From 87c3a53716535ca56fde7ef11e27716550cab81e Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 29 May 2022 08:15:16 +1000
Subject: [PATCH 001/959] Branch point after 2022-05-28 Breaking Change.

---
 readme.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/readme.md b/readme.md
index 5649ddfa09..63b483c744 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,7 @@
+# This is the `develop` branch!
+
+See the [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) document for more information.
+
 # Quantum Mechanical Keyboard Firmware
 
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)

From 2de70e6f2d5c7217ec0a0f318e999a0644d9db0d Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Mon, 30 May 2022 23:04:50 +0100
Subject: [PATCH 002/959] Add uf2-split-* make targets. (#17257)

---
 docs/feature_split_keyboard.md | 3 +++
 docs/flashing.md               | 4 ++++
 lib/python/qmk/cli/flash.py    | 2 ++
 platforms/chibios/flash.mk     | 8 ++++++--
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index 6ef70bf788..4fac083974 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -141,6 +141,9 @@ Next, you will have to flash the EEPROM files once for the correct hand to the c
 * ARM controllers with a DFU compatible bootloader (e.g. Proton-C):
   * `:dfu-util-split-left`
   * `:dfu-util-split-right`
+* ARM controllers with a UF2 compatible bootloader:
+  * `:uf2-split-left`
+  * `:uf2-split-right`
 
 Example:
 
diff --git a/docs/flashing.md b/docs/flashing.md
index ae31f9c621..a4610cae8c 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -358,3 +358,7 @@ CLI Flashing sequence:
 2. Wait for the OS to detect the device
 3. Flash via QMK CLI eg. `qmk flash --keyboard handwired/onekey/blackpill_f411_tinyuf2 --keymap default`
 4. Wait for the keyboard to become available
+
+### `make` Targets
+
+* `:uf2-split-left` and `:uf2-split-right`: Flashes the firmware but also sets the handedness setting in EEPROM by generating a side specific firmware.
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py
index 28e48a4101..3ff4a318df 100644
--- a/lib/python/qmk/cli/flash.py
+++ b/lib/python/qmk/cli/flash.py
@@ -33,6 +33,8 @@ def print_bootloader_help():
     cli.echo('\tdfu-split-right')
     cli.echo('\tdfu-util-split-left')
     cli.echo('\tdfu-util-split-right')
+    cli.echo('\tuf2-split-left')
+    cli.echo('\tuf2-split-right')
     cli.echo('For more info, visit https://docs.qmk.fm/#/flashing')
 
 
diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk
index a91ef2cf35..86bbc22943 100644
--- a/platforms/chibios/flash.mk
+++ b/platforms/chibios/flash.mk
@@ -54,11 +54,11 @@ endef
 
 # TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS
 #       within the emulated eeprom via dfu-util or another tool
-ifneq (,$(filter $(MAKECMDGOALS),dfu-util-split-left))
+ifneq (,$(filter $(MAKECMDGOALS), dfu-util-split-left uf2-split-left))
     OPT_DEFS += -DINIT_EE_HANDS_LEFT
 endif
 
-ifneq (,$(filter $(MAKECMDGOALS),dfu-util-split-right))
+ifneq (,$(filter $(MAKECMDGOALS), dfu-util-split-right uf2-split-right))
     OPT_DEFS += -DINIT_EE_HANDS_RIGHT
 endif
 
@@ -66,6 +66,10 @@ dfu-util-split-left: dfu-util
 
 dfu-util-split-right: dfu-util
 
+uf2-split-left: flash
+
+uf2-split-right: flash
+
 ST_LINK_CLI ?= st-link_cli
 ST_LINK_ARGS ?=
 

From 9e2fe4eff6d36d20aeeea57408216ff329b2bd31 Mon Sep 17 00:00:00 2001
From: trwnh <a@trwnh.com>
Date: Tue, 31 May 2022 00:28:55 -0500
Subject: [PATCH 003/959] Make SPI Mode configurable and change default mode to
 3 (#17263)

---
 docs/feature_rgb_matrix.md | 1 +
 drivers/led/aw20216.c      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 295e610fc4..ec67e32078 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -409,6 +409,7 @@ You can use up to 2 AW20216 IC's. Do not specify `DRIVER_<N>_xxx` defines for IC
 | `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
 | `AW_SCALING_MAX` | (Optional) LED current scaling value (0-255, higher values mean LED is brighter at full PWM) | 150 |
 | `AW_GLOBAL_CURRENT_MAX` | (Optional) Driver global current limit (0-255, higher values means the driver may consume more power) | 150 |
+| `AW_SPI_MODE` | (Optional) Mode for SPI communication (0-3, defines polarity and phase of the clock) | 3 |
 | `AW_SPI_DIVISOR` | (Optional) Clock divisor for SPI communication (powers of 2, smaller numbers means faster communication, should not be less than 4) | 4 |
 
 Here is an example using 2 drivers.
diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
index 448accdcd3..299434f909 100644
--- a/drivers/led/aw20216.c
+++ b/drivers/led/aw20216.c
@@ -53,6 +53,10 @@
 #    define AW_GLOBAL_CURRENT_MAX 150
 #endif
 
+#ifndef AW_SPI_MODE
+#    define AW_SPI_MODE 3
+#endif
+
 #ifndef AW_SPI_DIVISOR
 #    define AW_SPI_DIVISOR 4
 #endif
@@ -63,7 +67,7 @@ bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 bool AW20216_write(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t* data, uint8_t len) {
     static uint8_t s_spi_transfer_buffer[2] = {0};
 
-    if (!spi_start(cs_pin, false, 3, AW_SPI_DIVISOR)) {
+    if (!spi_start(cs_pin, false, AW_SPI_MODE, AW_SPI_DIVISOR)) {
         spi_stop();
         return false;
     }

From 854547330704fb1b1f07d547d49728da8b92b2a3 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 31 May 2022 15:38:08 +1000
Subject: [PATCH 004/959] Removes terminal from QMK. (#17258)

---
 builddefs/common_features.mk                  |   6 -
 builddefs/show_options.mk                     |   1 -
 docs/_summary.md                              |   1 -
 docs/feature_terminal.md                      | 107 ------
 docs/ja/_summary.md                           |   1 -
 docs/ja/feature_terminal.md                   | 112 ------
 docs/ja/understanding_qmk.md                  |   1 -
 docs/understanding_qmk.md                     |   1 -
 docs/zh-cn/_summary.md                        |   1 -
 .../mf68/keymaps/delivrance/rules.mk          |   1 -
 .../handwire_101/keymaps/default/keymap.c     |   8 +-
 keyboards/ckeys/handwire_101/rules.mk         |   1 -
 keyboards/contra/keymaps/default/keymap.c     |   2 +-
 .../delikeeb/vaneela/keymaps/default/keymap.c |   2 +-
 .../delikeeb/vaneela/keymaps/via/keymap.c     |   2 +-
 .../dm9records/plaid/keymaps/default/keymap.c |   2 +-
 keyboards/fractal/keymaps/default/keymap.c    |   2 +-
 .../ortho_brass/keymaps/default/keymap.c      |   2 +-
 .../riblee_f401/keymaps/default/keymap.c      |   2 +-
 .../riblee_f411/keymaps/default/keymap.c      |   2 +-
 .../handwired/rs60/keymaps/default/keymap.c   |   2 +-
 .../terminus_mini/keymaps/default/keymap.c    |   2 +-
 .../o4l_5x12/keymaps/default/keymap.c         |   2 +-
 .../massdrop/alt/keymaps/pregame/rules.mk     |   1 -
 .../massdrop/ctrl/keymaps/endgame/rules.mk    |   1 -
 .../ctrl/keymaps/matthewrobo/rules.mk         |   1 -
 .../massdrop/ctrl/keymaps/xanimos/rules.mk    |   1 -
 keyboards/mlego/m48/keymaps/default/keymap.c  |   8 +-
 keyboards/planck/keymaps/default/keymap.c     |   2 +-
 .../planck/keymaps/roguepullrequest/rules.mk  |   1 -
 keyboards/planck/keymaps/rootiest/rules.mk    |   3 -
 .../planck/keymaps/synth_sample/keymap.c      |   8 +-
 .../planck/keymaps/synth_wavetable/keymap.c   |   8 +-
 keyboards/preonic/keymaps/default/keymap.c    |   2 +-
 .../splitkb/kyria/keymaps/j-inc/rules.mk      |   1 -
 .../work_board/keymaps/default/keymap.c       |   6 +-
 quantum/process_keycode/process_terminal.c    | 330 ------------------
 quantum/process_keycode/process_terminal.h    |  24 --
 .../process_keycode/process_terminal_nop.h    |  22 --
 quantum/quantum.c                             |   3 -
 quantum/quantum.h                             |   6 -
 quantum/quantum_keycodes.h                    |   6 +-
 quantum/quantum_keycodes_legacy.h             |   3 +
 users/bcat/rules.mk                           |   1 -
 44 files changed, 38 insertions(+), 663 deletions(-)
 delete mode 100644 docs/feature_terminal.md
 delete mode 100644 docs/ja/feature_terminal.md
 delete mode 100644 quantum/process_keycode/process_terminal.c
 delete mode 100644 quantum/process_keycode/process_terminal.h
 delete mode 100644 quantum/process_keycode/process_terminal_nop.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index c976b8296d..631558ef27 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -542,12 +542,6 @@ ifeq ($(strip $(LED_TABLES)), yes)
     SRC += $(QUANTUM_DIR)/led_tables.c
 endif
 
-ifeq ($(strip $(TERMINAL_ENABLE)), yes)
-    SRC += $(QUANTUM_DIR)/process_keycode/process_terminal.c
-    OPT_DEFS += -DTERMINAL_ENABLE
-    OPT_DEFS += -DUSER_PRINT
-endif
-
 ifeq ($(strip $(VIA_ENABLE)), yes)
     DYNAMIC_KEYMAP_ENABLE := yes
     RAW_ENABLE := yes
diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
index f67d009191..1c1c189f27 100644
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@@ -5,7 +5,6 @@ BUILD_OPTION_NAMES = \
   CONSOLE_ENABLE \
   COMMAND_ENABLE \
   NKRO_ENABLE \
-  TERMINAL_ENABLE \
   CUSTOM_MATRIX \
   DEBOUNCE_TYPE \
   SPLIT_KEYBOARD \
diff --git a/docs/_summary.md b/docs/_summary.md
index 11f5e1dd51..78d7f30ea4 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -88,7 +88,6 @@
     * [Swap Hands](feature_swap_hands.md)
     * [Tap Dance](feature_tap_dance.md)
     * [Tap-Hold Configuration](tap_hold.md)
-    * [Terminal](feature_terminal.md)
     * [Unicode](feature_unicode.md)
     * [Userspace](feature_userspace.md)
     * [WPM Calculation](feature_wpm.md)
diff --git a/docs/feature_terminal.md b/docs/feature_terminal.md
deleted file mode 100644
index f850622165..0000000000
--- a/docs/feature_terminal.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Terminal
-
-> This feature is currently *huge*, and should probably only be put on boards with a lot of memory, or for fun.
-
-The terminal feature is a command-line-like interface designed to communicate through a text editor with keystrokes. It's beneficial to turn off auto-indent features in your editor.
-
-To enable, stick this in your `rules.mk` or `Makefile`:
-
-    TERMINAL_ENABLE = yes
-
-And use the `TERM_ON` and `TERM_OFF` keycodes to turn it on or off.
-
-When enabled, a `> ` prompt will appear, where you'll be able to type, backspace (a bell will ding if you reach the beginning and audio is enabled), and hit enter to send the command. Arrow keys are currently disabled so it doesn't get confused. Moving your cursor around with the mouse is discouraged.
-
-`#define TERMINAL_HELP` enables some other output helpers that aren't really needed with this page.
-
-Pressing "up" and "down" will allow you to cycle through the past 5 commands entered.
-
-## Future Ideas
-
-* Keyboard/user-extensible commands
-* Smaller footprint
-* Arrow key support
-* Command history - Done
-* SD card support
-* LCD support for buffer display
-* Keycode -> name string LUT
-* Layer status
-* *Analog/digital port read/write*
-* RGB mode stuff
-* Macro definitions
-* EEPROM read/write
-* Audio control
-
-## Current Commands
-
-### `about`
-
-Prints out the current version of QMK with a build date:
-
-```
-> about
-QMK Firmware
-  v0.5.115-7-g80ed73-dirty
-  Built: 2017-08-29-20:24:44
-```
-
-
-### `print-buffer`
-
-Outputs the last 5 commands entered
-
-```
-> print-buffer
-0. print-buffer
-1. help
-2. about
-3. keymap 0
-4. help
-5. flush-buffer
-```
-
-### `flush-buffer`
-
-Clears command buffer
-```
-> flush-buffer
-Buffer cleared!
-```
-
-
-### `help`
-
-
-Prints out the available commands:
-
-```
-> help
-commands available:
-  about help keycode keymap exit print-buffer flush-buffer
-```
-
-### `keycode <layer> <row> <col>`
-
-Prints out the keycode value of a certain layer, row, and column:
-
-```
-> keycode 0 1 0
-0x29 (41)
-```
-
-### `keymap <layer>`
-
-Prints out the entire keymap for a certain layer
-
-```
-> keymap 0
-0x002b, 0x0014, 0x001a, 0x0008, 0x0015, 0x0017, 0x001c, 0x0018, 0x000c, 0x0012, 0x0013, 0x002a,
-0x0029, 0x0004, 0x0016, 0x0007, 0x0009, 0x000a, 0x000b, 0x000d, 0x000e, 0x000f, 0x0033, 0x0034,
-0x00e1, 0x001d, 0x001b, 0x0006, 0x0019, 0x0005, 0x0011, 0x0010, 0x0036, 0x0037, 0x0038, 0x0028,
-0x5cd6, 0x00e0, 0x00e2, 0x00e3, 0x5cd4, 0x002c, 0x002c, 0x5cd5, 0x0050, 0x0051, 0x0052, 0x004f,
->
-```
-
-### `exit`
-
-Exits the terminal - same as `TERM_OFF`.
diff --git a/docs/ja/_summary.md b/docs/ja/_summary.md
index 81b5756c27..8516a5eaaa 100644
--- a/docs/ja/_summary.md
+++ b/docs/ja/_summary.md
@@ -85,7 +85,6 @@
     * [スワップハンド](ja/feature_swap_hands.md)
     * [タップダンス](ja/feature_tap_dance.md)
     * [タップホールド設定](ja/tap_hold.md)
-    * [ターミナル](ja/feature_terminal.md)
     * [ユニコード](ja/feature_unicode.md)
     * [ユーザスペース](ja/feature_userspace.md)
     * [WPM 計算](ja/feature_wpm.md)
diff --git a/docs/ja/feature_terminal.md b/docs/ja/feature_terminal.md
deleted file mode 100644
index 8e125ecee0..0000000000
--- a/docs/ja/feature_terminal.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# ターミナル
-
-<!---
-  original document: 0.8.147:docs/feature_terminal.md
-  git diff 0.8.147 HEAD -- docs/feature_terminal.md | cat
--->
-
-> この機能は現在のところ*巨大*であり、おそらく大量のメモリを搭載したキーボード、または楽しみのためにのみ配置する必要があります。
-
-ターミナル機能はテキストエディタを介してキーストロークで通信するように設計されたコマンドラインのようなインタフェースです。エディタで自動インデント機能をオフにすることは有益です。
-
-有効にするには、以下を `rules.mk` または `Makefile` に貼り付けます:
-
-    TERMINAL_ENABLE = yes
-
-そして、オンまたはオフにするために、`TERM_ON` および `TERM_OFF` キーコードを使います。
-
-有効な場合、`> ` プロンプトが現れ、ここでコマンドやバックスペース(オーディオが有効な場合は、先頭に到達するとベルが鳴ります)を入力することができ、エンターを入力するとコマンドを送信します。矢印キーは現在のところ無効なため、混乱することはありません。マウスでカーソルを移動することはお勧めしません。
-
-`#define TERMINAL_HELP` は、このページでは実際には必要のない他の出力ヘルパーを有効にします。
-
-"上矢印" および "下矢印" により、過去に入力した5つのコマンドを順に切り替えることができます。
-
-## 今後のアイデア
-
-* キーボード/ユーザ拡張可能なコマンド
-* より小さなフットプリント
-* 矢印キーのサポート
-* コマンド履歴 - 完了
-* SD カードのサポート
-* バッファディスプレイのための LCD サポート
-* キーコード -> 名称の対応表
-* レイヤー状態
-* *アナログ/デジタル ポートの読み込み/書き込み*
-* RGB モード関連機能
-* マクロ定義
-* EEPROM の読み込み/書き込み
-* オーディオ制御
-
-## 現在のコマンド
-
-### `about`
-
-現在の QMK のバージョンとビルドした日の出力:
-
-```
-> about
-QMK Firmware
-  v0.5.115-7-g80ed73-dirty
-  Built: 2017-08-29-20:24:44
-```
-
-
-### `print-buffer`
-
-最後に入力した5つのコマンドの出力
-
-```
-> print-buffer
-0. print-buffer
-1. help
-2. about
-3. keymap 0
-4. help
-5. flush-buffer
-```
-
-### `flush-buffer`
-
-コマンドバッファをクリア
-```
-> flush-buffer
-Buffer cleared!
-```
-
-
-### `help`
-
-
-利用可能なコマンドの出力:
-
-```
-> help
-commands available:
-  about help keycode keymap exit print-buffer flush-buffer
-```
-
-### `keycode <layer> <row> <col>`
-
-特定のレイヤー、行および列のキーコード値の出力:
-
-```
-> keycode 0 1 0
-0x29 (41)
-```
-
-### `keymap <layer>`
-
-特定のレイヤーの全てのキーマップの出力
-
-```
-> keymap 0
-0x002b, 0x0014, 0x001a, 0x0008, 0x0015, 0x0017, 0x001c, 0x0018, 0x000c, 0x0012, 0x0013, 0x002a,
-0x0029, 0x0004, 0x0016, 0x0007, 0x0009, 0x000a, 0x000b, 0x000d, 0x000e, 0x000f, 0x0033, 0x0034,
-0x00e1, 0x001d, 0x001b, 0x0006, 0x0019, 0x0005, 0x0011, 0x0010, 0x0036, 0x0037, 0x0038, 0x0028,
-0x5cd6, 0x00e0, 0x00e2, 0x00e3, 0x5cd4, 0x002c, 0x002c, 0x5cd5, 0x0050, 0x0051, 0x0052, 0x004f,
->
-```
-
-### `exit`
-
-ターミナルの終了 - `TERM_OFF` と同じ。
diff --git a/docs/ja/understanding_qmk.md b/docs/ja/understanding_qmk.md
index 1654f8e002..550ee3a7c0 100644
--- a/docs/ja/understanding_qmk.md
+++ b/docs/ja/understanding_qmk.md
@@ -161,7 +161,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * [`bool process_combo(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_combo.c#L115)
     * [`bool process_printer(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_printer.c#L77)
     * [`bool process_auto_shift(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_auto_shift.c#L94)
-    * [`bool process_terminal(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_terminal.c#L264)
     * [Quantum 固有のキーコードを識別して処理する](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/quantum.c#L291)
 
 この一連のイベントの中の任意のステップで (`process_record_kb()` のような)関数は `false` を返して、以降の処理を停止することができます。
diff --git a/docs/understanding_qmk.md b/docs/understanding_qmk.md
index 9b80fb179e..c1bcfe3ce9 100644
--- a/docs/understanding_qmk.md
+++ b/docs/understanding_qmk.md
@@ -155,7 +155,6 @@ The `process_record()` function itself is deceptively simple, but hidden within
       * [`bool process_printer(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_printer.c#L77)
       * [`bool process_auto_shift(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_auto_shift.c#L94)
       * `bool process_dynamic_tapping_term(uint16_t keycode, keyrecord_t *record)`
-      * [`bool process_terminal(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_terminal.c#L264)
       * [Identify and process Quantum-specific keycodes](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/quantum.c#L291)
 
 At any step during this chain of events a function (such as `process_record_kb()`) can `return false` to halt all further processing.
diff --git a/docs/zh-cn/_summary.md b/docs/zh-cn/_summary.md
index dbad1021fa..3baee6dc2e 100644
--- a/docs/zh-cn/_summary.md
+++ b/docs/zh-cn/_summary.md
@@ -91,7 +91,6 @@
     * [换手](zh-cn/feature_swap_hands.md)
     * [一键多用](zh-cn/feature_tap_dance.md)
     * [点按配置](zh-cn/tap_hold.md)
-    * [终端](zh-cn/feature_terminal.md)
     * [Unicode](zh-cn/feature_unicode.md)
     * [用户空间](zh-cn/feature_userspace.md)
     * [WPM计算](zh-cn/feature_wpm.md)
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/rules.mk b/keyboards/40percentclub/mf68/keymaps/delivrance/rules.mk
index 5ac2ce5ccb..3d056cb71b 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/rules.mk
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/rules.mk
@@ -1,6 +1,5 @@
 BACKLIGHT_DRIVER = custom
 NKRO_ENABLE = yes
-TERMINAL_ENABLE = yes
 DYNAMIC_MACRO_ENABLE = yes
 
 # Use RAM (fake EEPROM, transient) instead of real EEPROM
diff --git a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
index 3bb1a2c009..3f5ebc8655 100755
--- a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
+++ b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
@@ -134,10 +134,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `--------=======------------------------'
      */
     [_TERMINAL] = LAYOUT_ortho_4x4(
-        _______,  TERM_ABOUT, _______, _______,
-        TERM_OFF, TERM_PRINT, _______, _______,
-        _______,  TERM_FLUSH, _______, _______,
-        TERM_ON,  TERM_HELP , _______, _______
+        _______, TERM_ABOUT, _______, _______,
+        _______, TERM_PRINT, _______, _______,
+        _______, TERM_FLUSH, _______, _______,
+        _______, TERM_HELP , _______, _______
     ),
     /* ADMIN
      * ,-----------------------------------------.
diff --git a/keyboards/ckeys/handwire_101/rules.mk b/keyboards/ckeys/handwire_101/rules.mk
index 8fa32bcee5..3131bb405a 100755
--- a/keyboards/ckeys/handwire_101/rules.mk
+++ b/keyboards/ckeys/handwire_101/rules.mk
@@ -12,7 +12,6 @@ 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
-TERMINAL_ENABLE = yes
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c
index 6c05ebebff..1a365c9a6d 100644
--- a/keyboards/contra/keymaps/default/keymap.c
+++ b/keyboards/contra/keymaps/default/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_planck_mit(
     _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
   )
 
diff --git a/keyboards/delikeeb/vaneela/keymaps/default/keymap.c b/keyboards/delikeeb/vaneela/keymaps/default/keymap.c
index b1d7401b9d..57df91cd4d 100644
--- a/keyboards/delikeeb/vaneela/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/vaneela/keymaps/default/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT_ortho_5x12(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,TERM_ON, TERM_OFF, KC_DEL,
+  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
index 65194b84d3..4bfee3daf5 100644
--- a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT_ortho_5x12(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,TERM_ON, TERM_OFF, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/dm9records/plaid/keymaps/default/keymap.c b/keyboards/dm9records/plaid/keymaps/default/keymap.c
index f11b744066..d96c250609 100644
--- a/keyboards/dm9records/plaid/keymaps/default/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/default/keymap.c
@@ -195,7 +195,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_plaid_grid(
     QK_BOOT,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/fractal/keymaps/default/keymap.c b/keyboards/fractal/keymaps/default/keymap.c
index 6b0a8cc18c..ded4890d8c 100644
--- a/keyboards/fractal/keymaps/default/keymap.c
+++ b/keyboards/fractal/keymaps/default/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
index 948a7bd1bc..f32529b6a7 100644
--- a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12_1x2uC(
     _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
 )
 
diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
index 6892c0fb49..bee4de5ede 100644
--- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-    _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______,  _______, KC_DEL,
+    _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
     _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
index 2e9485d6b9..ff7e1117b8 100644
--- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-    _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______,  _______, KC_DEL,
+    _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
     _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
diff --git a/keyboards/handwired/rs60/keymaps/default/keymap.c b/keyboards/handwired/rs60/keymaps/default/keymap.c
index 6b311a7ebb..6d5dc4a32a 100644
--- a/keyboards/handwired/rs60/keymaps/default/keymap.c
+++ b/keyboards/handwired/rs60/keymaps/default/keymap.c
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index 8062aa711f..8d0631072f 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, QK_BOOT,   _______, TERM_ON, TERM_OFF, _______, _______, KC_DEL,
+  _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK,  DVORAK,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
   _______, _______, _______, _______,     _______,          _______,      _______, _______, _______,  _______
diff --git a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
index 050b5a2c3e..2f64a56e9a 100644
--- a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_ortho_5x12(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+        _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
         _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/massdrop/alt/keymaps/pregame/rules.mk b/keyboards/massdrop/alt/keymaps/pregame/rules.mk
index 184405662a..5981633f7c 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/rules.mk
+++ b/keyboards/massdrop/alt/keymaps/pregame/rules.mk
@@ -8,7 +8,6 @@ DYNAMIC_MACRO_ENABLE = no		# Dynamic macro recording and play
 MOUSEKEY_ENABLE = no			# Enable mouse control keycodes. Increases firmware size.
 TAP_DANCE_ENABLE = no			# Enable tap dance keys
 CONSOLE_ENABLE = no			# Enable debugging console. Increases firmware size.
-TERMINAL_ENABLE = no
 EXTRAKEY_ENABLE = yes			# Audio control and System control
 # RAW_ENABLE = yes				# Raw HID has not yet been implemented for this keyboard
 # COMBO_ENABLE					# Key combo feature
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/rules.mk b/keyboards/massdrop/ctrl/keymaps/endgame/rules.mk
index 9502c242dd..c4fab8ad53 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/rules.mk
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/rules.mk
@@ -7,7 +7,6 @@ MOUSEKEY_ENABLE = yes			# Enable mouse control keycodes. Increases firmware size
 TAP_DANCE_ENABLE = yes			# Enable tap dance keys
 CONSOLE_ENABLE = yes			# Enable debugging console. Increases firmware size.
 SRC += config_led.c				# Used to add files to the compilation/linking list.
-TERMINAL_ENABLE = yes
 EXTRAKEY_ENABLE = yes			# Audio control and System control
 # RAW_ENABLE = yes				# Raw HID has not yet been implemented for this keyboard
 # COMBO_ENABLE					# Key combo feature
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/rules.mk b/keyboards/massdrop/ctrl/keymaps/matthewrobo/rules.mk
index e834404e29..4bb43f525b 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/rules.mk
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/rules.mk
@@ -7,7 +7,6 @@ MOUSEKEY_ENABLE = no			# Enable mouse control keycodes. Increases firmware size.
 TAP_DANCE_ENABLE = no			# Enable tap dance keys
 CONSOLE_ENABLE = no			# Enable debugging console. Increases firmware size.
 SRC += config_led.c				# Used to add files to the compilation/linking list.
-TERMINAL_ENABLE = no
 EXTRAKEY_ENABLE = yes			# Audio control and System control
 #RAW_ENABLE = yes #Raw HID has not yet been implemented for this keyboard
 #COMBO_ENABLE #Key combo                    feature
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/rules.mk b/keyboards/massdrop/ctrl/keymaps/xanimos/rules.mk
index 43a312ce4e..2913eff83b 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/rules.mk
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/rules.mk
@@ -8,7 +8,6 @@ TAP_DANCE_ENABLE = yes			# Enable tap dance keys
 CONSOLE_ENABLE = no				# Enable debugging console. Increases firmware size.
 SRC += config_led.c				# Used to add files to the compilation/linking list.
 EXTRAKEY_ENABLE = yes			# Audio control and System control
-TERMINAL_ENABLE = no
 # RAW_ENABLE = yes				# Raw HID has not yet been implemented for this keyboard
 # COMBO_ENABLE					# Key combo feature
 # LEADER_ENABLE					# Enable leader key chording
diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c
index 5eb40a332a..175f42b9b9 100644
--- a/keyboards/mlego/m48/keymaps/default/keymap.c
+++ b/keyboards/mlego/m48/keymaps/default/keymap.c
@@ -106,10 +106,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJ] =  LAYOUT_ortho_4x12(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______, _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 3453d41746..8041e0bada 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/roguepullrequest/rules.mk b/keyboards/planck/keymaps/roguepullrequest/rules.mk
index 9394c96e5b..5eb053e886 100644
--- a/keyboards/planck/keymaps/roguepullrequest/rules.mk
+++ b/keyboards/planck/keymaps/roguepullrequest/rules.mk
@@ -1,4 +1,3 @@
 AUDIO_ENABLE = yes
 COMMAND_ENABLE = no
-TERMINAL_ENABLE = no
 TAP_DANCE_ENABLE = yes
diff --git a/keyboards/planck/keymaps/rootiest/rules.mk b/keyboards/planck/keymaps/rootiest/rules.mk
index b669d8bb7d..ca0f90b6e9 100644
--- a/keyboards/planck/keymaps/rootiest/rules.mk
+++ b/keyboards/planck/keymaps/rootiest/rules.mk
@@ -20,8 +20,5 @@ KEY_LOCK_ENABLE = yes # Enables using lock key to maintain holds
 # SWAP_HANDS_ENABLE = yes # Enables the swap hands function
 # DEBOUNCE_TYPE = sym_eager_pk # Change debounce algorithm
 
-# NOTE: The following requires a lot of memory to include
-TERMINAL_ENABLE = yes # Enables a command-line-like interface designed to communicate through a text editor with keystrokes
-
 # NOTE: The following is not yet available in main qmk branch
 KEY_OVERRIDE_ENABLE = yes # Allows overiding modifier combos (change Shift+1 without affecting 1 or Shift's normal operation)
diff --git a/keyboards/planck/keymaps/synth_sample/keymap.c b/keyboards/planck/keymaps/synth_sample/keymap.c
index 0a57b7ce9a..124c01cb05 100644
--- a/keyboards/planck/keymaps/synth_sample/keymap.c
+++ b/keyboards/planck/keymaps/synth_sample/keymap.c
@@ -160,10 +160,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/synth_wavetable/keymap.c b/keyboards/planck/keymaps/synth_wavetable/keymap.c
index d413d63896..a5c5491ebd 100644
--- a/keyboards/planck/keymaps/synth_wavetable/keymap.c
+++ b/keyboards/planck/keymaps/synth_wavetable/keymap.c
@@ -160,10 +160,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c
index ef7614393d..c1faf464d6 100644
--- a/keyboards/preonic/keymaps/default/keymap.c
+++ b/keyboards/preonic/keymaps/default/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
index 000c995025..ee07f52ff1 100644
--- a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
@@ -9,7 +9,6 @@ MOUSEKEY_ENABLE = no
 TAP_DANCE_ENABLE = no
 STENO_ENABLE = no
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-TERMINAL_ENABLE = no
 GRAVE_ESC_ENABLE = no
 MAGIC_ENABLE = no
 SPACE_CADET_ENABLE = no
diff --git a/keyboards/work_louder/work_board/keymaps/default/keymap.c b/keyboards/work_louder/work_board/keymaps/default/keymap.c
index 59bb437d9d..cae65ff5c2 100644
--- a/keyboards/work_louder/work_board/keymaps/default/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/default/keymap.c
@@ -144,9 +144,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL , _______,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , _______,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
 )
 
diff --git a/quantum/process_keycode/process_terminal.c b/quantum/process_keycode/process_terminal.c
deleted file mode 100644
index da1c4d506f..0000000000
--- a/quantum/process_keycode/process_terminal.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* Copyright 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 "process_terminal.h"
-#include <string.h>
-#include "version.h"
-#include <stdio.h>
-#include <math.h>
-
-#ifndef CMD_BUFF_SIZE
-#    define CMD_BUFF_SIZE 5
-#endif
-
-bool terminal_enabled = false;
-char buffer[80]       = "";
-char cmd_buffer[CMD_BUFF_SIZE][80];
-bool cmd_buffer_enabled = true; // replace with ifdef?
-char newline[2]         = "\n";
-char arguments[6][20];
-bool firstTime = true;
-
-short int current_cmd_buffer_pos = 0; // used for up/down arrows - keeps track of where you are in the command buffer
-
-__attribute__((weak)) const char terminal_prompt[8] = "> ";
-
-#ifdef AUDIO_ENABLE
-#    ifndef TERMINAL_SONG
-#        define TERMINAL_SONG SONG(TERMINAL_SOUND)
-#    endif
-float terminal_song[][2] = TERMINAL_SONG;
-#    define TERMINAL_BELL() PLAY_SONG(terminal_song)
-#else
-#    define TERMINAL_BELL()
-#endif
-
-__attribute__((weak)) const char keycode_to_ascii_lut[58] = {0, 0, 0, 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0, 0, 0, '\t', ' ', '-', '=', '[', ']', '\\', 0, ';', '\'', '`', ',', '.', '/'};
-
-__attribute__((weak)) const char shifted_keycode_to_ascii_lut[58] = {0, 0, 0, 0, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', 0, 0, 0, '\t', ' ', '_', '+', '{', '}', '|', 0, ':', '\'', '~', '<', '>', '?'};
-
-struct stringcase {
-    char *string;
-    void (*func)(void);
-} typedef stringcase;
-
-void enable_terminal(void) {
-    terminal_enabled = true;
-    strcpy(buffer, "");
-    memset(cmd_buffer, 0, CMD_BUFF_SIZE * 80);
-    for (int i = 0; i < 6; i++)
-        strcpy(arguments[i], "");
-    // select all text to start over
-    // SEND_STRING(SS_LCTL("a"));
-    send_string(terminal_prompt);
-}
-
-void disable_terminal(void) {
-    terminal_enabled = false;
-    SEND_STRING("\n");
-}
-
-void push_to_cmd_buffer(void) {
-    if (cmd_buffer_enabled) {
-        if (cmd_buffer == NULL) {
-            return;
-        } else {
-            if (firstTime) {
-                firstTime = false;
-                strcpy(cmd_buffer[0], buffer);
-                return;
-            }
-
-            for (int i = CMD_BUFF_SIZE - 1; i > 0; --i) {
-                strncpy(cmd_buffer[i], cmd_buffer[i - 1], 80);
-            }
-
-            strcpy(cmd_buffer[0], buffer);
-
-            return;
-        }
-    }
-}
-
-void terminal_about(void) {
-    SEND_STRING("QMK Firmware\n");
-    SEND_STRING("  v");
-    SEND_STRING(QMK_VERSION);
-    SEND_STRING("\n" SS_TAP(X_HOME) "  Built: ");
-    SEND_STRING(QMK_BUILDDATE);
-    send_string(newline);
-#ifdef TERMINAL_HELP
-    if (strlen(arguments[1]) != 0) {
-        SEND_STRING("You entered: ");
-        send_string(arguments[1]);
-        send_string(newline);
-    }
-#endif
-}
-
-void terminal_help(void);
-
-extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-
-void terminal_keycode(void) {
-    if (strlen(arguments[1]) != 0 && strlen(arguments[2]) != 0 && strlen(arguments[3]) != 0) {
-        char     keycode_dec[5];
-        char     keycode_hex[5];
-        uint16_t layer   = strtol(arguments[1], (char **)NULL, 10);
-        uint16_t row     = strtol(arguments[2], (char **)NULL, 10);
-        uint16_t col     = strtol(arguments[3], (char **)NULL, 10);
-        uint16_t keycode = pgm_read_word(&keymaps[layer][row][col]);
-        itoa(keycode, keycode_dec, 10);
-        itoa(keycode, keycode_hex, 16);
-        SEND_STRING("0x");
-        send_string(keycode_hex);
-        SEND_STRING(" (");
-        send_string(keycode_dec);
-        SEND_STRING(")\n");
-    } else {
-#ifdef TERMINAL_HELP
-        SEND_STRING("usage: keycode <layer> <row> <col>\n");
-#endif
-    }
-}
-
-void terminal_keymap(void) {
-    if (strlen(arguments[1]) != 0) {
-        uint16_t layer = strtol(arguments[1], (char **)NULL, 10);
-        for (int r = 0; r < MATRIX_ROWS; r++) {
-            for (int c = 0; c < MATRIX_COLS; c++) {
-                uint16_t keycode = pgm_read_word(&keymaps[layer][r][c]);
-                char     keycode_s[8];
-                sprintf(keycode_s, "0x%04x,", keycode);
-                send_string(keycode_s);
-            }
-            send_string(newline);
-        }
-    } else {
-#ifdef TERMINAL_HELP
-        SEND_STRING("usage: keymap <layer>\n");
-#endif
-    }
-}
-
-void print_cmd_buff(void) {
-    /* without the below wait, a race condition can occur wherein the
-     buffer can be printed before it has been fully moved */
-    wait_ms(250);
-    for (int i = 0; i < CMD_BUFF_SIZE; i++) {
-        char tmpChar = ' ';
-        itoa(i, &tmpChar, 10);
-        const char *tmpCnstCharStr = &tmpChar; // because sned_string wont take a normal char *
-        send_string(tmpCnstCharStr);
-        SEND_STRING(". ");
-        send_string(cmd_buffer[i]);
-        SEND_STRING("\n");
-    }
-}
-
-void flush_cmd_buffer(void) {
-    memset(cmd_buffer, 0, CMD_BUFF_SIZE * 80);
-    SEND_STRING("Buffer Cleared!\n");
-}
-
-stringcase terminal_cases[] = {{"about", terminal_about}, {"help", terminal_help}, {"keycode", terminal_keycode}, {"keymap", terminal_keymap}, {"flush-buffer", flush_cmd_buffer}, {"print-buffer", print_cmd_buff}, {"exit", disable_terminal}};
-
-void terminal_help(void) {
-    SEND_STRING("commands available:\n  ");
-    for (stringcase *case_p = terminal_cases; case_p != terminal_cases + sizeof(terminal_cases) / sizeof(terminal_cases[0]); case_p++) {
-        send_string(case_p->string);
-        SEND_STRING(" ");
-    }
-    send_string(newline);
-}
-
-void command_not_found(void) {
-    wait_ms(50); // sometimes buffer isnt grabbed quick enough
-    SEND_STRING("command \"");
-    send_string(buffer);
-    SEND_STRING("\" not found\n");
-}
-
-void process_terminal_command(void) {
-    // we capture return bc of the order of events, so we need to manually send a newline
-    send_string(newline);
-
-    char *  pch;
-    uint8_t i = 0;
-    pch       = strtok(buffer, " ");
-    while (pch != NULL) {
-        strcpy(arguments[i], pch);
-        pch = strtok(NULL, " ");
-        i++;
-    }
-
-    bool command_found = false;
-    for (stringcase *case_p = terminal_cases; case_p != terminal_cases + sizeof(terminal_cases) / sizeof(terminal_cases[0]); case_p++) {
-        if (0 == strcmp(case_p->string, buffer)) {
-            command_found = true;
-            (*case_p->func)();
-            break;
-        }
-    }
-
-    if (!command_found) command_not_found();
-
-    if (terminal_enabled) {
-        strcpy(buffer, "");
-        for (int i = 0; i < 6; i++)
-            strcpy(arguments[i], "");
-        SEND_STRING(SS_TAP(X_HOME));
-        send_string(terminal_prompt);
-    }
-}
-void check_pos(void) {
-    if (current_cmd_buffer_pos >= CMD_BUFF_SIZE) { // if over the top, move it back down to the top of the buffer so you can climb back down...
-        current_cmd_buffer_pos = CMD_BUFF_SIZE - 1;
-    } else if (current_cmd_buffer_pos < 0) { //...and if you fall under the bottom of the buffer, reset back to 0 so you can climb back up
-        current_cmd_buffer_pos = 0;
-    }
-}
-
-bool process_terminal(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == TERM_ON && record->event.pressed) {
-        enable_terminal();
-        return false;
-    }
-
-    if (terminal_enabled && record->event.pressed) {
-        if (keycode == TERM_OFF && record->event.pressed) {
-            disable_terminal();
-            return false;
-        }
-
-        if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-            keycode = keycode & 0xFF;
-        }
-
-        if (keycode < 256) {
-            uint8_t str_len;
-            char    char_to_add;
-            switch (keycode) {
-                case KC_ENTER:
-                case KC_KP_ENTER:
-                    push_to_cmd_buffer();
-                    current_cmd_buffer_pos = 0;
-                    process_terminal_command();
-                    return false;
-                    break;
-                case KC_ESCAPE:
-                    SEND_STRING("\n");
-                    enable_terminal();
-                    return false;
-                    break;
-                case KC_BACKSPACE:
-                    str_len = strlen(buffer);
-                    if (str_len > 0) {
-                        buffer[str_len - 1] = 0;
-                        return true;
-                    } else {
-                        TERMINAL_BELL();
-                        return false;
-                    }
-                    break;
-                case KC_LEFT:
-                    return false;
-                    break;
-                case KC_RIGHT:
-                    return false;
-                    break;
-                case KC_UP:                                            // 0 = recent
-                    check_pos();                                       // check our current buffer position is valid
-                    if (current_cmd_buffer_pos <= CMD_BUFF_SIZE - 1) { // once we get to the top, dont do anything
-                        str_len = strlen(buffer);
-                        for (int i = 0; i < str_len; ++i) {
-                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already
-                            // process_terminal(KC_BACKSPACE,record);
-                        }
-                        strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 80);
-
-                        send_string(buffer);
-                        ++current_cmd_buffer_pos; // get ready to access the above cmd if up/down is pressed again
-                    }
-                    return false;
-                    break;
-                case KC_DOWN:
-                    check_pos();
-                    if (current_cmd_buffer_pos >= 0) { // once we get to the bottom, dont do anything
-                        str_len = strlen(buffer);
-                        for (int i = 0; i < str_len; ++i) {
-                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already
-                            // process_terminal(KC_BACKSPACE,record);
-                        }
-                        strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 79);
-
-                        send_string(buffer);
-                        --current_cmd_buffer_pos; // get ready to access the above cmd if down/up is pressed again
-                    }
-                    return false;
-                    break;
-                default:
-                    if (keycode <= 58) {
-                        char_to_add = 0;
-                        if (get_mods() & (MOD_BIT(KC_LEFT_SHIFT) | MOD_BIT(KC_RIGHT_SHIFT))) {
-                            char_to_add = shifted_keycode_to_ascii_lut[keycode];
-                        } else if (get_mods() == 0) {
-                            char_to_add = keycode_to_ascii_lut[keycode];
-                        }
-                        if (char_to_add != 0) {
-                            strncat(buffer, &char_to_add, 1);
-                        }
-                    }
-                    break;
-            }
-        }
-    }
-    return true;
-}
diff --git a/quantum/process_keycode/process_terminal.h b/quantum/process_keycode/process_terminal.h
deleted file mode 100644
index 0159131e5b..0000000000
--- a/quantum/process_keycode/process_terminal.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2017 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-extern const char keycode_to_ascii_lut[58];
-extern const char shifted_keycode_to_ascii_lut[58];
-extern const char terminal_prompt[8];
-bool              process_terminal(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_terminal_nop.h b/quantum/process_keycode/process_terminal_nop.h
deleted file mode 100644
index 36e25320c5..0000000000
--- a/quantum/process_keycode/process_terminal_nop.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2017 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define TERM_ON KC_NO
-#define TERM_OFF KC_NO
diff --git a/quantum/quantum.c b/quantum/quantum.c
index ac3e2d90b4..4efcc6bd8f 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -304,9 +304,6 @@ bool process_record_quantum(keyrecord_t *record) {
 #ifdef DYNAMIC_TAPPING_TERM_ENABLE
             process_dynamic_tapping_term(keycode, record) &&
 #endif
-#ifdef TERMINAL_ENABLE
-            process_terminal(keycode, record) &&
-#endif
 #ifdef CAPS_WORD_ENABLE
             process_caps_word(keycode, record) &&
 #endif
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 92e1af1c40..8a7a20c706 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -141,12 +141,6 @@ extern layer_state_t layer_state;
 #    include "process_key_lock.h"
 #endif
 
-#ifdef TERMINAL_ENABLE
-#    include "process_terminal.h"
-#else
-#    include "process_terminal_nop.h"
-#endif
-
 #ifdef SPACE_CADET_ENABLE
 #    include "process_space_cadet.h"
 #endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 40355d799a..869826ce19 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -473,9 +473,9 @@ enum quantum_keycodes {
     // Lock Key
     KC_LOCK, // 5D2B
 
-    // Terminal
-    TERM_ON,  // 5D2C
-    TERM_OFF, // 5D2D
+    // Unused slots
+    UNUSED_000, // 5D2C
+    UNUSED_001, // 5D2D
 
     // Sequencer
     SQ_ON,  // 5D2E
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index ed9455ee74..51380d9c50 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -11,3 +11,6 @@
 
 #define KC_GESC QK_GRAVE_ESCAPE
 #define EEP_RST QK_CLEAR_EEPROM
+
+#define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
+#define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
\ No newline at end of file
diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk
index 1ad2ee0aa8..090f7474eb 100644
--- a/users/bcat/rules.mk
+++ b/users/bcat/rules.mk
@@ -47,7 +47,6 @@ endif
 COMMAND_ENABLE = no
 CONSOLE_ENABLE = no
 MOUSEKEY_ENABLE = no
-TERMINAL_ENABLE = no
 
 # Disable unwanted hardware options on all keyboards. (Some keyboards turn
 # these features on by default even though they aren't actually required.)

From d44a950c107492b801d567a507e2213376e7f47c Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Tue, 31 May 2022 07:55:33 +0200
Subject: [PATCH 005/959] Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK
 (#17099)

---
 quantum/action.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/action.c b/quantum/action.c
index 4e81a5466f..83f6e2a970 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -844,7 +844,7 @@ __attribute__((weak)) void register_code(uint8_t code) {
 #    endif
         add_key(KC_CAPS_LOCK);
         send_keyboard_report();
-        wait_ms(100);
+        wait_ms(TAP_HOLD_CAPS_DELAY);
         del_key(KC_CAPS_LOCK);
         send_keyboard_report();
     }

From ecce9900c9cecfb095a9eb041af32eab26b44c1e Mon Sep 17 00:00:00 2001
From: Andrew Dunai <a@dun.ai>
Date: Tue, 31 May 2022 09:15:17 +0300
Subject: [PATCH 006/959] Improve PS/2 mouse performance (#17111)

---
 drivers/ps2/ps2.h                     |  1 +
 drivers/ps2/ps2_interrupt.c           |  4 ++--
 drivers/ps2/ps2_mouse.c               | 19 +++++++++++++++++--
 platforms/avr/drivers/ps2/ps2_usart.c |  4 ++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/drivers/ps2/ps2.h b/drivers/ps2/ps2.h
index f123192852..2465e16235 100644
--- a/drivers/ps2/ps2.h
+++ b/drivers/ps2/ps2.h
@@ -89,6 +89,7 @@ uint8_t ps2_host_send(uint8_t data);
 uint8_t ps2_host_recv_response(void);
 uint8_t ps2_host_recv(void);
 void    ps2_host_set_led(uint8_t usb_led);
+bool    pbuf_has_data(void);
 
 /*--------------------------------------------------------------------
  * static functions
diff --git a/drivers/ps2/ps2_interrupt.c b/drivers/ps2/ps2_interrupt.c
index c49b4f8b75..c9a9f1e1ec 100644
--- a/drivers/ps2/ps2_interrupt.c
+++ b/drivers/ps2/ps2_interrupt.c
@@ -66,8 +66,8 @@ uint8_t ps2_error = PS2_ERR_NONE;
 
 static inline uint8_t pbuf_dequeue(void);
 static inline void    pbuf_enqueue(uint8_t data);
-static inline bool    pbuf_has_data(void);
 static inline void    pbuf_clear(void);
+bool                  pbuf_has_data(void);
 
 #if defined(PROTOCOL_CHIBIOS)
 void ps2_interrupt_service_routine(void);
@@ -309,7 +309,7 @@ static inline uint8_t pbuf_dequeue(void) {
 
     return val;
 }
-static inline bool pbuf_has_data(void) {
+bool pbuf_has_data(void) {
 #if defined(__AVR__)
     uint8_t sreg = SREG;
     cli();
diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c
index ccb0a929ae..66b48bb3c3 100644
--- a/drivers/ps2/ps2_mouse.c
+++ b/drivers/ps2/ps2_mouse.c
@@ -53,6 +53,7 @@ void ps2_mouse_init(void) {
     ps2_mouse_set_remote_mode();
 #else
     ps2_mouse_enable_data_reporting();
+    ps2_mouse_set_stream_mode();
 #endif
 
 #ifdef PS2_MOUSE_ENABLE_SCROLLING
@@ -75,19 +76,33 @@ void ps2_mouse_task(void) {
     extern int     tp_buttons;
 
     /* receives packet from mouse */
+#ifdef PS2_MOUSE_USE_REMOTE_MODE
     uint8_t rcv;
     rcv = ps2_host_send(PS2_MOUSE_READ_DATA);
     if (rcv == PS2_ACK) {
         mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
         mouse_report.x       = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
         mouse_report.y       = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
-#ifdef PS2_MOUSE_ENABLE_SCROLLING
+#    ifdef PS2_MOUSE_ENABLE_SCROLLING
         mouse_report.v = -(ps2_host_recv_response() & PS2_MOUSE_SCROLL_MASK) * PS2_MOUSE_V_MULTIPLIER;
-#endif
+#    endif
     } else {
         if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
         return;
     }
+#else
+    if (pbuf_has_data()) {
+        mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
+        mouse_report.x       = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
+        mouse_report.y       = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
+#    ifdef PS2_MOUSE_ENABLE_SCROLLING
+        mouse_report.v       = -(ps2_host_recv_response() & PS2_MOUSE_SCROLL_MASK) * PS2_MOUSE_V_MULTIPLIER;
+#    endif
+    } else {
+        if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
+        return;
+    }
+#endif
 
     /* if mouse moves or buttons state changes */
     if (mouse_report.x || mouse_report.y || mouse_report.v || ((mouse_report.buttons ^ buttons_prev) & PS2_MOUSE_BTN_MASK)) {
diff --git a/platforms/avr/drivers/ps2/ps2_usart.c b/platforms/avr/drivers/ps2/ps2_usart.c
index 39ec930d4a..581badac64 100644
--- a/platforms/avr/drivers/ps2/ps2_usart.c
+++ b/platforms/avr/drivers/ps2/ps2_usart.c
@@ -72,8 +72,8 @@ uint8_t ps2_error = PS2_ERR_NONE;
 
 static inline uint8_t pbuf_dequeue(void);
 static inline void    pbuf_enqueue(uint8_t data);
-static inline bool    pbuf_has_data(void);
 static inline void    pbuf_clear(void);
+bool                  pbuf_has_data(void);
 
 void ps2_host_init(void) {
     idle(); // without this many USART errors occur when cable is disconnected
@@ -212,7 +212,7 @@ static inline uint8_t pbuf_dequeue(void) {
 
     return val;
 }
-static inline bool pbuf_has_data(void) {
+bool pbuf_has_data(void) {
     uint8_t sreg = SREG;
     cli();
     bool has_data = (pbuf_head != pbuf_tail);

From bbab8eb993c7015a53a51e88da9c1fce6736cffa Mon Sep 17 00:00:00 2001
From: Thomas Preisner <mail@tpreisner.de>
Date: Tue, 31 May 2022 08:20:10 +0200
Subject: [PATCH 007/959] Make bootloader_jump for dualbank STM32 respect
 STM32_BOOTLOADER_DUAL_BANK_DELAY (#17178)

---
 docs/platformdev_chibios_earlyinit.md     | 2 +-
 platforms/chibios/bootloaders/stm32_dfu.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/platformdev_chibios_earlyinit.md b/docs/platformdev_chibios_earlyinit.md
index aaa91ba438..e1256f2714 100644
--- a/docs/platformdev_chibios_earlyinit.md
+++ b/docs/platformdev_chibios_earlyinit.md
@@ -20,7 +20,7 @@ As such, if you wish to override this API consider limiting use to writing to lo
 | `#define STM32_BOOTLOADER_DUAL_BANK`          | Relevant for dual-bank STM32 MCUs, signifies that a GPIO is to be toggled in order to enter bootloader mode.                                                                                                                                                                           | `FALSE`  |
 | `#define STM32_BOOTLOADER_DUAL_BANK_GPIO`     | Relevant for dual-bank STM32 MCUs, the pin to toggle when attempting to enter bootloader mode, e.g. `B8`                                                                                                                                                                               | `<none>` |
 | `#define STM32_BOOTLOADER_DUAL_BANK_POLARITY` | Relevant for dual-bank STM32 MCUs, the value to set the pin to in order to trigger charging of the RC circuit. e.g. `0` or `1`.                                                                                                                                                        | `0`      |
-| `#define STM32_BOOTLOADER_DUAL_BANK_DELAY`    | Relevant for dual-bank STM32 MCUs, an arbitrary measurement of time to delay before resetting the MCU. Increasing number increases the delay.                                                                                                                                          | `100000` |
+| `#define STM32_BOOTLOADER_DUAL_BANK_DELAY`    | Relevant for dual-bank STM32 MCUs, an arbitrary measurement of time to delay before resetting the MCU. Increasing number increases the delay.                                                                                                                                          | `100`    |
 
 Kinetis MCUs have no configurable options.
 
diff --git a/platforms/chibios/bootloaders/stm32_dfu.c b/platforms/chibios/bootloaders/stm32_dfu.c
index ff866bd2bc..7b4ab86033 100644
--- a/platforms/chibios/bootloaders/stm32_dfu.c
+++ b/platforms/chibios/bootloaders/stm32_dfu.c
@@ -38,7 +38,7 @@ extern uint32_t __ram0_end__;
 #    endif
 
 #    ifndef STM32_BOOTLOADER_DUAL_BANK_DELAY
-#        define STM32_BOOTLOADER_DUAL_BANK_DELAY 100000
+#        define STM32_BOOTLOADER_DUAL_BANK_DELAY 100
 #    endif
 
 __attribute__((weak)) void bootloader_jump(void) {
@@ -55,7 +55,7 @@ __attribute__((weak)) void bootloader_jump(void) {
 #    endif
 
     // Wait for a while for the capacitor to charge
-    wait_ms(100);
+    wait_ms(STM32_BOOTLOADER_DUAL_BANK_DELAY);
 
     // Issue a system reset to get the ROM bootloader to execute, with BOOT0 high
     NVIC_SystemReset();

From af02baae78a3c4a06a646bc338b35524b5e5e7f5 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Wed, 1 Jun 2022 00:10:05 +0100
Subject: [PATCH 008/959] Allow larger SPLIT_USB_TIMEOUT with default
 SPLIT_USB_TIMEOUT_POLL (#17272)

* Switch SPLIT_USB_DETECT loop to uint16_t

* Add assertion
---
 quantum/split_common/split_util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 7d50adf758..8b11e51374 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -57,8 +57,9 @@ static uint8_t connection_errors = 0;
 volatile bool isLeftHand = true;
 
 #if defined(SPLIT_USB_DETECT)
+_Static_assert((SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL) <= UINT16_MAX, "Please lower SPLIT_USB_TIMEOUT and/or increase SPLIT_USB_TIMEOUT_POLL.");
 static bool usbIsActive(void) {
-    for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) {
+    for (uint16_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) {
         // This will return true if a USB connection has been established
         if (usb_connected_state()) {
             return true;

From af84772a5f350c404bfad8f5b138f990828eac45 Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Sat, 4 Jun 2022 10:53:24 +1000
Subject: [PATCH 009/959] initial 24lc32a (#16990)

---
 docs/eeprom_driver.md       | 5 +++--
 drivers/eeprom/eeprom_i2c.h | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/eeprom_driver.md b/docs/eeprom_driver.md
index 6dcf10c04d..306ebacb3f 100644
--- a/docs/eeprom_driver.md
+++ b/docs/eeprom_driver.md
@@ -43,8 +43,9 @@ Module           | Equivalent `#define`            | Source
 -----------------|---------------------------------|------------------------------------------
 CAT24C512 EEPROM | `#define EEPROM_I2C_CAT24C512`  | <https://www.sparkfun.com/products/14764>
 RM24C512C EEPROM | `#define EEPROM_I2C_RM24C512C`  | <https://www.sparkfun.com/products/14764>
-24LC64 EEPROM    | `#define EEPROM_I2C_24LC64`     | <https://www.microchip.com/wwwproducts/en/24LC64>
-24LC128 EEPROM   | `#define EEPROM_I2C_24LC128`    | <https://www.microchip.com/wwwproducts/en/24LC128>
+24LC32A EEPROM   | `#define EEPROM_I2C_24LC32A`    | <https://www.microchip.com/en-us/product/24LC32A>
+24LC64 EEPROM    | `#define EEPROM_I2C_24LC64`     | <https://www.microchip.com/en-us/product/24LC64>
+24LC128 EEPROM   | `#define EEPROM_I2C_24LC128`    | <https://www.microchip.com/en-us/product/24LC128>
 24LC256 EEPROM   | `#define EEPROM_I2C_24LC256`    | <https://www.sparkfun.com/products/525>
 MB85RC256V FRAM  | `#define EEPROM_I2C_MB85RC256V` | <https://www.adafruit.com/product/1895>
 
diff --git a/drivers/eeprom/eeprom_i2c.h b/drivers/eeprom/eeprom_i2c.h
index 77eea66d63..85317c9ea5 100644
--- a/drivers/eeprom/eeprom_i2c.h
+++ b/drivers/eeprom/eeprom_i2c.h
@@ -54,6 +54,11 @@
 #    define EXTERNAL_EEPROM_PAGE_SIZE 32
 #    define EXTERNAL_EEPROM_ADDRESS_SIZE 2
 #    define EXTERNAL_EEPROM_WRITE_TIME 5
+#elif defined(EEPROM_I2C_24LC32A)
+#    define EXTERNAL_EEPROM_BYTE_COUNT 4096
+#    define EXTERNAL_EEPROM_PAGE_SIZE 32
+#    define EXTERNAL_EEPROM_ADDRESS_SIZE 2
+#    define EXTERNAL_EEPROM_WRITE_TIME 5
 #elif defined(EEPROM_I2C_MB85RC256V)
 #    define EXTERNAL_EEPROM_BYTE_COUNT 32768
 #    define EXTERNAL_EEPROM_PAGE_SIZE 128

From 08c556b78b9dc672a2aa2388bbd3fdf408e3ce98 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 5 Jun 2022 10:26:02 +1000
Subject: [PATCH 010/959] Add keymap wrappers for introspection into the
 keymap. (#17229)

* Introspection handlers for keymaps.

* Renaming.
---
 builddefs/build_keyboard.mk    |  4 +++-
 quantum/keymap.h               |  2 ++
 quantum/keymap_introspection.c | 25 +++++++++++++++++++++++++
 quantum/keymap_introspection.h | 15 +++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 quantum/keymap_introspection.c
 create mode 100644 quantum/keymap_introspection.h

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index dc86b232df..a258f33216 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -390,10 +390,12 @@ ifneq ("$(KEYMAP_H)","")
     CONFIG_H += $(KEYMAP_H)
 endif
 
+OPT_DEFS += -DKEYMAP_C=\"$(KEYMAP_C)\"
+
 # project specific files
 SRC += \
     $(KEYBOARD_SRC) \
-    $(KEYMAP_C) \
+    $(QUANTUM_DIR)/keymap_introspection.c \
     $(QUANTUM_SRC) \
     $(QUANTUM_DIR)/main.c \
 
diff --git a/quantum/keymap.h b/quantum/keymap.h
index d64b271efb..081bc54ebe 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -55,3 +55,5 @@ extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
 // Ensure we have a forward declaration for the encoder map
 #    include "encoder.h"
 #endif
+
+#include "keymap_introspection.h"
diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c
new file mode 100644
index 0000000000..9628b41eef
--- /dev/null
+++ b/quantum/keymap_introspection.c
@@ -0,0 +1,25 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Pull the actual keymap code so that we can inspect stuff from it
+#include KEYMAP_C
+
+#include "keymap_introspection.h"
+
+#define NUM_KEYMAP_LAYERS ((uint8_t)(sizeof(keymaps) / ((MATRIX_ROWS) * (MATRIX_COLS) * sizeof(uint16_t))))
+
+uint8_t keymap_layer_count(void) {
+    return NUM_KEYMAP_LAYERS;
+}
+
+#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
+
+#    define NUM_ENCODERMAP_LAYERS ((uint8_t)(sizeof(encoder_map) / ((NUM_ENCODERS) * (2) * sizeof(uint16_t))))
+
+uint8_t encodermap_layer_count(void) {
+    return NUM_ENCODERMAP_LAYERS;
+}
+
+_Static_assert(NUM_KEYMAP_LAYERS == NUM_ENCODERMAP_LAYERS, "Number of encoder_map layers doesn't match the number of keymap layers");
+
+#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h
new file mode 100644
index 0000000000..23f6f2016f
--- /dev/null
+++ b/quantum/keymap_introspection.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <stdint.h>
+
+// Get the number of layers defined in the keymap
+uint8_t keymap_layer_count(void);
+
+#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
+
+// Get the number of layers defined in the encoder map
+uint8_t encodermap_layer_count(void);
+
+#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)

From e89478eb0fe582d1a30a882e278927e31c9cdcc7 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 6 Jun 2022 00:47:22 +0200
Subject: [PATCH 011/959] [Core] Update C standard to GNU11, C++ to GNU++14
 (#17114)

---
 builddefs/common_rules.mk       | 117 +++-----------------------------
 platforms/arm_atsam/platform.mk |   2 +-
 platforms/avr/platform.mk       |   2 +-
 platforms/test/platform.mk      |   2 +-
 4 files changed, 13 insertions(+), 110 deletions(-)

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index d3acddc87b..6573257c78 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -1,19 +1,5 @@
 # Hey Emacs, this is a -*- makefile -*-
 #----------------------------------------------------------------------------
-# WinAVR Makefile Template written by Eric B. Weddington, Jg Wunsch, et al.
-#
-# Released to the Public Domain
-#
-# Additional material for this makefile was written by:
-# Peter Fleury
-# Tim Henigan
-# Colin O'Flynn
-# Reiner Patommel
-# Markus Pfaff
-# Sander Pool
-# Frederik Rouleau
-# Carlos Lamas
-#
 
 # Enable vpath seraching for source files only
 # Without this, output files, could be read from the wrong .build directories
@@ -38,36 +24,15 @@ NO_LTO_OBJ := $(filter %.a,$(OBJ))
 
 MASTER_OUTPUT := $(firstword $(OUTPUTS))
 
-
-
 # Output format. (can be srec, ihex, binary)
 FORMAT = ihex
 
 # Optimization level, can be [0, 1, 2, 3, s].
-#     0 = turn off optimization. s = optimize for size.
-#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
 OPT ?= s
 
-# Compiler flag to set the C Standard level.
-#     c89   = "ANSI" C
-#     gnu89 = c89 plus GCC extensions
-#     c99   = ISO C99 standard (not yet fully implemented)
-#     gnu99 = c99 plus GCC extensions
-CSTANDARD = -std=gnu99
-
-
-# Place -D or -U options here for C sources
-#CDEFS +=
-
-
-# Place -D or -U options here for ASM sources
-#ADEFS +=
-
-
-# Place -D or -U options here for C++ sources
-#CXXDEFS += -D__STDC_LIMIT_MACROS
-#CXXDEFS += -D__STDC_CONSTANT_MACROS
-#CXXDEFS +=
+# Compiler flag to set the C and C++ language standard level
+CSTANDARD = -std=gnu11
+CXXSTANDARD = -std=gnu++14
 
 # Speed up recompilations by opt-in usage of ccache
 USE_CCACHE ?= no
@@ -75,12 +40,8 @@ ifneq ($(USE_CCACHE),no)
     CC_PREFIX ?= ccache
 endif
 
-#---------------- Compiler Options C ----------------
-#  -g*:          generate debugging information
-#  -O*:          optimization level
-#  -f...:        tuning, see GCC manual and avr-libc documentation
-#  -Wall...:     warning level
-#  -Wa,...:      tell GCC to pass this to the assembler.
+#---------------- C Compiler Options ----------------
+
 ifeq ($(strip $(LTO_ENABLE)), yes)
     ifeq ($(PLATFORM),ARM_ATSAM)
         $(info Enabling LTO on arm_atsam-targeting boards is known to have a high likelihood of failure.)
@@ -111,23 +72,14 @@ CFLAGS += -Wstrict-prototypes
 ifneq ($(strip $(ALLOW_WARNINGS)), yes)
     CFLAGS += -Werror
 endif
-#CFLAGS += -mshort-calls
-#CFLAGS += -fno-unit-at-a-time
-#CFLAGS += -Wundef
-#CFLAGS += -Wunreachable-code
-#CFLAGS += -Wsign-compare
 CFLAGS += $(CSTANDARD)
 
 # This fixes lots of keyboards linking errors but SHOULDN'T BE A FINAL SOLUTION
 # Fixing of multiple variable definitions must be made.
 CFLAGS += -fcommon
 
-#---------------- Compiler Options C++ ----------------
-#  -g*:          generate debugging information
-#  -O*:          optimization level
-#  -f...:        tuning, see GCC manual and avr-libc documentation
-#  -Wall...:     warning level
-#  -Wa,...:      tell GCC to pass this to the assembler.
+#---------------- C++ Compiler Options ----------------
+
 ifeq ($(strip $(DEBUG_ENABLE)),yes)
   CXXFLAGS += -g$(DEBUG)
 endif
@@ -141,57 +93,17 @@ CXXFLAGS += -Wundef
 ifneq ($(strip $(ALLOW_WARNINGS)), yes)
     CXXFLAGS += -Werror
 endif
-#CXXFLAGS += -mshort-calls
-#CXXFLAGS += -fno-unit-at-a-time
-#CXXFLAGS += -Wstrict-prototypes
-#CXXFLAGS += -Wunreachable-code
-#CXXFLAGS += -Wsign-compare
-#CXXFLAGS += $(CSTANDARD)
 
 #---------------- Assembler Options ----------------
+
 ASFLAGS += $(ADEFS)
 ifeq ($(VERBOSE_AS_CMD),yes)
 	ASFLAGS += -v
 endif
 
-#---------------- Library Options ----------------
-# Minimalistic printf version
-PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
-
-# Floating point printf version (requires MATH_LIB = -lm below)
-PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
-
-# If this is left blank, then it will use the Standard printf version.
-PRINTF_LIB =
-#PRINTF_LIB = $(PRINTF_LIB_MIN)
-#PRINTF_LIB = $(PRINTF_LIB_FLOAT)
-
-
-# Minimalistic scanf version
-SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
-
-# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
-SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
-
-# If this is left blank, then it will use the Standard scanf version.
-SCANF_LIB =
-#SCANF_LIB = $(SCANF_LIB_MIN)
-#SCANF_LIB = $(SCANF_LIB_FLOAT)
-
-
-MATH_LIB = -lm
-CREATE_MAP ?= yes
-
-
 #---------------- Linker Options ----------------
-#  -Wl,...:     tell GCC to pass this to linker.
-#    -Map:      create map file
-#    --cref:    add cross reference to  map file
-#
-# Comennt out "--relax" option to avoid a error such:
-# 	(.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12'
-#
 
+CREATE_MAP ?= yes
 ifeq ($(CREATE_MAP),yes)
 	LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
 endif
@@ -201,20 +113,11 @@ endif
 #LDFLAGS += -Wl,--relax
 LDFLAGS += $(EXTMEMOPTS)
 LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
-LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
-#LDFLAGS += -T linker_script.x
+LDFLAGS += -lm
 # You can give EXTRALDFLAGS at 'make' command line.
 LDFLAGS += $(EXTRALDFLAGS)
 
 #---------------- Assembler Listings ----------------
-#  -Wa,...:   tell GCC to pass this to the assembler.
-#  -adhlns:   create listing
-#  -gstabs:   have the assembler create line number information; note that
-#             for use in COFF files, additional information about filenames
-#             and function names needs to be present in the assembler source
-#             files -- see avr-libc docs [FIXME: not yet described there]
-#  -listing-cont-lines: Sets the maximum number of continuation lines of hex
-#       dump that will be displayed for a given single line of source input.
 
 ADHLNS_ENABLE ?= no
 ifeq ($(ADHLNS_ENABLE),yes)
diff --git a/platforms/arm_atsam/platform.mk b/platforms/arm_atsam/platform.mk
index b49bf764d7..9618838dc3 100644
--- a/platforms/arm_atsam/platform.mk
+++ b/platforms/arm_atsam/platform.mk
@@ -30,7 +30,7 @@ COMPILEFLAGS += -mthumb
 CFLAGS += $(COMPILEFLAGS)
 
 CXXFLAGS += $(COMPILEFLAGS)
-CXXFLAGS += -fno-exceptions -std=c++11
+CXXFLAGS += -fno-exceptions $(CXXSTANDARD)
 
 LDFLAGS +=-Wl,--gc-sections
 LDFLAGS += -Wl,-Map="%OUT%%PROJ_NAME%.map"
diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index 978199b385..b51a94c93a 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -38,7 +38,7 @@ CFLAGS += -fno-inline-small-functions
 CFLAGS += -fno-strict-aliasing
 
 CXXFLAGS += $(COMPILEFLAGS)
-CXXFLAGS += -fno-exceptions -std=c++11
+CXXFLAGS += -fno-exceptions $(CXXSTANDARD)
 
 LDFLAGS += -Wl,--gc-sections
 
diff --git a/platforms/test/platform.mk b/platforms/test/platform.mk
index eb2424ec5c..f07c863e69 100644
--- a/platforms/test/platform.mk
+++ b/platforms/test/platform.mk
@@ -31,4 +31,4 @@ CFLAGS += -fno-strict-aliasing
 
 CXXFLAGS += $(COMPILEFLAGS)
 CXXFLAGS += -fno-exceptions
-CXXFLAGS += -std=gnu++11
+CXXFLAGS += $(CXXSTANDARD)

From 85b3b98570262b97851b726a31819e8864ff1bb3 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Mon, 6 Jun 2022 01:33:32 +0100
Subject: [PATCH 012/959] Move SPLIT_HAND_PIN setup to split_pre_init (#17271)

* Move SPLIT_HAND_PIN setup to split_pre_init

* doppelganger should use old behaviour

* Add comment for future

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/doppelganger/doppelganger.c | 36 ++++++++++++++++-----------
 quantum/split_common/split_util.c     |  5 +++-
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/keyboards/doppelganger/doppelganger.c b/keyboards/doppelganger/doppelganger.c
index 04d19480da..304d764028 100644
--- a/keyboards/doppelganger/doppelganger.c
+++ b/keyboards/doppelganger/doppelganger.c
@@ -15,25 +15,31 @@
  */
 #include "doppelganger.h"
 
-void keyboard_pre_init_kb (void) {
-  setPinOutput(C6);
-  setPinOutput(B0);
+void keyboard_pre_init_kb(void) {
+    setPinOutput(C6);
+    setPinOutput(B0);
 }
 
 bool led_update_kb(led_t led_state) {
-  bool res = led_update_user(led_state);
-  if(res) {
-    // writePin sets the pin high for 1 and low for 0.
-    // In this example the pins are inverted, setting
-    // it low/0 turns it on, and high/1 turns the LED off.
-    // This behavior depends on whether the LED is between the pin
-    // and VCC or the pin and GND.
-    writePin(C6, !led_state.caps_lock);
-  }
-  return res;
+    bool res = led_update_user(led_state);
+    if (res) {
+        // writePin sets the pin high for 1 and low for 0.
+        // In this example the pins are inverted, setting
+        // it low/0 turns it on, and high/1 turns the LED off.
+        // This behavior depends on whether the LED is between the pin
+        // and VCC or the pin and GND.
+        writePin(C6, !led_state.caps_lock);
+    }
+    return res;
 }
 
 __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
-  writePin(B0, !(state & (1UL << 1)));
-  return state;
+    writePin(B0, !(state & (1UL << 1)));
+    return state;
+}
+
+// Override core logic as we reuse SPLIT_HAND_PIN within matrix pins
+bool is_keyboard_left(void) {
+    setPinInput(SPLIT_HAND_PIN);
+    return readPin(SPLIT_HAND_PIN);
 }
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 8b11e51374..48b9cce6d4 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -94,7 +94,6 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
 __attribute__((weak)) bool is_keyboard_left(void) {
 #if defined(SPLIT_HAND_PIN)
     // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
-    setPinInput(SPLIT_HAND_PIN);
 #    ifdef SPLIT_HAND_PIN_LOW_IS_LEFT
     return !readPin(SPLIT_HAND_PIN);
 #    else
@@ -133,6 +132,10 @@ __attribute__((weak)) bool is_keyboard_master(void) {
 
 // this code runs before the keyboard is fully initialized
 void split_pre_init(void) {
+#if defined(SPLIT_HAND_PIN)
+    setPinInput(SPLIT_HAND_PIN);
+    wait_us(100);
+#endif
     isLeftHand = is_keyboard_left();
 
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT)

From 1085500e894d9d31c4e97e7f1b74091bb9043a91 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 8 Jun 2022 09:42:35 +1000
Subject: [PATCH 013/959] Rework paths for eeprom locations. (#17326)

* Rework paths for eeprom locations.

* File relocation.

* Wrong file move.

* Fixup test paths.
---
 builddefs/common_features.mk                  | 24 +++++++------------
 .../{ => drivers/eeprom}/eeprom_stm32.c       |  0
 .../{ => drivers/eeprom}/eeprom_stm32.h       |  0
 .../{ => drivers/eeprom}/eeprom_stm32_defs.h  |  0
 .../{ => drivers/eeprom}/eeprom_teensy.c      |  0
 .../{ => drivers/eeprom}/eeprom_teensy.h      |  0
 .../chibios/{ => drivers/flash}/flash_stm32.c |  0
 .../chibios/{ => drivers/flash}/flash_stm32.h |  0
 platforms/test/rules.mk                       |  5 ++--
 9 files changed, 12 insertions(+), 17 deletions(-)
 rename platforms/chibios/{ => drivers/eeprom}/eeprom_stm32.c (100%)
 rename platforms/chibios/{ => drivers/eeprom}/eeprom_stm32.h (100%)
 rename platforms/chibios/{ => drivers/eeprom}/eeprom_stm32_defs.h (100%)
 rename platforms/chibios/{ => drivers/eeprom}/eeprom_teensy.c (100%)
 rename platforms/chibios/{ => drivers/eeprom}/eeprom_teensy.h (100%)
 rename platforms/chibios/{ => drivers/flash}/flash_stm32.c (100%)
 rename platforms/chibios/{ => drivers/flash}/flash_stm32.h (100%)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 631558ef27..ff0c6b0cc6 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -160,27 +160,26 @@ ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
   $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
 else
   OPT_DEFS += -DEEPROM_ENABLE
+  COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
+  COMMON_VPATH += $(DRIVER_PATH)/eeprom
+  COMMON_VPATH += $(PLATFORM_COMMON_DIR)
   ifeq ($(strip $(EEPROM_DRIVER)), custom)
     # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
-    COMMON_VPATH += $(DRIVER_PATH)/eeprom
     SRC += eeprom_driver.c
   else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
     # External I2C EEPROM implementation
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
-    COMMON_VPATH += $(DRIVER_PATH)/eeprom
     QUANTUM_LIB_SRC += i2c_master.c
     SRC += eeprom_driver.c eeprom_i2c.c
   else ifeq ($(strip $(EEPROM_DRIVER)), spi)
     # External SPI EEPROM implementation
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
-    COMMON_VPATH += $(DRIVER_PATH)/eeprom
     QUANTUM_LIB_SRC += spi_master.c
     SRC += eeprom_driver.c eeprom_spi.c
   else ifeq ($(strip $(EEPROM_DRIVER)), transient)
     # Transient EEPROM implementation -- no data storage but provides runtime area for it
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-    COMMON_VPATH += $(DRIVER_PATH)/eeprom
     SRC += eeprom_driver.c eeprom_transient.c
   else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
     # Vendor-implemented EEPROM
@@ -191,17 +190,13 @@ else
       ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
         # Emulated EEPROM
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
-        COMMON_VPATH += $(DRIVER_PATH)/eeprom
-        SRC += eeprom_driver.c
-        SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
-        SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
+        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+        COMMON_VPATH += $(DRIVER_PATH)/flash
+        SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
         # True EEPROM on STM32L0xx, L1xx
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
-        COMMON_VPATH += $(DRIVER_PATH)/eeprom
-        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
-        SRC += eeprom_driver.c
-        SRC += eeprom_stm32_L0_L1.c
+        SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
       else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
         # Teensy EEPROM implementations
         OPT_DEFS += -DEEPROM_TEENSY
@@ -209,17 +204,16 @@ else
       else
         # Fall back to transient, i.e. non-persistent
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-        COMMON_VPATH += $(DRIVER_PATH)/eeprom
         SRC += eeprom_driver.c eeprom_transient.c
       endif
     else ifeq ($(PLATFORM),ARM_ATSAM)
       # arm_atsam EEPROM
       OPT_DEFS += -DEEPROM_SAMD
-      SRC += $(PLATFORM_COMMON_DIR)/eeprom_samd.c
+      SRC += eeprom_samd.c
     else ifeq ($(PLATFORM),TEST)
       # Test harness "EEPROM"
       OPT_DEFS += -DEEPROM_TEST_HARNESS
-      SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
+      SRC += eeprom.c
     endif
   endif
 endif
diff --git a/platforms/chibios/eeprom_stm32.c b/platforms/chibios/drivers/eeprom/eeprom_stm32.c
similarity index 100%
rename from platforms/chibios/eeprom_stm32.c
rename to platforms/chibios/drivers/eeprom/eeprom_stm32.c
diff --git a/platforms/chibios/eeprom_stm32.h b/platforms/chibios/drivers/eeprom/eeprom_stm32.h
similarity index 100%
rename from platforms/chibios/eeprom_stm32.h
rename to platforms/chibios/drivers/eeprom/eeprom_stm32.h
diff --git a/platforms/chibios/eeprom_stm32_defs.h b/platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h
similarity index 100%
rename from platforms/chibios/eeprom_stm32_defs.h
rename to platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h
diff --git a/platforms/chibios/eeprom_teensy.c b/platforms/chibios/drivers/eeprom/eeprom_teensy.c
similarity index 100%
rename from platforms/chibios/eeprom_teensy.c
rename to platforms/chibios/drivers/eeprom/eeprom_teensy.c
diff --git a/platforms/chibios/eeprom_teensy.h b/platforms/chibios/drivers/eeprom/eeprom_teensy.h
similarity index 100%
rename from platforms/chibios/eeprom_teensy.h
rename to platforms/chibios/drivers/eeprom/eeprom_teensy.h
diff --git a/platforms/chibios/flash_stm32.c b/platforms/chibios/drivers/flash/flash_stm32.c
similarity index 100%
rename from platforms/chibios/flash_stm32.c
rename to platforms/chibios/drivers/flash/flash_stm32.c
diff --git a/platforms/chibios/flash_stm32.h b/platforms/chibios/drivers/flash/flash_stm32.h
similarity index 100%
rename from platforms/chibios/flash_stm32.h
rename to platforms/chibios/drivers/flash/flash_stm32.h
diff --git a/platforms/test/rules.mk b/platforms/test/rules.mk
index 55512c7392..a2baa283d0 100644
--- a/platforms/test/rules.mk
+++ b/platforms/test/rules.mk
@@ -11,7 +11,8 @@ eeprom_stm32_large_DEFS := $(eeprom_stm32_DEFS) \
 	-DFEE_PAGE_COUNT=16
 
 eeprom_stm32_INC := \
-	$(PLATFORM_PATH)/chibios/
+	$(PLATFORM_PATH)/chibios/drivers/eeprom/ \
+	$(PLATFORM_PATH)/chibios/drivers/flash/
 eeprom_stm32_tiny_INC := $(eeprom_stm32_INC)
 eeprom_stm32_large_INC := $(eeprom_stm32_INC)
 
@@ -19,6 +20,6 @@ eeprom_stm32_SRC := \
 	$(TOP_DIR)/drivers/eeprom/eeprom_driver.c \
 	$(PLATFORM_PATH)/$(PLATFORM_KEY)/eeprom_stm32_tests.cpp \
 	$(PLATFORM_PATH)/$(PLATFORM_KEY)/flash_stm32_mock.c \
-	$(PLATFORM_PATH)/chibios/eeprom_stm32.c
+	$(PLATFORM_PATH)/chibios/drivers/eeprom/eeprom_stm32.c
 eeprom_stm32_tiny_SRC := $(eeprom_stm32_SRC)
 eeprom_stm32_large_SRC := $(eeprom_stm32_SRC)

From 0ab51ee29d6e980a50b27f122a10d0f7de4b1aed Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 8 Jun 2022 18:39:16 -0700
Subject: [PATCH 014/959] Add support for large Mouse Reports (#16371)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/config_options.md                        |  2 +
 docs/feature_pointing_device.md               |  1 +
 .../ploopyco/mouse/keymaps/drashna/config.h   |  2 +-
 quantum/pointing_device.c                     | 31 +++++++---
 quantum/pointing_device.h                     | 10 +++
 quantum/pointing_device_drivers.c             | 62 +++++++++++--------
 tmk_core/protocol/host.c                      |  5 ++
 tmk_core/protocol/report.h                    | 18 ++++--
 tmk_core/protocol/usb_descriptor.c            | 15 ++++-
 tmk_core/protocol/vusb/vusb.c                 | 16 ++++-
 10 files changed, 123 insertions(+), 39 deletions(-)

diff --git a/docs/config_options.md b/docs/config_options.md
index 8227a0e074..9aa360576a 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -174,6 +174,8 @@ If you define these options you will enable the associated feature, which may in
   * 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 MOUSE_EXTENDED_REPORT`
+  * Enables support for extended reports (-32767 to 32767, instead of -127 to 127), which may allow for smoother reporting, and prevent maxing out of the reports. Applies to both Pointing Device and Mousekeys.
 * `#define ONESHOT_TIMEOUT 300`
   * how long before oneshot times out
 * `#define ONESHOT_TAP_TOGGLE 2`
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 02c1e64a31..250e2843f6 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -259,6 +259,7 @@ The following configuration options are only available when using `SPLIT_POINTIN
 |`POINTING_DEVICE_ROTATION_270_RIGHT`    | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_ |
 |`POINTING_DEVICE_INVERT_X_RIGHT`        | (Optional) Inverts the X axis report.                                 | _not defined_ |
 |`POINTING_DEVICE_INVERT_Y_RIGHT`        | (Optional) Inverts the Y axis report.                                 | _not defined_ |
+|`MOUSE_EXTENDED_REPORT`                 | (Optional) Enables support for extended mouse reports. (-32767 to 32767, instead of just -127 to 127) |
 
 !> If there is a `_RIGHT` configuration option or callback, the [common configuration](feature_pointing_device.md?id=common-configuration) option will work for the left. For correct left/right detection you should setup a [handedness option](feature_split_keyboard?id=setting-handedness), `EE_HANDS` is usually a good option for an existing board that doesn't do handedness by hardware.
 
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/config.h b/keyboards/ploopyco/mouse/keymaps/drashna/config.h
index 9aa9a40769..1dc1b7695f 100644
--- a/keyboards/ploopyco/mouse/keymaps/drashna/config.h
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/config.h
@@ -28,4 +28,4 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 
-#define MOUSE_EXT_REPORT
+#define MOUSE_EXTENDED_REPORT
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index a160647890..3c2e2bc09d 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -177,7 +177,8 @@ __attribute__((weak)) void pointing_device_send(void) {
 report_mouse_t pointing_device_adjust_by_defines(report_mouse_t mouse_report) {
     // Support rotation of the sensor data
 #if defined(POINTING_DEVICE_ROTATION_90) || defined(POINTING_DEVICE_ROTATION_180) || defined(POINTING_DEVICE_ROTATION_270)
-    int8_t x = mouse_report.x, y = mouse_report.y;
+    mouse_xy_report_t x = mouse_report.x;
+    mouse_xy_report_t y = mouse_report.y;
 #    if defined(POINTING_DEVICE_ROTATION_90)
     mouse_report.x = y;
     mouse_report.y = -x;
@@ -347,7 +348,7 @@ void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) {
  * @param[in] int16_t value
  * @return int8_t clamped value
  */
-static inline int8_t pointing_device_movement_clamp(int16_t value) {
+static inline int8_t pointing_device_hv_clamp(int16_t value) {
     if (value < INT8_MIN) {
         return INT8_MIN;
     } else if (value > INT8_MAX) {
@@ -357,6 +358,21 @@ static inline int8_t pointing_device_movement_clamp(int16_t value) {
     }
 }
 
+/**
+ * @brief clamps int16_t to int8_t
+ *
+ * @param[in] clamp_range_t value
+ * @return mouse_xy_report_t clamped value
+ */
+static inline mouse_xy_report_t pointing_device_xy_clamp(clamp_range_t value) {
+    if (value < XY_REPORT_MIN) {
+        return XY_REPORT_MIN;
+    } else if (value > XY_REPORT_MAX) {
+        return XY_REPORT_MAX;
+    } else {
+        return value;
+    }
+}
 /**
  * @brief combines 2 mouse reports and returns 2
  *
@@ -369,10 +385,10 @@ static inline int8_t pointing_device_movement_clamp(int16_t value) {
  * @return combined report_mouse_t of left_report and right_report
  */
 report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, report_mouse_t right_report) {
-    left_report.x = pointing_device_movement_clamp((int16_t)left_report.x + right_report.x);
-    left_report.y = pointing_device_movement_clamp((int16_t)left_report.y + right_report.y);
-    left_report.h = pointing_device_movement_clamp((int16_t)left_report.h + right_report.h);
-    left_report.v = pointing_device_movement_clamp((int16_t)left_report.v + right_report.v);
+    left_report.x = pointing_device_xy_clamp((clamp_range_t)left_report.x + right_report.x);
+    left_report.y = pointing_device_xy_clamp((clamp_range_t)left_report.y + right_report.y);
+    left_report.h = pointing_device_hv_clamp((int16_t)left_report.h + right_report.h);
+    left_report.v = pointing_device_hv_clamp((int16_t)left_report.v + right_report.v);
     left_report.buttons |= right_report.buttons;
     return left_report;
 }
@@ -390,7 +406,8 @@ report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, repor
 report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report) {
     // Support rotation of the sensor data
 #    if defined(POINTING_DEVICE_ROTATION_90_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT)
-    int8_t x = mouse_report.x, y = mouse_report.y;
+    mouse_xy_report_t x = mouse_report.x;
+    mouse_xy_report_t y = mouse_report.y;
 #        if defined(POINTING_DEVICE_ROTATION_90_RIGHT)
     mouse_report.x = y;
     mouse_report.y = -x;
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 5c0eaeaf34..1e5ef9590c 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -75,6 +75,16 @@ typedef enum {
     POINTING_DEVICE_BUTTON8,
 } pointing_device_buttons_t;
 
+#ifdef MOUSE_EXTENDED_REPORT
+#    define XY_REPORT_MIN INT16_MIN
+#    define XY_REPORT_MAX INT16_MAX
+typedef int32_t clamp_range_t;
+#else
+#    define XY_REPORT_MIN INT8_MIN
+#    define XY_REPORT_MAX INT8_MAX
+typedef int16_t clamp_range_t;
+#endif
+
 void           pointing_device_init(void);
 void           pointing_device_task(void);
 void           pointing_device_send(void);
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 56363c7ac6..41d7018c86 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -22,8 +22,8 @@
 #include "timer.h"
 #include <stddef.h>
 
-// hid mouse reports cannot exceed -127 to 127, so constrain to that value
-#define constrain_hid(amt) ((amt) < -127 ? -127 : ((amt) > 127 ? 127 : (amt)))
+#define CONSTRAIN_HID(amt) ((amt) < INT8_MIN ? INT8_MIN : ((amt) > INT8_MAX ? INT8_MAX : (amt)))
+#define CONSTRAIN_HID_XY(amt) ((amt) < XY_REPORT_MIN ? XY_REPORT_MIN : ((amt) > XY_REPORT_MAX ? XY_REPORT_MAX : (amt)))
 
 // get_report functions should probably be moved to their respective drivers.
 #if defined(POINTING_DEVICE_DRIVER_adns5050)
@@ -35,8 +35,8 @@ report_mouse_t adns5050_get_report(report_mouse_t mouse_report) {
         if (debug_mouse) dprintf("Raw ] X: %d, Y: %d\n", data.dx, data.dy);
 #    endif
 
-        mouse_report.x = data.dx;
-        mouse_report.y = data.dy;
+        mouse_report.x = (mouse_xy_report_t)data.dx;
+        mouse_report.y = (mouse_xy_report_t)data.dy;
     }
 
     return mouse_report;
@@ -55,11 +55,8 @@ const pointing_device_driver_t pointing_device_driver = {
 report_mouse_t adns9800_get_report_driver(report_mouse_t mouse_report) {
     report_adns9800_t sensor_report = adns9800_get_report();
 
-    int8_t clamped_x = constrain_hid(sensor_report.x);
-    int8_t clamped_y = constrain_hid(sensor_report.y);
-
-    mouse_report.x = clamped_x;
-    mouse_report.y = clamped_y;
+    mouse_report.x = CONSTRAIN_HID_XY(sensor_report.x);
+    mouse_report.y = CONSTRAIN_HID_XY(sensor_report.y);
 
     return mouse_report;
 }
@@ -107,16 +104,16 @@ const pointing_device_driver_t pointing_device_driver = {
 #    endif
 
 report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
-    pinnacle_data_t touchData = cirque_pinnacle_read_data();
-    static uint16_t x = 0, y = 0, mouse_timer = 0;
-    int8_t          report_x = 0, report_y = 0;
-    static bool     is_z_down = false;
+    pinnacle_data_t   touchData = cirque_pinnacle_read_data();
+    static uint16_t   x = 0, y = 0, mouse_timer = 0;
+    mouse_xy_report_t report_x = 0, report_y = 0;
+    static bool       is_z_down = false;
 
     cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale()); // Scale coordinates to arbitrary X, Y resolution
 
     if (x && y && touchData.xValue && touchData.yValue) {
-        report_x = (int8_t)(touchData.xValue - x);
-        report_y = (int8_t)(touchData.yValue - y);
+        report_x = (mouse_xy_report_t)(touchData.xValue - x);
+        report_y = (mouse_xy_report_t)(touchData.yValue - y);
     }
     x = touchData.xValue;
     y = touchData.yValue;
@@ -157,11 +154,26 @@ const pointing_device_driver_t pointing_device_driver = {
 // clang-format on
 
 #elif defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
+
+mouse_xy_report_t pimoroni_trackball_adapt_values(clamp_range_t* offset) {
+    if (*offset > XY_REPORT_MAX) {
+        *offset -= XY_REPORT_MAX;
+        return (mouse_xy_report_t)XY_REPORT_MAX;
+    } else if (*offset < XY_REPORT_MIN) {
+        *offset += XY_REPORT_MAX;
+        return (mouse_xy_report_t)XY_REPORT_MIN;
+    } else {
+        mouse_xy_report_t temp_return = *offset;
+        *offset                       = 0;
+        return temp_return;
+    }
+}
+
 report_mouse_t pimoroni_trackball_get_report(report_mouse_t mouse_report) {
-    static uint16_t debounce      = 0;
-    static uint8_t  error_count   = 0;
-    pimoroni_data_t pimoroni_data = {0};
-    static int16_t  x_offset = 0, y_offset = 0;
+    static uint16_t      debounce      = 0;
+    static uint8_t       error_count   = 0;
+    pimoroni_data_t      pimoroni_data = {0};
+    static clamp_range_t x_offset = 0, y_offset = 0;
 
     if (error_count < PIMORONI_TRACKBALL_ERROR_COUNT) {
         i2c_status_t status = read_pimoroni_trackball(&pimoroni_data);
@@ -174,8 +186,8 @@ report_mouse_t pimoroni_trackball_get_report(report_mouse_t mouse_report) {
                 if (!debounce) {
                     x_offset += pimoroni_trackball_get_offsets(pimoroni_data.right, pimoroni_data.left, PIMORONI_TRACKBALL_SCALE);
                     y_offset += pimoroni_trackball_get_offsets(pimoroni_data.down, pimoroni_data.up, PIMORONI_TRACKBALL_SCALE);
-                    pimoroni_trackball_adapt_values(&mouse_report.x, &x_offset);
-                    pimoroni_trackball_adapt_values(&mouse_report.y, &y_offset);
+                    mouse_report.x = pimoroni_trackball_adapt_values(&x_offset);
+                    mouse_report.y = pimoroni_trackball_adapt_values(&y_offset);
                 } else {
                     debounce--;
                 }
@@ -221,8 +233,8 @@ report_mouse_t pmw3360_get_report(report_mouse_t mouse_report) {
 #    endif
             MotionStart = timer_read();
         }
-        mouse_report.x = constrain_hid(data.dx);
-        mouse_report.y = constrain_hid(data.dy);
+        mouse_report.x = CONSTRAIN_HID_XY(data.dx);
+        mouse_report.y = CONSTRAIN_HID_XY(data.dy);
     }
 
     return mouse_report;
@@ -259,8 +271,8 @@ report_mouse_t pmw3389_get_report(report_mouse_t mouse_report) {
 #    endif
             MotionStart = timer_read();
         }
-        mouse_report.x = constrain_hid(data.dx);
-        mouse_report.y = constrain_hid(data.dy);
+        mouse_report.x = CONSTRAIN_HID_XY(data.dx);
+        mouse_report.y = CONSTRAIN_HID_XY(data.dy);
     }
 
     return mouse_report;
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 053d2b79e3..3d8604d541 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -93,6 +93,11 @@ void host_mouse_send(report_mouse_t *report) {
     if (!driver) return;
 #ifdef MOUSE_SHARED_EP
     report->report_id = REPORT_ID_MOUSE;
+#endif
+#ifdef MOUSE_EXTENDED_REPORT
+    // clip and copy to Boot protocol XY
+    report->boot_x = (report->x > 127) ? 127 : ((report->x < -127) ? -127 : report->x);
+    report->boot_y = (report->y > 127) ? 127 : ((report->y < -127) ? -127 : report->y);
 #endif
     (*driver->send_mouse)(report);
 }
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 7bbeb78af7..735ccdb4a1 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -201,15 +201,25 @@ typedef struct {
     uint32_t usage;
 } __attribute__((packed)) report_programmable_button_t;
 
+#ifdef MOUSE_EXTENDED_REPORT
+typedef int16_t mouse_xy_report_t;
+#else
+typedef int8_t mouse_xy_report_t;
+#endif
+
 typedef struct {
 #ifdef MOUSE_SHARED_EP
     uint8_t report_id;
 #endif
     uint8_t buttons;
-    int8_t  x;
-    int8_t  y;
-    int8_t  v;
-    int8_t  h;
+#ifdef MOUSE_EXTENDED_REPORT
+    int8_t boot_x;
+    int8_t boot_y;
+#endif
+    mouse_xy_report_t x;
+    mouse_xy_report_t y;
+    int8_t            v;
+    int8_t            h;
 } __attribute__((packed)) report_mouse_t;
 
 typedef struct {
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index 063bd2c3f1..52e3276d35 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -126,14 +126,27 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
             HID_RI_REPORT_SIZE(8, 0x01),
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
 
-            // X/Y position (2 bytes)
+#    ifdef MOUSE_EXTENDED_REPORT
+            // Boot protocol XY ignored in Report protocol
+            HID_RI_REPORT_COUNT(8, 0x02),
+            HID_RI_REPORT_SIZE(8, 0x08),
+            HID_RI_INPUT(8, HID_IOF_CONSTANT),
+#    endif
+            // X/Y position (2 or 4 bytes)
             HID_RI_USAGE_PAGE(8, 0x01),    // Generic Desktop
             HID_RI_USAGE(8, 0x30),         // X
             HID_RI_USAGE(8, 0x31),         // Y
+#    ifndef MOUSE_EXTENDED_REPORT
             HID_RI_LOGICAL_MINIMUM(8, -127),
             HID_RI_LOGICAL_MAXIMUM(8, 127),
             HID_RI_REPORT_COUNT(8, 0x02),
             HID_RI_REPORT_SIZE(8, 0x08),
+#    else
+            HID_RI_LOGICAL_MINIMUM(16, -32767),
+            HID_RI_LOGICAL_MAXIMUM(16,  32767),
+            HID_RI_REPORT_COUNT(8, 0x02),
+            HID_RI_REPORT_SIZE(8, 0x10),
+#    endif
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
 
             // Vertical wheel (1 byte)
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index ebde955d3b..d07cc0d27e 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -482,14 +482,28 @@ const PROGMEM uchar shared_hid_report[] = {
     0x75, 0x01, //     Report Size (1)
     0x81, 0x02, //     Input (Data, Variable, Absolute)
 
-    // X/Y position (2 bytes)
+#    ifdef MOUSE_EXTENDED_REPORT
+    // Boot protocol XY ignored in Report protocol
+    0x95, 0x02, //     Report Count (2)
+    0x75, 0x08, //     Report Size (8)
+    0x81, 0x03, //     Input (Constant)
+#    endif
+
+    // X/Y position (2 or 4 bytes)
     0x05, 0x01, //     Usage Page (Generic Desktop)
     0x09, 0x30, //     Usage (X)
     0x09, 0x31, //     Usage (Y)
+#    ifndef MOUSE_EXTENDED_REPORT
     0x15, 0x81, //     Logical Minimum (-127)
     0x25, 0x7F, //     Logical Maximum (127)
     0x95, 0x02, //     Report Count (2)
     0x75, 0x08, //     Report Size (8)
+#    else
+    0x16, 0x01, 0x80, // Logical Minimum (-32767)
+    0x26, 0xFF, 0x7F, // Logical Maximum (32767)
+    0x95, 0x02,       // Report Count (2)
+    0x75, 0x10,       // Report Size (16)
+#    endif
     0x81, 0x06, //     Input (Data, Variable, Relative)
 
     // Vertical wheel (1 byte)

From d2abfaeacdd4d35b8b3dca8487f0f0149fe33aa3 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 9 Jun 2022 11:09:00 -0600
Subject: [PATCH 015/959] Fixup Pimoroni trackball code (#17335)

---
 drivers/sensors/pimoroni_trackball.c | 13 -------------
 drivers/sensors/pimoroni_trackball.h |  1 -
 2 files changed, 14 deletions(-)

diff --git a/drivers/sensors/pimoroni_trackball.c b/drivers/sensors/pimoroni_trackball.c
index 333e017a06..88a351316b 100644
--- a/drivers/sensors/pimoroni_trackball.c
+++ b/drivers/sensors/pimoroni_trackball.c
@@ -95,16 +95,3 @@ int16_t pimoroni_trackball_get_offsets(uint8_t negative_dir, uint8_t positive_di
     uint16_t magnitude = (scale * offset * offset * precision) >> 7;
     return isnegative ? -(int16_t)(magnitude) : (int16_t)(magnitude);
 }
-
-void pimoroni_trackball_adapt_values(int8_t* mouse, int16_t* offset) {
-    if (*offset > 127) {
-        *mouse = 127;
-        *offset -= 127;
-    } else if (*offset < -127) {
-        *mouse = -127;
-        *offset += 127;
-    } else {
-        *mouse  = *offset;
-        *offset = 0;
-    }
-}
diff --git a/drivers/sensors/pimoroni_trackball.h b/drivers/sensors/pimoroni_trackball.h
index e20ee748a7..749f381bbd 100644
--- a/drivers/sensors/pimoroni_trackball.h
+++ b/drivers/sensors/pimoroni_trackball.h
@@ -52,7 +52,6 @@ typedef struct {
 void         pimoroni_trackball_device_init(void);
 void         pimoroni_trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
 int16_t      pimoroni_trackball_get_offsets(uint8_t negative_dir, uint8_t positive_dir, uint8_t scale);
-void         pimoroni_trackball_adapt_values(int8_t* mouse, int16_t* offset);
 uint16_t     pimoroni_trackball_get_cpi(void);
 void         pimoroni_trackball_set_cpi(uint16_t cpi);
 i2c_status_t read_pimoroni_trackball(pimoroni_data_t* data);

From 0fd08da806711112147cd6c3b9bdee0250f9f103 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Sat, 11 Jun 2022 01:20:01 +0100
Subject: [PATCH 016/959] Scale brigthness for VIA (#17352)

Co-authored-by: yiancar <yiancar@gmail.com>
---
 quantum/via.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/quantum/via.c b/quantum/via.c
index 320bd5546d..a37bd38da8 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -64,6 +64,7 @@ void via_qmk_rgblight_get_value(uint8_t *data);
 #endif
 
 #if defined(VIA_QMK_RGB_MATRIX_ENABLE)
+#    include <lib/lib8tion/lib8tion.h>
 void via_qmk_rgb_matrix_set_value(uint8_t *data);
 void via_qmk_rgb_matrix_get_value(uint8_t *data);
 void eeconfig_update_rgb_matrix(void);
@@ -421,7 +422,7 @@ void via_qmk_backlight_get_value(uint8_t *data) {
     switch (*value_id) {
         case id_qmk_backlight_brightness: {
             // level / BACKLIGHT_LEVELS * 255
-            value_data[0] = ((uint16_t)get_backlight_level()) * 255 / BACKLIGHT_LEVELS;
+            value_data[0] = ((uint16_t)get_backlight_level() * UINT8_MAX) / BACKLIGHT_LEVELS;
             break;
         }
         case id_qmk_backlight_effect: {
@@ -441,7 +442,7 @@ void via_qmk_backlight_set_value(uint8_t *data) {
     switch (*value_id) {
         case id_qmk_backlight_brightness: {
             // level / 255 * BACKLIGHT_LEVELS
-            backlight_level_noeeprom(((uint16_t)value_data[0]) * BACKLIGHT_LEVELS / 255);
+            backlight_level_noeeprom(((uint16_t)value_data[0] * BACKLIGHT_LEVELS) / UINT8_MAX);
             break;
         }
         case id_qmk_backlight_effect: {
@@ -466,7 +467,7 @@ void via_qmk_rgblight_get_value(uint8_t *data) {
     uint8_t *value_data = &(data[1]);
     switch (*value_id) {
         case id_qmk_rgblight_brightness: {
-            value_data[0] = rgblight_get_val();
+            value_data[0] = ((uint16_t)rgblight_get_val() * UINT8_MAX) / RGBLIGHT_LIMIT_VAL;
             break;
         }
         case id_qmk_rgblight_effect: {
@@ -490,7 +491,7 @@ void via_qmk_rgblight_set_value(uint8_t *data) {
     uint8_t *value_data = &(data[1]);
     switch (*value_id) {
         case id_qmk_rgblight_brightness: {
-            rgblight_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
+            rgblight_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), ((uint16_t)value_data[0] * RGBLIGHT_LIMIT_VAL) / UINT8_MAX;
             break;
         }
         case id_qmk_rgblight_effect: {
@@ -557,7 +558,7 @@ void via_qmk_rgb_matrix_get_value(uint8_t *data) {
     uint8_t *value_data = &(data[1]);
     switch (*value_id) {
         case id_qmk_rgblight_brightness:
-            value_data[0] = rgb_matrix_get_val();
+            value_data[0] = ((uint16_t)rgb_matrix_get_val() * UINT8_MAX) / RGB_MATRIX_MAXIMUM_BRIGHTNESS;
             break;
         case id_qmk_rgblight_effect:
             value_data[0] = rgb_matrix_get_mode();
@@ -577,7 +578,7 @@ void via_qmk_rgb_matrix_set_value(uint8_t *data) {
     uint8_t *value_data = &(data[1]);
     switch (*value_id) {
         case id_qmk_rgblight_brightness:
-            rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), value_data[0]);
+            rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), scale8(value_data[0], RGB_MATRIX_MAXIMUM_BRIGHTNESS));
             break;
         case id_qmk_rgblight_effect:
             rgb_matrix_mode_noeeprom(value_data[0]);

From 568924c76cb29620e2cb7d2f2f5b1beddf8cf623 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sat, 11 Jun 2022 03:07:58 +0100
Subject: [PATCH 017/959] Add missing bracket for VIA brightness scaling
 (#17354)

---
 quantum/via.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/via.c b/quantum/via.c
index a37bd38da8..1ded1f5fe8 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -491,7 +491,7 @@ void via_qmk_rgblight_set_value(uint8_t *data) {
     uint8_t *value_data = &(data[1]);
     switch (*value_id) {
         case id_qmk_rgblight_brightness: {
-            rgblight_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), ((uint16_t)value_data[0] * RGBLIGHT_LIMIT_VAL) / UINT8_MAX;
+            rgblight_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), ((uint16_t)value_data[0] * RGBLIGHT_LIMIT_VAL) / UINT8_MAX);
             break;
         }
         case id_qmk_rgblight_effect: {

From 80034a847fdfe91cf0d6ef9399d34d90c15d8a54 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 10 Jun 2022 22:01:46 -0700
Subject: [PATCH 018/959] Ensure that rgb+via compiles in all cases (#17355)

---
 quantum/via.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/quantum/via.c b/quantum/via.c
index 1ded1f5fe8..d2ef0862cc 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -461,6 +461,9 @@ void via_qmk_backlight_set_value(uint8_t *data) {
 #endif // #if defined(VIA_QMK_BACKLIGHT_ENABLE)
 
 #if defined(VIA_QMK_RGBLIGHT_ENABLE)
+#    ifndef RGBLIGHT_LIMIT_VAL
+#        define RGBLIGHT_LIMIT_VAL 255
+#    endif
 
 void via_qmk_rgblight_get_value(uint8_t *data) {
     uint8_t *value_id   = &(data[0]);
@@ -518,6 +521,11 @@ void via_qmk_rgblight_set_value(uint8_t *data) {
 
 #if defined(VIA_QMK_RGB_MATRIX_ENABLE)
 
+#    if !defined(RGB_MATRIX_MAXIMUM_BRIGHTNESS) || RGB_MATRIX_MAXIMUM_BRIGHTNESS > UINT8_MAX
+#        undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS UINT8_MAX
+#    endif
+
 // VIA supports only 4 discrete values for effect speed; map these to some
 // useful speed values for RGB Matrix.
 enum speed_values {

From af6435d44d6fb1a6343d26a9783d3be5572c7ccc Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 12 Jun 2022 04:10:09 +1000
Subject: [PATCH 019/959] `qmk doctor`: show arch for macOS (#17356)

---
 lib/python/qmk/cli/doctor/macos.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/doctor/macos.py b/lib/python/qmk/cli/doctor/macos.py
index 00fb272858..5d088c9492 100644
--- a/lib/python/qmk/cli/doctor/macos.py
+++ b/lib/python/qmk/cli/doctor/macos.py
@@ -8,6 +8,6 @@ from .check import CheckStatus
 def os_test_macos():
     """Run the Mac specific tests.
     """
-    cli.log.info("Detected {fg_cyan}macOS %s{fg_reset}.", platform.mac_ver()[0])
+    cli.log.info("Detected {fg_cyan}macOS %s (%s){fg_reset}.", platform.mac_ver()[0], 'Apple Silicon' if platform.processor() == 'arm' else 'Intel')
 
     return CheckStatus.OK

From 0d64038b73a45cd4f873112cfa2679728df9b9ce Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 13 Jun 2022 09:17:24 +1000
Subject: [PATCH 020/959] Update LUFA submodule (#17368)

---
 lib/lufa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lufa b/lib/lufa
index 19a5d533f0..35cc3d92f5 160000
--- a/lib/lufa
+++ b/lib/lufa
@@ -1 +1 @@
-Subproject commit 19a5d533f02a7b46eeadca99cc9699659cef7a60
+Subproject commit 35cc3d92f557bc8874ca602d2f22642d77cfe129

From 1706da9054f8c4aa77493062a8937a7b64970a9e Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Mon, 13 Jun 2022 22:12:55 +0200
Subject: [PATCH 021/959] tap-dance: Restructure code and document in more
 detail (#16394)

---
 builddefs/build_test.mk                       |   2 +-
 docs/feature_tap_dance.md                     | 143 +++++---
 docs/ja/feature_tap_dance.md                  |   1 -
 .../slice/rev1/keymaps/2moons/keymap.c        |   4 +-
 .../rev1_rgb/keymaps/2moons_rgb/keymap.c      |   4 +-
 .../frosty_flake/keymaps/nikchi/config.h      |   1 +
 .../frosty_flake/keymaps/nikchi/keymap.c      |  32 +-
 .../keymaps/nikchi/variableTapDance.md        |   5 +-
 .../duck/lightsaver/keymaps/rasmus/keymap.c   |   4 +-
 .../ergodox_ez/keymaps/hacker_dvorak/config.h |   1 +
 .../tap_dance/tap_dance_actions.c             |  38 ++-
 .../gergoplex/keymaps/georgepetri/config.h    |   2 +
 .../gergoplex/keymaps/georgepetri/keymap.c    |  11 +-
 .../handwired/ortho5x14/keymaps/2u/keymap.c   |   6 +-
 .../ortho5x14/keymaps/split1/keymap.c         |   6 +-
 .../jones/v03/keymaps/default_jp/config.h     |   1 +
 .../jones/v03/keymaps/default_jp/keymap.c     |  15 +-
 .../jones/v03_1/keymaps/default_ansi/config.h |   1 +
 .../jones/v03_1/keymaps/default_ansi/keymap.c |  15 +-
 .../jones/v03_1/keymaps/default_jp/config.h   |   1 +
 .../jones/v03_1/keymaps/default_jp/keymap.c   |  15 +-
 .../keyhive/navi10/keymaps/default/keymap.c   |   2 +-
 .../keyhive/navi10/keymaps/devdev/keymap.c    |   2 +-
 .../keyhive/navi10/keymaps/emdarcher/keymap.c |   2 +-
 .../jj50/keymaps/archetype/config.h           |   1 +
 .../jj50/keymaps/archetype/keymap.c           |  11 +-
 keyboards/planck/keymaps/ariccb/config.h      |   1 +
 keyboards/planck/keymaps/ariccb/keymap.c      |  13 +-
 keyboards/planck/keymaps/rootiest/config.h    |   1 +
 keyboards/planck/keymaps/rootiest/keymap.c    |  23 +-
 .../7skb/keymaps/salicylic/keymap.c           |   4 +-
 .../7splus/keymaps/salicylic/keymap.c         |   4 +-
 .../jisplit89/keymaps/salicylic/keymap.c      |   4 +-
 .../naked60/keymaps/salicylic/keymap.c        |   4 +-
 .../keymaps/salicylic_with_nafuda/keymap.c    |   4 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |   4 +-
 .../naked64/keymaps/salicylic/keymap.c        |   4 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |   4 +-
 .../minivan/keymaps/belak/keymap.c            |  21 +-
 quantum/process_keycode/process_tap_dance.c   | 131 +++----
 quantum/process_keycode/process_tap_dance.h   |  35 +-
 tests/tapdance/config.h                       |  19 ++
 tests/tapdance/examples.c                     | 199 +++++++++++
 tests/tapdance/examples.h                     |  33 ++
 tests/tapdance/test.mk                        |  22 ++
 tests/tapdance/test_examples.cpp              | 319 ++++++++++++++++++
 users/edvorakjp/edvorakjp_tap_dance.c         |  13 +-
 users/gourdo1/gourdo1.c                       |   2 +-
 users/mnil/config.h                           |   1 +
 users/mnil/mnil.c                             |   4 +-
 users/ninjonas/config.h                       |   3 +-
 users/ninjonas/tap_dances.c                   |  16 +-
 52 files changed, 970 insertions(+), 244 deletions(-)
 create mode 100644 tests/tapdance/config.h
 create mode 100644 tests/tapdance/examples.c
 create mode 100644 tests/tapdance/examples.h
 create mode 100644 tests/tapdance/test.mk
 create mode 100644 tests/tapdance/test_examples.cpp

diff --git a/builddefs/build_test.mk b/builddefs/build_test.mk
index 5ad33b19c5..834184f221 100644
--- a/builddefs/build_test.mk
+++ b/builddefs/build_test.mk
@@ -42,7 +42,7 @@ VPATH += \
 
 all: elf
 
-VPATH += $(COMMON_VPATH)
+VPATH += $(TEST_PATH) $(COMMON_VPATH)
 PLATFORM:=TEST
 PLATFORM_KEY:=test
 BOOTLOADER_TYPE:=none
diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
index c055a9989a..05134ec229 100644
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -14,55 +14,48 @@ Optionally, you might want to set a custom `TAPPING_TERM` time by adding somethi
 
 ```c
 #define TAPPING_TERM 175
+#define TAPPING_TERM_PER_KEY
 ```
 
-The `TAPPING_TERM` time is the maximum time allowed between taps of your Tap Dance key, and is measured in milliseconds. For example, if you used the above `#define` statement and set up a Tap Dance key that sends `Space` on single-tap and `Enter` on double-tap, then this key will send `ENT` only if you tap this key twice in less than 175ms. If you tap the key, wait more than 175ms, and tap the key again you'll end up sending `SPC SPC` instead.
+The `TAPPING_TERM` time is the maximum time allowed between taps of your Tap Dance key, and is measured in milliseconds. For example, if you used the above `#define` statement and set up a Tap Dance key that sends `Space` on single-tap and `Enter` on double-tap, then this key will send `ENT` only if you tap this key twice in less than 175ms. If you tap the key, wait more than 175ms, and tap the key again you'll end up sending `SPC SPC` instead. The `TAPPING_TERM_PER_KEY` definition is only needed if you control the tapping term through a [custom `get_tapping_term` function](tap_hold.md#tapping_term), which may be needed because `TAPPING_TERM` affects not just tap-dance keys.
 
-Next, you will want to define some tap-dance keys, which is easiest to do with the `TD()` macro, that takes a number which will later be used as an index into the `tap_dance_actions` array.
+Next, you will want to define some tap-dance keys, which is easiest to do with the `TD()` macro. That macro takes a number which will later be used as an index into the `tap_dance_actions` array and turns it into a tap-dance keycode.
 
 After this, you'll want to use the `tap_dance_actions` array to specify what actions shall be taken when a tap-dance key is in action. Currently, there are five possible options:
 
 * `ACTION_TAP_DANCE_DOUBLE(kc1, kc2)`: Sends the `kc1` keycode when tapped once, `kc2` otherwise. When the key is held, the appropriate keycode is registered: `kc1` when pressed and held, `kc2` when tapped once, then pressed and held.
 * `ACTION_TAP_DANCE_LAYER_MOVE(kc, layer)`: Sends the `kc` keycode when tapped once, or moves to `layer`. (this functions like the `TO` layer keycode).
-    * This is the same as `ACTION_TAP_DANCE_DUAL_ROLE`, but renamed to something that is clearer about its functionality.  Both names will work.
 * `ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer)`: Sends the `kc` keycode when tapped once, or toggles the state of `layer`. (this functions like the `TG` layer keycode).
 * `ACTION_TAP_DANCE_FN(fn)`: Calls the specified function - defined in the user keymap - with the final tap count of the tap dance action.
 * `ACTION_TAP_DANCE_FN_ADVANCED(on_each_tap_fn, on_dance_finished_fn, on_dance_reset_fn)`: Calls the first specified function - defined in the user keymap - on every tap, the second function when the dance action finishes (like the previous option), and the last function when the tap dance action resets.
-* ~~`ACTION_TAP_DANCE_FN_ADVANCED_TIME(on_each_tap_fn, on_dance_finished_fn, on_dance_reset_fn, tap_specific_tapping_term)`~~: This functions identically to the `ACTION_TAP_DANCE_FN_ADVANCED` function, but uses a custom tapping term for it, instead of the predefined `TAPPING_TERM`.
-    * This is deprecated in favor of the Per Key Tapping Term functionality, as outlined [here](tap_hold.md#tapping-term). You'd want to check for the specific `TD()` macro that you want to use (such as `TD(TD_ESC_CAPS)`) instead of using this specific Tap Dance function.
 
 
 The first option is enough for a lot of cases, that just want dual roles. For example, `ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT)` will result in `Space` being sent on single-tap, `Enter` otherwise. 
 
 !> Keep in mind that only [basic keycodes](keycodes_basic.md) are supported here. Custom keycodes are not supported.
 
-Similar to the first option, the second option is good for simple layer-switching cases.
+Similar to the first option, the second and third option are good for simple layer-switching cases.
 
-For more complicated cases, use the third or fourth options (examples of each are listed below).
-
-Finally, the fifth option is particularly useful if your non-Tap-Dance keys start behaving weirdly after adding the code for your Tap Dance keys. The likely problem is that you changed the `TAPPING_TERM` time to make your Tap Dance keys easier for you to use, and that this has changed the way your other keys handle interrupts.
+For more complicated cases, like blink the LEDs, fiddle with the backlighting, and so on, use the fourth or fifth option. Examples of each are listed below.
 
 ## Implementation Details :id=implementation
 
 Well, that's the bulk of it! You should now be able to work through the examples below, and to develop your own Tap Dance functionality. But if you want a deeper understanding of what's going on behind the scenes, then read on for the explanation of how it all works!
 
-The main entry point is `process_tap_dance()`, called from `process_record_quantum()`, which is run for every keypress, and our handler gets to run early. This function checks whether the key pressed is a tap-dance key. If it is not, and a tap-dance was in action, we handle that first, and enqueue the newly pressed key. If it is a tap-dance key, then we check if it is the same as the already active one (if there's one active, that is). If it is not, we fire off the old one first, then register the new one. If it was the same, we increment the counter and reset the timer.
+Let's go over the three functions mentioned in `ACTION_TAP_DANCE_FN_ADVANCED` in a little more detail. They all receive the same too arguments: a pointer to a structure that holds all dance related state information, and a pointer to a use case specific state variable. The three functions differ in when they are called. The first, `on_each_tap_fn()`, is called every time the tap dance key is *pressed*. Before it is called, the counter is incremented and the timer is reset. The second function, `on_dance_finished_fn()`, is called when the tap dance is interrupted or ends because `TAPPING_TERM` milliseconds have passed since the last tap. When the `finished` field of the dance state structure is set to `true`, the `on_dance_finished_fn()` is skipped. After `on_dance_finished_fn()` was called or would have been called, but no sooner than when the tap dance key is *released*, `on_dance_reset_fn()` is called. It is possible to end a tap dance immediately, skipping `on_dance_finished_fn()`, but not `on_dance_reset_fn`, by calling `reset_tap_dance(state)`.
+
+To accomplish this logic, the tap dance mechanics use three entry points. The main entry point is `process_tap_dance()`, called from `process_record_quantum()` *after* `process_record_kb()` and `process_record_user()`. This function is responsible for calling `on_each_tap_fn()` and `on_dance_reset_fn()`. In order to handle interruptions of a tap dance, another entry point, `preprocess_tap_dance()` is run right at the beginning of `process_record_quantum()`. This function checks whether the key pressed is a tap-dance key. If it is not, and a tap-dance was in action, we handle that first, and enqueue the newly pressed key. If it is a tap-dance key, then we check if it is the same as the already active one (if there's one active, that is). If it is not, we fire off the old one first, then register the new one. Finally, `tap_dance_task()` periodically checks whether `TAPPING_TERM` has passed since the last key press and finishes a tap dance if that is the case.
 
 This means that you have `TAPPING_TERM` time to tap the key again; you do not have to input all the taps within a single `TAPPING_TERM` timeframe. This allows for longer tap counts, with minimal impact on responsiveness.
 
-Our next stop is `tap_dance_task()`. This handles the timeout of tap-dance keys.
-
-For the sake of flexibility, tap-dance actions can be either a pair of keycodes, or a user function. The latter allows one to handle higher tap counts, or do extra things, like blink the LEDs, fiddle with the backlighting, and so on. This is accomplished by using an union, and some clever macros.
-
 ## Examples :id=examples
 
-### Simple Example :id=simple-example
+### Simple Example: Send `ESC` on Single Tap, `CAPS_LOCK` on Double Tap :id=simple-example
 
 Here's a simple example for a single definition:
 
 1. In your `rules.mk`, add `TAP_DANCE_ENABLE = yes`
-2. In your `config.h` (which you can copy from `qmk_firmware/keyboards/planck/config.h` to your keymap directory), add `#define TAPPING_TERM 200`
-3. In your `keymap.c` file, define the variables and definitions, then add to your keymap:
+2. In your `keymap.c` file, define the variables and definitions, then add to your keymap:
 
 ```c
 // Tap Dance declarations
@@ -92,40 +85,15 @@ All the enums used in the examples are declared like this:
 ```c
 // Enums defined for all examples:
 enum {
-    CT_SE,
-    CT_CLN,
+    TD_ESC_CAPS,
     CT_EGG,
     CT_FLSH,
-    X_TAP_DANCE
+    CT_CLN,
+    X_CTL,
 };
 ```
 
-#### Example 1: Send `:` on Single Tap, `;` on Double Tap :id=example-1
-
-```c
-void dance_cln_finished(qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code16(KC_COLN);
-    } else {
-        register_code(KC_SCLN);
-    }
-}
-
-void dance_cln_reset(qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code16(KC_COLN);
-    } else {
-        unregister_code(KC_SCLN);
-    }
-}
-
-// All tap dance functions would go here. Only showing this one.
-qk_tap_dance_action_t tap_dance_actions[] = {
-    [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_cln_finished, dance_cln_reset),
-};
-```
-
-#### Example 2: Send "Safety Dance!" After 100 Taps :id=example-2
+#### Example 1: Send "Safety Dance!" After 100 Taps :id=example-1
 
 ```c
 void dance_egg(qk_tap_dance_state_t *state, void *user_data) {
@@ -140,7 +108,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 };
 ```
 
-#### Example 3: Turn LED Lights On Then Off, One at a Time :id=example-3
+#### Example 2: Turn LED Lights On Then Off, One at a Time :id=example-2
 
 ```c
 // On each tap, light up one LED, from right to left
@@ -181,15 +149,74 @@ void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
     ergodox_right_led_3_off();
 }
 
-// All tap dances now put together. Example 3 is "CT_FLASH"
+// All tap dances now put together. Example 2 is "CT_FLSH"
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [CT_SE] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT),
-    [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_cln_finished, dance_cln_reset),
+    [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
     [CT_EGG] = ACTION_TAP_DANCE_FN(dance_egg),
     [CT_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(dance_flsh_each, dance_flsh_finished, dance_flsh_reset)
 };
 ```
 
+#### Example 3: Send `:` on Tap, `;` on Hold :id=example-3
+
+With a little effort, powerful tap-hold configurations can be implemented as tap dances. To emit taps as early as possible, we need to act on releases of the tap dance key. There is no callback for this in the tap dance framework, so we use `process_record_user()`.
+
+```c
+typedef struct {
+    uint16_t tap;
+    uint16_t hold;
+    uint16_t held;
+} tap_dance_tap_hold_t;
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    qk_tap_dance_action_t *action;
+
+    switch (keycode) {
+        case TD(CT_CLN):  // list all tap dance keycodes with tap-hold configurations
+            action = &tap_dance_actions[TD_INDEX(keycode)];
+            if (!record->event.pressed && action->state.count && !action->state.finished) {
+                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
+                tap_code16(tap_hold->tap);
+            }
+    }
+    return true;
+}
+
+void tap_dance_tap_hold_finished(qk_tap_dance_state_t *state, void *user_data) {
+    tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
+
+    if (state->pressed) {
+        if (state->count == 1
+#ifndef PERMISSIVE_HOLD
+            && !state->interrupted
+#endif
+        ) {
+            register_code16(tap_hold->hold);
+            tap_hold->held = tap_hold->hold;
+        } else {
+            register_code16(tap_hold->tap);
+            tap_hold->held = tap_hold->tap;
+        }
+    }
+}
+
+void tap_dance_tap_hold_reset(qk_tap_dance_state_t *state, void *user_data) {
+    tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
+
+    if (tap_hold->held) {
+        unregister_code16(tap_hold->held);
+        tap_hold->held = 0;
+    }
+}
+
+#define ACTION_TAP_DANCE_TAP_HOLD(tap, hold) \
+    { .fn = {NULL, tap_dance_tap_hold_finished, tap_dance_tap_hold_reset}, .user_data = (void *)&((tap_dance_tap_hold_t){tap, hold, 0}), }
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [CT_CLN] = ACTION_TAP_DANCE_TAP_HOLD(KC_COLN, KC_SCLN),
+};
+```
+
 #### Example 4: 'Quad Function Tap-Dance' :id=example-4
 
 By [DanielGGordon](https://github.com/danielggordon)
@@ -329,7 +356,7 @@ And then simply use `TD(X_CTL)` anywhere in your keymap.
 
 If you want to implement this in your userspace, then you may want to check out how [DanielGGordon](https://github.com/qmk/qmk_firmware/tree/master/users/gordon) has implemented this in their userspace.
 
-> In this configuration "hold" takes place **after** tap dance timeout (see `ACTION_TAP_DANCE_FN_ADVANCED_TIME`). To achieve instant hold, remove `state->interrupted` checks in conditions. As a result you may use comfortable longer tapping periods to have more time for taps and not to wait too long for holds (try starting with doubled `TAPPING_TERM`).
+> In this configuration "hold" takes place **after** tap dance timeout. To achieve instant hold, remove `state->interrupted` checks in conditions. As a result you may use comfortable longer tapping periods to have more time for taps and not to wait too long for holds (try starting with doubled `TAPPING_TERM`).
 
 #### Example 5: Using tap dance for advanced mod-tap and layer-tap keys :id=example-5
 
@@ -511,8 +538,18 @@ void ql_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 // Associate our tap dance key with its functionality
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [QUOT_LAYR] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 275)
+    [QUOT_LAYR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ql_finished, ql_reset)
 };
+
+// Set a long-ish tapping term for tap-dance keys
+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;
+    }
+}
 ```
 
 The above code is similar to that used in previous examples. The one point to note is that we need to be able to check which layers are active at any time so we can toggle them if needed. To do this we use the `layer_state_is(layer)` function which returns `true` if the given `layer` is active.
@@ -521,6 +558,6 @@ The use of `cur_dance()` and `ql_tap_state` mirrors the above examples.
 
 The `case: TD_SINGLE_TAP` in `ql_finished` is similar to the above examples. The `TD_SINGLE_HOLD` case works in conjunction with `ql_reset()` to switch to `_MY_LAYER` while the tap dance key is held, and to switch away from `_MY_LAYER` when the key is released. This mirrors the use of `MO(_MY_LAYER)`. The `TD_DOUBLE_TAP` case works by checking whether `_MY_LAYER` is the active layer, and toggling it on or off accordingly. This mirrors the use of `TG(_MY_LAYER)`.
 
-`tap_dance_actions[]` works similar to the above examples. Note that I used `ACTION_TAP_DANCE_FN_ADVANCED_TIME()` instead of `ACTION_TAP_DANCE_FN_ADVANCED()`. This is because I like my `TAPPING_TERM` to be short (\~175ms) for my non-tap-dance keys but find that this is too quick for me to reliably complete tap dance actions - thus the increased time of 275ms here.
+`tap_dance_actions[]` works similar to the above examples. Note that, additionally, I set a longer tapping term for the tap dance keys. This is because I like my `TAPPING_TERM` to be short (\~175ms) for my non-tap-dance keys but find that this is too quick for me to reliably complete tap dance actions - thus the increased time of 275ms here. In order for the per-key tapping terms to take effect, `TAPPING_TERM_PER_KEY` must be defined in your `config.h`.
 
 Finally, to get this tap dance key working, be sure to include `TD(QUOT_LAYR)` in your `keymaps[]`.
diff --git a/docs/ja/feature_tap_dance.md b/docs/ja/feature_tap_dance.md
index a6d108f1e9..762816f21b 100644
--- a/docs/ja/feature_tap_dance.md
+++ b/docs/ja/feature_tap_dance.md
@@ -28,7 +28,6 @@
 
 * `ACTION_TAP_DANCE_DOUBLE(kc1, kc2)`: 1回タップすると `kc1` キーコードを送信し、2回タップすると `kc2` キーコードを送信します。キーを押し続けているときは、適切なキーコードが登録されます: キーを押し続けた場合は `kc1`、一度タップしてから続けてもう一度キーを押してそのまま押し続けたときは、 `kc2` が登録されます。
 * `ACTION_TAP_DANCE_LAYER_MOVE(kc, layer)`: 1回タップすると `kc` キーコードが送信され、2回タップすると `layer` レイヤーに移動します(これは `TO` レイヤーキーコードのように機能します)。
-    * この機能は `ACTION_TAP_DANCE_DUAL_ROLE` と同じですが、機能が明確になるように関数名を変更しました。どちらの関数名でも実行できます。
 * `ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer)`: 1回タップすると `kc` キーコードが送信され、2回タップすると `layer` の状態をトグルします(これは `TG` レイヤーキーコードのように機能します)。
 * `ACTION_TAP_DANCE_FN(fn)`: ユーザーキーマップに定義した指定の関数が呼び出されます。タップダンス実行の回数分タップすると、最後の時点で呼び出されます。
 * `ACTION_TAP_DANCE_FN_ADVANCED(on_each_tap_fn, on_dance_finished_fn, on_dance_reset_fn)`: タップする度にユーザーキーマップに定義した最初の関数が呼び出されます。タップダンスの実行が終わった時点で2番目の関数が呼び出され、タップダンスの実行をリセットするときに最後の関数が呼び出されます。
diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
index 26ca151089..1292f2d2ed 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
@@ -46,8 +46,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
index 05de0e42d0..7e82c7b7d2 100644
--- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
+++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
@@ -39,8 +39,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
index 4bc6d2c3c0..e45034f9a8 100644
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
@@ -2,6 +2,7 @@
 
 // place overrides here
 #define TAPPING_TERM 200
+#define TAPPING_TERM_PER_KEY
 #define LEADER_TIMEOUT 800
 
 #define DISABLE_SPACE_CADET_ROLLOVER
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
index dd2098d945..6db177c183 100644
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
@@ -52,17 +52,33 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   // Tap once for CTRL, twice for Caps Lock
   [TD_CTCPS]  = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_CAPS),
   [COPA]  = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)),
-  [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleEmojis, NULL, NULL, 800),
-  [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleAnimals, NULL, NULL, 800),
-  //[SYMBOLS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleSymbols, NULL, NULL, 800),
-  [FOODS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleFoods, NULL, NULL, 800),
-  [ETC] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleEtc, NULL, NULL, 800),
-  //[VEHICLES] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleVehicles, NULL, NULL, 800),
-  //[SUPPLEMENT] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleSupplement, NULL, NULL, 800),
-  [ALLS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(cycleAll, NULL, NULL, 800)
+  [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEmojis, NULL, NULL),
+  [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, NULL),
+  //[SYMBOLS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleSymbols, NULL, NULL),
+  [FOODS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleFoods, NULL, NULL),
+  [ETC] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEtc, NULL, NULL),
+  //[VEHICLES] = ACTION_TAP_DANCE_FN_ADVANCED(cycleVehicles, NULL, NULL),
+  //[SUPPLEMENT] = ACTION_TAP_DANCE_FN_ADVANCED(cycleSupplement, NULL, NULL),
+  [ALLS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAll, NULL, NULL)
 // Other declarations would go here, separated by commas, if you have them
 };
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(EMOJIS):
+        case TD(ANIMAL):
+        //case TD(SYMBOLS):
+        case TD(FOODS):
+        case TD(ETC):
+        //case TD(VEHICLES):
+        //case TD(SUPPLEMENT):
+        case TD(ALLS):
+            return 800;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
 // macros
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
   switch(id) {
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
index b2e5041393..c3fce50f2a 100644
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
@@ -3,7 +3,4 @@ Tap Dance is constrained normally by `TAPPING_TERM` defined in your keyboard's c
 
 
 
-- `ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term)` : This works the same as `ACTION_TAP_DANCE_FN_ADVANCED` just with the extra `tap_specific_tapping_term` arguement at the end. This way you can set a specific tap dance to have a longer or shorter tap in between your taps, giving you more, or less, time in between each tap.   
-
-
-`tap_specific_tapping_term` should be the same type and range of values that one would put into the `TAPPING_TERM` definition in the config.h file.
+- Implementing `uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record)`, you can set a specific tap dance to have a longer or shorter tap in between your taps, giving you more, or less, time in between each tap. The return value should be the same type and range of values that one would put into the `TAPPING_TERM` definition in the config.h file.
diff --git a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c b/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
index 70dc17bb13..65f128a26b 100644
--- a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
+++ b/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
@@ -34,8 +34,8 @@ enum {
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_F1_GAME] = ACTION_TAP_DANCE_DUAL_ROLE(KC_F1, GAME),
-  [TD_CAPS_FN] = ACTION_TAP_DANCE_DUAL_ROLE(KC_CAPS, 5)
+  [TD_F1_GAME] = ACTION_TAP_DANCE_LAYER_MOVE(KC_F1, GAME),
+  [TD_CAPS_FN] = ACTION_TAP_DANCE_LAYER_MOVE(KC_CAPS, 5)
 };
 
 enum macro_id {
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
index da20820787..c35963d842 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
@@ -7,6 +7,7 @@
 
 #undef  TAPPING_TERM
 #define TAPPING_TERM 175
+#define TAPPING_TERM_PER_KEY
 
 #undef  DEBOUNCE
 #define DEBOUNCE 15
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c
index 59e3e2b0dc..1d5e1cee00 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c
@@ -13,14 +13,32 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     [RPRN_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_RPRN, KC_RBRC),
     [LCBR_LABK] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_LABK),
     [RCBR_RABK] = ACTION_TAP_DANCE_DOUBLE(KC_RCBR, KC_RABK),
-    [SCLN_COLN] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, scln_coln_finished,       scln_coln_reset,      DANCING_TERM),
-    [QUOT_DQUO] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, quot_dquot_finished,      quot_dquot_reset,     DANCING_TERM),
-    [DOT_COMM]  = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, dot_comm_finished,        dot_comm_reset,       DANCING_TERM),
-    [NONE_LEAD] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, none_lead_finished,       none_lead_reset,      DANCING_TERM),
-    [U_ARR_GUI] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, u_arrows_gui_finished,    u_arrows_gui_reset,   DANCING_TERM),
-    [H_MOU_GUI] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, h_mouse_gui_finished,     h_mouse_gui_reset,    DANCING_TERM),
-    [J_MED_MEH] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, j_media_meh_finished,     j_media_meh_reset,    DANCING_TERM),
-    [W_MED_MEH] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, w_media_meh_finished,     w_media_meh_reset,    DANCING_TERM),
-    [K_NUM_HYP] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, k_numpad_hyper_finished,  k_numpad_hyper_reset, DANCING_TERM),
-    [M_CHO_HYP] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, m_chords_hyper_finished,  m_chords_hyper_reset, DANCING_TERM),
+    [SCLN_COLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, scln_coln_finished,       scln_coln_reset),
+    [QUOT_DQUO] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, quot_dquot_finished,      quot_dquot_reset),
+    [DOT_COMM]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dot_comm_finished,        dot_comm_reset),
+    [NONE_LEAD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, none_lead_finished,       none_lead_reset),
+    [U_ARR_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, u_arrows_gui_finished,    u_arrows_gui_reset),
+    [H_MOU_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, h_mouse_gui_finished,     h_mouse_gui_reset),
+    [J_MED_MEH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, j_media_meh_finished,     j_media_meh_reset),
+    [W_MED_MEH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, w_media_meh_finished,     w_media_meh_reset),
+    [K_NUM_HYP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, k_numpad_hyper_finished,  k_numpad_hyper_reset),
+    [M_CHO_HYP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, m_chords_hyper_finished,  m_chords_hyper_reset),
 };
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(SCLN_COLN):
+        case TD(QUOT_DQUO):
+        case TD(DOT_COMM):
+        case TD(NONE_LEAD):
+        case TD(U_ARR_GUI):
+        case TD(H_MOU_GUI):
+        case TD(J_MED_MEH):
+        case TD(W_MED_MEH):
+        case TD(K_NUM_HYP):
+        case TD(M_CHO_HYP):
+            return DANCING_TERM;
+        default:
+            return TAPPING_TERM;
+    }
+}
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
index f66c334b85..e2c27583fa 100644
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
+++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
@@ -27,3 +27,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define COMBO_ALLOW_ACTION_KEYS
 #define COMBO_VARIABLE_LEN
+
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c
index e3b8944814..8b832cbac8 100644
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c
+++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c
@@ -199,5 +199,14 @@ void ql_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [GAME] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 275)
+    [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/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
index 70a96fac9d..d785825332 100644
--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -343,9 +343,9 @@ qk_tap_dance_action_t tap_dance_actions[] = {
    [TD_PGUP_HOME]  = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, KC_HOME),
    [TD_PGDN_END]   = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_END),
 
-   [TD_Q_LrALT] = ACTION_TAP_DANCE_DUAL_ROLE(KC_Q, _ALT),
-   [TD_R_LrKey] = ACTION_TAP_DANCE_DUAL_ROLE(KC_R, _RAISE),
-   [TD_T_LrMS]  = ACTION_TAP_DANCE_DUAL_ROLE(KC_T, _MOUSE),
+   [TD_Q_LrALT] = ACTION_TAP_DANCE_LAYER_MOVE(KC_Q, _ALT),
+   [TD_R_LrKey] = ACTION_TAP_DANCE_LAYER_MOVE(KC_R, _RAISE),
+   [TD_T_LrMS]  = ACTION_TAP_DANCE_LAYER_MOVE(KC_T, _MOUSE),
 
    [TD_SHIFT_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,lshift_finished, lshift_reset),
    [TD_SPC_ENT]    = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_ENT),
diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
index b152503aaf..3734510f8c 100644
--- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
@@ -279,9 +279,9 @@ qk_tap_dance_action_t tap_dance_actions[] = {
    [TD_PGUP_HOME]  = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, KC_HOME),
    [TD_PGDN_END]   = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, KC_END),
 
-   [TD_Q_LrALT] = ACTION_TAP_DANCE_DUAL_ROLE(KC_Q, _ALT),
-   [TD_R_LrKey] = ACTION_TAP_DANCE_DUAL_ROLE(KC_R, _RAISE),
-   [TD_T_LrMS]  = ACTION_TAP_DANCE_DUAL_ROLE(KC_T, _MOUSE),
+   [TD_Q_LrALT] = ACTION_TAP_DANCE_LAYER_MOVE(KC_Q, _ALT),
+   [TD_R_LrKey] = ACTION_TAP_DANCE_LAYER_MOVE(KC_R, _RAISE),
+   [TD_T_LrMS]  = ACTION_TAP_DANCE_LAYER_MOVE(KC_T, _MOUSE),
 
    [TD_SHIFT_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,lshift_finished, lshift_reset),
    [TD_SPC_ENT]    = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_ENT),
diff --git a/keyboards/jones/v03/keymaps/default_jp/config.h b/keyboards/jones/v03/keymaps/default_jp/config.h
index aa06121c1c..7545003ac7 100644
--- a/keyboards/jones/v03/keymaps/default_jp/config.h
+++ b/keyboards/jones/v03/keymaps/default_jp/config.h
@@ -21,3 +21,4 @@
 
 // time for long press
 #define TAPPING_TERM 200
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/jones/v03/keymaps/default_jp/keymap.c b/keyboards/jones/v03/keymaps/default_jp/keymap.c
index 3f5b10208c..bdcb9e88b1 100644
--- a/keyboards/jones/v03/keymaps/default_jp/keymap.c
+++ b/keyboards/jones/v03/keymaps/default_jp/keymap.c
@@ -51,9 +51,18 @@ void ql_reset(qk_tap_dance_state_t *state, void *user_data);
 // Tap Dance definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
     [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 275),
+    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ql_finished, ql_reset),
 };
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_ESC_NUM):
+            return 275;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
   MAC = SAFE_RANGE,
@@ -303,7 +312,7 @@ static tap ql_tap_state = {
 // Functions that control what our tap dance key does
 void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
     ql_tap_state.state = cur_dance(state);
-    switch(state->keycode) {
+    switch(TAP_DANCE_KEYCODE(state)) {
         case TD(TD_ESC_NUM): // ESC key action
             switch (ql_tap_state.state) {
                 case SINGLE_TAP:
@@ -332,7 +341,7 @@ void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 void ql_reset(qk_tap_dance_state_t *state, void *user_data) {
-    switch(state->keycode) {
+    switch(TAP_DANCE_KEYCODE(state)) {
         case TD(TD_ESC_NUM):
             // If the key was held down and now is released then switch off the layer
             if (ql_tap_state.state == TAP_HOLD) {
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/config.h b/keyboards/jones/v03_1/keymaps/default_ansi/config.h
index 0b51190bbe..ee7b09a90c 100644
--- a/keyboards/jones/v03_1/keymaps/default_ansi/config.h
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/config.h
@@ -21,6 +21,7 @@
 
 // time for long press
 #define TAPPING_TERM 200
+#define TAPPING_TERM_PER_KEY
 
 // music map for music-mode
 #define MUSIC_MAP
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
index 5b1486bb86..e86204a3e3 100644
--- a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
@@ -50,9 +50,18 @@ void ql_reset(qk_tap_dance_state_t *state, void *user_data);
 // Tap Dance definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
     [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 275),
+    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ql_finished, ql_reset),
 };
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_ESC_NUM):
+            return 275;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
   MAC = SAFE_RANGE,
@@ -322,7 +331,7 @@ static tap ql_tap_state = {
 // Functions that control what our tap dance key does
 void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
     ql_tap_state.state = cur_dance(state);
-    switch(state->keycode) {
+    switch(TAP_DANCE_KEYCODE(state)) {
         case TD(TD_ESC_NUM): // ESC key action
             switch (ql_tap_state.state) {
                 case SINGLE_TAP:
@@ -351,7 +360,7 @@ void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 void ql_reset(qk_tap_dance_state_t *state, void *user_data) {
-    switch(state->keycode) {
+    switch(TAP_DANCE_KEYCODE(state)) {
         case TD(TD_ESC_NUM):
             // If the key was held down and now is released then switch off the layer
             if (ql_tap_state.state == TAP_HOLD) {
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/config.h b/keyboards/jones/v03_1/keymaps/default_jp/config.h
index 0b51190bbe..ee7b09a90c 100644
--- a/keyboards/jones/v03_1/keymaps/default_jp/config.h
+++ b/keyboards/jones/v03_1/keymaps/default_jp/config.h
@@ -21,6 +21,7 @@
 
 // time for long press
 #define TAPPING_TERM 200
+#define TAPPING_TERM_PER_KEY
 
 // music map for music-mode
 #define MUSIC_MAP
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
index 436586a721..9a2663f6d7 100644
--- a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
@@ -51,9 +51,18 @@ void ql_reset(qk_tap_dance_state_t *state, void *user_data);
 // Tap Dance definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
     [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ql_finished, ql_reset, 275),
+    [TD_ESC_NUM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ql_finished, ql_reset),
 };
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_ESC_NUM):
+            return 275;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
   MAC = SAFE_RANGE,
@@ -324,7 +333,7 @@ static tap ql_tap_state = {
 // Functions that control what our tap dance key does
 void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
     ql_tap_state.state = cur_dance(state);
-    switch(state->keycode) {
+    switch(TAP_DANCE_KEYCODE(state)) {
         case TD(TD_ESC_NUM): // ESC key action
             switch (ql_tap_state.state) {
                 case SINGLE_TAP:
@@ -353,7 +362,7 @@ void ql_finished(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 void ql_reset(qk_tap_dance_state_t *state, void *user_data) {
-    switch(state->keycode) {
+    switch(TAP_DANCE_KEYCODE(state)) {
         case TD(TD_ESC_NUM):
             // If the key was held down and now is released then switch off the layer
             if (ql_tap_state.state == TAP_HOLD) {
diff --git a/keyboards/keyhive/navi10/keymaps/default/keymap.c b/keyboards/keyhive/navi10/keymaps/default/keymap.c
index d1b3127760..c4295b1553 100644
--- a/keyboards/keyhive/navi10/keymaps/default/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/default/keymap.c
@@ -127,5 +127,5 @@ void tk_reset(qk_tap_dance_state_t *state, void *user_data){
 
 //associate the tap dance key with its functionality
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, tk_finished, tk_reset, 275)
+    [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
 };
diff --git a/keyboards/keyhive/navi10/keymaps/devdev/keymap.c b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
index b0d43ebc69..0fc20cbbd4 100644
--- a/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
@@ -259,5 +259,5 @@ void tk_reset(qk_tap_dance_state_t *state, void *user_data){
 
 //associate the tap dance key with its functionality
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, tk_finished, tk_reset, TAPPING_TERM)
+    [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
 };
diff --git a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
index 40efed48d5..37850e28f3 100644
--- a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
@@ -178,5 +178,5 @@ void tk_reset(qk_tap_dance_state_t *state, void *user_data){
 
 //associate the tap dance key with its functionality
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, tk_finished, tk_reset, 275)
+    [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
 };
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/config.h b/keyboards/kprepublic/jj50/keymaps/archetype/config.h
index a12e070b4f..9604ac719c 100644
--- a/keyboards/kprepublic/jj50/keymaps/archetype/config.h
+++ b/keyboards/kprepublic/jj50/keymaps/archetype/config.h
@@ -6,4 +6,5 @@
 #define AUTO_SHIFT_TIMEOUT 150
 #define NO_AUTO_SHIFT_ALPHA
 #define TAPPING_TERM 150
+#define TAPPING_TERM_PER_KEY
 //#define BOOTMAGIC_KEY_SALT KC_LCTL
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c b/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
index 82c615f135..ff59ef43e5 100644
--- a/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
@@ -167,9 +167,18 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   // 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_TIME(NULL, layer_switcher, layer_switcher_reset, 100),
+  [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] = {
 
diff --git a/keyboards/planck/keymaps/ariccb/config.h b/keyboards/planck/keymaps/ariccb/config.h
index 322aa9277f..464a8cd5db 100644
--- a/keyboards/planck/keymaps/ariccb/config.h
+++ b/keyboards/planck/keymaps/ariccb/config.h
@@ -40,6 +40,7 @@
 //#define MIDI_ADVANCED
 
 #define TAPPING_TERM 150
+#define TAPPING_TERM_PER_KEY
 #define IGNORE_MOD_TAP_INTERRUPT
 // #define IGNORE_MOD_TAP_INTERRUPT
 // #define HOLD_ON_OTHER_KEY_PRESS
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index c0b4e490fa..33d0a26273 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -379,9 +379,18 @@ void usl_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 // Associate our tap dance key with its functionality
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [UNDS_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, usl_finished, usl_reset, 175)
+    [UNDS_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, usl_finished, usl_reset)
 };
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(UNDS_LOWER):
+            return 175;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (!process_select_word(keycode, record, SELWORD)) { return false; }
   if (!process_caps_word(keycode, record)) { return false; }
@@ -661,4 +670,4 @@ void process_combo_event(uint16_t combo_index, bool pressed) {
       }
       break;
   }
-}
\ No newline at end of file
+}
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
index fc1fc81761..5bb5a73a29 100644
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ b/keyboards/planck/keymaps/rootiest/config.h
@@ -87,6 +87,7 @@
 /*
  * TAP-DANCE options
  */
+#define TAPPING_TERM_PER_KEY // Control Tap-Dance time individually by key
 #define TAPPING_TERM 250     // Default time allowed before resetting a Tap-Dance combo
 #define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped once again. */
 #define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 634bf2829e..857d7a9e21 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -1656,13 +1656,26 @@ void sml_reset(qk_tap_dance_state_t* state, void* user_data) { sml_state.state =
 // Tap Dance definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
     // Tap once for °, twice for ℉, thrice for ℃
-    [TD_DEG_DEGF]    = ACTION_TAP_DANCE_FN(send_degree_symbol),                                    //
-    [TD_LSHFT_CAPS]  = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, scap_finished, scap_reset, 200),    //
-    [TD_LCTL_STICKY] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, slctl_finished, slctl_reset, 200),  //
-    [TD_LALT_STICKY] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, slalt_finished, slalt_reset, 200),  //
-    [TD_SMILEY]      = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, sml_finished, sml_reset, 500),
+    [TD_DEG_DEGF]    = ACTION_TAP_DANCE_FN(send_degree_symbol),                          //
+    [TD_LSHFT_CAPS]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, scap_finished, scap_reset),    //
+    [TD_LCTL_STICKY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, slctl_finished, slctl_reset),  //
+    [TD_LALT_STICKY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, slalt_finished, slalt_reset),  //
+    [TD_SMILEY]      = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sml_finished, sml_reset),
 };
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_LSHFT_CAPS):
+        case TD(TD_LCTL_STICKY):
+        case TD(TD_LALT_STICKY):
+            return 200;
+        case TD(TD_SMILEY):
+            return 500;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
 // Dip-Switch controls
 void dip_switch_update_user(uint8_t index, bool active) {
     switch (index) {
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
index 4e1f2acd05..7221f8c612 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
@@ -32,8 +32,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
index 06d7972a2e..bea5978c50 100644
--- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
@@ -39,8 +39,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESMS] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _MOUSE),
-  [TD_ESAR] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESMS] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _MOUSE),
+  [TD_ESAR] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
index 4e8addf6b7..eba01d4d65 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
@@ -39,8 +39,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESMS] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _MOUSE),
-  [TD_ESAR] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESMS] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _MOUSE),
+  [TD_ESAR] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
index 8a2dbf051f..b70e68da54 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
@@ -23,8 +23,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
index 4201d79a2e..c43803be35 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
@@ -34,8 +34,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
index 23786da915..6dd2ef8863 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
@@ -32,8 +32,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
index db46075c8f..ae7843341a 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
@@ -33,8 +33,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
index c91716cdd4..6e2dd0886f 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
@@ -38,8 +38,8 @@ enum tapdances{
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
 };
 
 #define LOWER MO(_LOWER)
diff --git a/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
index 437b1881a4..0ed709747a 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
@@ -22,6 +22,9 @@
 #define TD_LCTL TD(BE_TD_CTL)
 #define TD_LALT TD(BE_TD_ALT)
 
+#define ACTION_TAP_DANCE_MOD_TAP(mod) \
+    { .fn = {mod_tap_fn, NULL, mod_reset_fn}, .user_data = (void *)&((uint8_t){mod}), }
+
 enum belak_td {
     BE_TD_GUI = 0,
     BE_TD_CTL,
@@ -32,15 +35,9 @@ void mod_tap_fn(qk_tap_dance_state_t *state, void *user_data);
 void mod_reset_fn(qk_tap_dance_state_t *state, void *user_data);
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [BE_TD_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(mod_tap_fn, NULL, mod_reset_fn),
-    [BE_TD_CTL] = ACTION_TAP_DANCE_FN_ADVANCED(mod_tap_fn, NULL, mod_reset_fn),
-    [BE_TD_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(mod_tap_fn, NULL, mod_reset_fn),
-};
-
-uint16_t tap_dance_keys[] = {
-    [BE_TD_GUI] = KC_LGUI,
-    [BE_TD_CTL] = KC_LCTL,
-    [BE_TD_ALT] = KC_LALT,
+    [BE_TD_GUI] = ACTION_TAP_DANCE_MOD_TAP(KC_LGUI),
+    [BE_TD_CTL] = ACTION_TAP_DANCE_MOD_TAP(KC_LCTL),
+    [BE_TD_ALT] = ACTION_TAP_DANCE_MOD_TAP(KC_LALT),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -74,7 +71,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void mod_tap_fn(qk_tap_dance_state_t *state, void *user_data) {
     switch (state->count) {
         case 1:
-            register_mods(MOD_BIT(tap_dance_keys[state->keycode - QK_TAP_DANCE]));
+            uint8_t *mod = (uint8_t *)user_data;
+            register_mods(MOD_BIT(*mod));
             send_keyboard_report();
             break;
         case 2:
@@ -90,8 +88,9 @@ void mod_tap_fn(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 void mod_reset_fn(qk_tap_dance_state_t *state, void *user_data) {
+    uint8_t *mod = (uint8_t *)user_data;
     layer_off(_L1);
     layer_off(_L2);
-    unregister_mods(MOD_BIT(tap_dance_keys[state->keycode - QK_TAP_DANCE]));
+    unregister_mods(MOD_BIT(*mod));
     send_keyboard_report();
 }
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index db8df5f870..3270a1b000 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -15,12 +15,8 @@
  */
 #include "quantum.h"
 
-#ifndef NO_ACTION_ONESHOT
-uint8_t get_oneshot_mods(void);
-#endif
-
-static uint16_t last_td;
-static int16_t  highest_td = -1;
+static uint16_t active_td;
+static uint16_t last_tap_time;
 
 void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data) {
     qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
@@ -34,18 +30,14 @@ void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data)
 void qk_tap_dance_pair_finished(qk_tap_dance_state_t *state, void *user_data) {
     qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
 
-    if (state->count == 1) {
-        register_code16(pair->kc1);
-    } else if (state->count == 2) {
-        register_code16(pair->kc2);
-    }
+    register_code16(pair->kc1);
 }
 
 void qk_tap_dance_pair_reset(qk_tap_dance_state_t *state, void *user_data) {
     qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
 
-    wait_ms(TAP_CODE_DELAY);
     if (state->count == 1) {
+        wait_ms(TAP_CODE_DELAY);
         unregister_code16(pair->kc1);
     } else if (state->count == 2) {
         unregister_code16(pair->kc2);
@@ -87,23 +79,40 @@ static inline void _process_tap_dance_action_fn(qk_tap_dance_state_t *state, voi
 }
 
 static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *action) {
+    action->state.count++;
+    action->state.weak_mods = get_mods();
+    action->state.weak_mods |= get_weak_mods();
+#ifndef NO_ACTION_ONESHOT
+    action->state.oneshot_mods = get_oneshot_mods();
+#endif
     _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap);
 }
 
-static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_action_t *action) {
-    if (action->state.finished) return;
-    action->state.finished = true;
-    add_mods(action->state.oneshot_mods);
-    add_weak_mods(action->state.weak_mods);
-    send_keyboard_report();
-    _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_dance_finished);
-}
-
 static inline void process_tap_dance_action_on_reset(qk_tap_dance_action_t *action) {
     _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_reset);
-    del_mods(action->state.oneshot_mods);
     del_weak_mods(action->state.weak_mods);
+#ifndef NO_ACTION_ONESHOT
+    del_mods(action->state.oneshot_mods);
+#endif
     send_keyboard_report();
+    action->state = (const qk_tap_dance_state_t){0};
+}
+
+static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_action_t *action) {
+    if (!action->state.finished) {
+        action->state.finished = true;
+        add_weak_mods(action->state.weak_mods);
+#ifndef NO_ACTION_ONESHOT
+        add_mods(action->state.oneshot_mods);
+#endif
+        send_keyboard_report();
+        _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_dance_finished);
+    }
+    active_td = 0;
+    if (!action->state.pressed) {
+        // There will not be a key release event, so reset now.
+        process_tap_dance_action_on_reset(action);
+    }
 }
 
 void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
@@ -111,51 +120,33 @@ void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
 
     if (!record->event.pressed) return;
 
-    if (highest_td == -1) return;
+    if (!active_td || keycode == active_td) return;
 
-    for (int i = 0; i <= highest_td; i++) {
-        action = &tap_dance_actions[i];
-        if (action->state.count) {
-            if (keycode == action->state.keycode && keycode == last_td) continue;
-            action->state.interrupted          = true;
-            action->state.interrupting_keycode = keycode;
-            process_tap_dance_action_on_dance_finished(action);
-            reset_tap_dance(&action->state);
+    action                             = &tap_dance_actions[TD_INDEX(active_td)];
+    action->state.interrupted          = true;
+    action->state.interrupting_keycode = keycode;
+    process_tap_dance_action_on_dance_finished(action);
 
-            // Tap dance actions can leave some weak mods active (e.g., if the tap dance is mapped to a keycode with
-            // modifiers), but these weak mods should not affect the keypress which interrupted the tap dance.
-            clear_weak_mods();
-        }
-    }
+    // Tap dance actions can leave some weak mods active (e.g., if the tap dance is mapped to a keycode with
+    // modifiers), but these weak mods should not affect the keypress which interrupted the tap dance.
+    clear_weak_mods();
 }
 
 bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
-    uint16_t               idx = keycode - QK_TAP_DANCE;
     qk_tap_dance_action_t *action;
 
     switch (keycode) {
         case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
-            if ((int16_t)idx > highest_td) highest_td = idx;
-            action = &tap_dance_actions[idx];
+            action = &tap_dance_actions[TD_INDEX(keycode)];
 
             action->state.pressed = record->event.pressed;
             if (record->event.pressed) {
-                action->state.keycode = keycode;
-                action->state.count++;
-                action->state.timer = timer_read();
-#ifndef NO_ACTION_ONESHOT
-                action->state.oneshot_mods = get_oneshot_mods();
-#else
-                action->state.oneshot_mods = 0;
-#endif
-                action->state.weak_mods = get_mods();
-                action->state.weak_mods |= get_weak_mods();
+                last_tap_time = timer_read();
                 process_tap_dance_action_on_each_tap(action);
-
-                last_td = keycode;
+                active_td = action->state.finished ? 0 : keycode;
             } else {
-                if (action->state.count && action->state.finished) {
-                    reset_tap_dance(&action->state);
+                if (action->state.finished) {
+                    process_tap_dance_action_on_reset(action);
                 }
             }
 
@@ -166,35 +157,17 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
 }
 
 void tap_dance_task() {
-    if (highest_td == -1) return;
-    uint16_t tap_user_defined;
+    qk_tap_dance_action_t *action;
 
-    for (uint8_t i = 0; i <= highest_td; i++) {
-        qk_tap_dance_action_t *action = &tap_dance_actions[i];
-        if (action->custom_tapping_term > 0) {
-            tap_user_defined = action->custom_tapping_term;
-        } else {
-            tap_user_defined = GET_TAPPING_TERM(action->state.keycode, &(keyrecord_t){});
-        }
-        if (action->state.count && timer_elapsed(action->state.timer) > tap_user_defined) {
-            process_tap_dance_action_on_dance_finished(action);
-            reset_tap_dance(&action->state);
-        }
+    if (!active_td || timer_elapsed(last_tap_time) <= GET_TAPPING_TERM(active_td, &(keyrecord_t){})) return;
+
+    action = &tap_dance_actions[TD_INDEX(active_td)];
+    if (!action->state.interrupted) {
+        process_tap_dance_action_on_dance_finished(action);
     }
 }
 
 void reset_tap_dance(qk_tap_dance_state_t *state) {
-    qk_tap_dance_action_t *action;
-
-    if (state->pressed) return;
-
-    action = &tap_dance_actions[state->keycode - QK_TAP_DANCE];
-
-    process_tap_dance_action_on_reset(action);
-
-    state->count                = 0;
-    state->interrupted          = false;
-    state->finished             = false;
-    state->interrupting_keycode = 0;
-    last_td                     = 0;
+    active_td = 0;
+    process_tap_dance_action_on_reset((qk_tap_dance_action_t *)state);
 }
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index d9ffb1e73d..d97900d96b 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -22,30 +22,27 @@
 #    include <inttypes.h>
 
 typedef struct {
-    uint8_t  count;
-    uint8_t  oneshot_mods;
-    uint8_t  weak_mods;
-    uint16_t keycode;
     uint16_t interrupting_keycode;
-    uint16_t timer;
-    bool     interrupted;
-    bool     pressed;
-    bool     finished;
+    uint8_t  count;
+    uint8_t  weak_mods;
+#    ifndef NO_ACTION_ONESHOT
+    uint8_t oneshot_mods;
+#    endif
+    bool pressed : 1;
+    bool finished : 1;
+    bool interrupted : 1;
 } qk_tap_dance_state_t;
 
-#    define TD(n) (QK_TAP_DANCE | ((n)&0xFF))
-
 typedef void (*qk_tap_dance_user_fn_t)(qk_tap_dance_state_t *state, void *user_data);
 
 typedef struct {
+    qk_tap_dance_state_t state;
     struct {
         qk_tap_dance_user_fn_t on_each_tap;
         qk_tap_dance_user_fn_t on_dance_finished;
         qk_tap_dance_user_fn_t on_reset;
     } fn;
-    qk_tap_dance_state_t state;
-    uint16_t             custom_tapping_term;
-    void *               user_data;
+    void *user_data;
 } qk_tap_dance_action_t;
 
 typedef struct {
@@ -62,31 +59,31 @@ typedef struct {
 #    define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \
         { .fn = {qk_tap_dance_pair_on_each_tap, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset}, .user_data = (void *)&((qk_tap_dance_pair_t){kc1, kc2}), }
 
-#    define ACTION_TAP_DANCE_DUAL_ROLE(kc, layer) \
+#    define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \
         { .fn = {qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_move}), }
 
 #    define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
         { .fn = {NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_invert}), }
 
-#    define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) ACTION_TAP_DANCE_DUAL_ROLE(kc, layer)
-
 #    define ACTION_TAP_DANCE_FN(user_fn) \
         { .fn = {NULL, user_fn, NULL}, .user_data = NULL, }
 
 #    define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) \
         { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, }
 
-#    define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) \
-        { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, .custom_tapping_term = tap_specific_tapping_term, }
+#    define TD(n) (QK_TAP_DANCE | TD_INDEX(n))
+#    define TD_INDEX(code) ((code)&0xFF)
+#    define TAP_DANCE_KEYCODE(state) TD(((qk_tap_dance_action_t *)state) - tap_dance_actions)
 
 extern qk_tap_dance_action_t tap_dance_actions[];
 
+void reset_tap_dance(qk_tap_dance_state_t *state);
+
 /* To be used internally */
 
 void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record);
 bool process_tap_dance(uint16_t keycode, keyrecord_t *record);
 void tap_dance_task(void);
-void reset_tap_dance(qk_tap_dance_state_t *state);
 
 void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data);
 void qk_tap_dance_pair_finished(qk_tap_dance_state_t *state, void *user_data);
diff --git a/tests/tapdance/config.h b/tests/tapdance/config.h
new file mode 100644
index 0000000000..6aada3efd3
--- /dev/null
+++ b/tests/tapdance/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 Jouke Witteveen
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "test_common.h"
diff --git a/tests/tapdance/examples.c b/tests/tapdance/examples.c
new file mode 100644
index 0000000000..4a5be41b08
--- /dev/null
+++ b/tests/tapdance/examples.c
@@ -0,0 +1,199 @@
+/* Copyright 2022 Jouke Witteveen
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+#include "examples.h"
+
+// Example code from the tap dance documentation, adapted for testing
+
+// clang-format off
+
+// Example 1
+
+void dance_egg(qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count >= 100) {
+        // SEND_STRING("Safety dance!");
+        tap_code(KC_C);
+        reset_tap_dance(state);
+    }
+}
+
+
+// Example 2
+
+void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
+    switch (state->count) {
+        case 1:
+            register_code(KC_3);
+            break;
+        case 2:
+            register_code(KC_2);
+            break;
+        case 3:
+            register_code(KC_1);
+            break;
+        case 4:
+            unregister_code(KC_3);
+            // wait_ms(50);
+            unregister_code(KC_2);
+            // wait_ms(50);
+            unregister_code(KC_1);
+    }
+}
+
+void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count >= 4) {
+        // reset_keyboard();
+        tap_code(KC_R);
+    }
+}
+
+void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
+    unregister_code(KC_1);
+    // wait_ms(50);
+    unregister_code(KC_2);
+    // wait_ms(50);
+    unregister_code(KC_3);
+}
+
+
+// Example 3
+
+typedef struct {
+    uint16_t tap;
+    uint16_t hold;
+    uint16_t held;
+} tap_dance_tap_hold_t;
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    qk_tap_dance_action_t *action;
+
+    switch (keycode) {
+        case TD(CT_CLN):
+            action = &tap_dance_actions[TD_INDEX(keycode)];
+            if (!record->event.pressed && action->state.count && !action->state.finished) {
+                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
+                tap_code16(tap_hold->tap);
+            }
+    }
+    return true;
+}
+
+void tap_dance_tap_hold_finished(qk_tap_dance_state_t *state, void *user_data) {
+    tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
+
+    if (state->pressed) {
+        if (state->count == 1
+#ifndef PERMISSIVE_HOLD
+            && !state->interrupted
+#endif
+        ) {
+            register_code16(tap_hold->hold);
+            tap_hold->held = tap_hold->hold;
+        } else {
+            register_code16(tap_hold->tap);
+            tap_hold->held = tap_hold->tap;
+        }
+    }
+}
+
+void tap_dance_tap_hold_reset(qk_tap_dance_state_t *state, void *user_data) {
+    tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
+
+    if (tap_hold->held) {
+        unregister_code16(tap_hold->held);
+        tap_hold->held = 0;
+    }
+}
+
+#define ACTION_TAP_DANCE_TAP_HOLD(tap, hold) \
+    { .fn = {NULL, tap_dance_tap_hold_finished, tap_dance_tap_hold_reset}, .user_data = (void *)&((tap_dance_tap_hold_t){tap, hold, 0}), }
+
+
+// Example 4
+
+typedef enum {
+    TD_NONE,
+    TD_UNKNOWN,
+    TD_SINGLE_TAP,
+    TD_SINGLE_HOLD,
+    TD_DOUBLE_TAP,
+    TD_DOUBLE_HOLD,
+    TD_DOUBLE_SINGLE_TAP,
+    TD_TRIPLE_TAP,
+    TD_TRIPLE_HOLD
+} td_state_t;
+
+typedef struct {
+    bool is_press_action;
+    td_state_t state;
+} td_tap_t;
+
+td_state_t cur_dance(qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return TD_SINGLE_TAP;
+        else return TD_SINGLE_HOLD;
+    } else if (state->count == 2) {
+        if (state->interrupted) return TD_DOUBLE_SINGLE_TAP;
+        else if (state->pressed) return TD_DOUBLE_HOLD;
+        else return TD_DOUBLE_TAP;
+    }
+
+    if (state->count == 3) {
+        if (state->interrupted || !state->pressed) return TD_TRIPLE_TAP;
+        else return TD_TRIPLE_HOLD;
+    } else return TD_UNKNOWN;
+}
+
+static td_tap_t xtap_state = {
+    .is_press_action = true,
+    .state = TD_NONE
+};
+
+void x_finished(qk_tap_dance_state_t *state, void *user_data) {
+    xtap_state.state = cur_dance(state);
+    switch (xtap_state.state) {
+        case TD_SINGLE_TAP: register_code(KC_X); break;
+        case TD_SINGLE_HOLD: register_code(KC_LCTL); break;
+        case TD_DOUBLE_TAP: register_code(KC_ESC); break;
+        case TD_DOUBLE_HOLD: register_code(KC_LALT); break;
+        case TD_DOUBLE_SINGLE_TAP: tap_code(KC_X); register_code(KC_X);
+        default: break;  // Not present in documentation
+    }
+}
+
+void x_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch (xtap_state.state) {
+        case TD_SINGLE_TAP: unregister_code(KC_X); break;
+        case TD_SINGLE_HOLD: unregister_code(KC_LCTL); break;
+        case TD_DOUBLE_TAP: unregister_code(KC_ESC); break;
+        case TD_DOUBLE_HOLD: unregister_code(KC_LALT);
+        case TD_DOUBLE_SINGLE_TAP: unregister_code(KC_X);
+        default: break;  // Not present in documentation
+    }
+    xtap_state.state = TD_NONE;
+}
+
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
+    [CT_EGG]      = ACTION_TAP_DANCE_FN(dance_egg),
+    [CT_FLSH]     = ACTION_TAP_DANCE_FN_ADVANCED(dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
+    [CT_CLN]      = ACTION_TAP_DANCE_TAP_HOLD(KC_COLN, KC_SCLN),
+    [X_CTL]       = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset)
+};
+
+// clang-format on
diff --git a/tests/tapdance/examples.h b/tests/tapdance/examples.h
new file mode 100644
index 0000000000..2622af6b2f
--- /dev/null
+++ b/tests/tapdance/examples.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 Jouke Witteveen
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 __cplusplus
+extern "C" {
+#endif
+
+enum {
+    TD_ESC_CAPS,
+    CT_EGG,
+    CT_FLSH,
+    CT_CLN,
+    X_CTL,
+};
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/tapdance/test.mk b/tests/tapdance/test.mk
new file mode 100644
index 0000000000..041d9b4dc9
--- /dev/null
+++ b/tests/tapdance/test.mk
@@ -0,0 +1,22 @@
+# Copyright 2022 Jouke Witteveen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
+
+TAP_DANCE_ENABLE = yes
+
+SRC += examples.c
diff --git a/tests/tapdance/test_examples.cpp b/tests/tapdance/test_examples.cpp
new file mode 100644
index 0000000000..e67e6cb907
--- /dev/null
+++ b/tests/tapdance/test_examples.cpp
@@ -0,0 +1,319 @@
+/* Copyright 2022 Jouke Witteveen
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "action_tapping.h"
+#include "test_keymap_key.hpp"
+#include "examples.h"
+
+using testing::_;
+using testing::InSequence;
+
+class TapDance : public TestFixture {};
+
+TEST_F(TapDance, DoubleTap) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_esc_caps = KeymapKey{0, 1, 0, TD(TD_ESC_CAPS)};
+
+    set_keymap({key_esc_caps});
+
+    /* The tap dance key does nothing on the first press */
+    key_esc_caps.press();
+    run_one_scan_loop();
+    key_esc_caps.release();
+    EXPECT_NO_REPORT(driver);
+
+    /* We get the key press and the release on timeout */
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_ESC));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Double tap gets us the second key */
+    tap_key(key_esc_caps);
+    EXPECT_NO_REPORT(driver);
+    key_esc_caps.press();
+    EXPECT_REPORT(driver, (KC_CAPS));
+    run_one_scan_loop();
+    key_esc_caps.release();
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
+
+TEST_F(TapDance, DoubleTapWithMod) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_esc_caps = KeymapKey{0, 1, 0, TD(TD_ESC_CAPS)};
+    auto       key_shift    = KeymapKey{0, 2, 0, KC_LSFT};
+
+    set_keymap({key_esc_caps, key_shift});
+
+    /* The tap dance key does nothing on the first press */
+    key_shift.press();
+    EXPECT_REPORT(driver, (KC_LSFT));
+    run_one_scan_loop();
+    key_esc_caps.press();
+    run_one_scan_loop();
+
+    key_esc_caps.release();
+    key_shift.release();
+    EXPECT_EMPTY_REPORT(driver);
+
+    /* We get the key press and the release */
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_REPORT(driver, (KC_LSFT, KC_ESC));
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Double tap gets us the second key */
+    key_shift.press();
+    EXPECT_REPORT(driver, (KC_LSFT));
+    run_one_scan_loop();
+    tap_key(key_esc_caps);
+    EXPECT_NO_REPORT(driver);
+    key_shift.release();
+    key_esc_caps.press();
+    EXPECT_REPORT(driver, (KC_LSFT, KC_CAPS));
+    run_one_scan_loop();
+    key_esc_caps.release();
+    EXPECT_REPORT(driver, (KC_LSFT));
+    run_one_scan_loop();
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
+
+TEST_F(TapDance, DoubleTapInterrupted) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_esc_caps = KeymapKey{0, 1, 0, TD(TD_ESC_CAPS)};
+    auto       regular_key  = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({key_esc_caps, regular_key});
+
+    /* Interrupted double tap */
+    tap_key(key_esc_caps);
+    regular_key.press();
+    /* Immediate tap of the first key */
+    EXPECT_REPORT(driver, (KC_ESC));
+    EXPECT_EMPTY_REPORT(driver);
+    /* Followed by the interrupting key */
+    EXPECT_REPORT(driver, (KC_A));
+    run_one_scan_loop();
+    regular_key.release();
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Second tap after being interrupted acts as a single tap */
+    key_esc_caps.press();
+    run_one_scan_loop();
+    key_esc_caps.release();
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_ESC));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
+
+TEST_F(TapDance, DanceFn) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_egg = KeymapKey(0, 1, 0, TD(CT_EGG));
+
+    set_keymap({key_egg});
+
+    /* 99 taps do nothing */
+    for (int i = 0; i < 99; i++) {
+        run_one_scan_loop();
+        key_egg.press();
+        run_one_scan_loop();
+        key_egg.release();
+    }
+    idle_for(TAPPING_TERM);
+    EXPECT_NO_REPORT(driver);
+    run_one_scan_loop();
+
+    /* 100 taps trigger the action */
+    for (int i = 0; i < 100; i++) {
+        run_one_scan_loop();
+        key_egg.press();
+        run_one_scan_loop();
+        key_egg.release();
+    }
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_C));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* 250 taps act the same as 100 taps */
+    /* Taps are counted in an uint8_t, so the count overflows after 255 taps */
+    for (int i = 0; i < 250; i++) {
+        run_one_scan_loop();
+        key_egg.press();
+        run_one_scan_loop();
+        key_egg.release();
+    }
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_C));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
+
+TEST_F(TapDance, DanceFnAdvanced) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_flsh = KeymapKey(0, 1, 0, TD(CT_FLSH));
+
+    set_keymap({key_flsh});
+
+    /* Three taps don't trigger a reset */
+    EXPECT_REPORT(driver, (KC_3));
+    EXPECT_REPORT(driver, (KC_3, KC_2));
+    EXPECT_REPORT(driver, (KC_3, KC_2, KC_1));
+    for (int i = 0; i < 3; i++) {
+        run_one_scan_loop();
+        key_flsh.press();
+        run_one_scan_loop();
+        key_flsh.release();
+    }
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_3, KC_2));
+    EXPECT_REPORT(driver, (KC_3));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Four taps trigger a reset */
+    EXPECT_REPORT(driver, (KC_3));
+    EXPECT_REPORT(driver, (KC_3, KC_2));
+    EXPECT_REPORT(driver, (KC_3, KC_2, KC_1));
+    EXPECT_REPORT(driver, (KC_2, KC_1));
+    EXPECT_REPORT(driver, (KC_1));
+    EXPECT_EMPTY_REPORT(driver);
+    for (int i = 0; i < 4; i++) {
+        run_one_scan_loop();
+        key_flsh.press();
+        run_one_scan_loop();
+        key_flsh.release();
+    }
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_R));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
+
+TEST_F(TapDance, TapHold) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_cln = KeymapKey{0, 1, 0, TD(CT_CLN)};
+
+    set_keymap({key_cln});
+
+    /* Short taps fire on release */
+    key_cln.press();
+    run_one_scan_loop();
+    key_cln.release();
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_REPORT(driver, (KC_LSFT, KC_SCLN));
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Holds immediate following a tap apply to the tap key */
+    key_cln.press();
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_REPORT(driver, (KC_LSFT, KC_SCLN));
+    idle_for(TAPPING_TERM * 2);
+    key_cln.release();
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Holds trigger the hold key */
+    key_cln.press();
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+    EXPECT_REPORT(driver, (KC_SCLN));
+    run_one_scan_loop();
+    key_cln.release();
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
+
+TEST_F(TapDance, QuadFunction) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_quad    = KeymapKey{0, 1, 0, TD(X_CTL)};
+    auto       regular_key = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({key_quad, regular_key});
+
+    /* Single tap */
+    key_quad.press();
+    run_one_scan_loop();
+    key_quad.release();
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_X));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Single hold */
+    key_quad.press();
+    run_one_scan_loop();
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_LCTL));
+    run_one_scan_loop();
+    key_quad.release();
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Double tap */
+    tap_key(key_quad);
+    key_quad.press();
+    run_one_scan_loop();
+    key_quad.release();
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_ESC));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Double tap and hold */
+    tap_key(key_quad);
+    key_quad.press();
+    run_one_scan_loop();
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (KC_LALT));
+    run_one_scan_loop();
+    key_quad.release();
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    /* Double single tap */
+    tap_key(key_quad);
+    tap_key(key_quad);
+    regular_key.press();
+    EXPECT_REPORT(driver, (KC_X));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_X));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_A));
+    run_one_scan_loop();
+    regular_key.release();
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
diff --git a/users/edvorakjp/edvorakjp_tap_dance.c b/users/edvorakjp/edvorakjp_tap_dance.c
index cee10de693..69fcbac1ca 100644
--- a/users/edvorakjp/edvorakjp_tap_dance.c
+++ b/users/edvorakjp/edvorakjp_tap_dance.c
@@ -64,6 +64,15 @@ void td_raise_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-    [TD_EDVORAKJP_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_lower_finished, td_lower_reset, 150),
-    [TD_EDVORAKJP_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_raise_finished, td_raise_reset, 150),
+    [TD_EDVORAKJP_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_lower_finished, td_lower_reset),
+    [TD_EDVORAKJP_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_raise_finished, td_raise_reset),
 };
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
+            return 150;
+        default:
+            return TAPPING_TERM;
+    }
+}
diff --git a/users/gourdo1/gourdo1.c b/users/gourdo1/gourdo1.c
index b964729be9..4e741ccc91 100644
--- a/users/gourdo1/gourdo1.c
+++ b/users/gourdo1/gourdo1.c
@@ -45,7 +45,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     [TD_LSFT_CAPSLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
     [TD_LSFT_CAPS_WIN] = ACTION_TAP_DANCE_FN_ADVANCED(dance_LSFT_each_tap, NULL, dance_LSFT_reset),
     // Tap once for Escape, twice to reset to base layer
-    [TD_ESC_BASELYR] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _BASE),
+    [TD_ESC_BASELYR] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _BASE),
 };
 #endif // TD_LSFT_CAPSLOCK_ENABLE
 
diff --git a/users/mnil/config.h b/users/mnil/config.h
index 3547785ff7..b471b9a818 100644
--- a/users/mnil/config.h
+++ b/users/mnil/config.h
@@ -19,3 +19,4 @@
 #define MK_3_SPEED
 #define MK_MOMENTARY_ACCEL
 #define PERMISSIVE_HOLD
+#define TAPPING_TERM 250
diff --git a/users/mnil/mnil.c b/users/mnil/mnil.c
index d5bd0ef0bb..00da6086ef 100644
--- a/users/mnil/mnil.c
+++ b/users/mnil/mnil.c
@@ -140,7 +140,7 @@ void aa_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 // clang-format off
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [AAE] =  ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, ae_finished, ae_reset, 250),
-  [OAA] =  ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, aa_finished, aa_reset, 250)
+  [AAE] =  ACTION_TAP_DANCE_FN_ADVANCED(NULL, ae_finished, ae_reset),
+  [OAA] =  ACTION_TAP_DANCE_FN_ADVANCED(NULL, aa_finished, aa_reset)
 };
 // clang-format on
diff --git a/users/ninjonas/config.h b/users/ninjonas/config.h
index 025dbb541a..565e40e841 100644
--- a/users/ninjonas/config.h
+++ b/users/ninjonas/config.h
@@ -2,6 +2,7 @@
     #undef TAPPING_TERM
     #define TAPPING_TERM 200
 #endif
+#define TAPPING_TERM_PER_KEY
 
 // Mouse Settings: Smoothing out mouse movement on keypress
 #ifndef MOUSEKEY_INTERVAL
@@ -18,4 +19,4 @@
     #undef COMBO_TERM
     #define COMBO_COUNT 5
     #define COMBO_TERM 60
-#endif
\ No newline at end of file
+#endif
diff --git a/users/ninjonas/tap_dances.c b/users/ninjonas/tap_dances.c
index 63e4d3ba47..3e4cec9133 100644
--- a/users/ninjonas/tap_dances.c
+++ b/users/ninjonas/tap_dances.c
@@ -107,6 +107,16 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   [TD_GUI_GUISPC]   = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, LGUI(KC_SPC)),
 
   // Advanced Tap Dances
-  [TD_COPY_PASTE_APP] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, copy_paste_app_finished, copy_paste_app_reset, 300),
-  [TD_Y_NUMPAD] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, y_numpad_finished, y_numpad_reset, 300),
-};
\ No newline at end of file
+  [TD_COPY_PASTE_APP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, copy_paste_app_finished, copy_paste_app_reset),
+  [TD_Y_NUMPAD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, y_numpad_finished, y_numpad_reset),
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_COPY_PASTE_APP):
+        case TD(TD_Y_NUMPAD):
+            return 300;
+        default:
+            return TAPPING_TERM;
+    }
+}

From 87e1ff218d01b193d84c7d2e396cded57fad3fba Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 14 Jun 2022 12:30:31 +0100
Subject: [PATCH 022/959] backlight|led 'on state' for DD configuration
 (#17383)

---
 data/mappings/info_config.json      | 4 ++++
 data/schemas/definitions.jsonschema | 6 ++++++
 data/schemas/keyboard.jsonschema    | 8 ++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 5f0d903bd7..fcceb98025 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -12,6 +12,7 @@
     "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
     "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
     "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
+    "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"},
     "BACKLIGHT_PIN": {"info_key": "backlight.pin"},
     "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
     "CAPS_WORD_IDLE_TIMEOUT": {"info_key": "caps_word.idle_timeout", "value_type": "int"},
@@ -35,6 +36,9 @@
     "LED_CAPS_LOCK_PIN": {"info_key": "indicators.caps_lock"},
     "LED_NUM_LOCK_PIN": {"info_key": "indicators.num_lock"},
     "LED_SCROLL_LOCK_PIN": {"info_key": "indicators.scroll_lock"},
+    "LED_COMPOSE_PIN": {"info_key": "indicators.compose"},
+    "LED_KANA_PIN": {"info_key": "indicators.kana"},
+    "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"},
     "MANUFACTURER": {"info_key": "manufacturer"},
     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 1bdfbbeb03..5a2e5ccc05 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -150,5 +150,11 @@
         "min": 0,
         "max": 255,
         "multipleOf": 1
+    },
+    "bit": {
+        "type": "number",
+        "min": 0,
+        "max": 1,
+        "multipleOf": 1
     }
 }
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index fd60920578..9f6721ba9d 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -45,7 +45,8 @@
                     "max": 31,
                     "multipleOf": 1
                 },
-                "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}
+                "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "on_state": {"$ref": "qmk.definitions.v1#/bit"}
             }
         },
         "bluetooth": {
@@ -119,7 +120,10 @@
             "properties": {
                 "caps_lock": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "num_lock": {"$ref": "qmk.definitions.v1#/mcu_pin"},
-                "scroll_lock": {"$ref": "qmk.definitions.v1#/mcu_pin"}
+                "scroll_lock": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "compose": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "kana": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "on_state": {"$ref": "qmk.definitions.v1#/bit"}
             }
         },
         "layout_aliases": {

From fa8fb6027952cfeda532ff4712c07e80cde8cfbf Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 16 Jun 2022 09:55:15 +1000
Subject: [PATCH 023/959] Dump out the largest symbols in flash and in RAM.
 (#17397)

---
 builddefs/build_keyboard.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index a258f33216..2b9ec48e70 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -471,6 +471,19 @@ check-size: build
 check-md5: build
 objs-size: build
 
+ifeq ($(strip $(TOP_SYMBOLS)),yes)
+all: top-symbols
+check-size: top-symbols
+top-symbols: build
+	echo "###########################################"
+	echo "# Highest flash usage:"
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [t] ' | head -n10 | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	echo "###########################################"
+	echo "# Highest RAM usage:"
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [dbv] ' | head -n10 | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	echo "###########################################"
+endif
+
 include $(BUILDDEFS_PATH)/show_options.mk
 include $(BUILDDEFS_PATH)/common_rules.mk
 

From 050fa9062f6a62ee2adefde17e6634edd79d92fc Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Thu, 16 Jun 2022 08:05:27 +0200
Subject: [PATCH 024/959] tap-dance: Rename tests so that tap_dance is used
 consistently (#17396)

---
 tests/{tapdance => tap_dance}/config.h          | 0
 tests/{tapdance => tap_dance}/examples.c        | 0
 tests/{tapdance => tap_dance}/examples.h        | 0
 tests/{tapdance => tap_dance}/test.mk           | 0
 tests/{tapdance => tap_dance}/test_examples.cpp | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{tapdance => tap_dance}/config.h (100%)
 rename tests/{tapdance => tap_dance}/examples.c (100%)
 rename tests/{tapdance => tap_dance}/examples.h (100%)
 rename tests/{tapdance => tap_dance}/test.mk (100%)
 rename tests/{tapdance => tap_dance}/test_examples.cpp (100%)

diff --git a/tests/tapdance/config.h b/tests/tap_dance/config.h
similarity index 100%
rename from tests/tapdance/config.h
rename to tests/tap_dance/config.h
diff --git a/tests/tapdance/examples.c b/tests/tap_dance/examples.c
similarity index 100%
rename from tests/tapdance/examples.c
rename to tests/tap_dance/examples.c
diff --git a/tests/tapdance/examples.h b/tests/tap_dance/examples.h
similarity index 100%
rename from tests/tapdance/examples.h
rename to tests/tap_dance/examples.h
diff --git a/tests/tapdance/test.mk b/tests/tap_dance/test.mk
similarity index 100%
rename from tests/tapdance/test.mk
rename to tests/tap_dance/test.mk
diff --git a/tests/tapdance/test_examples.cpp b/tests/tap_dance/test_examples.cpp
similarity index 100%
rename from tests/tapdance/test_examples.cpp
rename to tests/tap_dance/test_examples.cpp

From ef80a1dd670d443737f1191a2557e42ad54e56bc Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 16 Jun 2022 21:02:40 +1000
Subject: [PATCH 025/959] Update V-USB submodule (#17385)

---
 lib/vusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vusb b/lib/vusb
index bdb53e4c04..819dbc1e5d 160000
--- a/lib/vusb
+++ b/lib/vusb
@@ -1 +1 @@
-Subproject commit bdb53e4c043d089279d9891b68bea77614cb97ee
+Subproject commit 819dbc1e5d5926b17e27e00ca6d3d2988adae04e

From 0b1bed1d41951fa039227a6737be470628df8466 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Thu, 16 Jun 2022 20:20:12 +0200
Subject: [PATCH 026/959] Use --exclude-from=.gitignore in place of
 --exclude-standard (#17399)

---
 lib/python/qmk/git.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/python/qmk/git.py b/lib/python/qmk/git.py
index f493628492..960184a0a2 100644
--- a/lib/python/qmk/git.py
+++ b/lib/python/qmk/git.py
@@ -111,9 +111,9 @@ def git_check_deviation(active_branch):
 
 
 def git_get_ignored_files(check_dir='.'):
-    """Return a list of files that would be captured by the current .gitingore
+    """Return a list of files that would be captured by the current .gitignore
     """
-    invalid = cli.run(['git', 'ls-files', '-c', '-o', '-i', '--exclude-standard', check_dir])
+    invalid = cli.run(['git', 'ls-files', '-c', '-o', '-i', '--exclude-from=.gitignore', check_dir])
     if invalid.returncode != 0:
         return []
     return invalid.stdout.strip().splitlines()

From 999b91fbd94a26e78a9f75192d8865342a73e0fd Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Fri, 17 Jun 2022 08:03:38 +1000
Subject: [PATCH 027/959] SPI Bugfix for ChibiOS 21.11.1 -- also rollback
 AW20216 mode change issue. (#17371)

---
 drivers/led/aw20216.c         | 2 +-
 lib/chibios                   | 2 +-
 util/update_chibios_mirror.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
index 299434f909..55083936ef 100644
--- a/drivers/led/aw20216.c
+++ b/drivers/led/aw20216.c
@@ -54,7 +54,7 @@
 #endif
 
 #ifndef AW_SPI_MODE
-#    define AW_SPI_MODE 3
+#    define AW_SPI_MODE 0
 #endif
 
 #ifndef AW_SPI_DIVISOR
diff --git a/lib/chibios b/lib/chibios
index 257302333c..f836d24b06 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 257302333c31f1f710800c2b97acf3550de043e1
+Subproject commit f836d24b06d7265696a33d1cea010bd6a931791d
diff --git a/util/update_chibios_mirror.sh b/util/update_chibios_mirror.sh
index e6666c55c9..bd4c5c1529 100755
--- a/util/update_chibios_mirror.sh
+++ b/util/update_chibios_mirror.sh
@@ -7,7 +7,7 @@
 chibios_branches="trunk stable_20.3.x stable_21.11.x"
 
 # The ChibiOS tags to mirror
-chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1"
+chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1 ver21.11.2"
 
 # The ChibiOS-Contrib branches to mirror
 contrib_branches="chibios-20.3.x chibios-21.11.x"

From 6d67e9df4be6981de05517626c1a504da31abf16 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Fri, 17 Jun 2022 22:06:44 +0200
Subject: [PATCH 028/959] [Core] Allow usage of ChibiOS's SIO driver for split
 keyboards (#15907)

---
 docs/serial_driver.md                    | 291 +++++++++++++++++------
 platforms/chibios/drivers/serial_usart.c | 173 ++++++++++----
 platforms/chibios/drivers/serial_usart.h |  39 +--
 3 files changed, 365 insertions(+), 138 deletions(-)

diff --git a/docs/serial_driver.md b/docs/serial_driver.md
index 3e89deffad..3338b55fec 100644
--- a/docs/serial_driver.md
+++ b/docs/serial_driver.md
@@ -1,129 +1,268 @@
 # 'serial' Driver
-This driver powers the [Split Keyboard](feature_split_keyboard.md) feature.
+
+The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more then two halves.
+
+| Driver                                  | AVR                | ARM                | Connection between halves                                                                     |
+| --------------------------------------- | ------------------ | ------------------ | --------------------------------------------------------------------------------------------- |
+| [Bitbang](#bitbang)                     | :heavy_check_mark: | :heavy_check_mark: | Single wire communication. One wire is used for reception and transmission.                   |
+| [USART Half-duplex](#usart-half-duplex) |                    | :heavy_check_mark: | Efficient single wire communication. One wire is used for reception and transmission.         |
+| [USART Full-duplex](#usart-full-duplex) |                    | :heavy_check_mark: | Efficient two wire communication. Two distinct wires are used for reception and transmission. |
 
 ?> Serial in this context should be read as **sending information one bit at a time**, rather than implementing UART/USART/RS485/RS232 standards.
 
-Drivers in this category have the following characteristics:
-* bit bang and USART Half-duplex provide data and signaling over a single conductor
-* USART Full-duplex provide data and signaling over two conductors
-* They are all limited to single master and single slave communication scheme
+<hr>
 
-## Supported Driver Types
+## Bitbang
 
-|                   | AVR                | ARM                |
-| ----------------- | ------------------ | ------------------ |
-| bit bang          | :heavy_check_mark: | :heavy_check_mark: |
-| USART Half-duplex |                    | :heavy_check_mark: |
-| USART Full-duplex |                    | :heavy_check_mark: |
+This is the Default driver, the absence of configuration assumes this driver. It works by [bit banging](https://en.wikipedia.org/wiki/Bit_banging) a GPIO pin using the CPU. It is therefore not as efficient as a dedicated hardware peripheral, which the Half-duplex and Full-duplex drivers use.
 
-## Driver configuration
+!> On ARM platforms the bitbang driver causes connection issues when using it together with the bitbang WS2812 driver. Choosing alternate drivers for both serial and WS2812 (instead of bitbang) is strongly recommended.
 
-### Bitbang
-Default driver, the absence of configuration assumes this driver. To configure it, add this to your rules.mk:
+### Pin configuration
+
+```
+  LEFT                      RIGHT
++-------+      SERIAL     +-------+
+|   SSP |-----------------| SSP   |
+|       |       VDD       |       |
+|       |-----------------|       |
+|       |       GND       |       |
+|       |-----------------|       |
++-------+                 +-------+
+```
+
+One GPIO pin is needed for the bitbang driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SOFT_SERIAL_PIN` (SSP) in the configuration. A simple TRS or USB cable provides enough conductors for this driver to work. 
+
+### Setup
+
+To use the bitbang driver follow these steps to activate it.
+
+1. Change the `SERIAL_DRIVER` to `bitbang` in your keyboards `rules.mk` file:
 
 ```make
 SERIAL_DRIVER = bitbang
 ```
 
-Configure the driver via your config.h:
+2. Configure the GPIO pin of your keyboard via the `config.h` file:
+
 ```c
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-#define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5
-                                   //  0: about 189kbps (Experimental only)
-                                   //  1: about 137kbps (default)
-                                   //  2: about 75kbps
-                                   //  3: about 39kbps
-                                   //  4: about 26kbps
-                                   //  5: about 20kbps
 ```
 
-#### ARM
+3. On ARM platforms you must turn on ChibiOS `PAL_USE_CALLBACKS` feature:
 
-!> The bitbang driver causes connection issues with bitbang WS2812 driver
+* In `halconf.h` add the line `#define PAL_USE_CALLBACKS TRUE`.
 
-Along with the generic options above, you must also turn on the `PAL_USE_CALLBACKS` feature in your halconf.h.
+<hr>
 
-### USART Half-duplex
-Targeting STM32 boards where communication is offloaded to a USART hardware device. The advantage over bitbang is that this provides fast and accurate timings. `SERIAL_PIN_TX` for this driver is the configured USART TX pin. As this Pin is configured in open-drain mode an **external pull-up resistor is needed to keep the line high** (resistor values of 1.5k to 8.2k are known to work). To configure it, add this to your rules.mk:
+## USART Half-duplex
+
+Targeting ARM boards based on ChibiOS, where communication is offloaded to a USART hardware device that supports Half-duplex operation. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible.
+
+### Pin configuration
+
+```
+  LEFT                      RIGHT  
++-------+  |           |  +-------+
+|       |  R           R  |       |
+|       |  |   SERIAL  |  |       |
+|    TX |-----------------| TX    |
+|       |       VDD       |       |
+|       |-----------------|       |
+|       |       GND       |       |
+|       |-----------------|       |
++-------+                 +-------+
+```
+
+Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is refereed to as the `SERIAL_USART_TX_PIN` in the configuration. Take care that the pin you chose can act as the TX pin of the USART peripheral. A simple TRS or USB cable provides enough conductors for this driver to work. As the split connection is configured to work in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work.
+
+### Setup
+
+To use the Half-duplex driver follow these steps to activate it.
+
+1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
 ```make
 SERIAL_DRIVER = usart
 ```
 
-Configure the hardware via your config.h:
+2. Configure the hardware of your keyboard via the `config.h` file:
+
 ```c
-#define SOFT_SERIAL_PIN B6         // USART TX pin
-//#define USART1_REMAP             // Remap USART TX and RX pins on STM32F103 MCUs, see table below.
-#define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5
-                                   //  0: about 460800 baud
-                                   //  1: about 230400 baud (default)
-                                   //  2: about 115200 baud
-                                   //  3: about 57600 baud
-                                   //  4: about 38400 baud
-                                   //  5: about 19200 baud
-#define SERIAL_USART_DRIVER SD1    // USART driver of TX pin. default: SD1
-#define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#define SERIAL_USART_TIMEOUT 20    // USART driver timeout. default 20
+#define SERIAL_USART_TX_PIN B6     // The GPIO pin that is used split communication.
 ```
 
-You must also enable the ChibiOS `SERIAL` feature:
-* In your board's halconf.h: `#define HAL_USE_SERIAL TRUE`
-* In your board's mcuconf.h: `#define STM32_SERIAL_USE_USARTn TRUE` (where 'n' matches the peripheral number of your selected USART on the MCU)
+For STM32 MCUs several GPIO configuration options can be changed as well. See the section ["Alternate Functions for selected STM32 MCUs"](alternate-functions-for-selected-stm32-mcus).
 
-Do note that the configuration required is for the `SERIAL` peripheral, not the `UART` peripheral.
+```c
+#define USART1_REMAP               // Remap USART TX and RX pins on STM32F103 MCUs, see table below.
+#define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+```
 
-### USART Full-duplex
-Targeting STM32 boards where communication is offloaded to a USART hardware device. The advantage over bitbang is that this provides fast and accurate timings. USART Full-Duplex requires two conductors **without** pull-up resistors instead of one conductor with a pull-up resistor unlike the Half-duplex driver. Due to its internal design it is more efficent, which can result in even faster transmission speeds.
+3. Decide either for ChibiOS `SERIAL` or `SIO` subsystem, see the section ["Choosing a ChibiOS driver subsystem"](#choosing-a-chibios-driver-subsystem).
 
-#### Pin configuration
+<hr>
 
-`SERIAL_USART_TX_PIN` is the USART `TX` pin, `SERIAL_USART_RX_PIN` is the USART `RX` pin. No external pull-up resistors are needed as the `TX` pin operates in push-pull mode. To use this driver the usart peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refeer to the corresponding datasheets of your MCU or find those settings in the table below.
+## USART Full-duplex
 
-#### Connecting the halves and Pin Swap
-Please note that `TX` of the master half has to be connected with the `RX` pin of the slave half and `RX` of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the pcb. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU, this feature can be enabled using `#define SERIAL_USART_PIN_SWAP` in your config.h.
+Targeting ARM boards based on ChibiOS where communication is offloaded to an USART hardware device. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible. Due to its internal design it is slightly more efficient then the Half-duplex driver, but it should be primarily chosen if Half-duplex operation is not supported by the USART peripheral.
 
-#### Setup
-To use the driver, add this to your rules.mk:
+### Pin configuration
+
+```
+  LEFT                      RIGHT
++-------+                 +-------+
+|       |      SERIAL     |       |
+|    TX |-----------------| RX    |
+|       |      SERIAL     |       |
+|    RX |-----------------| TX    |
+|       |       VDD       |       |
+|       |-----------------|       |
+|       |       GND       |       |
+|       |-----------------|       |
++-------+                 +-------+
+```
+
+Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A simple TRRS or USB cable provides enough conductors for this driver to work.
+
+To use this driver the usart peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Reefer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus).
+
+### Setup
+
+To use the Full-duplex driver follow these steps to activate it.
+
+1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
 ```make
 SERIAL_DRIVER = usart
 ```
 
-Next configure the hardware via your config.h:
+2. Configure the hardware of your keyboard via the `config.h` file:
 
 ```c
 #define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
 #define SERIAL_USART_TX_PIN B6     // USART TX pin
 #define SERIAL_USART_RX_PIN B7     // USART RX pin
-//#define USART1_REMAP             // Remap USART TX and RX pins on STM32F103 MCUs, see table below.
-//#define SERIAL_USART_PIN_SWAP    // Swap TX and RX pins if keyboard is master halve.
-                                   // Check if this feature is necessary with your keyboard design and available on the mcu.
-#define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5
-                                   //  0: 460800 baud
-                                   //  1: 230400 baud (default)
-                                   //  2: 115200 baud
-                                   //  3: 57600 baud
-                                   //  4: 38400 baud
-                                   //  5: 19200 baud
-#define SERIAL_USART_DRIVER SD1    // USART driver of TX and RX pin. default: SD1
+```
+
+For STM32 MCUs several GPIO configuration options, including the ability for `TX` to `RX` pin swapping, can be changed as well. See the section ["Alternate Functions for selected STM32 MCUs"](alternate-functions-for-selected-stm32-mcus).
+
+```c
+#define SERIAL_USART_PIN_SWAP      // Swap TX and RX pins if keyboard is master halve. (Only available on some MCUs)
+#define USART1_REMAP               // Remap USART TX and RX pins on STM32F103 MCUs, see table below.
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+```
+
+3. Decide either for ChibiOS `SERIAL` or `SIO` subsystem, see the section ["Choosing a ChibiOS driver subsystem"](#choosing-a-chibios-driver-subsystem).
+
+<hr>
+
+## Choosing a ChibiOS driver subsystem
+
+### The `SERIAL` driver
+
+The `SERIAL` Subsystem is supported for the majority of ChibiOS MCUs and should be used whenever supported. Follow these steps in order to activate it:
+
+1. In your keyboards `halconf.h` add:
+
+```c
+#define HAL_USE_SERIAL TRUE
+```
+
+2. In your keyboards `mcuconf.h`: activate the USART peripheral that is used on your MCU. The shown example is for an STM32 MCU, so this will not work on MCUs by other manufacturers. You can find the correct names in the `mcuconf.h` files of your MCU that ship with ChibiOS. 
+ 
+Just below `#include_next <mcuconf.h>` add:
+
+```c
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USARTn
+#define STM32_SERIAL_USE_USARTn TRUE
+```
+
+Where 'n' matches the peripheral number of your selected USART on the MCU.
+
+3. In you keyboards `config.h`: override the default USART `SERIAL` driver if you use a USART peripheral that does not belong to the default selected `SD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SD3`.
+
+```c
+ #define SERIAL_USART_DRIVER SD3
+ ```
+
+### The `SIO` driver
+
+The `SIO` Subsystem was added to ChibiOS with the 21.11 release and is only supported on selected MCUs. It should only be chosen when the `SERIAL` subsystem is not supported by your MCU.
+
+Follow these steps in order to activate it:
+
+1. In your keyboards `halconf.h` add:
+
+```c
+#define HAL_USE_SIO TRUE
+```
+
+2. In your keyboards `mcuconf.h:` activate the USART peripheral that is used on your MCU. The shown example is for an STM32 MCU, so this will not work on MCUs by other manufacturers. You can find the correct names in the `mcuconf.h` files of your MCU that ship with ChibiOS. 
+ 
+Just below `#include_next <mcuconf.h>` add:
+
+```c
+#include_next <mcuconf.h>
+
+#undef STM32_SIO_USE_USARTn
+#define STM32_SIO_USE_USARTn TRUE
+```
+
+Where 'n' matches the peripheral number of your selected USART on the MCU.
+
+3. In you keyboards `config.h`: override the default USART `SIO` driver if you use a USART peripheral that does not belong to the default selected `SIOD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SIOD3`.
+
+```c
+ #define SERIAL_USART_DRIVER SIOD3
+ ```
+ 
+<hr>
+
+## Advanced Configuration
+
+There are several advanced configuration options that can be defined in your keyboards `config.h` file:
+
+### Baudrate
+
+If you're having issues or need a higher baudrate with serial communication, you can change the baudrate which in turn controls the communication speed for serial. You want to lower the baudrate if you experience failed transactions. 
+
+```c
+#define SELECT_SOFT_SERIAL_SPEED {#}
+```
+
+| Speed | Bitbang                    | Half-duplex and Full-duplex |
+| ----- | -------------------------- | --------------------------- |
+| `0`   | 189000 baud (experimental) | 460800 baud                 |
+| `1`   | 137000 baud (default)      | 230400 baud (default)       |
+| `2`   | 75000 baud                 | 115200 baud                 |
+| `3`   | 39000 baud                 | 57600 baud                  |
+| `4`   | 26000 baud                 | 38400 baud                  |
+| `5`   | 20000 baud                 | 19200 baud                  |
+
+Alternatively you can specify the baudrate directly by defining `SERIAL_USART_SPEED`.
+
+### Timeout
+
+This is the default time window in milliseconds in which a successful communication has to complete. Usually you don't want to change this value. But you can do so anyways by defining an alternate one in your keyboards `config.h` file:
+
+```c
 #define SERIAL_USART_TIMEOUT 20    // USART driver timeout. default 20
 ```
 
-You must also enable the ChibiOS `SERIAL` feature:
-* In your board's halconf.h: `#define HAL_USE_SERIAL TRUE`
-* In your board's mcuconf.h: `#define STM32_SERIAL_USE_USARTn TRUE` (where 'n' matches the peripheral number of your selected USART on the MCU)
+<hr>
 
-Do note that the configuration required is for the `SERIAL` peripheral, not the `UART` peripheral.
+## Alternate Functions for selected STM32 MCUs
 
-#### Pins for USART Peripherals with Alternate Functions for selected STM32 MCUs
+Pins for USART Peripherals with 
 
-##### STM32F303 / Proton-C [Datasheet](https://www.st.com/resource/en/datasheet/stm32f303cc.pdf)
+### STM32F303 / Proton-C [Datasheet](https://www.st.com/resource/en/datasheet/stm32f303cc.pdf)
 
 Pin Swap available: :heavy_check_mark:
 
-|    Pin     | Function | Mode |
+| Pin        | Function | Mode |
 | ---------- | -------- | ---- |
 | **USART1** |          |      |
 | PA9        | TX       | AF7  |
@@ -151,11 +290,11 @@ Pin Swap available: :heavy_check_mark:
 | PD8        | TX       | AF7  |
 | PD9        | RX       | AF7  |
 
-##### STM32F072 [Datasheet](https://www.st.com/resource/en/datasheet/stm32f072c8.pdf)
+### STM32F072 [Datasheet](https://www.st.com/resource/en/datasheet/stm32f072c8.pdf)
 
 Pin Swap available: :heavy_check_mark:
 
-|  Pin   | Function | Mode |
+| Pin    | Function | Mode |
 | ------ | -------- | ---- |
 | USART1 |          |      |
 | PA9    | TX       | AF1  |
@@ -180,7 +319,7 @@ Pin Swap available: :heavy_check_mark:
 | PA0    | TX       | AF4  |
 | PA1    | RX       | AF4  |
 
-##### STM32F103 Medium Density (C8-CB) [Datasheet](https://www.st.com/resource/en/datasheet/stm32f103c8.pdf)
+### STM32F103 Medium Density (C8-CB) [Datasheet](https://www.st.com/resource/en/datasheet/stm32f103c8.pdf)
 
 Pin Swap available: N/A
 
@@ -190,7 +329,7 @@ Pin remapping:
 
 The pins of USART Peripherals use default Pins that can be remapped to use other pins using the AFIO registers. Default pins are marked **bold**. Add the appropriate defines to your config.h file.
 
-|    Pin     | Function | Mode |     USART_REMAP     |
+| Pin        | Function | Mode | USART_REMAP         |
 | ---------- | -------- | ---- | ------------------- |
 | **USART1** |          |      |                     |
 | **PA9**    | TX       | AFPP |                     |
diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index e9fa4af7a3..7ea25d005b 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -1,44 +1,47 @@
-/* Copyright 2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 QMK
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "serial_usart.h"
 #include "synchronization_util.h"
 
 #if defined(SERIAL_USART_CONFIG)
-static SerialConfig serial_config = SERIAL_USART_CONFIG;
+static QMKSerialConfig serial_config = SERIAL_USART_CONFIG;
 #else
-static SerialConfig serial_config = {
-    .speed = (SERIAL_USART_SPEED), /* speed - mandatory */
+static QMKSerialConfig serial_config = {
+#    if HAL_USE_SERIAL
+    .speed = (SERIAL_USART_SPEED), /* baudrate - mandatory */
+#    else
+    .baud = (SERIAL_USART_SPEED), /* baudrate - mandatory */
+#    endif
     .cr1   = (SERIAL_USART_CR1),
     .cr2   = (SERIAL_USART_CR2),
 #    if !defined(SERIAL_USART_FULL_DUPLEX)
     .cr3   = ((SERIAL_USART_CR3) | USART_CR3_HDSEL) /* activate half-duplex mode */
 #    else
-    .cr3 = (SERIAL_USART_CR3)
+    .cr3  = (SERIAL_USART_CR3)
 #    endif
 };
 #endif
 
-static SerialDriver* serial_driver = &SERIAL_USART_DRIVER;
+static QMKSerialDriver* serial_driver = (QMKSerialDriver*)&SERIAL_USART_DRIVER;
 
 static inline bool react_to_transactions(void);
 static inline bool __attribute__((nonnull)) receive(uint8_t* destination, const size_t size);
+static inline bool __attribute__((nonnull)) receive_blocking(uint8_t* destination, const size_t size);
 static inline bool __attribute__((nonnull)) send(const uint8_t* source, const size_t size);
 static inline bool initiate_transaction(uint8_t sstd_index);
 static inline void usart_clear(void);
+static inline void usart_driver_start(void);
+
+#if HAL_USE_SERIAL
+
+/**
+ * @brief SERIAL Driver startup routine.
+ */
+static inline void usart_driver_start(void) {
+    sdStart(serial_driver, &serial_config);
+}
 
 /**
  * @brief Clear the receive input queue.
@@ -64,6 +67,45 @@ static inline void usart_clear(void) {
     }
 }
 
+#elif HAL_USE_SIO
+
+void clear_rx_evt_cb(SIODriver* siop) {
+    osalSysLockFromISR();
+    /* If errors occured during transactions this callback is invoked. We just
+     * clear the error sources and move on. We rely on the fact that we check
+     * for the success of the transaction by comparing the received/send bytes
+     * with the actual received/send bytes in the send/receive functions. */
+    sioGetAndClearEventsI(serial_driver);
+    osalSysUnlockFromISR();
+}
+
+static const SIOOperation serial_usart_operation = {.rx_cb = NULL, .rx_idle_cb = NULL, .tx_cb = NULL, .tx_end_cb = NULL, .rx_evt_cb = &clear_rx_evt_cb};
+
+/**
+ * @brief SIO Driver startup routine.
+ */
+static inline void usart_driver_start(void) {
+    sioStart(serial_driver, &serial_config);
+    sioStartOperation(serial_driver, &serial_usart_operation);
+}
+
+/**
+ * @brief Clear the receive input queue, as some MCUs have built-in hardware FIFOs.
+ */
+static inline void usart_clear(void) {
+    osalSysLock();
+    while (!sioIsRXEmptyX(serial_driver)) {
+        (void)sioGetX(serial_driver);
+    }
+    osalSysUnlock();
+}
+
+#else
+
+#    error Either the SERIAL or SIO driver has to be activated to use the usart driver for split keyboards.
+
+#endif
+
 /**
  * @brief Blocking send of buffer with timeout.
  *
@@ -71,15 +113,46 @@ static inline void usart_clear(void) {
  * @return false Send failed.
  */
 static inline bool send(const uint8_t* source, const size_t size) {
-    bool success = (size_t)sdWriteTimeout(serial_driver, source, size, TIME_MS2I(SERIAL_USART_TIMEOUT)) == size;
+    bool success = (size_t)chnWriteTimeout(serial_driver, source, size, TIME_MS2I(SERIAL_USART_TIMEOUT)) == size;
 
 #if !defined(SERIAL_USART_FULL_DUPLEX)
-    if (success) {
-        /* Half duplex fills the input queue with the data we wrote - just throw it away.
-           Under the right circumstances (e.g. bad cables paired with high baud rates)
-           less bytes can be present in the input queue, therefore a timeout is needed. */
-        uint8_t dump[size];
-        return receive(dump, size);
+    /* Half duplex fills the input queue with the data we wrote - just throw it away. */
+    if (likely(success)) {
+        size_t bytes_left = size;
+#    if HAL_USE_SERIAL
+        /* The SERIAL driver uses large soft FIFOs that are filled from an IRQ
+         * context, so there is a delay between receiving the data and it
+         * becoming actually available, therefore we have to apply a timeout
+         * mechanism. Under the right circumstances (e.g. bad cables paired with
+         * high baud rates) less bytes can be present in the input queue as
+         * well. */
+        uint8_t dump[64];
+
+        while (unlikely(bytes_left >= 64)) {
+            if (unlikely(!receive(dump, 64))) {
+                return false;
+            }
+            bytes_left -= 64;
+        }
+
+        return receive(dump, bytes_left);
+#    else
+        /* The SIO driver directly accesses the hardware FIFOs of the USART
+         * peripheral. As these are limited in depth, the RX FIFO might have been
+         * overflowed by a large that we just send. Therefore we attempt to read
+         * back all the data we send or until the FIFO runs empty in case it
+         * overflowed and data was truncated. */
+        if (unlikely(sioSynchronizeTXEnd(serial_driver, TIME_MS2I(SERIAL_USART_TIMEOUT)) < MSG_OK)) {
+            return false;
+        }
+
+        osalSysLock();
+        while (bytes_left > 0 && !sioIsRXEmptyX(serial_driver)) {
+            (void)sioGetX(serial_driver);
+            bytes_left--;
+        }
+        osalSysUnlock();
+#    endif
     }
 #endif
 
@@ -90,10 +163,21 @@ static inline bool send(const uint8_t* source, const size_t size) {
  * @brief  Blocking receive of size * bytes with timeout.
  *
  * @return true Receive success.
- * @return false Receive failed.
+ * @return false Receive failed, e.g. by timeout.
  */
 static inline bool receive(uint8_t* destination, const size_t size) {
-    bool success = (size_t)sdReadTimeout(serial_driver, destination, size, TIME_MS2I(SERIAL_USART_TIMEOUT)) == size;
+    bool success = (size_t)chnReadTimeout(serial_driver, destination, size, TIME_MS2I(SERIAL_USART_TIMEOUT)) == size;
+    return success;
+}
+
+/**
+ * @brief  Blocking receive of size * bytes.
+ *
+ * @return true Receive success.
+ * @return false Receive failed.
+ */
+static inline bool receive_blocking(uint8_t* destination, const size_t size) {
+    bool success = (size_t)chnRead(serial_driver, destination, size) == size;
     return success;
 }
 
@@ -146,7 +230,7 @@ __attribute__((weak)) void usart_init(void) {
 /**
  * @brief Overridable master specific initializations.
  */
-__attribute__((weak, nonnull)) void usart_master_init(SerialDriver** driver) {
+__attribute__((weak, nonnull)) void usart_master_init(QMKSerialDriver** driver) {
     (void)driver;
     usart_init();
 }
@@ -154,7 +238,7 @@ __attribute__((weak, nonnull)) void usart_master_init(SerialDriver** driver) {
 /**
  * @brief Overridable slave specific initializations.
  */
-__attribute__((weak, nonnull)) void usart_slave_init(SerialDriver** driver) {
+__attribute__((weak, nonnull)) void usart_slave_init(QMKSerialDriver** driver) {
     (void)driver;
     usart_init();
 }
@@ -169,7 +253,7 @@ static THD_FUNCTION(SlaveThread, arg) {
     chRegSetThreadName("usart_tx_rx");
 
     while (true) {
-        if (!react_to_transactions()) {
+        if (unlikely(!react_to_transactions())) {
             /* Clear the receive queue, to start with a clean slate.
              * Parts of failed transactions or spurious bytes could still be in it. */
             usart_clear();
@@ -184,7 +268,7 @@ static THD_FUNCTION(SlaveThread, arg) {
 void soft_serial_target_init(void) {
     usart_slave_init(&serial_driver);
 
-    sdStart(serial_driver, &serial_config);
+    usart_driver_start();
 
     /* Start transport thread. */
     chThdCreateStatic(waSlaveThread, sizeof(waSlaveThread), HIGHPRIO, SlaveThread, NULL);
@@ -195,10 +279,11 @@ void soft_serial_target_init(void) {
  */
 static inline bool react_to_transactions(void) {
     /* Wait until there is a transaction for us. */
-    uint8_t sstd_index = (uint8_t)sdGet(serial_driver);
+    uint8_t sstd_index = 0;
+    receive_blocking(&sstd_index, sizeof(sstd_index));
 
     /* Sanity check that we are actually responding to a valid transaction. */
-    if (sstd_index >= NUM_TOTAL_TRANSACTIONS) {
+    if (unlikely(sstd_index >= NUM_TOTAL_TRANSACTIONS)) {
         return false;
     }
 
@@ -208,13 +293,13 @@ static inline bool react_to_transactions(void) {
     /* Send back the handshake which is XORed as a simple checksum,
      to signal that the slave is ready to receive possible transaction buffers  */
     sstd_index ^= HANDSHAKE_MAGIC;
-    if (!send(&sstd_index, sizeof(sstd_index))) {
+    if (unlikely(!send(&sstd_index, sizeof(sstd_index)))) {
         return false;
     }
 
     /* Receive transaction buffer from the master. If this transaction requires it.*/
     if (trans->initiator2target_buffer_size) {
-        if (!receive(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size)) {
+        if (unlikely(!receive(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size))) {
             return false;
         }
     }
@@ -226,7 +311,7 @@ static inline bool react_to_transactions(void) {
 
     /* Send transaction buffer to the master. If this transaction requires it. */
     if (trans->target2initiator_buffer_size) {
-        if (!send(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size)) {
+        if (unlikely(!send(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size))) {
             return false;
         }
     }
@@ -244,7 +329,7 @@ void soft_serial_initiator_init(void) {
     serial_config.cr2 |= USART_CR2_SWAP; // master has swapped TX/RX pins
 #endif
 
-    sdStart(serial_driver, &serial_config);
+    usart_driver_start();
 }
 
 /**
@@ -270,7 +355,7 @@ bool soft_serial_transaction(int index) {
  */
 static inline bool initiate_transaction(uint8_t sstd_index) {
     /* Sanity check that we are actually starting a valid transaction. */
-    if (sstd_index >= NUM_TOTAL_TRANSACTIONS) {
+    if (unlikely(sstd_index >= NUM_TOTAL_TRANSACTIONS)) {
         dprintln("USART: Illegal transaction Id.");
         return false;
     }
@@ -278,7 +363,7 @@ static inline bool initiate_transaction(uint8_t sstd_index) {
     split_transaction_desc_t* trans = &split_transaction_table[sstd_index];
 
     /* Send transaction table index to the slave, which doubles as basic handshake token. */
-    if (!send(&sstd_index, sizeof(sstd_index))) {
+    if (unlikely(!send(&sstd_index, sizeof(sstd_index)))) {
         dprintln("USART: Send Handshake failed.");
         return false;
     }
@@ -289,14 +374,14 @@ static inline bool initiate_transaction(uint8_t sstd_index) {
      *   - due to the half duplex limitations on return codes, we always have to read *something*.
      *   - without the read, write only transactions *always* succeed, even during the boot process where the slave is not ready.
      */
-    if (!receive(&sstd_index_shake, sizeof(sstd_index_shake)) || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC))) {
+    if (unlikely(!receive(&sstd_index_shake, sizeof(sstd_index_shake)) || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC)))) {
         dprintln("USART: Handshake failed.");
         return false;
     }
 
     /* Send transaction buffer to the slave. If this transaction requires it. */
     if (trans->initiator2target_buffer_size) {
-        if (!send(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size)) {
+        if (unlikely(!send(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size))) {
             dprintln("USART: Send failed.");
             return false;
         }
@@ -304,7 +389,7 @@ static inline bool initiate_transaction(uint8_t sstd_index) {
 
     /* Receive transaction buffer from the slave. If this transaction requires it. */
     if (trans->target2initiator_buffer_size) {
-        if (!receive(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size)) {
+        if (unlikely(!receive(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size))) {
             dprintln("USART: Receive failed.");
             return false;
         }
diff --git a/platforms/chibios/drivers/serial_usart.h b/platforms/chibios/drivers/serial_usart.h
index 81fe9e0113..98c634dac0 100644
--- a/platforms/chibios/drivers/serial_usart.h
+++ b/platforms/chibios/drivers/serial_usart.h
@@ -1,18 +1,5 @@
-/* Copyright 2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -23,8 +10,24 @@
 #include <ch.h>
 #include <hal.h>
 
-#if !defined(SERIAL_USART_DRIVER)
-#    define SERIAL_USART_DRIVER SD1
+#if HAL_USE_SERIAL
+
+typedef SerialDriver QMKSerialDriver;
+typedef SerialConfig QMKSerialConfig;
+
+#    if !defined(SERIAL_USART_DRIVER)
+#        define SERIAL_USART_DRIVER SD1
+#    endif
+
+#elif HAL_USE_SIO
+
+typedef SIODriver QMKSerialDriver;
+typedef SIOConfig QMKSerialConfig;
+
+#    if !defined(SERIAL_USART_DRIVER)
+#        define SERIAL_USART_DRIVER SIOD1
+#    endif
+
 #endif
 
 #if !defined(USE_GPIOV1)
@@ -113,4 +116,4 @@
 #    define SERIAL_USART_TIMEOUT 20
 #endif
 
-#define HANDSHAKE_MAGIC 7
+#define HANDSHAKE_MAGIC 7U

From fe680a8568d275732738b07166b8f8a950d1e282 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Sat, 18 Jun 2022 00:04:17 +0200
Subject: [PATCH 029/959] [Core] Split ChibiOS usart split driver in protocol
 and hardware driver part (#16669)

---
 builddefs/common_features.mk                |  10 +-
 docs/serial_driver.md                       |  10 +
 drivers/serial.h                            |  10 +
 platforms/chibios/drivers/serial.c          |   4 +-
 platforms/chibios/drivers/serial_protocol.c | 164 +++++++++++++++++
 platforms/chibios/drivers/serial_protocol.h |  49 +++++
 platforms/chibios/drivers/serial_usart.c    | 191 +-------------------
 platforms/chibios/drivers/serial_usart.h    |  81 ++++-----
 8 files changed, 292 insertions(+), 227 deletions(-)
 create mode 100644 platforms/chibios/drivers/serial_protocol.c
 create mode 100644 platforms/chibios/drivers/serial_protocol.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index ff0c6b0cc6..83505596d2 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -583,6 +583,14 @@ ifneq ($(strip $(DEBOUNCE_TYPE)), custom)
     QUANTUM_SRC += $(QUANTUM_DIR)/debounce/$(strip $(DEBOUNCE_TYPE)).c
 endif
 
+
+VALID_SERIAL_DRIVER_TYPES := bitbang usart
+
+SERIAL_DRIVER ?= bitbang
+ifeq ($(filter $(SERIAL_DRIVER),$(VALID_SERIAL_DRIVER_TYPES)),)
+    $(call CATASTROPHIC_ERROR,Invalid SERIAL_DRIVER,SERIAL_DRIVER="$(SERIAL_DRIVER)" is not a valid SERIAL driver)
+endif
+
 ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
     POST_CONFIG_H += $(QUANTUM_DIR)/split_common/post_config.h
     OPT_DEFS += -DSPLIT_KEYBOARD
@@ -607,11 +615,11 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
             endif
         endif
 
-        SERIAL_DRIVER ?= bitbang
         OPT_DEFS += -DSERIAL_DRIVER_$(strip $(shell echo $(SERIAL_DRIVER) | tr '[:lower:]' '[:upper:]'))
         ifeq ($(strip $(SERIAL_DRIVER)), bitbang)
             QUANTUM_LIB_SRC += serial.c
         else
+            QUANTUM_LIB_SRC += serial_protocol.c
             QUANTUM_LIB_SRC += serial_$(strip $(SERIAL_DRIVER)).c
         endif
     endif
diff --git a/docs/serial_driver.md b/docs/serial_driver.md
index 3338b55fec..7c0daec9b1 100644
--- a/docs/serial_driver.md
+++ b/docs/serial_driver.md
@@ -254,6 +254,16 @@ This is the default time window in milliseconds in which a successful communicat
 
 <hr>
 
+## Troubleshooting
+
+If you're having issues withe serial communication, you can enable debug messages that will give you insights which part of the communication failed. The enable these messages add to your keyboards `config.h` file:
+
+```c
+#define SERIAL_DEBUG
+```
+ 
+?> The messages will be printed out to the `CONSOLE` output. For additional information, refer to [Debugging/Troubleshooting QMK](faq_debug.md).
+
 ## Alternate Functions for selected STM32 MCUs
 
 Pins for USART Peripherals with 
diff --git a/drivers/serial.h b/drivers/serial.h
index 0cfdbd9959..fb91b136e7 100644
--- a/drivers/serial.h
+++ b/drivers/serial.h
@@ -27,3 +27,13 @@ void soft_serial_initiator_init(void);
 void soft_serial_target_init(void);
 
 bool soft_serial_transaction(int sstd_index);
+
+#ifdef SERIAL_DEBUG
+#    include <debug.h>
+#    include <print.h>
+#    define serial_dprintf(...) dprintf(__VA_ARGS__)
+#else
+#    define serial_dprintf(...) \
+        do {                    \
+        } while (0)
+#endif
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index 0cff057d1d..e5f346ba33 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -233,7 +233,7 @@ static inline bool initiate_transaction(uint8_t sstd_index) {
     // check if the slave is present
     if (serial_read_pin()) {
         // slave failed to pull the line low, assume not present
-        dprintf("serial::NO_RESPONSE\n");
+        serial_dprintf("serial::NO_RESPONSE\n");
         chSysUnlock();
         return false;
     }
@@ -269,7 +269,7 @@ static inline bool initiate_transaction(uint8_t sstd_index) {
     serial_delay();
 
     if ((checksum_computed) != (checksum_received)) {
-        dprintf("serial::FAIL[%u,%u,%u]\n", checksum_computed, checksum_received, sstd_index);
+        serial_dprintf("serial::FAIL[%u,%u,%u]\n", checksum_computed, checksum_received, sstd_index);
         serial_output();
         serial_high();
 
diff --git a/platforms/chibios/drivers/serial_protocol.c b/platforms/chibios/drivers/serial_protocol.c
new file mode 100644
index 0000000000..3e160e0c5c
--- /dev/null
+++ b/platforms/chibios/drivers/serial_protocol.c
@@ -0,0 +1,164 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <ch.h>
+
+#include "quantum.h"
+#include "serial.h"
+#include "serial_protocol.h"
+#include "printf.h"
+#include "synchronization_util.h"
+
+static inline bool initiate_transaction(uint8_t transaction_id);
+static inline bool react_to_transaction(void);
+
+/**
+ * @brief This thread runs on the slave and responds to transactions initiated
+ * by the master.
+ */
+static THD_WORKING_AREA(waSlaveThread, 1024);
+static THD_FUNCTION(SlaveThread, arg) {
+    (void)arg;
+    chRegSetThreadName("split_protocol_tx_rx");
+
+    while (true) {
+        split_shared_memory_lock();
+        if (unlikely(!react_to_transaction())) {
+            /* Clear the receive queue, to start with a clean slate.
+             * Parts of failed transactions or spurious bytes could still be in it. */
+            serial_transport_driver_clear();
+        }
+        split_shared_memory_unlock();
+    }
+}
+
+/**
+ * @brief Slave specific initializations.
+ */
+void soft_serial_target_init(void) {
+    serial_transport_driver_slave_init();
+
+    /* Start transport thread. */
+    chThdCreateStatic(waSlaveThread, sizeof(waSlaveThread), HIGHPRIO, SlaveThread, NULL);
+}
+
+/**
+ * @brief Master specific initializations.
+ */
+void soft_serial_initiator_init(void) {
+    serial_transport_driver_master_init();
+}
+
+/**
+ * @brief React to transactions started by the master.
+ */
+static inline bool react_to_transaction(void) {
+    uint8_t transaction_id = 0;
+    /* Wait until there is a transaction for us. */
+    if (unlikely(!serial_transport_receive_blocking(&transaction_id, sizeof(transaction_id)))) {
+        return false;
+    }
+
+    /* Sanity check that we are actually responding to a valid transaction. */
+    if (unlikely(transaction_id >= NUM_TOTAL_TRANSACTIONS)) {
+        return false;
+    }
+
+    split_transaction_desc_t* transaction = &split_transaction_table[transaction_id];
+
+    /* Send back the handshake which is XORed as a simple checksum,
+     to signal that the slave is ready to receive possible transaction buffers  */
+    transaction_id ^= NUM_TOTAL_TRANSACTIONS;
+    if (unlikely(!serial_transport_send(&transaction_id, sizeof(transaction_id)))) {
+        return false;
+    }
+
+    /* Receive transaction buffer from the master. If this transaction requires it.*/
+    if (transaction->initiator2target_buffer_size) {
+        if (unlikely(!serial_transport_receive(split_trans_initiator2target_buffer(transaction), transaction->initiator2target_buffer_size))) {
+            return false;
+        }
+    }
+
+    /* Allow any slave processing to occur. */
+    if (transaction->slave_callback) {
+        transaction->slave_callback(transaction->initiator2target_buffer_size, split_trans_initiator2target_buffer(transaction), transaction->initiator2target_buffer_size, split_trans_target2initiator_buffer(transaction));
+    }
+
+    /* Send transaction buffer to the master. If this transaction requires it. */
+    if (transaction->target2initiator_buffer_size) {
+        if (unlikely(!serial_transport_send(split_trans_target2initiator_buffer(transaction), transaction->target2initiator_buffer_size))) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * @brief Start transaction from the master half to the slave half.
+ *
+ * @param index Transaction Table index of the transaction to start.
+ * @return bool Indicates success of transaction.
+ */
+bool soft_serial_transaction(int index) {
+    split_shared_memory_lock();
+    bool result = initiate_transaction((uint8_t)index);
+    split_shared_memory_unlock();
+
+    if (unlikely(!result)) {
+        /* Clear the receive queue, to start with a clean slate.
+         * Parts of failed transactions or spurious bytes could still be in it. */
+        serial_transport_driver_clear();
+    }
+
+    return result;
+}
+
+/**
+ * @brief Initiate transaction to slave half.
+ */
+static inline bool initiate_transaction(uint8_t transaction_id) {
+    /* Sanity check that we are actually starting a valid transaction. */
+    if (unlikely(transaction_id >= NUM_TOTAL_TRANSACTIONS)) {
+        serial_dprintf("SPLIT: illegal transaction id\n");
+        return false;
+    }
+
+    split_transaction_desc_t* transaction = &split_transaction_table[transaction_id];
+
+    /* Send transaction table index to the slave, which doubles as basic handshake token. */
+    if (unlikely(!serial_transport_send(&transaction_id, sizeof(transaction_id)))) {
+        serial_dprintf("SPLIT: sending handshake failed\n");
+        return false;
+    }
+
+    uint8_t transaction_id_shake = 0xFF;
+
+    /* Which we always read back first so that we can error out correctly.
+     *   - due to the half duplex limitations on return codes, we always have to read *something*.
+     *   - without the read, write only transactions *always* succeed, even during the boot process where the slave is not ready.
+     */
+    if (unlikely(!serial_transport_receive(&transaction_id_shake, sizeof(transaction_id_shake)) || (transaction_id_shake != (transaction_id ^ NUM_TOTAL_TRANSACTIONS)))) {
+        serial_dprintf("SPLIT: receiving handshake failed\n");
+        return false;
+    }
+
+    /* Send transaction buffer to the slave. If this transaction requires it. */
+    if (transaction->initiator2target_buffer_size) {
+        if (unlikely(!serial_transport_send(split_trans_initiator2target_buffer(transaction), transaction->initiator2target_buffer_size))) {
+            serial_dprintf("SPLIT: sending buffer failed\n");
+            return false;
+        }
+    }
+
+    /* Receive transaction buffer from the slave. If this transaction requires it. */
+    if (transaction->target2initiator_buffer_size) {
+        if (unlikely(!serial_transport_receive(split_trans_target2initiator_buffer(transaction), transaction->target2initiator_buffer_size))) {
+            serial_dprintf("SPLIT: receiving buffer failed\n");
+            return false;
+        }
+    }
+
+    return true;
+}
diff --git a/platforms/chibios/drivers/serial_protocol.h b/platforms/chibios/drivers/serial_protocol.h
new file mode 100644
index 0000000000..4275a7f8d8
--- /dev/null
+++ b/platforms/chibios/drivers/serial_protocol.h
@@ -0,0 +1,49 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#pragma once
+
+/**
+ * @brief Clears any intermediate sending or receiving state of the driver to a known good
+ * state. This happens after errors in the middle of transactions, to start with
+ * a clean slate.
+ */
+void serial_transport_driver_clear(void);
+
+/**
+ * @brief Driver specific initialization on the slave half.
+ */
+void serial_transport_driver_slave_init(void);
+
+/**
+ * @brief Driver specific specific initialization on the master half.
+ */
+void serial_transport_driver_master_init(void);
+
+/**
+ * @brief  Blocking receive of size * bytes.
+ *
+ * @return true Receive success.
+ * @return false Receive failed, e.g. by bit errors.
+ */
+bool __attribute__((nonnull, hot)) serial_transport_receive(uint8_t* destination, const size_t size);
+
+/**
+ * @brief Blocking receive of size * bytes with an implicitly defined timeout.
+ *
+ * @return true Receive success.
+ * @return false Receive failed, e.g. by timeout or bit errors.
+ */
+bool __attribute__((nonnull, hot)) serial_transport_receive_blocking(uint8_t* destination, const size_t size);
+
+/**
+ * @brief Blocking send of buffer with timeout.
+ *
+ * @return true Send success.
+ * @return false Send failed, e.g. by timeout or bit errors.
+ */
+bool __attribute__((nonnull, hot)) serial_transport_send(const uint8_t* source, const size_t size);
diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index 7ea25d005b..f76afb5db4 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "serial_usart.h"
+#include "serial_protocol.h"
 #include "synchronization_util.h"
 
 #if defined(SERIAL_USART_CONFIG)
@@ -26,14 +27,6 @@ static QMKSerialConfig serial_config = {
 
 static QMKSerialDriver* serial_driver = (QMKSerialDriver*)&SERIAL_USART_DRIVER;
 
-static inline bool react_to_transactions(void);
-static inline bool __attribute__((nonnull)) receive(uint8_t* destination, const size_t size);
-static inline bool __attribute__((nonnull)) receive_blocking(uint8_t* destination, const size_t size);
-static inline bool __attribute__((nonnull)) send(const uint8_t* source, const size_t size);
-static inline bool initiate_transaction(uint8_t sstd_index);
-static inline void usart_clear(void);
-static inline void usart_driver_start(void);
-
 #if HAL_USE_SERIAL
 
 /**
@@ -43,10 +36,7 @@ static inline void usart_driver_start(void) {
     sdStart(serial_driver, &serial_config);
 }
 
-/**
- * @brief Clear the receive input queue.
- */
-static inline void usart_clear(void) {
+inline void serial_transport_driver_clear(void) {
     osalSysLock();
     bool volatile queue_not_empty = !iqIsEmptyI(&serial_driver->iqueue);
     osalSysUnlock();
@@ -89,10 +79,7 @@ static inline void usart_driver_start(void) {
     sioStartOperation(serial_driver, &serial_usart_operation);
 }
 
-/**
- * @brief Clear the receive input queue, as some MCUs have built-in hardware FIFOs.
- */
-static inline void usart_clear(void) {
+inline void serial_transport_driver_clear(void) {
     osalSysLock();
     while (!sioIsRXEmptyX(serial_driver)) {
         (void)sioGetX(serial_driver);
@@ -106,13 +93,7 @@ static inline void usart_clear(void) {
 
 #endif
 
-/**
- * @brief Blocking send of buffer with timeout.
- *
- * @return true Send success.
- * @return false Send failed.
- */
-static inline bool send(const uint8_t* source, const size_t size) {
+inline bool serial_transport_send(const uint8_t* source, const size_t size) {
     bool success = (size_t)chnWriteTimeout(serial_driver, source, size, TIME_MS2I(SERIAL_USART_TIMEOUT)) == size;
 
 #if !defined(SERIAL_USART_FULL_DUPLEX)
@@ -129,13 +110,13 @@ static inline bool send(const uint8_t* source, const size_t size) {
         uint8_t dump[64];
 
         while (unlikely(bytes_left >= 64)) {
-            if (unlikely(!receive(dump, 64))) {
+            if (unlikely(!serial_transport_receive(dump, 64))) {
                 return false;
             }
             bytes_left -= 64;
         }
 
-        return receive(dump, bytes_left);
+        return serial_transport_receive(dump, bytes_left);
 #    else
         /* The SIO driver directly accesses the hardware FIFOs of the USART
          * peripheral. As these are limited in depth, the RX FIFO might have been
@@ -159,24 +140,12 @@ static inline bool send(const uint8_t* source, const size_t size) {
     return success;
 }
 
-/**
- * @brief  Blocking receive of size * bytes with timeout.
- *
- * @return true Receive success.
- * @return false Receive failed, e.g. by timeout.
- */
-static inline bool receive(uint8_t* destination, const size_t size) {
+inline bool serial_transport_receive(uint8_t* destination, const size_t size) {
     bool success = (size_t)chnReadTimeout(serial_driver, destination, size, TIME_MS2I(SERIAL_USART_TIMEOUT)) == size;
     return success;
 }
 
-/**
- * @brief  Blocking receive of size * bytes.
- *
- * @return true Receive success.
- * @return false Receive failed.
- */
-static inline bool receive_blocking(uint8_t* destination, const size_t size) {
+inline bool serial_transport_receive_blocking(uint8_t* destination, const size_t size) {
     bool success = (size_t)chnRead(serial_driver, destination, size) == size;
     return success;
 }
@@ -243,86 +212,12 @@ __attribute__((weak, nonnull)) void usart_slave_init(QMKSerialDriver** driver) {
     usart_init();
 }
 
-/**
- * @brief This thread runs on the slave and responds to transactions initiated
- * by the master.
- */
-static THD_WORKING_AREA(waSlaveThread, 1024);
-static THD_FUNCTION(SlaveThread, arg) {
-    (void)arg;
-    chRegSetThreadName("usart_tx_rx");
-
-    while (true) {
-        if (unlikely(!react_to_transactions())) {
-            /* Clear the receive queue, to start with a clean slate.
-             * Parts of failed transactions or spurious bytes could still be in it. */
-            usart_clear();
-        }
-        split_shared_memory_unlock();
-    }
-}
-
-/**
- * @brief Slave specific initializations.
- */
-void soft_serial_target_init(void) {
+void serial_transport_driver_slave_init(void) {
     usart_slave_init(&serial_driver);
-
     usart_driver_start();
-
-    /* Start transport thread. */
-    chThdCreateStatic(waSlaveThread, sizeof(waSlaveThread), HIGHPRIO, SlaveThread, NULL);
 }
 
-/**
- * @brief React to transactions started by the master.
- */
-static inline bool react_to_transactions(void) {
-    /* Wait until there is a transaction for us. */
-    uint8_t sstd_index = 0;
-    receive_blocking(&sstd_index, sizeof(sstd_index));
-
-    /* Sanity check that we are actually responding to a valid transaction. */
-    if (unlikely(sstd_index >= NUM_TOTAL_TRANSACTIONS)) {
-        return false;
-    }
-
-    split_shared_memory_lock();
-    split_transaction_desc_t* trans = &split_transaction_table[sstd_index];
-
-    /* Send back the handshake which is XORed as a simple checksum,
-     to signal that the slave is ready to receive possible transaction buffers  */
-    sstd_index ^= HANDSHAKE_MAGIC;
-    if (unlikely(!send(&sstd_index, sizeof(sstd_index)))) {
-        return false;
-    }
-
-    /* Receive transaction buffer from the master. If this transaction requires it.*/
-    if (trans->initiator2target_buffer_size) {
-        if (unlikely(!receive(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size))) {
-            return false;
-        }
-    }
-
-    /* Allow any slave processing to occur. */
-    if (trans->slave_callback) {
-        trans->slave_callback(trans->initiator2target_buffer_size, split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size, split_trans_target2initiator_buffer(trans));
-    }
-
-    /* Send transaction buffer to the master. If this transaction requires it. */
-    if (trans->target2initiator_buffer_size) {
-        if (unlikely(!send(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size))) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-/**
- * @brief Master specific initializations.
- */
-void soft_serial_initiator_init(void) {
+void serial_transport_driver_master_init(void) {
     usart_master_init(&serial_driver);
 
 #if defined(MCU_STM32) && defined(SERIAL_USART_PIN_SWAP)
@@ -331,69 +226,3 @@ void soft_serial_initiator_init(void) {
 
     usart_driver_start();
 }
-
-/**
- * @brief Start transaction from the master half to the slave half.
- *
- * @param index Transaction Table index of the transaction to start.
- * @return bool Indicates success of transaction.
- */
-bool soft_serial_transaction(int index) {
-    /* Clear the receive queue, to start with a clean slate.
-     * Parts of failed transactions or spurious bytes could still be in it. */
-    usart_clear();
-
-    split_shared_memory_lock();
-    bool result = initiate_transaction((uint8_t)index);
-    split_shared_memory_unlock();
-
-    return result;
-}
-
-/**
- * @brief Initiate transaction to slave half.
- */
-static inline bool initiate_transaction(uint8_t sstd_index) {
-    /* Sanity check that we are actually starting a valid transaction. */
-    if (unlikely(sstd_index >= NUM_TOTAL_TRANSACTIONS)) {
-        dprintln("USART: Illegal transaction Id.");
-        return false;
-    }
-
-    split_transaction_desc_t* trans = &split_transaction_table[sstd_index];
-
-    /* Send transaction table index to the slave, which doubles as basic handshake token. */
-    if (unlikely(!send(&sstd_index, sizeof(sstd_index)))) {
-        dprintln("USART: Send Handshake failed.");
-        return false;
-    }
-
-    uint8_t sstd_index_shake = 0xFF;
-
-    /* Which we always read back first so that we can error out correctly.
-     *   - due to the half duplex limitations on return codes, we always have to read *something*.
-     *   - without the read, write only transactions *always* succeed, even during the boot process where the slave is not ready.
-     */
-    if (unlikely(!receive(&sstd_index_shake, sizeof(sstd_index_shake)) || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC)))) {
-        dprintln("USART: Handshake failed.");
-        return false;
-    }
-
-    /* Send transaction buffer to the slave. If this transaction requires it. */
-    if (trans->initiator2target_buffer_size) {
-        if (unlikely(!send(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size))) {
-            dprintln("USART: Send failed.");
-            return false;
-        }
-    }
-
-    /* Receive transaction buffer from the slave. If this transaction requires it. */
-    if (trans->target2initiator_buffer_size) {
-        if (unlikely(!receive(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size))) {
-            dprintln("USART: Receive failed.");
-            return false;
-        }
-    }
-
-    return true;
-}
diff --git a/platforms/chibios/drivers/serial_usart.h b/platforms/chibios/drivers/serial_usart.h
index 98c634dac0..fa062cd736 100644
--- a/platforms/chibios/drivers/serial_usart.h
+++ b/platforms/chibios/drivers/serial_usart.h
@@ -5,11 +5,46 @@
 
 #include "quantum.h"
 #include "serial.h"
-#include "printf.h"
-
-#include <ch.h>
 #include <hal.h>
 
+#if defined(SOFT_SERIAL_PIN)
+#    define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN
+#endif
+
+#if !defined(SERIAL_USART_TX_PIN)
+#    define SERIAL_USART_TX_PIN A9
+#endif
+
+#if !defined(SERIAL_USART_RX_PIN)
+#    define SERIAL_USART_RX_PIN A10
+#endif
+
+#if !defined(SELECT_SOFT_SERIAL_SPEED)
+#    define SELECT_SOFT_SERIAL_SPEED 1
+#endif
+
+#if defined(SERIAL_USART_SPEED)
+// Allow advanced users to directly set SERIAL_USART_SPEED
+#elif SELECT_SOFT_SERIAL_SPEED == 0
+#    define SERIAL_USART_SPEED 460800
+#elif SELECT_SOFT_SERIAL_SPEED == 1
+#    define SERIAL_USART_SPEED 230400
+#elif SELECT_SOFT_SERIAL_SPEED == 2
+#    define SERIAL_USART_SPEED 115200
+#elif SELECT_SOFT_SERIAL_SPEED == 3
+#    define SERIAL_USART_SPEED 57600
+#elif SELECT_SOFT_SERIAL_SPEED == 4
+#    define SERIAL_USART_SPEED 38400
+#elif SELECT_SOFT_SERIAL_SPEED == 5
+#    define SERIAL_USART_SPEED 19200
+#else
+#    error invalid SELECT_SOFT_SERIAL_SPEED value
+#endif
+
+#if !defined(SERIAL_USART_TIMEOUT)
+#    define SERIAL_USART_TIMEOUT 20
+#endif
+
 #if HAL_USE_SERIAL
 
 typedef SerialDriver QMKSerialDriver;
@@ -40,18 +75,6 @@ typedef SIOConfig QMKSerialConfig;
 #    endif
 #endif
 
-#if defined(SOFT_SERIAL_PIN)
-#    define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN
-#endif
-
-#if !defined(SERIAL_USART_TX_PIN)
-#    define SERIAL_USART_TX_PIN A9
-#endif
-
-#if !defined(SERIAL_USART_RX_PIN)
-#    define SERIAL_USART_RX_PIN A10
-#endif
-
 #if !defined(USART_CR1_M0)
 #    define USART_CR1_M0 USART_CR1_M // some platforms (f1xx) dont have this so
 #endif
@@ -89,31 +112,3 @@ typedef SIOConfig QMKSerialConfig;
             (AFIO->MAPR |= AFIO_MAPR_USART3_REMAP_FULLREMAP); \
         } while (0)
 #endif
-
-#if !defined(SELECT_SOFT_SERIAL_SPEED)
-#    define SELECT_SOFT_SERIAL_SPEED 1
-#endif
-
-#if defined(SERIAL_USART_SPEED)
-// Allow advanced users to directly set SERIAL_USART_SPEED
-#elif SELECT_SOFT_SERIAL_SPEED == 0
-#    define SERIAL_USART_SPEED 460800
-#elif SELECT_SOFT_SERIAL_SPEED == 1
-#    define SERIAL_USART_SPEED 230400
-#elif SELECT_SOFT_SERIAL_SPEED == 2
-#    define SERIAL_USART_SPEED 115200
-#elif SELECT_SOFT_SERIAL_SPEED == 3
-#    define SERIAL_USART_SPEED 57600
-#elif SELECT_SOFT_SERIAL_SPEED == 4
-#    define SERIAL_USART_SPEED 38400
-#elif SELECT_SOFT_SERIAL_SPEED == 5
-#    define SERIAL_USART_SPEED 19200
-#else
-#    error invalid SELECT_SOFT_SERIAL_SPEED value
-#endif
-
-#if !defined(SERIAL_USART_TIMEOUT)
-#    define SERIAL_USART_TIMEOUT 20
-#endif
-
-#define HANDSHAKE_MAGIC 7U

From 7b3ee1db8cfaed4315b93f7f4c06f07faa08ae71 Mon Sep 17 00:00:00 2001
From: Yan-Fa Li <yanfali@gmail.com>
Date: Fri, 17 Jun 2022 18:42:32 -0700
Subject: [PATCH 030/959] Minor schema fixes (#14200)

Validating using AJV
---
 data/schemas/keyboard.jsonschema | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 9f6721ba9d..e9696cd1d8 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -41,8 +41,8 @@
                 "breathing_period": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "levels": {
                     "type": "number",
-                    "min": 1,
-                    "max": 31,
+                    "minimum": 1,
+                    "maximum": 31,
                     "multipleOf": 1
                 },
                 "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
@@ -159,7 +159,7 @@
                                     "maxItems": 2,
                                     "items": {
                                         "type": "number",
-                                        "min": 0,
+                                        "minimum": 0,
                                         "multipleOf": 1
                                     }
                                 },
@@ -235,7 +235,7 @@
                                 "maxItems": 2,
                                 "items": {
                                     "type": "number",
-                                    "min": 0,
+                                    "minimum": 0,
                                     "multipleOf": 1
                                 }
                             },
@@ -263,7 +263,7 @@
                                 "maxItems": 2,
                                 "items": {
                                     "type": "number",
-                                    "min": 0,
+                                    "minimum": 0,
                                     "multipleOf": 1
                                 }
                             },
@@ -295,8 +295,8 @@
                         "enabled": {"type": "boolean"},
                         "max": {
                             "type": "number",
-                            "min": 1,
-                            "max": 32,
+                            "minimum": 1,
+                            "maximum": 32,
                             "multipleOf": 1
                         },
                         "override_rgb": {"type": "boolean"}
@@ -311,8 +311,8 @@
                 "split": {"type": "boolean"},
                 "split_count": {
                     "type": "array",
-                    "minLength": 2,
-                    "maxLength": 2,
+                    "minItems": 2,
+                    "maxItems": 2,
                     "items": {"$ref": "qmk.definitions.v1#/unsigned_int"}
                 }
             }
@@ -326,15 +326,15 @@
                 "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "unlock_sequence": {
                     "type": "array",
-                    "minLength": 1,
-                    "maxLength": 5,
+                    "minItems": 1,
+                    "maxItems": 5,
                     "items": {
                         "type": "array",
                         "minItems": 2,
                         "maxItems": 2,
                         "items": {
                             "type": "number",
-                            "min": 0,
+                            "minimum": 0,
                             "multipleOf": 1
                         }
                     }
@@ -376,8 +376,8 @@
                 "soft_serial_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "soft_serial_speed": {
                     "type": "number",
-                    "min": 0,
-                    "max": 5,
+                    "minimum": 0,
+                    "maximum": 5,
                     "multipleOf": 1
                 },
                 "transport": {

From 17ec1650fd4fd27b3bf409e3493faf11c8d421e8 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 18 Jun 2022 06:30:46 +0100
Subject: [PATCH 031/959] Additional schema fixes (#17414)

---
 data/schemas/definitions.jsonschema      | 39 ++++++++----------
 data/schemas/keyboard.jsonschema         | 51 ++++++++++--------------
 data/schemas/keymap.jsonschema           |  5 +--
 lib/python/qmk/cli/generate/info_json.py |  8 ++--
 lib/python/qmk/json_schema.py            |  6 +--
 5 files changed, 45 insertions(+), 64 deletions(-)

diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 5a2e5ccc05..2cf76a351c 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$schema": "https://json-schema.org/draft/2020-12/schema#",
     "$id": "qmk.definitions.v1",
     "title": "Common definitions used across QMK's jsonschemas.",
     "type": "object",
@@ -65,8 +65,7 @@
         ]
     },
     "key_unit": {
-        "type": "number",
-        "min": 0.25
+        "type": "number"
     },
     "keyboard": {
         "oneOf": [
@@ -103,8 +102,7 @@
                 "pattern": "^LINE_PIN\\d{1,2}$"
             },
             {
-                "type": "number",
-                "multipleOf": 1
+                "type": "integer"
             },
             {
                 "type": "null"
@@ -115,14 +113,12 @@
         "type": "number"
     },
     "signed_int": {
-        "type": "number",
-        "multipleOf": 1
+        "type": "integer"
     },
     "signed_int_8": {
-        "type": "number",
-        "min": -127,
-        "max": 127,
-        "multipleOf": 1
+        "type": "integer",
+        "minimum": -127,
+        "maximum": 127
     },
     "string_array": {
         "type": "array",
@@ -138,23 +134,20 @@
     },
     "unsigned_decimal": {
         "type": "number",
-        "min": 0
+        "minimum": 0
     },
     "unsigned_int": {
-        "type": "number",
-        "min": 0,
-        "multipleOf": 1
+        "type": "integer",
+        "minimum": 0
     },
     "unsigned_int_8": {
-        "type": "number",
-        "min": 0,
-        "max": 255,
-        "multipleOf": 1
+        "type": "integer",
+        "minimum": 0,
+        "maximum": 255
     },
     "bit": {
-        "type": "number",
-        "min": 0,
-        "max": 1,
-        "multipleOf": 1
+        "type": "integer",
+        "minimum": 0,
+        "maximum": 1
     }
 }
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index e9696cd1d8..52a66cc132 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$schema": "https://json-schema.org/draft/2020-12/schema#",
     "$id": "qmk.keyboard.v1",
     "title": "Keyboard Information",
     "type": "object",
@@ -40,10 +40,9 @@
                 "breathing": {"type": "boolean"},
                 "breathing_period": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "levels": {
-                    "type": "number",
+                    "type": "integer",
                     "minimum": 1,
-                    "maximum": 31,
-                    "multipleOf": 1
+                    "maximum": 31
                 },
                 "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "on_state": {"$ref": "qmk.definitions.v1#/bit"}
@@ -158,12 +157,11 @@
                                     "minItems": 2,
                                     "maxItems": 2,
                                     "items": {
-                                        "type": "number",
-                                        "minimum": 0,
-                                        "multipleOf": 1
+                                        "type": "integer",
+                                        "minimum": 0
                                     }
                                 },
-                                "r": {"$ref": "qmk.definitions.v1#/unsigned_decimal"},
+                                "r": {"$ref": "qmk.definitions.v1#/signed_decimal"},
                                 "rx": {"$ref": "qmk.definitions.v1#/unsigned_decimal"},
                                 "ry": {"$ref": "qmk.definitions.v1#/unsigned_decimal"},
                                 "h": {"$ref": "qmk.definitions.v1#/key_unit"},
@@ -234,14 +232,13 @@
                                 "minItems": 2,
                                 "maxItems": 2,
                                 "items": {
-                                    "type": "number",
-                                    "minimum": 0,
-                                    "multipleOf": 1
+                                    "type": "integer",
+                                    "minimum": 0
                                 }
                             },
                             "x": {"$ref": "qmk.definitions.v1#/key_unit"},
                             "y": {"$ref": "qmk.definitions.v1#/key_unit"},
-                            "flags": {"$ref": "qmk.definitions.v1#/unsigned_decimal"}
+                            "flags": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                         }
                     }
                 }
@@ -262,14 +259,13 @@
                                 "minItems": 2,
                                 "maxItems": 2,
                                 "items": {
-                                    "type": "number",
-                                    "minimum": 0,
-                                    "multipleOf": 1
+                                    "type": "integer",
+                                    "minimum": 0
                                 }
                             },
                             "x": {"$ref": "qmk.definitions.v1#/key_unit"},
                             "y": {"$ref": "qmk.definitions.v1#/key_unit"},
-                            "flags": {"$ref": "qmk.definitions.v1#/unsigned_decimal"}
+                            "flags": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                         }
                     }
                 }
@@ -294,10 +290,9 @@
                         "blink": {"type": "boolean"},
                         "enabled": {"type": "boolean"},
                         "max": {
-                            "type": "number",
+                            "type": "integer",
                             "minimum": 1,
-                            "maximum": 32,
-                            "multipleOf": 1
+                            "maximum": 32
                         },
                         "override_rgb": {"type": "boolean"}
                     }
@@ -333,9 +328,8 @@
                         "minItems": 2,
                         "maxItems": 2,
                         "items": {
-                            "type": "number",
-                            "minimum": 0,
-                            "multipleOf": 1
+                            "type": "integer",
+                            "minimum": 0
                         }
                     }
                 }
@@ -375,10 +369,9 @@
                 },
                 "soft_serial_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "soft_serial_speed": {
-                    "type": "number",
+                    "type": "integer",
                     "minimum": 0,
-                    "maximum": 5,
-                    "multipleOf": 1
+                    "maximum": 5
                 },
                 "transport": {
                     "type": "object",
@@ -432,7 +425,7 @@
                 "force_nkro": {"type": "boolean"},
                 "pid": {"$ref": "qmk.definitions.v1#/hex_number_4d"},
                 "vid": {"$ref": "qmk.definitions.v1#/hex_number_4d"},
-                "max_power": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "max_power": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "no_startup_check": {"type": "boolean"},
                 "polling_interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "shared_endpoint": {
@@ -443,7 +436,7 @@
                         "mouse": {"type": "boolean"}
                     }
                 },
-                "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "wait_for": {"type": "boolean"},
             }
         },
@@ -452,8 +445,8 @@
             "additionalProperties": false,
             "properties": {
                 "keys_per_scan": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
-                "tap_keycode_delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
-                "tap_capslock_delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "tap_keycode_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "tap_capslock_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
             }
         },
         "qmk_lufa_bootloader": {
diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema
index 3803301a66..92a1ce533d 100644
--- a/data/schemas/keymap.jsonschema
+++ b/data/schemas/keymap.jsonschema
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$schema": "https://json-schema.org/draft/2020-12/schema#",
     "$id": "qmk.keymap.v1",
     "title": "Keymap Information",
     "type": "object",
@@ -50,8 +50,7 @@
         },
         "config": {"$ref": "qmk.keyboard.v1"},
         "notes": {
-            "type": "string",
-            "description": "asdf"
+            "type": "string"
         }
     },
     "required": [
diff --git a/lib/python/qmk/cli/generate/info_json.py b/lib/python/qmk/cli/generate/info_json.py
index 284d1a8510..0dc80f10cc 100755
--- a/lib/python/qmk/cli/generate/info_json.py
+++ b/lib/python/qmk/cli/generate/info_json.py
@@ -5,7 +5,7 @@ Compile an info.json for a particular keyboard and pretty-print it.
 import json
 
 from argcomplete.completers import FilesCompleter
-from jsonschema import Draft7Validator, RefResolver, validators
+from jsonschema import Draft202012Validator, RefResolver, validators
 from milc import cli
 from pathlib import Path
 
@@ -18,7 +18,7 @@ from qmk.path import is_keyboard, normpath
 
 
 def pruning_validator(validator_class):
-    """Extends Draft7Validator to remove properties that aren't specified in the schema.
+    """Extends Draft202012Validator to remove properties that aren't specified in the schema.
     """
     validate_properties = validator_class.VALIDATORS["properties"]
 
@@ -37,10 +37,10 @@ def strip_info_json(kb_info_json):
     """Remove the API-only properties from the info.json.
     """
     schema_store = compile_schema_store()
-    pruning_draft_7_validator = pruning_validator(Draft7Validator)
+    pruning_draft_validator = pruning_validator(Draft202012Validator)
     schema = schema_store['qmk.keyboard.v1']
     resolver = RefResolver.from_schema(schema_store['qmk.keyboard.v1'], store=schema_store)
-    validator = pruning_draft_7_validator(schema, resolver=resolver).validate
+    validator = pruning_draft_validator(schema, resolver=resolver).validate
 
     return validator(kb_info_json)
 
diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index 682346113e..01175146b5 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -68,11 +68,7 @@ def create_validator(schema):
     schema_store = compile_schema_store()
     resolver = jsonschema.RefResolver.from_schema(schema_store[schema], store=schema_store)
 
-    # TODO: Remove this after the jsonschema>=4 requirement had time to reach users
-    try:
-        return jsonschema.Draft202012Validator(schema_store[schema], resolver=resolver).validate
-    except AttributeError:
-        return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
+    return jsonschema.Draft202012Validator(schema_store[schema], resolver=resolver).validate
 
 
 def validate(data, schema):

From 0da6562c4df570729889690e21061229c5648b73 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 18 Jun 2022 14:37:51 -0700
Subject: [PATCH 032/959] Make default layer size 16-bit (#15286)

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 docs/zh-cn/custom_quantum_functions.md        |   7 +-
 .../sweet16/keymaps/ridingintraffic/keymap.c  |   2 +-
 .../gherkin/keymaps/itsaferbie/keymap.c       |   2 +-
 .../half_n_half/keymaps/Boy_314/keymap.c      |   4 +-
 keyboards/bandominedoni/keymaps/led/keymap.c  |   2 +-
 keyboards/bandominedoni/keymaps/via/keymap.c  |   2 +-
 .../biacco42/ergo42/keymaps/hdbx/keymap.c     |   4 +-
 .../kitten_paw/keymaps/ickerwx/keymap.c       |   4 +-
 .../pegasushoof/keymaps/blowrak/keymap.c      |   2 +-
 keyboards/cannonkeys/ortho75/ortho75.c        |  73 +--
 .../satisfaction75/satisfaction75.c           |   2 +-
 .../ckeys/washington/keymaps/default/keymap.c |   4 +-
 .../clueboard/66/keymaps/magicmonty/keymap.c  |   2 +-
 keyboards/crkbd/keymaps/dsanchezseco/keymap.c |   2 +-
 keyboards/crkbd/keymaps/edvorakjp/keymap.c    |   4 +-
 keyboards/crkbd/keymaps/edvorakjp/oled.c      |   2 +-
 keyboards/crkbd/keymaps/jarred/keymap.c       |   2 +-
 keyboards/dichotomy/keymaps/default/keymap.c  |   4 +-
 .../plaid/keymaps/thehalfdeafchef/keymap.c    |   2 +-
 .../dz60/keymaps/iso_split-spacebar/keymap.c  |  28 +-
 keyboards/dz60/keymaps/marianas/customLogic.c |   2 +-
 keyboards/dz60/keymaps/xtonhasvim/keymap.c    |   4 +-
 .../dz60rgb/keymaps/matthewrobo/keymap.c      |   2 +-
 .../dztech/dz60rgb/keymaps/mekanist/keymap.c  |   4 +-
 .../dztech/dz60rgb/keymaps/perseid/keymap.c   |   4 +-
 .../dz65rgb/keymaps/catrielmuller/keymap.c    |   4 +-
 .../dztech/dz65rgb/keymaps/drootz/keymap.c    | 156 ++---
 .../dz65rgb/keymaps/matthewrobo/keymap.c      |   2 +-
 .../ergodox_ez/keymaps/bepo_tm_style/keymap.c |   2 +-
 .../ergodox_ez/keymaps/blakedietz/keymap.c    |   3 +-
 .../keymaps/bpruitt-goddard/keymap.c          |   2 +-
 .../ergodox_ez/keymaps/default_osx/keymap.c   |   2 +-
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c |   2 +-
 .../hacker_dvorak/user/layer_set_state_user.c |   2 +-
 .../keymaps/heartrobotninja/keymap.c          |   4 +-
 keyboards/ergodox_ez/keymaps/kou/keymap.c     |   2 +-
 keyboards/ergodox_ez/keymaps/lukaus/keymap.c  |   2 +-
 .../ergodox_ez/keymaps/matrixman/keymap.c     |   2 +-
 .../keymaps/nathanvercaemert/keymap.c         |   3 +-
 keyboards/ergodox_ez/keymaps/nfriend/keymap.c |   2 +-
 .../ergodox_ez/keymaps/profet_80/keymap.c     |   2 +-
 keyboards/ergodox_ez/keymaps/pvinis/keymap.c  |   6 +-
 .../ergodox_ez/keymaps/rgb_layer/keymap.c     |   3 +-
 keyboards/ergodox_ez/keymaps/rishka/keymap.c  |   2 +-
 keyboards/ergodox_ez/keymaps/skug/keymap.c    |   2 +-
 .../ergodox_ez/keymaps/smurmann/keymap.c      |   8 +-
 keyboards/ergodox_ez/keymaps/steno/keymap.c   |   2 +-
 keyboards/ergodox_ez/keymaps/testing/keymap.c |   2 +-
 keyboards/ergodox_ez/keymaps/vim/keymap.c     |   2 +-
 keyboards/ergodox_ez/util/compile_keymap.py   | 110 ++--
 keyboards/ergoslab/keymaps/default/keymap.c   |   2 +-
 .../exclusive/e65/keymaps/masterzen/keymap.c  |   2 +-
 .../exclusive/e7v1/keymaps/masterzen/keymap.c |   2 +-
 .../gboards/gergo/keymaps/colemak/keymap.c    |   5 +-
 keyboards/gh60/revc/keymaps/dbroqua/keymap.c  |   4 +-
 keyboards/gh60/revc/keymaps/default/keymap.c  |   2 +-
 .../gh60/revc/keymaps/robotmaxtron/keymap.c   |   2 +-
 .../gh60/satan/keymaps/addcninblue/keymap.c   |   2 +-
 .../chimera_ergo/keymaps/default/keymap.c     |   2 +-
 .../chimera_ls/keymaps/default/keymap.c       |   2 +-
 .../chimera_ortho/keymaps/default/keymap.c    |   2 +-
 .../gon/nerdtkl/keymaps/gam3cat/keymap.c      |   2 +-
 .../frenchdev/keymaps/default/keymap.c        |   2 +-
 .../handwired/kbod/keymaps/default/keymap.c   |   2 +-
 .../handwired/prime_exl/keymaps/via/keymap.c  |   2 +-
 .../promethium/keymaps/default/keymap.c       |   6 +-
 .../promethium/keymaps/priyadi/keymap.c       |   8 +-
 .../traveller/keymaps/default/keymap.c        |   2 +-
 .../tritium_numpad/keymaps/blu/keymap.c       |   2 +-
 keyboards/helix/pico/keymaps/mtei/keymap.c    |   2 +-
 .../helix/rev2/keymaps/default/oled_display.c |   2 +-
 .../helix/rev2/keymaps/edvorakjp/keymap.c     |   4 +-
 keyboards/helix/rev2/keymaps/edvorakjp/oled.c |   2 +-
 .../helix/rev2/keymaps/five_rows/keymap.c     |   4 +-
 .../rev3_5rows/keymaps/five_rows/keymap.c     |   4 +-
 .../hineybush/h87a/keymaps/gam3cat/keymap.c   |   2 +-
 keyboards/hotdox/keymaps/default/keymap.c     |   2 +-
 keyboards/hotdox/keymaps/eozaki/keymap.c      |   2 +-
 keyboards/hotdox/keymaps/kloki/keymap.c       |   2 +-
 .../ergodox_infinity/keymaps/default/keymap.c |   2 +-
 .../ergodox_infinity/keymaps/gordon/keymap.c  |   2 +-
 .../keymaps/halfkeyboard/keymap.c             |   2 +-
 .../keymaps/input_club/keymap.c               |   2 +-
 .../ergodox_infinity/keymaps/narze/keymap.c   |   2 +-
 .../keymaps/nordic_ergo/keymap.c              |   2 +-
 .../ergodox_infinity/keymaps/rask/keymap.c    |   2 +-
 .../keymaps/rjhilgefort/keymap.c              |   2 +-
 .../keymaps/trulyergonomic/keymap.c           |   2 +-
 .../infinity60/keymaps/jpetermans/keymap.c    |   4 +-
 keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c |   2 +-
 .../jones/v03_1/keymaps/default_ansi/keymap.c |   2 +-
 .../jones/v03_1/keymaps/default_jp/keymap.c   |   2 +-
 .../angel64/alpha/keymaps/default/keymap.c    |   2 +-
 .../angel64/rev1/keymaps/kakunpc/keymap.c     |   2 +-
 .../suihankey/alpha/keymaps/default/keymap.c  |   2 +-
 .../suihankey/rev1/keymaps/default/keymap.c   |   2 +-
 keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c |   3 +-
 .../kbdfans/kbd75/keymaps/edulpn/keymap.c     |   2 +-
 .../kbdfans/niu_mini/keymaps/tobias/keymap.c  |  30 +-
 .../niu_mini/keymaps/xtonhasvim/keymap.c      |   2 +-
 .../keebio/bdn9/keymaps/vosechu-ksp/keymap.c  |   2 +-
 .../bfo9000/keymaps/abstractkb/keymap.c       |   5 +-
 .../keebio/iris/keymaps/edvorakjp/keymap.c    |   4 +-
 .../keebio/iris/keymaps/jerryhcooke/keymap.c  |   4 +-
 keyboards/keebio/iris/keymaps/sq5rix/keymap.c |   3 +-
 .../levinson/keymaps/issmirnov/keymap.c       |   2 +-
 .../keebio/levinson/keymaps/issmirnov/rgb.c   |   2 +-
 .../keebio/levinson/keymaps/issmirnov/rgb.h   |   2 +-
 .../levinson/keymaps/xtonhasvim/keymap.c      |   2 +-
 .../keebio/nyquist/keymaps/pitty/keymap.c     |   2 +-
 .../quefrency/keymaps/georgepetri/keymap.c    |   2 +-
 .../honeycomb/keymaps/default/keymap.c        |   2 +-
 keyboards/kinesis/keymaps/milestogo/keymap.c  |   2 +-
 .../kprepublic/cospad/keymaps/detrus/keymap.c |   6 +-
 .../jj50/keymaps/abstractkb/keymap.c          |   2 +-
 .../keymaps/abstractkb_gergomatch/keymap.c    |   2 +-
 .../ktec/ergodone/keymaps/eozaki/keymap.c     |   2 +-
 .../ktec/ergodone/keymaps/erovia/keymap.c     |   2 +-
 .../ktec/ergodone/keymaps/kloki/keymap.c      |   2 +-
 keyboards/ktec/ergodone/keymaps/vega/keymap.c |   2 +-
 .../leeku/finger65/keymaps/madhatter/keymap.c |   2 +-
 .../lets_split/keymaps/bbaserdem/keymap.c     |   2 +-
 .../lets_split/keymaps/cpeters1982/keymap.c   |   2 +-
 .../lets_split/keymaps/geripgeri/keymap.c     |   2 +-
 keyboards/lets_split/keymaps/pitty/keymap.c   |   2 +-
 keyboards/lily58/lib/layer_state_reader.c     |   2 +-
 keyboards/m10a/keymaps/gam3cat/keymap.c       |   2 +-
 .../lets_split_eh/keymaps/bbaserdem/keymap.c  |   2 +-
 .../lets_split_eh/keymaps/romus/keymap.c      |   4 +-
 .../mechmini/v2/keymaps/wsturgiss/keymap.c    |   3 +-
 .../mechllama/g35/keymaps/default/keymap.c    |   2 +-
 keyboards/mechlovin/hannah910/hannah910.c     |   6 +-
 .../mechlovin/hex4b/keymaps/nazzer/keymap.c   |  28 +-
 keyboards/minimacro5/keymaps/devdev/keymap.c  |   2 +-
 keyboards/mitosis/keymaps/carvac_dv/keymap.c  |   3 +-
 keyboards/mitosis/keymaps/datagrok/keymap.c   |   4 +-
 keyboards/mitosis/keymaps/default/keymap.c    |   5 +-
 keyboards/mitosis/keymaps/mjt/keymap.c        |   4 +-
 keyboards/mitosis/keymaps/nzen/keymap.c       |   4 +-
 keyboards/mschwingen/modelm/modelm.c          |   4 +-
 .../mwstudio/mw65_rgb/keymaps/via/keymap.c    |   4 +-
 keyboards/pearl/keymaps/cijanzen/keymap.c     |   2 +-
 .../pearl/keymaps/jetpacktuxedo/keymap.c      |   2 +-
 keyboards/pearl/keymaps/phil/keymap.c         |   2 +-
 keyboards/pearl/keymaps/rask/keymap.c         |   2 +-
 .../percent/canoe/keymaps/dhertz/keymap.c     |   4 +-
 keyboards/phoenix/phoenix.c                   |   2 +-
 keyboards/planck/keymaps/aviator/keymap.c     |   8 +-
 .../planck/keymaps/charlesrocket/keymap.c     |   2 +-
 .../planck/keymaps/grahampheath/keymap.c      |   2 +-
 keyboards/planck/keymaps/oryx/keymap.c        |   2 +-
 keyboards/planck/keymaps/rootiest/keymap.c    |   2 +-
 keyboards/planck/keymaps/tom/keymap.c         |   2 +-
 keyboards/planck/keymaps/tylerwince/keymap.c  |   4 +-
 .../preonic/keymaps/dudeofawesome/keymap.c    |   2 +-
 keyboards/preonic/keymaps/senseored/keymap.c  |   2 +-
 .../primekb/prime_e/keymaps/via/keymap.c      |   2 +-
 keyboards/redox_w/keymaps/italian/keymap.c    |  12 +-
 keyboards/redscarf_i/redscarf_i.c             |   2 +-
 keyboards/rgbkb/pan/keymaps/default/keymap.c  |   2 +-
 keyboards/rgbkb/sol/keymaps/default/keymap.c  |   4 +-
 keyboards/rgbkb/sol/keymaps/xyverz/keymap.c   |   4 +-
 keyboards/rgbkb/zen/rev2/rev2.c               |   2 +-
 .../zygomorph/keymaps/default_oled/keymap.c   |   2 +-
 .../comet46/keymaps/default-rgbled/keymap.c   |   2 +-
 .../satt/comet46/keymaps/default/keymap.c     |   4 +-
 keyboards/satt/comet46/keymaps/satt/keymap.c  |   4 +-
 .../splitkb/kyria/keymaps/j-inc/keymap.c      |   2 +-
 .../splitkb/kyria/keymaps/ninjonas/oled.c     |   2 +-
 .../kyria/keymaps/thomasbaart/keymap.c        |   4 +-
 .../splitography/keymaps/jeandeaual/keymap.c  |   2 +-
 keyboards/splitography/keymaps/multi/keymap.c |   2 +-
 keyboards/tetris/keymaps/default/keymap.c     |   4 +-
 .../roadkit/keymaps/flipphone/keymap.c        |   2 +-
 .../v60_type_r/keymaps/xtonhasvim/keymap.c    |   3 +-
 keyboards/xiudi/xd60/keymaps/birkir/keymap.c  |   2 +-
 .../xiudi/xd60/keymaps/kmontag42/keymap.c     |   2 +-
 .../xiudi/xd75/keymaps/arpinfidel/keymap.c    |   2 +-
 .../xiudi/xd75/keymaps/cbbrowne/keymap.c      |   2 +-
 keyboards/xiudi/xd75/keymaps/kloki/keymap.c   |   2 +-
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |   2 +-
 layouts/community/ergodox/ab/keymap.c         |   2 +-
 layouts/community/ergodox/absenth/keymap.c    |   2 +-
 layouts/community/ergodox/adam/keymap.c       |   2 +-
 layouts/community/ergodox/adnw_k_o_y/keymap.c |   2 +-
 layouts/community/ergodox/alexjj/keymap.c     |   2 +-
 layouts/community/ergodox/andrew_osx/keymap.c |   2 +-
 layouts/community/ergodox/berfarah/keymap.c   |   4 +-
 layouts/community/ergodox/bryan/keymap.c      |   2 +-
 .../community/ergodox/choromanski/keymap.c    |  42 +-
 layouts/community/ergodox/colemak/keymap.c    |   2 +-
 .../ergodox/colemak_code_friendly/keymap.c    |  20 +-
 .../ergodox/colemak_programmer/keymap.c       |   8 +-
 .../ergodox/common_nighthawk/keymap.c         |   2 +-
 layouts/community/ergodox/csharp_dev/keymap.c |  40 +-
 layouts/community/ergodox/dave/keymap.c       |   2 +-
 layouts/community/ergodox/deadcyclo/keymap.c  |  16 +-
 layouts/community/ergodox/dragon788/keymap.c  |   2 +-
 layouts/community/ergodox/dvorak/keymap.c     |   2 +-
 .../community/ergodox/dvorak_emacs/keymap.c   |   2 +-
 .../ergodox/dvorak_emacs_software/keymap.c    |   2 +-
 .../ergodox/dvorak_intl_squisher/keymap.c     |   2 +-
 .../community/ergodox/dvorak_plover/keymap.c  |   2 +-
 .../ergodox/dvorak_programmer/keymap.c        |  68 +--
 .../ergodox/dvorak_programmer_swe/keymap.c    |   2 +-
 .../community/ergodox/dvorak_spanish/keymap.c |  43 +-
 .../ergodox/dvorak_svorak_a5/keymap.c         |   2 +-
 .../community/ergodox/emacs_osx_dk/keymap.c   |   2 +-
 .../community/ergodox/french_hacker/keymap.c  |   2 +-
 layouts/community/ergodox/galson/keymap.c     |   4 +-
 .../community/ergodox/german-kinergo/keymap.c |   2 +-
 .../community/ergodox/german-lukas/keymap.c   |   2 +-
 .../ergodox/german-manuneo/compile_keymap.py  | 110 ++--
 .../community/ergodox/german-manuneo/keymap.c |   2 +-
 layouts/community/ergodox/german/keymap.c     |   2 +-
 layouts/community/ergodox/haegin/keymap.c     |   2 +-
 .../community/ergodox/ishigoya-jp/keymap.c    |  78 +--
 layouts/community/ergodox/issmirnov/keymap.c  |   6 +-
 layouts/community/ergodox/italian/keymap.c    |   4 +-
 layouts/community/ergodox/j3rn/keymap.c       |   2 +-
 .../community/ergodox/jackhumbert/keymap.c    |  14 +-
 layouts/community/ergodox/jacobono/keymap.c   |   2 +-
 layouts/community/ergodox/jafo/keymap.c       |   2 +-
 layouts/community/ergodox/jgarr/keymap.c      |   2 +-
 layouts/community/ergodox/josh/keymap.c       |   2 +-
 layouts/community/ergodox/kastyle/keymap.c    |   4 +-
 layouts/community/ergodox/kejadlen/keymap.c   |   2 +-
 layouts/community/ergodox/kines-ish/keymap.c  |   2 +-
 layouts/community/ergodox/kristian/keymap.c   |   2 +-
 layouts/community/ergodox/maz/keymap.c        |   2 +-
 .../community/ergodox/mclennon_osx/keymap.c   |   2 +-
 .../community/ergodox/meagerfindings/keymap.c |   2 +-
 layouts/community/ergodox/msc/keymap.c        |   2 +-
 layouts/community/ergodox/naps62/keymap.c     |   2 +-
 .../ergodox/neo2_on_qwertz_hardware/keymap.c  |   4 +-
 layouts/community/ergodox/osx_de/keymap.c     | 197 ++++---
 .../ergodox/osx_de_adnw_koy/keymap.c          | 153 +++--
 .../ergodox/osx_de_experimental/keymap.c      | 555 +++++++++---------
 layouts/community/ergodox/osx_fr/keymap.c     |   2 +-
 .../ergodox/osx_kinesis_pnut/keymap.c         |   2 +-
 layouts/community/ergodox/osx_neo2/keymap.c   |   2 +-
 layouts/community/ergodox/phoenix/keymap.c    |   2 +-
 layouts/community/ergodox/plover/keymap.c     |   2 +-
 .../ergodox/qwerty_code_friendly/keymap.c     |   2 +-
 .../community/ergodox/reset_eeprom/keymap.c   |   2 +-
 .../keymap.c                                  |   2 +-
 .../romanzolotarev-norman-plover-osx/keymap.c |   2 +-
 .../romanzolotarev-norman-qwerty-osx/keymap.c |   2 +-
 layouts/community/ergodox/sethbc/keymap.c     |   2 +-
 layouts/community/ergodox/siroken3/keymap.c   |   2 +-
 layouts/community/ergodox/sneako/keymap.c     |   2 +-
 .../community/ergodox/software_neo2/keymap.c  |   2 +-
 .../community/ergodox/swedish-lindhe/keymap.c |   2 +-
 layouts/community/ergodox/swedish/keymap.c    |   2 +-
 .../community/ergodox/swissgerman/keymap.c    |   2 +-
 layouts/community/ergodox/techtomas/keymap.c  |   2 +-
 .../community/ergodox/tkuichooseyou/keymap.c  |   2 +-
 .../community/ergodox/tonyabra_osx/keymap.c   |   2 +-
 layouts/community/ergodox/townk_osx/keymap.c  |   2 +-
 .../twentylives_dvorak_with_hebrew/keymap.c   |  22 +-
 .../ergodox/win10_writers-block/keymap.c      |  28 +-
 layouts/community/ergodox/xyverz/keymap.c     |   6 +-
 .../ergodox/zweihander-macos/keymap.c         |   2 +-
 layouts/community/ortho_4x12/peej/keymap.c    |   2 +-
 quantum/action_layer.h                        |   2 +-
 tmk_core/protocol/arm_atsam/md_rgb_matrix.c   |   2 +-
 users/333fred/333fred.c                       |   2 +-
 users/333fred/rgb.c                           |   4 +-
 users/bbaserdem/bbaserdem.c                   |   4 +-
 users/billypython/billypython.c               |   2 +-
 users/billypython/billypython.h               |   2 +-
 users/dhertz/dhertz.c                         |   3 +-
 users/doogle999/doogle999.c                   |   6 +-
 users/edvorakjp/edvorakjp.c                   |   2 +-
 users/edvorakjp/edvorakjp.h                   |   2 +-
 users/ericgebhart/ericgebhart.c               |   2 +-
 users/ericgebhart/tap_dances.c                |   4 +-
 users/kuchosauronad0/kuchosauronad0.c         |   6 +-
 users/kuchosauronad0/kuchosauronad0.h         |   4 +-
 users/kuchosauronad0/rgblight_user.c          |  20 +-
 users/kuchosauronad0/template.c               |   4 +-
 users/mtdjr/mtdjr.c                           |   2 +-
 users/ninjonas/oled.c                         |   2 +-
 users/pvinis/pvinis.c                         |   2 +-
 users/pvinis/pvinis.h                         |   2 +-
 users/romus/romus.c                           |   4 +-
 users/sigma/sigma.c                           |   4 +-
 users/stanrc85/layer_rgb.c                    |   2 +-
 users/talljoe/talljoe.c                       |   2 +-
 users/tominabox1/tominabox1.c                 |   4 +-
 users/turbomech/backupturbomech.c             |   6 +-
 users/xulkal/custom_oled.c                    |   2 +-
 users/zer09/zer09.c                           |   2 +-
 293 files changed, 1249 insertions(+), 1309 deletions(-)

diff --git a/docs/zh-cn/custom_quantum_functions.md b/docs/zh-cn/custom_quantum_functions.md
index 29c5089052..dba9e7e7c0 100644
--- a/docs/zh-cn/custom_quantum_functions.md
+++ b/docs/zh-cn/custom_quantum_functions.md
@@ -240,7 +240,7 @@ void suspend_wakeup_init_user(void) {
 
 ```c
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _RAISE:
         rgblight_setrgb (0x00,  0x00, 0xFF);
         break;
@@ -267,7 +267,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 ### `layer_state_set_*` 函数文档
 
-* 键盘/各子版本：`uint32_t layer_state_set_kb(uint32_t state)`
+* 键盘/各子版本：`layer_state_t layer_state_set_kb(layer_state_t state)`
 * 布局: `layer_state_t layer_state_set_user(layer_state_t state)`
 
 
@@ -325,7 +325,7 @@ void keyboard_post_init_user(void) {
 
 ```c
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _RAISE:
         if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_magenta(); rgblight_mode_noeeprom(1); }
         break;
@@ -474,4 +474,3 @@ cancel_deferred_exec(my_token);
 ```c
 #define MAX_DEFERRED_EXECUTORS 16
 ```
-
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
index 6b7b36cbb2..eeca552657 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
@@ -196,7 +196,7 @@ void matrix_scan_user(void) {
   }
 }
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _TAPLAND:
         rgblight_setrgb(0, 16, 0); //green
         break;
diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
index 950b6e86b9..32c074c88f 100644
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
@@ -105,7 +105,7 @@ void matrix_scan_user(void) {
   #ifdef RGBLIGHT_ENABLE
 
   static uint8_t old_layer = 255;
-  uint8_t new_layer = biton32(layer_state);
+  uint8_t new_layer = get_highest_layer(layer_state);
 
   // Color of the Icons.
   if (old_layer != new_layer) {
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
index 2eef3dc48b..bd467482fe 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
@@ -128,10 +128,10 @@ void tap_dance_choose_layer_reset (qk_tap_dance_state_t *state, void *user_data)
 			layer_off(_RAISE);
 			break;
 		case 3:
-			if (biton32(default_layer_state) == _DVORAK) {
+			if (get_highest_layer(default_layer_state) == _DVORAK) {
 				set_single_persistent_default_layer(_QWERTY);
 			}
-			else if (biton32(default_layer_state) == _QWERTY) {
+			else if (get_highest_layer(default_layer_state) == _QWERTY) {
 				set_single_persistent_default_layer(_DVORAK);
 			}
 			break;
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 305756b5b1..4a88d33872 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -180,7 +180,7 @@ void keyboard_post_init_user(void) {
 #ifdef RGB_MATRIX_ENABLE
 void rgb_matrix_indicators_user(void) {
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
-        uint8_t layer = biton32(layer_state);
+        uint8_t layer = get_highest_layer(layer_state);
         switch (layer) {
             case _CLOSE:
                 // rgb_matrix_set_color(pgm_read_byte(&convert_led_location2number[11]),  RGB_RED);         //  RGB_TOG  <- too heavy.
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index ad6833d692..342ed1d40c 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -118,7 +118,7 @@ void keyboard_post_init_user(void) {
 #ifdef RGB_MATRIX_ENABLE
 void rgb_matrix_indicators_user(void) {
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
-        uint8_t layer = biton32(layer_state);
+        uint8_t layer = get_highest_layer(layer_state);
         switch (layer) {
             case _CLOSE:
                 // rgb_matrix_set_color(pgm_read_byte(&convert_led_location2number[11]),  RGB_RED);         //  RGB_TOG  <- too heavy.
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
index bb3b6fac48..58f01bb322 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // RGB Underglow使用時のレイヤー毎のカラー切り替え
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 
@@ -148,7 +148,7 @@ void matrix_init_user(void) {
 layer_state_t layer_state_set_user(layer_state_t state) {
   state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
 #ifdef RGBLIGHT_ENABLE
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _RAISE:
       rgblight_setrgb_chartreuse(); // RAISE:シャルトリューズ
       break;
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
index cc4d0bca63..4553d4e0e3 100644
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_scan_user(void) {
     uint8_t layer;
-    layer = biton32(layer_state);
+    layer = get_highest_layer(layer_state);
 
     if (current_layer_global != layer) {
         current_layer_global = layer;
@@ -132,7 +132,7 @@ void tap_helper(keyrecord_t *record, uint16_t orig_mod, uint16_t macro_mod, uint
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     uint8_t layer;
-    layer = biton32(layer_state);
+    layer = get_highest_layer(layer_state);
     if (layer == PROG2) {
          if (keycode >= KC_A && keycode <= KC_EXSEL && \
              !(  // do not send LSFT + these keycodes, they are needed for emulating the US layout
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
index 7884462021..dc55cdf9fd 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_scan_user(void)
 {
-	uint8_t layer = biton32(layer_state);
+	uint8_t layer = get_highest_layer(layer_state);
 	switch (layer) {
 		case KM_BLOWRAK:
 			ph_caps_led_on();
diff --git a/keyboards/cannonkeys/ortho75/ortho75.c b/keyboards/cannonkeys/ortho75/ortho75.c
index 7c722d7156..58b7396a1b 100644
--- a/keyboards/cannonkeys/ortho75/ortho75.c
+++ b/keyboards/cannonkeys/ortho75/ortho75.c
@@ -5,47 +5,48 @@
 
 uint8_t layer = 0;
 
-uint32_t layer_state_set_kb(uint32_t state) {
-  state = layer_state_set_user(state);
-  layer = biton32(state);
-  return state;
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    layer = get_highest_layer(state);
+    return state;
 }
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) return false;
-  uint16_t mapped_code = 0;
-  if (index == 0) {
-    if (clockwise) {
-        switch(layer){
-            case 0:
-            default:
-                mapped_code = KC_VOLU;
-                break;
-            case 1:
-                mapped_code = KC_MEDIA_NEXT_TRACK;
-                break;
-            case 2:
-                mapped_code = KC_PGDN;
-                break;
+    uint16_t mapped_code = 0;
+    if (index == 0) {
+        if (clockwise) {
+            switch (layer) {
+                case 0:
+                default:
+                    mapped_code = KC_VOLU;
+                    break;
+                case 1:
+                    mapped_code = KC_MEDIA_NEXT_TRACK;
+                    break;
+                case 2:
+                    mapped_code = KC_PGDN;
+                    break;
+            }
+        } else {
+            switch (layer) {
+                case 0:
+                default:
+                    mapped_code = KC_VOLD;
+                    break;
+                case 1:
+                    mapped_code = KC_MEDIA_PREV_TRACK;
+                    break;
+                case 2:
+                    mapped_code = KC_PGUP;
+                    break;
+            }
         }
-    } else {
-        switch(layer){
-            case 0:
-            default:
-                mapped_code = KC_VOLD;
-                break;
-            case 1:
-                mapped_code = KC_MEDIA_PREV_TRACK;
-                break;
-            case 2:
-                mapped_code = KC_PGUP;
-                break;
+        uint16_t held_keycode_timer = timer_read();
+        register_code(mapped_code);
+        while (timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY) { /* no-op */
         }
+        unregister_code(mapped_code);
     }
-    uint16_t held_keycode_timer = timer_read();
-    register_code(mapped_code);
-    while (timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){ /* no-op */ }
-    unregister_code(mapped_code);
-  }
-  return true;
+    return true;
 }
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index bd7eaf1885..9435377839 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -240,7 +240,7 @@ void read_host_led_state(void) {
 
 layer_state_t layer_state_set_kb(layer_state_t state) {
   state = layer_state_set_user(state);
-  layer = biton32(state);
+  layer = get_highest_layer(state);
   oled_request_wakeup();
   return state;
 }
diff --git a/keyboards/ckeys/washington/keymaps/default/keymap.c b/keyboards/ckeys/washington/keymaps/default/keymap.c
index 95e0f3ab59..9ce0181fe4 100644
--- a/keyboards/ckeys/washington/keymaps/default/keymap.c
+++ b/keyboards/ckeys/washington/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
         case _BASE:
             if (clockwise) {
                 tap_code(KC_VOLU);
@@ -62,7 +62,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 bool oled_task_user(void) {
   // Host Keyboard Layer Status
   oled_write_P(PSTR("Layer: "), false);
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case _BASE:
       oled_write_P(PSTR("Default\n"), false);
       break;
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index 56d4c47071..7b7d2bdce0 100644
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -199,7 +199,7 @@ void matrix_scan_user(void) {
 
     if (!rgblight_config.enable || rgblight_config.mode != 1) { return; }
 
-    uint32_t layer = layer_state;
+    layer_state_t layer = layer_state;
     uint8_t val = rgblight_config.val;
 
     if (layer & (1<<_FL)) {
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
index 6ef428a11f..ab84e5c580 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
@@ -84,7 +84,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 
 const char *read_logo(void);
 bool oled_task_user(void){
-    switch (biton32(layer_state)){
+    switch (get_highest_layer(layer_state)){
         case _DVORAK:
             oled_write_ln_P(PSTR("DVRK"), false);
             break;
diff --git a/keyboards/crkbd/keymaps/edvorakjp/keymap.c b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
index 5e56da61a9..f3b801da68 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/keymap.c
+++ b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
@@ -54,9 +54,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // clang-format on
 
 #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
-uint32_t layer_state_set_keymap(uint32_t state) {
+layer_state_t layer_state_set_keymap(layer_state_t state) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case L_EDVORAKJP_LOWER:
             rgblight_sethsv_noeeprom_red();
             break;
diff --git a/keyboards/crkbd/keymaps/edvorakjp/oled.c b/keyboards/crkbd/keymaps/edvorakjp/oled.c
index e5ff029565..cd75f8e277 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/oled.c
+++ b/keyboards/crkbd/keymaps/edvorakjp/oled.c
@@ -9,7 +9,7 @@ void render_layer_state(void) {
     char layer_name[17];
     oled_write_P(PSTR("Layer: "), false);
 
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
         case L_EDVORAKJP_BASE:
             oled_write_ln_P(PSTR("Default"), false);
             break;
diff --git a/keyboards/crkbd/keymaps/jarred/keymap.c b/keyboards/crkbd/keymaps/jarred/keymap.c
index b938636c2a..3784eff2b8 100644
--- a/keyboards/crkbd/keymaps/jarred/keymap.c
+++ b/keyboards/crkbd/keymaps/jarred/keymap.c
@@ -84,7 +84,7 @@ const char *read_keylogs(void);
 char matrix_line_str[24];
 
 const char *read_layer_state(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   strcpy(matrix_line_str, "Layer: ");
 
diff --git a/keyboards/dichotomy/keymaps/default/keymap.c b/keyboards/dichotomy/keymaps/default/keymap.c
index b8c7ef4274..80fc4d89bc 100755
--- a/keyboards/dichotomy/keymaps/default/keymap.c
+++ b/keyboards/dichotomy/keymaps/default/keymap.c
@@ -109,7 +109,7 @@ report_mouse_t currentReport = {};
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	//uint8_t layer;
-	//layer = biton32(layer_state);  // get the current layer  //Or don't, I didn't use it.
+	//layer = get_highest_layer(layer_state);  // get the current layer  //Or don't, I didn't use it.
 	bool returnVal = true; //this is to determine if more key processing is needed.
 
 	 //custom layer handling for tri_layer,
@@ -437,7 +437,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 void matrix_scan_user(void) {
-	//uint8_t layer = biton32(layer_state);
+	//uint8_t layer = get_highest_layer(layer_state);
 	for (uint8_t i = 0; i<LONGPRESS_COUNT; i++){
 		if ((timer_elapsed(special_timers[i]) >= CUSTOM_LONGPRESS) && (!special_key_states[i]) && special_key_pressed[i]){
 			switch (i + SAFE_RANGE){
diff --git a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
index 6dcabb160e..e617d0dd5f 100644
--- a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
@@ -129,7 +129,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_laye
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
         case _LOWER:
diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
index a9e811f9a4..d3956ce3f0 100644
--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -4,12 +4,12 @@
 // thanks to atlacat, hailbreno, itsaferbie and weeheavy...
 
 // and special thanks to  AGausmann and drashna for the layer-activated RGB underglow
-// https://www.reddit.com/r/olkb/comments/6t1vdu/update_layeractivated_rgb_underglow/ 
+// https://www.reddit.com/r/olkb/comments/6t1vdu/update_layeractivated_rgb_underglow/
 // https://github.com/AGausmann/qmk_firmware/blob/agausmann-v3.x/keyboards/nyquist/keymaps/agausmann/keymap.c
 
 #include QMK_KEYBOARD_H
 
-/* 
+/*
 * Each layer gets a name for readability.
 * The underscores don't mean anything - you can
 * have a layer called STUFF or any other name.
@@ -23,8 +23,8 @@
 #define NL 2     // Numpad Layer
 #define RL 3     // RGB Layer
 
-/* 
-* Let's give an easier name to the RGB modes 
+/*
+* Let's give an easier name to the RGB modes
 * and assign the ones we want to the different layer
 * these will then be used by the function below
 *
@@ -49,10 +49,10 @@
 //
 #define RGB_RL_MODE    rgblight_mode_noeeprom(22)             //rgb mode for RL layer
 #define RGB_RL_LIGHT   rgblight_sethsv_noeeprom_red()         //rgb light for RL layer
-      
+
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	
+
   /* Keymap BL: Base Layer (Default Layer)
    *
    * ,-----------------------------------------------------------.
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,   RGB_STA,   RGB_BRE,   RGB_RAI,   RGB_SWI,   _______,   _______,   RGB_SNA,   RGB_KNI,   RGB_GRA,   RGB_XMS,   _______,   _______,   _______,
         _______,   BL_DEC,    BL_TOGG,   BL_INC,    BL_STEP,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
         _______,   _______,   _______,   _______,   MO(FL),    _______,   _______,   _______,   TO(BL),    _______),
-        
+
 
 };
 
@@ -175,25 +175,25 @@ void matrix_scan_user(void) {
   #ifdef RGBLIGHT_ENABLE
 
   static uint8_t old_layer = 1;
-  uint8_t new_layer = biton32(layer_state);
+  uint8_t new_layer = get_highest_layer(layer_state);
 
   if (old_layer != new_layer) {
     switch (new_layer) {
       case BL:
           RGB_BL_MODE;
-          RGB_BL_LIGHT;        
+          RGB_BL_LIGHT;
         break;
       case FL:
           RGB_FL_MODE;
-          RGB_FL_LIGHT;  
+          RGB_FL_LIGHT;
         break;
       case NL:
-          RGB_NL_MODE; 
-          RGB_NL_LIGHT; 
+          RGB_NL_MODE;
+          RGB_NL_LIGHT;
         break;
       case RL:
-          RGB_RL_MODE; 
-          RGB_RL_LIGHT;        
+          RGB_RL_MODE;
+          RGB_RL_LIGHT;
         break;
     }
 
diff --git a/keyboards/dz60/keymaps/marianas/customLogic.c b/keyboards/dz60/keymaps/marianas/customLogic.c
index f22bd882e9..03ba92fe92 100644
--- a/keyboards/dz60/keymaps/marianas/customLogic.c
+++ b/keyboards/dz60/keymaps/marianas/customLogic.c
@@ -11,7 +11,7 @@ static int16_t fnTimer = 0;
 
 layer_state_t layer_state_set_user(layer_state_t state)
 {
-  switch (biton32(state))
+  switch (get_highest_layer(state))
   {
     case QWERTY:
       rgblight_mode(9);
diff --git a/keyboards/dz60/keymaps/xtonhasvim/keymap.c b/keyboards/dz60/keymaps/xtonhasvim/keymap.c
index 9a482686d8..49bc20b576 100644
--- a/keyboards/dz60/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/dz60/keymaps/xtonhasvim/keymap.c
@@ -73,7 +73,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   static uint32_t last_state = 0;
 
   if(last_state != state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _CMD:
       user_led_on();
       break;
@@ -85,5 +85,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   }
   return state;
 }
-
-
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
index a12358c8d9..287496e17f 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
@@ -96,7 +96,7 @@ void rgb_matrix_indicators_user(void)
 	uint8_t this_led = host_keyboard_leds();
 
 	if (!g_suspend_state && rgb_matrix_config.enable) {
-		switch (biton32(layer_state)) {
+		switch (get_highest_layer(layer_state)) {
 		case _NAV:
 			if (this_led & (1 << USB_LED_NUM_LOCK)) {
 				rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index a7c6360568..6af35cf779 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -62,7 +62,7 @@ void rgb_matrix_indicators_user(void)
 	uint8_t this_led = host_keyboard_leds();
 
 	if (!g_suspend_state && rgb_matrix_config.enable) {
-		switch (biton32(layer_state)) {
+		switch (get_highest_layer(layer_state)) {
 		case _LAYER1:
 			rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
 
@@ -78,7 +78,7 @@ void rgb_matrix_indicators_user(void)
 		rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	}
 
-	switch (biton32(layer_state)) {
+	switch (get_highest_layer(layer_state)) {
 	case _LAYER3:
 		if (this_led & (1 << USB_LED_NUM_LOCK)) {
 			rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
index c13fcc1d35..daef7b271d 100644
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
@@ -37,7 +37,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
 void rgb_matrix_indicators_user(void)
 {
 	if (!g_suspend_state) {
-		switch (biton32(layer_state)) {
+		switch (get_highest_layer(layer_state)) {
 		case _QWERTY:
 			rgb_matrix_layer_helper(0x00, 0x0F, 0xFF); break;
 
@@ -46,7 +46,7 @@ void rgb_matrix_indicators_user(void)
 		}
 	}
 
-	switch (biton32(layer_state)) {
+	switch (get_highest_layer(layer_state)) {
 	case _FNM:
 		rgb_matrix_set_color(0, 0x00, 0xFF, 0x00);
 		rgb_matrix_set_color(1, 0x00, 0x00, 0x00);
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 8bd6069107..817c0fd2ff 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -238,5 +238,5 @@ void rgb_matrix_indicators_user(void) {
     }
 
     // Show Selected Layer
-    rgb_matrix_set_color(layers_leds_map[biton32(layer_state)], MAIN_COLOR[0], MAIN_COLOR[1], MAIN_COLOR[2]);
-}
\ No newline at end of file
+    rgb_matrix_set_color(layers_leds_map[get_highest_layer(layer_state)], MAIN_COLOR[0], MAIN_COLOR[1], MAIN_COLOR[2]);
+}
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index c313f467e3..2ebbddcef7 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -1,20 +1,20 @@
 #include QMK_KEYBOARD_H
 
 /**************** SOME GLOBALS *********************/
- 
+
 bool onMac = false;
 bool isLeader = false;
 bool isBlinking = false;
 bool isRecording = false;
 bool isPlaying = false;
-const float led_dim_ratio = 0.50; 
-static uint16_t blink_cycle_timer, 
-                blink_fade_in_timer, 
-                blink_fade_out_timer, 
+const float led_dim_ratio = 0.50;
+static uint16_t blink_cycle_timer,
+                blink_fade_in_timer,
+                blink_fade_out_timer,
                 macro_one_play_timer,
                 macro_two_play_timer,
                 macro_play_blink_timer = 2000;
-static uint8_t  fade_in_step_counter, 
+static uint8_t  fade_in_step_counter,
                 fade_out_step_counter,
                 blink_hsv_value;
 
@@ -26,13 +26,13 @@ Function to set color with hsv arguments
 - "val_ratio" is used to adjust brightness ratio
 */
 void rgb_matrix_set_color_hsv(uint8_t led, uint16_t hue, uint16_t sat, uint16_t val, float val_ratio) {
-    const uint8_t h = hue <= 255 ? hue : rgb_matrix_config.hsv.h;    
+    const uint8_t h = hue <= 255 ? hue : rgb_matrix_config.hsv.h;
     const uint8_t s = sat <= 255 ? sat : rgb_matrix_config.hsv.s;
     const uint8_t v = val <= 255 ? val * val_ratio : rgb_matrix_config.hsv.v * val_ratio;
     HSV hsv_in = {h, s, v};
     RGB rgb_out = hsv_to_rgb(hsv_in);
     rgb_matrix_set_color(led, rgb_out.r, rgb_out.g, rgb_out.b);
-} 
+}
 
 void reset_blink_cycle(void) {
     blink_cycle_timer = timer_read();
@@ -110,31 +110,31 @@ const layers_leds_map[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAIN] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
-        KC_LEAD, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, 
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, 
+        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_LEAD, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_MAC] = LAYOUT_65_ansi(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LALT, KC_LGUI, KC_TRNS, KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_FN] = LAYOUT_65_ansi(
-        DYN_REC_STOP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, 
-        KC_TRNS, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, DYN_MACRO_PLAY2, DYN_REC_START2, 
-        KC_TRNS, KC_BRID, KC_VOLD, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, DYN_MACRO_PLAY1, DYN_REC_START1, 
-        KC_TRNS, TO(_MAIN), TO(_MAC), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPD, RGB_SPI, KC_TRNS, RGB_VAI, KC_NO, 
+        DYN_REC_STOP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
+        KC_TRNS, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, DYN_MACRO_PLAY2, DYN_REC_START2,
+        KC_TRNS, KC_BRID, KC_VOLD, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, DYN_MACRO_PLAY1, DYN_REC_START1,
+        KC_TRNS, TO(_MAIN), TO(_MAC), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPD, RGB_SPI, KC_TRNS, RGB_VAI, KC_NO,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_MOD
     ),
-}; 
+};
 
 //**************** MATRIX SCANS *********************//
 
-void rgb_matrix_indicators_user(void) { 
+void rgb_matrix_indicators_user(void) {
 
     #ifdef RGB_MATRIX_ENABLE
 
@@ -144,7 +144,7 @@ void rgb_matrix_indicators_user(void) {
     /* CapsLock LED indicator */
     if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
         rgb_matrix_set_color_hsv(30, 999, 0, led_constant_val, 0.75); // WHITE
-    } 
+    }
 
     /* Current layer LED indicator */
     rgb_matrix_set_color_hsv(layers_leds_map[get_highest_layer(layer_state)], 999, 0, led_constant_val, led_dim_ratio); // WHITE
@@ -155,7 +155,7 @@ void rgb_matrix_indicators_user(void) {
         rgb_matrix_set_color_hsv(30, 999, 999, 999, 1); // CONFIG
     } else {
         rgb_matrix_set_color_hsv(14, 999, 999, 999, led_dim_ratio); // CONFIG
-    }   
+    }
 
     /* Blinking LED indicator when recording Dynamic Macro */
     if (isRecording && isBlinking) {
@@ -174,7 +174,7 @@ void rgb_matrix_indicators_user(void) {
         }
     }
 
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
         case _FN:
             /* Dynamic Macro LED indicator */
             if (isRecording) {
@@ -188,12 +188,12 @@ void rgb_matrix_indicators_user(void) {
             /* Layer LED indicators */
             rgb_matrix_set_color_hsv(45, 999, 0, led_constant_val, led_dim_ratio); /* WHITE Layer _MAIN */
             rgb_matrix_set_color_hsv(46, 999, 0, led_constant_val, led_dim_ratio); /* WHITE Layer _MAC */
-            break; 
+            break;
     }
 
     #endif /* RGB_MATRIX */
 }
- 
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     bool pressed = record->event.pressed;
     if (pressed) {
@@ -202,12 +202,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 onMac = true;
                 break;
             case TO(_MAIN):
-                onMac = false;      
+                onMac = false;
                 break;
         }
     }
     return true;
-} 
+}
 
 //**************** LEADER *********************//
 
@@ -244,7 +244,7 @@ const uint8_t french_accent_index[3] = {
     [_ACUTE] = 2
 };
 
-/* 
+/*
 This represent unicode decimal values
 Each index will be mapped to numpad keycode to out put the correct sequence
 All codes in this array should be of size 3
@@ -272,8 +272,8 @@ const uint8_t french_decimal_unicodes[5][3][2] = { /*[Letter][Accent][Case]*/
         }
     },{
         {
-            140,    // î    
-            206     // Î 
+            140,    // î
+            206     // Î
         }
     },{
         {
@@ -306,7 +306,7 @@ This is designed and work on an English language keyboard setting on both Window
 => accept french_letter and french_accent enum's as argument
 */
 void send_french_accent(uint8_t letter, uint8_t accent) {
-    
+
     bool isCaps;
     uint8_t decimal_unicode_in;
     uint8_t decimal_unicode_size = 3;
@@ -330,7 +330,7 @@ void send_french_accent(uint8_t letter, uint8_t accent) {
     };
 
     /*
-    Function to tap the correct keycodes in sequence for the 
+    Function to tap the correct keycodes in sequence for the
     "Windows Alt Code" requested, aka Decimal Unicodes
     */
     void tap_win_alt_code(void) {
@@ -341,7 +341,7 @@ void send_french_accent(uint8_t letter, uint8_t accent) {
             tap_code(numpad_key_map[decimal_unicode_out[i]]);
         }
     }
-    
+
     isCaps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? true : false;
 
     if (onMac) {
@@ -372,7 +372,7 @@ void send_french_accent(uint8_t letter, uint8_t accent) {
 
 /*Couple functions used to output the same macro on two different sequences*/
 
-/* (|) */ 
+/* (|) */
 void ldrkey_send_paranthesis_wrap_ini(void) {
     SEND_STRING("()" SS_TAP(X_LEFT));
 }
@@ -382,7 +382,7 @@ void ldrkey_send_paranthesis_wrap_word(void) {
     onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "(" SS_LALT(SS_TAP(X_RIGHT)) ")") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "(" SS_LCTL(SS_TAP(X_RIGHT)) ")");
 }
 
-/* (selection) */ 
+/* (selection) */
 void ldrkey_send_paranthesis_wrap_selection(void) {
     onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "()" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "()" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT));
 }
@@ -419,9 +419,9 @@ void ldrkey_send_curlybrace_wrap_selection(void) {
 
 LEADER_EXTERNS();
 
-void matrix_scan_user(void) 
+void matrix_scan_user(void)
 {
-    LEADER_DICTIONARY() 
+    LEADER_DICTIONARY()
     {
         leading = false;
         leader_end();
@@ -476,49 +476,49 @@ void matrix_scan_user(void)
             tap_code(KC_CAPS);
         }
         /*  ±       => LdrKey > = > - */
-        SEQ_TWO_KEYS(KC_EQL, KC_MINS) { 
-            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_EQL)))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P1) SS_UP(X_LALT)); 
+        SEQ_TWO_KEYS(KC_EQL, KC_MINS) {
+            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_EQL)))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P1) SS_UP(X_LALT));
         }
         /*  ≤       => LdrKey > - > = */
-        SEQ_TWO_KEYS(KC_MINS, KC_EQL) { 
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_COMM))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P3) SS_UP(X_LALT)); 
+        SEQ_TWO_KEYS(KC_MINS, KC_EQL) {
+            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_COMM))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P3) SS_UP(X_LALT));
         }
         /*  ≥       => LdrKey > = > = */
-        SEQ_TWO_KEYS(KC_EQL, KC_EQL) { 
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_DOT))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P2) SS_UP(X_LALT)); 
+        SEQ_TWO_KEYS(KC_EQL, KC_EQL) {
+            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_DOT))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P2) SS_UP(X_LALT));
         }
         /*  <=      => LdrKey > , > , */
-        SEQ_TWO_KEYS(KC_COMM, KC_COMM) { 
-            SEND_STRING(SS_LSFT(SS_TAP(X_COMM)) SS_TAP(X_SPC) SS_TAP(X_EQL) SS_TAP(X_LEFT) SS_TAP(X_BSPC) SS_TAP(X_RIGHT)); 
+        SEQ_TWO_KEYS(KC_COMM, KC_COMM) {
+            SEND_STRING(SS_LSFT(SS_TAP(X_COMM)) SS_TAP(X_SPC) SS_TAP(X_EQL) SS_TAP(X_LEFT) SS_TAP(X_BSPC) SS_TAP(X_RIGHT));
         }
         /*  =>      => LdrKey > . > . */
-        SEQ_TWO_KEYS(KC_DOT, KC_DOT) { 
-            SEND_STRING("=>"); 
+        SEQ_TWO_KEYS(KC_DOT, KC_DOT) {
+            SEND_STRING("=>");
         }
         /*  ", "    => LdrKey > " " */
-        SEQ_ONE_KEY(KC_SPC) { 
-            SEND_STRING(", "); 
+        SEQ_ONE_KEY(KC_SPC) {
+            SEND_STRING(", ");
         }
         /*  ". "    => LdrKey > " " > " " */
-        SEQ_TWO_KEYS(KC_SPC, KC_SPC) { 
-            SEND_STRING(". "); 
+        SEQ_TWO_KEYS(KC_SPC, KC_SPC) {
+            SEND_STRING(". ");
         }
         /*  Backward delete current word (on cursor) */
-        SEQ_TWO_KEYS(KC_BSPC, KC_BSPC) { 
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_RIGHT)) SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_TAP(X_RIGHT)) SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)); 
+        SEQ_TWO_KEYS(KC_BSPC, KC_BSPC) {
+            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_RIGHT)) SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_TAP(X_RIGHT)) SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC));
         }
         /*  Previous word delete */
-        SEQ_ONE_KEY(KC_BSPC) { 
-            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)); 
+        SEQ_ONE_KEY(KC_BSPC) {
+            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC));
         }
         /*  Forward delete current word (on cursor) */
-        SEQ_TWO_KEYS(KC_DEL, KC_DEL) { 
+        SEQ_TWO_KEYS(KC_DEL, KC_DEL) {
 
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)) : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)); 
+            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)) : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL));
         }
         /*  Next word delete */
-        SEQ_ONE_KEY(KC_DEL) { 
-            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)): SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)); 
+        SEQ_ONE_KEY(KC_DEL) {
+            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)): SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL));
         }
         /*  `   => LdrKey > Escape */
         SEQ_ONE_KEY(KC_GESC) {
@@ -548,7 +548,7 @@ void matrix_scan_user(void)
         SEQ_ONE_KEY(KC_Q) {
             onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_Q))) : SEND_STRING(SS_LALT(SS_TAP(X_F4)));
         }
-        /*  "           => LdrKey > ' */ 
+        /*  "           => LdrKey > ' */
         SEQ_ONE_KEY(KC_QUOT) {
             SEND_STRING("\"");
         }
@@ -657,48 +657,48 @@ void matrix_scan_user(void)
             ldrkey_send_curlybrace_wrap_selection();
         }
         /*  Select everything on this line before cursor => LdrKey > Left */
-        SEQ_ONE_KEY(KC_LEFT) { 
+        SEQ_ONE_KEY(KC_LEFT) {
             onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_LEFT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_HOME)));
         }
         /*  Select everything on this line after cursor  => LdrKey > Right */
-        SEQ_ONE_KEY(KC_RIGHT) { 
+        SEQ_ONE_KEY(KC_RIGHT) {
             onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_END)));
         }
         /*  Select everything on this line before cursor and bring on previous line => LdrKey > Left > Left */
-        SEQ_TWO_KEYS(KC_LEFT, KC_LEFT) { 
-            onMac ? SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_TAP(X_END))); 
+        SEQ_TWO_KEYS(KC_LEFT, KC_LEFT) {
+            onMac ? SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_TAP(X_END)));
         }
         /*  Select everything on this line  => LdrKey > Right > Left */
-        SEQ_TWO_KEYS(KC_RIGHT, KC_LEFT) { 
-            onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_RIGHT) SS_LSFT(SS_LGUI(SS_TAP(X_LEFT))))) : SEND_STRING(SS_TAP(X_END) SS_LSFT(SS_TAP(X_HOME))); 
+        SEQ_TWO_KEYS(KC_RIGHT, KC_LEFT) {
+            onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_RIGHT) SS_LSFT(SS_LGUI(SS_TAP(X_LEFT))))) : SEND_STRING(SS_TAP(X_END) SS_LSFT(SS_TAP(X_HOME)));
         }
         /*  Select 1x Page Up on the page before the cursor  => LdrKey > Up */
-        SEQ_ONE_KEY(KC_UP) { 
+        SEQ_ONE_KEY(KC_UP) {
             SEND_STRING(SS_LSFT(SS_TAP(X_PGUP)));
         }
         /*  Select 1x Page Down on the page after the cursor => LdrKey > Down */
-        SEQ_ONE_KEY(KC_DOWN) { 
-            SEND_STRING(SS_LSFT(SS_TAP(X_PGDN)));   
+        SEQ_ONE_KEY(KC_DOWN) {
+            SEND_STRING(SS_LSFT(SS_TAP(X_PGDN)));
         }
         /*  Select everything on the page before the cursor => LdrKey > Up > Up */
-        SEQ_TWO_KEYS(KC_UP, KC_UP) { 
+        SEQ_TWO_KEYS(KC_UP, KC_UP) {
             onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_UP)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_HOME))));
         }
         /*  Select everything on the page after the cursor => LdrKey > Down > Down */
-        SEQ_TWO_KEYS(KC_DOWN, KC_DOWN) { 
+        SEQ_TWO_KEYS(KC_DOWN, KC_DOWN) {
             onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_DOWN)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_END))));
         }
         /* HELPER => spit out the url of the layout description page on github */
-        SEQ_FIVE_KEYS(KC_GESC, KC_GESC, KC_GESC, KC_GESC, KC_GESC) { 
+        SEQ_FIVE_KEYS(KC_GESC, KC_GESC, KC_GESC, KC_GESC, KC_GESC) {
             SEND_STRING("https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz65rgb/keymaps/drootz");
         }
         /*  google.ca   => LdrKey > G > G */
-        SEQ_TWO_KEYS(KC_G, KC_G) { 
-            SEND_STRING("https://google.ca" SS_TAP(X_ENT)); 
+        SEQ_TWO_KEYS(KC_G, KC_G) {
+            SEND_STRING("https://google.ca" SS_TAP(X_ENT));
         }
         /*  @gmail  => LdrKey > M > L > T */
-        SEQ_THREE_KEYS(KC_M, KC_L, KC_T) { 
-            SEND_STRING("mailto." SS_TAP(X_D) SS_TAP(X_A) SS_TAP(X_N) SS_TAP(X_I) SS_TAP(X_E) SS_TAP(X_L) SS_TAP(X_R) SS_TAP(X_A) SS_TAP(X_C) SS_TAP(X_I) SS_TAP(X_N) SS_TAP(X_E) "@gmail.com"); 
+        SEQ_THREE_KEYS(KC_M, KC_L, KC_T) {
+            SEND_STRING("mailto." SS_TAP(X_D) SS_TAP(X_A) SS_TAP(X_N) SS_TAP(X_I) SS_TAP(X_E) SS_TAP(X_L) SS_TAP(X_R) SS_TAP(X_A) SS_TAP(X_C) SS_TAP(X_I) SS_TAP(X_N) SS_TAP(X_E) "@gmail.com");
         }
         /*  Show Desktop            => LdrKey > D */
         SEQ_ONE_KEY(KC_D) {
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index 00915a9b4f..0c7bfbbb48 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -91,7 +91,7 @@ void rgb_matrix_indicators_user(void)
 	uint8_t this_led = host_keyboard_leds();
 
 	if (!g_suspend_state && rgb_matrix_config.enable) {
-		switch (biton32(layer_state)) {
+		switch (get_highest_layer(layer_state)) {
 		case _NAV:
 			if (IS_LED_ON(this_led, USB_LED_NUM_LOCK)) {
 				rgb_matrix_set_color(17, 0xFF, 0x00, 0x00);
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
index a5b107baae..91798ab188 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
@@ -190,7 +190,7 @@ static bool is_macro1_recording = false;
 // The current set of active layers (as a bitmask).
 // There is a global 'layer_state' variable but it is set after the call
 // to layer_state_set_user().
-static uint32_t current_layer_state = 0;
+static layer_state_t current_layer_state = 0;
 layer_state_t layer_state_set_user(layer_state_t state);
 
 // Method called at the end of the tap dance on the TAP_MACRO key. That key is
diff --git a/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c b/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
index 5c08d30727..67c50eb129 100644
--- a/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
@@ -200,7 +200,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
@@ -262,4 +262,3 @@ void matrix_scan_user(void) {
 //  }
 //  return true;
 //}
-
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
index 229ece0d74..eff7f111b4 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
@@ -98,7 +98,7 @@ static bool is_macro1_recording = false;
 // The current set of active layers (as a bitmask).
 // There is a global 'layer_state' variable but it is set after the call
 // to layer_state_set_user().
-static uint32_t current_layer_state = 0;
+static layer_state_t current_layer_state = 0;
 layer_state_t layer_state_set_user(layer_state_t state);
 
 // Method called at the end of the tap dance on the TAP_MACRO key. That key is
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
index 73b1077b83..3ab66078fe 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   ergodox_board_led_off();
   ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index fab2977356..ff9ae77bdd 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -725,7 +725,7 @@ void led_set_user(uint8_t usb_led) {
 
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_2_off();
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
index fd022681b0..ed407def79 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
@@ -1,6 +1,6 @@
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    uint8_t layer = biton32(state);
+    uint8_t layer = get_highest_layer(state);
 
     switch (layer) {
         case DVORAK:
diff --git a/keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c b/keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c
index b6edc17532..91884c8e76 100644
--- a/keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c
@@ -370,7 +370,7 @@ LEADER_EXTERNS();
 void matrix_scan_user(void)
 {
 
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   if (keyboard_report->mods & MOD_BIT(KC_LSFT) ||
       ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) &&
@@ -677,4 +677,4 @@ void matrix_init_user(void)
   wait_ms(1000);
 
   rgblight_effect_knight(50);
-}
\ No newline at end of file
+}
diff --git a/keyboards/ergodox_ez/keymaps/kou/keymap.c b/keyboards/ergodox_ez/keymaps/kou/keymap.c
index c8d0a6b5dd..01427c2d2d 100644
--- a/keyboards/ergodox_ez/keymaps/kou/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/kou/keymap.c
@@ -284,7 +284,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
index 5d797beb18..542e123db3 100644
--- a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
@@ -813,7 +813,7 @@ case RU_7:
 
 layer_state_t layer_state_set_user(layer_state_t state) {
 
-    uint8_t layer = biton32(state);
+    uint8_t layer = get_highest_layer(state);
 
   //  ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c b/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
index 10b6567cdb..bb6ba5ae34 100644
--- a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
index e31391a674..a3c2176951 100644
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
@@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  uint8_t layer = biton32(state);
+  uint8_t layer = get_highest_layer(state);
   ergodox_board_led_off();
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
@@ -431,4 +431,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 }
-
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
index 1d12093bab..ba578dd1c5 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
@@ -1057,7 +1057,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    uint8_t layer = biton32(state);
+    uint8_t layer = get_highest_layer(state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/profet_80/keymap.c b/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
index 85455fa9d9..6f602e828e 100644
--- a/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
@@ -157,7 +157,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/pvinis/keymap.c b/keyboards/ergodox_ez/keymaps/pvinis/keymap.c
index 024cefd270..c69621ab98 100644
--- a/keyboards/ergodox_ez/keymaps/pvinis/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/pvinis/keymap.c
@@ -245,11 +245,11 @@ void keyboard_post_init_user_keymap(void) {
 }
 
 // light up leds based on the layer
-uint32_t layer_state_set_user_keymap(uint32_t state) {
+layer_state_t layer_state_set_user_keymap(layer_state_t state) {
     ergodox_right_led_1_off();
     ergodox_right_led_2_off();
     ergodox_right_led_3_off();
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case LR_SYSCTL:
             ergodox_right_led_3_on();  // blue
             break;
@@ -306,7 +306,7 @@ uint32_t layer_state_set_user_keymap(uint32_t state) {
 
 // SYSCTL on first tap, MOUSE ON second tap
 // void layers_dance_finished(qk_tap_dance_state_t *state, void *user_data) {
-//   uint8_t layer = biton32(layer_state);
+//   uint8_t layer = get_highest_layer(layer_state);
 
 //   switch(state->count) {
 //   case 1:
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
index 3e607edb39..595f3b4ee1 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
@@ -228,7 +228,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
   ergodox_right_led_3_off();
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case SYMB:
         ergodox_right_led_1_on();
         if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_red(); rgblight_mode_noeeprom(1); }
@@ -268,4 +268,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     }
   return state;
 }
-
diff --git a/keyboards/ergodox_ez/keymaps/rishka/keymap.c b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
index 102803e512..0d6ac9fe95 100644
--- a/keyboards/ergodox_ez/keymaps/rishka/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
@@ -138,7 +138,7 @@ void keyboard_post_init_user(void) {
 };
 
 // Runs whenever there is a layer state change.
-uint32_t layer_state_set_user(layer_state_t state) {
+layer_state_t layer_state_set_user(layer_state_t state) {
   ergodox_board_led_off();
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c
index 1446ea7466..04aa6a99fd 100644
--- a/keyboards/ergodox_ez/keymaps/skug/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c
@@ -228,7 +228,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
index 42ac13775f..c8ddc23a8b 100644
--- a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
@@ -139,7 +139,7 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-   uint8_t layer = biton32(layer_state);
+   uint8_t layer = get_highest_layer(layer_state);
 
    if(layer == 1)
    {
@@ -157,7 +157,7 @@ void matrix_scan_user(void) {
    }
 
   if(keyboard_report->mods & MOD_BIT(KC_LSFT))
-  { 
+  {
       ergodox_right_led_1_set (LED_BRIGHTNESS_HI);
       ergodox_right_led_1_on ();
   } else {
@@ -182,7 +182,7 @@ void matrix_scan_user(void) {
   }
 
   if(keyboard_report->mods & MOD_BIT(KC_LCTRL))
-  { 
+  {
       ergodox_right_led_3_set (LED_BRIGHTNESS_HI);
       ergodox_right_led_3_on ();
   } else {
@@ -195,7 +195,7 @@ void matrix_scan_user(void) {
 };
 
 void led_set_user(uint8_t usb_led){
- if (usb_led & (1 << USB_LED_CAPS_LOCK)) 
+ if (usb_led & (1 << USB_LED_CAPS_LOCK))
    {
       capsOn = true;
    }else {
diff --git a/keyboards/ergodox_ez/keymaps/steno/keymap.c b/keyboards/ergodox_ez/keymaps/steno/keymap.c
index 080d3f6cef..96218bbe99 100644
--- a/keyboards/ergodox_ez/keymaps/steno/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/steno/keymap.c
@@ -228,7 +228,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c
index 5c1fc4af28..3aee63ddf1 100644
--- a/keyboards/ergodox_ez/keymaps/testing/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c
@@ -62,7 +62,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/keymaps/vim/keymap.c b/keyboards/ergodox_ez/keymaps/vim/keymap.c
index 948f2b4794..c1c037ef23 100644
--- a/keyboards/ergodox_ez/keymaps/vim/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/vim/keymap.c
@@ -330,7 +330,7 @@ void matrix_init_user(void) {
 };
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ergodox_ez/util/compile_keymap.py b/keyboards/ergodox_ez/util/compile_keymap.py
index b447ecaf5c..310512c920 100755
--- a/keyboards/ergodox_ez/util/compile_keymap.py
+++ b/keyboards/ergodox_ez/util/compile_keymap.py
@@ -27,29 +27,34 @@ PY2 = sys.version_info.major == 2
 if PY2:
     chr = unichr
 
-
 KEYBOARD_LAYOUTS = {
     # These map positions in the parsed layout to
     # positions in the KEYMAP MATRIX
     'ergodox_ez': [
-        [ 0,  1,  2,  3,  4,  5,  6],  [38, 39, 40, 41, 42, 43, 44],
-        [ 7,  8,  9, 10, 11, 12, 13],  [45, 46, 47, 48, 49, 50, 51],
-        [14, 15, 16, 17, 18, 19    ],  [    52, 53, 54, 55, 56, 57],
-        [20, 21, 22, 23, 24, 25, 26],  [58, 59, 60, 61, 62, 63, 64],
-        [27, 28, 29, 30, 31        ],  [        65, 66, 67, 68, 69],
-        [                    32, 33],  [70, 71                    ],
-        [                        34],  [72                        ],
-        [                35, 36, 37],  [73, 74, 75                ],
+        [0, 1, 2, 3, 4, 5, 6],
+        [38, 39, 40, 41, 42, 43, 44],
+        [7, 8, 9, 10, 11, 12, 13],
+        [45, 46, 47, 48, 49, 50, 51],
+        [14, 15, 16, 17, 18, 19],
+        [52, 53, 54, 55, 56, 57],
+        [20, 21, 22, 23, 24, 25, 26],
+        [58, 59, 60, 61, 62, 63, 64],
+        [27, 28, 29, 30, 31],
+        [65, 66, 67, 68, 69],
+        [32, 33],
+        [70, 71],
+        [34],
+        [72],
+        [35, 36, 37],
+        [73, 74, 75],
     ]
 }
 
-ROW_INDENTS = {
-    'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]
-}
+ROW_INDENTS = {'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]}
 
 BLANK_LAYOUTS = [
-# Compact Layout
-"""
+    # Compact Layout
+    """
 .------------------------------------.------------------------------------.
 |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
 !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
@@ -70,8 +75,8 @@ BLANK_LAYOUTS = [
                   '-----------------' '-----------------'
 """,
 
-# Wide Layout
-"""
+    # Wide Layout
+    """
 .---------------------------------------------. .---------------------------------------------.
 |       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
 !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
@@ -93,26 +98,22 @@ BLANK_LAYOUTS = [
 """,
 ]
 
-
 DEFAULT_CONFIG = {
-    "keymaps_includes": [
-        "keymap_common.h",
-    ],
+    "keymaps_includes": ["keymap_common.h",],
     'filler': "-+.'!:x",
     'separator': "|",
     'default_key_prefix': ["KC_"],
 }
 
-
 SECTIONS = [
     'layout_config',
     'layers',
 ]
 
-
 #       Markdown Parsing
 
-ONELINE_COMMENT_RE = re.compile(r"""
+ONELINE_COMMENT_RE = re.compile(
+    r"""
     ^                       # comment must be at the start of the line
     \s*                     # arbitrary whitespace
     //                      # start of the comment
@@ -121,22 +122,26 @@ ONELINE_COMMENT_RE = re.compile(r"""
 """, re.MULTILINE | re.VERBOSE
 )
 
-INLINE_COMMENT_RE = re.compile(r"""
+INLINE_COMMENT_RE = re.compile(
+    r"""
     ([\,\"\[\]\{\}\d])      # anythig that might end a expression
     \s+                     # comment must be preceded by whitespace
     //                      # start of the comment
     \s                      # and succeded by whitespace
     (?:[^\"\]\}\{\[]*)      # the comment (except things which might be json)
     $                       # until the end of line
-""", re.MULTILINE | re.VERBOSE)
+""", re.MULTILINE | re.VERBOSE
+)
 
-TRAILING_COMMA_RE = re.compile(r"""
+TRAILING_COMMA_RE = re.compile(
+    r"""
     ,                       # the comma
     (?:\s*)                 # arbitrary whitespace
     $                       # only works if the trailing comma is followed by newline
     (\s*)                   # arbitrary whitespace
     ([\]\}])                # end of an array or object
-""", re.MULTILINE | re.VERBOSE)
+""", re.MULTILINE | re.VERBOSE
+)
 
 
 def loads(raw_data):
@@ -178,9 +183,7 @@ def parse_config(path):
     def end_section():
         if section['start_line'] >= 0:
             if section['name'] == 'layout_config':
-                config.update(loads("\n".join(
-                    section['code_lines']
-                )))
+                config.update(loads("\n".join(section['code_lines'])))
             elif section['sub_name'].startswith('layer'):
                 layer_name = section['sub_name']
                 config['layer_lines'][layer_name] = section['code_lines']
@@ -215,6 +218,7 @@ def parse_config(path):
     assert 'layout' in config
     return config
 
+
 #       header file parsing
 
 IF0_RE = re.compile(r"""
@@ -224,7 +228,6 @@ IF0_RE = re.compile(r"""
     #endif
 """, re.MULTILINE | re.DOTALL | re.VERBOSE)
 
-
 COMMENT_RE = re.compile(r"""
     /\*
     .*?
@@ -244,6 +247,7 @@ def regex_partial(re_str_fmt, flags):
     def partial(*args, **kwargs):
         re_str = re_str_fmt.format(*args, **kwargs)
         return re.compile(re_str, flags)
+
     return partial
 
 
@@ -256,7 +260,6 @@ KEYDEF_REP = regex_partial(r"""
     )                   # capture group end
 """, re.MULTILINE | re.DOTALL | re.VERBOSE)
 
-
 ENUM_RE = re.compile(r"""
     (
         enum
@@ -268,7 +271,6 @@ ENUM_RE = re.compile(r"""
     )                   # capture group end
 """, re.MULTILINE | re.DOTALL | re.VERBOSE)
 
-
 ENUM_KEY_REP = regex_partial(r"""
     (
         {}              # the prefixes
@@ -309,14 +311,13 @@ def parse_valid_keys(config, out_path):
         include_path = os.path.join(dirpath, include)
         if os.path.exists(include_path):
             header_data = read_header_file(include_path)
-            valid_keycodes.update(
-                parse_keydefs(config, header_data)
-            )
+            valid_keycodes.update(parse_keydefs(config, header_data))
     return valid_keycodes
 
 
 #       Keymap Parsing
 
+
 def iter_raw_codes(layer_lines, filler, separator):
     filler_re = re.compile("[" + filler + " ]")
     for line in layer_lines:
@@ -346,28 +347,21 @@ LAYER_CHANGE_RE = re.compile(r"""
     (DF|TG|MO)\(\d+\)
 """, re.VERBOSE)
 
-
 MACRO_RE = re.compile(r"""
     M\(\w+\)
 """, re.VERBOSE)
 
-
 UNICODE_RE = re.compile(r"""
     U[0-9A-F]{4}
 """, re.VERBOSE)
 
-
 NON_CODE = re.compile(r"""
     ^[^A-Z0-9_]$
 """, re.VERBOSE)
 
 
 def parse_uni_code(raw_code):
-    macro_id = "UC_" + (
-        unicodedata.name(raw_code)
-        .replace(" ", "_")
-        .replace("-", "_")
-    )
+    macro_id = "UC_" + (unicodedata.name(raw_code).replace(" ", "_").replace("-", "_"))
     code = "M({})".format(macro_id)
     uc_hex = "{:04X}".format(ord(raw_code))
     return code, macro_id, uc_hex
@@ -407,19 +401,13 @@ def parse_code(raw_code, key_prefixes, valid_keycodes):
 
 def parse_keymap(config, key_indexes, layer_lines, valid_keycodes):
     keymap = {}
-    raw_codes = list(iter_raw_codes(
-        layer_lines, config['filler'], config['separator']
-    ))
+    raw_codes = list(iter_raw_codes(layer_lines, config['filler'], config['separator']))
     indexed_codes = iter_indexed_codes(raw_codes, key_indexes)
     key_prefixes = config['key_prefixes']
     for raw_code, key_index, row_index in indexed_codes:
-        code, macro_id, uc_hex = parse_code(
-            raw_code, key_prefixes, valid_keycodes
-        )
+        code, macro_id, uc_hex = parse_code(raw_code, key_prefixes, valid_keycodes)
         # TODO: line numbers for invalid codes
-        err_msg = "Could not parse key '{}' on row {}".format(
-            raw_code, row_index
-        )
+        err_msg = "Could not parse key '{}' on row {}".format(raw_code, row_index)
         assert code is not None, err_msg
         # print(repr(raw_code), repr(code), macro_id, uc_hex)
         if macro_id:
@@ -432,17 +420,14 @@ def parse_keymap(config, key_indexes, layer_lines, valid_keycodes):
 
 def parse_keymaps(config, valid_keycodes):
     keymaps = collections.OrderedDict()
-    key_indexes = config.get(
-        'key_indexes', KEYBOARD_LAYOUTS[config['layout']]
-    )
+    key_indexes = config.get('key_indexes', KEYBOARD_LAYOUTS[config['layout']])
     # TODO: maybe validate key_indexes
 
     for layer_name, layer_lines, in config['layer_lines'].items():
-        keymaps[layer_name] = parse_keymap(
-            config, key_indexes, layer_lines, valid_keycodes
-        )
+        keymaps[layer_name] = parse_keymap(config, key_indexes, layer_lines, valid_keycodes)
     return keymaps
 
+
 #       keymap.c output
 
 USERCODE = """
@@ -453,7 +438,7 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
@@ -572,7 +557,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {{
 }};
 """
 
-
 UNICODE_MACRO_TEMPLATE = """
 case {macro_id}:
     unicode_action_function(0x{hi:02x}, 0x{lo:02x});
@@ -584,9 +568,7 @@ def unicode_macro_cases(config):
     for macro_id, uc_hex in config['unicode_macros'].items():
         hi = int(uc_hex, 16) >> 8
         lo = int(uc_hex, 16) & 0xFF
-        yield UNICODE_MACRO_TEMPLATE.format(
-            macro_id=macro_id, hi=hi, lo=lo
-        )
+        yield UNICODE_MACRO_TEMPLATE.format(macro_id=macro_id, hi=hi, lo=lo)
 
 
 def iter_keymap_lines(keymap, row_indents=None):
diff --git a/keyboards/ergoslab/keymaps/default/keymap.c b/keyboards/ergoslab/keymaps/default/keymap.c
index 59415618a8..093d586eba 100644
--- a/keyboards/ergoslab/keymaps/default/keymap.c
+++ b/keyboards/ergoslab/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGBLIGHT_ENABLE
 layer_state_t layer_state_set_user(layer_state_t state) {
-  uint8_t layer = biton32(state);
+  uint8_t layer = get_highest_layer(state);
   switch (layer) {
       case BASE:
           rgblight_sethsv(HSV_ERGOSLAB_ORANGE);
diff --git a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
index 156832de4e..898a294f7e 100644
--- a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
@@ -102,7 +102,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
         edit = false;
     }
 
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case _ADJUST:
             temp_config.mode = rgblight_get_mode();
             rgblight_mode_noeeprom(1);
diff --git a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
index 6987e84021..2793cffe93 100644
--- a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
@@ -121,7 +121,7 @@ layer_state_t layer_state_set_user(layer_state_t state)
     edit = false;
   }
 
-  switch (biton32(state))
+  switch (get_highest_layer(state))
   {
   case _ADJUST:
     mode = rgblight_get_mode();
diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
index b2e79114f2..35b1e0b653 100644
--- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
@@ -146,8 +146,8 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    //uint8_t layer = biton32(layer_state);
-    biton32(layer_state);
+    //uint8_t layer = get_highest_layer(layer_state);
+    get_highest_layer(layer_state);
 };
 
 
@@ -171,4 +171,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 };
-
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
index 964f40f1c0..ffb87ef009 100644
--- a/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_scan_user(void) {
-    uint32_t layer = layer_state;
+    layer_state_t layer = layer_state;
 
     if (layer & (1<<1)) {
         gh60_fn_led_on();
@@ -120,4 +120,4 @@ void matrix_scan_user(void) {
     } else {
         gh60_esc_led_off();
     }
-};
\ No newline at end of file
+};
diff --git a/keyboards/gh60/revc/keymaps/default/keymap.c b/keyboards/gh60/revc/keymaps/default/keymap.c
index a8fd4f3c22..4ebc71ff4b 100644
--- a/keyboards/gh60/revc/keymaps/default/keymap.c
+++ b/keyboards/gh60/revc/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void matrix_scan_user(void) {
 
 //Layer LED indicators
-    uint32_t layer = layer_state;
+    layer_state_t layer = layer_state;
 
     if (layer & (1<<1)) {
         gh60_wasd_leds_on();
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
index b84e7564fc..77bf54de63 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
@@ -97,7 +97,7 @@ void matrix_scan_user(void) {
 
 // Layer LED indicators
 // ESC led on when in function layer, WASD cluster leds enabled when on arrow cluster
-    uint32_t layer = layer_state;
+    layer_state_t layer = layer_state;
     if (layer & (1<<1)) {
         gh60_wasd_leds_on();
     } else {
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
index 5012fee56b..2b1a417fb5 100644
--- a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
+++ b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
@@ -177,7 +177,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   if (old_layer != layer) {
     switch (layer) {
diff --git a/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
index 51ab0e92cd..dd7e32f7dc 100644
--- a/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
@@ -131,7 +131,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
       case _QWERTY:
diff --git a/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
index 0affeef389..1ae70e6245 100644
--- a/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
@@ -158,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   switch (layer) {
     case _QWERTY:
diff --git a/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
index 6a676493dd..bc783f540c 100644
--- a/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
@@ -151,7 +151,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
       case _QWERTY:
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
index c4294c812e..bda83bb5da 100644
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
@@ -241,7 +241,7 @@ void matrix_scan_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case _BL:
             custom_backlight_level(0);
             break;
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index 2d917b412e..11463a0162 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -209,7 +209,7 @@ void press_underscore(void) {
 uint8_t old_layer=_BASE;
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     frenchdev_led_1_off();
     frenchdev_led_2_off();
diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c
index 333f8a769f..0ffc3e9d97 100644
--- a/keyboards/handwired/kbod/keymaps/default/keymap.c
+++ b/keyboards/handwired/kbod/keymaps/default/keymap.c
@@ -89,7 +89,7 @@ void matrix_init_user(void) {
 }
 
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   if (layer) {
     PORTC |= _BV(PC7);
   } else {
diff --git a/keyboards/handwired/prime_exl/keymaps/via/keymap.c b/keyboards/handwired/prime_exl/keymaps/via/keymap.c
index 0e6802996d..b5b616d55b 100644
--- a/keyboards/handwired/prime_exl/keymaps/via/keymap.c
+++ b/keyboards/handwired/prime_exl/keymaps/via/keymap.c
@@ -87,7 +87,7 @@ void led_set_user(uint8_t usb_led) {
 //function for layer indicator LED
 layer_state_t layer_state_set_user(layer_state_t state)
 {
-    if (biton32(state) == 1) {
+    if (get_highest_layer(state) == 1) {
     writePinHigh(C6);
 	} else {
 		writePinLow(C6);
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 1903b2f9ba..77f83361e6 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -529,7 +529,7 @@ void led_reset(void) {
 }
 
 void led_set_default_layer_indicator(void) {
-  uint8_t default_layer = biton32(default_layer_state);
+  uint8_t default_layer = get_highest_layer(default_layer_state);
   if (default_layer == _QWERTY) {
     rgbsps_set(LED_IND_QWERTY, THEME_COLOR_QWERTY);
     rgbsps_set(LED_IND_ALT, COLOR_BLANK);
@@ -553,7 +553,7 @@ void led_set_layer_indicator(void) {
   rgbsps_set(LED_IND_GREEK, COLOR_BLANK);
   rgbsps_set(LED_IND_EMOJI, COLOR_BLANK);
 
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   if (oldlayer == layer) {
     return;
   }
@@ -1014,7 +1014,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
   rshift = keyboard_report->mods & MOD_BIT(KC_RSFT);
-  layer = biton32(layer_state);
+  layer = get_highest_layer(layer_state);
 
 #ifdef DOUBLESPACE_LAYER_ENABLE
   // double-space: send space immediately if any other key depressed before space is released
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 94b505aa2c..faa096ce08 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -532,7 +532,7 @@ void led_reset(void) {
 }
 
 void led_set_default_layer_indicator(void) {
-  uint8_t default_layer = biton32(default_layer_state);
+  uint8_t default_layer = get_highest_layer(default_layer_state);
   if (default_layer == _QWERTY) {
     rgbsps_set(LED_IND_QWERTY, THEME_COLOR_QWERTY);
     rgbsps_set(LED_IND_ALT, COLOR_BLANK);
@@ -556,7 +556,7 @@ void led_set_layer_indicator(void) {
   rgbsps_set(LED_IND_GREEK, COLOR_BLANK);
   rgbsps_set(LED_IND_EMOJI, COLOR_BLANK);
 
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   if (oldlayer == layer) {
     return;
   }
@@ -989,7 +989,7 @@ void process_doublespace(bool pressed, bool *isactive, bool *otheractive, bool *
 }
 #endif
 
-uint32_t layer_state_set_kb(uint32_t state)
+layer_state_t layer_state_set_kb(layer_state_t state)
 {
   // turn on punc layer if both fun & num are on
   if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) {
@@ -1017,7 +1017,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
   rshift = keyboard_report->mods & MOD_BIT(KC_RSFT);
-  layer = biton32(layer_state);
+  layer = get_highest_layer(layer_state);
 
 #ifdef DOUBLESPACE_LAYER_ENABLE
   // double-space: send space immediately if any other key depressed before space is released
diff --git a/keyboards/handwired/traveller/keymaps/default/keymap.c b/keyboards/handwired/traveller/keymaps/default/keymap.c
index 288acbe108..2cd57db35f 100644
--- a/keyboards/handwired/traveller/keymaps/default/keymap.c
+++ b/keyboards/handwired/traveller/keymaps/default/keymap.c
@@ -219,7 +219,7 @@ void LayerLEDSet(uint8_t layr) {
 uint8_t old_layer = _QW;
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     if (old_layer != layer) {
         LayerLEDSet(layer);
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
index b618675295..50bbf232b5 100644
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
+++ b/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
@@ -9,7 +9,7 @@ void keyboard_pre_init_user(void)
 layer_state_t layer_state_set_user(layer_state_t state)
 {
 	// Switch layer LED accordingly
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case 0:
         writePinHigh(B0);
         break;
diff --git a/keyboards/helix/pico/keymaps/mtei/keymap.c b/keyboards/helix/pico/keymaps/mtei/keymap.c
index b703ca376d..f641829292 100644
--- a/keyboards/helix/pico/keymaps/mtei/keymap.c
+++ b/keyboards/helix/pico/keymaps/mtei/keymap.c
@@ -242,7 +242,7 @@ float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
 
 static int current_default_layer;
 
-uint32_t default_layer_state_set_kb(uint32_t state) {
+layer_state_t default_layer_state_set_kb(layer_state_t state) {
     // 1<<_QWERTY  - 1 == 1 - 1 == _QWERTY (=0)
     // 1<<_COLEMAK - 1 == 2 - 1 == _COLEMAK (=1)
     current_default_layer = state - 1;
diff --git a/keyboards/helix/rev2/keymaps/default/oled_display.c b/keyboards/helix/rev2/keymaps/default/oled_display.c
index ad5558869f..384356bd14 100644
--- a/keyboards/helix/rev2/keymaps/default/oled_display.c
+++ b/keyboards/helix/rev2/keymaps/default/oled_display.c
@@ -86,7 +86,7 @@ static void render_layer_status(void) {
         break;
     default:
         oled_write_P(PSTR("Undef-"), false);
-        snprintf(buf,sizeof(buf), "%ld", layer_state);
+        snprintf(buf,sizeof(buf), "%u", layer_state);
         oled_write(buf, false);
     }
     oled_write_P(PSTR("\n"), false);
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
index 5de00cb14c..80d0392ffb 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
@@ -5,9 +5,9 @@
 // keymaps definitions are moved to keymap_Xrows.c.
 
 #ifdef RGBLIGHT_ENABLE
-uint32_t layer_state_set_keymap(uint32_t state) {
+layer_state_t layer_state_set_keymap(layer_state_t state) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case L_EDVORAKJP_LOWER:
             rgblight_sethsv_noeeprom_red();
             break;
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
index 207aebc423..14e3e5533b 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
@@ -19,7 +19,7 @@ void render_layer_state(void) {
     char layer_name[17];
     oled_write_P(PSTR("Layer: "), false);
 
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
         case L_EDVORAKJP_BASE:
             oled_write_ln_P(PSTR("Default"), false);
             break;
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index d992425de7..4d9dc16a9e 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -379,8 +379,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 int current_default_layer;
 
-uint32_t default_layer_state_set_user(uint32_t state) {
-    current_default_layer = biton32(state);
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    current_default_layer = get_highest_layer(state);
     return state;
 }
 
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
index d992425de7..4d9dc16a9e 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
@@ -379,8 +379,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 int current_default_layer;
 
-uint32_t default_layer_state_set_user(uint32_t state) {
-    current_default_layer = biton32(state);
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    current_default_layer = get_highest_layer(state);
     return state;
 }
 
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
index d59438f6b3..d505d5171d 100644
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
@@ -245,7 +245,7 @@ void matrix_scan_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case _BL:
             custom_backlight_level(0);
             rgblight_sethsv_noeeprom(180,100,255);
diff --git a/keyboards/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c
index fe07e6f91d..eb4692a4c2 100644
--- a/keyboards/hotdox/keymaps/default/keymap.c
+++ b/keyboards/hotdox/keymaps/default/keymap.c
@@ -163,7 +163,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_right_led_1_off();
     ergodox_right_led_2_off();
diff --git a/keyboards/hotdox/keymaps/eozaki/keymap.c b/keyboards/hotdox/keymaps/eozaki/keymap.c
index 3516f20303..d4b8f491fd 100644
--- a/keyboards/hotdox/keymaps/eozaki/keymap.c
+++ b/keyboards/hotdox/keymaps/eozaki/keymap.c
@@ -170,7 +170,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/hotdox/keymaps/kloki/keymap.c b/keyboards/hotdox/keymaps/kloki/keymap.c
index f858effd54..2550b68978 100644
--- a/keyboards/hotdox/keymaps/kloki/keymap.c
+++ b/keyboards/hotdox/keymaps/kloki/keymap.c
@@ -189,7 +189,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
index cd65001803..6f9967b46e 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
@@ -167,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
index c321d546fb..50e3238a7d 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
@@ -335,7 +335,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_on();
     ergodox_led_all_on();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index 3870dd8ffd..c8498fe9e9 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -492,7 +492,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
index 545429fca0..e941cee154 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
@@ -223,7 +223,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
index dd721e9a78..184eb638c9 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
@@ -659,7 +659,7 @@ void matrix_setup(void) {
 }
 
 void matrix_scan_user(void) {
-  // uint8_t layer = biton32(layer_state);
+  // uint8_t layer = get_highest_layer(layer_state);
 
   //   ergodox_board_led_off();
   //   ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index d08b96cc6e..70f49bb5c9 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -221,7 +221,7 @@ void matrix_init_user(void){
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
index e31c1c5d6b..b202823c77 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
@@ -179,7 +179,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
index 31d218ebfb..c322222baf 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
@@ -309,7 +309,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
index 02f409ad9e..bbc24ea27f 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
@@ -137,7 +137,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
index 3c2e0d4da8..a19be6664c 100644
--- a/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
@@ -239,7 +239,7 @@ void matrix_scan_user(void) {
     //Turn on layer indicator or page depending on mode
     switch(led_mode_global) {
       case MODE_FLASH: //flash preset page leds then single indicator
-        page = biton32(layer_state) > max_pages ? 7 : biton32(layer_state);
+        page = get_highest_layer(layer_state) > max_pages ? 7 : get_highest_layer(layer_state);
         msg=(page << 8) | DISPLAY_PAGE;
         chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
         chThdSleepMilliseconds(500);
@@ -254,7 +254,7 @@ void matrix_scan_user(void) {
         break;
 
       case MODE_PAGE: //display pre-defined led page
-        page = biton32(layer_state) > max_pages ? 7 : biton32(layer_state);
+        page = get_highest_layer(layer_state) > max_pages ? 7 : get_highest_layer(layer_state);
         msg=(page << 8) | DISPLAY_PAGE;
         chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
         break;
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
index 7572b9e073..453cd2360d 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
@@ -224,7 +224,7 @@ void matrix_scan_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
        case _BL:
            custom_backlight_level(0);
            rgblight_sethsv_noeeprom(180,100,255);
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
index e86204a3e3..a592418c4d 100644
--- a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
@@ -253,7 +253,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         }
     }
     if (index == 1) { /* Second encoder, Left side */
-        switch(biton32(layer_state)) {
+        switch(get_highest_layer(layer_state)) {
             case _LOWER:
                 if (clockwise) {
                     rgblight_decrease_hue();
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
index 9a2663f6d7..56f51d56ce 100644
--- a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
@@ -255,7 +255,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         }
     }
     if (index == 1) { /* Second encoder, Left side */
-        switch(biton32(layer_state)) {
+        switch(get_highest_layer(layer_state)) {
             case _LOWER:
                 if (clockwise) {
                     rgblight_decrease_hue();
diff --git a/keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c
index 0f2a8dada1..92dfa7da6e 100644
--- a/keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef OLED_ENABLE
 bool oled_task_user(void) {
   oled_write_P(PSTR("Layer: "), false);
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case BASE:
       oled_write_P(PSTR("Default\n"), false);
       break;
diff --git a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
index 6c5184c1b3..601bf5f02f 100644
--- a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
+++ b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
@@ -175,7 +175,7 @@ void matrix_scan_user(void) {
 #ifdef OLED_ENABLE
 bool oled_task_user(void) {
   oled_write_P(PSTR("Layer: "), false);
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case BASE:
       oled_write_P(PSTR("Default\n"), false);
       break;
diff --git a/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
index b682f0f15d..d937b68813 100644
--- a/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef OLED_ENABLE
 bool oled_task_user(void) {
   oled_write_P(PSTR("Layer: "), false);
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case BASE:
       oled_write_P(PSTR("Default\n"), false);
       break;
diff --git a/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
index b682f0f15d..d937b68813 100644
--- a/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef OLED_ENABLE
 bool oled_task_user(void) {
   oled_write_P(PSTR("Layer: "), false);
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case BASE:
       oled_write_P(PSTR("Default\n"), false);
       break;
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
index 6bbbdd87c1..ce341509a6 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
@@ -38,7 +38,7 @@ void eeconfig_init_user(void) {
 #define DE_UDIA_CAP UC(0x00DC)
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case NM_MODE:
         rgblight_setrgb (0x00,  0x66, 0x00);
         break;
@@ -187,4 +187,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,   _______,         _______,         _______,         _______,   _______,      _______
       ),
 };
-
diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
index 998f1a25d2..5a6d760355 100644
--- a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case WINDOWS_LAYER:
         rgblight_setrgb_blue();
         break;
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
index 935dd5c506..8c03ae2df2 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
@@ -8,7 +8,7 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details. 
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -103,8 +103,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EQL, S(KC_EQL),   RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_E), KC_RBRC, RALT(KC_7), RALT(KC_8), RALT(KC_9),    RALT(KC_0), RALT(KC_MINS),
   KC_LSFT, KC_NUBS, RALT(KC_NUBS), S(KC_NUBS), DGRMCRO, XXXXXXX, XXXXXXX,   RALT(KC_M),   KC_RBRC,  S(KC_RBRC), RALT(KC_RBRC),       _______,
   _______, _______,       KC_RALT,    _______,TO(_ADJUST), _______, _______,      _______,   _______,     _______,       _______, TO(_QWERTY)
-), 
- 
+),
+
 
 /* Lower
  * ,-----------------------------------------------------------------------------------.
@@ -257,10 +257,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
                 else {
                     workmode = false;
-                    return false;       
-                }           
+                    return false;
+                }
         }
-        
+
     }
     return true;
 }
@@ -293,7 +293,7 @@ void rgbflag(uint8_t r, uint8_t g, uint8_t b) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
 //  if(rgblight_get_mode() == 1) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _QWERTY:
         if(!workmode){
             rgblight_mode(9);
@@ -312,7 +312,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             tap_code(KC_NLCK);
         }
         rgbflag(0xFF,  0x00, 0x00);
-        
+
         break;
     case _ADJUST:
         rgblight_mode(1);
@@ -350,7 +350,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
         rgblight_mode(1);
         if(bnumlock) {
             tap_code(KC_NLCK);
-        }        
+        }
         rgbflag(0xFF,  0xFF, 0xFF);
         break;
     }
@@ -363,8 +363,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     //Layer LED indicators
 
     uint32_t layer = layer_state;
-    
-    
+
+
     if (layer & (1<<2)) {
         if(!bnumlock) {
             numlock_changed = true;
@@ -373,10 +373,10 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             bnumlock = true;
         }
     }
-} 
+}
  */
- 
- 
+
+
 void led_set_user(uint8_t usb_led) {
 
     if (usb_led & (1 << USB_LED_NUM_LOCK)) {
@@ -410,4 +410,4 @@ void led_set_user(uint8_t usb_led) {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
index bfda812738..d3c6102b16 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
@@ -187,7 +187,7 @@ void rgbflag(uint8_t r, uint8_t g, uint8_t b, uint8_t rr, uint8_t gg, uint8_t bb
 
 void set_state_leds(void) {
   if (rgblight_get_mode() == 1) {
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
     case _RAISE:
       rgbflag(C_BLU, C_GRN);
       break;
diff --git a/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c b/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
index a449c3ec3d..3b92657d4d 100644
--- a/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
@@ -64,7 +64,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     flight_mode = false;
     rcs_mode = false;
 
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _PANIC:
         panic_mode = true; // For use in encoder evaluation
         rgblight_sethsv_noeeprom(HSV_RED);
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
index 29531b9973..ad56226ac6 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
@@ -42,7 +42,7 @@ void matrix_post_init_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case _LIST:
       rgblight_sethsv_noeeprom(0,255,255);
       rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
@@ -87,6 +87,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return true;
   }
 }
-
-
-
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
index 0c0fc5a746..013d6c00a5 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
@@ -59,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void matrix_init_keymap() {}
 
 #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
-uint32_t layer_state_set_keymap(uint32_t state) {
+layer_state_t layer_state_set_keymap(layer_state_t state) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case L_EDVORAKJP_LOWER:
             rgblight_sethsv_noeeprom_red();
             break;
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
index e0c09638b2..bc04f9fbfd 100644
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_GE
 #ifdef ENCODER_ENABLE
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
-        switch (biton32(layer_state)) {
+        switch (get_highest_layer(layer_state)) {
             case _LOWER:
                 clockwise ? tap_code(KC_MS_WH_UP) : tap_code(KC_MS_WH_DOWN);
                 break;
@@ -23,7 +23,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 break;
         }
     } else if (index == 1) {
-        switch (biton32(layer_state)) {
+        switch (get_highest_layer(layer_state)) {
             case _LOWER:
                 clockwise ? tap_code(KC_UP) : tap_code(KC_DOWN);
                 break;
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
index 19a939a55b..d3e0d680a1 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
+++ b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
@@ -134,7 +134,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     }
     // tmux screen
     else if (index == 1) {
-        switch(biton32(layer_state)){
+        switch(get_highest_layer(layer_state)){
              case 0:
                 if (clockwise) {
                     send_string(SS_LCTL("B")"p");
@@ -182,4 +182,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     rgblight_set_layer_state(2, layer_state_cmp(state, 4));
     return state;
 }
-
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
index d9edfebaa0..6de2279be4 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
@@ -91,7 +91,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   #ifdef RGBLIGHT_ENABLE
     layer_state_set_rgb(state);
   #endif
-  uint8_t layer = biton32(state);
+  uint8_t layer = get_highest_layer(state);
   combo_enable(); // by default, enable combos.
   switch (layer) {
     case 0:
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c
index de3a5342c0..3695731353 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c
@@ -45,7 +45,7 @@ void matrix_scan_rgb(void) {
 }
 
 void set_rgb_indicators(uint8_t this_mod, uint8_t this_osm) {
-  if (biton32(layer_state) == _QWERTY) {
+  if (get_highest_layer(layer_state) == _QWERTY) {
     if ((this_mod | this_osm) & MOD_MASK_SHIFT) {
       rgblight_setrgb_gold_at(SHFT_LED1);
     } else {
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.h b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.h
index 254d3cbac0..8b14d8571d 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.h
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.h
@@ -6,7 +6,7 @@
 void keyboard_post_init_rgb(void);
 
 // If rgb enabled, set underglow for layer
-uint32_t layer_state_set_rgb(uint32_t state);
+layer_state_t layer_state_set_rgb(layer_state_t state);
 
 // Enhance matrix scan code. Note: keep this light, since it runs every 100ms
 void matrix_scan_rgb(void);
diff --git a/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
index 16aa965d7d..014e6c9c23 100644
--- a/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
@@ -182,7 +182,7 @@ void rgbflag(uint8_t r, uint8_t g, uint8_t b, uint8_t rr, uint8_t gg, uint8_t bb
 
 void set_state_leds(void) {
   if (rgblight_get_mode() == 1) {
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
     case _RAISE:
       rgbflag(C_BLU, C_GRN);
       break;
diff --git a/keyboards/keebio/nyquist/keymaps/pitty/keymap.c b/keyboards/keebio/nyquist/keymaps/pitty/keymap.c
index 31912bb63e..2016cd1c46 100644
--- a/keyboards/keebio/nyquist/keymaps/pitty/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pitty/keymap.c
@@ -143,7 +143,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 #ifdef RGBLIGHT_ENABLE
   uint8_t default_layer = eeconfig_read_default_layer();
   if (rgb_layer_change) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _LOWER:
       rgblight_set_purple;
       rgblight_mode(5);
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c b/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
index a367e877fe..7d6f9da30e 100644
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
@@ -64,7 +64,7 @@ void keyboard_post_init_user(void) {
 }
 
 void update_led(void) {
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
       case _BASE:
       rgblight_sethsv_noeeprom(HSV_BLUE);
       break;
diff --git a/keyboards/keyhive/honeycomb/keymaps/default/keymap.c b/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
index d0a5961873..429624822e 100755
--- a/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
+++ b/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 report_mouse_t currentReport = {};
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	//uint8_t layer = biton32(layer_state);  // get the current layer
+	//uint8_t layer = get_highest_layer(layer_state);  // get the current layer
 
 	// Basic example functions
 	switch (keycode) {
diff --git a/keyboards/kinesis/keymaps/milestogo/keymap.c b/keyboards/kinesis/keymaps/milestogo/keymap.c
index 8c01bcb83d..72687195ef 100644
--- a/keyboards/kinesis/keymaps/milestogo/keymap.c
+++ b/keyboards/kinesis/keymaps/milestogo/keymap.c
@@ -330,7 +330,7 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
 
 #ifdef ALVICSTEP_CONFIG_H
- int8_t layer = biton32(layer_state);
+ int8_t layer = get_highest_layer(layer_state);
 
         switch (layer) {
         case 1:
diff --git a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
index af56305e5c..84324c6e0d 100644
--- a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
@@ -271,7 +271,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Makes sure to update the good tri-layer if a layer changes
 layer_state_t layer_state_set_user(layer_state_t state) {
-	switch (biton32(default_layer_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;
@@ -289,8 +289,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 }
 
 // Makes the tri-layer
-uint32_t default_layer_state_set_kb(uint32_t state) {
-	switch (biton32(state)) {
+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);
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
index e257649369..c096aaea10 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
@@ -42,7 +42,7 @@ void keyboard_post_init_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case _RAISE:
       rgblight_sethsv_noeeprom(170,255,255);
       rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
index baedbb4dd2..af4c3c84bb 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
@@ -42,7 +42,7 @@ void keyboard_post_init_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case _FUNC:
       rgblight_sethsv_noeeprom(170,255,255);
       rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
diff --git a/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c b/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
index 09854ee89c..3910756f81 100644
--- a/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
@@ -179,7 +179,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ktec/ergodone/keymaps/erovia/keymap.c b/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
index 279c8a57c1..502c0dafe6 100644
--- a/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
@@ -204,7 +204,7 @@ void matrix_init_user(void) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     ergodox_led_all_off();
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
       case FN:
           // Red led on Pro Micro for Fn layer
           ergodox_board_led_on();
diff --git a/keyboards/ktec/ergodone/keymaps/kloki/keymap.c b/keyboards/ktec/ergodone/keymaps/kloki/keymap.c
index 87e96d20fd..1347f8f501 100644
--- a/keyboards/ktec/ergodone/keymaps/kloki/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/kloki/keymap.c
@@ -198,7 +198,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
index ee6c56bf95..21db785345 100644
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
@@ -534,7 +534,7 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
index a69fe69153..f73b0371a1 100644
--- a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
+++ b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // layer_state_t layer_state_set_user(layer_state_t state) {
-//   switch(biton32(state)) {
+//   switch(get_highest_layer(state)) {
 //   case _FNMS:
 //     led_off();
 //     rgb_on();
diff --git a/keyboards/lets_split/keymaps/bbaserdem/keymap.c b/keyboards/lets_split/keymaps/bbaserdem/keymap.c
index f9eab059ef..296b3ccd23 100755
--- a/keyboards/lets_split/keymaps/bbaserdem/keymap.c
+++ b/keyboards/lets_split/keymaps/bbaserdem/keymap.c
@@ -13,7 +13,7 @@
 void matrix_init_keymap (void) {
 }
 
-uint32_t layer_state_set_keymap(uint32_t state) {
+layer_state_t layer_state_set_keymap(layer_state_t state) {
     return state;
 }
 
diff --git a/keyboards/lets_split/keymaps/cpeters1982/keymap.c b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
index c4c26d56bc..27cd9db8b4 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/keymap.c
+++ b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
@@ -183,7 +183,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 #ifdef RGBLIGHT_ENABLE
   uint8_t default_layer = eeconfig_read_default_layer();
   if (rgb_layer_change) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _RAISE:
       rgblight_set_orange;
       rgblight_mode(5);
diff --git a/keyboards/lets_split/keymaps/geripgeri/keymap.c b/keyboards/lets_split/keymaps/geripgeri/keymap.c
index 62e3570468..eb22a1509e 100644
--- a/keyboards/lets_split/keymaps/geripgeri/keymap.c
+++ b/keyboards/lets_split/keymaps/geripgeri/keymap.c
@@ -255,7 +255,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
   writePin(B0, !(state & (1UL << (_NUMPAD))));
 
-  switch(biton32(state)) {
+  switch(get_highest_layer(state)) {
     case _RAISE:
       rgblight_setrgb_at(255, 255, 255, RGBLED_NUM / 2);
       rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
diff --git a/keyboards/lets_split/keymaps/pitty/keymap.c b/keyboards/lets_split/keymaps/pitty/keymap.c
index d723e0c026..8bc32a1eb7 100644
--- a/keyboards/lets_split/keymaps/pitty/keymap.c
+++ b/keyboards/lets_split/keymaps/pitty/keymap.c
@@ -128,7 +128,7 @@ void persistent_default_layer_set(uint16_t default_layer) {
 
 
 void matrix_scan_user(void) {
-   uint8_t layer = biton32(layer_state);
+   uint8_t layer = get_highest_layer(layer_state);
    switch (layer) {
      case _NAV:
          if (RGB_INIT) {} else {
diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c
index 0e9dd7039b..868d8e5cb4 100644
--- a/keyboards/lily58/lib/layer_state_reader.c
+++ b/keyboards/lily58/lib/layer_state_reader.c
@@ -28,7 +28,7 @@ const char *read_layer_state(void) {
     snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust");
     break;
   default:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
+    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%u", layer_state);
   }
 
   return layer_state_str;
diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c
index f962246ef3..86231f8406 100644
--- a/keyboards/m10a/keymaps/gam3cat/keymap.c
+++ b/keyboards/m10a/keymaps/gam3cat/keymap.c
@@ -115,7 +115,7 @@ void matrix_scan_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case _L0:
             custom_backlight_level(0);
             break;
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
index 92e72bbf1c..73329c3114 100755
--- a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
@@ -5,7 +5,7 @@
 void matrix_init_keymap (void) {
 }
 
-uint32_t layer_state_set_keymap(uint32_t state) {
+layer_state_t layer_state_set_keymap(layer_state_t state) {
     return state;
 }
 
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c
index ba5b75a5cf..398a324a0f 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c
@@ -5,8 +5,8 @@
 void matrix_init_keymap (void) {
 }
 
-uint32_t layer_state_set_keymap(uint32_t state) {
-	
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+
     return state;
 }
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
index 218936a19b..689a9ce36e 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
@@ -87,7 +87,7 @@ void matrix_scan_user(void) {
 
 //change colors and rgb modes on layer change
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case raise:
         rgblight_mode_noeeprom(1);
         rgblight_setrgb(0xc7, 0x00, 0xf4);
@@ -103,4 +103,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     }
   return state;
 };
-
diff --git a/keyboards/mechllama/g35/keymaps/default/keymap.c b/keyboards/mechllama/g35/keymaps/default/keymap.c
index 4568f54f54..09d7afe171 100644
--- a/keyboards/mechllama/g35/keymaps/default/keymap.c
+++ b/keyboards/mechllama/g35/keymaps/default/keymap.c
@@ -67,7 +67,7 @@ const char* get_layer_name(uint8_t layer) {
 }
 
 bool oled_task_user(void) {
-    oled_write_ln_P(get_layer_name(biton32(layer_state)), false);
+    oled_write_ln_P(get_layer_name(get_highest_layer(layer_state)), false);
     return false;
 }
 #endif
diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c
index 3237636be2..70c1a7b8e3 100644
--- a/keyboards/mechlovin/hannah910/hannah910.c
+++ b/keyboards/mechlovin/hannah910/hannah910.c
@@ -34,20 +34,20 @@ void led_set_kb(uint8_t usb_led) {
 layer_state_t layer_state_set_user(layer_state_t state)
 {
   // if on layer 1, turn on D2 LED, otherwise off.
-    if (biton32(state) == 1) {
+    if (get_highest_layer(state) == 1) {
         writePinHigh(D2);
     } else {
         writePinLow(D2);
     }
   // if on layer 2, turn on D1 LED, otherwise off.
-    if (biton32(state) == 2) {
+    if (get_highest_layer(state) == 2) {
         writePinHigh(D1);
     } else {
         writePinLow(D1);
     }
 
   // if on layer 3, turn on D0 LED, otherwise off.
-    if (biton32(state) == 3) {
+    if (get_highest_layer(state) == 3) {
         writePinHigh(D0);
     } else {
         writePinLow(D0);
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c b/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
index 437233be52..e0634d85dc 100644
--- a/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
+++ b/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
@@ -53,9 +53,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 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;
@@ -69,30 +69,30 @@ bool led_update_user(led_t led_state) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-	
-	uint8_t layer = biton32(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); 
+			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); 
+			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); 
+			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); 
+			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE);
+			writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
             break;
     }
 #endif
 
-	return state;												
+	return state;
 
 }
diff --git a/keyboards/minimacro5/keymaps/devdev/keymap.c b/keyboards/minimacro5/keymaps/devdev/keymap.c
index d7f998fa3a..3c203fcc37 100644
--- a/keyboards/minimacro5/keymaps/devdev/keymap.c
+++ b/keyboards/minimacro5/keymaps/devdev/keymap.c
@@ -37,7 +37,7 @@ enum tap_dances{
 
 bool encoder_update_user(uint8_t index, bool clockwise) {
   if (index == 0) { /* First encoder*/
-    switch(biton32(layer_state)){
+    switch(get_highest_layer(layer_state)){
 		case _MAIN:
 			if (clockwise) {
 			  tap_code(KC_VOLU);
diff --git a/keyboards/mitosis/keymaps/carvac_dv/keymap.c b/keyboards/mitosis/keymaps/carvac_dv/keymap.c
index c67f2e387c..842556324f 100644
--- a/keyboards/mitosis/keymaps/carvac_dv/keymap.c
+++ b/keyboards/mitosis/keymaps/carvac_dv/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
     	case _STD:
@@ -121,4 +121,3 @@ void matrix_scan_user(void) {
             break;
     }
 };
-
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index 220c140af0..2611e1194c 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -102,7 +102,7 @@ const size_t defaultlayers_n = sizeof(defaultlayers) / sizeof(defaultlayers[0]);
 // New keycode KC_LAYO rotates between available default layers (for e.g.,
 // selecting a base layout). Shift+KC_LAYO makes the current one persistent.
 bool process_record_layout(uint16_t keycode, keyrecord_t *record) {
-  uint32_t default_layer;
+  uint8_t default_layer;
   uint8_t i;
   #if defined(AUDIO_ENABLE)
   float saved_song[][2] = SONG(COIN_SOUND);
@@ -121,7 +121,7 @@ bool process_record_layout(uint16_t keycode, keyrecord_t *record) {
   } else {
     // rotate default layer.
     // find the current default layer
-    default_layer = biton32(default_layer_state);
+    default_layer = get_highest_layer(default_layer_state);
     // find next valid default layer
     for (i = 1; i < defaultlayers_n; i++) {
       if (defaultlayers[(default_layer + i) % defaultlayers_n]) {
diff --git a/keyboards/mitosis/keymaps/default/keymap.c b/keyboards/mitosis/keymaps/default/keymap.c
index 6132ad6f78..27b2eb2525 100644
--- a/keyboards/mitosis/keymaps/default/keymap.c
+++ b/keyboards/mitosis/keymaps/default/keymap.c
@@ -77,7 +77,7 @@ static bool singular_key = false;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 	uint8_t layer;
-  layer = biton32(layer_state);  // get the current layer
+  layer = get_highest_layer(layer_state);  // get the current layer
 
   //custom layer handling for tri_layer,
   switch (keycode) {
@@ -174,7 +174,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
     	case _MALT:
@@ -193,4 +193,3 @@ void matrix_scan_user(void) {
             break;
     }
 };
-
diff --git a/keyboards/mitosis/keymaps/mjt/keymap.c b/keyboards/mitosis/keymaps/mjt/keymap.c
index f00bf59556..0946e40b8e 100644
--- a/keyboards/mitosis/keymaps/mjt/keymap.c
+++ b/keyboards/mitosis/keymaps/mjt/keymap.c
@@ -181,7 +181,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return false;
   }
   uint8_t layer;
-  layer = biton32(layer_state);  // get the current layer
+  layer = get_highest_layer(layer_state);  // get the current layer
 
   //custom layer handling for tri_layer,
   switch (keycode) {
@@ -310,7 +310,7 @@ void music_scale_user(void)
 #endif
 
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   switch (layer) {
   case _QWERTY:
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
index d9fd3641bc..c981441bc9 100644
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ b/keyboards/mitosis/keymaps/nzen/keymap.c
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
     	case _QWERTY:
@@ -205,5 +205,3 @@ void matrix_scan_user(void) {
 void matrix_init_user(void) {
 	set_unicode_input_mode(UC_LNX); // or UC_WINC
 };
-
-
diff --git a/keyboards/mschwingen/modelm/modelm.c b/keyboards/mschwingen/modelm/modelm.c
index 7dcd4ac024..0ff58f4be3 100644
--- a/keyboards/mschwingen/modelm/modelm.c
+++ b/keyboards/mschwingen/modelm/modelm.c
@@ -163,8 +163,8 @@ void update_layer_leds(void) {
     static uint8_t old_layer         = 255;
     static uint8_t old_default_layer = 255;
 
-    layer         = biton32(layer_state);
-    default_layer = biton32(default_layer_state);
+    layer         = get_highest_layer(layer_state);
+    default_layer = get_highest_layer(default_layer_state);
 
     if (isRecording && timer_elapsed(blink_cycle_timer) > 150) {
         blink_state       = !blink_state;
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
index 78a17233e3..ddcd3f6642 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
@@ -95,9 +95,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
   if (index == 0) {
     if (clockwise) {
-        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 3));
+        tap_code(dynamic_keymap_get_keycode(get_highest_layer(layer_state), 4, 3));
     } else {
-        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 4));
+        tap_code(dynamic_keymap_get_keycode(get_highest_layer(layer_state), 4, 4));
     }
   }
   return true;
diff --git a/keyboards/pearl/keymaps/cijanzen/keymap.c b/keyboards/pearl/keymaps/cijanzen/keymap.c
index 896e157fd6..5a3f1eb1cd 100644
--- a/keyboards/pearl/keymaps/cijanzen/keymap.c
+++ b/keyboards/pearl/keymaps/cijanzen/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /**
  * Status LED layer indicators courtesy of jetpacktuxedo's firmware
  */
-uint32_t layer_state_set_kb(uint32_t state)
+layer_state_t layer_state_set_kb(layer_state_t state)
 {
   if (state & (1<<1)) { // if we are on layer 1
     PORTD |= (1 << PD0); // light num lock led
diff --git a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
index 759c6fdc7d..4fd35f63ce 100644
--- a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
-uint32_t layer_state_set_kb(uint32_t state) {
+layer_state_t layer_state_set_kb(layer_state_t state) {
   // if we are on layer 1
   if (state & (1<<1)){
     // light num lock led
diff --git a/keyboards/pearl/keymaps/phil/keymap.c b/keyboards/pearl/keymaps/phil/keymap.c
index 56326d423f..492c4cb0c5 100755
--- a/keyboards/pearl/keymaps/phil/keymap.c
+++ b/keyboards/pearl/keymaps/phil/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
 };
 
-uint32_t layer_state_set_kb(uint32_t state) {
+layer_state_t layer_state_set_kb(layer_state_t state) {
   if (state & (1<<QWERTY)){
     PORTD &= ~(1 << PD0);
   } else {
diff --git a/keyboards/pearl/keymaps/rask/keymap.c b/keyboards/pearl/keymaps/rask/keymap.c
index bafb2b9738..30c8b6344f 100644
--- a/keyboards/pearl/keymaps/rask/keymap.c
+++ b/keyboards/pearl/keymaps/rask/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /**
  * Status LED layer indicators courtesy of jetpacktuxedo's firmware
  */
-uint32_t layer_state_set_kb(uint32_t state)
+layer_state_t layer_state_set_kb(layer_state_t state)
 {
     // if we are on layer 1
     if (state & (1<<1)){
diff --git a/keyboards/percent/canoe/keymaps/dhertz/keymap.c b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
index 7e8170aefc..7d855e8fa7 100644
--- a/keyboards/percent/canoe/keymaps/dhertz/keymap.c
+++ b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
@@ -49,8 +49,8 @@ void keyboard_post_init_user(void) {
     rgblight_sethsv_teal();
 }
 
-uint32_t layer_state_set_keymap(uint32_t state) {
-    switch (biton32(state)) {
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    switch (get_highest_layer(state)) {
         case 1:
             rgblight_sethsv_noeeprom_magenta();
             break;
diff --git a/keyboards/phoenix/phoenix.c b/keyboards/phoenix/phoenix.c
index a8e9a42a04..706a65b4de 100644
--- a/keyboards/phoenix/phoenix.c
+++ b/keyboards/phoenix/phoenix.c
@@ -74,7 +74,7 @@ void manipulate_led(uint32_t led, bool on) {
 }
 
 
-layer_state_t layer_state_set_kb(uint32_t state) {
+layer_state_t layer_state_set_kb(layer_state_t state) {
     state = layer_state_set_user(state);
 
     uint8_t layer = get_highest_layer(state);
diff --git a/keyboards/planck/keymaps/aviator/keymap.c b/keyboards/planck/keymaps/aviator/keymap.c
index 8fe66b3781..7ff410c767 100644
--- a/keyboards/planck/keymaps/aviator/keymap.c
+++ b/keyboards/planck/keymaps/aviator/keymap.c
@@ -142,7 +142,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
-        uint8_t default_layer = biton32(default_layer_state);
+        uint8_t default_layer = get_highest_layer(default_layer_state);
         if (default_layer == _QWERTY) {
           #ifdef BACKLIGHT_BREATHING
             breathing_enable();
@@ -151,7 +151,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         update_tri_layer(_LOWER, _RAISE, _ADJUST);
       } else {
         layer_off(_LOWER);
-        uint8_t default_layer = biton32(default_layer_state);
+        uint8_t default_layer = get_highest_layer(default_layer_state);
         if (default_layer == _QWERTY) {
           #ifdef BACKLIGHT_BREATHING
             breathing_self_disable();
@@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case RAISE:
       if (record->event.pressed) {
         layer_on(_RAISE);
-        uint8_t default_layer = biton32(default_layer_state);
+        uint8_t default_layer = get_highest_layer(default_layer_state);
         if (default_layer == _QWERTY) {
           #ifdef BACKLIGHT_BREATHING
             breathing_enable();
@@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         update_tri_layer(_LOWER, _RAISE, _ADJUST);
       } else {
         layer_off(_RAISE);
-        uint8_t default_layer = biton32(default_layer_state);
+        uint8_t default_layer = get_highest_layer(default_layer_state);
         if (default_layer == _QWERTY) {
           #ifdef BACKLIGHT_BREATHING
             breathing_self_disable();
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index cec3f0186a..bfe61294af 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -101,7 +101,7 @@ void set_layer_color(int layer) {
 
 void rgb_matrix_indicators_user(void) {
   if (g_suspend_state || keyboard_config.disable_layer_led) { return; }
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case 0:
       set_layer_color(0);
       break;
diff --git a/keyboards/planck/keymaps/grahampheath/keymap.c b/keyboards/planck/keymaps/grahampheath/keymap.c
index babe67c442..eb5401eabd 100644
--- a/keyboards/planck/keymaps/grahampheath/keymap.c
+++ b/keyboards/planck/keymaps/grahampheath/keymap.c
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   bool has_layer_changed = true;
 
   void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
     static uint8_t old_layer = 0;
 
     if (old_layer != layer) {
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 0368c98420..fae5a94713 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -94,7 +94,7 @@ void rgb_matrix_indicators_user(void) {
     if (keyboard_config.disable_layer_led) {
         return;
     }
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
         case 1:
             set_layer_color(0);
             break;
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 857d7a9e21..c289c50e5b 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -502,7 +502,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         } else {
             if (index == 0) { /* First encoder */
                 uint16_t held_keycode_timer = timer_read();
-                switch (biton32(layer_state)) {
+                switch (get_highest_layer(layer_state)) {
                     case 0:                                 // Base Layer
                         if ((get_mods() & MOD_MASK_GUI)) {  // GUI-ed
                             if (clockwise) {
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
index 66beaf33b7..d888fb7b05 100644
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ b/keyboards/planck/keymaps/tom/keymap.c
@@ -228,7 +228,7 @@ bool music_mask_user(uint16_t keycode) {
 
 void rgb_matrix_indicators_user(void) {
   #ifdef RGB_MATRIX_ENABLE
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case _RAISE:
       for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
         if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index 5cbc47b2fb..b4c0f9af52 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -168,7 +168,7 @@ void set_layer_color(int layer) {
 
 void rgb_matrix_indicators_user(void) {
   if (g_suspend_state || disable_layer_color) { return; }
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case 0:
       set_layer_color(0);
       break;
@@ -276,7 +276,7 @@ bool music_mask_user(uint16_t keycode) {
 layer_state_t layer_state_set_user(layer_state_t state) {
     palClearPad(GPIOB, 8);
     palClearPad(GPIOB, 9);
-    uint8_t layer = biton32(state);
+    uint8_t layer = get_highest_layer(state);
     switch (layer) {
         case _LOWER:
             palSetPad(GPIOB, 9);
diff --git a/keyboards/preonic/keymaps/dudeofawesome/keymap.c b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
index 2d2a252b23..812bf35a20 100644
--- a/keyboards/preonic/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
@@ -275,7 +275,7 @@ bool numpadActive = false;
 float tone_numpad_on[][2] = SONG(NUMPAD_ON_SOUND);
 
 void matrix_scan_user (void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   switch (layer) {
     case _NUMPAD:
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
index e152507835..0f896700e6 100644
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ b/keyboards/preonic/keymaps/senseored/keymap.c
@@ -367,7 +367,7 @@ bool dip_switch_update_user(uint8_t index, bool active) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
 //  if(rgblight_get_mode() == 1) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _QWERTY:
         if(bnumlock) {
             tap_code(KC_NLCK);
diff --git a/keyboards/primekb/prime_e/keymaps/via/keymap.c b/keyboards/primekb/prime_e/keymaps/via/keymap.c
index 195f845cc2..2d1d003d51 100644
--- a/keyboards/primekb/prime_e/keymaps/via/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/via/keymap.c
@@ -108,7 +108,7 @@ void led_set_user(uint8_t usb_led) {
 //function for layer indicator LED
 layer_state_t layer_state_set_user(layer_state_t state)
 {
-    if (biton32(state) == 1) {
+    if (get_highest_layer(state) == 1) {
     writePinHigh(B3);
 	} else {
 		writePinLow(B3);
diff --git a/keyboards/redox_w/keymaps/italian/keymap.c b/keyboards/redox_w/keymaps/italian/keymap.c
index e67742c6a1..b4c815e4f5 100644
--- a/keyboards/redox_w/keymaps/italian/keymap.c
+++ b/keyboards/redox_w/keymaps/italian/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,IT_UGRV ,IT_SHSL ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     GUI_LESS,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    ALT_IACC,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT 
+     GUI_LESS,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    ALT_IACC,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   ),
 
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,IT_PERC ,IT_CIRC ,IT_LPRN ,IT_RPRN ,IT_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX 
+     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   ),
 
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX 
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   ),
 
@@ -95,14 +95,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,        XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX 
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   )
 
 };
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
         case _QWERTY:
@@ -121,5 +121,3 @@ void matrix_scan_user(void) {
             break;
     }
 };
-
-
diff --git a/keyboards/redscarf_i/redscarf_i.c b/keyboards/redscarf_i/redscarf_i.c
index a8a685b13b..039e20664d 100644
--- a/keyboards/redscarf_i/redscarf_i.c
+++ b/keyboards/redscarf_i/redscarf_i.c
@@ -36,7 +36,7 @@ bool led_update_kb(led_t led_state) {
 }
 
 layer_state_t layer_state_set_kb(layer_state_t state) {
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case 1:
       writePinHigh(F6);
       writePinLow(F5);
diff --git a/keyboards/rgbkb/pan/keymaps/default/keymap.c b/keyboards/rgbkb/pan/keymaps/default/keymap.c
index dbc127616a..dcafeec765 100644
--- a/keyboards/rgbkb/pan/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/pan/keymaps/default/keymap.c
@@ -75,7 +75,7 @@ bool oled_task_user(void) {
     // Host Keyboard Layer Status
     oled_write_P(PSTR("RGBKB Pan\n"), false);
     oled_write_P(PSTR("Layer: "), false);
-    uint8_t layer = layer_state ? biton(layer_state) : biton32(default_layer_state);
+    uint8_t layer = get_highest_layer(layer_state|default_layer_state);
     switch (layer) {
         case _QWERTY:
             oled_write_P(PSTR("Default\n"), false);
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index c82259f5ee..1ce18bc1ab 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -233,7 +233,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   } else
 #endif
   {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
     uint16_t keycode = pgm_read_word(&encoders[layer][index][clockwise]);
     while (keycode == KC_TRANSPARENT && layer > 0)
     {
@@ -325,7 +325,7 @@ static void render_status(void) {
 
   // Define layers here
   oled_write_P(PSTR("Layer"), false);
-  uint8_t layer = layer_state ? biton(layer_state) : biton32(default_layer_state);
+  uint8_t layer = get_highest_layer(layer_state|default_layer_state);
   switch (layer) {
     case _QWERTY:
       oled_write_P(PSTR("BASE "), false);
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
index bdcfbb1b93..bc0884c8e4 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
@@ -263,7 +263,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   } else
 #endif
   {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
     uint16_t keycode = encoders[layer][index][clockwise];
     while (keycode == KC_TRANSPARENT && layer > 0)
     {
@@ -306,7 +306,7 @@ static void render_status(void) {
 
   // Define layers here
   oled_write_P(PSTR("     Layer-----"), false);
-  uint8_t layer = layer_state ? biton(layer_state) : biton32(default_layer_state);
+  uint8_t layer = layer_state ? get_highest_layer(layer_state) : get_highest_layer(default_layer_state);
   switch (layer) {
     case _DVORAK:
       oled_write_P(PSTR("DVRAK"), false);
diff --git a/keyboards/rgbkb/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c
index 5461890272..70e5531673 100644
--- a/keyboards/rgbkb/zen/rev2/rev2.c
+++ b/keyboards/rgbkb/zen/rev2/rev2.c
@@ -37,7 +37,7 @@ void render_status(void) {
   // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
   oled_set_cursor(0, 3); // Line 3
   oled_write_P(PSTR("Layer"), false); // Line 4
-  oled_write_P(layer_name_user(biton32(layer_state)), false);
+  oled_write_P(layer_name_user(get_highest_layer(layer_state)), false);
 
   // Host Keyboard LED Status
   uint8_t led_usb_state = host_keyboard_leds();
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
index 48bd1a33f7..f4d5c82a71 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
@@ -198,7 +198,7 @@ static void render_status(void) {
 
   // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
   oled_write_P(PSTR("Layer: "), false);
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
     case _QWERTY:
       oled_write_ln_P(PSTR("QWERTY"), false);
       break;
diff --git a/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
index 6c88b70bfe..1e96bd7fbc 100644
--- a/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
+++ b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
@@ -173,7 +173,7 @@ void matrix_init_user(void) {
 }
 
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   uint8_t default_layer = biton32(eeconfig_read_default_layer());
   switch (layer) {
     case _LOWER:
diff --git a/keyboards/satt/comet46/keymaps/default/keymap.c b/keyboards/satt/comet46/keymaps/default/keymap.c
index cf2c911d4c..bccca0a091 100644
--- a/keyboards/satt/comet46/keymaps/default/keymap.c
+++ b/keyboards/satt/comet46/keymaps/default/keymap.c
@@ -176,8 +176,8 @@ void render_status(struct CharacterMatrix *matrix) {
   // Layer state
   char layer_str[22];
   matrix_write(matrix, "Layer: ");
-  uint8_t layer = biton32(layer_state);
-  uint8_t default_layer = biton32(eeconfig_read_default_layer());
+  uint8_t layer = get_highest_layer(layer_state);
+  uint8_t default_layer = get_highest_layer(eeconfig_read_default_layer());
   switch (layer) {
     case _QWERTY:
       switch (default_layer) {
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
index cdd094f747..54d1d791d7 100644
--- a/keyboards/satt/comet46/keymaps/satt/keymap.c
+++ b/keyboards/satt/comet46/keymaps/satt/keymap.c
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case _PSEUDO_US_LOWER:
     case _PSEUDO_US_RAISE:
       return update_tri_layer_state(state, _PSEUDO_US_RAISE, _PSEUDO_US_LOWER, _ADJUST);
@@ -204,7 +204,7 @@ void render_status(struct CharacterMatrix *matrix) {
   // Layer state
   char layer_str[22];
   matrix_write(matrix, "Layer: ");
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   uint8_t default_layer = biton32(eeconfig_read_default_layer());
     switch (layer) {
       case _QWERTY:
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c b/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
index af583a607f..f193c6e00c 100644
--- a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
@@ -341,7 +341,7 @@ bool oled_task_user(void) {
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch(biton32(layer_state)){
+    switch(get_highest_layer(layer_state)){
         case 1:
             if (clockwise) {
                 tap_code16(C(KC_TAB));
diff --git a/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c b/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c
index 813328aa0c..d0f2a1b6cd 100644
--- a/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c
+++ b/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c
@@ -111,7 +111,7 @@ void oled_slash_separator(void){
 
 void render_layout_state(void) {
   oled_write_P(PSTR("Layout: "), false);
-  switch (biton32(default_layer_state)) {
+  switch (get_highest_layer(default_layer_state)) {
       case _COLEMAK:
         oled_write_P(PSTR("Colemak"), false);
         break;
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
index 0a4f1887c3..3cd9df27fb 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
@@ -311,7 +311,7 @@ bool oled_task_user(void) {
 #ifdef ENCODER_ENABLE
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
-        switch (biton32(layer_state)) {
+        switch (get_highest_layer(layer_state)) {
             case QWERTY:
                 // History scrubbing. For Adobe products, hold shift while moving
                 // backward to go forward instead.
@@ -336,7 +336,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 break;
         }
     } else if (index == 1) {
-        switch (biton32(layer_state)) {
+        switch (get_highest_layer(layer_state)) {
             case QWERTY:
                 // Scrolling with PageUp and PgDn.
                 if (clockwise) {
diff --git a/keyboards/splitography/keymaps/jeandeaual/keymap.c b/keyboards/splitography/keymaps/jeandeaual/keymap.c
index 6679d835f2..87c4159443 100644
--- a/keyboards/splitography/keymaps/jeandeaual/keymap.c
+++ b/keyboards/splitography/keymaps/jeandeaual/keymap.c
@@ -225,7 +225,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
         case KC_QUOT:
-            if ((base_layer != dvorak) || (biton32(layer_state) != _BLUE)) {
+            if ((base_layer != dvorak) || (get_highest_layer(layer_state) != _BLUE)) {
                 break;
             }
             if (record->event.pressed) {
diff --git a/keyboards/splitography/keymaps/multi/keymap.c b/keyboards/splitography/keymaps/multi/keymap.c
index af1cc1a801..7d847e40b6 100644
--- a/keyboards/splitography/keymaps/multi/keymap.c
+++ b/keyboards/splitography/keymaps/multi/keymap.c
@@ -331,7 +331,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
         case KC_QUOT:
-            if ((base_layer != dvorak) || (biton32(layer_state) != _BLUE)) {
+            if ((base_layer != dvorak) || (get_highest_layer(layer_state) != _BLUE)) {
                 break;
             }
             if (record->event.pressed) {
diff --git a/keyboards/tetris/keymaps/default/keymap.c b/keyboards/tetris/keymaps/default/keymap.c
index 1b53ea80b9..9e2a96ffc3 100755
--- a/keyboards/tetris/keymaps/default/keymap.c
+++ b/keyboards/tetris/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ void matrix_init_user(void) {
 }
 
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   if (RGB_encoder_dir != 0) {
     if (timer_elapsed(RGB_encoder_timer) > 1400) {
@@ -152,7 +152,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t * record) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
   RGB_encoder_timer = timer_read();
   RGB_encoder_timer2 = timer_read();
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   if (clockwise) {
     RGB_encoder_dir = 1;
   } else {
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
index b00cf80f5c..a6fa5ed722 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
@@ -147,7 +147,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
     }
     uint8_t layer;
-    layer = biton32(layer_state);
+    layer = get_highest_layer(layer_state);
 
     switch (keycode) {
     case FPH_1 ... FPH_9:
diff --git a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
index 82a7e52808..8927a8ee0a 100644
--- a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
@@ -104,7 +104,7 @@ void rgbflag(uint8_t r, uint8_t g, uint8_t b) {
 }
 
 void set_state_leds(void) {
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
   case _MOVE:
     rgbflag(C_BLU);
     break;
@@ -192,4 +192,3 @@ void suspend_wakeup_init_user(void)
   backlight_set(backlight_config.level);
   rgblight_set();
 }
-
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
index fe7cd60662..ab129332c9 100644
--- a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
@@ -47,7 +47,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     edit = false;
   }
 
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case 1:
       rgblight_mode(1);
       rgblight_setrgb(0xD3, 0x7F, 0xED);
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
index 8e081c6731..d17fc2f35d 100644
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Loop
 void matrix_scan_user(void) {
   static uint8_t old_layer = 255;
-  uint8_t new_layer = biton32(layer_state);
+  uint8_t new_layer = get_highest_layer(layer_state);
 
   if (old_layer != new_layer) {
     switch (new_layer) {
diff --git a/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c b/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
index 5f7337d68b..c278df1b21 100644
--- a/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
@@ -100,7 +100,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 // Runs whenever there is a layer state change.
 layer_state_t layer_state_set_user(layer_state_t state) {
-  uint8_t layer = biton32(state);
+  uint8_t layer = get_highest_layer(state);
 
   gp100_led_off();
   gp103_led_off();
diff --git a/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c b/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
index 1b29686cff..a0295f2f45 100644
--- a/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
@@ -286,7 +286,7 @@ void matrix_init_user(void) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch(biton32(state)) {
+  switch(get_highest_layer(state)) {
   case _QWERTY:
     rgblight_sethsv_white();
     break;
diff --git a/keyboards/xiudi/xd75/keymaps/kloki/keymap.c b/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
index a630019347..d25a16fbb6 100644
--- a/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
@@ -70,7 +70,7 @@ bool WINDOWN = false;
 bool SHIFTDOWN = false;
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
         case 0:
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index b7b98cd4c5..f48eb94214 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -180,7 +180,7 @@ void matrix_init_user(void) {
 
 //Set a color based on the layer
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch(biton32(state)) {
+  switch(get_highest_layer(state)) {
     case _LYFK:
       rgblight_setrgb_user_LYFK();
       break;
diff --git a/layouts/community/ergodox/ab/keymap.c b/layouts/community/ergodox/ab/keymap.c
index 001123e286..e85d5d528c 100644
--- a/layouts/community/ergodox/ab/keymap.c
+++ b/layouts/community/ergodox/ab/keymap.c
@@ -130,7 +130,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/absenth/keymap.c b/layouts/community/ergodox/absenth/keymap.c
index d84b68f0ef..884167aa31 100644
--- a/layouts/community/ergodox/absenth/keymap.c
+++ b/layouts/community/ergodox/absenth/keymap.c
@@ -157,7 +157,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/adam/keymap.c b/layouts/community/ergodox/adam/keymap.c
index 50270838aa..9dd611e03e 100644
--- a/layouts/community/ergodox/adam/keymap.c
+++ b/layouts/community/ergodox/adam/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   switch (layer) {
     // TODO: Make this relevant to the ErgoDox EZ.
diff --git a/layouts/community/ergodox/adnw_k_o_y/keymap.c b/layouts/community/ergodox/adnw_k_o_y/keymap.c
index 589a9ea873..6aa309c2cc 100644
--- a/layouts/community/ergodox/adnw_k_o_y/keymap.c
+++ b/layouts/community/ergodox/adnw_k_o_y/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/alexjj/keymap.c b/layouts/community/ergodox/alexjj/keymap.c
index 64e7c94433..c9adf7af63 100644
--- a/layouts/community/ergodox/alexjj/keymap.c
+++ b/layouts/community/ergodox/alexjj/keymap.c
@@ -206,7 +206,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/andrew_osx/keymap.c b/layouts/community/ergodox/andrew_osx/keymap.c
index 990fea4f45..4f3f6ef0cb 100644
--- a/layouts/community/ergodox/andrew_osx/keymap.c
+++ b/layouts/community/ergodox/andrew_osx/keymap.c
@@ -141,7 +141,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/berfarah/keymap.c b/layouts/community/ergodox/berfarah/keymap.c
index 164d026ef3..7dc09e7543 100644
--- a/layouts/community/ergodox/berfarah/keymap.c
+++ b/layouts/community/ergodox/berfarah/keymap.c
@@ -219,7 +219,7 @@ static inline void mod_layer_with_rgb(keyrecord_t *record, uint8_t layer) {
     bf_set_led(layer);
   } else {
     layer_off(layer);
-    uint8_t currentLayer = biton32(layer_state);
+    uint8_t currentLayer = get_highest_layer(layer_state);
     bf_set_led(currentLayer);
   };
 };
@@ -266,7 +266,7 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
diff --git a/layouts/community/ergodox/bryan/keymap.c b/layouts/community/ergodox/bryan/keymap.c
index acae77d5fc..ab301e8922 100644
--- a/layouts/community/ergodox/bryan/keymap.c
+++ b/layouts/community/ergodox/bryan/keymap.c
@@ -200,7 +200,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/choromanski/keymap.c b/layouts/community/ergodox/choromanski/keymap.c
index 8be3c7ea7e..933f13b25f 100644
--- a/layouts/community/ergodox/choromanski/keymap.c
+++ b/layouts/community/ergodox/choromanski/keymap.c
@@ -30,15 +30,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	OSL(3),		TG(2),			TO(5),			TO(1),			KC_CAPS,
 																			KC_LCTL,	KC_LALT,
 																						KC_MUTE,
-																KC_BSPC,	KC_DEL,		KC_LGUI,			
+																KC_BSPC,	KC_DEL,		KC_LGUI,
 
-	KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,	
+	KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
 	KC_RPRN,	KC_J,		KC_L,		KC_U,		KC_Y,			KC_SCLN,		KC_BSLS,
-				KC_H,		KC_N,		KC_E,		KC_I,			KC_O,			KC_QUOT,			
+				KC_H,		KC_N,		KC_E,		KC_I,			KC_O,			KC_QUOT,
 	KC_RBRC,	KC_K,		KC_M,		KC_COMM,	ALT_T(KC_DOT),	CTL_T(KC_SLSH),	KC_RSFT,
-							KC_LEFT,	KC_DOWN,	KC_UP,			KC_RGHT,		TG(4),			
-	KC_RALT,	KC_RCTL,			
-	KC_WH_U,			
+							KC_LEFT,	KC_DOWN,	KC_UP,			KC_RGHT,		TG(4),
+	KC_RALT,	KC_RCTL,
+	KC_WH_U,
 	KC_WH_D,	KC_ENT,		KC_SPC
   ),
 
@@ -106,22 +106,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [2] = LAYOUT_ergodox(
 	KC_TRNS,		KC_F1,			KC_F2,			KC_F3,			KC_F4,			KC_F5,			KC_F6,
-	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,	
-	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		
-	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,	
+	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
+	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
+	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
 	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
 																					KC_TRNS,		KC_TRNS,
 																									KC_TRNS,
 																	KC_TRNS,		KC_TRNS,		KC_TRNS,
 
-	KC_F7,			KC_F8,			KC_F9,			KC_F10,			KC_F11,			KC_F12,			KC_TRNS,	
+	KC_F7,			KC_F8,			KC_F9,			KC_F10,			KC_F11,			KC_F12,			KC_TRNS,
 	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
-					KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		
+					KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
 	KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
-									KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,	
-	KC_TRNS,		KC_TRNS,		
-	KC_TRNS,		
-	KC_TRNS,		KC_TRNS,		KC_TRNS	
+									KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,		KC_TRNS,
+	KC_TRNS,		KC_TRNS,
+	KC_TRNS,
+	KC_TRNS,		KC_TRNS,		KC_TRNS
   ),
 
   /* Keymap 3: Symbols
@@ -147,9 +147,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [3] = LAYOUT_ergodox(
 	KC_TRNS,	KC_F1,		KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_F6,
-	KC_TRNS,	KC_PIPE,	KC_PLUS,	KC_LABK,	KC_RABK,	KC_HASH,	KC_TRNS,	
-	KC_TRNS,	KC_EXLM,	KC_MINS,	KC_EQL,		KC_PERC,	KC_AT,			
-	KC_TRNS,	KC_ASTR,	KC_AMPR,	KC_SLSH,	KC_DLR,		KC_CIRC,	KC_TRNS,	
+	KC_TRNS,	KC_PIPE,	KC_PLUS,	KC_LABK,	KC_RABK,	KC_HASH,	KC_TRNS,
+	KC_TRNS,	KC_EXLM,	KC_MINS,	KC_EQL,		KC_PERC,	KC_AT,
+	KC_TRNS,	KC_ASTR,	KC_AMPR,	KC_SLSH,	KC_DLR,		KC_CIRC,	KC_TRNS,
 	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
 																KC_TRNS,	KC_TRNS,
 																			KC_TRNS,
@@ -229,8 +229,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [5] = LAYOUT_ergodox(
 	KC_GRV,		KC_1,			KC_2,	KC_3,		KC_4,		KC_5,		KC_6,
 	KC_TAB,		KC_Q,			KC_W,	KC_E,		KC_R,		KC_T,		KC_TRNS,
-	KC_LCTL,	KC_A,			KC_S,	KC_D,		KC_F,		KC_G,			
-	KC_LSFT,	KC_Z,			KC_X,	KC_C,		KC_V,		KC_B,		KC_MPLY,		
+	KC_LCTL,	KC_A,			KC_S,	KC_D,		KC_F,		KC_G,
+	KC_LSFT,	KC_Z,			KC_X,	KC_C,		KC_V,		KC_B,		KC_MPLY,
 	KC_LCTL,	LALT(KC_TAB),	TO(0),	KC_LALT,	KC_SPC,
 																KC_MPRV,	KC_MNXT,
 																  			KC_VOLU,
@@ -249,7 +249,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_scan_user(void) {
 
-	uint8_t layer = biton32(layer_state);
+	uint8_t layer = get_highest_layer(layer_state);
 
 	ergodox_board_led_off();
 	ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/colemak/keymap.c b/layouts/community/ergodox/colemak/keymap.c
index 54b0c5834a..db2addd6d9 100644
--- a/layouts/community/ergodox/colemak/keymap.c
+++ b/layouts/community/ergodox/colemak/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/colemak_code_friendly/keymap.c b/layouts/community/ergodox/colemak_code_friendly/keymap.c
index 936ddbc2a5..6350bd9ee2 100644
--- a/layouts/community/ergodox/colemak_code_friendly/keymap.c
+++ b/layouts/community/ergodox/colemak_code_friendly/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,         KC_A,          KC_R,          KC_S,     KC_T,            KC_D,
   KC_LSFT,        LCTL_T(KC_Z),  LGUI_T(KC_X),  KC_C,     KC_V,            RALT_T(KC_B),    KC_LCBR,
   KC_LCTL,        KC_LGUI,       KC_LALT,       KC_LBRC,  KC_RBRC,
-  
+
                                                               KC_HOME, KC_END,
                                                                       KC_PSCR,
                                             MO(LAYER_LNUM), KC_ENT,   KC_LGUI,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_F8,      KC_F7,   KC_F6,    KC_F5,    M_IN_PRN,
   KC_TRNS, KC_F4,      KC_F3,   KC_F2,    KC_F1,    M_IN_BRC,       KC_TRNS,
   KC_MUTE, KC_VOLD,    KC_VOLU, KC_TRNS,  KC_TRNS,
-  
+
                                                        KC_TRNS,   KC_TRNS,
                                                            DYN_REC_START1,
                                         KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1,
@@ -126,8 +126,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|      |  |  }   |------+------+------+------+------+--------|
  * |        |  F4  |  F3  |  F2  |  F1  |  []  |      |  |      |K/RAlt|   M  |   ,  |./Supe|/ RCtl| RShift |
  * '--------+------+------+------+------+-------------'  '-------------+------+------+------+------+--------'
- *   | MUTE | VOLD | VOLU |      |      |                              | Left | Down | Up   |Right | Del  |  
- *   '----------------------------------'                              '----------------------------------'  
+ *   | MUTE | VOLD | VOLU |      |      |                              | Left | Down | Up   |Right | Del  |
+ *   '----------------------------------'                              '----------------------------------'
  *                                      .-------------.  .-------------.
  *                                      |      |      |  | Ins  |ScrLck|
  *                               .------+------+------|  |------+------+------.
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_F8,      KC_F7,   KC_F6,    KC_F5,    M_IN_PRN,
   KC_TRNS, KC_F4,      KC_F3,   KC_F2,    KC_F1,    M_IN_BRC,       KC_TRNS,
   KC_MUTE, KC_VOLD,    KC_VOLU, KC_TRNS,  KC_TRNS,
-  
+
                                                        KC_TRNS,   KC_TRNS,
                                                            DYN_REC_START1,
                                         KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1,
@@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   S(KC_ESC),   S(KC_A),     S(KC_R),     S(KC_S),     S(KC_T),     S(KC_D),
   KC_LSFT,     S(KC_Z),     S(KC_X),     S(KC_C),     S(KC_V),     S(KC_B),    KC_LCBR,
   S(KC_LCTL),  S(KC_LGUI),  S(KC_LALT),  S(KC_LBRC),  S(KC_RBRC),
-  
+
                                                               S(KC_HOME), S(KC_END),
                                                                          S(KC_PSCR),
                                                    KC_CAPS, S(KC_ENT),   S(KC_LGUI),
@@ -227,7 +227,7 @@ static bool process_record_dynamic_macro_wrapper(uint16_t keycode, keyrecord_t *
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  
+
   /* the purpose of the ..._wrapper is to detect START/ST0P keys to
      light the blue led during recording */
   if (!process_record_dynamic_macro_wrapper(keycode, record)) {
@@ -308,19 +308,19 @@ void matrix_init_user(void) {
 
 /* Runs constantly in the background, in a loop. */
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   //led 1, RED, Caps-Lock ON
   //if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ergodox_right_led_1_on();
 
   //led 2, GREEN
-  if (layer == LAYER_NUM) 
+  if (layer == LAYER_NUM)
       ergodox_right_led_2_on();
   else
       ergodox_right_led_2_off();
 
   //led 3, BLUE
-  if (recording_dynamic_macro) 
+  if (recording_dynamic_macro)
       ergodox_right_led_3_on();
   else
       ergodox_right_led_3_off();
diff --git a/layouts/community/ergodox/colemak_programmer/keymap.c b/layouts/community/ergodox/colemak_programmer/keymap.c
index 46cd28dc8c..b4ace197de 100644
--- a/layouts/community/ergodox/colemak_programmer/keymap.c
+++ b/layouts/community/ergodox/colemak_programmer/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |symbol|N-Lock| End   |       | PgDn |       |      |
  *                                 `---------------------'       `---------------------'
  */
-[0] = LAYOUT_ergodox(  // layer 0 : default 
+[0] = 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_F,       KC_P,        KC_G,        TG(3),
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[1] = LAYOUT_ergodox(  // layer 1: QWERTY layer (games) 
+[1] = LAYOUT_ergodox(  // layer 1: QWERTY layer (games)
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_TRNS,
        KC_TRNS,        KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                        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_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_TRNS,
@@ -243,7 +243,7 @@ void matrix_scan_user(void) {
     //bit 1: default layer 1 - QWERTY
     if (default_layer_state & (1UL << 1)) ergodox_right_led_1_on();
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     //layer 2 : Symbols (& Fs)
     //if (layer == 2) ergodox_right_led_2_on();
diff --git a/layouts/community/ergodox/common_nighthawk/keymap.c b/layouts/community/ergodox/common_nighthawk/keymap.c
index cb13822e4e..a7ed10d715 100644
--- a/layouts/community/ergodox/common_nighthawk/keymap.c
+++ b/layouts/community/ergodox/common_nighthawk/keymap.c
@@ -188,7 +188,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/csharp_dev/keymap.c b/layouts/community/ergodox/csharp_dev/keymap.c
index 221389ef24..f22938429d 100644
--- a/layouts/community/ergodox/csharp_dev/keymap.c
+++ b/layouts/community/ergodox/csharp_dev/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_RPRN,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_BSPACE,
         KC_LCBR,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_RCBR,        ALT_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_SLASH,
-        CTL_T(KC_TAB), LSFT(KC_COMMA),LSFT(KC_DOT),KC_PIPE,KC_AMPR, 
+        CTL_T(KC_TAB), LSFT(KC_COMMA),LSFT(KC_DOT),KC_PIPE,KC_AMPR,
                                               LT(1,KC_DOT),  KC_COMM,
                                                               LCTL(KC_C),
                                                GUI_T(KC_ENTER),SFT_T(KC_SPACE),LCTL(KC_V),
@@ -125,81 +125,81 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 		case MACRO_PUBLIC:
 			if (record->event.pressed) {
 				return MACRO( T(P), T(U), T(B), T(L), T(I), T(C), T(SPACE),END);
-			} 
+			}
 			break;
 		case MACRO_PRIVATE:
 			if (record->event.pressed) {
 				return MACRO( T(P), T(R), T(I), T(V), T(A), T(T), T(E), T(SPACE),END);
-			} 
+			}
 			break;
 		case MACRO_STATIC:
 			if (record->event.pressed) {
 				return MACRO( T(S), T(T), T(A), T(T), T(I), T(C), T(SPACE), END);
-			} 
+			}
 			break;
 		case MACRO_CONST:
 			if (record->event.pressed) {
 				return MACRO( T(C), T(O), T(N), T(S), T(T), T(SPACE), END);
-			} 
+			}
 			break;
 		case MACRO_VOID:
 			if (record->event.pressed) {
 				return MACRO( T(V), T(O), T(I), T(D), T(SPACE), END);
-			} 
+			}
 			break;
 		case MACRO_VAR:
 			if (record->event.pressed) {
 				return MACRO( T(V), T(A), T(R), T(SPACE), END);
-			} 
+			}
 			break;
 		case MACRO_STRING:
 			if (record->event.pressed) {
 				return MACRO( T(S), T(T), T(R), T(I), T(N), T(G), T(SPACE), END);
-			} 
-			break;		
+			}
+			break;
 		case MACRO_BOOL:
 			if (record->event.pressed) {
 				return MACRO( T(B), T(O), T(O), T(L), T(SPACE), END);
-			} 
-			break;		
+			}
+			break;
 		case MACRO_INT:
 			if (record->event.pressed) {
 				return MACRO( T(I), T(N), T(T), T(SPACE), END);
-			} 
+			}
 			break;
 		case MACRO_FLOAT:
 			if (record->event.pressed) {
 				return MACRO( T(F), T(L), T(O), T(A),T(T),T(SPACE), END);
-			} 
+			}
 			break;
 		case MACRO_RETURN:
 			if (record->event.pressed) {
 				return MACRO( T(R), T(E), T(T), T(U),T(R),T(N), END);
-			} 
+			}
 			break;
 		case MACRO_NULL:
 			if (record->event.pressed) {
 				return MACRO( T(N), T(U), T(L), T(L), END);
-			} 
+			}
 		case MACRO_BREAK:
 			if (record->event.pressed) {
 				return MACRO( T(B), T(R), T(E), T(A), T(K), T(SCOLON), END);
-			} 
+			}
 			break;
 		case MACRO_TODO:
 			if (record->event.pressed) {
 				return MACRO( T(SLASH), T(SLASH), D(LSHIFT) ,T(T), T(O), T(D), T(O),U(LSHIFT), T(SPACE),END);
-			} 
+			}
 			break;
 		case MACRO_NEW:
 			if (record->event.pressed) {
 				return MACRO( T(N), T(E), T(W), T(SPACE), END);
-			} 
+			}
 			break;
 		case MACRO_PARENTHESE:
 			if (record->event.pressed) {
 				return MACRO(  D(LSHIFT),T(9), T(0),U(LSHIFT), T(SCOLON), END);
-			} 
+			}
 			break;
       }
     return MACRO_NONE;
@@ -213,7 +213,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dave/keymap.c b/layouts/community/ergodox/dave/keymap.c
index efa270c406..c54e50ba98 100644
--- a/layouts/community/ergodox/dave/keymap.c
+++ b/layouts/community/ergodox/dave/keymap.c
@@ -147,7 +147,7 @@ void matrix_scan_user(void) {
      */
     static uint8_t leds[4];
     uint8_t led;
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
 
diff --git a/layouts/community/ergodox/deadcyclo/keymap.c b/layouts/community/ergodox/deadcyclo/keymap.c
index 345e25e03e..76f5279257 100644
--- a/layouts/community/ergodox/deadcyclo/keymap.c
+++ b/layouts/community/ergodox/deadcyclo/keymap.c
@@ -90,10 +90,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LALT,  KC_RALT,KC_LEAD,LCTL(LSFT(KC_U)),          LT(SYMB,KC_TILD),
              KC_PGUP,        KC_INS,
              KC_PGDN,
-             KC_RBRC,KC_BSPC, KC_ENT   
+             KC_RBRC,KC_BSPC, KC_ENT
     ),
-/* Keymap 1: Symbol Layer LCTL(LSFT(KC_U))  
- *                                                  
+/* Keymap 1: Symbol Layer LCTL(LSFT(KC_U))
+ *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
@@ -192,7 +192,7 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, I3_RUN, KC_TRNS, KC_TRNS,
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |   ▒  |  ▓   |
  *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      | 
+ *                                 |      |      |      |       |      |      |      |
  *                                 |      |      |------|       |------|      |      |
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
@@ -218,7 +218,7 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, I3_RUN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS
 ),
 
-/* Keymap 4: Unicode 2 
+/* Keymap 4: Unicode 2
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |  ¹   |  ²   |  ³   |  ⁴   |  ⁵   |  ⁶   |           |  ⁶   |  ⁷   |  ⁸   |  ⁹   |  ⁰   |  ℃   |   ™    |
@@ -234,12 +234,12 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, I3_RUN, KC_TRNS, KC_TRNS,
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |      |      |
  *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      | 
+ *                                 |      |      |      |       |      |      |      |
  *                                 |      |      |------|       |------|      |      |
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-// Unicode 2   
+// Unicode 2
 [UNI2] = LAYOUT_ergodox(
 		KC_TRNS, UC(0x00b9), UC(0x00b2), UC(0x00b3), UC(0x2074), UC(0x2075), UC(0x2076),
 		KC_TRNS, UC(0x2081), UC(0x2082), UC(0x2083), UC(0x2084), UC(0x2085), UC(0x2086),
@@ -346,7 +346,7 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dragon788/keymap.c b/layouts/community/ergodox/dragon788/keymap.c
index 956a592b6d..b32346a9df 100644
--- a/layouts/community/ergodox/dragon788/keymap.c
+++ b/layouts/community/ergodox/dragon788/keymap.c
@@ -183,7 +183,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dvorak/keymap.c b/layouts/community/ergodox/dvorak/keymap.c
index 68b575fd68..664d8055a4 100644
--- a/layouts/community/ergodox/dvorak/keymap.c
+++ b/layouts/community/ergodox/dvorak/keymap.c
@@ -138,7 +138,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dvorak_emacs/keymap.c b/layouts/community/ergodox/dvorak_emacs/keymap.c
index 6055fd770d..14c592f27f 100644
--- a/layouts/community/ergodox/dvorak_emacs/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dvorak_emacs_software/keymap.c b/layouts/community/ergodox/dvorak_emacs_software/keymap.c
index 4f90f193c6..c2bc1ef8f2 100644
--- a/layouts/community/ergodox/dvorak_emacs_software/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs_software/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
index 3ebbd2df09..2d3ec3806b 100644
--- a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
+++ b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
@@ -139,7 +139,7 @@ LAYOUT_ergodox(  // layer 0 : default
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dvorak_plover/keymap.c b/layouts/community/ergodox/dvorak_plover/keymap.c
index 989aafb90a..51f7e61203 100644
--- a/layouts/community/ergodox/dvorak_plover/keymap.c
+++ b/layouts/community/ergodox/dvorak_plover/keymap.c
@@ -181,7 +181,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dvorak_programmer/keymap.c b/layouts/community/ergodox/dvorak_programmer/keymap.c
index 33115d21f3..a8acee119a 100644
--- a/layouts/community/ergodox/dvorak_programmer/keymap.c
+++ b/layouts/community/ergodox/dvorak_programmer/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,                    KC_QUOT,        KC_COMM,     KC_DOT,       KC_P,        KC_Y,        MO(KEY_SEL),
         MO(BRACKETS),              KC_A,           KC_O,        KC_E,         KC_U,        KC_I,
         MO(SHELL_NAV),             KC_SCLN,        KC_Q,        KC_J,         KC_K,        KC_X,        MO(KEY_NAV),
-                   OSL(SHORTCUTS),OSM(MOD_LCTL), OSM(MOD_LALT),OSL(SYMBOL),MO(NUMBER),  
+                   OSL(SHORTCUTS),OSM(MOD_LCTL), OSM(MOD_LALT),OSL(SYMBOL),MO(NUMBER),
                                               // thumb cluster
                                                OSM(MOD_LSFT), RCTL(KC_S),
                                                           RCTL(KC_DEL),
@@ -62,10 +62,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_UP,
              KC_DOWN,KC_ENT, KC_SPC
     ),
-     
 
-	 
-	 
+
+
+
 // shell navigation layer
 [SHELL_NAV] = LAYOUT_ergodox(
        // left hand
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
 
-    
+
 // key navigation layer
 [KEY_NAV] = LAYOUT_ergodox(
        // left hand
@@ -177,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,       
+       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                        KC_TRNS,KC_TRNS,
                                                KC_TRNS,
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_PLUS, KC_AMPR, KC_ASTR, KC_GRAVE,KC_TILD, KC_TRNS,
                 KC_MINS, KC_DLR,  KC_PERC, KC_CIRC, KC_PIPE, KC_TRNS,
        KC_TRNS, KC_EQUAL,KC_EXLM, KC_AT,   KC_HASH, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        M(SEMICOLON_NEWLINE), M(END_NEWLINE),
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,KC_TRNS,KC_TRNS,             KC_TRNS,            KC_TRNS,               KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,M(OPEN_CLOSE_CURLY), M(OPEN_CLOSE_PAREN),M(OPEN_CLOSE_BRACKET), KC_TRNS,KC_TRNS,
        KC_TRNS,KC_LPRN, KC_RPRN,            KC_LBRC,            KC_RBRC,               KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,             KC_LCBR,            KC_RCBR,               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,
@@ -207,8 +207,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS, KC_TRNS, M(OPEN_CLOSE_BRACKET),M(OPEN_CLOSE_PAREN),M(OPEN_CLOSE_CURLY),KC_TRNS,KC_TRNS,
                 KC_TRNS, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, 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_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
@@ -219,7 +219,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_NO,  MEH(KC_F1), MEH(KC_F2), MEH(KC_F3),  MEH(KC_F4), MEH(KC_F5), MEH(KC_F6),
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,       
+       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                          MEH(KC_0),MEH(KC_1),
                                                    MEH(KC_2),
@@ -272,12 +272,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         case MC_CUT_LINE:
             if (record->event.pressed) {
                 return MACRO( T(HOME), D(LSFT), T(END), U(LSFT), D(LCTL), T(X), U(LCTL), END);
-            }        
+            }
             break;
         case MC_PASTE_LINE:
             if (record->event.pressed) {
                 return MACRO( T(END), T(ENTER), D(LCTL), T(V), U(LCTL), END);
-            }                
+            }
             break;
         case MC_NEW_SEARCH_TAB:
              if (record->event.pressed) {
@@ -287,17 +287,17 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         case SCREEN_TAB_LEFT:
              if (record->event.pressed) {
                 return MACRO( D(LCTL), T(A), U(LCTL), T(P), END);
-            }        
+            }
             break;
         case SCREEN_TAB_RIGHT:
              if (record->event.pressed) {
                 return MACRO( D(LCTL), T(A), U(LCTL), T(N), END);
-            }                    
+            }
             break;
         case SCREEN_NEW_TAB:
              if (record->event.pressed) {
                 return MACRO( D(LCTL), T(A), U(LCTL), T(C), END);
-            }                                
+            }
         break;
         case SCREEN_COPY_MODE:
             if (record->event.pressed) {
@@ -306,14 +306,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         break;
         case SCREEN_PASTE:
             if (record->event.pressed) {
-                return MACRO( D(LCTL), T(A), U(LCTL), T(RBRC), END); 
+                return MACRO( D(LCTL), T(A), U(LCTL), T(RBRC), END);
             }
-        break;        
+        break;
         case SWITCH_NDS:
              if (record->event.pressed) {
                 return MACRO( D(LSFT), T(F11), U(LSFT), W(255), D(LALT), T(TAB), U(LALT), END);
-            }                                
-        break;        
+            }
+        break;
         case OPEN_CLOSE_PAREN:
             if (record->event.pressed) {
                 return MACRO( D(LSFT), T(9), T(0), U(LSFT), T(LEFT), END);
@@ -323,39 +323,39 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->event.pressed) {
                 return MACRO( T(LBRC), T(RBRC), T(LEFT), END);
             }
-        break;        
+        break;
         case OPEN_CLOSE_CURLY:
             if (record->event.pressed) {
                 return MACRO( D(LSFT), T(LBRC), T(RBRC), U(LSFT), T(LEFT), END);
             }
-        break;                
+        break;
         case OPEN_CLOSE_SINGLE_QUOTE:
             if (record->event.pressed) {
                 return MACRO( T(QUOT), T(QUOT), T(LEFT), END);
             }
-        break;        
+        break;
         case OPEN_CLOSE_DOUBLE_QUOTE:
             if (record->event.pressed) {
                 return MACRO( D(LSFT), T(QUOT), T(QUOT), U(LSFT), T(LEFT), END);
             }
-        break;                        
+        break;
         case SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND:
             if (record->event.pressed) {
                 return MACRO( T(UP), T(HOME), D(LALT), T(D), U(LALT), END);
             }
-        break;                                
+        break;
 		case SEMICOLON_NEWLINE:
             if (record->event.pressed) {
                 return MACRO( T(END), T(SCLN), T(ENTER), END);
-            }		
+            }
 		break;
 		case END_NEWLINE:
             if (record->event.pressed) {
                 return MACRO( T(END), T(ENTER), END);
-            }		
-		break;	
-		
-        
+            }
+		break;
+
+
       }
     return MACRO_NONE;
 };
@@ -378,7 +378,7 @@ void led_set_user(uint8_t usb_led) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_2_off();
@@ -387,13 +387,13 @@ void matrix_scan_user(void) {
         case NUMBER:
         case SYMBOL:
 		case BRACKETS:
-		//case SHELL_LAYER:		
+		//case SHELL_LAYER:
             ergodox_right_led_2_on();
             break;
         case KEY_NAV:
         case KEY_SEL:
             ergodox_right_led_3_on();
-            break;        
+            break;
         case SHORTCUTS:
             ergodox_right_led_2_on();
             ergodox_right_led_3_on();
@@ -401,6 +401,6 @@ void matrix_scan_user(void) {
         default:
             // none
             break;
-    } 
+    }
     return;
 };
diff --git a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
index a8a428a04b..2578547f17 100644
--- a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
+++ b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
@@ -306,7 +306,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/dvorak_spanish/keymap.c b/layouts/community/ergodox/dvorak_spanish/keymap.c
index 98aa638a0f..805abb0b77 100644
--- a/layouts/community/ergodox/dvorak_spanish/keymap.c
+++ b/layouts/community/ergodox/dvorak_spanish/keymap.c
@@ -192,13 +192,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->event.pressed) {
                 key_timer = timer_read();
                 register_code(KC_RSFT);
-            } else { 
+            } else {
                 unregister_code(KC_RSFT);
-                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) { 
-                    register_code(KC_RALT); 
-                    register_code(KC_BSLS); 
-                    unregister_code(KC_BSLS); 
-                    unregister_code(KC_RALT); 
+                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
+                    register_code(KC_RALT);
+                    register_code(KC_BSLS);
+                    unregister_code(KC_BSLS);
+                    unregister_code(KC_RALT);
                 }
             }
             break;
@@ -207,13 +207,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->event.pressed) {
                 key_timer = timer_read();
                 register_code(KC_LALT);
-            } else { 
+            } else {
                 unregister_code(KC_LALT);
-                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) { 
-                    register_code(KC_RALT); 
-                    register_code(KC_LBRACKET); 
-                    unregister_code(KC_LBRACKET); 
-                    unregister_code(KC_RALT); 
+                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
+                    register_code(KC_RALT);
+                    register_code(KC_LBRACKET);
+                    unregister_code(KC_LBRACKET);
+                    unregister_code(KC_RALT);
                 }
             }
             break;
@@ -222,13 +222,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->event.pressed) {
                 key_timer = timer_read();
                 register_code(KC_LALT);
-            } else { 
+            } else {
                 unregister_code(KC_LALT);
-                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) { 
-                    register_code(KC_RALT); 
-                    register_code(KC_RBRACKET); 
-                    unregister_code(KC_RBRACKET); 
-                    unregister_code(KC_RALT); 
+                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
+                    register_code(KC_RALT);
+                    register_code(KC_RBRACKET);
+                    unregister_code(KC_RBRACKET);
+                    unregister_code(KC_RALT);
                 }
             }
             break;
@@ -236,7 +236,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         case CAPS: {
             if (record->event.pressed) {
                 register_code(KC_CAPSLOCK);
-            } else { 
+            } else {
                 unregister_code(KC_CAPSLOCK);
             }
             break;
@@ -253,7 +253,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
@@ -270,11 +270,10 @@ void matrix_scan_user(void) {
             // none
             break;
     }
-    
+
     // Turn the caps lock led on
     if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
         ergodox_right_led_1_on();
     }
 
 }
-
diff --git a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
index 3ecef9d9b6..6729dbeeb6 100644
--- a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
+++ b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
@@ -186,7 +186,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/emacs_osx_dk/keymap.c b/layouts/community/ergodox/emacs_osx_dk/keymap.c
index 1de894616b..2c3430c236 100644
--- a/layouts/community/ergodox/emacs_osx_dk/keymap.c
+++ b/layouts/community/ergodox/emacs_osx_dk/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/french_hacker/keymap.c b/layouts/community/ergodox/french_hacker/keymap.c
index 44b0c47860..73e3076475 100644
--- a/layouts/community/ergodox/french_hacker/keymap.c
+++ b/layouts/community/ergodox/french_hacker/keymap.c
@@ -147,7 +147,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/galson/keymap.c b/layouts/community/ergodox/galson/keymap.c
index 2b7994b11d..83c6638d57 100644
--- a/layouts/community/ergodox/galson/keymap.c
+++ b/layouts/community/ergodox/galson/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 /* Keymap 1: Symbol Layer
  *
- * ,--------------------------------------------------. 
+ * ,--------------------------------------------------.
  * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
@@ -157,7 +157,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/german-kinergo/keymap.c b/layouts/community/ergodox/german-kinergo/keymap.c
index 9f8b72596e..eae02d8925 100644
--- a/layouts/community/ergodox/german-kinergo/keymap.c
+++ b/layouts/community/ergodox/german-kinergo/keymap.c
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/german-lukas/keymap.c b/layouts/community/ergodox/german-lukas/keymap.c
index 76a77acdb2..a63a13c12d 100644
--- a/layouts/community/ergodox/german-lukas/keymap.c
+++ b/layouts/community/ergodox/german-lukas/keymap.c
@@ -188,7 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/german-manuneo/compile_keymap.py b/layouts/community/ergodox/german-manuneo/compile_keymap.py
index df5d429842..ae7ff50397 100644
--- a/layouts/community/ergodox/german-manuneo/compile_keymap.py
+++ b/layouts/community/ergodox/german-manuneo/compile_keymap.py
@@ -27,29 +27,34 @@ PY2 = sys.version_info.major == 2
 if PY2:
     chr = unichr
 
-
 KEYBOARD_LAYOUTS = {
     # These map positions in the parsed layout to
     # positions in the LAYOUT_ergodox MATRIX
     'ergodox_ez': [
-        [ 0,  1,  2,  3,  4,  5,  6],  [38, 39, 40, 41, 42, 43, 44],
-        [ 7,  8,  9, 10, 11, 12, 13],  [45, 46, 47, 48, 49, 50, 51],
-        [14, 15, 16, 17, 18, 19    ],  [    52, 53, 54, 55, 56, 57],
-        [20, 21, 22, 23, 24, 25, 26],  [58, 59, 60, 61, 62, 63, 64],
-        [27, 28, 29, 30, 31        ],  [        65, 66, 67, 68, 69],
-        [                    32, 33],  [70, 71                    ],
-        [                        34],  [72                        ],
-        [                35, 36, 37],  [73, 74, 75                ],
+        [0, 1, 2, 3, 4, 5, 6],
+        [38, 39, 40, 41, 42, 43, 44],
+        [7, 8, 9, 10, 11, 12, 13],
+        [45, 46, 47, 48, 49, 50, 51],
+        [14, 15, 16, 17, 18, 19],
+        [52, 53, 54, 55, 56, 57],
+        [20, 21, 22, 23, 24, 25, 26],
+        [58, 59, 60, 61, 62, 63, 64],
+        [27, 28, 29, 30, 31],
+        [65, 66, 67, 68, 69],
+        [32, 33],
+        [70, 71],
+        [34],
+        [72],
+        [35, 36, 37],
+        [73, 74, 75],
     ]
 }
 
-ROW_INDENTS = {
-    'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]
-}
+ROW_INDENTS = {'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]}
 
 BLANK_LAYOUTS = [
-# Compact Layout
-"""
+    # Compact Layout
+    """
 .------------------------------------.------------------------------------.
 |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
 !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
@@ -70,8 +75,8 @@ BLANK_LAYOUTS = [
                   '-----------------' '-----------------'
 """,
 
-# Wide Layout
-"""
+    # Wide Layout
+    """
 .---------------------------------------------. .---------------------------------------------.
 |       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
 !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
@@ -93,26 +98,22 @@ BLANK_LAYOUTS = [
 """,
 ]
 
-
 DEFAULT_CONFIG = {
-    "keymaps_includes": [
-        "keymap_common.h",
-    ],
+    "keymaps_includes": ["keymap_common.h",],
     'filler': "-+.'!:x",
     'separator': "|",
     'default_key_prefix': ["KC_"],
 }
 
-
 SECTIONS = [
     'layout_config',
     'layers',
 ]
 
-
 #       Markdown Parsing
 
-ONELINE_COMMENT_RE = re.compile(r"""
+ONELINE_COMMENT_RE = re.compile(
+    r"""
     ^                       # comment must be at the start of the line
     \s*                     # arbitrary whitespace
     //                      # start of the comment
@@ -121,22 +122,26 @@ ONELINE_COMMENT_RE = re.compile(r"""
 """, re.MULTILINE | re.VERBOSE
 )
 
-INLINE_COMMENT_RE = re.compile(r"""
+INLINE_COMMENT_RE = re.compile(
+    r"""
     ([\,\"\[\]\{\}\d])      # anythig that might end a expression
     \s+                     # comment must be preceded by whitespace
     //                      # start of the comment
     \s                      # and succeded by whitespace
     (?:[^\"\]\}\{\[]*)      # the comment (except things which might be json)
     $                       # until the end of line
-""", re.MULTILINE | re.VERBOSE)
+""", re.MULTILINE | re.VERBOSE
+)
 
-TRAILING_COMMA_RE = re.compile(r"""
+TRAILING_COMMA_RE = re.compile(
+    r"""
     ,                       # the comma
     (?:\s*)                 # arbitrary whitespace
     $                       # only works if the trailing comma is followed by newline
     (\s*)                   # arbitrary whitespace
     ([\]\}])                # end of an array or object
-""", re.MULTILINE | re.VERBOSE)
+""", re.MULTILINE | re.VERBOSE
+)
 
 
 def loads(raw_data):
@@ -178,9 +183,7 @@ def parse_config(path):
     def end_section():
         if section['start_line'] >= 0:
             if section['name'] == 'layout_config':
-                config.update(loads("\n".join(
-                    section['code_lines']
-                )))
+                config.update(loads("\n".join(section['code_lines'])))
             elif section['sub_name'].startswith('layer'):
                 layer_name = section['sub_name']
                 config['layer_lines'][layer_name] = section['code_lines']
@@ -215,6 +218,7 @@ def parse_config(path):
     assert 'layout' in config
     return config
 
+
 #       header file parsing
 
 IF0_RE = re.compile(r"""
@@ -224,7 +228,6 @@ IF0_RE = re.compile(r"""
     #endif
 """, re.MULTILINE | re.DOTALL | re.VERBOSE)
 
-
 COMMENT_RE = re.compile(r"""
     /\*
     .*?
@@ -244,6 +247,7 @@ def regex_partial(re_str_fmt, flags):
     def partial(*args, **kwargs):
         re_str = re_str_fmt.format(*args, **kwargs)
         return re.compile(re_str, flags)
+
     return partial
 
 
@@ -256,7 +260,6 @@ KEYDEF_REP = regex_partial(r"""
     )                   # capture group end
 """, re.MULTILINE | re.DOTALL | re.VERBOSE)
 
-
 ENUM_RE = re.compile(r"""
     (
         enum
@@ -268,7 +271,6 @@ ENUM_RE = re.compile(r"""
     )                   # capture group end
 """, re.MULTILINE | re.DOTALL | re.VERBOSE)
 
-
 ENUM_KEY_REP = regex_partial(r"""
     (
         {}              # the prefixes
@@ -309,14 +311,13 @@ def parse_valid_keys(config, out_path):
         include_path = os.path.join(dirpath, include)
         if os.path.exists(include_path):
             header_data = read_header_file(include_path)
-            valid_keycodes.update(
-                parse_keydefs(config, header_data)
-            )
+            valid_keycodes.update(parse_keydefs(config, header_data))
     return valid_keycodes
 
 
 #       Keymap Parsing
 
+
 def iter_raw_codes(layer_lines, filler, separator):
     filler_re = re.compile("[" + filler + " ]")
     for line in layer_lines:
@@ -346,28 +347,21 @@ LAYER_CHANGE_RE = re.compile(r"""
     (DF|TG|MO)\(\d+\)
 """, re.VERBOSE)
 
-
 MACRO_RE = re.compile(r"""
     M\(\w+\)
 """, re.VERBOSE)
 
-
 UNICODE_RE = re.compile(r"""
     U[0-9A-F]{4}
 """, re.VERBOSE)
 
-
 NON_CODE = re.compile(r"""
     ^[^A-Z0-9_]$
 """, re.VERBOSE)
 
 
 def parse_uni_code(raw_code):
-    macro_id = "UC_" + (
-        unicodedata.name(raw_code)
-        .replace(" ", "_")
-        .replace("-", "_")
-    )
+    macro_id = "UC_" + (unicodedata.name(raw_code).replace(" ", "_").replace("-", "_"))
     code = "M({})".format(macro_id)
     uc_hex = "{:04X}".format(ord(raw_code))
     return code, macro_id, uc_hex
@@ -407,19 +401,13 @@ def parse_code(raw_code, key_prefixes, valid_keycodes):
 
 def parse_keymap(config, key_indexes, layer_lines, valid_keycodes):
     keymap = {}
-    raw_codes = list(iter_raw_codes(
-        layer_lines, config['filler'], config['separator']
-    ))
+    raw_codes = list(iter_raw_codes(layer_lines, config['filler'], config['separator']))
     indexed_codes = iter_indexed_codes(raw_codes, key_indexes)
     key_prefixes = config['key_prefixes']
     for raw_code, key_index, row_index in indexed_codes:
-        code, macro_id, uc_hex = parse_code(
-            raw_code, key_prefixes, valid_keycodes
-        )
+        code, macro_id, uc_hex = parse_code(raw_code, key_prefixes, valid_keycodes)
         # TODO: line numbers for invalid codes
-        err_msg = "Could not parse key '{}' on row {}".format(
-            raw_code, row_index
-        )
+        err_msg = "Could not parse key '{}' on row {}".format(raw_code, row_index)
         assert code is not None, err_msg
         # print(repr(raw_code), repr(code), macro_id, uc_hex)
         if macro_id:
@@ -432,17 +420,14 @@ def parse_keymap(config, key_indexes, layer_lines, valid_keycodes):
 
 def parse_keymaps(config, valid_keycodes):
     keymaps = collections.OrderedDict()
-    key_indexes = config.get(
-        'key_indexes', KEYBOARD_LAYOUTS[config['layout']]
-    )
+    key_indexes = config.get('key_indexes', KEYBOARD_LAYOUTS[config['layout']])
     # TODO: maybe validate key_indexes
 
     for layer_name, layer_lines, in config['layer_lines'].items():
-        keymaps[layer_name] = parse_keymap(
-            config, key_indexes, layer_lines, valid_keycodes
-        )
+        keymaps[layer_name] = parse_keymap(config, key_indexes, layer_lines, valid_keycodes)
     return keymaps
 
+
 #       keymap.c output
 
 USERCODE = """
@@ -453,7 +438,7 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
@@ -572,7 +557,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {{
 }};
 """
 
-
 UNICODE_MACRO_TEMPLATE = """
 case {macro_id}:
     unicode_action_function(0x{hi:02x}, 0x{lo:02x});
@@ -584,9 +568,7 @@ def unicode_macro_cases(config):
     for macro_id, uc_hex in config['unicode_macros'].items():
         hi = int(uc_hex, 16) >> 8
         lo = int(uc_hex, 16) & 0xFF
-        yield UNICODE_MACRO_TEMPLATE.format(
-            macro_id=macro_id, hi=hi, lo=lo
-        )
+        yield UNICODE_MACRO_TEMPLATE.format(macro_id=macro_id, hi=hi, lo=lo)
 
 
 def iter_keymap_lines(keymap, row_indents=None):
diff --git a/layouts/community/ergodox/german-manuneo/keymap.c b/layouts/community/ergodox/german-manuneo/keymap.c
index 9b24df83db..b6217800c3 100644
--- a/layouts/community/ergodox/german-manuneo/keymap.c
+++ b/layouts/community/ergodox/german-manuneo/keymap.c
@@ -741,7 +741,7 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/german/keymap.c b/layouts/community/ergodox/german/keymap.c
index 99dda5185c..150aaf3a73 100644
--- a/layouts/community/ergodox/german/keymap.c
+++ b/layouts/community/ergodox/german/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/haegin/keymap.c b/layouts/community/ergodox/haegin/keymap.c
index c3c2afecb8..cf5db6333b 100644
--- a/layouts/community/ergodox/haegin/keymap.c
+++ b/layouts/community/ergodox/haegin/keymap.c
@@ -226,7 +226,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c
index e9d89d1bbc..8fe2b7e415 100644
--- a/layouts/community/ergodox/ishigoya-jp/keymap.c
+++ b/layouts/community/ergodox/ishigoya-jp/keymap.c
@@ -109,7 +109,7 @@ static uint16_t start;
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
- * 
+ *
  * ,----------------------------------------------------.           ,--------------------------------------------------.
  * | En / 和  |      |   ^  |   %  |      |      |Selall|           | Undo |      |   $  |   @  |   LT |  UP  |   RT   |
  * |----------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
@@ -129,9 +129,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      | Num  |       |  Esc |        |      |
  *                                 `--------------------'       `----------------------'
  *
- * 
+ *
  * tmux prefix set to C-b
- * 
+ *
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
@@ -175,9 +175,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 | shift|  fn  |------|       |------|      |kazari|
  *                                 |      |      | Num  |       |      |      |      |
  *                                 `--------------------'       `--------------------'
- * 
- * 
- * 
+ *
+ *
+ *
  */
 [JP] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -218,14 +218,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |------|       |------|      |      |
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
- * 
- * 
- * 
+ *
+ *
+ *
  */
 [JPXON] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
 	   KC_NO, KC_NO,    M(JPXE),        KC_NO,    M(JPXKE),   KC_NO, KC_NO,
-       KC_NO, KC_NO,    KC_NO,          M(JPXKA),      KC_NO, KC_NO, 
+       KC_NO, KC_NO,    KC_NO,          M(JPXKA),      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,
@@ -261,14 +261,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |------|       |------|      |      |
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
- * 
- * 
- * 
+ *
+ *
+ *
  */
 [JPKAZARI] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
 	   KC_NO, KC_NO,    M(JPGO),        M(JPZA),    M(JPBE), M(JPGE), KC_NO,
-       KC_NO, M(JPDO),    M(JPJI),        M(JPGA),    M(JPGI), M(JPZU), 
+       KC_NO, M(JPDO),    M(JPJI),        M(JPGA),    M(JPGI), M(JPZU),
        KC_NO, KC_NO,    M(JPZO),        M(JPBI),    M(JPDI), KC_NO, KC_NO,
        KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_NO,
                                            KC_NO, KC_NO,
@@ -304,14 +304,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |------|       |------|      |      |
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
- * 
- * 
- * 
+ *
+ *
+ *
  */
 [JPTOPROW] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO,   KC_NO, KC_NO,
 	   KC_NO, KC_NO,    KC_E,       KC_MINS,  M(JPRE), KC_NO, KC_NO,
-       KC_NO, M(JPRA),  M(JPRI),       M(JPNA),  M(JPNO), M(JPMI), 
+       KC_NO, M(JPRA),  M(JPRI),       M(JPNA),  M(JPNO), M(JPMI),
        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,
@@ -348,14 +348,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |------|       |------|      |      |
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
- * 
- * 
- * 
+ *
+ *
+ *
  */
 [JPTRKZ] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    M(JPPE),KC_NO,  KC_NO,
-       KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, 
+       KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO,
        KC_NO, KC_NO,    KC_NO,        M(JPPI),    KC_NO, KC_NO, KC_NO,
        KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_NO,
                                            KC_NO, KC_NO,
@@ -397,7 +397,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // left hand
 	   KC_NO, KC_F1,      KC_F2,          KC_F3,      KC_F4,   KC_F5,   KC_NO,
 	   KC_NO, KC_NO,    KC_NO,        JP_DQUO,   KC_RBRACKET,   KC_BSPC, KC_SCLN,
-       KC_NO, KC_NO,    KC_SLSH,        JP_PLUS,    LSFT(KC_RBRACKET),   JP_RCBR, 
+       KC_NO, KC_NO,    KC_SLSH,        JP_PLUS,    LSFT(KC_RBRACKET),   JP_RCBR,
        KC_NO, KC_NO,    JP_ASTR,        KC_MINS,    LSFT(KC_8), LSFT(KC_9), JP_COLN,
        KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_HASH,
                                            KC_NO, KC_NO,
@@ -417,7 +417,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
-	
+
   // MACRO only works in this function
 	switch(id) {
 		case 0:
@@ -445,9 +445,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 				}
 			}
 			break;
-			
+
 		// kana macros start here
-			
+
 		case JPVU:
 			if (record->event.pressed) {
 				return MACRO( I(1), T(V), T(U), END);
@@ -641,7 +641,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 		case JPDI:
 			if (record->event.pressed) {
 				return MACRO( I(1), T(D), T(I), END);
-			} 
+			}
 			break;
 		case JPZE:
 			if (record->event.pressed) {
@@ -838,9 +838,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 				return MACRO( I(1), T(B), T(U), END);
 			}
 			break;
-			
+
 			// kana macros end here
-			
+
 			break;
 		case SHIFT:
 		if (record->event.pressed) {
@@ -848,8 +848,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			if (layer_state == (1<<JPKAZARI)) {
 				layer_state = (1<<JPTOPROW)| (1<<JPTRKZ);
 			} else {
-				layer_state = (1<<JPTOPROW);							
-			} 
+				layer_state = (1<<JPTOPROW);
+			}
       } else {
 			layer_state = (0<<JPTOPROW);
 			clear_keyboard_but_mods();
@@ -864,8 +864,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			if (layer_state == (1<<JPTOPROW)) {
 				layer_state = (1<<JPKAZARI)| (1<<JPTRKZ);
 			} else {
-				layer_state = (1<<JPKAZARI);							
-			} 
+				layer_state = (1<<JPKAZARI);
+			}
 			break;
       } else {
 		  	layer_state = (0<<JPKAZARI);
@@ -874,7 +874,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
           return MACRO( T(ENTER), END);
         }
       }
-      break;  
+      break;
 		case JPFN:
 			if (record->event.pressed) {
 				start = timer_read();
@@ -917,7 +917,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			break;
 */
 		}
-    return MACRO_NONE;   
+    return MACRO_NONE;
 };
 
 // Runs just one time when the keyboard initializes.
@@ -927,15 +927,15 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-	uint8_t layer = biton32(layer_state);
-   uint8_t deflayer = biton32(default_layer_state);
+	uint8_t layer = get_highest_layer(layer_state);
+   uint8_t deflayer = get_highest_layer(default_layer_state);
 
 	ergodox_board_led_off();
 	ergodox_right_led_1_off();
 	ergodox_right_led_2_off();
 	ergodox_right_led_3_off();
-    
-  
+
+
 	switch (layer) {
 		case 0:
 			//none
diff --git a/layouts/community/ergodox/issmirnov/keymap.c b/layouts/community/ergodox/issmirnov/keymap.c
index b129148b08..2743a04e93 100644
--- a/layouts/community/ergodox/issmirnov/keymap.c
+++ b/layouts/community/ergodox/issmirnov/keymap.c
@@ -125,7 +125,7 @@ _______, _______, KC_LGUI
 
 // called by QMK during key processing before the actual key event is handled. Useful for macros.
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   switch (keycode) {
     case TAP_TOG_LAYER:
       process_tap_tog(_SYMB,record);
@@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 // Runs constantly in the background, in a loop every 100ms or so.
 // Best used for LED status output triggered when user isn't actively typing.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   if (layer == 0) {
     // Set up LED indicators for stuck modifier keys.
     // https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/report.h#L118
@@ -202,7 +202,7 @@ void matrix_scan_user(void) {
 
 // only runs when when the layer is changed, good for updating LED's and clearing sticky state
 layer_state_t layer_state_set_user(layer_state_t state) {
-  uint8_t layer = biton32(state);
+  uint8_t layer = get_highest_layer(state);
 
   ergodox_board_led_off();
   ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/italian/keymap.c b/layouts/community/ergodox/italian/keymap.c
index 64dd51db67..3a81cc213b 100644
--- a/layouts/community/ergodox/italian/keymap.c
+++ b/layouts/community/ergodox/italian/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,                      KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
         KC_TAB,                      KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TT(SYMB),
         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_LALT, 
+        KC_LSFT,                     KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LALT,
         MT(MOD_LGUI,KC_NONUS_BSLASH),KC_PPLS,      KC_PMNS,KC_PAST,MT(MOD_LCTL,KC_PSLS),
                                                            KC_INS,  KC_LGUI,
                                                                     KC_HOME,
@@ -197,7 +197,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/j3rn/keymap.c b/layouts/community/ergodox/j3rn/keymap.c
index 5081ddf527..8ff8db2381 100644
--- a/layouts/community/ergodox/j3rn/keymap.c
+++ b/layouts/community/ergodox/j3rn/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/jackhumbert/keymap.c b/layouts/community/ergodox/jackhumbert/keymap.c
index 9d357881e2..b6d1b33e33 100644
--- a/layouts/community/ergodox/jackhumbert/keymap.c
+++ b/layouts/community/ergodox/jackhumbert/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_NO,     RGB_TOG,   RGB_MOD,   RGB_HUI,   RGB_HUD,   KC_P,             KC_BSPC,
                         RGB_SAI,   RGB_SAD,   RGB_VAI,   RGB_VAD,   KC_SCLN,          KC_QUOT,
              KC_NO,     KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_ENT,
-                                  MO(1), KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,  
+                                  MO(1), KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,
              RGB_TOG,        RGB_HUI,
              RGB_MOD,
              M(2), KC_SPC,KC_SPC
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,  KC_TRNS,
-       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, 
+       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
        KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                        KC_TRNS,KC_TRNS,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
                 KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
        KC_TRNS, KC_F12,  KC_NO,   KC_NO, KC_NO, RESET,   KC_TRNS,
-                         KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, 
+                         KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
@@ -51,9 +51,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS,
-       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  
+       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
        KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                                            KC_TRNS, KC_TRNS,
                                                     KC_TRNS,
                                   KC_TRNS, KC_TRNS, KC_TRNS,
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
                  KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
        KC_TRNS,  KC_F12,  KC_NO,   KC_NO, KC_NO, RESET,   KC_TRNS,
-                          KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, 
+                          KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
@@ -97,7 +97,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/jacobono/keymap.c b/layouts/community/ergodox/jacobono/keymap.c
index e97209fc84..7c5b914872 100644
--- a/layouts/community/ergodox/jacobono/keymap.c
+++ b/layouts/community/ergodox/jacobono/keymap.c
@@ -227,7 +227,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-	uint8_t layer = biton32(layer_state);
+	uint8_t layer = get_highest_layer(layer_state);
 
 	ergodox_board_led_off();
 	ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/jafo/keymap.c b/layouts/community/ergodox/jafo/keymap.c
index b8b8e63517..28c95d6540 100644
--- a/layouts/community/ergodox/jafo/keymap.c
+++ b/layouts/community/ergodox/jafo/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/jgarr/keymap.c b/layouts/community/ergodox/jgarr/keymap.c
index ac4e562263..38eaa5fca0 100644
--- a/layouts/community/ergodox/jgarr/keymap.c
+++ b/layouts/community/ergodox/jgarr/keymap.c
@@ -138,7 +138,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/josh/keymap.c b/layouts/community/ergodox/josh/keymap.c
index 07ee97ec82..3f9d8779e1 100644
--- a/layouts/community/ergodox/josh/keymap.c
+++ b/layouts/community/ergodox/josh/keymap.c
@@ -188,7 +188,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/kastyle/keymap.c b/layouts/community/ergodox/kastyle/keymap.c
index c9789955b3..268080c7dc 100644
--- a/layouts/community/ergodox/kastyle/keymap.c
+++ b/layouts/community/ergodox/kastyle/keymap.c
@@ -1,5 +1,5 @@
 /* Setup to approximate a Kinesis Advantage with an eye to use in a
- * Mac/OSX environment 
+ * Mac/OSX environment
  * This version adds a hand swap feature to flip the keyboard */
 #include QMK_KEYBOARD_H
 #include "debug.h"
@@ -143,7 +143,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/kejadlen/keymap.c b/layouts/community/ergodox/kejadlen/keymap.c
index 6ce209f806..92a667dec0 100644
--- a/layouts/community/ergodox/kejadlen/keymap.c
+++ b/layouts/community/ergodox/kejadlen/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/kines-ish/keymap.c b/layouts/community/ergodox/kines-ish/keymap.c
index 2d1513667f..718bf6cee1 100644
--- a/layouts/community/ergodox/kines-ish/keymap.c
+++ b/layouts/community/ergodox/kines-ish/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c
index 3fdccb790a..3f84823b99 100644
--- a/layouts/community/ergodox/kristian/keymap.c
+++ b/layouts/community/ergodox/kristian/keymap.c
@@ -35,7 +35,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/maz/keymap.c b/layouts/community/ergodox/maz/keymap.c
index 3244f2152d..4d313dee43 100644
--- a/layouts/community/ergodox/maz/keymap.c
+++ b/layouts/community/ergodox/maz/keymap.c
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/mclennon_osx/keymap.c b/layouts/community/ergodox/mclennon_osx/keymap.c
index 72e9d505a1..ae67d8fb40 100644
--- a/layouts/community/ergodox/mclennon_osx/keymap.c
+++ b/layouts/community/ergodox/mclennon_osx/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c
index f4340b8e1b..c780c1a9fb 100644
--- a/layouts/community/ergodox/meagerfindings/keymap.c
+++ b/layouts/community/ergodox/meagerfindings/keymap.c
@@ -538,7 +538,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   ergodox_board_led_off();
   ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/msc/keymap.c b/layouts/community/ergodox/msc/keymap.c
index 5d9de3239b..62d18798dd 100644
--- a/layouts/community/ergodox/msc/keymap.c
+++ b/layouts/community/ergodox/msc/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/naps62/keymap.c b/layouts/community/ergodox/naps62/keymap.c
index 230b3376b2..fe6289097b 100644
--- a/layouts/community/ergodox/naps62/keymap.c
+++ b/layouts/community/ergodox/naps62/keymap.c
@@ -141,7 +141,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c
index 7c91b3fbb0..7c57820c43 100644
--- a/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c
+++ b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c
@@ -5,7 +5,7 @@
 #define UM 0
 
 #define L0   0      // layer_0
-#define L1   1      // layer_1  
+#define L1   1      // layer_1
 #define L2   2      // layer_2
 #define L3   3      // layer_3
 #define L4   4      // layer_4
@@ -344,7 +344,7 @@ void unicode_action_function(uint16_t hi, uint16_t lo) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/osx_de/keymap.c b/layouts/community/ergodox/osx_de/keymap.c
index 5c3d7e49ea..cbbfc42280 100644
--- a/layouts/community/ergodox/osx_de/keymap.c
+++ b/layouts/community/ergodox/osx_de/keymap.c
@@ -31,117 +31,117 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE]=LAYOUT_ergodox(
 //left half
-    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(M_CTL_SFT_HASH), 
-    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI, 
-    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G, 
-    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT, 
-                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), KC_UP, KC_DOWN, 
-                                              M(M_MEH_SH_ACUT), TG(MDIA), 
-                                                     KC_HOME, 
-                                       KC_BSPC, KC_DEL, LT(SMLY,KC_END), 
+    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(M_CTL_SFT_HASH),
+    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,
+    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,
+    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,
+                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), KC_UP, KC_DOWN,
+                                              M(M_MEH_SH_ACUT), TG(MDIA),
+                                                     KC_HOME,
+                                       KC_BSPC, KC_DEL, LT(SMLY,KC_END),
     //right half
-    M(M_CTL_SFT_HASH), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS, 
-    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA, 
-           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA), 
-    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT, 
-                         KC_LEFT, KC_RIGHT, LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS), 
-    TG(NUMB), ALL_T(DE_ACUT), 
-    KC_PGUP, 
+    M(M_CTL_SFT_HASH), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,
+    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,
+           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),
+    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,
+                         KC_LEFT, KC_RIGHT, LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),
+    TG(NUMB), ALL_T(DE_ACUT),
+    KC_PGUP,
     KC_PGDN, KC_ENT, KC_SPC),
 [SYMB]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, 
-    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS, 
-    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT, 
-    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_DEL, KC_TRNS, 
+    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
+    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS,
+    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,
+    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                       KC_TRNS, KC_DEL, KC_TRNS,
     //right half
-    M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_LABK, DE_RABK, DE_EXLM, 
-           DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), DE_HASH, 
-    KC_TRNS, DE_PIPE, DE_TILD, DE_CIRC, KC_UP, DE_MINS, LSFT(KC_4), 
-                         DE_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, 
-    KC_F13, KC_F12, 
-    KC_F14, 
+    M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_LABK, DE_RABK, DE_EXLM,
+           DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), DE_HASH,
+    KC_TRNS, DE_PIPE, DE_TILD, DE_CIRC, KC_UP, DE_MINS, LSFT(KC_4),
+                         DE_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
+    KC_F13, KC_F12,
+    KC_F14,
     KC_F15, KC_TRNS, KC_TRNS),
 [MDIA]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, 
-    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
+    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                       KC_TRNS, KC_TRNS, KC_TRNS,
     //right half
-    KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-           KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS, 
-                         KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+           KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_WBAK),
 [SMLY]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                       KC_TRNS, KC_TRNS, KC_TRNS,
     //right half
-    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS, 
-           M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,
+           M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 [NUMB]=LAYOUT_ergodox(
 //left half
-    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_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, 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,
     //right half
-    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-    KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12, 
-           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_MINS, 
-    KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS, 
-                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+    KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12,
+           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_MINS,
+    KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS,
+                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 [EGOS]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                  KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_F1, KC_F2, 
-                                                     KC_F3, 
-                                       KC_SPC, KC_LCTL, KC_F4, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_F1, KC_F2,
+                                                     KC_F3,
+                                       KC_SPC, KC_LCTL, KC_F4,
     //right half
-    M(M_TOGGLE_5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    M(M_TOGGLE_5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
@@ -318,7 +318,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-uint8_t layer = biton32(layer_state);
+uint8_t layer = get_highest_layer(layer_state);
 
 ergodox_board_led_off();
 ergodox_right_led_1_off();
@@ -328,22 +328,22 @@ switch (layer) {
 
     case SYMB:
         ergodox_right_led_1_on();
-        
-        
+
+
         break;
     case MDIA:
-        
+
         ergodox_right_led_2_on();
-        
+
         break;
     case SMLY:
-        
-        
+
+
         ergodox_right_led_3_on();
         break;
     case NUMB:
         ergodox_right_led_1_on();
-        
+
         ergodox_right_led_3_on();
         break;
     case EGOS:
@@ -357,4 +357,3 @@ break;
 }
 
 };
-
diff --git a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
index b8ffc2e51f..cd09d066a6 100644
--- a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
+++ b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
@@ -27,105 +27,105 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE]=LAYOUT_ergodox(
 //left half
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL, 
-    KC_TAB, KC_K, KC_DOT, KC_O, KC_COMM, KC_Z, KC_LGUI, 
-    TG(QWERTZ), KC_H, KC_A, KC_E, KC_I, KC_U, 
-    KC_LSFT, CTL_T(KC_X), KC_Q, DE_ADIA, DE_UDIA, DE_ODIA, KC_LALT, 
-                  LT(SYMB,KC_GRV), DE_LABK, LALT(KC_LSFT), KC_LEFT, KC_RGHT, 
-                                              TG(MDIA), MEH_T(LSFT(DE_ACUT)), 
-                                                     KC_HOME, 
-                                       KC_BSPC, KC_DEL, KC_END, 
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL,
+    KC_TAB, KC_K, KC_DOT, KC_O, KC_COMM, KC_Z, KC_LGUI,
+    TG(QWERTZ), KC_H, KC_A, KC_E, KC_I, KC_U,
+    KC_LSFT, CTL_T(KC_X), KC_Q, DE_ADIA, DE_UDIA, DE_ODIA, KC_LALT,
+                  LT(SYMB,KC_GRV), DE_LABK, LALT(KC_LSFT), KC_LEFT, KC_RGHT,
+                                              TG(MDIA), MEH_T(LSFT(DE_ACUT)),
+                                                     KC_HOME,
+                                       KC_BSPC, KC_DEL, KC_END,
     //right half
-    KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, DE_MINS, 
-    KC_RGUI, KC_V, KC_G, KC_C, KC_L, KC_MINS, KC_Y, 
-           KC_D, KC_T, KC_R, KC_N, KC_S, LT(MDIA,KC_F), 
-    KC_RALT, KC_B, KC_P, KC_W, KC_M, CTL_T(KC_J), KC_RSFT, 
-                         KC_UP, KC_DOWN, LGUI(KC_LSFT), KC_RBRC, LT(SYMB,KC_BSLS), 
-    ALL_T(DE_ACUT), TG(NUMB), 
-    KC_PGUP, 
+    KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, DE_MINS,
+    KC_RGUI, KC_V, KC_G, KC_C, KC_L, KC_MINS, KC_Y,
+           KC_D, KC_T, KC_R, KC_N, KC_S, LT(MDIA,KC_F),
+    KC_RALT, KC_B, KC_P, KC_W, KC_M, CTL_T(KC_J), KC_RSFT,
+                         KC_UP, KC_DOWN, LGUI(KC_LSFT), KC_RBRC, LT(SYMB,KC_BSLS),
+    ALL_T(DE_ACUT), TG(NUMB),
+    KC_PGUP,
     KC_PGDN, KC_ENT, KC_SPC),
 [SYMB]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, 
-    KC_TRNS, KC_GRV, LSFT(KC_GRV), DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS, 
-    KC_TRNS, DE_HASH, DE_DLR, LALT(LSFT(KC_7)), DE_SLSH, KC_DOT, 
-    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, LALT(KC_7), LALT(KC_N), KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_DEL, KC_TRNS, 
+    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
+    KC_TRNS, KC_GRV, LSFT(KC_GRV), DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS,
+    KC_TRNS, DE_HASH, DE_DLR, LALT(LSFT(KC_7)), DE_SLSH, KC_DOT,
+    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, LALT(KC_7), LALT(KC_N), KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                       KC_TRNS, KC_DEL, KC_TRNS,
     //right half
-    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), LALT(KC_7), DE_HASH, KC_F12, 
-           DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), KC_TRNS, 
-    KC_TRNS, DE_AMPR, KC_GRV, LSFT(KC_GRV), DE_DQUO, DE_QUOT, DE_QUES, 
-                         KC_TRNS, KC_DOT, KC_EXLM, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), LALT(KC_7), DE_HASH, KC_F12,
+           DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), KC_TRNS,
+    KC_TRNS, DE_AMPR, KC_GRV, LSFT(KC_GRV), DE_DQUO, DE_QUOT, DE_QUES,
+                         KC_TRNS, KC_DOT, KC_EXLM, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 [MDIA]=LAYOUT_ergodox(
 //left half
-    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_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_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_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_BTN3, 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 half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_MUTE, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS, 
-                         KC_VOLU, KC_VOLD, 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_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_MUTE, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS,
+                         KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_RIGHT,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_WBAK),
 [QWERTZ]=LAYOUT_ergodox(
 //left half
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LGUI(KC_V), 
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LGUI, 
-    KC_TRNS, KC_A, KC_S, KC_D, KC_F, KC_G, 
-    KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LALT, 
-                  LT(SYMB,KC_GRV), DE_LABK, LALT(KC_LSFT), KC_LEFT, KC_RGHT, 
-                                              KC_TRNS, MEH_T(LSFT(DE_ACUT)), 
-                                                     KC_HOME, 
-                                       KC_BSPC, KC_DEL, KC_END, 
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LGUI(KC_V),
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LGUI,
+    KC_TRNS, KC_A, KC_S, KC_D, KC_F, KC_G,
+    KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LALT,
+                  LT(SYMB,KC_GRV), DE_LABK, LALT(KC_LSFT), KC_LEFT, KC_RGHT,
+                                              KC_TRNS, MEH_T(LSFT(DE_ACUT)),
+                                                     KC_HOME,
+                                       KC_BSPC, KC_DEL, KC_END,
     //right half
-    LGUI(KC_C), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 
-    KC_RGUI, KC_Y, KC_U, KC_I, KC_O, KC_P, DE_UDIA, 
-           KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(MDIA,DE_ADIA), 
-    KC_RALT, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT, 
-                         KC_UP, KC_DOWN, LGUI(KC_LSFT), KC_RBRC, LT(SYMB,KC_BSLS), 
-    ALL_T(DE_ACUT), KC_TRNS, 
-    KC_PGUP, 
+    LGUI(KC_C), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+    KC_RGUI, KC_Y, KC_U, KC_I, KC_O, KC_P, DE_UDIA,
+           KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(MDIA,DE_ADIA),
+    KC_RALT, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
+                         KC_UP, KC_DOWN, LGUI(KC_LSFT), KC_RBRC, LT(SYMB,KC_BSLS),
+    ALL_T(DE_ACUT), KC_TRNS,
+    KC_PGUP,
     KC_PGDN, KC_ENT, KC_SPC),
 [NUMB]=LAYOUT_ergodox(
 //left half
-    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_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, 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,
     //right half
-    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-    KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12, 
-           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, KC_TRNS, 
-    KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS, 
-                         KC_0, KC_DOT, KC_0, KC_EQL, KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+    KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12,
+           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, KC_TRNS,
+    KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS,
+                         KC_0, KC_DOT, KC_0, KC_EQL, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-uint8_t layer = biton32(layer_state);
+uint8_t layer = get_highest_layer(layer_state);
 
 ergodox_board_led_off();
 ergodox_right_led_1_off();
@@ -139,4 +139,3 @@ break;
 }
 
 };
-
diff --git a/layouts/community/ergodox/osx_de_experimental/keymap.c b/layouts/community/ergodox/osx_de_experimental/keymap.c
index 8228b5e371..faf238726f 100644
--- a/layouts/community/ergodox/osx_de_experimental/keymap.c
+++ b/layouts/community/ergodox/osx_de_experimental/keymap.c
@@ -66,315 +66,315 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /**
 * Layer: BASE
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                       
-* | ESC                | 1                  | 2                  | 3                  | 4                  | 5                  | Hold or toggle     |                       | Hold or toggle     | 6                  | 7                  | 8                  | 9                  | 0                  | ß                  |                      
-* |                    |                    |                    |                    |                    |                    | Layer NUMB         |                       | Layer MDIA         |                    |                    |                    |                    |                    |                    |                      
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                       
-* | TAB                | Q                  | W                  | E                  | R                  | T                  | Cmd                |                       | Cmd                | Z                  | U                  | I                  | O                  | P                  | Ü                  |                      
-* |                    |                    |                    |                    |                    |                    |                    |                       |                    |                    |                    |                    |                    |                    |                    |                      
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/\-------------------\                        \-------------------\/-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                       
-* | Alt                | A                  | S                  | D                  | F                  | G                  |                                                                 | H                  | J                  | K                  | L                  | Ö                  | Ä                  |                      
-* |                    |                    |                    |                    |                    |                    |                                                                 |                    |                    |                    |                    |                    | ALT                |                      
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                       
-* | Shift              | Y                  | X                  | C                  | V                  | B                  | Alt                |                       | Alt                | N                  | M                  | ,                  | .                  | -                  | Shift              |                      
-* |                    | Ctrl               |                    |                    |                    |                    |                    |                       |                    |                    |                    |                    |                    | Ctrl               |                    |                      
-* \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\                        \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\                       
-*                                                                                                                                                                                                                                                                                                                                                      
-*                                                                                                                                                                                                                                                                                                                                                      
-*                                           /-------------------//-------------------//-------------------//-------------------//-------------------/                                                                                       /-------------------//-------------------//-------------------//-------------------//-------------------/  
-*                                           | <                  | LongPress / Type   | LongPress / Type   | Shift+Ctrl         | Type               |                                                                                      | #                  | ACUT               | CMD+Shift          | ALT+Shift          | +                  | 
-*                                           | SYMB               | DE_CIRC_CTRLCMD    | DE_PLUS_CTRAlt     |                    | Toggle SMLY        |                                                                                      | Meh                | Hyper              |                    |                    | SYMB               | 
-*                                           \-------------------\\-------------------\\-------------------\\-------------------\/-------------------//-------------------/   /-------------------//-------------------/                     \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\  
-*                                                                                                                               | HOME               | END                |  | LEFT               | RIGHT              |                                                                                                                               
-*                                                                                                                               |                    |                    |  |                    |                    |                                                                                                                               
-*                                                                                                                               \-------------------\/-------------------/   /-------------------/\-------------------\                                                                                                                                
-*                                                                                                                                                    | PGUP               |  | UP                 |                                                                                                                                                    
-*                                                                                                                                                    |                    |  |                    |                                                                                                                                                    
-*                                                                                                          /-------------------//-------------------//-------------------/   /-------------------//-------------------//-------------------/                                                                                                           
-*                                                                                                          | BSPC               | DEL                | PGDN               |  | DOWN               | ENT                | SPC                |                                                                                                          
-*                                                                                                          |                    |                    |                    |  |                    |                    |                    |                                                                                                          
-*                                                                                                          \-------------------\\-------------------\\-------------------\   \-------------------\\-------------------\\-------------------\                                                                                                           
-*                                                                                                                                                                                                                                                                                                                                                      
-* 
+* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
+* | ESC                | 1                  | 2                  | 3                  | 4                  | 5                  | Hold or toggle     |                       | Hold or toggle     | 6                  | 7                  | 8                  | 9                  | 0                  | ß                  |
+* |                    |                    |                    |                    |                    |                    | Layer NUMB         |                       | Layer MDIA         |                    |                    |                    |                    |                    |                    |
+* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
+* | TAB                | Q                  | W                  | E                  | R                  | T                  | Cmd                |                       | Cmd                | Z                  | U                  | I                  | O                  | P                  | Ü                  |
+* |                    |                    |                    |                    |                    |                    |                    |                       |                    |                    |                    |                    |                    |                    |                    |
+* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/\-------------------\                        \-------------------\/-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
+* | Alt                | A                  | S                  | D                  | F                  | G                  |                                                                 | H                  | J                  | K                  | L                  | Ö                  | Ä                  |
+* |                    |                    |                    |                    |                    |                    |                                                                 |                    |                    |                    |                    |                    | ALT                |
+* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
+* | Shift              | Y                  | X                  | C                  | V                  | B                  | Alt                |                       | Alt                | N                  | M                  | ,                  | .                  | -                  | Shift              |
+* |                    | Ctrl               |                    |                    |                    |                    |                    |                       |                    |                    |                    |                    |                    | Ctrl               |                    |
+* \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\                        \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\
+*
+*
+*                                           /-------------------//-------------------//-------------------//-------------------//-------------------/                                                                                       /-------------------//-------------------//-------------------//-------------------//-------------------/
+*                                           | <                  | LongPress / Type   | LongPress / Type   | Shift+Ctrl         | Type               |                                                                                      | #                  | ACUT               | CMD+Shift          | ALT+Shift          | +                  |
+*                                           | SYMB               | DE_CIRC_CTRLCMD    | DE_PLUS_CTRAlt     |                    | Toggle SMLY        |                                                                                      | Meh                | Hyper              |                    |                    | SYMB               |
+*                                           \-------------------\\-------------------\\-------------------\\-------------------\/-------------------//-------------------/   /-------------------//-------------------/                     \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\
+*                                                                                                                               | HOME               | END                |  | LEFT               | RIGHT              |
+*                                                                                                                               |                    |                    |  |                    |                    |
+*                                                                                                                               \-------------------\/-------------------/   /-------------------/\-------------------\
+*                                                                                                                                                    | PGUP               |  | UP                 |
+*                                                                                                                                                    |                    |  |                    |
+*                                                                                                          /-------------------//-------------------//-------------------/   /-------------------//-------------------//-------------------/
+*                                                                                                          | BSPC               | DEL                | PGDN               |  | DOWN               | ENT                | SPC                |
+*                                                                                                          |                    |                    |                    |  |                    |                    |                    |
+*                                                                                                          \-------------------\\-------------------\\-------------------\   \-------------------\\-------------------\\-------------------\
+*
+*
 **/
 [BASE]=LAYOUT_ergodox(
 //left half
-    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(TGH_NUM), 
-    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI, 
-    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G, 
-    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT, 
-                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), LSFT(KC_LCTRL), M(SMLY_TOG_QUOT), 
-                                              KC_HOME, KC_END, 
-                                                     KC_PGUP, 
-                                       KC_BSPC, KC_DEL, KC_PGDN, 
+    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(TGH_NUM),
+    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,
+    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,
+    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,
+                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), LSFT(KC_LCTRL), M(SMLY_TOG_QUOT),
+                                              KC_HOME, KC_END,
+                                                     KC_PGUP,
+                                       KC_BSPC, KC_DEL, KC_PGDN,
     //right half
-    M(TOG_HLD_MDIA), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS, 
-    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA, 
-           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA), 
-    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT, 
-                         MEH_T(DE_HASH), ALL_T(DE_ACUT), LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS), 
-    KC_LEFT, KC_RIGHT, 
-    KC_UP, 
+    M(TOG_HLD_MDIA), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,
+    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,
+           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),
+    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,
+                         MEH_T(DE_HASH), ALL_T(DE_ACUT), LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),
+    KC_LEFT, KC_RIGHT,
+    KC_UP,
     KC_DOWN, KC_ENT, KC_SPC),
 /**
 * Layer: SYMB
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/               
-* | APPLICATION| F1         | F2         | F3         | F4         | F5         | F5         |               | F6         | F6         | F7         | F8         | F9         | F10        | F11        |              
-* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |              
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/               
-* |            | <          | >          | !          | ?          |            |            |               |            | \          | [          | ]          | <          | >          | !          |              
-* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |              
-* /-----------//-----------//-----------//-----------//-----------//-----------/\-----------\                \-----------\/-----------//-----------//-----------//-----------//-----------//-----------/               
-* |            | #          | $          | \          | /          | .          |                                         | /          | (          | )          | {          | }          | #          |              
-* |            |            |            |            |            |            |                                         |            |            |            |            |            |            |              
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/               
-* |            |            | <          | %          | |          | ~          |            |               |            | |          | ~          |            |            |            |            |              
-* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |              
-* \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\                \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\               
-*                                                                                                                                                                                                                      
-*                                                                                                                                                                                                                      
-*                           /-----------//-----------//-----------//-----------//-----------/                                                       /-----------//-----------//-----------//-----------//-----------/  
-*                           |            |            |            |            |            |                                                      | '          | DQOT       |            | Toggle 5   |            | 
-*                           |            |            |            |            |            |                                                      |            |            |            |            |            | 
-*                           \-----------\\-----------\\-----------\\-----------\/-----------//-----------/   /-----------//-----------/             \-----------\\-----------\\-----------\\-----------\\-----------\  
-*                                                                               |            |            |  | F13        | F12        |                                                                               
-*                                                                               |            |            |  |            |            |                                                                               
-*                                                                               \-----------\/-----------/   /-----------/\-----------\                                                                                
-*                                                                                            |            |  | F14        |                                                                                            
-*                                                                                            |            |  |            |                                                                                            
-*                                                                  /-----------//-----------//-----------/   /-----------//-----------//-----------/                                                                   
-*                                                                  |            | DEL        |            |  | F15        |            |            |                                                                  
-*                                                                  |            |            |            |  |            |            |            |                                                                  
-*                                                                  \-----------\\-----------\\-----------\   \-----------\\-----------\\-----------\                                                                   
-*                                                                                                                                                                                                                      
-* 
+* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
+* | APPLICATION| F1         | F2         | F3         | F4         | F5         | F5         |               | F6         | F6         | F7         | F8         | F9         | F10        | F11        |
+* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |
+* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
+* |            | <          | >          | !          | ?          |            |            |               |            | \          | [          | ]          | <          | >          | !          |
+* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |
+* /-----------//-----------//-----------//-----------//-----------//-----------/\-----------\                \-----------\/-----------//-----------//-----------//-----------//-----------//-----------/
+* |            | #          | $          | \          | /          | .          |                                         | /          | (          | )          | {          | }          | #          |
+* |            |            |            |            |            |            |                                         |            |            |            |            |            |            |
+* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
+* |            |            | <          | %          | |          | ~          |            |               |            | |          | ~          |            |            |            |            |
+* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |
+* \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\                \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\
+*
+*
+*                           /-----------//-----------//-----------//-----------//-----------/                                                       /-----------//-----------//-----------//-----------//-----------/
+*                           |            |            |            |            |            |                                                      | '          | DQOT       |            | Toggle 5   |            |
+*                           |            |            |            |            |            |                                                      |            |            |            |            |            |
+*                           \-----------\\-----------\\-----------\\-----------\/-----------//-----------/   /-----------//-----------/             \-----------\\-----------\\-----------\\-----------\\-----------\
+*                                                                               |            |            |  | F13        | F12        |
+*                                                                               |            |            |  |            |            |
+*                                                                               \-----------\/-----------/   /-----------/\-----------\
+*                                                                                            |            |  | F14        |
+*                                                                                            |            |  |            |
+*                                                                  /-----------//-----------//-----------/   /-----------//-----------//-----------/
+*                                                                  |            | DEL        |            |  | F15        |            |            |
+*                                                                  |            |            |            |  |            |            |            |
+*                                                                  \-----------\\-----------\\-----------\   \-----------\\-----------\\-----------\
+*
+*
 **/
 [SYMB]=LAYOUT_ergodox(
 //left half
-    KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, 
-    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QST, KC_TRNS, KC_TRNS, 
-    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT, 
-    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_DEL, KC_TRNS, 
+    KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5,
+    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QST, KC_TRNS, KC_TRNS,
+    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,
+    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                       KC_TRNS, KC_DEL, KC_TRNS,
     //right half
-    KC_F6, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-    KC_TRNS, DE_BSLS, DE_LBRC, DE_RBRC, DE_LABK, DE_RABK, DE_EXLM, 
-           DE_SLSH, DE_LPRN, DE_RPRN, DE_LCBR, DE_RCBR, DE_HASH, 
-    KC_TRNS, DE_PIPE, DE_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                         DE_QUOT, DE_DQUO, KC_TRNS, M(M_TOGGLE_5), KC_TRNS, 
-    KC_F13, KC_F12, 
-    KC_F14, 
+    KC_F6, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+    KC_TRNS, DE_BSLS, DE_LBRC, DE_RBRC, DE_LABK, DE_RABK, DE_EXLM,
+           DE_SLSH, DE_LPRN, DE_RPRN, DE_LCBR, DE_RCBR, DE_HASH,
+    KC_TRNS, DE_PIPE, DE_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         DE_QUOT, DE_DQUO, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,
+    KC_F13, KC_F12,
+    KC_F14,
     KC_F15, KC_TRNS, KC_TRNS),
 /**
 * Layer: MDIA
-* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/         
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |        
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |        
-* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/         
-* |      |      | BTN1 | U    | BTN2 | U    |      |         |      |      |      |      |      |      |      |        
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |        
-* /-----//-----//-----//-----//-----//-----/\-----\          \-----\/-----//-----//-----//-----//-----//-----/         
-* |      |      | L    | D    | R    | D    |                       |      |      |      |      |      |      |        
-* |      |      |      |      |      |      |                       |      |      |      |      |      |      |        
-* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/         
-* |      |      | L    | D    | R    | BTN3 |      |         |      |      |      |      |      | UP   |      |        
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |        
-* \-----\\-----\\-----\\-----\\-----\\-----\\-----\          \-----\\-----\\-----\\-----\\-----\\-----\\-----\         
-*                                                                                                                      
-*                                                                                                                      
-*               /-----//-----//-----//-----//-----/                               /-----//-----//-----//-----//-----/  
-*               |      |      |      |      |      |                              |      |      | LEFT | DOWN | RIGHT| 
-*               |      |      |      |      |      |                              |      |      |      |      |      | 
-*               \-----\\-----\\-----\\-----\/-----//-----/   /-----//-----/       \-----\\-----\\-----\\-----\\-----\  
-*                                           |      |      |  | MPRV | MNXT |                                           
-*                                           |      |      |  |      |      |                                           
-*                                           \-----\/-----/   /-----/\-----\                                            
-*                                                  |      |  | VOLU |                                                  
-*                                                  |      |  |      |                                                  
-*                                    /-----//-----//-----/   /-----//-----//-----/                                     
-*                                    |      |      |      |  | VOLD | MUTE | MPLY |                                    
-*                                    |      |      |      |  |      |      |      |                                    
-*                                    \-----\\-----\\-----\   \-----\\-----\\-----\                                     
-*                                                                                                                      
-* 
+* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/
+* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
+* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
+* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/
+* |      |      | BTN1 | U    | BTN2 | U    |      |         |      |      |      |      |      |      |      |
+* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
+* /-----//-----//-----//-----//-----//-----/\-----\          \-----\/-----//-----//-----//-----//-----//-----/
+* |      |      | L    | D    | R    | D    |                       |      |      |      |      |      |      |
+* |      |      |      |      |      |      |                       |      |      |      |      |      |      |
+* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/
+* |      |      | L    | D    | R    | BTN3 |      |         |      |      |      |      |      | UP   |      |
+* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
+* \-----\\-----\\-----\\-----\\-----\\-----\\-----\          \-----\\-----\\-----\\-----\\-----\\-----\\-----\
+*
+*
+*               /-----//-----//-----//-----//-----/                               /-----//-----//-----//-----//-----/
+*               |      |      |      |      |      |                              |      |      | LEFT | DOWN | RIGHT|
+*               |      |      |      |      |      |                              |      |      |      |      |      |
+*               \-----\\-----\\-----\\-----\/-----//-----/   /-----//-----/       \-----\\-----\\-----\\-----\\-----\
+*                                           |      |      |  | MPRV | MNXT |
+*                                           |      |      |  |      |      |
+*                                           \-----\/-----/   /-----/\-----\
+*                                                  |      |  | VOLU |
+*                                                  |      |  |      |
+*                                    /-----//-----//-----/   /-----//-----//-----/
+*                                    |      |      |      |  | VOLD | MUTE | MPLY |
+*                                    |      |      |      |  |      |      |      |
+*                                    \-----\\-----\\-----\   \-----\\-----\\-----\
+*
+*
 **/
 [MDIA]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, 
-    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
+    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                       KC_TRNS, KC_TRNS, KC_TRNS,
     //right half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, 
-                         KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, 
-    KC_MPRV, KC_MNXT, 
-    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_UP, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,
+    KC_MPRV, KC_MNXT,
+    KC_VOLU,
     KC_VOLD, KC_MUTE, KC_MPLY),
 /**
 * Layer: SMLY
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/            
-* |         |         |         |         |         |         |         |            | Typing  | Typing  | Typing  |         |         |         |         |           
-* |         |         |         |         |         |         |         |            | SM_SMILE| SM_SMIRK| SM_LAUGH|         |         |         |         |           
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/            
-* |         |         |         |         |         |         |         |            |         | Typing  | Typing  | Typing  |         |         |         |           
-* |         |         |         |         |         |         |         |            |         | SM_FROWN| SM_SAD  | SM_CRY  |         |         |         |           
-* /--------//--------//--------//--------//--------//--------/\--------\             \--------\/--------//--------//--------//--------//--------//--------/            
-* |         |         |         |         |         |         |                                | Typing  | Typing  |         |         |         |         |           
-* |         |         |         |         |         |         |                                | SM_HEART| SM_KISS |         |         |         |         |           
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/            
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* \--------\\--------\\--------\\--------\\--------\\--------\\--------\             \--------\\--------\\--------\\--------\\--------\\--------\\--------\            
-*                                                                                                                                                                      
-*                                                                                                                                                                      
-*                     /--------//--------//--------//--------//--------/                                           /--------//--------//--------//--------//--------/  
-*                     |         |         |         |         |         |                                          |         |         |         |         |         | 
-*                     |         |         |         |         |         |                                          |         |         |         |         |         | 
-*                     \--------\\--------\\--------\\--------\/--------//--------/   /--------//--------/          \--------\\--------\\--------\\--------\\--------\  
-*                                                             |         |         |  |         |         |                                                             
-*                                                             |         |         |  |         |         |                                                             
-*                                                             \--------\/--------/   /--------/\--------\                                                              
-*                                                                       |         |  |         |                                                                       
-*                                                                       |         |  |         |                                                                       
-*                                                   /--------//--------//--------/   /--------//--------//--------/                                                    
-*                                                   |         |         |         |  |         |         |         |                                                   
-*                                                   |         |         |         |  |         |         |         |                                                   
-*                                                   \--------\\--------\\--------\   \--------\\--------\\--------\                                                    
-*                                                                                                                                                                      
-* 
+* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
+* |         |         |         |         |         |         |         |            | Typing  | Typing  | Typing  |         |         |         |         |
+* |         |         |         |         |         |         |         |            | SM_SMILE| SM_SMIRK| SM_LAUGH|         |         |         |         |
+* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
+* |         |         |         |         |         |         |         |            |         | Typing  | Typing  | Typing  |         |         |         |
+* |         |         |         |         |         |         |         |            |         | SM_FROWN| SM_SAD  | SM_CRY  |         |         |         |
+* /--------//--------//--------//--------//--------//--------/\--------\             \--------\/--------//--------//--------//--------//--------//--------/
+* |         |         |         |         |         |         |                                | Typing  | Typing  |         |         |         |         |
+* |         |         |         |         |         |         |                                | SM_HEART| SM_KISS |         |         |         |         |
+* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* \--------\\--------\\--------\\--------\\--------\\--------\\--------\             \--------\\--------\\--------\\--------\\--------\\--------\\--------\
+*
+*
+*                     /--------//--------//--------//--------//--------/                                           /--------//--------//--------//--------//--------/
+*                     |         |         |         |         |         |                                          |         |         |         |         |         |
+*                     |         |         |         |         |         |                                          |         |         |         |         |         |
+*                     \--------\\--------\\--------\\--------\/--------//--------/   /--------//--------/          \--------\\--------\\--------\\--------\\--------\
+*                                                             |         |         |  |         |         |
+*                                                             |         |         |  |         |         |
+*                                                             \--------\/--------/   /--------/\--------\
+*                                                                       |         |  |         |
+*                                                                       |         |  |         |
+*                                                   /--------//--------//--------/   /--------//--------//--------/
+*                                                   |         |         |         |  |         |         |         |
+*                                                   |         |         |         |  |         |         |         |
+*                                                   \--------\\--------\\--------\   \--------\\--------\\--------\
+*
+*
 **/
 [SMLY]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                       KC_TRNS, KC_TRNS, KC_TRNS,
     //right half
-    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS, 
-           M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,
+           M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 /**
 * Layer: NUMB
-* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/        
-* |     |     |     |     |     |     |     |        |     | F6  | F7  | F8  | F9  | F10 | F11 |       
-* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |       
-* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/        
-* |     |     |     | UP  |     |     |     |        |     | /   | 7   | 8   | 9   | *   | F12 |       
-* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |       
-* /----//----//----//----//----//----/\----\         \----\/----//----//----//----//----//----/        
-* |     |     | LEFT| DOWN| RGHT|     |                    | /   | 4   | 5   | 6   | +   | -   |       
-* |     |     |     |     |     |     |                    |     |     |     |     |     |     |       
-* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/        
-* |     |     |     |     |     |     |     |        |     | %   | 1   | 2   | 3   |     |     |       
-* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |       
-* \----\\----\\----\\----\\----\\----\\----\         \----\\----\\----\\----\\----\\----\\----\        
-*                                                                                                      
-*                                                                                                      
-*             /----//----//----//----//----/                           /----//----//----//----//----/  
-*             |     |     |     |     |     |                          | 0   | .   | ,   | =   |     | 
-*             |     |     |     |     |     |                          |     |     |     |     |     | 
-*             \----\\----\\----\\----\/----//----/   /----//----/      \----\\----\\----\\----\\----\  
-*                                     |     |     |  |     |     |                                     
-*                                     |     |     |  |     |     |                                     
-*                                     \----\/----/   /----/\----\                                      
-*                                           |     |  |     |                                           
-*                                           |     |  |     |                                           
-*                               /----//----//----/   /----//----//----/                                
-*                               |     |     |     |  |     |     |     |                               
-*                               |     |     |     |  |     |     |     |                               
-*                               \----\\----\\----\   \----\\----\\----\                                
-*                                                                                                      
-* 
+* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/
+* |     |     |     |     |     |     |     |        |     | F6  | F7  | F8  | F9  | F10 | F11 |
+* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |
+* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/
+* |     |     |     | UP  |     |     |     |        |     | /   | 7   | 8   | 9   | *   | F12 |
+* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |
+* /----//----//----//----//----//----/\----\         \----\/----//----//----//----//----//----/
+* |     |     | LEFT| DOWN| RGHT|     |                    | /   | 4   | 5   | 6   | +   | -   |
+* |     |     |     |     |     |     |                    |     |     |     |     |     |     |
+* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/
+* |     |     |     |     |     |     |     |        |     | %   | 1   | 2   | 3   |     |     |
+* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |
+* \----\\----\\----\\----\\----\\----\\----\         \----\\----\\----\\----\\----\\----\\----\
+*
+*
+*             /----//----//----//----//----/                           /----//----//----//----//----/
+*             |     |     |     |     |     |                          | 0   | .   | ,   | =   |     |
+*             |     |     |     |     |     |                          |     |     |     |     |     |
+*             \----\\----\\----\\----\/----//----/   /----//----/      \----\\----\\----\\----\\----\
+*                                     |     |     |  |     |     |
+*                                     |     |     |  |     |     |
+*                                     \----\/----/   /----/\----\
+*                                           |     |  |     |
+*                                           |     |  |     |
+*                               /----//----//----/   /----//----//----/
+*                               |     |     |     |  |     |     |     |
+*                               |     |     |     |  |     |     |     |
+*                               \----\\----\\----\   \----\\----\\----\
+*
+*
 **/
 [NUMB]=LAYOUT_ergodox(
 //left half
-    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_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_TRNS, KC_TRNS, 
-                                                     KC_TRNS, 
-                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, 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,
     //right half
-    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-    KC_TRNS, DE_SLSH, KC_7, KC_8, KC_9, DE_ASTR, KC_F12, 
-           DE_SLSH, KC_4, KC_5, KC_6, DE_PLUS, DE_MINS, 
-    KC_TRNS, DE_PERC, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS, 
-                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+    KC_TRNS, DE_SLSH, KC_7, KC_8, KC_9, DE_ASTR, KC_F12,
+           DE_SLSH, KC_4, KC_5, KC_6, DE_PLUS, DE_MINS,
+    KC_TRNS, DE_PERC, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,
+                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 /**
 * Layer: EGOS
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/            
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/            
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* /--------//--------//--------//--------//--------//--------/\--------\             \--------\/--------//--------//--------//--------//--------//--------/            
-* | Shift   |         |         |         |         |         |                                |         |         |         |         |         |         |           
-* |         |         |         |         |         |         |                                |         |         |         |         |         |         |           
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/            
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |           
-* \--------\\--------\\--------\\--------\\--------\\--------\\--------\             \--------\\--------\\--------\\--------\\--------\\--------\\--------\            
-*                                                                                                                                                                      
-*                                                                                                                                                                      
-*                     /--------//--------//--------//--------//--------/                                           /--------//--------//--------//--------//--------/  
-*                     | Ctrl    |         |         |         |         |                                          |         |         |         | Toggle 5|         | 
-*                     |         |         |         |         |         |                                          |         |         |         |         |         | 
-*                     \--------\\--------\\--------\\--------\/--------//--------/   /--------//--------/          \--------\\--------\\--------\\--------\\--------\  
-*                                                             | F1      | F2      |  |         |         |                                                             
-*                                                             |         |         |  |         |         |                                                             
-*                                                             \--------\/--------/   /--------/\--------\                                                              
-*                                                                       | F3      |  |         |                                                                       
-*                                                                       |         |  |         |                                                                       
-*                                                   /--------//--------//--------/   /--------//--------//--------/                                                    
-*                                                   | SPC     | Ctrl    | F4      |  |         |         |         |                                                   
-*                                                   |         |         |         |  |         |         |         |                                                   
-*                                                   \--------\\--------\\--------\   \--------\\--------\\--------\                                                    
-*                                                                                                                                                                      
-* 
+* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* /--------//--------//--------//--------//--------//--------/\--------\             \--------\/--------//--------//--------//--------//--------//--------/
+* | Shift   |         |         |         |         |         |                                |         |         |         |         |         |         |
+* |         |         |         |         |         |         |                                |         |         |         |         |         |         |
+* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
+* \--------\\--------\\--------\\--------\\--------\\--------\\--------\             \--------\\--------\\--------\\--------\\--------\\--------\\--------\
+*
+*
+*                     /--------//--------//--------//--------//--------/                                           /--------//--------//--------//--------//--------/
+*                     | Ctrl    |         |         |         |         |                                          |         |         |         | Toggle 5|         |
+*                     |         |         |         |         |         |                                          |         |         |         |         |         |
+*                     \--------\\--------\\--------\\--------\/--------//--------/   /--------//--------/          \--------\\--------\\--------\\--------\\--------\
+*                                                             | F1      | F2      |  |         |         |
+*                                                             |         |         |  |         |         |
+*                                                             \--------\/--------/   /--------/\--------\
+*                                                                       | F3      |  |         |
+*                                                                       |         |  |         |
+*                                                   /--------//--------//--------/   /--------//--------//--------/
+*                                                   | SPC     | Ctrl    | F4      |  |         |         |         |
+*                                                   |         |         |         |  |         |         |         |
+*                                                   \--------\\--------\\--------\   \--------\\--------\\--------\
+*
+*
 **/
 [EGOS]=LAYOUT_ergodox(
 //left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                  KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                              KC_F1, KC_F2, 
-                                                     KC_F3, 
-                                       KC_SPC, KC_LCTL, KC_F4, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_F1, KC_F2,
+                                                     KC_F3,
+                                       KC_SPC, KC_LCTL, KC_F4,
     //right half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                         KC_TRNS, KC_TRNS, KC_TRNS, M(M_TOGGLE_5), KC_TRNS, 
-    KC_TRNS, KC_TRNS, 
-    KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
@@ -556,7 +556,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-uint8_t layer = biton32(layer_state);
+uint8_t layer = get_highest_layer(layer_state);
 
 ergodox_board_led_off();
 ergodox_right_led_1_off();
@@ -566,17 +566,17 @@ switch (layer) {
 
     case SYMB:
         ergodox_right_led_1_on();
-        
-        
+
+
     break;
     case MDIA:
-        
+
         ergodox_right_led_2_on();
-        
+
     break;
     case NUMB:
-        
-        
+
+
         ergodox_right_led_3_on();
     break;
     case EGOS:
@@ -590,4 +590,3 @@ break;
 }
 
 };
-
diff --git a/layouts/community/ergodox/osx_fr/keymap.c b/layouts/community/ergodox/osx_fr/keymap.c
index 886e54208a..22451c1a30 100644
--- a/layouts/community/ergodox/osx_fr/keymap.c
+++ b/layouts/community/ergodox/osx_fr/keymap.c
@@ -141,7 +141,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/osx_kinesis_pnut/keymap.c b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
index ad6ea27364..fb50a3407e 100644
--- a/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
+++ b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
@@ -145,7 +145,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index 3dbfceabc4..125cc43a8f 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -704,7 +704,7 @@ void matrix_init_user(void){
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   ergodox_board_led_off();
   ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/phoenix/keymap.c b/layouts/community/ergodox/phoenix/keymap.c
index a66462e3a8..4371e5f2e7 100644
--- a/layouts/community/ergodox/phoenix/keymap.c
+++ b/layouts/community/ergodox/phoenix/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/plover/keymap.c b/layouts/community/ergodox/plover/keymap.c
index ffb869309a..7b34dde2ed 100644
--- a/layouts/community/ergodox/plover/keymap.c
+++ b/layouts/community/ergodox/plover/keymap.c
@@ -182,7 +182,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index 6e285d5613..ed06446907 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -662,7 +662,7 @@ void matrix_init_user(void) {
 /* Runs constantly in the background, in a loop. */
 void matrix_scan_user(void) {
 
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   ergodox_board_led_off();
   ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/reset_eeprom/keymap.c b/layouts/community/ergodox/reset_eeprom/keymap.c
index 83c252a9a1..726447cbd0 100644
--- a/layouts/community/ergodox/reset_eeprom/keymap.c
+++ b/layouts/community/ergodox/reset_eeprom/keymap.c
@@ -96,7 +96,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/keymap.c
index 819944121e..6eb319ca63 100644
--- a/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   ergodox_board_led_off();
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
diff --git a/layouts/community/ergodox/romanzolotarev-norman-plover-osx/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-plover-osx/keymap.c
index a0964fac77..adf420daa0 100644
--- a/layouts/community/ergodox/romanzolotarev-norman-plover-osx/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-plover-osx/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   ergodox_board_led_off();
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
diff --git a/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/keymap.c
index 6aca3a6d5f..cf3941ee1d 100644
--- a/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
   ergodox_board_led_off();
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
diff --git a/layouts/community/ergodox/sethbc/keymap.c b/layouts/community/ergodox/sethbc/keymap.c
index 26d3106ec4..f3a1f64309 100644
--- a/layouts/community/ergodox/sethbc/keymap.c
+++ b/layouts/community/ergodox/sethbc/keymap.c
@@ -77,7 +77,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/siroken3/keymap.c b/layouts/community/ergodox/siroken3/keymap.c
index fed8b4a0c8..dd5125d20e 100644
--- a/layouts/community/ergodox/siroken3/keymap.c
+++ b/layouts/community/ergodox/siroken3/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/sneako/keymap.c b/layouts/community/ergodox/sneako/keymap.c
index 9d3cdd5a11..dffe797ab0 100644
--- a/layouts/community/ergodox/sneako/keymap.c
+++ b/layouts/community/ergodox/sneako/keymap.c
@@ -141,7 +141,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/software_neo2/keymap.c b/layouts/community/ergodox/software_neo2/keymap.c
index 5f600a5ab5..c191a034f2 100644
--- a/layouts/community/ergodox/software_neo2/keymap.c
+++ b/layouts/community/ergodox/software_neo2/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index 368e216cdc..b0abff9ec6 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -162,7 +162,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/swedish/keymap.c b/layouts/community/ergodox/swedish/keymap.c
index 90218aa886..5e2d47de57 100644
--- a/layouts/community/ergodox/swedish/keymap.c
+++ b/layouts/community/ergodox/swedish/keymap.c
@@ -203,7 +203,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/swissgerman/keymap.c b/layouts/community/ergodox/swissgerman/keymap.c
index 8ba9582934..8766d16ae0 100644
--- a/layouts/community/ergodox/swissgerman/keymap.c
+++ b/layouts/community/ergodox/swissgerman/keymap.c
@@ -222,7 +222,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     switch (layer) {
       // TODO: Make this relevant to the ErgoDox EZ.
diff --git a/layouts/community/ergodox/techtomas/keymap.c b/layouts/community/ergodox/techtomas/keymap.c
index 742eca03a4..bdbb50be42 100644
--- a/layouts/community/ergodox/techtomas/keymap.c
+++ b/layouts/community/ergodox/techtomas/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/tkuichooseyou/keymap.c b/layouts/community/ergodox/tkuichooseyou/keymap.c
index ea6c8f259f..08f1cfc9ab 100644
--- a/layouts/community/ergodox/tkuichooseyou/keymap.c
+++ b/layouts/community/ergodox/tkuichooseyou/keymap.c
@@ -138,7 +138,7 @@ LAYOUT_ergodox(
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/tonyabra_osx/keymap.c b/layouts/community/ergodox/tonyabra_osx/keymap.c
index 741a6396e8..9b8048dda3 100644
--- a/layouts/community/ergodox/tonyabra_osx/keymap.c
+++ b/layouts/community/ergodox/tonyabra_osx/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/townk_osx/keymap.c b/layouts/community/ergodox/townk_osx/keymap.c
index 6799ad7460..c79d74d6eb 100644
--- a/layouts/community/ergodox/townk_osx/keymap.c
+++ b/layouts/community/ergodox/townk_osx/keymap.c
@@ -229,7 +229,7 @@ uint8_t current_layer = BASE;
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
+  uint8_t layer = get_highest_layer(layer_state);
 
   ergodox_led_all_off();
   ergodox_led_all_set(LED_BRIGHTNESS_LO);
diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
index 4b5181a70d..12548ae0ea 100644
--- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                                          KC_DELETE, KC_TRNS,
 	                                                     KC_LGUI,
 	                              KC_BSPACE,CTL_T(KC_NO),KC_LALT,
-	
+
 	KC_TILD,   KC_6,    KC_7,        KC_8,        KC_9,      KC_0,     KC_EQUAL,
 	KC_TRNS,   KC_F,    KC_G,        KC_C,        KC_R,      KC_L,     KC_SLASH,
 	KC_D,      KC_H,    KC_T,        KC_N,        KC_S,      KC_MINUS,
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                                               KC_TRNS, KC_TRNS,
 	                                                        KC_TRNS,
 	                                      KC_TRNS, KC_TRNS, KC_TRNS,
-	
+
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
 	KC_TRNS, KC_Y,    KC_U,    KC_E,     KC_O,      KC_P,      KC_TRNS,
 	         KC_H,    KC_J,    KC_K,     KC_L,      KC_SCOLON, KC_TRNS,
@@ -110,9 +110,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 [2] = LAYOUT_ergodox(
-	KC_TRNS, KC_F1,   KC_F2,      KC_F3,      KC_F4,       KC_F5,   KC_TRNS, 
+	KC_TRNS, KC_F1,   KC_F2,      KC_F3,      KC_F4,       KC_F5,   KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_MS_UP,   KC_TRNS,     KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, 
+	KC_TRNS, KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,
 	                                                       KC_TRNS, KC_TRNS,
@@ -120,12 +120,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                                              KC_TRNS, KC_TRNS, KC_TRNS,
 
 	KC_TRNS,    KC_F6,      KC_F7,      KC_F8,      KC_F9,   KC_F10,  KC_TRNS,
-	KC_F11,     KC_TRNS,    KC_TRNS,    KC_UP,      KC_TRNS, KC_TRNS, KC_TRNS, 
+	KC_F11,     KC_TRNS,    KC_TRNS,    KC_UP,      KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS,    KC_LEFT,    KC_DOWN,    KC_RIGHT,   KC_TRNS, KC_TRNS,
 	KC_F12,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
 	                        KC_MS_BTN1, KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS,    KC_TRNS,
-	KC_TRNS, 
+	KC_TRNS,
 	KC_TRNS,    KC_TRNS,    KC_TRNS
 ),
 
@@ -154,19 +154,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Left Hand
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, 
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,
 	KC_TRNS,KC_TRNS,
 	KC_TRNS,
 	KC_TRNS,KC_TRNS,KC_TRNS,
 	// Right Hand
-	KC_TRNS, KC_TRNS,  KC_LOCKING_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_LOCKING_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
 	KC_TRNS, KC_TRNS,  KC_KP_7,        KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
-	         KC_TRNS,  KC_KP_4,        KC_KP_5,     KC_KP_6,        KC_KP_PLUS,  KC_TRNS,     
+	         KC_TRNS,  KC_KP_4,        KC_KP_5,     KC_KP_6,        KC_KP_PLUS,  KC_TRNS,
 	KC_TRNS, KC_TRNS,  KC_KP_1,        KC_KP_2,     KC_KP_3,        KC_ENTER,    KC_TRNS,
 	                   KC_KP_0,        KC_KP_0,     KC_KP_DOT,      KC_ENTER,    KC_TRNS,
-	KC_TRNS,  KC_TRNS, 
+	KC_TRNS,  KC_TRNS,
 	KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS
 ),
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/win10_writers-block/keymap.c b/layouts/community/ergodox/win10_writers-block/keymap.c
index 05adaed759..443e403b18 100644
--- a/layouts/community/ergodox/win10_writers-block/keymap.c
+++ b/layouts/community/ergodox/win10_writers-block/keymap.c
@@ -4,8 +4,8 @@
 #include "version.h"
 #include "wait.h"
 
-#define BASE 0 // default layer  -  helpful for writing in Office-style word processors. 
-#define SYMB 1 // symbol layer   -  NumPad, etc. - same as Ergodox EZ default but no EEPROM or Version key 
+#define BASE 0 // default layer  -  helpful for writing in Office-style word processors.
+#define SYMB 1 // symbol layer   -  NumPad, etc. - same as Ergodox EZ default but no EEPROM or Version key
 #define RIMW 2 // rimworld layer -  made for the game RimWorld, by Tynan Sylvester | feel free to remap for your favorite game!
 #define MDIA 3 // media layer    -  mouse and music - close to Ergodox EZ default media layer
 
@@ -27,19 +27,19 @@ enum {
 };
 
 void cake_count (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {         
+  if (state->count == 2) {
     layer_on (SYMB);        //define double tap here
     layer_off (MDIA);
-  } 
-  else {    
+  }
+  else {
     layer_off (SYMB);       //define single tap or hold here
     layer_off (MDIA);
   }
-  if (state->count == 3) {         
+  if (state->count == 3) {
      layer_on (RIMW);       //define triple tap here
      layer_off (MDIA);
-  } 
-  else {    
+  }
+  else {
    	layer_off (RIMW);       //define single tap or hold here
 	layer_off (MDIA);
     reset_tap_dance (state);
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |   `    |   1  |   2  |   3  |   4  |   5  | 6    |           |  7   |   7  |   8  |   9  |   0  |   -  |   =    |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | F12/L1 |   Q  |   W  |   E  |   R  |   T  |  {/[ |           |TD(L0 |   Y  |   U  |   I  |   O  |   P  |   \    | 
+ * | F12/L1 |   Q  |   W  |   E  |   R  |   T  |  {/[ |           |TD(L0 |   Y  |   U  |   I  |   O  |   P  |   \    |
  * |--------+------+------+------+------+------|      |           |L1 L2)|------+------+------+------+------+--------|
  * |Caps/Win|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
  * |--------+------+------+------+------+------|  }/] |           TD(ctrl|------+------+------+------+------+--------|
@@ -163,8 +163,8 @@ LT(SYMB, KC_F12),         KC_Q,         KC_W,         KC_E,        KC_R,   KC_T,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
-),	
-	
+),
+
 /* Keymap 2: RimWorld Layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
@@ -186,7 +186,7 @@ LT(SYMB, KC_F12),         KC_Q,         KC_W,         KC_E,        KC_R,   KC_T,
  *                                 |      |      |  Q   |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-// RIMWORLD 
+// RIMWORLD
 [RIMW] = LAYOUT_ergodox(
        // left hand
         KC_ESC,   KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,
@@ -300,7 +300,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
@@ -315,7 +315,7 @@ void matrix_scan_user(void) {
             break;
         case 3:
             ergodox_right_led_3_on();
-            break;			
+            break;
         default:
             // none
             break;
diff --git a/layouts/community/ergodox/xyverz/keymap.c b/layouts/community/ergodox/xyverz/keymap.c
index c77920bb13..f348736c6e 100644
--- a/layouts/community/ergodox/xyverz/keymap.c
+++ b/layouts/community/ergodox/xyverz/keymap.c
@@ -1,6 +1,6 @@
 /*
  * About this keymap:
- * 
+ *
  * The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak
  * software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner
  * keys. When I originally set up this keymap, I'd decided to continue using this layout with my ErgoDox.
@@ -14,7 +14,7 @@
  * layouts.
  *
  * What's New:
- * 
+ *
  * I've overhauled this Dvorak layout a bit to more match what I've got on my other Ortho boards. For
  * some keys, I'm moving away from my old Kinesis keymap and adding the brackets and braces to the
  * inner column vertical keys. I figure this will help me have better ease of use. In this update, I
@@ -246,7 +246,7 @@ void matrix_init_user(void) {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/zweihander-macos/keymap.c b/layouts/community/ergodox/zweihander-macos/keymap.c
index b2ddeb0d6b..0aecc24e67 100644
--- a/layouts/community/ergodox/zweihander-macos/keymap.c
+++ b/layouts/community/ergodox/zweihander-macos/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-    uint8_t layer = biton32(layer_state);
+    uint8_t layer = get_highest_layer(layer_state);
 
     ergodox_board_led_off();
     ergodox_right_led_1_off();
diff --git a/layouts/community/ortho_4x12/peej/keymap.c b/layouts/community/ortho_4x12/peej/keymap.c
index d78f03da41..1e2874ac99 100644
--- a/layouts/community/ortho_4x12/peej/keymap.c
+++ b/layouts/community/ortho_4x12/peej/keymap.c
@@ -56,7 +56,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     writePinLow(LED_RED);
     writePinLow(LED_GREEN);
 
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _FUNCTION:
         writePinHigh(LED_RED);
         break;
diff --git a/quantum/action_layer.h b/quantum/action_layer.h
index b87d096eed..bd1085a70f 100644
--- a/quantum/action_layer.h
+++ b/quantum/action_layer.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #if !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_32BIT)
-#    define LAYER_STATE_32BIT
+#    define LAYER_STATE_16BIT
 #endif
 
 #if defined(LAYER_STATE_8BIT)
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
index 3ed83a44a6..52fe86d297 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -450,7 +450,7 @@ static void md_rgb_matrix_config_override(int i) {
     float bo = 0;
     float po;
 
-    uint8_t highest_active_layer = biton32(layer_state);
+    uint8_t highest_active_layer = get_highest_layer(layer_state);
 
     if (led_animation_circular) {
         // TODO: should use min/max values from LED configuration instead of
diff --git a/users/333fred/333fred.c b/users/333fred/333fred.c
index 99f4e01685..ea7b904403 100644
--- a/users/333fred/333fred.c
+++ b/users/333fred/333fred.c
@@ -115,7 +115,7 @@ void tap_dance_process_keycode(uint16_t keycode) {
 }
 
 __attribute__ ((weak))
-void layer_state_set_rgb(uint32_t state) {}
+void layer_state_set_rgb(layer_state_t state) {}
 
 layer_state_t layer_state_set_user(layer_state_t state) {
   layer_state_set_rgb(state);
diff --git a/users/333fred/rgb.c b/users/333fred/rgb.c
index d287143302..ae21702030 100644
--- a/users/333fred/rgb.c
+++ b/users/333fred/rgb.c
@@ -23,8 +23,8 @@
 #include "quantum.h"
 #include "333fred.h"
 
-void layer_state_set_rgb(uint32_t state) {
-  switch (biton32(state)) {
+void layer_state_set_rgb(layer_state_t state) {
+  switch (get_highest_layer(state)) {
     case BASE:
       // purple
       rgblight_sethsv_noeeprom(210, 255, 20);
diff --git a/users/bbaserdem/bbaserdem.c b/users/bbaserdem/bbaserdem.c
index cdacda12ee..e0cf3d81d1 100644
--- a/users/bbaserdem/bbaserdem.c
+++ b/users/bbaserdem/bbaserdem.c
@@ -59,7 +59,7 @@ __attribute__ ((weak)) void matrix_scan_keymap(void) { }
 __attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
-__attribute__ ((weak)) uint32_t layer_state_set_keymap (uint32_t state) {
+__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) {
     return state;
 }
 __attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { }
@@ -627,7 +627,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     state = layer_state_set_keymap (state);
 #ifdef RGBLIGHT_ENABLE
     // Change RGB lighting depending on the last layer activated
-    rgblight_change( biton32(state) );
+    rgblight_change( get_highest_layer(state) );
 #endif
     return state;
 }
diff --git a/users/billypython/billypython.c b/users/billypython/billypython.c
index 180b478d7a..f165d2e260 100644
--- a/users/billypython/billypython.c
+++ b/users/billypython/billypython.c
@@ -23,7 +23,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 __attribute__((weak))
-uint32_t layer_state_set_keymap(uint32_t state) {
+layer_state_t layer_state_set_keymap(layer_state_t state) {
   return state;
 }
 
diff --git a/users/billypython/billypython.h b/users/billypython/billypython.h
index 4a444e9787..cdf5121f2f 100644
--- a/users/billypython/billypython.h
+++ b/users/billypython/billypython.h
@@ -31,4 +31,4 @@ enum layers_user {
 };
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
-uint32_t layer_state_set_keymap(uint32_t state);
+layer_state_t layer_state_set_keymap(layer_state_t state);
diff --git a/users/dhertz/dhertz.c b/users/dhertz/dhertz.c
index 163b1cb644..1a2b6e38f1 100644
--- a/users/dhertz/dhertz.c
+++ b/users/dhertz/dhertz.c
@@ -18,7 +18,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 __attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 __attribute__ ((weak))
@@ -107,4 +107,3 @@ layer_state_t layer_state_set_user (layer_state_t state) {
 void led_set_user(uint8_t usb_led) {
    led_set_keymap(usb_led);
 }
-
diff --git a/users/doogle999/doogle999.c b/users/doogle999/doogle999.c
index 320de7cff8..c9ee125741 100644
--- a/users/doogle999/doogle999.c
+++ b/users/doogle999/doogle999.c
@@ -382,7 +382,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
 	static char text[CALC_BUFFER_SIZE + 1]; // Used to store input and then output when ready to print
 	static char backspaceText[CALC_BUFFER_SIZE + 1]; // Pretty dumb waste of memory because only backspace characters, used with send_string to backspace and remove input
 
-	if((biton32(layer_state) == CALC_LAYER && CALC_FORCE_NUM_LOCK_INSIDE_CALC) || (biton32(layer_state) != CALC_LAYER && CALC_FORCE_NUM_LOCK_OUTSIDE_CALC))
+	if((get_highest_layer(layer_state) == CALC_LAYER && CALC_FORCE_NUM_LOCK_INSIDE_CALC) || (get_highest_layer(layer_state) != CALC_LAYER && CALC_FORCE_NUM_LOCK_OUTSIDE_CALC))
 	{
 		bool numpadKeyPressed = record->event.pressed &&
 			!(get_mods() & MODS_SHIFT_MASK) &&
@@ -397,7 +397,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
 		}
 	}
 
-	if(biton32(layer_state) != CALC_LAYER) { return true; }
+	if(get_highest_layer(layer_state) != CALC_LAYER) { return true; }
 
 	int action = process_input(keycode, get_mods(), record->event);
 	switch(action)
@@ -457,4 +457,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
 		send_string(characterToSend);
 	}
 	return false;
-}
\ No newline at end of file
+}
diff --git a/users/edvorakjp/edvorakjp.c b/users/edvorakjp/edvorakjp.c
index c44d8bb440..c95b03d981 100644
--- a/users/edvorakjp/edvorakjp.c
+++ b/users/edvorakjp/edvorakjp.c
@@ -12,7 +12,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     return layer_state_set_keymap(state);
 }
 
-__attribute__((weak)) uint32_t layer_state_set_keymap(uint32_t state) { return state; }
+__attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) { return state; }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     bool process_record_user_result = process_record_keymap(keycode, record) && process_record_edvorakjp_swap_scln(keycode, record) && process_record_edvorakjp_config(keycode, record) && process_record_layer(keycode, record) && process_record_ime(keycode, record);
diff --git a/users/edvorakjp/edvorakjp.h b/users/edvorakjp/edvorakjp.h
index 93cd9851b7..a878f71ca8 100644
--- a/users/edvorakjp/edvorakjp.h
+++ b/users/edvorakjp/edvorakjp.h
@@ -68,7 +68,7 @@ enum tap_dance_code {
 void     matrix_init_user(void);
 void     matrix_init_keymap(void);
 layer_state_t layer_state_set_user(layer_state_t state);
-uint32_t layer_state_set_keymap(uint32_t state);
+layer_state_t layer_state_set_keymap(layer_state_t state);
 bool     process_record_user(uint16_t keycode, keyrecord_t *record);
 bool     process_record_keymap(uint16_t keycode, keyrecord_t *record);
 
diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c
index 2a34110ae2..a071fb8c2e 100755
--- a/users/ericgebhart/ericgebhart.c
+++ b/users/ericgebhart/ericgebhart.c
@@ -40,7 +40,7 @@ __attribute__ ((weak))
 void matrix_scan_keymap(void) {}
 
 __attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 
diff --git a/users/ericgebhart/tap_dances.c b/users/ericgebhart/tap_dances.c
index 9f344986aa..8f9503a261 100755
--- a/users/ericgebhart/tap_dances.c
+++ b/users/ericgebhart/tap_dances.c
@@ -47,7 +47,7 @@ void tap_dance_mouse_btns (qk_tap_dance_state_t *state, void *user_data) {
 
 // counting on all the qwerty layers to be less than dvorak_on_bepo
 int on_qwerty(){
-    uint8_t deflayer = (biton32(default_layer_state));
+    uint8_t deflayer = (get_highest_layer(default_layer_state));
     return (deflayer < _DVORAK_BP);
 }
 
@@ -58,7 +58,7 @@ static void switch_default_layer(uint8_t layer) {
 
 // so the keyboard remembers which layer it's in after power disconnect.
 /*
-  uint32_t default_layer_state_set_kb(uint32_t state) {
+  layer_state_t default_layer_state_set_kb(layer_state_t state) {
   eeconfig_update_default_layer(state);
   return state;
   }
diff --git a/users/kuchosauronad0/kuchosauronad0.c b/users/kuchosauronad0/kuchosauronad0.c
index a8f17b08ee..820d84daad 100644
--- a/users/kuchosauronad0/kuchosauronad0.c
+++ b/users/kuchosauronad0/kuchosauronad0.c
@@ -117,7 +117,7 @@ void matrix_scan_user(void){
 }
 
 __attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 
@@ -133,12 +133,12 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 
 __attribute__ ((weak))
-uint32_t default_layer_state_set_keymap (uint32_t state) {
+layer_state_t default_layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 
 // Runs state check and changes underglow color and animation
-uint32_t default_layer_state_set_user(uint32_t state) {
+layer_state_t default_layer_state_set_user(layer_state_t state) {
   state = default_layer_state_set_keymap(state);
 #if 0
 #ifdef RGBLIGHT_ENABLE
diff --git a/users/kuchosauronad0/kuchosauronad0.h b/users/kuchosauronad0/kuchosauronad0.h
index da996457c6..5cbd517d67 100644
--- a/users/kuchosauronad0/kuchosauronad0.h
+++ b/users/kuchosauronad0/kuchosauronad0.h
@@ -65,8 +65,8 @@ void     shutdown_keymap(void);
 void     suspend_power_down_keymap(void);
 void     suspend_wakeup_init_keymap(void);
 void     matrix_scan_keymap(void);
-uint32_t layer_state_set_keymap (uint32_t state);
-uint32_t default_layer_state_set_keymap (uint32_t state);
+layer_state_t layer_state_set_keymap (layer_state_t state);
+layer_state_t default_layer_state_set_keymap (layer_state_t state);
 void     led_set_keymap(uint8_t usb_led);
 void     eeconfig_init_keymap(void);
 
diff --git a/users/kuchosauronad0/rgblight_user.c b/users/kuchosauronad0/rgblight_user.c
index 63e412c557..feea0c412f 100644
--- a/users/kuchosauronad0/rgblight_user.c
+++ b/users/kuchosauronad0/rgblight_user.c
@@ -84,7 +84,7 @@ void matrix_scan_rgb(void) {
 layer_state_t layer_state_set_rgb(layer_state_t state) {
 # ifdef RGBLIGHT_ENABLE
   if (userspace_config.rgb_layer_change) {
-    switch (biton32(state)) {  // _RAISE, _LOWER and _ADJUST use a custom color and the breathing effect
+    switch (get_highest_layer(state)) {  // _RAISE, _LOWER and _ADJUST use a custom color and the breathing effect
       case _RAISE:
         rgblight_sethsv_noeeprom_green();
         rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
@@ -98,7 +98,7 @@ layer_state_t layer_state_set_rgb(layer_state_t state) {
         rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 2);
         break;
       default:  // Use a solid color for normal layers
-        switch (biton32(default_layer_state)) {
+        switch (get_highest_layer(default_layer_state)) {
           case _QWERTY:
             rgblight_sethsv_noeeprom_magenta();
             break;
@@ -118,7 +118,7 @@ layer_state_t layer_state_set_rgb(layer_state_t state) {
             rgblight_sethsv_noeeprom_white();
             break;
         }
-        biton32(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);  // if _MODS layer is on, then breath to denote it
+        get_highest_layer(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);  // if _MODS layer is on, then breath to denote it
         break;
     }
   }
@@ -135,7 +135,7 @@ void matrix_scan_indicator(void) {
 #endif // !INDICATOR_LIGHTS
 
 void rgblight_fade_helper(bool direction){
-  // true: increase val = fade in 
+  // true: increase val = fade in
   // false: decrease val = fade out
   for (uint8_t index = 0; index <  RGBLIGHT_VAL_STEP ; index++) {
     direction ? rgblight_increase_val()  : rgblight_decrease_val();
@@ -147,10 +147,10 @@ void fadeflash_leds(uint8_t hue, uint8_t sat, uint8_t val){
   // fade out, set new hue and saturation, fade in, fade out, set old color, fade in
   // this is used in leader.c
   // TODO: come up with a better name maybe
-  rgblight_fade_helper(false); 
-  rgblight_sethsv_noeeprom(hue, sat, 0); 
-  rgblight_fade_helper(true); 
-  rgblight_fade_helper(false); 
-  rgblight_sethsv_noeeprom(base_hue, base_sat, 0); 
-  rgblight_fade_helper(true); 
+  rgblight_fade_helper(false);
+  rgblight_sethsv_noeeprom(hue, sat, 0);
+  rgblight_fade_helper(true);
+  rgblight_fade_helper(false);
+  rgblight_sethsv_noeeprom(base_hue, base_sat, 0);
+  rgblight_fade_helper(true);
 }
diff --git a/users/kuchosauronad0/template.c b/users/kuchosauronad0/template.c
index 475e45d391..76cc572be3 100644
--- a/users/kuchosauronad0/template.c
+++ b/users/kuchosauronad0/template.c
@@ -63,11 +63,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 
 __attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 
-uint32_t layer_state_set_user (uint32_t state) {
+layer_state_t layer_state_set_user (layer_state_t state) {
   return layer_state_set_keymap (state);
 }
 
diff --git a/users/mtdjr/mtdjr.c b/users/mtdjr/mtdjr.c
index 9c6c26bc86..cd67bf3b5f 100644
--- a/users/mtdjr/mtdjr.c
+++ b/users/mtdjr/mtdjr.c
@@ -137,7 +137,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case _RAISE:
       #ifdef RGBLIGHT_ENABLE
       rgblight_sethsv_noeeprom (240, 255, 255);
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
index 55eaf88ccb..463c6dfebb 100644
--- a/users/ninjonas/oled.c
+++ b/users/ninjonas/oled.c
@@ -23,7 +23,7 @@ bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
 
 void render_layout_state(void) {
   oled_write_P(PSTR("Layout: "), false);
-  switch (biton32(default_layer_state)) {
+  switch (get_highest_layer(default_layer_state)) {
       case _COLEMAK:
         oled_write_P(PSTR("Colemak"), false);
         break;
diff --git a/users/pvinis/pvinis.c b/users/pvinis/pvinis.c
index 71f9210aec..96b01bb461 100644
--- a/users/pvinis/pvinis.c
+++ b/users/pvinis/pvinis.c
@@ -95,4 +95,4 @@ void keyboard_post_init_user(void) {
 // Default functions.
 __attribute__((weak)) void keyboard_post_init_user_keymap(void) {}
 
-__attribute__((weak)) uint32_t layer_state_set_user_keymap(uint32_t state) { return state; }
+__attribute__((weak)) layer_state_t layer_state_set_user_keymap(layer_state_t state) { return state; }
diff --git a/users/pvinis/pvinis.h b/users/pvinis/pvinis.h
index c50033a440..5a11a6cb6f 100644
--- a/users/pvinis/pvinis.h
+++ b/users/pvinis/pvinis.h
@@ -169,4 +169,4 @@ enum {
 
 // Extra stuff that might be needed.
 void     keyboard_post_init_user_keymap(void);
-uint32_t layer_state_set_user_keymap(uint32_t state);
+layer_state_t layer_state_set_user_keymap(layer_state_t state);
diff --git a/users/romus/romus.c b/users/romus/romus.c
index f707bb8843..a41a6df578 100644
--- a/users/romus/romus.c
+++ b/users/romus/romus.c
@@ -59,7 +59,7 @@ __attribute__ ((weak)) void matrix_scan_keymap(void) { }
 __attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
-__attribute__ ((weak)) uint32_t layer_state_set_keymap (uint32_t state) {
+__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) {
     return state;
 }
 __attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { }
@@ -551,7 +551,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     state = layer_state_set_keymap (state);
 #ifdef RGBLIGHT_ENABLE
     // Change RGB lighting depending on the last layer activated
-    rgblight_change( biton32(state) );
+    rgblight_change( get_highest_layer(state) );
 #endif
     return state;
 }
diff --git a/users/sigma/sigma.c b/users/sigma/sigma.c
index 527925a63f..8470060a53 100644
--- a/users/sigma/sigma.c
+++ b/users/sigma/sigma.c
@@ -49,12 +49,12 @@ bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
 
 
 __attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 
 __attribute__ ((weak))
-uint32_t default_layer_state_set_keymap (uint32_t state) {
+layer_state_t default_layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 
diff --git a/users/stanrc85/layer_rgb.c b/users/stanrc85/layer_rgb.c
index 6d57198f3b..ad30c2ee65 100644
--- a/users/stanrc85/layer_rgb.c
+++ b/users/stanrc85/layer_rgb.c
@@ -5,7 +5,7 @@ void matrix_init_user(void) {
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (biton32(state)) {
+  switch (get_highest_layer(state)) {
     case 0:
       rgblight_setrgb (0xFF, 0x00, 0x00);
       break;
diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c
index 517f712ec8..6655170d4a 100644
--- a/users/talljoe/talljoe.c
+++ b/users/talljoe/talljoe.c
@@ -138,7 +138,7 @@ void matrix_init_user(void) {
   }
 }
 
-uint32_t default_layer_state_set_kb(uint32_t state) {
+layer_state_t default_layer_state_set_kb(layer_state_t state) {
   // persist changes to default layers
   eeconfig_update_default_layer(state);
   return state;
diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c
index 7322ead0dc..b4ec224d07 100644
--- a/users/tominabox1/tominabox1.c
+++ b/users/tominabox1/tominabox1.c
@@ -128,7 +128,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
         case _LOWER:
             break;
         case _RAISE:
@@ -231,7 +231,7 @@ void render_status_main(void) {
 
     // Host Keyboard Layer Status
     oled_write_P(PSTR("Layer: "), false);
-    switch (biton32(layer_state)) {
+    switch (get_highest_layer(layer_state)) {
         case _BASE:
             oled_write_P(PSTR("Colemak\n"), false);
             break;
diff --git a/users/turbomech/backupturbomech.c b/users/turbomech/backupturbomech.c
index aaea05df96..3671d27ab4 100644
--- a/users/turbomech/backupturbomech.c
+++ b/users/turbomech/backupturbomech.c
@@ -31,7 +31,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 __attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 __attribute__ ((weak))
@@ -300,7 +300,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 #ifdef RGBLIGHT_ENABLE
   uint8_t default_layer = eeconfig_read_default_layer();
   if (rgb_layer_change) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _FUNCTION:
       rgblight_set_blue;
      rgblight_mode(1);
@@ -377,7 +377,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 __attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
+layer_state_t layer_state_set_keymap (layer_state_t state) {
   return state;
 }
 __attribute__ ((weak))
diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c
index 7fe8040927..fd03033ad6 100644
--- a/users/xulkal/custom_oled.c
+++ b/users/xulkal/custom_oled.c
@@ -37,7 +37,7 @@ static void render_icon(void)
 
 static void render_layer(void)
 {
-    uint8_t layer = layer_state ? biton(layer_state) : biton32(default_layer_state);
+    uint8_t layer = layer_state ? get_highest_layer(layer_state) : get_highest_layer(default_layer_state);
 #ifdef OLED_90ROTATION
     oled_write_P(PSTR("Layer"), false);
 #else
diff --git a/users/zer09/zer09.c b/users/zer09/zer09.c
index a6768f0a1a..78433b4c20 100644
--- a/users/zer09/zer09.c
+++ b/users/zer09/zer09.c
@@ -43,7 +43,7 @@ void matrix_init_user(void) {
 
 void matrix_scan_user(void) {
   static uint8_t is_leds_changes = 1;
-  c_lyr = biton32(layer_state);
+  c_lyr = get_highest_layer(layer_state);
 
   is_leds_changes = is_leds_changes << set_layer_led(c_lyr);
   is_leds_changes = is_leds_changes << shifted_layer();

From c725b6bf89878aebe9c5ffa2f6c05abd9ea98117 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 20 Jun 2022 02:15:55 +0800
Subject: [PATCH 033/959] [Core] Mouse key kinetic mode fix (#17176)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 docs/feature_mouse_keys.md |  6 +++---
 quantum/mousekey.c         | 27 ++++++++++++++++-----------
 quantum/mousekey.h         |  4 ++--
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/docs/feature_mouse_keys.md b/docs/feature_mouse_keys.md
index 905da36e43..8e474c4245 100644
--- a/docs/feature_mouse_keys.md
+++ b/docs/feature_mouse_keys.md
@@ -87,9 +87,9 @@ This is an extension of the accelerated mode. The kinetic mode uses a quadratic
 |`MK_KINETIC_SPEED`                    |undefined|Enable kinetic mode                                            |
 |`MOUSEKEY_DELAY`                      |5        |Delay between pressing a movement key and cursor movement      |
 |`MOUSEKEY_INTERVAL`                   |10       |Time between cursor movements in milliseconds                  |
-|`MOUSEKEY_MOVE_DELTA`                 |5        |Step size for accelerating from initial to base speed          |
+|`MOUSEKEY_MOVE_DELTA`                 |16       |Step size for accelerating from initial to base speed          |
 |`MOUSEKEY_INITIAL_SPEED`              |100      |Initial speed of the cursor in pixel per second                |
-|`MOUSEKEY_BASE_SPEED`                 |1000     |Maximum cursor speed at which acceleration stops               |
+|`MOUSEKEY_BASE_SPEED`                 |5000     |Maximum cursor speed at which acceleration stops               |
 |`MOUSEKEY_DECELERATED_SPEED`          |400      |Decelerated cursor speed                                       |
 |`MOUSEKEY_ACCELERATED_SPEED`          |3000     |Accelerated cursor speed                                       |
 |`MOUSEKEY_WHEEL_INITIAL_MOVEMENTS`    |16       |Initial number of movements of the mouse wheel                 |
@@ -100,7 +100,7 @@ This is an extension of the accelerated mode. The kinetic mode uses a quadratic
 Tips:
 
 * The smoothness of the cursor movement depends on the `MOUSEKEY_INTERVAL` setting. The shorter the interval is set the smoother the movement will be.  Setting the value too low makes the cursor unresponsive.  Lower settings are possible if the micro processor is fast enough. For example: At an interval of `8` milliseconds, `125` movements per second will be initiated.  With a base speed of `1000` each movement will move the cursor by `8` pixels.
-* Mouse wheel movements are implemented differently from cursor movements. While it's okay for the cursor to move multiple pixels at once for the mouse wheel this would lead to jerky movements. Instead, the mouse wheel operates at step size `1`. Setting mouse wheel speed is done by adjusting the number of wheel movements per second.
+* Mouse wheel movements are implemented differently from cursor movements. While it's okay for the cursor to move multiple pixels at once for the mouse wheel this would lead to jerky movements. Instead, the mouse wheel operates at step size `2`. Setting mouse wheel speed is done by adjusting the number of wheel movements per second.
 
 ### Constant mode
 
diff --git a/quantum/mousekey.c b/quantum/mousekey.c
index 64d0e66682..81e887d529 100644
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -66,11 +66,18 @@ uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX;
 /* milliseconds between the initial key press and first repeated motion event (0-2550) */
 uint8_t mk_wheel_delay = MOUSEKEY_WHEEL_DELAY / 10;
 /* milliseconds between repeated motion events (0-255) */
-uint8_t mk_wheel_interval    = MOUSEKEY_WHEEL_INTERVAL;
+#    ifdef MK_KINETIC_SPEED
+float mk_wheel_interval = 1000.0f / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
+#    else
+uint8_t mk_wheel_interval = MOUSEKEY_WHEEL_INTERVAL;
+#    endif
 uint8_t mk_wheel_max_speed   = MOUSEKEY_WHEEL_MAX_SPEED;
 uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
 
 #    ifndef MK_COMBINED
+#        ifndef MK_KINETIC_SPEED
+
+/* Default accelerated mode */
 
 static uint8_t move_unit(void) {
     uint16_t unit;
@@ -108,8 +115,7 @@ static uint8_t wheel_unit(void) {
     return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));
 }
 
-#    else /* #ifndef MK_COMBINED */
-#        ifdef MK_KINETIC_SPEED
+#        else /* #ifndef MK_KINETIC_SPEED */
 
 /*
  * Kinetic movement  acceleration algorithm
@@ -147,27 +153,27 @@ static uint8_t move_unit(void) {
     return speed > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : speed;
 }
 
-float mk_wheel_interval = 1000.0f / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
-
 static uint8_t wheel_unit(void) {
     float speed = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
 
     if (mousekey_accel & ((1 << 0) | (1 << 2))) {
         speed = mousekey_accel & (1 << 2) ? MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS : MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS;
-    } else if (mousekey_repeat && mouse_timer) {
+    } else if (mousekey_wheel_repeat && mouse_timer) {
         if (mk_wheel_interval != MOUSEKEY_WHEEL_BASE_MOVEMENTS) {
             const float time_elapsed = timer_elapsed(mouse_timer) / 50;
             speed                    = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS + 1 * time_elapsed + 1 * 0.5 * time_elapsed * time_elapsed;
         }
         speed = speed > MOUSEKEY_WHEEL_BASE_MOVEMENTS ? MOUSEKEY_WHEEL_BASE_MOVEMENTS : speed;
     }
-
     mk_wheel_interval = 1000.0f / speed;
 
-    return 1;
+    return (uint8_t)speed > MOUSEKEY_WHEEL_INITIAL_MOVEMENTS ? 2 : 1;
 }
 
-#        else /* #ifndef MK_KINETIC_SPEED */
+#        endif /* #ifndef MK_KINETIC_SPEED */
+#    else      /* #ifndef MK_COMBINED */
+
+/* Combined mode */
 
 static uint8_t move_unit(void) {
     uint16_t unit;
@@ -205,8 +211,7 @@ static uint8_t wheel_unit(void) {
     return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));
 }
 
-#        endif /* #ifndef MK_KINETIC_SPEED */
-#    endif     /* #ifndef MK_COMBINED */
+#    endif /* #ifndef MK_COMBINED */
 
 void mousekey_task(void) {
     // report cursor and scroll movement independently
diff --git a/quantum/mousekey.h b/quantum/mousekey.h
index 03da5f282a..d44f47fc1f 100644
--- a/quantum/mousekey.h
+++ b/quantum/mousekey.h
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        ifndef MK_KINETIC_SPEED
 #            define MOUSEKEY_MOVE_DELTA 8
 #        else
-#            define MOUSEKEY_MOVE_DELTA 5
+#            define MOUSEKEY_MOVE_DELTA 16
 #        endif
 #    endif
 #    ifndef MOUSEKEY_WHEEL_DELTA
@@ -82,7 +82,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define MOUSEKEY_INITIAL_SPEED 100
 #    endif
 #    ifndef MOUSEKEY_BASE_SPEED
-#        define MOUSEKEY_BASE_SPEED 1000
+#        define MOUSEKEY_BASE_SPEED 5000
 #    endif
 #    ifndef MOUSEKEY_DECELERATED_SPEED
 #        define MOUSEKEY_DECELERATED_SPEED 400

From 2bddffeaecb885a32d071c744764f3af4ad15646 Mon Sep 17 00:00:00 2001
From: Jamal Bouajjaj <develop@electro707.com>
Date: Sun, 19 Jun 2022 17:32:37 -0400
Subject: [PATCH 034/959] IS31FL3737 Global Current Setting (#17420)

---
 docs/feature_rgb_matrix.md    | 1 +
 drivers/led/issi/is31fl3737.c | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index ec67e32078..2e88ae4727 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -172,6 +172,7 @@ Configure the hardware via your `config.h`:
 | `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
 | `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
 | `ISSI_PWM_FREQUENCY` | (Optional) PWM Frequency Setting - IS31FL3737B only | 0 |
+| `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF |
 | `ISSI_SWPULLUP` | (Optional) Set the value of the SWx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `ISSI_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
index bce0c34b2c..932530ac0a 100644
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -69,6 +69,10 @@
 #    define ISSI_CSPULLUP PUR_0R
 #endif
 
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+
 // Transfer buffer for TWITransmitData()
 uint8_t g_twi_transfer_buffer[20];
 
@@ -161,7 +165,7 @@ void IS31FL3737_init(uint8_t addr) {
     // Set de-ghost pull-down resistors (CSx)
     IS31FL3737_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3737_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    IS31FL3737_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
     IS31FL3737_write_register(addr, ISSI_REG_CONFIGURATION, ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 

From 62eaec52e0b6aadfea629e7457d1d7d8647e840c Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Mon, 20 Jun 2022 15:31:27 +0100
Subject: [PATCH 035/959] Init eeconfig before reading handedness (#17256)

---
 quantum/split_common/split_util.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 48b9cce6d4..4892b7f8d8 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -135,6 +135,10 @@ void split_pre_init(void) {
 #if defined(SPLIT_HAND_PIN)
     setPinInput(SPLIT_HAND_PIN);
     wait_us(100);
+#elif defined(EE_HANDS)
+    if (!eeconfig_is_enabled()) {
+        eeconfig_init();
+    }
 #endif
     isLeftHand = is_keyboard_left();
 

From 2703ecc9e98819ab4d13bdb6da6e0d02ee840d86 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 21 Jun 2022 00:24:53 +0200
Subject: [PATCH 036/959] [BUG] Fix deadlocks on disconnected secondary half
 (#17423)

---
 platforms/chibios/drivers/serial.c          | 11 +++-----
 platforms/chibios/drivers/serial_protocol.c |  8 +++---
 platforms/synchronization_util.h            | 30 +++++++++++++++++++++
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index e5f346ba33..3fae5cd3a4 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -87,10 +87,7 @@ static THD_FUNCTION(Thread1, arg) {
     chRegSetThreadName("blinker");
     while (true) {
         palWaitLineTimeout(SOFT_SERIAL_PIN, TIME_INFINITE);
-
-        split_shared_memory_lock();
         interrupt_handler(NULL);
-        split_shared_memory_unlock();
     }
 }
 
@@ -155,6 +152,7 @@ static void __attribute__((noinline)) serial_write_byte(uint8_t data) {
 
 // interrupt handle to be used by the slave device
 void interrupt_handler(void *arg) {
+    split_shared_memory_lock_autounlock();
     chSysLockFromISR();
 
     sync_send();
@@ -212,6 +210,8 @@ void interrupt_handler(void *arg) {
 static inline bool initiate_transaction(uint8_t sstd_index) {
     if (sstd_index > NUM_TOTAL_TRANSACTIONS) return false;
 
+    split_shared_memory_lock_autounlock();
+
     split_transaction_desc_t *trans = &split_transaction_table[sstd_index];
 
     // TODO: remove extra delay between transactions
@@ -292,8 +292,5 @@ static inline bool initiate_transaction(uint8_t sstd_index) {
 //
 // this code is very time dependent, so we need to disable interrupts
 bool soft_serial_transaction(int sstd_index) {
-    split_shared_memory_lock();
-    bool result = initiate_transaction((uint8_t)sstd_index);
-    split_shared_memory_unlock();
-    return result;
+    return initiate_transaction((uint8_t)sstd_index);
 }
diff --git a/platforms/chibios/drivers/serial_protocol.c b/platforms/chibios/drivers/serial_protocol.c
index 3e160e0c5c..c95aed9885 100644
--- a/platforms/chibios/drivers/serial_protocol.c
+++ b/platforms/chibios/drivers/serial_protocol.c
@@ -22,13 +22,11 @@ static THD_FUNCTION(SlaveThread, arg) {
     chRegSetThreadName("split_protocol_tx_rx");
 
     while (true) {
-        split_shared_memory_lock();
         if (unlikely(!react_to_transaction())) {
             /* Clear the receive queue, to start with a clean slate.
              * Parts of failed transactions or spurious bytes could still be in it. */
             serial_transport_driver_clear();
         }
-        split_shared_memory_unlock();
     }
 }
 
@@ -64,6 +62,8 @@ static inline bool react_to_transaction(void) {
         return false;
     }
 
+    split_shared_memory_lock_autounlock();
+
     split_transaction_desc_t* transaction = &split_transaction_table[transaction_id];
 
     /* Send back the handshake which is XORed as a simple checksum,
@@ -102,9 +102,7 @@ static inline bool react_to_transaction(void) {
  * @return bool Indicates success of transaction.
  */
 bool soft_serial_transaction(int index) {
-    split_shared_memory_lock();
     bool result = initiate_transaction((uint8_t)index);
-    split_shared_memory_unlock();
 
     if (unlikely(!result)) {
         /* Clear the receive queue, to start with a clean slate.
@@ -125,6 +123,8 @@ static inline bool initiate_transaction(uint8_t transaction_id) {
         return false;
     }
 
+    split_shared_memory_lock_autounlock();
+
     split_transaction_desc_t* transaction = &split_transaction_table[transaction_id];
 
     /* Send transaction table index to the slave, which doubles as basic handshake token. */
diff --git a/platforms/synchronization_util.h b/platforms/synchronization_util.h
index 3730f271db..81ce074cac 100644
--- a/platforms/synchronization_util.h
+++ b/platforms/synchronization_util.h
@@ -12,3 +12,33 @@ void split_shared_memory_unlock(void);
 inline void split_shared_memory_lock(void){};
 inline void split_shared_memory_unlock(void){};
 #endif
+
+/* GCCs cleanup attribute expects a function with one parameter, which is a
+ * pointer to a type compatible with the variable. As we don't want to expose
+ * the platforms internal mutex type this workaround with auto generated adapter
+ * function is defined */
+#define QMK_DECLARE_AUTOUNLOCK_HELPERS(prefix)                              \
+    inline unsigned prefix##_autounlock_lock_helper(void) {                 \
+        prefix##_lock();                                                    \
+        return 0;                                                           \
+    }                                                                       \
+                                                                            \
+    inline void prefix##_autounlock_unlock_helper(unsigned* unused_guard) { \
+        prefix##_unlock();                                                  \
+    }
+
+/* Convinience macro the automatically generate the correct RAII-style
+ * lock_autounlock function macro */
+#define QMK_DECLARE_AUTOUNLOCK_CALL(prefix) unsigned prefix##_guard __attribute__((unused, cleanup(prefix##_autounlock_unlock_helper))) = prefix##_autounlock_lock_helper
+
+QMK_DECLARE_AUTOUNLOCK_HELPERS(split_shared_memory)
+
+/**
+ * @brief Acquire exclusive access to the split keyboard shared memory, by
+ * calling the platforms `split_shared_memory_lock()` function. The lock is
+ * automatically released by calling the platforms `split_shared_memory_unlock()`
+ * function. This happens when the block where
+ * `split_shared_memory_lock_autounlock()` is called in goes out of scope i.e.
+ * when the enclosing function returns.
+ */
+#define split_shared_memory_lock_autounlock QMK_DECLARE_AUTOUNLOCK_CALL(split_shared_memory)

From 6a81cb44f2ec10472fd58496ad18f812798cc275 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 21 Jun 2022 01:31:20 +0200
Subject: [PATCH 037/959] [Fix] Fix compilation warning for non-split keebs
 after #17423 (#17439)

---
 platforms/synchronization_util.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platforms/synchronization_util.h b/platforms/synchronization_util.h
index 81ce074cac..59933945c3 100644
--- a/platforms/synchronization_util.h
+++ b/platforms/synchronization_util.h
@@ -9,8 +9,10 @@ void split_shared_memory_lock(void);
 void split_shared_memory_unlock(void);
 #    endif
 #else
+#    if defined(SPLIT_KEYBOARD)
 inline void split_shared_memory_lock(void){};
 inline void split_shared_memory_unlock(void){};
+#    endif
 #endif
 
 /* GCCs cleanup attribute expects a function with one parameter, which is a
@@ -31,6 +33,7 @@ inline void split_shared_memory_unlock(void){};
  * lock_autounlock function macro */
 #define QMK_DECLARE_AUTOUNLOCK_CALL(prefix) unsigned prefix##_guard __attribute__((unused, cleanup(prefix##_autounlock_unlock_helper))) = prefix##_autounlock_lock_helper
 
+#if defined(SPLIT_KEYBOARD)
 QMK_DECLARE_AUTOUNLOCK_HELPERS(split_shared_memory)
 
 /**
@@ -41,4 +44,5 @@ QMK_DECLARE_AUTOUNLOCK_HELPERS(split_shared_memory)
  * `split_shared_memory_lock_autounlock()` is called in goes out of scope i.e.
  * when the enclosing function returns.
  */
-#define split_shared_memory_lock_autounlock QMK_DECLARE_AUTOUNLOCK_CALL(split_shared_memory)
+#    define split_shared_memory_lock_autounlock QMK_DECLARE_AUTOUNLOCK_CALL(split_shared_memory)
+#endif

From 589e756e9838d9c9ba30e5421b98c29fae2f2d62 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 21 Jun 2022 10:56:47 +1000
Subject: [PATCH 038/959] Fixup SPI mode 3 => 0 on tzarc/djinn. (#17440)

---
 keyboards/tzarc/djinn/djinn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c
index 41155a6584..70e011218f 100644
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@@ -70,7 +70,7 @@ void keyboard_post_init_kb(void) {
     wait_ms(150);
 
     // Initialise the LCD
-    lcd = qp_ili9341_make_spi_device(320, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 3);
+    lcd = qp_ili9341_make_spi_device(320, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 0);
     qp_init(lcd, QP_ROTATION_0);
 
     // Turn on the LCD and clear the display

From 1a400d8644a1f0763c68626863b897cb83c6c939 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 21 Jun 2022 04:15:06 +0100
Subject: [PATCH 039/959] Allow encoder config from info.json (#17295)

---
 data/mappings/info_rules.json           |  1 +
 data/schemas/keyboard.jsonschema        | 35 +++++++++++++++
 docs/reference_info_json.md             | 36 +++++++++++++++
 lib/python/qmk/cli/generate/config_h.py | 29 +++++++++++++
 lib/python/qmk/info.py                  | 58 +++++++++++++++++++++++++
 5 files changed, 159 insertions(+)

diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index d4eec37ba0..5cdae962a5 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -13,6 +13,7 @@
     "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
     "BLUETOOTH": {"info_key": "bluetooth.driver"},
     "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"},
+    "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
     "MOUSE_SHARED_EP": {"info_key": "usb.shared_endpoint.mouse", "value_type": "bool"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 52a66cc132..8d9fc4754d 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -2,6 +2,26 @@
     "$schema": "https://json-schema.org/draft/2020-12/schema#",
     "$id": "qmk.keyboard.v1",
     "title": "Keyboard Information",
+    "definitions": {
+        "encoder_config": {
+            "type": "object",
+            "properties": {
+                "rotary": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "required": ["pin_a", "pin_b"],
+                        "properties": {
+                            "pin_a": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                            "pin_b": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                            "resolution": {"$ref": "qmk.definitions.v1#/unsigned_int"} 
+                        }
+                    }
+                }
+            }
+        }
+    },
     "type": "object",
     "properties": {
         "keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"},
@@ -113,6 +133,12 @@
             "type": "array",
             "items": {"$ref": "qmk.definitions.v1#/filename"}
         },
+        "encoder": {
+            "$ref": "#/definitions/encoder_config",
+            "properties": {
+                "enabled": {"type": "boolean"}
+            }
+        },
         "features": {"$ref": "qmk.definitions.v1#/boolean_array"},
         "indicators": {
             "type": "object",
@@ -363,6 +389,15 @@
                         }
                     }
                 },
+                "encoder": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "right": {
+                            "$ref": "#/definitions/encoder_config"
+                        }
+                    }
+                },
                 "main": {
                     "type": "string",
                     "enum": ["eeprom", "left", "matrix_grid", "pin", "right"]
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index 90b28689d0..d2e9346ee3 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -187,3 +187,39 @@ Example:
 ```
 
 The device version is a BCD (binary coded decimal) value, in the format `MMmr`, so the below value would look like `0x0100` in the generated code. This also means the maximum valid values for each part are `99.9.9`, despite it being a hexadecimal value under the hood.
+
+### Encoders
+
+This section controls the basic [rotary encoder](feature_encoders.md) support.
+
+The following items can be set. Not every value is required.
+
+* `pin_a`
+  * __Required__. A pad definition
+* `pin_b`
+  * __Required__. B pad definition
+* `resolution`
+  * How many pulses the encoder registers between each detent
+
+Examples:
+
+```json
+{
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B5", "pin_b": "A2" }
+        ]
+    }
+}
+```
+
+```json
+{
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B5", "pin_b": "A2", "resolution": 4 }
+            { "pin_a": "B6", "pin_b": "A3", "resolution": 2 }
+        ]
+    }
+}
+```
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 893892c479..9d50368aba 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -134,6 +134,29 @@ def generate_config_items(kb_info_json, config_h_lines):
             config_h_lines.append(f'#endif // {config_key}')
 
 
+def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
+    """Generate the config.h lines for encoders."""
+    a_pads = []
+    b_pads = []
+    resolutions = []
+    for encoder in encoder_json.get("rotary", []):
+        a_pads.append(encoder["pin_a"])
+        b_pads.append(encoder["pin_b"])
+        resolutions.append(str(encoder.get("resolution", 4)))
+
+    config_h_lines.append(f'#ifndef ENCODERS_PAD_A{postfix}')
+    config_h_lines.append(f'#   define ENCODERS_PAD_A{postfix} {{ { ", ".join(a_pads) } }}')
+    config_h_lines.append(f'#endif // ENCODERS_PAD_A{postfix}')
+
+    config_h_lines.append(f'#ifndef ENCODERS_PAD_B{postfix}')
+    config_h_lines.append(f'#   define ENCODERS_PAD_B{postfix} {{ { ", ".join(b_pads) } }}')
+    config_h_lines.append(f'#endif // ENCODERS_PAD_B{postfix}')
+
+    config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}')
+    config_h_lines.append(f'#   define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(resolutions) } }}')
+    config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')
+
+
 def generate_split_config(kb_info_json, config_h_lines):
     """Generate the config.h lines for split boards."""
     if 'primary' in kb_info_json['split']:
@@ -173,6 +196,9 @@ def generate_split_config(kb_info_json, config_h_lines):
     if 'right' in kb_info_json['split'].get('matrix_pins', {}):
         config_h_lines.append(matrix_pins(kb_info_json['split']['matrix_pins']['right'], '_RIGHT'))
 
+    if 'right' in kb_info_json['split'].get('encoder', {}):
+        generate_encoder_config(kb_info_json['split']['encoder']['right'], config_h_lines, '_RIGHT')
+
 
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
@@ -198,6 +224,9 @@ def generate_config_h(cli):
     if 'matrix_pins' in kb_info_json:
         config_h_lines.append(matrix_pins(kb_info_json['matrix_pins']))
 
+    if 'encoder' in kb_info_json:
+        generate_encoder_config(kb_info_json['encoder'], config_h_lines)
+
     if 'split' in kb_info_json:
         generate_split_config(kb_info_json, config_h_lines)
 
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 23761d71b7..d308de9db8 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -218,6 +218,62 @@ def _extract_audio(info_data, config_c):
         info_data['audio'] = {'pins': audio_pins}
 
 
+def _extract_encoders_values(config_c, postfix=''):
+    """Common encoder extraction logic
+    """
+    a_pad = config_c.get(f'ENCODERS_PAD_A{postfix}', '').replace(' ', '')[1:-1]
+    b_pad = config_c.get(f'ENCODERS_PAD_B{postfix}', '').replace(' ', '')[1:-1]
+    resolutions = config_c.get(f'ENCODER_RESOLUTIONS{postfix}', '').replace(' ', '')[1:-1]
+
+    default_resolution = config_c.get('ENCODER_RESOLUTION', '4')
+
+    if a_pad and b_pad:
+        a_pad = list(filter(None, a_pad.split(',')))
+        b_pad = list(filter(None, b_pad.split(',')))
+        resolutions = list(filter(None, resolutions.split(',')))
+        resolutions += [default_resolution] * (len(a_pad) - len(resolutions))
+
+        encoders = []
+        for index in range(len(a_pad)):
+            encoders.append({'pin_a': a_pad[index], 'pin_b': b_pad[index], "resolution": int(resolutions[index])})
+
+        return encoders
+
+
+def _extract_encoders(info_data, config_c):
+    """Populate data about encoder pins
+    """
+    encoders = _extract_encoders_values(config_c)
+    if encoders:
+        if 'encoder' not in info_data:
+            info_data['encoder'] = {}
+
+        if 'rotary' in info_data['encoder']:
+            _log_warning(info_data, 'Encoder config is specified in both config.h and info.json (encoder.rotary) (Value: %s), the config.h value wins.' % info_data['encoder']['rotary'])
+
+        info_data['encoder']['rotary'] = encoders
+
+
+def _extract_split_encoders(info_data, config_c):
+    """Populate data about split encoder pins
+    """
+    encoders = _extract_encoders_values(config_c, '_RIGHT')
+    if encoders:
+        if 'split' not in info_data:
+            info_data['split'] = {}
+
+        if 'encoder' not in info_data['split']:
+            info_data['split']['encoder'] = {}
+
+        if 'right' not in info_data['split']['encoder']:
+            info_data['split']['encoder']['right'] = {}
+
+        if 'rotary' in info_data['split']['encoder']['right']:
+            _log_warning(info_data, 'Encoder config is specified in both config.h and info.json (encoder.rotary) (Value: %s), the config.h value wins.' % info_data['split']['encoder']['right']['rotary'])
+
+        info_data['split']['encoder']['right']['rotary'] = encoders
+
+
 def _extract_secure_unlock(info_data, config_c):
     """Populate data about the secure unlock sequence
     """
@@ -506,6 +562,8 @@ def _extract_config_h(info_data, config_c):
     _extract_split_main(info_data, config_c)
     _extract_split_transport(info_data, config_c)
     _extract_split_right_pins(info_data, config_c)
+    _extract_encoders(info_data, config_c)
+    _extract_split_encoders(info_data, config_c)
     _extract_device_version(info_data)
 
     return info_data

From be42c5fb9885d3bcbf47f99ad6cef343ba2b0b97 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Tue, 21 Jun 2022 18:53:34 +0100
Subject: [PATCH 040/959] Fix RGB heatmap to use XY positions and use correct
 led limits (#17184)

* Fix RGB heatmap to use XY positions

* lower effect area limit and make configurable

* tidy up macro

* Fix triggering in both directions.

* add docs

* fix bug when decreasing value

* performance tweak
---
 docs/feature_rgb_matrix.md                    | 17 +++-
 .../animations/typing_heatmap_anim.h          | 80 +++++++++----------
 quantum/rgb_matrix/rgb_matrix.c               | 11 ++-
 3 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 2e88ae4727..9eaf63d710 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -667,7 +667,22 @@ In order to change the delay of temperature decrease define `RGB_MATRIX_TYPING_H
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
 ```
 
-Heatmap effect may not light up the correct adjacent LEDs for certain key matrix layout such as split keyboards. The following define will limit the effect to pressed keys only:
+As heatmap uses the physical position of the leds set in the g_led_config, you may need to tweak the following options to get the best effect for your keyboard. Note the size of this grid is `224x64`.
+
+Limit the distance the effect spreads to surrounding keys. 
+
+```c
+#define RGB_MATRIX_TYPING_HEATMAP_SPREAD 40
+```
+
+Limit how hot surrounding keys get from each press.
+
+```c
+#define RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT 16
+```
+
+Remove the spread effect entirely.
+
 ```c
 #define RGB_MATRIX_TYPING_HEATMAP_SLIM
 ```
diff --git a/quantum/rgb_matrix/animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
index 4b17c4c3ed..cfc3fc015b 100644
--- a/quantum/rgb_matrix/animations/typing_heatmap_anim.h
+++ b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
@@ -6,30 +6,35 @@ RGB_MATRIX_EFFECT(TYPING_HEATMAP)
 #            define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 25
 #        endif
 
+#        ifndef RGB_MATRIX_TYPING_HEATMAP_SPREAD
+#            define RGB_MATRIX_TYPING_HEATMAP_SPREAD 40
+#        endif
+
+#        ifndef RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT
+#            define RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT 16
+#        endif
 void process_rgb_matrix_typing_heatmap(uint8_t row, uint8_t col) {
 #        ifdef RGB_MATRIX_TYPING_HEATMAP_SLIM
     // Limit effect to pressed keys
     g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32);
 #        else
-    uint8_t m_row = row - 1;
-    uint8_t p_row = row + 1;
-    uint8_t m_col = col - 1;
-    uint8_t p_col = col + 1;
-
-    if (m_col < col) g_rgb_frame_buffer[row][m_col] = qadd8(g_rgb_frame_buffer[row][m_col], 16);
-    g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32);
-    if (p_col < MATRIX_COLS) g_rgb_frame_buffer[row][p_col] = qadd8(g_rgb_frame_buffer[row][p_col], 16);
-
-    if (p_row < MATRIX_ROWS) {
-        if (m_col < col) g_rgb_frame_buffer[p_row][m_col] = qadd8(g_rgb_frame_buffer[p_row][m_col], 13);
-        g_rgb_frame_buffer[p_row][col] = qadd8(g_rgb_frame_buffer[p_row][col], 16);
-        if (p_col < MATRIX_COLS) g_rgb_frame_buffer[p_row][p_col] = qadd8(g_rgb_frame_buffer[p_row][p_col], 13);
-    }
-
-    if (m_row < row) {
-        if (m_col < col) g_rgb_frame_buffer[m_row][m_col] = qadd8(g_rgb_frame_buffer[m_row][m_col], 13);
-        g_rgb_frame_buffer[m_row][col] = qadd8(g_rgb_frame_buffer[m_row][col], 16);
-        if (p_col < MATRIX_COLS) g_rgb_frame_buffer[m_row][p_col] = qadd8(g_rgb_frame_buffer[m_row][p_col], 13);
+    for (uint8_t i_row = 0; i_row < MATRIX_ROWS; i_row++) {
+        for (uint8_t i_col = 0; i_col < MATRIX_COLS; i_col++) {
+            if (i_row == row && i_col == col) {
+                g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32);
+            } else {
+#            define LED_DISTANCE(led_a, led_b) sqrt16(((int8_t)(led_a.x - led_b.x) * (int8_t)(led_a.x - led_b.x)) + ((int8_t)(led_a.y - led_b.y) * (int8_t)(led_a.y - led_b.y)))
+                uint8_t distance = LED_DISTANCE(g_led_config.point[g_led_config.matrix_co[row][col]], g_led_config.point[g_led_config.matrix_co[i_row][i_col]]);
+#            undef LED_DISTANCE
+                if (distance <= RGB_MATRIX_TYPING_HEATMAP_SPREAD) {
+                    uint8_t amount = qsub8(RGB_MATRIX_TYPING_HEATMAP_SPREAD, distance);
+                    if (amount > RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT) {
+                        amount = RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT;
+                    }
+                    g_rgb_frame_buffer[i_row][i_col] = qadd8(g_rgb_frame_buffer[i_row][i_col], amount);
+                }
+            }
+        }
     }
 #        endif
 }
@@ -40,10 +45,7 @@ static uint16_t heatmap_decrease_timer;
 static bool decrease_heatmap_values;
 
 bool TYPING_HEATMAP(effect_params_t* params) {
-    // Modified version of RGB_MATRIX_USE_LIMITS to work off of matrix row / col size
-    uint8_t led_min = RGB_MATRIX_LED_PROCESS_LIMIT * params->iter;
-    uint8_t led_max = led_min + RGB_MATRIX_LED_PROCESS_LIMIT;
-    if (led_max > sizeof(g_rgb_frame_buffer)) led_max = sizeof(g_rgb_frame_buffer);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
 
     if (params->init) {
         rgb_matrix_set_color_all(0, 0, 0);
@@ -63,28 +65,26 @@ bool TYPING_HEATMAP(effect_params_t* params) {
     }
 
     // Render heatmap & decrease
-    for (int i = led_min; i < led_max; i++) {
-        uint8_t row = i % MATRIX_ROWS;
-        uint8_t col = i / MATRIX_ROWS;
-        uint8_t val = g_rgb_frame_buffer[row][col];
+    uint8_t count = 0;
+    for (uint8_t row = 0; row < MATRIX_ROWS && count < RGB_MATRIX_LED_PROCESS_LIMIT; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS && RGB_MATRIX_LED_PROCESS_LIMIT; col++) {
+            if (g_led_config.matrix_co[row][col] >= led_min && g_led_config.matrix_co[row][col] < led_max) {
+                count++;
+                uint8_t val = g_rgb_frame_buffer[row][col];
+                if (!HAS_ANY_FLAGS(g_led_config.flags[g_led_config.matrix_co[row][col]], params->flags)) continue;
 
-        // set the pixel colour
-        uint8_t led[LED_HITS_TO_REMEMBER];
-        uint8_t led_count = rgb_matrix_map_row_column_to_led(row, col, led);
-        for (uint8_t j = 0; j < led_count; ++j) {
-            if (!HAS_ANY_FLAGS(g_led_config.flags[led[j]], params->flags)) continue;
+                HSV hsv = {170 - qsub8(val, 85), rgb_matrix_config.hsv.s, scale8((qadd8(170, val) - 170) * 3, rgb_matrix_config.hsv.v)};
+                RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+                rgb_matrix_set_color(g_led_config.matrix_co[row][col], rgb.r, rgb.g, rgb.b);
 
-            HSV hsv = {170 - qsub8(val, 85), rgb_matrix_config.hsv.s, scale8((qadd8(170, val) - 170) * 3, rgb_matrix_config.hsv.v)};
-            RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
-            rgb_matrix_set_color(led[j], rgb.r, rgb.g, rgb.b);
-        }
-
-        if (decrease_heatmap_values) {
-            g_rgb_frame_buffer[row][col] = qsub8(val, 1);
+                if (decrease_heatmap_values) {
+                    g_rgb_frame_buffer[row][col] = qsub8(val, 1);
+                }
+            }
         }
     }
 
-    return led_max < sizeof(g_rgb_frame_buffer);
+    return rgb_matrix_check_finished_leds(led_max);
 }
 
 #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index f721dfc7f2..a51e379025 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -249,8 +249,15 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
 #endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
-    if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) {
-        process_rgb_matrix_typing_heatmap(row, col);
+#    if defined(RGB_MATRIX_KEYRELEASES)
+    if (!pressed)
+#    else
+    if (pressed)
+#    endif // defined(RGB_MATRIX_KEYRELEASES)
+    {
+        if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) {
+            process_rgb_matrix_typing_heatmap(row, col);
+        }
     }
 #endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
 }

From 608404f8742f01d1821a74c5a107e0c62b046423 Mon Sep 17 00:00:00 2001
From: Daniel Kao <daniel.m.kao@gmail.com>
Date: Tue, 21 Jun 2022 15:00:04 -0700
Subject: [PATCH 041/959] Fix AVR I2C master 1ms timeout (#17174)

* avr i2c_master: Fix 1ms timeout

i2c_start() produces a minimum time_slice of 1ms for use as timeout
value.
The timer granularity is 1ms, it is entirely possible for timer_count
to tick up immediately after the last timer read and falsely trigger
timeout with a '>= 1' comparison.

* avr/drivers/i2c_master: Use timer_elapsed()
---
 platforms/avr/drivers/i2c_master.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platforms/avr/drivers/i2c_master.c b/platforms/avr/drivers/i2c_master.c
index c1a7b5f72d..524494c99d 100644
--- a/platforms/avr/drivers/i2c_master.c
+++ b/platforms/avr/drivers/i2c_master.c
@@ -64,7 +64,7 @@ static i2c_status_t i2c_start_impl(uint8_t address, uint16_t timeout) {
 
     uint16_t timeout_timer = timer_read();
     while (!(TWCR & (1 << TWINT))) {
-        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) {
+        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {
             return I2C_STATUS_TIMEOUT;
         }
     }
@@ -81,7 +81,7 @@ static i2c_status_t i2c_start_impl(uint8_t address, uint16_t timeout) {
 
     timeout_timer = timer_read();
     while (!(TWCR & (1 << TWINT))) {
-        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) {
+        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {
             return I2C_STATUS_TIMEOUT;
         }
     }
@@ -102,7 +102,7 @@ i2c_status_t i2c_start(uint8_t address, uint16_t timeout) {
     i2c_status_t status;
     do {
         status = i2c_start_impl(address, time_slice);
-    } while ((status < 0) && ((timeout == I2C_TIMEOUT_INFINITE) || (timer_elapsed(timeout_timer) < timeout)));
+    } while ((status < 0) && ((timeout == I2C_TIMEOUT_INFINITE) || (timer_elapsed(timeout_timer) <= timeout)));
     return status;
 }
 
@@ -114,7 +114,7 @@ i2c_status_t i2c_write(uint8_t data, uint16_t timeout) {
 
     uint16_t timeout_timer = timer_read();
     while (!(TWCR & (1 << TWINT))) {
-        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) {
+        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {
             return I2C_STATUS_TIMEOUT;
         }
     }
@@ -132,7 +132,7 @@ int16_t i2c_read_ack(uint16_t timeout) {
 
     uint16_t timeout_timer = timer_read();
     while (!(TWCR & (1 << TWINT))) {
-        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) {
+        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {
             return I2C_STATUS_TIMEOUT;
         }
     }
@@ -147,7 +147,7 @@ int16_t i2c_read_nack(uint16_t timeout) {
 
     uint16_t timeout_timer = timer_read();
     while (!(TWCR & (1 << TWINT))) {
-        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) {
+        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {
             return I2C_STATUS_TIMEOUT;
         }
     }

From eac0f6d4c99edf37903b14b7b71492fab69d4b08 Mon Sep 17 00:00:00 2001
From: Kyle McCreery <mccreery.kyle@gmail.com>
Date: Wed, 22 Jun 2022 15:59:37 -0400
Subject: [PATCH 042/959] Cirque Attenuation Setting (#17342)

---
 docs/feature_pointing_device.md   | 24 ++++++++++++++++--------
 drivers/sensors/cirque_pinnacle.c |  7 ++++++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 250e2843f6..5dacc9f5ab 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -72,7 +72,6 @@ The Analog Joystick is an analog (ADC) driven sensor.  There are a variety of jo
 |`ANALOG_JOYSTICK_SPEED_MAX`       | (Optional) The maximum value used for motion.                              | `2`           |
 |`ANALOG_JOYSTICK_CLICK_PIN`       | (Optional) The pin wired up to the press switch of the analog stick.       | _not defined_ |
 
-
 ### Cirque Trackpad
 
 To use the Cirque Trackpad sensor, add this to your `rules.mk`:
@@ -96,21 +95,30 @@ This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the
 |`CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.                         | `1919`                |
 |`CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.                         | `63`                  |
 |`CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.                         | `1471`                |
+|`CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.                             | `ADC_ATTENUATE_4X`    |
 |`CIRQUE_PINNACLE_TAPPING_TERM`   | (Optional) Length of time that a touch can be to be considered a tap.           | `TAPPING_TERM`/`200`  |
 |`CIRQUE_PINNACLE_TOUCH_DEBOUNCE` | (Optional) Length of time that a touch can be to be considered a tap.           | `TAPPING_TERM`/`200`  |
 
+**`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be. 
+
+Default attenuation is set to 4X, although if you are using a thicker overlay (such as the curved overlay) you will want a lower attenuation such as 2X. The possible values are:
+* `ADC_ATTENUATE_4X`: Least sensitive
+* `ADC_ATTENUATE_3X`
+* `ADC_ATTENUATE_2X`
+* `ADC_ATTENUATE_1X`: Most sensitive
+
 | I2C Setting              | Description                                                                     | Default |
 |--------------------------|---------------------------------------------------------------------------------|---------|
 |`CIRQUE_PINNACLE_ADDR`    | (Required) Sets the I2C Address for the Cirque Trackpad                         | `0x2A`  |
 |`CIRQUE_PINNACLE_TIMEOUT` | (Optional) The timeout for i2c communication with the trackpad in milliseconds. | `20`    |
 
-| SPI Setting                   | Description                                                            | Default       |
-|-------------------------------|------------------------------------------------------------------------|---------------|
-|`CIRQUE_PINNACLE_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `1000000`     |
-|`CIRQUE_PINNACLE_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
-|`CIRQUE_PINNACLE_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `1`           |
-|`CIRQUE_PINNACLE_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
-|`CIRQUE_PINNACLE_SPI_CS_PIN`   | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
+| SPI Setting                   | Description                                                            | Default        |
+|-------------------------------|------------------------------------------------------------------------|----------------|
+|`CIRQUE_PINNACLE_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `1000000`      |
+|`CIRQUE_PINNACLE_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`        |
+|`CIRQUE_PINNACLE_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `1`            |
+|`CIRQUE_PINNACLE_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_       |
+|`CIRQUE_PINNACLE_SPI_CS_PIN`   | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_  |
 
 Default Scaling/CPI is 1024.
 
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index 2db7f916fe..670b96f2fb 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -38,6 +38,10 @@
 #define ADC_ATTENUATE_3X     0x80
 #define ADC_ATTENUATE_4X     0xC0
 
+#ifndef CIRQUE_PINNACLE_ATTENUATION
+#    define CIRQUE_PINNACLE_ATTENUATION ADC_ATTENUATE_4X
+#endif
+
 // Register config values for this demo
 #define SYSCONFIG_1_VALUE    0x00
 #define FEEDCONFIG_1_VALUE   0x03  // 0x03 for absolute mode 0x01 for relative mode
@@ -213,7 +217,8 @@ void cirque_pinnacle_init(void) {
     // Host sets z-idle packet count to 5 (default is 30)
     RAP_Write(Z_IDLE_COUNT, Z_IDLE_COUNT_VALUE);
 
-    cirque_pinnacle_set_adc_attenuation(0xFF);
+    cirque_pinnacle_set_adc_attenuation(CIRQUE_PINNACLE_ATTENUATION);
+
     cirque_pinnacle_tune_edge_sensitivity();
     cirque_pinnacle_enable_feed(true);
 }

From 9aa9155e880da4d408a4da19ff56007046a0d3b9 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 23 Jun 2022 00:37:40 +0200
Subject: [PATCH 043/959] [Core] Mark GD32VF103 as ChibiOS-Contrib (#17444)

---
 platforms/chibios/platform.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index 21751f23fd..a30ca62bf5 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -36,6 +36,7 @@ ifeq ($(strip $(MCU)), risc-v)
     # RISC-V Support
     # As of 7.4.2021 there is only one supported RISC-V platform in Chibios-Contrib,
     # therefore all required settings are hard-coded
+    USE_CHIBIOS_CONTRIB = yes
     STARTUP_MK = $(CHIBIOS_CONTRIB)/os/common/startup/RISCV-ECLIC/compilers/GCC/mk/startup_$(MCU_STARTUP).mk
     PORT_V = $(CHIBIOS_CONTRIB)/os/common/ports/RISCV-ECLIC/compilers/GCC/mk/port.mk
     RULESPATH = $(CHIBIOS_CONTRIB)/os/common/startup/RISCV-ECLIC/compilers/GCC

From d3858585ac571e6aa41dba285a6dd4f95bc73aa2 Mon Sep 17 00:00:00 2001
From: Jamal Bouajjaj <develop@electro707.com>
Date: Wed, 22 Jun 2022 21:16:39 -0400
Subject: [PATCH 044/959] Added global current to all other issi drivers who
 don't have it (#17448)

---
 docs/feature_rgb_matrix.md           | 1 +
 drivers/led/issi/is31fl3733-simple.c | 6 +++++-
 drivers/led/issi/is31fl3733.c        | 6 +++++-
 drivers/led/issi/is31fl3736.c        | 6 +++++-
 drivers/led/issi/is31fl3741.c        | 6 +++++-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 9eaf63d710..247b77bcb1 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -86,6 +86,7 @@ You can use between 1 and 4 IS31FL3733 IC's. Do not specify `DRIVER_ADDR_<N>` de
 | `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
 | `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
 | `ISSI_PWM_FREQUENCY` | (Optional) PWM Frequency Setting - IS31FL3733B only | 0 |
+| `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF |
 | `ISSI_SWPULLUP` | (Optional) Set the value of the SWx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `ISSI_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
index af006f756d..2f41a7b1a9 100644
--- a/drivers/led/issi/is31fl3733-simple.c
+++ b/drivers/led/issi/is31fl3733-simple.c
@@ -70,6 +70,10 @@
 #    define ISSI_CSPULLUP PUR_0R
 #endif
 
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+
 // Transfer buffer for TWITransmitData()
 uint8_t g_twi_transfer_buffer[20];
 
@@ -182,7 +186,7 @@ void IS31FL3733_init(uint8_t addr, uint8_t sync) {
     // Set de-ghost pull-down resistors (CSx)
     IS31FL3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
     IS31FL3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
index a2fdaa90fa..add998f256 100644
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -69,6 +69,10 @@
 #    define ISSI_CSPULLUP PUR_0R
 #endif
 
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+
 // Transfer buffer for TWITransmitData()
 uint8_t g_twi_transfer_buffer[20];
 
@@ -172,7 +176,7 @@ void IS31FL3733_init(uint8_t addr, uint8_t sync) {
     // Set de-ghost pull-down resistors (CSx)
     IS31FL3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
     IS31FL3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
index 7752a3f6cb..e9943614d2 100644
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -63,6 +63,10 @@
 #    define ISSI_CSPULLUP PUR_0R
 #endif
 
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+
 // Transfer buffer for TWITransmitData()
 uint8_t g_twi_transfer_buffer[20];
 
@@ -154,7 +158,7 @@ void IS31FL3736_init(uint8_t addr) {
     // Set de-ghost pull-down resistors (CSx)
     IS31FL3736_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3736_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    IS31FL3736_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
     IS31FL3736_write_register(addr, ISSI_REG_CONFIGURATION, 0x01);
 
diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
index 393b0179b5..ba6b6761a3 100644
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -69,6 +69,10 @@
 #    define ISSI_CSPULLUP PUR_32KR
 #endif
 
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+
 #define ISSI_MAX_LEDS 351
 
 // Transfer buffer for TWITransmitData()
@@ -163,7 +167,7 @@ void IS31FL3741_init(uint8_t addr) {
     IS31FL3741_write_register(addr, ISSI_REG_CONFIGURATION, 0x01);
 
     // Set Golbal Current Control Register
-    IS31FL3741_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    IS31FL3741_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Set Pull up & Down for SWx CSy
     IS31FL3741_write_register(addr, ISSI_REG_PULLDOWNUP, ((ISSI_CSPULLUP << 4) | ISSI_SWPULLUP));
 

From 2239527871deef1253ebe885df167726a100f971 Mon Sep 17 00:00:00 2001
From: SmugSam <88806297+SmugSam@users.noreply.github.com>
Date: Wed, 22 Jun 2022 21:47:15 -0400
Subject: [PATCH 045/959] In honor of king terry (#17387)

---
 quantum/audio/song_list.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h
index 3e425abb47..ff22e6fe95 100644
--- a/quantum/audio/song_list.h
+++ b/quantum/audio/song_list.h
@@ -144,6 +144,12 @@
  */
 #define USSR_ANTHEM B__NOTE(_G6), B__NOTE(_C7), W__NOTE(_G6), H__NOTE(_A6), B__NOTE(_B6), W__NOTE(_E6), W__NOTE(_E6), B__NOTE(_A6), W__NOTE(_G6), H__NOTE(_F6), B__NOTE(_G6), W__NOTE(_C6), W__NOTE(_C6), B__NOTE(_D6), W__NOTE(_D6), W__NOTE(_E6), B__NOTE(_D6), W__NOTE(_D6), W__NOTE(_G6), B__NOTE(_F6), W__NOTE(_G6), W__NOTE(_A6), B__NOTE(_B6),
 
+/* Title:            Hymn Risen
+ * Author/Composer:  Terrance Andrew Davis
+ * License:          Public Domain
+ */
+#define TOS_HYMN_RISEN H__NOTE(_D5), H__NOTE(_E5), HD_NOTE(_F5), HD_NOTE(_F5), H__NOTE(_F5), HD_NOTE(_D5), E__NOTE(_E5), E__NOTE(_E5), H__NOTE(_C5), Q__NOTE(_D5), Q__NOTE(_D5), H__NOTE(_E5), H__NOTE(_C5), Q__NOTE(_G5), Q__NOTE(_F5), H__NOTE(_D5), H__NOTE(_E5), HD_NOTE(_F5), HD_NOTE(_F5), H__NOTE(_F5), HD_NOTE(_D5), E__NOTE(_E5), E__NOTE(_E5), H__NOTE(_C5), Q__NOTE(_D5), Q__NOTE(_D5), H__NOTE(_E5), H__NOTE(_C5), Q__NOTE(_G5), Q__NOTE(_F5), H__NOTE(_D5), H__NOTE(_C5), W__NOTE(_D5), W__NOTE(_E5), Q__NOTE(_A4), H__NOTE(_A4), Q__NOTE(_E5), Q__NOTE(_E5), Q__NOTE(_F5), Q__NOTE(_E5), Q__NOTE(_D5), Q__NOTE(_G5), Q__NOTE(_B4), Q__NOTE(_D5), Q__NOTE(_C5), M__NOTE(_F5, 80), H__NOTE(_D5), H__NOTE(_C5), W__NOTE(_D5), W__NOTE(_E5), Q__NOTE(_A4), H__NOTE(_A4), Q__NOTE(_E5), Q__NOTE(_E5), Q__NOTE(_F5), Q__NOTE(_E5), Q__NOTE(_D5), Q__NOTE(_G5), Q__NOTE(_B4), Q__NOTE(_D5), Q__NOTE(_C5), M__NOTE(_F5, 80)
+
 /* Removed sounds
  +   This list is here solely for compatibility, so that removed songs don't just break things
  *   If you think that any of these songs were wrongfully removed, let us know and provide

From 7060cb7b267e78ba693a77a3346c77c2d4209b01 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Thu, 23 Jun 2022 20:43:24 +0200
Subject: [PATCH 046/959] Refactor steno and add `STENO_PROTOCOL =
 [all|txbolt|geminipr]` (#17065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Refactor steno into STENO_ENABLE_[ALL|GEMINI|BOLT]

* Update stenography documentation

* STENO_ENABLE_TXBOLT → STENO_ENABLE_BOLT

TXBOLT is a better name but BOLT is more consistent with the
pre-existing TX Bolt related constants, which all drop the "TX " prefix

* Comments

* STENO_ENABLE_[GEMINI|BOLT|ALL] → STENO_PROTOCOL = [geminipr|txbolt|all]

* Add note on lacking V-USB support

* Clear chord at the end of the switch(mode){send_steno_chord} block

* Return true if NOEVENT

* update_chord_xxx → add_xxx_key_to_chord

* Enable the defines for all the protocols if STENO_PROTOCOL = all

* Mention how to use `steno_set_mode`

* Set the default steno protocol to "all"

This is done so that existing keymaps invoking `steno_set_mode` don't
all suddenly break

* Add data driver equivalents for stenography feature

* Document format of serial steno packets

(Thanks dnaq)

* Add missing comma
---
 builddefs/common_features.mk            |  25 +-
 builddefs/show_options.mk               |   1 +
 data/mappings/info_rules.json           |   2 +
 data/schemas/keyboard.jsonschema        |  11 +
 docs/feature_stenography.md             | 127 +++++++---
 quantum/keyboard.c                      |   2 +-
 quantum/keymap_extras/keymap_steno.h    |  28 +++
 quantum/process_keycode/process_steno.c | 316 +++++++++++++-----------
 quantum/process_keycode/process_steno.h |  24 +-
 9 files changed, 353 insertions(+), 183 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 83505596d2..b9ee0a30a7 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -92,10 +92,29 @@ ifeq ($(MUSIC_ENABLE), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_music.c
 endif
 
+VALID_STENO_PROTOCOL_TYPES := geminipr txbolt all
+STENO_PROTOCOL ?= all
 ifeq ($(strip $(STENO_ENABLE)), yes)
-    OPT_DEFS += -DSTENO_ENABLE
-    VIRTSER_ENABLE ?= yes
-    SRC += $(QUANTUM_DIR)/process_keycode/process_steno.c
+    ifeq ($(filter $(STENO_PROTOCOL),$(VALID_STENO_PROTOCOL_TYPES)),)
+        $(call CATASTROPHIC_ERROR,Invalid STENO_PROTOCOL,STENO_PROTOCOL="$(STENO_PROTOCOL)" is not a valid stenography protocol)
+    else
+        OPT_DEFS += -DSTENO_ENABLE
+        VIRTSER_ENABLE ?= yes
+
+        ifeq ($(strip $(STENO_PROTOCOL)), geminipr)
+            OPT_DEFS += -DSTENO_ENABLE_GEMINI
+        endif
+        ifeq ($(strip $(STENO_PROTOCOL)), txbolt)
+            OPT_DEFS += -DSTENO_ENABLE_BOLT
+        endif
+        ifeq ($(strip $(STENO_PROTOCOL)), all)
+            OPT_DEFS += -DSTENO_ENABLE_ALL
+            OPT_DEFS += -DSTENO_ENABLE_GEMINI
+            OPT_DEFS += -DSTENO_ENABLE_BOLT
+        endif
+
+        SRC += $(QUANTUM_DIR)/process_keycode/process_steno.c
+    endif
 endif
 
 ifeq ($(strip $(VIRTSER_ENABLE)), yes)
diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
index 1c1c189f27..98537e6da2 100644
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@@ -45,6 +45,7 @@ OTHER_OPTION_NAMES = \
   LEADER_ENABLE \
   PRINTING_ENABLE \
   STENO_ENABLE \
+  STENO_PROTOCOL \
   TAP_DANCE_ENABLE \
   VIRTSER_ENABLE \
   OLED_ENABLE \
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index 5cdae962a5..279b5ac213 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -28,6 +28,8 @@
     "SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"},
     "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
     "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"},
+    "STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"},
+    "STENO_PROTOCOL": {"info_key": "stenography.protocol"},
 
     # Items we want flagged in lint
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 8d9fc4754d..ec5377b3b3 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -361,6 +361,17 @@
                 }
             }
         },
+        "stenography": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "enabled": {"type": "boolean"},
+                "protocol": {
+                    "type": "string",
+                    "enum": ["all", "geminipr", "txbolt"]
+                }
+            }
+        },
         "split": {
             "type": "object",
             "additionalProperties": false,
diff --git a/docs/feature_stenography.md b/docs/feature_stenography.md
index 2b52bb17a6..e13fe845c5 100644
--- a/docs/feature_stenography.md
+++ b/docs/feature_stenography.md
@@ -8,46 +8,107 @@ The [Open Steno Project](https://www.openstenoproject.org/) has built an open-so
 
 Plover can work with any standard QWERTY keyboard, although it is more efficient if the keyboard supports NKRO (n-key rollover) to allow Plover to see all the pressed keys at once. An example keymap for Plover can be found in `planck/keymaps/default`. Switching to the `PLOVER` layer adjusts the position of the keyboard to support the number bar.
 
-To use Plover with QMK just enable NKRO and optionally adjust your layout if you have anything other than a standard layout. You may also want to purchase some steno-friendly keycaps to make it easier to hit multiple keys.
+To enable NKRO, add `NKRO_ENABLE = yes` in your `rules.mk` and make sure to press `NK_ON` to turn it on because `NKRO_ENABLE = yes` merely adds the possibility of switching to NKRO mode but it doesn't automatically switch to it. If you want to automatically switch, add `#define FORCE_NKRO` in your `config.h`.
+
+You may also need to adjust your layout, either in QMK or in Plover, if you have anything other than a standard layout. You may also want to purchase some steno-friendly keycaps to make it easier to hit multiple keys.
 
 ## Plover with Steno Protocol :id=plover-with-steno-protocol
 
-Plover also understands the language of several steno machines. QMK can speak a couple of these languages, TX Bolt and GeminiPR. An example layout can be found in `planck/keymaps/steno`.
+Plover also understands the language of several steno machines. QMK can speak a couple of these languages: TX Bolt and GeminiPR. An example layout can be found in `planck/keymaps/steno`.
 
-When QMK speaks to Plover over a steno protocol Plover will not use the keyboard as input. This means that you can switch back and forth between a standard keyboard and your steno keyboard, or even switch layers from Plover to standard and back without needing to activate/deactivate Plover.
+When QMK speaks to Plover over a steno protocol, Plover will not use the keyboard as input. This means that you can switch back and forth between a standard keyboard and your steno keyboard, or even switch layers from Plover to standard and back without needing to activate/deactivate Plover.
 
-In this mode Plover expects to speak with a steno machine over a serial port so QMK will present itself to the operating system as a virtual serial port in addition to a keyboard. By default QMK will speak the TX Bolt protocol but can be switched to GeminiPR; the last protocol used is stored in non-volatile memory so QMK will use the same protocol on restart.
+In this mode, Plover expects to speak with a steno machine over a serial port so QMK will present itself to the operating system as a virtual serial port in addition to a keyboard.
 
-> Note: Due to hardware limitations you may not be able to run both a virtual serial port and mouse emulation at the same time.
+> Note: Due to hardware limitations, you might not be able to run both a virtual serial port and mouse emulation at the same time.
+
+!> Serial stenography protocols are not supported on [V-USB keyboards](compatible_microcontrollers#atmel-avr).
+
+To enable stenography protocols, add the following lines to your `rules.mk`:
+```mk
+STENO_ENABLE = yes
+```
 
 ### TX Bolt :id=tx-bolt
 
-TX Bolt communicates the status of 24 keys over a very simple protocol in variable-sized (1-5 byte) packets.
+TX Bolt communicates the status of 24 keys over a simple protocol in variable-sized (1&ndash;4 bytes) packets.
+
+To select TX Bolt, add the following lines to your `rules.mk`:
+```mk
+STENO_ENABLE = yes
+STENO_PROTOCOL = txbolt
+```
+
+Each byte of the packet represents a different group of steno keys. Determining the group of a certain byte of the packet is done by checking the first two bits, the remaining bits are set if the corresponding steno key was pressed for the stroke. The last set of keys (as indicated by leading `11`) needs to keep track of less keys than there are bits so one of the bits is constantly 0.
+
+The start of a new packet can be detected by comparing the group “ID” (the two MSBs) of the current byte to that of the previously received byte. If the group “ID” of the current byte is smaller or equal to that of the previous byte, it means that the current byte is the beginning of a new packet.
+
+The format of TX Bolt packets is shown below.
+```
+00HWPKTS 01UE*OAR 10GLBPRF 110#ZDST
+```
+
+Examples of steno strokes and the associated packet:
+- `EUBG`    = `01110000 10101000`
+- `WAZ`     = `00010000 01000010 11001000`
+- `PHAPBGS` = `00101000 01000010 10101100 11000010`
 
 ### GeminiPR :id=geminipr
 
-GeminiPR encodes 42 keys into a 6-byte packet. While TX Bolt contains everything that is necessary for standard stenography, GeminiPR opens up many more options, including supporting non-English theories.
+GeminiPR encodes 42 keys into a 6-byte packet. While TX Bolt contains everything that is necessary for standard stenography, GeminiPR opens up many more options, including differentiating between top and bottom `S-`, and supporting non-English theories.
+
+To select GeminiPR, add the following lines to your `rules.mk`:
+```mk
+STENO_ENABLE = yes
+STENO_PROTOCOL = geminipr
+```
+
+All packets in the GeminiPR protocol consist of exactly six bytes, used as bit-arrays for different groups of keys. The beginning of a packet is indicated by setting the most significant bit (MSB) to 1 while setting the MSB of the remaining five bytes to 0.
+
+The format of GeminiPR packets is shown below.
+```
+1 Fn  #1  #2 #3 #4 #5   #6
+0 S1- S2- T- K- P- W-   H-
+0 R-  A-  O- *1 *2 res1 res2
+0 pwr *3  *4 -E -U -F   -R
+0 -P  -B  -L -G -T -S   -D
+0 #7  #8  #9 #A #B #C   -Z
+```
+
+Examples of steno strokes and the associated packet:
+- `EUBG`    = `10000000 00000000 00000000 00001100 00101000 00000000`
+- `WAZ`     = `10000000 00000010 00100000 00000000 00000000 00000001`
+- `PHAPBGS` = `10000000 00000101 00100000 00000000 01101010 00000000`
+
+### Switching protocols on the fly :id=switching-protocols-on-the-fly
+
+If you wish to switch the serial protocol used to transfer the steno chords without having to recompile your keyboard firmware every time, you can press the `QK_STENO_BOLT` and `QK_STENO_GEMINI` keycodes in order to switch protocols on the fly.
+
+To enable these special keycodes, add the following lines to your `rules.mk`:
+```mk
+STENO_ENABLE = yes
+STENO_PROTOCOL = all
+```
+
+If you want to switch protocols programatically, as part of a custom macro for example, don't use `tap_code(QK_STENO_*)`, as `tap_code` only supports [basic keycodes](keycodes_basic). Instead, you should use `steno_set_mode(STENO_MODE_*)`, whose valid arguments are `STENO_MODE_BOLT` and `STENO_MODE_GEMINI`.
+
+The default protocol is Gemini PR but the last protocol used is stored in non-volatile memory so QMK will remember your choice between reboots of your keyboard &mdash; assuming that your keyboard features (emulated) EEPROM.
+
+Naturally, this option takes the most amount of firmware space as it needs to compile the code for all the available stenography protocols. In most cases, compiling a single stenography protocol is sufficient.
+
+The default value for `STENO_PROTOCOL` is `all`.
 
 ## Configuring QMK for Steno :id=configuring-qmk-for-steno
 
-Firstly, enable steno in your keymap's Makefile. You may also need disable mousekeys, extra keys, or another USB endpoint to prevent conflicts. The builtin USB stack for some processors only supports a certain number of USB endpoints and the virtual serial port needed for steno fills 3 of them.
+After enabling stenography and optionally selecting a protocol, you may also need disable mouse keys, extra keys, or another USB endpoint to prevent conflicts. The builtin USB stack for some processors only supports a certain number of USB endpoints and the virtual serial port needed for steno fills 3 of them.
 
-```make
-STENO_ENABLE = yes
-MOUSEKEY_ENABLE = no
-```
+!> If you had *explicitly* set `VIRSTER_ENABLE = no`, none of the serial stenography protocols (GeminiPR, TX Bolt) will work properly. You are expected to either set it to `yes`, remove the line from your `rules.mk` or send the steno chords yourself in an alternative way using the [provided interceptable hooks](#interfacing-with-the-code).
 
-In your keymap create a new layer for Plover. You will need to include `keymap_steno.h`. See `planck/keymaps/steno/keymap.c` for an example. Remember to create a key to switch to the layer as well as a key for exiting the layer. If you would like to switch modes on the fly you can use the keycodes `QK_STENO_BOLT` and `QK_STENO_GEMINI`. If you only want to use one of the protocols you may set it up in your initialization function:
+In your keymap, create a new layer for Plover, that you can fill in with the [steno keycodes](#keycode-reference) (you will need to include `keymap_steno.h`, see `planck/keymaps/steno/keymap.c` for an example). Remember to create a key to switch to the layer as well as a key for exiting the layer.
 
-```c
-void eeconfig_init_user() {
-    steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
-}
-```
+Once you have your keyboard flashed, launch Plover. Click the 'Configure...' button. In the 'Machine' tab, select the Stenotype Machine that corresponds to your desired protocol. Click the 'Configure...' button on this tab and enter the serial port or click 'Scan'. Baud rate is fine at 9600 (although you should be able to set as high as 115200 with no issues). Use the default settings for everything else (Data Bits: 8, Stop Bits: 1, Parity: N, no flow control).
 
-Once you have your keyboard flashed launch Plover. Click the 'Configure...' button. In the 'Machine' tab select the Stenotype Machine that corresponds to your desired protocol. Click the 'Configure...' button on this tab and enter the serial port or click 'Scan'. Baud rate is fine at 9600 (although you should be able to set as high as 115200 with no issues). Use the default settings for everything else (Data Bits: 8, Stop Bits: 1, Parity: N, no flow control).
-
-On the display tab click 'Open stroke display'. With Plover disabled you should be able to hit keys on your keyboard and see them show up in the stroke display window. Use this to make sure you have set up your keymap correctly. You are now ready to steno!
+To test your keymap, you can chord keys on your keyboard and either look at the output of the 'paper tape' (Tools > Paper Tape) or that of the 'layout display' (Tools > Layout Display). If your strokes correctly show up, you are now ready to steno!
 
 ## Learning Stenography :id=learning-stenography
 
@@ -60,7 +121,7 @@ On the display tab click 'Open stroke display'. With Plover disabled you should
 The steno code has three interceptable hooks. If you define these functions, they will be called at certain points in processing; if they return true, processing continues, otherwise it's assumed you handled things.
 
 ```c
-bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]);
+bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE]);
 ```
 
 This function is called when a chord is about to be sent. Mode will be one of `STENO_MODE_BOLT` or `STENO_MODE_GEMINI`. This represents the actual chord that would be sent via whichever protocol. You can modify the chord provided to alter what gets sent. Remember to return true if you want the regular sending process to happen.
@@ -72,15 +133,23 @@ bool process_steno_user(uint16_t keycode, keyrecord_t *record) { return true; }
 This function is called when a keypress has come in, before it is processed. The keycode should be one of `QK_STENO_BOLT`, `QK_STENO_GEMINI`, or one of the `STN_*` key values.
 
 ```c
-bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed);
+bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE], int8_t n_pressed_keys);
 ```
 
-This function is called after a key has been processed, but before any decision about whether or not to send a chord. If `IS_PRESSED(record->event)` is false, and `pressed` is 0 or 1, the chord will be sent shortly, but has not yet been sent. This is where to put hooks for things like, say, live displays of steno chords or keys.
+This function is called after a key has been processed, but before any decision about whether or not to send a chord. This is where to put hooks for things like, say, live displays of steno chords or keys.
 
+If `IS_PRESSED(record->event)` is false, and `n_pressed_keys` is 0 or 1, the chord will be sent shortly, but has not yet been sent. This relieves you of the need of keeping track of where a packet ends and another begins.
+
+The `chord` argument contains the packet of the current chord as specified by the protocol in use. This is *NOT* simply a list of chorded steno keys of the form `[STN_E, STN_U, STN_BR, STN_GR]`. Refer to the appropriate protocol section of this document to learn more about the format of the packets in your steno protocol/mode of choice.
+
+The `n_pressed_keys` argument is the number of physical keys actually being held down.
+This is not always equal to the number of bits set to 1 (aka the [Hamming weight](https://en.wikipedia.org/wiki/Hamming_weight)) in `chord` because it is possible to simultaneously press down four keys, then release three of those four keys and then press yet another key while the fourth finger is still holding down its key.
+At the end of this scenario given as an example, `chord` would have five bits set to 1 but
+`n_pressed_keys` would be set to 2 because there are only two keys currently being pressed down.
 
 ## Keycode Reference :id=keycode-reference
 
-As defined in `keymap_steno.h`.
+You must include `keymap_steno.h` to your `keymap.c` with `#include "keymap_steno.h"` before you can use these keycodes
 
 > Note: TX Bolt does not support the full set of keys. The TX Bolt implementation in QMK will map the GeminiPR keys to the nearest TX Bolt key so that one key map will work for both.
 
@@ -124,10 +193,10 @@ As defined in `keymap_steno.h`.
 |`STN_SR`|`STN_SR`| `-S`|
 |`STN_DR`|`STN_DR`| `-D`|
 |`STN_ZR`|`STN_ZR`| `-Z`|
-|`STN_FN`|| (GeminiPR only)|
-|`STN_RES1`||(GeminiPR only)|
-|`STN_RES2`||(GeminiPR only)|
-|`STN_PWR`||(GeminiPR only)|
+|`STN_FN`|| (Function)|
+|`STN_RES1`||(Reset 1)|
+|`STN_RES2`||(Reset 2)|
+|`STN_PWR`||(Power)|
 
 If you do not want to hit two keys with one finger combined keycodes can be used. These are also defined in `keymap_steno.h`, and causes both keys to be reported as pressed or released. To use these keycodes define `STENO_COMBINEDMAP` in your `config.h` file.
 
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index a65f9d6d18..8273299a9a 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -381,7 +381,7 @@ void keyboard_init(void) {
 #ifdef ENCODER_ENABLE
     encoder_init();
 #endif
-#ifdef STENO_ENABLE
+#ifdef STENO_ENABLE_ALL
     steno_init();
 #endif
 #ifdef POINTING_DEVICE_ENABLE
diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h
index e888ccd643..07d96b7465 100644
--- a/quantum/keymap_extras/keymap_steno.h
+++ b/quantum/keymap_extras/keymap_steno.h
@@ -89,3 +89,31 @@ enum steno_combined_keycodes {
     STN_COMB_MAX = STN_EU,
 };
 #endif
+
+#ifdef STENO_ENABLE_BOLT
+// TxBolt Codes
+#    define TXB_NUL 0
+#    define TXB_S_L 0b00000001
+#    define TXB_T_L 0b00000010
+#    define TXB_K_L 0b00000100
+#    define TXB_P_L 0b00001000
+#    define TXB_W_L 0b00010000
+#    define TXB_H_L 0b00100000
+#    define TXB_R_L 0b01000001
+#    define TXB_A_L 0b01000010
+#    define TXB_O_L 0b01000100
+#    define TXB_STR 0b01001000
+#    define TXB_E_R 0b01010000
+#    define TXB_U_R 0b01100000
+#    define TXB_F_R 0b10000001
+#    define TXB_R_R 0b10000010
+#    define TXB_P_R 0b10000100
+#    define TXB_B_R 0b10001000
+#    define TXB_L_R 0b10010000
+#    define TXB_G_R 0b10100000
+#    define TXB_T_R 0b11000001
+#    define TXB_S_R 0b11000010
+#    define TXB_D_R 0b11000100
+#    define TXB_Z_R 0b11001000
+#    define TXB_NUM 0b11010000
+#endif // STENO_ENABLE_BOLT
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index 12ee898212..20b8b9db4b 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 Joseph Wasson
+/* Copyright 2017, 2022 Joseph Wasson, Vladislav Kucheriavykh
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,77 +15,118 @@
  */
 #include "process_steno.h"
 #include "quantum_keycodes.h"
-#include "eeprom.h"
 #include "keymap_steno.h"
-#include "virtser.h"
 #include <string.h>
+#ifdef VIRTSER_ENABLE
+#    include "virtser.h"
+#endif
+#ifdef STENO_ENABLE_ALL
+#    include "eeprom.h"
+#endif
 
-// TxBolt Codes
-#define TXB_NUL 0
-#define TXB_S_L 0b00000001
-#define TXB_T_L 0b00000010
-#define TXB_K_L 0b00000100
-#define TXB_P_L 0b00001000
-#define TXB_W_L 0b00010000
-#define TXB_H_L 0b00100000
-#define TXB_R_L 0b01000001
-#define TXB_A_L 0b01000010
-#define TXB_O_L 0b01000100
-#define TXB_STR 0b01001000
-#define TXB_E_R 0b01010000
-#define TXB_U_R 0b01100000
-#define TXB_F_R 0b10000001
-#define TXB_R_R 0b10000010
-#define TXB_P_R 0b10000100
-#define TXB_B_R 0b10001000
-#define TXB_L_R 0b10010000
-#define TXB_G_R 0b10100000
-#define TXB_T_R 0b11000001
-#define TXB_S_R 0b11000010
-#define TXB_D_R 0b11000100
-#define TXB_Z_R 0b11001000
-#define TXB_NUM 0b11010000
+// All steno keys that have been pressed to form this chord,
+// stored in MAX_STROKE_SIZE groups of 8-bit arrays.
+static uint8_t chord[MAX_STROKE_SIZE] = {0};
+// The number of physical keys actually being held down.
+// This is not always equal to the number of 1 bits in `chord` because it is possible to
+// simultaneously press down four keys, then release three of those four keys and then press yet
+// another key while the fourth finger is still holding down its key.
+// At the end of this scenario given as an example, `chord` would have five bits set to 1 but
+// `n_pressed_keys` would be set to 2 because there are only two keys currently being pressed down.
+static int8_t n_pressed_keys = 0;
 
-#define TXB_GRP0 0b00000000
-#define TXB_GRP1 0b01000000
-#define TXB_GRP2 0b10000000
-#define TXB_GRP3 0b11000000
-#define TXB_GRPMASK 0b11000000
-
-#define TXB_GET_GROUP(code) ((code & TXB_GRPMASK) >> 6)
-
-#define BOLT_STATE_SIZE 4
-#define GEMINI_STATE_SIZE 6
-#define MAX_STATE_SIZE GEMINI_STATE_SIZE
-
-static uint8_t      state[MAX_STATE_SIZE] = {0};
-static uint8_t      chord[MAX_STATE_SIZE] = {0};
-static int8_t       pressed               = 0;
+#ifdef STENO_ENABLE_ALL
 static steno_mode_t mode;
+#elif defined(STENO_ENABLE_GEMINI)
+static const steno_mode_t mode = STENO_MODE_GEMINI;
+#elif defined(STENO_ENABLE_BOLT)
+static const steno_mode_t mode = STENO_MODE_BOLT;
+#endif
+
+static inline void steno_clear_chord(void) {
+    memset(chord, 0, sizeof(chord));
+}
+
+#ifdef STENO_ENABLE_GEMINI
+
+#    ifdef VIRTSER_ENABLE
+void send_steno_chord_gemini(void) {
+    // Set MSB to 1 to indicate the start of packet
+    chord[0] |= 0x80;
+    for (uint8_t i = 0; i < GEMINI_STROKE_SIZE; ++i) {
+        virtser_send(chord[i]);
+    }
+}
+#    else
+#        pragma message "VIRTSER_ENABLE = yes is required for Gemini PR to work properly out of the box!"
+#    endif // VIRTSER_ENABLE
+
+/**
+ * @precondition: `key` is pressed
+ */
+bool add_gemini_key_to_chord(uint8_t key) {
+    // Although each group of the packet is 8 bits long, the MSB is reserved
+    // to indicate whether that byte is the first byte of the packet (MSB=1)
+    // or one of the remaining five bytes of the packet (MSB=0).
+    // As a consequence, only 7 out of the 8 bits are left to be used as a bit array
+    // for the steno keys of that group.
+    const int group_idx       = key / 7;
+    const int intra_group_idx = key - group_idx * 7;
+    // The 0th steno key of the group has bit=0b01000000, the 1st has bit=0b00100000, etc.
+    const uint8_t bit = 1 << (6 - intra_group_idx);
+    chord[group_idx] |= bit;
+    return false;
+}
+#endif // STENO_ENABLE_GEMINI
+
+#ifdef STENO_ENABLE_BOLT
+
+#    define TXB_GRP0 0b00000000
+#    define TXB_GRP1 0b01000000
+#    define TXB_GRP2 0b10000000
+#    define TXB_GRP3 0b11000000
+#    define TXB_GRPMASK 0b11000000
+
+#    define TXB_GET_GROUP(code) ((code & TXB_GRPMASK) >> 6)
 
 static const uint8_t boltmap[64] PROGMEM = {TXB_NUL, TXB_NUM, TXB_NUM, TXB_NUM, TXB_NUM, TXB_NUM, TXB_NUM, TXB_S_L, TXB_S_L, TXB_T_L, TXB_K_L, TXB_P_L, TXB_W_L, TXB_H_L, TXB_R_L, TXB_A_L, TXB_O_L, TXB_STR, TXB_STR, TXB_NUL, TXB_NUL, TXB_NUL, TXB_STR, TXB_STR, TXB_E_R, TXB_U_R, TXB_F_R, TXB_R_R, TXB_P_R, TXB_B_R, TXB_L_R, TXB_G_R, TXB_T_R, TXB_S_R, TXB_D_R, TXB_NUM, TXB_NUM, TXB_NUM, TXB_NUM, TXB_NUM, TXB_NUM, TXB_Z_R};
 
+#    ifdef VIRTSER_ENABLE
+static void send_steno_chord_bolt(void) {
+    for (uint8_t i = 0; i < BOLT_STROKE_SIZE; ++i) {
+        // TX Bolt uses variable length packets where each byte corresponds to a bit array of certain keys.
+        // If a user chorded the keys of the first group with keys of the last group, for example, there
+        // would be bytes of 0x00 in `chord` for the middle groups which we mustn't send.
+        if (chord[i]) {
+            virtser_send(chord[i]);
+        }
+    }
+    // Sending a null packet is not always necessary, but it is simpler and more reliable
+    // to unconditionally send it every time instead of keeping track of more states and
+    // creating more branches in the execution of the program.
+    virtser_send(0);
+}
+#    else
+#        pragma message "VIRTSER_ENABLE = yes is required for TX Bolt to work properly out of the box!"
+#    endif // VIRTSER_ENABLE
+
+/**
+ * @precondition: `key` is pressed
+ */
+static bool add_bolt_key_to_chord(uint8_t key) {
+    uint8_t boltcode = pgm_read_byte(boltmap + key);
+    chord[TXB_GET_GROUP(boltcode)] |= boltcode;
+    return false;
+}
+#endif // STENO_ENABLE_BOLT
+
 #ifdef STENO_COMBINEDMAP
 /* Used to look up when pressing the middle row key to combine two consonant or vowel keys */
 static const uint16_t combinedmap_first[] PROGMEM  = {STN_S1, STN_TL, STN_PL, STN_HL, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, STN_A, STN_E};
 static const uint16_t combinedmap_second[] PROGMEM = {STN_S2, STN_KL, STN_WL, STN_RL, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, STN_O, STN_U};
 #endif
 
-static void steno_clear_state(void) {
-    memset(state, 0, sizeof(state));
-    memset(chord, 0, sizeof(chord));
-}
-
-static void send_steno_state(uint8_t size, bool send_empty) {
-    for (uint8_t i = 0; i < size; ++i) {
-        if (chord[i] || send_empty) {
-#ifdef VIRTSER_ENABLE
-            virtser_send(chord[i]);
-#endif
-        }
-    }
-}
-
+#ifdef STENO_ENABLE_ALL
 void steno_init() {
     if (!eeconfig_is_enabled()) {
         eeconfig_init();
@@ -94,19 +135,20 @@ void steno_init() {
 }
 
 void steno_set_mode(steno_mode_t new_mode) {
-    steno_clear_state();
+    steno_clear_chord();
     mode = new_mode;
     eeprom_update_byte(EECONFIG_STENOMODE, mode);
 }
+#endif // STENO_ENABLE_ALL
 
 /* override to intercept chords right before they get sent.
  * return zero to suppress normal sending behavior.
  */
-__attribute__((weak)) bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]) {
+__attribute__((weak)) bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE]) {
     return true;
 }
 
-__attribute__((weak)) bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed) {
+__attribute__((weak)) bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE], int8_t n_pressed_keys) {
     return true;
 }
 
@@ -114,108 +156,94 @@ __attribute__((weak)) bool process_steno_user(uint16_t keycode, keyrecord_t *rec
     return true;
 }
 
-static void send_steno_chord(void) {
-    if (send_steno_chord_user(mode, chord)) {
-        switch (mode) {
-            case STENO_MODE_BOLT:
-                send_steno_state(BOLT_STATE_SIZE, false);
-#ifdef VIRTSER_ENABLE
-                virtser_send(0); // terminating byte
-#endif
-                break;
-            case STENO_MODE_GEMINI:
-                chord[0] |= 0x80; // Indicate start of packet
-                send_steno_state(GEMINI_STATE_SIZE, true);
-                break;
-        }
-    }
-    steno_clear_state();
-}
-
-uint8_t *steno_get_state(void) {
-    return &state[0];
-}
-
-uint8_t *steno_get_chord(void) {
-    return &chord[0];
-}
-
-static bool update_state_bolt(uint8_t key, bool press) {
-    uint8_t boltcode = pgm_read_byte(boltmap + key);
-    if (press) {
-        state[TXB_GET_GROUP(boltcode)] |= boltcode;
-        chord[TXB_GET_GROUP(boltcode)] |= boltcode;
-    } else {
-        state[TXB_GET_GROUP(boltcode)] &= ~boltcode;
-    }
-    return false;
-}
-
-static bool update_state_gemini(uint8_t key, bool press) {
-    int     idx = key / 7;
-    uint8_t bit = 1 << (6 - (key % 7));
-    if (press) {
-        state[idx] |= bit;
-        chord[idx] |= bit;
-    } else {
-        state[idx] &= ~bit;
-    }
-    return false;
-}
-
 bool process_steno(uint16_t keycode, keyrecord_t *record) {
+    if (keycode < QK_STENO || keycode > QK_STENO_MAX) {
+        return true; // Not a steno key, pass it further along the chain
+        /*
+         * Clearing or sending the chord state is not necessary as we intentionally ignore whatever
+         * normal keyboard keys the user may have tapped while chording steno keys.
+         */
+    }
+    if (IS_NOEVENT(record->event)) {
+        return true;
+    }
+    if (!process_steno_user(keycode, record)) {
+        return false; // User fully processed the steno key themselves
+    }
     switch (keycode) {
+#ifdef STENO_ENABLE_ALL
         case QK_STENO_BOLT:
-            if (!process_steno_user(keycode, record)) {
-                return false;
-            }
             if (IS_PRESSED(record->event)) {
                 steno_set_mode(STENO_MODE_BOLT);
             }
             return false;
 
         case QK_STENO_GEMINI:
-            if (!process_steno_user(keycode, record)) {
-                return false;
-            }
             if (IS_PRESSED(record->event)) {
                 steno_set_mode(STENO_MODE_GEMINI);
             }
             return false;
+#endif // STENO_ENABLE_ALL
 
 #ifdef STENO_COMBINEDMAP
         case QK_STENO_COMB ... QK_STENO_COMB_MAX: {
-            uint8_t result;
-            result = process_steno(combinedmap_first[keycode - QK_STENO_COMB], record);
-            result &= process_steno(combinedmap_second[keycode - QK_STENO_COMB], record);
-            return result;
+            bool first_result  = process_steno(combinedmap_first[keycode - QK_STENO_COMB], record);
+            bool second_result = process_steno(combinedmap_second[keycode - QK_STENO_COMB], record);
+            return first_result && second_result;
         }
-#endif
+#endif // STENO_COMBINEDMAP
         case STN__MIN ... STN__MAX:
-            if (!process_steno_user(keycode, record)) {
-                return false;
-            }
-            switch (mode) {
-                case STENO_MODE_BOLT:
-                    update_state_bolt(keycode - QK_STENO, IS_PRESSED(record->event));
-                    break;
-                case STENO_MODE_GEMINI:
-                    update_state_gemini(keycode - QK_STENO, IS_PRESSED(record->event));
-                    break;
-            }
-            // allow postprocessing hooks
-            if (postprocess_steno_user(keycode, record, mode, chord, pressed)) {
-                if (IS_PRESSED(record->event)) {
-                    ++pressed;
-                } else {
-                    --pressed;
-                    if (pressed <= 0) {
-                        pressed = 0;
-                        send_steno_chord();
-                    }
+            if (IS_PRESSED(record->event)) {
+                n_pressed_keys++;
+                switch (mode) {
+#ifdef STENO_ENABLE_BOLT
+                    case STENO_MODE_BOLT:
+                        add_bolt_key_to_chord(keycode - QK_STENO);
+                        break;
+#endif // STENO_ENABLE_BOLT
+#ifdef STENO_ENABLE_GEMINI
+                    case STENO_MODE_GEMINI:
+                        add_gemini_key_to_chord(keycode - QK_STENO);
+                        break;
+#endif // STENO_ENABLE_GEMINI
+                    default:
+                        return false;
                 }
+                if (!postprocess_steno_user(keycode, record, mode, chord, n_pressed_keys)) {
+                    return false;
+                }
+            } else { // is released
+                n_pressed_keys--;
+                if (!postprocess_steno_user(keycode, record, mode, chord, n_pressed_keys)) {
+                    return false;
+                }
+                if (n_pressed_keys > 0) {
+                    // User hasn't released all keys yet,
+                    // so the chord cannot be sent
+                    return false;
+                }
+                n_pressed_keys = 0;
+                if (!send_steno_chord_user(mode, chord)) {
+                    steno_clear_chord();
+                    return false;
+                }
+                switch (mode) {
+#if defined(STENO_ENABLE_BOLT) && defined(VIRTSER_ENABLE)
+                    case STENO_MODE_BOLT:
+                        send_steno_chord_bolt();
+                        break;
+#endif // STENO_ENABLE_BOLT && VIRTSER_ENABLE
+#if defined(STENO_ENABLE_GEMINI) && defined(VIRTSER_ENABLE)
+                    case STENO_MODE_GEMINI:
+                        send_steno_chord_gemini();
+                        break;
+#endif // STENO_ENABLE_GEMINI && VIRTSER_ENABLE
+                    default:
+                        break;
+                }
+                steno_clear_chord();
             }
-            return false;
+            break;
     }
-    return true;
+    return false;
 }
diff --git a/quantum/process_keycode/process_steno.h b/quantum/process_keycode/process_steno.h
index d11fd40af0..68d6097b9b 100644
--- a/quantum/process_keycode/process_steno.h
+++ b/quantum/process_keycode/process_steno.h
@@ -18,10 +18,22 @@
 
 #include "quantum.h"
 
-typedef enum { STENO_MODE_BOLT, STENO_MODE_GEMINI } steno_mode_t;
+#define BOLT_STROKE_SIZE 4
+#define GEMINI_STROKE_SIZE 6
 
-bool     process_steno(uint16_t keycode, keyrecord_t *record);
-void     steno_init(void);
-void     steno_set_mode(steno_mode_t mode);
-uint8_t *steno_get_state(void);
-uint8_t *steno_get_chord(void);
+#ifdef STENO_ENABLE_GEMINI
+#    define MAX_STROKE_SIZE GEMINI_STROKE_SIZE
+#else
+#    define MAX_STROKE_SIZE BOLT_STROKE_SIZE
+#endif
+
+typedef enum {
+    STENO_MODE_GEMINI,
+    STENO_MODE_BOLT,
+} steno_mode_t;
+
+bool process_steno(uint16_t keycode, keyrecord_t *record);
+#ifdef STENO_ENABLE_ALL
+void steno_init(void);
+void steno_set_mode(steno_mode_t mode);
+#endif // STENO_ENABLE_ALL

From 3b9e186019f74d5046fbdd399b5cfa0baf513a75 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Fri, 24 Jun 2022 12:40:09 +0200
Subject: [PATCH 047/959] Do not enable PERMISSIVE_HOLD when TAPPING_TERM
 exceeds 500ms (#15674)

---
 docs/config_options.md                               |  2 +-
 docs/ja/config_options.md                            |  2 +-
 keyboards/1k/keymaps/tap_dance/config.h              |  1 +
 .../sweet16/keymaps/ridingintraffic/config.h         |  3 ++-
 keyboards/flehrad/bigswitch/keymaps/333fred/config.h |  1 +
 keyboards/handwired/ergocheap/config.h               |  1 +
 keyboards/handwired/onekey/config.h                  |  1 +
 keyboards/handwired/uthol/rev3/config.h              |  1 +
 keyboards/helix/pico/keymaps/mtei/config.h           |  2 --
 keyboards/helix/rev2/keymaps/five_rows/config.h      |  2 --
 .../helix/rev3_5rows/keymaps/five_rows/config.h      |  2 --
 keyboards/idobao/id67/keymaps/thewerther/config.h    |  1 +
 .../thevankeyboards/minivan/keymaps/belak/config.h   |  1 +
 .../thevankeyboards/minivan/keymaps/halvves/config.h |  1 +
 .../bigseries/1key/keymaps/dudeofawesome/config.h    |  1 +
 keyboards/xiudi/xd002/keymaps/tap_dance/config.h     |  1 +
 keyboards/zfrontier/big_switch/config.h              |  1 +
 layouts/community/66_ansi/xyverz/config.h            |  1 +
 layouts/community/ergodox/adam/config.h              |  2 +-
 quantum/action_tapping.c                             | 12 +++++-------
 users/hvp/config.h                                   |  3 ++-
 21 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/docs/config_options.md b/docs/config_options.md
index 9aa360576a..c35227a407 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -141,7 +141,7 @@ If you define these options you will enable the associated feature, which may in
 ## Behaviors That Can Be Configured
 
 * `#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
+  * how long before a key press becomes a hold
 * `#define TAPPING_TERM_PER_KEY`
   * enables handling for per key `TAPPING_TERM` settings
 * `#define RETRO_TAPPING`
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index fb43d015f2..42dd9d502a 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -144,7 +144,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
 ## 設定可能な挙動 :id=behaviors-that-can-be-configured
 
 * `#define TAPPING_TERM 200`
-  * タップがホールドになるまでの時間。500以上に設定された場合、タップ期間中にタップされたキーもホールドになります。(訳注: PERMISSIVE_HOLDも参照)
+  * タップがホールドになるまでの時間。
 * `#define TAPPING_TERM_PER_KEY`
   * キーごとの `TAPPING_TERM` 設定の処理を有効にします
 * `#define RETRO_TAPPING`
diff --git a/keyboards/1k/keymaps/tap_dance/config.h b/keyboards/1k/keymaps/tap_dance/config.h
index 5df7869537..bd0163e447 100644
--- a/keyboards/1k/keymaps/tap_dance/config.h
+++ b/keyboards/1k/keymaps/tap_dance/config.h
@@ -4,3 +4,4 @@
 #pragma once
 
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
index c835440076..161b46c814 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
+++ b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
@@ -3,6 +3,7 @@
 /* tap dance stuff*/
 #undef TAPPING_TERM
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
 
 #define TAPPING_TOGGLE 2
 
@@ -12,4 +13,4 @@
 #define EXAMPLESTRING4 "tapdance_4"
 
 #undef RGBLED_NUM
-#define RGBLED_NUM 16
\ No newline at end of file
+#define RGBLED_NUM 16
diff --git a/keyboards/flehrad/bigswitch/keymaps/333fred/config.h b/keyboards/flehrad/bigswitch/keymaps/333fred/config.h
index 3273cc8db4..6e9219115c 100644
--- a/keyboards/flehrad/bigswitch/keymaps/333fred/config.h
+++ b/keyboards/flehrad/bigswitch/keymaps/333fred/config.h
@@ -24,3 +24,4 @@
 
 // Long tapping term on the big switch, because it takes so long to press
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h
index 26905e8cb3..00b9616e3e 100644
--- a/keyboards/handwired/ergocheap/config.h
+++ b/keyboards/handwired/ergocheap/config.h
@@ -47,6 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE   5
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
 
 /*
  * Feature disable options
diff --git a/keyboards/handwired/onekey/config.h b/keyboards/handwired/onekey/config.h
index f491d4d393..88c15806ce 100644
--- a/keyboards/handwired/onekey/config.h
+++ b/keyboards/handwired/onekey/config.h
@@ -42,6 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
 
 /*
  * Feature disable options
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index 90880998b7..84ca3f0cc6 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -57,6 +57,7 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
 
 // RGB Stuff
 #define RGB_DI_PIN B0
diff --git a/keyboards/helix/pico/keymaps/mtei/config.h b/keyboards/helix/pico/keymaps/mtei/config.h
index 1a4dc2c842..a633105ff9 100644
--- a/keyboards/helix/pico/keymaps/mtei/config.h
+++ b/keyboards/helix/pico/keymaps/mtei/config.h
@@ -13,8 +13,6 @@
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
-/* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
-   see tmk_core/common/action_tapping.c */
 
 // If you need more program area, try select and reduce rgblight modes to use.
 
diff --git a/keyboards/helix/rev2/keymaps/five_rows/config.h b/keyboards/helix/rev2/keymaps/five_rows/config.h
index 4aae9b5cac..43f14aaf2c 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/config.h
+++ b/keyboards/helix/rev2/keymaps/five_rows/config.h
@@ -6,8 +6,6 @@
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
-/* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
-   see tmk_core/common/action_tapping.c */
 
 #undef OLED_UPDATE_INTERVAL
 #ifdef DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h b/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
index ab679d14b9..a6fd32c613 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
@@ -6,8 +6,6 @@
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
-/* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
-   see tmk_core/common/action_tapping.c */
 
 #undef OLED_UPDATE_INTERVAL
 #ifdef DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/idobao/id67/keymaps/thewerther/config.h b/keyboards/idobao/id67/keymaps/thewerther/config.h
index a63a92b171..85498d91b8 100644
--- a/keyboards/idobao/id67/keymaps/thewerther/config.h
+++ b/keyboards/idobao/id67/keymaps/thewerther/config.h
@@ -18,6 +18,7 @@
 
 #define DRIVER_LED_UNDERGLOW 10
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
 
 #if defined(RGB_MATRIX_ENABLE)
     #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/thevankeyboards/minivan/keymaps/belak/config.h b/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
index 47d96a29d8..488ffa5418 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
@@ -4,5 +4,6 @@
 #include "../../config.h"
 
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
 
 #endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
index 6be8d217bd..c6404f8ce5 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #define TAPPING_TERM 505
+#define PERMISSIVE_HOLD
 #define RETRO_TAPPING
 
 // smooth mousekeys (copied from the ergo ez config)
diff --git a/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h
index 30b86224c6..131c755d4a 100644
--- a/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h
@@ -19,5 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CONFIG_USER_H
 
 #define TAPPING_TERM 1000
+#define PERMISSIVE_HOLD
 
 #endif
diff --git a/keyboards/xiudi/xd002/keymaps/tap_dance/config.h b/keyboards/xiudi/xd002/keymaps/tap_dance/config.h
index b86e862d30..1fd93f875f 100644
--- a/keyboards/xiudi/xd002/keymaps/tap_dance/config.h
+++ b/keyboards/xiudi/xd002/keymaps/tap_dance/config.h
@@ -1,3 +1,4 @@
 #pragma once
 
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index ddec2b2796..99bd790cae 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/config.h
@@ -51,3 +51,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* long tapping config */
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
diff --git a/layouts/community/66_ansi/xyverz/config.h b/layouts/community/66_ansi/xyverz/config.h
index 06e5830af8..37a57dbffd 100644
--- a/layouts/community/66_ansi/xyverz/config.h
+++ b/layouts/community/66_ansi/xyverz/config.h
@@ -1,5 +1,6 @@
 #pragma once
 
 #define TAPPING_TERM 600 // ms
+#define PERMISSIVE_HOLD
 #undef RGBLIGHT_HUE_STEP
 #define RGBLIGHT_HUE_STEP 8
diff --git a/layouts/community/ergodox/adam/config.h b/layouts/community/ergodox/adam/config.h
index 62e82d8b2b..1555ae11fd 100644
--- a/layouts/community/ergodox/adam/config.h
+++ b/layouts/community/ergodox/adam/config.h
@@ -1,5 +1,5 @@
 #pragma once
 
 #undef TAPPING_TERM
-#define TAPPING_TERM 300 //At 500 some bad logic takes hold
+#define TAPPING_TERM 300
 #define IGNORE_MOD_TAP_INTERRUPT
diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c
index 3c8b5678b7..df3317ac05 100644
--- a/quantum/action_tapping.c
+++ b/quantum/action_tapping.c
@@ -125,7 +125,7 @@ void action_tapping_process(keyrecord_t record) {
 /* return true when key event is processed or consumed. */
 bool process_tapping(keyrecord_t *keyp) {
     keyevent_t event = keyp->event;
-#    if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(TAPPING_TERM_PER_KEY) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(TAPPING_FORCE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
+#    if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(TAPPING_FORCE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
     uint16_t tapping_keycode = get_record_keycode(&tapping_key, false);
 #    endif
 
@@ -164,17 +164,15 @@ bool process_tapping(keyrecord_t *keyp) {
                  * useful for long TAPPING_TERM but may prevent fast typing.
                  */
                 // clang-format off
-#    if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY) || (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT))
+#    if defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY) || (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT))
                 else if (
                     (
-                        (
-                            GET_TAPPING_TERM(tapping_keycode, &tapping_key) >= 500
+                        IS_RELEASED(event) && waiting_buffer_typed(event)
 #        ifdef PERMISSIVE_HOLD_PER_KEY
-                            || get_permissive_hold(tapping_keycode, &tapping_key)
+                            && get_permissive_hold(tapping_keycode, &tapping_key)
 #        elif defined(PERMISSIVE_HOLD)
-                            || true
+                            && true
 #        endif
-                        ) && IS_RELEASED(event) && waiting_buffer_typed(event)
                     )
                     // Causes nested taps to not wait past TAPPING_TERM/RETRO_SHIFT
                     // unnecessarily and fixes them for Layer Taps.
diff --git a/users/hvp/config.h b/users/hvp/config.h
index 68dd8b4828..b7d0443bbc 100644
--- a/users/hvp/config.h
+++ b/users/hvp/config.h
@@ -15,4 +15,5 @@
   */ 
 #pragma once
 
-#define LONG_TAPPING_TERM 1000
\ No newline at end of file
+#define LONG_TAPPING_TERM 1000
+#define PERMISSIVE_HOLD

From 01bc974365581da6563e2bbd2425233d97280fdd Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date: Sat, 25 Jun 2022 22:22:28 +0200
Subject: [PATCH 048/959] improvements for Cirque Pinnacle trackpads (#17091)

---
 docs/feature_pointing_device.md       | 21 +++---
 drivers/sensors/cirque_pinnacle.c     | 98 +++++++++++++++++++--------
 drivers/sensors/cirque_pinnacle.h     | 50 +++++++++-----
 drivers/sensors/cirque_pinnacle_i2c.c |  4 +-
 drivers/sensors/cirque_pinnacle_spi.c |  4 +-
 quantum/pointing_device_drivers.c     | 45 +++++++++---
 6 files changed, 154 insertions(+), 68 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 5dacc9f5ab..264362ea77 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -89,15 +89,15 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
 
 This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the TM040040, TM035035 and the TM023023 trackpads. These are I2C or SPI compatible, and both configurations are supported.
 
-| Setting                         | Description                                                                     | Default               |
-|---------------------------------|---------------------------------------------------------------------------------|-----------------------|
-|`CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.                         | `127`                 |
-|`CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.                         | `1919`                |
-|`CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.                         | `63`                  |
-|`CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.                         | `1471`                |
-|`CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.                             | `ADC_ATTENUATE_4X`    |
-|`CIRQUE_PINNACLE_TAPPING_TERM`   | (Optional) Length of time that a touch can be to be considered a tap.           | `TAPPING_TERM`/`200`  |
-|`CIRQUE_PINNACLE_TOUCH_DEBOUNCE` | (Optional) Length of time that a touch can be to be considered a tap.           | `TAPPING_TERM`/`200`  |
+| Setting                         | Description                                                           | Default              |
+|-------------------------------- |-----------------------------------------------------------------------|--------------------- |
+|`CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.               | `127`                |
+|`CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.               | `1919`               |
+|`CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.               | `63`                 |
+|`CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.               | `1471`               |
+|`CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.                   | `ADC_ATTENUATE_4X`   |
+|`CIRQUE_PINNACLE_TAPPING_TERM`   | (Optional) Length of time that a touch can be to be considered a tap. | `TAPPING_TERM`/`200` |
+|`CIRQUE_PINNACLE_TOUCH_DEBOUNCE` | (Optional) Length of time that a touch can be to be considered a tap. | `TAPPING_TERM`/`200` |
 
 **`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be. 
 
@@ -122,6 +122,9 @@ Default attenuation is set to 4X, although if you are using a thicker overlay (s
 
 Default Scaling/CPI is 1024.
 
+Also see the `POINTING_DEVICE_TASK_THROTTLE_MS`, which defaults to 10ms when using Cirque Pinnacle, which matches the internal update rate of the position registers (in standard configuration). Advanced configuration for pen/stylus usage might require lower values.
+
+
 ### Pimoroni Trackball
 
 To use the Pimoroni Trackball module, add this to your `rules.mk`:
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index 670b96f2fb..1d1e4ccfc6 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -1,8 +1,13 @@
 // Copyright (c) 2018 Cirque Corp. Restrictions apply. See: www.cirque.com/sw-license
+// based on https://github.com/cirque-corp/Cirque_Pinnacle_1CA027/tree/master/Circular_Trackpad
+// with modifications and changes for QMK
+// refer to documentation: Gen2 and Gen3 (Pinnacle ASIC) at https://www.cirque.com/documentation
+
 #include "cirque_pinnacle.h"
 #include "print.h"
 #include "debug.h"
 #include "wait.h"
+#include "timer.h"
 
 // Registers for RAP
 // clang-format off
@@ -41,12 +46,6 @@
 #ifndef CIRQUE_PINNACLE_ATTENUATION
 #    define CIRQUE_PINNACLE_ATTENUATION ADC_ATTENUATE_4X
 #endif
-
-// Register config values for this demo
-#define SYSCONFIG_1_VALUE    0x00
-#define FEEDCONFIG_1_VALUE   0x03  // 0x03 for absolute mode 0x01 for relative mode
-#define FEEDCONFIG_2_VALUE   0x1C  // 0x1F for normal functionality 0x1E for intellimouse disabled
-#define Z_IDLE_COUNT_VALUE   0x05
 // clang-format on
 
 bool     touchpad_init;
@@ -114,16 +113,14 @@ void cirque_pinnacle_clear_flags() {
 // Enables/Disables the feed
 void cirque_pinnacle_enable_feed(bool feedEnable) {
     uint8_t temp;
-
     RAP_ReadBytes(FEEDCONFIG_1, &temp, 1); // Store contents of FeedConfig1 register
 
     if (feedEnable) {
         temp |= 0x01; // Set Feed Enable bit
-        RAP_Write(0x04, temp);
     } else {
         temp &= ~0x01; // Clear Feed Enable bit
-        RAP_Write(0x04, temp);
     }
+    RAP_Write(FEEDCONFIG_1, temp);
 }
 
 /*  ERA (Extended Register Access) Functions  */
@@ -195,7 +192,7 @@ void cirque_pinnacle_tune_edge_sensitivity(void) {
     ERA_ReadBytes(0x0168, &temp, 1);
 }
 
-/*  Pinnacle-based TM040040 Functions  */
+/*  Pinnacle-based TM040040/TM035035/TM023023 Functions  */
 void cirque_pinnacle_init(void) {
 #if defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
     spi_init();
@@ -204,18 +201,44 @@ void cirque_pinnacle_init(void) {
 #endif
 
     touchpad_init = true;
+
     // Host clears SW_CC flag
     cirque_pinnacle_clear_flags();
 
-    // Host configures bits of registers 0x03 and 0x05
-    RAP_Write(SYSCONFIG_1, SYSCONFIG_1_VALUE);
-    RAP_Write(FEEDCONFIG_2, FEEDCONFIG_2_VALUE);
+    // SysConfig1 (Low Power Mode)
+    // Bit 0: Reset, 1=Reset
+    // Bit 1: Shutdown, 1=Shutdown, 0=Active
+    // Bit 2: Sleep Enable, 1=low power mode, 0=normal mode
+    // send a RESET command now, in case QMK had a soft-reset without a power cycle
+    RAP_Write(SYSCONFIG_1, 0x01);
+    wait_ms(30); // Pinnacle needs 10-15ms to boot, so wait long enough before configuring
+    RAP_Write(SYSCONFIG_1, 0x00);
+    wait_us(50);
 
-    // Host enables preferred output mode (absolute)
-    RAP_Write(FEEDCONFIG_1, FEEDCONFIG_1_VALUE);
+    // FeedConfig2 (Feature flags for Relative Mode Only)
+    // Bit 0: IntelliMouse Enable, 1=enable, 0=disable
+    // Bit 1: All Taps Disable, 1=disable, 0=enable
+    // Bit 2: Secondary Tap Disable, 1=disable, 0=enable
+    // Bit 3: Scroll Disable, 1=disable, 0=enable
+    // Bit 4: GlideExtend® Disable, 1=disable, 0=enable
+    // Bit 5: reserved
+    // Bit 6: reserved
+    // Bit 7: Swap X & Y, 1=90° rotation, 0=0° rotation
+    RAP_Write(FEEDCONFIG_2, 0x00);
 
-    // Host sets z-idle packet count to 5 (default is 30)
-    RAP_Write(Z_IDLE_COUNT, Z_IDLE_COUNT_VALUE);
+    // FeedConfig1 (Data Output Flags)
+    // Bit 0: Feed enable, 1=feed, 0=no feed
+    // Bit 1: Data mode, 1=absolute, 0=relative
+    // Bit 2: Filter disable, 1=no filter, 0=filter
+    // Bit 3: X disable, 1=no X data, 0=X data
+    // Bit 4: Y disable, 1=no Y data, 0=Y data
+    // Bit 5: reserved
+    // Bit 6: X data Invert, 1=X max to 0, 0=0 to Y max
+    // Bit 7: Y data Invert, 1=Y max to 0, 0=0 to Y max
+    RAP_Write(FEEDCONFIG_1, CIRQUE_PINNACLE_POSITION_MODE << 1);
+
+    // Host sets z-idle packet count to 5 (default is 0x1F/30)
+    RAP_Write(Z_IDLE_COUNT, 5);
 
     cirque_pinnacle_set_adc_attenuation(CIRQUE_PINNACLE_ATTENUATION);
 
@@ -223,21 +246,42 @@ void cirque_pinnacle_init(void) {
     cirque_pinnacle_enable_feed(true);
 }
 
-// Reads XYZ data from Pinnacle registers 0x14 through 0x17
-// Stores result in pinnacle_data_t struct with xValue, yValue, and zValue members
 pinnacle_data_t cirque_pinnacle_read_data(void) {
-    uint8_t         data[6] = {0};
-    pinnacle_data_t result  = {0};
+    uint8_t         data_ready = 0;
+    uint8_t         data[6]    = {0};
+    pinnacle_data_t result     = {0};
+
+    // Check if there is valid data available
+    RAP_ReadBytes(STATUS_1, &data_ready, 1); // bit2 is Software Data Ready, bit3 is Command Complete, bit0 and bit1 are reserved/unused
+    if ((data_ready & 0x04) == 0) {
+        // no data available yet
+        result.valid = false; // be explicit
+        return result;
+    }
+
+    // Read all data bytes
     RAP_ReadBytes(PACKET_BYTE_0, data, 6);
 
+    // Get ready for the next data sample
     cirque_pinnacle_clear_flags();
 
-    result.buttonFlags = data[0] & 0x3F;
-    result.xValue      = data[2] | ((data[4] & 0x0F) << 8);
-    result.yValue      = data[3] | ((data[4] & 0xF0) << 4);
-    result.zValue      = data[5] & 0x3F;
-
-    result.touchDown = (result.xValue != 0 || result.yValue != 0);
+#if CIRQUE_PINNACLE_POSITION_MODE
+    // Decode data for absolute mode
+    // Register 0x13 is unused in this mode (palm detection area)
+    result.buttonFlags = data[0] & 0x3F;                             // bit0 to bit5 are switch 0-5, only hardware button presses (from input pin on the Pinnacle chip)
+    result.xValue      = data[2] | ((data[4] & 0x0F) << 8);          // merge high and low bits for X
+    result.yValue      = data[3] | ((data[4] & 0xF0) << 4);          // merge high and low bits for Y
+    result.zValue      = data[5] & 0x3F;                             // Z is only lower 6 bits, upper 2 bits are reserved/unused
+    result.touchDown   = (result.xValue != 0 || result.yValue != 0); // (0,0) is a "magic coordinate" to indicate "finger touched down"
+#else
+    // Decode data for relative mode
+    // Registers 0x16 and 0x17 are unused in this mode
+    result.buttons    = data[0] & 0x07; // bit0 = primary button, bit1 = secondary button, bit2 = auxilary button, if Taps enabled then also software-recognized taps are reported
+    result.xDelta     = data[1];
+    result.yDelta     = data[2];
+    result.wheelCount = data[3];
+#endif
 
+    result.valid = true;
     return result;
 }
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index c8cb360e03..d65bdb41b6 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -5,23 +5,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-// Convenient way to store and access measurements
-typedef struct {
-    uint16_t xValue;
-    uint16_t yValue;
-    uint16_t zValue;
-    uint8_t  buttonFlags;
-    bool     touchDown;
-} pinnacle_data_t;
-
-void            cirque_pinnacle_init(void);
-pinnacle_data_t cirque_pinnacle_read_data(void);
-void            cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResolution, uint16_t yResolution);
-uint16_t        cirque_pinnacle_get_scale(void);
-void            cirque_pinnacle_set_scale(uint16_t scale);
-
 #ifndef CIRQUE_PINNACLE_TIMEOUT
-#    define CIRQUE_PINNACLE_TIMEOUT 20
+#    define CIRQUE_PINNACLE_TIMEOUT 20 // I2C timeout in milliseconds
+#endif
+
+#define CIRQUE_PINNACLE_ABSOLUTE_MODE 1
+#define CIRQUE_PINNACLE_RELATIVE_MODE 0
+#ifndef CIRQUE_PINNACLE_POSITION_MODE
+#    define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE
 #endif
 
 // Coordinate scaling values
@@ -43,7 +34,9 @@ void            cirque_pinnacle_set_scale(uint16_t scale);
 #ifndef CIRQUE_PINNACLE_Y_RANGE
 #    define CIRQUE_PINNACLE_Y_RANGE (CIRQUE_PINNACLE_Y_UPPER - CIRQUE_PINNACLE_Y_LOWER)
 #endif
-
+#if !defined(POINTING_DEVICE_TASK_THROTTLE_MS)
+#    define POINTING_DEVICE_TASK_THROTTLE_MS 10 // Cirque Pinnacle in normal operation produces data every 10ms. Advanced configuration for pen/stylus usage might require lower values.
+#endif
 #if defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_i2c)
 #    include "i2c_master.h"
 // Cirque's 7-bit I2C Slave Address
@@ -72,3 +65,26 @@ void            cirque_pinnacle_set_scale(uint16_t scale);
 #        endif
 #    endif
 #endif
+
+// Convenient way to store and access measurements
+typedef struct {
+    bool valid; // true if valid data was read, false if no data was ready
+#if CIRQUE_PINNACLE_POSITION_MODE
+    uint16_t xValue;
+    uint16_t yValue;
+    uint16_t zValue;
+    uint8_t  buttonFlags;
+    bool     touchDown;
+#else
+    uint8_t xDelta;
+    uint8_t yDelta;
+    uint8_t wheelCount;
+    uint8_t buttons;
+#endif
+} pinnacle_data_t;
+
+void            cirque_pinnacle_init(void);
+pinnacle_data_t cirque_pinnacle_read_data(void);
+void            cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResolution, uint16_t yResolution);
+uint16_t        cirque_pinnacle_get_scale(void);
+void            cirque_pinnacle_set_scale(uint16_t scale);
diff --git a/drivers/sensors/cirque_pinnacle_i2c.c b/drivers/sensors/cirque_pinnacle_i2c.c
index 8a38f1dcea..b328dd9a7a 100644
--- a/drivers/sensors/cirque_pinnacle_i2c.c
+++ b/drivers/sensors/cirque_pinnacle_i2c.c
@@ -19,7 +19,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
         i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, NULL, 0, CIRQUE_PINNACLE_TIMEOUT);
         if (i2c_readReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, data, count, CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
 #ifdef CONSOLE_ENABLE
-            dprintf("error right touchpad\n");
+            dprintf("error cirque_pinnacle i2c_readReg\n");
 #endif
             touchpad_init = false;
         }
@@ -34,7 +34,7 @@ void RAP_Write(uint8_t address, uint8_t data) {
     if (touchpad_init) {
         if (i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, &data, sizeof(data), CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
 #ifdef CONSOLE_ENABLE
-            dprintf("error right touchpad\n");
+            dprintf("error cirque_pinnacle i2c_writeReg\n");
 #endif
             touchpad_init = false;
         }
diff --git a/drivers/sensors/cirque_pinnacle_spi.c b/drivers/sensors/cirque_pinnacle_spi.c
index 34c77df07b..bd980fc863 100644
--- a/drivers/sensors/cirque_pinnacle_spi.c
+++ b/drivers/sensors/cirque_pinnacle_spi.c
@@ -25,7 +25,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
             }
         } else {
 #ifdef CONSOLE_ENABLE
-            dprintf("error right touchpad\n");
+            dprintf("error cirque_pinnacle spi_start read\n");
 #endif
             touchpad_init = false;
         }
@@ -43,7 +43,7 @@ void RAP_Write(uint8_t address, uint8_t data) {
             spi_write(data);
         } else {
 #ifdef CONSOLE_ENABLE
-            dprintf("error right touchpad\n");
+            dprintf("error cirque_pinnacle spi_start write\n");
 #endif
             touchpad_init = false;
         }
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 41d7018c86..435fcabf7c 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -50,6 +50,7 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi      = adns5050_get_cpi,
 };
 // clang-format on
+
 #elif defined(POINTING_DEVICE_DRIVER_adns9800)
 
 report_mouse_t adns9800_get_report_driver(report_mouse_t mouse_report) {
@@ -69,6 +70,7 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = adns9800_get_cpi
 };
 // clang-format on
+
 #elif defined(POINTING_DEVICE_DRIVER_analog_joystick)
 report_mouse_t analog_joystick_get_report(report_mouse_t mouse_report) {
     report_analog_joystick_t data = analog_joystick_read();
@@ -93,6 +95,7 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = NULL
 };
 // clang-format on
+
 #elif defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_i2c) || defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
 #    ifndef CIRQUE_PINNACLE_TAPPING_TERM
 #        include "action.h"
@@ -104,22 +107,40 @@ const pointing_device_driver_t pointing_device_driver = {
 #    endif
 
 report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
-    pinnacle_data_t   touchData = cirque_pinnacle_read_data();
-    static uint16_t   x = 0, y = 0, mouse_timer = 0;
-    mouse_xy_report_t report_x = 0, report_y = 0;
-    static bool       is_z_down = false;
+    pinnacle_data_t          touchData = cirque_pinnacle_read_data();
+    mouse_xy_report_t        report_x = 0, report_y = 0;
+    static mouse_xy_report_t x = 0, y = 0;
+    static uint16_t          mouse_timer = 0;
+    static bool              is_z_down   = false;
 
-    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale()); // Scale coordinates to arbitrary X, Y resolution
+#    if !CIRQUE_PINNACLE_POSITION_MODE
+#        error Cirque Pinnacle with relative mode not implemented yet.
+#    endif
+
+    if (!touchData.valid) {
+        return mouse_report;
+    }
+
+#    if CONSOLE_ENABLE
+    if (debug_mouse && touchData.touchDown) {
+        dprintf("cirque_pinnacle touchData x=%4d y=%4d z=%2d\n", touchData.xValue, touchData.yValue, touchData.zValue);
+    }
+#    endif
+
+    // Scale coordinates to arbitrary X, Y resolution
+    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());
 
     if (x && y && touchData.xValue && touchData.yValue) {
         report_x = (mouse_xy_report_t)(touchData.xValue - x);
         report_y = (mouse_xy_report_t)(touchData.yValue - y);
     }
-    x = touchData.xValue;
-    y = touchData.yValue;
+    x              = touchData.xValue;
+    y              = touchData.yValue;
+    mouse_report.x = report_x;
+    mouse_report.y = report_y;
 
-    if ((bool)touchData.zValue != is_z_down) {
-        is_z_down = (bool)touchData.zValue;
+    if (touchData.touchDown != is_z_down) {
+        is_z_down = touchData.touchDown;
         if (!touchData.zValue) {
             if (timer_elapsed(mouse_timer) < CIRQUE_PINNACLE_TAPPING_TERM && mouse_timer != 0) {
                 mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, true, POINTING_DEVICE_BUTTON1);
@@ -138,8 +159,6 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     if (timer_elapsed(mouse_timer) > (CIRQUE_PINNACLE_TOUCH_DEBOUNCE)) {
         mouse_timer = 0;
     }
-    mouse_report.x = report_x;
-    mouse_report.y = report_y;
 
     return mouse_report;
 }
@@ -210,6 +229,7 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = pimoroni_trackball_get_cpi
 };
 // clang-format on
+
 #elif defined(POINTING_DEVICE_DRIVER_pmw3360)
 static void pmw3360_device_init(void) {
     pmw3360_init(0);
@@ -248,6 +268,7 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = pmw3360_get_cpi
 };
 // clang-format on
+
 #elif defined(POINTING_DEVICE_DRIVER_pmw3389)
 static void pmw3389_device_init(void) {
     pmw3389_init();
@@ -286,6 +307,7 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = pmw3389_get_cpi
 };
 // clang-format on
+
 #else
 __attribute__((weak)) void           pointing_device_driver_init(void) {}
 __attribute__((weak)) report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
@@ -304,4 +326,5 @@ const pointing_device_driver_t pointing_device_driver = {
     .set_cpi    = pointing_device_driver_set_cpi
 };
 // clang-format on
+
 #endif

From 0d013a21e1347fc38e742b2bd876329e86c153a9 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date: Sun, 26 Jun 2022 18:15:25 +0200
Subject: [PATCH 049/959] [Split] Verify Split Pointing Device config (#17481)

---
 quantum/pointing_device.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index 3c2e2bc09d..3aa4941687 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -25,6 +25,13 @@
 #if (defined(POINTING_DEVICE_ROTATION_90) + defined(POINTING_DEVICE_ROTATION_180) + defined(POINTING_DEVICE_ROTATION_270)) > 1
 #    error More than one rotation selected.  This is not supported.
 #endif
+
+#if defined(POINTING_DEVICE_LEFT) || defined(POINTING_DEVICE_RIGHT) || defined(POINTING_DEVICE_COMBINED)
+#    ifndef SPLIT_POINTING_ENABLE
+#        error "Using POINTING_DEVICE_LEFT or POINTING_DEVICE_RIGHT or POINTING_DEVICE_COMBINED, then SPLIT_POINTING_ENABLE is required but has not been defined"
+#    endif
+#endif
+
 #if defined(SPLIT_POINTING_ENABLE)
 #    include "transactions.h"
 #    include "keyboard.h"

From 01ecf332ff9f0c8f61e493cdca116f58d80bb5fb Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 27 Jun 2022 07:18:21 +1000
Subject: [PATCH 050/959] Generic wear-leveling algorithm (#16996)

* Initial import of wear-leveling algorithm.

* Alignment.

* Docs tweaks.

* Lock/unlock.

* Update quantum/wear_leveling/wear_leveling_internal.h

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>

* More tests, fix issue with consolidation when unlocked.

* More tests.

* Review comments.

* Add plumbing for FNV1a.

* Another test checking that checksum mismatch clears the cache.

* Check that the write log still gets played back.

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
---
 builddefs/build_test.mk                       |    1 +
 builddefs/common_features.mk                  |    6 +
 builddefs/testlist.mk                         |    1 +
 lib/fnv/Makefile                              |  304 +++
 lib/fnv/README                                |  158 ++
 lib/fnv/fnv.h                                 |  249 ++
 lib/fnv/fnv32.c                               |  467 ++++
 lib/fnv/fnv64.c                               |  591 +++++
 lib/fnv/hash_32.c                             |  156 ++
 lib/fnv/hash_32a.c                            |  144 ++
 lib/fnv/hash_64.c                             |  312 +++
 lib/fnv/hash_64a.c                            |  291 +++
 lib/fnv/have_ulong64.c                        |   58 +
 lib/fnv/longlong.h                            |   18 +
 lib/fnv/qmk_fnv_type_validation.c             |   14 +
 lib/fnv/test_fnv.c                            | 2237 +++++++++++++++++
 quantum/wear_leveling/tests/backing_mocks.cpp |  154 ++
 quantum/wear_leveling/tests/backing_mocks.hpp |  210 ++
 quantum/wear_leveling/tests/rules.mk          |   66 +
 quantum/wear_leveling/tests/testlist.mk       |    6 +
 .../tests/wear_leveling_2byte.cpp             |  228 ++
 .../wear_leveling_2byte_optimized_writes.cpp  |  295 +++
 .../tests/wear_leveling_4byte.cpp             |  193 ++
 .../tests/wear_leveling_8byte.cpp             |  178 ++
 .../tests/wear_leveling_general.cpp           |  204 ++
 quantum/wear_leveling/wear_leveling.c         |  779 ++++++
 quantum/wear_leveling/wear_leveling.h         |   54 +
 .../wear_leveling/wear_leveling_internal.h    |  145 ++
 28 files changed, 7519 insertions(+)
 create mode 100644 lib/fnv/Makefile
 create mode 100644 lib/fnv/README
 create mode 100644 lib/fnv/fnv.h
 create mode 100644 lib/fnv/fnv32.c
 create mode 100644 lib/fnv/fnv64.c
 create mode 100644 lib/fnv/hash_32.c
 create mode 100644 lib/fnv/hash_32a.c
 create mode 100644 lib/fnv/hash_64.c
 create mode 100644 lib/fnv/hash_64a.c
 create mode 100644 lib/fnv/have_ulong64.c
 create mode 100644 lib/fnv/longlong.h
 create mode 100644 lib/fnv/qmk_fnv_type_validation.c
 create mode 100644 lib/fnv/test_fnv.c
 create mode 100644 quantum/wear_leveling/tests/backing_mocks.cpp
 create mode 100644 quantum/wear_leveling/tests/backing_mocks.hpp
 create mode 100644 quantum/wear_leveling/tests/rules.mk
 create mode 100644 quantum/wear_leveling/tests/testlist.mk
 create mode 100644 quantum/wear_leveling/tests/wear_leveling_2byte.cpp
 create mode 100644 quantum/wear_leveling/tests/wear_leveling_2byte_optimized_writes.cpp
 create mode 100644 quantum/wear_leveling/tests/wear_leveling_4byte.cpp
 create mode 100644 quantum/wear_leveling/tests/wear_leveling_8byte.cpp
 create mode 100644 quantum/wear_leveling/tests/wear_leveling_general.cpp
 create mode 100644 quantum/wear_leveling/wear_leveling.c
 create mode 100644 quantum/wear_leveling/wear_leveling.h
 create mode 100644 quantum/wear_leveling/wear_leveling_internal.h

diff --git a/builddefs/build_test.mk b/builddefs/build_test.mk
index 834184f221..bd9b372c33 100644
--- a/builddefs/build_test.mk
+++ b/builddefs/build_test.mk
@@ -63,6 +63,7 @@ include $(TMK_PATH)/protocol.mk
 include $(QUANTUM_PATH)/debounce/tests/rules.mk
 include $(QUANTUM_PATH)/encoder/tests/rules.mk
 include $(QUANTUM_PATH)/sequencer/tests/rules.mk
+include $(QUANTUM_PATH)/wear_leveling/tests/rules.mk
 include $(PLATFORM_PATH)/test/rules.mk
 ifneq ($(filter $(FULL_TESTS),$(TEST)),)
 include $(BUILDDEFS_PATH)/build_full_test.mk
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index b9ee0a30a7..552171fe68 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -650,6 +650,12 @@ ifeq ($(strip $(CRC_ENABLE)), yes)
     SRC += crc.c
 endif
 
+ifeq ($(strip $(FNV_ENABLE)), yes)
+    OPT_DEFS += -DFNV_ENABLE
+    VPATH += $(LIB_PATH)/fnv
+    SRC += qmk_fnv_type_validation.c hash_32a.c hash_64a.c
+endif
+
 ifeq ($(strip $(HAPTIC_ENABLE)),yes)
     COMMON_VPATH += $(DRIVER_PATH)/haptic
 
diff --git a/builddefs/testlist.mk b/builddefs/testlist.mk
index b8d22bce80..8a30a44972 100644
--- a/builddefs/testlist.mk
+++ b/builddefs/testlist.mk
@@ -4,6 +4,7 @@ FULL_TESTS := $(notdir $(TEST_LIST))
 include $(QUANTUM_PATH)/debounce/tests/testlist.mk
 include $(QUANTUM_PATH)/encoder/tests/testlist.mk
 include $(QUANTUM_PATH)/sequencer/tests/testlist.mk
+include $(QUANTUM_PATH)/wear_leveling/tests/testlist.mk
 include $(PLATFORM_PATH)/test/testlist.mk
 
 define VALIDATE_TEST_LIST
diff --git a/lib/fnv/Makefile b/lib/fnv/Makefile
new file mode 100644
index 0000000000..c0673ded40
--- /dev/null
+++ b/lib/fnv/Makefile
@@ -0,0 +1,304 @@
+#!/bin/make
+#
+# hash - makefile for FNV hash tools
+#
+# @(#) $Revision: 5.2 $
+# @(#) $Id: Makefile,v 5.2 2012/03/21 01:42:15 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/fnv/RCS/Makefile,v $
+#
+# See:
+#	http://www.isthe.com/chongo/tech/comp/fnv/index.html
+#
+# for the most up to date copy of this code and the FNV hash home page.
+#
+# Please do not copyright this code.  This code is in the public domain.
+#
+# LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+# EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# By:
+#	chongo <Landon Curt Noll> /\oo/\
+#	http://www.isthe.com/chongo/
+#
+# Share and Enjoy!	:-)
+
+# make tools
+#
+SHELL= /bin/sh
+CFLAGS= -O3 -g3
+#CFLAGS= -O2 -g3
+#CC= cc
+AR= ar
+TAR= tar
+EGREP= egrep
+GZIP_BIN= gzip
+INSTALL= install
+
+# If your system needs ranlib use:
+#	RANLIB= ranlib
+# otherwise use:
+#	RANLIB= :
+#
+#RANLIB= ranlib
+RANLIB= :
+
+# where to install things
+#
+DESTBIN= /usr/local/bin
+DESTLIB= /usr/local/lib
+DESTINC= /usr/local/include
+
+# what to build
+#
+SRC=	hash_32.c hash_32a.c hash_64.c hash_64a.c \
+	fnv32.c fnv64.c \
+	have_ulong64.c test_fnv.c
+NO64BIT_SRC= no64bit_fnv64.c no64bit_hash_64.c \
+	no64bit_hash_64a.c no64bit_test_fnv.c
+HSRC=	fnv.h \
+	longlong.h
+ALL=	${SRC} ${HSRC} \
+	README Makefile
+PROGS=	fnv032 fnv064 fnv132 fnv164 fnv1a32 fnv1a64
+OBSOLETE_PROGS=	fnv0_32 fnv0_64 fnv1_32 fnv1_64 fnv1a_32 fnv1a_64
+NO64BIT_PROGS= no64bit_fnv064 no64bit_fnv164 no64bit_fnv1a64
+LIBS=	libfnv.a
+LIBOBJ=	hash_32.o hash_64.o hash_32a.o hash_64a.o test_fnv.o
+NO64BIT_OBJ= no64bit_fnv64.o no64bit_hash_64.o \
+	no64bit_hash_64a.o no64bit_test_fnv.o
+OTHEROBJ= fnv32.o fnv64.o
+TARGETS= ${LIBOBJ} ${LIBS} ${PROGS}
+
+# default rule
+#
+all: ${TARGETS}
+
+# things to build
+#
+hash_32.o: hash_32.c longlong.h fnv.h
+	${CC} ${CFLAGS} hash_32.c -c
+
+hash_64.o: hash_64.c longlong.h fnv.h
+	${CC} ${CFLAGS} hash_64.c -c
+
+hash_32a.o: hash_32a.c longlong.h fnv.h
+	${CC} ${CFLAGS} hash_32a.c -c
+
+hash_64a.o: hash_64a.c longlong.h fnv.h
+	${CC} ${CFLAGS} hash_64a.c -c
+
+test_fnv.o: test_fnv.c longlong.h fnv.h
+	${CC} ${CFLAGS} test_fnv.c -c
+
+fnv32.o: fnv32.c longlong.h fnv.h
+	${CC} ${CFLAGS} fnv32.c -c
+
+fnv032: fnv32.o libfnv.a
+	${CC} fnv32.o libfnv.a -o fnv032
+
+fnv64.o: fnv64.c longlong.h fnv.h
+	${CC} ${CFLAGS} fnv64.c -c
+
+fnv064: fnv64.o libfnv.a
+	${CC} fnv64.o libfnv.a -o fnv064
+
+libfnv.a: ${LIBOBJ}
+	rm -f $@
+	${AR} rv $@ ${LIBOBJ}
+	${RANLIB} $@
+
+fnv132: fnv032
+	-rm -f $@
+	-cp -f $? $@
+
+fnv1a32: fnv032
+	-rm -f $@
+	-cp -f $? $@
+
+fnv164: fnv064
+	-rm -f $@
+	-cp -f $? $@
+
+fnv1a64: fnv064
+	-rm -f $@
+	-cp -f $? $@
+
+longlong.h: have_ulong64.c Makefile
+	-@rm -f have_ulong64 have_ulong64.o ll_tmp longlong.h
+	@echo 'forming longlong.h'
+	@echo '/*' > longlong.h
+	@echo ' * DO NOT EDIT -- generated by the Makefile' >> longlong.h
+	@echo ' */' >> longlong.h
+	@echo '' >> longlong.h
+	@echo '#if !defined(__LONGLONG_H__)' >> longlong.h
+	@echo '#define __LONGLONG_H__' >> longlong.h
+	@echo '' >> longlong.h
+	@echo '/* do we have/want to use a long long type? */' >> longlong.h
+	-@rm -f have_ulong64.o have_ulong64
+	-@${CC} ${CFLAGS} have_ulong64.c -c 2>/dev/null; true
+	-@${CC} ${CFLAGS} have_ulong64.o -o have_ulong64 2>/dev/null; true
+	-@${SHELL} -c "./have_ulong64 > ll_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-@if [ -s ll_tmp ]; then \
+	    cat ll_tmp >> longlong.h; \
+	else \
+	    echo '#undef HAVE_64BIT_LONG_LONG	/* no */' >> longlong.h; \
+	fi
+	@echo '' >> longlong.h
+	@echo '/*' >> longlong.h
+	@echo ' * NO64BIT_LONG_LONG undef HAVE_64BIT_LONG_LONG' >> longlong.h
+	@echo ' */' >> longlong.h
+	@echo '#if defined(NO64BIT_LONG_LONG)' >> longlong.h
+	@echo '#undef HAVE_64BIT_LONG_LONG' >> longlong.h
+	@echo '#endif /* NO64BIT_LONG_LONG */' >> longlong.h
+	@echo '' >> longlong.h
+	@echo '#endif /* !__LONGLONG_H__ */' >> longlong.h
+	-@rm -f have_ulong64 have_ulong64.o ll_tmp
+	@echo 'longlong.h formed'
+
+# utilities
+#
+install: all
+	-@if [ -d "${DESTBIN}" ]; then \
+	    echo "	mkdir -p ${DESTBIN}"; \
+	    mkdir -p ${DESTBIN}; \
+	fi
+	-@if [ -d "${DESTLIB}" ]; then \
+	    echo "	mkdir -p ${DESTLIB}"; \
+	    mkdir -p ${DESTLIB}; \
+	fi
+	-@if [ -d "${DESTINC}" ]; then \
+	    echo "	mkdir -p ${DESTINC}"; \
+	    mkdir -p ${DESTINC}; \
+	fi
+	${INSTALL} -m 0755 ${PROGS} ${DESTBIN}
+	${INSTALL} -m 0644 ${LIBS} ${DESTLIB}
+	${RANLIB} ${DESTLIB}/libfnv.a
+	${INSTALL} -m 0644 ${HSRC} ${DESTINC}
+	@# remove osolete programs
+	for i in ${OBSOLETE_PROGS}; do \
+	    if [ -f "${DESTBIN}/$$i" ]; then \
+	        echo "rm -f ${DESTBIN}/$$i"; \
+		rm -f "${DESTBIN}/$$i"; \
+	    fi; \
+	done
+
+clean:
+	-rm -f have_ulong64 have_ulong64.o ll_tmp ll_tmp2 longlong.h
+	-rm -f ${LIBOBJ}
+	-rm -f ${OTHEROBJ}
+
+clobber: clean
+	-rm -f ${TARGETS}
+	-rm -f ${OBSOLETE_PROGS} lltmp lltmp2 ll_tmp
+	-rm -f ${NO64BIT_SRC}
+	-rm -f ${NO64BIT_OBJ}
+	-rm -f ${NO64BIT_PROGS}
+	-rm -f vector.c
+
+check: ${PROGS}
+	@echo -n "FNV-0 32 bit tests: "
+	@./fnv032 -t 1 -v
+	@echo -n "FNV-1 32 bit tests: "
+	@./fnv132 -t 1 -v
+	@echo -n "FNV-1a 32 bit tests: "
+	@./fnv1a32 -t 1 -v
+	@echo -n "FNV-0 64 bit tests: "
+	@./fnv064 -t 1 -v
+	@echo -n "FNV-1 64 bit tests: "
+	@./fnv164 -t 1 -v
+	@echo -n "FNV-1a 64 bit tests: "
+	@./fnv1a64 -t 1 -v
+
+###############################
+# generate test vector source #
+###############################
+
+no64bit_fnv64.c: fnv64.c
+	-rm -f $@
+	-cp -f $? $@
+
+no64bit_hash_64.c: hash_64.c
+	-rm -f $@
+	-cp -f $? $@
+
+no64bit_hash_64a.c: hash_64a.c
+	-rm -f $@
+	-cp -f $? $@
+
+no64bit_test_fnv.c: test_fnv.c
+	-rm -f $@
+	-cp -f $? $@
+
+no64bit_fnv64.o: no64bit_fnv64.c longlong.h fnv.h
+	${CC} ${CFLAGS} -DNO64BIT_LONG_LONG no64bit_fnv64.c -c
+
+no64bit_hash_64.o: no64bit_hash_64.c longlong.h fnv.h
+	${CC} ${CFLAGS} -DNO64BIT_LONG_LONG no64bit_hash_64.c -c
+
+no64bit_hash_64a.o: no64bit_hash_64a.c longlong.h fnv.h
+	${CC} ${CFLAGS} -DNO64BIT_LONG_LONG no64bit_hash_64a.c -c
+
+no64bit_test_fnv.o: no64bit_test_fnv.c longlong.h fnv.h
+	${CC} ${CFLAGS} -DNO64BIT_LONG_LONG no64bit_test_fnv.c -c
+
+no64bit_fnv064: no64bit_fnv64.o no64bit_hash_64.o \
+		no64bit_hash_64a.o no64bit_test_fnv.o
+	${CC} ${CFLAGS} no64bit_fnv64.o no64bit_hash_64.o \
+		        no64bit_hash_64a.o no64bit_test_fnv.o -o $@
+
+no64bit_fnv164: no64bit_fnv064
+	-rm -f $@
+	-cp -f $? $@
+
+no64bit_fnv1a64: no64bit_fnv064
+	-rm -f $@
+	-cp -f $? $@
+
+vector.c: ${PROGS} ${NO64BIT_PROGS}
+	-rm -f $@
+	echo '/* start of output generated by make $@ */' >> $@
+	echo '' >> $@
+	#@
+	echo '/* FNV-0 32 bit test vectors */' >> $@
+	./fnv032 -t 0 >> $@
+	echo '' >> $@
+	#@
+	echo '/* FNV-1 32 bit test vectors */' >> $@
+	./fnv132 -t 0 >> $@
+	echo '' >> $@
+	#@
+	echo '/* FNV-1a 32 bit test vectors */' >> $@
+	./fnv1a32 -t 0 >> $@
+	echo '' >> $@
+	#@
+	echo '/* FNV-0 64 bit test vectors */' >> $@
+	echo '#if defined(HAVE_64BIT_LONG_LONG)' >> $@
+	./fnv064 -t 0 >> $@
+	echo '#else /* HAVE_64BIT_LONG_LONG */' >> $@
+	./no64bit_fnv064 -t 0 >> $@
+	echo '#endif /* HAVE_64BIT_LONG_LONG */' >> $@
+	echo '' >> $@
+	#@
+	echo '/* FNV-1 64 bit test vectors */' >> $@
+	echo '#if defined(HAVE_64BIT_LONG_LONG)' >> $@
+	./fnv164 -t 0 >> $@
+	echo '#else /* HAVE_64BIT_LONG_LONG */' >> $@
+	./no64bit_fnv164 -t 0 >> $@
+	echo '#endif /* HAVE_64BIT_LONG_LONG */' >> $@
+	echo '' >> $@
+	#@
+	echo '/* FNV-1a 64 bit test vectors */' >> $@
+	echo '#if defined(HAVE_64BIT_LONG_LONG)' >> $@
+	./fnv1a64 -t 0 >> $@
+	echo '#else /* HAVE_64BIT_LONG_LONG */' >> $@
+	./no64bit_fnv1a64 -t 0 >> $@
+	echo '#endif /* HAVE_64BIT_LONG_LONG */' >> $@
+	echo '' >> $@
+	#@
+	echo '/* end of output generated by make $@ */' >> $@
diff --git a/lib/fnv/README b/lib/fnv/README
new file mode 100644
index 0000000000..60aa9aaf61
--- /dev/null
+++ b/lib/fnv/README
@@ -0,0 +1,158 @@
+#=====================#
+# Fowler/Noll/Vo hash #
+#=====================#
+
+The basis of this hash algorithm was taken from an idea sent
+as reviewer comments to the IEEE POSIX P1003.2 committee by:
+
+     Phong Vo (http://www.research.att.com/info/kpv)
+     Glenn Fowler (http://www.research.att.com/~gsf/)
+
+In a subsequent ballot round:
+
+     Landon Curt Noll (http://www.isthe.com/chongo)
+
+improved on their algorithm.  Some people tried this hash
+and found that it worked rather well.  In an EMail message
+to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+
+FNV hashes are designed to be fast while maintaining a low
+collision rate. The FNV speed allows one to quickly hash lots
+of data while maintaining a reasonable collision rate.  See:
+
+     http://www.isthe.com/chongo/tech/comp/fnv/index.html
+
+for more details as well as other forms of the FNV hash.
+Comments, questions, bug fixes and suggestions welcome at
+the address given in the above URL.
+
+
+#==================#
+# FNV hash utility #
+#==================#
+
+Two hash utilities (32 bit and 64 bit) are provided:
+
+	fnv032 [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]
+	fnv132 [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]
+	fnv1a32 [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]
+
+	fnv064 [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]
+	fnv164 [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]
+	fnv1a64 [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]
+
+	-b bcnt	  mask off all but the lower bcnt bits (default: 32)
+ 	-m	  multiple hashes, one per line for each arg
+	-s	  hash arg as a string (ignoring terminating NUL bytes)
+	-t code	  0 ==> generate test vectors, 1 ==> test FNV hash
+ 	-v	  verbose mode, print arg after hash (implies -m)
+	arg	  string (if -s was given) or filename (default stdin)
+
+The fnv032, fnv064 implement the historic FNV-0 hash.
+The fnv132, fnv164 implement the recommended FNV-1 hash.
+The fnv1a32, fnv1a64 implement the recommended FNV-1a hash.
+
+This is the original historic FNV algorithm with a 0 offset basis.
+It is recommended that FNV-1, with a non-0 offset basis be used instead.
+
+To test FNV hashes, try:
+
+	fnv032 -t 1 -v
+	fnv132 -t 1 -v
+	fnv1a32 -t 1 -v
+
+	fnv064 -t 1 -v
+	fnv164 -t 1 -v
+	fnv1a64 -t 1 -v
+
+If you are compiling, try:
+
+	make check
+
+
+#==================#
+# FNV hash library #
+#==================#
+
+The libfnv.a library implements both a 32 bit and a 64 bit FNV hash
+on collections of bytes, a NUL terminated strings or on an open file
+descriptor.
+
+Here is the 32 bit FNV 1 hash:
+
+	Fnv32_t fnv_32_buf(void *buf, int len, Fnv32_t hval);	/* byte buf */
+	Fnv32_t fnv_32_str(char *string, Fnv32_t hval);		/* string */
+
+Here is the 32 bit FNV 1a hash:
+
+	Fnv32_t fnv_32a_buf(void *buf, int len, Fnv32_t hval);	/* byte buf */
+	Fnv32_t fnv_32a_str(char *string, Fnv32_t hval);	/* string */
+
+Here is the 64 bit FNV 1 hash:
+
+	Fnv64_t fnv_64_buf(void *buf, int len, Fnv64_t hval);	/* byte buf */
+	Fnv64_t fnv_64_str(char *string, Fnv64_t hval);		/* string */
+
+Here is the 64 bit FNV 1a hash:
+
+	Fnv64_t fnv_64a_buf(void *buf, int len, Fnv64_t hval);	/* byte buf */
+	Fnv64_t fnv_64a_str(char *string, Fnv64_t hval);	/* string */
+
+On the first call to a hash function, one must supply the initial basis
+that is appropriate for the hash in question:
+
+    FNV-0:	(not recommended)
+
+	FNV0_32_INIT		/* 32 bit FNV-0 initial basis */
+	FNV0_64_INIT		/* 64 bit FNV-0 initial basis */
+
+    FNV-1:
+
+	FNV1_32_INIT		/* 32 bit FNV-1 initial basis */
+	FNV1_64_INIT		/* 64 bit FNV-1 initial basis */
+
+    FNV-1a:
+
+	FNV1A_32_INIT		/* 32 bit FNV-1a initial basis */
+	FNV1A_64_INIT		/* 64 bit FNV-1a initial basis */
+
+For example to perform a 64 bit FNV-1 hash:
+
+	#include "fnv.h"
+
+	Fnv64_t hash_val;
+
+	hash_val = fnv_64_str("a string", FNV1_64_INIT);
+	hash_val = fnv_64_str("more string", hash_val);
+
+produces the same final hash value as:
+
+	hash_val = fnv_64_str("a stringmore string", FNV1_64_INIT);
+
+NOTE: If one used 'FNV0_64_INIT' instead of 'FNV1_64_INIT' one would get the
+      historic FNV-0 hash instead recommended FNV-1 hash.
+
+To perform a 32 bit FNV-1 hash:
+
+	#include "fnv.h"
+
+	Fnv32_t hash_val;
+
+	hash_val = fnv_32_buf(buf, length_of_buf, FNV1_32_INIT);
+	hash_val = fnv_32_str("more data", hash_val);
+
+To perform a 64 bit FNV-1a hash:
+
+	#include "fnv.h"
+
+	Fnv64_t hash_val;
+
+	hash_val = fnv_64a_buf(buf, length_of_buf, FNV1_64_INIT);
+	hash_val = fnv_64a_str("more data", hash_val);
+
+=-=
+
+chongo <Landon Curt Noll> /\oo/\
+http://www.isthe.com/chongo
+
+Share and Enjoy!
diff --git a/lib/fnv/fnv.h b/lib/fnv/fnv.h
new file mode 100644
index 0000000000..2083a4aa23
--- /dev/null
+++ b/lib/fnv/fnv.h
@@ -0,0 +1,249 @@
+/*
+ * fnv - Fowler/Noll/Vo- hash code
+ *
+ * @(#) $Revision: 5.4 $
+ * @(#) $Id: fnv.h,v 5.4 2009/07/30 22:49:13 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/fnv.h,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo- hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * NOTE: The FNV-0 historic hash is not recommended.  One should use
+ *	 the FNV-1 hash instead.
+ *
+ * To use the 32 bit FNV-0 historic hash, pass FNV0_32_INIT as the
+ * Fnv32_t hashval argument to fnv_32_buf() or fnv_32_str().
+ *
+ * To use the 64 bit FNV-0 historic hash, pass FNV0_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64_buf() or fnv_64_str().
+ *
+ * To use the recommended 32 bit FNV-1 hash, pass FNV1_32_INIT as the
+ * Fnv32_t hashval argument to fnv_32_buf() or fnv_32_str().
+ *
+ * To use the recommended 64 bit FNV-1 hash, pass FNV1_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64_buf() or fnv_64_str().
+ *
+ * To use the recommended 32 bit FNV-1a hash, pass FNV1_32A_INIT as the
+ * Fnv32_t hashval argument to fnv_32a_buf() or fnv_32a_str().
+ *
+ * To use the recommended 64 bit FNV-1a hash, pass FNV1A_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64a_buf() or fnv_64a_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#if !defined(__FNV_H__)
+#define __FNV_H__
+
+#include <sys/types.h>
+
+#define FNV_VERSION "5.0.2"	/* @(#) FNV Version */
+
+
+/*
+ * 32 bit FNV-0 hash type
+ */
+typedef u_int32_t Fnv32_t;
+
+
+/*
+ * 32 bit FNV-0 zero initial basis
+ *
+ * This historic hash is not recommended.  One should use
+ * the FNV-1 hash and initial basis instead.
+ */
+#define FNV0_32_INIT ((Fnv32_t)0)
+
+
+/*
+ * 32 bit FNV-1 and FNV-1a non-zero initial basis
+ *
+ * The FNV-1 initial basis is the FNV-0 hash of the following 32 octets:
+ *
+ *              chongo <Landon Curt Noll> /\../\
+ *
+ * NOTE: The \'s above are not back-slashing escape characters.
+ * They are literal ASCII  backslash 0x5c characters.
+ *
+ * NOTE: The FNV-1a initial basis is the same value as FNV-1 by definition.
+ */
+#define FNV1_32_INIT ((Fnv32_t)0x811c9dc5)
+#define FNV1_32A_INIT FNV1_32_INIT
+
+
+/*
+ * determine how 64 bit unsigned values are represented
+ */
+#include "longlong.h"
+
+
+/*
+ * 64 bit FNV-0 hash
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+typedef u_int64_t Fnv64_t;
+#else /* HAVE_64BIT_LONG_LONG */
+typedef struct {
+    u_int32_t w32[2]; /* w32[0] is low order, w32[1] is high order word */
+} Fnv64_t;
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * 64 bit FNV-0 zero initial basis
+ *
+ * This historic hash is not recommended.  One should use
+ * the FNV-1 hash and initial basis instead.
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+#define FNV0_64_INIT ((Fnv64_t)0)
+#else /* HAVE_64BIT_LONG_LONG */
+extern const Fnv64_t fnv0_64_init;
+#define FNV0_64_INIT (fnv0_64_init)
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * 64 bit FNV-1 non-zero initial basis
+ *
+ * The FNV-1 initial basis is the FNV-0 hash of the following 32 octets:
+ *
+ *              chongo <Landon Curt Noll> /\../\
+ *
+ * NOTE: The \'s above are not back-slashing escape characters.
+ * They are literal ASCII  backslash 0x5c characters.
+ *
+ * NOTE: The FNV-1a initial basis is the same value as FNV-1 by definition.
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+#define FNV1_64_INIT ((Fnv64_t)0xcbf29ce484222325ULL)
+#define FNV1A_64_INIT FNV1_64_INIT
+#else /* HAVE_64BIT_LONG_LONG */
+extern const fnv1_64_init;
+extern const Fnv64_t fnv1a_64_init;
+#define FNV1_64_INIT (fnv1_64_init)
+#define FNV1A_64_INIT (fnv1a_64_init)
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * hash types
+ */
+enum fnv_type {
+    FNV_NONE = 0,	/* invalid FNV hash type */
+    FNV0_32 = 1,	/* FNV-0 32 bit hash */
+    FNV1_32 = 2,	/* FNV-1 32 bit hash */
+    FNV1a_32 = 3,	/* FNV-1a 32 bit hash */
+    FNV0_64 = 4,	/* FNV-0 64 bit hash */
+    FNV1_64 = 5,	/* FNV-1 64 bit hash */
+    FNV1a_64 = 6,	/* FNV-1a 64 bit hash */
+};
+
+
+/*
+ * these test vectors are used as part o the FNV test suite
+ */
+struct test_vector {
+    void *buf;		/* start of test vector buffer */
+    int len;		/* length of test vector */
+};
+struct fnv0_32_test_vector {
+    struct test_vector *test;	/* test vector buffer to hash */
+    Fnv32_t fnv0_32;		/* expected FNV-0 32 bit hash value */
+};
+struct fnv1_32_test_vector {
+    struct test_vector *test;	/* test vector buffer to hash */
+    Fnv32_t fnv1_32;		/* expected FNV-1 32 bit hash value */
+};
+struct fnv1a_32_test_vector {
+    struct test_vector *test;	/* test vector buffer to hash */
+    Fnv32_t fnv1a_32;		/* expected FNV-1a 32 bit hash value */
+};
+struct fnv0_64_test_vector {
+    struct test_vector *test;	/* test vector buffer to hash */
+    Fnv64_t fnv0_64;		/* expected FNV-0 64 bit hash value */
+};
+struct fnv1_64_test_vector {
+    struct test_vector *test;	/* test vector buffer to hash */
+    Fnv64_t fnv1_64;		/* expected FNV-1 64 bit hash value */
+};
+struct fnv1a_64_test_vector {
+    struct test_vector *test;	/* test vector buffer to hash */
+    Fnv64_t fnv1a_64;		/* expected FNV-1a 64 bit hash value */
+};
+
+
+/*
+ * external functions
+ */
+/* hash_32.c */
+extern Fnv32_t fnv_32_buf(void *buf, size_t len, Fnv32_t hashval);
+extern Fnv32_t fnv_32_str(char *buf, Fnv32_t hashval);
+
+/* hash_32a.c */
+extern Fnv32_t fnv_32a_buf(void *buf, size_t len, Fnv32_t hashval);
+extern Fnv32_t fnv_32a_str(char *buf, Fnv32_t hashval);
+
+/* hash_64.c */
+extern Fnv64_t fnv_64_buf(void *buf, size_t len, Fnv64_t hashval);
+extern Fnv64_t fnv_64_str(char *buf, Fnv64_t hashval);
+
+/* hash_64a.c */
+extern Fnv64_t fnv_64a_buf(void *buf, size_t len, Fnv64_t hashval);
+extern Fnv64_t fnv_64a_str(char *buf, Fnv64_t hashval);
+
+/* test_fnv.c */
+extern struct test_vector fnv_test_str[];
+extern struct fnv0_32_test_vector fnv0_32_vector[];
+extern struct fnv1_32_test_vector fnv1_32_vector[];
+extern struct fnv1a_32_test_vector fnv1a_32_vector[];
+extern struct fnv0_64_test_vector fnv0_64_vector[];
+extern struct fnv1_64_test_vector fnv1_64_vector[];
+extern struct fnv1a_64_test_vector fnv1a_64_vector[];
+extern void unknown_hash_type(char *prog, enum fnv_type type, int code);
+extern void print_fnv32(Fnv32_t hval, Fnv32_t mask, int verbose, char *arg);
+extern void print_fnv64(Fnv64_t hval, Fnv64_t mask, int verbose, char *arg);
+
+
+#endif /* __FNV_H__ */
diff --git a/lib/fnv/fnv32.c b/lib/fnv/fnv32.c
new file mode 100644
index 0000000000..58c61f03fc
--- /dev/null
+++ b/lib/fnv/fnv32.c
@@ -0,0 +1,467 @@
+/*
+ * fnv32 - 32 bit Fowler/Noll/Vo hash of a buffer or string
+ *
+ * @(#) $Revision: 5.5 $
+ * @(#) $Id: fnv32.c,v 5.5 2012/03/21 01:38:12 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/fnv32.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include "longlong.h"
+#include "fnv.h"
+
+#define WIDTH 32		/* bit width of hash */
+
+#define BUF_SIZE (32*1024)	/* number of bytes to hash at a time */
+
+static char *usage =
+"usage: %s [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]\n"
+"\n"
+"\t-b bcnt\tmask off all but the lower bcnt bits (default 32)\n"
+"\t-m\tmultiple hashes, one per line for each arg\n"
+"\t-s\thash arg as a string (ignoring terminating NUL bytes)\n"
+"\t-t code\t  test hash code: (0 ==> generate test vectors\n"
+"\t\t\t\t   1 ==> validate against FNV test vectors)\n"
+"\t-v\tverbose mode, print arg after hash (implies -m)\n"
+"\targ\tstring (if -s was given) or filename (default stdin)\n"
+"\n"
+"\tNOTE: Programs that begin with fnv0 implement the FNV-0 hash.\n"
+"\t      The FNV-0 hash is historic FNV algorithm that is now deprecated.\n"
+"\n"
+"\tSee http://www.isthe.com/chongo/tech/comp/fnv/index.html for more info.\n"
+"\n"
+"\t@(#) FNV Version: %s\n";
+static char *program;	/* our name */
+
+
+/*
+ * test_fnv32 - test the FNV32 hash
+ *
+ * given:
+ *	hash_type	type of FNV hash to test
+ *	init_hval	initial hash value
+ *	mask	  	lower bit mask
+ *	v_flag	  	1 => print test failure info on stderr
+ *	code	  0 ==> generate FNV test vectors
+ *		  1 ==> validate against FNV test vectors
+ *
+ * returns:	0 ==> OK, else test vector failure number
+ */
+static int
+test_fnv32(enum fnv_type hash_type, Fnv32_t init_hval,
+	   Fnv32_t mask, int v_flag, int code)
+{
+    struct test_vector *t;	/* FNV test vestor */
+    Fnv32_t hval;		/* current hash value */
+    int tstnum;			/* test vector that failed, starting at 1 */
+
+    /*
+     * print preamble if generating test vectors
+     */
+    if (code == 0) {
+	switch (hash_type) {
+	case FNV0_32:
+	    printf("struct fnv0_32_test_vector fnv0_32_vector[] = {\n");
+	    break;
+	case FNV1_32:
+	    printf("struct fnv1_32_test_vector fnv1_32_vector[] = {\n");
+	    break;
+	case FNV1a_32:
+	    printf("struct fnv1a_32_test_vector fnv1a_32_vector[] = {\n");
+	    break;
+	default:
+	    unknown_hash_type(program, hash_type, 12);	/* exit(12) */
+	    /*NOTREACHED*/
+    	}
+    }
+
+    /*
+     * loop thru all test vectors
+     */
+    for (t = fnv_test_str, tstnum = 1; t->buf != NULL; ++t, ++tstnum) {
+
+        /*
+	 * compute the FNV hash
+	 */
+	hval = init_hval;
+	switch (hash_type) {
+	case FNV0_32:
+	case FNV1_32:
+	    hval = fnv_32_buf(t->buf, t->len, hval);
+	    break;
+	case FNV1a_32:
+	    hval = fnv_32a_buf(t->buf, t->len, hval);
+	    break;
+	default:
+	    unknown_hash_type(program, hash_type, 13);	/* exit(13) */
+	    /*NOTREACHED*/
+	}
+
+	/*
+	 * print the vector
+	 */
+	switch (code) {
+	case 0:		/* generate the test vector */
+	    printf("    { &fnv_test_str[%d], (Fnv32_t) 0x%08lxUL },\n",
+	    	    tstnum-1, hval & mask);
+    	    break;
+	case 1:		/* validate against test vector */
+	    switch (hash_type) {
+	    case FNV0_32:
+		if ((hval&mask) != (fnv0_32_vector[tstnum-1].fnv0_32 & mask)) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv0_32 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%08lx != generated: 0x%08lx\n",
+			    program, (hval&mask),
+			    (fnv0_32_vector[tstnum-1].fnv0_32 & mask));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    case FNV1_32:
+		if ((hval&mask) != (fnv1_32_vector[tstnum-1].fnv1_32 & mask)) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv1_32 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%08lx != generated: 0x%08lx\n",
+			    program, (hval&mask),
+			    (fnv1_32_vector[tstnum-1].fnv1_32 & mask));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    case FNV1a_32:
+		if ((hval&mask) != (fnv1a_32_vector[tstnum-1].fnv1a_32 &mask)) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv1a_32 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%08lx != generated: 0x%08lx\n",
+			    program, (hval&mask),
+			    (fnv1a_32_vector[tstnum-1].fnv1a_32 & mask));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    }
+	    break;
+    	default:
+	    fprintf(stderr, "%s: -m %d not implemented yet\n", program, code);
+	    exit(14);
+    	}
+    }
+
+    /*
+     * print completion if generating test vectors
+     */
+    if (code == 0) {
+	printf("    { NULL, 0 }\n");
+	printf("};\n");
+    }
+
+    /*
+     * no failures, return code 0 ==> all OK
+     */
+    return 0;
+}
+
+
+/*
+ * main - the main function
+ *
+ * See the above usage for details.
+ */
+int
+main(int argc, char *argv[])
+{
+    char buf[BUF_SIZE+1];	/* read buffer */
+    int readcnt;		/* number of characters written */
+    Fnv32_t hval;		/* current hash value */
+    int s_flag = 0;		/* 1 => -s was given, hash args as strings */
+    int m_flag = 0;		/* 1 => print multiple hashes, one per arg */
+    int v_flag = 0;		/* 1 => verbose hash print */
+    int b_flag = WIDTH;		/* -b flag value */
+    int t_flag = -1;		/* FNV test vector code (0=>print, 1=>test) */
+    enum fnv_type hash_type = FNV_NONE;	/* type of FNV hash to perform */
+    Fnv32_t bmask;		/* mask to apply to output */
+    extern char *optarg;	/* option argument */
+    extern int optind;		/* argv index of the next arg */
+    int fd;			/* open file to process */
+    char *p;
+    int i;
+
+    /*
+     * parse args
+     */
+    program = argv[0];
+    while ((i = getopt(argc, argv, "b:mst:v")) != -1) {
+	switch (i) {
+	case 'b':	/* bcnt bit mask count */
+	    b_flag = atoi(optarg);
+	    break;
+	case 'm':	/* print multiple hashes, one per arg */
+	    m_flag = 1;
+	    break;
+	case 's':	/* hash args as strings */
+	    s_flag = 1;
+	    break;
+	case 't':	/* FNV test vector code */
+	    t_flag = atoi(optarg);
+	    if (t_flag < 0 || t_flag > 1) {
+		fprintf(stderr, "%s: -t code must be 0 or 1\n", program);
+		fprintf(stderr, usage, program, FNV_VERSION);
+		exit(1);
+	    }
+	    m_flag = 1;
+	    break;
+	case 'v':	/* verbose hash print */
+	    m_flag = 1;
+	    v_flag = 1;
+	    break;
+	default:
+	    fprintf(stderr, usage, program, FNV_VERSION);
+	    exit(1);
+	}
+    }
+    /* -t code incompatible with -b, -m and args */
+    if (t_flag >= 0) {
+    	if (b_flag != WIDTH) {
+	    fprintf(stderr, "%s: -t code incompatible with -b\n", program);
+	    exit(2);
+	}
+    	if (s_flag != 0) {
+	    fprintf(stderr, "%s: -t code incompatible with -s\n", program);
+	    exit(3);
+	}
+	if (optind < argc) {
+	    fprintf(stderr, "%s: -t code incompatible args\n", program);
+	    exit(4);
+	}
+    }
+    /* -s requires at least 1 arg */
+    if (s_flag && optind >= argc) {
+	fprintf(stderr, usage, program, FNV_VERSION);
+	exit(5);
+    }
+    /* limit -b values */
+    if (b_flag < 0 || b_flag > WIDTH) {
+	fprintf(stderr, "%s: -b bcnt: %d must be >= 0 and < %d\n",
+		program, b_flag, WIDTH);
+	exit(6);
+    }
+    if (b_flag == WIDTH) {
+	bmask = (Fnv32_t)0xffffffff;
+    } else {
+	bmask = (Fnv32_t)((1 << b_flag) - 1);
+    }
+
+    /*
+     * start with the initial basis depending on the hash type
+     */
+    p = strrchr(program, '/');
+    if (p == NULL) {
+	p = program;
+    } else {
+	++p;
+    }
+    if (strcmp(p, "fnv032") == 0) {
+	/* using non-recommended FNV-0 and zero initial basis */
+	hval = FNV0_32_INIT;
+	hash_type = FNV0_32;
+    } else if (strcmp(p, "fnv132") == 0) {
+	/* using FNV-1 and non-zero initial basis */
+	hval = FNV1_32_INIT;
+	hash_type = FNV1_32;
+    } else if (strcmp(p, "fnv1a32") == 0) {
+	 /* start with the FNV-1a initial basis */
+	hval = FNV1_32A_INIT;
+	hash_type = FNV1a_32;
+    } else {
+	fprintf(stderr, "%s: unknown program name, unknown hash type\n",
+		program);
+	exit(7);
+    }
+
+    /*
+     * FNV test vector processing, if needed
+     */
+    if (t_flag >= 0) {
+	int code;		/* test vector that failed, starting at 1 */
+
+	/*
+	 * perform all tests
+	 */
+	code = test_fnv32(hash_type, hval, bmask, v_flag, t_flag);
+
+	/*
+	 * evaluate the tests
+	 */
+	if (code == 0) {
+	    if (v_flag) {
+	    	printf("passed\n");
+	    }
+	    exit(0);
+	} else {
+	    printf("failed vector (1 is 1st test): %d\n", code);
+	    exit(8);
+	}
+    }
+
+    /*
+     * string hashing
+     */
+    if (s_flag) {
+
+	/* hash any other strings */
+	for (i=optind; i < argc; ++i) {
+	    switch (hash_type) {
+	    case FNV0_32:
+	    case FNV1_32:
+		hval = fnv_32_str(argv[i], hval);
+	    	break;
+	    case FNV1a_32:
+		hval = fnv_32a_str(argv[i], hval);
+		break;
+	    default:
+		unknown_hash_type(program, hash_type, 9);	/* exit(9) */
+		/*NOTREACHED*/
+	    }
+	    if (m_flag) {
+		print_fnv32(hval, bmask, v_flag, argv[i]);
+	    }
+	}
+
+
+    /*
+     * file hashing
+     */
+    } else {
+
+	/*
+	 * case: process only stdin
+	 */
+	if (optind >= argc) {
+
+	    /* case: process only stdin */
+	    while ((readcnt = read(0, buf, BUF_SIZE)) > 0) {
+		switch (hash_type) {
+		case FNV0_32:
+		case FNV1_32:
+		    hval = fnv_32_buf(buf, readcnt, hval);
+		    break;
+		case FNV1a_32:
+		    hval = fnv_32a_buf(buf, readcnt, hval);
+		    break;
+		default:
+		    unknown_hash_type(program, hash_type, 10);	/* exit(10) */
+		    /*NOTREACHED*/
+		}
+	    }
+	    if (m_flag) {
+		print_fnv32(hval, bmask, v_flag, "(stdin)");
+	    }
+
+	} else {
+
+	    /*
+	     * process any other files
+	     */
+	    for (i=optind; i < argc; ++i) {
+
+		/* open the file */
+		fd = open(argv[i], O_RDONLY);
+		if (fd < 0) {
+		    fprintf(stderr, "%s: unable to open file: %s\n",
+			    program, argv[i]);
+		    exit(4);
+		}
+
+		/*  hash the file */
+		while ((readcnt = read(fd, buf, BUF_SIZE)) > 0) {
+		    switch (hash_type) {
+		    case FNV0_32:
+		    case FNV1_32:
+			hval = fnv_32_buf(buf, readcnt, hval);
+			break;
+		    case FNV1a_32:
+			hval = fnv_32a_buf(buf, readcnt, hval);
+			break;
+		    default:
+			unknown_hash_type(program, hash_type, 11);/* exit(11) */
+			/*NOTREACHED*/
+		    }
+		}
+
+		/* finish processing the file */
+		if (m_flag) {
+		    print_fnv32(hval, bmask, v_flag, argv[i]);
+		}
+		close(fd);
+	    }
+	}
+    }
+
+    /*
+     * report hash and exit
+     */
+    if (!m_flag) {
+	print_fnv32(hval, bmask, v_flag, "");
+    }
+    return 0;	/* exit(0); */
+}
diff --git a/lib/fnv/fnv64.c b/lib/fnv/fnv64.c
new file mode 100644
index 0000000000..0662d4d657
--- /dev/null
+++ b/lib/fnv/fnv64.c
@@ -0,0 +1,591 @@
+/*
+ * fnv_64 - 64 bit Fowler/Noll/Vo hash of a buffer or string
+ *
+ * @(#) $Revision: 5.5 $
+ * @(#) $Id: fnv64.c,v 5.5 2012/03/21 01:38:12 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/fnv64.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include "longlong.h"
+#include "fnv.h"
+
+#define WIDTH 64	/* bit width of hash */
+
+#define BUF_SIZE (32*1024)	/* number of bytes to hash at a time */
+
+static char *usage =
+"usage: %s [-b bcnt] [-m] [-s arg] [-t code] [-v] [arg ...]\n"
+"\n"
+"\t-b bcnt\tmask off all but the lower bcnt bits (default 64)\n"
+"\t-m\tmultiple hashes, one per line for each arg\n"
+"\t-s\thash arg as a string (ignoring terminating NUL bytes)\n"
+"\t-t code\t  test hash code: (0 ==> generate test vectors\n"
+"\t\t\t\t   1 ==> validate against FNV test vectors)\n"
+"\t-v\tverbose mode, print arg after hash (implies -m)\n"
+"\targ\tstring (if -s was given) or filename (default stdin)\n"
+"\n"
+"\tNOTE: Programs that begin with fnv0 implement the FNV-0 hash.\n"
+"\t      The FNV-0 hash is historic FNV algorithm that is now deprecated.\n"
+"\n"
+"\tSee http://www.isthe.com/chongo/tech/comp/fnv/index.html for more info.\n"
+"\n"
+"\t@(#) FNV Version: %s\n";
+static char *program;	/* our name */
+
+
+/*
+ * test_fnv64 - test the FNV64 hash
+ *
+ * given:
+ *	hash_type	type of FNV hash to test
+ *	init_hval	initial hash value
+ *	mask	  	lower bit mask
+ *	v_flag	  	1 => print test failure info on stderr
+ *	code	  0 ==> generate FNV test vectors
+ *		  1 ==> validate against FNV test vectors
+ *
+ * returns:	0 ==> OK, else test vector failure number
+ */
+static int
+test_fnv64(enum fnv_type hash_type, Fnv64_t init_hval,
+	   Fnv64_t mask, int v_flag, int code)
+{
+    struct test_vector *t;	/* FNV test vestor */
+    Fnv64_t hval;		/* current hash value */
+    int tstnum;			/* test vector that failed, starting at 1 */
+
+    /*
+     * print preamble if generating test vectors
+     */
+    if (code == 0) {
+	switch (hash_type) {
+	case FNV0_64:
+	    printf("struct fnv0_64_test_vector fnv0_64_vector[] = {\n");
+	    break;
+	case FNV1_64:
+	    printf("struct fnv1_64_test_vector fnv1_64_vector[] = {\n");
+	    break;
+	case FNV1a_64:
+	    printf("struct fnv1a_64_test_vector fnv1a_64_vector[] = {\n");
+	    break;
+	default:
+	    unknown_hash_type(program, hash_type, 12);	/* exit(12) */
+	    /*NOTREACHED*/
+    	}
+    }
+
+    /*
+     * loop thru all test vectors
+     */
+    for (t = fnv_test_str, tstnum = 1; t->buf != NULL; ++t, ++tstnum) {
+
+        /*
+	 * compute the FNV hash
+	 */
+	hval = init_hval;
+	switch (hash_type) {
+	case FNV0_64:
+	case FNV1_64:
+	    hval = fnv_64_buf(t->buf, t->len, hval);
+	    break;
+	case FNV1a_64:
+	    hval = fnv_64a_buf(t->buf, t->len, hval);
+	    break;
+	default:
+	    unknown_hash_type(program, hash_type, 13);	/* exit(13) */
+	    /*NOTREACHED*/
+	}
+
+	/*
+	 * print the vector
+	 */
+#if defined(HAVE_64BIT_LONG_LONG)
+	/*
+	 * HAVE_64BIT_LONG_LONG testing
+	 */
+	switch (code) {
+	case 0:		/* generate the test vector */
+	    printf("    { &fnv_test_str[%d], (Fnv64_t) 0x%016llxULL },\n",
+	    	   tstnum-1, hval & mask);
+	    break;
+
+	case 1:		/* validate against test vector */
+	    switch (hash_type) {
+	    case FNV0_64:
+		if ((hval&mask) != (fnv0_64_vector[tstnum-1].fnv0_64 & mask)) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv0_64 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%016llx != generated: 0x%016llx\n",
+			    program,
+			    (hval&mask),
+			    (fnv0_64_vector[tstnum-1].fnv0_64 & mask));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    case FNV1_64:
+		if ((hval&mask) != (fnv1_64_vector[tstnum-1].fnv1_64 & mask)) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv1_64 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%016llx != generated: 0x%016llx\n",
+			    program,
+			    (hval&mask),
+			    (fnv1_64_vector[tstnum-1].fnv1_64 & mask));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    case FNV1a_64:
+		if ((hval&mask) != (fnv1a_64_vector[tstnum-1].fnv1a_64 &mask)) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv1a_64 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%016llx != generated: 0x%016llx\n",
+			    program,
+			    (hval&mask),
+			    (fnv1a_64_vector[tstnum-1].fnv1a_64 & mask));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    }
+	    break;
+
+    	default:
+	    fprintf(stderr, "%s: -m %d not implemented yet\n", program, code);
+	    exit(14);
+    	}
+#else /* HAVE_64BIT_LONG_LONG */
+	/*
+	 * non HAVE_64BIT_LONG_LONG testing
+	 */
+	switch (code) {
+	case 0:		/* generate the test vector */
+	    printf("    { &fnv_test_str[%d], "
+	    	   "(Fnv64_t) {0x%08lxUL, 0x%08lxUL} },\n",
+	    	   tstnum-1,
+		   (hval.w32[0] & mask.w32[0]),
+		   (hval.w32[1] & mask.w32[1]));
+	    break;
+
+	case 1:		/* validate against test vector */
+	    switch (hash_type) {
+	    case FNV0_64:
+		if (((hval.w32[0] & mask.w32[0]) !=
+		     (fnv0_64_vector[tstnum-1].fnv0_64.w32[0] &
+		      mask.w32[0])) &&
+		    ((hval.w32[1] & mask.w32[1]) !=
+		     (fnv0_64_vector[tstnum-1].fnv0_64.w32[1] &
+		      mask.w32[1]))) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv0_64 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%08llx%08llx != "
+			    "generated: 0x%08llx%08llx\n",
+			    program,
+			    (hval.w32[0] & mask.w32[0]),
+			    (hval.w32[1] & mask.w32[1]),
+			    ((fnv0_64_vector[tstnum-1].fnv0_64.w32[0] &
+			     mask.w32[0])),
+			    ((fnv0_64_vector[tstnum-1].fnv0_64.w32[1] &
+			     mask.w32[1])));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    case FNV1_64:
+		if (((hval.w32[0] & mask.w32[0]) !=
+		     (fnv1_64_vector[tstnum-1].fnv1_64.w32[0] &
+		      mask.w32[0])) &&
+		    ((hval.w32[1] & mask.w32[1]) !=
+		     (fnv1_64_vector[tstnum-1].fnv1_64.w32[1] &
+		      mask.w32[1]))) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv1_64 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%08llx%08llx != "
+			    "generated: 0x%08llx%08llx\n",
+			    program,
+			    (hval.w32[0] & mask.w32[0]),
+			    (hval.w32[1] & mask.w32[1]),
+			    ((fnv1_64_vector[tstnum-1].fnv1_64.w32[0] &
+			     mask.w32[0])),
+			    ((fnv1_64_vector[tstnum-1].fnv1_64.w32[1] &
+			     mask.w32[1])));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    case FNV1a_64:
+		if (((hval.w32[0] & mask.w32[0]) !=
+		     (fnv1a_64_vector[tstnum-1].fnv1a_64.w32[0] &
+		      mask.w32[0])) &&
+		    ((hval.w32[1] & mask.w32[1]) !=
+		     (fnv1a_64_vector[tstnum-1].fnv1a_64.w32[1] &
+		      mask.w32[1]))) {
+		    if (v_flag) {
+		    	fprintf(stderr, "%s: failed fnv1a_64 test # %d\n",
+				program, tstnum);
+		    	fprintf(stderr, "%s: test # 1 is 1st test\n", program);
+			fprintf(stderr,
+			    "%s: expected 0x%08llx%08llx != "
+			    "generated: 0x%08llx%08llx\n",
+			    program,
+			    (hval.w32[0] & mask.w32[0]),
+			    (hval.w32[1] & mask.w32[1]),
+			    ((fnv1a_64_vector[tstnum-1].fnv1a_64.w32[0] &
+			     mask.w32[0])),
+			    ((fnv1a_64_vector[tstnum-1].fnv1a_64.w32[1] &
+			     mask.w32[1])));
+		    }
+		    return tstnum;
+		}
+	    	break;
+	    }
+	    break;
+
+    	default:
+	    fprintf(stderr, "%s: -m %d not implemented yet\n", program, code);
+	    exit(15);
+    	}
+#endif /* HAVE_64BIT_LONG_LONG */
+    }
+
+    /*
+     * print completion if generating test vectors
+     */
+    if (code == 0) {
+#if defined(HAVE_64BIT_LONG_LONG)
+	printf("    { NULL, (Fnv64_t) 0 }\n");
+#else /* HAVE_64BIT_LONG_LONG */
+	printf("    { NULL, (Fnv64_t) {0,0} }\n");
+#endif /* HAVE_64BIT_LONG_LONG */
+	printf("};\n");
+    }
+
+    /*
+     * no failures, return code 0 ==> all OK
+     */
+    return 0;
+}
+
+
+/*
+ * main - the main function
+ *
+ * See the above usage for details.
+ */
+int
+main(int argc, char *argv[])
+{
+    char buf[BUF_SIZE+1];	/* read buffer */
+    int readcnt;		/* number of characters written */
+    Fnv64_t hval;		/* current hash value */
+    int s_flag = 0;		/* 1 => -s was given, hash args as strings */
+    int m_flag = 0;		/* 1 => print multiple hashes, one per arg */
+    int v_flag = 0;		/* 1 => verbose hash print */
+    int b_flag = WIDTH;		/* -b flag value */
+    int t_flag = -1;		/* FNV test vector code (0=>print, 1=>test) */
+    enum fnv_type hash_type = FNV_NONE;	/* type of FNV hash to perform */
+    Fnv64_t bmask;		/* mask to apply to output */
+    extern char *optarg;	/* option argument */
+    extern int optind;		/* argv index of the next arg */
+    int fd;			/* open file to process */
+    char *p;
+    int i;
+
+    /*
+     * parse args
+     */
+    program = argv[0];
+    while ((i = getopt(argc, argv, "b:mst:v")) != -1) {
+	switch (i) {
+	case 'b':	/* bcnt bit mask count */
+	    b_flag = atoi(optarg);
+	    break;
+	case 'm':	/* print multiple hashes, one per arg */
+	    m_flag = 1;
+	    break;
+	case 's':	/* hash args as strings */
+	    s_flag = 1;
+	    break;
+	case 't':	/* FNV test vector code */
+	    t_flag = atoi(optarg);
+	    if (t_flag < 0 || t_flag > 1) {
+		fprintf(stderr, "%s: -t code must be 0 or 1\n", program);
+		fprintf(stderr, usage, program, FNV_VERSION);
+		exit(1);
+	    }
+	    m_flag = 1;
+	    break;
+	case 'v':	/* verbose hash print */
+	    m_flag = 1;
+	    v_flag = 1;
+	    break;
+	default:
+	    fprintf(stderr, usage, program, FNV_VERSION);
+	    exit(1);
+	}
+    }
+    /* -t code incompatible with -b, -m and args */
+    if (t_flag >= 0) {
+    	if (b_flag != WIDTH) {
+	    fprintf(stderr, "%s: -t code incompatible with -b\n", program);
+	    exit(2);
+	}
+    	if (s_flag != 0) {
+	    fprintf(stderr, "%s: -t code incompatible with -s\n", program);
+	    exit(3);
+	}
+	if (optind < argc) {
+	    fprintf(stderr, "%s: -t code incompatible args\n", program);
+	    exit(4);
+	}
+    }
+    /* -s requires at least 1 arg */
+    if (s_flag && optind >= argc) {
+	fprintf(stderr, usage, program, FNV_VERSION);
+	exit(5);
+    }
+    /* limit -b values */
+    if (b_flag < 0 || b_flag > WIDTH) {
+	fprintf(stderr, "%s: -b bcnt: %d must be >= 0 and < %d\n",
+		program, b_flag, WIDTH);
+	exit(6);
+    }
+#if defined(HAVE_64BIT_LONG_LONG)
+    if (b_flag == WIDTH) {
+	bmask = (Fnv64_t)0xffffffffffffffffULL;
+    } else {
+	bmask = (Fnv64_t)((1ULL << b_flag) - 1ULL);
+    }
+#else /* HAVE_64BIT_LONG_LONG */
+    if (b_flag == WIDTH) {
+	bmask.w32[0] = 0xffffffffUL;
+	bmask.w32[1] = 0xffffffffUL;
+    } else if (b_flag >= WIDTH/2) {
+	bmask.w32[0] = 0xffffffffUL;
+	bmask.w32[1] = ((1UL << (b_flag-(WIDTH/2))) - 1UL);
+    } else {
+	bmask.w32[0] = ((1UL << b_flag) - 1UL);
+	bmask.w32[1] = 0UL;
+    }
+#endif /* HAVE_64BIT_LONG_LONG */
+
+    /*
+     * start with the initial basis depending on the hash type
+     */
+    p = strrchr(program, '/');
+    if (p == NULL) {
+	p = program;
+    } else {
+	++p;
+    }
+    if (strcmp(p, "fnv064") == 0 || strcmp(p, "no64bit_fnv064") == 0) {
+	/* using non-recommended FNV-0 and zero initial basis */
+	hval = FNV0_64_INIT;
+	hash_type = FNV0_64;
+    } else if (strcmp(p, "fnv164") == 0 || strcmp(p, "no64bit_fnv164") == 0) {
+	/* using FNV-1 and non-zero initial basis */
+	hval = FNV1_64_INIT;
+	hash_type = FNV1_64;
+    } else if (strcmp(p, "fnv1a64") == 0 || strcmp(p, "no64bit_fnv1a64") == 0) {
+	 /* start with the FNV-1a initial basis */
+	hval = FNV1A_64_INIT;
+	hash_type = FNV1a_64;
+    } else {
+	fprintf(stderr, "%s: unknown program name, unknown hash type\n",
+		program);
+	exit(7);
+    }
+
+    /*
+     * FNV test vector processing, if needed
+     */
+    if (t_flag >= 0) {
+	int code;		/* test vector that failed, starting at 1 */
+
+	/*
+	 * perform all tests
+	 */
+	code = test_fnv64(hash_type, hval, bmask, v_flag, t_flag);
+
+	/*
+	 * evaluate the tests
+	 */
+	if (code == 0) {
+	    if (v_flag) {
+	    	printf("passed\n");
+	    }
+	    exit(0);
+	} else {
+	    printf("failed vector (1 is 1st test): %d\n", code);
+	    exit(8);
+	}
+    }
+
+    /*
+     * string hashing
+     */
+    if (s_flag) {
+
+	/* hash any other strings */
+	for (i=optind; i < argc; ++i) {
+	    switch (hash_type) {
+	    case FNV0_64:
+	    case FNV1_64:
+		hval = fnv_64_str(argv[i], hval);
+	    	break;
+	    case FNV1a_64:
+		hval = fnv_64a_str(argv[i], hval);
+		break;
+	    default:
+		unknown_hash_type(program, hash_type, 9);	/* exit(9) */
+		/*NOTREACHED*/
+	    }
+	    if (m_flag) {
+		print_fnv64(hval, bmask, v_flag, argv[i]);
+	    }
+	}
+
+
+    /*
+     * file hashing
+     */
+    } else {
+
+	/*
+	 * case: process only stdin
+	 */
+	if (optind >= argc) {
+
+	    /* case: process only stdin */
+	    while ((readcnt = read(0, buf, BUF_SIZE)) > 0) {
+		switch (hash_type) {
+		case FNV0_64:
+		case FNV1_64:
+		    hval = fnv_64_buf(buf, readcnt, hval);
+		    break;
+		case FNV1a_64:
+		    hval = fnv_64a_buf(buf, readcnt, hval);
+		    break;
+		default:
+		    unknown_hash_type(program, hash_type, 10);	/* exit(10) */
+		    /*NOTREACHED*/
+		}
+	    }
+	    if (m_flag) {
+		print_fnv64(hval, bmask, v_flag, "(stdin)");
+	    }
+
+	} else {
+
+	    /*
+	     * process any other files
+	     */
+	    for (i=optind; i < argc; ++i) {
+
+		/* open the file */
+		fd = open(argv[i], O_RDONLY);
+		if (fd < 0) {
+		    fprintf(stderr, "%s: unable to open file: %s\n",
+			    program, argv[i]);
+		    exit(4);
+		}
+
+		/*  hash the file */
+		while ((readcnt = read(fd, buf, BUF_SIZE)) > 0) {
+		    switch (hash_type) {
+		    case FNV0_64:
+		    case FNV1_64:
+			hval = fnv_64_buf(buf, readcnt, hval);
+			break;
+		    case FNV1a_64:
+			hval = fnv_64a_buf(buf, readcnt, hval);
+			break;
+		    default:
+			unknown_hash_type(program, hash_type, 11);/* exit(11) */
+			/*NOTREACHED*/
+		    }
+		}
+
+		/* finish processing the file */
+		if (m_flag) {
+		    print_fnv64(hval, bmask, v_flag, argv[i]);
+		}
+		close(fd);
+	    }
+	}
+    }
+
+    /*
+     * report hash and exit
+     */
+    if (!m_flag) {
+	print_fnv64(hval, bmask, v_flag, "");
+    }
+    return 0;	/* exit(0); */
+}
diff --git a/lib/fnv/hash_32.c b/lib/fnv/hash_32.c
new file mode 100644
index 0000000000..077170ff6d
--- /dev/null
+++ b/lib/fnv/hash_32.c
@@ -0,0 +1,156 @@
+/*
+ * hash_32 - 32 bit Fowler/Noll/Vo hash code
+ *
+ * @(#) $Revision: 5.1 $
+ * @(#) $Id: hash_32.c,v 5.1 2009/06/30 09:13:32 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/hash_32.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ ***
+ *
+ * NOTE: The FNV-0 historic hash is not recommended.  One should use
+ *	 the FNV-1 hash instead.
+ *
+ * To use the 32 bit FNV-0 historic hash, pass FNV0_32_INIT as the
+ * Fnv32_t hashval argument to fnv_32_buf() or fnv_32_str().
+ *
+ * To use the recommended 32 bit FNV-1 hash, pass FNV1_32_INIT as the
+ * Fnv32_t hashval argument to fnv_32_buf() or fnv_32_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#include <stdlib.h>
+#include "fnv.h"
+
+
+/*
+ * 32 bit magic FNV-0 and FNV-1 prime
+ */
+#define FNV_32_PRIME ((Fnv32_t)0x01000193)
+
+
+/*
+ * fnv_32_buf - perform a 32 bit Fowler/Noll/Vo hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	len	- length of buffer in octets
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	32 bit hash as a static hash type
+ *
+ * NOTE: To use the 32 bit FNV-0 historic hash, use FNV0_32_INIT as the hval
+ *	 argument on the first call to either fnv_32_buf() or fnv_32_str().
+ *
+ * NOTE: To use the recommended 32 bit FNV-1 hash, use FNV1_32_INIT as the hval
+ *	 argument on the first call to either fnv_32_buf() or fnv_32_str().
+ */
+Fnv32_t
+fnv_32_buf(void *buf, size_t len, Fnv32_t hval)
+{
+    unsigned char *bp = (unsigned char *)buf;	/* start of buffer */
+    unsigned char *be = bp + len;		/* beyond end of buffer */
+
+    /*
+     * FNV-1 hash each octet in the buffer
+     */
+    while (bp < be) {
+
+	/* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_32_PRIME;
+#else
+	hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv32_t)*bp++;
+    }
+
+    /* return our new hash value */
+    return hval;
+}
+
+
+/*
+ * fnv_32_str - perform a 32 bit Fowler/Noll/Vo hash on a string
+ *
+ * input:
+ *	str	- string to hash
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	32 bit hash as a static hash type
+ *
+ * NOTE: To use the 32 bit FNV-0 historic hash, use FNV0_32_INIT as the hval
+ *	 argument on the first call to either fnv_32_buf() or fnv_32_str().
+ *
+ * NOTE: To use the recommended 32 bit FNV-1 hash, use FNV1_32_INIT as the hval
+ *	 argument on the first call to either fnv_32_buf() or fnv_32_str().
+ */
+Fnv32_t
+fnv_32_str(char *str, Fnv32_t hval)
+{
+    unsigned char *s = (unsigned char *)str;	/* unsigned string */
+
+    /*
+     * FNV-1 hash each octet in the buffer
+     */
+    while (*s) {
+
+	/* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_32_PRIME;
+#else
+	hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv32_t)*s++;
+    }
+
+    /* return our new hash value */
+    return hval;
+}
diff --git a/lib/fnv/hash_32a.c b/lib/fnv/hash_32a.c
new file mode 100644
index 0000000000..8b10acf3e2
--- /dev/null
+++ b/lib/fnv/hash_32a.c
@@ -0,0 +1,144 @@
+/*
+ * hash_32 - 32 bit Fowler/Noll/Vo FNV-1a hash code
+ *
+ * @(#) $Revision: 5.1 $
+ * @(#) $Id: hash_32a.c,v 5.1 2009/06/30 09:13:32 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/hash_32a.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ ***
+ *
+ * To use the recommended 32 bit FNV-1a hash, pass FNV1_32A_INIT as the
+ * Fnv32_t hashval argument to fnv_32a_buf() or fnv_32a_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#include <stdlib.h>
+#include "fnv.h"
+
+
+/*
+ * 32 bit magic FNV-1a prime
+ */
+#define FNV_32_PRIME ((Fnv32_t)0x01000193)
+
+
+/*
+ * fnv_32a_buf - perform a 32 bit Fowler/Noll/Vo FNV-1a hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	len	- length of buffer in octets
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	32 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 32 bit FNV-1a hash, use FNV1_32A_INIT as the
+ * 	 hval arg on the first call to either fnv_32a_buf() or fnv_32a_str().
+ */
+Fnv32_t
+fnv_32a_buf(void *buf, size_t len, Fnv32_t hval)
+{
+    unsigned char *bp = (unsigned char *)buf;	/* start of buffer */
+    unsigned char *be = bp + len;		/* beyond end of buffer */
+
+    /*
+     * FNV-1a hash each octet in the buffer
+     */
+    while (bp < be) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv32_t)*bp++;
+
+	/* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_32_PRIME;
+#else
+	hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+    }
+
+    /* return our new hash value */
+    return hval;
+}
+
+
+/*
+ * fnv_32a_str - perform a 32 bit Fowler/Noll/Vo FNV-1a hash on a string
+ *
+ * input:
+ *	str	- string to hash
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	32 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 32 bit FNV-1a hash, use FNV1_32A_INIT as the
+ *  	 hval arg on the first call to either fnv_32a_buf() or fnv_32a_str().
+ */
+Fnv32_t
+fnv_32a_str(char *str, Fnv32_t hval)
+{
+    unsigned char *s = (unsigned char *)str;	/* unsigned string */
+
+    /*
+     * FNV-1a hash each octet in the buffer
+     */
+    while (*s) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv32_t)*s++;
+
+	/* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_32_PRIME;
+#else
+	hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+    }
+
+    /* return our new hash value */
+    return hval;
+}
diff --git a/lib/fnv/hash_64.c b/lib/fnv/hash_64.c
new file mode 100644
index 0000000000..4338605dca
--- /dev/null
+++ b/lib/fnv/hash_64.c
@@ -0,0 +1,312 @@
+/*
+ * hash_64 - 64 bit Fowler/Noll/Vo-0 hash code
+ *
+ * @(#) $Revision: 5.1 $
+ * @(#) $Id: hash_64.c,v 5.1 2009/06/30 09:01:38 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/hash_64.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * NOTE: The FNV-0 historic hash is not recommended.  One should use
+ *	 the FNV-1 hash instead.
+ *
+ * To use the 64 bit FNV-0 historic hash, pass FNV0_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64_buf() or fnv_64_str().
+ *
+ * To use the recommended 64 bit FNV-1 hash, pass FNV1_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64_buf() or fnv_64_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#include <stdlib.h>
+#include "fnv.h"
+
+
+/*
+ * FNV-0 defines the initial basis to be zero
+ */
+#if !defined(HAVE_64BIT_LONG_LONG)
+const Fnv64_t fnv0_64_init = { 0UL, 0UL };
+#endif /* ! HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * FNV-1 defines the initial basis to be non-zero
+ */
+#if !defined(HAVE_64BIT_LONG_LONG)
+const Fnv64_t fnv1_64_init = { 0x84222325UL, 0xcbf29ce4UL };
+#endif /* ! HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * 64 bit magic FNV-0 and FNV-1 prime
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+#define FNV_64_PRIME ((Fnv64_t)0x100000001b3ULL)
+#else /* HAVE_64BIT_LONG_LONG */
+#define FNV_64_PRIME_LOW ((unsigned long)0x1b3)	/* lower bits of FNV prime */
+#define FNV_64_PRIME_SHIFT (8)		/* top FNV prime shift above 2^32 */
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * fnv_64_buf - perform a 64 bit Fowler/Noll/Vo hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	len	- length of buffer in octets
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	64 bit hash as a static hash type
+ *
+ * NOTE: To use the 64 bit FNV-0 historic hash, use FNV0_64_INIT as the hval
+ *	 argument on the first call to either fnv_64_buf() or fnv_64_str().
+ *
+ * NOTE: To use the recommended 64 bit FNV-1 hash, use FNV1_64_INIT as the hval
+ *	 argument on the first call to either fnv_64_buf() or fnv_64_str().
+ */
+Fnv64_t
+fnv_64_buf(void *buf, size_t len, Fnv64_t hval)
+{
+    unsigned char *bp = (unsigned char *)buf;	/* start of buffer */
+    unsigned char *be = bp + len;		/* beyond end of buffer */
+
+#if defined(HAVE_64BIT_LONG_LONG)
+
+    /*
+     * FNV-1 hash each octet of the buffer
+     */
+    while (bp < be) {
+
+	/* multiply by the 64 bit FNV magic prime mod 2^64 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_64_PRIME;
+#else /* NO_FNV_GCC_OPTIMIZATION */
+	hval += (hval << 1) + (hval << 4) + (hval << 5) +
+		(hval << 7) + (hval << 8) + (hval << 40);
+#endif /* NO_FNV_GCC_OPTIMIZATION */
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv64_t)*bp++;
+    }
+
+#else /* HAVE_64BIT_LONG_LONG */
+
+    unsigned long val[4];			/* hash value in base 2^16 */
+    unsigned long tmp[4];			/* tmp 64 bit value */
+
+    /*
+     * Convert Fnv64_t hval into a base 2^16 array
+     */
+    val[0] = hval.w32[0];
+    val[1] = (val[0] >> 16);
+    val[0] &= 0xffff;
+    val[2] = hval.w32[1];
+    val[3] = (val[2] >> 16);
+    val[2] &= 0xffff;
+
+    /*
+     * FNV-1 hash each octet of the buffer
+     */
+    while (bp < be) {
+
+	/*
+	 * multiply by the 64 bit FNV magic prime mod 2^64
+	 *
+	 * Using 0x100000001b3 we have the following digits base 2^16:
+	 *
+	 *	0x0	0x100	0x0	0x1b3
+	 *
+	 * which is the same as:
+	 *
+	 *	0x0	1<<FNV_64_PRIME_SHIFT	0x0	FNV_64_PRIME_LOW
+	 */
+	/* multiply by the lowest order digit base 2^16 */
+	tmp[0] = val[0] * FNV_64_PRIME_LOW;
+	tmp[1] = val[1] * FNV_64_PRIME_LOW;
+	tmp[2] = val[2] * FNV_64_PRIME_LOW;
+	tmp[3] = val[3] * FNV_64_PRIME_LOW;
+	/* multiply by the other non-zero digit */
+	tmp[2] += val[0] << FNV_64_PRIME_SHIFT;	/* tmp[2] += val[0] * 0x100 */
+	tmp[3] += val[1] << FNV_64_PRIME_SHIFT;	/* tmp[3] += val[1] * 0x100 */
+	/* propagate carries */
+	tmp[1] += (tmp[0] >> 16);
+	val[0] = tmp[0] & 0xffff;
+	tmp[2] += (tmp[1] >> 16);
+	val[1] = tmp[1] & 0xffff;
+	val[3] = tmp[3] + (tmp[2] >> 16);
+	val[2] = tmp[2] & 0xffff;
+	/*
+	 * Doing a val[3] &= 0xffff; is not really needed since it simply
+	 * removes multiples of 2^64.  We can discard these excess bits
+	 * outside of the loop when we convert to Fnv64_t.
+	 */
+
+	/* xor the bottom with the current octet */
+	val[0] ^= (unsigned long)*bp++;
+    }
+
+    /*
+     * Convert base 2^16 array back into an Fnv64_t
+     */
+    hval.w32[1] = ((val[3]<<16) | val[2]);
+    hval.w32[0] = ((val[1]<<16) | val[0]);
+
+#endif /* HAVE_64BIT_LONG_LONG */
+
+    /* return our new hash value */
+    return hval;
+}
+
+
+/*
+ * fnv_64_str - perform a 64 bit Fowler/Noll/Vo hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	64 bit hash as a static hash type
+ *
+ * NOTE: To use the 64 bit FNV-0 historic hash, use FNV0_64_INIT as the hval
+ *	 argument on the first call to either fnv_64_buf() or fnv_64_str().
+ *
+ * NOTE: To use the recommended 64 bit FNV-1 hash, use FNV1_64_INIT as the hval
+ *	 argument on the first call to either fnv_64_buf() or fnv_64_str().
+ */
+Fnv64_t
+fnv_64_str(char *str, Fnv64_t hval)
+{
+    unsigned char *s = (unsigned char *)str;	/* unsigned string */
+
+#if defined(HAVE_64BIT_LONG_LONG)
+
+    /*
+     * FNV-1 hash each octet of the string
+     */
+    while (*s) {
+
+	/* multiply by the 64 bit FNV magic prime mod 2^64 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_64_PRIME;
+#else /* NO_FNV_GCC_OPTIMIZATION */
+	hval += (hval << 1) + (hval << 4) + (hval << 5) +
+		(hval << 7) + (hval << 8) + (hval << 40);
+#endif /* NO_FNV_GCC_OPTIMIZATION */
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv64_t)*s++;
+    }
+
+#else /* !HAVE_64BIT_LONG_LONG */
+
+    unsigned long val[4];	/* hash value in base 2^16 */
+    unsigned long tmp[4];	/* tmp 64 bit value */
+
+    /*
+     * Convert Fnv64_t hval into a base 2^16 array
+     */
+    val[0] = hval.w32[0];
+    val[1] = (val[0] >> 16);
+    val[0] &= 0xffff;
+    val[2] = hval.w32[1];
+    val[3] = (val[2] >> 16);
+    val[2] &= 0xffff;
+
+    /*
+     * FNV-1 hash each octet of the string
+     */
+    while (*s) {
+
+	/*
+	 * multiply by the 64 bit FNV magic prime mod 2^64
+	 *
+	 * Using 1099511628211, we have the following digits base 2^16:
+	 *
+	 *	0x0	0x100	0x0	0x1b3
+	 *
+	 * which is the same as:
+	 *
+	 *	0x0	1<<FNV_64_PRIME_SHIFT	0x0	FNV_64_PRIME_LOW
+	 */
+	/* multiply by the lowest order digit base 2^16 */
+	tmp[0] = val[0] * FNV_64_PRIME_LOW;
+	tmp[1] = val[1] * FNV_64_PRIME_LOW;
+	tmp[2] = val[2] * FNV_64_PRIME_LOW;
+	tmp[3] = val[3] * FNV_64_PRIME_LOW;
+	/* multiply by the other non-zero digit */
+	tmp[2] += val[0] << FNV_64_PRIME_SHIFT;	/* tmp[2] += val[0] * 0x100 */
+	tmp[3] += val[1] << FNV_64_PRIME_SHIFT;	/* tmp[3] += val[1] * 0x100 */
+	/* propagate carries */
+	tmp[1] += (tmp[0] >> 16);
+	val[0] = tmp[0] & 0xffff;
+	tmp[2] += (tmp[1] >> 16);
+	val[1] = tmp[1] & 0xffff;
+	val[3] = tmp[3] + (tmp[2] >> 16);
+	val[2] = tmp[2] & 0xffff;
+	/*
+	 * Doing a val[3] &= 0xffff; is not really needed since it simply
+	 * removes multiples of 2^64.  We can discard these excess bits
+	 * outside of the loop when we convert to Fnv64_t.
+	 */
+
+	/* xor the bottom with the current octet */
+	val[0] ^= (unsigned long)(*s++);
+    }
+
+    /*
+     * Convert base 2^16 array back into an Fnv64_t
+     */
+    hval.w32[1] = ((val[3]<<16) | val[2]);
+    hval.w32[0] = ((val[1]<<16) | val[0]);
+
+#endif /* !HAVE_64BIT_LONG_LONG */
+
+    /* return our new hash value */
+    return hval;
+}
diff --git a/lib/fnv/hash_64a.c b/lib/fnv/hash_64a.c
new file mode 100644
index 0000000000..6660f92ddf
--- /dev/null
+++ b/lib/fnv/hash_64a.c
@@ -0,0 +1,291 @@
+/*
+ * hash_64 - 64 bit Fowler/Noll/Vo-0 FNV-1a hash code
+ *
+ * @(#) $Revision: 5.1 $
+ * @(#) $Id: hash_64a.c,v 5.1 2009/06/30 09:01:38 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/hash_64a.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * To use the recommended 64 bit FNV-1a hash, pass FNV1A_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64a_buf() or fnv_64a_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#include <stdlib.h>
+#include "fnv.h"
+
+
+/*
+ * FNV-1a defines the initial basis to be non-zero
+ */
+#if !defined(HAVE_64BIT_LONG_LONG)
+const Fnv64_t fnv1a_64_init = { 0x84222325, 0xcbf29ce4 };
+#endif /* ! HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * 64 bit magic FNV-1a prime
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+#define FNV_64_PRIME ((Fnv64_t)0x100000001b3ULL)
+#else /* HAVE_64BIT_LONG_LONG */
+#define FNV_64_PRIME_LOW ((unsigned long)0x1b3)	/* lower bits of FNV prime */
+#define FNV_64_PRIME_SHIFT (8)		/* top FNV prime shift above 2^32 */
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * fnv_64a_buf - perform a 64 bit Fowler/Noll/Vo FNV-1a hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	len	- length of buffer in octets
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	64 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 64 bit FNV-1a hash, use FNV1A_64_INIT as the
+ * 	 hval arg on the first call to either fnv_64a_buf() or fnv_64a_str().
+ */
+Fnv64_t
+fnv_64a_buf(void *buf, size_t len, Fnv64_t hval)
+{
+    unsigned char *bp = (unsigned char *)buf;	/* start of buffer */
+    unsigned char *be = bp + len;		/* beyond end of buffer */
+
+#if defined(HAVE_64BIT_LONG_LONG)
+    /*
+     * FNV-1a hash each octet of the buffer
+     */
+    while (bp < be) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv64_t)*bp++;
+
+	/* multiply by the 64 bit FNV magic prime mod 2^64 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_64_PRIME;
+#else /* NO_FNV_GCC_OPTIMIZATION */
+	hval += (hval << 1) + (hval << 4) + (hval << 5) +
+		(hval << 7) + (hval << 8) + (hval << 40);
+#endif /* NO_FNV_GCC_OPTIMIZATION */
+    }
+
+#else /* HAVE_64BIT_LONG_LONG */
+
+    unsigned long val[4];			/* hash value in base 2^16 */
+    unsigned long tmp[4];			/* tmp 64 bit value */
+
+    /*
+     * Convert Fnv64_t hval into a base 2^16 array
+     */
+    val[0] = hval.w32[0];
+    val[1] = (val[0] >> 16);
+    val[0] &= 0xffff;
+    val[2] = hval.w32[1];
+    val[3] = (val[2] >> 16);
+    val[2] &= 0xffff;
+
+    /*
+     * FNV-1a hash each octet of the buffer
+     */
+    while (bp < be) {
+
+	/* xor the bottom with the current octet */
+	val[0] ^= (unsigned long)*bp++;
+
+	/*
+	 * multiply by the 64 bit FNV magic prime mod 2^64
+	 *
+	 * Using 0x100000001b3 we have the following digits base 2^16:
+	 *
+	 *	0x0	0x100	0x0	0x1b3
+	 *
+	 * which is the same as:
+	 *
+	 *	0x0	1<<FNV_64_PRIME_SHIFT	0x0	FNV_64_PRIME_LOW
+	 */
+	/* multiply by the lowest order digit base 2^16 */
+	tmp[0] = val[0] * FNV_64_PRIME_LOW;
+	tmp[1] = val[1] * FNV_64_PRIME_LOW;
+	tmp[2] = val[2] * FNV_64_PRIME_LOW;
+	tmp[3] = val[3] * FNV_64_PRIME_LOW;
+	/* multiply by the other non-zero digit */
+	tmp[2] += val[0] << FNV_64_PRIME_SHIFT;	/* tmp[2] += val[0] * 0x100 */
+	tmp[3] += val[1] << FNV_64_PRIME_SHIFT;	/* tmp[3] += val[1] * 0x100 */
+	/* propagate carries */
+	tmp[1] += (tmp[0] >> 16);
+	val[0] = tmp[0] & 0xffff;
+	tmp[2] += (tmp[1] >> 16);
+	val[1] = tmp[1] & 0xffff;
+	val[3] = tmp[3] + (tmp[2] >> 16);
+	val[2] = tmp[2] & 0xffff;
+	/*
+	 * Doing a val[3] &= 0xffff; is not really needed since it simply
+	 * removes multiples of 2^64.  We can discard these excess bits
+	 * outside of the loop when we convert to Fnv64_t.
+	 */
+    }
+
+    /*
+     * Convert base 2^16 array back into an Fnv64_t
+     */
+    hval.w32[1] = ((val[3]<<16) | val[2]);
+    hval.w32[0] = ((val[1]<<16) | val[0]);
+
+#endif /* HAVE_64BIT_LONG_LONG */
+
+    /* return our new hash value */
+    return hval;
+}
+
+
+/*
+ * fnv_64a_str - perform a 64 bit Fowler/Noll/Vo FNV-1a hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	64 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 64 bit FNV-1a hash, use FNV1A_64_INIT as the
+ * 	 hval arg on the first call to either fnv_64a_buf() or fnv_64a_str().
+ */
+Fnv64_t
+fnv_64a_str(char *str, Fnv64_t hval)
+{
+    unsigned char *s = (unsigned char *)str;	/* unsigned string */
+
+#if defined(HAVE_64BIT_LONG_LONG)
+
+    /*
+     * FNV-1a hash each octet of the string
+     */
+    while (*s) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv64_t)*s++;
+
+	/* multiply by the 64 bit FNV magic prime mod 2^64 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_64_PRIME;
+#else /* NO_FNV_GCC_OPTIMIZATION */
+	hval += (hval << 1) + (hval << 4) + (hval << 5) +
+		(hval << 7) + (hval << 8) + (hval << 40);
+#endif /* NO_FNV_GCC_OPTIMIZATION */
+    }
+
+#else /* !HAVE_64BIT_LONG_LONG */
+
+    unsigned long val[4];	/* hash value in base 2^16 */
+    unsigned long tmp[4];	/* tmp 64 bit value */
+
+    /*
+     * Convert Fnv64_t hval into a base 2^16 array
+     */
+    val[0] = hval.w32[0];
+    val[1] = (val[0] >> 16);
+    val[0] &= 0xffff;
+    val[2] = hval.w32[1];
+    val[3] = (val[2] >> 16);
+    val[2] &= 0xffff;
+
+    /*
+     * FNV-1a hash each octet of the string
+     */
+    while (*s) {
+
+	/* xor the bottom with the current octet */
+
+	/*
+	 * multiply by the 64 bit FNV magic prime mod 2^64
+	 *
+	 * Using 1099511628211, we have the following digits base 2^16:
+	 *
+	 *	0x0	0x100	0x0	0x1b3
+	 *
+	 * which is the same as:
+	 *
+	 *	0x0	1<<FNV_64_PRIME_SHIFT	0x0	FNV_64_PRIME_LOW
+	 */
+	/* multiply by the lowest order digit base 2^16 */
+	tmp[0] = val[0] * FNV_64_PRIME_LOW;
+	tmp[1] = val[1] * FNV_64_PRIME_LOW;
+	tmp[2] = val[2] * FNV_64_PRIME_LOW;
+	tmp[3] = val[3] * FNV_64_PRIME_LOW;
+	/* multiply by the other non-zero digit */
+	tmp[2] += val[0] << FNV_64_PRIME_SHIFT;	/* tmp[2] += val[0] * 0x100 */
+	tmp[3] += val[1] << FNV_64_PRIME_SHIFT;	/* tmp[3] += val[1] * 0x100 */
+	/* propagate carries */
+	tmp[1] += (tmp[0] >> 16);
+	val[0] = tmp[0] & 0xffff;
+	tmp[2] += (tmp[1] >> 16);
+	val[1] = tmp[1] & 0xffff;
+	val[3] = tmp[3] + (tmp[2] >> 16);
+	val[2] = tmp[2] & 0xffff;
+	/*
+	 * Doing a val[3] &= 0xffff; is not really needed since it simply
+	 * removes multiples of 2^64.  We can discard these excess bits
+	 * outside of the loop when we convert to Fnv64_t.
+	 */
+	val[0] ^= (unsigned long)(*s++);
+    }
+
+    /*
+     * Convert base 2^16 array back into an Fnv64_t
+     */
+    hval.w32[1] = ((val[3]<<16) | val[2]);
+    hval.w32[0] = ((val[1]<<16) | val[0]);
+
+#endif /* !HAVE_64BIT_LONG_LONG */
+
+    /* return our new hash value */
+    return hval;
+}
diff --git a/lib/fnv/have_ulong64.c b/lib/fnv/have_ulong64.c
new file mode 100644
index 0000000000..5c06262388
--- /dev/null
+++ b/lib/fnv/have_ulong64.c
@@ -0,0 +1,58 @@
+/*
+ * have_ulong64 - Determine if we have a 64 bit unsigned long long
+ *
+ * usage:
+ *	have_ulong64 > longlong.h
+ *
+ * Not all systems have a 'long long type' so this may not compile on
+ * your system.
+ *
+ * This prog outputs the define:
+ *
+ *	HAVE_64BIT_LONG_LONG
+ *		defined ==> we have a 64 bit unsigned long long
+ *		undefined ==> we must simulate a 64 bit unsigned long long
+ */
+/*
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+/*
+ * have the compiler try its hand with unsigned and signed long longs
+ */
+#if ! defined(NO64BIT_LONG_LONG)
+unsigned long long val = 1099511628211ULL;
+#endif /* NO64BIT_LONG_LONG */
+
+int
+main(void)
+{
+	/*
+	 * ensure that the length of long long val is what we expect
+	 */
+#if defined(NO64BIT_LONG_LONG)
+	printf("#undef HAVE_64BIT_LONG_LONG\t/* no */\n");
+#else /* NO64BIT_LONG_LONG */
+	if (val == 1099511628211ULL && sizeof(val) == 8) {
+		printf("#define HAVE_64BIT_LONG_LONG\t/* yes */\n");
+	}
+#endif /* NO64BIT_LONG_LONG */
+
+	/* exit(0); */
+	return 0;
+}
diff --git a/lib/fnv/longlong.h b/lib/fnv/longlong.h
new file mode 100644
index 0000000000..c8cfe48f29
--- /dev/null
+++ b/lib/fnv/longlong.h
@@ -0,0 +1,18 @@
+/*
+ * DO NOT EDIT -- generated by the Makefile
+ */
+
+#if !defined(__LONGLONG_H__)
+#define __LONGLONG_H__
+
+/* do we have/want to use a long long type? */
+#define HAVE_64BIT_LONG_LONG	/* yes */
+
+/*
+ * NO64BIT_LONG_LONG undef HAVE_64BIT_LONG_LONG
+ */
+#if defined(NO64BIT_LONG_LONG)
+#undef HAVE_64BIT_LONG_LONG
+#endif /* NO64BIT_LONG_LONG */
+
+#endif /* !__LONGLONG_H__ */
diff --git a/lib/fnv/qmk_fnv_type_validation.c b/lib/fnv/qmk_fnv_type_validation.c
new file mode 100644
index 0000000000..e8576617ba
--- /dev/null
+++ b/lib/fnv/qmk_fnv_type_validation.c
@@ -0,0 +1,14 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "fnv.h"
+
+// This library was originally sourced from:
+//     http://www.isthe.com/chongo/tech/comp/fnv/index.html
+//
+// Version at the time of retrieval on 2022-06-26: v5.0.3
+
+_Static_assert(sizeof(long long) == 8, "long long should be 64 bits");
+_Static_assert(sizeof(unsigned long long) == 8, "unsigned long long should be 64 bits");
+
+_Static_assert(sizeof(Fnv32_t) == 4, "Fnv32_t should be 32 bits");
+_Static_assert(sizeof(Fnv64_t) == 8, "Fnv64_t should be 64 bits");
diff --git a/lib/fnv/test_fnv.c b/lib/fnv/test_fnv.c
new file mode 100644
index 0000000000..efec3dec1d
--- /dev/null
+++ b/lib/fnv/test_fnv.c
@@ -0,0 +1,2237 @@
+/*
+ * test_fnv - FNV test suite
+ *
+ * @(#) $Revision: 5.3 $
+ * @(#) $Id: test_fnv.c,v 5.3 2009/06/30 11:50:41 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/test_fnv.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#include <stdio.h>
+#include "longlong.h"
+#include "fnv.h"
+
+#define LEN(x) (sizeof(x)-1)
+/* TEST macro does not include trailing NUL byte in the test vector */
+#define TEST(x) {x, LEN(x)}
+/* TEST0 macro includes the trailing NUL byte in the test vector */
+#define TEST0(x) {x, sizeof(x)}
+/* REPEAT500 - repeat a string 500 times */
+#define R500(x) R100(x)R100(x)R100(x)R100(x)R100(x)
+#define R100(x) R10(x)R10(x)R10(x)R10(x)R10(x)R10(x)R10(x)R10(x)R10(x)R10(x)
+#define R10(x) x x x x x x x x x x
+
+/*
+ * FNV test vectors
+ *
+ * NOTE: A NULL pointer marks beyond the end of the test vectors.
+ *
+ * NOTE: The order of the fnv_test_str[] test vectors is 1-to-1 with:
+ *
+ *	struct fnv0_32_test_vector fnv0_32_vector[];
+ *	struct fnv1_32_test_vector fnv1_32_vector[];
+ *	struct fnv1a_32_test_vector fnv1a_32_vector[];
+ *	struct fnv0_64_test_vector fnv0_64_vector[];
+ *	struct fnv1_64_test_vector fnv1_64_vector[];
+ *	struct fnv1a_64_test_vector fnv1a_64_vector[];
+ *
+ * IMPORTANT NOTE:
+ *
+ *	If you change the fnv_test_str[] array, you need
+ *	to also change ALL of the above fnv*_vector arrays!!!
+ *
+ *	To rebuild, try:
+ *
+ *		make vector.c
+ *
+ *	and then fold the results into the source file.
+ *	Of course, you better make sure that the vaules
+ *	produced by the above command are valid, otherwise
+ * 	you will be testing against invalid vectors!
+ */
+struct test_vector fnv_test_str[] = {
+  TEST(""),
+  TEST("a"),
+  TEST("b"),
+  TEST("c"),
+  TEST("d"),
+  TEST("e"),
+  TEST("f"),
+  TEST("fo"),
+  TEST("foo"),
+  TEST("foob"),
+  TEST("fooba"),
+  TEST("foobar"),
+  TEST0(""),
+  TEST0("a"),
+  TEST0("b"),
+  TEST0("c"),
+  TEST0("d"),
+  TEST0("e"),
+  TEST0("f"),
+  TEST0("fo"),
+  TEST0("foo"),
+  TEST0("foob"),
+  TEST0("fooba"),
+  TEST0("foobar"),
+  TEST("ch"),
+  TEST("cho"),
+  TEST("chon"),
+  TEST("chong"),
+  TEST("chongo"),
+  TEST("chongo "),
+  TEST("chongo w"),
+  TEST("chongo wa"),
+  TEST("chongo was"),
+  TEST("chongo was "),
+  TEST("chongo was h"),
+  TEST("chongo was he"),
+  TEST("chongo was her"),
+  TEST("chongo was here"),
+  TEST("chongo was here!"),
+  TEST("chongo was here!\n"),
+  TEST0("ch"),
+  TEST0("cho"),
+  TEST0("chon"),
+  TEST0("chong"),
+  TEST0("chongo"),
+  TEST0("chongo "),
+  TEST0("chongo w"),
+  TEST0("chongo wa"),
+  TEST0("chongo was"),
+  TEST0("chongo was "),
+  TEST0("chongo was h"),
+  TEST0("chongo was he"),
+  TEST0("chongo was her"),
+  TEST0("chongo was here"),
+  TEST0("chongo was here!"),
+  TEST0("chongo was here!\n"),
+  TEST("cu"),
+  TEST("cur"),
+  TEST("curd"),
+  TEST("curds"),
+  TEST("curds "),
+  TEST("curds a"),
+  TEST("curds an"),
+  TEST("curds and"),
+  TEST("curds and "),
+  TEST("curds and w"),
+  TEST("curds and wh"),
+  TEST("curds and whe"),
+  TEST("curds and whey"),
+  TEST("curds and whey\n"),
+  TEST0("cu"),
+  TEST0("cur"),
+  TEST0("curd"),
+  TEST0("curds"),
+  TEST0("curds "),
+  TEST0("curds a"),
+  TEST0("curds an"),
+  TEST0("curds and"),
+  TEST0("curds and "),
+  TEST0("curds and w"),
+  TEST0("curds and wh"),
+  TEST0("curds and whe"),
+  TEST0("curds and whey"),
+  TEST0("curds and whey\n"),
+  TEST("hi"), TEST0("hi"),
+  TEST("hello"), TEST0("hello"),
+  TEST("\xff\x00\x00\x01"), TEST("\x01\x00\x00\xff"),
+  TEST("\xff\x00\x00\x02"), TEST("\x02\x00\x00\xff"),
+  TEST("\xff\x00\x00\x03"), TEST("\x03\x00\x00\xff"),
+  TEST("\xff\x00\x00\x04"), TEST("\x04\x00\x00\xff"),
+  TEST("\x40\x51\x4e\x44"), TEST("\x44\x4e\x51\x40"),
+  TEST("\x40\x51\x4e\x4a"), TEST("\x4a\x4e\x51\x40"),
+  TEST("\x40\x51\x4e\x54"), TEST("\x54\x4e\x51\x40"),
+  TEST("127.0.0.1"), TEST0("127.0.0.1"),
+  TEST("127.0.0.2"), TEST0("127.0.0.2"),
+  TEST("127.0.0.3"), TEST0("127.0.0.3"),
+  TEST("64.81.78.68"), TEST0("64.81.78.68"),
+  TEST("64.81.78.74"), TEST0("64.81.78.74"),
+  TEST("64.81.78.84"), TEST0("64.81.78.84"),
+  TEST("feedface"), TEST0("feedface"),
+  TEST("feedfacedaffdeed"), TEST0("feedfacedaffdeed"),
+  TEST("feedfacedeadbeef"), TEST0("feedfacedeadbeef"),
+  TEST("line 1\nline 2\nline 3"),
+  TEST("chongo <Landon Curt Noll> /\\../\\"),
+  TEST0("chongo <Landon Curt Noll> /\\../\\"),
+  TEST("chongo (Landon Curt Noll) /\\../\\"),
+  TEST0("chongo (Landon Curt Noll) /\\../\\"),
+  TEST("http://antwrp.gsfc.nasa.gov/apod/astropix.html"),
+  TEST("http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash"),
+  TEST("http://epod.usra.edu/"),
+  TEST("http://exoplanet.eu/"),
+  TEST("http://hvo.wr.usgs.gov/cam3/"),
+  TEST("http://hvo.wr.usgs.gov/cams/HMcam/"),
+  TEST("http://hvo.wr.usgs.gov/kilauea/update/deformation.html"),
+  TEST("http://hvo.wr.usgs.gov/kilauea/update/images.html"),
+  TEST("http://hvo.wr.usgs.gov/kilauea/update/maps.html"),
+  TEST("http://hvo.wr.usgs.gov/volcanowatch/current_issue.html"),
+  TEST("http://neo.jpl.nasa.gov/risk/"),
+  TEST("http://norvig.com/21-days.html"),
+  TEST("http://primes.utm.edu/curios/home.php"),
+  TEST("http://slashdot.org/"),
+  TEST("http://tux.wr.usgs.gov/Maps/155.25-19.5.html"),
+  TEST("http://volcano.wr.usgs.gov/kilaueastatus.php"),
+  TEST("http://www.avo.alaska.edu/activity/Redoubt.php"),
+  TEST("http://www.dilbert.com/fast/"),
+  TEST("http://www.fourmilab.ch/gravitation/orbits/"),
+  TEST("http://www.fpoa.net/"),
+  TEST("http://www.ioccc.org/index.html"),
+  TEST("http://www.isthe.com/cgi-bin/number.cgi"),
+  TEST("http://www.isthe.com/chongo/bio.html"),
+  TEST("http://www.isthe.com/chongo/index.html"),
+  TEST("http://www.isthe.com/chongo/src/calc/lucas-calc"),
+  TEST("http://www.isthe.com/chongo/tech/astro/venus2004.html"),
+  TEST("http://www.isthe.com/chongo/tech/astro/vita.html"),
+  TEST("http://www.isthe.com/chongo/tech/comp/c/expert.html"),
+  TEST("http://www.isthe.com/chongo/tech/comp/calc/index.html"),
+  TEST("http://www.isthe.com/chongo/tech/comp/fnv/index.html"),
+  TEST("http://www.isthe.com/chongo/tech/math/number/howhigh.html"),
+  TEST("http://www.isthe.com/chongo/tech/math/number/number.html"),
+  TEST("http://www.isthe.com/chongo/tech/math/prime/mersenne.html"),
+  TEST("http://www.isthe.com/chongo/tech/math/prime/mersenne.html#largest"),
+  TEST("http://www.lavarnd.org/cgi-bin/corpspeak.cgi"),
+  TEST("http://www.lavarnd.org/cgi-bin/haiku.cgi"),
+  TEST("http://www.lavarnd.org/cgi-bin/rand-none.cgi"),
+  TEST("http://www.lavarnd.org/cgi-bin/randdist.cgi"),
+  TEST("http://www.lavarnd.org/index.html"),
+  TEST("http://www.lavarnd.org/what/nist-test.html"),
+  TEST("http://www.macosxhints.com/"),
+  TEST("http://www.mellis.com/"),
+  TEST("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/havoalert.cfm"),
+  TEST("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/timelines_24.cfm"),
+  TEST("http://www.paulnoll.com/"),
+  TEST("http://www.pepysdiary.com/"),
+  TEST("http://www.sciencenews.org/index/home/activity/view"),
+  TEST("http://www.skyandtelescope.com/"),
+  TEST("http://www.sput.nl/~rob/sirius.html"),
+  TEST("http://www.systemexperts.com/"),
+  TEST("http://www.tq-international.com/phpBB3/index.php"),
+  TEST("http://www.travelquesttours.com/index.htm"),
+  TEST("http://www.wunderground.com/global/stations/89606.html"),
+  TEST(R10("21701")),
+  TEST(R10("M21701")),
+  TEST(R10("2^21701-1")),
+  TEST(R10("\x54\xc5")),
+  TEST(R10("\xc5\x54")),
+  TEST(R10("23209")),
+  TEST(R10("M23209")),
+  TEST(R10("2^23209-1")),
+  TEST(R10("\x5a\xa9")),
+  TEST(R10("\xa9\x5a")),
+  TEST(R10("391581216093")),
+  TEST(R10("391581*2^216093-1")),
+  TEST(R10("\x05\xf9\x9d\x03\x4c\x81")),
+  TEST(R10("FEDCBA9876543210")),
+  TEST(R10("\xfe\xdc\xba\x98\x76\x54\x32\x10")),
+  TEST(R10("EFCDAB8967452301")),
+  TEST(R10("\xef\xcd\xab\x89\x67\x45\x23\x01")),
+  TEST(R10("0123456789ABCDEF")),
+  TEST(R10("\x01\x23\x45\x67\x89\xab\xcd\xef")),
+  TEST(R10("1032547698BADCFE")),
+  TEST(R10("\x10\x32\x54\x76\x98\xba\xdc\xfe")),
+  TEST(R500("\x00")),
+  TEST(R500("\x07")),
+  TEST(R500("~")),
+  TEST(R500("\x7f")),
+  {NULL, 0}	/* MUST BE LAST */
+};
+
+
+/*
+ * insert the contents of vector.c below
+ *
+ *	make vector.c
+ *	:r vector.c
+ */
+/* start of output generated by make vector.c */
+
+/* FNV-0 32 bit test vectors */
+struct fnv0_32_test_vector fnv0_32_vector[] = {
+    { &fnv_test_str[0], (Fnv32_t) 0x00000000UL },
+    { &fnv_test_str[1], (Fnv32_t) 0x00000061UL },
+    { &fnv_test_str[2], (Fnv32_t) 0x00000062UL },
+    { &fnv_test_str[3], (Fnv32_t) 0x00000063UL },
+    { &fnv_test_str[4], (Fnv32_t) 0x00000064UL },
+    { &fnv_test_str[5], (Fnv32_t) 0x00000065UL },
+    { &fnv_test_str[6], (Fnv32_t) 0x00000066UL },
+    { &fnv_test_str[7], (Fnv32_t) 0x6600a0fdUL },
+    { &fnv_test_str[8], (Fnv32_t) 0x8ffd6e28UL },
+    { &fnv_test_str[9], (Fnv32_t) 0xd3f4689aUL },
+    { &fnv_test_str[10], (Fnv32_t) 0x43c0aa0fUL },
+    { &fnv_test_str[11], (Fnv32_t) 0xb74bb5efUL },
+    { &fnv_test_str[12], (Fnv32_t) 0x00000000UL },
+    { &fnv_test_str[13], (Fnv32_t) 0x610098b3UL },
+    { &fnv_test_str[14], (Fnv32_t) 0x62009a46UL },
+    { &fnv_test_str[15], (Fnv32_t) 0x63009bd9UL },
+    { &fnv_test_str[16], (Fnv32_t) 0x64009d6cUL },
+    { &fnv_test_str[17], (Fnv32_t) 0x65009effUL },
+    { &fnv_test_str[18], (Fnv32_t) 0x6600a092UL },
+    { &fnv_test_str[19], (Fnv32_t) 0x8ffd6e47UL },
+    { &fnv_test_str[20], (Fnv32_t) 0xd3f468f8UL },
+    { &fnv_test_str[21], (Fnv32_t) 0x43c0aa6eUL },
+    { &fnv_test_str[22], (Fnv32_t) 0xb74bb59dUL },
+    { &fnv_test_str[23], (Fnv32_t) 0x7b2f673dUL },
+    { &fnv_test_str[24], (Fnv32_t) 0x63009bb1UL },
+    { &fnv_test_str[25], (Fnv32_t) 0x8af517ccUL },
+    { &fnv_test_str[26], (Fnv32_t) 0x8bd4764aUL },
+    { &fnv_test_str[27], (Fnv32_t) 0x69763619UL },
+    { &fnv_test_str[28], (Fnv32_t) 0x1e172934UL },
+    { &fnv_test_str[29], (Fnv32_t) 0x9275dcfcUL },
+    { &fnv_test_str[30], (Fnv32_t) 0x8b8ae0c3UL },
+    { &fnv_test_str[31], (Fnv32_t) 0x6e9fd298UL },
+    { &fnv_test_str[32], (Fnv32_t) 0xbd98853bUL },
+    { &fnv_test_str[33], (Fnv32_t) 0xb219bbc1UL },
+    { &fnv_test_str[34], (Fnv32_t) 0x1f8290bbUL },
+    { &fnv_test_str[35], (Fnv32_t) 0x5589d604UL },
+    { &fnv_test_str[36], (Fnv32_t) 0xabfbe83eUL },
+    { &fnv_test_str[37], (Fnv32_t) 0xfb8e99ffUL },
+    { &fnv_test_str[38], (Fnv32_t) 0x007c6c4cUL },
+    { &fnv_test_str[39], (Fnv32_t) 0x0fde7baeUL },
+    { &fnv_test_str[40], (Fnv32_t) 0x8af517a3UL },
+    { &fnv_test_str[41], (Fnv32_t) 0x8bd47624UL },
+    { &fnv_test_str[42], (Fnv32_t) 0x6976367eUL },
+    { &fnv_test_str[43], (Fnv32_t) 0x1e17295bUL },
+    { &fnv_test_str[44], (Fnv32_t) 0x9275dcdcUL },
+    { &fnv_test_str[45], (Fnv32_t) 0x8b8ae0b4UL },
+    { &fnv_test_str[46], (Fnv32_t) 0x6e9fd2f9UL },
+    { &fnv_test_str[47], (Fnv32_t) 0xbd988548UL },
+    { &fnv_test_str[48], (Fnv32_t) 0xb219bbe1UL },
+    { &fnv_test_str[49], (Fnv32_t) 0x1f8290d3UL },
+    { &fnv_test_str[50], (Fnv32_t) 0x5589d661UL },
+    { &fnv_test_str[51], (Fnv32_t) 0xabfbe84cUL },
+    { &fnv_test_str[52], (Fnv32_t) 0xfb8e999aUL },
+    { &fnv_test_str[53], (Fnv32_t) 0x007c6c6dUL },
+    { &fnv_test_str[54], (Fnv32_t) 0x0fde7ba4UL },
+    { &fnv_test_str[55], (Fnv32_t) 0xa93cb2eaUL },
+    { &fnv_test_str[56], (Fnv32_t) 0x63009bacUL },
+    { &fnv_test_str[57], (Fnv32_t) 0x85f50fb6UL },
+    { &fnv_test_str[58], (Fnv32_t) 0x96c7bbe6UL },
+    { &fnv_test_str[59], (Fnv32_t) 0x426ccb61UL },
+    { &fnv_test_str[60], (Fnv32_t) 0xf2442993UL },
+    { &fnv_test_str[61], (Fnv32_t) 0xf44d7208UL },
+    { &fnv_test_str[62], (Fnv32_t) 0x9dea82f6UL },
+    { &fnv_test_str[63], (Fnv32_t) 0x8e2c2926UL },
+    { &fnv_test_str[64], (Fnv32_t) 0xf584c6f2UL },
+    { &fnv_test_str[65], (Fnv32_t) 0x72052e81UL },
+    { &fnv_test_str[66], (Fnv32_t) 0xff28357bUL },
+    { &fnv_test_str[67], (Fnv32_t) 0x274c30c4UL },
+    { &fnv_test_str[68], (Fnv32_t) 0xa0f0c4f5UL },
+    { &fnv_test_str[69], (Fnv32_t) 0x50060da5UL },
+    { &fnv_test_str[70], (Fnv32_t) 0x85f50fc4UL },
+    { &fnv_test_str[71], (Fnv32_t) 0x96c7bb82UL },
+    { &fnv_test_str[72], (Fnv32_t) 0x426ccb12UL },
+    { &fnv_test_str[73], (Fnv32_t) 0xf24429b3UL },
+    { &fnv_test_str[74], (Fnv32_t) 0xf44d7269UL },
+    { &fnv_test_str[75], (Fnv32_t) 0x9dea8298UL },
+    { &fnv_test_str[76], (Fnv32_t) 0x8e2c2942UL },
+    { &fnv_test_str[77], (Fnv32_t) 0xf584c6d2UL },
+    { &fnv_test_str[78], (Fnv32_t) 0x72052ef6UL },
+    { &fnv_test_str[79], (Fnv32_t) 0xff283513UL },
+    { &fnv_test_str[80], (Fnv32_t) 0x274c30a1UL },
+    { &fnv_test_str[81], (Fnv32_t) 0xa0f0c48cUL },
+    { &fnv_test_str[82], (Fnv32_t) 0x50060dafUL },
+    { &fnv_test_str[83], (Fnv32_t) 0x9e877abfUL },
+    { &fnv_test_str[84], (Fnv32_t) 0x6800a3d1UL },
+    { &fnv_test_str[85], (Fnv32_t) 0x8a01e203UL },
+    { &fnv_test_str[86], (Fnv32_t) 0xec6d6be8UL },
+    { &fnv_test_str[87], (Fnv32_t) 0x1840de38UL },
+    { &fnv_test_str[88], (Fnv32_t) 0xa7cc97b4UL },
+    { &fnv_test_str[89], (Fnv32_t) 0x3ee6b3b4UL },
+    { &fnv_test_str[90], (Fnv32_t) 0xa7cc97b7UL },
+    { &fnv_test_str[91], (Fnv32_t) 0x7dcd6669UL },
+    { &fnv_test_str[92], (Fnv32_t) 0xa7cc97b6UL },
+    { &fnv_test_str[93], (Fnv32_t) 0xbcb4191eUL },
+    { &fnv_test_str[94], (Fnv32_t) 0xa7cc97b1UL },
+    { &fnv_test_str[95], (Fnv32_t) 0xfb9acdd3UL },
+    { &fnv_test_str[96], (Fnv32_t) 0x89380433UL },
+    { &fnv_test_str[97], (Fnv32_t) 0x8acd2855UL },
+    { &fnv_test_str[98], (Fnv32_t) 0x8938043dUL },
+    { &fnv_test_str[99], (Fnv32_t) 0xcaeed493UL },
+    { &fnv_test_str[100], (Fnv32_t) 0x89380423UL },
+    { &fnv_test_str[101], (Fnv32_t) 0x59382a25UL },
+    { &fnv_test_str[102], (Fnv32_t) 0x567f75d7UL },
+    { &fnv_test_str[103], (Fnv32_t) 0x01a68175UL },
+    { &fnv_test_str[104], (Fnv32_t) 0x567f75d4UL },
+    { &fnv_test_str[105], (Fnv32_t) 0xfea67cbcUL },
+    { &fnv_test_str[106], (Fnv32_t) 0x567f75d5UL },
+    { &fnv_test_str[107], (Fnv32_t) 0xffa67e4fUL },
+    { &fnv_test_str[108], (Fnv32_t) 0xd131b668UL },
+    { &fnv_test_str[109], (Fnv32_t) 0xb94225b8UL },
+    { &fnv_test_str[110], (Fnv32_t) 0xd231b7d7UL },
+    { &fnv_test_str[111], (Fnv32_t) 0xbb446775UL },
+    { &fnv_test_str[112], (Fnv32_t) 0xdf31cc6eUL },
+    { &fnv_test_str[113], (Fnv32_t) 0xc964d12aUL },
+    { &fnv_test_str[114], (Fnv32_t) 0x23af8f9fUL },
+    { &fnv_test_str[115], (Fnv32_t) 0xcc5f174dUL },
+    { &fnv_test_str[116], (Fnv32_t) 0x96b29b8cUL },
+    { &fnv_test_str[117], (Fnv32_t) 0xc72add64UL },
+    { &fnv_test_str[118], (Fnv32_t) 0x528fb7efUL },
+    { &fnv_test_str[119], (Fnv32_t) 0xe73e8d3dUL },
+    { &fnv_test_str[120], (Fnv32_t) 0x876386feUL },
+    { &fnv_test_str[121], (Fnv32_t) 0x811c9dc5UL },
+    { &fnv_test_str[122], (Fnv32_t) 0x050c5d1fUL },
+    { &fnv_test_str[123], (Fnv32_t) 0x14bf7238UL },
+    { &fnv_test_str[124], (Fnv32_t) 0xe160ce28UL },
+    { &fnv_test_str[125], (Fnv32_t) 0x89dc5a75UL },
+    { &fnv_test_str[126], (Fnv32_t) 0xd89b69a0UL },
+    { &fnv_test_str[127], (Fnv32_t) 0x94471a88UL },
+    { &fnv_test_str[128], (Fnv32_t) 0xe78db65fUL },
+    { &fnv_test_str[129], (Fnv32_t) 0x0c3009a2UL },
+    { &fnv_test_str[130], (Fnv32_t) 0x122dff03UL },
+    { &fnv_test_str[131], (Fnv32_t) 0xb4cd8875UL },
+    { &fnv_test_str[132], (Fnv32_t) 0xf4dba725UL },
+    { &fnv_test_str[133], (Fnv32_t) 0x41a16560UL },
+    { &fnv_test_str[134], (Fnv32_t) 0x9c0f941fUL },
+    { &fnv_test_str[135], (Fnv32_t) 0x451a5348UL },
+    { &fnv_test_str[136], (Fnv32_t) 0x3f1d1d89UL },
+    { &fnv_test_str[137], (Fnv32_t) 0x1b91b57aUL },
+    { &fnv_test_str[138], (Fnv32_t) 0x3e99b577UL },
+    { &fnv_test_str[139], (Fnv32_t) 0x4c9de07aUL },
+    { &fnv_test_str[140], (Fnv32_t) 0x1ddf7572UL },
+    { &fnv_test_str[141], (Fnv32_t) 0x64e81976UL },
+    { &fnv_test_str[142], (Fnv32_t) 0x1106a888UL },
+    { &fnv_test_str[143], (Fnv32_t) 0xa498d8e5UL },
+    { &fnv_test_str[144], (Fnv32_t) 0x3c03d2e3UL },
+    { &fnv_test_str[145], (Fnv32_t) 0x26568b28UL },
+    { &fnv_test_str[146], (Fnv32_t) 0x70d7fb42UL },
+    { &fnv_test_str[147], (Fnv32_t) 0xd3ae1d22UL },
+    { &fnv_test_str[148], (Fnv32_t) 0xac8ea5f4UL },
+    { &fnv_test_str[149], (Fnv32_t) 0x4d0abd60UL },
+    { &fnv_test_str[150], (Fnv32_t) 0x48f5e086UL },
+    { &fnv_test_str[151], (Fnv32_t) 0xa8f6241bUL },
+    { &fnv_test_str[152], (Fnv32_t) 0x572f864fUL },
+    { &fnv_test_str[153], (Fnv32_t) 0xa5340803UL },
+    { &fnv_test_str[154], (Fnv32_t) 0x22881aa8UL },
+    { &fnv_test_str[155], (Fnv32_t) 0xc2e2f5a2UL },
+    { &fnv_test_str[156], (Fnv32_t) 0xebf5aec7UL },
+    { &fnv_test_str[157], (Fnv32_t) 0x3cdbfb85UL },
+    { &fnv_test_str[158], (Fnv32_t) 0xbb859704UL },
+    { &fnv_test_str[159], (Fnv32_t) 0xc956fe11UL },
+    { &fnv_test_str[160], (Fnv32_t) 0x8f11a7c9UL },
+    { &fnv_test_str[161], (Fnv32_t) 0x36c48ecfUL },
+    { &fnv_test_str[162], (Fnv32_t) 0x24bfa27eUL },
+    { &fnv_test_str[163], (Fnv32_t) 0xf2596ad1UL },
+    { &fnv_test_str[164], (Fnv32_t) 0xf14a9b45UL },
+    { &fnv_test_str[165], (Fnv32_t) 0x7d45835aUL },
+    { &fnv_test_str[166], (Fnv32_t) 0x6e49334dUL },
+    { &fnv_test_str[167], (Fnv32_t) 0x71767337UL },
+    { &fnv_test_str[168], (Fnv32_t) 0x858a1a8aUL },
+    { &fnv_test_str[169], (Fnv32_t) 0x16e75ac2UL },
+    { &fnv_test_str[170], (Fnv32_t) 0x409f99dfUL },
+    { &fnv_test_str[171], (Fnv32_t) 0x6d6652ddUL },
+    { &fnv_test_str[172], (Fnv32_t) 0x2761a9ffUL },
+    { &fnv_test_str[173], (Fnv32_t) 0x41f0d616UL },
+    { &fnv_test_str[174], (Fnv32_t) 0x0e2d0d0fUL },
+    { &fnv_test_str[175], (Fnv32_t) 0x06adc8fdUL },
+    { &fnv_test_str[176], (Fnv32_t) 0x60e0d4b9UL },
+    { &fnv_test_str[177], (Fnv32_t) 0x5ddc79d3UL },
+    { &fnv_test_str[178], (Fnv32_t) 0x1e6d0b46UL },
+    { &fnv_test_str[179], (Fnv32_t) 0x1d1514d8UL },
+    { &fnv_test_str[180], (Fnv32_t) 0xb1903a4eUL },
+    { &fnv_test_str[181], (Fnv32_t) 0x8200c318UL },
+    { &fnv_test_str[182], (Fnv32_t) 0x15e22888UL },
+    { &fnv_test_str[183], (Fnv32_t) 0x57591760UL },
+    { &fnv_test_str[184], (Fnv32_t) 0x02462efcUL },
+    { &fnv_test_str[185], (Fnv32_t) 0x7651ec44UL },
+    { &fnv_test_str[186], (Fnv32_t) 0x7c24e9d4UL },
+    { &fnv_test_str[187], (Fnv32_t) 0x1952a034UL },
+    { &fnv_test_str[188], (Fnv32_t) 0xd4c46864UL },
+    { &fnv_test_str[189], (Fnv32_t) 0xcb57cde0UL },
+    { &fnv_test_str[190], (Fnv32_t) 0x71136a70UL },
+    { &fnv_test_str[191], (Fnv32_t) 0x0618fb40UL },
+    { &fnv_test_str[192], (Fnv32_t) 0x69a24fc0UL },
+    { &fnv_test_str[193], (Fnv32_t) 0x6a9be510UL },
+    { &fnv_test_str[194], (Fnv32_t) 0xe0477040UL },
+    { &fnv_test_str[195], (Fnv32_t) 0x85aa94b0UL },
+    { &fnv_test_str[196], (Fnv32_t) 0xc6d76240UL },
+    { &fnv_test_str[197], (Fnv32_t) 0xa9f09e40UL },
+    { &fnv_test_str[198], (Fnv32_t) 0xa0291540UL },
+    { &fnv_test_str[199], (Fnv32_t) 0x00000000UL },
+    { &fnv_test_str[200], (Fnv32_t) 0x2e672aa4UL },
+    { &fnv_test_str[201], (Fnv32_t) 0x84b1aa48UL },
+    { &fnv_test_str[202], (Fnv32_t) 0xfc24ba24UL },
+    { NULL, 0 }
+};
+
+/* FNV-1 32 bit test vectors */
+struct fnv1_32_test_vector fnv1_32_vector[] = {
+    { &fnv_test_str[0], (Fnv32_t) 0x811c9dc5UL },
+    { &fnv_test_str[1], (Fnv32_t) 0x050c5d7eUL },
+    { &fnv_test_str[2], (Fnv32_t) 0x050c5d7dUL },
+    { &fnv_test_str[3], (Fnv32_t) 0x050c5d7cUL },
+    { &fnv_test_str[4], (Fnv32_t) 0x050c5d7bUL },
+    { &fnv_test_str[5], (Fnv32_t) 0x050c5d7aUL },
+    { &fnv_test_str[6], (Fnv32_t) 0x050c5d79UL },
+    { &fnv_test_str[7], (Fnv32_t) 0x6b772514UL },
+    { &fnv_test_str[8], (Fnv32_t) 0x408f5e13UL },
+    { &fnv_test_str[9], (Fnv32_t) 0xb4b1178bUL },
+    { &fnv_test_str[10], (Fnv32_t) 0xfdc80fb0UL },
+    { &fnv_test_str[11], (Fnv32_t) 0x31f0b262UL },
+    { &fnv_test_str[12], (Fnv32_t) 0x050c5d1fUL },
+    { &fnv_test_str[13], (Fnv32_t) 0x70772d5aUL },
+    { &fnv_test_str[14], (Fnv32_t) 0x6f772bc7UL },
+    { &fnv_test_str[15], (Fnv32_t) 0x6e772a34UL },
+    { &fnv_test_str[16], (Fnv32_t) 0x6d7728a1UL },
+    { &fnv_test_str[17], (Fnv32_t) 0x6c77270eUL },
+    { &fnv_test_str[18], (Fnv32_t) 0x6b77257bUL },
+    { &fnv_test_str[19], (Fnv32_t) 0x408f5e7cUL },
+    { &fnv_test_str[20], (Fnv32_t) 0xb4b117e9UL },
+    { &fnv_test_str[21], (Fnv32_t) 0xfdc80fd1UL },
+    { &fnv_test_str[22], (Fnv32_t) 0x31f0b210UL },
+    { &fnv_test_str[23], (Fnv32_t) 0xffe8d046UL },
+    { &fnv_test_str[24], (Fnv32_t) 0x6e772a5cUL },
+    { &fnv_test_str[25], (Fnv32_t) 0x4197aebbUL },
+    { &fnv_test_str[26], (Fnv32_t) 0xfcc8100fUL },
+    { &fnv_test_str[27], (Fnv32_t) 0xfdf147faUL },
+    { &fnv_test_str[28], (Fnv32_t) 0xbcd44ee1UL },
+    { &fnv_test_str[29], (Fnv32_t) 0x23382c13UL },
+    { &fnv_test_str[30], (Fnv32_t) 0x846d619eUL },
+    { &fnv_test_str[31], (Fnv32_t) 0x1630abdbUL },
+    { &fnv_test_str[32], (Fnv32_t) 0xc99e89b2UL },
+    { &fnv_test_str[33], (Fnv32_t) 0x1692c316UL },
+    { &fnv_test_str[34], (Fnv32_t) 0x9f091bcaUL },
+    { &fnv_test_str[35], (Fnv32_t) 0x2556be9bUL },
+    { &fnv_test_str[36], (Fnv32_t) 0x628e0e73UL },
+    { &fnv_test_str[37], (Fnv32_t) 0x98a0bf6cUL },
+    { &fnv_test_str[38], (Fnv32_t) 0xb10d5725UL },
+    { &fnv_test_str[39], (Fnv32_t) 0xdd002f35UL },
+    { &fnv_test_str[40], (Fnv32_t) 0x4197aed4UL },
+    { &fnv_test_str[41], (Fnv32_t) 0xfcc81061UL },
+    { &fnv_test_str[42], (Fnv32_t) 0xfdf1479dUL },
+    { &fnv_test_str[43], (Fnv32_t) 0xbcd44e8eUL },
+    { &fnv_test_str[44], (Fnv32_t) 0x23382c33UL },
+    { &fnv_test_str[45], (Fnv32_t) 0x846d61e9UL },
+    { &fnv_test_str[46], (Fnv32_t) 0x1630abbaUL },
+    { &fnv_test_str[47], (Fnv32_t) 0xc99e89c1UL },
+    { &fnv_test_str[48], (Fnv32_t) 0x1692c336UL },
+    { &fnv_test_str[49], (Fnv32_t) 0x9f091ba2UL },
+    { &fnv_test_str[50], (Fnv32_t) 0x2556befeUL },
+    { &fnv_test_str[51], (Fnv32_t) 0x628e0e01UL },
+    { &fnv_test_str[52], (Fnv32_t) 0x98a0bf09UL },
+    { &fnv_test_str[53], (Fnv32_t) 0xb10d5704UL },
+    { &fnv_test_str[54], (Fnv32_t) 0xdd002f3fUL },
+    { &fnv_test_str[55], (Fnv32_t) 0x1c4a506fUL },
+    { &fnv_test_str[56], (Fnv32_t) 0x6e772a41UL },
+    { &fnv_test_str[57], (Fnv32_t) 0x26978421UL },
+    { &fnv_test_str[58], (Fnv32_t) 0xe184ff97UL },
+    { &fnv_test_str[59], (Fnv32_t) 0x9b5e5ac6UL },
+    { &fnv_test_str[60], (Fnv32_t) 0x5b88e592UL },
+    { &fnv_test_str[61], (Fnv32_t) 0xaa8164b7UL },
+    { &fnv_test_str[62], (Fnv32_t) 0x20b18c7bUL },
+    { &fnv_test_str[63], (Fnv32_t) 0xf28025c5UL },
+    { &fnv_test_str[64], (Fnv32_t) 0x84bb753fUL },
+    { &fnv_test_str[65], (Fnv32_t) 0x3219925aUL },
+    { &fnv_test_str[66], (Fnv32_t) 0x384163c6UL },
+    { &fnv_test_str[67], (Fnv32_t) 0x54f010d7UL },
+    { &fnv_test_str[68], (Fnv32_t) 0x8cea820cUL },
+    { &fnv_test_str[69], (Fnv32_t) 0xe12ab8eeUL },
+    { &fnv_test_str[70], (Fnv32_t) 0x26978453UL },
+    { &fnv_test_str[71], (Fnv32_t) 0xe184fff3UL },
+    { &fnv_test_str[72], (Fnv32_t) 0x9b5e5ab5UL },
+    { &fnv_test_str[73], (Fnv32_t) 0x5b88e5b2UL },
+    { &fnv_test_str[74], (Fnv32_t) 0xaa8164d6UL },
+    { &fnv_test_str[75], (Fnv32_t) 0x20b18c15UL },
+    { &fnv_test_str[76], (Fnv32_t) 0xf28025a1UL },
+    { &fnv_test_str[77], (Fnv32_t) 0x84bb751fUL },
+    { &fnv_test_str[78], (Fnv32_t) 0x3219922dUL },
+    { &fnv_test_str[79], (Fnv32_t) 0x384163aeUL },
+    { &fnv_test_str[80], (Fnv32_t) 0x54f010b2UL },
+    { &fnv_test_str[81], (Fnv32_t) 0x8cea8275UL },
+    { &fnv_test_str[82], (Fnv32_t) 0xe12ab8e4UL },
+    { &fnv_test_str[83], (Fnv32_t) 0x64411eaaUL },
+    { &fnv_test_str[84], (Fnv32_t) 0x6977223cUL },
+    { &fnv_test_str[85], (Fnv32_t) 0x428ae474UL },
+    { &fnv_test_str[86], (Fnv32_t) 0xb6fa7167UL },
+    { &fnv_test_str[87], (Fnv32_t) 0x73408525UL },
+    { &fnv_test_str[88], (Fnv32_t) 0xb78320a1UL },
+    { &fnv_test_str[89], (Fnv32_t) 0x0caf4135UL },
+    { &fnv_test_str[90], (Fnv32_t) 0xb78320a2UL },
+    { &fnv_test_str[91], (Fnv32_t) 0xcdc88e80UL },
+    { &fnv_test_str[92], (Fnv32_t) 0xb78320a3UL },
+    { &fnv_test_str[93], (Fnv32_t) 0x8ee1dbcbUL },
+    { &fnv_test_str[94], (Fnv32_t) 0xb78320a4UL },
+    { &fnv_test_str[95], (Fnv32_t) 0x4ffb2716UL },
+    { &fnv_test_str[96], (Fnv32_t) 0x860632aaUL },
+    { &fnv_test_str[97], (Fnv32_t) 0xcc2c5c64UL },
+    { &fnv_test_str[98], (Fnv32_t) 0x860632a4UL },
+    { &fnv_test_str[99], (Fnv32_t) 0x2a7ec4a6UL },
+    { &fnv_test_str[100], (Fnv32_t) 0x860632baUL },
+    { &fnv_test_str[101], (Fnv32_t) 0xfefe8e14UL },
+    { &fnv_test_str[102], (Fnv32_t) 0x0a3cffd8UL },
+    { &fnv_test_str[103], (Fnv32_t) 0xf606c108UL },
+    { &fnv_test_str[104], (Fnv32_t) 0x0a3cffdbUL },
+    { &fnv_test_str[105], (Fnv32_t) 0xf906c5c1UL },
+    { &fnv_test_str[106], (Fnv32_t) 0x0a3cffdaUL },
+    { &fnv_test_str[107], (Fnv32_t) 0xf806c42eUL },
+    { &fnv_test_str[108], (Fnv32_t) 0xc07167d7UL },
+    { &fnv_test_str[109], (Fnv32_t) 0xc9867775UL },
+    { &fnv_test_str[110], (Fnv32_t) 0xbf716668UL },
+    { &fnv_test_str[111], (Fnv32_t) 0xc78435b8UL },
+    { &fnv_test_str[112], (Fnv32_t) 0xc6717155UL },
+    { &fnv_test_str[113], (Fnv32_t) 0xb99568cfUL },
+    { &fnv_test_str[114], (Fnv32_t) 0x7662e0d6UL },
+    { &fnv_test_str[115], (Fnv32_t) 0x33a7f0e2UL },
+    { &fnv_test_str[116], (Fnv32_t) 0xc2732f95UL },
+    { &fnv_test_str[117], (Fnv32_t) 0xb053e78fUL },
+    { &fnv_test_str[118], (Fnv32_t) 0x3a19c02aUL },
+    { &fnv_test_str[119], (Fnv32_t) 0xa089821eUL },
+    { &fnv_test_str[120], (Fnv32_t) 0x31ae8f83UL },
+    { &fnv_test_str[121], (Fnv32_t) 0x995fa9c4UL },
+    { &fnv_test_str[122], (Fnv32_t) 0x35983f8cUL },
+    { &fnv_test_str[123], (Fnv32_t) 0x5036a251UL },
+    { &fnv_test_str[124], (Fnv32_t) 0x97018583UL },
+    { &fnv_test_str[125], (Fnv32_t) 0xb4448d60UL },
+    { &fnv_test_str[126], (Fnv32_t) 0x025dfe59UL },
+    { &fnv_test_str[127], (Fnv32_t) 0xc5eab3afUL },
+    { &fnv_test_str[128], (Fnv32_t) 0x7d21ba1eUL },
+    { &fnv_test_str[129], (Fnv32_t) 0x7704cddbUL },
+    { &fnv_test_str[130], (Fnv32_t) 0xd0071bfeUL },
+    { &fnv_test_str[131], (Fnv32_t) 0x0ff3774cUL },
+    { &fnv_test_str[132], (Fnv32_t) 0xb0fea0eaUL },
+    { &fnv_test_str[133], (Fnv32_t) 0x58177303UL },
+    { &fnv_test_str[134], (Fnv32_t) 0x4f599cdaUL },
+    { &fnv_test_str[135], (Fnv32_t) 0x3e590a47UL },
+    { &fnv_test_str[136], (Fnv32_t) 0x965595f8UL },
+    { &fnv_test_str[137], (Fnv32_t) 0xc37f178dUL },
+    { &fnv_test_str[138], (Fnv32_t) 0x9711dd26UL },
+    { &fnv_test_str[139], (Fnv32_t) 0x23c99b7fUL },
+    { &fnv_test_str[140], (Fnv32_t) 0x6e568b17UL },
+    { &fnv_test_str[141], (Fnv32_t) 0x43f0245bUL },
+    { &fnv_test_str[142], (Fnv32_t) 0xbcb7a001UL },
+    { &fnv_test_str[143], (Fnv32_t) 0x12e6dffeUL },
+    { &fnv_test_str[144], (Fnv32_t) 0x0792f2d6UL },
+    { &fnv_test_str[145], (Fnv32_t) 0xb966936bUL },
+    { &fnv_test_str[146], (Fnv32_t) 0x46439ac5UL },
+    { &fnv_test_str[147], (Fnv32_t) 0x728d49afUL },
+    { &fnv_test_str[148], (Fnv32_t) 0xd33745c9UL },
+    { &fnv_test_str[149], (Fnv32_t) 0xbc382a57UL },
+    { &fnv_test_str[150], (Fnv32_t) 0x4bda1d31UL },
+    { &fnv_test_str[151], (Fnv32_t) 0xce35ccaeUL },
+    { &fnv_test_str[152], (Fnv32_t) 0x3b6eed94UL },
+    { &fnv_test_str[153], (Fnv32_t) 0x445c9c58UL },
+    { &fnv_test_str[154], (Fnv32_t) 0x3db8bf9dUL },
+    { &fnv_test_str[155], (Fnv32_t) 0x2dee116dUL },
+    { &fnv_test_str[156], (Fnv32_t) 0xc18738daUL },
+    { &fnv_test_str[157], (Fnv32_t) 0x5b156176UL },
+    { &fnv_test_str[158], (Fnv32_t) 0x2aa7d593UL },
+    { &fnv_test_str[159], (Fnv32_t) 0xb2409658UL },
+    { &fnv_test_str[160], (Fnv32_t) 0xe1489528UL },
+    { &fnv_test_str[161], (Fnv32_t) 0xfe1ee07eUL },
+    { &fnv_test_str[162], (Fnv32_t) 0xe8842315UL },
+    { &fnv_test_str[163], (Fnv32_t) 0x3a6a63a2UL },
+    { &fnv_test_str[164], (Fnv32_t) 0x06d2c18cUL },
+    { &fnv_test_str[165], (Fnv32_t) 0xf8ef7225UL },
+    { &fnv_test_str[166], (Fnv32_t) 0x843d3300UL },
+    { &fnv_test_str[167], (Fnv32_t) 0xbb24f7aeUL },
+    { &fnv_test_str[168], (Fnv32_t) 0x878c0ec9UL },
+    { &fnv_test_str[169], (Fnv32_t) 0xb557810fUL },
+    { &fnv_test_str[170], (Fnv32_t) 0x57423246UL },
+    { &fnv_test_str[171], (Fnv32_t) 0x87f7505eUL },
+    { &fnv_test_str[172], (Fnv32_t) 0xbb809f20UL },
+    { &fnv_test_str[173], (Fnv32_t) 0x8932abb5UL },
+    { &fnv_test_str[174], (Fnv32_t) 0x0a9b3aa0UL },
+    { &fnv_test_str[175], (Fnv32_t) 0xb8682a24UL },
+    { &fnv_test_str[176], (Fnv32_t) 0xa7ac1c56UL },
+    { &fnv_test_str[177], (Fnv32_t) 0x11409252UL },
+    { &fnv_test_str[178], (Fnv32_t) 0xa987f517UL },
+    { &fnv_test_str[179], (Fnv32_t) 0xf309e7edUL },
+    { &fnv_test_str[180], (Fnv32_t) 0xc9e8f417UL },
+    { &fnv_test_str[181], (Fnv32_t) 0x7f447bddUL },
+    { &fnv_test_str[182], (Fnv32_t) 0xb929adc5UL },
+    { &fnv_test_str[183], (Fnv32_t) 0x57022879UL },
+    { &fnv_test_str[184], (Fnv32_t) 0xdcfd2c49UL },
+    { &fnv_test_str[185], (Fnv32_t) 0x6edafff5UL },
+    { &fnv_test_str[186], (Fnv32_t) 0xf04fb1f1UL },
+    { &fnv_test_str[187], (Fnv32_t) 0xfb7de8b9UL },
+    { &fnv_test_str[188], (Fnv32_t) 0xc5f1d7e9UL },
+    { &fnv_test_str[189], (Fnv32_t) 0x32c1f439UL },
+    { &fnv_test_str[190], (Fnv32_t) 0x7fd3eb7dUL },
+    { &fnv_test_str[191], (Fnv32_t) 0x81597da5UL },
+    { &fnv_test_str[192], (Fnv32_t) 0x05eb7a25UL },
+    { &fnv_test_str[193], (Fnv32_t) 0x9c0fa1b5UL },
+    { &fnv_test_str[194], (Fnv32_t) 0x53ccb1c5UL },
+    { &fnv_test_str[195], (Fnv32_t) 0xfabece15UL },
+    { &fnv_test_str[196], (Fnv32_t) 0x4ad745a5UL },
+    { &fnv_test_str[197], (Fnv32_t) 0xe5bdc495UL },
+    { &fnv_test_str[198], (Fnv32_t) 0x23b3c0a5UL },
+    { &fnv_test_str[199], (Fnv32_t) 0xfa823dd5UL },
+    { &fnv_test_str[200], (Fnv32_t) 0x0c6c58b9UL },
+    { &fnv_test_str[201], (Fnv32_t) 0xe2dbccd5UL },
+    { &fnv_test_str[202], (Fnv32_t) 0xdb7f50f9UL },
+    { NULL, 0 }
+};
+
+/* FNV-1a 32 bit test vectors */
+struct fnv1a_32_test_vector fnv1a_32_vector[] = {
+    { &fnv_test_str[0], (Fnv32_t) 0x811c9dc5UL },
+    { &fnv_test_str[1], (Fnv32_t) 0xe40c292cUL },
+    { &fnv_test_str[2], (Fnv32_t) 0xe70c2de5UL },
+    { &fnv_test_str[3], (Fnv32_t) 0xe60c2c52UL },
+    { &fnv_test_str[4], (Fnv32_t) 0xe10c2473UL },
+    { &fnv_test_str[5], (Fnv32_t) 0xe00c22e0UL },
+    { &fnv_test_str[6], (Fnv32_t) 0xe30c2799UL },
+    { &fnv_test_str[7], (Fnv32_t) 0x6222e842UL },
+    { &fnv_test_str[8], (Fnv32_t) 0xa9f37ed7UL },
+    { &fnv_test_str[9], (Fnv32_t) 0x3f5076efUL },
+    { &fnv_test_str[10], (Fnv32_t) 0x39aaa18aUL },
+    { &fnv_test_str[11], (Fnv32_t) 0xbf9cf968UL },
+    { &fnv_test_str[12], (Fnv32_t) 0x050c5d1fUL },
+    { &fnv_test_str[13], (Fnv32_t) 0x2b24d044UL },
+    { &fnv_test_str[14], (Fnv32_t) 0x9d2c3f7fUL },
+    { &fnv_test_str[15], (Fnv32_t) 0x7729c516UL },
+    { &fnv_test_str[16], (Fnv32_t) 0xb91d6109UL },
+    { &fnv_test_str[17], (Fnv32_t) 0x931ae6a0UL },
+    { &fnv_test_str[18], (Fnv32_t) 0x052255dbUL },
+    { &fnv_test_str[19], (Fnv32_t) 0xbef39fe6UL },
+    { &fnv_test_str[20], (Fnv32_t) 0x6150ac75UL },
+    { &fnv_test_str[21], (Fnv32_t) 0x9aab3a3dUL },
+    { &fnv_test_str[22], (Fnv32_t) 0x519c4c3eUL },
+    { &fnv_test_str[23], (Fnv32_t) 0x0c1c9eb8UL },
+    { &fnv_test_str[24], (Fnv32_t) 0x5f299f4eUL },
+    { &fnv_test_str[25], (Fnv32_t) 0xef8580f3UL },
+    { &fnv_test_str[26], (Fnv32_t) 0xac297727UL },
+    { &fnv_test_str[27], (Fnv32_t) 0x4546b9c0UL },
+    { &fnv_test_str[28], (Fnv32_t) 0xbd564e7dUL },
+    { &fnv_test_str[29], (Fnv32_t) 0x6bdd5c67UL },
+    { &fnv_test_str[30], (Fnv32_t) 0xdd77ed30UL },
+    { &fnv_test_str[31], (Fnv32_t) 0xf4ca9683UL },
+    { &fnv_test_str[32], (Fnv32_t) 0x4aeb9bd0UL },
+    { &fnv_test_str[33], (Fnv32_t) 0xe0e67ad0UL },
+    { &fnv_test_str[34], (Fnv32_t) 0xc2d32fa8UL },
+    { &fnv_test_str[35], (Fnv32_t) 0x7f743fb7UL },
+    { &fnv_test_str[36], (Fnv32_t) 0x6900631fUL },
+    { &fnv_test_str[37], (Fnv32_t) 0xc59c990eUL },
+    { &fnv_test_str[38], (Fnv32_t) 0x448524fdUL },
+    { &fnv_test_str[39], (Fnv32_t) 0xd49930d5UL },
+    { &fnv_test_str[40], (Fnv32_t) 0x1c85c7caUL },
+    { &fnv_test_str[41], (Fnv32_t) 0x0229fe89UL },
+    { &fnv_test_str[42], (Fnv32_t) 0x2c469265UL },
+    { &fnv_test_str[43], (Fnv32_t) 0xce566940UL },
+    { &fnv_test_str[44], (Fnv32_t) 0x8bdd8ec7UL },
+    { &fnv_test_str[45], (Fnv32_t) 0x34787625UL },
+    { &fnv_test_str[46], (Fnv32_t) 0xd3ca6290UL },
+    { &fnv_test_str[47], (Fnv32_t) 0xddeaf039UL },
+    { &fnv_test_str[48], (Fnv32_t) 0xc0e64870UL },
+    { &fnv_test_str[49], (Fnv32_t) 0xdad35570UL },
+    { &fnv_test_str[50], (Fnv32_t) 0x5a740578UL },
+    { &fnv_test_str[51], (Fnv32_t) 0x5b004d15UL },
+    { &fnv_test_str[52], (Fnv32_t) 0x6a9c09cdUL },
+    { &fnv_test_str[53], (Fnv32_t) 0x2384f10aUL },
+    { &fnv_test_str[54], (Fnv32_t) 0xda993a47UL },
+    { &fnv_test_str[55], (Fnv32_t) 0x8227df4fUL },
+    { &fnv_test_str[56], (Fnv32_t) 0x4c298165UL },
+    { &fnv_test_str[57], (Fnv32_t) 0xfc563735UL },
+    { &fnv_test_str[58], (Fnv32_t) 0x8cb91483UL },
+    { &fnv_test_str[59], (Fnv32_t) 0x775bf5d0UL },
+    { &fnv_test_str[60], (Fnv32_t) 0xd5c428d0UL },
+    { &fnv_test_str[61], (Fnv32_t) 0x34cc0ea3UL },
+    { &fnv_test_str[62], (Fnv32_t) 0xea3b4cb7UL },
+    { &fnv_test_str[63], (Fnv32_t) 0x8e59f029UL },
+    { &fnv_test_str[64], (Fnv32_t) 0x2094de2bUL },
+    { &fnv_test_str[65], (Fnv32_t) 0xa65a0ad4UL },
+    { &fnv_test_str[66], (Fnv32_t) 0x9bbee5f4UL },
+    { &fnv_test_str[67], (Fnv32_t) 0xbe836343UL },
+    { &fnv_test_str[68], (Fnv32_t) 0x22d5344eUL },
+    { &fnv_test_str[69], (Fnv32_t) 0x19a1470cUL },
+    { &fnv_test_str[70], (Fnv32_t) 0x4a56b1ffUL },
+    { &fnv_test_str[71], (Fnv32_t) 0x70b8e86fUL },
+    { &fnv_test_str[72], (Fnv32_t) 0x0a5b4a39UL },
+    { &fnv_test_str[73], (Fnv32_t) 0xb5c3f670UL },
+    { &fnv_test_str[74], (Fnv32_t) 0x53cc3f70UL },
+    { &fnv_test_str[75], (Fnv32_t) 0xc03b0a99UL },
+    { &fnv_test_str[76], (Fnv32_t) 0x7259c415UL },
+    { &fnv_test_str[77], (Fnv32_t) 0x4095108bUL },
+    { &fnv_test_str[78], (Fnv32_t) 0x7559bdb1UL },
+    { &fnv_test_str[79], (Fnv32_t) 0xb3bf0bbcUL },
+    { &fnv_test_str[80], (Fnv32_t) 0x2183ff1cUL },
+    { &fnv_test_str[81], (Fnv32_t) 0x2bd54279UL },
+    { &fnv_test_str[82], (Fnv32_t) 0x23a156caUL },
+    { &fnv_test_str[83], (Fnv32_t) 0x64e2d7e4UL },
+    { &fnv_test_str[84], (Fnv32_t) 0x683af69aUL },
+    { &fnv_test_str[85], (Fnv32_t) 0xaed2346eUL },
+    { &fnv_test_str[86], (Fnv32_t) 0x4f9f2cabUL },
+    { &fnv_test_str[87], (Fnv32_t) 0x02935131UL },
+    { &fnv_test_str[88], (Fnv32_t) 0xc48fb86dUL },
+    { &fnv_test_str[89], (Fnv32_t) 0x2269f369UL },
+    { &fnv_test_str[90], (Fnv32_t) 0xc18fb3b4UL },
+    { &fnv_test_str[91], (Fnv32_t) 0x50ef1236UL },
+    { &fnv_test_str[92], (Fnv32_t) 0xc28fb547UL },
+    { &fnv_test_str[93], (Fnv32_t) 0x96c3bf47UL },
+    { &fnv_test_str[94], (Fnv32_t) 0xbf8fb08eUL },
+    { &fnv_test_str[95], (Fnv32_t) 0xf3e4d49cUL },
+    { &fnv_test_str[96], (Fnv32_t) 0x32179058UL },
+    { &fnv_test_str[97], (Fnv32_t) 0x280bfee6UL },
+    { &fnv_test_str[98], (Fnv32_t) 0x30178d32UL },
+    { &fnv_test_str[99], (Fnv32_t) 0x21addaf8UL },
+    { &fnv_test_str[100], (Fnv32_t) 0x4217a988UL },
+    { &fnv_test_str[101], (Fnv32_t) 0x772633d6UL },
+    { &fnv_test_str[102], (Fnv32_t) 0x08a3d11eUL },
+    { &fnv_test_str[103], (Fnv32_t) 0xb7e2323aUL },
+    { &fnv_test_str[104], (Fnv32_t) 0x07a3cf8bUL },
+    { &fnv_test_str[105], (Fnv32_t) 0x91dfb7d1UL },
+    { &fnv_test_str[106], (Fnv32_t) 0x06a3cdf8UL },
+    { &fnv_test_str[107], (Fnv32_t) 0x6bdd3d68UL },
+    { &fnv_test_str[108], (Fnv32_t) 0x1d5636a7UL },
+    { &fnv_test_str[109], (Fnv32_t) 0xd5b808e5UL },
+    { &fnv_test_str[110], (Fnv32_t) 0x1353e852UL },
+    { &fnv_test_str[111], (Fnv32_t) 0xbf16b916UL },
+    { &fnv_test_str[112], (Fnv32_t) 0xa55b89edUL },
+    { &fnv_test_str[113], (Fnv32_t) 0x3c1a2017UL },
+    { &fnv_test_str[114], (Fnv32_t) 0x0588b13cUL },
+    { &fnv_test_str[115], (Fnv32_t) 0xf22f0174UL },
+    { &fnv_test_str[116], (Fnv32_t) 0xe83641e1UL },
+    { &fnv_test_str[117], (Fnv32_t) 0x6e69b533UL },
+    { &fnv_test_str[118], (Fnv32_t) 0xf1760448UL },
+    { &fnv_test_str[119], (Fnv32_t) 0x64c8bd58UL },
+    { &fnv_test_str[120], (Fnv32_t) 0x97b4ea23UL },
+    { &fnv_test_str[121], (Fnv32_t) 0x9a4e92e6UL },
+    { &fnv_test_str[122], (Fnv32_t) 0xcfb14012UL },
+    { &fnv_test_str[123], (Fnv32_t) 0xf01b2511UL },
+    { &fnv_test_str[124], (Fnv32_t) 0x0bbb59c3UL },
+    { &fnv_test_str[125], (Fnv32_t) 0xce524afaUL },
+    { &fnv_test_str[126], (Fnv32_t) 0xdd16ef45UL },
+    { &fnv_test_str[127], (Fnv32_t) 0x60648bb3UL },
+    { &fnv_test_str[128], (Fnv32_t) 0x7fa4bcfcUL },
+    { &fnv_test_str[129], (Fnv32_t) 0x5053ae17UL },
+    { &fnv_test_str[130], (Fnv32_t) 0xc9302890UL },
+    { &fnv_test_str[131], (Fnv32_t) 0x956ded32UL },
+    { &fnv_test_str[132], (Fnv32_t) 0x9136db84UL },
+    { &fnv_test_str[133], (Fnv32_t) 0xdf9d3323UL },
+    { &fnv_test_str[134], (Fnv32_t) 0x32bb6cd0UL },
+    { &fnv_test_str[135], (Fnv32_t) 0xc8f8385bUL },
+    { &fnv_test_str[136], (Fnv32_t) 0xeb08bfbaUL },
+    { &fnv_test_str[137], (Fnv32_t) 0x62cc8e3dUL },
+    { &fnv_test_str[138], (Fnv32_t) 0xc3e20f5cUL },
+    { &fnv_test_str[139], (Fnv32_t) 0x39e97f17UL },
+    { &fnv_test_str[140], (Fnv32_t) 0x7837b203UL },
+    { &fnv_test_str[141], (Fnv32_t) 0x319e877bUL },
+    { &fnv_test_str[142], (Fnv32_t) 0xd3e63f89UL },
+    { &fnv_test_str[143], (Fnv32_t) 0x29b50b38UL },
+    { &fnv_test_str[144], (Fnv32_t) 0x5ed678b8UL },
+    { &fnv_test_str[145], (Fnv32_t) 0xb0d5b793UL },
+    { &fnv_test_str[146], (Fnv32_t) 0x52450be5UL },
+    { &fnv_test_str[147], (Fnv32_t) 0xfa72d767UL },
+    { &fnv_test_str[148], (Fnv32_t) 0x95066709UL },
+    { &fnv_test_str[149], (Fnv32_t) 0x7f52e123UL },
+    { &fnv_test_str[150], (Fnv32_t) 0x76966481UL },
+    { &fnv_test_str[151], (Fnv32_t) 0x063258b0UL },
+    { &fnv_test_str[152], (Fnv32_t) 0x2ded6e8aUL },
+    { &fnv_test_str[153], (Fnv32_t) 0xb07d7c52UL },
+    { &fnv_test_str[154], (Fnv32_t) 0xd0c71b71UL },
+    { &fnv_test_str[155], (Fnv32_t) 0xf684f1bdUL },
+    { &fnv_test_str[156], (Fnv32_t) 0x868ecfa8UL },
+    { &fnv_test_str[157], (Fnv32_t) 0xf794f684UL },
+    { &fnv_test_str[158], (Fnv32_t) 0xd19701c3UL },
+    { &fnv_test_str[159], (Fnv32_t) 0x346e171eUL },
+    { &fnv_test_str[160], (Fnv32_t) 0x91f8f676UL },
+    { &fnv_test_str[161], (Fnv32_t) 0x0bf58848UL },
+    { &fnv_test_str[162], (Fnv32_t) 0x6317b6d1UL },
+    { &fnv_test_str[163], (Fnv32_t) 0xafad4c54UL },
+    { &fnv_test_str[164], (Fnv32_t) 0x0f25681eUL },
+    { &fnv_test_str[165], (Fnv32_t) 0x91b18d49UL },
+    { &fnv_test_str[166], (Fnv32_t) 0x7d61c12eUL },
+    { &fnv_test_str[167], (Fnv32_t) 0x5147d25cUL },
+    { &fnv_test_str[168], (Fnv32_t) 0x9a8b6805UL },
+    { &fnv_test_str[169], (Fnv32_t) 0x4cd2a447UL },
+    { &fnv_test_str[170], (Fnv32_t) 0x1e549b14UL },
+    { &fnv_test_str[171], (Fnv32_t) 0x2fe1b574UL },
+    { &fnv_test_str[172], (Fnv32_t) 0xcf0cd31eUL },
+    { &fnv_test_str[173], (Fnv32_t) 0x6c471669UL },
+    { &fnv_test_str[174], (Fnv32_t) 0x0e5eef1eUL },
+    { &fnv_test_str[175], (Fnv32_t) 0x2bed3602UL },
+    { &fnv_test_str[176], (Fnv32_t) 0xb26249e0UL },
+    { &fnv_test_str[177], (Fnv32_t) 0x2c9b86a4UL },
+    { &fnv_test_str[178], (Fnv32_t) 0xe415e2bbUL },
+    { &fnv_test_str[179], (Fnv32_t) 0x18a98d1dUL },
+    { &fnv_test_str[180], (Fnv32_t) 0xb7df8b7bUL },
+    { &fnv_test_str[181], (Fnv32_t) 0x241e9075UL },
+    { &fnv_test_str[182], (Fnv32_t) 0x063f70ddUL },
+    { &fnv_test_str[183], (Fnv32_t) 0x0295aed9UL },
+    { &fnv_test_str[184], (Fnv32_t) 0x56a7f781UL },
+    { &fnv_test_str[185], (Fnv32_t) 0x253bc645UL },
+    { &fnv_test_str[186], (Fnv32_t) 0x46610921UL },
+    { &fnv_test_str[187], (Fnv32_t) 0x7c1577f9UL },
+    { &fnv_test_str[188], (Fnv32_t) 0x512b2851UL },
+    { &fnv_test_str[189], (Fnv32_t) 0x76823999UL },
+    { &fnv_test_str[190], (Fnv32_t) 0xc0586935UL },
+    { &fnv_test_str[191], (Fnv32_t) 0xf3415c85UL },
+    { &fnv_test_str[192], (Fnv32_t) 0x0ae4ff65UL },
+    { &fnv_test_str[193], (Fnv32_t) 0x58b79725UL },
+    { &fnv_test_str[194], (Fnv32_t) 0xdea43aa5UL },
+    { &fnv_test_str[195], (Fnv32_t) 0x2bb3be35UL },
+    { &fnv_test_str[196], (Fnv32_t) 0xea777a45UL },
+    { &fnv_test_str[197], (Fnv32_t) 0x8f21c305UL },
+    { &fnv_test_str[198], (Fnv32_t) 0x5c9d0865UL },
+    { &fnv_test_str[199], (Fnv32_t) 0xfa823dd5UL },
+    { &fnv_test_str[200], (Fnv32_t) 0x21a27271UL },
+    { &fnv_test_str[201], (Fnv32_t) 0x83c5c6d5UL },
+    { &fnv_test_str[202], (Fnv32_t) 0x813b0881UL },
+    { NULL, 0 }
+};
+
+/* FNV-0 64 bit test vectors */
+#if defined(HAVE_64BIT_LONG_LONG)
+struct fnv0_64_test_vector fnv0_64_vector[] = {
+    { &fnv_test_str[0], (Fnv64_t) 0x0000000000000000ULL },
+    { &fnv_test_str[1], (Fnv64_t) 0x0000000000000061ULL },
+    { &fnv_test_str[2], (Fnv64_t) 0x0000000000000062ULL },
+    { &fnv_test_str[3], (Fnv64_t) 0x0000000000000063ULL },
+    { &fnv_test_str[4], (Fnv64_t) 0x0000000000000064ULL },
+    { &fnv_test_str[5], (Fnv64_t) 0x0000000000000065ULL },
+    { &fnv_test_str[6], (Fnv64_t) 0x0000000000000066ULL },
+    { &fnv_test_str[7], (Fnv64_t) 0x000066000000ad3dULL },
+    { &fnv_test_str[8], (Fnv64_t) 0x015a8f0001265ec8ULL },
+    { &fnv_test_str[9], (Fnv64_t) 0x733fc501f4330dbaULL },
+    { &fnv_test_str[10], (Fnv64_t) 0x08697c51f2c0536fULL },
+    { &fnv_test_str[11], (Fnv64_t) 0x0b91ae3f7ccdc5efULL },
+    { &fnv_test_str[12], (Fnv64_t) 0x0000000000000000ULL },
+    { &fnv_test_str[13], (Fnv64_t) 0x000061000000a4d3ULL },
+    { &fnv_test_str[14], (Fnv64_t) 0x000062000000a686ULL },
+    { &fnv_test_str[15], (Fnv64_t) 0x000063000000a839ULL },
+    { &fnv_test_str[16], (Fnv64_t) 0x000064000000a9ecULL },
+    { &fnv_test_str[17], (Fnv64_t) 0x000065000000ab9fULL },
+    { &fnv_test_str[18], (Fnv64_t) 0x000066000000ad52ULL },
+    { &fnv_test_str[19], (Fnv64_t) 0x015a8f0001265ea7ULL },
+    { &fnv_test_str[20], (Fnv64_t) 0x733fc501f4330dd8ULL },
+    { &fnv_test_str[21], (Fnv64_t) 0x08697c51f2c0530eULL },
+    { &fnv_test_str[22], (Fnv64_t) 0x0b91ae3f7ccdc59dULL },
+    { &fnv_test_str[23], (Fnv64_t) 0x765104e111a7551dULL },
+    { &fnv_test_str[24], (Fnv64_t) 0x000063000000a851ULL },
+    { &fnv_test_str[25], (Fnv64_t) 0x01508a00011e01ccULL },
+    { &fnv_test_str[26], (Fnv64_t) 0x59dc4a01e5fd0dcaULL },
+    { &fnv_test_str[27], (Fnv64_t) 0xae5f8b39ccfe6e59ULL },
+    { &fnv_test_str[28], (Fnv64_t) 0x4ac7ec3754558154ULL },
+    { &fnv_test_str[29], (Fnv64_t) 0x6737b6044d4ac19cULL },
+    { &fnv_test_str[30], (Fnv64_t) 0xae6be54f5606fc63ULL },
+    { &fnv_test_str[31], (Fnv64_t) 0x685308cf2ddedc58ULL },
+    { &fnv_test_str[32], (Fnv64_t) 0x23f4500af1b069fbULL },
+    { &fnv_test_str[33], (Fnv64_t) 0xc88dfd98aec415a1ULL },
+    { &fnv_test_str[34], (Fnv64_t) 0x8d5b8b70f730c0fbULL },
+    { &fnv_test_str[35], (Fnv64_t) 0x634eebf407d7eae4ULL },
+    { &fnv_test_str[36], (Fnv64_t) 0x9705d3a953e4211eULL },
+    { &fnv_test_str[37], (Fnv64_t) 0x8307c6b98ca4459fULL },
+    { &fnv_test_str[38], (Fnv64_t) 0x4a7c4c49fb224d0cULL },
+    { &fnv_test_str[39], (Fnv64_t) 0xb382adb5bb48eb6eULL },
+    { &fnv_test_str[40], (Fnv64_t) 0x01508a00011e01a3ULL },
+    { &fnv_test_str[41], (Fnv64_t) 0x59dc4a01e5fd0da4ULL },
+    { &fnv_test_str[42], (Fnv64_t) 0xae5f8b39ccfe6e3eULL },
+    { &fnv_test_str[43], (Fnv64_t) 0x4ac7ec375455813bULL },
+    { &fnv_test_str[44], (Fnv64_t) 0x6737b6044d4ac1bcULL },
+    { &fnv_test_str[45], (Fnv64_t) 0xae6be54f5606fc14ULL },
+    { &fnv_test_str[46], (Fnv64_t) 0x685308cf2ddedc39ULL },
+    { &fnv_test_str[47], (Fnv64_t) 0x23f4500af1b06988ULL },
+    { &fnv_test_str[48], (Fnv64_t) 0xc88dfd98aec41581ULL },
+    { &fnv_test_str[49], (Fnv64_t) 0x8d5b8b70f730c093ULL },
+    { &fnv_test_str[50], (Fnv64_t) 0x634eebf407d7ea81ULL },
+    { &fnv_test_str[51], (Fnv64_t) 0x9705d3a953e4216cULL },
+    { &fnv_test_str[52], (Fnv64_t) 0x8307c6b98ca445faULL },
+    { &fnv_test_str[53], (Fnv64_t) 0x4a7c4c49fb224d2dULL },
+    { &fnv_test_str[54], (Fnv64_t) 0xb382adb5bb48eb64ULL },
+    { &fnv_test_str[55], (Fnv64_t) 0x4ff899cd3ce80beaULL },
+    { &fnv_test_str[56], (Fnv64_t) 0x000063000000a84cULL },
+    { &fnv_test_str[57], (Fnv64_t) 0x01508500011df956ULL },
+    { &fnv_test_str[58], (Fnv64_t) 0x59cb5501e5eead46ULL },
+    { &fnv_test_str[59], (Fnv64_t) 0x832eb839b4906d81ULL },
+    { &fnv_test_str[60], (Fnv64_t) 0x78d08b0dd16a1213ULL },
+    { &fnv_test_str[61], (Fnv64_t) 0xb46e5b7ad73cb628ULL },
+    { &fnv_test_str[62], (Fnv64_t) 0xd43b99bbbc298596ULL },
+    { &fnv_test_str[63], (Fnv64_t) 0xcacbd000ba8dfd86ULL },
+    { &fnv_test_str[64], (Fnv64_t) 0x264ff73cff45ca92ULL },
+    { &fnv_test_str[65], (Fnv64_t) 0x5fabaea5c3973661ULL },
+    { &fnv_test_str[66], (Fnv64_t) 0x27f024ab59f166bbULL },
+    { &fnv_test_str[67], (Fnv64_t) 0xce750a29d5318fa4ULL },
+    { &fnv_test_str[68], (Fnv64_t) 0x026fe915433713d5ULL },
+    { &fnv_test_str[69], (Fnv64_t) 0x5b3ce4213696b2e5ULL },
+    { &fnv_test_str[70], (Fnv64_t) 0x01508500011df924ULL },
+    { &fnv_test_str[71], (Fnv64_t) 0x59cb5501e5eead22ULL },
+    { &fnv_test_str[72], (Fnv64_t) 0x832eb839b4906df2ULL },
+    { &fnv_test_str[73], (Fnv64_t) 0x78d08b0dd16a1233ULL },
+    { &fnv_test_str[74], (Fnv64_t) 0xb46e5b7ad73cb649ULL },
+    { &fnv_test_str[75], (Fnv64_t) 0xd43b99bbbc2985f8ULL },
+    { &fnv_test_str[76], (Fnv64_t) 0xcacbd000ba8dfde2ULL },
+    { &fnv_test_str[77], (Fnv64_t) 0x264ff73cff45cab2ULL },
+    { &fnv_test_str[78], (Fnv64_t) 0x5fabaea5c3973616ULL },
+    { &fnv_test_str[79], (Fnv64_t) 0x27f024ab59f166d3ULL },
+    { &fnv_test_str[80], (Fnv64_t) 0xce750a29d5318fc1ULL },
+    { &fnv_test_str[81], (Fnv64_t) 0x026fe915433713acULL },
+    { &fnv_test_str[82], (Fnv64_t) 0x5b3ce4213696b2efULL },
+    { &fnv_test_str[83], (Fnv64_t) 0x9f2a896fc211fb1fULL },
+    { &fnv_test_str[84], (Fnv64_t) 0x000068000000b0d1ULL },
+    { &fnv_test_str[85], (Fnv64_t) 0x01618900012c7323ULL },
+    { &fnv_test_str[86], (Fnv64_t) 0x3fa86e63bc7d03c8ULL },
+    { &fnv_test_str[87], (Fnv64_t) 0xa8375b79486d6cd8ULL },
+    { &fnv_test_str[88], (Fnv64_t) 0xa0d18504e316ac54ULL },
+    { &fnv_test_str[89], (Fnv64_t) 0x08a97b0004e7fe54ULL },
+    { &fnv_test_str[90], (Fnv64_t) 0xa0d18504e316ac57ULL },
+    { &fnv_test_str[91], (Fnv64_t) 0x1152f60009cffda9ULL },
+    { &fnv_test_str[92], (Fnv64_t) 0xa0d18504e316ac56ULL },
+    { &fnv_test_str[93], (Fnv64_t) 0x19fc71000eb7fcfeULL },
+    { &fnv_test_str[94], (Fnv64_t) 0xa0d18504e316ac51ULL },
+    { &fnv_test_str[95], (Fnv64_t) 0x22a5ec00139ffa53ULL },
+    { &fnv_test_str[96], (Fnv64_t) 0x29bed00139779a33ULL },
+    { &fnv_test_str[97], (Fnv64_t) 0x4dbc81014e3c19f5ULL },
+    { &fnv_test_str[98], (Fnv64_t) 0x29bed00139779a3dULL },
+    { &fnv_test_str[99], (Fnv64_t) 0x81a72b016b9f7573ULL },
+    { &fnv_test_str[100], (Fnv64_t) 0x29bed00139779a23ULL },
+    { &fnv_test_str[101], (Fnv64_t) 0xd85411019cbbce45ULL },
+    { &fnv_test_str[102], (Fnv64_t) 0xf548616b8621d657ULL },
+    { &fnv_test_str[103], (Fnv64_t) 0xebd3e0b4eb7f35d5ULL },
+    { &fnv_test_str[104], (Fnv64_t) 0xf548616b8621d654ULL },
+    { &fnv_test_str[105], (Fnv64_t) 0xebd3ddb4eb7f30bcULL },
+    { &fnv_test_str[106], (Fnv64_t) 0xf548616b8621d655ULL },
+    { &fnv_test_str[107], (Fnv64_t) 0xebd3deb4eb7f326fULL },
+    { &fnv_test_str[108], (Fnv64_t) 0x581cb60340ab0968ULL },
+    { &fnv_test_str[109], (Fnv64_t) 0x63d2af86e2a0fbb8ULL },
+    { &fnv_test_str[110], (Fnv64_t) 0x581cb70340ab0b37ULL },
+    { &fnv_test_str[111], (Fnv64_t) 0x63d63186e2a40e75ULL },
+    { &fnv_test_str[112], (Fnv64_t) 0x581cc40340ab212eULL },
+    { &fnv_test_str[113], (Fnv64_t) 0x64023f86e2c9612aULL },
+    { &fnv_test_str[114], (Fnv64_t) 0xdbda6a26c33c909fULL },
+    { &fnv_test_str[115], (Fnv64_t) 0xd0b2feddbfe9be2dULL },
+    { &fnv_test_str[116], (Fnv64_t) 0x9c9eae3f5d037decULL },
+    { &fnv_test_str[117], (Fnv64_t) 0x252001ab0ceef804ULL },
+    { &fnv_test_str[118], (Fnv64_t) 0x4456a56f9e05cfefULL },
+    { &fnv_test_str[119], (Fnv64_t) 0x250b0ba983e0531dULL },
+    { &fnv_test_str[120], (Fnv64_t) 0x52b007213b27b33eULL },
+    { &fnv_test_str[121], (Fnv64_t) 0xcbf29ce484222325ULL },
+    { &fnv_test_str[122], (Fnv64_t) 0xaf63bd4c8601b7dfULL },
+    { &fnv_test_str[123], (Fnv64_t) 0x128599ccddae09f8ULL },
+    { &fnv_test_str[124], (Fnv64_t) 0x270e4f1caebaf068ULL },
+    { &fnv_test_str[125], (Fnv64_t) 0x01517d497446a395ULL },
+    { &fnv_test_str[126], (Fnv64_t) 0x9af5a29a89450b40ULL },
+    { &fnv_test_str[127], (Fnv64_t) 0xb502f6c063ba72e8ULL },
+    { &fnv_test_str[128], (Fnv64_t) 0xacf41561498ca7dfULL },
+    { &fnv_test_str[129], (Fnv64_t) 0x6be8c2423a351542ULL },
+    { &fnv_test_str[130], (Fnv64_t) 0xd04f1f6da96ce4a3ULL },
+    { &fnv_test_str[131], (Fnv64_t) 0x69eb9a8f282c7235ULL },
+    { &fnv_test_str[132], (Fnv64_t) 0x6a7e5a418f77cfc5ULL },
+    { &fnv_test_str[133], (Fnv64_t) 0xbcaf568ddc2ecba0ULL },
+    { &fnv_test_str[134], (Fnv64_t) 0xb03b5cc4c38f8b1fULL },
+    { &fnv_test_str[135], (Fnv64_t) 0xf89a9f51432db828ULL },
+    { &fnv_test_str[136], (Fnv64_t) 0x549e856be6103429ULL },
+    { &fnv_test_str[137], (Fnv64_t) 0x3cf50d224d29377aULL },
+    { &fnv_test_str[138], (Fnv64_t) 0xdb762df418c10c37ULL },
+    { &fnv_test_str[139], (Fnv64_t) 0xfeeb4226b0e9a6baULL },
+    { &fnv_test_str[140], (Fnv64_t) 0x7004a4cd9310c052ULL },
+    { &fnv_test_str[141], (Fnv64_t) 0xd1c727d7f5329276ULL },
+    { &fnv_test_str[142], (Fnv64_t) 0xbe313796596ce908ULL },
+    { &fnv_test_str[143], (Fnv64_t) 0x768f67ede090fcc5ULL },
+    { &fnv_test_str[144], (Fnv64_t) 0xa81563cc9db9bfc3ULL },
+    { &fnv_test_str[145], (Fnv64_t) 0x47194043c55197a8ULL },
+    { &fnv_test_str[146], (Fnv64_t) 0xc99d81864aebab02ULL },
+    { &fnv_test_str[147], (Fnv64_t) 0xcc1f161b235ea4a2ULL },
+    { &fnv_test_str[148], (Fnv64_t) 0xaadab0c420ecd434ULL },
+    { &fnv_test_str[149], (Fnv64_t) 0x6b3c034d6f44d740ULL },
+    { &fnv_test_str[150], (Fnv64_t) 0x73a45e850602cbc6ULL },
+    { &fnv_test_str[151], (Fnv64_t) 0x72360f04f0cd227bULL },
+    { &fnv_test_str[152], (Fnv64_t) 0xa9ca80be384a778fULL },
+    { &fnv_test_str[153], (Fnv64_t) 0xd4085e66906889e3ULL },
+    { &fnv_test_str[154], (Fnv64_t) 0x93aa8b2748efdbc8ULL },
+    { &fnv_test_str[155], (Fnv64_t) 0x6f8cd678407436a2ULL },
+    { &fnv_test_str[156], (Fnv64_t) 0xf39a43d4dc8be4c7ULL },
+    { &fnv_test_str[157], (Fnv64_t) 0xd7f5cec91125d245ULL },
+    { &fnv_test_str[158], (Fnv64_t) 0x691d7b73be18adc4ULL },
+    { &fnv_test_str[159], (Fnv64_t) 0xf4361e01caf6b691ULL },
+    { &fnv_test_str[160], (Fnv64_t) 0xde7d8264f64be089ULL },
+    { &fnv_test_str[161], (Fnv64_t) 0xa34ff43e5545c06fULL },
+    { &fnv_test_str[162], (Fnv64_t) 0x181f0b8e908a2bdeULL },
+    { &fnv_test_str[163], (Fnv64_t) 0x28a965b78ddbc071ULL },
+    { &fnv_test_str[164], (Fnv64_t) 0xead9cea0e3cc6ae5ULL },
+    { &fnv_test_str[165], (Fnv64_t) 0x0b6743153b43ebbaULL },
+    { &fnv_test_str[166], (Fnv64_t) 0xa7aa3f012c74528dULL },
+    { &fnv_test_str[167], (Fnv64_t) 0x2d5d8ad7f9dffeb7ULL },
+    { &fnv_test_str[168], (Fnv64_t) 0x00750fb6e19624eaULL },
+    { &fnv_test_str[169], (Fnv64_t) 0x01c125a4e6c76c82ULL },
+    { &fnv_test_str[170], (Fnv64_t) 0x3fde3afac0722f1fULL },
+    { &fnv_test_str[171], (Fnv64_t) 0xd7c3eaf4abaa379dULL },
+    { &fnv_test_str[172], (Fnv64_t) 0xd2217e1c923c9f3fULL },
+    { &fnv_test_str[173], (Fnv64_t) 0x82d0a2e3b725caf6ULL },
+    { &fnv_test_str[174], (Fnv64_t) 0x0a10bee8eeb72e4fULL },
+    { &fnv_test_str[175], (Fnv64_t) 0xc530e8723e72c6fdULL },
+    { &fnv_test_str[176], (Fnv64_t) 0xd8d34dcd2e7bad99ULL },
+    { &fnv_test_str[177], (Fnv64_t) 0xecf77466e9a2baf3ULL },
+    { &fnv_test_str[178], (Fnv64_t) 0xde3d2ddb043b9666ULL },
+    { &fnv_test_str[179], (Fnv64_t) 0xd1cc824e1a8157d8ULL },
+    { &fnv_test_str[180], (Fnv64_t) 0x7d5c68ecbc90512eULL },
+    { &fnv_test_str[181], (Fnv64_t) 0x2f7c691b1d7c76d8ULL },
+    { &fnv_test_str[182], (Fnv64_t) 0x5d88c2bad3a46bc8ULL },
+    { &fnv_test_str[183], (Fnv64_t) 0xdf107320276647a0ULL },
+    { &fnv_test_str[184], (Fnv64_t) 0x0f78f22e7e70e9bcULL },
+    { &fnv_test_str[185], (Fnv64_t) 0x8c67be5c80f67d04ULL },
+    { &fnv_test_str[186], (Fnv64_t) 0x07c1adfa4d019194ULL },
+    { &fnv_test_str[187], (Fnv64_t) 0xce1312420c5b1af4ULL },
+    { &fnv_test_str[188], (Fnv64_t) 0x043a41b2dc53ab24ULL },
+    { &fnv_test_str[189], (Fnv64_t) 0x0b038eebf7340860ULL },
+    { &fnv_test_str[190], (Fnv64_t) 0x1bcd837353fb69b0ULL },
+    { &fnv_test_str[191], (Fnv64_t) 0x46f992fc59eff180ULL },
+    { &fnv_test_str[192], (Fnv64_t) 0x497678ee29ae79c0ULL },
+    { &fnv_test_str[193], (Fnv64_t) 0xb10a62280ddd4450ULL },
+    { &fnv_test_str[194], (Fnv64_t) 0x35eb228db4d68140ULL },
+    { &fnv_test_str[195], (Fnv64_t) 0x8b350e86d9470870ULL },
+    { &fnv_test_str[196], (Fnv64_t) 0x4e1fbdb2812e9540ULL },
+    { &fnv_test_str[197], (Fnv64_t) 0x051e080df69a0600ULL },
+    { &fnv_test_str[198], (Fnv64_t) 0x45e1e8ae54dadb40ULL },
+    { &fnv_test_str[199], (Fnv64_t) 0x0000000000000000ULL },
+    { &fnv_test_str[200], (Fnv64_t) 0xcd73806290557064ULL },
+    { &fnv_test_str[201], (Fnv64_t) 0x2613a37bbe0317c8ULL },
+    { &fnv_test_str[202], (Fnv64_t) 0x1480e21fcf2ae5e4ULL },
+    { NULL, (Fnv64_t) 0 }
+};
+#else /* HAVE_64BIT_LONG_LONG */
+struct fnv0_64_test_vector fnv0_64_vector[] = {
+    { &fnv_test_str[0], (Fnv64_t) {0x00000000UL, 0x00000000UL} },
+    { &fnv_test_str[1], (Fnv64_t) {0x00000061UL, 0x00000000UL} },
+    { &fnv_test_str[2], (Fnv64_t) {0x00000062UL, 0x00000000UL} },
+    { &fnv_test_str[3], (Fnv64_t) {0x00000063UL, 0x00000000UL} },
+    { &fnv_test_str[4], (Fnv64_t) {0x00000064UL, 0x00000000UL} },
+    { &fnv_test_str[5], (Fnv64_t) {0x00000065UL, 0x00000000UL} },
+    { &fnv_test_str[6], (Fnv64_t) {0x00000066UL, 0x00000000UL} },
+    { &fnv_test_str[7], (Fnv64_t) {0x0000ad3dUL, 0x00006600UL} },
+    { &fnv_test_str[8], (Fnv64_t) {0x01265ec8UL, 0x015a8f00UL} },
+    { &fnv_test_str[9], (Fnv64_t) {0xf4330dbaUL, 0x733fc501UL} },
+    { &fnv_test_str[10], (Fnv64_t) {0xf2c0536fUL, 0x08697c51UL} },
+    { &fnv_test_str[11], (Fnv64_t) {0x7ccdc5efUL, 0x0b91ae3fUL} },
+    { &fnv_test_str[12], (Fnv64_t) {0x00000000UL, 0x00000000UL} },
+    { &fnv_test_str[13], (Fnv64_t) {0x0000a4d3UL, 0x00006100UL} },
+    { &fnv_test_str[14], (Fnv64_t) {0x0000a686UL, 0x00006200UL} },
+    { &fnv_test_str[15], (Fnv64_t) {0x0000a839UL, 0x00006300UL} },
+    { &fnv_test_str[16], (Fnv64_t) {0x0000a9ecUL, 0x00006400UL} },
+    { &fnv_test_str[17], (Fnv64_t) {0x0000ab9fUL, 0x00006500UL} },
+    { &fnv_test_str[18], (Fnv64_t) {0x0000ad52UL, 0x00006600UL} },
+    { &fnv_test_str[19], (Fnv64_t) {0x01265ea7UL, 0x015a8f00UL} },
+    { &fnv_test_str[20], (Fnv64_t) {0xf4330dd8UL, 0x733fc501UL} },
+    { &fnv_test_str[21], (Fnv64_t) {0xf2c0530eUL, 0x08697c51UL} },
+    { &fnv_test_str[22], (Fnv64_t) {0x7ccdc59dUL, 0x0b91ae3fUL} },
+    { &fnv_test_str[23], (Fnv64_t) {0x11a7551dUL, 0x765104e1UL} },
+    { &fnv_test_str[24], (Fnv64_t) {0x0000a851UL, 0x00006300UL} },
+    { &fnv_test_str[25], (Fnv64_t) {0x011e01ccUL, 0x01508a00UL} },
+    { &fnv_test_str[26], (Fnv64_t) {0xe5fd0dcaUL, 0x59dc4a01UL} },
+    { &fnv_test_str[27], (Fnv64_t) {0xccfe6e59UL, 0xae5f8b39UL} },
+    { &fnv_test_str[28], (Fnv64_t) {0x54558154UL, 0x4ac7ec37UL} },
+    { &fnv_test_str[29], (Fnv64_t) {0x4d4ac19cUL, 0x6737b604UL} },
+    { &fnv_test_str[30], (Fnv64_t) {0x5606fc63UL, 0xae6be54fUL} },
+    { &fnv_test_str[31], (Fnv64_t) {0x2ddedc58UL, 0x685308cfUL} },
+    { &fnv_test_str[32], (Fnv64_t) {0xf1b069fbUL, 0x23f4500aUL} },
+    { &fnv_test_str[33], (Fnv64_t) {0xaec415a1UL, 0xc88dfd98UL} },
+    { &fnv_test_str[34], (Fnv64_t) {0xf730c0fbUL, 0x8d5b8b70UL} },
+    { &fnv_test_str[35], (Fnv64_t) {0x07d7eae4UL, 0x634eebf4UL} },
+    { &fnv_test_str[36], (Fnv64_t) {0x53e4211eUL, 0x9705d3a9UL} },
+    { &fnv_test_str[37], (Fnv64_t) {0x8ca4459fUL, 0x8307c6b9UL} },
+    { &fnv_test_str[38], (Fnv64_t) {0xfb224d0cUL, 0x4a7c4c49UL} },
+    { &fnv_test_str[39], (Fnv64_t) {0xbb48eb6eUL, 0xb382adb5UL} },
+    { &fnv_test_str[40], (Fnv64_t) {0x011e01a3UL, 0x01508a00UL} },
+    { &fnv_test_str[41], (Fnv64_t) {0xe5fd0da4UL, 0x59dc4a01UL} },
+    { &fnv_test_str[42], (Fnv64_t) {0xccfe6e3eUL, 0xae5f8b39UL} },
+    { &fnv_test_str[43], (Fnv64_t) {0x5455813bUL, 0x4ac7ec37UL} },
+    { &fnv_test_str[44], (Fnv64_t) {0x4d4ac1bcUL, 0x6737b604UL} },
+    { &fnv_test_str[45], (Fnv64_t) {0x5606fc14UL, 0xae6be54fUL} },
+    { &fnv_test_str[46], (Fnv64_t) {0x2ddedc39UL, 0x685308cfUL} },
+    { &fnv_test_str[47], (Fnv64_t) {0xf1b06988UL, 0x23f4500aUL} },
+    { &fnv_test_str[48], (Fnv64_t) {0xaec41581UL, 0xc88dfd98UL} },
+    { &fnv_test_str[49], (Fnv64_t) {0xf730c093UL, 0x8d5b8b70UL} },
+    { &fnv_test_str[50], (Fnv64_t) {0x07d7ea81UL, 0x634eebf4UL} },
+    { &fnv_test_str[51], (Fnv64_t) {0x53e4216cUL, 0x9705d3a9UL} },
+    { &fnv_test_str[52], (Fnv64_t) {0x8ca445faUL, 0x8307c6b9UL} },
+    { &fnv_test_str[53], (Fnv64_t) {0xfb224d2dUL, 0x4a7c4c49UL} },
+    { &fnv_test_str[54], (Fnv64_t) {0xbb48eb64UL, 0xb382adb5UL} },
+    { &fnv_test_str[55], (Fnv64_t) {0x3ce80beaUL, 0x4ff899cdUL} },
+    { &fnv_test_str[56], (Fnv64_t) {0x0000a84cUL, 0x00006300UL} },
+    { &fnv_test_str[57], (Fnv64_t) {0x011df956UL, 0x01508500UL} },
+    { &fnv_test_str[58], (Fnv64_t) {0xe5eead46UL, 0x59cb5501UL} },
+    { &fnv_test_str[59], (Fnv64_t) {0xb4906d81UL, 0x832eb839UL} },
+    { &fnv_test_str[60], (Fnv64_t) {0xd16a1213UL, 0x78d08b0dUL} },
+    { &fnv_test_str[61], (Fnv64_t) {0xd73cb628UL, 0xb46e5b7aUL} },
+    { &fnv_test_str[62], (Fnv64_t) {0xbc298596UL, 0xd43b99bbUL} },
+    { &fnv_test_str[63], (Fnv64_t) {0xba8dfd86UL, 0xcacbd000UL} },
+    { &fnv_test_str[64], (Fnv64_t) {0xff45ca92UL, 0x264ff73cUL} },
+    { &fnv_test_str[65], (Fnv64_t) {0xc3973661UL, 0x5fabaea5UL} },
+    { &fnv_test_str[66], (Fnv64_t) {0x59f166bbUL, 0x27f024abUL} },
+    { &fnv_test_str[67], (Fnv64_t) {0xd5318fa4UL, 0xce750a29UL} },
+    { &fnv_test_str[68], (Fnv64_t) {0x433713d5UL, 0x026fe915UL} },
+    { &fnv_test_str[69], (Fnv64_t) {0x3696b2e5UL, 0x5b3ce421UL} },
+    { &fnv_test_str[70], (Fnv64_t) {0x011df924UL, 0x01508500UL} },
+    { &fnv_test_str[71], (Fnv64_t) {0xe5eead22UL, 0x59cb5501UL} },
+    { &fnv_test_str[72], (Fnv64_t) {0xb4906df2UL, 0x832eb839UL} },
+    { &fnv_test_str[73], (Fnv64_t) {0xd16a1233UL, 0x78d08b0dUL} },
+    { &fnv_test_str[74], (Fnv64_t) {0xd73cb649UL, 0xb46e5b7aUL} },
+    { &fnv_test_str[75], (Fnv64_t) {0xbc2985f8UL, 0xd43b99bbUL} },
+    { &fnv_test_str[76], (Fnv64_t) {0xba8dfde2UL, 0xcacbd000UL} },
+    { &fnv_test_str[77], (Fnv64_t) {0xff45cab2UL, 0x264ff73cUL} },
+    { &fnv_test_str[78], (Fnv64_t) {0xc3973616UL, 0x5fabaea5UL} },
+    { &fnv_test_str[79], (Fnv64_t) {0x59f166d3UL, 0x27f024abUL} },
+    { &fnv_test_str[80], (Fnv64_t) {0xd5318fc1UL, 0xce750a29UL} },
+    { &fnv_test_str[81], (Fnv64_t) {0x433713acUL, 0x026fe915UL} },
+    { &fnv_test_str[82], (Fnv64_t) {0x3696b2efUL, 0x5b3ce421UL} },
+    { &fnv_test_str[83], (Fnv64_t) {0xc211fb1fUL, 0x9f2a896fUL} },
+    { &fnv_test_str[84], (Fnv64_t) {0x0000b0d1UL, 0x00006800UL} },
+    { &fnv_test_str[85], (Fnv64_t) {0x012c7323UL, 0x01618900UL} },
+    { &fnv_test_str[86], (Fnv64_t) {0xbc7d03c8UL, 0x3fa86e63UL} },
+    { &fnv_test_str[87], (Fnv64_t) {0x486d6cd8UL, 0xa8375b79UL} },
+    { &fnv_test_str[88], (Fnv64_t) {0xe316ac54UL, 0xa0d18504UL} },
+    { &fnv_test_str[89], (Fnv64_t) {0x04e7fe54UL, 0x08a97b00UL} },
+    { &fnv_test_str[90], (Fnv64_t) {0xe316ac57UL, 0xa0d18504UL} },
+    { &fnv_test_str[91], (Fnv64_t) {0x09cffda9UL, 0x1152f600UL} },
+    { &fnv_test_str[92], (Fnv64_t) {0xe316ac56UL, 0xa0d18504UL} },
+    { &fnv_test_str[93], (Fnv64_t) {0x0eb7fcfeUL, 0x19fc7100UL} },
+    { &fnv_test_str[94], (Fnv64_t) {0xe316ac51UL, 0xa0d18504UL} },
+    { &fnv_test_str[95], (Fnv64_t) {0x139ffa53UL, 0x22a5ec00UL} },
+    { &fnv_test_str[96], (Fnv64_t) {0x39779a33UL, 0x29bed001UL} },
+    { &fnv_test_str[97], (Fnv64_t) {0x4e3c19f5UL, 0x4dbc8101UL} },
+    { &fnv_test_str[98], (Fnv64_t) {0x39779a3dUL, 0x29bed001UL} },
+    { &fnv_test_str[99], (Fnv64_t) {0x6b9f7573UL, 0x81a72b01UL} },
+    { &fnv_test_str[100], (Fnv64_t) {0x39779a23UL, 0x29bed001UL} },
+    { &fnv_test_str[101], (Fnv64_t) {0x9cbbce45UL, 0xd8541101UL} },
+    { &fnv_test_str[102], (Fnv64_t) {0x8621d657UL, 0xf548616bUL} },
+    { &fnv_test_str[103], (Fnv64_t) {0xeb7f35d5UL, 0xebd3e0b4UL} },
+    { &fnv_test_str[104], (Fnv64_t) {0x8621d654UL, 0xf548616bUL} },
+    { &fnv_test_str[105], (Fnv64_t) {0xeb7f30bcUL, 0xebd3ddb4UL} },
+    { &fnv_test_str[106], (Fnv64_t) {0x8621d655UL, 0xf548616bUL} },
+    { &fnv_test_str[107], (Fnv64_t) {0xeb7f326fUL, 0xebd3deb4UL} },
+    { &fnv_test_str[108], (Fnv64_t) {0x40ab0968UL, 0x581cb603UL} },
+    { &fnv_test_str[109], (Fnv64_t) {0xe2a0fbb8UL, 0x63d2af86UL} },
+    { &fnv_test_str[110], (Fnv64_t) {0x40ab0b37UL, 0x581cb703UL} },
+    { &fnv_test_str[111], (Fnv64_t) {0xe2a40e75UL, 0x63d63186UL} },
+    { &fnv_test_str[112], (Fnv64_t) {0x40ab212eUL, 0x581cc403UL} },
+    { &fnv_test_str[113], (Fnv64_t) {0xe2c9612aUL, 0x64023f86UL} },
+    { &fnv_test_str[114], (Fnv64_t) {0xc33c909fUL, 0xdbda6a26UL} },
+    { &fnv_test_str[115], (Fnv64_t) {0xbfe9be2dUL, 0xd0b2feddUL} },
+    { &fnv_test_str[116], (Fnv64_t) {0x5d037decUL, 0x9c9eae3fUL} },
+    { &fnv_test_str[117], (Fnv64_t) {0x0ceef804UL, 0x252001abUL} },
+    { &fnv_test_str[118], (Fnv64_t) {0x9e05cfefUL, 0x4456a56fUL} },
+    { &fnv_test_str[119], (Fnv64_t) {0x83e0531dUL, 0x250b0ba9UL} },
+    { &fnv_test_str[120], (Fnv64_t) {0x3b27b33eUL, 0x52b00721UL} },
+    { &fnv_test_str[121], (Fnv64_t) {0x84222325UL, 0xcbf29ce4UL} },
+    { &fnv_test_str[122], (Fnv64_t) {0x8601b7dfUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[123], (Fnv64_t) {0xddae09f8UL, 0x128599ccUL} },
+    { &fnv_test_str[124], (Fnv64_t) {0xaebaf068UL, 0x270e4f1cUL} },
+    { &fnv_test_str[125], (Fnv64_t) {0x7446a395UL, 0x01517d49UL} },
+    { &fnv_test_str[126], (Fnv64_t) {0x89450b40UL, 0x9af5a29aUL} },
+    { &fnv_test_str[127], (Fnv64_t) {0x63ba72e8UL, 0xb502f6c0UL} },
+    { &fnv_test_str[128], (Fnv64_t) {0x498ca7dfUL, 0xacf41561UL} },
+    { &fnv_test_str[129], (Fnv64_t) {0x3a351542UL, 0x6be8c242UL} },
+    { &fnv_test_str[130], (Fnv64_t) {0xa96ce4a3UL, 0xd04f1f6dUL} },
+    { &fnv_test_str[131], (Fnv64_t) {0x282c7235UL, 0x69eb9a8fUL} },
+    { &fnv_test_str[132], (Fnv64_t) {0x8f77cfc5UL, 0x6a7e5a41UL} },
+    { &fnv_test_str[133], (Fnv64_t) {0xdc2ecba0UL, 0xbcaf568dUL} },
+    { &fnv_test_str[134], (Fnv64_t) {0xc38f8b1fUL, 0xb03b5cc4UL} },
+    { &fnv_test_str[135], (Fnv64_t) {0x432db828UL, 0xf89a9f51UL} },
+    { &fnv_test_str[136], (Fnv64_t) {0xe6103429UL, 0x549e856bUL} },
+    { &fnv_test_str[137], (Fnv64_t) {0x4d29377aUL, 0x3cf50d22UL} },
+    { &fnv_test_str[138], (Fnv64_t) {0x18c10c37UL, 0xdb762df4UL} },
+    { &fnv_test_str[139], (Fnv64_t) {0xb0e9a6baUL, 0xfeeb4226UL} },
+    { &fnv_test_str[140], (Fnv64_t) {0x9310c052UL, 0x7004a4cdUL} },
+    { &fnv_test_str[141], (Fnv64_t) {0xf5329276UL, 0xd1c727d7UL} },
+    { &fnv_test_str[142], (Fnv64_t) {0x596ce908UL, 0xbe313796UL} },
+    { &fnv_test_str[143], (Fnv64_t) {0xe090fcc5UL, 0x768f67edUL} },
+    { &fnv_test_str[144], (Fnv64_t) {0x9db9bfc3UL, 0xa81563ccUL} },
+    { &fnv_test_str[145], (Fnv64_t) {0xc55197a8UL, 0x47194043UL} },
+    { &fnv_test_str[146], (Fnv64_t) {0x4aebab02UL, 0xc99d8186UL} },
+    { &fnv_test_str[147], (Fnv64_t) {0x235ea4a2UL, 0xcc1f161bUL} },
+    { &fnv_test_str[148], (Fnv64_t) {0x20ecd434UL, 0xaadab0c4UL} },
+    { &fnv_test_str[149], (Fnv64_t) {0x6f44d740UL, 0x6b3c034dUL} },
+    { &fnv_test_str[150], (Fnv64_t) {0x0602cbc6UL, 0x73a45e85UL} },
+    { &fnv_test_str[151], (Fnv64_t) {0xf0cd227bUL, 0x72360f04UL} },
+    { &fnv_test_str[152], (Fnv64_t) {0x384a778fUL, 0xa9ca80beUL} },
+    { &fnv_test_str[153], (Fnv64_t) {0x906889e3UL, 0xd4085e66UL} },
+    { &fnv_test_str[154], (Fnv64_t) {0x48efdbc8UL, 0x93aa8b27UL} },
+    { &fnv_test_str[155], (Fnv64_t) {0x407436a2UL, 0x6f8cd678UL} },
+    { &fnv_test_str[156], (Fnv64_t) {0xdc8be4c7UL, 0xf39a43d4UL} },
+    { &fnv_test_str[157], (Fnv64_t) {0x1125d245UL, 0xd7f5cec9UL} },
+    { &fnv_test_str[158], (Fnv64_t) {0xbe18adc4UL, 0x691d7b73UL} },
+    { &fnv_test_str[159], (Fnv64_t) {0xcaf6b691UL, 0xf4361e01UL} },
+    { &fnv_test_str[160], (Fnv64_t) {0xf64be089UL, 0xde7d8264UL} },
+    { &fnv_test_str[161], (Fnv64_t) {0x5545c06fUL, 0xa34ff43eUL} },
+    { &fnv_test_str[162], (Fnv64_t) {0x908a2bdeUL, 0x181f0b8eUL} },
+    { &fnv_test_str[163], (Fnv64_t) {0x8ddbc071UL, 0x28a965b7UL} },
+    { &fnv_test_str[164], (Fnv64_t) {0xe3cc6ae5UL, 0xead9cea0UL} },
+    { &fnv_test_str[165], (Fnv64_t) {0x3b43ebbaUL, 0x0b674315UL} },
+    { &fnv_test_str[166], (Fnv64_t) {0x2c74528dUL, 0xa7aa3f01UL} },
+    { &fnv_test_str[167], (Fnv64_t) {0xf9dffeb7UL, 0x2d5d8ad7UL} },
+    { &fnv_test_str[168], (Fnv64_t) {0xe19624eaUL, 0x00750fb6UL} },
+    { &fnv_test_str[169], (Fnv64_t) {0xe6c76c82UL, 0x01c125a4UL} },
+    { &fnv_test_str[170], (Fnv64_t) {0xc0722f1fUL, 0x3fde3afaUL} },
+    { &fnv_test_str[171], (Fnv64_t) {0xabaa379dUL, 0xd7c3eaf4UL} },
+    { &fnv_test_str[172], (Fnv64_t) {0x923c9f3fUL, 0xd2217e1cUL} },
+    { &fnv_test_str[173], (Fnv64_t) {0xb725caf6UL, 0x82d0a2e3UL} },
+    { &fnv_test_str[174], (Fnv64_t) {0xeeb72e4fUL, 0x0a10bee8UL} },
+    { &fnv_test_str[175], (Fnv64_t) {0x3e72c6fdUL, 0xc530e872UL} },
+    { &fnv_test_str[176], (Fnv64_t) {0x2e7bad99UL, 0xd8d34dcdUL} },
+    { &fnv_test_str[177], (Fnv64_t) {0xe9a2baf3UL, 0xecf77466UL} },
+    { &fnv_test_str[178], (Fnv64_t) {0x043b9666UL, 0xde3d2ddbUL} },
+    { &fnv_test_str[179], (Fnv64_t) {0x1a8157d8UL, 0xd1cc824eUL} },
+    { &fnv_test_str[180], (Fnv64_t) {0xbc90512eUL, 0x7d5c68ecUL} },
+    { &fnv_test_str[181], (Fnv64_t) {0x1d7c76d8UL, 0x2f7c691bUL} },
+    { &fnv_test_str[182], (Fnv64_t) {0xd3a46bc8UL, 0x5d88c2baUL} },
+    { &fnv_test_str[183], (Fnv64_t) {0x276647a0UL, 0xdf107320UL} },
+    { &fnv_test_str[184], (Fnv64_t) {0x7e70e9bcUL, 0x0f78f22eUL} },
+    { &fnv_test_str[185], (Fnv64_t) {0x80f67d04UL, 0x8c67be5cUL} },
+    { &fnv_test_str[186], (Fnv64_t) {0x4d019194UL, 0x07c1adfaUL} },
+    { &fnv_test_str[187], (Fnv64_t) {0x0c5b1af4UL, 0xce131242UL} },
+    { &fnv_test_str[188], (Fnv64_t) {0xdc53ab24UL, 0x043a41b2UL} },
+    { &fnv_test_str[189], (Fnv64_t) {0xf7340860UL, 0x0b038eebUL} },
+    { &fnv_test_str[190], (Fnv64_t) {0x53fb69b0UL, 0x1bcd8373UL} },
+    { &fnv_test_str[191], (Fnv64_t) {0x59eff180UL, 0x46f992fcUL} },
+    { &fnv_test_str[192], (Fnv64_t) {0x29ae79c0UL, 0x497678eeUL} },
+    { &fnv_test_str[193], (Fnv64_t) {0x0ddd4450UL, 0xb10a6228UL} },
+    { &fnv_test_str[194], (Fnv64_t) {0xb4d68140UL, 0x35eb228dUL} },
+    { &fnv_test_str[195], (Fnv64_t) {0xd9470870UL, 0x8b350e86UL} },
+    { &fnv_test_str[196], (Fnv64_t) {0x812e9540UL, 0x4e1fbdb2UL} },
+    { &fnv_test_str[197], (Fnv64_t) {0xf69a0600UL, 0x051e080dUL} },
+    { &fnv_test_str[198], (Fnv64_t) {0x54dadb40UL, 0x45e1e8aeUL} },
+    { &fnv_test_str[199], (Fnv64_t) {0x00000000UL, 0x00000000UL} },
+    { &fnv_test_str[200], (Fnv64_t) {0x90557064UL, 0xcd738062UL} },
+    { &fnv_test_str[201], (Fnv64_t) {0xbe0317c8UL, 0x2613a37bUL} },
+    { &fnv_test_str[202], (Fnv64_t) {0xcf2ae5e4UL, 0x1480e21fUL} },
+    { NULL, (Fnv64_t) {0,0} }
+};
+#endif /* HAVE_64BIT_LONG_LONG */
+
+/* FNV-1 64 bit test vectors */
+#if defined(HAVE_64BIT_LONG_LONG)
+struct fnv1_64_test_vector fnv1_64_vector[] = {
+    { &fnv_test_str[0], (Fnv64_t) 0xcbf29ce484222325ULL },
+    { &fnv_test_str[1], (Fnv64_t) 0xaf63bd4c8601b7beULL },
+    { &fnv_test_str[2], (Fnv64_t) 0xaf63bd4c8601b7bdULL },
+    { &fnv_test_str[3], (Fnv64_t) 0xaf63bd4c8601b7bcULL },
+    { &fnv_test_str[4], (Fnv64_t) 0xaf63bd4c8601b7bbULL },
+    { &fnv_test_str[5], (Fnv64_t) 0xaf63bd4c8601b7baULL },
+    { &fnv_test_str[6], (Fnv64_t) 0xaf63bd4c8601b7b9ULL },
+    { &fnv_test_str[7], (Fnv64_t) 0x08326207b4eb2f34ULL },
+    { &fnv_test_str[8], (Fnv64_t) 0xd8cbc7186ba13533ULL },
+    { &fnv_test_str[9], (Fnv64_t) 0x0378817ee2ed65cbULL },
+    { &fnv_test_str[10], (Fnv64_t) 0xd329d59b9963f790ULL },
+    { &fnv_test_str[11], (Fnv64_t) 0x340d8765a4dda9c2ULL },
+    { &fnv_test_str[12], (Fnv64_t) 0xaf63bd4c8601b7dfULL },
+    { &fnv_test_str[13], (Fnv64_t) 0x08326707b4eb37daULL },
+    { &fnv_test_str[14], (Fnv64_t) 0x08326607b4eb3627ULL },
+    { &fnv_test_str[15], (Fnv64_t) 0x08326507b4eb3474ULL },
+    { &fnv_test_str[16], (Fnv64_t) 0x08326407b4eb32c1ULL },
+    { &fnv_test_str[17], (Fnv64_t) 0x08326307b4eb310eULL },
+    { &fnv_test_str[18], (Fnv64_t) 0x08326207b4eb2f5bULL },
+    { &fnv_test_str[19], (Fnv64_t) 0xd8cbc7186ba1355cULL },
+    { &fnv_test_str[20], (Fnv64_t) 0x0378817ee2ed65a9ULL },
+    { &fnv_test_str[21], (Fnv64_t) 0xd329d59b9963f7f1ULL },
+    { &fnv_test_str[22], (Fnv64_t) 0x340d8765a4dda9b0ULL },
+    { &fnv_test_str[23], (Fnv64_t) 0x50a6d3b724a774a6ULL },
+    { &fnv_test_str[24], (Fnv64_t) 0x08326507b4eb341cULL },
+    { &fnv_test_str[25], (Fnv64_t) 0xd8d5c8186ba98bfbULL },
+    { &fnv_test_str[26], (Fnv64_t) 0x1ccefc7ef118dbefULL },
+    { &fnv_test_str[27], (Fnv64_t) 0x0c92fab3ad3db77aULL },
+    { &fnv_test_str[28], (Fnv64_t) 0x9b77794f5fdec421ULL },
+    { &fnv_test_str[29], (Fnv64_t) 0x0ac742dfe7874433ULL },
+    { &fnv_test_str[30], (Fnv64_t) 0xd7dad5766ad8e2deULL },
+    { &fnv_test_str[31], (Fnv64_t) 0xa1bb96378e897f5bULL },
+    { &fnv_test_str[32], (Fnv64_t) 0x5b3f9b6733a367d2ULL },
+    { &fnv_test_str[33], (Fnv64_t) 0xb07ce25cbea969f6ULL },
+    { &fnv_test_str[34], (Fnv64_t) 0x8d9e9997f9df0d6aULL },
+    { &fnv_test_str[35], (Fnv64_t) 0x838c673d9603cb7bULL },
+    { &fnv_test_str[36], (Fnv64_t) 0x8b5ee8a5e872c273ULL },
+    { &fnv_test_str[37], (Fnv64_t) 0x4507c4e9fb00690cULL },
+    { &fnv_test_str[38], (Fnv64_t) 0x4c9ca59581b27f45ULL },
+    { &fnv_test_str[39], (Fnv64_t) 0xe0aca20b624e4235ULL },
+    { &fnv_test_str[40], (Fnv64_t) 0xd8d5c8186ba98b94ULL },
+    { &fnv_test_str[41], (Fnv64_t) 0x1ccefc7ef118db81ULL },
+    { &fnv_test_str[42], (Fnv64_t) 0x0c92fab3ad3db71dULL },
+    { &fnv_test_str[43], (Fnv64_t) 0x9b77794f5fdec44eULL },
+    { &fnv_test_str[44], (Fnv64_t) 0x0ac742dfe7874413ULL },
+    { &fnv_test_str[45], (Fnv64_t) 0xd7dad5766ad8e2a9ULL },
+    { &fnv_test_str[46], (Fnv64_t) 0xa1bb96378e897f3aULL },
+    { &fnv_test_str[47], (Fnv64_t) 0x5b3f9b6733a367a1ULL },
+    { &fnv_test_str[48], (Fnv64_t) 0xb07ce25cbea969d6ULL },
+    { &fnv_test_str[49], (Fnv64_t) 0x8d9e9997f9df0d02ULL },
+    { &fnv_test_str[50], (Fnv64_t) 0x838c673d9603cb1eULL },
+    { &fnv_test_str[51], (Fnv64_t) 0x8b5ee8a5e872c201ULL },
+    { &fnv_test_str[52], (Fnv64_t) 0x4507c4e9fb006969ULL },
+    { &fnv_test_str[53], (Fnv64_t) 0x4c9ca59581b27f64ULL },
+    { &fnv_test_str[54], (Fnv64_t) 0xe0aca20b624e423fULL },
+    { &fnv_test_str[55], (Fnv64_t) 0x13998e580afa800fULL },
+    { &fnv_test_str[56], (Fnv64_t) 0x08326507b4eb3401ULL },
+    { &fnv_test_str[57], (Fnv64_t) 0xd8d5ad186ba95dc1ULL },
+    { &fnv_test_str[58], (Fnv64_t) 0x1c72e17ef0ca4e97ULL },
+    { &fnv_test_str[59], (Fnv64_t) 0x2183c1b327c38ae6ULL },
+    { &fnv_test_str[60], (Fnv64_t) 0xb66d096c914504f2ULL },
+    { &fnv_test_str[61], (Fnv64_t) 0x404bf57ad8476757ULL },
+    { &fnv_test_str[62], (Fnv64_t) 0x887976bd815498bbULL },
+    { &fnv_test_str[63], (Fnv64_t) 0x3afd7f02c2bf85a5ULL },
+    { &fnv_test_str[64], (Fnv64_t) 0xfc4476b0eb70177fULL },
+    { &fnv_test_str[65], (Fnv64_t) 0x186d2da00f77ecbaULL },
+    { &fnv_test_str[66], (Fnv64_t) 0xf97140fa48c74066ULL },
+    { &fnv_test_str[67], (Fnv64_t) 0xa2b1cf49aa926d37ULL },
+    { &fnv_test_str[68], (Fnv64_t) 0x0690712cd6cf940cULL },
+    { &fnv_test_str[69], (Fnv64_t) 0xf7045b3102b8906eULL },
+    { &fnv_test_str[70], (Fnv64_t) 0xd8d5ad186ba95db3ULL },
+    { &fnv_test_str[71], (Fnv64_t) 0x1c72e17ef0ca4ef3ULL },
+    { &fnv_test_str[72], (Fnv64_t) 0x2183c1b327c38a95ULL },
+    { &fnv_test_str[73], (Fnv64_t) 0xb66d096c914504d2ULL },
+    { &fnv_test_str[74], (Fnv64_t) 0x404bf57ad8476736ULL },
+    { &fnv_test_str[75], (Fnv64_t) 0x887976bd815498d5ULL },
+    { &fnv_test_str[76], (Fnv64_t) 0x3afd7f02c2bf85c1ULL },
+    { &fnv_test_str[77], (Fnv64_t) 0xfc4476b0eb70175fULL },
+    { &fnv_test_str[78], (Fnv64_t) 0x186d2da00f77eccdULL },
+    { &fnv_test_str[79], (Fnv64_t) 0xf97140fa48c7400eULL },
+    { &fnv_test_str[80], (Fnv64_t) 0xa2b1cf49aa926d52ULL },
+    { &fnv_test_str[81], (Fnv64_t) 0x0690712cd6cf9475ULL },
+    { &fnv_test_str[82], (Fnv64_t) 0xf7045b3102b89064ULL },
+    { &fnv_test_str[83], (Fnv64_t) 0x74f762479f9d6aeaULL },
+    { &fnv_test_str[84], (Fnv64_t) 0x08326007b4eb2b9cULL },
+    { &fnv_test_str[85], (Fnv64_t) 0xd8c4c9186b9b1a14ULL },
+    { &fnv_test_str[86], (Fnv64_t) 0x7b495389bdbdd4c7ULL },
+    { &fnv_test_str[87], (Fnv64_t) 0x3b6dba0d69908e25ULL },
+    { &fnv_test_str[88], (Fnv64_t) 0xd6b2b17bf4b71261ULL },
+    { &fnv_test_str[89], (Fnv64_t) 0x447bfb7f98e615b5ULL },
+    { &fnv_test_str[90], (Fnv64_t) 0xd6b2b17bf4b71262ULL },
+    { &fnv_test_str[91], (Fnv64_t) 0x3bd2807f93fe1660ULL },
+    { &fnv_test_str[92], (Fnv64_t) 0xd6b2b17bf4b71263ULL },
+    { &fnv_test_str[93], (Fnv64_t) 0x3329057f8f16170bULL },
+    { &fnv_test_str[94], (Fnv64_t) 0xd6b2b17bf4b71264ULL },
+    { &fnv_test_str[95], (Fnv64_t) 0x2a7f8a7f8a2e19b6ULL },
+    { &fnv_test_str[96], (Fnv64_t) 0x23d3767e64b2f98aULL },
+    { &fnv_test_str[97], (Fnv64_t) 0xff768d7e4f9d86a4ULL },
+    { &fnv_test_str[98], (Fnv64_t) 0x23d3767e64b2f984ULL },
+    { &fnv_test_str[99], (Fnv64_t) 0xccd1837e334e4aa6ULL },
+    { &fnv_test_str[100], (Fnv64_t) 0x23d3767e64b2f99aULL },
+    { &fnv_test_str[101], (Fnv64_t) 0x7691fd7e028f6754ULL },
+    { &fnv_test_str[102], (Fnv64_t) 0x34ad3b1041204318ULL },
+    { &fnv_test_str[103], (Fnv64_t) 0xa29e749ea9d201c8ULL },
+    { &fnv_test_str[104], (Fnv64_t) 0x34ad3b104120431bULL },
+    { &fnv_test_str[105], (Fnv64_t) 0xa29e779ea9d206e1ULL },
+    { &fnv_test_str[106], (Fnv64_t) 0x34ad3b104120431aULL },
+    { &fnv_test_str[107], (Fnv64_t) 0xa29e769ea9d2052eULL },
+    { &fnv_test_str[108], (Fnv64_t) 0x02a17ebca4aa3497ULL },
+    { &fnv_test_str[109], (Fnv64_t) 0x229ef18bcd375c95ULL },
+    { &fnv_test_str[110], (Fnv64_t) 0x02a17dbca4aa32c8ULL },
+    { &fnv_test_str[111], (Fnv64_t) 0x229b6f8bcd3449d8ULL },
+    { &fnv_test_str[112], (Fnv64_t) 0x02a184bca4aa3ed5ULL },
+    { &fnv_test_str[113], (Fnv64_t) 0x22b3618bcd48c3efULL },
+    { &fnv_test_str[114], (Fnv64_t) 0x5c2c346706186f36ULL },
+    { &fnv_test_str[115], (Fnv64_t) 0xb78c410f5b84f8c2ULL },
+    { &fnv_test_str[116], (Fnv64_t) 0xed9478212b267395ULL },
+    { &fnv_test_str[117], (Fnv64_t) 0xd9bbb55c5256662fULL },
+    { &fnv_test_str[118], (Fnv64_t) 0x8c54f0203249438aULL },
+    { &fnv_test_str[119], (Fnv64_t) 0xbd9790b5727dc37eULL },
+    { &fnv_test_str[120], (Fnv64_t) 0xa64e5f36c9e2b0e3ULL },
+    { &fnv_test_str[121], (Fnv64_t) 0x8fd0680da3088a04ULL },
+    { &fnv_test_str[122], (Fnv64_t) 0x67aad32c078284ccULL },
+    { &fnv_test_str[123], (Fnv64_t) 0xb37d55d81c57b331ULL },
+    { &fnv_test_str[124], (Fnv64_t) 0x55ac0f3829057c43ULL },
+    { &fnv_test_str[125], (Fnv64_t) 0xcb27f4b8e1b6cc20ULL },
+    { &fnv_test_str[126], (Fnv64_t) 0x26caf88bcbef2d19ULL },
+    { &fnv_test_str[127], (Fnv64_t) 0x8e6e063b97e61b8fULL },
+    { &fnv_test_str[128], (Fnv64_t) 0xb42750f7f3b7c37eULL },
+    { &fnv_test_str[129], (Fnv64_t) 0xf3c6ba64cf7ca99bULL },
+    { &fnv_test_str[130], (Fnv64_t) 0xebfb69b427ea80feULL },
+    { &fnv_test_str[131], (Fnv64_t) 0x39b50c3ed970f46cULL },
+    { &fnv_test_str[132], (Fnv64_t) 0x5b9b177aa3eb3e8aULL },
+    { &fnv_test_str[133], (Fnv64_t) 0x6510063ecf4ec903ULL },
+    { &fnv_test_str[134], (Fnv64_t) 0x2b3bbd2c00797c7aULL },
+    { &fnv_test_str[135], (Fnv64_t) 0xf1d6204ff5cb4aa7ULL },
+    { &fnv_test_str[136], (Fnv64_t) 0x4836e27ccf099f38ULL },
+    { &fnv_test_str[137], (Fnv64_t) 0x82efbb0dd073b44dULL },
+    { &fnv_test_str[138], (Fnv64_t) 0x4a80c282ffd7d4c6ULL },
+    { &fnv_test_str[139], (Fnv64_t) 0x305d1a9c9ee43bdfULL },
+    { &fnv_test_str[140], (Fnv64_t) 0x15c366948ffc6997ULL },
+    { &fnv_test_str[141], (Fnv64_t) 0x80153ae218916e7bULL },
+    { &fnv_test_str[142], (Fnv64_t) 0xfa23e2bdf9e2a9e1ULL },
+    { &fnv_test_str[143], (Fnv64_t) 0xd47e8d8a2333c6deULL },
+    { &fnv_test_str[144], (Fnv64_t) 0x7e128095f688b056ULL },
+    { &fnv_test_str[145], (Fnv64_t) 0x2f5356890efcedabULL },
+    { &fnv_test_str[146], (Fnv64_t) 0x95c2b383014f55c5ULL },
+    { &fnv_test_str[147], (Fnv64_t) 0x4727a5339ce6070fULL },
+    { &fnv_test_str[148], (Fnv64_t) 0xb0555ecd575108e9ULL },
+    { &fnv_test_str[149], (Fnv64_t) 0x48d785770bb4af37ULL },
+    { &fnv_test_str[150], (Fnv64_t) 0x09d4701c12af02b1ULL },
+    { &fnv_test_str[151], (Fnv64_t) 0x79f031e78f3cf62eULL },
+    { &fnv_test_str[152], (Fnv64_t) 0x52a1ee85db1b5a94ULL },
+    { &fnv_test_str[153], (Fnv64_t) 0x6bd95b2eb37fa6b8ULL },
+    { &fnv_test_str[154], (Fnv64_t) 0x74971b7077aef85dULL },
+    { &fnv_test_str[155], (Fnv64_t) 0xb4e4fae2ffcc1aadULL },
+    { &fnv_test_str[156], (Fnv64_t) 0x2bd48bd898b8f63aULL },
+    { &fnv_test_str[157], (Fnv64_t) 0xe9966ac1556257f6ULL },
+    { &fnv_test_str[158], (Fnv64_t) 0x92a3d1cd078ba293ULL },
+    { &fnv_test_str[159], (Fnv64_t) 0xf81175a482e20ab8ULL },
+    { &fnv_test_str[160], (Fnv64_t) 0x5bbb3de722e73048ULL },
+    { &fnv_test_str[161], (Fnv64_t) 0x6b4f363492b9f2beULL },
+    { &fnv_test_str[162], (Fnv64_t) 0xc2d559df73d59875ULL },
+    { &fnv_test_str[163], (Fnv64_t) 0xf75f62284bc7a8c2ULL },
+    { &fnv_test_str[164], (Fnv64_t) 0xda8dd8e116a9f1ccULL },
+    { &fnv_test_str[165], (Fnv64_t) 0xbdc1e6ab76057885ULL },
+    { &fnv_test_str[166], (Fnv64_t) 0xfec6a4238a1224a0ULL },
+    { &fnv_test_str[167], (Fnv64_t) 0xc03f40f3223e290eULL },
+    { &fnv_test_str[168], (Fnv64_t) 0x1ed21673466ffda9ULL },
+    { &fnv_test_str[169], (Fnv64_t) 0xdf70f906bb0dd2afULL },
+    { &fnv_test_str[170], (Fnv64_t) 0xf3dcda369f2af666ULL },
+    { &fnv_test_str[171], (Fnv64_t) 0x9ebb11573cdcebdeULL },
+    { &fnv_test_str[172], (Fnv64_t) 0x81c72d9077fedca0ULL },
+    { &fnv_test_str[173], (Fnv64_t) 0x0ec074a31be5fb15ULL },
+    { &fnv_test_str[174], (Fnv64_t) 0x2a8b3280b6c48f20ULL },
+    { &fnv_test_str[175], (Fnv64_t) 0xfd31777513309344ULL },
+    { &fnv_test_str[176], (Fnv64_t) 0x194534a86ad006b6ULL },
+    { &fnv_test_str[177], (Fnv64_t) 0x3be6fdf46e0cfe12ULL },
+    { &fnv_test_str[178], (Fnv64_t) 0x017cc137a07eb057ULL },
+    { &fnv_test_str[179], (Fnv64_t) 0x9428fc6e7d26b54dULL },
+    { &fnv_test_str[180], (Fnv64_t) 0x9aaa2e3603ef8ad7ULL },
+    { &fnv_test_str[181], (Fnv64_t) 0x82c6d3f3a0ccdf7dULL },
+    { &fnv_test_str[182], (Fnv64_t) 0xc86eeea00cf09b65ULL },
+    { &fnv_test_str[183], (Fnv64_t) 0x705f8189dbb58299ULL },
+    { &fnv_test_str[184], (Fnv64_t) 0x415a7f554391ca69ULL },
+    { &fnv_test_str[185], (Fnv64_t) 0xcfe3d49fa2bdc555ULL },
+    { &fnv_test_str[186], (Fnv64_t) 0xf0f9c56039b25191ULL },
+    { &fnv_test_str[187], (Fnv64_t) 0x7075cb6abd1d32d9ULL },
+    { &fnv_test_str[188], (Fnv64_t) 0x43c94e2c8b277509ULL },
+    { &fnv_test_str[189], (Fnv64_t) 0x3cbfd4e4ea670359ULL },
+    { &fnv_test_str[190], (Fnv64_t) 0xc05887810f4d019dULL },
+    { &fnv_test_str[191], (Fnv64_t) 0x14468ff93ac22dc5ULL },
+    { &fnv_test_str[192], (Fnv64_t) 0xebed699589d99c05ULL },
+    { &fnv_test_str[193], (Fnv64_t) 0x6d99f6df321ca5d5ULL },
+    { &fnv_test_str[194], (Fnv64_t) 0x0cd410d08c36d625ULL },
+    { &fnv_test_str[195], (Fnv64_t) 0xef1b2a2c86831d35ULL },
+    { &fnv_test_str[196], (Fnv64_t) 0x3b349c4d69ee5f05ULL },
+    { &fnv_test_str[197], (Fnv64_t) 0x55248ce88f45f035ULL },
+    { &fnv_test_str[198], (Fnv64_t) 0xaa69ca6a18a4c885ULL },
+    { &fnv_test_str[199], (Fnv64_t) 0x1fe3fce62bd816b5ULL },
+    { &fnv_test_str[200], (Fnv64_t) 0x0289a488a8df69d9ULL },
+    { &fnv_test_str[201], (Fnv64_t) 0x15e96e1613df98b5ULL },
+    { &fnv_test_str[202], (Fnv64_t) 0xe6be57375ad89b99ULL },
+    { NULL, (Fnv64_t) 0 }
+};
+#else /* HAVE_64BIT_LONG_LONG */
+struct fnv1_64_test_vector fnv1_64_vector[] = {
+    { &fnv_test_str[0], (Fnv64_t) {0x84222325UL, 0xcbf29ce4UL} },
+    { &fnv_test_str[1], (Fnv64_t) {0x8601b7beUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[2], (Fnv64_t) {0x8601b7bdUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[3], (Fnv64_t) {0x8601b7bcUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[4], (Fnv64_t) {0x8601b7bbUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[5], (Fnv64_t) {0x8601b7baUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[6], (Fnv64_t) {0x8601b7b9UL, 0xaf63bd4cUL} },
+    { &fnv_test_str[7], (Fnv64_t) {0xb4eb2f34UL, 0x08326207UL} },
+    { &fnv_test_str[8], (Fnv64_t) {0x6ba13533UL, 0xd8cbc718UL} },
+    { &fnv_test_str[9], (Fnv64_t) {0xe2ed65cbUL, 0x0378817eUL} },
+    { &fnv_test_str[10], (Fnv64_t) {0x9963f790UL, 0xd329d59bUL} },
+    { &fnv_test_str[11], (Fnv64_t) {0xa4dda9c2UL, 0x340d8765UL} },
+    { &fnv_test_str[12], (Fnv64_t) {0x8601b7dfUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[13], (Fnv64_t) {0xb4eb37daUL, 0x08326707UL} },
+    { &fnv_test_str[14], (Fnv64_t) {0xb4eb3627UL, 0x08326607UL} },
+    { &fnv_test_str[15], (Fnv64_t) {0xb4eb3474UL, 0x08326507UL} },
+    { &fnv_test_str[16], (Fnv64_t) {0xb4eb32c1UL, 0x08326407UL} },
+    { &fnv_test_str[17], (Fnv64_t) {0xb4eb310eUL, 0x08326307UL} },
+    { &fnv_test_str[18], (Fnv64_t) {0xb4eb2f5bUL, 0x08326207UL} },
+    { &fnv_test_str[19], (Fnv64_t) {0x6ba1355cUL, 0xd8cbc718UL} },
+    { &fnv_test_str[20], (Fnv64_t) {0xe2ed65a9UL, 0x0378817eUL} },
+    { &fnv_test_str[21], (Fnv64_t) {0x9963f7f1UL, 0xd329d59bUL} },
+    { &fnv_test_str[22], (Fnv64_t) {0xa4dda9b0UL, 0x340d8765UL} },
+    { &fnv_test_str[23], (Fnv64_t) {0x24a774a6UL, 0x50a6d3b7UL} },
+    { &fnv_test_str[24], (Fnv64_t) {0xb4eb341cUL, 0x08326507UL} },
+    { &fnv_test_str[25], (Fnv64_t) {0x6ba98bfbUL, 0xd8d5c818UL} },
+    { &fnv_test_str[26], (Fnv64_t) {0xf118dbefUL, 0x1ccefc7eUL} },
+    { &fnv_test_str[27], (Fnv64_t) {0xad3db77aUL, 0x0c92fab3UL} },
+    { &fnv_test_str[28], (Fnv64_t) {0x5fdec421UL, 0x9b77794fUL} },
+    { &fnv_test_str[29], (Fnv64_t) {0xe7874433UL, 0x0ac742dfUL} },
+    { &fnv_test_str[30], (Fnv64_t) {0x6ad8e2deUL, 0xd7dad576UL} },
+    { &fnv_test_str[31], (Fnv64_t) {0x8e897f5bUL, 0xa1bb9637UL} },
+    { &fnv_test_str[32], (Fnv64_t) {0x33a367d2UL, 0x5b3f9b67UL} },
+    { &fnv_test_str[33], (Fnv64_t) {0xbea969f6UL, 0xb07ce25cUL} },
+    { &fnv_test_str[34], (Fnv64_t) {0xf9df0d6aUL, 0x8d9e9997UL} },
+    { &fnv_test_str[35], (Fnv64_t) {0x9603cb7bUL, 0x838c673dUL} },
+    { &fnv_test_str[36], (Fnv64_t) {0xe872c273UL, 0x8b5ee8a5UL} },
+    { &fnv_test_str[37], (Fnv64_t) {0xfb00690cUL, 0x4507c4e9UL} },
+    { &fnv_test_str[38], (Fnv64_t) {0x81b27f45UL, 0x4c9ca595UL} },
+    { &fnv_test_str[39], (Fnv64_t) {0x624e4235UL, 0xe0aca20bUL} },
+    { &fnv_test_str[40], (Fnv64_t) {0x6ba98b94UL, 0xd8d5c818UL} },
+    { &fnv_test_str[41], (Fnv64_t) {0xf118db81UL, 0x1ccefc7eUL} },
+    { &fnv_test_str[42], (Fnv64_t) {0xad3db71dUL, 0x0c92fab3UL} },
+    { &fnv_test_str[43], (Fnv64_t) {0x5fdec44eUL, 0x9b77794fUL} },
+    { &fnv_test_str[44], (Fnv64_t) {0xe7874413UL, 0x0ac742dfUL} },
+    { &fnv_test_str[45], (Fnv64_t) {0x6ad8e2a9UL, 0xd7dad576UL} },
+    { &fnv_test_str[46], (Fnv64_t) {0x8e897f3aUL, 0xa1bb9637UL} },
+    { &fnv_test_str[47], (Fnv64_t) {0x33a367a1UL, 0x5b3f9b67UL} },
+    { &fnv_test_str[48], (Fnv64_t) {0xbea969d6UL, 0xb07ce25cUL} },
+    { &fnv_test_str[49], (Fnv64_t) {0xf9df0d02UL, 0x8d9e9997UL} },
+    { &fnv_test_str[50], (Fnv64_t) {0x9603cb1eUL, 0x838c673dUL} },
+    { &fnv_test_str[51], (Fnv64_t) {0xe872c201UL, 0x8b5ee8a5UL} },
+    { &fnv_test_str[52], (Fnv64_t) {0xfb006969UL, 0x4507c4e9UL} },
+    { &fnv_test_str[53], (Fnv64_t) {0x81b27f64UL, 0x4c9ca595UL} },
+    { &fnv_test_str[54], (Fnv64_t) {0x624e423fUL, 0xe0aca20bUL} },
+    { &fnv_test_str[55], (Fnv64_t) {0x0afa800fUL, 0x13998e58UL} },
+    { &fnv_test_str[56], (Fnv64_t) {0xb4eb3401UL, 0x08326507UL} },
+    { &fnv_test_str[57], (Fnv64_t) {0x6ba95dc1UL, 0xd8d5ad18UL} },
+    { &fnv_test_str[58], (Fnv64_t) {0xf0ca4e97UL, 0x1c72e17eUL} },
+    { &fnv_test_str[59], (Fnv64_t) {0x27c38ae6UL, 0x2183c1b3UL} },
+    { &fnv_test_str[60], (Fnv64_t) {0x914504f2UL, 0xb66d096cUL} },
+    { &fnv_test_str[61], (Fnv64_t) {0xd8476757UL, 0x404bf57aUL} },
+    { &fnv_test_str[62], (Fnv64_t) {0x815498bbUL, 0x887976bdUL} },
+    { &fnv_test_str[63], (Fnv64_t) {0xc2bf85a5UL, 0x3afd7f02UL} },
+    { &fnv_test_str[64], (Fnv64_t) {0xeb70177fUL, 0xfc4476b0UL} },
+    { &fnv_test_str[65], (Fnv64_t) {0x0f77ecbaUL, 0x186d2da0UL} },
+    { &fnv_test_str[66], (Fnv64_t) {0x48c74066UL, 0xf97140faUL} },
+    { &fnv_test_str[67], (Fnv64_t) {0xaa926d37UL, 0xa2b1cf49UL} },
+    { &fnv_test_str[68], (Fnv64_t) {0xd6cf940cUL, 0x0690712cUL} },
+    { &fnv_test_str[69], (Fnv64_t) {0x02b8906eUL, 0xf7045b31UL} },
+    { &fnv_test_str[70], (Fnv64_t) {0x6ba95db3UL, 0xd8d5ad18UL} },
+    { &fnv_test_str[71], (Fnv64_t) {0xf0ca4ef3UL, 0x1c72e17eUL} },
+    { &fnv_test_str[72], (Fnv64_t) {0x27c38a95UL, 0x2183c1b3UL} },
+    { &fnv_test_str[73], (Fnv64_t) {0x914504d2UL, 0xb66d096cUL} },
+    { &fnv_test_str[74], (Fnv64_t) {0xd8476736UL, 0x404bf57aUL} },
+    { &fnv_test_str[75], (Fnv64_t) {0x815498d5UL, 0x887976bdUL} },
+    { &fnv_test_str[76], (Fnv64_t) {0xc2bf85c1UL, 0x3afd7f02UL} },
+    { &fnv_test_str[77], (Fnv64_t) {0xeb70175fUL, 0xfc4476b0UL} },
+    { &fnv_test_str[78], (Fnv64_t) {0x0f77eccdUL, 0x186d2da0UL} },
+    { &fnv_test_str[79], (Fnv64_t) {0x48c7400eUL, 0xf97140faUL} },
+    { &fnv_test_str[80], (Fnv64_t) {0xaa926d52UL, 0xa2b1cf49UL} },
+    { &fnv_test_str[81], (Fnv64_t) {0xd6cf9475UL, 0x0690712cUL} },
+    { &fnv_test_str[82], (Fnv64_t) {0x02b89064UL, 0xf7045b31UL} },
+    { &fnv_test_str[83], (Fnv64_t) {0x9f9d6aeaUL, 0x74f76247UL} },
+    { &fnv_test_str[84], (Fnv64_t) {0xb4eb2b9cUL, 0x08326007UL} },
+    { &fnv_test_str[85], (Fnv64_t) {0x6b9b1a14UL, 0xd8c4c918UL} },
+    { &fnv_test_str[86], (Fnv64_t) {0xbdbdd4c7UL, 0x7b495389UL} },
+    { &fnv_test_str[87], (Fnv64_t) {0x69908e25UL, 0x3b6dba0dUL} },
+    { &fnv_test_str[88], (Fnv64_t) {0xf4b71261UL, 0xd6b2b17bUL} },
+    { &fnv_test_str[89], (Fnv64_t) {0x98e615b5UL, 0x447bfb7fUL} },
+    { &fnv_test_str[90], (Fnv64_t) {0xf4b71262UL, 0xd6b2b17bUL} },
+    { &fnv_test_str[91], (Fnv64_t) {0x93fe1660UL, 0x3bd2807fUL} },
+    { &fnv_test_str[92], (Fnv64_t) {0xf4b71263UL, 0xd6b2b17bUL} },
+    { &fnv_test_str[93], (Fnv64_t) {0x8f16170bUL, 0x3329057fUL} },
+    { &fnv_test_str[94], (Fnv64_t) {0xf4b71264UL, 0xd6b2b17bUL} },
+    { &fnv_test_str[95], (Fnv64_t) {0x8a2e19b6UL, 0x2a7f8a7fUL} },
+    { &fnv_test_str[96], (Fnv64_t) {0x64b2f98aUL, 0x23d3767eUL} },
+    { &fnv_test_str[97], (Fnv64_t) {0x4f9d86a4UL, 0xff768d7eUL} },
+    { &fnv_test_str[98], (Fnv64_t) {0x64b2f984UL, 0x23d3767eUL} },
+    { &fnv_test_str[99], (Fnv64_t) {0x334e4aa6UL, 0xccd1837eUL} },
+    { &fnv_test_str[100], (Fnv64_t) {0x64b2f99aUL, 0x23d3767eUL} },
+    { &fnv_test_str[101], (Fnv64_t) {0x028f6754UL, 0x7691fd7eUL} },
+    { &fnv_test_str[102], (Fnv64_t) {0x41204318UL, 0x34ad3b10UL} },
+    { &fnv_test_str[103], (Fnv64_t) {0xa9d201c8UL, 0xa29e749eUL} },
+    { &fnv_test_str[104], (Fnv64_t) {0x4120431bUL, 0x34ad3b10UL} },
+    { &fnv_test_str[105], (Fnv64_t) {0xa9d206e1UL, 0xa29e779eUL} },
+    { &fnv_test_str[106], (Fnv64_t) {0x4120431aUL, 0x34ad3b10UL} },
+    { &fnv_test_str[107], (Fnv64_t) {0xa9d2052eUL, 0xa29e769eUL} },
+    { &fnv_test_str[108], (Fnv64_t) {0xa4aa3497UL, 0x02a17ebcUL} },
+    { &fnv_test_str[109], (Fnv64_t) {0xcd375c95UL, 0x229ef18bUL} },
+    { &fnv_test_str[110], (Fnv64_t) {0xa4aa32c8UL, 0x02a17dbcUL} },
+    { &fnv_test_str[111], (Fnv64_t) {0xcd3449d8UL, 0x229b6f8bUL} },
+    { &fnv_test_str[112], (Fnv64_t) {0xa4aa3ed5UL, 0x02a184bcUL} },
+    { &fnv_test_str[113], (Fnv64_t) {0xcd48c3efUL, 0x22b3618bUL} },
+    { &fnv_test_str[114], (Fnv64_t) {0x06186f36UL, 0x5c2c3467UL} },
+    { &fnv_test_str[115], (Fnv64_t) {0x5b84f8c2UL, 0xb78c410fUL} },
+    { &fnv_test_str[116], (Fnv64_t) {0x2b267395UL, 0xed947821UL} },
+    { &fnv_test_str[117], (Fnv64_t) {0x5256662fUL, 0xd9bbb55cUL} },
+    { &fnv_test_str[118], (Fnv64_t) {0x3249438aUL, 0x8c54f020UL} },
+    { &fnv_test_str[119], (Fnv64_t) {0x727dc37eUL, 0xbd9790b5UL} },
+    { &fnv_test_str[120], (Fnv64_t) {0xc9e2b0e3UL, 0xa64e5f36UL} },
+    { &fnv_test_str[121], (Fnv64_t) {0xa3088a04UL, 0x8fd0680dUL} },
+    { &fnv_test_str[122], (Fnv64_t) {0x078284ccUL, 0x67aad32cUL} },
+    { &fnv_test_str[123], (Fnv64_t) {0x1c57b331UL, 0xb37d55d8UL} },
+    { &fnv_test_str[124], (Fnv64_t) {0x29057c43UL, 0x55ac0f38UL} },
+    { &fnv_test_str[125], (Fnv64_t) {0xe1b6cc20UL, 0xcb27f4b8UL} },
+    { &fnv_test_str[126], (Fnv64_t) {0xcbef2d19UL, 0x26caf88bUL} },
+    { &fnv_test_str[127], (Fnv64_t) {0x97e61b8fUL, 0x8e6e063bUL} },
+    { &fnv_test_str[128], (Fnv64_t) {0xf3b7c37eUL, 0xb42750f7UL} },
+    { &fnv_test_str[129], (Fnv64_t) {0xcf7ca99bUL, 0xf3c6ba64UL} },
+    { &fnv_test_str[130], (Fnv64_t) {0x27ea80feUL, 0xebfb69b4UL} },
+    { &fnv_test_str[131], (Fnv64_t) {0xd970f46cUL, 0x39b50c3eUL} },
+    { &fnv_test_str[132], (Fnv64_t) {0xa3eb3e8aUL, 0x5b9b177aUL} },
+    { &fnv_test_str[133], (Fnv64_t) {0xcf4ec903UL, 0x6510063eUL} },
+    { &fnv_test_str[134], (Fnv64_t) {0x00797c7aUL, 0x2b3bbd2cUL} },
+    { &fnv_test_str[135], (Fnv64_t) {0xf5cb4aa7UL, 0xf1d6204fUL} },
+    { &fnv_test_str[136], (Fnv64_t) {0xcf099f38UL, 0x4836e27cUL} },
+    { &fnv_test_str[137], (Fnv64_t) {0xd073b44dUL, 0x82efbb0dUL} },
+    { &fnv_test_str[138], (Fnv64_t) {0xffd7d4c6UL, 0x4a80c282UL} },
+    { &fnv_test_str[139], (Fnv64_t) {0x9ee43bdfUL, 0x305d1a9cUL} },
+    { &fnv_test_str[140], (Fnv64_t) {0x8ffc6997UL, 0x15c36694UL} },
+    { &fnv_test_str[141], (Fnv64_t) {0x18916e7bUL, 0x80153ae2UL} },
+    { &fnv_test_str[142], (Fnv64_t) {0xf9e2a9e1UL, 0xfa23e2bdUL} },
+    { &fnv_test_str[143], (Fnv64_t) {0x2333c6deUL, 0xd47e8d8aUL} },
+    { &fnv_test_str[144], (Fnv64_t) {0xf688b056UL, 0x7e128095UL} },
+    { &fnv_test_str[145], (Fnv64_t) {0x0efcedabUL, 0x2f535689UL} },
+    { &fnv_test_str[146], (Fnv64_t) {0x014f55c5UL, 0x95c2b383UL} },
+    { &fnv_test_str[147], (Fnv64_t) {0x9ce6070fUL, 0x4727a533UL} },
+    { &fnv_test_str[148], (Fnv64_t) {0x575108e9UL, 0xb0555ecdUL} },
+    { &fnv_test_str[149], (Fnv64_t) {0x0bb4af37UL, 0x48d78577UL} },
+    { &fnv_test_str[150], (Fnv64_t) {0x12af02b1UL, 0x09d4701cUL} },
+    { &fnv_test_str[151], (Fnv64_t) {0x8f3cf62eUL, 0x79f031e7UL} },
+    { &fnv_test_str[152], (Fnv64_t) {0xdb1b5a94UL, 0x52a1ee85UL} },
+    { &fnv_test_str[153], (Fnv64_t) {0xb37fa6b8UL, 0x6bd95b2eUL} },
+    { &fnv_test_str[154], (Fnv64_t) {0x77aef85dUL, 0x74971b70UL} },
+    { &fnv_test_str[155], (Fnv64_t) {0xffcc1aadUL, 0xb4e4fae2UL} },
+    { &fnv_test_str[156], (Fnv64_t) {0x98b8f63aUL, 0x2bd48bd8UL} },
+    { &fnv_test_str[157], (Fnv64_t) {0x556257f6UL, 0xe9966ac1UL} },
+    { &fnv_test_str[158], (Fnv64_t) {0x078ba293UL, 0x92a3d1cdUL} },
+    { &fnv_test_str[159], (Fnv64_t) {0x82e20ab8UL, 0xf81175a4UL} },
+    { &fnv_test_str[160], (Fnv64_t) {0x22e73048UL, 0x5bbb3de7UL} },
+    { &fnv_test_str[161], (Fnv64_t) {0x92b9f2beUL, 0x6b4f3634UL} },
+    { &fnv_test_str[162], (Fnv64_t) {0x73d59875UL, 0xc2d559dfUL} },
+    { &fnv_test_str[163], (Fnv64_t) {0x4bc7a8c2UL, 0xf75f6228UL} },
+    { &fnv_test_str[164], (Fnv64_t) {0x16a9f1ccUL, 0xda8dd8e1UL} },
+    { &fnv_test_str[165], (Fnv64_t) {0x76057885UL, 0xbdc1e6abUL} },
+    { &fnv_test_str[166], (Fnv64_t) {0x8a1224a0UL, 0xfec6a423UL} },
+    { &fnv_test_str[167], (Fnv64_t) {0x223e290eUL, 0xc03f40f3UL} },
+    { &fnv_test_str[168], (Fnv64_t) {0x466ffda9UL, 0x1ed21673UL} },
+    { &fnv_test_str[169], (Fnv64_t) {0xbb0dd2afUL, 0xdf70f906UL} },
+    { &fnv_test_str[170], (Fnv64_t) {0x9f2af666UL, 0xf3dcda36UL} },
+    { &fnv_test_str[171], (Fnv64_t) {0x3cdcebdeUL, 0x9ebb1157UL} },
+    { &fnv_test_str[172], (Fnv64_t) {0x77fedca0UL, 0x81c72d90UL} },
+    { &fnv_test_str[173], (Fnv64_t) {0x1be5fb15UL, 0x0ec074a3UL} },
+    { &fnv_test_str[174], (Fnv64_t) {0xb6c48f20UL, 0x2a8b3280UL} },
+    { &fnv_test_str[175], (Fnv64_t) {0x13309344UL, 0xfd317775UL} },
+    { &fnv_test_str[176], (Fnv64_t) {0x6ad006b6UL, 0x194534a8UL} },
+    { &fnv_test_str[177], (Fnv64_t) {0x6e0cfe12UL, 0x3be6fdf4UL} },
+    { &fnv_test_str[178], (Fnv64_t) {0xa07eb057UL, 0x017cc137UL} },
+    { &fnv_test_str[179], (Fnv64_t) {0x7d26b54dUL, 0x9428fc6eUL} },
+    { &fnv_test_str[180], (Fnv64_t) {0x03ef8ad7UL, 0x9aaa2e36UL} },
+    { &fnv_test_str[181], (Fnv64_t) {0xa0ccdf7dUL, 0x82c6d3f3UL} },
+    { &fnv_test_str[182], (Fnv64_t) {0x0cf09b65UL, 0xc86eeea0UL} },
+    { &fnv_test_str[183], (Fnv64_t) {0xdbb58299UL, 0x705f8189UL} },
+    { &fnv_test_str[184], (Fnv64_t) {0x4391ca69UL, 0x415a7f55UL} },
+    { &fnv_test_str[185], (Fnv64_t) {0xa2bdc555UL, 0xcfe3d49fUL} },
+    { &fnv_test_str[186], (Fnv64_t) {0x39b25191UL, 0xf0f9c560UL} },
+    { &fnv_test_str[187], (Fnv64_t) {0xbd1d32d9UL, 0x7075cb6aUL} },
+    { &fnv_test_str[188], (Fnv64_t) {0x8b277509UL, 0x43c94e2cUL} },
+    { &fnv_test_str[189], (Fnv64_t) {0xea670359UL, 0x3cbfd4e4UL} },
+    { &fnv_test_str[190], (Fnv64_t) {0x0f4d019dUL, 0xc0588781UL} },
+    { &fnv_test_str[191], (Fnv64_t) {0x3ac22dc5UL, 0x14468ff9UL} },
+    { &fnv_test_str[192], (Fnv64_t) {0x89d99c05UL, 0xebed6995UL} },
+    { &fnv_test_str[193], (Fnv64_t) {0x321ca5d5UL, 0x6d99f6dfUL} },
+    { &fnv_test_str[194], (Fnv64_t) {0x8c36d625UL, 0x0cd410d0UL} },
+    { &fnv_test_str[195], (Fnv64_t) {0x86831d35UL, 0xef1b2a2cUL} },
+    { &fnv_test_str[196], (Fnv64_t) {0x69ee5f05UL, 0x3b349c4dUL} },
+    { &fnv_test_str[197], (Fnv64_t) {0x8f45f035UL, 0x55248ce8UL} },
+    { &fnv_test_str[198], (Fnv64_t) {0x18a4c885UL, 0xaa69ca6aUL} },
+    { &fnv_test_str[199], (Fnv64_t) {0x2bd816b5UL, 0x1fe3fce6UL} },
+    { &fnv_test_str[200], (Fnv64_t) {0xa8df69d9UL, 0x0289a488UL} },
+    { &fnv_test_str[201], (Fnv64_t) {0x13df98b5UL, 0x15e96e16UL} },
+    { &fnv_test_str[202], (Fnv64_t) {0x5ad89b99UL, 0xe6be5737UL} },
+    { NULL, (Fnv64_t) {0,0} }
+};
+#endif /* HAVE_64BIT_LONG_LONG */
+
+/* FNV-1a 64 bit test vectors */
+#if defined(HAVE_64BIT_LONG_LONG)
+struct fnv1a_64_test_vector fnv1a_64_vector[] = {
+    { &fnv_test_str[0], (Fnv64_t) 0xcbf29ce484222325ULL },
+    { &fnv_test_str[1], (Fnv64_t) 0xaf63dc4c8601ec8cULL },
+    { &fnv_test_str[2], (Fnv64_t) 0xaf63df4c8601f1a5ULL },
+    { &fnv_test_str[3], (Fnv64_t) 0xaf63de4c8601eff2ULL },
+    { &fnv_test_str[4], (Fnv64_t) 0xaf63d94c8601e773ULL },
+    { &fnv_test_str[5], (Fnv64_t) 0xaf63d84c8601e5c0ULL },
+    { &fnv_test_str[6], (Fnv64_t) 0xaf63db4c8601ead9ULL },
+    { &fnv_test_str[7], (Fnv64_t) 0x08985907b541d342ULL },
+    { &fnv_test_str[8], (Fnv64_t) 0xdcb27518fed9d577ULL },
+    { &fnv_test_str[9], (Fnv64_t) 0xdd120e790c2512afULL },
+    { &fnv_test_str[10], (Fnv64_t) 0xcac165afa2fef40aULL },
+    { &fnv_test_str[11], (Fnv64_t) 0x85944171f73967e8ULL },
+    { &fnv_test_str[12], (Fnv64_t) 0xaf63bd4c8601b7dfULL },
+    { &fnv_test_str[13], (Fnv64_t) 0x089be207b544f1e4ULL },
+    { &fnv_test_str[14], (Fnv64_t) 0x08a61407b54d9b5fULL },
+    { &fnv_test_str[15], (Fnv64_t) 0x08a2ae07b54ab836ULL },
+    { &fnv_test_str[16], (Fnv64_t) 0x0891b007b53c4869ULL },
+    { &fnv_test_str[17], (Fnv64_t) 0x088e4a07b5396540ULL },
+    { &fnv_test_str[18], (Fnv64_t) 0x08987c07b5420ebbULL },
+    { &fnv_test_str[19], (Fnv64_t) 0xdcb28a18fed9f926ULL },
+    { &fnv_test_str[20], (Fnv64_t) 0xdd1270790c25b935ULL },
+    { &fnv_test_str[21], (Fnv64_t) 0xcac146afa2febf5dULL },
+    { &fnv_test_str[22], (Fnv64_t) 0x8593d371f738acfeULL },
+    { &fnv_test_str[23], (Fnv64_t) 0x34531ca7168b8f38ULL },
+    { &fnv_test_str[24], (Fnv64_t) 0x08a25607b54a22aeULL },
+    { &fnv_test_str[25], (Fnv64_t) 0xf5faf0190cf90df3ULL },
+    { &fnv_test_str[26], (Fnv64_t) 0xf27397910b3221c7ULL },
+    { &fnv_test_str[27], (Fnv64_t) 0x2c8c2b76062f22e0ULL },
+    { &fnv_test_str[28], (Fnv64_t) 0xe150688c8217b8fdULL },
+    { &fnv_test_str[29], (Fnv64_t) 0xf35a83c10e4f1f87ULL },
+    { &fnv_test_str[30], (Fnv64_t) 0xd1edd10b507344d0ULL },
+    { &fnv_test_str[31], (Fnv64_t) 0x2a5ee739b3ddb8c3ULL },
+    { &fnv_test_str[32], (Fnv64_t) 0xdcfb970ca1c0d310ULL },
+    { &fnv_test_str[33], (Fnv64_t) 0x4054da76daa6da90ULL },
+    { &fnv_test_str[34], (Fnv64_t) 0xf70a2ff589861368ULL },
+    { &fnv_test_str[35], (Fnv64_t) 0x4c628b38aed25f17ULL },
+    { &fnv_test_str[36], (Fnv64_t) 0x9dd1f6510f78189fULL },
+    { &fnv_test_str[37], (Fnv64_t) 0xa3de85bd491270ceULL },
+    { &fnv_test_str[38], (Fnv64_t) 0x858e2fa32a55e61dULL },
+    { &fnv_test_str[39], (Fnv64_t) 0x46810940eff5f915ULL },
+    { &fnv_test_str[40], (Fnv64_t) 0xf5fadd190cf8edaaULL },
+    { &fnv_test_str[41], (Fnv64_t) 0xf273ed910b32b3e9ULL },
+    { &fnv_test_str[42], (Fnv64_t) 0x2c8c5276062f6525ULL },
+    { &fnv_test_str[43], (Fnv64_t) 0xe150b98c821842a0ULL },
+    { &fnv_test_str[44], (Fnv64_t) 0xf35aa3c10e4f55e7ULL },
+    { &fnv_test_str[45], (Fnv64_t) 0xd1ed680b50729265ULL },
+    { &fnv_test_str[46], (Fnv64_t) 0x2a5f0639b3dded70ULL },
+    { &fnv_test_str[47], (Fnv64_t) 0xdcfbaa0ca1c0f359ULL },
+    { &fnv_test_str[48], (Fnv64_t) 0x4054ba76daa6a430ULL },
+    { &fnv_test_str[49], (Fnv64_t) 0xf709c7f5898562b0ULL },
+    { &fnv_test_str[50], (Fnv64_t) 0x4c62e638aed2f9b8ULL },
+    { &fnv_test_str[51], (Fnv64_t) 0x9dd1a8510f779415ULL },
+    { &fnv_test_str[52], (Fnv64_t) 0xa3de2abd4911d62dULL },
+    { &fnv_test_str[53], (Fnv64_t) 0x858e0ea32a55ae0aULL },
+    { &fnv_test_str[54], (Fnv64_t) 0x46810f40eff60347ULL },
+    { &fnv_test_str[55], (Fnv64_t) 0xc33bce57bef63eafULL },
+    { &fnv_test_str[56], (Fnv64_t) 0x08a24307b54a0265ULL },
+    { &fnv_test_str[57], (Fnv64_t) 0xf5b9fd190cc18d15ULL },
+    { &fnv_test_str[58], (Fnv64_t) 0x4c968290ace35703ULL },
+    { &fnv_test_str[59], (Fnv64_t) 0x07174bd5c64d9350ULL },
+    { &fnv_test_str[60], (Fnv64_t) 0x5a294c3ff5d18750ULL },
+    { &fnv_test_str[61], (Fnv64_t) 0x05b3c1aeb308b843ULL },
+    { &fnv_test_str[62], (Fnv64_t) 0xb92a48da37d0f477ULL },
+    { &fnv_test_str[63], (Fnv64_t) 0x73cdddccd80ebc49ULL },
+    { &fnv_test_str[64], (Fnv64_t) 0xd58c4c13210a266bULL },
+    { &fnv_test_str[65], (Fnv64_t) 0xe78b6081243ec194ULL },
+    { &fnv_test_str[66], (Fnv64_t) 0xb096f77096a39f34ULL },
+    { &fnv_test_str[67], (Fnv64_t) 0xb425c54ff807b6a3ULL },
+    { &fnv_test_str[68], (Fnv64_t) 0x23e520e2751bb46eULL },
+    { &fnv_test_str[69], (Fnv64_t) 0x1a0b44ccfe1385ecULL },
+    { &fnv_test_str[70], (Fnv64_t) 0xf5ba4b190cc2119fULL },
+    { &fnv_test_str[71], (Fnv64_t) 0x4c962690ace2baafULL },
+    { &fnv_test_str[72], (Fnv64_t) 0x0716ded5c64cda19ULL },
+    { &fnv_test_str[73], (Fnv64_t) 0x5a292c3ff5d150f0ULL },
+    { &fnv_test_str[74], (Fnv64_t) 0x05b3e0aeb308ecf0ULL },
+    { &fnv_test_str[75], (Fnv64_t) 0xb92a5eda37d119d9ULL },
+    { &fnv_test_str[76], (Fnv64_t) 0x73ce41ccd80f6635ULL },
+    { &fnv_test_str[77], (Fnv64_t) 0xd58c2c132109f00bULL },
+    { &fnv_test_str[78], (Fnv64_t) 0xe78baf81243f47d1ULL },
+    { &fnv_test_str[79], (Fnv64_t) 0xb0968f7096a2ee7cULL },
+    { &fnv_test_str[80], (Fnv64_t) 0xb425a84ff807855cULL },
+    { &fnv_test_str[81], (Fnv64_t) 0x23e4e9e2751b56f9ULL },
+    { &fnv_test_str[82], (Fnv64_t) 0x1a0b4eccfe1396eaULL },
+    { &fnv_test_str[83], (Fnv64_t) 0x54abd453bb2c9004ULL },
+    { &fnv_test_str[84], (Fnv64_t) 0x08ba5f07b55ec3daULL },
+    { &fnv_test_str[85], (Fnv64_t) 0x337354193006cb6eULL },
+    { &fnv_test_str[86], (Fnv64_t) 0xa430d84680aabd0bULL },
+    { &fnv_test_str[87], (Fnv64_t) 0xa9bc8acca21f39b1ULL },
+    { &fnv_test_str[88], (Fnv64_t) 0x6961196491cc682dULL },
+    { &fnv_test_str[89], (Fnv64_t) 0xad2bb1774799dfe9ULL },
+    { &fnv_test_str[90], (Fnv64_t) 0x6961166491cc6314ULL },
+    { &fnv_test_str[91], (Fnv64_t) 0x8d1bb3904a3b1236ULL },
+    { &fnv_test_str[92], (Fnv64_t) 0x6961176491cc64c7ULL },
+    { &fnv_test_str[93], (Fnv64_t) 0xed205d87f40434c7ULL },
+    { &fnv_test_str[94], (Fnv64_t) 0x6961146491cc5faeULL },
+    { &fnv_test_str[95], (Fnv64_t) 0xcd3baf5e44f8ad9cULL },
+    { &fnv_test_str[96], (Fnv64_t) 0xe3b36596127cd6d8ULL },
+    { &fnv_test_str[97], (Fnv64_t) 0xf77f1072c8e8a646ULL },
+    { &fnv_test_str[98], (Fnv64_t) 0xe3b36396127cd372ULL },
+    { &fnv_test_str[99], (Fnv64_t) 0x6067dce9932ad458ULL },
+    { &fnv_test_str[100], (Fnv64_t) 0xe3b37596127cf208ULL },
+    { &fnv_test_str[101], (Fnv64_t) 0x4b7b10fa9fe83936ULL },
+    { &fnv_test_str[102], (Fnv64_t) 0xaabafe7104d914beULL },
+    { &fnv_test_str[103], (Fnv64_t) 0xf4d3180b3cde3edaULL },
+    { &fnv_test_str[104], (Fnv64_t) 0xaabafd7104d9130bULL },
+    { &fnv_test_str[105], (Fnv64_t) 0xf4cfb20b3cdb5bb1ULL },
+    { &fnv_test_str[106], (Fnv64_t) 0xaabafc7104d91158ULL },
+    { &fnv_test_str[107], (Fnv64_t) 0xf4cc4c0b3cd87888ULL },
+    { &fnv_test_str[108], (Fnv64_t) 0xe729bac5d2a8d3a7ULL },
+    { &fnv_test_str[109], (Fnv64_t) 0x74bc0524f4dfa4c5ULL },
+    { &fnv_test_str[110], (Fnv64_t) 0xe72630c5d2a5b352ULL },
+    { &fnv_test_str[111], (Fnv64_t) 0x6b983224ef8fb456ULL },
+    { &fnv_test_str[112], (Fnv64_t) 0xe73042c5d2ae266dULL },
+    { &fnv_test_str[113], (Fnv64_t) 0x8527e324fdeb4b37ULL },
+    { &fnv_test_str[114], (Fnv64_t) 0x0a83c86fee952abcULL },
+    { &fnv_test_str[115], (Fnv64_t) 0x7318523267779d74ULL },
+    { &fnv_test_str[116], (Fnv64_t) 0x3e66d3d56b8caca1ULL },
+    { &fnv_test_str[117], (Fnv64_t) 0x956694a5c0095593ULL },
+    { &fnv_test_str[118], (Fnv64_t) 0xcac54572bb1a6fc8ULL },
+    { &fnv_test_str[119], (Fnv64_t) 0xa7a4c9f3edebf0d8ULL },
+    { &fnv_test_str[120], (Fnv64_t) 0x7829851fac17b143ULL },
+    { &fnv_test_str[121], (Fnv64_t) 0x2c8f4c9af81bcf06ULL },
+    { &fnv_test_str[122], (Fnv64_t) 0xd34e31539740c732ULL },
+    { &fnv_test_str[123], (Fnv64_t) 0x3605a2ac253d2db1ULL },
+    { &fnv_test_str[124], (Fnv64_t) 0x08c11b8346f4a3c3ULL },
+    { &fnv_test_str[125], (Fnv64_t) 0x6be396289ce8a6daULL },
+    { &fnv_test_str[126], (Fnv64_t) 0xd9b957fb7fe794c5ULL },
+    { &fnv_test_str[127], (Fnv64_t) 0x05be33da04560a93ULL },
+    { &fnv_test_str[128], (Fnv64_t) 0x0957f1577ba9747cULL },
+    { &fnv_test_str[129], (Fnv64_t) 0xda2cc3acc24fba57ULL },
+    { &fnv_test_str[130], (Fnv64_t) 0x74136f185b29e7f0ULL },
+    { &fnv_test_str[131], (Fnv64_t) 0xb2f2b4590edb93b2ULL },
+    { &fnv_test_str[132], (Fnv64_t) 0xb3608fce8b86ae04ULL },
+    { &fnv_test_str[133], (Fnv64_t) 0x4a3a865079359063ULL },
+    { &fnv_test_str[134], (Fnv64_t) 0x5b3a7ef496880a50ULL },
+    { &fnv_test_str[135], (Fnv64_t) 0x48fae3163854c23bULL },
+    { &fnv_test_str[136], (Fnv64_t) 0x07aaa640476e0b9aULL },
+    { &fnv_test_str[137], (Fnv64_t) 0x2f653656383a687dULL },
+    { &fnv_test_str[138], (Fnv64_t) 0xa1031f8e7599d79cULL },
+    { &fnv_test_str[139], (Fnv64_t) 0xa31908178ff92477ULL },
+    { &fnv_test_str[140], (Fnv64_t) 0x097edf3c14c3fb83ULL },
+    { &fnv_test_str[141], (Fnv64_t) 0xb51ca83feaa0971bULL },
+    { &fnv_test_str[142], (Fnv64_t) 0xdd3c0d96d784f2e9ULL },
+    { &fnv_test_str[143], (Fnv64_t) 0x86cd26a9ea767d78ULL },
+    { &fnv_test_str[144], (Fnv64_t) 0xe6b215ff54a30c18ULL },
+    { &fnv_test_str[145], (Fnv64_t) 0xec5b06a1c5531093ULL },
+    { &fnv_test_str[146], (Fnv64_t) 0x45665a929f9ec5e5ULL },
+    { &fnv_test_str[147], (Fnv64_t) 0x8c7609b4a9f10907ULL },
+    { &fnv_test_str[148], (Fnv64_t) 0x89aac3a491f0d729ULL },
+    { &fnv_test_str[149], (Fnv64_t) 0x32ce6b26e0f4a403ULL },
+    { &fnv_test_str[150], (Fnv64_t) 0x614ab44e02b53e01ULL },
+    { &fnv_test_str[151], (Fnv64_t) 0xfa6472eb6eef3290ULL },
+    { &fnv_test_str[152], (Fnv64_t) 0x9e5d75eb1948eb6aULL },
+    { &fnv_test_str[153], (Fnv64_t) 0xb6d12ad4a8671852ULL },
+    { &fnv_test_str[154], (Fnv64_t) 0x88826f56eba07af1ULL },
+    { &fnv_test_str[155], (Fnv64_t) 0x44535bf2645bc0fdULL },
+    { &fnv_test_str[156], (Fnv64_t) 0x169388ffc21e3728ULL },
+    { &fnv_test_str[157], (Fnv64_t) 0xf68aac9e396d8224ULL },
+    { &fnv_test_str[158], (Fnv64_t) 0x8e87d7e7472b3883ULL },
+    { &fnv_test_str[159], (Fnv64_t) 0x295c26caa8b423deULL },
+    { &fnv_test_str[160], (Fnv64_t) 0x322c814292e72176ULL },
+    { &fnv_test_str[161], (Fnv64_t) 0x8a06550eb8af7268ULL },
+    { &fnv_test_str[162], (Fnv64_t) 0xef86d60e661bcf71ULL },
+    { &fnv_test_str[163], (Fnv64_t) 0x9e5426c87f30ee54ULL },
+    { &fnv_test_str[164], (Fnv64_t) 0xf1ea8aa826fd047eULL },
+    { &fnv_test_str[165], (Fnv64_t) 0x0babaf9a642cb769ULL },
+    { &fnv_test_str[166], (Fnv64_t) 0x4b3341d4068d012eULL },
+    { &fnv_test_str[167], (Fnv64_t) 0xd15605cbc30a335cULL },
+    { &fnv_test_str[168], (Fnv64_t) 0x5b21060aed8412e5ULL },
+    { &fnv_test_str[169], (Fnv64_t) 0x45e2cda1ce6f4227ULL },
+    { &fnv_test_str[170], (Fnv64_t) 0x50ae3745033ad7d4ULL },
+    { &fnv_test_str[171], (Fnv64_t) 0xaa4588ced46bf414ULL },
+    { &fnv_test_str[172], (Fnv64_t) 0xc1b0056c4a95467eULL },
+    { &fnv_test_str[173], (Fnv64_t) 0x56576a71de8b4089ULL },
+    { &fnv_test_str[174], (Fnv64_t) 0xbf20965fa6dc927eULL },
+    { &fnv_test_str[175], (Fnv64_t) 0x569f8383c2040882ULL },
+    { &fnv_test_str[176], (Fnv64_t) 0xe1e772fba08feca0ULL },
+    { &fnv_test_str[177], (Fnv64_t) 0x4ced94af97138ac4ULL },
+    { &fnv_test_str[178], (Fnv64_t) 0xc4112ffb337a82fbULL },
+    { &fnv_test_str[179], (Fnv64_t) 0xd64a4fd41de38b7dULL },
+    { &fnv_test_str[180], (Fnv64_t) 0x4cfc32329edebcbbULL },
+    { &fnv_test_str[181], (Fnv64_t) 0x0803564445050395ULL },
+    { &fnv_test_str[182], (Fnv64_t) 0xaa1574ecf4642ffdULL },
+    { &fnv_test_str[183], (Fnv64_t) 0x694bc4e54cc315f9ULL },
+    { &fnv_test_str[184], (Fnv64_t) 0xa3d7cb273b011721ULL },
+    { &fnv_test_str[185], (Fnv64_t) 0x577c2f8b6115bfa5ULL },
+    { &fnv_test_str[186], (Fnv64_t) 0xb7ec8c1a769fb4c1ULL },
+    { &fnv_test_str[187], (Fnv64_t) 0x5d5cfce63359ab19ULL },
+    { &fnv_test_str[188], (Fnv64_t) 0x33b96c3cd65b5f71ULL },
+    { &fnv_test_str[189], (Fnv64_t) 0xd845097780602bb9ULL },
+    { &fnv_test_str[190], (Fnv64_t) 0x84d47645d02da3d5ULL },
+    { &fnv_test_str[191], (Fnv64_t) 0x83544f33b58773a5ULL },
+    { &fnv_test_str[192], (Fnv64_t) 0x9175cbb2160836c5ULL },
+    { &fnv_test_str[193], (Fnv64_t) 0xc71b3bc175e72bc5ULL },
+    { &fnv_test_str[194], (Fnv64_t) 0x636806ac222ec985ULL },
+    { &fnv_test_str[195], (Fnv64_t) 0xb6ef0e6950f52ed5ULL },
+    { &fnv_test_str[196], (Fnv64_t) 0xead3d8a0f3dfdaa5ULL },
+    { &fnv_test_str[197], (Fnv64_t) 0x922908fe9a861ba5ULL },
+    { &fnv_test_str[198], (Fnv64_t) 0x6d4821de275fd5c5ULL },
+    { &fnv_test_str[199], (Fnv64_t) 0x1fe3fce62bd816b5ULL },
+    { &fnv_test_str[200], (Fnv64_t) 0xc23e9fccd6f70591ULL },
+    { &fnv_test_str[201], (Fnv64_t) 0xc1af12bdfe16b5b5ULL },
+    { &fnv_test_str[202], (Fnv64_t) 0x39e9f18f2f85e221ULL },
+    { NULL, (Fnv64_t) 0 }
+};
+#else /* HAVE_64BIT_LONG_LONG */
+struct fnv1a_64_test_vector fnv1a_64_vector[] = {
+    { &fnv_test_str[0], (Fnv64_t) {0x84222325UL, 0xcbf29ce4UL} },
+    { &fnv_test_str[1], (Fnv64_t) {0x8601ec8cUL, 0xaf63dc4cUL} },
+    { &fnv_test_str[2], (Fnv64_t) {0x8601f1a5UL, 0xaf63df4cUL} },
+    { &fnv_test_str[3], (Fnv64_t) {0x8601eff2UL, 0xaf63de4cUL} },
+    { &fnv_test_str[4], (Fnv64_t) {0x8601e773UL, 0xaf63d94cUL} },
+    { &fnv_test_str[5], (Fnv64_t) {0x8601e5c0UL, 0xaf63d84cUL} },
+    { &fnv_test_str[6], (Fnv64_t) {0x8601ead9UL, 0xaf63db4cUL} },
+    { &fnv_test_str[7], (Fnv64_t) {0xb541d342UL, 0x08985907UL} },
+    { &fnv_test_str[8], (Fnv64_t) {0xfed9d577UL, 0xdcb27518UL} },
+    { &fnv_test_str[9], (Fnv64_t) {0x0c2512afUL, 0xdd120e79UL} },
+    { &fnv_test_str[10], (Fnv64_t) {0xa2fef40aUL, 0xcac165afUL} },
+    { &fnv_test_str[11], (Fnv64_t) {0xf73967e8UL, 0x85944171UL} },
+    { &fnv_test_str[12], (Fnv64_t) {0x8601b7dfUL, 0xaf63bd4cUL} },
+    { &fnv_test_str[13], (Fnv64_t) {0xb544f1e4UL, 0x089be207UL} },
+    { &fnv_test_str[14], (Fnv64_t) {0xb54d9b5fUL, 0x08a61407UL} },
+    { &fnv_test_str[15], (Fnv64_t) {0xb54ab836UL, 0x08a2ae07UL} },
+    { &fnv_test_str[16], (Fnv64_t) {0xb53c4869UL, 0x0891b007UL} },
+    { &fnv_test_str[17], (Fnv64_t) {0xb5396540UL, 0x088e4a07UL} },
+    { &fnv_test_str[18], (Fnv64_t) {0xb5420ebbUL, 0x08987c07UL} },
+    { &fnv_test_str[19], (Fnv64_t) {0xfed9f926UL, 0xdcb28a18UL} },
+    { &fnv_test_str[20], (Fnv64_t) {0x0c25b935UL, 0xdd127079UL} },
+    { &fnv_test_str[21], (Fnv64_t) {0xa2febf5dUL, 0xcac146afUL} },
+    { &fnv_test_str[22], (Fnv64_t) {0xf738acfeUL, 0x8593d371UL} },
+    { &fnv_test_str[23], (Fnv64_t) {0x168b8f38UL, 0x34531ca7UL} },
+    { &fnv_test_str[24], (Fnv64_t) {0xb54a22aeUL, 0x08a25607UL} },
+    { &fnv_test_str[25], (Fnv64_t) {0x0cf90df3UL, 0xf5faf019UL} },
+    { &fnv_test_str[26], (Fnv64_t) {0x0b3221c7UL, 0xf2739791UL} },
+    { &fnv_test_str[27], (Fnv64_t) {0x062f22e0UL, 0x2c8c2b76UL} },
+    { &fnv_test_str[28], (Fnv64_t) {0x8217b8fdUL, 0xe150688cUL} },
+    { &fnv_test_str[29], (Fnv64_t) {0x0e4f1f87UL, 0xf35a83c1UL} },
+    { &fnv_test_str[30], (Fnv64_t) {0x507344d0UL, 0xd1edd10bUL} },
+    { &fnv_test_str[31], (Fnv64_t) {0xb3ddb8c3UL, 0x2a5ee739UL} },
+    { &fnv_test_str[32], (Fnv64_t) {0xa1c0d310UL, 0xdcfb970cUL} },
+    { &fnv_test_str[33], (Fnv64_t) {0xdaa6da90UL, 0x4054da76UL} },
+    { &fnv_test_str[34], (Fnv64_t) {0x89861368UL, 0xf70a2ff5UL} },
+    { &fnv_test_str[35], (Fnv64_t) {0xaed25f17UL, 0x4c628b38UL} },
+    { &fnv_test_str[36], (Fnv64_t) {0x0f78189fUL, 0x9dd1f651UL} },
+    { &fnv_test_str[37], (Fnv64_t) {0x491270ceUL, 0xa3de85bdUL} },
+    { &fnv_test_str[38], (Fnv64_t) {0x2a55e61dUL, 0x858e2fa3UL} },
+    { &fnv_test_str[39], (Fnv64_t) {0xeff5f915UL, 0x46810940UL} },
+    { &fnv_test_str[40], (Fnv64_t) {0x0cf8edaaUL, 0xf5fadd19UL} },
+    { &fnv_test_str[41], (Fnv64_t) {0x0b32b3e9UL, 0xf273ed91UL} },
+    { &fnv_test_str[42], (Fnv64_t) {0x062f6525UL, 0x2c8c5276UL} },
+    { &fnv_test_str[43], (Fnv64_t) {0x821842a0UL, 0xe150b98cUL} },
+    { &fnv_test_str[44], (Fnv64_t) {0x0e4f55e7UL, 0xf35aa3c1UL} },
+    { &fnv_test_str[45], (Fnv64_t) {0x50729265UL, 0xd1ed680bUL} },
+    { &fnv_test_str[46], (Fnv64_t) {0xb3dded70UL, 0x2a5f0639UL} },
+    { &fnv_test_str[47], (Fnv64_t) {0xa1c0f359UL, 0xdcfbaa0cUL} },
+    { &fnv_test_str[48], (Fnv64_t) {0xdaa6a430UL, 0x4054ba76UL} },
+    { &fnv_test_str[49], (Fnv64_t) {0x898562b0UL, 0xf709c7f5UL} },
+    { &fnv_test_str[50], (Fnv64_t) {0xaed2f9b8UL, 0x4c62e638UL} },
+    { &fnv_test_str[51], (Fnv64_t) {0x0f779415UL, 0x9dd1a851UL} },
+    { &fnv_test_str[52], (Fnv64_t) {0x4911d62dUL, 0xa3de2abdUL} },
+    { &fnv_test_str[53], (Fnv64_t) {0x2a55ae0aUL, 0x858e0ea3UL} },
+    { &fnv_test_str[54], (Fnv64_t) {0xeff60347UL, 0x46810f40UL} },
+    { &fnv_test_str[55], (Fnv64_t) {0xbef63eafUL, 0xc33bce57UL} },
+    { &fnv_test_str[56], (Fnv64_t) {0xb54a0265UL, 0x08a24307UL} },
+    { &fnv_test_str[57], (Fnv64_t) {0x0cc18d15UL, 0xf5b9fd19UL} },
+    { &fnv_test_str[58], (Fnv64_t) {0xace35703UL, 0x4c968290UL} },
+    { &fnv_test_str[59], (Fnv64_t) {0xc64d9350UL, 0x07174bd5UL} },
+    { &fnv_test_str[60], (Fnv64_t) {0xf5d18750UL, 0x5a294c3fUL} },
+    { &fnv_test_str[61], (Fnv64_t) {0xb308b843UL, 0x05b3c1aeUL} },
+    { &fnv_test_str[62], (Fnv64_t) {0x37d0f477UL, 0xb92a48daUL} },
+    { &fnv_test_str[63], (Fnv64_t) {0xd80ebc49UL, 0x73cdddccUL} },
+    { &fnv_test_str[64], (Fnv64_t) {0x210a266bUL, 0xd58c4c13UL} },
+    { &fnv_test_str[65], (Fnv64_t) {0x243ec194UL, 0xe78b6081UL} },
+    { &fnv_test_str[66], (Fnv64_t) {0x96a39f34UL, 0xb096f770UL} },
+    { &fnv_test_str[67], (Fnv64_t) {0xf807b6a3UL, 0xb425c54fUL} },
+    { &fnv_test_str[68], (Fnv64_t) {0x751bb46eUL, 0x23e520e2UL} },
+    { &fnv_test_str[69], (Fnv64_t) {0xfe1385ecUL, 0x1a0b44ccUL} },
+    { &fnv_test_str[70], (Fnv64_t) {0x0cc2119fUL, 0xf5ba4b19UL} },
+    { &fnv_test_str[71], (Fnv64_t) {0xace2baafUL, 0x4c962690UL} },
+    { &fnv_test_str[72], (Fnv64_t) {0xc64cda19UL, 0x0716ded5UL} },
+    { &fnv_test_str[73], (Fnv64_t) {0xf5d150f0UL, 0x5a292c3fUL} },
+    { &fnv_test_str[74], (Fnv64_t) {0xb308ecf0UL, 0x05b3e0aeUL} },
+    { &fnv_test_str[75], (Fnv64_t) {0x37d119d9UL, 0xb92a5edaUL} },
+    { &fnv_test_str[76], (Fnv64_t) {0xd80f6635UL, 0x73ce41ccUL} },
+    { &fnv_test_str[77], (Fnv64_t) {0x2109f00bUL, 0xd58c2c13UL} },
+    { &fnv_test_str[78], (Fnv64_t) {0x243f47d1UL, 0xe78baf81UL} },
+    { &fnv_test_str[79], (Fnv64_t) {0x96a2ee7cUL, 0xb0968f70UL} },
+    { &fnv_test_str[80], (Fnv64_t) {0xf807855cUL, 0xb425a84fUL} },
+    { &fnv_test_str[81], (Fnv64_t) {0x751b56f9UL, 0x23e4e9e2UL} },
+    { &fnv_test_str[82], (Fnv64_t) {0xfe1396eaUL, 0x1a0b4eccUL} },
+    { &fnv_test_str[83], (Fnv64_t) {0xbb2c9004UL, 0x54abd453UL} },
+    { &fnv_test_str[84], (Fnv64_t) {0xb55ec3daUL, 0x08ba5f07UL} },
+    { &fnv_test_str[85], (Fnv64_t) {0x3006cb6eUL, 0x33735419UL} },
+    { &fnv_test_str[86], (Fnv64_t) {0x80aabd0bUL, 0xa430d846UL} },
+    { &fnv_test_str[87], (Fnv64_t) {0xa21f39b1UL, 0xa9bc8accUL} },
+    { &fnv_test_str[88], (Fnv64_t) {0x91cc682dUL, 0x69611964UL} },
+    { &fnv_test_str[89], (Fnv64_t) {0x4799dfe9UL, 0xad2bb177UL} },
+    { &fnv_test_str[90], (Fnv64_t) {0x91cc6314UL, 0x69611664UL} },
+    { &fnv_test_str[91], (Fnv64_t) {0x4a3b1236UL, 0x8d1bb390UL} },
+    { &fnv_test_str[92], (Fnv64_t) {0x91cc64c7UL, 0x69611764UL} },
+    { &fnv_test_str[93], (Fnv64_t) {0xf40434c7UL, 0xed205d87UL} },
+    { &fnv_test_str[94], (Fnv64_t) {0x91cc5faeUL, 0x69611464UL} },
+    { &fnv_test_str[95], (Fnv64_t) {0x44f8ad9cUL, 0xcd3baf5eUL} },
+    { &fnv_test_str[96], (Fnv64_t) {0x127cd6d8UL, 0xe3b36596UL} },
+    { &fnv_test_str[97], (Fnv64_t) {0xc8e8a646UL, 0xf77f1072UL} },
+    { &fnv_test_str[98], (Fnv64_t) {0x127cd372UL, 0xe3b36396UL} },
+    { &fnv_test_str[99], (Fnv64_t) {0x932ad458UL, 0x6067dce9UL} },
+    { &fnv_test_str[100], (Fnv64_t) {0x127cf208UL, 0xe3b37596UL} },
+    { &fnv_test_str[101], (Fnv64_t) {0x9fe83936UL, 0x4b7b10faUL} },
+    { &fnv_test_str[102], (Fnv64_t) {0x04d914beUL, 0xaabafe71UL} },
+    { &fnv_test_str[103], (Fnv64_t) {0x3cde3edaUL, 0xf4d3180bUL} },
+    { &fnv_test_str[104], (Fnv64_t) {0x04d9130bUL, 0xaabafd71UL} },
+    { &fnv_test_str[105], (Fnv64_t) {0x3cdb5bb1UL, 0xf4cfb20bUL} },
+    { &fnv_test_str[106], (Fnv64_t) {0x04d91158UL, 0xaabafc71UL} },
+    { &fnv_test_str[107], (Fnv64_t) {0x3cd87888UL, 0xf4cc4c0bUL} },
+    { &fnv_test_str[108], (Fnv64_t) {0xd2a8d3a7UL, 0xe729bac5UL} },
+    { &fnv_test_str[109], (Fnv64_t) {0xf4dfa4c5UL, 0x74bc0524UL} },
+    { &fnv_test_str[110], (Fnv64_t) {0xd2a5b352UL, 0xe72630c5UL} },
+    { &fnv_test_str[111], (Fnv64_t) {0xef8fb456UL, 0x6b983224UL} },
+    { &fnv_test_str[112], (Fnv64_t) {0xd2ae266dUL, 0xe73042c5UL} },
+    { &fnv_test_str[113], (Fnv64_t) {0xfdeb4b37UL, 0x8527e324UL} },
+    { &fnv_test_str[114], (Fnv64_t) {0xee952abcUL, 0x0a83c86fUL} },
+    { &fnv_test_str[115], (Fnv64_t) {0x67779d74UL, 0x73185232UL} },
+    { &fnv_test_str[116], (Fnv64_t) {0x6b8caca1UL, 0x3e66d3d5UL} },
+    { &fnv_test_str[117], (Fnv64_t) {0xc0095593UL, 0x956694a5UL} },
+    { &fnv_test_str[118], (Fnv64_t) {0xbb1a6fc8UL, 0xcac54572UL} },
+    { &fnv_test_str[119], (Fnv64_t) {0xedebf0d8UL, 0xa7a4c9f3UL} },
+    { &fnv_test_str[120], (Fnv64_t) {0xac17b143UL, 0x7829851fUL} },
+    { &fnv_test_str[121], (Fnv64_t) {0xf81bcf06UL, 0x2c8f4c9aUL} },
+    { &fnv_test_str[122], (Fnv64_t) {0x9740c732UL, 0xd34e3153UL} },
+    { &fnv_test_str[123], (Fnv64_t) {0x253d2db1UL, 0x3605a2acUL} },
+    { &fnv_test_str[124], (Fnv64_t) {0x46f4a3c3UL, 0x08c11b83UL} },
+    { &fnv_test_str[125], (Fnv64_t) {0x9ce8a6daUL, 0x6be39628UL} },
+    { &fnv_test_str[126], (Fnv64_t) {0x7fe794c5UL, 0xd9b957fbUL} },
+    { &fnv_test_str[127], (Fnv64_t) {0x04560a93UL, 0x05be33daUL} },
+    { &fnv_test_str[128], (Fnv64_t) {0x7ba9747cUL, 0x0957f157UL} },
+    { &fnv_test_str[129], (Fnv64_t) {0xc24fba57UL, 0xda2cc3acUL} },
+    { &fnv_test_str[130], (Fnv64_t) {0x5b29e7f0UL, 0x74136f18UL} },
+    { &fnv_test_str[131], (Fnv64_t) {0x0edb93b2UL, 0xb2f2b459UL} },
+    { &fnv_test_str[132], (Fnv64_t) {0x8b86ae04UL, 0xb3608fceUL} },
+    { &fnv_test_str[133], (Fnv64_t) {0x79359063UL, 0x4a3a8650UL} },
+    { &fnv_test_str[134], (Fnv64_t) {0x96880a50UL, 0x5b3a7ef4UL} },
+    { &fnv_test_str[135], (Fnv64_t) {0x3854c23bUL, 0x48fae316UL} },
+    { &fnv_test_str[136], (Fnv64_t) {0x476e0b9aUL, 0x07aaa640UL} },
+    { &fnv_test_str[137], (Fnv64_t) {0x383a687dUL, 0x2f653656UL} },
+    { &fnv_test_str[138], (Fnv64_t) {0x7599d79cUL, 0xa1031f8eUL} },
+    { &fnv_test_str[139], (Fnv64_t) {0x8ff92477UL, 0xa3190817UL} },
+    { &fnv_test_str[140], (Fnv64_t) {0x14c3fb83UL, 0x097edf3cUL} },
+    { &fnv_test_str[141], (Fnv64_t) {0xeaa0971bUL, 0xb51ca83fUL} },
+    { &fnv_test_str[142], (Fnv64_t) {0xd784f2e9UL, 0xdd3c0d96UL} },
+    { &fnv_test_str[143], (Fnv64_t) {0xea767d78UL, 0x86cd26a9UL} },
+    { &fnv_test_str[144], (Fnv64_t) {0x54a30c18UL, 0xe6b215ffUL} },
+    { &fnv_test_str[145], (Fnv64_t) {0xc5531093UL, 0xec5b06a1UL} },
+    { &fnv_test_str[146], (Fnv64_t) {0x9f9ec5e5UL, 0x45665a92UL} },
+    { &fnv_test_str[147], (Fnv64_t) {0xa9f10907UL, 0x8c7609b4UL} },
+    { &fnv_test_str[148], (Fnv64_t) {0x91f0d729UL, 0x89aac3a4UL} },
+    { &fnv_test_str[149], (Fnv64_t) {0xe0f4a403UL, 0x32ce6b26UL} },
+    { &fnv_test_str[150], (Fnv64_t) {0x02b53e01UL, 0x614ab44eUL} },
+    { &fnv_test_str[151], (Fnv64_t) {0x6eef3290UL, 0xfa6472ebUL} },
+    { &fnv_test_str[152], (Fnv64_t) {0x1948eb6aUL, 0x9e5d75ebUL} },
+    { &fnv_test_str[153], (Fnv64_t) {0xa8671852UL, 0xb6d12ad4UL} },
+    { &fnv_test_str[154], (Fnv64_t) {0xeba07af1UL, 0x88826f56UL} },
+    { &fnv_test_str[155], (Fnv64_t) {0x645bc0fdUL, 0x44535bf2UL} },
+    { &fnv_test_str[156], (Fnv64_t) {0xc21e3728UL, 0x169388ffUL} },
+    { &fnv_test_str[157], (Fnv64_t) {0x396d8224UL, 0xf68aac9eUL} },
+    { &fnv_test_str[158], (Fnv64_t) {0x472b3883UL, 0x8e87d7e7UL} },
+    { &fnv_test_str[159], (Fnv64_t) {0xa8b423deUL, 0x295c26caUL} },
+    { &fnv_test_str[160], (Fnv64_t) {0x92e72176UL, 0x322c8142UL} },
+    { &fnv_test_str[161], (Fnv64_t) {0xb8af7268UL, 0x8a06550eUL} },
+    { &fnv_test_str[162], (Fnv64_t) {0x661bcf71UL, 0xef86d60eUL} },
+    { &fnv_test_str[163], (Fnv64_t) {0x7f30ee54UL, 0x9e5426c8UL} },
+    { &fnv_test_str[164], (Fnv64_t) {0x26fd047eUL, 0xf1ea8aa8UL} },
+    { &fnv_test_str[165], (Fnv64_t) {0x642cb769UL, 0x0babaf9aUL} },
+    { &fnv_test_str[166], (Fnv64_t) {0x068d012eUL, 0x4b3341d4UL} },
+    { &fnv_test_str[167], (Fnv64_t) {0xc30a335cUL, 0xd15605cbUL} },
+    { &fnv_test_str[168], (Fnv64_t) {0xed8412e5UL, 0x5b21060aUL} },
+    { &fnv_test_str[169], (Fnv64_t) {0xce6f4227UL, 0x45e2cda1UL} },
+    { &fnv_test_str[170], (Fnv64_t) {0x033ad7d4UL, 0x50ae3745UL} },
+    { &fnv_test_str[171], (Fnv64_t) {0xd46bf414UL, 0xaa4588ceUL} },
+    { &fnv_test_str[172], (Fnv64_t) {0x4a95467eUL, 0xc1b0056cUL} },
+    { &fnv_test_str[173], (Fnv64_t) {0xde8b4089UL, 0x56576a71UL} },
+    { &fnv_test_str[174], (Fnv64_t) {0xa6dc927eUL, 0xbf20965fUL} },
+    { &fnv_test_str[175], (Fnv64_t) {0xc2040882UL, 0x569f8383UL} },
+    { &fnv_test_str[176], (Fnv64_t) {0xa08feca0UL, 0xe1e772fbUL} },
+    { &fnv_test_str[177], (Fnv64_t) {0x97138ac4UL, 0x4ced94afUL} },
+    { &fnv_test_str[178], (Fnv64_t) {0x337a82fbUL, 0xc4112ffbUL} },
+    { &fnv_test_str[179], (Fnv64_t) {0x1de38b7dUL, 0xd64a4fd4UL} },
+    { &fnv_test_str[180], (Fnv64_t) {0x9edebcbbUL, 0x4cfc3232UL} },
+    { &fnv_test_str[181], (Fnv64_t) {0x45050395UL, 0x08035644UL} },
+    { &fnv_test_str[182], (Fnv64_t) {0xf4642ffdUL, 0xaa1574ecUL} },
+    { &fnv_test_str[183], (Fnv64_t) {0x4cc315f9UL, 0x694bc4e5UL} },
+    { &fnv_test_str[184], (Fnv64_t) {0x3b011721UL, 0xa3d7cb27UL} },
+    { &fnv_test_str[185], (Fnv64_t) {0x6115bfa5UL, 0x577c2f8bUL} },
+    { &fnv_test_str[186], (Fnv64_t) {0x769fb4c1UL, 0xb7ec8c1aUL} },
+    { &fnv_test_str[187], (Fnv64_t) {0x3359ab19UL, 0x5d5cfce6UL} },
+    { &fnv_test_str[188], (Fnv64_t) {0xd65b5f71UL, 0x33b96c3cUL} },
+    { &fnv_test_str[189], (Fnv64_t) {0x80602bb9UL, 0xd8450977UL} },
+    { &fnv_test_str[190], (Fnv64_t) {0xd02da3d5UL, 0x84d47645UL} },
+    { &fnv_test_str[191], (Fnv64_t) {0xb58773a5UL, 0x83544f33UL} },
+    { &fnv_test_str[192], (Fnv64_t) {0x160836c5UL, 0x9175cbb2UL} },
+    { &fnv_test_str[193], (Fnv64_t) {0x75e72bc5UL, 0xc71b3bc1UL} },
+    { &fnv_test_str[194], (Fnv64_t) {0x222ec985UL, 0x636806acUL} },
+    { &fnv_test_str[195], (Fnv64_t) {0x50f52ed5UL, 0xb6ef0e69UL} },
+    { &fnv_test_str[196], (Fnv64_t) {0xf3dfdaa5UL, 0xead3d8a0UL} },
+    { &fnv_test_str[197], (Fnv64_t) {0x9a861ba5UL, 0x922908feUL} },
+    { &fnv_test_str[198], (Fnv64_t) {0x275fd5c5UL, 0x6d4821deUL} },
+    { &fnv_test_str[199], (Fnv64_t) {0x2bd816b5UL, 0x1fe3fce6UL} },
+    { &fnv_test_str[200], (Fnv64_t) {0xd6f70591UL, 0xc23e9fccUL} },
+    { &fnv_test_str[201], (Fnv64_t) {0xfe16b5b5UL, 0xc1af12bdUL} },
+    { &fnv_test_str[202], (Fnv64_t) {0x2f85e221UL, 0x39e9f18fUL} },
+    { NULL, (Fnv64_t) {0,0} }
+};
+#endif /* HAVE_64BIT_LONG_LONG */
+
+/* end of output generated by make vector.c */
+/*
+ * insert the contents of vector.c above
+ */
+
+
+/*
+ * unknown_hash_type - report an unknown hash type error
+ *
+ * NOTE: Does not return.
+ */
+void
+unknown_hash_type(char *prog, enum fnv_type type, int code)
+{
+    fprintf(stderr, "%s: unknown or unexpexted hash type: %d\n", prog, type);
+    exit(code);
+}
+
+
+/*
+ * print_fnv32 - print an FNV hash
+ *
+ * given:
+ *	hval	  the hash value to print
+ *	mask	  lower bit mask
+ *	verbose	  1 => print arg with hash
+ *	arg	  string or filename arg
+ */
+void
+print_fnv32(Fnv32_t hval, Fnv32_t mask, int verbose, char *arg)
+{
+    if (verbose) {
+	printf("0x%08lx %s\n", hval & mask, arg);
+    } else {
+	printf("0x%08lx\n", hval & mask);
+    }
+}
+
+
+/*
+ * print_fnv64 - print an FNV hash
+ *
+ * given:
+ *	hval	  the hash value to print
+ *	mask	  lower bit mask
+ *	verbose	  1 => print arg with hash
+ *	arg	  string or filename arg
+ */
+void
+print_fnv64(Fnv64_t hval, Fnv64_t mask, int verbose, char *arg)
+{
+#if defined(HAVE_64BIT_LONG_LONG)
+    if (verbose) {
+	printf("0x%016llx %s\n", hval & mask, arg);
+    } else {
+	printf("0x%016llx\n", hval & mask);
+    }
+#else
+    if (verbose) {
+	printf("0x%08lx%08lx %s\n",
+	       hval.w32[1] & mask.w32[1],
+	       hval.w32[0] & mask.w32[0],
+	       arg);
+    } else {
+	printf("0x%08lx%08lx\n",
+	       hval.w32[1] & mask.w32[1],
+	       hval.w32[0] & mask.w32[0]);
+    }
+#endif
+}
diff --git a/quantum/wear_leveling/tests/backing_mocks.cpp b/quantum/wear_leveling/tests/backing_mocks.cpp
new file mode 100644
index 0000000000..1dbb26f8e7
--- /dev/null
+++ b/quantum/wear_leveling/tests/backing_mocks.cpp
@@ -0,0 +1,154 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "backing_mocks.hpp"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Backing Store Mock implementation
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void MockBackingStore::reset_instance() {
+    for (auto&& e : backing_storage)
+        e.reset();
+
+    locked = true;
+
+    backing_erasure_count     = 0;
+    backing_max_write_count   = 0;
+    backing_total_write_count = 0;
+
+    backing_init_invoke_count   = 0;
+    backing_unlock_invoke_count = 0;
+    backing_erase_invoke_count  = 0;
+    backing_write_invoke_count  = 0;
+    backing_lock_invoke_count   = 0;
+
+    init_success_callback   = [](std::uint64_t) { return true; };
+    erase_success_callback  = [](std::uint64_t) { return true; };
+    unlock_success_callback = [](std::uint64_t) { return true; };
+    write_success_callback  = [](std::uint64_t, std::uint32_t) { return true; };
+    lock_success_callback   = [](std::uint64_t) { return true; };
+
+    write_log.clear();
+}
+
+bool MockBackingStore::init(void) {
+    ++backing_init_invoke_count;
+
+    if (init_success_callback) {
+        return init_success_callback(backing_init_invoke_count);
+    }
+    return true;
+}
+
+bool MockBackingStore::unlock(void) {
+    ++backing_unlock_invoke_count;
+
+    EXPECT_TRUE(is_locked()) << "Attempted to unlock but was not locked";
+    locked = false;
+
+    if (unlock_success_callback) {
+        return unlock_success_callback(backing_unlock_invoke_count);
+    }
+    return true;
+}
+
+bool MockBackingStore::erase(void) {
+    ++backing_erase_invoke_count;
+
+    // Erase each slot
+    for (std::size_t i = 0; i < backing_storage.size(); ++i) {
+        // Drop out of erase early with failure if we need to
+        if (erase_success_callback && !erase_success_callback(backing_erase_invoke_count)) {
+            append_log(true);
+            return false;
+        }
+
+        backing_storage[i].erase();
+    }
+
+    // Keep track of the erase in the write log so that we can verify during tests
+    append_log(true);
+
+    ++backing_erasure_count;
+    return true;
+}
+
+bool MockBackingStore::write(uint32_t address, backing_store_int_t value) {
+    ++backing_write_invoke_count;
+
+    // precondition: value's buffer size already matches BACKING_STORE_WRITE_SIZE
+    EXPECT_TRUE(address % BACKING_STORE_WRITE_SIZE == 0) << "Supplied address was not aligned with the backing store integral size";
+    EXPECT_TRUE(address + BACKING_STORE_WRITE_SIZE <= WEAR_LEVELING_BACKING_SIZE) << "Address would result of out-of-bounds access";
+    EXPECT_FALSE(is_locked()) << "Write was attempted without being unlocked first";
+
+    // Drop out of write early with failure if we need to
+    if (write_success_callback && !write_success_callback(backing_write_invoke_count, address)) {
+        return false;
+    }
+
+    // Write the complement as we're simulating flash memory -- 0xFF means 0x00
+    std::size_t index = address / BACKING_STORE_WRITE_SIZE;
+    backing_storage[index].set(~value);
+
+    // Keep track of the write log so that we can verify during tests
+    append_log(address, value);
+
+    // Keep track of the total number of writes into the backing store
+    ++backing_total_write_count;
+
+    return true;
+}
+
+bool MockBackingStore::lock(void) {
+    ++backing_lock_invoke_count;
+
+    EXPECT_FALSE(is_locked()) << "Attempted to lock but was not unlocked";
+    locked = true;
+
+    if (lock_success_callback) {
+        return lock_success_callback(backing_lock_invoke_count);
+    }
+    return true;
+}
+
+bool MockBackingStore::read(uint32_t address, backing_store_int_t& value) const {
+    // precondition: value's buffer size already matches BACKING_STORE_WRITE_SIZE
+    EXPECT_TRUE(address % BACKING_STORE_WRITE_SIZE == 0) << "Supplied address was not aligned with the backing store integral size";
+    EXPECT_TRUE(address + BACKING_STORE_WRITE_SIZE <= WEAR_LEVELING_BACKING_SIZE) << "Address would result of out-of-bounds access";
+
+    // Read and take the complement as we're simulating flash memory -- 0xFF means 0x00
+    std::size_t index = address / BACKING_STORE_WRITE_SIZE;
+    value             = ~backing_storage[index].get();
+
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Backing Implementation
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+extern "C" bool backing_store_init(void) {
+    return MockBackingStore::Instance().init();
+}
+
+extern "C" bool backing_store_unlock(void) {
+    return MockBackingStore::Instance().unlock();
+}
+
+extern "C" bool backing_store_erase(void) {
+    return MockBackingStore::Instance().erase();
+}
+
+extern "C" bool backing_store_write(uint32_t address, backing_store_int_t value) {
+    return MockBackingStore::Instance().write(address, value);
+}
+
+extern "C" bool backing_store_lock(void) {
+    return MockBackingStore::Instance().lock();
+}
+
+extern "C" bool backing_store_read(uint32_t address, backing_store_int_t* value) {
+    return MockBackingStore::Instance().read(address, *value);
+}
diff --git a/quantum/wear_leveling/tests/backing_mocks.hpp b/quantum/wear_leveling/tests/backing_mocks.hpp
new file mode 100644
index 0000000000..e7af7895f3
--- /dev/null
+++ b/quantum/wear_leveling/tests/backing_mocks.hpp
@@ -0,0 +1,210 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include <algorithm>
+#include <array>
+#include <cstdint>
+#include <cstdlib>
+#include <functional>
+#include <type_traits>
+#include <vector>
+
+extern "C" {
+#include "fnv.h"
+#include "wear_leveling.h"
+#include "wear_leveling_internal.h"
+};
+
+// Maximum number of mock write log entries to keep
+using MOCK_WRITE_LOG_MAX_ENTRIES = std::integral_constant<std::size_t, 1024>;
+// Complement to the backing store integral, for emulating flash erases of all bytes=0xFF
+using BACKING_STORE_INTEGRAL_COMPLEMENT = std::integral_constant<backing_store_int_t, ((backing_store_int_t)(~(backing_store_int_t)0))>;
+// Total number of elements stored in the backing arrays
+using BACKING_STORE_ELEMENT_COUNT = std::integral_constant<std::size_t, (WEAR_LEVELING_BACKING_SIZE / sizeof(backing_store_int_t))>;
+
+class MockBackingStoreElement {
+   private:
+    backing_store_int_t value;
+    std::size_t         writes;
+    std::size_t         erases;
+
+   public:
+    MockBackingStoreElement() : value(BACKING_STORE_INTEGRAL_COMPLEMENT::value), writes(0), erases(0) {}
+    void reset() {
+        erase();
+        writes = 0;
+        erases = 0;
+    }
+    void erase() {
+        if (!is_erased()) {
+            ++erases;
+        }
+        value = BACKING_STORE_INTEGRAL_COMPLEMENT::value;
+    }
+    backing_store_int_t get() const {
+        return value;
+    }
+    void set(const backing_store_int_t& v) {
+        EXPECT_TRUE(is_erased()) << "Attempted write at index which isn't empty.";
+        value = v;
+        ++writes;
+    }
+    std::size_t num_writes() const {
+        return writes;
+    }
+    std::size_t num_erases() const {
+        return erases;
+    }
+    bool is_erased() const {
+        return value == BACKING_STORE_INTEGRAL_COMPLEMENT::value;
+    }
+};
+
+struct MockBackingStoreLogEntry {
+    MockBackingStoreLogEntry(uint32_t address, backing_store_int_t value) : address(address), value(value), erased(false) {}
+    MockBackingStoreLogEntry(bool erased) : address(0), value(0), erased(erased) {}
+    uint32_t            address = 0;     // The address of the operation
+    backing_store_int_t value   = 0;     // The value of the operation
+    bool                erased  = false; // Whether the entire backing store was erased
+};
+
+class MockBackingStore {
+   private:
+    MockBackingStore() {
+        reset_instance();
+    }
+
+    // Type containing each of the entries and the write counts
+    using storage_t = std::array<MockBackingStoreElement, BACKING_STORE_ELEMENT_COUNT::value>;
+
+    // Whether the backing store is locked
+    bool locked;
+    // The actual data stored in the emulated flash
+    storage_t backing_storage;
+    // The number of erase cycles that have occurred
+    std::uint64_t backing_erasure_count;
+    // The max number of writes to an element of the backing store
+    std::uint64_t backing_max_write_count;
+    // The total number of writes to all elements of the backing store
+    std::uint64_t backing_total_write_count;
+    // The write log for the backing store
+    std::vector<MockBackingStoreLogEntry> write_log;
+
+    // The number of times each API was invoked
+    std::uint64_t backing_init_invoke_count;
+    std::uint64_t backing_unlock_invoke_count;
+    std::uint64_t backing_erase_invoke_count;
+    std::uint64_t backing_write_invoke_count;
+    std::uint64_t backing_lock_invoke_count;
+
+    // Whether init should succeed
+    std::function<bool(std::uint64_t)> init_success_callback;
+    // Whether erase should succeed
+    std::function<bool(std::uint64_t)> erase_success_callback;
+    // Whether unlocks should succeed
+    std::function<bool(std::uint64_t)> unlock_success_callback;
+    // Whether writes should succeed
+    std::function<bool(std::uint64_t, std::uint32_t)> write_success_callback;
+    // Whether locks should succeed
+    std::function<bool(std::uint64_t)> lock_success_callback;
+
+    template <typename... Args>
+    void append_log(Args&&... args) {
+        if (write_log.size() < MOCK_WRITE_LOG_MAX_ENTRIES::value) {
+            write_log.emplace_back(std::forward<Args>(args)...);
+        }
+    }
+
+   public:
+    static MockBackingStore& Instance() {
+        static MockBackingStore instance;
+        return instance;
+    }
+
+    std::uint64_t erasure_count() const {
+        return backing_erasure_count;
+    }
+    std::uint64_t max_write_count() const {
+        return backing_max_write_count;
+    }
+    std::uint64_t total_write_count() const {
+        return backing_total_write_count;
+    }
+
+    // The number of times each API was invoked
+    std::uint64_t init_invoke_count() const {
+        return backing_init_invoke_count;
+    }
+    std::uint64_t unlock_invoke_count() const {
+        return backing_unlock_invoke_count;
+    }
+    std::uint64_t erase_invoke_count() const {
+        return backing_erase_invoke_count;
+    }
+    std::uint64_t write_invoke_count() const {
+        return backing_write_invoke_count;
+    }
+    std::uint64_t lock_invoke_count() const {
+        return backing_lock_invoke_count;
+    }
+
+    // Clear out the internal data for the next run
+    void reset_instance();
+
+    bool is_locked() const {
+        return locked;
+    }
+
+    // APIs for the backing store
+    bool init();
+    bool unlock();
+    bool erase();
+    bool write(std::uint32_t address, backing_store_int_t value);
+    bool lock();
+    bool read(std::uint32_t address, backing_store_int_t& value) const;
+
+    // Control over when init/writes/erases should succeed
+    void set_init_callback(std::function<bool(std::uint64_t)> callback) {
+        init_success_callback = callback;
+    }
+    void set_erase_callback(std::function<bool(std::uint64_t)> callback) {
+        erase_success_callback = callback;
+    }
+    void set_unlock_callback(std::function<bool(std::uint64_t)> callback) {
+        unlock_success_callback = callback;
+    }
+    void set_write_callback(std::function<bool(std::uint64_t, std::uint32_t)> callback) {
+        write_success_callback = callback;
+    }
+    void set_lock_callback(std::function<bool(std::uint64_t)> callback) {
+        lock_success_callback = callback;
+    }
+
+    auto storage_begin() const -> decltype(backing_storage.begin()) {
+        return backing_storage.begin();
+    }
+    auto storage_end() const -> decltype(backing_storage.end()) {
+        return backing_storage.end();
+    }
+
+    auto storage_begin() -> decltype(backing_storage.begin()) {
+        return backing_storage.begin();
+    }
+    auto storage_end() -> decltype(backing_storage.end()) {
+        return backing_storage.end();
+    }
+
+    auto log_begin() -> decltype(write_log.begin()) {
+        return write_log.begin();
+    }
+    auto log_end() -> decltype(write_log.end()) {
+        return write_log.end();
+    }
+
+    auto log_begin() const -> decltype(write_log.begin()) {
+        return write_log.begin();
+    }
+    auto log_end() const -> decltype(write_log.end()) {
+        return write_log.end();
+    }
+};
diff --git a/quantum/wear_leveling/tests/rules.mk b/quantum/wear_leveling/tests/rules.mk
new file mode 100644
index 0000000000..4d7a964049
--- /dev/null
+++ b/quantum/wear_leveling/tests/rules.mk
@@ -0,0 +1,66 @@
+wear_leveling_common_DEFS := \
+	-DWEAR_LEVELING_TESTS
+wear_leveling_common_SRC := \
+	$(LIB_PATH)/fnv/qmk_fnv_type_validation.c \
+	$(LIB_PATH)/fnv/hash_32a.c \
+	$(LIB_PATH)/fnv/hash_64a.c \
+	$(QUANTUM_PATH)/wear_leveling/wear_leveling.c \
+	$(QUANTUM_PATH)/wear_leveling/tests/backing_mocks.cpp
+wear_leveling_common_INC := \
+	$(LIB_PATH)/fnv \
+	$(QUANTUM_PATH)/wear_leveling
+
+wear_leveling_general_DEFS := \
+	$(wear_leveling_common_DEFS) \
+	-DBACKING_STORE_WRITE_SIZE=2 \
+	-DWEAR_LEVELING_BACKING_SIZE=48 \
+	-DWEAR_LEVELING_LOGICAL_SIZE=16
+wear_leveling_general_SRC := \
+	$(wear_leveling_common_SRC) \
+	$(QUANTUM_PATH)/wear_leveling/tests/wear_leveling_general.cpp
+wear_leveling_general_INC := \
+	$(wear_leveling_common_INC)
+
+wear_leveling_2byte_optimized_writes_DEFS := \
+	$(wear_leveling_common_DEFS) \
+	-DBACKING_STORE_WRITE_SIZE=2 \
+	-DWEAR_LEVELING_BACKING_SIZE=65536 \
+	-DWEAR_LEVELING_LOGICAL_SIZE=32768
+wear_leveling_2byte_optimized_writes_SRC := \
+	$(wear_leveling_common_SRC) \
+	$(QUANTUM_PATH)/wear_leveling/tests/wear_leveling_2byte_optimized_writes.cpp
+wear_leveling_2byte_optimized_writes_INC := \
+	$(wear_leveling_common_INC)
+
+wear_leveling_2byte_DEFS := \
+	$(wear_leveling_common_DEFS) \
+	-DBACKING_STORE_WRITE_SIZE=2 \
+	-DWEAR_LEVELING_BACKING_SIZE=48 \
+	-DWEAR_LEVELING_LOGICAL_SIZE=16
+wear_leveling_2byte_SRC := \
+	$(wear_leveling_common_SRC) \
+	$(QUANTUM_PATH)/wear_leveling/tests/wear_leveling_2byte.cpp
+wear_leveling_2byte_INC := \
+	$(wear_leveling_common_INC)
+
+wear_leveling_4byte_DEFS := \
+	$(wear_leveling_common_DEFS) \
+	-DBACKING_STORE_WRITE_SIZE=4 \
+	-DWEAR_LEVELING_BACKING_SIZE=48 \
+	-DWEAR_LEVELING_LOGICAL_SIZE=16
+wear_leveling_4byte_SRC := \
+	$(wear_leveling_common_SRC) \
+	$(QUANTUM_PATH)/wear_leveling/tests/wear_leveling_4byte.cpp
+wear_leveling_4byte_INC := \
+	$(wear_leveling_common_INC)
+
+wear_leveling_8byte_DEFS := \
+	$(wear_leveling_common_DEFS) \
+	-DBACKING_STORE_WRITE_SIZE=8 \
+	-DWEAR_LEVELING_BACKING_SIZE=48 \
+	-DWEAR_LEVELING_LOGICAL_SIZE=16
+wear_leveling_8byte_SRC := \
+	$(wear_leveling_common_SRC) \
+	$(QUANTUM_PATH)/wear_leveling/tests/wear_leveling_8byte.cpp
+wear_leveling_8byte_INC := \
+	$(wear_leveling_common_INC)
\ No newline at end of file
diff --git a/quantum/wear_leveling/tests/testlist.mk b/quantum/wear_leveling/tests/testlist.mk
new file mode 100644
index 0000000000..32cfc178b4
--- /dev/null
+++ b/quantum/wear_leveling/tests/testlist.mk
@@ -0,0 +1,6 @@
+TEST_LIST += \
+	wear_leveling_general \
+	wear_leveling_2byte_optimized_writes \
+	wear_leveling_2byte \
+	wear_leveling_4byte \
+	wear_leveling_8byte
diff --git a/quantum/wear_leveling/tests/wear_leveling_2byte.cpp b/quantum/wear_leveling/tests/wear_leveling_2byte.cpp
new file mode 100644
index 0000000000..b749c32b04
--- /dev/null
+++ b/quantum/wear_leveling/tests/wear_leveling_2byte.cpp
@@ -0,0 +1,228 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <numeric>
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "backing_mocks.hpp"
+
+class WearLeveling2Byte : public ::testing::Test {
+   protected:
+    void SetUp() override {
+        MockBackingStore::Instance().reset_instance();
+        wear_leveling_init();
+    }
+};
+
+static std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> verify_data;
+
+static wear_leveling_status_t test_write(const uint32_t address, const void* value, size_t length) {
+    memcpy(&verify_data[address], value, length);
+    return wear_leveling_write(address, value, length);
+}
+
+/**
+ * This test verifies that the first write after initialisation occurs after the FNV1a_64 hash location.
+ */
+TEST_F(WearLeveling2Byte, FirstWriteOccursAfterHash) {
+    auto&   inst       = MockBackingStore::Instance();
+    uint8_t test_value = 0x15;
+    test_write(0x02, &test_value, sizeof(test_value));
+    EXPECT_EQ(inst.log_begin()->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid first write address.";
+}
+
+/**
+ * This test verifies that the first write after initialisation occurs after the FNV1a_64 hash location, after an erase has occurred.
+ */
+TEST_F(WearLeveling2Byte, FirstWriteOccursAfterHash_AfterErase) {
+    auto&   inst       = MockBackingStore::Instance();
+    uint8_t test_value = 0x15;
+    wear_leveling_erase();
+    test_write(0x02, &test_value, sizeof(test_value));
+    EXPECT_EQ((inst.log_begin() + 1)->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid first write address.";
+}
+
+/**
+ * This test forces consolidation by writing enough to the write log that it overflows, consolidating the data into the
+ * base logical area.
+ */
+TEST_F(WearLeveling2Byte, ConsolidationOverflow) {
+    auto& inst = MockBackingStore::Instance();
+
+    // Generate a test block of data which forces OPTIMIZED_64 writes
+    std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> testvalue;
+
+    // Write the data
+    std::iota(testvalue.begin(), testvalue.end(), 0x20);
+    EXPECT_EQ(test_write(0, testvalue.data(), testvalue.size()), WEAR_LEVELING_CONSOLIDATED) << "Write returned incorrect status";
+    uint8_t dummy = 0x40;
+    EXPECT_EQ(test_write(0x04, &dummy, sizeof(dummy)), WEAR_LEVELING_SUCCESS) << "Write returned incorrect status";
+
+    // All writes are at address<64, so each logical byte written will generate 1 write log entry, thus 1 backing store write.
+    // Expected log:
+    // [0..11]:  optimised64,        backing address 0x18, logical address 0x00
+    // [12]:     erase
+    // [13..20]: consolidated data,  backing address 0x00, logical address 0x00
+    // [21..24]: FNV1a_64 result,    backing address 0x10
+    // [25]:     optimised64,        backing address 0x18, logical address 0x04
+    EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), 26);
+
+    // Verify the backing store writes for the write log
+    std::size_t       index;
+    write_log_entry_t e;
+    for (index = 0; index < 12; ++index) {
+        auto write_iter = inst.log_begin() + index;
+        EXPECT_EQ(write_iter->address, WEAR_LEVELING_LOGICAL_SIZE + 8 + (index * BACKING_STORE_WRITE_SIZE)) << "Invalid write log address";
+        e.raw16[0] = write_iter->value;
+        EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_OPTIMIZED_64) << "Invalid write log entry type";
+    }
+
+    // Verify the backing store erase
+    {
+        index           = 12;
+        auto write_iter = inst.log_begin() + index;
+        e.raw16[0]      = write_iter->value;
+        EXPECT_TRUE(write_iter->erased) << "Backing store erase did not occur as required";
+    }
+
+    // Verify the backing store writes for consolidation
+    for (index = 13; index < 21; ++index) {
+        auto write_iter = inst.log_begin() + index;
+        EXPECT_EQ(write_iter->address, (index - 13) * BACKING_STORE_WRITE_SIZE) << "Invalid write log entry address";
+    }
+
+    // Verify the FNV1a_64 write
+    {
+        EXPECT_EQ((inst.log_begin() + 21)->address, WEAR_LEVELING_LOGICAL_SIZE) << "Invalid write log address";
+        e.raw16[0] = (inst.log_begin() + 21)->value;
+        e.raw16[1] = (inst.log_begin() + 22)->value;
+        e.raw16[2] = (inst.log_begin() + 23)->value;
+        e.raw16[3] = (inst.log_begin() + 24)->value;
+        EXPECT_EQ(e.raw64, fnv_64a_buf(testvalue.data(), testvalue.size(), FNV1A_64_INIT)) << "Invalid checksum"; // Note that checksum is based on testvalue, as we overwrote one byte and need to consult the consolidated data, not the current
+    }
+
+    // Verify the final write
+    EXPECT_EQ((inst.log_begin() + 25)->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid write log address";
+
+    // Verify the data is what we expected
+    std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> readback;
+    EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+    EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback did not match";
+
+    // Re-init and re-read, verifying the reload capability
+    EXPECT_NE(wear_leveling_init(), WEAR_LEVELING_FAILED) << "Re-initialisation failed";
+    EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+    EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback did not match";
+}
+
+/**
+ * This test verifies multibyte readback gets canceled with an out-of-bounds address.
+ */
+TEST_F(WearLeveling2Byte, PlaybackReadbackMultibyte_OOB) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Invalid FNV1a_64 hash
+    (logstart + 0)->set(0);
+    (logstart + 1)->set(0);
+    (logstart + 2)->set(0);
+    (logstart + 3)->set(0);
+
+    // Set up a 2-byte logical write of [0x11,0x12] at logical offset 0x01
+    auto entry0    = LOG_ENTRY_MAKE_MULTIBYTE(0x01, 2);
+    entry0.raw8[3] = 0x11;
+    entry0.raw8[4] = 0x12;
+    (logstart + 4)->set(~entry0.raw16[0]);
+    (logstart + 5)->set(~entry0.raw16[1]);
+    (logstart + 6)->set(~entry0.raw16[2]);
+
+    // Set up a 2-byte logical write of [0x13,0x14] at logical offset 0x1000 (out of bounds)
+    auto entry1    = LOG_ENTRY_MAKE_MULTIBYTE(0x1000, 2);
+    entry1.raw8[3] = 0x13;
+    entry1.raw8[4] = 0x14;
+    (logstart + 7)->set(~entry1.raw16[0]);
+    (logstart + 8)->set(~entry1.raw16[1]);
+    (logstart + 9)->set(~entry1.raw16[2]);
+
+    // Set up a 2-byte logical write of [0x15,0x16] at logical offset 0x01
+    auto entry2    = LOG_ENTRY_MAKE_MULTIBYTE(0x01, 2);
+    entry2.raw8[3] = 0x15;
+    entry2.raw8[4] = 0x16;
+    (logstart + 10)->set(~entry2.raw16[0]);
+    (logstart + 11)->set(~entry2.raw16[1]);
+    (logstart + 12)->set(~entry2.raw16[2]);
+
+    EXPECT_EQ(inst.erasure_count(), 0) << "Invalid initial erase count";
+    EXPECT_EQ(wear_leveling_init(), WEAR_LEVELING_CONSOLIDATED) << "Readback should have failed and triggered consolidation";
+    EXPECT_EQ(inst.erasure_count(), 1) << "Invalid final erase count";
+
+    uint8_t buf[2];
+    wear_leveling_read(0x01, buf, sizeof(buf));
+    EXPECT_EQ(buf[0], 0x11) << "Readback should have maintained the previous pre-failure value from the write log";
+    EXPECT_EQ(buf[1], 0x12) << "Readback should have maintained the previous pre-failure value from the write log";
+}
+
+/**
+ * This test verifies optimized 64 readback gets canceled with an out-of-bounds address.
+ */
+TEST_F(WearLeveling2Byte, PlaybackReadbackOptimized64_OOB) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Invalid FNV1a_64 hash
+    (logstart + 0)->set(0);
+    (logstart + 1)->set(0);
+    (logstart + 2)->set(0);
+    (logstart + 3)->set(0);
+
+    // Set up a 1-byte logical write of 0x11 at logical offset 0x01
+    auto entry0 = LOG_ENTRY_MAKE_OPTIMIZED_64(0x01, 0x11);
+    (logstart + 4)->set(~entry0.raw16[0]);
+
+    // Set up a 1-byte logical write of 0x11 at logical offset 0x30 (out of bounds)
+    auto entry1 = LOG_ENTRY_MAKE_OPTIMIZED_64(0x30, 0x11);
+    (logstart + 5)->set(~entry1.raw16[0]);
+
+    // Set up a 1-byte logical write of 0x12 at logical offset 0x01
+    auto entry2 = LOG_ENTRY_MAKE_OPTIMIZED_64(0x01, 0x12);
+    (logstart + 6)->set(~entry2.raw16[0]);
+
+    EXPECT_EQ(inst.erasure_count(), 0) << "Invalid initial erase count";
+    EXPECT_EQ(wear_leveling_init(), WEAR_LEVELING_CONSOLIDATED) << "Readback should have failed and triggered consolidation";
+    EXPECT_EQ(inst.erasure_count(), 1) << "Invalid final erase count";
+    uint8_t tmp;
+    wear_leveling_read(0x01, &tmp, sizeof(tmp));
+    EXPECT_EQ(tmp, 0x11) << "Readback should have maintained the previous pre-failure value from the write log";
+}
+
+/**
+ * This test verifies word 0/1 readback gets canceled with an out-of-bounds address.
+ */
+TEST_F(WearLeveling2Byte, PlaybackReadbackWord01_OOB) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Invalid FNV1a_64 hash
+    (logstart + 0)->set(0);
+    (logstart + 1)->set(0);
+    (logstart + 2)->set(0);
+    (logstart + 3)->set(0);
+
+    // Set up a 1-byte logical write of 1 at logical offset 0x02
+    auto entry0 = LOG_ENTRY_MAKE_WORD_01(0x02, 1);
+    (logstart + 4)->set(~entry0.raw16[0]);
+
+    // Set up a 1-byte logical write of 1 at logical offset 0x1000 (out of bounds)
+    auto entry1 = LOG_ENTRY_MAKE_WORD_01(0x1000, 1);
+    (logstart + 5)->set(~entry1.raw16[0]);
+
+    // Set up a 1-byte logical write of 0 at logical offset 0x02
+    auto entry2 = LOG_ENTRY_MAKE_WORD_01(0x02, 0);
+    (logstart + 6)->set(~entry2.raw16[0]);
+
+    EXPECT_EQ(inst.erasure_count(), 0) << "Invalid initial erase count";
+    EXPECT_EQ(wear_leveling_init(), WEAR_LEVELING_CONSOLIDATED) << "Readback should have failed and triggered consolidation";
+    EXPECT_EQ(inst.erasure_count(), 1) << "Invalid final erase count";
+    uint8_t tmp;
+    wear_leveling_read(0x02, &tmp, sizeof(tmp));
+    EXPECT_EQ(tmp, 1) << "Readback should have maintained the previous pre-failure value from the write log";
+}
diff --git a/quantum/wear_leveling/tests/wear_leveling_2byte_optimized_writes.cpp b/quantum/wear_leveling/tests/wear_leveling_2byte_optimized_writes.cpp
new file mode 100644
index 0000000000..0b03113c89
--- /dev/null
+++ b/quantum/wear_leveling/tests/wear_leveling_2byte_optimized_writes.cpp
@@ -0,0 +1,295 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <numeric>
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "backing_mocks.hpp"
+
+class WearLeveling2ByteOptimizedWrites : public ::testing::Test {
+   protected:
+    void SetUp() override {
+        MockBackingStore::Instance().reset_instance();
+        wear_leveling_init();
+    }
+};
+
+static std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> verify_data;
+
+static wear_leveling_status_t test_write(const uint32_t address, const void* value, size_t length) {
+    memcpy(&verify_data[address], value, length);
+    return wear_leveling_write(address, value, length);
+}
+
+/**
+ * This test ensures the correct number of backing store writes occurs with a multibyte write, given the input buffer size.
+ */
+TEST_F(WearLeveling2ByteOptimizedWrites, MultibyteBackingStoreWriteCounts) {
+    auto& inst = MockBackingStore::Instance();
+
+    for (std::size_t length = 1; length <= 5; ++length) {
+        // Clear things out
+        std::fill(verify_data.begin(), verify_data.end(), 0);
+        inst.reset_instance();
+        wear_leveling_init();
+
+        // Generate a test block of data
+        std::vector<std::uint8_t> testvalue(length);
+        std::iota(testvalue.begin(), testvalue.end(), 0x20);
+
+        // Write the data
+        EXPECT_EQ(test_write(2000, testvalue.data(), testvalue.size()), WEAR_LEVELING_SUCCESS) << "Write failed with incorrect status";
+
+        std::size_t expected;
+        if (length > 3) {
+            expected = 4;
+        } else if (length > 1) {
+            expected = 3;
+        } else {
+            expected = 2;
+        }
+
+        // Check that we got the expected number of write log entries
+        EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), expected);
+    }
+}
+
+/**
+ * This test runs through writing U16 values of `0` or `1` over the entire logical address range, to even addresses only.
+ *  - Addresses <16384 will result in a single optimised backing write
+ *  - Higher addresses will result in a multibyte write of 3 backing writes
+ */
+TEST_F(WearLeveling2ByteOptimizedWrites, WriteOneThenZeroToEvenAddresses) {
+    auto& inst = MockBackingStore::Instance();
+
+    // Only attempt writes for each address up to a limit that would NOT force a consolidated data write.
+    std::size_t writes_per_loop = (MOCK_WRITE_LOG_MAX_ENTRIES::value / 6) - 1; // Worst case is 6 writes for each pair of writes of 0/1
+    std::size_t final_address;
+    for (uint32_t address = 0; address < WEAR_LEVELING_LOGICAL_SIZE; address += (writes_per_loop * 2)) {
+        // Clear things out
+        std::fill(verify_data.begin(), verify_data.end(), 0);
+        inst.reset_instance();
+        wear_leveling_init();
+
+        // Loop through all the addresses in this range
+        std::size_t expected = 0;
+        for (uint32_t offset = 0; offset < (writes_per_loop * 2); offset += 2) {
+            // If we're about to exceed the limit of the logical store, skip the writes
+            if (address + offset + 2 > WEAR_LEVELING_LOGICAL_SIZE) {
+                break;
+            }
+
+            // The default erased value of the wear-leveling cache is zero, so we write a one first, then a zero, to ensure a backing store write occurs.
+            uint16_t val = 1;
+            EXPECT_EQ(test_write(address + offset, &val, sizeof(val)), WEAR_LEVELING_SUCCESS) << "Write failed with incorrect status";
+            val = 0;
+            EXPECT_EQ(test_write(address + offset, &val, sizeof(val)), WEAR_LEVELING_SUCCESS) << "Write failed with incorrect status";
+
+            std::size_t backing_store_writes_expected = 0;
+            if (address + offset < 16384) {
+                // A U16 value of 0/1 at an even address <16384 will result in 1 backing write each, so we need 2 backing writes for 2 logical writes
+                backing_store_writes_expected = 2;
+            } else {
+                // All other addresses result in a multibyte write (3 backing store writes) to write two local bytes of data
+                backing_store_writes_expected = 6;
+            }
+
+            // Keep track of the total number of expected writes to the backing store
+            expected += backing_store_writes_expected;
+
+            // Verify we're at the correct number of writes
+            EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), expected) << "Write log doesn't match required number of backing store writes for address " << (address + offset);
+
+            // Verify that the write log entries we expect are actually present
+            std::size_t       write_index = expected - backing_store_writes_expected;
+            auto              write_iter  = inst.log_begin() + write_index;
+            write_log_entry_t e;
+            if (address + offset < 16384) {
+                // A U16 value of 0/1 at an even address <16384 will result in 1 backing write each, so we need 2 backing writes for 2 logical writes
+                for (std::size_t i = 0; i < 2; ++i) {
+                    e.raw16[0] = write_iter->value;
+                    EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_WORD_01) << "Invalid write log entry type at " << (address + offset);
+                    ++write_iter;
+                }
+            } else {
+                // Multibyte write
+                e.raw16[0] = write_iter->value;
+                EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_MULTIBYTE) << "Invalid write log entry type at " << (address + offset);
+                EXPECT_EQ(LOG_ENTRY_MULTIBYTE_GET_LENGTH(e), 2) << "Invalid write log entry length at " << (address + offset);
+                ++write_iter;
+            }
+
+            // Keep track of the final address written, so we can verify the entire logical range was handled
+            final_address = address + offset;
+        }
+
+        // Verify the number of writes that occurred to the backing store
+        size_t backing_write_count = std::distance(inst.log_begin(), inst.log_end());
+        EXPECT_EQ(backing_write_count, expected) << "Invalid write count at address " << address;
+
+        // Verify the data is what we expected
+        std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> readback;
+        EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+        EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback for address " << address << " did not match";
+
+        // Re-init and re-read, testing the reload capability
+        EXPECT_NE(wear_leveling_init(), WEAR_LEVELING_FAILED) << "Re-initialisation failed";
+        EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+        EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback for address " << address << " did not match";
+    }
+
+    // Verify the full range of the logical area got written
+    EXPECT_EQ(final_address, WEAR_LEVELING_LOGICAL_SIZE - 2) << "Invalid final write address";
+}
+
+/**
+ * This test runs through writing U16 values of `0` or `1` over the entire logical address range, to odd addresses only.
+ *  - Addresses <63 will result in 2 optimised backing writes
+ *  - Address 63 results in a single optimised backing write for the first logical byte, and a multibyte write of 2 backing writes for the second logical byte
+ *  - Higher addresses will result in a multibyte write of 3 backing writes
+ */
+TEST_F(WearLeveling2ByteOptimizedWrites, WriteOneThenZeroToOddAddresses) {
+    auto& inst = MockBackingStore::Instance();
+
+    // Only attempt writes for each address up to a limit that would NOT force a consolidated data write.
+    std::size_t writes_per_loop = (MOCK_WRITE_LOG_MAX_ENTRIES::value / 6) - 1; // Worst case is 6 writes for each pair of writes of 0/1
+    std::size_t final_address;
+    for (uint32_t address = 1; address < WEAR_LEVELING_LOGICAL_SIZE; address += (writes_per_loop * 2)) {
+        // Clear things out
+        std::fill(verify_data.begin(), verify_data.end(), 0);
+        inst.reset_instance();
+        wear_leveling_init();
+
+        // Loop through all the addresses in this range
+        std::size_t expected = 0;
+        for (uint32_t offset = 0; offset < (writes_per_loop * 2); offset += 2) {
+            // If we're about to exceed the limit of the logical store, skip the writes
+            if (address + offset + 2 > WEAR_LEVELING_LOGICAL_SIZE) {
+                break;
+            }
+
+            // The default erased value of the wear-leveling cache is zero, so we write a one first, then a zero, to ensure a backing store write occurs.
+            uint16_t val = 1;
+            EXPECT_EQ(test_write(address + offset, &val, sizeof(val)), WEAR_LEVELING_SUCCESS) << "Write failed with incorrect status";
+            val = 0;
+            EXPECT_EQ(test_write(address + offset, &val, sizeof(val)), WEAR_LEVELING_SUCCESS) << "Write failed with incorrect status";
+
+            std::size_t backing_store_writes_expected = 0;
+            if (address + offset < 63) {
+                // A U16 value of 0/1 at an odd address <64 will result in 2 backing writes each, so we need 4 backing writes for 2 logical writes
+                backing_store_writes_expected = 4;
+            } else if (address + offset == 63) {
+                // If we're straddling the boundary for optimised bytes (addr==64), then the first logical byte is written using the optimised write (1 backing
+                // store write), and the second logical byte uses a multibyte write (2 backing store writes)
+                backing_store_writes_expected = 2    // First logical bytes written using optimised log entries
+                                                + 4; // Second logical bytes written using multibyte log entries
+            } else {
+                // All other addresses result in a multibyte write (3 backing store writes) to write two local bytes of data
+                backing_store_writes_expected = 6;
+            }
+
+            // Keep track of the total number of expected writes to the backing store
+            expected += backing_store_writes_expected;
+
+            // Verify we're at the correct number of writes
+            EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), expected) << "Write log doesn't match required number of backing store writes for address " << (address + offset);
+
+            // Verify that the write log entries we expect are actually present
+            std::size_t       write_index = expected - backing_store_writes_expected;
+            auto              write_iter  = inst.log_begin() + write_index;
+            write_log_entry_t e;
+            if (address + offset < 63) {
+                // A U16 value of 0/1 at an odd address <64 will result in 2 backing writes each, so we need 4 backing writes for 2 logical writes
+                for (std::size_t i = 0; i < 4; ++i) {
+                    e.raw16[0] = write_iter->value;
+                    EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_OPTIMIZED_64) << "Invalid write log entry type";
+                    ++write_iter;
+                }
+            } else if (address + offset == 63) {
+                // First log entry is the 64-addr optimised one
+                e.raw16[0] = write_iter->value;
+                EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_OPTIMIZED_64) << "Invalid write log entry type";
+                ++write_iter;
+
+                // Second log entry is the multibyte entry for the second logical byte
+                e.raw16[0] = write_iter->value;
+                EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_MULTIBYTE) << "Invalid write log entry type";
+                EXPECT_EQ(LOG_ENTRY_MULTIBYTE_GET_LENGTH(e), 1) << "Invalid write log entry length";
+                ++write_iter;
+            } else {
+                // Multibyte write
+                e.raw16[0] = write_iter->value;
+                EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_MULTIBYTE) << "Invalid write log entry type";
+                EXPECT_EQ(LOG_ENTRY_MULTIBYTE_GET_LENGTH(e), 2) << "Invalid write log entry length";
+                ++write_iter;
+            }
+
+            // Keep track of the final address written, so we can verify the entire logical range was handled
+            final_address = address + offset;
+        }
+
+        // Verify the number of writes that occurred to the backing store
+        size_t backing_write_count = std::distance(inst.log_begin(), inst.log_end());
+        EXPECT_EQ(backing_write_count, expected) << "Invalid write count at address " << address;
+
+        // Verify the data is what we expected
+        std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> readback;
+        EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+        EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback for address " << address << " did not match";
+
+        // Re-init and re-read, testing the reload capability
+        EXPECT_NE(wear_leveling_init(), WEAR_LEVELING_FAILED) << "Re-initialisation failed";
+        EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+        EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback for address " << address << " did not match";
+    }
+
+    // Verify the full range of the logical area got written
+    EXPECT_EQ(final_address, WEAR_LEVELING_LOGICAL_SIZE - 3) << "Invalid final write address";
+}
+
+/**
+ * This test verifies readback after playback of the write log, simulating power loss and reboot.
+ */
+TEST_F(WearLeveling2ByteOptimizedWrites, PlaybackReadbackOptimized64_Success) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Invalid FNV1a_64 hash
+    (logstart + 0)->set(0);
+    (logstart + 1)->set(0);
+    (logstart + 2)->set(0);
+    (logstart + 3)->set(0);
+
+    // Set up a 1-byte logical write of 0x11 at logical offset 0x01
+    auto entry0 = LOG_ENTRY_MAKE_OPTIMIZED_64(0x01, 0x11);
+    (logstart + 4)->set(~entry0.raw16[0]); // start at offset 4 to skip FNV1a_64 result
+
+    wear_leveling_init();
+    uint8_t tmp;
+
+    wear_leveling_read(0x01, &tmp, sizeof(tmp));
+    EXPECT_EQ(tmp, 0x11) << "Failed to read back the seeded data";
+}
+
+/**
+ * This test verifies readback after playback of the write log, simulating power loss and reboot.
+ */
+TEST_F(WearLeveling2ByteOptimizedWrites, PlaybackReadbackWord01_Success) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Invalid FNV1a_64 hash
+    (logstart + 0)->set(0);
+    (logstart + 1)->set(0);
+    (logstart + 2)->set(0);
+    (logstart + 3)->set(0);
+
+    // Set up a 1-byte logical write of 1 at logical offset 0x02
+    auto entry0 = LOG_ENTRY_MAKE_WORD_01(0x02, 1);
+    (logstart + 4)->set(~entry0.raw16[0]); // start at offset 4 to skip FNV1a_64 result
+
+    wear_leveling_init();
+    uint8_t tmp;
+
+    wear_leveling_read(0x02, &tmp, sizeof(tmp));
+    EXPECT_EQ(tmp, 1) << "Failed to read back the seeded data";
+}
diff --git a/quantum/wear_leveling/tests/wear_leveling_4byte.cpp b/quantum/wear_leveling/tests/wear_leveling_4byte.cpp
new file mode 100644
index 0000000000..54482c5fe7
--- /dev/null
+++ b/quantum/wear_leveling/tests/wear_leveling_4byte.cpp
@@ -0,0 +1,193 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <numeric>
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "backing_mocks.hpp"
+
+class WearLeveling4Byte : public ::testing::Test {
+   protected:
+    void SetUp() override {
+        MockBackingStore::Instance().reset_instance();
+        wear_leveling_init();
+    }
+};
+
+static std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> verify_data;
+
+static wear_leveling_status_t test_write(const uint32_t address, const void* value, size_t length) {
+    memcpy(&verify_data[address], value, length);
+    return wear_leveling_write(address, value, length);
+}
+
+/**
+ * This test verifies that the first write after initialisation occurs after the FNV1a_64 hash location.
+ */
+TEST_F(WearLeveling4Byte, FirstWriteOccursAfterHash) {
+    auto&   inst       = MockBackingStore::Instance();
+    uint8_t test_value = 0x15;
+    test_write(0x02, &test_value, sizeof(test_value));
+    EXPECT_EQ(inst.log_begin()->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid first write address.";
+}
+
+/**
+ * This test verifies that the first write after initialisation occurs after the FNV1a_64 hash location, after an erase has occurred.
+ */
+TEST_F(WearLeveling4Byte, FirstWriteOccursAfterHash_AfterErase) {
+    auto&   inst       = MockBackingStore::Instance();
+    uint8_t test_value = 0x15;
+    wear_leveling_erase();
+    test_write(0x02, &test_value, sizeof(test_value));
+    EXPECT_EQ((inst.log_begin() + 1)->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid first write address.";
+}
+
+/**
+ * This test ensures the correct number of backing store writes occurs with a multibyte write, given the input buffer size.
+ */
+TEST_F(WearLeveling4Byte, MultibyteBackingStoreWriteCounts) {
+    auto& inst = MockBackingStore::Instance();
+
+    for (std::size_t length = 1; length <= 5; ++length) {
+        // Clear things out
+        std::fill(verify_data.begin(), verify_data.end(), 0);
+        inst.reset_instance();
+        wear_leveling_init();
+
+        // Generate a test block of data
+        std::vector<std::uint8_t> testvalue(length);
+        std::iota(testvalue.begin(), testvalue.end(), 0x20);
+
+        // Write the data
+        EXPECT_EQ(test_write(0, testvalue.data(), testvalue.size()), WEAR_LEVELING_SUCCESS) << "Write failed with incorrect status";
+
+        std::size_t expected;
+        if (length > 1) {
+            expected = 2;
+        } else {
+            expected = 1;
+        }
+
+        // Check that we got the expected number of write log entries
+        EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), expected);
+    }
+}
+
+/**
+ * This test forces consolidation by writing enough to the write log that it overflows, consolidating the data into the
+ * base logical area.
+ */
+TEST_F(WearLeveling4Byte, ConsolidationOverflow) {
+    auto& inst = MockBackingStore::Instance();
+
+    // Generate a test block of data
+    std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> testvalue;
+
+    // Write the data
+    std::iota(testvalue.begin(), testvalue.end(), 0x20);
+    EXPECT_EQ(test_write(0, testvalue.data(), testvalue.size()), WEAR_LEVELING_CONSOLIDATED) << "Write returned incorrect status";
+    uint8_t dummy = 0x40;
+    EXPECT_EQ(test_write(0x04, &dummy, sizeof(dummy)), WEAR_LEVELING_SUCCESS) << "Write returned incorrect status";
+
+    // Expected log:
+    // [0,1]:   multibyte, 5 bytes, backing address 0x18, logical address 0x00
+    // [2,3]:   multibyte, 5 bytes, backing address 0x20, logical address 0x05
+    // [4,5]:   multibyte, 5 bytes, backing address 0x28, logical address 0x0A, triggers consolidation
+    // [6]:     erase
+    // [7,8]:   consolidated data,  backing address 0x00, logical address 0x00
+    // [9,10]:  consolidated data,  backing address 0x08, logical address 0x08
+    // [11,12]: FNV1a_64 result,    backing address 0x10
+    // [13]:    multibyte, 1 byte,  backing address 0x18, logical address 0x04
+    EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), 14);
+
+    // Verify the backing store writes for the write log
+    std::size_t       index;
+    write_log_entry_t e;
+    for (index = 0; index < 6; ++index) {
+        auto write_iter = inst.log_begin() + index;
+        EXPECT_EQ(write_iter->address, WEAR_LEVELING_LOGICAL_SIZE + 8 + (index * BACKING_STORE_WRITE_SIZE)) << "Invalid write log address";
+
+        // If this is the backing store write that contains the metadata, verify it
+        if (index % 2 == 0) {
+            write_log_entry_t e;
+            e.raw64 = write_iter->value;
+            EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_MULTIBYTE) << "Invalid write log entry type";
+        }
+    }
+
+    // Verify the backing store erase
+    {
+        index           = 6;
+        auto write_iter = inst.log_begin() + index;
+        e.raw64         = write_iter->value;
+        EXPECT_TRUE(write_iter->erased) << "Backing store erase did not occur as required";
+    }
+
+    // Verify the backing store writes for consolidation
+    for (index = 7; index < 11; ++index) {
+        auto write_iter = inst.log_begin() + index;
+        EXPECT_EQ(write_iter->address, (index - 7) * BACKING_STORE_WRITE_SIZE) << "Invalid write log entry address";
+    }
+
+    // Verify the FNV1a_64 write
+    {
+        EXPECT_EQ((inst.log_begin() + 11)->address, WEAR_LEVELING_LOGICAL_SIZE) << "Invalid write log address";
+        e.raw32[0] = (inst.log_begin() + 11)->value;
+        e.raw32[1] = (inst.log_begin() + 12)->value;
+        EXPECT_EQ(e.raw64, fnv_64a_buf(testvalue.data(), testvalue.size(), FNV1A_64_INIT)) << "Invalid checksum"; // Note that checksum is based on testvalue, as we overwrote one byte and need to consult the consolidated data, not the current
+    }
+
+    // Verify the final write
+    EXPECT_EQ((inst.log_begin() + 13)->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid write log address";
+
+    // Verify the data is what we expected
+    std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> readback;
+    EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+    EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback did not match";
+
+    // Re-init and re-read, verifying the reload capability
+    EXPECT_NE(wear_leveling_init(), WEAR_LEVELING_FAILED) << "Re-initialisation failed";
+    EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+    EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback did not match";
+}
+
+/**
+ * This test verifies multibyte readback gets canceled with an out-of-bounds address.
+ */
+TEST_F(WearLeveling4Byte, PlaybackReadbackMultibyte_OOB) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Invalid FNV1a_64 hash
+    (logstart + 0)->set(0);
+    (logstart + 1)->set(0);
+
+    // Set up a 2-byte logical write of [0x11,0x12] at logical offset 0x01
+    auto entry0    = LOG_ENTRY_MAKE_MULTIBYTE(0x01, 2);
+    entry0.raw8[3] = 0x11;
+    entry0.raw8[4] = 0x12;
+    (logstart + 2)->set(~entry0.raw32[0]);
+    (logstart + 3)->set(~entry0.raw32[1]);
+
+    // Set up a 2-byte logical write of [0x13,0x14] at logical offset 0x1000 (out of bounds)
+    auto entry1    = LOG_ENTRY_MAKE_MULTIBYTE(0x1000, 2);
+    entry1.raw8[3] = 0x13;
+    entry1.raw8[4] = 0x14;
+    (logstart + 4)->set(~entry1.raw32[0]);
+    (logstart + 5)->set(~entry1.raw32[1]);
+
+    // Set up a 2-byte logical write of [0x15,0x16] at logical offset 0x10
+    auto entry2    = LOG_ENTRY_MAKE_MULTIBYTE(0x01, 2);
+    entry2.raw8[3] = 0x15;
+    entry2.raw8[4] = 0x16;
+    (logstart + 6)->set(~entry2.raw32[0]);
+    (logstart + 7)->set(~entry2.raw32[1]);
+
+    EXPECT_EQ(inst.erasure_count(), 0) << "Invalid initial erase count";
+    EXPECT_EQ(wear_leveling_init(), WEAR_LEVELING_CONSOLIDATED) << "Readback should have failed and triggered consolidation";
+    EXPECT_EQ(inst.erasure_count(), 1) << "Invalid final erase count";
+
+    uint8_t buf[2];
+    wear_leveling_read(0x01, buf, sizeof(buf));
+    EXPECT_EQ(buf[0], 0x11) << "Readback should have maintained the previous pre-failure value from the write log";
+    EXPECT_EQ(buf[1], 0x12) << "Readback should have maintained the previous pre-failure value from the write log";
+}
diff --git a/quantum/wear_leveling/tests/wear_leveling_8byte.cpp b/quantum/wear_leveling/tests/wear_leveling_8byte.cpp
new file mode 100644
index 0000000000..c27c21d034
--- /dev/null
+++ b/quantum/wear_leveling/tests/wear_leveling_8byte.cpp
@@ -0,0 +1,178 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <numeric>
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "backing_mocks.hpp"
+
+class WearLeveling8Byte : public ::testing::Test {
+   protected:
+    void SetUp() override {
+        MockBackingStore::Instance().reset_instance();
+        wear_leveling_init();
+    }
+};
+
+static std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> verify_data;
+
+static wear_leveling_status_t test_write(const uint32_t address, const void* value, size_t length) {
+    memcpy(&verify_data[address], value, length);
+    return wear_leveling_write(address, value, length);
+}
+
+/**
+ * This test verifies that the first write after initialisation occurs after the FNV1a_64 hash location.
+ */
+TEST_F(WearLeveling8Byte, FirstWriteOccursAfterHash) {
+    auto&   inst       = MockBackingStore::Instance();
+    uint8_t test_value = 0x15;
+    test_write(0x02, &test_value, sizeof(test_value));
+    EXPECT_EQ(inst.log_begin()->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid first write address.";
+}
+
+/**
+ * This test verifies that the first write after initialisation occurs after the FNV1a_64 hash location, after an erase has occurred.
+ */
+TEST_F(WearLeveling8Byte, FirstWriteOccursAfterHash_AfterErase) {
+    auto&   inst       = MockBackingStore::Instance();
+    uint8_t test_value = 0x15;
+    wear_leveling_erase();
+    test_write(0x02, &test_value, sizeof(test_value));
+    EXPECT_EQ((inst.log_begin() + 1)->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid first write address.";
+}
+
+/**
+ * This test ensures the correct number of backing store writes occurs with a multibyte write, given the input buffer size.
+ */
+TEST_F(WearLeveling8Byte, MultibyteBackingStoreWriteCounts) {
+    auto& inst = MockBackingStore::Instance();
+
+    for (std::size_t length = 1; length <= 5; ++length) {
+        // Clear things out
+        std::fill(verify_data.begin(), verify_data.end(), 0);
+        inst.reset_instance();
+        wear_leveling_init();
+
+        // Generate a test block of data
+        std::vector<std::uint8_t> testvalue(length);
+        std::iota(testvalue.begin(), testvalue.end(), 0x20);
+
+        // Write the data
+        EXPECT_EQ(test_write(0, testvalue.data(), testvalue.size()), WEAR_LEVELING_SUCCESS) << "Write failed with incorrect status";
+
+        // Check that we got the expected number of write log entries
+        EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), 1);
+    }
+}
+
+/**
+ * This test forces consolidation by writing enough to the write log that it overflows, consolidating the data into the
+ * base logical area.
+ */
+TEST_F(WearLeveling8Byte, ConsolidationOverflow) {
+    auto& inst = MockBackingStore::Instance();
+
+    // Generate a test block of data
+    std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> testvalue;
+
+    // Write the data
+    std::iota(testvalue.begin(), testvalue.end(), 0x20);
+    EXPECT_EQ(test_write(0, testvalue.data(), testvalue.size()), WEAR_LEVELING_CONSOLIDATED) << "Write returned incorrect status";
+    uint8_t dummy = 0x40;
+    EXPECT_EQ(test_write(0x04, &dummy, sizeof(dummy)), WEAR_LEVELING_SUCCESS) << "Write returned incorrect status";
+
+    // Expected log:
+    // [0]: multibyte, 5 bytes, backing address 0x18, logical address 0x00
+    // [1]: multibyte, 5 bytes, backing address 0x20, logical address 0x05
+    // [2]: multibyte, 5 bytes, backing address 0x28, logical address 0x0A, triggers consolidation
+    // [3]: erase
+    // [4]: consolidated data, backing address 0x00, logical address 0x00
+    // [5]: consolidated data, backing address 0x08, logical address 0x08
+    // [6]: FNV1a_64 result, backing address 0x10
+    // [7]: multibyte, 1 byte,  backing address 0x18, logical address 0x04
+    EXPECT_EQ(std::distance(inst.log_begin(), inst.log_end()), 8);
+
+    // Verify the backing store writes for the write log
+    std::size_t       index;
+    write_log_entry_t e;
+    for (index = 0; index < 3; ++index) {
+        auto write_iter = inst.log_begin() + index;
+        EXPECT_EQ(write_iter->address, WEAR_LEVELING_LOGICAL_SIZE + 8 + (index * BACKING_STORE_WRITE_SIZE)) << "Invalid write log address";
+
+        write_log_entry_t e;
+        e.raw64 = write_iter->value;
+        EXPECT_EQ(LOG_ENTRY_GET_TYPE(e), LOG_ENTRY_TYPE_MULTIBYTE) << "Invalid write log entry type";
+    }
+
+    // Verify the backing store erase
+    {
+        index           = 3;
+        auto write_iter = inst.log_begin() + index;
+        e.raw64         = write_iter->value;
+        EXPECT_TRUE(write_iter->erased) << "Backing store erase did not occur as required";
+    }
+
+    // Verify the backing store writes for consolidation
+    for (index = 4; index < 6; ++index) {
+        auto write_iter = inst.log_begin() + index;
+        EXPECT_EQ(write_iter->address, (index - 4) * BACKING_STORE_WRITE_SIZE) << "Invalid write log entry address";
+    }
+
+    // Verify the FNV1a_64 write
+    {
+        EXPECT_EQ((inst.log_begin() + 6)->address, WEAR_LEVELING_LOGICAL_SIZE) << "Invalid write log address";
+        e.raw64 = (inst.log_begin() + 6)->value;
+        EXPECT_EQ(e.raw64, fnv_64a_buf(testvalue.data(), testvalue.size(), FNV1A_64_INIT)) << "Invalid checksum"; // Note that checksum is based on testvalue, as we overwrote one byte and need to consult the consolidated data, not the current
+    }
+
+    // Verify the final write
+    EXPECT_EQ((inst.log_begin() + 7)->address, WEAR_LEVELING_LOGICAL_SIZE + 8) << "Invalid write log address";
+
+    // Verify the data is what we expected
+    std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> readback;
+    EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+    EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback did not match";
+
+    // Re-init and re-read, verifying the reload capability
+    EXPECT_NE(wear_leveling_init(), WEAR_LEVELING_FAILED) << "Re-initialisation failed";
+    EXPECT_EQ(wear_leveling_read(0, readback.data(), WEAR_LEVELING_LOGICAL_SIZE), WEAR_LEVELING_SUCCESS) << "Failed to read back the saved data";
+    EXPECT_TRUE(memcmp(readback.data(), verify_data.data(), WEAR_LEVELING_LOGICAL_SIZE) == 0) << "Readback did not match";
+}
+
+/**
+ * This test verifies multibyte readback gets canceled with an out-of-bounds address.
+ */
+TEST_F(WearLeveling8Byte, PlaybackReadbackMultibyte_OOB) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Invalid FNV1a_64 hash
+    (logstart + 0)->set(0);
+
+    // Set up a 2-byte logical write of [0x11,0x12] at logical offset 0x01
+    auto entry0    = LOG_ENTRY_MAKE_MULTIBYTE(0x01, 2);
+    entry0.raw8[3] = 0x11;
+    entry0.raw8[4] = 0x12;
+    (logstart + 1)->set(~entry0.raw64);
+
+    // Set up a 2-byte logical write of [0x13,0x14] at logical offset 0x1000 (out of bounds)
+    auto entry1    = LOG_ENTRY_MAKE_MULTIBYTE(0x1000, 2);
+    entry1.raw8[3] = 0x13;
+    entry1.raw8[4] = 0x14;
+    (logstart + 2)->set(~entry1.raw64);
+
+    // Set up a 2-byte logical write of [0x15,0x16] at logical offset 0x10
+    auto entry2    = LOG_ENTRY_MAKE_MULTIBYTE(0x01, 2);
+    entry2.raw8[3] = 0x15;
+    entry2.raw8[4] = 0x16;
+    (logstart + 3)->set(~entry2.raw64);
+
+    EXPECT_EQ(inst.erasure_count(), 0) << "Invalid initial erase count";
+    EXPECT_EQ(wear_leveling_init(), WEAR_LEVELING_CONSOLIDATED) << "Readback should have failed and triggered consolidation";
+    EXPECT_EQ(inst.erasure_count(), 1) << "Invalid final erase count";
+
+    uint8_t buf[2];
+    wear_leveling_read(0x01, buf, sizeof(buf));
+    EXPECT_EQ(buf[0], 0x11) << "Readback should have maintained the previous pre-failure value from the write log";
+    EXPECT_EQ(buf[1], 0x12) << "Readback should have maintained the previous pre-failure value from the write log";
+}
diff --git a/quantum/wear_leveling/tests/wear_leveling_general.cpp b/quantum/wear_leveling/tests/wear_leveling_general.cpp
new file mode 100644
index 0000000000..76a4bf7bf3
--- /dev/null
+++ b/quantum/wear_leveling/tests/wear_leveling_general.cpp
@@ -0,0 +1,204 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <numeric>
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "backing_mocks.hpp"
+
+class WearLevelingGeneral : public ::testing::Test {
+   protected:
+    void SetUp() override {
+        MockBackingStore::Instance().reset_instance();
+        wear_leveling_init();
+    }
+};
+
+/**
+ * This test verifies that even if there is consolidated data present, if the checksum doesn't match then the cache is zero'd after reading the consolidated area, but before write log is played back.
+ */
+TEST_F(WearLevelingGeneral, InvalidChecksum_ConsolidatedDataIgnored) {
+    auto& inst     = MockBackingStore::Instance();
+    auto  logstart = inst.storage_begin() + (WEAR_LEVELING_LOGICAL_SIZE / sizeof(backing_store_int_t));
+
+    // Generate a test block of data
+    std::array<std::uint8_t, WEAR_LEVELING_LOGICAL_SIZE> testvalue;
+    std::iota(testvalue.begin(), testvalue.end(), 0x20);
+
+    // Write the data
+    EXPECT_EQ(wear_leveling_write(0, testvalue.data(), testvalue.size()), WEAR_LEVELING_CONSOLIDATED) << "Write returned incorrect status";
+
+    // Invalidate the checksum
+    (logstart + 0)->erase();
+    (logstart + 1)->erase();
+    (logstart + 2)->erase();
+    (logstart + 3)->erase();
+
+    // Set up a 1-byte logical write of [0x11] at logical offset 0x01
+    auto entry0 = LOG_ENTRY_MAKE_OPTIMIZED_64(0x01, 0x11);
+    (logstart + 4)->set(~entry0.raw16[0]);
+
+    // Re-init
+    EXPECT_EQ(wear_leveling_init(), WEAR_LEVELING_SUCCESS) << "Init returned incorrect status";
+    EXPECT_EQ(wear_leveling_read(0, testvalue.data(), testvalue.size()), WEAR_LEVELING_SUCCESS) << "Failed to read";
+    for (int i = 0; i < WEAR_LEVELING_LOGICAL_SIZE; ++i) {
+        EXPECT_EQ(testvalue[i], i == 0x01 ? 0x11 : 0x00) << "Invalid readback";
+    }
+}
+
+/**
+ * This test verifies that writing the same data multiple times does not result in subsequent writes to the backing store.
+ */
+TEST_F(WearLevelingGeneral, SameValue_SingleBackingWrite) {
+    auto& inst = MockBackingStore::Instance();
+
+    uint8_t test_val = 0x14;
+    EXPECT_EQ(wear_leveling_write(0x02, &test_val, sizeof(test_val)), WEAR_LEVELING_SUCCESS) << "First overall write operation should have succeeded";
+
+    uint64_t invoke_count = inst.unlock_invoke_count();
+    uint64_t erase_count  = inst.erase_invoke_count();
+    uint64_t write_count  = inst.write_invoke_count();
+    uint64_t lock_count   = inst.lock_invoke_count();
+
+    for (int i = 0; i < 10; ++i) {
+        EXPECT_EQ(wear_leveling_write(0x02, &test_val, sizeof(test_val)), WEAR_LEVELING_SUCCESS) << "Subsequent overall write operation should have succeeded";
+
+        EXPECT_EQ(inst.unlock_invoke_count(), invoke_count) << "Unlock count should match";
+        EXPECT_EQ(inst.erase_invoke_count(), erase_count) << "Erase count should match";
+        EXPECT_EQ(inst.write_invoke_count(), write_count) << "Write count should match";
+        EXPECT_EQ(inst.lock_invoke_count(), lock_count) << "Lock count should match";
+    }
+}
+
+/**
+ * This test verifies that no other invocations occur if `backing_store_init()` fails.
+ */
+TEST_F(WearLevelingGeneral, InitFailure) {
+    auto& inst = MockBackingStore::Instance();
+    inst.reset_instance(); // make sure the counters are all zero
+    inst.set_init_callback([](std::uint64_t count) { return false; });
+
+    EXPECT_EQ(inst.erasure_count(), 0) << "Invalid initial erase count";
+    EXPECT_EQ(wear_leveling_init(), WEAR_LEVELING_FAILED) << "Init should have failed";
+    EXPECT_EQ(inst.erasure_count(), 0) << "Invalid final erase count";
+
+    EXPECT_EQ(inst.init_invoke_count(), 1) << "Init should have been invoked once";
+    EXPECT_EQ(inst.unlock_invoke_count(), 0) << "Unlock should not have been invoked";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 0) << "Write should not have been invoked";
+    EXPECT_EQ(inst.lock_invoke_count(), 0) << "Lock should not have been invoked";
+}
+
+/**
+ * This test verifies that no invocations occur if the supplied address is out of range while writing.
+ */
+TEST_F(WearLevelingGeneral, WriteFailure_OOB) {
+    auto& inst = MockBackingStore::Instance();
+
+    uint8_t test_val = 0x14;
+    EXPECT_EQ(wear_leveling_write(0x21349830, &test_val, sizeof(test_val)), WEAR_LEVELING_FAILED) << "Overall write operation should have failed";
+
+    EXPECT_EQ(inst.unlock_invoke_count(), 0) << "Unlock should not have been invoked";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 0) << "Write should not have been invoked";
+    EXPECT_EQ(inst.lock_invoke_count(), 0) << "Lock should not have been invoked";
+}
+
+/**
+ * This test verifies that a single write occurs if the supplied address and data length hits the edge of the logical area.
+ */
+TEST_F(WearLevelingGeneral, WriteSuccess_BoundaryOK) {
+    auto& inst = MockBackingStore::Instance();
+
+    uint16_t test_val = 0x14;
+    EXPECT_EQ(wear_leveling_write(WEAR_LEVELING_LOGICAL_SIZE - sizeof(test_val), &test_val, sizeof(test_val)), WEAR_LEVELING_SUCCESS) << "Overall write operation should have succeeded";
+
+    EXPECT_EQ(inst.unlock_invoke_count(), 1) << "Unlock should have been invoked once";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 2) << "Write should have been invoked twice";
+    EXPECT_EQ(inst.lock_invoke_count(), 1) << "Lock should have been invoked once";
+}
+
+/**
+ * This test verifies that no invocations occur if the supplied address and length would generate writes outside the logical range.
+ */
+TEST_F(WearLevelingGeneral, WriteFailure_BoundaryOverflow) {
+    auto& inst = MockBackingStore::Instance();
+
+    uint16_t test_val = 0x14;
+    EXPECT_EQ(wear_leveling_write(WEAR_LEVELING_LOGICAL_SIZE - sizeof(test_val) + 1, &test_val, sizeof(test_val)), WEAR_LEVELING_FAILED) << "Overall write operation should have failed";
+
+    EXPECT_EQ(inst.unlock_invoke_count(), 0) << "Unlock should not have been invoked";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 0) << "Write should not have been invoked";
+    EXPECT_EQ(inst.lock_invoke_count(), 0) << "Lock should not have been invoked";
+}
+
+/**
+ * This test verifies that no invocations occur if the supplied address is out of range while reading.
+ */
+TEST_F(WearLevelingGeneral, ReadFailure_OOB) {
+    auto& inst = MockBackingStore::Instance();
+
+    uint8_t test_val = 0;
+    EXPECT_EQ(wear_leveling_read(0x21349830, &test_val, sizeof(test_val)), WEAR_LEVELING_FAILED) << "Overall read operation should have failed";
+
+    EXPECT_EQ(inst.unlock_invoke_count(), 0) << "Unlock should not have been invoked";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 0) << "Write should not have been invoked";
+    EXPECT_EQ(inst.lock_invoke_count(), 0) << "Lock should not have been invoked";
+}
+
+/**
+ * This test verifies that no write invocations occur if `backing_store_unlock()` fails.
+ */
+TEST_F(WearLevelingGeneral, UnlockFailure_NoWrite) {
+    auto& inst = MockBackingStore::Instance();
+    inst.set_unlock_callback([](std::uint64_t count) { return false; });
+
+    uint8_t test_val = 0x14;
+    EXPECT_EQ(wear_leveling_write(0x04, &test_val, sizeof(test_val)), WEAR_LEVELING_FAILED) << "Overall write operation should have failed";
+
+    EXPECT_EQ(inst.unlock_invoke_count(), 1) << "Unlock should have been invoked once";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 0) << "Write should not have been invoked";
+    EXPECT_EQ(inst.lock_invoke_count(), 0) << "Lock should not have been invoked";
+
+    test_val = 0;
+    wear_leveling_read(0x04, &test_val, sizeof(test_val));
+    EXPECT_EQ(test_val, 0x14) << "Readback should come from cache regardless of unlock failure";
+}
+
+/**
+ * This test verifies that no erase invocations occur if `backing_store_unlock()` fails.
+ */
+TEST_F(WearLevelingGeneral, UnlockFailure_NoErase) {
+    auto& inst = MockBackingStore::Instance();
+    inst.set_unlock_callback([](std::uint64_t count) { return false; });
+
+    EXPECT_EQ(wear_leveling_erase(), WEAR_LEVELING_FAILED) << "Overall erase operation should have failed";
+
+    EXPECT_EQ(inst.unlock_invoke_count(), 1) << "Unlock should have been invoked once";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 0) << "Write should not have been invoked";
+    EXPECT_EQ(inst.lock_invoke_count(), 0) << "Lock should not have been invoked";
+}
+
+/**
+ * This test verifies that only one write invocation occurs if `backing_store_write()` fails.
+ */
+TEST_F(WearLevelingGeneral, WriteFailure_NoSubsequentWrites) {
+    auto& inst = MockBackingStore::Instance();
+    inst.set_write_callback([](std::uint64_t count, std::uint32_t address) { return false; });
+
+    uint8_t test_val = 0x14;
+    EXPECT_EQ(wear_leveling_write(0x04, &test_val, sizeof(test_val)), WEAR_LEVELING_FAILED) << "Overall write operation should have failed";
+
+    EXPECT_EQ(inst.unlock_invoke_count(), 1) << "Unlock should have been invoked once";
+    EXPECT_EQ(inst.erase_invoke_count(), 0) << "Erase should not have been invoked";
+    EXPECT_EQ(inst.write_invoke_count(), 1) << "Write should have been invoked once";
+    EXPECT_EQ(inst.lock_invoke_count(), 1) << "Lock should have been invoked once";
+
+    test_val = 0;
+    wear_leveling_read(0x04, &test_val, sizeof(test_val));
+    EXPECT_EQ(test_val, 0x14) << "Readback should come from cache regardless of unlock failure";
+}
diff --git a/quantum/wear_leveling/wear_leveling.c b/quantum/wear_leveling/wear_leveling.c
new file mode 100644
index 0000000000..8418ae77bf
--- /dev/null
+++ b/quantum/wear_leveling/wear_leveling.c
@@ -0,0 +1,779 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <stdbool.h>
+#include "fnv.h"
+#include "wear_leveling.h"
+#include "wear_leveling_internal.h"
+
+/*
+    This wear leveling algorithm is adapted from algorithms from previous
+    implementations in QMK, namely:
+        - Artur F. (http://engsta.com/stm32-flash-memory-eeprom-emulator/)
+        - Yiancar -- QMK's base implementation for STM32F303
+        - Ilya Zhuravlev -- initial wear leveling algorithm
+        - Don Kjer -- increased flash density algorithm
+        - Nick Brassel (@tzarc) -- decoupled for use on other peripherals
+
+    At this layer, it is assumed that any reads/writes from the backing store
+    have a "reset state" after erasure of zero.
+    It is up to the backing store to perform translation of values, such as
+    taking the complement in order to deal with flash memory's reset value.
+
+    Terminology:
+
+        - Backing store: this is the storage area used by the wear leveling
+            algorithm.
+
+        - Backing size: this is the amount of storage provided by the backing
+            store for use by the wear leveling algorithm.
+
+        - Backing write size: this is the minimum number of bytes the backing
+            store can write in a single operation.
+
+        - Logical data: this is the externally-visible "emulated EEPROM" that
+            external subsystems "see" when performing reads/writes.
+
+        - Logical size: this is the amount of storage available for use
+            externally. Effectively, the "size of the EEPROM".
+
+        - Write log: this is a section of the backing store used to keep track
+            of modifications without overwriting existing data. This log is
+            "played back" on startup such that any subsequent reads are capable
+            of returning the latest data.
+
+        - Consolidated data: this is a section of the backing store reserved for
+            use for the latest copy of logical data. This is only ever written
+            when the write log is full -- the latest values for the logical data
+            are written here and the write log is cleared.
+
+    Configurables:
+
+        - BACKING_STORE_WRITE_SIZE: The number of bytes requires for a write
+            operation. This is defined by the capabilities of the backing store.
+
+        - WEAR_LEVELING_BACKING_SIZE: The number of bytes provided by the
+            backing store for use by the wear leveling algorithm.  This is
+            defined by the capabilities of the backing store. This value must
+            also be at least twice the size of the logical size, as well as a
+            multiple of the logical size.
+
+        - WEAR_LEVELING_LOGICAL_SIZE: The number of bytes externally visible
+            to other subsystems performing reads/writes. This must be a multiple
+            of the write size.
+
+    General algorithm:
+
+        During initialization:
+            * The contents of the consolidated data section are read into cache.
+            * The contents of the write log are "played back" and update the
+                cache accordingly.
+
+        During reads:
+            * Logical data is served from the cache.
+
+        During writes:
+            * The cache is updated with the new data.
+            * A new write log entry is appended to the log.
+            * If the log's full, data is consolidated and the write log cleared.
+
+    Write log structure:
+
+        The first 8 bytes of the write log are a FNV1a_64 hash of the contents
+        of the consolidated data area, in an attempt to detect and guard against
+        any data corruption.
+
+        The write log follows the hash:
+
+        Given that the algorithm needs to cater for 2-, 4-, and 8-byte writes,
+        a variable-length write log entry is used such that the minimal amount
+        of storage is used based off the backing store write size.
+
+        Firstly, an empty log entry is expected to be all zeros. If the backing
+        store uses 0xFF for cleared bytes, it should return the complement, such
+        that this wear-leveling algorithm "receives" zeros.
+
+        For multi-byte writes, up to 8 bytes will be used for each log entry,
+        depending on the size of backing store writes:
+
+        ╔ Multi-byte Log Entry (2, 4-byte) ═╗
+        ║00XXXYYY║YYYYYYYY║YYYYYYYY║AAAAAAAA║
+        ║  └┬┘└┬┘║└──┬───┘║└──┬───┘║└──┬───┘║
+        ║  LenAdd║ Address║ Address║Value[0]║
+        ╚════════╩════════╩════════╩════════╝
+        ╔ Multi-byte Log Entry (2-byte) ══════════════════════╗
+        ║00XXXYYY║YYYYYYYY║YYYYYYYY║AAAAAAAA║BBBBBBBB║CCCCCCCC║
+        ║  └┬┘└┬┘║└──┬───┘║└──┬───┘║└──┬───┘║└──┬───┘║└──┬───┘║
+        ║  LenAdd║ Address║ Address║Value[0]║Value[1]║Value[2]║
+        ╚════════╩════════╩════════╩════════╩════════╩════════╝
+        ╔ Multi-byte Log Entry (2, 4, 8-byte) ══════════════════════════════════╗
+        ║00XXXYYY║YYYYYYYY║YYYYYYYY║AAAAAAAA║BBBBBBBB║CCCCCCCC║DDDDDDDD║EEEEEEEE║
+        ║  └┬┘└┬┘║└──┬───┘║└──┬───┘║└──┬───┘║└──┬───┘║└──┬───┘║└──┬───┘║└──┬───┘║
+        ║  LenAdd║ Address║ Address║Value[0]║Value[1]║Value[2]║Value[3]║Value[4]║
+        ╚════════╩════════╩════════╩════════╩════════╩════════╩════════╩════════╝
+
+        19 bits are used for the address, which allows for a max logical size of
+        512kB. Up to 5 bytes can be included in a single log entry.
+
+        For 2-byte backing store writes, the last two bytes are optional
+            depending on the length of data to be written. Accordingly, either 3
+            or 4 backing store write operations will occur.
+        For 4-byte backing store writes, either one or two write operations
+            occur, depending on the length.
+        For 8-byte backing store writes, one write operation occur.
+
+    2-byte backing store optimizations:
+
+        For single byte writes, addresses between 0...63 are encoded in a single
+        backing store write operation. 4- and 8-byte backing stores do not have
+        this optimization as it does not minimize the number of bytes written.
+
+        ╔ Byte-Entry ════╗
+        ║01XXXXXXYYYYYYYY║
+        ║  └─┬──┘└──┬───┘║
+        ║ Address Value  ║
+        ╚════════════════╝
+        0 <= Address < 0x40 (64)
+
+        A second optimization takes into account uint16_t writes of 0 or 1,
+        specifically catering for KC_NO and KC_TRANSPARENT in the dynamic keymap
+        subsystem. This is valid only for the first 16kB of logical data --
+        addresses outside this range will use the multi-byte encoding above.
+
+        ╔ U16-Encoded 0 ═╗
+        ║100XXXXXXXXXXXXX║
+        ║  │└─────┬─────┘║
+        ║  │Address >> 1 ║
+        ║  └── Value: 0  ║
+        ╚════════════════╝
+        0 <= Address <= 0x3FFE (16382)
+
+        ╔ U16-Encoded 1 ═╗
+        ║101XXXXXXXXXXXXX║
+        ║  │└─────┬─────┘║
+        ║  │Address >> 1 ║
+        ║  └── Value: 1  ║
+        ╚════════════════╝
+        0 <= Address <= 0x3FFE (16382) */
+
+/**
+ * Storage area for the wear-leveling cache.
+ */
+static struct __attribute__((__aligned__(BACKING_STORE_WRITE_SIZE))) {
+    __attribute__((__aligned__(BACKING_STORE_WRITE_SIZE))) uint8_t cache[(WEAR_LEVELING_LOGICAL_SIZE)];
+    uint32_t                                                       write_address;
+    bool                                                           unlocked;
+} wear_leveling;
+
+/**
+ * Locking helper: status
+ */
+typedef enum backing_store_lock_status_t { STATUS_FAILURE = 0, STATUS_SUCCESS, STATUS_UNCHANGED } backing_store_lock_status_t;
+
+/**
+ * Locking helper: unlock
+ */
+static inline backing_store_lock_status_t wear_leveling_unlock(void) {
+    if (wear_leveling.unlocked) {
+        return STATUS_UNCHANGED;
+    }
+    if (!backing_store_unlock()) {
+        return STATUS_FAILURE;
+    }
+    wear_leveling.unlocked = true;
+    return STATUS_SUCCESS;
+}
+
+/**
+ * Locking helper: lock
+ */
+static inline backing_store_lock_status_t wear_leveling_lock(void) {
+    if (!wear_leveling.unlocked) {
+        return STATUS_UNCHANGED;
+    }
+    if (!backing_store_lock()) {
+        return STATUS_FAILURE;
+    }
+    wear_leveling.unlocked = false;
+    return STATUS_SUCCESS;
+}
+
+/**
+ * Resets the cache, ensuring the write address is correctly initialised.
+ */
+static void wear_leveling_clear_cache(void) {
+    memset(wear_leveling.cache, 0, (WEAR_LEVELING_LOGICAL_SIZE));
+    wear_leveling.write_address = (WEAR_LEVELING_LOGICAL_SIZE) + 8; // +8 is due to the FNV1a_64 of the consolidated buffer
+}
+
+/**
+ * Reads the consolidated data from the backing store into the cache.
+ * Does not consider the write log.
+ */
+static wear_leveling_status_t wear_leveling_read_consolidated(void) {
+    wl_dprintf("Reading consolidated data\n");
+
+    wear_leveling_status_t status = WEAR_LEVELING_SUCCESS;
+    for (int address = 0; address < (WEAR_LEVELING_LOGICAL_SIZE); address += (BACKING_STORE_WRITE_SIZE)) {
+        backing_store_int_t *const loc = (backing_store_int_t *)&wear_leveling.cache[address];
+        backing_store_int_t        temp;
+        bool                       ok = backing_store_read(address, &temp);
+        if (!ok) {
+            wl_dprintf("Failed to read from backing store\n");
+            status = WEAR_LEVELING_FAILED;
+            break;
+        }
+        *loc = temp;
+    }
+
+    // Verify the FNV1a_64 result
+    if (status != WEAR_LEVELING_FAILED) {
+        uint64_t          expected = fnv_64a_buf(wear_leveling.cache, (WEAR_LEVELING_LOGICAL_SIZE), FNV1A_64_INIT);
+        write_log_entry_t entry;
+#if BACKING_STORE_WRITE_SIZE == 2
+        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 0, &entry.raw16[0]);
+        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 2, &entry.raw16[1]);
+        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 4, &entry.raw16[2]);
+        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 6, &entry.raw16[3]);
+#elif BACKING_STORE_WRITE_SIZE == 4
+        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 0, &entry.raw32[0]);
+        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 4, &entry.raw32[1]);
+#elif BACKING_STORE_WRITE_SIZE == 8
+        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 0, &entry.raw64);
+#endif
+        // If we have a mismatch, clear the cache but do not flag a failure,
+        // which will cater for the completely clean MCU case.
+        if (entry.raw64 != expected) {
+            wear_leveling_clear_cache();
+        }
+    }
+
+    // If we failed for any reason, then clear the cache
+    if (status == WEAR_LEVELING_FAILED) {
+        wear_leveling_clear_cache();
+    }
+
+    return status;
+}
+
+/**
+ * Writes the current cache to consolidated data at the beginning of the backing store.
+ * Does not clear the write log.
+ */
+static wear_leveling_status_t wear_leveling_write_consolidated(void) {
+    wl_dprintf("Writing consolidated data\n");
+
+    wear_leveling_status_t      status      = WEAR_LEVELING_CONSOLIDATED;
+    backing_store_lock_status_t lock_status = wear_leveling_unlock();
+    for (int address = 0; address < (WEAR_LEVELING_LOGICAL_SIZE); address += (BACKING_STORE_WRITE_SIZE)) {
+        const backing_store_int_t value = *(backing_store_int_t *)&wear_leveling.cache[address];
+        backing_store_int_t       temp;
+        bool                      ok = backing_store_read(address, &temp);
+        if (!ok) {
+            wl_dprintf("Failed to read from backing store\n");
+            status = WEAR_LEVELING_FAILED;
+            break;
+        }
+        if (temp != value) {
+            ok = backing_store_write(address, value);
+            if (!ok) {
+                wl_dprintf("Failed to write to backing store\n");
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+        }
+    }
+
+    if (status != WEAR_LEVELING_FAILED) {
+        // Write out the FNV1a_64 result of the consolidated data
+        write_log_entry_t entry;
+        entry.raw64 = fnv_64a_buf(wear_leveling.cache, (WEAR_LEVELING_LOGICAL_SIZE), FNV1A_64_INIT);
+        do {
+#if BACKING_STORE_WRITE_SIZE == 2
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 0, entry.raw16[0])) {
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 2, entry.raw16[1])) {
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 4, entry.raw16[2])) {
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 6, entry.raw16[3])) {
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+#elif BACKING_STORE_WRITE_SIZE == 4
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 0, entry.raw32[0])) {
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 4, entry.raw32[1])) {
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+#elif BACKING_STORE_WRITE_SIZE == 8
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 0, entry.raw64)) {
+                status = WEAR_LEVELING_FAILED;
+                break;
+            }
+#endif
+        } while (0);
+    }
+
+    if (lock_status == STATUS_SUCCESS) {
+        wear_leveling_lock();
+    }
+    return status;
+}
+
+/**
+ * Forces a write of the current cache.
+ * Erases the backing store, including the write log.
+ * During this operation, there is the potential for data loss if a power loss occurs.
+ */
+static wear_leveling_status_t wear_leveling_consolidate_force(void) {
+    wl_dprintf("Erasing backing store\n");
+
+    // Erase the backing store. Expectation is that any un-written values that are read back after this call come back as zero.
+    bool ok = backing_store_erase();
+    if (!ok) {
+        wl_dprintf("Failed to erase backing store\n");
+        return WEAR_LEVELING_FAILED;
+    }
+
+    // Write the cache to the first section of the backing store.
+    wear_leveling_status_t status = wear_leveling_write_consolidated();
+    if (status == WEAR_LEVELING_FAILED) {
+        wl_dprintf("Failed to write consolidated data\n");
+    }
+
+    // Next write of the log occurs after the consolidated values at the start of the backing store.
+    wear_leveling.write_address = (WEAR_LEVELING_LOGICAL_SIZE) + 8; // +8 due to the FNV1a_64 of the consolidated area
+
+    return status;
+}
+
+/**
+ * Potential write of the current cache to the backing store.
+ * Skipped if the current write log position is not at the end of the backing store.
+ * During this operation, there is the potential for data loss if a power loss occurs.
+ *
+ * @return true if consolidation occurred
+ */
+static wear_leveling_status_t wear_leveling_consolidate_if_needed(void) {
+    if (wear_leveling.write_address >= (WEAR_LEVELING_BACKING_SIZE)) {
+        return wear_leveling_consolidate_force();
+    }
+
+    return WEAR_LEVELING_SUCCESS;
+}
+
+/**
+ * Appends the supplied fixed-width entry to the write log, optionally consolidating if the log is full.
+ *
+ * @return true if consolidation occurred
+ */
+static wear_leveling_status_t wear_leveling_append_raw(backing_store_int_t value) {
+    bool ok = backing_store_write(wear_leveling.write_address, value);
+    if (!ok) {
+        wl_dprintf("Failed to write to backing store\n");
+        return WEAR_LEVELING_FAILED;
+    }
+    wear_leveling.write_address += (BACKING_STORE_WRITE_SIZE);
+    return wear_leveling_consolidate_if_needed();
+}
+
+/**
+ * Handles writing multi_byte-encoded data to the backing store.
+ *
+ * @return true if consolidation occurred
+ */
+static wear_leveling_status_t wear_leveling_write_raw_multibyte(uint32_t address, const void *value, size_t length) {
+    const uint8_t *   p   = value;
+    write_log_entry_t log = LOG_ENTRY_MAKE_MULTIBYTE(address, length);
+    for (size_t i = 0; i < length; ++i) {
+        log.raw8[3 + i] = p[i];
+    }
+
+    // Write to the backing store. See the multi-byte log format in the documentation header at the top of the file.
+    wear_leveling_status_t status;
+#if BACKING_STORE_WRITE_SIZE == 2
+    status = wear_leveling_append_raw(log.raw16[0]);
+    if (status != WEAR_LEVELING_SUCCESS) {
+        return status;
+    }
+
+    status = wear_leveling_append_raw(log.raw16[1]);
+    if (status != WEAR_LEVELING_SUCCESS) {
+        return status;
+    }
+
+    if (length > 1) {
+        status = wear_leveling_append_raw(log.raw16[2]);
+        if (status != WEAR_LEVELING_SUCCESS) {
+            return status;
+        }
+    }
+
+    if (length > 3) {
+        status = wear_leveling_append_raw(log.raw16[3]);
+        if (status != WEAR_LEVELING_SUCCESS) {
+            return status;
+        }
+    }
+#elif BACKING_STORE_WRITE_SIZE == 4
+    status = wear_leveling_append_raw(log.raw32[0]);
+    if (status != WEAR_LEVELING_SUCCESS) {
+        return status;
+    }
+
+    if (length > 1) {
+        status = wear_leveling_append_raw(log.raw32[1]);
+        if (status != WEAR_LEVELING_SUCCESS) {
+            return status;
+        }
+    }
+#elif BACKING_STORE_WRITE_SIZE == 8
+    status = wear_leveling_append_raw(log.raw64);
+    if (status != WEAR_LEVELING_SUCCESS) {
+        return status;
+    }
+#endif
+    return status;
+}
+
+/**
+ * Handles the actual writing of logical data into the write log section of the backing store.
+ */
+static wear_leveling_status_t wear_leveling_write_raw(uint32_t address, const void *value, size_t length) {
+    const uint8_t *        p         = value;
+    size_t                 remaining = length;
+    wear_leveling_status_t status    = WEAR_LEVELING_SUCCESS;
+    while (remaining > 0) {
+#if BACKING_STORE_WRITE_SIZE == 2
+        // Small-write optimizations - uint16_t, 0 or 1, address is even, address <16384:
+        if (remaining >= 2 && address % 2 == 0 && address < 16384) {
+            const uint16_t v = *(const uint16_t *)p;
+            if (v == 0 || v == 1) {
+                const write_log_entry_t log = LOG_ENTRY_MAKE_WORD_01(address, v);
+                status                      = wear_leveling_append_raw(log.raw16[0]);
+                if (status != WEAR_LEVELING_SUCCESS) {
+                    // If consolidation occurred, then the cache has already been written to the consolidated area. No need to continue.
+                    // If a failure occurred, pass it on.
+                    return status;
+                }
+
+                remaining -= 2;
+                address += 2;
+                p += 2;
+                continue;
+            }
+        }
+
+        // Small-write optimizations - address<64:
+        if (address < 64) {
+            const write_log_entry_t log = LOG_ENTRY_MAKE_OPTIMIZED_64(address, *p);
+            status                      = wear_leveling_append_raw(log.raw16[0]);
+            if (status != WEAR_LEVELING_SUCCESS) {
+                // If consolidation occurred, then the cache has already been written to the consolidated area. No need to continue.
+                // If a failure occurred, pass it on.
+                return status;
+            }
+
+            remaining--;
+            address++;
+            p++;
+            continue;
+        }
+#endif // BACKING_STORE_WRITE_SIZE == 2
+        const size_t this_length = remaining >= LOG_ENTRY_MULTIBYTE_MAX_BYTES ? LOG_ENTRY_MULTIBYTE_MAX_BYTES : remaining;
+        status                   = wear_leveling_write_raw_multibyte(address, p, this_length);
+        if (status != WEAR_LEVELING_SUCCESS) {
+            // If consolidation occurred, then the cache has already been written to the consolidated area. No need to continue.
+            // If a failure occurred, pass it on.
+            return status;
+        }
+        remaining -= this_length;
+        address += (uint32_t)this_length;
+        p += this_length;
+    }
+
+    return status;
+}
+
+/**
+ * "Replays" the write log from the backing store, updating the local cache with updated values.
+ */
+static wear_leveling_status_t wear_leveling_playback_log(void) {
+    wl_dprintf("Playback write log\n");
+
+    wear_leveling_status_t status          = WEAR_LEVELING_SUCCESS;
+    bool                   cancel_playback = false;
+    uint32_t               address         = (WEAR_LEVELING_LOGICAL_SIZE) + 8; // +8 due to the FNV1a_64 of the consolidated area
+    while (!cancel_playback && address < (WEAR_LEVELING_BACKING_SIZE)) {
+        backing_store_int_t value;
+        bool                ok = backing_store_read(address, &value);
+        if (!ok) {
+            wl_dprintf("Failed to load from backing store, skipping playback of write log\n");
+            cancel_playback = true;
+            status          = WEAR_LEVELING_FAILED;
+            break;
+        }
+        if (value == 0) {
+            wl_dprintf("Found empty slot, no more log entries\n");
+            cancel_playback = true;
+            break;
+        }
+
+        // If we got a nonzero value, then we need to increment the address to ensure next write occurs at next location
+        address += (BACKING_STORE_WRITE_SIZE);
+
+        // Read from the write log
+        write_log_entry_t log;
+#if BACKING_STORE_WRITE_SIZE == 2
+        log.raw16[0] = value;
+#elif BACKING_STORE_WRITE_SIZE == 4
+        log.raw32[0] = value;
+#elif BACKING_STORE_WRITE_SIZE == 8
+        log.raw64 = value;
+#endif
+
+        switch (LOG_ENTRY_GET_TYPE(log)) {
+            case LOG_ENTRY_TYPE_MULTIBYTE: {
+#if BACKING_STORE_WRITE_SIZE == 2
+                ok = backing_store_read(address, &log.raw16[1]);
+                if (!ok) {
+                    wl_dprintf("Failed to load from backing store, skipping playback of write log\n");
+                    cancel_playback = true;
+                    status          = WEAR_LEVELING_FAILED;
+                    break;
+                }
+                address += (BACKING_STORE_WRITE_SIZE);
+#endif // BACKING_STORE_WRITE_SIZE == 2
+                const uint32_t a = LOG_ENTRY_MULTIBYTE_GET_ADDRESS(log);
+                const uint8_t  l = LOG_ENTRY_MULTIBYTE_GET_LENGTH(log);
+
+                if (a + l > (WEAR_LEVELING_LOGICAL_SIZE)) {
+                    cancel_playback = true;
+                    status          = WEAR_LEVELING_FAILED;
+                    break;
+                }
+
+#if BACKING_STORE_WRITE_SIZE == 2
+                if (l > 1) {
+                    ok = backing_store_read(address, &log.raw16[2]);
+                    if (!ok) {
+                        wl_dprintf("Failed to load from backing store, skipping playback of write log\n");
+                        cancel_playback = true;
+                        status          = WEAR_LEVELING_FAILED;
+                        break;
+                    }
+                    address += (BACKING_STORE_WRITE_SIZE);
+                }
+                if (l > 3) {
+                    ok = backing_store_read(address, &log.raw16[3]);
+                    if (!ok) {
+                        wl_dprintf("Failed to load from backing store, skipping playback of write log\n");
+                        cancel_playback = true;
+                        status          = WEAR_LEVELING_FAILED;
+                        break;
+                    }
+                    address += (BACKING_STORE_WRITE_SIZE);
+                }
+#elif BACKING_STORE_WRITE_SIZE == 4
+                if (l > 1) {
+                    ok = backing_store_read(address, &log.raw32[1]);
+                    if (!ok) {
+                        wl_dprintf("Failed to load from backing store, skipping playback of write log\n");
+                        cancel_playback = true;
+                        status = WEAR_LEVELING_FAILED;
+                        break;
+                    }
+                    address += (BACKING_STORE_WRITE_SIZE);
+                }
+#endif
+
+                memcpy(&wear_leveling.cache[a], &log.raw8[3], l);
+            } break;
+#if BACKING_STORE_WRITE_SIZE == 2
+            case LOG_ENTRY_TYPE_OPTIMIZED_64: {
+                const uint32_t a = LOG_ENTRY_OPTIMIZED_64_GET_ADDRESS(log);
+                const uint8_t  v = LOG_ENTRY_OPTIMIZED_64_GET_VALUE(log);
+
+                if (a >= (WEAR_LEVELING_LOGICAL_SIZE)) {
+                    cancel_playback = true;
+                    status          = WEAR_LEVELING_FAILED;
+                    break;
+                }
+
+                wear_leveling.cache[a] = v;
+            } break;
+            case LOG_ENTRY_TYPE_WORD_01: {
+                const uint32_t a = LOG_ENTRY_WORD_01_GET_ADDRESS(log);
+                const uint8_t  v = LOG_ENTRY_WORD_01_GET_VALUE(log);
+
+                if (a + 1 >= (WEAR_LEVELING_LOGICAL_SIZE)) {
+                    cancel_playback = true;
+                    status          = WEAR_LEVELING_FAILED;
+                    break;
+                }
+
+                wear_leveling.cache[a + 0] = v;
+                wear_leveling.cache[a + 1] = 0;
+            } break;
+#endif // BACKING_STORE_WRITE_SIZE == 2
+            default: {
+                cancel_playback = true;
+                status          = WEAR_LEVELING_FAILED;
+            } break;
+        }
+    }
+
+    // We've reached the end of the log, so we're at the new write location
+    wear_leveling.write_address = address;
+
+    if (status == WEAR_LEVELING_FAILED) {
+        // If we had a failure during readback, assume we're corrupted -- force a consolidation with the data we already have
+        status = wear_leveling_consolidate_force();
+    } else {
+        // Consolidate the cache + write log if required
+        status = wear_leveling_consolidate_if_needed();
+    }
+
+    return status;
+}
+
+/**
+ * Wear-leveling initialization
+ */
+wear_leveling_status_t wear_leveling_init(void) {
+    wl_dprintf("Init\n");
+
+    // Reset the cache
+    wear_leveling_clear_cache();
+
+    // Initialise the backing store
+    if (!backing_store_init()) {
+        // If it failed, clear the cache and return with failure
+        wear_leveling_clear_cache();
+        return WEAR_LEVELING_FAILED;
+    }
+
+    // Read the previous consolidated values, then replay the existing write log so that the cache has the "live" values
+    wear_leveling_status_t status = wear_leveling_read_consolidated();
+    if (status == WEAR_LEVELING_FAILED) {
+        // If it failed, clear the cache and return with failure
+        wear_leveling_clear_cache();
+        return status;
+    }
+
+    status = wear_leveling_playback_log();
+    if (status == WEAR_LEVELING_FAILED) {
+        // If it failed, clear the cache and return with failure
+        wear_leveling_clear_cache();
+        return status;
+    }
+
+    return status;
+}
+
+/**
+ * Wear-leveling erase.
+ * Post-condition: any reads from the backing store directly after an erase operation must come back as zero.
+ */
+wear_leveling_status_t wear_leveling_erase(void) {
+    wl_dprintf("Erase\n");
+
+    // Unlock the backing store
+    backing_store_lock_status_t lock_status = wear_leveling_unlock();
+    if (lock_status == STATUS_FAILURE) {
+        wear_leveling_lock();
+        return WEAR_LEVELING_FAILED;
+    }
+
+    // Perform the erase
+    bool ret = backing_store_erase();
+    wear_leveling_clear_cache();
+
+    // Lock the backing store if we acquired the lock successfully
+    if (lock_status == STATUS_SUCCESS) {
+        ret &= (wear_leveling_lock() != STATUS_FAILURE);
+    }
+
+    return ret ? WEAR_LEVELING_SUCCESS : WEAR_LEVELING_FAILED;
+}
+
+/**
+ * Writes logical data into the backing store. Skips writes if there are no changes to values.
+ */
+wear_leveling_status_t wear_leveling_write(const uint32_t address, const void *value, size_t length) {
+    wl_assert(address + length <= (WEAR_LEVELING_LOGICAL_SIZE));
+    if (address + length > (WEAR_LEVELING_LOGICAL_SIZE)) {
+        return WEAR_LEVELING_FAILED;
+    }
+
+    wl_dprintf("Write ");
+    wl_dump(address, value, length);
+
+    // Skip write if there's no change compared to the current cached value
+    if (memcmp(value, &wear_leveling.cache[address], length) == 0) {
+        return true;
+    }
+
+    // Update the cache before writing to the backing store -- if we hit the end of the backing store during writes to the log then we'll force a consolidation in-line
+    memcpy(&wear_leveling.cache[address], value, length);
+
+    // Unlock the backing store
+    backing_store_lock_status_t lock_status = wear_leveling_unlock();
+    if (lock_status == STATUS_FAILURE) {
+        wear_leveling_lock();
+        return WEAR_LEVELING_FAILED;
+    }
+
+    // Perform the actual write
+    wear_leveling_status_t status = wear_leveling_write_raw(address, value, length);
+    switch (status) {
+        case WEAR_LEVELING_CONSOLIDATED:
+        case WEAR_LEVELING_FAILED:
+            // If the write triggered consolidation, or the write failed, then nothing else needs to occur.
+            break;
+
+        case WEAR_LEVELING_SUCCESS:
+            // Consolidate the cache + write log if required
+            status = wear_leveling_consolidate_if_needed();
+            break;
+
+        default:
+            // Unsure how we'd get here...
+            status = WEAR_LEVELING_FAILED;
+            break;
+    }
+
+    if (lock_status == STATUS_SUCCESS) {
+        if (wear_leveling_lock() == STATUS_FAILURE) {
+            status = WEAR_LEVELING_FAILED;
+        }
+    }
+
+    return status;
+}
+
+/**
+ * Reads logical data from the cache.
+ */
+wear_leveling_status_t wear_leveling_read(const uint32_t address, void *value, size_t length) {
+    wl_assert(address + length <= (WEAR_LEVELING_LOGICAL_SIZE));
+    if (address + length > (WEAR_LEVELING_LOGICAL_SIZE)) {
+        return WEAR_LEVELING_FAILED;
+    }
+
+    // Only need to copy from the cache
+    memcpy(value, &wear_leveling.cache[address], length);
+
+    wl_dprintf("Read  ");
+    wl_dump(address, value, length);
+    return WEAR_LEVELING_SUCCESS;
+}
diff --git a/quantum/wear_leveling/wear_leveling.h b/quantum/wear_leveling/wear_leveling.h
new file mode 100644
index 0000000000..6641bc49b3
--- /dev/null
+++ b/quantum/wear_leveling/wear_leveling.h
@@ -0,0 +1,54 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * @typedef Status returned from any wear-leveling API.
+ */
+typedef enum wear_leveling_status_t {
+    WEAR_LEVELING_FAILED,      //< Invocation failed
+    WEAR_LEVELING_SUCCESS,     //< Invocation succeeded
+    WEAR_LEVELING_CONSOLIDATED //< Invocation succeeded, consolidation occurred
+} wear_leveling_status_t;
+
+/**
+ * Wear-leveling initialization
+ *
+ * @return Status of the request
+ */
+wear_leveling_status_t wear_leveling_init(void);
+
+/**
+ * Wear-leveling erasure.
+ *
+ * Clears the wear-leveling area, with the definition that the "reset state" of all data is zero.
+ *
+ * @return Status of the request
+ */
+wear_leveling_status_t wear_leveling_erase(void);
+
+/**
+ * Writes logical data into the backing store.
+ *
+ * Skips writes if there are no changes to written values. The entire written block is considered when attempting to
+ * determine if an overwrite should occur -- if there is any data mismatch the entire block will be written to the log,
+ * not just the changed bytes.
+ *
+ * @param address[in] the logical address to write data
+ * @param value[in] pointer to the source buffer
+ * @param length[in] length of the data
+ * @return Status of the request
+ */
+wear_leveling_status_t wear_leveling_write(uint32_t address, const void* value, size_t length);
+
+/**
+ * Reads logical data from the cache.
+ *
+ * @param address[in] the logical address to read data
+ * @param value[out] pointer to the destination buffer
+ * @param length[in] length of the data
+ * @return Status of the request
+ */
+wear_leveling_status_t wear_leveling_read(uint32_t address, void* value, size_t length);
diff --git a/quantum/wear_leveling/wear_leveling_internal.h b/quantum/wear_leveling/wear_leveling_internal.h
new file mode 100644
index 0000000000..74b43932df
--- /dev/null
+++ b/quantum/wear_leveling/wear_leveling_internal.h
@@ -0,0 +1,145 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef __cplusplus
+#    define _Static_assert static_assert
+#endif
+
+#include <stdint.h>
+#include <string.h>
+
+#if BACKING_STORE_WRITE_SIZE == 2
+typedef uint16_t backing_store_int_t;
+#elif BACKING_STORE_WRITE_SIZE == 4
+typedef uint32_t backing_store_int_t;
+#elif BACKING_STORE_WRITE_SIZE == 8
+typedef uint64_t backing_store_int_t;
+#else
+#    error Invalid BACKING_STORE_WRITE_SIZE, needs to be 2/4/8.
+#endif
+
+#ifndef WEAR_LEVELING_BACKING_SIZE
+#    error WEAR_LEVELING_BACKING_SIZE was not set.
+#endif
+
+#ifndef WEAR_LEVELING_LOGICAL_SIZE
+#    error WEAR_LEVELING_LOGICAL_SIZE was not set.
+#endif
+
+#ifdef WEAR_LEVELING_DEBUG_OUTPUT
+#    include <stdio.h>
+#    define wl_dprintf(...) printf("Wear leveling: " __VA_ARGS__)
+#    define wl_dump(address, value, length)             \
+        do {                                            \
+            printf("[0x%04X]: ", (int)(address));       \
+            const uint8_t* p = (const uint8_t*)(value); \
+            for (int i = 0; i < (length); ++i) {        \
+                printf(" %02X", (int)p[i]);             \
+            }                                           \
+            printf("\n");                               \
+        } while (0)
+#else
+#    define wl_dprintf(...) \
+        do {                \
+        } while (0)
+#    define wl_dump(...) \
+        do {             \
+        } while (0)
+#endif // WEAR_LEVELING_DEBUG_OUTPUT
+
+#ifdef WEAR_LEVELING_ASSERTS
+#    include <assert.h>
+#    define wl_assert(...) assert(__VA_ARGS__)
+#else
+#    define wl_assert(...) \
+        do {               \
+        } while (0)
+#endif // WEAR_LEVELING_ASSERTS
+
+// Compile-time validation of configurable options
+_Static_assert(WEAR_LEVELING_BACKING_SIZE >= (WEAR_LEVELING_LOGICAL_SIZE * 2), "Total backing size must be at least twice the size of the logical size");
+_Static_assert(WEAR_LEVELING_LOGICAL_SIZE % BACKING_STORE_WRITE_SIZE == 0, "Logical size must be a multiple of write size");
+_Static_assert(WEAR_LEVELING_BACKING_SIZE % WEAR_LEVELING_LOGICAL_SIZE == 0, "Backing size must be a multiple of logical size");
+
+// Backing Store API, to be implemented elsewhere by flash driver etc.
+bool backing_store_init(void);
+bool backing_store_unlock(void);
+bool backing_store_erase(void);
+bool backing_store_write(uint32_t address, backing_store_int_t value);
+bool backing_store_lock(void);
+bool backing_store_read(uint32_t address, backing_store_int_t* value);
+
+/**
+ * Helper type used to contain a write log entry.
+ */
+typedef union write_log_entry_t {
+    uint64_t raw64;
+    uint32_t raw32[2];
+    uint16_t raw16[4];
+    uint8_t  raw8[8];
+} write_log_entry_t;
+
+_Static_assert(sizeof(write_log_entry_t) == 8, "Wear leveling write log entry size was not 8");
+
+/**
+ * Log entry type discriminator.
+ */
+enum {
+    // 0x00 -- Multi-byte storage type
+    LOG_ENTRY_TYPE_MULTIBYTE,
+
+    // 0x01 -- 2-byte backing store write optimization: address < 64
+    LOG_ENTRY_TYPE_OPTIMIZED_64,
+
+    // 0x02 -- 2-byte backing store write optimization: word-encoded 0/1 values
+    LOG_ENTRY_TYPE_WORD_01,
+
+    LOG_ENTRY_TYPES
+};
+
+_Static_assert(LOG_ENTRY_TYPES <= (1 << 2), "Too many log entry types to fit into 2 bits of storage");
+
+#define BITMASK_FOR_BITCOUNT(n) ((1 << (n)) - 1)
+
+#define LOG_ENTRY_GET_TYPE(entry) (((entry).raw8[0] >> 6) & BITMASK_FOR_BITCOUNT(2))
+
+#define LOG_ENTRY_MULTIBYTE_MAX_BYTES 5
+#define LOG_ENTRY_MULTIBYTE_GET_ADDRESS(entry) (((((uint32_t)((entry).raw8[0])) & BITMASK_FOR_BITCOUNT(3)) << 16) | (((uint32_t)((entry).raw8[1])) << 8) | (entry).raw8[2])
+#define LOG_ENTRY_MULTIBYTE_GET_LENGTH(entry) ((uint8_t)(((entry).raw8[0] >> 3) & BITMASK_FOR_BITCOUNT(3)))
+#define LOG_ENTRY_MAKE_MULTIBYTE(address, length)                                                       \
+    (write_log_entry_t) {                                                                               \
+        .raw8 = {                                                                                       \
+            [0] = (((((uint8_t)LOG_ENTRY_TYPE_MULTIBYTE) & BITMASK_FOR_BITCOUNT(2)) << 6) /* type */    \
+                   | ((((uint8_t)(length)) & BITMASK_FOR_BITCOUNT(3)) << 3)               /* length */  \
+                   | ((((uint8_t)((address) >> 16))) & BITMASK_FOR_BITCOUNT(3))           /* address */ \
+                   ),                                                                                   \
+            [1] = (((uint8_t)((address) >> 8)) & BITMASK_FOR_BITCOUNT(8)), /* address */                \
+            [2] = (((uint8_t)(address)) & BITMASK_FOR_BITCOUNT(8)),        /* address */                \
+        }                                                                                               \
+    }
+
+#define LOG_ENTRY_OPTIMIZED_64_GET_ADDRESS(entry) ((uint32_t)((entry).raw8[0] & BITMASK_FOR_BITCOUNT(6)))
+#define LOG_ENTRY_OPTIMIZED_64_GET_VALUE(entry) ((entry).raw8[1])
+#define LOG_ENTRY_MAKE_OPTIMIZED_64(address, value)                                                        \
+    (write_log_entry_t) {                                                                                  \
+        .raw8 = {                                                                                          \
+            [0] = (((((uint8_t)LOG_ENTRY_TYPE_OPTIMIZED_64) & BITMASK_FOR_BITCOUNT(2)) << 6) /* type */    \
+                   | ((((uint8_t)(address))) & BITMASK_FOR_BITCOUNT(6))                      /* address */ \
+                   ),                                                                                      \
+            [1] = ((uint8_t)(value)), /* value */                                                          \
+        }                                                                                                  \
+    }
+
+#define LOG_ENTRY_WORD_01_GET_ADDRESS(entry) ((((uint32_t)(((entry).raw8[0]) & BITMASK_FOR_BITCOUNT(5))) << 9) | (((uint32_t)((entry).raw8[1])) << 1))
+#define LOG_ENTRY_WORD_01_GET_VALUE(entry) ((uint8_t)((entry).raw8[0] >> 5) & BITMASK_FOR_BITCOUNT(1))
+#define LOG_ENTRY_MAKE_WORD_01(address, value)                                                        \
+    (write_log_entry_t) {                                                                             \
+        .raw8 = {                                                                                     \
+            [0] = (((((uint8_t)LOG_ENTRY_TYPE_WORD_01) & BITMASK_FOR_BITCOUNT(2)) << 6) /* type */    \
+                   | (((((uint8_t)((value) ? 1 : 0))) & BITMASK_FOR_BITCOUNT(1)) << 5)  /* value */   \
+                   | ((((uint8_t)((address) >> 9))) & BITMASK_FOR_BITCOUNT(5))          /* address */ \
+                   ),                                                                                 \
+            [1] = (uint8_t)((address) >> 1), /* address */                                            \
+        }                                                                                             \
+    }

From dcdc7290e5e800689876c4d3ba393e926f966fbe Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Wed, 29 Jun 2022 09:25:03 +0100
Subject: [PATCH 051/959] RGB Matrix Heatmap - Skip positions with NO_LED
 (#17488)

---
 quantum/rgb_matrix/animations/typing_heatmap_anim.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quantum/rgb_matrix/animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
index cfc3fc015b..a05c07760e 100644
--- a/quantum/rgb_matrix/animations/typing_heatmap_anim.h
+++ b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
@@ -18,8 +18,14 @@ void process_rgb_matrix_typing_heatmap(uint8_t row, uint8_t col) {
     // Limit effect to pressed keys
     g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32);
 #        else
+    if (g_led_config.matrix_co[row][col] == NO_LED) { // skip as pressed key doesn't have an led position
+        return;
+    }
     for (uint8_t i_row = 0; i_row < MATRIX_ROWS; i_row++) {
         for (uint8_t i_col = 0; i_col < MATRIX_COLS; i_col++) {
+            if (g_led_config.matrix_co[i_row][i_col] == NO_LED) { // skip as target key doesn't have an led position
+                continue;
+            }
             if (i_row == row && i_col == col) {
                 g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32);
             } else {

From 1204cbb7ea53ff1e4e2aeb45e2cd0f371d30dcec Mon Sep 17 00:00:00 2001
From: ihatechoosingusernames <andrew.kevin.ellison@gmail.com>
Date: Wed, 29 Jun 2022 11:39:37 +0300
Subject: [PATCH 052/959] Update feature_split_keyboard.md to add extra detail
 about left and right matrices. (#17492)

---
 docs/feature_split_keyboard.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index 4cd0768377..e53b3525cb 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -370,7 +370,7 @@ There are some settings that you may need to configure, based on how the hardwar
 #define MATRIX_COL_PINS_RIGHT { <col pins> }
 ```
 
-This allows you to specify a different set of pins for the matrix on the right side.  This is useful if you have a board with differently-shaped halves that requires a different configuration (such as Keebio's Quefrency).
+This allows you to specify a different set of pins for the matrix on the right side.  This is useful if you have a board with differently-shaped halves that requires a different configuration (such as Keebio's Quefrency). The number of pins in the right and left matrices must be the same, if you have a board with a different number of rows or columns on one side, pad out the extra spaces with `NO_PIN` and make sure you add the unused rows or columns to your matrix.
 
 ```c
 #define DIRECT_PINS_RIGHT { { F1, F0, B0, C7 }, { F4, F5, F6, F7 } }

From 34e244cecf62afb30ee5a4362867f24b03675691 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 30 Jun 2022 07:42:23 +1000
Subject: [PATCH 053/959] Wear-leveling EEPROM drivers: `embedded_flash`,
 `spi_flash`, `legacy` (#17376)

---
 builddefs/build_keyboard.mk                   |  16 ++
 builddefs/common_features.mk                  |  44 +++++-
 docs/_summary.md                              |   1 +
 docs/eeprom_driver.md                         |  83 ++++++++++-
 drivers/eeprom/eeprom_wear_leveling.c         |  23 +++
 .../wear_leveling/wear_leveling_flash_spi.c   | 101 +++++++++++++
 .../wear_leveling_flash_spi_config.h          |  34 +++++
 .../drivers/wear_leveling/wear_leveling_efl.c | 140 ++++++++++++++++++
 .../wear_leveling/wear_leveling_efl_config.h  |  50 +++++++
 .../wear_leveling/wear_leveling_legacy.c      |  59 ++++++++
 .../wear_leveling_legacy_config.h             |  67 +++++++++
 platforms/chibios/platform.mk                 |   5 +
 platforms/eeprom.h                            |   2 +
 quantum/wear_leveling/wear_leveling.c         |  97 ++++++------
 .../wear_leveling/wear_leveling_internal.h    |  16 +-
 15 files changed, 667 insertions(+), 71 deletions(-)
 create mode 100644 drivers/eeprom/eeprom_wear_leveling.c
 create mode 100644 drivers/wear_leveling/wear_leveling_flash_spi.c
 create mode 100644 drivers/wear_leveling/wear_leveling_flash_spi_config.h
 create mode 100644 platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c
 create mode 100644 platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
 create mode 100644 platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
 create mode 100644 platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 2b9ec48e70..b5616a438f 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -13,6 +13,14 @@ endif
 include paths.mk
 include $(BUILDDEFS_PATH)/message.mk
 
+# Helper to add defines with a 'QMK_' prefix
+define add_qmk_prefix_defs
+    ifdef $1
+        # Need to cater for 'STM32L4xx+'
+        OPT_DEFS += -DQMK_$(2)="$($1)" -DQMK_$(2)_$(shell echo $($1) | sed -e 's@+@Plus@g' -e 's@[^a-zA-Z0-9]@_@g' | tr '[:lower:]' '[:upper:]')
+    endif
+endef
+
 # Set the qmk cli to use
 QMK_BIN ?= qmk
 
@@ -438,6 +446,14 @@ else
     include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
 endif
 
+# Setup definitions based on the selected MCU
+$(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU))
+$(eval $(call add_qmk_prefix_defs,MCU_ARCH,MCU_ARCH))
+$(eval $(call add_qmk_prefix_defs,MCU_PORT_NAME,MCU_PORT_NAME))
+$(eval $(call add_qmk_prefix_defs,MCU_FAMILY,MCU_FAMILY))
+$(eval $(call add_qmk_prefix_defs,MCU_SERIES,MCU_SERIES))
+$(eval $(call add_qmk_prefix_defs,BOARD,BOARD))
+
 # TODO: remove this bodge?
 PROJECT_DEFS := $(OPT_DEFS)
 PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 552171fe68..b447c6743d 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -173,7 +173,7 @@ ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
     include $(QUANTUM_DIR)/painter/rules.mk
 endif
 
-VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi
+VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling
 EEPROM_DRIVER ?= vendor
 ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
   $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
@@ -186,6 +186,10 @@ else
     # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
     SRC += eeprom_driver.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
+    # Wear-leveling EEPROM implementation
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+    SRC += eeprom_driver.c eeprom_wear_leveling.c
   else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
     # External I2C EEPROM implementation
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
@@ -237,17 +241,47 @@ else
   endif
 endif
 
+VALID_WEAR_LEVELING_DRIVER_TYPES := custom embedded_flash spi_flash legacy
+WEAR_LEVELING_DRIVER ?= none
+ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
+  ifeq ($(filter $(WEAR_LEVELING_DRIVER),$(VALID_WEAR_LEVELING_DRIVER_TYPES)),)
+    $(call CATASTROPHIC_ERROR,Invalid WEAR_LEVELING_DRIVER,WEAR_LEVELING_DRIVER="$(WEAR_LEVELING_DRIVER)" is not a valid wear leveling driver)
+  else
+    FNV_ENABLE := yes
+    OPT_DEFS += -DWEAR_LEVELING_ENABLE
+    OPT_DEFS += -DWEAR_LEVELING_$(strip $(shell echo $(WEAR_LEVELING_DRIVER) | tr '[:lower:]' '[:upper:]'))
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling
+    COMMON_VPATH += $(DRIVER_PATH)/wear_leveling
+    COMMON_VPATH += $(QUANTUM_DIR)/wear_leveling
+    SRC += wear_leveling.c
+    ifeq ($(strip $(WEAR_LEVELING_DRIVER)), embedded_flash)
+      OPT_DEFS += -DHAL_USE_EFL
+      SRC += wear_leveling_efl.c
+      POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_efl_config.h
+    else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), spi_flash)
+      FLASH_DRIVER := spi
+      SRC += wear_leveling_flash_spi.c
+      POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_flash_spi_config.h
+    else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), legacy)
+      COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+      SRC += flash_stm32.c wear_leveling_legacy.c
+      POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_legacy_config.h
+    endif
+  endif
+endif
+
 VALID_FLASH_DRIVER_TYPES := spi
-FLASH_DRIVER ?= no
-ifneq ($(strip $(FLASH_DRIVER)), no)
+FLASH_DRIVER ?= none
+ifneq ($(strip $(FLASH_DRIVER)), none)
     ifeq ($(filter $(FLASH_DRIVER),$(VALID_FLASH_DRIVER_TYPES)),)
-        $(error FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid FLASH driver)
+        $(call CATASTROPHIC_ERROR,Invalid FLASH_DRIVER,FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid flash driver)
     else
         OPT_DEFS += -DFLASH_ENABLE
-        ifeq ($(strip $(FLASH_DRIVER)), spi)
+        ifeq ($(strip $(FLASH_DRIVER)),spi)
             OPT_DEFS += -DFLASH_DRIVER -DFLASH_SPI
             COMMON_VPATH += $(DRIVER_PATH)/flash
             SRC += flash_spi.c
+            QUANTUM_LIB_SRC += spi_master.c
         endif
     endif
 endif
diff --git a/docs/_summary.md b/docs/_summary.md
index 78d7f30ea4..e6d636402b 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -146,6 +146,7 @@
       * [SPI Driver](spi_driver.md)
       * [WS2812 Driver](ws2812_driver.md)
       * [EEPROM Driver](eeprom_driver.md)
+      * [Flash Driver](flash_driver.md)
       * ['serial' Driver](serial_driver.md)
       * [UART Driver](uart_driver.md)
     * [GPIO Controls](gpio_control.md)
diff --git a/docs/eeprom_driver.md b/docs/eeprom_driver.md
index 306ebacb3f..de2eaf2e5b 100644
--- a/docs/eeprom_driver.md
+++ b/docs/eeprom_driver.md
@@ -2,12 +2,15 @@
 
 The EEPROM driver can be swapped out depending on the needs of the keyboard, or whether extra hardware is present.
 
+Selecting the EEPROM driver is done in your keyboard's `rules.mk`:
+
 Driver                             | Description
 -----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 `EEPROM_DRIVER = vendor` (default) | Uses the on-chip driver provided by the chip manufacturer. For AVR, this is provided by avr-libc. This is supported on ARM for a subset of chips -- STM32F3xx, STM32F1xx, and STM32F072xB will be emulated by writing to flash. STM32L0xx and STM32L1xx will use the onboard dedicated true EEPROM. Other chips will generally act as "transient" below.
 `EEPROM_DRIVER = i2c`              | Supports writing to I2C-based 24xx EEPROM chips. See the driver section below.
 `EEPROM_DRIVER = spi`              | Supports writing to SPI-based 25xx EEPROM chips. See the driver section below.
 `EEPROM_DRIVER = transient`        | Fake EEPROM driver -- supports reading/writing to RAM, and will be discarded when power is lost.
+`EEPROM_DRIVER = wear_leveling`    | Frontend driver for the wear_leveling system, allowing for EEPROM emulation on top of flash -- both in-MCU and external SPI NOR flash.
 
 ## Vendor Driver Configuration :id=vendor-eeprom-driver-configuration
 
@@ -55,13 +58,13 @@ MB85RC256V FRAM  | `#define EEPROM_I2C_MB85RC256V` | <https://www.adafruit.com/p
 
 Currently QMK supports 25xx-series chips over SPI. As such, requires a working spi_master driver configuration. You can override the driver configuration via your config.h:
 
-`config.h` override                            | Description                                                                          | Default Value
------------------------------------------------|--------------------------------------------------------------------------------------|--------------
-`#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN` | SPI Slave select pin in order to inform that the EEPROM is currently being addressed | _none_
-`#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR`    | Clock divisor used to divide the peripheral clock to derive the SPI frequency        | `64`
-`#define EXTERNAL_EEPROM_BYTE_COUNT`           | Total size of the EEPROM in bytes                                                    | 8192
-`#define EXTERNAL_EEPROM_PAGE_SIZE`            | Page size of the EEPROM in bytes, as specified in the datasheet                      | 32
-`#define EXTERNAL_EEPROM_ADDRESS_SIZE`         | The number of bytes to transmit for the memory location within the EEPROM            | 2
+`config.h` override                            | Default Value | Description
+-----------------------------------------------|---------------|-------------------------------------------------------------------------------------
+`#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN` | _none_        | SPI Slave select pin in order to inform that the EEPROM is currently being addressed
+`#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR`    | `64`          | Clock divisor used to divide the peripheral clock to derive the SPI frequency
+`#define EXTERNAL_EEPROM_BYTE_COUNT`           | `8192`        | Total size of the EEPROM in bytes
+`#define EXTERNAL_EEPROM_PAGE_SIZE`            | `32`          | Page size of the EEPROM in bytes, as specified in the datasheet
+`#define EXTERNAL_EEPROM_ADDRESS_SIZE`         | `2`           | The number of bytes to transmit for the memory location within the EEPROM
 
 !> There's no way to determine if there is an SPI EEPROM actually responding. Generally, this will result in reads of nothing but zero.
 
@@ -74,3 +77,69 @@ The only configurable item for the transient EEPROM driver is its size:
 `#define TRANSIENT_EEPROM_SIZE` | Total size of the EEPROM storage in bytes | 64
 
 Default values and extended descriptions can be found in `drivers/eeprom/eeprom_transient.h`.
+
+## Wear-leveling Driver Configuration :id=wear_leveling-eeprom-driver-configuration
+
+The wear-leveling driver uses an algorithm to minimise the number of erase cycles on the underlying MCU flash memory.
+
+There is no specific configuration for this driver, but the wear-leveling system used by this driver may need configuration. See the [wear-leveling configuration](#wear_leveling-configuration) section for more information.
+
+# Wear-leveling Configuration :id=wear_leveling-configuration
+
+The wear-leveling driver has a few possible _backing stores_ that may be used by adding to your keyboard's `rules.mk` file:
+
+Driver                                  | Description
+----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+`WEAR_LEVELING_DRIVER = embedded_flash` | This driver is used for emulating EEPROM by writing to embedded flash on the MCU.
+`WEAR_LEVELING_DRIVER = spi_flash`      | This driver is used to address external SPI NOR Flash peripherals.
+`WEAR_LEVELING_DRIVER = legacy`         | This driver is the "legacy" emulated EEPROM provided in historical revisions of QMK. Currently used for STM32F0xx and STM32F4x1, but slated for deprecation and removal once `embedded_flash` support for those MCU families is complete.
+
+!> All wear-leveling drivers require an amount of RAM equivalent to the selected logical EEPROM size. Increasing the size to 32kB of EEPROM requires 32kB of RAM, which a significant number of MCUs simply do not have.
+
+## Wear-leveling Embedded Flash Driver Configuration :id=wear_leveling-efl-driver-configuration
+
+This driver performs writes to the embedded flash storage embedded in the MCU. In most circumstances, the last few of sectors of flash are used in order to minimise the likelihood of collision with program code.
+
+Configurable options in your keyboard's `config.h`:
+
+`config.h` override                      | Default     | Description
+-----------------------------------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+`#define WEAR_LEVELING_EFL_FIRST_SECTOR` | _unset_     | The first sector on the MCU to use. By default this is not defined and calculated at runtime based on the MCU. However, different flash sizes on MCUs may require custom configuration.
+`#define WEAR_LEVELING_EFL_FLASH_SIZE`   | _unset_     | Allows overriding the flash size available for use for wear-leveling. Under normal circumstances this is automatically calculated and should not need to be overridden. Specifying a size larger than the amount actually available in flash will usually prevent the MCU from booting.
+`#define WEAR_LEVELING_LOGICAL_SIZE`     | `1024`      | Number of bytes "exposed" to the rest of QMK and denotes the size of the usable EEPROM.
+`#define WEAR_LEVELING_BACKING_SIZE`     | `2048`      | Number of bytes used by the wear-leveling algorithm for its underlying storage, and needs to be a multiple of the logical size.
+`#define BACKING_STORE_WRITE_SIZE`       | _automatic_ | The byte width of the underlying write used on the MCU, and is usually automatically determined from the selected MCU family. If an error occurs in the auto-detection, you'll need to consult the MCU's datasheet and determine this value, specifying it directly.
+
+!> If your MCU does not boot after swapping to the EFL wear-leveling driver, it's likely that the flash size is incorrectly detected, usually as an MCU with larger flash and may require overriding.
+
+## Wear-leveling SPI Flash Driver Configuration :id=wear_leveling-flash_spi-driver-configuration
+
+This driver performs writes to an external SPI NOR Flash peripheral. It also requires a working configuration for the SPI NOR Flash peripheral -- see the [flash driver](flash_driver.md) documentation for more information.
+
+Configurable options in your keyboard's `config.h`:
+
+`config.h` override                                 | Default                        | Description
+----------------------------------------------------|--------------------------------|--------------------------------------------------------------------------------------------------------------------------------
+`#define WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_COUNT`  | `1`                            | Number of blocks in the external flash used by the wear-leveling algorithm.
+`#define WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_OFFSET` | `0`                            | The index first block in the external flash used by the wear-leveling algorithm.
+`#define WEAR_LEVELING_LOGICAL_SIZE`                | `((block_count*block_size)/2)` | Number of bytes "exposed" to the rest of QMK and denotes the size of the usable EEPROM. Result must be <= 64kB.
+`#define WEAR_LEVELING_BACKING_SIZE`                | `(block_count*block_size)`     | Number of bytes used by the wear-leveling algorithm for its underlying storage, and needs to be a multiple of the logical size.
+`#define BACKING_STORE_WRITE_SIZE`                  | `8`                            | The write width used whenever a write is performed on the external flash peripheral.
+
+!> There is currently a limit of 64kB for the EEPROM subsystem within QMK, so using a larger flash is not going to be beneficial as the logical size cannot be increased beyond 65536. The backing size may be increased to a larger value, but erase timing may suffer as a result.
+
+## Wear-leveling Legacy EEPROM Emulation Driver Configuration :id=wear_leveling-legacy-driver-configuration
+
+This driver performs writes to the embedded flash storage embedded in the MCU much like the normal Embedded Flash Driver, and is only for use with STM32F0xx and STM32F4x1 devices. This flash implementation is still currently provided as the EFL driver is currently non-functional for the previously mentioned families.
+
+By default, `1024` bytes of emulated EEPROM is provided:
+
+MCU       | EEPROM Provided | Flash Used
+----------|-----------------|--------------
+STM32F042 | `1024` bytes    | `2048` bytes
+STM32F070 | `1024` bytes    | `2048` bytes
+STM32F072 | `1024` bytes    | `2048` bytes
+STM32F401 | `1024` bytes    | `16384` bytes
+STM32F411 | `1024` bytes    | `16384` bytes
+
+Under normal circumstances configuration of this driver requires intimate knowledge of the MCU's flash structure -- reconfiguration is at your own risk and will require referring to the code.
\ No newline at end of file
diff --git a/drivers/eeprom/eeprom_wear_leveling.c b/drivers/eeprom/eeprom_wear_leveling.c
new file mode 100644
index 0000000000..bd77eef35c
--- /dev/null
+++ b/drivers/eeprom/eeprom_wear_leveling.c
@@ -0,0 +1,23 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <stdint.h>
+#include <string.h>
+
+#include "eeprom_driver.h"
+#include "wear_leveling.h"
+
+void eeprom_driver_init(void) {
+    wear_leveling_init();
+}
+
+void eeprom_driver_erase(void) {
+    wear_leveling_erase();
+}
+
+void eeprom_read_block(void *buf, const void *addr, size_t len) {
+    wear_leveling_read((uint32_t)addr, buf, len);
+}
+
+void eeprom_write_block(const void *buf, void *addr, size_t len) {
+    wear_leveling_write((uint32_t)addr, buf, len);
+}
diff --git a/drivers/wear_leveling/wear_leveling_flash_spi.c b/drivers/wear_leveling/wear_leveling_flash_spi.c
new file mode 100644
index 0000000000..6191f8bf09
--- /dev/null
+++ b/drivers/wear_leveling/wear_leveling_flash_spi.c
@@ -0,0 +1,101 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <stdbool.h>
+#include <hal.h>
+#include "util.h"
+#include "timer.h"
+#include "wear_leveling.h"
+#include "wear_leveling_internal.h"
+
+#ifndef WEAR_LEVELING_EXTERNAL_FLASH_BULK_COUNT
+#    define WEAR_LEVELING_EXTERNAL_FLASH_BULK_COUNT 32
+#endif // WEAR_LEVELING_EXTERNAL_FLASH_BULK_COUNT
+
+bool backing_store_init(void) {
+    bs_dprintf("Init\n");
+    flash_init();
+    return true;
+}
+
+bool backing_store_unlock(void) {
+    bs_dprintf("Unlock\n");
+    // No-op -- handled by the flash driver as it is.
+    return true;
+}
+
+bool backing_store_erase(void) {
+#ifdef WEAR_LEVELING_DEBUG_OUTPUT
+    uint32_t start = timer_read32();
+#endif
+
+    bool ret = true;
+    for (int i = 0; i < (WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_COUNT); ++i) {
+        flash_status_t status = flash_erase_block(((WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_OFFSET) + i) * (EXTERNAL_FLASH_BLOCK_SIZE));
+        if (status != FLASH_STATUS_SUCCESS) {
+            ret = false;
+            break;
+        }
+    }
+
+    bs_dprintf("Backing store erase took %ldms to complete\n", ((long)(timer_read32() - start)));
+    return ret;
+}
+
+bool backing_store_write(uint32_t address, backing_store_int_t value) {
+    return backing_store_write_bulk(address, &value, 1);
+}
+
+bool backing_store_lock(void) {
+    bs_dprintf("Lock  \n");
+    // No-op -- handled by the flash driver as it is.
+    return true;
+}
+
+bool backing_store_read(uint32_t address, backing_store_int_t *value) {
+    return backing_store_read_bulk(address, value, 1);
+}
+
+bool backing_store_read_bulk(uint32_t address, backing_store_int_t *values, size_t item_count) {
+    bs_dprintf("Read  ");
+    uint32_t       offset = (WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_OFFSET) * (EXTERNAL_FLASH_BLOCK_SIZE) + address;
+    flash_status_t status = flash_read_block(offset, values, sizeof(backing_store_int_t) * item_count);
+    if (status == FLASH_STATUS_SUCCESS) {
+        for (size_t i = 0; i < item_count; ++i) {
+            values[i] = ~values[i];
+        }
+        wl_dump(offset, values, sizeof(backing_store_int_t) * item_count);
+    }
+    return status == FLASH_STATUS_SUCCESS;
+}
+
+bool backing_store_write_bulk(uint32_t address, backing_store_int_t *values, size_t item_count) {
+    uint32_t            offset = (WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_OFFSET) * (EXTERNAL_FLASH_BLOCK_SIZE) + address;
+    size_t              index  = 0;
+    backing_store_int_t temp[WEAR_LEVELING_EXTERNAL_FLASH_BULK_COUNT];
+    do {
+        // Copy out the block of data we want to transmit first
+        size_t this_loop = MIN(item_count, WEAR_LEVELING_EXTERNAL_FLASH_BULK_COUNT);
+        for (size_t i = 0; i < this_loop; ++i) {
+            temp[i] = values[index + i];
+        }
+
+        bs_dprintf("Write ");
+        wl_dump(offset, temp, sizeof(backing_store_int_t) * this_loop);
+
+        // Take the complement instead
+        for (size_t i = 0; i < this_loop; ++i) {
+            temp[i] = ~temp[i];
+        }
+
+        // Write out the block
+        if (flash_write_block(offset, temp, sizeof(backing_store_int_t) * this_loop) != FLASH_STATUS_SUCCESS) {
+            return false;
+        }
+
+        offset += this_loop * sizeof(backing_store_int_t);
+        index += this_loop;
+        item_count -= this_loop;
+    } while (item_count > 0);
+
+    return true;
+}
diff --git a/drivers/wear_leveling/wear_leveling_flash_spi_config.h b/drivers/wear_leveling/wear_leveling_flash_spi_config.h
new file mode 100644
index 0000000000..394370daa3
--- /dev/null
+++ b/drivers/wear_leveling/wear_leveling_flash_spi_config.h
@@ -0,0 +1,34 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifndef __ASSEMBLER__
+#    include <stdlib.h>
+#    include <stdint.h>
+#    include "flash_spi.h"
+#endif
+
+// Use 1 block -- check the config for the SPI flash to determine how big it is
+#ifndef WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_COUNT
+#    define WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_COUNT 1
+#endif // WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_COUNT
+
+// Start at the first block of the external flash
+#ifndef WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_OFFSET
+#    define WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_OFFSET 0
+#endif // WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_OFFSET
+
+// 8-byte writes by default
+#ifndef BACKING_STORE_WRITE_SIZE
+#    define BACKING_STORE_WRITE_SIZE 8
+#endif
+
+// The space allocated by the block
+#ifndef WEAR_LEVELING_BACKING_SIZE
+#    define WEAR_LEVELING_BACKING_SIZE ((EXTERNAL_FLASH_BLOCK_SIZE) * (WEAR_LEVELING_EXTERNAL_FLASH_BLOCK_COUNT))
+#endif // WEAR_LEVELING_BACKING_SIZE
+
+// Use half of the backing size for logical EEPROM
+#ifndef WEAR_LEVELING_LOGICAL_SIZE
+#    define WEAR_LEVELING_LOGICAL_SIZE ((WEAR_LEVELING_BACKING_SIZE) / 2)
+#endif // WEAR_LEVELING_LOGICAL_SIZE
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c
new file mode 100644
index 0000000000..4b5639ee4a
--- /dev/null
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c
@@ -0,0 +1,140 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <stdbool.h>
+#include <hal.h>
+#include "timer.h"
+#include "wear_leveling.h"
+#include "wear_leveling_internal.h"
+
+static flash_offset_t base_offset = UINT32_MAX;
+
+#if defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
+static flash_sector_t first_sector = WEAR_LEVELING_EFL_FIRST_SECTOR;
+#else  // defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
+static flash_sector_t first_sector = UINT16_MAX;
+#endif // defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
+
+static flash_sector_t sector_count = UINT16_MAX;
+static BaseFlash *    flash;
+
+#ifndef WEAR_LEVELING_EFL_FIRST_SECTOR
+// "Automatic" detection of the flash size -- ideally ChibiOS would have this already, but alas, it doesn't.
+static inline uint32_t detect_flash_size(void) {
+#    if defined(WEAR_LEVELING_EFL_FLASH_SIZE)
+    return WEAR_LEVELING_EFL_FLASH_SIZE;
+#    elif defined(FLASH_BANK_SIZE)
+    return FLASH_BANK_SIZE;
+#    elif defined(FLASH_SIZE)
+    return FLASH_SIZE;
+#    elif defined(FLASHSIZE_BASE)
+#        if defined(QMK_MCU_SERIES_STM32F0XX) || defined(QMK_MCU_SERIES_STM32F1XX) || defined(QMK_MCU_SERIES_STM32F3XX) || defined(QMK_MCU_SERIES_STM32F4XX) || defined(QMK_MCU_SERIES_STM32G4XX) || defined(QMK_MCU_SERIES_STM32L0XX) || defined(QMK_MCU_SERIES_STM32L4XX) || defined(QMK_MCU_SERIES_GD32VF103)
+    return ((*(uint32_t *)FLASHSIZE_BASE) & 0xFFFFU) << 10U; // this register has the flash size in kB, so we convert it to bytes
+#        elif defined(QMK_MCU_SERIES_STM32L1XX)
+#            error This MCU family has an uncommon flash size register definition and has not been implemented. Perhaps try using the true EEPROM on the MCU instead?
+#        endif
+#    else
+#        error Unknown flash size definition.
+    return 0;
+#    endif
+}
+#endif // WEAR_LEVELING_EFL_FIRST_SECTOR
+
+bool backing_store_init(void) {
+    bs_dprintf("Init\n");
+    flash = (BaseFlash *)&EFLD1;
+
+    const flash_descriptor_t *desc    = flashGetDescriptor(flash);
+    uint32_t                  counter = 0;
+
+#if defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
+
+    // Work out how many sectors we want to use, working forwards from the first sector specified
+    for (flash_sector_t i = 0; i < desc->sectors_count - first_sector; ++i) {
+        counter += flashGetSectorSize(flash, first_sector + i);
+        if (counter >= (WEAR_LEVELING_BACKING_SIZE)) {
+            sector_count = i + 1;
+            base_offset  = flashGetSectorOffset(flash, first_sector);
+            break;
+        }
+    }
+    if (sector_count == UINT16_MAX || base_offset >= flash_size) {
+        // We didn't get the required number of sectors. Can't do anything here. Fault.
+        chSysHalt("Invalid sector count intended to be used with wear_leveling");
+    }
+
+#else // defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
+
+    // Work out how many sectors we want to use, working backwards from the end of the flash
+    uint32_t       flash_size  = detect_flash_size();
+    flash_sector_t last_sector = desc->sectors_count;
+    for (flash_sector_t i = 0; i < desc->sectors_count; ++i) {
+        first_sector = desc->sectors_count - i - 1;
+        if (flashGetSectorOffset(flash, first_sector) >= flash_size) {
+            last_sector = first_sector;
+            continue;
+        }
+        counter += flashGetSectorSize(flash, first_sector);
+        if (counter >= (WEAR_LEVELING_BACKING_SIZE)) {
+            sector_count = last_sector - first_sector;
+            base_offset  = flashGetSectorOffset(flash, first_sector);
+            break;
+        }
+    }
+
+#endif // defined(WEAR_LEVELING_EFL_FIRST_SECTOR)
+
+    return true;
+}
+
+bool backing_store_unlock(void) {
+    bs_dprintf("Unlock\n");
+    return eflStart(&EFLD1, NULL) == HAL_RET_SUCCESS;
+}
+
+bool backing_store_erase(void) {
+#ifdef WEAR_LEVELING_DEBUG_OUTPUT
+    uint32_t start = timer_read32();
+#endif
+
+    bool          ret = true;
+    flash_error_t status;
+    for (int i = 0; i < sector_count; ++i) {
+        // Kick off the sector erase
+        status = flashStartEraseSector(flash, first_sector + i);
+        if (status != FLASH_NO_ERROR && status != FLASH_BUSY_ERASING) {
+            ret = false;
+        }
+
+        // Wait for the erase to complete
+        status = flashWaitErase(flash);
+        if (status != FLASH_NO_ERROR && status != FLASH_BUSY_ERASING) {
+            ret = false;
+        }
+    }
+
+    bs_dprintf("Backing store erase took %ldms to complete\n", ((long)(timer_read32() - start)));
+    return ret;
+}
+
+bool backing_store_write(uint32_t address, backing_store_int_t value) {
+    uint32_t offset = (base_offset + address);
+    bs_dprintf("Write ");
+    wl_dump(offset, &value, sizeof(value));
+    value = ~value;
+    return flashProgram(flash, offset, sizeof(value), (const uint8_t *)&value) == FLASH_NO_ERROR;
+}
+
+bool backing_store_lock(void) {
+    bs_dprintf("Lock  \n");
+    eflStop(&EFLD1);
+    return true;
+}
+
+bool backing_store_read(uint32_t address, backing_store_int_t *value) {
+    uint32_t             offset = (base_offset + address);
+    backing_store_int_t *loc    = (backing_store_int_t *)offset;
+    *value                      = ~(*loc);
+    bs_dprintf("Read  ");
+    wl_dump(offset, value, sizeof(backing_store_int_t));
+    return true;
+}
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
new file mode 100644
index 0000000000..9e38c2965d
--- /dev/null
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
@@ -0,0 +1,50 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifndef __ASSEMBLER__
+#    include <hal.h>
+#endif
+
+// Work out how many bytes per write to internal flash
+#ifndef BACKING_STORE_WRITE_SIZE
+// These need to match EFL's XXXXXX_FLASH_LINE_SIZE, see associated code in `lib/chibios/os/hal/ports/**/hal_efl_lld.c`,
+// or associated `stm32_registry.h` for the MCU in question (or equivalent for the family).
+#    if defined(QMK_MCU_SERIES_GD32VF103)
+#        define BACKING_STORE_WRITE_SIZE 2 // from hal_efl_lld.c
+#    elif defined(QMK_MCU_FAMILY_NUC123)
+#        define BACKING_STORE_WRITE_SIZE 4 // from hal_efl_lld.c
+#    elif defined(QMK_MCU_FAMILY_STM32)
+#        if defined(STM32_FLASH_LINE_SIZE) // from some family's stm32_registry.h file
+#            define BACKING_STORE_WRITE_SIZE (STM32_FLASH_LINE_SIZE)
+#        else
+#            if defined(QMK_MCU_SERIES_STM32F1XX)
+#                define BACKING_STORE_WRITE_SIZE 2 // from hal_efl_lld.c
+#            elif defined(QMK_MCU_SERIES_STM32F3XX)
+#                define BACKING_STORE_WRITE_SIZE 2 // from hal_efl_lld.c
+#            elif defined(QMK_MCU_SERIES_STM32F4XX)
+#                define BACKING_STORE_WRITE_SIZE (1 << STM32_FLASH_PSIZE) // from hal_efl_lld.c
+#            elif defined(QMK_MCU_SERIES_STM32L4XX)
+#                define BACKING_STORE_WRITE_SIZE 8 // from hal_efl_lld.c
+#            elif defined(QMK_MCU_SERIES_STM32G0XX)
+#                define BACKING_STORE_WRITE_SIZE 8 // from hal_efl_lld.c
+#            elif defined(QMK_MCU_SERIES_STM32G4XX)
+#                define BACKING_STORE_WRITE_SIZE 8 // from hal_efl_lld.c
+#            else
+#                error "ChibiOS hasn't defined STM32_FLASH_LINE_SIZE, and could not automatically determine BACKING_STORE_WRITE_SIZE" // normally defined in stm32_registry.h, should be set by STM32_FLASH_LINE_SIZE
+#            endif
+#        endif
+#    else
+#        error "Could not automatically determine BACKING_STORE_WRITE_SIZE"
+#    endif
+#endif
+
+// 2kB backing space allocated
+#ifndef WEAR_LEVELING_BACKING_SIZE
+#    define WEAR_LEVELING_BACKING_SIZE 2048
+#endif // WEAR_LEVELING_BACKING_SIZE
+
+// 1kB logical EEPROM
+#ifndef WEAR_LEVELING_LOGICAL_SIZE
+#    define WEAR_LEVELING_LOGICAL_SIZE 1024
+#endif // WEAR_LEVELING_LOGICAL_SIZE
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
new file mode 100644
index 0000000000..87126c4467
--- /dev/null
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
@@ -0,0 +1,59 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <stdbool.h>
+#include <hal.h>
+#include "timer.h"
+#include "wear_leveling.h"
+#include "wear_leveling_internal.h"
+#include "flash_stm32.h"
+
+bool backing_store_init(void) {
+    bs_dprintf("Init\n");
+    return true;
+}
+
+bool backing_store_unlock(void) {
+    bs_dprintf("Unlock\n");
+    FLASH_Unlock();
+    return true;
+}
+
+bool backing_store_erase(void) {
+#ifdef WEAR_LEVELING_DEBUG_OUTPUT
+    uint32_t start = timer_read32();
+#endif
+
+    bool         ret = true;
+    FLASH_Status status;
+    for (int i = 0; i < (WEAR_LEVELING_LEGACY_EMULATION_PAGE_COUNT); ++i) {
+        status = FLASH_ErasePage(WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS + (i * (WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE)));
+        if (status != FLASH_COMPLETE) {
+            ret = false;
+        }
+    }
+
+    bs_dprintf("Backing store erase took %ldms to complete\n", ((long)(timer_read32() - start)));
+    return ret;
+}
+
+bool backing_store_write(uint32_t address, backing_store_int_t value) {
+    uint32_t offset = ((WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS) + address);
+    bs_dprintf("Write ");
+    wl_dump(offset, &value, sizeof(backing_store_int_t));
+    return FLASH_ProgramHalfWord(offset, ~value) == FLASH_COMPLETE;
+}
+
+bool backing_store_lock(void) {
+    bs_dprintf("Lock  \n");
+    FLASH_Lock();
+    return true;
+}
+
+bool backing_store_read(uint32_t address, backing_store_int_t* value) {
+    uint32_t             offset = ((WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS) + address);
+    backing_store_int_t* loc    = (backing_store_int_t*)offset;
+    *value                      = ~(*loc);
+    bs_dprintf("Read  ");
+    wl_dump(offset, loc, sizeof(backing_store_int_t));
+    return true;
+}
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h
new file mode 100644
index 0000000000..1e4691a6c0
--- /dev/null
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h
@@ -0,0 +1,67 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+// Work out the page size to use
+#ifndef WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE
+#    if defined(QMK_MCU_STM32F042)
+#        define WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE 1024
+#    elif defined(QMK_MCU_STM32F070) || defined(QMK_MCU_STM32F072)
+#        define WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE 2048
+#    elif defined(QMK_MCU_STM32F401) || defined(QMK_MCU_STM32F411)
+#        define WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE 16384
+#    endif
+#endif
+
+// Work out how much flash space we have
+#ifndef WEAR_LEVELING_LEGACY_EMULATION_FLASH_SIZE
+#    define WEAR_LEVELING_LEGACY_EMULATION_FLASH_SIZE ((*(uint32_t *)FLASHSIZE_BASE) & 0xFFFFU) // in kB
+#endif
+
+// The base location of program memory
+#ifndef WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE
+#    define WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE 0x08000000
+#endif
+
+// The number of pages to use
+#ifndef WEAR_LEVELING_LEGACY_EMULATION_PAGE_COUNT
+#    if defined(QMK_MCU_STM32F042)
+#        define WEAR_LEVELING_LEGACY_EMULATION_PAGE_COUNT 2
+#    elif defined(QMK_MCU_STM32F070) || defined(QMK_MCU_STM32F072)
+#        define WEAR_LEVELING_LEGACY_EMULATION_PAGE_COUNT 1
+#    elif defined(QMK_MCU_STM32F401) || defined(QMK_MCU_STM32F411)
+#        define WEAR_LEVELING_LEGACY_EMULATION_PAGE_COUNT 1
+#    endif
+#endif
+
+// The origin of the emulated eeprom
+#ifndef WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS
+#    if defined(QMK_MCU_STM32F042) || defined(QMK_MCU_STM32F070) || defined(QMK_MCU_STM32F072)
+#        define WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS ((uintptr_t)(WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE) + WEAR_LEVELING_LEGACY_EMULATION_FLASH_SIZE * 1024 - (WEAR_LEVELING_LEGACY_EMULATION_PAGE_COUNT * WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE))
+#    elif defined(QMK_MCU_STM32F401) || defined(QMK_MCU_STM32F411)
+#        if defined(BOOTLOADER_STM32)
+#            define WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS (WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE + (1 * (WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE))) // +16k
+#        elif defined(BOOTLOADER_TINYUF2)
+#            define WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS (WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE + (3 * (WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE))) // +48k
+#        endif
+#    endif
+#endif
+
+// 2-byte writes
+#ifndef BACKING_STORE_WRITE_SIZE
+#    define BACKING_STORE_WRITE_SIZE 2
+#endif
+
+// The amount of space to use for the entire set of emulation
+#ifndef WEAR_LEVELING_BACKING_SIZE
+#    if defined(QMK_MCU_STM32F042) || defined(QMK_MCU_STM32F070) || defined(QMK_MCU_STM32F072)
+#        define WEAR_LEVELING_BACKING_SIZE 2048
+#    elif defined(QMK_MCU_STM32F401) || defined(QMK_MCU_STM32F411)
+#        define WEAR_LEVELING_BACKING_SIZE 16384
+#    endif
+#endif
+
+// The logical amount of eeprom available
+#ifndef WEAR_LEVELING_LOGICAL_SIZE
+#    define WEAR_LEVELING_LOGICAL_SIZE 1024
+#endif
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index a30ca62bf5..72428a762f 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -94,6 +94,11 @@ ifeq ("$(wildcard $(PLATFORM_MK))","")
     endif
 endif
 
+# If no MCU architecture specified, use the MCU instead (allows for mcu_selection.mk to swap to cortex-m0 etc.)
+ifeq ("$(MCU_ARCH)","")
+    MCU_ARCH = $(MCU)
+endif
+
 include $(STARTUP_MK)
 include $(PORT_V)
 include $(PLATFORM_MK)
diff --git a/platforms/eeprom.h b/platforms/eeprom.h
index 091e6e4400..8cb7e342dc 100644
--- a/platforms/eeprom.h
+++ b/platforms/eeprom.h
@@ -27,6 +27,8 @@ void     eeprom_update_block(const void *__src, void *__dst, size_t __n);
 #        error EEPROM_SIZE has not been defined for custom driver.
 #    endif
 #    define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
+#elif defined(EEPROM_WEAR_LEVELING)
+#    define TOTAL_EEPROM_BYTE_COUNT (WEAR_LEVELING_LOGICAL_SIZE)
 #elif defined(EEPROM_TRANSIENT)
 #    include "eeprom_transient.h"
 #    define TOTAL_EEPROM_BYTE_COUNT (TRANSIENT_EEPROM_SIZE)
diff --git a/quantum/wear_leveling/wear_leveling.c b/quantum/wear_leveling/wear_leveling.c
index 8418ae77bf..0a519639ea 100644
--- a/quantum/wear_leveling/wear_leveling.c
+++ b/quantum/wear_leveling/wear_leveling.c
@@ -213,36 +213,29 @@ static wear_leveling_status_t wear_leveling_read_consolidated(void) {
     wl_dprintf("Reading consolidated data\n");
 
     wear_leveling_status_t status = WEAR_LEVELING_SUCCESS;
-    for (int address = 0; address < (WEAR_LEVELING_LOGICAL_SIZE); address += (BACKING_STORE_WRITE_SIZE)) {
-        backing_store_int_t *const loc = (backing_store_int_t *)&wear_leveling.cache[address];
-        backing_store_int_t        temp;
-        bool                       ok = backing_store_read(address, &temp);
-        if (!ok) {
-            wl_dprintf("Failed to read from backing store\n");
-            status = WEAR_LEVELING_FAILED;
-            break;
-        }
-        *loc = temp;
+    if (!backing_store_read_bulk(0, (backing_store_int_t *)wear_leveling.cache, sizeof(wear_leveling.cache) / sizeof(backing_store_int_t))) {
+        wl_dprintf("Failed to read from backing store\n");
+        status = WEAR_LEVELING_FAILED;
     }
 
     // Verify the FNV1a_64 result
     if (status != WEAR_LEVELING_FAILED) {
         uint64_t          expected = fnv_64a_buf(wear_leveling.cache, (WEAR_LEVELING_LOGICAL_SIZE), FNV1A_64_INIT);
         write_log_entry_t entry;
+        wl_dprintf("Reading checksum\n");
 #if BACKING_STORE_WRITE_SIZE == 2
-        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 0, &entry.raw16[0]);
-        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 2, &entry.raw16[1]);
-        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 4, &entry.raw16[2]);
-        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 6, &entry.raw16[3]);
+        backing_store_read_bulk((WEAR_LEVELING_LOGICAL_SIZE), entry.raw16, 4);
 #elif BACKING_STORE_WRITE_SIZE == 4
-        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 0, &entry.raw32[0]);
-        backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 4, &entry.raw32[1]);
+        backing_store_read_bulk((WEAR_LEVELING_LOGICAL_SIZE), entry.raw32, 2);
 #elif BACKING_STORE_WRITE_SIZE == 8
         backing_store_read((WEAR_LEVELING_LOGICAL_SIZE) + 0, &entry.raw64);
 #endif
         // If we have a mismatch, clear the cache but do not flag a failure,
         // which will cater for the completely clean MCU case.
-        if (entry.raw64 != expected) {
+        if (entry.raw64 == expected) {
+            wl_dprintf("Checksum matches, consolidated data is correct\n");
+        } else {
+            wl_dprintf("Checksum mismatch, clearing cache\n");
             wear_leveling_clear_cache();
         }
     }
@@ -258,64 +251,36 @@ static wear_leveling_status_t wear_leveling_read_consolidated(void) {
 /**
  * Writes the current cache to consolidated data at the beginning of the backing store.
  * Does not clear the write log.
+ * Pre-condition: this is just after an erase, so we can write directly without reading.
  */
 static wear_leveling_status_t wear_leveling_write_consolidated(void) {
     wl_dprintf("Writing consolidated data\n");
 
-    wear_leveling_status_t      status      = WEAR_LEVELING_CONSOLIDATED;
     backing_store_lock_status_t lock_status = wear_leveling_unlock();
-    for (int address = 0; address < (WEAR_LEVELING_LOGICAL_SIZE); address += (BACKING_STORE_WRITE_SIZE)) {
-        const backing_store_int_t value = *(backing_store_int_t *)&wear_leveling.cache[address];
-        backing_store_int_t       temp;
-        bool                      ok = backing_store_read(address, &temp);
-        if (!ok) {
-            wl_dprintf("Failed to read from backing store\n");
-            status = WEAR_LEVELING_FAILED;
-            break;
-        }
-        if (temp != value) {
-            ok = backing_store_write(address, value);
-            if (!ok) {
-                wl_dprintf("Failed to write to backing store\n");
-                status = WEAR_LEVELING_FAILED;
-                break;
-            }
-        }
+    wear_leveling_status_t      status      = WEAR_LEVELING_CONSOLIDATED;
+    if (!backing_store_write_bulk(0, (backing_store_int_t *)wear_leveling.cache, sizeof(wear_leveling.cache) / sizeof(backing_store_int_t))) {
+        wl_dprintf("Failed to write to backing store\n");
+        status = WEAR_LEVELING_FAILED;
     }
 
     if (status != WEAR_LEVELING_FAILED) {
         // Write out the FNV1a_64 result of the consolidated data
         write_log_entry_t entry;
         entry.raw64 = fnv_64a_buf(wear_leveling.cache, (WEAR_LEVELING_LOGICAL_SIZE), FNV1A_64_INIT);
+        wl_dprintf("Writing checksum\n");
         do {
 #if BACKING_STORE_WRITE_SIZE == 2
-            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 0, entry.raw16[0])) {
-                status = WEAR_LEVELING_FAILED;
-                break;
-            }
-            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 2, entry.raw16[1])) {
-                status = WEAR_LEVELING_FAILED;
-                break;
-            }
-            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 4, entry.raw16[2])) {
-                status = WEAR_LEVELING_FAILED;
-                break;
-            }
-            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 6, entry.raw16[3])) {
+            if (!backing_store_write_bulk((WEAR_LEVELING_LOGICAL_SIZE), entry.raw16, 4)) {
                 status = WEAR_LEVELING_FAILED;
                 break;
             }
 #elif BACKING_STORE_WRITE_SIZE == 4
-            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 0, entry.raw32[0])) {
-                status = WEAR_LEVELING_FAILED;
-                break;
-            }
-            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 4, entry.raw32[1])) {
+            if (!backing_store_write_bulk((WEAR_LEVELING_LOGICAL_SIZE), entry.raw32, 2)) {
                 status = WEAR_LEVELING_FAILED;
                 break;
             }
 #elif BACKING_STORE_WRITE_SIZE == 8
-            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE) + 0, entry.raw64)) {
+            if (!backing_store_write((WEAR_LEVELING_LOGICAL_SIZE), entry.raw64)) {
                 status = WEAR_LEVELING_FAILED;
                 break;
             }
@@ -777,3 +742,27 @@ wear_leveling_status_t wear_leveling_read(const uint32_t address, void *value, s
     wl_dump(address, value, length);
     return WEAR_LEVELING_SUCCESS;
 }
+
+/**
+ * Weak implementation of bulk read, drivers can implement more optimised implementations.
+ */
+__attribute__((weak)) bool backing_store_read_bulk(uint32_t address, backing_store_int_t *values, size_t item_count) {
+    for (size_t i = 0; i < item_count; ++i) {
+        if (!backing_store_read(address + (i * BACKING_STORE_WRITE_SIZE), &values[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+ * Weak implementation of bulk write, drivers can implement more optimised implementations.
+ */
+__attribute__((weak)) bool backing_store_write_bulk(uint32_t address, backing_store_int_t *values, size_t item_count) {
+    for (size_t i = 0; i < item_count; ++i) {
+        if (!backing_store_write(address + (i * BACKING_STORE_WRITE_SIZE), values[i])) {
+            return false;
+        }
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/quantum/wear_leveling/wear_leveling_internal.h b/quantum/wear_leveling/wear_leveling_internal.h
index 74b43932df..e83f9b22ea 100644
--- a/quantum/wear_leveling/wear_leveling_internal.h
+++ b/quantum/wear_leveling/wear_leveling_internal.h
@@ -28,21 +28,25 @@ typedef uint64_t backing_store_int_t;
 #endif
 
 #ifdef WEAR_LEVELING_DEBUG_OUTPUT
-#    include <stdio.h>
-#    define wl_dprintf(...) printf("Wear leveling: " __VA_ARGS__)
+#    include <debug.h>
+#    define bs_dprintf(...) dprintf("Backing store: " __VA_ARGS__)
+#    define wl_dprintf(...) dprintf("Wear leveling: " __VA_ARGS__)
 #    define wl_dump(address, value, length)             \
         do {                                            \
-            printf("[0x%04X]: ", (int)(address));       \
+            dprintf("[0x%04X]: ", (int)(address));      \
             const uint8_t* p = (const uint8_t*)(value); \
             for (int i = 0; i < (length); ++i) {        \
-                printf(" %02X", (int)p[i]);             \
+                dprintf(" %02X", (int)p[i]);            \
             }                                           \
-            printf("\n");                               \
+            dprintf("\n");                              \
         } while (0)
 #else
 #    define wl_dprintf(...) \
         do {                \
         } while (0)
+#    define bs_dprintf(...) \
+        do {                \
+        } while (0)
 #    define wl_dump(...) \
         do {             \
         } while (0)
@@ -67,8 +71,10 @@ bool backing_store_init(void);
 bool backing_store_unlock(void);
 bool backing_store_erase(void);
 bool backing_store_write(uint32_t address, backing_store_int_t value);
+bool backing_store_write_bulk(uint32_t address, backing_store_int_t* values, size_t item_count); // weak implementation already provided, optimized implementation can be implemented by driver
 bool backing_store_lock(void);
 bool backing_store_read(uint32_t address, backing_store_int_t* value);
+bool backing_store_read_bulk(uint32_t address, backing_store_int_t* values, size_t item_count); // weak implementation already provided, optimized implementation can be implemented by driver
 
 /**
  * Helper type used to contain a write log entry.

From 4f124574f1087ab40c2630adc10e492f895cefdb Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Wed, 29 Jun 2022 20:07:43 -0500
Subject: [PATCH 054/959] (develop)AP2: Enable support for WL EEPROM Driver
 (#17506)

---
 keyboards/annepro2/c15/config.h | 18 ++++++++++++++++++
 keyboards/annepro2/c15/rules.mk |  4 ++++
 keyboards/annepro2/c18/config.h | 18 ++++++++++++++++++
 keyboards/annepro2/c18/rules.mk |  4 ++++
 keyboards/annepro2/halconf.h    |  4 ++++
 keyboards/annepro2/mcuconf.h    |  8 ++++++++
 6 files changed, 56 insertions(+)

diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h
index ff92aeea8e..2ebb962efb 100644
--- a/keyboards/annepro2/c15/config.h
+++ b/keyboards/annepro2/c15/config.h
@@ -49,3 +49,21 @@
 
 // Obins stock firmware has something similar to this already enabled, but disabled by default in QMK
 #define PERMISSIVE_HOLD
+
+// SPI configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A0
+#define SPI_MOSI_PIN A1
+#define SPI_MISO_PIN A2
+
+// Flash configuration
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B6
+#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 16
+#define EXTERNAL_FLASH_PAGE_SIZE 256
+#define EXTERNAL_FLASH_SECTOR_SIZE 4096
+#define EXTERNAL_FLASH_BLOCK_SIZE 4096
+#define EXTERNAL_FLASH_SIZE (256 * 1024) // 2M-bit flash size
+
+// Wear-leveling driver configuration
+#define WEAR_LEVELING_LOGICAL_SIZE 1024
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
index 2c518b6339..302aeecbe6 100644
--- a/keyboards/annepro2/c15/rules.mk
+++ b/keyboards/annepro2/c15/rules.mk
@@ -26,6 +26,10 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
+# Wear-levelling driver
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
+
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h
index 82a406a157..5e4978048b 100644
--- a/keyboards/annepro2/c18/config.h
+++ b/keyboards/annepro2/c18/config.h
@@ -47,3 +47,21 @@
 
 // Obins stock firmware has something similar to this already enabled, but disabled by default in QMK
 #define PERMISSIVE_HOLD
+
+// SPI configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A0
+#define SPI_MOSI_PIN A1
+#define SPI_MISO_PIN A2
+
+// Flash configuration
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN A3
+#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 16
+#define EXTERNAL_FLASH_PAGE_SIZE 256
+#define EXTERNAL_FLASH_SECTOR_SIZE 4096
+#define EXTERNAL_FLASH_BLOCK_SIZE 4096
+#define EXTERNAL_FLASH_SIZE (256 * 1024) // 2M-bit flash size
+
+// Wear-leveling driver configuration
+#define WEAR_LEVELING_LOGICAL_SIZE 1024
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index 60c2e08648..b1c7208f8b 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -26,6 +26,10 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
+# Wear-levelling driver
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
+
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/annepro2/halconf.h b/keyboards/annepro2/halconf.h
index 686b91a7fb..dcb04eab1b 100644
--- a/keyboards/annepro2/halconf.h
+++ b/keyboards/annepro2/halconf.h
@@ -25,4 +25,8 @@
 
 #define SERIAL_USB_BUFFERS_SIZE 256
 
+#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/annepro2/mcuconf.h b/keyboards/annepro2/mcuconf.h
index 8265fe6eb9..9e39bd9681 100644
--- a/keyboards/annepro2/mcuconf.h
+++ b/keyboards/annepro2/mcuconf.h
@@ -60,3 +60,11 @@
 
 #define HT32_USB_USE_USB0 TRUE
 #define HT32_USB_USB0_IRQ_PRIORITY 5
+
+/*
+ * SPI driver setting
+ */
+
+#define HT32_SPI_USE_SPI1 TRUE
+#define HT32_SPI1_IRQ_PRIORITY 9
+

From d206c1791e5858323cff0664f39f95edc1381ac5 Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Wed, 29 Jun 2022 21:25:33 -0500
Subject: [PATCH 055/959] (develop)Keychron Q2: Enable support for WL EEPROM
 Driver (#17507)

---
 keyboards/keychron/q2/config.h          | 3 ++-
 keyboards/keychron/q2/rev_0110/rules.mk | 3 ++-
 keyboards/keychron/q2/rev_0111/rules.mk | 3 ++-
 keyboards/keychron/q2/rev_0112/rules.mk | 3 ++-
 keyboards/keychron/q2/rev_0113/rules.mk | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index d019bcee15..e513536056 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -64,7 +64,8 @@
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
 
 /* EEPROM Driver Configuration */
-#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100010
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/keychron/q2/rev_0110/rules.mk b/keyboards/keychron/q2/rev_0110/rules.mk
index 30394028b3..38d48f0b27 100644
--- a/keyboards/keychron/q2/rev_0110/rules.mk
+++ b/keyboards/keychron/q2/rev_0110/rules.mk
@@ -20,7 +20,8 @@ ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = CKLED2001
-EEPROM_DRIVER = i2c
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/q2/rev_0111/rules.mk b/keyboards/keychron/q2/rev_0111/rules.mk
index a295f48e10..9332d29432 100644
--- a/keyboards/keychron/q2/rev_0111/rules.mk
+++ b/keyboards/keychron/q2/rev_0111/rules.mk
@@ -20,7 +20,8 @@ ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = CKLED2001
-EEPROM_DRIVER = i2c
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/q2/rev_0112/rules.mk b/keyboards/keychron/q2/rev_0112/rules.mk
index 30394028b3..38d48f0b27 100644
--- a/keyboards/keychron/q2/rev_0112/rules.mk
+++ b/keyboards/keychron/q2/rev_0112/rules.mk
@@ -20,7 +20,8 @@ ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = CKLED2001
-EEPROM_DRIVER = i2c
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/q2/rev_0113/rules.mk b/keyboards/keychron/q2/rev_0113/rules.mk
index a295f48e10..9332d29432 100644
--- a/keyboards/keychron/q2/rev_0113/rules.mk
+++ b/keyboards/keychron/q2/rev_0113/rules.mk
@@ -20,7 +20,8 @@ ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = CKLED2001
-EEPROM_DRIVER = i2c
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From d7173967087e022d20d1f9c812b1b668e9d3f71b Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 30 Jun 2022 13:19:27 +0200
Subject: [PATCH 056/959] [Core] Add Raspberry Pi RP2040 support (#14877)

* Disable RESET keycode because of naming conflicts

* Add Pico SDK as submodule

* Add RP2040 build support to QMK

* Adjust USB endpoint structs for RP2040

* Add RP2040 bootloader and double-tap reset routine

* Add generic and pro micro RP2040 boards

* Add RP2040 onekey keyboard

* Add WS2812 PIO DMA enabled driver and documentation

Supports regular and open-drain output configuration. RP2040 GPIOs are
sadly not 5V tolerant, so this is a bit use-less or needs extra hardware
or you take the risk to fry your hardware.

* Adjust SIO Driver for RP2040

* Adjust I2C Driver for RP2040

* Adjust SPI Driver for RP2040

* Add PIO serial driver and documentation

* Add general RP2040 documentation

* Apply suggestions from code review

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 .gitmodules                                   |   3 +
 Makefile                                      |   1 +
 builddefs/bootloader.mk                       |   4 +
 builddefs/common_features.mk                  |   4 +-
 builddefs/mcu_selection.mk                    |  35 ++
 data/schemas/definitions.jsonschema           |   4 +
 data/schemas/keyboard.jsonschema              |   4 +-
 docs/_summary.md                              |   1 +
 docs/compatible_microcontrollers.md           |   6 +
 docs/flashing.md                              |  39 ++
 docs/platformdev_rp2040.md                    | 125 +++++
 docs/serial_driver.md                         |  41 +-
 docs/ws2812_driver.md                         |  62 ++-
 keyboards/handwired/onekey/onekey.c           |  11 +
 keyboards/handwired/onekey/rp2040/config.h    |  17 +
 keyboards/handwired/onekey/rp2040/readme.md   |  12 +
 keyboards/handwired/onekey/rp2040/rules.mk    |   3 +
 lib/pico-sdk                                  |   1 +
 lib/python/qmk/constants.py                   |   2 +-
 platforms/chibios/_pin_defs.h                 |   5 +
 .../GENERIC_PROMICRO_RP2040/board/board.mk    |   9 +
 .../GENERIC_PROMICRO_RP2040/configs/board.h   |  12 +
 .../GENERIC_PROMICRO_RP2040/configs/chconf.h  |  13 +
 .../GENERIC_PROMICRO_RP2040/configs/config.h  |  62 +++
 .../GENERIC_PROMICRO_RP2040/configs/mcuconf.h |  98 ++++
 .../boards/GENERIC_RP_RP2040/board/board.mk   |   9 +
 .../boards/GENERIC_RP_RP2040/configs/board.h  |  12 +
 .../boards/GENERIC_RP_RP2040/configs/chconf.h |  13 +
 .../GENERIC_RP_RP2040/configs/mcuconf.h       |  98 ++++
 platforms/chibios/bootloaders/rp2040.c        |  57 +++
 platforms/chibios/chibios_config.h            |  21 +
 platforms/chibios/drivers/serial_usart.c      |  28 +-
 platforms/chibios/drivers/spi_master.c        |  31 +-
 .../drivers/vendor/RP/RP2040/serial_vendor.c  | 457 ++++++++++++++++++
 .../drivers/vendor/RP/RP2040/ws2812_vendor.c  | 189 ++++++++
 platforms/chibios/flash.mk                    |   2 +
 platforms/chibios/platform.mk                 |  15 +-
 platforms/chibios/vendors/RP/RP2040.mk        | 285 +++++++++++
 platforms/chibios/vendors/RP/_pin_defs.h      |  37 ++
 platforms/chibios/vendors/RP/pico_sdk_shims.c |   9 +
 .../chibios/vendors/RP/stage2_bootloaders.c   | 174 +++++++
 quantum/keymap.h                              |   5 +
 tmk_core/protocol/chibios/usb_main.c          | 106 ++--
 43 files changed, 2026 insertions(+), 96 deletions(-)
 create mode 100644 docs/platformdev_rp2040.md
 create mode 100644 keyboards/handwired/onekey/rp2040/config.h
 create mode 100644 keyboards/handwired/onekey/rp2040/readme.md
 create mode 100644 keyboards/handwired/onekey/rp2040/rules.mk
 create mode 160000 lib/pico-sdk
 create mode 100644 platforms/chibios/boards/GENERIC_PROMICRO_RP2040/board/board.mk
 create mode 100644 platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h
 create mode 100644 platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/chconf.h
 create mode 100644 platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
 create mode 100644 platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
 create mode 100644 platforms/chibios/boards/GENERIC_RP_RP2040/board/board.mk
 create mode 100644 platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h
 create mode 100644 platforms/chibios/boards/GENERIC_RP_RP2040/configs/chconf.h
 create mode 100644 platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
 create mode 100644 platforms/chibios/bootloaders/rp2040.c
 create mode 100644 platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
 create mode 100644 platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
 create mode 100644 platforms/chibios/vendors/RP/RP2040.mk
 create mode 100644 platforms/chibios/vendors/RP/_pin_defs.h
 create mode 100644 platforms/chibios/vendors/RP/pico_sdk_shims.c
 create mode 100644 platforms/chibios/vendors/RP/stage2_bootloaders.c

diff --git a/.gitmodules b/.gitmodules
index 681693a5a4..48c7035afa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,6 @@
 [submodule "lib/printf"]
 	path = lib/printf
 	url = https://github.com/qmk/printf
+[submodule "lib/pico-sdk"]
+	path = lib/pico-sdk
+	url = https://github.com/qmk/pico-sdk.git
diff --git a/Makefile b/Makefile
index 4c2e6a04dc..fc6d016448 100644
--- a/Makefile
+++ b/Makefile
@@ -401,6 +401,7 @@ ifndef SKIP_GIT
 	if [ ! -e lib/lufa ]; then git submodule sync lib/lufa && git submodule update --depth 50 --init lib/lufa; fi
 	if [ ! -e lib/vusb ]; then git submodule sync lib/vusb && git submodule update --depth 50 --init lib/vusb; fi
 	if [ ! -e lib/printf ]; then git submodule sync lib/printf && git submodule update --depth 50 --init lib/printf; fi
+	if [ ! -e lib/pico-sdk ]; then git submodule sync lib/pico-sdk && git submodule update --depth 50 --init lib/pico-sdk; fi
 	git submodule status --recursive 2>/dev/null | \
 	while IFS= read -r x; do \
 		case "$$x" in \
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index eba8e280e4..3d4c03b01c 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -200,6 +200,10 @@ ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     OPT_DEFS += -DBOOTLOADER_TINYUF2
     BOOTLOADER_TYPE = tinyuf2
 endif
+ifeq ($(strip $(BOOTLOADER)), rp2040)
+    OPT_DEFS += -DBOOTLOADER_RP2040
+    BOOTLOADER_TYPE = rp2040
+endif
 ifeq ($(strip $(BOOTLOADER)), halfkay)
     OPT_DEFS += -DBOOTLOADER_HALFKAY
     BOOTLOADER_TYPE = halfkay
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index b447c6743d..2edc1bdef0 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -547,7 +547,7 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     endif
 endif
 
-VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c
+VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c vendor
 
 WS2812_DRIVER ?= bitbang
 ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
@@ -637,7 +637,7 @@ ifneq ($(strip $(DEBOUNCE_TYPE)), custom)
 endif
 
 
-VALID_SERIAL_DRIVER_TYPES := bitbang usart
+VALID_SERIAL_DRIVER_TYPES := bitbang usart vendor
 
 SERIAL_DRIVER ?= bitbang
 ifeq ($(filter $(SERIAL_DRIVER),$(VALID_SERIAL_DRIVER_TYPES)),)
diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index d5fb731e08..d676e0c06a 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -116,6 +116,41 @@ ifneq ($(findstring MK66FX1M0, $(MCU)),)
   BOARD ?= PJRC_TEENSY_3_6
 endif
 
+ifneq ($(findstring RP2040, $(MCU)),)
+  # Cortex version
+  MCU = cortex-m0plus
+
+  # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
+  CHIBIOS_PORT = ARMv6-M-RP2
+
+  ## chip/board settings
+  # - the next two should match the directories in
+  #   <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
+  #   OR
+  #   <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
+  MCU_FAMILY = RP
+  MCU_SERIES = RP2040
+
+  # Linker script to use
+  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+  #   or <keyboard_dir>/ld/
+  STARTUPLD_CONTRIB = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
+  MCU_LDSCRIPT ?= RP2040_FLASH
+  LDFLAGS += -L $(STARTUPLD_CONTRIB)
+
+  # Startup code to use
+  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
+  MCU_STARTUP ?= rp2040
+
+  # Board: it should exist either in <chibios>/os/hal/boards/,
+  # <keyboard_dir>/boards/, or drivers/boards/
+  BOARD ?= GENERIC_PROMICRO_RP2040
+
+  # Default UF2 Bootloader settings
+  UF2_FAMILY ?= RP2040
+  FIRMWARE_FORMAT ?= uf2
+endif
+
 ifneq ($(findstring STM32F042, $(MCU)),)
   # Cortex version
   MCU = cortex-m0
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 2cf76a351c..8b68a58482 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -101,6 +101,10 @@
                 "type": "string",
                 "pattern": "^LINE_PIN\\d{1,2}$"
             },
+            {
+                "type": "string",
+                "pattern": "^GP\\d{1,2}$"
+            },
             {
                 "type": "integer"
             },
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index ec5377b3b3..8aca807e38 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -42,7 +42,7 @@
         },
         "processor": {
             "type": "string",
-            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66FX1M0", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "WB32FQ95", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
+            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66FX1M0", "RP2040", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "WB32FQ95", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
         },
         "audio": {
             "type": "object",
@@ -86,7 +86,7 @@
         },
         "bootloader": {
             "type": "string",
-            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
+            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2", "rp2040"],
         },
         "bootloader_instructions": {
             "type": "string",
diff --git a/docs/_summary.md b/docs/_summary.md
index e6d636402b..da007bccb6 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -165,6 +165,7 @@
     * Arm/ChibiOS
       * [Selecting an MCU](platformdev_selecting_arm_mcu.md)
       * [Early initialization](platformdev_chibios_earlyinit.md)
+      * [Raspberry Pi RP2040](platformdev_rp2040.md)
 
   * QMK Reference
     * [Contributing to QMK](contributing.md)
diff --git a/docs/compatible_microcontrollers.md b/docs/compatible_microcontrollers.md
index cee8986829..a594fe0620 100644
--- a/docs/compatible_microcontrollers.md
+++ b/docs/compatible_microcontrollers.md
@@ -65,6 +65,12 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s
  * [MK66FX1M0](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k6x-ethernet/kinetis-k66-180-mhz-dual-high-speed-full-speed-usbs-2mb-flash-microcontrollers-mcus-based-on-arm-cortex-m4-core:K66_180)
    * PJRC Teensy 3.6
 
+### Raspberry Pi
+
+* [RP2040](https://www.raspberrypi.com/documentation/microcontrollers/rp2040.html)
+
+For a detailed overview about the RP2040 support by QMK see the [dedicated RP2040 page](platformdev_rp2040.md).
+
 ## Atmel ATSAM
 
 There is limited support for one of Atmel's ATSAM microcontrollers, that being the [ATSAMD51J18A](https://www.microchip.com/wwwproducts/en/ATSAMD51J18A) used by the [Massdrop keyboards](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop). However, it is not recommended to design a board with this microcontroller as the support is quite specialized to Massdrop hardware.
diff --git a/docs/flashing.md b/docs/flashing.md
index dfb255f2dc..5e5dcb34e4 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -362,3 +362,42 @@ CLI Flashing sequence:
 ### `make` Targets
 
 * `:uf2-split-left` and `:uf2-split-right`: Flashes the firmware but also sets the handedness setting in EEPROM by generating a side specific firmware.
+
+## Raspberry Pi RP2040 UF2
+
+The `rules.mk` setting for this bootloader is `rp2040`, and can be specified at the keymap or user level.
+
+To ensure compatibility with the rp2040 bootloader, make sure this block is present in your `rules.mk`:
+
+```make
+# Bootloader selection
+BOOTLOADER = rp2040
+```
+
+Compatible flashers:
+
+* Any application able to copy a file from one place to another, such as _macOS Finder_ or _Windows Explorer_.
+
+Flashing sequence:
+
+1. Enter the bootloader using any of the following methods:
+    * Tap the `QK_BOOTLOADER` keycode
+    * Hold the `BOOTSEL` button on the PCB while plugin in the usb cable.
+    * Double-tap the `RESET` button on the PCB<sup>1</sup>.
+2. Wait for the OS to detect the device
+3. Copy the .uf2 file to the new USB disk
+4. Wait for the keyboard to become available
+
+or
+
+CLI Flashing sequence:
+
+1. Enter the bootloader using any of the following methods:
+    * Tap the `QK_BOOTLOADER` keycode
+    * Hold the `BOOTSEL` button on the PCB while plugin in the usb cable.
+    * Double-tap the `RESET` button on the PCB<sup>1</sup>.
+2. Wait for the OS to detect the device
+3. Flash via QMK CLI eg. `qmk flash --keyboard handwired/onekey/rpi_pico --keymap default`
+4. Wait for the keyboard to become available
+
+<sup>1</sup>: This works only if QMK was compiled with `RP2040_BOOTLOADER_DOUBLE_TAP_RESET` defined.
diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md
new file mode 100644
index 0000000000..9426efa29a
--- /dev/null
+++ b/docs/platformdev_rp2040.md
@@ -0,0 +1,125 @@
+# Raspberry Pi RP2040
+
+The following table shows the current driver status for peripherals on RP2040 MCUs:
+
+| System                               | Support                                        |
+| ------------------------------------ | ---------------------------------------------- |
+| [ADC driver](adc_driver.md)          | Support planned (no ETA)                       |
+| [Audio](audio_driver.md)             | Support planned (no ETA)                       |
+| [I2C driver](i2c_driver.md)          | :heavy_check_mark:                             |
+| [SPI driver](spi_driver.md)          | :heavy_check_mark:                             |
+| [WS2812 driver](ws2812_driver.md)    | :heavy_check_mark: using `PIO` driver          |
+| [External EEPROMs](eeprom_driver.md) | :heavy_check_mark: using `I2C` or `SPI` driver |
+| [EEPROM emulation](eeprom_driver.md) | Support planned (no ETA)                       |
+| [serial driver](serial_driver.md)    | :heavy_check_mark: using `SIO` or `PIO` driver |
+| [UART driver](uart_driver.md)        | Support planned (no ETA)                       |
+
+## GPIO
+
+<img alt="Raspberry Pi Pico pinout" src="https://i.imgur.com/nLaiYDE.jpg" width="48%"/>
+<img alt="Sparkfun RP2040 Pro Micro pinout" src="https://i.imgur.com/1TPAhrs.jpg" width="48%"/>
+
+!> The GPIO pins of the RP2040 are not 5V tolerant!
+
+### Pin nomenclature
+
+To address individual pins on the RP2040, QMK uses the `GPx` abbreviation -- where the `x` stands for the GPIO number of the pin. This number can likely be found on the official pinout diagram of your board. Note that these GPIO numbers match the RP2040 MCU datasheet, and don't necessarily match the number you see printed on the board. For instance the Raspberry Pi Pico uses numbers from 1 to 40 for their pins, but these are not identical to the RP2040's GPIO numbers. So if you want to use the pin 11 of the Pico for your keyboard, you would refer to it as `GP8` in the config files.
+
+### Alternate functions
+
+The RP2040 features flexible GPIO function multiplexing, this means that every pin can be connected to nearly all the internal peripherals like I2C, SPI, UART or PWM. This allows for flexible PCB designs that are much less restricted in the selection of GPIO pins. To find out which pin can use which peripheral refer to the official [Raspberry PI RP2040 datasheet](https://datasheets.raspberrypi.com/rp2040/rp2040-datasheet.pdf#page=14) section 1.4.3 GPIO functions.
+
+## Selecting hardware peripherals and drivers
+
+QMK RP2040 support builds upon ChibiOS and thus follows their convention for activating drivers and associated hardware peripherals. These tables only give a quick overview which values have to be used, please refer to the ChibiOS specific sections on the driver pages.
+
+### I2C Driver
+
+| RP2040 Peripheral | `mcuconf.h` values | `I2C_DRIVER` |
+| ----------------- | ------------------ | ------------ |
+| `I2C0`            | `RP_I2C_USE_I2C0`  | `I2CD1`      |
+| `I2C1`            | `RP_I2C_USE_I2C1`  | `I2CD2`      |
+
+To configure the I2C driver please read the [ChibiOS/ARM](i2c_driver.md#arm-configuration) section.
+
+### SPI Driver
+
+| RP2040 Peripheral | `mcuconf.h` values | `SPI_DRIVER` |
+| ----------------- | ------------------ | ------------ |
+| `SPI0`            | `RP_SPI_USE_SPI0`  | `SPID0`      |
+| `SPI1`            | `RP_SPI_USE_SPI1`  | `SPID1`      |
+
+To configure the SPI driver please read the [ChibiOS/ARM](spi_driver.md#chibiosarm-configuration) section.
+
+## 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:
+
+```c
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // Timeout window in ms in which the double tap can occur.
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U // Specify a optional status led which blinks when entering the bootloader
+```
+
+## Pre-defined RP2040 boards
+
+QMK defines two boards that you can choose from to base your RP2040 powered keyboard upon. These boards provide pre-configured default pins and drivers.
+
+### Generic Pro Micro RP2040
+
+This is the default board that is chosen, unless any other RP2040 board is selected in your keyboards `rules.mk` file. It assumes a pin layout for the I2C, SPI and Serial drivers which is identical to the Sparkfun Pro Micro RP2040, however all values can be overwritten by defining them in your keyboards `config.h` file. The [double-tap](#double-tap) reset to enter boot-loader behavior is activated by default.
+
+
+| Driver configuration define                                                | Value                                |
+| -------------------------------------------------------------------------- | ------------------------------------ |
+| **I2C driver**                                                             |                                      |
+| `I2C_DRIVER`                                                               | `I2CD2`                              |
+| `I2C1_SDA_PIN`                                                             | `GP2`                                |
+| `I2C1_SCL_PIN`                                                             | `GP3`                                |
+| **SPI driver**                                                             |                                      |
+| `SPI_DRIVER`                                                               | `SPID0`                              |
+| `SPI_SCK_PIN`                                                              | `GP18`                               |
+| `SPI_MISO_PIN`                                                             | `GP20`                               |
+| `SPI_MOSI_PIN`                                                             | `GP19`                               |
+| **Serial driver**                                                          |                                      |
+| `SERIAL_USART_DRIVER` ([SIO Driver](serial_driver.md#the-sio-driver) only) | `SIOD0`                              |
+| `SOFT_SERIAL_PIN`                                                          | undefined, use `SERIAL_USART_TX_PIN` |
+| `SERIAL_USART_TX_PIN`                                                      | `GP0`                                |
+| `SERIAL_USART_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.
+
+### Generic RP2040 board
+
+This board can be chosen as a base for RP2040 keyboards which configure all necessary pins and drivers themselves and do not wish to leverage the configuration matching the Generic Pro Micro RP2040 board. Thus it doesn't provide any pre-configured pins or drivers. To select this board add the following line to your keyboards `rules.mk` file.
+
+```make
+BOARD = GENERIC_RP_RP2040
+```
+
+## Split keyboard support
+
+Split keyboards are fully supported using the [serial driver](serial_driver.md) in both full-duplex and half-duplex configurations. Two driver subsystems are supported by the RP2040, the hardware UART based `SIO` and the Programmable IO based `PIO` driver.
+
+| Feature                       | [SIO Driver](serial_driver.md#the-sio-driver) | [PIO Driver](serial_driver.md#the-pio-driver) |
+| ----------------------------- | --------------------------------------------- | --------------------------------------------- |
+| Half-Duplex operation         |                                               | :heavy_check_mark:                            |
+| Full-Duplex operation         | :heavy_check_mark:                            | :heavy_check_mark:                            |
+| `TX` and `RX` pin swapping    |                                               | :heavy_check_mark:                            |
+| Any GPIO as `TX` and `RX` pin | Only UART capable pins                        | :heavy_check_mark:                            |
+| Simple configuration          |                                               | :heavy_check_mark:                            |
+
+The `PIO` driver is much more flexible then the `SIO` driver, the only "downside" is the usage of `PIO` resources which in turn are not available for advanced user programs. Under normal circumstances, this resource allocation will be a non-issue.
+
+## RP2040 second stage bootloader selection
+
+As the RP2040 does not have any internal flash memory it depends on an external SPI flash memory chip to store and execute instructions from. To successfully interact with a wide variety of these chips a second stage bootloader that is compatible with the chosen external flash memory has to be supplied with each firmware image. By default an `W25Q080` compatible bootloader is assumed, but others can be chosen by adding one of the defines listed in the table below to your keyboards `config.h` file. 
+
+| Compatible with flash chip | Selection                          |
+| :------------------------- | ---------------------------------- |
+| W25Q080                    | Selected by default                |
+| AT25SF128A                 | `#define RP2040_FLASH_AT25SF128A`  |
+| GD25Q64CS                  | `#define RP2040_FLASH_GD25Q64CS`   |
+| W25X10CL                   | `#define RP2040_FLASH_W25X10CL`    |
+| IS25LP080                  | `#define RP2040_FLASH_IS25LP080`   |
+| Generic 03H flash          | `#define RP2040_FLASH_GENERIC_03H` |
diff --git a/docs/serial_driver.md b/docs/serial_driver.md
index 7c0daec9b1..fff63109a1 100644
--- a/docs/serial_driver.md
+++ b/docs/serial_driver.md
@@ -74,11 +74,11 @@ Targeting ARM boards based on ChibiOS, where communication is offloaded to a USA
 +-------+                 +-------+
 ```
 
-Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is refereed to as the `SERIAL_USART_TX_PIN` in the configuration. Take care that the pin you chose can act as the TX pin of the USART peripheral. A simple TRS or USB cable provides enough conductors for this driver to work. As the split connection is configured to work in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work.
+Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SERIAL_USART_TX_PIN` in the configuration. Take care that the pin you chose can act as the TX pin of the USART peripheral. A simple TRS or USB cable provides enough conductors for this driver to work. As the split connection is configured to work in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work.
 
 ### Setup
 
-To use the Half-duplex driver follow these steps to activate it.
+To use the Half-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1.
 
 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
@@ -86,7 +86,13 @@ To use the Half-duplex driver follow these steps to activate it.
 SERIAL_DRIVER = usart
 ```
 
-2. Configure the hardware of your keyboard via the `config.h` file:
+2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
+
+```make
+SERIAL_DRIVER = vendor
+```
+
+3. Configure the hardware of your keyboard via the `config.h` file:
 
 ```c
 #define SERIAL_USART_TX_PIN B6     // The GPIO pin that is used split communication.
@@ -99,7 +105,7 @@ For STM32 MCUs several GPIO configuration options can be changed as well. See th
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 ```
 
-3. Decide either for ChibiOS `SERIAL` or `SIO` subsystem, see the section ["Choosing a ChibiOS driver subsystem"](#choosing-a-chibios-driver-subsystem).
+1. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
 
 <hr>
 
@@ -125,11 +131,11 @@ Targeting ARM boards based on ChibiOS where communication is offloaded to an USA
 
 Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A simple TRRS or USB cable provides enough conductors for this driver to work.
 
-To use this driver the usart peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Reefer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus).
+To use this driver the usart peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus).
 
 ### Setup
 
-To use the Full-duplex driver follow these steps to activate it.
+To use the Full-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1.
 
 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
@@ -137,7 +143,13 @@ To use the Full-duplex driver follow these steps to activate it.
 SERIAL_DRIVER = usart
 ```
 
-2. Configure the hardware of your keyboard via the `config.h` file:
+2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
+
+```make
+SERIAL_DRIVER = vendor
+```
+
+3. Configure the hardware of your keyboard via the `config.h` file:
 
 ```c
 #define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
@@ -153,11 +165,11 @@ For STM32 MCUs several GPIO configuration options, including the ability for `TX
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 ```
 
-3. Decide either for ChibiOS `SERIAL` or `SIO` subsystem, see the section ["Choosing a ChibiOS driver subsystem"](#choosing-a-chibios-driver-subsystem).
+1. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
 
 <hr>
 
-## Choosing a ChibiOS driver subsystem
+## Choosing a driver subsystem
 
 ### The `SERIAL` driver
 
@@ -219,6 +231,17 @@ Where 'n' matches the peripheral number of your selected USART on the MCU.
  #define SERIAL_USART_DRIVER SIOD3
  ```
  
+### The `PIO` driver
+
+The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of the PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation is fully supported. The Half-duplex operation mode uses the built-in pull-ups and GPIO manipulation on the RP2040 to drive the line high by default. An external pull-up is therefore not necessary.
+
+Configure the hardware via your config.h:
+```c
+#define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral
+```
+
+The Serial PIO program uses 2 state machines, 13 instructions and the complete interrupt handler of the PIO peripheral it is running on.
+
 <hr>
 
 ## Advanced Configuration
diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index 8acac0b3aa..54e6e77d81 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -11,11 +11,12 @@ These LEDs are called "addressable" because instead of using a wire per color, e
 ## Supported Driver Types
 
 |          | AVR                | ARM                |
-|----------|--------------------|--------------------|
+| -------- | ------------------ | ------------------ |
 | bit bang | :heavy_check_mark: | :heavy_check_mark: |
 | I2C      | :heavy_check_mark: |                    |
 | SPI      |                    | :heavy_check_mark: |
 | PWM      |                    | :heavy_check_mark: |
+| PIO      |                    | :heavy_check_mark: |
 
 ## Driver configuration
 
@@ -33,11 +34,11 @@ The default setting is 280 µs, which should work for most cases, but this can b
 Some variants of the WS2812 may have their color components in a different physical or logical order. For example, the WS2812B-2020 has physically swapped red and green LEDs, which causes the wrong color to be displayed, because the default order of the bytes sent over the wire is defined as GRB.
 In this case, you can change the byte order by defining `WS2812_BYTE_ORDER` as one of the following values:
 
-|Byte order                       |Known devices                |
-|---------------------------------|-----------------------------|
-|`WS2812_BYTE_ORDER_GRB` (default)|Most WS2812's, SK6812, SK6805|
-|`WS2812_BYTE_ORDER_RGB`          |WS2812B-2020                 |
-|`WS2812_BYTE_ORDER_BGR`          |TM1812                       |
+| Byte order                        | Known devices                 |
+| --------------------------------- | ----------------------------- |
+| `WS2812_BYTE_ORDER_GRB` (default) | Most WS2812's, SK6812, SK6805 |
+| `WS2812_BYTE_ORDER_RGB`           | WS2812B-2020                  |
+| `WS2812_BYTE_ORDER_BGR`           | TM1812                        |
 
 
 ### Bitbang
@@ -54,13 +55,13 @@ WS2812_DRIVER = bitbang
 The WS2812 LED communication topology depends on a serialized timed window. Different versions of the addressable LEDs have differing requirements for the timing parameters, for instance, of the SK6812.
 You can tune these parameters through the definition of the following macros:
 
-| Macro               |Default                                     | AVR                | ARM                |
-|---------------------|--------------------------------------------|--------------------|--------------------|
-|`WS2812_TIMING`      |`1250`                                      | :heavy_check_mark: | :heavy_check_mark: |
-|`WS2812_T0H`         |`350`                                       | :heavy_check_mark: | :heavy_check_mark: |
-|`WS2812_T0L`         |`WS2812_TIMING - WS2812_T0H`                |                    | :heavy_check_mark: |
-|`WS2812_T1H`         |`900`                                       | :heavy_check_mark: | :heavy_check_mark: |
-|`WS2812_T1L`         |`WS2812_TIMING - WS2812_T1H`                |                    | :heavy_check_mark: |
+| Macro           | Default                      | AVR                | ARM                |
+| --------------- | ---------------------------- | ------------------ | ------------------ |
+| `WS2812_TIMING` | `1250`                       | :heavy_check_mark: | :heavy_check_mark: |
+| `WS2812_T0H`    | `350`                        | :heavy_check_mark: | :heavy_check_mark: |
+| `WS2812_T0L`    | `WS2812_TIMING - WS2812_T0H` |                    | :heavy_check_mark: |
+| `WS2812_T1H`    | `900`                        | :heavy_check_mark: | :heavy_check_mark: |
+| `WS2812_T1L`    | `WS2812_TIMING - WS2812_T1H` |                    | :heavy_check_mark: |
 
 ### I2C
 Targeting boards where WS2812 support is offloaded to a 2nd MCU. Currently the driver is limited to AVR given the known consumers are ps2avrGB/BMC. To configure it, add this to your rules.mk:
@@ -107,16 +108,16 @@ To adjust the baudrate at which the SPI peripheral is configured, users will nee
 
 Only divisors of 2, 4, 8, 16, 32, 64, 128 and 256 are supported by hardware.
 
-|Define              |Default|Description                          |
-|--------------------|-------|-------------------------------------|
-|`WS2812_SPI_DIVISOR`|`16`   |SPI source clock peripheral divisor  |
+| Define               | Default | Description                         |
+| -------------------- | ------- | ----------------------------------- |
+| `WS2812_SPI_DIVISOR` | `16`    | SPI source clock peripheral divisor |
 
 #### Testing Notes
 
 While not an exhaustive list, the following table provides the scenarios that have been partially validated:
 
 |      | SPI1                                        | SPI2                                    | SPI3                  |
-|------|---------------------------------------------|-----------------------------------------|-----------------------|
+| ---- | ------------------------------------------- | --------------------------------------- | --------------------- |
 | f072 | ?                                           | B15 :heavy_check_mark: (needs SCK: B13) | N/A                   |
 | f103 | A7 :heavy_check_mark:                       | B15 :heavy_check_mark:                  | N/A                   |
 | f303 | A7 :heavy_check_mark: B5 :heavy_check_mark: | B15 :heavy_check_mark:                  | B5 :heavy_check_mark: |
@@ -150,15 +151,32 @@ You must also turn on the PWM feature in your halconf.h and mcuconf.h
 
 While not an exhaustive list, the following table provides the scenarios that have been partially validated:
 
-| | Status |
-|-|-|
-| f072 | ? |
-| f103 | :heavy_check_mark: |
-| f303 | :heavy_check_mark: |
+|           | Status             |
+| --------- | ------------------ |
+| f072      | ?                  |
+| f103      | :heavy_check_mark: |
+| f303      | :heavy_check_mark: |
 | f401/f411 | :heavy_check_mark: |
 
 *Other supported ChibiOS boards and/or pins may function, it will be highly chip and configuration dependent.*
 
+### PIO
+
+Targeting Raspberry Pi RP2040 boards only where WS2812 support is offloaded to an dedicated PIO implementation. This offloads processing of the WS2812 protocol from the MCU to a dedicated PIO program using DMA transfers.
+
+To configure it, add this to your rules.mk:
+
+```make
+WS2812_DRIVER = vendor
+```
+
+Configure the hardware via your config.h:
+```c
+#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
+```
+
+The WS2812 PIO programm uses 1 state machine, 4 instructions and does not use any interrupt handlers. 
+
 ### Push Pull and Open Drain Configuration
 The default configuration is a push pull on the defined pin.
 This can be configured for bitbang, PWM and SPI.
diff --git a/keyboards/handwired/onekey/onekey.c b/keyboards/handwired/onekey/onekey.c
index cbd67012ce..a29f9ea6d0 100644
--- a/keyboards/handwired/onekey/onekey.c
+++ b/keyboards/handwired/onekey/onekey.c
@@ -1 +1,12 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "onekey.h"
+
+void keyboard_post_init_kb(void) {
+    debug_enable   = true;
+    debug_matrix   = true;
+    debug_keyboard = true;
+    debug_mouse    = true;
+    keyboard_post_init_user();
+}
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
new file mode 100644
index 0000000000..f5a122e91b
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -0,0 +1,17 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT Onekey Raspberry Pi RP2040
+#define MATRIX_COL_PINS { GP4 }
+#define MATRIX_ROW_PINS { GP5 }
+#define DEBUG_MATRIX_SCAN_RATE
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define RGB_DI_PIN A1
diff --git a/keyboards/handwired/onekey/rp2040/readme.md b/keyboards/handwired/onekey/rp2040/readme.md
new file mode 100644
index 0000000000..9014479f8d
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/readme.md
@@ -0,0 +1,12 @@
+# Raspberry Pi 2040 onekey
+
+To trigger keypress, short together pins *GP4* and *GP5*.
+
+Double-tap reset to enter bootloader mode. Copy the built uf2 file to the device by dragging the file to the new USB disk.
+
+## Supported Hardware
+
+* Raspberry Pi Pico
+* SparkFun Pro Micro - RP2040
+* Adafruit KB2040 - RP2040 Kee Boar
+* ...and many more RP2040 based development boards
diff --git a/keyboards/handwired/onekey/rp2040/rules.mk b/keyboards/handwired/onekey/rp2040/rules.mk
new file mode 100644
index 0000000000..646402d0bb
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/rules.mk
@@ -0,0 +1,3 @@
+# MCU name
+MCU = RP2040
+BOOTLOADER = rp2040
diff --git a/lib/pico-sdk b/lib/pico-sdk
new file mode 160000
index 0000000000..07edde8e49
--- /dev/null
+++ b/lib/pico-sdk
@@ -0,0 +1 @@
+Subproject commit 07edde8e49890d2172bbc272aacc119f999df063
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index a54d9058bc..be85a1dbff 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -14,7 +14,7 @@ QMK_FIRMWARE_UPSTREAM = 'qmk/qmk_firmware'
 MAX_KEYBOARD_SUBFOLDERS = 5
 
 # Supported processor types
-CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71', 'WB32FQ95'
+CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'RP2040', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71', 'WB32FQ95'
 LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
 VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
 
diff --git a/platforms/chibios/_pin_defs.h b/platforms/chibios/_pin_defs.h
index 0d96e2fc3b..414c9e3d11 100644
--- a/platforms/chibios/_pin_defs.h
+++ b/platforms/chibios/_pin_defs.h
@@ -21,6 +21,11 @@
 #    include <hal.h>
 #endif
 
+/* Include the vendor specific pin defs */
+#if __has_include_next("_pin_defs.h")
+#    include_next "_pin_defs.h"
+#endif
+
 #define A0 PAL_LINE(GPIOA, 0)
 #define A1 PAL_LINE(GPIOA, 1)
 #define A2 PAL_LINE(GPIOA, 2)
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/board/board.mk b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/board/board.mk
new file mode 100644
index 0000000000..911cc5a058
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/board/board.mk
@@ -0,0 +1,9 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/RP_PICO_RP2040/board.c
+
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/RP_PICO_RP2040
+
+# Shared variables
+ALLCSRC += $(BOARDSRC) 
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h
new file mode 100644
index 0000000000..b4363595d0
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h
@@ -0,0 +1,12 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next "board.h"
+
+#undef BOARD_RP_PICO_RP2040
+#define BOARD_GENERIC_PROMICRO_RP2040
+
+#undef BOARD_NAME
+#define BOARD_NAME "Pro Micro RP2040"
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/chconf.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/chconf.h
new file mode 100644
index 0000000000..d53f57edd9
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/chconf.h
@@ -0,0 +1,13 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define CH_CFG_SMP_MODE                     TRUE
+#define CH_CFG_ST_RESOLUTION                32
+#define CH_CFG_ST_FREQUENCY                 1000000
+#define CH_CFG_INTERVALS_SIZE               32
+#define CH_CFG_TIME_TYPES_SIZE              32
+#define CH_CFG_ST_TIMEDELTA                 20
+
+#include_next <chconf.h>
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
new file mode 100644
index 0000000000..7fe9b654e1
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
@@ -0,0 +1,62 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/**======================
+ **    I2C Driver
+ *========================**/
+
+#if !defined(I2C_DRIVER)
+#    define I2C_DRIVER I2CD2
+#endif
+
+#if !defined(I2C1_SDA_PIN)
+#    define I2C1_SDA_PIN GP2
+#endif
+
+#if !defined(I2C1_SCL_PIN)
+#    define I2C1_SCL_PIN GP3
+#endif
+
+/**======================
+ **    SPI Driver
+ *========================**/
+
+#if !defined(SPI_DRIVER)
+#    define SPI_DRIVER SPID0
+#endif
+
+#if !defined(SPI_SCK_PIN)
+#    define SPI_SCK_PIN GP18
+#endif
+
+#if !defined(SPI_MISO_PIN)
+#    define SPI_MISO_PIN GP20
+#endif
+
+#if !defined(SPI_MOSI_PIN)
+#    define SPI_MOSI_PIN GP19
+#endif
+
+/**======================
+ **      SERIAL Driver
+ *========================**/
+
+#if !defined(SERIAL_USART_DRIVER)
+#    define SERIAL_USART_DRIVER SIOD0
+#endif
+
+#if !defined(SERIAL_USART_TX_PIN) && !defined(SOFT_SERIAL_PIN)
+#    define SERIAL_USART_TX_PIN GP0
+#endif
+
+#if !defined(SERIAL_USART_RX_PIN)
+#    define SERIAL_USART_RX_PIN GP1
+#endif
+
+/**======================
+ **    Double-tap
+ *========================**/
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET 
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
new file mode 100644
index 0000000000..8348e5312f
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
@@ -0,0 +1,98 @@
+/*
+    ChibiOS - Copyright (C) 2006..2021 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * RP2040_MCUCONF drivers configuration.
+ *
+ * IRQ priorities:
+ * 3...0        Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...1        Lowest...Highest.
+ */
+
+#define RP2040_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define RP_NO_INIT                          FALSE
+#define RP_CORE1_START                      FALSE
+#define RP_CORE1_VECTORS_TABLE              _vectors
+#define RP_CORE1_ENTRY_POINT                _crt0_c1_entry
+#define RP_CORE1_STACK_END                  __c1_main_stack_end__
+
+/*
+ * IRQ system settings.
+ */
+#define RP_IRQ_SYSTICK_PRIORITY             2
+#define RP_IRQ_TIMER_ALARM0_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM1_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM2_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM3_PRIORITY        2
+#define RP_IRQ_UART0_PRIORITY               3
+#define RP_IRQ_UART1_PRIORITY               3
+#define RP_IRQ_SPI0_PRIORITY                2
+#define RP_IRQ_SPI1_PRIORITY                2
+#define RP_IRQ_USB0_PRIORITY                3
+#define RP_IRQ_I2C0_PRIORITY                2
+#define RP_IRQ_I2C1_PRIORITY                2
+
+/*
+ * ADC driver system settings.
+ */
+#define RP_ADC_USE_ADC1                     FALSE
+
+/*
+ * SIO driver system settings.
+ */
+#define RP_SIO_USE_UART0                    TRUE
+#define RP_SIO_USE_UART1                    FALSE
+
+/*
+ * SPI driver system settings.
+ */
+#define RP_SPI_USE_SPI0                     TRUE
+#define RP_SPI_USE_SPI1                     FALSE
+#define RP_SPI_SPI0_RX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI0_TX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI1_RX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI1_TX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI0_DMA_PRIORITY            1
+#define RP_SPI_SPI1_DMA_PRIORITY            1
+#define RP_SPI_DMA_ERROR_HOOK(spip)
+
+/*
+ * I2C driver system settings.
+ */
+#define RP_I2C_USE_I2C0                     FALSE
+#define RP_I2C_USE_I2C1                     TRUE
+#define RP_I2C_BUSY_TIMEOUT                 50
+#define RP_I2C_ADDRESS_MODE_10BIT           FALSE
+
+/*
+ * USB driver system settings.
+ */
+#define RP_USB_USE_USBD0                    TRUE
+#define RP_USB_FORCE_VBUS_DETECT            TRUE
+#define RP_USE_EXTERNAL_VBUS_DETECT         FALSE
+#define RP_USB_USE_SOF_INTR                 TRUE
+#define RP_USB_USE_ERROR_DATA_SEQ_INTR      FALSE
+
+#endif /* MCUCONF_H */
diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/board/board.mk b/platforms/chibios/boards/GENERIC_RP_RP2040/board/board.mk
new file mode 100644
index 0000000000..911cc5a058
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_RP_RP2040/board/board.mk
@@ -0,0 +1,9 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/RP_PICO_RP2040/board.c
+
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/RP_PICO_RP2040
+
+# Shared variables
+ALLCSRC += $(BOARDSRC) 
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h
new file mode 100644
index 0000000000..052050c944
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h
@@ -0,0 +1,12 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next "board.h"
+
+#undef BOARD_RP_PICO_RP2040
+#define BOARD_GENERIC_RP2040
+
+#undef BOARD_NAME
+#define BOARD_NAME "Generic Raspberry Pi RP2040"
diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/chconf.h b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/chconf.h
new file mode 100644
index 0000000000..d53f57edd9
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/chconf.h
@@ -0,0 +1,13 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define CH_CFG_SMP_MODE                     TRUE
+#define CH_CFG_ST_RESOLUTION                32
+#define CH_CFG_ST_FREQUENCY                 1000000
+#define CH_CFG_INTERVALS_SIZE               32
+#define CH_CFG_TIME_TYPES_SIZE              32
+#define CH_CFG_ST_TIMEDELTA                 20
+
+#include_next <chconf.h>
diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
new file mode 100644
index 0000000000..9d8dc61aac
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
@@ -0,0 +1,98 @@
+/*
+    ChibiOS - Copyright (C) 2006..2021 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * RP2040_MCUCONF drivers configuration.
+ *
+ * IRQ priorities:
+ * 3...0        Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...1        Lowest...Highest.
+ */
+
+#define RP2040_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define RP_NO_INIT                          FALSE
+#define RP_CORE1_START                      FALSE
+#define RP_CORE1_VECTORS_TABLE              _vectors
+#define RP_CORE1_ENTRY_POINT                _crt0_c1_entry
+#define RP_CORE1_STACK_END                  __c1_main_stack_end__
+
+/*
+ * IRQ system settings.
+ */
+#define RP_IRQ_SYSTICK_PRIORITY             2
+#define RP_IRQ_TIMER_ALARM0_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM1_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM2_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM3_PRIORITY        2
+#define RP_IRQ_UART0_PRIORITY               3
+#define RP_IRQ_UART1_PRIORITY               3
+#define RP_IRQ_SPI0_PRIORITY                2
+#define RP_IRQ_SPI1_PRIORITY                2
+#define RP_IRQ_USB0_PRIORITY                3
+#define RP_IRQ_I2C0_PRIORITY                2
+#define RP_IRQ_I2C1_PRIORITY                2
+
+/*
+ * ADC driver system settings.
+ */
+#define RP_ADC_USE_ADC1                     FALSE
+
+/*
+ * SIO driver system settings.
+ */
+#define RP_SIO_USE_UART0                    FALSE
+#define RP_SIO_USE_UART1                    FALSE
+
+/*
+ * SPI driver system settings.
+ */
+#define RP_SPI_USE_SPI0                     FALSE
+#define RP_SPI_USE_SPI1                     FALSE
+#define RP_SPI_SPI0_RX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI0_TX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI1_RX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI1_TX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI0_DMA_PRIORITY            1
+#define RP_SPI_SPI1_DMA_PRIORITY            1
+#define RP_SPI_DMA_ERROR_HOOK(spip)
+
+/*
+ * I2C driver system settings.
+ */
+#define RP_I2C_USE_I2C0                     FALSE
+#define RP_I2C_USE_I2C1                     FALSE
+#define RP_I2C_BUSY_TIMEOUT                 50
+#define RP_I2C_ADDRESS_MODE_10BIT           FALSE
+
+/*
+ * USB driver system settings.
+ */
+#define RP_USB_USE_USBD0                    TRUE
+#define RP_USB_FORCE_VBUS_DETECT            TRUE
+#define RP_USE_EXTERNAL_VBUS_DETECT         FALSE
+#define RP_USB_USE_SOF_INTR                 TRUE
+#define RP_USB_USE_ERROR_DATA_SEQ_INTR      FALSE
+
+#endif /* MCUCONF_H */
diff --git a/platforms/chibios/bootloaders/rp2040.c b/platforms/chibios/bootloaders/rp2040.c
new file mode 100644
index 0000000000..13a54036ef
--- /dev/null
+++ b/platforms/chibios/bootloaders/rp2040.c
@@ -0,0 +1,57 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+#include "hal.h"
+#include "bootloader.h"
+#include "pico/bootrom.h"
+
+#if !defined(RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED)
+#    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U
+#else
+#    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK (1U << RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED)
+#endif
+
+__attribute__((weak)) void mcu_reset(void) {
+    NVIC_SystemReset();
+}
+void bootloader_jump(void) {
+    reset_usb_boot(RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK, 0U);
+}
+
+void enter_bootloader_mode_if_requested(void) {}
+
+#if defined(RP2040_BOOTLOADER_DOUBLE_TAP_RESET)
+#    if !defined(RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT)
+#        define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
+#    endif
+
+// Needs to be located in a RAM section that is never initialized on boot to
+// preserve its value on reset
+static volatile uint32_t __attribute__((section(".ram0.bootloader_magic"))) magic_location;
+const uint32_t magic_token = 0xCAFEB0BA;
+
+// We can not use the __early_init / enter_bootloader_mode_if_requested hook as
+// we depend on an already initialized system with usable memory regions and
+// populated function pointer tables to the optimized math functions in the
+// bootrom. This function is called just prior to main.
+void __late_init(void) {
+    // All clocks have to be enabled before jumping to the bootloader function,
+    // otherwise the bootrom will be stuck infinitely.
+    clocks_init();
+
+    if (magic_location != magic_token) {
+        magic_location = magic_token;
+        // ChibiOS is not initialized at this point, so sleeping is only
+        // possible via busy waiting. The internal timer peripheral is running
+        // at this point with a precision of 1us.
+        chSysPolledDelayX(MS2RTC(1 * MHZ, RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT));
+        magic_location = 0;
+        return;
+    }
+
+    magic_location = 0;
+    reset_usb_boot(RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK, 0U);
+}
+
+#endif
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index a7098f2713..1571bd5cd3 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -19,6 +19,27 @@
 #    define SPLIT_USB_DETECT // Force this on when dedicated pin is not used
 #endif
 
+#if defined(MCU_RP)
+#    define CPU_CLOCK RP_CORE_CLK
+
+#    define USE_GPIOV1
+#    define PAL_OUTPUT_TYPE_OPENDRAIN _Static_assert(0, "RP2040 has no Open Drain GPIO configuration, setting this is not possible");
+
+#    define usb_lld_endpoint_fields
+
+#    define I2C1_SCL_PAL_MODE (PAL_MODE_ALTERNATE_I2C | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_PUE | PAL_RP_PAD_DRIVE4)
+#    define I2C1_SDA_PAL_MODE I2C1_SCL_PAL_MODE
+
+#    define USE_I2CV1_CONTRIB
+#    if !defined(I2C1_CLOCK_SPEED)
+#        define I2C1_CLOCK_SPEED 400000
+#    endif
+
+#    define SPI_SCK_PAL_MODE (PAL_MODE_ALTERNATE_SPI | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_DRIVE4)
+#    define SPI_MOSI_PAL_MODE SPI_SCK_PAL_MODE
+#    define SPI_MISO_PAL_MODE SPI_SCK_PAL_MODE
+#endif
+
 // STM32 compatibility
 #if defined(MCU_STM32)
 #    define CPU_CLOCK STM32_SYSCLK
diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index f76afb5db4..6581a5b6e9 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -8,12 +8,12 @@
 
 #if defined(SERIAL_USART_CONFIG)
 static QMKSerialConfig serial_config = SERIAL_USART_CONFIG;
-#else
+#elif defined(MCU_STM32) /* STM32 MCUs */
 static QMKSerialConfig serial_config = {
 #    if HAL_USE_SERIAL
-    .speed = (SERIAL_USART_SPEED), /* baudrate - mandatory */
+    .speed = (SERIAL_USART_SPEED),
 #    else
-    .baud = (SERIAL_USART_SPEED), /* baudrate - mandatory */
+    .baud = (SERIAL_USART_SPEED),
 #    endif
     .cr1   = (SERIAL_USART_CR1),
     .cr2   = (SERIAL_USART_CR2),
@@ -23,6 +23,19 @@ static QMKSerialConfig serial_config = {
     .cr3  = (SERIAL_USART_CR3)
 #    endif
 };
+#elif defined(MCU_RP) /* Raspberry Pi MCUs */
+/* USART in 8E2 config with RX and TX FIFOs enabled. */
+// clang-format off
+static QMKSerialConfig serial_config = {
+    .baud = (SERIAL_USART_SPEED),
+    .UARTLCR_H = UART_UARTLCR_H_WLEN_8BITS | UART_UARTLCR_H_PEN | UART_UARTLCR_H_STP2 | UART_UARTLCR_H_FEN,
+    .UARTCR = 0U,
+    .UARTIFLS = UART_UARTIFLS_RXIFLSEL_1_8F | UART_UARTIFLS_TXIFLSEL_1_8E,
+    .UARTDMACR = 0U
+};
+// clang-format on
+#else
+#    error MCU Familiy not supported by default, supply your own serial_config by defining SERIAL_USART_CONFIG in your keyboard files.
 #endif
 
 static QMKSerialDriver* serial_driver = (QMKSerialDriver*)&SERIAL_USART_DRIVER;
@@ -156,7 +169,7 @@ inline bool serial_transport_receive_blocking(uint8_t* destination, const size_t
  * @brief Initiate pins for USART peripheral. Half-duplex configuration.
  */
 __attribute__((weak)) void usart_init(void) {
-#    if defined(MCU_STM32)
+#    if defined(MCU_STM32) /* STM32 MCUs */
 #        if defined(USE_GPIOV1)
     palSetLineMode(SERIAL_USART_TX_PIN, PAL_MODE_ALTERNATE_OPENDRAIN);
 #        else
@@ -166,6 +179,8 @@ __attribute__((weak)) void usart_init(void) {
 #        if defined(USART_REMAP)
     USART_REMAP;
 #        endif
+#    elif defined(MCU_RP) /* Raspberry Pi MCUs */
+#        error Half-duplex with the SIO driver is not supported due to hardware limitations on the RP2040, switch to the PIO driver which has half-duplex support.
 #    else
 #        pragma message "usart_init: MCU Familiy not supported by default, please supply your own init code by implementing usart_init() in your keyboard files."
 #    endif
@@ -177,7 +192,7 @@ __attribute__((weak)) void usart_init(void) {
  * @brief Initiate pins for USART peripheral. Full-duplex configuration.
  */
 __attribute__((weak)) void usart_init(void) {
-#    if defined(MCU_STM32)
+#    if defined(MCU_STM32) /* STM32 MCUs */
 #        if defined(USE_GPIOV1)
     palSetLineMode(SERIAL_USART_TX_PIN, PAL_MODE_ALTERNATE_PUSHPULL);
     palSetLineMode(SERIAL_USART_RX_PIN, PAL_MODE_INPUT);
@@ -189,6 +204,9 @@ __attribute__((weak)) void usart_init(void) {
 #        if defined(USART_REMAP)
     USART_REMAP;
 #        endif
+#    elif defined(MCU_RP) /* Raspberry Pi MCUs */
+    palSetLineMode(SERIAL_USART_TX_PIN, PAL_MODE_ALTERNATE_UART);
+    palSetLineMode(SERIAL_USART_RX_PIN, PAL_MODE_ALTERNATE_UART);
 #    else
 #        pragma message "usart_init: MCU Familiy not supported by default, please supply your own init code by implementing usart_init() in your keyboard files."
 #    endif
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index ce69e7f0ac..f9974d9f6b 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -20,7 +20,7 @@
 
 static pin_t currentSlavePin = NO_PIN;
 
-#if defined(K20x) || defined(KL2x)
+#if defined(K20x) || defined(KL2x) || defined(RP2040)
 static SPIConfig spiConfig = {NULL, 0, 0, 0};
 #else
 static SPIConfig spiConfig = {false, NULL, 0, 0, 0, 0};
@@ -167,7 +167,36 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
             spiConfig.SPI_CPOL = SPI_CPOL_High;
             break;
     }
+#elif defined(MCU_RP)
+    if (lsbFirst) {
+        osalDbgAssert(lsbFirst == false, "RP2040s PrimeCell SPI implementation does not support sending LSB first.");
+    }
 
+    // Motorola frame format and 8bit transfer data size.
+    spiConfig.SSPCR0 = SPI_SSPCR0_FRF_MOTOROLA | SPI_SSPCR0_DSS_8BIT;
+    // Serial output clock = (ck_sys or ck_peri) / (SSPCPSR->CPSDVSR * (1 +
+    // SSPCR0->SCR)). SCR is always set to zero, as QMK SPI API expects the
+    // passed divisor to be the only value to divide the input clock by.
+    spiConfig.SSPCPSR = roundedDivisor; // Even number from 2 to 254
+
+    switch (mode) {
+        case 0:
+            spiConfig.SSPCR0 &= ~SPI_SSPCR0_SPO; // Clock polarity: low
+            spiConfig.SSPCR0 &= ~SPI_SSPCR0_SPH; // Clock phase: sample on first edge
+            break;
+        case 1:
+            spiConfig.SSPCR0 &= ~SPI_SSPCR0_SPO; // Clock polarity: low
+            spiConfig.SSPCR0 |= SPI_SSPCR0_SPH;  // Clock phase: sample on second edge transition
+            break;
+        case 2:
+            spiConfig.SSPCR0 |= SPI_SSPCR0_SPO;  // Clock polarity: high
+            spiConfig.SSPCR0 &= ~SPI_SSPCR0_SPH; // Clock phase: sample on first edge
+            break;
+        case 3:
+            spiConfig.SSPCR0 |= SPI_SSPCR0_SPO; // Clock polarity: high
+            spiConfig.SSPCR0 |= SPI_SSPCR0_SPH; // Clock phase: sample on second edge transition
+            break;
+    }
 #else
     spiConfig.cr1 = 0;
 
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
new file mode 100644
index 0000000000..949fc6dd93
--- /dev/null
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
@@ -0,0 +1,457 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+#include "serial_usart.h"
+#include "serial_protocol.h"
+#include "hardware/pio.h"
+#include "hardware/clocks.h"
+
+#if !defined(MCU_RP)
+#    error PIO Driver is only available for Raspberry Pi 2040 MCUs!
+#endif
+
+static inline bool receive_impl(uint8_t* destination, const size_t size, sysinterval_t timeout);
+static inline bool send_impl(const uint8_t* source, const size_t size);
+static inline void pio_serve_interrupt(void);
+
+#define MSG_PIO_ERROR ((msg_t)(-3))
+
+#if defined(SERIAL_PIO_USE_PIO1)
+static const PIO pio = pio1;
+
+OSAL_IRQ_HANDLER(RP_PIO1_IRQ_0_HANDLER) {
+    OSAL_IRQ_PROLOGUE();
+    pio_serve_interrupt();
+    OSAL_IRQ_EPILOGUE();
+}
+#else
+static const PIO pio = pio0;
+
+OSAL_IRQ_HANDLER(RP_PIO0_IRQ_0_HANDLER) {
+    OSAL_IRQ_PROLOGUE();
+    pio_serve_interrupt();
+    OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+#define UART_TX_WRAP_TARGET 0
+#define UART_TX_WRAP 3
+
+// clang-format off
+#if defined(SERIAL_USART_FULL_DUPLEX)
+static const uint16_t uart_tx_program_instructions[] = {
+            //     .wrap_target
+    0x9fa0, //  0: pull   block           side 1 [7]
+    0xf727, //  1: set    x, 7            side 0 [7]
+    0x6001, //  2: out    pins, 1
+    0x0642, //  3: jmp    x--, 2                 [6]
+            //     .wrap
+};
+#else
+static const uint16_t uart_tx_program_instructions[] = {
+            //     .wrap_target
+    0x9fa0, //  0: pull   block           side 1 [7]
+    0xf727, //  1: set    x, 7            side 0 [7]
+    0x6081, //  2: out    pindirs, 1
+    0x0642, //  3: jmp    x--, 2                 [6]
+            //     .wrap
+};
+#endif
+// clang-format on
+
+static const pio_program_t uart_tx_program = {
+    .instructions = uart_tx_program_instructions,
+    .length       = 4,
+    .origin       = -1,
+};
+
+#define UART_RX_WRAP_TARGET 0
+#define UART_RX_WRAP 8
+
+// clang-format off
+static const uint16_t uart_rx_program_instructions[] = {
+            //     .wrap_target
+    0x2020, //  0: wait   0 pin, 0
+    0xea27, //  1: set    x, 7                   [10]
+    0x4001, //  2: in     pins, 1
+    0x0642, //  3: jmp    x--, 2                 [6]
+    0x00c8, //  4: jmp    pin, 8
+    0xc020, //  5: irq    wait 0
+    0x20a0, //  6: wait   1 pin, 0
+    0x0000, //  7: jmp    0
+    0x8020, //  8: push   block
+            //     .wrap
+};
+// clang-format on
+
+static const pio_program_t uart_rx_program = {
+    .instructions = uart_rx_program_instructions,
+    .length       = 9,
+    .origin       = -1,
+};
+
+thread_reference_t rx_thread        = NULL;
+static int         rx_state_machine = -1;
+
+thread_reference_t tx_thread        = NULL;
+static int         tx_state_machine = -1;
+
+void pio_serve_interrupt(void) {
+    uint32_t irqs = pio->ints0;
+
+    // The RX FIFO is not empty any more, therefore wake any sleeping rx thread
+    if (irqs & (PIO_IRQ0_INTF_SM0_RXNEMPTY_BITS << rx_state_machine)) {
+        // Disable rx not empty interrupt
+        pio_set_irq0_source_enabled(pio, pis_sm0_rx_fifo_not_empty + rx_state_machine, false);
+
+        osalSysLockFromISR();
+        osalThreadResumeI(&rx_thread, MSG_OK);
+        osalSysUnlockFromISR();
+    }
+
+    // The TX FIFO is not full any more, therefore wake any sleeping tx thread
+    if (irqs & (PIO_IRQ0_INTF_SM0_TXNFULL_BITS << tx_state_machine)) {
+        // Disable tx not full interrupt
+        pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, false);
+        osalSysLockFromISR();
+        osalThreadResumeI(&tx_thread, MSG_OK);
+        osalSysUnlockFromISR();
+    }
+
+    // IRQ 0 is set on framing or break errors by the rx state machine
+    if (pio_interrupt_get(pio, 0UL)) {
+        pio_interrupt_clear(pio, 0UL);
+
+        osalSysLockFromISR();
+        osalThreadResumeI(&rx_thread, MSG_PIO_ERROR);
+        osalSysUnlockFromISR();
+    }
+}
+
+#if !defined(SERIAL_USART_FULL_DUPLEX)
+// The internal pull-ups of the RP2040 are rather weakish with a range of 50k to
+// 80k, which in turn do not provide enough current to guarantee fast signal rise
+// times with a parasitic capacitance of greater than 100pf. In real world
+// applications, like split keyboards which might have vias in the signal path
+// or long PCB traces, this prevents a successful communication. The solution
+// is to temporarily augment the weak pull ups from the receiving side by
+// driving the tx pin high. On the receiving side the lowest possible drive
+// strength is chosen because the transmitting side must still be able to drive
+// the signal low. With this configuration the rise times are fast enough and
+// the generated low level with 360mV will generate a logical zero.
+static inline void enter_rx_state(void) {
+    osalSysLock();
+    // Wait for the transmitting state machines FIFO to run empty. At this point
+    // the last byte has been pulled from the transmitting state machines FIFO
+    // into the output shift register. We have to wait a tiny bit more until
+    // this byte is transmitted, before we can turn on the receiving state
+    // machine again.
+    while (!pio_sm_is_tx_fifo_empty(pio, tx_state_machine)) {
+    }
+    // Wait for ~11 bits, 1 start bit + 8 data bits + 1 stop bit + 1 bit
+    // headroom.
+    chSysPolledDelayX(US2RTC(1 * MHZ, (1000000U * 11 / SERIAL_USART_SPEED)));
+    // Disable tx state machine to not interfere with our tx pin manipulation
+    pio_sm_set_enabled(pio, tx_state_machine, false);
+    gpio_set_drive_strength(SERIAL_USART_TX_PIN, GPIO_DRIVE_STRENGTH_2MA);
+    pio_sm_set_pins_with_mask(pio, tx_state_machine, 1U << SERIAL_USART_TX_PIN, 1U << SERIAL_USART_TX_PIN);
+    pio_sm_set_consecutive_pindirs(pio, tx_state_machine, SERIAL_USART_TX_PIN, 1U, false);
+    pio_sm_set_enabled(pio, rx_state_machine, true);
+    osalSysUnlock();
+}
+
+static inline void leave_rx_state(void) {
+    osalSysLock();
+    // In Half-duplex operation the tx pin dual-functions as sender and
+    // receiver. To not receive the data we will send, we disable the receiving
+    // state machine.
+    pio_sm_set_enabled(pio, rx_state_machine, false);
+    pio_sm_set_consecutive_pindirs(pio, tx_state_machine, SERIAL_USART_TX_PIN, 1U, true);
+    pio_sm_set_pins_with_mask(pio, tx_state_machine, 0U, 1U << SERIAL_USART_TX_PIN);
+    gpio_set_drive_strength(SERIAL_USART_TX_PIN, GPIO_DRIVE_STRENGTH_12MA);
+    pio_sm_restart(pio, tx_state_machine);
+    pio_sm_set_enabled(pio, tx_state_machine, true);
+    osalSysUnlock();
+}
+#else
+// All this trickery is gladly not necessary for full-duplex.
+static inline void enter_rx_state(void) {}
+static inline void leave_rx_state(void) {}
+#endif
+
+/**
+ * @brief Clear the RX and TX hardware FIFOs of the state machines.
+ */
+inline void serial_transport_driver_clear(void) {
+    osalSysLock();
+    pio_sm_clear_fifos(pio, rx_state_machine);
+    pio_sm_clear_fifos(pio, tx_state_machine);
+    osalSysUnlock();
+}
+
+static inline msg_t sync_tx(sysinterval_t timeout) {
+    msg_t msg = MSG_OK;
+    osalSysLock();
+    while (pio_sm_is_tx_fifo_full(pio, tx_state_machine)) {
+        pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, true);
+        msg = osalThreadSuspendTimeoutS(&tx_thread, timeout);
+        if (msg < MSG_OK) {
+            break;
+        }
+    }
+    osalSysUnlock();
+    return msg;
+}
+
+static inline bool send_impl(const uint8_t* source, const size_t size) {
+    size_t send = 0;
+    msg_t  msg;
+    while (send < size) {
+        msg = sync_tx(TIME_MS2I(SERIAL_USART_TIMEOUT));
+        if (msg < MSG_OK) {
+            return false;
+        }
+
+        osalSysLock();
+        while (send < size) {
+            if (pio_sm_is_tx_fifo_full(pio, tx_state_machine)) {
+                break;
+            }
+            if (send >= size) {
+                break;
+            }
+            pio_sm_put(pio, tx_state_machine, (uint32_t)(*source));
+            source++;
+            send++;
+        }
+        osalSysUnlock();
+    }
+
+    return send == size;
+}
+
+/**
+ * @brief Blocking send of buffer with timeout.
+ *
+ * @return true Send success.
+ * @return false Send failed.
+ */
+inline bool serial_transport_send(const uint8_t* source, const size_t size) {
+    leave_rx_state();
+    bool result = send_impl(source, size);
+    enter_rx_state();
+
+    return result;
+}
+
+static inline msg_t sync_rx(sysinterval_t timeout) {
+    msg_t msg = MSG_OK;
+    osalSysLock();
+    while (pio_sm_is_rx_fifo_empty(pio, rx_state_machine)) {
+        pio_set_irq0_source_enabled(pio, pis_sm0_rx_fifo_not_empty + rx_state_machine, true);
+        msg = osalThreadSuspendTimeoutS(&rx_thread, timeout);
+        if (msg < MSG_OK) {
+            break;
+        }
+    }
+    osalSysUnlock();
+    return msg;
+}
+
+static inline bool receive_impl(uint8_t* destination, const size_t size, sysinterval_t timeout) {
+    size_t read = 0U;
+
+    while (read < size) {
+        msg_t msg = sync_rx(timeout);
+        if (msg < MSG_OK) {
+            return false;
+        }
+        osalSysLock();
+        while (true) {
+            if (pio_sm_is_rx_fifo_empty(pio, rx_state_machine)) {
+                break;
+            }
+            if (read >= size) {
+                break;
+            }
+            *destination++ = *((uint8_t*)&pio->rxf[rx_state_machine] + 3U);
+            read++;
+        }
+        osalSysUnlock();
+    }
+
+    return read == size;
+}
+
+/**
+ * @brief  Blocking receive of size * bytes with timeout.
+ *
+ * @return true Receive success.
+ * @return false Receive failed, e.g. by timeout.
+ */
+inline bool serial_transport_receive(uint8_t* destination, const size_t size) {
+    return receive_impl(destination, size, TIME_MS2I(SERIAL_USART_TIMEOUT));
+}
+
+/**
+ * @brief  Blocking receive of size * bytes.
+ *
+ * @return true Receive success.
+ * @return false Receive failed.
+ */
+inline bool serial_transport_receive_blocking(uint8_t* destination, const size_t size) {
+    return receive_impl(destination, size, TIME_INFINITE);
+}
+
+static inline void pio_tx_init(pin_t tx_pin) {
+    uint pio_idx = pio_get_index(pio);
+    uint offset  = pio_add_program(pio, &uart_tx_program);
+
+#if defined(SERIAL_USART_FULL_DUPLEX)
+    // clang-format off
+    iomode_t tx_pin_mode = PAL_RP_GPIO_OE |
+                           PAL_RP_PAD_SLEWFAST |
+                           PAL_RP_PAD_DRIVE4 |
+                           (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1);
+    // clang-format on
+    pio_sm_set_pins_with_mask(pio, tx_state_machine, 1U << tx_pin, 1U << tx_pin);
+    pio_sm_set_consecutive_pindirs(pio, tx_state_machine, tx_pin, 1U, true);
+#else
+    // clang-format off
+    iomode_t tx_pin_mode = PAL_RP_PAD_IE |
+                           PAL_RP_GPIO_OE |
+                           PAL_RP_PAD_SCHMITT |
+                           PAL_RP_PAD_PUE |
+                           PAL_RP_PAD_SLEWFAST |
+                           PAL_RP_PAD_DRIVE12 |
+                           PAL_RP_IOCTRL_OEOVER_DRVINVPERI |
+                           (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1);
+    // clang-format on
+    pio_sm_set_pins_with_mask(pio, tx_state_machine, 0U << tx_pin, 1U << tx_pin);
+    pio_sm_set_consecutive_pindirs(pio, tx_state_machine, tx_pin, 1U, true);
+#endif
+
+    palSetLineMode(tx_pin, tx_pin_mode);
+
+    pio_sm_config config = pio_get_default_sm_config();
+    sm_config_set_wrap(&config, offset + UART_TX_WRAP_TARGET, offset + UART_TX_WRAP);
+#if defined(SERIAL_USART_FULL_DUPLEX)
+    sm_config_set_sideset(&config, 2, true, false);
+#else
+    sm_config_set_sideset(&config, 2, true, true);
+#endif
+    // OUT shifts to right, no autopull
+    sm_config_set_out_shift(&config, true, false, 32);
+    // We are mapping both OUT and side-set to the same pin, because sometimes
+    // we need to assert user data onto the pin (with OUT) and sometimes
+    // assert constant values (start/stop bit)
+    sm_config_set_out_pins(&config, tx_pin, 1);
+    sm_config_set_sideset_pins(&config, tx_pin);
+    // We only need TX, so get an 8-deep FIFO!
+    sm_config_set_fifo_join(&config, PIO_FIFO_JOIN_TX);
+    // SM transmits 1 bit per 8 execution cycles.
+    float div = (float)clock_get_hz(clk_sys) / (8 * SERIAL_USART_SPEED);
+    sm_config_set_clkdiv(&config, div);
+    pio_sm_init(pio, tx_state_machine, offset, &config);
+    pio_sm_set_enabled(pio, tx_state_machine, true);
+}
+
+static inline void pio_rx_init(pin_t rx_pin) {
+    uint offset = pio_add_program(pio, &uart_rx_program);
+
+#if defined(SERIAL_USART_FULL_DUPLEX)
+    uint pio_idx = pio_get_index(pio);
+    pio_sm_set_consecutive_pindirs(pio, rx_state_machine, rx_pin, 1, false);
+    // clang-format off
+    iomode_t rx_pin_mode = PAL_RP_PAD_IE |
+                           PAL_RP_PAD_SCHMITT |
+                           PAL_RP_PAD_PUE |
+                           (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1);
+    // clang-format on
+    palSetLineMode(rx_pin, rx_pin_mode);
+#endif
+
+    pio_sm_config config = pio_get_default_sm_config();
+    sm_config_set_wrap(&config, offset + UART_RX_WRAP_TARGET, offset + UART_RX_WRAP);
+    sm_config_set_in_pins(&config, rx_pin); // for WAIT, IN
+    sm_config_set_jmp_pin(&config, rx_pin); // for JMP
+    // Shift to right, autopush disabled
+    sm_config_set_in_shift(&config, true, false, 32);
+    // Deeper FIFO as we're not doing any TX
+    sm_config_set_fifo_join(&config, PIO_FIFO_JOIN_RX);
+    // SM transmits 1 bit per 8 execution cycles.
+    float div = (float)clock_get_hz(clk_sys) / (8 * SERIAL_USART_SPEED);
+    sm_config_set_clkdiv(&config, div);
+    pio_sm_init(pio, rx_state_machine, offset, &config);
+    pio_sm_set_enabled(pio, rx_state_machine, true);
+}
+
+static inline void pio_init(pin_t tx_pin, pin_t rx_pin) {
+    uint pio_idx = pio_get_index(pio);
+
+    /* Get PIOx peripheral out of reset state. */
+    hal_lld_peripheral_unreset(pio_idx == 0 ? RESETS_ALLREG_PIO0 : RESETS_ALLREG_PIO1);
+
+    tx_state_machine = pio_claim_unused_sm(pio, true);
+    if (tx_state_machine < 0) {
+        dprintln("ERROR: Failed to acquire state machine for serial transmission!");
+        return;
+    }
+    pio_tx_init(tx_pin);
+
+    rx_state_machine = pio_claim_unused_sm(pio, true);
+    if (rx_state_machine < 0) {
+        dprintln("ERROR: Failed to acquire state machine for serial reception!");
+        return;
+    }
+    pio_rx_init(rx_pin);
+
+    // Enable error flag IRQ source for rx state machine
+    pio_set_irq0_source_enabled(pio, pis_sm0_rx_fifo_not_empty + rx_state_machine, true);
+    pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, true);
+    pio_set_irq0_source_enabled(pio, pis_interrupt0, true);
+
+    // Enable PIO specific interrupt vector
+#if defined(SERIAL_PIO_USE_PIO1)
+    nvicEnableVector(RP_PIO1_IRQ_0_NUMBER, RP_IRQ_UART0_PRIORITY);
+#else
+    nvicEnableVector(RP_PIO0_IRQ_0_NUMBER, RP_IRQ_UART0_PRIORITY);
+#endif
+
+    enter_rx_state();
+}
+
+/**
+ * @brief PIO driver specific initialization function for the master side.
+ */
+void serial_transport_driver_master_init(void) {
+#if defined(SERIAL_USART_FULL_DUPLEX)
+    pin_t tx_pin = SERIAL_USART_TX_PIN;
+    pin_t rx_pin = SERIAL_USART_RX_PIN;
+#else
+    pin_t tx_pin = SERIAL_USART_TX_PIN;
+    pin_t rx_pin = SERIAL_USART_TX_PIN;
+#endif
+
+#if defined(SERIAL_USART_PIN_SWAP)
+    pio_init(rx_pin, tx_pin);
+#else
+    pio_init(tx_pin, rx_pin);
+#endif
+}
+
+/**
+ * @brief PIO driver specific initialization function for the slave side.
+ */
+void serial_transport_driver_slave_init(void) {
+#if defined(SERIAL_USART_FULL_DUPLEX)
+    pin_t tx_pin = SERIAL_USART_TX_PIN;
+    pin_t rx_pin = SERIAL_USART_RX_PIN;
+#else
+    pin_t tx_pin = SERIAL_USART_TX_PIN;
+    pin_t rx_pin = SERIAL_USART_TX_PIN;
+#endif
+
+    pio_init(tx_pin, rx_pin);
+}
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
new file mode 100644
index 0000000000..bc34eded14
--- /dev/null
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -0,0 +1,189 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+#include "ws2812.h"
+#include "hardware/pio.h"
+#include "hardware/clocks.h"
+
+#if !defined(MCU_RP)
+#    error PIO Driver is only available for Raspberry Pi 2040 MCUs!
+#endif
+
+#if defined(WS2812_PIO_USE_PIO1)
+static const PIO pio = pio1;
+#else
+static const PIO pio = pio0;
+#endif
+
+#if !defined(RP_DMA_PRIORITY_WS2812)
+#    define RP_DMA_PRIORITY_WS2812 12
+#endif
+
+static int state_machine = -1;
+
+#define WS2812_WRAP_TARGET 0
+#define WS2812_WRAP 3
+
+#define WS2812_T1 2
+#define WS2812_T2 5
+#define WS2812_T3 3
+
+#if defined(WS2812_EXTERNAL_PULLUP)
+
+#    pragma message "The GPIOs of the RP2040 are NOT 5V tolerant! Make sure to NOT apply any voltage over 3.3V to the RGB data pin."
+
+// clang-format off
+static const uint16_t ws2812_program_instructions[] = {
+            //     .wrap_target
+    0x7221, //  0: out    x, 1            side 1 [2] 
+    0x0123, //  1: jmp    !x, 3           side 0 [1] 
+    0x0400, //  2: jmp    0               side 0 [4] 
+    0xb442, //  3: nop                    side 1 [4] 
+            //     .wrap
+};
+
+#else
+
+static const uint16_t ws2812_program_instructions[] = {
+             //     .wrap_target
+    0x6221,  //  0: out    x, 1            side 0 [2]
+    0x1123,  //  1: jmp    !x, 3           side 1 [1]
+    0x1400,  //  2: jmp    0               side 1 [4]
+    0xa442,  //  3: nop                    side 0 [4]
+             //     .wrap
+};
+// clang-format on
+#endif
+
+static const pio_program_t ws2812_program = {
+    .instructions = ws2812_program_instructions,
+    .length       = 4,
+    .origin       = -1,
+};
+
+static uint32_t                WS2812_BUFFER[RGBLED_NUM];
+static const rp_dma_channel_t* WS2812_DMA_CHANNEL;
+
+bool ws2812_init(void) {
+    uint pio_idx = pio_get_index(pio);
+    /* Get PIOx peripheral out of reset state. */
+    hal_lld_peripheral_unreset(pio_idx == 0 ? RESETS_ALLREG_PIO0 : RESETS_ALLREG_PIO1);
+
+    // clang-format off
+    iomode_t rgb_pin_mode = PAL_RP_PAD_SLEWFAST |
+                            PAL_RP_GPIO_OE |
+                            (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1);
+    // clang-format on
+
+    palSetLineMode(RGB_DI_PIN, rgb_pin_mode);
+
+    state_machine = pio_claim_unused_sm(pio, true);
+    if (state_machine < 0) {
+        dprintln("ERROR: Failed to acquire state machine for WS2812 output!");
+        return false;
+    }
+
+    uint offset = pio_add_program(pio, &ws2812_program);
+
+    pio_sm_set_consecutive_pindirs(pio, state_machine, RGB_DI_PIN, 1, true);
+
+    pio_sm_config config = pio_get_default_sm_config();
+    sm_config_set_wrap(&config, offset + WS2812_WRAP_TARGET, offset + WS2812_WRAP);
+    sm_config_set_sideset_pins(&config, RGB_DI_PIN);
+    sm_config_set_fifo_join(&config, PIO_FIFO_JOIN_TX);
+
+#if defined(WS2812_EXTERNAL_PULLUP)
+    /* Instruct side-set to change the pin-directions instead of outputting
+     * a logic level. We generate our levels the following way:
+     *
+     * 1: Set RGB data pin to high impedance input and let the pull-up drive the
+     * signal high.
+     *
+     * 0: Set RGB data pin to low impedance output and drive the pin low.
+     */
+    sm_config_set_sideset(&config, 1, false, true);
+#else
+    sm_config_set_sideset(&config, 1, false, false);
+#endif
+
+#if defined(RGBW)
+    sm_config_set_out_shift(&config, false, true, 32);
+#else
+    sm_config_set_out_shift(&config, false, true, 24);
+#endif
+
+    int   cycles_per_bit = WS2812_T1 + WS2812_T2 + WS2812_T3;
+    float div            = clock_get_hz(clk_sys) / (800.0f * KHZ * cycles_per_bit);
+    sm_config_set_clkdiv(&config, div);
+
+    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, NULL, NULL);
+
+    // clang-format off
+    uint32_t mode = DMA_CTRL_TRIG_INCR_READ |
+                    DMA_CTRL_TRIG_DATA_SIZE_WORD |
+                    DMA_CTRL_TRIG_IRQ_QUIET |
+                    DMA_CTRL_TRIG_TREQ_SEL(pio_idx == 0 ? state_machine : state_machine + 8);
+    // clang-format on
+
+    dmaChannelSetModeX(WS2812_DMA_CHANNEL, mode);
+    dmaChannelSetDestinationX(WS2812_DMA_CHANNEL, (uint32_t)&pio->txf[state_machine]);
+    return true;
+}
+
+/**
+ * @brief Convert RGBW value into WS2812 compatible 32-bit data word.
+ */
+__always_inline static uint32_t rgbw8888_to_u32(uint8_t red, uint8_t green, uint8_t blue, uint8_t white) {
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
+    return ((uint32_t)green << 24) | ((uint32_t)red << 16) | ((uint32_t)blue << 8) | ((uint32_t)white);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+    return ((uint32_t)red << 24) | ((uint32_t)green << 16) | ((uint32_t)blue << 8) | ((uint32_t)white);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR)
+    return ((uint32_t)blue << 24) | ((uint32_t)green << 16) | ((uint32_t)red << 8) | ((uint32_t)white);
+#endif
+}
+
+static inline void sync_ws2812_transfer(void) {
+    if (unlikely(dmaChannelIsBusyX(WS2812_DMA_CHANNEL) || !pio_sm_is_tx_fifo_empty(pio, state_machine))) {
+        fast_timer_t start = timer_read_fast();
+        do {
+            // Abort the synchronization if we have to wait longer than the total
+            // count of LEDs in millisecounds. This is safely much longer than it
+            // would take to push all the data out.
+            if (unlikely(timer_elapsed_fast(start) > RGBLED_NUM)) {
+                dprintln("ERROR: WS2812 DMA transfer has stalled, aborting!");
+                dmaChannelDisableX(WS2812_DMA_CHANNEL);
+                return;
+            }
+
+        } while (dmaChannelIsBusyX(WS2812_DMA_CHANNEL) || !pio_sm_is_tx_fifo_empty(pio, state_machine));
+        // We wait for the WS2812 chain to reset after all data has been pushed
+        // out.
+        wait_us(WS2812_TRST_US);
+    }
+}
+
+void ws2812_setleds(LED_TYPE* ledarray, uint16_t leds) {
+    static bool is_initialized = false;
+    if (unlikely(!is_initialized)) {
+        is_initialized = ws2812_init();
+    }
+
+    sync_ws2812_transfer();
+
+    for (int i = 0; i < leds; i++) {
+#if defined(RGBW)
+        WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w);
+#else
+        WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, 0);
+#endif
+    }
+
+    dmaChannelSetSourceX(WS2812_DMA_CHANNEL, (uint32_t)WS2812_BUFFER);
+    dmaChannelSetCounterX(WS2812_DMA_CHANNEL, leds);
+    dmaChannelEnableX(WS2812_DMA_CHANNEL);
+}
diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk
index 86bbc22943..790c4f3316 100644
--- a/platforms/chibios/flash.mk
+++ b/platforms/chibios/flash.mk
@@ -108,6 +108,8 @@ else ifeq ($(strip $(BOOTLOADER)),kiibohd)
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU_UTIL)
 else ifeq ($(strip $(BOOTLOADER)),tinyuf2)
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_UF2_UTIL_DEPLOY)
+else ifeq ($(strip $(BOOTLOADER)),rp2040)
+	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_UF2_UTIL_DEPLOY)
 else ifeq ($(strip $(MCU_FAMILY)),KINETIS)
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY)
 else ifeq ($(strip $(MCU_FAMILY)),MIMXRT1062)
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index 72428a762f..32b8c5a946 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -88,9 +88,9 @@ ifeq ("$(MCU_PORT_NAME)","")
 endif
 
 ifeq ("$(wildcard $(PLATFORM_MK))","")
-    PLATFORM_MK = $(CHIBIOS)/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)/$(PLATFORM_NAME).mk
+    PLATFORM_MK = $(CHIBIOS_CONTRIB)/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)/$(PLATFORM_NAME).mk
     ifeq ("$(wildcard $(PLATFORM_MK))","")
-        PLATFORM_MK = $(CHIBIOS_CONTRIB)/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)/$(PLATFORM_NAME).mk
+        PLATFORM_MK = $(CHIBIOS)/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)/$(PLATFORM_NAME).mk
     endif
 endif
 
@@ -287,6 +287,17 @@ EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH)
 
+#
+# QMK specific MCU family support selection.
+##############################################################################
+ifneq ("$(wildcard $(PLATFORM_PATH)/$(PLATFORM_KEY)/vendors/$(MCU_FAMILY)/$(MCU_SERIES).mk)","")
+    # Either by MCU series e.g. STM32/STM32F1xx.mk or...
+    include $(PLATFORM_PATH)/$(PLATFORM_KEY)/vendors/$(MCU_FAMILY)/$(MCU_SERIES).mk
+else ifneq ("$(wildcard $(PLATFORM_PATH)/$(PLATFORM_KEY)/vendors/$(MCU_FAMILY)/$(MCU_FAMILY).mk)","")
+    # By MCU family e.g. STM32/STM32.mk
+    include $(PLATFORM_PATH)/$(PLATFORM_KEY)/vendors/$(MCU_FAMILY)/$(MCU_FAMILY).mk
+endif
+
 #
 # ChibiOS-Contrib
 ##############################################################################
diff --git a/platforms/chibios/vendors/RP/RP2040.mk b/platforms/chibios/vendors/RP/RP2040.mk
new file mode 100644
index 0000000000..1aa925cb15
--- /dev/null
+++ b/platforms/chibios/vendors/RP/RP2040.mk
@@ -0,0 +1,285 @@
+#
+# Raspberry Pi RP2040 specific drivers
+##############################################################################
+COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/vendor/$(MCU_FAMILY)/$(MCU_SERIES)
+
+ifeq ($(strip $(WS2812_DRIVER)), vendor)
+    OPT_DEFS += -DRP_DMA_REQUIRED=TRUE
+endif
+
+#
+# Raspberry Pi Pico SDK Support
+##############################################################################
+ADEFS  += -DCRT0_VTOR_INIT=1 \
+		  -DCRT0_EXTRA_CORES_NUMBER=0
+
+CFLAGS += -DPICO_NO_FPGA_CHECK \
+          -DNDEBUG
+
+#
+# Pico SDK source and header files needed by QMK and ChibiOS
+##############################################################################
+PICOSDKROOT   := $(TOP_DIR)/lib/pico-sdk
+
+PICOSDKSRC     = $(PICOSDKROOT)/src/rp2_common/hardware_clocks/clocks.c \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_pll/pll.c \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_pio/pio.c \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_gpio/gpio.c \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_claim/claim.c \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_watchdog/watchdog.c \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_xosc/xosc.c \
+                 $(PICOSDKROOT)/src/rp2_common/pico_bootrom/bootrom.c
+
+PICOSDKINC     = $(CHIBIOS)//os/various/pico_bindings/dumb/include \
+                 $(PICOSDKROOT)/src/common/pico_base/include \
+                 $(PICOSDKROOT)/src/rp2_common/pico_platform/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_base/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_clocks/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_claim/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_gpio/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_irq/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_pll/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_pio/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_sync/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_resets/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_watchdog/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_xosc/include \
+                 $(PICOSDKROOT)/src/rp2040/hardware_regs/include \
+                 $(PICOSDKROOT)/src/rp2040/hardware_structs/include \
+                 $(PICOSDKROOT)/src/boards/include \
+                 $(PICOSDKROOT)/src/rp2_common/pico_bootrom/include
+
+PLATFORM_SRC += $(PICOSDKSRC)
+EXTRAINCDIRS += $(PICOSDKINC)
+
+PLATFORM_RP2040_PATH := $(PLATFORM_PATH)/$(PLATFORM_KEY)/vendors/$(MCU_FAMILY)
+
+PLATFORM_SRC +=	$(PLATFORM_RP2040_PATH)/stage2_bootloaders.c \
+				$(PLATFORM_RP2040_PATH)/pico_sdk_shims.c
+
+EXTRAINCDIRS += $(PLATFORM_RP2040_PATH)
+
+#
+# RP2040 optimized compiler intrinsics
+##############################################################################
+
+# Enables optimized Compiler intrinsics which are located in the RP2040
+# bootrom. This needs startup code and linker script support from ChibiOS,
+# which is WIP. Therefore disabled by default for now.
+RP2040_INTRINSICS_ENABLED ?= no
+ifeq ($(strip $(RP2040_INTRINSICS_ENABLED)), yes)
+    PICOSDKINTRINSICSSRC =  $(PICOSDKROOT)/src/rp2_common/pico_float/float_aeabi.S \
+                            $(PICOSDKROOT)/src/rp2_common/pico_float/float_math.c \
+                            $(PICOSDKROOT)/src/rp2_common/pico_float/float_init_rom.c \
+                            $(PICOSDKROOT)/src/rp2_common/pico_float/float_v1_rom_shim.S \
+                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_aeabi.S \
+                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_math.c \
+                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_init_rom.c \
+                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_v1_rom_shim.S \
+                            $(PICOSDKROOT)/src/rp2_common/pico_divider/divider.S \
+                            $(PICOSDKROOT)/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S \
+                            $(PICOSDKROOT)/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S \
+                            $(PICOSDKROOT)/src/rp2_common/pico_malloc/pico_malloc.c \
+                            $(PICOSDKROOT)/src/rp2_common/pico_bit_ops/bit_ops_aeabi.S
+
+    PICOSDKINTRINSICSINC =  $(PICOSDKROOT)/src/common/pico_base/include \
+                            $(PICOSDKROOT)/src/rp2_common/pico_platfrom/include \
+                            $(PICOSDKROOT)/src/rp2_common/pico_bootrom/include \
+                            $(PICOSDKROOT)/src/rp2_common/hardware_divider/include \
+                            $(PICOSDKROOT)/src/rp2_common/pico_float/include \
+                            $(PICOSDKROOT)/src/rp2_common/pico_double/include \
+                            $(PICOSDKROOT)/src/rp2_common/pico_malloc/include
+
+    OPT_DEFS += -DPICO_FLOAT_SUPPORT_ROM_V1=0 -DPICO_DOUBLE_SUPPORT_ROM_V1=0
+
+    CFLAGS += -Wl,--defsym=__StackLimit=__heap_end__
+    CFLAGS += -Wl,--defsym=__unhandled_user_irq=_unhandled_exception
+    CFLAGS += -Wl,--build-id=none
+
+    # single precision floating point intrinsics
+    OPT_DEFS += -DPICO_FLOAT_IN_RAM=1
+    OPT_DEFS += -DPICO_FLOAT_PROPAGATE_NANS=0
+
+    CFLAGS += -Wl,--wrap=__aeabi_fdiv
+    CFLAGS += -Wl,--wrap=__aeabi_fmul
+    CFLAGS += -Wl,--wrap=__aeabi_frsub
+    CFLAGS += -Wl,--wrap=__aeabi_fsub
+    CFLAGS += -Wl,--wrap=__aeabi_cfcmpeq
+    CFLAGS += -Wl,--wrap=__aeabi_cfrcmple
+    CFLAGS += -Wl,--wrap=__aeabi_cfcmple
+    CFLAGS += -Wl,--wrap=__aeabi_fcmpeq
+    CFLAGS += -Wl,--wrap=__aeabi_fcmplt
+    CFLAGS += -Wl,--wrap=__aeabi_fcmple
+    CFLAGS += -Wl,--wrap=__aeabi_fcmpge
+    CFLAGS += -Wl,--wrap=__aeabi_fcmpgt
+    CFLAGS += -Wl,--wrap=__aeabi_fcmpun
+    CFLAGS += -Wl,--wrap=__aeabi_i2f
+    CFLAGS += -Wl,--wrap=__aeabi_l2f
+    CFLAGS += -Wl,--wrap=__aeabi_ui2f
+    CFLAGS += -Wl,--wrap=__aeabi_ul2f
+    CFLAGS += -Wl,--wrap=__aeabi_i2f
+    CFLAGS += -Wl,--wrap=__aeabi_f2iz
+    CFLAGS += -Wl,--wrap=__aeabi_f2lz
+    CFLAGS += -Wl,--wrap=__aeabi_f2uiz
+    CFLAGS += -Wl,--wrap=__aeabi_f2ulz
+    CFLAGS += -Wl,--wrap=__aeabi_f2d
+    CFLAGS += -Wl,--wrap=sqrtf
+    CFLAGS += -Wl,--wrap=cosf
+    CFLAGS += -Wl,--wrap=sinf
+    CFLAGS += -Wl,--wrap=tanf
+    CFLAGS += -Wl,--wrap=atan2f
+    CFLAGS += -Wl,--wrap=expf
+    CFLAGS += -Wl,--wrap=logf
+    CFLAGS += -Wl,--wrap=ldexpf
+    CFLAGS += -Wl,--wrap=copysignf
+    CFLAGS += -Wl,--wrap=truncf
+    CFLAGS += -Wl,--wrap=floorf
+    CFLAGS += -Wl,--wrap=ceilf
+    CFLAGS += -Wl,--wrap=roundf
+    CFLAGS += -Wl,--wrap=sincosf
+    CFLAGS += -Wl,--wrap=asinf
+    CFLAGS += -Wl,--wrap=acosf
+    CFLAGS += -Wl,--wrap=atanf
+    CFLAGS += -Wl,--wrap=sinhf
+    CFLAGS += -Wl,--wrap=coshf
+    CFLAGS += -Wl,--wrap=tanhf
+    CFLAGS += -Wl,--wrap=asinhf
+    CFLAGS += -Wl,--wrap=acoshf
+    CFLAGS += -Wl,--wrap=atanhf
+    CFLAGS += -Wl,--wrap=exp2f
+    CFLAGS += -Wl,--wrap=log2f
+    CFLAGS += -Wl,--wrap=exp10f
+    CFLAGS += -Wl,--wrap=log10f
+    CFLAGS += -Wl,--wrap=powf
+    CFLAGS += -Wl,--wrap=powintf
+    CFLAGS += -Wl,--wrap=hypotf
+    CFLAGS += -Wl,--wrap=cbrtf
+    CFLAGS += -Wl,--wrap=fmodf
+    CFLAGS += -Wl,--wrap=dremf
+    CFLAGS += -Wl,--wrap=remainderf
+    CFLAGS += -Wl,--wrap=remquof
+    CFLAGS += -Wl,--wrap=expm1f
+    CFLAGS += -Wl,--wrap=log1pf
+    CFLAGS += -Wl,--wrap=fmaf
+
+    # double precision floating point intrinsics
+    OPT_DEFS += -DPICO_DOUBLE_IN_RAM=1
+    OPT_DEFS += -DPICO_DOUBLE_PROPAGATE_NANS=0
+
+    CFLAGS += -Wl,--wrap=__aeabi_dadd
+    CFLAGS += -Wl,--wrap=__aeabi_ddiv
+    CFLAGS += -Wl,--wrap=__aeabi_dmul
+    CFLAGS += -Wl,--wrap=__aeabi_drsub
+    CFLAGS += -Wl,--wrap=__aeabi_dsub
+    CFLAGS += -Wl,--wrap=__aeabi_cdcmpeq
+    CFLAGS += -Wl,--wrap=__aeabi_cdrcmple
+    CFLAGS += -Wl,--wrap=__aeabi_cdcmple
+    CFLAGS += -Wl,--wrap=__aeabi_dcmpeq
+    CFLAGS += -Wl,--wrap=__aeabi_dcmplt
+    CFLAGS += -Wl,--wrap=__aeabi_dcmple
+    CFLAGS += -Wl,--wrap=__aeabi_dcmpge
+    CFLAGS += -Wl,--wrap=__aeabi_dcmpgt
+    CFLAGS += -Wl,--wrap=__aeabi_dcmpun
+    CFLAGS += -Wl,--wrap=__aeabi_i2d
+    CFLAGS += -Wl,--wrap=__aeabi_l2d
+    CFLAGS += -Wl,--wrap=__aeabi_ui2d
+    CFLAGS += -Wl,--wrap=__aeabi_ul2d
+    CFLAGS += -Wl,--wrap=__aeabi_d2iz
+    CFLAGS += -Wl,--wrap=__aeabi_d2lz
+    CFLAGS += -Wl,--wrap=__aeabi_d2uiz
+    CFLAGS += -Wl,--wrap=__aeabi_d2ulz
+    CFLAGS += -Wl,--wrap=__aeabi_d2f
+    CFLAGS += -Wl,--wrap=sqrt
+    CFLAGS += -Wl,--wrap=cos
+    CFLAGS += -Wl,--wrap=sin
+    CFLAGS += -Wl,--wrap=tan
+    CFLAGS += -Wl,--wrap=atan2
+    CFLAGS += -Wl,--wrap=exp
+    CFLAGS += -Wl,--wrap=log
+    CFLAGS += -Wl,--wrap=ldexp
+    CFLAGS += -Wl,--wrap=copysign
+    CFLAGS += -Wl,--wrap=trunc
+    CFLAGS += -Wl,--wrap=floor
+    CFLAGS += -Wl,--wrap=ceil
+    CFLAGS += -Wl,--wrap=round
+    CFLAGS += -Wl,--wrap=sincos
+    CFLAGS += -Wl,--wrap=asin
+    CFLAGS += -Wl,--wrap=acos
+    CFLAGS += -Wl,--wrap=atan
+    CFLAGS += -Wl,--wrap=sinh
+    CFLAGS += -Wl,--wrap=cosh
+    CFLAGS += -Wl,--wrap=tanh
+    CFLAGS += -Wl,--wrap=asinh
+    CFLAGS += -Wl,--wrap=acosh
+    CFLAGS += -Wl,--wrap=atanh
+    CFLAGS += -Wl,--wrap=exp2
+    CFLAGS += -Wl,--wrap=log2
+    CFLAGS += -Wl,--wrap=exp10
+    CFLAGS += -Wl,--wrap=log10
+    CFLAGS += -Wl,--wrap=pow
+    CFLAGS += -Wl,--wrap=powint
+    CFLAGS += -Wl,--wrap=hypot
+    CFLAGS += -Wl,--wrap=cbrt
+    CFLAGS += -Wl,--wrap=fmod
+    CFLAGS += -Wl,--wrap=drem
+    CFLAGS += -Wl,--wrap=remainder
+    CFLAGS += -Wl,--wrap=remquo
+    CFLAGS += -Wl,--wrap=expm1
+    CFLAGS += -Wl,--wrap=log1p
+    CFLAGS += -Wl,--wrap=fma
+
+    # bit operation intrinsics
+    OPT_DEFS += -DPICO_BITS_IN_RAM=1
+
+    CFLAGS += -Wl,--wrap=__clzsi2
+    CFLAGS += -Wl,--wrap=__clzsi2
+    CFLAGS += -Wl,--wrap=__clzdi2
+    CFLAGS += -Wl,--wrap=__ctzsi2
+    CFLAGS += -Wl,--wrap=__ctzdi2
+    CFLAGS += -Wl,--wrap=__popcountsi2
+    CFLAGS += -Wl,--wrap=__popcountdi2
+    CFLAGS += -Wl,--wrap=__clz
+    CFLAGS += -Wl,--wrap=__clzl
+    CFLAGS += -Wl,--wrap=__clzsi2
+    CFLAGS += -Wl,--wrap=__clzll
+
+    # integer division intrinsics
+    OPT_DEFS += -DPICO_DIVIDER_IN_RAM=1
+    OPT_DEFS += -DPICO_DIVIDER_DISABLE_INTERRUPTS=1
+
+    CFLAGS += -Wl,--wrap=__aeabi_idiv
+    CFLAGS += -Wl,--wrap=__aeabi_idivmod
+    CFLAGS += -Wl,--wrap=__aeabi_ldivmod
+    CFLAGS += -Wl,--wrap=__aeabi_uidiv
+    CFLAGS += -Wl,--wrap=__aeabi_uidivmod
+    CFLAGS += -Wl,--wrap=__aeabi_uldivmod
+
+    # 64bit integer intrinsics
+    OPT_DEFS += -DPICO_INT64_OPS_IN_RAM=1
+
+    CFLAGS += -Wl,--wrap=__aeabi_lmul
+
+    # malloc and friends functions
+    OPT_DEFS += -DPICO_USE_MALLOC_MUTEX=0
+    OPT_DEFS += -DPICO_DEBUG_MALLOC=0
+    OPT_DEFS ?= -DPICO_MALLOC_PANIC=0
+
+    CFLAGS += -Wl,--wrap=malloc
+    CFLAGS += -Wl,--wrap=calloc
+    CFLAGS += -Wl,--wrap=free
+
+    # memory operation intrinsics
+    OPT_DEFS += -DPICO_MEM_IN_RAM=1
+
+    CFLAGS += -Wl,--wrap=memcpy
+    CFLAGS += -Wl,--wrap=memset
+    CFLAGS += -Wl,--wrap=__aeabi_memcpy
+    CFLAGS += -Wl,--wrap=__aeabi_memset
+    CFLAGS += -Wl,--wrap=__aeabi_memcpy4
+    CFLAGS += -Wl,--wrap=__aeabi_memset4
+    CFLAGS += -Wl,--wrap=__aeabi_memcpy8
+    CFLAGS += -Wl,--wrap=__aeabi_memset8
+
+    PLATFORM_SRC += $(PICOSDKINTRINSICSSRC)
+    EXTRAINCDIRS += $(PICOSDKINTRINSICSINC)
+endif
diff --git a/platforms/chibios/vendors/RP/_pin_defs.h b/platforms/chibios/vendors/RP/_pin_defs.h
new file mode 100644
index 0000000000..4241845369
--- /dev/null
+++ b/platforms/chibios/vendors/RP/_pin_defs.h
@@ -0,0 +1,37 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* RP2040 GPIO Numbering */
+#define GP0 0U
+#define GP1 1U
+#define GP2 2U
+#define GP3 3U
+#define GP4 4U
+#define GP5 5U
+#define GP6 6U
+#define GP7 7U
+#define GP8 8U
+#define GP9 9U
+#define GP10 10U
+#define GP11 11U
+#define GP12 12U
+#define GP13 13U
+#define GP14 14U
+#define GP15 15U
+#define GP16 16U
+#define GP17 17U
+#define GP18 18U
+#define GP19 19U
+#define GP20 20U
+#define GP21 21U
+#define GP22 22U
+#define GP23 23U
+#define GP24 24U
+#define GP25 25U
+#define GP26 26U
+#define GP27 27U
+#define GP28 28U
+#define GP29 29U
+#define GP30 30U
diff --git a/platforms/chibios/vendors/RP/pico_sdk_shims.c b/platforms/chibios/vendors/RP/pico_sdk_shims.c
new file mode 100644
index 0000000000..f6e3943928
--- /dev/null
+++ b/platforms/chibios/vendors/RP/pico_sdk_shims.c
@@ -0,0 +1,9 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <stdbool.h>
+#include <ch.h>
+
+void panic(const char *fmt, ...) {
+    chSysHalt(fmt);
+}
diff --git a/platforms/chibios/vendors/RP/stage2_bootloaders.c b/platforms/chibios/vendors/RP/stage2_bootloaders.c
new file mode 100644
index 0000000000..f22112fca9
--- /dev/null
+++ b/platforms/chibios/vendors/RP/stage2_bootloaders.c
@@ -0,0 +1,174 @@
+// ----------------------------------------------------------------------------
+// Pre-compiled second stage boot code for RP2040.
+//
+// Copyright (c) 2019-2021 Raspberry Pi (Trading) Ltd.
+// SPDX-License-Identifier: BSD-3-Clause
+// ----------------------------------------------------------------------------
+
+#include <stdint.h>
+
+#define BOOTLOADER_SECTION __attribute__ ((used, section (".boot2")))
+
+#if defined(RP2040_FLASH_AT25SF128A)
+
+uint8_t BOOTLOADER_SECTION BOOT2_AT25SF128A[256] = {
+  0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
+  0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
+  0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
+  0x99, 0x50, 0x2a, 0x49, 0x19, 0x60, 0x01, 0x21, 0x99, 0x60, 0x35, 0x20,
+  0x00, 0xf0, 0x42, 0xf8, 0x02, 0x22, 0x90, 0x42, 0x12, 0xd0, 0x06, 0x21,
+  0x19, 0x66, 0x00, 0xf0, 0x32, 0xf8, 0x19, 0x6e, 0x31, 0x21, 0x19, 0x66,
+  0x1a, 0x66, 0x00, 0xf0, 0x2c, 0xf8, 0x19, 0x6e, 0x19, 0x6e, 0x19, 0x6e,
+  0x05, 0x20, 0x00, 0xf0, 0x2f, 0xf8, 0x01, 0x21, 0x08, 0x42, 0xf9, 0xd1,
+  0x00, 0x21, 0x99, 0x60, 0x1b, 0x49, 0x19, 0x60, 0x00, 0x21, 0x59, 0x60,
+  0x1a, 0x49, 0x1b, 0x48, 0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0xeb, 0x21,
+  0x19, 0x66, 0x20, 0x21, 0x19, 0x66, 0x00, 0xf0, 0x12, 0xf8, 0x00, 0x21,
+  0x99, 0x60, 0x16, 0x49, 0x14, 0x48, 0x01, 0x60, 0x01, 0x21, 0x99, 0x60,
+  0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0, 0x00, 0x47, 0x12, 0x48, 0x13, 0x49,
+  0x08, 0x60, 0x03, 0xc8, 0x80, 0xf3, 0x08, 0x88, 0x08, 0x47, 0x03, 0xb5,
+  0x99, 0x6a, 0x04, 0x20, 0x01, 0x42, 0xfb, 0xd0, 0x01, 0x20, 0x01, 0x42,
+  0xf8, 0xd1, 0x03, 0xbd, 0x02, 0xb5, 0x18, 0x66, 0x18, 0x66, 0xff, 0xf7,
+  0xf2, 0xff, 0x18, 0x6e, 0x18, 0x6e, 0x02, 0xbd, 0x00, 0x00, 0x02, 0x40,
+  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x00, 0x03, 0x5f, 0x00,
+  0x21, 0x22, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x18, 0x22, 0x20, 0x00, 0x20,
+  0x00, 0x01, 0x00, 0x10, 0x08, 0xed, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0xdd, 0xc0, 0xb5
+};
+
+#elif defined(RP2040_FLASH_GD25Q64CS)
+
+uint8_t BOOTLOADER_SECTION BOOT2_GD25Q64CS[256] = {
+  0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
+  0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
+  0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
+  0x99, 0x50, 0x2a, 0x49, 0x19, 0x60, 0x01, 0x21, 0x99, 0x60, 0x35, 0x20,
+  0x00, 0xf0, 0x42, 0xf8, 0x02, 0x22, 0x90, 0x42, 0x12, 0xd0, 0x06, 0x21,
+  0x19, 0x66, 0x00, 0xf0, 0x32, 0xf8, 0x19, 0x6e, 0x31, 0x21, 0x19, 0x66,
+  0x1a, 0x66, 0x00, 0xf0, 0x2c, 0xf8, 0x19, 0x6e, 0x19, 0x6e, 0x19, 0x6e,
+  0x05, 0x20, 0x00, 0xf0, 0x2f, 0xf8, 0x01, 0x21, 0x08, 0x42, 0xf9, 0xd1,
+  0x00, 0x21, 0x99, 0x60, 0x1b, 0x49, 0x19, 0x60, 0x00, 0x21, 0x59, 0x60,
+  0x1a, 0x49, 0x1b, 0x48, 0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0xe7, 0x21,
+  0x19, 0x66, 0xa0, 0x21, 0x19, 0x66, 0x00, 0xf0, 0x12, 0xf8, 0x00, 0x21,
+  0x99, 0x60, 0x16, 0x49, 0x14, 0x48, 0x01, 0x60, 0x01, 0x21, 0x99, 0x60,
+  0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0, 0x00, 0x47, 0x12, 0x48, 0x13, 0x49,
+  0x08, 0x60, 0x03, 0xc8, 0x80, 0xf3, 0x08, 0x88, 0x08, 0x47, 0x03, 0xb5,
+  0x99, 0x6a, 0x04, 0x20, 0x01, 0x42, 0xfb, 0xd0, 0x01, 0x20, 0x01, 0x42,
+  0xf8, 0xd1, 0x03, 0xbd, 0x02, 0xb5, 0x18, 0x66, 0x18, 0x66, 0xff, 0xf7,
+  0xf2, 0xff, 0x18, 0x6e, 0x18, 0x6e, 0x02, 0xbd, 0x00, 0x00, 0x02, 0x40,
+  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00, 0x00, 0x03, 0x5f, 0x00,
+  0x21, 0x12, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x18, 0x22, 0x10, 0x00, 0xa0,
+  0x00, 0x01, 0x00, 0x10, 0x08, 0xed, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xe2, 0xd9, 0xa2, 0xb5
+};
+
+#elif defined(RP2040_FLASH_W25X10CL)
+
+uint8_t BOOTLOADER_SECTION BOOT2_W25X10CL[256] = {
+  0x00, 0xb5, 0x14, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
+  0x12, 0x49, 0x19, 0x60, 0x00, 0x21, 0x59, 0x60, 0x11, 0x49, 0x12, 0x48,
+  0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0xbb, 0x21, 0x19, 0x66, 0x02, 0x21,
+  0x19, 0x66, 0x08, 0x21, 0x98, 0x6a, 0x08, 0x42, 0xfc, 0xd0, 0x00, 0x21,
+  0x99, 0x60, 0x0c, 0x49, 0x0a, 0x48, 0x01, 0x60, 0x01, 0x21, 0x99, 0x60,
+  0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0, 0x00, 0x47, 0x08, 0x48, 0x09, 0x49,
+  0x08, 0x60, 0x03, 0xc8, 0x80, 0xf3, 0x08, 0x88, 0x08, 0x47, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x3f, 0x00, 0x1d, 0x12, 0x00, 0x00,
+  0xf4, 0x00, 0x00, 0x18, 0x1e, 0x10, 0x00, 0x20, 0x00, 0x01, 0x00, 0x10,
+  0x08, 0xed, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x7c, 0x81, 0x53, 0x9a
+};
+
+#elif defined(RP2040_FLASH_IS25LP080)
+
+uint8_t BOOTLOADER_SECTION BOOT2_IS25LP080[256] = {
+  0x00, 0xb5, 0x2b, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
+  0x29, 0x49, 0x19, 0x60, 0x01, 0x21, 0x99, 0x60, 0x28, 0x48, 0x00, 0xf0,
+  0x42, 0xf8, 0x28, 0x4a, 0x90, 0x42, 0x12, 0xd0, 0x06, 0x21, 0x19, 0x66,
+  0x00, 0xf0, 0x32, 0xf8, 0x19, 0x6e, 0x01, 0x21, 0x19, 0x66, 0x00, 0x20,
+  0x1a, 0x66, 0x00, 0xf0, 0x2b, 0xf8, 0x19, 0x6e, 0x19, 0x6e, 0x1f, 0x48,
+  0x00, 0xf0, 0x2f, 0xf8, 0x01, 0x21, 0x08, 0x42, 0xf9, 0xd1, 0x00, 0x21,
+  0x99, 0x60, 0x1d, 0x49, 0x19, 0x60, 0x00, 0x21, 0x59, 0x60, 0x1c, 0x49,
+  0x1c, 0x48, 0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0xeb, 0x21, 0x19, 0x66,
+  0xa0, 0x21, 0x19, 0x66, 0x00, 0xf0, 0x12, 0xf8, 0x00, 0x21, 0x99, 0x60,
+  0x17, 0x49, 0x16, 0x48, 0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0x01, 0xbc,
+  0x00, 0x28, 0x00, 0xd0, 0x00, 0x47, 0x14, 0x48, 0x14, 0x49, 0x08, 0x60,
+  0x03, 0xc8, 0x80, 0xf3, 0x08, 0x88, 0x08, 0x47, 0x03, 0xb5, 0x99, 0x6a,
+  0x04, 0x20, 0x01, 0x42, 0xfb, 0xd0, 0x01, 0x20, 0x01, 0x42, 0xf8, 0xd1,
+  0x03, 0xbd, 0x02, 0xb5, 0x18, 0x66, 0x18, 0x66, 0xff, 0xf7, 0xf2, 0xff,
+  0x18, 0x6e, 0x18, 0x6e, 0x02, 0xbd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
+  0x00, 0x00, 0x07, 0x00, 0x05, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x00, 0x03, 0x5f, 0x00, 0x21, 0x22, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x18,
+  0x22, 0x20, 0x00, 0xa0, 0x00, 0x01, 0x00, 0x10, 0x08, 0xed, 0x00, 0xe0,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x28, 0x33, 0x43, 0xb2
+};
+
+#elif defined(RP2040_FLASH_GENERIC_03H)
+
+uint8_t BOOTLOADER_SECTION BOOT2_GENERIC_03H[256] = {
+  0x00, 0xb5, 0x0c, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
+  0x0a, 0x49, 0x19, 0x60, 0x0a, 0x49, 0x0b, 0x48, 0x01, 0x60, 0x00, 0x21,
+  0x59, 0x60, 0x01, 0x21, 0x99, 0x60, 0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0,
+  0x00, 0x47, 0x07, 0x48, 0x07, 0x49, 0x08, 0x60, 0x03, 0xc8, 0x80, 0xf3,
+  0x08, 0x88, 0x08, 0x47, 0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x1f, 0x00,
+  0x18, 0x02, 0x00, 0x03, 0xf4, 0x00, 0x00, 0x18, 0x00, 0x01, 0x00, 0x10,
+  0x08, 0xed, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x2c, 0xec, 0x21, 0x0d
+};
+
+#else
+
+uint8_t BOOTLOADER_SECTION BOOT2_W25Q080[256] = {
+  0x00, 0xb5, 0x32, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
+  0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2e, 0x4b,
+  0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
+  0x99, 0x50, 0x2b, 0x49, 0x19, 0x60, 0x01, 0x21, 0x99, 0x60, 0x35, 0x20,
+  0x00, 0xf0, 0x44, 0xf8, 0x02, 0x22, 0x90, 0x42, 0x14, 0xd0, 0x06, 0x21,
+  0x19, 0x66, 0x00, 0xf0, 0x34, 0xf8, 0x19, 0x6e, 0x01, 0x21, 0x19, 0x66,
+  0x00, 0x20, 0x18, 0x66, 0x1a, 0x66, 0x00, 0xf0, 0x2c, 0xf8, 0x19, 0x6e,
+  0x19, 0x6e, 0x19, 0x6e, 0x05, 0x20, 0x00, 0xf0, 0x2f, 0xf8, 0x01, 0x21,
+  0x08, 0x42, 0xf9, 0xd1, 0x00, 0x21, 0x99, 0x60, 0x1b, 0x49, 0x19, 0x60,
+  0x00, 0x21, 0x59, 0x60, 0x1a, 0x49, 0x1b, 0x48, 0x01, 0x60, 0x01, 0x21,
+  0x99, 0x60, 0xeb, 0x21, 0x19, 0x66, 0xa0, 0x21, 0x19, 0x66, 0x00, 0xf0,
+  0x12, 0xf8, 0x00, 0x21, 0x99, 0x60, 0x16, 0x49, 0x14, 0x48, 0x01, 0x60,
+  0x01, 0x21, 0x99, 0x60, 0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0, 0x00, 0x47,
+  0x12, 0x48, 0x13, 0x49, 0x08, 0x60, 0x03, 0xc8, 0x80, 0xf3, 0x08, 0x88,
+  0x08, 0x47, 0x03, 0xb5, 0x99, 0x6a, 0x04, 0x20, 0x01, 0x42, 0xfb, 0xd0,
+  0x01, 0x20, 0x01, 0x42, 0xf8, 0xd1, 0x03, 0xbd, 0x02, 0xb5, 0x18, 0x66,
+  0x18, 0x66, 0xff, 0xf7, 0xf2, 0xff, 0x18, 0x6e, 0x18, 0x6e, 0x02, 0xbd,
+  0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x07, 0x00,
+  0x00, 0x03, 0x5f, 0x00, 0x21, 0x22, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x18,
+  0x22, 0x20, 0x00, 0xa0, 0x00, 0x01, 0x00, 0x10, 0x08, 0xed, 0x00, 0xe0,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x07, 0x0b, 0x8f, 0xd5
+};
+
+#endif
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 081bc54ebe..edff484129 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -46,6 +46,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum_keycodes.h"
 
+// Gross hack, remove me and change RESET keycode to QK_BOOT
+#if defined(MCU_RP)
+#    undef RESET
+#endif
+
 // translates key to keycode
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
 
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 19e2e858fc..4bb6949b4f 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -32,6 +32,7 @@
 #include "usb_main.h"
 
 #include "host.h"
+#include "chibios_config.h"
 #include "debug.h"
 #include "suspend.h"
 #ifdef SLEEP_LED_ENABLE
@@ -91,6 +92,13 @@ uint8_t extra_report_blank[3] = {0};
  * ---------------------------------------------------------
  */
 
+/* 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
+
 /* HID specific constants */
 #define HID_GET_REPORT 0x01
 #define HID_GET_IDLE 0x02
@@ -121,16 +129,15 @@ static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype
 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 */
-    kbd_in_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 */
-    2,                     /* IN multiplier */
-    NULL                   /* SETUP buffer (not a SETUP endpoint) */
+    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
+    NULL,                   /* SETUP packet notification callback */
+    kbd_in_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
 
@@ -140,16 +147,15 @@ 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 */
-    mouse_in_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 */
-    2,                     /* IN multiplier */
-    NULL                   /* SETUP buffer (not a SETUP endpoint) */
+    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
+    NULL,                   /* SETUP packet notification callback */
+    mouse_in_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
 
@@ -159,16 +165,15 @@ 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 */
-    shared_in_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 */
-    2,                     /* IN multiplier */
-    NULL                   /* SETUP buffer (not a SETUP endpoint) */
+    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
+    NULL,                   /* SETUP packet notification callback */
+    shared_in_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
 
@@ -251,29 +256,27 @@ typedef struct {
             .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 */                                                             \
-                    2,                     /* IN multiplier */                                                                  \
-                    NULL                   /* SETUP buffer (not a SETUP endpoint) */                                            \
+                    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 */                                                                \
-                    2,                  /* IN multiplier */                                                                     \
-                    NULL,               /* SETUP buffer (not a SETUP endpoint) */                                               \
+                    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 =                                                                                                    \
                 {                                                                                                               \
@@ -285,8 +288,7 @@ typedef struct {
                     0,                          /* OUT maximum packet size */                                                   \
                     NULL,                       /* IN Endpoint state */                                                         \
                     NULL,                       /* OUT endpoint state */                                                        \
-                    2,                          /* IN multiplier */                                                             \
-                    NULL,                       /* SETUP buffer (not a SETUP endpoint) */                                       \
+                    usb_lld_endpoint_fields     /* USB driver specific endpoint fields */                                       \
                 },                                                                                                              \
             .config = {                                                                                                         \
                 .usbp        = &USB_DRIVER,                                                                                     \

From 77d960cce3a10296fcdad2324f17eff4a2f0835f Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 30 Jun 2022 21:07:54 +0200
Subject: [PATCH 057/959] Disable clang-format for stage2_bootloaders (#17516)

---
 platforms/chibios/vendors/RP/stage2_bootloaders.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platforms/chibios/vendors/RP/stage2_bootloaders.c b/platforms/chibios/vendors/RP/stage2_bootloaders.c
index f22112fca9..af679a0dc7 100644
--- a/platforms/chibios/vendors/RP/stage2_bootloaders.c
+++ b/platforms/chibios/vendors/RP/stage2_bootloaders.c
@@ -7,7 +7,9 @@
 
 #include <stdint.h>
 
-#define BOOTLOADER_SECTION __attribute__ ((used, section (".boot2")))
+#define BOOTLOADER_SECTION __attribute__((used, section(".boot2")))
+
+// clang-format off
 
 #if defined(RP2040_FLASH_AT25SF128A)
 
@@ -172,3 +174,5 @@ uint8_t BOOTLOADER_SECTION BOOT2_W25Q080[256] = {
 };
 
 #endif
+
+// clang-format on

From a98f69850f6f9a15072122c32e6679e2dc49321a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 30 Jun 2022 23:29:56 +0100
Subject: [PATCH 058/959] Also check /run/media/ for uf2 drives (#17517)

---
 util/uf2conv.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/util/uf2conv.py b/util/uf2conv.py
index df94b5ac99..7f5645414a 100755
--- a/util/uf2conv.py
+++ b/util/uf2conv.py
@@ -219,6 +219,9 @@ def get_drives():
             tmp = rootpath + "/" + os.environ["USER"]
             if os.path.isdir(tmp):
                 rootpath = tmp
+            tmp = "/run" + rootpath + "/" + os.environ["USER"]
+            if os.path.isdir(tmp):
+                rootpath = tmp
         for d in os.listdir(rootpath):
             drives.append(os.path.join(rootpath, d))
 

From b67ae67687b00ffb11ef9c4652e7f7f77b0c7b6d Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 2 Jul 2022 13:20:45 +1000
Subject: [PATCH 059/959] [QP] Add ILI9488 support. (#17438)

---
 docs/quantum_painter.md                      |  25 ++++
 drivers/painter/gc9a01/qp_gc9a01.c           |   9 +-
 drivers/painter/ili9xxx/qp_ili9163.c         |   9 +-
 drivers/painter/ili9xxx/qp_ili9341.c         |   9 +-
 drivers/painter/ili9xxx/qp_ili9488.c         | 120 +++++++++++++++++++
 drivers/painter/ili9xxx/qp_ili9488.h         |  37 ++++++
 drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h |   1 +
 drivers/painter/ssd1351/qp_ssd1351.c         |   4 +-
 drivers/painter/st77xx/qp_st7789.c           |   9 +-
 drivers/painter/tft_panel/qp_tft_panel.c     |  60 +++++-----
 drivers/painter/tft_panel/qp_tft_panel.h     |  16 +--
 quantum/painter/qp.h                         |   4 +
 quantum/painter/rules.mk                     |  13 +-
 13 files changed, 252 insertions(+), 64 deletions(-)
 create mode 100644 drivers/painter/ili9xxx/qp_ili9488.c
 create mode 100644 drivers/painter/ili9xxx/qp_ili9488.h

diff --git a/docs/quantum_painter.md b/docs/quantum_painter.md
index a3705b62ce..2386a70933 100644
--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -24,6 +24,7 @@ Hardware supported:
 | GC9A01        | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = gc9a01_spi`  |
 | ILI9163       | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ili9163_spi` |
 | ILI9341       | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ili9341_spi` |
+| ILI9488       | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ili9488_spi` |
 | SSD1351       | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ssd1351_spi` |
 | ST7789        | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = st7789_spi`  |
 
@@ -654,6 +655,30 @@ The maximum number of displays can be configured by changing the following in yo
 #define ILI9341_NUM_DEVICES 3
 ```
 
+### ILI9488 :id=qp-driver-ili9488
+
+Enabling support for the ILI9488 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS = ili9488_spi
+```
+
+Creating a ILI9488 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_ili9488_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);
+```
+
+The device handle returned from the `qp_ili9488_make_spi_device` function 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 ILI9488_NUM_DEVICES 3
+```
+
 ### SSD1351 :id=qp-driver-ssd1351
 
 Enabling support for the SSD1351 in Quantum Painter is done by adding the following to `rules.mk`:
diff --git a/drivers/painter/gc9a01/qp_gc9a01.c b/drivers/painter/gc9a01/qp_gc9a01.c
index ad76d58b07..37700a28a4 100644
--- a/drivers/painter/gc9a01/qp_gc9a01.c
+++ b/drivers/painter/gc9a01/qp_gc9a01.c
@@ -102,12 +102,11 @@ const struct tft_panel_dc_reset_painter_driver_vtable_t gc9a01_driver_vtable = {
             .flush           = qp_tft_panel_flush,
             .pixdata         = qp_tft_panel_pixdata,
             .viewport        = qp_tft_panel_viewport,
-            .palette_convert = qp_tft_panel_palette_convert,
-            .append_pixels   = qp_tft_panel_append_pixels,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
         },
-    .rgb888_to_native16bit = qp_rgb888_to_rgb565_swapped,
-    .num_window_bytes      = 2,
-    .swap_window_coords    = false,
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
     .opcodes =
         {
             .display_on         = GC9A01_CMD_DISPLAY_ON,
diff --git a/drivers/painter/ili9xxx/qp_ili9163.c b/drivers/painter/ili9xxx/qp_ili9163.c
index beaac0fbb5..14363c7d04 100644
--- a/drivers/painter/ili9xxx/qp_ili9163.c
+++ b/drivers/painter/ili9xxx/qp_ili9163.c
@@ -67,12 +67,11 @@ const struct tft_panel_dc_reset_painter_driver_vtable_t ili9163_driver_vtable =
             .flush           = qp_tft_panel_flush,
             .pixdata         = qp_tft_panel_pixdata,
             .viewport        = qp_tft_panel_viewport,
-            .palette_convert = qp_tft_panel_palette_convert,
-            .append_pixels   = qp_tft_panel_append_pixels,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
         },
-    .rgb888_to_native16bit = qp_rgb888_to_rgb565_swapped,
-    .num_window_bytes      = 2,
-    .swap_window_coords    = false,
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
     .opcodes =
         {
             .display_on         = ILI9XXX_CMD_DISPLAY_ON,
diff --git a/drivers/painter/ili9xxx/qp_ili9341.c b/drivers/painter/ili9xxx/qp_ili9341.c
index 1f41dcfc0b..9608f109bd 100644
--- a/drivers/painter/ili9xxx/qp_ili9341.c
+++ b/drivers/painter/ili9xxx/qp_ili9341.c
@@ -74,12 +74,11 @@ const struct tft_panel_dc_reset_painter_driver_vtable_t ili9341_driver_vtable =
             .flush           = qp_tft_panel_flush,
             .pixdata         = qp_tft_panel_pixdata,
             .viewport        = qp_tft_panel_viewport,
-            .palette_convert = qp_tft_panel_palette_convert,
-            .append_pixels   = qp_tft_panel_append_pixels,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
         },
-    .rgb888_to_native16bit = qp_rgb888_to_rgb565_swapped,
-    .num_window_bytes      = 2,
-    .swap_window_coords    = false,
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
     .opcodes =
         {
             .display_on         = ILI9XXX_CMD_DISPLAY_ON,
diff --git a/drivers/painter/ili9xxx/qp_ili9488.c b/drivers/painter/ili9xxx/qp_ili9488.c
new file mode 100644
index 0000000000..55cf9f896f
--- /dev/null
+++ b/drivers/painter/ili9xxx/qp_ili9488.c
@@ -0,0 +1,120 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "qp_internal.h"
+#include "qp_comms.h"
+#include "qp_ili9488.h"
+#include "qp_ili9xxx_opcodes.h"
+#include "qp_tft_panel.h"
+
+#ifdef QUANTUM_PAINTER_ILI9488_SPI_ENABLE
+#    include <qp_comms_spi.h>
+#endif // QUANTUM_PAINTER_ILI9488_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Common
+
+// Driver storage
+tft_panel_dc_reset_painter_device_t ili9488_drivers[ILI9488_NUM_DEVICES] = {0};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Initialization
+
+bool qp_ili9488_init(painter_device_t device, painter_rotation_t rotation) {
+    // clang-format off
+    const uint8_t ili9488_init_sequence[] = {
+        // Command,                 Delay,  N, Data[N]
+        ILI9XXX_CMD_RESET,            120,  0,
+        ILI9XXX_SET_PGAMMA,             0, 15, 0x00, 0x03, 0x09, 0x08, 0x16, 0x0A, 0x3F, 0x78, 0x4C, 0x09, 0x0A, 0x08, 0x16, 0x1A, 0x0F,
+        ILI9XXX_SET_NGAMMA,             0, 15, 0x00, 0x16, 0x19, 0x03, 0x0F, 0x05, 0x32, 0x45, 0x46, 0x04, 0x0E, 0x0D, 0x35, 0x37, 0x0F,
+        ILI9XXX_SET_POWER_CTL_1,        0,  2, 0x17, 0x15,
+        ILI9XXX_SET_POWER_CTL_2,        0,  1, 0x41,
+        ILI9XXX_SET_VCOM_CTL_1,         0,  3, 0x00, 0x12, 0x80,
+        ILI9XXX_SET_PIX_FMT,            0,  1, 0x66,
+        ILI9XXX_SET_RGB_IF_SIG_CTL,     0,  1, 0x80,
+        ILI9XXX_SET_FRAME_CTL_NORMAL,   0,  1, 0xA0,
+        ILI9XXX_SET_INVERSION_CTL,      0,  1, 0x02,
+        ILI9XXX_SET_FUNCTION_CTL,       0,  2, 0x02, 0x02,
+        ILI9XXX_SET_IMAGE_FUNCTION,     0,  1, 0x00,
+        ILI9XXX_SET_PUMP_RATIO_CTL,     0,  4, 0xA9, 0x51, 0x2C, 0x82,
+        ILI9XXX_CMD_SLEEP_OFF,          5,  0,
+        ILI9XXX_CMD_DISPLAY_ON,        20,  0
+    };
+    // clang-format on
+    qp_comms_bulk_command_sequence(device, ili9488_init_sequence, sizeof(ili9488_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 | ILI9XXX_MADCTL_MY,
+        [QP_ROTATION_90]  = ILI9XXX_MADCTL_BGR | ILI9XXX_MADCTL_MX | ILI9XXX_MADCTL_MV | ILI9XXX_MADCTL_MY,
+        [QP_ROTATION_180] = ILI9XXX_MADCTL_BGR | ILI9XXX_MADCTL_MX,
+        [QP_ROTATION_270] = ILI9XXX_MADCTL_BGR | ILI9XXX_MADCTL_MV,
+    };
+    qp_comms_command_databyte(device, ILI9XXX_SET_MEM_ACS_CTL, madctl[rotation]);
+
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Driver vtable
+
+const struct tft_panel_dc_reset_painter_driver_vtable_t ili9488_driver_vtable = {
+    .base =
+        {
+            .init            = qp_ili9488_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_rgb888,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb888,
+        },
+    .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,
+        },
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SPI
+
+#ifdef QUANTUM_PAINTER_ILI9488_SPI_ENABLE
+
+// Factory function for creating a handle to the ILI9488 device
+painter_device_t qp_ili9488_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 < ILI9488_NUM_DEVICES; ++i) {
+        tft_panel_dc_reset_painter_device_t *driver = &ili9488_drivers[i];
+        if (!driver->base.driver_vtable) {
+            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&ili9488_driver_vtable;
+            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.native_bits_per_pixel = 24; // RGB888
+            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;
+            return (painter_device_t)driver;
+        }
+    }
+    return NULL;
+}
+
+#endif // QUANTUM_PAINTER_ILI9488_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/drivers/painter/ili9xxx/qp_ili9488.h b/drivers/painter/ili9xxx/qp_ili9488.h
new file mode 100644
index 0000000000..21b8f03322
--- /dev/null
+++ b/drivers/painter/ili9xxx/qp_ili9488.h
@@ -0,0 +1,37 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "gpio.h"
+#include "qp_internal.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ILI9488 configurables (add to your keyboard's config.h)
+
+#ifndef ILI9488_NUM_DEVICES
+/**
+ * @def This controls the maximum number of ILI9488 devices that Quantum Painter can communicate with at any one time.
+ *      Increasing this number allows for multiple displays to be used.
+ */
+#    define ILI9488_NUM_DEVICES 1
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ILI9488 device factories
+
+#ifdef QUANTUM_PAINTER_ILI9488_SPI_ENABLE
+/**
+ * Factory method for an ILI9488 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_ili9488_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);
+#endif // QUANTUM_PAINTER_ILI9488_SPI_ENABLE
diff --git a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
index 1fa395cb89..47bb703648 100644
--- a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
+++ b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
@@ -85,6 +85,7 @@
 #define ILI9XXX_SET_NGAMMA 0xE1             // Set negative gamma
 #define ILI9XXX_SET_DGAMMA_CTL_1 0xE2       // Set digital gamma ctl 1
 #define ILI9XXX_SET_DGAMMA_CTL_2 0xE3       // Set digital gamma ctl 2
+#define ILI9XXX_SET_IMAGE_FUNCTION 0xE9     // Set image function
 #define ILI9XXX_ENABLE_3_GAMMA 0xF2         // Enable 3 gamma
 #define ILI9XXX_SET_IF_CTL 0xF6             // Set interface control
 #define ILI9XXX_SET_PUMP_RATIO_CTL 0xF7     // Set pump ratio control
diff --git a/drivers/painter/ssd1351/qp_ssd1351.c b/drivers/painter/ssd1351/qp_ssd1351.c
index 970e7e67f3..67854133aa 100644
--- a/drivers/painter/ssd1351/qp_ssd1351.c
+++ b/drivers/painter/ssd1351/qp_ssd1351.c
@@ -71,8 +71,8 @@ const struct tft_panel_dc_reset_painter_driver_vtable_t ssd1351_driver_vtable =
             .flush           = qp_tft_panel_flush,
             .pixdata         = qp_tft_panel_pixdata,
             .viewport        = qp_tft_panel_viewport,
-            .palette_convert = qp_tft_panel_palette_convert,
-            .append_pixels   = qp_tft_panel_append_pixels,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
         },
     .rgb888_to_native16bit = qp_rgb888_to_rgb565_swapped,
     .num_window_bytes      = 1,
diff --git a/drivers/painter/st77xx/qp_st7789.c b/drivers/painter/st77xx/qp_st7789.c
index d005ece050..49e8436c29 100644
--- a/drivers/painter/st77xx/qp_st7789.c
+++ b/drivers/painter/st77xx/qp_st7789.c
@@ -90,12 +90,11 @@ const struct tft_panel_dc_reset_painter_driver_vtable_t st7789_driver_vtable = {
             .flush           = qp_tft_panel_flush,
             .pixdata         = qp_tft_panel_pixdata,
             .viewport        = qp_tft_panel_viewport,
-            .palette_convert = qp_tft_panel_palette_convert,
-            .append_pixels   = qp_tft_panel_append_pixels,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
         },
-    .rgb888_to_native16bit = qp_rgb888_to_rgb565_swapped,
-    .num_window_bytes      = 2,
-    .swap_window_coords    = false,
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
     .opcodes =
         {
             .display_on         = ST77XX_CMD_DISPLAY_ON,
diff --git a/drivers/painter/tft_panel/qp_tft_panel.c b/drivers/painter/tft_panel/qp_tft_panel.c
index 4d636c9509..ad83b6c792 100644
--- a/drivers/painter/tft_panel/qp_tft_panel.c
+++ b/drivers/painter/tft_panel/qp_tft_panel.c
@@ -9,29 +9,6 @@
 
 #define BYTE_SWAP(x) (((((uint16_t)(x)) >> 8) & 0x00FF) | ((((uint16_t)(x)) << 8) & 0xFF00))
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Native pixel format conversion
-
-uint16_t qp_rgb888_to_rgb565(uint8_t r, uint8_t g, uint8_t b) {
-    uint16_t rgb565 = (((uint16_t)r) >> 3) << 11 | (((uint16_t)g) >> 2) << 5 | (((uint16_t)b) >> 3);
-    return rgb565;
-}
-
-uint16_t qp_rgb888_to_rgb565_swapped(uint8_t r, uint8_t g, uint8_t b) {
-    uint16_t rgb565 = (((uint16_t)r) >> 3) << 11 | (((uint16_t)g) >> 2) << 5 | (((uint16_t)b) >> 3);
-    return BYTE_SWAP(rgb565);
-}
-
-uint16_t qp_rgb888_to_bgr565(uint8_t r, uint8_t g, uint8_t b) {
-    uint16_t bgr565 = (((uint16_t)b) >> 3) << 11 | (((uint16_t)g) >> 2) << 5 | (((uint16_t)r) >> 3);
-    return bgr565;
-}
-
-uint16_t qp_rgb888_to_bgr565_swapped(uint8_t r, uint8_t g, uint8_t b) {
-    uint16_t bgr565 = (((uint16_t)b) >> 3) << 11 | (((uint16_t)g) >> 2) << 5 | (((uint16_t)r) >> 3);
-    return BYTE_SWAP(bgr565);
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Quantum Painter API implementations
 
@@ -105,26 +82,49 @@ bool qp_tft_panel_viewport(painter_device_t device, uint16_t left, uint16_t top,
 
 // Stream pixel data to the current write position in GRAM
 bool qp_tft_panel_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count) {
-    qp_comms_send(device, pixel_data, native_pixel_count * sizeof(uint16_t));
+    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    qp_comms_send(device, pixel_data, native_pixel_count * driver->native_bits_per_pixel / 8);
     return true;
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Convert supplied palette entries into their native equivalents
-bool qp_tft_panel_palette_convert(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) {
-    struct painter_driver_t *                          driver = (struct painter_driver_t *)device;
-    struct tft_panel_dc_reset_painter_driver_vtable_t *vtable = (struct tft_panel_dc_reset_painter_driver_vtable_t *)driver->driver_vtable;
+
+bool qp_tft_panel_palette_convert_rgb565_swapped(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) {
     for (int16_t i = 0; i < palette_size; ++i) {
-        RGB rgb           = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v});
-        palette[i].rgb565 = vtable->rgb888_to_native16bit(rgb.r, rgb.g, rgb.b);
+        RGB      rgb      = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v});
+        uint16_t rgb565   = (((uint16_t)rgb.r) >> 3) << 11 | (((uint16_t)rgb.g) >> 2) << 5 | (((uint16_t)rgb.b) >> 3);
+        palette[i].rgb565 = BYTE_SWAP(rgb565);
     }
     return true;
 }
 
+bool qp_tft_panel_palette_convert_rgb888(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) {
+    for (int16_t i = 0; i < palette_size; ++i) {
+        RGB rgb             = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v});
+        palette[i].rgb888.r = rgb.r;
+        palette[i].rgb888.g = rgb.g;
+        palette[i].rgb888.b = rgb.b;
+    }
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Append pixels to the target location, keyed by the pixel index
-bool qp_tft_panel_append_pixels(painter_device_t device, uint8_t *target_buffer, qp_pixel_t *palette, uint32_t pixel_offset, uint32_t pixel_count, uint8_t *palette_indices) {
+
+bool qp_tft_panel_append_pixels_rgb565(painter_device_t device, uint8_t *target_buffer, qp_pixel_t *palette, uint32_t pixel_offset, uint32_t pixel_count, uint8_t *palette_indices) {
     uint16_t *buf = (uint16_t *)target_buffer;
     for (uint32_t i = 0; i < pixel_count; ++i) {
         buf[pixel_offset + i] = palette[palette_indices[i]].rgb565;
     }
     return true;
 }
+
+bool qp_tft_panel_append_pixels_rgb888(painter_device_t device, uint8_t *target_buffer, qp_pixel_t *palette, uint32_t pixel_offset, uint32_t pixel_count, uint8_t *palette_indices) {
+    for (uint32_t i = 0; i < pixel_count; ++i) {
+        target_buffer[(pixel_offset + i) * 3 + 0] = palette[palette_indices[i]].rgb888.r;
+        target_buffer[(pixel_offset + i) * 3 + 1] = palette[palette_indices[i]].rgb888.g;
+        target_buffer[(pixel_offset + i) * 3 + 2] = palette[palette_indices[i]].rgb888.b;
+    }
+    return true;
+}
diff --git a/drivers/painter/tft_panel/qp_tft_panel.h b/drivers/painter/tft_panel/qp_tft_panel.h
index 6eddfc503d..3cb015891b 100644
--- a/drivers/painter/tft_panel/qp_tft_panel.h
+++ b/drivers/painter/tft_panel/qp_tft_panel.h
@@ -11,15 +11,10 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Common TFT panel implementation using D/C, and RST pins.
 
-typedef uint16_t (*rgb888_to_native_uint16_t)(uint8_t r, uint8_t g, uint8_t b);
-
 // Driver vtable with extras
 struct tft_panel_dc_reset_painter_driver_vtable_t {
     struct painter_driver_vtable_t base; // must be first, so it can be cast to/from the painter_driver_vtable_t* type
 
-    // Conversion function for palette entries
-    rgb888_to_native_uint16_t rgb888_to_native16bit;
-
     // Number of bytes for transmitting x/y coordinates
     uint8_t num_window_bytes;
 
@@ -58,10 +53,9 @@ bool qp_tft_panel_clear(painter_device_t device);
 bool qp_tft_panel_flush(painter_device_t device);
 bool qp_tft_panel_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom);
 bool qp_tft_panel_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count);
-bool qp_tft_panel_palette_convert(painter_device_t device, int16_t palette_size, qp_pixel_t *palette);
-bool qp_tft_panel_append_pixels(painter_device_t device, uint8_t *target_buffer, qp_pixel_t *palette, uint32_t pixel_offset, uint32_t pixel_count, uint8_t *palette_indices);
 
-uint16_t qp_rgb888_to_rgb565(uint8_t r, uint8_t g, uint8_t b);
-uint16_t qp_rgb888_to_rgb565_swapped(uint8_t r, uint8_t g, uint8_t b);
-uint16_t qp_rgb888_to_bgr565(uint8_t r, uint8_t g, uint8_t b);
-uint16_t qp_rgb888_to_bgr565_swapped(uint8_t r, uint8_t g, uint8_t b);
+bool qp_tft_panel_palette_convert_rgb565_swapped(painter_device_t device, int16_t palette_size, qp_pixel_t *palette);
+bool qp_tft_panel_palette_convert_rgb888(painter_device_t device, int16_t palette_size, qp_pixel_t *palette);
+
+bool qp_tft_panel_append_pixels_rgb565(painter_device_t device, uint8_t *target_buffer, qp_pixel_t *palette, uint32_t pixel_offset, uint32_t pixel_count, uint8_t *palette_indices);
+bool qp_tft_panel_append_pixels_rgb888(painter_device_t device, uint8_t *target_buffer, qp_pixel_t *palette, uint32_t pixel_offset, uint32_t pixel_count, uint8_t *palette_indices);
diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h
index e1c14d156c..47f077d0cf 100644
--- a/quantum/painter/qp.h
+++ b/quantum/painter/qp.h
@@ -440,6 +440,10 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
 #    include "qp_ili9341.h"
 #endif // QUANTUM_PAINTER_ILI9341_ENABLE
 
+#ifdef QUANTUM_PAINTER_ILI9488_ENABLE
+#    include "qp_ili9488.h"
+#endif // QUANTUM_PAINTER_ILI9488_ENABLE
+
 #ifdef QUANTUM_PAINTER_ST7789_ENABLE
 #    include "qp_st7789.h"
 #endif // QUANTUM_PAINTER_ST7789_ENABLE
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index 9115d3d406..675a1a5460 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -3,7 +3,7 @@ QUANTUM_PAINTER_DRIVERS ?=
 QUANTUM_PAINTER_ANIMATIONS_ENABLE ?= yes
 
 # The list of permissible drivers that can be listed in QUANTUM_PAINTER_DRIVERS
-VALID_QUANTUM_PAINTER_DRIVERS := ili9163_spi ili9341_spi st7789_spi gc9a01_spi ssd1351_spi
+VALID_QUANTUM_PAINTER_DRIVERS := ili9163_spi ili9341_spi ili9488_spi st7789_spi gc9a01_spi ssd1351_spi
 
 #-------------------------------------------------------------------------------
 
@@ -61,6 +61,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)),ili9488_spi)
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
+        OPT_DEFS += -DQUANTUM_PAINTER_ILI9488_ENABLE -DQUANTUM_PAINTER_ILI9488_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_ili9488.c \
+
     else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),st7789_spi)
         QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
         QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes

From 9f1c4f304d0597b7024d079eb358bb0c71be3ce8 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 2 Jul 2022 14:29:45 +1000
Subject: [PATCH 060/959] Fixup `#17438` (#17533)

---
 drivers/painter/ssd1351/qp_ssd1351.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/painter/ssd1351/qp_ssd1351.c b/drivers/painter/ssd1351/qp_ssd1351.c
index 67854133aa..7ce76bab6d 100644
--- a/drivers/painter/ssd1351/qp_ssd1351.c
+++ b/drivers/painter/ssd1351/qp_ssd1351.c
@@ -74,9 +74,8 @@ const struct tft_panel_dc_reset_painter_driver_vtable_t ssd1351_driver_vtable =
             .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
             .append_pixels   = qp_tft_panel_append_pixels_rgb565,
         },
-    .rgb888_to_native16bit = qp_rgb888_to_rgb565_swapped,
-    .num_window_bytes      = 1,
-    .swap_window_coords    = true,
+    .num_window_bytes   = 1,
+    .swap_window_coords = true,
     .opcodes =
         {
             .display_on         = SSD1351_DISPLAYON,

From 5846b40f7444af96b0d8ddf3af9b558193c2475d Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 2 Jul 2022 15:18:50 +1000
Subject: [PATCH 061/959] RP2040 emulated EEPROM. (#17519)

---
 builddefs/common_features.mk                  |  10 +-
 builddefs/mcu_selection.mk                    |   2 +-
 docs/eeprom_driver.md                         |  17 +-
 docs/platformdev_rp2040.md                    |  22 +-
 .../boards/common/ld/RP2040_FLASH_TIMECRIT.ld | 117 ++++++++++
 .../ld/RP2040_rules_data_with_timecrit.ld     |  46 ++++
 .../wear_leveling_rp2040_flash.c              | 221 ++++++++++++++++++
 .../wear_leveling_rp2040_flash_config.h       |  32 +++
 platforms/chibios/platform.mk                 |   3 +
 platforms/chibios/vendors/RP/RP2040.mk        |   2 +
 platforms/chibios/vendors/RP/pico_sdk_shims.c |   4 +
 .../chibios/vendors/RP/stage2_bootloaders.c   |  12 +-
 quantum/wear_leveling/wear_leveling.c         |   4 +-
 13 files changed, 470 insertions(+), 22 deletions(-)
 create mode 100644 platforms/chibios/boards/common/ld/RP2040_FLASH_TIMECRIT.ld
 create mode 100644 platforms/chibios/boards/common/ld/RP2040_rules_data_with_timecrit.ld
 create mode 100644 platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash.c
 create mode 100644 platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash_config.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 2edc1bdef0..c11e5688e3 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -220,6 +220,11 @@ else
         # True EEPROM on STM32L0xx, L1xx
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
         SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
+      else ifneq ($(filter $(MCU_SERIES),RP2040),)
+		# Wear-leveling EEPROM implementation, backed by RP2040 flash
+		OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+		SRC += eeprom_driver.c eeprom_wear_leveling.c
+        WEAR_LEVELING_DRIVER = rp2040_flash
       else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
         # Teensy EEPROM implementations
         OPT_DEFS += -DEEPROM_TEENSY
@@ -241,7 +246,7 @@ else
   endif
 endif
 
-VALID_WEAR_LEVELING_DRIVER_TYPES := custom embedded_flash spi_flash legacy
+VALID_WEAR_LEVELING_DRIVER_TYPES := custom embedded_flash spi_flash rp2040_flash legacy
 WEAR_LEVELING_DRIVER ?= none
 ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
   ifeq ($(filter $(WEAR_LEVELING_DRIVER),$(VALID_WEAR_LEVELING_DRIVER_TYPES)),)
@@ -262,6 +267,9 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
       FLASH_DRIVER := spi
       SRC += wear_leveling_flash_spi.c
       POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_flash_spi_config.h
+    else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), rp2040_flash)
+      SRC += wear_leveling_rp2040_flash.c
+      POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_rp2040_flash_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), legacy)
       COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
       SRC += flash_stm32.c wear_leveling_legacy.c
diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index d676e0c06a..135f663c14 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -135,7 +135,7 @@ ifneq ($(findstring RP2040, $(MCU)),)
   # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
   #   or <keyboard_dir>/ld/
   STARTUPLD_CONTRIB = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
-  MCU_LDSCRIPT ?= RP2040_FLASH
+  MCU_LDSCRIPT ?= RP2040_FLASH_TIMECRIT
   LDFLAGS += -L $(STARTUPLD_CONTRIB)
 
   # Startup code to use
diff --git a/docs/eeprom_driver.md b/docs/eeprom_driver.md
index de2eaf2e5b..50d8bcb7b3 100644
--- a/docs/eeprom_driver.md
+++ b/docs/eeprom_driver.md
@@ -92,6 +92,7 @@ Driver                                  | Description
 ----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 `WEAR_LEVELING_DRIVER = embedded_flash` | This driver is used for emulating EEPROM by writing to embedded flash on the MCU.
 `WEAR_LEVELING_DRIVER = spi_flash`      | This driver is used to address external SPI NOR Flash peripherals.
+`WEAR_LEVELING_DRIVER = rp2040_flash`   | This driver is used to write to the same storage the RP2040 executes code from.
 `WEAR_LEVELING_DRIVER = legacy`         | This driver is the "legacy" emulated EEPROM provided in historical revisions of QMK. Currently used for STM32F0xx and STM32F4x1, but slated for deprecation and removal once `embedded_flash` support for those MCU families is complete.
 
 !> All wear-leveling drivers require an amount of RAM equivalent to the selected logical EEPROM size. Increasing the size to 32kB of EEPROM requires 32kB of RAM, which a significant number of MCUs simply do not have.
@@ -128,6 +129,20 @@ Configurable options in your keyboard's `config.h`:
 
 !> There is currently a limit of 64kB for the EEPROM subsystem within QMK, so using a larger flash is not going to be beneficial as the logical size cannot be increased beyond 65536. The backing size may be increased to a larger value, but erase timing may suffer as a result.
 
+## Wear-leveling RP2040 Driver Configuration :id=wear_leveling-rp2040-driver-configuration
+
+This driver performs writes to the same underlying storage that the RP2040 executes its code.
+
+Configurable options in your keyboard's `config.h`:
+
+`config.h` override                       | Default                    | Description
+------------------------------------------|----------------------------|--------------------------------------------------------------------------------------------------------------------------------
+`#define WEAR_LEVELING_RP2040_FLASH_SIZE` | `PICO_FLASH_SIZE_BYTES`    | Number of bytes of flash on the board.
+`#define WEAR_LEVELING_RP2040_FLASH_BASE` | `(flash_size-sector_size)` | The byte-wise location that the backing storage should be located.
+`#define WEAR_LEVELING_LOGICAL_SIZE`      | `4096`                     | Number of bytes "exposed" to the rest of QMK and denotes the size of the usable EEPROM.
+`#define WEAR_LEVELING_BACKING_SIZE`      | `8192`                     | Number of bytes used by the wear-leveling algorithm for its underlying storage, and needs to be a multiple of the logical size as well as the sector size.
+`#define BACKING_STORE_WRITE_SIZE`        | `2`                        | The write width used whenever a write is performed on the external flash peripheral.
+
 ## Wear-leveling Legacy EEPROM Emulation Driver Configuration :id=wear_leveling-legacy-driver-configuration
 
 This driver performs writes to the embedded flash storage embedded in the MCU much like the normal Embedded Flash Driver, and is only for use with STM32F0xx and STM32F4x1 devices. This flash implementation is still currently provided as the EFL driver is currently non-functional for the previously mentioned families.
@@ -142,4 +157,4 @@ STM32F072 | `1024` bytes    | `2048` bytes
 STM32F401 | `1024` bytes    | `16384` bytes
 STM32F411 | `1024` bytes    | `16384` bytes
 
-Under normal circumstances configuration of this driver requires intimate knowledge of the MCU's flash structure -- reconfiguration is at your own risk and will require referring to the code.
\ No newline at end of file
+Under normal circumstances configuration of this driver requires intimate knowledge of the MCU's flash structure -- reconfiguration is at your own risk and will require referring to the code.
diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md
index 9426efa29a..d690ebebf8 100644
--- a/docs/platformdev_rp2040.md
+++ b/docs/platformdev_rp2040.md
@@ -2,17 +2,17 @@
 
 The following table shows the current driver status for peripherals on RP2040 MCUs:
 
-| System                               | Support                                        |
-| ------------------------------------ | ---------------------------------------------- |
-| [ADC driver](adc_driver.md)          | Support planned (no ETA)                       |
-| [Audio](audio_driver.md)             | Support planned (no ETA)                       |
-| [I2C driver](i2c_driver.md)          | :heavy_check_mark:                             |
-| [SPI driver](spi_driver.md)          | :heavy_check_mark:                             |
-| [WS2812 driver](ws2812_driver.md)    | :heavy_check_mark: using `PIO` driver          |
-| [External EEPROMs](eeprom_driver.md) | :heavy_check_mark: using `I2C` or `SPI` driver |
-| [EEPROM emulation](eeprom_driver.md) | Support planned (no ETA)                       |
-| [serial driver](serial_driver.md)    | :heavy_check_mark: using `SIO` or `PIO` driver |
-| [UART driver](uart_driver.md)        | Support planned (no ETA)                       |
+| System                                                           | Support                                        |
+| ---------------------------------------------------------------- | ---------------------------------------------- |
+| [ADC driver](adc_driver.md)                                      | Support planned (no ETA)                       |
+| [Audio](audio_driver.md)                                         | Support planned (no ETA)                       |
+| [I2C driver](i2c_driver.md)                                      | :heavy_check_mark:                             |
+| [SPI driver](spi_driver.md)                                      | :heavy_check_mark:                             |
+| [WS2812 driver](ws2812_driver.md)                                | :heavy_check_mark: using `PIO` driver          |
+| [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)                       |
 
 ## GPIO
 
diff --git a/platforms/chibios/boards/common/ld/RP2040_FLASH_TIMECRIT.ld b/platforms/chibios/boards/common/ld/RP2040_FLASH_TIMECRIT.ld
new file mode 100644
index 0000000000..66ed4ce086
--- /dev/null
+++ b/platforms/chibios/boards/common/ld/RP2040_FLASH_TIMECRIT.ld
@@ -0,0 +1,117 @@
+/*
+    ChibiOS - Copyright (C) 2006..2021 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.
+*/
+
+/*
+ * RP2040 memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x00000000, len = 16k   /* ROM                  */
+    flash1 (rx) : org = 0x10000000, len = DEFINED(FLASH_LEN) ? FLASH_LEN : 2048k /* XIP */
+    flash2 (rx) : org = 0x00000000, len = 0
+    flash3 (rx) : org = 0x00000000, len = 0
+    flash4 (rx) : org = 0x00000000, len = 0
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 256k  /* SRAM0 striped        */
+    ram1   (wx) : org = 0x00000000, len = 256k  /* SRAM0 non striped    */
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x20040000, len = 4k    /* SRAM4                */
+    ram5   (wx) : org = 0x20041000, len = 4k    /* SRAM5                */
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x20041f00, len = 256   /* SRAM5 boot           */
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash1);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash1);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash1);
+REGION_ALIAS("XTORS_FLASH_LMA", flash1);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash1);
+REGION_ALIAS("TEXT_FLASH_LMA", flash1);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash1);
+REGION_ALIAS("RODATA_FLASH_LMA", flash1);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash1);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash1);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash1);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram4);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram4);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("C1_MAIN_STACK_RAM", ram5);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("C1_PROCESS_STACK_RAM", ram5);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash1);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+SECTIONS
+{
+   .flash_begin : {
+      __flash_binary_start = .;
+   } > flash1
+
+   .boot2 : {
+      __boot2_start__ = .;
+      KEEP (*(.boot2))
+      __boot2_end__ = .;
+   } > flash1
+}
+
+/* Generic rules inclusion.*/
+INCLUDE rules_stacks.ld
+INCLUDE rules_stacks_c1.ld
+INCLUDE RP2040_rules_code_with_boot2.ld
+INCLUDE RP2040_rules_data_with_timecrit.ld
+INCLUDE rules_memory.ld
+
+SECTIONS
+{
+   .flash_end : {
+      __flash_binary_end = .;
+   } > flash1
+}
diff --git a/platforms/chibios/boards/common/ld/RP2040_rules_data_with_timecrit.ld b/platforms/chibios/boards/common/ld/RP2040_rules_data_with_timecrit.ld
new file mode 100644
index 0000000000..a9a47be983
--- /dev/null
+++ b/platforms/chibios/boards/common/ld/RP2040_rules_data_with_timecrit.ld
@@ -0,0 +1,46 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+SECTIONS
+{
+    .data : ALIGN(4)
+    {
+        PROVIDE(_textdata = LOADADDR(.data));
+        PROVIDE(_data = .);
+        __textdata_base__ = LOADADDR(.data);
+        __data_base__ = .;
+        *(vtable)
+        *(.time_critical*)
+        . = ALIGN(4);
+        *(.data)
+        *(.data.*)
+        *(.ramtext)
+        . = ALIGN(4);
+        PROVIDE(_edata = .);
+        __data_end__ = .;
+    } > DATA_RAM AT > DATA_RAM_LMA
+
+    .bss (NOLOAD) : ALIGN(4)
+    {
+        __bss_base__ = .;
+        *(.bss)
+        *(.bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+        PROVIDE(end = .);
+    } > BSS_RAM
+}
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash.c b/platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash.c
new file mode 100644
index 0000000000..640628e1e9
--- /dev/null
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash.c
@@ -0,0 +1,221 @@
+/**
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ * Copyright (c) 2022 Nick Brassel (@tzarc)
+ * Copyright (c) 2022 Stefan Kerkmann (@KarlK90)
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "pico/bootrom.h"
+#include "hardware/flash.h"
+#include "hardware/sync.h"
+#include "hardware/structs/ssi.h"
+#include "hardware/structs/ioqspi.h"
+
+#include <stdbool.h>
+#include "timer.h"
+#include "wear_leveling.h"
+#include "wear_leveling_internal.h"
+
+#ifndef WEAR_LEVELING_RP2040_FLASH_BULK_COUNT
+#    define WEAR_LEVELING_RP2040_FLASH_BULK_COUNT 64
+#endif // WEAR_LEVELING_RP2040_FLASH_BULK_COUNT
+
+#define FLASHCMD_PAGE_PROGRAM 0x02
+#define FLASHCMD_READ_STATUS 0x05
+#define FLASHCMD_WRITE_ENABLE 0x06
+
+extern uint8_t  BOOT2_ROM[256];
+static uint32_t BOOT2_ROM_RAM[64];
+
+static ssi_hw_t *const ssi = (ssi_hw_t *)XIP_SSI_BASE;
+
+// Sanity check
+check_hw_layout(ssi_hw_t, ssienr, SSI_SSIENR_OFFSET);
+check_hw_layout(ssi_hw_t, spi_ctrlr0, SSI_SPI_CTRLR0_OFFSET);
+
+static void __no_inline_not_in_flash_func(flash_enable_xip_via_boot2)(void) {
+    ((void (*)(void))BOOT2_ROM_RAM + 1)();
+}
+
+// Bitbanging the chip select using IO overrides, in case RAM-resident IRQs
+// are still running, and the FIFO bottoms out. (the bootrom does the same)
+static void __no_inline_not_in_flash_func(flash_cs_force)(bool high) {
+    uint32_t field_val = high ? IO_QSPI_GPIO_QSPI_SS_CTRL_OUTOVER_VALUE_HIGH : IO_QSPI_GPIO_QSPI_SS_CTRL_OUTOVER_VALUE_LOW;
+    hw_write_masked(&ioqspi_hw->io[1].ctrl, field_val << IO_QSPI_GPIO_QSPI_SS_CTRL_OUTOVER_LSB, IO_QSPI_GPIO_QSPI_SS_CTRL_OUTOVER_BITS);
+}
+
+// Also allow any unbounded loops to check whether the above abort condition
+// was asserted, and terminate early
+static int __no_inline_not_in_flash_func(flash_was_aborted)(void) {
+    return *(io_rw_32 *)(IO_QSPI_BASE + IO_QSPI_GPIO_QSPI_SD1_CTRL_OFFSET) & IO_QSPI_GPIO_QSPI_SD1_CTRL_INOVER_BITS;
+}
+
+// Put bytes from one buffer, and get bytes into another buffer.
+// These can be the same buffer.
+// If tx is NULL then send zeroes.
+// If rx is NULL then all read data will be dropped.
+//
+// If rx_skip is nonzero, this many bytes will first be consumed from the FIFO,
+// before reading a further count bytes into *rx.
+// E.g. if you have written a command+address just before calling this function.
+static void __no_inline_not_in_flash_func(flash_put_get)(const uint8_t *tx, uint8_t *rx, size_t count, size_t rx_skip) {
+    // Make sure there is never more data in flight than the depth of the RX
+    // FIFO. Otherwise, when we are interrupted for long periods, hardware
+    // will overflow the RX FIFO.
+    const uint max_in_flight = 16 - 2; // account for data internal to SSI
+    size_t     tx_count      = count;
+    size_t     rx_count      = count;
+    while (tx_count || rx_skip || rx_count) {
+        // NB order of reads, for pessimism rather than optimism
+        uint32_t tx_level      = ssi_hw->txflr;
+        uint32_t rx_level      = ssi_hw->rxflr;
+        bool     did_something = false; // Expect this to be folded into control flow, not register
+        if (tx_count && tx_level + rx_level < max_in_flight) {
+            ssi->dr0 = (uint32_t)(tx ? *tx++ : 0);
+            --tx_count;
+            did_something = true;
+        }
+        if (rx_level) {
+            uint8_t rxbyte = ssi->dr0;
+            did_something  = true;
+            if (rx_skip) {
+                --rx_skip;
+            } else {
+                if (rx) *rx++ = rxbyte;
+                --rx_count;
+            }
+        }
+        // APB load costs 4 cycles, so only do it on idle loops (our budget is
+        // 48 cyc/byte)
+        if (!did_something && __builtin_expect(flash_was_aborted(), 0)) break;
+    }
+    flash_cs_force(1);
+}
+
+// Convenience wrapper for above
+// (And it's hard for the debug host to get the tight timing between
+// cmd DR0 write and the remaining data)
+static void __no_inline_not_in_flash_func(_flash_do_cmd)(uint8_t cmd, const uint8_t *tx, uint8_t *rx, size_t count) {
+    flash_cs_force(0);
+    ssi->dr0 = cmd;
+    flash_put_get(tx, rx, count, 1);
+}
+
+// Timing of this one is critical, so do not expose the symbol to debugger etc
+static void __no_inline_not_in_flash_func(flash_put_cmd_addr)(uint8_t cmd, uint32_t addr) {
+    flash_cs_force(0);
+    addr |= cmd << 24;
+    for (int i = 0; i < 4; ++i) {
+        ssi->dr0 = addr >> 24;
+        addr <<= 8;
+    }
+}
+
+// Poll the flash status register until the busy bit (LSB) clears
+static void __no_inline_not_in_flash_func(flash_wait_ready)(void) {
+    uint8_t stat;
+    do {
+        _flash_do_cmd(FLASHCMD_READ_STATUS, NULL, &stat, 1);
+    } while (stat & 0x1 && !flash_was_aborted());
+}
+
+// Set the WEL bit (needed before any program/erase operation)
+static void __no_inline_not_in_flash_func(flash_enable_write)(void) {
+    _flash_do_cmd(FLASHCMD_WRITE_ENABLE, NULL, NULL, 0);
+}
+
+static void __no_inline_not_in_flash_func(pico_program_bulk)(uint32_t flash_address, backing_store_int_t *values, size_t item_count) {
+    rom_connect_internal_flash_fn connect_internal_flash = (rom_connect_internal_flash_fn)rom_func_lookup_inline(ROM_FUNC_CONNECT_INTERNAL_FLASH);
+    rom_flash_exit_xip_fn         flash_exit_xip         = (rom_flash_exit_xip_fn)rom_func_lookup_inline(ROM_FUNC_FLASH_EXIT_XIP);
+    rom_flash_flush_cache_fn      flash_flush_cache      = (rom_flash_flush_cache_fn)rom_func_lookup_inline(ROM_FUNC_FLASH_FLUSH_CACHE);
+    assert(connect_internal_flash && flash_exit_xip && flash_flush_cache);
+
+    static backing_store_int_t bulk_write_buffer[WEAR_LEVELING_RP2040_FLASH_BULK_COUNT];
+
+    while (item_count) {
+        size_t batch_size = MIN(item_count, WEAR_LEVELING_RP2040_FLASH_BULK_COUNT);
+        for (size_t i = 0; i < batch_size; i++, values++, item_count--) {
+            bulk_write_buffer[i] = ~(*values);
+        }
+        __compiler_memory_barrier();
+
+        connect_internal_flash();
+        flash_exit_xip();
+        flash_enable_write();
+
+        flash_put_cmd_addr(FLASHCMD_PAGE_PROGRAM, flash_address);
+        flash_put_get((uint8_t *)bulk_write_buffer, NULL, batch_size * sizeof(backing_store_int_t), 4);
+        flash_wait_ready();
+        flash_address += batch_size * sizeof(backing_store_int_t);
+
+        flash_flush_cache();
+        flash_enable_xip_via_boot2();
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// QMK Wear-Leveling Backing Store implementation
+
+static int interrupts;
+
+bool backing_store_init(void) {
+    bs_dprintf("Init\n");
+    memcpy(BOOT2_ROM_RAM, BOOT2_ROM, sizeof(BOOT2_ROM));
+    __compiler_memory_barrier();
+    return true;
+}
+
+bool backing_store_unlock(void) {
+    bs_dprintf("Unlock\n");
+    return true;
+}
+
+bool backing_store_erase(void) {
+#ifdef WEAR_LEVELING_DEBUG_OUTPUT
+    uint32_t start = timer_read32();
+#endif
+
+    // Ensure the backing size can be cleanly subtracted from the flash size without alignment issues.
+    _Static_assert((WEAR_LEVELING_BACKING_SIZE) % (FLASH_SECTOR_SIZE) == 0, "Backing size must be a multiple of FLASH_SECTOR_SIZE");
+
+    interrupts = save_and_disable_interrupts();
+    flash_range_erase((WEAR_LEVELING_RP2040_FLASH_BASE), (WEAR_LEVELING_BACKING_SIZE));
+    restore_interrupts(interrupts);
+
+    bs_dprintf("Backing store erase took %ldms to complete\n", ((long)(timer_read32() - start)));
+    return true;
+}
+
+bool backing_store_write(uint32_t address, backing_store_int_t value) {
+    return backing_store_write_bulk(address, &value, 1);
+}
+
+bool backing_store_write_bulk(uint32_t address, backing_store_int_t *values, size_t item_count) {
+    uint32_t offset = (WEAR_LEVELING_RP2040_FLASH_BASE) + address;
+    bs_dprintf("Write ");
+    wl_dump(offset, values, sizeof(backing_store_int_t) * item_count);
+    interrupts = save_and_disable_interrupts();
+    pico_program_bulk(offset, values, item_count);
+    restore_interrupts(interrupts);
+    return true;
+}
+
+bool backing_store_lock(void) {
+    return true;
+}
+
+bool backing_store_read(uint32_t address, backing_store_int_t *value) {
+    return backing_store_read_bulk(address, value, 1);
+}
+
+bool backing_store_read_bulk(uint32_t address, backing_store_int_t *values, size_t item_count) {
+    uint32_t             offset = (WEAR_LEVELING_RP2040_FLASH_BASE) + address;
+    backing_store_int_t *loc    = (backing_store_int_t *)((XIP_BASE) + offset);
+    for (size_t i = 0; i < item_count; ++i) {
+        values[i] = ~loc[i];
+    }
+    bs_dprintf("Read  ");
+    wl_dump(offset, values, item_count * sizeof(backing_store_int_t));
+    return true;
+}
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash_config.h b/platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash_config.h
new file mode 100644
index 0000000000..93a9aa0372
--- /dev/null
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash_config.h
@@ -0,0 +1,32 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifndef __ASSEMBLER__
+#    include "hardware/flash.h"
+#endif
+
+// 2-byte writes
+#ifndef BACKING_STORE_WRITE_SIZE
+#    define BACKING_STORE_WRITE_SIZE 2
+#endif
+
+// 64kB backing space allocated
+#ifndef WEAR_LEVELING_BACKING_SIZE
+#    define WEAR_LEVELING_BACKING_SIZE 8192
+#endif // WEAR_LEVELING_BACKING_SIZE
+
+// 32kB logical EEPROM
+#ifndef WEAR_LEVELING_LOGICAL_SIZE
+#    define WEAR_LEVELING_LOGICAL_SIZE 4096
+#endif // WEAR_LEVELING_LOGICAL_SIZE
+
+// Define how much flash space we have (defaults to lib/pico-sdk/src/boards/include/boards/***)
+#ifndef WEAR_LEVELING_RP2040_FLASH_SIZE
+#    define WEAR_LEVELING_RP2040_FLASH_SIZE (PICO_FLASH_SIZE_BYTES)
+#endif
+
+// Define the location of emulated EEPROM
+#ifndef WEAR_LEVELING_RP2040_FLASH_BASE
+#    define WEAR_LEVELING_RP2040_FLASH_BASE ((WEAR_LEVELING_RP2040_FLASH_SIZE) - (WEAR_LEVELING_BACKING_SIZE))
+#endif
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index 32b8c5a946..63cc1a4b33 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -351,8 +351,11 @@ SHARED_CFLAGS = -fomit-frame-pointer \
                 -fno-common \
                 -fshort-wchar
 
+LDSCRIPT_PATH := $(shell dirname "$(LDSCRIPT)")
+
 # Shared Linker flags for all toolchains
 SHARED_LDFLAGS = -T $(LDSCRIPT) \
+                 -L $(LDSCRIPT_PATH) \
                  -Wl,--gc-sections \
                  -nostartfiles
 
diff --git a/platforms/chibios/vendors/RP/RP2040.mk b/platforms/chibios/vendors/RP/RP2040.mk
index 1aa925cb15..de426c9c40 100644
--- a/platforms/chibios/vendors/RP/RP2040.mk
+++ b/platforms/chibios/vendors/RP/RP2040.mk
@@ -24,6 +24,7 @@ PICOSDKROOT   := $(TOP_DIR)/lib/pico-sdk
 PICOSDKSRC     = $(PICOSDKROOT)/src/rp2_common/hardware_clocks/clocks.c \
                  $(PICOSDKROOT)/src/rp2_common/hardware_pll/pll.c \
                  $(PICOSDKROOT)/src/rp2_common/hardware_pio/pio.c \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_flash/flash.c \
                  $(PICOSDKROOT)/src/rp2_common/hardware_gpio/gpio.c \
                  $(PICOSDKROOT)/src/rp2_common/hardware_claim/claim.c \
                  $(PICOSDKROOT)/src/rp2_common/hardware_watchdog/watchdog.c \
@@ -36,6 +37,7 @@ PICOSDKINC     = $(CHIBIOS)//os/various/pico_bindings/dumb/include \
                  $(PICOSDKROOT)/src/rp2_common/hardware_base/include \
                  $(PICOSDKROOT)/src/rp2_common/hardware_clocks/include \
                  $(PICOSDKROOT)/src/rp2_common/hardware_claim/include \
+                 $(PICOSDKROOT)/src/rp2_common/hardware_flash/include \
                  $(PICOSDKROOT)/src/rp2_common/hardware_gpio/include \
                  $(PICOSDKROOT)/src/rp2_common/hardware_irq/include \
                  $(PICOSDKROOT)/src/rp2_common/hardware_pll/include \
diff --git a/platforms/chibios/vendors/RP/pico_sdk_shims.c b/platforms/chibios/vendors/RP/pico_sdk_shims.c
index f6e3943928..239155c086 100644
--- a/platforms/chibios/vendors/RP/pico_sdk_shims.c
+++ b/platforms/chibios/vendors/RP/pico_sdk_shims.c
@@ -7,3 +7,7 @@
 void panic(const char *fmt, ...) {
     chSysHalt(fmt);
 }
+
+void hard_assertion_failure(void) {
+    panic("hard assert");
+}
diff --git a/platforms/chibios/vendors/RP/stage2_bootloaders.c b/platforms/chibios/vendors/RP/stage2_bootloaders.c
index af679a0dc7..e65b0a5802 100644
--- a/platforms/chibios/vendors/RP/stage2_bootloaders.c
+++ b/platforms/chibios/vendors/RP/stage2_bootloaders.c
@@ -13,7 +13,7 @@
 
 #if defined(RP2040_FLASH_AT25SF128A)
 
-uint8_t BOOTLOADER_SECTION BOOT2_AT25SF128A[256] = {
+uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
   0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
   0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
   0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
@@ -40,7 +40,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_AT25SF128A[256] = {
 
 #elif defined(RP2040_FLASH_GD25Q64CS)
 
-uint8_t BOOTLOADER_SECTION BOOT2_GD25Q64CS[256] = {
+uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
   0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
   0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
   0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
@@ -67,7 +67,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_GD25Q64CS[256] = {
 
 #elif defined(RP2040_FLASH_W25X10CL)
 
-uint8_t BOOTLOADER_SECTION BOOT2_W25X10CL[256] = {
+uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
   0x00, 0xb5, 0x14, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
   0x12, 0x49, 0x19, 0x60, 0x00, 0x21, 0x59, 0x60, 0x11, 0x49, 0x12, 0x48,
   0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0xbb, 0x21, 0x19, 0x66, 0x02, 0x21,
@@ -94,7 +94,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_W25X10CL[256] = {
 
 #elif defined(RP2040_FLASH_IS25LP080)
 
-uint8_t BOOTLOADER_SECTION BOOT2_IS25LP080[256] = {
+uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
   0x00, 0xb5, 0x2b, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
   0x29, 0x49, 0x19, 0x60, 0x01, 0x21, 0x99, 0x60, 0x28, 0x48, 0x00, 0xf0,
   0x42, 0xf8, 0x28, 0x4a, 0x90, 0x42, 0x12, 0xd0, 0x06, 0x21, 0x19, 0x66,
@@ -121,7 +121,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_IS25LP080[256] = {
 
 #elif defined(RP2040_FLASH_GENERIC_03H)
 
-uint8_t BOOTLOADER_SECTION BOOT2_GENERIC_03H[256] = {
+uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
   0x00, 0xb5, 0x0c, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
   0x0a, 0x49, 0x19, 0x60, 0x0a, 0x49, 0x0b, 0x48, 0x01, 0x60, 0x00, 0x21,
   0x59, 0x60, 0x01, 0x21, 0x99, 0x60, 0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0,
@@ -148,7 +148,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_GENERIC_03H[256] = {
 
 #else
 
-uint8_t BOOTLOADER_SECTION BOOT2_W25Q080[256] = {
+uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
   0x00, 0xb5, 0x32, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
   0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2e, 0x4b,
   0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
diff --git a/quantum/wear_leveling/wear_leveling.c b/quantum/wear_leveling/wear_leveling.c
index 0a519639ea..429df45df5 100644
--- a/quantum/wear_leveling/wear_leveling.c
+++ b/quantum/wear_leveling/wear_leveling.c
@@ -421,7 +421,7 @@ static wear_leveling_status_t wear_leveling_write_raw(uint32_t address, const vo
 #if BACKING_STORE_WRITE_SIZE == 2
         // Small-write optimizations - uint16_t, 0 or 1, address is even, address <16384:
         if (remaining >= 2 && address % 2 == 0 && address < 16384) {
-            const uint16_t v = *(const uint16_t *)p;
+            const uint16_t v = ((uint16_t)p[1]) << 8 | p[0]; // don't just dereference a uint16_t here -- if unaligned it generates faults on some MCUs
             if (v == 0 || v == 1) {
                 const write_log_entry_t log = LOG_ENTRY_MAKE_WORD_01(address, v);
                 status                      = wear_leveling_append_raw(log.raw16[0]);
@@ -765,4 +765,4 @@ __attribute__((weak)) bool backing_store_write_bulk(uint32_t address, backing_st
         }
     }
     return true;
-}
\ No newline at end of file
+}

From 9dc7b9d40cfa199875cdc9e2e05b15d3f463b415 Mon Sep 17 00:00:00 2001
From: "FREEWING.JP" <freewing.jp@gmail.com>
Date: Sat, 2 Jul 2022 20:48:26 +0900
Subject: [PATCH 062/959] Added Wait time to sending each Keys for Dynamic
 Macros function (#16800)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 docs/feature_dynamic_macros.md                  | 1 +
 docs/ja/feature_dynamic_macros.md               | 1 +
 quantum/process_keycode/process_dynamic_macro.c | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/docs/feature_dynamic_macros.md b/docs/feature_dynamic_macros.md
index 01f2a0ca40..0660e0c065 100644
--- a/docs/feature_dynamic_macros.md
+++ b/docs/feature_dynamic_macros.md
@@ -35,6 +35,7 @@ There are a number of options added that should allow some additional degree of
 |`DYNAMIC_MACRO_SIZE`        |128             |Sets the amount of memory that Dynamic Macros can use. This is a limited resource, dependent on the controller.  |
 |`DYNAMIC_MACRO_USER_CALL`   |*Not defined*   |Defining this falls back to using the user `keymap.c` file to trigger the macro behavior.                        |
 |`DYNAMIC_MACRO_NO_NESTING`  |*Not Defined*   |Defining this disables the ability to call a macro from another macro (nested macros).                           | 
+|`DYNAMIC_MACRO_DELAY`        |*Not Defined*   |Sets the waiting time (ms unit) when sending each key.                                                           |
 
 
 If the LEDs start blinking during the recording with each keypress, it means there is no more space for the macro in the macro buffer. To fit the macro in, either make the other macro shorter (they share the same buffer) or increase the buffer size by adding the `DYNAMIC_MACRO_SIZE` define in your `config.h` (default value: 128; please read the comments for it in the header).
diff --git a/docs/ja/feature_dynamic_macros.md b/docs/ja/feature_dynamic_macros.md
index 951b903127..3cff788007 100644
--- a/docs/ja/feature_dynamic_macros.md
+++ b/docs/ja/feature_dynamic_macros.md
@@ -40,6 +40,7 @@ QMK はその場で作られた一時的なマクロをサポートします。
 | `DYNAMIC_MACRO_SIZE` | 128 | 動的マクロが使用できるメモリ量を設定します。これは限られたリソースであり、コントローラに依存します。 |
 | `DYNAMIC_MACRO_USER_CALL` | *定義なし* | これを定義すると、ユーザの `keymap.c` ファイルを使ってマクロが起動されます。 |
 | `DYNAMIC_MACRO_NO_NESTING` | *定義なし* | これを定義すると、別のマクロからマクロを呼び出す(入れ子になったマクロ)機能を無効にします。 |
+| `DYNAMIC_MACRO_DELAY` | *定義なし* | 各キーを送信する時の待ち時間（ms単位）を設定します。 |
 
 
 記録中にキーを押すたびに LED が点滅し始めた場合は、マクロバッファにマクロを入れるスペースがもう無いことを意味します。マクロを入れるには、他のマクロ(それらは同じバッファを共有します)を短くするか、`config.h` に `DYNAMIC_MACRO_SIZE` 定義を追加することでバッファを増やします(デフォルト値: 128; ヘッダ内のコメントを読んでください)。
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index a1ada2d5a2..a7555fdd40 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -86,6 +86,9 @@ void dynamic_macro_play(keyrecord_t *macro_buffer, keyrecord_t *macro_end, int8_
     while (macro_buffer != macro_end) {
         process_record(macro_buffer);
         macro_buffer += direction;
+#ifdef DYNAMIC_MACRO_DELAY
+        wait_ms(DYNAMIC_MACRO_DELAY);
+#endif
     }
 
     clear_keyboard();

From 59e28b8958db4940f026c4bbd81dee7b9b5e49b0 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 2 Jul 2022 12:50:09 +0100
Subject: [PATCH 063/959] Add cli command to import keyboard|keymap|kbfirmware
 (#16668)

---
 docs/cli_commands.md                    |  68 +++++++++++
 lib/python/qmk/cli/__init__.py          |   3 +
 lib/python/qmk/cli/import/__init__.py   |   0
 lib/python/qmk/cli/import/kbfirmware.py |  25 ++++
 lib/python/qmk/cli/import/keyboard.py   |  23 ++++
 lib/python/qmk/cli/import/keymap.py     |  23 ++++
 lib/python/qmk/importers.py             | 148 ++++++++++++++++++++++++
 7 files changed, 290 insertions(+)
 create mode 100644 lib/python/qmk/cli/import/__init__.py
 create mode 100644 lib/python/qmk/cli/import/kbfirmware.py
 create mode 100644 lib/python/qmk/cli/import/keyboard.py
 create mode 100644 lib/python/qmk/cli/import/keymap.py
 create mode 100644 lib/python/qmk/importers.py

diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index a380d3eb2f..56767d962b 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -352,6 +352,73 @@ $ qmk via2json -kb ai03/polaris -o polaris_keymap.json polaris_via_backup.json
 Ψ Wrote keymap to /home/you/qmk_firmware/polaris_keymap.json
 ```
 
+## `qmk import-keyboard`
+
+This command imports a data-driven `info.json` keyboard into the repo.
+
+**Usage**:
+
+```
+usage: qmk import-keyboard [-h] filename
+```
+
+**Example:**
+
+```
+$ qmk import-keyboard ~/Downloads/forever60.json
+Ψ Importing forever60.json.
+
+Ψ Imported a new keyboard named forever60.
+Ψ To start working on things, `cd` into keyboards/forever60,
+Ψ or open the directory in your preferred text editor.
+Ψ And build with qmk compile -kb forever60 -km default.
+```
+
+## `qmk import-keymap`
+
+This command imports a data-driven `keymap.json` keymap into the repo.
+
+**Usage**:
+
+```
+usage: qmk import-keymap [-h] filename
+```
+
+**Example:**
+
+```
+qmk import-keymap ~/Downloads/asdf2.json
+Ψ Importing asdf2.json.
+
+Ψ Imported a new keymap named asdf2.
+Ψ To start working on things, `cd` into keyboards/takashicompany/dogtag/keymaps/asdf2,
+Ψ or open the directory in your preferred text editor.
+Ψ And build with qmk compile -kb takashicompany/dogtag -km asdf2.
+```
+
+## `qmk import-kbfirmware`
+
+This command creates a new keyboard based on a [Keyboard Firmware Builder](https://kbfirmware.com/) export.
+
+**Usage**:
+
+```
+usage: qmk import-kbfirmware [-h] filename
+```
+
+**Example:**
+
+```
+$ qmk import-kbfirmware ~/Downloads/gh62.json
+Ψ Importing gh62.json.
+
+⚠ Support here is basic - Consider using 'qmk new-keyboard' instead
+Ψ Imported a new keyboard named gh62.
+Ψ To start working on things, `cd` into keyboards/gh62,
+Ψ or open the directory in your preferred text editor.
+Ψ And build with qmk compile -kb gh62 -km default.
+```
+
 ---
 
 # Developer Commands
@@ -527,3 +594,4 @@ This command converts a TTF font to an intermediate format for editing, before c
 ## `qmk painter-convert-font-image`
 
 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.
+
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 02c6d1cbf4..8a507677ef 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -59,6 +59,9 @@ subcommands = [
     'qmk.cli.generate.rules_mk',
     'qmk.cli.generate.version_h',
     'qmk.cli.hello',
+    'qmk.cli.import.kbfirmware',
+    'qmk.cli.import.keyboard',
+    'qmk.cli.import.keymap',
     'qmk.cli.info',
     'qmk.cli.json2c',
     'qmk.cli.lint',
diff --git a/lib/python/qmk/cli/import/__init__.py b/lib/python/qmk/cli/import/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/python/qmk/cli/import/kbfirmware.py b/lib/python/qmk/cli/import/kbfirmware.py
new file mode 100644
index 0000000000..9c03737378
--- /dev/null
+++ b/lib/python/qmk/cli/import/kbfirmware.py
@@ -0,0 +1,25 @@
+from milc import cli
+
+from qmk.importers import import_kbfirmware as _import_kbfirmware
+from qmk.path import FileType
+from qmk.json_schema import json_load
+
+
+@cli.argument('filename', type=FileType('r'), nargs='+', arg_only=True, help='file')
+@cli.subcommand('Import kbfirmware json export')
+def import_kbfirmware(cli):
+    filename = cli.args.filename[0]
+
+    data = json_load(filename)
+
+    cli.log.info(f'{{style_bright}}Importing {filename.name}.{{style_normal}}')
+    cli.echo('')
+
+    cli.log.warn("Support here is basic - Consider using 'qmk new-keyboard' instead")
+
+    kb_name = _import_kbfirmware(data)
+
+    cli.log.info(f'{{fg_green}}Imported a new keyboard named {{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}}.")
diff --git a/lib/python/qmk/cli/import/keyboard.py b/lib/python/qmk/cli/import/keyboard.py
new file mode 100644
index 0000000000..3a5ed37dee
--- /dev/null
+++ b/lib/python/qmk/cli/import/keyboard.py
@@ -0,0 +1,23 @@
+from milc import cli
+
+from qmk.importers import import_keyboard as _import_keyboard
+from qmk.path import FileType
+from qmk.json_schema import json_load
+
+
+@cli.argument('filename', type=FileType('r'), nargs='+', arg_only=True, help='file')
+@cli.subcommand('Import data-driven keyboard')
+def import_keyboard(cli):
+    filename = cli.args.filename[0]
+
+    data = json_load(filename)
+
+    cli.log.info(f'{{style_bright}}Importing {filename.name}.{{style_normal}}')
+    cli.echo('')
+
+    kb_name = _import_keyboard(data)
+
+    cli.log.info(f'{{fg_green}}Imported a new keyboard named {{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}}.")
diff --git a/lib/python/qmk/cli/import/keymap.py b/lib/python/qmk/cli/import/keymap.py
new file mode 100644
index 0000000000..a499c93480
--- /dev/null
+++ b/lib/python/qmk/cli/import/keymap.py
@@ -0,0 +1,23 @@
+from milc import cli
+
+from qmk.importers import import_keymap as _import_keymap
+from qmk.path import FileType
+from qmk.json_schema import json_load
+
+
+@cli.argument('filename', type=FileType('r'), nargs='+', arg_only=True, help='file')
+@cli.subcommand('Import data-driven keymap')
+def import_keymap(cli):
+    filename = cli.args.filename[0]
+
+    data = json_load(filename)
+
+    cli.log.info(f'{{style_bright}}Importing {filename.name}.{{style_normal}}')
+    cli.echo('')
+
+    kb_name, km_name = _import_keymap(data)
+
+    cli.log.info(f'{{fg_green}}Imported a new keymap named {{fg_cyan}}{km_name}{{fg_green}}.{{fg_reset}}')
+    cli.log.info(f'To start working on things, `cd` into {{fg_cyan}}keyboards/{kb_name}/keymaps/{km_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 {km_name}{{fg_reset}}.")
diff --git a/lib/python/qmk/importers.py b/lib/python/qmk/importers.py
new file mode 100644
index 0000000000..f9ecac02ae
--- /dev/null
+++ b/lib/python/qmk/importers.py
@@ -0,0 +1,148 @@
+from dotty_dict import dotty
+import json
+
+from qmk.json_schema import validate
+from qmk.path import keyboard, keymap
+from qmk.constants import MCU2BOOTLOADER
+from qmk.json_encoders import InfoJSONEncoder, KeymapJSONEncoder
+
+
+def _gen_dummy_keymap(name, info_data):
+    # Pick the first layout macro and just dump in KC_NOs or something?
+    (layout_name, layout_data), *_ = info_data["layouts"].items()
+    layout_length = len(layout_data["layout"])
+
+    keymap_data = {
+        "keyboard": name,
+        "layout": layout_name,
+        "layers": [["KC_NO" for _ in range(0, layout_length)]],
+    }
+
+    return json.dumps(keymap_data, cls=KeymapJSONEncoder)
+
+
+def import_keymap(keymap_data):
+    # Validate to ensure we don't have to deal with bad data - handles stdin/file
+    validate(keymap_data, 'qmk.keymap.v1')
+
+    kb_name = keymap_data['keyboard']
+    km_name = keymap_data['keymap']
+
+    km_folder = keymap(kb_name) / km_name
+    keyboard_keymap = km_folder / 'keymap.json'
+
+    # This is the deepest folder in the expected tree
+    keyboard_keymap.parent.mkdir(parents=True, exist_ok=True)
+
+    # Dump out all those lovely files
+    keyboard_keymap.write_text(json.dumps(keymap_data, cls=KeymapJSONEncoder))
+
+    return (kb_name, km_name)
+
+
+def import_keyboard(info_data):
+    # Validate to ensure we don't have to deal with bad data - handles stdin/file
+    validate(info_data, 'qmk.api.keyboard.v1')
+
+    # And validate some more as everything is optional
+    if not all(key in info_data for key in ['keyboard_name', 'layouts']):
+        raise ValueError('invalid info.json')
+
+    kb_name = info_data['keyboard_name']
+
+    # bail
+    kb_folder = keyboard(kb_name)
+    if kb_folder.exists():
+        raise ValueError(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} already exists! Please choose a different name.')
+
+    keyboard_info = kb_folder / 'info.json'
+    keyboard_rules = kb_folder / 'rules.mk'
+    keyboard_keymap = kb_folder / 'keymaps' / 'default' / 'keymap.json'
+
+    # This is the deepest folder in the expected tree
+    keyboard_keymap.parent.mkdir(parents=True, exist_ok=True)
+
+    # Dump out all those lovely files
+    keyboard_info.write_text(json.dumps(info_data, cls=InfoJSONEncoder))
+    keyboard_rules.write_text("# This file intentionally left blank")
+    keyboard_keymap.write_text(_gen_dummy_keymap(kb_name, info_data))
+
+    return kb_name
+
+
+def import_kbfirmware(kbfirmware_data):
+    kbf_data = dotty(kbfirmware_data)
+
+    diode_direction = ["COL2ROW", "ROW2COL"][kbf_data['keyboard.settings.diodeDirection']]
+    mcu = ["atmega32u2", "atmega32u4", "at90usb1286"][kbf_data['keyboard.controller']]
+    bootloader = MCU2BOOTLOADER.get(mcu, "custom")
+
+    layout = []
+    for key in kbf_data['keyboard.keys']:
+        layout.append({
+            "matrix": [key["row"], key["col"]],
+            "x": key["state"]["x"],
+            "y": key["state"]["y"],
+            "w": key["state"]["w"],
+            "h": key["state"]["h"],
+        })
+
+    # convert to d/d info.json
+    info_data = {
+        "keyboard_name": kbf_data['keyboard.settings.name'].lower(),
+        "manufacturer": "TODO",
+        "maintainer": "TODO",
+        "processor": mcu,
+        "bootloader": bootloader,
+        "diode_direction": diode_direction,
+        "matrix_pins": {
+            "cols": kbf_data['keyboard.pins.col'],
+            "rows": kbf_data['keyboard.pins.row'],
+        },
+        "usb": {
+            "vid": "0xFEED",
+            "pid": "0x0000",
+            "device_version": "0.0.1",
+        },
+        "features": {
+            "bootmagic": True,
+            "command": False,
+            "console": False,
+            "extrakey": True,
+            "mousekey": True,
+            "nkro": True,
+        },
+        "layouts": {
+            "LAYOUT": {
+                "layout": layout,
+            }
+        }
+    }
+
+    if kbf_data['keyboard.pins.num'] or kbf_data['keyboard.pins.caps'] or kbf_data['keyboard.pins.scroll']:
+        indicators = {}
+        if kbf_data['keyboard.pins.num']:
+            indicators['num_lock'] = kbf_data['keyboard.pins.num']
+        if kbf_data['keyboard.pins.caps']:
+            indicators['caps_lock'] = kbf_data['keyboard.pins.caps']
+        if kbf_data['keyboard.pins.scroll']:
+            indicators['scroll_lock'] = kbf_data['keyboard.pins.scroll']
+        info_data['indicators'] = indicators
+
+    if kbf_data['keyboard.pins.rgb']:
+        info_data['rgblight'] = {
+            'animations': {
+                'all': True
+            },
+            'led_count': kbf_data['keyboard.settings.rgbNum'],
+            'pin': kbf_data['keyboard.pins.rgb'],
+        }
+
+    if kbf_data['keyboard.pins.led']:
+        info_data['backlight'] = {
+            'levels': kbf_data['keyboard.settings.backlightLevels'],
+            'pin': kbf_data['keyboard.pins.led'],
+        }
+
+    # delegate as if it were a regular keyboard import
+    return import_keyboard(info_data)

From 2af2c5e109cb58401521e32df4b83d7e7f6f1444 Mon Sep 17 00:00:00 2001
From: mmccoyd <mmccoyd@users.noreply.github.com>
Date: Sat, 2 Jul 2022 04:56:23 -0700
Subject: [PATCH 064/959] [Keyboard] Move/Rename to Hillside48, simplify
 default keymap (#17210)

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
---
 keyboards/handwired/hillside/0_1/0_1.c        |   4 -
 .../hillside/0_1/keymaps/default/keymap.json  | 101 ---------
 .../hillside/0_1/keymaps/default/readme.md    | 212 ------------------
 keyboards/handwired/hillside/48/48.c          |   4 +
 .../handwired/hillside/{0_1/0_1.h => 48/48.h} |   2 +-
 .../handwired/hillside/{0_1 => 48}/config.h   |   0
 .../handwired/hillside/{0_1 => 48}/info.json  |  22 +-
 .../hillside/48/keymaps/default/config.h      |   9 +
 .../hillside/48/keymaps/default/keymap.json   |  88 ++++++++
 .../hillside/48/keymaps/default/readme.md     | 159 +++++++++++++
 .../hillside/48/keymaps/default/rules.mk      |   1 +
 .../keymaps/json2hill48.py}                   |  40 ++--
 .../{0_1 => 48}/keymaps/via/keymap.json       |   2 +-
 .../handwired/hillside/{0_1 => 48}/readme.md  |   6 +-
 .../handwired/hillside/{0_1 => 48}/rules.mk   |   0
 15 files changed, 302 insertions(+), 348 deletions(-)
 delete mode 100644 keyboards/handwired/hillside/0_1/0_1.c
 delete mode 100644 keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
 delete mode 100644 keyboards/handwired/hillside/0_1/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/hillside/48/48.c
 rename keyboards/handwired/hillside/{0_1/0_1.h => 48/48.h} (96%)
 rename keyboards/handwired/hillside/{0_1 => 48}/config.h (100%)
 rename keyboards/handwired/hillside/{0_1 => 48}/info.json (83%)
 create mode 100644 keyboards/handwired/hillside/48/keymaps/default/config.h
 create mode 100644 keyboards/handwired/hillside/48/keymaps/default/keymap.json
 create mode 100644 keyboards/handwired/hillside/48/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/hillside/48/keymaps/default/rules.mk
 rename keyboards/handwired/hillside/{0_1/keymaps/json2hill.py => 48/keymaps/json2hill48.py} (79%)
 rename keyboards/handwired/hillside/{0_1 => 48}/keymaps/via/keymap.json (98%)
 rename keyboards/handwired/hillside/{0_1 => 48}/readme.md (87%)
 rename keyboards/handwired/hillside/{0_1 => 48}/rules.mk (100%)

diff --git a/keyboards/handwired/hillside/0_1/0_1.c b/keyboards/handwired/hillside/0_1/0_1.c
deleted file mode 100644
index ee096f18a7..0000000000
--- a/keyboards/handwired/hillside/0_1/0_1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Michael McCoyd (@mmccoyd)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "0_1.h"
diff --git a/keyboards/handwired/hillside/0_1/keymaps/default/keymap.json b/keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
deleted file mode 100644
index 5c672f8b8b..0000000000
--- a/keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{    "version": 1,
-    "notes": "",
-    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "handwired/hillside/0_1",
-    "keymap": "default",
-    "layout": "LAYOUT",
-    "layers": [
-        ["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_GRV",
-         "KC_ESC" , "KC_N"         , "KC_M"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
-
-         "KC_LCTL", "KC_LGUI"      , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"       , "KC_LALT"      , "KC_RGUI"   , "KC_QUOT"
-
-        ],
-        ["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_CAPS", "KC_A"         , "KC_O"         , "KC_E"      , "KC_U"         , "KC_I",
-         "KC_D"   , "KC_H"         , "KC_T"         , "KC_N"      , "KC_S"         , "KC_ENT",
-
-         "KC_LSFT", "KC_SCLN"      , "KC_Q"         , "KC_J"      , "KC_K"         , "KC_X"      , "KC_GRV",
-         "KC_ESC" , "KC_B"         , "KC_M"         , "KC_W"      , "KC_V"         , "KC_Z"      , "KC_RSFT",
-
-         "KC_LCTL", "KC_LGUI"      , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"       , "KC_LALT"      , "KC_RGUI"   , "KC_SLSH"
-
-        ],
-        ["KC_TAB" , "KC_Q"         , "KC_W"         , "KC_F"      , "KC_P"         , "KC_B",
-         "KC_J"   , "KC_L"         , "KC_U"         , "KC_Y"      , "KC_SCLN"      , "KC_BSPC",
-
-         "KC_CAPS", "KC_A"         , "KC_R"         , "KC_S"      , "KC_T"         , "KC_G",
-         "KC_M"   , "KC_N"         , "KC_E"         , "KC_I"      , "KC_O"         , "KC_ENT",
-
-         "KC_LSFT", "KC_Z"         , "KC_X"         , "KC_C"      , "KC_D"         , "KC_V"      , "KC_GRV",
-         "KC_ESC" , "KC_K"         , "KC_H"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
-
-         "KC_LCTL", "KC_LGUI"      , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"       , "KC_LALT"      , "KC_RGUI"   , "KC_QUOT"
-
-        ],
-        ["KC_NO"  , "KC_INS"       , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_VOLU",
-         "KC_PGUP", "KC_HOME"      , "KC_NO"        , "KC_END"    , "KC_NO"        , "KC_DEL",
-
-         "KC_NO"  , "KC_LGUI"      , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_VOLD",
-         "KC_PGDN", "KC_LEFT"      , "KC_UP"        , "KC_RGHT"   , "KC_NO"        , "KC_TRNS",
-
-         "KC_LSFT", "LCTL(KC_Z)"   , "LCTL(KC_X)"   , "LCTL(KC_C)", "LCTL(KC_V)"   , "LCTL(KC_Y)", "KC_MUTE",
-         "KC_ESC" , "OSM(MOD_RALT)", "LCTL(KC_LEFT)", "KC_DOWN"   , "LCTL(KC_RGHT)", "KC_APP"    , "KC_TRNS",
-
-         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS",
-         "MO(6)"  , "KC_BSPC"      , "KC_TRNS"      , "KC_TRNS"   , "KC_RCTL"
-
-        ],
-        ["KC_F11" , "KC_EXLM"      , "KC_AT"        , "KC_HASH"   , "KC_DLR"       , "KC_PERC",
-         "KC_CIRC", "KC_AMPR"      , "KC_ASTR"      , "KC_LPRN"   , "KC_RPRN"      , "KC_TRNS",
-
-         "KC_F12" , "KC_F1"        , "KC_F2"        , "KC_F3"     , "KC_F4"        , "KC_F5",
-         "KC_PIPE", "KC_LSFT"      , "KC_LCTL"      , "KC_LALT"   , "KC_LGUI"      , "KC_TRNS",
-
-         "KC_LSFT", "KC_F6"        , "KC_F7"        , "KC_F8"     , "KC_F9"        , "KC_F10"    , "KC_PSCR",
-         "KC_ESC" , "KC_BSLS"      , "KC_LBRC"      , "KC_RBRC"   , "KC_LCBR"      , "KC_RCBR"   , "KC_TRNS",
-
-         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "MO(6)",
-         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "KC_RCTL"
-
-        ],
-        ["KC_TAB" , "KC_MINS"      , "KC_PLUS"      , "KC_EQL"    , "KC_SLSH"      , "KC_ASTR",
-         "KC_COMM", "KC_7"         , "KC_8"         , "KC_9"      , "KC_NO"        , "KC_TRNS",
-
-         "KC_NO"  , "KC_LGUI"      , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_NO",
-         "KC_0"   , "KC_1"         , "KC_2"         , "KC_3"      , "KC_UNDS"      , "KC_TRNS",
-
-         "KC_TRNS", "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
-         "KC_NO"  , "KC_DOT"       , "KC_4"         , "KC_5"      , "KC_6"         , "KC_NO"     , "KC_TRNS",
-
-         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "KC_NO",
-         "KC_NO"  , "KC_BSPC"      , "KC_TRNS"      , "KC_TRNS"   , "KC_RCTL"
-
-        ],
-        ["KC_NO"  , "DF(0)"        , "DF(1)"        , "DF(2)"     , "AG_SWAP"      , "AG_NORM",
-         "KC_NO"  , "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
-
-         "KC_NO"  , "KC_NO"        , "KC_NO"        , "KC_NO"     , "CL_SWAP"      , "CL_NORM",
-         "RGB_MOD", "RGB_VAI"      , "RGB_HUI"      , "RGB_SAI"   , "KC_NO"        , "KC_NO",
-
-         "QK_BOOT", "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
-         "RGB_TOG", "RGB_RMOD"     , "RGB_VAD"      , "RGB_HUD"   , "RGB_SAD"      , "KC_NO"     , "KC_NO",
-
-         "KC_NO"  , "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_TRNS",
-         "KC_TRNS", "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"
-
-        ]
-    ],
-    "author": "@mmccoyd"
-}
diff --git a/keyboards/handwired/hillside/0_1/keymaps/default/readme.md b/keyboards/handwired/hillside/0_1/keymaps/default/readme.md
deleted file mode 100644
index 1890d5808c..0000000000
--- a/keyboards/handwired/hillside/0_1/keymaps/default/readme.md
+++ /dev/null
@@ -1,212 +0,0 @@
-# Default Keymap
-
-This default keymap follows many of the norms seen in non-programmable keyboards
-  to ease initial use of the Hillside keyboard.
-It is a starting point for you to tweak over time to better suit _your_ preferences.
-You can easily customize it with the
-  [QMK configurator](https://config.qmk.fm/#/hillside/0_1/LAYOUT)
-  or with the [via firmware](https://caniusevia.com).
-
-Some of its key features are:
-- A mostly standard base layer with letters, some symbols, shift, modifier and delete keys
-  in the expected places for non-programmable keyboards.
-- QWERTY, Colemak-DH and Dvorak options for the letter and symbol layout.
-- Comfortable modifier and function or symbol combinations on the non-base layers
-  using modifiers on the home row of the navigation/edit, symbol/function and number-pad layers.
-- Word navigation and cut/copy/paste keys on the navigation layer.
-- A slightly optimized number pad with the more frequently used numbers on the home row.
-
-We've deliberately omitted some features:
-- Combos: because the online configuration tools do not handle them
-  and because they would add to the initial learning curve,
-  as helpful to a keymap as a light sprinkling of combos can be.
-- Multi-function mod-tap keys, auto shift capitalization and auto-exit modes such as CAPWORD or NUMWORD:
-  as they may be too large a step for someone new to programmable keyboards.
-
-## Base Layer
-
-```
-| TAB   |  Q  |  W  |  E  |  R  |  T  |---------------------------|  Y  |  U  |  I  |  O  |  P  | BKSPC |
-| CAPS  |  A  |  S  |  D  |  F  |  G  |---------------------------|  H  |  J  |  K  |  L  |  ;  | ENTER |
-| SHIFT |  Z  |  X  |  C  |  V  |  B  |  ~  |---------------| ESC |  N  |  M  |  ,  |  .  |  /  | SHIFT |
---------------|CTRL |-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----|  '  |--------------
-```
-
-The base layer provides a very standard key layout:
-
-- Return, Tab, backspace and shift keys in the outer columns.
-- Alt/option and win/command keys on both thumbs, with the location swappable for windows or mac.
-- A space key on the right thumb.
-
-The differences from a standard layout are:
-
-- There are three additional "shift" keys
-  to access the navigation/editing, symbol/function, and number layers.
-- Esc and `~ are above the thumbs.
-- The Menu and AltGr keys are on a layer.
-
-The default layout is QWERTY with alternatives of Dvorak and Colemak-DH
-and the alt/option and win/command key locations are swappable for windows or mac.
-
-<details>
-<summary>Details of Dvorak and Colemak-DH</summary>
-The Dvorak and Colemak-DH base layers
-  have identical non-alpha and non-symbol keys as the QWERTY base layer.
-In the Dvorak layout, the symbol key in the bottom row is the "/?" symbols
-  so that the same 12 symbols are taken care of on the base layer.
-
-```
-Dvorak
-| TAB   |  '  |  ,  |  .  |  P  |  Y  |---------------------------|  F  |  G  |  C  |  R  |  L  | BKSPC |
-| CAPS  |  A  |  O  |  E  |  U  |  I  |---------------------------|  D  |  H  |  T  |  N  |  S  | ENTER |
-| SHIFT |  ;  |  Q  |  J  |  K  |  X  |  ~  |---------------| ESC |  B  |  M  |  W  |  V  |  Z  | SHIFT |
---------------|CTRL |-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----|  /  |--------------
-
-Colemak-DH
-| TAB   |  Q  |  W  |  F  |  P  |  B  |---------------------------|  J  |  L  |  U  |  Y  |  ;  | BKSPC |
-| CAPS  |  A  |  R  |  S  |  T  |  G  |---------------------------|  M  |  N  |  E  |  I  |  O  | ENTER |
-| SHIFT |  Z  |  X  |  C  |  D  |  V  |  ~  |---------------| ESC |  K  |  H  |  ,  |  .  |  /  | SHIFT |
---------------|CTRL |-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----|  '  |--------------
-```
-</details>
-
-## Navigation, Editing and Media Layer
-
-```
-|       | INS |     |     |     |VOL+ |---------------------------|PG_UP|HOME |     |  END|     | DEL   |
-|       | GUI | ALT |CTRL |SHIFT|VOL- |---------------------------|PG_DN|LEFT | UP  |RIGHT|     | ENTER |
-| SHIFT |UNDO | CUT |COPY |PASTE|REDO |MUTE |---------------| ESC |RALT |WORDL|DOWN |WORDR|MENU | SHIFT |
---------------|CTRL |-----| GUI | ALT | Num | *** |---| Adj |BSPC | ALT | GUI |-----|CTRL |--------------
-```
-Holding down the Nav key accesses a navigation and editing layer:
-
-- Navigation arrows are on and below the right home row in a cross pattern.
-  This feels more natural for a column stagger keyboard than an inverted T.
-  The keys below that move left or right by a word.
-  Home, end, and page up/down are beside them.
-- Modifiers in the left home row make it easier to use the arrows
-  to select text with the shift key or move between desktops or tabs.
-- Editing keys appear on the lower left.
-  The edit keys, modifiers and arrows make it easy to move text around without leaving the layer.
-- Delete is in the upper right, and a backspace key is on the thumb.
-- The base layer modifiers and escape are in the same spots as on the base layer,
-  and a right-hand control key is added.
-- Media volume and play keys are on the left, accessible with one hand.
-- Menu and AltGr keys fill out the layer.
-- A few keys do nothing and are available for more user-specific needs.
-
-## Symbol and Function Layer
-
-```
-| F11   |  !  |  @  |  #  |  $  |  %  |---------------------------|  ^  |  &  |  *  |  (  |  )  | BSPC  |
-| F12   | F1  | F2  | F3  | F4  | F5  |---------------------------|  |  |SHIFT|CTRL | ALT | GUI | ENTER |
-| SHIFT | F6  | F7  | F8  | F9  | F10 |PRTSC|---------------| ESC |  \  |  [  |  ]  |  {  |  }  | SHIFT |
---------------|CTRL |-----| GUI | ALT | Num | Adj |---| *** |SPACE| ALT | GUI |-----|CTRL |--------------
-```
-Holding down the Sym key accesses a layer of symbol and function keys:
-
-- The symbols usually found on the number keys are in the top row.
-  If desired, you can use these positions for other things,
-  as the symbols are also accessible from the number pad layer with the shift key.
-- Several more symbols appear on the right.
-- The function keys are on the left, beginning with two rows of five.
-- A row of modifiers in the home row allows the comfortable creation of any modifier and function key combination.  
-- The base layer modifier and escape keys are still available, as is a right-hand control key.
-
-##  Number Pad and Algebraic Layer
-```
-| TAB   |  -  |  +  |  =  |  /  |  *  |---------------------------|  .  |  7  |  8  |  9  |     | BSPC  |
-|       | GUI | ALT |CTRL |SHIFT|     |---------------------------|  0  |  1  |  2  |  3  |  _  | ENTER |
-| SHIFT |     |     |     |     |     |     |---------------| ESC |  ,  |  4  |  5  |  6  |     | SHIFT |
---------------|CTRL |-----| GUI | ALT | *** |     |---|     |BSPC | ALT | GUI |-----|CTRL |--------------
-```
-Holding down the Num key accesses a number pad and arithmetic symbols:
-
-- The number pad has the lowest numbers swapped into the home row as these are the most commonly used.
-- A row of modifiers in the home row allows the comfortable creation of any modifier and number combination.
-- Symbols commonly used with numbers fill out the layer
-   and can be combined with the home row mods or the existing base layer modifiers on the right hand.
-- Several keys remain unused and await more user-specific needs.
-
-
-## Adjust Layer
-```
-|       |QWERT|DVORK|COLMK|AG_SWAP|AG_NORM|-----------------------|     |     |     |     |     |       |
-|       |     |     |     |CTR_S|CTR_N|---------------------------|MOD+ |BRI+ |HUE+ |SAT+ |     |       |
-| QK_BOOT |     |     |     |     |     |     |--------------|RGBTOG|MOD- |BRI- |HUE- |SAT- |     |       |
---------------|     |-----|     |     |     | *** |---| *** |     |     |     |-----|     |--------------
-```
-Simultaneously holding down the Nav and Sym keys enables keys to adjust various keyboard settings:
-
-- The base layer can be set to QWERTY, Colemak-DH or Dvorak,
-  but the keyboard reverts to QWERTY each time it is plugged in.
-- Alt/option and GUI/command can be swapped for mac users or restored to the windows norm.
-  This setting persists over power loss.
-- The backlight LEDs can be enabled, disabled, and controlled.
-  These settings also persist over power loss.
-
-
-## Make it Yours
-
-If you are coming from a traditional keyboard,
-  with a row-staggered layout and a large set of physical keys,
-  learning to use a column staggered (ergo) and layer-based keyboard,
-  which uses layers instead of finger reaches to access numbers, symbols and functions,
-  will be an adjustment for your muscle memory and your mental keyboard map.
-This default layout tries to simplify that adjustment by keeping things    in the expected spots when possible.
-
-Yet this layout is only a decent compromise and is not optimal for each user.
-
-The online configurator makes it easy to tweak this layout to your needs.
-You can add additional layers or completely switch around what these do.
-
-Some changes you might consider making:
-- Put some of your most-used key combinations on the unused keys on the navigation layer.
-- If you are on a mac, switch the editing and word navigation keys from ctrl-x to cmd-x.
-- Change the shift keys to one-shot shift keys,
-  where pressing and releasing them shifts the next key pressed.
-  That is much easier on your hands than holding them down.
-  Yet, they can still be held as usual if desired.
-- Instead of holding down the thumb key to keep the symbol layer active,
-  you could use a one-shot layer key.
-  One-shot modifiers are likely less stress on your hands and may even be faster.
-  You would still be able to hold it down instead.
-- Instead of holding down the key for the number pad layer,
-  you could make it a layer toggle, like caps lock is a capitalization toggle key.
-
-Here are some other keymaps for inspiration and ideas:
-- The [Ferris default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default) uses more advanced features as it has far fewer keys to work with.
-- The [Miryoku](https://github.com/manna-harbour/miryoku/tree/master/docs/reference) keymap ensures that all modifiers are comfortably available with each character key.
-- The [Kyria default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/default) has different keymap choices and a couple more keys.
-
-A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
-  in response to ideas of how it might serve you better.
-
-
-## Why no keymap.c
-
-Via and the online configurator provide straightforward visual ways to work with a simple layout,
-  and both use a .json keymap format.
-So this default ```keymap.json``` was created with the online configurator
-  and formatted for easier reading and editing.
-
-If you wish, you can edit the ```keymap.json``` directly in a text editor, optionally use the below ```json2hill.py``` to restore the spacing, and then compile and flash it.
-
-Or, you can use the graphical configurator to edit the keymap. To do that:
-
-- Open the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/LAYOUT)
-- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/handwired/hillside/keymaps/default/keymap.json```
-- Make the changes you wish to the layout
-- Save the keymap using the green down arrow button.
-- Copy those changes back into your QMK repository and reformat for easy reading using the format script:
-```
-./keyboards/handwired/hillside/0_1/keymaps/json2hill.py --input <Your download directory>/default.json > ./keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
-```
-   You may need to make that script executable with ```chmod +x```. After your keymap is safely copied and formated, you may want to remove the keymap from your download directory so later downloads will automatically receive the same file name.
-
-After either method of editing, compile and flash the keymap as usual.
-
-You can combine a .json based keymap with more advanced features specified in .c files
-  with a bit more complexity.
-For example, see
-[pierrec83's Kyria map](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/pierrec83).
diff --git a/keyboards/handwired/hillside/48/48.c b/keyboards/handwired/hillside/48/48.c
new file mode 100644
index 0000000000..a1d2c2f6e4
--- /dev/null
+++ b/keyboards/handwired/hillside/48/48.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "48.h"
diff --git a/keyboards/handwired/hillside/0_1/0_1.h b/keyboards/handwired/hillside/48/48.h
similarity index 96%
rename from keyboards/handwired/hillside/0_1/0_1.h
rename to keyboards/handwired/hillside/48/48.h
index 0aeefdf630..65e1aaee30 100644
--- a/keyboards/handwired/hillside/0_1/0_1.h
+++ b/keyboards/handwired/hillside/48/48.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Michael McCoyd (@mmccoyd)
+// Copyright 2022 Michael McCoyd (@mmccoyd)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/keyboards/handwired/hillside/0_1/config.h b/keyboards/handwired/hillside/48/config.h
similarity index 100%
rename from keyboards/handwired/hillside/0_1/config.h
rename to keyboards/handwired/hillside/48/config.h
diff --git a/keyboards/handwired/hillside/0_1/info.json b/keyboards/handwired/hillside/48/info.json
similarity index 83%
rename from keyboards/handwired/hillside/0_1/info.json
rename to keyboards/handwired/hillside/48/info.json
index 7e128d5191..2325c2d8d3 100644
--- a/keyboards/handwired/hillside/0_1/info.json
+++ b/keyboards/handwired/hillside/48/info.json
@@ -2,7 +2,7 @@
     "manufacturer": "mmccoyd",
     "maintainer": "mmccoyd",
 
-    "keyboard_name": "Hillside",
+    "keyboard_name": "Hillside48",
     "url": "http://github.com/mmccoyd/hillside/",
 
     "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
@@ -44,7 +44,7 @@
         "LAYOUT": {
             "layout": [
 
-                {"label": "Tab", "x": 0, "y": 0.93},
+                {"label": "`", "x": 0, "y": 0.93},
                 {"label": "Q", "x": 1, "y": 0.93},
                 {"label": "W", "x": 2, "y": 0.31},
                 {"label": "E", "x": 3, "y": 0},
@@ -59,7 +59,7 @@
                 {"label": "Backspace", "x": 14.5, "y": 0.93},
 
 
-                {"label": "Ctrl", "x": 0, "y": 1.93},
+                {"label": "Tab", "x": 0, "y": 1.93},
                 {"label": "A", "x": 1, "y": 1.93},
                 {"label": "S", "x": 2, "y": 1.31},
                 {"label": "D", "x": 3, "y": 1},
@@ -71,7 +71,7 @@
                 {"label": "K", "x": 11.5, "y": 1},
                 {"label": "L", "x": 12.5, "y": 1.31},
                 {"label": ";", "x": 13.5, "y": 1.93},
-                {"label": "'", "x": 14.5, "y": 1.93},
+                {"label": "Enter", "x": 14.5, "y": 1.93},
 
 
                 {"label": "Shift", "x": 0, "y": 2.93},
@@ -80,9 +80,9 @@
                 {"label": "C", "x": 3, "y": 2},
                 {"label": "V", "x": 4, "y": 2.28},
                 {"label": "B", "x": 5, "y": 2.42},
-                {"label": "`", "x": 6, "y": 2.78},
+                {"label": "Esc", "x": 6, "y": 2.78},
 
-                {"label": "Esc", "x": 8.5, "y": 2.78},
+                {"label": "Caps", "x": 8.5, "y": 2.78},
                 {"label": "N", "x": 9.5, "y": 2.42},
                 {"label": "M", "x": 10.5, "y": 2.28},
                 {"label": ",", "x": 11.5, "y": 2},
@@ -91,18 +91,18 @@
                 {"label": "Shift", "x": 14.5, "y": 2.93},
 
 
-                {"label": "Enter", "x": 2, "y": 3.31},
+                {"label": "Ctrl", "x": 2, "y": 3.31},
                 {"label": "Gui", "x": 3.5, "y": 3.28},
                 {"label": "Alt", "x": 4.5, "y": 3.42},
-                {"label": "Num", "x": 5.5, "y": 3.78},
-                {"label": "Nav", "x": 6.5, "y": 4.14},
+                {"label": "Sym", "x": 5.5, "y": 3.78},
+                {"label": "Shift", "x": 6.5, "y": 4.14},
 
 
-                {"label": "Sym", "x": 8, "y": 4.14},
+                {"label": "Nav", "x": 8, "y": 4.14},
                 {"label": "Space", "x": 9, "y": 3.78},
                 {"label": "Alt", "x": 10, "y": 3.42},
                 {"label": "Gui", "x": 11, "y": 3.28},
-                {"label": "App", "x": 12.5, "y": 3.31}
+                {"label": "'", "x": 12.5, "y": 3.31}
             ]
         }
     }
diff --git a/keyboards/handwired/hillside/48/keymaps/default/config.h b/keyboards/handwired/hillside/48/keymaps/default/config.h
new file mode 100644
index 0000000000..1f71d42e67
--- /dev/null
+++ b/keyboards/handwired/hillside/48/keymaps/default/config.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Some boards have issues detecting handedness using the vbus voltage,
+// such as Elite-C v3, but not v3.1 on, and apparently some ProMicro boards.
+// For those boards, use usb detection instead.
+// #define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/hillside/48/keymaps/default/keymap.json b/keyboards/handwired/hillside/48/keymaps/default/keymap.json
new file mode 100644
index 0000000000..364ab726a0
--- /dev/null
+++ b/keyboards/handwired/hillside/48/keymaps/default/keymap.json
@@ -0,0 +1,88 @@
+{    "version": 1,
+    "notes": "",
+    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+    "keyboard": "handwired/hillside/48",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        ["KC_GRV"    , "KC_Q"    , "KC_W"   , "KC_E"   , "KC_R"         , "KC_T",
+         "KC_Y"      , "KC_U"    , "KC_I"   , "KC_O"   , "KC_P"         , "KC_BSPC",
+
+         "KC_TAB"    , "KC_A"    , "KC_S"   , "KC_D"   , "KC_F"         , "KC_G",
+         "KC_H"      , "KC_J"    , "KC_K"   , "KC_L"   , "KC_SCLN"      , "KC_ENT",
+
+         "KC_LSFT"   , "KC_Z"    , "KC_X"   , "KC_C"   , "KC_V"         , "KC_B"      , "KC_ESC",
+         "CAPS_WORD" , "KC_N"    , "KC_M"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
+         "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_QUOT"
+
+        ],
+        ["KC_GRV"    , "KC_QUOT" , "KC_COMM", "KC_DOT" , "KC_P"         , "KC_Y",
+         "KC_F"      , "KC_G"    , "KC_C"   , "KC_R"   , "KC_L"         , "KC_BSPC",
+
+         "KC_TAB"    , "KC_A"    , "KC_O"   , "KC_E"   , "KC_U"         , "KC_I",
+         "KC_D"      , "KC_H"    , "KC_T"   , "KC_N"   , "KC_S"         , "KC_ENT",
+
+         "KC_LSFT"   , "KC_SCLN" , "KC_Q"   , "KC_J"   , "KC_K"         , "KC_X"      , "KC_ESC",
+         "CAPS_WORD"   , "KC_B"    , "KC_M"   , "KC_W"   , "KC_V"         , "KC_Z"      , "KC_RSFT",
+
+         "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
+         "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_SLSH"
+
+        ],
+        ["KC_GRV"    , "KC_Q"    , "KC_W"   , "KC_F"   , "KC_P"         , "KC_B",
+         "KC_J"      , "KC_L"    , "KC_U"   , "KC_Y"   , "KC_SCLN"      , "KC_BSPC",
+
+         "KC_TAB"    , "KC_A"    , "KC_R"   , "KC_S"   , "KC_T"         , "KC_G",
+         "KC_M"      , "KC_N"    , "KC_E"   , "KC_I"   , "KC_O"         , "KC_ENT",
+
+         "KC_LSFT"   , "KC_Z"    , "KC_X"   , "KC_C"   , "KC_D"         , "KC_V"      , "KC_ESC",
+         "CAPS_WORD"   , "KC_K"    , "KC_H"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
+         "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_QUOT"
+
+        ],
+        ["KC_HOME"   , "KC_EXLM" , "KC_AT"  , "KC_HASH", "KC_DLR"       , "KC_PERC",
+         "KC_CIRC"   , "KC_AMPR" , "KC_ASTR", "KC_LPRN", "KC_RPRN"      , "KC_DEL",
+
+         "KC_END"    , "KC_LGUI" , "KC_LALT", "KC_LCTL", "KC_LSFT"      , "KC_INS",
+         "KC_LBRC"   , "KC_RBRC" , "KC_MINS", "KC_EQL" , "KC_BSLS"      , "KC_TRNS",
+
+         "KC_LSFT"   , "KC_NO"   , "KC_VOLD", "KC_MUTE", "KC_VOLU"      , "KC_MPLY"   , "OSM(MOD_RALT)",
+         "KC_APP"    , "KC_LCBR" , "KC_RCBR", "KC_UNDS", "KC_PLUS"      , "KC_PIPE"   , "KC_TRNS",
+
+         "KC_TRNS"   , "KC_TRNS" , "KC_TRNS", "KC_TRNS", "OSM(MOD_LSFT)",
+         "MO(5)"     , "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["LCTL(KC_X)", "KC_1"    , "KC_2"   , "KC_3"   , "KC_4"         , "KC_5",
+         "KC_6"      , "KC_7"    , "KC_8"   , "KC_9"   , "KC_0"         , "KC_BSPC",
+
+         "LCTL(KC_C)", "KC_LEFT" , "KC_DOWN", "KC_UP"  , "KC_RGHT"      , "LCTL(KC_V)",
+         "KC_PGUP"   , "KC_RSFT" , "KC_RCTL", "KC_LALT", "KC_RGUI"      , "KC_PGDN",
+
+         "KC_LSFT"   , "KC_F1"   , "KC_F2"  , "KC_F3"  , "KC_F4"        , "KC_F5"     , "LCTL(KC_Z)",
+         "LCTL(KC_Y)", "KC_F6"   , "KC_F7"  , "KC_F8"  , "KC_F9"        , "KC_F10"    , "KC_TRNS",
+
+         "KC_TRNS"   , "KC_TRNS" , "KC_TRNS", "MO(5)"  , "KC_TRNS",
+         "KC_TRNS"   , "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["KC_NO"     , "DF(0)"   , "DF(1)"  , "DF(2)"  , "AG_SWAP"      , "CG_SWAP",
+         "KC_NO"     , "KC_F11"  , "KC_F12" , "KC_PSCR", "KC_NO"        , "KC_NO",
+
+         "KC_NO"     , "KC_NO"   , "KC_NO"  , "KC_NO"  , "AG_NORM"      , "CG_NORM",
+         "RGB_MOD"   , "RGB_VAI" , "RGB_HUI", "RGB_SAI", "KC_NO"        , "KC_NO",
+
+         "KC_NO"     , "KC_LGUI" , "KC_LALT", "KC_LCTL", "KC_LSFT"      , "KC_NO"     , "KC_NO",
+         "RGB_TOG"   , "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD"      , "KC_NO"     , "QK_BOOT",
+
+         "KC_NO"     , "KC_NO"   , "KC_NO"  , "KC_TRNS", "KC_NO",
+         "KC_TRNS"   , "KC_NO"   , "KC_NO"  , "KC_NO"  , "KC_NO"
+
+        ]
+    ],
+    "author": "@mmccoyd"
+}
diff --git a/keyboards/handwired/hillside/48/keymaps/default/readme.md b/keyboards/handwired/hillside/48/keymaps/default/readme.md
new file mode 100644
index 0000000000..9bf294eff0
--- /dev/null
+++ b/keyboards/handwired/hillside/48/keymaps/default/readme.md
@@ -0,0 +1,159 @@
+# Default Keymap
+
+For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/48/LAYOUT).
+
+Some of its key features are:
+- Numbers and symbols along the top row of their layers for familiarity.
+- Comfortable combination of modifier and function or symbol on the non-base layers
+  using modifiers on the home row of the symbol and number/function layers.
+- A layer with both navigation and editing keys allows document editing without leaving the layer.
+- QWERTY, Colemak-DH and Dvorak base layer options.
+
+## Base Layer
+
+```
+|  `    |  Q  |  W  |  E  |  R  |  T  |---------------------------|  Y  |  U  |  I  |  O  |  P  | BKSPC |
+| TAB   |  A  |  S  |  D  |  F  |  G  |---------------------------|  H  |  J  |  K  |  L  |  ;  | ENTER |
+| SHIFT |  Z  |  X  |  C  |  V  |  B  | ESC |---------------|CAPS |  N  |  M  |  ,  |  .  |  /  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Sym |SHIFT|---| Nav |SPACE| ALT | GUI |-----|  '  |--------------
+```
+
+The base layer provides a very standard key layout with five differences:
+
+- Numbers, functions and most symbols are accessed with number and symbol shift keys.
+- Escape is on the left thumb.
+- The left thumb has a shift key that affects the next key pressed. So to get 'A', press and release the thumb shift key, press 'a'. You can also hold the key down, and it will work like a standard shift key. There are still standard shift keys at either end of the keyboard.
+- The right upper thumb turns on a mode that capitalizes all letters until something other than a letter, digit, dash, underscore, delete or backspace is typed. The caps word mode also times out after five seconds of no key presses.
+- The Menu and AltGr keys are on a layer.
+
+The default layout is QWERTY with alternatives of Dvorak and Colemak-DH, and the alt/option and the win/command key locations are swappable for windows or mac.
+
+
+<details>
+<summary>Details of Dvorak and Colemak-DH</summary>
+The Dvorak and Colemak-DH base layers
+  have identical non-alpha and non-symbol keys as the QWERTY base layer.
+
+```
+Dvorak
+|  `    |  '  |  ,  |  .  |  P  |  Y  |---------------------------|  F  |  G  |  C  |  R  |  L  | BKSPC |
+| TAB   |  A  |  O  |  E  |  U  |  I  |---------------------------|  D  |  H  |  T  |  N  |  S  | ENTER |
+| SHIFT |  ;  |  Q  |  J  |  K  |  X  | ESC |---------------|CAPS |  B  |  M  |  W  |  V  |  Z  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Sym |SHIFT|---| Nav |SPACE| ALT | GUI |-----|  /  |--------------
+
+Colemak-DH
+|  `    |  Q  |  W  |  F  |  P  |  B  |---------------------------|  J  |  L  |  U  |  Y  |  ;  | BKSPC |
+| TAB   |  A  |  R  |  S  |  T  |  G  |---------------------------|  M  |  N  |  E  |  I  |  O  | ENTER |
+| SHIFT |  Z  |  X  |  C  |  D  |  V  | ESC |---------------|CAPS |  K  |  H  |  ,  |  .  |  /  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Sym |SHIFT|---| Nav |SPACE| ALT | GUI |-----|  '  |--------------
+```
+</details>
+
+## Symbol and Media Layer
+
+```
+| HOME  |  !  |  @  |  #  |  $  |  %  |---------------------------|  ^  |  &  |  *  |  (  |  )  | DEL   |
+| END   | GUI | ALT |CTRL |SHIFT| INS |---------------------------|  [  |  ]  |  -  |  =  |  \  | ENTER |
+| SHIFT |     |VOL- |MUTE |VOL+ |PLAY |OSM ALT |------------|MENU |  {  |  }  |  _  |  +  |  |  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | *** |SHIFT|---| Adj |SPACE| ALT | GUI |-----|CTRL |--------------
+```
+Holding down the SYM key accesses the symbol layer:
+
+- The symbols not present on the base layer are along the top row and right side, similar to a full-size keyboard.
+- Duplicates of the modifier keys are along the left home keys. This allows a very comfortable combination of any set of modifiers plus a key on the right side of the board.
+- Forward delete is on the upper right, taking backspace's place.
+- The Windows OS application menu key is on the upper right thumb.
+- The AltGr key affects the next key pressed so that it can combine with a key on any layer. It changes the meaning of the next key pressed after the AltGr key is pressed and released. For example, to do AltGr-h: press SYM, press and release AltGr, release SYM, press and release h.
+
+## Navigation, Editing, Number and Function Layer
+
+```
+| CUT   |  1  |  2  |  3  |  4  |  5  |---------------------------|  6  |  7  |  8  |  9  |  0  | BSPC  |
+| COPY  |LEFT |DOWN | UP  |RIGHT|PASTE|---------------------------|PG_UP|SHIFT|CTRL | ALT | GUI | PG_DN |
+| SHIFT | F1  | F2  | F3  | F4  | F5  |UNDO |---------------|REDO | F6  | F7  | F8  | F9  | F10 | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Adj |SHIFT|---| *** |SPACE| ALT | GUI |-----|CTRL |--------------
+```
+Holding down the Nav/Edit key accesses the navigation, editing, number and function layer:
+
+- Numbers are along the top row, and function keys are on the bottom row.
+- The arrow keys on the left can be combined with the home row modifiers on the right to easily move around and select text, which can then be cut, copied and pasted.
+
+
+## Adjust Layer
+```
+|       |QWERT|DVORK|COLMK|AG_SWAP|CTR_SWAP|----------------------|     | F11 | F12 |PR_SCR|    |       |
+|       |     |     |     |AG_NORM|CTR_NORM|----------------------|MOD+ |BRI+ |HUE+ |SAT+ |     |       |
+|       | GUI | ALT |CTRL |SHIFT|     |     |--------------|RGBTOG|MOD- |BRI- |HUE- |SAT- |     | BOOT  |
+--------------|     |-----|     |     | *** |     |---| *** |     |     |     |-----|     |--------------
+```
+Simultaneously holding down the Sym and Nav/Edit keys enables keys to adjust keyboard settings:
+
+- The base layer can be set to QWERTY, Colemak-DH or Dvorak, although the keyboard reverts to QWERTY each time it is plugged in.
+- Alt/option and GUI/command can be swapped for mac users or restored to the windows norm.
+- The backlight LEDs can be enabled, disabled, and controlled.
+- BOOT allows loading new firmware, such as for keymap changes.
+- The remaining Fn keys are here with modifiers to use with them.
+
+## Make it Yours
+
+If you are coming from a traditional keyboard,
+  with a row-staggered layout and a large set of physical keys,
+  learning to use a column staggered (ergo) and layer-based keyboard,
+  which uses layers instead of finger reaches to access numbers, symbols and functions,
+  will be an adjustment for your muscle memory and your mental keyboard map.
+This default layout tries to simplify that adjustment by keeping things in the expected spots when possible.
+
+Yet this layout is only a decent compromise and is not optimal for each user.
+The online configurator makes it easy to tweak this layout to your needs.
+You can add additional layers or completely switch around what these do.
+
+A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
+  in response to ideas of how it might serve you better.
+
+Some changes you might consider making:
+- If you are on a mac, switch the editing keys from ctrl-x to cmd-x.
+- Change the shift keys to one-shot shift keys,
+  where pressing and releasing them shifts the next key pressed.
+  That is much easier on your hands than holding them down.
+  Yet, they can still be held as usual if desired.
+- Instead of holding down the thumb key to keep the symbol layer active,
+  you could use a one-shot layer key.
+  One-shot modifiers are likely less stress on your hands and may even be faster.
+  You would still be able to hold it down instead.
+
+Here are some other keymaps for inspiration and ideas:
+- The [Ferris default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default) uses more advanced features as it has far fewer keys.
+- The [Miryoku](https://github.com/manna-harbour/miryoku/tree/master/docs/reference) keymap ensures that all modifiers are comfortably available with each character key.
+- The [Kyria default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/default) has different keymap choices and a couple more keys.
+
+
+
+## Why no keymap.c
+
+The online configurator provides a straightforward visual way to work with a simple layout
+  and uses a .json keymap format.
+So this default ```keymap.json``` was created with the online configurator
+  and formatted for easier reading and editing.
+
+If you wish, you can edit the ```keymap.json``` directly in a text editor, optionally use the below ```json2hill48.py``` to restore the spacing, and then compile and flash it.
+
+Or, you can use the graphical configurator to edit the keymap. To do that:
+
+- Open the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/48/LAYOUT)
+- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/handwired/hillside/48/keymaps/default/keymap.json```
+- Make the changes you wish to the layout
+- Save the keymap using the green down arrow button.
+- Copy those changes back into your QMK repository and reformat for easy reading using the format script:
+```
+./keyboards/handwired/hillside/48/keymaps/json2hill48.py \
+    --input <Your download directory>/default.json \
+    > ./keyboards/handwired/hillside/48/keymaps/default/keymap.json
+```
+   You may need to make that script executable with ```chmod +x```. After your keymap is safely copied and formatted, you may want to remove the keymap from your download directory so later downloads will automatically receive the same file name.
+
+After either method of editing, compile and flash the keymap as usual.
+
+You can combine a .json based keymap with more advanced features specified in .c files
+  with a bit more complexity.
+For example, see
+[pierrec83's Kyria map](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/pierrec83).
\ No newline at end of file
diff --git a/keyboards/handwired/hillside/48/keymaps/default/rules.mk b/keyboards/handwired/hillside/48/keymaps/default/rules.mk
new file mode 100644
index 0000000000..4711d2ff74
--- /dev/null
+++ b/keyboards/handwired/hillside/48/keymaps/default/rules.mk
@@ -0,0 +1 @@
+CAPS_WORD_ENABLE = yes
diff --git a/keyboards/handwired/hillside/0_1/keymaps/json2hill.py b/keyboards/handwired/hillside/48/keymaps/json2hill48.py
similarity index 79%
rename from keyboards/handwired/hillside/0_1/keymaps/json2hill.py
rename to keyboards/handwired/hillside/48/keymaps/json2hill48.py
index a9971c0d78..c4fb5b1037 100755
--- a/keyboards/handwired/hillside/0_1/keymaps/json2hill.py
+++ b/keyboards/handwired/hillside/48/keymaps/json2hill48.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2020-2021 Pierre Viseu Chevalier, Michael McCoyd (@pierrechevalier83, @mmccoyd)
+# Copyright 2020-2022 Pierre Viseu Chevalier, Michael McCoyd (@pierrechevalier83, @mmccoyd)
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-"""Pretty print keymap json in more readable row/side organized format."""
+"""Pretty print keymap json in more readable row/side organized format, based on ROW_SIZES."""
 
 import argparse
 import json
@@ -28,14 +28,20 @@ For example, for one layer:
  ],
 """
 
-indent_level=4 # number of spaces of initial indent per output line
+# The structure of the keymap. Tuples describing row sizes.
+# (<Keys upto and including (one-indexed) keycount x> <are in half rows of y>)
+ROW_SIZES = [(24, 6),
+             (38, 7),
+             (48, 5),
+             ]
 
-# The structure of the keymap
-# [[Endpoint of sides with identical widths, side width, mapping to column],...]
-KEYS_TO_COL = [[24, 6, lambda n: n % 6],
-               [38, 7, lambda n: (n - 24) % 7],
-               [48, 5, lambda n: (n - 38) % 5]]
-LAST_KEY = KEYS_TO_COL[-1][0] - 1
+###
+### Below here should not need to changed for different keyboards
+###
+
+LAST_KEY = ROW_SIZES[-1][0] - 1
+
+indent_level=4 # number of spaces of initial indent per output line
 
 def parse_cli():
     parser = argparse.ArgumentParser(description='Hillside keymap formatter')
@@ -54,12 +60,15 @@ class Column(NamedTuple):
 
 def get_col(key_index):
     """Return Column for key_index."""
-    for keys, num_cols, col_fn in KEYS_TO_COL:
-        if key_index < keys:
-            col_num = col_fn(key_index)
-            return Column(col_num,
+    index_prior = 0 # index of last key in rows of the prior size
+    for keys_upto, num_cols in ROW_SIZES: # For row sizes from top
+        if key_index < keys_upto: # Find range key_index is in
+            col_num = (key_index - index_prior) % num_cols
+            return Column(col_num, # Return column plus side and row ends flags
                           ends_side=col_num == num_cols - 1,
-                          ends_row=(keys - 1 - key_index) % (2 * num_cols) == 0)
+                          ends_row=(keys_upto - 1 - key_index) %
+                          (2 * num_cols) == 0)
+        index_prior = keys_upto # Big O: row ranges * keys, but range is small
 
 def format_layers(layers):
     formatted = indent_level * " " + "\"layers\": [\n"
@@ -133,4 +142,5 @@ def main():
     keymap_json = json.loads(args.input.read())
     print(format_keymap(keymap_json))
 
-main()
+if __name__ == "__main__":
+    main()
diff --git a/keyboards/handwired/hillside/0_1/keymaps/via/keymap.json b/keyboards/handwired/hillside/48/keymaps/via/keymap.json
similarity index 98%
rename from keyboards/handwired/hillside/0_1/keymaps/via/keymap.json
rename to keyboards/handwired/hillside/48/keymaps/via/keymap.json
index a015f0241c..b4848a72ee 100644
--- a/keyboards/handwired/hillside/0_1/keymaps/via/keymap.json
+++ b/keyboards/handwired/hillside/48/keymaps/via/keymap.json
@@ -1,6 +1,6 @@
 {    "version": 1,
     "notes": "",
-    "keyboard": "handwired/hillside/0_1",
+    "keyboard": "handwired/hillside/48",
     "keymap": "via",
     "layout": "LAYOUT",
     "layers": [
diff --git a/keyboards/handwired/hillside/0_1/readme.md b/keyboards/handwired/hillside/48/readme.md
similarity index 87%
rename from keyboards/handwired/hillside/0_1/readme.md
rename to keyboards/handwired/hillside/48/readme.md
index f1ff0f8506..ec6dffc0f2 100644
--- a/keyboards/handwired/hillside/0_1/readme.md
+++ b/keyboards/handwired/hillside/48/readme.md
@@ -2,7 +2,7 @@
 
 ![hillside](https://imgur.com/XW0rX13.png)
 
-[Hillside](https://github.com/mmccoyd/hillside)
+[Hillside 48](https://github.com/mmccoyd/hillside)
  is a split ergonomic keyboard
  with 3x6+4+2 choc-spaced keys with aggressive column stagger,
  a longer thumb arc and a breakoff outer-pinky column.
@@ -13,11 +13,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/hillside/0_1:default
+    make handwired/hillside/48:default
 
 Flashing example for this keyboard:
 
-    make handwired/hillside/0_1:default:flash
+    make handwired/hillside/48:default:flash
 
 ## Bootloader
 
diff --git a/keyboards/handwired/hillside/0_1/rules.mk b/keyboards/handwired/hillside/48/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/0_1/rules.mk
rename to keyboards/handwired/hillside/48/rules.mk

From 0112938140b4a59904f4b0b8c3893588410013cb Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Sat, 2 Jul 2022 13:57:05 +0200
Subject: [PATCH 065/959] Expose the time of the last change to the LED state
 (#17222)

---
 quantum/led.c | 12 +++++++++++-
 quantum/led.h |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/quantum/led.c b/quantum/led.c
index c5ddbc22c5..444d38f751 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -15,6 +15,7 @@
  */
 #include "led.h"
 #include "host.h"
+#include "timer.h"
 #include "debug.h"
 #include "gpio.h"
 
@@ -54,6 +55,14 @@ static void handle_backlight_caps_lock(led_t led_state) {
 }
 #endif
 
+static uint32_t last_led_modification_time = 0;
+uint32_t        last_led_activity_time(void) {
+    return last_led_modification_time;
+}
+uint32_t last_led_activity_elapsed(void) {
+    return timer_elapsed32(last_led_modification_time);
+}
+
 /** \brief Lock LED set callback - keymap/user level
  *
  * \deprecated Use led_update_user() instead.
@@ -174,7 +183,8 @@ void led_task(void) {
     // update LED
     uint8_t led_status = host_keyboard_leds();
     if (last_led_status != led_status) {
-        last_led_status = led_status;
+        last_led_status            = led_status;
+        last_led_modification_time = timer_read32();
 
         if (debug_keyboard) {
             debug("led_task: ");
diff --git a/quantum/led.h b/quantum/led.h
index 934d25312c..b8262cbd8e 100644
--- a/quantum/led.h
+++ b/quantum/led.h
@@ -61,6 +61,9 @@ void led_set_kb(uint8_t usb_led);
 bool led_update_user(led_t led_state);
 bool led_update_kb(led_t led_state);
 
+uint32_t last_led_activity_time(void);    // Timestamp of the LED activity
+uint32_t last_led_activity_elapsed(void); // Number of milliseconds since the last LED activity
+
 #ifdef __cplusplus
 }
 #endif

From 8b78fac4511cd006b7be92e5789d29de6118fad3 Mon Sep 17 00:00:00 2001
From: torkel104 <bjorn.spindel@protonmail.com>
Date: Sat, 2 Jul 2022 14:03:40 +0200
Subject: [PATCH 066/959] Fix keys being discarded after using the leader key
 (#17287)

---
 quantum/process_keycode/process_leader.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index c2fd02e5c7..ae00b3227a 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -64,6 +64,7 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
                 } else {
                     leading = false;
                     leader_end();
+                    return true;
                 }
 #    ifdef LEADER_PER_KEY_TIMING
                 leader_time = timer_read();

From 871eeae4eab476cb64b40e0636ec19deeea79525 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamuaoki@users.noreply.github.com>
Date: Sat, 2 Jul 2022 21:08:48 +0900
Subject: [PATCH 067/959] PoC: Swap Escape and Caps (#16336)

---
 docs/keycodes.md                        |  3 +++
 docs/keycodes_magic.md                  |  3 +++
 quantum/command.c                       |  2 ++
 quantum/keycode_config.c                |  4 ++++
 quantum/keycode_config.h                |  1 +
 quantum/process_keycode/process_magic.c | 10 ++++++++++
 quantum/quantum_keycodes.h              |  8 ++++++++
 7 files changed, 31 insertions(+)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index bd5af32dd3..37e9d00392 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -337,6 +337,9 @@ See also: [Magic Keycodes](keycodes_magic.md)
 |`MAGIC_SWAP_CONTROL_CAPSLOCK`     |`CL_SWAP`|Swap Caps Lock and Left Control                                           |
 |`MAGIC_UNSWAP_CONTROL_CAPSLOCK`   |`CL_NORM`|Unswap Caps Lock and Left Control                                         |
 |`MAGIC_TOGGLE_CONTROL_CAPSLOCK`   |`CL_TOGG`|Toggle Caps Lock and Left Control swap                                    |
+|`MAGIC_SWAP_ESCAPE_CAPSLOCK`      |`EC_SWAP`|Swap Caps Lock and Escape                                                 |
+|`MAGIC_UNSWAP_ESCAPE_CAPSLOCK`    |`EC_NORM`|Unswap Caps Lock and Escape                                               |
+|`MAGIC_TOGGLE_ESCAPE_CAPSLOCK`    |`EC_TOGG`|Toggle Caps Lock and Escape swap                                          |
 |`MAGIC_CAPSLOCK_TO_CONTROL`       |`CL_CTRL`|Treat Caps Lock as Control                                                |
 |`MAGIC_UNCAPSLOCK_TO_CONTROL`     |`CL_CAPS`|Stop treating Caps Lock as Control                                        |
 |`MAGIC_SWAP_LCTL_LGUI`            |`LCG_SWP`|Swap Left Control and GUI                                                 |
diff --git a/docs/keycodes_magic.md b/docs/keycodes_magic.md
index 01eb69168e..982a301630 100644
--- a/docs/keycodes_magic.md
+++ b/docs/keycodes_magic.md
@@ -7,6 +7,9 @@
 |`MAGIC_SWAP_CONTROL_CAPSLOCK`     |`CL_SWAP`|Swap Caps Lock and Left Control                                           |
 |`MAGIC_UNSWAP_CONTROL_CAPSLOCK`   |`CL_NORM`|Unswap Caps Lock and Left Control                                         |
 |`MAGIC_TOGGLE_CONTROL_CAPSLOCK`   |`CL_TOGG`|Toggle Caps Lock and Left Control swap                                    |
+|`MAGIC_SWAP_ESCAPE_CAPSLOCK`      |`EC_SWAP`|Swap Caps Lock and Escape                                                 |
+|`MAGIC_UNSWAP_ESCAPE_CAPSLOCK`    |`EC_NORM`|Unswap Caps Lock and Escape                                               |
+|`MAGIC_TOGGLE_ESCAPE_CAPSLOCK`    |`EC_TOGG`|Toggle Caps Lock and Escape swap                                          |
 |`MAGIC_CAPSLOCK_TO_CONTROL`       |`CL_CTRL`|Treat Caps Lock as Control                                                |
 |`MAGIC_UNCAPSLOCK_TO_CONTROL`     |`CL_CAPS`|Stop treating Caps Lock as Control                                        |
 |`MAGIC_SWAP_LCTL_LGUI`            |`LCG_SWP`|Swap Left Control and GUI                                                 |
diff --git a/quantum/command.c b/quantum/command.c
index f90d73207c..2e94cb44b8 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -282,6 +282,7 @@ static void print_eeconfig(void) {
         ".swap_grave_esc: %u\n"
         ".swap_backslash_backspace: %u\n"
         ".nkro: %u\n"
+        ".swap_escape_capslock: %u\n"
 
         , kc.raw
         , kc.swap_control_capslock
@@ -294,6 +295,7 @@ static void print_eeconfig(void) {
         , kc.swap_grave_esc
         , kc.swap_backslash_backspace
         , kc.nkro
+        , kc.swap_escape_capslock
     ); /* clang-format on */
 
 #    ifdef BACKLIGHT_ENABLE
diff --git a/quantum/keycode_config.c b/quantum/keycode_config.c
index dd2a17e242..5b5cc5d28e 100644
--- a/quantum/keycode_config.c
+++ b/quantum/keycode_config.c
@@ -29,6 +29,8 @@ uint16_t keycode_config(uint16_t keycode) {
         case KC_LOCKING_CAPS_LOCK:
             if (keymap_config.swap_control_capslock || keymap_config.capslock_to_control) {
                 return KC_LEFT_CTRL;
+            } else if (keymap_config.swap_escape_capslock) {
+                return KC_ESCAPE;
             }
             return keycode;
         case KC_LEFT_CTRL:
@@ -96,6 +98,8 @@ uint16_t keycode_config(uint16_t keycode) {
         case KC_ESCAPE:
             if (keymap_config.swap_grave_esc) {
                 return KC_GRAVE;
+            } else if (keymap_config.swap_escape_capslock) {
+                return KC_CAPS_LOCK;
             }
             return KC_ESCAPE;
         case KC_BACKSLASH:
diff --git a/quantum/keycode_config.h b/quantum/keycode_config.h
index a2cb025ed2..81a8e61471 100644
--- a/quantum/keycode_config.h
+++ b/quantum/keycode_config.h
@@ -38,6 +38,7 @@ typedef union {
         bool swap_lctl_lgui : 1;
         bool swap_rctl_rgui : 1;
         bool oneshot_enable : 1;
+        bool swap_escape_capslock : 1;
     };
 } keymap_config_t;
 
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c
index 10161adda3..ae60f29bf5 100644
--- a/quantum/process_keycode/process_magic.c
+++ b/quantum/process_keycode/process_magic.c
@@ -45,12 +45,16 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
             case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT:
             case MAGIC_TOGGLE_GUI:
             case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
+            case MAGIC_SWAP_ESCAPE_CAPSLOCK ... MAGIC_TOGGLE_ESCAPE_CAPSLOCK:
                 /* keymap config */
                 keymap_config.raw = eeconfig_read_keymap();
                 switch (keycode) {
                     case MAGIC_SWAP_CONTROL_CAPSLOCK:
                         keymap_config.swap_control_capslock = true;
                         break;
+                    case MAGIC_SWAP_ESCAPE_CAPSLOCK:
+                        keymap_config.swap_escape_capslock = true;
+                        break;
                     case MAGIC_CAPSLOCK_TO_CONTROL:
                         keymap_config.capslock_to_control = true;
                         break;
@@ -94,6 +98,9 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                     case MAGIC_UNSWAP_CONTROL_CAPSLOCK:
                         keymap_config.swap_control_capslock = false;
                         break;
+                    case MAGIC_UNSWAP_ESCAPE_CAPSLOCK:
+                        keymap_config.swap_escape_capslock = false;
+                        break;
                     case MAGIC_UNCAPSLOCK_TO_CONTROL:
                         keymap_config.capslock_to_control = false;
                         break;
@@ -172,6 +179,9 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                     case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
                         keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock;
                         break;
+                    case MAGIC_TOGGLE_ESCAPE_CAPSLOCK:
+                        keymap_config.swap_escape_capslock = !keymap_config.swap_escape_capslock;
+                        break;
                 }
 
                 eeconfig_update_keymap(keymap_config.raw);
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 869826ce19..456fad6f1b 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -605,6 +605,10 @@ enum quantum_keycodes {
 
     CAPS_WORD,
 
+    MAGIC_SWAP_ESCAPE_CAPSLOCK,
+    MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
+    MAGIC_TOGGLE_ESCAPE_CAPSLOCK,
+
     // Start of custom keycode range for keyboards and keymaps - always leave at the end
     SAFE_RANGE
 };
@@ -756,6 +760,10 @@ enum quantum_keycodes {
 #define CL_CAPS MAGIC_UNCAPSLOCK_TO_CONTROL
 #define CL_TOGG MAGIC_TOGGLE_CONTROL_CAPSLOCK
 
+#define EC_SWAP MAGIC_SWAP_ESCAPE_CAPSLOCK
+#define EC_NORM MAGIC_UNSWAP_ESCAPE_CAPSLOCK
+#define EC_TOGG MAGIC_TOGGLE_ESCAPE_CAPSLOCK
+
 #define LCG_SWP MAGIC_SWAP_LCTL_LGUI
 #define LCG_NRM MAGIC_UNSWAP_LCTL_LGUI
 #define RCG_SWP MAGIC_SWAP_RCTL_RGUI

From 3ecb0a80af9e4ce4194a34032642933641730706 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 2 Jul 2022 22:10:08 +1000
Subject: [PATCH 068/959] Feature-ify Send String (#17275)

---
 builddefs/common_features.mk                  |   8 +-
 docs/_summary.md                              |   1 +
 docs/feature_macros.md                        |   2 +
 docs/feature_send_string.md                   | 224 ++++++++
 quantum/process_keycode/process_auto_shift.c  |   2 +
 .../process_dynamic_tapping_term.c            |   2 +
 quantum/quantum.h                             |   5 +-
 quantum/send_string.h                         |  54 --
 quantum/{ => send_string}/send_string.c       | 126 ++---
 quantum/send_string/send_string.h             | 152 ++++++
 quantum/send_string/send_string_keycodes.h    | 434 +++++++++++++++
 quantum/send_string_keycodes.h                | 505 ------------------
 12 files changed, 892 insertions(+), 623 deletions(-)
 create mode 100644 docs/feature_send_string.md
 delete mode 100644 quantum/send_string.h
 rename quantum/{ => send_string}/send_string.c (89%)
 create mode 100644 quantum/send_string/send_string.h
 create mode 100644 quantum/send_string/send_string_keycodes.h
 delete mode 100644 quantum/send_string_keycodes.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index c11e5688e3..5cc4508307 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -15,7 +15,6 @@
 
 QUANTUM_SRC += \
     $(QUANTUM_DIR)/quantum.c \
-    $(QUANTUM_DIR)/send_string.c \
     $(QUANTUM_DIR)/bitwise.c \
     $(QUANTUM_DIR)/led.c \
     $(QUANTUM_DIR)/action.c \
@@ -774,6 +773,13 @@ ifeq ($(strip $(MAGIC_ENABLE)), yes)
     OPT_DEFS += -DMAGIC_KEYCODE_ENABLE
 endif
 
+SEND_STRING_ENABLE ?= yes
+ifeq ($(strip $(SEND_STRING_ENABLE)), yes)
+    OPT_DEFS += -DSEND_STRING_ENABLE
+    COMMON_VPATH += $(QUANTUM_DIR)/send_string
+    SRC += $(QUANTUM_DIR)/send_string/send_string.c
+endif
+
 ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_auto_shift.c
     OPT_DEFS += -DAUTO_SHIFT_ENABLE
diff --git a/docs/_summary.md b/docs/_summary.md
index da007bccb6..b5746ff6de 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -84,6 +84,7 @@
     * [One Shot Keys](one_shot_keys.md)
     * [Pointing Device](feature_pointing_device.md)
     * [Raw HID](feature_rawhid.md)
+    * [Send String](feature_send_string.md)
     * [Sequencer](feature_sequencer.md)
     * [Swap Hands](feature_swap_hands.md)
     * [Tap Dance](feature_tap_dance.md)
diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 78bc4ba0a5..f5b163d5df 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -106,6 +106,8 @@ Only basic keycodes (prefixed by `KC_`) are supported. Do not include the `KC_`
 
 ### `SEND_STRING()` & `process_record_user`
 
+See also: [Send String](feature_send_string.md)
+
 Sometimes you want a key to type out words or phrases. For the most common situations, we've provided `SEND_STRING()`, which will type out a string (i.e. a sequence of characters) for you. All ASCII characters that are easily translatable to a keycode are supported (e.g. `qmk 123\n\t`).
 
 Here is an example `keymap.c` for a two-key keyboard:
diff --git a/docs/feature_send_string.md b/docs/feature_send_string.md
new file mode 100644
index 0000000000..67df0224e9
--- /dev/null
+++ b/docs/feature_send_string.md
@@ -0,0 +1,224 @@
+# Send String
+
+The Send String API is part of QMK's macro system. It allows for sequences of keystrokes to be sent automatically.
+
+The full ASCII character set is supported, along with all of the keycodes in the Basic Keycode range (as these are the only ones that will actually be sent to the host).
+
+?> Unicode characters are **not** supported with this API -- see the [Unicode](feature_unicode.md) feature instead.
+
+## Usage
+
+Send String is enabled by default, so there is usually no need for any special setup. However, if it is disabled, add the following to your `rules.mk`:
+
+```make
+SEND_STRING_ENABLE = yes
+```
+
+## Basic Configuration
+
+Add the following to your `config.h`:
+
+|Define           |Default         |Description                                                                                                 |
+|-----------------|----------------|------------------------------------------------------------------------------------------------------------|
+|`SENDSTRING_BELL`|*Not defined*   |If the [Audio](feature_audio.md) feature is enabled, the `\a` character (ASCII `BEL`) will beep the speaker.|
+|`BELL_SOUND`     |`TERMINAL_SOUND`|The song to play when the `\a` character is encountered. By default, this is an eighth note of C5.          |
+
+## Keycodes
+
+The Send String functions accept C string literals, but specific keycodes can be injected with the below macros. All of the keycodes in the [Basic Keycode range](keycodes_basic.md) are supported (as these are the only ones that will actually be sent to the host), but with an `X_` prefix instead of `KC_`.
+
+|Macro         |Description                                                        |
+|--------------|-------------------------------------------------------------------|
+|`SS_TAP(x)`   |Send a keydown, then keyup, event for the given Send String keycode|
+|`SS_DOWN(x)`  |Send a keydown event for the given Send String keycode             |
+|`SS_UP(x)`    |Send a keyup event for the given Send String keycode               |
+|`SS_DELAY(ms)`|Wait for `ms` milliseconds                                         |
+
+The following characters are also mapped to their respective keycodes for convenience:
+
+|Character|Hex   |ASCII|Keycode       |
+|---------|------|-----|--------------|
+|`\b`     |`\x08`|`BS` |`KC_BACKSPACE`|
+|`\e`     |`\x09`|`ESC`|`KC_ESCAPE`   |
+|`\n`     |`\x0A`|`LF` |`KC_ENTER`    |
+|`\t`     |`\x1B`|`TAB`|`KC_TAB`      |
+|         |`\x7F`|`DEL`|`KC_DELETE`   |
+
+### Language Support
+
+By default, Send String assumes your OS keyboard layout is set to US ANSI. If you are using a different keyboard layout, you can [override the lookup tables used to convert ASCII characters to keystrokes](reference_keymap_extras.md#sendstring-support).
+
+## Examples
+
+### Hello World
+
+A simple custom keycode which types out "Hello, world!" and the Enter key when pressed.
+
+Add the following to your `keymap.c`:
+
+```c
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case SS_HELLO:
+            if (record->event.pressed) {
+                SEND_STRING("Hello, world!\n");
+            }
+            return false;
+    }
+
+    return true;
+}
+```
+
+### Keycode Injection
+
+This example types out opening and closing curly braces, then taps the left arrow key to move the cursor between the two.
+
+```c
+SEND_STRING("{}" SS_TAP(X_LEFT));
+```
+
+This example types Ctrl+A, then Ctrl+C, without releasing Ctrl.
+
+```c
+SEND_STRING(SS_LCTL("ac"));
+```
+
+## API
+
+### `void send_string(const char *string)`
+
+Type out a string of ASCII characters.
+
+This function simply calls `send_string_with_delay(string, 0)`.
+
+#### Arguments
+
+ - `const char *string`  
+   The string to type out.
+
+---
+
+### `void send_string_with_delay(const char *string, uint8_t interval)`
+
+Type out a string of ASCII characters, with a delay between each character.
+
+#### Arguments
+
+ - `const char *string`  
+   The string to type out.
+ - `uint8_t interval`  
+   The amount of time, in milliseconds, to wait before typing the next character.
+
+---
+
+### `void send_string_P(const char *string)`
+
+Type out a PROGMEM string of ASCII characters.
+
+On ARM devices, this function is simply an alias for `send_string_with_delay(string, 0)`.
+
+#### Arguments
+
+ - `const char *string`  
+   The string to type out.
+
+---
+
+### `void send_string_with_delay_P(const char *string, uint8_t interval)`
+
+Type out a PROGMEM string of ASCII characters, with a delay between each character.
+
+On ARM devices, this function is simply an alias for `send_string_with_delay(string, interval)`.
+
+#### Arguments
+
+ - `const char *string`  
+   The string to type out.
+ - `uint8_t interval`  
+   The amount of time, in milliseconds, to wait before typing the next character.
+
+---
+
+### `void send_char(char ascii_code)`
+
+Type out an ASCII character.
+
+#### Arguments
+
+ - `char ascii_code`  
+   The character to type.
+
+---
+
+### `void send_dword(uint32_t number)`
+
+Type out an eight digit (unsigned 32-bit) hexadecimal value.
+
+The format is `[0-9a-f]{8}`, eg. `00000000` through `ffffffff`.
+
+#### Arguments
+
+ - `uint32_t number`  
+   The value to type, from 0 to 4,294,967,295.
+
+---
+
+### `void send_word(uint16_t number)`
+
+Type out a four digit (unsigned 16-bit) hexadecimal value.
+
+The format is `[0-9a-f]{4}`, eg. `0000` through `ffff`.
+
+#### Arguments
+
+ - `uint16_t number`  
+   The value to type, from 0 to 65,535.
+
+---
+
+### `void send_byte(uint8_t number)`
+
+Type out a two digit (8-bit) hexadecimal value.
+
+The format is `[0-9a-f]{2}`, eg. `00` through `ff`.
+
+#### Arguments
+
+ - `uint8_t number`  
+   The value to type, from 0 to 255.
+
+---
+
+### `void send_nibble(uint8_t number)`
+
+Type out a single hexadecimal digit.
+
+The format is `[0-9a-f]{1}`, eg. `0` through `f`.
+
+#### Arguments
+
+ - `uint8_t number`  
+   The value to type, from 0 to 15.
+
+---
+
+### `void tap_random_base64(void)`
+
+Type a pseudorandom character from the set `A-Z`, `a-z`, `0-9`, `+` and `/`.
+
+---
+
+### `SEND_STRING(string)`
+
+Shortcut macro for `send_string_with_delay_P(PSTR(string), 0)`.
+
+On ARM devices, this define evaluates to `send_string_with_delay(string, 0)`.
+
+---
+
+### `SEND_STRING_DELAY(string, interval)`
+
+Shortcut macro for `send_string_with_delay_P(PSTR(string), interval)`.
+
+On ARM devices, this define evaluates to `send_string_with_delay(string, interval)`.
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index e6a7c01f2a..8cb45bc0ae 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -325,11 +325,13 @@ void autoshift_disable(void) {
 
 #    ifndef AUTO_SHIFT_NO_SETUP
 void autoshift_timer_report(void) {
+#        ifdef SEND_STRING_ENABLE
     char display[8];
 
     snprintf(display, 8, "\n%d\n", autoshift_timeout);
 
     send_string((const char *)display);
+#        endif
 }
 #    endif
 
diff --git a/quantum/process_keycode/process_dynamic_tapping_term.c b/quantum/process_keycode/process_dynamic_tapping_term.c
index bdc5529e33..b682f34da6 100644
--- a/quantum/process_keycode/process_dynamic_tapping_term.c
+++ b/quantum/process_keycode/process_dynamic_tapping_term.c
@@ -22,12 +22,14 @@
 #endif
 
 static void tapping_term_report(void) {
+#ifdef SEND_STRING_ENABLE
     const char *tapping_term_str = get_u16_str(g_tapping_term, ' ');
     // Skip padding spaces
     while (*tapping_term_str == ' ') {
         tapping_term_str++;
     }
     send_string(tapping_term_str);
+#endif
 }
 
 bool process_dynamic_tapping_term(uint16_t keycode, keyrecord_t *record) {
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 8a7a20c706..f3a8a323c7 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -49,7 +49,6 @@
 #include "action_util.h"
 #include "action_tapping.h"
 #include "print.h"
-#include "send_string.h"
 #include "suspend.h"
 #include <stddef.h>
 #include <stdlib.h>
@@ -169,6 +168,10 @@ extern layer_state_t layer_state;
 #    include "hd44780.h"
 #endif
 
+#ifdef SEND_STRING_ENABLE
+#    include "send_string.h"
+#endif
+
 #ifdef HAPTIC_ENABLE
 #    include "haptic.h"
 #    include "process_haptic.h"
diff --git a/quantum/send_string.h b/quantum/send_string.h
deleted file mode 100644
index b90e6f6890..0000000000
--- a/quantum/send_string.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-
-#include "progmem.h"
-#include "send_string_keycodes.h"
-
-#define SEND_STRING(string) send_string_P(PSTR(string))
-#define SEND_STRING_DELAY(string, interval) send_string_with_delay_P(PSTR(string), interval)
-
-// Look-Up Tables (LUTs) to convert ASCII character to keycode sequence.
-extern const uint8_t ascii_to_shift_lut[16];
-extern const uint8_t ascii_to_altgr_lut[16];
-extern const uint8_t ascii_to_dead_lut[16];
-extern const uint8_t ascii_to_keycode_lut[128];
-
-// clang-format off
-#define KCLUT_ENTRY(a, b, c, d, e, f, g, h) \
-    ( ((a) ? 1 : 0) << 0 \
-    | ((b) ? 1 : 0) << 1 \
-    | ((c) ? 1 : 0) << 2 \
-    | ((d) ? 1 : 0) << 3 \
-    | ((e) ? 1 : 0) << 4 \
-    | ((f) ? 1 : 0) << 5 \
-    | ((g) ? 1 : 0) << 6 \
-    | ((h) ? 1 : 0) << 7 )
-// clang-format on
-
-void send_string(const char *str);
-void send_string_with_delay(const char *str, uint8_t interval);
-void send_string_P(const char *str);
-void send_string_with_delay_P(const char *str, uint8_t interval);
-void send_char(char ascii_code);
-
-void send_dword(uint32_t number);
-void send_word(uint16_t number);
-void send_byte(uint8_t number);
-void send_nibble(uint8_t number);
-
-void tap_random_base64(void);
diff --git a/quantum/send_string.c b/quantum/send_string/send_string.c
similarity index 89%
rename from quantum/send_string.c
rename to quantum/send_string/send_string.c
index 0de12ba12d..818a52f6dc 100644
--- a/quantum/send_string.c
+++ b/quantum/send_string/send_string.c
@@ -142,40 +142,36 @@ __attribute__((weak)) const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
 // Note: we bit-pack in "reverse" order to optimize loading
 #define PGM_LOADBIT(mem, pos) ((pgm_read_byte(&((mem)[(pos) / 8])) >> ((pos) % 8)) & 0x01)
 
-void send_string(const char *str) {
-    send_string_with_delay(str, 0);
+void send_string(const char *string) {
+    send_string_with_delay(string, 0);
 }
 
-void send_string_P(const char *str) {
-    send_string_with_delay_P(str, 0);
-}
-
-void send_string_with_delay(const char *str, uint8_t interval) {
+void send_string_with_delay(const char *string, uint8_t interval) {
     while (1) {
-        char ascii_code = *str;
+        char ascii_code = *string;
         if (!ascii_code) break;
         if (ascii_code == SS_QMK_PREFIX) {
-            ascii_code = *(++str);
+            ascii_code = *(++string);
             if (ascii_code == SS_TAP_CODE) {
                 // tap
-                uint8_t keycode = *(++str);
+                uint8_t keycode = *(++string);
                 tap_code(keycode);
             } else if (ascii_code == SS_DOWN_CODE) {
                 // down
-                uint8_t keycode = *(++str);
+                uint8_t keycode = *(++string);
                 register_code(keycode);
             } else if (ascii_code == SS_UP_CODE) {
                 // up
-                uint8_t keycode = *(++str);
+                uint8_t keycode = *(++string);
                 unregister_code(keycode);
             } else if (ascii_code == SS_DELAY_CODE) {
                 // delay
                 int     ms      = 0;
-                uint8_t keycode = *(++str);
+                uint8_t keycode = *(++string);
                 while (isdigit(keycode)) {
                     ms *= 10;
                     ms += keycode - '0';
-                    keycode = *(++str);
+                    keycode = *(++string);
                 }
                 while (ms--)
                     wait_ms(1);
@@ -183,50 +179,7 @@ void send_string_with_delay(const char *str, uint8_t interval) {
         } else {
             send_char(ascii_code);
         }
-        ++str;
-        // interval
-        {
-            uint8_t ms = interval;
-            while (ms--)
-                wait_ms(1);
-        }
-    }
-}
-
-void send_string_with_delay_P(const char *str, uint8_t interval) {
-    while (1) {
-        char ascii_code = pgm_read_byte(str);
-        if (!ascii_code) break;
-        if (ascii_code == SS_QMK_PREFIX) {
-            ascii_code = pgm_read_byte(++str);
-            if (ascii_code == SS_TAP_CODE) {
-                // tap
-                uint8_t keycode = pgm_read_byte(++str);
-                tap_code(keycode);
-            } else if (ascii_code == SS_DOWN_CODE) {
-                // down
-                uint8_t keycode = pgm_read_byte(++str);
-                register_code(keycode);
-            } else if (ascii_code == SS_UP_CODE) {
-                // up
-                uint8_t keycode = pgm_read_byte(++str);
-                unregister_code(keycode);
-            } else if (ascii_code == SS_DELAY_CODE) {
-                // delay
-                int     ms      = 0;
-                uint8_t keycode = pgm_read_byte(++str);
-                while (isdigit(keycode)) {
-                    ms *= 10;
-                    ms += keycode - '0';
-                    keycode = pgm_read_byte(++str);
-                }
-                while (ms--)
-                    wait_ms(1);
-            }
-        } else {
-            send_char(ascii_code);
-        }
-        ++str;
+        ++string;
         // interval
         {
             uint8_t ms = interval;
@@ -250,17 +203,17 @@ void send_char(char ascii_code) {
     bool    is_dead    = PGM_LOADBIT(ascii_to_dead_lut, (uint8_t)ascii_code);
 
     if (is_shifted) {
-        register_code(KC_LSFT);
+        register_code(KC_LEFT_SHIFT);
     }
     if (is_altgred) {
-        register_code(KC_RALT);
+        register_code(KC_RIGHT_ALT);
     }
     tap_code(keycode);
     if (is_altgred) {
-        unregister_code(KC_RALT);
+        unregister_code(KC_RIGHT_ALT);
     }
     if (is_shifted) {
-        unregister_code(KC_LSFT);
+        unregister_code(KC_LEFT_SHIFT);
     }
     if (is_dead) {
         tap_code(KC_SPACE);
@@ -320,3 +273,52 @@ void tap_random_base64(void) {
             break;
     }
 }
+
+#if defined(__AVR__)
+void send_string_P(const char *string) {
+    send_string_with_delay_P(string, 0);
+}
+
+void send_string_with_delay_P(const char *string, uint8_t interval) {
+    while (1) {
+        char ascii_code = pgm_read_byte(string);
+        if (!ascii_code) break;
+        if (ascii_code == SS_QMK_PREFIX) {
+            ascii_code = pgm_read_byte(++string);
+            if (ascii_code == SS_TAP_CODE) {
+                // tap
+                uint8_t keycode = pgm_read_byte(++string);
+                tap_code(keycode);
+            } else if (ascii_code == SS_DOWN_CODE) {
+                // down
+                uint8_t keycode = pgm_read_byte(++string);
+                register_code(keycode);
+            } else if (ascii_code == SS_UP_CODE) {
+                // up
+                uint8_t keycode = pgm_read_byte(++string);
+                unregister_code(keycode);
+            } else if (ascii_code == SS_DELAY_CODE) {
+                // delay
+                int     ms      = 0;
+                uint8_t keycode = pgm_read_byte(++string);
+                while (isdigit(keycode)) {
+                    ms *= 10;
+                    ms += keycode - '0';
+                    keycode = pgm_read_byte(++string);
+                }
+                while (ms--)
+                    wait_ms(1);
+            }
+        } else {
+            send_char(ascii_code);
+        }
+        ++string;
+        // interval
+        {
+            uint8_t ms = interval;
+            while (ms--)
+                wait_ms(1);
+        }
+    }
+}
+#endif
diff --git a/quantum/send_string/send_string.h b/quantum/send_string/send_string.h
new file mode 100644
index 0000000000..4eb55b88dc
--- /dev/null
+++ b/quantum/send_string/send_string.h
@@ -0,0 +1,152 @@
+/* Copyright 2021
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \defgroup send_string
+ *
+ * Send String API. These functions allow you to create macros by typing out sequences of keystrokes.
+ * \{
+ */
+
+#include <stdint.h>
+
+#include "progmem.h"
+#include "send_string_keycodes.h"
+
+// Look-Up Tables (LUTs) to convert ASCII character to keycode sequence.
+extern const uint8_t ascii_to_shift_lut[16];
+extern const uint8_t ascii_to_altgr_lut[16];
+extern const uint8_t ascii_to_dead_lut[16];
+extern const uint8_t ascii_to_keycode_lut[128];
+
+// clang-format off
+#define KCLUT_ENTRY(a, b, c, d, e, f, g, h) \
+    ( ((a) ? 1 : 0) << 0 \
+    | ((b) ? 1 : 0) << 1 \
+    | ((c) ? 1 : 0) << 2 \
+    | ((d) ? 1 : 0) << 3 \
+    | ((e) ? 1 : 0) << 4 \
+    | ((f) ? 1 : 0) << 5 \
+    | ((g) ? 1 : 0) << 6 \
+    | ((h) ? 1 : 0) << 7 )
+// clang-format on
+
+/**
+ * \brief Type out a string of ASCII characters.
+ *
+ * This function simply calls `send_string_with_delay(string, 0)`.
+ *
+ * Most keycodes from the basic keycode range are also supported by way of a special sequence - see `send_string_keycodes.h`.
+ *
+ * \param string The string to type out.
+ */
+void send_string(const char *string);
+
+/**
+ * \brief Type out a string of ASCII characters, with a delay between each character.
+ *
+ * \param string The string to type out.
+ * \param interval The amount of time, in milliseconds, to wait before typing the next character.
+ */
+void send_string_with_delay(const char *string, uint8_t interval);
+
+/**
+ * \brief Type out an ASCII character.
+ *
+ * \param ascii_code The character to type.
+ */
+void send_char(char ascii_code);
+
+/**
+ * \brief Type out an eight digit (unsigned 32-bit) hexadecimal value.
+ *
+ * The format is `[0-9a-f]{8}`, eg. `00000000` through `ffffffff`.
+ *
+ * \param number The value to type, from 0 to 4,294,967,295.
+ */
+void send_dword(uint32_t number);
+
+/**
+ * \brief Type out a four digit (unsigned 16-bit) hexadecimal value.
+ *
+ * The format is `[0-9a-f]{4}`, eg. `0000` through `ffff`.
+ *
+ * \param number The value to type, from 0 to 65,535.
+ */
+void send_word(uint16_t number);
+
+/**
+ * \brief Type out a two digit (8-bit) hexadecimal value.
+ *
+ * The format is `[0-9a-f]{2}`, eg. `00` through `ff`.
+ *
+ * \param number The value to type, from 0 to 255.
+ */
+void send_byte(uint8_t number);
+
+/**
+ * \brief Type out a single hexadecimal digit.
+ *
+ * The format is `[0-9a-f]{1}`, eg. `0` through `f`.
+ *
+ * \param number The value to type, from 0 to 15.
+ */
+void send_nibble(uint8_t number);
+
+/**
+ * \brief Type a pseudorandom character from the set `A-Z`, `a-z`, `0-9`, `+` and `/`.
+ */
+void tap_random_base64(void);
+
+#if defined(__AVR__) || defined(__DOXYGEN__)
+/**
+ * \brief Type out a PROGMEM string of ASCII characters.
+ *
+ * On ARM devices, this function is simply an alias for send_string_with_delay(string, 0).
+ *
+ * \param string The string to type out.
+ */
+void send_string_P(const char *string);
+
+/**
+ * \brief Type out a PROGMEM string of ASCII characters, with a delay between each character.
+ *
+ * On ARM devices, this function is simply an alias for send_string_with_delay(string, interval).
+ *
+ * \param string The string to type out.
+ * \param interval The amount of time, in milliseconds, to wait before typing the next character.
+ */
+void send_string_with_delay_P(const char *string, uint8_t interval);
+#else
+#    define send_string_P(string) send_string_with_delay(string, 0)
+#    define send_string_with_delay_P(string, interval) send_string_with_delay(string, interval)
+#endif
+
+/**
+ * \brief Shortcut macro for send_string_with_delay_P(PSTR(string), 0).
+ *
+ * On ARM devices, this define evaluates to send_string_with_delay(string, 0).
+ */
+#define SEND_STRING(string) send_string_with_delay_P(PSTR(string), 0)
+
+/**
+ * \brief Shortcut macro for send_string_with_delay_P(PSTR(string), interval).
+ *
+ * On ARM devices, this define evaluates to send_string_with_delay(string, interval).
+ */
+#define SEND_STRING_DELAY(string, interval) send_string_with_delay_P(PSTR(string), interval)
+
+/** \} */
diff --git a/quantum/send_string/send_string_keycodes.h b/quantum/send_string/send_string_keycodes.h
new file mode 100644
index 0000000000..7017e03d5a
--- /dev/null
+++ b/quantum/send_string/send_string_keycodes.h
@@ -0,0 +1,434 @@
+/* Copyright 2019
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// clang-format off
+
+/* Punctuation */
+#define X_ENT  X_ENTER
+#define X_ESC  X_ESCAPE
+#define X_BSPC X_BSPACE
+#define X_SPC  X_SPACE
+#define X_MINS X_MINUS
+#define X_EQL  X_EQUAL
+#define X_LBRC X_LBRACKET
+#define X_RBRC X_RBRACKET
+#define X_BSLS X_BSLASH
+#define X_NUHS X_NONUS_HASH
+#define X_SCLN X_SCOLON
+#define X_QUOT X_QUOTE
+#define X_GRV  X_GRAVE
+#define X_COMM X_COMMA
+#define X_SLSH X_SLASH
+#define X_NUBS X_NONUS_BSLASH
+
+/* Lock Keys */
+#define X_CLCK X_CAPSLOCK
+#define X_CAPS X_CAPSLOCK
+#define X_SLCK X_SCROLLLOCK
+#define X_NLCK X_NUMLOCK
+#define X_LCAP X_LOCKING_CAPS
+#define X_LNUM X_LOCKING_NUM
+#define X_LSCR X_LOCKING_SCROLL
+
+/* Commands */
+#define X_PSCR X_PSCREEN
+#define X_PAUS X_PAUSE
+#define X_BRK  X_PAUSE
+#define X_INS  X_INSERT
+#define X_DEL  X_DELETE
+#define X_PGDN X_PGDOWN
+#define X_RGHT X_RIGHT
+#define X_APP  X_APPLICATION
+#define X_EXEC X_EXECUTE
+#define X_SLCT X_SELECT
+#define X_AGIN X_AGAIN
+#define X_PSTE X_PASTE
+#define X_ERAS X_ALT_ERASE
+#define X_CLR  X_CLEAR
+
+/* Keypad */
+#define X_PSLS X_KP_SLASH
+#define X_PAST X_KP_ASTERISK
+#define X_PMNS X_KP_MINUS
+#define X_PPLS X_KP_PLUS
+#define X_PENT X_KP_ENTER
+#define X_P1   X_KP_1
+#define X_P2   X_KP_2
+#define X_P3   X_KP_3
+#define X_P4   X_KP_4
+#define X_P5   X_KP_5
+#define X_P6   X_KP_6
+#define X_P7   X_KP_7
+#define X_P8   X_KP_8
+#define X_P9   X_KP_9
+#define X_P0   X_KP_0
+#define X_PDOT X_KP_DOT
+#define X_PEQL X_KP_EQUAL
+#define X_PCMM X_KP_COMMA
+
+/* Japanese specific */
+#define X_ZKHK X_GRAVE
+#define X_RO   X_INT1
+#define X_KANA X_INT2
+#define X_JYEN X_INT3
+#define X_HENK X_INT4
+#define X_MHEN X_INT5
+
+/* Korean specific */
+#define X_HAEN X_LANG1
+#define X_HANJ X_LANG2
+
+/* Modifiers */
+#define X_LCTL X_LCTRL
+#define X_LSFT X_LSHIFT
+#define X_LOPT X_LALT
+#define X_LCMD X_LGUI
+#define X_LWIN X_LGUI
+#define X_RCTL X_RCTRL
+#define X_RSFT X_RSHIFT
+#define X_ALGR X_RALT
+#define X_ROPT X_RALT
+#define X_RCMD X_RGUI
+#define X_RWIN X_RGUI
+
+/* Generic Desktop Page (0x01) */
+#define X_PWR  X_SYSTEM_POWER
+#define X_SLEP X_SYSTEM_SLEEP
+#define X_WAKE X_SYSTEM_WAKE
+
+/* Consumer Page (0x0C) */
+#define X_MUTE X_AUDIO_MUTE
+#define X_VOLU X_AUDIO_VOL_UP
+#define X_VOLD X_AUDIO_VOL_DOWN
+#define X_MNXT X_MEDIA_NEXT_TRACK
+#define X_MPRV X_MEDIA_PREV_TRACK
+#define X_MSTP X_MEDIA_STOP
+#define X_MPLY X_MEDIA_PLAY_PAUSE
+#define X_MSEL X_MEDIA_SELECT
+#define X_EJCT X_MEDIA_EJECT
+#define X_CALC X_CALCULATOR
+#define X_MYCM X_MY_COMPUTER
+#define X_WSCH X_WWW_SEARCH
+#define X_WHOM X_WWW_HOME
+#define X_WBAK X_WWW_BACK
+#define X_WFWD X_WWW_FORWARD
+#define X_WSTP X_WWW_STOP
+#define X_WREF X_WWW_REFRESH
+#define X_WFAV X_WWW_FAVORITES
+#define X_MFFD X_MEDIA_FAST_FORWARD
+#define X_MRWD X_MEDIA_REWIND
+#define X_BRIU X_BRIGHTNESS_UP
+#define X_BRID X_BRIGHTNESS_DOWN
+
+/* System Specific */
+#define X_BRMU X_PAUSE
+#define X_BRMD X_SCROLLLOCK
+
+/* Mouse Keys */
+#define X_MS_U X_MS_UP
+#define X_MS_D X_MS_DOWN
+#define X_MS_L X_MS_LEFT
+#define X_MS_R X_MS_RIGHT
+#define X_BTN1 X_MS_BTN1
+#define X_BTN2 X_MS_BTN2
+#define X_BTN3 X_MS_BTN3
+#define X_BTN4 X_MS_BTN4
+#define X_BTN5 X_MS_BTN5
+#define X_WH_U X_MS_WH_UP
+#define X_WH_D X_MS_WH_DOWN
+#define X_WH_L X_MS_WH_LEFT
+#define X_WH_R X_MS_WH_RIGHT
+#define X_ACL0 X_MS_ACCEL0
+#define X_ACL1 X_MS_ACCEL1
+#define X_ACL2 X_MS_ACCEL2
+
+/* Keyboard/Keypad Page (0x07) */
+#define X_A                  04
+#define X_B                  05
+#define X_C                  06
+#define X_D                  07
+#define X_E                  08
+#define X_F                  09
+#define X_G                  0a
+#define X_H                  0b
+#define X_I                  0c
+#define X_J                  0d
+#define X_K                  0e
+#define X_L                  0f
+#define X_M                  10
+#define X_N                  11
+#define X_O                  12
+#define X_P                  13
+#define X_Q                  14
+#define X_R                  15
+#define X_S                  16
+#define X_T                  17
+#define X_U                  18
+#define X_V                  19
+#define X_W                  1a
+#define X_X                  1b
+#define X_Y                  1c
+#define X_Z                  1d
+#define X_1                  1e
+#define X_2                  1f
+#define X_3                  20
+#define X_4                  21
+#define X_5                  22
+#define X_6                  23
+#define X_7                  24
+#define X_8                  25
+#define X_9                  26
+#define X_0                  27
+#define X_ENTER              28
+#define X_ESCAPE             29
+#define X_BSPACE             2a
+#define X_TAB                2b
+#define X_SPACE              2c
+#define X_MINUS              2d
+#define X_EQUAL              2e
+#define X_LBRACKET           2f
+#define X_RBRACKET           30
+#define X_BSLASH             31
+#define X_NONUS_HASH         32
+#define X_SCOLON             33
+#define X_QUOTE              34
+#define X_GRAVE              35
+#define X_COMMA              36
+#define X_DOT                37
+#define X_SLASH              38
+#define X_CAPSLOCK           39
+#define X_F1                 3a
+#define X_F2                 3b
+#define X_F3                 3c
+#define X_F4                 3d
+#define X_F5                 3e
+#define X_F6                 3f
+#define X_F7                 40
+#define X_F8                 41
+#define X_F9                 42
+#define X_F10                43
+#define X_F11                44
+#define X_F12                45
+#define X_PSCREEN            46
+#define X_SCROLLLOCK         47
+#define X_PAUSE              48
+#define X_INSERT             49
+#define X_HOME               4a
+#define X_PGUP               4b
+#define X_DELETE             4c
+#define X_END                4d
+#define X_PGDOWN             4e
+#define X_RIGHT              4f
+#define X_LEFT               50
+#define X_DOWN               51
+#define X_UP                 52
+#define X_NUMLOCK            53
+#define X_KP_SLASH           54
+#define X_KP_ASTERISK        55
+#define X_KP_MINUS           56
+#define X_KP_PLUS            57
+#define X_KP_ENTER           58
+#define X_KP_1               59
+#define X_KP_2               5a
+#define X_KP_3               5b
+#define X_KP_4               5c
+#define X_KP_5               5d
+#define X_KP_6               5e
+#define X_KP_7               5f
+#define X_KP_8               60
+#define X_KP_9               61
+#define X_KP_0               62
+#define X_KP_DOT             63
+#define X_NONUS_BSLASH       64
+#define X_APPLICATION        65
+#define X_POWER              66
+#define X_KP_EQUAL           67
+#define X_F13                68
+#define X_F14                69
+#define X_F15                6a
+#define X_F16                6b
+#define X_F17                6c
+#define X_F18                6d
+#define X_F19                6e
+#define X_F20                6f
+#define X_F21                70
+#define X_F22                71
+#define X_F23                72
+#define X_F24                73
+#define X_EXECUTE            74
+#define X_HELP               75
+#define X_MENU               76
+#define X_SELECT             77
+#define X_STOP               78
+#define X_AGAIN              79
+#define X_UNDO               7a
+#define X_CUT                7b
+#define X_COPY               7c
+#define X_PASTE              7d
+#define X_FIND               7e
+#define X__MUTE              7f
+#define X__VOLUP             80
+#define X__VOLDOWN           81
+#define X_LOCKING_CAPS       82
+#define X_LOCKING_NUM        83
+#define X_LOCKING_SCROLL     84
+#define X_KP_COMMA           85
+#define X_KP_EQUAL_AS400     86
+#define X_INT1               87
+#define X_INT2               88
+#define X_INT3               89
+#define X_INT4               8a
+#define X_INT5               8b
+#define X_INT6               8c
+#define X_INT7               8d
+#define X_INT8               8e
+#define X_INT9               8f
+#define X_LANG1              90
+#define X_LANG2              91
+#define X_LANG3              92
+#define X_LANG4              93
+#define X_LANG5              94
+#define X_LANG6              95
+#define X_LANG7              96
+#define X_LANG8              97
+#define X_LANG9              98
+#define X_ALT_ERASE          99
+#define X_SYSREQ             9a
+#define X_CANCEL             9b
+#define X_CLEAR              9c
+#define X_PRIOR              9d
+#define X_RETURN             9e
+#define X_SEPARATOR          9f
+#define X_OUT                a0
+#define X_OPER               a1
+#define X_CLEAR_AGAIN        a2
+#define X_CRSEL              a3
+#define X_EXSEL              a4
+
+/* Modifiers */
+#define X_LCTRL              e0
+#define X_LSHIFT             e1
+#define X_LALT               e2
+#define X_LGUI               e3
+#define X_RCTRL              e4
+#define X_RSHIFT             e5
+#define X_RALT               e6
+#define X_RGUI               e7
+
+/* Media and Function keys */
+/* Generic Desktop Page (0x01) */
+#define X_SYSTEM_POWER       a5
+#define X_SYSTEM_SLEEP       a6
+#define X_SYSTEM_WAKE        a7
+
+/* Consumer Page (0x0C) */
+#define X_AUDIO_MUTE         a8
+#define X_AUDIO_VOL_UP       a9
+#define X_AUDIO_VOL_DOWN     aa
+#define X_MEDIA_NEXT_TRACK   ab
+#define X_MEDIA_PREV_TRACK   ac
+#define X_MEDIA_STOP         ad
+#define X_MEDIA_PLAY_PAUSE   ae
+#define X_MEDIA_SELECT       af
+#define X_MEDIA_EJECT        b0
+#define X_MAIL               b1
+#define X_CALCULATOR         b2
+#define X_MY_COMPUTER        b3
+#define X_WWW_SEARCH         b4
+#define X_WWW_HOME           b5
+#define X_WWW_BACK           b6
+#define X_WWW_FORWARD        b7
+#define X_WWW_STOP           b8
+#define X_WWW_REFRESH        b9
+#define X_WWW_FAVORITES      ba
+#define X_MEDIA_FAST_FORWARD bb
+#define X_MEDIA_REWIND       bc
+#define X_BRIGHTNESS_UP      bd
+#define X_BRIGHTNESS_DOWN    be
+
+/* Mouse Buttons (unallocated range in HID spec) */
+#ifdef VIA_ENABLE
+#define X_MS_UP              f0
+#define X_MS_DOWN            f1
+#define X_MS_LEFT            f2
+#define X_MS_RIGHT           f3
+#define X_MS_BTN1            f4
+#define X_MS_BTN2            f5
+#define X_MS_BTN3            f6
+#define X_MS_BTN4            f7
+#define X_MS_BTN5            f8
+#define X_MS_BTN6            f8
+#define X_MS_BTN7            f8
+#define X_MS_BTN8            f8
+#else
+#define X_MS_UP              ed
+#define X_MS_DOWN            ee
+#define X_MS_LEFT            ef
+#define X_MS_RIGHT           f0
+#define X_MS_BTN1            f1
+#define X_MS_BTN2            f2
+#define X_MS_BTN3            f3
+#define X_MS_BTN4            f4
+#define X_MS_BTN5            f5
+#define X_MS_BTN6            f6
+#define X_MS_BTN7            f7
+#define X_MS_BTN8            f8
+#endif
+#define X_MS_WH_UP           f9
+#define X_MS_WH_DOWN         fa
+#define X_MS_WH_LEFT         fb
+#define X_MS_WH_RIGHT        fc
+#define X_MS_ACCEL0          fd
+#define X_MS_ACCEL1          fe
+#define X_MS_ACCEL2          ff
+
+// Send string macros
+#define STRINGIZE(z) #z
+#define ADD_SLASH_X(y) STRINGIZE(\x##y)
+#define SYMBOL_STR(x) ADD_SLASH_X(x)
+
+#define SS_QMK_PREFIX 1
+
+#define SS_TAP_CODE 1
+#define SS_DOWN_CODE 2
+#define SS_UP_CODE 3
+#define SS_DELAY_CODE 4
+
+#define SS_TAP(keycode) "\1\1" SYMBOL_STR(keycode)
+#define SS_DOWN(keycode) "\1\2" SYMBOL_STR(keycode)
+#define SS_UP(keycode) "\1\3" SYMBOL_STR(keycode)
+#define SS_DELAY(msecs) "\1\4" STRINGIZE(msecs) "|"
+
+// `string` arguments must not be parenthesized
+#define SS_LCTL(string) SS_DOWN(X_LCTL) string SS_UP(X_LCTL)
+#define SS_LSFT(string) SS_DOWN(X_LSFT) string SS_UP(X_LSFT)
+#define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT)
+#define SS_LGUI(string) SS_DOWN(X_LGUI) string SS_UP(X_LGUI)
+#define SS_LCMD(string) SS_LGUI(string)
+#define SS_LWIN(string) SS_LGUI(string)
+
+#define SS_RCTL(string) SS_DOWN(X_RCTL) string SS_UP(X_RCTL)
+#define SS_RSFT(string) SS_DOWN(X_RSFT) string SS_UP(X_RSFT)
+#define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT)
+#define SS_RGUI(string) SS_DOWN(X_RGUI) string SS_UP(X_RGUI)
+#define SS_ALGR(string) SS_RALT(string)
+#define SS_RCMD(string) SS_RGUI(string)
+#define SS_RWIN(string) SS_RGUI(string)
+
+// DEPRECATED
+#define SS_LCTRL(string) SS_LCTL(string)
diff --git a/quantum/send_string_keycodes.h b/quantum/send_string_keycodes.h
deleted file mode 100644
index b35bf66b7b..0000000000
--- a/quantum/send_string_keycodes.h
+++ /dev/null
@@ -1,505 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-
-/* Punctuation */
-#define X_ENT  X_ENTER
-#define X_ESC  X_ESCAPE
-#define X_BSPC X_BACKSPACE
-#define X_SPC  X_SPACE
-#define X_MINS X_MINUS
-#define X_EQL  X_EQUAL
-#define X_LBRC X_LEFT_BRACKET
-#define X_RBRC X_RIGHT_BRACKET
-#define X_BSLS X_BACKSLASH
-#define X_NUHS X_NONUS_HASH
-#define X_SCLN X_SEMICOLON
-#define X_QUOT X_QUOTE
-#define X_GRV  X_GRAVE
-#define X_COMM X_COMMA
-#define X_SLSH X_SLASH
-#define X_NUBS X_NONUS_BACKSLASH
-
-/* Lock Keys */
-#define X_CAPS X_CAPS_LOCK
-#define X_SCRL X_SCROLL_LOCK
-#define X_NUM  X_NUM_LOCK
-#define X_LCAP X_LOCKING_CAPS_LOCK
-#define X_LNUM X_LOCKING_NUM_LOCK
-#define X_LSCR X_LOCKING_SCROLL_LOCK
-
-/* Commands */
-#define X_PSCR X_PRINT_SCREEN
-#define X_PAUS X_PAUSE
-#define X_BRK  X_PAUSE
-#define X_INS  X_INSERT
-#define X_PGUP X_PAGE_UP
-#define X_DEL  X_DELETE
-#define X_PGDN X_PAGE_DOWN
-#define X_RGHT X_RIGHT
-#define X_APP  X_APPLICATION
-#define X_EXEC X_EXECUTE
-#define X_SLCT X_SELECT
-#define X_AGIN X_AGAIN
-#define X_PSTE X_PASTE
-#define X_ERAS X_ALTERNATE_ERASE
-#define X_SYRQ X_SYSTEM_REQUEST
-#define X_CNCL X_CANCEL
-#define X_CLR  X_CLEAR
-#define X_PRIR X_PRIOR
-#define X_RETN X_RETURN
-#define X_SEPR X_SEPARATOR
-#define X_CLAG X_CLEAR_AGAIN
-#define X_CRSL X_CRSEL
-#define X_EXSL X_EXSEL
-
-/* Keypad */
-#define X_PSLS X_KP_SLASH
-#define X_PAST X_KP_ASTERISK
-#define X_PMNS X_KP_MINUS
-#define X_PPLS X_KP_PLUS
-#define X_PENT X_KP_ENTER
-#define X_P1   X_KP_1
-#define X_P2   X_KP_2
-#define X_P3   X_KP_3
-#define X_P4   X_KP_4
-#define X_P5   X_KP_5
-#define X_P6   X_KP_6
-#define X_P7   X_KP_7
-#define X_P8   X_KP_8
-#define X_P9   X_KP_9
-#define X_P0   X_KP_0
-#define X_PDOT X_KP_DOT
-#define X_PEQL X_KP_EQUAL
-#define X_PCMM X_KP_COMMA
-
-/* Language Specific */
-#define X_INT1 X_INTERNATIONAL_1
-#define X_INT2 X_INTERNATIONAL_2
-#define X_INT3 X_INTERNATIONAL_3
-#define X_INT4 X_INTERNATIONAL_4
-#define X_INT5 X_INTERNATIONAL_5
-#define X_INT6 X_INTERNATIONAL_6
-#define X_INT7 X_INTERNATIONAL_7
-#define X_INT8 X_INTERNATIONAL_8
-#define X_INT9 X_INTERNATIONAL_9
-#define X_LNG1 X_LANGUAGE_1
-#define X_LNG2 X_LANGUAGE_2
-#define X_LNG3 X_LANGUAGE_3
-#define X_LNG4 X_LANGUAGE_4
-#define X_LNG5 X_LANGUAGE_5
-#define X_LNG6 X_LANGUAGE_6
-#define X_LNG7 X_LANGUAGE_7
-#define X_LNG8 X_LANGUAGE_8
-#define X_LNG9 X_LANGUAGE_9
-
-/* Modifiers */
-#define X_LCTL X_LEFT_CTRL
-#define X_LSFT X_LEFT_SHIFT
-#define X_LALT X_LEFT_ALT
-#define X_LOPT X_LEFT_ALT
-#define X_LGUI X_LEFT_GUI
-#define X_LCMD X_LEFT_GUI
-#define X_LWIN X_LEFT_GUI
-#define X_RCTL X_RIGHT_CTRL
-#define X_RSFT X_RIGHT_SHIFT
-#define X_RALT X_RIGHT_ALT
-#define X_ALGR X_RIGHT_ALT
-#define X_ROPT X_RIGHT_ALT
-#define X_RGUI X_RIGHT_GUI
-#define X_RCMD X_RIGHT_GUI
-#define X_RWIN X_RIGHT_GUI
-
-/* Generic Desktop Page (0x01) */
-#define X_PWR  X_SYSTEM_POWER
-#define X_SLEP X_SYSTEM_SLEEP
-#define X_WAKE X_SYSTEM_WAKE
-
-/* Consumer Page (0x0C) */
-#define X_MUTE X_AUDIO_MUTE
-#define X_VOLU X_AUDIO_VOL_UP
-#define X_VOLD X_AUDIO_VOL_DOWN
-#define X_MNXT X_MEDIA_NEXT_TRACK
-#define X_MPRV X_MEDIA_PREV_TRACK
-#define X_MSTP X_MEDIA_STOP
-#define X_MPLY X_MEDIA_PLAY_PAUSE
-#define X_MSEL X_MEDIA_SELECT
-#define X_EJCT X_MEDIA_EJECT
-#define X_CALC X_CALCULATOR
-#define X_MYCM X_MY_COMPUTER
-#define X_WSCH X_WWW_SEARCH
-#define X_WHOM X_WWW_HOME
-#define X_WBAK X_WWW_BACK
-#define X_WFWD X_WWW_FORWARD
-#define X_WSTP X_WWW_STOP
-#define X_WREF X_WWW_REFRESH
-#define X_WFAV X_WWW_FAVORITES
-#define X_MFFD X_MEDIA_FAST_FORWARD
-#define X_MRWD X_MEDIA_REWIND
-#define X_BRIU X_BRIGHTNESS_UP
-#define X_BRID X_BRIGHTNESS_DOWN
-
-/* System Specific */
-#define X_BRMU X_PAUSE
-#define X_BRMD X_SCROLL_LOCK
-
-/* Mouse Keys */
-#define X_MS_U X_MS_UP
-#define X_MS_D X_MS_DOWN
-#define X_MS_L X_MS_LEFT
-#define X_MS_R X_MS_RIGHT
-#define X_BTN1 X_MS_BTN1
-#define X_BTN2 X_MS_BTN2
-#define X_BTN3 X_MS_BTN3
-#define X_BTN4 X_MS_BTN4
-#define X_BTN5 X_MS_BTN5
-#define X_BTN6 X_MS_BTN6
-#define X_BTN7 X_MS_BTN7
-#define X_BTN8 X_MS_BTN8
-#define X_WH_U X_MS_WH_UP
-#define X_WH_D X_MS_WH_DOWN
-#define X_WH_L X_MS_WH_LEFT
-#define X_WH_R X_MS_WH_RIGHT
-#define X_ACL0 X_MS_ACCEL0
-#define X_ACL1 X_MS_ACCEL1
-#define X_ACL2 X_MS_ACCEL2
-
-/* Keyboard/Keypad Page (0x07) */
-#define X_A                   04
-#define X_B                   05
-#define X_C                   06
-#define X_D                   07
-#define X_E                   08
-#define X_F                   09
-#define X_G                   0a
-#define X_H                   0b
-#define X_I                   0c
-#define X_J                   0d
-#define X_K                   0e
-#define X_L                   0f
-#define X_M                   10
-#define X_N                   11
-#define X_O                   12
-#define X_P                   13
-#define X_Q                   14
-#define X_R                   15
-#define X_S                   16
-#define X_T                   17
-#define X_U                   18
-#define X_V                   19
-#define X_W                   1a
-#define X_X                   1b
-#define X_Y                   1c
-#define X_Z                   1d
-#define X_1                   1e
-#define X_2                   1f
-#define X_3                   20
-#define X_4                   21
-#define X_5                   22
-#define X_6                   23
-#define X_7                   24
-#define X_8                   25
-#define X_9                   26
-#define X_0                   27
-#define X_ENTER               28
-#define X_ESCAPE              29
-#define X_BACKSPACE           2a
-#define X_TAB                 2b
-#define X_SPACE               2c
-#define X_MINUS               2d
-#define X_EQUAL               2e
-#define X_LEFT_BRACKET        2f
-#define X_RIGHT_BRACKET       30
-#define X_BACKSLASH           31
-#define X_NONUS_HASH          32
-#define X_SEMICOLON           33
-#define X_QUOTE               34
-#define X_GRAVE               35
-#define X_COMMA               36
-#define X_DOT                 37
-#define X_SLASH               38
-#define X_CAPS_LOCK           39
-#define X_F1                  3a
-#define X_F2                  3b
-#define X_F3                  3c
-#define X_F4                  3d
-#define X_F5                  3e
-#define X_F6                  3f
-#define X_F7                  40
-#define X_F8                  41
-#define X_F9                  42
-#define X_F10                 43
-#define X_F11                 44
-#define X_F12                 45
-#define X_PRINT_SCREEN        46
-#define X_SCROLL_LOCK         47
-#define X_PAUSE               48
-#define X_INSERT              49
-#define X_HOME                4a
-#define X_PAGE_UP             4b
-#define X_DELETE              4c
-#define X_END                 4d
-#define X_PAGE_DOWN           4e
-#define X_RIGHT               4f
-#define X_LEFT                50
-#define X_DOWN                51
-#define X_UP                  52
-#define X_NUM_LOCK            53
-#define X_KP_SLASH            54
-#define X_KP_ASTERISK         55
-#define X_KP_MINUS            56
-#define X_KP_PLUS             57
-#define X_KP_ENTER            58
-#define X_KP_1                59
-#define X_KP_2                5a
-#define X_KP_3                5b
-#define X_KP_4                5c
-#define X_KP_5                5d
-#define X_KP_6                5e
-#define X_KP_7                5f
-#define X_KP_8                60
-#define X_KP_9                61
-#define X_KP_0                62
-#define X_KP_DOT              63
-#define X_NONUS_BACKSLASH     64
-#define X_APPLICATION         65
-#define X_KB_POWER            66
-#define X_KP_EQUAL            67
-#define X_F13                 68
-#define X_F14                 69
-#define X_F15                 6a
-#define X_F16                 6b
-#define X_F17                 6c
-#define X_F18                 6d
-#define X_F19                 6e
-#define X_F20                 6f
-#define X_F21                 70
-#define X_F22                 71
-#define X_F23                 72
-#define X_F24                 73
-#define X_EXECUTE             74
-#define X_HELP                75
-#define X_MENU                76
-#define X_SELECT              77
-#define X_STOP                78
-#define X_AGAIN               79
-#define X_UNDO                7a
-#define X_CUT                 7b
-#define X_COPY                7c
-#define X_PASTE               7d
-#define X_FIND                7e
-#define X_KB_MUTE             7f
-#define X_KB_VOLUME_UP        80
-#define X_KB_VOLUME_DOWN      81
-#define X_LOCKING_CAPS_LOCK   82
-#define X_LOCKING_NUM_LOCK    83
-#define X_LOCKING_SCROLL_LOCK 84
-#define X_KP_COMMA           85
-#define X_KP_EQUAL_AS400     86
-#define X_INTERNATIONAL_1    87
-#define X_INTERNATIONAL_2    88
-#define X_INTERNATIONAL_3    89
-#define X_INTERNATIONAL_4    8a
-#define X_INTERNATIONAL_5    8b
-#define X_INTERNATIONAL_6    8c
-#define X_INTERNATIONAL_7    8d
-#define X_INTERNATIONAL_8    8e
-#define X_INTERNATIONAL_9    8f
-#define X_LANGUAGE_1         90
-#define X_LANGUAGE_2         91
-#define X_LANGUAGE_3         92
-#define X_LANGUAGE_4         93
-#define X_LANGUAGE_5         94
-#define X_LANGUAGE_6         95
-#define X_LANGUAGE_7         96
-#define X_LANGUAGE_8         97
-#define X_LANGUAGE_9         98
-#define X_ALTERNATE_ERASE    99
-#define X_SYSTEM_REQUEST     9a
-#define X_CANCEL             9b
-#define X_CLEAR              9c
-#define X_PRIOR              9d
-#define X_RETURN             9e
-#define X_SEPARATOR          9f
-#define X_OUT                a0
-#define X_OPER               a1
-#define X_CLEAR_AGAIN        a2
-#define X_CRSEL              a3
-#define X_EXSEL              a4
-
-/* Modifiers */
-#define X_LEFT_CTRL          e0
-#define X_LEFT_SHIFT         e1
-#define X_LEFT_ALT           e2
-#define X_LEFT_GUI           e3
-#define X_RIGHT_CTRL         e4
-#define X_RIGHT_SHIFT        e5
-#define X_RIGHT_ALT          e6
-#define X_RIGHT_GUI          e7
-
-/* Media and Function keys */
-/* Generic Desktop Page (0x01) */
-#define X_SYSTEM_POWER       a5
-#define X_SYSTEM_SLEEP       a6
-#define X_SYSTEM_WAKE        a7
-
-/* Consumer Page (0x0C) */
-#define X_AUDIO_MUTE         a8
-#define X_AUDIO_VOL_UP       a9
-#define X_AUDIO_VOL_DOWN     aa
-#define X_MEDIA_NEXT_TRACK   ab
-#define X_MEDIA_PREV_TRACK   ac
-#define X_MEDIA_STOP         ad
-#define X_MEDIA_PLAY_PAUSE   ae
-#define X_MEDIA_SELECT       af
-#define X_MEDIA_EJECT        b0
-#define X_MAIL               b1
-#define X_CALCULATOR         b2
-#define X_MY_COMPUTER        b3
-#define X_WWW_SEARCH         b4
-#define X_WWW_HOME           b5
-#define X_WWW_BACK           b6
-#define X_WWW_FORWARD        b7
-#define X_WWW_STOP           b8
-#define X_WWW_REFRESH        b9
-#define X_WWW_FAVORITES      ba
-#define X_MEDIA_FAST_FORWARD bb
-#define X_MEDIA_REWIND       bc
-#define X_BRIGHTNESS_UP      bd
-#define X_BRIGHTNESS_DOWN    be
-
-/* Mouse Buttons (unallocated range in HID spec) */
-#ifdef VIA_ENABLE
-#define X_MS_UP              f0
-#define X_MS_DOWN            f1
-#define X_MS_LEFT            f2
-#define X_MS_RIGHT           f3
-#define X_MS_BTN1            f4
-#define X_MS_BTN2            f5
-#define X_MS_BTN3            f6
-#define X_MS_BTN4            f7
-#define X_MS_BTN5            f8
-#define X_MS_BTN6            f8
-#define X_MS_BTN7            f8
-#define X_MS_BTN8            f8
-#else
-#define X_MS_UP              ed
-#define X_MS_DOWN            ee
-#define X_MS_LEFT            ef
-#define X_MS_RIGHT           f0
-#define X_MS_BTN1            f1
-#define X_MS_BTN2            f2
-#define X_MS_BTN3            f3
-#define X_MS_BTN4            f4
-#define X_MS_BTN5            f5
-#define X_MS_BTN6            f6
-#define X_MS_BTN7            f7
-#define X_MS_BTN8            f8
-#endif
-#define X_MS_WH_UP           f9
-#define X_MS_WH_DOWN         fa
-#define X_MS_WH_LEFT         fb
-#define X_MS_WH_RIGHT        fc
-#define X_MS_ACCEL0          fd
-#define X_MS_ACCEL1          fe
-#define X_MS_ACCEL2          ff
-
-// Send string macros
-#define STRINGIZE(z) #z
-#define ADD_SLASH_X(y) STRINGIZE(\x##y)
-#define SYMBOL_STR(x) ADD_SLASH_X(x)
-
-#define SS_QMK_PREFIX 1
-
-#define SS_TAP_CODE 1
-#define SS_DOWN_CODE 2
-#define SS_UP_CODE 3
-#define SS_DELAY_CODE 4
-
-#define SS_TAP(keycode) "\1\1" SYMBOL_STR(keycode)
-#define SS_DOWN(keycode) "\1\2" SYMBOL_STR(keycode)
-#define SS_UP(keycode) "\1\3" SYMBOL_STR(keycode)
-#define SS_DELAY(msecs) "\1\4" STRINGIZE(msecs) "|"
-
-// `string` arguments must not be parenthesized
-#define SS_LCTL(string) SS_DOWN(X_LCTL) string SS_UP(X_LCTL)
-#define SS_LSFT(string) SS_DOWN(X_LSFT) string SS_UP(X_LSFT)
-#define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT)
-#define SS_LGUI(string) SS_DOWN(X_LGUI) string SS_UP(X_LGUI)
-#define SS_LCMD(string) SS_LGUI(string)
-#define SS_LWIN(string) SS_LGUI(string)
-
-#define SS_RCTL(string) SS_DOWN(X_RCTL) string SS_UP(X_RCTL)
-#define SS_RSFT(string) SS_DOWN(X_RSFT) string SS_UP(X_RSFT)
-#define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT)
-#define SS_RGUI(string) SS_DOWN(X_RGUI) string SS_UP(X_RGUI)
-#define SS_ALGR(string) SS_RALT(string)
-#define SS_RCMD(string) SS_RGUI(string)
-#define SS_RWIN(string) SS_RGUI(string)
-
-// DEPRECATED
-#define X_BSPACE         X_BACKSPACE
-#define X_LBRACKET       X_LEFT_BRACKET
-#define X_RBRACKET       X_RIGHT_BRACKET
-#define X_BSLASH         X_BACKSLASH
-#define X_SCOLON         X_SEMICOLON
-#define X_CAPSLOCK       X_CAPS_LOCK
-#define X_PSCREEN        X_PRINT_SCREEN
-#define X_SCROLLLOCK     X_SCROLL_LOCK
-#define X_PGDOWN         X_PAGE_DOWN
-#define X_NUMLOCK        X_NUM_LOCK
-#define X_NONUS_BSLASH   X_NONUS_BACKSLASH
-#define X_POWER          X_KB_POWER
-#define X__MUTE          X_KB_MUTE
-#define X__VOLUP         X_KB_VOLUME_UP
-#define X__VOLDOWN       X_KB_VOLUME_DOWN
-#define X_LOCKING_CAPS   X_LOCKING_CAPS_LOCK
-#define X_LOCKING_NUM    X_LOCKING_NUM_LOCK
-#define X_LOCKING_SCROLL X_LOCKING_SCROLL_LOCK
-#define X_LANG1          X_LANGUAGE_1
-#define X_LANG2          X_LANGUAGE_2
-#define X_LANG3          X_LANGUAGE_3
-#define X_LANG4          X_LANGUAGE_4
-#define X_LANG5          X_LANGUAGE_5
-#define X_LANG6          X_LANGUAGE_6
-#define X_LANG7          X_LANGUAGE_7
-#define X_LANG8          X_LANGUAGE_8
-#define X_LANG9          X_LANGUAGE_9
-#define X_ALT_ERASE      X_ALTERNATE_ERASE
-#define X_SYSREQ         X_SYSTEM_REQUEST
-
-#define X_LCTRL  X_LEFT_CTRL
-#define X_LSHIFT X_LEFT_SHIFT
-#define X_RCTRL  X_RIGHT_CTRL
-#define X_RSHIFT X_RIGHT_SHIFT
-
-#define X_ZKHK X_GRAVE
-#define X_RO   X_INTERNATIONAL_1
-#define X_KANA X_INTERNATIONAL_2
-#define X_JYEN X_INTERNATIONAL_3
-#define X_HENK X_INTERNATIONAL_4
-#define X_MHEN X_INTERNATIONAL_5
-#define X_HAEN X_LANGUAGE_1
-#define X_HANJ X_LANGUAGE_2
-
-#define X_CLCK X_CAPS_LOCK
-#define X_SLCK X_SCROLL_LOCK
-#define X_NLCK X_NUM_LOCK
-
-#define SS_LCTRL(string) SS_LCTL(string)

From b8e8a20ca64327d0c5276f87a9dddc8e83cee0de Mon Sep 17 00:00:00 2001
From: Marek Wyborski <9861955+mwyborski@users.noreply.github.com>
Date: Sat, 2 Jul 2022 14:12:41 +0200
Subject: [PATCH 069/959] Improve ENCODER_DEFAULT_POS to recognize lost ticks
 (#16932)

---
 quantum/encoder.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/quantum/encoder.c b/quantum/encoder.c
index 105bed0147..5f8a7ce080 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -163,27 +163,38 @@ static bool encoder_update(uint8_t index, uint8_t state) {
     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) {
-        encoder_value[index]++;
-        changed = true;
+#endif
+
+            encoder_value[index]++;
+            changed = true;
 #ifdef ENCODER_MAP_ENABLE
-        encoder_exec_mapping(index, ENCODER_COUNTER_CLOCKWISE);
+            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
-        encoder_value[index]--;
-        changed = true;
+#endif
+            encoder_value[index]--;
+            changed = true;
 #ifdef ENCODER_MAP_ENABLE
-        encoder_exec_mapping(index, ENCODER_CLOCKWISE);
+            encoder_exec_mapping(index, ENCODER_CLOCKWISE);
 #else  // ENCODER_MAP_ENABLE
         encoder_update_kb(index, ENCODER_CLOCKWISE);
 #endif // ENCODER_MAP_ENABLE
-    }
-    encoder_pulses[i] %= resolution;
+        }
+        encoder_pulses[i] %= resolution;
 #ifdef ENCODER_DEFAULT_POS
-    if ((state & 0x3) == ENCODER_DEFAULT_POS) {
         encoder_pulses[i] = 0;
     }
 #endif

From 4aca94d24737a866336b0ecff78b3f80f98d717c Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Sat, 2 Jul 2022 22:31:38 +1000
Subject: [PATCH 070/959] [Keyboard] IDOBAO ID80v3 code rewrite and include
 factory keymap (#17234)

---
 keyboards/idobao/id80/v3/ansi/ansi.c          |  76 +++++
 keyboards/idobao/id80/v3/ansi/ansi.h          |   6 +
 keyboards/idobao/id80/v3/ansi/config.h        |  97 ++++++
 keyboards/idobao/id80/v3/ansi/info.json       | 121 +++++++
 .../id80/v3/ansi/keymaps/default/keymap.c     |  56 ++++
 .../id80/v3/ansi/keymaps/idobao/keymap.c      | 315 ++++++++++++++++++
 .../via => ansi/keymaps/idobao}/rules.mk      |   0
 .../idobao/id80/v3/ansi/keymaps/via/keymap.c  |  90 +++++
 .../idobao/id80/v3/ansi/keymaps/via/rules.mk  |   2 +
 keyboards/idobao/id80/v3/ansi/rules.mk        |   5 +
 keyboards/idobao/id80/v3/config.h             | 131 --------
 keyboards/idobao/id80/v3/info.json            |  96 ------
 .../idobao/id80/v3/keymaps/default/keymap.c   |  36 --
 .../idobao/id80/v3/keymaps/default/readme.md  |   1 -
 keyboards/idobao/id80/v3/keymaps/via/keymap.c |  52 ---
 keyboards/idobao/id80/v3/readme.md            |  31 +-
 keyboards/idobao/id80/v3/rules.mk             |  25 +-
 keyboards/idobao/id80/v3/v3.c                 |  62 ----
 keyboards/idobao/id80/v3/v3.h                 |  37 --
 19 files changed, 790 insertions(+), 449 deletions(-)
 create mode 100644 keyboards/idobao/id80/v3/ansi/ansi.c
 create mode 100644 keyboards/idobao/id80/v3/ansi/ansi.h
 create mode 100644 keyboards/idobao/id80/v3/ansi/config.h
 create mode 100644 keyboards/idobao/id80/v3/ansi/info.json
 create mode 100644 keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
 rename keyboards/idobao/id80/v3/{keymaps/via => ansi/keymaps/idobao}/rules.mk (100%)
 create mode 100644 keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/idobao/id80/v3/ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/idobao/id80/v3/ansi/rules.mk
 delete mode 100644 keyboards/idobao/id80/v3/config.h
 delete mode 100644 keyboards/idobao/id80/v3/info.json
 delete mode 100644 keyboards/idobao/id80/v3/keymaps/default/keymap.c
 delete mode 100644 keyboards/idobao/id80/v3/keymaps/default/readme.md
 delete mode 100644 keyboards/idobao/id80/v3/keymaps/via/keymap.c
 delete mode 100644 keyboards/idobao/id80/v3/v3.c
 delete mode 100644 keyboards/idobao/id80/v3/v3.h

diff --git a/keyboards/idobao/id80/v3/ansi/ansi.c b/keyboards/idobao/id80/v3/ansi/ansi.c
new file mode 100644
index 0000000000..2b298924cf
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/ansi.c
@@ -0,0 +1,76 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "ansi.h"
+
+#define __ NO_LED
+
+#ifdef RGB_MATRIX_ENABLE
+
+/* Per-key LED's
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+ * │79 ││78 │77 │76 │75 ││74 │73 │72 │71 ││70 │69 │68 │67 ││66 ││65 │
+ * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+ * │64 │63 │62 │61 │60 │59 │58 │57 │56 │55 │54 │53 │52 │  51   ││50 │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+ * │ 49  │48 │47 │46 │45 │44 │43 │42 │41 │40 │39 │38 │37 │ 36  ││35 │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+ * │  34  │33 │32 │31 │30 │29 │28 │27 │26 │25 │24 │23 │   22   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+ * │   21   │20 │19 │18 │17 │16 │15 │14 │13 │12 │11 │  10  │┌───┐
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│ 9 │
+ * │  8 │  7 │  6 │            5           │  4  │  3  │┌───┼───┼───┐
+ * └────┴────┴────┴────────────────────────┴─────┴─────┘│ 2 │ 1 │ 0 │
+ *                                                      └───┴───┴───┘
+ * Underglow (as seen from top)
+ * ┌────┬────┬────┬────┬────┬────┐
+ * │ 80 │ 81 │ 82 │ 83 │ 84 │ 85 │
+ * ├────┼────┴────┴────┴────┼────┤
+ * │ 93 │                   │ 86 │
+ * ├────┼────┬────┬────┬────┼────┤
+ * │ 92 │ 91 │ 90 │ 89 │ 88 │ 87 │
+ * └────┴────┴────┴────┴────┴────┘
+ */
+
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    /* Generated with: https://xelus.netlify.app/guides/KLE_to_RGB_parser */
+    {   8,  21,  34,  49,  64,  79,  __,  __,  __,  __,  __ },
+    {   7,  __,  33,  48,  63,  78,  __,  __,  __,  __,  __ },
+    {   6,  20,  32,  47,  62,  77,  __,  __,  35,  50,  65 },
+    {   0,  19,  31,  46,  61,  76,   9,  __,  36,  __,  67 },
+    {   1,  18,  30,  45,  60,  75,  10,  22,  37,  52,  68 },
+    {   2,  17,  29,  44,  59,  74,  11,  23,  38,  53,  69 },
+    {   5,  16,  28,  43,  58,  73,  __,  __,  __,  51,  66 },
+    {   3,  15,  27,  42,  57,  72,  12,  24,  39,  54,  70 },
+    {   4,  14,  26,  41,  56,  71,  13,  25,  40,  55,  __ },
+}, {
+    /* NB: Reversed order */
+    // per-key
+    {224,64 }, {209,64 }, {195,64 },                       {173,61 }, {151,61 },                       { 94,61 },                       { 39,61 }, { 20,61 }, {  2,61 },
+               {209,52 }, {185,49 }, {165,49 }, {151,49 }, {136,49 }, {121,49 }, {106,49 }, { 92,49 }, { 77,49 }, { 62,49 }, { 48,49 }, { 33,49 },            {  9,49 },
+               {196,38 },            {173,38 }, {158,38 }, {143,38 }, {129,38 }, {114,38 }, { 99,38 }, { 84,38 }, { 70,38 }, { 55,38 }, { 40,38 }, { 26,38 }, {  6,38 },
+    {224,26 }, {202,26 }, {184,26 }, {169,26 }, {154,26 }, {140,26 }, {125,26 }, {110,26 }, { 95,26 }, { 81,26 }, { 66,26 }, { 51,26 }, { 37,26 }, { 22,26 }, {  4,26 },
+    {224,15 }, {198,15 }, {176,15 }, {162,15 }, {147,15 }, {132,15 }, {118,15 }, {103,15 }, { 88,15 }, { 73,15 }, { 59,15 }, { 44,15 }, { 29,15 }, { 15,15 }, {  0,15 },
+    {224,0  }, {206,0  }, {187,0  }, {173,0  }, {158,0  }, {143,0  }, {125,0  }, {110,0  }, { 95,0  }, { 81,0  }, { 62,0  }, { 48,0  }, { 33,0  }, { 18,0  }, {  0,0  },
+    // underglow
+    {  0,0  }, { 45,0  }, { 90,0  }, {134,0  }, {179,0  }, {224,0  },
+    {224,32 },
+    {224,64 }, {179,64 }, {134,64 }, { 90,64 }, { 45,64 }, {  0,64 },
+    {  0,32 }
+}, {
+    /* NB: Reversed order */
+    4, 4, 4,       4, 4,       1,       4, 4, 4,
+       4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    4,
+       4,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
+    4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
+    4, 4, 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, 4, 4, 4,
+    //
+    2, 2, 2, 2, 2, 2,
+    2,
+    2, 2, 2, 2, 2, 2,
+    2
+} };
+
+#endif
diff --git a/keyboards/idobao/id80/v3/ansi/ansi.h b/keyboards/idobao/id80/v3/ansi/ansi.h
new file mode 100644
index 0000000000..d9bef6d021
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/ansi.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
new file mode 100644
index 0000000000..1b99fd7908
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/config.h
@@ -0,0 +1,97 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* --------------------------------
+ * Bootmagic Lite key configuration
+ * use the Esc key
+ * -------------------------------- */
+
+#define BOOTMAGIC_LITE_ROW      0
+#define BOOTMAGIC_LITE_COLUMN   5
+
+/* ----------------
+ * RGB Matrix stuff
+ * ---------------- */
+
+#define RGB_DI_PIN E2
+
+// RGB Matrix config
+#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+
+    #define DRIVER_LED_TOTAL 94
+
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
+
+    #define RGB_MATRIX_KEYPRESSES
+
+    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
+    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
+    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
+    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
+
+    /* don't need `#if`, animation modes themselves check defines
+     * #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) */
+    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+    /* #endif  // RGB_MATRIX_FRAMEBUFFER_EFFECTS */
+
+    /* don't need `#if`, animation modes themselves check defines
+     * #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) */
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+    /* #endif  // RGB_MATRIX_KEYPRESSES | RGB_MATRIX_KEYRELEASES */
+#endif  // RGB_MATRIX_ENABLE
+
+/* -----------------------
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ * ----------------------- */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
new file mode 100644
index 0000000000..c7768130e1
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -0,0 +1,121 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "IDOBAO ID80v3",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id80*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0380",
+        "device_version": "3.0.0"
+    },
+    "layouts": {
+        "LAYOUT_80_ansi": {
+            "layout": [
+                { "matrix": [0, 5], "x": 0, "y": 0 },
+                { "matrix": [1, 5], "x": 1.25, "y": 0 },
+                { "matrix": [2, 5], "x": 2.25, "y": 0 },
+                { "matrix": [3, 5], "x": 3.25, "y": 0 },
+                { "matrix": [4, 5], "x": 4.25, "y": 0 },
+                { "matrix": [5, 5], "x": 5.5, "y": 0 },
+                { "matrix": [6, 5], "x": 6.5, "y": 0 },
+                { "matrix": [7, 5], "x": 7.5, "y": 0 },
+                { "matrix": [8, 5], "x": 8.5, "y": 0 },
+                { "matrix": [7, 10], "x": 9.75, "y": 0 },
+                { "matrix": [5, 10], "x": 10.75, "y": 0 },
+                { "matrix": [4, 10], "x": 11.75, "y": 0 },
+                { "matrix": [3, 10], "x": 12.75, "y": 0 },
+                { "matrix": [6, 10], "x": 14, "y": 0 },
+                { "matrix": [2, 10], "x": 15.25, "y": 0 },
+
+                { "matrix": [0, 4], "x": 0, "y": 1.25 },
+                { "matrix": [1, 4], "x": 1, "y": 1.25 },
+                { "matrix": [2, 4], "x": 2, "y": 1.25 },
+                { "matrix": [3, 4], "x": 3, "y": 1.25 },
+                { "matrix": [4, 4], "x": 4, "y": 1.25 },
+                { "matrix": [5, 4], "x": 5, "y": 1.25 },
+                { "matrix": [6, 4], "x": 6, "y": 1.25 },
+                { "matrix": [7, 4], "x": 7, "y": 1.25 },
+                { "matrix": [8, 4], "x": 8, "y": 1.25 },
+                { "matrix": [8, 9], "x": 9, "y": 1.25 },
+                { "matrix": [7, 9], "x": 10, "y": 1.25 },
+                { "matrix": [5, 9], "x": 11, "y": 1.25 },
+                { "matrix": [4, 9], "x": 12, "y": 1.25 },
+                { "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2 },
+                { "matrix": [2, 9], "x": 15.25, "y": 1.25 },
+
+                { "matrix": [0, 3], "x":0, "y":2.25, "w":1.5},
+                { "matrix": [1, 3], "x":1.5, "y":2.25},
+                { "matrix": [2, 3], "x":2.5, "y":2.25},
+                { "matrix": [3, 3], "x":3.5, "y":2.25},
+                { "matrix": [4, 3], "x":4.5, "y":2.25},
+                { "matrix": [5, 3], "x":5.5, "y":2.25},
+                { "matrix": [6, 3], "x":6.5, "y":2.25},
+                { "matrix": [7, 3], "x":7.5, "y":2.25},
+                { "matrix": [8, 3], "x":8.5, "y":2.25},
+                { "matrix": [8, 8], "x":9.5, "y":2.25},
+                { "matrix": [7, 8], "x":10.5, "y":2.25},
+                { "matrix": [5, 8], "x":11.5, "y":2.25},
+                { "matrix": [4, 8], "x":12.5, "y":2.25},
+                { "matrix": [3, 8], "x":13.5, "y":2.25, "w":1.5},
+                { "matrix": [2, 8], "x":15.25, "y":2.25},
+
+                { "matrix": [0, 2], "x":0, "y":3.25, "w":1.75},
+                { "matrix": [1, 2], "x":1.75, "y":3.25},
+                { "matrix": [2, 2], "x":2.75, "y":3.25},
+                { "matrix": [3, 2], "x":3.75, "y":3.25},
+                { "matrix": [4, 2], "x":4.75, "y":3.25},
+                { "matrix": [5, 2], "x":5.75, "y":3.25},
+                { "matrix": [6, 2], "x":6.75, "y":3.25},
+                { "matrix": [7, 2], "x":7.75, "y":3.25},
+                { "matrix": [8, 2], "x":8.75, "y":3.25},
+                { "matrix": [8, 7], "x":9.75, "y":3.25},
+                { "matrix": [7, 7], "x":10.75, "y":3.25},
+                { "matrix": [5, 7], "x":11.75, "y":3.25},
+                { "matrix": [4, 7], "x":12.75, "y":3.25, "w":2.25},
+
+                { "matrix": [0, 1], "x":0, "y":4.25, "w":2.25},
+                { "matrix": [2, 1], "x":2.25, "y":4.25},
+                { "matrix": [3, 1], "x":3.25, "y":4.25},
+                { "matrix": [4, 1], "x":4.25, "y":4.25},
+                { "matrix": [5, 1], "x":5.25, "y":4.25},
+                { "matrix": [6, 1], "x":6.25, "y":4.25},
+                { "matrix": [7, 1], "x":7.25, "y":4.25},
+                { "matrix": [8, 1], "x":8.25, "y":4.25},
+                { "matrix": [8, 6], "x":9.25, "y":4.25},
+                { "matrix": [7, 6], "x":10.25, "y":4.25},
+                { "matrix": [5, 6], "x":11.25, "y":4.25},
+                { "matrix": [4, 6], "x":12.25, "y":4.25, "w":1.75},
+
+                { "matrix": [3, 6], "x":14.25, "y":4.5},
+
+                { "matrix": [0, 0], "x":0, "y":5.25, "w":1.25},
+                { "matrix": [1, 0], "x":1.25, "y":5.25, "w":1.25},
+                { "matrix": [2, 0], "x":2.5, "y":5.25, "w":1.25},
+                { "matrix": [6, 0], "y":5.25, "w":6.25},
+                { "matrix": [8, 0], "x":10, "y":5.25, "w":1.5},
+                { "matrix": [7, 0], "x":11.5, "y":5.25, "w":1.5},
+
+                { "matrix": [5, 0], "x":13.25, "y":5.5},
+                { "matrix": [4, 0], "x":14.25, "y":5.5},
+                { "matrix": [3, 0], "x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..127647c664
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c
@@ -0,0 +1,56 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││Fn1││Ins│
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │`~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │-_ │=+ │Backspc││Hom│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │[{ │]} │ \|  ││Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │;: │'" │ Enter  │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │,< │.> │/? │Shift │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│ ↑ │
+     * │Ctrl│Win │Alt │         Space          │ Alt │Ctrl │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│ ← │ ↓ │ → │
+     *                                                      └───┴───┴───┘
+     */
+    [0] = LAYOUT_80_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,  MO(1),   KC_INS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Rst││   │   │   │   ││   │   │   │   ││   │PSc│SLk│Pau││   ││Mut│
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       ││Vl+│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │     │Tog│   │Mod│Hu+│Hu-│Sa+│Sa-│Br+│Br-│Sp+│Sp-│   │     ││Vl-│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │        │   │   │mod│   │   │NKR│   │   │   │   │      │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│PUp│
+     * │    │    │    │                        │     │     │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│Hom│PDn│End│
+     *                                                      └───┴───┴───┘
+     */
+    [1] = LAYOUT_80_ansi(
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MUTE,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+        _______, RGB_TOG, _______, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, KC_VOLD,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, RGB_RMOD, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______,                    _______,                   _______, _______,                   KC_HOME, KC_PGDN, KC_END
+    )
+};
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
new file mode 100644
index 0000000000..e0d786e5e2
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
@@ -0,0 +1,315 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// Copyright 2022 IDOBAO (@idobaokb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* ------------------------------------------------------------------
+ * This is the IDOBAO factory default keymap ;)
+ * ------------------------------------------------------------------ */
+
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool rgb_disable_perkey:1;
+        bool rgb_disable_underglow:1;
+    };
+} user_config_t;
+
+#endif  // RGB_MATRIX_ENABLE
+
+enum {
+    _BASE = 0,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum {
+    KC_MCON = USER00,  // macOS Open Mission Control
+    KC_LPAD,           // macOS Open Launchpad
+    #ifdef RGB_MATRIX_ENABLE
+    RGB_TPK,           // Toggle Per-Key
+    RGB_TUG,           // Toggle Underglow
+    #endif  // RGB_MATRIX_ENABLE
+    KB_VRSN = USER09   // debug, type version
+};
+
+#ifndef RGB_MATRIX_ENABLE
+    #define RGB_TPK _______
+    #define RGB_TUG _______
+#endif  // RGB_MATRIX_ENABLE
+
+enum macos_consumer_usages {
+    _AC_SHOW_ALL_WINDOWS = 0x29F,  // mapped to KC_MCON
+    _AC_SHOW_ALL_APPS    = 0x2A0   // mapped to KC_LPAD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││Fn1││Ins│
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │`~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │-_ │=+ │Backspc││Hom│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │[{ │]} │ \|  ││Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │;: │'" │ Enter  │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │,< │.> │/? │Shift │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│ ↑ │
+     * │Ctrl│Win │Alt │         Space          │ Alt │Ctrl │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│ ← │ ↓ │ → │
+     *                                                      └───┴───┴───┘
+     */
+    [_BASE] = LAYOUT_80_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,  MO(_FN1), KC_INS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN,  KC_RGHT
+    ),
+
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Rst││   │   │   │   ││   │   │   │   ││   │PSc│SLk│Pau││   ││Mut│
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       ││Vl+│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │     │Tog│   │Mod│Hu+│Hu-│Sa+│Sa-│Br+│Br-│Sp+│Sp-│   │     ││Vl-│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │        │   │   │mod│Ver│   │NKR│   │   │   │   │      │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│PUp│
+     * │    │    │    │                        │     │     │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│Hom│PDn│End│
+     *                                                      └───┴───┴───┘
+     */
+    [_FN1] = LAYOUT_80_ansi(
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MUTE,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+        _______, RGB_TOG, _______, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, KC_VOLD,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, RGB_RMOD, KB_VRSN, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______,                    _______,                   _______, _______,                   KC_HOME, KC_PGDN, KC_END
+    ),
+
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       ││   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│   │
+     * │    │    │    │                        │     │     │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│   │   │   │
+     *                                                      └───┴───┴───┘
+     */
+    [_FN2] = LAYOUT_80_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,                   _______,                   _______, _______,                   _______, _______, _______, _______
+    ),
+
+    [_FN3] = LAYOUT_80_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,                   _______,                   _______, _______,                   _______, _______, _______, _______
+    )
+};
+
+#ifdef RGB_MATRIX_ENABLE
+
+/*
+ * RGB Stuff
+ */
+
+#define ID80_CAPS_LOCK_KEY_INDEX 34  // position of Caps Lock key
+
+#define ID80_CAPS_LOCK_MAX_BRIGHTNESS 0xFF
+#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #undef ID80_CAPS_LOCK_MAX_BRIGHTNESS
+    #define ID80_CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#define ID80_CAPS_LOCK_VAL_STEP 8
+#ifdef RGB_MATRIX_VAL_STEP
+    #undef ID80_CAPS_LOCK_VAL_STEP
+    #define ID80_CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+user_config_t user_config;
+
+void id80_update_rgb_mode(void) {
+    uint8_t flags = LED_FLAG_ALL;
+
+    if (user_config.rgb_disable_perkey  &&  user_config.rgb_disable_underglow) {
+        flags = 0;  // All OFF Condition
+    } else {
+        if (user_config.rgb_disable_perkey) {
+            flags = LED_FLAG_UNDERGLOW | 0xF0;
+        }
+        if (user_config.rgb_disable_underglow) {
+            flags = LED_FLAG_MODIFIER | LED_FLAG_KEYLIGHT | LED_FLAG_INDICATOR | 0xF0;
+        }
+    }
+
+    if (flags == 0) {
+        rgb_matrix_set_flags(0);
+        rgb_matrix_set_color_all(HSV_OFF);
+    } else {
+        rgb_matrix_set_flags(flags);
+        rgb_matrix_enable_noeeprom();
+    }
+
+    eeconfig_update_kb(user_config.raw);  // write back to EEPROM
+}
+
+void id80_get_rgb_mode(void) {
+    user_config.raw = eeconfig_read_kb();  // read config from EEPROM
+    id80_update_rgb_mode();
+}
+
+void keyboard_post_init_user(void) {
+    id80_get_rgb_mode();
+}
+
+void eeconfig_init_user(void) {
+    // EEPROM is getting reset!
+    user_config.raw = 0;
+    id80_update_rgb_mode();
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // Caps Lock key stuff
+
+    if (host_keyboard_led_state().caps_lock) {
+        uint8_t v = rgb_matrix_get_val();
+        if (v < ID80_CAPS_LOCK_VAL_STEP) {
+            v = ID80_CAPS_LOCK_VAL_STEP;
+        } else if (v < (ID80_CAPS_LOCK_MAX_BRIGHTNESS - ID80_CAPS_LOCK_VAL_STEP)) {
+            if (!user_config.rgb_disable_perkey) {
+                v += ID80_CAPS_LOCK_VAL_STEP;  // inc. by one more step than current brightness
+            }  // else leave as current brightness
+        } else {
+            v = ID80_CAPS_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(ID80_CAPS_LOCK_KEY_INDEX, v, v, v);  // white, brightness adjusted
+    } else if (user_config.rgb_disable_perkey) {
+        rgb_matrix_set_color(ID80_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
+    }
+}
+
+#endif  // RGB_MATRIX_ENABLE
+
+/*
+ * Extra keys and RGB Toggle handler
+ */
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        // handle RGB toggle key - this ensures caps lock always works
+        #ifdef RGB_MATRIX_ENABLE
+
+        case QK_BOOT:
+            if (record->event.pressed) {
+                rgb_matrix_set_color_all(RGB_MATRIX_MAXIMUM_BRIGHTNESS, 0, 0);  // All red
+                rgb_matrix_driver.flush();
+            }
+            return true;
+
+        case RGB_TOG:
+            /* roll through the LED modes
+             * |    Level   | Per-key | Underglow |
+             * |------------|---------|-----------|
+             * | 0 (defalt) |   on    |    on     |
+             * |     1      |   OFF   |    on     |
+             * |     2      |   on    |    OFF    |
+             * |     3      |   OFF   |    OFF    |
+             */
+            if (record->event.pressed) {
+                if ( (!user_config.rgb_disable_perkey) && (!user_config.rgb_disable_underglow) ) {
+                    user_config.rgb_disable_perkey = 1;
+                } else if ( user_config.rgb_disable_perkey && (!user_config.rgb_disable_underglow) ) {
+                    user_config.rgb_disable_perkey = 0;
+                    user_config.rgb_disable_underglow = 1;
+                } else if ( (!user_config.rgb_disable_perkey) && user_config.rgb_disable_underglow ) {
+                    user_config.rgb_disable_perkey = 1;
+                } else {
+                    user_config.rgb_disable_perkey = 0;
+                    user_config.rgb_disable_underglow = 0;
+                }
+                id80_update_rgb_mode();
+            }
+            return false;
+
+        case RGB_TPK:
+            if (record->event.pressed) {
+                user_config.rgb_disable_perkey ^= 1;
+                id80_update_rgb_mode();
+            }
+            return false;
+
+        case RGB_TUG:
+            if (record->event.pressed) {
+                user_config.rgb_disable_underglow ^= 1;
+                id80_update_rgb_mode();
+            }
+            return false;
+
+        case EE_CLR:
+            if (!record->event.pressed) {  // on release
+                id80_get_rgb_mode();
+            }
+            return true;  // let this one pass on
+
+        #endif  // RGB_MATRIX_ENABLE
+
+        // print firmware version
+        case KB_VRSN:
+            if (!get_mods()) {
+                if (!record->event.pressed) {
+                    SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " (v" QMK_VERSION ")");
+                }
+            }
+            return false;
+
+        // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353
+        case KC_MCON:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_WINDOWS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        case KC_LPAD:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_APPS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+}
diff --git a/keyboards/idobao/id80/v3/keymaps/via/rules.mk b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/v3/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v3/ansi/keymaps/idobao/rules.mk
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9ca5d285fa
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c
@@ -0,0 +1,90 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││Fn1││Ins│
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │`~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │-_ │=+ │Backspc││Hom│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │[{ │]} │ \|  ││Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │;: │'" │ Enter  │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │,< │.> │/? │Shift │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│ ↑ │
+     * │Ctrl│Win │Alt │         Space          │ Alt │Ctrl │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│ ← │ ↓ │ → │
+     *                                                      └───┴───┴───┘
+     */
+    [0] = LAYOUT_80_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,  MO(1),   KC_INS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Rst││   │   │   │   ││   │   │   │   ││   │PSc│SLk│Pau││   ││Mut│
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       ││Vl+│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │     │Tog│   │Mod│Hu+│Hu-│Sa+│Sa-│Br+│Br-│Sp+│Sp-│   │     ││Vl-│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │        │   │   │mod│   │   │NKR│   │   │   │   │      │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│PUp│
+     * │    │    │    │                        │     │     │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│Hom│PDn│End│
+     *                                                      └───┴───┴───┘
+     */
+    [1] = LAYOUT_80_ansi(
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MUTE,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+        _______, RGB_TOG, _______, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, KC_VOLD,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, RGB_RMOD, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______,                    _______,                   _______, _______,                   KC_HOME, KC_PGDN, KC_END
+    ),
+
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │
+     * ├───┼┴──┬┴──┬┴──┬┴──┬┴┴─┬─┴─┬─┴─┬─┴─┬─┴┴┬──┴┬──┴┬──┴┬──┴┴───┤├───┤
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       ││   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+     * │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│   │
+     * │    │    │    │                        │     │     │┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴─────┴─────┘│   │   │   │
+     *                                                      └───┴───┴───┘
+     */
+    [2] = LAYOUT_80_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,                   _______,                   _______, _______,                   _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_80_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,                   _______,                   _______, _______,                   _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/via/rules.mk b/keyboards/idobao/id80/v3/ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk
new file mode 100644
index 0000000000..eab741fd0a
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/rules.mk
@@ -0,0 +1,5 @@
+# This file intentionally left blank
+# ** settings are data driven & stored in `info.json` **
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id80/v3/config.h b/keyboards/idobao/id80/v3/config.h
deleted file mode 100644
index 4b2fb8d056..0000000000
--- a/keyboards/idobao/id80/v3/config.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
-Copyright 2022 peepeetee
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0080
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID80 v3
-
-
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 11
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- * The matrix description in the vendor-supplied JSON file for kbfirmware.com
- * had 9 columns:
- *     { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
- * and 12 rows:
- *     { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
- * However, the row 6 was completely empty, and the pin F0 was not actually
- * routed anywhere on the PCB, therefore this row was removed to save some
- * resources (the EEPROM space for dynamic keymaps is especially scarce).
- *
- * After doing the above change, the matrix was transposed (rows and columns
- * were swapped), because a matrix with the COL2ROW layout can be scanned much
- * more efficiently than a matrix with the ROW2COL layout (depending on various
- * optimizations, the difference in scan rate can be over 2 times).  Because of
- * this, the "columns" in the matrix layout now mostly correspond to physical
- * rows, and the "rows" have mostly vertical physical orientation.
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B6
-#ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL 96 /* 16 Bottom 80 top*/
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_KEYPRESSES
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only if RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
-
-/* Bootmagic Lite key configuration: use the Esc key */
-#define BOOTMAGIC_LITE_ROW      0
-#define BOOTMAGIC_LITE_COLUMN   5
-
-#define ENCODERS_PAD_A { C7 }
-#define ENCODERS_PAD_B { C6 }
-
-
-
-
diff --git a/keyboards/idobao/id80/v3/info.json b/keyboards/idobao/id80/v3/info.json
deleted file mode 100644
index 0dc8efaf02..0000000000
--- a/keyboards/idobao/id80/v3/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "ID80 v3",
-    "url": "",
-    "maintainer": "qmk",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Fn", "x":14, "y":0},
-                {"label":"Insert", "x":15.25, "y":0},
-
-                {"label":"`", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Home", "x":15.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"\u2191", "x":14.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":13.25, "y":5.5},
-                {"label":"\u2193", "x":14.25, "y":5.5},
-                {"label":"\u2192", "x":15.25, "y":5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id80/v3/keymaps/default/keymap.c b/keyboards/idobao/id80/v3/keymaps/default/keymap.c
deleted file mode 100644
index f7886f1e0e..0000000000
--- a/keyboards/idobao/id80/v3/keymaps/default/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_HOME,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        QK_BOOT,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
-        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
-    ),
-};
-
diff --git a/keyboards/idobao/id80/v3/keymaps/default/readme.md b/keyboards/idobao/id80/v3/keymaps/default/readme.md
deleted file mode 100644
index 8ae9f656cd..0000000000
--- a/keyboards/idobao/id80/v3/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for id80
diff --git a/keyboards/idobao/id80/v3/keymaps/via/keymap.c b/keyboards/idobao/id80/v3/keymaps/via/keymap.c
deleted file mode 100644
index 19787b6b89..0000000000
--- a/keyboards/idobao/id80/v3/keymaps/via/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_HOME,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        QK_BOOT,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
-        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
-    ),
-    [2] = LAYOUT(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
-    ),
-    [3] = LAYOUT(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
-    ),
-};
-
diff --git a/keyboards/idobao/id80/v3/readme.md b/keyboards/idobao/id80/v3/readme.md
index dc6c67b4f4..ad3b9b272c 100644
--- a/keyboards/idobao/id80/v3/readme.md
+++ b/keyboards/idobao/id80/v3/readme.md
@@ -1,27 +1,36 @@
-# ID80v3
+# IDOBAO ID80v3
 
-![ID80v3](https://i.imgur.com/PGvZfQj.jpg)
+![IDOBAO ID80](https://i.imgur.com/977ENjp.png)
 
-A 75% hotswap in-switch RGB keyboard with an encoder.
+A 75% hotswap keyboard from IDOBAO.
 
-* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
-* Hardware Supported: ID80v3
-* Hardware Availability: Not avaliable yet
+## ANSI Support
+
+* Keyboard Maintainer: [Vino Rodrigues](https://github.com/vinorodrigues)
+* Hardware Supported: **IDOBAO ID80v3**
+* Hardware Availability: [IDOBAO.net](https://idobao.net/search?type=product&q=id80*)
+
+## ANSI Layout
+
+![](https://idobao.github.io/kle/idobao-id80.png)
+
+## Compiling and Flashing
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id80/v3:default
+    make idobao/id80/v3/ansi:default
 
 Flashing example for this keyboard:
 
-    make idobao/id80/v3:default:flash
+    make idobao/id80/v3/ansi:default:flash
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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
+* **Bootmagic reset**: Hold down the [Escape] key (the top left key) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `RESET`  if it is available
diff --git a/keyboards/idobao/id80/v3/rules.mk b/keyboards/idobao/id80/v3/rules.mk
index 6805b8f0f9..218fc05539 100644
--- a/keyboards/idobao/id80/v3/rules.mk
+++ b/keyboards/idobao/id80/v3/rules.mk
@@ -1,23 +1,2 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+# Defalt to the ansi version
+DEFAULT_FOLDER = idobao/id80/v3/ansi
diff --git a/keyboards/idobao/id80/v3/v3.c b/keyboards/idobao/id80/v3/v3.c
deleted file mode 100644
index cd05a26a49..0000000000
--- a/keyboards/idobao/id80/v3/v3.c
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// Copyright 2022 Xelus22
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "v3.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    // Key Matrix to LED Index
-    { 8,   9,      34,   35,   64,   65,   NO_LED,   NO_LED, NO_LED, NO_LED,   NO_LED },
-    { 7,   NO_LED, 33,   36,   63,   66,   NO_LED,   NO_LED, NO_LED, NO_LED,   NO_LED },
-    { 6,   10,     32,   37,   62,   67,   NO_LED,   NO_LED, 49,     50,       79 },
-    { 0,   11,     31,   38,   61,   68,   21,       NO_LED, 48,     NO_LED,   77 },
-    { 1,   12,     30,   39,   60,   69,   20,       22,     47,     52,   76 },
-    { 2,   13,     29,   40,   59,   70,   19,       23,     46,     53,   75 },
-    { 5,   14,     28,   41,   58,   71,   NO_LED,   NO_LED, NO_LED, 51,   78 },
-    { 3,   15,     27,   42,   57,   72,   18,       24,     45,     54,   74 },
-    { 4,   16,     26,   43,   56,   73,   17,       25,     44,     55,   NO_LED },
-}, {
-    // LED Index to Physical Position
-{224, 64}, {209, 64}, {195, 64}, {173, 61}, {151, 61}, {94 , 61}, {39 , 61}, {20 , 61}, {2  , 61}, {9  , 50}, {33 , 50},
-{48 , 50}, {62 , 50}, {77 , 50}, {92 , 50}, {106, 50}, {121, 50}, {136, 50}, {151, 50}, {165, 50}, {185, 50}, {209, 53},
-{196, 39}, {173, 39}, {158, 39}, {143, 39}, {129, 39}, {114, 39}, {99 , 39}, {84 , 39}, {70 , 39}, {55 , 39}, {40 , 39},
-{26 , 39}, {6  , 39}, {4  , 28}, {22 , 28}, {37 , 28}, {51 , 28}, {66 , 28}, {81 , 28}, {95 , 28}, {110, 28}, {125, 28},
-{140, 28}, {154, 28}, {169, 28}, {184, 28}, {202, 28}, {224, 28}, {224, 17}, {198, 17}, {176, 17}, {162, 17}, {147, 17},
-{132, 17}, {118, 17}, {103, 17}, {88 , 17}, {73 , 17}, {59 , 17}, {44 , 17}, {29 , 17}, {15 , 17}, {0  , 17}, {0  ,  0},
-{18 ,  0}, {33 ,  0}, {48 ,  0}, {62 ,  0}, {81 ,  0}, {95 ,  0}, {110,  0}, {125,  0}, {143,  0}, {158,  0}, {173,  0},
-{187,  0}, {206,  0}, {224,  0},
-
-{ 207,  13},
-{ 207,  32},
-{ 207,  51},{ 174,  51},{ 141,  51},{ 108,  51},{ 73,  51},{ 40,  51},{  13,  51 },
-{ 13,  32},
-{ 13,  13},{ 40,  13},{ 73,  13},{ 108,  13},{ 141,  13},{ 174,  13},
-
-}, {
-    // LED Index to Flag
-1,1,1,1,1,4,1,1,1,
-1,4,4,4,4,4,4,4,4,4,4,1,1,
-1,4,4,4,4,4,4,4,4,4,4,4,1,
-1,4,4,4,4,4,4,4,4,4,4,4,4,4,1,
-1,1,4,4,4,4,4,4,4,4,4,4,4,4,4,
-1,4,4,4,4,1,1,1,1,4,4,4,4,1,1,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-
-} };
-
-#endif
diff --git a/keyboards/idobao/id80/v3/v3.h b/keyboards/idobao/id80/v3/v3.h
deleted file mode 100644
index 94626fe4f6..0000000000
--- a/keyboards/idobao/id80/v3/v3.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K50,  K51, K52, K53, K54,  K55, K56, K57, K58,  KA7, KA5, KA4, KA3,   KA6,  KA2,  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K98, K97, K95, K94, K96,       K92,  \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K88, K87, K85, K84, K83,     K82,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K78, K77, K75, K74,               \
-    K10,       K12, K13, K14, K15, K16, K17, K18, K68, K67, K65, K64,      K63,       \
-    K00,  K01,  K02,              K06,                K08,   K07,     K05, K04, K03   \
-) { \
-    { K00,   K10,   K20,   K30,   K40,   K50,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K01,   KC_NO, K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, K82,   K92,   KA2   }, \
-    { K03,   K13,   K23,   K33,   K43,   K53,   K63,   KC_NO, K83,   KC_NO, KA3   }, \
-    { K04,   K14,   K24,   K34,   K44,   K54,   K64,   K74,   K84,   K94,   KA4   }, \
-    { K05,   K15,   K25,   K35,   K45,   K55,   K65,   K75,   K85,   K95,   KA5   }, \
-    { K06,   K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, K96,   KA6   }, \
-    { K07,   K17,   K27,   K37,   K47,   K57,   K67,   K77,   K87,   K97,   KA7   }, \
-    { K08,   K18,   K28,   K38,   K48,   K58,   K68,   K78,   K88,   K98,   KC_NO }, \
-}

From 7a5f76d40a8a04af9e16cbaa79d90e93bca9970d Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Sat, 2 Jul 2022 22:32:32 +1000
Subject: [PATCH 071/959] [Keyboard] IDOBAO ID87v2 code rewrite and include
 factory keymap (#17232)

---
 keyboards/idobao/id87/v2/config.h             | 196 ++++--------
 keyboards/idobao/id87/v2/info.json            | 209 ++++++------
 .../idobao/id87/v2/keymaps/default/keymap.c   |  77 +++--
 .../idobao/id87/v2/keymaps/default/readme.md  |   1 -
 .../idobao/id87/v2/keymaps/idobao/config.h    |   4 +
 .../idobao/id87/v2/keymaps/idobao/keymap.c    | 299 ++++++++++++++++++
 .../idobao/id87/v2/keymaps/idobao/rules.mk    |   3 +
 keyboards/idobao/id87/v2/keymaps/via/config.h |   4 +
 keyboards/idobao/id87/v2/keymaps/via/keymap.c | 115 ++++---
 keyboards/idobao/id87/v2/keymaps/via/rules.mk |   1 +
 keyboards/idobao/id87/v2/readme.md            |  28 +-
 keyboards/idobao/id87/v2/rules.mk             |  21 +-
 keyboards/idobao/id87/v2/v2.c                 | 104 ++++--
 keyboards/idobao/id87/v2/v2.h                 |  38 +--
 14 files changed, 711 insertions(+), 389 deletions(-)
 delete mode 100644 keyboards/idobao/id87/v2/keymaps/default/readme.md
 create mode 100644 keyboards/idobao/id87/v2/keymaps/idobao/config.h
 create mode 100644 keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
 create mode 100644 keyboards/idobao/id87/v2/keymaps/idobao/rules.mk
 create mode 100644 keyboards/idobao/id87/v2/keymaps/via/config.h

diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
index f094ef0638..8f1a9ddf03 100644
--- a/keyboards/idobao/id87/v2/config.h
+++ b/keyboards/idobao/id87/v2/config.h
@@ -1,144 +1,78 @@
-// Copyright 2022 peepeetee (@peepeetee)
+// Copyright 2022 vinorodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964   // "id"
-#define PRODUCT_ID      0x0087
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID87
-
-/* key matrix size */
-#define MATRIX_ROWS 11
-#define MATRIX_COLS 9
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-//#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define LED_CAPS_LOCK_PIN C7
-
-//#define BACKLIGHT_PIN B7
-//#define BACKLIGHT_LEVELS 3
-//#define BACKLIGHT_BREATHING
+/* ----------------
+ * RGB Matrix stuff
+ * ---------------- */
 
 #define RGB_DI_PIN E2
-#    define DRIVER_LED_TOTAL 103 /* 16 Bottom 87 top*/
-#ifdef RGB_DI_PIN
-#    define RGBLED_NUM 103 /* 16 Bottom 87 top*/
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#endif
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_KEYPRESSES
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
+
+// RGB Matrix config
+#if defined(RGB_MATRIX_ENABLE)
+
+    #define DRIVER_LED_TOTAL 103
+
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
+
+    #define RGB_MATRIX_KEYPRESSES
+
+    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
+    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
+    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
+    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
+
+    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS -- do not enable */
+    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+    /* RGB_MATRIX_KEYPRESSES | RGB_MATRIX_KEYRELEASES */
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+#endif  // RGB_MATRIX_ENABLE
 
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-#define FORCE_NKRO
-
-/*
+/* -----------------------
  * Feature disable options
  *  These options are also useful to firmware size reduction.
- */
+ * ----------------------- */
 
 /* disable debug print */
 //#define NO_DEBUG
@@ -150,7 +84,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
index e4e252aa64..7292ce29ca 100644
--- a/keyboards/idobao/id87/v2/info.json
+++ b/keyboards/idobao/id87/v2/info.json
@@ -1,97 +1,126 @@
 {
-    "keyboard_name": "ID87",
-    "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit",
-    "maintainer": "qmk",
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID87v2",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false
+    },
+    "debounce": 5,
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID87*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0287",
+        "device_version": "2.0.0"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"LT(1, KC_APP)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [6, 8], "x": 9.5, "y": 0 },
+                { "matrix": [6, 7], "x": 11, "y": 0 },
+                { "matrix": [6, 5], "x": 12, "y": 0 },
+                { "matrix": [6, 4], "x": 13, "y": 0 },
+                { "matrix": [6, 3], "x": 14, "y": 0 },
+                { "matrix": [6, 6], "x": 15.25, "y": 0 },
+                { "matrix": [6, 2], "x": 16.25, "y": 0 },
+                { "matrix": [6, 1], "x": 17.25, "y": 0 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [7, 8], "x": 9, "y": 1.25 },
+                { "matrix": [7, 0], "x": 10, "y": 1.25 },
+                { "matrix": [7, 7], "x": 11, "y": 1.25 },
+                { "matrix": [7, 5], "x": 12, "y": 1.25 },
+                { "matrix": [7, 3], "x": 13, "y": 1.25, "w": 2 },
+                { "matrix": [7, 6], "x": 15.25, "y": 1.25 },
+                { "matrix": [7, 2], "x": 16.25, "y": 1.25 },
+                { "matrix": [7, 1], "x": 17.25, "y": 1.25 },
+
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "matrix": [8, 8], "x": 9.5, "y": 2.25 },
+                { "matrix": [8, 7], "x": 10.5, "y": 2.25 },
+                { "matrix": [8, 5], "x": 11.5, "y": 2.25 },
+                { "matrix": [8, 4], "x": 12.5, "y": 2.25 },
+                { "matrix": [8, 3], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "matrix": [8, 6], "x": 15.25, "y": 2.25 },
+                { "matrix": [8, 2], "x": 16.25, "y": 2.25 },
+                { "matrix": [8, 1], "x": 17.25, "y": 2.25 },
+
+                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 },
+                { "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "matrix": [9, 8], "x": 9.75, "y": 3.25 },
+                { "matrix": [9, 7], "x": 10.75, "y": 3.25 },
+                { "matrix": [9, 5], "x": 11.75, "y": 3.25 },
+                { "matrix": [9, 3], "x": 12.75, "y": 3.25, "w": 2.25 },
+
+                { "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 },
+                { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
+                { "matrix": [4, 3], "x": 3.25, "y": 4.25 },
+                { "matrix": [4, 4], "x": 4.25, "y": 4.25 },
+                { "matrix": [4, 5], "x": 5.25, "y": 4.25 },
+                { "matrix": [4, 6], "x": 6.25, "y": 4.25 },
+                { "matrix": [4, 7], "x": 7.25, "y": 4.25 },
+                { "matrix": [4, 8], "x": 8.25, "y": 4.25 },
+                { "matrix": [10, 8], "x": 9.25, "y": 4.25 },
+                { "matrix": [10, 7], "x": 10.25, "y": 4.25 },
+                { "matrix": [10, 5], "x": 11.25, "y": 4.25 },
+                { "matrix": [10, 4], "x": 12.25, "y": 4.25, "w": 2.75 },
+                { "matrix": [9, 2], "x": 16.25, "y": 4.25 },
+
+                { "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 4], "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 3], "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "matrix": [10, 6], "x": 15.25, "y": 5.25 },
+                { "matrix": [10, 2], "x": 16.25, "y": 5.25 },
+                { "matrix": [10, 1], "x": 17.25, "y": 5.25 }
             ]
         }
     }
diff --git a/keyboards/idobao/id87/v2/keymaps/default/keymap.c b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
index 9465dca531..53690899c1 100644
--- a/keyboards/idobao/id87/v2/keymaps/default/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
@@ -1,35 +1,58 @@
-/*
-Copyright 2020 Tybera
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
+#define LT_1_AP LT(1, KC_APP)  // Tap = Menu, Hold = MO(1)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │     │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Fn1*│Ctrl│ │ ← │ ↓ │ → │  Fn1* => Tap = Menu, Hold = MO(1)
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
     [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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   KC_RGUI,   LT(1, KC_APP),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
-        _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT_1_AP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Rst│   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │Hu+│   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │     │Tog│Mod│   │   │   │   │   │   │   │   │   │   │     │ │St-│Hu-│St+│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │      │   │mod│   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │        │   │   │   │   │   │NRO│   │   │   │   │          │     │Br+│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │    │    │    │                        │    │    │    │    │ │Sp-│Br-│Sp+│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT_tkl_ansi(
+        QK_BOOT,          _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______,
+        _______, RGB_TOG, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI,
+        _______, _______, RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______,  _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,          RGB_VAI,
+        _______, _______, _______,                             _______,                            _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    )
 };
diff --git a/keyboards/idobao/id87/v2/keymaps/default/readme.md b/keyboards/idobao/id87/v2/keymaps/default/readme.md
deleted file mode 100644
index 6054431de4..0000000000
--- a/keyboards/idobao/id87/v2/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for id87
\ No newline at end of file
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/config.h b/keyboards/idobao/id87/v2/keymaps/idobao/config.h
new file mode 100644
index 0000000000..a1612e6e32
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/config.h
@@ -0,0 +1,4 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
new file mode 100644
index 0000000000..59b60b7e1d
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
@@ -0,0 +1,299 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// Copyright 2022 IDOBAO (@idobaokb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* ------------------------------------------------------------------
+ * This is the IDOBAO factory default keymap ;)
+ * ------------------------------------------------------------------ */
+
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool rgb_disable_perkey:1;
+        bool rgb_disable_underglow:1;
+    };
+} user_config_t;
+
+#endif  // RGB_MATRIX_ENABLE
+
+enum {
+    KC_MCON = USER00,  // macOS Open Mission Control
+    KC_LPAD,           // macOS Open Launchpad
+    #ifdef RGB_MATRIX_ENABLE
+    RGB_TPK,           // Toggle Per-Key
+    RGB_TUG,           // Toggle Underglow
+    #endif  // RGB_MATRIX_ENABLE
+    KB_VRSN = USER09   // debug, type version
+};
+
+#ifndef RGB_MATRIX_ENABLE
+    #define RGB_TPK _______
+    #define RGB_TUG _______
+#endif
+
+enum macos_consumer_usages {
+    _AC_SHOW_ALL_WINDOWS = 0x29F,  // mapped to KC_MCON
+    _AC_SHOW_ALL_APPS    = 0x2A0   // mapped to KC_LPAD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │     │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │         space          │ Alt│ GUI│MO(1│Ctrl│ │ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    [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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Rst│   │BR+│BR-│mMC│mLP│ │Br-│Br+│Prv│Ply│ │Nxt│Mut│Vl-│Vl+│ │   │   │   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │Hu+│   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │     │Tog│Mod│   │   │   │   │   │   │   │   │   │   │     │ │St-│Hu-│St+│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │      │   │mod│   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │        │   │   │   │Ver│   │NRO│   │   │   │   │  MO(2)   │     │Br+│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │    │    │    │                        │    │    │    │    │ │Sp-│Br-│Sp+│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    [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, _______, _______, _______,
+        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______,
+        _______, RGB_TOG, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI,
+        _______, _______, RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______,  _______, _______, KB_VRSN, _______, NK_TOGG, _______, _______, _______, _______,          MO(2),            RGB_VAI,
+        _______, _______, _______,                             _______,                            _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │M00│M01│M02│M03│M04│M05│M06│M07│M08│M09│M10│   │   │       │ │   │   │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │     │M11│M12│M13│M14│M15│M16│   │   │   │   │   │   │     │ │   │   │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │        │   │   │   │   │   │   │   │   │   │   │          │     │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │    │    │    │                        │    │    │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT_tkl_ansi(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______,
+        _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+    )
+};
+
+#ifdef RGB_MATRIX_ENABLE
+
+/*
+ * RGB Stuff
+ */
+
+#define ID87_CAPS_LOCK_KEY_INDEX 40  // position of Caps Lock key
+
+#define ID87_CAPS_LOCK_MAX_BRIGHTNESS 0xFF
+#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #undef ID87_CAPS_LOCK_MAX_BRIGHTNESS
+    #define ID87_CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#define ID87_CAPS_LOCK_VAL_STEP 8
+#ifdef RGB_MATRIX_VAL_STEP
+    #undef ID87_CAPS_LOCK_VAL_STEP
+    #define ID87_CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+user_config_t user_config;
+
+void id87_update_rgb_mode(void) {
+    uint8_t flags = LED_FLAG_ALL;
+
+    if (user_config.rgb_disable_perkey  &&  user_config.rgb_disable_underglow) {
+        flags = 0;  // All OFF Condition
+    } else {
+        if (user_config.rgb_disable_perkey) {
+            flags = LED_FLAG_UNDERGLOW | 0xF0;
+        }
+        if (user_config.rgb_disable_underglow) {
+            flags = LED_FLAG_MODIFIER | LED_FLAG_KEYLIGHT | LED_FLAG_INDICATOR | 0xF0;
+        }
+    }
+
+    if (flags == 0) {
+        rgb_matrix_set_flags(0);
+        rgb_matrix_set_color_all(HSV_OFF);
+    } else {
+        rgb_matrix_set_flags(flags);
+        rgb_matrix_enable_noeeprom();
+    }
+
+    eeconfig_update_kb(user_config.raw);  // write back to EEPROM
+}
+
+void id87_get_rgb_mode(void) {
+    user_config.raw = eeconfig_read_kb();  // read config from EEPROM
+    id87_update_rgb_mode();
+}
+
+void keyboard_post_init_user(void) {
+    id87_get_rgb_mode();
+}
+
+void eeconfig_init_user(void) {
+    // EEPROM is getting reset!
+    user_config.raw = 0;
+    id87_update_rgb_mode();
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // Caps Lock key stuff
+
+    if (host_keyboard_led_state().caps_lock) {
+        uint8_t v = rgb_matrix_get_val();
+        if (v < ID87_CAPS_LOCK_VAL_STEP) {
+            v = ID87_CAPS_LOCK_VAL_STEP;
+        } else if (v < (ID87_CAPS_LOCK_MAX_BRIGHTNESS - ID87_CAPS_LOCK_VAL_STEP)) {
+            if (!user_config.rgb_disable_perkey) {
+                v += ID87_CAPS_LOCK_VAL_STEP;  // inc. by one more step than current brightness
+            }  // else leave as current brightness
+        } else {
+            v = ID87_CAPS_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(ID87_CAPS_LOCK_KEY_INDEX, v, v, v);  // white, brightness adjusted
+    } else if (user_config.rgb_disable_perkey) {
+        rgb_matrix_set_color(ID87_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
+    }
+}
+
+#endif  // RGB_MATRIX_ENABLE
+
+/*
+ * Extra keys and RGB Toggle handler
+ */
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        // handle RGB toggle key - this ensures caps lock always works
+        #ifdef RGB_MATRIX_ENABLE
+
+        case QK_BOOT:
+            if (record->event.pressed) {
+                rgb_matrix_set_color_all(RGB_MATRIX_MAXIMUM_BRIGHTNESS, 0, 0);  // All red
+                rgb_matrix_driver.flush();
+            }
+            return true;
+
+        case RGB_TOG:
+            /* roll through the LED modes
+             * |    Level   | Per-key | Underglow |
+             * |------------|---------|-----------|
+             * | 0 (defalt) |   on    |    on     |
+             * |     1      |   OFF   |    on     |
+             * |     2      |   on    |    OFF    |
+             * |     3      |   OFF   |    OFF    |
+             */
+            if (record->event.pressed) {
+                if ( (!user_config.rgb_disable_perkey) && (!user_config.rgb_disable_underglow) ) {
+                    user_config.rgb_disable_perkey = 1;
+                } else if ( user_config.rgb_disable_perkey && (!user_config.rgb_disable_underglow) ) {
+                    user_config.rgb_disable_perkey = 0;
+                    user_config.rgb_disable_underglow = 1;
+                } else if ( (!user_config.rgb_disable_perkey) && user_config.rgb_disable_underglow ) {
+                    user_config.rgb_disable_perkey = 1;
+                } else {
+                    user_config.rgb_disable_perkey = 0;
+                    user_config.rgb_disable_underglow = 0;
+                }
+                id87_update_rgb_mode();
+            }
+            return false;
+
+        case RGB_TPK:
+            if (record->event.pressed) {
+                user_config.rgb_disable_perkey ^= 1;
+                id87_update_rgb_mode();
+            }
+            return false;
+
+        case RGB_TUG:
+            if (record->event.pressed) {
+                user_config.rgb_disable_underglow ^= 1;
+                id87_update_rgb_mode();
+            }
+            return false;
+
+        case EE_CLR:
+            if (!record->event.pressed) {  // on release
+                id87_get_rgb_mode();
+            }
+            return true;  // let this one pass on
+
+        #endif  // RGB_MATRIX_ENABLE
+
+        // print firmware version
+        case KB_VRSN:
+            if (!get_mods()) {
+                if (!record->event.pressed) {
+                    SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " (v" QMK_VERSION ")");
+                }
+            }
+            return false;
+
+        // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353
+        case KC_MCON:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_WINDOWS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        case KC_LPAD:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_APPS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+}
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/rules.mk b/keyboards/idobao/id87/v2/keymaps/idobao/rules.mk
new file mode 100644
index 0000000000..974ef99660
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/rules.mk
@@ -0,0 +1,3 @@
+
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id87/v2/keymaps/via/config.h b/keyboards/idobao/id87/v2/keymaps/via/config.h
new file mode 100644
index 0000000000..a1612e6e32
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/via/config.h
@@ -0,0 +1,4 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/idobao/id87/v2/keymaps/via/keymap.c b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
index e71a924bfd..15e909c7e7 100644
--- a/keyboards/idobao/id87/v2/keymaps/via/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
@@ -1,50 +1,81 @@
-/*
-Copyright 2020 Tybera
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   KC_RGUI,   LT(1, KC_APP),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │     │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│MO(1│Ctrl│ │ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    [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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
+
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Rst│   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │Hu+│   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │     │Tog│Mod│   │   │   │   │   │   │   │   │   │   │     │ │St-│Hu-│St+│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │      │   │mod│   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │        │   │   │   │   │   │NRO│   │   │   │   │  MO(2)   │     │Br+│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │    │    │    │                        │    │    │    │    │ │Sp-│Br-│Sp+│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
     [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
-        _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+        QK_BOOT,          _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______,
+        _______, RGB_TOG, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI,
+        _______, _______, RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______,  _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          MO(2),            RGB_VAI,
+        _______, _______, _______,                             _______,                            _______, KC_APP,  _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
     ),
-	[2] = LAYOUT_tkl_ansi(
-        _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______,  _______, _______
-                ),
-	[3] = LAYOUT_tkl_ansi(
-                _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______,  _______, _______
-                ),
+
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │M00│M01│M02│M03│M04│M05│M06│M07│M08│M09│M10│   │   │       │ │   │   │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │     │M11│M12│M13│M14│M15│M16│   │   │   │   │   │   │     │ │   │   │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │        │   │   │   │   │   │   │   │   │   │   │          │     │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │    │    │    │                        │    │    │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT_tkl_ansi(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______,
+        _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+    )
 };
diff --git a/keyboards/idobao/id87/v2/keymaps/via/rules.mk b/keyboards/idobao/id87/v2/keymaps/via/rules.mk
index ca9fed0e6b..974ef99660 100644
--- a/keyboards/idobao/id87/v2/keymaps/via/rules.mk
+++ b/keyboards/idobao/id87/v2/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
+
 LTO_ENABLE = yes
 VIA_ENABLE = yes
diff --git a/keyboards/idobao/id87/v2/readme.md b/keyboards/idobao/id87/v2/readme.md
index 06a3f2c08a..f689d2175a 100644
--- a/keyboards/idobao/id87/v2/readme.md
+++ b/keyboards/idobao/id87/v2/readme.md
@@ -1,12 +1,24 @@
-# ID87 v2
+# IDOBAO ID87 v2
 
-![ID87 v2](https://i.imgur.com/woTSycN.jpg)
+![IDOBAO ID87](https://i.imgur.com/LIpWjog.png)
 
-A TKL keyboard with hotswap sockets and in switch RGB.
+A TKL hotswap board from IDOBAO.
 
-* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
-* Hardware Supported: ID87 v2
-* Hardware Availability: [Drop](https://drop.com/buy/idobao-id87-v2-tkl-mechanical-keyboard-kit), [idobao](https://idobao.net/products/idobao-id87-v2-tkl-pcb-mounted-hot-swappable-mechanical-keyboard-kit)
+## ANSI Support
+
+* Keyboard Maintainer: [Vino Rodrigues](https://github.com/vinorodrigues)
+* Hardware Supported:
+  - **IDOBAO ID87v2**
+  - **IDOBAO ID87 Crystal**
+  - **IDOBAO ID87 Bestype**
+  - **IDOBAO ID87 Charm** *(Limited Edition)*
+* Hardware Availability: [IDOBAO.net](https://idobao.net/search?type=product&q=ID87*)
+
+## ANSI Layout
+
+![](https://idobao.github.io/kle/idobao-id87.png)
+
+## Compiling & Flashing
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -22,6 +34,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 Enter the bootloader in 3 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Bootmagic reset**: Hold down the [Escape] key *(the top left)* and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `RESET` *(default is [Fn]+[Escape])*
diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk
index 1d519258e3..eab741fd0a 100644
--- a/keyboards/idobao/id87/v2/rules.mk
+++ b/keyboards/idobao/id87/v2/rules.mk
@@ -1,22 +1,5 @@
-# MCU name
-MCU = atmega32u4
+# This file intentionally left blank
+# ** settings are data driven & stored in `info.json` **
 
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE =  no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-
-LAYOUTS = tkl_ansi
diff --git a/keyboards/idobao/id87/v2/v2.c b/keyboards/idobao/id87/v2/v2.c
index 5bca630ca3..34f0a74669 100644
--- a/keyboards/idobao/id87/v2/v2.c
+++ b/keyboards/idobao/id87/v2/v2.c
@@ -1,45 +1,83 @@
-// Copyright 2022 peepeetee (@peepeetee)
+// Copyright 2022 vinorodrigues (@vinorodrigues)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "v2.h"
 
-#ifdef RGB_MATRIX_ENABLE
+#define __ NO_LED
+
+#if defined(RGB_MATRIX_ENABLE)
+
+/* Under-, Per-Key
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ * │102│   │101│100│99 │98 │ │97 │96 │95 │94 │ │93 │92 │91 │90 │ │89 │88 │87 │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+ * │70 │71 │72 │73 │74 │75 │76 │77 │78 │79 │80 │81 │82 │  83   │ │84 │85 │86 │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+ * │  69 │68 │67 │66 │65 │64 │63 │62 │61 │60 │59 │58 │57 │ 56  │ │55 │54 │53 │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │  40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │50 │51 │  52    │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+ * │   39   │38 │37 │36 │35 │34 │33 │32 │31 │30 │29 │    28    │     │27 │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+ * │ 16 │ 17 │ 18 │           19           │ 20 │ 21 │ 22 │ 23 │ │24 │25 │26 │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *
+ * Underglow (as seen from top)
+ * ┌───┬───┬───┬───┬───┬───┬───┐
+ * │14 │13 │12 │11 │10 │ 9 │ 8 │
+ * ├───┼───┴───┴───┴───┴───┼───┤
+ * │15 │                   │ 7 │
+ * ├───┼───┬───┬───┬───┬───┼───┤
+ * │ 0 │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │
+ * └───┴───┴───┴───┴───┴───┴───┘
+*/
 led_config_t g_led_config = { {
     // Key Matrix to LED Index
-    { 102,   NO_LED,   101,   100,   99,   98,   97,   96,   95   }, //0
-    { 70,   71,   72,   73,   74,   75,   76,   77,   78   }, //1
-    { 69,   68,   67,   66,   65,   64,   63,   62,   61   }, //2
-    { 40,   41,   42,   43,   44,   45,   46,   47,   48   }, //3
-    { 39,   NO_LED,   38,   37,   36,   35,   34,   33,   32   }, //4
-    { 16,   17,   18,   23,   22,   NO_LED,   19,   21,   20   }, //5
-    { NO_LED,   87,   88,   90,   91,   92,   89,   93,   94   }, //6
-    { 80,   86,   85,   83,   NO_LED,   82,   84,   81,   79   }, //7
-    { NO_LED,   53,   54,   56,   57,   58,   55,   59,   60   }, //8
-    { NO_LED,   NO_LED,   27,   52,   NO_LED,   51,   NO_LED,   50,   49   }, //9
-    { NO_LED,   26,   25,   NO_LED,   28,   29,   24,   30,   31   } //A
+    // partially generated from: https://xelus.netlify.app/guides/KLE_to_RGB_parser & CSV Excel formula
+
+    { 102, __, 101, 100, 99, 98, 97, 96, 95 },
+    { 70,  71,  72, 73,  74, 75, 76, 77, 78 },
+    { 69,  68,  67, 66,  65, 64, 63, 62, 61 },
+    { 40,  41,  42, 43,  44, 45, 46, 47, 48 },
+    { 39,  __,  38, 37,  36, 35, 34, 33, 32 },
+    { 16,  17,  18, 23,  22, __, 19, 21, 20 },
+    { __,  87,  88, 90,  91, 92, 89, 93, 94 },
+    { 80,  86,  85, 83,  __, 82, 84, 81, 79 },
+    { __,  53,  54, 56,  57, 58, 55, 59, 60 },
+    { __,  __,  27, 52,  __, 51, __, 50, 49 },
+    { __,  26,  25, __,  28, 29, 24, 30, 31 }
 }, {
     // LED Index to Physical Position
-    {  13,  51 },{ 40,  51},{ 73,  51},{ 108,  51},{ 141,  51},{ 174,  51},{ 207,  51},
-    { 207,  32},
-    { 207,  13},{ 174,  13},{ 141,  13},{ 108,  13},{ 73,  13},{ 40,  13},{ 13,  13},
-    { 13,  32},
-
-{   8,  59 }, {  23,  59 }, {  38,  59 }, {  83,  59 }, { 129,  59 }, { 144,  59 }, { 159,  59 }, { 174,  59 }, { 193,  59 }, { 205,  59 }, { 217,  59 },
-{ 205,  49 }, { 165,  49 }, { 142,  49 }, { 130,  49 }, { 118,  49 }, { 106,  49 }, {  94,  49 }, {  82,  49 }, {  70,  49 }, {  58,  49 }, {  46,  49 }, {  34,  49 }, {  14,  49 },
-{  11,  39 }, {  28,  39 }, {  40,  39 }, {  52,  39 }, {  64,  39 }, {  76,  39 }, {  88,  39 }, { 100,  39 }, { 112,  39 }, { 124,  39 }, { 136,  39 }, { 148,  39 }, { 168,  39 },
-{ 217,  30 }, { 205,  30 }, { 193,  30 }, { 172,  30 }, { 157,  30 }, { 145,  30 }, { 133,  30 }, { 121,  30 }, { 109,  30 }, {  97,  30 }, {  85,  30 }, {  73,  30 }, {  61,  30 }, {  49,  30 }, {  37,  30 }, {  25,  30 }, {  10,  30 },
-{   7,  20 }, {  19,  20 }, {  31,  20 }, {  43,  20 }, {  55,  20 }, {  67,  20 }, {  79,  20 }, {  91,  20 }, { 103,  20 }, { 115,  20 }, { 127,  20 }, { 139,  20 }, { 151,  20 }, { 169,  20 }, { 193,  20 }, { 205,  20 }, { 217,  20 },
-{ 217,   5 }, { 205,   5 }, { 193,   5 }, { 175,   5 }, { 163,   5 }, { 151,   5 }, { 139,   5 }, { 121,   5 },  { 109,   5 }, {  97,   5 },  {  85,   5 },  {  67,   5 }, {  55,   5 }, {  43,   5 }, {  31,   5 },{   7,   5 },
+    // generated from: https://xelus.netlify.app/guides/KLE_to_RGB_parser
+    // underglow
+    /* colors are pushed to the edge as only the edges can be seen */
+    {  0,64 }, { 37,64 }, { 75,64 }, {112,64 }, {149,64 }, {187,64 }, {224,64 },
+    {224,32 },
+    {224,0  }, {187,0  }, {149,0  }, {112,0  }, { 75,0  }, { 37,0  }, {  0,0  },
+    {  0,32  },
+    // under-, per-key
+    /* pattern is complex; starts at btm-lft, zig-zags up, and ends top-lft */
+    {  2,64 }, { 18,64 }, { 34,64 }, { 83,64 }, {131,64 }, {148,64 }, {164,64 }, {180,64 }, {198,64 }, {211,64 }, {224,64 },  // lf-2-rt, btm
+    {211,52 }, {170,52 }, {146,52 }, {133,52 }, {120,52 }, {107,52 }, { 94,52 }, { 81,52 }, { 68,52 }, { 55,52 }, { 42,52 }, { 29,52 }, {  8,52 },  // rt-2-lf**
+    {  5,40 }, { 23,40 }, { 36,40 }, { 49,40 }, { 62,40 }, { 75,40 }, { 88,40 }, {101,40 }, {114,40 }, {127,40 }, {140,40 }, {153,40 }, {174,40 },  // lf-2-rt
+    {224,27 }, {211,27 }, {198,27 }, {179,27 }, {162,27 }, {149,27 }, {136,27 }, {123,27 }, {110,27 }, { 97,27 }, { 84,27 }, { 71,27 }, { 58,27 }, { 45,27 }, { 32,27 }, { 19,27 }, {  3,27 },  // rt-2-lf**
+    {  0,15 }, { 13,15 }, { 26,15 }, { 39,15 }, { 52,15 }, { 65,15 }, { 78,15 }, { 91,15 }, {104,15 }, {117,15 }, {130,15 }, {143,15 }, {156,15 }, {175,15 }, {198,15 }, {211,15 }, {224,15 },  // lf-2-rt
+    {224,0  }, {211,0  }, {198,0  }, {182,0  }, {169,0  }, {156,0  }, {143,0  }, {123,0  }, {110,0  }, { 97,0  }, { 84,0  }, { 65,0  }, { 52,0  }, { 39,0  }, { 26,0  }, {  0,0  },  // rt-2-lf**, top
 }, {
     // LED Index to Flag
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-
-1,1,1,4,1,1,1,1,1,1,1,
-1,1,4,4,4,4,4,4,4,4,4,4,1,
-9,4,4,4,4,4,4,4,4,4,4,4,1,
-1,1,1,4,4,4,4,4,4,4,4,4,4,4,4,4,1,
-4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,
-1,9,1,4,4,4,4,1,1,1,1,4,4,4,4,1
+    // underglow
+    2, 2, 2, 2, 2, 2, 2,
+    2,
+    2, 2, 2, 2, 2, 2, 2,
+    2,
+    // under-, per-key
+    1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 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, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 } };
 
-#endif
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id87/v2/v2.h b/keyboards/idobao/id87/v2/v2.h
index 1a75d95755..38b3c9dfda 100644
--- a/keyboards/idobao/id87/v2/v2.h
+++ b/keyboards/idobao/id87/v2/v2.h
@@ -1,40 +1,6 @@
-/*
-Copyright 2020 Tybera
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2022 vinorodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K68,    K67, K65, K64, K63,  K66, K62, K61,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
-    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
-    K50,  K51,  K52,              K56,                K58,  K57,  K54,  K53,    KA6, KA2, KA1   \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   K58   }, \
-    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
-    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
-    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
-    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
-}
-
-

From 882eadd94de2e2c8bde63384a3026524c1ff407c Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Sat, 2 Jul 2022 22:35:37 +1000
Subject: [PATCH 072/959] [Keyboard] IDOBAO ID67 code touch-ups and include
 factory keymap (#17231)

---
 keyboards/idobao/id67/config.h                | 140 +++----
 keyboards/idobao/id67/id67.c                  | 100 ++---
 keyboards/idobao/id67/id67.h                  |  36 +-
 keyboards/idobao/id67/info.json               | 161 +++++----
 .../idobao/id67/keymaps/default/keymap.c      |  50 ++-
 keyboards/idobao/id67/keymaps/idobao/keymap.c | 341 ++++++++++++++++++
 keyboards/idobao/id67/keymaps/idobao/rules.mk |   2 +
 .../idobao/id67/keymaps/thewerther/config.h   |  17 +-
 .../idobao/id67/keymaps/thewerther/keymap.c   |  25 +-
 keyboards/idobao/id67/keymaps/via/keymap.c    |  63 +++-
 .../id67/keymaps/vinorodrigues/config.h       |  22 +-
 .../id67/keymaps/vinorodrigues/keymap.c       |  80 +++-
 .../id67/keymaps/vinorodrigues/rules.mk       |   4 +-
 keyboards/idobao/id67/post_rules.mk           |  10 +-
 keyboards/idobao/id67/readme.md               |  23 +-
 keyboards/idobao/id67/rules.mk                |  16 -
 16 files changed, 703 insertions(+), 387 deletions(-)
 create mode 100644 keyboards/idobao/id67/keymaps/idobao/keymap.c
 create mode 100644 keyboards/idobao/id67/keymaps/idobao/rules.mk

diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h
index f94606c9e7..59e34654b5 100644
--- a/keyboards/idobao/id67/config.h
+++ b/keyboards/idobao/id67/config.h
@@ -1,49 +1,12 @@
-/* Copyright 2021 Tybera
- * Copyright 2021 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Tybera (@tybera)
+// Copyright 2021 Werther (@thewerther)
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0067
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID67
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 }
-
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F0
 
 // RGB Matrix config
@@ -51,60 +14,73 @@
     #ifndef ID67_DISABLE_UNDERGLOW
         #define DRIVER_LED_TOTAL 77
     #else
-        #define DRIVER_LED_TOTAL 67
+        #define DRIVER_LED_TOTAL (77 - 10)
     #endif
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150    // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180    // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
 
     #define RGB_MATRIX_KEYPRESSES
 
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS          // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN     // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT  // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING            // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT             // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL             // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT    // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL    // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT      // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL      // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL            // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT     // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN        // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN         // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL    // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL       // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL         // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON          // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON       // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS    // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS            // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING        // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM         // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE             // Hue shifts up a slight amount and then back down in a wave to the right
+    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
+    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
+    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
+    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
 
-    // don't need `#if`, animation modes themselves check defines
-    // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS -- don't enable */
     // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
     // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-    // #endif // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
 
-    // don't need `#if`, animation modes themselves check defines
-    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE// Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE       // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    /* RGB_MATRIX_KEYPRESSES || RGB_MATRIX_KEYRELEASES */
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH               // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH          // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH         // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
-    // #endif // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-#endif // #if defined(RGB_MATRIX_ENABLE)
+    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+#endif  // RGB_MATRIX_ENABLE
+
+/* -----------------------
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ * ----------------------- */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+// #define NO_ACTION_LAYER
+// #define NO_ACTION_TAPPING
+// #define NO_ACTION_ONESHOT
diff --git a/keyboards/idobao/id67/id67.c b/keyboards/idobao/id67/id67.c
index 155cc74087..17bcd9a943 100644
--- a/keyboards/idobao/id67/id67.c
+++ b/keyboards/idobao/id67/id67.c
@@ -1,19 +1,7 @@
-/* Copyright 2021 Tybera
- * Copyright 2021 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Tybera (@tybera)
+// Copyright 2021 Werther (@thewerther)
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "id67.h"
 
@@ -25,6 +13,23 @@
  * These "LED Index to *" arrays are in that reversed order!
  * i.e., Space row on top, listed right to left */
 led_config_t g_led_config = { {
+    /* Under- / Per-Key
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │66 │65 │64 │63 │62 │61 │60 │59 │58 │57 │56 │55 │54 │  53   │52 │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ 51  │50 │49 │48 │47 │46 │45 │44 │43 │42 │41 │40 │39 │ 38  │37 │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │  36  │35 │34 │33 │32 │31 │30 │29 │28 │27 │26 │25 │   24   │23 │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │   22   │21 │20 │19 │18 │17 │16 │15 │14 │13 │12 │  11  │10 │ 9 │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │  8 │  7 │  6 │            5           │  4 │  3 │ │ 2 │ 1 │ 0 │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     *
+     * Bottom Side (as seen from top orientation)
+     *   67  68  69  70  71
+     *   76  75  74  73  72
+     */
     // Key Matrix to LED Index
     {66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52},
     {51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37},
@@ -34,63 +39,30 @@ led_config_t g_led_config = { {
 }, {
     // LED Index to Physical Position
     // based on: https://gist.github.com/vinorodrigues/07fd735683856b2a06c7c52b9b3878cb
-    {224, 64}, {209, 64}, {194, 64}, {170, 64}, {151, 64},                                  {95, 64},                      {39, 64},           {21, 64}, {2, 64},
-    {224, 48}, {209, 48}, {189, 48}, {168, 48}, {153, 48}, {138, 48}, {123, 48}, {108, 48}, {93, 48},  {78, 48}, {63, 48}, {49, 48}, {34, 48},           {9, 48},
-    {224, 32}, {200, 32},            {175, 32}, {161, 32}, {146, 32}, {131, 32}, {116, 32}, {101, 32}, {86, 32}, {71, 32}, {56, 32}, {41, 32}, {26, 32}, {6, 32},
-    {224, 16}, {205, 16}, {187, 16}, {172, 16}, {157, 16}, {142, 16}, {127, 16}, {112, 16}, {97, 16},  {82, 16}, {67, 16}, {52, 16}, {37, 16}, {22, 16}, {4, 16},
-    {224, 0},  {202, 0},  {179, 0},  {164, 0},  {149, 0},  {134, 0},  {119, 0},  {105, 0},  {90, 0},   {75, 0},  {60, 0},  {45, 0},  {30, 0},  {15, 0},  {0, 0}
-    #ifndef ID67_DISABLE_UNDERGLOW
+    // **NB: In reverse order**
+    {224,64 }, {209,64 }, {194,64 }, {170,64 }, {151,64 },                                  { 95,64 },                       { 39,64 },            { 21,64 }, {  2,64 },
+    {224,48 }, {209,48 }, {189,48 }, {168,48 }, {153,48 }, {138,48 }, {123,48 }, {108,48 }, { 93,48 }, { 78,48 }, { 63,48 }, { 49,48 }, { 34,48 },            {  9,48 },
+    {224,32 }, {200,32 },            {175,32 }, {161,32 }, {146,32 }, {131,32 }, {116,32 }, {101,32 }, { 86,32 }, { 71,32 }, { 56,32 }, { 41,32 }, { 26,32 }, {  6,32 },
+    {224,16 }, {205,16 }, {187,16 }, {172,16 }, {157,16 }, {142,16 }, {127,16 }, {112,16 }, { 97,16 }, { 82,16 }, { 67,16 }, { 52,16 }, { 37,16 }, { 22,16 }, {  4,16 },
+    {224,0  }, {202,0  }, {179,0  }, {164,0  }, {149,0  }, {134,0  }, {119,0  }, {105,0  }, { 90,0  }, { 75,0  }, { 60,0  }, { 45,0  }, { 30,0  }, { 15,0  }, {  0,0  }
     // underglow LEDs
+    #ifndef ID67_DISABLE_UNDERGLOW
     , {0, 0}, {56, 0}, {112, 0}, {168, 0}, {224, 0},
     {224, 64}, {168, 64}, {112, 64}, {56, 64}, {0, 64}
     #endif
 },  {
     // LED Index to Flag
-    4, 4, 4, 1, 1,          4,       1,    1, 1,  // first row
-    1, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,  // second row
+    // **NB: In reverse order**
+    1, 1, 1, 1, 1,          4,       1,    1, 1,  // fifth/bottom row
+    1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,  // fourth row
     1,    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9,  // third row
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,  // fourth row
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4   // fifth row
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,  // second row
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1   // first/top row
     // underglow LEDs
     #ifndef ID67_DISABLE_UNDERGLOW
-    , 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+    , 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2
     #endif
 } };
 
-#endif  // #ifdef RGB_MATRIX_ENABLE
-
-
-/* Use `#define ID67_CAPS_LOCK_KEY_INDEX 36` in `keymaps/yourkeymap/config.h`
- * if you want to enable Caps-Lock LED mode */
-#if defined(RGB_MATRIX_ENABLE) && defined(ID67_CAPS_LOCK_KEY_INDEX)
-
-#define ID67_CAPS_LOCK_MAX_BRIGHTNESS 0xFF
-#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #undef ID67_CAPS_LOCK_MAX_BRIGHTNESS
-    #define ID67_CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#endif
-
-#define ID67_CAPS_LOCK_VAL_STEP 8
-#ifdef RGB_MATRIX_VAL_STEP
-    #undef ID67_CAPS_LOCK_VAL_STEP
-    #define ID67_CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
-#endif
-
-/* This function is defined as weak, so if you create your own in keymap then
- * that will compile, not this */
-__attribute__((weak))
-void rgb_matrix_indicators_user(void) {
-    if (host_keyboard_led_state().caps_lock) {
-        uint8_t b = rgb_matrix_get_val();
-        if (b < ID67_CAPS_LOCK_VAL_STEP) {
-            b = ID67_CAPS_LOCK_VAL_STEP;
-        } else if (b < (ID67_CAPS_LOCK_MAX_BRIGHTNESS - ID67_CAPS_LOCK_VAL_STEP)) {
-            b += ID67_CAPS_LOCK_VAL_STEP;  // one step more than current brightness
-        } else {
-            b = ID67_CAPS_LOCK_MAX_BRIGHTNESS;
-        }
-        rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, b, b, b);  // white, with the adjusted brightness
-    }
-}
-
-#endif // #ifdef ID67_CAPS_LOCK_KEY_INDEX
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/id67.h b/keyboards/idobao/id67/id67.h
index a8eead92a0..cd5ab8de09 100644
--- a/keyboards/idobao/id67/id67.h
+++ b/keyboards/idobao/id67/id67.h
@@ -1,36 +1,8 @@
-/* Copyright 2021 Tybera
- * Copyright 2021 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Tybera (@tybera)
+// Copyright 2021 Werther (@thewerther)
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1E,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2E,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,     K3E,   \
-    K40,  K41,  K43,              K46,                K4A,  K4B,  K4C,  K4D,   K4E    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index 545cd863d8..5d70e19cd8 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -1,84 +1,105 @@
 {
+    "manufacturer": "IDOBAO",
     "keyboard_name": "ID67",
-    "url": "https://idobao.net",
     "maintainer": "thewerther",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": false,
+        "console": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID67*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0267",
+        "device_version": "2.0.0"
     },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B0,C7)", "x":0, "y":0},
-                {"label":"K01 (B0,F6)", "x":1, "y":0},
-                {"label":"K02 (B0,F5)", "x":2, "y":0},
-                {"label":"K03 (B0,F4)", "x":3, "y":0},
-                {"label":"K04 (B0,F1)", "x":4, "y":0},
-                {"label":"K05 (B0,B7)", "x":5, "y":0},
-                {"label":"K06 (B0,D5)", "x":6, "y":0},
-                {"label":"K07 (B0,D1)", "x":7, "y":0},
-                {"label":"K08 (B0,D2)", "x":8, "y":0},
-                {"label":"K09 (B0,D3)", "x":9, "y":0},
-                {"label":"K0A (B0,D4)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D6)", "x":12, "y":0},
-                {"label":"K0D (B0,D7)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,B4)", "x":15, "y":0},
+                { "matrix": [0, 0], "x":0, "y":0 },
+                { "matrix": [0, 1], "x":1, "y":0 },
+                { "matrix": [0, 2], "x":2, "y":0 },
+                { "matrix": [0, 3], "x":3, "y":0 },
+                { "matrix": [0, 4], "x":4, "y":0 },
+                { "matrix": [0, 5], "x":5, "y":0 },
+                { "matrix": [0, 6], "x":6, "y":0 },
+                { "matrix": [0, 7], "x":7, "y":0 },
+                { "matrix": [0, 8], "x":8, "y":0 },
+                { "matrix": [0, 9], "x":9, "y":0 },
+                { "matrix": [0, 10], "x":10, "y":0 },
+                { "matrix": [0, 11], "x":11, "y":0 },
+                { "matrix": [0, 12], "x":12, "y":0 },
+                { "matrix": [0, 13], "x":13, "y":0, "w":2 },
+                { "matrix": [0, 14], "x":15, "y":0 },
 
-                {"label":"K10 (B1,C7)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,F6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,F5)", "x":2.5, "y":1},
-                {"label":"K13 (B1,F4)", "x":3.5, "y":1},
-                {"label":"K14 (B1,F1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,B7)", "x":5.5, "y":1},
-                {"label":"K16 (B1,D5)", "x":6.5, "y":1},
-                {"label":"K17 (B1,D1)", "x":7.5, "y":1},
-                {"label":"K18 (B1,D2)", "x":8.5, "y":1},
-                {"label":"K19 (B1,D3)", "x":9.5, "y":1},
-                {"label":"K1A (B1,D4)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D6)", "x":12.5, "y":1},
-                {"label":"K1D (B1,D7)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,B4)", "x":15, "y":1},
+                { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
+                { "matrix": [1, 1], "x":1.5, "y":1 },
+                { "matrix": [1, 2], "x":2.5, "y":1 },
+                { "matrix": [1, 3], "x":3.5, "y":1 },
+                { "matrix": [1, 4], "x":4.5, "y":1 },
+                { "matrix": [1, 5], "x":5.5, "y":1 },
+                { "matrix": [1, 6], "x":6.5, "y":1 },
+                { "matrix": [1, 7], "x":7.5, "y":1 },
+                { "matrix": [1, 8], "x":8.5, "y":1 },
+                { "matrix": [1, 9], "x":9.5, "y":1 },
+                { "matrix": [1, 10], "x":10.5, "y":1 },
+                { "matrix": [1, 11], "x":11.5, "y":1 },
+                { "matrix": [1, 12], "x":12.5, "y":1 },
+                { "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
+                { "matrix": [1, 14], "x":15, "y":1 },
 
-                {"label":"K20 (B2,C7)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,F6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,F5)", "x":2.75, "y":2},
-                {"label":"K23 (B2,F4)", "x":3.75, "y":2},
-                {"label":"K24 (B2,F1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,B7)", "x":5.75, "y":2},
-                {"label":"K26 (B2,D5)", "x":6.75, "y":2},
-                {"label":"K27 (B2,D1)", "x":7.75, "y":2},
-                {"label":"K28 (B2,D2)", "x":8.75, "y":2},
-                {"label":"K29 (B2,D3)", "x":9.75, "y":2},
-                {"label":"K2A (B2,D4)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D7)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,B4)", "x":15, "y":2},
+                { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
+                { "matrix": [2, 1], "x":1.75, "y":2 },
+                { "matrix": [2, 2], "x":2.75, "y":2 },
+                { "matrix": [2, 3], "x":3.75, "y":2 },
+                { "matrix": [2, 4], "x":4.75, "y":2 },
+                { "matrix": [2, 5], "x":5.75, "y":2 },
+                { "matrix": [2, 6], "x":6.75, "y":2 },
+                { "matrix": [2, 7], "x":7.75, "y":2 },
+                { "matrix": [2, 8], "x":8.75, "y":2 },
+                { "matrix": [2, 9], "x":9.75, "y":2 },
+                { "matrix": [2, 10], "x":10.75, "y":2 },
+                { "matrix": [2, 11], "x":11.75, "y":2 },
+                { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
+                { "matrix": [2, 14], "x":15, "y":2 },
 
-                {"label":"K30 (B3,C7)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,F5)", "x":2.25, "y":3},
-                {"label":"K33 (B3,F4)", "x":3.25, "y":3},
-                {"label":"K34 (B3,F1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,B7)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D5)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D1)", "x":7.25, "y":3},
-                {"label":"K38 (B3,D2)", "x":8.25, "y":3},
-                {"label":"K39 (B3,D3)", "x":9.25, "y":3},
-                {"label":"K3A (B3,D4)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D6)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D7)", "x":14, "y":3},
-                {"label":"K3E (B3,B4)", "x":15, "y":3},
+                { "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
+                { "matrix": [3, 2], "x":2.25, "y":3 },
+                { "matrix": [3, 3], "x":3.25, "y":3 },
+                { "matrix": [3, 4], "x":4.25, "y":3 },
+                { "matrix": [3, 5], "x":5.25, "y":3 },
+                { "matrix": [3, 6], "x":6.25, "y":3 },
+                { "matrix": [3, 7], "x":7.25, "y":3 },
+                { "matrix": [3, 8], "x":8.25, "y":3 },
+                { "matrix": [3, 9], "x":9.25, "y":3 },
+                { "matrix": [3, 10], "x":10.25, "y":3 },
+                { "matrix": [3, 11], "x":11.25, "y":3 },
+                { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
+                { "matrix": [3, 13], "x":14, "y":3 },
+                { "matrix": [3, 14], "x":15, "y":3 },
 
-                {"label":"K40 (F7,C7)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F7,F6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (F7,F4)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F7,D5)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F7,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F7,D6)", "x":13, "y":4},
-                {"label":"K4D (F7,D7)", "x":14, "y":4},
-                {"label":"K4E (F7,B4)", "x":15, "y":4}
+                { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
+                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
+                { "matrix": [4, 3], "x":2.5, "y":4, "w":1.25 },
+                { "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 },
+                { "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
+                { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4, 12], "x":13, "y":4 },
+                { "matrix": [4, 13], "x":14, "y":4 },
+                { "matrix": [4, 14], "x":15, "y":4 }
             ]
         }
     }
diff --git a/keyboards/idobao/id67/keymaps/default/keymap.c b/keyboards/idobao/id67/keymaps/default/keymap.c
index 54b39ad4a7..55e6fd88cd 100644
--- a/keyboards/idobao/id67/keymaps/default/keymap.c
+++ b/keyboards/idobao/id67/keymaps/default/keymap.c
@@ -1,23 +1,22 @@
-/* Copyright 2021 Tybera
- * Copyright 2022 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Tybera (@tybera)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │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│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shft │Up │PDn│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │Ctrl│Win │Alt │                        │Fn1 │Ctrl│ │Lf │Dn │Rt │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
     [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_TILD,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,
@@ -25,12 +24,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
     ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │Tog│Up │Mod│Hu+│Hu-│Sa+│Sa-│Br+│Br-│   │   │   │     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │      │Lf │Dn │Rt │   │   │   │   │   │Ins│Hom│PUp│        │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │        │RST│Sp+│Sp-│   │Vl-│Mut│Vl+│Del│End│PDn│      │   │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
     [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,  _______,          _______,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,      _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,             _______,
-        _______,           QK_BOOT,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______,         _______,
+        _______,         QK_BOOT,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_DEL,  KC_END,  KC_PGDN, _______, _______,         _______,
         _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-
+    )
 };
diff --git a/keyboards/idobao/id67/keymaps/idobao/keymap.c b/keyboards/idobao/id67/keymaps/idobao/keymap.c
new file mode 100644
index 0000000000..55ff6e5730
--- /dev/null
+++ b/keyboards/idobao/id67/keymaps/idobao/keymap.c
@@ -0,0 +1,341 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// Copyright 2022 IDOBAO (@idobaokb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* ------------------------------------------------------------------
+ * This is the IDOBAO factory default keymap ;)
+ * ------------------------------------------------------------------ */
+
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool rgb_disable_perkey:1;
+        #ifndef ID67_DISABLE_UNDERGLOW
+        bool rgb_disable_underglow:1;
+        #endif  // ID67_DISABLE_UNDERGLOW
+    };
+} user_config_t;
+
+#endif  // RGB_MATRIX_ENABLE
+
+enum {
+    KC_MCON = USER00,  // macOS Open Mission Control
+    KC_LPAD,           // macOS Open Launchpad
+    #ifdef RGB_MATRIX_ENABLE
+    RGB_TPK,           // Toggle Per-Key
+    #ifndef ID67_DISABLE_UNDERGLOW
+    RGB_TUG,           // Toggle Underglow
+    #endif  // ID67_DISABLE_UNDERGLOW
+    #endif  //RGB_MATRIX_ENABLE
+    KB_VRSN = USER09   // debug, type version
+};
+
+#ifndef RGB_MATRIX_ENABLE
+    #define RGB_TPK _______
+    #define RGB_TUG _______
+#else
+    #ifdef ID67_DISABLE_UNDERGLOW
+        #define RGB_TUG _______
+    #endif  // ID67_DISABLE_UNDERGLOW
+#endif  // RGB_MATRIX_ENABLE
+
+enum macos_consumer_usages {
+    _AC_SHOW_ALL_WINDOWS = 0x29F,  // mapped to KC_MCON
+    _AC_SHOW_ALL_APPS    = 0x2A0   // mapped to KC_LPAD
+};
+
+/* Special Keys */
+#define SK_LT1C LT(1, KC_CAPS)  // Layer Tap 1, i.e., Tap = Caps Lock, Hold = Layer 1
+#define SK_LT2A LT(2, KC_APP)   // Layer Tap 2, i.e., Tap = Menu, Hold = Layer 2
+
+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│Win │Alt │                        │Fn1 │*Mn*│ │Lf │Dn │Rt │  *Mn* => `LT(2, KC_APP)`
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+    [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_TILD,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,
+        SK_LT1C,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,              KC_PGUP,
+        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     SK_LT2A,   KC_LEFT,   KC_DOWN,    KC_RGHT
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │Tog│Up │Mod│Hu+│Hu-│Sa+│Sa-│Br+│Br-│   │TUG│TPK│     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │      │Lf │Dn │Rt │   │   │   │   │   │Ins│Hom│PUp│        │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │        │RST│Sp+│Sp-│   │Vl-│Mut│Vl+│Del│End│PDn│      │   │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+    [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,  _______,          _______,
+        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, RGB_TUG, RGB_TPK, _______,      _______,
+        KC_CAPS,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,             _______,
+        _______,         QK_BOOT,  RGB_SPI,  RGB_SPD, KB_VRSN, KC_VOLD, KC_MUTE, KC_VOLU, KC_DEL,  KC_END,  KC_PGDN, _______, _______,         _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+	[2] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
+    ),
+
+	[3] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
+    )
+};
+
+#ifdef RGB_MATRIX_ENABLE
+
+/*
+ * RGB Stuff
+ */
+
+#define ID67_CAPS_LOCK_KEY_INDEX 36  // position of Caps Lock key
+
+#define ID67_CAPS_LOCK_MAX_BRIGHTNESS 0xFF
+#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #undef ID67_CAPS_LOCK_MAX_BRIGHTNESS
+    #define ID67_CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#define ID67_CAPS_LOCK_VAL_STEP 8
+#ifdef RGB_MATRIX_VAL_STEP
+    #undef ID67_CAPS_LOCK_VAL_STEP
+    #define ID67_CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+user_config_t user_config;
+
+void id67_update_rgb_mode(void) {
+    uint8_t flags = LED_FLAG_ALL;
+
+    if (user_config.rgb_disable_perkey
+        #ifndef ID67_DISABLE_UNDERGLOW
+        && user_config.rgb_disable_underglow
+        #endif  // ID67_DISABLE_UNDERGLOW
+        ) {
+        flags = 0;  // All OFF Condition
+    } else {
+        if (user_config.rgb_disable_perkey) {
+            #ifndef ID67_DISABLE_UNDERGLOW
+            flags = LED_FLAG_UNDERGLOW | 0xF0;
+            #else
+            flags = 0xF0;
+            #endif  // ID67_DISABLE_UNDERGLOW
+        }
+        #ifndef ID67_DISABLE_UNDERGLOW
+        if (user_config.rgb_disable_underglow) {
+            flags = LED_FLAG_MODIFIER | LED_FLAG_KEYLIGHT | LED_FLAG_INDICATOR | 0xF0;
+        }
+        #endif  // ID67_DISABLE_UNDERGLOW
+    }
+
+    if (flags == 0) {
+        rgb_matrix_set_flags(0);
+        rgb_matrix_set_color_all(HSV_OFF);
+    } else {
+        rgb_matrix_set_flags(flags);
+        rgb_matrix_enable_noeeprom();
+    }
+
+    eeconfig_update_kb(user_config.raw);  // write back to EEPROM
+}
+
+void id67_get_rgb_mode(void) {
+    user_config.raw = eeconfig_read_kb();  // read config from EEPROM
+    id67_update_rgb_mode();
+}
+
+void keyboard_post_init_user(void) {
+    id67_get_rgb_mode();
+}
+
+void eeconfig_init_user(void) {
+    // EEPROM is getting reset!
+    user_config.raw = 0;
+    id67_update_rgb_mode();
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // Caps Lock key stuff
+
+    if (host_keyboard_led_state().caps_lock) {
+        uint8_t v = rgb_matrix_get_val();
+        if (v < ID67_CAPS_LOCK_VAL_STEP) {
+            v = ID67_CAPS_LOCK_VAL_STEP;
+        } else if (v < (ID67_CAPS_LOCK_MAX_BRIGHTNESS - ID67_CAPS_LOCK_VAL_STEP)) {
+            if (!user_config.rgb_disable_perkey) {
+                v += ID67_CAPS_LOCK_VAL_STEP;  // inc. by one more step than current brightness
+            }  // else leave as current brightness
+        } else {
+            v = ID67_CAPS_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v);  // white, brightness adjusted
+    } else if (user_config.rgb_disable_perkey) {
+        rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
+    }
+}
+
+#endif  // RGB_MATRIX_ENABLE
+
+/*
+ * Extra keys and RGB Toggle handler
+ */
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        // handle RGB toggle key - this ensures caps lock always works
+        #ifdef RGB_MATRIX_ENABLE
+
+        case QK_BOOT:
+            if (record->event.pressed) {
+                rgb_matrix_set_color_all(RGB_MATRIX_MAXIMUM_BRIGHTNESS, 0, 0);  // All red
+                rgb_matrix_driver.flush();
+            }
+            return true;
+
+        case RGB_TOG:
+            /* roll through the LED modes
+             * |    Level    | Per-key | Underglow |
+             * |-------------|---------|-----------|
+             * | 0 (default) |   on    |    on     |
+             * |     1       |   OFF   |    on     |
+             * |     2       |   on    |    OFF    |
+             * |     3       |   OFF   |    OFF    |
+             *
+             * for ID67_DISABLE_UNDERGLOW
+             * |    Level    | Per-key |
+             * |-------------|---------|
+             * | 0 (default) |   on    |
+             * |     1       |   OFF   |
+             */
+            if (record->event.pressed) {
+                if ((!user_config.rgb_disable_perkey)
+                    #ifndef ID67_DISABLE_UNDERGLOW
+                    && (!user_config.rgb_disable_underglow)
+                    #endif  // ID67_DISABLE_UNDERGLOW
+                    ) {
+                    user_config.rgb_disable_perkey = 1;
+
+                #ifndef ID67_DISABLE_UNDERGLOW
+
+                } else if (user_config.rgb_disable_perkey && (!user_config.rgb_disable_underglow)) {
+                    user_config.rgb_disable_perkey = 0;
+                    user_config.rgb_disable_underglow = 1;
+
+                } else if ((!user_config.rgb_disable_perkey) && user_config.rgb_disable_underglow) {
+                    user_config.rgb_disable_perkey = 1;
+
+                #endif  // ID67_DISABLE_UNDERGLOW
+
+                } else {
+                    user_config.rgb_disable_perkey = 0;
+                    #ifndef ID67_DISABLE_UNDERGLOW
+                    user_config.rgb_disable_underglow = 0;
+                    #endif  // ID67_DISABLE_UNDERGLOW
+                }
+
+                id67_update_rgb_mode();
+            }
+            return false;
+
+        case RGB_TPK:
+            if (record->event.pressed) {
+                user_config.rgb_disable_perkey ^= 1;
+                id67_update_rgb_mode();
+            }
+            return false;
+
+        #ifndef ID67_DISABLE_UNDERGLOW
+
+        case RGB_TUG:
+            if (record->event.pressed) {
+                user_config.rgb_disable_underglow ^= 1;
+                id67_update_rgb_mode();
+            }
+            return false;
+
+        #endif  // ID67_DISABLE_UNDERGLOW
+
+        case EE_CLR:
+            if (!record->event.pressed) {  // on release
+                id67_get_rgb_mode();
+            }
+            return true;  // let this one pass on
+
+        #endif  // RGB_MATRIX_ENABLE
+
+        // print firmware version
+        case KB_VRSN:
+            if (!get_mods()) {
+                if (!record->event.pressed) {
+                    SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " (v" QMK_VERSION ")");
+                }
+            }
+            return false;
+
+        // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353
+        case KC_MCON:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_WINDOWS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        case KC_LPAD:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_APPS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+}
diff --git a/keyboards/idobao/id67/keymaps/idobao/rules.mk b/keyboards/idobao/id67/keymaps/idobao/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/idobao/id67/keymaps/idobao/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id67/keymaps/thewerther/config.h b/keyboards/idobao/id67/keymaps/thewerther/config.h
index 85498d91b8..4cd526feea 100644
--- a/keyboards/idobao/id67/keymaps/thewerther/config.h
+++ b/keyboards/idobao/id67/keymaps/thewerther/config.h
@@ -1,18 +1,5 @@
-/* Copyright 2021 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Werther (@thewerther)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
diff --git a/keyboards/idobao/id67/keymaps/thewerther/keymap.c b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
index 8af720755f..ef37b210f5 100644
--- a/keyboards/idobao/id67/keymaps/thewerther/keymap.c
+++ b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
@@ -1,19 +1,5 @@
-/* Copyright 2021 Tybera
- * Copyright 2021 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Werther (@thewerther)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
@@ -36,14 +22,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______,
         _______,     RGB_TOG, _______,  RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MPLY, KC_MPRV, KC_MNXT, _______,     _______,
         _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_HOME,
-        _______,           RESET,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,  _______,  _______,  _______,      KC_END,
+        _______,         QK_BOOT,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,  _______,  _______,  _______,      KC_END,
         _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
     )
 
 };
 
 void matrix_scan_user(void) {
-#   if defined(RGB_MATRIX_ENABLE)
+    #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
@@ -52,6 +38,5 @@ void matrix_scan_user(void) {
             rgb_matrix_set_color(i, current_color.r, current_color.g, current_color.b);
         }
     }
-#   endif
+    #endif
 }
-
diff --git a/keyboards/idobao/id67/keymaps/via/keymap.c b/keyboards/idobao/id67/keymaps/via/keymap.c
index ff0bfff745..0014fb3bbf 100644
--- a/keyboards/idobao/id67/keymaps/via/keymap.c
+++ b/keyboards/idobao/id67/keymaps/via/keymap.c
@@ -1,22 +1,22 @@
-/* Copyright 2021 Tybera
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Tybera (@tybera)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │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│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shft │Up │PDn│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │Ctrl│Win │Alt │                        │Fn1 │Ctrl│ │Lf │Dn │Rt │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
     [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_TILD,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,
@@ -24,13 +24,41 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
     ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │Tog│Up │Mod│Hu+│Hu-│Sa+│Sa-│Br+│Br-│   │   │   │     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │      │Lf │Dn │Rt │   │   │   │   │   │Ins│Hom│PUp│        │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │        │RST│Sp+│Sp-│   │Vl-│Mut│Vl+│Del│End│PDn│      │   │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
     [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,  _______,          _______,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,      _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,             _______,
-        _______,            QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______,        _______,
+        _______,         QK_BOOT,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_DEL,  KC_END,  KC_PGDN, _______, _______,         _______,
         _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
     ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
 	[2] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
@@ -38,11 +66,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
         _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
     ),
+
 	[3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
         _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
+    )
 };
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
index 92b3ec0658..f7ada65953 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
@@ -1,26 +1,14 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
  * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
- * Copyright (C) 2022  Vino 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 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
 
-#if defined(RGB_MATRIX_ENABLE)
-    #define VIA_QMK_RGBLIGHT_ENABLE
-    #define ID67_DISABLE_UNDERGLOW  // personal choice, I use a ID67 Bestype
+#ifdef RGB_MATRIX_ENABLE
+    #define ID67_DISABLE_UNDERGLOW
 
     #ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
         #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index c62db2c724..1bf6971730 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -1,19 +1,8 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
  * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
- * Copyright (C) 2022  Vino 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 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
@@ -44,30 +33,85 @@ enum macos_consumer_usages {
 #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(
         KC_GESC,  KC_1,     KC_2,    KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_BSPC,   KC_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_BSLASH, 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_SLCK, \
         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(
-        RESET,    MACRO01,  MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11,   MACRO12, KC_POWER,  KC_F15, \
+        QK_BOOT,  MACRO01,  MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11,   MACRO12, KC_POWER,  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,            DEBUG,     XXXXXXX, \
         XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, MACRO00,   XXXXXXX, \
-        XXXXXXX,  XXXXXXX,           XXXXXXX,                   KC_WAKE,                            XXXXXXX, XXXXXXX,   MACRO13, MACRO14,   MACRO15),
+        XXXXXXX,  XXXXXXX,           XXXXXXX,                   KC_WAKE,                            XXXXXXX, XXXXXXX,   MACRO13, MACRO14,   MACRO15)
 };
 
 #ifdef RGB_MATRIX_ENABLE
@@ -248,12 +292,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case KC_MCON:
             if (record->event.pressed) {
                 host_consumer_send(_AC_SHOW_ALL_WINDOWS);
+            } else {
+                host_consumer_send(0);
             }
             return false;
 
         case KC_LPAD:
             if (record->event.pressed) {
                 host_consumer_send(_AC_SHOW_ALL_APPS);
+            } else {
+                host_consumer_send(0);
             }
             return false;
 
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk b/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
index 24f7bdab9c..cf6371fda0 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
@@ -1,5 +1,3 @@
 LTO_ENABLE = yes
 VIA_ENABLE = yes
-
-KEY_LOCK_ENABLE = no  # Enable KC_LOCK support
-NKRO_ENABLE = no      # N-Key Rollover must be OFF for mac keys to work
+NKRO_ENABLE = no  # N-Key Rollover must be OFF for mac keys to work
diff --git a/keyboards/idobao/id67/post_rules.mk b/keyboards/idobao/id67/post_rules.mk
index 5eecdef4ce..32832a65b2 100644
--- a/keyboards/idobao/id67/post_rules.mk
+++ b/keyboards/idobao/id67/post_rules.mk
@@ -2,13 +2,7 @@
 #  this enables switching off thoes LEDs
 # Usage:  `make idobao/id67:default UNDERGLOW=off`
 
-ifeq ($(findstring off,$(UNDERGLOW)), off)
-  $(info ** UNDERGLOW OFF)
-  OPT_DEFS += -DID67_DISABLE_UNDERGLOW
-else ifeq ($(findstring no,$(UNDERGLOW)), no)
-  $(info ** NO UNDERGLOW)
-  OPT_DEFS += -DID67_DISABLE_UNDERGLOW
-else ifeq ($(findstring 0,$(UNDERGLOW)), 0)
-  $(info ** Nil UNDERGLOW)
+UNDERGLOW ?= yes
+ifneq ($(strip $(UNDERGLOW)), yes)
   OPT_DEFS += -DID67_DISABLE_UNDERGLOW
 endif
diff --git a/keyboards/idobao/id67/readme.md b/keyboards/idobao/id67/readme.md
index b69e2e60b1..c2d59eedeb 100644
--- a/keyboards/idobao/id67/readme.md
+++ b/keyboards/idobao/id67/readme.md
@@ -1,25 +1,32 @@
 # IDOBAO ID67
 
-![id67](https://idobao.github.io/assets/img/idobao-id67.png)
+![id67](https://i.imgur.com/XiEnksS.png)
 
 A 65% hotswap keyboard from IDOBAO.
 
 ## ANSI support:
 
-* Keyboard Maintainer: Tybera *(fmr.)*, [thewerther](https://github.com/thewerther) *(curr.)*
-* Hardware Supported: IDOBAO ID67, ID67V2, ID67 Crystal & ID67 Bestype
-* Hardware Availability: IDOBAO website: 
+* Keyboard Maintainer:
+  - [Tybera](https://github.com/tybera) *(fmr.)*
+  - [Werther](https://github.com/thewerther) *(curr.)*
+  - [Vino Rodrigues](https://github.com/vinorodrigues) *(curr.)*
+* Hardware Supported:
+  - **IDOBAO ID67**
+  - **ID67v2**
+  - **ID67 Crystal**
+  - **ID67 Bestype**
+* Hardware Availability: [IDOBAO.net](https://idobao.net/search?type=product&q=ID67*): 
   * [ID67](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
-  * [ID67V2](https://idobao.net/products/idobao-id67v2-65-hot-swappable-mechanical-keyboard-kit)
+  * [ID67v2](https://idobao.net/products/idobao-id67v2-65-hot-swappable-mechanical-keyboard-kit)
   * [ID67 Crystal](https://idobao.net/products/idobao-id67-crystal-keyboard-kit-gasket-mount-version)
   * [ID67 Bestype](https://idobao.net/products/idobao-id67-bestype-keyboard-kit-aluminum-with-brass-weight)
 
-## Layout
+## ANSI Layout
 
-![ID67 layout](https://idobao.github.io/kle/idobao-id67.png)
+![ID67 Layout](https://idobao.github.io/kle/idobao-id67.png)
 
 
-## Compiling and flashing
+## Compiling and Flashing
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk
index 729e1ca67c..ce58b87be5 100644
--- a/keyboards/idobao/id67/rules.mk
+++ b/keyboards/idobao/id67/rules.mk
@@ -1,21 +1,5 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature
 RGB_MATRIX_DRIVER = WS2812 	# ID67 uses WS2812 driver
-LAYOUTS = 65_ansi_blocker

From 0c74892e9080e17db637a31d421f920862baaaef Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 2 Jul 2022 06:58:40 -0700
Subject: [PATCH 073/959] [Keyboard] Update Charybdis code for Extended Mouse
 reports (#17435)

---
 keyboards/bastardkb/charybdis/charybdis.c     | 51 +++++++++++++++++--
 keyboards/bastardkb/charybdis/post_config.h   |  5 ++
 keyboards/bastardkb/charybdis/readme.md       | 20 ++++++++
 .../tractyl_manuform/tractyl_manuform.c       |  5 +-
 4 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c
index f94682ba41..29603042b2 100644
--- a/keyboards/bastardkb/charybdis/charybdis.c
+++ b/keyboards/bastardkb/charybdis/charybdis.c
@@ -18,6 +18,8 @@
  */
 
 #include "charybdis.h"
+#include "transactions.h"
+#include <string.h>
 
 #ifdef CONSOLE_ENABLE
 #    include "print.h"
@@ -160,10 +162,8 @@ void charybdis_set_pointer_dragscroll_enabled(bool enable) {
     maybe_update_pointing_device_cpi(&g_charybdis_config);
 }
 
-void pointing_device_init_kb(void) { maybe_update_pointing_device_cpi(&g_charybdis_config); }
-
 #    ifndef CONSTRAIN_HID
-#        define CONSTRAIN_HID(value) ((value) < -127 ? -127 : ((value) > 127 ? 127 : (value)))
+#        define CONSTRAIN_HID(value) ((value) < XY_REPORT_MIN ? XY_REPORT_MIN : ((value) > XY_REPORT_MAX ? XY_REPORT_MAX : (value)))
 #    endif  // !CONSTRAIN_HID
 
 /**
@@ -340,4 +340,49 @@ void matrix_init_kb(void) {
     read_charybdis_config_from_eeprom(&g_charybdis_config);
     matrix_init_user();
 }
+
+#    ifdef CHARYBDIS_CONFIG_SYNC
+void charybdis_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
+    if (initiator2target_buffer_size == sizeof(g_charybdis_config)) {
+        memcpy(&g_charybdis_config, initiator2target_buffer, sizeof(g_charybdis_config));
+    }
+}
+#    endif
+
+void keyboard_post_init_kb(void) {
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
+#    ifdef CHARYBDIS_CONFIG_SYNC
+    transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, charybdis_config_sync_handler);
+#    endif
+    keyboard_post_init_user();
+}
+
+#    ifdef CHARYBDIS_CONFIG_SYNC
+void housekeeping_task_kb(void) {
+    if (is_keyboard_master()) {
+        // Keep track of the last state, so that we can tell if we need to propagate to slave
+        static charybdis_config_t last_charybdis_config = {0};
+        static uint32_t           last_sync             = 0;
+        bool                      needs_sync            = false;
+
+        // Check if the state values are different
+        if (memcmp(&g_charybdis_config, &last_charybdis_config, sizeof(g_charybdis_config))) {
+            needs_sync = true;
+            memcpy(&last_charybdis_config, &g_charybdis_config, sizeof(g_charybdis_config));
+        }
+        // Send to slave every 500ms regardless of state change
+        if (timer_elapsed32(last_sync) > 500) {
+            needs_sync = true;
+        }
+
+        // Perform the sync if requested
+        if (needs_sync) {
+            if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(g_charybdis_config), &g_charybdis_config)) {
+                last_sync = timer_read32();
+            }
+        }
+    }
+    // no need for user function, is called already
+}
+#    endif // CHARYBDIS_CONFIG_SYNC
 #endif  // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/charybdis/post_config.h b/keyboards/bastardkb/charybdis/post_config.h
index 540751f6c6..b769722b64 100644
--- a/keyboards/bastardkb/charybdis/post_config.h
+++ b/keyboards/bastardkb/charybdis/post_config.h
@@ -20,6 +20,11 @@
 
 #pragma once
 
+// Enable syncing of charybdis config
+#ifdef CHARYBDIS_CONFIG_SYNC
+#    define SPLIT_TRANSACTION_IDS_KB RPC_ID_KB_CONFIG_SYNC
+#endif
+
 /* Mouse config. */
 
 #ifndef MOUSEKEY_MOVE_DELTA
diff --git a/keyboards/bastardkb/charybdis/readme.md b/keyboards/bastardkb/charybdis/readme.md
index 461f33117c..d786abf36e 100644
--- a/keyboards/bastardkb/charybdis/readme.md
+++ b/keyboards/bastardkb/charybdis/readme.md
@@ -176,3 +176,23 @@ To disable the custom keycodes, and reduce binary size, simply add a definition
 ```c
 #define NO_CHARYBDIS_KEYCODES
 ```
+
+### Configuration Syncing
+
+If you want/need to enable syncing of the charybdis config, such as to read the sniping or drag scroll modes on the other half (such as for displaying the status via rgb matrix, or added on screens, or what not), you can enabled this.  To do so, add this to your `config.h`: 
+
+```c
+#define CHARYBDIS_CONFIG_SYNC
+```
+
+Note that you will need to reflash both sides when enabling this. 
+
+### Enable Large Mouse Reports
+
+By default, the X and Y motion for the pointing device/mouse reports is -127 to 127.  You can definitely hit the limit for that with the sensors.  You can enable support for -32767 to 32767 by adding this to your `config.h`:
+
+```c
+#define MOUSE_EXTENDED_REPORT
+```
+
+Note that you will need to reflash both sides when enabling this.
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index 0ae49b6397..c68234d8d8 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -159,10 +159,8 @@ void charybdis_set_pointer_dragscroll_enabled(bool enable) {
     maybe_update_pointing_device_cpi(&g_charybdis_config);
 }
 
-void pointing_device_init_kb(void) { maybe_update_pointing_device_cpi(&g_charybdis_config); }
-
 #    ifndef CONSTRAIN_HID
-#        define CONSTRAIN_HID(value) ((value) < -127 ? -127 : ((value) > 127 ? 127 : (value)))
+#        define CONSTRAIN_HID(value) ((value) < XY_REPORT_MIN ? XY_REPORT_MIN : ((value) > XY_REPORT_MAX ? XY_REPORT_MAX : (value)))
 #    endif  // !CONSTRAIN_HID
 
 /**
@@ -339,6 +337,7 @@ void charybdis_config_sync_handler(uint8_t initiator2target_buffer_size, const v
 }
 
 void keyboard_post_init_kb(void) {
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
     transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, charybdis_config_sync_handler);
 
     keyboard_post_init_user();

From ac5e6b6a3bfad12ab7d9786a18fcc90f8bf4caf7 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 3 Jul 2022 00:12:45 +1000
Subject: [PATCH 074/959] Tentative Teensy 3.5 support (#14420)

* Tentative Teensy 3.5 support

* Set firmware format to .hex for ARM Teensys

* Got to "device descriptor failed" by comparing with Teensy 3.6 code

* Drop down to 96MHz...

* Bump back up to 120MHz
---
 builddefs/bootloader.mk                       |  4 +-
 builddefs/mcu_selection.mk                    | 27 ++++++++++
 data/schemas/keyboard.jsonschema              |  2 +-
 docs/compatible_microcontrollers.md           |  2 +
 keyboards/handwired/onekey/teensy_35/chconf.h | 28 +++++++++++
 keyboards/handwired/onekey/teensy_35/config.h | 32 ++++++++++++
 .../handwired/onekey/teensy_35/halconf.h      | 28 +++++++++++
 .../handwired/onekey/teensy_35/mcuconf.h      | 50 +++++++++++++++++++
 keyboards/handwired/onekey/teensy_35/rules.mk |  8 +++
 lib/python/qmk/constants.py                   |  2 +-
 platforms/chibios/chibios_config.h            |  2 +-
 11 files changed, 180 insertions(+), 5 deletions(-)
 create mode 100644 keyboards/handwired/onekey/teensy_35/chconf.h
 create mode 100644 keyboards/handwired/onekey/teensy_35/config.h
 create mode 100644 keyboards/handwired/onekey/teensy_35/halconf.h
 create mode 100644 keyboards/handwired/onekey/teensy_35/mcuconf.h
 create mode 100644 keyboards/handwired/onekey/teensy_35/rules.mk

diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 3d4c03b01c..51e9b7d558 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -105,8 +105,8 @@ ifeq ($(strip $(BOOTLOADER)), halfkay)
     ifeq ($(strip $(MCU)), at90usb1286)
         BOOTLOADER_SIZE = 1024
     endif
-    # Teensy LC, 3.x
-    ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK66FX1M0))
+    # Teensy LC, 3.0, 3.1/2, 3.5, 3.6
+    ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK64FX512 MK66FX1M0))
         FIRMWARE_FORMAT = hex
     endif
 endif
diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index 135f663c14..7528aa6842 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -87,6 +87,33 @@ ifneq ($(findstring MK20DX256, $(MCU)),)
   BOARD ?= PJRC_TEENSY_3_1
 endif
 
+ifneq ($(findstring MK64FX512, $(MCU)),)
+  # Cortex version
+  MCU = cortex-m4
+
+  # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
+  ARMV = 7
+
+  ## chip/board settings
+  # - the next two should match the directories in
+  #   <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
+  MCU_FAMILY = KINETIS
+  MCU_SERIES = K60x
+
+  # Linker script to use
+  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+  #   or <keyboard_dir>/ld/
+  MCU_LDSCRIPT ?= MK64FX512
+
+  # Startup code to use
+  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
+  MCU_STARTUP ?= k60x
+
+  # Board: it should exist either in <chibios>/os/hal/boards/,
+  # <keyboard_dir>/boards/, or drivers/boards/
+  BOARD ?= PJRC_TEENSY_3_5
+endif
+
 ifneq ($(findstring MK66FX1M0, $(MCU)),)
   # Cortex version
   MCU = cortex-m4
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 8aca807e38..320974f0c4 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -42,7 +42,7 @@
         },
         "processor": {
             "type": "string",
-            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66FX1M0", "RP2040", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "WB32FQ95", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
+            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK64FX512", "MK66FX1M0", "RP2040", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "WB32FQ95", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
         },
         "audio": {
             "type": "object",
diff --git a/docs/compatible_microcontrollers.md b/docs/compatible_microcontrollers.md
index a594fe0620..cc9c0b7f92 100644
--- a/docs/compatible_microcontrollers.md
+++ b/docs/compatible_microcontrollers.md
@@ -62,6 +62,8 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s
  * [MK20DX128](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k2x-usb/kinetis-k20-50-mhz-full-speed-usb-mixed-signal-integration-microcontrollers-based-on-arm-cortex-m4-core:K20_50)
  * [MK20DX256](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k2x-usb/kinetis-k20-72-mhz-full-speed-usb-mixed-signal-integration-microcontrollers-mcus-based-on-arm-cortex-m4-core:K20_72)
    * PJRC Teensy 3.2
+ * [MK64FX512](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k6x-ethernet/kinetis-k64-120-mhz-256-kb-sram-microcontrollers-mcus-based-on-arm-cortex-m4-core:K64_120)
+   * PJRC Teensy 3.5
  * [MK66FX1M0](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k6x-ethernet/kinetis-k66-180-mhz-dual-high-speed-full-speed-usbs-2mb-flash-microcontrollers-mcus-based-on-arm-cortex-m4-core:K66_180)
    * PJRC Teensy 3.6
 
diff --git a/keyboards/handwired/onekey/teensy_35/chconf.h b/keyboards/handwired/onekey/teensy_35/chconf.h
new file mode 100644
index 0000000000..ee8312c526
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_35/chconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/teensy_35/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_TIME_QUANTUM 20
+
+#include_next <chconf.h>
diff --git a/keyboards/handwired/onekey/teensy_35/config.h b/keyboards/handwired/onekey/teensy_35/config.h
new file mode 100644
index 0000000000..a5f2c945c4
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_35/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2019
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// TODO: including this causes "error: expected identifier before '(' token" errors
+//#include "config_common.h"
+
+#define PRODUCT Onekey Teensy 3.5
+
+#define MATRIX_COL_PINS { D5 } // 20/A6
+#define MATRIX_ROW_PINS { B2 } // 19/A5
+#define UNUSED_PINS
+
+// i2c_master defines
+#define I2C1_SCL_PIN B0 // 16/A2 on pinout
+#define I2C1_SDA_PIN B1 // 17/A3 on pinout
+#define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
+#define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
diff --git a/keyboards/handwired/onekey/teensy_35/halconf.h b/keyboards/handwired/onekey/teensy_35/halconf.h
new file mode 100644
index 0000000000..6ac756d0f2
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_35/halconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/teensy_35/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/teensy_35/mcuconf.h b/keyboards/handwired/onekey/teensy_35/mcuconf.h
new file mode 100644
index 0000000000..dc508eee7d
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_35/mcuconf.h
@@ -0,0 +1,50 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+#define K60x_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+
+/* Select the MCU clocking mode below by enabling the appropriate block. */
+
+/* PEE mode - 120MHz system clock driven by external crystal. */
+#define KINETIS_MCG_MODE            KINETIS_MCG_MODE_PEE
+#define KINETIS_PLLCLK_FREQUENCY    120000000UL  // 120 MHz (RUN)
+#define KINETIS_SYSCLK_FREQUENCY    KINETIS_PLLCLK_FREQUENCY
+#define KINETIS_BUSCLK_FREQUENCY    60000000UL
+#define KINETIS_FLASHCLK_FREQUENCY  24000000UL  // 24 MHz (RUN)
+
+#define KINETIS_CLKDIV1_OUTDIV1 1  // -> 0
+#define KINETIS_CLKDIV1_OUTDIV2 2  // -> 1
+#define KINETIS_CLKDIV1_OUTDIV4 5  // -> 4
+
+/*
+ * SERIAL driver system settings.
+ */
+#define KINETIS_SERIAL_USE_UART0              TRUE
+
+/*
+ * USB driver settings
+ */
+#define KINETIS_USB_USE_USB0                  TRUE
+#define KINETIS_USB_USB0_IRQ_PRIORITY         5
+
+#endif /* _MCUCONF_H_ */
diff --git a/keyboards/handwired/onekey/teensy_35/rules.mk b/keyboards/handwired/onekey/teensy_35/rules.mk
new file mode 100644
index 0000000000..8ebefd03f5
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_35/rules.mk
@@ -0,0 +1,8 @@
+# MCU name
+MCU = MK64FX512
+
+# Bootloader selection
+BOOTLOADER = halfkay
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index be85a1dbff..95fe9a61d0 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -14,7 +14,7 @@ QMK_FIRMWARE_UPSTREAM = 'qmk/qmk_firmware'
 MAX_KEYBOARD_SUBFOLDERS = 5
 
 # Supported processor types
-CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'RP2040', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71', 'WB32FQ95'
+CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK64FX512', 'MK66FX1M0', 'RP2040', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71', 'WB32FQ95'
 LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
 VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
 
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index 1571bd5cd3..e5aa8e3d05 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -95,7 +95,7 @@
 #if defined(MCU_KINETIS)
 #    define CPU_CLOCK KINETIS_SYSCLK_FREQUENCY
 
-#    if defined(K20x) || defined(KL2x)
+#    if defined(K20x) || defined(K60x) || defined(KL2x)
 #        define USE_I2CV1
 #        define USE_I2CV1_CONTRIB // for some reason a bunch of ChibiOS-Contrib boards only have clock_speed
 #        define USE_GPIOV1

From f346c8400c1c0e994aaa598b7bb075e4c51f8174 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 3 Jul 2022 00:47:28 +1000
Subject: [PATCH 075/959] Update ChibiOS-Contrib (#17540)

---
 lib/chibios-contrib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 2a6b73ff51..2bfb681d68 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 2a6b73ff51baf89083a220b6692a04ca2cae8750
+Subproject commit 2bfb681d68df4294f73847dba2cf2218b21a50e7

From fb40abe2f25336b653d3c8ee787756e4260acd4c Mon Sep 17 00:00:00 2001
From: nirim000 <nirim000@gmail.com>
Date: Sat, 2 Jul 2022 19:37:02 -0400
Subject: [PATCH 076/959] Pca9505/6 driver (#17333)

---
 drivers/gpio/pca9505.c | 166 +++++++++++++++++++++++++++++++++++++++++
 drivers/gpio/pca9505.h |  67 +++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 drivers/gpio/pca9505.c
 create mode 100644 drivers/gpio/pca9505.h

diff --git a/drivers/gpio/pca9505.c b/drivers/gpio/pca9505.c
new file mode 100644
index 0000000000..5803746c96
--- /dev/null
+++ b/drivers/gpio/pca9505.c
@@ -0,0 +1,166 @@
+// Copyright 2022 nirim000
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "i2c_master.h"
+#include "pca9505.h"
+
+#include "debug.h"
+
+#define SLAVE_TO_ADDR(n) (n << 1)
+#define TIMEOUT 100
+
+enum {
+    CMD_INPUT_0 = 0,
+    CMD_INPUT_1,
+    CMD_INPUT_2,
+    CMD_INPUT_3,
+    CMD_INPUT_4,
+    CMD_OUTPUT_0 = 8,
+    CMD_OUTPUT_1,
+    CMD_OUTPUT_2,
+    CMD_OUTPUT_3,
+    CMD_OUTPUT_4,
+    CMD_INVERSION_0 = 16,
+    CMD_INVERSION_1,
+    CMD_INVERSION_2,
+    CMD_INVERSION_3,
+    CMD_INVERSION_4,
+    CMD_CONFIG_0 = 24,
+    CMD_CONFIG_1,
+    CMD_CONFIG_2,
+    CMD_CONFIG_3,
+    CMD_CONFIG_4,
+};
+
+void pca9505_init(uint8_t slave_addr) {
+    static uint8_t s_init = 0;
+    if (!s_init) {
+        i2c_init();
+
+        s_init = 1;
+    }
+
+    // TODO: could check device connected
+    // i2c_start(SLAVE_TO_ADDR(slave) | I2C_WRITE);
+    // i2c_stop();
+}
+
+bool pca9505_set_config(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) {
+    uint8_t addr = SLAVE_TO_ADDR(slave_addr);
+    uint8_t cmd  = 0;
+    switch (port) {
+        case 0:
+            cmd = CMD_CONFIG_0;
+            break;
+        case 1:
+            cmd = CMD_CONFIG_1;
+            break;
+        case 2:
+            cmd = CMD_CONFIG_2;
+            break;
+        case 3:
+            cmd = CMD_CONFIG_3;
+            break;
+        case 4:
+            cmd = CMD_CONFIG_4;
+            break;
+    }
+
+    i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
+    if (ret != I2C_STATUS_SUCCESS) {
+        print("pca9505_set_config::FAILED\n");
+        return false;
+    }
+
+    return true;
+}
+
+bool pca9505_set_polarity(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) {
+    uint8_t addr = SLAVE_TO_ADDR(slave_addr);
+    uint8_t cmd  = 0;
+    switch (port) {
+        case 0:
+            cmd = CMD_INVERSION_0;
+            break;
+        case 1:
+            cmd = CMD_INVERSION_1;
+            break;
+        case 2:
+            cmd = CMD_INVERSION_2;
+            break;
+        case 3:
+            cmd = CMD_INVERSION_3;
+            break;
+        case 4:
+            cmd = CMD_INVERSION_4;
+            break;
+    }
+
+    i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
+    if (ret != I2C_STATUS_SUCCESS) {
+        print("pca9505_set_polarity::FAILED\n");
+        return false;
+    }
+
+    return true;
+}
+
+bool pca9505_set_output(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) {
+    uint8_t addr = SLAVE_TO_ADDR(slave_addr);
+    uint8_t cmd  = 0;
+    switch (port) {
+        case 0:
+            cmd = CMD_OUTPUT_0;
+            break;
+        case 1:
+            cmd = CMD_OUTPUT_1;
+            break;
+        case 2:
+            cmd = CMD_OUTPUT_2;
+            break;
+        case 3:
+            cmd = CMD_OUTPUT_3;
+            break;
+        case 4:
+            cmd = CMD_OUTPUT_4;
+            break;
+    }
+
+    i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
+    if (ret != I2C_STATUS_SUCCESS) {
+        print("pca9505_set_output::FAILED\n");
+        return false;
+    }
+
+    return true;
+}
+
+bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) {
+    uint8_t addr = SLAVE_TO_ADDR(slave_addr);
+    uint8_t cmd  = 0;
+    switch (port) {
+        case 0:
+            cmd = CMD_INPUT_0;
+            break;
+        case 1:
+            cmd = CMD_INPUT_1;
+            break;
+        case 2:
+            cmd = CMD_INPUT_2;
+            break;
+        case 3:
+            cmd = CMD_INPUT_3;
+            break;
+        case 4:
+            cmd = CMD_INPUT_4;
+            break;
+    }
+
+    i2c_status_t ret = i2c_readReg(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
+    if (ret != I2C_STATUS_SUCCESS) {
+        print("pca9505_readPins::FAILED\n");
+        return false;
+    }
+
+    return true;
+}
diff --git a/drivers/gpio/pca9505.h b/drivers/gpio/pca9505.h
new file mode 100644
index 0000000000..732ddb88ea
--- /dev/null
+++ b/drivers/gpio/pca9505.h
@@ -0,0 +1,67 @@
+// Copyright 2022 nirim000
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**
+ * Port ID
+ */
+typedef enum {
+    PCA9505_PORT0,
+    PCA9505_PORT1,
+    PCA9505_PORT2,
+    PCA9505_PORT3,
+    PCA9505_PORT4,
+} pca9505_port_t;
+
+/**
+ * Helpers for set_config
+ */
+enum {
+    ALL_NORMAL   = 0,
+    ALL_INVERTED = 0xFF,
+};
+
+/**
+ * Helpers for set_config
+ */
+enum {
+    ALL_OUTPUT = 0,
+    ALL_INPUT  = 0xFF,
+};
+
+/**
+ * Helpers for set_output
+ */
+enum {
+    ALL_LOW  = 0,
+    ALL_HIGH = 0xFF,
+};
+
+/**
+ * Init expander and any other dependent drivers
+ */
+void pca9505_init(uint8_t slave_addr);
+
+/**
+ * Configure input/output to a given port
+ */
+bool pca9505_set_config(uint8_t slave_addr, pca9505_port_t port, uint8_t conf);
+
+/**
+ * Configure polarity to a given port
+ */
+bool pca9505_set_polarity(uint8_t slave_addr, pca9505_port_t port, uint8_t conf);
+
+/**
+ * Write high/low to a given port
+ */
+bool pca9505_set_output(uint8_t slave_addr, pca9505_port_t port, uint8_t conf);
+
+/**
+ * Read state of a given port
+ */
+bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* ret);

From c5215d4a063b6c8293ddc431c6902437a32bdeec Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sat, 2 Jul 2022 17:43:29 -0600
Subject: [PATCH 077/959] initial (#17545)

---
 keyboards/doio/kb16/keymaps/default/keymap.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/doio/kb16/keymaps/default/keymap.c b/keyboards/doio/kb16/keymaps/default/keymap.c
index 0d229c753b..df72bbe15a 100644
--- a/keyboards/doio/kb16/keymaps/default/keymap.c
+++ b/keyboards/doio/kb16/keymaps/default/keymap.c
@@ -133,5 +133,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 };
 #endif

From 0e5d67145a649480fd49a72712997feb6303a471 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 5 Jul 2022 08:58:35 +1000
Subject: [PATCH 078/959] Allow for `keymaps` array to be implemented in a file
 other than `$(KEYMAP_C)` (#17559)

---
 builddefs/build_keyboard.mk               | 6 ++++++
 quantum/keymap_introspection.c            | 5 +++++
 users/manna-harbour_miryoku/post_rules.mk | 2 --
 users/manna-harbour_miryoku/rules.mk      | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index b5616a438f..fe95dcaf15 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -400,6 +400,12 @@ endif
 
 OPT_DEFS += -DKEYMAP_C=\"$(KEYMAP_C)\"
 
+# If a keymap or userspace places their keymap array in another file instead, allow for it to be included
+# !!NOTE!! -- For this to work, the source file cannot be part of $(SRC), so users should not add it via `SRC += <file>`
+ifneq ($(strip $(INTROSPECTION_KEYMAP_C)),)
+OPT_DEFS += -DINTROSPECTION_KEYMAP_C=\"$(strip $(INTROSPECTION_KEYMAP_C))\"
+endif
+
 # project specific files
 SRC += \
     $(KEYBOARD_SRC) \
diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c
index 9628b41eef..7a96f802ef 100644
--- a/quantum/keymap_introspection.c
+++ b/quantum/keymap_introspection.c
@@ -4,6 +4,11 @@
 // Pull the actual keymap code so that we can inspect stuff from it
 #include KEYMAP_C
 
+// Allow for keymap or userspace rules.mk to specify an alternate location for the keymap array
+#ifdef INTROSPECTION_KEYMAP_C
+#    include INTROSPECTION_KEYMAP_C
+#endif // INTROSPECTION_KEYMAP_C
+
 #include "keymap_introspection.h"
 
 #define NUM_KEYMAP_LAYERS ((uint8_t)(sizeof(keymaps) / ((MATRIX_ROWS) * (MATRIX_COLS) * sizeof(uint16_t))))
diff --git a/users/manna-harbour_miryoku/post_rules.mk b/users/manna-harbour_miryoku/post_rules.mk
index c5b4b7d28e..8fece85e66 100644
--- a/users/manna-harbour_miryoku/post_rules.mk
+++ b/users/manna-harbour_miryoku/post_rules.mk
@@ -1,8 +1,6 @@
 # Copyright 2019 Manna Harbour
 # https://github.com/manna-harbour/miryoku
 
-SRC += manna-harbour_miryoku.c # keymaps
-
 # alternative layouts:
 
 # alphas
diff --git a/users/manna-harbour_miryoku/rules.mk b/users/manna-harbour_miryoku/rules.mk
index 879c7fc43e..ea226c4a3d 100644
--- a/users/manna-harbour_miryoku/rules.mk
+++ b/users/manna-harbour_miryoku/rules.mk
@@ -5,7 +5,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
 EXTRAKEY_ENABLE = yes # Audio control and System control
 AUTO_SHIFT_ENABLE = yes # Auto Shift
 
-SRC += manna-harbour_miryoku.c # keymaps
+INTROSPECTION_KEYMAP_C = manna-harbour_miryoku.c # keymaps
 
 include users/manna-harbour_miryoku/custom_rules.mk
 

From 29a2bac4691dae81a613af31e5e99660e61edc3d Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 6 Jul 2022 06:41:35 +1000
Subject: [PATCH 079/959] Fixup SPI. (#17534)

---
 drivers/eeprom/eeprom_spi.c            | 42 ++++++++++++--------------
 platforms/chibios/drivers/spi_master.c |  3 ++
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/drivers/eeprom/eeprom_spi.c b/drivers/eeprom/eeprom_spi.c
index 25955498c4..51ba25dece 100644
--- a/drivers/eeprom/eeprom_spi.c
+++ b/drivers/eeprom/eeprom_spi.c
@@ -58,14 +58,20 @@ static bool spi_eeprom_start(void) {
 
 static spi_status_t spi_eeprom_wait_while_busy(int timeout) {
     uint32_t     deadline = timer_read32() + timeout;
-    spi_status_t response;
-    do {
+    spi_status_t response = SR_WIP;
+    while (response & SR_WIP) {
+        if (!spi_eeprom_start()) {
+            return SPI_STATUS_ERROR;
+        }
+
         spi_write(CMD_RDSR);
         response = spi_read();
+        spi_stop();
+
         if (timer_read32() >= deadline) {
             return SPI_STATUS_TIMEOUT;
         }
-    } while (response & SR_WIP);
+    }
     return SPI_STATUS_SUCCESS;
 }
 
@@ -105,27 +111,21 @@ void eeprom_driver_erase(void) {
 void eeprom_read_block(void *buf, const void *addr, size_t len) {
     //-------------------------------------------------
     // Wait for the write-in-progress bit to be cleared
-    bool res = spi_eeprom_start();
-    if (!res) {
-        dprint("failed to start SPI for WIP check\n");
-        memset(buf, 0, len);
-        return;
-    }
-
     spi_status_t response = spi_eeprom_wait_while_busy(EXTERNAL_EEPROM_SPI_TIMEOUT);
-    spi_stop();
-    if (response == SPI_STATUS_TIMEOUT) {
-        dprint("SPI timeout for WIP check\n");
+    if (response != SPI_STATUS_SUCCESS) {
+        spi_stop();
         memset(buf, 0, len);
+        dprint("SPI timeout for WIP check\n");
         return;
     }
 
     //-------------------------------------------------
     // Perform read
-    res = spi_eeprom_start();
+    bool res = spi_eeprom_start();
     if (!res) {
-        dprint("failed to start SPI for read\n");
+        spi_stop();
         memset(buf, 0, len);
+        dprint("failed to start SPI for read\n");
         return;
     }
 
@@ -158,15 +158,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
 
         //-------------------------------------------------
         // Wait for the write-in-progress bit to be cleared
-        res = spi_eeprom_start();
-        if (!res) {
-            dprint("failed to start SPI for WIP check\n");
-            return;
-        }
-
         spi_status_t response = spi_eeprom_wait_while_busy(EXTERNAL_EEPROM_SPI_TIMEOUT);
-        spi_stop();
-        if (response == SPI_STATUS_TIMEOUT) {
+        if (response != SPI_STATUS_SUCCESS) {
+            spi_stop();
             dprint("SPI timeout for WIP check\n");
             return;
         }
@@ -175,6 +169,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
         // Enable writes
         res = spi_eeprom_start();
         if (!res) {
+            spi_stop();
             dprint("failed to start SPI for write-enable\n");
             return;
         }
@@ -186,6 +181,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
         // Perform the write
         res = spi_eeprom_start();
         if (!res) {
+            spi_stop();
             dprint("failed to start SPI for write\n");
             return;
         }
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index f9974d9f6b..223d8a403e 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -46,6 +46,9 @@ __attribute__((weak)) void spi_init(void) {
         palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
         palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
 #endif
+        spiUnselect(&SPI_DRIVER);
+        spiStop(&SPI_DRIVER);
+        currentSlavePin = NO_PIN;
     }
 }
 

From 744af003befb3f5cf6dc6b6f3e581f288d598f96 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 6 Jul 2022 19:27:15 +0100
Subject: [PATCH 080/959] Add kb2040 and sparkfun rp2040 converters (#17514)

---
 data/mappings/defaults.json                   | 12 +++
 data/schemas/keyboard.jsonschema              |  2 +-
 .../chibios/boards/QMK_PM2040/board/board.mk  |  9 ++
 .../chibios/boards/QMK_PM2040/configs/board.h | 12 +++
 .../boards/QMK_PM2040/configs/chconf.h        | 13 +++
 .../boards/QMK_PM2040/configs/config.h        | 21 ++++
 .../boards/QMK_PM2040/configs/halconf.h       |  9 ++
 .../boards/QMK_PM2040/configs/mcuconf.h       | 98 +++++++++++++++++++
 .../converters/promicro_to_kb2040/_pin_defs.h | 36 +++++++
 .../promicro_to_kb2040/converter.mk           |  9 ++
 .../promicro_to_promicro_rp2040/_pin_defs.h   | 36 +++++++
 .../promicro_to_promicro_rp2040/converter.mk  |  9 ++
 12 files changed, 265 insertions(+), 1 deletion(-)
 create mode 100644 platforms/chibios/boards/QMK_PM2040/board/board.mk
 create mode 100644 platforms/chibios/boards/QMK_PM2040/configs/board.h
 create mode 100644 platforms/chibios/boards/QMK_PM2040/configs/chconf.h
 create mode 100644 platforms/chibios/boards/QMK_PM2040/configs/config.h
 create mode 100644 platforms/chibios/boards/QMK_PM2040/configs/halconf.h
 create mode 100644 platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
 create mode 100644 platforms/chibios/converters/promicro_to_kb2040/_pin_defs.h
 create mode 100644 platforms/chibios/converters/promicro_to_kb2040/converter.mk
 create mode 100644 platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h
 create mode 100644 platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk

diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json
index e62ab688d6..c6cb53f4c3 100644
--- a/data/mappings/defaults.json
+++ b/data/mappings/defaults.json
@@ -16,6 +16,18 @@
             "board": "QMK_PROTON_C",
             "pin_compatible": "promicro"
         },
+        "kb2040": {
+            "processor": "RP2040",
+            "bootloader": "rp2040",
+            "board": "QMK_PM2040",
+            "pin_compatible": "promicro"
+        },
+        "promicro_rp2040": {
+            "processor": "RP2040",
+            "bootloader": "rp2040",
+            "board": "QMK_PM2040",
+            "pin_compatible": "promicro"
+        },
         "bluepill": {
             "processor": "STM32F103",
             "bootloader": "stm32duino",
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 320974f0c4..166a5d4d3b 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -34,7 +34,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "proton_c", "bluepill", "blackpill_f401", "blackpill_f411"]
+            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "bluepill", "blackpill_f401", "blackpill_f411"]
         },
         "pin_compatible": {
             "type": "string",
diff --git a/platforms/chibios/boards/QMK_PM2040/board/board.mk b/platforms/chibios/boards/QMK_PM2040/board/board.mk
new file mode 100644
index 0000000000..911cc5a058
--- /dev/null
+++ b/platforms/chibios/boards/QMK_PM2040/board/board.mk
@@ -0,0 +1,9 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/RP_PICO_RP2040/board.c
+
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/RP_PICO_RP2040
+
+# Shared variables
+ALLCSRC += $(BOARDSRC) 
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/board.h b/platforms/chibios/boards/QMK_PM2040/configs/board.h
new file mode 100644
index 0000000000..433e1c527f
--- /dev/null
+++ b/platforms/chibios/boards/QMK_PM2040/configs/board.h
@@ -0,0 +1,12 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next "board.h"
+
+#undef BOARD_RP_PICO_RP2040
+#define BOARD_PM2040
+
+#undef BOARD_NAME
+#define BOARD_NAME "Pro Micro RP2040"
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/chconf.h b/platforms/chibios/boards/QMK_PM2040/configs/chconf.h
new file mode 100644
index 0000000000..d53f57edd9
--- /dev/null
+++ b/platforms/chibios/boards/QMK_PM2040/configs/chconf.h
@@ -0,0 +1,13 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define CH_CFG_SMP_MODE                     TRUE
+#define CH_CFG_ST_RESOLUTION                32
+#define CH_CFG_ST_FREQUENCY                 1000000
+#define CH_CFG_INTERVALS_SIZE               32
+#define CH_CFG_TIME_TYPES_SIZE              32
+#define CH_CFG_ST_TIMEDELTA                 20
+
+#include_next <chconf.h>
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/config.h b/platforms/chibios/boards/QMK_PM2040/configs/config.h
new file mode 100644
index 0000000000..6b1dcca938
--- /dev/null
+++ b/platforms/chibios/boards/QMK_PM2040/configs/config.h
@@ -0,0 +1,21 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifndef I2C_DRIVER
+#    define I2C_DRIVER I2CD2
+#endif
+#ifndef I2C1_SDA_PIN
+#    define I2C1_SDA_PIN D2
+#endif
+#ifndef I2C1_SCL_PIN
+#    define I2C1_SCL_PIN D3
+#endif
+
+#ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#endif
+#ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT
+#    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+#endif
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/halconf.h b/platforms/chibios/boards/QMK_PM2040/configs/halconf.h
new file mode 100644
index 0000000000..d7a58f0ea6
--- /dev/null
+++ b/platforms/chibios/boards/QMK_PM2040/configs/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h b/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
new file mode 100644
index 0000000000..a737b36c1c
--- /dev/null
+++ b/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
@@ -0,0 +1,98 @@
+/*
+    ChibiOS - Copyright (C) 2006..2021 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * RP2040_MCUCONF drivers configuration.
+ *
+ * IRQ priorities:
+ * 3...0        Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...1        Lowest...Highest.
+ */
+
+#define RP2040_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define RP_NO_INIT                          FALSE
+#define RP_CORE1_START                      FALSE
+#define RP_CORE1_VECTORS_TABLE              _vectors
+#define RP_CORE1_ENTRY_POINT                _crt0_c1_entry
+#define RP_CORE1_STACK_END                  __c1_main_stack_end__
+
+/*
+ * IRQ system settings.
+ */
+#define RP_IRQ_SYSTICK_PRIORITY             2
+#define RP_IRQ_TIMER_ALARM0_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM1_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM2_PRIORITY        2
+#define RP_IRQ_TIMER_ALARM3_PRIORITY        2
+#define RP_IRQ_UART0_PRIORITY               3
+#define RP_IRQ_UART1_PRIORITY               3
+#define RP_IRQ_SPI0_PRIORITY                2
+#define RP_IRQ_SPI1_PRIORITY                2
+#define RP_IRQ_USB0_PRIORITY                3
+#define RP_IRQ_I2C0_PRIORITY                2
+#define RP_IRQ_I2C1_PRIORITY                2
+
+/*
+ * ADC driver system settings.
+ */
+#define RP_ADC_USE_ADC1                     FALSE
+
+/*
+ * SIO driver system settings.
+ */
+#define RP_SIO_USE_UART0                    FALSE
+#define RP_SIO_USE_UART1                    FALSE
+
+/*
+ * SPI driver system settings.
+ */
+#define RP_SPI_USE_SPI0                     TRUE
+#define RP_SPI_USE_SPI1                     FALSE
+#define RP_SPI_SPI0_RX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI0_TX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI1_RX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI1_TX_DMA_CHANNEL          RP_DMA_CHANNEL_ID_ANY
+#define RP_SPI_SPI0_DMA_PRIORITY            1
+#define RP_SPI_SPI1_DMA_PRIORITY            1
+#define RP_SPI_DMA_ERROR_HOOK(spip)
+
+/*
+ * I2C driver system settings.
+ */
+#define RP_I2C_USE_I2C0                     FALSE
+#define RP_I2C_USE_I2C1                     TRUE
+#define RP_I2C_BUSY_TIMEOUT                 50
+#define RP_I2C_ADDRESS_MODE_10BIT           FALSE
+
+/*
+ * USB driver system settings.
+ */
+#define RP_USB_USE_USBD0                    TRUE
+#define RP_USB_FORCE_VBUS_DETECT            TRUE
+#define RP_USE_EXTERNAL_VBUS_DETECT         FALSE
+#define RP_USB_USE_SOF_INTR                 TRUE
+#define RP_USB_USE_ERROR_DATA_SEQ_INTR      FALSE
+
+#endif /* MCUCONF_H */
diff --git a/platforms/chibios/converters/promicro_to_kb2040/_pin_defs.h b/platforms/chibios/converters/promicro_to_kb2040/_pin_defs.h
new file mode 100644
index 0000000000..0a3110890b
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_kb2040/_pin_defs.h
@@ -0,0 +1,36 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 0U
+#define D2 1U
+//      GND
+//      GND
+#define D1 2U
+#define D0 3U
+#define D4 4U
+#define C6 5U
+#define D7 6U
+#define E6 7U
+#define B4 8U
+#define B5 9U
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 29U
+#define F5 28U
+#define F6 27U
+#define F7 26U
+#define B1 18U
+#define B3 20U
+#define B2 19U
+#define B6 10U
+
+// LEDs (Mapped to QT connector to avoid collisions with button/neopixel)
+#define D5 12U
+#define B0 13U
diff --git a/platforms/chibios/converters/promicro_to_kb2040/converter.mk b/platforms/chibios/converters/promicro_to_kb2040/converter.mk
new file mode 100644
index 0000000000..6ffee357b3
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_kb2040/converter.mk
@@ -0,0 +1,9 @@
+# Adafruit KB2040 MCU settings for converting AVR projects
+MCU := RP2040
+BOARD := QMK_PM2040
+BOOTLOADER := rp2040
+
+# These are defaults based on what has been implemented for RP2040 boards
+SERIAL_DRIVER ?= vendor
+WS2812_DRIVER ?= vendor
+BACKLIGHT_DRIVER ?= software
diff --git a/platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h b/platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h
new file mode 100644
index 0000000000..0a1f4112a3
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_promicro_rp2040/_pin_defs.h
@@ -0,0 +1,36 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 0U
+#define D2 1U
+//      GND
+//      GND
+#define D1 2U
+#define D0 3U
+#define D4 4U
+#define C6 5U
+#define D7 6U
+#define E6 7U
+#define B4 8U
+#define B5 9U
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 29U
+#define F5 28U
+#define F6 27U
+#define F7 26U
+#define B1 22U
+#define B3 20U
+#define B2 23U
+#define B6 21U
+
+// LEDs (Mapped to QT connector to avoid collisions with button/neopixel)
+#define D5 17U
+#define B0 16U
diff --git a/platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk b/platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk
new file mode 100644
index 0000000000..03863eeb02
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_promicro_rp2040/converter.mk
@@ -0,0 +1,9 @@
+# Sparkfun Pro Micro RP2040 MCU settings for converting AVR projects
+MCU := RP2040
+BOARD := QMK_PM2040
+BOOTLOADER := rp2040
+
+# These are defaults based on what has been implemented for RP2040 boards
+SERIAL_DRIVER ?= vendor
+WS2812_DRIVER ?= vendor
+BACKLIGHT_DRIVER ?= software

From d9bb189e25f14578ca74d6a3aa9f9a467f6f6595 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 7 Jul 2022 09:27:50 +0200
Subject: [PATCH 081/959] [Core] Update mpaland/printf to eyalroz/printf fork
 (#16163)

mpaland printf implementation was abandoned in ~2019 and the fork by
eyalroz is now regarded to be the goto replacement of it. So this commit
incoporates the changes needed to use this fork in QMK.

Note that pointer ptrdiff_t is always supported since commit
51c90f93a97fdaef895783ecbe24569be0db7cb8
---
 builddefs/build_test.mk         |  6 +--
 lib/printf                      |  2 +-
 platforms/arm_atsam/platform.mk |  1 +
 platforms/avr/platform.mk       |  1 +
 platforms/chibios/platform.mk   |  3 +-
 quantum/logging/print.c         |  2 +-
 quantum/logging/print.h         | 68 ++++++++++++++++++++-------------
 quantum/logging/print.mk        | 17 +++++----
 8 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/builddefs/build_test.mk b/builddefs/build_test.mk
index bd9b372c33..64db99fed9 100644
--- a/builddefs/build_test.mk
+++ b/builddefs/build_test.mk
@@ -38,11 +38,11 @@ CREATE_MAP := no
 VPATH += \
 	$(LIB_PATH)/googletest \
 	$(LIB_PATH)/googlemock \
-	$(LIB_PATH)/printf
+	$(COMMON_VPATH) \
+	$(TEST_PATH)
 
 all: elf
 
-VPATH += $(TEST_PATH) $(COMMON_VPATH)
 PLATFORM:=TEST
 PLATFORM_KEY:=test
 BOOTLOADER_TYPE:=none
@@ -64,6 +64,7 @@ include $(QUANTUM_PATH)/debounce/tests/rules.mk
 include $(QUANTUM_PATH)/encoder/tests/rules.mk
 include $(QUANTUM_PATH)/sequencer/tests/rules.mk
 include $(QUANTUM_PATH)/wear_leveling/tests/rules.mk
+include $(QUANTUM_PATH)/logging/print.mk
 include $(PLATFORM_PATH)/test/rules.mk
 ifneq ($(filter $(FULL_TESTS),$(TEST)),)
 include $(BUILDDEFS_PATH)/build_full_test.mk
@@ -71,7 +72,6 @@ endif
 
 $(TEST)_SRC += \
 	tests/test_common/main.c \
-	$(LIB_PATH)/printf/printf.c \
 	$(QUANTUM_PATH)/logging/print.c
 
 $(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)
diff --git a/lib/printf b/lib/printf
index d3b984684b..c2e3b4e10d 160000
--- a/lib/printf
+++ b/lib/printf
@@ -1 +1 @@
-Subproject commit d3b984684bb8a8bdc48cc7a1abecb93ce59bbe3e
+Subproject commit c2e3b4e10d281e7f0f694d3ecbd9f320977288cc
diff --git a/platforms/arm_atsam/platform.mk b/platforms/arm_atsam/platform.mk
index 9618838dc3..9462f517ae 100644
--- a/platforms/arm_atsam/platform.mk
+++ b/platforms/arm_atsam/platform.mk
@@ -24,6 +24,7 @@ COMPILEFLAGS += -fno-strict-aliasing
 COMPILEFLAGS += -mfloat-abi=hard
 COMPILEFLAGS += -mfpu=fpv4-sp-d16
 COMPILEFLAGS += -mthumb
+COMPILEFLAGS += -fno-builtin-printf
 
 #ALLOW_WARNINGS = yes
 
diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index b51a94c93a..39a11b28e4 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -24,6 +24,7 @@ COMPILEFLAGS += -fdata-sections
 COMPILEFLAGS += -fpack-struct
 COMPILEFLAGS += -fshort-enums
 COMPILEFLAGS += -mcall-prologues
+COMPILEFLAGS += -fno-builtin-printf
 
 # Linker relaxation is only possible if
 # link time optimizations are not enabled.
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index 63cc1a4b33..b2a8ec89e1 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -349,7 +349,8 @@ SHARED_CFLAGS = -fomit-frame-pointer \
                 -ffunction-sections \
                 -fdata-sections \
                 -fno-common \
-                -fshort-wchar
+                -fshort-wchar \
+                -fno-builtin-printf
 
 LDSCRIPT_PATH := $(shell dirname "$(LDSCRIPT)")
 
diff --git a/quantum/logging/print.c b/quantum/logging/print.c
index 50a6b826ee..17e6737ac4 100644
--- a/quantum/logging/print.c
+++ b/quantum/logging/print.c
@@ -28,6 +28,6 @@ void print_set_sendchar(sendchar_func_t send) {
     func = send;
 }
 
-void _putchar(char character) {
+void putchar_(char character) {
     func(character);
 }
diff --git a/quantum/logging/print.h b/quantum/logging/print.h
index aa72fc7074..5fbf189505 100644
--- a/quantum/logging/print.h
+++ b/quantum/logging/print.h
@@ -32,6 +32,22 @@
 
 void print_set_sendchar(sendchar_func_t func);
 
+/**
+ * @brief This macro suppress format warnings for the function that is passed
+ * in. The main use-case is that `b` format specifier for printing binary
+ * numbers is not in the official C standard. Inclusion is planned for the
+ * upcoming C2X C standard, but until then GCC will always output a warning for
+ * a unknown format specifier.
+ */
+#define IGNORE_FORMAT_WARNING(func)                                \
+    do {                                                           \
+        _Pragma("GCC diagnostic push");                            \
+        _Pragma("GCC diagnostic ignored \"-Wformat\"");            \
+        _Pragma("GCC diagnostic ignored \"-Wformat-extra-args\""); \
+        func;                                                      \
+        _Pragma("GCC diagnostic pop");                             \
+    } while (0)
+
 #ifndef NO_PRINT
 #    if __has_include_next("_print.h")
 #        include_next "_print.h" /* Include the platforms print.h */
@@ -78,25 +94,25 @@ void print_set_sendchar(sendchar_func_t func);
 #define print_hex16(i) xprintf("%04X", i)
 #define print_hex32(i) xprintf("%08lX", i)
 /* binary */
-#define print_bin4(i) xprintf("%04b", i)
-#define print_bin8(i) xprintf("%08b", i)
-#define print_bin16(i) xprintf("%016b", i)
-#define print_bin32(i) xprintf("%032lb", i)
-#define print_bin_reverse8(i) xprintf("%08b", bitrev(i))
-#define print_bin_reverse16(i) xprintf("%016b", bitrev16(i))
-#define print_bin_reverse32(i) xprintf("%032lb", bitrev32(i))
+#define print_bin4(i) IGNORE_FORMAT_WARNING(xprintf("%04b", i))
+#define print_bin8(i) IGNORE_FORMAT_WARNING(xprintf("%08b", i))
+#define print_bin16(i) IGNORE_FORMAT_WARNING(xprintf("%016b", i))
+#define print_bin32(i) IGNORE_FORMAT_WARNING(xprintf("%032lb", i))
+#define print_bin_reverse8(i) IGNORE_FORMAT_WARNING(xprintf("%08b", bitrev(i)))
+#define print_bin_reverse16(i) IGNORE_FORMAT_WARNING(xprintf("%016b", bitrev16(i)))
+#define print_bin_reverse32(i) IGNORE_FORMAT_WARNINGxprintf("%032lb", bitrev32(i)))
 /* print value utility */
 #define print_val_dec(v) xprintf(#v ": %u\n", v)
 #define print_val_decs(v) xprintf(#v ": %d\n", v)
 #define print_val_hex8(v) xprintf(#v ": %X\n", v)
 #define print_val_hex16(v) xprintf(#v ": %02X\n", v)
 #define print_val_hex32(v) xprintf(#v ": %04lX\n", v)
-#define print_val_bin8(v) xprintf(#v ": %08b\n", v)
-#define print_val_bin16(v) xprintf(#v ": %016b\n", v)
-#define print_val_bin32(v) xprintf(#v ": %032lb\n", v)
-#define print_val_bin_reverse8(v) xprintf(#v ": %08b\n", bitrev(v))
-#define print_val_bin_reverse16(v) xprintf(#v ": %016b\n", bitrev16(v))
-#define print_val_bin_reverse32(v) xprintf(#v ": %032lb\n", bitrev32(v))
+#define print_val_bin8(v) IGNORE_FORMAT_WARNING(xprintf(#v ": %08b\n", v))
+#define print_val_bin16(v) IGNORE_FORMAT_WARNING(xprintf(#v ": %016b\n", v))
+#define print_val_bin32(v) IGNORE_FORMAT_WARNING(xprintf(#v ": %032lb\n", v))
+#define print_val_bin_reverse8(v) IGNORE_FORMAT_WARNING(xprintf(#v ": %08b\n", bitrev(v)))
+#define print_val_bin_reverse16(v) IGNORE_FORMAT_WARNING(xprintf(#v ": %016b\n", bitrev16(v)))
+#define print_val_bin_reverse32(v) IGNORE_FORMAT_WARNING(xprintf(#v ": %032lb\n", bitrev32(v)))
 
 // User print disables the normal print messages in the body of QMK/TMK code and
 // is meant as a lightweight alternative to NOPRINT. Use it when you only want to do
@@ -114,22 +130,22 @@ void print_set_sendchar(sendchar_func_t func);
 #define uprint_hex16(i) uprintf("%04X", i)
 #define uprint_hex32(i) uprintf("%08lX", i)
 /* binary */
-#define uprint_bin4(i) uprintf("%04b", i)
-#define uprint_bin8(i) uprintf("%08b", i)
-#define uprint_bin16(i) uprintf("%016b", i)
-#define uprint_bin32(i) uprintf("%032lb", i)
-#define uprint_bin_reverse8(i) uprintf("%08b", bitrev(i))
-#define uprint_bin_reverse16(i) uprintf("%016b", bitrev16(i))
-#define uprint_bin_reverse32(i) uprintf("%032lb", bitrev32(i))
+#define uprint_bin4(i) IGNORE_FORMAT_WARNING(uprintf("%04b", i))
+#define uprint_bin8(i) IGNORE_FORMAT_WARNING(uprintf("%08b", i))
+#define uprint_bin16(i) IGNORE_FORMAT_WARNING(uprintf("%016b", i))
+#define uprint_bin32(i) IGNORE_FORMAT_WARNING(uprintf("%032lb", i))
+#define uprint_bin_reverse8(i) IGNORE_FORMAT_WARNING(uprintf("%08b", bitrev(i)))
+#define uprint_bin_reverse16(i) IGNORE_FORMAT_WARNING(uprintf("%016b", bitrev16(i)))
+#define uprint_bin_reverse32(i) IGNORE_FORMAT_WARNING(uprintf("%032lb", bitrev32(i)))
 /* print value utility */
 #define uprint_val_dec(v) uprintf(#v ": %u\n", v)
 #define uprint_val_decs(v) uprintf(#v ": %d\n", v)
 #define uprint_val_hex8(v) uprintf(#v ": %X\n", v)
 #define uprint_val_hex16(v) uprintf(#v ": %02X\n", v)
 #define uprint_val_hex32(v) uprintf(#v ": %04lX\n", v)
-#define uprint_val_bin8(v) uprintf(#v ": %08b\n", v)
-#define uprint_val_bin16(v) uprintf(#v ": %016b\n", v)
-#define uprint_val_bin32(v) uprintf(#v ": %032lb\n", v)
-#define uprint_val_bin_reverse8(v) uprintf(#v ": %08b\n", bitrev(v))
-#define uprint_val_bin_reverse16(v) uprintf(#v ": %016b\n", bitrev16(v))
-#define uprint_val_bin_reverse32(v) uprintf(#v ": %032lb\n", bitrev32(v))
+#define uprint_val_bin8(v) IGNORE_FORMAT_WARNING(uprintf(#v ": %08b\n", v))
+#define uprint_val_bin16(v) IGNORE_FORMAT_WARNING(uprintf(#v ": %016b\n", v))
+#define uprint_val_bin32(v) IGNORE_FORMAT_WARNING(uprintf(#v ": %032lb\n", v))
+#define uprint_val_bin_reverse8(v) IGNORE_FORMAT_WARNING(uprintf(#v ": %08b\n", bitrev(v)))
+#define uprint_val_bin_reverse16(v) IGNORE_FORMAT_WARNING(uprintf(#v ": %016b\n", bitrev16(v)))
+#define uprint_val_bin_reverse32(v) IGNORE_FORMAT_WARNING(uprintf(#v ": %032lb\n", bitrev32(v)))
diff --git a/quantum/logging/print.mk b/quantum/logging/print.mk
index 67c004192d..658c533dad 100644
--- a/quantum/logging/print.mk
+++ b/quantum/logging/print.mk
@@ -1,9 +1,12 @@
-PRINTF_PATH = $(LIB_PATH)/printf
+PRINTF_PATH = $(LIB_PATH)/printf/src
 
-VPATH += $(PRINTF_PATH)
-SRC += $(PRINTF_PATH)/printf.c
+VPATH += $(PRINTF_PATH) $(PRINTF_PATH)/printf
+SRC += printf.c
 QUANTUM_SRC +=$(QUANTUM_DIR)/logging/print.c
-OPT_DEFS += -DPRINTF_DISABLE_SUPPORT_FLOAT
-OPT_DEFS += -DPRINTF_DISABLE_SUPPORT_EXPONENTIAL
-OPT_DEFS += -DPRINTF_DISABLE_SUPPORT_LONG_LONG
-OPT_DEFS += -DPRINTF_DISABLE_SUPPORT_PTRDIFF_T
+
+OPT_DEFS += -DPRINTF_SUPPORT_DECIMAL_SPECIFIERS=0
+OPT_DEFS += -DPRINTF_SUPPORT_EXPONENTIAL_SPECIFIERS=0
+OPT_DEFS += -DPRINTF_SUPPORT_LONG_LONG=0
+OPT_DEFS += -DPRINTF_SUPPORT_WRITEBACK_SPECIFIER=0
+OPT_DEFS += -DSUPPORT_MSVC_STYLE_INTEGER_SPECIFIERS=0
+OPT_DEFS += -DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES=1

From cca5d3532128a9d1aa2ab39405d935fc132c752d Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 7 Jul 2022 15:33:11 +0800
Subject: [PATCH 082/959] Update PM2040 I2C pins (#17578)

---
 platforms/chibios/boards/QMK_PM2040/configs/config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/boards/QMK_PM2040/configs/config.h b/platforms/chibios/boards/QMK_PM2040/configs/config.h
index 6b1dcca938..9dfe86f12e 100644
--- a/platforms/chibios/boards/QMK_PM2040/configs/config.h
+++ b/platforms/chibios/boards/QMK_PM2040/configs/config.h
@@ -7,10 +7,10 @@
 #    define I2C_DRIVER I2CD2
 #endif
 #ifndef I2C1_SDA_PIN
-#    define I2C1_SDA_PIN D2
+#    define I2C1_SDA_PIN 2U
 #endif
 #ifndef I2C1_SCL_PIN
-#    define I2C1_SCL_PIN D3
+#    define I2C1_SCL_PIN 3U
 #endif
 
 #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET

From 8224f62806b66f0825b68fd8c00436ee57a28e9a Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 7 Jul 2022 10:00:40 +0200
Subject: [PATCH 083/959] Make debounce() signal changes in the cooked matrix
 as return value (#17554)

---
 docs/custom_matrix.md                           |  6 +++---
 docs/ja/custom_matrix.md                        |  6 +++---
 quantum/debounce.h                              | 16 +++++++++++-----
 quantum/debounce/asym_eager_defer_pk.c          | 11 +++++++++--
 quantum/debounce/none.c                         | 11 +++++++----
 quantum/debounce/sym_defer_g.c                  | 12 +++++++++---
 quantum/debounce/sym_defer_pk.c                 | 12 +++++++++---
 quantum/debounce/sym_defer_pr.c                 | 14 +++++++++-----
 quantum/debounce/sym_eager_pk.c                 |  7 ++++++-
 quantum/debounce/sym_eager_pr.c                 | 11 ++++++++---
 quantum/debounce/tests/debounce_test_common.cpp |  6 +++++-
 quantum/matrix.c                                |  5 ++---
 quantum/matrix_common.c                         |  5 ++---
 13 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/docs/custom_matrix.md b/docs/custom_matrix.md
index 8f6878f94a..6d6ae5e972 100644
--- a/docs/custom_matrix.md
+++ b/docs/custom_matrix.md
@@ -81,17 +81,17 @@ void matrix_init(void) {
 }
 
 uint8_t matrix_scan(void) {
-    bool matrix_has_changed = false;
+    bool changed = false;
 
     // TODO: add matrix scanning routine here
 
     // Unless hardware debouncing - use the configured debounce routine
-    debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
+    changed = debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
     // This *must* be called for correct keyboard behavior
     matrix_scan_quantum();
 
-    return matrix_has_changed;
+    return changed;
 }
 ```
 
diff --git a/docs/ja/custom_matrix.md b/docs/ja/custom_matrix.md
index 277fc658d3..2c697bb148 100644
--- a/docs/ja/custom_matrix.md
+++ b/docs/ja/custom_matrix.md
@@ -87,17 +87,17 @@ void matrix_init(void) {
 }
 
 uint8_t matrix_scan(void) {
-    bool matrix_has_changed = false;
+    bool changed = false;
 
     // TODO: ここにマトリックススキャンルーチンを追加します
 
     // ハードウェアによるデバウンスがない場合 - 設定されているデバウンスルーチンを使用します
-    debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
+    changed = debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
     // 正しいキーボード動作のためにこれを呼び出す*必要があります*
     matrix_scan_quantum();
 
-    return matrix_has_changed;
+    return changed;
 }
 ```
 
diff --git a/quantum/debounce.h b/quantum/debounce.h
index 3532d9cd7b..a8629654c2 100644
--- a/quantum/debounce.h
+++ b/quantum/debounce.h
@@ -1,10 +1,16 @@
 #pragma once
 
-// raw is the current key state
-// on entry cooked is the previous debounced state
-// on exit cooked is the current debounced state
-// changed is true if raw has changed since the last call
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed);
+/**
+ * @brief Debounce raw matrix events according to the choosen debounce algorithm.
+ *
+ * @param raw The current key state
+ * @param cooked The debounced key state
+ * @param num_rows Number of rows to debounce
+ * @param changed True if raw has changed since the last call
+ * @return true Cooked has new keychanges after debouncing
+ * @return false Cooked is the same as before
+ */
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed);
 
 void debounce_init(uint8_t num_rows);
 
diff --git a/quantum/debounce/asym_eager_defer_pk.c b/quantum/debounce/asym_eager_defer_pk.c
index b1eb4a2b7b..4745c6f465 100644
--- a/quantum/debounce/asym_eager_defer_pk.c
+++ b/quantum/debounce/asym_eager_defer_pk.c
@@ -55,6 +55,7 @@ static debounce_counter_t *debounce_counters;
 static fast_timer_t        last_time;
 static bool                counters_need_update;
 static bool                matrix_need_update;
+static bool                cooked_changed;
 
 #    define DEBOUNCE_ELAPSED 0
 
@@ -77,8 +78,9 @@ void debounce_free(void) {
     debounce_counters = NULL;
 }
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
     bool updated_last = false;
+    cooked_changed    = false;
 
     if (counters_need_update) {
         fast_timer_t now          = timer_read_fast();
@@ -102,6 +104,8 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
 
         transfer_matrix_values(raw, cooked, num_rows);
     }
+
+    return cooked_changed;
 }
 
 static void update_debounce_counters_and_transfer_if_expired(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t elapsed_time) {
@@ -123,7 +127,9 @@ static void update_debounce_counters_and_transfer_if_expired(matrix_row_t raw[],
                         matrix_need_update = true;
                     } else {
                         // key-up: defer
-                        cooked[row] = (cooked[row] & ~col_mask) | (raw[row] & col_mask);
+                        matrix_row_t cooked_next = (cooked[row] & ~col_mask) | (raw[row] & col_mask);
+                        cooked_changed |= cooked_next ^ cooked[row];
+                        cooked[row] = cooked_next;
                     }
                 } else {
                     debounce_pointer->time -= elapsed_time;
@@ -152,6 +158,7 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
                     if (debounce_pointer->pressed) {
                         // key-down: eager
                         cooked[row] ^= col_mask;
+                        cooked_changed = true;
                     }
                 }
             } else if (debounce_pointer->time != DEBOUNCE_ELAPSED) {
diff --git a/quantum/debounce/none.c b/quantum/debounce/none.c
index 8a85cc04a8..4cff5e05e2 100644
--- a/quantum/debounce/none.c
+++ b/quantum/debounce/none.c
@@ -17,13 +17,16 @@
 #include "matrix.h"
 #include "quantum.h"
 #include <stdlib.h>
+#include <string.h>
 
 void debounce_init(uint8_t num_rows) {}
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
-    for (int i = 0; i < num_rows; i++) {
-        cooked[i] = raw[i];
-    }
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+    bool cooked_changed = memcmp(raw, cooked, sizeof(matrix_row_t) * num_rows) != 0;
+
+    memcpy(cooked, raw, sizeof(matrix_row_t) * num_rows);
+
+    return cooked_changed;
 }
 
 void debounce_free(void) {}
diff --git a/quantum/debounce/sym_defer_g.c b/quantum/debounce/sym_defer_g.c
index 47450992a4..d04310a761 100644
--- a/quantum/debounce/sym_defer_g.c
+++ b/quantum/debounce/sym_defer_g.c
@@ -20,6 +20,7 @@ When no state changes have occured for DEBOUNCE milliseconds, we push the state.
 #include "matrix.h"
 #include "timer.h"
 #include "quantum.h"
+#include <string.h>
 #ifndef DEBOUNCE
 #    define DEBOUNCE 5
 #endif
@@ -30,18 +31,23 @@ static fast_timer_t debouncing_time;
 
 void debounce_init(uint8_t num_rows) {}
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+    bool cooked_changed = false;
+
     if (changed) {
         debouncing      = true;
         debouncing_time = timer_read_fast();
     }
 
     if (debouncing && timer_elapsed_fast(debouncing_time) >= DEBOUNCE) {
-        for (int i = 0; i < num_rows; i++) {
-            cooked[i] = raw[i];
+        if (memcmp(cooked, raw, sizeof(matrix_row_t) * num_rows) != 0) {
+            memcpy(cooked, raw, sizeof(matrix_row_t) * num_rows);
+            cooked_changed = true;
         }
         debouncing = false;
     }
+
+    return cooked_changed;
 }
 
 void debounce_free(void) {}
diff --git a/quantum/debounce/sym_defer_pk.c b/quantum/debounce/sym_defer_pk.c
index 9dee29e28e..7b59b5e100 100644
--- a/quantum/debounce/sym_defer_pk.c
+++ b/quantum/debounce/sym_defer_pk.c
@@ -48,6 +48,7 @@ typedef uint8_t debounce_counter_t;
 static debounce_counter_t *debounce_counters;
 static fast_timer_t        last_time;
 static bool                counters_need_update;
+static bool                cooked_changed;
 
 #    define DEBOUNCE_ELAPSED 0
 
@@ -70,8 +71,9 @@ void debounce_free(void) {
     debounce_counters = NULL;
 }
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
     bool updated_last = false;
+    cooked_changed    = false;
 
     if (counters_need_update) {
         fast_timer_t now          = timer_read_fast();
@@ -95,6 +97,8 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
 
         start_debounce_counters(raw, cooked, num_rows);
     }
+
+    return cooked_changed;
 }
 
 static void update_debounce_counters_and_transfer_if_expired(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t elapsed_time) {
@@ -104,8 +108,10 @@ static void update_debounce_counters_and_transfer_if_expired(matrix_row_t raw[],
         for (uint8_t col = 0; col < MATRIX_COLS; col++) {
             if (*debounce_pointer != DEBOUNCE_ELAPSED) {
                 if (*debounce_pointer <= elapsed_time) {
-                    *debounce_pointer = DEBOUNCE_ELAPSED;
-                    cooked[row]       = (cooked[row] & ~(ROW_SHIFTER << col)) | (raw[row] & (ROW_SHIFTER << col));
+                    *debounce_pointer        = DEBOUNCE_ELAPSED;
+                    matrix_row_t cooked_next = (cooked[row] & ~(ROW_SHIFTER << col)) | (raw[row] & (ROW_SHIFTER << col));
+                    cooked_changed |= cooked[row] ^ cooked_next;
+                    cooked[row] = cooked_next;
                 } else {
                     *debounce_pointer -= elapsed_time;
                     counters_need_update = true;
diff --git a/quantum/debounce/sym_defer_pr.c b/quantum/debounce/sym_defer_pr.c
index ce24f0922f..452c4599d0 100644
--- a/quantum/debounce/sym_defer_pr.c
+++ b/quantum/debounce/sym_defer_pr.c
@@ -46,11 +46,12 @@ void debounce_free(void) {
     last_raw = NULL;
 }
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
-    uint16_t now       = timer_read();
-    uint16_t elapsed16 = TIMER_DIFF_16(now, last_time);
-    last_time          = now;
-    uint8_t elapsed    = (elapsed16 > 255) ? 255 : elapsed16;
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+    uint16_t now           = timer_read();
+    uint16_t elapsed16     = TIMER_DIFF_16(now, last_time);
+    last_time              = now;
+    uint8_t elapsed        = (elapsed16 > 255) ? 255 : elapsed16;
+    bool    cooked_changed = false;
 
     uint8_t* countdown = countdowns;
 
@@ -63,10 +64,13 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
         } else if (*countdown > elapsed) {
             *countdown -= elapsed;
         } else if (*countdown) {
+            cooked_changed |= cooked[row] ^ raw_row;
             cooked[row] = raw_row;
             *countdown  = 0;
         }
     }
+
+    return cooked_changed;
 }
 
 bool debounce_active(void) {
diff --git a/quantum/debounce/sym_eager_pk.c b/quantum/debounce/sym_eager_pk.c
index fe3e88bb06..f736d1645c 100644
--- a/quantum/debounce/sym_eager_pk.c
+++ b/quantum/debounce/sym_eager_pk.c
@@ -49,6 +49,7 @@ static debounce_counter_t *debounce_counters;
 static fast_timer_t        last_time;
 static bool                counters_need_update;
 static bool                matrix_need_update;
+static bool                cooked_changed;
 
 #    define DEBOUNCE_ELAPSED 0
 
@@ -71,8 +72,9 @@ void debounce_free(void) {
     debounce_counters = NULL;
 }
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
     bool updated_last = false;
+    cooked_changed    = false;
 
     if (counters_need_update) {
         fast_timer_t now          = timer_read_fast();
@@ -96,6 +98,8 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
 
         transfer_matrix_values(raw, cooked, num_rows);
     }
+
+    return cooked_changed;
 }
 
 // If the current time is > debounce counter, set the counter to enable input.
@@ -132,6 +136,7 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
                     *debounce_pointer    = DEBOUNCE;
                     counters_need_update = true;
                     existing_row ^= col_mask; // flip the bit.
+                    cooked_changed = true;
                 }
             }
             debounce_pointer++;
diff --git a/quantum/debounce/sym_eager_pr.c b/quantum/debounce/sym_eager_pr.c
index 29b0cabefb..aad5ca351b 100644
--- a/quantum/debounce/sym_eager_pr.c
+++ b/quantum/debounce/sym_eager_pr.c
@@ -48,6 +48,7 @@ static bool matrix_need_update;
 static debounce_counter_t *debounce_counters;
 static fast_timer_t        last_time;
 static bool                counters_need_update;
+static bool                cooked_changed;
 
 #    define DEBOUNCE_ELAPSED 0
 
@@ -67,8 +68,9 @@ void debounce_free(void) {
     debounce_counters = NULL;
 }
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+bool debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
     bool updated_last = false;
+    cooked_changed    = false;
 
     if (counters_need_update) {
         fast_timer_t now          = timer_read_fast();
@@ -92,6 +94,8 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
 
         transfer_matrix_values(raw, cooked, num_rows);
     }
+
+    return cooked_changed;
 }
 
 // If the current time is > debounce counter, set the counter to enable input.
@@ -123,8 +127,9 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
         // determine new value basd on debounce pointer + raw value
         if (existing_row != raw_row) {
             if (*debounce_pointer == DEBOUNCE_ELAPSED) {
-                *debounce_pointer    = DEBOUNCE;
-                cooked[row]          = raw_row;
+                *debounce_pointer = DEBOUNCE;
+                cooked[row]       = raw_row;
+                cooked_changed |= cooked[row] ^ raw[row];
                 counters_need_update = true;
             }
         }
diff --git a/quantum/debounce/tests/debounce_test_common.cpp b/quantum/debounce/tests/debounce_test_common.cpp
index 0d5a7bb766..bd98e32955 100644
--- a/quantum/debounce/tests/debounce_test_common.cpp
+++ b/quantum/debounce/tests/debounce_test_common.cpp
@@ -125,11 +125,15 @@ void DebounceTest::runDebounce(bool changed) {
     std::copy(std::begin(input_matrix_), std::end(input_matrix_), std::begin(raw_matrix_));
     std::copy(std::begin(output_matrix_), std::end(output_matrix_), std::begin(cooked_matrix_));
 
-    debounce(raw_matrix_, cooked_matrix_, MATRIX_ROWS, changed);
+    bool cooked_changed = debounce(raw_matrix_, cooked_matrix_, MATRIX_ROWS, changed);
 
     if (!std::equal(std::begin(input_matrix_), std::end(input_matrix_), std::begin(raw_matrix_))) {
         FAIL() << "Fatal error: debounce() modified raw matrix at " << strTime() << "\ninput_matrix: changed=" << changed << "\n" << strMatrix(input_matrix_) << "\nraw_matrix:\n" << strMatrix(raw_matrix_);
     }
+
+    if (std::equal(std::begin(output_matrix_), std::end(output_matrix_), std::begin(cooked_matrix_)) && cooked_changed) {
+        FAIL() << "Fatal error: debounce() did detect a wrong cooked matrix change at " << strTime() << "\noutput_matrix: cooked_changed=" << cooked_changed << "\n" << strMatrix(output_matrix_) << "\ncooked_matrix:\n" << strMatrix(cooked_matrix_);
+    }
 }
 
 void DebounceTest::checkCookedMatrix(bool changed, const std::string &error_message) {
diff --git a/quantum/matrix.c b/quantum/matrix.c
index db59b73754..db683104ed 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -337,10 +337,9 @@ uint8_t matrix_scan(void) {
     if (changed) memcpy(raw_matrix, curr_matrix, sizeof(curr_matrix));
 
 #ifdef SPLIT_KEYBOARD
-    debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
-    changed = (changed || matrix_post_scan());
+    changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan();
 #else
-    debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
+    changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
     matrix_scan_quantum();
 #endif
     return (uint8_t)changed;
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index 2cf8484347..68f0e38297 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -169,10 +169,9 @@ __attribute__((weak)) uint8_t matrix_scan(void) {
     bool changed = matrix_scan_custom(raw_matrix);
 
 #ifdef SPLIT_KEYBOARD
-    debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
-    changed = (changed || matrix_post_scan());
+    changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan();
 #else
-    debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
+    changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
     matrix_scan_quantum();
 #endif
 

From 643f6367a19649a0f5af6d43f2ed7f0e93b21f70 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 7 Jul 2022 14:14:09 +0200
Subject: [PATCH 084/959] [Fix] Patches after printf library update (#17584)

* Add missing '(' to print_bin_reverse32 declaration
* Fix insufficient character buffers on satisfaction75
* Remove \0 character in format string and use corrected offset math
  instead on rocketboard 16
* Replace snprintf_ with snprintf for djinn
* Explicitly ignore format checks for tracktyl manuform that uses %b
  specifier
* Print properly escaped version string in command.c, as PRODUCT or
  other defines can contain constructs like 'Vendor keyboard 66%' which
  will be interpreted as a format specifier
---
 .../satisfaction75/satisfaction_oled.c        |  4 ++--
 .../tractyl_manuform/tractyl_manuform.c       | 22 +++++++++----------
 .../rocketboard_16/keymaps/default/keymap.c   |  4 ++--
 keyboards/rocketboard_16/keymaps/via/keymap.c |  4 ++--
 .../djinn/graphics/theme_djinn_default.c      | 10 ++++-----
 quantum/command.c                             |  2 +-
 quantum/logging/print.h                       |  2 +-
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c
index fff8b65bd7..1e8465387c 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c
@@ -145,7 +145,7 @@ static char* get_time(void) {
         hour = 12;
     }
 
-    static char time_str[8] = "";
+    static char time_str[11] = "";
     sprintf(time_str, "%02d:%02d%s", hour, minute, is_pm ? "pm" : "am");
 
     return time_str;
@@ -162,7 +162,7 @@ static char* get_date(void) {
         day   = day_config;
     }
 
-    static char date_str[11] = "";
+    static char date_str[15] = "";
     sprintf(date_str, "%04d-%02d-%02d", year, month, day);
 
     return date_str;
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index c68234d8d8..d3e2e02975 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -247,17 +247,17 @@ static bool has_shift_mod(void) {
  */
 __attribute__((unused)) static void debug_charybdis_config_to_console(charybdis_config_t* config) {
 #    ifdef CONSOLE_ENABLE
-    dprintf("(charybdis) process_record_kb: config = {\n"
-            "\traw = 0x%04X,\n"
-            "\t{\n"
-            "\t\tis_dragscroll_enabled=%b\n"
-            "\t\tis_sniping_enabled=%b\n"
-            "\t\tdefault_dpi=0x%02X (%ld)\n"
-            "\t\tsniping_dpi=0x%01X (%ld)\n"
-            "\t}\n"
-            "}\n",
-            config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
-#    endif  // CONSOLE_ENABLE
+    IGNORE_FORMAT_WARNING(dprintf("(charybdis) process_record_kb: config = {\n"
+                                  "\traw = 0x%04X,\n"
+                                  "\t{\n"
+                                  "\t\tis_dragscroll_enabled=%b\n"
+                                  "\t\tis_sniping_enabled=%b\n"
+                                  "\t\tdefault_dpi=0x%02X (%ld)\n"
+                                  "\t\tsniping_dpi=0x%01X (%ld)\n"
+                                  "\t}\n"
+                                  "}\n",
+                                  config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config)));
+#    endif // CONSOLE_ENABLE
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
diff --git a/keyboards/rocketboard_16/keymaps/default/keymap.c b/keyboards/rocketboard_16/keymaps/default/keymap.c
index ce26a834d0..dc83cbd62b 100644
--- a/keyboards/rocketboard_16/keymaps/default/keymap.c
+++ b/keyboards/rocketboard_16/keymaps/default/keymap.c
@@ -107,10 +107,10 @@ static void oled_write_ln_centered(const char * data, bool inverted)
     char line_buf[21];
 
     // Amount to offset string from left side
-    uint8_t offset = (21 - strlen(data))/2;
+    uint8_t offset = (22 - strlen(data)) / 2;
 
     // Formatted string centering... look, it works, don't ask how...
-    snprintf(line_buf, 21, "%*s%s%*s\0", offset, "", data, offset, ""); // Centers data within 21 character buffer with null termination
+    snprintf(line_buf, 21, "%*s%s%*s", offset, "", data, offset, ""); // Centers data within 21 character buffer
 
     oled_write_ln(line_buf, inverted);
 }
diff --git a/keyboards/rocketboard_16/keymaps/via/keymap.c b/keyboards/rocketboard_16/keymaps/via/keymap.c
index ce26a834d0..08b8e65b4f 100644
--- a/keyboards/rocketboard_16/keymaps/via/keymap.c
+++ b/keyboards/rocketboard_16/keymaps/via/keymap.c
@@ -107,10 +107,10 @@ static void oled_write_ln_centered(const char * data, bool inverted)
     char line_buf[21];
 
     // Amount to offset string from left side
-    uint8_t offset = (21 - strlen(data))/2;
+    uint8_t offset = (22 - strlen(data))/2;
 
     // Formatted string centering... look, it works, don't ask how...
-    snprintf(line_buf, 21, "%*s%s%*s\0", offset, "", data, offset, ""); // Centers data within 21 character buffer with null termination
+    snprintf(line_buf, 21, "%*s%s%*s", offset, "", data, offset, ""); // Centers data within 21 character buffer
 
     oled_write_ln(line_buf, inverted);
 }
diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
index 616a3c2430..a4e87bd341 100644
--- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
+++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
@@ -158,7 +158,7 @@ void draw_ui_user(void) {
         if (hue_redraw || rgb_effect_redraw) {
             static int max_rgb_xpos = 0;
             xpos                    = 16;
-            snprintf_(buf, sizeof(buf), "rgb: %s", rgb_matrix_name(curr_effect));
+            snprintf(buf, sizeof(buf), "rgb: %s", rgb_matrix_name(curr_effect));
 
             for (int i = 5; i < sizeof(buf); ++i) {
                 if (buf[i] == 0)
@@ -187,7 +187,7 @@ void draw_ui_user(void) {
 
             static int max_layer_xpos = 0;
             xpos                      = 16;
-            snprintf_(buf, sizeof(buf), "layer: %s", layer_name);
+            snprintf(buf, sizeof(buf), "layer: %s", layer_name);
             xpos += qp_drawtext_recolor(lcd, xpos, ypos, thintel, buf, curr_hue, 255, 255, curr_hue, 255, 0);
             if (max_layer_xpos < xpos) {
                 max_layer_xpos = xpos;
@@ -200,7 +200,7 @@ void draw_ui_user(void) {
         if (hue_redraw || power_state_redraw) {
             static int max_power_xpos = 0;
             xpos                      = 16;
-            snprintf_(buf, sizeof(buf), "power: %s", usbpd_str(kb_state.current_setting));
+            snprintf(buf, sizeof(buf), "power: %s", usbpd_str(kb_state.current_setting));
             xpos += qp_drawtext_recolor(lcd, xpos, ypos, thintel, buf, curr_hue, 255, 255, curr_hue, 255, 0);
             if (max_power_xpos < xpos) {
                 max_power_xpos = xpos;
@@ -213,7 +213,7 @@ void draw_ui_user(void) {
         if (hue_redraw || scan_redraw) {
             static int max_scans_xpos = 0;
             xpos                      = 16;
-            snprintf_(buf, sizeof(buf), "scans: %d", (int)theme_state.scan_rate);
+            snprintf(buf, sizeof(buf), "scans: %d", (int)theme_state.scan_rate);
             xpos += qp_drawtext_recolor(lcd, xpos, ypos, thintel, buf, curr_hue, 255, 255, curr_hue, 255, 0);
             if (max_scans_xpos < xpos) {
                 max_scans_xpos = xpos;
@@ -226,7 +226,7 @@ void draw_ui_user(void) {
         if (hue_redraw || wpm_redraw) {
             static int max_wpm_xpos = 0;
             xpos                    = 16;
-            snprintf_(buf, sizeof(buf), "wpm: %d", (int)get_current_wpm());
+            snprintf(buf, sizeof(buf), "wpm: %d", (int)get_current_wpm());
             xpos += qp_drawtext_recolor(lcd, xpos, ypos, thintel, buf, curr_hue, 255, 255, curr_hue, 255, 0);
             if (max_wpm_xpos < xpos) {
                 max_wpm_xpos = xpos;
diff --git a/quantum/command.c b/quantum/command.c
index 2e94cb44b8..84757b9b01 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -161,7 +161,7 @@ static void command_common_help(void) {
 }
 
 static void print_version(void) {
-    print(/* clang-format off */
+    xprintf("%s", /* clang-format off */
         "\n\t- Version -\n"
         "VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") "
         "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") "
diff --git a/quantum/logging/print.h b/quantum/logging/print.h
index 5fbf189505..4c4195de50 100644
--- a/quantum/logging/print.h
+++ b/quantum/logging/print.h
@@ -100,7 +100,7 @@ void print_set_sendchar(sendchar_func_t func);
 #define print_bin32(i) IGNORE_FORMAT_WARNING(xprintf("%032lb", i))
 #define print_bin_reverse8(i) IGNORE_FORMAT_WARNING(xprintf("%08b", bitrev(i)))
 #define print_bin_reverse16(i) IGNORE_FORMAT_WARNING(xprintf("%016b", bitrev16(i)))
-#define print_bin_reverse32(i) IGNORE_FORMAT_WARNINGxprintf("%032lb", bitrev32(i)))
+#define print_bin_reverse32(i) IGNORE_FORMAT_WARNING(xprintf("%032lb", bitrev32(i)))
 /* print value utility */
 #define print_val_dec(v) xprintf(#v ": %u\n", v)
 #define print_val_decs(v) xprintf(#v ": %d\n", v)

From 81d317aa8768fe53a6cca040297231278b06af64 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 8 Jul 2022 22:48:48 +0100
Subject: [PATCH 085/959] Fix rgbkb/sol/rev2 build issues (#17601)

---
 lib/python/qmk/c_parse.py               |  3 +++
 lib/python/qmk/cli/generate/config_h.py | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py
index 4b49b8d4e9..c14eb490fa 100644
--- a/lib/python/qmk/c_parse.py
+++ b/lib/python/qmk/c_parse.py
@@ -258,6 +258,9 @@ def _parse_led_config(file, matrix_cols, matrix_rows):
                         position_raw.append(_coerce_led_token(_type, value))
                     if section == 3 and bracket_count == 2:
                         flags.append(_coerce_led_token(_type, value))
+                elif _type in [Token.Comment.Preproc]:
+                    # TODO: Promote to error
+                    return None
 
     # Slightly better intrim format
     matrix = list(_get_chunks(matrix_raw, matrix_cols))
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 9d50368aba..b53f4ff335 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -152,9 +152,14 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
     config_h_lines.append(f'#   define ENCODERS_PAD_B{postfix} {{ { ", ".join(b_pads) } }}')
     config_h_lines.append(f'#endif // ENCODERS_PAD_B{postfix}')
 
-    config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}')
-    config_h_lines.append(f'#   define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(resolutions) } }}')
-    config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')
+    if len(set(resolutions)) == 1:
+        config_h_lines.append(f'#ifndef ENCODER_RESOLUTION{postfix}')
+        config_h_lines.append(f'#   define ENCODER_RESOLUTION{postfix} { resolutions[0] }')
+        config_h_lines.append(f'#endif // ENCODER_RESOLUTION{postfix}')
+    else:
+        config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}')
+        config_h_lines.append(f'#   define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(resolutions) } }}')
+        config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')
 
 
 def generate_split_config(kb_info_json, config_h_lines):

From 345e19f691f067aeeb237c3f59ee710e13643182 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 8 Jul 2022 22:49:16 +0100
Subject: [PATCH 086/959] Add converter docs (#17593)

---
 docs/_summary.md             |  3 +-
 docs/feature_converters.md   | 95 ++++++++++++++++++++++++++++++++++++
 docs/platformdev_proton_c.md | 77 +++++++++++++++++++++++++++++
 docs/proton_c_conversion.md  | 91 ----------------------------------
 4 files changed, 174 insertions(+), 92 deletions(-)
 create mode 100644 docs/feature_converters.md
 create mode 100644 docs/platformdev_proton_c.md
 delete mode 100644 docs/proton_c_conversion.md

diff --git a/docs/_summary.md b/docs/_summary.md
index b5746ff6de..3abe48556f 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -107,6 +107,7 @@
     * [Audio](feature_audio.md)
     * [Bluetooth](feature_bluetooth.md)
     * [Bootmagic Lite](feature_bootmagic.md)
+    * [Converters](feature_converters.md)
     * [Custom Matrix](custom_matrix.md)
     * [Digitizer](feature_digitizer.md)
     * [DIP Switch](feature_dip_switch.md)
@@ -115,7 +116,6 @@
     * [Joystick](feature_joystick.md)
     * [LED Indicators](feature_led_indicators.md)
     * [MIDI](feature_midi.md)
-    * [Proton C Conversion](proton_c_conversion.md)
     * [PS/2 Mouse](feature_ps2_mouse.md)
     * [Split Keyboard](feature_split_keyboard.md)
     * [Stenography](feature_stenography.md)
@@ -167,6 +167,7 @@
       * [Selecting an MCU](platformdev_selecting_arm_mcu.md)
       * [Early initialization](platformdev_chibios_earlyinit.md)
       * [Raspberry Pi RP2040](platformdev_rp2040.md)
+      * [Proton C](platformdev_proton_c.md)
 
   * QMK Reference
     * [Contributing to QMK](contributing.md)
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
new file mode 100644
index 0000000000..4845912575
--- /dev/null
+++ b/docs/feature_converters.md
@@ -0,0 +1,95 @@
+# Converters
+
+Since many drop-in replacement controllers now exist, we've done our best to make them easy to use in existing designs.
+
+This page documents the handy automated process for converting keyboards.
+
+### Supported Converters
+
+Currently the following converters are available:
+
+| From       | To                |
+|------------|-------------------|
+| `promicro` | `proton_c`        |
+| `promicro` | `kb2040`          |
+| `promicro` | `promicro_rp2040` |
+
+See below for more in depth information on each converter.
+
+## Overview
+
+Each converter category is broken down by its declared `pin compatibility`.
+This ensures that only valid combinations are attempted.
+
+You can generate the firmware by appending `-e CONVERT_TO=<target>` to your compile/flash command. For example:
+
+```sh
+qmk flash -c -kb keebio/bdn9/rev1 -km default -e CONVERT_TO=proton_c
+```
+
+You can also add the same `CONVERT_TO=<target>` to your keymap's `rules.mk`, which will accomplish the same thing.
+
+?> If you get errors about `PORTB/DDRB`, etc not being defined, so you'll need to convert the keyboard's code to use the [GPIO Controls](gpio_control.md) that will work for both ARM and AVR. This shouldn't affect the AVR builds at all.
+
+### Conditional Configuration
+
+Once a converter is enabled, it exposes the `CONVERT_TO_<target_uppercase>` flag that you can use in your code with `#ifdef`s, For example:
+
+```c
+#ifdef CONVERT_TO_PROTON_C
+    // Proton C code
+#else
+    // Pro Micro code
+#endif
+```
+
+## Pro Micro
+
+If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.com/products/12640) (or compatible board), the supported alternative controllers are:
+
+| Device                                                                 | Target            |
+|------------------------------------------------------------------------|-------------------|
+| [Proton C](https://qmk.fm/proton-c/)                                   | `proton_c`        |
+| [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040)          | `kb2040`          |
+| [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) | `promicro_rp2040` |
+
+Converter summary:
+
+| Target            | Argument                        | `rules.mk`                   | Condition                           |
+|-------------------|---------------------------------|------------------------------|-------------------------------------|
+| `proton_c`        | `-e CONVERT_TO=proton_c`        | `CONVERT_TO=proton_c`        | `#ifdef CONVERT_TO_PROTON_C`        |
+| `kb2040`          | `-e CONVERT_TO=kb2040`          | `CONVERT_TO=kb2040`          | `#ifdef CONVERT_TO_KB2040`          |
+| `promicro_rp2040` | `-e CONVERT_TO=promicro_rp2040` | `CONVERT_TO=promicro_rp2040` | `#ifdef CONVERT_TO_PROMICRO_RP2040` |
+
+### Proton C :id=proton_c
+
+The Proton C only has one on-board LED (C13), and by default, the TXLED (D5) is mapped to it. If you want the RXLED (B0) mapped to it instead, add this like to your `config.h`:
+
+```c
+#define CONVERT_TO_PROTON_C_RXLED
+```
+
+The following defaults are based on what has been implemented for STM32 boards.
+
+| Feature                                      | Notes                                                                                                            |
+|----------------------------------------------|------------------------------------------------------------------------------------------------------------------|
+| [Audio](feature_audio.md)                    | Enabled                                                                                                          |
+| [RGB Lighting](feature_rgblight.md)          | Disabled                                                                                                         |
+| [Backlight](feature_backlight.md)            | Forces [task driven PWM](feature_backlight.md#software-pwm-driver) until ARM can provide automatic configuration |
+| USB Host (e.g. USB-USB converter)            | Not supported (USB host code is AVR specific and is not currently supported on ARM)                              |
+| [Split keyboards](feature_split_keyboard.md) | Partial - heavily dependent on enabled features                                                                  |
+
+### Adafruit KB2040 :id=kb2040
+
+The following defaults are based on what has been implemented for [RP2040](platformdev_rp2040.md) boards.
+
+| Feature                                      | Notes                                                                                                            |
+|----------------------------------------------|------------------------------------------------------------------------------------------------------------------|
+| [RGB Lighting](feature_rgblight.md)          | Enabled via `PIO` vendor driver                                                                                  |
+| [Backlight](feature_backlight.md)            | Forces [task driven PWM](feature_backlight.md#software-pwm-driver) until ARM can provide automatic configuration |
+| USB Host (e.g. USB-USB converter)            | Not supported (USB host code is AVR specific and is not currently supported on ARM)                              |
+| [Split keyboards](feature_split_keyboard.md) | Partial via `PIO` vendor driver - heavily dependent on enabled features                                          |
+
+### SparkFun Pro Micro - RP2040 :id=promicro_rp2040
+
+Currently identical to  [Adafruit KB2040](#kb2040).
diff --git a/docs/platformdev_proton_c.md b/docs/platformdev_proton_c.md
new file mode 100644
index 0000000000..3afec893fa
--- /dev/null
+++ b/docs/platformdev_proton_c.md
@@ -0,0 +1,77 @@
+# Proton C
+
+The Proton C is an Arm STM32F303xC based drop-in replacement for the Pro Micro.
+
+<img src="https://i.imgur.com/GdsN1Rdh.jpg" alt="Proton C" />
+
+#### Features
+
+* Through-hole mounted USB-C Port
+* 32-bit 72MHz Cortex-M4 processor (STM32F303CCT6)
+* I2C, SPI, PWM, DMA, DAC, USART, I2S
+* 23x 3.3V I/O Ports
+* 1x 5V output for WS2812 LED chains
+* 256kB flash
+* 40kB RAM
+* AST1109MLTRQ speaker footprint
+* Reset button
+
+## Warnings
+
+Some of the PCBs compatible with Pro Micro have VCC (3.3V) and RAW (5V) pins connected (shorted) on the pcb. Using the Proton C will short 5V power from USB and regulated 3.3V which is connected directly to the MCU. Shorting those pins may damage the MCU on the Proton C.
+
+So far, it appears that this is only an issue on the Gherkin PCBs, but other PCBs may be affected in this way.
+
+In this case, you may want to not hook up the RAW pin at all.
+
+## Manual Conversion
+
+To use the Proton C natively, without having to specify `CONVERT_TO=proton_c`, you need to change the `MCU` line in `rules.mk`:
+
+```
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+```
+
+Remove these variables if they exist:
+
+* `BOOTLOADER`
+* `EXTRA_FLAGS`
+
+Finally convert all pin assignments in `config.h` to the stm32 equivalents.
+
+| Pro Micro Left | Proton C Left | | Proton C Right | Pro Micro Right |
+|-----------|----------|-|----------|-----------|
+| `D3` | `A9` | | 5v | RAW (5v) |
+| `D2` | `A10` | | GND | GND |
+| GND | GND | | FLASH | RESET |
+| GND | GND | | 3.3v | VCC <sup>1</sup> |
+| `D1` | `B7` | | `A2` | `F4` |
+| `D0` | `B6` | | `A1` | `F5` |
+| `D4` | `B5` | | `A0` | `F6` |
+| `C6` | `B4` | | `B8` | `F7` |
+| `D7` | `B3` | | `B13` | `B1` |
+| `E6` | `B2` | | `B14` | `B3` |
+| `B4` | `B1` | | `B15` | `B2` |
+| `B5` | `B0` | | `B9` | `B6` |
+| `B0` (RX LED) | `C13` <sup>2</sup> | | `C13` <sup>2</sup> | `D5` (TX LED) |
+
+You can also make use of several new pins on the extended portion of the Proton C:
+
+| Left | | Right | 
+|------|-|-------|
+| `A4`<sup>3</sup> | | `B10` |
+| `A5`<sup>4</sup> | | `B11` |
+| `A6` | | `B12` |
+| `A7` | | `A14`<sup>5</sup> (SWCLK) |
+| `A8` | | `A13`<sup>5</sup> (SWDIO) |
+| `A15` | | RESET<sup>6</sup> |
+
+Notes:
+
+1. On a Pro Micro VCC can be 3.3v or 5v.
+2. A Proton C only has one onboard LED, not two like a Pro Micro. The Pro Micro has an RX LED on `D5` and a TX LED on `B0`.
+3. `A4` is shared with the speaker.
+4. `A5` is shared with the speaker.
+5. `A13` and `A14` are used for hardware debugging (SWD). You can also use them for GPIO, but should use them last.
+6. Short RESET to 3.3v (pull high) to reboot the MCU. This does not enter bootloader mode like a Pro Micro, it only resets the MCU.
diff --git a/docs/proton_c_conversion.md b/docs/proton_c_conversion.md
deleted file mode 100644
index 1e1b1e806d..0000000000
--- a/docs/proton_c_conversion.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Converting a board to use the Proton C
-
-Since the Proton C is a drop-in replacement for a Pro Micro we've made it easy to use. This page documents a handy automated process for converting keyboards, as well as documenting the manual process if you'd like to make use of Proton C features that aren't available on Pro Micros.
-
-## Automatic Conversion
-
-If a board currently supported in QMK uses a Pro Micro (or compatible board) and you want to use the Proton C, you can generate the firmware by appending `CONVERT_TO_PROTON_C=yes` (or `CTPC=yes`) to your make argument, like this:
-
-    make 40percentclub/mf68:default CTPC=yes
-
-You can add the same argument to your keymap's `rules.mk`, which will accomplish the same thing.
-
-This exposes the `CONVERT_TO_PROTON_C` flag that you can use in your code with `#ifdef`s, like this:
-
-```c
-#ifdef CONVERT_TO_PROTON_C
-    // Proton C code
-#else
-    // Pro Micro code
-#endif
-```
-
-If you get errors about `PORTB/DDRB`, etc not being defined, so you'll need to convert the keyboard's code to use the [GPIO Controls](gpio_control.md) that will work for both ARM and AVR. This shouldn't affect the AVR builds at all.
-
-The Proton C only has one on-board LED (C13), and by default, the TXLED (D5) is mapped to it. If you want the RXLED (B0) mapped to it instead, add this like to your `config.h`:
-
-    #define CONVERT_TO_PROTON_C_RXLED
-
-## Feature Conversion
-
-These are defaults based on what has been implemented for ARM boards.
-
-| Feature                             | Notes                                                                                                            |
-|-------------------------------------|------------------------------------------------------------------------------------------------------------------|
-| [Audio](feature_audio.md)           | Enabled                                                                                                          |  
-| [RGB Lighting](feature_rgblight.md) | Disabled                                                                                                         |
-| [Backlight](feature_backlight.md)   | Forces [task driven PWM](feature_backlight.md#software-pwm-driver) until ARM can provide automatic configuration |
-| USB Host (e.g. USB-USB converter)   | Not supported (USB host code is AVR specific and is not currently supported on ARM)                              |
-| [Split keyboards](feature_split_keyboard.md) | Partial - heavily dependent on enabled features                                                         |
-
-## Manual Conversion
-
-To use the Proton C natively, without having to specify `CTPC=yes`, you need to change the `MCU` line in `rules.mk`:
-
-```
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-```
-
-Remove these variables if they exist:
-
-* `BOOTLOADER`
-* `EXTRA_FLAGS`
-
-Finally convert all pin assignments in `config.h` to the stm32 equivalents.
-
-| Pro Micro Left | Proton C Left | | Proton C Right | Pro Micro Right |
-|-----------|----------|-|----------|-----------|
-| `D3` | `A9` | | 5v | RAW (5v) |
-| `D2` | `A10` | | GND | GND |
-| GND | GND | | FLASH | RESET |
-| GND | GND | | 3.3v | VCC <sup>1</sup> |
-| `D1` | `B7` | | `A2` | `F4` |
-| `D0` | `B6` | | `A1` | `F5` |
-| `D4` | `B5` | | `A0` | `F6` |
-| `C6` | `B4` | | `B8` | `F7` |
-| `D7` | `B3` | | `B13` | `B1` |
-| `E6` | `B2` | | `B14` | `B3` |
-| `B4` | `B1` | | `B15` | `B2` |
-| `B5` | `B0` | | `B9` | `B6` |
-| `B0` (RX LED) | `C13` <sup>2</sup> | | `C13` <sup>2</sup> | `D5` (TX LED) |
-
-You can also make use of several new pins on the extended portion of the Proton C:
-
-| Left | | Right | 
-|------|-|-------|
-| `A4`<sup>3</sup> | | `B10` |
-| `A5`<sup>4</sup> | | `B11` |
-| `A6` | | `B12` |
-| `A7` | | `A14`<sup>5</sup> (SWCLK) |
-| `A8` | | `A13`<sup>5</sup> (SWDIO) |
-| `A15` | | RESET<sup>6</sup> |
-
-Notes:
-
-1. On a Pro Micro VCC can be 3.3v or 5v.
-2. A Proton C only has one onboard LED, not two like a Pro Micro. The Pro Micro has an RX LED on `D5` and a TX LED on `B0`.
-3. `A4` is shared with the speaker.
-4. `A5` is shared with the speaker.
-5. `A13` and `A14` are used for hardware debugging (SWD). You can also use them for GPIO, but should use them last.
-6. Short RESET to 3.3v (pull high) to reboot the MCU. This does not enter bootloader mode like a Pro Micro, it only resets the MCU.

From 13b2b93fb0e66e421430733360f0af852bae8964 Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Fri, 8 Jul 2022 17:33:03 -0500
Subject: [PATCH 087/959] Add Adafruit Macropad (#17512)

---
 keyboards/adafruit/macropad/config.h          | 137 +++
 keyboards/adafruit/macropad/halconf.h         |  28 +
 keyboards/adafruit/macropad/info.json         |  24 +
 .../macropad/keymaps/default/keymap.c         | 114 +++
 .../adafruit/macropad/lib/oled_driver_spi.h   |  29 +
 .../adafruit/macropad/lib/ssd1306_sh1106.c    | 827 ++++++++++++++++++
 keyboards/adafruit/macropad/macropad.c        |  56 ++
 keyboards/adafruit/macropad/macropad.h        |  38 +
 keyboards/adafruit/macropad/mcuconf.h         |  22 +
 keyboards/adafruit/macropad/readme.md         |  37 +
 keyboards/adafruit/macropad/rules.mk          |  26 +
 11 files changed, 1338 insertions(+)
 create mode 100644 keyboards/adafruit/macropad/config.h
 create mode 100644 keyboards/adafruit/macropad/halconf.h
 create mode 100644 keyboards/adafruit/macropad/info.json
 create mode 100644 keyboards/adafruit/macropad/keymaps/default/keymap.c
 create mode 100644 keyboards/adafruit/macropad/lib/oled_driver_spi.h
 create mode 100644 keyboards/adafruit/macropad/lib/ssd1306_sh1106.c
 create mode 100644 keyboards/adafruit/macropad/macropad.c
 create mode 100644 keyboards/adafruit/macropad/macropad.h
 create mode 100644 keyboards/adafruit/macropad/mcuconf.h
 create mode 100644 keyboards/adafruit/macropad/readme.md
 create mode 100644 keyboards/adafruit/macropad/rules.mk

diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
new file mode 100644
index 0000000000..8d7298e09c
--- /dev/null
+++ b/keyboards/adafruit/macropad/config.h
@@ -0,0 +1,137 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 3
+
+#define VENDOR_ID    0x239A
+#define PRODUCT_ID   0x0108
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Adafruit
+#define PRODUCT      Macropad RP2040
+
+/* Keyboard Matrix Assignments */
+// clang-format off
+#define DIRECT_PINS { \
+    { NO_PIN, NO_PIN, GP0  }, \
+    { GP1,    GP2,    GP3  }, \
+    { GP4,    GP5,    GP6  }, \
+    { GP7,    GP8,    GP9  }, \
+    { GP10,   GP11,   GP12 }  \
+}
+// clang-format on
+
+/* OLED SPI Defines */
+#define OLED_DISPLAY_128X64
+#define OLED_IC OLED_IC_SH1106
+
+/* OLED SPI Pins */
+#define OLED_DC_PIN GP24
+#define OLED_CS_PIN GP22
+#define OLED_RST_PIN GP23
+
+/* Shift OLED columns by 2 pixels */
+#define OLED_COLUMN_OFFSET 2
+
+/* Divisor for OLED */
+#define OLED_SPI_DIVISOR 4
+
+/* ChibiOS SPI definitions */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN GP26
+#define SPI_MOSI_PIN GP27
+#define SPI_MISO_PIN GP28
+
+/* Encoders */
+#define ENCODERS_PAD_A { GP18 }
+#define ENCODERS_PAD_B { GP17 }
+
+#define DEBOUNCE 5
+
+/* Bootmagic lite */
+/* (Press the Encoder button while plugging the keyboard to enter the bootloader) */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 2
+
+/* Double tap the side button to enter bootloader */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+/* Audio (Unsupported for now)*/
+// #define AUDIO_PIN GP16
+// #define SPEAKER_SHUTDOWN GP14
+
+#ifdef RGB_MATRIX_ENABLE
+
+     /* RGB Defines */
+#    define RGB_DI_PIN GP19
+#    define DRIVER_LED_TOTAL 12
+#    define RGBLED_NUM 12
+
+     /* Enable Framebuffer and keypress effects */
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_KEYPRESSES
+
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/adafruit/macropad/halconf.h b/keyboards/adafruit/macropad/halconf.h
new file mode 100644
index 0000000000..6cd66fd520
--- /dev/null
+++ b/keyboards/adafruit/macropad/halconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <halconf.h>
+
+#undef HAL_USE_SPI
+#define HAL_USE_SPI TRUE
+
+#undef SPI_USE_WAIT
+#define SPI_USE_WAIT TRUE
+
+#undef SPI_SELECT_MODE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
new file mode 100644
index 0000000000..ffa31780a9
--- /dev/null
+++ b/keyboards/adafruit/macropad/info.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Adafruit Macropad RP2040",
+    "url": "https://learn.adafruit.com/adafruit-macropad-rp2040",
+    "maintainer": "Jpe230",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Mute", "x":2, "y":0},
+                {"label":"Enter", "x":0, "y":1},
+                {"label":"KC_0", "x":1, "y":1},
+                {"label":"BackSpace", "x":2, "y":1},
+                {"label":"KC_7", "x":0, "y":2},
+                {"label":"KC_8", "x":1, "y":2},
+                {"label":"KC_9", "x":2, "y":2},
+                {"label":"KC_4", "x":0, "y":3},
+                {"label":"KC_5", "x":1, "y":3},
+                {"label":"KC_6", "x":2, "y":3},
+                {"label":"KC_1", "x":0, "y":4},
+                {"label":"KC_2", "x":1, "y":4},
+                {"label":"KC_3", "x":2, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/adafruit/macropad/keymaps/default/keymap.c b/keyboards/adafruit/macropad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..26c6b4ccf2
--- /dev/null
+++ b/keyboards/adafruit/macropad/keymaps/default/keymap.c
@@ -0,0 +1,114 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+                    KC_MUTE,
+      KC_ENT, KC_0, KC_BSPC,
+      KC_7,   KC_8, KC_9,
+      KC_4,   KC_5, KC_6,
+      KC_1,   KC_2, KC_3
+  )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+};
+#endif
+
+
+#ifdef OLED_ENABLE
+static void render_qmk_logo(void) {
+  static const char PROGMEM qmk_logo[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
+    0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe,
+    0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff,
+    0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff,
+    0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
+    0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+  };
+
+  oled_write_raw_P(qmk_logo, sizeof(qmk_logo));
+}
+
+bool oled_task_user(void) {
+  render_qmk_logo();
+  return true;
+}
+
+#endif
+
diff --git a/keyboards/adafruit/macropad/lib/oled_driver_spi.h b/keyboards/adafruit/macropad/lib/oled_driver_spi.h
new file mode 100644
index 0000000000..c8a2cd7d9a
--- /dev/null
+++ b/keyboards/adafruit/macropad/lib/oled_driver_spi.h
@@ -0,0 +1,29 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifndef OLED_DC_PIN
+#   error "The OLED driver in SPI needs a D/C pin defined"
+#endif
+#ifndef OLED_CS_PIN
+#   error "The OLED driver in SPI needs a CS pin defined"
+#endif
+#ifndef OLED_SPI_MODE
+#   define OLED_SPI_MODE 3
+#endif
+#ifndef OLED_SPI_DIVISOR
+#   define OLED_SPI_DIVISOR 2
+#endif
diff --git a/keyboards/adafruit/macropad/lib/ssd1306_sh1106.c b/keyboards/adafruit/macropad/lib/ssd1306_sh1106.c
new file mode 100644
index 0000000000..dc1289fdb1
--- /dev/null
+++ b/keyboards/adafruit/macropad/lib/ssd1306_sh1106.c
@@ -0,0 +1,827 @@
+/*
+Copyright 2019 Ryan Caltabiano <https://github.com/XScorpion2>
+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 "oled_driver.h"
+#include "oled_driver_spi.h"
+
+#include "spi_master.h"
+
+#include <quantum.h>
+#include OLED_FONT_H
+#include "timer.h"
+#include "print.h"
+
+#include <string.h>
+
+#include "progmem.h"
+
+#include "keyboard.h"
+
+// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
+// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf
+
+// Fundamental Commands
+#define CONTRAST 0x81
+#define DISPLAY_ALL_ON 0xA5
+#define DISPLAY_ALL_ON_RESUME 0xA4
+#define NORMAL_DISPLAY 0xA6
+#define INVERT_DISPLAY 0xA7
+#define DISPLAY_ON 0xAF
+#define DISPLAY_OFF 0xAE
+#define NOP 0xE3
+
+// Scrolling Commands
+#define ACTIVATE_SCROLL 0x2F
+#define DEACTIVATE_SCROLL 0x2E
+#define SCROLL_RIGHT 0x26
+#define SCROLL_LEFT 0x27
+#define SCROLL_RIGHT_UP 0x29
+#define SCROLL_LEFT_UP 0x2A
+
+// Addressing Setting Commands
+#define MEMORY_MODE 0x20
+#define COLUMN_ADDR 0x21
+#define PAGE_ADDR 0x22
+#define PAM_SETCOLUMN_LSB 0x00
+#define PAM_SETCOLUMN_MSB 0x10
+#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7
+
+// Hardware Configuration Commands
+#define DISPLAY_START_LINE 0x40
+#define SEGMENT_REMAP 0xA0
+#define SEGMENT_REMAP_INV 0xA1
+#define MULTIPLEX_RATIO 0xA8
+#define COM_SCAN_INC 0xC0
+#define COM_SCAN_DEC 0xC8
+#define DISPLAY_OFFSET 0xD3
+#define COM_PINS 0xDA
+#define COM_PINS_SEQ 0x02
+#define COM_PINS_ALT 0x12
+#define COM_PINS_SEQ_LR 0x22
+#define COM_PINS_ALT_LR 0x32
+
+// Timing & Driving Commands
+#define DISPLAY_CLOCK 0xD5
+#define PRE_CHARGE_PERIOD 0xD9
+#define VCOM_DETECT 0xDB
+
+// Advance Graphic Commands
+#define FADE_BLINK 0x23
+#define ENABLE_FADE 0x20
+#define ENABLE_BLINK 0x30
+
+// Charge Pump Commands
+#define CHARGE_PUMP 0x8D
+
+// Misc defines
+#ifndef OLED_BLOCK_COUNT
+#    define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)
+#endif
+#ifndef OLED_BLOCK_SIZE
+#    define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)
+#endif
+
+#define OLED_ALL_BLOCKS_MASK (((((OLED_BLOCK_TYPE)1 << (OLED_BLOCK_COUNT - 1)) - 1) << 1) | 1)
+
+#define ARRAY_SIZE(arr) sizeof(arr)/sizeof(arr[0])
+
+// spi defines
+#define OLED_STATUS_SUCCESS SPI_STATUS_SUCCESS
+
+void oled_spi_init(void) {
+    spi_init();
+
+    setPinOutput(OLED_CS_PIN);
+    writePinHigh(OLED_CS_PIN);
+
+    setPinOutput(OLED_DC_PIN);
+    writePinLow(OLED_DC_PIN);
+}
+
+void oled_spi_start(void) {
+    spi_start(OLED_CS_PIN, false, OLED_SPI_MODE, OLED_SPI_DIVISOR);
+}
+
+void oled_spi_stop(void) {
+    spi_stop();
+}
+
+// Transmit/Write Funcs.
+bool oled_cmd(const uint8_t *data, uint16_t size) {
+    oled_spi_start();
+    // Command Mode
+    writePinLow(OLED_DC_PIN);
+    // Send the commands
+    if(spi_transmit(data, size) != OLED_STATUS_SUCCESS){
+        oled_spi_stop();
+        return false;
+    }
+    oled_spi_stop();
+    return true;
+}
+
+bool oled_cmd_p(const uint8_t *data, uint16_t size) {
+    return oled_cmd(data, size);
+}
+
+bool oled_write_reg(const uint8_t *data, uint16_t size)
+{
+    oled_spi_start();
+    // Command Mode
+    writePinHigh(OLED_DC_PIN);
+    // Send the commands
+    if(spi_transmit(data, size) != OLED_STATUS_SUCCESS){
+        oled_spi_stop();
+        return false;
+    }
+    oled_spi_stop();
+    return true;
+}
+
+#define HAS_FLAGS(bits, flags) ((bits & flags) == flags)
+
+// Display buffer's is the same as the OLED memory layout
+// this is so we don't end up with rounding errors with
+// parts of the display unusable or don't get cleared correctly
+// and also allows for drawing & inverting
+uint8_t         oled_buffer[OLED_MATRIX_SIZE];
+uint8_t *       oled_cursor;
+OLED_BLOCK_TYPE oled_dirty          = 0;
+bool            oled_initialized    = false;
+bool            oled_active         = false;
+bool            oled_scrolling      = false;
+bool            oled_inverted       = false;
+uint8_t         oled_brightness     = OLED_BRIGHTNESS;
+oled_rotation_t oled_rotation       = 0;
+uint8_t         oled_rotation_width = 0;
+uint8_t         oled_scroll_speed   = 0; // this holds the speed after being remapped to ssd1306 internal values
+uint8_t         oled_scroll_start   = 0;
+uint8_t         oled_scroll_end     = 7;
+#if OLED_TIMEOUT > 0
+uint32_t oled_timeout;
+#endif
+#if OLED_SCROLL_TIMEOUT > 0
+uint32_t oled_scroll_timeout;
+#endif
+#if OLED_UPDATE_INTERVAL > 0
+uint16_t oled_update_timeout;
+#endif
+
+// Flips the rendering bits for a character at the current cursor position
+static void InvertCharacter(uint8_t *cursor) {
+    const uint8_t *end = cursor + OLED_FONT_WIDTH;
+    while (cursor < end) {
+        *cursor = ~(*cursor);
+        cursor++;
+    }
+}
+
+bool oled_init(oled_rotation_t rotation) {
+    oled_rotation = oled_init_user(oled_init_kb(rotation));
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        oled_rotation_width = OLED_DISPLAY_WIDTH;
+    } else {
+        oled_rotation_width = OLED_DISPLAY_HEIGHT;
+    }
+
+    oled_spi_init();
+
+#ifdef OLED_RST_PIN
+    /* Reset device */
+    setPinOutput(OLED_RST_PIN);
+    writePinLow(OLED_RST_PIN);
+    wait_ms(20);
+    writePinHigh(OLED_RST_PIN);
+    wait_ms(20);
+#endif
+
+    static const uint8_t PROGMEM display_setup1[] = {
+        DISPLAY_OFF,
+        DISPLAY_CLOCK,
+        0x80,
+        MULTIPLEX_RATIO,
+        OLED_DISPLAY_HEIGHT - 1,
+        DISPLAY_OFFSET,
+        0x00,
+        DISPLAY_START_LINE | 0x00,
+        CHARGE_PUMP,
+        0x14,
+#if (OLED_IC != OLED_IC_SH1106)
+        // MEMORY_MODE is unsupported on SH1106 (Page Addressing only)
+        MEMORY_MODE,
+        0x00, // Horizontal addressing mode
+#endif
+    };
+
+    if (!oled_cmd_p(display_setup1, ARRAY_SIZE(display_setup1))) {
+        print("oled_init cmd set 1 failed\n");
+        return false;
+    }
+
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_180)) {
+        static const uint8_t PROGMEM display_normal[] = {SEGMENT_REMAP_INV, COM_SCAN_DEC};
+        if (!oled_cmd_p(display_normal, ARRAY_SIZE(display_normal))) {
+            print("oled_init cmd normal rotation failed\n");
+            return false;
+        }
+    } else {
+        static const uint8_t PROGMEM display_flipped[] = {SEGMENT_REMAP, COM_SCAN_INC};
+        if (!oled_cmd_p(display_flipped, ARRAY_SIZE(display_flipped))) {
+            print("display_flipped failed\n");
+            return false;
+        }
+    }
+
+    static const uint8_t PROGMEM display_setup2[] = {COM_PINS, OLED_COM_PINS, CONTRAST, OLED_BRIGHTNESS, PRE_CHARGE_PERIOD, 0xF1, VCOM_DETECT, 0x20, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON};
+    if (!oled_cmd_p(display_setup2, ARRAY_SIZE(display_setup2))) {
+        print("display_setup2 failed\n");
+        return false;
+    }
+
+#if OLED_TIMEOUT > 0
+    oled_timeout = timer_read32() + OLED_TIMEOUT;
+#endif
+#if OLED_SCROLL_TIMEOUT > 0
+    oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT;
+#endif
+
+    oled_clear();
+    oled_initialized = true;
+    oled_active      = true;
+    oled_scrolling   = false;
+    return true;
+}
+
+__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return rotation;
+}
+__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return rotation;
+}
+
+void oled_clear(void) {
+    memset(oled_buffer, 0, sizeof(oled_buffer));
+    oled_cursor = &oled_buffer[0];
+    oled_dirty  = OLED_ALL_BLOCKS_MASK;
+}
+
+static void calc_bounds(uint8_t update_start, uint8_t *cmd_array) {
+    // Calculate commands to set memory addressing bounds.
+    uint8_t start_page   = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_WIDTH;
+    uint8_t start_column = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_WIDTH;
+#if (OLED_IC == OLED_IC_SH1106)
+    // Commands for Page Addressing Mode. Sets starting page and column; has no end bound.
+    // Column value must be split into high and low nybble and sent as two commands.
+    cmd_array[0] = PAM_PAGE_ADDR | start_page;
+    cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f);
+    cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f);
+    cmd_array[3] = NOP;
+    cmd_array[4] = NOP;
+    cmd_array[5] = NOP;
+#else
+    // Commands for use in Horizontal Addressing mode.
+    cmd_array[1] = start_column;
+    cmd_array[4] = start_page;
+    cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) % OLED_DISPLAY_WIDTH + cmd_array[1];
+    cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) / OLED_DISPLAY_WIDTH - 1;
+#endif
+}
+
+static void calc_bounds_90(uint8_t update_start, uint8_t *cmd_array) {
+    cmd_array[1] = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8;
+    cmd_array[4] = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT;
+    cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8 - 1 + cmd_array[1];
+    ;
+    cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) % OLED_DISPLAY_HEIGHT / 8;
+}
+
+uint8_t crot(uint8_t a, int8_t n) {
+    const uint8_t mask = 0x7;
+    n &= mask;
+    return a << n | a >> (-n & mask);
+}
+
+static void rotate_90(const uint8_t *src, uint8_t *dest) {
+    for (uint8_t i = 0, shift = 7; i < 8; ++i, --shift) {
+        uint8_t selector = (1 << i);
+        for (uint8_t j = 0; j < 8; ++j) {
+            dest[i] |= crot(src[j] & selector, shift - (int8_t)j);
+        }
+    }
+}
+
+void oled_render(void) {
+    if (!oled_initialized) {
+        return;
+    }
+
+    // Do we have work to do?
+    oled_dirty &= OLED_ALL_BLOCKS_MASK;
+    if (!oled_dirty || oled_scrolling) {
+        return;
+    }
+
+    // Find first dirty block
+    uint8_t update_start = 0;
+    while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) {
+        ++update_start;
+    }
+
+    // Set column & page position
+    static uint8_t display_start[] = {COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        calc_bounds(update_start, display_start);
+    } else {
+        calc_bounds_90(update_start, display_start);
+    }
+
+    // Send column & page position
+    if (!oled_cmd(display_start, ARRAY_SIZE(display_start))) {
+        print("oled_render offset command failed\n");
+        return;
+    }
+
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        // Send render data chunk as is
+        if (!oled_write_reg(&oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE)) {
+            print("oled_render data failed\n");
+            return;
+        }
+    } else {
+        // Rotate the render chunks
+        const static uint8_t source_map[] = OLED_SOURCE_MAP;
+        const static uint8_t target_map[] = OLED_TARGET_MAP;
+
+        static uint8_t temp_buffer[OLED_BLOCK_SIZE];
+        memset(temp_buffer, 0, sizeof(temp_buffer));
+        for (uint8_t i = 0; i < sizeof(source_map); ++i) {
+            rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]);
+        }
+
+        // Send render data chunk after rotating
+        if (!oled_write_reg(temp_buffer, OLED_BLOCK_SIZE)) {
+            print("oled_render90 data failed\n");
+            return;
+        }
+    }
+
+    // Turn on display if it is off
+    oled_on();
+
+    // Clear dirty flag
+    oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start);
+}
+
+void oled_set_cursor(uint8_t col, uint8_t line) {
+    uint16_t index = line * oled_rotation_width + col * OLED_FONT_WIDTH;
+
+    // Out of bounds?
+    if (index >= OLED_MATRIX_SIZE) {
+        index = 0;
+    }
+
+    oled_cursor = &oled_buffer[index];
+}
+
+void oled_advance_page(bool clearPageRemainder) {
+    uint16_t index     = oled_cursor - &oled_buffer[0];
+    uint8_t  remaining = oled_rotation_width - (index % oled_rotation_width);
+
+    if (clearPageRemainder) {
+        // Remaining Char count
+        remaining = remaining / OLED_FONT_WIDTH;
+
+        // Write empty character until next line
+        while (remaining--)
+            oled_write_char(' ', false);
+    } else {
+        // Next page index out of bounds?
+        if (index + remaining >= OLED_MATRIX_SIZE) {
+            index     = 0;
+            remaining = 0;
+        }
+
+        oled_cursor = &oled_buffer[index + remaining];
+    }
+}
+
+void oled_advance_char(void) {
+    uint16_t nextIndex      = oled_cursor - &oled_buffer[0] + OLED_FONT_WIDTH;
+    uint8_t  remainingSpace = oled_rotation_width - (nextIndex % oled_rotation_width);
+
+    // Do we have enough space on the current line for the next character
+    if (remainingSpace < OLED_FONT_WIDTH) {
+        nextIndex += remainingSpace;
+    }
+
+    // Did we go out of bounds
+    if (nextIndex >= OLED_MATRIX_SIZE) {
+        nextIndex = 0;
+    }
+
+    // Update cursor position
+    oled_cursor = &oled_buffer[nextIndex];
+}
+
+// Main handler that writes character data to the display buffer
+void oled_write_char(const char data, bool invert) {
+    // Advance to the next line if newline
+    if (data == '\n') {
+        // Old source wrote ' ' until end of line...
+        oled_advance_page(true);
+        return;
+    }
+
+    if (data == '\r') {
+        oled_advance_page(false);
+        return;
+    }
+
+    // copy the current render buffer to check for dirty after
+    static uint8_t oled_temp_buffer[OLED_FONT_WIDTH];
+    memcpy(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH);
+
+    _Static_assert(sizeof(font) >= ((OLED_FONT_END + 1 - OLED_FONT_START) * OLED_FONT_WIDTH), "OLED_FONT_END references outside array");
+
+    // set the reder buffer data
+    uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index
+    if (cast_data < OLED_FONT_START || cast_data > OLED_FONT_END) {
+        memset(oled_cursor, 0x00, OLED_FONT_WIDTH);
+    } else {
+        const uint8_t *glyph = &font[(cast_data - OLED_FONT_START) * OLED_FONT_WIDTH];
+        memcpy_P(oled_cursor, glyph, OLED_FONT_WIDTH);
+    }
+
+    // Invert if needed
+    if (invert) {
+        InvertCharacter(oled_cursor);
+    }
+
+    // Dirty check
+    if (memcmp(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH)) {
+        uint16_t index = oled_cursor - &oled_buffer[0];
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
+        // Edgecase check if the written data spans the 2 chunks
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << ((index + OLED_FONT_WIDTH - 1) / OLED_BLOCK_SIZE));
+    }
+
+    // Finally move to the next char
+    oled_advance_char();
+}
+
+void oled_write(const char *data, bool invert) {
+    const char *end = data + strlen(data);
+    while (data < end) {
+        oled_write_char(*data, invert);
+        data++;
+    }
+}
+
+void oled_write_ln(const char *data, bool invert) {
+    oled_write(data, invert);
+    oled_advance_page(true);
+}
+
+void oled_pan(bool left) {
+    uint16_t i = 0;
+    for (uint16_t y = 0; y < OLED_DISPLAY_HEIGHT / 8; y++) {
+        if (left) {
+            for (uint16_t x = 0; x < OLED_DISPLAY_WIDTH - 1; x++) {
+                i              = y * OLED_DISPLAY_WIDTH + x;
+                oled_buffer[i] = oled_buffer[i + 1];
+            }
+        } else {
+            for (uint16_t x = OLED_DISPLAY_WIDTH - 1; x > 0; x--) {
+                i              = y * OLED_DISPLAY_WIDTH + x;
+                oled_buffer[i] = oled_buffer[i - 1];
+            }
+        }
+    }
+    oled_dirty = OLED_ALL_BLOCKS_MASK;
+}
+
+oled_buffer_reader_t oled_read_raw(uint16_t start_index) {
+    if (start_index > OLED_MATRIX_SIZE) start_index = OLED_MATRIX_SIZE;
+    oled_buffer_reader_t ret_reader;
+    ret_reader.current_element         = &oled_buffer[start_index];
+    ret_reader.remaining_element_count = OLED_MATRIX_SIZE - start_index;
+    return ret_reader;
+}
+
+void oled_write_raw_byte(const char data, uint16_t index) {
+    if (index > OLED_MATRIX_SIZE) index = OLED_MATRIX_SIZE;
+    if (oled_buffer[index] == data) return;
+    oled_buffer[index] = data;
+    oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
+}
+
+void oled_write_raw(const char *data, uint16_t size) {
+    uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
+    if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
+    for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
+        uint8_t c = *data++;
+        if (oled_buffer[i] == c) continue;
+        oled_buffer[i] = c;
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
+    }
+}
+
+void oled_write_pixel(uint8_t x, uint8_t y, bool on) {
+    if (x >= oled_rotation_width) {
+        return;
+    }
+    uint16_t index = x + (y / 8) * oled_rotation_width;
+    if (index >= OLED_MATRIX_SIZE) {
+        return;
+    }
+    uint8_t data = oled_buffer[index];
+    if (on) {
+        data |= (1 << (y % 8));
+    } else {
+        data &= ~(1 << (y % 8));
+    }
+    if (oled_buffer[index] != data) {
+        oled_buffer[index] = data;
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
+    }
+}
+
+#if defined(__AVR__)
+void oled_write_P(const char *data, bool invert) {
+    uint8_t c = pgm_read_byte(data);
+    while (c != 0) {
+        oled_write_char(c, invert);
+        c = pgm_read_byte(++data);
+    }
+}
+
+void oled_write_ln_P(const char *data, bool invert) {
+    oled_write_P(data, invert);
+    oled_advance_page(true);
+}
+
+void oled_write_raw_P(const char *data, uint16_t size) {
+    uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
+    if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
+    for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
+        uint8_t c = pgm_read_byte(data++);
+        if (oled_buffer[i] == c) continue;
+        oled_buffer[i] = c;
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
+    }
+}
+#endif // defined(__AVR__)
+
+bool oled_on(void) {
+    if (!oled_initialized) {
+        return oled_active;
+    }
+
+#if OLED_TIMEOUT > 0
+    oled_timeout = timer_read32() + OLED_TIMEOUT;
+#endif
+
+    static const uint8_t PROGMEM display_on[] =
+#ifdef OLED_FADE_OUT
+        {FADE_BLINK, 0x00};
+#else
+        {DISPLAY_ON};
+#endif
+
+    if (!oled_active) {
+        if (!oled_cmd_p(display_on, ARRAY_SIZE(display_on))) {
+            print("oled_on cmd failed\n");
+            return oled_active;
+        }
+        oled_active = true;
+    }
+    return oled_active;
+}
+
+bool oled_off(void) {
+    if (!oled_initialized) {
+        return !oled_active;
+    }
+
+    static const uint8_t PROGMEM display_off[] =
+#ifdef OLED_FADE_OUT
+        {FADE_BLINK, ENABLE_FADE | OLED_FADE_OUT_INTERVAL};
+#else
+        {DISPLAY_OFF};
+#endif
+
+    if (oled_active) {
+        if (!oled_cmd_p(display_off, ARRAY_SIZE(display_off))) {
+            print("oled_off cmd failed\n");
+            return oled_active;
+        }
+        oled_active = false;
+    }
+    return !oled_active;
+}
+
+bool is_oled_on(void) {
+    return oled_active;
+}
+
+uint8_t oled_set_brightness(uint8_t level) {
+    if (!oled_initialized) {
+        return oled_brightness;
+    }
+
+    uint8_t set_contrast[] = { CONTRAST, level};
+    if (oled_brightness != level) {
+        if (!oled_cmd(set_contrast, ARRAY_SIZE(set_contrast))) {
+            print("set_brightness cmd failed\n");
+            return oled_brightness;
+        }
+        oled_brightness = level;
+    }
+    return oled_brightness;
+}
+
+uint8_t oled_get_brightness(void) {
+    return oled_brightness;
+}
+
+// Set the specific 8 lines rows of the screen to scroll.
+// 0 is the default for start, and 7 for end, which is the entire
+// height of the screen.  For 128x32 screens, rows 4-7 are not used.
+void oled_scroll_set_area(uint8_t start_line, uint8_t end_line) {
+    oled_scroll_start = start_line;
+    oled_scroll_end   = end_line;
+}
+
+void oled_scroll_set_speed(uint8_t speed) {
+    // Sets the speed for scrolling... does not take effect
+    // until scrolling is either started or restarted
+    // the ssd1306 supports 8 speeds
+    // FrameRate2   speed = 7
+    // FrameRate3   speed = 4
+    // FrameRate4   speed = 5
+    // FrameRate5   speed = 0
+    // FrameRate25  speed = 6
+    // FrameRate64  speed = 1
+    // FrameRate128 speed = 2
+    // FrameRate256 speed = 3
+    // for ease of use these are remaped here to be in order
+    static const uint8_t scroll_remap[8] = {7, 4, 5, 0, 6, 1, 2, 3};
+    oled_scroll_speed                    = scroll_remap[speed];
+}
+
+bool oled_scroll_right(void) {
+    if (!oled_initialized) {
+        return oled_scrolling;
+    }
+
+    // Dont enable scrolling if we need to update the display
+    // This prevents scrolling of bad data from starting the scroll too early after init
+    if (!oled_dirty && !oled_scrolling) {
+        uint8_t display_scroll_right[] = {SCROLL_RIGHT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL};
+        if (!oled_cmd(display_scroll_right, ARRAY_SIZE(display_scroll_right))) {
+            print("oled_scroll_right cmd failed\n");
+            return oled_scrolling;
+        }
+        oled_scrolling = true;
+    }
+    return oled_scrolling;
+}
+
+bool oled_scroll_left(void) {
+    if (!oled_initialized) {
+        return oled_scrolling;
+    }
+
+    // Dont enable scrolling if we need to update the display
+    // This prevents scrolling of bad data from starting the scroll too early after init
+    if (!oled_dirty && !oled_scrolling) {
+        uint8_t display_scroll_left[] = {SCROLL_LEFT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL};
+        if (!oled_cmd(display_scroll_left, ARRAY_SIZE(display_scroll_left))) {
+            print("oled_scroll_left cmd failed\n");
+            return oled_scrolling;
+        }
+        oled_scrolling = true;
+    }
+    return oled_scrolling;
+}
+
+bool oled_scroll_off(void) {
+    if (!oled_initialized) {
+        return !oled_scrolling;
+    }
+
+    if (oled_scrolling) {
+        static const uint8_t PROGMEM display_scroll_off[] = {DEACTIVATE_SCROLL};
+        if (!oled_cmd_p(display_scroll_off, ARRAY_SIZE(display_scroll_off))) {
+            print("oled_scroll_off cmd failed\n");
+            return oled_scrolling;
+        }
+        oled_scrolling = false;
+        oled_dirty     = OLED_ALL_BLOCKS_MASK;
+    }
+    return !oled_scrolling;
+}
+
+bool is_oled_scrolling(void) {
+    return oled_scrolling;
+}
+
+bool oled_invert(bool invert) {
+    if (!oled_initialized) {
+        return oled_inverted;
+    }
+
+    if (invert && !oled_inverted) {
+        static const uint8_t PROGMEM display_inverted[] = {INVERT_DISPLAY};
+        if (!oled_cmd_p(display_inverted, ARRAY_SIZE(display_inverted))) {
+            print("oled_invert cmd failed\n");
+            return oled_inverted;
+        }
+        oled_inverted = true;
+    } else if (!invert && oled_inverted) {
+        static const uint8_t PROGMEM display_normal[] = {NORMAL_DISPLAY};
+        if (!oled_cmd_p(display_normal, ARRAY_SIZE(display_normal))) {
+            print("oled_invert cmd failed\n");
+            return oled_inverted;
+        }
+        oled_inverted = false;
+    }
+
+    return oled_inverted;
+}
+
+uint8_t oled_max_chars(void) {
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        return OLED_DISPLAY_WIDTH / OLED_FONT_WIDTH;
+    }
+    return OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH;
+}
+
+uint8_t oled_max_lines(void) {
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        return OLED_DISPLAY_HEIGHT / OLED_FONT_HEIGHT;
+    }
+    return OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT;
+}
+
+void oled_task(void) {
+    if (!oled_initialized) {
+        return;
+    }
+
+#if OLED_UPDATE_INTERVAL > 0
+    if (timer_elapsed(oled_update_timeout) >= OLED_UPDATE_INTERVAL) {
+        oled_update_timeout = timer_read();
+        oled_set_cursor(0, 0);
+        oled_task_kb();
+    }
+#else
+    oled_set_cursor(0, 0);
+    oled_task_kb();
+#endif
+
+#if OLED_SCROLL_TIMEOUT > 0
+    if (oled_dirty && oled_scrolling) {
+        oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT;
+        oled_scroll_off();
+    }
+#endif
+
+    // Smart render system, no need to check for dirty
+    oled_render();
+
+    // Display timeout check
+#if OLED_TIMEOUT > 0
+    if (oled_active && timer_expired32(timer_read32(), oled_timeout)) {
+        oled_off();
+    }
+#endif
+
+#if OLED_SCROLL_TIMEOUT > 0
+    if (!oled_scrolling && timer_expired32(timer_read32(), oled_scroll_timeout)) {
+#    ifdef OLED_SCROLL_TIMEOUT_RIGHT
+        oled_scroll_right();
+#    else
+        oled_scroll_left();
+#    endif
+    }
+#endif
+}
+
+__attribute__((weak)) bool oled_task_kb(void) {
+    return oled_task_user();
+}
+__attribute__((weak)) bool oled_task_user(void) {
+    return true;
+}
diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c
new file mode 100644
index 0000000000..a82a2dabb1
--- /dev/null
+++ b/keyboards/adafruit/macropad/macropad.c
@@ -0,0 +1,56 @@
+/* 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 "macropad.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+#define NA NO_LED
+
+/* RGB Positioning */
+led_config_t g_led_config = { {
+    { NA,  NA, NA },
+    {  0,   1,  2 },
+    {  3,   4,  5 },
+    {  6,   7,  8 },
+    {  9,  10, 11 }
+}, {
+    { 0,  0 }, { 112,  0 }, { 224,  0},
+    { 0, 21 }, { 112, 21 }, { 224, 21},
+    { 0, 42 }, { 112, 42 }, { 224, 42},
+    { 0, 64 }, { 112, 64 }, { 224, 64}
+}, {
+    4, 4, 4,
+    4, 4, 4,
+    4, 4, 4,
+    4, 4, 4
+} };
+
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/adafruit/macropad/macropad.h b/keyboards/adafruit/macropad/macropad.h
new file mode 100644
index 0000000000..6e2e3524b7
--- /dev/null
+++ b/keyboards/adafruit/macropad/macropad.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+// clang-format off
+ #define LAYOUT(  \
+             K02, \
+   K10, K11, K12, \
+   K20, K21, K22, \
+   K30, K31, K32, \
+   K40, K41, K42  \
+ ) \
+ { \
+   { ___, ___, K02 }, \
+   { K10, K11, K12 }, \
+   { K20, K21, K22 }, \
+   { K30, K31, K32 }, \
+   { K40, K41, K42 }  \
+ }
+// clang-format on
diff --git a/keyboards/adafruit/macropad/mcuconf.h b/keyboards/adafruit/macropad/mcuconf.h
new file mode 100644
index 0000000000..198a2eea69
--- /dev/null
+++ b/keyboards/adafruit/macropad/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/adafruit/macropad/readme.md b/keyboards/adafruit/macropad/readme.md
new file mode 100644
index 0000000000..fe7375b336
--- /dev/null
+++ b/keyboards/adafruit/macropad/readme.md
@@ -0,0 +1,37 @@
+# Adafruit MacroPad RP2040
+
+![AdafruitMacropad](https://i.imgur.com/dSBSwcJh.jpeg)
+
+A RP2040-powered Macropad with a 3x4 layout.
+
+- Keyboard Maintainer: [Jpe230](https://github.com/jpe230/) 
+- Hardware Supported: Adafruit MacroPad RP2040
+- Hardware Availability: [Barebones kit](https://www.adafruit.com/product/5100) [Starter Kit](https://www.adafruit.com/product/5128)
+
+Make example for this board (after setting up your build environment):
+
+```sh
+qmk compile -kb adafruit/macropad -km default
+```
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Features
+
+- Raspberry Pi RP2040 Chip + 8MB Flash memory - Dual-core Cortex M0+ at ~130MHz with 264KB of RAM.
+- 3x4 Mechanical key switch sockets - accepts any Cherry MX-compatible switches. Individually tied to GPIO pins (not matrix wired)
+- One NeoPixel RGB LED per switch, on north side.
+- Rotary encoder, 20 detents per rotation, with push-switch on GPIO pin. Push switch is also used for entering bootloader mode when held down on power-up or reset.
+- 128x64 SH1106 Monochrome OLED display - On high-speed hardware SPI port for quick updates.
+- 8mm Speaker/Buzzer - With Class D amplifier and RC filter, can be used to make simple beeps and sounds effects. (Unsupported for now)
+- STEMMA QT Connector - Allows adding any I2C sensors/displays/devices with plug-and-play cables.
+- Reset button - On the side, for quick restarting, press it twice to enter bootloader.
+- Four M3 mounting bosses - Make custom enclosures easily.
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the rotary encoder push-button on power-up or reset.
+* **Physical reset button**: Press twice the button on the side while the board is connected.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
new file mode 100644
index 0000000000..3636424a71
--- /dev/null
+++ b/keyboards/adafruit/macropad/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = RP2040
+# Bootloader selection
+BOOTLOADER = rp2040
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+# AUDIO_DRIVER = pwm_software
+ENCODER_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+WS2812_DRIVER = vendor
+OLED_ENABLE = yes
+OLED_DRIVER = custom
+# Project specific files
+SRC += lib/ssd1306_sh1106.c
+QUANTUM_LIB_SRC += spi_master.c

From 35d78aa8a4587ce5286a362471380a9d4f000f3c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 11 Jul 2022 10:51:39 +0100
Subject: [PATCH 088/959] More DD encoder fixes (#17615)

---
 lib/python/qmk/cli/generate/config_h.py |  8 +++++---
 lib/python/qmk/info.py                  | 10 +++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index b53f4ff335..a26dcdf7d7 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -142,7 +142,7 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
     for encoder in encoder_json.get("rotary", []):
         a_pads.append(encoder["pin_a"])
         b_pads.append(encoder["pin_b"])
-        resolutions.append(str(encoder.get("resolution", 4)))
+        resolutions.append(encoder.get("resolution", None))
 
     config_h_lines.append(f'#ifndef ENCODERS_PAD_A{postfix}')
     config_h_lines.append(f'#   define ENCODERS_PAD_A{postfix} {{ { ", ".join(a_pads) } }}')
@@ -152,13 +152,15 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
     config_h_lines.append(f'#   define ENCODERS_PAD_B{postfix} {{ { ", ".join(b_pads) } }}')
     config_h_lines.append(f'#endif // ENCODERS_PAD_B{postfix}')
 
-    if len(set(resolutions)) == 1:
+    if None in resolutions:
+        cli.log.debug("Unable to generate ENCODER_RESOLUTION configuration")
+    elif len(set(resolutions)) == 1:
         config_h_lines.append(f'#ifndef ENCODER_RESOLUTION{postfix}')
         config_h_lines.append(f'#   define ENCODER_RESOLUTION{postfix} { resolutions[0] }')
         config_h_lines.append(f'#endif // ENCODER_RESOLUTION{postfix}')
     else:
         config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}')
-        config_h_lines.append(f'#   define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(resolutions) } }}')
+        config_h_lines.append(f'#   define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(map(str,resolutions)) } }}')
         config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')
 
 
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index dac2fd6e9e..72424f390e 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -225,17 +225,21 @@ def _extract_encoders_values(config_c, postfix=''):
     b_pad = config_c.get(f'ENCODERS_PAD_B{postfix}', '').replace(' ', '')[1:-1]
     resolutions = config_c.get(f'ENCODER_RESOLUTIONS{postfix}', '').replace(' ', '')[1:-1]
 
-    default_resolution = config_c.get('ENCODER_RESOLUTION', '4')
+    default_resolution = config_c.get('ENCODER_RESOLUTION', None)
 
     if a_pad and b_pad:
         a_pad = list(filter(None, a_pad.split(',')))
         b_pad = list(filter(None, b_pad.split(',')))
         resolutions = list(filter(None, resolutions.split(',')))
-        resolutions += [default_resolution] * (len(a_pad) - len(resolutions))
+        if default_resolution:
+            resolutions += [default_resolution] * (len(a_pad) - len(resolutions))
 
         encoders = []
         for index in range(len(a_pad)):
-            encoders.append({'pin_a': a_pad[index], 'pin_b': b_pad[index], "resolution": int(resolutions[index])})
+            encoder = {'pin_a': a_pad[index], 'pin_b': b_pad[index]}
+            if index < len(resolutions):
+                encoder['resolution'] = int(resolutions[index])
+            encoders.append(encoder)
 
         return encoders
 

From 0348071810d30fc362e8ec8fda6764431f7939e2 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 11 Jul 2022 13:05:04 +0200
Subject: [PATCH 089/959] Stabilize Half-duplex PIO split comms (#17612)

---
 .../drivers/vendor/RP/RP2040/serial_vendor.c  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
index 949fc6dd93..d933dc1f5d 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
@@ -142,6 +142,7 @@ void pio_serve_interrupt(void) {
 // the generated low level with 360mV will generate a logical zero.
 static inline void enter_rx_state(void) {
     osalSysLock();
+    nvicEnableVector(RP_USBCTRL_IRQ_NUMBER, RP_IRQ_USB0_PRIORITY);
     // Wait for the transmitting state machines FIFO to run empty. At this point
     // the last byte has been pulled from the transmitting state machines FIFO
     // into the output shift register. We have to wait a tiny bit more until
@@ -163,6 +164,9 @@ static inline void enter_rx_state(void) {
 
 static inline void leave_rx_state(void) {
     osalSysLock();
+    // We don't want to be interrupted by frequent (1KHz) USB interrupts while
+    // doing our timing critical sending operation.
+    nvicDisableVector(RP_USBCTRL_IRQ_NUMBER);
     // In Half-duplex operation the tx pin dual-functions as sender and
     // receiver. To not receive the data we will send, we disable the receiving
     // state machine.
@@ -194,12 +198,21 @@ static inline msg_t sync_tx(sysinterval_t timeout) {
     msg_t msg = MSG_OK;
     osalSysLock();
     while (pio_sm_is_tx_fifo_full(pio, tx_state_machine)) {
+#if !defined(SERIAL_USART_FULL_DUPLEX)
+        // Enable USB interrupts again, because we might sleep for a long time
+        // here and don't want to be disconnected from the host.
+        nvicEnableVector(RP_USBCTRL_IRQ_NUMBER, RP_IRQ_USB0_PRIORITY);
+#endif
         pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, true);
         msg = osalThreadSuspendTimeoutS(&tx_thread, timeout);
         if (msg < MSG_OK) {
             break;
         }
     }
+#if !defined(SERIAL_USART_FULL_DUPLEX)
+    // Entering timing critical territory again.
+    nvicDisableVector(RP_USBCTRL_IRQ_NUMBER);
+#endif
     osalSysUnlock();
     return msg;
 }
@@ -412,11 +425,12 @@ static inline void pio_init(pin_t tx_pin, pin_t rx_pin) {
     pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, true);
     pio_set_irq0_source_enabled(pio, pis_interrupt0, true);
 
-    // Enable PIO specific interrupt vector
+    // Enable PIO specific interrupt vector, as the pio implementation is timing
+    // critical we use the highest possible priority.
 #if defined(SERIAL_PIO_USE_PIO1)
-    nvicEnableVector(RP_PIO1_IRQ_0_NUMBER, RP_IRQ_UART0_PRIORITY);
+    nvicEnableVector(RP_PIO1_IRQ_0_NUMBER, CORTEX_MAX_KERNEL_PRIORITY);
 #else
-    nvicEnableVector(RP_PIO0_IRQ_0_NUMBER, RP_IRQ_UART0_PRIORITY);
+    nvicEnableVector(RP_PIO0_IRQ_0_NUMBER, CORTEX_MAX_KERNEL_PRIORITY);
 #endif
 
     enter_rx_state();

From 7a73f9a6b32b7f7f49772b0f1160c7e65002c263 Mon Sep 17 00:00:00 2001
From: Aidan Smith <LeoneShamoth@gmail.com>
Date: Mon, 11 Jul 2022 08:10:47 -0400
Subject: [PATCH 090/959] [Keyboard] Add Fine!40 PCB Support (#17426)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/aidansmithdotdev/fine40/config.h    |  12 +
 keyboards/aidansmithdotdev/fine40/fine40.c    |  85 +++++++
 keyboards/aidansmithdotdev/fine40/fine40.h    |   3 +
 keyboards/aidansmithdotdev/fine40/info.json   | 231 ++++++++++++++++++
 .../fine40/keymaps/default/keymap.c           |  43 ++++
 .../fine40/keymaps/via/keymap.c               |  43 ++++
 .../fine40/keymaps/via/rules.mk               |   1 +
 keyboards/aidansmithdotdev/fine40/readme.md   |  27 ++
 keyboards/aidansmithdotdev/fine40/rules.mk    |   1 +
 9 files changed, 446 insertions(+)
 create mode 100644 keyboards/aidansmithdotdev/fine40/config.h
 create mode 100644 keyboards/aidansmithdotdev/fine40/fine40.c
 create mode 100644 keyboards/aidansmithdotdev/fine40/fine40.h
 create mode 100644 keyboards/aidansmithdotdev/fine40/info.json
 create mode 100644 keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
 create mode 100644 keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
 create mode 100644 keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk
 create mode 100644 keyboards/aidansmithdotdev/fine40/readme.md
 create mode 100644 keyboards/aidansmithdotdev/fine40/rules.mk

diff --git a/keyboards/aidansmithdotdev/fine40/config.h b/keyboards/aidansmithdotdev/fine40/config.h
new file mode 100644
index 0000000000..43ac1e5dda
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 Aidan Smith (@Aidan-OS)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define ENCODER_RESOLUTION 2
+#define ENCODERS_PAD_A { D5 }
+#define ENCODERS_PAD_B { B7 }
+
+#define OLED_DISPLAY_128X64 //Comment this out to change the screen size
diff --git a/keyboards/aidansmithdotdev/fine40/fine40.c b/keyboards/aidansmithdotdev/fine40/fine40.c
new file mode 100644
index 0000000000..cc4024136e
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/fine40.c
@@ -0,0 +1,85 @@
+// Copyright 2022 Aidan Smith (@Aidan-OS)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "fine40.h"
+
+enum keyboard_layers {
+	_MAIN,
+	_RIGHT,
+	_LEFT,
+	_TAB,
+};
+
+#ifdef OLED_ENABLE
+//static void render_logo(void) {
+//    static const char PROGMEM raw_logo[] = {
+//        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192,224,224,240,240,248,248,248,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,248,248,248,240,240,224,224,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,224,224,224,192,  0,  0,  0,  0, 96,240,240, 96,  0,  0,  0,  0,  0,  0,240,240,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+//        0,  0,  0,  0,  0,  0,  0,128,192,224,240,248,252,254,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 15,  7,  7,  7, 15,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,254,252,248,240,224,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,240,254,255,127,115,127,127,255,252,224,  0,255,255,255,254, 48,254,254,255,199,135,255,255,255,  0,224,247,255,191,191,255,255,254,  0,254,255,255,255,  7,255,255,254,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+//        0,  0,  0,  0,192,248,254,255,255,255,255,255,255,255,255,255,127, 31, 15,  7,  3,  1,192,224,240,251,255,255,255,255,255,  0,  0,  0,  0,  0,255,255,255,255,255,255,241,225,192,  1,  3,  7, 15, 31,127,255,255,255,255,255,255,255,255,255,254,248,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3,  3,128,128,128,128,  0,  1,  3,  3,  1,  1,  3,  3,  1,  0,  0,  1,  1,  3,  3,  3,  3,129,192,128,  1,  3,  3,  3,  3,  1,  1,  0,129,195,195,193,  0,  1,  3,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+//        0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,  7,  0,  0,  0,240,252,255,255,255,255,255,255,255,255,255,255,255,254,252,254,255,255,255,255,255,255,255,255,255,255,255,252,240,  0,  0,  0,  7,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12, 63, 63,127,123,243,247,231,193,  0,252,252,252, 28, 60,252,252,252, 28,252,252,248,224,  0,255,255,255,  0,255,255,255,255, 28, 28,  0,255,255,255,255, 28,252,252,248,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+//        0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,240,  0,  0,  0,  7, 31,127,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,127, 31,  7,  0,  0,  0,240,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  7, 15, 15, 14, 15,  7,  7,  3,  0, 15, 15, 15,  0,  0, 15, 15, 15,  0,  7, 15, 15,  7,  0, 15, 15, 15,  0,  1,  7,  7, 15, 14, 14,  6,  7,  7,  7,  7,  0,  7,  7,  7,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+//        0,  0,  0,  0,  1, 15, 63,255,255,255,255,255,255,255,255,255,255,254,248,240,224,192,128,129,  3,  7, 15, 15, 31, 31, 31, 63, 63, 63, 63, 63, 31, 31, 31, 15, 15,  7,  3,129,128,192,224,240,248,254,255,255,255,255,255,255,255,255,255,255, 63, 15,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192,224,224,224,252,254,254,  0,  0,128,192,224,224,224,224,192,128, 96,224,224,224,  0,  0,224,224,224,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+//        0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  7, 15, 31, 63,127,255,255,255,255,255,255,255,255,255,255,254,254,254,254,254,252,252,252,252,252,252,252,254,254,254,254,254,255,255,255,255,255,255,255,255,255,255,127, 63, 31, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,120,120, 48, 31, 63, 63,120,112,127,127, 63,  0,  6, 31, 63, 63,127,119,119, 63, 55,  0,  3, 15, 63,127,127, 63, 15,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+//        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  3,  7,  7, 15, 15, 15, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 15, 15, 15,  7,  7,  3,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+//    };
+//    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+//}
+
+static void render_mochi(void)
+{
+	static const char PROGMEM mochi_logo[] = {
+        0,  0,  0,  0,  0,224,240,240,240,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,224,240,240,240,224,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,252,252,252,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,248,248,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192,224,240,240,240,224,  0,  0,  0,  0,  0,  0,128,192,224,240,240,240,240,240,240,224,224,192,  0,  0,  0,  0,  0,
+        0,  0,  0,  0,224,255,255,255, 15, 63,255,254,248,224,  0,  0,  0,  0,224,248,254,255, 31, 31,255,255,255,128,  0,  0,  0,128,224,240,248,252, 60, 28, 28, 30, 28, 60,124,248,248,240,192,  0,  0,  0,128,224,240,248,252, 60, 60, 28, 30, 28, 28, 60, 28,  0,  0,  0,255,255,255,255, 28, 28, 28, 28, 60,124,252,248,240,192,  0,  0,  0,  0,252,252,252,252,  0,  0,  0,  0,  0,192,224,248,252, 63, 31,  7,  3,255,255,255,255,  0,  0,  0,  0,224,254,255,255, 15,  1,  0,  0,  0,  0,  1, 15,255,255,255,248,  0,  0,  0, 
+        0,  0,  0,  0,255,255,255,255,  0,  0,  0,  3, 15, 63,255,252,252,255, 63, 15,  3,  0,  0,  0,255,255,255,255,  0,  0,  0, 63,255,255,255,224,128,  0,  0,  0,  0,128,192,255,255,255,127,  4,  0,  0, 63,255,255,255,224,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,  0,  0,  0,  0,  0,  0,255,255,255,255,  0,  0,  0,  0,255,255,255,255,  0,  0,  0, 60, 63, 63, 63, 61, 60, 60, 60, 60, 60,255,255,255,255, 60, 60,  0,  0,  7,127,255,255,248,128,  0,  0,  0,  0,128,240,255,255,127, 31,  0,  0,  0, 
+        0,  0,  0,  0, 15, 15, 15,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7, 15, 15, 15,  0,  0,  0,  0,  0,  1,  3,  7,  7, 15, 15, 15, 15, 15,  7,  7,  3,  1,  0,  0,  0,  0,  0,  0,  3,  3,  7,  7, 15, 15, 15, 15, 15, 15,  7,  0,  0,  0, 15, 15, 15,  7,  0,  0,  0,  0,  0,  0,  7, 15, 15, 15,  0,  0,  0,  0, 15, 15, 15,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 15, 15,  7,  0,  0,  0,  0,  0,  0,  1,  3,  7,  7, 15, 15, 15, 15,  7,  7,  3,  1,  0,  0,  0,  0,  0,
+    };
+	
+	oled_write_raw_P(mochi_logo, sizeof(mochi_logo));
+}
+
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+       return OLED_ROTATION_180;  // flips the display 180 degrees
+}
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+	render_mochi();
+	oled_set_cursor(0, 4);
+	oled_write_P(PSTR("Layer: "), false);
+	
+	switch(get_highest_layer(layer_state))
+	{
+		case _MAIN:
+			oled_write_ln_P(PSTR("Main"), false);
+			break;
+		case _LEFT:
+			oled_write_ln_P(PSTR("Left"), false);
+			break;
+		case _RIGHT:
+			oled_write_ln_P(PSTR("Right"), false);
+			break;
+		case _TAB:
+			oled_write_ln_P(PSTR("Tab"), false);
+			break;
+	}
+	
+	//render_logo();
+	return(true);
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+	// Volume control
+	if (clockwise) {
+		tap_code(KC_VOLU);
+	} else {
+		tap_code(KC_VOLD);
+	}
+	return false;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/aidansmithdotdev/fine40/fine40.h b/keyboards/aidansmithdotdev/fine40/fine40.h
new file mode 100644
index 0000000000..dd675cf3ad
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/fine40.h
@@ -0,0 +1,3 @@
+// Copyright 2022 Aidan Smith (@Aidan-OS)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json
new file mode 100644
index 0000000000..c2e1afd84c
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/info.json
@@ -0,0 +1,231 @@
+{
+    "manufacturer": "Aidan Smith",
+    "keyboard_name": "aidansmithdotdev/fine40",
+    "maintainer": "Aidan-OS",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "encoder": true,
+        "oled": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": [ "B3", "E6", "B1", "D7", "F7", "C6" ],
+        "rows": [ "F5", "F6", "B2", "B5", "F4", "D4", "B4", "B6" ]
+    },
+    "processor": "atmega32u4",
+    "url": "https://aidansmith.dev",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4564",
+        "vid": "0xA059"
+    },
+    "layouts": {
+        "LAYOUT_2u_single_space": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [4, 5], "x": 6, "y": 0 },
+                { "matrix": [4, 4], "x": 7, "y": 0 },
+                { "matrix": [4, 3], "x": 8, "y": 0 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 1], "x": 10, "y": 0 },
+                { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 },
+                { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "matrix": [1, 1], "x": 1.25, "y": 1 },
+                { "matrix": [1, 2], "x": 2.25, "y": 1 },
+                { "matrix": [1, 3], "x": 3.25, "y": 1 },
+                { "matrix": [1, 4], "x": 4.25, "y": 1 },
+                { "matrix": [1, 5], "x": 5.25, "y": 1 },
+                { "matrix": [5, 5], "x": 6.25, "y": 1 },
+                { "matrix": [5, 4], "x": 7.25, "y": 1 },
+                { "matrix": [5, 3], "x": 8.25, "y": 1 },
+                { "matrix": [5, 2], "x": 9.25, "y": 1 },
+                { "matrix": [5, 1], "x": 10.25, "y": 1 },
+                { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 },
+                { "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": [6, 5], "x": 6.5, "y": 2 },
+                { "matrix": [6, 4], "x": 7.5, "y": 2 },
+                { "matrix": [6, 3], "x": 8.5, "y": 2 },
+                { "matrix": [6, 2], "x": 9.5, "y": 2 },
+                { "matrix": [6, 1], "x": 10.5, "y": 2 },
+                { "matrix": [6, 0], "x": 11.5, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3, "w": 1.25 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3, "w": 2 },
+                { "matrix": [7, 5], "x": 7.25, "y": 3, "w": 1.25 },
+                { "matrix": [7, 4], "x": 8.5, "y": 3 },
+                { "matrix": [7, 3], "x": 9.5, "y": 3 },
+                { "matrix": [7, 2], "x": 10.5, "y": 3 },
+                { "matrix": [7, 1], "x": 11.5, "y": 3 },
+                { "matrix": [7, 0], "x": 13, "y": 3 }
+            ]
+        },
+        "LAYOUT_2u_split_space": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [4, 5], "x": 6, "y": 0 },
+                { "matrix": [4, 4], "x": 7, "y": 0 },
+                { "matrix": [4, 3], "x": 8, "y": 0 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 1], "x": 10, "y": 0 },
+                { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 },
+                { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "matrix": [1, 1], "x": 1.25, "y": 1 },
+                { "matrix": [1, 2], "x": 2.25, "y": 1 },
+                { "matrix": [1, 3], "x": 3.25, "y": 1 },
+                { "matrix": [1, 4], "x": 4.25, "y": 1 },
+                { "matrix": [1, 5], "x": 5.25, "y": 1 },
+                { "matrix": [5, 5], "x": 6.25, "y": 1 },
+                { "matrix": [5, 4], "x": 7.25, "y": 1 },
+                { "matrix": [5, 3], "x": 8.25, "y": 1 },
+                { "matrix": [5, 2], "x": 9.25, "y": 1 },
+                { "matrix": [5, 1], "x": 10.25, "y": 1 },
+                { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 },
+                { "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": [6, 5], "x": 6.5, "y": 2 },
+                { "matrix": [6, 4], "x": 7.5, "y": 2 },
+                { "matrix": [6, 3], "x": 8.5, "y": 2 },
+                { "matrix": [6, 2], "x": 9.5, "y": 2 },
+                { "matrix": [6, 1], "x": 10.5, "y": 2 },
+                { "matrix": [6, 0], "x": 11.5, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3, "w": 1.25 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3, "w": 2 },
+                { "matrix": [7, 5], "x": 6.25, "y": 3, "w": 2 },
+                { "matrix": [7, 4], "x": 8.25, "y": 3, "w": 1.25 },
+                { "matrix": [7, 3], "x": 9.5, "y": 3 },
+                { "matrix": [7, 2], "x": 10.5, "y": 3 },
+                { "matrix": [7, 1], "x": 11.5, "y": 3 },
+                { "matrix": [7, 0], "x": 13, "y": 3 }
+            ]
+        },
+        "LAYOUT_225u_split_space": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [4, 5], "x": 6, "y": 0 },
+                { "matrix": [4, 4], "x": 7, "y": 0 },
+                { "matrix": [4, 3], "x": 8, "y": 0 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 1], "x": 10, "y": 0 },
+                { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 },
+                { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "matrix": [1, 1], "x": 1.25, "y": 1 },
+                { "matrix": [1, 2], "x": 2.25, "y": 1 },
+                { "matrix": [1, 3], "x": 3.25, "y": 1 },
+                { "matrix": [1, 4], "x": 4.25, "y": 1 },
+                { "matrix": [1, 5], "x": 5.25, "y": 1 },
+                { "matrix": [5, 5], "x": 6.25, "y": 1 },
+                { "matrix": [5, 4], "x": 7.25, "y": 1 },
+                { "matrix": [5, 3], "x": 8.25, "y": 1 },
+                { "matrix": [5, 2], "x": 9.25, "y": 1 },
+                { "matrix": [5, 1], "x": 10.25, "y": 1 },
+                { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 },
+                { "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": [6, 5], "x": 6.5, "y": 2 },
+                { "matrix": [6, 4], "x": 7.5, "y": 2 },
+                { "matrix": [6, 3], "x": 8.5, "y": 2 },
+                { "matrix": [6, 2], "x": 9.5, "y": 2 },
+                { "matrix": [6, 1], "x": 10.5, "y": 2 },
+                { "matrix": [6, 0], "x": 11.5, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3, "w": 2.25 },
+                { "matrix": [7, 5], "x": 6.25, "y": 3, "w": 2.25 },
+                { "matrix": [7, 4], "x": 8.5, "y": 3 },
+                { "matrix": [7, 3], "x": 9.5, "y": 3 },
+                { "matrix": [7, 2], "x": 10.5, "y": 3 },
+                { "matrix": [7, 1], "x": 11.5, "y": 3 },
+                { "matrix": [7, 0], "x": 13, "y": 3 }
+            ]
+        },
+        "LAYOUT_7u_space": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [4, 5], "x": 6, "y": 0 },
+                { "matrix": [4, 4], "x": 7, "y": 0 },
+                { "matrix": [4, 3], "x": 8, "y": 0 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 1], "x": 10, "y": 0 },
+                { "matrix": [4, 0], "x": 11, "y": 0, "w": 1.5 },
+                { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "matrix": [1, 1], "x": 1.25, "y": 1 },
+                { "matrix": [1, 2], "x": 2.25, "y": 1 },
+                { "matrix": [1, 3], "x": 3.25, "y": 1 },
+                { "matrix": [1, 4], "x": 4.25, "y": 1 },
+                { "matrix": [1, 5], "x": 5.25, "y": 1 },
+                { "matrix": [5, 5], "x": 6.25, "y": 1 },
+                { "matrix": [5, 4], "x": 7.25, "y": 1 },
+                { "matrix": [5, 3], "x": 8.25, "y": 1 },
+                { "matrix": [5, 2], "x": 9.25, "y": 1 },
+                { "matrix": [5, 1], "x": 10.25, "y": 1 },
+                { "matrix": [5, 0], "x": 11.25, "y": 1, "w": 1.25 },
+                { "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": [6, 5], "x": 6.5, "y": 2 },
+                { "matrix": [6, 4], "x": 7.5, "y": 2 },
+                { "matrix": [6, 3], "x": 8.5, "y": 2 },
+                { "matrix": [6, 2], "x": 9.5, "y": 2 },
+                { "matrix": [6, 1], "x": 10.5, "y": 2 },
+                { "matrix": [6, 0], "x": 11.5, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25 },
+                { "matrix": [3, 5], "x": 2.5, "y": 3, "w": 7 },
+                { "matrix": [7, 3], "x": 9.5, "y": 3 },
+                { "matrix": [7, 2], "x": 10.5, "y": 3 },
+                { "matrix": [7, 1], "x": 11.5, "y": 3 },
+                { "matrix": [7, 0], "x": 13, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..37085b7c90
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2022 Aidan Smith (@Aidan-OS)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum keyboard_layers {
+	_MAIN,
+	_RIGHT,
+	_LEFT,
+	_TAB,
+};
+
+#define LT3_TAB LT(_TAB, KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MAIN] = LAYOUT_2u_single_space(
+    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  , KC_ENT  ,
+    KC_LCTL , KC_RALT , KC_LGUI , KC_BSLS , MO(_LEFT) , KC_SPC , MO(_RIGHT) , KC_LEFT , KC_DOWN , KC_UP  , KC_RIGHT , KC_MPLY
+),
+
+[_LEFT] = LAYOUT_2u_single_space( /* LEFT */
+  KC_GRV  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7          , KC_8    , KC_9                , KC_0                 , KC_DELETE ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_UNDERSCORE , KC_PLUS , KC_LEFT_CURLY_BRACE , KC_RIGHT_CURLY_BRACE , _______   ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______       , _______ , _______             , _______              , _______   ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_HOME       , KC_PGDN , KC_PGUP             , KC_END               , _______
+),
+
+[_RIGHT] = LAYOUT_2u_single_space( /* RIGHT */
+  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_MINS      , KC_EQL      , KC_LBRC       , KC_RBRC        , _______   ,
+  _______  , _______    , _______ , _______ , _______   , _______    , _______       , _______      , KC_LT       , KC_GT         , _______        , _______   ,
+  _______  , _______    , _______ , _______ , _______   , _______    , _______       , KC_MUTE      , KC_VOLD     , KC_VOLU       , KC_MPLY        , _______
+),
+
+[_TAB] = LAYOUT_2u_single_space( /* Tab */
+  KC_ESC  , RESET   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  _______ , KC_F11  , KC_F12  , KC_F13  , KC_F14  , KC_F15  , KC_F16  , KC_F17  , KC_F18  , KC_F19  , KC_F20  , _______ ,
+  _______ , KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , _______ ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
+),
+};
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
new file mode 100644
index 0000000000..37085b7c90
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2022 Aidan Smith (@Aidan-OS)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum keyboard_layers {
+	_MAIN,
+	_RIGHT,
+	_LEFT,
+	_TAB,
+};
+
+#define LT3_TAB LT(_TAB, KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MAIN] = LAYOUT_2u_single_space(
+    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  , KC_ENT  ,
+    KC_LCTL , KC_RALT , KC_LGUI , KC_BSLS , MO(_LEFT) , KC_SPC , MO(_RIGHT) , KC_LEFT , KC_DOWN , KC_UP  , KC_RIGHT , KC_MPLY
+),
+
+[_LEFT] = LAYOUT_2u_single_space( /* LEFT */
+  KC_GRV  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7          , KC_8    , KC_9                , KC_0                 , KC_DELETE ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_UNDERSCORE , KC_PLUS , KC_LEFT_CURLY_BRACE , KC_RIGHT_CURLY_BRACE , _______   ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______       , _______ , _______             , _______              , _______   ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_HOME       , KC_PGDN , KC_PGUP             , KC_END               , _______
+),
+
+[_RIGHT] = LAYOUT_2u_single_space( /* RIGHT */
+  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_MINS      , KC_EQL      , KC_LBRC       , KC_RBRC        , _______   ,
+  _______  , _______    , _______ , _______ , _______   , _______    , _______       , _______      , KC_LT       , KC_GT         , _______        , _______   ,
+  _______  , _______    , _______ , _______ , _______   , _______    , _______       , KC_MUTE      , KC_VOLD     , KC_VOLU       , KC_MPLY        , _______
+),
+
+[_TAB] = LAYOUT_2u_single_space( /* Tab */
+  KC_ESC  , RESET   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  _______ , KC_F11  , KC_F12  , KC_F13  , KC_F14  , KC_F15  , KC_F16  , KC_F17  , KC_F18  , KC_F19  , KC_F20  , _______ ,
+  _______ , KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , _______ ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
+),
+};
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/aidansmithdotdev/fine40/readme.md b/keyboards/aidansmithdotdev/fine40/readme.md
new file mode 100644
index 0000000000..ad3eba7c5c
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/readme.md
@@ -0,0 +1,27 @@
+# Fine!40 PCB (For Mochi40)
+
+![aidansmithdotdev/fine40](https://i.imgur.com/2JMorvxh.png)
+
+The PCB for the Mochi40, a spiritual successor to the unreleased Whimsy recreated from scratch and made completely open source! With an OLED, Rotary Encoder, and headers for both the Elite-C and Nice!Nano, this board gives you all you could want in a 40%.
+
+* Keyboard Maintainer: [Aidan Smith](https://github.com/Aidan-OS)
+* Hardware Supported: Fine!40
+* Hardware Availability: https://github.com/Aidan-OS/Mochi40
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aidansmithdotdev/fine40:default
+
+Flashing example for this keyboard:
+
+    make aidansmithdotdev/fine40:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/aidansmithdotdev/fine40/rules.mk b/keyboards/aidansmithdotdev/fine40/rules.mk
new file mode 100644
index 0000000000..2e3ef9fb84
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/rules.mk
@@ -0,0 +1 @@
+OLED_DRIVER = SSD1306

From 3f5dc472965e6a5b8efe60e33c7b6c2d18d92008 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 11 Jul 2022 15:17:05 +0200
Subject: [PATCH 091/959] [Core] Use polled waiting on ChibiOS platforms that
 support it (#17607)

* Use polled waiting on platforms that support it

Due to context switching overhead waiting a very short amount of time on
a sleeping thread is often not accurate and in fact not usable for timing
critical usage i.e. in a driver. Thus we use polled waiting for ranges
in the us range on platforms that support it instead. The fallback is
the thread sleeping mechanism.

This includes:

* ARM platforms with CYCCNT register (ARMv7, ARMv8) this is
  incremented at CPU clock frequency
* GD32VF103 RISC-V port with CSR_MCYCLE register this is incremented at
  CPU clock frequency
* RP2040 ARMv6 port which uses the integrated timer peripheral which is
  incremented with a fixed 1MHz frequency

* Use wait_us() instead of chSysPolledDelayX

...as it is powered by busy waiting now.

* Add chibios waiting methods test bench
---
 keyboards/handwired/onekey/elite_c/config.h   |  3 ++
 .../keymaps/chibios_waiting_test/config.h     | 12 +++++
 .../keymaps/chibios_waiting_test/keymap.c     | 47 +++++++++++++++++++
 keyboards/handwired/onekey/promicro/config.h  |  3 ++
 keyboards/handwired/onekey/rp2040/config.h    |  9 +++-
 keyboards/handwired/onekey/teensy_2/config.h  |  3 ++
 .../handwired/onekey/teensy_2pp/config.h      |  3 ++
 keyboards/planck/rev6_drop/matrix.c           | 25 +++++-----
 keyboards/preonic/rev3_drop/matrix.c          | 25 +++++-----
 platforms/chibios/_wait.h                     |  5 ++
 platforms/chibios/bootloaders/rp2040.c        |  5 +-
 platforms/chibios/chibios_config.h            | 12 +++++
 platforms/chibios/drivers/serial.c            |  3 +-
 .../drivers/vendor/RP/RP2040/serial_vendor.c  |  2 +-
 14 files changed, 126 insertions(+), 31 deletions(-)
 create mode 100644 keyboards/handwired/onekey/keymaps/chibios_waiting_test/config.h
 create mode 100644 keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c

diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h
index f495a1c38b..a3f63983fe 100644
--- a/keyboards/handwired/onekey/elite_c/config.h
+++ b/keyboards/handwired/onekey/elite_c/config.h
@@ -30,3 +30,6 @@
 #define RGB_CI_PIN B1
 
 #define ADC_PIN F6
+
+#define QMK_WAITING_TEST_BUSY_PIN F6
+#define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/config.h b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/config.h
new file mode 100644
index 0000000000..0c75fa3044
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#if !defined(QMK_WAITING_TEST_BUSY_PIN)
+#    define QMK_WAITING_TEST_BUSY_PIN A8
+#endif
+
+#if !defined(QMK_WAITING_TEST_YIELD_PIN)
+#    define QMK_WAITING_TEST_YIELD_PIN A9
+#endif
diff --git a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
new file mode 100644
index 0000000000..ecf67d3b3c
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
@@ -0,0 +1,47 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {LAYOUT_ortho_1x1(KC_A)};
+
+#if defined(__AVR__)
+#    pragma message "AVR uses polled waiting by default, running theses tests will not show any difference"
+static inline void chThdSleepMicroseconds(uint32_t us) {
+    wait_us(us);
+}
+#endif
+
+void keyboard_post_init_user(void) {
+    setPinOutput(QMK_WAITING_TEST_BUSY_PIN);
+    setPinOutput(QMK_WAITING_TEST_YIELD_PIN);
+}
+
+static inline void wait_us_polling_with_strobe(uint32_t us) {
+    writePinHigh(QMK_WAITING_TEST_BUSY_PIN);
+    wait_us(us);
+    writePinLow(QMK_WAITING_TEST_BUSY_PIN);
+}
+
+static inline void wait_us_yield_with_strobe(uint32_t us) {
+    writePinHigh(QMK_WAITING_TEST_YIELD_PIN);
+    chThdSleepMicroseconds(us);
+    writePinLow(QMK_WAITING_TEST_YIELD_PIN);
+}
+
+static const uint32_t waiting_values[] = {0, 1, 5, 10, 25, 50, 100, 150, 200, 500, 1000};
+
+void housekeeping_task_user(void) {
+    static uint32_t last_bench = 0;
+    if (timer_elapsed32(last_bench) > 500) {
+        for (int i = 0; i < (sizeof(waiting_values) / sizeof(waiting_values[0])); i++) {
+            wait_us_polling_with_strobe(waiting_values[i]);
+            wait_us(10);
+        }
+        for (int i = 0; i < (sizeof(waiting_values) / sizeof(waiting_values[0])); i++) {
+            wait_us_yield_with_strobe(waiting_values[i]);
+            wait_us(10);
+        }
+        last_bench = timer_read32();
+    }
+}
diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h
index 9c8961d5ca..b9ab046eae 100644
--- a/keyboards/handwired/onekey/promicro/config.h
+++ b/keyboards/handwired/onekey/promicro/config.h
@@ -30,3 +30,6 @@
 #define RGB_CI_PIN B1
 
 #define ADC_PIN F6
+
+#define QMK_WAITING_TEST_BUSY_PIN F6
+#define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index f5a122e91b..f4e45a8981 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -6,10 +6,15 @@
 #include "config_common.h"
 
 #define PRODUCT Onekey Raspberry Pi RP2040
-#define MATRIX_COL_PINS { GP4 }
-#define MATRIX_ROW_PINS { GP5 }
+#define MATRIX_COL_PINS \
+    { GP4 }
+#define MATRIX_ROW_PINS \
+    { GP5 }
 #define DEBUG_MATRIX_SCAN_RATE
 
+#define QMK_WAITING_TEST_BUSY_PIN GP8
+#define QMK_WAITING_TEST_YIELD_PIN GP9
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h
index b83262ef05..437c597f29 100644
--- a/keyboards/handwired/onekey/teensy_2/config.h
+++ b/keyboards/handwired/onekey/teensy_2/config.h
@@ -29,3 +29,6 @@
 #define RGB_DI_PIN F6
 
 #define ADC_PIN F6
+
+#define QMK_WAITING_TEST_BUSY_PIN F6
+#define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h
index 886ad70cbf..691dddfd1a 100644
--- a/keyboards/handwired/onekey/teensy_2pp/config.h
+++ b/keyboards/handwired/onekey/teensy_2pp/config.h
@@ -29,3 +29,6 @@
 #define RGB_DI_PIN F6
 
 #define ADC_PIN F6
+
+#define QMK_WAITING_TEST_BUSY_PIN F6
+#define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c
index 49e115d029..d10d94dcf8 100644
--- a/keyboards/planck/rev6_drop/matrix.c
+++ b/keyboards/planck/rev6_drop/matrix.c
@@ -15,14 +15,7 @@
  * 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 "debug.h"
-#include "matrix.h"
+#include "quantum.h"
 
 /*
  *     col: { B11, B10, B2, B1, A7, B0 }
@@ -38,9 +31,13 @@ __attribute__((weak)) void matrix_init_user(void) {}
 
 __attribute__((weak)) void matrix_scan_user(void) {}
 
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
+__attribute__((weak)) void matrix_init_kb(void) {
+    matrix_init_user();
+}
 
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+__attribute__((weak)) void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
 
 void matrix_init(void) {
     dprintf("matrix init\n");
@@ -146,9 +143,13 @@ uint8_t matrix_scan(void) {
     return 1;
 }
 
-bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & (1 << col)); }
+bool matrix_is_on(uint8_t row, uint8_t col) {
+    return (matrix[row] & (1 << col));
+}
 
-matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
+matrix_row_t matrix_get_row(uint8_t row) {
+    return matrix[row];
+}
 
 void matrix_print(void) {
     dprintf("\nr/c 01234567\n");
diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c
index 07171a39e9..82214e03d9 100644
--- a/keyboards/preonic/rev3_drop/matrix.c
+++ b/keyboards/preonic/rev3_drop/matrix.c
@@ -15,14 +15,7 @@
  * 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 "debug.h"
-#include "matrix.h"
+#include "quantum.h"
 
 typedef uint16_t matrix_col_t;
 
@@ -40,9 +33,13 @@ __attribute__((weak)) void matrix_init_user(void) {}
 
 __attribute__((weak)) void matrix_scan_user(void) {}
 
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
+__attribute__((weak)) void matrix_init_kb(void) {
+    matrix_init_user();
+}
 
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+__attribute__((weak)) void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
 
 void matrix_init(void) {
     dprintf("matrix init\n");
@@ -150,9 +147,13 @@ uint8_t matrix_scan(void) {
     return 1;
 }
 
-bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & (1 << col)); }
+bool matrix_is_on(uint8_t row, uint8_t col) {
+    return (matrix[row] & (1 << col));
+}
 
-matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
+matrix_row_t matrix_get_row(uint8_t row) {
+    return matrix[row];
+}
 
 void matrix_print(void) {
     dprintf("\nr/c 01234567\n");
diff --git a/platforms/chibios/_wait.h b/platforms/chibios/_wait.h
index 2f36c64a2e..21cdffe11a 100644
--- a/platforms/chibios/_wait.h
+++ b/platforms/chibios/_wait.h
@@ -30,6 +30,11 @@
 
 #ifdef WAIT_US_TIMER
 void wait_us(uint16_t duration);
+#elif PORT_SUPPORTS_RT == TRUE
+#    define wait_us(us)                                            \
+        do {                                                       \
+            chSysPolledDelayX(US2RTC(REALTIME_COUNTER_CLOCK, us)); \
+        } while (0)
 #else
 #    define wait_us(us)                     \
         do {                                \
diff --git a/platforms/chibios/bootloaders/rp2040.c b/platforms/chibios/bootloaders/rp2040.c
index 13a54036ef..bedc00f32e 100644
--- a/platforms/chibios/bootloaders/rp2040.c
+++ b/platforms/chibios/bootloaders/rp2040.c
@@ -43,9 +43,8 @@ void __late_init(void) {
     if (magic_location != magic_token) {
         magic_location = magic_token;
         // ChibiOS is not initialized at this point, so sleeping is only
-        // possible via busy waiting. The internal timer peripheral is running
-        // at this point with a precision of 1us.
-        chSysPolledDelayX(MS2RTC(1 * MHZ, RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT));
+        // possible via busy waiting.
+        wait_us(RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT * 1000U);
         magic_location = 0;
         return;
     }
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index e5aa8e3d05..c7a3a98fb0 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -21,6 +21,9 @@
 
 #if defined(MCU_RP)
 #    define CPU_CLOCK RP_CORE_CLK
+// ChibiOS uses the RP2040 timer peripheral as its real time counter, this timer
+// is monotonic and running at 1MHz.
+#    define REALTIME_COUNTER_CLOCK 1000000
 
 #    define USE_GPIOV1
 #    define PAL_OUTPUT_TYPE_OPENDRAIN _Static_assert(0, "RP2040 has no Open Drain GPIO configuration, setting this is not possible");
@@ -102,6 +105,11 @@
 #    endif
 #endif
 
+#if defined(MCU_MIMXRT1062)
+#    include "clock_config.h"
+#    define CPU_CLOCK BOARD_BOOTCLOCKRUN_CORE_CLOCK
+#endif
+
 #if defined(HT32)
 #    define CPU_CLOCK HT32_CK_SYS_FREQUENCY
 #    define PAL_MODE_ALTERNATE PAL_HT32_MODE_AF
@@ -109,3 +117,7 @@
 #    define PAL_OUTPUT_TYPE_PUSHPULL PAL_HT32_MODE_DIR
 #    define PAL_OUTPUT_SPEED_HIGHEST 0
 #endif
+
+#if !defined(REALTIME_COUNTER_CLOCK)
+#    define REALTIME_COUNTER_CLOCK CPU_CLOCK
+#endif
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index 3fae5cd3a4..0dd8e71ae8 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -20,7 +20,8 @@
 #    error "chSysPolledDelayX method not supported on this platform"
 #else
 #    undef wait_us
-#    define wait_us(x) chSysPolledDelayX(US2RTC(CPU_CLOCK, x))
+// Force usage of polled waiting - in case WAIT_US_TIMER is activated
+#    define wait_us(us) chSysPolledDelayX(US2RTC(REALTIME_COUNTER_CLOCK, us))
 #endif
 
 #ifndef SELECT_SOFT_SERIAL_SPEED
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
index d933dc1f5d..338146dadd 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
@@ -152,7 +152,7 @@ static inline void enter_rx_state(void) {
     }
     // Wait for ~11 bits, 1 start bit + 8 data bits + 1 stop bit + 1 bit
     // headroom.
-    chSysPolledDelayX(US2RTC(1 * MHZ, (1000000U * 11 / SERIAL_USART_SPEED)));
+    wait_us(1000000U * 11U / SERIAL_USART_SPEED);
     // Disable tx state machine to not interfere with our tx pin manipulation
     pio_sm_set_enabled(pio, tx_state_machine, false);
     gpio_set_drive_strength(SERIAL_USART_TX_PIN, GPIO_DRIVE_STRENGTH_2MA);

From 61df87ae2ccaafc8387c4349187f0ab7e9e7bfbc Mon Sep 17 00:00:00 2001
From: "FREEWING.JP" <freewing.jp@gmail.com>
Date: Tue, 12 Jul 2022 04:59:16 +0900
Subject: [PATCH 092/959] Added Delay time dynamic keymap's macro feature
 (#16810)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 quantum/dynamic_keymap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index fc1c55784d..cbe9f13940 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -93,6 +93,10 @@ _Static_assert((DYNAMIC_KEYMAP_EEPROM_MAX_ADDR) - (DYNAMIC_KEYMAP_MACRO_EEPROM_A
 #    define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE (DYNAMIC_KEYMAP_EEPROM_MAX_ADDR - DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + 1)
 #endif
 
+#ifndef DYNAMIC_KEYMAP_MACRO_DELAY
+#    define DYNAMIC_KEYMAP_MACRO_DELAY TAP_CODE_DELAY
+#endif
+
 uint8_t dynamic_keymap_get_layer_count(void) {
     return DYNAMIC_KEYMAP_LAYER_COUNT;
 }
@@ -300,6 +304,6 @@ void dynamic_keymap_macro_send(uint8_t id) {
                 break;
             }
         }
-        send_string(data);
+        send_string_with_delay(data, DYNAMIC_KEYMAP_MACRO_DELAY);
     }
 }

From bbd6ea977c87dc610e487ef5b787047e09b0f551 Mon Sep 17 00:00:00 2001
From: GloriousThrall <74627436+GloriousThrall@users.noreply.github.com>
Date: Tue, 12 Jul 2022 02:30:54 -0500
Subject: [PATCH 093/959] GMMK 2 WBG7 MCU compatibility  (#16436)

* GMMK V2 QMK Compatibility

* fix problems

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Fix a minor problem

* Optimize the code

* Update config.h

* Update

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update keyboards/gmmk/gmmk2/p65/ansi/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/iso/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p65/iso/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update config.h

* Update config.h

* Modify device pid

* Add gmmk2_p96 keyboard.

* Add gmmk2_p96 keyboard.

* Update led matrix.

* Update led matrix.

* Delete eeprom_flash.c

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update from qmk develop branch

* Increased compatibility with wear_leveling.

* Update config.h

Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 keyboards/gmmk/gmmk2/p96/ansi/ansi.c          | 332 ++++++++++++++++++
 keyboards/gmmk/gmmk2/p96/ansi/ansi.h          |  54 +++
 keyboards/gmmk/gmmk2/p96/ansi/config.h        |  21 ++
 keyboards/gmmk/gmmk2/p96/ansi/info.json       | 119 +++++++
 .../gmmk2/p96/ansi/keymaps/default/keymap.c   |  46 +++
 .../gmmk2/p96/ansi/keymaps/default/readme.md  |   1 +
 .../gmmk/gmmk2/p96/ansi/keymaps/via/config.h  |  22 ++
 .../gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c  |  53 +++
 .../gmmk/gmmk2/p96/ansi/keymaps/via/rules.mk  |   1 +
 keyboards/gmmk/gmmk2/p96/ansi/readme.md       |  23 ++
 keyboards/gmmk/gmmk2/p96/ansi/rules.mk        |  22 ++
 keyboards/gmmk/gmmk2/p96/config.h             | 130 +++++++
 keyboards/gmmk/gmmk2/p96/halconf.h            |  29 ++
 keyboards/gmmk/gmmk2/p96/iso/config.h         |  21 ++
 keyboards/gmmk/gmmk2/p96/iso/info.json        | 120 +++++++
 keyboards/gmmk/gmmk2/p96/iso/iso.c            | 328 +++++++++++++++++
 keyboards/gmmk/gmmk2/p96/iso/iso.h            |  54 +++
 .../gmmk2/p96/iso/keymaps/default/keymap.c    |  44 +++
 .../gmmk2/p96/iso/keymaps/default/readme.md   |   1 +
 .../gmmk/gmmk2/p96/iso/keymaps/via/config.h   |  22 ++
 .../gmmk/gmmk2/p96/iso/keymaps/via/keymap.c   |  51 +++
 .../gmmk/gmmk2/p96/iso/keymaps/via/rules.mk   |   1 +
 keyboards/gmmk/gmmk2/p96/iso/readme.md        |  23 ++
 keyboards/gmmk/gmmk2/p96/iso/rules.mk         |  22 ++
 keyboards/gmmk/gmmk2/p96/mcuconf.h            |  30 ++
 keyboards/gmmk/gmmk2/p96/p96.c                |  17 +
 keyboards/gmmk/gmmk2/p96/p96.h                |  25 ++
 27 files changed, 1612 insertions(+)
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/ansi.c
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/ansi.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/config.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/info.json
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p96/ansi/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p96/config.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/halconf.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/config.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/info.json
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/iso.c
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/iso.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/keymaps/via/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p96/iso/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p96/mcuconf.h
 create mode 100644 keyboards/gmmk/gmmk2/p96/p96.c
 create mode 100644 keyboards/gmmk/gmmk2/p96/p96.h

diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
new file mode 100644
index 0000000000..455a598982
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
@@ -0,0 +1,332 @@
+/* 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 "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   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, 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, 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, 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, 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, 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 .
+
+    {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
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {{
+    { 0, 18, 36, 54, 70, 87, 14, 94},
+    { 1, 19, 37, 55, __, 88, 15, 82},
+    { 2, 20, 38, 56, 71, 89, 16, 95},
+    { 3, 21, 39, 57, 72, __, 17, 96},
+    { 4, 22, 40, 58, 73, __, 32, 97},
+    { 5, 23, 41, 59, 74, __, 33, 98},
+    { 6, 24, 42, 60, 75, 90, 34, 83},
+    { 7, 25, 43, 61, 76, __, 35, 84},
+    { 8, 26, 44, 62, 77, __, 50, 85},
+    { 9, 27, 45, 63, 78, 91, 51, 86},
+    {10, 28, 46, 64, 79, 92, 52, 67},
+    {11, 29, 47, 65, 80, __, 53, 68},
+    {12, 30, 48, __, __, 93, __, 69},
+    {13, 31, 49, 66, 81, __, __, __}
+}, {
+    { 11,    0}, //   0, k00, Esc
+    { 22,    0}, //   1, k10, F1
+    { 33,    0}, //   2, k20, F2
+    { 44,    0}, //   3, k30, F3
+    { 55,    0}, //   4, k40, F4
+    { 66,    0}, //   5, k50, F5
+    { 77,    0}, //   6, k60, F6
+    { 88,    0}, //   7, k70, F7
+    { 99,    0}, //   8, k80, F8
+    { 110,   0}, //   9, k90, F9
+    { 121,   0}, //  10, ka0, F10
+    { 132,   0}, //  11, kb0, F11
+    { 143,   0}, //  12, kc0, F12
+    { 154,   0}, //  13, kd0, Printscreen
+    { 165,   0}, //  14, k06, Delete
+    { 176,   0}, //  15, k16, Insert
+    { 187,   0}, //  16, k26, Page Up
+    { 198,   0}, //  17, k36, Page Down
+
+    {  11,  11}, //  18, k01, `
+    {  22,  11}, //  19, k11, 1
+    {  33,  11}, //  20, k21, 2
+    {  44,  11}, //  21, k31, 3
+    {  55,  11}, //  22, k41, 4
+    {  66,  11}, //  23, k51, 5
+    {  77,  11}, //  24, k61, 6
+    {  88,  11}, //  25, k71, 7
+    {  99,  11}, //  26, k81, 8
+    { 110,  11}, //  27, k91, 9
+    { 121,  11}, //  28, ka1, 0
+    { 132,  11}, //  29, kb1, -
+    { 143,  11}, //  30, kc1, =
+    { 154,  11}, //  31, kd1, Backspace
+    { 165,  11}, //  32, k46, Num Lock
+    { 176,  11}, //  33, k56, Num /
+    { 187,  11}, //  34, k66, Num *
+    { 198,  11}, //  35, k76, Num -
+
+    {  11,  22}, //  36, k02, Tab
+    {  22,  22}, //  37, k12, Q
+    {  33,  22}, //  38, k22, W
+    {  44,  22}, //  39, k32, E
+    {  55,  22}, //  40, k42, R
+    {  66,  22}, //  41, k52, T
+    {  77,  22}, //  42, k62, Y
+    {  88,  22}, //  43, k72, U
+    {  99,  22}, //  44, k82, I
+    { 110,  22}, //  45, k92, O
+    { 121,  22}, //  46, ka2, P
+    { 132,  22}, //  47, kb2, [
+    { 143,  22}, //  48, kc2, ]
+    { 154,  22}, //  49, kd3, "\\"
+    { 165,  22}, //  50, k86, Num 7
+    { 176,  22}, //  51, k96, Num 8
+    { 187,  22}, //  52, ka6, Num 9
+    { 198,  22}, //  53, kb6, Num +
+
+    {  11,  33}, //  54, k03, Caps Lock
+    {  22,  33}, //  55, k13, A
+    {  33,  33}, //  56, k23, S
+    {  44,  33}, //  57, k33, D
+    {  55,  33}, //  58, k43, F
+    {  66,  33}, //  59, k53, G
+    {  77,  33}, //  60, k63, H
+    {  88,  33}, //  61, k73, J
+    {  99,  33}, //  62, k83, K
+    { 110,  33}, //  63, k93, L
+    { 121,  33}, //  64, ka3, ;
+    { 132,  33}, //  65, kb3, '
+    { 154,  33}, //  66, kc3, Enter
+    { 165,  33}, //  67, ka7, Num 4
+    { 176,  33}, //  68, kb7, Num 5
+    { 187,  33}, //  69, kc7, Num 6
+
+    {  11,  44}, //  70, k04, Shift_L
+    {  33,  44}, //  71, k24, Z
+    {  44,  44}, //  72, k34, X
+    {  55,  44}, //  73, k44, C
+    {  66,  44}, //  74, k54, V
+    {  77,  44}, //  75, k64, B
+    {  88,  44}, //  76, k74, N
+    {  99,  44}, //  77, k84, M
+    { 110,  44}, //  78, k94, ,
+    { 121,  44}, //  79, ka4, .
+    { 132,  44}, //  80, kb4, /
+    { 143,  44}, //  81, kd4, Shift_R
+    { 154,  44}, //  82, k17, Up
+    { 165,  44}, //  83, k67, Num 1
+    { 176,  44}, //  84, k77, Num 2
+    { 187,  44}, //  85, k87, Num 3
+    { 198,  44}, //  86, k97, Enter_R
+
+    {  11,  55}, //  87, k05, Ctrl_L
+    {  22,  55}, //  88, k15, Win_L
+    {  33,  55}, //  89, k25, Alt_L
+    {  77,  55}, //  90, k65, Space
+    { 110,  55}, //  91, k95, Alt_R
+    { 121,  55}, //  92, ka5, FN
+    { 132,  55}, //  93, kc5, Ctrl_R
+    { 143,  55}, //  94, k07, Left
+    { 154,  55}, //  95, k27, Down
+    { 165,  55}, //  96, k37, Right
+    { 176,  55}, //  97, k47, Num 0
+    { 187,  55}, //  98, k57, Num .
+
+    {   0,   0}, // 101, LED 1
+    {   0,   6}, // 102, LED 2
+    {   0,  12}, // 103, LED 3
+    {   0,  18}, // 104, LED 4
+    {   0,  24}, // 105, LED 5
+    {   0,  30}, // 106, LED 6
+    {   0,  36}, // 107, LED 7
+    {   0,  42}, // 108, LED 8
+    {   0,  48}, // 109, LED 9
+    {   0,  54}, // 110, LED 10
+    { 209,   0}, // 111, LED 11
+    { 209,   6}, // 112, LED 12
+    { 209,  12}, // 113, LED 13
+    { 209,  18}, // 114, LED 14
+    { 209,  24}, // 115, LED 15
+    { 209,  30}, // 116, LED 16
+    { 209,  36}, // 117, LED 17
+    { 209,  42}, // 118, LED 18
+    { 209,  48}, // 119, LED 19
+    { 209,  54}  // 120, LED 20
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.h b/keyboards/gmmk/gmmk2/p96/ansi/ansi.h
new file mode 100644
index 0000000000..d449a198df
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.h
@@ -0,0 +1,54 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+//  ESC  F1   F2   F3   F4   F5   F6   F7   F8   F9   F10  F11  F12  Prt      Del  Ins  PgUp  PgDn
+//  `    1    2    3    4    5    6    7    8    9    0    -    =    BSpc     Num  /    *     -
+//  Tab  Q    W    E    R    T    Y    U    I    O    P    [    ]    \\       7    8    9     +
+//  Caps A    S    D    F    G    H    J    K    L    ;    '         Enter    4    5    6     +
+//  Sh_L      Z    X    C    V    B    N    M    ,    .    /    Sh_R   Up     1    2    3     Enter
+//  Ct_L    Win_L   Alt_L      SPACE          Alt_R   FN   Ct_R    Left Down Right 0    .     Enter
+
+// clang-format off
+#define LAYOUT( \
+    k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0,     k06, k16, k26, k36,\
+    k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1,     k46, k56, k66, k76,\
+    k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2,     k86, k96, ka6, kb6,\
+    k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3,      kd3,     ka7, kb7, kc7, \
+    k04,      k24, k34, k44, k54, k64, k74, k84, k94, ka4, kb4, kd4,  k17,    k67, k77, k87, k97,\
+    k05,    k15,    k25,       k65,           k95,    ka5, kc5,    k07, k27, k37,  k47, k57      \
+)\
+{\
+    { k00, k01, k02, k03, k04, k05, k06, k07},\
+    { k10, k11, k12, k13, ___, k15, k16, k17},\
+    { k20, k21, k22, k23, k24, k25, k26, k27},\
+    { k30, k31, k32, k33, k34, ___, k36, k37},\
+    { k40, k41, k42, k43, k44, ___, k46, k47},\
+    { k50, k51, k52, k53, k54, ___, k56, k57},\
+    { k60, k61, k62, k63, k64, k65, k66, k67},\
+    { k70, k71, k72, k73, k74, ___, k76, k77},\
+    { k80, k81, k82, k83, k84, ___, k86, k87},\
+    { k90, k91, k92, k93, k94, k95, k96, k97},\
+    { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7},\
+    { kb0, kb1, kb2, kb3, kb4, ___, kb6, kb7},\
+    { kc0, kc1, kc2, ___, ___, kc5, ___, kc7},\
+    { kd0, kd1, kd2, kd3, kd4, ___, ___, ___} \
+}
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/config.h b/keyboards/gmmk/gmmk2/p96/ansi/config.h
new file mode 100644
index 0000000000..9f386a4211
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT_ID 0x504B
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
new file mode 100644
index 0000000000..1fe1530e4e
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -0,0 +1,119 @@
+{
+    "keyboard_name": "GMMK V2 96 ANSI",
+    "url": "http://www.pcgamingrace.com",
+    "maintainer": "GloriousThrall",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "ESC", "x": 0, "y": 0 },
+
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+
+                { "label": "Printscreen", "x": 14, "y": 0 },
+                { "label": "Delete", "x": 15.5, "y": 0 },
+                { "label": "Insert", "x": 16.5, "y": 0 },
+                { "label": "Page Up", "x": 17.5, "y": 0 },
+                { "label": "Page Down", "x": 18.5, "y": 0 },
+
+                { "label": "`", "x": 0, "y": 1 },
+                { "label": "1", "x": 1, "y": 1 },
+                { "label": "2", "x": 2, "y": 1 },
+                { "label": "3", "x": 3, "y": 1 },
+                { "label": "4", "x": 4, "y": 1 },
+                { "label": "5", "x": 5, "y": 1 },
+                { "label": "6", "x": 6, "y": 1 },
+                { "label": "7", "x": 7, "y": 1 },
+                { "label": "8", "x": 8, "y": 1 },
+                { "label": "9", "x": 9, "y": 1 },
+                { "label": "0", "x": 10, "y": 1 },
+                { "label": "-", "x": 11, "y": 1 },
+                { "label": "=", "x": 12, "y": 1 },
+                { "label": "Backspace", "x": 13, "y": 1, "w": 2},
+                { "label": "Num Lock", "x": 15.5, "y": 1 },
+                { "label": "/", "x": 16.5, "y": 1 },
+                { "label": "*", "x": 17.5, "y": 1 },
+                { "label": "-", "x": 18.5, "y": 1 },
+
+                { "label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                { "label": "Q", "x": 1.5, "y": 2 },
+                { "label": "W", "x": 2.5, "y": 2 },
+                { "label": "E", "x": 3.5, "y": 2 },
+                { "label": "R", "x": 4.5, "y": 2 },
+                { "label": "T", "x": 5.5, "y": 2 },
+                { "label": "Y", "x": 6.5, "y": 2 },
+                { "label": "U", "x": 7.5, "y": 2 },
+                { "label": "I", "x": 8.5, "y": 2 },
+                { "label": "O", "x": 9.5, "y": 2 },
+                { "label": "P", "x": 10.5, "y": 2 },
+                { "label": "[", "x": 11.5, "y": 2 },
+                { "label": "]", "x": 12.5, "y": 2 },
+                { "label": "\\", "x": 13.5, "y": 2 , "w": 1.25},
+                { "label": "7", "x": 15.5, "y": 2 },
+                { "label": "8", "x": 16.5, "y": 2 },
+                { "label": "9", "x": 17.5, "y": 2, "w": 1.5},
+                { "label": "+", "x": 18.5, "y": 2 ,"h":2},
+
+                { "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
+                { "label": "A", "x": 1.75, "y": 3 },
+                { "label": "S", "x": 2.75, "y": 3 },
+                { "label": "D", "x": 3.75, "y": 3 },
+                { "label": "F", "x": 4.75, "y": 3 },
+                { "label": "G", "x": 5.75, "y": 3 },
+                { "label": "H", "x": 6.75, "y": 3 },
+                { "label": "J", "x": 7.75, "y": 3 },
+                { "label": "K", "x": 8.75, "y": 3 },
+                { "label": "L", "x": 9.75, "y": 3 },
+                { "label": ";", "x": 10.75, "y": 3 },
+                { "label": "'", "x": 11.75, "y": 3 },
+                { "label": "Enter", "x": 12.75, "y": 3, "w": 2.25 },
+                { "label": "4", "x": 15.5, "y": 3 },
+                { "label": "5", "x": 16.5, "y": 3 },
+                { "label": "6", "x": 17.5, "y": 3 },
+
+                { "label": "Shift", "x": 0, "y": 4, "w": 2.25},
+                { "label": "Z", "x": 2.25, "y": 4 },
+                { "label": "X", "x": 3.25, "y": 4 },
+                { "label": "C", "x": 4.25, "y": 4 },
+                { "label": "V", "x": 5.25, "y": 4 },
+                { "label": "B", "x": 6.25, "y": 4 },
+                { "label": "N", "x": 7.25, "y": 4 },
+                { "label": "M", "x": 8.25, "y": 4 },
+                { "label": ",", "x": 9.25, "y": 4 },
+                { "label": ".", "x": 10.25, "y": 4 },
+                { "label": "/", "x": 11.25, "y": 4 },
+                { "label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
+                { "label": "Up", "x": 14.25, "y": 4 },
+                { "label": "1", "x": 15.5, "y": 4 },
+                { "label": "2", "x": 16.5, "y": 4 },
+                { "label": "3", "x": 17.5, "y": 4 },
+                { "label": "Enter", "x": 18.5, "y": 4 ,"h":2},
+
+                { "label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
+                { "label": "Win", "x": 1.25, "y": 5, "w": 1.25},
+                { "label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
+                { "label": "Space", "x": 3.75, "y": 5, "w": 6.25},
+                { "label": "Alt", "x": 10, "y": 5 },
+                { "label": "FN", "x": 11, "y": 5 },
+                { "label": "Ctrl", "x": 12, "y": 5 },
+                { "label": "Left", "x": 13.25, "y": 5 },
+                { "label": "Down", "x": 14.25, "y": 5 },
+                { "label": "Right", "x": 15.25, "y": 5 },
+                { "label": "0", "x": 16.5, "y": 5 },
+                { "label": ".", "x": 17.5, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7ea51338aa
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* 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(
+  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT(
+    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
+  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
+	_______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
+};
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md
new file mode 100644
index 0000000000..fd8536d5de
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md
@@ -0,0 +1 @@
+# ANSI GMMKV2 96% Layout
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
new file mode 100644
index 0000000000..8fe214e8a7
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define STM32_USB_USE_OTG1 TRUE
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c61740193e
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* 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(
+  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT(
+    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
+  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
+	_______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
+[2] = LAYOUT(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+	_______,  _______,  _______,                      _______,                                _______,  _______,  _______, _______,   _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/readme.md b/keyboards/gmmk/gmmk2/p96/ansi/readme.md
new file mode 100644
index 0000000000..0d01979bb3
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/readme.md
@@ -0,0 +1,23 @@
+# GMMK V2 96% (ANSI)
+
+A keyboard made and sold by Glorious LLC. Equipped with the WestBerry G7 ARM Cortex-M4 microcontroller
+
+* Keyboard Maintainer: [GloriousThrall](https://github.com/GloriousThrall)
+* Hardware Supported: GMMK V2
+* Hardware Availability: [GloriousPCGaming.com](https://www.pcgamingrace.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gmmk/gmmk2/p96/ansi:default
+
+Flashing example for this keyboard:
+
+    make gmmk/gmmk2/p96/ansi:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB while connecting the USB cable (remove the spacebar key and press and hold the pin on the right side)
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+Backslash will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
new file mode 100644
index 0000000000..ba78129495
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = WB32F3G71
+
+# Bootloader selection
+BOOTLOADER = wb32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite.
+MOUSEKEY_ENABLE = yes        # Mouse keys.
+EXTRAKEY_ENABLE = yes        # Audio control and System control.
+CONSOLE_ENABLE = no          # Console for debug.
+COMMAND_ENABLE = no          # Commands for debug and configuration.
+NKRO_ENABLE = yes            # Enable NKRO Rollover.
+BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
+RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
+AUDIO_ENABLE = no            # Audio output.
+RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
+RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
new file mode 100644
index 0000000000..1b3a92dd53
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -0,0 +1,130 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define DEVICE_VER 0x0001
+#define VENDOR_ID 0x320F
+#define MANUFACTURER Glorious
+
+#define PRODUCT GMMK 2 96
+
+/* key matrix size */
+#define MATRIX_ROWS 14
+#define MATRIX_COLS 8
+
+#define MATRIX_ROW_PINS \
+    { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13 }
+#define MATRIX_COL_PINS \
+    { A0, A1, A2, A3, A4, A8, A9, A10 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Hold ESC on start up to clear EEPROM and boot into bootloader mode */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+#define TAP_CODE_DELAY 10
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
+#define WEAR_LEVELING_BACKING_SIZE 2048
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN A5
+#define SPI_MOSI_PIN A7
+#define SPI_MISO_PIN A6
+
+#define DRIVER_1_CS A15
+#define DRIVER_2_CS B15
+#define DRIVER_1_EN C13
+#define DRIVER_2_EN C13
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 54
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+
+/* Send up to 4 key press events per scan */
+#define QMK_KEYS_PER_SCAN 4
+
+/* Set debounce time to 5ms */
+#define DEBOUNCE 5
+
+/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */
+// #define FORCE_NKRO
diff --git a/keyboards/gmmk/gmmk2/p96/halconf.h b/keyboards/gmmk/gmmk2/p96/halconf.h
new file mode 100644
index 0000000000..293d182917
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/halconf.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/wb_support/gmmk2/halconf.h -r platforms/chibios/boards/common/configs/halconf.h`
+ */
+
+#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/gmmk/gmmk2/p96/iso/config.h b/keyboards/gmmk/gmmk2/p96/iso/config.h
new file mode 100644
index 0000000000..97a391b09c
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT_ID 0x505A
diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
new file mode 100644
index 0000000000..96e9f1312b
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "GMMK V2 96 ISO",
+    "url": "http://www.pcgamingrace.com",
+    "maintainer": "GloriousThrall",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "ESC", "x": 0, "y": 0 },
+
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+
+                { "label": "Printscreen", "x": 14, "y": 0 },
+                { "label": "Delete", "x": 15.5, "y": 0 },
+                { "label": "Insert", "x": 16.5, "y": 0 },
+                { "label": "Page Up", "x": 17.5, "y": 0 },
+                { "label": "Page Down", "x": 18.5, "y": 0 },
+
+                { "label": "`", "x": 0, "y": 1 },
+                { "label": "1", "x": 1, "y": 1 },
+                { "label": "2", "x": 2, "y": 1 },
+                { "label": "3", "x": 3, "y": 1 },
+                { "label": "4", "x": 4, "y": 1 },
+                { "label": "5", "x": 5, "y": 1 },
+                { "label": "6", "x": 6, "y": 1 },
+                { "label": "7", "x": 7, "y": 1 },
+                { "label": "8", "x": 8, "y": 1 },
+                { "label": "9", "x": 9, "y": 1 },
+                { "label": "0", "x": 10, "y": 1 },
+                { "label": "-", "x": 11, "y": 1 },
+                { "label": "=", "x": 12, "y": 1 },
+                { "label": "Backspace", "x": 13, "y": 1, "w": 2},
+                { "label": "Num Lock", "x": 15.5, "y": 1 },
+                { "label": "/", "x": 16.5, "y": 1 },
+                { "label": "*", "x": 17.5, "y": 1 },
+                { "label": "-", "x": 18.5, "y": 1 },
+
+                { "label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                { "label": "Q", "x": 1.5, "y": 2 },
+                { "label": "W", "x": 2.5, "y": 2 },
+                { "label": "E", "x": 3.5, "y": 2 },
+                { "label": "R", "x": 4.5, "y": 2 },
+                { "label": "T", "x": 5.5, "y": 2 },
+                { "label": "Y", "x": 6.5, "y": 2 },
+                { "label": "U", "x": 7.5, "y": 2 },
+                { "label": "I", "x": 8.5, "y": 2 },
+                { "label": "O", "x": 9.5, "y": 2 },
+                { "label": "P", "x": 10.5, "y": 2 },
+                { "label": "[", "x": 11.5, "y": 2 },
+                { "label": "]", "x": 12.5, "y": 2 },
+                { "label": "Enter", "x": 13.5, "y": 2 ,"h":2, "w": 1.25},
+                { "label": "7", "x": 15.5, "y": 2 },
+                { "label": "8", "x": 16.5, "y": 2 },
+                { "label": "9", "x": 17.5, "y": 2, "w": 1.5},
+                { "label": "+", "x": 18.5, "y": 2 ,"h":2},
+
+                { "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
+                { "label": "A", "x": 1.75, "y": 3 },
+                { "label": "S", "x": 2.75, "y": 3 },
+                { "label": "D", "x": 3.75, "y": 3 },
+                { "label": "F", "x": 4.75, "y": 3 },
+                { "label": "G", "x": 5.75, "y": 3 },
+                { "label": "H", "x": 6.75, "y": 3 },
+                { "label": "J", "x": 7.75, "y": 3 },
+                { "label": "K", "x": 8.75, "y": 3 },
+                { "label": "L", "x": 9.75, "y": 3 },
+                { "label": ";", "x": 10.75, "y": 3 },
+                { "label": "'", "x": 11.75, "y": 3 },
+                { "label": "#", "x": 12.75, "y": 3 },
+                { "label": "4", "x": 15.5, "y": 3 },
+                { "label": "5", "x": 16.5, "y": 3 },
+                { "label": "6", "x": 17.5, "y": 3 },
+
+                { "label": "Shift", "x": 0, "y": 4, "w": 1.25},
+                { "label": "\\", "x": 1.25, "y": 4 },
+                { "label": "Z", "x": 2.25, "y": 4 },
+                { "label": "X", "x": 3.25, "y": 4 },
+                { "label": "C", "x": 4.25, "y": 4 },
+                { "label": "V", "x": 5.25, "y": 4 },
+                { "label": "B", "x": 6.25, "y": 4 },
+                { "label": "N", "x": 7.25, "y": 4 },
+                { "label": "M", "x": 8.25, "y": 4 },
+                { "label": ",", "x": 9.25, "y": 4 },
+                { "label": ".", "x": 10.25, "y": 4 },
+                { "label": "/", "x": 11.25, "y": 4 },
+                { "label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
+                { "label": "Up", "x": 14.25, "y": 4 },
+                { "label": "1", "x": 15.5, "y": 4 },
+                { "label": "2", "x": 16.5, "y": 4 },
+                { "label": "3", "x": 17.5, "y": 4 },
+                { "label": "Enter", "x": 18.5, "y": 4 ,"h":2},
+
+                { "label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
+                { "label": "Win", "x": 1.25, "y": 5, "w": 1.25},
+                { "label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
+                { "label": "Space", "x": 3.75, "y": 5, "w": 6.25},
+                { "label": "Alt", "x": 10, "y": 5 },
+                { "label": "FN", "x": 11, "y": 5 },
+                { "label": "Ctrl", "x": 12, "y": 5 },
+                { "label": "Left", "x": 13.25, "y": 5 },
+                { "label": "Down", "x": 14.25, "y": 5 },
+                { "label": "Right", "x": 15.25, "y": 5 },
+                { "label": "0", "x": 16.5, "y": 5 },
+                { "label": ".", "x": 17.5, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c
new file mode 100644
index 0000000000..e1fee18079
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c
@@ -0,0 +1,328 @@
+/* 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 "iso.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   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, 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, 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, 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, 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, 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 .
+
+    {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
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {{
+    { 0, 18, 36, 54, 70, 88, 14, 95},
+    { 1, 19, 37, 55, 71, 89, 15, 83},
+    { 2, 20, 38, 56, 72, 90, 16, 96},
+    { 3, 21, 39, 57, 73, __, 17, 97},
+    { 4, 22, 40, 58, 74, __, 32, 98},
+    { 5, 23, 41, 59, 75, __, 33, 99},
+    { 6, 24, 42, 60, 76, 91, 34, 84},
+    { 7, 25, 43, 61, 77, __, 35, 85},
+    { 8, 26, 44, 62, 78, __, 50, 86},
+    { 9, 27, 45, 63, 79, 92, 51, 87},
+    {10, 28, 46, 64, 80, 93, 52, 67},
+    {11, 29, 47, 65, 81, __, 53, 68},
+    {12, 30, 48, 66, __, 94, __, 69},
+    {13, 31, __, 49, 82, __, __, __}
+}, {
+    { 11,    0}, //   0, k00, Esc
+    { 22,    0}, //   1, k10, F1
+    { 33,    0}, //   2, k20, F2
+    { 44,    0}, //   3, k30, F3
+    { 55,    0}, //   4, k40, F4
+    { 66,    0}, //   5, k50, F5
+    { 77,    0}, //   6, k60, F6
+    { 88,    0}, //   7, k70, F7
+    { 99,    0}, //   8, k80, F8
+    { 110,   0}, //   9, k90, F9
+    { 121,   0}, //  10, ka0, F10
+    { 132,   0}, //  11, kb0, F11
+    { 143,   0}, //  12, kc0, F12
+    { 154,   0}, //  13, kd0, Printscreen
+    { 165,   0}, //  14, k06, Delete
+    { 176,   0}, //  15, k16, Insert
+    { 187,   0}, //  16, k26, Page Up
+    { 198,   0}, //  17, k36, Page Down
+    {  11,  11}, //  18, k01, `
+    {  22,  11}, //  19, k11, 1
+    {  33,  11}, //  20, k21, 2
+    {  44,  11}, //  21, k31, 3
+    {  55,  11}, //  22, k41, 4
+    {  66,  11}, //  23, k51, 5
+    {  77,  11}, //  24, k61, 6
+    {  88,  11}, //  25, k71, 7
+    {  99,  11}, //  26, k81, 8
+    { 110,  11}, //  27, k91, 9
+    { 121,  11}, //  28, ka1, 0
+    { 132,  11}, //  29, kb1, -
+    { 143,  11}, //  30, kc1, =
+    { 154,  11}, //  31, kd1, Backspace
+    { 165,  11}, //  32, k46, Num Lock
+    { 176,  11}, //  33, k56, Num /
+    { 187,  11}, //  34, k66, Num *
+    { 198,  11}, //  35, k76, Num -
+    {  11,  22}, //  36, k02, Tab
+    {  22,  22}, //  37, k12, Q
+    {  33,  22}, //  38, k22, W
+    {  44,  22}, //  39, k32, E
+    {  55,  22}, //  40, k42, R
+    {  66,  22}, //  41, k52, T
+    {  77,  22}, //  42, k62, Y
+    {  88,  22}, //  43, k72, U
+    {  99,  22}, //  44, k82, I
+    { 110,  22}, //  45, k92, O
+    { 121,  22}, //  46, ka2, P
+    { 132,  22}, //  47, kb2, [
+    { 143,  22}, //  48, kc2, ]
+    { 154,  22}, //  49, kd3, Enter
+    { 165,  22}, //  50, k86, Num 7
+    { 176,  22}, //  51, k96, Num 8
+    { 187,  22}, //  52, ka6, Num 9
+    { 198,  22}, //  53, kb6, Num +
+    {  11,  33}, //  54, k03, Caps Lock
+    {  22,  33}, //  55, k13, A
+    {  33,  33}, //  56, k23, S
+    {  44,  33}, //  57, k33, D
+    {  55,  33}, //  58, k43, F
+    {  66,  33}, //  59, k53, G
+    {  77,  33}, //  60, k63, H
+    {  88,  33}, //  61, k73, J
+    {  99,  33}, //  62, k83, K
+    { 110,  33}, //  63, k93, L
+    { 121,  33}, //  64, ka3, ;
+    { 132,  33}, //  65, kb3, '
+    { 143,  33}, //  66, kc3, #
+    { 165,  33}, //  67, ka7, Num 4
+    { 176,  33}, //  68, kb7, Num 5
+    { 187,  33}, //  69, kc7, Num 6
+    {  11,  44}, //  70, k04, Shift_L
+    {  22,  44}, //  71, k14, "\\"
+    {  33,  44}, //  72, k24, Z
+    {  44,  44}, //  73, k34, X
+    {  55,  44}, //  74, k44, C
+    {  66,  44}, //  75, k54, V
+    {  77,  44}, //  76, k64, B
+    {  88,  44}, //  77, k74, N
+    {  99,  44}, //  78, k84, M
+    { 110,  44}, //  79, k94, ,
+    { 121,  44}, //  80, ka4, .
+    { 132,  44}, //  81, kb4, /
+    { 143,  44}, //  82, kd4, Shift_R
+    { 154,  44}, //  83, k17, Up
+    { 165,  44}, //  84, k67, Num 1
+    { 176,  44}, //  85, k77, Num 2
+    { 187,  44}, //  86, k87, Num 3
+    { 198,  44}, //  87, k97, Enter_R
+    {  11,  55}, //  88, k05, Ctrl_L
+    {  22,  55}, //  89, k15, Win_L
+    {  33,  55}, //  90, k25, Alt_L
+    {  77,  55}, //  91, k65, Space
+    { 110,  55}, //  92, k95, Alt_R
+    { 121,  55}, //  93, ka5, FN
+    { 132,  55}, //  94, kc5, Ctrl_R
+    { 143,  55}, //  95, k07, Left
+    { 154,  55}, //  96, k27, Down
+    { 165,  55}, //  97, k37, Right
+    { 176,  55}, //  98, k47, Num 0
+    { 187,  55}, //  99, k57, Num .
+    {   0,   0}, // 101, LED 1
+    {   0,   6}, // 102, LED 2
+    {   0,  12}, // 103, LED 3
+    {   0,  18}, // 104, LED 4
+    {   0,  24}, // 105, LED 5
+    {   0,  30}, // 106, LED 6
+    {   0,  36}, // 107, LED 7
+    {   0,  42}, // 108, LED 8
+    {   0,  48}, // 109, LED 9
+    {   0,  54}, // 110, LED 10
+    { 209,   0}, // 111, LED 11
+    { 209,   6}, // 112, LED 12
+    { 209,  12}, // 113, LED 13
+    { 209,  18}, // 114, LED 14
+    { 209,  24}, // 115, LED 15
+    { 209,  30}, // 116, LED 16
+    { 209,  36}, // 117, LED 17
+    { 209,  42}, // 118, LED 18
+    { 209,  48}, // 119, LED 19
+    { 209,  54}  // 120, LED 20
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.h b/keyboards/gmmk/gmmk2/p96/iso/iso.h
new file mode 100644
index 0000000000..f575befdc1
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/iso.h
@@ -0,0 +1,54 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+//  ESC  F1   F2   F3   F4   F5   F6   F7   F8   F9   F10  F11  F12  Prt      Del  Ins  PgUp  PgDn
+//  `    1    2    3    4    5    6    7    8    9    0    -    =    BSpc     Num  /    *     -
+//  Tab  Q    W    E    R    T    Y    U    I    O    P    [    ]    Enter    7    8    9     +
+//  Caps A    S    D    F    G    H    J    K    L    ;    '    #    Enter    4    5    6     +
+//  Sh_L \    Z    X    C    V    B    N    M    ,    .    /    Sh_R   Up     1    2    3     Enter
+//  Ct_L    Win_L   Alt_L      SPACE          Alt_R   FN   Ct_R    Left Down Right 0    .     Enter
+
+// clang-format off
+#define LAYOUT( \
+    k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0,     k06, k16, k26, k36,\
+    k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1,     k46, k56, k66, k76,\
+    k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd3,     k86, k96, ka6, kb6,\
+    k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3,          ka7, kb7, kc7,     \
+    k04, k14, k24, k34, k44, k54, k64, k74, k84, k94, ka4, kb4, kd4,  k17,    k67, k77, k87, k97,\
+    k05,    k15,    k25,       k65,           k95,    ka5, kc5,    k07, k27, k37,  k47, k57      \
+)\
+{\
+    { k00, k01, k02, k03, k04, k05, k06, k07},\
+    { k10, k11, k12, k13, k14, k15, k16, k17},\
+    { k20, k21, k22, k23, k24, k25, k26, k27},\
+    { k30, k31, k32, k33, k34, ___, k36, k37},\
+    { k40, k41, k42, k43, k44, ___, k46, k47},\
+    { k50, k51, k52, k53, k54, ___, k56, k57},\
+    { k60, k61, k62, k63, k64, k65, k66, k67},\
+    { k70, k71, k72, k73, k74, ___, k76, k77},\
+    { k80, k81, k82, k83, k84, ___, k86, k87},\
+    { k90, k91, k92, k93, k94, k95, k96, k97},\
+    { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7},\
+    { kb0, kb1, kb2, kb3, kb4, ___, kb6, kb7},\
+    { kc0, kc1, kc2, kc3, ___, kc5, ___, kc7},\
+    { kd0, kd1, ___, kd3, kd4, ___, ___, ___} \
+}
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1b41235e3c
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* 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.
+#define _BL 0
+#define _FL 1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT(
+  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,            KC_P4,    KC_P5,    KC_P6,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT(
+    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
+  _______,  _______,  RGB_SAI,  RGB_SAD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
+  _______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
+};
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md
new file mode 100644
index 0000000000..b83b40941d
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md
@@ -0,0 +1 @@
+# ISO GMMKV2 96% Layout
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
new file mode 100644
index 0000000000..8fe214e8a7
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define STM32_USB_USE_OTG1 TRUE
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0656566cf7
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* 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.
+#define _BL 0
+#define _FL 1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT(
+  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,            KC_P4,    KC_P5,    KC_P6,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT(
+    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
+  _______,  _______,  RGB_SAI,  RGB_SAD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
+	_______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
+[2] = LAYOUT(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+	_______,  _______,  _______,                      _______,                                _______,  _______,  _______, _______,   _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gmmk/gmmk2/p96/iso/readme.md b/keyboards/gmmk/gmmk2/p96/iso/readme.md
new file mode 100644
index 0000000000..88a9211973
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/readme.md
@@ -0,0 +1,23 @@
+# GMMK V2 96% (ISO)
+
+A keyboard made and sold by Glorious LLC. Equipped with the WestBerry G7 ARM Cortex-M4 microcontroller
+
+* Keyboard Maintainer: [GloriousThrall](https://github.com/GloriousThrall)
+* Hardware Supported: GMMK V2
+* Hardware Availability: [GloriousPCGaming.com](https://www.pcgamingrace.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gmmk/gmmk2/p96/iso:default
+
+Flashing example for this keyboard:
+
+    make gmmk/gmmk2/p96/iso:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB while connecting the USB cable (remove the spacebar key and press and hold the pin on the right side)
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+Backslash will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
new file mode 100644
index 0000000000..ba78129495
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = WB32F3G71
+
+# Bootloader selection
+BOOTLOADER = wb32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite.
+MOUSEKEY_ENABLE = yes        # Mouse keys.
+EXTRAKEY_ENABLE = yes        # Audio control and System control.
+CONSOLE_ENABLE = no          # Console for debug.
+COMMAND_ENABLE = no          # Commands for debug and configuration.
+NKRO_ENABLE = yes            # Enable NKRO Rollover.
+BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
+RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
+AUDIO_ENABLE = no            # Audio output.
+RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
+RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/gmmk2/p96/mcuconf.h b/keyboards/gmmk/gmmk2/p96/mcuconf.h
new file mode 100644
index 0000000000..c58ff986b1
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/wb_support/gmmk2/mcuconf.h -r platforms/chibios/GENERIC_WB32_F3G71XX/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/gmmk/gmmk2/p96/p96.c b/keyboards/gmmk/gmmk2/p96/p96.c
new file mode 100644
index 0000000000..47edcfe1ad
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/p96.c
@@ -0,0 +1,17 @@
+/* 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 "p96.h"
diff --git a/keyboards/gmmk/gmmk2/p96/p96.h b/keyboards/gmmk/gmmk2/p96/p96.h
new file mode 100644
index 0000000000..e7b37d6816
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/p96.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_gmmk_gmmk2_p96_ansi)
+#    include "ansi/ansi.h"
+#elif defined(KEYBOARD_gmmk_gmmk2_p96_iso)
+#    include "iso/iso.h"
+#endif  // GMMK V2 revisions

From 45ffe42f1a26d14e372ff8e0a35441fd968e1494 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 12 Jul 2022 21:54:33 +0200
Subject: [PATCH 094/959] [Fix] Make ChibiOS `_wait.h` independent of
 `quantum.h` (#17645)

---
 platforms/chibios/_wait.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platforms/chibios/_wait.h b/platforms/chibios/_wait.h
index 21cdffe11a..c0ccbc5569 100644
--- a/platforms/chibios/_wait.h
+++ b/platforms/chibios/_wait.h
@@ -17,6 +17,7 @@
 
 #include <ch.h>
 #include <hal.h>
+#include "chibios_config.h"
 
 /* chThdSleepX of zero maps to infinite - so we map to a tiny delay to still yield */
 #define wait_ms(ms)                     \

From ffb34fc0825e4a715842e93dbfdbe843759fec05 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 12 Jul 2022 13:55:19 -0600
Subject: [PATCH 095/959] Include stdint.h in avr/i2c_master.h (#17639)

---
 platforms/avr/drivers/i2c_master.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platforms/avr/drivers/i2c_master.h b/platforms/avr/drivers/i2c_master.h
index 2d95846db5..04ef126c80 100644
--- a/platforms/avr/drivers/i2c_master.h
+++ b/platforms/avr/drivers/i2c_master.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #define I2C_READ 0x01
 #define I2C_WRITE 0x00
 

From 36c25756583dfb5fc4b3069992dabd45b8f7a213 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 12 Jul 2022 20:58:16 -0700
Subject: [PATCH 096/959] Grammar fixes for docs/feature_converters.md (#17652)

---
 docs/feature_converters.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 4845912575..9cca76e8e8 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -29,7 +29,7 @@ qmk flash -c -kb keebio/bdn9/rev1 -km default -e CONVERT_TO=proton_c
 
 You can also add the same `CONVERT_TO=<target>` to your keymap's `rules.mk`, which will accomplish the same thing.
 
-?> If you get errors about `PORTB/DDRB`, etc not being defined, so you'll need to convert the keyboard's code to use the [GPIO Controls](gpio_control.md) that will work for both ARM and AVR. This shouldn't affect the AVR builds at all.
+?> If you get errors about `PORTB/DDRB`, etc not being defined, you'll need to convert the keyboard's code to use the [GPIO Controls](gpio_control.md) that will work for both ARM and AVR. This shouldn't affect the AVR builds at all.
 
 ### Conditional Configuration
 
@@ -63,7 +63,7 @@ Converter summary:
 
 ### Proton C :id=proton_c
 
-The Proton C only has one on-board LED (C13), and by default, the TXLED (D5) is mapped to it. If you want the RXLED (B0) mapped to it instead, add this like to your `config.h`:
+The Proton C only has one on-board LED (C13), and by default, the TXLED (D5) is mapped to it. If you want the RXLED (B0) mapped to it instead, add this line to your `config.h`:
 
 ```c
 #define CONVERT_TO_PROTON_C_RXLED

From 5db705d054e54a901f8968e3380e13c791991ab3 Mon Sep 17 00:00:00 2001
From: Daniel Kao <daniel.m.kao@gmail.com>
Date: Tue, 12 Jul 2022 21:17:40 -0700
Subject: [PATCH 097/959] Cirque trackpad features: circular scroll, inertial
 cursor (#17482)

---
 builddefs/common_features.mk               |   4 +
 docs/feature_pointing_device.md            |  31 +-
 drivers/sensors/cirque_pinnacle.c          | 189 +++++-----
 drivers/sensors/cirque_pinnacle.h          |  14 +-
 drivers/sensors/cirque_pinnacle_gestures.c | 226 ++++++++++++
 drivers/sensors/cirque_pinnacle_gestures.h | 107 ++++++
 drivers/sensors/cirque_pinnacle_regdefs.h  | 405 +++++++++++++++++++++
 quantum/pointing_device.h                  |   2 +
 quantum/pointing_device_drivers.c          | 101 +++--
 quantum/pointing_device_gestures.c         | 133 +++++++
 quantum/pointing_device_gestures.h         |  58 +++
 11 files changed, 1122 insertions(+), 148 deletions(-)
 create mode 100644 drivers/sensors/cirque_pinnacle_gestures.c
 create mode 100644 drivers/sensors/cirque_pinnacle_gestures.h
 create mode 100644 drivers/sensors/cirque_pinnacle_regdefs.h
 create mode 100644 quantum/pointing_device_gestures.c
 create mode 100644 quantum/pointing_device_gestures.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 5cc4508307..01dbdc3330 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -149,10 +149,14 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_i2c)
             OPT_DEFS += -DSTM32_I2C -DHAL_USE_I2C=TRUE
             SRC += drivers/sensors/cirque_pinnacle.c
+            SRC += drivers/sensors/cirque_pinnacle_gestures.c
+            SRC += $(QUANTUM_DIR)/pointing_device_gestures.c
             QUANTUM_LIB_SRC += i2c_master.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_spi)
             OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
             SRC += drivers/sensors/cirque_pinnacle.c
+            SRC += drivers/sensors/cirque_pinnacle_gestures.c
+            SRC += $(QUANTUM_DIR)/pointing_device_gestures.c
             QUANTUM_LIB_SRC += spi_master.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
             OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 264362ea77..70129dfc9a 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -89,15 +89,15 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
 
 This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the TM040040, TM035035 and the TM023023 trackpads. These are I2C or SPI compatible, and both configurations are supported.
 
-| Setting                         | Description                                                           | Default              |
-|-------------------------------- |-----------------------------------------------------------------------|--------------------- |
-|`CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.               | `127`                |
-|`CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.               | `1919`               |
-|`CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.               | `63`                 |
-|`CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.               | `1471`               |
-|`CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.                   | `ADC_ATTENUATE_4X`   |
-|`CIRQUE_PINNACLE_TAPPING_TERM`   | (Optional) Length of time that a touch can be to be considered a tap. | `TAPPING_TERM`/`200` |
-|`CIRQUE_PINNACLE_TOUCH_DEBOUNCE` | (Optional) Length of time that a touch can be to be considered a tap. | `TAPPING_TERM`/`200` |
+| Setting                         | Description                                                | Default            |
+|-------------------------------- |------------------------------------------------------------|--------------------|
+|`CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.    | `127`              |
+|`CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.    | `1919`             |
+|`CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.    | `63`               |
+|`CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.    | `1471`             |
+|`CIRQUE_PINNACLE_DIAMETER_MM`    | (Optional) Diameter of the trackpad sensor in millimeters. | `40`               |
+|`CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.        | `ADC_ATTENUATE_4X` |
+|`CIRQUE_PINNACLE_CURVED_OVERLAY` | (Optional) Applies settings tuned for curved overlay.      | _not defined_      |
 
 **`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be. 
 
@@ -120,10 +120,21 @@ Default attenuation is set to 4X, although if you are using a thicker overlay (s
 |`CIRQUE_PINNACLE_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_       |
 |`CIRQUE_PINNACLE_SPI_CS_PIN`   | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_  |
 
-Default Scaling/CPI is 1024.
+Default Scaling is 1024. Actual CPI depends on trackpad diameter.
 
 Also see the `POINTING_DEVICE_TASK_THROTTLE_MS`, which defaults to 10ms when using Cirque Pinnacle, which matches the internal update rate of the position registers (in standard configuration). Advanced configuration for pen/stylus usage might require lower values.
 
+#### Cirque Trackpad gestures
+
+| Gesture Setting                               | Description                                                                                                                                                                                      | Default              |
+|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------|
+|`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction                                                                              | _not defined_        |
+|`CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE`       | (Optional) Enable circular scroll. Touch originating in outer ring can trigger scroll by moving along the perimeter. Near side triggers vertical scroll and far side triggers horizontal scroll. | _not defined_        |
+|`CIRQUE_PINNACLE_TAP_ENABLE`                   | (Optional) Enable tap to click. This currently only works on the master side.                                                                                                                    | _not defined_        |
+|`CIRQUE_PINNACLE_TAPPING_TERM`                 | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
+|`CIRQUE_PINNACLE_TOUCH_DEBOUNCE`               | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
+
+**`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`** is not specific to Cirque trackpad; any pointing device with a lift/contact status can integrate this gesture into its driver. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `pointing_device_get_report()` is needed to generate glide reports.
 
 ### Pimoroni Trackball
 
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index 1d1e4ccfc6..c50d5a2525 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -9,47 +9,16 @@
 #include "wait.h"
 #include "timer.h"
 
-// Registers for RAP
-// clang-format off
-#define FIRMWARE_ID          0x00
-#define FIRMWARE_VERSION_C   0x01
-#define STATUS_1             0x02
-#define SYSCONFIG_1          0x03
-#define FEEDCONFIG_1         0x04
-#define FEEDCONFIG_2         0x05
-#define CALIBRATION_CONFIG_1 0x07
-#define PS2_AU_CONTROL       0x08
-#define SAMPLE_RATE          0x09
-#define Z_IDLE_COUNT         0x0A
-#define Z_SCALER             0x0B
-#define SLEEP_INTERVAL       0x0C
-#define SLEEP_TIMER          0x0D
-#define PACKET_BYTE_0        0x12
-#define PACKET_BYTE_1        0x13
-#define PACKET_BYTE_2        0x14
-#define PACKET_BYTE_3        0x15
-#define PACKET_BYTE_4        0x16
-#define PACKET_BYTE_5        0x17
-
-#define ERA_VALUE            0x1B
-#define ERA_HIGH_BYTE        0x1C
-#define ERA_LOW_BYTE         0x1D
-#define ERA_CONTROL          0x1E
-
-// ADC-attenuation settings (held in BIT_7 and BIT_6)
-// 1X = most sensitive, 4X = least sensitive
-#define ADC_ATTENUATE_1X     0x00
-#define ADC_ATTENUATE_2X     0x40
-#define ADC_ATTENUATE_3X     0x80
-#define ADC_ATTENUATE_4X     0xC0
-
 #ifndef CIRQUE_PINNACLE_ATTENUATION
-#    define CIRQUE_PINNACLE_ATTENUATION ADC_ATTENUATE_4X
+#    ifdef CIRQUE_PINNACLE_CURVED_OVERLAY
+#        define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X
+#    else
+#        define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_4X
+#    endif
 #endif
-// clang-format on
 
 bool     touchpad_init;
-uint16_t scale_data = 1024;
+uint16_t scale_data = CIRQUE_PINNACLE_DEFAULT_SCALE;
 
 void cirque_pinnacle_clear_flags(void);
 void cirque_pinnacle_enable_feed(bool feedEnable);
@@ -106,43 +75,45 @@ void cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResoluti
 
 // Clears Status1 register flags (SW_CC and SW_DR)
 void cirque_pinnacle_clear_flags() {
-    RAP_Write(STATUS_1, 0x00);
+    RAP_Write(HOSTREG__STATUS1, HOSTREG__STATUS1_DEFVAL & ~(HOSTREG__STATUS1__COMMAND_COMPLETE | HOSTREG__STATUS1__DATA_READY));
     wait_us(50);
 }
 
 // Enables/Disables the feed
 void cirque_pinnacle_enable_feed(bool feedEnable) {
-    uint8_t temp;
-    RAP_ReadBytes(FEEDCONFIG_1, &temp, 1); // Store contents of FeedConfig1 register
+    uint8_t feedconfig1;
+    RAP_ReadBytes(HOSTREG__FEEDCONFIG1, &feedconfig1, 1);
 
     if (feedEnable) {
-        temp |= 0x01; // Set Feed Enable bit
+        feedconfig1 |= HOSTREG__FEEDCONFIG1__FEED_ENABLE;
     } else {
-        temp &= ~0x01; // Clear Feed Enable bit
+        feedconfig1 &= ~HOSTREG__FEEDCONFIG1__FEED_ENABLE;
     }
-    RAP_Write(FEEDCONFIG_1, temp);
+    RAP_Write(HOSTREG__FEEDCONFIG1, feedconfig1);
 }
 
 /*  ERA (Extended Register Access) Functions  */
 // Reads <count> bytes from an extended register at <address> (16-bit address),
 // stores values in <*data>
 void ERA_ReadBytes(uint16_t address, uint8_t* data, uint16_t count) {
-    uint8_t ERAControlValue = 0xFF;
+    uint8_t  ERAControlValue = 0xFF;
+    uint16_t timeout_timer;
 
     cirque_pinnacle_enable_feed(false); // Disable feed
 
-    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));    // Send upper byte of ERA address
-    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF)); // Send lower byte of ERA address
+    RAP_Write(HOSTREG__EXT_REG_AXS_ADDR_HIGH, (uint8_t)(address >> 8));    // Send upper byte of ERA address
+    RAP_Write(HOSTREG__EXT_REG_AXS_ADDR_LOW, (uint8_t)(address & 0x00FF)); // Send lower byte of ERA address
 
     for (uint16_t i = 0; i < count; i++) {
-        RAP_Write(ERA_CONTROL, 0x05); // Signal ERA-read (auto-increment) to Pinnacle
+        RAP_Write(HOSTREG__EXT_REG_AXS_CTRL, HOSTREG__EREG_AXS__INC_ADDR_READ | HOSTREG__EREG_AXS__READ); // Signal ERA-read (auto-increment) to Pinnacle
 
         // Wait for status register 0x1E to clear
+        timeout_timer = timer_read();
         do {
-            RAP_ReadBytes(ERA_CONTROL, &ERAControlValue, 1);
-        } while (ERAControlValue != 0x00);
+            RAP_ReadBytes(HOSTREG__EXT_REG_AXS_CTRL, &ERAControlValue, 1);
+        } while ((ERAControlValue != 0x00) && (timer_elapsed(timeout_timer) <= CIRQUE_PINNACLE_TIMEOUT));
 
-        RAP_ReadBytes(ERA_VALUE, data + i, 1);
+        RAP_ReadBytes(HOSTREG__EXT_REG_AXS_VALUE, data + i, 1);
 
         cirque_pinnacle_clear_flags();
     }
@@ -150,46 +121,80 @@ void ERA_ReadBytes(uint16_t address, uint8_t* data, uint16_t count) {
 
 // Writes a byte, <data>, to an extended register at <address> (16-bit address)
 void ERA_WriteByte(uint16_t address, uint8_t data) {
-    uint8_t ERAControlValue = 0xFF;
+    uint8_t  ERAControlValue = 0xFF;
+    uint16_t timeout_timer;
 
     cirque_pinnacle_enable_feed(false); // Disable feed
 
-    RAP_Write(ERA_VALUE, data); // Send data byte to be written
+    RAP_Write(HOSTREG__EXT_REG_AXS_VALUE, data); // Send data byte to be written
 
-    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));    // Upper byte of ERA address
-    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF)); // Lower byte of ERA address
+    RAP_Write(HOSTREG__EXT_REG_AXS_ADDR_HIGH, (uint8_t)(address >> 8));    // Upper byte of ERA address
+    RAP_Write(HOSTREG__EXT_REG_AXS_ADDR_LOW, (uint8_t)(address & 0x00FF)); // Lower byte of ERA address
 
-    RAP_Write(ERA_CONTROL, 0x02); // Signal an ERA-write to Pinnacle
+    RAP_Write(HOSTREG__EXT_REG_AXS_CTRL, HOSTREG__EREG_AXS__WRITE); // Signal an ERA-write to Pinnacle
 
     // Wait for status register 0x1E to clear
+    timeout_timer = timer_read();
     do {
-        RAP_ReadBytes(ERA_CONTROL, &ERAControlValue, 1);
-    } while (ERAControlValue != 0x00);
+        RAP_ReadBytes(HOSTREG__EXT_REG_AXS_CTRL, &ERAControlValue, 1);
+    } while ((ERAControlValue != 0x00) && (timer_elapsed(timeout_timer) <= CIRQUE_PINNACLE_TIMEOUT));
 
     cirque_pinnacle_clear_flags();
 }
 
 void cirque_pinnacle_set_adc_attenuation(uint8_t adcGain) {
-    uint8_t temp = 0x00;
+    uint8_t adcconfig = 0x00;
 
-    ERA_ReadBytes(0x0187, &temp, 1);
-    temp &= 0x3F; // clear top two bits
-    temp |= adcGain;
-    ERA_WriteByte(0x0187, temp);
-    ERA_ReadBytes(0x0187, &temp, 1);
+    ERA_ReadBytes(EXTREG__TRACK_ADCCONFIG, &adcconfig, 1);
+    adcconfig &= EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK;
+    adcconfig |= adcGain;
+    ERA_WriteByte(EXTREG__TRACK_ADCCONFIG, adcconfig);
+    ERA_ReadBytes(EXTREG__TRACK_ADCCONFIG, &adcconfig, 1);
 }
 
 // Changes thresholds to improve detection of fingers
+// Not needed for flat overlay?
 void cirque_pinnacle_tune_edge_sensitivity(void) {
-    uint8_t temp = 0x00;
+    uint8_t widezmin = 0x00;
 
-    ERA_ReadBytes(0x0149, &temp, 1);
-    ERA_WriteByte(0x0149, 0x04);
-    ERA_ReadBytes(0x0149, &temp, 1);
+    ERA_ReadBytes(EXTREG__XAXIS_WIDEZMIN, &widezmin, 1);
+    ERA_WriteByte(EXTREG__XAXIS_WIDEZMIN, 0x04); // magic number from Cirque sample code
+    ERA_ReadBytes(EXTREG__XAXIS_WIDEZMIN, &widezmin, 1);
 
-    ERA_ReadBytes(0x0168, &temp, 1);
-    ERA_WriteByte(0x0168, 0x03);
-    ERA_ReadBytes(0x0168, &temp, 1);
+    ERA_ReadBytes(EXTREG__YAXIS_WIDEZMIN, &widezmin, 1);
+    ERA_WriteByte(EXTREG__YAXIS_WIDEZMIN, 0x03); // magic number from Cirque sample code
+    ERA_ReadBytes(EXTREG__YAXIS_WIDEZMIN, &widezmin, 1);
+}
+
+// Perform calibration
+void cirque_pinnacle_calibrate(void) {
+    uint8_t  calconfig;
+    uint16_t timeout_timer;
+
+    RAP_ReadBytes(HOSTREG__CALCONFIG1, &calconfig, 1);
+    calconfig |= HOSTREG__CALCONFIG1__CALIBRATE;
+    RAP_Write(HOSTREG__CALCONFIG1, calconfig);
+
+    // Calibration takes ~100ms according to GT-AN-090624, doubling the timeout just to be safe
+    timeout_timer = timer_read();
+    do {
+        RAP_ReadBytes(HOSTREG__CALCONFIG1, &calconfig, 1);
+    } while ((calconfig & HOSTREG__CALCONFIG1__CALIBRATE) && (timer_elapsed(timeout_timer) <= 200));
+
+    cirque_pinnacle_clear_flags();
+}
+
+// Enable/disable cursor smoothing, smoothing is enabled by default
+void cirque_pinnacle_cursor_smoothing(bool enable) {
+    uint8_t feedconfig3;
+
+    RAP_ReadBytes(HOSTREG__FEEDCONFIG3, &feedconfig3, 1);
+    if (enable) {
+        feedconfig3 &= ~HOSTREG__FEEDCONFIG3__DISABLE_CROSS_RATE_SMOOTHING;
+    } else {
+        feedconfig3 |= HOSTREG__FEEDCONFIG3__DISABLE_CROSS_RATE_SMOOTHING;
+    }
+    RAP_Write(HOSTREG__FEEDCONFIG3, feedconfig3);
 }
 
 /*  Pinnacle-based TM040040/TM035035/TM023023 Functions  */
@@ -205,44 +210,28 @@ void cirque_pinnacle_init(void) {
     // Host clears SW_CC flag
     cirque_pinnacle_clear_flags();
 
-    // SysConfig1 (Low Power Mode)
-    // Bit 0: Reset, 1=Reset
-    // Bit 1: Shutdown, 1=Shutdown, 0=Active
-    // Bit 2: Sleep Enable, 1=low power mode, 0=normal mode
     // send a RESET command now, in case QMK had a soft-reset without a power cycle
-    RAP_Write(SYSCONFIG_1, 0x01);
+    RAP_Write(HOSTREG__SYSCONFIG1, HOSTREG__SYSCONFIG1__RESET);
     wait_ms(30); // Pinnacle needs 10-15ms to boot, so wait long enough before configuring
-    RAP_Write(SYSCONFIG_1, 0x00);
+    RAP_Write(HOSTREG__SYSCONFIG1, HOSTREG__SYSCONFIG1_DEFVAL);
     wait_us(50);
 
     // FeedConfig2 (Feature flags for Relative Mode Only)
-    // Bit 0: IntelliMouse Enable, 1=enable, 0=disable
-    // Bit 1: All Taps Disable, 1=disable, 0=enable
-    // Bit 2: Secondary Tap Disable, 1=disable, 0=enable
-    // Bit 3: Scroll Disable, 1=disable, 0=enable
-    // Bit 4: GlideExtend® Disable, 1=disable, 0=enable
-    // Bit 5: reserved
-    // Bit 6: reserved
-    // Bit 7: Swap X & Y, 1=90° rotation, 0=0° rotation
-    RAP_Write(FEEDCONFIG_2, 0x00);
+    RAP_Write(HOSTREG__FEEDCONFIG2, HOSTREG__FEEDCONFIG2_DEFVAL);
 
     // FeedConfig1 (Data Output Flags)
-    // Bit 0: Feed enable, 1=feed, 0=no feed
-    // Bit 1: Data mode, 1=absolute, 0=relative
-    // Bit 2: Filter disable, 1=no filter, 0=filter
-    // Bit 3: X disable, 1=no X data, 0=X data
-    // Bit 4: Y disable, 1=no Y data, 0=Y data
-    // Bit 5: reserved
-    // Bit 6: X data Invert, 1=X max to 0, 0=0 to Y max
-    // Bit 7: Y data Invert, 1=Y max to 0, 0=0 to Y max
-    RAP_Write(FEEDCONFIG_1, CIRQUE_PINNACLE_POSITION_MODE << 1);
+    RAP_Write(HOSTREG__FEEDCONFIG1, CIRQUE_PINNACLE_POSITION_MODE ? HOSTREG__FEEDCONFIG1__DATA_TYPE__REL0_ABS1 : HOSTREG__FEEDCONFIG1_DEFVAL);
 
-    // Host sets z-idle packet count to 5 (default is 0x1F/30)
-    RAP_Write(Z_IDLE_COUNT, 5);
+    // Host sets z-idle packet count to 5 (default is 0x1E/30)
+    RAP_Write(HOSTREG__ZIDLE, 5);
 
     cirque_pinnacle_set_adc_attenuation(CIRQUE_PINNACLE_ATTENUATION);
-
+#ifdef CIRQUE_PINNACLE_CURVED_OVERLAY
     cirque_pinnacle_tune_edge_sensitivity();
+#endif
+    // Force a calibration after setting ADC attenuation
+    cirque_pinnacle_calibrate();
+
     cirque_pinnacle_enable_feed(true);
 }
 
@@ -252,15 +241,15 @@ pinnacle_data_t cirque_pinnacle_read_data(void) {
     pinnacle_data_t result     = {0};
 
     // Check if there is valid data available
-    RAP_ReadBytes(STATUS_1, &data_ready, 1); // bit2 is Software Data Ready, bit3 is Command Complete, bit0 and bit1 are reserved/unused
-    if ((data_ready & 0x04) == 0) {
+    RAP_ReadBytes(HOSTREG__STATUS1, &data_ready, 1);
+    if ((data_ready & HOSTREG__STATUS1__DATA_READY) == 0) {
         // no data available yet
         result.valid = false; // be explicit
         return result;
     }
 
     // Read all data bytes
-    RAP_ReadBytes(PACKET_BYTE_0, data, 6);
+    RAP_ReadBytes(HOSTREG__PACKETBYTE_0, data, 6);
 
     // Get ready for the next data sample
     cirque_pinnacle_clear_flags();
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index d65bdb41b6..1c9bf06fd3 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "cirque_pinnacle_regdefs.h"
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -15,6 +16,11 @@
 #    define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE
 #endif
 
+#define CIRQUE_PINNACLE_DEFAULT_SCALE 1024
+#ifndef CIRQUE_PINNACLE_DIAMETER_MM
+#    define CIRQUE_PINNACLE_DIAMETER_MM 40
+#endif
+
 // Coordinate scaling values
 #ifndef CIRQUE_PINNACLE_X_LOWER
 #    define CIRQUE_PINNACLE_X_LOWER 127 // min "reachable" X value
@@ -41,7 +47,7 @@
 #    include "i2c_master.h"
 // Cirque's 7-bit I2C Slave Address
 #    ifndef CIRQUE_PINNACLE_ADDR
-#        define CIRQUE_PINNACLE_ADDR 0x2A
+#        define CIRQUE_PINNACLE_ADDR I2C_ADDRESS_DEFAULT
 #    endif
 #elif defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
 #    include "spi_master.h"
@@ -66,6 +72,10 @@
 #    endif
 #endif
 
+#define DIVIDE_UNSIGNED_ROUND(numerator, denominator) (((numerator) + ((denominator) / 2)) / (denominator))
+#define CIRQUE_PINNACLE_INCH_TO_PX(inch) (DIVIDE_UNSIGNED_ROUND((inch) * (uint32_t)CIRQUE_PINNACLE_DIAMETER_MM * 10, 254))
+#define CIRQUE_PINNACLE_PX_TO_INCH(px) (DIVIDE_UNSIGNED_ROUND((px) * (uint32_t)254, CIRQUE_PINNACLE_DIAMETER_MM * 10))
+
 // Convenient way to store and access measurements
 typedef struct {
     bool valid; // true if valid data was read, false if no data was ready
@@ -84,6 +94,8 @@ typedef struct {
 } pinnacle_data_t;
 
 void            cirque_pinnacle_init(void);
+void            cirque_pinnacle_calibrate(void);
+void            cirque_pinnacle_cursor_smoothing(bool enable);
 pinnacle_data_t cirque_pinnacle_read_data(void);
 void            cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResolution, uint16_t yResolution);
 uint16_t        cirque_pinnacle_get_scale(void);
diff --git a/drivers/sensors/cirque_pinnacle_gestures.c b/drivers/sensors/cirque_pinnacle_gestures.c
new file mode 100644
index 0000000000..f6f9177e08
--- /dev/null
+++ b/drivers/sensors/cirque_pinnacle_gestures.c
@@ -0,0 +1,226 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2022 Daniel Kao <daniel.m.kao@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <stdlib.h>
+#include <lib/lib8tion/lib8tion.h>
+#include "cirque_pinnacle_gestures.h"
+#include "pointing_device.h"
+#include "timer.h"
+
+#if defined(CIRQUE_PINNACLE_TAP_ENABLE) || defined(CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE)
+static cirque_pinnacle_features_t features = {.tap_enable = true, .circular_scroll_enable = true};
+#endif
+
+#ifdef CIRQUE_PINNACLE_TAP_ENABLE
+static trackpad_tap_context_t tap;
+
+static report_mouse_t trackpad_tap(report_mouse_t mouse_report, pinnacle_data_t touchData) {
+    if (touchData.touchDown != tap.touchDown) {
+        tap.touchDown = touchData.touchDown;
+        if (!touchData.zValue) {
+            if (timer_elapsed(tap.timer) < CIRQUE_PINNACLE_TAPPING_TERM && tap.timer != 0) {
+                mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, true, POINTING_DEVICE_BUTTON1);
+                pointing_device_set_report(mouse_report);
+                pointing_device_send();
+#    if TAP_CODE_DELAY > 0
+                wait_ms(TAP_CODE_DELAY);
+#    endif
+                mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, false, POINTING_DEVICE_BUTTON1);
+                pointing_device_set_report(mouse_report);
+                pointing_device_send();
+            }
+        }
+        tap.timer = timer_read();
+    }
+    if (timer_elapsed(tap.timer) > (CIRQUE_PINNACLE_TOUCH_DEBOUNCE)) {
+        tap.timer = 0;
+    }
+
+    return mouse_report;
+}
+
+void cirque_pinnacle_enable_tap(bool enable) {
+    features.tap_enable = enable;
+}
+#endif
+
+#ifdef CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
+/* To set a trackpad exclusively as scroll wheel: outer_ring_pct = 100, trigger_px = 0, trigger_ang = 0 */
+static circular_scroll_context_t scroll = {.config = {.outer_ring_pct = 33,
+                                                      .trigger_px     = 16,
+                                                      .trigger_ang    = 9102, /* 50 degrees */
+                                                      .wheel_clicks   = 18}};
+
+static inline uint16_t atan2_16(int32_t dy, int32_t dx) {
+    if (dy == 0) {
+        if (dx >= 0) {
+            return 0;
+        } else {
+            return 32768;
+        }
+    }
+
+    int32_t abs_y = dy > 0 ? dy : -dy;
+    int16_t a;
+
+    if (dx >= 0) {
+        a = 8192 - (8192 * (dx - abs_y) / (dx + abs_y));
+    } else {
+        a = 24576 - (8192 * (dx + abs_y) / (abs_y - dx));
+    }
+
+    if (dy < 0) {
+        return -a; // negate if in quad III or IV
+    }
+    return a;
+}
+
+static circular_scroll_t circular_scroll(pinnacle_data_t touchData) {
+    circular_scroll_t report = {0, 0, false};
+    int8_t            x, y, wheel_clicks;
+    uint8_t           center = 256 / 2, mag;
+    int16_t           ang, dot, det, opposite_side, adjacent_side;
+    uint16_t          scale = cirque_pinnacle_get_scale();
+
+    if (touchData.zValue) {
+        /*
+         * Place origin at center of trackpad, treat coordinates as vectors.
+         * Scale to fixed int8_t size; angles are independent of resolution.
+         */
+        if (scale) {
+            x = (int8_t)((int32_t)touchData.xValue * 256 / scale - center);
+            y = (int8_t)((int32_t)touchData.yValue * 256 / scale - center);
+        } else {
+            x = 0;
+            y = 0;
+        }
+
+        /* Check if first touch */
+        if (!scroll.z) {
+            report.suppress_touch = false;
+            /* Check if touch falls within outer ring */
+            mag = sqrt16(x * x + y * y);
+            if (mag * 100 / center >= 100 - scroll.config.outer_ring_pct) {
+                scroll.state = SCROLL_DETECTING;
+                scroll.x     = x;
+                scroll.y     = y;
+                scroll.mag   = mag;
+                /*
+                 * Decide scroll axis:
+                 *   Vertical if started from righ half
+                 *   Horizontal if started from left half
+                 * Flipped for left-handed
+                 */
+#    if defined(POINTING_DEVICE_ROTATION_90)
+                scroll.axis = y < 0;
+#    elif defined(POINTING_DEVICE_ROTATION_180)
+                scroll.axis = x > 0;
+#    elif defined(POINTING_DEVICE_ROTATION_270)
+                scroll.axis = y > 0;
+#    else
+                scroll.axis = x < 0;
+#    endif
+            }
+        } else if (scroll.state == SCROLL_DETECTING) {
+            report.suppress_touch = true;
+            /* Already detecting scroll, check movement from touchdown location */
+            mag = sqrt16((x - scroll.x) * (x - scroll.x) + (y - scroll.y) * (y - scroll.y));
+            if (mag >= scroll.config.trigger_px) {
+                /*
+                 * Find angle of movement.
+                 * 0 degrees here means movement towards center of circle
+                 */
+                dot           = scroll.x * x + scroll.y * y;
+                det           = scroll.x * y - scroll.y * x;
+                opposite_side = abs(det);                                /* Based on scalar rejection */
+                adjacent_side = abs(scroll.mag * scroll.mag - abs(dot)); /* Based on scalar projection */
+                ang           = (int16_t)atan2_16(opposite_side, adjacent_side);
+                if (ang < scroll.config.trigger_ang) {
+                    /* Not a scroll, release coordinates */
+                    report.suppress_touch = false;
+                    scroll.state          = NOT_SCROLL;
+                } else {
+                    /* Scroll detected */
+                    scroll.state = SCROLL_VALID;
+                }
+            }
+        }
+        if (scroll.state == SCROLL_VALID) {
+            report.suppress_touch = true;
+            dot                   = scroll.x * x + scroll.y * y;
+            det                   = scroll.x * y - scroll.y * x;
+            ang                   = (int16_t)atan2_16(det, dot);
+            wheel_clicks          = ((int32_t)ang * scroll.config.wheel_clicks) / 65536;
+            if (wheel_clicks >= 1 || wheel_clicks <= -1) {
+                if (scroll.config.left_handed) {
+                    if (scroll.axis == 0) {
+                        report.h = -wheel_clicks;
+                    } else {
+                        report.v = wheel_clicks;
+                    }
+                } else {
+                    if (scroll.axis == 0) {
+                        report.v = -wheel_clicks;
+                    } else {
+                        report.h = wheel_clicks;
+                    }
+                }
+                scroll.x = x;
+                scroll.y = y;
+            }
+        }
+    }
+
+    scroll.z = touchData.zValue;
+    if (!scroll.z) scroll.state = SCROLL_UNINITIALIZED;
+
+    return report;
+}
+
+void cirque_pinnacle_enable_circular_scroll(bool enable) {
+    features.circular_scroll_enable = enable;
+}
+
+void cirque_pinnacle_configure_circular_scroll(uint8_t outer_ring_pct, uint8_t trigger_px, uint16_t trigger_ang, uint8_t wheel_clicks, bool left_handed) {
+    scroll.config.outer_ring_pct = outer_ring_pct;
+    scroll.config.trigger_px     = trigger_px;
+    scroll.config.trigger_ang    = trigger_ang;
+    scroll.config.wheel_clicks   = wheel_clicks;
+    scroll.config.left_handed    = left_handed;
+}
+#endif
+
+bool cirque_pinnacle_gestures(report_mouse_t* mouse_report, pinnacle_data_t touchData) {
+    bool suppress_mouse_update = false;
+
+#ifdef CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
+    circular_scroll_t scroll_report;
+    if (features.circular_scroll_enable) {
+        scroll_report         = circular_scroll(touchData);
+        mouse_report->v       = scroll_report.v;
+        mouse_report->h       = scroll_report.h;
+        suppress_mouse_update = scroll_report.suppress_touch;
+    }
+#endif
+
+#ifdef CIRQUE_PINNACLE_TAP_ENABLE
+    if (features.tap_enable) {
+        *mouse_report = trackpad_tap(*mouse_report, touchData);
+    }
+#endif
+
+    return suppress_mouse_update;
+}
diff --git a/drivers/sensors/cirque_pinnacle_gestures.h b/drivers/sensors/cirque_pinnacle_gestures.h
new file mode 100644
index 0000000000..f39782b467
--- /dev/null
+++ b/drivers/sensors/cirque_pinnacle_gestures.h
@@ -0,0 +1,107 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2022 Daniel Kao <daniel.m.kao@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 "cirque_pinnacle.h"
+#include "report.h"
+
+typedef struct {
+    bool tap_enable;
+    bool circular_scroll_enable;
+} cirque_pinnacle_features_t;
+
+#ifdef CIRQUE_PINNACLE_TAP_ENABLE
+#    ifndef CIRQUE_PINNACLE_TAPPING_TERM
+#        include "action.h"
+#        include "action_tapping.h"
+#        define CIRQUE_PINNACLE_TAPPING_TERM GET_TAPPING_TERM(KC_BTN1, &(keyrecord_t){})
+#    endif
+#    ifndef CIRQUE_PINNACLE_TOUCH_DEBOUNCE
+#        define CIRQUE_PINNACLE_TOUCH_DEBOUNCE (CIRQUE_PINNACLE_TAPPING_TERM * 8)
+#    endif
+
+typedef struct {
+    uint16_t timer;
+    bool     touchDown;
+} trackpad_tap_context_t;
+
+/* Enable/disable tap gesture */
+void cirque_pinnacle_enable_tap(bool enable);
+#endif
+
+#ifdef CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
+typedef enum {
+    SCROLL_UNINITIALIZED,
+    SCROLL_DETECTING,
+    SCROLL_VALID,
+    NOT_SCROLL,
+} circular_scroll_status_t;
+
+typedef struct {
+    int8_t v;
+    int8_t h;
+    bool   suppress_touch;
+} circular_scroll_t;
+
+typedef struct {
+    uint8_t  outer_ring_pct; /* Width of outer ring, given as a percentage of the radius */
+    uint8_t  trigger_px;     /* Amount of movement before triggering scroll validation, in pixels 0~127 */
+    uint16_t trigger_ang;    /* Angle required to validate scroll, in radians where pi = 32768 */
+    uint8_t  wheel_clicks;   /* How many clicks to report in a circle */
+    bool     left_handed;    /* Whether scrolling should be flipped for left handed use */
+} circular_scroll_config_t;
+
+typedef struct {
+    circular_scroll_config_t config;
+    circular_scroll_status_t state;
+    uint8_t                  mag;
+    int8_t                   x;
+    int8_t                   y;
+    uint16_t                 z;
+    bool                     axis;
+} circular_scroll_context_t;
+
+/* Enable/disable circular scroll gesture */
+void cirque_pinnacle_enable_circular_scroll(bool enable);
+
+/*
+ * Configure circular scroll gesture.
+ * Trackpad can be configured to act exclusively as a scroll wheel with outer_ring_pct = 0, trigger_px = 0, trigger_ang = 0.
+ * @param outer_ring_pct Width of outer ring from which to begin scroll validation, given as a percentage of the radius.
+ * @param trigger_px Amount of movement before triggering scroll validation. Expressed in pixels, trackpad coordinates are scaled to radius of 128 pixels for circular scroll.
+ * @param triger_ang Angle required to validate scroll, angle smaller than this will invalidate scroll. In radians where pi = 32768, 0 means movement towards center of trackpad, 16384 means movement perpendicular to center.
+ * @param wheel_clicks Number of scroll wheel clicks to report in a full rotation.
+ * @param left_handed Whether scrolling should be flipped for left-handed use.
+ */
+void cirque_pinnacle_configure_circular_scroll(uint8_t outer_ring_pct, uint8_t trigger_px, uint16_t trigger_ang, uint8_t wheel_clicks, bool left_handed);
+#endif
+
+#ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+/* Implementation in pointing_device_drivers.c */
+
+/* Enable/disable inertial cursor */
+void cirque_pinnacle_enable_cursor_glide(bool enable);
+
+/*
+ * Configure inertial cursor.
+ * @param trigger_px Movement required to trigger cursor glide, set this to non-zero if you have some amount of hover.
+ */
+void cirque_pinnacle_configure_cursor_glide(float trigger_px);
+#endif
+
+/* Process available gestures */
+bool cirque_pinnacle_gestures(report_mouse_t* mouse_report, pinnacle_data_t touchData);
diff --git a/drivers/sensors/cirque_pinnacle_regdefs.h b/drivers/sensors/cirque_pinnacle_regdefs.h
new file mode 100644
index 0000000000..993da1e757
--- /dev/null
+++ b/drivers/sensors/cirque_pinnacle_regdefs.h
@@ -0,0 +1,405 @@
+// Copyright (c) 2018 Cirque Corp. Restrictions apply. See: www.cirque.com/sw-license
+// based on https://github.com/cirque-corp/Cirque_Pinnacle_1CA027/tree/master/Additional_Examples
+// with modifications and changes for QMK
+// refer to documentation: Gen2 and Gen3 (Pinnacle ASIC) at https://www.cirque.com/gen2gen3-asic-details
+
+#pragma once
+
+// clang-format off
+
+#define HostReg__0      (0x00)
+#define HostReg__1      (0x01)
+#define HostReg__2      (0x02)
+#define HostReg__3      (0x03)
+#define HostReg__4      (0x04)
+#define HostReg__5      (0x05)
+#define HostReg__6      (0x06)
+#define HostReg__7      (0x07)
+#define HostReg__8      (0x08)
+#define HostReg__9      (0x09)
+#define HostReg__10     (0x0A)
+#define HostReg__11     (0x0B)
+#define HostReg__12     (0x0C)
+#define HostReg__13     (0x0D)
+#define HostReg__14     (0x0E)
+#define HostReg__15     (0x0F)
+#define HostReg__16     (0x10)
+#define HostReg__17     (0x11)
+#define HostReg__18     (0x12)
+#define HostReg__19     (0x13)
+#define HostReg__20     (0x14)
+#define HostReg__21     (0x15)
+#define HostReg__22     (0x16)
+#define HostReg__23     (0x17)
+#define HostReg__24     (0x18)
+#define HostReg__25     (0x19)
+#define HostReg__26     (0x1A)
+#define HostReg__27     (0x1B)
+#define HostReg__28     (0x1C)
+#define HostReg__29     (0x1D)
+#define HostReg__30     (0x1E)
+#define HostReg__31     (0x1F)
+
+// ---------------- Register Assignments -------------------------------------
+
+/*--------------------------------------------------------------------------*\
+                           Chip ID / Version
+\*--------------------------------------------------------------------------*/
+// Chip ID Register
+#define HOSTREG__CHIPID                                             HostReg__0
+
+// Chip Version Register
+#define HOSTREG__VERSION                                            HostReg__1
+
+/*--------------------------------------------------------------------------*\
+                           Status Register
+\*--------------------------------------------------------------------------*/
+// Status 1 Register -- MUST BE HOSTREG__2
+#define HOSTREG__STATUS1                                            HostReg__2
+#    define HOSTREG__STATUS1__DATA_READY                            0x04
+#    define HOSTREG__STATUS1__COMMAND_COMPLETE                      0x08
+#define HOSTREG__STATUS1_DEFVAL                                     0x00
+
+/*--------------------------------------------------------------------------*\
+                           System Config Register
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__SYSCONFIG1                                         HostReg__3
+#    define HOSTREG__SYSCONFIG1__RESET                              0x01
+#    define HOSTREG__SYSCONFIG1__STANDBY                            0x02
+#    define HOSTREG__SYSCONFIG1__AUTO_SLEEP                         0x04
+#    define HOSTREG__SYSCONFIG1__TRACK_DISABLE                      0x08
+#    define HOSTREG__SYSCONFIG1__ANYMEAS_ENABLE                     0x10
+#    define HOSTREG__SYSCONFIG1__GPIO_CTRL_ENABLE                   0x20
+#    define HOSTREG__SYSCONFIG1__WAKEUP_TOGGLE                      0x40
+#    define HOSTREG__SYSCONFIG1__FORCE_WAKEUP                       0x80
+#define HOSTREG__SYSCONFIG1_DEFVAL                                  0x00
+
+/*--------------------------------------------------------------------------*\
+                           Feed Config Registers
+\*--------------------------------------------------------------------------*/
+// Feed Config Register1
+#define HOSTREG__FEEDCONFIG1                                        HostReg__4
+#    define HOSTREG__FEEDCONFIG1__FEED_ENABLE                       0x01
+#    define HOSTREG__FEEDCONFIG1__DATA_TYPE__REL0_ABS1              0x02
+#    define HOSTREG__FEEDCONFIG1__FILTER_DISABLE                    0x04
+#    define HOSTREG__FEEDCONFIG1__X_AXIS_DISABLE                    0x08
+#    define HOSTREG__FEEDCONFIG1__Y_AXIS_DISABLE                    0x10
+#    define HOSTREG__FEEDCONFIG1__AXIS_FOR_Z__Y0_X1                 0x20
+#    define HOSTREG__FEEDCONFIG1__X_DATA_INVERT                     0x40
+#    define HOSTREG__FEEDCONFIG1__Y_DATA_INVERT                     0x80
+#define HOSTREG__FEEDCONFIG1_DEFVAL                                 0x00
+
+// Feed Config Register2
+#define HOSTREG__FEEDCONFIG2                                        HostReg__5
+#    define HOSTREG__FEEDCONFIG2__INTELLIMOUSE_MODE                 0x01
+#    define HOSTREG__FEEDCONFIG2__ALL_TAP_DISABLE                   0x02
+#    define HOSTREG__FEEDCONFIG2__SECONDARY_TAP_DISABLE             0x04
+#    define HOSTREG__FEEDCONFIG2__SCROLL_DISABLE                    0x08
+#    define HOSTREG__FEEDCONFIG2__GLIDE_EXTEND_DISABLE              0x10
+#    define HOSTREG__FEEDCONFIG2__PALM_BEFORE_Z_ENABLE              0x20
+#    define HOSTREG__FEEDCONFIG2__BUTNS_46_SCROLL_5_MIDDLE          0x40
+#    define HOSTREG__FEEDCONFIG2__SWAP_XY_RELATIVE                  0x80
+#define HOSTREG__FEEDCONFIG2_DEFVAL                                 0x00
+
+// Feed Config Register3
+#define HOSTREG__FEEDCONFIG3                                        HostReg__6
+#    define HOSTREG__FEEDCONFIG3__BTNS_456_TO_123_IN_REL            0x01
+#    define HOSTREG__FEEDCONFIG3__DISABLE_CROSS_RATE_SMOOTHING      0x02
+#    define HOSTREG__FEEDCONFIG3__DISABLE_PALM_NERD_MEAS            0x04
+#    define HOSTREG__FEEDCONFIG3__DISABLE_NOISE_AVOIDANCE           0x08
+#    define HOSTREG__FEEDCONFIG3__DISABLE_WRAP_LOCKOUT              0x10
+#    define HOSTREG__FEEDCONFIG3__DISABLE_DYNAMIC_EMI_ADJUST        0x20
+#    define HOSTREG__FEEDCONFIG3__DISABLE_HW_EMI_DETECT             0x40
+#    define HOSTREG__FEEDCONFIG3__DISABLE_SW_EMI_DETECT             0x80
+#define HOSTREG__FEEDCONFIG3_DEFVAL                                 0x00
+
+/*--------------------------------------------------------------------------*\
+                           Calibration Config
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__CALCONFIG1                                         HostReg__7
+#    define HOSTREG__CALCONFIG1__CALIBRATE                          0x01
+#    define HOSTREG__CALCONFIG1__BACKGROUND_COMP_ENABLE             0x02
+#    define HOSTREG__CALCONFIG1__NERD_COMP_ENABLE                   0x04
+#    define HOSTREG__CALCONFIG1__TRACK_ERROR_COMP_ENABLE            0x08
+#    define HOSTREG__CALCONFIG1__TAP_COMP_ENABLE                    0x10
+#    define HOSTREG__CALCONFIG1__PALM_ERROR_COMP_ENABLE             0x20
+#    define HOSTREG__CALCONFIG1__CALIBRATION_MATRIX_DISABLE         0x40
+#    define HOSTREG__CALCONFIG1__FORCE_PRECALIBRATION_NOISE_CHECK   0x80
+#define HOSTREG__CALCONFIG1_DEFVAL                                  (HOSTREG__CALCONFIG1__BACKGROUND_COMP_ENABLE | HOSTREG__CALCONFIG1__NERD_COMP_ENABLE | HOSTREG__CALCONFIG1__TRACK_ERROR_COMP_ENABLE | HOSTREG__CALCONFIG1__TAP_COMP_ENABLE | HOSTREG__CALCONFIG1__PALM_ERROR_COMP_ENABLE)
+
+/*--------------------------------------------------------------------------*\
+                           PS2 Aux Control Register
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__PS2AUX_CTRL                                        HostReg__8
+#    define HOSTREG__PS2AUX_CTRL__CMD_PASSTHRU_ENABLE               0x01
+#    define HOSTREG__PS2AUX_CTRL__SP_EXTENDED_MODE                  0x02
+#    define HOSTREG__PS2AUX_CTRL__GS_DISABLE                        0x04
+#    define HOSTREG__PS2AUX_CTRL__SP_DISABLE                        0x08
+#    define HOSTREG__PS2AUX_CTRL__GS_COORDINATE_DISABLE             0x10
+#    define HOSTREG__PS2AUX_CTRL__SP_COORDINATE_DISABLE             0x20
+#    define HOSTREG__PS2AUX_CTRL__DISABLE_AA00_DETECT               0x40
+#    define HOSTREG__PS2AUX_CTRL__AUX_PRESENT                       0x80
+#define HOSTREG__PR2AUX_CTRL_DEFVAL                                 0x00
+
+/*--------------------------------------------------------------------------*\
+                           Sample Rate Value
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__SAMPLERATE                                         HostReg__9
+#    define HOSTREG__SAMPLERATE__10_SPS                             0x0A
+#    define HOSTREG__SAMPLERATE__20_SPS                             0x14
+#    define HOSTREG__SAMPLERATE__40_SPS                             0x28
+#    define HOSTREG__SAMPLERATE__60_SPS                             0x3C
+#    define HOSTREG__SAMPLERATE__80_SPS                             0x50
+#    define HOSTREG__SAMPLERATE__100_SPS                            0x64
+#    define HOSTREG__SAMPLERATE__200_SPS                            0xC8        // 200sps not supported
+                                                                                // only for ps2 compatibility
+                                                                                // rate set to 100sps
+#define HOSTREG__SAMPLERATE_DEFVAL                                  HOSTREG__SAMPLERATE__100_SPS
+
+/*--------------------------------------------------------------------------*\
+                           Z Idle Value
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__ZIDLE                                              HostReg__10
+#define HOSTREG__ZIDLE_DEFVAL                                       30 // 0x1E
+
+/*--------------------------------------------------------------------------*\
+                           Z Scaler Value
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__ZSCALER                                            HostReg__11
+#define HOSTREG__ZSCALER_DEFVAL                                     8 // 0x08
+
+/*--------------------------------------------------------------------------*\
+                           Sleep Interval Value
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__SLEEP_INTERVAL                                     HostReg__12
+#define HOSTREG__SLEEP_INTERVAL_DEFVAL                              73 // 0x49
+
+/*--------------------------------------------------------------------------*\
+                           Sleep Delay Value
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__SLEEP_DELAY                                        HostReg__13
+#define HOSTREG__SLEEP_DELAY_DEFVAL                                 39 // 0x27
+
+/*--------------------------------------------------------------------------*\
+                           Dynamic EMI Bad Channel Count Thresholds
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__DYNAMIC_EMI_ADJUST_THRESHOLD                       HostReg__14
+#define HOSTREG__DYNAMIC_EMI_ADJUST_THRESHOLD_DEFVAL                66 // 0x42
+
+/*--------------------------------------------------------------------------*\
+                           Packet Registers
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__PACKETBYTE_0                                       HostReg__18
+#define HOSTREG__PACKETBYTE_1                                       HostReg__19
+#define HOSTREG__PACKETBYTE_2                                       HostReg__20
+#define HOSTREG__PACKETBYTE_3                                       HostReg__21
+#define HOSTREG__PACKETBYTE_4                                       HostReg__22
+#define HOSTREG__PACKETBYTE_5                                       HostReg__23
+
+/*--------------------------------------------------------------------------*\
+                           Port A GPIO Control
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__PORTA_GPIO_CTRL                                    HostReg__24
+#define HOSTREG__PORTA_GPIO_CTRL_DEFVAL                             0xFF
+
+/*--------------------------------------------------------------------------*\
+                           Port A GPIO Data
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__PORTA_GPIO_DATA                                    HostReg__25
+#define HOSTREG__PORTA_GPIO_DATA_DEFVAL                             0x00
+
+/*--------------------------------------------------------------------------*\
+                           Port B GPIO Control And Data
+\*--------------------------------------------------------------------------*/
+
+#define HOSTREG__PORTB_GPIO_CTRL_DATA                               HostReg__26
+#    define HOSTREG__PORTB_GPIO_DATA__PB0                           0x01
+#    define HOSTREG__PORTB_GPIO_DATA__PB1                           0x02
+#    define HOSTREG__PORTB_GPIO_DATA__PB2                           0x04
+#    define HOSTREG__PORTB_GPIO_CTRL__PB0                           0x08
+#    define HOSTREG__PORTB_GPIO_CTRL__PB1                           0x10
+#    define HOSTREG__PORTB_GPIO_CTRL__PB2                           0x20
+#    define HOSTREG__PORTB_GPIO_RSVD_0                              0x40
+#    define HOSTREG__PORTB_GPIO_READ1_WRITE0                        0x80
+#define HOSTREG__PORTB_GPIO_CTRL_DATA_DEFVAL                        (HOSTREG__PORTB_GPIO_CTRL__PB0 | HOSTREG__PORTB_GPIO_CTRL__PB1 | HOSTREG__PORTB_GPIO_CTRL__PB2)
+
+/*--------------------------------------------------------------------------*\
+                           Extended Register Access
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__EXT_REG_AXS_VALUE                                  HostReg__27
+
+#define HOSTREG__EXT_REG_AXS_ADDR_HIGH                              HostReg__28
+#define HOSTREG__EXT_REG_AXS_ADDR_LOW                               HostReg__29
+
+#define HOSTREG__EXT_REG_AXS_CTRL                                   HostReg__30
+#    define HOSTREG__EREG_AXS__READ                                 0x01
+#    define HOSTREG__EREG_AXS__WRITE                                0x02
+#    define HOSTREG__EREG_AXS__INC_ADDR_READ                        0x04
+#    define HOSTREG__EREG_AXS__INC_ADDR_WRITE                       0x08
+#    define HOSTREG__EREG_AXS__RSVD_3                               0x10
+#    define HOSTREG__EREG_AXS__RSVD_2                               0x20
+#    define HOSTREG__EREG_AXS__RSVD_1                               0x40
+#    define HOSTREG__EREG_AXS__RSVD_0                               0x80
+
+#define HOSTREG__EXT_REG_AXS_VALUE_DEFVAL                           0x00
+#define HOSTREG__EXT_REG_AXS_ADDR_HIGH_DEFVAL                       0x00
+#define HOSTREG__EXT_REG_AXS_ADDR_LOW_DEFVAL                        0x00
+#define HOSTREG__EXT_REG_AXS_CTRL_DEFVAL                            0x00
+
+/*--------------------------------------------------------------------------*\
+                           Product ID
+\*--------------------------------------------------------------------------*/
+#define HOSTREG__PRODUCT_ID                                         HostReg__31
+
+
+
+//Some useful values
+#define I2C_ADDRESS_DEFAULT                                         0x2A
+#define FIRMWARE_ID                                                 0x07
+#define FIRMWARE_VERSION                                            0x9D
+
+//Anymeas config options
+//First setting is HostReg 5.  This sets toggle frequency (EF) and gain.
+//Gain is upper two bits (0xC0), frequency is lower 6 bits (0x3F)
+#define AnyMeas_AccumBits_ElecFreq                                  HostReg__5
+#    define ADCCNFG_ELEC_FREQ                                       0x3F  /* Bit 4, 3, 2, 1, 0 */
+#        define ADCCNFG_EF_0                                        0x02  // 500,000Hz
+#        define ADCCNFG_EF_1                                        0x03  // 444,444Hz
+#        define ADCCNFG_EF_2                                        0x04  // 400,000Hz
+#        define ADCCNFG_EF_3                                        0x05  // 363,636Hz
+#        define ADCCNFG_EF_4                                        0x06  // 333,333Hz
+#        define ADCCNFG_EF_5                                        0x07  // 307,692Hz
+#        define ADCCNFG_EF_6                                        0x09  // 267,000Hz
+#        define ADCCNFG_EF_7                                        0x0B  // 235,000Hz
+#    define ADCCNFG_ACCUMBITSSELECT                                 0xC0  /* Bit 7, 6 */
+#        define ADCCNFG_ACCBITS_17_14_0                             0x00  //This is about 2x gain
+#        define ADCCNFG_ACCBITS_17_15_1                             0x40  //This is about 1.6x gain
+#        define ADCCNFG_ACCBITS_17_2__80                            0x80  //This is about 1.3x gain
+#        define ADCCNFG_ACCBITS_17_2__C0                            0xC0  //This is lowest gain
+//Note, all frequencies above are based on default 500ns aperture.  If aperture is shorter the frequencies will be faster and if aperture is longer the frequencies will be slower.
+
+//Next is HostReg 6.  This sets the sample length.  There are four possible settings to bit length.  All other settings are not normally used and should be a 0.
+#define AnyMeas_BitLength                                           HostReg__6
+#    define ADCCTRL_BIT_LENGTH                                      0x03  /* Bit 1, 0 */
+#        define ADCCTRL_SAMPLES_32                                  0x00  //Note: this does not work.
+#        define ADCCTRL_SAMPLES_128                                 0x01
+#        define ADCCTRL_SAMPLES_256                                 0x02
+#        define ADCCTRL_SAMPLES_512                                 0x03
+#    define ADCCTRL_ENABLE                                          0x20  /* Bit 5 */
+#    define ADCCTRL_INT_FLAG                                        0x40  /* Bit 6 */
+#    define ADCCTRL_START_BUSY                                      0x80  /* Bit 7 */
+//The smaller the sample length the faster the measurement but the lower the SNR.  For high SNR requirements 512 sample length is recommended.  Alternatively, multiple 128 or 256 length measurements could be averaged.
+
+//Next is HostReg 7.  This sets the sense mux.  Pinnacle has 2 sense lines, Sense N and Sense P1.  There is also a Sense P2 but it is not bonded out, it is only internal.
+//Signal on Sense N will be inverted from signal on Sense P1.  Other than sign inversion, signal strength should be the same.
+#define AnyMeas_ADC_MuxControl                                      HostReg__7
+#    define ADCMUXCTRL_SENSEP1GATE                                  0x01  //Enables Sense P1.  Can be combined with Sense N input or exclusivly Sense P1 alone.
+#    define ADCMUXCTRL_SENSEP2GATE                                  0x02  //Not used.
+#    define ADCMUXCTRL_SENSENGATE                                   0x04  //Enables Sense N.  Can be combined with Sense P inputs or exclusivly Sense N alone.
+#    define ADCMUXCTRL_REF0GATE                                     0x08  //This enables the RefCap0.  This is a capacitor inside the chip that is roughly 0.25pF. It is also controlled with the toggle and polarity bits so those bits must be set properly as well in order to use it.
+#    define ADCMUXCTRL_REF1GATE                                     0x10  //This enables the RefCap1.  This is a capacitor inside the chip that is roughly 0.5pF. It is also controlled with the toggle and polarity bits so those bits must be set properly as well in order to use it.
+#    define ADCMUXCTRL_OSCMEASEN                                    0x80  //this is a test mode for measuring the internal oscillator.  It is for IC test only.
+
+//Next is HostReg 8.  This contains various ADC config settings that are not likely to be used.
+#define AnyMeas_ADC_Config2                                         HostReg__8
+#    define ADCCNFG2_ADC_CLK_SELECT                                 0x01  /* Bit 0 */   //If 0 use the standard 8Mhz clock.  If 1 use a divide by 2, 4Mhz clock.  Only used if extra slow toggle frequencies are required.
+#    define ADCCNFG2_EMI_FLAG                                       0x02  /* Bit 1 */   //EMI flag threshold only used with internal FW.  Not valid in anymeas mode.
+#    define ADCCNFG2_EMI_FLAG_THRESHOLD_0                           0x04  /* Bit 2 */   //EMI flag threshold only used with internal FW.  Not valid in anymeas mode.
+#    define ADCCNFG2_EMI_FLAG_THRESHOLD_1                           0x08  /* Bit 3 */   //EMI flag threshold only used with internal FW.  Not valid in anymeas mode.
+#    define ADCCNFG2_DSX2_EXTEND                                    0x10  /* Bit 4 */   //extend one signal on the receive.  Could also be helpful in situations where sensor cap is extremely high.
+#    define ADCCNFG2_ETOGGLE_DELAY                                  0x20  /* Bit 5 */   //delay a bit before toggling electrodes.  Could be helpful in situations where sensor cap is extremely high.
+
+//Next is HostReg 9.  This sets the aperture length.  Bottom 4 bits set the aperture width
+#define AnyMeas_ADC_AWidth                                          HostReg__9
+#    define ADCAWIDTH_AWIDTHMASK                                    0x0F
+#        define ADCAWIDTH_APERTURE_OPEN                             0x00  //does not work
+#        define ADCAWIDTH_APERTURE_125NS                            0x01  //does not work
+#        define ADCAWIDTH_APERTURE_250NS                            0x02
+#        define ADCAWIDTH_APERTURE_375NS                            0x03
+#        define ADCAWIDTH_APERTURE_500NS                            0x04
+#        define ADCAWIDTH_APERTURE_625NS                            0x05
+#        define ADCAWIDTH_APERTURE_750NS                            0x06
+#        define ADCAWIDTH_APERTURE_875NS                            0x07
+#        define ADCAWIDTH_APERTURE_1000NS                           0x08
+#        define ADCAWIDTH_APERTURE_1125NS                           0x09
+#        define ADCAWIDTH_APERTURE_1250NS                           0x0A
+#        define ADCAWIDTH_APERTURE_1375NS                           0x0B
+#        define ADCAWIDTH_APERTURE_1500NS                           0x0C
+#        define ADCAWIDTH_APERTURE_1625NS                           0x0D
+#        define ADCAWIDTH_APERTURE_1750NS                           0x0E
+#        define ADCAWIDTH_APERTURE_1875NS                           0x0F
+#    define ADCAWIDTH_AWIDTHPLUSHALF                                0x10
+#    define ADCAWIDTH_AOPEN                                         0x20
+#    define ADCAWIDTH_W2WAIT                                        0x40
+
+//next two registers give the high and low bytes to the 16 bit address where Pinnacle will pull the measurement data.  Normally these addresses are within the base 32 registers.
+#define AnyMeas_pADCMeasInfoStart_High_Byte                         HostReg__10
+#define AnyMeas_pADCMeasInfoStart_Low_Byte                          HostReg__11
+
+//Next is the measurement index, this sets the measurement state machine to the start and should be a 0 at start.
+#define AnyMeas_MeasIndex                                           HostReg__12
+#   define ANYMEASSTATE_RESET_START                                 0x00
+#   define ANYMEASSTATE_START_MEASUREMENT                           0x01
+#   define ANYMEASSTATE_WAIT_FOR_MEASUREMENT_AND_HOST               0x02
+
+//next is the state itself of the measurement, should always be 0.
+#define AnyMeas_State                                               HostReg__13
+
+//next is the number of measurements.  Use 0x80 to repeat the single measurement or repeat a number of measurements.
+//0x40 will turn the ADC off after measurements.  This will result in longer startup time for a subsequent measurement, but lower idle power draw.
+#define AnyMeas_Control_NumMeas                                     HostReg__14
+#    define ANYMEAS_CONTROL__NUM_MEAS_MASK                          0x3F
+#    define ANYMEAS_CONTROL__ADC_POST_MEAS_PWR                      0x40
+#    define ANYMEAS_CONTROL__REPEAT                                 0x80
+
+//These are not used
+#define AnyMeas_pADCMeasInfo_High_Byte                              HostReg__15
+#define AnyMeas_pADCMeasInfo_Low_Byte                               HostReg__16
+
+//16 bit result of measurement will be found in these two registers.
+#define AnyMeas_Result_High_Byte                                    HostReg__17
+#define AnyMeas_Result_Low_Byte                                     HostReg__18
+
+// ---------------- Extended Register Assignments ----------------------------
+/*--------------------------------------------------------------------------*\
+                           ADC Mux Control
+\*--------------------------------------------------------------------------*/
+#define EXTREG__ADCMUX_CTRL                                         0x00EB
+#    define EXTREG__ADCMUX_CTRL__SNSP_ENABLE                        0x01
+#    define EXTREG__ADCMUX_CTRL__SNSN_ENABLE                        0x04
+
+/*--------------------------------------------------------------------------*\
+                           Timer Reload Registers
+\*--------------------------------------------------------------------------*/
+#define EXTREG__PACKET_TIMER_RELOAD                                 0x019F
+#define EXTREG__TRACK_TIMER_RELOAD                                  0x019E
+// These two registers should have matching content.
+#    define EXTREG__TIMER_RELOAD__300_SPS                           0x06
+#    define EXTREG__TIMER_RELOAD__200_SPS                           0x09
+#    define EXTREG__TIMER_RELOAD__100_SPS                           0x13
+
+/*--------------------------------------------------------------------------*\
+                           Track ADC Config
+\*--------------------------------------------------------------------------*/
+#define EXTREG__TRACK_ADCCONFIG                                     0x0187
+// ADC-attenuation settings (held in BIT_7 and BIT_6)
+// 1X = most sensitive, 4X = least sensitive
+#    define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK             0x3F
+#        define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_1X           0x00
+#        define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X           0x40
+#        define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_3X           0x80
+#        define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_4X           0xC0
+#define EXTREG__TRACK_ADCCONFIG_DEFVAL                              0x4E
+
+
+/*--------------------------------------------------------------------------*\
+                           Tune Edge Sensitivity
+\*--------------------------------------------------------------------------*/
+// These registers are not detailed in any publically available documentation
+// Names inferred from debug prints in https://github.com/cirque-corp/Cirque_Pinnacle_1CA027/blob/master/Circular_Trackpad
+#define EXTREG__XAXIS_WIDEZMIN                                      0x0149
+#define EXTREG__YAXIS_WIDEZMIN                                      0x0168
+#define EXTREG__XAXIS_WIDEZMIN_DEFVAL                               0x06
+#define EXTREG__YAXIS_WIDEZMIN_DEFVAL                               0x05
+
+// clang-format on
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 1e5ef9590c..8225e55aa2 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -31,6 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "drivers/sensors/analog_joystick.h"
 #elif defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_i2c) || defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
 #    include "drivers/sensors/cirque_pinnacle.h"
+#    include "drivers/sensors/cirque_pinnacle_gestures.h"
+#    include "pointing_device_gestures.h"
 #elif defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
 #    include "i2c_master.h"
 #    include "drivers/sensors/pimoroni_trackball.h"
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 435fcabf7c..8f510b3a98 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -97,27 +97,48 @@ const pointing_device_driver_t pointing_device_driver = {
 // clang-format on
 
 #elif defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_i2c) || defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
-#    ifndef CIRQUE_PINNACLE_TAPPING_TERM
-#        include "action.h"
-#        include "action_tapping.h"
-#        define CIRQUE_PINNACLE_TAPPING_TERM GET_TAPPING_TERM(KC_BTN1, &(keyrecord_t){})
-#    endif
-#    ifndef CIRQUE_PINNACLE_TOUCH_DEBOUNCE
-#        define CIRQUE_PINNACLE_TOUCH_DEBOUNCE (CIRQUE_PINNACLE_TAPPING_TERM * 8)
+#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+static bool cursor_glide_enable = true;
+
+static cursor_glide_context_t glide = {.config = {
+                                           .coef       = 102, /* Good default friction coef */
+                                           .interval   = 10,  /* 100sps */
+                                           .trigger_px = 10,  /* Default threshold in case of hover, set to 0 if you'd like */
+                                       }};
+
+void cirque_pinnacle_enable_cursor_glide(bool enable) {
+    cursor_glide_enable = enable;
+}
+
+void cirque_pinnacle_configure_cursor_glide(float trigger_px) {
+    glide.config.trigger_px = trigger_px;
+}
 #    endif
 
 report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     pinnacle_data_t          touchData = cirque_pinnacle_read_data();
     mouse_xy_report_t        report_x = 0, report_y = 0;
     static mouse_xy_report_t x = 0, y = 0;
-    static uint16_t          mouse_timer = 0;
-    static bool              is_z_down   = false;
+#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+    cursor_glide_t           glide_report = {0};
+
+    if (cursor_glide_enable) {
+        glide_report = cursor_glide_check(&glide);
+    }
+#    endif
 
 #    if !CIRQUE_PINNACLE_POSITION_MODE
 #        error Cirque Pinnacle with relative mode not implemented yet.
 #    endif
 
     if (!touchData.valid) {
+#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+        if (cursor_glide_enable && glide_report.valid) {
+            report_x = glide_report.dx;
+            report_y = glide_report.dy;
+            goto mouse_report_update;
+        }
+#    endif
         return mouse_report;
     }
 
@@ -130,45 +151,51 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     // Scale coordinates to arbitrary X, Y resolution
     cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());
 
-    if (x && y && touchData.xValue && touchData.yValue) {
-        report_x = (mouse_xy_report_t)(touchData.xValue - x);
-        report_y = (mouse_xy_report_t)(touchData.yValue - y);
+    if (!cirque_pinnacle_gestures(&mouse_report, touchData)) {
+        if (x && y && touchData.xValue && touchData.yValue) {
+            report_x = (mouse_xy_report_t)(touchData.xValue - x);
+            report_y = (mouse_xy_report_t)(touchData.yValue - y);
+        }
+        x = touchData.xValue;
+        y = touchData.yValue;
+
+#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+        if (cursor_glide_enable) {
+            if (touchData.touchDown) {
+                cursor_glide_update(&glide, report_x, report_y, touchData.zValue);
+            } else if (!glide_report.valid) {
+                glide_report = cursor_glide_start(&glide);
+                if (glide_report.valid) {
+                    report_x = glide_report.dx;
+                    report_y = glide_report.dy;
+                }
+            }
+        }
+#    endif
     }
-    x              = touchData.xValue;
-    y              = touchData.yValue;
+
+#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+mouse_report_update:
+#    endif
     mouse_report.x = report_x;
     mouse_report.y = report_y;
 
-    if (touchData.touchDown != is_z_down) {
-        is_z_down = touchData.touchDown;
-        if (!touchData.zValue) {
-            if (timer_elapsed(mouse_timer) < CIRQUE_PINNACLE_TAPPING_TERM && mouse_timer != 0) {
-                mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, true, POINTING_DEVICE_BUTTON1);
-                pointing_device_set_report(mouse_report);
-                pointing_device_send();
-#    if TAP_CODE_DELAY > 0
-                wait_ms(TAP_CODE_DELAY);
-#    endif
-                mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, false, POINTING_DEVICE_BUTTON1);
-                pointing_device_set_report(mouse_report);
-                pointing_device_send();
-            }
-        }
-        mouse_timer = timer_read();
-    }
-    if (timer_elapsed(mouse_timer) > (CIRQUE_PINNACLE_TOUCH_DEBOUNCE)) {
-        mouse_timer = 0;
-    }
-
     return mouse_report;
 }
 
+uint16_t cirque_pinnacle_get_cpi(void) {
+    return CIRQUE_PINNACLE_PX_TO_INCH(cirque_pinnacle_get_scale());
+}
+void cirque_pinnacle_set_cpi(uint16_t cpi) {
+    cirque_pinnacle_set_scale(CIRQUE_PINNACLE_INCH_TO_PX(cpi));
+}
+
 // clang-format off
 const pointing_device_driver_t pointing_device_driver = {
     .init       = cirque_pinnacle_init,
     .get_report = cirque_pinnacle_get_report,
-    .set_cpi    = cirque_pinnacle_set_scale,
-    .get_cpi    = cirque_pinnacle_get_scale
+    .set_cpi    = cirque_pinnacle_set_cpi,
+    .get_cpi    = cirque_pinnacle_get_cpi
 };
 // clang-format on
 
diff --git a/quantum/pointing_device_gestures.c b/quantum/pointing_device_gestures.c
new file mode 100644
index 0000000000..02b11ebe3f
--- /dev/null
+++ b/quantum/pointing_device_gestures.c
@@ -0,0 +1,133 @@
+/* Copyright 2022 Daniel Kao <daniel.m.kao@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <string.h>
+#include "pointing_device_gestures.h"
+#include "timer.h"
+
+#ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+#    ifdef POINTING_DEVICE_MOTION_PIN
+#        error POINTING_DEVICE_MOTION_PIN not supported when using inertial cursor. Need repeated calls to get_report() to generate glide events.
+#    endif
+
+static void cursor_glide_stop(cursor_glide_context_t* glide) {
+    memset(&glide->status, 0, sizeof(glide->status));
+}
+
+static cursor_glide_t cursor_glide(cursor_glide_context_t* glide) {
+    cursor_glide_status_t* status = &glide->status;
+    cursor_glide_t         report;
+    int32_t                p;
+    int32_t                x, y;
+
+    if (status->v0 == 0) {
+        report.dx    = 0;
+        report.dy    = 0;
+        report.valid = false;
+        cursor_glide_stop(glide);
+        goto exit;
+    }
+
+    status->counter++;
+    /* Calculate current 1D position */
+    p = status->v0 * status->counter - (int32_t)glide->config.coef * status->counter * status->counter / 2;
+    /*
+     * Translate to x & y axes
+     * Done this way instead of applying friction to each axis separately, so we don't end up with the shorter axis stuck at 0 towards the end of diagonal movements.
+     */
+    x            = (int32_t)(p * status->dx0 / status->v0);
+    y            = (int32_t)(p * status->dy0 / status->v0);
+    report.dx    = (mouse_xy_report_t)(x - status->x);
+    report.dy    = (mouse_xy_report_t)(y - status->y);
+    report.valid = true;
+    if (report.dx <= 1 && report.dx >= -1 && report.dy <= 1 && report.dy >= -1) {
+        /* Stop gliding once speed is low enough */
+        cursor_glide_stop(glide);
+        goto exit;
+    }
+    status->x     = x;
+    status->y     = y;
+    status->timer = timer_read();
+
+exit:
+    return report;
+}
+
+cursor_glide_t cursor_glide_check(cursor_glide_context_t* glide) {
+    cursor_glide_t         invalid_report = {0, 0, false};
+    cursor_glide_status_t* status         = &glide->status;
+
+    if (status->z || (status->dx0 == 0 && status->dy0 == 0) || timer_elapsed(status->timer) < glide->config.interval) {
+        return invalid_report;
+    } else {
+        return cursor_glide(glide);
+    }
+}
+
+static inline uint16_t sqrt32(uint32_t x) {
+    uint32_t l, m, h;
+
+    if (x == 0) {
+        return 0;
+    } else if (x > (UINT16_MAX >> 2)) {
+        /* Safe upper bound to avoid integer overflow with m * m */
+        h = UINT16_MAX;
+    } else {
+        /* Upper bound based on closest log2 */
+        h = (1 << (((__builtin_clzl(1) - __builtin_clzl(x) + 1) + 1) >> 1));
+    }
+    /* Lower bound based on closest log2 */
+    l = (1 << ((__builtin_clzl(1) - __builtin_clzl(x)) >> 1));
+
+    /* Binary search to find integer square root */
+    while (l != h - 1) {
+        m = (l + h) / 2;
+        if (m * m <= x) {
+            l = m;
+        } else {
+            h = m;
+        }
+    }
+    return l;
+}
+
+cursor_glide_t cursor_glide_start(cursor_glide_context_t* glide) {
+    cursor_glide_t         invalid_report = {0, 0, false};
+    cursor_glide_status_t* status         = &glide->status;
+
+    status->timer   = timer_read();
+    status->counter = 0;
+    status->v0      = (status->dx0 == 0 && status->dy0 == 0) ? 0.0 : sqrt32(((int32_t)status->dx0 * 256 * status->dx0 * 256) + ((int32_t)status->dy0 * 256 * status->dy0 * 256)); // skip trigonometry if not needed, calculate distance in Q8
+    status->x       = 0;
+    status->y       = 0;
+    status->z       = 0;
+
+    if (status->v0 < ((uint32_t)glide->config.trigger_px * 256)) { /* Q8 comparison */
+        /* Not enough velocity to be worth gliding, abort */
+        cursor_glide_stop(glide);
+        return invalid_report;
+    }
+
+    return cursor_glide(glide);
+}
+
+void cursor_glide_update(cursor_glide_context_t* glide, mouse_xy_report_t dx, mouse_xy_report_t dy, uint16_t z) {
+    cursor_glide_status_t* status = &glide->status;
+
+    status->dx0 = dx;
+    status->dy0 = dy;
+    status->z   = z;
+}
+#endif
diff --git a/quantum/pointing_device_gestures.h b/quantum/pointing_device_gestures.h
new file mode 100644
index 0000000000..d2ea44971b
--- /dev/null
+++ b/quantum/pointing_device_gestures.h
@@ -0,0 +1,58 @@
+/* Copyright 2022 Daniel Kao <daniel.m.kao@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 "report.h"
+
+#ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+typedef struct {
+    mouse_xy_report_t dx;
+    mouse_xy_report_t dy;
+    bool              valid;
+} cursor_glide_t;
+
+typedef struct {
+    uint16_t trigger_px; /* Pixels of movement needed to trigger cursor glide */
+    uint16_t coef;       /* Coefficient of friction */
+    uint16_t interval;   /* Glide report interval, in milliseconds */
+} cursor_glide_config_t;
+
+typedef struct {
+    int32_t           v0;
+    int32_t           x;
+    int32_t           y;
+    uint16_t          z;
+    uint16_t          timer;
+    uint16_t          counter;
+    mouse_xy_report_t dx0;
+    mouse_xy_report_t dy0;
+} cursor_glide_status_t;
+
+typedef struct {
+    cursor_glide_config_t config;
+    cursor_glide_status_t status;
+} cursor_glide_context_t;
+
+/* Check glide report conditions, calculates glide coordinates */
+cursor_glide_t cursor_glide_check(cursor_glide_context_t* glide);
+
+/* Start glide reporting, gives first set of glide coordinates */
+cursor_glide_t cursor_glide_start(cursor_glide_context_t* glide);
+
+/* Update glide engine on the latest cursor movement, cursor glide is based on the final movement */
+void cursor_glide_update(cursor_glide_context_t* glide, mouse_xy_report_t dx, mouse_xy_report_t dy, uint16_t z);
+#endif

From dfff040433a2cabd4a1047bbeb9eb72b736bba2e Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 13 Jul 2022 14:42:24 +1000
Subject: [PATCH 098/959] Allow MCU-specific overrides for SPI flags. (#17650)

---
 platforms/chibios/chibios_config.h     | 15 +++++++++++++++
 platforms/chibios/drivers/spi_master.c |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index c7a3a98fb0..8dcc23727f 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -84,6 +84,8 @@
 #        define PAL_OUTPUT_TYPE_PUSHPULL PAL_WB32_OTYPE_PUSHPULL
 #        define PAL_OUTPUT_SPEED_HIGHEST PAL_WB32_OSPEED_HIGH
 #        define PAL_PUPDR_FLOATING PAL_WB32_PUPDR_FLOATING
+
+#        define SPI_SCK_FLAGS PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3
 #    endif
 #endif
 
@@ -121,3 +123,16 @@
 #if !defined(REALTIME_COUNTER_CLOCK)
 #    define REALTIME_COUNTER_CLOCK CPU_CLOCK
 #endif
+
+// SPI Fallbacks
+#ifndef SPI_SCK_FLAGS
+#    define SPI_SCK_FLAGS PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST
+#endif
+
+#ifndef SPI_MOSI_FLAGS
+#    define SPI_MOSI_FLAGS PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST
+#endif
+
+#ifndef SPI_MISO_FLAGS
+#    define SPI_MISO_FLAGS PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST
+#endif
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index 223d8a403e..de308229ef 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -42,9 +42,9 @@ __attribute__((weak)) void spi_init(void) {
         palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), SPI_MOSI_PAL_MODE);
         palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), SPI_MISO_PAL_MODE);
 #else
-        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
-        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
-        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), SPI_SCK_FLAGS);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), SPI_MOSI_FLAGS);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), SPI_MISO_FLAGS);
 #endif
         spiUnselect(&SPI_DRIVER);
         spiStop(&SPI_DRIVER);

From 8a1ca7f6b854163983bf79111d87e03428f93d33 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 12 Jul 2022 22:47:32 -0600
Subject: [PATCH 099/959] [Keyboard] boardsource/holiday/spooky data driven
 (#17632)

---
 keyboards/boardsource/holiday/spooky/config.h | 129 ------------------
 .../boardsource/holiday/spooky/info.json      |  58 ++++++--
 .../holiday/spooky/keymaps/default/keymap.c   |  14 +-
 .../holiday/spooky/keymaps/rip_mx/keymap.c    |  84 ++++++------
 .../spooky/keymaps/rip_my_wallet/keymap.c     |  83 ++++++-----
 keyboards/boardsource/holiday/spooky/rules.mk |  21 +--
 keyboards/boardsource/holiday/spooky/spooky.c |  17 ---
 keyboards/boardsource/holiday/spooky/spooky.h |  35 -----
 8 files changed, 124 insertions(+), 317 deletions(-)
 delete mode 100644 keyboards/boardsource/holiday/spooky/config.h
 delete mode 100644 keyboards/boardsource/holiday/spooky/spooky.c
 delete mode 100644 keyboards/boardsource/holiday/spooky/spooky.h

diff --git a/keyboards/boardsource/holiday/spooky/config.h b/keyboards/boardsource/holiday/spooky/config.h
deleted file mode 100644
index 87d63b0d9e..0000000000
--- a/keyboards/boardsource/holiday/spooky/config.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-Copyright 2020 boardsource
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4273
-#define PRODUCT_ID   0x1031
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Boardsource
-#define PRODUCT      spooky
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-#define DIRECT_PINS { {E6,B4,B5}, {B3,B2,B6}}
-
-#define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 5   // Number of LEDs
-#endif
-
-
-//#define BACKLIGHT_PIN B7
-//#define BACKLIGHT_LEVELS 3
-//#define BACKLIGHT_BREATHING
-
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
-//#    define RGBLED_NUM 16
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
-/*== 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 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * 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
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json
index c942b2af11..56be9f7d26 100644
--- a/keyboards/boardsource/holiday/spooky/info.json
+++ b/keyboards/boardsource/holiday/spooky/info.json
@@ -1,18 +1,46 @@
 {
-    "keyboard_name": "spooky",
-    "url": "https://boardsource.xyz/store/5f783f6da2c1b43e37ca0795",
-    "maintainer": "boardsource",
-    "layouts": {
-        "LAYOUT_ortho_2x3": {
-            "layout": [
-                { "label": "k00", "x": 0, "y": 0 },
-                { "label": "k01", "x": 1, "y": 0 },
-                { "label": "k02", "x": 2, "y": 0 },
-
-                { "label": "k10", "x": 0, "y": 1 },
-                { "label": "k11", "x": 1, "y": 1 },
-                { "label": "k12", "x": 2, "y": 1 }
-            ]
-        }
+  "manufacturer": "Boardsource",
+  "keyboard_name": "Spooky",
+  "maintainer": "waffle87",
+  "development_board": "promicro",
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["E6", "B4", "B5"],
+      ["B3", "B2", "B6"]
+    ]
+  },
+  "usb": {
+    "device_version": "1.0.0",
+    "pid": "0x1031",
+    "vid": "0x4273"
+  },
+  "rgblight": {
+    "led_count": 5,
+    "pin": "D3",
+    "sleep": true,
+    "animations": {
+      "all": true
     }
+  },
+  "community_layouts": [
+    "ortho_2x3"
+  ],
+  "layouts": {
+    "LAYOUT_ortho_2x3": {
+      "layout": [
+        { "matrix": [0, 0], "x": 0, "y": 0 },
+        { "matrix": [0, 1], "x": 1, "y": 0 },
+        { "matrix": [0, 2], "x": 2, "y": 0 },
+        { "matrix": [1, 0], "x": 0, "y": 1 },
+        { "matrix": [1, 1], "x": 1, "y": 1 },
+        { "matrix": [1, 2], "x": 2, "y": 1 }
+      ]
+    }
+  }
 }
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c b/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c
index 63fbb1b94c..96c21f53f3 100644
--- a/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c
+++ b/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 boardsource
+/* Copyright 2022 boardsource
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,15 +15,9 @@
  */
 #include QMK_KEYBOARD_H
 
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT_ortho_2x3(
+    [0] = LAYOUT_ortho_2x3(
       KC_F1, KC_F2, KC_F3,
       KC_F4, KC_F5, KC_F6
-    ),
-  };
+    )
+};
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c b/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c
index eb56d11735..0afc136854 100644
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c
+++ b/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 boardsource
+/* Copyright 2022 boardsource
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,17 +15,11 @@
  */
 #include QMK_KEYBOARD_H
 
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT_ortho_2x3(
+    [0] = LAYOUT_ortho_2x3(
         RGB_TOG, KC_VOLU, KC_F2,
         RGB_MOD, KC_VOLD, KC_F1
-    ),
+    )
 };
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
@@ -34,46 +28,44 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 
 static void render_RIP(void) {
   static const char PROGMEM my_logo[] = {
-0xff, 0xff, 0x07, 0x1e, 0x70, 0xc0, 0x00, 0x00, 0xe0, 0x78, 0x1e, 0x07, 0xff, 0xfe, 0x00, 0x00,
-0x00, 0x00, 0x03, 0x06, 0x1c, 0xb8, 0xf0, 0xe0, 0xb8, 0x1c, 0x0e, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x3e, 0x66, 0x63, 0x63, 0x43, 0x43, 0xc3, 0xc2, 0x82,
-0x00, 0x00, 0x00, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0xc0, 0xf0, 0x30, 0xf0, 0x80, 0x00, 0x00, 0xc0,
-0xf0, 0x10, 0x00, 0x00, 0x00, 0xf3, 0xf3, 0x00, 0x00, 0x10, 0x18, 0xfe, 0x18, 0x10, 0x10, 0x10,
-0x00, 0x00, 0xc0, 0xe0, 0x30, 0x10, 0x18, 0x18, 0x18, 0x10, 0x10, 0x00, 0x00, 0x00, 0xff, 0xff,
-0x30, 0x10, 0x18, 0x18, 0x18, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0x90, 0x90, 0x98,
-0x98, 0x98, 0xb0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x90, 0x98, 0x98, 0x18, 0x18, 0x10, 0x00,
-0x1f, 0x1f, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00,
-0x00, 0x10, 0x1c, 0x0e, 0x07, 0x01, 0x00, 0x00, 0x01, 0x07, 0x0e, 0x1c, 0x18, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x18, 0x18, 0x10, 0x10, 0x18, 0x18, 0x0d, 0x0f,
-0x03, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x1e, 0x1e, 0x07, 0x00, 0x00, 0x01, 0x0f, 0x1c, 0x1e, 0x07,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x18, 0x18, 0x18,
-0x00, 0x00, 0x03, 0x0f, 0x0c, 0x18, 0x10, 0x10, 0x10, 0x18, 0x08, 0x00, 0x00, 0x00, 0x1f, 0x1f,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x08, 0x18, 0x10,
-0x10, 0x10, 0x18, 0x18, 0x08, 0x00, 0x00, 0x08, 0x18, 0x10, 0x11, 0x11, 0x11, 0x19, 0x0f, 0x0e,
-0x00, 0x30, 0x30, 0x10, 0x10, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0,
-0x30, 0x10, 0x18, 0x18, 0x10, 0x70, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xb0, 0x10, 0x18,
-0x18, 0x10, 0x30, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x70, 0x10, 0x18, 0x18, 0x10, 0x30,
-0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x18, 0x18, 0x18,
-0x10, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0x30, 0x10, 0x18, 0x10, 0x30, 0xf0,
-0xe0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x18, 0x18, 0x10, 0x30, 0xf0, 0xe0, 0x00, 0x00,
-0x00, 0x00, 0xc0, 0xe0, 0x30, 0x10, 0x18, 0x18, 0x10, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xff, 0xff, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc7,
-0xc4, 0x8c, 0x8c, 0xcc, 0xc4, 0x77, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x38, 0x7d, 0xc7, 0xc3, 0x82,
-0x82, 0xc3, 0xc7, 0x7d, 0x7c, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x70, 0xc0, 0x80, 0x80, 0xc0, 0xc0,
-0x7f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08,
-0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xd8, 0xcc,
-0xc6, 0xc3, 0xc1, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x70, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0x70,
-0x3f, 0x0f, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xd8, 0xcc, 0xcc, 0xc7, 0xc3, 0xc1, 0x00, 0x00,
-0x00, 0x00, 0x3f, 0x7f, 0xe0, 0xc0, 0x80, 0x80, 0xc0, 0x60, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00
- };
-
+    0xff, 0xff, 0x07, 0x1e, 0x70, 0xc0, 0x00, 0x00, 0xe0, 0x78, 0x1e, 0x07, 0xff, 0xfe, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x06, 0x1c, 0xb8, 0xf0, 0xe0, 0xb8, 0x1c, 0x0e, 0x07, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x3e, 0x66, 0x63, 0x63, 0x43, 0x43, 0xc3, 0xc2, 0x82,
+    0x00, 0x00, 0x00, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0xc0, 0xf0, 0x30, 0xf0, 0x80, 0x00, 0x00, 0xc0,
+    0xf0, 0x10, 0x00, 0x00, 0x00, 0xf3, 0xf3, 0x00, 0x00, 0x10, 0x18, 0xfe, 0x18, 0x10, 0x10, 0x10,
+    0x00, 0x00, 0xc0, 0xe0, 0x30, 0x10, 0x18, 0x18, 0x18, 0x10, 0x10, 0x00, 0x00, 0x00, 0xff, 0xff,
+    0x30, 0x10, 0x18, 0x18, 0x18, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0x90, 0x90, 0x98,
+    0x98, 0x98, 0xb0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x90, 0x98, 0x98, 0x18, 0x18, 0x10, 0x00,
+    0x1f, 0x1f, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00,
+    0x00, 0x10, 0x1c, 0x0e, 0x07, 0x01, 0x00, 0x00, 0x01, 0x07, 0x0e, 0x1c, 0x18, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x18, 0x18, 0x10, 0x10, 0x18, 0x18, 0x0d, 0x0f,
+    0x03, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x1e, 0x1e, 0x07, 0x00, 0x00, 0x01, 0x0f, 0x1c, 0x1e, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x18, 0x18, 0x18,
+    0x00, 0x00, 0x03, 0x0f, 0x0c, 0x18, 0x10, 0x10, 0x10, 0x18, 0x08, 0x00, 0x00, 0x00, 0x1f, 0x1f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x08, 0x18, 0x10,
+    0x10, 0x10, 0x18, 0x18, 0x08, 0x00, 0x00, 0x08, 0x18, 0x10, 0x11, 0x11, 0x11, 0x19, 0x0f, 0x0e,
+    0x00, 0x30, 0x30, 0x10, 0x10, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0,
+    0x30, 0x10, 0x18, 0x18, 0x10, 0x70, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xb0, 0x10, 0x18,
+    0x18, 0x10, 0x30, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x70, 0x10, 0x18, 0x18, 0x10, 0x30,
+    0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x18, 0x18, 0x18,
+    0x10, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0x30, 0x10, 0x18, 0x10, 0x30, 0xf0,
+    0xe0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x18, 0x18, 0x10, 0x30, 0xf0, 0xe0, 0x00, 0x00,
+    0x00, 0x00, 0xc0, 0xe0, 0x30, 0x10, 0x18, 0x18, 0x10, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xff, 0xff, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc7,
+    0xc4, 0x8c, 0x8c, 0xcc, 0xc4, 0x77, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x38, 0x7d, 0xc7, 0xc3, 0x82,
+    0x82, 0xc3, 0xc7, 0x7d, 0x7c, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x70, 0xc0, 0x80, 0x80, 0xc0, 0xc0,
+    0x7f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08,
+    0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xd8, 0xcc,
+    0xc6, 0xc3, 0xc1, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x70, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0x70,
+    0x3f, 0x0f, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xd8, 0xcc, 0xcc, 0xc7, 0xc3, 0xc1, 0x00, 0x00,
+    0x00, 0x00, 0x3f, 0x7f, 0xe0, 0xc0, 0x80, 0x80, 0xc0, 0x60, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00
+  };
   oled_write_raw_P(my_logo, sizeof(my_logo));
 }
 
 bool oled_task_user(void) {
   render_RIP();
-    return false;
-  }
-
+  return false;
+}
 #endif
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/keymap.c b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/keymap.c
index f8cac50875..1ddad75827 100644
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/keymap.c
+++ b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 boardsource
+/* Copyright 2022 boardsource
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,18 +15,13 @@
  */
 #include QMK_KEYBOARD_H
 
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT_ortho_2x3(
+    [0] = LAYOUT_ortho_2x3(
         RGB_TOG, KC_1, KC_2,
         RGB_MOD, KC_3,KC_4
-    ),
+    )
 };
+
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
     return OLED_ROTATION_180;
@@ -34,46 +29,44 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 
 static void render_RIP(void) {
   static const char PROGMEM my_logo[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x08, 0x04,
-0x04, 0x7c, 0xfc, 0xf0, 0x00, 0x00, 0x40, 0x20, 0xf0, 0x7c, 0x06, 0x00, 0x41, 0xc0, 0x00, 0x00,
-0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0xc0, 0x00,
-0x00, 0x00, 0xe0, 0x60, 0x00, 0x80, 0x40, 0x20, 0x20, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0x02,
-0x01, 0xc1, 0xf8, 0x0e, 0x00, 0x01, 0xc0, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x08,
-0x03, 0x00, 0x00, 0x0f, 0x06, 0x01, 0x00, 0x1e, 0x1f, 0x10, 0x00, 0x00, 0x1e, 0x1f, 0x08, 0xc0,
-0x3e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1e, 0x11, 0x08, 0x04, 0x1e, 0x11, 0x00,
-0x08, 0x06, 0x01, 0x00, 0x1e, 0x19, 0x08, 0x00, 0x1e, 0x0b, 0x08, 0x00, 0x1f, 0x1b, 0x08, 0x00,
-0x18, 0x1f, 0x00, 0x00, 0x00, 0x1f, 0x12, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x19, 0x08, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
-0x84, 0x84, 0x84, 0xcc, 0x38, 0x00, 0x00, 0x00, 0xf0, 0x18, 0x04, 0x05, 0x0f, 0x79, 0xe1, 0x00,
-0x00, 0x00, 0xc0, 0x78, 0x0c, 0x00, 0x00, 0x0c, 0x84, 0x84, 0xcc, 0xf8, 0x30, 0x00, 0x00, 0xe0,
-0xf8, 0x0c, 0x04, 0x04, 0x0c, 0xf8, 0x80, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x00, 0x00, 0x08, 0x0c,
-0x04, 0x04, 0xcc, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x18, 0x0c, 0x04, 0x0c, 0x18, 0xf0, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x10, 0x10, 0x10, 0x19, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x18, 0x10, 0x10, 0x18, 0x0f, 0x07, 0x00,
-0x20, 0x1e, 0x03, 0x00, 0x00, 0x00, 0x18, 0x10, 0x10, 0x10, 0x10, 0x1d, 0x0f, 0x00, 0x00, 0x03,
-0x0f, 0x18, 0x10, 0x10, 0x18, 0x0f, 0x00, 0x00, 0x38, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x18, 0x1c,
-0x16, 0x13, 0x10, 0x10, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x10, 0x10, 0x10, 0x0c, 0x07, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x08, 0x04,
+    0x04, 0x7c, 0xfc, 0xf0, 0x00, 0x00, 0x40, 0x20, 0xf0, 0x7c, 0x06, 0x00, 0x41, 0xc0, 0x00, 0x00,
+    0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0xc0, 0x00,
+    0x00, 0x00, 0xe0, 0x60, 0x00, 0x80, 0x40, 0x20, 0x20, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0x02,
+    0x01, 0xc1, 0xf8, 0x0e, 0x00, 0x01, 0xc0, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x50, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x08,
+    0x03, 0x00, 0x00, 0x0f, 0x06, 0x01, 0x00, 0x1e, 0x1f, 0x10, 0x00, 0x00, 0x1e, 0x1f, 0x08, 0xc0,
+    0x3e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1e, 0x11, 0x08, 0x04, 0x1e, 0x11, 0x00,
+    0x08, 0x06, 0x01, 0x00, 0x1e, 0x19, 0x08, 0x00, 0x1e, 0x0b, 0x08, 0x00, 0x1f, 0x1b, 0x08, 0x00,
+    0x18, 0x1f, 0x00, 0x00, 0x00, 0x1f, 0x12, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x19, 0x08, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
+    0x84, 0x84, 0x84, 0xcc, 0x38, 0x00, 0x00, 0x00, 0xf0, 0x18, 0x04, 0x05, 0x0f, 0x79, 0xe1, 0x00,
+    0x00, 0x00, 0xc0, 0x78, 0x0c, 0x00, 0x00, 0x0c, 0x84, 0x84, 0xcc, 0xf8, 0x30, 0x00, 0x00, 0xe0,
+    0xf8, 0x0c, 0x04, 0x04, 0x0c, 0xf8, 0x80, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x00, 0x00, 0x08, 0x0c,
+    0x04, 0x04, 0xcc, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x18, 0x0c, 0x04, 0x0c, 0x18, 0xf0, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
+    0x10, 0x10, 0x10, 0x19, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x18, 0x10, 0x10, 0x18, 0x0f, 0x07, 0x00,
+    0x20, 0x1e, 0x03, 0x00, 0x00, 0x00, 0x18, 0x10, 0x10, 0x10, 0x10, 0x1d, 0x0f, 0x00, 0x00, 0x03,
+    0x0f, 0x18, 0x10, 0x10, 0x18, 0x0f, 0x00, 0x00, 0x38, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x18, 0x1c,
+    0x16, 0x13, 0x10, 0x10, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x10, 0x10, 0x10, 0x0c, 0x07, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
   };
-
   oled_write_raw_P(my_logo, sizeof(my_logo));
 }
 
 bool oled_task_user(void) {
   render_RIP();
-    return false;
-  }
-
+  return false;
+}
 #endif
diff --git a/keyboards/boardsource/holiday/spooky/rules.mk b/keyboards/boardsource/holiday/spooky/rules.mk
index ce35761cc9..6e7633bfe0 100644
--- a/keyboards/boardsource/holiday/spooky/rules.mk
+++ b/keyboards/boardsource/holiday/spooky/rules.mk
@@ -1,20 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = ortho_2x3
+# This file intentionally left blank
diff --git a/keyboards/boardsource/holiday/spooky/spooky.c b/keyboards/boardsource/holiday/spooky/spooky.c
deleted file mode 100644
index 87fe02c1a8..0000000000
--- a/keyboards/boardsource/holiday/spooky/spooky.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 boardsource
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "spooky.h"
diff --git a/keyboards/boardsource/holiday/spooky/spooky.h b/keyboards/boardsource/holiday/spooky/spooky.h
deleted file mode 100644
index 42127b8f44..0000000000
--- a/keyboards/boardsource/holiday/spooky/spooky.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 boardsource
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_2x3( \
-    k00, k01, k02, \
-    k10, k11, k12 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }  \
-}

From 1dfe2bb49ab9cae1450697bf95d7a4c7bfc18bab Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 12 Jul 2022 22:18:02 -0700
Subject: [PATCH 100/959] Update LED/RGB Matrix flag function behavior (#17651)

---
 quantum/led_matrix/led_matrix.c | 14 ++++++++++++--
 quantum/led_matrix/led_matrix.h |  1 +
 quantum/rgb_matrix/rgb_matrix.c | 12 +++++++++++-
 quantum/rgb_matrix/rgb_matrix.h |  1 +
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 38ed79bed0..75a0aba5a0 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -618,10 +618,20 @@ void led_matrix_decrease_speed(void) {
     led_matrix_decrease_speed_helper(true);
 }
 
+void led_matrix_set_flags_eeprom_helper(led_flags_t flags, bool write_to_eeprom) {
+    led_matrix_config.flags = flags;
+    eeconfig_flag_led_matrix(write_to_eeprom);
+    dprintf("led matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_config.flags);
+}
+
 led_flags_t led_matrix_get_flags(void) {
-    return led_matrix_eeconfig.flags;
+    return led_matrix_config.flags;
 }
 
 void led_matrix_set_flags(led_flags_t flags) {
-    led_matrix_eeconfig.flags = flags;
+    led_matrix_set_flags_eeprom_helper(flags, true);
+}
+
+void led_matrix_set_flags_noeeprom(led_flags_t flags) {
+    led_matrix_set_flags_eeprom_helper(flags, false);
 }
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index d21f36e295..b2abec7eb1 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -158,6 +158,7 @@ void        led_matrix_decrease_speed(void);
 void        led_matrix_decrease_speed_noeeprom(void);
 led_flags_t led_matrix_get_flags(void);
 void        led_matrix_set_flags(led_flags_t flags);
+void        led_matrix_set_flags_noeeprom(led_flags_t flags);
 
 typedef struct {
     /* Perform any initialisation required for the other driver functions to work. */
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index a51e379025..2730686839 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -731,10 +731,20 @@ void rgb_matrix_decrease_speed(void) {
     rgb_matrix_decrease_speed_helper(true);
 }
 
+void rgb_matrix_set_flags_eeprom_helper(led_flags_t flags, bool write_to_eeprom) {
+    rgb_matrix_config.flags = flags;
+    eeconfig_flag_rgb_matrix(write_to_eeprom);
+    dprintf("rgb matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.flags);
+}
+
 led_flags_t rgb_matrix_get_flags(void) {
     return rgb_matrix_config.flags;
 }
 
 void rgb_matrix_set_flags(led_flags_t flags) {
-    rgb_matrix_config.flags = flags;
+    rgb_matrix_set_flags_eeprom_helper(flags, true);
+}
+
+void rgb_matrix_set_flags_noeeprom(led_flags_t flags) {
+    rgb_matrix_set_flags_eeprom_helper(flags, false);
 }
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index 359d507a4d..fc9fc3e020 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -182,6 +182,7 @@ void        rgb_matrix_increase_speed_noeeprom(void);
 void        rgb_matrix_decrease_speed(void);
 void        rgb_matrix_decrease_speed_noeeprom(void);
 led_flags_t rgb_matrix_get_flags(void);
+led_flags_t rgb_matrix_get_flags_noeeprom(void);
 void        rgb_matrix_set_flags(led_flags_t flags);
 
 #ifndef RGBLIGHT_ENABLE

From 98312417b524b7ef4717c5a5523ab87d94aeee52 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 12 Jul 2022 23:20:38 -0600
Subject: [PATCH 101/959] [Keyboard] boardsource/lulu data driven (#17638)

---
 keyboards/boardsource/lulu/config.h           |  50 +--
 keyboards/boardsource/lulu/info.json          | 187 +++++++-
 .../boardsource/lulu/keymaps/default/keymap.c |  21 -
 .../boardsource/lulu/keymaps/via/keymap.c     |   1 -
 keyboards/boardsource/lulu/lulu.c             | 425 ++++++++----------
 keyboards/boardsource/lulu/lulu.h             |  29 --
 keyboards/boardsource/lulu/rules.mk           |  25 --
 7 files changed, 380 insertions(+), 358 deletions(-)
 delete mode 100644 keyboards/boardsource/lulu/lulu.h

diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h
index 8cd240179e..f96a228429 100644
--- a/keyboards/boardsource/lulu/config.h
+++ b/keyboards/boardsource/lulu/config.h
@@ -2,46 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-
 #include "config_common.h"
-
-#define VENDOR_ID       0x4273
-#define PRODUCT_ID      0x7685
-#define DEVICE_VER      0x0000
-#define MANUFACTURER    Boardsource
-#define PRODUCT         lulu
-
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-#define MATRIX_ROW_PINS {C6, D7, E6, B4, B5}
-
-// wiring of each half
-#define MATRIX_COL_PINS {F6, F7, B1, B3, B2, B6}
-#define USE_SERIAL
-#define SOFT_SERIAL_PIN D2
-#define SPLIT_USB_DETECT
 #define RGB_DI_PIN D3
-
-#define ENCODERS_PAD_A { F0 }
-#define ENCODERS_PAD_B { F1 }
-#define ENCODERS_PAD_A_RIGHT { F0 }
-#define ENCODERS_PAD_B_RIGHT { F1 }
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-#define DIODE_DIRECTION COL2ROW
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-    #define RGBLED_NUM 70  // Number of LEDs
-    #define DRIVER_LED_TOTAL RGBLED_NUM
-    #define RGB_MATRIX_SPLIT { 35, 35 }
-    #define SPLIT_TRANSPORT_MIRROR
-    #define RGBLIGHT_LIMIT_VAL 150
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-    #define ENABLE_RGB_MATRIX_BREATHING
-    #define ENABLE_RGB_MATRIX_BAND_SAT
-    #define ENABLE_RGB_MATRIX_BAND_VAL
-#endif
-
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_SPLIT { 35, 35 }
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
index 156a7cea98..5ee5c59c1a 100644
--- a/keyboards/boardsource/lulu/info.json
+++ b/keyboards/boardsource/lulu/info.json
@@ -1,16 +1,177 @@
 {
-    "keyboard_name": "Lulu",
-    "url": "https://boardsource.xyz/store/61d0b772319a1f3cc53ba2fb",
-    "maintainer": "boardsource",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5},
-                {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5},
-                {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5},
-                {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
-                {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.15}
-            ]
-        }
+  "manufacturer": "Boardsource",
+  "keyboard_name": "lulu",
+  "maintainer": "waffle87",
+  "bootloader": "atmel-dfu",
+  "diode_direction": "COL2ROW",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgb_matrix": true,
+    "oled": true
+  },
+  "matrix_pins": {
+    "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "processor": "atmega32u4",
+  "url": "https://boardsource.xyz/projects/60de24d6847112054777bbdd",
+  "usb": {
+    "device_version": "1.0.0",
+    "pid": "0x7685",
+    "vid": "0x4273"
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2"
+  },
+  "encoder": {
+    "enabled": true,
+    "rotary": [
+      { "pin_a": "F0", "pin_b": "F1" }
+    ]
+  },
+  "rgb_matrix": {
+    "layout": [
+      { "flags": 2, "x": 86, "y": 55 },
+      { "flags": 2, "x": 51, "y": 55 },
+      { "flags": 2, "x": 17, "y": 40 },
+      { "flags": 2, "x": 17, "y": 10 },
+      { "flags": 2, "x": 51, "y": 10 },
+      { "flags": 2, "x": 86, "y": 10 },
+      { "flags": 2, "x": 137, "y": 55 },
+      { "flags": 2, "x": 172, "y": 55 },
+      { "flags": 2, "x": 206, "y": 40 },
+      { "flags": 2, "x": 206, "y": 10 },
+      { "flags": 2, "x": 172, "y": 10 },
+      { "flags": 2, "x": 137, "y": 10 },
+      { "flags": 1, "matrix": [0, 0], "x": 0,  "y": 0 },
+      { "flags": 4, "matrix": [0, 1], "x": 17,  "y": 0 },
+      { "flags": 4, "matrix": [0, 2], "x": 34,  "y": 0 },
+      { "flags": 4, "matrix": [0, 3], "x": 51,  "y": 0 },
+      { "flags": 4, "matrix": [0, 4], "x": 68,  "y": 0 },
+      { "flags": 4, "matrix": [0, 5], "x": 86,  "y": 0 },
+      { "flags": 4, "matrix": [5, 5], "x": 137,  "y": 0 },
+      { "flags": 4, "matrix": [5, 4], "x": 155,  "y": 0 },
+      { "flags": 4, "matrix": [5, 3], "x": 172,  "y": 0 },
+      { "flags": 4, "matrix": [5, 2], "x": 189,  "y": 0 },
+      { "flags": 4, "matrix": [5, 1], "x": 206,  "y": 0 },
+      { "flags": 1, "matrix": [5, 0], "x": 224,  "y": 0 },
+      { "flags": 1, "matrix": [1, 0], "x": 0,  "y": 16 },
+      { "flags": 4, "matrix": [1, 1], "x": 17,  "y": 16 },
+      { "flags": 4, "matrix": [1, 2], "x": 34,  "y": 16 },
+      { "flags": 4, "matrix": [1, 3], "x": 51,  "y": 16 },
+      { "flags": 4, "matrix": [1, 4], "x": 68,  "y": 16 },
+      { "flags": 4, "matrix": [1, 5], "x": 86,  "y": 16 },
+      { "flags": 4, "matrix": [6, 5], "x": 137,  "y": 16 },
+      { "flags": 4, "matrix": [6, 4], "x": 155,  "y": 16 },
+      { "flags": 4, "matrix": [6, 3], "x": 172,  "y": 16 },
+      { "flags": 4, "matrix": [6, 2], "x": 189,  "y": 16 },
+      { "flags": 4, "matrix": [6, 1], "x": 206,  "y": 16 },
+      { "flags": 1, "matrix": [6, 4], "x": 224,  "y": 16 },
+      { "flags": 1, "matrix": [2, 0], "x": 0,  "y": 32 },
+      { "flags": 4, "matrix": [2, 1], "x": 17,  "y": 32 },
+      { "flags": 4, "matrix": [2, 2], "x": 34,  "y": 32 },
+      { "flags": 4, "matrix": [2, 3], "x": 51,  "y": 32 },
+      { "flags": 4, "matrix": [2, 4], "x": 68,  "y": 32 },
+      { "flags": 4, "matrix": [2, 5], "x": 86,  "y": 32 },
+      { "flags": 4, "matrix": [7, 5], "x": 137,  "y": 32 },
+      { "flags": 4, "matrix": [7, 4], "x": 155,  "y": 32 },
+      { "flags": 4, "matrix": [7, 3], "x": 172,  "y": 32 },
+      { "flags": 4, "matrix": [7, 2], "x": 189,  "y": 32 },
+      { "flags": 4, "matrix": [7, 1], "x": 206,  "y": 32 },
+      { "flags": 1, "matrix": [7, 4], "x": 224,  "y": 32 },
+      { "flags": 1, "matrix": [3, 0], "x": 0,  "y": 48 },
+      { "flags": 4, "matrix": [3, 1], "x": 17,  "y": 48 },
+      { "flags": 4, "matrix": [3, 2], "x": 34,  "y": 48 },
+      { "flags": 4, "matrix": [3, 3], "x": 51,  "y": 48 },
+      { "flags": 4, "matrix": [3, 4], "x": 68,  "y": 48 },
+      { "flags": 4, "matrix": [3, 5], "x": 86,  "y": 48 },
+      { "flags": 4, "matrix": [4, 5], "x": 103,  "y": 48 },
+      { "flags": 4, "matrix": [9, 5], "x": 120,  "y": 48 },
+      { "flags": 4, "matrix": [8, 5], "x": 137,  "y": 48 },
+      { "flags": 4, "matrix": [8, 4], "x": 155,  "y": 48 },
+      { "flags": 4, "matrix": [8, 3], "x": 172,  "y": 48 },
+      { "flags": 4, "matrix": [8, 2], "x": 189,  "y": 48 },
+      { "flags": 4, "matrix": [8, 1], "x": 206,  "y": 48 },
+      { "flags": 1, "matrix": [8, 4], "x": 224,  "y": 48 },
+      { "flags": 1, "matrix": [4, 1], "x": 34,  "y": 64 },
+      { "flags": 1, "matrix": [4, 2], "x": 51,  "y": 64 },
+      { "flags": 1, "matrix": [4, 3], "x": 68,  "y": 64 },
+      { "flags": 1, "matrix": [4, 4], "x": 86,  "y": 64 },
+      { "flags": 1, "matrix": [9, 4], "x": 137,  "y": 64 },
+      { "flags": 1, "matrix": [9, 3], "x": 155,  "y": 64 },
+      { "flags": 1, "matrix": [9, 2], "x": 172,  "y": 64 },
+      { "flags": 1, "matrix": [9, 1], "x": 189,  "y": 64 }
+    ]
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "matrix": [0, 0], "x": 0, "y": 0.5 },
+        { "matrix": [0, 1], "x": 1, "y": 0.375 },
+        { "matrix": [0, 2], "x": 2, "y": 0.125 },
+        { "matrix": [0, 3], "x": 3, "y": 0 },
+        { "matrix": [0, 4], "x": 4, "y": 0.125 },
+        { "matrix": [0, 5], "x": 5, "y": 0.25 },
+        { "matrix": [5, 5], "x": 10.5, "y": 0.25 },
+        { "matrix": [5, 4], "x": 11.5, "y": 0.125 },
+        { "matrix": [5, 3], "x": 12.5, "y": 0 },
+        { "matrix": [5, 2], "x": 13.5, "y": 0.125 },
+        { "matrix": [5, 1], "x": 14.5, "y": 0.375 },
+        { "matrix": [5, 0], "x": 15.5, "y": 0.5 },
+        { "matrix": [1, 0], "x": 0, "y": 1.5 },
+        { "matrix": [1, 1], "x": 1, "y": 1.375 },
+        { "matrix": [1, 2], "x": 2, "y": 1.125 },
+        { "matrix": [1, 3], "x": 3, "y": 1 },
+        { "matrix": [1, 4], "x": 4, "y": 1.125 },
+        { "matrix": [1, 5], "x": 5, "y": 1.25 },
+        { "matrix": [6, 5], "x": 10.5, "y": 1.25 },
+        { "matrix": [6, 4], "x": 11.5, "y": 1.125 },
+        { "matrix": [6, 3], "x": 12.5, "y": 1 },
+        { "matrix": [6, 2], "x": 13.5, "y": 1.125 },
+        { "matrix": [6, 1], "x": 14.5, "y": 1.375 },
+        { "matrix": [6, 0], "x": 15.5, "y": 1.5 },
+        { "matrix": [2, 0], "x": 0, "y": 2.5 },
+        { "matrix": [2, 1], "x": 1, "y": 2.375 },
+        { "matrix": [2, 2], "x": 2, "y": 2.125 },
+        { "matrix": [2, 3], "x": 3, "y": 2 },
+        { "matrix": [2, 4], "x": 4, "y": 2.125 },
+        { "matrix": [2, 5], "x": 5, "y": 2.25 },
+        { "matrix": [7, 5], "x": 10.5, "y": 2.25 },
+        { "matrix": [7, 4], "x": 11.5, "y": 2.125 },
+        { "matrix": [7, 3], "x": 12.5, "y": 2 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.125 },
+        { "matrix": [7, 1], "x": 14.5, "y": 2.375 },
+        { "matrix": [7, 0], "x": 15.5, "y": 2.5 },
+        { "matrix": [3, 0], "x": 0, "y": 3.5 },
+        { "matrix": [3, 1], "x": 1, "y": 3.375 },
+        { "matrix": [3, 2], "x": 2, "y": 3.125 },
+        { "matrix": [3, 3], "x": 3, "y": 3 },
+        { "matrix": [3, 4], "x": 4, "y": 3.125 },
+        { "matrix": [3, 5], "x": 5, "y": 3.25 },
+        { "matrix": [4, 5], "x": 6, "y": 2.75 },
+        { "matrix": [9, 5], "x": 9.5, "y": 2.75 },
+        { "matrix": [8, 5], "x": 10.5, "y": 3.25 },
+        { "matrix": [8, 4], "x": 11.5, "y": 3.125 },
+        { "matrix": [8, 3], "x": 12.5, "y": 3 },
+        { "matrix": [8, 2], "x": 13.5, "y": 3.125 },
+        { "matrix": [8, 1], "x": 14.5, "y": 3.375 },
+        { "matrix": [8, 0], "x": 15.5, "y": 3.5 },
+        { "matrix": [4, 1], "x": 2.5, "y": 4.125 },
+        { "matrix": [4, 2], "x": 3.5, "y": 4.15 },
+        { "matrix": [4, 3], "x": 4.5, "y": 4.25 },
+        { "matrix": [4, 4], "h": 1.5, "x": 6, "y": 4.25 },
+        { "matrix": [9, 4], "h": 1.5, "x": 9.5, "y": 4.25 },
+        { "matrix": [9, 3], "x": 11, "y": 4.25 },
+        { "matrix": [9, 2], "x": 12, "y": 4.15 },
+        { "matrix": [9, 1], "x": 13, "y": 4.15 }
+      ]
     }
+  }
 }
diff --git a/keyboards/boardsource/lulu/keymaps/default/keymap.c b/keyboards/boardsource/lulu/keymaps/default/keymap.c
index 8624b51b6a..cbee1401ed 100644
--- a/keyboards/boardsource/lulu/keymaps/default/keymap.c
+++ b/keyboards/boardsource/lulu/keymaps/default/keymap.c
@@ -106,24 +106,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 layer_state_t layer_state_set_user(layer_state_t state) {
    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        // Volume control
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        // Page up/Page down
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/boardsource/lulu/keymaps/via/keymap.c b/keyboards/boardsource/lulu/keymaps/via/keymap.c
index 912ea38559..de635a6128 100644
--- a/keyboards/boardsource/lulu/keymaps/via/keymap.c
+++ b/keyboards/boardsource/lulu/keymaps/via/keymap.c
@@ -102,4 +102,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                              _______, _______, _______, _______, _______,  _______, _______, _______
   )
 };
-
diff --git a/keyboards/boardsource/lulu/lulu.c b/keyboards/boardsource/lulu/lulu.c
index 7a25fce50c..be6d565a32 100644
--- a/keyboards/boardsource/lulu/lulu.c
+++ b/keyboards/boardsource/lulu/lulu.c
@@ -1,267 +1,237 @@
 // Copyright 2022 Cole Smith <cole@boadsource.xyz>
 // SPDX-License-Identifier: GPL-2.0-or-later
+#include "encoder.h"
 
-#include "lulu.h"
-#ifdef RGB_MATRIX_ENABLE
-
-led_config_t g_led_config = { {
-    {11,10, 9, 8, 7, 6},
-    {17,16,15,14,13,12},
-    {23,22,21,20,19,18},
-    {29,28,27,26,25,24},
-    {NO_LED,34,33,32,31,30},
-    {41,42,43,44,45,46},
-    {47,48,49,50,51,52},
-    {53,54,55,56,57,58},
-    {59,60,61,62,63,64},
-    {NO_LED,65,66,67,68,69}
-},{
-
-  {86,55},{51,55},{17,40},{17,10},{51,10},{86,10},
-  {0,0}, {17,0}, {34,0}, {51,0}, {68,0}, {86,0},
-  {0,16},{17,16},{34,16},{51,16},{68,16},{86,16},
-  {0,32},{17,32},{34,32},{51,32},{68,32},{86,32},
-  {0,48},{17,48},{34,48},{51,48},{68,48},{86,48},{103,48},
-                 {34,64},{51,64},{68,64},{86,64},
-
-
-  {137,55},{172,55},{206,40},{206,10},{172,10},{137,10},
-  {137,0}, {155,0}, {172,0}, {189,0}, {206,0}, {224,0},
-  {137,16},{155,16},{172,16},{189,16},{206,16},{224,16},
-  {137,32},{155,32},{172,32},{189,32},{206,32},{224,32},
-  {137,48},{155,48},{172,48},{189,48},{155,48},{137,48},{120,48},
-                    {172,64},{189,64},{155,64},{137,64}
-},{2,2,2,2,2,2,
-   4,4,4,4,4,1,
-   1,4,4,4,4,4,
-   4,4,4,4,4,1,
-   1,4,4,4,4,4,
-   1,4,1,1,1,
-   2,2,2,2,2,2,
-   4,4,4,4,4,1,
-   1,4,4,4,4,4,
-   4,4,4,4,4,1,
-   1,4,4,4,4,4,
-   1,4,1,1,1
-}};
-
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
 #endif
 
-
-
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
   if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+    return OLED_ROTATION_180;
   }
   return rotation;
 }
 
 void render_layer1_logo(void){
-        static const char PROGMEM layer_logo[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
-0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 
-0xfc, 0x0e, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
-0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
-0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
-0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
-0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+    static const char PROGMEM layer_logo[] = {
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+      0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 
+      0xfc, 0x0e, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+      0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+      0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+      0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+      0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+  };
+  oled_write_raw_P(layer_logo, sizeof(layer_logo));
 }
+
 void render_layer2_logo(void){
-        static const char PROGMEM layer_logo[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
-0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
-0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
-0x3f, 0x70, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
-0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
-0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
-0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
-};
+    static const char PROGMEM layer_logo[] = {
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+      0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+      0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+      0x3f, 0x70, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+      0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+      0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+      0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+      0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+      0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
     oled_write_raw_P(layer_logo, sizeof(layer_logo));
 }
+
 void render_layer3_logo(void){
-        static const char PROGMEM layer_logo[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
-0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
-0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0x70, 0x38, 0x1f, 0x07, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
-0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
-0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
-0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
-};
+    static const char PROGMEM layer_logo[] = {
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+      0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+      0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
+      0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
+      0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0x70, 0x38, 0x1f, 0x07, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+      0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+      0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+      0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+      0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+      0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
     oled_write_raw_P(layer_logo, sizeof(layer_logo));
 }
+
 void render_layer4_logo(void){
-        static const char PROGMEM layer_logo[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
-0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
-0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
-0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
-0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
-0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
-0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
-};
+    static const char PROGMEM layer_logo[] = {
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+      0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+      0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+      0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+      0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+      0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+      0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
     oled_write_raw_P(layer_logo, sizeof(layer_logo));
 }
 
 void render_logo(void) {
     static const char PROGMEM logo[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x60, 0x60, 0x60, 
-0x60, 0x60, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
-0x00, 0xe0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0x1e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 
-0x80, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 
-0xe0, 0xc0, 0x80, 0x80, 0xc0, 0xc0, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
-0x00, 0x1f, 0xff, 0xff, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xe0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x78, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x01, 
-0x01, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0x78, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 
-0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x60, 0x60, 0x60, 
+      0x60, 0x60, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+      0x00, 0xe0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0x1e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 
+      0x80, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 
+      0xe0, 0xc0, 0x80, 0x80, 0xc0, 0xc0, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+      0x00, 0x1f, 0xff, 0xff, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xe0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x78, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x01, 
+      0x01, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0x78, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 
+      0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
     oled_write_raw_P(logo, sizeof(logo));
 }
-enum Layers{
-    _QWERTY,
-    _RAISE,
-    _LOWER,
-    _ADJUST
-};
 
 void process_layer_state(void) {
     switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
+        case 0:
             render_layer1_logo();
             break;
-        case _LOWER:
+        case 1:
             render_layer2_logo();
             break;
-        case _RAISE:
+        case 2:
             render_layer3_logo();
             break;
-        case _ADJUST:
+        case 3:
             render_layer4_logo();
             break;
     }
@@ -277,4 +247,3 @@ bool oled_task_kb(void) {
     return false;
 }
 #endif
-
diff --git a/keyboards/boardsource/lulu/lulu.h b/keyboards/boardsource/lulu/lulu.h
deleted file mode 100644
index bda65f63e0..0000000000
--- a/keyboards/boardsource/lulu/lulu.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 Cole Smith <cole@boadsource.xyz>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-#include "split_util.h"
-#define has_usb() is_keyboard_master()
-#define is_master is_keyboard_master()
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
-	L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
-	L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,  \
-	L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \
-	               L41, L42, L43, L44, R41, R42, R43, R44  \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ KC_NO, L41, L42, L43, L44, L45 }, \
-		{ R05, R04, R03, R02, R01, R00 }, \
-		{ R15, R14, R13, R12, R11, R10 }, \
-		{ R25, R24, R23, R22, R21, R20 }, \
-		{ R35, R34, R33, R32, R31, R30 }, \
-		{ KC_NO, R44, R43, R42, R41, R40 } \
-	}
-
diff --git a/keyboards/boardsource/lulu/rules.mk b/keyboards/boardsource/lulu/rules.mk
index 06d206cb55..32afd21635 100644
--- a/keyboards/boardsource/lulu/rules.mk
+++ b/keyboards/boardsource/lulu/rules.mk
@@ -1,26 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-RGB_MATRIX_SUPPORTED = yes
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-LTO_ENABLE = yes
-ENCODER_ENABLE = yes  

From b21a52c824399c1de33ec09caf10f4cee40d7489 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 13 Jul 2022 00:01:30 -0700
Subject: [PATCH 102/959] Fix compilation issue with Cirque Guestures file
 (#17656)

---
 drivers/sensors/cirque_pinnacle_gestures.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/sensors/cirque_pinnacle_gestures.c b/drivers/sensors/cirque_pinnacle_gestures.c
index f6f9177e08..70f16527ba 100644
--- a/drivers/sensors/cirque_pinnacle_gestures.c
+++ b/drivers/sensors/cirque_pinnacle_gestures.c
@@ -19,6 +19,7 @@
 #include "cirque_pinnacle_gestures.h"
 #include "pointing_device.h"
 #include "timer.h"
+#include "wait.h"
 
 #if defined(CIRQUE_PINNACLE_TAP_ENABLE) || defined(CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE)
 static cirque_pinnacle_features_t features = {.tap_enable = true, .circular_scroll_enable = true};

From 09e4001bba6510afd0b34df154b75c17c32e2076 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 13 Jul 2022 01:10:51 -0700
Subject: [PATCH 103/959] [Bug] Fix compile issue with LED Matrix (#17658)

---
 quantum/led_matrix/led_matrix.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 75a0aba5a0..14dd0dd48a 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -619,13 +619,13 @@ void led_matrix_decrease_speed(void) {
 }
 
 void led_matrix_set_flags_eeprom_helper(led_flags_t flags, bool write_to_eeprom) {
-    led_matrix_config.flags = flags;
+    led_matrix_eeconfig.flags = flags;
     eeconfig_flag_led_matrix(write_to_eeprom);
-    dprintf("led matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_config.flags);
+    dprintf("led matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.flags);
 }
 
 led_flags_t led_matrix_get_flags(void) {
-    return led_matrix_config.flags;
+    return led_matrix_eeconfig.flags;
 }
 
 void led_matrix_set_flags(led_flags_t flags) {

From dc70ba612a929fdd365275d412e68c61836ed5b8 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 14 Jul 2022 00:41:08 +1000
Subject: [PATCH 104/959] Post-bootloader EFL/SPI fixes. (#17661)

* Fixup read address for EFL driver.

* Fixup sequencing of SPI.

* Lock during init of EFL backing store.
---
 platforms/chibios/drivers/spi_master.c                      | 1 -
 platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index de308229ef..c3ab0623f0 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -46,7 +46,6 @@ __attribute__((weak)) void spi_init(void) {
         palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), SPI_MOSI_FLAGS);
         palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), SPI_MISO_FLAGS);
 #endif
-        spiUnselect(&SPI_DRIVER);
         spiStop(&SPI_DRIVER);
         currentSlavePin = NO_PIN;
     }
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c
index 4b5639ee4a..cdd1e26a7d 100644
--- a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c
@@ -43,6 +43,9 @@ bool backing_store_init(void) {
     bs_dprintf("Init\n");
     flash = (BaseFlash *)&EFLD1;
 
+    // Need to re-lock the EFL, as if we've just had the bootloader executing it'll already be unlocked.
+    backing_store_lock();
+
     const flash_descriptor_t *desc    = flashGetDescriptor(flash);
     uint32_t                  counter = 0;
 
@@ -132,7 +135,7 @@ bool backing_store_lock(void) {
 
 bool backing_store_read(uint32_t address, backing_store_int_t *value) {
     uint32_t             offset = (base_offset + address);
-    backing_store_int_t *loc    = (backing_store_int_t *)offset;
+    backing_store_int_t *loc    = (backing_store_int_t *)flashGetOffsetAddress(flash, offset);
     *value                      = ~(*loc);
     bs_dprintf("Read  ");
     wl_dump(offset, value, sizeof(backing_store_int_t));

From 3c58f989295e17d03b66db9a154e02cde7336ece Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 14 Jul 2022 11:50:00 +0200
Subject: [PATCH 105/959] [Core] PMW33XX drivers overhaul (#17613)

* PMW33XX drivers overhaul

This combines the PMW3389 and PM3360 drivers as they only differ in the
firmware blobs and CPI get and set functions. The following changes have
been made:

* PMW3389 now gets the same multi-sensor feature that is already available on the
  PMW3360.

* Introduced a shared pmw33xx_report_t struct is now directly readable via SPI
  transactions instead of individual byte-sized reads, saving multiple
  copies and bitshift operations.

* pmw33(89/60)_get_report functions had unreachable branches in their motion
  detection logic these have been simplied as much as possible.

* The fast firmware upload option has been removed as this becomes obsolete by
  the newly introduced polled waiting functions for ChibiOS polled waiting

* PMW33(60/89)_SPI_LSBFIRST and PMW33(60/89)_SPI_MODE config options
  have been removed as they don't need to be configurable.

* All PMW3389 and PMW3360 defines have been unified to a PMW33XX prefix
  to reduce code duplication and make the defines interchangeable

* Adjust keyboards to PMW33XX naming scheme
---
 builddefs/common_features.mk                  |   6 +-
 docs/feature_pointing_device.md               |  83 +--
 drivers/sensors/pmw3360.c                     | 579 ++++++++---------
 drivers/sensors/pmw3360.h                     | 134 ++--
 drivers/sensors/pmw3360_firmware.h            | 288 ---------
 drivers/sensors/pmw3389.c                     | 580 +++++++++---------
 drivers/sensors/pmw3389.h                     | 135 ++--
 drivers/sensors/pmw3389_firmware.h            | 307 ---------
 drivers/sensors/pmw33xx_common.c              | 218 +++++++
 drivers/sensors/pmw33xx_common.h              | 145 +++++
 keyboards/bastardkb/charybdis/3x5/config.h    |   4 +-
 .../charybdis/3x5/keymaps/drashna/config.h    |   6 +-
 keyboards/bastardkb/charybdis/4x6/config.h    |   4 +-
 .../charybdis/4x6/keymaps/drashna/config.h    |   8 +-
 keyboards/bbrfkr/dynamis/config.h             |   2 +-
 .../tractyl_manuform/4x6_right/config.h       |   4 +-
 .../tractyl_manuform/4x6_right/info.json      |   2 +-
 .../5x6_right/elite_c/config.h                |   4 +-
 .../tractyl_manuform/5x6_right/f303/config.h  |   5 +-
 .../tractyl_manuform/5x6_right/f411/config.h  |   5 +-
 .../5x6_right/teensy2pp/config.h              |   4 +-
 keyboards/oddball/config.h                    |   2 +-
 keyboards/ploopyco/mouse/config.h             |   4 +-
 keyboards/ploopyco/trackball/config.h         |   4 +-
 quantum/pointing_device.h                     |   7 +-
 quantum/pointing_device_drivers.c             |  95 +--
 26 files changed, 1179 insertions(+), 1456 deletions(-)
 delete mode 100644 drivers/sensors/pmw3360_firmware.h
 delete mode 100644 drivers/sensors/pmw3389_firmware.h
 create mode 100644 drivers/sensors/pmw33xx_common.c
 create mode 100644 drivers/sensors/pmw33xx_common.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 01dbdc3330..d7a00ba944 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -161,11 +161,9 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
             OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE
             QUANTUM_LIB_SRC += i2c_master.c
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3360)
-            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
-            QUANTUM_LIB_SRC += spi_master.c
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3389)
+        else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),)
             OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
+            SRC += drivers/sensors/pmw33xx_common.c
             QUANTUM_LIB_SRC += spi_master.c
         endif
     endif
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 70129dfc9a..607c74c562 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -154,54 +154,61 @@ The Pimoroni Trackball module is a I2C based breakout board with an RGB enable t
 |`PIMORONI_TRACKBALL_DEBOUNCE_CYCLES` | (Optional) The number of scan cycles used for debouncing on the ball press.        | `20`    |
 |`PIMORONI_TRACKBALL_ERROR_COUNT`     | (Optional) Specifies the number of read/write errors until the sensor is disabled. | `10`    |
 
-### PMW 3360 Sensor
+### PMW 3360 and PMW 3389 Sensor
 
-This drivers supports multiple sensors _per_ controller, so 2 can be attached at the same side for split keyboards (or unsplit keyboards).
-To use the PMW 3360 sensor, add this to your `rules.mk`
+This drivers supports both the PMW 3360 and PMW 3389 sensor as well as multiple sensors of the same type _per_ controller, so 2 can be attached at the same side for split keyboards (or unsplit keyboards).
+
+To use the **PMW 3360** sensor, add this to your `rules.mk`
 
 ```make
 POINTING_DEVICE_DRIVER = pmw3360
 ```
 
-The PMW 3360 is an SPI driven optical sensor, that uses a built in IR LED for surface tracking.
-
-| Setting                     | Description                                                                                | Default       |
-|-----------------------------|--------------------------------------------------------------------------------------------|---------------|
-|`PMW3360_CS_PIN`                 | (Required) Sets the Cable Select pin connected to the sensor.                              | _not defined_ |
-|`PMW3360_CS_PINS`                | (Alternative) Sets the Cable Select pins connected to multiple sensors.                    | _not defined_ |
-|`PMW3360_CLOCK_SPEED`            | (Optional) Sets the clock speed that the sensor runs at.                                   | `2000000`     |
-|`PMW3360_SPI_LSBFIRST`           | (Optional) Sets the Least/Most Significant Byte First setting for SPI.                     | `false`       |
-|`PMW3360_SPI_MODE`               | (Optional) Sets the SPI Mode for the sensor.                                               | `3`           |
-|`PMW3360_SPI_DIVISOR`            | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
-|`PMW3360_LIFTOFF_DISTANCE`       | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
-|`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor.| `0`           |
-|`PMW3360_FIRMWARE_UPLOAD_FAST`   | (Optional) Skips the 15us wait between firmware blocks.                                    | _not defined_ |
-
 The CPI range is 100-12000, in increments of 100. Defaults to 1600 CPI.
 
-To use multiple sensors, instead of setting `PMW3360_CS_PIN` you need to set `PMW3360_CS_PINS` and also handle and merge the read from this sensor in user code.
+To use the **PMW 3389** sensor, add this to your `rules.mk`
+
+```make
+POINTING_DEVICE_DRIVER = pmw3389
+```
+
+The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
+
+Both PMW 3360 and PMW 3389 are SPI driven optical sensors, that use a built in IR LED for surface tracking.
+
+| Setting                      | Description                                                                                 | Default       |
+| ---------------------------- | ------------------------------------------------------------------------------------------- | ------------- |
+| `PMW33XX_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                               | _not defined_ |
+| `PMW33XX_CS_PINS`            | (Alternative) Sets the Cable Select pins connected to multiple sensors.                     | _not defined_ |
+| `PMW33XX_CPI`                | (Optional) Sets counts per inch sensitivity of the sensor.                                  | _varies_      |
+| `PMW33XX_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                    | `2000000`     |
+| `PMW33XX_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                 | _varies_      |
+| `PMW33XX_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                           | `0x02`        |
+| `ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`           |
+
+To use multiple sensors, instead of setting `PMW33XX_CS_PIN` you need to set `PMW33XX_CS_PINS` and also handle and merge the read from this sensor in user code.
 Note that different (per sensor) values of CPI, speed liftoff, rotational angle or flipping of X/Y is not currently supported.
 
 ```c
 // in config.h:
-#define PMW3360_CS_PINS { B5, B6 }
-
+#define PMW33XX_CS_PINS { B5, B6 }
 // in keyboard.c:
 #ifdef POINTING_DEVICE_ENABLE
 void pointing_device_init_kb(void) {
-    pmw3360_init(1);  // index 1 is the second device.
-    pointing_device_set_cpi(800);  // applies to both sensors
+    pmw33xx_init(1);         // index 1 is the second device.
+    pmw33xx_set_cpi(0, 800); // applies to first sensor
+    pmw33xx_set_cpi(1, 800); // applies to second sensor
     pointing_device_init_user();
 }
 
 // Contains report from sensor #0 already, need to merge in from sensor #1
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
-    report_pmw3360_t data = pmw3360_read_burst(1);
-    if (data.isOnSurface && data.isMotion) {
+    pmw33xx_report_t report = pmw33xx_read_burst(1);
+    if (!report.motion.b.is_lifted && report.motion.b.is_motion) {
 // From quantum/pointing_device_drivers.c
 #define constrain_hid(amt) ((amt) < -127 ? -127 : ((amt) > 127 ? 127 : (amt)))
-        mouse_report.x = constrain_hid(mouse_report.x + data.dx);
-        mouse_report.y = constrain_hid(mouse_report.y + data.dy);
+        mouse_report.x = constrain_hid(mouse_report.x + report.delta_x);
+        mouse_report.y = constrain_hid(mouse_report.y + report.delta_y);
     }
     return pointing_device_task_user(mouse_report);
 }
@@ -209,30 +216,6 @@ report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
 
 ```
 
-### PMW 3389 Sensor
-
-To use the PMW 3389 sensor, add this to your `rules.mk`
-
-```make
-POINTING_DEVICE_DRIVER = pmw3389
-```
-
-The PMW 3389 is an SPI driven optical sensor, that uses a built in IR LED for surface tracking.
-
-| Setting                         | Description                                                                                | Default       |
-|---------------------------------|--------------------------------------------------------------------------------------------|---------------|
-|`PMW3389_CS_PIN`                 | (Required) Sets the Cable Select pin connected to the sensor.                              | _not defined_ |
-|`PMW3389_CLOCK_SPEED`            | (Optional) Sets the clock speed that the sensor runs at.                                   | `2000000`     |
-|`PMW3389_SPI_LSBFIRST`           | (Optional) Sets the Least/Most Significant Byte First setting for SPI.                     | `false`       |
-|`PMW3389_SPI_MODE`               | (Optional) Sets the SPI Mode for the sensor.                                               | `3`           |
-|`PMW3389_SPI_DIVISOR`            | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
-|`PMW3389_LIFTOFF_DISTANCE`       | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
-|`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
-|`PMW3389_FIRMWARE_UPLOAD_FAST`   | (Optional) Skips the 15us wait between firmware blocks.                                    | _not defined_ |
-
-The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
-
-
 ### Custom Driver
 
 If you have a sensor type that isn't supported above, a custom option is available by adding the following to your `rules.mk`
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 5f4d17a3f0..2c6d91d588 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -1,291 +1,294 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- * Copyright 2022 Ulrich Spörlein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Stefan Kerkmann (KarlK90)
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// Copyright 2021 Alabastard (@Alabastard-64)
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// Copyright 2019 Sunjun Kim
+// Copyright 2020 Ploopy Corporation
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "spi_master.h"
-#include "pmw3360.h"
-#include "wait.h"
-#include "debug.h"
-#include "print.h"
-#include "pmw3360_firmware.h"
+#include "pmw33xx_common.h"
+#include "progmem.h"
 
-// Registers
+extern const size_t pmw33xx_number_of_sensors;
+
+uint16_t pmw33xx_get_cpi(uint8_t sensor) {
+    if (sensor >= pmw33xx_number_of_sensors) {
+        return 0;
+    }
+
+    uint8_t cpival = pmw33xx_read(sensor, REG_Config1);
+    return (uint16_t)((cpival + 1) & 0xFF) * PMW33XX_CPI_STEP;
+}
+
+void pmw33xx_set_cpi(uint8_t sensor, uint16_t cpi) {
+    if (sensor >= pmw33xx_number_of_sensors) {
+        return;
+    }
+
+    uint8_t cpival = CONSTRAIN((cpi / PMW33XX_CPI_STEP) - 1, 0, (PMW33XX_CPI_MAX / PMW33XX_CPI_STEP) - 1U);
+    pmw33xx_write(sensor, REG_Config1, cpival);
+}
+
+// PID, Inverse PID, SROM version
+const uint8_t pmw33xx_firmware_signature[3] PROGMEM = {0x42, 0xBD, 0x04};
+
+// Firmware Blob for PMW3360
 // clang-format off
-#define REG_Product_ID                   0x00
-#define REG_Revision_ID                  0x01
-#define REG_Motion                       0x02
-#define REG_Delta_X_L                    0x03
-#define REG_Delta_X_H                    0x04
-#define REG_Delta_Y_L                    0x05
-#define REG_Delta_Y_H                    0x06
-#define REG_SQUAL                        0x07
-#define REG_Raw_Data_Sum                 0x08
-#define REG_Maximum_Raw_data             0x09
-#define REG_Minimum_Raw_data             0x0a
-#define REG_Shutter_Lower                0x0b
-#define REG_Shutter_Upper                0x0c
-#define REG_Control                      0x0d
-#define REG_Config1                      0x0f
-#define REG_Config2                      0x10
-#define REG_Angle_Tune                   0x11
-#define REG_Frame_Capture                0x12
-#define REG_SROM_Enable                  0x13
-#define REG_Run_Downshift                0x14
-#define REG_Rest1_Rate_Lower             0x15
-#define REG_Rest1_Rate_Upper             0x16
-#define REG_Rest1_Downshift              0x17
-#define REG_Rest2_Rate_Lower             0x18
-#define REG_Rest2_Rate_Upper             0x19
-#define REG_Rest2_Downshift              0x1a
-#define REG_Rest3_Rate_Lower             0x1b
-#define REG_Rest3_Rate_Upper             0x1c
-#define REG_Observation                  0x24
-#define REG_Data_Out_Lower               0x25
-#define REG_Data_Out_Upper               0x26
-#define REG_Raw_Data_Dump                0x29
-#define REG_SROM_ID                      0x2a
-#define REG_Min_SQ_Run                   0x2b
-#define REG_Raw_Data_Threshold           0x2c
-#define REG_Config5                      0x2f
-#define REG_Power_Up_Reset               0x3a
-#define REG_Shutdown                     0x3b
-#define REG_Inverse_Product_ID           0x3f
-#define REG_LiftCutoff_Tune3             0x41
-#define REG_Angle_Snap                   0x42
-#define REG_LiftCutoff_Tune1             0x4a
-#define REG_Motion_Burst                 0x50
-#define REG_LiftCutoff_Tune_Timeout      0x58
-#define REG_LiftCutoff_Tune_Min_Length   0x5a
-#define REG_SROM_Load_Burst              0x62
-#define REG_Lift_Config                  0x63
-#define REG_Raw_Data_Burst               0x64
-#define REG_LiftCutoff_Tune2             0x65
-
-#define CPI_STEP          100
-// clang-format on
-
-// limits to 0--119, resulting in a CPI range of 100 -- 12000 (as only steps of 100 are possible).
-#ifndef MAX_CPI
-#    define MAX_CPI 0x77
-#endif
-
-static const pin_t pins[] = PMW3360_CS_PINS;
-#define NUMBER_OF_SENSORS (sizeof(pins) / sizeof(pin_t))
-
-// per-sensor driver state
-static bool _inBurst[NUMBER_OF_SENSORS] = {0};
-
-#ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) {
-    dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
-}
-#endif
-#define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
-
-bool pmw3360_spi_start(int8_t index) {
-    bool status = spi_start(pins[index], PMW3360_SPI_LSBFIRST, PMW3360_SPI_MODE, PMW3360_SPI_DIVISOR);
-    // tNCS-SCLK, 120ns
-    wait_us(1);
-    return status;
-}
-
-spi_status_t pmw3360_write(int8_t index, uint8_t reg_addr, uint8_t data) {
-    pmw3360_spi_start(index);
-
-    if (reg_addr != REG_Motion_Burst) {
-        _inBurst[index] = false;
-    }
-
-    // send address of the register, with MSBit = 1 to indicate it's a write
-    spi_status_t status = spi_write(reg_addr | 0x80);
-    status              = spi_write(data);
-
-    // tSCLK-NCS for write operation is 35us
-    wait_us(35);
-    spi_stop();
-
-    // tSWW/tSWR (=180us) minus tSCLK-NCS. Could be shortened, but it looks like a safe lower bound
-    wait_us(145);
-    return status;
-}
-
-uint8_t pmw3360_read(int8_t index, uint8_t reg_addr) {
-    pmw3360_spi_start(index);
-    // send adress of the register, with MSBit = 0 to indicate it's a read
-    spi_write(reg_addr & 0x7f);
-    // tSRAD (=160us)
-    wait_us(160);
-    uint8_t data = spi_read();
-
-    // tSCLK-NCS for read operation is 120ns
-    wait_us(1);
-    spi_stop();
-
-    //  tSRW/tSRR (=20us) minus tSCLK-NCS
-    wait_us(19);
-    return data;
-}
-
-bool pmw3360_check_signature(int8_t index) {
-    uint8_t pid      = pmw3360_read(index, REG_Product_ID);
-    uint8_t iv_pid   = pmw3360_read(index, REG_Inverse_Product_ID);
-    uint8_t SROM_ver = pmw3360_read(index, REG_SROM_ID);
-    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]); // signature for SROM 0x04
-}
-
-void pmw3360_upload_firmware(int8_t index) {
-    // Datasheet claims we need to disable REST mode first, but during startup
-    // it's already disabled and we're not turning it on ...
-    // pmw3360_write(index, REG_Config2, 0x00); // disable REST mode
-    pmw3360_write(index, REG_SROM_Enable, 0x1d);
-
-    wait_ms(10);
-
-    pmw3360_write(index, REG_SROM_Enable, 0x18);
-
-    pmw3360_spi_start(index);
-    spi_write(REG_SROM_Load_Burst | 0x80);
-    wait_us(15);
-
-    for (uint16_t i = 0; i < FIRMWARE_LENGTH; i++) {
-        spi_write(pgm_read_byte(firmware_data + i));
-#ifndef PMW3360_FIRMWARE_UPLOAD_FAST
-        wait_us(15);
-#endif
-    }
-    wait_us(200);
-
-    pmw3360_read(index, REG_SROM_ID);
-    pmw3360_write(index, REG_Config2, 0x00);
-}
-
-bool pmw3360_init(int8_t index) {
-    if (index >= NUMBER_OF_SENSORS) {
-        return false;
-    }
-    spi_init();
-
-    // power up, need to first drive NCS high then low.
-    // the datasheet does not say for how long, 40us works well in practice.
-    pmw3360_spi_start(index);
-    wait_us(40);
-    spi_stop();
-    wait_us(40);
-    pmw3360_write(index, REG_Power_Up_Reset, 0x5a);
-    wait_ms(50);
-
-    // read registers and discard
-    pmw3360_read(index, REG_Motion);
-    pmw3360_read(index, REG_Delta_X_L);
-    pmw3360_read(index, REG_Delta_X_H);
-    pmw3360_read(index, REG_Delta_Y_L);
-    pmw3360_read(index, REG_Delta_Y_H);
-
-    pmw3360_upload_firmware(index);
-
-    spi_stop();
-
-    wait_ms(10);
-    pmw3360_set_cpi(PMW3360_CPI);
-
-    wait_ms(1);
-
-    pmw3360_write(index, REG_Config2, 0x00);
-
-    pmw3360_write(index, REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
-
-    pmw3360_write(index, REG_Lift_Config, PMW3360_LIFTOFF_DISTANCE);
-
-    bool init_success = pmw3360_check_signature(index);
-#ifdef CONSOLE_ENABLE
-    if (init_success) {
-        dprintf("pmw3360 signature verified");
-    } else {
-        dprintf("pmw3360 signature verification failed!");
-    }
-#endif
-
-    return init_success;
-}
-
-// Only support reading the value from sensor #0, no one is using this anyway.
-uint16_t pmw3360_get_cpi(void) {
-    uint8_t cpival = pmw3360_read(0, REG_Config1);
-    return (uint16_t)((cpival + 1) & 0xFF) * CPI_STEP;
-}
-
-// Write same CPI to all sensors.
-void pmw3360_set_cpi(uint16_t cpi) {
-    uint8_t cpival = constrain((cpi / CPI_STEP) - 1, 0, MAX_CPI);
-    for (size_t i = 0; i < NUMBER_OF_SENSORS; i++) {
-        pmw3360_write(i, REG_Config1, cpival);
-    }
-}
-
-report_pmw3360_t pmw3360_read_burst(int8_t index) {
-    report_pmw3360_t report = {0};
-    if (index >= NUMBER_OF_SENSORS) {
-        return report;
-    }
-
-    if (!_inBurst[index]) {
-#ifdef CONSOLE_ENABLE
-        dprintf("burst on for index %d", index);
-#endif
-        pmw3360_write(index, REG_Motion_Burst, 0x00);
-        _inBurst[index] = true;
-    }
-
-    pmw3360_spi_start(index);
-    spi_write(REG_Motion_Burst);
-    wait_us(35); // waits for tSRAD_MOTBR
-
-    report.motion = spi_read();
-    spi_read(); // skip Observation
-    // delta registers
-    report.dx  = spi_read();
-    report.mdx = spi_read();
-    report.dy  = spi_read();
-    report.mdy = spi_read();
-
-    if (report.motion & 0b111) { // panic recovery, sometimes burst mode works weird.
-        _inBurst[index] = false;
-    }
-
-    spi_stop();
-
-#ifdef CONSOLE_ENABLE
-    if (debug_mouse) {
-        print_byte(report.motion);
-        print_byte(report.dx);
-        print_byte(report.mdx);
-        print_byte(report.dy);
-        print_byte(report.mdy);
-        dprintf("\n");
-    }
-#endif
-
-    report.isMotion    = (report.motion & 0x80) != 0;
-    report.isOnSurface = (report.motion & 0x08) == 0;
-    report.dx |= (report.mdx << 8);
-    report.dx = report.dx * -1;
-    report.dy |= (report.mdy << 8);
-    report.dy = report.dy * -1;
-
-    return report;
-}
+const uint8_t pmw33xx_firmware_data[PMW33XX_FIRMWARE_LENGTH] PROGMEM = {
+    0x01, 0x04, 0x8E, 0x96, 0x6E, 0x77, 0x3E, 0xFE, 0x7E, 0x5F, 0x1D, 0xB8, 0xF2, 0x66, 0x4E, 0xFF,
+    0x5D, 0x19, 0xB0, 0xC2, 0x04, 0x69, 0x54, 0x2A, 0xD6, 0x2E, 0xBF, 0xDD, 0x19, 0xB0, 0xC3, 0xE5,
+    0x29, 0xB1, 0xE0, 0x23, 0xA5, 0xA9, 0xB1, 0xC1, 0x00, 0x82, 0x67, 0x4C, 0x1A, 0x97, 0x8D, 0x79,
+    0x51, 0x20, 0xC7, 0x06, 0x8E, 0x7C, 0x7C, 0x7A, 0x76, 0x4F, 0xFD, 0x59, 0x30, 0xE2, 0x46, 0x0E,
+    0x9E, 0xBE, 0xDF, 0x1D, 0x99, 0x91, 0xA0, 0xA5, 0xA1, 0xA9, 0xD0, 0x22, 0xC6, 0xEF, 0x5C, 0x1B,
+    0x95, 0x89, 0x90, 0xA2, 0xA7, 0xCC, 0xFB, 0x55, 0x28, 0xB3, 0xE4, 0x4A, 0xF7, 0x6C, 0x3B, 0xF4,
+    0x6A, 0x56, 0x2E, 0xDE, 0x1F, 0x9D, 0xB8, 0xD3, 0x05, 0x88, 0x92, 0xA6, 0xCE, 0x1E, 0xBE, 0xDF,
+    0x1D, 0x99, 0xB0, 0xE2, 0x46, 0xEF, 0x5C, 0x07, 0x11, 0x5D, 0x98, 0x0B, 0x9D, 0x94, 0x97, 0xEE,
+    0x4E, 0x45, 0x33, 0x6B, 0x44, 0xC7, 0x29, 0x56, 0x27, 0x30, 0xC6, 0xA7, 0xD5, 0xF2, 0x56, 0xDF,
+    0xB4, 0x38, 0x62, 0xCB, 0xA0, 0xB6, 0xE3, 0x0F, 0x84, 0x06, 0x24, 0x05, 0x65, 0x6F, 0x76, 0x89,
+    0xB5, 0x77, 0x41, 0x27, 0x82, 0x66, 0x65, 0x82, 0xCC, 0xD5, 0xE6, 0x20, 0xD5, 0x27, 0x17, 0xC5,
+    0xF8, 0x03, 0x23, 0x7C, 0x5F, 0x64, 0xA5, 0x1D, 0xC1, 0xD6, 0x36, 0xCB, 0x4C, 0xD4, 0xDB, 0x66,
+    0xD7, 0x8B, 0xB1, 0x99, 0x7E, 0x6F, 0x4C, 0x36, 0x40, 0x06, 0xD6, 0xEB, 0xD7, 0xA2, 0xE4, 0xF4,
+    0x95, 0x51, 0x5A, 0x54, 0x96, 0xD5, 0x53, 0x44, 0xD7, 0x8C, 0xE0, 0xB9, 0x40, 0x68, 0xD2, 0x18,
+    0xE9, 0xDD, 0x9A, 0x23, 0x92, 0x48, 0xEE, 0x7F, 0x43, 0xAF, 0xEA, 0x77, 0x38, 0x84, 0x8C, 0x0A,
+    0x72, 0xAF, 0x69, 0xF8, 0xDD, 0xF1, 0x24, 0x83, 0xA3, 0xF8, 0x4A, 0xBF, 0xF5, 0x94, 0x13, 0xDB,
+    0xBB, 0xD8, 0xB4, 0xB3, 0xA0, 0xFB, 0x45, 0x50, 0x60, 0x30, 0x59, 0x12, 0x31, 0x71, 0xA2, 0xD3,
+    0x13, 0xE7, 0xFA, 0xE7, 0xCE, 0x0F, 0x63, 0x15, 0x0B, 0x6B, 0x94, 0xBB, 0x37, 0x83, 0x26, 0x05,
+    0x9D, 0xFB, 0x46, 0x92, 0xFC, 0x0A, 0x15, 0xD1, 0x0D, 0x73, 0x92, 0xD6, 0x8C, 0x1B, 0x8C, 0xB8,
+    0x55, 0x8A, 0xCE, 0xBD, 0xFE, 0x8E, 0xFC, 0xED, 0x09, 0x12, 0x83, 0x91, 0x82, 0x51, 0x31, 0x23,
+    0xFB, 0xB4, 0x0C, 0x76, 0xAD, 0x7C, 0xD9, 0xB4, 0x4B, 0xB2, 0x67, 0x14, 0x09, 0x9C, 0x7F, 0x0C,
+    0x18, 0xBA, 0x3B, 0xD6, 0x8E, 0x14, 0x2A, 0xE4, 0x1B, 0x52, 0x9F, 0x2B, 0x7D, 0xE1, 0xFB, 0x6A,
+    0x33, 0x02, 0xFA, 0xAC, 0x5A, 0xF2, 0x3E, 0x88, 0x7E, 0xAE, 0xD1, 0xF3, 0x78, 0xE8, 0x05, 0xD1,
+    0xE3, 0xDC, 0x21, 0xF6, 0xE1, 0x9A, 0xBD, 0x17, 0x0E, 0xD9, 0x46, 0x9B, 0x88, 0x03, 0xEA, 0xF6,
+    0x66, 0xBE, 0x0E, 0x1B, 0x50, 0x49, 0x96, 0x40, 0x97, 0xF1, 0xF1, 0xE4, 0x80, 0xA6, 0x6E, 0xE8,
+    0x77, 0x34, 0xBF, 0x29, 0x40, 0x44, 0xC2, 0xFF, 0x4E, 0x98, 0xD3, 0x9C, 0xA3, 0x32, 0x2B, 0x76,
+    0x51, 0x04, 0x09, 0xE7, 0xA9, 0xD1, 0xA6, 0x32, 0xB1, 0x23, 0x53, 0xE2, 0x47, 0xAB, 0xD6, 0xF5,
+    0x69, 0x5C, 0x3E, 0x5F, 0xFA, 0xAE, 0x45, 0x20, 0xE5, 0xD2, 0x44, 0xFF, 0x39, 0x32, 0x6D, 0xFD,
+    0x27, 0x57, 0x5C, 0xFD, 0xF0, 0xDE, 0xC1, 0xB5, 0x99, 0xE5, 0xF5, 0x1C, 0x77, 0x01, 0x75, 0xC5,
+    0x6D, 0x58, 0x92, 0xF2, 0xB2, 0x47, 0x00, 0x01, 0x26, 0x96, 0x7A, 0x30, 0xFF, 0xB7, 0xF0, 0xEF,
+    0x77, 0xC1, 0x8A, 0x5D, 0xDC, 0xC0, 0xD1, 0x29, 0x30, 0x1E, 0x77, 0x38, 0x7A, 0x94, 0xF1, 0xB8,
+    0x7A, 0x7E, 0xEF, 0xA4, 0xD1, 0xAC, 0x31, 0x4A, 0xF2, 0x5D, 0x64, 0x3D, 0xB2, 0xE2, 0xF0, 0x08,
+    0x99, 0xFC, 0x70, 0xEE, 0x24, 0xA7, 0x7E, 0xEE, 0x1E, 0x20, 0x69, 0x7D, 0x44, 0xBF, 0x87, 0x42,
+    0xDF, 0x88, 0x3B, 0x0C, 0xDA, 0x42, 0xC9, 0x04, 0xF9, 0x45, 0x50, 0xFC, 0x83, 0x8F, 0x11, 0x6A,
+    0x72, 0xBC, 0x99, 0x95, 0xF0, 0xAC, 0x3D, 0xA7, 0x3B, 0xCD, 0x1C, 0xE2, 0x88, 0x79, 0x37, 0x11,
+    0x5F, 0x39, 0x89, 0x95, 0x0A, 0x16, 0x84, 0x7A, 0xF6, 0x8A, 0xA4, 0x28, 0xE4, 0xED, 0x83, 0x80,
+    0x3B, 0xB1, 0x23, 0xA5, 0x03, 0x10, 0xF4, 0x66, 0xEA, 0xBB, 0x0C, 0x0F, 0xC5, 0xEC, 0x6C, 0x69,
+    0xC5, 0xD3, 0x24, 0xAB, 0xD4, 0x2A, 0xB7, 0x99, 0x88, 0x76, 0x08, 0xA0, 0xA8, 0x95, 0x7C, 0xD8,
+    0x38, 0x6D, 0xCD, 0x59, 0x02, 0x51, 0x4B, 0xF1, 0xB5, 0x2B, 0x50, 0xE3, 0xB6, 0xBD, 0xD0, 0x72,
+    0xCF, 0x9E, 0xFD, 0x6E, 0xBB, 0x44, 0xC8, 0x24, 0x8A, 0x77, 0x18, 0x8A, 0x13, 0x06, 0xEF, 0x97,
+    0x7D, 0xFA, 0x81, 0xF0, 0x31, 0xE6, 0xFA, 0x77, 0xED, 0x31, 0x06, 0x31, 0x5B, 0x54, 0x8A, 0x9F,
+    0x30, 0x68, 0xDB, 0xE2, 0x40, 0xF8, 0x4E, 0x73, 0xFA, 0xAB, 0x74, 0x8B, 0x10, 0x58, 0x13, 0xDC,
+    0xD2, 0xE6, 0x78, 0xD1, 0x32, 0x2E, 0x8A, 0x9F, 0x2C, 0x58, 0x06, 0x48, 0x27, 0xC5, 0xA9, 0x5E,
+    0x81, 0x47, 0x89, 0x46, 0x21, 0x91, 0x03, 0x70, 0xA4, 0x3E, 0x88, 0x9C, 0xDA, 0x33, 0x0A, 0xCE,
+    0xBC, 0x8B, 0x8E, 0xCF, 0x9F, 0xD3, 0x71, 0x80, 0x43, 0xCF, 0x6B, 0xA9, 0x51, 0x83, 0x76, 0x30,
+    0x82, 0xC5, 0x6A, 0x85, 0x39, 0x11, 0x50, 0x1A, 0x82, 0xDC, 0x1E, 0x1C, 0xD5, 0x7D, 0xA9, 0x71,
+    0x99, 0x33, 0x47, 0x19, 0x97, 0xB3, 0x5A, 0xB1, 0xDF, 0xED, 0xA4, 0xF2, 0xE6, 0x26, 0x84, 0xA2,
+    0x28, 0x9A, 0x9E, 0xDF, 0xA6, 0x6A, 0xF4, 0xD6, 0xFC, 0x2E, 0x5B, 0x9D, 0x1A, 0x2A, 0x27, 0x68,
+    0xFB, 0xC1, 0x83, 0x21, 0x4B, 0x90, 0xE0, 0x36, 0xDD, 0x5B, 0x31, 0x42, 0x55, 0xA0, 0x13, 0xF7,
+    0xD0, 0x89, 0x53, 0x71, 0x99, 0x57, 0x09, 0x29, 0xC5, 0xF3, 0x21, 0xF8, 0x37, 0x2F, 0x40, 0xF3,
+    0xD4, 0xAF, 0x16, 0x08, 0x36, 0x02, 0xFC, 0x77, 0xC5, 0x8B, 0x04, 0x90, 0x56, 0xB9, 0xC9, 0x67,
+    0x9A, 0x99, 0xE8, 0x00, 0xD3, 0x86, 0xFF, 0x97, 0x2D, 0x08, 0xE9, 0xB7, 0xB3, 0x91, 0xBC, 0xDF,
+    0x45, 0xC6, 0xED, 0x0F, 0x8C, 0x4C, 0x1E, 0xE6, 0x5B, 0x6E, 0x38, 0x30, 0xE4, 0xAA, 0xE3, 0x95,
+    0xDE, 0xB9, 0xE4, 0x9A, 0xF5, 0xB2, 0x55, 0x9A, 0x87, 0x9B, 0xF6, 0x6A, 0xB2, 0xF2, 0x77, 0x9A,
+    0x31, 0xF4, 0x7A, 0x31, 0xD1, 0x1D, 0x04, 0xC0, 0x7C, 0x32, 0xA2, 0x9E, 0x9A, 0xF5, 0x62, 0xF8,
+    0x27, 0x8D, 0xBF, 0x51, 0xFF, 0xD3, 0xDF, 0x64, 0x37, 0x3F, 0x2A, 0x6F, 0x76, 0x3A, 0x7D, 0x77,
+    0x06, 0x9E, 0x77, 0x7F, 0x5E, 0xEB, 0x32, 0x51, 0xF9, 0x16, 0x66, 0x9A, 0x09, 0xF3, 0xB0, 0x08,
+    0xA4, 0x70, 0x96, 0x46, 0x30, 0xFF, 0xDA, 0x4F, 0xE9, 0x1B, 0xED, 0x8D, 0xF8, 0x74, 0x1F, 0x31,
+    0x92, 0xB3, 0x73, 0x17, 0x36, 0xDB, 0x91, 0x30, 0xD6, 0x88, 0x55, 0x6B, 0x34, 0x77, 0x87, 0x7A,
+    0xE7, 0xEE, 0x06, 0xC6, 0x1C, 0x8C, 0x19, 0x0C, 0x48, 0x46, 0x23, 0x5E, 0x9C, 0x07, 0x5C, 0xBF,
+    0xB4, 0x7E, 0xD6, 0x4F, 0x74, 0x9C, 0xE2, 0xC5, 0x50, 0x8B, 0xC5, 0x8B, 0x15, 0x90, 0x60, 0x62,
+    0x57, 0x29, 0xD0, 0x13, 0x43, 0xA1, 0x80, 0x88, 0x91, 0x00, 0x44, 0xC7, 0x4D, 0x19, 0x86, 0xCC,
+    0x2F, 0x2A, 0x75, 0x5A, 0xFC, 0xEB, 0x97, 0x2A, 0x70, 0xE3, 0x78, 0xD8, 0x91, 0xB0, 0x4F, 0x99,
+    0x07, 0xA3, 0x95, 0xEA, 0x24, 0x21, 0xD5, 0xDE, 0x51, 0x20, 0x93, 0x27, 0x0A, 0x30, 0x73, 0xA8,
+    0xFF, 0x8A, 0x97, 0xE9, 0xA7, 0x6A, 0x8E, 0x0D, 0xE8, 0xF0, 0xDF, 0xEC, 0xEA, 0xB4, 0x6C, 0x1D,
+    0x39, 0x2A, 0x62, 0x2D, 0x3D, 0x5A, 0x8B, 0x65, 0xF8, 0x90, 0x05, 0x2E, 0x7E, 0x91, 0x2C, 0x78,
+    0xEF, 0x8E, 0x7A, 0xC1, 0x2F, 0xAC, 0x78, 0xEE, 0xAF, 0x28, 0x45, 0x06, 0x4C, 0x26, 0xAF, 0x3B,
+    0xA2, 0xDB, 0xA3, 0x93, 0x06, 0xB5, 0x3C, 0xA5, 0xD8, 0xEE, 0x8F, 0xAF, 0x25, 0xCC, 0x3F, 0x85,
+    0x68, 0x48, 0xA9, 0x62, 0xCC, 0x97, 0x8F, 0x7F, 0x2A, 0xEA, 0xE0, 0x15, 0x0A, 0xAD, 0x62, 0x07,
+    0xBD, 0x45, 0xF8, 0x41, 0xD8, 0x36, 0xCB, 0x4C, 0xDB, 0x6E, 0xE6, 0x3A, 0xE7, 0xDA, 0x15, 0xE9,
+    0x29, 0x1E, 0x12, 0x10, 0xA0, 0x14, 0x2C, 0x0E, 0x3D, 0xF4, 0xBF, 0x39, 0x41, 0x92, 0x75, 0x0B,
+    0x25, 0x7B, 0xA3, 0xCE, 0x39, 0x9C, 0x15, 0x64, 0xC8, 0xFA, 0x3D, 0xEF, 0x73, 0x27, 0xFE, 0x26,
+    0x2E, 0xCE, 0xDA, 0x6E, 0xFD, 0x71, 0x8E, 0xDD, 0xFE, 0x76, 0xEE, 0xDC, 0x12, 0x5C, 0x02, 0xC5,
+    0x3A, 0x4E, 0x4E, 0x4F, 0xBF, 0xCA, 0x40, 0x15, 0xC7, 0x6E, 0x8D, 0x41, 0xF1, 0x10, 0xE0, 0x4F,
+    0x7E, 0x97, 0x7F, 0x1C, 0xAE, 0x47, 0x8E, 0x6B, 0xB1, 0x25, 0x31, 0xB0, 0x73, 0xC7, 0x1B, 0x97,
+    0x79, 0xF9, 0x80, 0xD3, 0x66, 0x22, 0x30, 0x07, 0x74, 0x1E, 0xE4, 0xD0, 0x80, 0x21, 0xD6, 0xEE,
+    0x6B, 0x6C, 0x4F, 0xBF, 0xF5, 0xB7, 0xD9, 0x09, 0x87, 0x2F, 0xA9, 0x14, 0xBE, 0x27, 0xD9, 0x72,
+    0x50, 0x01, 0xD4, 0x13, 0x73, 0xA6, 0xA7, 0x51, 0x02, 0x75, 0x25, 0xE1, 0xB3, 0x45, 0x34, 0x7D,
+    0xA8, 0x8E, 0xEB, 0xF3, 0x16, 0x49, 0xCB, 0x4F, 0x8C, 0xA1, 0xB9, 0x36, 0x85, 0x39, 0x75, 0x5D,
+    0x08, 0x00, 0xAE, 0xEB, 0xF6, 0xEA, 0xD7, 0x13, 0x3A, 0x21, 0x5A, 0x5F, 0x30, 0x84, 0x52, 0x26,
+    0x95, 0xC9, 0x14, 0xF2, 0x57, 0x55, 0x6B, 0xB1, 0x10, 0xC2, 0xE1, 0xBD, 0x3B, 0x51, 0xC0, 0xB7,
+    0x55, 0x4C, 0x71, 0x12, 0x26, 0xC7, 0x0D, 0xF9, 0x51, 0xA4, 0x38, 0x02, 0x05, 0x7F, 0xB8, 0xF1,
+    0x72, 0x4B, 0xBF, 0x71, 0x89, 0x14, 0xF3, 0x77, 0x38, 0xD9, 0x71, 0x24, 0xF3, 0x00, 0x11, 0xA1,
+    0xD8, 0xD4, 0x69, 0x27, 0x08, 0x37, 0x35, 0xC9, 0x11, 0x9D, 0x90, 0x1C, 0x0E, 0xE7, 0x1C, 0xFF,
+    0x2D, 0x1E, 0xE8, 0x92, 0xE1, 0x18, 0x10, 0x95, 0x7C, 0xE0, 0x80, 0xF4, 0x96, 0x43, 0x21, 0xF9,
+    0x75, 0x21, 0x64, 0x38, 0xDD, 0x9F, 0x1E, 0x95, 0x16, 0xDA, 0x56, 0x1D, 0x4F, 0x9A, 0x53, 0xB2,
+    0xE2, 0xE4, 0x18, 0xCB, 0x6B, 0x1A, 0x65, 0xEB, 0x56, 0xC6, 0x3B, 0xE5, 0xFE, 0xD8, 0x26, 0x3F,
+    0x3A, 0x84, 0x59, 0x72, 0x66, 0xA2, 0xF3, 0x75, 0xFF, 0xFB, 0x60, 0xB3, 0x22, 0xAD, 0x3F, 0x2D,
+    0x6B, 0xF9, 0xEB, 0xEA, 0x05, 0x7C, 0xD8, 0x8F, 0x6D, 0x2C, 0x98, 0x9E, 0x2B, 0x93, 0xF1, 0x5E,
+    0x46, 0xF0, 0x87, 0x49, 0x29, 0x73, 0x68, 0xD7, 0x7F, 0xF9, 0xF0, 0xE5, 0x7D, 0xDB, 0x1D, 0x75,
+    0x19, 0xF3, 0xC4, 0x58, 0x9B, 0x17, 0x88, 0xA8, 0x92, 0xE0, 0xBE, 0xBD, 0x8B, 0x1D, 0x8D, 0x9F,
+    0x56, 0x76, 0xAD, 0xAF, 0x29, 0xE2, 0xD9, 0xD5, 0x52, 0xF6, 0xB5, 0x56, 0x35, 0x57, 0x3A, 0xC8,
+    0xE1, 0x56, 0x43, 0x19, 0x94, 0xD3, 0x04, 0x9B, 0x6D, 0x35, 0xD8, 0x0B, 0x5F, 0x4D, 0x19, 0x8E,
+    0xEC, 0xFA, 0x64, 0x91, 0x0A, 0x72, 0x20, 0x2B, 0xBC, 0x1A, 0x4A, 0xFE, 0x8B, 0xFD, 0xBB, 0xED,
+    0x1B, 0x23, 0xEA, 0xAD, 0x72, 0x82, 0xA1, 0x29, 0x99, 0x71, 0xBD, 0xF0, 0x95, 0xC1, 0x03, 0xDD,
+    0x7B, 0xC2, 0xB2, 0x3C, 0x28, 0x54, 0xD3, 0x68, 0xA4, 0x72, 0xC8, 0x66, 0x96, 0xE0, 0xD1, 0xD8,
+    0x7F, 0xF8, 0xD1, 0x26, 0x2B, 0xF7, 0xAD, 0xBA, 0x55, 0xCA, 0x15, 0xB9, 0x32, 0xC3, 0xE5, 0x88,
+    0x97, 0x8E, 0x5C, 0xFB, 0x92, 0x25, 0x8B, 0xBF, 0xA2, 0x45, 0x55, 0x7A, 0xA7, 0x6F, 0x8B, 0x57,
+    0x5B, 0xCF, 0x0E, 0xCB, 0x1D, 0xFB, 0x20, 0x82, 0x77, 0xA8, 0x8C, 0xCC, 0x16, 0xCE, 0x1D, 0xFA,
+    0xDE, 0xCC, 0x0B, 0x62, 0xFE, 0xCC, 0xE1, 0xB7, 0xF0, 0xC3, 0x81, 0x64, 0x73, 0x40, 0xA0, 0xC2,
+    0x4D, 0x89, 0x11, 0x75, 0x33, 0x55, 0x33, 0x8D, 0xE8, 0x4A, 0xFD, 0xEA, 0x6E, 0x30, 0x0B, 0xD7,
+    0x31, 0x2C, 0xDE, 0x47, 0xE3, 0xBF, 0xF8, 0x55, 0x42, 0xE2, 0x7F, 0x59, 0xE5, 0x17, 0xEF, 0x99,
+    0x34, 0x69, 0x91, 0xB1, 0x23, 0x8E, 0x20, 0x87, 0x2D, 0xA8, 0xFE, 0xD5, 0x8A, 0xF3, 0x84, 0x3A,
+    0xF0, 0x37, 0xE4, 0x09, 0x00, 0x54, 0xEE, 0x67, 0x49, 0x93, 0xE4, 0x81, 0x70, 0xE3, 0x90, 0x4D,
+    0xEF, 0xFE, 0x41, 0xB7, 0x99, 0x7B, 0xC1, 0x83, 0xBA, 0x62, 0x12, 0x6F, 0x7D, 0xDE, 0x6B, 0xAF,
+    0xDA, 0x16, 0xF9, 0x55, 0x51, 0xEE, 0xA6, 0x0C, 0x2B, 0x02, 0xA3, 0xFD, 0x8D, 0xFB, 0x30, 0x17,
+    0xE4, 0x6F, 0xDF, 0x36, 0x71, 0xC4, 0xCA, 0x87, 0x25, 0x48, 0xB0, 0x47, 0xEC, 0xEA, 0xB4, 0xBF,
+    0xA5, 0x4D, 0x9B, 0x9F, 0x02, 0x93, 0xC4, 0xE3, 0xE4, 0xE8, 0x42, 0x2D, 0x68, 0x81, 0x15, 0x0A,
+    0xEB, 0x84, 0x5B, 0xD6, 0xA8, 0x74, 0xFB, 0x7D, 0x1D, 0xCB, 0x2C, 0xDA, 0x46, 0x2A, 0x76, 0x62,
+    0xCE, 0xBC, 0x5C, 0x9E, 0x8B, 0xE7, 0xCF, 0xBE, 0x78, 0xF5, 0x7C, 0xEB, 0xB3, 0x3A, 0x9C, 0xAA,
+    0x6F, 0xCC, 0x72, 0xD1, 0x59, 0xF2, 0x11, 0x23, 0xD6, 0x3F, 0x48, 0xD1, 0xB7, 0xCE, 0xB0, 0xBF,
+    0xCB, 0xEA, 0x80, 0xDE, 0x57, 0xD4, 0x5E, 0x97, 0x2F, 0x75, 0xD1, 0x50, 0x8E, 0x80, 0x2C, 0x66,
+    0x79, 0xBF, 0x72, 0x4B, 0xBD, 0x8A, 0x81, 0x6C, 0xD3, 0xE1, 0x01, 0xDC, 0xD2, 0x15, 0x26, 0xC5,
+    0x36, 0xDA, 0x2C, 0x1A, 0xC0, 0x27, 0x94, 0xED, 0xB7, 0x9B, 0x85, 0x0B, 0x5E, 0x80, 0x97, 0xC5,
+    0xEC, 0x4F, 0xEC, 0x88, 0x5D, 0x50, 0x07, 0x35, 0x47, 0xDC, 0x0B, 0x3B, 0x3D, 0xDD, 0x60, 0xAF,
+    0xA8, 0x5D, 0x81, 0x38, 0x24, 0x25, 0x5D, 0x5C, 0x15, 0xD1, 0xDE, 0xB3, 0xAB, 0xEC, 0x05, 0x69,
+    0xEF, 0x83, 0xED, 0x57, 0x54, 0xB8, 0x64, 0x64, 0x11, 0x16, 0x32, 0x69, 0xDA, 0x9F, 0x2D, 0x7F,
+    0x36, 0xBB, 0x44, 0x5A, 0x34, 0xE8, 0x7F, 0xBF, 0x03, 0xEB, 0x00, 0x7F, 0x59, 0x68, 0x22, 0x79,
+    0xCF, 0x73, 0x6C, 0x2C, 0x29, 0xA7, 0xA1, 0x5F, 0x38, 0xA1, 0x1D, 0xF0, 0x20, 0x53, 0xE0, 0x1A,
+    0x63, 0x14, 0x58, 0x71, 0x10, 0xAA, 0x08, 0x0C, 0x3E, 0x16, 0x1A, 0x60, 0x22, 0x82, 0x7F, 0xBA,
+    0xA4, 0x43, 0xA0, 0xD0, 0xAC, 0x1B, 0xD5, 0x6B, 0x64, 0xB5, 0x14, 0x93, 0x31, 0x9E, 0x53, 0x50,
+    0xD0, 0x57, 0x66, 0xEE, 0x5A, 0x4F, 0xFB, 0x03, 0x2A, 0x69, 0x58, 0x76, 0xF1, 0x83, 0xF7, 0x4E,
+    0xBA, 0x8C, 0x42, 0x06, 0x60, 0x5D, 0x6D, 0xCE, 0x60, 0x88, 0xAE, 0xA4, 0xC3, 0xF1, 0x03, 0xA5,
+    0x4B, 0x98, 0xA1, 0xFF, 0x67, 0xE1, 0xAC, 0xA2, 0xB8, 0x62, 0xD7, 0x6F, 0xA0, 0x31, 0xB4, 0xD2,
+    0x77, 0xAF, 0x21, 0x10, 0x06, 0xC6, 0x9A, 0xFF, 0x1D, 0x09, 0x17, 0x0E, 0x5F, 0xF1, 0xAA, 0x54,
+    0x34, 0x4B, 0x45, 0x8A, 0x87, 0x63, 0xA6, 0xDC, 0xF9, 0x24, 0x30, 0x67, 0xC6, 0xB2, 0xD6, 0x61,
+    0x33, 0x69, 0xEE, 0x50, 0x61, 0x57, 0x28, 0xE7, 0x7E, 0xEE, 0xEC, 0x3A, 0x5A, 0x73, 0x4E, 0xA8,
+    0x8D, 0xE4, 0x18, 0xEA, 0xEC, 0x41, 0x64, 0xC8, 0xE2, 0xE8, 0x66, 0xB6, 0x2D, 0xB6, 0xFB, 0x6A,
+    0x6C, 0x16, 0xB3, 0xDD, 0x46, 0x43, 0xB9, 0x73, 0x00, 0x6A, 0x71, 0xED, 0x4E, 0x9D, 0x25, 0x1A,
+    0xC3, 0x3C, 0x4A, 0x95, 0x15, 0x99, 0x35, 0x81, 0x14, 0x02, 0xD6, 0x98, 0x9B, 0xEC, 0xD8, 0x23,
+    0x3B, 0x84, 0x29, 0xAF, 0x0C, 0x99, 0x83, 0xA6, 0x9A, 0x34, 0x4F, 0xFA, 0xE8, 0xD0, 0x3C, 0x4B,
+    0xD0, 0xFB, 0xB6, 0x68, 0xB8, 0x9E, 0x8F, 0xCD, 0xF7, 0x60, 0x2D, 0x7A, 0x22, 0xE5, 0x7D, 0xAB,
+    0x65, 0x1B, 0x95, 0xA7, 0xA8, 0x7F, 0xB6, 0x77, 0x47, 0x7B, 0x5F, 0x8B, 0x12, 0x72, 0xD0, 0xD4,
+    0x91, 0xEF, 0xDE, 0x19, 0x50, 0x3C, 0xA7, 0x8B, 0xC4, 0xA9, 0xB3, 0x23, 0xCB, 0x76, 0xE6, 0x81,
+    0xF0, 0xC1, 0x04, 0x8F, 0xA3, 0xB8, 0x54, 0x5B, 0x97, 0xAC, 0x19, 0xFF, 0x3F, 0x55, 0x27, 0x2F,
+    0xE0, 0x1D, 0x42, 0x9B, 0x57, 0xFC, 0x4B, 0x4E, 0x0F, 0xCE, 0x98, 0xA9, 0x43, 0x57, 0x03, 0xBD,
+    0xE7, 0xC8, 0x94, 0xDF, 0x6E, 0x36, 0x73, 0x32, 0xB4, 0xEF, 0x2E, 0x85, 0x7A, 0x6E, 0xFC, 0x6C,
+    0x18, 0x82, 0x75, 0x35, 0x90, 0x07, 0xF3, 0xE4, 0x9F, 0x3E, 0xDC, 0x68, 0xF3, 0xB5, 0xF3, 0x19,
+    0x80, 0x92, 0x06, 0x99, 0xA2, 0xE8, 0x6F, 0xFF, 0x2E, 0x7F, 0xAE, 0x42, 0xA4, 0x5F, 0xFB, 0xD4,
+    0x0E, 0x81, 0x2B, 0xC3, 0x04, 0xFF, 0x2B, 0xB3, 0x74, 0x4E, 0x36, 0x5B, 0x9C, 0x15, 0x00, 0xC6,
+    0x47, 0x2B, 0xE8, 0x8B, 0x3D, 0xF1, 0x9C, 0x03, 0x9A, 0x58, 0x7F, 0x9B, 0x9C, 0xBF, 0x85, 0x49,
+    0x79, 0x35, 0x2E, 0x56, 0x7B, 0x41, 0x14, 0x39, 0x47, 0x83, 0x26, 0xAA, 0x07, 0x89, 0x98, 0x11,
+    0x1B, 0x86, 0xE7, 0x73, 0x7A, 0xD8, 0x7D, 0x78, 0x61, 0x53, 0xE9, 0x79, 0xF5, 0x36, 0x8D, 0x44,
+    0x92, 0x84, 0xF9, 0x13, 0x50, 0x58, 0x3B, 0xA4, 0x6A, 0x36, 0x65, 0x49, 0x8E, 0x3C, 0x0E, 0xF1,
+    0x6F, 0xD2, 0x84, 0xC4, 0x7E, 0x8E, 0x3F, 0x39, 0xAE, 0x7C, 0x84, 0xF1, 0x63, 0x37, 0x8E, 0x3C,
+    0xCC, 0x3E, 0x44, 0x81, 0x45, 0xF1, 0x4B, 0xB9, 0xED, 0x6B, 0x36, 0x5D, 0xBB, 0x20, 0x60, 0x1A,
+    0x0F, 0xA3, 0xAA, 0x55, 0x77, 0x3A, 0xA9, 0xAE, 0x37, 0x4D, 0xBA, 0xB8, 0x86, 0x6B, 0xBC, 0x08,
+    0x50, 0xF6, 0xCC, 0xA4, 0xBD, 0x1D, 0x40, 0x72, 0xA5, 0x86, 0xFA, 0xE2, 0x10, 0xAE, 0x3D, 0x58,
+    0x4B, 0x97, 0xF3, 0x43, 0x74, 0xA9, 0x9E, 0xEB, 0x21, 0xB7, 0x01, 0xA4, 0x86, 0x93, 0x97, 0xEE,
+    0x2F, 0x4F, 0x3B, 0x86, 0xA1, 0x41, 0x6F, 0x41, 0x26, 0x90, 0x78, 0x5C, 0x7F, 0x30, 0x38, 0x4B,
+    0x3F, 0xAA, 0xEC, 0xED, 0x5C, 0x6F, 0x0E, 0xAD, 0x43, 0x87, 0xFD, 0x93, 0x35, 0xE6, 0x01, 0xEF,
+    0x41, 0x26, 0x90, 0x99, 0x9E, 0xFB, 0x19, 0x5B, 0xAD, 0xD2, 0x91, 0x8A, 0xE0, 0x46, 0xAF, 0x65,
+    0xFA, 0x4F, 0x84, 0xC1, 0xA1, 0x2D, 0xCF, 0x45, 0x8B, 0xD3, 0x85, 0x50, 0x55, 0x7C, 0xF9, 0x67,
+    0x88, 0xD4, 0x4E, 0xE9, 0xD7, 0x6B, 0x61, 0x54, 0xA1, 0xA4, 0xA6, 0xA2, 0xC2, 0xBF, 0x30, 0x9C,
+    0x40, 0x9F, 0x5F, 0xD7, 0x69, 0x2B, 0x24, 0x82, 0x5E, 0xD9, 0xD6, 0xA7, 0x12, 0x54, 0x1A, 0xF7,
+    0x55, 0x9F, 0x76, 0x50, 0xA9, 0x95, 0x84, 0xE6, 0x6B, 0x6D, 0xB5, 0x96, 0x54, 0xD6, 0xCD, 0xB3,
+    0xA1, 0x9B, 0x46, 0xA7, 0x94, 0x4D, 0xC4, 0x94, 0xB4, 0x98, 0xE3, 0xE1, 0xE2, 0x34, 0xD5, 0x33,
+    0x16, 0x07, 0x54, 0xCD, 0xB7, 0x77, 0x53, 0xDB, 0x4F, 0x4D, 0x46, 0x9D, 0xE9, 0xD4, 0x9C, 0x8A,
+    0x36, 0xB6, 0xB8, 0x38, 0x26, 0x6C, 0x0E, 0xFF, 0x9C, 0x1B, 0x43, 0x8B, 0x80, 0xCC, 0xB9, 0x3D,
+    0xDA, 0xC7, 0xF1, 0x8A, 0xF2, 0x6D, 0xB8, 0xD7, 0x74, 0x2F, 0x7E, 0x1E, 0xB7, 0xD3, 0x4A, 0xB4,
+    0xAC, 0xFC, 0x79, 0x48, 0x6C, 0xBC, 0x96, 0xB6, 0x94, 0x46, 0x57, 0x2D, 0xB0, 0xA3, 0xFC, 0x1E,
+    0xB9, 0x52, 0x60, 0x85, 0x2D, 0x41, 0xD0, 0x43, 0x01, 0x1E, 0x1C, 0xD5, 0x7D, 0xFC, 0xF3, 0x96,
+    0x0D, 0xC7, 0xCB, 0x2A, 0x29, 0x9A, 0x93, 0xDD, 0x88, 0x2D, 0x37, 0x5D, 0xAA, 0xFB, 0x49, 0x68,
+    0xA0, 0x9C, 0x50, 0x86, 0x7F, 0x68, 0x56, 0x57, 0xF9, 0x79, 0x18, 0x39, 0xD4, 0xE0, 0x01, 0x84,
+    0x33, 0x61, 0xCA, 0xA5, 0xD2, 0xD6, 0xE4, 0xC9, 0x8A, 0x4A, 0x23, 0x44, 0x4E, 0xBC, 0xF0, 0xDC,
+    0x24, 0xA1, 0xA0, 0xC4, 0xE2, 0x07, 0x3C, 0x10, 0xC4, 0xB5, 0x25, 0x4B, 0x65, 0x63, 0xF4, 0x80,
+    0xE7, 0xCF, 0x61, 0xB1, 0x71, 0x82, 0x21, 0x87, 0x2C, 0xF5, 0x91, 0x00, 0x32, 0x0C, 0xEC, 0xA9,
+    0xB5, 0x9A, 0x74, 0x85, 0xE3, 0x36, 0x8F, 0x76, 0x4F, 0x9C, 0x6D, 0xCE, 0xBC, 0xAD, 0x0A, 0x4B,
+    0xED, 0x76, 0x04, 0xCB, 0xC3, 0xB9, 0x33, 0x9E, 0x01, 0x93, 0x96, 0x69, 0x7D, 0xC5, 0xA2, 0x45,
+    0x79, 0x9B, 0x04, 0x5C, 0x84, 0x09, 0xED, 0x88, 0x43, 0xC7, 0xAB, 0x93, 0x14, 0x26, 0xA1, 0x40,
+    0xB5, 0xCE, 0x4E, 0xBF, 0x2A, 0x42, 0x85, 0x3E, 0x2C, 0x3B, 0x54, 0xE8, 0x12, 0x1F, 0x0E, 0x97,
+    0x59, 0xB2, 0x27, 0x89, 0xFA, 0xF2, 0xDF, 0x8E, 0x68, 0x59, 0xDC, 0x06, 0xBC, 0xB6, 0x85, 0x0D,
+    0x06, 0x22, 0xEC, 0xB1, 0xCB, 0xE5, 0x04, 0xE6, 0x3D, 0xB3, 0xB0, 0x41, 0x73, 0x08, 0x3F, 0x3C,
+    0x58, 0x86, 0x63, 0xEB, 0x50, 0xEE, 0x1D, 0x2C, 0x37, 0x74, 0xA9, 0xD3, 0x18, 0xA3, 0x47, 0x6E,
+    0x93, 0x54, 0xAD, 0x0A, 0x5D, 0xB8, 0x2A, 0x55, 0x5D, 0x78, 0xF6, 0xEE, 0xBE, 0x8E, 0x3C, 0x76,
+    0x69, 0xB9, 0x40, 0xC2, 0x34, 0xEC, 0x2A, 0xB9, 0xED, 0x7E, 0x20, 0xE4, 0x8D, 0x00, 0x38, 0xC7,
+    0xE6, 0x8F, 0x44, 0xA8, 0x86, 0xCE, 0xEB, 0x2A, 0xE9, 0x90, 0xF1, 0x4C, 0xDF, 0x32, 0xFB, 0x73,
+    0x1B, 0x6D, 0x92, 0x1E, 0x95, 0xFE, 0xB4, 0xDB, 0x65, 0xDF, 0x4D, 0x23, 0x54, 0x89, 0x48, 0xBF,
+    0x4A, 0x2E, 0x70, 0xD6, 0xD7, 0x62, 0xB4, 0x33, 0x29, 0xB1, 0x3A, 0x33, 0x4C, 0x23, 0x6D, 0xA6,
+    0x76, 0xA5, 0x21, 0x63, 0x48, 0xE6, 0x90, 0x5D, 0xED, 0x90, 0x95, 0x0B, 0x7A, 0x84, 0xBE, 0xB8,
+    0x0D, 0x5E, 0x63, 0x0C, 0x62, 0x26, 0x4C, 0x14, 0x5A, 0xB3, 0xAC, 0x23, 0xA4, 0x74, 0xA7, 0x6F,
+    0x33, 0x30, 0x05, 0x60, 0x01, 0x42, 0xA0, 0x28, 0xB7, 0xEE, 0x19, 0x38, 0xF1, 0x64, 0x80, 0x82,
+    0x43, 0xE1, 0x41, 0x27, 0x1F, 0x1F, 0x90, 0x54, 0x7A, 0xD5, 0x23, 0x2E, 0xD1, 0x3D, 0xCB, 0x28,
+    0xBA, 0x58, 0x7F, 0xDC, 0x7C, 0x91, 0x24, 0xE9, 0x28, 0x51, 0x83, 0x6E, 0xC5, 0x56, 0x21, 0x42,
+    0xED, 0xA0, 0x56, 0x22, 0xA1, 0x40, 0x80, 0x6B, 0xA8, 0xF7, 0x94, 0xCA, 0x13, 0x6B, 0x0C, 0x39,
+    0xD9, 0xFD, 0xE9, 0xF3, 0x6F, 0xA6, 0x9E, 0xFC, 0x70, 0x8A, 0xB3, 0xBC, 0x59, 0x3C, 0x1E, 0x1D,
+    0x6C, 0xF9, 0x7C, 0xAF, 0xF9, 0x88, 0x71, 0x95, 0xEB, 0x57, 0x00, 0xBD, 0x9F, 0x8C, 0x4F, 0xE1,
+    0x24, 0x83, 0xC5, 0x22, 0xEA, 0xFD, 0xD3, 0x0C, 0xE2, 0x17, 0x18, 0x7C, 0x6A, 0x4C, 0xDE, 0x77,
+    0xB4, 0x53, 0x9B, 0x4C, 0x81, 0xCD, 0x23, 0x60, 0xAA, 0x0E, 0x25, 0x73, 0x9C, 0x02, 0x79, 0x32,
+    0x30, 0xDF, 0x74, 0xDF, 0x75, 0x19, 0xF4, 0xA5, 0x14, 0x5C, 0xF7, 0x7A, 0xA8, 0xA5, 0x91, 0x84,
+    0x7C, 0x60, 0x03, 0x06, 0x3B, 0xCD, 0x50, 0xB6, 0x27, 0x9C, 0xFE, 0xB1, 0xDD, 0xCC, 0xD3, 0xB0,
+    0x59, 0x24, 0xB2, 0xCA, 0xE2, 0x1C, 0x81, 0x22, 0x9D, 0x07, 0x8F, 0x8E, 0xB9, 0xBE, 0x4E, 0xFA,
+    0xFC, 0x39, 0x65, 0xBA, 0xBF, 0x9D, 0x12, 0x37, 0x5E, 0x97, 0x7E, 0xF3, 0x89, 0xF5, 0x5D, 0xF5,
+    0xE3, 0x09, 0x8C, 0x62, 0xB5, 0x20, 0x9D, 0x0C, 0x53, 0x8A, 0x68, 0x1B, 0xD2, 0x8F, 0x75, 0x17,
+    0x5D, 0xD4, 0xE5, 0xDA, 0x75, 0x62, 0x19, 0x14, 0x6A, 0x26, 0x2D, 0xEB, 0xF8, 0xAF, 0x37, 0xF0,
+    0x6C, 0xA4, 0x55, 0xB1, 0xBC, 0xE2, 0x33, 0xC0, 0x9A, 0xCA, 0xB0, 0x11, 0x49, 0x4F, 0x68, 0x9B,
+    0x3B, 0x6B, 0x3C, 0xCC, 0x13, 0xF6, 0xC7, 0x85, 0x61, 0x68, 0x42, 0xAE, 0xBB, 0xDD, 0xCD, 0x45,
+    0x16, 0x29, 0x1D, 0xEA, 0xDB, 0xC8, 0x03, 0x94, 0x3C, 0xEE, 0x4F, 0x82, 0x11, 0xC3, 0xEC, 0x28,
+    0xBD, 0x97, 0x05, 0x99, 0xDE, 0xD7, 0xBB, 0x5E, 0x22, 0x1F, 0xD4, 0xEB, 0x64, 0xD9, 0x92, 0xD9,
+    0x85, 0xB7, 0x6A, 0x05, 0x6A, 0xE4, 0x24, 0x41, 0xF1, 0xCD, 0xF0, 0xD8, 0x3F, 0xF8, 0x9E, 0x0E,
+    0xCD, 0x0B, 0x7A, 0x70, 0x6B, 0x5A, 0x75, 0x0A, 0x6A, 0x33, 0x88, 0xEC, 0x17, 0x75, 0x08, 0x70,
+    0x10, 0x2F, 0x24, 0xCF, 0xC4, 0xE9, 0x42, 0x00, 0x61, 0x94, 0xCA, 0x1F, 0x3A, 0x76, 0x06, 0xFA,
+    0xD2, 0x48, 0x81, 0xF0, 0x77, 0x60, 0x03, 0x45, 0xD9, 0x61, 0xF4, 0xA4, 0x6F, 0x3D, 0xD9, 0x30,
+    0xC3, 0x04, 0x6B, 0x54, 0x2A, 0xB7, 0xEC, 0x3B, 0xF4, 0x4B, 0xF5, 0x68, 0x52, 0x26, 0xCE, 0xFF,
+    0x5D, 0x19, 0x91, 0xA0, 0xA3, 0xA5, 0xA9, 0xB1, 0xE0, 0x23, 0xC4, 0x0A, 0x77, 0x4D, 0xF9, 0x51,
+    0x20, 0xA3, 0xA5, 0xA9, 0xB1, 0xC1, 0x00, 0x82, 0x86, 0x8E, 0x7F, 0x5D, 0x19, 0x91, 0xA0, 0xA3,
+    0xC4, 0xEB, 0x54, 0x0B, 0x75, 0x68, 0x52, 0x07, 0x8C, 0x9A, 0x97, 0x8D, 0x79, 0x70, 0x62, 0x46,
+    0xEF, 0x5C, 0x1B, 0x95, 0x89, 0x71, 0x41, 0xE1, 0x21, 0xA1, 0xA1, 0xA1, 0xC0, 0x02, 0x67, 0x4C,
+    0x1A, 0xB6, 0xCF, 0xFD, 0x78, 0x53, 0x24, 0xAB, 0xB5, 0xC9, 0xF1, 0x60, 0x23, 0xA5, 0xC8, 0x12,
+    0x87, 0x6D, 0x58, 0x13, 0x85, 0x88, 0x92, 0x87, 0x6D, 0x58, 0x32, 0xC7, 0x0C, 0x9A, 0x97, 0xAC,
+    0xDA, 0x36, 0xEE, 0x5E, 0x3E, 0xDF, 0x1D, 0xB8, 0xF2, 0x66, 0x2F, 0xBD, 0xF8, 0x72, 0x47, 0xED,
+    0x58, 0x13, 0x85, 0x88, 0x92, 0x87, 0x8C, 0x7B, 0x55, 0x09, 0x90, 0xA2, 0xC6, 0xEF, 0x3D, 0xF8,
+    0x53, 0x24, 0xAB, 0xD4, 0x2A, 0xB7, 0xEC, 0x5A, 0x36, 0xEE, 0x5E, 0x3E, 0xDF, 0x3C, 0xFA, 0x76,
+    0x4F, 0xFD, 0x59, 0x30, 0xE2, 0x46, 0xEF, 0x3D, 0xF8, 0x53, 0x05, 0x69, 0x31, 0xC1, 0x00, 0x82,
+    0x86, 0x8E, 0x7F, 0x5D, 0x19, 0xB0, 0xE2, 0x27, 0xCC, 0xFB, 0x74, 0x4B, 0x14, 0x8B, 0x94, 0x8B,
+    0x75, 0x68, 0x33, 0xC5, 0x08, 0x92, 0x87, 0x8C, 0x9A, 0xB6, 0xCF, 0x1C, 0xBA, 0xD7, 0x0D, 0x98,
+    0xB2, 0xE6, 0x2F, 0xDC, 0x1B, 0x95, 0x89, 0x71, 0x60, 0x23, 0xC4, 0x0A, 0x96, 0x8F, 0x9C, 0xBA,
+    0xF6, 0x6E, 0x3F, 0xFC, 0x5B, 0x15, 0xA8, 0xD2, 0x26, 0xAF, 0xBD, 0xF8, 0x72, 0x66, 0x2F, 0xDC,
+    0x1B, 0xB4, 0xCB, 0x14, 0x8B, 0x94, 0xAA, 0xB7, 0xCD, 0xF9, 0x51, 0x01, 0x80, 0x82, 0x86, 0x6F,
+    0x3D, 0xD9, 0x30, 0xE2, 0x27, 0xCC, 0xFB, 0x74, 0x4B, 0x14, 0xAA, 0xB7, 0xCD, 0xF9, 0x70, 0x43,
+    0x04, 0x6B, 0x35, 0xC9, 0xF1, 0x60, 0x23, 0xA5, 0xC8, 0xF3, 0x45, 0x08, 0x92, 0x87, 0x6D, 0x58,
+    0x32, 0xE6, 0x2F, 0xBD, 0xF8, 0x72, 0x66, 0x4E, 0x1E, 0xBE, 0xFE, 0x7E, 0x7E, 0x7E, 0x5F, 0x1D,
+    0x99, 0x91, 0xA0, 0xA3, 0xC4, 0x0A, 0x77, 0x4D, 0x18, 0x93, 0xA4, 0xAB, 0xD4, 0x0B, 0x75, 0x49,
+    0x10, 0xA2, 0xC6, 0xEF, 0x3D, 0xF8, 0x53, 0x24, 0xAB, 0xB5, 0xE8, 0x33, 0xE4, 0x4A, 0x16, 0xAE,
+    0xDE, 0x1F, 0xBC, 0xDB, 0x15, 0xA8, 0xB3, 0xC5, 0x08, 0x73, 0x45, 0xE9, 0x31, 0xC1, 0xE1, 0x21,
+    0xA1, 0xA1, 0xA1, 0xC0, 0x02, 0x86, 0x6F, 0x5C, 0x3A, 0xD7, 0x0D, 0x98, 0x93, 0xA4, 0xCA, 0x16,
+    0xAE, 0xDE, 0x1F, 0x9D, 0x99, 0xB0, 0xE2, 0x46, 0xEF, 0x3D, 0xF8, 0x72, 0x47, 0x0C, 0x9A, 0xB6,
+    0xCF, 0xFD, 0x59, 0x11, 0xA0, 0xA3, 0xA5, 0xC8, 0xF3, 0x45, 0x08, 0x92, 0x87, 0x6D, 0x39, 0xF0,
+    0x43, 0x04, 0x8A, 0x96, 0xAE, 0xDE, 0x3E, 0xDF, 0x1D, 0x99, 0x91, 0xA0, 0xC2, 0x06, 0x6F, 0x3D,
+    0xF8, 0x72, 0x47, 0x0C, 0x9A, 0x97, 0x8D, 0x98, 0x93, 0x85, 0x88, 0x73, 0x45, 0xE9, 0x31, 0xE0,
+    0x23, 0xA5, 0xA9, 0xD0, 0x03, 0x84, 0x8A, 0x96, 0xAE, 0xDE, 0x1F, 0xBC, 0xDB, 0x15, 0xA8, 0xD2,
+    0x26, 0xCE, 0xFF, 0x5D, 0x19, 0x91, 0x81, 0x80, 0x82, 0x67, 0x2D, 0xD8, 0x13, 0xA4, 0xAB, 0xD4,
+    0x0B, 0x94, 0xAA, 0xB7, 0xCD, 0xF9, 0x51, 0x20, 0xA3, 0xA5, 0xC8, 0xF3, 0x45, 0xE9, 0x50, 0x22,
+    0xC6, 0xEF, 0x5C, 0x3A, 0xD7, 0x0D, 0x98, 0x93, 0x85, 0x88, 0x73, 0x64, 0x4A, 0xF7, 0x4D, 0xF9,
+    0x51, 0x20, 0xA3, 0xC4, 0x0A, 0x96, 0xAE, 0xDE, 0x3E, 0xFE, 0x7E, 0x7E, 0x7E, 0x5F, 0x3C, 0xFA,
+    0x76, 0x4F, 0xFD, 0x78, 0x72, 0x66, 0x2F, 0xBD, 0xD9, 0x30, 0xC3, 0xE5, 0x48, 0x12, 0x87, 0x8C,
+    0x7B, 0x55, 0x28, 0xD2, 0x07, 0x8C, 0x9A, 0x97, 0xAC, 0xDA, 0x17, 0x8D, 0x79, 0x51, 0x20, 0xA3,
+    0xC4, 0xEB, 0x54, 0x0B, 0x94, 0x8B, 0x94, 0xAA, 0xD6, 0x2E, 0xBF, 0xFC, 0x5B, 0x15, 0xA8, 0xD2,
+    0x26, 0xAF, 0xDC, 0x1B, 0xB4, 0xEA, 0x37, 0xEC, 0x3B, 0xF4, 0x6A, 0x37, 0xCD, 0x18, 0x93, 0x85,
+    0x69, 0x31, 0xC1, 0xE1, 0x40, 0xE3, 0x25, 0xC8, 0x12, 0x87, 0x8C, 0x9A, 0xB6, 0xCF, 0xFD, 0x59,
+    0x11, 0xA0, 0xC2, 0x06, 0x8E, 0x7F, 0x5D, 0x38, 0xF2, 0x47, 0x0C, 0x7B, 0x74, 0x6A, 0x37, 0xEC,
+    0x5A, 0x36, 0xEE, 0x3F, 0xFC, 0x7A, 0x76, 0x4F, 0x1C, 0x9B, 0x95, 0x89, 0x71, 0x41, 0x00, 0x63,
+    0x44, 0xEB, 0x54, 0x2A, 0xD6, 0x0F, 0x9C, 0xBA, 0xD7, 0x0D, 0x98, 0x93, 0x85, 0x69, 0x31, 0xC1,
+    0x00, 0x82, 0x86, 0x8E, 0x9E, 0xBE, 0xDF, 0x3C, 0xFA, 0x57, 0x2C, 0xDA, 0x36, 0xEE, 0x3F, 0xFC,
+    0x5B, 0x15, 0x89, 0x71, 0x41, 0x00, 0x82, 0x86, 0x8E, 0x7F, 0x5D, 0x38, 0xF2, 0x47, 0xED, 0x58,
+    0x13, 0xA4, 0xCA, 0xF7, 0x4D, 0xF9, 0x51, 0x01, 0x80, 0x63, 0x44, 0xEB, 0x54, 0x2A, 0xD6, 0x2E,
+    0xBF, 0xDD, 0x19, 0x91, 0xA0, 0xA3, 0xA5, 0xA9, 0xB1, 0xE0, 0x42, 0x06, 0x8E, 0x7F, 0x5D, 0x19,
+    0x91, 0xA0, 0xA3, 0xC4, 0x0A, 0x96, 0x8F, 0x7D, 0x78, 0x72, 0x47, 0x0C, 0x7B, 0x74, 0x6A, 0x56,
+    0x2E, 0xDE, 0x1F, 0xBC, 0xFA, 0x57, 0x0D, 0x79, 0x51, 0x01, 0x61, 0x21, 0xA1, 0xC0, 0xE3, 0x25,
+    0xA9, 0xB1, 0xC1, 0xE1, 0x40, 0x02, 0x67, 0x4C, 0x1A, 0x97, 0x8D, 0x98, 0x93, 0xA4, 0xAB, 0xD4,
+    0x2A, 0xD6, 0x0F, 0x9C, 0x9B, 0xB4, 0xCB, 0x14, 0xAA, 0xB7, 0xCD, 0xF9, 0x51, 0x20, 0xA3, 0xC4,
+    0xEB, 0x35, 0xC9, 0xF1, 0x60, 0x42, 0x06, 0x8E, 0x7F, 0x7C, 0x7A, 0x76, 0x6E, 0x3F, 0xFC, 0x7A,
+    0x76, 0x6E, 0x5E, 0x3E, 0xFE, 0x7E, 0x5F, 0x3C, 0xDB, 0x15, 0x89, 0x71, 0x41, 0xE1, 0x21, 0xC0,
+    0xE3, 0x44, 0xEB, 0x54, 0x2A, 0xB7, 0xCD, 0xF9, 0x70, 0x62, 0x27, 0xAD, 0xD8, 0x32, 0xC7, 0x0C,
+    0x7B, 0x74, 0x4B, 0x14, 0xAA, 0xB7, 0xEC, 0x3B, 0xD5, 0x28, 0xD2, 0x07, 0x6D, 0x39, 0xD1, 0x20,
+    0xC2, 0xE7, 0x4C, 0x1A, 0x97, 0x8D, 0x98, 0xB2, 0xC7, 0x0C, 0x59, 0x28, 0xF3, 0x9B
+};
diff --git a/drivers/sensors/pmw3360.h b/drivers/sensors/pmw3360.h
index 3aa8ed0ed8..8aa70bd427 100644
--- a/drivers/sensors/pmw3360.h
+++ b/drivers/sensors/pmw3360.h
@@ -1,79 +1,73 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Stefan Kerkmann (KarlK90)
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// Copyright 2019 Sunjun Kim
+// Copyright 2020 Ploopy Corporation
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <stdint.h>
 
-#ifndef PMW3360_CPI
-#    define PMW3360_CPI 1600
+#if !defined(PMW33XX_CPI)
+#    define PMW33XX_CPI 1600U
 #endif
 
-#ifndef PMW3360_CLOCK_SPEED
-#    define PMW3360_CLOCK_SPEED 2000000
-#endif
+#define PMW33XX_CPI_STEP 100
+#define PMW33XX_CPI_MIN 100
+#define PMW33XX_CPI_MAX 12000
 
-#ifndef PMW3360_SPI_LSBFIRST
-#    define PMW3360_SPI_LSBFIRST false
-#endif
+#define PMW33XX_FIRMWARE_LENGTH 4094
 
-#ifndef PMW3360_SPI_MODE
-#    define PMW3360_SPI_MODE 3
-#endif
-
-#ifndef PMW3360_SPI_DIVISOR
-#    ifdef __AVR__
-#        define PMW3360_SPI_DIVISOR (F_CPU / PMW3360_CLOCK_SPEED)
-#    else
-#        define PMW3360_SPI_DIVISOR 64
-#    endif
-#endif
-
-#ifndef PMW3360_LIFTOFF_DISTANCE
-#    define PMW3360_LIFTOFF_DISTANCE 0x02
-#endif
-
-#ifndef ROTATIONAL_TRANSFORM_ANGLE
-#    define ROTATIONAL_TRANSFORM_ANGLE 0x00
-#endif
-
-// Support single and plural spellings
-#ifndef PMW3360_CS_PINS
-#    ifndef PMW3360_CS_PIN
-#        error "No chip select pin defined -- missing PMW3360_CS_PIN or PMW3360_CS_PINS"
-#    else
-#        define PMW3360_CS_PINS \
-            { PMW3360_CS_PIN }
-#    endif
-#endif
-
-typedef struct {
-    int8_t  motion;
-    bool    isMotion;    // True if a motion is detected.
-    bool    isOnSurface; // True when a chip is on a surface
-    int16_t dx;          // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
-    int8_t  mdx;
-    int16_t dy; // displacement on y directions.
-    int8_t  mdy;
-} report_pmw3360_t;
-
-bool     pmw3360_init(int8_t index);
-uint16_t pmw3360_get_cpi(void);
-void     pmw3360_set_cpi(uint16_t cpi);
-/* Reads and clears the current delta values on the sensor */
-report_pmw3360_t pmw3360_read_burst(int8_t index);
+// PMW3360 register addresses
+// clang-format off
+#define REG_Product_ID                   0x00
+#define REG_Revision_ID                  0x01
+#define REG_Motion                       0x02
+#define REG_Delta_X_L                    0x03
+#define REG_Delta_X_H                    0x04
+#define REG_Delta_Y_L                    0x05
+#define REG_Delta_Y_H                    0x06
+#define REG_SQUAL                        0x07
+#define REG_Raw_Data_Sum                 0x08
+#define REG_Maximum_Raw_data             0x09
+#define REG_Minimum_Raw_data             0x0a
+#define REG_Shutter_Lower                0x0b
+#define REG_Shutter_Upper                0x0c
+#define REG_Control                      0x0d
+#define REG_Config1                      0x0f
+#define REG_Config2                      0x10
+#define REG_Angle_Tune                   0x11
+#define REG_Frame_Capture                0x12
+#define REG_SROM_Enable                  0x13
+#define REG_Run_Downshift                0x14
+#define REG_Rest1_Rate_Lower             0x15
+#define REG_Rest1_Rate_Upper             0x16
+#define REG_Rest1_Downshift              0x17
+#define REG_Rest2_Rate_Lower             0x18
+#define REG_Rest2_Rate_Upper             0x19
+#define REG_Rest2_Downshift              0x1a
+#define REG_Rest3_Rate_Lower             0x1b
+#define REG_Rest3_Rate_Upper             0x1c
+#define REG_Observation                  0x24
+#define REG_Data_Out_Lower               0x25
+#define REG_Data_Out_Upper               0x26
+#define REG_Raw_Data_Dump                0x29
+#define REG_SROM_ID                      0x2a
+#define REG_Min_SQ_Run                   0x2b
+#define REG_Raw_Data_Threshold           0x2c
+#define REG_Config5                      0x2f
+#define REG_Power_Up_Reset               0x3a
+#define REG_Shutdown                     0x3b
+#define REG_Inverse_Product_ID           0x3f
+#define REG_LiftCutoff_Tune3             0x41
+#define REG_Angle_Snap                   0x42
+#define REG_LiftCutoff_Tune1             0x4a
+#define REG_Motion_Burst                 0x50
+#define REG_LiftCutoff_Tune_Timeout      0x58
+#define REG_LiftCutoff_Tune_Min_Length   0x5a
+#define REG_SROM_Load_Burst              0x62
+#define REG_Lift_Config                  0x63
+#define REG_Raw_Data_Burst               0x64
+#define REG_LiftCutoff_Tune2             0x65
+// clang-format on
diff --git a/drivers/sensors/pmw3360_firmware.h b/drivers/sensors/pmw3360_firmware.h
deleted file mode 100644
index ed9fda5a75..0000000000
--- a/drivers/sensors/pmw3360_firmware.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "progmem.h"
-
-// PID, Inverse PID, SROM version
-const uint8_t firmware_signature[] PROGMEM = {0x42, 0xBD, 0x04};
-
-#define FIRMWARE_LENGTH 4094
-
-// Firmware Blob foor PMW3360
-
-// clang-format off
-const uint8_t firmware_data[FIRMWARE_LENGTH] PROGMEM = {
-    0x01, 0x04, 0x8E, 0x96, 0x6E, 0x77, 0x3E, 0xFE, 0x7E, 0x5F, 0x1D, 0xB8, 0xF2, 0x66, 0x4E, 0xFF,
-    0x5D, 0x19, 0xB0, 0xC2, 0x04, 0x69, 0x54, 0x2A, 0xD6, 0x2E, 0xBF, 0xDD, 0x19, 0xB0, 0xC3, 0xE5,
-    0x29, 0xB1, 0xE0, 0x23, 0xA5, 0xA9, 0xB1, 0xC1, 0x00, 0x82, 0x67, 0x4C, 0x1A, 0x97, 0x8D, 0x79,
-    0x51, 0x20, 0xC7, 0x06, 0x8E, 0x7C, 0x7C, 0x7A, 0x76, 0x4F, 0xFD, 0x59, 0x30, 0xE2, 0x46, 0x0E,
-    0x9E, 0xBE, 0xDF, 0x1D, 0x99, 0x91, 0xA0, 0xA5, 0xA1, 0xA9, 0xD0, 0x22, 0xC6, 0xEF, 0x5C, 0x1B,
-    0x95, 0x89, 0x90, 0xA2, 0xA7, 0xCC, 0xFB, 0x55, 0x28, 0xB3, 0xE4, 0x4A, 0xF7, 0x6C, 0x3B, 0xF4,
-    0x6A, 0x56, 0x2E, 0xDE, 0x1F, 0x9D, 0xB8, 0xD3, 0x05, 0x88, 0x92, 0xA6, 0xCE, 0x1E, 0xBE, 0xDF,
-    0x1D, 0x99, 0xB0, 0xE2, 0x46, 0xEF, 0x5C, 0x07, 0x11, 0x5D, 0x98, 0x0B, 0x9D, 0x94, 0x97, 0xEE,
-    0x4E, 0x45, 0x33, 0x6B, 0x44, 0xC7, 0x29, 0x56, 0x27, 0x30, 0xC6, 0xA7, 0xD5, 0xF2, 0x56, 0xDF,
-    0xB4, 0x38, 0x62, 0xCB, 0xA0, 0xB6, 0xE3, 0x0F, 0x84, 0x06, 0x24, 0x05, 0x65, 0x6F, 0x76, 0x89,
-    0xB5, 0x77, 0x41, 0x27, 0x82, 0x66, 0x65, 0x82, 0xCC, 0xD5, 0xE6, 0x20, 0xD5, 0x27, 0x17, 0xC5,
-    0xF8, 0x03, 0x23, 0x7C, 0x5F, 0x64, 0xA5, 0x1D, 0xC1, 0xD6, 0x36, 0xCB, 0x4C, 0xD4, 0xDB, 0x66,
-    0xD7, 0x8B, 0xB1, 0x99, 0x7E, 0x6F, 0x4C, 0x36, 0x40, 0x06, 0xD6, 0xEB, 0xD7, 0xA2, 0xE4, 0xF4,
-    0x95, 0x51, 0x5A, 0x54, 0x96, 0xD5, 0x53, 0x44, 0xD7, 0x8C, 0xE0, 0xB9, 0x40, 0x68, 0xD2, 0x18,
-    0xE9, 0xDD, 0x9A, 0x23, 0x92, 0x48, 0xEE, 0x7F, 0x43, 0xAF, 0xEA, 0x77, 0x38, 0x84, 0x8C, 0x0A,
-    0x72, 0xAF, 0x69, 0xF8, 0xDD, 0xF1, 0x24, 0x83, 0xA3, 0xF8, 0x4A, 0xBF, 0xF5, 0x94, 0x13, 0xDB,
-    0xBB, 0xD8, 0xB4, 0xB3, 0xA0, 0xFB, 0x45, 0x50, 0x60, 0x30, 0x59, 0x12, 0x31, 0x71, 0xA2, 0xD3,
-    0x13, 0xE7, 0xFA, 0xE7, 0xCE, 0x0F, 0x63, 0x15, 0x0B, 0x6B, 0x94, 0xBB, 0x37, 0x83, 0x26, 0x05,
-    0x9D, 0xFB, 0x46, 0x92, 0xFC, 0x0A, 0x15, 0xD1, 0x0D, 0x73, 0x92, 0xD6, 0x8C, 0x1B, 0x8C, 0xB8,
-    0x55, 0x8A, 0xCE, 0xBD, 0xFE, 0x8E, 0xFC, 0xED, 0x09, 0x12, 0x83, 0x91, 0x82, 0x51, 0x31, 0x23,
-    0xFB, 0xB4, 0x0C, 0x76, 0xAD, 0x7C, 0xD9, 0xB4, 0x4B, 0xB2, 0x67, 0x14, 0x09, 0x9C, 0x7F, 0x0C,
-    0x18, 0xBA, 0x3B, 0xD6, 0x8E, 0x14, 0x2A, 0xE4, 0x1B, 0x52, 0x9F, 0x2B, 0x7D, 0xE1, 0xFB, 0x6A,
-    0x33, 0x02, 0xFA, 0xAC, 0x5A, 0xF2, 0x3E, 0x88, 0x7E, 0xAE, 0xD1, 0xF3, 0x78, 0xE8, 0x05, 0xD1,
-    0xE3, 0xDC, 0x21, 0xF6, 0xE1, 0x9A, 0xBD, 0x17, 0x0E, 0xD9, 0x46, 0x9B, 0x88, 0x03, 0xEA, 0xF6,
-    0x66, 0xBE, 0x0E, 0x1B, 0x50, 0x49, 0x96, 0x40, 0x97, 0xF1, 0xF1, 0xE4, 0x80, 0xA6, 0x6E, 0xE8,
-    0x77, 0x34, 0xBF, 0x29, 0x40, 0x44, 0xC2, 0xFF, 0x4E, 0x98, 0xD3, 0x9C, 0xA3, 0x32, 0x2B, 0x76,
-    0x51, 0x04, 0x09, 0xE7, 0xA9, 0xD1, 0xA6, 0x32, 0xB1, 0x23, 0x53, 0xE2, 0x47, 0xAB, 0xD6, 0xF5,
-    0x69, 0x5C, 0x3E, 0x5F, 0xFA, 0xAE, 0x45, 0x20, 0xE5, 0xD2, 0x44, 0xFF, 0x39, 0x32, 0x6D, 0xFD,
-    0x27, 0x57, 0x5C, 0xFD, 0xF0, 0xDE, 0xC1, 0xB5, 0x99, 0xE5, 0xF5, 0x1C, 0x77, 0x01, 0x75, 0xC5,
-    0x6D, 0x58, 0x92, 0xF2, 0xB2, 0x47, 0x00, 0x01, 0x26, 0x96, 0x7A, 0x30, 0xFF, 0xB7, 0xF0, 0xEF,
-    0x77, 0xC1, 0x8A, 0x5D, 0xDC, 0xC0, 0xD1, 0x29, 0x30, 0x1E, 0x77, 0x38, 0x7A, 0x94, 0xF1, 0xB8,
-    0x7A, 0x7E, 0xEF, 0xA4, 0xD1, 0xAC, 0x31, 0x4A, 0xF2, 0x5D, 0x64, 0x3D, 0xB2, 0xE2, 0xF0, 0x08,
-    0x99, 0xFC, 0x70, 0xEE, 0x24, 0xA7, 0x7E, 0xEE, 0x1E, 0x20, 0x69, 0x7D, 0x44, 0xBF, 0x87, 0x42,
-    0xDF, 0x88, 0x3B, 0x0C, 0xDA, 0x42, 0xC9, 0x04, 0xF9, 0x45, 0x50, 0xFC, 0x83, 0x8F, 0x11, 0x6A,
-    0x72, 0xBC, 0x99, 0x95, 0xF0, 0xAC, 0x3D, 0xA7, 0x3B, 0xCD, 0x1C, 0xE2, 0x88, 0x79, 0x37, 0x11,
-    0x5F, 0x39, 0x89, 0x95, 0x0A, 0x16, 0x84, 0x7A, 0xF6, 0x8A, 0xA4, 0x28, 0xE4, 0xED, 0x83, 0x80,
-    0x3B, 0xB1, 0x23, 0xA5, 0x03, 0x10, 0xF4, 0x66, 0xEA, 0xBB, 0x0C, 0x0F, 0xC5, 0xEC, 0x6C, 0x69,
-    0xC5, 0xD3, 0x24, 0xAB, 0xD4, 0x2A, 0xB7, 0x99, 0x88, 0x76, 0x08, 0xA0, 0xA8, 0x95, 0x7C, 0xD8,
-    0x38, 0x6D, 0xCD, 0x59, 0x02, 0x51, 0x4B, 0xF1, 0xB5, 0x2B, 0x50, 0xE3, 0xB6, 0xBD, 0xD0, 0x72,
-    0xCF, 0x9E, 0xFD, 0x6E, 0xBB, 0x44, 0xC8, 0x24, 0x8A, 0x77, 0x18, 0x8A, 0x13, 0x06, 0xEF, 0x97,
-    0x7D, 0xFA, 0x81, 0xF0, 0x31, 0xE6, 0xFA, 0x77, 0xED, 0x31, 0x06, 0x31, 0x5B, 0x54, 0x8A, 0x9F,
-    0x30, 0x68, 0xDB, 0xE2, 0x40, 0xF8, 0x4E, 0x73, 0xFA, 0xAB, 0x74, 0x8B, 0x10, 0x58, 0x13, 0xDC,
-    0xD2, 0xE6, 0x78, 0xD1, 0x32, 0x2E, 0x8A, 0x9F, 0x2C, 0x58, 0x06, 0x48, 0x27, 0xC5, 0xA9, 0x5E,
-    0x81, 0x47, 0x89, 0x46, 0x21, 0x91, 0x03, 0x70, 0xA4, 0x3E, 0x88, 0x9C, 0xDA, 0x33, 0x0A, 0xCE,
-    0xBC, 0x8B, 0x8E, 0xCF, 0x9F, 0xD3, 0x71, 0x80, 0x43, 0xCF, 0x6B, 0xA9, 0x51, 0x83, 0x76, 0x30,
-    0x82, 0xC5, 0x6A, 0x85, 0x39, 0x11, 0x50, 0x1A, 0x82, 0xDC, 0x1E, 0x1C, 0xD5, 0x7D, 0xA9, 0x71,
-    0x99, 0x33, 0x47, 0x19, 0x97, 0xB3, 0x5A, 0xB1, 0xDF, 0xED, 0xA4, 0xF2, 0xE6, 0x26, 0x84, 0xA2,
-    0x28, 0x9A, 0x9E, 0xDF, 0xA6, 0x6A, 0xF4, 0xD6, 0xFC, 0x2E, 0x5B, 0x9D, 0x1A, 0x2A, 0x27, 0x68,
-    0xFB, 0xC1, 0x83, 0x21, 0x4B, 0x90, 0xE0, 0x36, 0xDD, 0x5B, 0x31, 0x42, 0x55, 0xA0, 0x13, 0xF7,
-    0xD0, 0x89, 0x53, 0x71, 0x99, 0x57, 0x09, 0x29, 0xC5, 0xF3, 0x21, 0xF8, 0x37, 0x2F, 0x40, 0xF3,
-    0xD4, 0xAF, 0x16, 0x08, 0x36, 0x02, 0xFC, 0x77, 0xC5, 0x8B, 0x04, 0x90, 0x56, 0xB9, 0xC9, 0x67,
-    0x9A, 0x99, 0xE8, 0x00, 0xD3, 0x86, 0xFF, 0x97, 0x2D, 0x08, 0xE9, 0xB7, 0xB3, 0x91, 0xBC, 0xDF,
-    0x45, 0xC6, 0xED, 0x0F, 0x8C, 0x4C, 0x1E, 0xE6, 0x5B, 0x6E, 0x38, 0x30, 0xE4, 0xAA, 0xE3, 0x95,
-    0xDE, 0xB9, 0xE4, 0x9A, 0xF5, 0xB2, 0x55, 0x9A, 0x87, 0x9B, 0xF6, 0x6A, 0xB2, 0xF2, 0x77, 0x9A,
-    0x31, 0xF4, 0x7A, 0x31, 0xD1, 0x1D, 0x04, 0xC0, 0x7C, 0x32, 0xA2, 0x9E, 0x9A, 0xF5, 0x62, 0xF8,
-    0x27, 0x8D, 0xBF, 0x51, 0xFF, 0xD3, 0xDF, 0x64, 0x37, 0x3F, 0x2A, 0x6F, 0x76, 0x3A, 0x7D, 0x77,
-    0x06, 0x9E, 0x77, 0x7F, 0x5E, 0xEB, 0x32, 0x51, 0xF9, 0x16, 0x66, 0x9A, 0x09, 0xF3, 0xB0, 0x08,
-    0xA4, 0x70, 0x96, 0x46, 0x30, 0xFF, 0xDA, 0x4F, 0xE9, 0x1B, 0xED, 0x8D, 0xF8, 0x74, 0x1F, 0x31,
-    0x92, 0xB3, 0x73, 0x17, 0x36, 0xDB, 0x91, 0x30, 0xD6, 0x88, 0x55, 0x6B, 0x34, 0x77, 0x87, 0x7A,
-    0xE7, 0xEE, 0x06, 0xC6, 0x1C, 0x8C, 0x19, 0x0C, 0x48, 0x46, 0x23, 0x5E, 0x9C, 0x07, 0x5C, 0xBF,
-    0xB4, 0x7E, 0xD6, 0x4F, 0x74, 0x9C, 0xE2, 0xC5, 0x50, 0x8B, 0xC5, 0x8B, 0x15, 0x90, 0x60, 0x62,
-    0x57, 0x29, 0xD0, 0x13, 0x43, 0xA1, 0x80, 0x88, 0x91, 0x00, 0x44, 0xC7, 0x4D, 0x19, 0x86, 0xCC,
-    0x2F, 0x2A, 0x75, 0x5A, 0xFC, 0xEB, 0x97, 0x2A, 0x70, 0xE3, 0x78, 0xD8, 0x91, 0xB0, 0x4F, 0x99,
-    0x07, 0xA3, 0x95, 0xEA, 0x24, 0x21, 0xD5, 0xDE, 0x51, 0x20, 0x93, 0x27, 0x0A, 0x30, 0x73, 0xA8,
-    0xFF, 0x8A, 0x97, 0xE9, 0xA7, 0x6A, 0x8E, 0x0D, 0xE8, 0xF0, 0xDF, 0xEC, 0xEA, 0xB4, 0x6C, 0x1D,
-    0x39, 0x2A, 0x62, 0x2D, 0x3D, 0x5A, 0x8B, 0x65, 0xF8, 0x90, 0x05, 0x2E, 0x7E, 0x91, 0x2C, 0x78,
-    0xEF, 0x8E, 0x7A, 0xC1, 0x2F, 0xAC, 0x78, 0xEE, 0xAF, 0x28, 0x45, 0x06, 0x4C, 0x26, 0xAF, 0x3B,
-    0xA2, 0xDB, 0xA3, 0x93, 0x06, 0xB5, 0x3C, 0xA5, 0xD8, 0xEE, 0x8F, 0xAF, 0x25, 0xCC, 0x3F, 0x85,
-    0x68, 0x48, 0xA9, 0x62, 0xCC, 0x97, 0x8F, 0x7F, 0x2A, 0xEA, 0xE0, 0x15, 0x0A, 0xAD, 0x62, 0x07,
-    0xBD, 0x45, 0xF8, 0x41, 0xD8, 0x36, 0xCB, 0x4C, 0xDB, 0x6E, 0xE6, 0x3A, 0xE7, 0xDA, 0x15, 0xE9,
-    0x29, 0x1E, 0x12, 0x10, 0xA0, 0x14, 0x2C, 0x0E, 0x3D, 0xF4, 0xBF, 0x39, 0x41, 0x92, 0x75, 0x0B,
-    0x25, 0x7B, 0xA3, 0xCE, 0x39, 0x9C, 0x15, 0x64, 0xC8, 0xFA, 0x3D, 0xEF, 0x73, 0x27, 0xFE, 0x26,
-    0x2E, 0xCE, 0xDA, 0x6E, 0xFD, 0x71, 0x8E, 0xDD, 0xFE, 0x76, 0xEE, 0xDC, 0x12, 0x5C, 0x02, 0xC5,
-    0x3A, 0x4E, 0x4E, 0x4F, 0xBF, 0xCA, 0x40, 0x15, 0xC7, 0x6E, 0x8D, 0x41, 0xF1, 0x10, 0xE0, 0x4F,
-    0x7E, 0x97, 0x7F, 0x1C, 0xAE, 0x47, 0x8E, 0x6B, 0xB1, 0x25, 0x31, 0xB0, 0x73, 0xC7, 0x1B, 0x97,
-    0x79, 0xF9, 0x80, 0xD3, 0x66, 0x22, 0x30, 0x07, 0x74, 0x1E, 0xE4, 0xD0, 0x80, 0x21, 0xD6, 0xEE,
-    0x6B, 0x6C, 0x4F, 0xBF, 0xF5, 0xB7, 0xD9, 0x09, 0x87, 0x2F, 0xA9, 0x14, 0xBE, 0x27, 0xD9, 0x72,
-    0x50, 0x01, 0xD4, 0x13, 0x73, 0xA6, 0xA7, 0x51, 0x02, 0x75, 0x25, 0xE1, 0xB3, 0x45, 0x34, 0x7D,
-    0xA8, 0x8E, 0xEB, 0xF3, 0x16, 0x49, 0xCB, 0x4F, 0x8C, 0xA1, 0xB9, 0x36, 0x85, 0x39, 0x75, 0x5D,
-    0x08, 0x00, 0xAE, 0xEB, 0xF6, 0xEA, 0xD7, 0x13, 0x3A, 0x21, 0x5A, 0x5F, 0x30, 0x84, 0x52, 0x26,
-    0x95, 0xC9, 0x14, 0xF2, 0x57, 0x55, 0x6B, 0xB1, 0x10, 0xC2, 0xE1, 0xBD, 0x3B, 0x51, 0xC0, 0xB7,
-    0x55, 0x4C, 0x71, 0x12, 0x26, 0xC7, 0x0D, 0xF9, 0x51, 0xA4, 0x38, 0x02, 0x05, 0x7F, 0xB8, 0xF1,
-    0x72, 0x4B, 0xBF, 0x71, 0x89, 0x14, 0xF3, 0x77, 0x38, 0xD9, 0x71, 0x24, 0xF3, 0x00, 0x11, 0xA1,
-    0xD8, 0xD4, 0x69, 0x27, 0x08, 0x37, 0x35, 0xC9, 0x11, 0x9D, 0x90, 0x1C, 0x0E, 0xE7, 0x1C, 0xFF,
-    0x2D, 0x1E, 0xE8, 0x92, 0xE1, 0x18, 0x10, 0x95, 0x7C, 0xE0, 0x80, 0xF4, 0x96, 0x43, 0x21, 0xF9,
-    0x75, 0x21, 0x64, 0x38, 0xDD, 0x9F, 0x1E, 0x95, 0x16, 0xDA, 0x56, 0x1D, 0x4F, 0x9A, 0x53, 0xB2,
-    0xE2, 0xE4, 0x18, 0xCB, 0x6B, 0x1A, 0x65, 0xEB, 0x56, 0xC6, 0x3B, 0xE5, 0xFE, 0xD8, 0x26, 0x3F,
-    0x3A, 0x84, 0x59, 0x72, 0x66, 0xA2, 0xF3, 0x75, 0xFF, 0xFB, 0x60, 0xB3, 0x22, 0xAD, 0x3F, 0x2D,
-    0x6B, 0xF9, 0xEB, 0xEA, 0x05, 0x7C, 0xD8, 0x8F, 0x6D, 0x2C, 0x98, 0x9E, 0x2B, 0x93, 0xF1, 0x5E,
-    0x46, 0xF0, 0x87, 0x49, 0x29, 0x73, 0x68, 0xD7, 0x7F, 0xF9, 0xF0, 0xE5, 0x7D, 0xDB, 0x1D, 0x75,
-    0x19, 0xF3, 0xC4, 0x58, 0x9B, 0x17, 0x88, 0xA8, 0x92, 0xE0, 0xBE, 0xBD, 0x8B, 0x1D, 0x8D, 0x9F,
-    0x56, 0x76, 0xAD, 0xAF, 0x29, 0xE2, 0xD9, 0xD5, 0x52, 0xF6, 0xB5, 0x56, 0x35, 0x57, 0x3A, 0xC8,
-    0xE1, 0x56, 0x43, 0x19, 0x94, 0xD3, 0x04, 0x9B, 0x6D, 0x35, 0xD8, 0x0B, 0x5F, 0x4D, 0x19, 0x8E,
-    0xEC, 0xFA, 0x64, 0x91, 0x0A, 0x72, 0x20, 0x2B, 0xBC, 0x1A, 0x4A, 0xFE, 0x8B, 0xFD, 0xBB, 0xED,
-    0x1B, 0x23, 0xEA, 0xAD, 0x72, 0x82, 0xA1, 0x29, 0x99, 0x71, 0xBD, 0xF0, 0x95, 0xC1, 0x03, 0xDD,
-    0x7B, 0xC2, 0xB2, 0x3C, 0x28, 0x54, 0xD3, 0x68, 0xA4, 0x72, 0xC8, 0x66, 0x96, 0xE0, 0xD1, 0xD8,
-    0x7F, 0xF8, 0xD1, 0x26, 0x2B, 0xF7, 0xAD, 0xBA, 0x55, 0xCA, 0x15, 0xB9, 0x32, 0xC3, 0xE5, 0x88,
-    0x97, 0x8E, 0x5C, 0xFB, 0x92, 0x25, 0x8B, 0xBF, 0xA2, 0x45, 0x55, 0x7A, 0xA7, 0x6F, 0x8B, 0x57,
-    0x5B, 0xCF, 0x0E, 0xCB, 0x1D, 0xFB, 0x20, 0x82, 0x77, 0xA8, 0x8C, 0xCC, 0x16, 0xCE, 0x1D, 0xFA,
-    0xDE, 0xCC, 0x0B, 0x62, 0xFE, 0xCC, 0xE1, 0xB7, 0xF0, 0xC3, 0x81, 0x64, 0x73, 0x40, 0xA0, 0xC2,
-    0x4D, 0x89, 0x11, 0x75, 0x33, 0x55, 0x33, 0x8D, 0xE8, 0x4A, 0xFD, 0xEA, 0x6E, 0x30, 0x0B, 0xD7,
-    0x31, 0x2C, 0xDE, 0x47, 0xE3, 0xBF, 0xF8, 0x55, 0x42, 0xE2, 0x7F, 0x59, 0xE5, 0x17, 0xEF, 0x99,
-    0x34, 0x69, 0x91, 0xB1, 0x23, 0x8E, 0x20, 0x87, 0x2D, 0xA8, 0xFE, 0xD5, 0x8A, 0xF3, 0x84, 0x3A,
-    0xF0, 0x37, 0xE4, 0x09, 0x00, 0x54, 0xEE, 0x67, 0x49, 0x93, 0xE4, 0x81, 0x70, 0xE3, 0x90, 0x4D,
-    0xEF, 0xFE, 0x41, 0xB7, 0x99, 0x7B, 0xC1, 0x83, 0xBA, 0x62, 0x12, 0x6F, 0x7D, 0xDE, 0x6B, 0xAF,
-    0xDA, 0x16, 0xF9, 0x55, 0x51, 0xEE, 0xA6, 0x0C, 0x2B, 0x02, 0xA3, 0xFD, 0x8D, 0xFB, 0x30, 0x17,
-    0xE4, 0x6F, 0xDF, 0x36, 0x71, 0xC4, 0xCA, 0x87, 0x25, 0x48, 0xB0, 0x47, 0xEC, 0xEA, 0xB4, 0xBF,
-    0xA5, 0x4D, 0x9B, 0x9F, 0x02, 0x93, 0xC4, 0xE3, 0xE4, 0xE8, 0x42, 0x2D, 0x68, 0x81, 0x15, 0x0A,
-    0xEB, 0x84, 0x5B, 0xD6, 0xA8, 0x74, 0xFB, 0x7D, 0x1D, 0xCB, 0x2C, 0xDA, 0x46, 0x2A, 0x76, 0x62,
-    0xCE, 0xBC, 0x5C, 0x9E, 0x8B, 0xE7, 0xCF, 0xBE, 0x78, 0xF5, 0x7C, 0xEB, 0xB3, 0x3A, 0x9C, 0xAA,
-    0x6F, 0xCC, 0x72, 0xD1, 0x59, 0xF2, 0x11, 0x23, 0xD6, 0x3F, 0x48, 0xD1, 0xB7, 0xCE, 0xB0, 0xBF,
-    0xCB, 0xEA, 0x80, 0xDE, 0x57, 0xD4, 0x5E, 0x97, 0x2F, 0x75, 0xD1, 0x50, 0x8E, 0x80, 0x2C, 0x66,
-    0x79, 0xBF, 0x72, 0x4B, 0xBD, 0x8A, 0x81, 0x6C, 0xD3, 0xE1, 0x01, 0xDC, 0xD2, 0x15, 0x26, 0xC5,
-    0x36, 0xDA, 0x2C, 0x1A, 0xC0, 0x27, 0x94, 0xED, 0xB7, 0x9B, 0x85, 0x0B, 0x5E, 0x80, 0x97, 0xC5,
-    0xEC, 0x4F, 0xEC, 0x88, 0x5D, 0x50, 0x07, 0x35, 0x47, 0xDC, 0x0B, 0x3B, 0x3D, 0xDD, 0x60, 0xAF,
-    0xA8, 0x5D, 0x81, 0x38, 0x24, 0x25, 0x5D, 0x5C, 0x15, 0xD1, 0xDE, 0xB3, 0xAB, 0xEC, 0x05, 0x69,
-    0xEF, 0x83, 0xED, 0x57, 0x54, 0xB8, 0x64, 0x64, 0x11, 0x16, 0x32, 0x69, 0xDA, 0x9F, 0x2D, 0x7F,
-    0x36, 0xBB, 0x44, 0x5A, 0x34, 0xE8, 0x7F, 0xBF, 0x03, 0xEB, 0x00, 0x7F, 0x59, 0x68, 0x22, 0x79,
-    0xCF, 0x73, 0x6C, 0x2C, 0x29, 0xA7, 0xA1, 0x5F, 0x38, 0xA1, 0x1D, 0xF0, 0x20, 0x53, 0xE0, 0x1A,
-    0x63, 0x14, 0x58, 0x71, 0x10, 0xAA, 0x08, 0x0C, 0x3E, 0x16, 0x1A, 0x60, 0x22, 0x82, 0x7F, 0xBA,
-    0xA4, 0x43, 0xA0, 0xD0, 0xAC, 0x1B, 0xD5, 0x6B, 0x64, 0xB5, 0x14, 0x93, 0x31, 0x9E, 0x53, 0x50,
-    0xD0, 0x57, 0x66, 0xEE, 0x5A, 0x4F, 0xFB, 0x03, 0x2A, 0x69, 0x58, 0x76, 0xF1, 0x83, 0xF7, 0x4E,
-    0xBA, 0x8C, 0x42, 0x06, 0x60, 0x5D, 0x6D, 0xCE, 0x60, 0x88, 0xAE, 0xA4, 0xC3, 0xF1, 0x03, 0xA5,
-    0x4B, 0x98, 0xA1, 0xFF, 0x67, 0xE1, 0xAC, 0xA2, 0xB8, 0x62, 0xD7, 0x6F, 0xA0, 0x31, 0xB4, 0xD2,
-    0x77, 0xAF, 0x21, 0x10, 0x06, 0xC6, 0x9A, 0xFF, 0x1D, 0x09, 0x17, 0x0E, 0x5F, 0xF1, 0xAA, 0x54,
-    0x34, 0x4B, 0x45, 0x8A, 0x87, 0x63, 0xA6, 0xDC, 0xF9, 0x24, 0x30, 0x67, 0xC6, 0xB2, 0xD6, 0x61,
-    0x33, 0x69, 0xEE, 0x50, 0x61, 0x57, 0x28, 0xE7, 0x7E, 0xEE, 0xEC, 0x3A, 0x5A, 0x73, 0x4E, 0xA8,
-    0x8D, 0xE4, 0x18, 0xEA, 0xEC, 0x41, 0x64, 0xC8, 0xE2, 0xE8, 0x66, 0xB6, 0x2D, 0xB6, 0xFB, 0x6A,
-    0x6C, 0x16, 0xB3, 0xDD, 0x46, 0x43, 0xB9, 0x73, 0x00, 0x6A, 0x71, 0xED, 0x4E, 0x9D, 0x25, 0x1A,
-    0xC3, 0x3C, 0x4A, 0x95, 0x15, 0x99, 0x35, 0x81, 0x14, 0x02, 0xD6, 0x98, 0x9B, 0xEC, 0xD8, 0x23,
-    0x3B, 0x84, 0x29, 0xAF, 0x0C, 0x99, 0x83, 0xA6, 0x9A, 0x34, 0x4F, 0xFA, 0xE8, 0xD0, 0x3C, 0x4B,
-    0xD0, 0xFB, 0xB6, 0x68, 0xB8, 0x9E, 0x8F, 0xCD, 0xF7, 0x60, 0x2D, 0x7A, 0x22, 0xE5, 0x7D, 0xAB,
-    0x65, 0x1B, 0x95, 0xA7, 0xA8, 0x7F, 0xB6, 0x77, 0x47, 0x7B, 0x5F, 0x8B, 0x12, 0x72, 0xD0, 0xD4,
-    0x91, 0xEF, 0xDE, 0x19, 0x50, 0x3C, 0xA7, 0x8B, 0xC4, 0xA9, 0xB3, 0x23, 0xCB, 0x76, 0xE6, 0x81,
-    0xF0, 0xC1, 0x04, 0x8F, 0xA3, 0xB8, 0x54, 0x5B, 0x97, 0xAC, 0x19, 0xFF, 0x3F, 0x55, 0x27, 0x2F,
-    0xE0, 0x1D, 0x42, 0x9B, 0x57, 0xFC, 0x4B, 0x4E, 0x0F, 0xCE, 0x98, 0xA9, 0x43, 0x57, 0x03, 0xBD,
-    0xE7, 0xC8, 0x94, 0xDF, 0x6E, 0x36, 0x73, 0x32, 0xB4, 0xEF, 0x2E, 0x85, 0x7A, 0x6E, 0xFC, 0x6C,
-    0x18, 0x82, 0x75, 0x35, 0x90, 0x07, 0xF3, 0xE4, 0x9F, 0x3E, 0xDC, 0x68, 0xF3, 0xB5, 0xF3, 0x19,
-    0x80, 0x92, 0x06, 0x99, 0xA2, 0xE8, 0x6F, 0xFF, 0x2E, 0x7F, 0xAE, 0x42, 0xA4, 0x5F, 0xFB, 0xD4,
-    0x0E, 0x81, 0x2B, 0xC3, 0x04, 0xFF, 0x2B, 0xB3, 0x74, 0x4E, 0x36, 0x5B, 0x9C, 0x15, 0x00, 0xC6,
-    0x47, 0x2B, 0xE8, 0x8B, 0x3D, 0xF1, 0x9C, 0x03, 0x9A, 0x58, 0x7F, 0x9B, 0x9C, 0xBF, 0x85, 0x49,
-    0x79, 0x35, 0x2E, 0x56, 0x7B, 0x41, 0x14, 0x39, 0x47, 0x83, 0x26, 0xAA, 0x07, 0x89, 0x98, 0x11,
-    0x1B, 0x86, 0xE7, 0x73, 0x7A, 0xD8, 0x7D, 0x78, 0x61, 0x53, 0xE9, 0x79, 0xF5, 0x36, 0x8D, 0x44,
-    0x92, 0x84, 0xF9, 0x13, 0x50, 0x58, 0x3B, 0xA4, 0x6A, 0x36, 0x65, 0x49, 0x8E, 0x3C, 0x0E, 0xF1,
-    0x6F, 0xD2, 0x84, 0xC4, 0x7E, 0x8E, 0x3F, 0x39, 0xAE, 0x7C, 0x84, 0xF1, 0x63, 0x37, 0x8E, 0x3C,
-    0xCC, 0x3E, 0x44, 0x81, 0x45, 0xF1, 0x4B, 0xB9, 0xED, 0x6B, 0x36, 0x5D, 0xBB, 0x20, 0x60, 0x1A,
-    0x0F, 0xA3, 0xAA, 0x55, 0x77, 0x3A, 0xA9, 0xAE, 0x37, 0x4D, 0xBA, 0xB8, 0x86, 0x6B, 0xBC, 0x08,
-    0x50, 0xF6, 0xCC, 0xA4, 0xBD, 0x1D, 0x40, 0x72, 0xA5, 0x86, 0xFA, 0xE2, 0x10, 0xAE, 0x3D, 0x58,
-    0x4B, 0x97, 0xF3, 0x43, 0x74, 0xA9, 0x9E, 0xEB, 0x21, 0xB7, 0x01, 0xA4, 0x86, 0x93, 0x97, 0xEE,
-    0x2F, 0x4F, 0x3B, 0x86, 0xA1, 0x41, 0x6F, 0x41, 0x26, 0x90, 0x78, 0x5C, 0x7F, 0x30, 0x38, 0x4B,
-    0x3F, 0xAA, 0xEC, 0xED, 0x5C, 0x6F, 0x0E, 0xAD, 0x43, 0x87, 0xFD, 0x93, 0x35, 0xE6, 0x01, 0xEF,
-    0x41, 0x26, 0x90, 0x99, 0x9E, 0xFB, 0x19, 0x5B, 0xAD, 0xD2, 0x91, 0x8A, 0xE0, 0x46, 0xAF, 0x65,
-    0xFA, 0x4F, 0x84, 0xC1, 0xA1, 0x2D, 0xCF, 0x45, 0x8B, 0xD3, 0x85, 0x50, 0x55, 0x7C, 0xF9, 0x67,
-    0x88, 0xD4, 0x4E, 0xE9, 0xD7, 0x6B, 0x61, 0x54, 0xA1, 0xA4, 0xA6, 0xA2, 0xC2, 0xBF, 0x30, 0x9C,
-    0x40, 0x9F, 0x5F, 0xD7, 0x69, 0x2B, 0x24, 0x82, 0x5E, 0xD9, 0xD6, 0xA7, 0x12, 0x54, 0x1A, 0xF7,
-    0x55, 0x9F, 0x76, 0x50, 0xA9, 0x95, 0x84, 0xE6, 0x6B, 0x6D, 0xB5, 0x96, 0x54, 0xD6, 0xCD, 0xB3,
-    0xA1, 0x9B, 0x46, 0xA7, 0x94, 0x4D, 0xC4, 0x94, 0xB4, 0x98, 0xE3, 0xE1, 0xE2, 0x34, 0xD5, 0x33,
-    0x16, 0x07, 0x54, 0xCD, 0xB7, 0x77, 0x53, 0xDB, 0x4F, 0x4D, 0x46, 0x9D, 0xE9, 0xD4, 0x9C, 0x8A,
-    0x36, 0xB6, 0xB8, 0x38, 0x26, 0x6C, 0x0E, 0xFF, 0x9C, 0x1B, 0x43, 0x8B, 0x80, 0xCC, 0xB9, 0x3D,
-    0xDA, 0xC7, 0xF1, 0x8A, 0xF2, 0x6D, 0xB8, 0xD7, 0x74, 0x2F, 0x7E, 0x1E, 0xB7, 0xD3, 0x4A, 0xB4,
-    0xAC, 0xFC, 0x79, 0x48, 0x6C, 0xBC, 0x96, 0xB6, 0x94, 0x46, 0x57, 0x2D, 0xB0, 0xA3, 0xFC, 0x1E,
-    0xB9, 0x52, 0x60, 0x85, 0x2D, 0x41, 0xD0, 0x43, 0x01, 0x1E, 0x1C, 0xD5, 0x7D, 0xFC, 0xF3, 0x96,
-    0x0D, 0xC7, 0xCB, 0x2A, 0x29, 0x9A, 0x93, 0xDD, 0x88, 0x2D, 0x37, 0x5D, 0xAA, 0xFB, 0x49, 0x68,
-    0xA0, 0x9C, 0x50, 0x86, 0x7F, 0x68, 0x56, 0x57, 0xF9, 0x79, 0x18, 0x39, 0xD4, 0xE0, 0x01, 0x84,
-    0x33, 0x61, 0xCA, 0xA5, 0xD2, 0xD6, 0xE4, 0xC9, 0x8A, 0x4A, 0x23, 0x44, 0x4E, 0xBC, 0xF0, 0xDC,
-    0x24, 0xA1, 0xA0, 0xC4, 0xE2, 0x07, 0x3C, 0x10, 0xC4, 0xB5, 0x25, 0x4B, 0x65, 0x63, 0xF4, 0x80,
-    0xE7, 0xCF, 0x61, 0xB1, 0x71, 0x82, 0x21, 0x87, 0x2C, 0xF5, 0x91, 0x00, 0x32, 0x0C, 0xEC, 0xA9,
-    0xB5, 0x9A, 0x74, 0x85, 0xE3, 0x36, 0x8F, 0x76, 0x4F, 0x9C, 0x6D, 0xCE, 0xBC, 0xAD, 0x0A, 0x4B,
-    0xED, 0x76, 0x04, 0xCB, 0xC3, 0xB9, 0x33, 0x9E, 0x01, 0x93, 0x96, 0x69, 0x7D, 0xC5, 0xA2, 0x45,
-    0x79, 0x9B, 0x04, 0x5C, 0x84, 0x09, 0xED, 0x88, 0x43, 0xC7, 0xAB, 0x93, 0x14, 0x26, 0xA1, 0x40,
-    0xB5, 0xCE, 0x4E, 0xBF, 0x2A, 0x42, 0x85, 0x3E, 0x2C, 0x3B, 0x54, 0xE8, 0x12, 0x1F, 0x0E, 0x97,
-    0x59, 0xB2, 0x27, 0x89, 0xFA, 0xF2, 0xDF, 0x8E, 0x68, 0x59, 0xDC, 0x06, 0xBC, 0xB6, 0x85, 0x0D,
-    0x06, 0x22, 0xEC, 0xB1, 0xCB, 0xE5, 0x04, 0xE6, 0x3D, 0xB3, 0xB0, 0x41, 0x73, 0x08, 0x3F, 0x3C,
-    0x58, 0x86, 0x63, 0xEB, 0x50, 0xEE, 0x1D, 0x2C, 0x37, 0x74, 0xA9, 0xD3, 0x18, 0xA3, 0x47, 0x6E,
-    0x93, 0x54, 0xAD, 0x0A, 0x5D, 0xB8, 0x2A, 0x55, 0x5D, 0x78, 0xF6, 0xEE, 0xBE, 0x8E, 0x3C, 0x76,
-    0x69, 0xB9, 0x40, 0xC2, 0x34, 0xEC, 0x2A, 0xB9, 0xED, 0x7E, 0x20, 0xE4, 0x8D, 0x00, 0x38, 0xC7,
-    0xE6, 0x8F, 0x44, 0xA8, 0x86, 0xCE, 0xEB, 0x2A, 0xE9, 0x90, 0xF1, 0x4C, 0xDF, 0x32, 0xFB, 0x73,
-    0x1B, 0x6D, 0x92, 0x1E, 0x95, 0xFE, 0xB4, 0xDB, 0x65, 0xDF, 0x4D, 0x23, 0x54, 0x89, 0x48, 0xBF,
-    0x4A, 0x2E, 0x70, 0xD6, 0xD7, 0x62, 0xB4, 0x33, 0x29, 0xB1, 0x3A, 0x33, 0x4C, 0x23, 0x6D, 0xA6,
-    0x76, 0xA5, 0x21, 0x63, 0x48, 0xE6, 0x90, 0x5D, 0xED, 0x90, 0x95, 0x0B, 0x7A, 0x84, 0xBE, 0xB8,
-    0x0D, 0x5E, 0x63, 0x0C, 0x62, 0x26, 0x4C, 0x14, 0x5A, 0xB3, 0xAC, 0x23, 0xA4, 0x74, 0xA7, 0x6F,
-    0x33, 0x30, 0x05, 0x60, 0x01, 0x42, 0xA0, 0x28, 0xB7, 0xEE, 0x19, 0x38, 0xF1, 0x64, 0x80, 0x82,
-    0x43, 0xE1, 0x41, 0x27, 0x1F, 0x1F, 0x90, 0x54, 0x7A, 0xD5, 0x23, 0x2E, 0xD1, 0x3D, 0xCB, 0x28,
-    0xBA, 0x58, 0x7F, 0xDC, 0x7C, 0x91, 0x24, 0xE9, 0x28, 0x51, 0x83, 0x6E, 0xC5, 0x56, 0x21, 0x42,
-    0xED, 0xA0, 0x56, 0x22, 0xA1, 0x40, 0x80, 0x6B, 0xA8, 0xF7, 0x94, 0xCA, 0x13, 0x6B, 0x0C, 0x39,
-    0xD9, 0xFD, 0xE9, 0xF3, 0x6F, 0xA6, 0x9E, 0xFC, 0x70, 0x8A, 0xB3, 0xBC, 0x59, 0x3C, 0x1E, 0x1D,
-    0x6C, 0xF9, 0x7C, 0xAF, 0xF9, 0x88, 0x71, 0x95, 0xEB, 0x57, 0x00, 0xBD, 0x9F, 0x8C, 0x4F, 0xE1,
-    0x24, 0x83, 0xC5, 0x22, 0xEA, 0xFD, 0xD3, 0x0C, 0xE2, 0x17, 0x18, 0x7C, 0x6A, 0x4C, 0xDE, 0x77,
-    0xB4, 0x53, 0x9B, 0x4C, 0x81, 0xCD, 0x23, 0x60, 0xAA, 0x0E, 0x25, 0x73, 0x9C, 0x02, 0x79, 0x32,
-    0x30, 0xDF, 0x74, 0xDF, 0x75, 0x19, 0xF4, 0xA5, 0x14, 0x5C, 0xF7, 0x7A, 0xA8, 0xA5, 0x91, 0x84,
-    0x7C, 0x60, 0x03, 0x06, 0x3B, 0xCD, 0x50, 0xB6, 0x27, 0x9C, 0xFE, 0xB1, 0xDD, 0xCC, 0xD3, 0xB0,
-    0x59, 0x24, 0xB2, 0xCA, 0xE2, 0x1C, 0x81, 0x22, 0x9D, 0x07, 0x8F, 0x8E, 0xB9, 0xBE, 0x4E, 0xFA,
-    0xFC, 0x39, 0x65, 0xBA, 0xBF, 0x9D, 0x12, 0x37, 0x5E, 0x97, 0x7E, 0xF3, 0x89, 0xF5, 0x5D, 0xF5,
-    0xE3, 0x09, 0x8C, 0x62, 0xB5, 0x20, 0x9D, 0x0C, 0x53, 0x8A, 0x68, 0x1B, 0xD2, 0x8F, 0x75, 0x17,
-    0x5D, 0xD4, 0xE5, 0xDA, 0x75, 0x62, 0x19, 0x14, 0x6A, 0x26, 0x2D, 0xEB, 0xF8, 0xAF, 0x37, 0xF0,
-    0x6C, 0xA4, 0x55, 0xB1, 0xBC, 0xE2, 0x33, 0xC0, 0x9A, 0xCA, 0xB0, 0x11, 0x49, 0x4F, 0x68, 0x9B,
-    0x3B, 0x6B, 0x3C, 0xCC, 0x13, 0xF6, 0xC7, 0x85, 0x61, 0x68, 0x42, 0xAE, 0xBB, 0xDD, 0xCD, 0x45,
-    0x16, 0x29, 0x1D, 0xEA, 0xDB, 0xC8, 0x03, 0x94, 0x3C, 0xEE, 0x4F, 0x82, 0x11, 0xC3, 0xEC, 0x28,
-    0xBD, 0x97, 0x05, 0x99, 0xDE, 0xD7, 0xBB, 0x5E, 0x22, 0x1F, 0xD4, 0xEB, 0x64, 0xD9, 0x92, 0xD9,
-    0x85, 0xB7, 0x6A, 0x05, 0x6A, 0xE4, 0x24, 0x41, 0xF1, 0xCD, 0xF0, 0xD8, 0x3F, 0xF8, 0x9E, 0x0E,
-    0xCD, 0x0B, 0x7A, 0x70, 0x6B, 0x5A, 0x75, 0x0A, 0x6A, 0x33, 0x88, 0xEC, 0x17, 0x75, 0x08, 0x70,
-    0x10, 0x2F, 0x24, 0xCF, 0xC4, 0xE9, 0x42, 0x00, 0x61, 0x94, 0xCA, 0x1F, 0x3A, 0x76, 0x06, 0xFA,
-    0xD2, 0x48, 0x81, 0xF0, 0x77, 0x60, 0x03, 0x45, 0xD9, 0x61, 0xF4, 0xA4, 0x6F, 0x3D, 0xD9, 0x30,
-    0xC3, 0x04, 0x6B, 0x54, 0x2A, 0xB7, 0xEC, 0x3B, 0xF4, 0x4B, 0xF5, 0x68, 0x52, 0x26, 0xCE, 0xFF,
-    0x5D, 0x19, 0x91, 0xA0, 0xA3, 0xA5, 0xA9, 0xB1, 0xE0, 0x23, 0xC4, 0x0A, 0x77, 0x4D, 0xF9, 0x51,
-    0x20, 0xA3, 0xA5, 0xA9, 0xB1, 0xC1, 0x00, 0x82, 0x86, 0x8E, 0x7F, 0x5D, 0x19, 0x91, 0xA0, 0xA3,
-    0xC4, 0xEB, 0x54, 0x0B, 0x75, 0x68, 0x52, 0x07, 0x8C, 0x9A, 0x97, 0x8D, 0x79, 0x70, 0x62, 0x46,
-    0xEF, 0x5C, 0x1B, 0x95, 0x89, 0x71, 0x41, 0xE1, 0x21, 0xA1, 0xA1, 0xA1, 0xC0, 0x02, 0x67, 0x4C,
-    0x1A, 0xB6, 0xCF, 0xFD, 0x78, 0x53, 0x24, 0xAB, 0xB5, 0xC9, 0xF1, 0x60, 0x23, 0xA5, 0xC8, 0x12,
-    0x87, 0x6D, 0x58, 0x13, 0x85, 0x88, 0x92, 0x87, 0x6D, 0x58, 0x32, 0xC7, 0x0C, 0x9A, 0x97, 0xAC,
-    0xDA, 0x36, 0xEE, 0x5E, 0x3E, 0xDF, 0x1D, 0xB8, 0xF2, 0x66, 0x2F, 0xBD, 0xF8, 0x72, 0x47, 0xED,
-    0x58, 0x13, 0x85, 0x88, 0x92, 0x87, 0x8C, 0x7B, 0x55, 0x09, 0x90, 0xA2, 0xC6, 0xEF, 0x3D, 0xF8,
-    0x53, 0x24, 0xAB, 0xD4, 0x2A, 0xB7, 0xEC, 0x5A, 0x36, 0xEE, 0x5E, 0x3E, 0xDF, 0x3C, 0xFA, 0x76,
-    0x4F, 0xFD, 0x59, 0x30, 0xE2, 0x46, 0xEF, 0x3D, 0xF8, 0x53, 0x05, 0x69, 0x31, 0xC1, 0x00, 0x82,
-    0x86, 0x8E, 0x7F, 0x5D, 0x19, 0xB0, 0xE2, 0x27, 0xCC, 0xFB, 0x74, 0x4B, 0x14, 0x8B, 0x94, 0x8B,
-    0x75, 0x68, 0x33, 0xC5, 0x08, 0x92, 0x87, 0x8C, 0x9A, 0xB6, 0xCF, 0x1C, 0xBA, 0xD7, 0x0D, 0x98,
-    0xB2, 0xE6, 0x2F, 0xDC, 0x1B, 0x95, 0x89, 0x71, 0x60, 0x23, 0xC4, 0x0A, 0x96, 0x8F, 0x9C, 0xBA,
-    0xF6, 0x6E, 0x3F, 0xFC, 0x5B, 0x15, 0xA8, 0xD2, 0x26, 0xAF, 0xBD, 0xF8, 0x72, 0x66, 0x2F, 0xDC,
-    0x1B, 0xB4, 0xCB, 0x14, 0x8B, 0x94, 0xAA, 0xB7, 0xCD, 0xF9, 0x51, 0x01, 0x80, 0x82, 0x86, 0x6F,
-    0x3D, 0xD9, 0x30, 0xE2, 0x27, 0xCC, 0xFB, 0x74, 0x4B, 0x14, 0xAA, 0xB7, 0xCD, 0xF9, 0x70, 0x43,
-    0x04, 0x6B, 0x35, 0xC9, 0xF1, 0x60, 0x23, 0xA5, 0xC8, 0xF3, 0x45, 0x08, 0x92, 0x87, 0x6D, 0x58,
-    0x32, 0xE6, 0x2F, 0xBD, 0xF8, 0x72, 0x66, 0x4E, 0x1E, 0xBE, 0xFE, 0x7E, 0x7E, 0x7E, 0x5F, 0x1D,
-    0x99, 0x91, 0xA0, 0xA3, 0xC4, 0x0A, 0x77, 0x4D, 0x18, 0x93, 0xA4, 0xAB, 0xD4, 0x0B, 0x75, 0x49,
-    0x10, 0xA2, 0xC6, 0xEF, 0x3D, 0xF8, 0x53, 0x24, 0xAB, 0xB5, 0xE8, 0x33, 0xE4, 0x4A, 0x16, 0xAE,
-    0xDE, 0x1F, 0xBC, 0xDB, 0x15, 0xA8, 0xB3, 0xC5, 0x08, 0x73, 0x45, 0xE9, 0x31, 0xC1, 0xE1, 0x21,
-    0xA1, 0xA1, 0xA1, 0xC0, 0x02, 0x86, 0x6F, 0x5C, 0x3A, 0xD7, 0x0D, 0x98, 0x93, 0xA4, 0xCA, 0x16,
-    0xAE, 0xDE, 0x1F, 0x9D, 0x99, 0xB0, 0xE2, 0x46, 0xEF, 0x3D, 0xF8, 0x72, 0x47, 0x0C, 0x9A, 0xB6,
-    0xCF, 0xFD, 0x59, 0x11, 0xA0, 0xA3, 0xA5, 0xC8, 0xF3, 0x45, 0x08, 0x92, 0x87, 0x6D, 0x39, 0xF0,
-    0x43, 0x04, 0x8A, 0x96, 0xAE, 0xDE, 0x3E, 0xDF, 0x1D, 0x99, 0x91, 0xA0, 0xC2, 0x06, 0x6F, 0x3D,
-    0xF8, 0x72, 0x47, 0x0C, 0x9A, 0x97, 0x8D, 0x98, 0x93, 0x85, 0x88, 0x73, 0x45, 0xE9, 0x31, 0xE0,
-    0x23, 0xA5, 0xA9, 0xD0, 0x03, 0x84, 0x8A, 0x96, 0xAE, 0xDE, 0x1F, 0xBC, 0xDB, 0x15, 0xA8, 0xD2,
-    0x26, 0xCE, 0xFF, 0x5D, 0x19, 0x91, 0x81, 0x80, 0x82, 0x67, 0x2D, 0xD8, 0x13, 0xA4, 0xAB, 0xD4,
-    0x0B, 0x94, 0xAA, 0xB7, 0xCD, 0xF9, 0x51, 0x20, 0xA3, 0xA5, 0xC8, 0xF3, 0x45, 0xE9, 0x50, 0x22,
-    0xC6, 0xEF, 0x5C, 0x3A, 0xD7, 0x0D, 0x98, 0x93, 0x85, 0x88, 0x73, 0x64, 0x4A, 0xF7, 0x4D, 0xF9,
-    0x51, 0x20, 0xA3, 0xC4, 0x0A, 0x96, 0xAE, 0xDE, 0x3E, 0xFE, 0x7E, 0x7E, 0x7E, 0x5F, 0x3C, 0xFA,
-    0x76, 0x4F, 0xFD, 0x78, 0x72, 0x66, 0x2F, 0xBD, 0xD9, 0x30, 0xC3, 0xE5, 0x48, 0x12, 0x87, 0x8C,
-    0x7B, 0x55, 0x28, 0xD2, 0x07, 0x8C, 0x9A, 0x97, 0xAC, 0xDA, 0x17, 0x8D, 0x79, 0x51, 0x20, 0xA3,
-    0xC4, 0xEB, 0x54, 0x0B, 0x94, 0x8B, 0x94, 0xAA, 0xD6, 0x2E, 0xBF, 0xFC, 0x5B, 0x15, 0xA8, 0xD2,
-    0x26, 0xAF, 0xDC, 0x1B, 0xB4, 0xEA, 0x37, 0xEC, 0x3B, 0xF4, 0x6A, 0x37, 0xCD, 0x18, 0x93, 0x85,
-    0x69, 0x31, 0xC1, 0xE1, 0x40, 0xE3, 0x25, 0xC8, 0x12, 0x87, 0x8C, 0x9A, 0xB6, 0xCF, 0xFD, 0x59,
-    0x11, 0xA0, 0xC2, 0x06, 0x8E, 0x7F, 0x5D, 0x38, 0xF2, 0x47, 0x0C, 0x7B, 0x74, 0x6A, 0x37, 0xEC,
-    0x5A, 0x36, 0xEE, 0x3F, 0xFC, 0x7A, 0x76, 0x4F, 0x1C, 0x9B, 0x95, 0x89, 0x71, 0x41, 0x00, 0x63,
-    0x44, 0xEB, 0x54, 0x2A, 0xD6, 0x0F, 0x9C, 0xBA, 0xD7, 0x0D, 0x98, 0x93, 0x85, 0x69, 0x31, 0xC1,
-    0x00, 0x82, 0x86, 0x8E, 0x9E, 0xBE, 0xDF, 0x3C, 0xFA, 0x57, 0x2C, 0xDA, 0x36, 0xEE, 0x3F, 0xFC,
-    0x5B, 0x15, 0x89, 0x71, 0x41, 0x00, 0x82, 0x86, 0x8E, 0x7F, 0x5D, 0x38, 0xF2, 0x47, 0xED, 0x58,
-    0x13, 0xA4, 0xCA, 0xF7, 0x4D, 0xF9, 0x51, 0x01, 0x80, 0x63, 0x44, 0xEB, 0x54, 0x2A, 0xD6, 0x2E,
-    0xBF, 0xDD, 0x19, 0x91, 0xA0, 0xA3, 0xA5, 0xA9, 0xB1, 0xE0, 0x42, 0x06, 0x8E, 0x7F, 0x5D, 0x19,
-    0x91, 0xA0, 0xA3, 0xC4, 0x0A, 0x96, 0x8F, 0x7D, 0x78, 0x72, 0x47, 0x0C, 0x7B, 0x74, 0x6A, 0x56,
-    0x2E, 0xDE, 0x1F, 0xBC, 0xFA, 0x57, 0x0D, 0x79, 0x51, 0x01, 0x61, 0x21, 0xA1, 0xC0, 0xE3, 0x25,
-    0xA9, 0xB1, 0xC1, 0xE1, 0x40, 0x02, 0x67, 0x4C, 0x1A, 0x97, 0x8D, 0x98, 0x93, 0xA4, 0xAB, 0xD4,
-    0x2A, 0xD6, 0x0F, 0x9C, 0x9B, 0xB4, 0xCB, 0x14, 0xAA, 0xB7, 0xCD, 0xF9, 0x51, 0x20, 0xA3, 0xC4,
-    0xEB, 0x35, 0xC9, 0xF1, 0x60, 0x42, 0x06, 0x8E, 0x7F, 0x7C, 0x7A, 0x76, 0x6E, 0x3F, 0xFC, 0x7A,
-    0x76, 0x6E, 0x5E, 0x3E, 0xFE, 0x7E, 0x5F, 0x3C, 0xDB, 0x15, 0x89, 0x71, 0x41, 0xE1, 0x21, 0xC0,
-    0xE3, 0x44, 0xEB, 0x54, 0x2A, 0xB7, 0xCD, 0xF9, 0x70, 0x62, 0x27, 0xAD, 0xD8, 0x32, 0xC7, 0x0C,
-    0x7B, 0x74, 0x4B, 0x14, 0xAA, 0xB7, 0xEC, 0x3B, 0xD5, 0x28, 0xD2, 0x07, 0x6D, 0x39, 0xD1, 0x20,
-    0xC2, 0xE7, 0x4C, 0x1A, 0x97, 0x8D, 0x98, 0xB2, 0xC7, 0x0C, 0x59, 0x28, 0xF3, 0x9B
-};
diff --git a/drivers/sensors/pmw3389.c b/drivers/sensors/pmw3389.c
index 828dafa134..cba94d6c65 100644
--- a/drivers/sensors/pmw3389.c
+++ b/drivers/sensors/pmw3389.c
@@ -1,294 +1,314 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Stefan Kerkmann (KarlK90)
+// Copyright 2021 Alabastard (@Alabastard-64)
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// Copyright 2019 Sunjun Kim
+// Copyright 2020 Ploopy Corporation
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "spi_master.h"
-#include "pmw3389.h"
-#include "wait.h"
-#include "debug.h"
-#include "print.h"
-#include "pmw3389_firmware.h"
+#include "pmw33xx_common.h"
+#include "progmem.h"
 
-// Registers
-// clang-format off
-#define REG_Product_ID                 0x00
-#define REG_Revision_ID                0x01
-#define REG_Motion                     0x02
-#define REG_Delta_X_L                  0x03
-#define REG_Delta_X_H                  0x04
-#define REG_Delta_Y_L                  0x05
-#define REG_Delta_Y_H                  0x06
-#define REG_SQUAL                      0x07
-#define REG_RawData_Sum                0x08
-#define REG_Maximum_RawData            0x09
-#define REG_Minimum_RawData            0x0a
-#define REG_Shutter_Lower              0x0b
-#define REG_Shutter_Upper              0x0c
-#define REG_Ripple_Control             0x0d
-#define REG_Resolution_L               0x0e
-#define REG_Resolution_H               0x0f
-#define REG_Config2                    0x10
-#define REG_Angle_Tune                 0x11
-#define REG_Frame_Capture              0x12
-#define REG_SROM_Enable                0x13
-#define REG_Run_Downshift              0x14
-#define REG_Rest1_Rate_Lower           0x15
-#define REG_Rest1_Rate_Upper           0x16
-#define REG_Rest1_Downshift            0x17
-#define REG_Rest2_Rate_Lower           0x18
-#define REG_Rest2_Rate_Upper           0x19
-#define REG_Rest2_Downshift            0x1a
-#define REG_Rest3_Rate_Lower           0x1b
-#define REG_Rest3_Rate_Upper           0x1c
-#define REG_Observation                0x24
-#define REG_Data_Out_Lower             0x25
-#define REG_Data_Out_Upper             0x26
-#define REG_SROM_ID                    0x2a
-#define REG_Min_SQ_Run                 0x2b
-#define REG_RawData_Threshold          0x2c
-#define REG_Control2                   0x2d
-#define REG_Config5_L                  0x2e
-#define REG_Config5_H                  0x2f
-#define REG_Power_Up_Reset             0X3a
-#define REG_Shutdown                   0x3b
-#define REG_Inverse_Product_ID         0x3f
-#define REG_LiftCutoff_Cal3            0x41
-#define REG_Angle_Snap                 0x42
-#define REG_LiftCutoff_Cal1            0x4a
-#define REG_Motion_Burst               0x50
-#define REG_SROM_Load_Burst            0x62
-#define REG_Lift_Config                0x63
-#define REG_RawData_Burst              0x64
-#define REG_LiftCutoff_Cal2            0x65
-#define REG_LiftCutoff_Cal_Timeout     0x71
-#define REG_LiftCutoff_Cal_Min_Length  0x72
-#define REG_PWM_Period_Cnt             0x73
-#define REG_PWM_Width_Cnt              0x74
+extern const size_t pmw33xx_number_of_sensors;
 
-#define CPI_STEP       50
-// clang-format on
-
-// limits to 0--319, resulting in a CPI range of 50 -- 16000 (as only steps of 50 are possible).
-#ifndef MAX_CPI
-#    define MAX_CPI 0x013f
-#endif
-
-bool _inBurst = false;
-
-#ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) {
-    dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
-}
-#endif
-#define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
-
-bool pmw3389_spi_start(void) {
-    bool status = spi_start(PMW3389_CS_PIN, PMW3389_SPI_LSBFIRST, PMW3389_SPI_MODE, PMW3389_SPI_DIVISOR);
-    // tNCS-SCLK, 120ns
-    wait_us(1);
-    return status;
-}
-
-spi_status_t pmw3389_write(uint8_t reg_addr, uint8_t data) {
-    pmw3389_spi_start();
-
-    if (reg_addr != REG_Motion_Burst) {
-        _inBurst = false;
+uint16_t pmw33xx_get_cpi(uint8_t sensor) {
+    if (sensor >= pmw33xx_number_of_sensors) {
+        return 0;
     }
 
-    // send address of the register, with MSBit = 1 to indicate it's a write
-    spi_status_t status = spi_write(reg_addr | 0x80);
-    status              = spi_write(data);
-
-    // tSCLK-NCS for write operation is 35 us
-    wait_us(35);
-    spi_stop();
-
-    // tSWW/tSWR (=180us) minus tSCLK-NCS. Could be shortened, but is looks like a safe lower bound
-    wait_us(145);
-    return status;
+    uint16_t cpival = (pmw33xx_read(sensor, REG_Resolution_H) << 8) | pmw33xx_read(sensor, REG_Resolution_L);
+    return (uint16_t)((cpival + 1) & 0xFFFF) * PMW33XX_CPI_STEP;
 }
 
-uint8_t pmw3389_read(uint8_t reg_addr) {
-    pmw3389_spi_start();
-    // send adress of the register, with MSBit = 0 to indicate it's a read
-    spi_write(reg_addr & 0x7f);
-    // tSRAD (=160us)
-    wait_us(160);
-    uint8_t data = spi_read();
-
-    // tSCLK-NCS, 120ns
-    wait_us(1);
-    spi_stop();
-
-    //  tSRW/tSRR (=20us) minus tSCLK-NCS
-    wait_us(19);
-    return data;
-}
-
-bool pmw3389_init(void) {
-    setPinOutput(PMW3389_CS_PIN);
-
-    spi_init();
-    _inBurst = false;
-
-    spi_stop();
-    pmw3389_spi_start();
-    spi_stop();
-
-    pmw3389_write(REG_Shutdown, 0xb6); // Shutdown first
-    wait_ms(300);
-
-    pmw3389_spi_start();
-    wait_us(40);
-    spi_stop();
-    wait_us(40);
-
-    // power up, need to first drive NCS high then low, see above.
-    pmw3389_write(REG_Power_Up_Reset, 0x5a);
-    wait_ms(50);
-
-    // read registers and discard
-    pmw3389_read(REG_Motion);
-    pmw3389_read(REG_Delta_X_L);
-    pmw3389_read(REG_Delta_X_H);
-    pmw3389_read(REG_Delta_Y_L);
-    pmw3389_read(REG_Delta_Y_H);
-
-    pmw3389_upload_firmware();
-
-    spi_stop();
-
-    wait_ms(10);
-    pmw3389_set_cpi(PMW3389_CPI);
-
-    wait_ms(1);
-
-    pmw3389_write(REG_Config2, 0x00);
-
-    pmw3389_write(REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
-
-    pmw3389_write(REG_Lift_Config, PMW3389_LIFTOFF_DISTANCE);
-
-    bool init_success = pmw3389_check_signature();
-#ifdef CONSOLE_ENABLE
-    if (init_success) {
-        dprintf("pmw3389 signature verified");
-    } else {
-        dprintf("pmw3389 signature verification failed!");
+void pmw33xx_set_cpi(uint8_t sensor, uint16_t cpi) {
+    if (sensor >= pmw33xx_number_of_sensors) {
+        return;
     }
-#endif
 
-    writePinLow(PMW3389_CS_PIN);
-
-    return init_success;
-}
-
-void pmw3389_upload_firmware(void) {
-    // Datasheet claims we need to disable REST mode first, but during startup
-    // it's already disabled and we're not turning it on ...
-    // pmw3389_write(REG_Config2, 0x00);  // disable REST mode
-    pmw3389_write(REG_SROM_Enable, 0x1d);
-
-    wait_ms(10);
-
-    pmw3389_write(REG_SROM_Enable, 0x18);
-
-    pmw3389_spi_start();
-    spi_write(REG_SROM_Load_Burst | 0x80);
-    wait_us(15);
-
-    for (uint16_t i = 0; i < FIRMWARE_LENGTH; i++) {
-        spi_write(pgm_read_byte(firmware_data + i));
-#ifndef PMW3389_FIRMWARE_UPLOAD_FAST
-        wait_us(15);
-#endif
-    }
-    wait_us(200);
-
-    pmw3389_read(REG_SROM_ID);
-    pmw3389_write(REG_Config2, 0x00);
-}
-
-bool pmw3389_check_signature(void) {
-    uint8_t pid      = pmw3389_read(REG_Product_ID);
-    uint8_t iv_pid   = pmw3389_read(REG_Inverse_Product_ID);
-    uint8_t SROM_ver = pmw3389_read(REG_SROM_ID);
-    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]); // signature for SROM 0x04
-}
-
-uint16_t pmw3389_get_cpi(void) {
-    uint16_t cpival = (pmw3389_read(REG_Resolution_H) << 8) | pmw3389_read(REG_Resolution_L);
-    return (uint16_t)((cpival + 1) & 0xffff) * CPI_STEP;
-}
-
-void pmw3389_set_cpi(uint16_t cpi) {
-    uint16_t cpival = constrain((cpi / CPI_STEP) - 1, 0, MAX_CPI);
+    uint16_t cpival = CONSTRAIN((cpi / PMW33XX_CPI_STEP) - 1, 0, (PMW33XX_CPI_MAX / PMW33XX_CPI_STEP) - 1U);
     // Sets upper byte first for more consistent setting of cpi
-    pmw3389_write(REG_Resolution_H, (cpival >> 8) & 0xff);
-    pmw3389_write(REG_Resolution_L, cpival & 0xff);
+    pmw33xx_write(sensor, REG_Resolution_H, (cpival >> 8) & 0xFF);
+    pmw33xx_write(sensor, REG_Resolution_L, cpival & 0xFF);
 }
 
-report_pmw3389_t pmw3389_read_burst(void) {
-    report_pmw3389_t report = {0};
+// PID, Inverse PID, SROM version
+const uint8_t pmw33xx_firmware_signature[3] PROGMEM = {0x42, 0xBD, 0x04};
 
-    if (!_inBurst) {
-#ifdef CONSOLE_ENABLE
-        dprintf("burst on");
-#endif
-        pmw3389_write(REG_Motion_Burst, 0x00);
-        _inBurst = true;
-    }
+// Firmware Blob for PMW3389
+// clang-format off
+const uint8_t pmw33xx_firmware_data[PMW33XX_FIRMWARE_LENGTH] PROGMEM = {
+    0x01, 0xe8, 0xba, 0x26, 0x0b, 0xb2, 0xbe, 0xfe, 0x7e, 0x5f, 0x3c, 0xdb, 0x15, 0xa8, 0xb3,
+    0xe4, 0x2b, 0xb5, 0xe8, 0x53, 0x07, 0x6d, 0x3b, 0xd1, 0x20, 0xc2, 0x06, 0x6f, 0x3d, 0xd9,
+    0x11, 0xa0, 0xc2, 0xe7, 0x2d, 0xb9, 0xd1, 0x20, 0xa3, 0xa5, 0xc8, 0xf3, 0x64, 0x4a, 0xf7,
+    0x4d, 0x18, 0x93, 0xa4, 0xca, 0xf7, 0x6c, 0x5a, 0x36, 0xee, 0x5e, 0x3e, 0xfe, 0x7e, 0x7e,
+    0x5f, 0x1d, 0x99, 0xb0, 0xc3, 0xe5, 0x29, 0xd3, 0x03, 0x65, 0x48, 0x12, 0x87, 0x6d, 0x58,
+    0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xf2, 0x4f, 0xfd, 0x59, 0x11, 0x81, 0x61, 0x21, 0xc0, 0x02,
+    0x86, 0x8e, 0x7f, 0x5d, 0x38, 0xf2, 0x47, 0x0c, 0x7b, 0x55, 0x28, 0xb3, 0xe4, 0x4a, 0x16,
+    0xab, 0xbf, 0xdd, 0x38, 0xf2, 0x66, 0x4e, 0xff, 0x5d, 0x19, 0x91, 0xa0, 0xa3, 0xa5, 0xc8,
+    0x12, 0xa6, 0xaf, 0xdc, 0x3a, 0xd1, 0x41, 0x60, 0x75, 0x58, 0x24, 0x92, 0xd4, 0x72, 0x6c,
+    0xe0, 0x2f, 0xfd, 0x23, 0x8d, 0x1c, 0x5b, 0xb2, 0x97, 0x36, 0x3d, 0x0b, 0xa2, 0x49, 0xb1,
+    0x58, 0xf2, 0x1f, 0xc0, 0xcb, 0xf8, 0x41, 0x4f, 0xcd, 0x1e, 0x6b, 0x39, 0xa7, 0x2b, 0xe9,
+    0x30, 0x16, 0x83, 0xd2, 0x0e, 0x47, 0x8f, 0xe3, 0xb1, 0xdf, 0xa2, 0x15, 0xdb, 0x5d, 0x30,
+    0xc5, 0x1a, 0xab, 0x31, 0x99, 0xf3, 0xfa, 0xb2, 0x86, 0x69, 0xad, 0x7a, 0xe8, 0xa7, 0x18,
+    0x6a, 0xcc, 0xc8, 0x65, 0x23, 0x87, 0xa8, 0x5f, 0xf5, 0x21, 0x59, 0x75, 0x09, 0x71, 0x45,
+    0x55, 0x25, 0x4b, 0xda, 0xa1, 0xc3, 0xf7, 0x41, 0xab, 0x59, 0xd9, 0x74, 0x12, 0x55, 0x5f,
+    0xbc, 0xaf, 0xd9, 0xfd, 0xb0, 0x1e, 0xa3, 0x0f, 0xff, 0xde, 0x11, 0x16, 0x6a, 0xae, 0x0e,
+    0xe1, 0x5d, 0x3c, 0x10, 0x43, 0x9a, 0xa1, 0x0b, 0x24, 0x8f, 0x0d, 0x7f, 0x0b, 0x5e, 0x4c,
+    0x42, 0xa4, 0x84, 0x2c, 0x40, 0xd0, 0x55, 0x39, 0xe6, 0x4b, 0xf8, 0x9b, 0x2f, 0xdc, 0x28,
+    0xff, 0xfa, 0xb5, 0x85, 0x19, 0xe5, 0x28, 0xa1, 0x77, 0xaa, 0x73, 0xf3, 0x03, 0xc7, 0x62,
+    0xa6, 0x91, 0x18, 0xc9, 0xb0, 0xcd, 0x05, 0xdc, 0xca, 0x81, 0x26, 0x1a, 0x47, 0x40, 0xda,
+    0x36, 0x7d, 0x6a, 0x53, 0xc8, 0x5a, 0x77, 0x5d, 0x19, 0xa4, 0x1b, 0x23, 0x83, 0xd0, 0xb2,
+    0xaa, 0x0e, 0xbf, 0x77, 0x4e, 0x3a, 0x3b, 0x59, 0x00, 0x31, 0x0d, 0x02, 0x1b, 0x88, 0x7a,
+    0xd4, 0xbd, 0x9d, 0xcc, 0x58, 0x04, 0x69, 0xf6, 0x3b, 0xca, 0x42, 0xe2, 0xfd, 0xc3, 0x3d,
+    0x39, 0xc5, 0xd0, 0x71, 0xe4, 0xc8, 0xb7, 0x3e, 0x3f, 0xc8, 0xe9, 0xca, 0xc9, 0x3f, 0x04,
+    0x4e, 0x1b, 0x79, 0xca, 0xa5, 0x61, 0xc2, 0xed, 0x1d, 0xa6, 0xda, 0x5a, 0xe9, 0x7f, 0x65,
+    0x8c, 0xbe, 0x12, 0x6e, 0xa4, 0x5b, 0x33, 0x2f, 0x84, 0x28, 0x9c, 0x1c, 0x88, 0x2d, 0xff,
+    0x07, 0xbf, 0xa6, 0xd7, 0x5a, 0x88, 0x86, 0xb0, 0x3f, 0xf6, 0x31, 0x5b, 0x11, 0x6d, 0xf5,
+    0x58, 0xeb, 0x58, 0x02, 0x9e, 0xb5, 0x9a, 0xb1, 0xff, 0x25, 0x9d, 0x8b, 0x4f, 0xb6, 0x0a,
+    0xf9, 0xea, 0x3e, 0x3f, 0x21, 0x09, 0x65, 0x21, 0x22, 0xfe, 0x3d, 0x4e, 0x11, 0x5b, 0x9e,
+    0x5a, 0x59, 0x8b, 0xdd, 0xd8, 0xce, 0xd6, 0xd9, 0x59, 0xd2, 0x1e, 0xfd, 0xef, 0x0d, 0x1b,
+    0xd9, 0x61, 0x7f, 0xd7, 0x2d, 0xad, 0x62, 0x09, 0xe5, 0x22, 0x63, 0xea, 0xc7, 0x31, 0xd9,
+    0xa1, 0x38, 0x80, 0x5c, 0xa7, 0x32, 0x82, 0xec, 0x1b, 0xa2, 0x49, 0x5a, 0x06, 0xd2, 0x7c,
+    0xc9, 0x96, 0x57, 0xbb, 0x17, 0x75, 0xfc, 0x7a, 0x8f, 0x0d, 0x77, 0xb5, 0x7a, 0x8e, 0x3e,
+    0xf4, 0xba, 0x2f, 0x69, 0x13, 0x26, 0xd6, 0xd9, 0x21, 0x60, 0x2f, 0x21, 0x3e, 0x87, 0xee,
+    0xfd, 0x87, 0x16, 0x0d, 0xc8, 0x08, 0x00, 0x25, 0x71, 0xac, 0x2c, 0x03, 0x2a, 0x37, 0x2d,
+    0xb3, 0x34, 0x09, 0x91, 0xe3, 0x06, 0x2c, 0x38, 0x37, 0x95, 0x3b, 0x17, 0x7a, 0xaf, 0xac,
+    0x99, 0x55, 0xab, 0x41, 0x39, 0x5f, 0x8e, 0xa6, 0x43, 0x80, 0x03, 0x88, 0x6f, 0x7d, 0xbd,
+    0x5a, 0xb4, 0x2b, 0x32, 0x23, 0x5a, 0xa9, 0x31, 0x32, 0x39, 0x4c, 0x5b, 0xf4, 0x6b, 0xaf,
+    0x66, 0x6f, 0x3c, 0x8e, 0x2d, 0x82, 0x97, 0x9f, 0x4a, 0x01, 0xdc, 0x99, 0x98, 0x00, 0xec,
+    0x38, 0x7a, 0x79, 0x70, 0xa6, 0x85, 0xd6, 0x21, 0x63, 0x0d, 0x45, 0x9a, 0x2e, 0x5e, 0xa7,
+    0xb1, 0xea, 0x66, 0x6a, 0xbc, 0x62, 0x2d, 0x7b, 0x7d, 0x85, 0xea, 0x95, 0x2f, 0xc0, 0xe8,
+    0x6f, 0x35, 0xa0, 0x3a, 0x02, 0x25, 0xbc, 0xb2, 0x5f, 0x5c, 0x43, 0x96, 0xcc, 0x26, 0xd2,
+    0x16, 0xb4, 0x96, 0x73, 0xd7, 0x13, 0xc7, 0xae, 0x53, 0x15, 0x31, 0x89, 0x68, 0x66, 0x6d,
+    0x2c, 0x92, 0x1f, 0xcc, 0x5b, 0xa7, 0x8f, 0x5d, 0xbb, 0xc9, 0xdb, 0xe8, 0x3b, 0x9d, 0x61,
+    0x74, 0x8b, 0x05, 0xa1, 0x58, 0x52, 0x68, 0xee, 0x3d, 0x39, 0x79, 0xa0, 0x9b, 0xdd, 0xe1,
+    0x55, 0xc9, 0x60, 0xeb, 0xad, 0xb8, 0x5b, 0xc2, 0x5a, 0xb5, 0x2c, 0x18, 0x55, 0xa9, 0x50,
+    0xc3, 0xf6, 0x72, 0x5f, 0xcc, 0xe2, 0xf4, 0x55, 0xb5, 0xd6, 0xb5, 0x4a, 0x99, 0xa5, 0x28,
+    0x74, 0x97, 0x18, 0xe8, 0xc0, 0x84, 0x89, 0x50, 0x03, 0x86, 0x4d, 0x1a, 0xb7, 0x09, 0x90,
+    0xa2, 0x01, 0x04, 0xbb, 0x73, 0x62, 0xcb, 0x97, 0x22, 0x70, 0x5d, 0x52, 0x41, 0x8e, 0xd9,
+    0x90, 0x15, 0xaa, 0xab, 0x0a, 0x31, 0x65, 0xb4, 0xda, 0xd0, 0xee, 0x24, 0xc9, 0x41, 0x91,
+    0x1e, 0xbc, 0x46, 0x70, 0x40, 0x9d, 0xda, 0x0e, 0x2a, 0xe4, 0xb2, 0x4c, 0x9f, 0xf2, 0xfc,
+    0xf3, 0x84, 0x17, 0x44, 0x1e, 0xd7, 0xca, 0x23, 0x1f, 0x3f, 0x5a, 0x22, 0x3d, 0xaf, 0x9b,
+    0x2d, 0xfc, 0x41, 0xad, 0x26, 0xb4, 0x45, 0x67, 0x0b, 0x80, 0x0e, 0xf9, 0x61, 0x37, 0xec,
+    0x3b, 0xf4, 0x4b, 0x14, 0xdf, 0x5a, 0x0c, 0x3a, 0x50, 0x0b, 0x14, 0x0c, 0x72, 0xae, 0xc6,
+    0xc5, 0xec, 0x35, 0x53, 0x2d, 0x59, 0xed, 0x91, 0x74, 0xe2, 0xc4, 0xc8, 0xf2, 0x25, 0x6b,
+    0x97, 0x6f, 0xc9, 0x76, 0xce, 0xa9, 0xb1, 0x99, 0x8f, 0x5a, 0x92, 0x3b, 0xc4, 0x8d, 0x54,
+    0x50, 0x40, 0x72, 0xd6, 0x90, 0x83, 0xfc, 0xe5, 0x49, 0x8b, 0x17, 0xf5, 0xfd, 0x6b, 0x8d,
+    0x32, 0x02, 0xe9, 0x0a, 0xfe, 0xbf, 0x00, 0x6b, 0xa3, 0xad, 0x5f, 0x09, 0x4b, 0x97, 0x2b,
+    0x00, 0x58, 0x65, 0x2e, 0x07, 0x49, 0x0a, 0x3b, 0x6b, 0x2e, 0x50, 0x6c, 0x1d, 0xac, 0xb7,
+    0x6a, 0x26, 0xd8, 0x13, 0xa4, 0xca, 0x16, 0xae, 0xab, 0x93, 0xb9, 0x1c, 0x1c, 0xb4, 0x47,
+    0x6a, 0x38, 0x36, 0x17, 0x27, 0xc9, 0x7f, 0xc7, 0x64, 0xcb, 0x89, 0x58, 0xc5, 0x61, 0xc2,
+    0xc6, 0xea, 0x15, 0x0b, 0x34, 0x0c, 0x5d, 0x61, 0x76, 0x6e, 0x2b, 0x62, 0x40, 0x92, 0xa3,
+    0x6c, 0xef, 0xf4, 0xe4, 0xc3, 0xa1, 0xa8, 0xf5, 0x94, 0x79, 0x0d, 0xd1, 0x3d, 0xcb, 0x3d,
+    0x40, 0xb6, 0xd0, 0xf0, 0x10, 0x54, 0xd8, 0x47, 0x25, 0x51, 0xc5, 0x41, 0x79, 0x00, 0xe5,
+    0xa0, 0x72, 0xde, 0xbb, 0x3b, 0x62, 0x17, 0xf6, 0xbc, 0x5d, 0x00, 0x76, 0x2e, 0xa7, 0x3b,
+    0xb6, 0xf1, 0x98, 0x72, 0x59, 0x2a, 0x73, 0xb0, 0x21, 0xd6, 0x49, 0xe0, 0xc0, 0xd5, 0xeb,
+    0x02, 0x7d, 0x4b, 0x41, 0x28, 0x70, 0x2d, 0xec, 0x2b, 0x71, 0x1f, 0x0b, 0xb9, 0x71, 0x63,
+    0x06, 0xe6, 0xbc, 0x60, 0xbb, 0xf4, 0x9a, 0x62, 0x43, 0x09, 0x18, 0x4e, 0x93, 0x06, 0x4d,
+    0x76, 0xfa, 0x7f, 0xbd, 0x02, 0xe4, 0x50, 0x91, 0x12, 0xe5, 0x86, 0xff, 0x64, 0x1e, 0xaf,
+    0x7e, 0xb3, 0xb2, 0xde, 0x89, 0xc1, 0xa2, 0x6f, 0x40, 0x7b, 0x41, 0x51, 0x63, 0xea, 0x25,
+    0xd1, 0x97, 0x57, 0x92, 0xa8, 0x45, 0xa1, 0xa5, 0x45, 0x21, 0x43, 0x7f, 0x83, 0x15, 0x29,
+    0xd0, 0x30, 0x53, 0x32, 0xb4, 0x5a, 0x17, 0x96, 0xbc, 0xc2, 0x68, 0xa9, 0xb7, 0xaf, 0xac,
+    0xdf, 0xf1, 0xe3, 0x89, 0xba, 0x24, 0x79, 0x54, 0xc6, 0x14, 0x07, 0x1c, 0x1e, 0x0d, 0x3a,
+    0x6b, 0xe5, 0x3d, 0x4e, 0x10, 0x60, 0x96, 0xec, 0x6c, 0xda, 0x47, 0xae, 0x03, 0x25, 0x39,
+    0x1d, 0x74, 0xc8, 0xac, 0x6a, 0xf2, 0x6b, 0x05, 0x2a, 0x9a, 0xe7, 0xe8, 0x92, 0xd6, 0xc2,
+    0x6d, 0xfa, 0xe8, 0xa7, 0x9d, 0x5f, 0x48, 0xc9, 0x75, 0xf1, 0x66, 0x6a, 0xdb, 0x5d, 0x9a,
+    0xcd, 0x27, 0xdd, 0xb9, 0x24, 0x04, 0x9c, 0x18, 0xc2, 0x6d, 0x0c, 0x91, 0x34, 0x48, 0x42,
+    0x6f, 0xe9, 0x59, 0x70, 0xc4, 0x7e, 0x81, 0x0e, 0x32, 0x0a, 0x93, 0x48, 0xb0, 0xc0, 0x15,
+    0x9e, 0x05, 0xac, 0x36, 0x16, 0xcb, 0x59, 0x65, 0xa0, 0x83, 0xdf, 0x3e, 0xda, 0xfb, 0x1d,
+    0x1a, 0xdb, 0x65, 0xec, 0x9a, 0xc6, 0xc3, 0x8e, 0x3c, 0x45, 0xfd, 0xc8, 0xf5, 0x1c, 0x6a,
+    0x67, 0x0d, 0x8f, 0x99, 0x7d, 0x30, 0x21, 0x8c, 0xea, 0x22, 0x87, 0x65, 0xc9, 0xb2, 0x4c,
+    0xe4, 0x1b, 0x46, 0xba, 0x54, 0xbd, 0x7c, 0xca, 0xd5, 0x8f, 0x5b, 0xa5, 0x01, 0x04, 0xd8,
+    0x0a, 0x16, 0xbf, 0xb9, 0x50, 0x2e, 0x37, 0x2f, 0x64, 0xf3, 0x70, 0x11, 0x02, 0x05, 0x31,
+    0x9b, 0xa0, 0xb2, 0x01, 0x5e, 0x4f, 0x19, 0xc9, 0xd4, 0xea, 0xa1, 0x79, 0x54, 0x53, 0xa7,
+    0xde, 0x2f, 0x49, 0xd3, 0xd1, 0x63, 0xb5, 0x03, 0x15, 0x4e, 0xbf, 0x04, 0xb3, 0x26, 0x8b,
+    0x20, 0xb2, 0x45, 0xcf, 0xcd, 0x5b, 0x82, 0x32, 0x88, 0x61, 0xa7, 0xa8, 0xb2, 0xa0, 0x72,
+    0x96, 0xc0, 0xdb, 0x2b, 0xe2, 0x5f, 0xba, 0xe3, 0xf5, 0x8a, 0xde, 0xf1, 0x18, 0x01, 0x16,
+    0x40, 0xd9, 0x86, 0x12, 0x09, 0x18, 0x1b, 0x05, 0x0c, 0xb1, 0xb5, 0x47, 0xe2, 0x43, 0xab,
+    0xfe, 0x92, 0x63, 0x7e, 0x95, 0x2b, 0xf0, 0xaf, 0xe1, 0xf1, 0xc3, 0x4a, 0xff, 0x2b, 0x09,
+    0xbb, 0x4a, 0x0e, 0x9a, 0xc4, 0xd8, 0x64, 0x7d, 0x83, 0xa0, 0x4f, 0x44, 0xdb, 0xc4, 0xa8,
+    0x58, 0xef, 0xfc, 0x9e, 0x77, 0xf9, 0xa6, 0x8f, 0x58, 0x8b, 0x12, 0xf4, 0xe9, 0x81, 0x12,
+    0x47, 0x51, 0x41, 0x83, 0xef, 0xf6, 0x73, 0xbc, 0x8e, 0x0f, 0x4c, 0x8f, 0x4e, 0x69, 0x90,
+    0x77, 0x29, 0x5d, 0x92, 0xb0, 0x6d, 0x06, 0x67, 0x29, 0x60, 0xbd, 0x4b, 0x17, 0xc8, 0x89,
+    0x69, 0x28, 0x29, 0xd6, 0x78, 0xcb, 0x11, 0x4c, 0xba, 0x8b, 0x68, 0xae, 0x7e, 0x9f, 0xef,
+    0x95, 0xda, 0xe2, 0x9e, 0x7f, 0xe9, 0x55, 0xe5, 0xe1, 0xe2, 0xb7, 0xe6, 0x5f, 0xbb, 0x2c,
+    0xa2, 0xe6, 0xee, 0xc7, 0x0a, 0x60, 0xa9, 0xd1, 0x80, 0xdf, 0x7f, 0xd6, 0x97, 0xab, 0x1d,
+    0x22, 0x25, 0xfc, 0x79, 0x23, 0xe0, 0xae, 0xc5, 0xef, 0x16, 0xa4, 0xa1, 0x0f, 0x92, 0xa9,
+    0xc7, 0xe3, 0x3a, 0x55, 0xdf, 0x62, 0x49, 0xd9, 0xf5, 0x84, 0x49, 0xc5, 0x90, 0x34, 0xd3,
+    0xe1, 0xac, 0x99, 0x21, 0xb1, 0x02, 0x76, 0x4a, 0xfa, 0xd4, 0xbb, 0xa4, 0x9c, 0xa2, 0xe2,
+    0xcb, 0x3d, 0x3b, 0x14, 0x75, 0x60, 0xd1, 0x02, 0xb4, 0xa3, 0xb4, 0x72, 0x06, 0xf9, 0x19,
+    0x9c, 0xe2, 0xe4, 0xa7, 0x0f, 0x25, 0x88, 0xc6, 0x86, 0xd6, 0x8c, 0x74, 0x4e, 0x6e, 0xfc,
+    0xa8, 0x48, 0x9e, 0xa7, 0x9d, 0x1a, 0x4b, 0x37, 0x09, 0xc8, 0xb0, 0x10, 0xbe, 0x6f, 0xfe,
+    0xa3, 0xc4, 0x7a, 0xb5, 0x3d, 0xe8, 0x30, 0xf1, 0x0d, 0xa0, 0xb2, 0x44, 0xfc, 0x9b, 0x8c,
+    0xf8, 0x61, 0xed, 0x81, 0xd1, 0x62, 0x11, 0xb4, 0xe1, 0xd5, 0x39, 0x52, 0x89, 0xd3, 0xa8,
+    0x49, 0x31, 0xdf, 0xb6, 0xf9, 0x91, 0xf4, 0x1c, 0x9d, 0x09, 0x95, 0x40, 0x56, 0xe7, 0xe3,
+    0xcd, 0x5c, 0x92, 0xc1, 0x1d, 0x6b, 0xe9, 0x78, 0x6f, 0x8e, 0x94, 0x42, 0x66, 0xa2, 0xaa,
+    0xd3, 0xc8, 0x2e, 0xe3, 0xf6, 0x07, 0x72, 0x0b, 0x6b, 0x1e, 0x7b, 0xb9, 0x7c, 0xe0, 0xa0,
+    0xbc, 0xd9, 0x25, 0xdf, 0x87, 0xa8, 0x5f, 0x9c, 0xcc, 0xf0, 0xdb, 0x42, 0x8e, 0x07, 0x31,
+    0x13, 0x01, 0x66, 0x32, 0xd1, 0xb8, 0xd6, 0xe3, 0x5e, 0x12, 0x76, 0x61, 0xd3, 0x38, 0x89,
+    0xe6, 0x17, 0x6f, 0xa5, 0xf2, 0x71, 0x0e, 0xa5, 0xe2, 0x88, 0x30, 0xbb, 0xbe, 0x8a, 0xea,
+    0xc7, 0x62, 0xc4, 0xcf, 0xb8, 0xcd, 0x33, 0x8d, 0x3d, 0x3e, 0xb5, 0x60, 0x3a, 0x03, 0x92,
+    0xe4, 0x6d, 0x1b, 0xe0, 0xb4, 0x84, 0x08, 0x55, 0x88, 0xa7, 0x3a, 0xb9, 0x3d, 0x43, 0xc3,
+    0xc0, 0xfa, 0x07, 0x6a, 0xca, 0x94, 0xad, 0x99, 0x55, 0xf1, 0xf1, 0xc0, 0x23, 0x87, 0x1d,
+    0x3d, 0x1c, 0xd1, 0x66, 0xa0, 0x57, 0x10, 0x52, 0xa2, 0x7f, 0xbe, 0xf9, 0x88, 0xb6, 0x02,
+    0xbf, 0x08, 0x23, 0xa9, 0x0c, 0x63, 0x17, 0x2a, 0xae, 0xf5, 0xf7, 0xb7, 0x21, 0x83, 0x92,
+    0x31, 0x23, 0x0d, 0x20, 0xc3, 0xc2, 0x05, 0x21, 0x62, 0x8e, 0x45, 0xe8, 0x14, 0xc1, 0xda,
+    0x75, 0xb8, 0xf8, 0x92, 0x01, 0xd0, 0x5d, 0x18, 0x9f, 0x99, 0x11, 0x19, 0xf5, 0x35, 0xe8,
+    0x7f, 0x20, 0x88, 0x8c, 0x05, 0x75, 0xf5, 0xd7, 0x40, 0x17, 0xbb, 0x1e, 0x36, 0x52, 0xd9,
+    0xa4, 0x9c, 0xc2, 0x9d, 0x42, 0x81, 0xd8, 0xc7, 0x8a, 0xe7, 0x4c, 0x81, 0xe0, 0xb7, 0x57,
+    0xed, 0x48, 0x8b, 0xf0, 0x97, 0x15, 0x61, 0xd9, 0x2c, 0x7c, 0x45, 0xaf, 0xc2, 0xcd, 0xfc,
+    0xaa, 0x13, 0xad, 0x59, 0xcc, 0xb2, 0xb2, 0x6e, 0xdd, 0x63, 0x9c, 0x32, 0x0f, 0xec, 0x83,
+    0xbe, 0x78, 0xac, 0x91, 0x44, 0x1a, 0x1f, 0xea, 0xfd, 0x5d, 0x8e, 0xb4, 0xc0, 0x84, 0xd4,
+    0xac, 0xb4, 0x87, 0x5f, 0xac, 0xef, 0xdf, 0xcd, 0x12, 0x56, 0xc8, 0xcd, 0xfe, 0xc5, 0xda,
+    0xd3, 0xc1, 0x69, 0xf3, 0x61, 0x05, 0xea, 0x25, 0xe2, 0x12, 0x05, 0x8f, 0x39, 0x08, 0x08,
+    0x7c, 0x37, 0xb6, 0x7e, 0x5b, 0xd8, 0xb1, 0x0e, 0xf2, 0xdb, 0x4b, 0xf1, 0xad, 0x90, 0x01,
+    0x57, 0xcd, 0xa0, 0xb4, 0x52, 0xe8, 0xf3, 0xd7, 0x8a, 0xbd, 0x4f, 0x9f, 0x21, 0x40, 0x72,
+    0xa4, 0xfc, 0x0b, 0x01, 0x2b, 0x2f, 0xb6, 0x4c, 0x95, 0x2d, 0x35, 0x33, 0x41, 0x6b, 0xa0,
+    0x93, 0xe7, 0x2c, 0xf2, 0xd3, 0x72, 0x8b, 0xf4, 0x4f, 0x15, 0x3c, 0xaf, 0xd6, 0x12, 0xde,
+    0x3f, 0x83, 0x3f, 0xff, 0xf8, 0x7f, 0xf6, 0xcc, 0xa6, 0x7f, 0xc9, 0x9a, 0x6e, 0x1f, 0xc1,
+    0x0c, 0xfb, 0xee, 0x9c, 0xe7, 0xaf, 0xc9, 0x26, 0x54, 0xef, 0xb0, 0x39, 0xef, 0xb2, 0xe9,
+    0x23, 0xc4, 0xef, 0xd1, 0xa1, 0xa4, 0x25, 0x24, 0x6f, 0x8d, 0x6a, 0xe5, 0x8a, 0x32, 0x3a,
+    0xaf, 0xfc, 0xda, 0xce, 0x18, 0x25, 0x42, 0x07, 0x4d, 0x45, 0x8b, 0xdf, 0x85, 0xcf, 0x55,
+    0xb2, 0x24, 0xfe, 0x9c, 0x69, 0x74, 0xa7, 0x6e, 0xa0, 0xce, 0xc0, 0x39, 0xf4, 0x86, 0xc6,
+    0x8d, 0xae, 0xb9, 0x48, 0x64, 0x13, 0x0b, 0x40, 0x81, 0xa2, 0xc9, 0xa8, 0x85, 0x51, 0xee,
+    0x9f, 0xcf, 0xa2, 0x8c, 0x19, 0x52, 0x48, 0xe2, 0xc1, 0xa8, 0x58, 0xb4, 0x10, 0x24, 0x06,
+    0x58, 0x51, 0xfc, 0xb9, 0x12, 0xec, 0xfd, 0x73, 0xb4, 0x6d, 0x84, 0xfa, 0x06, 0x8b, 0x05,
+    0x0b, 0x2d, 0xd6, 0xd6, 0x1f, 0x29, 0x82, 0x9f, 0x19, 0x12, 0x1e, 0xb2, 0x04, 0x8f, 0x7f,
+    0x4d, 0xbd, 0x30, 0x2e, 0xe3, 0xe0, 0x88, 0x29, 0xc5, 0x93, 0xd6, 0x6c, 0x1f, 0x29, 0x45,
+    0x91, 0xa7, 0x58, 0xcd, 0x05, 0x17, 0xd6, 0x6d, 0xb3, 0xca, 0x66, 0xcc, 0x3c, 0x4a, 0x74,
+    0xfd, 0x08, 0x10, 0xa6, 0x99, 0x92, 0x10, 0xd2, 0x85, 0xab, 0x6e, 0x1d, 0x0e, 0x8b, 0x26,
+    0x46, 0xd1, 0x6c, 0x84, 0xc0, 0x26, 0x43, 0x59, 0x68, 0xf0, 0x13, 0x1d, 0xfb, 0xe3, 0xd1,
+    0xd2, 0xb4, 0x71, 0x9e, 0xf2, 0x59, 0x6a, 0x33, 0x29, 0x79, 0xd2, 0xd7, 0x26, 0xf1, 0xae,
+    0x78, 0x9e, 0x1f, 0x0f, 0x3f, 0xe3, 0xe8, 0xd0, 0x27, 0x78, 0x77, 0xf6, 0xac, 0x9c, 0x56,
+    0x39, 0x73, 0x8a, 0x6b, 0x2f, 0x34, 0x78, 0xb1, 0x11, 0xdb, 0xa4, 0x5c, 0x80, 0x01, 0x71,
+    0x6a, 0xc2, 0xd1, 0x2e, 0x5e, 0x76, 0x28, 0x70, 0x93, 0xae, 0x3e, 0x78, 0xb0, 0x1f, 0x0f,
+    0xda, 0xbf, 0xfb, 0x8a, 0x67, 0x65, 0x4f, 0x91, 0xed, 0x49, 0x75, 0x78, 0x62, 0xa2, 0x93,
+    0xb5, 0x70, 0x7f, 0x4d, 0x08, 0x4e, 0x79, 0x61, 0xa8, 0x5f, 0x7f, 0xb4, 0x65, 0x9f, 0x91,
+    0x54, 0x3a, 0xe8, 0x50, 0x33, 0xd3, 0xd5, 0x8a, 0x7c, 0xf3, 0x9e, 0x8b, 0x77, 0x7b, 0xc6,
+    0xc6, 0x0c, 0x45, 0x95, 0x1f, 0xb0, 0xd0, 0x0b, 0x27, 0x4a, 0xfd, 0xc7, 0xf7, 0x0d, 0x5a,
+    0x43, 0xc9, 0x7d, 0x35, 0xb0, 0x7d, 0xc4, 0x9c, 0x57, 0x1e, 0x76, 0x0d, 0xf1, 0x95, 0x30,
+    0x71, 0xcc, 0xb3, 0x66, 0x3b, 0x63, 0xa8, 0x6c, 0xa3, 0x43, 0xa0, 0x24, 0xcc, 0xb7, 0x53,
+    0xfe, 0xfe, 0xbc, 0x6e, 0x60, 0x89, 0xaf, 0x16, 0x21, 0xc8, 0x91, 0x6a, 0x89, 0xce, 0x80,
+    0x2c, 0xf1, 0x59, 0xce, 0xc3, 0x60, 0x61, 0x3b, 0x0b, 0x19, 0xfe, 0x99, 0xac, 0x65, 0x90,
+    0x15, 0x12, 0x05, 0xac, 0x7e, 0xff, 0x98, 0x7b, 0x66, 0x64, 0x0e, 0x4b, 0x5b, 0xaa, 0x8d,
+    0x3b, 0xd2, 0x56, 0xcf, 0x99, 0x39, 0xee, 0x22, 0x81, 0xd0, 0x60, 0x06, 0x66, 0x20, 0x81,
+    0x48, 0x3c, 0x6f, 0x3a, 0x77, 0xba, 0xcb, 0x52, 0xac, 0x79, 0x56, 0xaf, 0xe9, 0x16, 0x17,
+    0x0a, 0xa3, 0x82, 0x08, 0xd5, 0x3c, 0x97, 0xcb, 0x09, 0xff, 0x7f, 0xf9, 0x4f, 0x60, 0x05,
+    0xb9, 0x53, 0x26, 0xaa, 0xb8, 0x50, 0xaa, 0x19, 0x25, 0xae, 0x5f, 0xea, 0x8a, 0xd0, 0x89,
+    0x12, 0x80, 0x43, 0x50, 0x24, 0x12, 0x21, 0x14, 0xcd, 0x77, 0xeb, 0x21, 0xcc, 0x5c, 0x09,
+    0x64, 0xf3, 0xc7, 0xcb, 0xc5, 0x4b, 0xc3, 0xe7, 0xed, 0xe7, 0x86, 0x2c, 0x1d, 0x8e, 0x19,
+    0x52, 0x9b, 0x2a, 0x0c, 0x18, 0x72, 0x0b, 0x1e, 0x1b, 0xb0, 0x0f, 0x42, 0x99, 0x04, 0xae,
+    0xd5, 0xb7, 0x89, 0x1a, 0xb9, 0x4f, 0xd6, 0xaf, 0xf3, 0xc9, 0x93, 0x6f, 0xb0, 0x60, 0x83,
+    0x6e, 0x6b, 0xd1, 0x5f, 0x3f, 0x1a, 0x83, 0x1e, 0x24, 0x00, 0x87, 0xb5, 0x3e, 0xdb, 0xf9,
+    0x4d, 0xa7, 0x16, 0x2e, 0x19, 0x5b, 0x8f, 0x1b, 0x0d, 0x47, 0x72, 0x42, 0xe9, 0x0a, 0x11,
+    0x08, 0x2d, 0x88, 0x1c, 0xbc, 0xc7, 0xb4, 0xbe, 0x29, 0x4d, 0x03, 0x5e, 0xec, 0xdf, 0xf3,
+    0x3d, 0x2f, 0xe8, 0x1d, 0x9a, 0xd2, 0xd1, 0xab, 0x41, 0x3d, 0x87, 0x11, 0x45, 0xb0, 0x0d,
+    0x46, 0xf5, 0xe8, 0x95, 0x62, 0x1c, 0x68, 0xf7, 0xa6, 0x5b, 0x39, 0x4e, 0xbf, 0x47, 0xba,
+    0x5d, 0x7f, 0xb7, 0x6a, 0xf4, 0xba, 0x1d, 0x69, 0xf6, 0xa4, 0xe7, 0xe4, 0x6b, 0x3b, 0x0d,
+    0x23, 0x16, 0x4a, 0xb2, 0x68, 0xf0, 0xb2, 0x0d, 0x09, 0x17, 0x6a, 0x63, 0x8c, 0x83, 0xd3,
+    0xbd, 0x05, 0xc9, 0xf6, 0xf0, 0xa1, 0x31, 0x0b, 0x2c, 0xac, 0x83, 0xac, 0x80, 0x34, 0x32,
+    0xb4, 0xec, 0xd0, 0xbc, 0x54, 0x82, 0x9a, 0xc8, 0xf6, 0xa0, 0x7d, 0xc6, 0x79, 0x73, 0xf4,
+    0x20, 0x99, 0xf3, 0xb4, 0x01, 0xde, 0x91, 0x27, 0xf2, 0xc0, 0xdc, 0x81, 0x00, 0x4e, 0x7e,
+    0x07, 0x99, 0xc8, 0x3a, 0x51, 0xbc, 0x38, 0xd6, 0x8a, 0xa2, 0xde, 0x3b, 0x6a, 0x8c, 0x1a,
+    0x7c, 0x81, 0x0f, 0x3a, 0x1f, 0xe4, 0x05, 0x7b, 0x20, 0x35, 0x6b, 0xa5, 0x6a, 0xa7, 0xe7,
+    0xbc, 0x9c, 0x20, 0xec, 0x00, 0x15, 0xe2, 0x51, 0xaf, 0x77, 0xeb, 0x29, 0x3c, 0x7d, 0x2e,
+    0x00, 0x5c, 0x81, 0x21, 0xfa, 0x35, 0x6f, 0x40, 0xef, 0xfb, 0xd1, 0x3f, 0xcc, 0x9d, 0x55,
+    0x53, 0xfb, 0x5a, 0xa5, 0x56, 0x89, 0x0b, 0x52, 0xeb, 0x57, 0x73, 0x4f, 0x1b, 0x67, 0x24,
+    0xcb, 0xb8, 0x6a, 0x10, 0x69, 0xd6, 0xfb, 0x52, 0x40, 0xff, 0x20, 0xa5, 0xf3, 0x72, 0xe1,
+    0x3d, 0xa4, 0x8c, 0x81, 0x66, 0x16, 0x0d, 0x5d, 0xad, 0xa8, 0x50, 0x25, 0x78, 0x31, 0x77,
+    0x0c, 0x57, 0xe4, 0xe9, 0x15, 0x2d, 0xdb, 0x07, 0x87, 0xc8, 0xb0, 0x43, 0xde, 0xfc, 0xfe,
+    0xa9, 0xeb, 0xf5, 0xb0, 0xd3, 0x7b, 0xe9, 0x1f, 0x6e, 0xca, 0xe4, 0x03, 0x95, 0xc5, 0xd1,
+    0x59, 0x72, 0x63, 0xf0, 0x86, 0x54, 0xe8, 0x16, 0x62, 0x0b, 0x35, 0x29, 0xc2, 0x68, 0xd0,
+    0xd6, 0x3e, 0x90, 0x60, 0x57, 0x1d, 0xc9, 0xed, 0x3f, 0xed, 0xb0, 0x2f, 0x7e, 0x97, 0x02,
+    0x51, 0xec, 0xee, 0x6f, 0x82, 0x74, 0x76, 0x7f, 0xfb, 0xd6, 0xc4, 0xc3, 0xdd, 0xe8, 0xb1,
+    0x60, 0xfc, 0xc6, 0xb9, 0x0d, 0x6a, 0x33, 0x78, 0xc6, 0xc1, 0xbf, 0x86, 0x2c, 0x50, 0xcc,
+    0x9a, 0x70, 0x8e, 0x7b, 0xec, 0xab, 0x95, 0xac, 0x53, 0xa0, 0x4b, 0x07, 0x88, 0xaf, 0x42,
+    0xed, 0x19, 0x8d, 0xf6, 0x32, 0x17, 0x48, 0x47, 0x1d, 0x41, 0x6f, 0xfe, 0x2e, 0xa7, 0x8f,
+    0x4b, 0xa0, 0x51, 0xf3, 0xbf, 0x02, 0x0a, 0x48, 0x58, 0xf7, 0xa1, 0x6d, 0xea, 0xa5, 0x13,
+    0x5a, 0x5b, 0xea, 0x0c, 0x9e, 0x52, 0x4f, 0x9e, 0xb9, 0x71, 0x7f, 0x23, 0x83, 0xda, 0x1b,
+    0x86, 0x9a, 0x41, 0x29, 0xda, 0x70, 0xe7, 0x64, 0xa1, 0x7b, 0xd5, 0x0a, 0x22, 0x0d, 0x5c,
+    0x40, 0xc4, 0x81, 0x07, 0x25, 0x35, 0x4a, 0x1c, 0x10, 0xdb, 0x45, 0x0a, 0xff, 0x36, 0xd4,
+    0xe0, 0xeb, 0x5f, 0x68, 0xd6, 0x67, 0xc6, 0xd0, 0x8b, 0x76, 0x1a, 0x7d, 0x59, 0x42, 0xa1,
+    0xcb, 0x96, 0x4d, 0x84, 0x09, 0x9a, 0x3d, 0xe0, 0x52, 0x85, 0x6e, 0x48, 0x90, 0x85, 0x2a,
+    0x63, 0xb2, 0x69, 0xd2, 0x00, 0x43, 0x31, 0x37, 0xb3, 0x52, 0xaf, 0x62, 0xfa, 0xc1, 0xe0,
+    0x03, 0xfb, 0x62, 0xaa, 0x88, 0xc9, 0xb2, 0x2c, 0xd5, 0xa8, 0xf5, 0xa5, 0x4c, 0x12, 0x59,
+    0x4e, 0x06, 0x5e, 0x9b, 0x15, 0x66, 0x11, 0xb2, 0x27, 0x92, 0xdc, 0x98, 0x59, 0xde, 0xdf,
+    0xfa, 0x9a, 0x32, 0x2e, 0xc0, 0x5d, 0x3c, 0x33, 0x41, 0x6d, 0xaf, 0xb2, 0x25, 0x23, 0x14,
+    0xa5, 0x7b, 0xc7, 0x9b, 0x68, 0xf3, 0xda, 0xeb, 0xe3, 0xa9, 0xe2, 0x6f, 0x0e, 0x1d, 0x1c,
+    0xba, 0x55, 0xb6, 0x34, 0x6a, 0x93, 0x1f, 0x1f, 0xb8, 0x34, 0xc8, 0x84, 0x08, 0xb1, 0x6b,
+    0x6a, 0x28, 0x74, 0x74, 0xe5, 0xeb, 0x75, 0xe9, 0x7c, 0xd8, 0xba, 0xd8, 0x42, 0xa5, 0xee,
+    0x1f, 0x80, 0xd9, 0x96, 0xb2, 0x2e, 0xe7, 0xbf, 0xba, 0xeb, 0xd1, 0x69, 0xbb, 0x8f, 0xfd,
+    0x5a, 0x63, 0x8f, 0x39, 0x7f, 0xdf, 0x1d, 0x37, 0xd2, 0x18, 0x35, 0x9d, 0xb6, 0xcc, 0xe4,
+    0x27, 0x81, 0x89, 0x38, 0x38, 0x68, 0x33, 0xe7, 0x78, 0xd8, 0x76, 0xf5, 0xee, 0xd0, 0x4a,
+    0x07, 0x69, 0x19, 0x7a, 0xad, 0x18, 0xb1, 0x94, 0x61, 0x45, 0x53, 0xa2, 0x48, 0xda, 0x96,
+    0x4a, 0xf9, 0xee, 0x94, 0x2a, 0x1f, 0x6e, 0x18, 0x3c, 0x92, 0x46, 0xd1, 0x1a, 0x28, 0x18,
+    0x32, 0x1f, 0x3a, 0x45, 0xbe, 0x04, 0x35, 0x92, 0xe5, 0xa3, 0xcb, 0xb5, 0x2e, 0x32, 0x43,
+    0xac, 0x65, 0x17, 0x89, 0x99, 0x15, 0x03, 0x9e, 0xb1, 0x23, 0x2f, 0xed, 0x76, 0x4d, 0xd8,
+    0xac, 0x21, 0x40, 0xc4, 0x99, 0x4e, 0x65, 0x71, 0x2c, 0xb3, 0x45, 0xab, 0xfb, 0xe7, 0x72,
+    0x39, 0x56, 0x30, 0x6d, 0xfb, 0x74, 0xeb, 0x99, 0xf3, 0xcd, 0x57, 0x5c, 0x78, 0x75, 0xe9,
+    0x8d, 0xc3, 0xa2, 0xfb, 0x5d, 0xe0, 0x90, 0xc5, 0x55, 0xad, 0x91, 0x53, 0x4e, 0x9e, 0xbd,
+    0x8c, 0x49, 0xa4, 0xa4, 0x69, 0x10, 0x0c, 0xc5, 0x76, 0xe9, 0x25, 0x86, 0x8d, 0x66, 0x23,
+    0xa8, 0xdb, 0x5c, 0xe8, 0xd9, 0x30, 0xe1, 0x15, 0x7b, 0xc0, 0x99, 0x0f, 0x03, 0xec, 0xaa,
+    0x12, 0xef, 0xce, 0xd4, 0xea, 0x55, 0x5c, 0x08, 0x86, 0xf4, 0xf4, 0xb0, 0x83, 0x42, 0x95,
+    0x37, 0xb6, 0x38, 0xe0, 0x2b, 0x54, 0x89, 0xbd, 0x4e, 0x20, 0x9d, 0x3f, 0xc3, 0x4b, 0xb7,
+    0xec, 0xfa, 0x5a, 0x14, 0x03, 0xcb, 0x64, 0xc8, 0x34, 0x4a, 0x4b, 0x6e, 0xf8, 0x6e, 0x56,
+    0xf6, 0xdd, 0x5f, 0xa1, 0x24, 0xe2, 0xd4, 0xd0, 0x82, 0x64, 0x1f, 0x8e, 0x9b, 0xfa, 0xb4,
+    0xcb, 0xdb, 0x0a, 0xe8, 0x15, 0xfc, 0x15, 0xab, 0x4b, 0x18, 0xbf, 0xd4, 0x42, 0x14, 0x48,
+    0x82, 0x85, 0xdd, 0xeb, 0x49, 0x1b, 0x0b, 0x0b, 0x05, 0xe9, 0xb4, 0xa1, 0x33, 0x0a, 0x5d,
+    0x0e, 0x6c, 0x4b, 0xc0, 0xd6, 0x6c, 0x7c, 0xfb, 0x69, 0x0b, 0x53, 0x19, 0xe4, 0xf3, 0x35,
+    0xfc, 0xbe, 0xa1, 0x34, 0x02, 0x09, 0x4f, 0x74, 0x86, 0x92, 0xcd, 0x5d, 0x1a, 0xc1, 0x27,
+    0x0c, 0xf2, 0xc5, 0xcf, 0xdd, 0x23, 0x93, 0x02, 0xbd, 0x41, 0x5e, 0x42, 0xf0, 0xa0, 0x9d,
+    0x0c, 0x72, 0xc8, 0xec, 0x32, 0x0a, 0x8a, 0xfd, 0x3d, 0x5a, 0x41, 0x27, 0x0c, 0x88, 0x59,
+    0xad, 0x94, 0x2e, 0xef, 0x5d, 0x8f, 0xc7, 0xdf, 0x66, 0xe4, 0xdd, 0x56, 0x6c, 0x7b, 0xca,
+    0x55, 0x81, 0xae, 0xae, 0x5c, 0x1b, 0x1a, 0xab, 0xae, 0x99, 0x8d, 0xcc, 0x42, 0x97, 0x59,
+    0xf4, 0x14, 0x3f, 0x75, 0xc6, 0xd1, 0x88, 0xba, 0xaa, 0x84, 0x4a, 0xd0, 0x34, 0x08, 0x3b,
+    0x7d, 0xdb, 0x15, 0x06, 0xb0, 0x5c, 0xbd, 0x40, 0xf5, 0xa8, 0xec, 0xae, 0x36, 0x40, 0xdd,
+    0x90, 0x1c, 0x3e, 0x0d, 0x7e, 0x73, 0xc7, 0xc2, 0xc5, 0x6a, 0xff, 0x52, 0x05, 0x7f, 0xbe,
+    0xd0, 0x92, 0xfd, 0xb3, 0x6f, 0xff, 0x5d, 0xb7, 0x97, 0x64, 0x73, 0x7b, 0xca, 0xd1, 0x98,
+    0x24, 0x6b, 0x0b, 0x01, 0x68, 0xdd, 0x27, 0x85, 0x85, 0xb5, 0x83, 0xc1, 0xe0, 0x50, 0x64,
+    0xc7, 0xaf, 0xf1, 0xc6, 0x4d, 0xb1, 0xef, 0xc9, 0xb4, 0x0a, 0x6d, 0x65, 0xf3, 0x47, 0xcc,
+    0xa3, 0x02, 0x21, 0x0c, 0xbe, 0x22, 0x29, 0x05, 0xcf, 0x5f, 0xe8, 0x94, 0x6c, 0xe5, 0xdc,
+    0xc4, 0xdf, 0xbe, 0x3e, 0xa8, 0xb4, 0x18, 0xb0, 0x99, 0xb8, 0x6f, 0xff, 0x5d, 0xb9, 0xfd,
+    0x3b, 0x5d, 0x16, 0xbf, 0x3e, 0xd8, 0xb3, 0xd8, 0x08, 0x34, 0xf6, 0x47, 0x35, 0x5b, 0x72,
+    0x1a, 0x33, 0xad, 0x52, 0x5d, 0xb8, 0xd0, 0x77, 0xc6, 0xab, 0xba, 0x55, 0x09, 0x5f, 0x02,
+    0xf8, 0xd4, 0x5f, 0x53, 0x06, 0x91, 0xcd, 0x74, 0x42, 0xae, 0x54, 0x91, 0x81, 0x62, 0x13,
+    0x6f, 0xd8, 0xa9, 0x77, 0xc3, 0x6c, 0xcb, 0xf1, 0x29, 0x5a, 0xcc, 0xda, 0x35, 0xbd, 0x52,
+    0x23, 0xbe, 0x59, 0xeb, 0x12, 0x6d, 0xb7, 0x53, 0xee, 0xfc, 0xb4, 0x1b, 0x13, 0x5e, 0xba,
+    0x16, 0x7c, 0xc5, 0xf3, 0xe3, 0x6d, 0x07, 0x78, 0xf5, 0x2b, 0x21, 0x05, 0x88, 0x4c, 0xc0,
+    0xa1, 0xe3, 0x36, 0x10, 0xf8, 0x1b, 0xd8, 0x17, 0xfb, 0x6a, 0x4e, 0xd8, 0xb3, 0x47, 0x2d,
+    0x99, 0xbd, 0xbb, 0x5d, 0x37, 0x7d, 0xba, 0xf1, 0xe1, 0x7c, 0xc0, 0xc5, 0x54, 0x62, 0x7f,
+    0xcf, 0x5a, 0x4a, 0x93, 0xcc, 0xf1, 0x1b, 0x34, 0xc8, 0xa6, 0x05, 0x4c, 0x55, 0x8b, 0x54,
+    0x84, 0xd5, 0x77, 0xeb, 0xc0, 0x6d, 0x3a, 0x29, 0xbd, 0x75, 0x61, 0x09, 0x9a, 0x2c, 0xbb,
+    0xf7, 0x18, 0x79, 0x34, 0x90, 0x24, 0xa5, 0x81, 0x70, 0x87, 0xc5, 0x02, 0x7c, 0xba, 0xd4,
+    0x5e, 0x14, 0x8e, 0xe4, 0xed, 0xa2, 0x61, 0x6a, 0xb9, 0x6e, 0xb5, 0x4a, 0xb9, 0x01, 0x46,
+    0xf4, 0xcf, 0xbc, 0x09, 0x2f, 0x27, 0x4b, 0xbd, 0x86, 0x7a, 0x10, 0xe1, 0xd4, 0xc8, 0xd9,
+    0x20, 0x8d, 0x8a, 0x63, 0x00, 0x63, 0x44, 0xeb, 0x54, 0x0b, 0x75, 0x49, 0x10, 0xa2, 0xa7,
+    0xad, 0xb9, 0xd1, 0x01, 0x80, 0x63, 0x25, 0xc8, 0x12, 0xa6, 0xce, 0x1e, 0xbe, 0xfe, 0x7e,
+    0x5f, 0x3c, 0xdb, 0x34, 0xea, 0x37, 0xec, 0x3b, 0xd5, 0x28, 0xd2, 0x07, 0x8c, 0x9a, 0xb6,
+    0xee, 0x5e, 0x3e, 0xdf, 0x1d, 0x99, 0xb0, 0xe2, 0x46, 0xef, 0x5c, 0x1b, 0xb4, 0xea, 0x56,
+    0x2e, 0xde, 0x1f, 0x9d, 0xb8, 0xd3, 0x24, 0xab, 0xd4, 0x2a, 0xd6, 0x2e, 0xde, 0x1f, 0x9d,
+    0xb8, 0xf2, 0x66, 0x2f, 0xbd, 0xf8, 0x72, 0x66, 0x4e, 0x1e, 0x9f, 0x9d, 0xb8, 0xf2, 0x47,
+    0x0c, 0x9a, 0xb6, 0xee, 0x3f, 0xfc, 0x7a, 0x57, 0x0d, 0x79, 0x70, 0x62, 0x27, 0xad, 0xb9,
+    0xd1, 0x01, 0x61, 0x40, 0x02, 0x67, 0x2d, 0xd8, 0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xd7, 0x2c,
+    0xbb, 0xf4, 0x4b, 0xf5, 0x49, 0xf1, 0x60, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0xf9, 0x51, 0x01,
+    0x80, 0x63, 0x25, 0xa9, 0xb1, 0xe0, 0x42, 0xe7, 0x4c, 0x1a, 0x97, 0xac, 0xbb, 0xf4, 0x6a,
+    0x37, 0xcd, 0x18, 0xb2, 0xe6, 0x2f, 0xdc, 0x1b, 0x95, 0xa8, 0xd2, 0x07, 0x6d, 0x58, 0x32,
+    0xe6, 0x4e, 0x1e, 0x9f, 0xbc, 0xfa, 0x57, 0x0d, 0x79, 0x51, 0x20, 0xc2, 0x06, 0x6f, 0x5c,
+    0x1b, 0x95, 0xa8, 0xb3, 0xc5, 0xe9, 0x31, 0xe0, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0x18, 0x93,
+    0x85, 0x69, 0x31, 0xc1, 0xe1, 0x21, 0xc0, 0xe3, 0x44, 0x0a, 0x77, 0x6c, 0x5a, 0x17, 0x8d,
+    0x98, 0x93, 0xa4, 0xab, 0xd4, 0x2a, 0xb7, 0xec, 0x5a, 0x17, 0xac, 0xbb, 0xf4, 0x4b, 0x14,
+    0xaa, 0xb7, 0xec, 0x3b, 0xd5, 0x28, 0xb3, 0xc5, 0xe9, 0x31, 0xc1, 0x00, 0x82, 0x67, 0x4c,
+    0xfb, 0x55, 0x28, 0xd2, 0x26, 0xaf, 0xbd, 0xd9, 0x11, 0x81, 0x61, 0x21, 0xa1, 0xa1, 0xc0,
+    0x02, 0x86, 0x6f, 0x5c, 0x1b, 0xb4, 0xcb, 0x14, 0x8b, 0x94, 0xaa, 0xd6, 0x2e, 0xbf, 0xdd,
+    0x19, 0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x7c, 0x5b, 0x15, 0x89, 0x90, 0x83, 0x84, 0x6b, 0x54,
+    0x0b, 0x75, 0x68, 0x52, 0x07, 0x6d, 0x58, 0x32, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0xed, 0x58,
+    0x32, 0xe6, 0x4e, 0xff, 0x7c, 0x7a, 0x76, 0x6e, 0x3f, 0xdd, 0x38, 0xd3, 0x05, 0x88, 0x92,
+    0xa6, 0xaf, 0xdc, 0x1b, 0xb4, 0xcb, 0xf5, 0x68, 0x52, 0x07, 0x8c, 0x7b, 0x55, 0x09, 0x90,
+    0x83, 0x84, 0x6b, 0x54, 0x2a, 0xb7, 0xec, 0x3b, 0xd5, 0x09, 0x90, 0xa2, 0xc6, 0x0e, 0x7f,
+    0x7c, 0x7a, 0x57, 0x0d, 0x98, 0xb2, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0x0c, 0x7b, 0x74, 0x4b,
+    0x14, 0x8b, 0x94, 0xaa, 0xb7, 0xcd, 0x18, 0x93, 0xa4, 0xca, 0x16, 0xae, 0xbf, 0xdd, 0x19,
+    0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x5d, 0x19, 0x91, 0x81, 0x80, 0x63, 0x44, 0xeb, 0x35, 0xc9,
+    0x10, 0x83, 0x65, 0x48, 0x12, 0xa6, 0xce, 0x1e, 0x9f, 0xbc, 0xdb, 0x15, 0x89, 0x71, 0x60,
+    0x23, 0xc4, 0xeb, 0x54, 0x2a, 0xb7, 0xec, 0x5a, 0x36, 0xcf, 0x81, 0x10, 0xac, 0x74
+};
 
-    pmw3389_spi_start();
-    spi_write(REG_Motion_Burst);
-    wait_us(35); // waits for tSRAD_MOTBR
-
-    report.motion = spi_read();
-    spi_read(); // skip Observation
-    // delta registers
-    report.dx  = spi_read();
-    report.mdx = spi_read();
-    report.dy  = spi_read();
-    report.mdy = spi_read();
-
-    if (report.motion & 0b111) { // panic recovery, sometimes burst mode works weird.
-        _inBurst = false;
-    }
-
-    spi_stop();
-
-#ifdef CONSOLE_ENABLE
-    if (debug_mouse) {
-        print_byte(report.motion);
-        print_byte(report.dx);
-        print_byte(report.mdx);
-        print_byte(report.dy);
-        print_byte(report.mdy);
-        dprintf("\n");
-    }
-#endif
-
-    report.isMotion    = (report.motion & 0x80) != 0;
-    report.isOnSurface = (report.motion & 0x08) == 0;
-    report.dx |= (report.mdx << 8);
-    report.dx = report.dx * -1;
-    report.dy |= (report.mdy << 8);
-    report.dy = report.dy * -1;
-
-    return report;
-}
+// clang-format off
diff --git a/drivers/sensors/pmw3389.h b/drivers/sensors/pmw3389.h
index db4a763fe3..fafd1e2046 100644
--- a/drivers/sensors/pmw3389.h
+++ b/drivers/sensors/pmw3389.h
@@ -1,76 +1,77 @@
-/* Copyright 2021 Alabastard (@Alabastard-64)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Stefan Kerkmann (KarlK90)
+// Copyright 2021 Alabastard (@Alabastard-64)
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// Copyright 2019 Sunjun Kim
+// Copyright 2020 Ploopy Corporation
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <stdint.h>
 
-#ifndef PMW3389_CPI
-#    define PMW3389_CPI 2000
+#if !defined(PMW33XX_CPI)
+#    define PMW33XX_CPI 2000
 #endif
 
-#ifndef PMW3389_CLOCK_SPEED
-#    define PMW3389_CLOCK_SPEED 2000000
-#endif
+#define PMW33XX_CPI_STEP 50
+#define PMW33XX_CPI_MIN 50
+#define PMW33XX_CPI_MAX 16000
 
-#ifndef PMW3389_SPI_LSBFIRST
-#    define PMW3389_SPI_LSBFIRST false
-#endif
+#define PMW33XX_FIRMWARE_LENGTH 4094
 
-#ifndef PMW3389_SPI_MODE
-#    define PMW3389_SPI_MODE 3
-#endif
-
-#ifndef PMW3389_SPI_DIVISOR
-#    ifdef __AVR__
-#        define PMW3389_SPI_DIVISOR (F_CPU / PMW3389_CLOCK_SPEED)
-#    else
-#        define PMW3389_SPI_DIVISOR 64
-#    endif
-#endif
-
-#ifndef PMW3389_LIFTOFF_DISTANCE
-#    define PMW3389_LIFTOFF_DISTANCE 0x02
-#endif
-
-#ifndef ROTATIONAL_TRANSFORM_ANGLE
-#    define ROTATIONAL_TRANSFORM_ANGLE 0x00
-#endif
-
-#ifndef PMW3389_CS_PIN
-#    error "No chip select pin defined -- missing PMW3389_CS_PIN"
-#endif
-
-typedef struct {
-    int8_t  motion;
-    bool    isMotion;    // True if a motion is detected.
-    bool    isOnSurface; // True when a chip is on a surface
-    int16_t dx;          // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
-    int8_t  mdx;
-    int16_t dy; // displacement on y directions.
-    int8_t  mdy;
-} report_pmw3389_t;
-
-bool     pmw3389_init(void);
-void     pmw3389_upload_firmware(void);
-bool     pmw3389_check_signature(void);
-uint16_t pmw3389_get_cpi(void);
-void     pmw3389_set_cpi(uint16_t cpi);
-/* Reads and clears the current delta values on the sensor */
-report_pmw3389_t pmw3389_read_burst(void);
+// PMW3389 register addresses
+// clang-format off
+#define REG_Product_ID                 0x00
+#define REG_Revision_ID                0x01
+#define REG_Motion                     0x02
+#define REG_Delta_X_L                  0x03
+#define REG_Delta_X_H                  0x04
+#define REG_Delta_Y_L                  0x05
+#define REG_Delta_Y_H                  0x06
+#define REG_SQUAL                      0x07
+#define REG_RawData_Sum                0x08
+#define REG_Maximum_RawData            0x09
+#define REG_Minimum_RawData            0x0a
+#define REG_Shutter_Lower              0x0b
+#define REG_Shutter_Upper              0x0c
+#define REG_Ripple_Control             0x0d
+#define REG_Resolution_L               0x0e
+#define REG_Resolution_H               0x0f
+#define REG_Config2                    0x10
+#define REG_Angle_Tune                 0x11
+#define REG_Frame_Capture              0x12
+#define REG_SROM_Enable                0x13
+#define REG_Run_Downshift              0x14
+#define REG_Rest1_Rate_Lower           0x15
+#define REG_Rest1_Rate_Upper           0x16
+#define REG_Rest1_Downshift            0x17
+#define REG_Rest2_Rate_Lower           0x18
+#define REG_Rest2_Rate_Upper           0x19
+#define REG_Rest2_Downshift            0x1a
+#define REG_Rest3_Rate_Lower           0x1b
+#define REG_Rest3_Rate_Upper           0x1c
+#define REG_Observation                0x24
+#define REG_Data_Out_Lower             0x25
+#define REG_Data_Out_Upper             0x26
+#define REG_SROM_ID                    0x2a
+#define REG_Min_SQ_Run                 0x2b
+#define REG_RawData_Threshold          0x2c
+#define REG_Control2                   0x2d
+#define REG_Config5_L                  0x2e
+#define REG_Config5_H                  0x2f
+#define REG_Power_Up_Reset             0X3a
+#define REG_Shutdown                   0x3b
+#define REG_Inverse_Product_ID         0x3f
+#define REG_LiftCutoff_Cal3            0x41
+#define REG_Angle_Snap                 0x42
+#define REG_LiftCutoff_Cal1            0x4a
+#define REG_Motion_Burst               0x50
+#define REG_SROM_Load_Burst            0x62
+#define REG_Lift_Config                0x63
+#define REG_RawData_Burst              0x64
+#define REG_LiftCutoff_Cal2            0x65
+#define REG_LiftCutoff_Cal_Timeout     0x71
+#define REG_LiftCutoff_Cal_Min_Length  0x72
+#define REG_PWM_Period_Cnt             0x73
+#define REG_PWM_Width_Cnt              0x74
+// clang-format on
diff --git a/drivers/sensors/pmw3389_firmware.h b/drivers/sensors/pmw3389_firmware.h
deleted file mode 100644
index cd9638b605..0000000000
--- a/drivers/sensors/pmw3389_firmware.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "progmem.h"
-
-// PID, Inverse PID, SROM version
-const uint8_t firmware_signature[] PROGMEM = {0x42, 0xBD, 0x04};
-
-#define FIRMWARE_LENGTH 4094
-
-// Firmware Blob for PMW3389
-
-// clang-format off
-const uint8_t firmware_data[FIRMWARE_LENGTH] PROGMEM = {
-    0x01, 0xe8, 0xba, 0x26, 0x0b, 0xb2, 0xbe, 0xfe, 0x7e, 0x5f, 0x3c, 0xdb, 0x15, 0xa8, 0xb3,
-    0xe4, 0x2b, 0xb5, 0xe8, 0x53, 0x07, 0x6d, 0x3b, 0xd1, 0x20, 0xc2, 0x06, 0x6f, 0x3d, 0xd9,
-    0x11, 0xa0, 0xc2, 0xe7, 0x2d, 0xb9, 0xd1, 0x20, 0xa3, 0xa5, 0xc8, 0xf3, 0x64, 0x4a, 0xf7,
-    0x4d, 0x18, 0x93, 0xa4, 0xca, 0xf7, 0x6c, 0x5a, 0x36, 0xee, 0x5e, 0x3e, 0xfe, 0x7e, 0x7e,
-    0x5f, 0x1d, 0x99, 0xb0, 0xc3, 0xe5, 0x29, 0xd3, 0x03, 0x65, 0x48, 0x12, 0x87, 0x6d, 0x58,
-    0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xf2, 0x4f, 0xfd, 0x59, 0x11, 0x81, 0x61, 0x21, 0xc0, 0x02,
-    0x86, 0x8e, 0x7f, 0x5d, 0x38, 0xf2, 0x47, 0x0c, 0x7b, 0x55, 0x28, 0xb3, 0xe4, 0x4a, 0x16,
-    0xab, 0xbf, 0xdd, 0x38, 0xf2, 0x66, 0x4e, 0xff, 0x5d, 0x19, 0x91, 0xa0, 0xa3, 0xa5, 0xc8,
-    0x12, 0xa6, 0xaf, 0xdc, 0x3a, 0xd1, 0x41, 0x60, 0x75, 0x58, 0x24, 0x92, 0xd4, 0x72, 0x6c,
-    0xe0, 0x2f, 0xfd, 0x23, 0x8d, 0x1c, 0x5b, 0xb2, 0x97, 0x36, 0x3d, 0x0b, 0xa2, 0x49, 0xb1,
-    0x58, 0xf2, 0x1f, 0xc0, 0xcb, 0xf8, 0x41, 0x4f, 0xcd, 0x1e, 0x6b, 0x39, 0xa7, 0x2b, 0xe9,
-    0x30, 0x16, 0x83, 0xd2, 0x0e, 0x47, 0x8f, 0xe3, 0xb1, 0xdf, 0xa2, 0x15, 0xdb, 0x5d, 0x30,
-    0xc5, 0x1a, 0xab, 0x31, 0x99, 0xf3, 0xfa, 0xb2, 0x86, 0x69, 0xad, 0x7a, 0xe8, 0xa7, 0x18,
-    0x6a, 0xcc, 0xc8, 0x65, 0x23, 0x87, 0xa8, 0x5f, 0xf5, 0x21, 0x59, 0x75, 0x09, 0x71, 0x45,
-    0x55, 0x25, 0x4b, 0xda, 0xa1, 0xc3, 0xf7, 0x41, 0xab, 0x59, 0xd9, 0x74, 0x12, 0x55, 0x5f,
-    0xbc, 0xaf, 0xd9, 0xfd, 0xb0, 0x1e, 0xa3, 0x0f, 0xff, 0xde, 0x11, 0x16, 0x6a, 0xae, 0x0e,
-    0xe1, 0x5d, 0x3c, 0x10, 0x43, 0x9a, 0xa1, 0x0b, 0x24, 0x8f, 0x0d, 0x7f, 0x0b, 0x5e, 0x4c,
-    0x42, 0xa4, 0x84, 0x2c, 0x40, 0xd0, 0x55, 0x39, 0xe6, 0x4b, 0xf8, 0x9b, 0x2f, 0xdc, 0x28,
-    0xff, 0xfa, 0xb5, 0x85, 0x19, 0xe5, 0x28, 0xa1, 0x77, 0xaa, 0x73, 0xf3, 0x03, 0xc7, 0x62,
-    0xa6, 0x91, 0x18, 0xc9, 0xb0, 0xcd, 0x05, 0xdc, 0xca, 0x81, 0x26, 0x1a, 0x47, 0x40, 0xda,
-    0x36, 0x7d, 0x6a, 0x53, 0xc8, 0x5a, 0x77, 0x5d, 0x19, 0xa4, 0x1b, 0x23, 0x83, 0xd0, 0xb2,
-    0xaa, 0x0e, 0xbf, 0x77, 0x4e, 0x3a, 0x3b, 0x59, 0x00, 0x31, 0x0d, 0x02, 0x1b, 0x88, 0x7a,
-    0xd4, 0xbd, 0x9d, 0xcc, 0x58, 0x04, 0x69, 0xf6, 0x3b, 0xca, 0x42, 0xe2, 0xfd, 0xc3, 0x3d,
-    0x39, 0xc5, 0xd0, 0x71, 0xe4, 0xc8, 0xb7, 0x3e, 0x3f, 0xc8, 0xe9, 0xca, 0xc9, 0x3f, 0x04,
-    0x4e, 0x1b, 0x79, 0xca, 0xa5, 0x61, 0xc2, 0xed, 0x1d, 0xa6, 0xda, 0x5a, 0xe9, 0x7f, 0x65,
-    0x8c, 0xbe, 0x12, 0x6e, 0xa4, 0x5b, 0x33, 0x2f, 0x84, 0x28, 0x9c, 0x1c, 0x88, 0x2d, 0xff,
-    0x07, 0xbf, 0xa6, 0xd7, 0x5a, 0x88, 0x86, 0xb0, 0x3f, 0xf6, 0x31, 0x5b, 0x11, 0x6d, 0xf5,
-    0x58, 0xeb, 0x58, 0x02, 0x9e, 0xb5, 0x9a, 0xb1, 0xff, 0x25, 0x9d, 0x8b, 0x4f, 0xb6, 0x0a,
-    0xf9, 0xea, 0x3e, 0x3f, 0x21, 0x09, 0x65, 0x21, 0x22, 0xfe, 0x3d, 0x4e, 0x11, 0x5b, 0x9e,
-    0x5a, 0x59, 0x8b, 0xdd, 0xd8, 0xce, 0xd6, 0xd9, 0x59, 0xd2, 0x1e, 0xfd, 0xef, 0x0d, 0x1b,
-    0xd9, 0x61, 0x7f, 0xd7, 0x2d, 0xad, 0x62, 0x09, 0xe5, 0x22, 0x63, 0xea, 0xc7, 0x31, 0xd9,
-    0xa1, 0x38, 0x80, 0x5c, 0xa7, 0x32, 0x82, 0xec, 0x1b, 0xa2, 0x49, 0x5a, 0x06, 0xd2, 0x7c,
-    0xc9, 0x96, 0x57, 0xbb, 0x17, 0x75, 0xfc, 0x7a, 0x8f, 0x0d, 0x77, 0xb5, 0x7a, 0x8e, 0x3e,
-    0xf4, 0xba, 0x2f, 0x69, 0x13, 0x26, 0xd6, 0xd9, 0x21, 0x60, 0x2f, 0x21, 0x3e, 0x87, 0xee,
-    0xfd, 0x87, 0x16, 0x0d, 0xc8, 0x08, 0x00, 0x25, 0x71, 0xac, 0x2c, 0x03, 0x2a, 0x37, 0x2d,
-    0xb3, 0x34, 0x09, 0x91, 0xe3, 0x06, 0x2c, 0x38, 0x37, 0x95, 0x3b, 0x17, 0x7a, 0xaf, 0xac,
-    0x99, 0x55, 0xab, 0x41, 0x39, 0x5f, 0x8e, 0xa6, 0x43, 0x80, 0x03, 0x88, 0x6f, 0x7d, 0xbd,
-    0x5a, 0xb4, 0x2b, 0x32, 0x23, 0x5a, 0xa9, 0x31, 0x32, 0x39, 0x4c, 0x5b, 0xf4, 0x6b, 0xaf,
-    0x66, 0x6f, 0x3c, 0x8e, 0x2d, 0x82, 0x97, 0x9f, 0x4a, 0x01, 0xdc, 0x99, 0x98, 0x00, 0xec,
-    0x38, 0x7a, 0x79, 0x70, 0xa6, 0x85, 0xd6, 0x21, 0x63, 0x0d, 0x45, 0x9a, 0x2e, 0x5e, 0xa7,
-    0xb1, 0xea, 0x66, 0x6a, 0xbc, 0x62, 0x2d, 0x7b, 0x7d, 0x85, 0xea, 0x95, 0x2f, 0xc0, 0xe8,
-    0x6f, 0x35, 0xa0, 0x3a, 0x02, 0x25, 0xbc, 0xb2, 0x5f, 0x5c, 0x43, 0x96, 0xcc, 0x26, 0xd2,
-    0x16, 0xb4, 0x96, 0x73, 0xd7, 0x13, 0xc7, 0xae, 0x53, 0x15, 0x31, 0x89, 0x68, 0x66, 0x6d,
-    0x2c, 0x92, 0x1f, 0xcc, 0x5b, 0xa7, 0x8f, 0x5d, 0xbb, 0xc9, 0xdb, 0xe8, 0x3b, 0x9d, 0x61,
-    0x74, 0x8b, 0x05, 0xa1, 0x58, 0x52, 0x68, 0xee, 0x3d, 0x39, 0x79, 0xa0, 0x9b, 0xdd, 0xe1,
-    0x55, 0xc9, 0x60, 0xeb, 0xad, 0xb8, 0x5b, 0xc2, 0x5a, 0xb5, 0x2c, 0x18, 0x55, 0xa9, 0x50,
-    0xc3, 0xf6, 0x72, 0x5f, 0xcc, 0xe2, 0xf4, 0x55, 0xb5, 0xd6, 0xb5, 0x4a, 0x99, 0xa5, 0x28,
-    0x74, 0x97, 0x18, 0xe8, 0xc0, 0x84, 0x89, 0x50, 0x03, 0x86, 0x4d, 0x1a, 0xb7, 0x09, 0x90,
-    0xa2, 0x01, 0x04, 0xbb, 0x73, 0x62, 0xcb, 0x97, 0x22, 0x70, 0x5d, 0x52, 0x41, 0x8e, 0xd9,
-    0x90, 0x15, 0xaa, 0xab, 0x0a, 0x31, 0x65, 0xb4, 0xda, 0xd0, 0xee, 0x24, 0xc9, 0x41, 0x91,
-    0x1e, 0xbc, 0x46, 0x70, 0x40, 0x9d, 0xda, 0x0e, 0x2a, 0xe4, 0xb2, 0x4c, 0x9f, 0xf2, 0xfc,
-    0xf3, 0x84, 0x17, 0x44, 0x1e, 0xd7, 0xca, 0x23, 0x1f, 0x3f, 0x5a, 0x22, 0x3d, 0xaf, 0x9b,
-    0x2d, 0xfc, 0x41, 0xad, 0x26, 0xb4, 0x45, 0x67, 0x0b, 0x80, 0x0e, 0xf9, 0x61, 0x37, 0xec,
-    0x3b, 0xf4, 0x4b, 0x14, 0xdf, 0x5a, 0x0c, 0x3a, 0x50, 0x0b, 0x14, 0x0c, 0x72, 0xae, 0xc6,
-    0xc5, 0xec, 0x35, 0x53, 0x2d, 0x59, 0xed, 0x91, 0x74, 0xe2, 0xc4, 0xc8, 0xf2, 0x25, 0x6b,
-    0x97, 0x6f, 0xc9, 0x76, 0xce, 0xa9, 0xb1, 0x99, 0x8f, 0x5a, 0x92, 0x3b, 0xc4, 0x8d, 0x54,
-    0x50, 0x40, 0x72, 0xd6, 0x90, 0x83, 0xfc, 0xe5, 0x49, 0x8b, 0x17, 0xf5, 0xfd, 0x6b, 0x8d,
-    0x32, 0x02, 0xe9, 0x0a, 0xfe, 0xbf, 0x00, 0x6b, 0xa3, 0xad, 0x5f, 0x09, 0x4b, 0x97, 0x2b,
-    0x00, 0x58, 0x65, 0x2e, 0x07, 0x49, 0x0a, 0x3b, 0x6b, 0x2e, 0x50, 0x6c, 0x1d, 0xac, 0xb7,
-    0x6a, 0x26, 0xd8, 0x13, 0xa4, 0xca, 0x16, 0xae, 0xab, 0x93, 0xb9, 0x1c, 0x1c, 0xb4, 0x47,
-    0x6a, 0x38, 0x36, 0x17, 0x27, 0xc9, 0x7f, 0xc7, 0x64, 0xcb, 0x89, 0x58, 0xc5, 0x61, 0xc2,
-    0xc6, 0xea, 0x15, 0x0b, 0x34, 0x0c, 0x5d, 0x61, 0x76, 0x6e, 0x2b, 0x62, 0x40, 0x92, 0xa3,
-    0x6c, 0xef, 0xf4, 0xe4, 0xc3, 0xa1, 0xa8, 0xf5, 0x94, 0x79, 0x0d, 0xd1, 0x3d, 0xcb, 0x3d,
-    0x40, 0xb6, 0xd0, 0xf0, 0x10, 0x54, 0xd8, 0x47, 0x25, 0x51, 0xc5, 0x41, 0x79, 0x00, 0xe5,
-    0xa0, 0x72, 0xde, 0xbb, 0x3b, 0x62, 0x17, 0xf6, 0xbc, 0x5d, 0x00, 0x76, 0x2e, 0xa7, 0x3b,
-    0xb6, 0xf1, 0x98, 0x72, 0x59, 0x2a, 0x73, 0xb0, 0x21, 0xd6, 0x49, 0xe0, 0xc0, 0xd5, 0xeb,
-    0x02, 0x7d, 0x4b, 0x41, 0x28, 0x70, 0x2d, 0xec, 0x2b, 0x71, 0x1f, 0x0b, 0xb9, 0x71, 0x63,
-    0x06, 0xe6, 0xbc, 0x60, 0xbb, 0xf4, 0x9a, 0x62, 0x43, 0x09, 0x18, 0x4e, 0x93, 0x06, 0x4d,
-    0x76, 0xfa, 0x7f, 0xbd, 0x02, 0xe4, 0x50, 0x91, 0x12, 0xe5, 0x86, 0xff, 0x64, 0x1e, 0xaf,
-    0x7e, 0xb3, 0xb2, 0xde, 0x89, 0xc1, 0xa2, 0x6f, 0x40, 0x7b, 0x41, 0x51, 0x63, 0xea, 0x25,
-    0xd1, 0x97, 0x57, 0x92, 0xa8, 0x45, 0xa1, 0xa5, 0x45, 0x21, 0x43, 0x7f, 0x83, 0x15, 0x29,
-    0xd0, 0x30, 0x53, 0x32, 0xb4, 0x5a, 0x17, 0x96, 0xbc, 0xc2, 0x68, 0xa9, 0xb7, 0xaf, 0xac,
-    0xdf, 0xf1, 0xe3, 0x89, 0xba, 0x24, 0x79, 0x54, 0xc6, 0x14, 0x07, 0x1c, 0x1e, 0x0d, 0x3a,
-    0x6b, 0xe5, 0x3d, 0x4e, 0x10, 0x60, 0x96, 0xec, 0x6c, 0xda, 0x47, 0xae, 0x03, 0x25, 0x39,
-    0x1d, 0x74, 0xc8, 0xac, 0x6a, 0xf2, 0x6b, 0x05, 0x2a, 0x9a, 0xe7, 0xe8, 0x92, 0xd6, 0xc2,
-    0x6d, 0xfa, 0xe8, 0xa7, 0x9d, 0x5f, 0x48, 0xc9, 0x75, 0xf1, 0x66, 0x6a, 0xdb, 0x5d, 0x9a,
-    0xcd, 0x27, 0xdd, 0xb9, 0x24, 0x04, 0x9c, 0x18, 0xc2, 0x6d, 0x0c, 0x91, 0x34, 0x48, 0x42,
-    0x6f, 0xe9, 0x59, 0x70, 0xc4, 0x7e, 0x81, 0x0e, 0x32, 0x0a, 0x93, 0x48, 0xb0, 0xc0, 0x15,
-    0x9e, 0x05, 0xac, 0x36, 0x16, 0xcb, 0x59, 0x65, 0xa0, 0x83, 0xdf, 0x3e, 0xda, 0xfb, 0x1d,
-    0x1a, 0xdb, 0x65, 0xec, 0x9a, 0xc6, 0xc3, 0x8e, 0x3c, 0x45, 0xfd, 0xc8, 0xf5, 0x1c, 0x6a,
-    0x67, 0x0d, 0x8f, 0x99, 0x7d, 0x30, 0x21, 0x8c, 0xea, 0x22, 0x87, 0x65, 0xc9, 0xb2, 0x4c,
-    0xe4, 0x1b, 0x46, 0xba, 0x54, 0xbd, 0x7c, 0xca, 0xd5, 0x8f, 0x5b, 0xa5, 0x01, 0x04, 0xd8,
-    0x0a, 0x16, 0xbf, 0xb9, 0x50, 0x2e, 0x37, 0x2f, 0x64, 0xf3, 0x70, 0x11, 0x02, 0x05, 0x31,
-    0x9b, 0xa0, 0xb2, 0x01, 0x5e, 0x4f, 0x19, 0xc9, 0xd4, 0xea, 0xa1, 0x79, 0x54, 0x53, 0xa7,
-    0xde, 0x2f, 0x49, 0xd3, 0xd1, 0x63, 0xb5, 0x03, 0x15, 0x4e, 0xbf, 0x04, 0xb3, 0x26, 0x8b,
-    0x20, 0xb2, 0x45, 0xcf, 0xcd, 0x5b, 0x82, 0x32, 0x88, 0x61, 0xa7, 0xa8, 0xb2, 0xa0, 0x72,
-    0x96, 0xc0, 0xdb, 0x2b, 0xe2, 0x5f, 0xba, 0xe3, 0xf5, 0x8a, 0xde, 0xf1, 0x18, 0x01, 0x16,
-    0x40, 0xd9, 0x86, 0x12, 0x09, 0x18, 0x1b, 0x05, 0x0c, 0xb1, 0xb5, 0x47, 0xe2, 0x43, 0xab,
-    0xfe, 0x92, 0x63, 0x7e, 0x95, 0x2b, 0xf0, 0xaf, 0xe1, 0xf1, 0xc3, 0x4a, 0xff, 0x2b, 0x09,
-    0xbb, 0x4a, 0x0e, 0x9a, 0xc4, 0xd8, 0x64, 0x7d, 0x83, 0xa0, 0x4f, 0x44, 0xdb, 0xc4, 0xa8,
-    0x58, 0xef, 0xfc, 0x9e, 0x77, 0xf9, 0xa6, 0x8f, 0x58, 0x8b, 0x12, 0xf4, 0xe9, 0x81, 0x12,
-    0x47, 0x51, 0x41, 0x83, 0xef, 0xf6, 0x73, 0xbc, 0x8e, 0x0f, 0x4c, 0x8f, 0x4e, 0x69, 0x90,
-    0x77, 0x29, 0x5d, 0x92, 0xb0, 0x6d, 0x06, 0x67, 0x29, 0x60, 0xbd, 0x4b, 0x17, 0xc8, 0x89,
-    0x69, 0x28, 0x29, 0xd6, 0x78, 0xcb, 0x11, 0x4c, 0xba, 0x8b, 0x68, 0xae, 0x7e, 0x9f, 0xef,
-    0x95, 0xda, 0xe2, 0x9e, 0x7f, 0xe9, 0x55, 0xe5, 0xe1, 0xe2, 0xb7, 0xe6, 0x5f, 0xbb, 0x2c,
-    0xa2, 0xe6, 0xee, 0xc7, 0x0a, 0x60, 0xa9, 0xd1, 0x80, 0xdf, 0x7f, 0xd6, 0x97, 0xab, 0x1d,
-    0x22, 0x25, 0xfc, 0x79, 0x23, 0xe0, 0xae, 0xc5, 0xef, 0x16, 0xa4, 0xa1, 0x0f, 0x92, 0xa9,
-    0xc7, 0xe3, 0x3a, 0x55, 0xdf, 0x62, 0x49, 0xd9, 0xf5, 0x84, 0x49, 0xc5, 0x90, 0x34, 0xd3,
-    0xe1, 0xac, 0x99, 0x21, 0xb1, 0x02, 0x76, 0x4a, 0xfa, 0xd4, 0xbb, 0xa4, 0x9c, 0xa2, 0xe2,
-    0xcb, 0x3d, 0x3b, 0x14, 0x75, 0x60, 0xd1, 0x02, 0xb4, 0xa3, 0xb4, 0x72, 0x06, 0xf9, 0x19,
-    0x9c, 0xe2, 0xe4, 0xa7, 0x0f, 0x25, 0x88, 0xc6, 0x86, 0xd6, 0x8c, 0x74, 0x4e, 0x6e, 0xfc,
-    0xa8, 0x48, 0x9e, 0xa7, 0x9d, 0x1a, 0x4b, 0x37, 0x09, 0xc8, 0xb0, 0x10, 0xbe, 0x6f, 0xfe,
-    0xa3, 0xc4, 0x7a, 0xb5, 0x3d, 0xe8, 0x30, 0xf1, 0x0d, 0xa0, 0xb2, 0x44, 0xfc, 0x9b, 0x8c,
-    0xf8, 0x61, 0xed, 0x81, 0xd1, 0x62, 0x11, 0xb4, 0xe1, 0xd5, 0x39, 0x52, 0x89, 0xd3, 0xa8,
-    0x49, 0x31, 0xdf, 0xb6, 0xf9, 0x91, 0xf4, 0x1c, 0x9d, 0x09, 0x95, 0x40, 0x56, 0xe7, 0xe3,
-    0xcd, 0x5c, 0x92, 0xc1, 0x1d, 0x6b, 0xe9, 0x78, 0x6f, 0x8e, 0x94, 0x42, 0x66, 0xa2, 0xaa,
-    0xd3, 0xc8, 0x2e, 0xe3, 0xf6, 0x07, 0x72, 0x0b, 0x6b, 0x1e, 0x7b, 0xb9, 0x7c, 0xe0, 0xa0,
-    0xbc, 0xd9, 0x25, 0xdf, 0x87, 0xa8, 0x5f, 0x9c, 0xcc, 0xf0, 0xdb, 0x42, 0x8e, 0x07, 0x31,
-    0x13, 0x01, 0x66, 0x32, 0xd1, 0xb8, 0xd6, 0xe3, 0x5e, 0x12, 0x76, 0x61, 0xd3, 0x38, 0x89,
-    0xe6, 0x17, 0x6f, 0xa5, 0xf2, 0x71, 0x0e, 0xa5, 0xe2, 0x88, 0x30, 0xbb, 0xbe, 0x8a, 0xea,
-    0xc7, 0x62, 0xc4, 0xcf, 0xb8, 0xcd, 0x33, 0x8d, 0x3d, 0x3e, 0xb5, 0x60, 0x3a, 0x03, 0x92,
-    0xe4, 0x6d, 0x1b, 0xe0, 0xb4, 0x84, 0x08, 0x55, 0x88, 0xa7, 0x3a, 0xb9, 0x3d, 0x43, 0xc3,
-    0xc0, 0xfa, 0x07, 0x6a, 0xca, 0x94, 0xad, 0x99, 0x55, 0xf1, 0xf1, 0xc0, 0x23, 0x87, 0x1d,
-    0x3d, 0x1c, 0xd1, 0x66, 0xa0, 0x57, 0x10, 0x52, 0xa2, 0x7f, 0xbe, 0xf9, 0x88, 0xb6, 0x02,
-    0xbf, 0x08, 0x23, 0xa9, 0x0c, 0x63, 0x17, 0x2a, 0xae, 0xf5, 0xf7, 0xb7, 0x21, 0x83, 0x92,
-    0x31, 0x23, 0x0d, 0x20, 0xc3, 0xc2, 0x05, 0x21, 0x62, 0x8e, 0x45, 0xe8, 0x14, 0xc1, 0xda,
-    0x75, 0xb8, 0xf8, 0x92, 0x01, 0xd0, 0x5d, 0x18, 0x9f, 0x99, 0x11, 0x19, 0xf5, 0x35, 0xe8,
-    0x7f, 0x20, 0x88, 0x8c, 0x05, 0x75, 0xf5, 0xd7, 0x40, 0x17, 0xbb, 0x1e, 0x36, 0x52, 0xd9,
-    0xa4, 0x9c, 0xc2, 0x9d, 0x42, 0x81, 0xd8, 0xc7, 0x8a, 0xe7, 0x4c, 0x81, 0xe0, 0xb7, 0x57,
-    0xed, 0x48, 0x8b, 0xf0, 0x97, 0x15, 0x61, 0xd9, 0x2c, 0x7c, 0x45, 0xaf, 0xc2, 0xcd, 0xfc,
-    0xaa, 0x13, 0xad, 0x59, 0xcc, 0xb2, 0xb2, 0x6e, 0xdd, 0x63, 0x9c, 0x32, 0x0f, 0xec, 0x83,
-    0xbe, 0x78, 0xac, 0x91, 0x44, 0x1a, 0x1f, 0xea, 0xfd, 0x5d, 0x8e, 0xb4, 0xc0, 0x84, 0xd4,
-    0xac, 0xb4, 0x87, 0x5f, 0xac, 0xef, 0xdf, 0xcd, 0x12, 0x56, 0xc8, 0xcd, 0xfe, 0xc5, 0xda,
-    0xd3, 0xc1, 0x69, 0xf3, 0x61, 0x05, 0xea, 0x25, 0xe2, 0x12, 0x05, 0x8f, 0x39, 0x08, 0x08,
-    0x7c, 0x37, 0xb6, 0x7e, 0x5b, 0xd8, 0xb1, 0x0e, 0xf2, 0xdb, 0x4b, 0xf1, 0xad, 0x90, 0x01,
-    0x57, 0xcd, 0xa0, 0xb4, 0x52, 0xe8, 0xf3, 0xd7, 0x8a, 0xbd, 0x4f, 0x9f, 0x21, 0x40, 0x72,
-    0xa4, 0xfc, 0x0b, 0x01, 0x2b, 0x2f, 0xb6, 0x4c, 0x95, 0x2d, 0x35, 0x33, 0x41, 0x6b, 0xa0,
-    0x93, 0xe7, 0x2c, 0xf2, 0xd3, 0x72, 0x8b, 0xf4, 0x4f, 0x15, 0x3c, 0xaf, 0xd6, 0x12, 0xde,
-    0x3f, 0x83, 0x3f, 0xff, 0xf8, 0x7f, 0xf6, 0xcc, 0xa6, 0x7f, 0xc9, 0x9a, 0x6e, 0x1f, 0xc1,
-    0x0c, 0xfb, 0xee, 0x9c, 0xe7, 0xaf, 0xc9, 0x26, 0x54, 0xef, 0xb0, 0x39, 0xef, 0xb2, 0xe9,
-    0x23, 0xc4, 0xef, 0xd1, 0xa1, 0xa4, 0x25, 0x24, 0x6f, 0x8d, 0x6a, 0xe5, 0x8a, 0x32, 0x3a,
-    0xaf, 0xfc, 0xda, 0xce, 0x18, 0x25, 0x42, 0x07, 0x4d, 0x45, 0x8b, 0xdf, 0x85, 0xcf, 0x55,
-    0xb2, 0x24, 0xfe, 0x9c, 0x69, 0x74, 0xa7, 0x6e, 0xa0, 0xce, 0xc0, 0x39, 0xf4, 0x86, 0xc6,
-    0x8d, 0xae, 0xb9, 0x48, 0x64, 0x13, 0x0b, 0x40, 0x81, 0xa2, 0xc9, 0xa8, 0x85, 0x51, 0xee,
-    0x9f, 0xcf, 0xa2, 0x8c, 0x19, 0x52, 0x48, 0xe2, 0xc1, 0xa8, 0x58, 0xb4, 0x10, 0x24, 0x06,
-    0x58, 0x51, 0xfc, 0xb9, 0x12, 0xec, 0xfd, 0x73, 0xb4, 0x6d, 0x84, 0xfa, 0x06, 0x8b, 0x05,
-    0x0b, 0x2d, 0xd6, 0xd6, 0x1f, 0x29, 0x82, 0x9f, 0x19, 0x12, 0x1e, 0xb2, 0x04, 0x8f, 0x7f,
-    0x4d, 0xbd, 0x30, 0x2e, 0xe3, 0xe0, 0x88, 0x29, 0xc5, 0x93, 0xd6, 0x6c, 0x1f, 0x29, 0x45,
-    0x91, 0xa7, 0x58, 0xcd, 0x05, 0x17, 0xd6, 0x6d, 0xb3, 0xca, 0x66, 0xcc, 0x3c, 0x4a, 0x74,
-    0xfd, 0x08, 0x10, 0xa6, 0x99, 0x92, 0x10, 0xd2, 0x85, 0xab, 0x6e, 0x1d, 0x0e, 0x8b, 0x26,
-    0x46, 0xd1, 0x6c, 0x84, 0xc0, 0x26, 0x43, 0x59, 0x68, 0xf0, 0x13, 0x1d, 0xfb, 0xe3, 0xd1,
-    0xd2, 0xb4, 0x71, 0x9e, 0xf2, 0x59, 0x6a, 0x33, 0x29, 0x79, 0xd2, 0xd7, 0x26, 0xf1, 0xae,
-    0x78, 0x9e, 0x1f, 0x0f, 0x3f, 0xe3, 0xe8, 0xd0, 0x27, 0x78, 0x77, 0xf6, 0xac, 0x9c, 0x56,
-    0x39, 0x73, 0x8a, 0x6b, 0x2f, 0x34, 0x78, 0xb1, 0x11, 0xdb, 0xa4, 0x5c, 0x80, 0x01, 0x71,
-    0x6a, 0xc2, 0xd1, 0x2e, 0x5e, 0x76, 0x28, 0x70, 0x93, 0xae, 0x3e, 0x78, 0xb0, 0x1f, 0x0f,
-    0xda, 0xbf, 0xfb, 0x8a, 0x67, 0x65, 0x4f, 0x91, 0xed, 0x49, 0x75, 0x78, 0x62, 0xa2, 0x93,
-    0xb5, 0x70, 0x7f, 0x4d, 0x08, 0x4e, 0x79, 0x61, 0xa8, 0x5f, 0x7f, 0xb4, 0x65, 0x9f, 0x91,
-    0x54, 0x3a, 0xe8, 0x50, 0x33, 0xd3, 0xd5, 0x8a, 0x7c, 0xf3, 0x9e, 0x8b, 0x77, 0x7b, 0xc6,
-    0xc6, 0x0c, 0x45, 0x95, 0x1f, 0xb0, 0xd0, 0x0b, 0x27, 0x4a, 0xfd, 0xc7, 0xf7, 0x0d, 0x5a,
-    0x43, 0xc9, 0x7d, 0x35, 0xb0, 0x7d, 0xc4, 0x9c, 0x57, 0x1e, 0x76, 0x0d, 0xf1, 0x95, 0x30,
-    0x71, 0xcc, 0xb3, 0x66, 0x3b, 0x63, 0xa8, 0x6c, 0xa3, 0x43, 0xa0, 0x24, 0xcc, 0xb7, 0x53,
-    0xfe, 0xfe, 0xbc, 0x6e, 0x60, 0x89, 0xaf, 0x16, 0x21, 0xc8, 0x91, 0x6a, 0x89, 0xce, 0x80,
-    0x2c, 0xf1, 0x59, 0xce, 0xc3, 0x60, 0x61, 0x3b, 0x0b, 0x19, 0xfe, 0x99, 0xac, 0x65, 0x90,
-    0x15, 0x12, 0x05, 0xac, 0x7e, 0xff, 0x98, 0x7b, 0x66, 0x64, 0x0e, 0x4b, 0x5b, 0xaa, 0x8d,
-    0x3b, 0xd2, 0x56, 0xcf, 0x99, 0x39, 0xee, 0x22, 0x81, 0xd0, 0x60, 0x06, 0x66, 0x20, 0x81,
-    0x48, 0x3c, 0x6f, 0x3a, 0x77, 0xba, 0xcb, 0x52, 0xac, 0x79, 0x56, 0xaf, 0xe9, 0x16, 0x17,
-    0x0a, 0xa3, 0x82, 0x08, 0xd5, 0x3c, 0x97, 0xcb, 0x09, 0xff, 0x7f, 0xf9, 0x4f, 0x60, 0x05,
-    0xb9, 0x53, 0x26, 0xaa, 0xb8, 0x50, 0xaa, 0x19, 0x25, 0xae, 0x5f, 0xea, 0x8a, 0xd0, 0x89,
-    0x12, 0x80, 0x43, 0x50, 0x24, 0x12, 0x21, 0x14, 0xcd, 0x77, 0xeb, 0x21, 0xcc, 0x5c, 0x09,
-    0x64, 0xf3, 0xc7, 0xcb, 0xc5, 0x4b, 0xc3, 0xe7, 0xed, 0xe7, 0x86, 0x2c, 0x1d, 0x8e, 0x19,
-    0x52, 0x9b, 0x2a, 0x0c, 0x18, 0x72, 0x0b, 0x1e, 0x1b, 0xb0, 0x0f, 0x42, 0x99, 0x04, 0xae,
-    0xd5, 0xb7, 0x89, 0x1a, 0xb9, 0x4f, 0xd6, 0xaf, 0xf3, 0xc9, 0x93, 0x6f, 0xb0, 0x60, 0x83,
-    0x6e, 0x6b, 0xd1, 0x5f, 0x3f, 0x1a, 0x83, 0x1e, 0x24, 0x00, 0x87, 0xb5, 0x3e, 0xdb, 0xf9,
-    0x4d, 0xa7, 0x16, 0x2e, 0x19, 0x5b, 0x8f, 0x1b, 0x0d, 0x47, 0x72, 0x42, 0xe9, 0x0a, 0x11,
-    0x08, 0x2d, 0x88, 0x1c, 0xbc, 0xc7, 0xb4, 0xbe, 0x29, 0x4d, 0x03, 0x5e, 0xec, 0xdf, 0xf3,
-    0x3d, 0x2f, 0xe8, 0x1d, 0x9a, 0xd2, 0xd1, 0xab, 0x41, 0x3d, 0x87, 0x11, 0x45, 0xb0, 0x0d,
-    0x46, 0xf5, 0xe8, 0x95, 0x62, 0x1c, 0x68, 0xf7, 0xa6, 0x5b, 0x39, 0x4e, 0xbf, 0x47, 0xba,
-    0x5d, 0x7f, 0xb7, 0x6a, 0xf4, 0xba, 0x1d, 0x69, 0xf6, 0xa4, 0xe7, 0xe4, 0x6b, 0x3b, 0x0d,
-    0x23, 0x16, 0x4a, 0xb2, 0x68, 0xf0, 0xb2, 0x0d, 0x09, 0x17, 0x6a, 0x63, 0x8c, 0x83, 0xd3,
-    0xbd, 0x05, 0xc9, 0xf6, 0xf0, 0xa1, 0x31, 0x0b, 0x2c, 0xac, 0x83, 0xac, 0x80, 0x34, 0x32,
-    0xb4, 0xec, 0xd0, 0xbc, 0x54, 0x82, 0x9a, 0xc8, 0xf6, 0xa0, 0x7d, 0xc6, 0x79, 0x73, 0xf4,
-    0x20, 0x99, 0xf3, 0xb4, 0x01, 0xde, 0x91, 0x27, 0xf2, 0xc0, 0xdc, 0x81, 0x00, 0x4e, 0x7e,
-    0x07, 0x99, 0xc8, 0x3a, 0x51, 0xbc, 0x38, 0xd6, 0x8a, 0xa2, 0xde, 0x3b, 0x6a, 0x8c, 0x1a,
-    0x7c, 0x81, 0x0f, 0x3a, 0x1f, 0xe4, 0x05, 0x7b, 0x20, 0x35, 0x6b, 0xa5, 0x6a, 0xa7, 0xe7,
-    0xbc, 0x9c, 0x20, 0xec, 0x00, 0x15, 0xe2, 0x51, 0xaf, 0x77, 0xeb, 0x29, 0x3c, 0x7d, 0x2e,
-    0x00, 0x5c, 0x81, 0x21, 0xfa, 0x35, 0x6f, 0x40, 0xef, 0xfb, 0xd1, 0x3f, 0xcc, 0x9d, 0x55,
-    0x53, 0xfb, 0x5a, 0xa5, 0x56, 0x89, 0x0b, 0x52, 0xeb, 0x57, 0x73, 0x4f, 0x1b, 0x67, 0x24,
-    0xcb, 0xb8, 0x6a, 0x10, 0x69, 0xd6, 0xfb, 0x52, 0x40, 0xff, 0x20, 0xa5, 0xf3, 0x72, 0xe1,
-    0x3d, 0xa4, 0x8c, 0x81, 0x66, 0x16, 0x0d, 0x5d, 0xad, 0xa8, 0x50, 0x25, 0x78, 0x31, 0x77,
-    0x0c, 0x57, 0xe4, 0xe9, 0x15, 0x2d, 0xdb, 0x07, 0x87, 0xc8, 0xb0, 0x43, 0xde, 0xfc, 0xfe,
-    0xa9, 0xeb, 0xf5, 0xb0, 0xd3, 0x7b, 0xe9, 0x1f, 0x6e, 0xca, 0xe4, 0x03, 0x95, 0xc5, 0xd1,
-    0x59, 0x72, 0x63, 0xf0, 0x86, 0x54, 0xe8, 0x16, 0x62, 0x0b, 0x35, 0x29, 0xc2, 0x68, 0xd0,
-    0xd6, 0x3e, 0x90, 0x60, 0x57, 0x1d, 0xc9, 0xed, 0x3f, 0xed, 0xb0, 0x2f, 0x7e, 0x97, 0x02,
-    0x51, 0xec, 0xee, 0x6f, 0x82, 0x74, 0x76, 0x7f, 0xfb, 0xd6, 0xc4, 0xc3, 0xdd, 0xe8, 0xb1,
-    0x60, 0xfc, 0xc6, 0xb9, 0x0d, 0x6a, 0x33, 0x78, 0xc6, 0xc1, 0xbf, 0x86, 0x2c, 0x50, 0xcc,
-    0x9a, 0x70, 0x8e, 0x7b, 0xec, 0xab, 0x95, 0xac, 0x53, 0xa0, 0x4b, 0x07, 0x88, 0xaf, 0x42,
-    0xed, 0x19, 0x8d, 0xf6, 0x32, 0x17, 0x48, 0x47, 0x1d, 0x41, 0x6f, 0xfe, 0x2e, 0xa7, 0x8f,
-    0x4b, 0xa0, 0x51, 0xf3, 0xbf, 0x02, 0x0a, 0x48, 0x58, 0xf7, 0xa1, 0x6d, 0xea, 0xa5, 0x13,
-    0x5a, 0x5b, 0xea, 0x0c, 0x9e, 0x52, 0x4f, 0x9e, 0xb9, 0x71, 0x7f, 0x23, 0x83, 0xda, 0x1b,
-    0x86, 0x9a, 0x41, 0x29, 0xda, 0x70, 0xe7, 0x64, 0xa1, 0x7b, 0xd5, 0x0a, 0x22, 0x0d, 0x5c,
-    0x40, 0xc4, 0x81, 0x07, 0x25, 0x35, 0x4a, 0x1c, 0x10, 0xdb, 0x45, 0x0a, 0xff, 0x36, 0xd4,
-    0xe0, 0xeb, 0x5f, 0x68, 0xd6, 0x67, 0xc6, 0xd0, 0x8b, 0x76, 0x1a, 0x7d, 0x59, 0x42, 0xa1,
-    0xcb, 0x96, 0x4d, 0x84, 0x09, 0x9a, 0x3d, 0xe0, 0x52, 0x85, 0x6e, 0x48, 0x90, 0x85, 0x2a,
-    0x63, 0xb2, 0x69, 0xd2, 0x00, 0x43, 0x31, 0x37, 0xb3, 0x52, 0xaf, 0x62, 0xfa, 0xc1, 0xe0,
-    0x03, 0xfb, 0x62, 0xaa, 0x88, 0xc9, 0xb2, 0x2c, 0xd5, 0xa8, 0xf5, 0xa5, 0x4c, 0x12, 0x59,
-    0x4e, 0x06, 0x5e, 0x9b, 0x15, 0x66, 0x11, 0xb2, 0x27, 0x92, 0xdc, 0x98, 0x59, 0xde, 0xdf,
-    0xfa, 0x9a, 0x32, 0x2e, 0xc0, 0x5d, 0x3c, 0x33, 0x41, 0x6d, 0xaf, 0xb2, 0x25, 0x23, 0x14,
-    0xa5, 0x7b, 0xc7, 0x9b, 0x68, 0xf3, 0xda, 0xeb, 0xe3, 0xa9, 0xe2, 0x6f, 0x0e, 0x1d, 0x1c,
-    0xba, 0x55, 0xb6, 0x34, 0x6a, 0x93, 0x1f, 0x1f, 0xb8, 0x34, 0xc8, 0x84, 0x08, 0xb1, 0x6b,
-    0x6a, 0x28, 0x74, 0x74, 0xe5, 0xeb, 0x75, 0xe9, 0x7c, 0xd8, 0xba, 0xd8, 0x42, 0xa5, 0xee,
-    0x1f, 0x80, 0xd9, 0x96, 0xb2, 0x2e, 0xe7, 0xbf, 0xba, 0xeb, 0xd1, 0x69, 0xbb, 0x8f, 0xfd,
-    0x5a, 0x63, 0x8f, 0x39, 0x7f, 0xdf, 0x1d, 0x37, 0xd2, 0x18, 0x35, 0x9d, 0xb6, 0xcc, 0xe4,
-    0x27, 0x81, 0x89, 0x38, 0x38, 0x68, 0x33, 0xe7, 0x78, 0xd8, 0x76, 0xf5, 0xee, 0xd0, 0x4a,
-    0x07, 0x69, 0x19, 0x7a, 0xad, 0x18, 0xb1, 0x94, 0x61, 0x45, 0x53, 0xa2, 0x48, 0xda, 0x96,
-    0x4a, 0xf9, 0xee, 0x94, 0x2a, 0x1f, 0x6e, 0x18, 0x3c, 0x92, 0x46, 0xd1, 0x1a, 0x28, 0x18,
-    0x32, 0x1f, 0x3a, 0x45, 0xbe, 0x04, 0x35, 0x92, 0xe5, 0xa3, 0xcb, 0xb5, 0x2e, 0x32, 0x43,
-    0xac, 0x65, 0x17, 0x89, 0x99, 0x15, 0x03, 0x9e, 0xb1, 0x23, 0x2f, 0xed, 0x76, 0x4d, 0xd8,
-    0xac, 0x21, 0x40, 0xc4, 0x99, 0x4e, 0x65, 0x71, 0x2c, 0xb3, 0x45, 0xab, 0xfb, 0xe7, 0x72,
-    0x39, 0x56, 0x30, 0x6d, 0xfb, 0x74, 0xeb, 0x99, 0xf3, 0xcd, 0x57, 0x5c, 0x78, 0x75, 0xe9,
-    0x8d, 0xc3, 0xa2, 0xfb, 0x5d, 0xe0, 0x90, 0xc5, 0x55, 0xad, 0x91, 0x53, 0x4e, 0x9e, 0xbd,
-    0x8c, 0x49, 0xa4, 0xa4, 0x69, 0x10, 0x0c, 0xc5, 0x76, 0xe9, 0x25, 0x86, 0x8d, 0x66, 0x23,
-    0xa8, 0xdb, 0x5c, 0xe8, 0xd9, 0x30, 0xe1, 0x15, 0x7b, 0xc0, 0x99, 0x0f, 0x03, 0xec, 0xaa,
-    0x12, 0xef, 0xce, 0xd4, 0xea, 0x55, 0x5c, 0x08, 0x86, 0xf4, 0xf4, 0xb0, 0x83, 0x42, 0x95,
-    0x37, 0xb6, 0x38, 0xe0, 0x2b, 0x54, 0x89, 0xbd, 0x4e, 0x20, 0x9d, 0x3f, 0xc3, 0x4b, 0xb7,
-    0xec, 0xfa, 0x5a, 0x14, 0x03, 0xcb, 0x64, 0xc8, 0x34, 0x4a, 0x4b, 0x6e, 0xf8, 0x6e, 0x56,
-    0xf6, 0xdd, 0x5f, 0xa1, 0x24, 0xe2, 0xd4, 0xd0, 0x82, 0x64, 0x1f, 0x8e, 0x9b, 0xfa, 0xb4,
-    0xcb, 0xdb, 0x0a, 0xe8, 0x15, 0xfc, 0x15, 0xab, 0x4b, 0x18, 0xbf, 0xd4, 0x42, 0x14, 0x48,
-    0x82, 0x85, 0xdd, 0xeb, 0x49, 0x1b, 0x0b, 0x0b, 0x05, 0xe9, 0xb4, 0xa1, 0x33, 0x0a, 0x5d,
-    0x0e, 0x6c, 0x4b, 0xc0, 0xd6, 0x6c, 0x7c, 0xfb, 0x69, 0x0b, 0x53, 0x19, 0xe4, 0xf3, 0x35,
-    0xfc, 0xbe, 0xa1, 0x34, 0x02, 0x09, 0x4f, 0x74, 0x86, 0x92, 0xcd, 0x5d, 0x1a, 0xc1, 0x27,
-    0x0c, 0xf2, 0xc5, 0xcf, 0xdd, 0x23, 0x93, 0x02, 0xbd, 0x41, 0x5e, 0x42, 0xf0, 0xa0, 0x9d,
-    0x0c, 0x72, 0xc8, 0xec, 0x32, 0x0a, 0x8a, 0xfd, 0x3d, 0x5a, 0x41, 0x27, 0x0c, 0x88, 0x59,
-    0xad, 0x94, 0x2e, 0xef, 0x5d, 0x8f, 0xc7, 0xdf, 0x66, 0xe4, 0xdd, 0x56, 0x6c, 0x7b, 0xca,
-    0x55, 0x81, 0xae, 0xae, 0x5c, 0x1b, 0x1a, 0xab, 0xae, 0x99, 0x8d, 0xcc, 0x42, 0x97, 0x59,
-    0xf4, 0x14, 0x3f, 0x75, 0xc6, 0xd1, 0x88, 0xba, 0xaa, 0x84, 0x4a, 0xd0, 0x34, 0x08, 0x3b,
-    0x7d, 0xdb, 0x15, 0x06, 0xb0, 0x5c, 0xbd, 0x40, 0xf5, 0xa8, 0xec, 0xae, 0x36, 0x40, 0xdd,
-    0x90, 0x1c, 0x3e, 0x0d, 0x7e, 0x73, 0xc7, 0xc2, 0xc5, 0x6a, 0xff, 0x52, 0x05, 0x7f, 0xbe,
-    0xd0, 0x92, 0xfd, 0xb3, 0x6f, 0xff, 0x5d, 0xb7, 0x97, 0x64, 0x73, 0x7b, 0xca, 0xd1, 0x98,
-    0x24, 0x6b, 0x0b, 0x01, 0x68, 0xdd, 0x27, 0x85, 0x85, 0xb5, 0x83, 0xc1, 0xe0, 0x50, 0x64,
-    0xc7, 0xaf, 0xf1, 0xc6, 0x4d, 0xb1, 0xef, 0xc9, 0xb4, 0x0a, 0x6d, 0x65, 0xf3, 0x47, 0xcc,
-    0xa3, 0x02, 0x21, 0x0c, 0xbe, 0x22, 0x29, 0x05, 0xcf, 0x5f, 0xe8, 0x94, 0x6c, 0xe5, 0xdc,
-    0xc4, 0xdf, 0xbe, 0x3e, 0xa8, 0xb4, 0x18, 0xb0, 0x99, 0xb8, 0x6f, 0xff, 0x5d, 0xb9, 0xfd,
-    0x3b, 0x5d, 0x16, 0xbf, 0x3e, 0xd8, 0xb3, 0xd8, 0x08, 0x34, 0xf6, 0x47, 0x35, 0x5b, 0x72,
-    0x1a, 0x33, 0xad, 0x52, 0x5d, 0xb8, 0xd0, 0x77, 0xc6, 0xab, 0xba, 0x55, 0x09, 0x5f, 0x02,
-    0xf8, 0xd4, 0x5f, 0x53, 0x06, 0x91, 0xcd, 0x74, 0x42, 0xae, 0x54, 0x91, 0x81, 0x62, 0x13,
-    0x6f, 0xd8, 0xa9, 0x77, 0xc3, 0x6c, 0xcb, 0xf1, 0x29, 0x5a, 0xcc, 0xda, 0x35, 0xbd, 0x52,
-    0x23, 0xbe, 0x59, 0xeb, 0x12, 0x6d, 0xb7, 0x53, 0xee, 0xfc, 0xb4, 0x1b, 0x13, 0x5e, 0xba,
-    0x16, 0x7c, 0xc5, 0xf3, 0xe3, 0x6d, 0x07, 0x78, 0xf5, 0x2b, 0x21, 0x05, 0x88, 0x4c, 0xc0,
-    0xa1, 0xe3, 0x36, 0x10, 0xf8, 0x1b, 0xd8, 0x17, 0xfb, 0x6a, 0x4e, 0xd8, 0xb3, 0x47, 0x2d,
-    0x99, 0xbd, 0xbb, 0x5d, 0x37, 0x7d, 0xba, 0xf1, 0xe1, 0x7c, 0xc0, 0xc5, 0x54, 0x62, 0x7f,
-    0xcf, 0x5a, 0x4a, 0x93, 0xcc, 0xf1, 0x1b, 0x34, 0xc8, 0xa6, 0x05, 0x4c, 0x55, 0x8b, 0x54,
-    0x84, 0xd5, 0x77, 0xeb, 0xc0, 0x6d, 0x3a, 0x29, 0xbd, 0x75, 0x61, 0x09, 0x9a, 0x2c, 0xbb,
-    0xf7, 0x18, 0x79, 0x34, 0x90, 0x24, 0xa5, 0x81, 0x70, 0x87, 0xc5, 0x02, 0x7c, 0xba, 0xd4,
-    0x5e, 0x14, 0x8e, 0xe4, 0xed, 0xa2, 0x61, 0x6a, 0xb9, 0x6e, 0xb5, 0x4a, 0xb9, 0x01, 0x46,
-    0xf4, 0xcf, 0xbc, 0x09, 0x2f, 0x27, 0x4b, 0xbd, 0x86, 0x7a, 0x10, 0xe1, 0xd4, 0xc8, 0xd9,
-    0x20, 0x8d, 0x8a, 0x63, 0x00, 0x63, 0x44, 0xeb, 0x54, 0x0b, 0x75, 0x49, 0x10, 0xa2, 0xa7,
-    0xad, 0xb9, 0xd1, 0x01, 0x80, 0x63, 0x25, 0xc8, 0x12, 0xa6, 0xce, 0x1e, 0xbe, 0xfe, 0x7e,
-    0x5f, 0x3c, 0xdb, 0x34, 0xea, 0x37, 0xec, 0x3b, 0xd5, 0x28, 0xd2, 0x07, 0x8c, 0x9a, 0xb6,
-    0xee, 0x5e, 0x3e, 0xdf, 0x1d, 0x99, 0xb0, 0xe2, 0x46, 0xef, 0x5c, 0x1b, 0xb4, 0xea, 0x56,
-    0x2e, 0xde, 0x1f, 0x9d, 0xb8, 0xd3, 0x24, 0xab, 0xd4, 0x2a, 0xd6, 0x2e, 0xde, 0x1f, 0x9d,
-    0xb8, 0xf2, 0x66, 0x2f, 0xbd, 0xf8, 0x72, 0x66, 0x4e, 0x1e, 0x9f, 0x9d, 0xb8, 0xf2, 0x47,
-    0x0c, 0x9a, 0xb6, 0xee, 0x3f, 0xfc, 0x7a, 0x57, 0x0d, 0x79, 0x70, 0x62, 0x27, 0xad, 0xb9,
-    0xd1, 0x01, 0x61, 0x40, 0x02, 0x67, 0x2d, 0xd8, 0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xd7, 0x2c,
-    0xbb, 0xf4, 0x4b, 0xf5, 0x49, 0xf1, 0x60, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0xf9, 0x51, 0x01,
-    0x80, 0x63, 0x25, 0xa9, 0xb1, 0xe0, 0x42, 0xe7, 0x4c, 0x1a, 0x97, 0xac, 0xbb, 0xf4, 0x6a,
-    0x37, 0xcd, 0x18, 0xb2, 0xe6, 0x2f, 0xdc, 0x1b, 0x95, 0xa8, 0xd2, 0x07, 0x6d, 0x58, 0x32,
-    0xe6, 0x4e, 0x1e, 0x9f, 0xbc, 0xfa, 0x57, 0x0d, 0x79, 0x51, 0x20, 0xc2, 0x06, 0x6f, 0x5c,
-    0x1b, 0x95, 0xa8, 0xb3, 0xc5, 0xe9, 0x31, 0xe0, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0x18, 0x93,
-    0x85, 0x69, 0x31, 0xc1, 0xe1, 0x21, 0xc0, 0xe3, 0x44, 0x0a, 0x77, 0x6c, 0x5a, 0x17, 0x8d,
-    0x98, 0x93, 0xa4, 0xab, 0xd4, 0x2a, 0xb7, 0xec, 0x5a, 0x17, 0xac, 0xbb, 0xf4, 0x4b, 0x14,
-    0xaa, 0xb7, 0xec, 0x3b, 0xd5, 0x28, 0xb3, 0xc5, 0xe9, 0x31, 0xc1, 0x00, 0x82, 0x67, 0x4c,
-    0xfb, 0x55, 0x28, 0xd2, 0x26, 0xaf, 0xbd, 0xd9, 0x11, 0x81, 0x61, 0x21, 0xa1, 0xa1, 0xc0,
-    0x02, 0x86, 0x6f, 0x5c, 0x1b, 0xb4, 0xcb, 0x14, 0x8b, 0x94, 0xaa, 0xd6, 0x2e, 0xbf, 0xdd,
-    0x19, 0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x7c, 0x5b, 0x15, 0x89, 0x90, 0x83, 0x84, 0x6b, 0x54,
-    0x0b, 0x75, 0x68, 0x52, 0x07, 0x6d, 0x58, 0x32, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0xed, 0x58,
-    0x32, 0xe6, 0x4e, 0xff, 0x7c, 0x7a, 0x76, 0x6e, 0x3f, 0xdd, 0x38, 0xd3, 0x05, 0x88, 0x92,
-    0xa6, 0xaf, 0xdc, 0x1b, 0xb4, 0xcb, 0xf5, 0x68, 0x52, 0x07, 0x8c, 0x7b, 0x55, 0x09, 0x90,
-    0x83, 0x84, 0x6b, 0x54, 0x2a, 0xb7, 0xec, 0x3b, 0xd5, 0x09, 0x90, 0xa2, 0xc6, 0x0e, 0x7f,
-    0x7c, 0x7a, 0x57, 0x0d, 0x98, 0xb2, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0x0c, 0x7b, 0x74, 0x4b,
-    0x14, 0x8b, 0x94, 0xaa, 0xb7, 0xcd, 0x18, 0x93, 0xa4, 0xca, 0x16, 0xae, 0xbf, 0xdd, 0x19,
-    0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x5d, 0x19, 0x91, 0x81, 0x80, 0x63, 0x44, 0xeb, 0x35, 0xc9,
-    0x10, 0x83, 0x65, 0x48, 0x12, 0xa6, 0xce, 0x1e, 0x9f, 0xbc, 0xdb, 0x15, 0x89, 0x71, 0x60,
-    0x23, 0xc4, 0xeb, 0x54, 0x2a, 0xb7, 0xec, 0x5a, 0x36, 0xcf, 0x81, 0x10, 0xac, 0x74
-};
-
-// clang-format off
diff --git a/drivers/sensors/pmw33xx_common.c b/drivers/sensors/pmw33xx_common.c
new file mode 100644
index 0000000000..538c40c462
--- /dev/null
+++ b/drivers/sensors/pmw33xx_common.c
@@ -0,0 +1,218 @@
+// Copyright 2022 Stefan Kerkmann (KarlK90)
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// Copyright 2021 Alabastard (@Alabastard-64)
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// Copyright 2019 Sunjun Kim
+// Copyright 2020 Ploopy Corporation
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "debug.h"
+#include "pmw33xx_common.h"
+#include "print.h"
+#include "string.h"
+#include "wait.h"
+#include "spi_master.h"
+#include "progmem.h"
+
+extern const uint8_t pmw33xx_firmware_data[PMW33XX_FIRMWARE_LENGTH] PROGMEM;
+extern const uint8_t pmw33xx_firmware_signature[3] PROGMEM;
+
+static const pin_t cs_pins[]                                 = PMW33XX_CS_PINS;
+static bool        in_burst[sizeof(cs_pins) / sizeof(pin_t)] = {0};
+
+const size_t pmw33xx_number_of_sensors = sizeof(cs_pins) / sizeof(pin_t);
+
+bool __attribute__((cold)) pmw33xx_upload_firmware(uint8_t sensor);
+bool __attribute__((cold)) pmw33xx_check_signature(uint8_t sensor);
+
+void pmw33xx_set_cpi_all_sensors(uint16_t cpi) {
+    for (uint8_t sensor = 0; sensor < pmw33xx_number_of_sensors; sensor++) {
+        pmw33xx_set_cpi(sensor, cpi);
+    }
+}
+
+bool pmw33xx_spi_start(uint8_t sensor) {
+    if (!spi_start(cs_pins[sensor], false, 3, PMW33XX_SPI_DIVISOR)) {
+        spi_stop();
+        return false;
+    }
+    // tNCS-SCLK, 10ns
+    wait_us(1);
+    return true;
+}
+
+bool pmw33xx_write(uint8_t sensor, uint8_t reg_addr, uint8_t data) {
+    if (!pmw33xx_spi_start(sensor)) {
+        return false;
+    }
+
+    if (reg_addr != REG_Motion_Burst) {
+        in_burst[sensor] = false;
+    }
+
+    // send address of the register, with MSBit = 1 to indicate it's a write
+    uint8_t command[2] = {reg_addr | 0x80, data};
+    if (spi_transmit(command, sizeof(command)) != SPI_STATUS_SUCCESS) {
+        return false;
+    }
+
+    // tSCLK-NCS for write operation is 35us
+    wait_us(35);
+    spi_stop();
+
+    // tSWW/tSWR (=18us) minus tSCLK-NCS. Could be shortened, but it looks like
+    // a safe lower bound
+    wait_us(145);
+    return true;
+}
+
+uint8_t pmw33xx_read(uint8_t sensor, uint8_t reg_addr) {
+    if (!pmw33xx_spi_start(sensor)) {
+        return 0;
+    }
+
+    // send adress of the register, with MSBit = 0 to indicate it's a read
+    spi_write(reg_addr & 0x7f);
+    // tSRAD (=160us)
+    wait_us(160);
+    uint8_t data = spi_read();
+
+    // tSCLK-NCS, 120ns
+    wait_us(1);
+    spi_stop();
+
+    //  tSRW/tSRR (=20us) mins tSCLK-NCS
+    wait_us(19);
+    return data;
+}
+
+bool pmw33xx_check_signature(uint8_t sensor) {
+    uint8_t signature_dump[3] = {
+        pmw33xx_read(sensor, REG_Product_ID),
+        pmw33xx_read(sensor, REG_Inverse_Product_ID),
+        pmw33xx_read(sensor, REG_SROM_ID),
+    };
+
+    return memcmp(pmw33xx_firmware_signature, signature_dump, sizeof(signature_dump)) == 0;
+}
+
+bool pmw33xx_upload_firmware(uint8_t sensor) {
+    // Datasheet claims we need to disable REST mode first, but during startup
+    // it's already disabled and we're not turning it on ...
+    // pmw33xx_write(REG_Config2, 0x00);  // disable REST mode
+    if (!pmw33xx_write(sensor, REG_SROM_Enable, 0x1d)) {
+        return false;
+    }
+    wait_ms(10);
+    pmw33xx_write(sensor, REG_SROM_Enable, 0x18);
+
+    if (!pmw33xx_spi_start(sensor)) {
+        return false;
+    }
+
+    spi_write(REG_SROM_Load_Burst | 0x80);
+    wait_us(15);
+
+    for (size_t i = 0; i < PMW33XX_FIRMWARE_LENGTH; i++) {
+        spi_write(pgm_read_byte(pmw33xx_firmware_data + i));
+        wait_us(15);
+    }
+    wait_us(200);
+
+    pmw33xx_read(sensor, REG_SROM_ID);
+    pmw33xx_write(sensor, REG_Config2, 0x00);
+
+    return true;
+}
+
+bool pmw33xx_init(uint8_t sensor) {
+    if (sensor >= pmw33xx_number_of_sensors) {
+        return false;
+    }
+    spi_init();
+
+    // power up, need to first drive NCS high then low. the datasheet does not
+    // say for how long, 40us works well in practice.
+    if (!pmw33xx_spi_start(sensor)) {
+        return false;
+    }
+    wait_us(40);
+    spi_stop();
+    wait_us(40);
+
+    if (!pmw33xx_write(sensor, REG_Power_Up_Reset, 0x5a)) {
+        return false;
+    }
+    wait_ms(50);
+
+    // read registers and discard
+    pmw33xx_read(sensor, REG_Motion);
+    pmw33xx_read(sensor, REG_Delta_X_L);
+    pmw33xx_read(sensor, REG_Delta_X_H);
+    pmw33xx_read(sensor, REG_Delta_Y_L);
+    pmw33xx_read(sensor, REG_Delta_Y_H);
+
+    if (!pmw33xx_upload_firmware(sensor)) {
+        dprintf("PMW33XX (%d): firmware upload failed!\n", sensor);
+        return false;
+    }
+
+    spi_stop();
+
+    wait_ms(10);
+    pmw33xx_set_cpi(sensor, PMW33XX_CPI);
+
+    wait_ms(1);
+
+    pmw33xx_write(sensor, REG_Config2, 0x00);
+    pmw33xx_write(sensor, REG_Angle_Tune, CONSTRAIN(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
+    pmw33xx_write(sensor, REG_Lift_Config, PMW33XX_LIFTOFF_DISTANCE);
+
+    if (!pmw33xx_check_signature(sensor)) {
+        dprintf("PMW33XX (%d): firmware signature verification failed!\n", sensor);
+        return false;
+    }
+
+    return true;
+}
+
+pmw33xx_report_t pmw33xx_read_burst(uint8_t sensor) {
+    pmw33xx_report_t report = {0};
+
+    if (sensor >= pmw33xx_number_of_sensors) {
+        return report;
+    }
+
+    if (!in_burst[sensor]) {
+        dprintf("PMW33XX (%d): burst\n", sensor);
+        if (!pmw33xx_write(sensor, REG_Motion_Burst, 0x00)) {
+            return report;
+        }
+        in_burst[sensor] = true;
+    }
+
+    if (!pmw33xx_spi_start(sensor)) {
+        return report;
+    }
+
+    spi_write(REG_Motion_Burst);
+    wait_us(35); // waits for tSRAD_MOTBR
+
+    spi_receive((uint8_t*)&report, sizeof(report));
+
+    // panic recovery, sometimes burst mode works weird.
+    if (report.motion.w & 0b111) {
+        in_burst[sensor] = false;
+    }
+
+    spi_stop();
+
+    if (debug_config.mouse) {
+        dprintf("PMW33XX (%d): motion: 0x%x dx: %i dy: %i\n", sensor, report.motion.w, report.delta_x, report.delta_y);
+    }
+
+    report.delta_x *= -1;
+    report.delta_y *= -1;
+
+    return report;
+}
diff --git a/drivers/sensors/pmw33xx_common.h b/drivers/sensors/pmw33xx_common.h
new file mode 100644
index 0000000000..181bea3d43
--- /dev/null
+++ b/drivers/sensors/pmw33xx_common.h
@@ -0,0 +1,145 @@
+// Copyright 2022 Stefan Kerkmann (KarlK90)
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// Copyright 2021 Alabastard (@Alabastard-64)
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// Copyright 2019 Sunjun Kim
+// Copyright 2020 Ploopy Corporation
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include "spi_master.h"
+#include "util.h"
+
+#if defined(POINTING_DEVICE_DRIVER_pmw3360)
+#    include "pmw3360.h"
+#elif defined(POINTING_DEVICE_DRIVER_pmw3389)
+#    include "pmw3389.h"
+#endif
+
+typedef struct __attribute__((packed)) {
+    union {
+        struct {
+            bool    capture_from_raw_data : 1;     // FRAME_RData_1st
+            uint8_t operation_mode : 2;            // OP_MODE
+            bool    is_lifted : 1;                 // Lift_stat
+            bool    raw_data_grab_is_raw_data : 1; // RData_1st
+            uint8_t _reserved : 2;                 // 1 + Reserved
+            bool    is_motion : 1;                 // MOT
+        } b;
+        uint8_t w;
+    } motion;
+    uint8_t observation;
+    int16_t delta_x; // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
+    int16_t delta_y; // displacement on y directions.
+} pmw33xx_report_t;
+
+_Static_assert(sizeof(pmw33xx_report_t) == 6, "pmw33xx_report_t must be 6 bytes in size");
+_Static_assert(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.motion must be 1 byte in size");
+
+#if !defined(PMW33XX_CLOCK_SPEED)
+#    define PMW33XX_CLOCK_SPEED 2000000
+#endif
+
+#if !defined(PMW33XX_SPI_DIVISOR)
+#    ifdef __AVR__
+#        define PMW33XX_SPI_DIVISOR (F_CPU / PMW33XX_CLOCK_SPEED)
+#    else
+#        define PMW33XX_SPI_DIVISOR 64
+#    endif
+#endif
+
+#if !defined(PMW33XX_LIFTOFF_DISTANCE)
+#    define PMW33XX_LIFTOFF_DISTANCE 0x02
+#endif
+
+#if !defined(ROTATIONAL_TRANSFORM_ANGLE)
+#    define ROTATIONAL_TRANSFORM_ANGLE 0x00
+#endif
+
+// Support single and plural spellings
+#ifndef PMW33XX_CS_PINS
+#    ifndef PMW33XX_CS_PIN
+#        error "No chip select pin defined -- missing PMW33XX_CS_PIN or PMW33XX_CS_PINS"
+#    else
+#        define PMW33XX_CS_PINS \
+            { PMW33XX_CS_PIN }
+#    endif
+#endif
+
+#if PMW33XX_CPI > PMW33XX_CPI_MAX || PMW33XX_CPI < PMW33XX_CPI_MIN || (PMW33XX_CPI % PMW33XX_CPI_STEP) != 0U
+#    pragma message "PMW33XX_CPI has to be in the range of " STR(PMW33XX_CPI_MAX) "-" STR(PMW33XX_CPI_MIN) " in increments of " STR(PMW33XX_CPI_STEP) ". But it is " STR(PMW33XX_CPI) "."
+#    error Use correct PMW33XX_CPI value.
+#endif
+
+#define CONSTRAIN(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
+
+/**
+ * @brief Initializes the given sensor so it is in a working state and ready to
+ * be polled for data.
+ *
+ * @param sensor Index of the sensors chip select pin
+ * @return true Initialization was a success
+ * @return false Initialization failed, do not proceed operation
+ */
+bool __attribute__((cold)) pmw33xx_init(uint8_t sensor);
+
+/**
+ * @brief Gets the currently set CPI value from the sensor. CPI is often
+ * refereed to as the sensors sensitivity.
+ *
+ * @param sensor Index of the sensors chip select pin
+ * @return uint16_t Current CPI value of the sensor
+ */
+uint16_t pmw33xx_get_cpi(uint8_t sensor);
+
+/**
+ * @brief Sets the given CPI value for the given PMW33XX sensor. CIP is often
+ * refereed to as the sensors sensitivity. Values outside of the allow range are
+ * constrained into legal values.
+ *
+ * @param sensor Index of the sensors chip select pin
+ * @param cpi CPI value to set, legal range depends on the PMW sensor type
+ */
+void pmw33xx_set_cpi(uint8_t sensor, uint16_t cpi);
+
+/**
+ * @brief Sets the given CPI value to all registered PMW33XX sensors. CPI is
+ * often refereed to as the sensors sensitivity. Values outside of the allow
+ * range are constrained into legal values.
+ *
+ * @param sensor Index of the sensors chip select pin
+ * @param cpi CPI value to set, legal range depends on the PMW sensor type
+ */
+void pmw33xx_set_cpi_all_sensors(uint16_t cpi);
+
+/**
+ * @brief Reads and clears the current delta, and motion register values on the
+ * given sensor.
+ *
+ * @param sensor Index of the sensors chip select pin
+ * @return pmw33xx_report_t Current values of the sensor, if errors occurred all
+ * fields are set to zero
+ */
+pmw33xx_report_t pmw33xx_read_burst(uint8_t sensor);
+
+/**
+ * @brief Read one byte of data from the given register on the sensor
+ *
+ * @param sensor Index of the sensors chip select pin
+ * @param reg_addr Register address to read from
+ * @return uint8_t
+ */
+uint8_t pmw33xx_read(uint8_t sensor, uint8_t reg_addr);
+
+/**
+ * @brief Writes one byte of data to the given register on the sensor
+ *
+ * @param sensor Index of the sensors chip select pin
+ * @param reg_addr Registers address to write to
+ * @param data Data to write to the register
+ * @return true Write was a success
+ * @return false Write failed, do not proceed operation
+ */
+bool pmw33xx_write(uint8_t sensor, uint8_t reg_addr, uint8_t data);
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index 89b896bc35..b12603fade 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -58,8 +58,8 @@
 /* Set 0 if debouncing isn't needed. */
 #define DEBOUNCE 5
 
-/* PMW3360 settings. */
-#define PMW3360_CS_PIN B0
+/* PMW33XX settings. */
+#define PMW33XX_CS_PIN B0
 
 // Trackball angle adjustment.
 #define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
index 0f08aee9ef..39204a3667 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
@@ -98,10 +98,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EXTERNAL_EEPROM_ADDRESS_SIZE         2
 
 /* pmw3360 config  */
-#undef PMW3360_CS_PIN
-#define PMW3360_CS_PIN                       B0
-#define PMW3360_SPI_MODE                     3
-#define PMW3360_SPI_DIVISOR                  64
+#undef PMW33XX_CS_PIN
+#define PMW33XX_CS_PIN                       B0
 
 #define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
 #define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 423f12fdbe..6760129ef8 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -60,8 +60,8 @@
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-/* PMW3360 settings. */
-#define PMW3360_CS_PIN B0
+/* PMW33XX settings. */
+#define PMW33XX_CS_PIN B0
 
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 56
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
index 2b6e11ec61..63e67aa6d8 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -87,11 +87,9 @@
 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
 #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
 
-#undef PMW3360_CS_PIN
-#define PMW3360_CS_PIN                       A15  // b14
-#define PMW3360_CS_MODE 3
-#define PMW3360_CS_DIVISOR 64
-#define PMW3360_LIFTOFF_DISTANCE 0b1111
+#undef PMW33XX_CS_PIN
+#define PMW33XX_CS_PIN                       A15  // b14
+#define PMW33XX_LIFTOFF_DISTANCE 0b1111
 #undef ROTATIONAL_TRANSFORM_ANGLE
 #define ROTATIONAL_TRANSFORM_ANGLE -65
 
diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
index 0c11416612..abf4058e7b 100644
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -52,5 +52,5 @@
 #define ENCODERS_PAD_A { B7 }
 #define ENCODERS_PAD_B { E6 }
 
-#define PMW3360_CS_PIN SPI_SS_PIN
+#define PMW33XX_CS_PIN SPI_SS_PIN
 #define POINTING_DEVICE_INVERT_Y
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index ab46bc5276..5bfb17ee31 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -85,7 +85,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* PMW3360 Settings */
-#define PMW3360_CS_PIN           B0
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN           B0
 
 #define POINTING_DEVICE_RIGHT
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index e3da8b444c..3d428260ad 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -3,7 +3,7 @@
     "url": "",
     "maintainer": "drashna",
     "layouts": {
-        "LAYOUT_5x6_right": {
+        "LAYOUT_4x6_right": {
             "layout": [
                 {"label":"L00", "x":0, "y":0},
                 {"label":"L01", "x":1, "y":0},
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index d8d36e824c..ab72957b5c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -47,5 +47,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B \
     { C7 }
 
-/* PMW3360 Settings */
-#define PMW3360_CS_PIN B6
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN B6
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index f9a44587b0..809acdcd94 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -99,6 +99,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define DEBUG_EEPROM_OUTPUT
 
 /* pmw3360 config  */
-#define PMW3360_CS_PIN                       B9
-#define PMW3360_SPI_MODE                     3
-#define PMW3360_SPI_DIVISOR                  8
+#define PMW33XX_CS_PIN                       B9
+#define PMW33XX_SPI_DIVISOR                  8
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 5f0350810c..0eb5b2a217 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -102,7 +102,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
 
 /* pmw3360 config  */
-#define PMW3360_CS_PIN                       B0
-#define PMW3360_SPI_MODE                     3
-#define PMW3360_SPI_DIVISOR                  64
-#define PMW3360_FIRMWARE_UPLOAD_FAST
+#define PMW33XX_CS_PIN                       B0
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index 442d474920..6eb3186332 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -51,5 +51,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B \
     { D4 }
 
-/* PMW3360 Settings */
-#define PMW3360_CS_PIN B0
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN B0
diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h
index cfb134c4e3..1aaead0cae 100644
--- a/keyboards/oddball/config.h
+++ b/keyboards/oddball/config.h
@@ -56,4 +56,4 @@
 // #define BOOTMAGIC_LITE_COLUMN 0
 
 #define ADNS9800_CS_PIN SPI_SS_PIN
-#define PMW3360_CS_PIN SPI_SS_PIN
+#define PMW33XX_CS_PIN SPI_SS_PIN
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 98fc81bb05..a3e4b76893 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -77,5 +77,5 @@
 
 // #define DEBUG_LED_PIN F7
 
-/* PMW3360 Settings */
-#define PMW3360_CS_PIN B0
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN B0
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index dd068e4838..5c151c2e73 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -53,6 +53,6 @@
 // If board has a debug LED, you can enable it by defining this
 // #define DEBUG_LED_PIN F7
 
-/* PMW3360 Settings */
-#define PMW3360_CS_PIN             B0
+/* PMW33XX Settings */
+#define PMW33XX_CS_PIN             B0
 #define POINTING_DEVICE_INVERT_Y
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 8225e55aa2..a8e8e75e87 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -46,12 +46,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    ifdef PIMORONI_TRACKBALL_ROTATE
 #        define POINTING_DEVICE_ROTATION_90
 #    endif
-#elif defined(POINTING_DEVICE_DRIVER_pmw3360)
+#elif defined(POINTING_DEVICE_DRIVER_pmw3360) || defined(POINTING_DEVICE_DRIVER_pmw3389)
 #    include "spi_master.h"
-#    include "drivers/sensors/pmw3360.h"
-#elif defined(POINTING_DEVICE_DRIVER_pmw3389)
-#    include "spi_master.h"
-#    include "drivers/sensors/pmw3389.h"
+#    include "drivers/sensors/pmw33xx_common.h"
 #else
 void           pointing_device_driver_init(void);
 report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report);
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 8f510b3a98..b7e98e897e 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -257,81 +257,48 @@ const pointing_device_driver_t pointing_device_driver = {
 };
 // clang-format on
 
-#elif defined(POINTING_DEVICE_DRIVER_pmw3360)
-static void pmw3360_device_init(void) {
-    pmw3360_init(0);
+#elif defined(POINTING_DEVICE_DRIVER_pmw3360) || defined(POINTING_DEVICE_DRIVER_pmw3389)
+static void pmw33xx_init_wrapper(void) {
+    pmw33xx_init(0);
 }
 
-report_mouse_t pmw3360_get_report(report_mouse_t mouse_report) {
-    report_pmw3360_t data        = pmw3360_read_burst(0);
-    static uint16_t  MotionStart = 0; // Timer for accel, 0 is resting state
+static void pmw33xx_set_cpi_wrapper(uint16_t cpi) {
+    pmw33xx_set_cpi(0, cpi);
+}
 
-    if (data.isOnSurface && data.isMotion) {
-        // Reset timer if stopped moving
-        if (!data.isMotion) {
-            if (MotionStart != 0) MotionStart = 0;
-            return mouse_report;
-        }
+static uint16_t pmw33xx_get_cpi_wrapper(void) {
+    return pmw33xx_get_cpi(0);
+}
 
-        // Set timer if new motion
-        if ((MotionStart == 0) && data.isMotion) {
-#    ifdef CONSOLE_ENABLE
-            if (debug_mouse) dprintf("Starting motion.\n");
-#    endif
-            MotionStart = timer_read();
-        }
-        mouse_report.x = CONSTRAIN_HID_XY(data.dx);
-        mouse_report.y = CONSTRAIN_HID_XY(data.dy);
+report_mouse_t pmw33xx_get_report(report_mouse_t mouse_report) {
+    pmw33xx_report_t report    = pmw33xx_read_burst(0);
+    static bool      in_motion = false;
+
+    if (report.motion.b.is_lifted) {
+        return mouse_report;
     }
 
+    if (!report.motion.b.is_motion) {
+        in_motion = false;
+        return mouse_report;
+    }
+
+    if (!in_motion) {
+        in_motion = true;
+        dprintf("PWM3360 (0): starting motion\n");
+    }
+
+    mouse_report.x = CONSTRAIN_HID_XY(report.delta_x);
+    mouse_report.y = CONSTRAIN_HID_XY(report.delta_y);
     return mouse_report;
 }
 
 // clang-format off
 const pointing_device_driver_t pointing_device_driver = {
-    .init       = pmw3360_device_init,
-    .get_report = pmw3360_get_report,
-    .set_cpi    = pmw3360_set_cpi,
-    .get_cpi    = pmw3360_get_cpi
-};
-// clang-format on
-
-#elif defined(POINTING_DEVICE_DRIVER_pmw3389)
-static void pmw3389_device_init(void) {
-    pmw3389_init();
-}
-
-report_mouse_t pmw3389_get_report(report_mouse_t mouse_report) {
-    report_pmw3389_t data        = pmw3389_read_burst();
-    static uint16_t  MotionStart = 0; // Timer for accel, 0 is resting state
-
-    if (data.isOnSurface && data.isMotion) {
-        // Reset timer if stopped moving
-        if (!data.isMotion) {
-            if (MotionStart != 0) MotionStart = 0;
-            return mouse_report;
-        }
-
-        // Set timer if new motion
-        if ((MotionStart == 0) && data.isMotion) {
-#    ifdef CONSOLE_ENABLE
-            if (debug_mouse) dprintf("Starting motion.\n");
-#    endif
-            MotionStart = timer_read();
-        }
-        mouse_report.x = CONSTRAIN_HID_XY(data.dx);
-        mouse_report.y = CONSTRAIN_HID_XY(data.dy);
-    }
-
-    return mouse_report;
-}
-
-// clang-format off
-const pointing_device_driver_t pointing_device_driver = {
-    .init       = pmw3389_device_init,
-    .get_report = pmw3389_get_report,
-    .set_cpi    = pmw3389_set_cpi,
-    .get_cpi    = pmw3389_get_cpi
+    .init       = pmw33xx_init_wrapper,
+    .get_report = pmw33xx_get_report,
+    .set_cpi    = pmw33xx_set_cpi_wrapper,
+    .get_cpi    = pmw33xx_get_cpi_wrapper
 };
 // clang-format on
 

From 300dab7962ba50dcb4c550c91097573fa09b8dea Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 14 Jul 2022 19:22:53 +0800
Subject: [PATCH 106/959] [Code] Add solid reactive gradient mode (#17228)

---
 docs/feature_rgb_matrix.md                             | 10 ++++++++++
 quantum/rgb_matrix/animations/solid_reactive_anim.h    |  3 +++
 quantum/rgb_matrix/animations/solid_reactive_cross.h   |  3 +++
 quantum/rgb_matrix/animations/solid_reactive_nexus.h   |  3 +++
 .../rgb_matrix/animations/solid_reactive_simple_anim.h |  3 +++
 quantum/rgb_matrix/animations/solid_reactive_wide.h    |  3 +++
 6 files changed, 25 insertions(+)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 2debfd1c2f..f9ab395488 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -688,6 +688,16 @@ Remove the spread effect entirely.
 #define RGB_MATRIX_TYPING_HEATMAP_SLIM
 ```
 
+### RGB Matrix Effect Solid Reactive :id=rgb-matrix-effect-solid-reactive
+
+Solid reactive effects will pulse RGB light on key presses with user configurable hues. To enable gradient mode that will automatically change reactive color, add the following define:
+
+```c
+#define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+```
+
+Gradient mode will loop through the color wheel hues over time and its duration can be controlled with the effect speed keycodes (`RGB_SPI`/`RGB_SPD`).
+
 ## Custom RGB Matrix Effects :id=custom-rgb-matrix-effects
 
 By setting `RGB_MATRIX_CUSTOM_USER = yes` in `rules.mk`, new effects can be defined directly from your keymap or userspace, without having to edit any QMK core files. To declare new effects, create a `rgb_matrix_user.inc` file in the user keymap directory or userspace folder.
diff --git a/quantum/rgb_matrix/animations/solid_reactive_anim.h b/quantum/rgb_matrix/animations/solid_reactive_anim.h
index d3a7ebbdf7..052bfb22fd 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_anim.h
@@ -4,6 +4,9 @@ RGB_MATRIX_EFFECT(SOLID_REACTIVE)
 #        ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 static HSV SOLID_REACTIVE_math(HSV hsv, uint16_t offset) {
+#            ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+    hsv.h = scale16by8(g_rgb_timer, add8(rgb_matrix_config.speed, 1) >> 6);
+#            endif
     hsv.h += qsub8(130, offset);
     return hsv;
 }
diff --git a/quantum/rgb_matrix/animations/solid_reactive_cross.h b/quantum/rgb_matrix/animations/solid_reactive_cross.h
index 043a369b73..9e5703a0ea 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_cross.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_cross.h
@@ -19,6 +19,9 @@ static HSV SOLID_REACTIVE_CROSS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di
     dy              = dy * 16 > 255 ? 255 : dy * 16;
     effect += dx > dy ? dy : dx;
     if (effect > 255) effect = 255;
+#            ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+    hsv.h = scale16by8(g_rgb_timer, add8(rgb_matrix_config.speed, 1) >> 6);
+#            endif
     hsv.v = qadd8(hsv.v, 255 - effect);
     return hsv;
 }
diff --git a/quantum/rgb_matrix/animations/solid_reactive_nexus.h b/quantum/rgb_matrix/animations/solid_reactive_nexus.h
index 8d62a49fea..64f5064cf9 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_nexus.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_nexus.h
@@ -16,6 +16,9 @@ static HSV SOLID_REACTIVE_NEXUS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di
     if (effect > 255) effect = 255;
     if (dist > 72) effect = 255;
     if ((dx > 8 || dx < -8) && (dy > 8 || dy < -8)) effect = 255;
+#            ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+    hsv.h = scale16by8(g_rgb_timer, add8(rgb_matrix_config.speed, 1) >> 6);
+#            endif
     hsv.v = qadd8(hsv.v, 255 - effect);
     hsv.h = rgb_matrix_config.hsv.h + dy / 4;
     return hsv;
diff --git a/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
index 0d0a424cf3..bd3ce0817d 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
@@ -4,6 +4,9 @@ RGB_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE)
 #        ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 static HSV SOLID_REACTIVE_SIMPLE_math(HSV hsv, uint16_t offset) {
+#            ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+    hsv.h = scale16by8(g_rgb_timer, add8(rgb_matrix_config.speed, 1) >> 6);
+#            endif
     hsv.v = scale8(255 - offset, hsv.v);
     return hsv;
 }
diff --git a/quantum/rgb_matrix/animations/solid_reactive_wide.h b/quantum/rgb_matrix/animations/solid_reactive_wide.h
index 7598796316..24fedc2020 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_wide.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_wide.h
@@ -14,6 +14,9 @@ RGB_MATRIX_EFFECT(SOLID_REACTIVE_MULTIWIDE)
 static HSV SOLID_REACTIVE_WIDE_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) {
     uint16_t effect = tick + dist * 5;
     if (effect > 255) effect = 255;
+#            ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
+    hsv.h = scale16by8(g_rgb_timer, add8(rgb_matrix_config.speed, 1) >> 6);
+#            endif
     hsv.v = qadd8(hsv.v, 255 - effect);
     return hsv;
 }

From 1862ac54540573843055b3b609b9f40d9f7dc21f Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 14 Jul 2022 19:36:51 +0800
Subject: [PATCH 107/959] Fix the use of LED limits (#17678)

---
 quantum/rgb_matrix/animations/raindrops_anim.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h
index 2d4b53b7b0..a508e51183 100644
--- a/quantum/rgb_matrix/animations/raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/raindrops_anim.h
@@ -14,23 +14,22 @@ static void raindrops_set_color(int i, effect_params_t* params) {
         deltaH += 256;
     }
 
-    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (random8() & 0x03));
     RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 }
 
 bool RAINDROPS(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color(random8() % DRIVER_LED_TOTAL, params);
+        }
+    } else {
+        for (int i = led_min; i < led_max; i++) {
+            raindrops_set_color(i, params);
         }
-        return false;
-    }
-
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    for (int i = led_min; i < led_max; i++) {
-        raindrops_set_color(i, params);
     }
     return rgb_matrix_check_finished_leds(led_max);
 }

From 2f73e6583766bad3996f15955214800b1ad3b833 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 14 Jul 2022 19:37:47 +0800
Subject: [PATCH 108/959] Add LED limit call (#17679)

---
 quantum/rgb_matrix/animations/pixel_rain_anim.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/quantum/rgb_matrix/animations/pixel_rain_anim.h b/quantum/rgb_matrix/animations/pixel_rain_anim.h
index 03488b43df..ce2528a26d 100644
--- a/quantum/rgb_matrix/animations/pixel_rain_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_rain_anim.h
@@ -20,17 +20,14 @@ RGB_MATRIX_EFFECT(PIXEL_RAIN)
 
 static bool PIXEL_RAIN(effect_params_t* params) {
     static uint32_t wait_timer = 0;
-    if (wait_timer > g_rgb_timer) {
-        return false;
-    }
 
     inline uint32_t interval(void) {
         return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
     }
 
-    bool rain_pixel(uint8_t i, effect_params_t * params, bool off) {
+    void rain_pixel(uint8_t i, effect_params_t * params, bool off) {
         if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) {
-            return true;
+            return;
         }
         if (off) {
             rgb_matrix_set_color(i, 0, 0, 0);
@@ -40,10 +37,13 @@ static bool PIXEL_RAIN(effect_params_t* params) {
             rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         }
         wait_timer = g_rgb_timer + interval();
-        return false;
     }
 
-    return rain_pixel(mod8(random8(), DRIVER_LED_TOTAL), params, random8() & 2);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    if (g_rgb_timer > wait_timer) {
+        rain_pixel(mod8(random8(), DRIVER_LED_TOTAL), params, random8() & 2);
+    }
+    return rgb_matrix_check_finished_leds(led_max);
 }
 
 #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS

From 580bcff4f65a3a9ee301de0fd036de7b610c7ee2 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Sat, 16 Jul 2022 11:33:18 +0200
Subject: [PATCH 109/959] Use correct angle tune range of +/-30 on PMW33XX
 (#17693)

Co-authored-by: Daniel Kao <daniel.m.kao@gmail.com>

Co-authored-by: Daniel Kao <daniel.m.kao@gmail.com>
---
 docs/feature_pointing_device.md  | 184 +++++++++++++++----------------
 drivers/sensors/pmw33xx_common.c |   3 +-
 drivers/sensors/pmw33xx_common.h |   5 +
 3 files changed, 99 insertions(+), 93 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 607c74c562..7cfdaac407 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -22,11 +22,11 @@ POINTING_DEVICE_DRIVER = adns5050
 
 The ADNS 5050 sensor uses a serial type protocol for communication, and requires an additional light source. 
 
-| Setting            | Description                                                         |
-|--------------------|---------------------------------------------------------------------|
-|`ADNS5050_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.        |
-|`ADNS5050_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.         |
-|`ADNS5050_CS_PIN`   | (Required) The pin connected to the cable select pin of the sensor. |
+| Setting             | Description                                                         |
+| ------------------- | ------------------------------------------------------------------- |
+| `ADNS5050_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.        |
+| `ADNS5050_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.         |
+| `ADNS5050_CS_PIN`   | (Required) The pin connected to the cable select pin of the sensor. |
 
 The CPI range is 125-1375, in increments of 125. Defaults to 500 CPI.
 
@@ -40,13 +40,13 @@ POINTING_DEVICE_DRIVER = adns9800
 
 The ADNS 9800 is an SPI driven optical sensor, that uses laser output for surface tracking. 
 
-| Setting                        | Description                                                            | Default       |
-|--------------------------------|------------------------------------------------------------------------|---------------|
-|`ADNS9800_CLOCK_SPEED`          | (Optional) Sets the clock speed that the sensor runs at.               | `2000000`     |
-|`ADNS9800_SPI_LSBFIRST`         | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
-|`ADNS9800_SPI_MODE`             | (Optional) Sets the SPI Mode for the sensor.                           | `3`           |
-|`ADNS9800_SPI_DIVISOR`          | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
-|`ADNS9800_CS_PIN`               | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
+| Setting                 | Description                                                            | Default       |
+| ----------------------- | ---------------------------------------------------------------------- | ------------- |
+| `ADNS9800_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `2000000`     |
+| `ADNS9800_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
+| `ADNS9800_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `3`           |
+| `ADNS9800_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
+| `ADNS9800_CS_PIN`       | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
 
 
 The CPI range is 800-8200, in increments of 200. Defaults to 1800 CPI. 
@@ -61,16 +61,16 @@ POINTING_DEVICE_DRIVER = analog_joystick
 
 The Analog Joystick is an analog (ADC) driven sensor.  There are a variety of joysticks that you can use for this.
 
-| Setting                          | Description                                                                | Default       |
-|----------------------------------|----------------------------------------------------------------------------|---------------|
-|`ANALOG_JOYSTICK_X_AXIS_PIN`      | (Required) The pin used for the vertical/X axis.                           | _not defined_ |
-|`ANALOG_JOYSTICK_Y_AXIS_PIN`      | (Required) The pin used for the horizontal/Y axis.                         | _not defined_ |
-|`ANALOG_JOYSTICK_AXIS_MIN`        | (Optional) Sets the lower range to be considered movement.                 | `0`           |
-|`ANALOG_JOYSTICK_AXIS_MAX`        | (Optional) Sets the upper range to be considered movement.                 | `1023`        |
-|`ANALOG_JOYSTICK_SPEED_REGULATOR` | (Optional) The divisor used to slow down movement. (lower makes it faster) | `20`          |
-|`ANALOG_JOYSTICK_READ_INTERVAL`   | (Optional) The interval in milliseconds between reads.                     | `10`          |
-|`ANALOG_JOYSTICK_SPEED_MAX`       | (Optional) The maximum value used for motion.                              | `2`           |
-|`ANALOG_JOYSTICK_CLICK_PIN`       | (Optional) The pin wired up to the press switch of the analog stick.       | _not defined_ |
+| Setting                           | Description                                                                | Default       |
+| --------------------------------- | -------------------------------------------------------------------------- | ------------- |
+| `ANALOG_JOYSTICK_X_AXIS_PIN`      | (Required) The pin used for the vertical/X axis.                           | _not defined_ |
+| `ANALOG_JOYSTICK_Y_AXIS_PIN`      | (Required) The pin used for the horizontal/Y axis.                         | _not defined_ |
+| `ANALOG_JOYSTICK_AXIS_MIN`        | (Optional) Sets the lower range to be considered movement.                 | `0`           |
+| `ANALOG_JOYSTICK_AXIS_MAX`        | (Optional) Sets the upper range to be considered movement.                 | `1023`        |
+| `ANALOG_JOYSTICK_SPEED_REGULATOR` | (Optional) The divisor used to slow down movement. (lower makes it faster) | `20`          |
+| `ANALOG_JOYSTICK_READ_INTERVAL`   | (Optional) The interval in milliseconds between reads.                     | `10`          |
+| `ANALOG_JOYSTICK_SPEED_MAX`       | (Optional) The maximum value used for motion.                              | `2`           |
+| `ANALOG_JOYSTICK_CLICK_PIN`       | (Optional) The pin wired up to the press switch of the analog stick.       | _not defined_ |
 
 ### Cirque Trackpad
 
@@ -89,15 +89,15 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
 
 This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the TM040040, TM035035 and the TM023023 trackpads. These are I2C or SPI compatible, and both configurations are supported.
 
-| Setting                         | Description                                                | Default            |
-|-------------------------------- |------------------------------------------------------------|--------------------|
-|`CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.    | `127`              |
-|`CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.    | `1919`             |
-|`CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.    | `63`               |
-|`CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.    | `1471`             |
-|`CIRQUE_PINNACLE_DIAMETER_MM`    | (Optional) Diameter of the trackpad sensor in millimeters. | `40`               |
-|`CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.        | `ADC_ATTENUATE_4X` |
-|`CIRQUE_PINNACLE_CURVED_OVERLAY` | (Optional) Applies settings tuned for curved overlay.      | _not defined_      |
+| Setting                          | Description                                                | Default            |
+| -------------------------------- | ---------------------------------------------------------- | ------------------ |
+| `CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.    | `127`              |
+| `CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.    | `1919`             |
+| `CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.    | `63`               |
+| `CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.    | `1471`             |
+| `CIRQUE_PINNACLE_DIAMETER_MM`    | (Optional) Diameter of the trackpad sensor in millimeters. | `40`               |
+| `CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.        | `ADC_ATTENUATE_4X` |
+| `CIRQUE_PINNACLE_CURVED_OVERLAY` | (Optional) Applies settings tuned for curved overlay.      | _not defined_      |
 
 **`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be. 
 
@@ -107,18 +107,18 @@ Default attenuation is set to 4X, although if you are using a thicker overlay (s
 * `ADC_ATTENUATE_2X`
 * `ADC_ATTENUATE_1X`: Most sensitive
 
-| I2C Setting              | Description                                                                     | Default |
-|--------------------------|---------------------------------------------------------------------------------|---------|
-|`CIRQUE_PINNACLE_ADDR`    | (Required) Sets the I2C Address for the Cirque Trackpad                         | `0x2A`  |
-|`CIRQUE_PINNACLE_TIMEOUT` | (Optional) The timeout for i2c communication with the trackpad in milliseconds. | `20`    |
+| I2C Setting               | Description                                                                     | Default |
+| ------------------------- | ------------------------------------------------------------------------------- | ------- |
+| `CIRQUE_PINNACLE_ADDR`    | (Required) Sets the I2C Address for the Cirque Trackpad                         | `0x2A`  |
+| `CIRQUE_PINNACLE_TIMEOUT` | (Optional) The timeout for i2c communication with the trackpad in milliseconds. | `20`    |
 
-| SPI Setting                   | Description                                                            | Default        |
-|-------------------------------|------------------------------------------------------------------------|----------------|
-|`CIRQUE_PINNACLE_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `1000000`      |
-|`CIRQUE_PINNACLE_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`        |
-|`CIRQUE_PINNACLE_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `1`            |
-|`CIRQUE_PINNACLE_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_       |
-|`CIRQUE_PINNACLE_SPI_CS_PIN`   | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_  |
+| SPI Setting                    | Description                                                            | Default       |
+| ------------------------------ | ---------------------------------------------------------------------- | ------------- |
+| `CIRQUE_PINNACLE_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `1000000`     |
+| `CIRQUE_PINNACLE_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
+| `CIRQUE_PINNACLE_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `1`           |
+| `CIRQUE_PINNACLE_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
+| `CIRQUE_PINNACLE_SPI_CS_PIN`   | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
 
 Default Scaling is 1024. Actual CPI depends on trackpad diameter.
 
@@ -126,13 +126,13 @@ Also see the `POINTING_DEVICE_TASK_THROTTLE_MS`, which defaults to 10ms when usi
 
 #### Cirque Trackpad gestures
 
-| Gesture Setting                               | Description                                                                                                                                                                                      | Default              |
-|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------|
-|`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction                                                                              | _not defined_        |
-|`CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE`       | (Optional) Enable circular scroll. Touch originating in outer ring can trigger scroll by moving along the perimeter. Near side triggers vertical scroll and far side triggers horizontal scroll. | _not defined_        |
-|`CIRQUE_PINNACLE_TAP_ENABLE`                   | (Optional) Enable tap to click. This currently only works on the master side.                                                                                                                    | _not defined_        |
-|`CIRQUE_PINNACLE_TAPPING_TERM`                 | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
-|`CIRQUE_PINNACLE_TOUCH_DEBOUNCE`               | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
+| Gesture Setting                                | Description                                                                                                                                                                                      | Default              |
+| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------- |
+| `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction                                                                              | _not defined_        |
+| `CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE`       | (Optional) Enable circular scroll. Touch originating in outer ring can trigger scroll by moving along the perimeter. Near side triggers vertical scroll and far side triggers horizontal scroll. | _not defined_        |
+| `CIRQUE_PINNACLE_TAP_ENABLE`                   | (Optional) Enable tap to click. This currently only works on the master side.                                                                                                                    | _not defined_        |
+| `CIRQUE_PINNACLE_TAPPING_TERM`                 | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
+| `CIRQUE_PINNACLE_TOUCH_DEBOUNCE`               | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
 
 **`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`** is not specific to Cirque trackpad; any pointing device with a lift/contact status can integrate this gesture into its driver. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `pointing_device_get_report()` is needed to generate glide reports.
 
@@ -146,13 +146,13 @@ POINTING_DEVICE_DRIVER = pimoroni_trackball
 
 The Pimoroni Trackball module is a I2C based breakout board with an RGB enable trackball. 
 
-| Setting                             | Description                                                                        | Default |
-|-------------------------------------|------------------------------------------------------------------------------------|---------|
-|`PIMORONI_TRACKBALL_ADDRESS`         | (Required) Sets the I2C Address for the Pimoroni Trackball.                        | `0x0A`  |
-|`PIMORONI_TRACKBALL_TIMEOUT`         | (Optional) The timeout for i2c communication with the trackball in milliseconds.   | `100`   |
-|`PIMORONI_TRACKBALL_SCALE`           | (Optional) The multiplier used to generate reports from the sensor.                | `5`     |
-|`PIMORONI_TRACKBALL_DEBOUNCE_CYCLES` | (Optional) The number of scan cycles used for debouncing on the ball press.        | `20`    |
-|`PIMORONI_TRACKBALL_ERROR_COUNT`     | (Optional) Specifies the number of read/write errors until the sensor is disabled. | `10`    |
+| Setting                              | Description                                                                        | Default |
+| ------------------------------------ | ---------------------------------------------------------------------------------- | ------- |
+| `PIMORONI_TRACKBALL_ADDRESS`         | (Required) Sets the I2C Address for the Pimoroni Trackball.                        | `0x0A`  |
+| `PIMORONI_TRACKBALL_TIMEOUT`         | (Optional) The timeout for i2c communication with the trackball in milliseconds.   | `100`   |
+| `PIMORONI_TRACKBALL_SCALE`           | (Optional) The multiplier used to generate reports from the sensor.                | `5`     |
+| `PIMORONI_TRACKBALL_DEBOUNCE_CYCLES` | (Optional) The number of scan cycles used for debouncing on the ball press.        | `20`    |
+| `PIMORONI_TRACKBALL_ERROR_COUNT`     | (Optional) Specifies the number of read/write errors until the sensor is disabled. | `10`    |
 
 ### PMW 3360 and PMW 3389 Sensor
 
@@ -176,15 +176,15 @@ The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
 
 Both PMW 3360 and PMW 3389 are SPI driven optical sensors, that use a built in IR LED for surface tracking.
 
-| Setting                      | Description                                                                                 | Default       |
-| ---------------------------- | ------------------------------------------------------------------------------------------- | ------------- |
-| `PMW33XX_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                               | _not defined_ |
-| `PMW33XX_CS_PINS`            | (Alternative) Sets the Cable Select pins connected to multiple sensors.                     | _not defined_ |
-| `PMW33XX_CPI`                | (Optional) Sets counts per inch sensitivity of the sensor.                                  | _varies_      |
-| `PMW33XX_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                    | `2000000`     |
-| `PMW33XX_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                 | _varies_      |
-| `PMW33XX_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                           | `0x02`        |
-| `ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`           |
+| Setting                      | Description                                                                                | Default       |
+| ---------------------------- | ------------------------------------------------------------------------------------------ | ------------- |
+| `PMW33XX_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                              | _not defined_ |
+| `PMW33XX_CS_PINS`            | (Alternative) Sets the Cable Select pins connected to multiple sensors.                    | _not defined_ |
+| `PMW33XX_CPI`                | (Optional) Sets counts per inch sensitivity of the sensor.                                 | _varies_      |
+| `PMW33XX_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                   | `2000000`     |
+| `PMW33XX_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
+| `PMW33XX_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
+| `ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
 
 To use multiple sensors, instead of setting `PMW33XX_CS_PIN` you need to set `PMW33XX_CS_PINS` and also handle and merge the read from this sensor in user code.
 Note that different (per sensor) values of CPI, speed liftoff, rotational angle or flipping of X/Y is not currently supported.
@@ -237,15 +237,15 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 
 ## Common Configuration
 
-| Setting                          | Description                                                           | Default           |
-|----------------------------------|-----------------------------------------------------------------------|-------------------|
-|`POINTING_DEVICE_ROTATION_90`     | (Optional) Rotates the X and Y data by  90 degrees.                   | _not defined_     |
-|`POINTING_DEVICE_ROTATION_180`    | (Optional) Rotates the X and Y data by 180 degrees.                   | _not defined_     |
-|`POINTING_DEVICE_ROTATION_270`    | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_     |
-|`POINTING_DEVICE_INVERT_X`        | (Optional) Inverts the X axis report.                                 | _not defined_     |
-|`POINTING_DEVICE_INVERT_Y`        | (Optional) Inverts the Y axis report.                                 | _not defined_     |
-|`POINTING_DEVICE_MOTION_PIN`      | (Optional) If supported, will only read from sensor if pin is active. | _not defined_     |
-|`POINTING_DEVICE_TASK_THROTTLE_MS`      | (Optional) Limits the frequency that the sensor is polled for motion. | _not defined_     |
+| Setting                            | Description                                                           | Default       |
+| ---------------------------------- | --------------------------------------------------------------------- | ------------- |
+| `POINTING_DEVICE_ROTATION_90`      | (Optional) Rotates the X and Y data by  90 degrees.                   | _not defined_ |
+| `POINTING_DEVICE_ROTATION_180`     | (Optional) Rotates the X and Y data by 180 degrees.                   | _not defined_ |
+| `POINTING_DEVICE_ROTATION_270`     | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_ |
+| `POINTING_DEVICE_INVERT_X`         | (Optional) Inverts the X axis report.                                 | _not defined_ |
+| `POINTING_DEVICE_INVERT_Y`         | (Optional) Inverts the Y axis report.                                 | _not defined_ |
+| `POINTING_DEVICE_MOTION_PIN`       | (Optional) If supported, will only read from sensor if pin is active. | _not defined_ |
+| `POINTING_DEVICE_TASK_THROTTLE_MS` | (Optional) Limits the frequency that the sensor is polled for motion. | _not defined_ |
 
 !> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and `POINTING_DEVICE_TASK_THROTTLE_MS` will default to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
 
@@ -254,25 +254,25 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 
 The following configuration options are only available when using `SPLIT_POINTING_ENABLE` see [data sync options](feature_split_keyboard.md?id=data-sync-options). The rotation and invert `*_RIGHT` options are only used with `POINTING_DEVICE_COMBINED`. If using `POINTING_DEVICE_LEFT` or `POINTING_DEVICE_RIGHT` use the common configuration above to configure your pointing device.
 
-| Setting                                | Description                                                           | Default       |
-|----------------------------------------|-----------------------------------------------------------------------|---------------|
-|`POINTING_DEVICE_LEFT`                  | Pointing device on the left side (Required - pick one only)           | _not defined_ |
-|`POINTING_DEVICE_RIGHT`                 | Pointing device on the right side (Required - pick one only)          | _not defined_ |
-|`POINTING_DEVICE_COMBINED`              | Pointing device on both sides (Required - pick one only)              | _not defined_ |
-|`POINTING_DEVICE_ROTATION_90_RIGHT`     | (Optional) Rotates the X and Y data by  90 degrees.                   | _not defined_ |
-|`POINTING_DEVICE_ROTATION_180_RIGHT`    | (Optional) Rotates the X and Y data by 180 degrees.                   | _not defined_ |
-|`POINTING_DEVICE_ROTATION_270_RIGHT`    | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_ |
-|`POINTING_DEVICE_INVERT_X_RIGHT`        | (Optional) Inverts the X axis report.                                 | _not defined_ |
-|`POINTING_DEVICE_INVERT_Y_RIGHT`        | (Optional) Inverts the Y axis report.                                 | _not defined_ |
-|`MOUSE_EXTENDED_REPORT`                 | (Optional) Enables support for extended mouse reports. (-32767 to 32767, instead of just -127 to 127) |
+| Setting                              | Description                                                                                           | Default       |
+| ------------------------------------ | ----------------------------------------------------------------------------------------------------- | ------------- |
+| `POINTING_DEVICE_LEFT`               | Pointing device on the left side (Required - pick one only)                                           | _not defined_ |
+| `POINTING_DEVICE_RIGHT`              | Pointing device on the right side (Required - pick one only)                                          | _not defined_ |
+| `POINTING_DEVICE_COMBINED`           | Pointing device on both sides (Required - pick one only)                                              | _not defined_ |
+| `POINTING_DEVICE_ROTATION_90_RIGHT`  | (Optional) Rotates the X and Y data by  90 degrees.                                                   | _not defined_ |
+| `POINTING_DEVICE_ROTATION_180_RIGHT` | (Optional) Rotates the X and Y data by 180 degrees.                                                   | _not defined_ |
+| `POINTING_DEVICE_ROTATION_270_RIGHT` | (Optional) Rotates the X and Y data by 270 degrees.                                                   | _not defined_ |
+| `POINTING_DEVICE_INVERT_X_RIGHT`     | (Optional) Inverts the X axis report.                                                                 | _not defined_ |
+| `POINTING_DEVICE_INVERT_Y_RIGHT`     | (Optional) Inverts the Y axis report.                                                                 | _not defined_ |
+| `MOUSE_EXTENDED_REPORT`              | (Optional) Enables support for extended mouse reports. (-32767 to 32767, instead of just -127 to 127) |
 
 !> If there is a `_RIGHT` configuration option or callback, the [common configuration](feature_pointing_device.md?id=common-configuration) option will work for the left. For correct left/right detection you should setup a [handedness option](feature_split_keyboard?id=setting-handedness), `EE_HANDS` is usually a good option for an existing board that doesn't do handedness by hardware.
 
 
 ## Callbacks and Functions 
 
-| Function                          | Description                                                                                                                            |
-|-----------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|
+| Function                                                   | Description                                                                                                   |
+| ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
 | `pointing_device_init_kb(void)`                            | Callback to allow for keyboard level initialization. Useful for additional hardware sensors.                  |
 | `pointing_device_init_user(void)`                          | Callback to allow for user level initialization. Useful for additional hardware sensors.                      |
 | `pointing_device_task_kb(mouse_report)`                    | Callback that sends sensor data, so keyboard code can intercept and modify the data.  Returns a mouse report. |
@@ -280,11 +280,11 @@ The following configuration options are only available when using `SPLIT_POINTIN
 | `pointing_device_handle_buttons(buttons, pressed, button)` | Callback to handle hardware button presses. Returns a `uint8_t`.                                              |
 | `pointing_device_get_cpi(void)`                            | Gets the current CPI/DPI setting from the sensor, if supported.                                               |
 | `pointing_device_set_cpi(uint16_t)`                        | Sets the CPI/DPI, if supported.                                                                               |
-| `pointing_device_get_report(void)`                         | Returns the current mouse report (as a `mouse_report_t` data structure).                                      | 
-| `pointing_device_set_report(mouse_report)`                 | Sets the mouse report to the assigned `mouse_report_t` data structured passed to the function.                | 
-| `pointing_device_send(void)`                               | Sends the current mouse report to the host system.  Function can be replaced.                                 | 
+| `pointing_device_get_report(void)`                         | Returns the current mouse report (as a `mouse_report_t` data structure).                                      |
+| `pointing_device_set_report(mouse_report)`                 | Sets the mouse report to the assigned `mouse_report_t` data structured passed to the function.                |
+| `pointing_device_send(void)`                               | Sends the current mouse report to the host system.  Function can be replaced.                                 |
 | `has_mouse_report_changed(new_report, old_report)`         | Compares the old and new `mouse_report_t` data and returns true only if it has changed.                       |
-| `pointing_device_adjust_by_defines(mouse_report)`          | Applies rotations and invert configurations to a raw mouse report.                                             |
+| `pointing_device_adjust_by_defines(mouse_report)`          | Applies rotations and invert configurations to a raw mouse report.                                            |
 
 
 ## Split Keyboard Callbacks and Functions
@@ -292,7 +292,7 @@ The following configuration options are only available when using `SPLIT_POINTIN
 The combined functions below are only available when using `SPLIT_POINTING_ENABLE` and `POINTING_DEVICE_COMBINED`. The 2 callbacks `pointing_device_task_combined_*` replace the single sided equivalents above. See the [combined pointing devices example](feature_pointing_device.md?id=combined-pointing-devices)
 
 | Function                                                        | Description                                                                                                              |
-|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|
+| --------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
 | `pointing_device_set_shared_report(mouse_report)`               | Sets the shared mouse report to the assigned `mouse_report_t` data structured passed to the function.                    |
 | `pointing_device_set_cpi_on_side(bool, uint16_t)`               | Sets the CPI/DPI of one side, if supported. Passing `true` will set the left and `false` the right`                      |
 | `pointing_device_combine_reports(left_report, right_report)`    | Returns a combined mouse_report of left_report and right_report (as a `mouse_report_t` data structure)                   |
diff --git a/drivers/sensors/pmw33xx_common.c b/drivers/sensors/pmw33xx_common.c
index 538c40c462..0a8989fcea 100644
--- a/drivers/sensors/pmw33xx_common.c
+++ b/drivers/sensors/pmw33xx_common.c
@@ -1,3 +1,4 @@
+// Copyright 2022 Daniel Kao (dkao)
 // Copyright 2022 Stefan Kerkmann (KarlK90)
 // Copyright 2022 Ulrich Spörlein (@uqs)
 // Copyright 2021 Alabastard (@Alabastard-64)
@@ -165,7 +166,7 @@ bool pmw33xx_init(uint8_t sensor) {
     wait_ms(1);
 
     pmw33xx_write(sensor, REG_Config2, 0x00);
-    pmw33xx_write(sensor, REG_Angle_Tune, CONSTRAIN(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
+    pmw33xx_write(sensor, REG_Angle_Tune, CONSTRAIN(ROTATIONAL_TRANSFORM_ANGLE, -30, 30));
     pmw33xx_write(sensor, REG_Lift_Config, PMW33XX_LIFTOFF_DISTANCE);
 
     if (!pmw33xx_check_signature(sensor)) {
diff --git a/drivers/sensors/pmw33xx_common.h b/drivers/sensors/pmw33xx_common.h
index 181bea3d43..eab8518baa 100644
--- a/drivers/sensors/pmw33xx_common.h
+++ b/drivers/sensors/pmw33xx_common.h
@@ -1,3 +1,4 @@
+// Copyright 2022 Daniel Kao (dkao)
 // Copyright 2022 Stefan Kerkmann (KarlK90)
 // Copyright 2022 Ulrich Spörlein (@uqs)
 // Copyright 2021 Alabastard (@Alabastard-64)
@@ -58,6 +59,10 @@ _Static_assert(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.moti
 #    define ROTATIONAL_TRANSFORM_ANGLE 0x00
 #endif
 
+#if ROTATIONAL_TRANSFORM_ANGLE > 30 || ROTATIONAL_TRANSFORM_ANGLE < (-30)
+#    error ROTATIONAL_TRANSFORM_ANGLE has to be in the range of +/- 30 for all PMW33XX sensors.
+#endif
+
 // Support single and plural spellings
 #ifndef PMW33XX_CS_PINS
 #    ifndef PMW33XX_CS_PIN

From a304a9b51ed6e876f25c579f383e2cbf9afb8353 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Sun, 17 Jul 2022 21:08:55 +0200
Subject: [PATCH 110/959] Use correct angle tune range of +/-127 on PMW33XX
 (#17708)

...partially reverts 580bcff4f65a3a9ee301de0fd036de7b610c7ee2 as the
datasheet doesn't claim that the angle tuning as limited to +/- 30
degrees.
---
 docs/feature_pointing_device.md  | 18 +++++++++---------
 drivers/sensors/pmw33xx_common.c |  2 +-
 drivers/sensors/pmw33xx_common.h |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 7cfdaac407..6343ed073d 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -176,15 +176,15 @@ The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
 
 Both PMW 3360 and PMW 3389 are SPI driven optical sensors, that use a built in IR LED for surface tracking.
 
-| Setting                      | Description                                                                                | Default       |
-| ---------------------------- | ------------------------------------------------------------------------------------------ | ------------- |
-| `PMW33XX_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                              | _not defined_ |
-| `PMW33XX_CS_PINS`            | (Alternative) Sets the Cable Select pins connected to multiple sensors.                    | _not defined_ |
-| `PMW33XX_CPI`                | (Optional) Sets counts per inch sensitivity of the sensor.                                 | _varies_      |
-| `PMW33XX_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                   | `2000000`     |
-| `PMW33XX_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
-| `PMW33XX_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
-| `ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
+| Setting                      | Description                                                                                 | Default       |
+| ---------------------------- | ------------------------------------------------------------------------------------------- | ------------- |
+| `PMW33XX_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                               | _not defined_ |
+| `PMW33XX_CS_PINS`            | (Alternative) Sets the Cable Select pins connected to multiple sensors.                     | _not defined_ |
+| `PMW33XX_CPI`                | (Optional) Sets counts per inch sensitivity of the sensor.                                  | _varies_      |
+| `PMW33XX_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                    | `2000000`     |
+| `PMW33XX_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                 | _varies_      |
+| `PMW33XX_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                           | `0x02`        |
+| `ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`           |
 
 To use multiple sensors, instead of setting `PMW33XX_CS_PIN` you need to set `PMW33XX_CS_PINS` and also handle and merge the read from this sensor in user code.
 Note that different (per sensor) values of CPI, speed liftoff, rotational angle or flipping of X/Y is not currently supported.
diff --git a/drivers/sensors/pmw33xx_common.c b/drivers/sensors/pmw33xx_common.c
index 0a8989fcea..13164cb150 100644
--- a/drivers/sensors/pmw33xx_common.c
+++ b/drivers/sensors/pmw33xx_common.c
@@ -166,7 +166,7 @@ bool pmw33xx_init(uint8_t sensor) {
     wait_ms(1);
 
     pmw33xx_write(sensor, REG_Config2, 0x00);
-    pmw33xx_write(sensor, REG_Angle_Tune, CONSTRAIN(ROTATIONAL_TRANSFORM_ANGLE, -30, 30));
+    pmw33xx_write(sensor, REG_Angle_Tune, CONSTRAIN(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
     pmw33xx_write(sensor, REG_Lift_Config, PMW33XX_LIFTOFF_DISTANCE);
 
     if (!pmw33xx_check_signature(sensor)) {
diff --git a/drivers/sensors/pmw33xx_common.h b/drivers/sensors/pmw33xx_common.h
index eab8518baa..87e8b34d5c 100644
--- a/drivers/sensors/pmw33xx_common.h
+++ b/drivers/sensors/pmw33xx_common.h
@@ -59,8 +59,8 @@ _Static_assert(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.moti
 #    define ROTATIONAL_TRANSFORM_ANGLE 0x00
 #endif
 
-#if ROTATIONAL_TRANSFORM_ANGLE > 30 || ROTATIONAL_TRANSFORM_ANGLE < (-30)
-#    error ROTATIONAL_TRANSFORM_ANGLE has to be in the range of +/- 30 for all PMW33XX sensors.
+#if ROTATIONAL_TRANSFORM_ANGLE > 127 || ROTATIONAL_TRANSFORM_ANGLE < (-127)
+#    error ROTATIONAL_TRANSFORM_ANGLE has to be in the range of +/- 127 for all PMW33XX sensors.
 #endif
 
 // Support single and plural spellings

From 42eff8c3726517304ad479f3e760dc34428b4f9f Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 18 Jul 2022 11:55:27 +0100
Subject: [PATCH 111/959]  Allow dynamic keymap to compile without via.h
 (#17703)

---
 quantum/dynamic_keymap.c | 15 ++++++++-------
 quantum/via.h            |  2 ++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index cbe9f13940..e80dd6d534 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -19,7 +19,13 @@
 #include "progmem.h" // to read default from flash
 #include "quantum.h" // for send_string()
 #include "dynamic_keymap.h"
-#include "via.h" // for default VIA_EEPROM_ADDR_END
+
+#ifdef VIA_ENABLE
+#    include "via.h" // for VIA_EEPROM_CONFIG_END
+#    define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
+#else
+#    define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
+#endif
 
 #ifdef ENCODER_ENABLE
 #    include "encoder.h"
@@ -55,13 +61,8 @@
 #endif
 
 // If DYNAMIC_KEYMAP_EEPROM_ADDR not explicitly defined in config.h,
-// default it start after VIA_EEPROM_CUSTOM_ADDR+VIA_EEPROM_CUSTOM_SIZE
 #ifndef DYNAMIC_KEYMAP_EEPROM_ADDR
-#    ifdef VIA_EEPROM_CUSTOM_CONFIG_ADDR
-#        define DYNAMIC_KEYMAP_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR + VIA_EEPROM_CUSTOM_CONFIG_SIZE)
-#    else
-#        error DYNAMIC_KEYMAP_EEPROM_ADDR not defined
-#    endif
+#    define DYNAMIC_KEYMAP_EEPROM_ADDR DYNAMIC_KEYMAP_EEPROM_START
 #endif
 
 // Dynamic encoders starts after dynamic keymaps
diff --git a/quantum/via.h b/quantum/via.h
index ac29a58902..31d9c21af4 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -54,6 +54,8 @@
 #    define VIA_EEPROM_CUSTOM_CONFIG_SIZE 0
 #endif
 
+#define VIA_EEPROM_CONFIG_END (VIA_EEPROM_CUSTOM_CONFIG_ADDR + VIA_EEPROM_CUSTOM_CONFIG_SIZE)
+
 // This is changed only when the command IDs change,
 // so VIA Configurator can detect compatible firmware.
 #define VIA_PROTOCOL_VERSION 0x0009

From c3f1ba7dd1673e28c852303c58eec876d38b6fed Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 19 Jul 2022 02:28:23 +0100
Subject: [PATCH 112/959] Remove full bootmagic config (#17702)

---
 keyboards/handwired/promethium/keymaps/priyadi/config.h     | 6 ------
 keyboards/keebio/nyquist/keymaps/danielhklein/config.h      | 4 +---
 keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h | 4 ----
 keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h     | 4 ----
 .../kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h    | 4 ----
 .../kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h   | 4 ----
 keyboards/kprepublic/jj50/keymaps/archetype/config.h        | 1 -
 keyboards/planck/keymaps/priyadi/config.h                   | 6 ------
 users/talljoe/config.h                                      | 4 ----
 users/tominabox1/config.h                                   | 2 --
 10 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/keyboards/handwired/promethium/keymaps/priyadi/config.h b/keyboards/handwired/promethium/keymaps/priyadi/config.h
index 0630fd43e3..1e5e8906ed 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/config.h
+++ b/keyboards/handwired/promethium/keymaps/priyadi/config.h
@@ -2,12 +2,6 @@
 
 #define PRIYADI_PROMETHIUM
 
-/* bootmagic salt key */
-#define BOOTMAGIC_KEY_SALT              KC_ESC
-
-/* skip bootmagic and eeconfig */
-#define BOOTMAGIC_KEY_SKIP              KC_SPACE
-
 #define RGBSPS_ENABLE
 #define RGBSPS_DEMO_ENABLE
 
diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
index 09abbccb72..398b285b89 100644
--- a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
@@ -14,13 +14,11 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
+#pragma once
 
 #define TAPPING_TERM 150 
 #define USE_SERIAL
 #define EE_HANDS
-#define BOOTMAGIC_KEY_SALT KC_ENT
-
 
 #ifdef SUBPROJECT_rev1
     #include "../../rev1/config.h"
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
index b38e4b8fc6..ba18295ead 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
@@ -60,10 +60,6 @@
 
 #define RGBLIGHT_LIMIT_VAL 10
 
-//bootmagic
-#define BOOTMAGIC_KEY_SALT KC_V
-#define BOOTMAGIC_KEY_EEPROM_CLEAR KC_Q
-
 #ifdef RGB_MATRIX_ENABLE
 
 #    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
index 2b0d0961c4..a88ae7f2e8 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
@@ -25,10 +25,6 @@
 //#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
 
-//bootmagic
-#define BOOTMAGIC_KEY_SALT KC_V
-#define BOOTMAGIC_KEY_EEPROM_CLEAR KC_Q
-
 #ifdef RGB_MATRIX_ENABLE
 
 #define TAPPING_TERM 200
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
index d39f6b95c8..cdfa67acb0 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
@@ -25,10 +25,6 @@
 //#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
 
-//bootmagic
-#define BOOTMAGIC_KEY_SALT KC_V
-#define BOOTMAGIC_KEY_EEPROM_CLEAR KC_Q
-
 #ifdef RGB_MATRIX_ENABLE
 
 #define TAPPING_TERM 200
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
index a4634c581e..dbadc3da99 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
@@ -25,10 +25,6 @@
 //#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
 
-//bootmagic
-#define BOOTMAGIC_KEY_SALT KC_V
-#define BOOTMAGIC_KEY_EEPROM_CLEAR KC_Q
-
 #ifdef RGB_MATRIX_ENABLE
 
 #define TAPPING_TERM 200
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/config.h b/keyboards/kprepublic/jj50/keymaps/archetype/config.h
index 9604ac719c..17ce95a363 100644
--- a/keyboards/kprepublic/jj50/keymaps/archetype/config.h
+++ b/keyboards/kprepublic/jj50/keymaps/archetype/config.h
@@ -7,4 +7,3 @@
 #define NO_AUTO_SHIFT_ALPHA
 #define TAPPING_TERM 150
 #define TAPPING_TERM_PER_KEY
-//#define BOOTMAGIC_KEY_SALT KC_LCTL
diff --git a/keyboards/planck/keymaps/priyadi/config.h b/keyboards/planck/keymaps/priyadi/config.h
index c85e8656e6..d72b6d3908 100644
--- a/keyboards/planck/keymaps/priyadi/config.h
+++ b/keyboards/planck/keymaps/priyadi/config.h
@@ -5,12 +5,6 @@
 
 #define PRIYADI_PLANCK
 
-/* bootmagic salt key */
-#define BOOTMAGIC_KEY_SALT              KC_ESC
-
-/* skip bootmagic and eeconfig */
-#define BOOTMAGIC_KEY_SKIP              KC_SPACE
-
 #define UNICODE_TYPE_DELAY 0
 
 #define LAYOUT_DVORAK
diff --git a/users/talljoe/config.h b/users/talljoe/config.h
index 8a5fd50cb7..dcdbbd89f4 100644
--- a/users/talljoe/config.h
+++ b/users/talljoe/config.h
@@ -19,9 +19,5 @@
 
 #define RESET_LAYER 15
 
-#define BOOTMAGIC_KEY_SALT KC_ESC
-#define BOOTMAGIC_KEY_SKIP KC_I
-#define BOOTMAGIC_KEY_EEPROM_CLEAR KC_E
-
 #define COMBO_COUNT 2
 #define COMBO_TERM 250
diff --git a/users/tominabox1/config.h b/users/tominabox1/config.h
index 4a2433eb0b..f853e18605 100644
--- a/users/tominabox1/config.h
+++ b/users/tominabox1/config.h
@@ -3,8 +3,6 @@
 // Tapping term settings
 #define TAPPING_TERM_PER_KEY
 #define TAP_HOLD_CAPS_DELAY 350
-#define BOOTMAGIC_KEY_SALT KC_BSPACE
-#define BOOTMAGIC_KEY_EEPROM_CLEAR KC_Q
 
 // OLED settings
 #define OLED_FONT_H "users/tominabox1/doug.c"

From 59c7b15b4da6e9325b7af6bd34fc4cb557ebb184 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 18 Jul 2022 20:20:24 -0600
Subject: [PATCH 113/959] [Keyboard] boardsource/microdox data driven (#17675)

---
 keyboards/boardsource/microdox/.noci          |   0
 keyboards/boardsource/microdox/config.h       |  83 ------------
 keyboards/boardsource/microdox/info.json      | 118 ++++++++++--------
 .../microdox/keymaps/cole/keymap.c            |   2 +-
 .../microdox/keymaps/cole/rules.mk            |   1 -
 .../microdox/keymaps/default/keymap.c         |   2 +-
 .../boardsource/microdox/keymaps/via/rules.mk |   2 -
 keyboards/boardsource/microdox/microdox.c     |  37 ++++--
 keyboards/boardsource/microdox/microdox.h     |  38 ------
 keyboards/boardsource/microdox/readme.md      |   3 +-
 keyboards/boardsource/microdox/rules.mk       |  21 ----
 keyboards/boardsource/microdox/v1/config.h    |  20 +++
 keyboards/boardsource/microdox/v1/info.json   |  25 ++++
 keyboards/boardsource/microdox/v1/rules.mk    |   1 +
 keyboards/boardsource/microdox/v2/config.h    |  51 ++------
 keyboards/boardsource/microdox/v2/info.json   |  82 ++++++++++++
 keyboards/boardsource/microdox/v2/rules.mk    |   7 --
 keyboards/boardsource/microdox/v2/v2.c        |  62 ---------
 keyboards/boardsource/microdox/v2/v2.h        |  22 ----
 19 files changed, 238 insertions(+), 339 deletions(-)
 delete mode 100644 keyboards/boardsource/microdox/.noci
 delete mode 100644 keyboards/boardsource/microdox/config.h
 delete mode 100644 keyboards/boardsource/microdox/keymaps/cole/rules.mk
 delete mode 100644 keyboards/boardsource/microdox/microdox.h
 delete mode 100644 keyboards/boardsource/microdox/rules.mk
 create mode 100644 keyboards/boardsource/microdox/v1/config.h
 create mode 100644 keyboards/boardsource/microdox/v1/info.json
 create mode 100644 keyboards/boardsource/microdox/v1/rules.mk
 create mode 100644 keyboards/boardsource/microdox/v2/info.json
 delete mode 100644 keyboards/boardsource/microdox/v2/v2.c
 delete mode 100644 keyboards/boardsource/microdox/v2/v2.h

diff --git a/keyboards/boardsource/microdox/.noci b/keyboards/boardsource/microdox/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/boardsource/microdox/config.h b/keyboards/boardsource/microdox/config.h
deleted file mode 100644
index f2ba806ae7..0000000000
--- a/keyboards/boardsource/microdox/config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright 2020 Cole Smith <cole@boadsource.xyz>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-#define VENDOR_ID 0xF7E0
-#define PRODUCT_ID 0x0412
-#define DEVICE_VER 0x0000
-#define MANUFACTURER Boardsource
-#define PRODUCT microdox
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-#define MATRIX_ROW_PINS \
-    { B2, B6, B4, B5 }
-
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { F4, F5, F6, F7, B1 }
-#define USE_SERIAL
-#define SOFT_SERIAL_PIN D2
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 12 // Number of LEDs
-#    define RGBLED_SPLIT \
-        { 6, 6 }
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-
-#endif
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardsource/microdox/info.json b/keyboards/boardsource/microdox/info.json
index 3255056002..37f190d42d 100644
--- a/keyboards/boardsource/microdox/info.json
+++ b/keyboards/boardsource/microdox/info.json
@@ -1,54 +1,70 @@
 {
-    "keyboard_name": "microdox",
-    "url": "https://boardsource.xyz/store/5f2e7e4a2902de7151494f92",
-    "maintainer": "boardsource",
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                { "label": "Q", "x": 0, "y": 0.3 },
-                { "label": "W", "x": 1, "y": 0.1 },
-                { "label": "E", "x": 2, "y": 0 },
-                { "label": "R", "x": 3, "y": 0.1 },
-                { "label": "T", "x": 4, "y": 0.2 },
-
-                { "label": "Y", "x": 8, "y": 0.2 },
-                { "label": "U", "x": 9, "y": 0.1 },
-                { "label": "I", "x": 10, "y": 0 },
-                { "label": "O", "x": 11, "y": 0.1 },
-                { "label": "P", "x": 12, "y": 0.3 },
-
-                { "label": "A", "x": 0, "y": 1.3 },
-                { "label": "S", "x": 1, "y": 1.1 },
-                { "label": "D", "x": 2, "y": 1 },
-                { "label": "F", "x": 3, "y": 1.1 },
-                { "label": "G", "x": 4, "y": 1.2 },
-
-                { "label": "H", "x": 8, "y": 1.2 },
-                { "label": "J", "x": 9, "y": 1.1 },
-                { "label": "K", "x": 10, "y": 1 },
-                { "label": "L", "x": 11, "y": 1.1 },
-                { "label": ";", "x": 12, "y": 1.3 },
-
-                { "label": "Z", "x": 0, "y": 2.3 },
-                { "label": "X", "x": 1, "y": 2.1 },
-                { "label": "C", "x": 2, "y": 2 },
-                { "label": "V", "x": 3, "y": 2.1 },
-                { "label": "B", "x": 4, "y": 2.2 },
-
-                { "label": "N", "x": 8, "y": 2.2 },
-                { "label": "M", "x": 9, "y": 2.1 },
-                { "label": ",", "x": 10, "y": 2 },
-                { "label": ".", "x": 11, "y": 2.1 },
-                { "label": "/", "x": 12, "y": 2.3 },
-
-                { "label": "GUI / KC_HANJ", "x": 3, "y": 3.7 },
-                { "label": "Lower", "x": 4, "y": 3.7 },
-                { "label": "Space", "x": 5, "y": 3.2 },
-
-                { "label": "Enter", "x": 7, "y": 3.2 },
-                { "label": "Raise", "x": 8, "y": 3.7 },
-                { "label": "Alt / KC_HAEN", "x": 9, "y": 3.7 }
-            ]
-        }
+  "manufacturer": "Boardsource",
+  "keyboard_name": "microdox",
+  "maintainer": "waffle87",
+  "development_board": "promicro",
+  "diode_direction": "COL2ROW",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "oled": true
+  },
+  "url": "https://boardsource.xyz/store/5f2e7e4a2902de7151494f92",
+  "usb": {
+    "pid": "0x0412",
+    "vid": "0xF7E0"
+  },
+  "split": {
+    "enabled": true
+  },
+  "community_layouts": [
+    "split_3x5_3"
+  ],
+  "layouts": {
+    "LAYOUT_split_3x5_3": {
+      "layout": [
+        { "matrix": [0, 0], "x": 0, "y": 0 },
+        { "matrix": [0, 1], "x": 1, "y": 0 },
+        { "matrix": [0, 2], "x": 2, "y": 0 },
+        { "matrix": [0, 3], "x": 3, "y": 0 },
+        { "matrix": [0, 4], "x": 4, "y": 0 },
+        { "matrix": [4, 4], "x": 5, "y": 0 },
+        { "matrix": [4, 3], "x": 6, "y": 0 },
+        { "matrix": [4, 2], "x": 7, "y": 0 },
+        { "matrix": [4, 1], "x": 8, "y": 0 },
+        { "matrix": [4, 0], "x": 9, "y": 0 },
+        { "matrix": [1, 0], "x": 10, "y": 0 },
+        { "matrix": [1, 1], "x": 11, "y": 0 },
+        { "matrix": [1, 2], "x": 12, "y": 0 },
+        { "matrix": [1, 3], "x": 13, "y": 0 },
+        { "matrix": [1, 4], "x": 14, "y": 0 },
+        { "matrix": [5, 4], "x": 15, "y": 0 },
+        { "matrix": [5, 3], "x": 16, "y": 0 },
+        { "matrix": [5, 2], "x": 17, "y": 0 },
+        { "matrix": [5, 1], "x": 18, "y": 0 },
+        { "matrix": [5, 0], "x": 19, "y": 0 },
+        { "matrix": [2, 0], "x": 20, "y": 0 },
+        { "matrix": [2, 1], "x": 21, "y": 0 },
+        { "matrix": [2, 2], "x": 22, "y": 0 },
+        { "matrix": [2, 3], "x": 23, "y": 0 },
+        { "matrix": [2, 4], "x": 24, "y": 0 },
+        { "matrix": [6, 4], "x": 25, "y": 0 },
+        { "matrix": [6, 3], "x": 26, "y": 0 },
+        { "matrix": [6, 2], "x": 27, "y": 0 },
+        { "matrix": [6, 1], "x": 28, "y": 0 },
+        { "matrix": [6, 0], "x": 29, "y": 0 },
+        { "matrix": [3, 2], "x": 30, "y": 0 },
+        { "matrix": [3, 3], "x": 31, "y": 0 },
+        { "matrix": [3, 4], "x": 32, "y": 0 },
+        { "matrix": [7, 4], "x": 33, "y": 0 },
+        { "matrix": [7, 3], "x": 34, "y": 0 },
+        { "matrix": [7, 2], "x": 35, "y": 0 }
+      ]
     }
+  }
 }
diff --git a/keyboards/boardsource/microdox/keymaps/cole/keymap.c b/keyboards/boardsource/microdox/keymaps/cole/keymap.c
index f4ac92ea0d..8c177be5a5 100644
--- a/keyboards/boardsource/microdox/keymaps/cole/keymap.c
+++ b/keyboards/boardsource/microdox/keymaps/cole/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Cole Smith <cole@boadsource.xyz>
+Copyright 2022 Cole Smith <cole@boadsource.xyz>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/boardsource/microdox/keymaps/cole/rules.mk b/keyboards/boardsource/microdox/keymaps/cole/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/boardsource/microdox/keymaps/cole/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/boardsource/microdox/keymaps/default/keymap.c b/keyboards/boardsource/microdox/keymaps/default/keymap.c
index 6fe94011f4..8a090b6f8f 100644
--- a/keyboards/boardsource/microdox/keymaps/default/keymap.c
+++ b/keyboards/boardsource/microdox/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Cole Smith <cole@boadsource.xyz>
+Copyright 2022 Cole Smith <cole@boadsource.xyz>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/boardsource/microdox/keymaps/via/rules.mk b/keyboards/boardsource/microdox/keymaps/via/rules.mk
index 7fad85c015..1e5b99807c 100644
--- a/keyboards/boardsource/microdox/keymaps/via/rules.mk
+++ b/keyboards/boardsource/microdox/keymaps/via/rules.mk
@@ -1,3 +1 @@
-OLED_ENABLE = yes
 VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/boardsource/microdox/microdox.c b/keyboards/boardsource/microdox/microdox.c
index abfe65a2bd..76ee6bc54e 100644
--- a/keyboards/boardsource/microdox/microdox.c
+++ b/keyboards/boardsource/microdox/microdox.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Cole Smith <cole@boadsource.xyz>
+Copyright 2022 Cole Smith <cole@boadsource.xyz>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,9 +15,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "microdox.h"
-
 #ifdef OLED_ENABLE
+#include "oled_driver.h"
+#include "bitwise.h"
+#include "action_layer.h"
+
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
   if (is_keyboard_master())
     return OLED_ROTATION_180;
@@ -26,14 +28,12 @@ oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
 
 static void render_logo(void) {
   static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
-    0
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+    0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+    0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
   };
   oled_write_P(qmk_logo, false);
 }
-
 static void render_status(void) {
    switch (get_highest_layer(layer_state)) {
     case 0:
@@ -74,3 +74,24 @@ bool oled_task_kb(void) {
   return false;
 }
 #endif
+
+#ifdef ENCODER_ENABLE
+#include "encoder.h"
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+  if (!encoder_update_user(index, clockwise)) { return false; }
+  if (index == 0) {
+    if (clockwise) {
+      tap_code_delay(KC_VOLU, 10);
+    } else {
+      tap_code_delay(KC_VOLD, 10);  
+    }
+  } else {
+    if (clockwise) {
+      tap_code(KC_MNXT);
+    } else {
+      tap_code(KC_MPRV);
+    }
+  }
+  return true;
+}
+#endif
diff --git a/keyboards/boardsource/microdox/microdox.h b/keyboards/boardsource/microdox/microdox.h
deleted file mode 100644
index 8b63b46415..0000000000
--- a/keyboards/boardsource/microdox/microdox.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 Cole Smith <cole@boadsource.xyz>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-#define xxx KC_NO
-
-#define LAYOUT_split_3x5_3(\
-  k00, k01, k02, k03, k04,    k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14,    k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24,    k64, k63, k62, k61, k60, \
-            k32, k33, k34,    k74, k73, k72            \
-  ) \
-  { \
-    { k00, k01, k02, k03, k04 }, \
-    { k10, k11, k12, k13, k14 }, \
-    { k20, k21, k22, k23, k24 }, \
-    { xxx, xxx, k32, k33, k34 }, \
-    { k40, k41, k42, k43, k44 }, \
-    { k50, k51, k52, k53, k54 }, \
-    { k60, k61, k62, k63, k64 }, \
-    { xxx, xxx, k72, k73, k74 } \
-  }
diff --git a/keyboards/boardsource/microdox/readme.md b/keyboards/boardsource/microdox/readme.md
index 0a468bd4a3..d5b22a2854 100644
--- a/keyboards/boardsource/microdox/readme.md
+++ b/keyboards/boardsource/microdox/readme.md
@@ -8,8 +8,9 @@
 
 Make example for this keyboard (after setting up your build environment):
 
+    make boardsource/microdox/v1:default
     make boardsource/microdox/v2:default
 
-Remove `v2` from above command if you purchased your PCBs prior to April 2022
+Compile `v1` firmware if you purchased your PCBs prior to April 2022.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/boardsource/microdox/rules.mk b/keyboards/boardsource/microdox/rules.mk
deleted file mode 100644
index a15c5aded1..0000000000
--- a/keyboards/boardsource/microdox/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-
-LAYOUTS = split_3x5_3
diff --git a/keyboards/boardsource/microdox/v1/config.h b/keyboards/boardsource/microdox/v1/config.h
new file mode 100644
index 0000000000..111033dd67
--- /dev/null
+++ b/keyboards/boardsource/microdox/v1/config.h
@@ -0,0 +1,20 @@
+// Copyright 2022 jack (@waffle87)
+// 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/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json
new file mode 100644
index 0000000000..a79153a73c
--- /dev/null
+++ b/keyboards/boardsource/microdox/v1/info.json
@@ -0,0 +1,25 @@
+{
+  "features": {
+    "rgblight": true
+  },
+    "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1"],
+    "rows": ["B2", "B6", "B4", "B5"]
+  },
+  "usb": {
+    "device_version": "1.0.0"
+  },
+  "split": {
+    "soft_serial_pin": "D2"
+  },
+    "rgblight": {
+    "pin": "D3",
+    "sleep": true,
+    "led_count": 12,
+    "split_count": [6, 6],
+    "max_brightness": 150,
+    "animations": {
+      "all": true
+    }
+  }
+}
diff --git a/keyboards/boardsource/microdox/v1/rules.mk b/keyboards/boardsource/microdox/v1/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/boardsource/microdox/v1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
index 1f8bc7c3d9..50207651ab 100644
--- a/keyboards/boardsource/microdox/v2/config.h
+++ b/keyboards/boardsource/microdox/v2/config.h
@@ -1,45 +1,14 @@
 // Copyright 2022 jack (@waffle87)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS \
-    { F4, D2, C6, B1 }
-#define MATRIX_COL_PINS \
-    { D4, D7, B3, F7, F6 }
-#define MATRIX_ROW_PINS_RIGHT \
-    { F5, F7, F6, E6 }
-#define MATRIX_COL_PINS_RIGHT \
-    { F4, B1, D7, C6, B3 }
-#undef SOFT_SERIAL_PIN
-#define SOFT_SERIAL_PIN D3
-#undef RGB_DI_PIN
 #define RGB_DI_PIN B5
-#ifdef RGBLIGHT_ENABLE
-#    undef RGBLED_NUM
-#    undef RGBLED_SPLIT
-#    define RGBLED_NUM 8
-#    define RGBLED_SPLIT { 4, 4 } // underglow only
-#    define RGBLIGHT_SLEEP
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
-#ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL 44
-#    define RGB_MATRIX_SPLIT { 22, 22 }
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#endif
-#ifdef ENCODER_ENABLE
-#    define ENCODERS_PAD_A { E6 }
-#    define ENCODERS_PAD_B { B2 }
-#    define ENCODERS_PAD_A_RIGHT { B6 }
-#    define ENCODERS_PAD_B_RIGHT { B2 }
-#endif
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#define DRIVER_LED_TOTAL 44
+#define RGB_MATRIX_SPLIT { 22, 22 }
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json
new file mode 100644
index 0000000000..a53dfff708
--- /dev/null
+++ b/keyboards/boardsource/microdox/v2/info.json
@@ -0,0 +1,82 @@
+{
+  "features": {
+    "rgb_matrix": true
+  },
+  "matrix_pins": {
+    "cols": ["D4", "D7", "B3", "F7", "F6"],
+    "rows": ["F4", "D2", "C6", "B1"]
+  },
+  "usb": {
+    "device_version": "2.0.0"
+  },
+  "encoder": {
+    "enabled": true,
+    "rotary": [
+      { "pin_a": "E6", "pin_b": "B2"}
+    ]
+  },
+  "split": {
+    "soft_serial_pin": "D3",
+    "matrix_pins": {
+      "right": {
+        "cols": ["F4", "B1", "D7", "C6", "B3"],
+        "rows": ["F5", "F7", "F6", "E6"]
+      }
+    },
+    "encoder": {
+      "right": {
+        "rotary": [
+          { "pin_a": "B6", "pin_b": "B2" }
+        ]
+      }
+    }
+  },
+  "rgb_matrix": {
+    "layout": [
+      { "flags": 2, "x": 12, "y": 11 },
+      { "flags": 2, "x": 86, "y": 11 },
+      { "flags": 2, "x": 86, "y": 53 },
+      { "flags": 2, "x": 0, "y": 64 },
+      { "flags": 2, "x": 211, "y": 11 },
+      { "flags": 2, "x": 136, "y": 11 },
+      { "flags": 2, "x": 136, "y": 53 },
+      { "flags": 2, "x": 224, "y": 64 },
+      { "flags": 4, "matrix": [0, 0], "x": 0,  "y": 0 },
+      { "flags": 4, "matrix": [0, 1], "x": 24,  "y": 0 },
+      { "flags": 4, "matrix": [0, 2], "x": 49,  "y": 0 },
+      { "flags": 4, "matrix": [0, 3], "x": 74,  "y": 0 },
+      { "flags": 4, "matrix": [0, 4], "x": 99,  "y": 0 },
+      { "flags": 4, "matrix": [4, 4], "x": 124,  "y": 0 },
+      { "flags": 4, "matrix": [4, 3], "x": 149,  "y": 0 },
+      { "flags": 4, "matrix": [4, 2], "x": 174,  "y": 0 },
+      { "flags": 4, "matrix": [4, 1], "x": 199,  "y": 0 },
+      { "flags": 4, "matrix": [4, 0], "x": 224,  "y": 0 },
+      { "flags": 4, "matrix": [1, 0], "x": 0,  "y": 21 },
+      { "flags": 4, "matrix": [1, 1], "x": 24,  "y": 21 },
+      { "flags": 4, "matrix": [1, 2], "x": 49,  "y": 21 },
+      { "flags": 4, "matrix": [1, 3], "x": 74,  "y": 21 },
+      { "flags": 4, "matrix": [1, 4], "x": 99,  "y": 21 },
+      { "flags": 4, "matrix": [5, 4], "x": 124,  "y": 21 },
+      { "flags": 4, "matrix": [5, 3], "x": 149,  "y": 21 },
+      { "flags": 4, "matrix": [5, 2], "x": 174,  "y": 21 },
+      { "flags": 4, "matrix": [5, 1], "x": 199,  "y": 21 },
+      { "flags": 4, "matrix": [5, 0], "x": 224,  "y": 21 },
+      { "flags": 4, "matrix": [2, 0], "x": 0,  "y": 42 },
+      { "flags": 4, "matrix": [2, 1], "x": 24,  "y": 42 },
+      { "flags": 4, "matrix": [2, 2], "x": 49,  "y": 42 },
+      { "flags": 4, "matrix": [2, 3], "x": 74,  "y": 42 },
+      { "flags": 4, "matrix": [2, 4], "x": 99,  "y": 42 },
+      { "flags": 4, "matrix": [6, 4], "x": 124,  "y": 42 },
+      { "flags": 4, "matrix": [6, 3], "x": 149,  "y": 42 },
+      { "flags": 4, "matrix": [6, 2], "x": 174,  "y": 42 },
+      { "flags": 4, "matrix": [6, 1], "x": 199,  "y": 42 },
+      { "flags": 4, "matrix": [6, 0], "x": 224,  "y": 42 },
+      { "flags": 1, "matrix": [3, 2], "x": 49,  "y": 64 },
+      { "flags": 1, "matrix": [3, 3], "x": 74,  "y": 64 },
+      { "flags": 1, "matrix": [3, 4], "x": 99,  "y": 64 },
+      { "flags": 1, "matrix": [7, 4], "x": 124,  "y": 64 },
+      { "flags": 1, "matrix": [7, 3], "x": 149,  "y": 64 },
+      { "flags": 1, "matrix": [7, 2], "x": 174,  "y": 64 }
+    ]
+  }
+}
diff --git a/keyboards/boardsource/microdox/v2/rules.mk b/keyboards/boardsource/microdox/v2/rules.mk
index 0d57a06d1e..32afd21635 100644
--- a/keyboards/boardsource/microdox/v2/rules.mk
+++ b/keyboards/boardsource/microdox/v2/rules.mk
@@ -1,8 +1 @@
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-RGB_MATRIX_SUPPORTED = yes
-RGBLIGHT_ENABLE = no
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/boardsource/microdox/v2/v2.c b/keyboards/boardsource/microdox/v2/v2.c
deleted file mode 100644
index 11476a6ea2..0000000000
--- a/keyboards/boardsource/microdox/v2/v2.c
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 jack (@waffle87)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "v2.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { 
-  {
-    { 13, 14, 15, 16, 17 },
-    { 12, 11, 10, 9,  8  },
-    { 3,  4,  5,  6,  7  },
-    { NO_LED, NO_LED, 2, 1, 0 },
-    //18-21 left underglow
-    { 35, 36, 37, 38, 39 },
-    { 34, 33, 32, 31, 30 },
-    { 25, 26, 27, 28, 29 },
-    { NO_LED, NO_LED, 24, 23, 22 }
-    //40-44 right underglow
-  }, {
-    {99,64}, {74,64}, {49,64}, //0-2
-    {0,42},  {24,42}, {49,42}, {74,42}, {99,42}, //3-7
-    {99,21}, {74,21}, {49,21}, {24,21}, {0,21}, //8-12
-    {0,0},   {24,0},  {49,0},  {74,0},  {99,0}, //13-17
-    {12,11}, {86,11}, {86,53}, {0,64}, //18-21
-    {124,64}, {149,64}, {174,64}, //22-24
-    {224,42}, {199,42}, {174,42}, {149,42}, {124,42}, //25-29
-    {124,21}, {149,21}, {174,21}, {199,21}, {224,21}, //30-34
-    {224,0},  {199,0},  {174,0},  {149,0},  {124,0}, //35-39
-    {211,11}, {136,11}, {136,53}, {224,64} //40-44
-  }, {
-    1, 1, 1,
-    4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4,
-    2, 2, 2, 2,
-    1, 1, 1,
-    4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4,
-    2, 2, 2, 2
-  }
-};
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-  if (!encoder_update_user(index, clockwise)) { return false; }
-  if (index == 0) {
-    if (clockwise) {
-      tap_code_delay(KC_VOLU, 10);
-    } else {
-      tap_code_delay(KC_VOLD, 10);  
-    }
-  } else {
-    if (clockwise) {
-      tap_code(KC_MNXT);
-    } else {
-      tap_code(KC_MPRV);
-    }
-  }
-  return false;
-}
-#endif
diff --git a/keyboards/boardsource/microdox/v2/v2.h b/keyboards/boardsource/microdox/v2/v2.h
deleted file mode 100644
index 400660fffa..0000000000
--- a/keyboards/boardsource/microdox/v2/v2.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 jack (@waffle87)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#include "quantum.h"
-#define xxx KC_NO
-
-#define LAYOUT_split_3x5_3(\
-  k00, k01, k02, k03, k04,    k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14,    k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24,    k64, k63, k62, k61, k60, \
-            k32, k33, k34,    k74, k73, k72            \
-  ) \
-  { \
-    { k00, k01, k02, k03, k04 }, \
-    { k10, k11, k12, k13, k14 }, \
-    { k20, k21, k22, k23, k24 }, \
-    { xxx, xxx, k32, k33, k34 }, \
-    { k40, k41, k42, k43, k44 }, \
-    { k50, k51, k52, k53, k54 }, \
-    { k60, k61, k62, k63, k64 }, \
-    { xxx, xxx, k72, k73, k74 } \
-  }

From 1cdde7ba6a2ba3b35737380f49242e8229302a3d Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 19 Jul 2022 14:30:01 +1000
Subject: [PATCH 114/959] Fix AVR compilation of FNV by using standard integer
 typenames. (#17716)

---
 lib/fnv/fnv.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/fnv/fnv.h b/lib/fnv/fnv.h
index 2083a4aa23..5249366731 100644
--- a/lib/fnv/fnv.h
+++ b/lib/fnv/fnv.h
@@ -76,7 +76,8 @@
 #if !defined(__FNV_H__)
 #define __FNV_H__
 
-#include <sys/types.h>
+#include <stdlib.h>
+#include <stdint.h>
 
 #define FNV_VERSION "5.0.2"	/* @(#) FNV Version */
 
@@ -84,7 +85,7 @@
 /*
  * 32 bit FNV-0 hash type
  */
-typedef u_int32_t Fnv32_t;
+typedef uint32_t Fnv32_t;
 
 
 /*
@@ -122,10 +123,10 @@ typedef u_int32_t Fnv32_t;
  * 64 bit FNV-0 hash
  */
 #if defined(HAVE_64BIT_LONG_LONG)
-typedef u_int64_t Fnv64_t;
+typedef uint64_t Fnv64_t;
 #else /* HAVE_64BIT_LONG_LONG */
 typedef struct {
-    u_int32_t w32[2]; /* w32[0] is low order, w32[1] is high order word */
+    uint32_t w32[2]; /* w32[0] is low order, w32[1] is high order word */
 } Fnv64_t;
 #endif /* HAVE_64BIT_LONG_LONG */
 

From 12eb6444c67456d522c815120de8eed431ead2f8 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 19 Jul 2022 17:46:22 -0700
Subject: [PATCH 115/959] Add support for PAW3204 Optical Sensor (#17669)

Co-authored-by: gompa <gompa@h-bomb.nl>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
---
 builddefs/common_features.mk      |   2 +-
 docs/feature_pointing_device.md   |  18 ++++
 drivers/sensors/paw3204.c         | 172 ++++++++++++++++++++++++++++++
 drivers/sensors/paw3204.h         |  68 ++++++++++++
 quantum/pointing_device.h         |   2 +
 quantum/pointing_device_drivers.c |  21 ++++
 6 files changed, 282 insertions(+), 1 deletion(-)
 create mode 100644 drivers/sensors/paw3204.c
 create mode 100644 drivers/sensors/paw3204.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index d7a00ba944..9ee51149ef 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -126,7 +126,7 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/mousekey.c
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi pmw3360 pmw3389 pimoroni_trackball custom
+VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3360 pmw3389 pimoroni_trackball custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 6343ed073d..f0463a131d 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -136,6 +136,24 @@ Also see the `POINTING_DEVICE_TASK_THROTTLE_MS`, which defaults to 10ms when usi
 
 **`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`** is not specific to Cirque trackpad; any pointing device with a lift/contact status can integrate this gesture into its driver. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `pointing_device_get_report()` is needed to generate glide reports.
 
+### PAW 3204 Sensor
+
+To use the paw 3204 sensor, add this to your `rules.mk`
+
+```make
+POINTING_DEVICE_DRIVER = paw3204
+```
+
+The paw 3204 sensor uses a serial type protocol for communication, and requires an additional light source. 
+
+| Setting            | Description                                                         |
+|--------------------|---------------------------------------------------------------------|
+|`PAW3204_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.        |
+|`PAW3204_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.         |
+
+The CPI range is 400-1600, with supported values of (400, 500, 600, 800, 1000, 1200 and 1600).  Defaults to 1000 CPI.
+
+
 ### Pimoroni Trackball
 
 To use the Pimoroni Trackball module, add this to your `rules.mk`:
diff --git a/drivers/sensors/paw3204.c b/drivers/sensors/paw3204.c
new file mode 100644
index 0000000000..a13753dd6f
--- /dev/null
+++ b/drivers/sensors/paw3204.c
@@ -0,0 +1,172 @@
+/* Copyright 2021 Gompa (@Gompa)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// https://github.com/shinoaliceKabocha/choco60_track/tree/master/keymaps/default
+
+#include "paw3204.h"
+#include "wait.h"
+#include "debug.h"
+#include "gpio.h"
+
+#define REG_PID1 0x00
+#define REG_PID2 0x01
+#define REG_STAT 0x02
+#define REG_X 0x03
+#define REG_Y 0x04
+
+#define REG_SETUP 0x06
+#define REG_IMGQUAL 0x07
+#define REG_IMGREC 0x0E
+#define REG_IMGTRASH 0x0D
+
+#define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
+
+// CPI values
+enum cpi_values {
+    CPI400,  // 0b000
+    CPI500,  // 0b001
+    CPI600,  // 0b010
+    CPI800,  // 0b011
+    CPI1000, // 0b100
+    CPI1200, // 0b101
+    CPI1600, // 0b110
+};
+
+uint8_t paw3204_serial_read(void);
+void    paw3204_serial_write(uint8_t reg_addr);
+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
+
+    paw3204_write_reg(REG_SETUP, 0x86); // reset sensor and set 1600cpi
+    wait_us(5);
+
+    paw3204_read_reg(0x00); // read id
+    paw3204_read_reg(0x01); // read id2
+    // PAW3204_write_reg(REG_SETUP,0x06);  // dont reset sensor and set cpi 1600
+    paw3204_write_reg(REG_IMGTRASH, 0x32); // write image trashhold
+}
+
+uint8_t paw3204_serial_read(void) {
+    setPinInput(PAW3204_SDIO_PIN);
+    uint8_t byte = 0;
+
+    for (uint8_t i = 0; i < 8; ++i) {
+        writePinLow(PAW3204_SCLK_PIN);
+        wait_us(1);
+
+        byte = (byte << 1) | readPin(PAW3204_SDIO_PIN);
+
+        writePinHigh(PAW3204_SCLK_PIN);
+        wait_us(1);
+    }
+
+    return byte;
+}
+
+void paw3204_serial_write(uint8_t data) {
+    writePinLow(PAW3204_SDIO_PIN);
+    setPinOutput(PAW3204_SDIO_PIN);
+
+    for (int8_t b = 7; b >= 0; b--) {
+        writePinLow(PAW3204_SCLK_PIN);
+        if (data & (1 << b)) {
+            writePinHigh(PAW3204_SDIO_PIN);
+        } else {
+            writePinLow(PAW3204_SDIO_PIN);
+        }
+        writePinHigh(PAW3204_SCLK_PIN);
+    }
+
+    wait_us(4);
+}
+
+report_paw3204_t paw3204_read(void) {
+    report_paw3204_t data = {0};
+
+    data.isMotion = paw3204_read_reg(REG_STAT) & (1 << 7); // check for motion only (bit 7 in field)
+    data.x        = (int8_t)paw3204_read_reg(REG_X);
+    data.y        = (int8_t)paw3204_read_reg(REG_Y);
+
+    return data;
+}
+
+void paw3204_write_reg(uint8_t reg_addr, uint8_t data) {
+    paw3204_serial_write(0b10000000 | reg_addr);
+    paw3204_serial_write(data);
+}
+
+uint8_t paw3204_read_reg(uint8_t reg_addr) {
+    paw3204_serial_write(reg_addr);
+    wait_us(5);
+    return paw3204_serial_read();
+}
+
+void paw3204_set_cpi(uint16_t cpi) {
+    uint8_t cpival = CPI1000;
+    if (cpi <= 450) {
+        cpival = CPI400;
+    } else if (cpi <= 550) {
+        cpival = CPI500;
+    } else if (cpi <= 700) {
+        cpival = CPI600;
+    } else if (cpi <= 900) {
+        cpival = CPI800;
+    } else if (cpi <= 1100) {
+        cpival = CPI1000;
+    } else if (cpi <= 1400) {
+        cpival = CPI1200;
+    } else if (cpi > 1400) {
+        cpival = CPI1600;
+    }
+    paw3204_write_reg(REG_SETUP, cpival);
+}
+
+uint16_t paw3204_get_cpi(void) {
+    uint16_t cpival = 1000;
+
+    switch (paw3204_read_reg(REG_SETUP) & 0b111) {
+        case CPI400:
+            cpival = 400;
+            break;
+        case CPI500:
+            cpival = 500;
+            break;
+        case CPI600:
+            cpival = 600;
+            break;
+        case CPI800:
+            cpival = 800;
+            break;
+        case CPI1000:
+            cpival = 1000;
+            break;
+        case CPI1200:
+            cpival = 1200;
+            break;
+        case CPI1600:
+            cpival = 1600;
+            break;
+    }
+    return cpival;
+}
+
+uint8_t read_pid_paw3204(void) {
+    return paw3204_read_reg(REG_PID1);
+}
diff --git a/drivers/sensors/paw3204.h b/drivers/sensors/paw3204.h
new file mode 100644
index 0000000000..bf6dbd04a0
--- /dev/null
+++ b/drivers/sensors/paw3204.h
@@ -0,0 +1,68 @@
+/* Copyright 2021 Gompa (@Gompa)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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>
+
+#ifndef PAW3204_SCLK_PIN
+#    error "No clock pin defined -- missing PAW3204_SCLK_PIN"
+#endif
+#ifndef PAW3204_SDIO_PIN
+#    error "No data pin defined -- missing PAW3204_SDIO_PIN"
+#endif
+
+typedef struct {
+    int16_t x;
+    int16_t y;
+    bool    isMotion;
+} report_paw3204_t;
+
+/**
+ * @brief Initializes the sensor so it is in a working state and ready to
+ * be polled for data.
+ *
+ * @return true Initialization was a success
+ * @return false Initialization failed, do not proceed operation
+ */
+void paw3204_init(void);
+
+/**
+ * @brief Reads and clears the current delta, and motion register values on the
+ * given sensor.
+ *
+ * @return pmw33xx_report_t Current values of the sensor, if errors occurred all
+ * fields are set to zero
+ */
+
+report_paw3204_t paw3204_read(void);
+/**
+ * @brief Sets the given CPI value the sensor. CPI is  often refereed to
+ * as the sensors sensitivity. Values outside of the allowed range are
+ * constrained into legal values.
+ *
+ * @param cpi CPI value to set
+ */
+void paw3204_set_cpi(uint16_t cpi);
+
+/**
+ * @brief Gets the currently set CPI value from the sensor. CPI is often
+ * refereed to as the sensors sensitivity.
+ *
+ * @return uint16_t Current CPI value of the sensor
+ */
+uint16_t paw3204_get_cpi(void);
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index a8e8e75e87..77db5471ea 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -33,6 +33,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "drivers/sensors/cirque_pinnacle.h"
 #    include "drivers/sensors/cirque_pinnacle_gestures.h"
 #    include "pointing_device_gestures.h"
+#elif defined(POINTING_DEVICE_DRIVER_paw3204)
+#    include "drivers/sensors/paw3204.h"
 #elif defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
 #    include "i2c_master.h"
 #    include "drivers/sensors/pimoroni_trackball.h"
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index b7e98e897e..d0b545d22d 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -26,6 +26,7 @@
 #define CONSTRAIN_HID_XY(amt) ((amt) < XY_REPORT_MIN ? XY_REPORT_MIN : ((amt) > XY_REPORT_MAX ? XY_REPORT_MAX : (amt)))
 
 // get_report functions should probably be moved to their respective drivers.
+
 #if defined(POINTING_DEVICE_DRIVER_adns5050)
 report_mouse_t adns5050_get_report(report_mouse_t mouse_report) {
     report_adns5050_t data = adns5050_read_burst();
@@ -198,7 +199,27 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = cirque_pinnacle_get_cpi
 };
 // clang-format on
+#elif defined(POINTING_DEVICE_DRIVER_paw3204)
 
+report_mouse_t paw3204_get_report(report_mouse_t mouse_report) {
+    report_paw3204_t data = paw3204_read();
+    if (data.isMotion) {
+#    ifdef CONSOLE_ENABLE
+        dprintf("Raw ] X: %d, Y: %d\n", data.x, data.y);
+#    endif
+
+        mouse_report.x = data.x;
+        mouse_report.y = data.y;
+    }
+
+    return mouse_report;
+}
+const pointing_device_driver_t pointing_device_driver = {
+    .init       = paw3204_init,
+    .get_report = paw3204_get_report,
+    .set_cpi    = paw3204_set_cpi,
+    .get_cpi    = paw3204_get_cpi,
+};
 #elif defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
 
 mouse_xy_report_t pimoroni_trackball_adapt_values(clamp_range_t* offset) {

From ee17ffadea41241fc2b397e0bbea8903591dd21c Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 20 Jul 2022 09:32:00 -0700
Subject: [PATCH 116/959] Move Pointing Device code to a subdirectory (#17684)

---
 builddefs/common_features.mk                             | 9 +++++----
 quantum/{ => pointing_device}/pointing_device.c          | 0
 quantum/{ => pointing_device}/pointing_device.h          | 0
 quantum/{ => pointing_device}/pointing_device_drivers.c  | 0
 quantum/{ => pointing_device}/pointing_device_gestures.c | 0
 quantum/{ => pointing_device}/pointing_device_gestures.h | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename quantum/{ => pointing_device}/pointing_device.c (100%)
 rename quantum/{ => pointing_device}/pointing_device.h (100%)
 rename quantum/{ => pointing_device}/pointing_device_drivers.c (100%)
 rename quantum/{ => pointing_device}/pointing_device_gestures.c (100%)
 rename quantum/{ => pointing_device}/pointing_device_gestures.h (100%)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 9ee51149ef..8d31f694a7 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -133,8 +133,9 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     else
         OPT_DEFS += -DPOINTING_DEVICE_ENABLE
         MOUSE_ENABLE := yes
-        SRC += $(QUANTUM_DIR)/pointing_device.c
-        SRC += $(QUANTUM_DIR)/pointing_device_drivers.c
+        VPATH += $(QUANTUM_DIR)/pointing_device
+        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device.c
+        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_drivers.c
         ifneq ($(strip $(POINTING_DEVICE_DRIVER)), custom)
             SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c
             OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]'))
@@ -150,13 +151,13 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
             OPT_DEFS += -DSTM32_I2C -DHAL_USE_I2C=TRUE
             SRC += drivers/sensors/cirque_pinnacle.c
             SRC += drivers/sensors/cirque_pinnacle_gestures.c
-            SRC += $(QUANTUM_DIR)/pointing_device_gestures.c
+            SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
             QUANTUM_LIB_SRC += i2c_master.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_spi)
             OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
             SRC += drivers/sensors/cirque_pinnacle.c
             SRC += drivers/sensors/cirque_pinnacle_gestures.c
-            SRC += $(QUANTUM_DIR)/pointing_device_gestures.c
+            SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
             QUANTUM_LIB_SRC += spi_master.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
             OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE
diff --git a/quantum/pointing_device.c b/quantum/pointing_device/pointing_device.c
similarity index 100%
rename from quantum/pointing_device.c
rename to quantum/pointing_device/pointing_device.c
diff --git a/quantum/pointing_device.h b/quantum/pointing_device/pointing_device.h
similarity index 100%
rename from quantum/pointing_device.h
rename to quantum/pointing_device/pointing_device.h
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
similarity index 100%
rename from quantum/pointing_device_drivers.c
rename to quantum/pointing_device/pointing_device_drivers.c
diff --git a/quantum/pointing_device_gestures.c b/quantum/pointing_device/pointing_device_gestures.c
similarity index 100%
rename from quantum/pointing_device_gestures.c
rename to quantum/pointing_device/pointing_device_gestures.c
diff --git a/quantum/pointing_device_gestures.h b/quantum/pointing_device/pointing_device_gestures.h
similarity index 100%
rename from quantum/pointing_device_gestures.h
rename to quantum/pointing_device/pointing_device_gestures.h

From 1db5272154cdde484e589aa8bce3d92da174c76b Mon Sep 17 00:00:00 2001
From: Ben Fiedler <git@bfiedler.ch>
Date: Wed, 20 Jul 2022 18:43:41 +0200
Subject: [PATCH 117/959] docs: fix default value of USB_SUSPEND_WAKEUP_DELAY
 (#17501)

Documents the change made in #12081
---
 docs/config_options.md    | 6 ++++--
 docs/ja/config_options.md | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/config_options.md b/docs/config_options.md
index c35227a407..34034f7c8d 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -107,8 +107,10 @@ This is a C header file that is one of the first things included, and will persi
   * sets the maximum power (in mA) over USB for the device (default: 500)
 * `#define USB_POLLING_INTERVAL_MS 10`
   * sets the USB polling rate in milliseconds for the keyboard, mouse, and shared (NKRO/media keys) interfaces
-* `#define USB_SUSPEND_WAKEUP_DELAY 200`
-  * set the number of milliseconde to pause after sending a wakeup packet
+* `#define USB_SUSPEND_WAKEUP_DELAY 0`
+  * sets the number of milliseconds to pause after sending a wakeup packet.
+    Disabled by default, you might want to set this to 200 (or higher) if the
+    keyboard does not wake up properly after suspending.
 * `#define F_SCL 100000L`
   * sets the I2C clock rate speed for keyboards using I2C. The default is `400000L`, except for keyboards using `split_common`, where the default is `100000L`.
 
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index 42dd9d502a..9da84e6e4f 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -108,7 +108,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * デバイスの USB 経由の最大電力(mA) を設定します (デフォルト: 500)
 * `#define USB_POLLING_INTERVAL_MS 10`
   * キーボード、マウス および 共有 (NKRO/メディアキー) インタフェースのための USB ポーリングレートをミリ秒で設定します
-* `#define USB_SUSPEND_WAKEUP_DELAY 200`
+* `#define USB_SUSPEND_WAKEUP_DELAY 0`
    * ウェイクアップパケットを送信した後で一時停止するミリ秒を設定します
 * `#define F_SCL 100000L`
   * I2C を使用するキーボードのための I2C クロックレート速度を設定します。デフォルトは `400000L` ですが、`split_common` を使っているキーボードは別でデフォルトは `100000L` です。

From 05f30f0787aaea63f83e4c889891255d379abb6d Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 21 Jul 2022 01:24:34 +0800
Subject: [PATCH 118/959] Use Pro Micro pinout for SDA/SCL (#17595)

---
 platforms/chibios/boards/QMK_PM2040/configs/config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/boards/QMK_PM2040/configs/config.h b/platforms/chibios/boards/QMK_PM2040/configs/config.h
index 9dfe86f12e..8c773f8b19 100644
--- a/platforms/chibios/boards/QMK_PM2040/configs/config.h
+++ b/platforms/chibios/boards/QMK_PM2040/configs/config.h
@@ -7,10 +7,10 @@
 #    define I2C_DRIVER I2CD2
 #endif
 #ifndef I2C1_SDA_PIN
-#    define I2C1_SDA_PIN 2U
+#    define I2C1_SDA_PIN D1
 #endif
 #ifndef I2C1_SCL_PIN
-#    define I2C1_SCL_PIN 3U
+#    define I2C1_SCL_PIN D0
 #endif
 
 #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET

From 9a31bbb3fa4389ea0d0efcb0d283664eaf684190 Mon Sep 17 00:00:00 2001
From: mknj <github@mknj.de>
Date: Wed, 20 Jul 2022 23:59:18 +0200
Subject: [PATCH 119/959] fix syntax error (#17732)

---
 quantum/keymap_extras/keymap_turkish_f.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/keymap_turkish_f.h b/quantum/keymap_extras/keymap_turkish_f.h
index f86ef21546..aaee2aa480 100644
--- a/quantum/keymap_extras/keymap_turkish_f.h
+++ b/quantum/keymap_extras/keymap_turkish_f.h
@@ -187,7 +187,7 @@
 #define TR_CURR S(ALGR(TR_4))    // ¤
 #define TR_IQUE S(ALGR(TR_SLSH)) // ¿
 // Row 2
-#define TR_REGD S(ALGR(TR_I)     // ®
+#define TR_REGD S(ALGR(TR_I))    // ®
 // Row 3
 #define TR_SECT S(ALGR(TR_IDOT)) // §
 #define TR_FORD S(ALGR(TR_A))    // ª

From 4efe6330c49f076b9c01d3f609dea0cd9f9b0214 Mon Sep 17 00:00:00 2001
From: Wilba <Jason.S.Williams@gmail.com>
Date: Thu, 21 Jul 2022 09:53:42 +1000
Subject: [PATCH 120/959] VIA Encoder Map Support (#17734)

---
 quantum/via.c | 12 ++++++++++++
 quantum/via.h |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/quantum/via.c b/quantum/via.c
index d2ef0862cc..37e2046a10 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -397,6 +397,18 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
             dynamic_keymap_set_buffer(offset, size, &command_data[3]);
             break;
         }
+#ifdef ENCODER_MAP_ENABLE
+        case id_dynamic_keymap_get_encoder: {
+            uint16_t keycode = dynamic_keymap_get_encoder(command_data[0], command_data[1], command_data[2] != 0);
+            command_data[3]  = keycode >> 8;
+            command_data[4]  = keycode & 0xFF;
+            break;
+        }
+        case id_dynamic_keymap_set_encoder: {
+            dynamic_keymap_set_encoder(command_data[0], command_data[1], command_data[2] != 0, (command_data[3] << 8) | command_data[4]);
+            break;
+        }
+#endif
         default: {
             // The command ID is not known
             // Return the unhandled state
diff --git a/quantum/via.h b/quantum/via.h
index 31d9c21af4..558ae95de4 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -58,7 +58,7 @@
 
 // This is changed only when the command IDs change,
 // so VIA Configurator can detect compatible firmware.
-#define VIA_PROTOCOL_VERSION 0x0009
+#define VIA_PROTOCOL_VERSION 0x000A
 
 enum via_command_id {
     id_get_protocol_version                 = 0x01, // always 0x01
@@ -80,6 +80,8 @@ enum via_command_id {
     id_dynamic_keymap_get_layer_count       = 0x11,
     id_dynamic_keymap_get_buffer            = 0x12,
     id_dynamic_keymap_set_buffer            = 0x13,
+    id_dynamic_keymap_get_encoder           = 0x14,
+    id_dynamic_keymap_set_encoder           = 0x15,
     id_unhandled                            = 0xFF,
 };
 

From d510e80b89b5de54d60ff1a3dc1cca0307161fad Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 21 Jul 2022 07:54:05 +0800
Subject: [PATCH 121/959] Add Blok 2040 conversion (#17603)

---
 data/mappings/defaults.json                   |  8 ++++-
 data/schemas/keyboard.jsonschema              |  2 +-
 docs/feature_converters.md                    |  5 ++-
 .../converters/promicro_to_blok/_pin_defs.h   | 36 +++++++++++++++++++
 .../converters/promicro_to_blok/converter.mk  |  9 +++++
 5 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 platforms/chibios/converters/promicro_to_blok/_pin_defs.h
 create mode 100644 platforms/chibios/converters/promicro_to_blok/converter.mk

diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json
index c6cb53f4c3..b62e5450b3 100644
--- a/data/mappings/defaults.json
+++ b/data/mappings/defaults.json
@@ -28,6 +28,12 @@
             "board": "QMK_PM2040",
             "pin_compatible": "promicro"
         },
+        "blok": {
+            "processor": "RP2040",
+            "bootloader": "rp2040",
+            "board": "QMK_PM2040",
+            "pin_compatible": "promicro"
+        },
         "bluepill": {
             "processor": "STM32F103",
             "bootloader": "stm32duino",
@@ -44,4 +50,4 @@
             "board": "BLACKPILL_STM32_F411"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 166a5d4d3b..46f840616a 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -34,7 +34,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "bluepill", "blackpill_f401", "blackpill_f411"]
+            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bluepill", "blackpill_f401", "blackpill_f411"]
         },
         "pin_compatible": {
             "type": "string",
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 9cca76e8e8..11dcc62b2a 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -13,6 +13,7 @@ Currently the following converters are available:
 | `promicro` | `proton_c`        |
 | `promicro` | `kb2040`          |
 | `promicro` | `promicro_rp2040` |
+| `promicro` | `blok`            |
 
 See below for more in depth information on each converter.
 
@@ -52,6 +53,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co
 | [Proton C](https://qmk.fm/proton-c/)                                   | `proton_c`        |
 | [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040)          | `kb2040`          |
 | [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) | `promicro_rp2040` |
+| [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)         | `blok`            |
 
 Converter summary:
 
@@ -60,6 +62,7 @@ Converter summary:
 | `proton_c`        | `-e CONVERT_TO=proton_c`        | `CONVERT_TO=proton_c`        | `#ifdef CONVERT_TO_PROTON_C`        |
 | `kb2040`          | `-e CONVERT_TO=kb2040`          | `CONVERT_TO=kb2040`          | `#ifdef CONVERT_TO_KB2040`          |
 | `promicro_rp2040` | `-e CONVERT_TO=promicro_rp2040` | `CONVERT_TO=promicro_rp2040` | `#ifdef CONVERT_TO_PROMICRO_RP2040` |
+| `blok`            | `-e CONVERT_TO=blok`            | `CONVERT_TO=blok`            | `#ifdef CONVERT_TO_BLOK`            |
 
 ### Proton C :id=proton_c
 
@@ -90,6 +93,6 @@ The following defaults are based on what has been implemented for [RP2040](platf
 | USB Host (e.g. USB-USB converter)            | Not supported (USB host code is AVR specific and is not currently supported on ARM)                              |
 | [Split keyboards](feature_split_keyboard.md) | Partial via `PIO` vendor driver - heavily dependent on enabled features                                          |
 
-### SparkFun Pro Micro - RP2040 :id=promicro_rp2040
+### SparkFun Pro Micro - RP2040 and Blok :id=promicro_rp2040 
 
 Currently identical to  [Adafruit KB2040](#kb2040).
diff --git a/platforms/chibios/converters/promicro_to_blok/_pin_defs.h b/platforms/chibios/converters/promicro_to_blok/_pin_defs.h
new file mode 100644
index 0000000000..957b84e1a6
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_blok/_pin_defs.h
@@ -0,0 +1,36 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 0U
+#define D2 1U
+//      GND
+//      GND
+#define D1 16U
+#define D0 17U
+#define D4 4U
+#define C6 5U
+#define D7 6U
+#define E6 7U
+#define B4 8U
+#define B5 9U
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 29U
+#define F5 28U
+#define F6 27U
+#define F7 26U
+#define B1 22U
+#define B3 20U
+#define B2 23U
+#define B6 21U
+
+// LEDs (Mapped to unused pins to avoid collisions)
+#define D5 12U
+#define B0 13U
diff --git a/platforms/chibios/converters/promicro_to_blok/converter.mk b/platforms/chibios/converters/promicro_to_blok/converter.mk
new file mode 100644
index 0000000000..5106e411f4
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_blok/converter.mk
@@ -0,0 +1,9 @@
+# Boardsource Blok MCU settings for converting AVR projects
+MCU := RP2040
+BOARD := QMK_PM2040
+BOOTLOADER := rp2040
+
+# These are defaults based on what has been implemented for RP2040 boards
+SERIAL_DRIVER ?= vendor
+WS2812_DRIVER ?= vendor
+BACKLIGHT_DRIVER ?= software

From 5c907326221d0b7de00daf11b0560e10a1e73aaf Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Thu, 21 Jul 2022 08:44:12 -0500
Subject: [PATCH 122/959] Adafruit Macropad: Add VIA keymap, fix default km
 (#17735)

---
 .../macropad/keymaps/default/keymap.c         |   2 +-
 .../macropad/keymaps/default/rules.mk         |   1 +
 .../adafruit/macropad/keymaps/via/keymap.c    | 138 ++++++++++++++++++
 .../adafruit/macropad/keymaps/via/rules.mk    |   2 +
 4 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/adafruit/macropad/keymaps/default/rules.mk
 create mode 100644 keyboards/adafruit/macropad/keymaps/via/keymap.c
 create mode 100644 keyboards/adafruit/macropad/keymaps/via/rules.mk

diff --git a/keyboards/adafruit/macropad/keymaps/default/keymap.c b/keyboards/adafruit/macropad/keymaps/default/keymap.c
index 26c6b4ccf2..34989ea0b6 100644
--- a/keyboards/adafruit/macropad/keymaps/default/keymap.c
+++ b/keyboards/adafruit/macropad/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-  [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 };
 #endif
 
diff --git a/keyboards/adafruit/macropad/keymaps/default/rules.mk b/keyboards/adafruit/macropad/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/adafruit/macropad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adafruit/macropad/keymaps/via/keymap.c b/keyboards/adafruit/macropad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6ef3d3e29d
--- /dev/null
+++ b/keyboards/adafruit/macropad/keymaps/via/keymap.c
@@ -0,0 +1,138 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+                    KC_MUTE,
+      KC_ENT, KC_0, KC_BSPC,
+      KC_7,   KC_8, KC_9,
+      KC_4,   KC_5, KC_6,
+      KC_1,   KC_2, KC_3
+  ),
+  [1] = LAYOUT(
+                        _______,
+      _______, _______, _______,
+      _______, _______, _______,
+      _______, _______, _______,
+      _______, _______, _______
+  ),
+  [2] = LAYOUT(
+                        _______,
+      _______, _______, _______,
+      _______, _______, _______,
+      _______, _______, _______,
+      _______, _______, _______
+  ),
+  [3] = LAYOUT(
+                        _______,
+      _______, _______, _______,
+      _______, _______, _______,
+      _______, _______, _______,
+      _______, _______, _______
+  ),
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+  [1] = { ENCODER_CCW_CW(_______, _______) },
+  [2] = { ENCODER_CCW_CW(_______, _______) },
+  [3] = { ENCODER_CCW_CW(_______, _______) }
+};
+#endif
+
+
+#ifdef OLED_ENABLE
+static void render_qmk_logo(void) {
+  static const char PROGMEM qmk_logo[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
+    0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe,
+    0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff,
+    0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff,
+    0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
+    0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+  };
+
+  oled_write_raw_P(qmk_logo, sizeof(qmk_logo));
+}
+
+bool oled_task_user(void) {
+  render_qmk_logo();
+  return true;
+}
+
+#endif
+
diff --git a/keyboards/adafruit/macropad/keymaps/via/rules.mk b/keyboards/adafruit/macropad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..715838ecc5
--- /dev/null
+++ b/keyboards/adafruit/macropad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes

From 5f32690cba8789c1ac98e71cb8ae8a4b6a5ee2d2 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 21 Jul 2022 10:16:44 -0700
Subject: [PATCH 123/959] Move Pointing Device Initialization (#17740)

Move Pointing Device Initialization to after Split Post Initialization

If both pointing device and split is enabled, the pointing device init needs to be called after the split post init, otherwise the connection (serial/etc) isn't initialized yet, and any commands that need to send data over (such as calling the set cpi command) never get sent over.
---
 quantum/keyboard.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 8273299a9a..2364e3167b 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -384,9 +384,6 @@ void keyboard_init(void) {
 #ifdef STENO_ENABLE_ALL
     steno_init();
 #endif
-#ifdef POINTING_DEVICE_ENABLE
-    pointing_device_init();
-#endif
 #if defined(NKRO_ENABLE) && defined(FORCE_NKRO)
     keymap_config.nkro = 1;
     eeconfig_update_keymap(keymap_config.raw);
@@ -403,6 +400,10 @@ void keyboard_init(void) {
 #ifdef SPLIT_KEYBOARD
     split_post_init();
 #endif
+#ifdef POINTING_DEVICE_ENABLE
+    // init after split init
+    pointing_device_init();
+#endif
 
 #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
     debug_enable = true;

From c586cfda48ff095d00b418aa7fc617435ac356a5 Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Fri, 22 Jul 2022 17:28:51 -0500
Subject: [PATCH 124/959] (develop) Update bootmagic for  Adafruit Macropad
 (#17755)

---
 keyboards/adafruit/macropad/config.h  | 4 ++--
 keyboards/adafruit/macropad/readme.md | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 8d7298e09c..1e055e273b 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -67,8 +67,8 @@
 #define DEBOUNCE 5
 
 /* Bootmagic lite */
-/* (Press the Encoder button while plugging the keyboard to enter the bootloader) */
-#define BOOTMAGIC_LITE_ROW 0
+/* (Press the key bellow the encoder button while plugging the keyboard to enter the bootloader and clear flash) */
+#define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 2
 
 /* Double tap the side button to enter bootloader */
diff --git a/keyboards/adafruit/macropad/readme.md b/keyboards/adafruit/macropad/readme.md
index fe7375b336..09c8657902 100644
--- a/keyboards/adafruit/macropad/readme.md
+++ b/keyboards/adafruit/macropad/readme.md
@@ -30,8 +30,9 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 4 ways:
 
-* **Bootmagic reset**: Hold down the rotary encoder push-button on power-up or reset.
+* **Bootmagic reset**: Hold down the key just bellow the rotary encoder push-button on power-up.
 * **Physical reset button**: Press twice the button on the side while the board is connected.
+* **BOOT button** Hold down the rotary encoder push-button on power-up or reset.
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.

From a6f3194397a515ade82f10b5547e82e2863c8685 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sat, 23 Jul 2022 10:43:32 -0600
Subject: [PATCH 125/959] Add ability to enter bootloader mode from `QK_MAKE`
 (#17745)

---
 docs/keycodes.md         | 14 +++++++-------
 docs/quantum_keycodes.md | 14 +++++++-------
 quantum/quantum.c        |  3 +++
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index 37e9d00392..d0ba8e25bf 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -219,13 +219,13 @@ See also: [Basic Keycodes](keycodes_basic.md)
 
 See also: [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes)
 
-|Key              |Aliases  |Description                                                                      |
-|-----------------|---------|---------------------------------------------------------------------------------|
-|`QK_BOOTLOADER`  |`QK_BOOT`|Put the keyboard into bootloader mode for flashing                               |
-|`QK_DEBUG_TOGGLE`|`DB_TOGG`|Toggle debug mode                                                                |
-|`QK_CLEAR_EEPROM`|`EE_CLR` |Reinitializes the keyboard's EEPROM (persistent memory)                          |
-|`QK_MAKE`        |         |Sends `qmk compile -kb (keyboard) -km (keymap)`, or `qmk flash` if shift is held |
-|`QK_REBOOT`      |`QK_RBT` |Resets the keyboard. Does not load the bootloader                                |
+|Key              |Aliases  |Description                                                                                                                                      |
+|-----------------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------|
+|`QK_BOOTLOADER`  |`QK_BOOT`|Put the keyboard into bootloader mode for flashing                                                                                               |
+|`QK_DEBUG_TOGGLE`|`DB_TOGG`|Toggle debug mode                                                                                                                                |
+|`QK_CLEAR_EEPROM`|`EE_CLR` |Reinitializes the keyboard's EEPROM (persistent memory)                                                                                          |
+|`QK_MAKE`        |         |Sends `qmk compile -kb (keyboard) -km (keymap)`, or `qmk flash` if shift is held. Puts keyboard into bootloader mode if shift & control are held |
+|`QK_REBOOT`      |`QK_RBT` |Resets the keyboard. Does not load the bootloader                                                                                                |
 
 ## Audio Keys :id=audio-keys
 
diff --git a/docs/quantum_keycodes.md b/docs/quantum_keycodes.md
index a1923777ef..bc68cbc922 100644
--- a/docs/quantum_keycodes.md
+++ b/docs/quantum_keycodes.md
@@ -8,10 +8,10 @@ On this page we have documented keycodes between `0x00FF` and `0xFFFF` which are
 
 ## QMK Keycodes :id=qmk-keycodes
 
-|Key              |Aliases  |Description                                                                      |
-|-----------------|---------|---------------------------------------------------------------------------------|
-|`QK_BOOTLOADER`  |`QK_BOOT`|Put the keyboard into bootloader mode for flashing                               |
-|`QK_DEBUG_TOGGLE`|`DB_TOGG`|Toggle debug mode                                                                |
-|`QK_CLEAR_EEPROM`|`EE_CLR` |Reinitializes the keyboard's EEPROM (persistent memory)                          |
-|`QK_MAKE`        |         |Sends `qmk compile -kb (keyboard) -km (keymap)`, or `qmk flash` if shift is held |
-|`QK_REBOOT`      |`QK_RBT` |Resets the keyboard. Does not load the bootloader                                |
+|Key              |Aliases  |Description                                                                                                                                      |
+|-----------------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------|
+|`QK_BOOTLOADER`  |`QK_BOOT`|Put the keyboard into bootloader mode for flashing                                                                                               |
+|`QK_DEBUG_TOGGLE`|`DB_TOGG`|Toggle debug mode                                                                                                                                |
+|`QK_CLEAR_EEPROM`|`EE_CLR` |Reinitializes the keyboard's EEPROM (persistent memory)                                                                                          |
+|`QK_MAKE`        |         |Sends `qmk compile -kb (keyboard) -km (keymap)`, or `qmk flash` if shift is held. Puts keyboard into bootloader mode if shift & control are held |
+|`QK_REBOOT`      |`QK_RBT` |Resets the keyboard. Does not load the bootloader                                                                                                |
diff --git a/quantum/quantum.c b/quantum/quantum.c
index d1cfb5fbe0..0d5f398585 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -400,6 +400,9 @@ bool process_record_quantum(keyrecord_t *record) {
                     SEND_STRING_DELAY(" compile ", TAP_CODE_DELAY);
                 }
                 SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP SS_TAP(X_ENTER), TAP_CODE_DELAY);
+                if (temp_mod & MOD_MASK_CS) {
+                    reset_keyboard();
+                }
             }
 #endif
         }

From d02cefe613f5ba252c6917c7b0fc6b5b87993062 Mon Sep 17 00:00:00 2001
From: JayceFayne <13365789+JayceFayne@users.noreply.github.com>
Date: Sat, 23 Jul 2022 20:21:20 +0200
Subject: [PATCH 126/959] implement `tap_code16_delay` (#17748)

---
 docs/feature_macros.md |  2 +-
 quantum/quantum.c      | 21 ++++++++++++++++-----
 quantum/quantum.h      |  1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index f5b163d5df..f5bd5be41b 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -349,7 +349,7 @@ If the keycode is `KC_CAPS`, it waits `TAP_HOLD_CAPS_DELAY` milliseconds instead
 
 Like `tap_code(<kc>)`, but with a `delay` parameter for specifying arbitrary intervals before sending the unregister event.
 
-#### `register_code16(<kc>);`, `unregister_code16(<kc>);` and `tap_code16(<kc>);`
+#### `register_code16(<kc>);`, `unregister_code16(<kc>);`, `tap_code16(<kc>);` and `tap_code16_delay(<kc>, <delay>);`
 
 These functions work similar to their regular counterparts, but allow you to use modded keycodes (with Shift, Alt, Control, and/or GUI applied to them).
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 0d5f398585..80fa1a3ced 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -93,16 +93,27 @@ __attribute__((weak)) void unregister_code16(uint16_t code) {
     }
 }
 
-__attribute__((weak)) void tap_code16(uint16_t code) {
+/** \brief Tap a keycode with a delay.
+ *
+ * \param code The modded keycode to tap.
+ * \param delay The amount of time in milliseconds to leave the keycode registered, before unregistering it.
+ */
+__attribute__((weak)) void tap_code16_delay(uint16_t code, uint16_t delay) {
     register_code16(code);
-    if (code == KC_CAPS_LOCK) {
-        wait_ms(TAP_HOLD_CAPS_DELAY);
-    } else if (TAP_CODE_DELAY > 0) {
-        wait_ms(TAP_CODE_DELAY);
+    for (uint16_t i = delay; i > 0; i--) {
+        wait_ms(1);
     }
     unregister_code16(code);
 }
 
+/** \brief Tap a keycode with the default delay.
+ *
+ * \param code The modded keycode to tap. If `code` is `KC_CAPS_LOCK`, the delay will be `TAP_HOLD_CAPS_DELAY`, otherwise `TAP_CODE_DELAY`, if defined.
+ */
+__attribute__((weak)) void tap_code16(uint16_t code) {
+    tap_code16_delay(code, code == KC_CAPS_LOCK ? TAP_HOLD_CAPS_DELAY : TAP_CODE_DELAY);
+}
+
 __attribute__((weak)) bool process_action_kb(keyrecord_t *record) {
     return true;
 }
diff --git a/quantum/quantum.h b/quantum/quantum.h
index f3a8a323c7..8d74f2be38 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -264,6 +264,7 @@ void shutdown_user(void);
 void register_code16(uint16_t code);
 void unregister_code16(uint16_t code);
 void tap_code16(uint16_t code);
+void tap_code16_delay(uint16_t code, uint16_t delay);
 
 const char *get_numeric_str(char *buf, size_t buf_len, uint32_t curr_num, char curr_pad);
 const char *get_u8_str(uint8_t curr_num, char curr_pad);

From 50a12c06b9c3dd4bda1fbe6dac1f692fade2d4d1 Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Mon, 25 Jul 2022 18:11:28 +0900
Subject: [PATCH 127/959] [keyboard] bastardkb: restructure folder hierarchy
 (#16778)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bastardkb: restructure folder hierarchy ahead of supporting other adapters/mcus

Upcoming support for the following (adapter, mcu) pairs will be
submitted in follow-up PRs:

- `v2/elitec`
- `v2/stemcell`
- `blackpill`

This PR contains the following changes:

- Move previous implementation to an inner `v1/elitec` folder
- Move keyboard USB IDs and strings to data driven
- Update headers to update maintainers list
- Run `qmk format-c`

* bastardkb/charybdis: remove broken acceleration implementation

* bastardkb/charybdis: fix debug output

* bastardkb: add support for BastardKb the `v2/elitec` (adapter, mcu) pair

* bastardkb: add Blackpill support

* bastardkb/charybdis/3x5: add `bstiq` keymap

* bastardkb/charybdis: add fake LEDs to the configuration

For the Charybdis 3x5 (respectively 4x6), the LED config now simulates
36 (respectively 58) LEDs instead of the actual 35 (respectively 56) to
prevent confusion when testing LEDs during assembly when handedness is
not set correctly.  Those fake LEDs are bound to the physical
bottom-left corner.

* bastardkbk/charybdis/readme.md: update build commands

Merge pull request #5 from Nathancooke7/update_charybdis_readme_v2_shield.

* bastardkb/charybdis: fix Via keymap with blackpill

* bastardkb/charybdis: add 3x6 configuration

* bastardkb/charybdis: remove unnecessary files

* bastardkb/charybdis: remove obsolete code

* bastardkb/charybdis/3x6: add Via keymap

* bastardkb: add support for Splinky (RP2040) board

* bastardkb: initial configuration for the Splinky (SPI not working yet)

* bastardkb/charybdis/3x5/v2/splinky: tentative change to enable trackball

* bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins

* bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins

* bastardkb/charybdis/4x6/v2/splinky: add SPI configuration and enable trackball

* bastardkb/charybdis/3x6: add splinky config

* bastardkb/*/v2/splinky: update drivers to `vendor`

* bastardkb/dilemma: add new board

* bastardkb/charybdis: fix infinite loop in `layer_state_set_user(…)` in the `via` keymaps

* bastardkb/dilemma: add `bstiq` keymap

* bastardkb: specify blackpill boards

* bastardkb/charybdis: fix blackpill-specific define syntax

* bastardkb: remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` which are no longer valid options

* bastardkb: fix `QK_BOOT` keycodes

* bastardkb/dilemma: fix mouse direction on X axis

* bastardkb/charybdis/3x6: adjust CS

* bastardkb/dilemma: adjust trackpad configuration

* charybdis: fix `PWM33XX_CS_PIN` defines

This is a follow-up of https://github.com/qmk/qmk_firmware/pull/17613.

* bastardkb: remove Vial mentions from `bstiq` keymaps

* Cleanup unnecessary comments

Co-authored-by: Nathan <nathan.cooke@compass.com>
Co-authored-by: Charly Delay <0xcharly@codesink.dev>
---
 keyboards/bastardkb/charybdis/3x5/3x5.c       |   8 +-
 .../charybdis/3x5/blackpill/config.h          |  62 ++++
 .../charybdis/3x5/blackpill/halconf.h         |  29 ++
 .../charybdis/3x5/blackpill/info.json         |   6 +
 .../charybdis/3x5/blackpill/mcuconf.h         |  61 ++++
 .../charybdis/3x5/blackpill/readme.md         |   3 +
 .../charybdis/3x5/blackpill/rules.mk          |  41 +++
 keyboards/bastardkb/charybdis/3x5/config.h    |  44 +--
 keyboards/bastardkb/charybdis/3x5/info.json   |   7 +-
 .../charybdis/3x5/keymaps/bstiq/README.md     |   3 +
 .../charybdis/3x5/keymaps/bstiq/config.h      | 166 +++++++++
 .../charybdis/3x5/keymaps/bstiq/keymap.c      | 224 ++++++++++++
 .../charybdis/3x5/keymaps/bstiq/rules.mk      |  10 +
 .../charybdis/3x5/keymaps/default/keymap.c    |   4 +-
 .../charybdis/3x5/keymaps/via/config.h        |  13 +-
 .../charybdis/3x5/keymaps/via/keymap.c        |  42 ++-
 .../charybdis/3x5/v1/elitec/config.h          |  42 +++
 .../charybdis/3x5/v1/elitec/info.json         |   6 +
 .../charybdis/3x5/{ => v1/elitec}/rules.mk    |   9 +-
 .../charybdis/3x5/v2/elitec/config.h          |  36 ++
 .../charybdis/3x5/v2/elitec/info.json         |   6 +
 .../charybdis/3x5/v2/elitec/rules.mk          |  37 ++
 .../charybdis/3x5/v2/splinky/config.h         |  50 +++
 .../charybdis/3x5/v2/splinky/info.json        |   6 +
 .../charybdis/3x5/v2/splinky/mcuconf.h        |  23 ++
 .../charybdis/3x5/v2/splinky/rules.mk         |  37 ++
 keyboards/bastardkb/charybdis/3x6/3x6.c       |  91 +++++
 keyboards/bastardkb/charybdis/3x6/3x6.h       |  62 ++++
 .../charybdis/3x6/blackpill/config.h          |  60 ++++
 .../charybdis/3x6/blackpill/halconf.h         |  26 ++
 .../charybdis/3x6/blackpill/info.json         |   6 +
 .../charybdis/3x6/blackpill/mcuconf.h         |  43 +++
 .../charybdis/3x6/blackpill/readme.md         |   3 +
 .../charybdis/3x6/blackpill/rules.mk          |  39 +++
 keyboards/bastardkb/charybdis/3x6/config.h    |  49 +++
 keyboards/bastardkb/charybdis/3x6/info.json   |  99 ++++++
 .../charybdis/3x6/keymaps/default/config.h    |  54 +++
 .../charybdis/3x6/keymaps/default/keymap.c    |  66 ++++
 .../charybdis/3x6/keymaps/default/readme.md   |   7 +
 .../charybdis/3x6/keymaps/via/config.h        |  71 ++++
 .../charybdis/3x6/keymaps/via/keymap.c        | 148 ++++++++
 .../charybdis/3x6/keymaps/via/readme.md       |  57 +++
 .../charybdis/3x6/keymaps/via/rules.mk        |   1 +
 keyboards/bastardkb/charybdis/3x6/readme.md   |  15 +
 .../charybdis/3x6/v1/elitec/config.h          |  41 +++
 .../charybdis/3x6/v1/elitec/info.json         |   6 +
 .../charybdis/3x6/v1/elitec/rules.mk          |  35 ++
 .../charybdis/3x6/v2/elitec/config.h          |  36 ++
 .../charybdis/3x6/v2/elitec/info.json         |   6 +
 .../charybdis/3x6/v2/elitec/rules.mk          |  35 ++
 .../charybdis/3x6/v2/splinky/config.h         |  50 +++
 .../charybdis/3x6/v2/splinky/info.json        |   6 +
 .../charybdis/3x6/v2/splinky/mcuconf.h        |  23 ++
 .../charybdis/3x6/v2/splinky/rules.mk         |  37 ++
 keyboards/bastardkb/charybdis/4x6/4x6.c       |   6 +
 .../charybdis/4x6/blackpill/config.h          |  62 ++++
 .../charybdis/4x6/blackpill/halconf.h         |  29 ++
 .../charybdis/4x6/blackpill/info.json         |   6 +
 .../charybdis/4x6/blackpill/mcuconf.h         |  61 ++++
 .../charybdis/4x6/blackpill/readme.md         |   3 +
 .../charybdis/4x6/blackpill/rules.mk          |  40 +++
 keyboards/bastardkb/charybdis/4x6/config.h    |  47 +--
 keyboards/bastardkb/charybdis/4x6/info.json   |   7 +-
 .../charybdis/4x6/keymaps/default/keymap.c    |   4 +-
 .../charybdis/4x6/keymaps/via/config.h        |  13 +-
 .../charybdis/4x6/keymaps/via/keymap.c        |  37 +-
 .../charybdis/4x6/v1/elitec/config.h          |  42 +++
 .../charybdis/4x6/v1/elitec/info.json         |   6 +
 .../charybdis/4x6/{ => v1/elitec}/rules.mk    |   9 +-
 .../charybdis/4x6/v2/elitec/config.h          |  36 ++
 .../charybdis/4x6/v2/elitec/info.json         |   6 +
 .../charybdis/4x6/v2/elitec/rules.mk          |  36 ++
 .../charybdis/4x6/v2/splinky/config.h         |  50 +++
 .../charybdis/4x6/v2/splinky/info.json        |   6 +
 .../charybdis/4x6/v2/splinky/mcuconf.h        |  23 ++
 .../charybdis/4x6/v2/splinky/rules.mk         |  36 ++
 keyboards/bastardkb/charybdis/charybdis.c     | 134 +++----
 keyboards/bastardkb/charybdis/charybdis.h     |   8 +-
 keyboards/bastardkb/charybdis/post_config.h   |  48 +--
 keyboards/bastardkb/charybdis/readme.md       |  53 +--
 keyboards/bastardkb/dilemma/config.h          |  49 +++
 keyboards/bastardkb/dilemma/dilemma.c         | 326 ++++++++++++++++++
 keyboards/bastardkb/dilemma/dilemma.h         | 134 +++++++
 keyboards/bastardkb/dilemma/elitec/config.h   |  37 ++
 keyboards/bastardkb/dilemma/elitec/info.json  |   6 +
 keyboards/bastardkb/dilemma/elitec/rules.mk   |   5 +
 keyboards/bastardkb/dilemma/info.json         |  46 +++
 .../bastardkb/dilemma/keymaps/bstiq/README.md |   3 +
 .../bastardkb/dilemma/keymaps/bstiq/config.h  | 153 ++++++++
 .../bastardkb/dilemma/keymaps/bstiq/keymap.c  | 224 ++++++++++++
 .../dilemma/keymaps/default/keymap.c          |  84 +++++
 keyboards/bastardkb/dilemma/readme.md         |  14 +
 keyboards/bastardkb/dilemma/rules.mk          |  23 ++
 keyboards/bastardkb/dilemma/splinky/config.h  |  46 +++
 keyboards/bastardkb/dilemma/splinky/halconf.h |  21 ++
 keyboards/bastardkb/dilemma/splinky/info.json |   6 +
 keyboards/bastardkb/dilemma/splinky/mcuconf.h |  23 ++
 keyboards/bastardkb/dilemma/splinky/rules.mk  |   9 +
 keyboards/bastardkb/dilemma/splinky/splinky.c |  32 ++
 keyboards/bastardkb/info.json                 |   8 +
 keyboards/bastardkb/scylla/blackpill/config.h |  58 ++++
 .../bastardkb/scylla/blackpill/halconf.h      |  29 ++
 .../bastardkb/scylla/blackpill/info.json      |   6 +
 .../bastardkb/scylla/blackpill/mcuconf.h      |  61 ++++
 keyboards/bastardkb/scylla/blackpill/rules.mk |  36 ++
 keyboards/bastardkb/scylla/config.h           |  85 +----
 keyboards/bastardkb/scylla/info.json          |   7 +-
 .../bastardkb/scylla/keymaps/default/keymap.c |  65 ++--
 keyboards/bastardkb/scylla/readme.md          |   2 +-
 keyboards/bastardkb/scylla/scylla.h           |  46 +--
 keyboards/bastardkb/scylla/v1/elitec/config.h |  34 ++
 .../bastardkb/scylla/v1/elitec/info.json      |   6 +
 .../bastardkb/scylla/{ => v1/elitec}/rules.mk |   8 +-
 keyboards/bastardkb/scylla/v2/elitec/config.h |  33 ++
 .../bastardkb/scylla/v2/elitec/info.json      |   6 +
 keyboards/bastardkb/scylla/v2/elitec/rules.mk |  26 ++
 .../bastardkb/scylla/v2/splinky/config.h      |  43 +++
 .../bastardkb/scylla/v2/splinky/info.json     |   6 +
 .../bastardkb/scylla/v2/splinky/rules.mk      |  33 ++
 .../bastardkb/skeletyl/blackpill/config.h     |  58 ++++
 .../bastardkb/skeletyl/blackpill/halconf.h    |  29 ++
 .../bastardkb/skeletyl/blackpill/info.json    |   6 +
 .../bastardkb/skeletyl/blackpill/mcuconf.h    |  61 ++++
 .../bastardkb/skeletyl/blackpill/rules.mk     |  37 ++
 keyboards/bastardkb/skeletyl/config.h         |  82 +----
 keyboards/bastardkb/skeletyl/info.json        |   7 +-
 keyboards/bastardkb/skeletyl/skeletyl.h       |   2 +
 .../bastardkb/skeletyl/v1/elitec/config.h     |  34 ++
 .../bastardkb/skeletyl/v1/elitec/info.json    |   6 +
 .../skeletyl/{ => v1/elitec}/rules.mk         |  15 +-
 keyboards/bastardkb/skeletyl/v1/info.json     |   5 +
 .../bastardkb/skeletyl/v2/elitec/config.h     |  33 ++
 .../bastardkb/skeletyl/v2/elitec/info.json    |   6 +
 .../bastardkb/skeletyl/v2/elitec/rules.mk     |  27 ++
 .../bastardkb/skeletyl/v2/splinky/config.h    |  43 +++
 .../bastardkb/skeletyl/v2/splinky/info.json   |   6 +
 .../bastardkb/skeletyl/v2/splinky/rules.mk    |  34 ++
 keyboards/bastardkb/tbk/readme.md             |   2 +-
 .../bastardkb/tbkmini/blackpill/config.h      |  58 ++++
 .../bastardkb/tbkmini/blackpill/halconf.h     |  29 ++
 .../bastardkb/tbkmini/blackpill/info.json     |   6 +
 .../bastardkb/tbkmini/blackpill/mcuconf.h     |  61 ++++
 .../bastardkb/tbkmini/blackpill/rules.mk      |  37 ++
 keyboards/bastardkb/tbkmini/config.h          |  85 +----
 keyboards/bastardkb/tbkmini/info.json         |   7 +-
 .../tbkmini/keymaps/default/keymap.c          |  91 +++--
 keyboards/bastardkb/tbkmini/tbkmini.h         |  37 +-
 .../bastardkb/tbkmini/v1/elitec/config.h      |  34 ++
 .../bastardkb/tbkmini/v1/elitec/info.json     |   6 +
 .../tbkmini/{ => v1/elitec}/rules.mk          |  16 +-
 .../bastardkb/tbkmini/v2/elitec/config.h      |  33 ++
 .../bastardkb/tbkmini/v2/elitec/info.json     |   6 +
 .../bastardkb/tbkmini/v2/elitec/rules.mk      |  27 ++
 .../bastardkb/tbkmini/v2/splinky/config.h     |  43 +++
 .../bastardkb/tbkmini/v2/splinky/info.json    |   6 +
 .../bastardkb/tbkmini/v2/splinky/rules.mk     |  34 ++
 156 files changed, 5260 insertions(+), 643 deletions(-)
 create mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/README.md
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
 rename keyboards/bastardkb/charybdis/3x5/{ => v1/elitec}/rules.mk (95%)
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/3x6.c
 create mode 100644 keyboards/bastardkb/charybdis/3x6/3x6.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/via/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/via/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/blackpill/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/blackpill/info.json
 create mode 100644 keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/blackpill/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
 rename keyboards/bastardkb/charybdis/4x6/{ => v1/elitec}/rules.mk (94%)
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk
 create mode 100644 keyboards/bastardkb/dilemma/config.h
 create mode 100644 keyboards/bastardkb/dilemma/dilemma.c
 create mode 100644 keyboards/bastardkb/dilemma/dilemma.h
 create mode 100644 keyboards/bastardkb/dilemma/elitec/config.h
 create mode 100644 keyboards/bastardkb/dilemma/elitec/info.json
 create mode 100644 keyboards/bastardkb/dilemma/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/dilemma/info.json
 create mode 100644 keyboards/bastardkb/dilemma/keymaps/bstiq/README.md
 create mode 100644 keyboards/bastardkb/dilemma/keymaps/bstiq/config.h
 create mode 100644 keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
 create mode 100644 keyboards/bastardkb/dilemma/keymaps/default/keymap.c
 create mode 100644 keyboards/bastardkb/dilemma/readme.md
 create mode 100644 keyboards/bastardkb/dilemma/rules.mk
 create mode 100644 keyboards/bastardkb/dilemma/splinky/config.h
 create mode 100644 keyboards/bastardkb/dilemma/splinky/halconf.h
 create mode 100644 keyboards/bastardkb/dilemma/splinky/info.json
 create mode 100644 keyboards/bastardkb/dilemma/splinky/mcuconf.h
 create mode 100644 keyboards/bastardkb/dilemma/splinky/rules.mk
 create mode 100644 keyboards/bastardkb/dilemma/splinky/splinky.c
 create mode 100644 keyboards/bastardkb/info.json
 create mode 100644 keyboards/bastardkb/scylla/blackpill/config.h
 create mode 100644 keyboards/bastardkb/scylla/blackpill/halconf.h
 create mode 100644 keyboards/bastardkb/scylla/blackpill/info.json
 create mode 100644 keyboards/bastardkb/scylla/blackpill/mcuconf.h
 create mode 100644 keyboards/bastardkb/scylla/blackpill/rules.mk
 create mode 100644 keyboards/bastardkb/scylla/v1/elitec/config.h
 create mode 100644 keyboards/bastardkb/scylla/v1/elitec/info.json
 rename keyboards/bastardkb/scylla/{ => v1/elitec}/rules.mk (78%)
 create mode 100644 keyboards/bastardkb/scylla/v2/elitec/config.h
 create mode 100644 keyboards/bastardkb/scylla/v2/elitec/info.json
 create mode 100644 keyboards/bastardkb/scylla/v2/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/config.h
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/info.json
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/rules.mk
 create mode 100644 keyboards/bastardkb/skeletyl/blackpill/config.h
 create mode 100644 keyboards/bastardkb/skeletyl/blackpill/halconf.h
 create mode 100644 keyboards/bastardkb/skeletyl/blackpill/info.json
 create mode 100644 keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
 create mode 100644 keyboards/bastardkb/skeletyl/blackpill/rules.mk
 create mode 100644 keyboards/bastardkb/skeletyl/v1/elitec/config.h
 create mode 100644 keyboards/bastardkb/skeletyl/v1/elitec/info.json
 rename keyboards/bastardkb/skeletyl/{ => v1/elitec}/rules.mk (74%)
 create mode 100644 keyboards/bastardkb/skeletyl/v1/info.json
 create mode 100644 keyboards/bastardkb/skeletyl/v2/elitec/config.h
 create mode 100644 keyboards/bastardkb/skeletyl/v2/elitec/info.json
 create mode 100644 keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/config.h
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/info.json
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/rules.mk
 create mode 100644 keyboards/bastardkb/tbkmini/blackpill/config.h
 create mode 100644 keyboards/bastardkb/tbkmini/blackpill/halconf.h
 create mode 100644 keyboards/bastardkb/tbkmini/blackpill/info.json
 create mode 100644 keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
 create mode 100644 keyboards/bastardkb/tbkmini/blackpill/rules.mk
 create mode 100644 keyboards/bastardkb/tbkmini/v1/elitec/config.h
 create mode 100644 keyboards/bastardkb/tbkmini/v1/elitec/info.json
 rename keyboards/bastardkb/tbkmini/{ => v1/elitec}/rules.mk (74%)
 create mode 100644 keyboards/bastardkb/tbkmini/v2/elitec/config.h
 create mode 100644 keyboards/bastardkb/tbkmini/v2/elitec/info.json
 create mode 100644 keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/config.h
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/info.json
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/rules.mk

diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.c b/keyboards/bastardkb/charybdis/3x5/3x5.c
index d896cf6923..7b10d322cd 100644
--- a/keyboards/bastardkb/charybdis/3x5/3x5.c
+++ b/keyboards/bastardkb/charybdis/3x5/3x5.c
@@ -33,6 +33,10 @@
  * ╰────────────────────╯                 ╰────────────────────╯
  *                   15  16  17     33  34  XX
  *                 ╰────────────╯ ╰────────────╯
+ *
+ * Note: the LED config simulates 36 LEDs instead of the actual 35 to prevent
+ * confusion when testing LEDs during assembly when handedness is not set
+ * correctly.  Those fake LEDs are bound to the physical top-left corner.
  */
 led_config_t g_led_config = { {
     /* Key Matrix to LED index. */
@@ -61,7 +65,7 @@ led_config_t g_led_config = { {
     /* index=24 */ { 188,  42 }, { 188,  21 }, { 188,   0 },
     /* index=27 */ { 170,   0 }, { 170,  21 }, { 170,  42 },
     /* index=30 */ { 152,   0 }, { 152,  21 }, { 152,  42 },
-    /* index=33 */ { 152,  64 }, { 134,  64 },
+    /* index=33 */ { 134,  64 }, { 152,  64 }, {   0,   0 },
 }, {
     /* LED index to flag. */
     // Left split.
@@ -77,7 +81,7 @@ led_config_t g_led_config = { {
     /* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
     /* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
     /* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-    /* index=33 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
+    /* index=33 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
 } };
 #endif
 // clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
new file mode 100644
index 0000000000..ddd5e83318
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { A2, B8, A8, B9 }
+#define MATRIX_COL_PINS \
+    { B1, B10, B3, B4, B5 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
+
+/* RGB settings. */
+#define RGB_DI_PIN A1
+#define WS2812_PWM_DRIVER PWMD2
+#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_TARGET_PERIOD 800000
+
+/* Serial configuration for split keyboard. */
+#define SERIAL_USART_TX_PIN A9
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for EEPROM and pmw3360 sensor. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
+
+/* EEPROM config. */
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN B14
+#define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
new file mode 100644
index 0000000000..a89dff0cd3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+//#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+//#define HAL_USE_GPT TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
new file mode 100644
index 0000000000..1e347df9b2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Blackpill",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
new file mode 100644
index 0000000000..1615d1bf46
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_I2C_I2C1_RX_DMA_STREAM
+#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+#undef STM32_I2C_I2C1_TX_DMA_STREAM
+#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_SPI_SPI1_RX_DMA_STREAM
+#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
+#undef STM32_SPI_SPI1_TX_DMA_STREAM
+#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+// #undef STM32_SERIAL_USE_USART2
+// #define STM32_SERIAL_USE_USART2 TRUE
+
+// #undef STM32_UART_USART2_RX_DMA_STREAM
+// #define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+// #undef STM32_UART_USART2_TX_DMA_STREAM
+// #define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+
+#undef STM32_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/readme.md b/keyboards/bastardkb/charybdis/3x5/blackpill/readme.md
new file mode 100644
index 0000000000..7ef08798b8
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/readme.md
@@ -0,0 +1,3 @@
+# Charybdis Nano (3x5) BlackPill
+
+An ergonomic keyboard with integrated trackball, with BlackPill (STM32F411) mod.
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
new file mode 100644
index 0000000000..0f732c2cbd
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -0,0 +1,41 @@
+# MCU name
+MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
+# the trackball side).
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index b12603fade..57634258be 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -18,58 +18,24 @@
 
 #pragma once
 
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1832
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT Charybdis Nano
+#include "config_common.h"
 
 /* Key matrix configuration. */
-
-// Rows are doubled-up.
-#define MATRIX_ROWS 8
+#define MATRIX_ROWS 8 // Rows are doubled-up.
 #define MATRIX_COLS 5
 
-// Wiring configuration for each half.
-#define MATRIX_ROW_PINS \
-    { B7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { C7, F0, D7, E6, B4 }
-
-#define MATRIX_ROW_PINS_RIGHT \
-    { F0, C6, D4, B5 }
-#define MATRIX_COL_PINS_RIGHT \
-    { C7, B7, D7, E6, B4 }
-
 #define DIODE_DIRECTION ROW2COL
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-/* Bootmagic Lite configuration. */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-
-/* serial.c configuration (for split keyboard) */
-#define SOFT_SERIAL_PIN D2
-
 /* Set 0 if debouncing isn't needed. */
 #define DEBOUNCE 5
 
-/* PMW33XX settings. */
-#define PMW33XX_CS_PIN B0
-
-// Trackball angle adjustment.
+/* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
 
 /* RGB settings. */
-
-#define RGB_DI_PIN D3
-#define RGBLED_NUM 35
+#define RGBLED_NUM 36
 #define RGBLED_SPLIT \
-    { 18, 17 }
+    { 18, 18 }
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
index 03fb05664f..ece533944e 100644
--- a/keyboards/bastardkb/charybdis/3x5/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -1,7 +1,8 @@
 {
-    "keyboard_name": "Charybdis Nano",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com/charybdis-nano",
+    "usb": {
+        "pid": "0x1832",
+    },
     "layouts": {
         "LAYOUT_charybdis_3x5": {
             "layout": [
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/README.md b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/README.md
new file mode 100644
index 0000000000..5d9f7fcd5f
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/README.md
@@ -0,0 +1,3 @@
+# Charybdis (3x5) @bstiq keymap
+
+Inspired from Miryoku, using home-rows.
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
new file mode 100644
index 0000000000..699a700063
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
@@ -0,0 +1,166 @@
+/**
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifdef VIA_ENABLE
+/* Via configuration. */
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 8
+#endif // VIA_ENABLE
+
+#ifndef __arm__
+/* Disable unused features. */
+#    define NO_ACTION_ONESHOT
+#endif // __arm__
+
+/**
+ * Configure the global tapping term (default: 200ms).
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#ifndef TAPPING_TERM
+#    define TAPPING_TERM 160
+#endif // TAPPING_TERM
+
+/**
+ * Enable rapid switch from tap to hold.  Disable auto-repeat when pressing key
+ * twice, except for one-shot keys.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
+ */
+#define TAPPING_FORCE_HOLD
+
+/*
+ * Tap-or-Hold decision modes.
+ *
+ * Note that the following flags behave differently when combined (ie. when 2 or
+ * more are enabled).
+ *
+ * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
+ * decision modes.
+ */
+
+/**
+ * Faster tap-hold trigger.
+ *
+ * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
+ * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
+ */
+#define PERMISSIVE_HOLD
+
+/**
+ * Prevent normal rollover on alphas from accidentally triggering mods.
+ *
+ * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
+ *
+ * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
+ * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
+ */
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/** Charybdis-specific features. */
+
+#ifdef POINTING_DEVICE_ENABLE
+// Automatically enable the pointer layer when moving the trackball.  See also:
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
+// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+// Flip horizontal direction for drag-scroll.
+#    define CHARYBDIS_DRAGSCROLL_REVERSE_X
+// #define CHARYBDIS_DRAGSCROLL_REVERSE_Y
+#endif // POINTING_DEVICE_ENABLE
+
+/** RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+#    ifdef __arm__
+// Enable all animations on ARM boards since they have plenty of memory
+// available for it.
+#        define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_BREATHING
+#        define ENABLE_RGB_MATRIX_BAND_SAT
+#        define ENABLE_RGB_MATRIX_BAND_VAL
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#        define ENABLE_RGB_MATRIX_CYCLE_ALL
+#        define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#        define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#        define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#        define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#        define ENABLE_RGB_MATRIX_DUAL_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#        define ENABLE_RGB_MATRIX_RAINDROPS
+#        define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#        define ENABLE_RGB_MATRIX_HUE_BREATHING
+#        define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#        define ENABLE_RGB_MATRIX_HUE_WAVE
+#        define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#        define ENABLE_RGB_MATRIX_SPLASH
+#        define ENABLE_RGB_MATRIX_MULTISPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#    else
+// Disable control of RGB matrix by keycodes (must use firmware implementation
+// to control the feature).
+#        define RGB_MATRIX_DISABLE_KEYCODES
+#    endif
+
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
new file mode 100644
index 0000000000..ca67dd690c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
@@ -0,0 +1,224 @@
+/**
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum charybdis_keymap_bstiq_layers {
+    LAYER_BASE = 0,
+    LAYER_MBO,
+    LAYER_MEDIA,
+    LAYER_NAV,
+    LAYER_MOUSE,
+    LAYER_SYM,
+    LAYER_NUM,
+    LAYER_FUN,
+};
+
+// Automatically enable sniping when the mouse layer is on.
+#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_MOUSE
+
+#define BSP_NAV LT(LAYER_NAV, KC_BSPC)
+#define ENT_MBO LT(LAYER_MBO, KC_ENT)
+#define TAB_MED LT(LAYER_MEDIA, KC_TAB)
+#define ESC_SYM LT(LAYER_SYM, KC_ESC)
+#define SPC_NUM LT(LAYER_NUM, KC_SPC)
+#define MOUSE(KC) LT(LAYER_MOUSE, KC)
+
+#define USR_RDO KC_AGAIN
+#define USR_PST S(KC_INS)
+#define USR_CPY C(KC_INS)
+#define USR_CUT S(KC_DEL)
+#define USR_UND KC_UNDO
+
+#define MS_L KC_MS_LEFT
+#define MS_R KC_MS_RIGHT
+#define MS_D KC_MS_DOWN
+#define MS_U KC_MS_UP
+
+#define WH_L KC_MS_WH_LEFT
+#define WH_R KC_MS_WH_RIGHT
+#define WH_D KC_MS_WH_DOWN
+#define WH_U KC_MS_WH_UP
+
+// clang-format off
+/** Convenience macro. */
+#define _KC_LAYOUT_wrapper(                                                                             \
+         k00,      k01,      k02,      k03,      k04,      k05,      k06,      k07,      k08,      k09, \
+         k10,      k11,      k12,      k13,      k14,      k15,      k16,      k17,      k18,      k19, \
+         k20,      k21,      k22,      k23,      k24,      k25,      k26,      k27,      k28,      k29, \
+         ...)                                                                                           \
+    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, \
+    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, \
+    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, \
+    __VA_ARGS__
+#define KC_LAYOUT_wrapper(...) _KC_LAYOUT_wrapper(__VA_ARGS__)
+
+/** Base layer with BÉPO layout. */
+#define LAYOUT_LAYER_BASE_BEPO KC_LAYOUT_wrapper(               \
+       B,    Z,    P,    O, QUOT,  DOT,    V,    D,    L,    J, \
+       A,    U,    I,    E, COMM,    C,    T,    S,    R,    N, \
+       W,    Y,    X, SLSH,    K,    M,    Q,    G,    H,    F, \
+       BSP_NAV, ENT_MBO, TAB_MED,    ESC_SYM, SPC_NUM)
+
+/** Convenience key shorthands. */
+#define U_NA KC_NO // Present but not available for use.
+#define U_NU KC_NO // Available but not used.
+
+/** Convenience row shorthands. */
+#define __________________RESET_L__________________ QK_BOOT,    U_NA,    U_NA,    U_NA,    U_NA
+#define __________________RESET_R__________________    U_NA,    U_NA,    U_NA,    U_NA, QK_BOOT
+#define ______________HOME_ROW_GASC_L______________ KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL,    U_NA
+#define ______________HOME_ROW_ALGR_L______________    U_NA, KC_ALGR,    U_NA,    U_NA,    U_NA
+#define ______________HOME_ROW_GASC_R______________    U_NA, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI
+#define ______________HOME_ROW_ALGR_R______________    U_NA,    U_NA,    U_NA, KC_ALGR,    U_NA
+
+/** Layers. */
+
+// Buttons.
+#define LAYOUT_LAYER_MBO                                                                      \
+    __________________RESET_L__________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    ______________HOME_ROW_GASC_L______________, KC_CAPS, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
+    KC_BTN3, KC_ALGR, KC_BTN2, KC_BTN1,    U_NA,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
+                         U_NA,    U_NA,    U_NA,  KC_ENT,  KC_DEL
+
+// Media.
+#define LAYOUT_LAYER_MEDIA                                                                    \
+    __________________RESET_L__________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    ______________HOME_ROW_GASC_L______________,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
+    ______________HOME_ROW_ALGR_L______________,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
+                         U_NA,    U_NA,    U_NA, KC_BTN1, KC_BTN3
+
+// Navigation.
+#define LAYOUT_LAYER_NAV                                                                      \
+    __________________RESET_L__________________, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, \
+    ______________HOME_ROW_GASC_L______________,    U_NU, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, \
+    ______________HOME_ROW_ALGR_L______________,    U_NU,    U_NU,    U_NU,    U_NU,    U_NU, \
+                         U_NA,    U_NA,    U_NA, KC_MSTP, KC_MPLY
+
+// Mouse.
+#define LAYOUT_LAYER_MOUSE                                                                    \
+    S_D_MOD, USR_PST, USR_CPY, USR_CUT, USR_UND, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    DPI_MOD, DRGSCRL, KC_LSFT, KC_LCTL, _______,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
+    USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
+                      KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN1, KC_BTN3
+
+// Symbols.
+#define LAYOUT_LAYER_SYM                                                                      \
+    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, __________________RESET_R__________________, \
+    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GASC_R______________, \
+    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_PIPE, ______________HOME_ROW_ALGR_R______________, \
+                      KC_LPRN, KC_RPRN, KC_UNDS,    U_NA,    U_NA
+
+// Numerals.
+#define LAYOUT_LAYER_NUM                                                                      \
+    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, __________________RESET_R__________________, \
+    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GASC_R______________, \
+     KC_GRV,    KC_1,    KC_2,    KC_3, KC_BSLS, ______________HOME_ROW_ALGR_R______________, \
+                       KC_DOT,    KC_0, KC_MINS,    U_NA,    U_NA
+
+// Function keys.
+#define LAYOUT_LAYER_FUN                                                                      \
+     KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, __________________RESET_R__________________, \
+     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \
+     KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
+                       KC_APP,  KC_SPC,  KC_TAB,    U_NA,    U_NA
+
+/**
+ * Add Home Row mod to a layout.
+ *
+ * Expects a 10-key per row layout.  Adds support for GASC (Gui, Alt, Shift, Ctl)
+ * home row.  The layout passed in parameter must contain at least 20 keycodes.
+ *
+ * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
+ *
+ *     HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO)
+ */
+#define _HOME_ROW_MOD_GASC(                                            \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
+    ...)                                                               \
+             L00,         L01,         L02,         L03,         L04,  \
+             R05,         R06,         R07,         R08,         R09,  \
+      LGUI_T(L10), LALT_T(L11), LSFT_T(L12), LCTL_T(L13),        L14,  \
+             R15,  RCTL_T(R16), RSFT_T(R17), LALT_T(R18), RGUI_T(R19), \
+      __VA_ARGS__
+#define HOME_ROW_MOD_GASC(...) _HOME_ROW_MOD_GASC(__VA_ARGS__)
+
+/**
+ * Add mouse layer keys to a layout.
+ *
+ * Expects a 10-key per row layout.  The layout passed in parameter must contain
+ * at least 30 keycodes.
+ *
+ * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
+ *
+ *     MOUSE_MOD(LAYOUT_LAYER_BASE_BEPO)
+ */
+#define _MOUSE_MOD(                                               \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,             \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,             \
+    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,             \
+    ...)                                                          \
+            L00,        L01,        L02,        L03,        L04,  \
+            R05,        R06,        R07,        R08,        R09,  \
+            L10,        L11,        L12,        L13,        L14,  \
+            R15,        R16,        R17,        R18,        R19,  \
+      MOUSE(L20),       L21,        L22,        L23,        L24,  \
+            R25,        R26,        R27,        R28,  MOUSE(R29), \
+      __VA_ARGS__
+#define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__)
+
+#define LAYOUT_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_wrapper(
+    MOUSE_MOD(HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO))
+  ),
+  [LAYER_MBO] = LAYOUT_wrapper(LAYOUT_LAYER_MBO),
+  [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA),
+  [LAYER_NAV] = LAYOUT_wrapper(LAYOUT_LAYER_NAV),
+  [LAYER_MOUSE] = LAYOUT_wrapper(LAYOUT_LAYER_MOUSE),
+  [LAYER_SYM] = LAYOUT_wrapper(LAYOUT_LAYER_SYM),
+  [LAYER_NUM] = LAYOUT_wrapper(LAYOUT_LAYER_NUM),
+  [LAYER_FUN] = LAYOUT_wrapper(LAYOUT_LAYER_FUN),
+};
+// clang-format on
+
+#if defined(POINTING_DEVICE_ENABLE) && defined(CHARYBDIS_AUTO_SNIPING_ON_LAYER)
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#endif // POINTING_DEVICE_ENABLE && CHARYBDIS_AUTO_SNIPING_ON_LAYER
+
+#ifdef RGB_MATRIX_ENABLE
+// Forward-declare this helper function since it is defined in rgb_matrix.c.
+void rgb_matrix_update_pwm_buffers(void);
+#endif
+
+void shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgblight_setrgb_red();
+#endif // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(RGB_RED);
+    rgb_matrix_update_pwm_buffers();
+#endif // RGB_MATRIX_ENABLE
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/rules.mk
new file mode 100644
index 0000000000..5d91064607
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/rules.mk
@@ -0,0 +1,10 @@
+ifeq ($(MCU),atmega32u4)
+	# Space saving settings.
+	TAP_DANCE_ENABLE = no
+	COMBO_ENABLE = no
+	QMK_SETTINGS = no
+else ifeq ($(MCU),STM32F411)
+	EEPROM_DRIVER = vendor
+endif
+
+VIA_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
index cb578aa8d6..148f026740 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
        KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,    KC_4,    KC_5,    KC_6, KC_PMNS,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,   QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS,
+       XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
                          XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______
   //                   ╰───────────────────────────╯ ╰──────────────────╯
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
        KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,      QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX,
+       KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
                          _______, _______, XXXXXXX,    _______, XXXXXXX
   //                   ╰───────────────────────────╯ ╰──────────────────╯
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
index f515d85334..d20131e9cf 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
@@ -19,7 +19,7 @@
 #ifdef VIA_ENABLE
 /* VIA configuration. */
 #    define DYNAMIC_KEYMAP_LAYER_COUNT 7
-#endif  // VIA_ENABLE
+#endif // VIA_ENABLE
 
 /* Disable unused features. */
 #define NO_ACTION_ONESHOT
@@ -33,7 +33,7 @@
  * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
  */
 #    define TAPPING_TERM 200
-#endif  // TAPPING_TERM
+#endif // TAPPING_TERM
 
 /**
  * \brief Enable rapid switch from tap to hold.
@@ -84,16 +84,11 @@
 /* Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
-// Enable pointer acceleration, which increases the speed by ~2x for large
-// displacement, while maintaining 1x speed for slow movements.  See also:
-// - `CHARYBDIS_POINTER_ACCELERATION_FACTOR`
-#    define CHARYBDIS_POINTER_ACCELERATION_ENABLE
-
 // Automatically enable the pointer layer when moving the trackball.  See also:
 // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
 // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
 // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
-#endif  // POINTING_DEVICE_ENABLE
+#endif // POINTING_DEVICE_ENABLE
 
 /* RGB Matrix. */
 
@@ -115,4 +110,4 @@
 #    define RGB_MATRIX_STARTUP_SAT 255
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif  // RGB_MATRIX_ENABLE
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
index dc02ed34c6..b54c58cf0c 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 #ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 #    include "timer.h"
-#endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 
 enum charybdis_keymap_layers {
     LAYER_BASE = 0,
@@ -38,12 +38,12 @@ static uint16_t auto_pointer_layer_timer = 0;
 
 #    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
 #        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
-#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
 
 #    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
 #        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
-#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
-#endif      // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#endif     // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 
 #define ESC_MED LT(LAYER_MEDIA, KC_ESC)
 #define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC)
@@ -52,6 +52,13 @@ static uint16_t auto_pointer_layer_timer = 0;
 #define BSP_NUM LT(LAYER_NUMERAL, KC_BSPC)
 #define _L_PTR(KC) LT(LAYER_POINTER, KC)
 
+#ifndef POINTING_DEVICE_ENABLE
+#    define DRGSCRL KC_NO
+#    define DPI_MOD KC_NO
+#    define S_D_MOD KC_NO
+#    define SNIPING KC_NO
+#endif // !POINTING_DEVICE_ENABLE
+
 // clang-format off
 /** \brief QWERTY layout (3 rows, 10 columns). */
 #define LAYOUT_LAYER_BASE                                                                     \
@@ -98,14 +105,14 @@ static uint16_t auto_pointer_layer_timer = 0;
 #define LAYOUT_LAYER_MEDIA                                                                    \
     XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, \
     KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, \
-    XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,   QK_BOOT,   QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, \
+    XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, \
                       _______, KC_MPLY, KC_MSTP, KC_MSTP, KC_MPLY
 
 /** \brief Mouse emulation and pointer functions. */
 #define LAYOUT_LAYER_POINTER                                                                  \
     XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, \
     ______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
-    _______, DRGSCRL, SNIPING, EEP_RST,   QK_BOOT,   QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, \
+    _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, \
                       KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1
 
 /**
@@ -217,36 +224,35 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
 #        ifdef RGB_MATRIX_ENABLE
             rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
             rgb_matrix_sethsv_noeeprom(HSV_GREEN);
-#        endif  // RGB_MATRIX_ENABLE
+#        endif // RGB_MATRIX_ENABLE
         }
         auto_pointer_layer_timer = timer_read();
     }
     return mouse_report;
 }
 
-void matrix_scan_kb(void) {
+void matrix_scan_user(void) {
     if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
         auto_pointer_layer_timer = 0;
         layer_off(LAYER_POINTER);
 #        ifdef RGB_MATRIX_ENABLE
         rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
-#        endif  // RGB_MATRIX_ENABLE
+#        endif // RGB_MATRIX_ENABLE
     }
-    matrix_scan_user();
 }
-#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 
 #    ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    state = layer_state_set_user(state);
+layer_state_t layer_state_set_user(layer_state_t state) {
     charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
     return state;
 }
-#    endif  // CHARYBDIS_AUTO_SNIPING_ON_LAYER
-#endif      // POINTING_DEVICE_ENABLE
+#    endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
+#endif     // POINTING_DEVICE_ENABLE
 
 #ifdef RGB_MATRIX_ENABLE
-// Forward-declare this helper function since it is defined in rgb_matrix.c.
+// Forward-declare this helper function since it is defined in
+// rgb_matrix.c.
 void rgb_matrix_update_pwm_buffers(void);
 #endif
 
@@ -255,9 +261,9 @@ void shutdown_user(void) {
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
     rgblight_setrgb_red();
-#endif  // RGBLIGHT_ENABLE
+#endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(RGB_RED);
     rgb_matrix_update_pwm_buffers();
-#endif  // RGB_MATRIX_ENABLE
+#endif // RGB_MATRIX_ENABLE
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
new file mode 100644
index 0000000000..3e3d95174c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { B7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { C7, F0, D7, E6, B4 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { F0, C6, D4, B5 }
+#define MATRIX_COL_PINS_RIGHT \
+    { C7, B7, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
new file mode 100644
index 0000000000..9071212f33
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Elite-C",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
similarity index 95%
rename from keyboards/bastardkb/charybdis/3x5/rules.mk
rename to keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index c5f3f0fb8c..22bd22652a 100644
--- a/keyboards/bastardkb/charybdis/3x5/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -23,10 +23,6 @@ RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by def
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812
 
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
-
 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
 # the trackball side).
 SPLIT_KEYBOARD = yes
@@ -34,5 +30,8 @@ LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
-# https://qmk.fm/changes/2018-11-16-use-a-single-endpoint-for-hid-reports
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
new file mode 100644
index 0000000000..5c11fa3145
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
new file mode 100644
index 0000000000..7c90e5d5a3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Elite-C",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
new file mode 100644
index 0000000000..22bd22652a
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
+# the trackball side).
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
new file mode 100644
index 0000000000..2929d3dd1e
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+    { GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* RGB settings. */
+#define RGB_DI_PIN GP0
+
+/* SPI & PMW3360 settings. */
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP18
+#define SPI_MOSI_PIN GP19
+#define SPI_MISO_PIN GP20
+#define PMW33XX_CS_PIN GP14
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
new file mode 100644
index 0000000000..1aa1e8811d
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Splinky",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h
new file mode 100644
index 0000000000..0fdd67c3a2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk
new file mode 100644
index 0000000000..21a9506077
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.c b/keyboards/bastardkb/charybdis/3x6/3x6.c
new file mode 100644
index 0000000000..beb04efc0b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/3x6.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "3x6.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+/**
+ * \brief LEDs index.
+ *
+ #  0,0  14  28  42  56  70  84  98    126 140 154 168 182 196 210 224,0
+ #  0,0  15  30  45  60  75  90 105    119 134 149 164 179 194 209 224,0
+ * ╭────────────────────────╮                 ╭────────────────────────╮
+ *    0   5   6  11  12  15                     36  33  32  27  26  21
+ * ├────────────────────────┤                 ├────────────────────────┤
+ *    1   4   7  10  13  16                     37  34  31  28  25  22
+ * ├────────────────────────┤                 ├────────────────────────┤
+ *    2   3   8   9  14  17                     38  35  30  29  24  23
+ * ╰────────────────────────╯                 ╰────────────────────────╯
+ *                       18  19  20     39  40  XX
+ *                     ╰────────────╯ ╰────────────╯
+ *
+ * Note: the LED config simulates 42 LEDs instead of the actual 41 to prevent
+ * confusion when testing LEDs during assembly when handedness is not set
+ * correctly.  Those fake LEDs are bound to the physical top-left corner.
+ */
+led_config_t g_led_config = { {
+    /* Key Matrix to LED index. */
+    // Left split.
+    {      0,      5,      6,     11,     12,     15 }, // Top row
+    {      1,      4,      7,     10,     13,     16 }, // Middle row
+    {      2,      3,      8,      9,     14,     17 }, // Bottom row
+    { NO_LED,     20, NO_LED,     18,     19, NO_LED }, // Thumb cluster
+    // Right split.
+    {     21,     26,     27,     32,     33,     36 }, // Top row
+    {     22,     25,     28,     31,     34,     37 }, // Middle row
+    {     23,     24,     29,     30,     35,     38 }, // Bottom row
+    { NO_LED,     41, NO_LED,     39,     40, NO_LED }, // Thumb cluster
+}, {
+    /* LED index to physical position. */
+    // Left split.
+    /* index=0  */ {   0,   0 }, {   0,  21 }, {   0,  42 }, // col 1 (left most)
+    /* index=3  */ {  15,  42 }, {  15,  21 }, {  15,   0 }, // col 2
+    /* index=6  */ {  30,   0 }, {  30,  21 }, {  30,  42 },
+    /* index=9  */ {  45,  42 }, {  45,  21 }, {  45,   0 },
+    /* index=12 */ {  60,   0 }, {  60,  21 }, {  60,  42 },
+    /* index=15 */ {  75,   0 }, {  75,  21 }, {  75,  42 },
+    /* index=18 */ {  75,  64 }, {  90,  64 }, { 105,  64 }, // Thumb cluster
+    // Right split.
+    /* index=21 */ { 224,   0 }, { 224,  21 }, { 224,  42 }, // col 12 (right most)
+    /* index=24 */ { 209,  42 }, { 209,  21 }, { 209,   0 }, // col 10
+    /* index=27 */ { 194,   0 }, { 194,  21 }, { 194,  42 },
+    /* index=30 */ { 179,  42 }, { 179,  21 }, { 179,   0 },
+    /* index=33 */ { 164,   0 }, { 164,  21 }, { 164,  42 },
+    /* index=36 */ { 149,   0 }, { 149,  21 }, { 149,  42 },
+    /* index=39 */ { 119,  64 }, { 134,  64 }, {   0,   0 }, // Thumb cluster
+}, {
+    /* LED index to flag. */
+    // Left split.
+    /* index=0  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
+    /* index=3  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
+    /* index=6  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=9  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=15 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=18 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
+    // Right split.
+    /* index=21 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 10
+    /* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 9
+    /* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=33 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=36 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=39 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
+} };
+#endif
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.h b/keyboards/bastardkb/charybdis/3x6/3x6.h
new file mode 100644
index 0000000000..bf5de31036
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/3x6.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "charybdis.h"
+
+// clang-format off
+#define LAYOUT_charybdis_3x6(                                     \
+  k00, k01, k02, k03, k04, k05,     k45, k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14, k15,     k55, k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24, k25,     k65, k64, k63, k62, k61, k60, \
+                 k33, k34, k31,     k71, k73                      \
+)                                                                 \
+{                                                                 \
+  {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
+  {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
+  {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
+  { KC_NO,   k31, KC_NO,   k33,   k34, KC_NO },                   \
+  {   k40,   k41,   k42,   k43,   k44,   k45 },                   \
+  {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
+  {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
+  { KC_NO,   k71, KC_NO,   k73, KC_NO, KC_NO },                   \
+}
+
+/**
+ * \brief Compatibility layout with the split_3x5_6 community layout.
+ *
+ * This effectively renders the Charbdis Nano compatible with existing layout
+ * implementations relying on the `split_3x6_3` layout.
+ */
+#define LAYOUT_split_3x6_3(                                       \
+  k00, k01, k02, k03, k04, k05,     k45, k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14, k15,     k55, k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24, k25,     k65, k64, k63, k62, k61, k60, \
+                 k33, k34, k31,     k71, k73, ___                 \
+)                                                                 \
+{                                                                 \
+  {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
+  {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
+  {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
+  { KC_NO,   k31, KC_NO,   k33,   k34, KC_NO },                   \
+  {   k40,   k41,   k42,   k43,   k44,   k45 },                   \
+  {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
+  {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
+  { KC_NO,   k71, KC_NO,   k73, KC_NO, KC_NO },                   \
+}
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
new file mode 100644
index 0000000000..1b90a3076b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { A2, B8, A8, B9 }
+#define MATRIX_COL_PINS \
+    { B0, B1, B10, B3, B4, B5 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
+
+/* RGB settings. */
+#define RGB_DI_PIN A1
+#define WS2812_PWM_DRIVER PWMD2
+#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_TARGET_PERIOD 800000
+
+/* Serial configuration for split keyboard. */
+#define SERIAL_USART_TX_PIN A9
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for EEPROM and pmw3360 sensor. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
+
+/* EEPROM config. */
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN B14
+#define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
new file mode 100644
index 0000000000..42d7499907
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next "halconf.h"
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
new file mode 100644
index 0000000000..73a1359e00
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Blackpill",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
new file mode 100644
index 0000000000..26645d8c1a
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_SPI_SPI1_RX_DMA_STREAM
+#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
+#undef STM32_SPI_SPI1_TX_DMA_STREAM
+#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+#undef STM32_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/readme.md b/keyboards/bastardkb/charybdis/3x6/blackpill/readme.md
new file mode 100644
index 0000000000..6a9907c2ae
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/readme.md
@@ -0,0 +1,3 @@
+# Charybdis Mini (3x6) BlackPill
+
+An ergonomic keyboard with integrated trackball, with BlackPill (STM32F411) mod.
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
new file mode 100644
index 0000000000..a29e3e433d
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -0,0 +1,39 @@
+# MCU name
+MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
new file mode 100644
index 0000000000..6b31a773fc
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* Key matrix configuration. */
+#define MATRIX_ROWS 8 // Rows are doubled-up.
+#define MATRIX_COLS 6
+
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed. */
+#define DEBOUNCE 5
+
+/* Trackball angle adjustment. */
+#define ROTATIONAL_TRANSFORM_ANGLE -25
+
+/* RGB settings. */
+#define RGBLED_NUM 42
+#define RGBLED_SPLIT \
+    { 21, 21 }
+
+/* RGB matrix support. */
+#ifdef RGB_MATRIX_ENABLE
+#    define SPLIT_TRANSPORT_MIRROR
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_KEYPRESSES
+#endif
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
new file mode 100644
index 0000000000..0b4428cdbe
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -0,0 +1,99 @@
+{
+    "url": "https://bastardkb.com",
+    "usb": {
+        "pid": "0x1834",
+    },
+    "layouts": {
+        "LAYOUT_charybdis_3x6": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0},
+                {"label":"L01", "x":1, "y":0},
+                {"label":"L02", "x":2, "y":0},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0},
+                {"label":"R00", "x":11, "y":0},
+                {"label":"R01", "x":12, "y":0},
+                {"label":"R02", "x":13, "y":0},
+                {"label":"R03", "x":14, "y":0},
+                {"label":"R04", "x":15, "y":0},
+                {"label":"R05", "x":16, "y":0},
+                {"label":"L10", "x":0, "y":1},
+                {"label":"L11", "x":1, "y":1},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1},
+                {"label":"R10", "x":11, "y":1},
+                {"label":"R11", "x":12, "y":1},
+                {"label":"R12", "x":13, "y":1},
+                {"label":"R13", "x":14, "y":1},
+                {"label":"R14", "x":15, "y":1},
+                {"label":"R15", "x":16, "y":1},
+                {"label":"L20", "x":0, "y":2},
+                {"label":"L21", "x":1, "y":2},
+                {"label":"L22", "x":2, "y":2},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2},
+                {"label":"R20", "x":11, "y":2},
+                {"label":"R21", "x":12, "y":2},
+                {"label":"R22", "x":13, "y":2},
+                {"label":"R23", "x":14, "y":2},
+                {"label":"R24", "x":15, "y":2},
+                {"label":"R25", "x":16, "y":2},
+                {"label":"L33", "x":5, "y":3},
+                {"label":"L34", "x":6, "y":3},
+                {"label":"L31", "x":7, "y":3},
+                {"label":"R31", "x":9, "y":3},
+                {"label":"R33", "x":10, "y":3}
+            ]
+        },
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0},
+                {"label":"L01", "x":1, "y":0},
+                {"label":"L02", "x":2, "y":0},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0},
+                {"label":"R00", "x":11, "y":0},
+                {"label":"R01", "x":12, "y":0},
+                {"label":"R02", "x":13, "y":0},
+                {"label":"R03", "x":14, "y":0},
+                {"label":"R04", "x":15, "y":0},
+                {"label":"R05", "x":16, "y":0},
+                {"label":"L10", "x":0, "y":1},
+                {"label":"L11", "x":1, "y":1},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1},
+                {"label":"R10", "x":11, "y":1},
+                {"label":"R11", "x":12, "y":1},
+                {"label":"R12", "x":13, "y":1},
+                {"label":"R13", "x":14, "y":1},
+                {"label":"R14", "x":15, "y":1},
+                {"label":"R15", "x":16, "y":1},
+                {"label":"L20", "x":0, "y":2},
+                {"label":"L21", "x":1, "y":2},
+                {"label":"L22", "x":2, "y":2},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2},
+                {"label":"R20", "x":11, "y":2},
+                {"label":"R21", "x":12, "y":2},
+                {"label":"R22", "x":13, "y":2},
+                {"label":"R23", "x":14, "y":2},
+                {"label":"R24", "x":15, "y":2},
+                {"label":"R25", "x":16, "y":2},
+                {"label":"L33", "x":5, "y":3},
+                {"label":"L34", "x":6, "y":3},
+                {"label":"L31", "x":7, "y":3},
+                {"label":"R33", "x":9, "y":3},
+                {"label":"R34", "x":10, "y":3},
+                {"label":"R31", "x":11, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h b/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
new file mode 100644
index 0000000000..4b1bae3ca0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
@@ -0,0 +1,54 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifndef TAPPING_TERM
+/**
+ * \brief Configure the global tapping term (default: 200ms).
+ *
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#    define TAPPING_TERM 200
+#endif // TAPPING_TERM
+
+/* RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Disable control of RGB matrix by keycodes (must use firmware implementation
+// to control the feature).
+#    define RGB_MATRIX_DISABLE_KEYCODES
+
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fee8d87ad6
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+};
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_charybdis_3x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       KC_LGUI,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_RGUI,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_RCTL,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  KC_BSPC,  KC_SPC,   LOWER,      RAISE,  KC_ENT
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_LOWER] = LAYOUT_charybdis_3x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       XXXXXXX, RGB_TOG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX,    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,    KC_4,    KC_5,    KC_6, KC_PMNS, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS, XXXXXXX,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_RAISE] = LAYOUT_charybdis_3x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  _______, _______, XXXXXXX,    _______, XXXXXXX
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+};
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md b/keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md
new file mode 100644
index 0000000000..8b407f68a2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+# Charybdis Mini (3x6) default keymap
+
+> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout.
+
+The Charydbis Mini (3x6) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap.
+
+This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
new file mode 100644
index 0000000000..abbf492089
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifdef VIA_ENABLE
+/* VIA configuration. */
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 4
+#endif // VIA_ENABLE
+
+/* Disable unused features. */
+#define NO_ACTION_ONESHOT
+
+#ifndef TAPPING_TERM
+/**
+ * \brief Configure the global tapping term (default: 200ms).
+ *
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#    define TAPPING_TERM 200
+#endif // TAPPING_TERM
+
+/* Charybdis-specific features. */
+
+#ifdef POINTING_DEVICE_ENABLE
+// Automatically enable the pointer layer when moving the trackball.  See also:
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
+// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#endif // POINTING_DEVICE_ENABLE
+
+/* RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Disable control of RGB matrix by keycodes (must use firmware implementation
+// to control the feature).
+#    define RGB_MATRIX_DISABLE_KEYCODES
+
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
new file mode 100644
index 0000000000..edfce673fb
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
@@ -0,0 +1,148 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+    LAYER_POINTER,
+};
+
+/** \brief Automatically enable sniping-mode on the pointer layer. */
+#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+
+#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+static uint16_t auto_pointer_layer_timer = 0;
+
+#    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+#        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+
+#    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#endif     // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+#define PT_Z LT(LAYER_POINTER, KC_Z)
+#define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_charybdis_3x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       KC_LGUI,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_RGUI,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_RCTL,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  KC_BSPC,  KC_SPC,   LOWER,      RAISE,  KC_ENT
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_LOWER] = LAYOUT_charybdis_3x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       XXXXXXX, RGB_TOG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX,    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,    KC_4,    KC_5,    KC_6, KC_PMNS, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS, XXXXXXX,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_RAISE] = LAYOUT_charybdis_3x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  _______, _______, XXXXXXX,    _______, XXXXXXX
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_POINTER] = LAYOUT_charybdis_3x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD,    S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT,    QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  KC_BTN2, KC_BTN1, KC_BTN3,    KC_BTN3, KC_BTN1
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+};
+// clang-format on
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    if (abs(mouse_report.x) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD || abs(mouse_report.y) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD) {
+        if (auto_pointer_layer_timer == 0) {
+            layer_on(LAYER_POINTER);
+#        ifdef RGB_MATRIX_ENABLE
+            rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
+            rgb_matrix_sethsv_noeeprom(HSV_GREEN);
+#        endif // RGB_MATRIX_ENABLE
+        }
+        auto_pointer_layer_timer = timer_read();
+    }
+    return mouse_report;
+}
+
+void matrix_scan_user(void) {
+    if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
+        auto_pointer_layer_timer = 0;
+        layer_off(LAYER_POINTER);
+#        ifdef RGB_MATRIX_ENABLE
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
+#        endif // RGB_MATRIX_ENABLE
+    }
+}
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#    ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
+layer_state_t layer_state_set_user(layer_state_t state) {
+    charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#    endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
+#endif     // POINTING_DEVICE_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+// Forward-declare this helper function since it is defined in rgb_matrix.c.
+void rgb_matrix_update_pwm_buffers(void);
+#endif
+
+void shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(1);
+    rgblight_setrgb_red();
+#endif // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(RGB_RED);
+    rgb_matrix_update_pwm_buffers();
+#endif // RGB_MATRIX_ENABLE
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/readme.md b/keyboards/bastardkb/charybdis/3x6/keymaps/via/readme.md
new file mode 100644
index 0000000000..fba00cd996
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/readme.md
@@ -0,0 +1,57 @@
+# Charybdis Mini (3x6) `via` keymap
+
+The Charydbis Mini (3x6) `via` keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap, with some features and changes specific to the Charybdis.
+
+This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
+
+## Customizing the keymap
+
+### Dynamic DPI scaling
+
+Use the following keycodes to change the default DPI:
+
+-   `POINTER_DEFAULT_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_DEFAULT_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 16 possible values for the sniping mode DPI. See the [Charybdis documentation](../../README.md) for more information.
+
+Use the following keycodes to change the sniping mode DPI:
+
+-   `POINTER_SNIPING_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_SNIPING_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 4 possible values for the sniping mode DPI. See the [Charybdis documentation](../../README.md) for more information.
+
+### Drag-scroll
+
+Use the `DRAGSCROLL_MODE` keycode to enable drag-scroll on hold. Use the `DRAGSCROLL_TOGGLE` keycode to enable/disable drag-scroll on key press.
+
+### Sniping
+
+Use the `SNIPING_MODE` keycode to enable sniping mode on hold. Use the `SNIPING_TOGGLE` keycode to enable/disable sniping mode on key press.
+
+Change the value of `CHARYBDIS_AUTO_SNIPING_ON_LAYER` to automatically enable sniping mode on layer change. By default, sniping mode is enabled on the pointer layer:
+
+```c
+#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+```
+
+### Auto pointer layer
+
+The pointer layer can be automatically enabled when moving the trackball. To enable or disable this behavior, add or remove the following define:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+```
+
+By default, the layer is turned off 1 second after the last registered trackball movement:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+```
+
+The trigger sensibility can also be tuned. The lower the value, the more sensible the trigger:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+```
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/rules.mk b/keyboards/bastardkb/charybdis/3x6/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/readme.md b/keyboards/bastardkb/charybdis/3x6/readme.md
new file mode 100644
index 0000000000..c6385ed8f1
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/readme.md
@@ -0,0 +1,15 @@
+# Charybdis Nano (3x6)
+
+An ergonomic keyboard with integrated trackball.
+
+The Charybdis is available in 4x6, 3x6 and 3x5 form factor at [bastardkb.com](https://bastardkb.com).
+
+## Keymaps
+
+### [`default`](keymaps/default)
+
+A simple QWERTY layout with 4 layers.
+
+### [`via`](keymaps/via)
+
+A [Miryoku-inspired](https://github.com/manna-harbour/miryoku), feature-rich, keymap with VIA support.
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
new file mode 100644
index 0000000000..05746cf17e
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { B7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { D5, C7, F0, D7, E6, B4 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { F0, C6, D4, B5 }
+#define MATRIX_COL_PINS_RIGHT \
+    { F1, C7, B7, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
new file mode 100644
index 0000000000..bf7f1a35f2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Elite-C",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
new file mode 100644
index 0000000000..54406bcc1d
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -0,0 +1,35 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
new file mode 100644
index 0000000000..edd167446b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
new file mode 100644
index 0000000000..239a10f8a3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Elite-C",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
new file mode 100644
index 0000000000..54406bcc1d
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -0,0 +1,35 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
new file mode 100644
index 0000000000..9c4ced817a
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* RGB settings. */
+#define RGB_DI_PIN GP0
+
+/* SPI & PMW3360 settings. */
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP18
+#define SPI_MOSI_PIN GP19
+#define SPI_MISO_PIN GP20
+#define PMW33XX_CS_PIN GP14
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
new file mode 100644
index 0000000000..7f3997158f
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Splinky",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h
new file mode 100644
index 0000000000..0fdd67c3a2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk
new file mode 100644
index 0000000000..6ab474a76f
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c
index 6cd8fffee7..85e8b5fdd1 100644
--- a/keyboards/bastardkb/charybdis/4x6/4x6.c
+++ b/keyboards/bastardkb/charybdis/4x6/4x6.c
@@ -36,6 +36,10 @@
  *                       26  27  28     53  54  XX
  *                           25  24     55  XX
  *                     ╰────────────╯ ╰────────────╯
+ *
+ * Note: the LED config simulates 58 LEDs instead of the actual 56 to prevent
+ * confusion when testing LEDs during assembly when handedness is not set
+ * correctly.  Those fake LEDs are bound to the physical bottom-left corner.
  */
 led_config_t g_led_config = { {
     /* Key Matrix to LED index. */
@@ -70,6 +74,7 @@ led_config_t g_led_config = { {
     /* index=45 */ { 160,   0 }, { 160,  12 }, { 160,  24 }, { 160,  36 },
     /* index=49 */ { 144,   0 }, { 144,  12 }, { 144,  24 }, { 144,  36 },
     /* index=53 */ { 112,  52 }, { 128,  64 }, { 112,  64 },
+    /* index=56 */ {   0,   0 }, {   0,   0 },
 }, {
     /* LED index to flag. */
     // Left split.
@@ -89,6 +94,7 @@ led_config_t g_led_config = { {
     /* index=45 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
     /* index=49 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
     /* index=53 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
+    /* index=55 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER,                    // Thumb cluster fakes
 } };
 #endif
 // clang-format on
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
new file mode 100644
index 0000000000..2514a52fb0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { B15, A2, B8, A8, B9 }
+#define MATRIX_COL_PINS \
+    { B0, B1, B10, B3, B4, B5 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
+
+/* RGB settings. */
+#define RGB_DI_PIN A1
+#define WS2812_PWM_DRIVER PWMD2
+#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_TARGET_PERIOD 800000
+
+/* Serial configuration for split keyboard. */
+#define SERIAL_USART_TX_PIN A9
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for EEPROM and pmw3360 sensor. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
+
+/* EEPROM config. */
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN B14
+#define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
new file mode 100644
index 0000000000..a89dff0cd3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+//#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+//#define HAL_USE_GPT TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
new file mode 100644
index 0000000000..788783c679
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis (4x6) Blackpill",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
new file mode 100644
index 0000000000..1615d1bf46
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_I2C_I2C1_RX_DMA_STREAM
+#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+#undef STM32_I2C_I2C1_TX_DMA_STREAM
+#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_SPI_SPI1_RX_DMA_STREAM
+#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
+#undef STM32_SPI_SPI1_TX_DMA_STREAM
+#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+// #undef STM32_SERIAL_USE_USART2
+// #define STM32_SERIAL_USE_USART2 TRUE
+
+// #undef STM32_UART_USART2_RX_DMA_STREAM
+// #define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+// #undef STM32_UART_USART2_TX_DMA_STREAM
+// #define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+
+#undef STM32_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/readme.md b/keyboards/bastardkb/charybdis/4x6/blackpill/readme.md
new file mode 100644
index 0000000000..bbae15bb85
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/readme.md
@@ -0,0 +1,3 @@
+# Charybdis (4x6) BlackPill
+
+An ergonomic keyboard with integrated trackball, with BlackPill (STM32F411) mod.
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
new file mode 100644
index 0000000000..6123ec58b7
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -0,0 +1,40 @@
+# MCU name
+MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported.
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
+# trackball side).
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 6760129ef8..f0c1f48cdf 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -18,55 +18,24 @@
 
 #pragma once
 
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1833
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT Charybdis
+#include "config_common.h"
 
 /* Key matrix configuration. */
-
-// Rows are doubled-up.
-#define MATRIX_ROWS 10
+#define MATRIX_ROWS 10 // Rows are doubled-up.
 #define MATRIX_COLS 6
 
-// Wiring configuration for each half.
-#define MATRIX_ROW_PINS \
-    { F1, B7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { D5, C7, F0, D7, E6, B4 }
-
-#define MATRIX_ROW_PINS_RIGHT \
-    { D5, F0, C6, D4, B5 }
-#define MATRIX_COL_PINS_RIGHT \
-    { F1, C7, B7, D7, E6, B4 }
-
 #define DIODE_DIRECTION ROW2COL
 
-#define ROTATIONAL_TRANSFORM_ANGLE -25
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-/* Bootmagic Lite configuration. */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 5
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-
-/* serial.c configuration (for split keyboard) */
-#define SOFT_SERIAL_PIN D2
-
-/* Set 0 if debouncing isn't needed */
+/* Set 0 if debouncing isn't needed. */
 #define DEBOUNCE 5
 
-/* PMW33XX settings. */
-#define PMW33XX_CS_PIN B0
+/* Trackball angle adjustment. */
+#define ROTATIONAL_TRANSFORM_ANGLE -25
 
-#define RGB_DI_PIN D3
-#define RGBLED_NUM 56
+/* RGB settings. */
+#define RGBLED_NUM 58
 #define RGBLED_SPLIT \
-    { 29, 27 }
+    { 29, 29 }
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
index 956dfe88f5..4bd0983709 100644
--- a/keyboards/bastardkb/charybdis/4x6/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -1,7 +1,8 @@
 {
-    "keyboard_name": "Charybdis",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com/charybdis",
+    "usb": {
+        "pid": "0x1833",
+    },
     "layouts": {
         "LAYOUT_charybdis_4x6": {
             "layout": [
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
index 1d3142faac..e0cee41221 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PEQL,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,   QK_BOOT,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
+      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______,
                                            XXXXXXX, XXXXXXX,      KC_P0
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        KC_MPLY, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,      QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   _______, _______, XXXXXXX,    _______, XXXXXXX,
                                            _______, _______,    XXXXXXX
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
index 75eb2240f3..c31e39261e 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
@@ -19,7 +19,7 @@
 #ifdef VIA_ENABLE
 /* VIA configuration. */
 #    define DYNAMIC_KEYMAP_LAYER_COUNT 4
-#endif  // VIA_ENABLE
+#endif // VIA_ENABLE
 
 /* Disable unused features. */
 #define NO_ACTION_ONESHOT
@@ -33,21 +33,16 @@
  * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
  */
 #    define TAPPING_TERM 200
-#endif  // TAPPING_TERM
+#endif // TAPPING_TERM
 
 /* Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
-// Enable pointer acceleration, which increases the speed by ~2x for large
-// displacement, while maintaining 1x speed for slow movements.
-// - `CHARYBDIS_POINTER_ACCELERATION_FACTOR`
-#    define CHARYBDIS_POINTER_ACCELERATION_ENABLE
-
 // Automatically enable the pointer layer when moving the trackball.  See also:
 // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
 // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
 // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
-#endif  // POINTING_DEVICE_ENABLE
+#endif // POINTING_DEVICE_ENABLE
 
 /* RGB Matrix. */
 
@@ -69,4 +64,4 @@
 #    define RGB_MATRIX_STARTUP_SAT 255
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif  // RGB_MATRIX_ENABLE
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
index cf24fea3c0..8c55855af1 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 #ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 #    include "timer.h"
-#endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 
 enum charybdis_keymap_layers {
     LAYER_BASE = 0,
@@ -35,18 +35,25 @@ static uint16_t auto_pointer_layer_timer = 0;
 
 #    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
 #        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
-#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
 
 #    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
 #        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
-#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
-#endif      // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#endif     // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 
 #define LOWER MO(LAYER_LOWER)
 #define RAISE MO(LAYER_RAISE)
 #define PT_Z LT(LAYER_POINTER, KC_Z)
 #define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
 
+#ifndef POINTING_DEVICE_ENABLE
+#    define DRGSCRL KC_NO
+#    define DPI_MOD KC_NO
+#    define S_D_MOD KC_NO
+#    define SNIPING KC_NO
+#endif // !POINTING_DEVICE_ENABLE
+
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [LAYER_BASE] = LAYOUT_charybdis_4x6(
@@ -102,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST,   QK_BOOT,      QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
+       XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT,    QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   KC_BTN2, KC_BTN1, KC_BTN3,    KC_BTN3, KC_BTN1,
                                            XXXXXXX, KC_BTN2,    KC_BTN2
@@ -120,33 +127,31 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
 #        ifdef RGB_MATRIX_ENABLE
             rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
             rgb_matrix_sethsv_noeeprom(HSV_GREEN);
-#        endif  // RGB_MATRIX_ENABLE
+#        endif // RGB_MATRIX_ENABLE
         }
         auto_pointer_layer_timer = timer_read();
     }
     return mouse_report;
 }
 
-void matrix_scan_kb(void) {
+void matrix_scan_user(void) {
     if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
         auto_pointer_layer_timer = 0;
         layer_off(LAYER_POINTER);
 #        ifdef RGB_MATRIX_ENABLE
         rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
-#        endif  // RGB_MATRIX_ENABLE
+#        endif // RGB_MATRIX_ENABLE
     }
-    matrix_scan_user();
 }
-#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#    endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 
 #    ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    state = layer_state_set_user(state);
+layer_state_t layer_state_set_user(layer_state_t state) {
     charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
     return state;
 }
-#    endif  // CHARYBDIS_AUTO_SNIPING_ON_LAYER
-#endif      // POINTING_DEVICE_ENABLE
+#    endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
+#endif     // POINTING_DEVICE_ENABLE
 
 #ifdef RGB_MATRIX_ENABLE
 // Forward-declare this helper function since it is defined in rgb_matrix.c.
@@ -158,9 +163,9 @@ void shutdown_user(void) {
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(1);
     rgblight_setrgb_red();
-#endif  // RGBLIGHT_ENABLE
+#endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(RGB_RED);
     rgb_matrix_update_pwm_buffers();
-#endif  // RGB_MATRIX_ENABLE
+#endif // RGB_MATRIX_ENABLE
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
new file mode 100644
index 0000000000..15044ef645
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F1, B7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { D5, C7, F0, D7, E6, B4 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { D5, F0, C6, D4, B5 }
+#define MATRIX_COL_PINS_RIGHT \
+    { F1, C7, B7, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
new file mode 100644
index 0000000000..4ea658a7d9
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis (4x6) Elite-C",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
similarity index 94%
rename from keyboards/bastardkb/charybdis/4x6/rules.mk
rename to keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
index e137f5d4cc..fa5fe80405 100644
--- a/keyboards/bastardkb/charybdis/4x6/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
@@ -23,15 +23,14 @@ RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by def
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812
 
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
-
 # Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
 # trackball side).
 SPLIT_KEYBOARD = yes
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
-# https://qmk.fm/changes/2018-11-16-use-a-single-endpoint-for-hid-reports
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
new file mode 100644
index 0000000000..891e511ccb
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F4, F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+
+/* PMW3360 settings. */
+#define PMW33XX_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
new file mode 100644
index 0000000000..151c0e1ca3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis (4x6) Elite-C",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
new file mode 100644
index 0000000000..fa5fe80405
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported.
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
+# trackball side).
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
new file mode 100644
index 0000000000..e17ec49726
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP29, GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* RGB settings. */
+#define RGB_DI_PIN GP0
+
+/* SPI & PMW3360 settings. */
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP18
+#define SPI_MOSI_PIN GP19
+#define SPI_MISO_PIN GP20
+#define PMW33XX_CS_PIN GP14
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
new file mode 100644
index 0000000000..0004eb81c9
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis (4x6) Splinky",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h
new file mode 100644
index 0000000000..0fdd67c3a2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk
new file mode 100644
index 0000000000..13c1b39961
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c
index 29603042b2..d0619ef172 100644
--- a/keyboards/bastardkb/charybdis/charybdis.c
+++ b/keyboards/bastardkb/charybdis/charybdis.c
@@ -23,43 +23,39 @@
 
 #ifdef CONSOLE_ENABLE
 #    include "print.h"
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 #ifdef POINTING_DEVICE_ENABLE
 #    ifndef CHARYBDIS_MINIMUM_DEFAULT_DPI
 #        define CHARYBDIS_MINIMUM_DEFAULT_DPI 400
-#    endif  // CHARYBDIS_MINIMUM_DEFAULT_DPI
+#    endif // CHARYBDIS_MINIMUM_DEFAULT_DPI
 
 #    ifndef CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
 #        define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
-#    endif  // CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
+#    endif // CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
 
 #    ifndef CHARYBDIS_MINIMUM_SNIPING_DPI
 #        define CHARYBDIS_MINIMUM_SNIPING_DPI 200
-#    endif  // CHARYBDIS_MINIMUM_SNIPER_MODE_DPI
+#    endif // CHARYBDIS_MINIMUM_SNIPER_MODE_DPI
 
 #    ifndef CHARYBDIS_SNIPING_DPI_CONFIG_STEP
 #        define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
-#    endif  // CHARYBDIS_SNIPING_DPI_CONFIG_STEP
+#    endif // CHARYBDIS_SNIPING_DPI_CONFIG_STEP
 
 // Fixed DPI for drag-scroll.
 #    ifndef CHARYBDIS_DRAGSCROLL_DPI
 #        define CHARYBDIS_DRAGSCROLL_DPI 100
-#    endif  // CHARYBDIS_DRAGSCROLL_DPI
+#    endif // CHARYBDIS_DRAGSCROLL_DPI
 
 #    ifndef CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
 #        define CHARYBDIS_DRAGSCROLL_BUFFER_SIZE 6
-#    endif  // !CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
-
-#    ifndef CHARYBDIS_POINTER_ACCELERATION_FACTOR
-#        define CHARYBDIS_POINTER_ACCELERATION_FACTOR 24
-#    endif  // !CHARYBDIS_POINTER_ACCELERATION_FACTOR
+#    endif // !CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
 
 typedef union {
     uint8_t raw;
     struct {
-        uint8_t pointer_default_dpi : 4;  // 16 steps available.
-        uint8_t pointer_sniping_dpi : 2;  // 4 steps available.
+        uint8_t pointer_default_dpi : 4; // 16 steps available.
+        uint8_t pointer_sniping_dpi : 2; // 4 steps available.
         bool    is_dragscroll_enabled : 1;
         bool    is_sniping_enabled : 1;
     } __attribute__((packed));
@@ -89,13 +85,19 @@ static void read_charybdis_config_from_eeprom(charybdis_config_t* config) {
  * resets these 2 values to `false` since it does not make sense to persist
  * these across reboots of the board.
  */
-static void write_charybdis_config_to_eeprom(charybdis_config_t* config) { eeconfig_update_kb(config->raw); }
+static void write_charybdis_config_to_eeprom(charybdis_config_t* config) {
+    eeconfig_update_kb(config->raw);
+}
 
 /** \brief Return the current value of the pointer's default DPI. */
-static uint16_t get_pointer_default_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_default_dpi * CHARYBDIS_DEFAULT_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_DEFAULT_DPI; }
+static uint16_t get_pointer_default_dpi(charybdis_config_t* config) {
+    return (uint16_t)config->pointer_default_dpi * CHARYBDIS_DEFAULT_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_DEFAULT_DPI;
+}
 
 /** \brief Return the current value of the pointer's sniper-mode DPI. */
-static uint16_t get_pointer_sniping_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_sniping_dpi * CHARYBDIS_SNIPING_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_SNIPING_DPI; }
+static uint16_t get_pointer_sniping_dpi(charybdis_config_t* config) {
+    return (uint16_t)config->pointer_sniping_dpi * CHARYBDIS_SNIPING_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_SNIPING_DPI;
+}
 
 /** \brief Set the appropriate DPI for the input config. */
 static void maybe_update_pointing_device_cpi(charybdis_config_t* config) {
@@ -130,64 +132,54 @@ static void step_pointer_sniping_dpi(charybdis_config_t* config, bool forward) {
     maybe_update_pointing_device_cpi(config);
 }
 
-uint16_t charybdis_get_pointer_default_dpi(void) { return get_pointer_default_dpi(&g_charybdis_config); }
+uint16_t charybdis_get_pointer_default_dpi(void) {
+    return get_pointer_default_dpi(&g_charybdis_config);
+}
 
-uint16_t charybdis_get_pointer_sniping_dpi(void) { return get_pointer_sniping_dpi(&g_charybdis_config); }
+uint16_t charybdis_get_pointer_sniping_dpi(void) {
+    return get_pointer_sniping_dpi(&g_charybdis_config);
+}
 
-void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward) { step_pointer_default_dpi(&g_charybdis_config, forward); }
+void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward) {
+    step_pointer_default_dpi(&g_charybdis_config, forward);
+}
 
 void charybdis_cycle_pointer_default_dpi(bool forward) {
     step_pointer_default_dpi(&g_charybdis_config, forward);
     write_charybdis_config_to_eeprom(&g_charybdis_config);
 }
 
-void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward) { step_pointer_sniping_dpi(&g_charybdis_config, forward); }
+void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward) {
+    step_pointer_sniping_dpi(&g_charybdis_config, forward);
+}
 
 void charybdis_cycle_pointer_sniping_dpi(bool forward) {
     step_pointer_sniping_dpi(&g_charybdis_config, forward);
     write_charybdis_config_to_eeprom(&g_charybdis_config);
 }
 
-bool charybdis_get_pointer_sniping_enabled(void) { return g_charybdis_config.is_sniping_enabled; }
+bool charybdis_get_pointer_sniping_enabled(void) {
+    return g_charybdis_config.is_sniping_enabled;
+}
 
 void charybdis_set_pointer_sniping_enabled(bool enable) {
     g_charybdis_config.is_sniping_enabled = enable;
     maybe_update_pointing_device_cpi(&g_charybdis_config);
 }
 
-bool charybdis_get_pointer_dragscroll_enabled(void) { return g_charybdis_config.is_dragscroll_enabled; }
+bool charybdis_get_pointer_dragscroll_enabled(void) {
+    return g_charybdis_config.is_dragscroll_enabled;
+}
 
 void charybdis_set_pointer_dragscroll_enabled(bool enable) {
     g_charybdis_config.is_dragscroll_enabled = enable;
     maybe_update_pointing_device_cpi(&g_charybdis_config);
 }
 
-#    ifndef CONSTRAIN_HID
-#        define CONSTRAIN_HID(value) ((value) < XY_REPORT_MIN ? XY_REPORT_MIN : ((value) > XY_REPORT_MAX ? XY_REPORT_MAX : (value)))
-#    endif  // !CONSTRAIN_HID
-
-/**
- * \brief Add optional acceleration effect.
- *
- * If `CHARYBDIS_ENABLE_POINTER_ACCELERATION` is defined, add a simple and naive
- * acceleration effect to the provided value.  Return the value unchanged
- * otherwise.
- */
-#    ifndef DISPLACEMENT_WITH_ACCELERATION
-#        ifdef CHARYBDIS_POINTER_ACCELERATION_ENABLE
-#            define DISPLACEMENT_WITH_ACCELERATION(d) (CONSTRAIN_HID(d > 0 ? d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d : -d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d))
-#        else  // !CHARYBDIS_POINTER_ACCELERATION_ENABLE
-#            define DISPLACEMENT_WITH_ACCELERATION(d) (d)
-#        endif  // CHARYBDIS_POINTER_ACCELERATION_ENABLE
-#    endif      // !DISPLACEMENT_WITH_ACCELERATION
-
 /**
  * \brief Augment the pointing device behavior.
  *
- * Implement the Charybdis-specific features for pointing devices:
- *   - Drag-scroll
- *   - Sniping
- *   - Acceleration
+ * Implement drag-scroll.
  */
 static void pointing_device_task_charybdis(report_mouse_t* mouse_report) {
     static int16_t scroll_buffer_x = 0;
@@ -197,12 +189,12 @@ static void pointing_device_task_charybdis(report_mouse_t* mouse_report) {
         scroll_buffer_x -= mouse_report->x;
 #    else
         scroll_buffer_x += mouse_report->x;
-#    endif  // CHARYBDIS_DRAGSCROLL_REVERSE_X
+#    endif // CHARYBDIS_DRAGSCROLL_REVERSE_X
 #    ifdef CHARYBDIS_DRAGSCROLL_REVERSE_Y
         scroll_buffer_y -= mouse_report->y;
 #    else
         scroll_buffer_y += mouse_report->y;
-#    endif  // CHARYBDIS_DRAGSCROLL_REVERSE_Y
+#    endif // CHARYBDIS_DRAGSCROLL_REVERSE_Y
         mouse_report->x = 0;
         mouse_report->y = 0;
         if (abs(scroll_buffer_x) > CHARYBDIS_DRAGSCROLL_BUFFER_SIZE) {
@@ -213,9 +205,6 @@ static void pointing_device_task_charybdis(report_mouse_t* mouse_report) {
             mouse_report->v = scroll_buffer_y > 0 ? 1 : -1;
             scroll_buffer_y = 0;
         }
-    } else if (!g_charybdis_config.is_sniping_enabled) {
-        mouse_report->x = DISPLACEMENT_WITH_ACCELERATION(mouse_report->x);
-        mouse_report->y = DISPLACEMENT_WITH_ACCELERATION(mouse_report->y);
     }
 }
 
@@ -234,9 +223,9 @@ static bool has_shift_mod(void) {
     return mod_config(get_mods()) & MOD_MASK_SHIFT;
 #        else
     return mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT;
-#        endif  // NO_ACTION_ONESHOT
+#        endif // NO_ACTION_ONESHOT
 }
-#    endif  // POINTING_DEVICE_ENABLE && !NO_CHARYBDIS_KEYCODES
+#    endif // POINTING_DEVICE_ENABLE && !NO_CHARYBDIS_KEYCODES
 
 /**
  * \brief Outputs the Charybdis configuration to console.
@@ -252,16 +241,16 @@ static bool has_shift_mod(void) {
 static void debug_charybdis_config_to_console(charybdis_config_t* config) {
 #    ifdef CONSOLE_ENABLE
     dprintf("(charybdis) process_record_kb: config = {\n"
-            "\traw = 0x%04X,\n"
+            "\traw = 0x%X,\n"
             "\t{\n"
             "\t\tis_dragscroll_enabled=%b\n"
             "\t\tis_sniping_enabled=%b\n"
-            "\t\tdefault_dpi=0x%02X (%ld)\n"
-            "\t\tsniping_dpi=0x%01X (%ld)\n"
+            "\t\tdefault_dpi=0x%X (%ld)\n"
+            "\t\tsniping_dpi=0x%X (%ld)\n"
             "\t}\n"
             "}\n",
             config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
-#    endif  // CONSOLE_ENABLE
+#    endif // CONSOLE_ENABLE
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
@@ -313,7 +302,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
             }
             break;
     }
-#        endif  // !NO_CHARYBDIS_KEYCODES
+#        endif // !NO_CHARYBDIS_KEYCODES
 #        ifndef MOUSEKEY_ENABLE
     // Simulate mouse keys if full support is not enabled (reduces firmware size
     // while maintaining support for mouse keys).
@@ -323,8 +312,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
         pointing_device_set_report(mouse_report);
         pointing_device_send();
     }
-#        endif  // !MOUSEKEY_ENABLE
-#    endif      // POINTING_DEVICE_ENABLE
+#        endif // !MOUSEKEY_ENABLE
+#    endif     // POINTING_DEVICE_ENABLE
     debug_charybdis_config_to_console(&g_charybdis_config);
     return true;
 }
@@ -360,29 +349,44 @@ void keyboard_post_init_kb(void) {
 #    ifdef CHARYBDIS_CONFIG_SYNC
 void housekeeping_task_kb(void) {
     if (is_keyboard_master()) {
-        // Keep track of the last state, so that we can tell if we need to propagate to slave
+        // Keep track of the last state, so that we can tell if we need to propagate to slave.
         static charybdis_config_t last_charybdis_config = {0};
         static uint32_t           last_sync             = 0;
         bool                      needs_sync            = false;
 
-        // Check if the state values are different
+        // Check if the state values are different.
         if (memcmp(&g_charybdis_config, &last_charybdis_config, sizeof(g_charybdis_config))) {
             needs_sync = true;
             memcpy(&last_charybdis_config, &g_charybdis_config, sizeof(g_charybdis_config));
         }
-        // Send to slave every 500ms regardless of state change
+        // Send to slave every 500ms regardless of state change.
         if (timer_elapsed32(last_sync) > 500) {
             needs_sync = true;
         }
 
-        // Perform the sync if requested
+        // Perform the sync if requested.
         if (needs_sync) {
             if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(g_charybdis_config), &g_charybdis_config)) {
                 last_sync = timer_read32();
             }
         }
     }
-    // no need for user function, is called already
+    // No need to invoke the user-specific callback, as it's been called
+    // already.
 }
 #    endif // CHARYBDIS_CONFIG_SYNC
-#endif  // POINTING_DEVICE_ENABLE
+#endif     // POINTING_DEVICE_ENABLE
+
+#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill) || defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
+void keyboard_pre_init_kb(void) {
+    setPinInputHigh(A0);
+    keyboard_pre_init_user();
+}
+
+void matrix_scan_kb(void) {
+    if (!readPin(A0)) {
+        reset_keyboard();
+    }
+    matrix_scan_user();
+}
+#endif // KEYBOARD_bastardkb_charybdis_3x5_blackpill || KEYBOARD_bastardkb_charybdis_4x6_blackpill
diff --git a/keyboards/bastardkb/charybdis/charybdis.h b/keyboards/bastardkb/charybdis/charybdis.h
index 42423c0c92..f624c554f4 100644
--- a/keyboards/bastardkb/charybdis/charybdis.h
+++ b/keyboards/bastardkb/charybdis/charybdis.h
@@ -21,6 +21,8 @@
 // clang-format off
 #if defined(KEYBOARD_bastardkb_charybdis_3x5)
 #    include "3x5.h"
+#elif defined(KEYBOARD_bastardkb_charybdis_3x6)
+#    include "3x6.h"
 #elif defined(KEYBOARD_bastardkb_charybdis_4x6)
 #    include "4x6.h"
 #else
@@ -37,7 +39,7 @@ enum charybdis_keycodes {
     POINTER_DEFAULT_DPI_FORWARD = USER00,
 #        else
     POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
-#        endif  // VIA_ENABLE
+#        endif // VIA_ENABLE
     POINTER_DEFAULT_DPI_REVERSE,
     POINTER_SNIPING_DPI_FORWARD,
     POINTER_SNIPING_DPI_REVERSE,
@@ -56,7 +58,7 @@ enum charybdis_keycodes {
 #        define SNP_TOG SNIPING_MODE_TOGGLE
 #        define DRGSCRL DRAGSCROLL_MODE
 #        define DRG_TOG DRAGSCROLL_MODE_TOGGLE
-#    endif  // !NO_CHARYBDIS_KEYCODES
+#    endif // !NO_CHARYBDIS_KEYCODES
 
 /** \brief Return the current DPI value for the pointer's default mode. */
 uint16_t charybdis_get_pointer_default_dpi(void);
@@ -123,4 +125,4 @@ bool charybdis_get_pointer_dragscroll_enabled(void);
  * are translated into horizontal and vertical scroll movements.
  */
 void charybdis_set_pointer_dragscroll_enabled(bool enable);
-#endif  // POINTING_DEVICE_ENABLE
+#endif // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/charybdis/post_config.h b/keyboards/bastardkb/charybdis/post_config.h
index b769722b64..4cfd24c4b6 100644
--- a/keyboards/bastardkb/charybdis/post_config.h
+++ b/keyboards/bastardkb/charybdis/post_config.h
@@ -30,85 +30,85 @@
 #ifndef MOUSEKEY_MOVE_DELTA
 #    ifndef MK_KINETIC_SPEED
 #        define MOUSEKEY_MOVE_DELTA 5
-#    else  // MK_KINETIC_SPEED
+#    else // MK_KINETIC_SPEED
 #        define MOUSEKEY_MOVE_DELTA 25
-#    endif  // !MK_KINETIC_SPEED
-#endif      // !MOUSEKEY_MOVE_DELTA
+#    endif // !MK_KINETIC_SPEED
+#endif     // !MOUSEKEY_MOVE_DELTA
 
 #ifndef MOUSEKEY_DELAY
 #    ifndef MK_KINETIC_SPEED
 #        define MOUSEKEY_DELAY 300
-#    else  // MK_KINETIC_SPEED
+#    else // MK_KINETIC_SPEED
 #        define MOUSEKEY_DELAY 8
-#    endif  // !MK_KINETIC_SPEED
-#endif      // !MOUSEKEY_DELAY
+#    endif // !MK_KINETIC_SPEED
+#endif     // !MOUSEKEY_DELAY
 
 #ifndef MOUSEKEY_INTERVAL
 #    ifndef MK_KINETIC_SPEED
 #        define MOUSEKEY_INTERVAL 50
-#    else  // MK_KINETIC_SPEED
+#    else // MK_KINETIC_SPEED
 #        define MOUSEKEY_INTERVAL 20
-#    endif  // !MK_KINETIC_SPEED
-#endif      // !MOUSEKEY_INTERNAL
+#    endif // !MK_KINETIC_SPEED
+#endif     // !MOUSEKEY_INTERNAL
 
 #ifndef MOUSEKEY_MAX_SPEED
 #    define MOUSEKEY_MAX_SPEED 7
-#endif  // !MOUSEKEY_MAX_SPEED
+#endif // !MOUSEKEY_MAX_SPEED
 
 #ifndef MOUSEKEY_TIME_TO_MAX
 #    define MOUSEKEY_TIME_TO_MAX 60
-#endif  // !MOUSEKEY_TIME_TO_MAX
+#endif // !MOUSEKEY_TIME_TO_MAX
 
 #ifndef MOUSEKEY_INITIAL_SPEED
 #    define MOUSEKEY_INITIAL_SPEED 100
-#endif  // !MOUSEKEY_INITIAL_SPEED
+#endif // !MOUSEKEY_INITIAL_SPEED
 
 #ifndef MOUSEKEY_BASE_SPEED
 #    define MOUSEKEY_BASE_SPEED 1000
-#endif  // !MOUSEKEY_BASE_SPEED
+#endif // !MOUSEKEY_BASE_SPEED
 
 #ifndef MOUSEKEY_DECELERATED_SPEED
 #    define MOUSEKEY_DECELERATED_SPEED 400
-#endif  // !MOUSEKEY_DECELERATED_SPEED
+#endif // !MOUSEKEY_DECELERATED_SPEED
 
 #ifndef MOUSEKEY_ACCELERATED_SPEED
 #    define MOUSEKEY_ACCELERATED_SPEED 3000
-#endif  // !MOUSEKEY_ACCELERATED_SPEED
+#endif // !MOUSEKEY_ACCELERATED_SPEED
 
 /* Mouse scroll config. */
 
 #ifndef MOUSEKEY_WHEEL_DELAY
 #    define MOUSEKEY_WHEEL_DELAY 15
-#endif  // !MOUSEKEY_WHEEL_DELAY
+#endif // !MOUSEKEY_WHEEL_DELAY
 
 #ifndef MOUSEKEY_WHEEL_DELTA
 #    define MOUSEKEY_WHEEL_DELTA 1
-#endif  // !MOUSEKEY_WHEEL_DELTA
+#endif // !MOUSEKEY_WHEEL_DELTA
 
 #ifndef MOUSEKEY_WHEEL_INTERVAL
 #    define MOUSEKEY_WHEEL_INTERVAL 50
-#endif  // !MOUSEKEY_WHEEL_INTERVAL
+#endif // !MOUSEKEY_WHEEL_INTERVAL
 
 #ifndef MOUSEKEY_WHEEL_MAX_SPEED
 #    define MOUSEKEY_WHEEL_MAX_SPEED 8
-#endif  // !MOUSEKEY_WHEEL_MAX_SPEED
+#endif // !MOUSEKEY_WHEEL_MAX_SPEED
 
 #ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
 #    define MOUSEKEY_WHEEL_TIME_TO_MAX 80
-#endif  // !MOUSEKEY_WHEEL_TIME_TO_MAX
+#endif // !MOUSEKEY_WHEEL_TIME_TO_MAX
 
 #ifndef MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
 #    define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 8
-#endif  // !MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
+#endif // !MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
 
 #ifndef MOUSEKEY_WHEEL_BASE_MOVEMENTS
 #    define MOUSEKEY_WHEEL_BASE_MOVEMENTS 48
-#endif  // !MOUSEKEY_WHEEL_BASE_MOVEMENTS
+#endif // !MOUSEKEY_WHEEL_BASE_MOVEMENTS
 
 #ifndef MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
 #    define MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS 48
-#endif  // !MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
+#endif // !MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
 
 #ifndef MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
 #    define MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS 8
-#endif  // !MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
+#endif // !MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
diff --git a/keyboards/bastardkb/charybdis/readme.md b/keyboards/bastardkb/charybdis/readme.md
index d786abf36e..c112c1150e 100644
--- a/keyboards/bastardkb/charybdis/readme.md
+++ b/keyboards/bastardkb/charybdis/readme.md
@@ -18,33 +18,32 @@ Check out the [keyboard build guides](https://docs.bastardkb.com) for the Charyb
 
 ## Building the firmware
 
-### Charybdis (4x6)
+**You must specify the shield version when compiling/flashing the firmware.**
+
+The template is:
+```shell
+qmk compile -kb bastardkb/charybdis/{LAYOUT}/{VERSION}/elitec -km {KEYMAP}
+```
+
+See below for populated commands per layout
 
 The `default` keymap is inspired from the original [Dactyl Manuform](../../handwired/dactyl_manuform) layout.
 
-```shell
-qmk compile -kb bastardkb/charybdis/4x6 -km default
-```
+Check out the `via` layout if you're looking for VIA support.
 
-Check out the `via` layout if you're looking for VIA support:
+### Charybdis (4x6)
 
-```shell
-qmk compile -kb bastardkb/charybdis/4x6 -km via
-```
+| Shield Version | default                                                         | via                                                             |
+|----------------|-----------------------------------------------------------------|-----------------------------------------------------------------|
+| v1             | `qmk compile -kb bastardkb/charybdis/4x6/v1/elitec -km default` | `qmk compile -kb bastardkb/charybdis/4x6/v1/elitec -km via`     |
+| v2             | `qmk compile -kb bastardkb/charybdis/4x6/v2/elitec -km default` | `qmk compile -kb bastardkb/charybdis/4x6/v2/elitec -km via` |
 
 ### Charybdis (3x5)
 
-The `default` keymap is inspired from the original [Dactyl Manuform](../../handwired/dactyl_manuform) layout.
-
-```shell
-qmk compile -kb bastardkb/charybdis/3x5 -km default
-```
-
-Check out the `via` layout if you're looking for VIA support:
-
-```shell
-qmk compile -kb bastardkb/charybdis/3x5 -km via
-```
+| Shield Version | default                                                         | via                                                             |
+|----------------|-----------------------------------------------------------------|-----------------------------------------------------------------|
+| v1             | `qmk compile -kb bastardkb/charybdis/3x5/v1/elitec -km default` | `qmk compile -kb bastardkb/charybdis/3x5/v1/elitec -km via`     |
+| v2             | `qmk compile -kb bastardkb/charybdis/3x5/v2/elitec -km default` | `qmk compile -kb bastardkb/charybdis/3x5/v2/elitec -km via` |
 
 ## Customizing the firmware
 
@@ -73,7 +72,7 @@ Drag-scroll enables scrolling with the trackball. When drag-scroll is enabled, t
 
 Call `charybdis_set_pointer_dragscroll_enabled(bool enable)` to enable/disable drag-scroll.
 
-`charybdis_get_pointer_dragscroll_enabled()` returns whether sniping mode is currently enabled.
+`charybdis_get_pointer_dragscroll_enabled()` returns whether drag-scroll mode is currently enabled.
 
 To invert the horizontal scrolling direction, define `CHARYBDIS_DRAGSCROLL_REVERSE_X`:
 
@@ -114,20 +113,6 @@ This behavior can be further customized with the following defines:
 #define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
 ```
 
-### Acceleration
-
-By default, the pointer's movements are linear. To enable acceleration, add the following define:
-
-```c
-#define CHARYBDIS_POINTER_ACCELERATION_ENABLE
-```
-
-The acceleration factor can be further tune _via_ the `CHARYBDIS_POINTER_ACCELERATION_FACTOR`:
-
-```c
-#define CHARYBDIS_POINTER_ACCELERATION_FACTOR 24
-```
-
 ### Custom keycodes
 
 The Charybdis firmware defines a number of keycodes to leverage its features, namely:
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
new file mode 100644
index 0000000000..af59efb709
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* Key matrix configuration. */
+
+#define MATRIX_ROWS 8 // Rows are doubled-up.
+#define MATRIX_COLS 5
+
+#define DIODE_DIRECTION ROW2COL
+
+// Set 0 if debouncing isn't needed.
+#define DEBOUNCE 5
+
+/* Pointing device configuration. */
+
+// Enable use of pointing device on slave split.
+#define SPLIT_POINTING_ENABLE
+
+// Pointing device is on the right split.
+#define POINTING_DEVICE_RIGHT
+
+// Limits the frequency that the sensor is polled for motion.
+#define POINTING_DEVICE_TASK_THROTTLE_MS 10
+
+// Adjust trackpad rotation.
+#define POINTING_DEVICE_ROTATION_90
+
+// Configure for the Cirque model used on the Dilemma.
+#define CIRQUE_PINNACLE_DIAMETER_MM 35
+#define CIRQUE_PINNACLE_CURVED_OVERLAY
diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c
new file mode 100644
index 0000000000..b4d3ba5de1
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/dilemma.c
@@ -0,0 +1,326 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dilemma.h"
+
+#ifdef CONSOLE_ENABLE
+#    include "print.h"
+#endif // CONSOLE_ENABLE
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifndef DILEMMA_MINIMUM_DEFAULT_DPI
+#        define DILEMMA_MINIMUM_DEFAULT_DPI 400
+#    endif // DILEMMA_MINIMUM_DEFAULT_DPI
+
+#    ifndef DILEMMA_DEFAULT_DPI_CONFIG_STEP
+#        define DILEMMA_DEFAULT_DPI_CONFIG_STEP 200
+#    endif // DILEMMA_DEFAULT_DPI_CONFIG_STEP
+
+#    ifndef DILEMMA_MINIMUM_SNIPING_DPI
+#        define DILEMMA_MINIMUM_SNIPING_DPI 200
+#    endif // DILEMMA_MINIMUM_SNIPING_DPI
+
+#    ifndef DILEMMA_SNIPING_DPI_CONFIG_STEP
+#        define DILEMMA_SNIPING_DPI_CONFIG_STEP 100
+#    endif // DILEMMA_SNIPING_DPI_CONFIG_STEP
+
+// Fixed DPI for drag-scroll.
+#    ifndef DILEMMA_DRAGSCROLL_DPI
+#        define DILEMMA_DRAGSCROLL_DPI 100
+#    endif // DILEMMA_DRAGSCROLL_DPI
+
+#    ifndef DILEMMA_DRAGSCROLL_BUFFER_SIZE
+#        define DILEMMA_DRAGSCROLL_BUFFER_SIZE 6
+#    endif // !DILEMMA_DRAGSCROLL_BUFFER_SIZE
+
+typedef union {
+    uint8_t raw;
+    struct {
+        uint8_t pointer_default_dpi : 4; // 16 steps available.
+        uint8_t pointer_sniping_dpi : 2; // 4 steps available.
+        bool    is_dragscroll_enabled : 1;
+        bool    is_sniping_enabled : 1;
+    } __attribute__((packed));
+} dilemma_config_t;
+
+static dilemma_config_t g_dilemma_config = {0};
+
+/**
+ * \brief Set the value of `config` from EEPROM.
+ *
+ * Note that `is_dragscroll_enabled` and `is_sniping_enabled` are purposefully
+ * ignored since we do not want to persist this state to memory.  In practice,
+ * this state is always written to maximize write-performances.  Therefore, we
+ * explicitly set them to `false` in this function.
+ */
+static void read_dilemma_config_from_eeprom(dilemma_config_t* config) {
+    config->raw                   = eeconfig_read_kb() & 0xff;
+    config->is_dragscroll_enabled = false;
+    config->is_sniping_enabled    = false;
+}
+
+/**
+ * \brief Save the value of `config` to eeprom.
+ *
+ * Note that all values are written verbatim, including whether drag-scroll
+ * and/or sniper mode are enabled.  `read_dilemma_config_from_eeprom(…)`
+ * resets these 2 values to `false` since it does not make sense to persist
+ * these across reboots of the board.
+ */
+static void write_dilemma_config_to_eeprom(dilemma_config_t* config) {
+    eeconfig_update_kb(config->raw);
+}
+
+/** \brief Return the current value of the pointer's default DPI. */
+static uint16_t get_pointer_default_dpi(dilemma_config_t* config) {
+    return (uint16_t)config->pointer_default_dpi * DILEMMA_DEFAULT_DPI_CONFIG_STEP + DILEMMA_MINIMUM_DEFAULT_DPI;
+}
+
+/** \brief Return the current value of the pointer's sniper-mode DPI. */
+static uint16_t get_pointer_sniping_dpi(dilemma_config_t* config) {
+    return (uint16_t)config->pointer_sniping_dpi * DILEMMA_SNIPING_DPI_CONFIG_STEP + DILEMMA_MINIMUM_SNIPING_DPI;
+}
+
+/** \brief Set the appropriate DPI for the input config. */
+static void maybe_update_pointing_device_cpi(dilemma_config_t* config) {
+    if (config->is_dragscroll_enabled) {
+        pointing_device_set_cpi(DILEMMA_DRAGSCROLL_DPI);
+    } else if (config->is_sniping_enabled) {
+        pointing_device_set_cpi(get_pointer_sniping_dpi(config));
+    } else {
+        pointing_device_set_cpi(get_pointer_default_dpi(config));
+    }
+}
+
+/**
+ * \brief Update the pointer's default DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to DILEMMA_DEFAULT_DPI_CONFIG_STEP.
+ */
+static void step_pointer_default_dpi(dilemma_config_t* config, bool forward) {
+    config->pointer_default_dpi += forward ? 1 : -1;
+    maybe_update_pointing_device_cpi(config);
+}
+
+/**
+ * \brief Update the pointer's sniper-mode DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to DILEMMA_SNIPING_DPI_CONFIG_STEP.
+ */
+static void step_pointer_sniping_dpi(dilemma_config_t* config, bool forward) {
+    config->pointer_sniping_dpi += forward ? 1 : -1;
+    maybe_update_pointing_device_cpi(config);
+}
+
+uint16_t dilemma_get_pointer_default_dpi(void) {
+    return get_pointer_default_dpi(&g_dilemma_config);
+}
+
+uint16_t dilemma_get_pointer_sniping_dpi(void) {
+    return get_pointer_sniping_dpi(&g_dilemma_config);
+}
+
+void dilemma_cycle_pointer_default_dpi_noeeprom(bool forward) {
+    step_pointer_default_dpi(&g_dilemma_config, forward);
+}
+
+void dilemma_cycle_pointer_default_dpi(bool forward) {
+    step_pointer_default_dpi(&g_dilemma_config, forward);
+    write_dilemma_config_to_eeprom(&g_dilemma_config);
+}
+
+void dilemma_cycle_pointer_sniping_dpi_noeeprom(bool forward) {
+    step_pointer_sniping_dpi(&g_dilemma_config, forward);
+}
+
+void dilemma_cycle_pointer_sniping_dpi(bool forward) {
+    step_pointer_sniping_dpi(&g_dilemma_config, forward);
+    write_dilemma_config_to_eeprom(&g_dilemma_config);
+}
+
+bool dilemma_get_pointer_sniping_enabled(void) {
+    return g_dilemma_config.is_sniping_enabled;
+}
+
+void dilemma_set_pointer_sniping_enabled(bool enable) {
+    g_dilemma_config.is_sniping_enabled = enable;
+    maybe_update_pointing_device_cpi(&g_dilemma_config);
+}
+
+bool dilemma_get_pointer_dragscroll_enabled(void) {
+    return g_dilemma_config.is_dragscroll_enabled;
+}
+
+void dilemma_set_pointer_dragscroll_enabled(bool enable) {
+    g_dilemma_config.is_dragscroll_enabled = enable;
+    maybe_update_pointing_device_cpi(&g_dilemma_config);
+}
+
+void pointing_device_init_kb(void) {
+    maybe_update_pointing_device_cpi(&g_dilemma_config);
+    pointing_device_init_user();
+}
+
+/**
+ * \brief Augment the pointing device behavior.
+ *
+ * Implement drag-scroll.
+ */
+static void pointing_device_task_dilemma(report_mouse_t* mouse_report) {
+    static int16_t scroll_buffer_x = 0;
+    static int16_t scroll_buffer_y = 0;
+    if (g_dilemma_config.is_dragscroll_enabled) {
+#    ifdef DILEMMA_DRAGSCROLL_REVERSE_X
+        scroll_buffer_x -= mouse_report->x;
+#    else
+        scroll_buffer_x += mouse_report->x;
+#    endif // DILEMMA_DRAGSCROLL_REVERSE_X
+#    ifdef DILEMMA_DRAGSCROLL_REVERSE_Y
+        scroll_buffer_y -= mouse_report->y;
+#    else
+        scroll_buffer_y += mouse_report->y;
+#    endif // DILEMMA_DRAGSCROLL_REVERSE_Y
+        mouse_report->x = 0;
+        mouse_report->y = 0;
+        if (abs(scroll_buffer_x) > DILEMMA_DRAGSCROLL_BUFFER_SIZE) {
+            mouse_report->h = scroll_buffer_x > 0 ? 1 : -1;
+            scroll_buffer_x = 0;
+        }
+        if (abs(scroll_buffer_y) > DILEMMA_DRAGSCROLL_BUFFER_SIZE) {
+            mouse_report->v = scroll_buffer_y > 0 ? 1 : -1;
+            scroll_buffer_y = 0;
+        }
+    }
+}
+
+report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+    if (is_keyboard_master()) {
+        pointing_device_task_dilemma(&mouse_report);
+        mouse_report = pointing_device_task_user(mouse_report);
+    }
+    return mouse_report;
+}
+
+#    if defined(POINTING_DEVICE_ENABLE) && !defined(NO_DILEMMA_KEYCODES)
+/** \brief Whether SHIFT mod is enabled. */
+static bool has_shift_mod(void) {
+#        ifdef NO_ACTION_ONESHOT
+    return mod_config(get_mods()) & MOD_MASK_SHIFT;
+#        else
+    return mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT;
+#        endif // NO_ACTION_ONESHOT
+}
+#    endif // POINTING_DEVICE_ENABLE && !NO_DILEMMA_KEYCODES
+
+/**
+ * \brief Outputs the Dilemma configuration to console.
+ *
+ * Prints the in-memory configuration structure to console, for debugging.
+ * Includes:
+ *   - raw value
+ *   - drag-scroll: on/off
+ *   - sniping: on/off
+ *   - default DPI: internal table index/actual DPI
+ *   - sniping DPI: internal table index/actual DPI
+ */
+static void debug_dilemma_config_to_console(dilemma_config_t* config) {
+#    ifdef CONSOLE_ENABLE
+    dprintf("(dilemma) process_record_kb: config = {\n"
+            "\traw = 0x%X,\n"
+            "\t{\n"
+            "\t\tis_dragscroll_enabled=%b\n"
+            "\t\tis_sniping_enabled=%b\n"
+            "\t\tdefault_dpi=0x%X (%ld)\n"
+            "\t\tsniping_dpi=0x%X (%ld)\n"
+            "\t}\n"
+            "}\n",
+            config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
+#    endif // CONSOLE_ENABLE
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (!process_record_user(keycode, record)) {
+        debug_dilemma_config_to_console(&g_dilemma_config);
+        return false;
+    }
+#    ifdef POINTING_DEVICE_ENABLE
+#        ifndef NO_DILEMMA_KEYCODES
+    switch (keycode) {
+        case POINTER_DEFAULT_DPI_FORWARD:
+            if (record->event.pressed) {
+                // Step backward if shifted, forward otherwise.
+                dilemma_cycle_pointer_default_dpi(/* forward= */ !has_shift_mod());
+            }
+            break;
+        case POINTER_DEFAULT_DPI_REVERSE:
+            if (record->event.pressed) {
+                // Step forward if shifted, backward otherwise.
+                dilemma_cycle_pointer_default_dpi(/* forward= */ has_shift_mod());
+            }
+            break;
+        case POINTER_SNIPING_DPI_FORWARD:
+            if (record->event.pressed) {
+                // Step backward if shifted, forward otherwise.
+                dilemma_cycle_pointer_sniping_dpi(/* forward= */ !has_shift_mod());
+            }
+            break;
+        case POINTER_SNIPING_DPI_REVERSE:
+            if (record->event.pressed) {
+                // Step forward if shifted, backward otherwise.
+                dilemma_cycle_pointer_sniping_dpi(/* forward= */ has_shift_mod());
+            }
+            break;
+        case SNIPING_MODE:
+            dilemma_set_pointer_sniping_enabled(record->event.pressed);
+            break;
+        case SNIPING_MODE_TOGGLE:
+            if (record->event.pressed) {
+                dilemma_set_pointer_sniping_enabled(!dilemma_get_pointer_sniping_enabled());
+            }
+            break;
+        case DRAGSCROLL_MODE:
+            dilemma_set_pointer_dragscroll_enabled(record->event.pressed);
+            break;
+        case DRAGSCROLL_MODE_TOGGLE:
+            if (record->event.pressed) {
+                dilemma_set_pointer_dragscroll_enabled(!dilemma_get_pointer_dragscroll_enabled());
+            }
+            break;
+    }
+#        endif // !NO_DILEMMA_KEYCODES
+#    endif     // POINTING_DEVICE_ENABLE
+    debug_dilemma_config_to_console(&g_dilemma_config);
+    return true;
+}
+
+void eeconfig_init_kb(void) {
+    g_dilemma_config.raw                 = 0;
+    g_dilemma_config.pointer_default_dpi = 4;
+    write_dilemma_config_to_eeprom(&g_dilemma_config);
+    maybe_update_pointing_device_cpi(&g_dilemma_config);
+    eeconfig_init_user();
+}
+
+void matrix_init_kb(void) {
+    read_dilemma_config_from_eeprom(&g_dilemma_config);
+    matrix_init_user();
+}
+#endif // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h
new file mode 100644
index 0000000000..fbf54c804b
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/dilemma.h
@@ -0,0 +1,134 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+// clang-format off
+#define LAYOUT_split_3x5_2(                             \
+  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
+                 k30, k32,     k72, k70                 \
+)                                                       \
+{                                                       \
+  {   k00,   k01,   k02,   k03,   k04 },                \
+  {   k10,   k11,   k12,   k13,   k14 },                \
+  {   k20,   k21,   k22,   k23,   k24 },                \
+  {   k30, KC_NO,   k32, KC_NO, KC_NO },                \
+  {   k40,   k41,   k42,   k43,   k44 },                \
+  {   k50,   k51,   k52,   k53,   k54 },                \
+  {   k60,   k61,   k62,   k63,   k64 },                \
+  {   k70, KC_NO,   k72, KC_NO, KC_NO },                \
+}
+// clang-format on
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifndef NO_DILEMMA_KEYCODES
+enum dilemma_keycodes {
+#        ifdef VIA_ENABLE
+    POINTER_DEFAULT_DPI_FORWARD = USER00,
+#        else
+    POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
+#        endif // VIA_ENABLE
+    POINTER_DEFAULT_DPI_REVERSE,
+    POINTER_SNIPING_DPI_FORWARD,
+    POINTER_SNIPING_DPI_REVERSE,
+    SNIPING_MODE,
+    SNIPING_MODE_TOGGLE,
+    DRAGSCROLL_MODE,
+    DRAGSCROLL_MODE_TOGGLE,
+    DILEMMA_SAFE_RANGE,
+};
+
+#        define DPI_MOD POINTER_DEFAULT_DPI_FORWARD
+#        define DPI_RMOD POINTER_DEFAULT_DPI_REVERSE
+#        define S_D_MOD POINTER_SNIPING_DPI_FORWARD
+#        define S_D_RMOD POINTER_SNIPING_DPI_REVERSE
+#        define SNIPING SNIPING_MODE
+#        define SNP_TOG SNIPING_MODE_TOGGLE
+#        define DRGSCRL DRAGSCROLL_MODE
+#        define DRG_TOG DRAGSCROLL_MODE_TOGGLE
+#    endif // !NO_DILEMMA_KEYCODES
+
+/** \brief Return the current DPI value for the pointer's default mode. */
+uint16_t dilemma_get_pointer_default_dpi(void);
+
+/**
+ * \brief Update the pointer's default DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to DILEMMA_DEFAULT_DPI_CONFIG_STEP.
+ *
+ * The new value is persisted in EEPROM.
+ */
+void dilemma_cycle_pointer_default_dpi(bool forward);
+
+/**
+ * \brief Same as `dilemma_cycle_pointer_default_dpi`, but do not write to
+ * EEPROM.
+ *
+ * This means that reseting the board will revert the value to the last
+ * persisted one.
+ */
+void dilemma_cycle_pointer_default_dpi_noeeprom(bool forward);
+
+/** \brief Return the current DPI value for the pointer's sniper-mode. */
+uint16_t dilemma_get_pointer_sniping_dpi(void);
+
+/**
+ * \brief Update the pointer's sniper-mode DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to DILEMMA_SNIPING_DPI_CONFIG_STEP.
+ *
+ * The new value is persisted in EEPROM.
+ */
+void dilemma_cycle_pointer_sniping_dpi(bool forward);
+
+/**
+ * \brief Same as `dilemma_cycle_pointer_sniping_dpi`, but do not write to
+ * EEPROM.
+ *
+ * This means that reseting the board will revert the value to the last
+ * persisted one.
+ */
+void dilemma_cycle_pointer_sniping_dpi_noeeprom(bool forward);
+
+/** \brief Whether sniper-mode is enabled. */
+bool dilemma_get_pointer_sniping_enabled(void);
+
+/**
+ * \brief Enable/disable sniper mode.
+ *
+ * When sniper mode is enabled the dpi is reduced to slow down the pointer for
+ * more accurate movements.
+ */
+void dilemma_set_pointer_sniping_enabled(bool enable);
+
+/** \brief Whether drag-scroll is enabled. */
+bool dilemma_get_pointer_dragscroll_enabled(void);
+
+/**
+ * \brief Enable/disable drag-scroll mode.
+ *
+ * When drag-scroll mode is enabled, horizontal and vertical pointer movements
+ * are translated into horizontal and vertical scroll movements.
+ */
+void dilemma_set_pointer_dragscroll_enabled(bool enable);
+#endif // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/elitec/config.h b/keyboards/bastardkb/dilemma/elitec/config.h
new file mode 100644
index 0000000000..0f26e46fdb
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/elitec/config.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { D4, C6, F5, F7 }
+#define MATRIX_COL_PINS \
+    { B4, B5, E6, D7, F6 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+//#define SPLIT_HAND_PIN F4
+// If you've soldered the handedness pull-up on the upper side instead of the
+// left one, uncomment the following line.
+//#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
diff --git a/keyboards/bastardkb/dilemma/elitec/info.json b/keyboards/bastardkb/dilemma/elitec/info.json
new file mode 100644
index 0000000000..f5916f3ab1
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Dilemma Elite-C",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/dilemma/elitec/rules.mk b/keyboards/bastardkb/dilemma/elitec/rules.mk
new file mode 100644
index 0000000000..e8326bcf09
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/elitec/rules.mk
@@ -0,0 +1,5 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
diff --git a/keyboards/bastardkb/dilemma/info.json b/keyboards/bastardkb/dilemma/info.json
new file mode 100644
index 0000000000..6764219969
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/info.json
@@ -0,0 +1,46 @@
+{
+    "url": "https://bastardkb.com/dilemma",
+    "usb": {
+        "pid": "0x1835",
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0},
+                {"label":"L01", "x":1, "y":0},
+                {"label":"L02", "x":2, "y":0},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"R00", "x":11, "y":0},
+                {"label":"R01", "x":12, "y":0},
+                {"label":"R02", "x":13, "y":0},
+                {"label":"R03", "x":14, "y":0},
+                {"label":"R04", "x":15, "y":0},
+                {"label":"L10", "x":0, "y":1},
+                {"label":"L11", "x":1, "y":1},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"R10", "x":11, "y":1},
+                {"label":"R11", "x":12, "y":1},
+                {"label":"R12", "x":13, "y":1},
+                {"label":"R13", "x":14, "y":1},
+                {"label":"R14", "x":15, "y":1},
+                {"label":"L20", "x":0, "y":2},
+                {"label":"L21", "x":1, "y":2},
+                {"label":"L22", "x":2, "y":2},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"R20", "x":11, "y":2},
+                {"label":"R21", "x":12, "y":2},
+                {"label":"R22", "x":13, "y":2},
+                {"label":"R23", "x":14, "y":2},
+                {"label":"R24", "x":15, "y":2},
+                {"label":"L30", "x":4, "y":3},
+                {"label":"L32", "x":5, "y":3},
+                {"label":"R32", "x":10, "y":3},
+                {"label":"R30", "x":11, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/README.md b/keyboards/bastardkb/dilemma/keymaps/bstiq/README.md
new file mode 100644
index 0000000000..df1f43cbcb
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/keymaps/bstiq/README.md
@@ -0,0 +1,3 @@
+# Dilemma @bstiq keymap
+
+Inspired from Miryoku, using home-rows.
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/keymaps/bstiq/config.h
new file mode 100644
index 0000000000..b2e49c8c6e
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/keymaps/bstiq/config.h
@@ -0,0 +1,153 @@
+/**
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifdef VIA_ENABLE
+/* Via configuration. */
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 8
+#endif // VIA_ENABLE
+
+/**
+ * Configure the global tapping term (default: 200ms).
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#ifndef TAPPING_TERM
+#    define TAPPING_TERM 160
+#endif // TAPPING_TERM
+
+// disable trackpad taps
+// #define CIRQUE_PINNACLE_TAPPING_TERM 0
+
+/**
+ * Enable rapid switch from tap to hold.  Disable auto-repeat when pressing key
+ * twice, except for one-shot keys.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
+ */
+#define TAPPING_FORCE_HOLD
+
+/*
+ * Tap-or-Hold decision modes.
+ *
+ * Note that the following flags behave differently when combined (ie. when 2 or
+ * more are enabled).
+ *
+ * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
+ * decision modes.
+ */
+
+/**
+ * Faster tap-hold trigger.
+ *
+ * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
+ * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
+ */
+#define PERMISSIVE_HOLD
+
+/**
+ * Prevent normal rollover on alphas from accidentally triggering mods.
+ *
+ * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
+ *
+ * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
+ * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
+ */
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/** Dilemma-specific features. */
+
+#ifdef POINTING_DEVICE_ENABLE
+// Flip horizontal direction for drag-scroll.
+#    define DILEMMA_DRAGSCROLL_REVERSE_X
+// #define DILEMMA_DRAGSCROLL_REVERSE_Y
+#endif // POINTING_DEVICE_ENABLE
+
+/** RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Enable all animations on ARM boards since they have plenty of memory
+// available for it.
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
new file mode 100644
index 0000000000..f8396cb1c2
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
@@ -0,0 +1,224 @@
+/**
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum bstiq_layers {
+    LAYER_BASE = 0,
+    LAYER_MBO,
+    LAYER_MEDIA,
+    LAYER_NAV,
+    LAYER_MOUSE,
+    LAYER_SYM,
+    LAYER_NUM,
+    LAYER_FUN,
+};
+
+// Automatically enable sniping when the mouse layer is on.
+#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_MOUSE
+
+#define BSP_NAV LT(LAYER_NAV, KC_BSPC)
+#define ENT_MBO LT(LAYER_MBO, KC_ENT)
+#define TAB_MED LT(LAYER_MEDIA, KC_TAB)
+#define ESC_SYM LT(LAYER_SYM, KC_ESC)
+#define SPC_NUM LT(LAYER_NUM, KC_SPC)
+#define SPC_MBO LT(LAYER_MBO, KC_SPC)
+#define MOUSE(KC) LT(LAYER_MOUSE, KC)
+
+#define USR_RDO KC_AGAIN
+#define USR_PST S(KC_INS)
+#define USR_CPY C(KC_INS)
+#define USR_CUT S(KC_DEL)
+#define USR_UND KC_UNDO
+
+#define MS_L KC_MS_LEFT
+#define MS_R KC_MS_RIGHT
+#define MS_D KC_MS_DOWN
+#define MS_U KC_MS_UP
+
+#define WH_L KC_MS_WH_LEFT
+#define WH_R KC_MS_WH_RIGHT
+#define WH_D KC_MS_WH_DOWN
+#define WH_U KC_MS_WH_UP
+
+// clang-format off
+/** Convenience macro. */
+#define _KC_LAYOUT_wrapper(                                                                             \
+         k00,      k01,      k02,      k03,      k04,      k05,      k06,      k07,      k08,      k09, \
+         k10,      k11,      k12,      k13,      k14,      k15,      k16,      k17,      k18,      k19, \
+         k20,      k21,      k22,      k23,      k24,      k25,      k26,      k27,      k28,      k29, \
+         ...)                                                                                           \
+    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, \
+    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, \
+    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, \
+    __VA_ARGS__
+#define KC_LAYOUT_wrapper(...) _KC_LAYOUT_wrapper(__VA_ARGS__)
+
+/** Base layer with BÉPO layout. */
+#define LAYOUT_LAYER_BASE_BEPO KC_LAYOUT_wrapper(               \
+       B,    W,    P,    O, QUOT,  DOT,    V,    D,    L,    J, \
+       A,    U,    I,    E, COMM,    C,    T,    S,    R,    N, \
+       Z,    Y,    X, SLSH,    K,    M,    Q,    G,    H,    F, \
+                SPC_MBO, TAB_MED,    ESC_SYM, SPC_NUM)
+
+/** Convenience key shorthands. */
+#define U_NA KC_NO // Present but not available for use.
+#define U_NU KC_NO // Available but not used.
+
+/** Convenience row shorthands. */
+#define ________________HOME_ROW_NA________________    U_NA,    U_NA,    U_NA,    U_NA,    U_NA
+#define ______________HOME_ROW_GASC_L______________ KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL,    U_NA
+#define ______________HOME_ROW_ALGR_L______________    U_NA, KC_ALGR,    U_NA,    U_NA,    U_NA
+#define ______________HOME_ROW_GASC_R______________    U_NA, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI
+#define ______________HOME_ROW_ALGR_R______________    U_NA,    U_NA,    U_NA, KC_ALGR,    U_NA
+
+/** Layers. */
+
+// Buttons.
+#define LAYOUT_LAYER_MBO                                                                      \
+    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    ______________HOME_ROW_GASC_L______________, KC_BSPC, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
+    KC_BTN3, KC_ALGR, KC_BTN2, KC_BTN1,    U_NA,  KC_DEL, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
+                                  U_NA,    U_NA,  KC_ENT,  KC_ENT
+
+// Media.
+#define LAYOUT_LAYER_MEDIA                                                                    \
+    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    ______________HOME_ROW_GASC_L______________,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
+    ______________HOME_ROW_ALGR_L______________,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
+                                  U_NA,    U_NA, KC_BTN1, KC_BTN3
+
+// Navigation.
+#define LAYOUT_LAYER_NAV                                                                      \
+    ________________HOME_ROW_NA________________, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, \
+    ______________HOME_ROW_GASC_L______________,    U_NU, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, \
+    ______________HOME_ROW_ALGR_L______________,    U_NU,    U_NU,    U_NU,    U_NU,    U_NU, \
+                                  U_NA,    U_NA, KC_MSTP, KC_MPLY
+
+// Mouse.
+#define LAYOUT_LAYER_MOUSE                                                                    \
+    S_D_MOD, USR_PST, USR_CPY, USR_CUT, USR_UND, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    DPI_MOD, DRGSCRL, KC_LSFT, DRGSCRL, _______,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
+    USR_RDO, USR_PST, USR_CPY, KC_BTN3, USR_UND,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
+                               KC_BTN1, KC_BTN2, KC_BTN1, KC_BTN3
+
+// Symbols.
+#define LAYOUT_LAYER_SYM                                                                      \
+    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, ________________HOME_ROW_NA________________, \
+    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GASC_R______________, \
+    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_MINS, ______________HOME_ROW_ALGR_R______________, \
+                               KC_RPRN, KC_LPRN,    U_NA,    U_NA
+
+// Numerals.
+#define LAYOUT_LAYER_NUM                                                                      \
+    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, ________________HOME_ROW_NA________________, \
+    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GASC_R______________, \
+     KC_GRV,    KC_1,    KC_2,    KC_3, KC_UNDS, ______________HOME_ROW_ALGR_R______________, \
+                                  KC_0, KC_MINS,    U_NA,    U_NA
+
+// Function keys.
+#define LAYOUT_LAYER_FUN                                                                      \
+     KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \
+     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \
+     KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
+                                KC_APP,  KC_TAB,    U_NA,    U_NA
+
+/**
+ * Add Home Row mod to a layout.
+ *
+ * Expects a 10-key per row layout.  Adds support for GASC (Gui, Alt, Shift, Ctl)
+ * home row.  The layout passed in parameter must contain at least 20 keycodes.
+ *
+ * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
+ *
+ *     HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO)
+ */
+#define _HOME_ROW_MOD_GASC(                                            \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
+    ...)                                                               \
+             L00,         L01,         L02,         L03,         L04,  \
+             R05,         R06,         R07,         R08,         R09,  \
+      LGUI_T(L10), LALT_T(L11), LSFT_T(L12), LCTL_T(L13),        L14,  \
+             R15,  RCTL_T(R16), RSFT_T(R17), LALT_T(R18), RGUI_T(R19), \
+      __VA_ARGS__
+#define HOME_ROW_MOD_GASC(...) _HOME_ROW_MOD_GASC(__VA_ARGS__)
+
+/**
+ * Add mouse layer keys to a layout.
+ *
+ * Expects a 10-key per row layout.  The layout passed in parameter must contain
+ * at least 30 keycodes.
+ *
+ * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
+ *
+ *     MOUSE_MOD(LAYOUT_LAYER_BASE_BEPO)
+ */
+#define _MOUSE_MOD(                                               \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,             \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,             \
+    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,             \
+    ...)                                                          \
+            L00,        L01,        L02,        L03,        L04,  \
+            R05,        R06,        R07,        R08,        R09,  \
+            L10,        L11,        L12,        L13,        L14,  \
+            R15,        R16,        R17,        R18,        R19,  \
+            L20, MOUSE(L21),        L22,        L23,        L24,  \
+            R25,        R26,        R27,        R28,  MOUSE(R29), \
+      __VA_ARGS__
+#define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__)
+
+#define LAYOUT_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_wrapper(
+    MOUSE_MOD(HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO))
+  ),
+  [LAYER_MBO] = LAYOUT_wrapper(LAYOUT_LAYER_MBO),
+  [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA),
+  [LAYER_NAV] = LAYOUT_wrapper(LAYOUT_LAYER_NAV),
+  [LAYER_MOUSE] = LAYOUT_wrapper(LAYOUT_LAYER_MOUSE),
+  [LAYER_SYM] = LAYOUT_wrapper(LAYOUT_LAYER_SYM),
+  [LAYER_NUM] = LAYOUT_wrapper(LAYOUT_LAYER_NUM),
+  [LAYER_FUN] = LAYOUT_wrapper(LAYOUT_LAYER_FUN),
+};
+// clang-format on
+
+#if defined(POINTING_DEVICE_ENABLE) && defined(DILEMMA_AUTO_SNIPING_ON_LAYER)
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#endif // POINTING_DEVICE_ENABLE && DILEMMA_AUTO_SNIPING_ON_LAYER
+
+#ifdef RGB_MATRIX_ENABLE
+// Forward-declare this helper function since it is defined in rgb_matrix.c.
+void rgb_matrix_update_pwm_buffers(void);
+#endif
+
+void shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgblight_setrgb_red();
+#endif // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(RGB_RED);
+    rgb_matrix_update_pwm_buffers();
+#endif // RGB_MATRIX_ENABLE
+}
diff --git a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3f77ebcabb
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_NAV,
+    LAYER_SYM,
+    LAYER_NUM,
+};
+
+#define NAV MO(LAYER_NAV)
+#define SYM MO(LAYER_SYM)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_split_3x5_2(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+          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,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                                      NAV, CAPSWRD,     KC_SPC,     SYM
+  //                            ╰──────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_NAV] = LAYOUT_split_3x5_2(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+        KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,    XXXXXXX, KC_HOME,   KC_UP,  KC_END,  KC_DEL,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD,    XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       QK_BOOT, EEP_RST, KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                                  _______, KC_LSFT,     KC_SPC, _______
+  //                            ╰──────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_SYM] = LAYOUT_split_3x5_2(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+        KC_ESC, KC_LBRC, KC_LCBR, KC_LPRN, KC_TILD,    KC_CIRC, KC_RPRN, KC_RCBR, KC_RBRC,  KC_GRV,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_MINS, KC_ASTR,  KC_EQL, KC_UNDS,  KC_DLR,    KC_HASH, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_PLUS, KC_PIPE,   KC_AT, KC_SLSH, KC_PERC,    _______, KC_BSLS, KC_AMPR, KC_QUES, KC_EXLM,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                                  _______, KC_LSFT,     KC_SPC, _______
+  //                            ╰──────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_NUM] = LAYOUT_split_3x5_2(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,   KC_0,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,  KC_F11,     KC_F12, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                                  _______, KC_LSFT,     KC_SPC, _______
+  //                            ╰──────────────────╯ ╰──────────────────╯
+  ),
+};
+// clang-format on
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, LAYER_NAV, LAYER_SYM, LAYER_NUM);
+}
diff --git a/keyboards/bastardkb/dilemma/readme.md b/keyboards/bastardkb/dilemma/readme.md
new file mode 100644
index 0000000000..ecd1f9f1c9
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/readme.md
@@ -0,0 +1,14 @@
+# Dilemma
+
+A very small keyboard made for ergonomic enthusiasts.
+
+-   Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
+-   Hardware Supported: elite-C V4, Splinky
+-   Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bastardkb/dilemma/elitec:default
+    make bastardkb/dilemma/splinky:default
+
+See the [keyboard build instructions](http://docs.bastardkb.com/)
diff --git a/keyboards/bastardkb/dilemma/rules.mk b/keyboards/bastardkb/dilemma/rules.mk
new file mode 100644
index 0000000000..1a6fc9e72c
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/rules.mk
@@ -0,0 +1,23 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = no   # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = no      # Enable keyboard RGB matrix functionality
+
+POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_2
diff --git a/keyboards/bastardkb/dilemma/splinky/config.h b/keyboards/bastardkb/dilemma/splinky/config.h
new file mode 100644
index 0000000000..80c9e42224
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/splinky/config.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP4, GP5, GP28, GP26 }
+#define MATRIX_COL_PINS \
+    { GP8, GP9, GP7, GP6, GP27 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+//#define SPLIT_HAND_PIN GP29
+// If you've soldered the handedness pull-up on the upper side instead of the
+// left one, uncomment the following line.
+//#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/dilemma/splinky/halconf.h b/keyboards/bastardkb/dilemma/splinky/halconf.h
new file mode 100644
index 0000000000..a4c25c090a
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/splinky/halconf.h
@@ -0,0 +1,21 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/bastardkb/dilemma/splinky/info.json b/keyboards/bastardkb/dilemma/splinky/info.json
new file mode 100644
index 0000000000..07ee320bb9
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/splinky/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Dilemma Splinky",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/dilemma/splinky/mcuconf.h b/keyboards/bastardkb/dilemma/splinky/mcuconf.h
new file mode 100644
index 0000000000..5e47eac54f
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/splinky/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/bastardkb/dilemma/splinky/rules.mk b/keyboards/bastardkb/dilemma/splinky/rules.mk
new file mode 100644
index 0000000000..9c593c6ed8
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/splinky/rules.mk
@@ -0,0 +1,9 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/dilemma/splinky/splinky.c b/keyboards/bastardkb/dilemma/splinky/splinky.c
new file mode 100644
index 0000000000..f38fe43818
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/splinky/splinky.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// Forward declare RP2040 SDK declaration.
+void gpio_init(uint gpio);
+
+void keyboard_pre_init_user(void) {
+    // Ensures that GP26 through GP29 are initialized as digital inputs (as
+    // opposed to analog inputs).  These GPIOs are shared with A0 through A3,
+    // respectively.  On RP2040-B2 and later, the digital inputs are disabled by
+    // default (see RP2040-E6).
+    gpio_init(GP26);
+    gpio_init(GP27);
+    gpio_init(GP28);
+    gpio_init(GP29);
+}
diff --git a/keyboards/bastardkb/info.json b/keyboards/bastardkb/info.json
new file mode 100644
index 0000000000..2791a78b77
--- /dev/null
+++ b/keyboards/bastardkb/info.json
@@ -0,0 +1,8 @@
+{
+    "url": "https://bastardkb.com",
+    "manufacturer": "Bastard Keyboards",
+    "maintainer": "Quentin Lebastard",
+    "usb": {
+        "vid": "0xA8F8",
+    },
+}
diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h
new file mode 100644
index 0000000000..773ee947d7
--- /dev/null
+++ b/keyboards/bastardkb/scylla/blackpill/config.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { B15, A2, B8, A8, B9 }
+#define MATRIX_COL_PINS \
+    { B0, B1, B10, B3, B4, B5 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
+
+/* RGB settings. */
+#define RGB_DI_PIN A1
+#define WS2812_PWM_DRIVER PWMD2
+#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_TARGET_PERIOD 800000
+
+/* Serial configuration for split keyboard. */
+#define SERIAL_USART_TX_PIN A9
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for EEPROM. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
+
+/* EEPROM config. */
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
diff --git a/keyboards/bastardkb/scylla/blackpill/halconf.h b/keyboards/bastardkb/scylla/blackpill/halconf.h
new file mode 100644
index 0000000000..0d4b7b5dc5
--- /dev/null
+++ b/keyboards/bastardkb/scylla/blackpill/halconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+//#define HAL_USE_I2C     TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#define HAL_USE_GPT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
new file mode 100644
index 0000000000..587cc2bc04
--- /dev/null
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Scylla Blackpill",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/scylla/blackpill/mcuconf.h b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
new file mode 100644
index 0000000000..e7cf3681fd
--- /dev/null
+++ b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 FALSE
+
+//#undef STM32_I2C_I2C1_RX_DMA_STREAM
+//#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+//#undef STM32_I2C_I2C1_TX_DMA_STREAM
+//#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+//#undef STM32_PWM_USE_TIM3
+//#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+//#undef STM32_SPI_SPI1_RX_DMA_STREAM
+//#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
+//#undef STM32_SPI_SPI1_TX_DMA_STREAM
+//#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+//#undef STM32_SERIAL_USE_USART2
+//#define STM32_SERIAL_USE_USART2 TRUE
+
+//#undef STM32_UART_USART2_RX_DMA_STREAM
+//#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+//#undef STM32_UART_USART2_TX_DMA_STREAM
+//#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+
+#undef STM32_GPT_USE_TIM3
+#define STM32_GPT_USE_TIM3 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
new file mode 100644
index 0000000000..cf2041ea1c
--- /dev/null
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
+
+SPLIT_KEYBOARD = yes
+
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index d876b5d018..777f99197a 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,90 +17,30 @@
  */
 
 #pragma once
+
 #include "config_common.h"
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1829
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT Scylla
 
-#define MATRIX_ROWS 10
+/* Key matrix configuration. */
+#define MATRIX_ROWS 10 // Rows are doubled-up.
 #define MATRIX_COLS 6
+
 #define DIODE_DIRECTION ROW2COL
-#define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 }
-#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 }
 
-#define RGB_DI_PIN D2
-#define RGBLED_NUM 58
-#define RGBLED_SPLIT { 29, 29 }
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_ANIMATIONS
+/* Set 0 if debouncing isn't needed. */
 #define DEBOUNCE 5
-#define SOFT_SERIAL_PIN D0
-#define MASTER_RIGHT
 
-#ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 58
-#   define RGBLED_SPLIT { 29, 29 }
-#   define RGBLIGHT_LIMIT_VAL 50
-#   define RGBLIGHT_ANIMATIONS
-#endif
+/* RGB settings. */
+#define RGBLED_NUM 58
+#define RGBLED_SPLIT \
+    { 29, 29 }
 
-// RGB matrix support
+/* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL 58 // Number of LEDs
-#    define RGB_MATRIX_SPLIT { 29, 29 }
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 104932e471..026b0f742e 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,7 +1,8 @@
 {
-    "keyboard_name": "The Bastard Keyboard",
-    "url": "https://bastardkb.com/",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com/scylla",
+    "usb": {
+        "pid": "0x1829",
+    },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.c b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
index fe9a834fa2..85781f6631 100644
--- a/keyboards/bastardkb/scylla/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,42 +19,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_split_4x6_5(
-    KC_ESC,  KC_1, KC_2, KC_3, KC_4, KC_5,			            KC_6, KC_7, KC_8,    KC_9,   KC_0,     KC_BSPC,
-//-------------------------------------------------//-----------------------------------------------------------//
-    KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T,			            KC_Y, KC_U, KC_I,    KC_O,   KC_P,     KC_MINS,
-//-------------------------------------------------//-----------------------------------------------------------//
-    KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G,	                KC_H, KC_J, KC_K,    KC_L,   KC_SCLN,  KC_QUOT,
-//-------------------------------------------------//-----------------------------------------------------------//
-    KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B,                  KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,  KC_BSLS,
-//-------------------------------------------------//-----------------------------------------------------------//
-                        KC_LCTL, KC_SPC, MO(1),		     MO(2),  KC_ENT, KC_RGUI,
-                                 KC_HOME,  KC_BSPC,      KC_DEL, KC_RALT
-  ),
+    [0] = LAYOUT_split_4x6_5(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+                             //-------------------------------------------------//-----------------------------------------------------------//
+                             KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
+                             //-------------------------------------------------//-----------------------------------------------------------//
+                             KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+                             //-------------------------------------------------//-----------------------------------------------------------//
+                             KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
+                             //-------------------------------------------------//-----------------------------------------------------------//
+                             KC_LCTL, KC_SPC, MO(1), MO(2), KC_ENT, KC_RGUI, KC_HOME, KC_BSPC, KC_DEL, KC_RALT),
 
-  [1] = LAYOUT_split_4x6_5(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,			  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL,
-//---------------------------------------------------------//-----------------------------------------------------------//
-    QK_BOOT,   _______, _______, _______, _______, KC_LBRC,			  KC_RBRC, KC_P7,   KC_P8,   KC_P9,   _______,  KC_PLUS,
-//---------------------------------------------------------//-----------------------------------------------------------//
-    _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_LPRN,	      KC_RPRN, KC_P4,   KC_P5,   KC_P6,   KC_MINS,  KC_PIPE,
-//---------------------------------------------------------//-----------------------------------------------------------//
-    _______, _______, _______, _______, _______, _______,       _______, KC_P1,   KC_P2,   KC_P3,   KC_EQL,   KC_UNDS,
-//---------------------------------------------------------//-----------------------------------------------------------//
-                               KC_LCTL, KC_HOME, KC_TRNS,		    KC_TRNS, KC_RALT, KC_RGUI,
-                                        KC_SPC,  KC_BSPC,       KC_RCTL, KC_ENT
-  ),
+    [1] = LAYOUT_split_4x6_5(KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+                             //---------------------------------------------------------//-----------------------------------------------------------//
+                             QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS,
+                             //---------------------------------------------------------//-----------------------------------------------------------//
+                             _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE,
+                             //---------------------------------------------------------//-----------------------------------------------------------//
+                             _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS,
+                             //---------------------------------------------------------//-----------------------------------------------------------//
+                             KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, KC_RGUI, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
 
-  [2] = LAYOUT_split_4x6_5(
-    KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,			    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,
-//---------------------------------------------------------//--------------------------------------------------------------//
-    _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC,			  KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK,  KC_MUTE,
-//---------------------------------------------------------//--------------------------------------------------------------//
-    _______, KC_LEFT, KC_UP,    KC_DOWN, KC_RGHT, KC_LPRN,	      KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_VOLU,
-//---------------------------------------------------------//--------------------------------------------------------------//
-    _______, _______, _______,  _______, _______, _______,        _______, _______, _______, _______, _______,  KC_VOLD,
-//---------------------------------------------------------//--------------------------------------------------------------//
-                               KC_LCTL, KC_HOME, KC_TRNS,		    KC_TRNS, KC_RALT, QK_BOOT,
-                                        KC_SPC,  KC_BSPC,       KC_RCTL, KC_ENT
-  ),
+    [2] = LAYOUT_split_4x6_5(KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+                             //---------------------------------------------------------//--------------------------------------------------------------//
+                             _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC, KC_RBRC, _______, KC_NLCK, KC_INS, KC_SLCK, KC_MUTE,
+                             //---------------------------------------------------------//--------------------------------------------------------------//
+                             _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+                             //---------------------------------------------------------//--------------------------------------------------------------//
+                             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
+                             //---------------------------------------------------------//--------------------------------------------------------------//
+                             KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, QK_BOOT, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
 };
diff --git a/keyboards/bastardkb/scylla/readme.md b/keyboards/bastardkb/scylla/readme.md
index 70df5cfbb9..5a83083b96 100644
--- a/keyboards/bastardkb/scylla/readme.md
+++ b/keyboards/bastardkb/scylla/readme.md
@@ -17,6 +17,6 @@ See the [keyboard build instructions](https://docs.bastardkb.com)
 
 ## Important information regarding the reset
 
-If you modify this firmware, make sure to always have a RESET key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
+If you modify this firmware, make sure to always have a `QK_BOOT` key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
 
 Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/keyboards/bastardkb/scylla/scylla.h b/keyboards/bastardkb/scylla/scylla.h
index 196982952f..4039ad3a94 100644
--- a/keyboards/bastardkb/scylla/scylla.h
+++ b/keyboards/bastardkb/scylla/scylla.h
@@ -1,5 +1,6 @@
-/* 
+/*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,28 +16,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
+
 #include "quantum.h"
 
-// SWITCHED 91 and 95 - check on left ?
-#define LAYOUT_split_4x6_5( \
-	k00, k01, k02, k03, k04, k05,			k55, k54, k53, k52, k51, k50, \
-	k10, k11, k12, k13, k14, k15,			k65, k64, k63, k62, k61, k60, \
-	k20, k21, k22, k23, k24, k25,			k75, k74, k73, k72, k71, k70, \
-	k30, k31, k32, k33, k34, k35,			k85, k84, k83, k82, k81, k80, \
-		       k43, k44, k41,		        k91, k94, k93, \
-		            k45, k42,                   k92, k95 \
-)\
-{\
-	{ k00, k01, k02, k03, k04, k05 }, \
-	{ k10, k11, k12, k13, k14, k15 }, \
-	{ k20, k21, k22, k23, k24, k25 }, \
-	{ k30, k31, k32, k33, k34, k35 }, \
-	{ KC_NO, k41, k42, k43, k44, k45 }, \
-	{ k50, k51, k52, k53, k54, k55 }, \
-	{ k60, k61, k62, k63, k64, k65 }, \
-	{ k70, k71, k72, k73, k74, k75 }, \
-	{ k80, k81, k82, k83, k84, k85 }, \
-	{ KC_NO, k91, k92, k93, k94, k95 }, \
+// clang-format off
+#define LAYOUT_split_4x6_5(                                       \
+  k00, k01, k02, k03, k04, k05,     k55, k54, k53, k52, k51, k50, \
+  k10, k11, k12, k13, k14, k15,     k65, k64, k63, k62, k61, k60, \
+  k20, k21, k22, k23, k24, k25,     k75, k74, k73, k72, k71, k70, \
+  k30, k31, k32, k33, k34, k35,     k85, k84, k83, k82, k81, k80, \
+                 k43, k44, k41,     k91, k94, k93,                \
+                      k45, k42,     k92, k95                      \
+)                                                                 \
+{                                                                 \
+  {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
+  {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
+  {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
+  {   k30,   k31,   k32,   k33,   k34,   k35 },                   \
+  { KC_NO,   k41,   k42,   k43,   k44,   k45 },                   \
+  {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
+  {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
+  {   k70,   k71,   k72,   k73,   k74,   k75 },                   \
+  {   k80,   k81,   k82,   k83,   k84,   k85 },                   \
+  { KC_NO,   k91,   k92,   k93,   k94,   k95 },                   \
 }
+// clang-format on
diff --git a/keyboards/bastardkb/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h
new file mode 100644
index 0000000000..0990e6d068
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v1/elitec/config.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { D7, B5, F7, F6, B6 }
+#define MATRIX_COL_PINS \
+    { B4, E6, C6, B1, B3, B2 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D0
+
+/* RGB settings. */
+#define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
new file mode 100644
index 0000000000..57b36e1e2a
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Scylla Elite-C",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/scylla/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
similarity index 78%
rename from keyboards/bastardkb/scylla/rules.mk
rename to keyboards/bastardkb/scylla/v1/elitec/rules.mk
index fe2991040d..0c131a2eaf 100644
--- a/keyboards/bastardkb/scylla/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -15,8 +15,12 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
-AUDIO_ENABLE = no           # Audio output
+
 SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
new file mode 100644
index 0000000000..698f6e426f
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/elitec/config.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F4, F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
new file mode 100644
index 0000000000..213bb9a79c
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Scylla Elite-C",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
new file mode 100644
index 0000000000..0c131a2eaf
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
+
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky/config.h b/keyboards/bastardkb/scylla/v2/splinky/config.h
new file mode 100644
index 0000000000..5f678fb331
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/config.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP29, GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* RGB settings. */
+#define RGB_DI_PIN GP0
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky/info.json b/keyboards/bastardkb/scylla/v2/splinky/info.json
new file mode 100644
index 0000000000..614e22eefa
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Scylla Splinky",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/scylla/v2/splinky/rules.mk b/keyboards/bastardkb/scylla/v2/splinky/rules.mk
new file mode 100644
index 0000000000..8dfc0256ab
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h
new file mode 100644
index 0000000000..cbff281ddc
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/blackpill/config.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { A2, B8, A8, B9 }
+#define MATRIX_COL_PINS \
+    { B1, B10, B3, B4, B5 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
+
+/* RGB settings. */
+#define RGB_DI_PIN A1
+#define WS2812_PWM_DRIVER PWMD2
+#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_TARGET_PERIOD 800000
+
+/* Serial configuration for split keyboard. */
+#define SERIAL_USART_TX_PIN A9
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for EEPROM. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
+
+/* EEPROM config. */
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
diff --git a/keyboards/bastardkb/skeletyl/blackpill/halconf.h b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
new file mode 100644
index 0000000000..0d4b7b5dc5
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+//#define HAL_USE_I2C     TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#define HAL_USE_GPT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
new file mode 100644
index 0000000000..16106f2f82
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Skeletyl Blackpill",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h b/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
new file mode 100644
index 0000000000..e7cf3681fd
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 FALSE
+
+//#undef STM32_I2C_I2C1_RX_DMA_STREAM
+//#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+//#undef STM32_I2C_I2C1_TX_DMA_STREAM
+//#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+//#undef STM32_PWM_USE_TIM3
+//#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+//#undef STM32_SPI_SPI1_RX_DMA_STREAM
+//#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
+//#undef STM32_SPI_SPI1_TX_DMA_STREAM
+//#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+//#undef STM32_SERIAL_USE_USART2
+//#define STM32_SERIAL_USE_USART2 TRUE
+
+//#undef STM32_UART_USART2_RX_DMA_STREAM
+//#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+//#undef STM32_UART_USART2_TX_DMA_STREAM
+//#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+
+#undef STM32_GPT_USE_TIM3
+#define STM32_GPT_USE_TIM3 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
new file mode 100644
index 0000000000..4ecd8c6924
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
+
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index fae8e2ec03..8494e2bfac 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,87 +17,30 @@
  */
 
 #pragma once
-#include "config_common.h"
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1830
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT Skeletyl
 
-#define MATRIX_ROWS 8
+#include "config_common.h"
+
+/* Key matrix configuration. */
+#define MATRIX_ROWS 8 // Rows are doubled-up.
 #define MATRIX_COLS 5
-#define RGBLIGHT_LIMIT_VAL 180
-#define MATRIX_ROW_PINS { B5, F7, F6, B6 }
-#define MATRIX_COL_PINS { E6, C6, B1, B3, B2 }
 
 #define DIODE_DIRECTION ROW2COL
 
-#define RGB_DI_PIN D2
-#define RGBLED_NUM 36
-#define RGBLED_SPLIT { 18, 18 }
-#define RGBLIGHT_ANIMATIONS
-
+/* Set 0 if debouncing isn't needed. */
 #define DEBOUNCE 5
 
-#define SOFT_SERIAL_PIN D0
+/* RGB settings. */
+#define RGBLED_NUM 36
+#define RGBLED_SPLIT \
+    { 18, 18 }
 
-#define MASTER_RIGHT
-
-// RGB matrix support
+/* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL 36 // Number of LEDs
-#    define RGB_MATRIX_SPLIT { 18, 18 }
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 54c14da330..bafc97294b 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -1,7 +1,8 @@
 {
-    "keyboard_name": "Skeletyl",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com/skeletyl",
+    "usb": {
+        "pid": "0x1830",
+    },
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.h b/keyboards/bastardkb/skeletyl/skeletyl.h
index c7ad89bd2b..6d8073153f 100644
--- a/keyboards/bastardkb/skeletyl/skeletyl.h
+++ b/keyboards/bastardkb/skeletyl/skeletyl.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly DELAY <charly@codesink.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
@@ -16,6 +17,7 @@
  */
 
 #pragma once
+
 #include "quantum.h"
 
 // clang-format off
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
new file mode 100644
index 0000000000..fd2101ec55
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { B5, F7, F6, B6 }
+#define MATRIX_COL_PINS \
+    { E6, C6, B1, B3, B2 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D0
+
+/* RGB settings. */
+#define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
new file mode 100644
index 0000000000..f784c9423d
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Skeletyl Elite-C",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/skeletyl/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
similarity index 74%
rename from keyboards/bastardkb/skeletyl/rules.mk
rename to keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index 808b59c93d..399e03a2a5 100644
--- a/keyboards/bastardkb/skeletyl/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -12,17 +12,16 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
-AUDIO_ENABLE = no           # Audio output
+
 SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
-
-AUDIO_SUPPORTED = no
-RGB_MATRIX_SUPPORTED = yes
-RGBLIGHT_SUPPORTED = yes
-
 LAYOUTS = split_3x5_3
diff --git a/keyboards/bastardkb/skeletyl/v1/info.json b/keyboards/bastardkb/skeletyl/v1/info.json
new file mode 100644
index 0000000000..2443086ddf
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
new file mode 100644
index 0000000000..5d4e48d49d
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
new file mode 100644
index 0000000000..0b50c1faa1
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Skeletyl Elite-C",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
new file mode 100644
index 0000000000..399e03a2a5
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
new file mode 100644
index 0000000000..02a8bd6551
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+    { GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* RGB settings. */
+#define RGB_DI_PIN GP0
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/info.json b/keyboards/bastardkb/skeletyl/v2/splinky/info.json
new file mode 100644
index 0000000000..b90334c78d
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Skeletyl Splinky",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk
new file mode 100644
index 0000000000..1ce16352dd
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbk/readme.md b/keyboards/bastardkb/tbk/readme.md
index 9359e6ad9c..0d552e5caf 100644
--- a/keyboards/bastardkb/tbk/readme.md
+++ b/keyboards/bastardkb/tbk/readme.md
@@ -17,6 +17,6 @@ See the [keyboard build instructions](https://docs.bastardkb.com)
 
 ## Important information regarding the reset
 
-If you modify this firmware, make sure to always have a RESET key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
+If you modify this firmware, make sure to always have a QK_BOOT key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
 
 Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h
new file mode 100644
index 0000000000..ba0c93ff93
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/blackpill/config.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { A2, B8, A8, B9 }
+#define MATRIX_COL_PINS \
+    { B0, B1, B10, B3, B4, B5 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
+
+/* RGB settings. */
+#define RGB_DI_PIN A1
+#define WS2812_PWM_DRIVER PWMD2
+#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_TARGET_PERIOD 800000
+
+/* Serial configuration for split keyboard. */
+#define SERIAL_USART_TX_PIN A9
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for EEPROM. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN A7
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN A6
+#define SPI_MISO_PAL_MODE 5
+
+/* EEPROM config. */
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
diff --git a/keyboards/bastardkb/tbkmini/blackpill/halconf.h b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
new file mode 100644
index 0000000000..0d4b7b5dc5
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+//#define HAL_USE_I2C     TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#define HAL_USE_GPT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
new file mode 100644
index 0000000000..d4f15e44f1
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "TBK Mini Blackpill",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h b/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
new file mode 100644
index 0000000000..e7cf3681fd
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 FALSE
+
+//#undef STM32_I2C_I2C1_RX_DMA_STREAM
+//#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+//#undef STM32_I2C_I2C1_TX_DMA_STREAM
+//#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+//#undef STM32_PWM_USE_TIM3
+//#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+//#undef STM32_SPI_SPI1_RX_DMA_STREAM
+//#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
+//#undef STM32_SPI_SPI1_TX_DMA_STREAM
+//#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+//#undef STM32_SERIAL_USE_USART2
+//#define STM32_SERIAL_USE_USART2 TRUE
+
+//#undef STM32_UART_USART2_RX_DMA_STREAM
+//#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+//#undef STM32_UART_USART2_TX_DMA_STREAM
+//#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+
+#undef STM32_GPT_USE_TIM3
+#define STM32_GPT_USE_TIM3 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
new file mode 100644
index 0000000000..702ed34356
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index 094544de9a..0624c4b4a6 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,90 +17,30 @@
  */
 
 #pragma once
-#include "config_common.h"
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1828
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT TBK Mini
 
-#define MATRIX_ROWS 8
+#include "config_common.h"
+
+/* Key matrix configuration. */
+#define MATRIX_ROWS 8 // Rows are doubled-up.
 #define MATRIX_COLS 6
-#define RGBLIGHT_LIMIT_VAL 180
-#define MATRIX_ROW_PINS { B5, F7, F6, B6 }
-#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 }
 
 #define DIODE_DIRECTION ROW2COL
 
-#define RGB_DI_PIN D2
-#define RGBLED_NUM 42
-#define RGBLED_SPLIT { 21, 21 }
-#define RGBLIGHT_ANIMATIONS
-
+/* Set 0 if debouncing isn't needed. */
 #define DEBOUNCE 5
 
-#define SOFT_SERIAL_PIN D0
+/* RGB settings. */
+#define RGBLED_NUM 42
+#define RGBLED_SPLIT \
+    { 21, 21 }
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-#define F_SCL 400000L
-#define MASTER_RIGHT
-
-// RGB matrix support
+/* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL 42 // Number of LEDs
-#    define RGB_MATRIX_SPLIT { 21, 21 }
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index d7fddeb7e6..d46ddb8dab 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -1,7 +1,8 @@
 {
-    "keyboard_name": "TBK Mini",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com/tbk-mini",
+    "usb": {
+        "pid": "0x1828",
+    },
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
diff --git a/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c b/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
index 3aa41b6fba..551aea127f 100644
--- a/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,52 +19,51 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, KC_SPC  ,  MO(1),     MO(2), KC_ENT , KC_RALT
-                                      //`--------------------------'  `--------------------------'
+    [0] = LAYOUT_split_3x6_3(
+        //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC,
+        //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+        KC_LGUI, KC_SPC, MO(1), MO(2), KC_ENT, KC_RALT
+        //`--------------------------'  `--------------------------'
 
-  ),
+        ),
 
-  [1] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, KC_SPC,  _______,     MO(3), KC_ENT, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
+    [1] = LAYOUT_split_3x6_3(
+        //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, XXXXXXX, XXXXXXX,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+        KC_LGUI, KC_SPC, _______, MO(3), KC_ENT, KC_RALT
+        //`--------------------------'  `--------------------------'
+        ),
 
-  [2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,  KC_SPC,  MO(3),     _______, KC_ENT, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
+    [2] = LAYOUT_split_3x6_3(
+        //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+        //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+        KC_LGUI, KC_SPC, MO(3), _______, KC_ENT, KC_RALT
+        //`--------------------------'  `--------------------------'
+        ),
 
-  [3] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,  KC_SPC, _______,     _______, KC_ENT, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  )
-};
+    [3] = LAYOUT_split_3x6_3(
+        //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+        KC_LGUI, KC_SPC, _______, _______, KC_ENT, KC_RALT
+        //`--------------------------'  `--------------------------'
+        )};
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.h b/keyboards/bastardkb/tbkmini/tbkmini.h
index 66235f4f4d..f031c9fed2 100644
--- a/keyboards/bastardkb/tbkmini/tbkmini.h
+++ b/keyboards/bastardkb/tbkmini/tbkmini.h
@@ -1,5 +1,6 @@
-/* 
+/*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly DELAY <charly@codesink.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
@@ -15,23 +16,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
+
 #include "quantum.h"
 
-#define LAYOUT_split_3x6_3( \
-	k00, k01, k02, k03, k04, k05,			k45, k44, k43, k42, k41, k40, \
-	k10, k11, k12, k13, k14, k15,			k55, k54, k53, k52, k51, k50, \
-	k20, k21, k22, k23, k24, k25,			k65, k64, k63, k62, k61, k60, \
-		       k33, k34, k31,		        k71, k74, k73  \
-)\
-{\
-	{ k00, k01, k02, k03, k04, k05 }, \
-	{ k10, k11, k12, k13, k14, k15 }, \
-	{ k20, k21, k22, k23, k24, k25 }, \
-	{ KC_NO, k31, KC_NO, k33, k34, KC_NO }, \
-	{ k40, k41, k42, k43, k44, k45 }, \
-	{ k50, k51, k52, k53, k54, k55 }, \
-	{ k60, k61, k62, k63, k64, k65 }, \
-	{ KC_NO, k71, KC_NO, k73, k74, KC_NO }, \
+// clang-format off
+#define LAYOUT_split_3x6_3(                                       \
+  k00, k01, k02, k03, k04, k05,     k45, k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14, k15,     k55, k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24, k25,     k65, k64, k63, k62, k61, k60, \
+                 k33, k34, k31,     k71, k74, k73                 \
+)                                                                 \
+{                                                                 \
+  {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
+  {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
+  {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
+  { KC_NO,   k31, KC_NO,   k33,   k34, KC_NO },                   \
+  {   k40,   k41,   k42,   k43,   k44,   k45 },                   \
+  {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
+  {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
+  { KC_NO,   k71, KC_NO,   k73,   k74, KC_NO },                   \
 }
+// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h
new file mode 100644
index 0000000000..5a9ff87efa
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/config.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { B5, F7, F6, B6 }
+#define MATRIX_COL_PINS \
+    { B4, E6, C6, B1, B3, B2 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D0
+
+/* RGB settings. */
+#define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
new file mode 100644
index 0000000000..83a9e799e1
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "TBK Mini Elite-C",
+    "usb": {
+      "device_version": "1.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/tbkmini/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
similarity index 74%
rename from keyboards/bastardkb/tbkmini/rules.mk
rename to keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
index 2892f5dd6e..380f48e73b 100644
--- a/keyboards/bastardkb/tbkmini/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
@@ -12,18 +12,16 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
-AUDIO_ENABLE = no           # Audio output
+
 SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
-
-AUDIO_SUPPORTED = no
-RGB_MATRIX_SUPPORTED = yes
-RGBLIGHT_SUPPORTED = yes
-
 LAYOUTS = split_3x6_3
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h
new file mode 100644
index 0000000000..1feeac092b
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/config.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
new file mode 100644
index 0000000000..50cfe860dd
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "TBK Mini Elite-C",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
new file mode 100644
index 0000000000..380f48e73b
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
new file mode 100644
index 0000000000..ed0b4a6a54
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP26, GP5, GP4, GP9 }
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* RGB settings. */
+#define RGB_DI_PIN GP0
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/info.json b/keyboards/bastardkb/tbkmini/v2/splinky/info.json
new file mode 100644
index 0000000000..ca66bceeff
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "TBK Mini Splinky",
+    "usb": {
+      "device_version": "2.0.0",
+    },
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk
new file mode 100644
index 0000000000..6b55f6e595
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RP2040-specific options
+ALLOW_WARNINGS = yes
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor

From 325da02e57fe7374e77b82cb00360ba45167e25c Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 25 Jul 2022 15:06:26 -0700
Subject: [PATCH 128/959] Fix QK_MAKE's reboot check (#17795)

---
 quantum/quantum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 80fa1a3ced..9a0016b150 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -411,7 +411,7 @@ bool process_record_quantum(keyrecord_t *record) {
                     SEND_STRING_DELAY(" compile ", TAP_CODE_DELAY);
                 }
                 SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP SS_TAP(X_ENTER), TAP_CODE_DELAY);
-                if (temp_mod & MOD_MASK_CS) {
+                if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) {
                     reset_keyboard();
                 }
             }

From 683eeca2e228b1ffdf34eaf4c74d3b24ba72d848 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 25 Jul 2022 15:07:15 -0700
Subject: [PATCH 129/959] [Docs] Fix custom debug function and sample output
 (#17790)

---
 docs/faq_debug.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/faq_debug.md b/docs/faq_debug.md
index fba27c5f68..4a35997222 100644
--- a/docs/faq_debug.md
+++ b/docs/faq_debug.md
@@ -59,7 +59,7 @@ When porting, or when attempting to diagnose pcb issues, it can be useful to kno
 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: %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);
+    uprintf("KL: kc: 0x%04X, col: %2u, row: %2u, pressed: %u, time: %5u, int: %u, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
 #endif 
   return true;
 }
@@ -69,12 +69,12 @@ Example output
 ```
 Waiting for device:.......
 Listening:
-KL: kc: 169, col: 0, row: 0, pressed: 1
-KL: kc: 169, col: 0, row: 0, pressed: 0
-KL: kc: 174, col: 1, row: 0, pressed: 1
-KL: kc: 174, col: 1, row: 0, pressed: 0
-KL: kc: 172, col: 2, row: 0, pressed: 1
-KL: kc: 172, col: 2, row: 0, pressed: 0
+KL: kc: 169, col: 0, row: 0, pressed: 1, time: 15505, int: 0, count: 0
+KL: kc: 169, col: 0, row: 0, pressed: 0, time: 15510, int: 0, count: 0
+KL: kc: 174, col: 1, row: 0, pressed: 1, time: 15703, int: 0, count: 0
+KL: kc: 174, col: 1, row: 0, pressed: 0, time: 15843, int: 0, count: 0
+KL: kc: 172, col: 2, row: 0, pressed: 1, time: 16303, int: 0, count: 0
+KL: kc: 172, col: 2, row: 0, pressed: 0, time: 16411, int: 0, count: 0
 ```
 
 ### How long did it take to scan for a keypress?

From 928bbded6dd434d1b54190e4acd162428e412457 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 25 Jul 2022 18:40:14 -0700
Subject: [PATCH 130/959] [Keyboard] Fix compilation issues for
 Charybdis/Dilemma (#17791)

* [Keyboard] Fix debug printing for Charybdis/Dilemma

* Fix compliation issue for dilemma
---
 keyboards/bastardkb/charybdis/charybdis.c | 12 +++++++-----
 keyboards/bastardkb/dilemma/dilemma.c     | 11 +++++++----
 keyboards/bastardkb/dilemma/rules.mk      |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c
index d0619ef172..60bca936e7 100644
--- a/keyboards/bastardkb/charybdis/charybdis.c
+++ b/keyboards/bastardkb/charybdis/charybdis.c
@@ -243,10 +243,10 @@ static void debug_charybdis_config_to_console(charybdis_config_t* config) {
     dprintf("(charybdis) process_record_kb: config = {\n"
             "\traw = 0x%X,\n"
             "\t{\n"
-            "\t\tis_dragscroll_enabled=%b\n"
-            "\t\tis_sniping_enabled=%b\n"
-            "\t\tdefault_dpi=0x%X (%ld)\n"
-            "\t\tsniping_dpi=0x%X (%ld)\n"
+            "\t\tis_dragscroll_enabled=%u\n"
+            "\t\tis_sniping_enabled=%u\n"
+            "\t\tdefault_dpi=0x%X (%u)\n"
+            "\t\tsniping_dpi=0x%X (%u)\n"
             "\t}\n"
             "}\n",
             config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
@@ -314,7 +314,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     }
 #        endif // !MOUSEKEY_ENABLE
 #    endif     // POINTING_DEVICE_ENABLE
-    debug_charybdis_config_to_console(&g_charybdis_config);
+    if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < CHARYBDIS_SAFE_RANGE) || IS_MOUSEKEY(keycode)) {
+        debug_charybdis_config_to_console(&g_charybdis_config);
+    }
     return true;
 }
 
diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c
index b4d3ba5de1..e710f3aab7 100644
--- a/keyboards/bastardkb/dilemma/dilemma.c
+++ b/keyboards/bastardkb/dilemma/dilemma.c
@@ -246,10 +246,10 @@ static void debug_dilemma_config_to_console(dilemma_config_t* config) {
     dprintf("(dilemma) process_record_kb: config = {\n"
             "\traw = 0x%X,\n"
             "\t{\n"
-            "\t\tis_dragscroll_enabled=%b\n"
-            "\t\tis_sniping_enabled=%b\n"
-            "\t\tdefault_dpi=0x%X (%ld)\n"
-            "\t\tsniping_dpi=0x%X (%ld)\n"
+            "\t\tis_dragscroll_enabled=%u\n"
+            "\t\tis_sniping_enabled=%u\n"
+            "\t\tdefault_dpi=0x%X (%u)\n"
+            "\t\tsniping_dpi=0x%X (%u)\n"
             "\t}\n"
             "}\n",
             config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
@@ -308,6 +308,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
 #        endif // !NO_DILEMMA_KEYCODES
 #    endif     // POINTING_DEVICE_ENABLE
     debug_dilemma_config_to_console(&g_dilemma_config);
+    if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < DILEMMA_SAFE_RANGE) || IS_MOUSEKEY(keycode)) {
+        debug_dilemma_config_to_console(&g_dilemma_config);
+    }
     return true;
 }
 
diff --git a/keyboards/bastardkb/dilemma/rules.mk b/keyboards/bastardkb/dilemma/rules.mk
index 1a6fc9e72c..499eadfdfb 100644
--- a/keyboards/bastardkb/dilemma/rules.mk
+++ b/keyboards/bastardkb/dilemma/rules.mk
@@ -21,3 +21,5 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
 
 SPLIT_KEYBOARD = yes
 LAYOUTS = split_3x5_2
+
+DEFAULT_FOLDER = bastardkb/dilemma/splinky

From 70d554420c26688b198454e0a92874b084e3feb2 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 26 Jul 2022 13:22:42 +0800
Subject: [PATCH 131/959] [Keyboard] Add RP2040 config defaults for
 ferris/sweep and cradio (#17557)

---
 keyboards/cradio/config.h        | 12 ------------
 keyboards/cradio/readme.md       |  6 ++++++
 keyboards/ferris/sweep/config.h  | 13 -------------
 keyboards/ferris/sweep/readme.md |  7 +++++++
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h
index 65895f8492..979f4e94a4 100644
--- a/keyboards/cradio/config.h
+++ b/keyboards/cradio/config.h
@@ -25,17 +25,6 @@
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
 #define DIRECT_PINS { \
     { E6, F7, F6, F5, F4 }, \
     { B1, B3, B2, B6, D3 }, \
@@ -66,4 +55,3 @@
 /* Top right key on right half */
 #define BOOTMAGIC_LITE_ROW_RIGHT    4
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 4
-
diff --git a/keyboards/cradio/readme.md b/keyboards/cradio/readme.md
index 7f3cef0969..df23e72bea 100644
--- a/keyboards/cradio/readme.md
+++ b/keyboards/cradio/readme.md
@@ -18,6 +18,12 @@ Make example for this keyboard (after setting up your build environment):
 
     make cradio:default
 
+### RP2040 Controllers
+
+Pro Micro RP2040 controllers are supported with [QMK Converters](https://docs.qmk.fm/#/feature_converters). The make command example for Adafruit's KB2040 are:
+
+    make CONVERT_TO=kb2040 cradio: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
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
index 4d4d7d309f..8cbaade80b 100644
--- a/keyboards/ferris/sweep/config.h
+++ b/keyboards/ferris/sweep/config.h
@@ -32,17 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
 #define DIRECT_PINS { \
     { E6, F7, F6, F5, F4 }, \
     { B1, B3, B2, B6, D3 }, \
@@ -57,8 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
 }
 
-
-
 #define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ferris/sweep/readme.md b/keyboards/ferris/sweep/readme.md
index 332ab2c790..b66bed5df0 100644
--- a/keyboards/ferris/sweep/readme.md
+++ b/keyboards/ferris/sweep/readme.md
@@ -31,6 +31,13 @@ For Elite-C or compatible controllers using `DFU` bootloader, add the line `BOOT
 
 [QMK Toolbox](http://qmk.fm/toolbox) can also be used to set EEPROM handedness. Place the controller in bootloader mode and select menu option Tools -> EEPROM -> Set Left/Right Hand
 
+### RP2040 Controllers
+
+Pro Micro RP2040 controllers are supported with [QMK Converters](https://docs.qmk.fm/#/feature_converters). The make command example with handedness setting for Adafruit's KB2040 are:
+
+    make CONVERT_TO=kb2040 ferris/sweep:default:uf2-split-left
+    make CONVERT_TO=kb2040 ferris/sweep:default:uf2-split-right
+
 ## Bootloader
 
 Enter the bootloader in 3 ways:

From 1de6811ebebba77b4604fb01276d42a8d9003374 Mon Sep 17 00:00:00 2001
From: Daniel Kao <daniel.m.kao@gmail.com>
Date: Mon, 25 Jul 2022 23:19:33 -0700
Subject: [PATCH 132/959] Cirque circular scroll: Support
 POINTING_DEVICE_COMBINED (#17654)

---
 drivers/sensors/cirque_pinnacle_gestures.c | 29 +++++++++++++---------
 quantum/pointing_device/pointing_device.c  |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/drivers/sensors/cirque_pinnacle_gestures.c b/drivers/sensors/cirque_pinnacle_gestures.c
index 70f16527ba..dc2f682a83 100644
--- a/drivers/sensors/cirque_pinnacle_gestures.c
+++ b/drivers/sensors/cirque_pinnacle_gestures.c
@@ -20,6 +20,9 @@
 #include "pointing_device.h"
 #include "timer.h"
 #include "wait.h"
+#if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
+#    include "keyboard.h"
+#endif
 
 #if defined(CIRQUE_PINNACLE_TAP_ENABLE) || defined(CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE)
 static cirque_pinnacle_features_t features = {.tap_enable = true, .circular_scroll_enable = true};
@@ -92,18 +95,28 @@ static inline uint16_t atan2_16(int32_t dy, int32_t dx) {
 static circular_scroll_t circular_scroll(pinnacle_data_t touchData) {
     circular_scroll_t report = {0, 0, false};
     int8_t            x, y, wheel_clicks;
-    uint8_t           center = 256 / 2, mag;
+    uint8_t           center = INT8_MAX, mag;
     int16_t           ang, dot, det, opposite_side, adjacent_side;
     uint16_t          scale = cirque_pinnacle_get_scale();
 
     if (touchData.zValue) {
         /*
          * Place origin at center of trackpad, treat coordinates as vectors.
-         * Scale to fixed int8_t size; angles are independent of resolution.
+         * Scale to +/-INT8_MAX; angles are independent of resolution.
          */
         if (scale) {
-            x = (int8_t)((int32_t)touchData.xValue * 256 / scale - center);
-            y = (int8_t)((int32_t)touchData.yValue * 256 / scale - center);
+            /* Rotate coordinates into a consistent orientation */
+            report_mouse_t rot = {.x = (int8_t)((int32_t)touchData.xValue * INT8_MAX * 2 / scale - center), .y = (int8_t)((int32_t)touchData.yValue * INT8_MAX * 2 / scale - center)};
+#    if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
+            if (!is_keyboard_left()) {
+                rot = pointing_device_adjust_by_defines_right(rot);
+            } else
+#    endif
+            {
+                rot = pointing_device_adjust_by_defines(rot);
+            }
+            x = rot.x;
+            y = rot.y;
         } else {
             x = 0;
             y = 0;
@@ -125,15 +138,7 @@ static circular_scroll_t circular_scroll(pinnacle_data_t touchData) {
                  *   Horizontal if started from left half
                  * Flipped for left-handed
                  */
-#    if defined(POINTING_DEVICE_ROTATION_90)
-                scroll.axis = y < 0;
-#    elif defined(POINTING_DEVICE_ROTATION_180)
-                scroll.axis = x > 0;
-#    elif defined(POINTING_DEVICE_ROTATION_270)
-                scroll.axis = y > 0;
-#    else
                 scroll.axis = x < 0;
-#    endif
             }
         } else if (scroll.state == SCROLL_DETECTING) {
             report.suppress_touch = true;
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 3aa4941687..09f9e5efb7 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -412,7 +412,7 @@ report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, repor
  */
 report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report) {
     // Support rotation of the sensor data
-#    if defined(POINTING_DEVICE_ROTATION_90_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT)
+#    if defined(POINTING_DEVICE_ROTATION_90_RIGHT) || defined(POINTING_DEVICE_ROTATION_180_RIGHT) || defined(POINTING_DEVICE_ROTATION_270_RIGHT)
     mouse_xy_report_t x = mouse_report.x;
     mouse_xy_report_t y = mouse_report.y;
 #        if defined(POINTING_DEVICE_ROTATION_90_RIGHT)

From 244450625a121e35f3848c111bf4e42f09e009b9 Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Tue, 26 Jul 2022 15:41:24 +0900
Subject: [PATCH 133/959] bastardkb: fix info.json changes that got reverted
 during the last merge from `master` to `develop` (#17800)

* bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop`

* Remove board name from root folder `info.json`
---
 keyboards/bastardkb/scylla/info.json   | 7 +------
 keyboards/bastardkb/skeletyl/info.json | 7 +------
 keyboards/bastardkb/tbk/info.json      | 3 ---
 keyboards/bastardkb/tbkmini/info.json  | 7 +------
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 1d3dd39030..026b0f742e 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,12 +1,7 @@
 {
-    "keyboard_name": "Scylla",
-    "manufacturer": "Bastard Keyboards",
-    "url": "https://bastardkb.com/",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com/scylla",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1829",
-        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index c06e23ba22..55f68dc9b2 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -1,12 +1,7 @@
 {
-    "keyboard_name": "Skeletyl",
-    "manufacturer": "Bastard Keyboards",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://www.bastardkb.com/skeletyl",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1830",
-        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x5_3": {
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index d16014c48a..d25ccd5cf6 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -1,10 +1,7 @@
 {
     "keyboard_name": "The Bastard Keyboard",
-    "manufacturer": "Bastard Keyboards",
     "url": "https://bastardkb.com/",
-    "maintainer": "Quentin Lebastard",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1828",
         "device_version": "0.0.1"
     },
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 549879328b..4233599432 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -1,12 +1,7 @@
 {
-    "keyboard_name": "TBK Mini",
-    "manufacturer": "Bastard Keyboards",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
+    "url": "https://www.bastardkb.com/tbk-mini",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1828",
-        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x6_3": {

From 5d898a3d34a510282608ed682bdbf8acf5937c0c Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 26 Jul 2022 00:27:34 -0700
Subject: [PATCH 134/959] [Docs] Updates to Pointing Device Docs (#17777)

---
 docs/_summary.md                |  2 +-
 docs/feature_pointing_device.md | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/docs/_summary.md b/docs/_summary.md
index 66f2d60af0..c86f1321c7 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -82,7 +82,6 @@
     * [Key Overrides](feature_key_overrides.md)
     * [Layers](feature_layers.md)
     * [One Shot Keys](one_shot_keys.md)
-    * [Pointing Device](feature_pointing_device.md)
     * [Raw HID](feature_rawhid.md)
     * [Secure](feature_secure.md)
     * [Send String](feature_send_string.md)
@@ -117,6 +116,7 @@
     * [Joystick](feature_joystick.md)
     * [LED Indicators](feature_led_indicators.md)
     * [MIDI](feature_midi.md)
+    * [Pointing Device](feature_pointing_device.md)
     * [PS/2 Mouse](feature_ps2_mouse.md)
     * [Split Keyboard](feature_split_keyboard.md)
     * [Stenography](feature_stenography.md)
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index f0463a131d..f8a55c1c86 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -10,7 +10,7 @@ POINTING_DEVICE_ENABLE = yes
 
 ## Sensor Drivers
 
-There are a number of sensors that are supported by default. Note that only one sensor can be enabled by `POINTING_DEVICE_DRIVER` at a time.  If you need to enable more than one sensor, then you need to implement it manually.
+There are a number of sensors that are supported by default. Note that only one sensor can be enabled by `POINTING_DEVICE_DRIVER` at a time.  If you need to enable more than one sensor, then you need to implement it manually, using the `custom` driver.
 
 ### ADNS 5050 Sensor
 
@@ -128,13 +128,12 @@ Also see the `POINTING_DEVICE_TASK_THROTTLE_MS`, which defaults to 10ms when usi
 
 | Gesture Setting                                | Description                                                                                                                                                                                      | Default              |
 | ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------- |
-| `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction                                                                              | _not defined_        |
 | `CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE`       | (Optional) Enable circular scroll. Touch originating in outer ring can trigger scroll by moving along the perimeter. Near side triggers vertical scroll and far side triggers horizontal scroll. | _not defined_        |
 | `CIRQUE_PINNACLE_TAP_ENABLE`                   | (Optional) Enable tap to click. This currently only works on the master side.                                                                                                                    | _not defined_        |
 | `CIRQUE_PINNACLE_TAPPING_TERM`                 | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
 | `CIRQUE_PINNACLE_TOUCH_DEBOUNCE`               | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
 
-**`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`** is not specific to Cirque trackpad; any pointing device with a lift/contact status can integrate this gesture into its driver. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `pointing_device_get_report()` is needed to generate glide reports.
+Additionally, `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` is supported on the Cirque.
 
 ### PAW 3204 Sensor
 
@@ -255,19 +254,23 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 
 ## Common Configuration
 
-| Setting                            | Description                                                           | Default       |
-| ---------------------------------- | --------------------------------------------------------------------- | ------------- |
-| `POINTING_DEVICE_ROTATION_90`      | (Optional) Rotates the X and Y data by  90 degrees.                   | _not defined_ |
-| `POINTING_DEVICE_ROTATION_180`     | (Optional) Rotates the X and Y data by 180 degrees.                   | _not defined_ |
-| `POINTING_DEVICE_ROTATION_270`     | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_ |
-| `POINTING_DEVICE_INVERT_X`         | (Optional) Inverts the X axis report.                                 | _not defined_ |
-| `POINTING_DEVICE_INVERT_Y`         | (Optional) Inverts the Y axis report.                                 | _not defined_ |
-| `POINTING_DEVICE_MOTION_PIN`       | (Optional) If supported, will only read from sensor if pin is active. | _not defined_ |
-| `POINTING_DEVICE_TASK_THROTTLE_MS` | (Optional) Limits the frequency that the sensor is polled for motion. | _not defined_ |
+| Setting                            | Description                                                                                                                      | Default       |
+| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------- |
+| `MOUSE_EXTENDED_REPORT`            | (Optional) Enables support for extended mouse reports. (-32767 to 32767, instead of just -127 to 127).                           | _not defined_ |
+| `POINTING_DEVICE_ROTATION_90`      | (Optional) Rotates the X and Y data by  90 degrees.                                                                              | _not defined_ |
+| `POINTING_DEVICE_ROTATION_180`     | (Optional) Rotates the X and Y data by 180 degrees.                                                                              | _not defined_ |
+| `POINTING_DEVICE_ROTATION_270`     | (Optional) Rotates the X and Y data by 270 degrees.                                                                              | _not defined_ |
+| `POINTING_DEVICE_INVERT_X`         | (Optional) Inverts the X axis report.                                                                                            | _not defined_ |
+| `POINTING_DEVICE_INVERT_Y`         | (Optional) Inverts the Y axis report.                                                                                            | _not defined_ |
+| `POINTING_DEVICE_MOTION_PIN`       | (Optional) If supported, will only read from sensor if pin is active.                                                            | _not defined_ |
+| `POINTING_DEVICE_TASK_THROTTLE_MS` | (Optional) Limits the frequency that the sensor is polled for motion.                                                            | _not defined_ |
+| `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction. | _not defined_ |
 
 !> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and `POINTING_DEVICE_TASK_THROTTLE_MS` will default to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
 
 
+!> **`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`** can be used with any pointing device with a lift/contact status can integrate this gesture into its driver. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `pointing_device_get_report()` is needed to generate glide reports.
+
 ## Split Keyboard Configuration
 
 The following configuration options are only available when using `SPLIT_POINTING_ENABLE` see [data sync options](feature_split_keyboard.md?id=data-sync-options). The rotation and invert `*_RIGHT` options are only used with `POINTING_DEVICE_COMBINED`. If using `POINTING_DEVICE_LEFT` or `POINTING_DEVICE_RIGHT` use the common configuration above to configure your pointing device.
@@ -282,7 +285,6 @@ The following configuration options are only available when using `SPLIT_POINTIN
 | `POINTING_DEVICE_ROTATION_270_RIGHT` | (Optional) Rotates the X and Y data by 270 degrees.                                                   | _not defined_ |
 | `POINTING_DEVICE_INVERT_X_RIGHT`     | (Optional) Inverts the X axis report.                                                                 | _not defined_ |
 | `POINTING_DEVICE_INVERT_Y_RIGHT`     | (Optional) Inverts the Y axis report.                                                                 | _not defined_ |
-| `MOUSE_EXTENDED_REPORT`              | (Optional) Enables support for extended mouse reports. (-32767 to 32767, instead of just -127 to 127) |
 
 !> If there is a `_RIGHT` configuration option or callback, the [common configuration](feature_pointing_device.md?id=common-configuration) option will work for the left. For correct left/right detection you should setup a [handedness option](feature_split_keyboard?id=setting-handedness), `EE_HANDS` is usually a good option for an existing board that doesn't do handedness by hardware.
 
@@ -454,4 +456,3 @@ report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, re
     return pointing_device_combine_reports(left_report, right_report);
 }
 ```
-=======

From c982d6c5e3f5b113322beabb8a51c3153cab3d54 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 26 Jul 2022 17:38:28 +0100
Subject: [PATCH 135/959] Avoid OOB in dynamic_keymap_reset (#17695)

---
 quantum/dynamic_keymap.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index e80dd6d534..01be9806e4 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -149,18 +149,25 @@ void dynamic_keymap_set_encoder(uint8_t layer, uint8_t encoder_id, bool clockwis
 
 void dynamic_keymap_reset(void) {
     // Reset the keymaps in EEPROM to what is in flash.
-    // All keyboards using dynamic keymaps should define a layout
-    // for the same number of layers as DYNAMIC_KEYMAP_LAYER_COUNT.
     for (int layer = 0; layer < DYNAMIC_KEYMAP_LAYER_COUNT; layer++) {
         for (int row = 0; row < MATRIX_ROWS; row++) {
             for (int column = 0; column < MATRIX_COLS; column++) {
-                dynamic_keymap_set_keycode(layer, row, column, pgm_read_word(&keymaps[layer][row][column]));
+                if (layer < keymap_layer_count()) {
+                    dynamic_keymap_set_keycode(layer, row, column, pgm_read_word(&keymaps[layer][row][column]));
+                } else {
+                    dynamic_keymap_set_keycode(layer, row, column, KC_TRANSPARENT);
+                }
             }
         }
 #ifdef ENCODER_MAP_ENABLE
         for (int encoder = 0; encoder < NUM_ENCODERS; encoder++) {
-            dynamic_keymap_set_encoder(layer, encoder, true, pgm_read_word(&encoder_map[layer][encoder][0]));
-            dynamic_keymap_set_encoder(layer, encoder, false, pgm_read_word(&encoder_map[layer][encoder][1]));
+            if (layer < encodermap_layer_count()) {
+                dynamic_keymap_set_encoder(layer, encoder, true, pgm_read_word(&encoder_map[layer][encoder][0]));
+                dynamic_keymap_set_encoder(layer, encoder, false, pgm_read_word(&encoder_map[layer][encoder][1]));
+            } else {
+                dynamic_keymap_set_encoder(layer, encoder, true, KC_TRANSPARENT);
+                dynamic_keymap_set_encoder(layer, encoder, false, KC_TRANSPARENT);
+            }
         }
 #endif // ENCODER_MAP_ENABLE
     }

From b8b2e9997680bbc0aef074ad0bfb2eb130aafe04 Mon Sep 17 00:00:00 2001
From: Daniel Kao <daniel.m.kao@gmail.com>
Date: Tue, 26 Jul 2022 11:35:41 -0700
Subject: [PATCH 136/959] Constrain Cirque Pinnacle coordinates (#17803)

Static x & y should be the same type as touchData.xValue &
touchData.yValue: uint16_t.
Their delta could be larger than int8_t and should be constrained to
mouse_xy_report_t.
---
 quantum/pointing_device/pointing_device_drivers.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/quantum/pointing_device/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
index d0b545d22d..3780f3d2da 100644
--- a/quantum/pointing_device/pointing_device_drivers.c
+++ b/quantum/pointing_device/pointing_device_drivers.c
@@ -117,11 +117,11 @@ void cirque_pinnacle_configure_cursor_glide(float trigger_px) {
 #    endif
 
 report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
-    pinnacle_data_t          touchData = cirque_pinnacle_read_data();
-    mouse_xy_report_t        report_x = 0, report_y = 0;
-    static mouse_xy_report_t x = 0, y = 0;
+    pinnacle_data_t   touchData = cirque_pinnacle_read_data();
+    mouse_xy_report_t report_x = 0, report_y = 0;
+    static uint16_t   x = 0, y = 0;
 #    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
-    cursor_glide_t           glide_report = {0};
+    cursor_glide_t    glide_report = {0};
 
     if (cursor_glide_enable) {
         glide_report = cursor_glide_check(&glide);
@@ -154,8 +154,8 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
 
     if (!cirque_pinnacle_gestures(&mouse_report, touchData)) {
         if (x && y && touchData.xValue && touchData.yValue) {
-            report_x = (mouse_xy_report_t)(touchData.xValue - x);
-            report_y = (mouse_xy_report_t)(touchData.yValue - y);
+            report_x = CONSTRAIN_HID_XY((int16_t)(touchData.xValue - x));
+            report_y = CONSTRAIN_HID_XY((int16_t)(touchData.yValue - y));
         }
         x = touchData.xValue;
         y = touchData.yValue;

From 083b42068a284765c5dd18c2f04ed542d157ffc9 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 26 Jul 2022 21:40:14 +0200
Subject: [PATCH 137/959] Chibios: Stop I2C peripheral on transaction error
 (#17798)

From the ChibiOS HAL I2C driver pages:

After a timeout the driver must be stopped and restarted because the bus is in
an uncertain state.

This commit does that stopping explicitly on any error that occurred, not only
timeouts. As all the i2c functions restart the peripheral if necessary it is
safe to do so.

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 platforms/chibios/drivers/i2c_master.c | 39 ++++++++++++++++----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index 21e064b1dc..bf8f1ee236 100644
--- a/platforms/chibios/drivers/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
@@ -107,16 +107,25 @@ static const I2CConfig i2cconfig = {
 #endif
 };
 
-static i2c_status_t chibios_to_qmk(const msg_t* status) {
-    switch (*status) {
-        case I2C_NO_ERROR:
-            return I2C_STATUS_SUCCESS;
-        case I2C_TIMEOUT:
-            return I2C_STATUS_TIMEOUT;
-        // I2C_BUS_ERROR, I2C_ARBITRATION_LOST, I2C_ACK_FAILURE, I2C_OVERRUN, I2C_PEC_ERROR, I2C_SMB_ALERT
-        default:
-            return I2C_STATUS_ERROR;
+/**
+ * @brief Handles any I2C error condition by stopping the I2C peripheral and
+ * aborting any ongoing transactions. Furthermore ChibiOS status codes are
+ * converted into QMK codes.
+ *
+ * @param status ChibiOS specific I2C status code
+ * @return i2c_status_t QMK specific I2C status code
+ */
+static i2c_status_t i2c_epilogue(const msg_t status) {
+    if (status == I2C_NO_ERROR) {
+        return I2C_STATUS_SUCCESS;
     }
+
+    // From ChibiOS HAL: "After a timeout the driver must be stopped and
+    // restarted because the bus is in an uncertain state." We also issue that
+    // hard stop in case of any error.
+    i2c_stop();
+
+    return status == I2C_TIMEOUT ? I2C_STATUS_TIMEOUT : I2C_STATUS_ERROR;
 }
 
 __attribute__((weak)) void i2c_init(void) {
@@ -149,14 +158,14 @@ i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length,
     i2c_address = address;
     i2cStart(&I2C_DRIVER, &i2cconfig);
     msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, TIME_MS2I(timeout));
-    return chibios_to_qmk(&status);
+    return i2c_epilogue(status);
 }
 
 i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout) {
     i2c_address = address;
     i2cStart(&I2C_DRIVER, &i2cconfig);
     msg_t status = i2cMasterReceiveTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, TIME_MS2I(timeout));
-    return chibios_to_qmk(&status);
+    return i2c_epilogue(status);
 }
 
 i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
@@ -170,7 +179,7 @@ i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data,
     complete_packet[0] = regaddr;
 
     msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 1, 0, 0, TIME_MS2I(timeout));
-    return chibios_to_qmk(&status);
+    return i2c_epilogue(status);
 }
 
 i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
@@ -185,14 +194,14 @@ i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* da
     complete_packet[1] = regaddr & 0xFF;
 
     msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 2, 0, 0, TIME_MS2I(timeout));
-    return chibios_to_qmk(&status);
+    return i2c_epilogue(status);
 }
 
 i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
     i2c_address = devaddr;
     i2cStart(&I2C_DRIVER, &i2cconfig);
     msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), &regaddr, 1, data, length, TIME_MS2I(timeout));
-    return chibios_to_qmk(&status);
+    return i2c_epilogue(status);
 }
 
 i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
@@ -200,7 +209,7 @@ i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uin
     i2cStart(&I2C_DRIVER, &i2cconfig);
     uint8_t register_packet[2] = {regaddr >> 8, regaddr & 0xFF};
     msg_t   status             = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), register_packet, 2, data, length, TIME_MS2I(timeout));
-    return chibios_to_qmk(&status);
+    return i2c_epilogue(status);
 }
 
 void i2c_stop(void) {

From 59d940c9f33eb95691c40187c9f1e9a648de35cb Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Wed, 27 Jul 2022 10:06:18 +0200
Subject: [PATCH 138/959] ChibiOS-Contrib: Update for RP2040 PWM and I2C driver
 (#17817)

---
 lib/chibios-contrib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 2bfb681d68..966c48894b 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 2bfb681d68df4294f73847dba2cf2218b21a50e7
+Subproject commit 966c48894b12a2ebf8819e6316c2a5dabdd320f2

From 157ea964117de382b52229db87a55340830839c9 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 28 Jul 2022 03:02:10 +0200
Subject: [PATCH 139/959] ChibiOS: use correct status codes in i2c_master.c
 (#17808)

msg_t is MSG_OK in the success case and either MSG_RESET or MSG_TIMEOUT
in case of errors. So actually use them in the comparison.
---
 platforms/chibios/drivers/i2c_master.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index bf8f1ee236..4c7a5daa17 100644
--- a/platforms/chibios/drivers/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
@@ -116,7 +116,7 @@ static const I2CConfig i2cconfig = {
  * @return i2c_status_t QMK specific I2C status code
  */
 static i2c_status_t i2c_epilogue(const msg_t status) {
-    if (status == I2C_NO_ERROR) {
+    if (status == MSG_OK) {
         return I2C_STATUS_SUCCESS;
     }
 
@@ -125,7 +125,7 @@ static i2c_status_t i2c_epilogue(const msg_t status) {
     // hard stop in case of any error.
     i2c_stop();
 
-    return status == I2C_TIMEOUT ? I2C_STATUS_TIMEOUT : I2C_STATUS_ERROR;
+    return status == MSG_TIMEOUT ? I2C_STATUS_TIMEOUT : I2C_STATUS_ERROR;
 }
 
 __attribute__((weak)) void i2c_init(void) {

From 95c1cc425e596ddcfff7bebd678635fea7ffbcdc Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Fri, 29 Jul 2022 06:51:01 +0200
Subject: [PATCH 140/959] =?UTF-8?q?Rename=20postprocess=5Fsteno=5Fuser=20?=
 =?UTF-8?q?=E2=86=92=20post=5Fprocess=5Fsteno=5Fuser=20(#17823)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/feature_stenography.md             | 2 +-
 docs/ja/feature_stenography.md          | 2 +-
 quantum/process_keycode/process_steno.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/feature_stenography.md b/docs/feature_stenography.md
index e13fe845c5..62d4dabf81 100644
--- a/docs/feature_stenography.md
+++ b/docs/feature_stenography.md
@@ -133,7 +133,7 @@ bool process_steno_user(uint16_t keycode, keyrecord_t *record) { return true; }
 This function is called when a keypress has come in, before it is processed. The keycode should be one of `QK_STENO_BOLT`, `QK_STENO_GEMINI`, or one of the `STN_*` key values.
 
 ```c
-bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE], int8_t n_pressed_keys);
+bool post_process_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE], int8_t n_pressed_keys);
 ```
 
 This function is called after a key has been processed, but before any decision about whether or not to send a chord. This is where to put hooks for things like, say, live displays of steno chords or keys.
diff --git a/docs/ja/feature_stenography.md b/docs/ja/feature_stenography.md
index f8f7df11e1..b280084ae3 100644
--- a/docs/ja/feature_stenography.md
+++ b/docs/ja/feature_stenography.md
@@ -77,7 +77,7 @@ bool process_steno_user(uint16_t keycode, keyrecord_t *record) { return true; }
 この関数はキーが押されるとキーが処理される前に呼び出されます。キーコードは `QK_STENO_BOLT`、`QK_STENO_GEMINI` あるいは `STN_*` キー値のいずれかでなければなりません。
 
 ```c
-bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed);
+bool post_process_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed);
 ```
 
 この関数はキーが処理された後、ただしコードを送信するかどうかを決める前に呼び出されます。`IS_PRESSED(record->event)` が false で、`pressed` が 0 または 1 の場合は、コードはまもなく送信されますが、まだ送信されてはいません。ここが速記コードあるいはキーのライブ表示などのフックを配置する場所です。
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index 20b8b9db4b..30a0d4056f 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -148,7 +148,7 @@ __attribute__((weak)) bool send_steno_chord_user(steno_mode_t mode, uint8_t chor
     return true;
 }
 
-__attribute__((weak)) bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE], int8_t n_pressed_keys) {
+__attribute__((weak)) bool post_process_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[MAX_STROKE_SIZE], int8_t n_pressed_keys) {
     return true;
 }
 
@@ -209,12 +209,12 @@ bool process_steno(uint16_t keycode, keyrecord_t *record) {
                     default:
                         return false;
                 }
-                if (!postprocess_steno_user(keycode, record, mode, chord, n_pressed_keys)) {
+                if (!post_process_steno_user(keycode, record, mode, chord, n_pressed_keys)) {
                     return false;
                 }
             } else { // is released
                 n_pressed_keys--;
-                if (!postprocess_steno_user(keycode, record, mode, chord, n_pressed_keys)) {
+                if (!post_process_steno_user(keycode, record, mode, chord, n_pressed_keys)) {
                     return false;
                 }
                 if (n_pressed_keys > 0) {

From a204523bbb22d45e2968d1ded64d499b9777f37f Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Fri, 29 Jul 2022 20:13:16 +0200
Subject: [PATCH 141/959] [Core] RP2040 disable PIO IRQs on serial timeout
 (#17839)

---
 platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
index 338146dadd..764764b3f9 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
@@ -206,6 +206,7 @@ static inline msg_t sync_tx(sysinterval_t timeout) {
         pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, true);
         msg = osalThreadSuspendTimeoutS(&tx_thread, timeout);
         if (msg < MSG_OK) {
+            pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, false);
             break;
         }
     }
@@ -265,6 +266,7 @@ static inline msg_t sync_rx(sysinterval_t timeout) {
         pio_set_irq0_source_enabled(pio, pis_sm0_rx_fifo_not_empty + rx_state_machine, true);
         msg = osalThreadSuspendTimeoutS(&rx_thread, timeout);
         if (msg < MSG_OK) {
+            pio_set_irq0_source_enabled(pio, pis_sm0_rx_fifo_not_empty + rx_state_machine, false);
             break;
         }
     }

From 21603c5142c1bd7d0e766bd78b4cc31408c3649d Mon Sep 17 00:00:00 2001
From: Frank Tackitt <im@frank.af>
Date: Fri, 29 Jul 2022 15:42:34 -0700
Subject: [PATCH 142/959] Enable mousekeys by default for RGBKB Sol3 (#17842)

---
 keyboards/rgbkb/sol3/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index e30330d333..6f04c5ec96 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -14,7 +14,7 @@ QUANTUM_LIB_SRC += i2c_master.c
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
+MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration

From 0b726a437b8906fb52662504ccb6e4f052890f3c Mon Sep 17 00:00:00 2001
From: Drzony <drzony@gmail.com>
Date: Sat, 30 Jul 2022 06:20:34 +0200
Subject: [PATCH 143/959] Implement relative mode for Cirque trackpad (#17760)

---
 docs/feature_pointing_device.md               | 75 +++++++++++------
 drivers/sensors/cirque_pinnacle.c             | 83 ++++++++++++++++---
 drivers/sensors/cirque_pinnacle.h             | 51 +++++++-----
 drivers/sensors/cirque_pinnacle_gestures.c    | 12 ++-
 drivers/sensors/cirque_pinnacle_gestures.h    |  5 +-
 drivers/sensors/cirque_pinnacle_regdefs.h     |  2 +-
 .../pointing_device/pointing_device_drivers.c | 51 ++++++++----
 7 files changed, 202 insertions(+), 77 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index f8a55c1c86..17acc15ff0 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -89,17 +89,16 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
 
 This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the TM040040, TM035035 and the TM023023 trackpads. These are I2C or SPI compatible, and both configurations are supported.
 
+#### Common settings
+
 | Setting                          | Description                                                | Default            |
 | -------------------------------- | ---------------------------------------------------------- | ------------------ |
-| `CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.    | `127`              |
-| `CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.    | `1919`             |
-| `CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.    | `63`               |
-| `CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.    | `1471`             |
 | `CIRQUE_PINNACLE_DIAMETER_MM`    | (Optional) Diameter of the trackpad sensor in millimeters. | `40`               |
 | `CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.        | `ADC_ATTENUATE_4X` |
 | `CIRQUE_PINNACLE_CURVED_OVERLAY` | (Optional) Applies settings tuned for curved overlay.      | _not defined_      |
+| `CIRQUE_PINNACLE_POSITION_MODE`  | (Optional) Mode of operation.                              | _not defined_      |
 
-**`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be. 
+**`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be.
 
 Default attenuation is set to 4X, although if you are using a thicker overlay (such as the curved overlay) you will want a lower attenuation such as 2X. The possible values are:
 * `ADC_ATTENUATE_4X`: Least sensitive
@@ -107,6 +106,11 @@ Default attenuation is set to 4X, although if you are using a thicker overlay (s
 * `ADC_ATTENUATE_2X`
 * `ADC_ATTENUATE_1X`: Most sensitive
 
+**`CIRQUE_PINNACLE_POSITION_MODE`** can be `CIRQUE_PINNACLE_ABSOLUTE_MODE` or `CIRQUE_PINNACLE_RELATIVE_MODE`. Modes differ in supported features/gestures.
+
+* `CIRQUE_PINNACLE_ABSOLUTE_MODE`: Reports absolute x, y, z (touch pressure) coordinates and up to 5 hw buttons connected to the trackpad
+* `CIRQUE_PINNACLE_RELATIVE_MODE`: Reports x/y deltas, scroll and up to 3 buttons (2 of them can be from taps, see gestures) connected to trackpad. Supports taps on secondary side of split. Saves about 2k of flash compared to absolute mode with all features.
+
 | I2C Setting               | Description                                                                     | Default |
 | ------------------------- | ------------------------------------------------------------------------------- | ------- |
 | `CIRQUE_PINNACLE_ADDR`    | (Required) Sets the I2C Address for the Cirque Trackpad                         | `0x2A`  |
@@ -124,16 +128,37 @@ Default Scaling is 1024. Actual CPI depends on trackpad diameter.
 
 Also see the `POINTING_DEVICE_TASK_THROTTLE_MS`, which defaults to 10ms when using Cirque Pinnacle, which matches the internal update rate of the position registers (in standard configuration). Advanced configuration for pen/stylus usage might require lower values.
 
-#### Cirque Trackpad gestures
+#### Absolute mode settings
 
-| Gesture Setting                                | Description                                                                                                                                                                                      | Default              |
-| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------- |
-| `CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE`       | (Optional) Enable circular scroll. Touch originating in outer ring can trigger scroll by moving along the perimeter. Near side triggers vertical scroll and far side triggers horizontal scroll. | _not defined_        |
-| `CIRQUE_PINNACLE_TAP_ENABLE`                   | (Optional) Enable tap to click. This currently only works on the master side.                                                                                                                    | _not defined_        |
-| `CIRQUE_PINNACLE_TAPPING_TERM`                 | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
-| `CIRQUE_PINNACLE_TOUCH_DEBOUNCE`               | (Optional) Length of time that a touch can be to be considered a tap.                                                                                                                            | `TAPPING_TERM`/`200` |
+| Setting                          | Description                                                | Default            |
+| -------------------------------- | ---------------------------------------------------------- | ------------------ |
+| `CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.    | `127`              |
+| `CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.    | `1919`             |
+| `CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.    | `63`               |
+| `CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.    | `1471`             |
 
-Additionally, `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` is supported on the Cirque.
+#### Absolute mode gestures
+
+| Gesture Setting                                | Description                                                                    | Default              |
+| ---------------------------------------------- | ------------------------------------------------------------------------------ | -------------------- |
+| `CIRQUE_PINNACLE_TAP_ENABLE`                   | (Optional) Enable tap to click. This currently only works on the master side.  | _not defined_        |
+| `CIRQUE_PINNACLE_TAPPING_TERM`                 | (Optional) Length of time that a touch can be to be considered a tap.          | `TAPPING_TERM`/`200` |
+| `CIRQUE_PINNACLE_TOUCH_DEBOUNCE`               | (Optional) Length of time that a touch can be to be considered a tap.          | `TAPPING_TERM`/`200` |
+
+`POINTING_DEVICE_GESTURES_SCROLL_ENABLE` in this mode enables circular scroll. Touch originating in outer ring can trigger scroll by moving along the perimeter. Near side triggers vertical scroll and far side triggers horizontal scroll.
+
+Additionally, `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` is supported in this mode.
+
+#### Relative mode gestures
+
+| Gesture Setting                        | Description                                                                                                                                                                               | Default       |
+| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
+| `CIRQUE_PINNACLE_TAP_ENABLE`           | (Optional) Enable tap to "left click". Works on both sides of a split keyboard.                                                                                                           | _not defined_ |
+| `CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE` | (Optional) Tap in upper right corner (half of the finger needs to be outside of the trackpad) of the trackpad will result in "right click". `CIRQUE_PINNACLE_TAP_ENABLE` must be enabled. | _not defined_ |
+
+Tapping term and debounce are not configurable in this mode since it's handled by trackpad internally.
+
+`POINTING_DEVICE_GESTURES_SCROLL_ENABLE` in this mode enables side scroll. Touch originating on the right side can trigger vertical scroll (IntelliSense trackpad style).
 
 ### PAW 3204 Sensor
 
@@ -152,7 +177,6 @@ The paw 3204 sensor uses a serial type protocol for communication, and requires
 
 The CPI range is 400-1600, with supported values of (400, 500, 600, 800, 1000, 1200 and 1600).  Defaults to 1000 CPI.
 
-
 ### Pimoroni Trackball
 
 To use the Pimoroni Trackball module, add this to your `rules.mk`:
@@ -254,17 +278,18 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 
 ## Common Configuration
 
-| Setting                            | Description                                                                                                                      | Default       |
-| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| `MOUSE_EXTENDED_REPORT`            | (Optional) Enables support for extended mouse reports. (-32767 to 32767, instead of just -127 to 127).                           | _not defined_ |
-| `POINTING_DEVICE_ROTATION_90`      | (Optional) Rotates the X and Y data by  90 degrees.                                                                              | _not defined_ |
-| `POINTING_DEVICE_ROTATION_180`     | (Optional) Rotates the X and Y data by 180 degrees.                                                                              | _not defined_ |
-| `POINTING_DEVICE_ROTATION_270`     | (Optional) Rotates the X and Y data by 270 degrees.                                                                              | _not defined_ |
-| `POINTING_DEVICE_INVERT_X`         | (Optional) Inverts the X axis report.                                                                                            | _not defined_ |
-| `POINTING_DEVICE_INVERT_Y`         | (Optional) Inverts the Y axis report.                                                                                            | _not defined_ |
-| `POINTING_DEVICE_MOTION_PIN`       | (Optional) If supported, will only read from sensor if pin is active.                                                            | _not defined_ |
-| `POINTING_DEVICE_TASK_THROTTLE_MS` | (Optional) Limits the frequency that the sensor is polled for motion.                                                            | _not defined_ |
-| `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction. | _not defined_ |
+| Setting                                        | Description                                                                                                                      | Default       |
+| ---------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------- |
+| `MOUSE_EXTENDED_REPORT`                        | (Optional) Enables support for extended mouse reports. (-32767 to 32767, instead of just -127 to 127).                           | _not defined_ |
+| `POINTING_DEVICE_ROTATION_90`                  | (Optional) Rotates the X and Y data by  90 degrees.                                                                              | _not defined_ |
+| `POINTING_DEVICE_ROTATION_180`                 | (Optional) Rotates the X and Y data by 180 degrees.                                                                              | _not defined_ |
+| `POINTING_DEVICE_ROTATION_270`                 | (Optional) Rotates the X and Y data by 270 degrees.                                                                              | _not defined_ |
+| `POINTING_DEVICE_INVERT_X`                     | (Optional) Inverts the X axis report.                                                                                            | _not defined_ |
+| `POINTING_DEVICE_INVERT_Y`                     | (Optional) Inverts the Y axis report.                                                                                            | _not defined_ |
+| `POINTING_DEVICE_MOTION_PIN`                   | (Optional) If supported, will only read from sensor if pin is active.                                                            | _not defined_ |
+| `POINTING_DEVICE_TASK_THROTTLE_MS`             | (Optional) Limits the frequency that the sensor is polled for motion.                                                            | _not defined_ |
+| `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction.             | _not defined_ |
+| `POINTING_DEVICE_GESTURES_SCROLL_ENABLE`       | (Optional) Enable scroll gesture. The gesture that activates the scroll is device dependent.                                     | _not defined_ |
 
 !> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and `POINTING_DEVICE_TASK_THROTTLE_MS` will default to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
 
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index c50d5a2525..8bd4eb736e 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -9,6 +9,8 @@
 #include "wait.h"
 #include "timer.h"
 
+#include <stdlib.h>
+
 #ifndef CIRQUE_PINNACLE_ATTENUATION
 #    ifdef CIRQUE_PINNACLE_CURVED_OVERLAY
 #        define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X
@@ -31,6 +33,7 @@ void print_byte(uint8_t byte) {
 }
 #endif
 
+#if CIRQUE_PINNACLE_POSITION_MODE
 /*  Logical Scaling Functions */
 // Clips raw coordinates to "reachable" window of sensor
 // NOTE: values outside this window can only appear as a result of noise
@@ -46,6 +49,7 @@ void ClipCoordinates(pinnacle_data_t* coordinates) {
         coordinates->yValue = CIRQUE_PINNACLE_Y_UPPER;
     }
 }
+#endif
 
 uint16_t cirque_pinnacle_get_scale(void) {
     return scale_data;
@@ -56,6 +60,7 @@ void cirque_pinnacle_set_scale(uint16_t scale) {
 
 // Scales data to desired X & Y resolution
 void cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResolution, uint16_t yResolution) {
+#if CIRQUE_PINNACLE_POSITION_MODE
     uint32_t xTemp = 0;
     uint32_t yTemp = 0;
 
@@ -71,6 +76,22 @@ void cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResoluti
     // scale coordinates to (xResolution, yResolution) range
     coordinates->xValue = (uint16_t)(xTemp * xResolution / CIRQUE_PINNACLE_X_RANGE);
     coordinates->yValue = (uint16_t)(yTemp * yResolution / CIRQUE_PINNACLE_Y_RANGE);
+#else
+    int32_t        xTemp = 0, yTemp = 0;
+    ldiv_t         temp;
+    static int32_t xRemainder, yRemainder;
+
+    temp       = ldiv(((int32_t)coordinates->xDelta) * (int32_t)xResolution + xRemainder, (int32_t)CIRQUE_PINNACLE_X_RANGE);
+    xTemp      = temp.quot;
+    xRemainder = temp.rem;
+
+    temp       = ldiv(((int32_t)coordinates->yDelta) * (int32_t)yResolution + yRemainder, (int32_t)CIRQUE_PINNACLE_Y_RANGE);
+    yTemp      = temp.quot;
+    yRemainder = temp.rem;
+
+    coordinates->xDelta = (int16_t)xTemp;
+    coordinates->yDelta = (int16_t)yTemp;
+#endif
 }
 
 // Clears Status1 register flags (SW_CC and SW_DR)
@@ -142,14 +163,20 @@ void ERA_WriteByte(uint16_t address, uint8_t data) {
     cirque_pinnacle_clear_flags();
 }
 
-void cirque_pinnacle_set_adc_attenuation(uint8_t adcGain) {
+bool cirque_pinnacle_set_adc_attenuation(uint8_t adcGain) {
     uint8_t adcconfig = 0x00;
 
     ERA_ReadBytes(EXTREG__TRACK_ADCCONFIG, &adcconfig, 1);
-    adcconfig &= EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK;
+    adcGain &= EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK;
+    if (adcGain == (adcconfig & EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK)) {
+        return false;
+    }
+    adcconfig &= ~EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK;
     adcconfig |= adcGain;
     ERA_WriteByte(EXTREG__TRACK_ADCCONFIG, adcconfig);
     ERA_ReadBytes(EXTREG__TRACK_ADCCONFIG, &adcconfig, 1);
+
+    return true;
 }
 
 // Changes thresholds to improve detection of fingers
@@ -207,30 +234,52 @@ void cirque_pinnacle_init(void) {
 
     touchpad_init = true;
 
-    // Host clears SW_CC flag
-    cirque_pinnacle_clear_flags();
-
     // send a RESET command now, in case QMK had a soft-reset without a power cycle
     RAP_Write(HOSTREG__SYSCONFIG1, HOSTREG__SYSCONFIG1__RESET);
     wait_ms(30); // Pinnacle needs 10-15ms to boot, so wait long enough before configuring
     RAP_Write(HOSTREG__SYSCONFIG1, HOSTREG__SYSCONFIG1_DEFVAL);
     wait_us(50);
 
-    // FeedConfig2 (Feature flags for Relative Mode Only)
+    // Host clears SW_CC flag
+    cirque_pinnacle_clear_flags();
+
+#if CIRQUE_PINNACLE_POSITION_MODE
     RAP_Write(HOSTREG__FEEDCONFIG2, HOSTREG__FEEDCONFIG2_DEFVAL);
+#else
+    // FeedConfig2 (Feature flags for Relative Mode Only)
+    uint8_t feedconfig2 = HOSTREG__FEEDCONFIG2__GLIDE_EXTEND_DISABLE | HOSTREG__FEEDCONFIG2__INTELLIMOUSE_MODE;
+#    if !defined(CIRQUE_PINNACLE_TAP_ENABLE)
+    feedconfig2 |= HOSTREG__FEEDCONFIG2__ALL_TAP_DISABLE;
+#    endif
+#    if !defined(CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE)
+    feedconfig2 |= HOSTREG__FEEDCONFIG2__SECONDARY_TAP_DISABLE;
+#    elif !defined(CIRQUE_PINNACLE_TAP_ENABLE)
+#        error CIRQUE_PINNACLE_TAP_ENABLE must be defined for CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE to work
+#    endif
+#    if !defined(CIRQUE_PINNACLE_SIDE_SCROLL_ENABLE)
+    feedconfig2 |= HOSTREG__FEEDCONFIG2__SCROLL_DISABLE;
+#    endif
+    RAP_Write(HOSTREG__FEEDCONFIG2, feedconfig2);
+#endif
 
     // FeedConfig1 (Data Output Flags)
     RAP_Write(HOSTREG__FEEDCONFIG1, CIRQUE_PINNACLE_POSITION_MODE ? HOSTREG__FEEDCONFIG1__DATA_TYPE__REL0_ABS1 : HOSTREG__FEEDCONFIG1_DEFVAL);
 
+#if CIRQUE_PINNACLE_POSITION_MODE
     // Host sets z-idle packet count to 5 (default is 0x1E/30)
     RAP_Write(HOSTREG__ZIDLE, 5);
+#endif
+
+    bool calibrate = cirque_pinnacle_set_adc_attenuation(CIRQUE_PINNACLE_ATTENUATION);
 
-    cirque_pinnacle_set_adc_attenuation(CIRQUE_PINNACLE_ATTENUATION);
 #ifdef CIRQUE_PINNACLE_CURVED_OVERLAY
     cirque_pinnacle_tune_edge_sensitivity();
+    calibrate = true;
 #endif
-    // Force a calibration after setting ADC attenuation
-    cirque_pinnacle_calibrate();
+    if (calibrate) {
+        // Force a calibration after setting ADC attenuation
+        cirque_pinnacle_calibrate();
+    }
 
     cirque_pinnacle_enable_feed(true);
 }
@@ -265,10 +314,18 @@ pinnacle_data_t cirque_pinnacle_read_data(void) {
 #else
     // Decode data for relative mode
     // Registers 0x16 and 0x17 are unused in this mode
-    result.buttons    = data[0] & 0x07; // bit0 = primary button, bit1 = secondary button, bit2 = auxilary button, if Taps enabled then also software-recognized taps are reported
-    result.xDelta     = data[1];
-    result.yDelta     = data[2];
-    result.wheelCount = data[3];
+    result.buttons = data[0] & 0x07; // Only three buttons are supported
+    if ((data[0] & 0x10) && data[1] != 0) {
+        result.xDelta = -((int16_t)256 - (int16_t)(data[1]));
+    } else {
+        result.xDelta = data[1];
+    }
+    if ((data[0] & 0x20) && data[2] != 0) {
+        result.yDelta = ((int16_t)256 - (int16_t)(data[2]));
+    } else {
+        result.yDelta = -((int16_t)data[2]);
+    }
+    result.wheelCount = ((int8_t*)data)[3];
 #endif
 
     result.valid = true;
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index 1c9bf06fd3..e9bb9621e4 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -21,24 +21,35 @@
 #    define CIRQUE_PINNACLE_DIAMETER_MM 40
 #endif
 
+#if CIRQUE_PINNACLE_POSITION_MODE
 // Coordinate scaling values
-#ifndef CIRQUE_PINNACLE_X_LOWER
-#    define CIRQUE_PINNACLE_X_LOWER 127 // min "reachable" X value
-#endif
-#ifndef CIRQUE_PINNACLE_X_UPPER
-#    define CIRQUE_PINNACLE_X_UPPER 1919 // max "reachable" X value
-#endif
-#ifndef CIRQUE_PINNACLE_Y_LOWER
-#    define CIRQUE_PINNACLE_Y_LOWER 63 // min "reachable" Y value
-#endif
-#ifndef CIRQUE_PINNACLE_Y_UPPER
-#    define CIRQUE_PINNACLE_Y_UPPER 1471 // max "reachable" Y value
-#endif
-#ifndef CIRQUE_PINNACLE_X_RANGE
-#    define CIRQUE_PINNACLE_X_RANGE (CIRQUE_PINNACLE_X_UPPER - CIRQUE_PINNACLE_X_LOWER)
-#endif
-#ifndef CIRQUE_PINNACLE_Y_RANGE
-#    define CIRQUE_PINNACLE_Y_RANGE (CIRQUE_PINNACLE_Y_UPPER - CIRQUE_PINNACLE_Y_LOWER)
+#    ifndef CIRQUE_PINNACLE_X_LOWER
+#        define CIRQUE_PINNACLE_X_LOWER 127 // min "reachable" X value
+#    endif
+#    ifndef CIRQUE_PINNACLE_X_UPPER
+#        define CIRQUE_PINNACLE_X_UPPER 1919 // max "reachable" X value
+#    endif
+#    ifndef CIRQUE_PINNACLE_Y_LOWER
+#        define CIRQUE_PINNACLE_Y_LOWER 63 // min "reachable" Y value
+#    endif
+#    ifndef CIRQUE_PINNACLE_Y_UPPER
+#        define CIRQUE_PINNACLE_Y_UPPER 1471 // max "reachable" Y value
+#    endif
+#    ifndef CIRQUE_PINNACLE_X_RANGE
+#        define CIRQUE_PINNACLE_X_RANGE (CIRQUE_PINNACLE_X_UPPER - CIRQUE_PINNACLE_X_LOWER)
+#    endif
+#    ifndef CIRQUE_PINNACLE_Y_RANGE
+#        define CIRQUE_PINNACLE_Y_RANGE (CIRQUE_PINNACLE_Y_UPPER - CIRQUE_PINNACLE_Y_LOWER)
+#    endif
+#    if defined(POINTING_DEVICE_GESTURE_SCROLL_ENABLE)
+#        define CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
+#    endif
+#else
+#    define CIRQUE_PINNACLE_X_RANGE 256
+#    define CIRQUE_PINNACLE_Y_RANGE 256
+#    if defined(POINTING_DEVICE_GESTURE_SCROLL_ENABLE)
+#        define CIRQUE_PINNACLE_SIDE_SCROLL_ENABLE
+#    endif
 #endif
 #if !defined(POINTING_DEVICE_TASK_THROTTLE_MS)
 #    define POINTING_DEVICE_TASK_THROTTLE_MS 10 // Cirque Pinnacle in normal operation produces data every 10ms. Advanced configuration for pen/stylus usage might require lower values.
@@ -86,9 +97,9 @@ typedef struct {
     uint8_t  buttonFlags;
     bool     touchDown;
 #else
-    uint8_t xDelta;
-    uint8_t yDelta;
-    uint8_t wheelCount;
+    int16_t xDelta;
+    int16_t yDelta;
+    int8_t  wheelCount;
     uint8_t buttons;
 #endif
 } pinnacle_data_t;
diff --git a/drivers/sensors/cirque_pinnacle_gestures.c b/drivers/sensors/cirque_pinnacle_gestures.c
index dc2f682a83..a73b745e59 100644
--- a/drivers/sensors/cirque_pinnacle_gestures.c
+++ b/drivers/sensors/cirque_pinnacle_gestures.c
@@ -24,11 +24,11 @@
 #    include "keyboard.h"
 #endif
 
-#if defined(CIRQUE_PINNACLE_TAP_ENABLE) || defined(CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE)
+#if (defined(CIRQUE_PINNACLE_TAP_ENABLE) || defined(CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE)) && CIRQUE_PINNACLE_POSITION_MODE
 static cirque_pinnacle_features_t features = {.tap_enable = true, .circular_scroll_enable = true};
 #endif
 
-#ifdef CIRQUE_PINNACLE_TAP_ENABLE
+#if defined(CIRQUE_PINNACLE_TAP_ENABLE) && CIRQUE_PINNACLE_POSITION_MODE
 static trackpad_tap_context_t tap;
 
 static report_mouse_t trackpad_tap(report_mouse_t mouse_report, pinnacle_data_t touchData) {
@@ -62,6 +62,9 @@ void cirque_pinnacle_enable_tap(bool enable) {
 #endif
 
 #ifdef CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
+#    if !CIRQUE_PINNACLE_POSITION_MODE
+#        error "Circular scroll is not supported in relative mode"
+#    endif
 /* To set a trackpad exclusively as scroll wheel: outer_ring_pct = 100, trigger_px = 0, trigger_ang = 0 */
 static circular_scroll_context_t scroll = {.config = {.outer_ring_pct = 33,
                                                       .trigger_px     = 16,
@@ -213,6 +216,9 @@ bool cirque_pinnacle_gestures(report_mouse_t* mouse_report, pinnacle_data_t touc
     bool suppress_mouse_update = false;
 
 #ifdef CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
+#    if !CIRQUE_PINNACLE_POSITION_MODE
+#        error "Circular scroll is not supported in relative mode"
+#    endif
     circular_scroll_t scroll_report;
     if (features.circular_scroll_enable) {
         scroll_report         = circular_scroll(touchData);
@@ -222,7 +228,7 @@ bool cirque_pinnacle_gestures(report_mouse_t* mouse_report, pinnacle_data_t touc
     }
 #endif
 
-#ifdef CIRQUE_PINNACLE_TAP_ENABLE
+#if defined(CIRQUE_PINNACLE_TAP_ENABLE) && CIRQUE_PINNACLE_POSITION_MODE
     if (features.tap_enable) {
         *mouse_report = trackpad_tap(*mouse_report, touchData);
     }
diff --git a/drivers/sensors/cirque_pinnacle_gestures.h b/drivers/sensors/cirque_pinnacle_gestures.h
index f39782b467..d2aa206b2b 100644
--- a/drivers/sensors/cirque_pinnacle_gestures.h
+++ b/drivers/sensors/cirque_pinnacle_gestures.h
@@ -24,7 +24,7 @@ typedef struct {
     bool circular_scroll_enable;
 } cirque_pinnacle_features_t;
 
-#ifdef CIRQUE_PINNACLE_TAP_ENABLE
+#if defined(CIRQUE_PINNACLE_TAP_ENABLE) && CIRQUE_PINNACLE_POSITION_MODE
 #    ifndef CIRQUE_PINNACLE_TAPPING_TERM
 #        include "action.h"
 #        include "action_tapping.h"
@@ -44,6 +44,9 @@ void cirque_pinnacle_enable_tap(bool enable);
 #endif
 
 #ifdef CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
+#    if !CIRQUE_PINNACLE_POSITION_MODE
+#        error "Circular scroll is not supported in relative mode"
+#    endif
 typedef enum {
     SCROLL_UNINITIALIZED,
     SCROLL_DETECTING,
diff --git a/drivers/sensors/cirque_pinnacle_regdefs.h b/drivers/sensors/cirque_pinnacle_regdefs.h
index 993da1e757..fb9e09af6e 100644
--- a/drivers/sensors/cirque_pinnacle_regdefs.h
+++ b/drivers/sensors/cirque_pinnacle_regdefs.h
@@ -384,7 +384,7 @@
 #define EXTREG__TRACK_ADCCONFIG                                     0x0187
 // ADC-attenuation settings (held in BIT_7 and BIT_6)
 // 1X = most sensitive, 4X = least sensitive
-#    define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK             0x3F
+#    define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_MASK             0xC0
 #        define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_1X           0x00
 #        define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X           0x40
 #        define EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_3X           0x80
diff --git a/quantum/pointing_device/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
index 3780f3d2da..b96f8ff4b3 100644
--- a/quantum/pointing_device/pointing_device_drivers.c
+++ b/quantum/pointing_device/pointing_device_drivers.c
@@ -116,38 +116,35 @@ void cirque_pinnacle_configure_cursor_glide(float trigger_px) {
 }
 #    endif
 
+#    if CIRQUE_PINNACLE_POSITION_MODE
 report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     pinnacle_data_t   touchData = cirque_pinnacle_read_data();
     mouse_xy_report_t report_x = 0, report_y = 0;
     static uint16_t   x = 0, y = 0;
-#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+#        ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
     cursor_glide_t    glide_report = {0};
 
     if (cursor_glide_enable) {
         glide_report = cursor_glide_check(&glide);
     }
-#    endif
-
-#    if !CIRQUE_PINNACLE_POSITION_MODE
-#        error Cirque Pinnacle with relative mode not implemented yet.
-#    endif
+#        endif
 
     if (!touchData.valid) {
-#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+#        ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
         if (cursor_glide_enable && glide_report.valid) {
             report_x = glide_report.dx;
             report_y = glide_report.dy;
             goto mouse_report_update;
         }
-#    endif
+#        endif
         return mouse_report;
     }
 
-#    if CONSOLE_ENABLE
+#        if CONSOLE_ENABLE
     if (debug_mouse && touchData.touchDown) {
         dprintf("cirque_pinnacle touchData x=%4d y=%4d z=%2d\n", touchData.xValue, touchData.yValue, touchData.zValue);
     }
-#    endif
+#        endif
 
     // Scale coordinates to arbitrary X, Y resolution
     cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());
@@ -160,7 +157,7 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
         x = touchData.xValue;
         y = touchData.yValue;
 
-#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+#        ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
         if (cursor_glide_enable) {
             if (touchData.touchDown) {
                 cursor_glide_update(&glide, report_x, report_y, touchData.zValue);
@@ -172,12 +169,12 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
                 }
             }
         }
-#    endif
+#        endif
     }
 
-#    ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+#        ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
 mouse_report_update:
-#    endif
+#        endif
     mouse_report.x = report_x;
     mouse_report.y = report_y;
 
@@ -199,6 +196,32 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = cirque_pinnacle_get_cpi
 };
 // clang-format on
+#    else
+report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
+    pinnacle_data_t touchData = cirque_pinnacle_read_data();
+
+    // Scale coordinates to arbitrary X, Y resolution
+    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());
+
+    if (touchData.valid) {
+        mouse_report.buttons = touchData.buttons;
+        mouse_report.x       = CONSTRAIN_HID_XY(touchData.xDelta);
+        mouse_report.y       = CONSTRAIN_HID_XY(touchData.yDelta);
+        mouse_report.v       = touchData.wheelCount;
+    }
+    return mouse_report;
+}
+
+// clang-format off
+const pointing_device_driver_t pointing_device_driver = {
+    .init       = cirque_pinnacle_init,
+    .get_report = cirque_pinnacle_get_report,
+    .set_cpi    = cirque_pinnacle_set_scale,
+    .get_cpi    = cirque_pinnacle_get_scale
+};
+// clang-format on
+#    endif
+
 #elif defined(POINTING_DEVICE_DRIVER_paw3204)
 
 report_mouse_t paw3204_get_report(report_mouse_t mouse_report) {

From f02e3553808bb086b39946b63d5d4057060e02e7 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sat, 30 Jul 2022 18:21:54 -0400
Subject: [PATCH 144/959] More glyph transformations for spidey3 userspace
 (#17854)

* add bold and blackboard bold glyph transformations

* trim firmware size; cformat

* fix typo in macro

* trim firmware size a bit more
---
 layouts/community/75_ansi/spidey3/config.h |   1 +
 layouts/community/75_ansi/spidey3/keymap.c |   2 +-
 users/spidey3/init.c                       |   1 -
 users/spidey3/layer_rgb.c                  | 139 +++++++++++----------
 users/spidey3/spidey3.c                    |  88 ++++++++-----
 users/spidey3/spidey3.h                    |   2 +
 6 files changed, 131 insertions(+), 102 deletions(-)

diff --git a/layouts/community/75_ansi/spidey3/config.h b/layouts/community/75_ansi/spidey3/config.h
index 89bd9422ae..3fb06b2363 100644
--- a/layouts/community/75_ansi/spidey3/config.h
+++ b/layouts/community/75_ansi/spidey3/config.h
@@ -2,6 +2,7 @@
 
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
+#define NO_ACTION_ONESHOT
 #undef LOCKING_SUPPORT_ENABLE
 
 #define LAYER_STATE_8BIT
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index d7ffd61a49..05f3aac4bc 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // FN
     [_FN] = LAYOUT_75_ansi(
-        RESET,      SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, XXXXXXX,    XXXXXXX,    XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
+        RESET,      SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
         EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SLCK,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    RGB_SPD,    RGB_SPI,    VLK_TOG,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_T,    SPI_LNX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
diff --git a/users/spidey3/init.c b/users/spidey3/init.c
index 8db41a5f4c..0c2bd678e0 100644
--- a/users/spidey3/init.c
+++ b/users/spidey3/init.c
@@ -7,7 +7,6 @@ void keyboard_post_init_user(void) {
 }
 
 void eeconfig_init_user(void) {
-    print("eeconfig_init_user\n");
     set_single_persistent_default_layer(_BASE);
 #ifdef UNICODEMAP_ENABLE
     eeconfig_init_user_unicode();
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index 37e59579cf..7381f64bb2 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -101,7 +101,6 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
 const uint8_t PROGMEM _n_rgb_layers = sizeof(_rgb_layers) / sizeof(_rgb_layers[0]) - 1;
 
 void clear_rgb_layers() {
-    dprint("clear_rgb_layers()\n");
     for (uint8_t i = 0; i < _n_rgb_layers; i++) {
         rgblight_set_layer_state(i, false);
     }
@@ -110,7 +109,6 @@ void clear_rgb_layers() {
 void do_rgb_layers(layer_state_t state, uint8_t start, uint8_t end) {
     for (uint8_t i = start; i < end; i++) {
         bool is_on = layer_state_cmp(state, i);
-        dprintf("layer[%u]=rl[%u]=%u\n", i, LAYER_OFFSET + i, is_on);
         rgblight_set_layer_state(LAYER_OFFSET + i, is_on);
     }
 }
@@ -119,7 +117,6 @@ void do_rgb_unicode(void) {
     uint8_t uc_mode = get_unicode_input_mode();
     for (uint8_t i = 0; i < UC__COUNT; i++) {
         bool is_on = i == uc_mode;
-        dprintf("unicode[%u]=rl[%u]=%u\n", i, UNICODE_OFFSET + i, is_on);
         rgblight_set_layer_state(UNICODE_OFFSET + i, is_on);
     }
 }
@@ -138,7 +135,7 @@ int8_t change_sat = 0;
 int8_t change_val = 0;
 
 // timer to control color change speed
-uint16_t change_timer = 0;
+uint16_t       change_timer = 0;
 const uint16_t change_tick  = 15;
 
 extern rgblight_config_t rgblight_config;
@@ -146,14 +143,15 @@ extern rgblight_status_t rgblight_status;
 
 #if defined(RGBLIGHT_STARTUP_ANIMATION)
 
-#define STARTUP_ANIMATION_SATURATION 200
-#define STARTUP_ANIMATION_VALUE 255
-#define STARTUP_ANIMATION_FADE_STEP 5
-#define STARTUP_ANIMATION_CYCLE_STEP 2
-#define STARTUP_ANIMATION_RAMP_TO_STEPS 70
-#define STARTUP_ANIMATION_STEP_TIME 10
-#define STARTUP_ANIMATION_INITIAL_DELAY 0 // milliseconds, must be < 255 * STEP_TIME
+#    define STARTUP_ANIMATION_SATURATION 200
+#    define STARTUP_ANIMATION_VALUE 255
+#    define STARTUP_ANIMATION_FADE_STEP 5
+#    define STARTUP_ANIMATION_CYCLE_STEP 2
+#    define STARTUP_ANIMATION_RAMP_TO_STEPS 70
+#    define STARTUP_ANIMATION_STEP_TIME 10
+#    define STARTUP_ANIMATION_INITIAL_DELAY 0  // milliseconds, must be < 255 * STEP_TIME
 
+// clang-format off
 typedef enum {
     DISABLED,
     WAITING,
@@ -167,18 +165,18 @@ typedef enum {
     CLEAN_UP,
     DONE
 } startup_animation_state_t;
+// clang-format on
 
-static rgblight_config_t old_config;
-static uint8_t old_base_mode;
+static rgblight_config_t         old_config;
+static uint8_t                   old_base_mode;
 static startup_animation_state_t startup_animation_state = DISABLED;
-static uint16_t rgblight_startup_loop_timer;
+static uint16_t                  rgblight_startup_loop_timer;
 
 void startup_animation_init(void) {
     old_config.raw = rgblight_config.raw;
     old_base_mode  = rgblight_status.base_mode;
 
-    if (!old_config.enable)
-        rgblight_enable_noeeprom();
+    if (!old_config.enable) rgblight_enable_noeeprom();
 }
 #endif
 
@@ -202,9 +200,9 @@ void matrix_scan_user_rgb(void) {
 
             switch (startup_animation_state) {
                 case WAITING:
-#ifdef STARTUP_ANIMATION_DEBUG
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintf("sua WAITING counter=%u\n", counter);
-#endif
+#    endif
                     if (counter < STARTUP_ANIMATION_INITIAL_DELAY / STARTUP_ANIMATION_STEP_TIME) {
                         counter++;
                     } else {
@@ -213,83 +211,87 @@ void matrix_scan_user_rgb(void) {
                     break;
 
                 case RESTART:
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintln("sua RESTART");
+#    endif
                     startup_animation_init();
                 case START:
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintln("sua START");
+#    endif
                     startup_animation_state = FADE_OLD;
-                    counter = old_config.val;
+                    counter                 = old_config.val;
                     // No break! Just roll into FADE_OLD in the same iteration...
 
                 case FADE_OLD:
-#ifdef STARTUP_ANIMATION_DEBUG
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintf("sua FADE_OLD counter=%u\n", counter);
-#endif
+#    endif
                     if (counter >= STARTUP_ANIMATION_FADE_STEP) {
                         rgblight_sethsv_noeeprom(old_config.hue, old_config.sat, counter);
                         counter -= STARTUP_ANIMATION_FADE_STEP;
                     } else {
-                        counter = 0;
+                        counter                 = 0;
                         startup_animation_state = FADE_IN;
                         rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
                     }
                     break;
 
                 case FADE_IN:
-#ifdef STARTUP_ANIMATION_DEBUG
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintf("sua FADE_IN counter=%u\n", counter);
-#endif
+#    endif
                     if (counter < STARTUP_ANIMATION_VALUE) {
                         rgblight_sethsv_noeeprom(old_config.hue, STARTUP_ANIMATION_SATURATION, counter);
                         counter += STARTUP_ANIMATION_FADE_STEP;
                     } else {
-                        counter = 255;
+                        counter                 = 255;
                         startup_animation_state = CYCLE;
                     }
                     break;
 
                 case CYCLE:
-#ifdef STARTUP_ANIMATION_DEBUG
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintf("sua CYCLE counter=%u\n", counter);
-#endif
+#    endif
                     if (counter >= STARTUP_ANIMATION_CYCLE_STEP) {
                         rgblight_sethsv_noeeprom((counter + old_config.hue) % 255, STARTUP_ANIMATION_SATURATION, STARTUP_ANIMATION_VALUE);
                         counter -= STARTUP_ANIMATION_CYCLE_STEP;
                     } else {
                         if (
-#ifdef RGBLIGHT_EFFECT_BREATHING
+#    ifdef RGBLIGHT_EFFECT_BREATHING
                             (old_base_mode == RGBLIGHT_MODE_BREATHING) ||
-#endif
-#ifdef RGBLIGHT_EFFECT_SNAKE
+#    endif
+#    ifdef RGBLIGHT_EFFECT_SNAKE
                             (old_base_mode == RGBLIGHT_MODE_SNAKE) ||
-#endif
-#ifdef RGBLIGHT_EFFECT_KNIGHT
+#    endif
+#    ifdef RGBLIGHT_EFFECT_KNIGHT
                             (old_base_mode == RGBLIGHT_MODE_KNIGHT) ||
-#endif
-#ifdef RGBLIGHT_EFFECT_TWINKLE
+#    endif
+#    ifdef RGBLIGHT_EFFECT_TWINKLE
                             (old_base_mode == RGBLIGHT_MODE_TWINKLE) ||
-#endif
+#    endif
                             !old_config.enable) {
-                            counter = STARTUP_ANIMATION_VALUE;
+                            counter                 = STARTUP_ANIMATION_VALUE;
                             startup_animation_state = RAMP_DOWN;
                         } else if (
-#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
                             (old_base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) ||
-#endif
-#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    endif
+#    ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
                             (old_base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) ||
-#endif
-#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    endif
+#    ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
                             (old_base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) ||
-#endif
-#ifdef RGBLIGHT_EFFECT_RAINBOW_CHRISTMAS
+#    endif
+#    ifdef RGBLIGHT_EFFECT_RAINBOW_CHRISTMAS
                             (old_base_mode == RGBLIGHT_MODE_CHRISTMAS) ||
-#endif
-#ifdef RGBLIGHT_EFFECT_RAINBOW_RGB_TEST_
+#    endif
+#    ifdef RGBLIGHT_EFFECT_RAINBOW_RGB_TEST
                             (old_base_mode == RGBLIGHT_MODE_RGB_TEST) ||
-#endif
+#    endif
                             (old_base_mode == RGBLIGHT_MODE_STATIC_LIGHT)) {
-                            counter = 0;
+                            counter                 = 0;
                             startup_animation_state = RAMP_TO;
                         } else {
                             startup_animation_state = CLEAN_UP;
@@ -298,9 +300,9 @@ void matrix_scan_user_rgb(void) {
                     break;
 
                 case RAMP_DOWN:
-#ifdef STARTUP_ANIMATION_DEBUG
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintf("sua RAMP_DOWN counter=%u\n", counter);
-#endif
+#    endif
                     if (counter >= STARTUP_ANIMATION_FADE_STEP) {
                         rgblight_sethsv_noeeprom(old_config.hue, STARTUP_ANIMATION_SATURATION, counter);
                         counter -= STARTUP_ANIMATION_FADE_STEP;
@@ -309,28 +311,30 @@ void matrix_scan_user_rgb(void) {
                     }
                     break;
 
-                case RAMP_TO:
-                    {
-#ifdef STARTUP_ANIMATION_DEBUG
-                        dprintf("sua RAMP_TO s=%u, v=%u, counter=%u\n", old_config.sat, old_config.val, counter);
-#endif
-                        uint8_t steps = STARTUP_ANIMATION_RAMP_TO_STEPS;
-                        if (counter < steps) {
-                            uint8_t s = STARTUP_ANIMATION_SATURATION + counter * (((float)old_config.sat - STARTUP_ANIMATION_SATURATION) / (float)steps);
-                            uint8_t v = STARTUP_ANIMATION_VALUE + counter * (((float)old_config.val - STARTUP_ANIMATION_VALUE) / (float)steps);
-                            rgblight_sethsv_noeeprom(old_config.hue, s, v);
-                            counter++;
-                        } else {
-                            startup_animation_state = CLEAN_UP;
-                        }
+                case RAMP_TO: {
+#    ifdef STARTUP_ANIMATION_DEBUG
+                    dprintf("sua RAMP_TO s=%u, v=%u, counter=%u\n", old_config.sat, old_config.val, counter);
+#    endif
+                    uint8_t steps = STARTUP_ANIMATION_RAMP_TO_STEPS;
+                    if (counter < steps) {
+                        uint8_t s = STARTUP_ANIMATION_SATURATION + counter * (((float)old_config.sat - STARTUP_ANIMATION_SATURATION) / (float)steps);
+                        uint8_t v = STARTUP_ANIMATION_VALUE + counter * (((float)old_config.val - STARTUP_ANIMATION_VALUE) / (float)steps);
+                        rgblight_sethsv_noeeprom(old_config.hue, s, v);
+                        counter++;
+                    } else {
+                        startup_animation_state = CLEAN_UP;
                     }
-                    break;
+                } break;
 
                 case CLEAN_UP:
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintln("sua CLEAN_UP");
+#    endif
                     rgblight_reload_from_eeprom();
                     startup_animation_state = DONE;
+#    ifdef STARTUP_ANIMATION_DEBUG
                     dprintln("sua DONE");
+#    endif
                     break;
 
                 default:
@@ -344,8 +348,8 @@ void matrix_scan_user_rgb(void) {
         if (timer_elapsed(change_timer) > change_tick) {
             HSV hsv = rgblight_get_hsv();
             hsv.h += change_hue;
-            hsv.s = change_sat > 0 ? qadd8(hsv.s, (uint8_t) change_sat) : qsub8(hsv.s, (uint8_t) -change_sat);
-            hsv.v = change_val > 0 ? qadd8(hsv.v, (uint8_t) change_val) : qsub8(hsv.v, (uint8_t) -change_val);
+            hsv.s = change_sat > 0 ? qadd8(hsv.s, (uint8_t)change_sat) : qsub8(hsv.s, (uint8_t)-change_sat);
+            hsv.v = change_val > 0 ? qadd8(hsv.v, (uint8_t)change_val) : qsub8(hsv.v, (uint8_t)-change_val);
             rgblight_sethsv_noeeprom(hsv.h, hsv.s, hsv.v);
             change_timer = timer_read();
         }
@@ -372,8 +376,6 @@ layer_state_t layer_state_set_user_rgb(layer_state_t state) {
 }
 
 bool led_update_user_rgb(led_t led_state) {
-    dprintf("num=%u, cap=%u, scl=%u, cmp=%u, kan=%u\n", led_state.num_lock, led_state.caps_lock, led_state.scroll_lock, led_state.compose, led_state.kana);
-
     rgblight_set_layer_state(LOCK_OFFSET + USB_LED_NUM_LOCK, led_state.num_lock);
     rgblight_set_layer_state(LOCK_OFFSET + USB_LED_CAPS_LOCK, led_state.caps_lock);
     rgblight_set_layer_state(LOCK_OFFSET + USB_LED_SCROLL_LOCK, led_state.scroll_lock);
@@ -385,7 +387,6 @@ void rgb_layer_ack_yn(bool yn) { rgb_layer_ack(yn ? ACK_YES : ACK_NO); }
 
 void rgb_layer_ack(layer_ack_t n) {
     uint8_t layer = ACK_OFFSET + n;
-    dprintf("rgb_layer_ack(%u) ==> %u\n", n, layer);
     rgblight_blink_layer(layer, RGB_LAYER_ACK_DURATION);
 }
 
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index df73c903d0..651c750465 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -18,7 +18,7 @@ static uint32_t matrix_timer = 0;
 #    endif
 
 void report_version(void) {
-    uprintln(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE);
+    uprintln(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " - " QMK_BUILDDATE);
     reported_version = true;
 }
 #endif
@@ -51,8 +51,41 @@ void matrix_scan_user(void) {
 #endif
 }
 
-bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uint32_t baseAlphaLower, uint32_t baseAlphaUpper, uint32_t zeroGlyph, uint32_t baseNumberOne, uint32_t spaceGlyph, uint8_t temp_mod, uint8_t temp_osm) {
+static uint32_t math_glyph_exceptions(const uint16_t keycode, const bool shifted) {
+    if (shifted) {
+        switch (keycode) {
+            // clang-format off
+            case KC_C: return 0x2102;
+            case KC_H: return 0x210D;
+            case KC_N: return 0x2115;
+            case KC_P: return 0x2119;
+            case KC_Q: return 0x211A;
+            case KC_R: return 0x211D;
+            case KC_Z: return 0x2124;
+                // clang-format on
+        }
+    }
+    return 0;
+}
+
+bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uint32_t baseAlphaLower, uint32_t baseAlphaUpper, uint32_t zeroGlyph, uint32_t baseNumberOne, uint32_t spaceGlyph, uint32_t (*exceptions)(const uint16_t keycode, const bool shifted), uint8_t temp_mod, uint8_t temp_osm) {
+    void _register(uint32_t codepoint) {
+        unicode_input_start();
+        register_hex32(codepoint);
+        unicode_input_finish();
+    }
+
     if ((((temp_mod | temp_osm) & (MOD_MASK_CTRL | MOD_MASK_ALT | MOD_MASK_GUI))) == 0) {
+        bool shifted = ((temp_mod | temp_osm) & MOD_MASK_SHIFT);
+        if (exceptions) {
+            uint32_t res = exceptions(keycode, shifted);
+            if (res) {
+                if (record->event.pressed) {
+                    _register(res);
+                }
+                return false;
+            }
+        }
         switch (keycode) {
             case KC_A ... KC_Z:
                 if (record->event.pressed) {
@@ -61,39 +94,30 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
                     clear_oneshot_mods();
 #endif
 
-                    unicode_input_start();
-                    uint32_t base = ((temp_mod | temp_osm) & MOD_MASK_SHIFT) ? baseAlphaUpper : baseAlphaLower;
-                    register_hex32(base + (keycode - KC_A));
-                    unicode_input_finish();
-
+                    uint32_t base = shifted ? baseAlphaUpper : baseAlphaLower;
+                    _register(base + (keycode - KC_A));
                     set_mods(temp_mod);
                 }
                 return false;
             case KC_0:
-                if ((temp_mod | temp_osm) & MOD_MASK_SHIFT) {  // skip shifted numbers, so that we can still use symbols etc.
+                if (shifted) {  // skip shifted numbers, so that we can still use symbols etc.
                     return true;
                 }
                 if (record->event.pressed) {
-                    unicode_input_start();
-                    register_hex32(zeroGlyph);
-                    unicode_input_finish();
+                    _register(zeroGlyph);
                 }
                 return false;
             case KC_1 ... KC_9:
-                if ((temp_mod | temp_osm) & MOD_MASK_SHIFT) {  // skip shifted numbers, so that we can still use symbols etc.
+                if (shifted) {  // skip shifted numbers, so that we can still use symbols etc.
                     return true;
                 }
                 if (record->event.pressed) {
-                    unicode_input_start();
-                    register_hex32(baseNumberOne + (keycode - KC_1));
-                    unicode_input_finish();
+                    _register(baseNumberOne + (keycode - KC_1));
                 }
                 return false;
             case KC_SPACE:
                 if (record->event.pressed) {
-                    unicode_input_start();
-                    register_hex32(spaceGlyph);  // em space
-                    unicode_input_finish();
+                    _register(spaceGlyph);  // em space
                 }
                 return false;
         }
@@ -163,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     debug_keyboard = 0;
                     debug_matrix   = 0;
                 }
-                uprintf("DEBUG: enable=%u, keyboard=%u, matrix=%u\n", debug_enable, debug_keyboard, debug_matrix);
+                uprintf("DEBUG: enable=%u, kb=%u, matrix=%u\n", debug_enable, debug_keyboard, debug_matrix);
                 eeconfig_update_debug(debug_config.raw);
                 return false;
 #endif
@@ -181,14 +205,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #endif
                 // clang-format on
 
-            case SPI_NORMAL ... SPI_FRAKTR:
+            case SPI_NORMAL ... SPI_MATH:
                 spi_replace_mode = (spi_replace_mode == keycode) ? SPI_NORMAL : keycode;
-                dprintf("spi_replace_mode = %u\n", spi_replace_mode);
                 break;
 
             case SPI_GFLOCK:
                 spi_gflock = !spi_gflock;
-                dprintf("spi_gflock = %u\n", spi_gflock);
                 break;
 
             case SPI_KP_00:
@@ -279,19 +301,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case KC_SPACE:
             switch (spi_replace_mode) {
                 case SPI_WIDE:
-                    return process_record_glyph_replacement(keycode, record, 0xFF41, 0xFF21, 0xFF10, 0xFF11, 0x2003, mods, osm);
+                    return process_record_glyph_replacement(keycode, record, 0xFF41, 0xFF21, 0xFF10, 0xFF11, 0x2003, NULL, mods, osm);
                 case SPI_SCRIPT:
-                    return process_record_glyph_replacement(keycode, record, 0x1D4EA, 0x1D4D0, 0x1D7CE, 0x1D7CF, 0x2002, mods, osm);
+                    return process_record_glyph_replacement(keycode, record, 0x1D4EA, 0x1D4D0, 0x1D7CE, 0x1D7CF, 0x2002, NULL, mods, osm);
                 case SPI_BLOCKS:
-                    return process_record_glyph_replacement(keycode, record, 0x1F170, 0x1F170, '0', '1', 0x2002, mods, osm);
+                    return process_record_glyph_replacement(keycode, record, 0x1F170, 0x1F170, '0', '1', 0x2002, NULL, mods, osm);
                 case SPI_CIRCLE:
-                    return process_record_glyph_replacement(keycode, record, 0x1F150, 0x1F150, '0', '1', 0x2002, mods, osm);
+                    return process_record_glyph_replacement(keycode, record, 0x1F150, 0x1F150, '0', '1', 0x2002, NULL, mods, osm);
                 case SPI_SQUARE:
-                    return process_record_glyph_replacement(keycode, record, 0x1F130, 0x1F130, '0', '1', 0x2002, mods, osm);
+                    return process_record_glyph_replacement(keycode, record, 0x1F130, 0x1F130, '0', '1', 0x2002, NULL, mods, osm);
                 case SPI_PARENS:
-                    return process_record_glyph_replacement(keycode, record, 0x1F110, 0x1F110, '0', '1', 0x2002, mods, osm);
+                    return process_record_glyph_replacement(keycode, record, 0x1F110, 0x1F110, '0', '1', 0x2002, NULL, mods, osm);
                 case SPI_FRAKTR:
-                    return process_record_glyph_replacement(keycode, record, 0x1D586, 0x1D56C, '0', '1', 0x2002, mods, osm);
+                    return process_record_glyph_replacement(keycode, record, 0x1D586, 0x1D56C, '0', '1', 0x2002, NULL, mods, osm);
+                case SPI_BOLD:
+                    return process_record_glyph_replacement(keycode, record, 0x1D41A, 0x1D400, '0', '1', 0x2002, NULL, mods, osm);
+                case SPI_MATH:
+                    return process_record_glyph_replacement(keycode, record, 0x1D552, 0x1D538, '0', '1', 0x2002, &math_glyph_exceptions, mods, osm);
             }
             break;
 
@@ -304,9 +330,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
                 if ((mods | osm) & MOD_MASK_SHIFT) {
                     del_mods(MOD_MASK_SHIFT);
-#ifndef NO_ACTION_ONESHOT
+#    ifndef NO_ACTION_ONESHOT
                     clear_oneshot_mods();
-#endif
+#    endif
                     register_code(KC_DEL);
                     delkey_registered = true;
                     set_mods(mods);
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index d018e5defb..6fd26e224e 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -29,6 +29,8 @@ enum custom_keycodes {
     SPI_SQUARE,
     SPI_PARENS,
     SPI_FRAKTR,
+    SPI_BOLD,
+    SPI_MATH,
     SPI_GFLOCK,
     SPI_KP_00,
 };

From baf34989f1847185a055e9d41783052eccb09d9c Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sat, 30 Jul 2022 18:31:31 -0400
Subject: [PATCH 145/959] Default rgblight (#17855)

* better rgb bindings; improve default

* trim firmware size
---
 layouts/community/75_ansi/spidey3/keymap.c |  6 +--
 users/spidey3/config.h                     | 44 +++++++++++++++-------
 users/spidey3/init.c                       |  4 --
 users/spidey3/layer_rgb.c                  | 18 +++------
 users/spidey3/spidey3.h                    | 18 +++++----
 5 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index 05f3aac4bc..d500f11031 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -25,9 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_75_ansi(
         RESET,      SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
         EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SLCK,
-        XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    RGB_SPD,    RGB_SPI,    VLK_TOG,    XXXXXXX,                XXXXXXX,    KC_BRIU,
-        XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_T,    SPI_LNX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
-        _______,    SPI_GLO,    XXXXXXX,    SPI_WIN,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),SPI_OSX,    X(LARR),    X(RARR),    DEBUG,      _______,                            KC_VOLU,    KC_MUTE,
+        XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
+        XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   SPI_LNX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
+        _______,    XXXXXXX,    XXXXXXX,    SPI_WIN,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),SPI_OSX,    X(LARR),    X(RARR),    DEBUG,      _______,                            KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            CH_ASST,    _______,    CH_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
     )
 };
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index f5f5e07f0f..884cc11a5c 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -2,21 +2,37 @@
 
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_MAX_LAYERS 17
-#define RGBLIGHT_LAYER_BLINK
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_STARTUP_ANIMATION
 
-#undef RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
+#ifdef RGBLIGHT_ENABLE
+
+#    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_MAX_LAYERS 17
+#    define RGBLIGHT_LAYER_BLINK
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#    define RGBLIGHT_STARTUP_ANIMATION
+
+#    undef RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_TWINKLE
+
+#    define RGBLIGHT_DEFAULT_HUE 213
+#    define RGBLIGHT_DEFAULT_SAT UINT8_MAX
+#    define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL / 2
+
+#    if defined(RGBLIGHT_EFFECT_TWINKLE)
+#        define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_TWINKLE
+#    elif defined(RGBLIGHT_EFFECT_RAINBOW_MOOD)
+#        define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+#    else
+#        define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
+#    endif
+
+#endif
 
 #define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC
 
diff --git a/users/spidey3/init.c b/users/spidey3/init.c
index 0c2bd678e0..014dfdc3c4 100644
--- a/users/spidey3/init.c
+++ b/users/spidey3/init.c
@@ -11,10 +11,6 @@ void eeconfig_init_user(void) {
 #ifdef UNICODEMAP_ENABLE
     eeconfig_init_user_unicode();
 #endif
-
-#ifdef RGBLIGHT_ENABLE
-    eeconfig_init_user_rgb();
-#endif
 }
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index 7381f64bb2..77558016d0 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -13,21 +13,15 @@ bool     rgb_saved = 0;
 extern bool     spi_gflock;
 extern uint16_t spi_replace_mode;
 
-void spidey_glow(void) {
+static void set_rgb_default(void) {
     rgblight_enable();
-    rgblight_sethsv(213, 255, 128);
-    if ((RGBLIGHT_MODE_TWINKLE <= rgblight_get_mode()) && (rgblight_get_mode() < RGBLIGHT_MODE_TWINKLE_end)) {
-        rgblight_step();
-    } else {
-        rgblight_mode(RGBLIGHT_MODE_TWINKLE);
-    }
+    rgblight_sethsv(RGBLIGHT_DEFAULT_HUE, RGBLIGHT_DEFAULT_SAT, RGBLIGHT_DEFAULT_VAL);
+    rgblight_mode(RGBLIGHT_DEFAULT_MODE);
 #ifdef VELOCIKEY_ENABLE
     if (velocikey_enabled()) velocikey_toggle();
 #endif
 }
 
-void eeconfig_init_user_rgb(void) { spidey_glow(); }
-
 // clang-format off
 
 // Convenience macros
@@ -396,11 +390,9 @@ extern rgblight_config_t rgblight_config;
 bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
-            case SPI_GLO:
-                spidey_glow();
-                return false;
-
                 // clang-format off
+            case SPI_GLO: set_rgb_default(); return false;
+
             case RGB_HUI: change_timer = timer_read(); change_hue =  1; return false;
             case RGB_HUD: change_timer = timer_read(); change_hue = -1; return false;
             case RGB_SAI: change_timer = timer_read(); change_sat =  1; return false;
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index 6fd26e224e..6d73c669bc 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -13,13 +13,12 @@ enum userspace_layers {
 };
 
 enum custom_keycodes {
-    SPI_GLO = SAFE_RANGE,
-    SPI_LNX,  // Mode: Linux
-    SPI_OSX,  // Mode: Mac
-    SPI_WIN,  // Mode: Windows
-    CH_CPNL,  // AL Control Panel
-    CH_ASST,  // AL Context-aware Desktop Assistant
-    CH_SUSP,  // Suspend
+    SPI_LNX = SAFE_RANGE,  // Mode: Linux
+    SPI_OSX,               // Mode: Mac
+    SPI_WIN,               // Mode: Windows
+    CH_CPNL,               // AL Control Panel
+    CH_ASST,               // AL Context-aware Desktop Assistant
+    CH_SUSP,               // Suspend
 
     SPI_NORMAL,
     SPI_WIDE,
@@ -33,6 +32,10 @@ enum custom_keycodes {
     SPI_MATH,
     SPI_GFLOCK,
     SPI_KP_00,
+
+#ifdef RGBLIGHT_ENABLE
+    SPI_GLO,
+#endif
 };
 
 #ifdef RGBLIGHT_ENABLE
@@ -52,7 +55,6 @@ typedef enum layer_ack {
 
 #    define RGB_LAYER_ACK_DURATION 500
 
-void          eeconfig_init_user_rgb(void);
 void          matrix_init_user_rgb(void);
 void          matrix_scan_user_rgb(void);
 void          keyboard_post_init_user_rgb(void);

From 409790457cdc509c0bf783745f27335ec6806b5d Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 31 Jul 2022 15:35:42 +0100
Subject: [PATCH 146/959] Refactor satt/comet46 to use core OLED driver
 (#17856)

---
 keyboards/satt/comet46/i2c.c                  | 162 ---------
 keyboards/satt/comet46/i2c.h                  |  46 ---
 .../satt/comet46/keymaps/default/config.h     |  29 --
 .../satt/comet46/keymaps/default/keymap.c     |  47 +--
 .../satt/comet46/keymaps/default/rules.mk     |   5 +-
 keyboards/satt/comet46/keymaps/satt/config.h  |  29 --
 keyboards/satt/comet46/keymaps/satt/keymap.c  | 105 ++----
 keyboards/satt/comet46/keymaps/satt/rules.mk  |   4 +-
 keyboards/satt/comet46/lib/glcdfont.c         | 137 -------
 keyboards/satt/comet46/rules.mk               |   5 +-
 keyboards/satt/comet46/ssd1306.c              | 343 ------------------
 keyboards/satt/comet46/ssd1306.h              |  90 -----
 12 files changed, 55 insertions(+), 947 deletions(-)
 delete mode 100644 keyboards/satt/comet46/i2c.c
 delete mode 100644 keyboards/satt/comet46/i2c.h
 delete mode 100644 keyboards/satt/comet46/keymaps/default/config.h
 delete mode 100644 keyboards/satt/comet46/keymaps/satt/config.h
 delete mode 100644 keyboards/satt/comet46/lib/glcdfont.c
 delete mode 100644 keyboards/satt/comet46/ssd1306.c
 delete mode 100644 keyboards/satt/comet46/ssd1306.h

diff --git a/keyboards/satt/comet46/i2c.c b/keyboards/satt/comet46/i2c.c
deleted file mode 100644
index 4bee5c6398..0000000000
--- a/keyboards/satt/comet46/i2c.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <util/twi.h>
-#include <avr/io.h>
-#include <stdlib.h>
-#include <avr/interrupt.h>
-#include <util/twi.h>
-#include <stdbool.h>
-#include "i2c.h"
-
-#ifdef USE_I2C
-
-// Limits the amount of we wait for any one i2c transaction.
-// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
-// 9 bits, a single transaction will take around 90μs to complete.
-//
-// (F_CPU/SCL_CLOCK)  =>  # of μC cycles to transfer a bit
-// poll loop takes at least 8 clock cycles to execute
-#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8
-
-#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE)
-
-volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-static volatile uint8_t slave_buffer_pos;
-static volatile bool slave_has_register_set = false;
-
-// Wait for an i2c operation to finish
-inline static
-void i2c_delay(void) {
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-
-  // easier way, but will wait slightly longer
-  // _delay_us(100);
-}
-
-// Setup twi to run at 100kHz or 400kHz (see ./i2c.h SCL_CLOCK)
-void i2c_master_init(void) {
-  // no prescaler
-  TWSR = 0;
-  // Set TWI clock frequency to SCL_CLOCK. Need TWBR>10.
-  // Check datasheets for more info.
-  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;
-}
-
-// Start a transaction with the given i2c slave address. The direction of the
-// transfer is set with I2C_READ and I2C_WRITE.
-// returns: 0 => success
-//          1 => error
-uint8_t i2c_master_start(uint8_t address) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
-
-  i2c_delay();
-
-  // check that we started successfully
-  if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
-    return 1;
-
-  TWDR = address;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) )
-    return 1; // slave did not acknowledge
-  else
-    return 0; // success
-}
-
-
-// Finish the i2c transaction.
-void i2c_master_stop(void) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
-
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-}
-
-// Write one byte to the i2c slave.
-// returns 0 => slave ACK
-//         1 => slave NACK
-uint8_t i2c_master_write(uint8_t data) {
-  TWDR = data;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  // check if the slave acknowledged us
-  return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1;
-}
-
-// Read one byte from the i2c slave. If ack=1 the slave is acknowledged,
-// if ack=0 the acknowledge bit is not set.
-// returns: byte read from i2c device
-uint8_t i2c_master_read(int ack) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA);
-
-  i2c_delay();
-  return TWDR;
-}
-
-void i2c_reset_state(void) {
-  TWCR = 0;
-}
-
-void i2c_slave_init(uint8_t address) {
-  TWAR = address << 0; // slave i2c address
-  // TWEN  - twi enable
-  // TWEA  - enable address acknowledgement
-  // TWINT - twi interrupt flag
-  // TWIE  - enable the twi interrupt
-  TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN);
-}
-
-ISR(TWI_vect);
-
-ISR(TWI_vect) {
-  uint8_t ack = 1;
-  switch(TW_STATUS) {
-    case TW_SR_SLA_ACK:
-      // this device has been addressed as a slave receiver
-      slave_has_register_set = false;
-      break;
-
-    case TW_SR_DATA_ACK:
-      // this device has received data as a slave receiver
-      // The first byte that we receive in this transaction sets the location
-      // of the read/write location of the slaves memory that it exposes over
-      // i2c.  After that, bytes will be written at slave_buffer_pos, incrementing
-      // slave_buffer_pos after each write.
-      if(!slave_has_register_set) {
-        slave_buffer_pos = TWDR;
-        // don't acknowledge the master if this memory loctaion is out of bounds
-        if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) {
-          ack = 0;
-          slave_buffer_pos = 0;
-        }
-        slave_has_register_set = true;
-      } else {
-        i2c_slave_buffer[slave_buffer_pos] = TWDR;
-        BUFFER_POS_INC();
-      }
-      break;
-
-    case TW_ST_SLA_ACK:
-    case TW_ST_DATA_ACK:
-      // master has addressed this device as a slave transmitter and is
-      // requesting data.
-      TWDR = i2c_slave_buffer[slave_buffer_pos];
-      BUFFER_POS_INC();
-      break;
-
-    case TW_BUS_ERROR: // something went wrong, reset twi state
-      TWCR = 0;
-    default:
-      break;
-  }
-  // Reset everything, so we are ready for the next TWI interrupt
-  TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
-}
-#endif
diff --git a/keyboards/satt/comet46/i2c.h b/keyboards/satt/comet46/i2c.h
deleted file mode 100644
index 710662c7ab..0000000000
--- a/keyboards/satt/comet46/i2c.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifndef F_CPU
-#define F_CPU 16000000UL
-#endif
-
-#define I2C_READ 1
-#define I2C_WRITE 0
-
-#define I2C_ACK 1
-#define I2C_NACK 0
-
-#define SLAVE_BUFFER_SIZE 0x10
-
-// i2c SCL clock frequency 400kHz
-#define SCL_CLOCK  400000L
-
-extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-void i2c_master_init(void);
-uint8_t i2c_master_start(uint8_t address);
-void i2c_master_stop(void);
-uint8_t i2c_master_write(uint8_t data);
-uint8_t i2c_master_read(int);
-void i2c_reset_state(void);
-void i2c_slave_init(uint8_t address);
-
-
-static inline unsigned char i2c_start_read(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_READ);
-}
-
-static inline unsigned char i2c_start_write(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_WRITE);
-}
-
-// from SSD1306 scrips
-extern unsigned char i2c_rep_start(unsigned char addr);
-extern void i2c_start_wait(unsigned char addr);
-extern unsigned char i2c_readAck(void);
-extern unsigned char i2c_readNak(void);
-extern unsigned char i2c_read(unsigned char ack);
-
-#define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak();
diff --git a/keyboards/satt/comet46/keymaps/default/config.h b/keyboards/satt/comet46/keymaps/default/config.h
deleted file mode 100644
index ee02a94b7e..0000000000
--- a/keyboards/satt/comet46/keymaps/default/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-
-/* Use I2C or Serial */
-
-#define USE_I2C
-#define SSD1306OLED
diff --git a/keyboards/satt/comet46/keymaps/default/keymap.c b/keyboards/satt/comet46/keymaps/default/keymap.c
index bccca0a091..3e6f9045ff 100644
--- a/keyboards/satt/comet46/keymaps/default/keymap.c
+++ b/keyboards/satt/comet46/keymaps/default/keymap.c
@@ -2,9 +2,6 @@
 // This is the canonical layout file for the Quantum project. If you want to add another keyboard,
 
 #include QMK_KEYBOARD_H
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -148,8 +145,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 // You need to add source files to SRC in rules.mk when using OLED display functions
 void set_keylog(uint16_t keycode);
@@ -157,25 +153,10 @@ const char *read_keylog(void);
 const char *read_modifier_state(void);
 const char *read_host_led_state(void);
 
-void matrix_init_user(void) {
-  iota_gfx_init(false);   // turns on the display
-}
-
-void matrix_scan_user(void) {
-  iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void render_status(struct CharacterMatrix *matrix) {
+bool oled_task_user(void) {
   // Layer state
   char layer_str[22];
-  matrix_write(matrix, "Layer: ");
+  oled_write_P(PSTR("Layer: "), false);
   uint8_t layer = get_highest_layer(layer_state);
   uint8_t default_layer = get_highest_layer(eeconfig_read_default_layer());
   switch (layer) {
@@ -207,27 +188,21 @@ void render_status(struct CharacterMatrix *matrix) {
     default:
       snprintf(layer_str, sizeof(layer_str), "Undef-%d", layer);
   }
-  matrix_write_ln(matrix, layer_str);
+  oled_write_ln(layer_str, false);
   // Last entered keycode
-  matrix_write_ln(matrix, read_keylog());
+  oled_write_ln(read_keylog(), false);
   // Modifier state
-  matrix_write_ln(matrix, read_modifier_state());
+  oled_write_ln(read_modifier_state(), false);
   // Host Keyboard LED Status
-  matrix_write(matrix, read_host_led_state());
+  oled_write(read_host_led_state(), false);
+
+  return false;
 }
 
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  render_status(&matrix);
-  matrix_update(&display, &matrix);
-}
-
-#endif//SSD1306OLED
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #ifdef SSD1306OLED
+  #ifdef OLED_ENABLE
     if (record->event.pressed) {
       set_keylog(keycode);
     }
diff --git a/keyboards/satt/comet46/keymaps/default/rules.mk b/keyboards/satt/comet46/keymaps/default/rules.mk
index 3fa01f96af..3ceffe90ec 100644
--- a/keyboards/satt/comet46/keymaps/default/rules.mk
+++ b/keyboards/satt/comet46/keymaps/default/rules.mk
@@ -1,5 +1,6 @@
 # If you want to change display settings of the OLED, you need to change the following lines
-SRC +=  ./lib/glcdfont.c \
-		./lib/keylogger.c \
+SRC +=  ./lib/keylogger.c \
         ./lib/modifier_state_reader.c \
         ./lib/host_led_state_reader.c
+
+OLED_ENABLE = yes
diff --git a/keyboards/satt/comet46/keymaps/satt/config.h b/keyboards/satt/comet46/keymaps/satt/config.h
deleted file mode 100644
index a3ca2ebfef..0000000000
--- a/keyboards/satt/comet46/keymaps/satt/config.h
+++ /dev/null
@@ -1,29 +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
-
-/* Use I2C or Serial */
-
-#define USE_I2C
-#define SSD1306OLED
-
-#endif
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
index 54d1d791d7..505b7eaf0a 100644
--- a/keyboards/satt/comet46/keymaps/satt/keymap.c
+++ b/keyboards/satt/comet46/keymaps/satt/keymap.c
@@ -5,9 +5,6 @@
 #include "keymap_jis2us.h"
 #include "action_pseudo_lut.h"
 #include "keymap_japanese.h"
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -176,8 +173,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   }
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 // You need to add source files to SRC in rules.mk when using OLED display functions
 void set_keylog(uint16_t keycode);
@@ -185,86 +181,59 @@ const char *read_keylog(void);
 const char *read_modifier_state(void);
 const char *read_host_led_state(void);
 
-void matrix_init_user(void) {
-  iota_gfx_init(false);   // turns on the display
-}
-
-void matrix_scan_user(void) {
-  iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void render_status(struct CharacterMatrix *matrix) {
+bool oled_task_user(void) {
   // Layer state
   char layer_str[22];
-  matrix_write(matrix, "Layer: ");
+  oled_write_P(PSTR("Layer: "), false);
   uint8_t layer = get_highest_layer(layer_state);
-  uint8_t default_layer = biton32(eeconfig_read_default_layer());
-    switch (layer) {
-      case _QWERTY:
-        switch (default_layer) {
-          case _QWERTY:
-            snprintf(layer_str, sizeof(layer_str), "Qwerty");
-            break;
-          case _PSEUDO_US:
-            snprintf(layer_str, sizeof(layer_str), "Psuedo_US");
-            break;
-          default:
-            snprintf(layer_str, sizeof(layer_str), "Undef-%d", default_layer);
-            break;
-        }
-        break;
-      case _RAISE:
-        snprintf(layer_str, sizeof(layer_str), "Raise");
-        break;
-      case _LOWER:
-        snprintf(layer_str, sizeof(layer_str), "Lower");
-        break;
+  uint8_t default_layer = get_highest_layer(eeconfig_read_default_layer());
+  switch (layer) {
+    case _QWERTY:
+      switch (default_layer) {
+        case _QWERTY:
+          snprintf(layer_str, sizeof(layer_str), "Qwerty");
+          break;
+        case _PSEUDO_US:
+          snprintf(layer_str, sizeof(layer_str), "Psuedo_US");
+          break;
+        default:
+          snprintf(layer_str, sizeof(layer_str), "Undef-%d", default_layer);
+          break;
+      }
+      break;
+    case _RAISE:
+      snprintf(layer_str, sizeof(layer_str), "Raise");
+      break;
+    case _LOWER:
+      snprintf(layer_str, sizeof(layer_str), "Lower");
+      break;
       case _PSEUDO_US_RAISE:
         snprintf(layer_str, sizeof(layer_str), "P_US_Raise");
         break;
       case _PSEUDO_US_LOWER:
         snprintf(layer_str, sizeof(layer_str), "P_US_Lower");
         break;
-      case _ADJUST:
-        snprintf(layer_str, sizeof(layer_str), "Adjust");
-        break;
-      default:
-        snprintf(layer_str, sizeof(layer_str), "Undef-%d", layer);
-    }
-  matrix_write_ln(matrix, layer_str);
+    case _ADJUST:
+      snprintf(layer_str, sizeof(layer_str), "Adjust");
+      break;
+    default:
+      snprintf(layer_str, sizeof(layer_str), "Undef-%d", layer);
+  }
+  oled_write_ln(layer_str, false);
   // Last entered keycode
-  matrix_write_ln(matrix, read_keylog());
+  oled_write_ln(read_keylog(), false);
   // Modifier state
-  matrix_write_ln(matrix, read_modifier_state());
+  oled_write_ln(read_modifier_state(), false);
   // Host Keyboard LED Status
-  matrix_write(matrix, read_host_led_state());
+  oled_write(read_host_led_state(), false);
+
+  return false;
 }
 
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
 #endif
 
-  matrix_clear(&matrix);
-  render_status(&matrix);
-  matrix_update(&display, &matrix);
-}
-
-#endif//SSD1306OLED
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #ifdef SSD1306OLED
+  #ifdef OLED_ENABLE
     if (record->event.pressed) {
       set_keylog(keycode);
     }
diff --git a/keyboards/satt/comet46/keymaps/satt/rules.mk b/keyboards/satt/comet46/keymaps/satt/rules.mk
index 91609dd4fd..9c07b12fcb 100644
--- a/keyboards/satt/comet46/keymaps/satt/rules.mk
+++ b/keyboards/satt/comet46/keymaps/satt/rules.mk
@@ -1,8 +1,8 @@
 SRC += action_pseudo_lut.c
 
 # If you want to change display settings of the OLED, you need to change the following lines
-SRC +=  ./lib/glcdfont.c \
-		./lib/keylogger.c \
+SRC +=  ./lib/keylogger.c \
         ./lib/modifier_state_reader.c \
         ./lib/host_led_state_reader.c
 
+OLED_ENABLE = yes
diff --git a/keyboards/satt/comet46/lib/glcdfont.c b/keyboards/satt/comet46/lib/glcdfont.c
deleted file mode 100644
index 361d0c3dc6..0000000000
--- a/keyboards/satt/comet46/lib/glcdfont.c
+++ /dev/null
@@ -1,137 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-
-const unsigned char font[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-  0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-  0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-  0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-  0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-  0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-  0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-  0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-  0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-  0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-  0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-  0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-  0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-  0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-  0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-  0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-  0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-  0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-  0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-  0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-  0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-  0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-  0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-  0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-  0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-  0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-  0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-  0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-  0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
-  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-  0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
-  0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-  0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-  0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-  0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-  0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-  0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-  0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
-};
diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
index e177fc6441..83f7d905e9 100644
--- a/keyboards/satt/comet46/rules.mk
+++ b/keyboards/satt/comet46/rules.mk
@@ -17,9 +17,8 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
+OLED_DRIVER = SSD1306
 
 # project specific files
-SRC += matrix.c \
-       i2c.c \
-       ssd1306.c
+SRC += matrix.c
 QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/satt/comet46/ssd1306.c b/keyboards/satt/comet46/ssd1306.c
deleted file mode 100644
index 4bd2d80bc4..0000000000
--- a/keyboards/satt/comet46/ssd1306.c
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifdef SSD1306OLED
-
-#include "ssd1306.h"
-#include "i2c.h"
-#include <string.h>
-#include "print.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#endif
-#include "sendchar.h"
-#include "timer.h"
-
-struct CharacterMatrix display;
-
-extern const unsigned char font[] PROGMEM;
-
-// Set this to 1 to help diagnose early startup problems
-// when testing power-on with ble.  Turn it off otherwise,
-// as the latency of printing most of the debug info messes
-// with the matrix scan, causing keys to drop.
-#define DEBUG_TO_SCREEN 0
-
-//static uint16_t last_battery_update;
-//static uint32_t vbat;
-//#define BatteryUpdateInterval 10000 /* milliseconds */
-
-// 'last_flush' is declared as uint16_t,
-// so this must be less than 65535 
-#define ScreenOffInterval 60000 /* milliseconds */
-#if DEBUG_TO_SCREEN
-static uint8_t displaying;
-#endif
-static uint16_t last_flush;
-
-static bool force_dirty = true;
-
-// Write command sequence.
-// Returns true on success.
-static inline bool _send_cmd1(uint8_t cmd) {
-  bool res = false;
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    xprintf("failed to start write to %d\n", SSD1306_ADDRESS);
-    goto done;
-  }
-
-  if (i2c_master_write(0x0 /* command byte follows */)) {
-    print("failed to write control byte\n");
-
-    goto done;
-  }
-
-  if (i2c_master_write(cmd)) {
-    xprintf("failed to write command %d\n", cmd);
-    goto done;
-  }
-  res = true;
-done:
-  i2c_master_stop();
-  return res;
-}
-
-// Write 2-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd2(uint8_t cmd, uint8_t opr) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  return _send_cmd1(opr);
-}
-
-// Write 3-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd3(uint8_t cmd, uint8_t opr1, uint8_t opr2) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  if (!_send_cmd1(opr1)) {
-    return false;
-  }
-  return _send_cmd1(opr2);
-}
-
-#define send_cmd1(c) if (!_send_cmd1(c)) {goto done;}
-#define send_cmd2(c,o) if (!_send_cmd2(c,o)) {goto done;}
-#define send_cmd3(c,o1,o2) if (!_send_cmd3(c,o1,o2)) {goto done;}
-
-static void clear_display(void) {
-  matrix_clear(&display);
-
-  // Clear all of the display bits (there can be random noise
-  // in the RAM on startup)
-  send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1);
-  send_cmd3(ColumnAddr, 0, DisplayWidth - 1);
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    goto done;
-  }
-  if (i2c_master_write(0x40)) {
-    // Data mode
-    goto done;
-  }
-  for (uint8_t row = 0; row < MatrixRows; ++row) {
-    for (uint8_t col = 0; col < DisplayWidth; ++col) {
-      i2c_master_write(0);
-    }
-  }
-
-  display.dirty = false;
-
-done:
-  i2c_master_stop();
-}
-
-#if DEBUG_TO_SCREEN
-#undef sendchar
-static int8_t capture_sendchar(uint8_t c) {
-  sendchar(c);
-  iota_gfx_write_char(c);
-
-  if (!displaying) {
-    iota_gfx_flush();
-  }
-  return 0;
-}
-#endif
-
-bool iota_gfx_init(bool rotate) {
-  bool success = false;
-
-  i2c_master_init();
-  send_cmd1(DisplayOff);
-  send_cmd2(SetDisplayClockDiv, 0x80);
-  send_cmd2(SetMultiPlex, DisplayHeight - 1);
-
-  send_cmd2(SetDisplayOffset, 0);
-
-
-  send_cmd1(SetStartLine | 0x0);
-  send_cmd2(SetChargePump, 0x14 /* Enable */);
-  send_cmd2(SetMemoryMode, 0 /* horizontal addressing */);
-
-  if(rotate){
-    // the following Flip the display orientation 180 degrees
-    send_cmd1(SegRemap);
-    send_cmd1(ComScanInc);
-  }else{
-    // Flips the display orientation 0 degrees
-    send_cmd1(SegRemap | 0x1);
-    send_cmd1(ComScanDec);
-  }
-
-  send_cmd2(SetComPins, 0x2);
-  send_cmd2(SetContrast, 0x8f);
-  send_cmd2(SetPreCharge, 0xf1);
-  send_cmd2(SetVComDetect, 0x40);
-  send_cmd1(DisplayAllOnResume);
-  send_cmd1(NormalDisplay);
-  send_cmd1(DeActivateScroll);
-  send_cmd1(DisplayOn);
-
-  send_cmd2(SetContrast, 0); // Dim
-
-  clear_display();
-
-  success = true;
-
-  iota_gfx_flush();
-
-#if DEBUG_TO_SCREEN
-  print_set_sendchar(capture_sendchar);
-#endif
-
-done:
-  return success;
-}
-
-bool iota_gfx_off(void) {
-  bool success = false;
-
-  send_cmd1(DisplayOff);
-  success = true;
-
-done:
-  return success;
-}
-
-bool iota_gfx_on(void) {
-  bool success = false;
-
-  send_cmd1(DisplayOn);
-  success = true;
-
-done:
-  return success;
-}
-
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c) {
-  *matrix->cursor = c;
-  ++matrix->cursor;
-
-  if (matrix->cursor - &matrix->display[0][0] == sizeof(matrix->display)) {
-    // We went off the end; scroll the display upwards by one line
-    memmove(&matrix->display[0], &matrix->display[1],
-            MatrixCols * (MatrixRows - 1));
-    matrix->cursor = &matrix->display[MatrixRows - 1][0];
-    memset(matrix->cursor, ' ', MatrixCols);
-  }
-}
-
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
-  matrix->dirty = true;
-
-  if (c == '\n') {
-    // Clear to end of line from the cursor and then move to the
-    // start of the next line
-    uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols;
-
-    while (cursor_col++ < MatrixCols) {
-      matrix_write_char_inner(matrix, ' ');
-    }
-    return;
-  }
-
-  matrix_write_char_inner(matrix, c);
-}
-
-void iota_gfx_write_char(uint8_t c) {
-  matrix_write_char(&display, c);
-}
-
-void matrix_write(struct CharacterMatrix *matrix, const char *data) {
-  const char *end = data + strlen(data);
-  while (data < end) {
-    matrix_write_char(matrix, *data);
-    ++data;
-  }
-}
-
-void matrix_write_ln(struct CharacterMatrix *matrix, const char *data) {
-  char data_ln[strlen(data)+2];
-  snprintf(data_ln, sizeof(data_ln), "%s\n", data);
-  matrix_write(matrix, data_ln);
-}
-
-void iota_gfx_write(const char *data) {
-  matrix_write(&display, data);
-}
-
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
-  while (true) {
-    uint8_t c = pgm_read_byte(data);
-    if (c == 0) {
-      return;
-    }
-    matrix_write_char(matrix, c);
-    ++data;
-  }
-}
-
-void iota_gfx_write_P(const char *data) {
-  matrix_write_P(&display, data);
-}
-
-void matrix_clear(struct CharacterMatrix *matrix) {
-  memset(matrix->display, ' ', sizeof(matrix->display));
-  matrix->cursor = &matrix->display[0][0];
-  matrix->dirty = true;
-}
-
-void iota_gfx_clear_screen(void) {
-  matrix_clear(&display);
-}
-
-void matrix_render(struct CharacterMatrix *matrix) {
-  last_flush = timer_read();
-  iota_gfx_on();
-#if DEBUG_TO_SCREEN
-  ++displaying;
-#endif
-
-  // Move to the home position
-  send_cmd3(PageAddr, 0, MatrixRows - 1);
-  send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1);
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    goto done;
-  }
-  if (i2c_master_write(0x40)) {
-    // Data mode
-    goto done;
-  }
-
-  for (uint8_t row = 0; row < MatrixRows; ++row) {
-    for (uint8_t col = 0; col < MatrixCols; ++col) {
-      const uint8_t *glyph = font + (matrix->display[row][col] * FontWidth);
-
-      for (uint8_t glyphCol = 0; glyphCol < FontWidth; ++glyphCol) {
-        uint8_t colBits = pgm_read_byte(glyph + glyphCol);
-        i2c_master_write(colBits);
-      }
-
-      // 1 column of space between chars (it's not included in the glyph)
-      //i2c_master_write(0);
-    }
-  }
-
-  matrix->dirty = false;
-
-done:
-  i2c_master_stop();
-#if DEBUG_TO_SCREEN
-  --displaying;
-#endif
-}
-
-void iota_gfx_flush(void) {
-  matrix_render(&display);
-}
-
-__attribute__ ((weak))
-void iota_gfx_task_user(void) {
-}
-
-void iota_gfx_task(void) {
-  iota_gfx_task_user();
-
-  if (display.dirty|| force_dirty) {
-    iota_gfx_flush();
-    force_dirty = false;
-  }
-
-  if (timer_elapsed(last_flush) > ScreenOffInterval) {
-    iota_gfx_off();
-  }
-}
-
-bool process_record_gfx(uint16_t keycode, keyrecord_t *record) {
-  force_dirty = true;
-  return true;
-}
-
-#endif
diff --git a/keyboards/satt/comet46/ssd1306.h b/keyboards/satt/comet46/ssd1306.h
deleted file mode 100644
index 11a3cc67f4..0000000000
--- a/keyboards/satt/comet46/ssd1306.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <stdio.h>
-#include "action.h"
-
-enum ssd1306_cmds {
-  DisplayOff = 0xAE,
-  DisplayOn = 0xAF,
-
-  SetContrast = 0x81,
-  DisplayAllOnResume = 0xA4,
-
-  DisplayAllOn = 0xA5,
-  NormalDisplay = 0xA6,
-  InvertDisplay = 0xA7,
-  SetDisplayOffset = 0xD3,
-  SetComPins = 0xda,
-  SetVComDetect = 0xdb,
-  SetDisplayClockDiv = 0xD5,
-  SetPreCharge = 0xd9,
-  SetMultiPlex = 0xa8,
-  SetLowColumn = 0x00,
-  SetHighColumn = 0x10,
-  SetStartLine = 0x40,
-
-  SetMemoryMode = 0x20,
-  ColumnAddr = 0x21,
-  PageAddr = 0x22,
-
-  ComScanInc = 0xc0,
-  ComScanDec = 0xc8,
-  SegRemap = 0xa0,
-  SetChargePump = 0x8d,
-  ExternalVcc = 0x01,
-  SwitchCapVcc = 0x02,
-
-  ActivateScroll = 0x2f,
-  DeActivateScroll = 0x2e,
-  SetVerticalScrollArea = 0xa3,
-  RightHorizontalScroll = 0x26,
-  LeftHorizontalScroll = 0x27,
-  VerticalAndRightHorizontalScroll = 0x29,
-  VerticalAndLeftHorizontalScroll = 0x2a,
-};
-
-// Controls the SSD1306 128x32 OLED display via i2c
-
-#ifndef SSD1306_ADDRESS
-#define SSD1306_ADDRESS 0x3C
-#endif
-
-#define DisplayHeight 32
-#define DisplayWidth 128
-
-#define FontHeight 8
-#define FontWidth 6
-
-#define MatrixRows (DisplayHeight / FontHeight)
-#define MatrixCols (DisplayWidth / FontWidth)
-
-struct CharacterMatrix {
-  uint8_t display[MatrixRows][MatrixCols];
-  uint8_t *cursor;
-  bool dirty;
-};
-
-extern struct CharacterMatrix display;
-
-bool iota_gfx_init(bool rotate);
-void iota_gfx_task(void);
-bool iota_gfx_off(void);
-bool iota_gfx_on(void);
-void iota_gfx_flush(void);
-void iota_gfx_write_char(uint8_t c);
-void iota_gfx_write(const char *data);
-void iota_gfx_write_P(const char *data);
-void iota_gfx_clear_screen(void);
-
-void iota_gfx_task_user(void);
-
-void matrix_clear(struct CharacterMatrix *matrix);
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write(struct CharacterMatrix *matrix, const char *data);
-void matrix_write_ln(struct CharacterMatrix *matrix, const char *data);
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data);
-void matrix_render(struct CharacterMatrix *matrix);
-
-bool process_record_gfx(uint16_t keycode, keyrecord_t *record);

From b03a7cef7555119f1cdee95b0c08cafd9f1f18eb Mon Sep 17 00:00:00 2001
From: Daniel Kao <daniel.m.kao@gmail.com>
Date: Sun, 31 Jul 2022 07:51:20 -0700
Subject: [PATCH 147/959] Fix POINTING_DEVICE_GESTURES_SCROLL_ENABLE typo
 (#17850)

* Fix typo for POINTING_DEVICE_GESTURES_SCROLL_ENABLE

Follow the name written in documentation which follows
POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE

* Reword the blurb about POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE in docs
---
 docs/feature_pointing_device.md   | 2 +-
 drivers/sensors/cirque_pinnacle.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 17acc15ff0..c46cf34ee6 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -294,7 +294,7 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 !> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and `POINTING_DEVICE_TASK_THROTTLE_MS` will default to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
 
 
-!> **`POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`** can be used with any pointing device with a lift/contact status can integrate this gesture into its driver. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `pointing_device_get_report()` is needed to generate glide reports.
+!> Any pointing device with a lift/contact status can integrate inertial cursor feature into its driver, controlled by `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `get_report()` is needed to generate glide reports.
 
 ## Split Keyboard Configuration
 
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index e9bb9621e4..320e7d936e 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -41,13 +41,13 @@
 #    ifndef CIRQUE_PINNACLE_Y_RANGE
 #        define CIRQUE_PINNACLE_Y_RANGE (CIRQUE_PINNACLE_Y_UPPER - CIRQUE_PINNACLE_Y_LOWER)
 #    endif
-#    if defined(POINTING_DEVICE_GESTURE_SCROLL_ENABLE)
+#    if defined(POINTING_DEVICE_GESTURES_SCROLL_ENABLE)
 #        define CIRQUE_PINNACLE_CIRCULAR_SCROLL_ENABLE
 #    endif
 #else
 #    define CIRQUE_PINNACLE_X_RANGE 256
 #    define CIRQUE_PINNACLE_Y_RANGE 256
-#    if defined(POINTING_DEVICE_GESTURE_SCROLL_ENABLE)
+#    if defined(POINTING_DEVICE_GESTURES_SCROLL_ENABLE)
 #        define CIRQUE_PINNACLE_SIDE_SCROLL_ENABLE
 #    endif
 #endif

From 2f19579d3f2c8b4041f0128976c00136c5a6a32d Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 31 Jul 2022 20:32:45 +0100
Subject: [PATCH 148/959] Convert yosino58 to use split common (#17861)

---
 keyboards/yosino58/.noci                      |   0
 keyboards/yosino58/config.h                   |  25 -
 keyboards/yosino58/i2c.c                      | 162 -----
 keyboards/yosino58/i2c.h                      |  46 --
 keyboards/yosino58/keymaps/default/config.h   |   7 +-
 keyboards/yosino58/keymaps/default/keymap.c   | 107 +---
 keyboards/yosino58/keymaps/default/rules.mk   |   1 +
 keyboards/yosino58/keymaps/sakura/config.h    |   5 +-
 keyboards/yosino58/keymaps/sakura/keymap.c    | 114 +---
 keyboards/yosino58/keymaps/sakura/rules.mk    |   1 +
 keyboards/yosino58/rev1/.noci                 |   0
 keyboards/yosino58/rev1/config.h              |   8 +
 keyboards/yosino58/rev1/matrix.c              | 343 ----------
 keyboards/yosino58/rev1/rev1.h                |  15 -
 keyboards/yosino58/rev1/rules.mk              |  23 +-
 keyboards/yosino58/rev1/serial_config.h       |   4 -
 .../yosino58/rev1/serial_config_simpleapi.h   |   5 -
 keyboards/yosino58/rev1/split_scomm.c         |  91 ---
 keyboards/yosino58/rev1/split_scomm.h         |  21 -
 keyboards/yosino58/rev1/split_util.c          |  70 ---
 keyboards/yosino58/rev1/split_util.h          |  16 -
 keyboards/yosino58/rules.mk                   |  27 -
 keyboards/yosino58/serial.c                   | 589 ------------------
 keyboards/yosino58/serial.h                   |  81 ---
 keyboards/yosino58/ssd1306.c                  | 347 -----------
 keyboards/yosino58/ssd1306.h                  |  95 ---
 keyboards/yosino58/yosino58.c                 |  11 +-
 27 files changed, 96 insertions(+), 2118 deletions(-)
 delete mode 100644 keyboards/yosino58/.noci
 delete mode 100644 keyboards/yosino58/config.h
 delete mode 100644 keyboards/yosino58/i2c.c
 delete mode 100644 keyboards/yosino58/i2c.h
 delete mode 100644 keyboards/yosino58/rev1/.noci
 delete mode 100644 keyboards/yosino58/rev1/matrix.c
 delete mode 100644 keyboards/yosino58/rev1/serial_config.h
 delete mode 100644 keyboards/yosino58/rev1/serial_config_simpleapi.h
 delete mode 100644 keyboards/yosino58/rev1/split_scomm.c
 delete mode 100644 keyboards/yosino58/rev1/split_scomm.h
 delete mode 100644 keyboards/yosino58/rev1/split_util.c
 delete mode 100644 keyboards/yosino58/rev1/split_util.h
 delete mode 100644 keyboards/yosino58/serial.c
 delete mode 100644 keyboards/yosino58/serial.h
 delete mode 100644 keyboards/yosino58/ssd1306.c
 delete mode 100644 keyboards/yosino58/ssd1306.h

diff --git a/keyboards/yosino58/.noci b/keyboards/yosino58/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/yosino58/config.h b/keyboards/yosino58/config.h
deleted file mode 100644
index 24831ee5b2..0000000000
--- a/keyboards/yosino58/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-#include "serial_config.h"
-
-#define USE_I2C
-#define USE_SERIAL
diff --git a/keyboards/yosino58/i2c.c b/keyboards/yosino58/i2c.c
deleted file mode 100644
index 4bee5c6398..0000000000
--- a/keyboards/yosino58/i2c.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <util/twi.h>
-#include <avr/io.h>
-#include <stdlib.h>
-#include <avr/interrupt.h>
-#include <util/twi.h>
-#include <stdbool.h>
-#include "i2c.h"
-
-#ifdef USE_I2C
-
-// Limits the amount of we wait for any one i2c transaction.
-// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
-// 9 bits, a single transaction will take around 90μs to complete.
-//
-// (F_CPU/SCL_CLOCK)  =>  # of μC cycles to transfer a bit
-// poll loop takes at least 8 clock cycles to execute
-#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8
-
-#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE)
-
-volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-static volatile uint8_t slave_buffer_pos;
-static volatile bool slave_has_register_set = false;
-
-// Wait for an i2c operation to finish
-inline static
-void i2c_delay(void) {
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-
-  // easier way, but will wait slightly longer
-  // _delay_us(100);
-}
-
-// Setup twi to run at 100kHz or 400kHz (see ./i2c.h SCL_CLOCK)
-void i2c_master_init(void) {
-  // no prescaler
-  TWSR = 0;
-  // Set TWI clock frequency to SCL_CLOCK. Need TWBR>10.
-  // Check datasheets for more info.
-  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;
-}
-
-// Start a transaction with the given i2c slave address. The direction of the
-// transfer is set with I2C_READ and I2C_WRITE.
-// returns: 0 => success
-//          1 => error
-uint8_t i2c_master_start(uint8_t address) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
-
-  i2c_delay();
-
-  // check that we started successfully
-  if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
-    return 1;
-
-  TWDR = address;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) )
-    return 1; // slave did not acknowledge
-  else
-    return 0; // success
-}
-
-
-// Finish the i2c transaction.
-void i2c_master_stop(void) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
-
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-}
-
-// Write one byte to the i2c slave.
-// returns 0 => slave ACK
-//         1 => slave NACK
-uint8_t i2c_master_write(uint8_t data) {
-  TWDR = data;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  // check if the slave acknowledged us
-  return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1;
-}
-
-// Read one byte from the i2c slave. If ack=1 the slave is acknowledged,
-// if ack=0 the acknowledge bit is not set.
-// returns: byte read from i2c device
-uint8_t i2c_master_read(int ack) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA);
-
-  i2c_delay();
-  return TWDR;
-}
-
-void i2c_reset_state(void) {
-  TWCR = 0;
-}
-
-void i2c_slave_init(uint8_t address) {
-  TWAR = address << 0; // slave i2c address
-  // TWEN  - twi enable
-  // TWEA  - enable address acknowledgement
-  // TWINT - twi interrupt flag
-  // TWIE  - enable the twi interrupt
-  TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN);
-}
-
-ISR(TWI_vect);
-
-ISR(TWI_vect) {
-  uint8_t ack = 1;
-  switch(TW_STATUS) {
-    case TW_SR_SLA_ACK:
-      // this device has been addressed as a slave receiver
-      slave_has_register_set = false;
-      break;
-
-    case TW_SR_DATA_ACK:
-      // this device has received data as a slave receiver
-      // The first byte that we receive in this transaction sets the location
-      // of the read/write location of the slaves memory that it exposes over
-      // i2c.  After that, bytes will be written at slave_buffer_pos, incrementing
-      // slave_buffer_pos after each write.
-      if(!slave_has_register_set) {
-        slave_buffer_pos = TWDR;
-        // don't acknowledge the master if this memory loctaion is out of bounds
-        if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) {
-          ack = 0;
-          slave_buffer_pos = 0;
-        }
-        slave_has_register_set = true;
-      } else {
-        i2c_slave_buffer[slave_buffer_pos] = TWDR;
-        BUFFER_POS_INC();
-      }
-      break;
-
-    case TW_ST_SLA_ACK:
-    case TW_ST_DATA_ACK:
-      // master has addressed this device as a slave transmitter and is
-      // requesting data.
-      TWDR = i2c_slave_buffer[slave_buffer_pos];
-      BUFFER_POS_INC();
-      break;
-
-    case TW_BUS_ERROR: // something went wrong, reset twi state
-      TWCR = 0;
-    default:
-      break;
-  }
-  // Reset everything, so we are ready for the next TWI interrupt
-  TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
-}
-#endif
diff --git a/keyboards/yosino58/i2c.h b/keyboards/yosino58/i2c.h
deleted file mode 100644
index 710662c7ab..0000000000
--- a/keyboards/yosino58/i2c.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifndef F_CPU
-#define F_CPU 16000000UL
-#endif
-
-#define I2C_READ 1
-#define I2C_WRITE 0
-
-#define I2C_ACK 1
-#define I2C_NACK 0
-
-#define SLAVE_BUFFER_SIZE 0x10
-
-// i2c SCL clock frequency 400kHz
-#define SCL_CLOCK  400000L
-
-extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-void i2c_master_init(void);
-uint8_t i2c_master_start(uint8_t address);
-void i2c_master_stop(void);
-uint8_t i2c_master_write(uint8_t data);
-uint8_t i2c_master_read(int);
-void i2c_reset_state(void);
-void i2c_slave_init(uint8_t address);
-
-
-static inline unsigned char i2c_start_read(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_READ);
-}
-
-static inline unsigned char i2c_start_write(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_WRITE);
-}
-
-// from SSD1306 scrips
-extern unsigned char i2c_rep_start(unsigned char addr);
-extern void i2c_start_wait(unsigned char addr);
-extern unsigned char i2c_readAck(void);
-extern unsigned char i2c_readNak(void);
-extern unsigned char i2c_read(unsigned char ack);
-
-#define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak();
diff --git a/keyboards/yosino58/keymaps/default/config.h b/keyboards/yosino58/keymaps/default/config.h
index 21fc2d3b54..aa3caa3d06 100644
--- a/keyboards/yosino58/keymaps/default/config.h
+++ b/keyboards/yosino58/keymaps/default/config.h
@@ -20,17 +20,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_MATRIX_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-// #define SSD1306_128X64
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
@@ -40,4 +35,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
\ No newline at end of file
+#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/yosino58/keymaps/default/keymap.c b/keyboards/yosino58/keymaps/default/keymap.c
index 3200d14708..00a6c8e83f 100644
--- a/keyboards/yosino58/keymaps/default/keymap.c
+++ b/keyboards/yosino58/keymaps/default/keymap.c
@@ -1,20 +1,10 @@
 #include QMK_KEYBOARD_H
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
 extern rgblight_config_t rgblight_config;
 #endif
 
-extern uint8_t is_master;
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -25,8 +15,7 @@ extern uint8_t is_master;
 #define _ADJUST 3
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
   RGBRST
@@ -126,11 +115,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 int RGB_current_mode;
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 // Setting ADJUST layer RGB back to default
 void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
   if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
@@ -144,18 +128,9 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-      #ifdef SSD1306_128X64
-        iota_gfx_init(false);   // turns on the display
-      #else
-        iota_gfx_init(!has_usb());   // turns on the display
-      #endif
-    #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 //assign the right code to your layers for OLED display
 #define L_QWERTY 0
@@ -166,12 +141,8 @@ void matrix_init_user(void) {
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_logo(void);
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
+bool oled_task_user(void) {
+  if (is_keyboard_master()) {
     static char indctr[2][20][5]=
     {
       // white icon
@@ -235,58 +206,40 @@ void matrix_render_user(struct CharacterMatrix *matrix) {
     if (layer_state == L_RAISE) { rowr = 1; }
     if (layer_state == L_ADJUST) { rowa = 1; }
 
-    matrix_write(matrix, indctr[rowl]  [0]);
-    matrix_write(matrix, indctr[rowr]  [1]);
-    matrix_write(matrix, indctr[rowa]  [2]);
-    matrix_write(matrix, indctr[rowc]  [3]);
-    matrix_write(matrix, indctr[rown]  [4]);
-    matrix_write_char(matrix, 0x13);
-    matrix_write(matrix, indctr[rowl]  [5]);
-    matrix_write(matrix, indctr[rowr]  [6]);
-    matrix_write(matrix, indctr[rowa]  [7]);
-    matrix_write(matrix, indctr[rowc]  [8]);
-    matrix_write(matrix, indctr[rown]  [9]);
-    matrix_write_char(matrix, 0x13);
-    matrix_write(matrix, indctr[rowl]  [10]);
-    matrix_write(matrix, indctr[rowr]  [11]);
-    matrix_write(matrix, indctr[rowa]  [12]);
-    matrix_write(matrix, indctr[rowc]  [13]);
-    matrix_write(matrix, indctr[rown]  [14]);
-    matrix_write_char(matrix, 0x13);
-    matrix_write(matrix, indctr[rowl]  [15]);
-    matrix_write(matrix, indctr[rowr]  [16]);
-    matrix_write(matrix, indctr[rowa]  [17]);
-    matrix_write(matrix, indctr[rowc]  [18]);
-    matrix_write(matrix, indctr[rown]  [19]);
+    oled_write(indctr[rowl]  [0], false);
+    oled_write(indctr[rowr]  [1], false);
+    oled_write(indctr[rowa]  [2], false);
+    oled_write(indctr[rowc]  [3], false);
+    oled_write(indctr[rown]  [4], false);
+    oled_write_char(0x13, false);
+    oled_write(indctr[rowl]  [5], false);
+    oled_write(indctr[rowr]  [6], false);
+    oled_write(indctr[rowa]  [7], false);
+    oled_write(indctr[rowc]  [8], false);
+    oled_write(indctr[rown]  [9], false);
+    oled_write_char(0x13, false);
+    oled_write(indctr[rowl]  [10], false);
+    oled_write(indctr[rowr]  [11], false);
+    oled_write(indctr[rowa]  [12], false);
+    oled_write(indctr[rowc]  [13], false);
+    oled_write(indctr[rown]  [14], false);
+    oled_write_char(0x13, false);
+    oled_write(indctr[rowl]  [15], false);
+    oled_write(indctr[rowr]  [16], false);
+    oled_write(indctr[rowa]  [17], false);
+    oled_write(indctr[rowc]  [18], false);
+    oled_write(indctr[rown]  [19], false);
 
   }else{
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
+  return false;
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);  
-}
-#endif//SSD1306OLED
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/yosino58/keymaps/default/rules.mk b/keyboards/yosino58/keymaps/default/rules.mk
index 88c202edb0..191140d278 100644
--- a/keyboards/yosino58/keymaps/default/rules.mk
+++ b/keyboards/yosino58/keymaps/default/rules.mk
@@ -1,5 +1,6 @@
 EXTRAKEY_ENABLE = yes
 RGBLIGHT_ENABLE = yes
+OLED_ENABLE = yes
 
 # If you want to change the display of OLED, you need to change here
 SRC +=  ./lib/glcdfont.c \
diff --git a/keyboards/yosino58/keymaps/sakura/config.h b/keyboards/yosino58/keymaps/sakura/config.h
index 64962b0d20..b80d37d457 100644
--- a/keyboards/yosino58/keymaps/sakura/config.h
+++ b/keyboards/yosino58/keymaps/sakura/config.h
@@ -20,16 +20,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_MATRIX_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
 #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-#define SSD1306_128X64
+#define OLED_DISPLAY_128X64
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
diff --git a/keyboards/yosino58/keymaps/sakura/keymap.c b/keyboards/yosino58/keymaps/sakura/keymap.c
index 0996f0e4e7..2ed734292a 100644
--- a/keyboards/yosino58/keymaps/sakura/keymap.c
+++ b/keyboards/yosino58/keymaps/sakura/keymap.c
@@ -1,21 +1,10 @@
 #include QMK_KEYBOARD_H
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.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
 
-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
@@ -26,8 +15,7 @@ extern uint8_t is_master;
 #define _ADJUST 3
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
   RGBRST
@@ -60,11 +48,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                                  ,-----------------------------------------.
  * | ESC  |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
  * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * | Tab  |   /  |   -  |   7  |   8  |   9  |                                  | PSCR | SLCK | Pause|      |  ��  |      |
+ * | Tab  |   /  |   -  |   7  |   8  |   9  |                                  | PSCR | SLCK | Pause|      |  ��  |      |
  * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |LShift|   *  |   +  |   4  |   5  |   6  |                                  |Insert| Home |PageUP|      |  ��  |  ��  |
+ * |LShift|   *  |   +  |   4  |   5  |   6  |                                  |Insert| Home |PageUP|      |  ��  |  ��  |
  * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |LCTRL |   .  |   0  |   1  |   2  |   3  |-------.-------.  ,---------------|  Del | End  |PageDN|  ��  | Num  | Caps |
+ * |LCTRL |   .  |   0  |   1  |   2  |   3  |-------.-------.  ,---------------|  Del | End  |PageDN|  ��  | Num  | Caps |
  * `-----------------------------------------/  F11  /       /   \       \  F12  \----------------------------------------'
  *                          | LAlt | LGUI | /-------/ Space /     \ Enter \-------\  |      |      |
  *                          |      |      |/ LOWER /       /       \       \       \ |      |      |
@@ -127,11 +115,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 int RGB_current_mode;
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 // Setting ADJUST layer RGB back to default
 void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
   if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
@@ -145,18 +128,9 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-      #ifdef SSD1306_128X64
-        iota_gfx_init(false);   // turns on the display
-      #else
-        iota_gfx_init(!has_usb());   // turns on the display
-      #endif
-    #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 //assign the right code to your layers for OLED display
 #define L_QWERTY 0
@@ -167,12 +141,8 @@ void matrix_init_user(void) {
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_logo(void);
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
+bool oled_task_user(void) {
+  if (is_keyboard_master()) {
     static char indctr[2][20][5]=
     {
       // white icon
@@ -236,58 +206,40 @@ void matrix_render_user(struct CharacterMatrix *matrix) {
     if (layer_state == L_RAISE) { rowr = 1; }
     if (layer_state == L_ADJUST) { rowa = 1; }
 
-    matrix_write(matrix, indctr[rowl]  [0]);
-    matrix_write(matrix, indctr[rowr]  [1]);
-    matrix_write(matrix, indctr[rowa]  [2]);
-    matrix_write(matrix, indctr[rowc]  [3]);
-    matrix_write(matrix, indctr[rown]  [4]);
-    matrix_write_char(matrix, 0x13);
-    matrix_write(matrix, indctr[rowl]  [5]);
-    matrix_write(matrix, indctr[rowr]  [6]);
-    matrix_write(matrix, indctr[rowa]  [7]);
-    matrix_write(matrix, indctr[rowc]  [8]);
-    matrix_write(matrix, indctr[rown]  [9]);
-    matrix_write_char(matrix, 0x13);
-    matrix_write(matrix, indctr[rowl]  [10]);
-    matrix_write(matrix, indctr[rowr]  [11]);
-    matrix_write(matrix, indctr[rowa]  [12]);
-    matrix_write(matrix, indctr[rowc]  [13]);
-    matrix_write(matrix, indctr[rown]  [14]);
-    matrix_write_char(matrix, 0x13);
-    matrix_write(matrix, indctr[rowl]  [15]);
-    matrix_write(matrix, indctr[rowr]  [16]);
-    matrix_write(matrix, indctr[rowa]  [17]);
-    matrix_write(matrix, indctr[rowc]  [18]);
-    matrix_write(matrix, indctr[rown]  [19]);
+    oled_write(indctr[rowl]  [0], false);
+    oled_write(indctr[rowr]  [1], false);
+    oled_write(indctr[rowa]  [2], false);
+    oled_write(indctr[rowc]  [3], false);
+    oled_write(indctr[rown]  [4], false);
+    oled_write_char(0x13, false);
+    oled_write(indctr[rowl]  [5], false);
+    oled_write(indctr[rowr]  [6], false);
+    oled_write(indctr[rowa]  [7], false);
+    oled_write(indctr[rowc]  [8], false);
+    oled_write(indctr[rown]  [9], false);
+    oled_write_char(0x13, false);
+    oled_write(indctr[rowl]  [10], false);
+    oled_write(indctr[rowr]  [11], false);
+    oled_write(indctr[rowa]  [12], false);
+    oled_write(indctr[rowc]  [13], false);
+    oled_write(indctr[rown]  [14], false);
+    oled_write_char(0x13, false);
+    oled_write(indctr[rowl]  [15], false);
+    oled_write(indctr[rowr]  [16], false);
+    oled_write(indctr[rowa]  [17], false);
+    oled_write(indctr[rowc]  [18], false);
+    oled_write(indctr[rown]  [19], false);
 
   }else{
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
+  return false;
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);  
-}
-#endif//SSD1306OLED
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/yosino58/keymaps/sakura/rules.mk b/keyboards/yosino58/keymaps/sakura/rules.mk
index 0b2ca1ba59..679c8c155d 100644
--- a/keyboards/yosino58/keymaps/sakura/rules.mk
+++ b/keyboards/yosino58/keymaps/sakura/rules.mk
@@ -15,6 +15,7 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+OLED_ENABLE = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/yosino58/rev1/.noci b/keyboards/yosino58/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h
index b7bbace5d9..6969aca480 100644
--- a/keyboards/yosino58/rev1/config.h
+++ b/keyboards/yosino58/rev1/config.h
@@ -18,6 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "config_common.h"
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x0F6A
 #define PRODUCT_ID      0x01B8
@@ -33,6 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring of each half
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
+#define DIODE_DIRECTION COL2ROW
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
@@ -43,6 +46,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 //#define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/yosino58/rev1/matrix.c b/keyboards/yosino58/rev1/matrix.c
deleted file mode 100644
index 802ce00cc6..0000000000
--- a/keyboards/yosino58/rev1/matrix.c
+++ /dev/null
@@ -1,343 +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/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "quantum.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else // USE_SERIAL
-#  include "split_scomm.h"
-#endif
-
-#ifndef DEBOUNCE
-#  define DEBOUNCE	5
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-static uint8_t debouncing = DEBOUNCE;
-static const int ROWS_PER_HAND = MATRIX_ROWS/2;
-static uint8_t error_count = 0;
-uint8_t is_master = 0 ;
-
-static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static matrix_row_t read_cols(void);
-static void init_cols(void);
-static void unselect_rows(void);
-static void select_row(uint8_t row);
-static uint8_t matrix_master_scan(void);
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-    debug_enable = true;
-    debug_matrix = true;
-    debug_mouse = true;
-    // initialize row and col
-    unselect_rows();
-    init_cols();
-
-    setPinOutput(B0);
-    setPinOutput(D5);
-    writePinHigh(D5);
-    writePinHigh(B0);
-
-    // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
-    }
-
-    is_master = has_usb();
-
-    matrix_init_quantum();
-}
-
-uint8_t _matrix_scan(void)
-{
-    // Right hand is stored after the left in the matirx so, we need to offset it
-    int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
-
-    for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-        select_row(i);
-        _delay_us(30);  // without this wait read unstable value.
-        matrix_row_t cols = read_cols();
-        if (matrix_debouncing[i+offset] != cols) {
-            matrix_debouncing[i+offset] = cols;
-            debouncing = DEBOUNCE;
-        }
-        unselect_rows();
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-                matrix[i+offset] = matrix_debouncing[i+offset];
-            }
-        }
-    }
-
-    return 1;
-}
-
-#ifdef USE_MATRIX_I2C
-
-// Get rows from other half over i2c
-int i2c_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
-    int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-    if (err) goto i2c_error;
-
-    // start of matrix stored at 0x00
-    err = i2c_master_write(0x00);
-    if (err) goto i2c_error;
-
-    // Start read
-    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
-    if (err) goto i2c_error;
-
-    if (!err) {
-        int i;
-        for (i = 0; i < ROWS_PER_HAND-1; ++i) {
-            matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
-        }
-        matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
-        i2c_master_stop();
-    } else {
-i2c_error: // the cable is disconnceted, or something else went wrong
-        i2c_reset_state();
-        return err;
-    }
-
-    return 0;
-}
-
-#else // USE_SERIAL
-
-int serial_transaction(int master_changed) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-    int ret=serial_update_buffers(master_changed);
-#else
-    int ret=serial_update_buffers();
-#endif
-    if (ret ) {
-        if(ret==2) writePinLow(B0);
-        return 1;
-    }
-    writePinHigh(B0);
-    memcpy(&matrix[slaveOffset],
-        (void *)serial_slave_buffer, SERIAL_SLAVE_BUFFER_LENGTH);
-    return 0;
-}
-#endif
-
-uint8_t matrix_scan(void)
-{
-    if (is_master) {
-        matrix_master_scan();
-    }else{
-        matrix_slave_scan();
-        int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
-        memcpy(&matrix[offset],
-               (void *)serial_master_buffer, SERIAL_MASTER_BUFFER_LENGTH);
-        matrix_scan_quantum();
-    }
-    return 1;
-}
-
-
-uint8_t matrix_master_scan(void) {
-
-    int ret = _matrix_scan();
-    int mchanged = 1;
-
-    int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-#ifdef USE_MATRIX_I2C
-//    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-//        i2c_slave_buffer[i] = matrix[offset+i];
-//    }
-#else // USE_SERIAL
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-    mchanged = memcmp((void *)serial_master_buffer,
-		      &matrix[offset], SERIAL_MASTER_BUFFER_LENGTH);
-  #endif
-    memcpy((void *)serial_master_buffer,
-	   &matrix[offset], SERIAL_MASTER_BUFFER_LENGTH);
-#endif
-
-#ifdef USE_MATRIX_I2C
-    if( i2c_transaction() ) {
-#else // USE_SERIAL
-    if( serial_transaction(mchanged) ) {
-#endif
-        // turn on the indicator led when halves are disconnected
-        writePinLow(D5);
-
-        error_count++;
-
-        if (error_count > ERROR_DISCONNECT_COUNT) {
-            // reset other half if disconnected
-            int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                matrix[slaveOffset+i] = 0;
-            }
-        }
-    } else {
-        // turn off the indicator led on no error
-        writePinHigh(D5);
-        error_count = 0;
-    }
-    matrix_scan_quantum();
-    return ret;
-}
-
-void matrix_slave_scan(void) {
-    _matrix_scan();
-
-    int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-#ifdef USE_MATRIX_I2C
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-        i2c_slave_buffer[i] = matrix[offset+i];
-    }
-#else // USE_SERIAL
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-    int change = 0;
-  #endif
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-        if( serial_slave_buffer[i] != matrix[offset+i] )
-	    change = 1;
-  #endif
-        serial_slave_buffer[i] = matrix[offset+i];
-    }
-  #ifdef SERIAL_USE_MULTI_TRANSACTION
-    slave_buffer_change_count += change;
-  #endif
-#endif
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_bin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-static void  init_cols(void)
-{
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
-        _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
-    }
-}
-
-static matrix_row_t read_cols(void)
-{
-    matrix_row_t result = 0;
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
-    }
-    return result;
-}
-
-static void unselect_rows(void)
-{
-    for(int x = 0; x < ROWS_PER_HAND; x++) {
-        _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
-        _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
-    }
-}
-
-static void select_row(uint8_t row)
-{
-    _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
-    _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
-}
diff --git a/keyboards/yosino58/rev1/rev1.h b/keyboards/yosino58/rev1/rev1.h
index bc68892e88..c643c9d729 100644
--- a/keyboards/yosino58/rev1/rev1.h
+++ b/keyboards/yosino58/rev1/rev1.h
@@ -1,22 +1,7 @@
 #pragma once
 
-#include "../yosino58.h"
-
 #include "quantum.h"
 
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
   L00, L01, L02, L03, L04, L05,                     R00, R01, R02, R03, R04, R05, \
   L10, L11, L12, L13, L14, L15,                     R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/yosino58/rev1/rules.mk b/keyboards/yosino58/rev1/rules.mk
index 6028b5a5b9..cf39e83a4f 100644
--- a/keyboards/yosino58/rev1/rules.mk
+++ b/keyboards/yosino58/rev1/rules.mk
@@ -1,3 +1,20 @@
-SRC += rev1/matrix.c
-SRC += rev1/split_util.c
-SRC += rev1/split_scomm.c
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = 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
+AUDIO_ENABLE = no           # Audio output
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
+SPLIT_KEYBOARD = yes
+OLED_DRIVER = SSD1306
diff --git a/keyboards/yosino58/rev1/serial_config.h b/keyboards/yosino58/rev1/serial_config.h
deleted file mode 100644
index 4fab8e8ddf..0000000000
--- a/keyboards/yosino58/rev1/serial_config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef SOFT_SERIAL_PIN
-#define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
-#endif
diff --git a/keyboards/yosino58/rev1/serial_config_simpleapi.h b/keyboards/yosino58/rev1/serial_config_simpleapi.h
deleted file mode 100644
index 0e1dd9e4ac..0000000000
--- a/keyboards/yosino58/rev1/serial_config_simpleapi.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#undef SERIAL_USE_MULTI_TRANSACTION
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
diff --git a/keyboards/yosino58/rev1/split_scomm.c b/keyboards/yosino58/rev1/split_scomm.c
deleted file mode 100644
index 82b53d7e7f..0000000000
--- a/keyboards/yosino58/rev1/split_scomm.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifdef USE_SERIAL
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-/* --- USE flexible API (using multi-type transaction function) --- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-#include "split_scomm.h"
-#include "serial.h"
-#ifdef CONSOLE_ENABLE
-  #include "print.h"
-#endif
-
-uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
-uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
-uint8_t volatile status_com = 0;
-uint8_t volatile status1 = 0;
-uint8_t slave_buffer_change_count = 0;
-uint8_t s_change_old = 0xff;
-uint8_t s_change_new = 0xff;
-
-SSTD_t transactions[] = {
-#define GET_SLAVE_STATUS 0
-    /* master buffer not changed, only recive slave_buffer_change_count */
-    { (uint8_t *)&status_com,
-      0, NULL,
-      sizeof(slave_buffer_change_count), &slave_buffer_change_count,
-    },
-#define PUT_MASTER_GET_SLAVE_STATUS 1
-    /* master buffer changed need send, and recive slave_buffer_change_count  */
-    { (uint8_t *)&status_com,
-      sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer,
-      sizeof(slave_buffer_change_count), &slave_buffer_change_count,
-    },
-#define GET_SLAVE_BUFFER 2
-    /* recive serial_slave_buffer */
-    { (uint8_t *)&status1,
-      0, NULL,
-      sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer
-    }
-};
-
-void serial_master_init(void)
-{
-    soft_serial_initiator_init(transactions, TID_LIMIT(transactions));
-}
-
-void serial_slave_init(void)
-{
-    soft_serial_target_init(transactions, TID_LIMIT(transactions));
-}
-
-// 0 => no error
-// 1 => slave did not respond
-// 2 => checksum error
-int serial_update_buffers(int master_update)
-{
-    int status, smatstatus;
-    static int need_retry = 0;
-
-    if( s_change_old != s_change_new ) {
-        smatstatus = soft_serial_transaction(GET_SLAVE_BUFFER);
-        if( smatstatus == TRANSACTION_END ) {
-            s_change_old = s_change_new;
-#ifdef CONSOLE_ENABLE
-            uprintf("slave matrix = %b %b %b %b\n",
-                    serial_slave_buffer[0], serial_slave_buffer[1],
-                    serial_slave_buffer[2], serial_slave_buffer[3]);
-#endif
-        }
-    } else {
-        // serial_slave_buffer dosen't change
-        smatstatus = TRANSACTION_END; // dummy status
-    }
-
-    if( !master_update && !need_retry) {
-        status = soft_serial_transaction(GET_SLAVE_STATUS);
-    } else {
-        status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS);
-    }
-    if( status == TRANSACTION_END ) {
-        s_change_new = slave_buffer_change_count;
-        need_retry = 0;
-    } else {
-        need_retry = 1;
-    }
-    return smatstatus;
-}
-
-#endif // SERIAL_USE_MULTI_TRANSACTION
-#endif /* USE_SERIAL */
diff --git a/keyboards/yosino58/rev1/split_scomm.h b/keyboards/yosino58/rev1/split_scomm.h
deleted file mode 100644
index 16887eb74f..0000000000
--- a/keyboards/yosino58/rev1/split_scomm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-/* --- USE Simple API (OLD API, compatible with let's split serial.c) --- */
-#include "serial.h"
-
-#else
-/* --- USE flexible API (using multi-type transaction function) --- */
-// Buffers for master - slave communication
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
-
-extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH];
-extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH];
-extern uint8_t slave_buffer_change_count;
-
-void serial_master_init(void);
-void serial_slave_init(void);
-int serial_update_buffers(int master_changed);
-
-#endif
diff --git a/keyboards/yosino58/rev1/split_util.c b/keyboards/yosino58/rev1/split_util.c
deleted file mode 100644
index e1ff8b4379..0000000000
--- a/keyboards/yosino58/rev1/split_util.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/power.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/eeprom.h>
-#include "split_util.h"
-#include "matrix.h"
-#include "keyboard.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else
-#  include "split_scomm.h"
-#endif
-
-volatile bool isLeftHand = true;
-
-static void setup_handedness(void) {
-  #ifdef EE_HANDS
-    isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
-  #else
-    // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c
-    #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
-      isLeftHand = !has_usb();
-    #else
-      isLeftHand = has_usb();
-    #endif
-  #endif
-}
-
-static void keyboard_master_setup(void) {
-
-#ifdef USE_MATRIX_I2C
-    i2c_master_init();
-#else
-    serial_master_init();
-#endif
-}
-
-static void keyboard_slave_setup(void) {
-
-#ifdef USE_MATRIX_I2C
-    i2c_slave_init(SLAVE_I2C_ADDRESS);
-#else
-    serial_slave_init();
-#endif
-}
-
-bool has_usb(void) {
-   USBCON |= (1 << OTGPADE); //enables VBUS pad
-   _delay_us(5);
-   return (USBSTA & (1<<VBUS));  //checks state of VBUS
-}
-
-void split_keyboard_setup(void) {
-   setup_handedness();
-
-   if (has_usb()) {
-      keyboard_master_setup();
-   } else {
-      keyboard_slave_setup();
-   }
-   sei();
-}
-
-// this code runs before the usb and keyboard is initialized
-void matrix_setup(void) {
-    split_keyboard_setup();
-}
diff --git a/keyboards/yosino58/rev1/split_util.h b/keyboards/yosino58/rev1/split_util.h
deleted file mode 100644
index f593047560..0000000000
--- a/keyboards/yosino58/rev1/split_util.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include "eeconfig.h"
-
-#define SLAVE_I2C_ADDRESS           0x32
-
-extern volatile bool isLeftHand;
-
-// slave version of matix scan, defined in matrix.c
-void matrix_slave_scan(void);
-
-void split_keyboard_setup(void);
-bool has_usb(void);
-
-void matrix_master_OLED_init (void);
diff --git a/keyboards/yosino58/rules.mk b/keyboards/yosino58/rules.mk
index 3d0f6b19e5..c700b6f5b5 100644
--- a/keyboards/yosino58/rules.mk
+++ b/keyboards/yosino58/rules.mk
@@ -1,28 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SUBPROJECT_rev1 = no
-USE_I2C = yes
-
-CUSTOM_MATRIX = yes
-
 DEFAULT_FOLDER = yosino58/rev1
-
-SRC += i2c.c
-SRC += serial.c
-SRC += ssd1306.c
diff --git a/keyboards/yosino58/serial.c b/keyboards/yosino58/serial.c
deleted file mode 100644
index f6293c3dc2..0000000000
--- a/keyboards/yosino58/serial.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * WARNING: be careful changing this code, it is very timing dependent
- *
- * 2018-10-28 checked
- *  avr-gcc 4.9.2
- *  avr-gcc 5.4.0
- *  avr-gcc 7.3.0
- */
-
-#ifndef F_CPU
-#define F_CPU 16000000
-#endif
-
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include "serial.h"
-
-#ifdef SOFT_SERIAL_PIN
-
-#ifdef __AVR_ATmega32U4__
-  // if using ATmega32U4 I2C, can not use PD0 and PD1 in soft serial.
-  #ifdef USE_I2C
-    #if SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1
-      #error Using ATmega32U4 I2C, so can not use PD0, PD1
-    #endif
-  #endif
-
-  #if SOFT_SERIAL_PIN >= D0 && SOFT_SERIAL_PIN <= D3
-    #define SERIAL_PIN_DDR   DDRD
-    #define SERIAL_PIN_PORT  PORTD
-    #define SERIAL_PIN_INPUT PIND
-    #if SOFT_SERIAL_PIN == D0
-      #define SERIAL_PIN_MASK _BV(PD0)
-      #define EIMSK_BIT       _BV(INT0)
-      #define EICRx_BIT       (~(_BV(ISC00) | _BV(ISC01)))
-      #define SERIAL_PIN_INTERRUPT INT0_vect
-    #elif  SOFT_SERIAL_PIN == D1
-      #define SERIAL_PIN_MASK _BV(PD1)
-      #define EIMSK_BIT       _BV(INT1)
-      #define EICRx_BIT       (~(_BV(ISC10) | _BV(ISC11)))
-      #define SERIAL_PIN_INTERRUPT INT1_vect
-    #elif  SOFT_SERIAL_PIN == D2
-      #define SERIAL_PIN_MASK _BV(PD2)
-      #define EIMSK_BIT       _BV(INT2)
-      #define EICRx_BIT       (~(_BV(ISC20) | _BV(ISC21)))
-      #define SERIAL_PIN_INTERRUPT INT2_vect
-    #elif  SOFT_SERIAL_PIN == D3
-      #define SERIAL_PIN_MASK _BV(PD3)
-      #define EIMSK_BIT       _BV(INT3)
-      #define EICRx_BIT       (~(_BV(ISC30) | _BV(ISC31)))
-      #define SERIAL_PIN_INTERRUPT INT3_vect
-    #endif
-  #elif  SOFT_SERIAL_PIN == E6
-    #define SERIAL_PIN_DDR   DDRE
-    #define SERIAL_PIN_PORT  PORTE
-    #define SERIAL_PIN_INPUT PINE
-    #define SERIAL_PIN_MASK  _BV(PE6)
-    #define EIMSK_BIT        _BV(INT6)
-    #define EICRx_BIT        (~(_BV(ISC60) | _BV(ISC61)))
-    #define SERIAL_PIN_INTERRUPT INT6_vect
-  #else
-  #error invalid SOFT_SERIAL_PIN value
-  #endif
-
-#else
- #error serial.c now support ATmega32U4 only
-#endif
-
-//////////////// for backward compatibility ////////////////////////////////
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-/* --- USE Simple API (OLD API, compatible with let's split serial.c) */
-  #if SERIAL_SLAVE_BUFFER_LENGTH > 0
-  uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
-  #endif
-  #if SERIAL_MASTER_BUFFER_LENGTH > 0
-  uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
-  #endif
-  uint8_t volatile status0 = 0;
-
-SSTD_t transactions[] = {
-    { (uint8_t *)&status0,
-  #if SERIAL_MASTER_BUFFER_LENGTH > 0
-      sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer,
-  #else
-      0, (uint8_t *)NULL,
-  #endif
-  #if SERIAL_SLAVE_BUFFER_LENGTH > 0
-      sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer
-  #else
-      0, (uint8_t *)NULL,
-  #endif
-  }
-};
-
-void serial_master_init(void)
-{ soft_serial_initiator_init(transactions, TID_LIMIT(transactions)); }
-
-void serial_slave_init(void)
-{ soft_serial_target_init(transactions, TID_LIMIT(transactions)); }
-
-// 0 => no error
-// 1 => slave did not respond
-// 2 => checksum error
-int serial_update_buffers()
-{
-    int result;
-    result = soft_serial_transaction();
-    return result;
-}
-
-#endif // end of Simple API (OLD API, compatible with let's split serial.c)
-////////////////////////////////////////////////////////////////////////////
-
-#define ALWAYS_INLINE __attribute__((always_inline))
-#define NO_INLINE __attribute__((noinline))
-#define _delay_sub_us(x)    __builtin_avr_delay_cycles(x)
-
-// parity check
-#define ODD_PARITY 1
-#define EVEN_PARITY 0
-#define PARITY EVEN_PARITY
-
-#ifdef SERIAL_DELAY
-  // custom setup in config.h
-  // #define TID_SEND_ADJUST 2
-  // #define SERIAL_DELAY 6             // micro sec
-  // #define READ_WRITE_START_ADJUST 30 // cycles
-  // #define READ_WRITE_WIDTH_ADJUST 8 // cycles
-#else
-// ============ Standard setups ============
-
-#ifndef SELECT_SOFT_SERIAL_SPEED
-#define SELECT_SOFT_SERIAL_SPEED 1
-//  0: about 189kbps
-//  1: about 137kbps (default)
-//  2: about 75kbps
-//  3: about 39kbps
-//  4: about 26kbps
-//  5: about 20kbps
-#endif
-
-#if __GNUC__ < 6
-  #define TID_SEND_ADJUST 14
-#else
-  #define TID_SEND_ADJUST 2
-#endif
-
-#if SELECT_SOFT_SERIAL_SPEED == 0
-  // Very High speed
-  #define SERIAL_DELAY 4             // micro sec
-  #if __GNUC__ < 6
-    #define READ_WRITE_START_ADJUST 33 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_START_ADJUST 34 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 1
-  // High speed
-  #define SERIAL_DELAY 6             // micro sec
-  #if __GNUC__ < 6
-    #define READ_WRITE_START_ADJUST 30 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_START_ADJUST 33 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 2
-  // Middle speed
-  #define SERIAL_DELAY 12            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 3
-  // Low speed
-  #define SERIAL_DELAY 24            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 4
-  // Very Low speed
-  #define SERIAL_DELAY 36            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 5
-  // Ultra Low speed
-  #define SERIAL_DELAY 48            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#else
-#error invalid SELECT_SOFT_SERIAL_SPEED value
-#endif /* SELECT_SOFT_SERIAL_SPEED */
-#endif /* SERIAL_DELAY */
-
-#define SERIAL_DELAY_HALF1 (SERIAL_DELAY/2)
-#define SERIAL_DELAY_HALF2 (SERIAL_DELAY - SERIAL_DELAY/2)
-
-#define SLAVE_INT_WIDTH_US 1
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  #define SLAVE_INT_RESPONSE_TIME SERIAL_DELAY
-#else
-  #define SLAVE_INT_ACK_WIDTH_UNIT 2
-  #define SLAVE_INT_ACK_WIDTH 4
-#endif
-
-static SSTD_t *Transaction_table = NULL;
-static uint8_t Transaction_table_size = 0;
-
-inline static void serial_delay(void) ALWAYS_INLINE;
-inline static
-void serial_delay(void) {
-  _delay_us(SERIAL_DELAY);
-}
-
-inline static void serial_delay_half1(void) ALWAYS_INLINE;
-inline static
-void serial_delay_half1(void) {
-  _delay_us(SERIAL_DELAY_HALF1);
-}
-
-inline static void serial_delay_half2(void) ALWAYS_INLINE;
-inline static
-void serial_delay_half2(void) {
-  _delay_us(SERIAL_DELAY_HALF2);
-}
-
-inline static void serial_output(void) ALWAYS_INLINE;
-inline static
-void serial_output(void) {
-  SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
-}
-
-// 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) {
-  SERIAL_PIN_DDR  &= ~SERIAL_PIN_MASK;
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
-inline static
-uint8_t serial_read_pin(void) {
-  return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);
-}
-
-inline static void serial_low(void) ALWAYS_INLINE;
-inline static
-void serial_low(void) {
-  SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
-}
-
-inline static void serial_high(void) ALWAYS_INLINE;
-inline static
-void serial_high(void) {
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size)
-{
-    Transaction_table = sstd_table;
-    Transaction_table_size = (uint8_t)sstd_table_size;
-    serial_output();
-    serial_high();
-}
-
-void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size)
-{
-    Transaction_table = sstd_table;
-    Transaction_table_size = (uint8_t)sstd_table_size;
-    serial_input_with_pullup();
-
-    // Enable INT0-INT3,INT6
-    EIMSK |= EIMSK_BIT;
-#if SERIAL_PIN_MASK == _BV(PE6)
-    // Trigger on falling edge of INT6
-    EICRB &= EICRx_BIT;
-#else
-    // Trigger on falling edge of INT0-INT3
-    EICRA &= EICRx_BIT;
-#endif
-}
-
-// Used by the sender to synchronize timing with the reciver.
-static void sync_recv(void) NO_INLINE;
-static
-void sync_recv(void) {
-  for (uint8_t i = 0; i < SERIAL_DELAY*5 && serial_read_pin(); i++ ) {
-  }
-  // This shouldn't hang if the target disconnects because the
-  // serial line will float to high if the target does disconnect.
-  while (!serial_read_pin());
-}
-
-// Used by the reciver to send a synchronization signal to the sender.
-static void sync_send(void) NO_INLINE;
-static
-void sync_send(void) {
-  serial_low();
-  serial_delay();
-  serial_high();
-}
-
-// Reads a byte from the serial line
-static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) NO_INLINE;
-static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
-    uint8_t byte, i, p, pb;
-
-  _delay_sub_us(READ_WRITE_START_ADJUST);
-  for( i = 0, byte = 0, p = PARITY; i < bit; i++ ) {
-      serial_delay_half1();   // read the middle of pulses
-      if( serial_read_pin() ) {
-          byte = (byte << 1) | 1; p ^= 1;
-      } else {
-          byte = (byte << 1) | 0; p ^= 0;
-      }
-      _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
-      serial_delay_half2();
-  }
-  /* recive parity bit */
-  serial_delay_half1();   // read the middle of pulses
-  pb = serial_read_pin();
-  _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
-  serial_delay_half2();
-
-  *pterrcount += (p != pb)? 1 : 0;
-
-  return byte;
-}
-
-// Sends a byte with MSB ordering
-void serial_write_chunk(uint8_t data, uint8_t bit) NO_INLINE;
-void serial_write_chunk(uint8_t data, uint8_t bit) {
-    uint8_t b, p;
-    for( p = PARITY, b = 1<<(bit-1); b ; b >>= 1) {
-        if(data & b) {
-            serial_high(); p ^= 1;
-        } else {
-            serial_low();  p ^= 0;
-        }
-        serial_delay();
-    }
-    /* send parity bit */
-    if(p & 1) { serial_high(); }
-    else      { serial_low(); }
-    serial_delay();
-
-    serial_low(); // sync_send() / senc_recv() need raise edge
-}
-
-static void serial_send_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
-static
-void serial_send_packet(uint8_t *buffer, uint8_t size) {
-  for (uint8_t i = 0; i < size; ++i) {
-    uint8_t data;
-    data = buffer[i];
-    sync_send();
-    serial_write_chunk(data,8);
-  }
-}
-
-static uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
-static
-uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) {
-  uint8_t pecount = 0;
-  for (uint8_t i = 0; i < size; ++i) {
-    uint8_t data;
-    sync_recv();
-    data = serial_read_chunk(&pecount, 8);
-    buffer[i] = data;
-  }
-  return pecount == 0;
-}
-
-inline static
-void change_sender2reciver(void) {
-    sync_send();          //0
-    serial_delay_half1(); //1
-    serial_low();         //2
-    serial_input_with_pullup(); //2
-    serial_delay_half1(); //3
-}
-
-inline static
-void change_reciver2sender(void) {
-    sync_recv();     //0
-    serial_delay();  //1
-    serial_low();    //3
-    serial_output(); //3
-    serial_delay_half1(); //4
-}
-
-static inline uint8_t nibble_bits_count(uint8_t bits)
-{
-    bits = (bits & 0x5) + (bits >> 1 & 0x5);
-    bits = (bits & 0x3) + (bits >> 2 & 0x3);
-    return bits;
-}
-
-// interrupt handle to be used by the target device
-ISR(SERIAL_PIN_INTERRUPT) {
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  serial_low();
-  serial_output();
-  SSTD_t *trans = Transaction_table;
-#else
-  // recive transaction table index
-  uint8_t tid, bits;
-  uint8_t pecount = 0;
-  sync_recv();
-  bits = serial_read_chunk(&pecount,7);
-  tid = bits>>3;
-  bits = (bits&7) != nibble_bits_count(tid);
-  if( bits || pecount> 0 || tid > Transaction_table_size ) {
-      return;
-  }
-  serial_delay_half1();
-
-  serial_high(); // response step1 low->high
-  serial_output();
-  _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT*SLAVE_INT_ACK_WIDTH);
-  SSTD_t *trans = &Transaction_table[tid];
-  serial_low(); // response step2 ack high->low
-#endif
-
-  // target send phase
-  if( trans->target2initiator_buffer_size > 0 )
-      serial_send_packet((uint8_t *)trans->target2initiator_buffer,
-                         trans->target2initiator_buffer_size);
-  // target switch to input
-  change_sender2reciver();
-
-  // target recive phase
-  if( trans->initiator2target_buffer_size > 0 ) {
-      if (serial_recive_packet((uint8_t *)trans->initiator2target_buffer,
-                               trans->initiator2target_buffer_size) ) {
-          *trans->status = TRANSACTION_ACCEPTED;
-      } else {
-          *trans->status = TRANSACTION_DATA_ERROR;
-      }
-  } else {
-      *trans->status = TRANSACTION_ACCEPTED;
-  }
-
-  sync_recv(); //weit initiator output to high
-}
-
-/////////
-//  start transaction by initiator
-//
-// int  soft_serial_transaction(int sstd_index)
-//
-// Returns:
-//    TRANSACTION_END
-//    TRANSACTION_NO_RESPONSE
-//    TRANSACTION_DATA_ERROR
-// this code is very time dependent, so we need to disable interrupts
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_transaction(void) {
-  SSTD_t *trans = Transaction_table;
-#else
-int  soft_serial_transaction(int sstd_index) {
-  if( sstd_index > Transaction_table_size )
-      return TRANSACTION_TYPE_ERROR;
-  SSTD_t *trans = &Transaction_table[sstd_index];
-#endif
-  cli();
-
-  // signal to the target that we want to start a transaction
-  serial_output();
-  serial_low();
-  _delay_us(SLAVE_INT_WIDTH_US);
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  // wait for the target response
-  serial_input_with_pullup();
-  _delay_us(SLAVE_INT_RESPONSE_TIME);
-
-  // check if the target is present
-  if (serial_read_pin()) {
-    // target failed to pull the line low, assume not present
-    serial_output();
-    serial_high();
-    *trans->status = TRANSACTION_NO_RESPONSE;
-    sei();
-    return TRANSACTION_NO_RESPONSE;
-  }
-
-#else
-  // send transaction table index
-  int tid = (sstd_index<<3) | (7 & nibble_bits_count(sstd_index));
-  sync_send();
-  _delay_sub_us(TID_SEND_ADJUST);
-  serial_write_chunk(tid, 7);
-  serial_delay_half1();
-
-  // wait for the target response (step1 low->high)
-  serial_input_with_pullup();
-  while( !serial_read_pin() ) {
-      _delay_sub_us(2);
-  }
-
-  // check if the target is present (step2 high->low)
-  for( int i = 0; serial_read_pin(); i++ ) {
-      if (i > SLAVE_INT_ACK_WIDTH + 1) {
-          // slave failed to pull the line low, assume not present
-          serial_output();
-          serial_high();
-          *trans->status = TRANSACTION_NO_RESPONSE;
-          sei();
-          return TRANSACTION_NO_RESPONSE;
-      }
-      _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT);
-  }
-#endif
-
-  // initiator recive phase
-  // if the target is present syncronize with it
-  if( trans->target2initiator_buffer_size > 0 ) {
-      if (!serial_recive_packet((uint8_t *)trans->target2initiator_buffer,
-                                trans->target2initiator_buffer_size) ) {
-          serial_output();
-          serial_high();
-          *trans->status = TRANSACTION_DATA_ERROR;
-          sei();
-          return TRANSACTION_DATA_ERROR;
-      }
-   }
-
-  // initiator switch to output
-  change_reciver2sender();
-
-  // initiator send phase
-  if( trans->initiator2target_buffer_size > 0 ) {
-      serial_send_packet((uint8_t *)trans->initiator2target_buffer,
-                         trans->initiator2target_buffer_size);
-  }
-
-  // always, release the line when not in use
-  sync_send();
-
-  *trans->status = TRANSACTION_END;
-  sei();
-  return TRANSACTION_END;
-}
-
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-int soft_serial_get_and_clean_status(int sstd_index) {
-    SSTD_t *trans = &Transaction_table[sstd_index];
-    cli();
-    int retval = *trans->status;
-    *trans->status = 0;;
-    sei();
-    return retval;
-}
-#endif
-
-#endif
-
-// Helix serial.c history
-//   2018-1-29 fork from let's split and add PD2, modify sync_recv() (#2308, bceffdefc)
-//   2018-6-28 bug fix master to slave comm and speed up (#3255, 1038bbef4)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-7-13 remove USE_SERIAL_PD2 macro (#3374, f30d6dd78)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-8-11 add support multi-type transaction (#3608, feb5e4aae)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-10-21 fix serial and RGB animation conflict (#4191, 4665e4fff)
-//             (adjusted with avr-gcc 7.3.0)
-//   2018-10-28 re-adjust compiler depend value of delay (#4269, 8517f8a66)
-//             (adjusted with avr-gcc 5.4.0, 7.3.0)
diff --git a/keyboards/yosino58/serial.h b/keyboards/yosino58/serial.h
deleted file mode 100644
index ac3459c876..0000000000
--- a/keyboards/yosino58/serial.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-
-// /////////////////////////////////////////////////////////////////
-// Need Soft Serial defines in config.h
-// /////////////////////////////////////////////////////////////////
-// ex.
-//  #define SOFT_SERIAL_PIN ??   // ?? = D0,D1,D2,D3,E6
-//  OPTIONAL: #define SELECT_SOFT_SERIAL_SPEED ? // ? = 1,2,3,4,5
-//                                               //  1: about 137kbps (default)
-//                                               //  2: about 75kbps
-//                                               //  3: about 39kbps
-//                                               //  4: about 26kbps
-//                                               //  5: about 20kbps
-//
-// //// USE Simple API (OLD API, compatible with let's split serial.c)
-// ex.
-//  #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-//  #define SERIAL_MASTER_BUFFER_LENGTH 1
-//
-// //// USE flexible API (using multi-type transaction function)
-//  #define SERIAL_USE_MULTI_TRANSACTION
-//
-// /////////////////////////////////////////////////////////////////
-
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-/* --- USE Simple API (OLD API, compatible with let's split serial.c) */
-#if SERIAL_SLAVE_BUFFER_LENGTH > 0
-extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH];
-#endif
-#if SERIAL_MASTER_BUFFER_LENGTH > 0
-extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH];
-#endif
-
-void serial_master_init(void);
-void serial_slave_init(void);
-int serial_update_buffers(void);
-
-#endif // USE Simple API
-
-// Soft Serial Transaction Descriptor
-typedef struct _SSTD_t  {
-    uint8_t *status;
-    uint8_t initiator2target_buffer_size;
-    uint8_t *initiator2target_buffer;
-    uint8_t target2initiator_buffer_size;
-    uint8_t *target2initiator_buffer;
-} SSTD_t;
-#define TID_LIMIT( table ) (sizeof(table) / sizeof(SSTD_t))
-
-// initiator is transaction start side
-void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size);
-// target is interrupt accept side
-void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size);
-
-// initiator resullt
-#define TRANSACTION_END 0
-#define TRANSACTION_NO_RESPONSE 0x1
-#define TRANSACTION_DATA_ERROR  0x2
-#define TRANSACTION_TYPE_ERROR  0x4
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_transaction(void);
-#else
-int  soft_serial_transaction(int sstd_index);
-#endif
-
-// target status
-// *SSTD_t.status has
-//   initiator:
-//       TRANSACTION_END
-//    or TRANSACTION_NO_RESPONSE
-//    or TRANSACTION_DATA_ERROR
-//   target:
-//       TRANSACTION_DATA_ERROR
-//    or TRANSACTION_ACCEPTED
-#define TRANSACTION_ACCEPTED 0x8
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_get_and_clean_status(int sstd_index);
-#endif
diff --git a/keyboards/yosino58/ssd1306.c b/keyboards/yosino58/ssd1306.c
deleted file mode 100644
index abd9de2f7a..0000000000
--- a/keyboards/yosino58/ssd1306.c
+++ /dev/null
@@ -1,347 +0,0 @@
-#ifdef SSD1306OLED
-
-#include "ssd1306.h"
-#include "i2c.h"
-#include <string.h>
-#include "print.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#endif
-#include "sendchar.h"
-#include "timer.h"
-
-struct CharacterMatrix display;
-
-extern const unsigned char font[] PROGMEM;
-
-// Set this to 1 to help diagnose early startup problems
-// when testing power-on with ble.  Turn it off otherwise,
-// as the latency of printing most of the debug info messes
-// with the matrix scan, causing keys to drop.
-#define DEBUG_TO_SCREEN 0
-
-//static uint16_t last_battery_update;
-//static uint32_t vbat;
-//#define BatteryUpdateInterval 10000 /* milliseconds */
-
-// 'last_flush' is declared as uint16_t,
-// so this must be less than 65535 
-#define ScreenOffInterval 30000 /* milliseconds */
-#if DEBUG_TO_SCREEN
-static uint8_t displaying;
-#endif
-static uint16_t last_flush;
-
-static bool force_dirty = true;
-
-// Write command sequence.
-// Returns true on success.
-static inline bool _send_cmd1(uint8_t cmd) {
-  bool res = false;
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    xprintf("failed to start write to %d\n", SSD1306_ADDRESS);
-    goto done;
-  }
-
-  if (i2c_master_write(0x0 /* command byte follows */)) {
-    print("failed to write control byte\n");
-
-    goto done;
-  }
-
-  if (i2c_master_write(cmd)) {
-    xprintf("failed to write command %d\n", cmd);
-    goto done;
-  }
-  res = true;
-done:
-  i2c_master_stop();
-  return res;
-}
-
-// Write 2-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd2(uint8_t cmd, uint8_t opr) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  return _send_cmd1(opr);
-}
-
-// Write 3-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd3(uint8_t cmd, uint8_t opr1, uint8_t opr2) {
-  if (!_send_cmd1(cmd)) {
-    return false;
-  }
-  if (!_send_cmd1(opr1)) {
-    return false;
-  }
-  return _send_cmd1(opr2);
-}
-
-#define send_cmd1(c) if (!_send_cmd1(c)) {goto done;}
-#define send_cmd2(c,o) if (!_send_cmd2(c,o)) {goto done;}
-#define send_cmd3(c,o1,o2) if (!_send_cmd3(c,o1,o2)) {goto done;}
-
-static void clear_display(void) {
-  matrix_clear(&display);
-
-  // Clear all of the display bits (there can be random noise
-  // in the RAM on startup)
-  send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1);
-  send_cmd3(ColumnAddr, 0, DisplayWidth - 1);
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    goto done;
-  }
-  if (i2c_master_write(0x40)) {
-    // Data mode
-    goto done;
-  }
-  for (uint8_t row = 0; row < MatrixRows; ++row) {
-    for (uint8_t col = 0; col < DisplayWidth; ++col) {
-      i2c_master_write(0);
-    }
-  }
-
-  display.dirty = false;
-
-done:
-  i2c_master_stop();
-}
-
-#if DEBUG_TO_SCREEN
-#undef sendchar
-static int8_t capture_sendchar(uint8_t c) {
-  sendchar(c);
-  iota_gfx_write_char(c);
-
-  if (!displaying) {
-    iota_gfx_flush();
-  }
-  return 0;
-}
-#endif
-
-bool iota_gfx_init(bool rotate) {
-  bool success = false;
-
-  i2c_master_init();
-  send_cmd1(DisplayOff);
-  send_cmd2(SetDisplayClockDiv, 0x80);
-  send_cmd2(SetMultiPlex, DisplayHeight - 1);
-
-  send_cmd2(SetDisplayOffset, 0);
-
-
-  send_cmd1(SetStartLine | 0x0);
-  send_cmd2(SetChargePump, 0x14 /* Enable */);
-  send_cmd2(SetMemoryMode, 0 /* horizontal addressing */);
-
-  if(rotate){
-    // the following Flip the display orientation 180 degrees
-    send_cmd1(SegRemap);
-    send_cmd1(ComScanInc);
-  }else{
-    // Flips the display orientation 0 degrees
-    send_cmd1(SegRemap | 0x1);
-    send_cmd1(ComScanDec);
-  }
-
-#ifdef SSD1306_128X64
-  send_cmd2(SetComPins, 0x12);
-#else
-  send_cmd2(SetComPins, 0x2);
-#endif
-  send_cmd2(SetContrast, 0x8f);
-  send_cmd2(SetPreCharge, 0xf1);
-  send_cmd2(SetVComDetect, 0x40);
-  send_cmd1(DisplayAllOnResume);
-  send_cmd1(NormalDisplay);
-  send_cmd1(DeActivateScroll);
-  send_cmd1(DisplayOn);
-
-  send_cmd2(SetContrast, 0); // Dim
-
-  clear_display();
-
-  success = true;
-
-  iota_gfx_flush();
-
-#if DEBUG_TO_SCREEN
-  print_set_sendchar(capture_sendchar);
-#endif
-
-done:
-  return success;
-}
-
-bool iota_gfx_off(void) {
-  bool success = false;
-
-  send_cmd1(DisplayOff);
-  success = true;
-
-done:
-  return success;
-}
-
-bool iota_gfx_on(void) {
-  bool success = false;
-
-  send_cmd1(DisplayOn);
-  success = true;
-
-done:
-  return success;
-}
-
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c) {
-  *matrix->cursor = c;
-  ++matrix->cursor;
-
-  if (matrix->cursor - &matrix->display[0][0] == sizeof(matrix->display)) {
-    // We went off the end; scroll the display upwards by one line
-    memmove(&matrix->display[0], &matrix->display[1],
-            MatrixCols * (MatrixRows - 1));
-    matrix->cursor = &matrix->display[MatrixRows - 1][0];
-    memset(matrix->cursor, ' ', MatrixCols);
-  }
-}
-
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
-  matrix->dirty = true;
-
-  if (c == '\n') {
-    // Clear to end of line from the cursor and then move to the
-    // start of the next line
-    uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols;
-
-    while (cursor_col++ < MatrixCols) {
-      matrix_write_char_inner(matrix, ' ');
-    }
-    return;
-  }
-
-  matrix_write_char_inner(matrix, c);
-}
-
-void iota_gfx_write_char(uint8_t c) {
-  matrix_write_char(&display, c);
-}
-
-void matrix_write(struct CharacterMatrix *matrix, const char *data) {
-  const char *end = data + strlen(data);
-  while (data < end) {
-    matrix_write_char(matrix, *data);
-    ++data;
-  }
-}
-
-void matrix_write_ln(struct CharacterMatrix *matrix, const char *data) {
-  char data_ln[strlen(data)+2];
-  snprintf(data_ln, sizeof(data_ln), "%s\n", data);
-  matrix_write(matrix, data_ln);
-}
-
-void iota_gfx_write(const char *data) {
-  matrix_write(&display, data);
-}
-
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
-  while (true) {
-    uint8_t c = pgm_read_byte(data);
-    if (c == 0) {
-      return;
-    }
-    matrix_write_char(matrix, c);
-    ++data;
-  }
-}
-
-void iota_gfx_write_P(const char *data) {
-  matrix_write_P(&display, data);
-}
-
-void matrix_clear(struct CharacterMatrix *matrix) {
-  memset(matrix->display, ' ', sizeof(matrix->display));
-  matrix->cursor = &matrix->display[0][0];
-  matrix->dirty = true;
-}
-
-void iota_gfx_clear_screen(void) {
-  matrix_clear(&display);
-}
-
-void matrix_render(struct CharacterMatrix *matrix) {
-  last_flush = timer_read();
-  iota_gfx_on();
-#if DEBUG_TO_SCREEN
-  ++displaying;
-#endif
-
-  // Move to the home position
-  send_cmd3(PageAddr, 0, MatrixRows - 1);
-  send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1);
-
-  if (i2c_start_write(SSD1306_ADDRESS)) {
-    goto done;
-  }
-  if (i2c_master_write(0x40)) {
-    // Data mode
-    goto done;
-  }
-
-  for (uint8_t row = 0; row < MatrixRows; ++row) {
-    for (uint8_t col = 0; col < MatrixCols; ++col) {
-      const uint8_t *glyph = font + (matrix->display[row][col] * FontWidth);
-
-      for (uint8_t glyphCol = 0; glyphCol < FontWidth; ++glyphCol) {
-        uint8_t colBits = pgm_read_byte(glyph + glyphCol);
-        i2c_master_write(colBits);
-      }
-
-      // 1 column of space between chars (it's not included in the glyph)
-      //i2c_master_write(0);
-    }
-  }
-
-  matrix->dirty = false;
-
-done:
-  i2c_master_stop();
-#if DEBUG_TO_SCREEN
-  --displaying;
-#endif
-}
-
-void iota_gfx_flush(void) {
-  matrix_render(&display);
-}
-
-__attribute__ ((weak))
-void iota_gfx_task_user(void) {
-}
-
-void iota_gfx_task(void) {
-  iota_gfx_task_user();
-
-  if (display.dirty|| force_dirty) {
-    iota_gfx_flush();
-    force_dirty = false;
-  }
-
-  if (timer_elapsed(last_flush) > ScreenOffInterval) {
-    iota_gfx_off();
-  }
-}
-
-bool process_record_gfx(uint16_t keycode, keyrecord_t *record) {
-  force_dirty = true;
-  return true;
-}
-
-#endif
diff --git a/keyboards/yosino58/ssd1306.h b/keyboards/yosino58/ssd1306.h
deleted file mode 100644
index 35e4c144cc..0000000000
--- a/keyboards/yosino58/ssd1306.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <stdio.h>
-#include "action.h"
-
-enum ssd1306_cmds {
-  DisplayOff = 0xAE,
-  DisplayOn = 0xAF,
-
-  SetContrast = 0x81,
-  DisplayAllOnResume = 0xA4,
-
-  DisplayAllOn = 0xA5,
-  NormalDisplay = 0xA6,
-  InvertDisplay = 0xA7,
-  SetDisplayOffset = 0xD3,
-  SetComPins = 0xda,
-  SetVComDetect = 0xdb,
-  SetDisplayClockDiv = 0xD5,
-  SetPreCharge = 0xd9,
-  SetMultiPlex = 0xa8,
-  SetLowColumn = 0x00,
-  SetHighColumn = 0x10,
-  SetStartLine = 0x40,
-
-  SetMemoryMode = 0x20,
-  ColumnAddr = 0x21,
-  PageAddr = 0x22,
-
-  ComScanInc = 0xc0,
-  ComScanDec = 0xc8,
-  SegRemap = 0xa0,
-  SetChargePump = 0x8d,
-  ExternalVcc = 0x01,
-  SwitchCapVcc = 0x02,
-
-  ActivateScroll = 0x2f,
-  DeActivateScroll = 0x2e,
-  SetVerticalScrollArea = 0xa3,
-  RightHorizontalScroll = 0x26,
-  LeftHorizontalScroll = 0x27,
-  VerticalAndRightHorizontalScroll = 0x29,
-  VerticalAndLeftHorizontalScroll = 0x2a,
-};
-
-// Controls the SSD1306 128x32 OLED display via i2c
-
-#ifndef SSD1306_ADDRESS
-#define SSD1306_ADDRESS 0x3C
-#endif
-
-#ifdef SSD1306_128X64
-#define DisplayHeight 64
-#else
-#define DisplayHeight 32
-#endif
-#define DisplayWidth 128
-
-
-#define FontHeight 8
-#define FontWidth 6
-
-#define MatrixRows (DisplayHeight / FontHeight)
-#define MatrixCols (DisplayWidth / FontWidth)
-
-struct CharacterMatrix {
-  uint8_t display[MatrixRows][MatrixCols];
-  uint8_t *cursor;
-  bool dirty;
-};
-
-extern struct CharacterMatrix display;
-
-bool iota_gfx_init(bool rotate);
-void iota_gfx_task(void);
-bool iota_gfx_off(void);
-bool iota_gfx_on(void);
-void iota_gfx_flush(void);
-void iota_gfx_write_char(uint8_t c);
-void iota_gfx_write(const char *data);
-void iota_gfx_write_P(const char *data);
-void iota_gfx_clear_screen(void);
-
-void iota_gfx_task_user(void);
-
-void matrix_clear(struct CharacterMatrix *matrix);
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write(struct CharacterMatrix *matrix, const char *data);
-void matrix_write_ln(struct CharacterMatrix *matrix, const char *data);
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data);
-void matrix_render(struct CharacterMatrix *matrix);
-
-bool process_record_gfx(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c
index ff3ec10e5a..85545f3f44 100644
--- a/keyboards/yosino58/yosino58.c
+++ b/keyboards/yosino58/yosino58.c
@@ -1,10 +1 @@
-#include "yosino58.h"
-#include "ssd1306.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-#ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
-#else
-  return process_record_user(keycode, record);
-#endif
-}
+#include "yosino58.h"
\ No newline at end of file

From c10c2575b8f71b5fccad6a50bf79bacc7b3caeaf Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 31 Jul 2022 20:33:12 +0100
Subject: [PATCH 149/959] Remove OLED driver Split Common warning (#17862)

---
 docs/feature_oled_driver.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index 0d04f007f8..f73909f486 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -14,8 +14,6 @@ Tested combinations:
 
 Hardware configurations using Arm-based microcontrollers or different sizes of OLED modules may be compatible, but are untested.
 
-!> Warning: This OLED driver currently uses the new i2c_master driver from Split Common code. If your split keyboard uses I2C to communicate between sides, this driver could cause an address conflict (serial is fine). Please contact your keyboard vendor and ask them to migrate to the latest Split Common code to fix this. In addition, the display timeout system to reduce OLED burn-in also uses Split Common to detect keypresses, so you will need to implement custom timeout logic for non-Split Common keyboards.
-
 ## Usage
 
 To enable the OLED feature, there are two steps. First, when compiling your keyboard, you'll need to add the following to your `rules.mk`:

From f7aaed1b57d264a983d4890ce6ada930ce2f6368 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 31 Jul 2022 20:36:30 +0100
Subject: [PATCH 150/959] Migrate crkbd keymaps to oled driver (#17863)

---
 keyboards/crkbd/keymaps/davidrambo/config.h   |   2 -
 keyboards/crkbd/keymaps/davidrambo/keymap.c   |   3 -
 keyboards/crkbd/keymaps/devdev/keymap.c       |  25 +--
 keyboards/crkbd/keymaps/gotham/config.h       |   3 -
 keyboards/crkbd/keymaps/gotham/oled.c         |   2 -
 keyboards/crkbd/keymaps/hvp/config.h          |   4 -
 keyboards/crkbd/keymaps/hvp/keymap.c          |  45 ++---
 keyboards/crkbd/keymaps/hvp/rules.mk          |   9 +-
 keyboards/crkbd/keymaps/jarred/config.h       |   3 -
 keyboards/crkbd/keymaps/jarred/keymap.c       |  47 +----
 keyboards/crkbd/keymaps/jarred/rules.mk       |   8 +-
 keyboards/crkbd/keymaps/kidbrazil/config.h    |   3 -
 keyboards/crkbd/keymaps/kidbrazil/keymap.c    |   4 +-
 keyboards/crkbd/keymaps/kidbrazil/rules.mk    |   3 -
 keyboards/crkbd/keymaps/madhatter/config.h    |   3 -
 keyboards/crkbd/keymaps/madhatter/keymap.c    |  50 ++----
 keyboards/crkbd/keymaps/madhatter/rules.mk    |   8 +-
 keyboards/crkbd/keymaps/ninjonas/keymap.c     |   2 -
 keyboards/crkbd/keymaps/oled_sample/config.h  |   4 -
 keyboards/crkbd/keymaps/rpbaptist/config.h    |   2 -
 keyboards/crkbd/keymaps/rs/config.h           |   2 -
 keyboards/crkbd/keymaps/rs/oled.c             |  33 +---
 keyboards/crkbd/keymaps/rs/rules.mk           |   1 -
 keyboards/crkbd/keymaps/soundmonster/config.h |   4 -
 keyboards/crkbd/keymaps/thumb_ctrl/config.h   |   2 -
 keyboards/crkbd/keymaps/thumb_ctrl/keymap.c   |  50 ++----
 keyboards/crkbd/keymaps/thumb_ctrl/rules.mk   |   8 +-
 .../crkbd/keymaps/thunderbird2086/config.h    |   2 -
 keyboards/crkbd/keymaps/vayashiko/keymap.c    |   4 +-
 keyboards/crkbd/keymaps/vayashiko/rules.mk    |   3 +-
 .../keymaps/vlukash_trackpad_left/config.h    |   3 -
 .../keymaps/vlukash_trackpad_left/keymap.c    |  45 +----
 .../keymaps/vlukash_trackpad_left/rules.mk    |   8 +-
 keyboards/crkbd/keymaps/vxid/config.h         |   3 -
 keyboards/crkbd/keymaps/vxid/rules.mk         |   8 +-
 keyboards/crkbd/lib/i2c.c                     | 162 ------------------
 keyboards/crkbd/lib/i2c.h                     |  46 -----
 keyboards/crkbd/lib/layer_state_reader.c      |   4 +
 keyboards/crkbd/rules.mk                      |   1 +
 users/ninjonas/oled.c                         |   2 +-
 40 files changed, 97 insertions(+), 524 deletions(-)
 delete mode 100644 keyboards/crkbd/lib/i2c.c
 delete mode 100644 keyboards/crkbd/lib/i2c.h

diff --git a/keyboards/crkbd/keymaps/davidrambo/config.h b/keyboards/crkbd/keymaps/davidrambo/config.h
index bf96f265f4..df5e0611e1 100644
--- a/keyboards/crkbd/keymaps/davidrambo/config.h
+++ b/keyboards/crkbd/keymaps/davidrambo/config.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLIGHT_SPLIT
 
-//#define SSD1306OLED
-
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
 
diff --git a/keyboards/crkbd/keymaps/davidrambo/keymap.c b/keyboards/crkbd/keymaps/davidrambo/keymap.c
index 6e97795220..98ab35bf75 100644
--- a/keyboards/crkbd/keymaps/davidrambo/keymap.c
+++ b/keyboards/crkbd/keymaps/davidrambo/keymap.c
@@ -16,9 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-//extern uint8_t is_master;
-
-
 enum custom_layers {
     _COLEMAK,
     _SYMBOL,
diff --git a/keyboards/crkbd/keymaps/devdev/keymap.c b/keyboards/crkbd/keymaps/devdev/keymap.c
index a506295749..c00bee6da6 100644
--- a/keyboards/crkbd/keymaps/devdev/keymap.c
+++ b/keyboards/crkbd/keymaps/devdev/keymap.c
@@ -263,9 +263,6 @@ bool led_update_user(led_t led_state) {
 }
 */
 
-
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
   if (!is_keyboard_master()) {
@@ -319,27 +316,15 @@ void oled_render_layer_state(void) {
         oled_write_ln_P(PSTR("Layer: Layer Switch"),false);
         break;
       default:
+#if defined (LAYER_STATE_32BIT)
         snprintf(string, sizeof(string), "%ld",layer_state);
+#else
+        snprintf(string, sizeof(string), "%d",layer_state);
+#endif
         oled_write_P(PSTR("Layer: Undef-"),false);
         oled_write_ln(string, false);
     }
- }
-
-/*
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (has_usb()) {
-    // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    //matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
-  } else {
-    matrix_write(matrix, read_logo());
-  }
 }
-*/
 
 char keylog_str[24] = {};
 const char code_to_name[60] = {
@@ -393,7 +378,7 @@ void oled_render_logo(void) {
 }
 
 bool oled_task_user(void) {
-    if (is_master) {
+    if (is_keyboard_master()) {
         oled_render_layer_state();
         oled_render_keylog();
     } else {
diff --git a/keyboards/crkbd/keymaps/gotham/config.h b/keyboards/crkbd/keymaps/gotham/config.h
index 45fe8c37a8..2a35f60dad 100644
--- a/keyboards/crkbd/keymaps/gotham/config.h
+++ b/keyboards/crkbd/keymaps/gotham/config.h
@@ -3,9 +3,6 @@
 #define EE_HANDS
 #define SPLIT_USB_DETECT
 
-#undef USE_I2C
-#undef SSD1306OLED
-
 #define USE_SERIAL_PD2
 
 #define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/crkbd/keymaps/gotham/oled.c b/keyboards/crkbd/keymaps/gotham/oled.c
index 6bf1233659..c4ac5e736c 100644
--- a/keyboards/crkbd/keymaps/gotham/oled.c
+++ b/keyboards/crkbd/keymaps/gotham/oled.c
@@ -1,7 +1,5 @@
 #pragma once
 
-extern uint8_t is_master;
-
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
 #    include "rgb.c"
 #endif
diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h
index f32ec8cfbe..106e7535e3 100644
--- a/keyboards/crkbd/keymaps/hvp/config.h
+++ b/keyboards/crkbd/keymaps/hvp/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-#define USE_SSD_I2C
-
-
 #define USE_SERIAL_PD2
 
 //#define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/hvp/keymap.c b/keyboards/crkbd/keymaps/hvp/keymap.c
index 9e72504653..c3d25cd99c 100644
--- a/keyboards/crkbd/keymaps/hvp/keymap.c
+++ b/keyboards/crkbd/keymaps/hvp/keymap.c
@@ -91,14 +91,9 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init();   // turns on the display
-    #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_layer_state(void);
@@ -112,42 +107,26 @@ const char *read_keylogs(void);
 // void set_timelog(void);
 // const char *read_timelog(void);
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
+bool oled_task_user(void) {
   if (is_keyboard_master()) {
     // If you want to change the display of OLED, you need to change here
-    matrix_write(matrix, read_layer_state());
-    matrix_write(matrix, read_keylog());
-    //matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
+    oled_write(read_layer_state(), false);
+    oled_write(read_keylog(), false);
+    //oled_write_ln(read_keylogs(), false);
+    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
+    //oled_write_ln(read_host_led_state()), false;
+    //oled_write_ln(read_timelog(), false);
   } else {
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
+  return false;
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
     set_keylog(keycode, record);
 #endif
     // set_timelog();
diff --git a/keyboards/crkbd/keymaps/hvp/rules.mk b/keyboards/crkbd/keymaps/hvp/rules.mk
index 640a07b305..c7ed029e3d 100644
--- a/keyboards/crkbd/keymaps/hvp/rules.mk
+++ b/keyboards/crkbd/keymaps/hvp/rules.mk
@@ -1,10 +1,5 @@
-
-VPATH += keyboards/crkbd/lib
-LIB_SRC += ssd1306.c i2c.c
-
 # If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
+SRC +=  ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \
@@ -14,4 +9,6 @@ SRC +=  ./lib/glcdfont.c \
 
 TAP_DANCE_ENABLE = yes
 EXTRAKEY_ENABLE = yes        # Audio control and System control
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
 # LOCAL_GLCDFONT = yes
diff --git a/keyboards/crkbd/keymaps/jarred/config.h b/keyboards/crkbd/keymaps/jarred/config.h
index 012356241d..e5c2029a52 100644
--- a/keyboards/crkbd/keymaps/jarred/config.h
+++ b/keyboards/crkbd/keymaps/jarred/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-#define USE_SSD_I2C
-
 #define USE_SERIAL_PD2
 
 //#define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/jarred/keymap.c b/keyboards/crkbd/keymaps/jarred/keymap.c
index 3784eff2b8..b0e181b37f 100644
--- a/keyboards/crkbd/keymaps/jarred/keymap.c
+++ b/keyboards/crkbd/keymaps/jarred/keymap.c
@@ -5,10 +5,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
@@ -65,15 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void matrix_init_user(void) {
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init();   // turns on the display
-    #endif
-}
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_logo(void);
@@ -142,37 +130,18 @@ const char *read_usb_state(void) {
   return matrix_line_str;
 }
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
+bool oled_task_user(void) {
   if (is_keyboard_master()) {
-    matrix_write(matrix, read_layer_state());
-    matrix_write(matrix, "\n");
-    matrix_write(matrix, read_usb_state());
-    matrix_write(matrix, "\n");
-    matrix_write(matrix, read_keylogs());
-    matrix_write(matrix, "\n");
+    oled_write_ln(read_layer_state(), false);
+    oled_write_ln(read_usb_state(), false);
+    oled_write_ln(read_keylogs(), false);
   } else {
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
+  return false;
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
+#endif
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
diff --git a/keyboards/crkbd/keymaps/jarred/rules.mk b/keyboards/crkbd/keymaps/jarred/rules.mk
index c5a73d5bd6..f18100d7ff 100644
--- a/keyboards/crkbd/keymaps/jarred/rules.mk
+++ b/keyboards/crkbd/keymaps/jarred/rules.mk
@@ -16,19 +16,17 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 # If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
+SRC +=  ./lib/rgb_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \
         #./lib/layer_state_reader.c \
         # ./lib/mode_icon_reader.c \
         # ./lib/host_led_state_reader.c \
         # ./lib/timelogger.c \
-
-VPATH += keyboards/crkbd/lib
-LIB_SRC += ssd1306.c i2c.c
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
index e44ae520f4..2801436709 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ b/keyboards/crkbd/keymaps/kidbrazil/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-#define USE_SSD_I2C
-
 #define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/kidbrazil/keymap.c b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
index 219db22433..6a1e2e0cde 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/keymap.c
+++ b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
@@ -182,13 +182,13 @@ bool oled_task_user(void) {
             master_oled_cleared = true;
         }
         render_logo();
-        return;
+        return false;
     }
     // Drashna style timeout for LED and OLED Roughly 8mins
     else if (timer_elapsed32(oled_timer) > 480000) {
         oled_off();
         rgb_matrix_disable_noeeprom();
-        return;
+        return false;
     }
     else {
         oled_on();
diff --git a/keyboards/crkbd/keymaps/kidbrazil/rules.mk b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
index 5566a6130b..d2c2f649e0 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/rules.mk
+++ b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
@@ -11,6 +11,3 @@ OLED_DRIVER = SSD1306
 # If you want to change the display of OLED, you need to change here
 SRC +=  logo_reader.c \
 				layer.c
-
-VPATH += keyboards/crkbd/lib
-LIB_SRC += ssd1306.c i2c.c
diff --git a/keyboards/crkbd/keymaps/madhatter/config.h b/keyboards/crkbd/keymaps/madhatter/config.h
index bcf4e05005..6cbe5befb8 100644
--- a/keyboards/crkbd/keymaps/madhatter/config.h
+++ b/keyboards/crkbd/keymaps/madhatter/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-#define USE_SSD_I2C
-
 #define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/madhatter/keymap.c b/keyboards/crkbd/keymaps/madhatter/keymap.c
index c228a7b573..f833428a02 100644
--- a/keyboards/crkbd/keymaps/madhatter/keymap.c
+++ b/keyboards/crkbd/keymaps/madhatter/keymap.c
@@ -17,10 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#ifdef SSD1306OLED
-#    include "ssd1306.h"
-#    include <string.h>
-#endif
+#include <string.h>
 
 enum corny_layers {
   _QWERTY,
@@ -108,14 +105,9 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_get_mode();
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init();   // turns on the display
-    #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_layer_state(void);
@@ -129,42 +121,26 @@ const char *read_keylogs(void);
 // void set_timelog(void);
 // const char *read_timelog(void);
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
+bool oled_task_user(void) {
   if (is_keyboard_master()) {
     // If you want to change the display of OLED, you need to change here
-    matrix_write(matrix, read_layer_state());
-    matrix_write(matrix, read_keylog());
-    //matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
+    oled_write(read_layer_state(), false);
+    oled_write(read_keylog(), false);
+    //oled_write_ln(read_keylogs(), false);
+    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
+    //oled_write_ln(read_host_led_state(), false);
+    //oled_write_ln(read_timelog(), false);
   } else {
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
+  return false;
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
     set_keylog(keycode, record);
 #endif
     // set_timelog();
diff --git a/keyboards/crkbd/keymaps/madhatter/rules.mk b/keyboards/crkbd/keymaps/madhatter/rules.mk
index 489b16ef1c..89a2791bcd 100644
--- a/keyboards/crkbd/keymaps/madhatter/rules.mk
+++ b/keyboards/crkbd/keymaps/madhatter/rules.mk
@@ -1,13 +1,11 @@
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
 
 # If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
+SRC +=  ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \
         # ./lib/mode_icon_reader.c \
         # ./lib/host_led_state_reader.c \
         # ./lib/timelogger.c \
-
-VPATH += keyboards/crkbd/lib
-LIB_SRC += ssd1306.c i2c.c
diff --git a/keyboards/crkbd/keymaps/ninjonas/keymap.c b/keyboards/crkbd/keymaps/ninjonas/keymap.c
index bea80d2fd6..e29fda6deb 100644
--- a/keyboards/crkbd/keymaps/ninjonas/keymap.c
+++ b/keyboards/crkbd/keymaps/ninjonas/keymap.c
@@ -1,8 +1,6 @@
 #include QMK_KEYBOARD_H
 #include "ninjonas.h"
 
-uint8_t is_master;
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_wrapper(
   //,----------------------------------------------------.      ,----------------------------------------------------.
diff --git a/keyboards/crkbd/keymaps/oled_sample/config.h b/keyboards/crkbd/keymaps/oled_sample/config.h
index 41568c5916..450653e46c 100644
--- a/keyboards/crkbd/keymaps/oled_sample/config.h
+++ b/keyboards/crkbd/keymaps/oled_sample/config.h
@@ -21,10 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 //#define USE_MATRIX_I2C
-#ifdef KEYBOARD_crkbd_rev1_common
-#    undef USE_I2C
-#    define USE_SERIAL
-#endif
 
 /* Select hand configuration */
 
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 3300684d63..994aef314e 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -26,11 +26,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #ifdef OLED_ENABLE
-#    undef SSD1306OLED
 #    define OLED_TIMEOUT 600000
 #endif
 
-#undef USE_I2C
 #define USE_SERIAL_PD2
 
 // #define FORCE_NKRO
diff --git a/keyboards/crkbd/keymaps/rs/config.h b/keyboards/crkbd/keymaps/rs/config.h
index a2d5092dee..60f33e7585 100644
--- a/keyboards/crkbd/keymaps/rs/config.h
+++ b/keyboards/crkbd/keymaps/rs/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// #define SSD1306OLED
-
 #define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/rs/oled.c b/keyboards/crkbd/keymaps/rs/oled.c
index bd8ae7d299..a4c71daac2 100644
--- a/keyboards/crkbd/keymaps/rs/oled.c
+++ b/keyboards/crkbd/keymaps/rs/oled.c
@@ -1,13 +1,10 @@
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 #include QMK_KEYBOARD_H
-#include "ssd1306.h"
 #ifdef PROTOCOL_LUFA
 #include "lufa.h"
 #include "split_util.h"
 #endif
 
-extern uint8_t is_master;
-
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_logo(void);
 const char *read_keylog(void);
@@ -47,7 +44,6 @@ void update_keymap_status(void) {
 #endif
 
 void matrix_init_user(void) {
-  iota_gfx_init(!has_usb()); // turns on the display
   update_keymap_status();
 }
 
@@ -74,31 +70,18 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 }
 
 static inline void render_keymap_status(struct CharacterMatrix *matrix) {
-  matrix_write(matrix, layer_status_buf);
+  oled_write(layer_status_buf);
 }
 
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
+bool oled_task_user(void) {
+  if (is_keyboard_master()) {
     render_keymap_status(matrix);
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
+    oled_write_ln(read_keylog(), false);
+    oled_write_ln(read_keylogs(), false);
   } else {
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
-}
-
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
+  return false;
 }
 
 #endif
diff --git a/keyboards/crkbd/keymaps/rs/rules.mk b/keyboards/crkbd/keymaps/rs/rules.mk
index c754ebdcbc..5a76c38f38 100644
--- a/keyboards/crkbd/keymaps/rs/rules.mk
+++ b/keyboards/crkbd/keymaps/rs/rules.mk
@@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 # If you want to change the display of OLED, you need to change here
 SRC +=  oled.c \
-        ./lib/glcdfont.c \
         ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index 3a31f8613f..2d2b394369 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// #define SSD1306OLED
-#undef USE_I2C
-#undef SSD1306OLED
-
 #define USE_SERIAL_PD2
 
 // #define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/config.h b/keyboards/crkbd/keymaps/thumb_ctrl/config.h
index 4aee2aed14..10b89aede5 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/config.h
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// #define SSD1306OLED
-
 #define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
index cbd7a46890..a4b4f67fb4 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
@@ -4,9 +4,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 extern keymap_config_t keymap_config;
 
@@ -129,14 +126,9 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_layer_state(void);
@@ -150,42 +142,26 @@ const char *read_keylogs(void);
 // void set_timelog(void);
 // const char *read_timelog(void);
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
+bool oled_task_user(void) {
+  if (is_keyboard_master()) {
     // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
+    oled_write_ln(read_layer_state(), false);
+    oled_write_ln(read_keylog(), false);
+    oled_write_ln(read_keylogs(), false);
+    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
+    //oled_write_ln(read_host_led_state(), false);
+    //oled_write_ln(read_timelog(), false);
   } else {
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
+  return false;
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
     set_keylog(keycode, record);
 #endif
     // set_timelog();
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk b/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
index e1d691834d..193aa14dac 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
@@ -16,19 +16,17 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 # If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
+SRC +=  ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \
         # ./lib/mode_icon_reader.c \
         # ./lib/host_led_state_reader.c \
         # ./lib/timelogger.c \
-
-VPATH += keyboards/crkbd/lib
-LIB_SRC += ssd1306.c i2c.c
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/config.h b/keyboards/crkbd/keymaps/thunderbird2086/config.h
index 735caadaee..36afd9b469 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/config.h
+++ b/keyboards/crkbd/keymaps/thunderbird2086/config.h
@@ -7,8 +7,6 @@
 #define SPLIT_USB_DETECT
 
 // #define RGB_LAYER_ENABLE
-#undef USE_I2C
-#undef SSD1306OLED
 
 #define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c
index f3cf5cb2f6..77229a3603 100644
--- a/keyboards/crkbd/keymaps/vayashiko/keymap.c
+++ b/keyboards/crkbd/keymaps/vayashiko/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_master) {
+  if (!is_keyboard_master()) {
     return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
   }
   return rotation;
@@ -165,7 +165,7 @@ void oled_render_logo(void) {
 }
 
 bool oled_task_user(void) {
-    if (is_master) {
+    if (is_keyboard_master()) {
         oled_render_layer_state();
         oled_render_keylog();
     } else {
diff --git a/keyboards/crkbd/keymaps/vayashiko/rules.mk b/keyboards/crkbd/keymaps/vayashiko/rules.mk
index b8ba838422..c29927421d 100644
--- a/keyboards/crkbd/keymaps/vayashiko/rules.mk
+++ b/keyboards/crkbd/keymaps/vayashiko/rules.mk
@@ -21,8 +21,7 @@ SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 # If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
+SRC +=  ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
index d1c3855402..94494bafd8 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
@@ -5,9 +5,6 @@
 #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-#define USE_SSD_I2C
-
 #define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
index 7940e28025..eb30873f5b 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
@@ -4,9 +4,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
@@ -122,14 +119,9 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init();   // turns on the display
-    #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
 
 // When add source files to SRC in rules.mk, you can use functions.
 const char *read_layer_state(void);
@@ -138,42 +130,23 @@ void set_keylog(uint16_t keycode, keyrecord_t *record);
 const char *read_keylog(void);
 const char *read_keylogs(void);
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
+bool oled_task_user(void) {
   if (is_keyboard_master()) {
     // If you want to change the display of OLED, you need to change here
-    matrix_write(matrix, read_layer_state());
-    matrix_write(matrix, "\n");
-    matrix_write(matrix, read_keylog());
-    matrix_write(matrix, "\n");
-    matrix_write(matrix, read_keylogs());
-    matrix_write(matrix, "\n");
+    oled_write_ln(read_layer_state(), false);
+    oled_write_ln(read_keylog(), false);
+    oled_write_ln(read_keylogs(), false);
   } else {
-    matrix_write(matrix, read_logo());
+    oled_write(read_logo(), false);
   }
+  return false;
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
-#ifdef SSD1306OLED
+#ifdef OLED_ENABLE
     set_keylog(keycode, record);
 #endif
   }
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk b/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
index 44ff63ada1..ed4d34a70b 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
@@ -1,14 +1,12 @@
 # Build Options
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
 
 BOOTLOADER = atmel-dfu
 
 # If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
+SRC +=  ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \
-
-VPATH += keyboards/crkbd/lib
-LIB_SRC += ssd1306.c i2c.c
diff --git a/keyboards/crkbd/keymaps/vxid/config.h b/keyboards/crkbd/keymaps/vxid/config.h
index d9c0cbccf4..7a4596f3b2 100644
--- a/keyboards/crkbd/keymaps/vxid/config.h
+++ b/keyboards/crkbd/keymaps/vxid/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-#define USE_SSD_I2C
-
 #define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/crkbd/keymaps/vxid/rules.mk b/keyboards/crkbd/keymaps/vxid/rules.mk
index cb104fb344..432e219476 100644
--- a/keyboards/crkbd/keymaps/vxid/rules.mk
+++ b/keyboards/crkbd/keymaps/vxid/rules.mk
@@ -16,19 +16,17 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 # If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
+SRC +=  ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \
         # ./lib/mode_icon_reader.c \
         # ./lib/host_led_state_reader.c \
         # ./lib/timelogger.c \
-
-VPATH += keyboards/crkbd/lib
-LIB_SRC += ssd1306.c i2c.c
diff --git a/keyboards/crkbd/lib/i2c.c b/keyboards/crkbd/lib/i2c.c
deleted file mode 100644
index 7b82e838c2..0000000000
--- a/keyboards/crkbd/lib/i2c.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <util/twi.h>
-#include <avr/io.h>
-#include <stdlib.h>
-#include <avr/interrupt.h>
-#include <util/twi.h>
-#include <stdbool.h>
-#include "i2c.h"
-
-#if defined(USE_SSD_I2C)
-
-// Limits the amount of we wait for any one i2c transaction.
-// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
-// 9 bits, a single transaction will take around 90μs to complete.
-//
-// (F_CPU/SCL_CLOCK)  =>  # of μC cycles to transfer a bit
-// poll loop takes at least 8 clock cycles to execute
-#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8
-
-#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE)
-
-volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-static volatile uint8_t slave_buffer_pos;
-static volatile bool slave_has_register_set = false;
-
-// Wait for an i2c operation to finish
-inline static
-void i2c_delay(void) {
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-
-  // easier way, but will wait slightly longer
-  // _delay_us(100);
-}
-
-// Setup twi to run at 100kHz or 400kHz (see ./i2c.h SCL_CLOCK)
-void i2c_master_init(void) {
-  // no prescaler
-  TWSR = 0;
-  // Set TWI clock frequency to SCL_CLOCK. Need TWBR>10.
-  // Check datasheets for more info.
-  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;
-}
-
-// Start a transaction with the given i2c slave address. The direction of the
-// transfer is set with I2C_READ and I2C_WRITE.
-// returns: 0 => success
-//          1 => error
-uint8_t i2c_master_start(uint8_t address) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
-
-  i2c_delay();
-
-  // check that we started successfully
-  if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
-    return 1;
-
-  TWDR = address;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) )
-    return 1; // slave did not acknowledge
-  else
-    return 0; // success
-}
-
-
-// Finish the i2c transaction.
-void i2c_master_stop(void) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
-
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-}
-
-// Write one byte to the i2c slave.
-// returns 0 => slave ACK
-//         1 => slave NACK
-uint8_t i2c_master_write(uint8_t data) {
-  TWDR = data;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  // check if the slave acknowledged us
-  return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1;
-}
-
-// Read one byte from the i2c slave. If ack=1 the slave is acknowledged,
-// if ack=0 the acknowledge bit is not set.
-// returns: byte read from i2c device
-uint8_t i2c_master_read(int ack) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA);
-
-  i2c_delay();
-  return TWDR;
-}
-
-void i2c_reset_state(void) {
-  TWCR = 0;
-}
-
-void i2c_slave_init(uint8_t address) {
-  TWAR = address << 0; // slave i2c address
-  // TWEN  - twi enable
-  // TWEA  - enable address acknowledgement
-  // TWINT - twi interrupt flag
-  // TWIE  - enable the twi interrupt
-  TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN);
-}
-
-ISR(TWI_vect);
-
-ISR(TWI_vect) {
-  uint8_t ack = 1;
-  switch(TW_STATUS) {
-    case TW_SR_SLA_ACK:
-      // this device has been addressed as a slave receiver
-      slave_has_register_set = false;
-      break;
-
-    case TW_SR_DATA_ACK:
-      // this device has received data as a slave receiver
-      // The first byte that we receive in this transaction sets the location
-      // of the read/write location of the slaves memory that it exposes over
-      // i2c.  After that, bytes will be written at slave_buffer_pos, incrementing
-      // slave_buffer_pos after each write.
-      if(!slave_has_register_set) {
-        slave_buffer_pos = TWDR;
-        // don't acknowledge the master if this memory loctaion is out of bounds
-        if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) {
-          ack = 0;
-          slave_buffer_pos = 0;
-        }
-        slave_has_register_set = true;
-      } else {
-        i2c_slave_buffer[slave_buffer_pos] = TWDR;
-        BUFFER_POS_INC();
-      }
-      break;
-
-    case TW_ST_SLA_ACK:
-    case TW_ST_DATA_ACK:
-      // master has addressed this device as a slave transmitter and is
-      // requesting data.
-      TWDR = i2c_slave_buffer[slave_buffer_pos];
-      BUFFER_POS_INC();
-      break;
-
-    case TW_BUS_ERROR: // something went wrong, reset twi state
-      TWCR = 0;
-    default:
-      break;
-  }
-  // Reset everything, so we are ready for the next TWI interrupt
-  TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
-}
-#endif
diff --git a/keyboards/crkbd/lib/i2c.h b/keyboards/crkbd/lib/i2c.h
deleted file mode 100644
index 710662c7ab..0000000000
--- a/keyboards/crkbd/lib/i2c.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifndef F_CPU
-#define F_CPU 16000000UL
-#endif
-
-#define I2C_READ 1
-#define I2C_WRITE 0
-
-#define I2C_ACK 1
-#define I2C_NACK 0
-
-#define SLAVE_BUFFER_SIZE 0x10
-
-// i2c SCL clock frequency 400kHz
-#define SCL_CLOCK  400000L
-
-extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-void i2c_master_init(void);
-uint8_t i2c_master_start(uint8_t address);
-void i2c_master_stop(void);
-uint8_t i2c_master_write(uint8_t data);
-uint8_t i2c_master_read(int);
-void i2c_reset_state(void);
-void i2c_slave_init(uint8_t address);
-
-
-static inline unsigned char i2c_start_read(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_READ);
-}
-
-static inline unsigned char i2c_start_write(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_WRITE);
-}
-
-// from SSD1306 scrips
-extern unsigned char i2c_rep_start(unsigned char addr);
-extern void i2c_start_wait(unsigned char addr);
-extern unsigned char i2c_readAck(void);
-extern unsigned char i2c_readNak(void);
-extern unsigned char i2c_read(unsigned char ack);
-
-#define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak();
diff --git a/keyboards/crkbd/lib/layer_state_reader.c b/keyboards/crkbd/lib/layer_state_reader.c
index 63d80b136c..601fd71958 100644
--- a/keyboards/crkbd/lib/layer_state_reader.c
+++ b/keyboards/crkbd/lib/layer_state_reader.c
@@ -29,7 +29,11 @@ const char *read_layer_state(void) {
     snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust");
     break;
   default:
+#if defined (LAYER_STATE_32BIT)
     snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
+#else
+    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%d", layer_state);
+#endif
   }
 
   return layer_state_str;
diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
index 4f373d53da..2e91f24848 100644
--- a/keyboards/crkbd/rules.mk
+++ b/keyboards/crkbd/rules.mk
@@ -18,6 +18,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
 RGB_MATRIX_DRIVER = WS2812
+LTO_ENABLE = yes
 
 # if firmware size over limit, try this option
 # LTO_ENABLE = yes
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
index 463c6dfebb..73cd50fb8c 100644
--- a/users/ninjonas/oled.c
+++ b/users/ninjonas/oled.c
@@ -93,7 +93,7 @@ static void render_logo(void) {
 bool oled_task_user(void) {
     if (timer_elapsed32(oled_timer) > 15000) {
         oled_off();
-        return;
+        return false;
     }
     #ifndef SPLIT_KEYBOARD
     else { oled_on(); }

From 98d5c77521961fa19d0ff81e941e78997d96dfb0 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 31 Jul 2022 22:15:01 +0100
Subject: [PATCH 151/959] Remove legacy AVR ssd1306 driver (#17864)

---
 keyboards/dc01/left/i2c.c                     | 159 -------
 keyboards/dc01/left/i2c.h                     |  28 --
 .../lets_split/keymaps/OLED_sample/config.h   |  58 ---
 .../lets_split/keymaps/OLED_sample/keymap.c   | 415 ------------------
 .../lets_split/keymaps/OLED_sample/readme.md  |  25 --
 .../lets_split/keymaps/OLED_sample/rules.mk   |  22 -
 platforms/avr/drivers/ssd1306.c               | 329 --------------
 platforms/avr/drivers/ssd1306.h               |  87 ----
 8 files changed, 1123 deletions(-)
 delete mode 100644 keyboards/dc01/left/i2c.c
 delete mode 100644 keyboards/dc01/left/i2c.h
 delete mode 100644 keyboards/lets_split/keymaps/OLED_sample/config.h
 delete mode 100644 keyboards/lets_split/keymaps/OLED_sample/keymap.c
 delete mode 100644 keyboards/lets_split/keymaps/OLED_sample/readme.md
 delete mode 100644 keyboards/lets_split/keymaps/OLED_sample/rules.mk
 delete mode 100644 platforms/avr/drivers/ssd1306.c
 delete mode 100644 platforms/avr/drivers/ssd1306.h

diff --git a/keyboards/dc01/left/i2c.c b/keyboards/dc01/left/i2c.c
deleted file mode 100644
index c72789403e..0000000000
--- a/keyboards/dc01/left/i2c.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include <util/twi.h>
-#include <avr/io.h>
-#include <stdlib.h>
-#include <avr/interrupt.h>
-#include <util/twi.h>
-#include <stdbool.h>
-#include "i2c.h"
-
-// Limits the amount of we wait for any one i2c transaction.
-// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
-// 9 bits, a single transaction will take around 90μs to complete.
-//
-// (F_CPU/SCL_CLOCK)  =>  # of μC cycles to transfer a bit
-// poll loop takes at least 8 clock cycles to execute
-#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8
-
-#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE)
-
-volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-static volatile uint8_t slave_buffer_pos;
-static volatile bool slave_has_register_set = false;
-
-// Wait for an i2c operation to finish
-inline static
-void i2c_delay(void) {
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-
-  // easier way, but will wait slightly longer
-  // _delay_us(100);
-}
-
-// Setup twi to run at 100kHz
-void i2c_master_init(void) {
-  // no prescaler
-  TWSR = 0;
-  // Set TWI clock frequency to SCL_CLOCK. Need TWBR>10.
-  // Check datasheets for more info.
-  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;
-}
-
-// Start a transaction with the given i2c slave address. The direction of the
-// transfer is set with I2C_READ and I2C_WRITE.
-// returns: 0 => success
-//          1 => error
-uint8_t i2c_master_start(uint8_t address) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
-
-  i2c_delay();
-
-  // check that we started successfully
-  if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
-    return 1;
-
-  TWDR = address;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) )
-    return 1; // slave did not acknowledge
-  else
-    return 0; // success
-}
-
-
-// Finish the i2c transaction.
-void i2c_master_stop(void) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
-
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-}
-
-// Write one byte to the i2c slave.
-// returns 0 => slave ACK
-//         1 => slave NACK
-uint8_t i2c_master_write(uint8_t data) {
-  TWDR = data;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  // check if the slave acknowledged us
-  return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1;
-}
-
-// Read one byte from the i2c slave. If ack=1 the slave is acknowledged,
-// if ack=0 the acknowledge bit is not set.
-// returns: byte read from i2c device
-uint8_t i2c_master_read(int ack) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA);
-
-  i2c_delay();
-  return TWDR;
-}
-
-void i2c_reset_state(void) {
-  TWCR = 0;
-}
-
-void i2c_slave_init(uint8_t address) {
-  TWAR = address << 0; // slave i2c address
-  // TWEN  - twi enable
-  // TWEA  - enable address acknowledgement
-  // TWINT - twi interrupt flag
-  // TWIE  - enable the twi interrupt
-  TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN);
-}
-
-ISR(TWI_vect);
-
-ISR(TWI_vect) {
-  uint8_t ack = 1;
-  switch(TW_STATUS) {
-    case TW_SR_SLA_ACK:
-      // this device has been addressed as a slave receiver
-      slave_has_register_set = false;
-      break;
-
-    case TW_SR_DATA_ACK:
-      // this device has received data as a slave receiver
-      // The first byte that we receive in this transaction sets the location
-      // of the read/write location of the slaves memory that it exposes over
-      // i2c.  After that, bytes will be written at slave_buffer_pos, incrementing
-      // slave_buffer_pos after each write.
-      if(!slave_has_register_set) {
-        slave_buffer_pos = TWDR;
-        // don't acknowledge the master if this memory loctaion is out of bounds
-        if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) {
-          ack = 0;
-          slave_buffer_pos = 0;
-        }
-        slave_has_register_set = true;
-      } else {
-        i2c_slave_buffer[slave_buffer_pos] = TWDR;
-        BUFFER_POS_INC();
-      }
-      break;
-
-    case TW_ST_SLA_ACK:
-    case TW_ST_DATA_ACK:
-      // master has addressed this device as a slave transmitter and is
-      // requesting data.
-      TWDR = i2c_slave_buffer[slave_buffer_pos];
-      BUFFER_POS_INC();
-      break;
-
-    case TW_BUS_ERROR: // something went wrong, reset twi state
-      TWCR = 0;
-    default:
-      break;
-  }
-  // Reset everything, so we are ready for the next TWI interrupt
-  TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
-}
diff --git a/keyboards/dc01/left/i2c.h b/keyboards/dc01/left/i2c.h
deleted file mode 100644
index 0d93e4ecaa..0000000000
--- a/keyboards/dc01/left/i2c.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifndef F_CPU
-#define F_CPU 16000000UL
-#endif
-
-#define I2C_READ 1
-#define I2C_WRITE 0
-
-#define I2C_ACK 1
-#define I2C_NACK 0
-
-#define SLAVE_BUFFER_SIZE 0x10
-
-// i2c SCL clock frequency
-#define SCL_CLOCK  400000L
-
-extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-void i2c_master_init(void);
-uint8_t i2c_master_start(uint8_t address);
-void i2c_master_stop(void);
-uint8_t i2c_master_write(uint8_t data);
-uint8_t i2c_master_read(int);
-void i2c_reset_state(void);
-void i2c_slave_init(uint8_t address);
diff --git a/keyboards/lets_split/keymaps/OLED_sample/config.h b/keyboards/lets_split/keymaps/OLED_sample/config.h
deleted file mode 100644
index 6aa909d284..0000000000
--- a/keyboards/lets_split/keymaps/OLED_sample/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_I2C
-//#define USE_SERIAL
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define FLIP_HALF
-
-#define SSD1306OLED
-//#define OLED_ROTATE180
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "../../rev2/config.h"
-#endif
-
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#endif
diff --git a/keyboards/lets_split/keymaps/OLED_sample/keymap.c b/keyboards/lets_split/keymaps/OLED_sample/keymap.c
deleted file mode 100644
index a34d5a32be..0000000000
--- a/keyboards/lets_split/keymaps/OLED_sample/keymap.c
+++ /dev/null
@@ -1,415 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <LUFA/Drivers/Peripheral/TWI.h>
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  RGBLED_TOGGLE,
-  RGBLED_STEP_MODE,
-  RGBLED_INCREASE_HUE,
-  RGBLED_DECREASE_HUE,
-  RGBLED_INCREASE_SAT,
-  RGBLED_DECREASE_SAT,
-  RGBLED_INCREASE_VAL,
-  RGBLED_DECREASE_VAL,
-  M_SAMPLE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT( \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT( \
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT( \
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT( \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT( \
-  _______, RESET,   _______, M_SAMPLE, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-)
-
-
-};
-
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-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);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-float tone_goodbye[][2]    = SONG(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);
-}
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    rgblight_mode(RGB_current_mode);
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-          //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;
-          rgblight_mode(16);
-        }
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        rgblight_mode(RGB_current_mode);   // revert RGB to initial mode prior to RGB mode change
-        TOG_STATUS = false;
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        //not sure how to have keyboard check mode and set it to a variable, so my work around
-        //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          rgblight_mode(15);
-        }
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        rgblight_mode(RGB_current_mode);  // revert RGB to initial mode prior to RGB mode change
-        layer_off(_RAISE);
-        TOG_STATUS = false;
-        update_tri_layer_RGB(_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;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGB_MOD:
-      if (record->event.pressed) {
-        rgblight_mode(RGB_current_mode);
-        rgblight_step();
-        RGB_current_mode = rgblight_config.mode;
-      }
-      return false;
-      break;
-    case M_SAMPLE:
-      if (record->event.pressed){
-        SEND_STRING("hello world");
-      }
-      return false;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-    RGB_current_mode = rgblight_config.mode;
-}
-
-//SSD1306 OLED init and update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-void matrix_master_OLED_init (void) {
-    TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
-    iota_gfx_init();   // turns on the display
-}
-
-void matrix_scan_user(void) {
-     iota_gfx_task();  // this is what updates the display continuously
-}
-#endif
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_LOWER 8
-#define L_RAISE 16
-#define L_FNLAYER 64
-#define L_NUMLAY 128
-#define L_NLOWER 136
-#define L_NFNLAYER 192
-#define L_MOUSECURSOR 256
-#define L_ADJUST 65560
-
-void iota_gfx_task_user(void) {
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  struct CharacterMatrix matrix;
-
-  matrix_clear(&matrix);
-  matrix_write_P(&matrix, PSTR("USB: "));
-#ifdef PROTOCOL_LUFA
-  switch (USB_DeviceState) {
-    case DEVICE_STATE_Unattached:
-      matrix_write_P(&matrix, PSTR("Unattached"));
-      break;
-    case DEVICE_STATE_Suspended:
-      matrix_write_P(&matrix, PSTR("Suspended"));
-      break;
-    case DEVICE_STATE_Configured:
-      matrix_write_P(&matrix, PSTR("Connected"));
-      break;
-    case DEVICE_STATE_Powered:
-      matrix_write_P(&matrix, PSTR("Powered"));
-      break;
-    case DEVICE_STATE_Default:
-      matrix_write_P(&matrix, PSTR("Default"));
-      break;
-    case DEVICE_STATE_Addressed:
-      matrix_write_P(&matrix, PSTR("Addressed"));
-      break;
-    default:
-      matrix_write_P(&matrix, PSTR("Invalid"));
-  }
-#endif
-
-// Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-
-  char buf[40];
-  snprintf(buf,sizeof(buf), "Undef-%ld", layer_state);
-  matrix_write_P(&matrix, PSTR("\n\nLayer: "));
-    switch (layer_state) {
-        case L_BASE:
-           matrix_write_P(&matrix, PSTR("Default"));
-           break;
-        case L_RAISE:
-           matrix_write_P(&matrix, PSTR("Raise"));
-           break;
-        case L_LOWER:
-           matrix_write_P(&matrix, PSTR("Lower"));
-           break;
-        case L_ADJUST:
-           matrix_write_P(&matrix, PSTR("ADJUST"));
-           break;
-        default:
-           matrix_write(&matrix, buf);
- }
-
-  // Host Keyboard LED Status
-  char led[40];
-    snprintf(led, sizeof(led), "\n%s  %s  %s",
-            (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
-            (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
-            (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
-  matrix_write(&matrix, led);
-  matrix_update(&display, &matrix);
-}
diff --git a/keyboards/lets_split/keymaps/OLED_sample/readme.md b/keyboards/lets_split/keymaps/OLED_sample/readme.md
deleted file mode 100644
index 02888855b8..0000000000
--- a/keyboards/lets_split/keymaps/OLED_sample/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-SSD1306 OLED Display via I2C
-======
-
-Features
---------
-
-Some features supported by the firmware:
-
-
-* I2C connection between the two halves is required as the OLED display will use this connection as well. Note this
-  requires pull-up resistors on the data and clock lines.
-* OLED display will connect from either side
-
-
-Wiring
-------
-
-
-Work in progress...
-
-
-OLED Configuration
--------------------------------
-
-Work in progress...
diff --git a/keyboards/lets_split/keymaps/OLED_sample/rules.mk b/keyboards/lets_split/keymaps/OLED_sample/rules.mk
deleted file mode 100644
index e1716e0c02..0000000000
--- a/keyboards/lets_split/keymaps/OLED_sample/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-SRC += ssd1306.c
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/platforms/avr/drivers/ssd1306.c b/platforms/avr/drivers/ssd1306.c
deleted file mode 100644
index 7afbc09f00..0000000000
--- a/platforms/avr/drivers/ssd1306.c
+++ /dev/null
@@ -1,329 +0,0 @@
-#ifdef SSD1306OLED
-
-#    include "ssd1306.h"
-#    include "i2c.h"
-#    include <string.h>
-#    include "print.h"
-#    include "glcdfont.c"
-#    ifdef PROTOCOL_LUFA
-#        include "lufa.h"
-#    endif
-#    include "sendchar.h"
-#    include "timer.h"
-
-struct CharacterMatrix display;
-
-// Set this to 1 to help diagnose early startup problems
-// when testing power-on with ble.  Turn it off otherwise,
-// as the latency of printing most of the debug info messes
-// with the matrix scan, causing keys to drop.
-#    define DEBUG_TO_SCREEN 0
-
-// static uint16_t last_battery_update;
-// static uint32_t vbat;
-//#define BatteryUpdateInterval 10000 /* milliseconds */
-#    define ScreenOffInterval 300000 /* milliseconds */
-#    if DEBUG_TO_SCREEN
-static uint8_t displaying;
-#    endif
-static uint16_t last_flush;
-
-// Write command sequence.
-// Returns true on success.
-static inline bool _send_cmd1(uint8_t cmd) {
-    bool res = false;
-
-    if (i2c_start_write(SSD1306_ADDRESS)) {
-        xprintf("failed to start write to %d\n", SSD1306_ADDRESS);
-        goto done;
-    }
-
-    if (i2c_master_write(0x0 /* command byte follows */)) {
-        print("failed to write control byte\n");
-
-        goto done;
-    }
-
-    if (i2c_master_write(cmd)) {
-        xprintf("failed to write command %d\n", cmd);
-        goto done;
-    }
-    res = true;
-done:
-    i2c_master_stop();
-    return res;
-}
-
-// Write 2-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd2(uint8_t cmd, uint8_t opr) {
-    if (!_send_cmd1(cmd)) {
-        return false;
-    }
-    return _send_cmd1(opr);
-}
-
-// Write 3-byte command sequence.
-// Returns true on success
-static inline bool _send_cmd3(uint8_t cmd, uint8_t opr1, uint8_t opr2) {
-    if (!_send_cmd1(cmd)) {
-        return false;
-    }
-    if (!_send_cmd1(opr1)) {
-        return false;
-    }
-    return _send_cmd1(opr2);
-}
-
-#    define send_cmd1(c)      \
-        if (!_send_cmd1(c)) { \
-            goto done;        \
-        }
-#    define send_cmd2(c, o)      \
-        if (!_send_cmd2(c, o)) { \
-            goto done;           \
-        }
-#    define send_cmd3(c, o1, o2)      \
-        if (!_send_cmd3(c, o1, o2)) { \
-            goto done;                \
-        }
-
-static void clear_display(void) {
-    matrix_clear(&display);
-
-    // Clear all of the display bits (there can be random noise
-    // in the RAM on startup)
-    send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1);
-    send_cmd3(ColumnAddr, 0, DisplayWidth - 1);
-
-    if (i2c_start_write(SSD1306_ADDRESS)) {
-        goto done;
-    }
-    if (i2c_master_write(0x40)) {
-        // Data mode
-        goto done;
-    }
-    for (uint8_t row = 0; row < MatrixRows; ++row) {
-        for (uint8_t col = 0; col < DisplayWidth; ++col) {
-            i2c_master_write(0);
-        }
-    }
-
-    display.dirty = false;
-
-done:
-    i2c_master_stop();
-}
-
-#    if DEBUG_TO_SCREEN
-#        undef sendchar
-static int8_t capture_sendchar(uint8_t c) {
-    sendchar(c);
-    iota_gfx_write_char(c);
-
-    if (!displaying) {
-        iota_gfx_flush();
-    }
-    return 0;
-}
-#    endif
-
-bool iota_gfx_init(void) {
-    bool success = false;
-
-    send_cmd1(DisplayOff);
-    send_cmd2(SetDisplayClockDiv, 0x80);
-    send_cmd2(SetMultiPlex, DisplayHeight - 1);
-
-    send_cmd2(SetDisplayOffset, 0);
-
-    send_cmd1(SetStartLine | 0x0);
-    send_cmd2(SetChargePump, 0x14 /* Enable */);
-    send_cmd2(SetMemoryMode, 0 /* horizontal addressing */);
-
-#    ifdef OLED_ROTATE180
-    // the following Flip the display orientation 180 degrees
-    send_cmd1(SegRemap);
-    send_cmd1(ComScanInc);
-#    endif
-#    ifndef OLED_ROTATE180
-    // Flips the display orientation 0 degrees
-    send_cmd1(SegRemap | 0x1);
-    send_cmd1(ComScanDec);
-#    endif
-
-    send_cmd2(SetComPins, 0x2);
-    send_cmd2(SetContrast, 0x8f);
-    send_cmd2(SetPreCharge, 0xf1);
-    send_cmd2(SetVComDetect, 0x40);
-    send_cmd1(DisplayAllOnResume);
-    send_cmd1(NormalDisplay);
-    send_cmd1(DeActivateScroll);
-    send_cmd1(DisplayOn);
-
-    send_cmd2(SetContrast, 0); // Dim
-
-    clear_display();
-
-    success = true;
-
-    iota_gfx_flush();
-
-#    if DEBUG_TO_SCREEN
-    print_set_sendchar(capture_sendchar);
-#    endif
-
-done:
-    return success;
-}
-
-bool iota_gfx_off(void) {
-    bool success = false;
-
-    send_cmd1(DisplayOff);
-    success = true;
-
-done:
-    return success;
-}
-
-bool iota_gfx_on(void) {
-    bool success = false;
-
-    send_cmd1(DisplayOn);
-    success = true;
-
-done:
-    return success;
-}
-
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c) {
-    *matrix->cursor = c;
-    ++matrix->cursor;
-
-    if (matrix->cursor - &matrix->display[0][0] == sizeof(matrix->display)) {
-        // We went off the end; scroll the display upwards by one line
-        memmove(&matrix->display[0], &matrix->display[1], MatrixCols * (MatrixRows - 1));
-        matrix->cursor = &matrix->display[MatrixRows - 1][0];
-        memset(matrix->cursor, ' ', MatrixCols);
-    }
-}
-
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
-    matrix->dirty = true;
-
-    if (c == '\n') {
-        // Clear to end of line from the cursor and then move to the
-        // start of the next line
-        uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols;
-
-        while (cursor_col++ < MatrixCols) {
-            matrix_write_char_inner(matrix, ' ');
-        }
-        return;
-    }
-
-    matrix_write_char_inner(matrix, c);
-}
-
-void iota_gfx_write_char(uint8_t c) {
-    matrix_write_char(&display, c);
-}
-
-void matrix_write(struct CharacterMatrix *matrix, const char *data) {
-    const char *end = data + strlen(data);
-    while (data < end) {
-        matrix_write_char(matrix, *data);
-        ++data;
-    }
-}
-
-void iota_gfx_write(const char *data) {
-    matrix_write(&display, data);
-}
-
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
-    while (true) {
-        uint8_t c = pgm_read_byte(data);
-        if (c == 0) {
-            return;
-        }
-        matrix_write_char(matrix, c);
-        ++data;
-    }
-}
-
-void iota_gfx_write_P(const char *data) {
-    matrix_write_P(&display, data);
-}
-
-void matrix_clear(struct CharacterMatrix *matrix) {
-    memset(matrix->display, ' ', sizeof(matrix->display));
-    matrix->cursor = &matrix->display[0][0];
-    matrix->dirty  = true;
-}
-
-void iota_gfx_clear_screen(void) {
-    matrix_clear(&display);
-}
-
-void matrix_render(struct CharacterMatrix *matrix) {
-    last_flush = timer_read();
-    iota_gfx_on();
-#    if DEBUG_TO_SCREEN
-    ++displaying;
-#    endif
-
-    // Move to the home position
-    send_cmd3(PageAddr, 0, MatrixRows - 1);
-    send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1);
-
-    if (i2c_start_write(SSD1306_ADDRESS)) {
-        goto done;
-    }
-    if (i2c_master_write(0x40)) {
-        // Data mode
-        goto done;
-    }
-
-    for (uint8_t row = 0; row < MatrixRows; ++row) {
-        for (uint8_t col = 0; col < MatrixCols; ++col) {
-            const uint8_t *glyph = font + (matrix->display[row][col] * (FontWidth - 1));
-
-            for (uint8_t glyphCol = 0; glyphCol < FontWidth - 1; ++glyphCol) {
-                uint8_t colBits = pgm_read_byte(glyph + glyphCol);
-                i2c_master_write(colBits);
-            }
-
-            // 1 column of space between chars (it's not included in the glyph)
-            i2c_master_write(0);
-        }
-    }
-
-    matrix->dirty = false;
-
-done:
-    i2c_master_stop();
-#    if DEBUG_TO_SCREEN
-    --displaying;
-#    endif
-}
-
-void iota_gfx_flush(void) {
-    matrix_render(&display);
-}
-
-__attribute__((weak)) void iota_gfx_task_user(void) {}
-
-void iota_gfx_task(void) {
-    iota_gfx_task_user();
-
-    if (display.dirty) {
-        iota_gfx_flush();
-    }
-
-    if (timer_elapsed(last_flush) > ScreenOffInterval) {
-        iota_gfx_off();
-    }
-}
-#endif
diff --git a/platforms/avr/drivers/ssd1306.h b/platforms/avr/drivers/ssd1306.h
deleted file mode 100644
index 6eecdcfaa4..0000000000
--- a/platforms/avr/drivers/ssd1306.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <stdio.h>
-#include "config.h"
-
-enum ssd1306_cmds {
-    DisplayOff = 0xAE,
-    DisplayOn  = 0xAF,
-
-    SetContrast        = 0x81,
-    DisplayAllOnResume = 0xA4,
-
-    DisplayAllOn       = 0xA5,
-    NormalDisplay      = 0xA6,
-    InvertDisplay      = 0xA7,
-    SetDisplayOffset   = 0xD3,
-    SetComPins         = 0xda,
-    SetVComDetect      = 0xdb,
-    SetDisplayClockDiv = 0xD5,
-    SetPreCharge       = 0xd9,
-    SetMultiPlex       = 0xa8,
-    SetLowColumn       = 0x00,
-    SetHighColumn      = 0x10,
-    SetStartLine       = 0x40,
-
-    SetMemoryMode = 0x20,
-    ColumnAddr    = 0x21,
-    PageAddr      = 0x22,
-
-    ComScanInc    = 0xc0,
-    ComScanDec    = 0xc8,
-    SegRemap      = 0xa0,
-    SetChargePump = 0x8d,
-    ExternalVcc   = 0x01,
-    SwitchCapVcc  = 0x02,
-
-    ActivateScroll                   = 0x2f,
-    DeActivateScroll                 = 0x2e,
-    SetVerticalScrollArea            = 0xa3,
-    RightHorizontalScroll            = 0x26,
-    LeftHorizontalScroll             = 0x27,
-    VerticalAndRightHorizontalScroll = 0x29,
-    VerticalAndLeftHorizontalScroll  = 0x2a,
-};
-
-// Controls the SSD1306 128x32 OLED display via i2c
-
-#ifndef SSD1306_ADDRESS
-#    define SSD1306_ADDRESS 0x3C
-#endif
-
-#define DisplayHeight 32
-#define DisplayWidth 128
-
-#define FontHeight 8
-#define FontWidth 6
-
-#define MatrixRows (DisplayHeight / FontHeight)
-#define MatrixCols (DisplayWidth / FontWidth)
-
-struct CharacterMatrix {
-    uint8_t  display[MatrixRows][MatrixCols];
-    uint8_t *cursor;
-    bool     dirty;
-};
-
-extern struct CharacterMatrix display;
-
-bool iota_gfx_init(void);
-void iota_gfx_task(void);
-bool iota_gfx_off(void);
-bool iota_gfx_on(void);
-void iota_gfx_flush(void);
-void iota_gfx_write_char(uint8_t c);
-void iota_gfx_write(const char *data);
-void iota_gfx_write_P(const char *data);
-void iota_gfx_clear_screen(void);
-
-void iota_gfx_task_user(void);
-
-void matrix_clear(struct CharacterMatrix *matrix);
-void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c);
-void matrix_write(struct CharacterMatrix *matrix, const char *data);
-void matrix_write_P(struct CharacterMatrix *matrix, const char *data);
-void matrix_render(struct CharacterMatrix *matrix);

From 09ea5f6337452fa5f15b225da2873377f46b1bbc Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 31 Jul 2022 20:05:15 -0600
Subject: [PATCH 152/959] [Keyboard] Fix uzu42 compilation issue (#17867)

---
 keyboards/uzu42/keymaps/default/keymap.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/keyboards/uzu42/keymaps/default/keymap.c b/keyboards/uzu42/keymaps/default/keymap.c
index 01e31ceb39..937405566f 100644
--- a/keyboards/uzu42/keymaps/default/keymap.c
+++ b/keyboards/uzu42/keymaps/default/keymap.c
@@ -4,10 +4,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 
 #ifdef RGBLIGHT_ENABLE
 #include <stdio.h>

From 2bdd73f80135965c1047b24b78fdf15c1ebbbee7 Mon Sep 17 00:00:00 2001
From: David Hoelscher <infinityis@users.noreply.github.com>
Date: Sun, 31 Jul 2022 21:58:25 -0500
Subject: [PATCH 153/959] Add ST7735 driver to Quantum Painter (#17848)

---
 docs/quantum_painter.md                    |  29 ++++-
 drivers/painter/st77xx/qp_st7735.c         | 144 +++++++++++++++++++++
 drivers/painter/st77xx/qp_st7735.h         |  45 +++++++
 drivers/painter/st77xx/qp_st7735_opcodes.h |  31 +++++
 quantum/painter/qp.h                       |   4 +
 quantum/painter/rules.mk                   |  13 +-
 6 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 drivers/painter/st77xx/qp_st7735.c
 create mode 100644 drivers/painter/st77xx/qp_st7735.h
 create mode 100644 drivers/painter/st77xx/qp_st7735_opcodes.h

diff --git a/docs/quantum_painter.md b/docs/quantum_painter.md
index 2386a70933..6d4e2764d4 100644
--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -27,6 +27,7 @@ Hardware supported:
 | 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` |
 | ST7789        | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = st7789_spi`  |
+| ST7735        | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = st7735_spi`  |
 
 ## Quantum Painter Configuration :id=quantum-painter-config
 
@@ -727,4 +728,30 @@ The maximum number of displays can be configured by changing the following in yo
 #define ST7789_NUM_DEVICES 3
 ```
 
-!> Some ST7789 devices are known to have different drawing offsets -- despite being a 240x320 pixel display controller internally, some display panels are only 240x240, or smaller. These may require an offset to be applied; see `qp_set_viewport_offsets` above for information on how to override the offsets if they aren't correctly rendered.
\ No newline at end of file
+!> Some ST7789 devices are known to have different drawing offsets -- despite being a 240x320 pixel display controller internally, some display panels are only 240x240, or smaller. These may require an offset to be applied; see `qp_set_viewport_offsets` above for information on how to override the offsets if they aren't correctly rendered.
+
+### ST7735 :id=qp-driver-st7735
+
+Enabling support for the ST7735 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS = st7735_spi
+```
+
+Creating a ST7735 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_st7735_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);
+```
+
+The device handle returned from the `qp_st7735_make_spi_device` function 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 ST7735_NUM_DEVICES 3
+```
+
+!> Some ST7735 devices are known to have different drawing offsets -- despite being a 132x162 pixel display controller internally, some display panels are only 80x160, or smaller. These may require an offset to be applied; see `qp_set_viewport_offsets` above for information on how to override the offsets if they aren't correctly rendered.
\ No newline at end of file
diff --git a/drivers/painter/st77xx/qp_st7735.c b/drivers/painter/st77xx/qp_st7735.c
new file mode 100644
index 0000000000..e434e31b92
--- /dev/null
+++ b/drivers/painter/st77xx/qp_st7735.c
@@ -0,0 +1,144 @@
+// Copyright 2021 Paul Cotter (@gr1mr3aver)
+// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2022 David Hoelscher (@customMK)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "qp_internal.h"
+#include "qp_comms.h"
+#include "qp_st7735.h"
+#include "qp_st77xx_opcodes.h"
+#include "qp_st7735_opcodes.h"
+#include "qp_tft_panel.h"
+
+#ifdef QUANTUM_PAINTER_ST7735_SPI_ENABLE
+#    include "qp_comms_spi.h"
+#endif // QUANTUM_PAINTER_ST7735_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Common
+
+// Driver storage
+tft_panel_dc_reset_painter_device_t st7735_drivers[ST7735_NUM_DEVICES] = {0};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Automatic viewport offsets
+
+#ifndef ST7735_NO_AUTOMATIC_OFFSETS
+static inline void st7735_automatic_viewport_offsets(painter_device_t device, painter_rotation_t rotation) {
+    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+
+    // clang-format off
+    const struct {
+        uint16_t offset_x;
+        uint16_t offset_y;
+    } rotation_offsets_80x160[] = {
+        [QP_ROTATION_0]   = { .offset_x = 24, .offset_y =  0 },
+        [QP_ROTATION_90]  = { .offset_x =  0, .offset_y = 24 },
+        [QP_ROTATION_180] = { .offset_x = 24, .offset_y =  0 },
+        [QP_ROTATION_270] = { .offset_x =  0, .offset_y = 24 },
+    };
+    // clang-format on
+
+    if (driver->panel_width == 80 && driver->panel_height == 160) {
+        driver->offset_x = rotation_offsets_80x160[rotation].offset_x;
+        driver->offset_y = rotation_offsets_80x160[rotation].offset_y;
+    }
+}
+#endif // ST7735_NO_AUTOMATIC_OFFSETS
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Initialization
+
+bool qp_st7735_init(painter_device_t device, painter_rotation_t rotation) {
+    // clang-format off
+    const uint8_t st7735_init_sequence[] = {
+        // Command,                 Delay, N, Data[N]
+        ST77XX_CMD_RESET,            120,  0,
+        ST77XX_CMD_SLEEP_OFF,          5,  0,
+        ST77XX_SET_PIX_FMT,            0,  1, 0x55,
+        ST77XX_CMD_INVERT_OFF,         0,  0,
+        ST77XX_CMD_NORMAL_ON,          0,  0,
+        ST77XX_CMD_DISPLAY_ON,        20,  0
+    };
+    // clang-format on
+    qp_comms_bulk_command_sequence(device, st7735_init_sequence, sizeof(st7735_init_sequence));
+
+    // Configure the rotation (i.e. the ordering and direction of memory writes in GRAM)
+    const uint8_t madctl[] = {
+        [QP_ROTATION_0]   = ST77XX_MADCTL_BGR,
+        [QP_ROTATION_90]  = ST77XX_MADCTL_BGR | ST77XX_MADCTL_MX | ST77XX_MADCTL_MV,
+        [QP_ROTATION_180] = ST77XX_MADCTL_BGR | ST77XX_MADCTL_MX | ST77XX_MADCTL_MY,
+        [QP_ROTATION_270] = ST77XX_MADCTL_BGR | ST77XX_MADCTL_MV | ST77XX_MADCTL_MY,
+    };
+    qp_comms_command_databyte(device, ST77XX_SET_MADCTL, madctl[rotation]);
+
+#ifndef ST7735_NO_AUTOMATIC_VIEWPORT_OFFSETS
+    st7735_automatic_viewport_offsets(device, rotation);
+#endif // ST7735_NO_AUTOMATIC_VIEWPORT_OFFSETS
+
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Driver vtable
+
+const struct tft_panel_dc_reset_painter_driver_vtable_t st7735_driver_vtable = {
+    .base =
+        {
+            .init            = qp_st7735_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,
+        },
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
+    .opcodes =
+        {
+            .display_on         = ST77XX_CMD_DISPLAY_ON,
+            .display_off        = ST77XX_CMD_DISPLAY_OFF,
+            .set_column_address = ST77XX_SET_COL_ADDR,
+            .set_row_address    = ST77XX_SET_ROW_ADDR,
+            .enable_writes      = ST77XX_SET_MEM,
+        },
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SPI
+
+#ifdef QUANTUM_PAINTER_ST7735_SPI_ENABLE
+
+// Factory function for creating a handle to the ST7735 device
+painter_device_t qp_st7735_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 < ST7735_NUM_DEVICES; ++i) {
+        tft_panel_dc_reset_painter_device_t *driver = &st7735_drivers[i];
+        if (!driver->base.driver_vtable) {
+            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&st7735_driver_vtable;
+            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            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;
+            driver->base.native_bits_per_pixel = 16; // RGB565
+
+            // 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;
+            return (painter_device_t)driver;
+        }
+    }
+    return NULL;
+}
+
+#endif // QUANTUM_PAINTER_ST7735_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/drivers/painter/st77xx/qp_st7735.h b/drivers/painter/st77xx/qp_st7735.h
new file mode 100644
index 0000000000..a9ce16bef1
--- /dev/null
+++ b/drivers/painter/st77xx/qp_st7735.h
@@ -0,0 +1,45 @@
+// Copyright 2021 Paul Cotter (@gr1mr3aver)
+// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2022 David Hoelscher (@customMK)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "gpio.h"
+#include "qp_internal.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ST7735 configurables (add to your keyboard's config.h)
+
+#ifndef ST7735_NUM_DEVICES
+/**
+ * @def This controls the maximum number of ST7735 devices that Quantum Painter can communicate with at any one time.
+ *      Increasing this number allows for multiple displays to be used.
+ */
+#    define ST7735_NUM_DEVICES 1
+#endif
+
+// Additional configuration options to be copied to your keyboard's config.h (don't change here):
+
+// If you know exactly which offsets should be used on your panel with respect to selected rotation, then this config
+// option allows you to save some flash space -- you'll need to invoke qp_set_viewport_offsets() instead from your keyboard.
+//       #define ST7735_NO_AUTOMATIC_VIEWPORT_OFFSETS
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ST7735 device factories
+
+#ifdef QUANTUM_PAINTER_ST7735_SPI_ENABLE
+/**
+ * Factory method for an ST7735 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_st7735_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);
+#endif // QUANTUM_PAINTER_ST7735_SPI_ENABLE
\ No newline at end of file
diff --git a/drivers/painter/st77xx/qp_st7735_opcodes.h b/drivers/painter/st77xx/qp_st7735_opcodes.h
new file mode 100644
index 0000000000..3cbef78537
--- /dev/null
+++ b/drivers/painter/st77xx/qp_st7735_opcodes.h
@@ -0,0 +1,31 @@
+// Copyright 2022 David Hoelscher (@customMK)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ST7735 additional command opcodes
+
+// Panel Function Commands
+#define ST7735_SET_FRAME_RATE_CTL_1 0xB1   // Set frame rate control 1
+#define ST7735_SET_FRAME_RATE_CTL_2 0xB2   // Set frame rate control 2
+#define ST7735_SET_FRAME_RATE_CTL_3 0xB3   // Set frame rate control 3
+#define ST7735_SET_INVERSION_CTL 0xB4      // Set inversion mode control
+#define ST7735_SET_DISPLAY_CTL 0xB6        // Set display control 5
+#define ST7735_SET_POWER_CTL_1 0xC0        // Set GVDD
+#define ST7735_SET_POWER_CTL_2 0xC1        // Set VGH and VGL
+#define ST7735_SET_POWER_CTL_3 0xC2        // Set normal mode op amp current
+#define ST7735_SET_POWER_CTL_4 0xC3        // Set idle mode op amp current
+#define ST7735_SET_POWER_CTL_5 0xC4        // Set partial mode op amp current
+#define ST7735_SET_VCOM_CTL 0xC5           // Set VCOM voltages
+#define ST7735_SET_VCOM_OFFSET_CTL 0xC7    // Set VCOM offset ctl
+#define ST7735_SET_LCD_ID 0xD1             // Set LCD module version
+#define ST7735_SET_PROJECT_ID 0xD2         // Set product project ID
+#define ST7735_SET_POWER_CTL_6 0xFC        // Set partial+idle op amp current
+#define ST7735_SET_NVMEM_CTL_STATUS 0xD9   // EEPROM Control Status
+#define ST7735_SET_NVMEM_READ_CMD 0xCC     // EEPROM Read Command
+#define ST7735_SET_NVMEM_WRITE_CMD 0xDF    // EEPROM Write Command
+#define ST7735_SET_PGAMMA 0xE0             // Set positive gamma
+#define ST7735_SET_NGAMMA 0xE1             // Set negative gamma
+#define ST7735_SET_EXTENSION_ENABLE 0xF0   // Enable extension command
+#define ST7735_SET_VCOM_DELAY 0xFF         // Set VCOM delay time
diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h
index 47f077d0cf..fb6904de22 100644
--- a/quantum/painter/qp.h
+++ b/quantum/painter/qp.h
@@ -448,6 +448,10 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
 #    include "qp_st7789.h"
 #endif // QUANTUM_PAINTER_ST7789_ENABLE
 
+#ifdef QUANTUM_PAINTER_ST7735_ENABLE
+#    include "qp_st7735.h"
+#endif // QUANTUM_PAINTER_ST7735_ENABLE
+
 #ifdef QUANTUM_PAINTER_GC9A01_ENABLE
 #    include "qp_gc9a01.h"
 #endif // QUANTUM_PAINTER_GC9A01_ENABLE
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index 675a1a5460..91787dfe0e 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -3,7 +3,7 @@ QUANTUM_PAINTER_DRIVERS ?=
 QUANTUM_PAINTER_ANIMATIONS_ENABLE ?= yes
 
 # The list of permissible drivers that can be listed in QUANTUM_PAINTER_DRIVERS
-VALID_QUANTUM_PAINTER_DRIVERS := ili9163_spi ili9341_spi ili9488_spi st7789_spi gc9a01_spi ssd1351_spi
+VALID_QUANTUM_PAINTER_DRIVERS := ili9163_spi ili9341_spi ili9488_spi st7789_spi st7735_spi gc9a01_spi ssd1351_spi
 
 #-------------------------------------------------------------------------------
 
@@ -83,6 +83,17 @@ define handle_quantum_painter_driver
             $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
             $(DRIVER_PATH)/painter/st77xx/qp_st7789.c
 
+    else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),st7735_spi)
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
+        OPT_DEFS += -DQUANTUM_PAINTER_ST7735_ENABLE -DQUANTUM_PAINTER_ST7735_SPI_ENABLE
+        COMMON_VPATH += \
+            $(DRIVER_PATH)/painter/tft_panel \
+            $(DRIVER_PATH)/painter/st77xx
+        SRC += \
+            $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
+            $(DRIVER_PATH)/painter/st77xx/qp_st7735.c
+
     else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),gc9a01_spi)
         QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
         QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes

From e32a9560282aa0946760ca3945d8575d96eeb8fc Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sun, 31 Jul 2022 21:35:53 -0700
Subject: [PATCH 154/959] Format code according to conventions (#17869)

---
 drivers/painter/st77xx/qp_st7735_opcodes.h | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/painter/st77xx/qp_st7735_opcodes.h b/drivers/painter/st77xx/qp_st7735_opcodes.h
index 3cbef78537..816e32f3d7 100644
--- a/drivers/painter/st77xx/qp_st7735_opcodes.h
+++ b/drivers/painter/st77xx/qp_st7735_opcodes.h
@@ -7,25 +7,25 @@
 // Quantum Painter ST7735 additional command opcodes
 
 // Panel Function Commands
-#define ST7735_SET_FRAME_RATE_CTL_1 0xB1   // Set frame rate control 1
-#define ST7735_SET_FRAME_RATE_CTL_2 0xB2   // Set frame rate control 2
-#define ST7735_SET_FRAME_RATE_CTL_3 0xB3   // Set frame rate control 3
-#define ST7735_SET_INVERSION_CTL 0xB4      // Set inversion mode control
-#define ST7735_SET_DISPLAY_CTL 0xB6        // Set display control 5
-#define ST7735_SET_POWER_CTL_1 0xC0        // Set GVDD
-#define ST7735_SET_POWER_CTL_2 0xC1        // Set VGH and VGL
-#define ST7735_SET_POWER_CTL_3 0xC2        // Set normal mode op amp current
-#define ST7735_SET_POWER_CTL_4 0xC3        // Set idle mode op amp current
-#define ST7735_SET_POWER_CTL_5 0xC4        // Set partial mode op amp current
-#define ST7735_SET_VCOM_CTL 0xC5           // Set VCOM voltages
-#define ST7735_SET_VCOM_OFFSET_CTL 0xC7    // Set VCOM offset ctl
-#define ST7735_SET_LCD_ID 0xD1             // Set LCD module version
-#define ST7735_SET_PROJECT_ID 0xD2         // Set product project ID
-#define ST7735_SET_POWER_CTL_6 0xFC        // Set partial+idle op amp current
-#define ST7735_SET_NVMEM_CTL_STATUS 0xD9   // EEPROM Control Status
-#define ST7735_SET_NVMEM_READ_CMD 0xCC     // EEPROM Read Command
-#define ST7735_SET_NVMEM_WRITE_CMD 0xDF    // EEPROM Write Command
-#define ST7735_SET_PGAMMA 0xE0             // Set positive gamma
-#define ST7735_SET_NGAMMA 0xE1             // Set negative gamma
-#define ST7735_SET_EXTENSION_ENABLE 0xF0   // Enable extension command
-#define ST7735_SET_VCOM_DELAY 0xFF         // Set VCOM delay time
+#define ST7735_SET_FRAME_RATE_CTL_1 0xB1 // Set frame rate control 1
+#define ST7735_SET_FRAME_RATE_CTL_2 0xB2 // Set frame rate control 2
+#define ST7735_SET_FRAME_RATE_CTL_3 0xB3 // Set frame rate control 3
+#define ST7735_SET_INVERSION_CTL 0xB4    // Set inversion mode control
+#define ST7735_SET_DISPLAY_CTL 0xB6      // Set display control 5
+#define ST7735_SET_POWER_CTL_1 0xC0      // Set GVDD
+#define ST7735_SET_POWER_CTL_2 0xC1      // Set VGH and VGL
+#define ST7735_SET_POWER_CTL_3 0xC2      // Set normal mode op amp current
+#define ST7735_SET_POWER_CTL_4 0xC3      // Set idle mode op amp current
+#define ST7735_SET_POWER_CTL_5 0xC4      // Set partial mode op amp current
+#define ST7735_SET_VCOM_CTL 0xC5         // Set VCOM voltages
+#define ST7735_SET_VCOM_OFFSET_CTL 0xC7  // Set VCOM offset ctl
+#define ST7735_SET_LCD_ID 0xD1           // Set LCD module version
+#define ST7735_SET_PROJECT_ID 0xD2       // Set product project ID
+#define ST7735_SET_POWER_CTL_6 0xFC      // Set partial+idle op amp current
+#define ST7735_SET_NVMEM_CTL_STATUS 0xD9 // EEPROM Control Status
+#define ST7735_SET_NVMEM_READ_CMD 0xCC   // EEPROM Read Command
+#define ST7735_SET_NVMEM_WRITE_CMD 0xDF  // EEPROM Write Command
+#define ST7735_SET_PGAMMA 0xE0           // Set positive gamma
+#define ST7735_SET_NGAMMA 0xE1           // Set negative gamma
+#define ST7735_SET_EXTENSION_ENABLE 0xF0 // Enable extension command
+#define ST7735_SET_VCOM_DELAY 0xFF       // Set VCOM delay time

From b1eac5c671d81cff1a29a3ddf21fade4dc798458 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 1 Aug 2022 06:04:26 -0700
Subject: [PATCH 155/959] [Keyboard] Overhaul uzu42 (#17868)

---
 .../default/glcdfont_uzu42.c => glcdfont.c}   |   0
 keyboards/uzu42/keymaps/default/config.h      |  47 ----
 keyboards/uzu42/keymaps/default/keymap.c      | 245 ++----------------
 keyboards/uzu42/post_config.h                 |   8 +
 keyboards/uzu42/rev1/config.h                 |  22 +-
 keyboards/uzu42/rev1/rev1.c                   |   4 +-
 keyboards/uzu42/rev1/rev1.h                   |  19 +-
 keyboards/uzu42/rev1/serial_config.h          |   4 -
 .../uzu42/rev1/serial_config_simpleapi.h      |   5 -
 keyboards/uzu42/uzu42.c                       | 104 ++++++++
 keyboards/uzu42/uzu42.h                       |   3 +
 11 files changed, 165 insertions(+), 296 deletions(-)
 rename keyboards/uzu42/{keymaps/default/glcdfont_uzu42.c => glcdfont.c} (100%)
 delete mode 100644 keyboards/uzu42/keymaps/default/config.h
 create mode 100644 keyboards/uzu42/post_config.h
 delete mode 100644 keyboards/uzu42/rev1/serial_config.h
 delete mode 100644 keyboards/uzu42/rev1/serial_config_simpleapi.h

diff --git a/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c b/keyboards/uzu42/glcdfont.c
similarity index 100%
rename from keyboards/uzu42/keymaps/default/glcdfont_uzu42.c
rename to keyboards/uzu42/glcdfont.c
diff --git a/keyboards/uzu42/keymaps/default/config.h b/keyboards/uzu42/keymaps/default/config.h
deleted file mode 100644
index bc7897f501..0000000000
--- a/keyboards/uzu42/keymaps/default/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define SSD1306OLED
-
-#define USE_SERIAL_PD2
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 200
-
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 54
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-// Use the lily version to get the uzu42 logo instead of the qmk logo
-#define OLED_FONT_H "keymaps/default/glcdfont_uzu42.c"
diff --git a/keyboards/uzu42/keymaps/default/keymap.c b/keyboards/uzu42/keymaps/default/keymap.c
index 937405566f..4334400c86 100644
--- a/keyboards/uzu42/keymaps/default/keymap.c
+++ b/keyboards/uzu42/keymaps/default/keymap.c
@@ -1,38 +1,28 @@
-#include QMK_KEYBOARD_H
-#include "uzu42.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#ifdef RGBLIGHT_ENABLE
-#include <stdio.h>
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
+#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,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
+    _QWERTY = 0,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
 };
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  RGBRST
+    RGBRST = SAFE_RANGE,
 };
 
-#define KC_CTES  CTL_T(KC_ESC)
-#define KC_SFSP  SFT_T(KC_SPC)
-#define KC_ALBS  ALT_T(KC_BSPC)
+#define KC_CTES CTL_T(KC_ESC)
+#define KC_SFSP SFT_T(KC_SPC)
+#define KC_ALBS ALT_T(KC_BSPC)
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
@@ -84,205 +74,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
 }
 
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-#define L_BASE 0
-#define L_LOWER (1 << 1)
-#define L_RAISE (1 << 2)
-#define L_ADJUST (1 << 3)
-#define L_ADJUST_TRI (L_ADJUST | L_RAISE | L_LOWER)
-
-char layer_state_str[24];
-
-const char *read_layer_state(void) {
-  switch (layer_state)
-  {
-  case L_BASE:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Default");
-    break;
-  case L_RAISE:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise");
-    break;
-  case L_LOWER:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower");
-    break;
-  case L_ADJUST:
-  case L_ADJUST_TRI:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust");
-    break;
-  default:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
-  }
-
-  return layer_state_str;
-}
-
-const char *read_logo(void) {
-  static char logo[] = {
-      0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-      0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-      0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-      0};
-  return logo;
-}
-
-char keylog_str[24] = {};
-char keylogs_str[21] = {};
-int keylogs_str_idx = 0;
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', ' ', ' ', ' ', ' ', ' ', ' ',
-    ' ', ';', '\'', ' ', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-
-  // update keylogs
-  if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
-    keylogs_str_idx = 0;
-    for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
-      keylogs_str[i] = ' ';
-    }
-  }
-
-  keylogs_str[keylogs_str_idx] = name;
-  keylogs_str_idx++;
-}
-
-const char *read_keylog(void) {
-  return keylog_str;
-}
-
-const char *read_keylogs(void) {
-  return keylogs_str;
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-    return false;
-}
-#endif // OLED_ENABLE
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
+    switch (keycode) {
+        case RGBRST:
 #ifdef RGBLIGHT_ENABLE
-
-char rbf_info_str[24];
-const char *read_rgb_info(void) {
-
-  snprintf(rbf_info_str, sizeof(rbf_info_str), "%s %2d h%3d s%3d v%3d",
-    rgblight_config.enable ? "on" : "- ", rgblight_config.mode,
-    rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
-  return rbf_info_str;
-}
+            if (record->event.pressed) {
+                eeconfig_update_rgblight_default();
+                rgblight_enable();
+            }
 #endif
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/uzu42/post_config.h b/keyboards/uzu42/post_config.h
new file mode 100644
index 0000000000..69a18bf962
--- /dev/null
+++ b/keyboards/uzu42/post_config.h
@@ -0,0 +1,8 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifndef OLED_FONT_H
+#    define OLED_FONT_H "keyboards/uzu42/glcdfont.c"
+#endif
diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
index 815442ed21..4da4f02aa9 100644
--- a/keyboards/uzu42/rev1/config.h
+++ b/keyboards/uzu42/rev1/config.h
@@ -54,10 +54,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 
-#ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 54    // Number of LEDs
-#   define RGBLED_SPLIT { 27, 27 }
-#endif
+#define RGBLED_NUM 54    // Number of LEDs
+#define RGBLED_SPLIT { 27, 27 }
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+// #define RGBLIGHT_EFFECT_RGB_TEST
+// #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define RGBLIGHT_LIMIT_VAL 120
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
 
 /*
  * Feature disable options
diff --git a/keyboards/uzu42/rev1/rev1.c b/keyboards/uzu42/rev1/rev1.c
index 0bfac6bd93..e22860d04b 100644
--- a/keyboards/uzu42/rev1/rev1.c
+++ b/keyboards/uzu42/rev1/rev1.c
@@ -1,2 +1,4 @@
-#include "uzu42.h"
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "uzu42.h"
diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h
index 7b9c7d5991..e4aba8b79b 100644
--- a/keyboards/uzu42/rev1/rev1.h
+++ b/keyboards/uzu42/rev1/rev1.h
@@ -1,22 +1,12 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
-#include "../uzu42.h"
+#include "uzu42.h"
 
 #include "quantum.h"
 
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
   L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
   L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
@@ -33,4 +23,3 @@
     { R24, R23, R22, R21, R20 }, \
     { R35, R34, R33, R32, R31, R30 } \
   }
-
diff --git a/keyboards/uzu42/rev1/serial_config.h b/keyboards/uzu42/rev1/serial_config.h
deleted file mode 100644
index 4fab8e8ddf..0000000000
--- a/keyboards/uzu42/rev1/serial_config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef SOFT_SERIAL_PIN
-#define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
-#endif
diff --git a/keyboards/uzu42/rev1/serial_config_simpleapi.h b/keyboards/uzu42/rev1/serial_config_simpleapi.h
deleted file mode 100644
index 0e1dd9e4ac..0000000000
--- a/keyboards/uzu42/rev1/serial_config_simpleapi.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#undef SERIAL_USE_MULTI_TRANSACTION
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/uzu42.c
index df71734f7b..6a47ceac38 100644
--- a/keyboards/uzu42/uzu42.c
+++ b/keyboards/uzu42/uzu42.c
@@ -1 +1,105 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "uzu42.h"
+
+#ifdef OLED_ENABLE
+#include <stdio.h>
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+  return rotation;
+}
+
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("Layer: "), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_ln_P(PSTR("Default"), false);
+            break;
+        case 1:
+            oled_write_ln_P(PSTR("Lower"), false);
+            break;
+        case 2:
+            oled_write_ln_P(PSTR("Raise"), false);
+            break;
+        case 3:
+            oled_write_ln_P(PSTR("Adjust"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+
+    }
+}
+
+char keylog_str[24] = {};
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+    char name = ' ';
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
+        keycode = keycode & 0xFF;
+    }
+    if (keycode < 60) {
+        name = code_to_name[keycode];
+    }
+
+    // update keylog
+    snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c", record->event.key.row, record->event.key.col, keycode, name);
+}
+
+void oled_render_keylog(void) {
+    oled_write(keylog_str, false);
+}
+
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+void oled_render_logo(void) {
+    static const char PROGMEM crkbd_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0};
+    oled_write_P(crkbd_logo, false);
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return true;
+    }
+    if (is_keyboard_master()) {
+        oled_render_layer_state();
+        oled_render_keylog();
+    } else {
+        oled_render_logo();
+    }
+    return false;
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        set_keylog(keycode, record);
+    }
+    return process_record_user(keycode, record);
+}
+
+#endif // OLED_ENABLE
diff --git a/keyboards/uzu42/uzu42.h b/keyboards/uzu42/uzu42.h
index dd944e3750..c23baac333 100644
--- a/keyboards/uzu42/uzu42.h
+++ b/keyboards/uzu42/uzu42.h
@@ -1,3 +1,6 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #ifdef KEYBOARD_uzu42_rev1

From 543f54a483842474d2333581597dd4691bb77fac Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 4 Aug 2022 21:05:16 +1000
Subject: [PATCH 156/959] [Core] `STM32_USB_USE_OTG1` =>
 `USB_ENDPOINTS_ARE_REORDERABLE` (#17647)

---
 builddefs/common_rules.mk                     |  1 +
 .../gmmk/gmmk2/p96/ansi/keymaps/via/config.h  |  1 -
 .../gmmk/gmmk2/p96/iso/keymaps/via/config.h   |  1 -
 .../GENERIC_WB32_F3G71XX/configs/config.h     |  2 ++
 tmk_core/protocol/chibios/usb_main.c          | 30 +++++++++----------
 tmk_core/protocol/usb_descriptor.h            | 15 ++++++----
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index 6573257c78..c8816639f8 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -371,6 +371,7 @@ show_path:
 dump_vars: ERROR_IF_EMPTY=""
 dump_vars: ERROR_IF_NONBOOL=""
 dump_vars: ERROR_IF_UNSET=""
+dump_vars: CATASTROPHIC_ERROR=""
 dump_vars:
 	@$(foreach V,$(sort $(.VARIABLES)),$(if $(filter-out environment% default automatic,$(origin $V)),$(info $V=$($V))))
 
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
index 8fe214e8a7..b656a22f1b 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
@@ -19,4 +19,3 @@
 #include "config_common.h"
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-#define STM32_USB_USE_OTG1 TRUE
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
index 8fe214e8a7..b656a22f1b 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
@@ -19,4 +19,3 @@
 #include "config_common.h"
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-#define STM32_USB_USE_OTG1 TRUE
diff --git a/platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/config.h b/platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/config.h
index 9fdc825669..437a8e4df2 100644
--- a/platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/config.h
@@ -18,3 +18,5 @@
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 #    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #endif
+
+#define USB_ENDPOINTS_ARE_REORDERABLE
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 4bb6949b4f..eb9ef82554 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -177,7 +177,7 @@ static const USBEndpointConfig shared_ep_config = {
 };
 #endif
 
-#if STM32_USB_USE_OTG1
+#ifdef USB_ENDPOINTS_ARE_REORDERABLE
 typedef struct {
     size_t              queue_capacity_in;
     size_t              queue_capacity_out;
@@ -204,23 +204,22 @@ typedef struct {
 } usb_driver_config_t;
 #endif
 
-#if STM32_USB_USE_OTG1
+#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 */                                                             \
-                    2,                     /* IN multiplier */                                                                  \
-                    NULL                   /* SETUP buffer (not a SETUP endpoint) */                                            \
+                    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 =                                                                                                    \
                 {                                                                                                               \
@@ -232,8 +231,7 @@ typedef struct {
                     0,                          /* OUT maximum packet size */                                                   \
                     NULL,                       /* IN Endpoint state */                                                         \
                     NULL,                       /* OUT endpoint state */                                                        \
-                    2,                          /* IN multiplier */                                                             \
-                    NULL,                       /* SETUP buffer (not a SETUP endpoint) */                                       \
+                    usb_lld_endpoint_fields     /* USB driver specific endpoint fields */                                       \
                 },                                                                                                              \
             .config = {                                                                                                         \
                 .usbp        = &USB_DRIVER,                                                                                     \
@@ -490,7 +488,7 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
             usbInitEndpointI(usbp, SHARED_IN_EPNUM, &shared_ep_config);
 #endif
             for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-#if STM32_USB_USE_OTG1
+#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);
@@ -717,7 +715,7 @@ static const USBConfig usbcfg = {
  */
 void init_usb_driver(USBDriver *usbp) {
     for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-#if STM32_USB_USE_OTG1
+#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;
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index 6c3424145c..f8b7a863aa 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -47,6 +47,9 @@
 
 #ifdef PROTOCOL_CHIBIOS
 #    include <hal.h>
+#    if STM32_USB_USE_OTG1 == TRUE
+#        define USB_ENDPOINTS_ARE_REORDERABLE
+#    endif
 #endif
 
 /*
@@ -216,7 +219,7 @@ enum usb_endpoints {
 
 #ifdef RAW_ENABLE
     RAW_IN_EPNUM = NEXT_EPNUM,
-#    if STM32_USB_USE_OTG1
+#    ifdef USB_ENDPOINTS_ARE_REORDERABLE
 #        define RAW_OUT_EPNUM RAW_IN_EPNUM
 #    else
     RAW_OUT_EPNUM         = NEXT_EPNUM,
@@ -234,7 +237,7 @@ enum usb_endpoints {
 // ChibiOS has enough memory and descriptor to actually enable the endpoint
 // It could use the same endpoint numbers, as that's supported by ChibiOS
 // But the QMK code currently assumes that the endpoint numbers are different
-#        if STM32_USB_USE_OTG1
+#        ifdef USB_ENDPOINTS_ARE_REORDERABLE
 #            define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
 #        else
     CONSOLE_OUT_EPNUM   = NEXT_EPNUM,
@@ -246,7 +249,7 @@ enum usb_endpoints {
 
 #ifdef MIDI_ENABLE
     MIDI_STREAM_IN_EPNUM = NEXT_EPNUM,
-#    if STM32_USB_USE_OTG1
+#    ifdef USB_ENDPOINTS_ARE_REORDERABLE
 #        define MIDI_STREAM_OUT_EPNUM MIDI_STREAM_IN_EPNUM
 #    else
     MIDI_STREAM_OUT_EPNUM = NEXT_EPNUM,
@@ -256,7 +259,7 @@ enum usb_endpoints {
 #ifdef VIRTSER_ENABLE
     CDC_NOTIFICATION_EPNUM = NEXT_EPNUM,
     CDC_IN_EPNUM           = NEXT_EPNUM,
-#    if STM32_USB_USE_OTG1
+#    ifdef USB_ENDPOINTS_ARE_REORDERABLE
 #        define CDC_OUT_EPNUM CDC_IN_EPNUM
 #    else
     CDC_OUT_EPNUM         = NEXT_EPNUM,
@@ -264,7 +267,7 @@ enum usb_endpoints {
 #endif
 #ifdef JOYSTICK_ENABLE
     JOYSTICK_IN_EPNUM = NEXT_EPNUM,
-#    if STM32_USB_USE_OTG1
+#    ifdef USB_ENDPOINTS_ARE_REORDERABLE
     JOYSTICK_OUT_EPNUM = JOYSTICK_IN_EPNUM,
 #    else
     JOYSTICK_OUT_EPNUM    = NEXT_EPNUM,
@@ -274,7 +277,7 @@ enum usb_endpoints {
 #ifdef DIGITIZER_ENABLE
 #    if !defined(DIGITIZER_SHARED_EP)
     DIGITIZER_IN_EPNUM = NEXT_EPNUM,
-#        if STM32_USB_USE_OTG1
+#        ifdef USB_ENDPOINTS_ARE_REORDERABLE
     DIGITIZER_OUT_EPNUM = DIGITIZER_IN_EPNUM,
 #        else
     DIGITIZER_OUT_EPNUM = NEXT_EPNUM,

From 94e8701b3e62647866e52b9e1086017aab4be2f9 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 4 Aug 2022 21:44:56 +1000
Subject: [PATCH 157/959] Fixup compilation of printf-like functions with
 uint32_t args. (#17904)

---
 drivers/flash/flash_spi.c                     |  8 ++++----
 .../chibios/drivers/eeprom/eeprom_stm32.c     | 20 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/flash/flash_spi.c b/drivers/flash/flash_spi.c
index 684ee06d71..0c0eb8a99e 100644
--- a/drivers/flash/flash_spi.c
+++ b/drivers/flash/flash_spi.c
@@ -207,7 +207,7 @@ flash_status_t flash_erase_sector(uint32_t addr) {
 
     /* Check that the address exceeds the limit. */
     if ((addr + (EXTERNAL_FLASH_SECTOR_SIZE)) >= (EXTERNAL_FLASH_SIZE) || ((addr % (EXTERNAL_FLASH_SECTOR_SIZE)) != 0)) {
-        dprintf("Flash erase sector address over limit! [addr:0x%x]\n", (uint32_t)addr);
+        dprintf("Flash erase sector address over limit! [addr:0x%lx]\n", (uint32_t)addr);
         return FLASH_STATUS_ERROR;
     }
 
@@ -247,7 +247,7 @@ flash_status_t flash_erase_block(uint32_t addr) {
 
     /* Check that the address exceeds the limit. */
     if ((addr + (EXTERNAL_FLASH_BLOCK_SIZE)) >= (EXTERNAL_FLASH_SIZE) || ((addr % (EXTERNAL_FLASH_BLOCK_SIZE)) != 0)) {
-        dprintf("Flash erase block address over limit! [addr:0x%x]\n", (uint32_t)addr);
+        dprintf("Flash erase block address over limit! [addr:0x%lx]\n", (uint32_t)addr);
         return FLASH_STATUS_ERROR;
     }
 
@@ -303,7 +303,7 @@ flash_status_t flash_read_block(uint32_t addr, void *buf, size_t len) {
     }
 
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_FLASH_SPI_OUTPUT)
-    dprintf("[SPI FLASH R] 0x%08lX: ", addr);
+    dprintf("[SPI FLASH R] 0x%08lx: ", addr);
     for (size_t i = 0; i < len; ++i) {
         dprintf(" %02X", (int)(((uint8_t *)read_buf)[i]));
     }
@@ -339,7 +339,7 @@ flash_status_t flash_write_block(uint32_t addr, const void *buf, size_t len) {
         }
 
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_FLASH_SPI_OUTPUT)
-        dprintf("[SPI FLASH W] 0x%08lX: ", addr);
+        dprintf("[SPI FLASH W] 0x%08lx: ", addr);
         for (size_t i = 0; i < write_length; i++) {
             dprintf(" %02X", (int)(uint8_t)(write_buf[i]));
         }
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.c b/platforms/chibios/drivers/eeprom/eeprom_stm32.c
index a15bfe09ed..25733fb336 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_stm32.c
@@ -250,7 +250,7 @@ uint16_t EEPROM_Init(void) {
                 }
                 wvalue = ~*log_addr;
                 if (!wvalue) {
-                    eeprom_printf("Incomplete write at log_addr: 0x%04x;\n", (uint32_t)log_addr);
+                    eeprom_printf("Incomplete write at log_addr: 0x%04lx;\n", (uint32_t)log_addr);
                     /* Possibly incomplete write.  Ignore and continue */
                     continue;
                 }
@@ -261,7 +261,7 @@ uint16_t EEPROM_Init(void) {
             } else {
                 /* Reserved for future use */
                 if (address & FEE_VALUE_RESERVED) {
-                    eeprom_printf("Reserved encoded value at log_addr: 0x%04x;\n", (uint32_t)log_addr);
+                    eeprom_printf("Reserved encoded value at log_addr: 0x%04lx;\n", (uint32_t)log_addr);
                     continue;
                 }
                 /* Optimization for 0 or 1 values. */
@@ -273,7 +273,7 @@ uint16_t EEPROM_Init(void) {
                 eeprom_printf("DataBuf[0x%04x] = 0x%04x;\n", address, wvalue);
                 *(uint16_t *)(&DataBuf[address]) = wvalue;
             } else {
-                eeprom_printf("DataBuf[0x%04x] cannot be set to 0x%04x [BAD ADDRESS]\n", address, wvalue);
+                eeprom_printf("DataBuf[0x%04x] cannot be set to 0x%04lx [BAD ADDRESS]\n", address, wvalue);
             }
         }
     }
@@ -293,14 +293,14 @@ static void eeprom_clear(void) {
     FLASH_Unlock();
 
     for (uint16_t page_num = 0; page_num < FEE_PAGE_COUNT; ++page_num) {
-        eeprom_printf("FLASH_ErasePage(0x%04x)\n", (uint32_t)(FEE_PAGE_BASE_ADDRESS + (page_num * FEE_PAGE_SIZE)));
+        eeprom_printf("FLASH_ErasePage(0x%04lx)\n", (uint32_t)(FEE_PAGE_BASE_ADDRESS + (page_num * FEE_PAGE_SIZE)));
         FLASH_ErasePage(FEE_PAGE_BASE_ADDRESS + (page_num * FEE_PAGE_SIZE));
     }
 
     FLASH_Lock();
 
     empty_slot = (uint16_t *)FEE_WRITE_LOG_BASE_ADDRESS;
-    eeprom_printf("eeprom_clear empty_slot: 0x%08x\n", (uint32_t)empty_slot);
+    eeprom_printf("eeprom_clear empty_slot: 0x%08lx\n", (uint32_t)empty_slot);
 }
 
 /* Erase emulated eeprom */
@@ -328,7 +328,7 @@ static uint8_t eeprom_compact(void) {
     for (; dest < FEE_COMPACTED_LAST_ADDRESS; ++src, dest += 2) {
         value = *src;
         if (value) {
-            eeprom_printf("FLASH_ProgramHalfWord(0x%04x, 0x%04x)\n", (uint32_t)dest, ~value);
+            eeprom_printf("FLASH_ProgramHalfWord(0x%04lx, 0x%04x)\n", (uint32_t)dest, ~value);
             FLASH_Status status = FLASH_ProgramHalfWord(dest, ~value);
             if (status != FLASH_COMPLETE) final_status = status;
         }
@@ -355,7 +355,7 @@ static uint8_t eeprom_write_direct_entry(uint16_t Address) {
 
         FLASH_Unlock();
 
-        eeprom_printf("FLASH_ProgramHalfWord(0x%08x, 0x%04x) [DIRECT]\n", (uint32_t)directAddress, value);
+        eeprom_printf("FLASH_ProgramHalfWord(0x%08lx, 0x%04x) [DIRECT]\n", (uint32_t)directAddress, value);
         FLASH_Status status = FLASH_ProgramHalfWord(directAddress, value);
 
         FLASH_Lock();
@@ -397,12 +397,12 @@ static uint8_t eeprom_write_log_word_entry(uint16_t Address) {
     FLASH_Unlock();
 
     /* address */
-    eeprom_printf("FLASH_ProgramHalfWord(0x%08x, 0x%04x)\n", (uint32_t)empty_slot, Address);
+    eeprom_printf("FLASH_ProgramHalfWord(0x%08lx, 0x%04x)\n", (uint32_t)empty_slot, Address);
     final_status = FLASH_ProgramHalfWord((uintptr_t)empty_slot++, Address);
 
     /* value */
     if (encoding == (FEE_WORD_ENCODING | FEE_VALUE_NEXT)) {
-        eeprom_printf("FLASH_ProgramHalfWord(0x%08x, 0x%04x)\n", (uint32_t)empty_slot, ~value);
+        eeprom_printf("FLASH_ProgramHalfWord(0x%08lx, 0x%04x)\n", (uint32_t)empty_slot, ~value);
         FLASH_Status status = FLASH_ProgramHalfWord((uintptr_t)empty_slot++, ~value);
         if (status != FLASH_COMPLETE) final_status = status;
     }
@@ -428,7 +428,7 @@ static uint8_t eeprom_write_log_byte_entry(uint16_t Address) {
     uint16_t value = (Address << 8) | DataBuf[Address];
 
     /* write to flash */
-    eeprom_printf("FLASH_ProgramHalfWord(0x%08x, 0x%04x)\n", (uint32_t)empty_slot, value);
+    eeprom_printf("FLASH_ProgramHalfWord(0x%08lx, 0x%04x)\n", (uint32_t)empty_slot, value);
     FLASH_Status status = FLASH_ProgramHalfWord((uintptr_t)empty_slot++, value);
 
     FLASH_Lock();

From d9eb152a90da0bedb0047b67e4f5ebb53e64b422 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 4 Aug 2022 22:15:42 +1000
Subject: [PATCH 158/959] Fix issue with #17904. (#17905)

---
 platforms/chibios/drivers/eeprom/eeprom_stm32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.c b/platforms/chibios/drivers/eeprom/eeprom_stm32.c
index 25733fb336..1a354dc213 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_stm32.c
@@ -273,7 +273,7 @@ uint16_t EEPROM_Init(void) {
                 eeprom_printf("DataBuf[0x%04x] = 0x%04x;\n", address, wvalue);
                 *(uint16_t *)(&DataBuf[address]) = wvalue;
             } else {
-                eeprom_printf("DataBuf[0x%04x] cannot be set to 0x%04lx [BAD ADDRESS]\n", address, wvalue);
+                eeprom_printf("DataBuf[0x%04x] cannot be set to 0x%04x [BAD ADDRESS]\n", address, wvalue);
             }
         }
     }

From eb417b3aaf0ed4581f923fde2906d34f06616699 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 4 Aug 2022 11:05:53 -0700
Subject: [PATCH 159/959] Add deprecated check for RGBLIGHT_ANIMATIONS (#17832)

---
 data/mappings/info_config.json |  2 +-
 docs/config_options.md         |  2 --
 docs/feature_rgblight.md       | 15 ++++++++-------
 docs/ja/config_options.md      |  2 --
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index fcceb98025..3891ef6437 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -56,7 +56,6 @@
     "RGB_DI_PIN": {"info_key": "rgblight.pin"},
     "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
     "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"},
-    "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool"},
     "RGBLIGHT_EFFECT_ALTERNATING": {"info_key": "rgblight.animations.alternating", "value_type": "bool"},
     "RGBLIGHT_EFFECT_BREATHING": {"info_key": "rgblight.animations.breathing", "value_type": "bool"},
     "RGBLIGHT_EFFECT_CHRISTMAS": {"info_key": "rgblight.animations.christmas", "value_type": "bool"},
@@ -114,4 +113,5 @@
     "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true},
     "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true},
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
+    "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool", "deprecated": true},
 }
diff --git a/docs/config_options.md b/docs/config_options.md
index 34034f7c8d..f50748b950 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -218,8 +218,6 @@ If you define these options you will enable the associated feature, which may in
 
 * `#define RGB_DI_PIN D7`
   * pin the DI on the WS2812 is hooked-up to
-* `#define RGBLIGHT_ANIMATIONS`
-  * run RGB animations
 * `#define RGBLIGHT_LAYERS`
   * Lets you define [lighting layers](feature_rgblight.md?id=lighting-layers) that can be toggled on or off. Great for showing the current keyboard layer or caps lock state.
 * `#define RGBLIGHT_MAX_LAYERS`
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 11d4f89950..7e7699c5b7 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -105,7 +105,7 @@ Your RGB lighting can be configured by placing these `#define`s in your `config.
 ## Effects and Animations
 
 Not only can this lighting be whatever color you want,
-if `RGBLIGHT_EFFECT_xxxx` or `RGBLIGHT_ANIMATIONS` is defined, you also have a number of animation modes at your disposal:
+if `RGBLIGHT_EFFECT_xxxx` is defined, you also have a number of animation modes at your disposal:
 
 |Mode number symbol           |Additional number  |Description                            |
 |-----------------------------|-------------------|---------------------------------------|
@@ -125,13 +125,14 @@ Check out [this video](https://youtube.com/watch?v=VKrpPAHlisY) for a demonstrat
 
 Note: For versions older than 0.6.117, The mode numbers were written directly. In `quantum/rgblight/rgblight.h` there is a contrast table between the old mode number and the current symbol.
 
+
 ### Effect and Animation Toggles
 
 Use these defines to add or remove animations from the firmware. When you are running low on flash space, it can be helpful to disable animations you are not using.
 
 |Define                              |Default      |Description                                                              |
 |------------------------------------|-------------|-------------------------------------------------------------------------|
-|`RGBLIGHT_ANIMATIONS`               |*Not defined*|Enable all additional animation modes.                                   |
+|`RGBLIGHT_ANIMATIONS`               |*Not defined*|Enable all additional animation modes.  (deprecated)                     |
 |`RGBLIGHT_EFFECT_ALTERNATING`       |*Not defined*|Enable alternating animation mode.                                       |
 |`RGBLIGHT_EFFECT_BREATHING`         |*Not defined*|Enable breathing animation mode.                                         |
 |`RGBLIGHT_EFFECT_CHRISTMAS`         |*Not defined*|Enable christmas animation mode.                                         |
@@ -143,6 +144,8 @@ Use these defines to add or remove animations from the firmware. When you are ru
 |`RGBLIGHT_EFFECT_STATIC_GRADIENT`   |*Not defined*|Enable static gradient mode.                                             |
 |`RGBLIGHT_EFFECT_TWINKLE`           |*Not defined*|Enable twinkle animation mode.                                           |
 
+!> `RGBLIGHT_ANIMATIONS` is being deprecated and animation modes should be explicitly defined.
+
 ### Effect and Animation Settings
 
 The following options are used to tweak the various animations:
@@ -162,14 +165,12 @@ The following options are used to tweak the various animations:
 |`RGBLIGHT_EFFECT_TWINKLE_PROBABILITY`|`1/127`     |Adjusts how likely each LED is to twinkle (on each animation step)                             |
 
 ### Example Usage to Reduce Memory Footprint
-  1. Remove `RGBLIGHT_ANIMATIONS` from `config.h`.
-  1. Selectively add the animations you want to enable. The following would enable two animations and save about 4KiB:
+  1. Selectively disable the animations you want to enable. The following would enable two animations and save about 4KiB:
 
 ```diff
  #undef RGBLED_NUM
--#define RGBLIGHT_ANIMATIONS
-+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
++#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
++#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
  #define RGBLED_NUM 12
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index 9da84e6e4f..5236230a10 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -196,8 +196,6 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
 
 * `#define RGB_DI_PIN D7`
   * WS2812 の DI 端子につなぐピン
-* `#define RGBLIGHT_ANIMATIONS`
-  * RGB アニメーションを実行します
 * `#define RGBLIGHT_LAYERS`
   * オンとオフを切り替えることができる [ライトレイヤー](ja/feature_rgblight.md?id=lighting-layers) を定義できます。現在のキーボードレイヤーまたは Caps Lock 状態を表示するのに最適です。
 * `#define RGBLIGHT_MAX_LAYERS`

From ad4ef47d2b92c158d49feabf28cc3b5eb367a1c4 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 5 Aug 2022 18:58:06 -0700
Subject: [PATCH 160/959] [Keyboard] use correct function in Dilemma splinky
 (#17923)

---
 keyboards/bastardkb/dilemma/splinky/splinky.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/bastardkb/dilemma/splinky/splinky.c b/keyboards/bastardkb/dilemma/splinky/splinky.c
index f38fe43818..0100ae06ae 100644
--- a/keyboards/bastardkb/dilemma/splinky/splinky.c
+++ b/keyboards/bastardkb/dilemma/splinky/splinky.c
@@ -20,7 +20,7 @@
 // Forward declare RP2040 SDK declaration.
 void gpio_init(uint gpio);
 
-void keyboard_pre_init_user(void) {
+void keyboard_pre_init_kb(void) {
     // Ensures that GP26 through GP29 are initialized as digital inputs (as
     // opposed to analog inputs).  These GPIOs are shared with A0 through A3,
     // respectively.  On RP2040-B2 and later, the digital inputs are disabled by
@@ -29,4 +29,5 @@ void keyboard_pre_init_user(void) {
     gpio_init(GP27);
     gpio_init(GP28);
     gpio_init(GP29);
+    keyboard_pre_init_user();
 }

From 7bbc1b21dd97d0d1577b5ed288adc48475512497 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 5 Aug 2022 21:38:10 -0500
Subject: [PATCH 161/959] Add kb2040 onkey keyboard that works with the oled
 keymap (#17786)

---
 keyboards/handwired/onekey/kb2040/config.h  | 29 +++++++++++++++++++++
 keyboards/handwired/onekey/kb2040/mcuconf.h | 24 +++++++++++++++++
 keyboards/handwired/onekey/kb2040/readme.md | 10 +++++++
 keyboards/handwired/onekey/kb2040/rules.mk  |  9 +++++++
 4 files changed, 72 insertions(+)
 create mode 100644 keyboards/handwired/onekey/kb2040/config.h
 create mode 100644 keyboards/handwired/onekey/kb2040/mcuconf.h
 create mode 100644 keyboards/handwired/onekey/kb2040/readme.md
 create mode 100644 keyboards/handwired/onekey/kb2040/rules.mk

diff --git a/keyboards/handwired/onekey/kb2040/config.h b/keyboards/handwired/onekey/kb2040/config.h
new file mode 100644
index 0000000000..24a7d3a3eb
--- /dev/null
+++ b/keyboards/handwired/onekey/kb2040/config.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT Onekey Raspberry Pi RP2040
+#define MATRIX_COL_PINS \
+    { GP4 }
+#define MATRIX_ROW_PINS \
+    { GP5 }
+#define DEBUG_MATRIX_SCAN_RATE
+
+#define QMK_WAITING_TEST_BUSY_PIN GP8
+#define QMK_WAITING_TEST_YIELD_PIN GP9
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define RGB_DI_PIN A1
+
+// settings for the oled keyboard demo with Adafruit 0.91" OLED display on the Stemma QT port
+#define OLED_DISPLAY_128X32
+#define I2C_DRIVER I2CD1
+#define I2C1_SDA_PIN GP12
+#define I2C1_SCL_PIN GP13
+ 
diff --git a/keyboards/handwired/onekey/kb2040/mcuconf.h b/keyboards/handwired/onekey/kb2040/mcuconf.h
new file mode 100644
index 0000000000..57e58e14d7
--- /dev/null
+++ b/keyboards/handwired/onekey/kb2040/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/handwired/onekey/kb2040/readme.md b/keyboards/handwired/onekey/kb2040/readme.md
new file mode 100644
index 0000000000..54ea25a6a5
--- /dev/null
+++ b/keyboards/handwired/onekey/kb2040/readme.md
@@ -0,0 +1,10 @@
+# Adafruit KB2040 onekey with OLED
+
+To trigger keypress, short together pins *GP4* and *GP5*.
+
+Double-tap reset to enter bootloader mode. Copy the built uf2 file to the device by dragging the file to the new USB disk.
+
+## Supported Hardware
+
+* [Adafruit KB2040 - RP2040 Kee Boar](https://www.adafruit.com/product/5302)
+* Optional [128x32 OLED display on the Stemma QT port](https://www.adafruit.com/product/4440)
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
new file mode 100644
index 0000000000..624b331bf8
--- /dev/null
+++ b/keyboards/handwired/onekey/kb2040/rules.mk
@@ -0,0 +1,9 @@
+# MCU name
+MCU = RP2040
+BOOTLOADER = rp2040
+
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+
+OPT_DEFS += -DHAL_USE_I2C=TRUE
+

From 897403c4a71080469b8c11fc87e0e145ffe3837a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 6 Aug 2022 07:14:29 +0100
Subject: [PATCH 162/959] Publish data as part of API generation (#17020)

---
 .github/workflows/api.yml          |  3 ++
 .github/workflows/develop_api.yml  |  3 ++
 lib/python/qmk/cli/generate/api.py | 47 ++++++++++++++++++------------
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index 9d850080a6..dd3fbdaa92 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -7,6 +7,9 @@ on:
     paths:
     - 'keyboards/**'
     - 'layouts/community/**'
+    - 'lib/python/**'
+    - 'data/**'
+    - '.github/workflows/api.yml'
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/develop_api.yml b/.github/workflows/develop_api.yml
index ebc1b545b7..194305e730 100644
--- a/.github/workflows/develop_api.yml
+++ b/.github/workflows/develop_api.yml
@@ -7,6 +7,9 @@ on:
     paths:
     - 'keyboards/**'
     - 'layouts/community/**'
+    - 'lib/python/**'
+    - 'data/**'
+    - '.github/workflows/develop_api.yml'
   workflow_dispatch:
 
 jobs:
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 0596b3f22b..8d8ca3cd41 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -12,29 +12,14 @@ from qmk.json_encoders import InfoJSONEncoder
 from qmk.json_schema import json_load
 from qmk.keyboard import find_readme, list_keyboards
 
-TEMPLATE_PATH = Path('data/templates/api/')
+DATA_PATH = Path('data')
+TEMPLATE_PATH = DATA_PATH / 'templates/api/'
 BUILD_API_PATH = Path('.build/api_data/')
 
 
-@cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Don't write the data to disk.")
-@cli.argument('-f', '--filter', arg_only=True, action='append', default=[], help="Filter the list of keyboards based on partial name matches the supplied value. May be passed multiple times.")
-@cli.subcommand('Creates a new keymap for the keyboard of your choosing', hidden=False if cli.config.user.developer else True)
-def generate_api(cli):
-    """Generates the QMK API data.
+def _filtered_keyboard_list():
+    """Perform basic filtering of list_keyboards
     """
-    if BUILD_API_PATH.exists():
-        shutil.rmtree(BUILD_API_PATH)
-
-    shutil.copytree(TEMPLATE_PATH, BUILD_API_PATH)
-
-    v1_dir = BUILD_API_PATH / 'v1'
-    keyboard_all_file = v1_dir / 'keyboards.json'  # A massive JSON containing everything
-    keyboard_list_file = v1_dir / 'keyboard_list.json'  # A simple list of keyboard targets
-    keyboard_aliases_file = v1_dir / 'keyboard_aliases.json'  # A list of historical keyboard names and their new name
-    keyboard_metadata_file = v1_dir / 'keyboard_metadata.json'  # All the data configurator/via needs for initialization
-    usb_file = v1_dir / 'usb.json'  # A mapping of USB VID/PID -> keyboard target
-
-    # Filter down when required
     keyboard_list = list_keyboards()
     if cli.args.filter:
         kb_list = []
@@ -42,6 +27,30 @@ def generate_api(cli):
             if any(i in keyboard_name for i in cli.args.filter):
                 kb_list.append(keyboard_name)
         keyboard_list = kb_list
+    return keyboard_list
+
+
+@cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Don't write the data to disk.")
+@cli.argument('-f', '--filter', arg_only=True, action='append', default=[], help="Filter the list of keyboards based on partial name matches the supplied value. May be passed multiple times.")
+@cli.subcommand('Generate QMK API data', hidden=False if cli.config.user.developer else True)
+def generate_api(cli):
+    """Generates the QMK API data.
+    """
+    v1_dir = BUILD_API_PATH / 'v1'
+    keyboard_all_file = v1_dir / 'keyboards.json'  # A massive JSON containing everything
+    keyboard_list_file = v1_dir / 'keyboard_list.json'  # A simple list of keyboard targets
+    keyboard_aliases_file = v1_dir / 'keyboard_aliases.json'  # A list of historical keyboard names and their new name
+    keyboard_metadata_file = v1_dir / 'keyboard_metadata.json'  # All the data configurator/via needs for initialization
+    usb_file = v1_dir / 'usb.json'  # A mapping of USB VID/PID -> keyboard target
+
+    if BUILD_API_PATH.exists():
+        shutil.rmtree(BUILD_API_PATH)
+
+    shutil.copytree(TEMPLATE_PATH, BUILD_API_PATH)
+    shutil.copytree(DATA_PATH, v1_dir)
+
+    # Filter down when required
+    keyboard_list = _filtered_keyboard_list()
 
     kb_all = {}
     usb_list = {}

From ed9bdcbc3608819e17ff7a11221e651bf51ec1cc Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Sat, 6 Aug 2022 10:46:59 +0200
Subject: [PATCH 163/959] [Core] guard RPC invocation by checking RPC info
 against crc checksum (#17840)

---
 quantum/split_common/transactions.c | 18 ++++++++++++------
 quantum/split_common/transport.h    |  9 ++++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 9e3df534e3..719068908f 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -694,7 +694,7 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
         [PUT_RPC_INFO]  = trans_initiator2target_initializer_cb(rpc_info, slave_rpc_info_callback),
     [PUT_RPC_REQ_DATA]  = trans_initiator2target_initializer(rpc_m2s_buffer),
-    [EXECUTE_RPC]       = trans_initiator2target_initializer_cb(rpc_info.transaction_id, slave_rpc_exec_callback),
+    [EXECUTE_RPC]       = trans_initiator2target_initializer_cb(rpc_info.payload.transaction_id, slave_rpc_exec_callback),
     [GET_RPC_RESP_DATA] = trans_target2initiator_initializer(rpc_s2m_buffer),
 #endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 };
@@ -760,7 +760,8 @@ bool transaction_rpc_exec(int8_t transaction_id, uint8_t initiator2target_buffer
     if (target2initiator_buffer_size > RPC_S2M_BUFFER_SIZE) return false;
 
     // Prepare the metadata block
-    rpc_sync_info_t info = {.transaction_id = transaction_id, .m2s_length = initiator2target_buffer_size, .s2m_length = target2initiator_buffer_size};
+    rpc_sync_info_t info = {.payload = {.transaction_id = transaction_id, .m2s_length = initiator2target_buffer_size, .s2m_length = target2initiator_buffer_size}};
+    info.checksum        = crc8(&info.payload, sizeof(info.payload));
 
     // Make sure the local side knows that we're not sending the full block of data
     split_transaction_table[PUT_RPC_REQ_DATA].initiator2target_buffer_size  = initiator2target_buffer_size;
@@ -791,18 +792,23 @@ void slave_rpc_info_callback(uint8_t initiator2target_buffer_size, const void *i
     // Ignore the args -- the `split_shmem` already has the info, we just need to act upon it.
     // We must keep the `split_transaction_table` non-const, so that it is able to be modified at runtime.
 
-    split_transaction_table[PUT_RPC_REQ_DATA].initiator2target_buffer_size  = split_shmem->rpc_info.m2s_length;
-    split_transaction_table[GET_RPC_RESP_DATA].target2initiator_buffer_size = split_shmem->rpc_info.s2m_length;
+    split_transaction_table[PUT_RPC_REQ_DATA].initiator2target_buffer_size  = split_shmem->rpc_info.payload.m2s_length;
+    split_transaction_table[GET_RPC_RESP_DATA].target2initiator_buffer_size = split_shmem->rpc_info.payload.s2m_length;
 }
 
 void slave_rpc_exec_callback(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer) {
     // We can assume that the buffer lengths are correctly set, now, given that sequentially the rpc_info callback was already executed.
     // Go through the rpc_info and execute _that_ transaction's callback, with the scratch buffers as inputs.
-    int8_t transaction_id = split_shmem->rpc_info.transaction_id;
+    // As a safety precaution we check that the received payload matches its checksum first.
+    if (crc8(&split_shmem->rpc_info.payload, sizeof(split_shmem->rpc_info.payload)) != split_shmem->rpc_info.checksum) {
+        return;
+    }
+
+    int8_t transaction_id = split_shmem->rpc_info.payload.transaction_id;
     if (transaction_id < NUM_TOTAL_TRANSACTIONS) {
         split_transaction_desc_t *trans = &split_transaction_table[transaction_id];
         if (trans->slave_callback) {
-            trans->slave_callback(split_shmem->rpc_info.m2s_length, split_shmem->rpc_m2s_buffer, split_shmem->rpc_info.s2m_length, split_shmem->rpc_s2m_buffer);
+            trans->slave_callback(split_shmem->rpc_info.payload.m2s_length, split_shmem->rpc_m2s_buffer, split_shmem->rpc_info.payload.s2m_length, split_shmem->rpc_s2m_buffer);
         }
     }
 }
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index e62679990a..06778ad14a 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -116,9 +116,12 @@ typedef struct _split_slave_pointing_sync_t {
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 typedef struct _rpc_sync_info_t {
-    int8_t  transaction_id;
-    uint8_t m2s_length;
-    uint8_t s2m_length;
+    uint8_t checksum;
+    struct {
+        int8_t  transaction_id;
+        uint8_t m2s_length;
+        uint8_t s2m_length;
+    } payload;
 } rpc_sync_info_t;
 #endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 

From f27b617f36d55ac5469247016a1b79304f892366 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Sat, 6 Aug 2022 12:51:13 +0200
Subject: [PATCH 164/959] [Core] Process all changed keys in one scan loop,
 deprecate `QMK_KEYS_PER_SCAN` (#15292)

---
 data/mappings/info_config.json                |   2 +-
 docs/config_options.md                        |   9 --
 docs/ja/config_options.md                     |   2 -
 .../gherkin/keymaps/stevexyz/config.h         |   2 -
 keyboards/ai03/jp60/keymaps/default/config.h  |  20 ---
 keyboards/ai03/jp60/keymaps/via/config.h      |  20 ---
 keyboards/bioi/morgan65/config.h              |   2 -
 keyboards/doio/kb16/config.h                  |   3 -
 .../dztech/dz60rgb/keymaps/kgreulich/config.h |   2 -
 .../dz60rgb/keymaps/matthewrobo/config.h      |   2 -
 .../dztech/dz60rgb/keymaps/xunz/config.h      |   2 -
 .../dz65rgb/keymaps/matthewrobo/config.h      |   2 -
 .../dztech/dz65rgb/keymaps/yuannan/config.h   |   2 -
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c |   2 -
 .../ergodox_ez/keymaps/hacker_dvorak/config.h |   1 -
 .../ergodox_ez/keymaps/rgb_layer/config.h     |   6 +-
 keyboards/ergodox_ez/keymaps/rmw/config.h     |   1 -
 .../eternal_keypad/keymaps/kyek/config.h      |   2 -
 keyboards/gmmk/gmmk2/p96/config.h             |   4 -
 keyboards/gmmk/pro/config.h                   |   3 -
 keyboards/gopolar/gg86/config.h               |   3 -
 keyboards/handwired/marauder/config.h         |   2 +-
 keyboards/handwired/xealous/config.h          |   1 -
 .../chinese_pcb/black_e65/config.h            |   3 -
 .../chinese_pcb/devil68_pro/config.h          |   3 -
 keyboards/horrortroll/handwired_k552/config.h |   3 -
 keyboards/horrortroll/lemon40/config.h        |   3 -
 keyboards/horrortroll/paws60/config.h         |   3 -
 keyboards/ianklug/grooveboard/config.h        |   2 -
 keyboards/jadookb/jkb2/keymaps/via/config.h   |  19 ---
 keyboards/jadookb/jkb65/keymaps/via/config.h  |  19 ---
 .../kbd67/mkiirgb/keymaps/dnsnrk/config.h     |   2 -
 .../mkiirgb/keymaps/pascalpfeil/config.h      |   3 -
 .../keystonecaps/gameroyadvance/config.h      |   4 -
 .../bm40hsrgb/keymaps/34keys/config.h         |   5 +-
 .../bm40hsrgb/keymaps/gabustoledo/config.h    |   3 -
 .../bm68hsrgb/rev1/keymaps/peepeetee/config.h |   1 -
 .../bm80hsrgb/keymaps/peepeetee/config.h      |   1 -
 .../kprepublic/jj40/keymaps/stevexyz/config.h |   2 -
 keyboards/lets_split/keymaps/piemod/config.h  |   3 -
 .../lfkpad/keymaps/pascalpfeil/config.h       |   3 -
 .../minidox/keymaps/norman/config.h           |   1 -
 keyboards/massdrop/alt/keymaps/b_/config.h    |   1 -
 .../massdrop/alt/keymaps/pregame/config.h     |   1 -
 .../massdrop/ctrl/keymaps/endgame/config.h    |   1 -
 .../ctrl/keymaps/matthewrobo/config.h         |   1 -
 .../massdrop/ctrl/keymaps/xanimos/config.h    |   1 -
 keyboards/ml/gas75/config.h                   |   3 -
 keyboards/mmkzoo65/config.h                   |   1 -
 keyboards/mss_studio/m63_rgb/config.h         |   3 -
 keyboards/mss_studio/m64_rgb/config.h         |   3 -
 .../mw65_rgb/keymaps/horrortroll/config.h     |   4 -
 .../mw65_rgb/keymaps/thearesia/config.h       |   4 -
 keyboards/pierce/keymaps/durken1/config.h     |   4 -
 .../rgbkb/zen/rev1/keymaps/cwebster2/config.h |   2 -
 keyboards/sanctified/dystopia/config.h        |   2 -
 .../signum/3_0/keymaps/sgurenkov/config.h     |   3 -
 keyboards/skme/zeno/config.h                  |   3 -
 keyboards/sofle/keymaps/killmaster/config.h   |   1 -
 .../splitkb/kyria/keymaps/cwebster2/config.h  |   2 -
 keyboards/synthlabs/solo/config.h             |   2 -
 .../xelus/dharma/keymaps/default/config.h     |  18 ---
 keyboards/xelus/dharma/keymaps/via/config.h   |  18 ---
 .../xelus/kangaroo/keymaps/default/config.h   |  18 ---
 keyboards/xelus/kangaroo/keymaps/via/config.h |  18 ---
 .../xelus/la_plus/keymaps/default/config.h    |  19 ---
 keyboards/xelus/la_plus/keymaps/via/config.h  |   2 -
 .../pachi/mini_32u4/keymaps/default/config.h  |  18 ---
 .../pachi/mini_32u4/keymaps/via/config.h      |   2 -
 .../xelus/pachi/rev1/keymaps/default/config.h |  18 ---
 .../xelus/pachi/rev1/keymaps/via/config.h     |   2 -
 .../xelus/pachi/rgb/keymaps/default/config.h  |  18 ---
 .../xelus/pachi/rgb/keymaps/via/config.h      |   2 -
 keyboards/xelus/rs60/keymaps/default/config.h |  18 ---
 keyboards/xelus/rs60/keymaps/via/config.h     |  18 ---
 .../xelus/valor/rev2/keymaps/default/config.h |  18 ---
 .../xelus/valor/rev2/keymaps/via/config.h     |   2 -
 .../valor_frl_tkl/keymaps/default/config.h    |  18 ---
 .../xelus/valor_frl_tkl/keymaps/via/config.h  |  18 ---
 keyboards/xelus/xs60/keymaps/default/config.h |  18 ---
 keyboards/xelus/xs60/keymaps/via/config.h     |   2 -
 .../xiudi/xd75/keymaps/tdl-jturner/config.h   |   1 -
 .../65_ansi_blocker/brandonschlack/config.h   |   2 -
 .../brandonschlack-split/config.h             |   2 -
 quantum/keyboard.c                            | 146 ++++++++++--------
 quantum/keyboard.h                            |   8 +-
 tests/basic/test_keypress.cpp                 |  22 ---
 tests/tap_dance/test_examples.cpp             |   3 +-
 users/curry/config.h                          |   4 -
 users/drashna/post_config.h                   |   4 -
 users/ishtob/config.h                         |   1 -
 users/issmirnov/config.h                      |   3 -
 users/kuchosauronad0/config.h                 |   4 -
 users/miles2go/config.h                       |   4 -
 users/yet-another-developer/config.h          |   4 -
 users/zer09/config.h                          |   4 -
 96 files changed, 90 insertions(+), 607 deletions(-)
 delete mode 100644 keyboards/ai03/jp60/keymaps/default/config.h
 delete mode 100644 keyboards/ai03/jp60/keymaps/via/config.h
 delete mode 100644 keyboards/jadookb/jkb2/keymaps/via/config.h
 delete mode 100644 keyboards/jadookb/jkb65/keymaps/via/config.h
 delete mode 100644 keyboards/xelus/dharma/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/dharma/keymaps/via/config.h
 delete mode 100644 keyboards/xelus/kangaroo/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/kangaroo/keymaps/via/config.h
 delete mode 100644 keyboards/xelus/la_plus/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/pachi/rev1/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/pachi/rgb/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/rs60/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/rs60/keymaps/via/config.h
 delete mode 100644 keyboards/xelus/valor/rev2/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
 delete mode 100644 keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
 delete mode 100644 keyboards/xelus/xs60/keymaps/default/config.h

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 3891ef6437..d03f50c51e 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -82,7 +82,6 @@
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"},
     "QMK_ESC_OUTPUT": {"info_key": "qmk_lufa_bootloader.esc_output"},
     "QMK_ESC_INPUT": {"info_key": "qmk_lufa_bootloader.esc_input"},
-    "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int"},
     "QMK_LED": {"info_key": "qmk_lufa_bootloader.led"},
     "QMK_SPEAKER": {"info_key": "qmk_lufa_bootloader.speaker"},
     "SECURE_UNLOCK_SEQUENCE": {"info_key": "secure.unlock_sequence", "value_type": "array.array.int", "to_json": false},
@@ -114,4 +113,5 @@
     "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true},
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
     "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool", "deprecated": true},
+    "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
 }
diff --git a/docs/config_options.md b/docs/config_options.md
index f50748b950..c0a150e405 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -182,15 +182,6 @@ If you define these options you will enable the associated feature, which may in
   * how long before oneshot times out
 * `#define ONESHOT_TAP_TOGGLE 2`
   * how many taps before oneshot toggle is triggered
-* `#define QMK_KEYS_PER_SCAN 4`
-  * Allows sending more than one key per scan. By default, only one key event gets
-    sent via `process_record()` per scan. This has little impact on most typing, but
-    if you're doing a lot of chords, or your scan rate is slow to begin with, you can
-    have some delay in processing key events. Each press and release is a separate
-    event. For a keyboard with 1ms or so scan times, even a very fast typist isn't
-    going to produce the 500 keystrokes a second needed to actually get more than a
-    few ms of delay from this. But if you're doing chording on something with 3-4ms
-    scan times? You probably want this.
 * `#define COMBO_COUNT 2`
   * Set this to the number of combos that you're using in the [Combo](feature_combo.md) feature. Or leave it undefined and programmatically set the count.
 * `#define COMBO_TERM 200`
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index 5236230a10..c95753bd5d 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -181,8 +181,6 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * ワンショットがタイムアウトするまでの時間
 * `#define ONESHOT_TAP_TOGGLE 2`
   * ワンショットトグルが引き起こされるまでのタップ数
-* `#define QMK_KEYS_PER_SCAN 4`
-  * 走査ごとに1つ以上のキーを送信できるようにします。デフォルトでは、走査ごとに `process_record()` 経由で1つのキーイベントのみが送信されます。これはほとんどのタイピングにほとんど影響しませんが、多くのコードを入力しているか、走査レートが最初から遅い場合、キーイベントの処理に多少の遅延が生じる可能性があります。それぞれのプレスとリリースは別のイベントです。スキャン時間が 1ms 程度のキーボードの場合、とても高速なタイピストでさえ、実際にキーボードから数 ms 以上の遅延を発生させるのに必要な 500 キーストロークを1秒間に生成することはないでしょう。しかし、3～4ms の走査時間でコードを入力している場合はどうでしょうか？おそらくこれが必要です。
 * `#define COMBO_COUNT 2`
   * [コンボ](ja/feature_combo.md)機能で使っているコンボの数にこれを設定します。
 * `#define COMBO_TERM 200`
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
index c708babf16..d837be8ba1 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
@@ -39,8 +39,6 @@
         // how long before oneshot times out
     #define ONESHOT_TAP_TOGGLE 2
         // how many taps before oneshot toggle is triggered
-    #define QMK_KEYS_PER_SCAN 4
-        // Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
     #define COMBO_COUNT 2
         // Set this to the number of combos that you're using in the Combo feature.
     #define COMBO_TERM 200
diff --git a/keyboards/ai03/jp60/keymaps/default/config.h b/keyboards/ai03/jp60/keymaps/default/config.h
deleted file mode 100644
index 9e0623524a..0000000000
--- a/keyboards/ai03/jp60/keymaps/default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 ai03
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Increase scan quantity for improved performance */
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/ai03/jp60/keymaps/via/config.h b/keyboards/ai03/jp60/keymaps/via/config.h
deleted file mode 100644
index 9e0623524a..0000000000
--- a/keyboards/ai03/jp60/keymaps/via/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 ai03
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Increase scan quantity for improved performance */
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index e4ad58c3a7..2ce3c7a56b 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { E6, C6, F4, B2, D4 }
 #define MATRIX_COL_PINS { F5, F6, F7, C7, B0, B7, B5, D5, B4, D7, D6, D1, D0, B3 }
 
-//#define QMK_KEYS_PER_SCAN 4
-
 /* Backlight Setup */
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 12
diff --git a/keyboards/doio/kb16/config.h b/keyboards/doio/kb16/config.h
index 043a492006..911ba9d3d5 100644
--- a/keyboards/doio/kb16/config.h
+++ b/keyboards/doio/kb16/config.h
@@ -39,9 +39,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Larger keys per scan */
-#define QMK_KEYS_PER_SCAN 12
-
 /* Use the custom font */
 #define OLED_FONT_H "lib/glcdfont.c"
 
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
index fc836b5ebb..e3250acef1 100644
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
@@ -7,8 +7,6 @@
 #define TAP_HOLD_CAPS_DELAY 0
 #define USB_POLLING_INTERVAL_MS 1
 
-#define QMK_KEYS_PER_SCAN 4
-
 // some speed shit
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
index c2b14f5284..ca64eeb69b 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
@@ -51,8 +51,6 @@
 // #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define QMK_KEYS_PER_SCAN 4
-
 // #define RGB_MATRIX_KEYRELEASES
 
 // some speed shit
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
index cfeba003bd..2fdb3e5f4c 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
@@ -46,8 +46,6 @@
 // #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define QMK_KEYS_PER_SCAN 4
-
 // #define RGB_MATRIX_KEYRELEASES
 
 #define NO_ACTION_ONESHOT
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
index 586e5765aa..25842ac186 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
@@ -47,8 +47,6 @@
 // #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define QMK_KEYS_PER_SCAN 4
-
 // #define RGB_MATRIX_KEYRELEASES
 
 // some speed shit
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h b/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
index 0a005cbca3..ef5023f8c6 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
@@ -30,8 +30,6 @@
 #define RGB_MATRIX_VAL_STEP 8
 #define RGB_MATRIX_SPD_STEP 8
 
-//#define QMK_KEYS_PER_SCAN 12nn
-
 #define MOUSEKEY_DELAY 	0
 #define MOUSEKEY_INTERVAL 	1
 #define MOUSEKEY_MOVE_DELTA 	1
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index ff9ae77bdd..93b82df8cf 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -20,8 +20,6 @@
 // debounce settings
 // remove these after getting a new keyboard
 // #define DEBOUNCE 50
-// #define QMK_KEYS_PER_SCAN 4
-
 
 enum custom_keycodes {
   PLACEHOLDER = SAFE_RANGE, // can always be here
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
index c35963d842..acd3a44e16 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
@@ -25,7 +25,6 @@
 
 #define LEADER_TIMEOUT 1000
 #define PERMISSIVE_HOLD
-#define QMK_KEYS_PER_SCAN 4
 #define DANCING_TERM 175
 
 #define ONESHOT_TAP_TOGGLE 5
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
index 1913a2d369..84c5adfc9e 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
@@ -2,13 +2,9 @@
 #define KEYMAP_CONFIG_H
 
 
-    #define RGBLIGHT_SLEEP
+#define RGBLIGHT_SLEEP
 
 
-#ifndef QMK_KEYS_PER_SCAN
-#define QMK_KEYS_PER_SCAN 4
-#endif // !QMK_KEYS_PER_SCAN
-
 #define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 
diff --git a/keyboards/ergodox_ez/keymaps/rmw/config.h b/keyboards/ergodox_ez/keymaps/rmw/config.h
index 1ecf8b8b79..1b7528a4a7 100644
--- a/keyboards/ergodox_ez/keymaps/rmw/config.h
+++ b/keyboards/ergodox_ez/keymaps/rmw/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USB_MAX_POWER_CONSUMPTION 500
 
-#define QMK_KEYS_PER_SCAN 4 
 /* Set 0 if debouncing isn't needed */
 #undef  DEBOUNCE
 #define DEBOUNCE 5
diff --git a/keyboards/eternal_keypad/keymaps/kyek/config.h b/keyboards/eternal_keypad/keymaps/kyek/config.h
index 226b16e546..36ab46334c 100644
--- a/keyboards/eternal_keypad/keymaps/kyek/config.h
+++ b/keyboards/eternal_keypad/keymaps/kyek/config.h
@@ -17,5 +17,3 @@
 
 #define ONESHOT_TIMEOUT 2000
 #define FORCE_NKRO
-#define USB_POLLING_INTERVAL_MS 1
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index 1b3a92dd53..fec383c240 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -119,10 +119,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-
-/* Send up to 4 key press events per scan */
-#define QMK_KEYS_PER_SCAN 4
-
 /* Set debounce time to 5ms */
 #define DEBOUNCE 5
 
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index aba69c8872..aea22c5434 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -113,9 +113,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-/* Send up to 4 key press events per scan */
-#define QMK_KEYS_PER_SCAN 4
-
 /* Set debounce time to 5ms */
 #define DEBOUNCE 5
 
diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h
index 7566bd2c3f..7964834623 100644
--- a/keyboards/gopolar/gg86/config.h
+++ b/keyboards/gopolar/gg86/config.h
@@ -35,9 +35,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 /* Use the custom font */
 #define OLED_FONT_H "lib/glcdfont.c"
 
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index fdc269fb7f..a3165c480d 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -36,7 +36,7 @@
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }
 #define DIODE_DIRECTION COL2ROW
 #define LAYER_STATE_8BIT
-#define QMK_KEYS_PER_SCAN 12 // moar gaming code
+
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 7
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index 5c1469b1f0..2502b4d196 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
 #define FORCE_NKRO
 
-#define QMK_KEYS_PER_SCAN 4 //if we press four keys simultaneously, lets process them simultaneously...
 #define DIODE_DIRECTION COL2ROW
 
 
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index f544206b81..bcd38d62c7 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -38,9 +38,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 /* LED Indicator */
 #define LED_CAPS_LOCK_PIN C7
 
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index 82465cf99c..8a227f3c49 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -38,9 +38,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 #ifdef RGB_MATRIX_ENABLE
     #define DRIVER_LED_TOTAL 86
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 09e89b13c4..d3c385f64e 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -39,9 +39,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 /* EEPROM size */
 #define EEPROM_PAGE_SIZE
 #define FEE_PAGE_SIZE 0x800
diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h
index 600ef01657..c3e1972ae3 100644
--- a/keyboards/horrortroll/lemon40/config.h
+++ b/keyboards/horrortroll/lemon40/config.h
@@ -38,9 +38,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Larger keys per scan */
-#define QMK_KEYS_PER_SCAN 12
-
 /* RGB light config */
 #ifdef RGBLIGHT_ENABLE
    
diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h
index 7bd3ac8be3..055a6ae319 100644
--- a/keyboards/horrortroll/paws60/config.h
+++ b/keyboards/horrortroll/paws60/config.h
@@ -37,6 +37,3 @@
 
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
-
-/* Larger keys per scan */
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index 007a86529c..2d255a2c18 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/config.h
@@ -142,5 +142,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/jadookb/jkb2/keymaps/via/config.h b/keyboards/jadookb/jkb2/keymaps/via/config.h
deleted file mode 100644
index 31022ca535..0000000000
--- a/keyboards/jadookb/jkb2/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
- /* Copyright 2021 Wizard-GG
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/jadookb/jkb65/keymaps/via/config.h b/keyboards/jadookb/jkb65/keymaps/via/config.h
deleted file mode 100644
index 9d4eaf74ee..0000000000
--- a/keyboards/jadookb/jkb65/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
- /* Copyright 2021 Wizard-GG
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h
index 25f645f734..bb3409256c 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h
@@ -16,8 +16,6 @@
 #pragma once
 
 /* place overrides here */
-#undef QMK_KEYS_PER_SCAN
-#define QMK_KEYS_PER_SCAN 4
 #undef DEBOUNCE
 #define DEBOUNCE 8
 #undef TAPPING_TOGGLE
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
index 2cd513223a..cda14c4bc0 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
@@ -19,9 +19,6 @@
 /* 1000Hz USB polling */
 #define USB_POLLING_INTERVAL_MS 1
 
-/* Send up to 4 key press events per scan */
-#define QMK_KEYS_PER_SCAN 4
-
 /* Force NKRO on boot up */
 #define FORCE_NKRO
 
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
index b8d5a69122..06b40b5e66 100644
--- a/keyboards/keystonecaps/gameroyadvance/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/config.h
@@ -55,10 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-
-#define QMK_KEYS_PER_SCAN 12
-
 #define RGB_DI_PIN C7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
index 63176adb50..2534ffd554 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
@@ -14,9 +14,6 @@
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define TAPPING_FORCE_HOLD
 
-// Recommended for heavy chording.          
-#define QMK_KEYS_PER_SCAN 4
-
 // Mouse key speed and acceleration.
 #undef MOUSEKEY_DELAY
 #define MOUSEKEY_DELAY          0
@@ -56,4 +53,4 @@
 #    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
 #    undef RGB_MATRIX_STARTUP_MODE
 // #    define RGBLIGHT_HUE_STEP 20
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
index ba18295ead..e71078415a 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
@@ -30,9 +30,6 @@
 #define AUTO_SHIFT_TIMEOUT TAPPING_TERM
 #define AUTO_SHIFT_NO_SETUP
 
-// Recommended for heavy chording.
-#define QMK_KEYS_PER_SCAN 4
-
 // Mouse key speed and acceleration.
 #undef MOUSEKEY_DELAY
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index 0748f83cdc..3ddb813486 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -35,7 +35,6 @@
 // #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 QMK_KEYS_PER_SCAN 4         // Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
 // #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
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index b322afae9b..97cae26cbd 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
@@ -22,7 +22,6 @@
 // #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 QMK_KEYS_PER_SCAN 4         // Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
 // #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
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
index 84c02dddd6..a4d3d37561 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
@@ -34,8 +34,6 @@
         // how long before oneshot times out
     #define ONESHOT_TAP_TOGGLE 2
         // how many taps before oneshot toggle is triggered
-    #define QMK_KEYS_PER_SCAN 4
-        // Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
     #define COMBO_COUNT 2
         // Set this to the number of combos that you're using in the Combo feature.
     #define COMBO_TERM 200
diff --git a/keyboards/lets_split/keymaps/piemod/config.h b/keyboards/lets_split/keymaps/piemod/config.h
index 1b3fd7544e..c3975da3ca 100644
--- a/keyboards/lets_split/keymaps/piemod/config.h
+++ b/keyboards/lets_split/keymaps/piemod/config.h
@@ -42,7 +42,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_SNAKE_LENGTH 1
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 1
 
-// Typing Options
-#define QMK_KEYS_PER_SCAN 4
-
 #endif
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
index a9f61f849c..0f9ddaef31 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
@@ -19,9 +19,6 @@
 /* 1000Hz USB polling */
 #define USB_POLLING_INTERVAL_MS 1
 
-/* Send up to 4 key press events per scan */
-#define QMK_KEYS_PER_SCAN 4
-
 /* Force NKRO on boot up */
 #define FORCE_NKRO
 
diff --git a/keyboards/maple_computing/minidox/keymaps/norman/config.h b/keyboards/maple_computing/minidox/keymaps/norman/config.h
index 0d3542a03e..ecdf080c2c 100644
--- a/keyboards/maple_computing/minidox/keymaps/norman/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/norman/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
 #define PERMISSIVE_HOLD
-#define QMK_KEYS_PER_SCAN 4 
 #define TAPPING_TERM 160
diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
index ca4424bd3f..b7112c9ea7 100644
--- a/keyboards/massdrop/alt/keymaps/b_/config.h
+++ b/keyboards/massdrop/alt/keymaps/b_/config.h
@@ -23,7 +23,6 @@
 // #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 QMK_KEYS_PER_SCAN 4         			// Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
 // #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
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 19fc4fed34..936951e34a 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -36,7 +36,6 @@
 // #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 QMK_KEYS_PER_SCAN 4         			// Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
 // #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
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 4850d7eed2..d0bbfd2103 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -20,7 +20,6 @@
 #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 QMK_KEYS_PER_SCAN 4         // Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
 // #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
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index 81e7764a9e..692faa35a2 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #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 QMK_KEYS_PER_SCAN 4         // Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
 // #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
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index 37987340ce..f1cbd5f3b0 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -36,7 +36,6 @@
 #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 QMK_KEYS_PER_SCAN 4         // Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
 // #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
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h
index 4f35c4c265..82d8c134a0 100644
--- a/keyboards/ml/gas75/config.h
+++ b/keyboards/ml/gas75/config.h
@@ -38,9 +38,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Larger keys per scan */
-#define QMK_KEYS_PER_SCAN 12
-
 /* Encoder pins */
 #define ENCODERS_PAD_A { F0 }
 #define ENCODERS_PAD_B { F1 }
diff --git a/keyboards/mmkzoo65/config.h b/keyboards/mmkzoo65/config.h
index b562a40859..b874fdef8a 100644
--- a/keyboards/mmkzoo65/config.h
+++ b/keyboards/mmkzoo65/config.h
@@ -38,4 +38,3 @@
 
 /* 将USB 轮询速率更改为 1000hz 并为精英游戏每次扫描使用更大的密钥*/
 #define USB_POLLING_INTERVAL_MS  2
-#define QMK_KEYS_PER_SCAN  12
diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
index e2aae8469f..a7220ab1c6 100644
--- a/keyboards/mss_studio/m63_rgb/config.h
+++ b/keyboards/mss_studio/m63_rgb/config.h
@@ -36,9 +36,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 #ifdef RGB_MATRIX_ENABLE
     #define DRIVER_LED_TOTAL 75
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h
index d8ac27024b..c9a1e3f3db 100644
--- a/keyboards/mss_studio/m64_rgb/config.h
+++ b/keyboards/mss_studio/m64_rgb/config.h
@@ -36,9 +36,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change larger keys per scan for elite gaming */
-#define QMK_KEYS_PER_SCAN 12
-
 #ifdef RGB_MATRIX_ENABLE
     #define DRIVER_LED_TOTAL 76
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h
index 13cffea4da..0d2051ffd5 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h
@@ -21,10 +21,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
-#define QMK_KEYS_PER_SCAN 12
-
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
     #undef ENABLE_RGB_MATRIX_BAND_SAT
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h
index ba574e1e3c..fef62c6374 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h
@@ -20,7 +20,3 @@
 
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
-
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
index 7d19a0b83b..bc0bb1c4b8 100644
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ b/keyboards/pierce/keymaps/durken1/config.h
@@ -27,9 +27,6 @@
 
 #define PERMISSIVE_HOLD
 
-// Recommended for heavy chording.
-#define QMK_KEYS_PER_SCAN 4
-
 // Combo settings
 #define COMBO_COUNT 3
 #define COMBO_TERM 35
@@ -74,4 +71,3 @@
 #ifdef AUTO_BUTTONS
   #define AUTO_BUTTONS_TIMEOUT 750
 #endif
-
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
index 211e3517ec..cdffe6fd50 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
@@ -29,6 +29,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define COMBO_COUNT 2
 #endif
 
-#define QMK_KEYS_PER_SCAN 4
-
 #define EE_HANDS
diff --git a/keyboards/sanctified/dystopia/config.h b/keyboards/sanctified/dystopia/config.h
index a818d3e84f..cf9d91d551 100644
--- a/keyboards/sanctified/dystopia/config.h
+++ b/keyboards/sanctified/dystopia/config.h
@@ -27,5 +27,3 @@
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D6, D7, B4 }
 
 #define DIODE_DIRECTION COL2ROW
-
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/config.h b/keyboards/signum/3_0/keymaps/sgurenkov/config.h
index 5f8d0d02b8..7d164aa3a9 100644
--- a/keyboards/signum/3_0/keymaps/sgurenkov/config.h
+++ b/keyboards/signum/3_0/keymaps/sgurenkov/config.h
@@ -29,9 +29,6 @@
 // Auto Shift and Retro Shift (Auto Shift for Tap Hold).
 #define AUTO_SHIFT_TIMEOUT TAPPING_TERM
 
-// Recommended for heavy chording.
-#define QMK_KEYS_PER_SCAN 4
-
 // Mouse key speed and acceleration.
 #undef MOUSEKEY_DELAY
 #define MOUSEKEY_DELAY 0
diff --git a/keyboards/skme/zeno/config.h b/keyboards/skme/zeno/config.h
index a6404a8ff4..53aa1cd621 100644
--- a/keyboards/skme/zeno/config.h
+++ b/keyboards/skme/zeno/config.h
@@ -34,6 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/*Enable 1khz polling by default*/
-#define USB_POLLING_INTERVAL_MS 1
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h
index 2e6abe84e3..9d1de12d5a 100644
--- a/keyboards/sofle/keymaps/killmaster/config.h
+++ b/keyboards/sofle/keymaps/killmaster/config.h
@@ -61,4 +61,3 @@ for more options.
 #define MEDIA_KEY_DELAY 2
 
 #define USB_POLLING_INTERVAL_MS 1
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
index 9a58f7751a..59994e01fa 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
@@ -47,8 +47,6 @@
   #define COMBO_COUNT 5
 #endif
 
-#define QMK_KEYS_PER_SCAN 4
-
 #define EE_HANDS
 
 //#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h
index affb70befc..112d12d1ee 100644
--- a/keyboards/synthlabs/solo/config.h
+++ b/keyboards/synthlabs/solo/config.h
@@ -16,8 +16,6 @@
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 7
 
-#define QMK_KEYS_PER_SCAN 17
-
 /*
  * Force NKRO
  *
diff --git a/keyboards/xelus/dharma/keymaps/default/config.h b/keyboards/xelus/dharma/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/dharma/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/dharma/keymaps/via/config.h b/keyboards/xelus/dharma/keymaps/via/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/dharma/keymaps/via/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/kangaroo/keymaps/default/config.h b/keyboards/xelus/kangaroo/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/kangaroo/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/kangaroo/keymaps/via/config.h b/keyboards/xelus/kangaroo/keymaps/via/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/kangaroo/keymaps/via/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/la_plus/keymaps/default/config.h b/keyboards/xelus/la_plus/keymaps/default/config.h
deleted file mode 100644
index e559a15426..0000000000
--- a/keyboards/xelus/la_plus/keymaps/default/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/la_plus/keymaps/via/config.h b/keyboards/xelus/la_plus/keymaps/via/config.h
index 58c086282c..43760bd281 100644
--- a/keyboards/xelus/la_plus/keymaps/via/config.h
+++ b/keyboards/xelus/la_plus/keymaps/via/config.h
@@ -18,5 +18,3 @@
 
 // Enable RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
index fc3a2bd0b2..47bbf2bf81 100644
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
@@ -18,5 +18,3 @@
 
 // 3 layers or else it will not fit in EEPROM
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rev1/keymaps/default/config.h b/keyboards/xelus/pachi/rev1/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/pachi/rev1/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rev1/keymaps/via/config.h b/keyboards/xelus/pachi/rev1/keymaps/via/config.h
index fc3a2bd0b2..47bbf2bf81 100644
--- a/keyboards/xelus/pachi/rev1/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/rev1/keymaps/via/config.h
@@ -18,5 +18,3 @@
 
 // 3 layers or else it will not fit in EEPROM
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rgb/keymaps/default/config.h b/keyboards/xelus/pachi/rgb/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/pachi/rgb/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/config.h b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
index 1213e7a8f2..0e34ad2c1a 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
@@ -21,5 +21,3 @@
 
 // Enable RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/rs60/keymaps/default/config.h b/keyboards/xelus/rs60/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/rs60/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/rs60/keymaps/via/config.h b/keyboards/xelus/rs60/keymaps/via/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/rs60/keymaps/via/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor/rev2/keymaps/default/config.h b/keyboards/xelus/valor/rev2/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/valor/rev2/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor/rev2/keymaps/via/config.h b/keyboards/xelus/valor/rev2/keymaps/via/config.h
index 490964f272..e7fb31cb23 100644
--- a/keyboards/xelus/valor/rev2/keymaps/via/config.h
+++ b/keyboards/xelus/valor/rev2/keymaps/via/config.h
@@ -20,5 +20,3 @@
 
 // More layers
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h b/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
deleted file mode 100644
index 7b8de5510e..0000000000
--- a/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h b/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
deleted file mode 100644
index 7b8de5510e..0000000000
--- a/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/xs60/keymaps/default/config.h b/keyboards/xelus/xs60/keymaps/default/config.h
deleted file mode 100644
index 5d972dd48c..0000000000
--- a/keyboards/xelus/xs60/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/xs60/keymaps/via/config.h b/keyboards/xelus/xs60/keymaps/via/config.h
index b608adcfc4..8c0ed0c6e3 100644
--- a/keyboards/xelus/xs60/keymaps/via/config.h
+++ b/keyboards/xelus/xs60/keymaps/via/config.h
@@ -17,5 +17,3 @@
 
 // More layers
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h b/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h
index 596aaff665..210c4441c3 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h
@@ -24,7 +24,6 @@
 //#define TAPPING_TERM 200
 #define TAPPING_TOGGLE 2
 //#define PERMISSIVE_HOLD
-//#define QMK_KEYS_PER_SCAN 4
 #define FORCE_NKRO
 
 #define MOUSEKEY_INTERVAL 16
diff --git a/layouts/community/65_ansi_blocker/brandonschlack/config.h b/layouts/community/65_ansi_blocker/brandonschlack/config.h
index ea8ca61901..d7687315ed 100644
--- a/layouts/community/65_ansi_blocker/brandonschlack/config.h
+++ b/layouts/community/65_ansi_blocker/brandonschlack/config.h
@@ -54,8 +54,6 @@
 #    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define QMK_KEYS_PER_SCAN 4
-
 #    define USB_LED_CAPS_LOCK_SCANCODE 30
 #endif
 
diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h
index fe3dcd41c2..38b827ba32 100644
--- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h
+++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h
@@ -54,8 +54,6 @@
 #    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define QMK_KEYS_PER_SCAN 4
-
 #    define USB_LED_CAPS_LOCK_SCANCODE 30
 #endif
 
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 2364e3167b..1c62a43d9d 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -212,6 +212,12 @@ static inline bool has_ghost_in_row(uint8_t row, matrix_row_t rowdata) {
     return false;
 }
 
+#else
+
+static inline bool has_ghost_in_row(uint8_t row, matrix_row_t rowdata) {
+    return false;
+}
+
 #endif
 
 /** \brief matrix_setup
@@ -426,64 +432,74 @@ void switch_events(uint8_t row, uint8_t col, bool pressed) {
 #endif
 }
 
-/** \brief Perform scan of keyboard matrix
- *
- * Any detected changes in state are sent out as part of the processing
+/**
+ * @brief Generates a tick event at a maximum rate of 1KHz that drives the
+ * internal QMK state machine.
  */
-bool matrix_scan_task(void) {
-    static matrix_row_t matrix_prev[MATRIX_ROWS];
-    matrix_row_t        matrix_row    = 0;
-    matrix_row_t        matrix_change = 0;
-#ifdef QMK_KEYS_PER_SCAN
-    uint8_t keys_processed = 0;
-#endif
-
-    uint8_t matrix_changed = matrix_scan();
-    if (matrix_changed) last_matrix_activity_trigger();
-
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        matrix_row    = matrix_get_row(r);
-        matrix_change = matrix_row ^ matrix_prev[r];
-        if (matrix_change) {
-#ifdef MATRIX_HAS_GHOST
-            if (has_ghost_in_row(r, matrix_row)) {
-                continue;
-            }
-#endif
-            if (debug_matrix) matrix_print();
-            matrix_row_t col_mask = 1;
-            for (uint8_t c = 0; c < MATRIX_COLS; c++, col_mask <<= 1) {
-                if (matrix_change & col_mask) {
-                    if (should_process_keypress()) {
-                        action_exec((keyevent_t){
-                            .key = (keypos_t){.row = r, .col = c}, .pressed = (matrix_row & col_mask), .time = (timer_read() | 1) /* time should not be 0 */
-                        });
-                    }
-                    // record a processed key
-                    matrix_prev[r] ^= col_mask;
-
-                    switch_events(r, c, (matrix_row & col_mask));
-
-#ifdef QMK_KEYS_PER_SCAN
-                    // only jump out if we have processed "enough" keys.
-                    if (++keys_processed >= QMK_KEYS_PER_SCAN)
-#endif
-                        // process a key per task call
-                        goto MATRIX_LOOP_END;
-                }
-            }
-        }
-    }
-    // call with pseudo tick event when no real key event.
-#ifdef QMK_KEYS_PER_SCAN
-    // we can get here with some keys processed now.
-    if (!keys_processed)
-#endif
+static inline void generate_tick_event(void) {
+    static uint16_t last_tick = 0;
+    const uint16_t  now       = timer_read();
+    if (TIMER_DIFF_16(now, last_tick) != 0) {
         action_exec(TICK_EVENT);
+        last_tick = now;
+    }
+}
 
-MATRIX_LOOP_END:
+/**
+ * @brief This task scans the keyboards matrix and processes any key presses
+ * that occur.
+ *
+ * @return true Matrix did change
+ * @return false Matrix didn't change
+ */
+static bool matrix_task(void) {
+    static matrix_row_t matrix_previous[MATRIX_ROWS];
+
+    matrix_scan();
+
+    bool matrix_changed = false;
+    for (uint8_t row = 0; row < MATRIX_ROWS && !matrix_changed; row++) {
+        matrix_changed |= matrix_previous[row] ^ matrix_get_row(row);
+    }
 
     matrix_scan_perf_task();
+
+    // Short-circuit the complete matrix processing if it is not necessary
+    if (!matrix_changed) {
+        generate_tick_event();
+        return matrix_changed;
+    }
+
+    if (debug_config.matrix) {
+        matrix_print();
+    }
+
+    const bool process_keypress = should_process_keypress();
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        const matrix_row_t current_row = matrix_get_row(row);
+        const matrix_row_t row_changes = current_row ^ matrix_previous[row];
+
+        if (!row_changes || has_ghost_in_row(row, current_row)) {
+            continue;
+        }
+
+        matrix_row_t col_mask = 1;
+        for (uint8_t col = 0; col < MATRIX_COLS; col++, col_mask <<= 1) {
+            if (row_changes & col_mask) {
+                const bool key_pressed = current_row & col_mask;
+
+                if (process_keypress) {
+                    action_exec(MAKE_KEYEVENT(row, col, key_pressed));
+                }
+
+                switch_events(row, col, key_pressed);
+            }
+        }
+
+        matrix_previous[row] = current_row;
+    }
+
     return matrix_changed;
 }
 
@@ -562,20 +578,12 @@ void quantum_task(void) {
 #endif
 }
 
-/** \brief Keyboard task: Do keyboard routine jobs
- *
- * Do routine keyboard jobs:
- *
- * * scan matrix
- * * handle mouse movements
- * * handle midi commands
- * * light LEDs
- *
- * This is repeatedly called as fast as possible.
- */
+/** \brief Main task that is repeatedly called as fast as possible. */
 void keyboard_task(void) {
-    bool matrix_changed = matrix_scan_task();
-    (void)matrix_changed;
+    const bool matrix_changed = matrix_task();
+    if (matrix_changed) {
+        last_matrix_activity_trigger();
+    }
 
     quantum_task();
 
@@ -597,8 +605,10 @@ void keyboard_task(void) {
 #endif
 
 #ifdef ENCODER_ENABLE
-    bool encoders_changed = encoder_read();
-    if (encoders_changed) last_encoder_activity_trigger();
+    const bool encoders_changed = encoder_read();
+    if (encoders_changed) {
+        last_encoder_activity_trigger();
+    }
 #endif
 
 #ifdef OLED_ENABLE
diff --git a/quantum/keyboard.h b/quantum/keyboard.h
index fe0736a515..86ce65aac1 100644
--- a/quantum/keyboard.h
+++ b/quantum/keyboard.h
@@ -71,9 +71,15 @@ static inline bool IS_RELEASED(keyevent_t event) {
 
 /* Common keyevent object factory */
 #define MAKE_KEYPOS(row_num, col_num) ((keypos_t){.row = (row_num), .col = (col_num)})
+
+/**
+ * @brief Constructs a key event for a pressed or released key.
+ */
 #define MAKE_KEYEVENT(row_num, col_num, press) ((keyevent_t){.key = MAKE_KEYPOS((row_num), (col_num)), .pressed = (press), .time = (timer_read() | 1)})
 
-/* Tick event */
+/**
+ * @brief Constructs a internal tick event that is used to drive the internal QMK state machine.
+ */
 #define TICK_EVENT MAKE_KEYEVENT(KEYLOC_TICK, KEYLOC_TICK, false)
 
 #ifdef ENCODER_MAP_ENABLE
diff --git a/tests/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp
index bb68ced557..6d5b502a00 100644
--- a/tests/basic/test_keypress.cpp
+++ b/tests/basic/test_keypress.cpp
@@ -64,11 +64,7 @@ TEST_F(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) {
 
     key_b.press();
     key_c.press();
-    // Note that QMK only processes one key at a time
-    // See issue #1476 for more information
     EXPECT_REPORT(driver, (key_b.report_code));
-    keyboard_task();
-
     EXPECT_REPORT(driver, (key_b.report_code, key_c.report_code));
     keyboard_task();
 
@@ -76,8 +72,6 @@ TEST_F(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) {
     key_c.release();
     // Note that the first key released is the first one in the matrix order
     EXPECT_REPORT(driver, (key_c.report_code));
-    keyboard_task();
-
     EXPECT_EMPTY_REPORT(driver);
     keyboard_task();
 }
@@ -92,10 +86,7 @@ TEST_F(KeyPress, LeftShiftIsReportedCorrectly) {
     key_lsft.press();
     key_a.press();
 
-    // Unfortunately modifiers are also processed in the wrong order
-    // See issue #1476 for more information
     EXPECT_REPORT(driver, (key_a.report_code));
-    keyboard_task();
     EXPECT_REPORT(driver, (key_a.report_code, key_lsft.report_code));
     keyboard_task();
 
@@ -118,11 +109,7 @@ TEST_F(KeyPress, PressLeftShiftAndControl) {
     key_lsft.press();
     key_lctrl.press();
 
-    // Unfortunately modifiers are also processed in the wrong order
-    // See issue #1476 for more information
     EXPECT_REPORT(driver, (key_lsft.report_code));
-    keyboard_task();
-
     EXPECT_REPORT(driver, (key_lsft.report_code, key_lctrl.report_code));
     keyboard_task();
 
@@ -130,8 +117,6 @@ TEST_F(KeyPress, PressLeftShiftAndControl) {
     key_lctrl.release();
 
     EXPECT_REPORT(driver, (key_lctrl.report_code));
-    keyboard_task();
-
     EXPECT_EMPTY_REPORT(driver);
     keyboard_task();
 }
@@ -145,20 +130,13 @@ TEST_F(KeyPress, LeftAndRightShiftCanBePressedAtTheSameTime) {
 
     key_lsft.press();
     key_rsft.press();
-    // Unfortunately modifiers are also processed in the wrong order
-    // See issue #1476 for more information
     EXPECT_REPORT(driver, (key_lsft.report_code));
-    keyboard_task();
-
     EXPECT_REPORT(driver, (key_lsft.report_code, key_rsft.report_code));
     keyboard_task();
 
     key_lsft.release();
     key_rsft.release();
-
     EXPECT_REPORT(driver, (key_rsft.report_code));
-    keyboard_task();
-
     EXPECT_EMPTY_REPORT(driver);
     keyboard_task();
 }
diff --git a/tests/tap_dance/test_examples.cpp b/tests/tap_dance/test_examples.cpp
index e67e6cb907..6dabc45513 100644
--- a/tests/tap_dance/test_examples.cpp
+++ b/tests/tap_dance/test_examples.cpp
@@ -92,10 +92,9 @@ TEST_F(TapDance, DoubleTapWithMod) {
     key_shift.release();
     key_esc_caps.press();
     EXPECT_REPORT(driver, (KC_LSFT, KC_CAPS));
+    EXPECT_REPORT(driver, (KC_CAPS));
     run_one_scan_loop();
     key_esc_caps.release();
-    EXPECT_REPORT(driver, (KC_LSFT));
-    run_one_scan_loop();
     EXPECT_EMPTY_REPORT(driver);
     run_one_scan_loop();
 }
diff --git a/users/curry/config.h b/users/curry/config.h
index 3301ebe533..0c96293bd5 100644
--- a/users/curry/config.h
+++ b/users/curry/config.h
@@ -65,10 +65,6 @@
 #    define ONESHOT_TIMEOUT 3000
 #endif  // !ONESHOT_TIMEOUT
 
-#if !defined(QMK_KEYS_PER_SCAN)
-#    define QMK_KEYS_PER_SCAN 4
-#endif  // !QMK_KEYS_PER_SCAN
-
 #define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index 2d5e6438d6..85c028076e 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -37,10 +37,6 @@
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_REST_MODE
 #endif
 
-#ifndef QMK_KEYS_PER_SCAN
-#    define QMK_KEYS_PER_SCAN 8
-#endif
-
 #ifdef MOUSEKEY_ENABLE
 // mouse movement config
 #    ifdef MK_3_SPEED
diff --git a/users/ishtob/config.h b/users/ishtob/config.h
index 6c07d2f2fd..695077528c 100755
--- a/users/ishtob/config.h
+++ b/users/ishtob/config.h
@@ -16,7 +16,6 @@
 //#define LEADER_TIMEOUT 300
 //#define BACKLIGHT_BREATHING
 //#define PERMISSIVE_HOLD
-// #define QMK_KEYS_PER_SCAN 4
 
 //audio clicky
   //#define AUDIO_CLICKY
diff --git a/users/issmirnov/config.h b/users/issmirnov/config.h
index 664ebfe8a3..5fe78f7a53 100644
--- a/users/issmirnov/config.h
+++ b/users/issmirnov/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-// Allows sending more than one key per scan. Useful for chords.
-#define QMK_KEYS_PER_SCAN 4
-
 // how long before a tap becomes a hold
 #undef TAPPING_TERM
 #define TAPPING_TERM 100
diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h
index 58542dc184..8502031f02 100644
--- a/users/kuchosauronad0/config.h
+++ b/users/kuchosauronad0/config.h
@@ -41,10 +41,6 @@
 #  define ONESHOT_TIMEOUT 3000
 #endif// !ONESHOT_TIMEOUT
 
-#ifndef QMK_KEYS_PER_SCAN
-#  define QMK_KEYS_PER_SCAN 4
-#endif // !QMK_KEYS_PER_SCAN
-
 #if defined(LEADER_ENABLE)
 #  define LEADER_PER_KEY_TIMING
 #  define LEADER_TIMEOUT 250
diff --git a/users/miles2go/config.h b/users/miles2go/config.h
index a704df4b55..2a1d6504d6 100644
--- a/users/miles2go/config.h
+++ b/users/miles2go/config.h
@@ -6,10 +6,6 @@
 #define RGBLIGHT_EFFECT_BREATHING
 #endif // RGBLIGHT_ENABLE
 
-#ifndef QMK_KEYS_PER_SCAN
-#define QMK_KEYS_PER_SCAN 4
-#endif // !QMK_KEYS_PER_SCAN
-
 #undef FORCE_NKRO
 
 #ifndef TAPPING_TOGGLE
diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h
index d46d487fe3..6d1bf83f0b 100644
--- a/users/yet-another-developer/config.h
+++ b/users/yet-another-developer/config.h
@@ -11,10 +11,6 @@
     #define ONESHOT_TIMEOUT 2000
 #endif  // !ONESHOT_TIMEOUT
 
-#ifndef QMK_KEYS_PER_SCAN
-  #define QMK_KEYS_PER_SCAN 4
-#endif // !QMK_KEYS_PER_SCAN
-
 #if defined(LEADER_ENABLE)
   #define LEADER_PER_KEY_TIMING
   #define LEADER_TIMEOUT 250
diff --git a/users/zer09/config.h b/users/zer09/config.h
index c5ab32f8d4..0324aaa7d3 100644
--- a/users/zer09/config.h
+++ b/users/zer09/config.h
@@ -1,10 +1,6 @@
 #ifndef USERSPACE_CONFIG_H
 #define USERSPACE_CONFIG_H
 
-#ifndef QMK_KEYS_PER_SCAN
-#define QMK_KEYS_PER_SCAN 4
-#endif // !QMK_KEYS_PER_SCAN
-
 // this makes it possible to do rolling combos (zx) with keys that
 // convert to other keys on hold (z becomes ctrl when you hold it,
 // and when this option isn't enabled, z rapidly followed by x

From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 6 Aug 2022 23:23:35 +1000
Subject: [PATCH 165/959] Remove `UNUSED_PINS` (#17931)

---
 data/mappings/info_config.json                    |  1 +
 data/schemas/keyboard.jsonschema                  |  5 ++---
 docs/config_options.md                            | 12 +++++-------
 keyboards/0_sixty/config.h                        |  1 -
 keyboards/0xc7/61key/config.h                     |  1 -
 keyboards/0xcb/static/config.h                    |  1 -
 keyboards/10bleoledhub/config.h                   |  1 -
 keyboards/1upkeyboards/1up60hse/config.h          |  1 -
 keyboards/1upkeyboards/1up60hte/config.h          |  1 -
 keyboards/1upkeyboards/1up60rgb/config.h          |  1 -
 keyboards/1upkeyboards/super16/config.h           |  1 -
 keyboards/1upkeyboards/super16v2/config.h         |  1 -
 keyboards/1upkeyboards/sweet16/v1/config.h        |  1 -
 .../1upkeyboards/sweet16/v2/promicro/config.h     |  1 -
 .../1upkeyboards/sweet16/v2/proton_c/config.h     |  1 -
 keyboards/25keys/aleth42/rev0/config.h            |  1 -
 keyboards/25keys/aleth42/rev1/config.h            |  1 -
 keyboards/25keys/cassette42/config.h              |  1 -
 keyboards/2key2crawl/config.h                     |  1 -
 keyboards/30wer/config.h                          |  1 -
 keyboards/3keyecosystem/2key2/config.h            |  1 -
 keyboards/3w6/rev1/config.h                       |  2 --
 keyboards/3w6/rev2/config.h                       |  2 --
 keyboards/40percentclub/25/config.h               |  1 -
 keyboards/40percentclub/4pack/config.h            |  1 -
 keyboards/40percentclub/4x4/config.h              |  1 -
 keyboards/40percentclub/5x5/config.h              |  1 -
 keyboards/40percentclub/6lit/config.h             |  1 -
 keyboards/40percentclub/foobar/config.h           |  1 -
 keyboards/40percentclub/gherkin/config.h          |  1 -
 keyboards/40percentclub/half_n_half/config.h      |  1 -
 keyboards/40percentclub/i75/promicro/config.h     |  1 -
 keyboards/40percentclub/i75/teensy2/config.h      |  1 -
 keyboards/40percentclub/luddite/config.h          |  1 -
 keyboards/40percentclub/mf68/config.h             |  1 -
 .../40percentclub/mf68/keymaps/mf68_ble/config.h  |  2 --
 keyboards/40percentclub/nano/config.h             |  1 -
 keyboards/40percentclub/nein/config.h             |  1 -
 keyboards/40percentclub/nori/config.h             |  1 -
 .../40percentclub/polyandry/promicro/config.h     |  1 -
 .../40percentclub/polyandry/teensy2/config.h      |  1 -
 keyboards/40percentclub/sixpack/config.h          |  1 -
 keyboards/40percentclub/tomato/config.h           |  1 -
 keyboards/40percentclub/ut47/config.h             |  1 -
 keyboards/45_ats/config.h                         |  1 -
 keyboards/4by3/config.h                           |  1 -
 keyboards/9key/config.h                           |  1 -
 keyboards/a_dux/config.h                          |  1 -
 keyboards/abacus/config.h                         |  1 -
 keyboards/abatskeyboardclub/nayeon/config.h       |  1 -
 keyboards/abstract/ellipse/rev1/config.h          |  1 -
 keyboards/acekeyboard/titan60/config.h            |  1 -
 keyboards/acheron/elongate/beta/config.h          |  1 -
 keyboards/acheron/shark/alpha/config.h            |  1 -
 keyboards/ada/infinity81/config.h                 |  1 -
 keyboards/adelheid/config.h                       |  1 -
 keyboards/adpenrose/kintsugi/config.h             |  1 -
 keyboards/aeboards/aegis/config.h                 |  1 -
 keyboards/aeboards/constellation/rev1/config.h    |  1 -
 keyboards/aeboards/constellation/rev2/config.h    |  1 -
 keyboards/aeboards/ext65/rev1/config.h            |  1 -
 keyboards/ai03/equinox/config.h                   |  1 -
 keyboards/ai03/jp60/config.h                      |  1 -
 keyboards/ai03/lunar/config.h                     |  1 -
 keyboards/ai03/orbit/config.h                     |  1 -
 keyboards/ai03/orbit_x/config.h                   |  1 -
 keyboards/ai03/polaris/config.h                   |  1 -
 keyboards/ai03/quasar/config.h                    |  1 -
 keyboards/ai03/soyuz/config.h                     |  1 -
 keyboards/ai03/voyager60_alps/config.h            |  1 -
 keyboards/akb/raine/config.h                      |  1 -
 keyboards/alf/dc60/config.h                       |  1 -
 keyboards/alf/x11/config.h                        |  1 -
 keyboards/alf/x2/config.h                         |  1 -
 keyboards/alpha/config.h                          |  1 -
 keyboards/alps64/config.h                         |  1 -
 keyboards/amag23/config.h                         |  1 -
 keyboards/amjkeyboard/amj40/config.h              |  1 -
 keyboards/amjkeyboard/amj60/config.h              |  1 -
 keyboards/amjkeyboard/amj66/config.h              |  1 -
 keyboards/amjkeyboard/amj84/config.h              |  1 -
 keyboards/amjkeyboard/amj96/config.h              |  1 -
 keyboards/amjkeyboard/amjpad/config.h             |  1 -
 keyboards/anavi/macropad8/config.h                |  1 -
 keyboards/ano/config.h                            |  1 -
 keyboards/anomalykb/a65i/config.h                 |  1 -
 keyboards/aos/tkl/config.h                        |  1 -
 keyboards/aplyard/aplx6/rev1/config.h             |  1 -
 keyboards/aplyard/aplx6/rev2/config.h             |  1 -
 keyboards/ares/config.h                           |  1 -
 keyboards/arisu/config.h                          |  1 -
 keyboards/arrayperipherals/1x4p1/config.h         |  1 -
 keyboards/ash1800/config.h                        |  1 -
 keyboards/ash_xiix/config.h                       |  1 -
 keyboards/ashpil/modelm_usbc/config.h             |  1 -
 keyboards/atlantis/ak81_ve/config.h               |  1 -
 keyboards/atlas_65/config.h                       |  1 -
 keyboards/atomic/config.h                         |  1 -
 keyboards/atreus/astar/config.h                   |  1 -
 keyboards/atreus/astar_mirrored/config.h          |  1 -
 keyboards/atreus/f103/config.h                    |  1 -
 keyboards/atreus/feather/config.h                 |  1 -
 keyboards/atreus/keymaps/kejadlen/config.h        |  1 -
 keyboards/atreus/keymaps/nojjan/config.h          |  2 --
 keyboards/atreus/promicro/config.h                |  1 -
 keyboards/atreus/teensy2/config.h                 |  1 -
 keyboards/atset/at1/config.h                      |  1 -
 keyboards/atset/at12/config.h                     |  1 -
 keyboards/atset/at16/config.h                     |  1 -
 keyboards/atset/at3/config.h                      |  1 -
 keyboards/atset/at6/config.h                      |  1 -
 keyboards/atset/at9/config.h                      |  1 -
 keyboards/atxkb/1894/config.h                     |  1 -
 keyboards/aves60/config.h                         |  1 -
 keyboards/aves65/config.h                         |  1 -
 keyboards/b_sides/rev41lp/config.h                |  1 -
 keyboards/baguette/config.h                       |  1 -
 keyboards/bandominedoni/config.h                  |  1 -
 keyboards/bantam44/config.h                       |  1 -
 keyboards/barleycorn_smd/config.h                 |  1 -
 keyboards/barracuda/config.h                      |  1 -
 keyboards/basketweave/config.h                    |  1 -
 .../charybdis/4x6/keymaps/drashna/config.h        |  1 -
 keyboards/bear_face/config.h                      |  1 -
 keyboards/beatervan/config.h                      |  1 -
 keyboards/bemeier/bmek/rev1/config.h              |  2 --
 keyboards/bemeier/bmek/rev2/config.h              |  4 +---
 keyboards/bemeier/bmek/rev3/config.h              |  4 +---
 keyboards/bfake/config.h                          |  1 -
 keyboards/biacco42/meishi/config.h                |  1 -
 keyboards/biacco42/meishi2/config.h               |  1 -
 keyboards/binepad/bn003/config.h                  |  1 -
 keyboards/binepad/bn009/config.h                  |  1 -
 keyboards/bioi/g60ble/config.h                    |  1 -
 keyboards/blackplum/config.h                      |  1 -
 keyboards/blank/blank01/config.h                  |  1 -
 keyboards/blank_tehnologii/manibus/config.h       |  1 -
 keyboards/blaster75/config.h                      |  1 -
 keyboards/blockey/config.h                        |  1 -
 keyboards/boardrun/bizarre/config.h               |  1 -
 keyboards/boardrun/classic/config.h               |  1 -
 keyboards/boardwalk/config.h                      |  1 -
 keyboards/bolsa/damapad/config.h                  |  1 -
 keyboards/bop/config.h                            |  1 -
 keyboards/botanicalkeyboards/fm2u/config.h        |  1 -
 keyboards/bpiphany/four_banger/config.h           |  1 -
 keyboards/bpiphany/frosty_flake/config.h          |  1 -
 keyboards/bpiphany/kitten_paw/config.h            |  1 -
 keyboards/bpiphany/sixshooter/config.h            |  1 -
 keyboards/bpiphany/tiger_lily/config.h            |  1 -
 keyboards/bthlabs/geekpad/config.h                |  1 -
 keyboards/buildakb/potato65/config.h              |  1 -
 keyboards/buildakb/potato65hs/config.h            |  1 -
 keyboards/buildakb/potato65s/config.h             |  1 -
 keyboards/buzzard/rev1/config.h                   |  1 -
 keyboards/cablecardesigns/cypher/rev6/config.h    |  1 -
 keyboards/caffeinated/serpent65/config.h          |  1 -
 keyboards/canary/canary60rgb/v1/config.h          |  1 -
 keyboards/cannonkeys/atlas_alps/config.h          |  1 -
 keyboards/capsunlocked/cu24/config.h              |  1 -
 keyboards/capsunlocked/cu65/config.h              |  1 -
 keyboards/capsunlocked/cu7/config.h               |  1 -
 keyboards/capsunlocked/cu75/config.h              |  1 -
 keyboards/capsunlocked/cu80/v1/config.h           |  1 -
 keyboards/catch22/config.h                        |  1 -
 keyboards/cest73/tkm/config.h                     |  1 -
 keyboards/charue/charon/config.h                  |  1 -
 keyboards/charue/sunsetter_r2/config.h            |  1 -
 keyboards/chavdai40/rev1/config.h                 |  1 -
 keyboards/chavdai40/rev2/config.h                 |  1 -
 keyboards/checkerboards/axon40/config.h           |  1 -
 keyboards/checkerboards/candybar_ortho/config.h   |  1 -
 keyboards/checkerboards/g_idb60/config.h          |  1 -
 keyboards/checkerboards/nop60/config.h            |  1 -
 keyboards/checkerboards/phoenix45_ortho/config.h  |  1 -
 keyboards/checkerboards/plexus75/config.h         |  1 -
 keyboards/checkerboards/plexus75_he/config.h      |  1 -
 keyboards/checkerboards/pursuit40/config.h        |  1 -
 keyboards/checkerboards/quark/config.h            |  1 -
 keyboards/checkerboards/quark_lp/config.h         |  1 -
 keyboards/checkerboards/quark_plus/config.h       |  1 -
 keyboards/checkerboards/quark_squared/config.h    |  1 -
 keyboards/checkerboards/snop60/config.h           |  1 -
 keyboards/checkerboards/ud40_ortho_alt/config.h   |  1 -
 keyboards/cherrybstudio/cb1800/config.h           |  1 -
 keyboards/cherrybstudio/cb87/config.h             |  1 -
 keyboards/cherrybstudio/cb87rgb/config.h          |  1 -
 keyboards/cherrybstudio/cb87v2/config.h           |  1 -
 keyboards/cheshire/curiosity/config.h             |  1 -
 keyboards/chickenman/ciel/config.h                |  1 -
 keyboards/chlx/merro60/config.h                   |  2 --
 keyboards/chlx/str_merro60/config.h               |  2 --
 keyboards/chocv/config.h                          |  1 -
 keyboards/cipulot/kallos/config.h                 |  1 -
 keyboards/ckeys/nakey/config.h                    |  1 -
 keyboards/ckeys/obelus/config.h                   |  1 -
 keyboards/ckeys/thedora/config.h                  |  1 -
 keyboards/ckeys/washington/config.h               |  1 -
 keyboards/contender/config.h                      |  1 -
 keyboards/contra/config.h                         |  1 -
 keyboards/converter/a1200/miss1200/config.h       |  1 -
 keyboards/converter/a1200/mistress1200/config.h   |  1 -
 keyboards/converter/a1200/teensy2pp/config.h      |  1 -
 keyboards/converter/modelm101/config.h            |  1 -
 keyboards/converter/modelm101_teensy2/config.h    |  1 -
 keyboards/converter/modelm_ssk/config.h           |  1 -
 keyboards/converter/numeric_keypad_IIe/config.h   |  1 -
 keyboards/cool836a/config.h                       |  1 -
 keyboards/copenhagen_click/click_pad_v1/config.h  |  1 -
 keyboards/coseyfannitutti/discipad/config.h       |  1 -
 keyboards/coseyfannitutti/discipline/config.h     |  1 -
 keyboards/coseyfannitutti/mullet/config.h         |  1 -
 keyboards/coseyfannitutti/mulletpad/config.h      |  1 -
 keyboards/coseyfannitutti/mysterium/config.h      |  1 -
 keyboards/coseyfannitutti/romeo/config.h          |  1 -
 keyboards/cozykeys/bloomer/v2/config.h            |  1 -
 keyboards/cozykeys/bloomer/v3/config.h            |  1 -
 keyboards/cozykeys/speedo/v2/config.h             |  1 -
 keyboards/cozykeys/speedo/v3/config.h             |  1 -
 keyboards/cradio/config.h                         |  1 -
 keyboards/craftwalk/config.h                      |  1 -
 keyboards/crawlpad/config.h                       |  1 -
 keyboards/crazy_keyboard_68/config.h              |  1 -
 keyboards/crbn/config.h                           |  1 -
 keyboards/creatkeebs/glacier/config.h             |  1 -
 keyboards/creatkeebs/thera/config.h               |  1 -
 keyboards/crimsonkeyboards/resume1800/config.h    |  1 -
 keyboards/custommk/genesis/rev1/config.h          |  1 -
 keyboards/custommk/genesis/rev2/config.h          |  1 -
 keyboards/cutie_club/borsdorf/config.h            |  1 -
 keyboards/cutie_club/giant_macro_pad/config.h     |  1 -
 keyboards/cutie_club/keebcats/denis/config.h      |  1 -
 keyboards/cutie_club/keebcats/dougal/config.h     |  1 -
 keyboards/cutie_club/novus/config.h               |  1 -
 keyboards/cutie_club/wraith/config.h              |  1 -
 keyboards/cx60/config.h                           |  1 -
 keyboards/dailycraft/bat43/config.h               |  1 -
 keyboards/dailycraft/claw44/rev1/config.h         |  1 -
 keyboards/dailycraft/owl8/config.h                |  1 -
 keyboards/dailycraft/sandbox/rev1/config.h        |  1 -
 keyboards/dailycraft/sandbox/rev2/config.h        |  1 -
 keyboards/dailycraft/stickey4/config.h            |  1 -
 keyboards/dailycraft/wings42/rev1/config.h        |  1 -
 .../dailycraft/wings42/rev1_extkeys/config.h      |  1 -
 keyboards/dailycraft/wings42/rev2/config.h        |  1 -
 keyboards/daji/seis_cinco/config.h                |  1 -
 keyboards/db/db63/config.h                        |  1 -
 keyboards/dc01/arrow/config.h                     |  1 -
 keyboards/dc01/left/config.h                      |  1 -
 keyboards/dc01/numpad/config.h                    |  1 -
 keyboards/dc01/right/config.h                     |  1 -
 keyboards/delikeeb/flatbread60/config.h           |  1 -
 keyboards/delikeeb/vaguettelite/config.h          |  1 -
 keyboards/delikeeb/vanana/rev1/config.h           |  1 -
 keyboards/delikeeb/vanana/rev2/config.h           |  1 -
 keyboards/delikeeb/vaneela/config.h               |  1 -
 keyboards/delikeeb/vaneelaex/config.h             |  1 -
 keyboards/delikeeb/waaffle/rev3/config.h          |  1 -
 keyboards/deltapad/config.h                       |  1 -
 keyboards/demiurge/config.h                       |  1 -
 keyboards/dk60/config.h                           |  1 -
 keyboards/dm9records/plaid/config.h               |  1 -
 keyboards/dm9records/tartan/config.h              |  1 -
 keyboards/dmqdesign/spin/config.h                 |  1 -
 keyboards/do60/config.h                           |  1 -
 keyboards/donutcables/budget96/config.h           |  1 -
 keyboards/donutcables/scrabblepad/config.h        |  1 -
 keyboards/doodboard/duckboard/config.h            |  1 -
 keyboards/doodboard/duckboard_r2/config.h         |  1 -
 keyboards/doppelganger/config.h                   |  1 -
 keyboards/doro67/rgb/config.h                     |  1 -
 keyboards/dp60/config.h                           |  1 -
 keyboards/draculad/config.h                       |  1 -
 keyboards/draytronics/daisy/config.h              |  1 -
 keyboards/draytronics/elise/config.h              |  1 -
 keyboards/draytronics/elise_v2/config.h           |  1 -
 keyboards/draytronics/scarlet/config.h            |  1 -
 keyboards/drewkeys/iskar/config.h                 |  1 -
 keyboards/drhigsby/bkf/config.h                   |  1 -
 keyboards/drhigsby/dubba175/config.h              |  1 -
 keyboards/drhigsby/ogurec/config.h                |  1 -
 keyboards/drhigsby/packrat/config.h               |  1 -
 keyboards/dtisaac/cg108/config.h                  |  1 -
 keyboards/dtisaac/dosa40rgb/config.h              |  1 -
 keyboards/dtisaac/dtisaac01/config.h              |  1 -
 keyboards/ducky/one2mini/1861st/config.h          |  1 -
 keyboards/ducky/one2sf/1967st/config.h            |  1 -
 keyboards/dumbo/config.h                          |  1 -
 keyboards/dumbpad/v0x/config.h                    |  1 -
 keyboards/dumbpad/v0x_right/config.h              |  1 -
 keyboards/dumbpad/v1x/config.h                    |  1 -
 keyboards/dumbpad/v1x_dualencoder/config.h        |  1 -
 keyboards/dumbpad/v1x_right/config.h              |  1 -
 keyboards/dz60/config.h                           |  1 -
 keyboards/dz60/keymaps/LEdiodes/config.h          |  1 -
 keyboards/dztech/bocc/config.h                    |  1 -
 keyboards/dztech/duo_s/config.h                   |  1 -
 keyboards/dztech/dz60rgb/v1/config.h              |  1 -
 keyboards/dztech/dz60rgb/v2/config.h              |  1 -
 keyboards/dztech/dz60rgb/v2_1/config.h            |  1 -
 keyboards/dztech/dz60rgb_ansi/v1/config.h         |  1 -
 keyboards/dztech/dz60rgb_ansi/v2/config.h         |  1 -
 keyboards/dztech/dz60rgb_ansi/v2_1/config.h       |  1 -
 keyboards/dztech/dz60rgb_wkl/v1/config.h          |  1 -
 keyboards/dztech/dz60rgb_wkl/v2/config.h          |  1 -
 keyboards/dztech/dz60rgb_wkl/v2_1/config.h        |  1 -
 keyboards/dztech/dz64rgb/config.h                 |  1 -
 keyboards/dztech/dz65rgb/v3/config.h              |  1 -
 keyboards/dztech/dz96/config.h                    |  1 -
 keyboards/e88/config.h                            |  1 -
 keyboards/ealdin/quadrant/config.h                |  1 -
 keyboards/earth_rover/config.h                    |  1 -
 keyboards/ebastler/e80_1800/config.h              |  1 -
 keyboards/ebastler/isometria_75/rev1/config.h     |  1 -
 keyboards/eco/rev1/config.h                       |  1 -
 keyboards/eco/rev2/config.h                       |  1 -
 keyboards/edc40/config.h                          |  1 -
 keyboards/edi/hardlight/mk1/config.h              |  1 -
 keyboards/edi/standaside/config.h                 |  1 -
 keyboards/eek/config.h                            |  1 -
 keyboards/efreet/config.h                         |  1 -
 keyboards/elephant42/config.h                     |  1 -
 keyboards/emajesty/eiri/config.h                  |  1 -
 keyboards/emi20/config.h                          |  1 -
 keyboards/eniigmakeyboards/ek60/config.h          |  1 -
 keyboards/eniigmakeyboards/ek65/config.h          |  1 -
 keyboards/eniigmakeyboards/ek87/config.h          |  1 -
 keyboards/ep/96/config.h                          |  1 -
 keyboards/ep/comsn/hs68/config.h                  |  1 -
 keyboards/ep/comsn/mollydooker/config.h           |  1 -
 keyboards/ep/comsn/tf_longeboye/config.h          |  1 -
 keyboards/epoch80/config.h                        |  1 -
 keyboards/ericrlau/numdiscipline/rev1/config.h    |  1 -
 keyboards/eternal_keypad/config.h                 |  1 -
 keyboards/eu_isolation/config.h                   |  1 -
 keyboards/evancookaudio/sleepingdinosaur/config.h |  1 -
 keyboards/evancookaudio/tenpad/config.h           |  1 -
 keyboards/eve/meteor/config.h                     |  1 -
 keyboards/evil80/config.h                         |  1 -
 keyboards/evyd13/atom47/rev2/config.h             |  1 -
 keyboards/evyd13/atom47/rev3/config.h             |  1 -
 keyboards/evyd13/atom47/rev4/config.h             |  1 -
 keyboards/evyd13/atom47/rev5/config.h             |  1 -
 keyboards/evyd13/eon40/config.h                   |  1 -
 keyboards/evyd13/eon65/config.h                   |  1 -
 keyboards/evyd13/eon75/config.h                   |  1 -
 keyboards/evyd13/eon87/config.h                   |  1 -
 keyboards/evyd13/eon95/config.h                   |  1 -
 keyboards/evyd13/gh80_1800/config.h               |  1 -
 keyboards/evyd13/gh80_3700/config.h               |  1 -
 keyboards/evyd13/gud70/config.h                   |  1 -
 keyboards/evyd13/minitomic/config.h               |  1 -
 keyboards/evyd13/mx5160/config.h                  |  1 -
 keyboards/evyd13/nt660/config.h                   |  1 -
 keyboards/evyd13/nt750/config.h                   |  1 -
 keyboards/evyd13/nt980/config.h                   |  1 -
 keyboards/evyd13/omrontkl/config.h                |  1 -
 keyboards/evyd13/pockettype/config.h              |  1 -
 keyboards/evyd13/quackfire/config.h               |  1 -
 keyboards/evyd13/solheim68/config.h               |  1 -
 keyboards/evyd13/ta65/config.h                    |  1 -
 keyboards/evyd13/wasdat/config.h                  |  1 -
 keyboards/evyd13/wasdat_code/config.h             |  1 -
 keyboards/evyd13/wonderland/config.h              |  1 -
 keyboards/exclusive/e65/config.h                  |  1 -
 keyboards/exclusive/e6_rgb/config.h               |  1 -
 keyboards/exclusive/e6v2/le/config.h              |  1 -
 keyboards/exclusive/e6v2/oe/config.h              |  1 -
 keyboards/exclusive/e7v1/config.h                 |  1 -
 keyboards/exclusive/e7v1se/config.h               |  1 -
 keyboards/exclusive/e85/config.h                  |  1 -
 keyboards/exent/config.h                          |  1 -
 keyboards/eyeohdesigns/babyv/config.h             |  1 -
 keyboards/eyeohdesigns/theboulevard/config.h      |  1 -
 keyboards/facew/config.h                          |  1 -
 keyboards/fallacy/config.h                        |  1 -
 keyboards/fc980c/config.h                         |  1 -
 keyboards/feels/feels65/config.h                  |  1 -
 keyboards/ferris/0_2/config.h                     |  2 --
 keyboards/ferris/sweep/config.h                   |  4 +---
 keyboards/fjlabs/7vhotswap/config.h               |  1 -
 keyboards/fjlabs/ad65/config.h                    |  1 -
 keyboards/fjlabs/bks65/config.h                   |  1 -
 keyboards/fjlabs/bks65solder/config.h             |  1 -
 keyboards/fjlabs/bolsa65/config.h                 |  1 -
 keyboards/fjlabs/kf87/config.h                    |  1 -
 keyboards/fjlabs/kyuu/config.h                    |  1 -
 keyboards/fjlabs/ldk65/config.h                   |  1 -
 keyboards/fjlabs/midway60/config.h                |  1 -
 keyboards/fjlabs/mk61rgbansi/config.h             |  1 -
 keyboards/fjlabs/polaris/config.h                 |  1 -
 keyboards/fjlabs/ready100/config.h                |  1 -
 keyboards/fjlabs/sinanju/config.h                 |  1 -
 keyboards/fjlabs/solanis/config.h                 |  1 -
 keyboards/fjlabs/swordfish/config.h               |  1 -
 keyboards/fjlabs/tf60ansi/config.h                |  1 -
 keyboards/fjlabs/tf60v2/config.h                  |  1 -
 keyboards/fjlabs/tf65rgbv2/config.h               |  1 -
 keyboards/flehrad/bigswitch/config.h              |  1 -
 keyboards/flehrad/downbubble/config.h             |  1 -
 keyboards/flehrad/numbrero/config.h               |  1 -
 keyboards/flehrad/snagpad/config.h                |  1 -
 keyboards/flehrad/tradestation/config.h           |  1 -
 keyboards/fleuron/config.h                        |  1 -
 keyboards/fluorite/config.h                       |  1 -
 keyboards/flx/lodestone/config.h                  |  1 -
 keyboards/flygone60/rev3/config.h                 |  1 -
 keyboards/foostan/cornelius/config.h              |  1 -
 keyboards/for_science/config.h                    |  1 -
 keyboards/foxlab/leaf60/hotswap/config.h          |  1 -
 keyboards/foxlab/leaf60/universal/config.h        |  1 -
 keyboards/foxlab/time80/config.h                  |  1 -
 keyboards/fr4/southpaw75/config.h                 |  1 -
 keyboards/fr4/unix60/config.h                     |  1 -
 keyboards/fractal/config.h                        |  1 -
 keyboards/free_willy/config.h                     |  1 -
 keyboards/friedrich/config.h                      |  1 -
 keyboards/ft/mars80/config.h                      |  1 -
 keyboards/function96/v1/config.h                  |  1 -
 keyboards/function96/v2/config.h                  |  1 -
 keyboards/funky40/config.h                        |  1 -
 keyboards/gboards/butterstick/config.h            |  1 -
 keyboards/gboards/gergoplex/config.h              |  1 -
 keyboards/geekboards/macropad_v2/config.h         |  1 -
 keyboards/geekboards/tester/config.h              |  1 -
 keyboards/generic_panda/panda65_01/config.h       |  1 -
 keyboards/genone/eclipse_65/config.h              |  1 -
 keyboards/genone/g1_65/config.h                   |  1 -
 keyboards/gentleman65/config.h                    |  1 -
 keyboards/gh60/revc/config.h                      |  1 -
 keyboards/gh60/satan/config.h                     |  1 -
 .../gh60/satan/keymaps/admiralStrokers/config.h   |  1 -
 keyboards/gh60/satan/keymaps/fakb/config.h        |  1 -
 keyboards/gh80_3000/config.h                      |  1 -
 keyboards/ghs/rar/config.h                        |  1 -
 keyboards/gizmo_engineering/gk6/config.h          |  1 -
 keyboards/gkeyboard/gkb_m16/config.h              |  1 -
 keyboards/gl516/a52gl/config.h                    |  1 -
 keyboards/gl516/j73gl/config.h                    |  1 -
 keyboards/gl516/n51gl/config.h                    |  1 -
 keyboards/gon/nerd60/config.h                     |  1 -
 keyboards/gon/nerdtkl/config.h                    |  1 -
 keyboards/gorthage_truck/config.h                 |  1 -
 keyboards/gowla/config.h                          |  1 -
 keyboards/gray_studio/cod67/config.h              |  1 -
 keyboards/gray_studio/space65/config.h            |  1 -
 keyboards/grid600/press/config.h                  |  1 -
 keyboards/h0oni/deskpad/config.h                  |  1 -
 keyboards/h0oni/hotduck/config.h                  |  1 -
 keyboards/hadron/ver2/config.h                    |  1 -
 keyboards/hadron/ver3/config.h                    |  1 -
 keyboards/halfcliff/config.h                      |  1 -
 keyboards/han60/config.h                          |  1 -
 keyboards/handwired/108key_trackpoint/config.h    |  1 -
 keyboards/handwired/2x5keypad/config.h            |  1 -
 keyboards/handwired/3dp660/config.h               |  1 -
 keyboards/handwired/412_64/config.h               |  1 -
 keyboards/handwired/42/config.h                   |  1 -
 keyboards/handwired/6key/config.h                 |  1 -
 keyboards/handwired/6macro/config.h               |  1 -
 keyboards/handwired/aek64/config.h                |  1 -
 keyboards/handwired/amigopunk/config.h            |  1 -
 keyboards/handwired/angel/config.h                |  1 -
 keyboards/handwired/aplx2/config.h                |  1 -
 keyboards/handwired/aranck/config.h               |  1 -
 keyboards/handwired/arrow_pad/config.h            |  1 -
 .../handwired/arrow_pad/keymaps/pad_21/config.h   |  1 -
 .../handwired/arrow_pad/keymaps/pad_24/config.h   |  1 -
 keyboards/handwired/atreus50/config.h             |  1 -
 keyboards/handwired/axon/config.h                 |  1 -
 keyboards/handwired/baredev/rev1/info.json        |  9 +--------
 keyboards/handwired/battleship_gamepad/config.h   |  1 -
 keyboards/handwired/bolek/config.h                |  1 -
 keyboards/handwired/bstk100/config.h              |  1 -
 keyboards/handwired/cans12er/config.h             |  1 -
 keyboards/handwired/chiron/config.h               |  1 -
 keyboards/handwired/cmd60/config.h                |  1 -
 keyboards/handwired/co60/rev1/config.h            |  1 -
 keyboards/handwired/co60/rev7/config.h            |  1 -
 keyboards/handwired/colorlice/config.h            |  1 -
 keyboards/handwired/concertina/64key/config.h     |  1 -
 keyboards/handwired/curiosity/config.h            |  1 -
 keyboards/handwired/d48/config.h                  |  1 -
 keyboards/handwired/dactyl_left/config.h          |  1 -
 keyboards/handwired/daishi/config.h               |  1 -
 keyboards/handwired/dc/mc/001/config.h            |  1 -
 keyboards/handwired/dqz11n1g/config.h             |  1 -
 keyboards/handwired/eagleii/config.h              |  1 -
 keyboards/handwired/evk/v1_3/config.h             |  1 -
 keyboards/handwired/fc200rt_qmk/config.h          |  1 -
 keyboards/handwired/fivethirteen/config.h         |  1 -
 keyboards/handwired/floorboard/config.h           |  1 -
 keyboards/handwired/frankie_macropad/config.h     |  1 -
 keyboards/handwired/fruity60/config.h             |  1 -
 keyboards/handwired/gamenum/config.h              |  1 -
 keyboards/handwired/hacked_motospeed/config.h     |  1 -
 keyboards/handwired/heisenberg/config.h           |  1 -
 keyboards/handwired/hexon38/config.h              |  1 -
 keyboards/handwired/hnah108/config.h              |  1 -
 keyboards/handwired/hnah40/config.h               |  1 -
 keyboards/handwired/ibm122m/config.h              |  1 -
 keyboards/handwired/jn68m/config.h                |  1 -
 keyboards/handwired/jopr/config.h                 |  1 -
 keyboards/handwired/jot50/config.h                |  1 -
 keyboards/handwired/jotanck/config.h              |  1 -
 keyboards/handwired/jotpad16/config.h             |  1 -
 keyboards/handwired/jtallbean/split_65/config.h   |  1 -
 keyboards/handwired/k_numpad17/config.h           |  1 -
 keyboards/handwired/kbod/config.h                 |  1 -
 keyboards/handwired/lagrange/config.h             |  1 -
 keyboards/handwired/leftynumpad/config.h          |  1 -
 keyboards/handwired/lemonpad/config.h             |  1 -
 keyboards/handwired/lovelive9/config.h            |  1 -
 keyboards/handwired/m40/5x5_macropad/config.h     |  1 -
 keyboards/handwired/macroboard/config.h           |  1 -
 keyboards/handwired/macroboard/f411/config.h      |  1 -
 keyboards/handwired/magicforce61/config.h         |  1 -
 keyboards/handwired/magicforce68/config.h         |  1 -
 keyboards/handwired/mechboards_micropad/config.h  |  1 -
 .../handwired/meck_tkl/blackpill_f401/config.h    |  2 --
 keyboards/handwired/minorca/config.h              |  1 -
 keyboards/handwired/mutepad/config.h              |  1 -
 keyboards/handwired/nicekey/config.h              |  1 -
 keyboards/handwired/novem/config.h                |  1 -
 keyboards/handwired/nozbe_macro/config.h          |  1 -
 keyboards/handwired/numpad20/config.h             |  1 -
 keyboards/handwired/oem_ansi_fullsize/config.h    |  1 -
 .../handwired/onekey/blackpill_f401/config.h      |  1 -
 .../handwired/onekey/blackpill_f411/config.h      |  1 -
 .../onekey/blackpill_f411_tinyuf2/config.h        |  1 -
 keyboards/handwired/onekey/bluepill/config.h      |  1 -
 keyboards/handwired/onekey/elite_c/config.h       |  1 -
 keyboards/handwired/onekey/evb_wb32f3g71/config.h |  1 -
 keyboards/handwired/onekey/evb_wb32fq95/config.h  |  1 -
 keyboards/handwired/onekey/nucleo_l432kc/config.h |  1 -
 keyboards/handwired/onekey/promicro/config.h      |  1 -
 keyboards/handwired/onekey/proton_c/config.h      |  1 -
 .../handwired/onekey/sipeed_longan_nano/config.h  |  1 -
 keyboards/handwired/onekey/stm32f0_disco/config.h |  1 -
 .../handwired/onekey/stm32f405_feather/config.h   |  1 -
 keyboards/handwired/onekey/teensy_2/config.h      |  1 -
 keyboards/handwired/onekey/teensy_2pp/config.h    |  1 -
 keyboards/handwired/onekey/teensy_32/config.h     |  1 -
 keyboards/handwired/onekey/teensy_35/config.h     |  1 -
 keyboards/handwired/onekey/teensy_lc/config.h     |  1 -
 keyboards/handwired/ortho5x13/config.h            |  1 -
 keyboards/handwired/ortho5x14/config.h            |  1 -
 keyboards/handwired/ortho_brass/config.h          |  2 --
 keyboards/handwired/p65rgb/config.h               |  1 -
 keyboards/handwired/pilcrow/config.h              |  1 -
 .../handwired/pill60/blackpill_f401/config.h      |  2 --
 .../handwired/pill60/blackpill_f411/config.h      |  3 ---
 keyboards/handwired/pill60/bluepill/config.h      |  2 --
 keyboards/handwired/postageboard/mini/config.h    |  1 -
 keyboards/handwired/postageboard/r1/config.h      |  1 -
 keyboards/handwired/prime_exl/config.h            |  1 -
 keyboards/handwired/prime_exl_plus/config.h       |  1 -
 keyboards/handwired/prkl30/feather/config.h       |  1 -
 keyboards/handwired/prkl30/promicro/config.h      |  1 -
 keyboards/handwired/promethium/config.h           |  1 -
 keyboards/handwired/pteron/config.h               |  1 -
 keyboards/handwired/pteron38/config.h             |  1 -
 keyboards/handwired/pteron44/config.h             |  1 -
 keyboards/handwired/retro_refit/config.h          |  1 -
 keyboards/handwired/riblee_f401/config.h          |  1 -
 keyboards/handwired/riblee_f411/config.h          |  1 -
 keyboards/handwired/rs60/config.h                 |  1 -
 keyboards/handwired/selene/config.h               |  1 -
 keyboards/handwired/sick68/config.h               |  1 -
 keyboards/handwired/sick_pad/config.h             |  1 -
 keyboards/handwired/slash/config.h                |  1 -
 keyboards/handwired/snatchpad/config.h            |  1 -
 keyboards/handwired/space_oddity/config.h         |  1 -
 keyboards/handwired/steamvan/rev1/config.h        |  1 -
 keyboards/handwired/sticc14/config.h              |  1 -
 .../handwired/symmetric70_proto/promicro/config.h |  1 -
 .../handwired/symmetric70_proto/proton_c/config.h |  1 -
 keyboards/handwired/symmetry60/config.h           |  1 -
 keyboards/handwired/t111/config.h                 |  1 -
 keyboards/handwired/tennie/config.h               |  1 -
 keyboards/handwired/terminus_mini/config.h        |  1 -
 keyboards/handwired/trackpoint/config.h           |  1 -
 .../tractyl_manuform/5x6_right/f303/config.h      |  3 ---
 .../tractyl_manuform/5x6_right/f411/config.h      |  3 ---
 keyboards/handwired/traveller/config.h            |  1 -
 keyboards/handwired/tritium_numpad/config.h       |  1 -
 keyboards/handwired/twadlee/tp69/config.h         |  1 -
 keyboards/handwired/unicomp_mini_m/config.h       |  1 -
 keyboards/handwired/uthol/rev1/config.h           |  1 -
 keyboards/handwired/uthol/rev2/config.h           |  1 -
 keyboards/handwired/uthol/rev3/config.h           |  1 -
 keyboards/handwired/videowriter/config.h          |  1 -
 keyboards/handwired/wabi/config.h                 |  1 -
 keyboards/handwired/woodpad/config.h              |  1 -
 keyboards/handwired/xealousbrown/config.h         |  1 -
 keyboards/handwired/z150/config.h                 |  1 -
 keyboards/handwired/zergo/config.h                |  1 -
 keyboards/hardlineworks/otd_plus/config.h         |  1 -
 keyboards/helix/rev3_4rows/config.h               |  1 -
 keyboards/helix/rev3_5rows/config.h               |  1 -
 keyboards/hhkb_lite_2/config.h                    |  1 -
 keyboards/hifumi/config.h                         |  1 -
 keyboards/hineybush/h08_ocelot/config.h           |  1 -
 keyboards/hineybush/h10/config.h                  |  1 -
 keyboards/hineybush/h60/config.h                  |  1 -
 keyboards/hineybush/h65/config.h                  |  1 -
 keyboards/hineybush/h65_hotswap/config.h          |  1 -
 keyboards/hineybush/h660s/config.h                |  1 -
 keyboards/hineybush/h75_singa/config.h            |  1 -
 keyboards/hineybush/h87a/config.h                 |  1 -
 keyboards/hineybush/h88/config.h                  |  1 -
 keyboards/hineybush/hbcp/config.h                 |  1 -
 keyboards/hineybush/hineyg80/config.h             |  1 -
 keyboards/hineybush/physix/config.h               |  1 -
 keyboards/hineybush/sm68/config.h                 |  1 -
 keyboards/hnahkb/freyr/config.h                   |  1 -
 keyboards/hnahkb/stella/config.h                  |  1 -
 keyboards/hnahkb/vn66/config.h                    |  1 -
 keyboards/horizon/config.h                        |  1 -
 keyboards/hs60/v1/config.h                        |  1 -
 keyboards/ianklug/grooveboard/config.h            |  1 -
 .../ibm/model_m_4th_gen/overnumpad_1xb/config.h   |  1 -
 keyboards/ibnuda/alicia_cook/config.h             |  1 -
 keyboards/ibnuda/gurindam/config.h                |  1 -
 keyboards/idb/idb_60/config.h                     |  1 -
 keyboards/idobao/id75/v1/config.h                 |  1 -
 keyboards/idobao/id75/v2/config.h                 |  1 -
 keyboards/idobao/id87/v1/config.h                 |  1 -
 keyboards/idobao/id96/config.h                    |  1 -
 keyboards/idobao/montex/v1/config.h               |  1 -
 keyboards/illuminati/is0/config.h                 |  1 -
 keyboards/illusion/rosa/config.h                  |  1 -
 keyboards/ilumkb/primus75/config.h                |  1 -
 keyboards/ilumkb/simpler61/config.h               |  1 -
 keyboards/ilumkb/simpler64/config.h               |  1 -
 keyboards/ilumkb/volcano660/config.h              |  1 -
 keyboards/inett_studio/sqx/hotswap/config.h       |  1 -
 keyboards/inett_studio/sqx/universal/config.h     |  1 -
 keyboards/input_club/ergodox_infinity/config.h    |  1 -
 keyboards/input_club/infinity60/led/config.h      |  1 -
 keyboards/input_club/infinity60/rev1/config.h     |  1 -
 keyboards/input_club/k_type/config.h              |  1 -
 keyboards/input_club/whitefox/config.h            |  1 -
 keyboards/io_mini1800/config.h                    |  1 -
 keyboards/irene/config.h                          |  1 -
 keyboards/iriskeyboards/config.h                  |  1 -
 keyboards/j80/config.h                            |  1 -
 keyboards/jacky_studio/s7_elephant/rev1/config.h  |  1 -
 keyboards/jadookb/jkb2/config.h                   |  1 -
 keyboards/jadookb/jkb65/config.h                  |  1 -
 keyboards/jae/j01/config.h                        |  1 -
 keyboards/jagdpietr/drakon/config.h               |  1 -
 keyboards/jc65/v32u4/config.h                     |  1 -
 keyboards/jd40/config.h                           |  1 -
 keyboards/jd45/config.h                           |  1 -
 keyboards/jm60/config.h                           |  1 -
 keyboards/jolofsor/denial75/config.h              |  1 -
 keyboards/jones/v03/config.h                      |  1 -
 keyboards/jones/v03_1/config.h                    |  1 -
 keyboards/jorne/rev1/config.h                     |  1 -
 keyboards/k34/config.h                            |  1 -
 keyboards/kabedon/kabedon980/config.h             |  1 -
 keyboards/kagizaraya/chidori/config.h             |  1 -
 keyboards/kagizaraya/halberd/config.h             |  1 -
 keyboards/kagizaraya/scythe/config.h              |  1 -
 keyboards/kakunpc/angel17/alpha/config.h          |  1 -
 keyboards/kakunpc/angel17/rev1/config.h           |  1 -
 keyboards/kakunpc/angel64/alpha/config.h          |  1 -
 keyboards/kakunpc/angel64/rev1/config.h           |  1 -
 keyboards/kakunpc/business_card/alpha/config.h    |  1 -
 keyboards/kakunpc/business_card/beta/config.h     |  1 -
 keyboards/kakunpc/choc_taro/config.h              |  1 -
 keyboards/kakunpc/rabbit_capture_plan/config.h    |  1 -
 keyboards/kakunpc/suihankey/alpha/config.h        |  1 -
 keyboards/kakunpc/suihankey/rev1/config.h         |  1 -
 keyboards/kakunpc/suihankey/split/alpha/config.h  |  1 -
 keyboards/kakunpc/suihankey/split/rev1/config.h   |  1 -
 keyboards/kakunpc/thedogkeyboard/config.h         |  1 -
 keyboards/kapcave/gskt00/config.h                 |  1 -
 keyboards/kapcave/paladin64/config.h              |  1 -
 keyboards/kb58/config.h                           |  1 -
 keyboards/kb_elmo/aek2_usb/config.h               |  1 -
 keyboards/kb_elmo/elmopad/config.h                |  1 -
 keyboards/kb_elmo/isolation/config.h              |  1 -
 keyboards/kb_elmo/m0110a_usb/config.h             |  1 -
 keyboards/kb_elmo/m0116_usb/config.h              |  1 -
 keyboards/kb_elmo/noah_avr/config.h               |  1 -
 keyboards/kb_elmo/sesame/config.h                 |  1 -
 keyboards/kb_elmo/vertex/config.h                 |  1 -
 keyboards/kbdclack/kaishi65/config.h              |  1 -
 keyboards/kbdfans/baguette66/rgb/config.h         |  1 -
 keyboards/kbdfans/baguette66/soldered/config.h    |  1 -
 keyboards/kbdfans/bella/rgb/config.h              |  1 -
 keyboards/kbdfans/bella/rgb_iso/config.h          |  1 -
 keyboards/kbdfans/bella/soldered/config.h         |  1 -
 keyboards/kbdfans/boop65/rgb/config.h             |  1 -
 keyboards/kbdfans/bounce/75/hotswap/config.h      |  1 -
 keyboards/kbdfans/bounce/75/soldered/config.h     |  1 -
 keyboards/kbdfans/bounce/pad/config.h             |  1 -
 keyboards/kbdfans/kbd19x/config.h                 |  1 -
 keyboards/kbdfans/kbd4x/config.h                  |  1 -
 keyboards/kbdfans/kbd66/config.h                  |  1 -
 keyboards/kbdfans/kbd67/hotswap/config.h          |  1 -
 keyboards/kbdfans/kbd67/mkii_soldered/config.h    |  1 -
 keyboards/kbdfans/kbd67/mkiirgb/v3/config.h       |  1 -
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h       |  1 -
 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h      |  1 -
 keyboards/kbdfans/kbd67/rev1/config.h             |  1 -
 keyboards/kbdfans/kbd67/rev2/config.h             |  1 -
 keyboards/kbdfans/kbd6x/config.h                  |  1 -
 keyboards/kbdfans/kbd75/config.h                  |  1 -
 keyboards/kbdfans/kbd75hs/config.h                |  1 -
 keyboards/kbdfans/kbd75rgb/config.h               |  1 -
 keyboards/kbdfans/kbd8x/config.h                  |  1 -
 keyboards/kbdfans/kbd8x_mk2/config.h              |  1 -
 keyboards/kbdfans/kbdmini/config.h                |  1 -
 keyboards/kbdfans/kbdpad/mk2/config.h             |  1 -
 keyboards/kbdfans/niu_mini/config.h               |  1 -
 keyboards/kbdfans/odin/rgb/config.h               |  1 -
 keyboards/kbdfans/odin/soldered/config.h          |  1 -
 keyboards/kbdfans/phaseone/config.h               |  1 -
 keyboards/kbdfans/tiger80/config.h                |  1 -
 keyboards/kc60/config.h                           |  1 -
 keyboards/kc60se/config.h                         |  1 -
 keyboards/keebio/dilly/config.h                   |  1 -
 keyboards/keebio/ergodicity/config.h              |  1 -
 keyboards/keebio/tragicforce68/config.h           |  1 -
 keyboards/keebsforall/freebird60/config.h         |  1 -
 keyboards/keebsforall/freebirdnp/lite/config.h    |  1 -
 keyboards/keebsforall/freebirdnp/pro/config.h     |  1 -
 keyboards/keebsforall/freebirdtkl/config.h        |  1 -
 keyboards/keebwerk/nano_slider/config.h           |  1 -
 keyboards/keebzdotnet/fme/config.h                |  1 -
 keyboards/keebzdotnet/wazowski/config.h           |  1 -
 keyboards/keybage/radpad/config.h                 |  1 -
 keyboards/keybee/keybee65/config.h                |  1 -
 keyboards/keyboardio/atreus/config.h              |  1 -
 keyboards/keycapsss/o4l_5x12/config.h             |  1 -
 keyboards/keycapsss/plaid_pad/rev1/config.h       |  1 -
 keyboards/keycapsss/plaid_pad/rev2/config.h       |  1 -
 keyboards/keycapsss/plaid_pad/rev3/config.h       |  1 -
 keyboards/keyhive/absinthe/config.h               |  1 -
 keyboards/keyhive/ergosaurus/config.h             |  1 -
 keyboards/keyhive/lattice60/config.h              |  1 -
 keyboards/keyhive/maypad/config.h                 |  1 -
 keyboards/keyhive/navi10/rev0/config.h            |  1 -
 keyboards/keyhive/navi10/rev2/config.h            |  1 -
 keyboards/keyhive/navi10/rev3/config.h            |  1 -
 keyboards/keyhive/opus/config.h                   |  1 -
 keyboards/keyhive/smallice/config.h               |  1 -
 keyboards/keyhive/southpole/config.h              |  1 -
 keyboards/keyhive/uno/rev1/config.h               |  1 -
 keyboards/keyhive/uno/rev2/config.h               |  1 -
 keyboards/keyhive/ut472/config.h                  |  1 -
 keyboards/keyprez/bison/config.h                  |  1 -
 keyboards/keyprez/corgi/config.h                  |  1 -
 keyboards/keyprez/unicorn/config.h                |  1 -
 keyboards/keyquest/enclave/config.h               |  1 -
 keyboards/keysofkings/twokey/config.h             |  1 -
 keyboards/keystonecaps/gameroyadvance/config.h    |  1 -
 keyboards/keyten/kt60_m/config.h                  |  1 -
 keyboards/kikkou/config.h                         |  1 -
 keyboards/kin80/micro/config.h                    |  1 -
 keyboards/kindakeyboards/conone65/config.h        |  1 -
 keyboards/kinesis/alvicstep/config.h              |  1 -
 keyboards/kinesis/kint2pp/config.h                |  1 -
 keyboards/kinesis/kint36/config.h                 |  1 -
 keyboards/kinesis/kint41/config.h                 |  1 -
 keyboards/kinesis/kintlc/config.h                 |  1 -
 keyboards/kinesis/nguyenvietyen/config.h          |  1 -
 keyboards/kinesis/stapelberg/config.h             |  1 -
 keyboards/kineticlabs/emu/hotswap/config.h        |  1 -
 keyboards/kineticlabs/emu/soldered/config.h       |  1 -
 keyboards/kingly_keys/ave/config.h                |  1 -
 keyboards/kingly_keys/little_foot/config.h        |  1 -
 keyboards/kingly_keys/romac/config.h              |  1 -
 keyboards/kingly_keys/romac_plus/config.h         |  1 -
 keyboards/kingly_keys/ropro/config.h              |  1 -
 keyboards/kingly_keys/smd_milk/config.h           |  1 -
 keyboards/kingly_keys/soap/config.h               |  1 -
 keyboards/kira75/config.h                         |  1 -
 keyboards/kira80/config.h                         |  1 -
 keyboards/kiwikeebs/macro/config.h                |  1 -
 keyboards/kiwikeebs/macro_v2/config.h             |  1 -
 keyboards/kiwikey/borderland/config.h             |  1 -
 keyboards/kiwikey/kawii9/config.h                 |  1 -
 keyboards/kiwikey/wanderland/config.h             |  1 -
 keyboards/kkatano/bakeneko60/config.h             |  1 -
 keyboards/kkatano/bakeneko65/rev2/config.h        |  1 -
 keyboards/kkatano/bakeneko65/rev3/config.h        |  1 -
 keyboards/kkatano/bakeneko80/config.h             |  1 -
 keyboards/kkatano/wallaby/config.h                |  1 -
 keyboards/kkatano/yurei/config.h                  |  1 -
 keyboards/kmac/config.h                           |  1 -
 keyboards/kmac_pad/config.h                       |  1 -
 keyboards/kmini/config.h                          |  1 -
 keyboards/knobgoblin/config.h                     |  1 -
 keyboards/knops/mini/config.h                     |  1 -
 keyboards/kona_classic/config.h                   |  1 -
 keyboards/kopibeng/mnk65/config.h                 |  1 -
 keyboards/kopibeng/xt65/config.h                  |  1 -
 keyboards/kprepublic/bm16a/config.h               |  1 -
 keyboards/kprepublic/bm16s/config.h               |  1 -
 keyboards/kprepublic/bm40hsrgb/config.h           |  1 -
 keyboards/kprepublic/bm60hsrgb/rev2/config.h      |  1 -
 keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h   |  1 -
 keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h  |  1 -
 .../kprepublic/bm60hsrgb_poker/rev2/config.h      |  1 -
 keyboards/kprepublic/bm65hsrgb/rev1/config.h      |  1 -
 keyboards/kprepublic/bm68hsrgb/rev1/config.h      |  1 -
 keyboards/kprepublic/bm68hsrgb/rev2/config.h      |  1 -
 keyboards/kprepublic/bm80hsrgb/config.h           |  1 -
 keyboards/kprepublic/bm80v2/config.h              |  1 -
 keyboards/kprepublic/bm80v2_iso/config.h          |  1 -
 keyboards/kprepublic/bm980hsrgb/config.h          |  1 -
 keyboards/kprepublic/cospad/config.h              |  1 -
 keyboards/ktec/daisy/config.h                     |  1 -
 keyboards/ktec/staryu/config.h                    |  1 -
 keyboards/kv/revt/config.h                        |  1 -
 keyboards/kwub/bloop/config.h                     |  1 -
 keyboards/ky01/config.h                           |  1 -
 keyboards/labbe/labbeminiv1/config.h              |  1 -
 keyboards/labyrinth75/config.h                    |  1 -
 keyboards/latincompass/latin17rgb/config.h        |  1 -
 keyboards/latincompass/latin47ble/config.h        |  1 -
 keyboards/latincompass/latin60rgb/config.h        |  1 -
 keyboards/latincompass/latin64ble/config.h        |  1 -
 keyboards/latincompass/latin6rgb/config.h         |  1 -
 keyboards/latincompass/latinpad/config.h          |  1 -
 keyboards/latincompass/latinpadble/config.h       |  1 -
 keyboards/lazydesigners/dimple/config.h           |  1 -
 keyboards/lazydesigners/the50/config.h            |  1 -
 keyboards/lazydesigners/the60/rev1/config.h       |  1 -
 keyboards/leafcutterlabs/bigknob/config.h         |  1 -
 keyboards/leeku/finger65/config.h                 |  1 -
 keyboards/lfkeyboards/lfk65_hs/config.h           |  1 -
 keyboards/lfkeyboards/lfk78/revb/config.h         |  1 -
 keyboards/lfkeyboards/lfk78/revc/config.h         |  1 -
 keyboards/lfkeyboards/lfk78/revj/config.h         |  1 -
 keyboards/lfkeyboards/lfk87/config.h              |  4 ----
 keyboards/lfkeyboards/lfkpad/config.h             |  1 -
 keyboards/lfkeyboards/mini1800/config.h           |  1 -
 keyboards/lfkeyboards/smk65/revb/config.h         |  2 --
 keyboards/lfkeyboards/smk65/revf/config.h         |  1 -
 keyboards/linworks/dolice/config.h                |  1 -
 keyboards/linworks/fave65h/config.h               |  1 -
 keyboards/linworks/fave84h/config.h               |  1 -
 keyboards/linworks/fave87/config.h                |  1 -
 keyboards/linworks/fave87h/config.h               |  1 -
 keyboards/linworks/whale75/config.h               |  1 -
 keyboards/littlealby/mute/config.h                |  1 -
 keyboards/lizard_trick/tenkey_plusplus/config.h   |  1 -
 keyboards/ll3macorn/bongopad/config.h             |  1 -
 keyboards/lm_keyboard/lm60n/config.h              |  1 -
 keyboards/lucid/alexa/config.h                    |  1 -
 keyboards/lucid/alexa_solder/config.h             |  1 -
 keyboards/lucid/kbd8x_hs/config.h                 |  1 -
 keyboards/lucid/phantom_hs/config.h               |  1 -
 keyboards/lucid/phantom_solder/config.h           |  1 -
 keyboards/lucid/scarlet/config.h                  |  1 -
 keyboards/lw67/config.h                           |  1 -
 keyboards/lyso1/lck75/config.h                    |  1 -
 keyboards/lyso1/lefishe/config.h                  |  1 -
 keyboards/lz/erghost/config.h                     |  1 -
 keyboards/m10a/config.h                           |  1 -
 keyboards/machine_industries/m4_a/config.h        |  1 -
 keyboards/macro1/config.h                         |  1 -
 keyboards/macro3/config.h                         |  1 -
 keyboards/makrosu/config.h                        |  1 -
 keyboards/manta60/config.h                        |  1 -
 keyboards/manyboard/macro/config.h                |  1 -
 keyboards/maple_computing/6ball/config.h          |  1 -
 keyboards/maple_computing/christmas_tree/config.h |  1 -
 keyboards/maple_computing/ivy/rev1/config.h       |  1 -
 keyboards/maple_computing/jnao/config.h           |  1 -
 keyboards/maple_computing/launchpad/rev1/config.h |  1 -
 .../maple_computing/lets_split_eh/eh/config.h     |  1 -
 keyboards/maple_computing/the_ruler/config.h      |  1 -
 keyboards/marksard/leftover30/config.h            |  1 -
 keyboards/marksard/rhymestone/rev1/config.h       |  1 -
 keyboards/marksard/treadstone32/lite/config.h     |  1 -
 keyboards/marksard/treadstone32/rev1/config.h     |  1 -
 keyboards/marksard/treadstone48/rev1/config.h     |  1 -
 keyboards/marksard/treadstone48/rev2/config.h     |  1 -
 keyboards/massdrop/alt/config.h                   |  1 -
 keyboards/massdrop/ctrl/config.h                  |  1 -
 keyboards/masterworks/classy_tkl/rev_a/config.h   |  1 -
 keyboards/matchstickworks/southpad/config.h       |  1 -
 keyboards/matrix/abelx/config.h                   |  1 -
 keyboards/matrix/cain_re/config.h                 |  1 -
 keyboards/matrix/falcon/config.h                  |  1 -
 keyboards/matrix/m12og/rev2/config.h              |  1 -
 keyboards/matrix/m20add/config.h                  |  1 -
 keyboards/matrix/me/config.h                      |  1 -
 keyboards/matrix/noah/config.h                    |  1 -
 keyboards/matthewdias/m3n3van/config.h            |  1 -
 keyboards/matthewdias/minim/config.h              |  1 -
 keyboards/matthewdias/txuu/config.h               |  1 -
 keyboards/maxipad/promicro/config.h               |  1 -
 keyboards/maxipad/teensy2/config.h                |  1 -
 keyboards/maxr1998/pulse4k/config.h               |  1 -
 keyboards/mb44/config.h                           |  1 -
 keyboards/mc_76k/config.h                         |  1 -
 keyboards/mechanickeys/miniashen40/config.h       |  1 -
 keyboards/mechanickeys/undead60m/config.h         |  1 -
 keyboards/mechbrewery/mb65h/config.h              |  1 -
 keyboards/mechbrewery/mb65s/config.h              |  1 -
 keyboards/mechkeys/acr60/config.h                 |  1 -
 keyboards/mechkeys/alu84/config.h                 |  1 -
 keyboards/mechkeys/espectro/config.h              |  1 -
 keyboards/mechkeys/mechmini/v2/config.h           |  1 -
 keyboards/mechkeys/mk60/config.h                  |  1 -
 keyboards/mechlovin/adelais/rgb_led/rev1/config.h |  1 -
 .../mechlovin/adelais/standard_led/arm/config.h   |  1 -
 .../adelais/standard_led/avr/rev1/config.h        |  1 -
 keyboards/mechlovin/hannah910/config.h            |  1 -
 keyboards/mechlovin/hex4b/rev1/config.h           |  1 -
 keyboards/mechlovin/hex4b/rev2/config.h           |  1 -
 keyboards/mechlovin/hex6c/config.h                |  1 -
 keyboards/mechlovin/infinity87/rev2/config.h      |  1 -
 keyboards/mechlovin/infinity875/config.h          |  1 -
 keyboards/mechlovin/jay60/config.h                |  1 -
 keyboards/mechlovin/kanu/config.h                 |  1 -
 keyboards/mechlovin/kay60/config.h                |  1 -
 keyboards/mechlovin/olly/bb/config.h              |  1 -
 keyboards/mechlovin/olly/jf/config.h              |  1 -
 keyboards/mechlovin/serratus/config.h             |  1 -
 keyboards/mechlovin/th1800/config.h               |  1 -
 keyboards/mechlovin/zed60/config.h                |  1 -
 keyboards/mechstudio/dawn/config.h                |  1 -
 keyboards/mechstudio/ud_40_ortho/config.h         |  1 -
 keyboards/mechwild/bbs/config.h                   |  1 -
 keyboards/mechwild/bde/lefty/config.h             |  1 -
 keyboards/mechwild/bde/rev2/config.h              |  1 -
 keyboards/mechwild/bde/righty/config.h            |  1 -
 keyboards/mechwild/mercutio/config.h              |  1 -
 keyboards/mechwild/mokulua/mirrored/config.h      |  1 -
 keyboards/mechwild/mokulua/standard/config.h      |  1 -
 keyboards/mechwild/murphpad/config.h              |  1 -
 keyboards/mechwild/obe/config.h                   |  1 -
 keyboards/mechwild/waka60/config.h                |  1 -
 keyboards/melgeek/mach80/rev1/config.h            |  1 -
 keyboards/melgeek/mach80/rev2/config.h            |  1 -
 keyboards/melgeek/mj61/rev1/config.h              |  1 -
 keyboards/melgeek/mj61/rev2/config.h              |  1 -
 keyboards/melgeek/mj63/rev1/config.h              |  1 -
 keyboards/melgeek/mj63/rev2/config.h              |  1 -
 keyboards/melgeek/mj64/rev1/config.h              |  1 -
 keyboards/melgeek/mj64/rev2/config.h              |  1 -
 keyboards/melgeek/mj64/rev3/config.h              |  1 -
 keyboards/melgeek/mj65/rev3/config.h              |  1 -
 keyboards/melgeek/mj6xy/rev3/config.h             |  1 -
 keyboards/melgeek/mojo68/rev1/config.h            |  1 -
 keyboards/melgeek/mojo75/rev1/config.h            |  1 -
 keyboards/melgeek/tegic/rev1/config.h             |  1 -
 keyboards/melgeek/z70ultra/rev1/config.h          |  1 -
 keyboards/meme/config.h                           |  1 -
 keyboards/meow65/config.h                         |  1 -
 keyboards/merge/iso_macro/config.h                |  1 -
 keyboards/merge/uc1/config.h                      |  1 -
 keyboards/merge/um70/config.h                     |  1 -
 keyboards/merge/um80/config.h                     |  1 -
 keyboards/merge/uma/config.h                      |  1 -
 keyboards/mesa/mesa_tkl/config.h                  |  1 -
 keyboards/meson/config.h                          |  1 -
 keyboards/metamechs/timberwolf/config.h           |  1 -
 keyboards/mexsistor/ludmila/config.h              |  1 -
 keyboards/mikeneko65/config.h                     |  1 -
 keyboards/miller/gm862/config.h                   |  1 -
 keyboards/millipad/config.h                       |  1 -
 keyboards/mini_elixivy/config.h                   |  1 -
 keyboards/mini_ten_key_plus/config.h              |  1 -
 keyboards/miniaxe/config.h                        |  1 -
 keyboards/minimacro5/config.h                     |  1 -
 keyboards/minimon/index_tab/config.h              |  1 -
 keyboards/mino/hotswap/config.h                   |  1 -
 keyboards/mint60/config.h                         |  1 -
 keyboards/misonoworks/chocolatebar/config.h       |  1 -
 keyboards/misonoworks/karina/config.h             |  1 -
 keyboards/miuni32/config.h                        |  1 -
 keyboards/mlego/m48/rev1/config.h                 |  1 -
 keyboards/mlego/m60/rev1/config.h                 |  1 -
 keyboards/mlego/m60_split/rev1/config.h           |  1 -
 keyboards/mlego/m60_split/rev2/config.h           |  1 -
 keyboards/mlego/m65/rev1/config.h                 |  1 -
 keyboards/mlego/m65/rev2/config.h                 |  1 -
 keyboards/mlego/m65/rev3/config.h                 |  1 -
 keyboards/mlego/m65/rev4/config.h                 |  1 -
 keyboards/mntre/config.h                          |  1 -
 keyboards/mode/m80v1/config.h                     |  1 -
 keyboards/mokey/ginkgo65/config.h                 |  1 -
 keyboards/mokey/ginkgo65hot/config.h              |  1 -
 keyboards/mokey/mokey63/config.h                  |  1 -
 keyboards/mokey/mokey64/config.h                  |  1 -
 keyboards/mokey/xox70/config.h                    |  1 -
 keyboards/mokey/xox70hot/config.h                 |  1 -
 keyboards/molecule/config.h                       |  1 -
 keyboards/momoka_ergo/config.h                    |  1 -
 keyboards/monoflex60/config.h                     |  1 -
 keyboards/monstargear/xo87/rgb/config.h           |  1 -
 keyboards/monstargear/xo87/solderable/config.h    |  1 -
 keyboards/montsinger/rebound/rev1/config.h        |  1 -
 keyboards/montsinger/rebound/rev2/config.h        |  1 -
 keyboards/montsinger/rebound/rev3/config.h        |  1 -
 keyboards/montsinger/rebound/rev4/config.h        |  1 -
 keyboards/montsinger/rewind/config.h              |  1 -
 keyboards/morizon/config.h                        |  1 -
 keyboards/mountainblocks/mb17/config.h            |  1 -
 keyboards/ms_sculpt/info.json                     |  1 -
 keyboards/mt/blocked65/config.h                   |  1 -
 keyboards/mt/mt40/config.h                        |  1 -
 keyboards/mt/mt64rgb/config.h                     |  1 -
 keyboards/mt/mt84/config.h                        |  1 -
 keyboards/mt/mt980/config.h                       |  1 -
 keyboards/mtbkeys/mtb60/hotswap/config.h          |  1 -
 keyboards/mtbkeys/mtb60/solder/config.h           |  1 -
 keyboards/murcielago/rev1/config.h                |  1 -
 keyboards/mxss/config.h                           |  1 -
 keyboards/mysticworks/wyvern/config.h             |  1 -
 keyboards/nacly/ua62/config.h                     |  1 -
 keyboards/ncc1701kb/config.h                      |  1 -
 keyboards/neito/config.h                          |  1 -
 keyboards/neopad/rev1/config.h                    |  1 -
 keyboards/neson_design/700e/config.h              |  1 -
 keyboards/neson_design/n6/config.h                |  1 -
 keyboards/newgame40/config.h                      |  1 -
 keyboards/nightingale_studios/hailey/config.h     |  1 -
 keyboards/nightly_boards/adellein/config.h        |  1 -
 keyboards/nightly_boards/alter/rev1/config.h      |  1 -
 keyboards/nightly_boards/alter_lite/config.h      |  1 -
 keyboards/nightly_boards/conde60/config.h         |  1 -
 keyboards/nightly_boards/n2/config.h              |  1 -
 keyboards/nightly_boards/n40_o/config.h           |  1 -
 keyboards/nightly_boards/n60_s/config.h           |  1 -
 keyboards/nightly_boards/n87/config.h             |  1 -
 keyboards/nightly_boards/n9/config.h              |  1 -
 keyboards/nightly_boards/octopad/config.h         |  1 -
 keyboards/nightly_boards/paraluman/config.h       |  1 -
 keyboards/nightly_boards/ph_arisu/config.h        |  1 -
 keyboards/nightmare/config.h                      |  1 -
 keyboards/nimrod/config.h                         |  1 -
 keyboards/nix_studio/oxalys80/config.h            |  1 -
 keyboards/nopunin10did/jabberwocky/config.h       |  1 -
 keyboards/nopunin10did/kastenwagen1840/config.h   |  1 -
 keyboards/nopunin10did/kastenwagen48/config.h     |  1 -
 keyboards/nopunin10did/railroad/rev0/config.h     |  1 -
 keyboards/novelkeys/novelpad/config.h             |  1 -
 keyboards/noxary/220/config.h                     |  1 -
 keyboards/noxary/260/config.h                     |  1 -
 keyboards/noxary/268/config.h                     |  1 -
 keyboards/noxary/268_2/config.h                   |  1 -
 keyboards/noxary/268_2_rgb/config.h               |  1 -
 keyboards/noxary/280/config.h                     |  1 -
 keyboards/noxary/vulcan/config.h                  |  1 -
 keyboards/noxary/x268/config.h                    |  1 -
 keyboards/np12/config.h                           |  1 -
 keyboards/nullbitsco/tidbit/config.h              |  1 -
 keyboards/obosob/arch_36/config.h                 |  1 -
 keyboards/obosob/steal_this_keyboard/config.h     |  1 -
 keyboards/ocean/addon/config.h                    |  1 -
 keyboards/ocean/gin_v2/config.h                   |  1 -
 keyboards/ocean/stealth/config.h                  |  1 -
 keyboards/ocean/sus/config.h                      |  1 -
 keyboards/ocean/wang_ergo/config.h                |  1 -
 keyboards/ocean/wang_v2/config.h                  |  1 -
 keyboards/oddball/v1/config.h                     |  1 -
 keyboards/oddball/v2/config.h                     |  1 -
 keyboards/oddball/v2_1/config.h                   |  1 -
 keyboards/odelia/config.h                         |  1 -
 keyboards/ok60/config.h                           |  1 -
 keyboards/orange75/config.h                       |  1 -
 keyboards/org60/config.h                          |  1 -
 keyboards/ortho5by12/config.h                     |  1 -
 keyboards/orthocode/config.h                      |  1 -
 keyboards/p3d/glitch/config.h                     |  1 -
 keyboards/pabile/p18/config.h                     |  1 -
 keyboards/pabile/p20/ver1/config.h                |  1 -
 keyboards/pabile/p20/ver2/config.h                |  1 -
 keyboards/pabile/p40/config.h                     |  1 -
 keyboards/pabile/p40_ortho/config.h               |  1 -
 keyboards/pabile/p42/config.h                     |  1 -
 keyboards/palette1202/config.h                    |  1 -
 keyboards/panc40/config.h                         |  1 -
 keyboards/panc60/config.h                         |  1 -
 keyboards/papercranekeyboards/gerald65/config.h   |  1 -
 keyboards/parallel/parallel_65/hotswap/config.h   |  1 -
 keyboards/parallel/parallel_65/soldered/config.h  |  1 -
 keyboards/pdxkbc/config.h                         |  1 -
 keyboards/pearl/config.h                          |  1 -
 keyboards/pearlboards/atlas/config.h              |  1 -
 keyboards/pearlboards/pandora/config.h            |  1 -
 keyboards/pearlboards/zeus/config.h               |  1 -
 keyboards/pearlboards/zeuspad/config.h            |  1 -
 keyboards/peej/lumberjack/config.h                |  1 -
 keyboards/peej/rosaline/config.h                  |  1 -
 keyboards/peej/tripel/config.h                    |  1 -
 keyboards/pegasus/config.h                        |  1 -
 keyboards/peranekofactory/tone/rev1/config.h      |  1 -
 keyboards/peranekofactory/tone/rev2/config.h      |  1 -
 keyboards/percent/canoe/config.h                  |  1 -
 keyboards/percent/canoe_gen2/config.h             |  1 -
 keyboards/percent/skog_lite/config.h              |  1 -
 keyboards/phantom/config.h                        |  1 -
 keyboards/picolab/frusta_fundamental/config.h     |  1 -
 keyboards/pimentoso/paddino02/rev1/config.h       |  1 -
 keyboards/pimentoso/paddino02/rev2/left/config.h  |  1 -
 keyboards/pimentoso/paddino02/rev2/right/config.h |  1 -
 keyboards/pinky/3/config.h                        |  1 -
 keyboards/pinky/4/config.h                        |  1 -
 keyboards/pisces/config.h                         |  1 -
 keyboards/pizzakeyboards/pizza65/config.h         |  1 -
 keyboards/pjb/eros/config.h                       |  1 -
 keyboards/pkb65/config.h                          |  1 -
 keyboards/planck/config.h                         |  1 -
 keyboards/planck/keymaps/pvc/config.h             |  1 -
 keyboards/planck/keymaps/zrichard/config.h        |  1 -
 keyboards/planck/rev6/config.h                    |  1 -
 keyboards/planck/rev6_drop/config.h               |  1 -
 keyboards/playkbtw/ca66/config.h                  |  1 -
 keyboards/playkbtw/pk60/config.h                  |  1 -
 keyboards/ploopyco/mouse/config.h                 |  2 +-
 keyboards/ploopyco/mouse/mouse.c                  |  4 ++--
 keyboards/ploopyco/trackball/rev1/config.h        |  2 +-
 keyboards/ploopyco/trackball/rev1_005/config.h    |  2 +-
 keyboards/ploopyco/trackball/trackball.c          |  4 ++--
 .../ploopyco/trackball_mini/rev1_001/config.h     |  2 +-
 .../ploopyco/trackball_mini/rev1_002/config.h     |  2 +-
 .../ploopyco/trackball_mini/trackball_mini.c      |  4 ++--
 .../ploopyco/trackball_nano/rev1_001/config.h     |  2 +-
 .../ploopyco/trackball_nano/trackball_nano.c      |  4 ++--
 keyboards/pluckey/config.h                        |  1 -
 keyboards/plume/plume65/config.h                  |  1 -
 keyboards/plut0nium/0x3e/config.h                 |  1 -
 keyboards/plywrks/ahgase/config.h                 |  1 -
 keyboards/pohjolaworks/louhi/config.h             |  1 -
 keyboards/polilla/rev1/config.h                   |  1 -
 keyboards/polycarbdiet/s20/config.h               |  1 -
 keyboards/pom_keyboards/tnln95/config.h           |  1 -
 keyboards/portal_66/hotswap/config.h              |  1 -
 keyboards/portal_66/soldered/config.h             |  1 -
 keyboards/pos78/config.h                          |  1 -
 keyboards/preonic/config.h                        |  1 -
 keyboards/preonic/keymaps/kinesis/config.h        |  1 -
 keyboards/preonic/keymaps/zach/config.h           |  1 -
 keyboards/preonic/rev3/config.h                   |  1 -
 keyboards/preonic/rev3_drop/config.h              |  1 -
 .../primekb/prime_e/keymaps/milestogo/config.h    |  1 -
 keyboards/primekb/prime_l/v1/config.h             |  1 -
 keyboards/primekb/prime_l/v2/config.h             |  1 -
 keyboards/primekb/prime_m/config.h                |  1 -
 keyboards/primekb/prime_o/config.h                |  1 -
 keyboards/primekb/prime_r/config.h                |  1 -
 keyboards/program_yoink/config.h                  |  1 -
 keyboards/projectcain/relic/config.h              |  1 -
 keyboards/projectcain/vault35/config.h            |  1 -
 keyboards/projectcain/vault45/config.h            |  1 -
 keyboards/prototypist/allison/config.h            |  1 -
 keyboards/prototypist/allison_numpad/config.h     |  1 -
 keyboards/prototypist/j01/config.h                |  1 -
 keyboards/psuieee/pluto12/config.h                |  1 -
 keyboards/pteron36/config.h                       |  1 -
 keyboards/puck/config.h                           |  1 -
 keyboards/punk75/config.h                         |  1 -
 keyboards/q4z/config.h                            |  1 -
 keyboards/qpockets/eggman/config.h                |  1 -
 keyboards/qpockets/space_space/rev1/config.h      |  1 -
 keyboards/qpockets/space_space/rev2/config.h      |  1 -
 keyboards/qpockets/wanten/config.h                |  1 -
 keyboards/quad_h/lb75/config.h                    |  1 -
 keyboards/quantrik/kyuu/config.h                  |  1 -
 keyboards/qvex/lynepad/config.h                   |  1 -
 keyboards/rabbit/rabbit68/config.h                |  1 -
 keyboards/rad/config.h                            |  1 -
 keyboards/rainkeebs/delilah/config.h              |  1 -
 keyboards/rainkeebs/rainkeeb/config.h             |  1 -
 keyboards/rainkeebs/yasui/config.h                |  1 -
 keyboards/ramonimbao/aelith/config.h              |  1 -
 keyboards/ramonimbao/chevron/config.h             |  1 -
 keyboards/ramonimbao/herringbone/pro/config.h     |  1 -
 keyboards/ramonimbao/herringbone/v1/config.h      |  1 -
 keyboards/ramonimbao/mona/v1/config.h             |  1 -
 keyboards/ramonimbao/mona/v1_1/config.h           |  1 -
 keyboards/ramonimbao/mona/v32a/config.h           |  1 -
 keyboards/ramonimbao/squishyfrl/config.h          |  1 -
 keyboards/ramonimbao/squishytkl/config.h          |  1 -
 keyboards/ramonimbao/tkl_ff/config.h              |  1 -
 keyboards/ramonimbao/wete/v2/config.h             |  1 -
 keyboards/rart/rart45/config.h                    |  1 -
 keyboards/rart/rart4x4/config.h                   |  1 -
 keyboards/rart/rart67/config.h                    |  1 -
 keyboards/rart/rart67m/config.h                   |  1 -
 keyboards/rart/rart75/config.h                    |  1 -
 keyboards/rart/rart75hs/config.h                  |  1 -
 keyboards/rart/rart75m/config.h                   |  1 -
 keyboards/rart/rartand/config.h                   |  1 -
 keyboards/rart/rartland/config.h                  |  1 -
 keyboards/rart/rartlite/config.h                  |  1 -
 keyboards/rart/rartpad/config.h                   |  1 -
 keyboards/rate/pistachio/rev1/config.h            |  1 -
 keyboards/rate/pistachio/rev2/config.h            |  1 -
 keyboards/rate/pistachio_mp/config.h              |  1 -
 keyboards/rate/pistachio_pro/config.h             |  1 -
 keyboards/recompile_keys/choco60/rev1/config.h    |  1 -
 keyboards/recompile_keys/choco60/rev2/config.h    |  1 -
 keyboards/recompile_keys/cocoa40/config.h         |  1 -
 keyboards/recompile_keys/mio/config.h             |  1 -
 keyboards/recompile_keys/nomu30/rev1/config.h     |  1 -
 keyboards/recompile_keys/nomu30/rev2/config.h     |  1 -
 keyboards/redscarf_i/config.h                     |  1 -
 keyboards/redscarf_iiplus/verb/config.h           |  1 -
 keyboards/redscarf_iiplus/verc/config.h           |  1 -
 keyboards/redscarf_iiplus/verd/config.h           |  1 -
 keyboards/retro_75/config.h                       |  1 -
 keyboards/reversestudio/decadepad/config.h        |  1 -
 keyboards/reviung/reviung33/config.h              |  1 -
 keyboards/reviung/reviung34/config.h              |  1 -
 keyboards/reviung/reviung39/config.h              |  1 -
 keyboards/reviung/reviung41/config.h              |  1 -
 keyboards/reviung/reviung5/config.h               |  1 -
 keyboards/reviung/reviung53/config.h              |  1 -
 keyboards/reviung/reviung61/config.h              |  1 -
 keyboards/rmkeebs/rm_numpad/config.h              |  1 -
 keyboards/rominronin/katana60/rev1/config.h       |  1 -
 keyboards/rominronin/katana60/rev2/config.h       |  1 -
 keyboards/roseslite/config.h                      |  1 -
 keyboards/rotr/config.h                           |  1 -
 keyboards/rpiguy9907/southpaw66/config.h          |  1 -
 keyboards/rubi/config.h                           |  1 -
 keyboards/runes/skjoldr/config.h                  |  1 -
 keyboards/runes/vaengr/config.h                   |  1 -
 keyboards/ryanbaekr/rb18/config.h                 |  1 -
 keyboards/ryanbaekr/rb69/config.h                 |  1 -
 keyboards/ryanbaekr/rb86/config.h                 |  1 -
 keyboards/ryloo_studio/m0110/config.h             |  1 -
 keyboards/sandwich/keeb68/config.h                |  1 -
 keyboards/sauce/mild/config.h                     |  1 -
 keyboards/sawnsprojects/amber80/solder/config.h   |  1 -
 .../sawnsprojects/krush/krush60/solder/config.h   |  1 -
 .../sawnsprojects/krush/krush65/hotswap/config.h  |  1 -
 .../sawnsprojects/krush/krush65/solder/config.h   |  1 -
 keyboards/sawnsprojects/vcl65/solder/config.h     |  1 -
 keyboards/scatter42/config.h                      |  1 -
 keyboards/sck/gtm/config.h                        |  1 -
 keyboards/sck/m0116b/config.h                     |  1 -
 keyboards/sck/neiso/config.h                      |  1 -
 keyboards/sck/osa/config.h                        |  1 -
 keyboards/sekigon/grs_70ec/config.h               |  1 -
 keyboards/senselessclay/ck65/config.h             |  1 -
 keyboards/senselessclay/gos65/config.h            |  1 -
 keyboards/senselessclay/had60/config.h            |  1 -
 keyboards/sentraq/number_pad/config.h             |  1 -
 keyboards/sentraq/s60_x/default/config.h          |  1 -
 keyboards/sentraq/s60_x/rgb/config.h              |  1 -
 keyboards/sentraq/s65_plus/config.h               |  1 -
 keyboards/sentraq/s65_x/config.h                  |  1 -
 keyboards/sergiopoverony/creator_pro/config.h     |  1 -
 keyboards/sets3n/kk980/config.h                   |  1 -
 keyboards/shambles/config.h                       |  1 -
 keyboards/shapeshifter4060/config.h               |  1 -
 keyboards/shiro/config.h                          |  1 -
 keyboards/shk9/config.h                           |  1 -
 keyboards/signum/3_0/elitec/config.h              |  1 -
 keyboards/signum/3_0/teensy/config.h              |  1 -
 keyboards/silverbullet44/config.h                 |  1 -
 keyboards/singa/config.h                          |  1 -
 keyboards/skeletn87/hotswap/config.h              |  1 -
 keyboards/skeletn87/soldered/config.h             |  1 -
 keyboards/skeletonkbd/skeletonnumpad/config.h     |  1 -
 keyboards/skergo/config.h                         |  1 -
 keyboards/skippys_custom_pcs/rooboard65/config.h  |  1 -
 keyboards/skippys_custom_pcs/roopad/config.h      |  1 -
 keyboards/slz40/config.h                          |  1 -
 keyboards/smallkeyboard/config.h                  |  1 -
 keyboards/smk60/config.h                          |  1 -
 keyboards/snampad/config.h                        |  1 -
 keyboards/sneakbox/aliceclone/config.h            |  1 -
 keyboards/sneakbox/aliceclonergb/config.h         |  1 -
 keyboards/sneakbox/ava/config.h                   |  1 -
 keyboards/sneakbox/disarray/ortho/config.h        |  1 -
 keyboards/sneakbox/disarray/staggered/config.h    |  1 -
 keyboards/soup10/config.h                         |  1 -
 keyboards/sowbug/68keys/config.h                  |  1 -
 keyboards/sowbug/ansi_tkl/config.h                |  1 -
 keyboards/soy20/config.h                          |  1 -
 keyboards/spaceman/2_milk/config.h                |  1 -
 keyboards/spaceman/pancake/rev1/feather/config.h  |  1 -
 keyboards/spaceman/pancake/rev1/promicro/config.h |  1 -
 keyboards/spaceman/pancake/rev2/config.h          |  1 -
 keyboards/spaceman/yun65/config.h                 |  1 -
 keyboards/spacetime/config.h                      |  1 -
 keyboards/specskeys/config.h                      |  1 -
 keyboards/splitish/config.h                       |  1 -
 keyboards/splitkb/kyria/rev1/config.h             |  1 -
 keyboards/splitkb/kyria/rev2/config.h             |  1 -
 keyboards/splitkb/zima/config.h                   |  1 -
 keyboards/sporewoh/banime40/config.h              |  1 -
 keyboards/star75/config.h                         |  1 -
 keyboards/stello65/beta/config.h                  |  1 -
 keyboards/stello65/hs_rev1/config.h               |  1 -
 keyboards/stello65/sl_rev1/config.h               |  1 -
 keyboards/stratos/config.h                        |  1 -
 keyboards/subatomic/config.h                      |  1 -
 keyboards/subrezon/la_nc/config.h                 |  1 -
 keyboards/superuser/ext/config.h                  |  1 -
 keyboards/superuser/frl/config.h                  |  1 -
 keyboards/superuser/tkl/config.h                  |  1 -
 keyboards/switchplate/southpaw_65/config.h        |  1 -
 keyboards/switchplate/southpaw_fullsize/config.h  |  1 -
 keyboards/switchplate/switchplate910/config.h     |  1 -
 keyboards/sx60/config.h                           |  1 -
 keyboards/synapse/config.h                        |  1 -
 keyboards/system76/launch_1/config.h              |  1 -
 keyboards/tada68/config.h                         |  1 -
 keyboards/takashicompany/center_enter/config.h    |  1 -
 keyboards/takashicompany/compacx/config.h         |  1 -
 keyboards/takashicompany/dogtag/config.h          |  1 -
 keyboards/takashicompany/endzone34/config.h       |  1 -
 keyboards/takashicompany/heavy_left/config.h      |  1 -
 keyboards/takashicompany/minizone/config.h        |  1 -
 keyboards/takashicompany/qoolee/config.h          |  1 -
 keyboards/takashicompany/radialex/config.h        |  1 -
 keyboards/takashiski/hecomi/alpha/config.h        |  1 -
 keyboards/takashiski/namecard2x4/rev1/config.h    |  1 -
 keyboards/takashiski/namecard2x4/rev2/config.h    |  1 -
 keyboards/takashiski/otaku_split/rev0/config.h    |  1 -
 keyboards/takashiski/otaku_split/rev1/config.h    |  1 -
 keyboards/taleguers/taleguers75/config.h          |  1 -
 keyboards/tanuki/config.h                         |  1 -
 keyboards/tau4/config.h                           |  1 -
 keyboards/team0110/p1800fl/config.h               |  1 -
 keyboards/teleport/numpad/config.h                |  1 -
 keyboards/tender/macrowo_pad/config.h             |  1 -
 keyboards/tenki/config.h                          |  1 -
 keyboards/terrazzo/config.h                       |  1 -
 keyboards/tetris/config.h                         |  1 -
 keyboards/tg4x/config.h                           |  1 -
 keyboards/tgr/910/config.h                        |  1 -
 keyboards/tgr/910ce/config.h                      |  1 -
 keyboards/tgr/jane/v2/config.h                    |  1 -
 keyboards/tgr/jane/v2ce/config.h                  |  1 -
 keyboards/the_royal/liminal/config.h              |  1 -
 keyboards/the_royal/schwann/config.h              |  1 -
 keyboards/the_uni/pro_micro/config.h              |  1 -
 keyboards/the_uni/usb_c/config.h                  |  1 -
 keyboards/themadnoodle/ncc1701kb/v2/config.h      |  1 -
 keyboards/themadnoodle/noodlepad/config.h         |  1 -
 keyboards/thevankeyboards/bananasplit/config.h    |  1 -
 keyboards/thevankeyboards/caravan/config.h        |  1 -
 keyboards/thevankeyboards/jetvan/config.h         |  1 -
 keyboards/thevankeyboards/minivan/config.h        |  1 -
 keyboards/thevankeyboards/roadkit/config.h        |  1 -
 keyboards/tkc/california/config.h                 |  1 -
 keyboards/tkc/m0lly/config.h                      |  1 -
 keyboards/tkc/osav2/config.h                      |  1 -
 keyboards/tkc/tkc1800/config.h                    |  1 -
 keyboards/tkc/tkl_ab87/config.h                   |  1 -
 keyboards/tkw/stoutgat/v1/config.h                |  1 -
 keyboards/tmo50/config.h                          |  1 -
 keyboards/toad/config.h                           |  1 -
 keyboards/tokyokeyboard/alix40/config.h           |  1 -
 keyboards/tokyokeyboard/tokyo60/config.h          |  1 -
 keyboards/tominabox1/adalyn/config.h              |  1 -
 keyboards/tominabox1/bigboy/config.h              |  1 -
 keyboards/tominabox1/le_chiffre/he/config.h       |  1 -
 keyboards/tominabox1/le_chiffre/rev1/config.h     |  1 -
 keyboards/tominabox1/le_chiffre/rev2/config.h     |  1 -
 keyboards/tominabox1/littlefoot_lx/rev1/config.h  |  1 -
 keyboards/tominabox1/littlefoot_lx/rev2/config.h  |  1 -
 keyboards/tominabox1/qaz/config.h                 |  1 -
 keyboards/tominabox1/underscore33/rev1/config.h   |  1 -
 keyboards/tominabox1/underscore33/rev2/config.h   |  1 -
 keyboards/torn/config.h                           |  1 -
 keyboards/tr60w/config.h                          |  1 -
 keyboards/treasure/type9/config.h                 |  1 -
 keyboards/treasure/type9s2/config.h               |  1 -
 keyboards/tszaboo/ortho4exent/config.h            |  1 -
 keyboards/tw40/config.h                           |  1 -
 keyboards/uk78/config.h                           |  1 -
 keyboards/ungodly/nines/config.h                  |  1 -
 .../overnumpad_1xb/config.h                       |  1 -
 .../overnumpad_1xb/config.h                       |  1 -
 .../overnumpad_1xb/config.h                       |  1 -
 .../spacesaver_m_pre_2013/overnumpad_1xb/config.h |  1 -
 keyboards/unikeyboard/diverge3/config.h           |  1 -
 keyboards/unikeyboard/divergetm2/config.h         |  1 -
 keyboards/unikeyboard/felix/config.h              |  1 -
 keyboards/unikorn/config.h                        |  1 -
 keyboards/unison/v04/config.h                     |  1 -
 keyboards/uranuma/config.h                        |  1 -
 keyboards/utd80/config.h                          |  1 -
 keyboards/v60_type_r/config.h                     |  1 -
 keyboards/vagrant_10/config.h                     |  1 -
 keyboards/viktus/at101_bh/config.h                |  1 -
 keyboards/viktus/omnikey_bh/config.h              |  1 -
 keyboards/viktus/smolka/config.h                  |  1 -
 keyboards/viktus/styrka/config.h                  |  1 -
 keyboards/viktus/z150_bh/config.h                 |  1 -
 keyboards/waldo/config.h                          |  1 -
 keyboards/walletburner/cajal/config.h             |  1 -
 keyboards/walletburner/neuron/config.h            |  1 -
 keyboards/wavtype/foundation/config.h             |  1 -
 keyboards/wavtype/p01_ultra/config.h              |  1 -
 keyboards/weirdo/tiger910/config.h                |  1 -
 keyboards/wekey/polaris/config.h                  |  1 -
 keyboards/wekey/we27/config.h                     |  1 -
 keyboards/westfoxtrot/aanzee/config.h             |  1 -
 keyboards/westfoxtrot/cyclops/config.h            |  1 -
 keyboards/westfoxtrot/cypher/rev1/config.h        |  1 -
 keyboards/westfoxtrot/cypher/rev5/config.h        |  1 -
 keyboards/westfoxtrot/prophet/config.h            |  1 -
 keyboards/wilba_tech/rama_works_kara/config.h     |  1 -
 keyboards/wilba_tech/rama_works_koyu/config.h     |  1 -
 keyboards/wilba_tech/rama_works_m10_b/config.h    |  1 -
 keyboards/wilba_tech/rama_works_m10_c/config.h    |  1 -
 keyboards/wilba_tech/rama_works_m50_a/config.h    |  1 -
 keyboards/wilba_tech/rama_works_m50_ax/config.h   |  1 -
 keyboards/wilba_tech/rama_works_m60_a/config.h    |  1 -
 keyboards/wilba_tech/rama_works_m65_b/config.h    |  1 -
 keyboards/wilba_tech/rama_works_m65_bx/config.h   |  1 -
 keyboards/wilba_tech/rama_works_m6_a/config.h     |  1 -
 keyboards/wilba_tech/rama_works_m6_b/config.h     |  1 -
 keyboards/wilba_tech/rama_works_u80_a/config.h    |  1 -
 keyboards/wilba_tech/wt60_a/config.h              |  1 -
 keyboards/wilba_tech/wt60_b/config.h              |  1 -
 keyboards/wilba_tech/wt60_bx/config.h             |  1 -
 keyboards/wilba_tech/wt60_c/config.h              |  1 -
 keyboards/wilba_tech/wt60_d/config.h              |  1 -
 keyboards/wilba_tech/wt60_g/config.h              |  1 -
 keyboards/wilba_tech/wt60_g2/config.h             |  1 -
 keyboards/wilba_tech/wt60_h1/config.h             |  1 -
 keyboards/wilba_tech/wt60_h2/config.h             |  1 -
 keyboards/wilba_tech/wt60_h3/config.h             |  1 -
 keyboards/wilba_tech/wt60_xt/config.h             |  1 -
 keyboards/wilba_tech/wt65_a/config.h              |  1 -
 keyboards/wilba_tech/wt65_b/config.h              |  1 -
 keyboards/wilba_tech/wt65_d/config.h              |  1 -
 keyboards/wilba_tech/wt65_f/config.h              |  1 -
 keyboards/wilba_tech/wt65_fx/config.h             |  1 -
 keyboards/wilba_tech/wt65_g/config.h              |  1 -
 keyboards/wilba_tech/wt65_g2/config.h             |  1 -
 keyboards/wilba_tech/wt65_h1/config.h             |  1 -
 keyboards/wilba_tech/wt65_xt/config.h             |  1 -
 keyboards/wilba_tech/wt65_xtx/config.h            |  1 -
 keyboards/wilba_tech/wt69_a/config.h              |  1 -
 keyboards/wilba_tech/wt70_jb/config.h             |  1 -
 keyboards/wilba_tech/wt75_a/config.h              |  1 -
 keyboards/wilba_tech/wt75_b/config.h              |  1 -
 keyboards/wilba_tech/wt75_c/config.h              |  1 -
 keyboards/wilba_tech/wt80_a/config.h              |  1 -
 keyboards/wilba_tech/wt80_bc/config.h             |  1 -
 keyboards/wilba_tech/wt80_g/config.h              |  1 -
 keyboards/wilba_tech/wt8_a/config.h               |  1 -
 keyboards/wilba_tech/zeal60/config.h              |  1 -
 keyboards/wilba_tech/zeal65/config.h              |  1 -
 keyboards/winkeyless/bface/config.h               |  1 -
 keyboards/winkeys/mini_winni/config.h             |  1 -
 keyboards/wolf/kuku65/config.h                    |  1 -
 keyboards/wolf/ryujin/config.h                    |  1 -
 keyboards/wolf/sabre/config.h                     |  1 -
 keyboards/wolf/ts60/config.h                      |  1 -
 keyboards/woodkeys/bigseries/1key/config.h        |  1 -
 keyboards/woodkeys/bigseries/2key/config.h        |  1 -
 keyboards/woodkeys/bigseries/3key/config.h        |  1 -
 keyboards/woodkeys/bigseries/4key/config.h        |  1 -
 keyboards/woodkeys/meira/featherble/config.h      |  1 -
 keyboards/woodkeys/meira/promicro/config.h        |  1 -
 keyboards/work_louder/loop/config.h               |  1 -
 keyboards/work_louder/work_board/config.h         |  1 -
 keyboards/wren/config.h                           |  1 -
 keyboards/wsk/alpha9/config.h                     |  1 -
 keyboards/wsk/g4m3ralpha/config.h                 |  1 -
 keyboards/wsk/gothic50/config.h                   |  1 -
 keyboards/wsk/gothic70/config.h                   |  1 -
 keyboards/wsk/houndstooth/config.h                |  1 -
 keyboards/wsk/jerkin/config.h                     |  1 -
 keyboards/wsk/kodachi50/config.h                  |  1 -
 keyboards/wsk/pain27/config.h                     |  1 -
 keyboards/wsk/sl40/config.h                       |  1 -
 keyboards/wsk/tkl30/config.h                      |  1 -
 keyboards/x16/config.h                            |  1 -
 keyboards/xelus/akis/config.h                     |  1 -
 keyboards/xelus/dawn60/rev1/config.h              |  2 --
 keyboards/xelus/dawn60/rev1_qmk/config.h          |  1 -
 keyboards/xelus/dharma/config.h                   |  1 -
 keyboards/xelus/la_plus/config.h                  |  1 -
 keyboards/xelus/pachi/rgb/rev1/config.h           |  1 -
 keyboards/xelus/pachi/rgb/rev2/config.h           |  1 -
 keyboards/xelus/rs108/config.h                    |  1 -
 keyboards/xelus/rs60/rev1/config.h                |  1 -
 keyboards/xelus/rs60/rev2/config.h                |  1 -
 keyboards/xelus/snap96/config.h                   |  1 -
 keyboards/xelus/valor/rev1/config.h               |  1 -
 keyboards/xelus/valor/rev2/config.h               |  1 -
 keyboards/xelus/valor_frl_tkl/config.h            |  1 -
 keyboards/xelus/xs60/config.h                     |  1 -
 keyboards/xiudi/xd004/v1/config.h                 |  1 -
 keyboards/xiudi/xd60/rev2/config.h                |  1 -
 keyboards/xiudi/xd60/rev3/config.h                |  1 -
 keyboards/xiudi/xd68/config.h                     |  1 -
 keyboards/xiudi/xd75/config.h                     |  1 -
 keyboards/xiudi/xd84/config.h                     |  1 -
 keyboards/xiudi/xd84pro/config.h                  |  1 -
 keyboards/xiudi/xd87/config.h                     |  1 -
 keyboards/xiudi/xd96/config.h                     |  1 -
 keyboards/xmmx/config.h                           |  1 -
 keyboards/xw60/config.h                           |  1 -
 keyboards/yatara/drink_me/config.h                |  1 -
 keyboards/ydkb/chili/config.h                     |  1 -
 keyboards/ydkb/just60/config.h                    |  1 -
 keyboards/ydkb/yd68/config.h                      |  1 -
 keyboards/yiancardesigns/barleycorn/config.h      |  1 -
 keyboards/yiancardesigns/gingham/config.h         |  1 -
 keyboards/yiancardesigns/seigaiha/config.h        |  1 -
 keyboards/ymdk/bface/config.h                     |  1 -
 keyboards/ymdk/melody96/config.h                  |  1 -
 keyboards/ymdk/wings/config.h                     |  1 -
 keyboards/ymdk/wingshs/config.h                   |  1 -
 keyboards/ymdk/yd60mq/config.h                    |  1 -
 keyboards/ymdk/ymd09/config.h                     |  1 -
 keyboards/ymdk/ymd67/config.h                     |  1 -
 keyboards/yoichiro/lunakey_macro/config.h         |  1 -
 keyboards/yoichiro/lunakey_mini/config.h          |  1 -
 keyboards/yugo_m/model_m_101/config.h             |  1 -
 keyboards/yushakobo/quick17/config.h              |  1 -
 keyboards/yushakobo/quick7/config.h               |  1 -
 keyboards/yynmt/dozen0/config.h                   |  1 -
 keyboards/yynmt/kagamidget/config.h               |  1 -
 keyboards/z12/config.h                            |  1 -
 keyboards/z34/config.h                            |  1 -
 keyboards/zfrontier/big_switch/config.h           |  1 -
 keyboards/ziggurat/config.h                       |  1 -
 keyboards/zj68/config.h                           |  1 -
 keyboards/zlant/config.h                          |  1 -
 keyboards/zoo/wampus/config.h                     |  1 -
 keyboards/ztboards/after/config.h                 |  1 -
 keyboards/ztboards/noon/config.h                  |  1 -
 lib/python/qmk/info.py                            | 15 +--------------
 1537 files changed, 27 insertions(+), 1597 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 66a20e588b..582b5149ea 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -113,6 +113,7 @@
     "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true},
     "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true, replace_with: "DEBOUNCE"},
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
+    "UNUSED_PINS": {"info_key": "_invalid.unused_pins", "deprecated": true},
     "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool", "deprecated": true},
     "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
 }
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 46f840616a..14f84c5595 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -15,7 +15,7 @@
                         "properties": {
                             "pin_a": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                             "pin_b": {"$ref": "qmk.definitions.v1#/mcu_pin"},
-                            "resolution": {"$ref": "qmk.definitions.v1#/unsigned_int"} 
+                            "resolution": {"$ref": "qmk.definitions.v1#/unsigned_int"}
                         }
                     }
                 }
@@ -221,8 +221,7 @@
                     "items": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}
                 },
                 "cols": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
-                "rows": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
-                "unused": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}
+                "rows": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}
             }
         },
         "mouse_key": {
diff --git a/docs/config_options.md b/docs/config_options.md
index c0a150e405..3e011a5cc9 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -57,8 +57,6 @@ This is a C header file that is one of the first things included, and will persi
   * may be omitted by the keyboard designer if matrix reads are handled in an alternate manner. See [low-level matrix overrides](custom_quantum_functions.md?id=low-level-matrix-overrides) for more information.
 * `#define MATRIX_IO_DELAY 30`
   * the delay in microseconds when between changing matrix pin state and reading values
-* `#define UNUSED_PINS { D1, D2, D3, B1, B2, B3 }`
-  * pins unused by the keyboard for reference
 * `#define MATRIX_HAS_GHOST`
   * define is matrix has ghost (unlikely)
 * `#define MATRIX_UNSELECT_DRIVE_HIGH`
@@ -189,7 +187,7 @@ If you define these options you will enable the associated feature, which may in
 * `#define COMBO_MUST_HOLD_MODS`
   * Flag for enabling extending timeout on Combos containing modifers
 * `#define COMBO_MOD_TERM 200`
-  * Allows for extending COMBO_TERM for mod keys while mid-combo. 
+  * Allows for extending COMBO_TERM for mod keys while mid-combo.
 * `#define COMBO_MUST_HOLD_PER_COMBO`
   * Flag to enable per-combo COMBO_TERM extension and `get_combo_must_hold()` function
 * `#define COMBO_TERM_PER_COMBO`
@@ -214,7 +212,7 @@ If you define these options you will enable the associated feature, which may in
 * `#define RGBLIGHT_MAX_LAYERS`
   * Defaults to 8. Can be expanded up to 32 if more [lighting layers](feature_rgblight.md?id=lighting-layers) are needed.
   * Note: Increasing the maximum will increase the firmware size and slow sync on split keyboards.
-* `#define RGBLIGHT_LAYER_BLINK` 
+* `#define RGBLIGHT_LAYER_BLINK`
   * Adds ability to [blink](feature_rgblight.md?id=lighting-layer-blink) a lighting layer for a specified number of milliseconds (e.g. to acknowledge an action).
 * `#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF`
   * If defined, then [lighting layers](feature_rgblight?id=overriding-rgb-lighting-onoff-status) will be shown even if RGB Light is off.
@@ -359,8 +357,8 @@ This is a [make](https://www.gnu.org/software/make/manual/make.html) file that i
 * `SRC`
   * Used to add files to the compilation/linking list.
 * `LIB_SRC`
-  * Used to add files as a library to the compilation/linking list.  
-    The files specified by `LIB_SRC` is linked after the files specified by `SRC`.  
+  * Used to add files as a library to the compilation/linking list.
+    The files specified by `LIB_SRC` is linked after the files specified by `SRC`.
     For example, if you specify:
     ```
     SRC += a.c
@@ -413,7 +411,7 @@ Use these to enable or disable building certain features. The more you have enab
 * `NKRO_ENABLE`
   * USB N-Key Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 * `RING_BUFFERED_6KRO_REPORT_ENABLE`
-  * USB 6-Key Rollover - Instead of stopping any new input once 6 keys are pressed, the oldest key is released and the new key is pressed. 
+  * USB 6-Key Rollover - Instead of stopping any new input once 6 keys are pressed, the oldest key is released and the new key is pressed.
 * `AUDIO_ENABLE`
   * Enable the audio subsystem.
 * `KEY_OVERRIDE_ENABLE`
diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h
index 9d9394c14f..04241b3454 100644
--- a/keyboards/0_sixty/config.h
+++ b/keyboards/0_sixty/config.h
@@ -33,7 +33,6 @@
 #define MATRIX_COLS 12
 #define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index 11b01ad8b6..6eeb183379 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 9c3a0c6649..784baadc2c 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D5, D6, D7, B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index 867589a27c..86d5b59348 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define MATRIX_COLS 3
 #define MATRIX_ROW_PINS { F0, F5, F4, F6 }
 #define MATRIX_COL_PINS { D6, D7, B5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 2396e9083b..62d28fd6c9 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
 #define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index 256af396e5..db8da3f6f5 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 00cff570b1..02959ddafa 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index fd11e13fe1..1a9344cbac 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D1, D0, F4, F5 }
 #define MATRIX_COL_PINS \
     { D4, C6, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 9832c28bef..cea3c4edb6 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -42,7 +42,6 @@
 #define ENCODERS_PAD_A { B1, B3 }
 #define ENCODERS_PAD_B { B2, B4 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index 4020f4fdc0..97ce1ae28a 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
index d344b0750d..9bbe1bec80 100644
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, D1, E6, B5 }
 #define MATRIX_COL_PINS { F7, F6, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
index 286af1857f..92572523d2 100644
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, B7, B2, B0 }
 #define MATRIX_COL_PINS { B8, A0, A10, A9 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index 8424b2edc3..21071f8ca8 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index 38c74c6bf1..0cf444bee4 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B4, B0, B2, B1 }
 #define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index 71621695f4..44c17ea85a 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 6
 
 #define DIRECT_PINS {{ B4, F6, F5, F4, B5, F7 }}
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B6, B3 }
 #define ENCODERS_PAD_B { B2, B1 }
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index f6fc6f8c1e..4a0d7eb013 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C4, C5 }
 #define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7, B2 }
-#define UNUSED_PINS
 
 
 #define ENCODERS_PAD_A { D0 }
diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h
index 65a54cba4a..3dcd4d0302 100644
--- a/keyboards/30wer/config.h
+++ b/keyboards/30wer/config.h
@@ -9,7 +9,6 @@
 /* pcb default pin-out */
 #define MATRIX_ROW_PINS { E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0, D4, C6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 80e864ce9d..5ccd3f1cd5 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { F6 }
 #define MATRIX_COL_PINS { F4, D7 }
-#define UNUSED_PINS
 
 // LED on kbmount base board is on B7
 #define LED_CAPS_LOCK_PIN B7 // onboard LED for testing
diff --git a/keyboards/3w6/rev1/config.h b/keyboards/3w6/rev1/config.h
index 0c14dc72d3..2ec430b4e2 100644
--- a/keyboards/3w6/rev1/config.h
+++ b/keyboards/3w6/rev1/config.h
@@ -44,11 +44,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS_L { B0, B1, B2, B4}
 #define MATRIX_COL_PINS_L { B3, E6, F7, B6, B5 }
-#define UNUSED_PINS_L { B7, C6, C7, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 }
 
 #define MATRIX_ROW_PINS_R { P10, P11, P12, P05 }
 #define MATRIX_COL_PINS_R { P06, P13, P14, P01, P00 }
-#define UNUSED_PINS_R { P02, P03, P04, P07, P15, P16, P17 }
 
 
 /* COL2ROW, ROW2COL */
diff --git a/keyboards/3w6/rev2/config.h b/keyboards/3w6/rev2/config.h
index 4101aa76cd..df68436ff1 100644
--- a/keyboards/3w6/rev2/config.h
+++ b/keyboards/3w6/rev2/config.h
@@ -44,11 +44,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS_L { B0, B1, B2, B4}
 #define MATRIX_COL_PINS_L { B3, E6, F7, B6, B5 }
-#define UNUSED_PINS_L { B7, C6, C7, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 }
 
 #define MATRIX_ROW_PINS_R { P10, P11, P12, P05 }
 #define MATRIX_COL_PINS_R { P06, P13, P14, P01, P00 }
-#define UNUSED_PINS_R { P02, P03, P04, P07, P15, P16, P17 }
 
 
 /* COL2ROW, ROW2COL */
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index c753f7c29f..9027cdac5f 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -44,7 +44,6 @@
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
index 943b918d56..67a21d3c97 100644
--- a/keyboards/40percentclub/4pack/config.h
+++ b/keyboards/40percentclub/4pack/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS { \
     { E6, D7, C6, D4 } \
 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index 44628ac741..4744d61dbf 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -20,7 +20,6 @@
 */
 #define MATRIX_ROW_PINS { B2, D1, D0, D4 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index 460f5ba93d..60a5122830 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -20,7 +20,6 @@
 */
 #define MATRIX_ROW_PINS { B2, D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index 302decc162..c886eb48da 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -45,7 +45,6 @@
 */
 #define MATRIX_ROW_PINS { D7, E6 }
 #define MATRIX_COL_PINS { F6, F7, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index afc50acb7e..d507a2c445 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -45,7 +45,6 @@
 */
 #define MATRIX_ROW_PINS { D7, E6, B4 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index e7062990cb..db81033f9b 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index 2ed218199f..f47788ce87 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/i75/promicro/config.h b/keyboards/40percentclub/i75/promicro/config.h
index d4cd997736..971f626cc8 100644
--- a/keyboards/40percentclub/i75/promicro/config.h
+++ b/keyboards/40percentclub/i75/promicro/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B4, E6, D7, C6, D4, D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/i75/teensy2/config.h b/keyboards/40percentclub/i75/teensy2/config.h
index bcf9b1b888..77ef177f0d 100644
--- a/keyboards/40percentclub/i75/teensy2/config.h
+++ b/keyboards/40percentclub/i75/teensy2/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, B7, B3, B2, B1, B0 }
 #define MATRIX_COL_PINS { C6, C7, D6, D7, B5, B6, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 3924841b04..9ea825e7d7 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 404cd6f7d3..6853462585 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h b/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
index bc5de30f2f..caaafa67c6 100644
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
+++ b/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
@@ -33,7 +33,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #undef MATRIX_ROW_PINS
 #undef MATRIX_COL_PINS
-#undef UNUSED_PINS
 #define MATRIX_ROW_PINS { D1, D0, C6, D7, B5, B6, B7, D6 }
 #define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, D2, D3 }
-#define UNUSED_PINS {B5}
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index 7d789cff04..e71f91a030 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F4, F5, F6, F7 }, \
     { D1, D0, D4, C6 }, \
 }
-#define UNUSED_PINS
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
index 53c227d832..48f7f949fb 100644
--- a/keyboards/40percentclub/nein/config.h
+++ b/keyboards/40percentclub/nein/config.h
@@ -28,7 +28,6 @@
     { F7, B1, B3 }, \
     { B2, B6, B5 }  \
 }
-#define UNUSED_PINS
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index bf0507716f..01d4f9b537 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D4, C6, D7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/polyandry/promicro/config.h b/keyboards/40percentclub/polyandry/promicro/config.h
index e6f8643c44..f1bd8adc76 100644
--- a/keyboards/40percentclub/polyandry/promicro/config.h
+++ b/keyboards/40percentclub/polyandry/promicro/config.h
@@ -28,7 +28,6 @@
 */ 
 #define MATRIX_ROW_PINS { D7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, E6, B4, F4, F5, F6, F7, B3, B2 }
-#define UNUSED_PINS
 
 /* doesn't really matter lol */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/40percentclub/polyandry/teensy2/config.h
index d730ce6f94..6d6ba19489 100644
--- a/keyboards/40percentclub/polyandry/teensy2/config.h
+++ b/keyboards/40percentclub/polyandry/teensy2/config.h
@@ -30,7 +30,6 @@
 
 #define MATRIX_ROW_PINS { D3 }
 #define MATRIX_COL_PINS { B7, D0, D1, D2, C6, C7, F6, F7, B6, B5, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h
index 4ddad2efb7..9a03bc7974 100644
--- a/keyboards/40percentclub/sixpack/config.h
+++ b/keyboards/40percentclub/sixpack/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D4, C6, D7 }, \
     { E6, B4, B5 }  \
 }
-#define UNUSED_PINS { D1, D0, C4, C5, B1, B2, B3 } // TX, RX, SDA, SCL, PB1, PB2, PB3 on expansion connector
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index b6534622ea..a29f22834e 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h
index 3724e4b2d5..04742e93e0 100644
--- a/keyboards/40percentclub/ut47/config.h
+++ b/keyboards/40percentclub/ut47/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h
index 8177f89038..762abd0fce 100644
--- a/keyboards/45_ats/config.h
+++ b/keyboards/45_ats/config.h
@@ -30,7 +30,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, D5, D7, D6 }
 #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, F6, F5, F4, C7, F7, C6, B6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4by3/config.h b/keyboards/4by3/config.h
index 27ad7441cc..be28796d1f 100644
--- a/keyboards/4by3/config.h
+++ b/keyboards/4by3/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, D4 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index 622ccc7ae9..dc1eef180e 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 9Key PCB default pin-out */
 #define MATRIX_ROW_PINS { D1, D0, D4 }
 #define MATRIX_COL_PINS { F4, F5, F6 }
-#define UNUSED_PINS
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h
index 4e9258667c..ffda0a301c 100644
--- a/keyboards/a_dux/config.h
+++ b/keyboards/a_dux/config.h
@@ -49,7 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index a539eeabc2..814f0b59f7 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, D2, D4, C6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7, B3, E6, B2, B4, B6, B5}
-#define UNUSED_PINS {B0}
 
 #define DIP_SWITCH_PINS { D0 }
 
diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h
index 4af821539d..cb591b8e24 100644
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ b/keyboards/abatskeyboardclub/nayeon/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index 060229abb2..1febf490e7 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, C7 }
 #define MATRIX_COL_PINS { F0, B6, B5 }
-#define UNUSED_PINS { B0, D0, D1, D2, D4, D6, D7, F1, F4, F5, F6, F7 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index f348a12cf4..0daf1a90cd 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
 #define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
 #define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index 874183362c..d03d886a55 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, B7, D5, B5, D6 }
 #define MATRIX_COL_PINS { F5, F6, F4, F1, F0, B2, B1, C6, B0, B3, E6, D4, B4}
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index 493d267b51..e98bae4510 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -52,7 +52,6 @@ EncA (B6) because it is not used in the default PCB
 All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
 B0, which is unconnected on the PCB
 */
-//#define UNUSED_PINS { B0, B6, B13, B14, B15, B8, B9, B5, B3 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index 173f2685d7..e4cfa2c34e 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, F6, B7 }
 #define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F5, F1, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
index cb6393393c..f3eecce72b 100644
--- a/keyboards/adelheid/config.h
+++ b/keyboards/adelheid/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, F4, D1, D2, D3, D5, F7 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, F6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index cbde0090fa..d4e3dcc729 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, E6, D7, C6, D4, D2, F4, F5, B5, B4 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, F0 }
-#define UNUSED_PINS { D3, C7 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h
index 631a007bf3..e87b856968 100644
--- a/keyboards/aeboards/aegis/config.h
+++ b/keyboards/aeboards/aegis/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F5, F6, E6, F7, D1, D0, D6, D4, B4, D7, B6, B5 }
 #define MATRIX_COL_PINS { C7, C6, B7, D2, D3, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h
index 22dd96f663..42535abd67 100755
--- a/keyboards/aeboards/constellation/rev1/config.h
+++ b/keyboards/aeboards/constellation/rev1/config.h
@@ -33,7 +33,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
 #define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h
index de42885b47..f2f34aeeb8 100755
--- a/keyboards/aeboards/constellation/rev2/config.h
+++ b/keyboards/aeboards/constellation/rev2/config.h
@@ -32,7 +32,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B15, A14, A2, B13, B14 }
 #define MATRIX_COL_PINS { B12, A1, H0, C15, C14, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aeboards/ext65/rev1/config.h b/keyboards/aeboards/ext65/rev1/config.h
index cd9c240069..7ee340aa2d 100644
--- a/keyboards/aeboards/ext65/rev1/config.h
+++ b/keyboards/aeboards/ext65/rev1/config.h
@@ -32,7 +32,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C6, C7, B5, B6, D7, B4, D4, D6, B7, E6 }
 #define MATRIX_COL_PINS { B2, B3, B1, B0, F7, F0, F1, F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
index 4a6b841b60..5717260e29 100644
--- a/keyboards/ai03/equinox/config.h
+++ b/keyboards/ai03/equinox/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, C5, D4, D5 }
 #define MATRIX_COL_PINS { D1, D2, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
index c951655ad9..dd1b4bcb0e 100644
--- a/keyboards/ai03/jp60/config.h
+++ b/keyboards/ai03/jp60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, E6 }
 #define MATRIX_COL_PINS { D2, D1, D3, D5, D4, D6, C6, F0, F1, F4, F5, F6, F7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
index ed584c4461..3cdec4d046 100644
--- a/keyboards/ai03/lunar/config.h
+++ b/keyboards/ai03/lunar/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 775df8913f..3cd0895788 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { C7, B4, D7, D6, D4, F1, F0 }
 #define MATRIX_ROW_PINS_RIGHT { B6, B5, B4, D7, E6 }
 #define MATRIX_COL_PINS_RIGHT { D4, D6, F1, F0, F4, F5, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index f5bc5f0b34..6966de9df5 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { E6, F6, B1, B0, C7, C6 }
 #define MATRIX_ROW_PINS_RIGHT { B5, D7, B4, D4 }
 #define MATRIX_COL_PINS_RIGHT { D6, B6, B1, B0, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 8d8951cd71..8cf852cfab 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
 #define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
index 99e0413566..462ffe1a8e 100644
--- a/keyboards/ai03/quasar/config.h
+++ b/keyboards/ai03/quasar/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
index 872fb58c13..9ffec17840 100644
--- a/keyboards/ai03/soyuz/config.h
+++ b/keyboards/ai03/soyuz/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, B6, E6, B4 }
 #define MATRIX_COL_PINS { F4, B3, D7, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index 5ae9a4c9f5..c96be0030d 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
 #define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h
index c341ceb7dc..d04304c9c3 100644
--- a/keyboards/akb/raine/config.h
+++ b/keyboards/akb/raine/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   { E6, C6, F7, B2, B0 }
 #define MATRIX_COL_PINS \
   { F6, F5, F4, B1, F1, F0, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index 8e5d855d0d..f9d9c1363b 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index cbe4733397..5e7275dd11 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 50e256778a..9c0c0a527a 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -27,7 +27,6 @@
     { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS \
     { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION   COL2ROW
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index 379b879abc..e98029fb82 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, B4, B5 }
 #define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
index 9656678fe9..5ca083c349 100644
--- a/keyboards/alps64/config.h
+++ b/keyboards/alps64/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_COL_PINS {  B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_ROW_PINS {  D0, D1, D2, D3, D4, D5, D6, C2 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index cbbac33136..a847c0ef7e 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { A0, A1, A2, A3 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index 168d16eaee..b5b9c2e4df 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F4, F5, F6, F7}
 #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7}
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN B2
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index a3764d00d2..68994d2b2e 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, D5 }
 #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
index 240cb312c9..9cbab73e70 100644
--- a/keyboards/amjkeyboard/amj66/config.h
+++ b/keyboards/amjkeyboard/amj66/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5, D6, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
index 99f59983ea..1166c3f986 100644
--- a/keyboards/amjkeyboard/amj84/config.h
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { D0, F7, F6, F5, F4, D5 }
 #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 4b94236ec9..12a01dc3e6 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index 0a885b7a36..647df951df 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, D5, D0 }
 #define MATRIX_COL_PINS { F1, F0, E6, C7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 
diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h
index ef51822f5a..b15656fe83 100644
--- a/keyboards/anavi/macropad8/config.h
+++ b/keyboards/anavi/macropad8/config.h
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 #define RGBLIGHT_SLEEP
 
-#define UNUSED_PINS
 
 /* ws2812B RGB LED */
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h
index 5489e656b7..4fe23fb1c8 100644
--- a/keyboards/ano/config.h
+++ b/keyboards/ano/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_ROW_PINS { A4, B14, B15, B9, B10, B11 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, A5, A6, A7, A8, A15, A2, A1, A0, B8, B13 }
 
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B12 }
 #define ENCODERS_PAD_B { A14 }
diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h
index e090e46456..a5a9dc5081 100644
--- a/keyboards/anomalykb/a65i/config.h
+++ b/keyboards/anomalykb/a65i/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, B5 }
 #define MATRIX_COL_PINS { D7, D6, D4, B4, B6, E6, F1, B7, C6, C7, D5, D3, D2, F0, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index ddea414eb1..5ddec8cda0 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D3, D2, B7, F1, C7, D5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, F4, F5, F6, F7, B6, B5, D7, B4, D6, F0, D1, C6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h
index 98a7381cc7..94e9717efa 100644
--- a/keyboards/aplyard/aplx6/rev1/config.h
+++ b/keyboards/aplyard/aplx6/rev1/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pin-out */
 #define MATRIX_ROW_PINS { E6, B3 }
 #define MATRIX_COL_PINS { F7, B6, F4 }
-#define UNUSED_PINS
 
 
 /* ws2812 RGB LED */
diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h
index 2b30e67e09..a190083da5 100644
--- a/keyboards/aplyard/aplx6/rev2/config.h
+++ b/keyboards/aplyard/aplx6/rev2/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 9Key PCB default pin-out */
 #define MATRIX_ROW_PINS { B4, B5 }
 #define MATRIX_COL_PINS { C6, D7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index 4049109827..6568cdf69d 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS {}
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
index c323bbbfed..f499c29de3 100644
--- a/keyboards/arisu/config.h
+++ b/keyboards/arisu/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/arrayperipherals/1x4p1/config.h b/keyboards/arrayperipherals/1x4p1/config.h
index aec5a143ee..5fd99ef30f 100644
--- a/keyboards/arrayperipherals/1x4p1/config.h
+++ b/keyboards/arrayperipherals/1x4p1/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS {   \
     { C7, B7, D6, F5, F7} \
 }
-#define UNUSED_PINS
 
 /* rotary encoder*/
 #define ENCODERS_PAD_A {F0}
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index 3748d87f4d..cd74024125 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
-#define UNUSED_PINS
 
 #define NUM_LOCK_LED_PIN E6
 #define CAPS_LOCK_LED_PIN F0
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
index 10819eb8e4..2006f2de30 100644
--- a/keyboards/ash_xiix/config.h
+++ b/keyboards/ash_xiix/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
-#define UNUSED_PINS
 
 #define NUM_LOCK_LED_PIN E6
 #define CAPS_LOCK_LED_PIN F0
diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h
index ccc6f2bbf8..a932d62946 100644
--- a/keyboards/ashpil/modelm_usbc/config.h
+++ b/keyboards/ashpil/modelm_usbc/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C7, C6, C5, C4, C3, C2, C1, C0 }
 #define MATRIX_COL_PINS { E6, E7, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index ac9a407ccb..e097c47cb0 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -25,7 +25,6 @@
 /* Key matrix pins */
 #define MATRIX_ROW_PINS { F1, F7, F6, F5, F4, D5 }
 #define MATRIX_COL_PINS { F0, C7, C6, B6, B5, B4, D7, D6, B2, B7, D3, D2, D1, D0, B3 }
-#define UNUSED_PINS
 
 /* Encoder pins */
 #define ENCODERS_PAD_A { E6 }
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
index 337ba015c2..412b474193 100644
--- a/keyboards/atlas_65/config.h
+++ b/keyboards/atlas_65/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h
index a0f38d845f..ed839dab04 100644
--- a/keyboards/atomic/config.h
+++ b/keyboards/atomic/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D5, B5, B6, C6 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/atreus/astar/config.h b/keyboards/atreus/astar/config.h
index a925c6fb1c..34df07559a 100644
--- a/keyboards/atreus/astar/config.h
+++ b/keyboards/atreus/astar/config.h
@@ -34,7 +34,6 @@
 #else
   #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
 #endif
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar_mirrored/config.h b/keyboards/atreus/astar_mirrored/config.h
index 75155044de..4b5bf9d887 100644
--- a/keyboards/atreus/astar_mirrored/config.h
+++ b/keyboards/atreus/astar_mirrored/config.h
@@ -32,7 +32,6 @@
 
 #define MATRIX_ROW_PINS { D0, D1, D3, D2 }
 #define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/f103/config.h b/keyboards/atreus/f103/config.h
index e16c9ee930..d42a057ab8 100644
--- a/keyboards/atreus/f103/config.h
+++ b/keyboards/atreus/f103/config.h
@@ -32,7 +32,6 @@
 /* key matrix pins */
 #define MATRIX_COL_PINS { B10, B1, B0, A7, A6, B5, B4, B3, A15, A10, A9 }
 #define MATRIX_ROW_PINS { A5, A4, A3, A2 }
-#define UNUSED_PINS {B12, B13, B14, B15, A8, B6, B7, B8, B9, A1, A0, C15, C14, C13}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/feather/config.h b/keyboards/atreus/feather/config.h
index 72c9cd716b..ab0640681d 100644
--- a/keyboards/atreus/feather/config.h
+++ b/keyboards/atreus/feather/config.h
@@ -32,7 +32,6 @@
 // #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
 #define MATRIX_ROW_PINS { B7, D6, C7, F5 }
 #define MATRIX_COL_PINS { D7, B5, D1, D0, C6, B6, F0, D2, D3, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/keymaps/kejadlen/config.h b/keyboards/atreus/keymaps/kejadlen/config.h
index 03a48dcb4b..437bfa326e 100644
--- a/keyboards/atreus/keymaps/kejadlen/config.h
+++ b/keyboards/atreus/keymaps/kejadlen/config.h
@@ -4,7 +4,6 @@
 #undef MATRIX_COL_PINS
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, F7, B0, B1, B2, B3, B7 }
-/* #define UNUSED_PINS */
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/atreus/keymaps/nojjan/config.h b/keyboards/atreus/keymaps/nojjan/config.h
index 90b7c4a6c6..bc5c25d416 100644
--- a/keyboards/atreus/keymaps/nojjan/config.h
+++ b/keyboards/atreus/keymaps/nojjan/config.h
@@ -2,9 +2,7 @@
 
 #undef MATRIX_ROW_PINS
 #undef MATRIX_COL_PINS
-#undef UNUSED_PINS
 
 // Pin configuration for falbatech atreus
 #define MATRIX_ROW_PINS { D0, D1, D3, D2 }
 #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
-#define UNUSED_PINS
diff --git a/keyboards/atreus/promicro/config.h b/keyboards/atreus/promicro/config.h
index a4ed1c642d..605a7ccdae 100644
--- a/keyboards/atreus/promicro/config.h
+++ b/keyboards/atreus/promicro/config.h
@@ -36,7 +36,6 @@
 #else
   #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B6, E6, D7, C6, D4, D0 }
 #endif
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/teensy2/config.h b/keyboards/atreus/teensy2/config.h
index 4130ef9bb7..25ae56ffb6 100644
--- a/keyboards/atreus/teensy2/config.h
+++ b/keyboards/atreus/teensy2/config.h
@@ -30,7 +30,6 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h
index b5f433b879..635faf9b4e 100644
--- a/keyboards/atset/at1/config.h
+++ b/keyboards/atset/at1/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D2 }
 #define MATRIX_COL_PINS { B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h
index 26e26fc32e..d27b4b646a 100644
--- a/keyboards/atset/at12/config.h
+++ b/keyboards/atset/at12/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h
index da194644ba..400244a66e 100644
--- a/keyboards/atset/at16/config.h
+++ b/keyboards/atset/at16/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { B6, B5, B4, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h
index 094ad56a1e..5195939cf9 100644
--- a/keyboards/atset/at3/config.h
+++ b/keyboards/atset/at3/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D2 }
 #define MATRIX_COL_PINS { B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h
index fd40ac609b..b443529631 100644
--- a/keyboards/atset/at6/config.h
+++ b/keyboards/atset/at6/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D2, D1 }
 #define MATRIX_COL_PINS { B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h
index 187442c265..bf9819c4b9 100644
--- a/keyboards/atset/at9/config.h
+++ b/keyboards/atset/at9/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D2, D1, D0 }
 #define MATRIX_COL_PINS { B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index 72d11a180f..1cf30b258b 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
 #define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 7783cc9120..8e59e88d83 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { F6, F7, F5, F1, F4 }
 #define MATRIX_COL_PINS { B2, B3, D0, D1, D2, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS { B0, B7, E6, F0 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 1536787ac0..59b54ebc73 100644
--- a/keyboards/aves65/config.h
+++ b/keyboards/aves65/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {D4,D6,D7,B4,E6}
 #define MATRIX_COL_PINS {D0,D1,D2,D3,D5,B5,F0,F1,F4,F5,F6,F7,C7,C6,B6}
-#define UNUSED_PINS {B7,B1,B2,B3}
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/b_sides/rev41lp/config.h b/keyboards/b_sides/rev41lp/config.h
index b2c9c01959..3628cc4db5 100644
--- a/keyboards/b_sides/rev41lp/config.h
+++ b/keyboards/b_sides/rev41lp/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F4, B2, F5, B3, F6, B1, F7 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
index 2db6f08c52..c4cb1cc373 100644
--- a/keyboards/baguette/config.h
+++ b/keyboards/baguette/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, B2, B1, E6, D6 }
 #define MATRIX_COL_PINS { B6, C6, C7, F7, F6, F5, F4, F1, F0, B0, D0, D1, D2, D3, D5, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 0e37d96d41..a7dfcb3961 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { B5, B4, D7, F6, C6, D4 }
 #define MATRIX_COL_PINS { D1, E6, F7, B1, B3, B2, D0 }
-#define UNUSED_PINS
 
 #define MASTER_RIGHT
 #ifndef MASTER_RIGHT
diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h
index 9933ec2fb3..6e0c57c838 100644
--- a/keyboards/bantam44/config.h
+++ b/keyboards/bantam44/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // COLS: Left to right, ROWS: Top to bottom
 #define MATRIX_ROW_PINS { F0, D6, D4, D5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, B6, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index ba9e2b9185..75db1ba447 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
 #define MATRIX_ROW_PINS { F5, F4, F1, F0, F6 }
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D5, D5, D5, D5, D5, D5, D5, D5, D5, D5 }
-#define UNUSED_PINS
 #define PORT_EXPANDER_ADDRESS 0x20
 
 #define RGB_DI_PIN E6
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
index ea974876c7..d6cc58bd8b 100644
--- a/keyboards/barracuda/config.h
+++ b/keyboards/barracuda/config.h
@@ -34,7 +34,6 @@
  */
 #define MATRIX_ROW_PINS { C4, C5, C6, D1, D2, D3 }
 #define MATRIX_COL_PINS { D4, D5, D6, B0, B1, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
index ee8604b8ba..88828d7ddd 100644
--- a/keyboards/basketweave/config.h
+++ b/keyboards/basketweave/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
index 63e67aa6d8..6711212cb1 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_ROW_PINS_RIGHT \
     { B15, A2, B8, A8, B9 }
 
-#define UNUSED_PINS { B6, C14, C15 }
 
 #define DIODE_DIRECTION ROW2COL
 #define SPLIT_HAND_PIN A3
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
index 593f8a23a4..c11f27db10 100644
--- a/keyboards/bear_face/config.h
+++ b/keyboards/bear_face/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* bear_face matrix pinout */
 #define MATRIX_ROW_PINS { F5, F6, F4, F1, B0, B6 }
 #define MATRIX_COL_PINS { B5, C7, C6, F0, E6, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
index 15f1ea2c39..3354a35bd5 100644
--- a/keyboards/beatervan/config.h
+++ b/keyboards/beatervan/config.h
@@ -34,7 +34,6 @@
  */
 #define MATRIX_ROW_PINS { D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5, F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bemeier/bmek/rev1/config.h b/keyboards/bemeier/bmek/rev1/config.h
index 5c738499f7..37f4025c22 100755
--- a/keyboards/bemeier/bmek/rev1/config.h
+++ b/keyboards/bemeier/bmek/rev1/config.h
@@ -23,7 +23,5 @@
     { D4, D7, B6, B4, B7 }
 #define MATRIX_COL_PINS \
     { F1, B0, B1, B2, B3, D0, D1, D2, C6, C7, F7, F6, F5, F4, B5 }
-#define UNUSED_PINS \
-    { D4, D5, F0, B7 }
 #define RGB_DI_PIN E6
 
diff --git a/keyboards/bemeier/bmek/rev2/config.h b/keyboards/bemeier/bmek/rev2/config.h
index c97d0417ad..a478cfa951 100755
--- a/keyboards/bemeier/bmek/rev2/config.h
+++ b/keyboards/bemeier/bmek/rev2/config.h
@@ -22,8 +22,6 @@
 #define MATRIX_ROW_PINS \
     { F4, F5, D7, B5, B4 }
 #define MATRIX_COL_PINS \
-    { F6, B0, B1, F7, C7, C6, B6, F1, B2, B3, D6, D3, D2, D1, D0 } 
-#define UNUSED_PINS \
-    { D4, D5, F0, B7 }
+    { F6, B0, B1, F7, C7, C6, B6, F1, B2, B3, D6, D3, D2, D1, D0 }
 
 #define RGB_DI_PIN E6
diff --git a/keyboards/bemeier/bmek/rev3/config.h b/keyboards/bemeier/bmek/rev3/config.h
index fd74a74027..6171efc8c2 100755
--- a/keyboards/bemeier/bmek/rev3/config.h
+++ b/keyboards/bemeier/bmek/rev3/config.h
@@ -22,8 +22,6 @@
 #define MATRIX_ROW_PINS \
     { F1, B4, B5, D6, D7 }
 #define MATRIX_COL_PINS \
-    { B6, C6, C7, F7, F6, F5, F4, F0, B7, D0, D1, D2, D3, D5, D4 } 
-#define UNUSED_PINS \
-    { D0, B1, B2, B3 }
+    { B6, C6, C7, F7, F6, F5, F4, F0, B7, D0, D1, D2, D3, D5, D4 }
 
 #define RGB_DI_PIN E6
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 79fe4a739a..4980416017 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
index 3420c30035..5d5d422d13 100644
--- a/keyboards/biacco42/meishi/config.h
+++ b/keyboards/biacco42/meishi/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B5 }
 #define MATRIX_COL_PINS { B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
index 723aae73ff..a99aa088a9 100644
--- a/keyboards/biacco42/meishi2/config.h
+++ b/keyboards/biacco42/meishi2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D7, E6 }
 #define MATRIX_COL_PINS { F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h
index 72051f3c39..1c818b7459 100644
--- a/keyboards/binepad/bn003/config.h
+++ b/keyboards/binepad/bn003/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { C6 }
 #define MATRIX_COL_PINS { B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/binepad/bn009/config.h b/keyboards/binepad/bn009/config.h
index 8fb7182d91..48c2fd984c 100644
--- a/keyboards/binepad/bn009/config.h
+++ b/keyboards/binepad/bn009/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { D2, D1, D0 }
 #define MATRIX_COL_PINS { B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index c87292c635..e710c19b98 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -11,7 +11,6 @@
     { E6, B0, F1, F5, F4 }
 #define MATRIX_COL_PINS \
     { F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
index 9c9805d423..999e655a94 100644
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C6, B6, B4, B5, D6, D7, D5, D3, D4 }
 #define MATRIX_COL_PINS { D0, D1, D2, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
index 4ee950216a..220d0852fe 100644
--- a/keyboards/blank/blank01/config.h
+++ b/keyboards/blank/blank01/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, B3 }
 #define MATRIX_COL_PINS { D5, D4, D6, D7, B5, B4, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/blank_tehnologii/manibus/config.h b/keyboards/blank_tehnologii/manibus/config.h
index f739334e0d..8e7f4e8a11 100644
--- a/keyboards/blank_tehnologii/manibus/config.h
+++ b/keyboards/blank_tehnologii/manibus/config.h
@@ -29,7 +29,6 @@
 #define MATRIX_COL_PINS { B5, B4, D7, D6, F0, F1, C6 }
 #define MATRIX_ROW_PINS_RIGHT { D6, D7, B4, F7, E6 }
 #define MATRIX_COL_PINS_RIGHT { B1, B2, B3, F1, F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h
index cad1d20ea8..7f17869ce5 100644
--- a/keyboards/blaster75/config.h
+++ b/keyboards/blaster75/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B0, B4, B5, B6, B7, C6, C7, D0, D1, D2, D3, D4, D5, D6, D7 } 
-#define UNUSED_PINS
 
 /* Diode Direction */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index e543ab16d9..661605480a 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, D1, D4, E6, B5, D2, F6, B3, B2, B6 }
 #define MATRIX_COL_PINS { D0, B4, C6, D7, F4, F5, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index 4034ced4e8..5b9fb46286 100644
--- a/keyboards/boardrun/bizarre/config.h
+++ b/keyboards/boardrun/bizarre/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index f6ac6ee88e..f65abc2ff4 100644
--- a/keyboards/boardrun/classic/config.h
+++ b/keyboards/boardrun/classic/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
index 62e75b36dd..80ca48c995 100644
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bolsa/damapad/config.h b/keyboards/bolsa/damapad/config.h
index fd3db403f5..16c4006896 100644
--- a/keyboards/bolsa/damapad/config.h
+++ b/keyboards/bolsa/damapad/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, F7, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h
index c1a6078cb4..00bae0f655 100644
--- a/keyboards/bop/config.h
+++ b/keyboards/bop/config.h
@@ -27,7 +27,6 @@
 #define MATRIX_COL_PINS { D5, C5, B0, B1, B2, B3, B4, B5, B6, E7, E6, F0, F7, F6, F5, F4, F3, F2, F1, C6 }
 //    If your board is spamming the end column, change C7 to C6 in the line above and short those pins on the controller
                         
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/botanicalkeyboards/fm2u/config.h b/keyboards/botanicalkeyboards/fm2u/config.h
index 23e4ad208b..4664c79d3d 100644
--- a/keyboards/botanicalkeyboards/fm2u/config.h
+++ b/keyboards/botanicalkeyboards/fm2u/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index ec8a0956be..5408ee3350 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B2, B6 }
 #define MATRIX_COL_PINS { B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index 1ca00f231d..a0f088802a 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -45,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_COL_PINS { B0, B3, B2, B1, B6, B4, B5, C7 }
 #define MATRIX_ROW_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define UNUSED_PINS { C0, C1, C2, C3, C4, D2, D7 }
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 819b68e40f..1d2c594cfb 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 //#define MATRIX_ROW_PINS { D0, D5 }
 //#define MATRIX_COL_PINS { F1, F0, B0 }
-//#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h
index a943bcc249..9c713d92dd 100644
--- a/keyboards/bpiphany/sixshooter/config.h
+++ b/keyboards/bpiphany/sixshooter/config.h
@@ -11,7 +11,6 @@
     { F7, F6, F1 }, \
     { F5, F4, F0 } \
 }
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index 2d185e0c28..9aa010c85c 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 }
 #define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define UNUSED_PINS { B0, C4, D3 }
 
 #define LED_NUM_LOCK_PIN C5
 #define LED_CAPS_LOCK_PIN C6
diff --git a/keyboards/bthlabs/geekpad/config.h b/keyboards/bthlabs/geekpad/config.h
index c8d3039202..5a29c90eab 100644
--- a/keyboards/bthlabs/geekpad/config.h
+++ b/keyboards/bthlabs/geekpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6 }
 #define MATRIX_COL_PINS { D4, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 1c9b6f1549..6e363d42ad 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index dc83f4456e..e102000fb5 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 }
 #define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index 6ad3183c84..6a19a5aceb 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 }
 #define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index 2a7ea22ec1..7e4628c6ec 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -20,7 +20,6 @@
     { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS \
     { B1, B3, B2, B6, B5, B4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h
index 235a50a1bf..2ec01133fc 100644
--- a/keyboards/cablecardesigns/cypher/rev6/config.h
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -10,7 +10,6 @@
 
 #define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/caffeinated/serpent65/config.h b/keyboards/caffeinated/serpent65/config.h
index 1d3e71d94a..35f2a3ae5f 100644
--- a/keyboards/caffeinated/serpent65/config.h
+++ b/keyboards/caffeinated/serpent65/config.h
@@ -41,7 +41,6 @@ EncA (B6) because it is not used in the default PCB
 All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
 B0, which is unconnected on the PCB
 */
-//#define UNUSED_PINS { B0, B6, B13, B14, B15, B8, B9, B5, B3 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index f02b29c1b9..3d2dd81d88 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -38,7 +38,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 17d8c62634..d88edb945c 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -26,7 +26,6 @@
 #define MATRIX_ROW_PINS { B5, B4, D1, D7, D6 }
 #define MATRIX_COL_PINS { B6, C6, D2, E6, C7, B3, F7, F6, F5, F4, F1, F0 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 1d3bdb1212..552a991af8 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { E6, F5, B4, B6, C6, C7 }
 #define MATRIX_COL_PINS { F0, F1, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h
index 1ac332aa64..bf2055cb50 100644
--- a/keyboards/capsunlocked/cu65/config.h
+++ b/keyboards/capsunlocked/cu65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F1, F4, F5, F6, D3 }
 #define MATRIX_COL_PINS { D6, D7, D4, B4, B5, B6, C6, D5, C7, F0, E6, B0, B1, B7, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index 0bf17fe96c..3f93aae5e8 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D7, F0, F6 }
 #define MATRIX_COL_PINS { F5, F7, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 0168668134..27c1dd4e2f 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 16
 #define MATRIX_ROW_PINS {F1, B7, B3, D2, D3, B2}
 #define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B1, B0, F0}
-#define UNUSED_PINS {}
 
 #define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
 #define RGBLED_NUM 24     // Number of LEDs
diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h
index f2acea9fef..949fca07df 100644
--- a/keyboards/capsunlocked/cu80/v1/config.h
+++ b/keyboards/capsunlocked/cu80/v1/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B1, B5, B4, F7, D7, D6 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C7, C6, B6, B0, E6, B7, B3, B2, D2, D3, D5, D4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h
index 8deead431c..94be3c3451 100644
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define UNUSED_PINS { }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h
index 9b48d1a7d8..a11e7a5e9b 100644
--- a/keyboards/cest73/tkm/config.h
+++ b/keyboards/cest73/tkm/config.h
@@ -27,7 +27,6 @@
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7, D0 }
 /*    column handy ruler: c0  c1  c2  c3  c4  c5  c6  c7  c8  c9 */
 #define MATRIX_COL_PINS { D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 }
-#define UNUSED_PINS { }
 
 //NOTE: if D6 pin shows any issues in exploatation the LED on the Teensy is to be removed
 
diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h
index 89c9ebde7c..61734ac4ea 100644
--- a/keyboards/charue/charon/config.h
+++ b/keyboards/charue/charon/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, C7 }
 #define MATRIX_COL_PINS { D3, D5, B4, D7, D6, D4, F7, F6, F5, F4, F1, F0, B5, B6, C6 }
-#define UNUSED_PINS { B7, D0, D1, D2 }
 #define DIODE_DIRECTION COL2ROW
 
 /* LED config */
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index 5a0f2e3f8e..aa835564e0 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -12,7 +12,6 @@
 /* Keyboard Matrix Assignment s*/
 #define MATRIX_ROW_PINS { B3, B2, F4, F5, F6 }
 #define MATRIX_COL_PINS { F0, F1, F7, B1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS { B7 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h
index 5ce1111bae..47ec1ca1ff 100644
--- a/keyboards/chavdai40/rev1/config.h
+++ b/keyboards/chavdai40/rev1/config.h
@@ -38,7 +38,6 @@
 
 #define MATRIX_ROW_PINS { A0, A15, B5, B6 }
 #define MATRIX_COL_PINS { B8, B4, B3, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chavdai40/rev2/config.h b/keyboards/chavdai40/rev2/config.h
index e45d2b2db1..5f277415fa 100644
--- a/keyboards/chavdai40/rev2/config.h
+++ b/keyboards/chavdai40/rev2/config.h
@@ -38,7 +38,6 @@
 
 #define MATRIX_ROW_PINS { A0, A15, B5, B6 }
 #define MATRIX_COL_PINS { B7, B4, B3, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index 9f9209df70..08d505f494 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -26,7 +26,6 @@
 #define MATRIX_ROW_PINS { D2, D3, D1, D5 }
 #define MATRIX_COL_PINS { C7, B7, D4, D6, F0, F1, C6, B6, B5, B4, E6, B0 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h
index ee5d973365..fb0d209fdd 100644
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@@ -26,7 +26,6 @@
 #define MATRIX_ROW_PINS { B4, D4, D7, D6, B5, B6, C7, C6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, D2 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/g_idb60/config.h b/keyboards/checkerboards/g_idb60/config.h
index 2aa9dc7747..4f8c1e650f 100644
--- a/keyboards/checkerboards/g_idb60/config.h
+++ b/keyboards/checkerboards/g_idb60/config.h
@@ -26,7 +26,6 @@ Copyright 2021 Nathan Spears
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D6, D7, B4, B5, F7 }
 #define MATRIX_COL_PINS { B6, C6, C7, D4, F6, F0, B0, F1, F4, F5, D1, D0, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h
index 09524f940c..9cd70c1d7d 100644
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@@ -26,7 +26,6 @@ Copyright 2021 Nathan Spears
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, E6, B7, C6 }
 #define MATRIX_COL_PINS { F6, F5, F4, D0, D7, D3, D4, D5, D6, F7, C7, B4, B6, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/phoenix45_ortho/config.h b/keyboards/checkerboards/phoenix45_ortho/config.h
index 9fc442cc8f..a7d1a9a1d5 100644
--- a/keyboards/checkerboards/phoenix45_ortho/config.h
+++ b/keyboards/checkerboards/phoenix45_ortho/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D1, D0, C4 }
 #define MATRIX_COL_PINS { D3, C2, C5, B0, D6, D5, D4, B4, B5, B6, B7, C7, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
index 0acab1cf99..3cee0be178 100644
--- a/keyboards/checkerboards/plexus75/config.h
+++ b/keyboards/checkerboards/plexus75/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D2, B3, B1, F1, F0 }
 #define MATRIX_COL_PINS { B2, B0, D1, F7, F6, F5, F4, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h
index 202eee2e27..096c2e4f0c 100644
--- a/keyboards/checkerboards/plexus75_he/config.h
+++ b/keyboards/checkerboards/plexus75_he/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C2, D0, D1, D2, D6, B0, B3, B2, C6, B1 }
 #define MATRIX_COL_PINS { C4, C5, D3, C7, B7, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index a9714dc2d2..e794580789 100644
--- a/keyboards/checkerboards/pursuit40/config.h
+++ b/keyboards/checkerboards/pursuit40/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D1, F4, F5 }
 #define MATRIX_COL_PINS { F1, E6, B7, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index f985c49b48..dda0f9f189 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
 #define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index 076132fd51..b4664ec5c2 100644
--- a/keyboards/checkerboards/quark_lp/config.h
+++ b/keyboards/checkerboards/quark_lp/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C5, C4, C6, C7 }
 #define MATRIX_COL_PINS { B6, B5, B4, B3, B0, D6, D5, D4, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
index 6883a8d565..919df92e6d 100644
--- a/keyboards/checkerboards/quark_plus/config.h
+++ b/keyboards/checkerboards/quark_plus/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B4, B1, C2, D0, D6, B0, B6, B5 }
 #define MATRIX_COL_PINS { C6, D1, D5, D4, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h
index 56bcd720eb..d9af2af4b3 100644
--- a/keyboards/checkerboards/quark_squared/config.h
+++ b/keyboards/checkerboards/quark_squared/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
 #define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h
index 573f102fcb..f084870939 100644
--- a/keyboards/checkerboards/snop60/config.h
+++ b/keyboards/checkerboards/snop60/config.h
@@ -26,7 +26,6 @@ Copyright 2022 Nathan Spears
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, D0, D6, B4, B5 }
 #define MATRIX_COL_PINS { B6, C6, C7, D5, F7, F6, F5, F4, F1, F0, B0, E6, D4, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h
index 7819d1b002..9ba1df7d8a 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/config.h
+++ b/keyboards/checkerboards/ud40_ortho_alt/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, F0, F1, F4 }
 #define MATRIX_COL_PINS { B2, B1, F7, D6, D7, B4, B5, B6, C6, C7, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index c6266e4459..7c10378e97 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index 1f497cee03..fa9a752801 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
index 030f1e6047..d915e59c7f 100644
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
 #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index e3f7b9bb9e..d3d5818b1c 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
 #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h
index 50b69789ff..3f6bdf4f0a 100644
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B13, B14, A4, A2, A1 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/chickenman/ciel/config.h b/keyboards/chickenman/ciel/config.h
index 800b570590..ce73bdc831 100644
--- a/keyboards/chickenman/ciel/config.h
+++ b/keyboards/chickenman/ciel/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C5, C4, B0, C7, B7 }
 #define MATRIX_COL_PINS { C6, B6, B5, B4, B3, B2, B1, D6, D5, D4, D3, D2, D1, D0, C2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h
index 9cf509da86..fab584880d 100644
--- a/keyboards/chlx/merro60/config.h
+++ b/keyboards/chlx/merro60/config.h
@@ -33,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, D5, D3, B5, F4 }
 #define MATRIX_COL_PINS { B7, D1, D0, B0, B1, E6, B2, B3, D2, D7, B4, B6, C6, C7, D6 }
-#define UNUSED_PINS
-// #define UNUSED_PINS { F0, F1, F5, F6, F7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index c310396030..9c8a0a64b8 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/config.h
@@ -35,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, E6, B0, B1, B2 }
-#define UNUSED_PINS
-// #define UNUSED_PINS { B4, B5, B6, D4, D5, D6, D7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/chocv/config.h b/keyboards/chocv/config.h
index 4d1ea3794a..16c2682646 100644
--- a/keyboards/chocv/config.h
+++ b/keyboards/chocv/config.h
@@ -25,7 +25,6 @@
 
  #define MATRIX_ROW_PINS { F4, F5, D1, D0 }
  #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, C6, D7, E6, B4, B5}
- #define UNUSED_PINS
 
  /* COL2ROW, ROW2COL*/
  #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h
index 9c7e298caf..27923128d3 100644
--- a/keyboards/cipulot/kallos/config.h
+++ b/keyboards/cipulot/kallos/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B3, B2, F0, C7, F4, F1 }
 #define MATRIX_COL_PINS \
     { F5, F6, C6, B6, B5, B4, D7, D6, D4, D5, D3, F7, D2, D1, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h
index cd1296034b..c482a41acd 100644
--- a/keyboards/ckeys/nakey/config.h
+++ b/keyboards/ckeys/nakey/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3 }
-#define UNUSED_PINS { D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, B4, B5, B6, B7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h
index 0ac18c7aa5..07e0ec394d 100644
--- a/keyboards/ckeys/obelus/config.h
+++ b/keyboards/ckeys/obelus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { F0, F1, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ckeys/thedora/config.h b/keyboards/ckeys/thedora/config.h
index c14b575678..721e8977d6 100755
--- a/keyboards/ckeys/thedora/config.h
+++ b/keyboards/ckeys/thedora/config.h
@@ -29,7 +29,6 @@
 #define MATRIX_ROW_PINS { A2, A1, A0, B8 }
 #define MATRIX_COL_PINS { B5, B4, B3, B2, B1, B0 }
 
-// #define UNUSED_PINS { B14 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h
index 643f61c5d6..8849c4e834 100644
--- a/keyboards/ckeys/washington/config.h
+++ b/keyboards/ckeys/washington/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6 }
 #define MATRIX_COL_PINS { F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index f2ccbc7fe6..e6d32c8a62 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, D3, B5, B7, B4, B2 }
 #define MATRIX_COL_PINS { C7, D6, B3, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/contra/config.h b/keyboards/contra/config.h
index 7e4fddb59f..a6be554875 100755
--- a/keyboards/contra/config.h
+++ b/keyboards/contra/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F6, B3, B2, B6 }
 #define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h
index 7347f1948c..80053df0db 100644
--- a/keyboards/converter/a1200/miss1200/config.h
+++ b/keyboards/converter/a1200/miss1200/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0, B1, B3 }
 #define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index 123d6165d6..6e869e1db5 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0, B1, B3 }
 #define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h
index 84a81c297c..9342bd344c 100644
--- a/keyboards/converter/a1200/teensy2pp/config.h
+++ b/keyboards/converter/a1200/teensy2pp/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h
index 33c6303036..b3f03979bc 100644
--- a/keyboards/converter/modelm101/config.h
+++ b/keyboards/converter/modelm101/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0 }
 #define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D6, D5, D4, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h
index eb443856cd..99eae26e01 100644
--- a/keyboards/converter/modelm101_teensy2/config.h
+++ b/keyboards/converter/modelm101_teensy2/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, C6, C7, D5, D4 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, B0, B1, B2, B3, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h
index ff7aa12000..aed3761091 100644
--- a/keyboards/converter/modelm_ssk/config.h
+++ b/keyboards/converter/modelm_ssk/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D5, D4, D3, D2, D1 }
 #define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/converter/numeric_keypad_IIe/config.h b/keyboards/converter/numeric_keypad_IIe/config.h
index be21814f80..27ad0610b5 100644
--- a/keyboards/converter/numeric_keypad_IIe/config.h
+++ b/keyboards/converter/numeric_keypad_IIe/config.h
@@ -94,7 +94,6 @@ http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_conn
 #define MATRIX_COLS 6
 #define MATRIX_ROW_PINS { B0, B2, D2, D3 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 #define SOFT_SERIAL_PIN D0
 #define DEBOUNCE 5
diff --git a/keyboards/cool836a/config.h b/keyboards/cool836a/config.h
index 1b4f3b8916..d2f134c778 100644
--- a/keyboards/cool836a/config.h
+++ b/keyboards/cool836a/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, B5, B4, F4, B1, B6 }
 #define MATRIX_COL_PINS { F5, D0, B2, C6, D7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h
index 07e498856a..88c1393fac 100755
--- a/keyboards/copenhagen_click/click_pad_v1/config.h
+++ b/keyboards/copenhagen_click/click_pad_v1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7 }
 #define MATRIX_COL_PINS { F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h
index 9fe37c68a4..a93d34f4fb 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
 #define MATRIX_ROW_PINS { B1, B0, D7, D6, D4 }
 #define MATRIX_COL_PINS { C0, C1, C2, C3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h
index 7d9c73f480..258efdb965 100644
--- a/keyboards/coseyfannitutti/discipline/config.h
+++ b/keyboards/coseyfannitutti/discipline/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B2, A1, B1, A0, B0 }
 #define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D5, D6, C6, C5, C4, C3, C2, C1, C0, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index 1b9c4c4fac..86294fa7c2 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, B0, F0, F1 }
 #define MATRIX_COL_PINS { B2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coseyfannitutti/mulletpad/config.h b/keyboards/coseyfannitutti/mulletpad/config.h
index 3d5badf883..daa0cb91dc 100644
--- a/keyboards/coseyfannitutti/mulletpad/config.h
+++ b/keyboards/coseyfannitutti/mulletpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F1, F5, F6, F7 }
 #define MATRIX_COL_PINS { F0, C7, C6, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coseyfannitutti/mysterium/config.h b/keyboards/coseyfannitutti/mysterium/config.h
index b6bb2f8510..d11a02c5f0 100644
--- a/keyboards/coseyfannitutti/mysterium/config.h
+++ b/keyboards/coseyfannitutti/mysterium/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                         0   1   2   3   4  5   6   7   8   9   10  11  12  13  14  15  16  17*/
 #define MATRIX_ROW_PINS { C2, C3, C7, C4, C6, C5 }
 #define MATRIX_COL_PINS { A0, B0, A1, B1, A2, B2, A3, B3, A4, B4, A5, A6, A7, D6, D5, D1, D0, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h
index d82277dc89..e70b99984e 100644
--- a/keyboards/coseyfannitutti/romeo/config.h
+++ b/keyboards/coseyfannitutti/romeo/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0   1   2   3   4   5   6   7   8   9  10  11*/
 #define MATRIX_ROW_PINS { B1, B4, B3, B2 }
 #define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h
index 49fac4d254..4cbe7025db 100644
--- a/keyboards/cozykeys/bloomer/v2/config.h
+++ b/keyboards/cozykeys/bloomer/v2/config.h
@@ -24,6 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Keyboard Matrix Assignments
 #define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/cozykeys/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h
index 4bb291be56..222afaf7dc 100644
--- a/keyboards/cozykeys/bloomer/v3/config.h
+++ b/keyboards/cozykeys/bloomer/v3/config.h
@@ -24,6 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Keyboard Matrix Assignments
 #define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h
index 1ab81ed7d1..52ef4bed87 100644
--- a/keyboards/cozykeys/speedo/v2/config.h
+++ b/keyboards/cozykeys/speedo/v2/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Keyboard Matrix Assignments
 #define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 }
-#define UNUSED_PINS { D5, D4, D6, D7, B4 }
 #define DIODE_DIRECTION COL2ROW
 
 // Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index 9928e91f98..39aa73adc8 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Keyboard Matrix Assignments
 #define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B6, B2, E6, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS { D2, D3, B0, B4 }
 #define DIODE_DIRECTION COL2ROW
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h
index 979f4e94a4..90a5401590 100644
--- a/keyboards/cradio/config.h
+++ b/keyboards/cradio/config.h
@@ -39,7 +39,6 @@
     { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
 }
 
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index 8bb7623376..ce953b43fe 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F6, B3, B5 }
 #define MATRIX_COL_PINS { B1, F7, F5, F4, B2, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h
index dd8b7dde07..06939422b0 100755
--- a/keyboards/crawlpad/config.h
+++ b/keyboards/crawlpad/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5 }
 #define MATRIX_COL_PINS { D4, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* Pins for custom per-row LEDs. Should be changed to use named pins. */
 #define LED_ROW_PINS { 8, 9, 10, 11 }
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index e6c7b4c9ef..d1fa1bb5d2 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/crbn/config.h b/keyboards/crbn/config.h
index d2ff5b1fea..47f8ca93a6 100644
--- a/keyboards/crbn/config.h
+++ b/keyboards/crbn/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, B1, F7, F6 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
index 2da93150f6..0af5d6f6b7 100644
--- a/keyboards/creatkeebs/glacier/config.h
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, E6, F5, D0 }
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F6, B0, B6, C6, C7, B1, B2, B3, B7, D3, D2, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
index 863897acbf..68494a1cd6 100644
--- a/keyboards/creatkeebs/thera/config.h
+++ b/keyboards/creatkeebs/thera/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B2, B1, B0, E6, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h
index 3e8304935b..d1b0903ce6 100644
--- a/keyboards/crimsonkeyboards/resume1800/config.h
+++ b/keyboards/crimsonkeyboards/resume1800/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { A5, A0, A1, B1, B2, B0 }
 #define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D1, D5, D6, A6, A7, C7, C6, C5, C4, D7, C3, C2, C1, C0, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index 7bd527449b..9eaa4ddd76 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, C7, C6, B6, B5 }
 #define MATRIX_COL_PINS { F4, F5, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index a8f6ae8644..0f4eb64efe 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, C7, C6, B6, B5, B0}
 #define MATRIX_COL_PINS { F4, F5, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cutie_club/borsdorf/config.h b/keyboards/cutie_club/borsdorf/config.h
index 9c12a349e3..6d77293aea 100644
--- a/keyboards/cutie_club/borsdorf/config.h
+++ b/keyboards/cutie_club/borsdorf/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A15, A14, B12, B5, B4 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cutie_club/giant_macro_pad/config.h b/keyboards/cutie_club/giant_macro_pad/config.h
index c6b63dfa9c..7d306a44c8 100755
--- a/keyboards/cutie_club/giant_macro_pad/config.h
+++ b/keyboards/cutie_club/giant_macro_pad/config.h
@@ -27,7 +27,6 @@
  */
 #define MATRIX_ROW_PINS { C10, C11, C12, D2,  B3,  B4,  B5,  B6,  B7,  B8,  A3,  B2,  B1,  B0,  C5,  C4,  A7,  A6,  A5,  A4 }
 #define MATRIX_COL_PINS { C9,  C8,  C7,  C6,  B15, B14, B13, B12, A8,  A15, B9,  A2,  A1,  A0,  C3,  C2,  C1,  C0,  F1,  F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cutie_club/keebcats/denis/config.h b/keyboards/cutie_club/keebcats/denis/config.h
index 32b93e1eaa..ada603ab48 100644
--- a/keyboards/cutie_club/keebcats/denis/config.h
+++ b/keyboards/cutie_club/keebcats/denis/config.h
@@ -27,7 +27,6 @@
  */
 #define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 }
 #define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-#define UNUSED_PINS { B0, B1, B7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cutie_club/keebcats/dougal/config.h b/keyboards/cutie_club/keebcats/dougal/config.h
index 616b7818f1..e59732a56b 100644
--- a/keyboards/cutie_club/keebcats/dougal/config.h
+++ b/keyboards/cutie_club/keebcats/dougal/config.h
@@ -27,7 +27,6 @@
  */
 #define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 }
 #define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, B7 }
-#define UNUSED_PINS { B0, B1, B3 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h
index 8fa4014ca3..6c601e729e 100644
--- a/keyboards/cutie_club/novus/config.h
+++ b/keyboards/cutie_club/novus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { B6, C6, C7, B2, B3, D0, D1, D2, D3, D7, B4, B5, D5, D4, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h
index f354efe72e..b020db7b93 100644
--- a/keyboards/cutie_club/wraith/config.h
+++ b/keyboards/cutie_club/wraith/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h
index a80c1398d8..c396ff8b93 100644
--- a/keyboards/cx60/config.h
+++ b/keyboards/cx60/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { F1, F4, F5, F6, E6 }
 #define MATRIX_COL_PINS { C7, C6, F7, F0, B4, D7, D6, B0, B1, B2, B3, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* Backlight Setup */
 #define BACKLIGHT_PIN B7
diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h
index 4c42f6a06d..d3833931a4 100644
--- a/keyboards/dailycraft/bat43/config.h
+++ b/keyboards/dailycraft/bat43/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, D7, C6, D4, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, B5, B4 }
-// #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h
index bcfcbababa..6256f3db9c 100644
--- a/keyboards/dailycraft/claw44/rev1/config.h
+++ b/keyboards/dailycraft/claw44/rev1/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 6
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 #define SOFT_SERIAL_PIN D2
 
diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h
index 3704497521..4bae3460d0 100644
--- a/keyboards/dailycraft/owl8/config.h
+++ b/keyboards/dailycraft/owl8/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS { \
     { F4, F7, B3, B6, F5, F6, B1, B2, D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h
index 2bd405d2aa..332aa6cdc1 100644
--- a/keyboards/dailycraft/sandbox/rev1/config.h
+++ b/keyboards/dailycraft/sandbox/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4 }
 #define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h
index 06905afe47..f24c8ef740 100644
--- a/keyboards/dailycraft/sandbox/rev2/config.h
+++ b/keyboards/dailycraft/sandbox/rev2/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4 }
 #define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h
index d9bd0f3301..ad7bd295bb 100644
--- a/keyboards/dailycraft/stickey4/config.h
+++ b/keyboards/dailycraft/stickey4/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS { \
     { D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index 0d53ff7634..992729e3af 100644
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index b2fe3210b6..2f32c483fe 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B2, B4 }
 #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B6, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index f1e7716bb4..3314ac118b 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, NO_PIN }
 #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/config.h
index 0472a84805..a4824a6e73 100644
--- a/keyboards/daji/seis_cinco/config.h
+++ b/keyboards/daji/seis_cinco/config.h
@@ -28,7 +28,6 @@
 */
 #define MATRIX_ROW_PINS { B2, B10, B11, A9, A6 }
 #define MATRIX_COL_PINS { B1, B0, A7, B14, A8, B15, A0, C15, C14, C13, B5, B4, B3, A15, A10, A14 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
index e938096a8e..2ee4fe23c1 100644
--- a/keyboards/db/db63/config.h
+++ b/keyboards/db/db63/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/dc01/arrow/config.h b/keyboards/dc01/arrow/config.h
index 0dc107bd51..1318ec77d7 100644
--- a/keyboards/dc01/arrow/config.h
+++ b/keyboards/dc01/arrow/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, C7, C6, B6, B4 }
 #define MATRIX_COL_PINS { F0, B7, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dc01/left/config.h b/keyboards/dc01/left/config.h
index 5ce6f43c26..ebcf4a0182 100644
--- a/keyboards/dc01/left/config.h
+++ b/keyboards/dc01/left/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, D6 }
 #define MATRIX_COL_PINS { F4, F1, F0, F7, F6, F5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define UNUSED_PINS
 
 #define F_SCL 350000UL
 
diff --git a/keyboards/dc01/numpad/config.h b/keyboards/dc01/numpad/config.h
index 969d97e268..d3133b3732 100644
--- a/keyboards/dc01/numpad/config.h
+++ b/keyboards/dc01/numpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, E6, D6, D7, B4 }
 #define MATRIX_COL_PINS { F0, B7, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dc01/right/config.h b/keyboards/dc01/right/config.h
index e4dcfd549d..4fc84508e0 100644
--- a/keyboards/dc01/right/config.h
+++ b/keyboards/dc01/right/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS { F1, E6, F6, F5, F4, D4, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 055eec6af5..772ed61faf 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F6, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index c57dd2187a..ba956b1798 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, B3, D1, D2, D3, F5 }
 #define MATRIX_COL_PINS { F6, F7, B1, B2, B6, B5, B4, E6, D7, C6, D0, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 8213404eb3..8a054927b9 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D7, B4, B5, B6 }
 #define MATRIX_COL_PINS { B2, B3, B1, F7, F5, F6, D3, D1, D0, D4, C6, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index 8397424aa9..e6f95fa9d4 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, C6, E6, B4, B5, F5}
 #define MATRIX_COL_PINS { B3, B1, F7, F6, F4, D2, D3, D0, D4, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h
index c240196291..43d8a9041b 100644
--- a/keyboards/delikeeb/vaneela/config.h
+++ b/keyboards/delikeeb/vaneela/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F6, F7, B3, B2, B6 }
 #define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h
index 836402fcea..006c55020f 100644
--- a/keyboards/delikeeb/vaneelaex/config.h
+++ b/keyboards/delikeeb/vaneelaex/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, B2, B6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B5, B4, E6, D7, C6, D4 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 12ff241f4c..6b8604e289 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, B6, B2, B3, B1, F5, F6, F7 }
 #define MATRIX_COL_PINS { D3, D2, B5, B4, E6, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
index 78c8027a04..dffb30cf71 100644
--- a/keyboards/deltapad/config.h
+++ b/keyboards/deltapad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D3, D1, D0 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
index fcc9960845..f20f07c584 100755
--- a/keyboards/demiurge/config.h
+++ b/keyboards/demiurge/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F4, F6, F7, C7 }
 #define MATRIX_COL_PINS { E6, F5, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h
index 9fd0a69d64..5fc549ee02 100644
--- a/keyboards/dk60/config.h
+++ b/keyboards/dk60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 }
 #define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index 2ea548dd11..1875566cf6 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, B5, B3, D4 }
 #define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
index 0f608d2e33..a64d584d8e 100644
--- a/keyboards/dm9records/tartan/config.h
+++ b/keyboards/dm9records/tartan/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, B5, B3, B0, C0 }
 #define MATRIX_COL_PINS { D7, D6, D5, D4, B1, B2, C1, C2, C3, C5, D1, D0, C4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
index 8253c6030f..72efc0f556 100644
--- a/keyboards/dmqdesign/spin/config.h
+++ b/keyboards/dmqdesign/spin/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F0, F1, F4 }
 #define MATRIX_COL_PINS { F5, F6, F7, C7, C6 }
-#define UNUSED_PINS { D5, D2, D1, D0, B7, B3, B2, B0, E6 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 5832927baf..34a44066d4 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, F4, B4, D7, D6, B3, B0 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN B2
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index 243020ae1f..2f922435e6 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h
index 4796c68c30..2d16e78457 100644
--- a/keyboards/donutcables/scrabblepad/config.h
+++ b/keyboards/donutcables/scrabblepad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, F1, C7, F2, C6, F3, C5, F4, C4, F5, C3, F6, C2, F7, C1 }
 #define MATRIX_COL_PINS { D6, D7, E0, E1, B7, D2, D3, D4, C0, B4, B5, B6, F0, E6, E7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index f0a7a54c28..853d997094 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { F5 }
 #define ENCODERS_PAD_B { F6 }
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
index b431f471b6..23b255b7d9 100644
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ b/keyboards/doodboard/duckboard_r2/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { F6 }
 #define ENCODERS_PAD_B { F5 }
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index a72fa76d1c..5570cdf9bb 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { E6, F1, C7, F7, F6 }
 #define MATRIX_COL_PINS { F4, F0, B7, B3, B2, B1, D5, D3, D2 }
-#define UNUSED_PINS
 
 #define MATRIX_ROW_PINS_RIGHT { D7, D6, D4, E6, B5 }
 #define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, F7, C7, C6, B6 }
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index 6a1710da87..dfd0cde6d8 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index ff7eb6f6d4..ad7fee9009 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -20,7 +20,6 @@
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index 5c42a927e6..c4a3f82117 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -57,7 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODER_RESOLUTIONS { 4, 4 }
 #define ENCODER_RESOLUTIONS_RIGHT { 4, 1 }
-#define UNUSED_PINS
 
 #define EE_HANDS
 
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index 2c51c2862a..3e0895cff3 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, C0, C1}
 #define MATRIX_COL_PINS { C2, C3, C4, C5 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B1, D0 }
 #define ENCODERS_PAD_B { B2, D1 }
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 0f8b307f6d..309b68039f 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B2,B3, B1, F0, F1}
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3, D5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index cd971248a7..d4e4e2dc28 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B2,B3, B1, F0, F1}
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3, D5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
index fbfcbf33ff..4d55960783 100644
--- a/keyboards/draytronics/scarlet/config.h
+++ b/keyboards/draytronics/scarlet/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
 #define MATRIX_COL_PINS { A5, A6, A7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h
index aa5485f05b..3f5504ba5a 100644
--- a/keyboards/drewkeys/iskar/config.h
+++ b/keyboards/drewkeys/iskar/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  //                       0   1   2   3   4   5   6   7   8   9   10  11  12  13  14  15
 #define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 }
 #define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h
index 4803db9fb6..b5b1914f4e 100644
--- a/keyboards/drhigsby/bkf/config.h
+++ b/keyboards/drhigsby/bkf/config.h
@@ -35,7 +35,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F6, F7, B1, B3 }
 #define MATRIX_COL_PINS { B6, B2, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS 
 
 /* Define encoder pads */
 #define ENCODERS_PAD_A { F4 }
diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h
index 27ecd3b5ae..c1e15170dc 100644
--- a/keyboards/drhigsby/dubba175/config.h
+++ b/keyboards/drhigsby/dubba175/config.h
@@ -35,7 +35,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, B3, B2, B5 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h
index 05ef0cdf6c..a6e01fdb78 100644
--- a/keyboards/drhigsby/ogurec/config.h
+++ b/keyboards/drhigsby/ogurec/config.h
@@ -35,7 +35,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F6, B6, B2 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, F4, F5 }
-#define UNUSED_PINS { F7, B1, B3 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/drhigsby/packrat/config.h b/keyboards/drhigsby/packrat/config.h
index 0b05e6a86a..b55f36c222 100644
--- a/keyboards/drhigsby/packrat/config.h
+++ b/keyboards/drhigsby/packrat/config.h
@@ -35,7 +35,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F7, B1, B6, B2 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3 }
-#define UNUSED_PINS { F6 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
index ec4dce5f54..211b60b3e0 100644
--- a/keyboards/dtisaac/cg108/config.h
+++ b/keyboards/dtisaac/cg108/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 }
 #define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index ccb3f74867..2651a4d9b5 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B7, D7, F1, F0 }
 #define MATRIX_COL_PINS { D1, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
index 71b5baa093..9b9a012ab4 100644
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ b/keyboards/dtisaac/dtisaac01/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, B4, D2, B2, B1, B3, D4, D6 }
 #define MATRIX_COL_PINS { C7, C6, D0, B5, F0, D7, B0, B7, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ducky/one2mini/1861st/config.h b/keyboards/ducky/one2mini/1861st/config.h
index f1fcb4faa1..39050f6102 100644
--- a/keyboards/ducky/one2mini/1861st/config.h
+++ b/keyboards/ducky/one2mini/1861st/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D11, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2, B8 }
 #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h
index f5d1904d8a..c5abcdac94 100644
--- a/keyboards/ducky/one2sf/1967st/config.h
+++ b/keyboards/ducky/one2sf/1967st/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D11, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2,B15,B8 }
 #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dumbo/config.h b/keyboards/dumbo/config.h
index ab99c291bd..811f3d98f6 100644
--- a/keyboards/dumbo/config.h
+++ b/keyboards/dumbo/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring
 #define MATRIX_ROW_PINS { D4, D7, E6, B4 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6}
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { F4, C6 }
 #define ENCODERS_PAD_B { F5, B5 }
diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h
index 6d503c9abe..973cb87b86 100644
--- a/keyboards/dumbpad/v0x/config.h
+++ b/keyboards/dumbpad/v0x/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 5
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* Single rotary encoder */
 #define ENCODERS_PAD_A { D0 }
diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h
index 0380203fdf..d02d5fe8a3 100644
--- a/keyboards/dumbpad/v0x_right/config.h
+++ b/keyboards/dumbpad/v0x_right/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 5
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define UNUSED_PINS
 
 /* Single rotary encoder */
 #define ENCODERS_PAD_A { D4 }
diff --git a/keyboards/dumbpad/v1x/config.h b/keyboards/dumbpad/v1x/config.h
index 0d967a6a01..4c5b14d61c 100644
--- a/keyboards/dumbpad/v1x/config.h
+++ b/keyboards/dumbpad/v1x/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 5
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* Single rotary encoder */
 #define ENCODERS_PAD_A { B2 }
diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h
index 13f4785d8a..29340597b3 100644
--- a/keyboards/dumbpad/v1x_dualencoder/config.h
+++ b/keyboards/dumbpad/v1x_dualencoder/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 5
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* Dual rotary encoders */
 #define ENCODERS_PAD_A { B2, D0 }
diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h
index 23c2685dde..79f0ec1503 100644
--- a/keyboards/dumbpad/v1x_right/config.h
+++ b/keyboards/dumbpad/v1x_right/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 5
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define UNUSED_PINS
 
 /* Single rotary encoder */
 #define ENCODERS_PAD_A { D4 }
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index 753e7c5612..64ef45437f 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -18,7 +18,6 @@
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dz60/keymaps/LEdiodes/config.h b/keyboards/dz60/keymaps/LEdiodes/config.h
index e392109119..e5ead20c12 100644
--- a/keyboards/dz60/keymaps/LEdiodes/config.h
+++ b/keyboards/dz60/keymaps/LEdiodes/config.h
@@ -17,7 +17,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index 3e68abba52..d9f0224ae8 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, F0 }
 #define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, F1, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index ef46b2a207..d08e1547be 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { A15, B3, B4, B5, B11 }
 #define MATRIX_COL_PINS { B12, B13, B14, A8, B9, C13, C14, C15, A1, A2, A3, A4, A5, A6, A7 }
-#define UNUSED_PINS
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index 7bdad00144..86d74bf73a 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -23,7 +23,6 @@
  */
 #define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
 #define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 9426a7be99..89dc7c2b7f 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -23,7 +23,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 7e5dfd6703..9638fab985 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -39,7 +39,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index ccfe91b66b..b1be1fb430 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -23,7 +23,6 @@
  */
 #define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
 #define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 865ac2ab21..89b2315ee6 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -23,7 +23,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 64e2a40bda..f4ec86ae9d 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -39,7 +39,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index 9af78167ad..ab2dca7a69 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -23,7 +23,6 @@
  */
 #define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
 #define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index 140d74fee0..3e52252889 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -23,7 +23,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 3ab221391e..0ddd807f88 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -39,7 +39,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index 5239aa7fea..11f623c1bd 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -20,7 +20,6 @@
 #define MATRIX_COLS 14
 #define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
 #define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 6c21fa22c2..27c99f91f6 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
 #define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz96/config.h b/keyboards/dztech/dz96/config.h
index 189edb4e73..534bd56cd9 100644
--- a/keyboards/dztech/dz96/config.h
+++ b/keyboards/dztech/dz96/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 }
 #define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h
index 89bbbd1d60..87b87b4365 100644
--- a/keyboards/e88/config.h
+++ b/keyboards/e88/config.h
@@ -35,7 +35,6 @@
 #define MATRIX_ROW_PINS { B7, D7, B4, C6, B5, B6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, D2, D3, B3, B2, B1, E6, D5, D6, D4 }
 
-#define UNUSED_PINS {B0}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index f78db423ea..ff217d933c 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B2, F7, B3, B6, B1 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/earth_rover/config.h b/keyboards/earth_rover/config.h
index 9fbc8c13da..081834972e 100644
--- a/keyboards/earth_rover/config.h
+++ b/keyboards/earth_rover/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ebastler/e80_1800/config.h b/keyboards/ebastler/e80_1800/config.h
index c21285483c..85e2a4e409 100644
--- a/keyboards/ebastler/e80_1800/config.h
+++ b/keyboards/ebastler/e80_1800/config.h
@@ -26,7 +26,6 @@
 
 #define MATRIX_ROW_PINS { B7, B3, D2, C12, C11, C10, A15 }
 #define MATRIX_COL_PINS { A1, A0, C3, C2, F1, F0, C15, C14, C13, C4, C5, B0, B1, B2, B9, A13, A8, C9, C8 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
index 787d33e16d..2c2a62fc26 100644
--- a/keyboards/ebastler/isometria_75/rev1/config.h
+++ b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { A15, B4, B5, B6, B7, B8}
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10, A13, A14, B9, C13, F0, F1, A0, B2, B10, B11 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h
index 65cb050d6c..f674c50f23 100644
--- a/keyboards/eco/rev1/config.h
+++ b/keyboards/eco/rev1/config.h
@@ -24,4 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ECO V1 pin-out */
 #define MATRIX_ROW_PINS { B1, B6, B2, B3 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define UNUSED_PINS
diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h
index bbc0492e06..091b4ffcce 100644
--- a/keyboards/eco/rev2/config.h
+++ b/keyboards/eco/rev2/config.h
@@ -24,4 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ECO V2.1 pin-out */
 #define MATRIX_ROW_PINS { D7, B5, B4, E6 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }
-#define UNUSED_PINS
diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
index 8e47136e6b..907cf257fe 100644
--- a/keyboards/edc40/config.h
+++ b/keyboards/edc40/config.h
@@ -32,7 +32,6 @@
  */
  #define MATRIX_ROW_PINS { D4, D6, D7, F7 }
  #define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, B4, B5 }
- #define UNUSED_PINS
 
  #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index be136fe9c9..321946b46c 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, D4, D6, D7, B4 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5 }
-#define UNUSED_PINS { B7, D2, D3, D5 }
 
 
 /* COL2ROW, ROW2COL */
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index 83cc9f3eef..ebf0f6de9a 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -20,7 +20,6 @@
 */
 #define MATRIX_ROW_PINS { D1, F4, F6, F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { F5, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS {}
 
 
 /* COL2ROW, ROW2COL */
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index a9d3d5e75b..e183afa0be 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { D4, C6, B6, B2, B3, B1, F7, F6, F5, F4 }
 
-#define UNUSED_PINS { D2, D1, D0 }
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
index 6370544c2b..e937fe57c2 100644
--- a/keyboards/efreet/config.h
+++ b/keyboards/efreet/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, D6, D5, D4, D3, D2, D1, C2 }
 #define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index 92f1303480..26d9daba4e 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS \
     { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/emajesty/eiri/config.h b/keyboards/emajesty/eiri/config.h
index 748558719f..fb8f2d357d 100644
--- a/keyboards/emajesty/eiri/config.h
+++ b/keyboards/emajesty/eiri/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, B5, B2, B6 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h
index 5bd1775659..6bd6981274 100644
--- a/keyboards/emi20/config.h
+++ b/keyboards/emi20/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B6 }
 #define MATRIX_COL_PINS { C7, C6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eniigmakeyboards/ek60/config.h b/keyboards/eniigmakeyboards/ek60/config.h
index b9bd26b39b..75cadda935 100644
--- a/keyboards/eniigmakeyboards/ek60/config.h
+++ b/keyboards/eniigmakeyboards/ek60/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { B2, B1, B0, F0, B4 }
 #define MATRIX_COL_PINS { F7, C6, F6, B6, F5, F4, B5, F1, E6, D0, D7, D5, D1, D3, D2 }
-#define UNUSED_PINS { B3, B7, C7, D4, D6 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eniigmakeyboards/ek65/config.h b/keyboards/eniigmakeyboards/ek65/config.h
index 35a38fdbdc..a3872f02f2 100644
--- a/keyboards/eniigmakeyboards/ek65/config.h
+++ b/keyboards/eniigmakeyboards/ek65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, E6, B2, B1, B0 }
-#define UNUSED_PINS { B3, B7, D4, D6 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h
index a15994b7f9..133738e460 100644
--- a/keyboards/eniigmakeyboards/ek87/config.h
+++ b/keyboards/eniigmakeyboards/ek87/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, F0, F1, E6, D3, D2, D1 }
-#define UNUSED_PINS { D5 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ep/96/config.h b/keyboards/ep/96/config.h
index d057e05c35..a7d9d1a91b 100644
--- a/keyboards/ep/96/config.h
+++ b/keyboards/ep/96/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B3, B2, B7, C6 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C7, F7, F6, F5, F4, F1, F0, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ep/comsn/hs68/config.h b/keyboards/ep/comsn/hs68/config.h
index 1a7e681bd2..7998faf673 100644
--- a/keyboards/ep/comsn/hs68/config.h
+++ b/keyboards/ep/comsn/hs68/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   { B6, B5, B4, D0, F6 }
 #define MATRIX_COL_PINS \
   { B0, B1, B3, B2, B7, D3, F1, D5, D6, D7, F4, F5, C7, C6, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
index 879c4405f4..416f3b5477 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   { F4, F5, F6, F7, D2 }
 #define MATRIX_COL_PINS \
   { B1, B2, B3, E6, B7, F1, F0, D0, D1, D7, D5, D4, D6, B4, B5, D3, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ep/comsn/tf_longeboye/config.h b/keyboards/ep/comsn/tf_longeboye/config.h
index 73ec20acfb..964705bff3 100644
--- a/keyboards/ep/comsn/tf_longeboye/config.h
+++ b/keyboards/ep/comsn/tf_longeboye/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   { B5, B4, D1, D2, D3 }
 #define MATRIX_COL_PINS \
   { F4, F5, F6, F7, B1, B3, B2, B6, F0, F1, C7, D5, B7, E6, D7, C6, D4, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/epoch80/config.h b/keyboards/epoch80/config.h
index f960058d74..7c1e66ddc0 100644
--- a/keyboards/epoch80/config.h
+++ b/keyboards/epoch80/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
index 72abf556d4..8aa4be245d 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ b/keyboards/ericrlau/numdiscipline/rev1/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B2, A1, B1, A0, B0 }
 #define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D5, D6, C6, C5, C4, C3, C2, C1, C0, D7, A5, A6, A7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index d98af99960..29933bcbb0 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eu_isolation/config.h b/keyboards/eu_isolation/config.h
index 49355bfec8..0681896cb9 100644
--- a/keyboards/eu_isolation/config.h
+++ b/keyboards/eu_isolation/config.h
@@ -23,7 +23,6 @@
 /* NIU Mini PCB default pin-out */
 #define MATRIX_ROW_PINS { D2, D3, F1, F0 }
 #define MATRIX_COL_PINS { D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evancookaudio/sleepingdinosaur/config.h b/keyboards/evancookaudio/sleepingdinosaur/config.h
index c6818085e1..73c24861c5 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/config.h
+++ b/keyboards/evancookaudio/sleepingdinosaur/config.h
@@ -32,4 +32,3 @@
 
 #define MATRIX_ROW_PINS {D1, D0, D4, C6, D7}
 #define MATRIX_COL_PINS {B3, B1, F7, F6, F5, F4}
-#define UNUSED_PINS
diff --git a/keyboards/evancookaudio/tenpad/config.h b/keyboards/evancookaudio/tenpad/config.h
index e49d8e9b1a..f72ffeb685 100644
--- a/keyboards/evancookaudio/tenpad/config.h
+++ b/keyboards/evancookaudio/tenpad/config.h
@@ -33,5 +33,4 @@
 #define MATRIX_ROW_PINS {D0, D1}
 #define MATRIX_COL_PINS {F4, F5, F6, F7, B1}
 
-#define UNUSED_PINS {B3, B2, B6, B7, D5, C7, F1, F0, B4, E6, D7, C6, D4 }
 
diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h
index 4947167645..fd40e2e568 100644
--- a/keyboards/eve/meteor/config.h
+++ b/keyboards/eve/meteor/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B5, B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0, D7}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h
index 25fb7d4a0b..bf086b394a 100644
--- a/keyboards/evil80/config.h
+++ b/keyboards/evil80/config.h
@@ -9,7 +9,6 @@
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { F1, F4, F5, F0, B3, B0 }
 #define MATRIX_COL_PINS { B2, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1, C6, C7, E6, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
index cba27459cd..a314395501 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B1,B2,B3,B7}
 #define MATRIX_COL_PINS {D7,D5,F0,F1,F4,F6,F7,D4,C7,C6,D6,B5,B4}
-#define UNUSED_PINS
 
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index a00f5177fe..4ca725705b 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B3,B2,B1,B0}
 #define MATRIX_COL_PINS {B7,F0,F1,F4,F6,D4,D6,D7,B4,B5,C6,C7,F7}
-#define UNUSED_PINS
 
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h
index 19add7be46..8d8b477e4a 100644
--- a/keyboards/evyd13/atom47/rev4/config.h
+++ b/keyboards/evyd13/atom47/rev4/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {D0,C2,C5,C6}
 #define MATRIX_COL_PINS {C4,C7,B7,B6,B5,B2,B1,B0,D6,D5,D4,D3,D2}
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B3 }
 #define ENCODERS_PAD_B { B4 }
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index 4ab41e9567..d16ac9404f 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS {B1,B2,B3,D4}
 #define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,D7,B4,B5,B6,C6,C7}
-#define UNUSED_PINS {B0,B7,D2,D3,D5,D6}
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
index a10c3924fc..3a3fdfccff 100644
--- a/keyboards/evyd13/eon40/config.h
+++ b/keyboards/evyd13/eon40/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {B7,D5,F5,F6}
 #define MATRIX_COL_PINS {F0,F1,F4,D3,D4,D6,D7,B4,B5,B6,C6,C7}
-#define UNUSED_PINS {B1,B2,B3}
 
 #define ENCODERS_PAD_A { E6, B0, D1 }
 #define ENCODERS_PAD_B { F7, D0, D2 }
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index 02d8e96474..c9796792aa 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {D3,D5,B1,B2,B3}
 #define MATRIX_COL_PINS {B0,D2,D4,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,F1,F0}
-#define UNUSED_PINS {B7,D0,D1}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h
index 4cc5d89300..c77a0c9be9 100644
--- a/keyboards/evyd13/eon75/config.h
+++ b/keyboards/evyd13/eon75/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7}
 #define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3}
-#define UNUSED_PINS {B2,B1}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h
index 8b23338406..4379f6106e 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {B1,B2,B3,D4,D1,D5}
 #define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,E6,B7,D3,D2}
-#define UNUSED_PINS {B0}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index c10eab2fcf..4fb9906832 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7}
 #define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3,B2,B1}
-#define UNUSED_PINS {}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h
index 2be1840b77..c1e0a1533c 100644
--- a/keyboards/evyd13/gh80_1800/config.h
+++ b/keyboards/evyd13/gh80_1800/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {D5,B4,B5,B6,C6,C7,B0,B2,B1,B3}
 #define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,D3,D2,D1,D0,B7}
-#define UNUSED_PINS {E6}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h
index fdc4b7968c..a83c5563bf 100644
--- a/keyboards/evyd13/gh80_3700/config.h
+++ b/keyboards/evyd13/gh80_3700/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {B3,C7,C6,B6,B5,B4}
 #define MATRIX_COL_PINS {B0,D7,D6,D4}
-#define UNUSED_PINS {}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h
index f942e47164..a6aeea3423 100644
--- a/keyboards/evyd13/gud70/config.h
+++ b/keyboards/evyd13/gud70/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {D7,D6,D4,E6,B7}
 #define MATRIX_COL_PINS {D5,D3,D2,D1,D0,B4,B5,B6,C6,C7,F0,F1,F4,F5,F6,F7}
-#define UNUSED_PINS {}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h
index 118ea3693b..f17184715f 100644
--- a/keyboards/evyd13/minitomic/config.h
+++ b/keyboards/evyd13/minitomic/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {B1,B3,D4,D6}
 #define MATRIX_COL_PINS {C6,B6,B5,B4,D7,F0,F1,F4,F5,F6,F7,B7,E6}
-#define UNUSED_PINS {B2,D0,D1,D2,D3,D5}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h
index caa88da9a5..eccfd287b7 100644
--- a/keyboards/evyd13/mx5160/config.h
+++ b/keyboards/evyd13/mx5160/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {C6,C7,B5,B6,D7,B4,D4,D6,D5,D3}
 #define MATRIX_COL_PINS {D0,D1,D2,F7,F6,F5,F4,F1,F0,E6}
-#define UNUSED_PINS {B7,B0}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
index 716c910911..be1b892280 100644
--- a/keyboards/evyd13/nt660/config.h
+++ b/keyboards/evyd13/nt660/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS {B7,E6,F6,F7,C7}
 #define MATRIX_COL_PINS {D6,D7,B4,B5,B6,C6,B0,B1,B2,B3,F0,F1,F4,F5,D4}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h
index 68d7603202..30f453ebd8 100644
--- a/keyboards/evyd13/nt750/config.h
+++ b/keyboards/evyd13/nt750/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS {B2,B3,B7,D0,D1,D2}
 #define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,E6,B1,B0}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h
index 785507d0c8..b4757a844d 100644
--- a/keyboards/evyd13/nt980/config.h
+++ b/keyboards/evyd13/nt980/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, D1, D0, C6, C7, B5, B6, B4, D7, D4, D6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, E6, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h
index 40ba73dfe9..9f51b63a9f 100644
--- a/keyboards/evyd13/omrontkl/config.h
+++ b/keyboards/evyd13/omrontkl/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {D0,D1,D2,D3,D4,B7}
 #define MATRIX_COL_PINS {F0,C7,F1,C6,F4,B6,F5,B5,F6,B4,F7,D7,D6,D5,B3,B1,B2}
-#define UNUSED_PINS {E6,B0}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
index f4755a1b42..21e27d130e 100644
--- a/keyboards/evyd13/pockettype/config.h
+++ b/keyboards/evyd13/pockettype/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {D3,D1,D7,B5}
 #define MATRIX_COL_PINS {F6,F7,B1,B3,B2,B6,B4,E6,C6,D4,D0,D2}
-#define UNUSED_PINS {B1,B2,B3}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index 60d1164551..c2bf0598c3 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS {D3,F5,F4,F0,B7,B2,E6,B0}
 #define MATRIX_COL_PINS {B3,F1,B1,D5,D2,D1,D0,D4,D6,D7,B4,B5,B6,C6,C7}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h
index d5d8d4fc24..d622cc1695 100644
--- a/keyboards/evyd13/solheim68/config.h
+++ b/keyboards/evyd13/solheim68/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS {E6,B0,B1,B2,B3}
 #define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3}
-#define UNUSED_PINS {B7,D0,D1,D2}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h
index 4ea54f6a2a..a65210e0ed 100644
--- a/keyboards/evyd13/ta65/config.h
+++ b/keyboards/evyd13/ta65/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B4,D7,D6,D4,B3}
 #define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0}
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B2 }
 #define ENCODERS_PAD_B { B1 }
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index 821cc26b65..02db1dc2ab 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D6, D4, F6, F7, F4, F5, F0, F1 }
 #define MATRIX_COL_PINS { C7, B6, C6, B4, B5, D7, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, D3, B7, B3 } // Columns 6-12 controlled by demux
-#define UNUSED_PINS
 
 #define SN74X138_ADDRESS_PINS { D2, D1, D0 }
 
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index 84c2614c39..ca79477e12 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { E6, C7, C6, B6, B5, B4, D7, D6 }
 #define MATRIX_COL_PINS { F7, F5, F6, F1, F4, F0, NO_PIN, D5, D3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } // Columns 6 and 9-15 controlled by demux
-#define UNUSED_PINS
 
 #define SN74X138_ADDRESS_PINS { D2, D1, D0 }
 #define SN74X138_E3_PIN D4
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index 538c1ef889..b0ac35cff8 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B0,D1,D2,D3,D5}
 #define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,C7,C6,B6,B5,B4,D7,D6,D4}
-#define UNUSED_PINS
 
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index 49f4e916d9..6b65d5ea9b 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -27,7 +27,6 @@
     { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS \
     { C6, C7, D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index d00a6ac715..c4765ce93c 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -12,7 +12,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, F4, F5, F6, D6 }
 #define MATRIX_COL_PINS { D7, B4, B5, B6, C6, C7, F7, F0, B0, B1, D2, D3, B3, B2 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 //rgb light setting
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 0999d13bf1..6f684a24e6 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* QMK E6-V2 PCB default pin-out */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN B7
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index 213fb34947..6e82f4650b 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* QMK E6-V2 PCB default pin-out */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { C7, C6, B5, B4, D7, D6, D4, F6, F7, F5, F4, F1, F0, B0, B1 }
-#define UNUSED_PINS { E6, B2, B3, B7 }
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 217885e44f..ff985f4255 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
 #define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 2eee4ef01f..32e913bd12 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, F0 }
 #define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D7, D6, D4, B4, B5, B6, C6, C7, F7, F6, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index 2683403204..49d5efc7b0 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         0   1   2   3   4   5   6   7   8   9   A
 #define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index 6f51688db7..ad7938f17c 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -34,7 +34,6 @@
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
 #define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A1, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
index 75b5e19384..00f609b282 100644
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ b/keyboards/eyeohdesigns/babyv/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B5, D2, D5, D3 }
 #define MATRIX_COL_PINS { D0, D1, B4, D7, D6, D4, B0, B1, B2, F0, F1, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h
index ad3d630f4f..7417e63143 100644
--- a/keyboards/eyeohdesigns/theboulevard/config.h
+++ b/keyboards/eyeohdesigns/theboulevard/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F7, B1, E6, F0, F1 }
 #define MATRIX_COL_PINS { B0, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
index 3a38df9130..1dc4236c51 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 3bd00eebae..4aa7aaf348 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -26,7 +26,6 @@
  */
 #define MATRIX_ROW_PINS { B1, B2, B3, C6, C7 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS { B0, B7 }
 
 /* COL2ROW or ROW2COL
  */
diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h
index 99089e9e0a..68c14ea61c 100644
--- a/keyboards/fc980c/config.h
+++ b/keyboards/fc980c/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 }
 // #define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 }
-// #define UNUSED_PINS
 
 //#define DIODE_DIRECTION
 
diff --git a/keyboards/feels/feels65/config.h b/keyboards/feels/feels65/config.h
index 13ce5c6afd..d036fdddd9 100644
--- a/keyboards/feels/feels65/config.h
+++ b/keyboards/feels/feels65/config.h
@@ -24,6 +24,5 @@
 /* default pinout */
 #define MATRIX_ROW_PINS { D5, D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h
index f51e5dd8f1..4e454fd0a0 100644
--- a/keyboards/ferris/0_2/config.h
+++ b/keyboards/ferris/0_2/config.h
@@ -52,8 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B7, B6, B5, A2, A0, A0, A0, A0 }
 #define MATRIX_COL_PINS \
     { B8, B4, B3, A15, A14, A1, A1, A1, A1, A1 }
-#define UNUSED_PINS \
-    { A3, A4, A5, A6, A7, A8, A9, A10, A13, B0, B1, B2, B9, B12, B13, B14, B15, C13, C14, C15, F0, F1 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
index 8cbaade80b..c74c1bf6c5 100644
--- a/keyboards/ferris/sweep/config.h
+++ b/keyboards/ferris/sweep/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2018-2020 
+/* Copyright 2018-2020
 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
 David Philip Barr <@davidphilipbarr>
 Pierre Chevalier <pierrechevalier83@gmail.com>
@@ -46,8 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
 }
 
-#define UNUSED_PINS
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
index bc03d3d79e..1bb8d77a22 100644
--- a/keyboards/fjlabs/7vhotswap/config.h
+++ b/keyboards/fjlabs/7vhotswap/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B0, F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/ad65/config.h b/keyboards/fjlabs/ad65/config.h
index cbab1ed111..de19592464 100644
--- a/keyboards/fjlabs/ad65/config.h
+++ b/keyboards/fjlabs/ad65/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 7f0fb50e3e..d7da95f678 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
index 8d65b22434..5bb4800aa0 100644
--- a/keyboards/fjlabs/bks65solder/config.h
+++ b/keyboards/fjlabs/bks65solder/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/bolsa65/config.h b/keyboards/fjlabs/bolsa65/config.h
index e3280216be..4c0b2bdfad 100644
--- a/keyboards/fjlabs/bolsa65/config.h
+++ b/keyboards/fjlabs/bolsa65/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F1, F0, F6, F5, F4  }
 #define MATRIX_COL_PINS { C7, B1, B2, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index 9f4a3b239b..0313d0247d 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
 #define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index 59ce1c61fa..7d83a83dc8 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/ldk65/config.h b/keyboards/fjlabs/ldk65/config.h
index b37f371812..5321f569fa 100644
--- a/keyboards/fjlabs/ldk65/config.h
+++ b/keyboards/fjlabs/ldk65/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/midway60/config.h b/keyboards/fjlabs/midway60/config.h
index 9dde640bee..d218cb7022 100644
--- a/keyboards/fjlabs/midway60/config.h
+++ b/keyboards/fjlabs/midway60/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index 54a787103f..02b2a741d4 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/polaris/config.h b/keyboards/fjlabs/polaris/config.h
index 87d8423b9f..dc6fce6c84 100644
--- a/keyboards/fjlabs/polaris/config.h
+++ b/keyboards/fjlabs/polaris/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h
index 8edf1c5d08..9258d4ddba 100644
--- a/keyboards/fjlabs/ready100/config.h
+++ b/keyboards/fjlabs/ready100/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/sinanju/config.h b/keyboards/fjlabs/sinanju/config.h
index 01d81a2f3d..751dd24383 100644
--- a/keyboards/fjlabs/sinanju/config.h
+++ b/keyboards/fjlabs/sinanju/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h
index 40b9ad8525..05c528efb6 100644
--- a/keyboards/fjlabs/solanis/config.h
+++ b/keyboards/fjlabs/solanis/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
 #define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h
index ad184d17b6..0a0f66f275 100644
--- a/keyboards/fjlabs/swordfish/config.h
+++ b/keyboards/fjlabs/swordfish/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B0, B1, C7, C6, B6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B2, B3, B7, B5, B4, D7, D6, D4, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index 54a787103f..02b2a741d4 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index 54a787103f..02b2a741d4 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
index 4a71d1dac7..981eb2144e 100644
--- a/keyboards/fjlabs/tf65rgbv2/config.h
+++ b/keyboards/fjlabs/tf65rgbv2/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index c0f73366a7..dbb23e1ffb 100644
--- a/keyboards/flehrad/bigswitch/config.h
+++ b/keyboards/flehrad/bigswitch/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5 }
 #define MATRIX_COL_PINS { B6 }
-#define UNUSED_PINS { }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h
index fa13006a97..2d22a98ae4 100644
--- a/keyboards/flehrad/downbubble/config.h
+++ b/keyboards/flehrad/downbubble/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F1, F2, F3, F4, F5, F6 }
 #define MATRIX_COL_PINS { F7, C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D6, D5, D4, D3, D2, D1, D0, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
index 8360dfb3f9..f39e99c8bb 100644
--- a/keyboards/flehrad/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
@@ -16,7 +16,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F6, B5, B4, E6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
index 946534ebb8..728c624462 100644
--- a/keyboards/flehrad/snagpad/config.h
+++ b/keyboards/flehrad/snagpad/config.h
@@ -16,7 +16,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index 6b8f021ebc..aef6f60472 100644
--- a/keyboards/flehrad/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
@@ -31,7 +31,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, C6, D4, D0 }
 #define MATRIX_COL_PINS { F7, B1, D7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h
index 3e7da10503..d10f94bc00 100644
--- a/keyboards/fleuron/config.h
+++ b/keyboards/fleuron/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { C7, B6, B3, B5, B4, D7, D4, D5, D3, D2, D1, D0, B7, B0, B1, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fluorite/config.h b/keyboards/fluorite/config.h
index b414389c0b..f4e973d5d1 100644
--- a/keyboards/fluorite/config.h
+++ b/keyboards/fluorite/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { D3, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/flx/lodestone/config.h b/keyboards/flx/lodestone/config.h
index 844e769a6c..b232e7f06e 100644
--- a/keyboards/flx/lodestone/config.h
+++ b/keyboards/flx/lodestone/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B3, B7, F0, F1, F4 }
 #define MATRIX_COL_PINS { B2, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/flygone60/rev3/config.h b/keyboards/flygone60/rev3/config.h
index e75eb64617..cb752315e0 100644
--- a/keyboards/flygone60/rev3/config.h
+++ b/keyboards/flygone60/rev3/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D3, D5, B7, F1}
 #define MATRIX_COL_PINS { F0, E6, B1, B2, B3, B0, D4, D6, D7, B4, B5, B6, C6, C7}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/foostan/cornelius/config.h b/keyboards/foostan/cornelius/config.h
index fa3493e455..e3b7ed4f64 100644
--- a/keyboards/foostan/cornelius/config.h
+++ b/keyboards/foostan/cornelius/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/for_science/config.h b/keyboards/for_science/config.h
index 32c335bbb3..f3f2d1ffc9 100644
--- a/keyboards/for_science/config.h
+++ b/keyboards/for_science/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
 //#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 //#define USE_I2C
 #define SOFT_SERIAL_PIN D0
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index a0eb1b93e6..725e3d7a79 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D2, D1, D0, D3, D5 }
 #define MATRIX_COL_PINS { F5, F4, F1, F0, B0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index 270cf0ad6e..eb702fc948 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 }
 #define MATRIX_COL_PINS { B0, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h
index 7e7e521f27..e0a1cbeaf8 100644
--- a/keyboards/foxlab/time80/config.h
+++ b/keyboards/foxlab/time80/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
 #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fr4/southpaw75/config.h b/keyboards/fr4/southpaw75/config.h
index d96d5bc20c..3f613c371b 100644
--- a/keyboards/fr4/southpaw75/config.h
+++ b/keyboards/fr4/southpaw75/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { B5, F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fr4/unix60/config.h b/keyboards/fr4/unix60/config.h
index 03ae2c509d..5e0b52ee80 100644
--- a/keyboards/fr4/unix60/config.h
+++ b/keyboards/fr4/unix60/config.h
@@ -26,7 +26,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7 }
 #define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h
index c494f6aa77..9db3d0abe5 100755
--- a/keyboards/fractal/config.h
+++ b/keyboards/fractal/config.h
@@ -10,7 +10,6 @@
 #define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { B3, B2, B6, B5, B4, E6, D7, C6, D4, D0, D1, D3 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/free_willy/config.h b/keyboards/free_willy/config.h
index 918821b787..a5250a8c39 100644
--- a/keyboards/free_willy/config.h
+++ b/keyboards/free_willy/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/friedrich/config.h b/keyboards/friedrich/config.h
index 5b601cf6c0..531a9af4d5 100644
--- a/keyboards/friedrich/config.h
+++ b/keyboards/friedrich/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { F4, F1, F0, F5, D5 }
 #define MATRIX_COL_PINS { F6, F7, E6, B2, B3, D4, D6, D7, B4, C6, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index bf727460c6..d922620dde 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
-#define UNUSED_PINS     {}
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/function96/v1/config.h b/keyboards/function96/v1/config.h
index 9f36f8b5f5..e3f603cd7c 100644
--- a/keyboards/function96/v1/config.h
+++ b/keyboards/function96/v1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F1, F0, C15, C14, C13, B9 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B12, A13, A14, A15, B3, B4, B5, B6, B7, B8}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/function96/v2/config.h b/keyboards/function96/v2/config.h
index 5c49a16785..5f44ea397e 100644
--- a/keyboards/function96/v2/config.h
+++ b/keyboards/function96/v2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A14, A15, B3, B4, B5, B6, B7, B8, B9}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/funky40/config.h b/keyboards/funky40/config.h
index 2346adef27..20e2c890a4 100644
--- a/keyboards/funky40/config.h
+++ b/keyboards/funky40/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, C6, B4, B5 }
 #define MATRIX_COL_PINS { D3, F5, F4, F7, B1, B6, B2, B3, D2, F6, E6, D7 }
-#define UNUSED_PINS 
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
index 84e1899081..50f23cb945 100644
--- a/keyboards/gboards/butterstick/config.h
+++ b/keyboards/gboards/butterstick/config.h
@@ -12,7 +12,6 @@
 #define MATRIX_COLS 10
 #define MATRIX_ROW_PINS { F4, F5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index f118bb4017..bd8c075190 100644
--- a/keyboards/gboards/gergoplex/config.h
+++ b/keyboards/gboards/gergoplex/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { B1, B2, B3, D2, D3 }
-#define UNUSED_PINS
 #define IGNORE_MOD_TAP_INTERRUPT
 
 #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 69c87cd154..7ddbefea2a 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -20,7 +20,6 @@
 #define MATRIX_COLS 4
 
 #define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}}
-#define UNUSED_PINS
 
 #define RGBLED_NUM 42
 #define DRIVER_LED_TOTAL 42
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index 47cb82f215..bdf2d39c98 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -7,7 +7,6 @@
 
 #define MATRIX_ROW_PINS { B0, D4}
 #define MATRIX_COL_PINS { F7, F6, D2, D3}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABL
diff --git a/keyboards/generic_panda/panda65_01/config.h b/keyboards/generic_panda/panda65_01/config.h
index 41cf77a389..e3cab53758 100644
--- a/keyboards/generic_panda/panda65_01/config.h
+++ b/keyboards/generic_panda/panda65_01/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A9, A8, B15, A6, A4 }
 #define MATRIX_COL_PINS { A3, A10, B7, B6, B5, B4, B3, A15, A14, A2, A1, A0, F1, F0, B10, B11 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h
index c13f04ad29..0bc5fa68a1 100644
--- a/keyboards/genone/eclipse_65/config.h
+++ b/keyboards/genone/eclipse_65/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/genone/g1_65/config.h b/keyboards/genone/g1_65/config.h
index ecbbf6e8c4..de1714f7cd 100644
--- a/keyboards/genone/g1_65/config.h
+++ b/keyboards/genone/g1_65/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gentleman65/config.h b/keyboards/gentleman65/config.h
index a58111d7df..7ebaae3e5a 100644
--- a/keyboards/gentleman65/config.h
+++ b/keyboards/gentleman65/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, D2, D1, F7, F1 }
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, D5, C7, F0, B2, B1, B3, B0, B7, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h
index f7f85bfaf7..286bb53cba 100644
--- a/keyboards/gh60/revc/config.h
+++ b/keyboards/gh60/revc/config.h
@@ -38,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 }
 // Rev B/C
    #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index 487400d574..3a094be74f 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN B2
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
index b1c1600e9d..5bb9bd59a8 100644
--- a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
+++ b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 
diff --git a/keyboards/gh60/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
index fcdf1f1528..720b359c1e 100644
--- a/keyboards/gh60/satan/keymaps/fakb/config.h
+++ b/keyboards/gh60/satan/keymaps/fakb/config.h
@@ -18,7 +18,6 @@
 
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 
diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h
index 1476722c74..b3df0ae2f6 100644
--- a/keyboards/gh80_3000/config.h
+++ b/keyboards/gh80_3000/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 }
 #define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index 33ce4f0e5c..7b93dc2197 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
index 5bc2e400bf..1a8bf51312 100755
--- a/keyboards/gizmo_engineering/gk6/config.h
+++ b/keyboards/gizmo_engineering/gk6/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B4, D7, D6, D4}
 #define MATRIX_COL_PINS { B5, C6, C7, F7, F6, D5, D3, D2, F1, F4, B7, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 3e89084879..9df13da954 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, D5, D6, D7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gl516/a52gl/config.h b/keyboards/gl516/a52gl/config.h
index 8c7ea45bbd..0841d8e26e 100644
--- a/keyboards/gl516/a52gl/config.h
+++ b/keyboards/gl516/a52gl/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring of each half
 #define MATRIX_ROW_PINS { D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h
index 01dc309a5c..bbbb1110c6 100644
--- a/keyboards/gl516/j73gl/config.h
+++ b/keyboards/gl516/j73gl/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring of each half
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 }
-#define UNUSED_PINS
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h
index 69e770a6b9..44b31834c1 100644
--- a/keyboards/gl516/n51gl/config.h
+++ b/keyboards/gl516/n51gl/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring of each half
 #define MATRIX_ROW_PINS { D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { D7 }
 #define ENCODERS_PAD_B { E6 }
diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h
index 85dfe0a339..90b4b18494 100644
--- a/keyboards/gon/nerd60/config.h
+++ b/keyboards/gon/nerd60/config.h
@@ -13,7 +13,6 @@
 /* matrix pins */
 #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 }
 #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h
index ec2cbc8a32..66b132e052 100644
--- a/keyboards/gon/nerdtkl/config.h
+++ b/keyboards/gon/nerdtkl/config.h
@@ -13,7 +13,6 @@
 /* matrix pins */
 #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 }
 #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 }
-#define UNUSED_PINS
 
 #define BOOTMAGIC_LITE_ROW 8
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/gorthage_truck/config.h b/keyboards/gorthage_truck/config.h
index c3777f7318..2e1c9ea0a6 100644
--- a/keyboards/gorthage_truck/config.h
+++ b/keyboards/gorthage_truck/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, C7, B3, B7, D7}
 #define MATRIX_COL_PINS { F0, F1, F4, F7, D6, E6, B0, B1, B2}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gowla/config.h b/keyboards/gowla/config.h
index 8f178c6aba..c0eef6ba5b 100644
--- a/keyboards/gowla/config.h
+++ b/keyboards/gowla/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Pin-out */
 #define MATRIX_ROW_PINS { D1, D0, D4 }
 #define MATRIX_COL_PINS { B5, B4, E6 }
-#define UNUSED_PINS
 
 /* ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h
index 20612363ec..178cc3dc13 100644
--- a/keyboards/gray_studio/cod67/config.h
+++ b/keyboards/gray_studio/cod67/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS { D7, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index 0a67e39bcf..d8b67b3c50 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 }
 #define MATRIX_COL_PINS { B0, B3, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h
index 7afe784e06..9800c38402 100644
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h
index d01487a5f7..7d6e4605ad 100644
--- a/keyboards/h0oni/deskpad/config.h
+++ b/keyboards/h0oni/deskpad/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D7, C6 }
 #define MATRIX_COL_PINS { D0, D4, D1}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index 5ee44e4e23..67cb2fdced 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2, D3}
-#define UNUSED_PINS
 
 // #define LED_CAPS_LOCK_PIN B2
 // #define LED_PIN_ON_STATE 0
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index c992f7fe33..c7e03e483b 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Hadron Ver0 PCB default pin-out */
 #define MATRIX_ROW_PINS { D7, E6, B4, B5, B6 }
 #define MATRIX_COL_PINS { F6, F7, D6, C7, F5, F4, F1, F0, D2, D3, D5, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 // configure oled driver for the 128x32 oled
 #define OLED_UPDATE_INTERVAL 33 // ~30fps
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index c61cc9a1e0..76353b6ee4 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -41,7 +41,6 @@
 
 #define MATRIX_ROW_PINS { C15, C14, A10, A9, A8 }
 #define MATRIX_COL_PINS { B8,  B2,  B10, A0, A1, A2, B0, A3, B1, A6, A7, B12, C13, B11, B9 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B13 }
 #define ENCODERS_PAD_B { B14 }
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index 0ef616b967..23b40935ee 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 }
 #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
-#define UNUSED_PINS
 
 //#define NUMBER_OF_ENCODERS 1
 #define ENCODERS_PAD_A { D4 }
diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h
index 70267edb81..1c65f6ba90 100644
--- a/keyboards/han60/config.h
+++ b/keyboards/han60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, D3, D2, D1, D0}
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h
index 2ff8a9a115..703cd93e64 100644
--- a/keyboards/handwired/108key_trackpoint/config.h
+++ b/keyboards/handwired/108key_trackpoint/config.h
@@ -43,7 +43,6 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, F0, D3, D4, F1, D6, D7, E0, E1, E2, E3, E4, E5, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index f53879f19a..00c4ac1ab4 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, B2 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h
index 8a8fe8ea30..eaae958e4d 100644
--- a/keyboards/handwired/3dp660/config.h
+++ b/keyboards/handwired/3dp660/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D7, B4, B5, B6, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h
index de6d79e0a9..b32afc2033 100644
--- a/keyboards/handwired/412_64/config.h
+++ b/keyboards/handwired/412_64/config.h
@@ -20,7 +20,6 @@
 */
 #define MATRIX_ROW_PINS { D3, F4, F5, F6, F7, B1, B3, B2 }
 #define MATRIX_COL_PINS { B0, D2, D0, D1, D4, C6, D7, E6 }
-#define UNUSED_PINS { B4, B5, B6, B7, C7, F0, F1 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h
index 34c9a0500c..5ec89cce84 100644
--- a/keyboards/handwired/42/config.h
+++ b/keyboards/handwired/42/config.h
@@ -18,7 +18,6 @@
 */
 #define MATRIX_COL_PINS { F5, F6, F7, F0, F1, F4, B6, B5, D7, C7, D6, B7 }
 #define MATRIX_ROW_PINS { D2, D3, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h
index efa24db048..b7d983d75f 100644
--- a/keyboards/handwired/6key/config.h
+++ b/keyboards/handwired/6key/config.h
@@ -25,7 +25,6 @@
 /* pin-out */
 #define MATRIX_ROW_PINS { B4, D0 }
 #define MATRIX_COL_PINS { D3, D2, D1 }
-#define UNUSED_PINS
 
 /* dip switch */
 #define DIP_SWITCH_PINS { C6 }
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index 7fe3be6556..1e8c296855 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pinout - DON'T CHANGE */
 #define MATRIX_ROW_PINS { B3, B4 }
 #define MATRIX_COL_PINS { B0, B1, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
index 8bb20b7fdf..784eeb1298 100644
--- a/keyboards/handwired/aek64/config.h
+++ b/keyboards/handwired/aek64/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Originally made for a Teensy 2++
 #define MATRIX_COL_PINS { F0, E6, E7, B0, B1, B2, B3, B4, B5, B6, D3, D0, D1, D2 }
 #define MATRIX_ROW_PINS { E0, E1, C0, C1, C2 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h
index b6e79d05f2..c6f1a99537 100644
--- a/keyboards/handwired/amigopunk/config.h
+++ b/keyboards/handwired/amigopunk/config.h
@@ -25,7 +25,6 @@
 /* Key matrix pins */
 #define MATRIX_ROW_PINS { C0, C1, C2, C3, C4, C5 }
 #define MATRIX_COL_PINS { B6, B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h
index ffa5110fe5..ce1bf11ed6 100644
--- a/keyboards/handwired/angel/config.h
+++ b/keyboards/handwired/angel/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B2, B5, B4 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B3, B1, F7, F6, F5 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 // https://docs.qmk.fm/using-qmk/software-features/tap_hold
diff --git a/keyboards/handwired/aplx2/config.h b/keyboards/handwired/aplx2/config.h
index d1ec168038..cbe0ef91ba 100644
--- a/keyboards/handwired/aplx2/config.h
+++ b/keyboards/handwired/aplx2/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pin-out */
 #define MATRIX_ROW_PINS { D1 }
 #define MATRIX_COL_PINS { B5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h
index 8517852270..1b9a0b2419 100644
--- a/keyboards/handwired/aranck/config.h
+++ b/keyboards/handwired/aranck/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS \
     { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h
index 436b37f8a0..9615075121 100644
--- a/keyboards/handwired/arrow_pad/config.h
+++ b/keyboards/handwired/arrow_pad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h b/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h
index 550bfd183f..1f07965555 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h b/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h
index 51d3b9080b..4bc89f5ce7 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index c7365fe20c..f433427ab0 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { D4, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/axon/config.h b/keyboards/handwired/axon/config.h
index e4ace3ba4e..50be74b882 100644
--- a/keyboards/handwired/axon/config.h
+++ b/keyboards/handwired/axon/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D5, D6, D4, D0 }
 #define MATRIX_COL_PINS { B0, D7, B1, B2, C0, C1, C2, C3, C4, C5, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
index 6292817538..d35e3644ba 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -9,13 +9,6 @@
         "term": 175
     },
     "matrix_pins": {
-        "unused": [
-            "F1",
-            "F4",
-            "F5",
-            "F6",
-            "F7"
-        ],
         "cols": [
             "B6",
             "B7",
@@ -703,4 +696,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
index 92ad57d178..25389c0245 100644
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ b/keyboards/handwired/battleship_gamepad/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* joystick configuration */
 #define JOYSTICK_BUTTON_COUNT 25
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index 33fbf59ac1..b6cbea8f39 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, B5, D3, D2, D1, B4 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, E6, D7, C6, D0, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
index 2c79452943..c51031b2b5 100644
--- a/keyboards/handwired/bstk100/config.h
+++ b/keyboards/handwired/bstk100/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/cans12er/config.h b/keyboards/handwired/cans12er/config.h
index 117474691a..240a2a5da9 100644
--- a/keyboards/handwired/cans12er/config.h
+++ b/keyboards/handwired/cans12er/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F7, B1, B3 }
 #define MATRIX_COL_PINS { D0, D4, C6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
index 7b72988431..52bb89519b 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Pro Micro Pins         A3, A2, A1, A0, 15, 14, 16
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
 
-#define UNUSED_PINS
 
 // Pro Micro Pins      RX1
 #define SPLIT_HAND_PIN D2
diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h
index 4927762d8e..433aabc5b7 100644
--- a/keyboards/handwired/cmd60/config.h
+++ b/keyboards/handwired/cmd60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, C6, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h
index a41bde6fa2..5234c5b920 100644
--- a/keyboards/handwired/co60/rev1/config.h
+++ b/keyboards/handwired/co60/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B2, B5, B4, D7, D6, B3, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index 16fa7cb4c5..934a6a2d25 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { A8, A2, B13, B2, B10 }
 #define MATRIX_COL_PINS { A10, A9, A3, A4, A5, A6, B0, B1, A15, B3, B4, B5, C13, C14, C15 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index 41d87f6c71..a941ea493d 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6, B0, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index 1b09c403f6..cb897ba109 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS { D3, D2 }
 
 /* LEDs are not used in the standard 64key configuration. */
 #define RGB_DI_PIN D3
diff --git a/keyboards/handwired/curiosity/config.h b/keyboards/handwired/curiosity/config.h
index 35bfef4794..4cd00d8b2d 100644
--- a/keyboards/handwired/curiosity/config.h
+++ b/keyboards/handwired/curiosity/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, F7, F6, F5 }
 #define MATRIX_COL_PINS { D3, D4, F4, C6, D7, E6, B5, B4, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 6b6ae5ce3f..47ae30a98f 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -10,7 +10,6 @@
 #define MATRIX_ROW_PINS { B8, B9, B1, B2, B4 }
 
 #define MATRIX_COL_PINS { A2, B0, A7, A8, A13, A14, B12, B11, B10, B15, B14, B13 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h
index cce0d050a7..c10096e590 100644
--- a/keyboards/handwired/dactyl_left/config.h
+++ b/keyboards/handwired/dactyl_left/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS \
     { D0, B7, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/daishi/config.h b/keyboards/handwired/daishi/config.h
index 09a5897f7a..e02c7c889c 100644
--- a/keyboards/handwired/daishi/config.h
+++ b/keyboards/handwired/daishi/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D6, D7, E0, E1, C0, C1, C2 }
 #define MATRIX_COL_PINS { E6, E7, E3, B0, B1, B2, A6, A5, A4, A3, A2, A1, A0, F7, F6, F5, F4, F3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h
index db03889cc1..b6d6f60dfc 100644
--- a/keyboards/handwired/dc/mc/001/config.h
+++ b/keyboards/handwired/dc/mc/001/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {                          \
         { B4, B0, B1, B2, B3 } \
     }
-#define UNUSED_PINS
 
 /*
     RE_CHANNEL_A          = _BV(6),
diff --git a/keyboards/handwired/dqz11n1g/config.h b/keyboards/handwired/dqz11n1g/config.h
index fbfdeb30ae..3bd8123426 100644
--- a/keyboards/handwired/dqz11n1g/config.h
+++ b/keyboards/handwired/dqz11n1g/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Column read via SPI (shift register) */
 /* #define MATRIX_COL_PINS { } */
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN F7 /* A0 */
 #define LED_NUM_LOCK_PIN F5 /*A2 */
diff --git a/keyboards/handwired/eagleii/config.h b/keyboards/handwired/eagleii/config.h
index c17635caf1..2007137d84 100644
--- a/keyboards/handwired/eagleii/config.h
+++ b/keyboards/handwired/eagleii/config.h
@@ -6,6 +6,5 @@
 #define MATRIX_COLS 12
 #define MATRIX_ROW_PINS { D0, B5, F1, B2, F7, F6, D4, D7, B4, B7, F5, B0 }
 #define MATRIX_COL_PINS { D2, C6, E6, D5, B3, D3, D1, C7, F0, B6, B1, F4 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h
index a280c49f3b..9a2192ec44 100644
--- a/keyboards/handwired/evk/v1_3/config.h
+++ b/keyboards/handwired/evk/v1_3/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B0, B1, B2, B3, B7, D0 }
 #define MATRIX_COL_PINS \
     { D1, D2, D3, C6, C7, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL // the positive current flows into the rows and then out of the columns negative.
diff --git a/keyboards/handwired/fc200rt_qmk/config.h b/keyboards/handwired/fc200rt_qmk/config.h
index d0b9fc2cab..1ac044e8b2 100644
--- a/keyboards/handwired/fc200rt_qmk/config.h
+++ b/keyboards/handwired/fc200rt_qmk/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, E6, B7, D0, D1 }
 #define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h
index 8f392c35d0..9b5af88e57 100644
--- a/keyboards/handwired/fivethirteen/config.h
+++ b/keyboards/handwired/fivethirteen/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F6, F7, B6, B5, B4 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, F0, D0, D1, D2, D3, C6, C7, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h
index 84b748d520..2f071df7bd 100644
--- a/keyboards/handwired/floorboard/config.h
+++ b/keyboards/handwired/floorboard/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A2, A1, A0, B8 }
 #define MATRIX_COL_PINS { B7, B6, B5, B4, B3, B2, B1, B9, B0, B15, B14, B13 }
-#define UNUSED_PINS { B10, B11, B12, A14, A13, A4, A5, A6, A7, A8, A15, A10, A9 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index 823be87688..883807239b 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2 }
 #define MATRIX_COL_PINS { B3, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/fruity60/config.h b/keyboards/handwired/fruity60/config.h
index a3a1e2beb8..b21e752d85 100644
--- a/keyboards/handwired/fruity60/config.h
+++ b/keyboards/handwired/fruity60/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B6, B5, D7, C6, D0, D1 }
 #define MATRIX_COL_PINS \
     { F7, F6, F5, F4, F1, F0, D2, D3, B7, D6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h
index 480f6f73aa..eb9efef846 100644
--- a/keyboards/handwired/gamenum/config.h
+++ b/keyboards/handwired/gamenum/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h
index ee781012b1..690e96365c 100644
--- a/keyboards/handwired/hacked_motospeed/config.h
+++ b/keyboards/handwired/hacked_motospeed/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //                        ER  DR  CR  BR  AR  FR  FL  AL  BL  CL  DL  EL
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F3, F2, E0, E1, C0, C1, C2, C3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 7aa147b4e4..84224a4514 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS \
     { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h
index cd818ca2bc..b6529b3ddf 100644
--- a/keyboards/handwired/hexon38/config.h
+++ b/keyboards/handwired/hexon38/config.h
@@ -11,7 +11,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, F0, B2, F4 }
 #define MATRIX_COL_PINS { C6, D3, D2, D1, D0, B7, F6, F7, B6, B5, B4, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index d430e008dd..825edd40ca 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, C7, B4, B5, B6, C6 }
 #define MATRIX_COL_PINS { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h
index 8080cf1138..6d4e8f7d33 100644
--- a/keyboards/handwired/hnah40/config.h
+++ b/keyboards/handwired/hnah40/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B4, B5, B3, D4 }
 #define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/handwired/ibm122m/config.h
index 9c9b7a09a9..e9f99eaba3 100644
--- a/keyboards/handwired/ibm122m/config.h
+++ b/keyboards/handwired/ibm122m/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_COL_PINS { E6, B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C7, F1 }
 #define MATRIX_ROW_PINS { F0, B5, B4, B3, B2, B1, B0, E7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/jn68m/config.h b/keyboards/handwired/jn68m/config.h
index 2a0f34cab1..cabfebbfcd 100644
--- a/keyboards/handwired/jn68m/config.h
+++ b/keyboards/handwired/jn68m/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, D5, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index 484415752b..5625f99521 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D6, D2, D4, D3, D5, D7, C6, B6, F5 }
 #define MATRIX_COL_PINS { B3, B2, B1, B0, F7, E6, F6, B5, C7, B4, D1 }
-#define UNUSED_PINS { B7 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h
index 5d3c6773e1..d3ce848df6 100644
--- a/keyboards/handwired/jot50/config.h
+++ b/keyboards/handwired/jot50/config.h
@@ -9,7 +9,6 @@
 /* pro_micro pin-out */
 #define MATRIX_ROW_PINS { D7, E6, B4, B6, B2 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 }
-#define UNUSED_PINS
 
 /* leds */
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/handwired/jotanck/config.h b/keyboards/handwired/jotanck/config.h
index f1ae28b9dc..9468505c44 100644
--- a/keyboards/handwired/jotanck/config.h
+++ b/keyboards/handwired/jotanck/config.h
@@ -9,7 +9,6 @@
 /* pro_micro pin-out */
 #define MATRIX_ROW_PINS { D7, E6, B6, B2 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 }
-#define UNUSED_PINS
 
 /* leds */
 #define JOTANCK_LEDS
diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h
index 0afe9be035..b0e3ebcf8c 100644
--- a/keyboards/handwired/jotpad16/config.h
+++ b/keyboards/handwired/jotpad16/config.h
@@ -9,7 +9,6 @@
 /* pro_micro pin-out */
 #define MATRIX_ROW_PINS { B6, B2, D2, D3 }
 #define MATRIX_COL_PINS { E6, D7, B3, B1 }
-#define UNUSED_PINS
 
 /* leds */
 #define JOTPAD16_LEDS
diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h
index acca0a265a..e3c08722e2 100644
--- a/keyboards/handwired/jtallbean/split_65/config.h
+++ b/keyboards/handwired/jtallbean/split_65/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { C6, B5, B4, D7, D6, D4, D2, D3, B7 } // B7 is not actually used, but it is needed since # of entries must equal 9
 #define MATRIX_ROW_PINS_RIGHT { E6, F0, F1, F7, D7 }
 #define MATRIX_COL_PINS_RIGHT { B4, B5, B6, C6, C7, D4, D6, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h
index fd412cb723..ebe38b9d31 100644
--- a/keyboards/handwired/k_numpad17/config.h
+++ b/keyboards/handwired/k_numpad17/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D1, D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { B2, B1, F6 , F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index 0200f5e180..44046dcfa1 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 }
 #define MATRIX_COL_PINS { D0, D1, F0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/lagrange/config.h b/keyboards/handwired/lagrange/config.h
index 0b9638178d..14a5767272 100644
--- a/keyboards/handwired/lagrange/config.h
+++ b/keyboards/handwired/lagrange/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_COL_PINS { B4, B5, D7, B6, C6, D6 }
 #define MATRIX_ROW_PINS_RIGHT { B5, B4, D7, B6, C6, D6, D4 }
 #define MATRIX_COL_PINS_RIGHT { C7, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/leftynumpad/config.h b/keyboards/handwired/leftynumpad/config.h
index 33dc93fc0e..e05ceae098 100644
--- a/keyboards/handwired/leftynumpad/config.h
+++ b/keyboards/handwired/leftynumpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
 #define MATRIX_COL_PINS { E6, B4, B5, B6, B2 }
-#define UNUSED_PINS {D3, D2, B0, D5, B3, B1, F7, F6, F5, F4 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/lemonpad/config.h b/keyboards/handwired/lemonpad/config.h
index 32ccfda88a..7db499aba4 100644
--- a/keyboards/handwired/lemonpad/config.h
+++ b/keyboards/handwired/lemonpad/config.h
@@ -37,7 +37,6 @@
     { E6, D7, C6 }, 	\
     { B4, B5, D4 }  	\
 }
-#define UNUSED_PINS
 
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index 7453fb0202..42974d48a5 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -13,7 +13,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define UNUSED_PINS
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
diff --git a/keyboards/handwired/m40/5x5_macropad/config.h b/keyboards/handwired/m40/5x5_macropad/config.h
index 935bc3992c..fb9938c9d6 100644
--- a/keyboards/handwired/m40/5x5_macropad/config.h
+++ b/keyboards/handwired/m40/5x5_macropad/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 91f2b6a6a7..0d2aba2a38 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/macroboard/f411/config.h b/keyboards/handwired/macroboard/f411/config.h
index d0d88f0c9e..31cb5fa11b 100644
--- a/keyboards/handwired/macroboard/f411/config.h
+++ b/keyboards/handwired/macroboard/f411/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { A15, B3, B4, B5, B7 }
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10 }
-#define UNUSED_PINS
 
 #define AUDIO_INIT_DELAY
 #define AUDIO_PIN B10
diff --git a/keyboards/handwired/magicforce61/config.h b/keyboards/handwired/magicforce61/config.h
index 7cf32ea0ed..ab24503ea0 100644
--- a/keyboards/handwired/magicforce61/config.h
+++ b/keyboards/handwired/magicforce61/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h
index d53c51a01a..7eab860061 100644
--- a/keyboards/handwired/magicforce68/config.h
+++ b/keyboards/handwired/magicforce68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { B2, B0, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h
index 923428df56..659bed03e2 100644
--- a/keyboards/handwired/mechboards_micropad/config.h
+++ b/keyboards/handwired/mechboards_micropad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6 }
 #define MATRIX_COL_PINS { B2, B3, B1, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/config.h b/keyboards/handwired/meck_tkl/blackpill_f401/config.h
index cca2eac3a9..eff5d5d81f 100644
--- a/keyboards/handwired/meck_tkl/blackpill_f401/config.h
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/config.h
@@ -7,8 +7,6 @@
     { B15, A8, A9, B14, A15, B3 }
 #define MATRIX_COL_PINS \
     { B4, B5, B6, B7, B8, B9, A1, A2, A3, A4, A5, A6, A7, B0, B1, A0, B10 }
-#define UNUSED_PINS \
-    { A10, A11, A12, B2, B12, C14, C15 }
 
 #define LED_CAPS_LOCK_PIN C13
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h
index 0707e7a8ec..4c27d9da4d 100644
--- a/keyboards/handwired/minorca/config.h
+++ b/keyboards/handwired/minorca/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* MinOrca PCB default pin-out */
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 }
 #define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h
index bf030bce4b..bc763fc29d 100644
--- a/keyboards/handwired/mutepad/config.h
+++ b/keyboards/handwired/mutepad/config.h
@@ -23,7 +23,6 @@
     { F6 }
 #define MATRIX_COL_PINS \
     { B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* encoder support */
 #define ENCODERS_PAD_A \
diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h
index 702bdaacf7..4cb41fc431 100644
--- a/keyboards/handwired/nicekey/config.h
+++ b/keyboards/handwired/nicekey/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_COL_PINS { C6 }
 #define MATRIX_ROW_PINS { B6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/novem/config.h b/keyboards/handwired/novem/config.h
index a442f493e2..81fe2d877f 100644
--- a/keyboards/handwired/novem/config.h
+++ b/keyboards/handwired/novem/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B4, B5 }
 #define MATRIX_COL_PINS { B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h
index 289e5afcfe..fe69a0833a 100644
--- a/keyboards/handwired/nozbe_macro/config.h
+++ b/keyboards/handwired/nozbe_macro/config.h
@@ -28,7 +28,6 @@
     { B0 }
 #define MATRIX_COL_PINS \
     { D1, D0, D4, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h
index 4690cce003..0651b524f8 100644
--- a/keyboards/handwired/numpad20/config.h
+++ b/keyboards/handwired/numpad20/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F6, B1, B3, B6, B5 }
 #define MATRIX_COL_PINS { D1, D0, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h
index 6d2ca75e9b..0ba0cb3897 100644
--- a/keyboards/handwired/oem_ansi_fullsize/config.h
+++ b/keyboards/handwired/oem_ansi_fullsize/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { C3, C2, C1, C0, E1, E0, D7, E6, D5, D4, D3, D2, D1, D0, B7, B0, B1, B2, B3, B4, B5, F6 }
 //    C0  C1  C2  C3  C4  C5  C6  C7  C8  C9  CA  CB  CC  CD  CE  CF  CG  CH  CI  CJ  CK  CL
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h
index 3825d3f7ec..6489226c24 100644
--- a/keyboards/handwired/onekey/blackpill_f401/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD5
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h
index 3797217153..630f567c26 100644
--- a/keyboards/handwired/onekey/blackpill_f411/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD5
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
index 44ec0bfc6e..cd33f05ab0 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD5
diff --git a/keyboards/handwired/onekey/bluepill/config.h b/keyboards/handwired/onekey/bluepill/config.h
index 3eb7699a8b..f84cbb8dce 100644
--- a/keyboards/handwired/onekey/bluepill/config.h
+++ b/keyboards/handwired/onekey/bluepill/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD2
diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h
index a3f63983fe..0612a6351a 100644
--- a/keyboards/handwired/onekey/elite_c/config.h
+++ b/keyboards/handwired/onekey/elite_c/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
index 91ae8b8996..e68272d8d6 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/config.h
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
@@ -8,4 +8,3 @@
 
 #define MATRIX_COL_PINS { B12 }
 #define MATRIX_ROW_PINS { B13 }
-#define UNUSED_PINS
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h
index 9014d08f52..069de03687 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/config.h
+++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h
@@ -8,4 +8,3 @@
 
 #define MATRIX_COL_PINS { B12 }
 #define MATRIX_ROW_PINS { B13 }
-#define UNUSED_PINS
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h
index 7aa74f6682..9c20898d34 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/config.h
+++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h
@@ -8,7 +8,6 @@
 
 #define MATRIX_COL_PINS { A2 }
 #define MATRIX_ROW_PINS { A1 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN         B8
 #define BACKLIGHT_PWM_DRIVER  PWMD4
diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h
index b9ab046eae..67f0c9a7c5 100644
--- a/keyboards/handwired/onekey/promicro/config.h
+++ b/keyboards/handwired/onekey/promicro/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 
diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h
index 5600ae33ae..986cee5560 100644
--- a/keyboards/handwired/onekey/proton_c/config.h
+++ b/keyboards/handwired/onekey/proton_c/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { A2 }
 #define MATRIX_ROW_PINS { A1 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN         B8
 #define BACKLIGHT_PWM_DRIVER  PWMD4
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/config.h b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
index 1825b936d8..6f97baf57f 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/config.h
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
@@ -22,7 +22,6 @@
     { B0 }
 #define MATRIX_ROW_PINS \
     { A7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN A1           /* Green LED. */
 #define BACKLIGHT_PWM_DRIVER PWMD5 /* GD32 numbering scheme starts from 0, TIMER4 on GD32 boards is TIMER5 on STM32 boards. */
diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h
index e0f6d00050..3995df6c35 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/config.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { B4 }
 #define MATRIX_ROW_PINS { B5 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN         C8
 #define BACKLIGHT_PWM_DRIVER  PWMD3
diff --git a/keyboards/handwired/onekey/stm32f405_feather/config.h b/keyboards/handwired/onekey/stm32f405_feather/config.h
index 32d7807975..07cbe70a30 100644
--- a/keyboards/handwired/onekey/stm32f405_feather/config.h
+++ b/keyboards/handwired/onekey/stm32f405_feather/config.h
@@ -22,4 +22,3 @@
 
 #define MATRIX_COL_PINS { C2 }
 #define MATRIX_ROW_PINS { C3 }
-#define UNUSED_PINS
diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h
index 437c597f29..e52d1bed6d 100644
--- a/keyboards/handwired/onekey/teensy_2/config.h
+++ b/keyboards/handwired/onekey/teensy_2/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 
diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h
index 691dddfd1a..0c8bde7764 100644
--- a/keyboards/handwired/onekey/teensy_2pp/config.h
+++ b/keyboards/handwired/onekey/teensy_2pp/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_COL_PINS { F4 }
 #define MATRIX_ROW_PINS { F5 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 
diff --git a/keyboards/handwired/onekey/teensy_32/config.h b/keyboards/handwired/onekey/teensy_32/config.h
index e388b01af8..63845ed673 100644
--- a/keyboards/handwired/onekey/teensy_32/config.h
+++ b/keyboards/handwired/onekey/teensy_32/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_COL_PINS { D5 }
 #define MATRIX_ROW_PINS { B2 }
-#define UNUSED_PINS
 
 // i2c_master defines
 #define I2C1_SCL_PIN B0 // A2 on pinout = B0
diff --git a/keyboards/handwired/onekey/teensy_35/config.h b/keyboards/handwired/onekey/teensy_35/config.h
index a5f2c945c4..18eebcaffd 100644
--- a/keyboards/handwired/onekey/teensy_35/config.h
+++ b/keyboards/handwired/onekey/teensy_35/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_COL_PINS { D5 } // 20/A6
 #define MATRIX_ROW_PINS { B2 } // 19/A5
-#define UNUSED_PINS
 
 // i2c_master defines
 #define I2C1_SCL_PIN B0 // 16/A2 on pinout
diff --git a/keyboards/handwired/onekey/teensy_lc/config.h b/keyboards/handwired/onekey/teensy_lc/config.h
index 4e594e7d7e..d30d58ea1e 100644
--- a/keyboards/handwired/onekey/teensy_lc/config.h
+++ b/keyboards/handwired/onekey/teensy_lc/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_COL_PINS { D5 }
 #define MATRIX_ROW_PINS { B2 }
-#define UNUSED_PINS
 
 // i2c_master defines
 #define I2C1_SCL_PIN B0 // A2 on pinout = B0
diff --git a/keyboards/handwired/ortho5x13/config.h b/keyboards/handwired/ortho5x13/config.h
index c16cf77cd4..f88d2b7002 100644
--- a/keyboards/handwired/ortho5x13/config.h
+++ b/keyboards/handwired/ortho5x13/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h
index 0be408cbf4..e74a645870 100644
--- a/keyboards/handwired/ortho5x14/config.h
+++ b/keyboards/handwired/ortho5x14/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1  }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/ortho_brass/config.h b/keyboards/handwired/ortho_brass/config.h
index 694b93c4ee..8b546c04c0 100644
--- a/keyboards/handwired/ortho_brass/config.h
+++ b/keyboards/handwired/ortho_brass/config.h
@@ -27,8 +27,6 @@
     { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS \
     { F4, F7, F5, F1, C7, F0, B1, B0, F6, B6, B2, B3 }
-#define UNUSED_PINS \
-    { B0, B1, B2, F0, F1, F4, D4, D5, E6 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index 44e2a1b5da..abb5efc284 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C7, C6, B6, B5, D5 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B0, B1, B2, B3, B7, D0, D1, D2, D3, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pilcrow/config.h b/keyboards/handwired/pilcrow/config.h
index 3667d46296..c846dd387a 100644
--- a/keyboards/handwired/pilcrow/config.h
+++ b/keyboards/handwired/pilcrow/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B4, F7, B1, B3 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, F5, F6, B6, B2, F4, B5}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pill60/blackpill_f401/config.h b/keyboards/handwired/pill60/blackpill_f401/config.h
index d56ba94ea4..7de8654319 100644
--- a/keyboards/handwired/pill60/blackpill_f401/config.h
+++ b/keyboards/handwired/pill60/blackpill_f401/config.h
@@ -20,5 +20,3 @@
     { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
 #define MATRIX_ROW_PINS \
     { B4, B3, A15, B13, B5 }
-#define UNUSED_PINS \
-    { A9, A11, A12, C13, C14, C15, B10 }
diff --git a/keyboards/handwired/pill60/blackpill_f411/config.h b/keyboards/handwired/pill60/blackpill_f411/config.h
index b106c2d290..7de8654319 100644
--- a/keyboards/handwired/pill60/blackpill_f411/config.h
+++ b/keyboards/handwired/pill60/blackpill_f411/config.h
@@ -20,6 +20,3 @@
     { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
 #define MATRIX_ROW_PINS \
     { B4, B3, A15, B13, B5 }
-#define UNUSED_PINS \
-    { A9, A11, A12, C13, C14, C15, B10 }
-
diff --git a/keyboards/handwired/pill60/bluepill/config.h b/keyboards/handwired/pill60/bluepill/config.h
index f68f518b97..1ba5ff2069 100644
--- a/keyboards/handwired/pill60/bluepill/config.h
+++ b/keyboards/handwired/pill60/bluepill/config.h
@@ -20,5 +20,3 @@
     { A8, B11, B10, B15, A10, A1, A2, A3, A4, A5, A6, A7, B0, B1 }
 #define MATRIX_ROW_PINS \
     { B4, B3, A15, B13, B5 }
-#define UNUSED_PINS \
-    { A0, A9, A11, A12, C13, C14, C15 }
diff --git a/keyboards/handwired/postageboard/mini/config.h b/keyboards/handwired/postageboard/mini/config.h
index d4f654a7a4..13247e9b4d 100644
--- a/keyboards/handwired/postageboard/mini/config.h
+++ b/keyboards/handwired/postageboard/mini/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5 }
 #define MATRIX_COL_PINS { E6, B3, B7 }
-#define UNUSED_PINS { D0, D1, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, B2, B1, B0, F7, F6, F5, F4, F1, F0 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/postageboard/r1/config.h b/keyboards/handwired/postageboard/r1/config.h
index 078e66dd75..d5058a2d12 100644
--- a/keyboards/handwired/postageboard/r1/config.h
+++ b/keyboards/handwired/postageboard/r1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6 }
 #define MATRIX_COL_PINS { B7, C6, C7 }
-#define UNUSED_PINS { D4, D6, D7, B4, B5, D5, D3, D2, D1, D0, B2, B3, F0, F1, F4, F5, F6, F7, E6, B0, B1 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/prime_exl/config.h b/keyboards/handwired/prime_exl/config.h
index bb68ab28a1..88919b934e 100644
--- a/keyboards/handwired/prime_exl/config.h
+++ b/keyboards/handwired/prime_exl/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { B1, E6, D5, D6, B4, D7, D4, F1, F0, B0 }
 #define MATRIX_COL_PINS { D0, B3, B2, D1, D2, D3, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h
index 6b02ea50f4..46b235f9ee 100644
--- a/keyboards/handwired/prime_exl_plus/config.h
+++ b/keyboards/handwired/prime_exl_plus/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D2, D6, B4, F1, E6, F0, F4, B5, D7, D3 }
 #define MATRIX_COL_PINS { F5, F6, F7, C7, C6, B6, B7, B3, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h
index 875b3d7401..cdd71da3db 100644
--- a/keyboards/handwired/prkl30/feather/config.h
+++ b/keyboards/handwired/prkl30/feather/config.h
@@ -35,7 +35,6 @@
 #define ENCODERS_PAD_A { F7 }
 #define ENCODERS_PAD_B { F6 }
 #define ENCODER_RESOLUTION 4
-#define UNUSED_PINS
 
 /* RGB Light Configuration */
 
diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h
index d9ccb00314..929ebe7682 100644
--- a/keyboards/handwired/prkl30/promicro/config.h
+++ b/keyboards/handwired/prkl30/promicro/config.h
@@ -35,7 +35,6 @@
 #define ENCODERS_PAD_A { D3 }
 #define ENCODERS_PAD_B { D2 }
 #define ENCODER_RESOLUTION 4
-#define UNUSED_PINS
 
 /* RGB Light Configuration */
 
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index 73fffcc45f..a447a70abd 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F5, F6, F7, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 #define TRACKPOINT_PINS \
     { B7, B6, D7 }
-#define UNUSED_PINS
 
 /*
  * Keyboard Matrix Assignments
diff --git a/keyboards/handwired/pteron/config.h b/keyboards/handwired/pteron/config.h
index 81141a3ebf..5d26b9f430 100644
--- a/keyboards/handwired/pteron/config.h
+++ b/keyboards/handwired/pteron/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D7, E6, B4, B5, B6 }
 #define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/pteron38/config.h b/keyboards/handwired/pteron38/config.h
index 95eaa86e3b..a877d8dfa3 100644
--- a/keyboards/handwired/pteron38/config.h
+++ b/keyboards/handwired/pteron38/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, B4, B5, B6 }
 #define MATRIX_COL_PINS { F6, F5, F7, B1, B3, C6, D4, D0, D1, D2 }
-#define UNUSED_PINS     { D7, F4, D3 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pteron44/config.h b/keyboards/handwired/pteron44/config.h
index d28e6c3b36..517d498eaa 100644
--- a/keyboards/handwired/pteron44/config.h
+++ b/keyboards/handwired/pteron44/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, B4, B5, B6 }
 #define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 }
-#define UNUSED_PINS { D7 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h
index 22eea072d4..89e6fc9595 100644
--- a/keyboards/handwired/retro_refit/config.h
+++ b/keyboards/handwired/retro_refit/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // See note in retro_refit.h for an explanation of how this matrix is wired up
 #define MATRIX_ROW_PINS { D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D3, C7, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h
index 3437f3c7b9..ed0ff636f1 100644
--- a/keyboards/handwired/riblee_f401/config.h
+++ b/keyboards/handwired/riblee_f401/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 }
 #define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B6, B7, B8, B9 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h
index 35d51754d2..6cf4b6370a 100644
--- a/keyboards/handwired/riblee_f411/config.h
+++ b/keyboards/handwired/riblee_f411/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 }
 #define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B14, A0, B8, B9 }
-#define UNUSED_PINS { A1, A7, B2, B11, B12, B13 }
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/rs60/config.h b/keyboards/handwired/rs60/config.h
index 60553af596..506b0bff0d 100644
--- a/keyboards/handwired/rs60/config.h
+++ b/keyboards/handwired/rs60/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, B6, B4, B2, E6 }
 #define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3,  F4, F5, F6, F7, B1, B3}
-#define UNUSED_PINS { }
 
 #define QMK_ESC_OUTPUT C6
 #define QMK_ESC_INPUT  B4
diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h
index be61d7da23..25603183a7 100644
--- a/keyboards/handwired/selene/config.h
+++ b/keyboards/handwired/selene/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { B10, B9, B15, B14, B13, B8}
 #define MATRIX_COL_PINS { A9, A10, B11, B7, B6, B5, B4, B3, B2, B1, B0, C14, A4, A5, A6, A7, A8, A15, A13, A14, B12 }
-#define UNUSED_PINS
 #define RGB_DI_PIN A3
 #define RGBLED_NUM 50
 
diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h
index 846f50a87a..79ce50ba8b 100644
--- a/keyboards/handwired/sick68/config.h
+++ b/keyboards/handwired/sick68/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D3, D2, D1, D0, D4 }
 #define MATRIX_COL_PINS \
     { C6, D7, E6, B4, B5, B0, D5, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/sick_pad/config.h b/keyboards/handwired/sick_pad/config.h
index bc563be4f1..7f8df32c06 100644
--- a/keyboards/handwired/sick_pad/config.h
+++ b/keyboards/handwired/sick_pad/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B9, B15, B14, B13 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/slash/config.h b/keyboards/handwired/slash/config.h
index 325b3b5cfd..f3c92e6dd2 100644
--- a/keyboards/handwired/slash/config.h
+++ b/keyboards/handwired/slash/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C7, D6, B7, B6, B5, D7, C6, D0 }
 #define MATRIX_COL_PINS { D2, F0, F1, F4, F5, F6, F7, D3 }
-#define UNUSED_PINS
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h
index dce9776dcd..188135b4d6 100644
--- a/keyboards/handwired/snatchpad/config.h
+++ b/keyboards/handwired/snatchpad/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { F4, F5, F6 }
 #define MATRIX_COL_PINS { B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h
index b4825cf1a2..0c8e86704e 100644
--- a/keyboards/handwired/space_oddity/config.h
+++ b/keyboards/handwired/space_oddity/config.h
@@ -15,7 +15,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
 #define MATRIX_COL_PINS { B2, B6, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index 18a6690c25..98e21b43f1 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { A6, A5, A4, A3 }
 #define MATRIX_COL_PINS { A9, A8, B15, B14, B13, A10, B9, B6, B5, B4, B3, A15 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/sticc14/config.h b/keyboards/handwired/sticc14/config.h
index 962c9e0356..19ae8d1dbf 100644
--- a/keyboards/handwired/sticc14/config.h
+++ b/keyboards/handwired/sticc14/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1 }
 #define MATRIX_COL_PINS { B6, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/symmetric70_proto/promicro/config.h b/keyboards/handwired/symmetric70_proto/promicro/config.h
index 570de7039d..aa0725cab6 100644
--- a/keyboards/handwired/symmetric70_proto/promicro/config.h
+++ b/keyboards/handwired/symmetric70_proto/promicro/config.h
@@ -48,7 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         +-----------------+
 ***************************************/
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/symmetric70_proto/proton_c/config.h b/keyboards/handwired/symmetric70_proto/proton_c/config.h
index 92716a21f6..c0df9b2067 100644
--- a/keyboards/handwired/symmetric70_proto/proton_c/config.h
+++ b/keyboards/handwired/symmetric70_proto/proton_c/config.h
@@ -56,7 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
          +-----------------+
 ***************************************/
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index 22cb401e8d..17ea91745b 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/t111/config.h b/keyboards/handwired/t111/config.h
index 6cd9616165..691bc7d121 100644
--- a/keyboards/handwired/t111/config.h
+++ b/keyboards/handwired/t111/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B15, B11, B10, B1, B0, A10, A9, A7, A6, A5, A4, A8, B13, B14 }
 /*                         0    1    2    3   4   5    6   7   8   9   A   B   C    D*/
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index 4659804169..e59f7efbe1 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C6, D4, D0}
 #define MATRIX_COL_PINS { D7, E6, B4, B5 }
-#define UNUSED_PINS { B1, B2, B3, B6, F4, F5, F6, F7, D1}
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h
index a2c843a79f..4dec0f1341 100644
--- a/keyboards/handwired/terminus_mini/config.h
+++ b/keyboards/handwired/terminus_mini/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B5, B4, D7, D6 }
 #define MATRIX_COL_PINS { B0, D0, D5, B6, D4, C7, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/trackpoint/config.h b/keyboards/handwired/trackpoint/config.h
index 97bb0b905f..a4b468faef 100644
--- a/keyboards/handwired/trackpoint/config.h
+++ b/keyboards/handwired/trackpoint/config.h
@@ -43,7 +43,6 @@
 
 #define MATRIX_COL_PINS { F1, F4, F5 }
 #define MATRIX_ROW_PINS { F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index 809acdcd94..bf7f2c7605 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B0, B1, B2, B3, B4, B5 }
 #define MATRIX_ROW_PINS \
     { B10, B11, B12, A14, A13, A15 }
-
-#define UNUSED_PINS \
-    { A0, A2, A7, A8 }
 // B2 used for BOOT1, has internal pull down?
 // A9 has internal pull-down
 // A11 and A12 are used for USB sense.  DO NOT USE.
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 0eb5b2a217..b31f450553 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS \
     { B12, B13, B14, B15, A8, A10 }
 
-#define UNUSED_PINS \
-    { C15 }
-
 #define DIODE_DIRECTION     COL2ROW
 
 // #define USB_VBUS_PIN        B10 // doesn't seem to work for me on one of my controllers... */
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index ef68263c06..82de3bc0ba 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D3, D2 }
 #define MATRIX_COL_PINS { B5, D6, B7, B6, F6, B1, B3, F7, B4, E6, D7, C6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index 73c0201e03..7fee66e04f 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F6, B1, B2 }
-#define UNUSED_PINS
 
 #define LED_NUM_LOCK_PIN D5
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h
index 0af5afa517..dd69394916 100644
--- a/keyboards/handwired/twadlee/tp69/config.h
+++ b/keyboards/handwired/twadlee/tp69/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B2, B1, B0, C0, D1, D0, D3, D4, D2, C3 }
 /*                        20  21  18    0    1   3   4   5 */
 #define MATRIX_COL_PINS { D5, D6, A4, B16, B17, A1, A2, D7 }
-#define UNUSED_PINS
 
 /* for trackpoint: C1 (22)  C2 (23) */
 
diff --git a/keyboards/handwired/unicomp_mini_m/config.h b/keyboards/handwired/unicomp_mini_m/config.h
index 78b42577d8..77e2d1c7ea 100644
--- a/keyboards/handwired/unicomp_mini_m/config.h
+++ b/keyboards/handwired/unicomp_mini_m/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1 }
 #define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, B7, D5, D4, D3, D2 }
-#define UNUSED_PINS
 
 #define LED_PIN_ON_STATE 0
 #define LED_NUM_LOCK_PIN B6
diff --git a/keyboards/handwired/uthol/rev1/config.h b/keyboards/handwired/uthol/rev1/config.h
index dbda8e90ed..30c1e17e3e 100644
--- a/keyboards/handwired/uthol/rev1/config.h
+++ b/keyboards/handwired/uthol/rev1/config.h
@@ -26,4 +26,3 @@
 /* Uthol PCB default pin-out */
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
 #define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 }
-#define UNUSED_PINS
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index 3ef6fc172c..2750282d30 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -26,7 +26,6 @@
 /* Uthol PCB default pin-out */
 #define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 }
-#define UNUSED_PINS
 
 //RGB Stuff
 #define RGB_DI_PIN E6
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index 84ca3f0cc6..ded5aead8e 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_ROW_PINS \
     { A4, A3, A2, A1, A0 }
 
-#define UNUSED_PINS
 
 // Encoder config
 #define ENCODERS_PAD_A \
diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h
index ad54ca3c13..8bb4835e3d 100644
--- a/keyboards/handwired/videowriter/config.h
+++ b/keyboards/handwired/videowriter/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D7, C6, D1, D0, D4, D2, D3, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/wabi/config.h b/keyboards/handwired/wabi/config.h
index 63068c6bc0..f78413445a 100644
--- a/keyboards/handwired/wabi/config.h
+++ b/keyboards/handwired/wabi/config.h
@@ -35,7 +35,6 @@ diode)
 
 #define MATRIX_ROW_PINS { D5, F5, F6, F7, B0 }
 #define MATRIX_COL_PINS { F4, F1, F0, E6, B3, B7, D0, D1, D2, D3, D4, D6, D7, B5 }
-#define UNUSED_PINS { B1, B2, C7, C6, B6, B4 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/woodpad/config.h b/keyboards/handwired/woodpad/config.h
index 163f7db6ae..16290df805 100644
--- a/keyboards/handwired/woodpad/config.h
+++ b/keyboards/handwired/woodpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
 #define MATRIX_COL_PINS { B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/xealousbrown/config.h b/keyboards/handwired/xealousbrown/config.h
index c9093342c4..37d424b01e 100644
--- a/keyboards/handwired/xealousbrown/config.h
+++ b/keyboards/handwired/xealousbrown/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS { }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/z150/config.h b/keyboards/handwired/z150/config.h
index 5f0a321db6..96bda8c8d8 100644
--- a/keyboards/handwired/z150/config.h
+++ b/keyboards/handwired/z150/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B13, B14, B15, A8, A9, A3, A10, A1, A2, A15, A0 }
 #define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4 }
-#define UNUSED_PINS
 
 #define NUM_LOCK_LED_PIN B5
 #define SCROLL_LOCK_LED_PIN B4
diff --git a/keyboards/handwired/zergo/config.h b/keyboards/handwired/zergo/config.h
index 9ede839248..8453b8efc9 100644
--- a/keyboards/handwired/zergo/config.h
+++ b/keyboards/handwired/zergo/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, D7, C3, D6, D5, D4 }
 #define MATRIX_COL_PINS { C7, C6, C5, C4, C2, C1, B7, D3, D2, B6, B5, B4, B3, B2 }
-#define UNUSED_PINS { A0, A1, A2, A3, A4, A5, A6, A7, B0, C0, E0, E1, E4, E5, F0, F1, F2, F3, F4, F5, F6, F7 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hardlineworks/otd_plus/config.h b/keyboards/hardlineworks/otd_plus/config.h
index 77b340c893..95c5ee6ec6 100644
--- a/keyboards/hardlineworks/otd_plus/config.h
+++ b/keyboards/hardlineworks/otd_plus/config.h
@@ -8,7 +8,6 @@
 
 #define MATRIX_ROW_PINS { D2, D4, D1, E6, F5, C6, B6, F6, F0, D0, D6, D3 }
 #define MATRIX_COL_PINS { B3, B2, B1, B7, B0, F1, D7, F7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 50d9aa3306..5050599075 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 589ffda25b..489eeded06 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hhkb_lite_2/config.h b/keyboards/hhkb_lite_2/config.h
index 4909bb5e8a..c264169d5b 100644
--- a/keyboards/hhkb_lite_2/config.h
+++ b/keyboards/hhkb_lite_2/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F5, F4, F1, F0, B0, B1, B2, B3 }
 #define MATRIX_COL_PINS { F6, F7, B6, B5, B4, D7, D6, D4, D5, C7, C6, D3, D2, D1}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h
index 45b72bd163..3475843da2 100644
--- a/keyboards/hifumi/config.h
+++ b/keyboards/hifumi/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6 }
 #define MATRIX_COL_PINS { F4, F5, F6 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index 4b10abc1e3..2499e4ba50 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, B6 }
 #define MATRIX_COL_PINS { F4, C7, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h
index 7c878f4f3d..2f8fb70069 100644
--- a/keyboards/hineybush/h10/config.h
+++ b/keyboards/hineybush/h10/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, C6, B6, B5, B4, D7 }
 #define MATRIX_COL_PINS { F0, C7, B1, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
index 3a2109067c..f2205d1121 100644
--- a/keyboards/hineybush/h60/config.h
+++ b/keyboards/hineybush/h60/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, E6 }
 #define MATRIX_COL_PINS { B3, D0, D1, D2, D3, D5, D6, C7, F0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index e205822ee3..f4f3900afe 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D7, D6, D4, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index e205822ee3..f4f3900afe 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D7, D6, D4, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index 64548b60e4..582c1b0958 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B1, E6, B3, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index ab5cae00d9..f1428d0b19 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, D0, D1, D2, D6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, B2, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index 8059e54cb9..1200dbd9fb 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, D0, D1, B5, B6, D7, B4, D6, D4 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h
index c86c41fcf6..79481fbb0a 100644
--- a/keyboards/hineybush/h88/config.h
+++ b/keyboards/hineybush/h88/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, D0, D1, B5, B6, D7, B4, D6, D4 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h
index b5ca670a7f..a92ddc1aa8 100644
--- a/keyboards/hineybush/hbcp/config.h
+++ b/keyboards/hineybush/hbcp/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 }
 #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 }
-#define UNUSED_PINS
 
 //EITHERWAY is supported through a custom matrix
 //#define DIODE_DIRECTION EITHERWAY
diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h
index b5bf45e31f..4014bc804f 100644
--- a/keyboards/hineybush/hineyg80/config.h
+++ b/keyboards/hineybush/hineyg80/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B2, B3, D0, B1, D2, D1, D5, D3, D6, D4, B4, D7 }
 #define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
index c423e0328b..6557696f89 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, C7, C6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B2, B1, B0, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS { B6 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index daec667868..62de4db381 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B1, B0, D4, D1 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h
index ed4d97c0bb..57abe3e37e 100644
--- a/keyboards/hnahkb/freyr/config.h
+++ b/keyboards/hnahkb/freyr/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, B2, B1, B0, E6, F0, D2, D5, F4, F1 }
 #define MATRIX_COL_PINS { B4, D7, D6, D4, B5, C7, C6, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index b213467ac7..043c9933da 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, B2, B1, B0, E6, F0, D2, D5, F4, F1 }
 #define MATRIX_COL_PINS { B4, D7, D6, D4, B5, C7, C6, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 52c03503ae..92fd3d456c 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B1, B2, B3, D2, F7 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C6, C7, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/horizon/config.h b/keyboards/horizon/config.h
index 5ab65f31dc..65af08d288 100644
--- a/keyboards/horizon/config.h
+++ b/keyboards/horizon/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D3, D2, D1, F4 }
 #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6, D4, D0 }
-#define UNUSED_PINS { }
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index 3e47dbef77..adc6f94f1f 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
 #define MATRIX_COL_PINS { F1, F4, F5, E6, F0, B7, D2, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS     { B6, C6, C7, F6 }
 
 /* bootloader configuration */
 
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index 2d255a2c18..1a42b95b41 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS { \
     { F7, F6, D1, D2 } \
 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
index df30e84aca..4e027625fd 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
@@ -50,7 +50,6 @@
 
 #define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, C4, B0, B10, B13, C6, C7, C8, C9 }
 #define MATRIX_ROW_PINS { A7, C5, B1, B12, B14, B15, A8, A9 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h
index 04f368dce6..8e8c46b694 100644
--- a/keyboards/ibnuda/alicia_cook/config.h
+++ b/keyboards/ibnuda/alicia_cook/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D3, F4, F5 }
 #define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index da86f8557e..ec281a7c56 100644
--- a/keyboards/ibnuda/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2}
 #define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h
index eaaaf45d7d..24960dcbd5 100644
--- a/keyboards/idb/idb_60/config.h
+++ b/keyboards/idb/idb_60/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C2, D0, D1, D2, D3, D4, D5, D6, B0, B1 }
 #define MATRIX_COL_PINS { B2, B3, B4, C6, B6, B7, C7, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 16cffdfbad..8671bbcd75 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index a36ba404a6..4029d80bf8 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/v2/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index 6ae4cee1b5..3d60f14f1e 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
 
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index 3b0d9afc16..444464019b 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -27,7 +27,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index c21dda65a7..6cd45b2598 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 }
 #define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h
index 9416fd592f..f589733388 100644
--- a/keyboards/illuminati/is0/config.h
+++ b/keyboards/illuminati/is0/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D2 }
 #define MATRIX_COL_PINS { D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h
index 16f5198907..1bfc08c8c8 100644
--- a/keyboards/illusion/rosa/config.h
+++ b/keyboards/illusion/rosa/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D1, D4, F0, B0, B1 }
 #define MATRIX_COL_PINS { D0, D2, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h
index 3abd1b219a..2751eaea6c 100644
--- a/keyboards/ilumkb/primus75/config.h
+++ b/keyboards/ilumkb/primus75/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index 26b7f603d4..0b952c25e5 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 475e0d63c9..324745efa8 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h
index a64bcf64ba..7936e968b7 100644
--- a/keyboards/ilumkb/volcano660/config.h
+++ b/keyboards/ilumkb/volcano660/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index 2602dc8286..af9c4ecbe2 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -25,7 +25,6 @@
 #define MATRIX_COLS 14
 #define MATRIX_ROW_PINS { F0, F1, F4, B7, D6}
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION ROW2COL
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index 921f2b85ec..8c2405e644 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -25,7 +25,6 @@
 #define MATRIX_COLS 14
 #define MATRIX_ROW_PINS { F0, F1, F4, B7, D6}
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION ROW2COL
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index 458b2d1042..00dd0bd1f3 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -49,7 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // For some reason, the rows are colums in the schematic, and vice versa
 #define MATRIX_ROW_PINS { B2, B3, B18, B19, C0, C9, C10, C11, D0 }
 #define MATRIX_COL_PINS { D1, D4, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
index 5bd3b590b9..301003e8b9 100644
--- a/keyboards/input_club/infinity60/led/config.h
+++ b/keyboards/input_club/infinity60/led/config.h
@@ -20,4 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Keyboard Matrix Assignments
 #define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
 #define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 }
-#define UNUSED_PINS
diff --git a/keyboards/input_club/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h
index d4ab34bccc..1207dffc78 100644
--- a/keyboards/input_club/infinity60/rev1/config.h
+++ b/keyboards/input_club/infinity60/rev1/config.h
@@ -20,6 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Keyboard Matrix Assignments
 #define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 }
-#define UNUSED_PINS
 
 
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index d55bf89236..12cda14a3a 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 }
 #define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index fde568ddae..2c2e8c6324 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D4, D5, D6, D7, C1, C2 }
 #define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, C10, C11 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/io_mini1800/config.h b/keyboards/io_mini1800/config.h
index 88636c2825..3190c1bb45 100644
--- a/keyboards/io_mini1800/config.h
+++ b/keyboards/io_mini1800/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { D6, D7, B4, B5, D4, E6, B3, D2, D5, D3 }
 #define MATRIX_COL_PINS { D1, D0, B7, B2, F0, F1, F7, F6, F4, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index 9b745d1c1d..9eb72dcc11 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, F0, C7, B4, B7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B6, B5, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h
index 2d06e9f05c..e761d76895 100644
--- a/keyboards/iriskeyboards/config.h
+++ b/keyboards/iriskeyboards/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
index 1ad00356fe..dbf277bc4e 100644
--- a/keyboards/j80/config.h
+++ b/keyboards/j80/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
 #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, A0 }
-#define UNUSED_PINS { B4, C1, C0, D0, D1, D2, D3, D4, D5, D6, D7 }
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index 96f8d57ede..b4de22c83e 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/jadookb/jkb2/config.h
index 21ec68ad9b..ec9deec35c 100644
--- a/keyboards/jadookb/jkb2/config.h
+++ b/keyboards/jadookb/jkb2/config.h
@@ -21,6 +21,5 @@
 
 #define MATRIX_ROW_PINS { B1 }
 #define MATRIX_COL_PINS { B3 ,B2}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index dae3cea49a..b7f754c3de 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
 
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h
index 1804dfeb4e..4f94a69603 100644
--- a/keyboards/jae/j01/config.h
+++ b/keyboards/jae/j01/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B2, B1, B3, B0, D0}
 #define MATRIX_COL_PINS {D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h
index e6c205e61c..cab8ec9d05 100644
--- a/keyboards/jagdpietr/drakon/config.h
+++ b/keyboards/jagdpietr/drakon/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C7, B5, B6, B0, B1, F1 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B2, B3, B7, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index f4b4963236..d59d30a12e 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* QMK JC65 PCB default pin-out */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN B2
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h
index 3645e86984..340123270e 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F5, B4 }
 #define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h
index ec4628fccb..a1b59f236f 100644
--- a/keyboards/jd45/config.h
+++ b/keyboards/jd45/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { F0, F1, F5, B4 }
 #define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h
index d3b5ec7243..bee9ee0ac0 100644
--- a/keyboards/jm60/config.h
+++ b/keyboards/jm60/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B11, B10, B2, B1, B0 }
 #define MATRIX_COL_PINS { A15, C10, C11, C12, D2, B3, B4, B5, B6, B7, B8, B9, A2, A3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h
index a5d8b9fe59..4e7852dbc1 100644
--- a/keyboards/jolofsor/denial75/config.h
+++ b/keyboards/jolofsor/denial75/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { F7, C7, C6, B5, B4, D7, D6, D4, E6, B1, B2, B3, B7, D0, D1, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index 9123005ac4..2c44bbd6bd 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Same pins for Jones' custom Round-Robin matrix.
 #define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
 #define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 // No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index e73bb22850..9359b0a51b 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Same pins for Jones' custom Round-Robin matrix.
 #define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
 #define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 // No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h
index 7144d9fe0a..89f1ce29e9 100644
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@@ -17,7 +17,6 @@
 
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/k34/config.h b/keyboards/k34/config.h
index 692940a16d..b7cbe618c2 100644
--- a/keyboards/k34/config.h
+++ b/keyboards/k34/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { F4, B2, E6, B4 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS { B5, B6, D2, D3 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h
index 7da74f6c92..ad667ae252 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6,C7,D7,B5,B2}
 #define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0}
-#define UNUSED_PINS
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
index 69ec346794..90de362e8b 100644
--- a/keyboards/kagizaraya/chidori/config.h
+++ b/keyboards/kagizaraya/chidori/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS \
     { F1, F0, B0 }
 */
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 // #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index a559f1a1fe..932c8cac3a 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D6, D4, D5, E6 }
 #define MATRIX_COL_PINS { D7, B4, C7, C6, B6, B5, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 36515c172f..1df0fb6593 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, D5 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h
index 192464c216..23f64f5376 100644
--- a/keyboards/kakunpc/angel17/alpha/config.h
+++ b/keyboards/kakunpc/angel17/alpha/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index f042a089c4..f3ee158546 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index 6f17407e8a..796bd9dc51 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index 6f17407e8a..796bd9dc51 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index 62c3bc180e..9673d0328e 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B2, B6 }
 #define MATRIX_COL_PINS { E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index f91c78f3bd..3f78333468 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, B2, B6 }
 #define MATRIX_COL_PINS { B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/choc_taro/config.h b/keyboards/kakunpc/choc_taro/config.h
index c4d1ac1eda..5ccbbee0cd 100644
--- a/keyboards/kakunpc/choc_taro/config.h
+++ b/keyboards/kakunpc/choc_taro/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index 9324d3e739..89aaf90ee3 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index 00f04c0d32..2d20aa16e9 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 // #define USE_I2C
 // #undef USE_SERIAL
 
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index 3ff2fdb27b..a1e7183124 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7 }
-#define UNUSED_PINS
 //#define USE_I2C
 //#undef USE_SERIAL
 
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index 4131283166..df5a855671 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 #define USE_I2C
 #undef USE_SERIAL
 
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index 83dc587e57..097a80a39d 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7 }
-#define UNUSED_PINS
 #define USE_I2C
 #undef USE_SERIAL
 
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index 51ae24ae03..a0cfbc6405 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
-#define UNUSED_PINS
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
diff --git a/keyboards/kapcave/gskt00/config.h b/keyboards/kapcave/gskt00/config.h
index 3730df5ea3..5a77496032 100755
--- a/keyboards/kapcave/gskt00/config.h
+++ b/keyboards/kapcave/gskt00/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, D1, D2, D4, D6, F7, B0, F4 }
 #define MATRIX_COL_PINS { F6, D7, F5, C7, B4, C6, B6, B5 }
-#define UNUSED_PINS
 
 #define BOOTMAGIC_LITE_ROW 3
 #define BOOTMAGIC_LITE_COLUMN 6
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index 37fee46aaa..4ab6863c4f 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -84,7 +84,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, B0, D3 }
 #define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
index ea1aad06e2..b50f1021af 100644
--- a/keyboards/kb58/config.h
+++ b/keyboards/kb58/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F5, F6, F7, B1, D7, D4, D0 }
 #define MATRIX_ROW_PINS_RIGHT { F7, B5, B3, B2, B6 }
 #define MATRIX_COL_PINS_RIGHT { F6, B1, E6, D7, C6, D4, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
index 5251a5d91e..345195b428 100644
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_usb/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, C1, C4, D0, C3, C2, B3, B4 }
 #define MATRIX_COL_PINS { A1, A0, A2, A3, A4, A5, A6, A7, C7, C6, C5, C0, D6, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/elmopad/config.h b/keyboards/kb_elmo/elmopad/config.h
index de2711bbc3..4581fbf94f 100644
--- a/keyboards/kb_elmo/elmopad/config.h
+++ b/keyboards/kb_elmo/elmopad/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C5, C4, B2, B1, D7, B0 }
 #define MATRIX_COL_PINS { C0, C1, C2, C3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h
index 493714310a..6088cd5de2 100644
--- a/keyboards/kb_elmo/isolation/config.h
+++ b/keyboards/kb_elmo/isolation/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* direct key pin */
 #define DIRECT_PINS {{ B0 }}
-#define UNUSED_PINS
 
 /* RGB backlight */
 #define RGB_DI_PIN B2
diff --git a/keyboards/kb_elmo/m0110a_usb/config.h b/keyboards/kb_elmo/m0110a_usb/config.h
index 18a3a405d7..4509b76933 100644
--- a/keyboards/kb_elmo/m0110a_usb/config.h
+++ b/keyboards/kb_elmo/m0110a_usb/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, D5 }
 #define MATRIX_COL_PINS { D7, C0, C1, C2, C3, D1, B4, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/m0116_usb/config.h b/keyboards/kb_elmo/m0116_usb/config.h
index 28c82ddb33..7d3581efff 100644
--- a/keyboards/kb_elmo/m0116_usb/config.h
+++ b/keyboards/kb_elmo/m0116_usb/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B1, A0, B2, A2, A1 }
 #define MATRIX_COL_PINS { D6, D5, D1, D0, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index 07dec2e1c1..6c462d7176 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { B4, B6, D7, D5, D0 }
 #define MATRIX_COL_PINS { D1, D2, D3, D4, C6, C7, F7, F6, F5, F4, F0, F1, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/sesame/config.h b/keyboards/kb_elmo/sesame/config.h
index 20e19ea60d..432bb769c3 100644
--- a/keyboards/kb_elmo/sesame/config.h
+++ b/keyboards/kb_elmo/sesame/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C4, C5, C6, C7, A7 }
 #define MATRIX_COL_PINS { D1, D5, D6, D7, C0, C1, C2, C3, A6, A5, A4, A3, A2, A1, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/vertex/config.h b/keyboards/kb_elmo/vertex/config.h
index b532b63745..9bf46423b4 100644
--- a/keyboards/kb_elmo/vertex/config.h
+++ b/keyboards/kb_elmo/vertex/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D2, D4, B7, C6 }
 #define MATRIX_COL_PINS { C4, C7, D3, D5, B6, D6, B5, B0, B4, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdclack/kaishi65/config.h b/keyboards/kbdclack/kaishi65/config.h
index 52b86d3f12..aa8c1e4dd0 100644
--- a/keyboards/kbdclack/kaishi65/config.h
+++ b/keyboards/kbdclack/kaishi65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, B0, F0, F1 }
 #define MATRIX_COL_PINS { B2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index 27c8fbc0e5..4f23460964 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/baguette66/soldered/config.h b/keyboards/kbdfans/baguette66/soldered/config.h
index 624dfadca8..0d96871a74 100644
--- a/keyboards/kbdfans/baguette66/soldered/config.h
+++ b/keyboards/kbdfans/baguette66/soldered/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index 74c8c99ed5..837701c7c4 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D2, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index ac2cba6036..b1024b4e21 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D2, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/kbdfans/bella/soldered/config.h b/keyboards/kbdfans/bella/soldered/config.h
index 5992ddaa2c..3f499624b9 100755
--- a/keyboards/kbdfans/bella/soldered/config.h
+++ b/keyboards/kbdfans/bella/soldered/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, D1, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D2, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index 726e7b2962..2d4cbe4e85 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
 #define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 95e7bc3052..7921b12edb 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index f21ddb9d0b..b0ad114346 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/bounce/pad/config.h b/keyboards/kbdfans/bounce/pad/config.h
index aee424ac39..dab7f6f9fe 100644
--- a/keyboards/kbdfans/bounce/pad/config.h
+++ b/keyboards/kbdfans/bounce/pad/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { C7, B7, B6, B0, B1, B2 }
 #define MATRIX_COL_PINS { B5, B4, D0, C2 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 #define LED_NUM_LOCK_PIN C6
 #define LED_PIN_ON_STATE 1
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 436ceb4b1c..675128d354 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 }
 #define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index 70c4683242..a2da25a983 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B1, B0, D5, B7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h
index 9737a9c6d8..4c2cb170d8 100644
--- a/keyboards/kbdfans/kbd66/config.h
+++ b/keyboards/kbdfans/kbd66/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, F0, F1, D4 } // From qmkeyboard.cn
 #define MATRIX_COL_PINS { C6, C7, E2, F5, F6, F4, D3, D2, D5, D0, D1, B4, D7, D6, E6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index 1fca508a87..d22de44672 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
 #define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/config.h
index f955e82c6f..0af4b7ad7b 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/config.h
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index 23b0a8a30c..b2b4ec3ce6 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
 #define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index a63a3ee61b..b6311715fd 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { B1, F1, B2, B3, C6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 03b806821f..415da00b48 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { B1, F1, B2, B3, C6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index dbe7f03503..145a928e22 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index 9a68b4b08e..f156afd9b1 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index e7160abd95..7eb6019c74 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index b54ce4d24c..ae8a1ee478 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -17,7 +17,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index a06de0dda8..6cb9064461 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index 2499c25933..85ad8150da 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -30,7 +30,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, F1, B0, B1, B2, C6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, E6, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index 33376c800a..e37124632b 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 }
 #define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0  }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index a33c328a8b..7a2b2aa3c8 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
index d3da84af14..1f7d095e9f 100644
--- a/keyboards/kbdfans/kbdmini/config.h
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -18,7 +18,6 @@
  */
 #define MATRIX_ROW_PINS { B7, E6, F5, F4 }
 #define MATRIX_COL_PINS { B3, B2, B1, B0, F1, F0, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index 711d1b03e5..c0f1632169 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, D1, D2, C6, C7, B6 }
 #define MATRIX_COL_PINS { C4, C5, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
index 3eafcd24cf..945c932da9 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* NIU Mini PCB default pin-out */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B1, B0, D5, B7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 81572cee6e..571f6d0d1c 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -20,7 +20,6 @@
 
 #define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index 0731524dad..57ad7e8533 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -20,7 +20,6 @@
 
 #define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-#define UNUSED_PINS
 
 #define LED_NUM_LOCK_PIN B9
 #define LED_CAPS_LOCK_PIN B10
diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index d1ab30f614..34ab024a60 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -22,7 +22,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, C6, C7, F7, F6, F5, F4, F1, E6, B7, D0, D1, D2, D3, D5 }
-#define UNUSED_PINS
 #define LED_NUM_LOCK_PIN D7
 #define LED_CAPS_LOCK_PIN D6
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h
index c1092c11e9..207f627f7e 100644
--- a/keyboards/kbdfans/tiger80/config.h
+++ b/keyboards/kbdfans/tiger80/config.h
@@ -22,7 +22,6 @@
 #define MATRIX_COLS 16
 #define MATRIX_ROW_PINS { B0, E6, B1, B4, D1, D2 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D3, D5, D4, D6, D7, B5, B6, C6, E2, D0 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index 602a4cc35d..8939dd2fbe 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, F6, F7, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kc60se/config.h b/keyboards/kc60se/config.h
index 88a4afa9d3..f6d4e2e42b 100644
--- a/keyboards/kc60se/config.h
+++ b/keyboards/kc60se/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 14
 
 /* * Keyboard Matrix Assignments */
-#define UNUSED_PINS
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
 
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index d56c572a4d..2dacb39e07 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D7, E6, B4, B1, B3, B2 }
 #define MATRIX_COL_PINS { D2, D4, C6, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index 975a456300..80603481f1 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, C7, B6, B4 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D7, D6, D4, D3, D2, D1, D0, B7, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebio/tragicforce68/config.h b/keyboards/keebio/tragicforce68/config.h
index 428a7ca1ff..d39b78c010 100644
--- a/keyboards/keebio/tragicforce68/config.h
+++ b/keyboards/keebio/tragicforce68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, B4, E6, C6, D7, D4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebsforall/freebird60/config.h b/keyboards/keebsforall/freebird60/config.h
index 736782e836..44331c8612 100644
--- a/keyboards/keebsforall/freebird60/config.h
+++ b/keyboards/keebsforall/freebird60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F5, F4, F1, F0, F6 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D0, D1, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebsforall/freebirdnp/lite/config.h b/keyboards/keebsforall/freebirdnp/lite/config.h
index 6630124423..031b2ba596 100644
--- a/keyboards/keebsforall/freebirdnp/lite/config.h
+++ b/keyboards/keebsforall/freebirdnp/lite/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B7, B6, B5, B4, B3 }
 #define MATRIX_COL_PINS { C7, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebsforall/freebirdnp/pro/config.h b/keyboards/keebsforall/freebirdnp/pro/config.h
index b7c850c83d..8986e2ef64 100644
--- a/keyboards/keebsforall/freebirdnp/pro/config.h
+++ b/keyboards/keebsforall/freebirdnp/pro/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D3, B7, B6, B5, B4, B3 }
 #define MATRIX_COL_PINS { C7, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebsforall/freebirdtkl/config.h b/keyboards/keebsforall/freebirdtkl/config.h
index e775ccf083..06b8d65619 100644
--- a/keyboards/keebsforall/freebirdtkl/config.h
+++ b/keyboards/keebsforall/freebirdtkl/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B1, B0, B3, D5, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D3, D2, D1 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index 544445f085..7d6a9a8330 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 #define SLIDER_PIN D4
 
diff --git a/keyboards/keebzdotnet/fme/config.h b/keyboards/keebzdotnet/fme/config.h
index a756fea926..1723e314ef 100644
--- a/keyboards/keebzdotnet/fme/config.h
+++ b/keyboards/keebzdotnet/fme/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B6, B5, B7, D2 }
 #define MATRIX_COL_PINS { B0, B4, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebzdotnet/wazowski/config.h b/keyboards/keebzdotnet/wazowski/config.h
index fb9fc9c118..9670585b45 100644
--- a/keyboards/keebzdotnet/wazowski/config.h
+++ b/keyboards/keebzdotnet/wazowski/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6 }
 #define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index ff4d011025..269f5a7967 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F5, B5, B6, B2, B3 }
 #define MATRIX_COL_PINS { E6, B4, D7, B1 }
-#define UNUSED_PINS { B0, B7, C7, D2, D3, D5, F0 }
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index e8281c8019..1e54bbfb15 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { D3, D2, D0, B0, F0  }
 #define MATRIX_COL_PINS { E6, D1, D5, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyboardio/atreus/config.h b/keyboards/keyboardio/atreus/config.h
index ad616634b2..6e6e68dcaf 100644
--- a/keyboards/keyboardio/atreus/config.h
+++ b/keyboards/keyboardio/atreus/config.h
@@ -49,7 +49,6 @@
 
 #define MATRIX_ROW_PINS { F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { F7, E2, C7, C6, B6, B5, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index b6eed0b04d..84a262e874 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -18,7 +18,6 @@
  */
 #define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keycapsss/plaid_pad/rev1/config.h b/keyboards/keycapsss/plaid_pad/rev1/config.h
index fee25316dd..1178c7f7e3 100644
--- a/keyboards/keycapsss/plaid_pad/rev1/config.h
+++ b/keyboards/keycapsss/plaid_pad/rev1/config.h
@@ -19,7 +19,6 @@
 #define PRODUCT Plaid-Pad Rev1
 #define DEVICE_VER 0x0001
 
-#define UNUSED_PINS     { B3, B4, B5, D4}
 
 #define ENCODERS_PAD_A { D1, B2 }
 #define ENCODERS_PAD_B { D0, B1 }
diff --git a/keyboards/keycapsss/plaid_pad/rev2/config.h b/keyboards/keycapsss/plaid_pad/rev2/config.h
index f3646dd575..aaa954271e 100644
--- a/keyboards/keycapsss/plaid_pad/rev2/config.h
+++ b/keyboards/keycapsss/plaid_pad/rev2/config.h
@@ -19,7 +19,6 @@
 #define PRODUCT Plaid-Pad Rev2
 #define DEVICE_VER 0x0002
 
-#define UNUSED_PINS     { }
 
 #define ENCODERS_PAD_A { D1, B2, B4, D4 }
 #define ENCODERS_PAD_B { D0, B1, B3, B5 }
diff --git a/keyboards/keycapsss/plaid_pad/rev3/config.h b/keyboards/keycapsss/plaid_pad/rev3/config.h
index 40f96cd5c8..7159059a80 100644
--- a/keyboards/keycapsss/plaid_pad/rev3/config.h
+++ b/keyboards/keycapsss/plaid_pad/rev3/config.h
@@ -19,7 +19,6 @@
 #define PRODUCT Plaid-Pad Rev3
 #define DEVICE_VER 0x0003
 
-#define UNUSED_PINS     { }
 
 #define ENCODERS_PAD_A { D1, B2, B4, D4 }
 #define ENCODERS_PAD_B { D0, B1, B3, B5 }
diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 3ea0cf83d1..98ab67871c 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D1, B6, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3, D0 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B7 }
 #define ENCODERS_PAD_B { D5 }
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 25c01a4c00..ddb9ef8bfe 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B5, B4, E6, D4, F6, D3, D2, F4, F5 }
 #define MATRIX_COL_PINS \
     { D7, C6, D0, D1, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index c2d346bc61..e72a6ab6b3 100644
--- a/keyboards/keyhive/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B3, B4, B5, C0, C1, C2, C3 }
 #define MATRIX_COL_PINS { D7, D6, B0, D5, D1, D4, D0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index d7bc4b4200..4a177fa93d 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index 22a985c280..0d4685b17f 100644
--- a/keyboards/keyhive/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B6, B2, B3, B4 }
 #define MATRIX_COL_PINS \
     { D1, D0, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 1dfb210b03..c128e8ecdc 100644
--- a/keyboards/keyhive/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B6, B2, B3, B4 }
 #define MATRIX_COL_PINS \
     { D4, C6, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 205535273a..74cf7f77ca 100644
--- a/keyboards/keyhive/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B6, B2, B3, B4 }
 #define MATRIX_COL_PINS \
     { D4, E6, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h
index e5ea2a2d94..5f7f279346 100644
--- a/keyboards/keyhive/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
@@ -25,7 +25,6 @@
 /* PCB pin-out */
 #define MATRIX_ROW_PINS {B1, B3, B2, B6}
 #define MATRIX_COL_PINS {D1, D0, D4, C6, D7, E6, B4, B5, F4, F5, F6, F7}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index aa94a5045a..ac2db030f1 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B6, B5, B4 }
 #define MATRIX_COL_PINS { C7, C6, F7, F6, F5, F4, F1, D4, D6, D7, D0, D1, D2, D3, D5 }
-#define UNUSED_PINS { E6, F0 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 044a60dfed..d74682cea2 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D3, C6, C7, D5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 11c84ad2ab..cbd2306106 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -35,7 +35,6 @@
 #define DIRECT_PINS { \
     { B6 } \
 }
-#define UNUSED_PINS
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN F6
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index 37ea08c017..0539c124b7 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -38,7 +38,6 @@
 #define DIRECT_PINS { \
     { D0 } \
 }
-#define UNUSED_PINS
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D1
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 98210f5f9c..a9d24c0c9e 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { C4, C5, B7, B6, B5, B4, B3, B2, B1, B0, D6, D5 }
-#define UNUSED_PINS
 
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h
index 727d5fc105..08a81a4a91 100644
--- a/keyboards/keyprez/bison/config.h
+++ b/keyboards/keyprez/bison/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, F7, B1, B3, D7 }
 #define MATRIX_COL_PINS { D3, E6, B2, B4, D4, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyprez/corgi/config.h b/keyboards/keyprez/corgi/config.h
index 96ce6b0d62..bebc94e14b 100644
--- a/keyboards/keyprez/corgi/config.h
+++ b/keyboards/keyprez/corgi/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F5, F7, B2, B6, F4, F6, B1, B3 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h
index 57333658d8..739d5b525e 100644
--- a/keyboards/keyprez/unicorn/config.h
+++ b/keyboards/keyprez/unicorn/config.h
@@ -24,7 +24,6 @@
 #define MATRIX_COL_PINS { F5, B2, B5, D7, B4, B6, E6, D4 }
 #define MATRIX_ROW_PINS_RIGHT { F4, B2, F6, F7, B1, B3 }
 #define MATRIX_COL_PINS_RIGHT { F5, D3, B5, D7, B4, B6, E6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyquest/enclave/config.h b/keyboards/keyquest/enclave/config.h
index 931386a775..b91c01dca5 100644
--- a/keyboards/keyquest/enclave/config.h
+++ b/keyboards/keyquest/enclave/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments*/
 #define MATRIX_ROW_PINS { D6, B6, F5 }
 #define MATRIX_COL_PINS { B4, B7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keysofkings/twokey/config.h b/keyboards/keysofkings/twokey/config.h
index 99f523df2b..f33537fabb 100755
--- a/keyboards/keysofkings/twokey/config.h
+++ b/keyboards/keysofkings/twokey/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B4, B5 }
 #define MATRIX_COL_PINS { B3, B2 }
-#define UNUSED_PINS
 
 
 #define ENCODERS_PAD_A { D7 }
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
index 06b40b5e66..3b949040fd 100644
--- a/keyboards/keystonecaps/gameroyadvance/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B_RIGHT { B2 }
 #define SOFT_SERIAL_PIN D2
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyten/kt60_m/config.h b/keyboards/keyten/kt60_m/config.h
index 1e0961ce4f..9e2b068777 100644
--- a/keyboards/keyten/kt60_m/config.h
+++ b/keyboards/keyten/kt60_m/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C7, C6, B6, F7, F6 }
 #define MATRIX_COL_PINS { B7, F0, F1, F4, F5, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kikkou/config.h b/keyboards/kikkou/config.h
index 06b9cb3923..f9dbebd28c 100644
--- a/keyboards/kikkou/config.h
+++ b/keyboards/kikkou/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, E6 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kin80/micro/config.h b/keyboards/kin80/micro/config.h
index 546d0bc5f5..2874cb819d 100644
--- a/keyboards/kin80/micro/config.h
+++ b/keyboards/kin80/micro/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B6, B3, B1, D6, B7, B5, D1 }
 #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS { C7 }
 
 #define LED_PIN_ON_STATE 0
 #define NUM_LOCK_LED_PIN D2
diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h
index 3116265841..5e3dacdb0e 100644
--- a/keyboards/kindakeyboards/conone65/config.h
+++ b/keyboards/kindakeyboards/conone65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS {D5,D3,E6,D1,D2}
 #define MATRIX_COL_PINS {B7,F7,D4,D6,D7,B4,B5,B6,C6,C7,F6,F5,F4,F1,F0,D0}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h
index 8a656264ee..8667d2d132 100644
--- a/keyboards/kinesis/alvicstep/config.h
+++ b/keyboards/kinesis/alvicstep/config.h
@@ -26,7 +26,6 @@
 
 // May be upside down. 
 #define MATRIX_COL_PINS { B0,B1, B2, B3, B4, B5, B6, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 54ba07d3d6..baef45e32b 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_ROW_PINS { D7, E0, E1, C0, C6, F6, D4, D2, D3, D0, B7, D1, E6, B4, B2 }
 #define MATRIX_COL_PINS { E7, F0, F7, B1, B3, B0, D5 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 188c83345d..88f28d0fe2 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -45,7 +45,6 @@
 #define MATRIX_ROW_PINS { D3, C3, C4, C6, D2, B0, D7, A12, A13, B17, B16, D0, B1, C2, D6 }
 #define MATRIX_COL_PINS { B3, D1, C0, D5, C1, B2, D4 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 3e13e84606..6a21e8efad 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -72,7 +72,6 @@
             LINE_PIN6   /* COL_6 */ \
     }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index 8e15fea479..5eb397856e 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -72,7 +72,6 @@
             LINE_PIN6   /* COL_6 */ \
     }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h
index f1b41e61bc..b518456e27 100644
--- a/keyboards/kinesis/nguyenvietyen/config.h
+++ b/keyboards/kinesis/nguyenvietyen/config.h
@@ -21,7 +21,6 @@
 // Passed through the port multipler, so 4 pins =16
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index fe44131adb..1ef92a604d 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -23,7 +23,6 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5, D6, D7, C0, C1, C2, C3, C4, C5, C6 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kineticlabs/emu/hotswap/config.h b/keyboards/kineticlabs/emu/hotswap/config.h
index e4b07c155f..23e3b22a37 100644
--- a/keyboards/kineticlabs/emu/hotswap/config.h
+++ b/keyboards/kineticlabs/emu/hotswap/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { E6, D4, B3, B1, B0, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kineticlabs/emu/soldered/config.h b/keyboards/kineticlabs/emu/soldered/config.h
index e4b07c155f..23e3b22a37 100644
--- a/keyboards/kineticlabs/emu/soldered/config.h
+++ b/keyboards/kineticlabs/emu/soldered/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { E6, D4, B3, B1, B0, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
index 8a663da356..0776d1ba08 100644
--- a/keyboards/kingly_keys/ave/config.h
+++ b/keyboards/kingly_keys/ave/config.h
@@ -36,7 +36,6 @@
 
 #define MATRIX_ROW_PINS { B3, F4, F7, F6, F5 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
index 64b187f1cf..68954c6b70 100644
--- a/keyboards/kingly_keys/little_foot/config.h
+++ b/keyboards/kingly_keys/little_foot/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F6, B6, B2, B3, B1 }
 #define MATRIX_COL_PINS { F5, F7, B5, B4, E6, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
index 4d47736bc5..a5478582b1 100644
--- a/keyboards/kingly_keys/romac/config.h
+++ b/keyboards/kingly_keys/romac/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 0f9afb982c..441584a84e 100644
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ b/keyboards/kingly_keys/romac_plus/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C6, D4, D2, D3 }
 #define MATRIX_COL_PINS { F6, F5, F4 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B3 }
 #define ENCODERS_PAD_B { B2 }
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
index 7900f09d29..092349cbc6 100644
--- a/keyboards/kingly_keys/ropro/config.h
+++ b/keyboards/kingly_keys/ropro/config.h
@@ -28,7 +28,6 @@
  /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, F1, NO_PIN }
 #define MATRIX_COL_PINS { F0, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2, B6, D2, C7 }
-#define UNUSED_PINS
 
  /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
index 7e192b61f7..a1a308f088 100644
--- a/keyboards/kingly_keys/smd_milk/config.h
+++ b/keyboards/kingly_keys/smd_milk/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C5, D2 }
 #define MATRIX_COL_PINS { D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index eff9bf64ed..503c77a04b 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -26,7 +26,6 @@
  /* key matrix pins */
 #define MATRIX_ROW_PINS { C7, C6 }
 #define MATRIX_COL_PINS { F4, F1, F0, D5 }
-#define UNUSED_PINS
 
  /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
index 7570cad543..17c73df412 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira75/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4 }
 #define MATRIX_COL_PINS { F6, F7, C7, C6, B6, B5, B4, F5, F4, F1, F0, E6, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kira80/config.h b/keyboards/kira80/config.h
index 076c360dac..4307eabbdd 100644
--- a/keyboards/kira80/config.h
+++ b/keyboards/kira80/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
 #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, A0, C2, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h
index 2457f99879..67d02c6396 100644
--- a/keyboards/kiwikeebs/macro/config.h
+++ b/keyboards/kiwikeebs/macro/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, D7 }
 #define MATRIX_COL_PINS { F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h
index 179a08e34c..9a24d57a69 100644
--- a/keyboards/kiwikeebs/macro_v2/config.h
+++ b/keyboards/kiwikeebs/macro_v2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4 }
 #define MATRIX_COL_PINS { B6, C6, C7, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index 350245d1c3..42bc5644bd 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 9f98ca1926..10ab8dfd5b 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B5, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 4107d5717a..fc42b5ff19 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F1, E6, E2, C7, D4 }
 #define MATRIX_COL_PINS { F5, F6, B4, D7, D6, D5, D2, D3, B0, F0, B1, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kkatano/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h
index 97f6ade6a4..fc3da670dc 100644
--- a/keyboards/kkatano/bakeneko60/config.h
+++ b/keyboards/kkatano/bakeneko60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kkatano/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h
index e45fef4297..442f69238f 100644
--- a/keyboards/kkatano/bakeneko65/rev2/config.h
+++ b/keyboards/kkatano/bakeneko65/rev2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kkatano/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h
index e45fef4297..442f69238f 100644
--- a/keyboards/kkatano/bakeneko65/rev3/config.h
+++ b/keyboards/kkatano/bakeneko65/rev3/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kkatano/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
index 4b586aeba7..89fd9070a0 100644
--- a/keyboards/kkatano/bakeneko80/config.h
+++ b/keyboards/kkatano/bakeneko80/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B0, B1, B7, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
index a5ef8c4d0c..fc380eecf6 100644
--- a/keyboards/kkatano/wallaby/config.h
+++ b/keyboards/kkatano/wallaby/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
 #define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kkatano/yurei/config.h b/keyboards/kkatano/yurei/config.h
index f5910d4723..95aa6b7ee3 100644
--- a/keyboards/kkatano/yurei/config.h
+++ b/keyboards/kkatano/yurei/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
 #define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kmac/config.h b/keyboards/kmac/config.h
index 495c612452..3d1b8eb5d5 100644
--- a/keyboards/kmac/config.h
+++ b/keyboards/kmac/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D0, D1, D2, D3, D5, B7 }
 #define MATRIX_COL_PINS \
     { B6, C6, C7, F1, F0, B5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 //#define DIODE_DIRECTION
diff --git a/keyboards/kmac_pad/config.h b/keyboards/kmac_pad/config.h
index 3d238dbfe9..301a7813da 100644
--- a/keyboards/kmac_pad/config.h
+++ b/keyboards/kmac_pad/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E2, D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 // #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kmini/config.h b/keyboards/kmini/config.h
index 67aad7985e..7138b158a6 100755
--- a/keyboards/kmini/config.h
+++ b/keyboards/kmini/config.h
@@ -29,7 +29,6 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 //#define DIODE_DIRECTION
diff --git a/keyboards/knobgoblin/config.h b/keyboards/knobgoblin/config.h
index 96303b930a..57a0a016c4 100644
--- a/keyboards/knobgoblin/config.h
+++ b/keyboards/knobgoblin/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, B6, B2, B3, B1 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { F7, F5 }
 #define ENCODERS_PAD_B { F6, F4 }
diff --git a/keyboards/knops/mini/config.h b/keyboards/knops/mini/config.h
index 259819e7cf..7ca350b30c 100644
--- a/keyboards/knops/mini/config.h
+++ b/keyboards/knops/mini/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
index 7a63ccc46d..f53944789e 100644
--- a/keyboards/kona_classic/config.h
+++ b/keyboards/kona_classic/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Column pin configuration
  */
 #define MATRIX_COL_PINS { F0, F4, B5, B4, D7, D6, B0, B1, B3, D2, B7, D0, D1, D3, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
index 1c2993684d..a5bc7430c8 100644
--- a/keyboards/kopibeng/mnk65/config.h
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, B7, B3 }
 #define MATRIX_COL_PINS { D0, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN D1
 
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index 3c78f01d52..54195ef454 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
 #define MATRIX_COL_PINS { D1, D2, D3, B6, C6, C7, F0, F1, F4, F5, F6, F7, B2, B3, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/bm16a/config.h b/keyboards/kprepublic/bm16a/config.h
index 17568b446e..7e6289b793 100644
--- a/keyboards/kprepublic/bm16a/config.h
+++ b/keyboards/kprepublic/bm16a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D3, D5, D1, D2}
 #define MATRIX_COL_PINS { D6, D4, D7, B4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index a473ee3956..2de3ffe3d4 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/config.h
@@ -8,7 +8,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, D3, D2 }
 #define MATRIX_COL_PINS { F7, F6, D4, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
index f5f4c8bd4d..8e4710abb3 100755
--- a/keyboards/kprepublic/bm40hsrgb/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, B2, E6, B5 }
 #define MATRIX_COL_PINS { B6, C6, B4, D7, D4, D6, C7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index 7a1b051f83..09ba659d65 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
 #define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index 0a63b7819b..ac80357e9f 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -36,7 +36,6 @@
  */
 #define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
 #define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index 177ceb49fd..80dc26907c 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -35,7 +35,6 @@
  */
 #define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
 #define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 0107d3410d..96d8a450c9 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
 #define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index 8199a75395..c5e8022d35 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                           B3, \
                           E6 }
 #define MATRIX_COL_PINS {     D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index d5d96a2644..9b9d534c42 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                           B3, \
                           E6 }
 #define MATRIX_COL_PINS {     D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 946bdaba55..86fbb7ae3b 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { D6, D4, D5, D3, F6 }
 #define MATRIX_COL_PINS { F0, F1, B0, B1, B2, B3, E6, B7, D2, D7, B4, B5, B6, C6, C7}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index 9246d8066a..049aca9b8a 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, C6, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, D7, D6, D4, D5, D3, D2, F5, F6, F7, D1, D0, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/bm80v2/config.h b/keyboards/kprepublic/bm80v2/config.h
index a0e9a5d2e1..f04ec1d960 100644
--- a/keyboards/kprepublic/bm80v2/config.h
+++ b/keyboards/kprepublic/bm80v2/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_COLS 17
 #define MATRIX_ROW_PINS { C7, C6, B6, F5, F7, F6 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, D7, D6, B7, B1, B0, B2, B3, D3, D5, D4, D2, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kprepublic/bm80v2_iso/config.h b/keyboards/kprepublic/bm80v2_iso/config.h
index 17f8653fd9..aee11c42c9 100644
--- a/keyboards/kprepublic/bm80v2_iso/config.h
+++ b/keyboards/kprepublic/bm80v2_iso/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_COLS 17
 #define MATRIX_ROW_PINS { C7, C6, B6, F5, F7, F6 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, D7, D6, B7, B1, B0, B2, B3, D3, D5, D4, D2, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index 4bcc83da43..af7e3f3be3 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, B6, B5, B4, F7, F6, D7 }
 #define MATRIX_COL_PINS { B1, B2, B3, B7, D0, D1, D2, D3, D5, E6, F0, F1, F4, F5, D6 }
-// #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index 75c7c0990c..895cc57a0d 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index 83b9464cc0..ec826ab1af 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D2, D3, D5, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
index c11d3e074b..876d61223f 100755
--- a/keyboards/ktec/staryu/config.h
+++ b/keyboards/ktec/staryu/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { NO_PIN, D0,     D1 }, \
     { D4,     D3,     D2 }, \
 }
-#define UNUSED_PINS
 
 #define RGB_DI_PIN C6
 #define RGBLED_NUM 1     // Number of LEDs
diff --git a/keyboards/kv/revt/config.h b/keyboards/kv/revt/config.h
index 49079a6bc2..19e72ad573 100644
--- a/keyboards/kv/revt/config.h
+++ b/keyboards/kv/revt/config.h
@@ -22,7 +22,6 @@
 #define MATRIX_COLS 21
 #define MATRIX_ROW_PINS { A6, B13, B8, A0, A1, A2 }
 #define MATRIX_COL_PINS { B7, B6, B5, B4, B3, B2, B14, B1, B15, B0, B9, B10, B11, B12, A14, A13, A4, A5, A7, A8, A15 }
-#define UNUSED_PINS { }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h
index 832fb98d9d..5abbd8d4f9 100644
--- a/keyboards/kwub/bloop/config.h
+++ b/keyboards/kwub/bloop/config.h
@@ -27,7 +27,6 @@
     { F5, F4, C6, C7, D7 }
 #define MATRIX_COL_PINS \
     { B4, B5, B6, F6, F1, F7, F0, B0, B7, D3, D2, D1, D5, D4, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ky01/config.h b/keyboards/ky01/config.h
index b5ad4a25e8..47edbd2605 100644
--- a/keyboards/ky01/config.h
+++ b/keyboards/ky01/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B5, B4, D7, D4, D6 }
 #define MATRIX_COL_PINS { B3, B7, D0, D1, D2, D3, D5, F0, F1, F4, F5, F6, F7, C7, C6, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/labbe/labbeminiv1/config.h b/keyboards/labbe/labbeminiv1/config.h
index 5a561fecad..4b47be8db8 100644
--- a/keyboards/labbe/labbeminiv1/config.h
+++ b/keyboards/labbe/labbeminiv1/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F6 }
 #define MATRIX_COL_PINS { F0, F1, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index 97ede34376..c944d14ed5 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, E6, D7, C6, D4, D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
-#define UNUSED_PINS 
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index c9e5913f52..585f632c40 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -35,7 +35,6 @@
  */
 #define MATRIX_ROW_PINS {C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS {F7, F6, F5, F4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index 2e69294bb5..019e18751d 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { D6, D7, B5, B6 ,C6, C7, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index e975e6eaf9..0058297dda 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -34,7 +34,6 @@
  */
 #define MATRIX_ROW_PINS {C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS {F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3, D6, D4, D3}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index 901b957b52..5bb3ca4562 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define MATRIX_COLS 8
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D6, D7, B5, B6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index f5ff59d697..17083580a6 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -36,7 +36,6 @@
  */
 #define MATRIX_ROW_PINS {C7, C6 }
 #define MATRIX_COL_PINS {F7, F6, F5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index bf9538e32d..255ddc89db 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index 8d7976ae56..09198df612 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { F0, F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { D6, D7, B5, B6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index 7ed6da4064..c9200e2d18 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h
index 9ffa915e22..53ee2b2bbb 100644
--- a/keyboards/lazydesigners/the50/config.h
+++ b/keyboards/lazydesigners/the50/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lazydesigners/the60/rev1/config.h b/keyboards/lazydesigners/the60/rev1/config.h
index 4c6f606a0e..4d50f75296 100755
--- a/keyboards/lazydesigners/the60/rev1/config.h
+++ b/keyboards/lazydesigners/the60/rev1/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h
index fb8a5d581f..3034c0e2f4 100644
--- a/keyboards/leafcutterlabs/bigknob/config.h
+++ b/keyboards/leafcutterlabs/bigknob/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS {   \
     { B7, D4, D6, F6, F7} \
 }
-#define UNUSED_PINS
 
 /* rotary encoder 1,2,3 closest to usb port is 0*/
 #define ENCODERS_PAD_A { D0}
diff --git a/keyboards/leeku/finger65/config.h b/keyboards/leeku/finger65/config.h
index 97d3835b4b..10cf15b91f 100644
--- a/keyboards/leeku/finger65/config.h
+++ b/keyboards/leeku/finger65/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_ROW_PINS { C3, C4, C5, C6, C7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h
index 02d9aa21cc..4ecf59006e 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -7,7 +7,6 @@
 #define MATRIX_COLS 16
 #define MATRIX_ROW_PINS {B0, B3, B2, B1, F5}
 #define MATRIX_COL_PINS {E6, F4, B7, D5, D3, D2, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
-#define UNUSED_PINS {}
 #define RGBLED_NUM 20     // Number of LEDs
 
 #define QMK_ESC_OUTPUT E6 // usually COL
diff --git a/keyboards/lfkeyboards/lfk78/revb/config.h b/keyboards/lfkeyboards/lfk78/revb/config.h
index 34ca869c5f..b94cf4be27 100644
--- a/keyboards/lfkeyboards/lfk78/revb/config.h
+++ b/keyboards/lfkeyboards/lfk78/revb/config.h
@@ -16,6 +16,5 @@
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { E6, F7, D2, D3, D4, D5, D6, D7 }
-#define UNUSED_PINS
 
 #define RGBLED_NUM 31
diff --git a/keyboards/lfkeyboards/lfk78/revc/config.h b/keyboards/lfkeyboards/lfk78/revc/config.h
index 1a62dfe4f3..c7c7bc9b5f 100644
--- a/keyboards/lfkeyboards/lfk78/revc/config.h
+++ b/keyboards/lfkeyboards/lfk78/revc/config.h
@@ -16,6 +16,5 @@
  */
 #define MATRIX_ROW_PINS { D2, D3, D4, D5, D6 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 }
-#define UNUSED_PINS
 
 #define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revj/config.h b/keyboards/lfkeyboards/lfk78/revj/config.h
index 1a62dfe4f3..c7c7bc9b5f 100644
--- a/keyboards/lfkeyboards/lfk78/revj/config.h
+++ b/keyboards/lfkeyboards/lfk78/revj/config.h
@@ -16,6 +16,5 @@
  */
 #define MATRIX_ROW_PINS { D2, D3, D4, D5, D6 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 }
-#define UNUSED_PINS
 
 #define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h
index 7d19335eec..a7b7415e02 100644
--- a/keyboards/lfkeyboards/lfk87/config.h
+++ b/keyboards/lfkeyboards/lfk87/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define MATRIX_ROW_PINS {D2, D3, D4, D5, D6, D7 }
     #define MATRIX_COL_PINS {A0, A1, A2, A3, A4, A5, A6, A7, E6, E7,\
                              F0, F1, F2, F3, C0, C1, C2 }
-    #define UNUSED_PINS {B0, B1, B2, B3, B4, B4, B5, B6, B7, C4, C5, C6, C7,\
-                         D0, D1, E0, E1, E2, E3, E4, F4, F5, F6, F7}
     #define RGBLED_NUM 25     // Number of LEDs
 #else
 /* RevC/D Matrix config */
@@ -37,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define MATRIX_COLS 16
     #define MATRIX_ROW_PINS {F2, D7, D6, D5, D4, D3, F3}
     #define MATRIX_COL_PINS {A0, A1, A2, A3, A4, A5, A6, A7, C7, C1, C0, E1, E0, C2, C3, C4}
-    #define UNUSED_PINS {B0, B1, B2, B3, B4, B4, B5, B6, B7, C5, C6, D2, E3, E4, E5, E6, E7, \
-                         F0, F1, F4, F5, F6, F7}
     #define RGBLED_NUM 24     // Number of LEDs
 #endif
 
diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h
index 7f91008573..84dfdad009 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, F4, F6, F7, C7, C6 }
 #define MATRIX_COL_PINS { F1, F0, D4, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index 7959c15de0..b304db7548 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define MATRIX_COLS 19
     #define MATRIX_ROW_PINS {D7, E1, F2, F0, F1}
     #define MATRIX_COL_PINS {E6, E0, A3, A4, A5, A6, A7, C7, C5, C4, C3, C2, C1, C0, D6, A2, A1, A0, F3}
-    #define UNUSED_PINS {}
     #define RGBLED_NUM 26     // Number of LEDs
 
 #define AUDIO_VOICES
diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h
index ecb183e8af..26fcc540f4 100644
--- a/keyboards/lfkeyboards/smk65/revb/config.h
+++ b/keyboards/lfkeyboards/smk65/revb/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MATRIX_COLS 16
 // #define MATRIX_ROW_PINS {B7, F7, F6, F5, F4}
 // #define MATRIX_COL_PINS {F0, F1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C7, B3, B2, B1, B0}
-// #define UNUSED_PINS {}
 
 // RevB
 #define DIODE_DIRECTION COL2ROW
@@ -37,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 16
 #define MATRIX_ROW_PINS {D6, D7, E0, C3, C4}
 #define MATRIX_COL_PINS {F2, C5, E5, E4, B7, B6, B5, B4, B3, B2, B1, B0, E1, C0, C1, C2}
-#define UNUSED_PINS {}
 #define RGBLED_NUM 20     // Number of LEDs
 
 //RevB only:
diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h
index 1b8295b152..40d4e8cb79 100644
--- a/keyboards/lfkeyboards/smk65/revf/config.h
+++ b/keyboards/lfkeyboards/smk65/revf/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B3, B2, B1, F5 }
 #define MATRIX_COL_PINS { E6, F4, B7, D5, D3, D2, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h
index f46e052ad6..b8648e64db 100644
--- a/keyboards/linworks/dolice/config.h
+++ b/keyboards/linworks/dolice/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F5, F4, F6, F7, B0, B7, D7, D6, D4 }
 #define MATRIX_COL_PINS { E6, F0, F1, B4, D5, D3, D2, B2 }
-#define UNUSED_PINS { B1, B3, D0, D1, E2 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 9c45f0426b..5fac33e7d5 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { D1, D0, D2, D3, D5  }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index fd1a6554f0..e9e69f3b66 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B1, B2, B3, D3, D1, D0  }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B7, E6}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index 3e2671e7a5..867f66ed1e 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D3, D5, D1, D2, D4, D0, F5, F4, F7, F6, B5, B4 }
 #define MATRIX_COL_PINS { F1, F0, E6, B0, B1, B2, B3, D6, D7 }
-#define UNUSED_PINS { B6, C6, C7 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 0a7a0244e7..54850aec3f 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B1, B2, B3, D3, D1, D0  }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B7, E6}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index b998effd38..d70ff939e3 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7, A0 }
 #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15 }
-#define UNUSED_PINS { C13, C14, C15 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h
index b960708365..aafdddbf9e 100644
--- a/keyboards/littlealby/mute/config.h
+++ b/keyboards/littlealby/mute/config.h
@@ -30,7 +30,6 @@
 #define DIRECT_PINS { \
     {B5} \
 }
-#define UNUSED_PINS
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN B6
diff --git a/keyboards/lizard_trick/tenkey_plusplus/config.h b/keyboards/lizard_trick/tenkey_plusplus/config.h
index ffda3cad5b..3e9e0d37dc 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/config.h
+++ b/keyboards/lizard_trick/tenkey_plusplus/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B7, D4, B5, B6, C6, C7 }
 #define MATRIX_COL_PINS { D5, D3, D2, F7 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A \
     { B4, F0, F4 }
diff --git a/keyboards/ll3macorn/bongopad/config.h b/keyboards/ll3macorn/bongopad/config.h
index 9a9214dd43..9e1affd59e 100644
--- a/keyboards/ll3macorn/bongopad/config.h
+++ b/keyboards/ll3macorn/bongopad/config.h
@@ -19,7 +19,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F7, D7, C6, D4 }
 #define MATRIX_COL_PINS { F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index b11962d822..813fc5b19c 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F1, F5, F6, F7, B3, B2, B1 }
 #define MATRIX_COL_PINS { B4, D7, D6, D4, D5, D3, D2, D1, D0, C6, B6, B5, F4, F0, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lucid/alexa/config.h b/keyboards/lucid/alexa/config.h
index 433c43b5d2..07a73c30fd 100644
--- a/keyboards/lucid/alexa/config.h
+++ b/keyboards/lucid/alexa/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lucid/alexa_solder/config.h b/keyboards/lucid/alexa_solder/config.h
index 6bbd9eb32d..4b04217ef7 100644
--- a/keyboards/lucid/alexa_solder/config.h
+++ b/keyboards/lucid/alexa_solder/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lucid/kbd8x_hs/config.h b/keyboards/lucid/kbd8x_hs/config.h
index e6e587c458..99a8ff4729 100644
--- a/keyboards/lucid/kbd8x_hs/config.h
+++ b/keyboards/lucid/kbd8x_hs/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
 #define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lucid/phantom_hs/config.h b/keyboards/lucid/phantom_hs/config.h
index bf9f1f371e..f5b6189e90 100644
--- a/keyboards/lucid/phantom_hs/config.h
+++ b/keyboards/lucid/phantom_hs/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lucid/phantom_solder/config.h b/keyboards/lucid/phantom_solder/config.h
index 2fdc7ef475..6fdca244b6 100644
--- a/keyboards/lucid/phantom_solder/config.h
+++ b/keyboards/lucid/phantom_solder/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lucid/scarlet/config.h b/keyboards/lucid/scarlet/config.h
index 3435720623..118b32d688 100644
--- a/keyboards/lucid/scarlet/config.h
+++ b/keyboards/lucid/scarlet/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
 #define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lw67/config.h b/keyboards/lw67/config.h
index 0153a72c30..9f8ed50654 100644
--- a/keyboards/lw67/config.h
+++ b/keyboards/lw67/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, B7, D0, D1, D2 }
 #define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, B0, B1 }
-#define UNUSED_PINS
 
 /*ENCODER*/
 #define ENCODERS_PAD_A { F0 }
diff --git a/keyboards/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h
index 2a9c2c3c80..a631992eb8 100644
--- a/keyboards/lyso1/lck75/config.h
+++ b/keyboards/lyso1/lck75/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14  15*/
 #define MATRIX_ROW_PINS { C2, C3, C7, C4, C6, C5 }
 #define MATRIX_COL_PINS { A0, B0, A1, B1, A2, B2, A3, B3, A4, B4, A5, A6, A7, D7, D6, D5 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_B { D1 }
 #define ENCODERS_PAD_A { D0 }
diff --git a/keyboards/lyso1/lefishe/config.h b/keyboards/lyso1/lefishe/config.h
index dff7d1503f..fe324c20e2 100644
--- a/keyboards/lyso1/lefishe/config.h
+++ b/keyboards/lyso1/lefishe/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { F0, F1, D5, C7, C6, B6, B5, B4, D7, D6, D4, D3, D2, D1, D0, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 41dac1ccbd..2bc1c8b599 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
 */
 #define MATRIX_ROW_PINS { D5, D2, D4, D3, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/m10a/config.h b/keyboards/m10a/config.h
index a04f8e4025..8a5b36f4fe 100644
--- a/keyboards/m10a/config.h
+++ b/keyboards/m10a/config.h
@@ -27,7 +27,6 @@
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { B6, F7, F6, D6 }
 #define MATRIX_COL_PINS { F5, F1, F0 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h
index d5f02ebffd..6922ab8a66 100644
--- a/keyboards/machine_industries/m4_a/config.h
+++ b/keyboards/machine_industries/m4_a/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { C7, C6 }
 #define MATRIX_COL_PINS { F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/macro1/config.h b/keyboards/macro1/config.h
index d9ba969b3c..66449ee8cc 100644
--- a/keyboards/macro1/config.h
+++ b/keyboards/macro1/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 }
 #define MATRIX_COL_PINS { D3, D4, D6, D7 }
-#define UNUSED_PINS
 
 /*ENCODER*/
 #define ENCODERS_PAD_A { F0 }
diff --git a/keyboards/macro3/config.h b/keyboards/macro3/config.h
index 9fa5d0ec18..bfd60418a7 100644
--- a/keyboards/macro3/config.h
+++ b/keyboards/macro3/config.h
@@ -19,7 +19,6 @@
 #define ENCODERS_PAD_A { D2, F7 }
 #define ENCODERS_PAD_B { D3, F6 }
 
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index df9edb2f1c..f441a16f7a 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B6 }
 #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5}
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { E6 }
 #define ENCODERS_PAD_B { D1 }
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
index c0a58cd64b..ce4120249c 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 ,B4}
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h
index ebab49e36a..6b49e670ba 100644
--- a/keyboards/manyboard/macro/config.h
+++ b/keyboards/manyboard/macro/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { D4, D5, D6, D7 }
-#define UNUSED_PINS
 
 /*Encoder Pins*/
 #define ENCODERS_PAD_A { C6 }
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 591fae2d3e..40fb44e7a7 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pin-out */
 #define MATRIX_ROW_PINS { F5 }
 #define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 }
-#define UNUSED_PINS
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h
index 531c5996d2..984debea4b 100644
--- a/keyboards/maple_computing/christmas_tree/config.h
+++ b/keyboards/maple_computing/christmas_tree/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D3, F4, D0, F6, F5, D4 }
 #define MATRIX_COL_PINS { D1 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN D2
 
diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h
index 9b88b89e5e..70747bdcaf 100644
--- a/keyboards/maple_computing/ivy/rev1/config.h
+++ b/keyboards/maple_computing/ivy/rev1/config.h
@@ -22,6 +22,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Let's Macro V2 pin-out */
 #define MATRIX_ROW_PINS { F1, B2, D3 }
 #define MATRIX_COL_PINS { F5, B3, D5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h
index d89ca3ddee..e8a2ca39b8 100644
--- a/keyboards/maple_computing/jnao/config.h
+++ b/keyboards/maple_computing/jnao/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { E6, F0, F5, F6, F7 }
 #define MATRIX_COL_PINS { F1, F4, B1, B2, B3, B7, D1, D2, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN D0
 
diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
index debc28fab3..baceaa43f7 100644
--- a/keyboards/maple_computing/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Let's Macro V2 pin-out */
 #define MATRIX_ROW_PINS { C6, B1, B3, D7 }
 #define MATRIX_COL_PINS { D2, F7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index 43e0266502..b9e6da535d 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Let's Split EH? pin-out */
 #define MATRIX_ROW_PINS { B1, B3, D7, B4 }
 #define MATRIX_COL_PINS { F4, F5, C6, B6, B5, D5 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index 61027372b9..f7ccfab276 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C7 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index 93fd345776..0e23869558 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B2, F7, F6, B3, B1, D4, D0 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 4448e51268..dcb27a0a3e 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index 90db1a7895..d1afa59beb 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B2, F7, F6, B3, B1, F4, F5 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index 3f21ad59c5..b844b874dd 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, B2, B4, D7, D6, D4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index 0945f92e95..0666e18cad 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 7b18e4d898..b6d8269d88 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h
index 2ab9c26d2c..127b07d223 100644
--- a/keyboards/massdrop/alt/config.h
+++ b/keyboards/massdrop/alt/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { A00, A01, A02, A03, A04 }
 #define MATRIX_COL_PINS { B04, B05, B06, B07, B08, B09, B10, B11, B12, B13, A05, A06, A07, A10, A11 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h
index 15abcaa674..27f3d935a9 100644
--- a/keyboards/massdrop/ctrl/config.h
+++ b/keyboards/massdrop/ctrl/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B04, B05, B06, B07, B08, B09, A10, A11, B10, B11, B12 }
 #define MATRIX_COL_PINS { A00, A01, A02, A03, A04, A05, A06, A07 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/masterworks/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h
index 0821b1dfce..9d9c02effe 100644
--- a/keyboards/masterworks/classy_tkl/rev_a/config.h
+++ b/keyboards/masterworks/classy_tkl/rev_a/config.h
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { C7, F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS \
     { B4, D7, D6, D4, C6, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0, E6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/matchstickworks/southpad/config.h b/keyboards/matchstickworks/southpad/config.h
index 6ccf439740..3e11e34467 100644
--- a/keyboards/matchstickworks/southpad/config.h
+++ b/keyboards/matchstickworks/southpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B3, B5, B6, B7, C7, C6 }
 #define MATRIX_COL_PINS { B0, B1, B2, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h
index 218e3b53a4..29241f1ff6 100644
--- a/keyboards/matrix/abelx/config.h
+++ b/keyboards/matrix/abelx/config.h
@@ -78,7 +78,6 @@
 #define COL15_MASK 0x04
 #define COL16_MASK 0x02
 
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE    5
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index e564576459..830d3d8286 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -28,7 +28,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, C7, C6, D5, D2, D4, D7, B7, D1 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6, B5, B6, B3, B2, B1, D0, B4, D6}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index ff3287d735..d25668115c 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -24,7 +24,6 @@
 #define MATRIX_ROW_PINS { F1, B7, F7, F5, F4}
 #define MATRIX_COL_PINS { F6, B3, B2, B1, B0, C7, C6, B6, B5, B4, D7, D6, D4}
 
-#define UNUSED_PINS
 #define DIODE_DIRECTION ROW2COL
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 5f68217319..6a4b003fbf 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -13,7 +13,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, F0, B7, C7, D3, B0, D1 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6, F7, B6, B5, B4, D7, D0, D2, D6, D4, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index df053270d8..cf63bb1bda 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -68,7 +68,6 @@
     DEF_PIN(TCA6424_PORT0, 2), \
     DEF_PIN(TCA6424_PORT0, 1) }
 
-#define UNUSED_PINS
 
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index e9230d11e8..85ec6a04c7 100644
--- a/keyboards/matrix/me/config.h
+++ b/keyboards/matrix/me/config.h
@@ -22,7 +22,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS {D3, D5, D4, D6, B5, B4}
 #define MATRIX_COL_PINS {B7, B3, B2, B1, B0, F0, F1, F4, F5, F6, F7, C7, C6, B6, D7}
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 28bcf4ee6e..83c1942a5f 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -13,7 +13,6 @@
 
 #define MATRIX_ROW_PINS {  B0,  A1, C14, C13,  A0}
 #define MATRIX_COL_PINS { C15, B10,  B7,  B6,  B5,  B4, A15, A10,  A9,  A8, B15, B14, B13, B12,  B2}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE    5
diff --git a/keyboards/matthewdias/m3n3van/config.h b/keyboards/matthewdias/m3n3van/config.h
index 2d0d1ffc4c..d389f197ae 100644
--- a/keyboards/matthewdias/m3n3van/config.h
+++ b/keyboards/matthewdias/m3n3van/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F4, F5, F6, F1, F7, F0, E6, D3, D0, D1, D2, D4, D6 }
 #define ENCODERS_PAD_A { B4 }
 #define ENCODERS_PAD_B { D7 }
-#define UNUSED_PINS { B0, B1, B2, B3, B7, D5 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/matthewdias/minim/config.h b/keyboards/matthewdias/minim/config.h
index db837e3990..0e3347c5a9 100644
--- a/keyboards/matthewdias/minim/config.h
+++ b/keyboards/matthewdias/minim/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* minim PCB default pin-out */
 #define MATRIX_ROW_PINS { D6, D7, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F1, F7, F0, B0, D1, B1, D2, B2, D3, D5, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/matthewdias/txuu/config.h b/keyboards/matthewdias/txuu/config.h
index 1bc4f33d6d..854fb5e114 100644
--- a/keyboards/matthewdias/txuu/config.h
+++ b/keyboards/matthewdias/txuu/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* m3n3van PCB default pin-out */
 #define MATRIX_ROW_PINS { B1, B0, F7, F4, F1 }
 #define MATRIX_COL_PINS { F0, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS {  }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maxipad/promicro/config.h b/keyboards/maxipad/promicro/config.h
index 008e7929cb..f72fd89c6e 100644
--- a/keyboards/maxipad/promicro/config.h
+++ b/keyboards/maxipad/promicro/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
 #define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maxipad/teensy2/config.h b/keyboards/maxipad/teensy2/config.h
index 4e43920d5a..32521bc6a4 100644
--- a/keyboards/maxipad/teensy2/config.h
+++ b/keyboards/maxipad/teensy2/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
 #define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index fbabd8b2bb..697fe10621 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -26,7 +26,6 @@
 /* Matrix pins */
 #define MATRIX_ROW_PINS { B4, E6 }
 #define MATRIX_COL_PINS { B7, B3, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mb44/config.h b/keyboards/mb44/config.h
index ce71f485d0..da822ddfe9 100644
--- a/keyboards/mb44/config.h
+++ b/keyboards/mb44/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, D6, D5, D4 }
 #define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, B1, B0 }
-#define UNUSED_PINS { C2 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mc_76k/config.h b/keyboards/mc_76k/config.h
index 7a783ce327..428405d6d2 100644
--- a/keyboards/mc_76k/config.h
+++ b/keyboards/mc_76k/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C7, C6, B6, B0, D1, D0 }
 #define MATRIX_COL_PINS { D5, D3, D4, B1, D6, D7, B4, B5, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechanickeys/miniashen40/config.h b/keyboards/mechanickeys/miniashen40/config.h
index c3a097bf77..1510dc9870 100644
--- a/keyboards/mechanickeys/miniashen40/config.h
+++ b/keyboards/mechanickeys/miniashen40/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h
index bbf8bc2f71..e21f4c4870 100644
--- a/keyboards/mechanickeys/undead60m/config.h
+++ b/keyboards/mechanickeys/undead60m/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechbrewery/mb65h/config.h b/keyboards/mechbrewery/mb65h/config.h
index 3715e66c98..79fc4bdde5 100644
--- a/keyboards/mechbrewery/mb65h/config.h
+++ b/keyboards/mechbrewery/mb65h/config.h
@@ -25,7 +25,6 @@
 
 #define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h
index c3c90f53e6..57ae42b415 100644
--- a/keyboards/mechbrewery/mb65s/config.h
+++ b/keyboards/mechbrewery/mb65s/config.h
@@ -25,7 +25,6 @@
 
 #define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index a27841231a..8ef708931f 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index a6435fa4f5..286c06f482 100755
--- a/keyboards/mechkeys/alu84/config.h
+++ b/keyboards/mechkeys/alu84/config.h
@@ -34,7 +34,6 @@
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index 2d7fec72e2..48f3c3f95d 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 }
 #define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
index 507c89a520..9c7b74f4ef 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -26,7 +26,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B1, B0, D5, B7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 03fc30bc2d..ff1b4367e4 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index c0cae1600b..fa8b213cc7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -5,7 +5,6 @@
 
 #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
 #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-#define UNUSED_PINS
 
 #define RGB_DI_PIN A7
 #define DRIVER_LED_TOTAL 91
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index 4377405fc6..2fe1e63632 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
 #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index 9093d262e4..b7696c5a07 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index cc2ac81bc5..cca6cdfad3 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 }
 #define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h
index 014209cefd..89538b47c7 100644
--- a/keyboards/mechlovin/hex4b/rev1/config.h
+++ b/keyboards/mechlovin/hex4b/rev1/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 }
 #define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
-#define UNUSED_PINS
 
 #define LED_NUM_LOCK_PIN D6
 #define LED_CAPS_LOCK_PIN D7
diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h
index af956f3ec0..cf5aced043 100644
--- a/keyboards/mechlovin/hex4b/rev2/config.h
+++ b/keyboards/mechlovin/hex4b/rev2/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 }
-#define UNUSED_PINS
 
 #define LED_NUM_LOCK_PIN C15
 #define LED_CAPS_LOCK_PIN B9
diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
index d76d271047..c3125f217f 100644
--- a/keyboards/mechlovin/hex6c/config.h
+++ b/keyboards/mechlovin/hex6c/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
 #define MATRIX_COL_PINS { A13, A14, A1, A0, C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index 575e826a9b..ab329db96e 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -31,7 +31,6 @@
  *
 */
 #define MATRIX_ROW_PINS { D5, D2, D4, D3, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
index 0f81a71f96..4f02ed39c9 100644
--- a/keyboards/mechlovin/infinity875/config.h
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #define MATRIX_ROW_PINS { D5, D2, D4, D3, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h
index b0e3d3bd4b..5228f40751 100644
--- a/keyboards/mechlovin/jay60/config.h
+++ b/keyboards/mechlovin/jay60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C2, C1, C0, D7, A1 }
 #define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, C3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h
index 880d87a4ac..d9028d0740 100644
--- a/keyboards/mechlovin/kanu/config.h
+++ b/keyboards/mechlovin/kanu/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 }
 #define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index 7896a6edf4..2cae8a3b67 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, D3, D2, B1, B5}
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B2, B3, B7, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
index 52b1e77f6a..00ecb21470 100644
--- a/keyboards/mechlovin/olly/bb/config.h
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #define MATRIX_ROW_PINS {D6, A5, A4, A3, A6}
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index d9d839b3b8..4dc4785332 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #define MATRIX_ROW_PINS { D5, D6, A5, A4, A3, A6}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index 965c34bbd0..4b497875da 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #define MATRIX_ROW_PINS { D5, D2, D4, D3, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h
index 423af0bc14..46c370ae2e 100644
--- a/keyboards/mechlovin/th1800/config.h
+++ b/keyboards/mechlovin/th1800/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B7, D0, D1, D5, D6 }
 #define MATRIX_COL_PINS { A3, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, B3, B2, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h
index 7d096d3e96..af78e10b7c 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B10, B2, B1, B0, A2 }
 #define MATRIX_COL_PINS { A10, A3, A9, A8, B15, B14, B13, B12, B5, B4, B3, A15, B7, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechstudio/dawn/config.h b/keyboards/mechstudio/dawn/config.h
index 362e2297b2..1b5124d7ea 100644
--- a/keyboards/mechstudio/dawn/config.h
+++ b/keyboards/mechstudio/dawn/config.h
@@ -26,7 +26,6 @@
 
 #define MATRIX_ROW_PINS {B1,B2,B3,D1,D6,D4}
 #define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D5,D3,D2}
-#define UNUSED_PINS {B0,B7,D0,E6}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h
index e83484b2da..ad964a72f5 100644
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ b/keyboards/mechstudio/ud_40_ortho/config.h
@@ -26,7 +26,6 @@
 
 #define MATRIX_ROW_PINS {C2,B4,B5,B6}
 #define MATRIX_COL_PINS {C5,D0,B3,B2,B1,B0,D6,D5,D4,D3,D2,D1}
-#define UNUSED_PINS {C4,C6,C7}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h
index c7b1880fa0..8798c484f1 100644
--- a/keyboards/mechwild/bbs/config.h
+++ b/keyboards/mechwild/bbs/config.h
@@ -28,7 +28,6 @@
  */
 #define MATRIX_ROW_PINS { B12, B10, B13, B1, B14 }
 #define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechwild/bde/lefty/config.h b/keyboards/mechwild/bde/lefty/config.h
index 082295ef7c..50101cbfc5 100644
--- a/keyboards/mechwild/bde/lefty/config.h
+++ b/keyboards/mechwild/bde/lefty/config.h
@@ -33,7 +33,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D7, D3}
 #define MATRIX_COL_PINS { F7, B1, B6, B2, B3, F6, F5, F4, D0, D4, C6, E6, B5, B4}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h
index 0f290ecc33..ab5110c19b 100644
--- a/keyboards/mechwild/bde/rev2/config.h
+++ b/keyboards/mechwild/bde/rev2/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Key matrix pins */
 #define MATRIX_ROW_PINS { C6, D7, B4, D4, E6, B2 }
 #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B5 }
-#define UNUSED_PINS
 
 /* Encoder pins */
 #define ENCODERS_PAD_A { D3 }
diff --git a/keyboards/mechwild/bde/righty/config.h b/keyboards/mechwild/bde/righty/config.h
index 1764520b13..3cae15b107 100644
--- a/keyboards/mechwild/bde/righty/config.h
+++ b/keyboards/mechwild/bde/righty/config.h
@@ -33,7 +33,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D7, D3}
 #define MATRIX_COL_PINS { B4, B5, E6, C6, D4, D0, F4, F5, F6, B6, B3, B2, B1, F7}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h
index 64dee1bf31..5a8fbe1ec5 100755
--- a/keyboards/mechwild/mercutio/config.h
+++ b/keyboards/mechwild/mercutio/config.h
@@ -26,7 +26,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D4, C3, C0, C1, C2}
 #define MATRIX_COL_PINS { B0, D7, D6, D5, B1, B2, B3}
-#define UNUSED_PINS
 
 /* encoder pins */
 #define ENCODERS_PAD_A { B4 }
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index 599d0543e4..3742bd1958 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -12,7 +12,6 @@
 /* Key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* Encoder pins */
 #define ENCODERS_PAD_A { D2 }
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index 9726f7bf99..21a6f314c3 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -12,7 +12,6 @@
 /* Key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* Encoder pins */
 #define ENCODERS_PAD_A { D2 }
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index 428d6391d0..b52810b424 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Key matrix pins */
 #define MATRIX_ROW_PINS { F5, B2, B3, B1, F7, F6 }
 #define MATRIX_COL_PINS { B5, D7, C6, D4, B6 }
-#define UNUSED_PINS
 
 /* Encoder pins */
 #define ENCODERS_PAD_A { E6, D2 }
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 23d8c94318..1fef5fe001 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, A15, B3 }
 #define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-#define UNUSED_PINS
 
 /* encoder pins */
 #define ENCODERS_PAD_A { B5 }
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index cba318d575..df73f51946 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B8, B4, B3, B9, A15, B12, B13, B14, B15, A8 }
 #define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4 }
-#define UNUSED_PINS
 
 /* encoder pins */
 #define ENCODERS_PAD_A { A3 }
diff --git a/keyboards/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h
index 868832d808..7d941ba1e3 100755
--- a/keyboards/melgeek/mach80/rev1/config.h
+++ b/keyboards/melgeek/mach80/rev1/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, E6 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h
index 3ac1b87ab5..b08ec05100 100755
--- a/keyboards/melgeek/mach80/rev2/config.h
+++ b/keyboards/melgeek/mach80/rev2/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, E6 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h
index 9d73a4fe96..bba46db2dd 100644
--- a/keyboards/melgeek/mj61/rev1/config.h
+++ b/keyboards/melgeek/mj61/rev1/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h
index 616426df65..e17f291934 100644
--- a/keyboards/melgeek/mj61/rev2/config.h
+++ b/keyboards/melgeek/mj61/rev2/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj63/rev1/config.h b/keyboards/melgeek/mj63/rev1/config.h
index 75f7da43a6..ef8c7872d6 100644
--- a/keyboards/melgeek/mj63/rev1/config.h
+++ b/keyboards/melgeek/mj63/rev1/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj63/rev2/config.h b/keyboards/melgeek/mj63/rev2/config.h
index 616426df65..e17f291934 100644
--- a/keyboards/melgeek/mj63/rev2/config.h
+++ b/keyboards/melgeek/mj63/rev2/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj64/rev1/config.h b/keyboards/melgeek/mj64/rev1/config.h
index fbe170f18e..713c051a09 100644
--- a/keyboards/melgeek/mj64/rev1/config.h
+++ b/keyboards/melgeek/mj64/rev1/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj64/rev2/config.h b/keyboards/melgeek/mj64/rev2/config.h
index fbe170f18e..713c051a09 100644
--- a/keyboards/melgeek/mj64/rev2/config.h
+++ b/keyboards/melgeek/mj64/rev2/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj64/rev3/config.h b/keyboards/melgeek/mj64/rev3/config.h
index dfde77f24a..ff467af7d6 100644
--- a/keyboards/melgeek/mj64/rev3/config.h
+++ b/keyboards/melgeek/mj64/rev3/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj65/rev3/config.h b/keyboards/melgeek/mj65/rev3/config.h
index d9a8c5a815..5274508744 100644
--- a/keyboards/melgeek/mj65/rev3/config.h
+++ b/keyboards/melgeek/mj65/rev3/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
 #define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1, B14 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index 8ea2b72030..3c07db143b 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B6, B5, B4, D7, D6, D4, D5, F7, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h
index 74a7e3dc26..de50fb8b1e 100755
--- a/keyboards/melgeek/mojo68/rev1/config.h
+++ b/keyboards/melgeek/mojo68/rev1/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { B0 ,B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h
index eaac850b6d..f51798a308 100644
--- a/keyboards/melgeek/mojo75/rev1/config.h
+++ b/keyboards/melgeek/mojo75/rev1/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { B11, B10, B1, B0, A7, A6 }
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/tegic/rev1/config.h b/keyboards/melgeek/tegic/rev1/config.h
index d847fd2364..49d4550be9 100755
--- a/keyboards/melgeek/tegic/rev1/config.h
+++ b/keyboards/melgeek/tegic/rev1/config.h
@@ -29,7 +29,6 @@
 
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/melgeek/z70ultra/rev1/config.h b/keyboards/melgeek/z70ultra/rev1/config.h
index 4593051758..022e318da1 100644
--- a/keyboards/melgeek/z70ultra/rev1/config.h
+++ b/keyboards/melgeek/z70ultra/rev1/config.h
@@ -33,5 +33,4 @@
 
 #define MATRIX_ROW_PINS { B12, B13, B14, B15, A3, B9 }
 #define MATRIX_COL_PINS { B11, B10, B1, A10, B5, B4, B3, A15, A2, A1, A0, C15, C14, C13 }
-#define UNUSED_PINS
 
diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h
index 6346e855c0..83353f9ba0 100644
--- a/keyboards/meme/config.h
+++ b/keyboards/meme/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C2, D0, D1, D4, D5, D6, B0, B1, B2, B3  }
 #define MATRIX_COL_PINS { D3, D2, B5, B6, C7, C6, C5, C4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h
index 22d4ed54df..ecdf7311a4 100644
--- a/keyboards/meow65/config.h
+++ b/keyboards/meow65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, B6, B5, B7, F7 }
 #define MATRIX_COL_PINS { F5, F6, B0, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h
index 94a53e6946..f5a82d2df8 100644
--- a/keyboards/merge/iso_macro/config.h
+++ b/keyboards/merge/iso_macro/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { F4, F5, F6}
 #define MATRIX_COL_PINS { B4, B5, B6}
-#define UNUSED_PINS
 #define BACKLIGHT_PIN B7
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 1679d589f8..3d89ba0a57 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -22,7 +22,6 @@
 
 #define MATRIX_ROW_PINS { B1, B2 }
 #define MATRIX_COL_PINS { B3, B4 }
-#define UNUSED_PINS
 
 #define RGB_DI_PIN B5
 #define RGBLED_NUM 12
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 1556626e52..b22bd3fb10 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -21,7 +21,6 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 9e39647343..d76eee087a 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -21,7 +21,6 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
index 72e9eaf6b8..99343cc152 100644
--- a/keyboards/merge/uma/config.h
+++ b/keyboards/merge/uma/config.h
@@ -21,7 +21,6 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN C6
 
diff --git a/keyboards/mesa/mesa_tkl/config.h b/keyboards/mesa/mesa_tkl/config.h
index eaf740d69c..8d322d52e7 100644
--- a/keyboards/mesa/mesa_tkl/config.h
+++ b/keyboards/mesa/mesa_tkl/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D1, D0, B0, C6, C7 }
 #define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0, B1, B2, B3 }
-#define UNUSED_PINS     { B7, E6 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index c7c0a3e43e..0206db4674 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F7, C6, F6, F5 }
 #define MATRIX_COL_PINS { D4, D7, E6, B3, B2, B6, F4 }
-// #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/metamechs/timberwolf/config.h b/keyboards/metamechs/timberwolf/config.h
index 76a9086723..46d62e795d 100644
--- a/keyboards/metamechs/timberwolf/config.h
+++ b/keyboards/metamechs/timberwolf/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_COL_PINS { B2, D1, D2, C7, F5, F6, F7, F0, E6 }
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4, D5, D3, F4, F1, B1, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mexsistor/ludmila/config.h b/keyboards/mexsistor/ludmila/config.h
index 19c7e5a8de..324a1c4baa 100644
--- a/keyboards/mexsistor/ludmila/config.h
+++ b/keyboards/mexsistor/ludmila/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, C7, F7 }
 #define MATRIX_COL_PINS { F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mikeneko65/config.h b/keyboards/mikeneko65/config.h
index d5faaba618..f8be58b6d9 100644
--- a/keyboards/mikeneko65/config.h
+++ b/keyboards/mikeneko65/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, C7 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h
index 2420230247..0e784fe527 100644
--- a/keyboards/miller/gm862/config.h
+++ b/keyboards/miller/gm862/config.h
@@ -17,7 +17,6 @@
  */
 #define MATRIX_ROW_PINS {F0, F1, F4, F5, B4}
 #define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6, B0, B1, B2, B3, B7, D2, D3, D5 }
-#define UNUSED_PINS
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/millipad/config.h b/keyboards/millipad/config.h
index 82fdeb3953..7c0aa209c1 100644
--- a/keyboards/millipad/config.h
+++ b/keyboards/millipad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mini_elixivy/config.h b/keyboards/mini_elixivy/config.h
index 5955d4b5cb..529414f2c2 100644
--- a/keyboards/mini_elixivy/config.h
+++ b/keyboards/mini_elixivy/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F7, F5, F4, F1, F0, B7, D0, D1, D2, D3, D4, D6, D7, B4, C6 }
 #define ENCODERS_PAD_A { B0 }
 #define ENCODERS_PAD_B { D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mini_ten_key_plus/config.h b/keyboards/mini_ten_key_plus/config.h
index 893a8a6a60..cb70a7d790 100644
--- a/keyboards/mini_ten_key_plus/config.h
+++ b/keyboards/mini_ten_key_plus/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F5, F4, B6, D7, C6 }
 #define ENCODERS_PAD_A { F7 }
 #define ENCODERS_PAD_B { F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index 43d3066f9e..99ebf5b9af 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F6, F7, C7, D5, D3 }, \
     { B5, C6, B6, NO_PIN, NO_PIN } \
 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 ////#define DIODE_DIRECTION
diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h
index e839fea224..2dcc91f7ce 100644
--- a/keyboards/minimacro5/config.h
+++ b/keyboards/minimacro5/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //speed for double tap
 #define TAPPING_TERM 200
 
-#define UNUSED_PINS
 
 /* rotary encoder 1,2,3 closest to usb port is 0*/
 #define ENCODERS_PAD_B { D3, F6, F7, D4, C6}
diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h
index fc02185545..7c5612873f 100644
--- a/keyboards/minimon/index_tab/config.h
+++ b/keyboards/minimon/index_tab/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, B7, B3, B2, B1, B0 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D2, F1, F0 }
-#define UNUSED_PINS { F4, F5, F6, D1, D0 }
 
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/mino/hotswap/config.h b/keyboards/mino/hotswap/config.h
index 62583e7156..39042bfcff 100644
--- a/keyboards/mino/hotswap/config.h
+++ b/keyboards/mino/hotswap/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, C6, D4, D2}
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index 2b5b831456..fa13775f24 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { D4, B3, B1, F7, B2, B6, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
index 8581a545d3..438ed237e7 100644
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ b/keyboards/misonoworks/chocolatebar/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B7, D2, D3 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index e77f0fcff5..9460bff0be 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // pins
 #define MATRIX_ROW_PINS { D2, D3, D5, F0 }
 #define MATRIX_COL_PINS { B3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6}
-#define UNUSED_PINS
 
 // diode mode
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h
index 4d6964dafb..19e55934e6 100644
--- a/keyboards/miuni32/config.h
+++ b/keyboards/miuni32/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F4, D7}
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F1, E6, B7, B3, B2, B1, B0}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
index dcca34c95e..4b718f129c 100644
--- a/keyboards/mlego/m48/rev1/config.h
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -56,6 +56,5 @@
 
 #endif
 
-#define UNUSED_PINS
 // you want to comment this if using stm32-dfu as bootloader
 #define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index 437e605149..638a698536 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -56,6 +56,5 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
-#define UNUSED_PINS
 // you want to comment this if using stm32-dfu as bootloader
 #define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index 0bbb56aee0..573ec72288 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -83,6 +83,5 @@
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 0
 #endif
 
-#define UNUSED_PINS
 // you want to comment this if using stm32-dfu as bootloader
 #define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
index c5b011c437..1f1435a237 100644
--- a/keyboards/mlego/m60_split/rev2/config.h
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -81,4 +81,3 @@
 #define BOOTMAGIC_LITE_ROW_RIGHT 5
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 0
 
-#define UNUSED_PINS
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index 0e40ae2e3d..988b3cf31f 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B15
 
-#define UNUSED_PINS
 #define RGBLIGHT_LAYERS
 
 #define ENCODER_RESOLUTION 4
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index db13bbb2ad..55c4f0d2f4 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B15
 
-#define UNUSED_PINS
 #define RGBLIGHT_LAYERS
 
 #define ENCODER_RESOLUTION 4
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index a4b1ba3343..1ebf730601 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -59,6 +59,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #endif
 
-#define UNUSED_PINS
 // you want to comment this if using stm32-dfu as bootloader
 #define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index 07dd0fefaa..606a6bb85c 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -68,6 +68,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define OLED_FONT_H "keyboards/mlego/m65/lib/glcdfont.c"
 #endif
 
-#define UNUSED_PINS
 // you want to comment this if using stm32-dfu as bootloader
 #define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h
index 45d47bad68..ada82728d3 100644
--- a/keyboards/mntre/config.h
+++ b/keyboards/mntre/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4 }
 #define MATRIX_COL_PINS { D5, F7, E6, C7, B3, B2, B1, B0, F0, F1, F4, F5, F6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h
index a0d39774e6..c31a29003e 100644
--- a/keyboards/mode/m80v1/config.h
+++ b/keyboards/mode/m80v1/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { A10, A15, B3, B9, A3, A4 }
 #define MATRIX_COL_PINS { B8, B7, B6, B5, B4, A2, A1, A0, F1, F0, C15, C14, C13, A7, A6, A5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/ginkgo65/config.h b/keyboards/mokey/ginkgo65/config.h
index 5b09351e32..6605744221 100644
--- a/keyboards/mokey/ginkgo65/config.h
+++ b/keyboards/mokey/ginkgo65/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        /*  1  2   3   4   5   6   7   8   9   10  11  12  13  14  15  16 */
 #define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
 #define MATRIX_COL_PINS { C7, F6, B2, F4, B3, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PIN B6
diff --git a/keyboards/mokey/ginkgo65hot/config.h b/keyboards/mokey/ginkgo65hot/config.h
index 63d633d661..423d844765 100644
--- a/keyboards/mokey/ginkgo65hot/config.h
+++ b/keyboards/mokey/ginkgo65hot/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
 #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PIN B6
diff --git a/keyboards/mokey/mokey63/config.h b/keyboards/mokey/mokey63/config.h
index 86ff35ad5c..a8917c31f9 100644
--- a/keyboards/mokey/mokey63/config.h
+++ b/keyboards/mokey/mokey63/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B5, B6, B2, B3, B1 }
 #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/mokey64/config.h b/keyboards/mokey/mokey64/config.h
index 60a0b69d38..685d26af00 100644
--- a/keyboards/mokey/mokey64/config.h
+++ b/keyboards/mokey/mokey64/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
 #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/xox70/config.h b/keyboards/mokey/xox70/config.h
index 3c1448ee75..a0696aad05 100644
--- a/keyboards/mokey/xox70/config.h
+++ b/keyboards/mokey/xox70/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
 #define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/mokey/xox70hot/config.h b/keyboards/mokey/xox70hot/config.h
index 3c1448ee75..a0696aad05 100644
--- a/keyboards/mokey/xox70hot/config.h
+++ b/keyboards/mokey/xox70hot/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
 #define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h
index 5327b0bd52..8f7396dfc8 100755
--- a/keyboards/molecule/config.h
+++ b/keyboards/molecule/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, B6 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index 441c5f4305..e480581220 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/monoflex60/config.h b/keyboards/monoflex60/config.h
index b8b1b810e3..2663b4ffb3 100644
--- a/keyboards/monoflex60/config.h
+++ b/keyboards/monoflex60/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, D3, D2, D5 }
 #define MATRIX_COL_PINS { B7, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index 9dab7c7dda..4117f243ac 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -25,7 +25,6 @@
 #define BACKLIGHT_PIN F5
 #define MATRIX_ROW_PINS { E6,E7, E3, B0, B1 ,A2}
 #define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D7
 #define DRIVER_LED_TOTAL 110
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index 460538600f..8b3af96024 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -35,7 +35,6 @@
 #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 }
 #define LED_DRIVER_LED_COUNT 93
 
-#define UNUSED_PINS
 #define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D7
 #define DRIVER_LED_TOTAL 21
diff --git a/keyboards/montsinger/rebound/rev1/config.h b/keyboards/montsinger/rebound/rev1/config.h
index b7481c789f..446d6db71d 100644
--- a/keyboards/montsinger/rebound/rev1/config.h
+++ b/keyboards/montsinger/rebound/rev1/config.h
@@ -35,7 +35,6 @@ diode)
 
 #define MATRIX_ROW_PINS { D1, B5, B2, B6 }
 #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS {  D2, D3 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/montsinger/rebound/rev2/config.h b/keyboards/montsinger/rebound/rev2/config.h
index e71e12c97c..0cdb9f8d61 100644
--- a/keyboards/montsinger/rebound/rev2/config.h
+++ b/keyboards/montsinger/rebound/rev2/config.h
@@ -35,7 +35,6 @@ diode)
 
 #define MATRIX_ROW_PINS { D1, B5, B2, B6, B0 }
 #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS { }
 
 #define ENCODERS_PAD_A { D2 }
 #define ENCODERS_PAD_B { D3 }
diff --git a/keyboards/montsinger/rebound/rev3/config.h b/keyboards/montsinger/rebound/rev3/config.h
index 2a5cde0343..25dee80ff3 100644
--- a/keyboards/montsinger/rebound/rev3/config.h
+++ b/keyboards/montsinger/rebound/rev3/config.h
@@ -35,7 +35,6 @@ diode)
 
 #define MATRIX_ROW_PINS { F4, F5, D1, D0, B0 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 }
-#define UNUSED_PINS { }
 
 #define ENCODERS_PAD_A { D3 }
 #define ENCODERS_PAD_B { D2 }
diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h
index 06bdd561b9..6b03a19288 100644
--- a/keyboards/montsinger/rebound/rev4/config.h
+++ b/keyboards/montsinger/rebound/rev4/config.h
@@ -35,7 +35,6 @@ diode)
 
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5, B2, B3, B1 }
-#define UNUSED_PINS { B6 }
 
 #define ENCODERS_PAD_A { D2 }
 #define ENCODERS_PAD_B { D3 }
diff --git a/keyboards/montsinger/rewind/config.h b/keyboards/montsinger/rewind/config.h
index 3e7577f7c9..bc83168ae6 100644
--- a/keyboards/montsinger/rewind/config.h
+++ b/keyboards/montsinger/rewind/config.h
@@ -35,7 +35,6 @@ diode)
 
 #define MATRIX_ROW_PINS { B5, B4, D2, D3, B2 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, E6, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS { F4, F5, B6 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h
index 98d53259d4..732864d2ef 100644
--- a/keyboards/morizon/config.h
+++ b/keyboards/morizon/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS { F4 }
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/mountainblocks/mb17/config.h b/keyboards/mountainblocks/mb17/config.h
index 820c371693..bd397ee541 100644
--- a/keyboards/mountainblocks/mb17/config.h
+++ b/keyboards/mountainblocks/mb17/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { F7, E6, D7, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json
index 734b1443bc..4eaf4b0a75 100644
--- a/keyboards/ms_sculpt/info.json
+++ b/keyboards/ms_sculpt/info.json
@@ -15,7 +15,6 @@
     "matrix_pins": {
         "rows": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
         "cols": ["A2","B8","A0","C15","C14","A14","A13","B7","B6","B5","B4","B3","A15","A10","A8","B15","B14","B12"],
-        "unused": ["B13", "A1", "B9"],
         "ghost": true,
         "io_delay": 5
     },
diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h
index bc7dfcadcd..223b0fe0a1 100644
--- a/keyboards/mt/blocked65/config.h
+++ b/keyboards/mt/blocked65/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h
index 5dfa0a10a1..7045dac8aa 100644
--- a/keyboards/mt/mt40/config.h
+++ b/keyboards/mt/mt40/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-/* #define UNUSED_PINS */
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index 92c7ad8166..8124a6a4a1 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 }
 #define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index 6b67d84b60..ac510f1967 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { D7, D6, D5, D3, D2, D4 }
 #define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index 567e06d1ac..c4b89fa7f7 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index 09fec112d1..eeb9bef6ff 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pinout */
 #define MATRIX_ROW_PINS { D6, D7, B4, B5, D5 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, B7, B6, F7, C6, C7, F6, F4, F1, F0, F5, E6 }
-#define UNUSED_PINS
 
 /* diode direction: COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
index 3187166bcc..88d6b4097b 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pinout */
 #define MATRIX_ROW_PINS { D0, D1, F4, F1, D2 }
 #define MATRIX_COL_PINS { E6, F0, F5, F6, F7, D5, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* diode direction: COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h
index 2851ae884b..742e5398d3 100644
--- a/keyboards/murcielago/rev1/config.h
+++ b/keyboards/murcielago/rev1/config.h
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A_RIGHT { F6 }
 #define ENCODERS_PAD_B_RIGHT { F7 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h
index 1ef9a5fc0f..698fd4c6a9 100644
--- a/keyboards/mxss/config.h
+++ b/keyboards/mxss/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* matrix pin configuration */
 #define MATRIX_ROW_PINS { F4, F1, F7, B1, B7 }
 #define MATRIX_COL_PINS { D7, D6, D4, D0, C6, B6, D1, B5, D2, B4, D3, D5, B0, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mysticworks/wyvern/config.h b/keyboards/mysticworks/wyvern/config.h
index 864be372c4..859eece683 100644
--- a/keyboards/mysticworks/wyvern/config.h
+++ b/keyboards/mysticworks/wyvern/config.h
@@ -25,7 +25,6 @@
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS {D0,D1,D5,D3,F7,F6,F5,F4,F1,F0}
 #define MATRIX_COL_PINS {E6,B0,D4,D6,D7,B4,B5,B6,C6,C7}
-#define UNUSED_PINS {B7,D2}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h
index 0637a9a3d3..464939080c 100644
--- a/keyboards/nacly/ua62/config.h
+++ b/keyboards/nacly/ua62/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ncc1701kb/config.h b/keyboards/ncc1701kb/config.h
index 09a54276cb..7b57d26f86 100644
--- a/keyboards/ncc1701kb/config.h
+++ b/keyboards/ncc1701kb/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* NCC-1701-KB PCB default pin-out */
 #define MATRIX_ROW_PINS { D4, D6, D7 }
 #define MATRIX_COL_PINS { B4, B5, B6 }
-#define UNUSED_PINS
 
 /* BackLight */
 #define BACKLIGHT_PIN B7
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index 1ad5401f30..01f2545de9 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -25,7 +25,6 @@
 #define ENCODERS_PAD_A { B7 }
 #define ENCODERS_PAD_B { B0 }
 #define ENCODER_RESOLUTION 4
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN B6
 #define BACKLIGHT_ON_STATE  0
diff --git a/keyboards/neopad/rev1/config.h b/keyboards/neopad/rev1/config.h
index 92d3392715..aa85ce1975 100755
--- a/keyboards/neopad/rev1/config.h
+++ b/keyboards/neopad/rev1/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 3
 #define MATRIX_ROW_PINS { F4, F5 }
 #define MATRIX_COL_PINS { B3, B2, B6 }
-#define UNUSED_PINS
 
 /* Dual rotary encoders */
 #define ENCODERS_PAD_A { D1, D4 }
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index f1f26cdbc1..a7f50b184f 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -32,7 +32,6 @@
 #define MATRIX_COLS 16
 #define MATRIX_ROW_PINS { E6, B7, F6, F1, F0}
 #define MATRIX_COL_PINS { F7, B0, B3, B1, B2, F4, C7, C6, B6, B5, B4, D7, D3, D2, D6, D4}
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index d8c3945f50..7d27825eaf 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -25,7 +25,6 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, B1, F6, F4, F1}
 #define MATRIX_COL_PINS { F7, B0, E6, C7, C6, B6, B5, B4, D7, D6, D4, D5, B2, D3, D2 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h
index ed7df48f72..a04ddf45cc 100644
--- a/keyboards/newgame40/config.h
+++ b/keyboards/newgame40/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pin-out */
 #define MATRIX_ROW_PINS { F7, B1, B3, B2 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F6
diff --git a/keyboards/nightingale_studios/hailey/config.h b/keyboards/nightingale_studios/hailey/config.h
index 915a8b89d1..73584acd94 100644
--- a/keyboards/nightingale_studios/hailey/config.h
+++ b/keyboards/nightingale_studios/hailey/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, B6, A14 }
 #define MATRIX_COL_PINS { A4, A3, F1, F0, C15, C14, C13, B11, B10, B2, B1, B0, A7, A5, A6, B5, A15 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h
index 6b975eee8a..81d0f0cbfd 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B1, B0, B5, B6 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B7, B3, B2, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index 86af00ffd8..fbfa65c2a0 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F7, F6, F5, E6, D0, B7, D5, D3, D2, D1 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h
index 59b7abf11f..35f10a53e1 100644
--- a/keyboards/nightly_boards/alter_lite/config.h
+++ b/keyboards/nightly_boards/alter_lite/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, D3, D5, B5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, E6, B6, C6, C7, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h
index c50c9e29c9..16a21f20ef 100644
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B1, B2, F0, F1, F4 }
 #define MATRIX_COL_PINS { B0, B3, B7, B6, C6, C7, F7, F6, F5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h
index ed9b8d8031..a4f19c8a18 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F1, C7 }
 #define MATRIX_COL_PINS { F0, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 4e812463b2..4f2a5ff5a0 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, F0, F1, D7, NO_PIN }
 #define MATRIX_COL_PINS { B5, C7, D6, D4, B3, B2, B1, B0, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index af26187605..d71fe7733e 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, D7, D6, D0, E6, NO_PIN }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index 7281a3c330..64b14b0207 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, F1, F0, D7, B4, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, C7, C6, B6, B5, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index b2b87fad44..98c05d887f 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, B1, B3 }
 #define MATRIX_COL_PINS { F6, F7, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index 11c553a070..a17eb502e1 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B3, NO_PIN }
 #define MATRIX_COL_PINS { F1, F0, D0, D1, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/paraluman/config.h b/keyboards/nightly_boards/paraluman/config.h
index 20eacfde3e..7d3101d116 100644
--- a/keyboards/nightly_boards/paraluman/config.h
+++ b/keyboards/nightly_boards/paraluman/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, F7, B1, B0, E6 }
 #define MATRIX_COL_PINS { B2, F6, F5, F4, F1, F0, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightly_boards/ph_arisu/config.h b/keyboards/nightly_boards/ph_arisu/config.h
index 6cb0887cf8..1173bca779 100644
--- a/keyboards/nightly_boards/ph_arisu/config.h
+++ b/keyboards/nightly_boards/ph_arisu/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h
index 921d7f70de..706cdbbf37 100644
--- a/keyboards/nightmare/config.h
+++ b/keyboards/nightmare/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { B4, B5, D3, D2, D1, D0, F4, F5, F6, F7, B1, B3, B2, B6}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nimrod/config.h b/keyboards/nimrod/config.h
index 1c3385a215..8b40ba11f6 100644
--- a/keyboards/nimrod/config.h
+++ b/keyboards/nimrod/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { F5, B6, D7, C6 }
 #define MATRIX_COL_PINS { D1, F4, B5, B4, E6, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index fa45d976fd..8a9403c9a5 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nopunin10did/jabberwocky/config.h b/keyboards/nopunin10did/jabberwocky/config.h
index f90795bc51..cb4f238852 100644
--- a/keyboards/nopunin10did/jabberwocky/config.h
+++ b/keyboards/nopunin10did/jabberwocky/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS     { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS     { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 }
-#define UNUSED_PINS
 
 /* Indicator LEDs */
 #define LED_NUM_LOCK_PIN    D1
diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h
index 7ec0a78ebf..714bed1b0e 100644
--- a/keyboards/nopunin10did/kastenwagen1840/config.h
+++ b/keyboards/nopunin10did/kastenwagen1840/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
 #define MATRIX_COL_PINS     { F4, F5, F6, F7, B1, B3, B2, E6, D7 }
-#define UNUSED_PINS
 
 /* Indicator LEDs */
 #define LED_INDICATOR_TOP   B0
diff --git a/keyboards/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h
index aea908d24a..1ced831ad9 100644
--- a/keyboards/nopunin10did/kastenwagen48/config.h
+++ b/keyboards/nopunin10did/kastenwagen48/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
 #define MATRIX_COL_PINS     { F4, F5, F6, F7, B1, B3, B2, E6 }
-#define UNUSED_PINS
 
 /* Indicator LEDs */
 #define LED_INDICATOR_TOP   B0
diff --git a/keyboards/nopunin10did/railroad/rev0/config.h b/keyboards/nopunin10did/railroad/rev0/config.h
index 19aa2ec8fb..b092687229 100644
--- a/keyboards/nopunin10did/railroad/rev0/config.h
+++ b/keyboards/nopunin10did/railroad/rev0/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D3, D5, C6, C7, F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index 2798738fd3..6980258e33 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C2, C4, C5, C6, C7 }
 #define MATRIX_COL_PINS { D7, D6, D5, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/220/config.h b/keyboards/noxary/220/config.h
index ebaf8c776e..95814568a2 100644
--- a/keyboards/noxary/220/config.h
+++ b/keyboards/noxary/220/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C4, B0, D3, D4, D5, D6 }
 #define MATRIX_COL_PINS { B4, C5, D2, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h
index a4e1c63e9d..88c9214a90 100644
--- a/keyboards/noxary/260/config.h
+++ b/keyboards/noxary/260/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F0, B5 }
 #define MATRIX_COL_PINS { C7, C6, B6, F4, E6, D0, B4, D1, D2, D3, D7, D6, D4, F1, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/268/config.h b/keyboards/noxary/268/config.h
index 6f52937cf7..26d9b272dc 100644
--- a/keyboards/noxary/268/config.h
+++ b/keyboards/noxary/268/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F5, F4, F0, F1, D0 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, E6, B0, D1, B2, B3, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h
index 6e3e5be283..3cade7ae27 100644
--- a/keyboards/noxary/268_2/config.h
+++ b/keyboards/noxary/268_2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F0, B5 }
 #define MATRIX_COL_PINS { C6, B6, C7, F4, E6, D0, D7, D1, D2, B4, D6, D4, D5, F1, D3, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index b7164743b9..9856f6401e 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F6, F5, F4, F0, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F1, E6, B2, B1, D6, B4, D7, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/280/config.h b/keyboards/noxary/280/config.h
index 17d06155ce..8ba050ab83 100644
--- a/keyboards/noxary/280/config.h
+++ b/keyboards/noxary/280/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, E6, D6, D4, F6, F5, F4, F1, B2, D3, D2, D1}
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, B0, B3}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/vulcan/config.h b/keyboards/noxary/vulcan/config.h
index 84c4bec622..e54c0c6044 100644
--- a/keyboards/noxary/vulcan/config.h
+++ b/keyboards/noxary/vulcan/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D1, D0, D2, F0, F1 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index bf88418deb..12f62c3ff0 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, F6, F5, F0, B4 }
 #define MATRIX_COL_PINS { C6, B6, C7, F4, E6, B2, D6, D0, D1, D7, D4, D5, D3, F1, D2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/np12/config.h b/keyboards/np12/config.h
index c769feff96..1f9a14b315 100644
--- a/keyboards/np12/config.h
+++ b/keyboards/np12/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { D7, E6, B4, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, F6 }
-#define UNUSED_PINS
 
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 5986308f7b..5e3d640dbd 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -30,7 +30,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, E6, D7, C6, D4 }
 #define MATRIX_COL_PINS { NO_PIN, NO_PIN, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h
index 6ec4b2a26c..9d38dde232 100644
--- a/keyboards/obosob/arch_36/config.h
+++ b/keyboards/obosob/arch_36/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring
 #define MATRIX_ROW_PINS { D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/obosob/steal_this_keyboard/config.h b/keyboards/obosob/steal_this_keyboard/config.h
index d5f21482aa..acb0d64b79 100644
--- a/keyboards/obosob/steal_this_keyboard/config.h
+++ b/keyboards/obosob/steal_this_keyboard/config.h
@@ -47,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B5, C6, NO_PIN, NO_PIN, NO_PIN } \
 }
 
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/ocean/addon/config.h b/keyboards/ocean/addon/config.h
index 9380a36eb6..00d6a02a9d 100644
--- a/keyboards/ocean/addon/config.h
+++ b/keyboards/ocean/addon/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 }
-#define UNUSED_PINS     { D0, D1, D2, D3, D4, F4 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/gin_v2/config.h b/keyboards/ocean/gin_v2/config.h
index e1d7b9a74d..1c0dabc4e3 100644
--- a/keyboards/ocean/gin_v2/config.h
+++ b/keyboards/ocean/gin_v2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS     { D2, D3 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/stealth/config.h b/keyboards/ocean/stealth/config.h
index 2661b00c55..b0240c4a0e 100644
--- a/keyboards/ocean/stealth/config.h
+++ b/keyboards/ocean/stealth/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { D1 }
 #define MATRIX_COL_PINS { D0, D4, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/sus/config.h b/keyboards/ocean/sus/config.h
index 4b2306d387..2446daee7b 100644
--- a/keyboards/ocean/sus/config.h
+++ b/keyboards/ocean/sus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { B5, B4, E6, D7 }
 #define MATRIX_COL_PINS { C6, D4, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/wang_ergo/config.h b/keyboards/ocean/wang_ergo/config.h
index a9a0d11791..05b6b687ed 100644
--- a/keyboards/ocean/wang_ergo/config.h
+++ b/keyboards/ocean/wang_ergo/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/wang_v2/config.h b/keyboards/ocean/wang_v2/config.h
index a2cd557720..e9953e63cc 100644
--- a/keyboards/ocean/wang_v2/config.h
+++ b/keyboards/ocean/wang_v2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/oddball/v1/config.h b/keyboards/oddball/v1/config.h
index 96aa56f822..7a33a7049a 100644
--- a/keyboards/oddball/v1/config.h
+++ b/keyboards/oddball/v1/config.h
@@ -28,4 +28,3 @@
  */
 #define MATRIX_ROW_PINS { F6, B5, B6, F7 }
 #define MATRIX_COL_PINS { D6, D7, B4, D3, C6, C7 }
-#define UNUSED_PINS { B7, D4, D5, E6, F0, F1, F4, F5 }
diff --git a/keyboards/oddball/v2/config.h b/keyboards/oddball/v2/config.h
index 9ba3bb8dfb..793d305931 100644
--- a/keyboards/oddball/v2/config.h
+++ b/keyboards/oddball/v2/config.h
@@ -28,4 +28,3 @@
  */
 #define MATRIX_ROW_PINS { D4, E6, D7, C6 }
 #define MATRIX_COL_PINS { B7, B5, B4, F5, F6, F7 }
-#define UNUSED_PINS { D3, D5, C7, F1, F0, B6, F4 }
diff --git a/keyboards/oddball/v2_1/config.h b/keyboards/oddball/v2_1/config.h
index 6be3e8a248..9f138d7d52 100644
--- a/keyboards/oddball/v2_1/config.h
+++ b/keyboards/oddball/v2_1/config.h
@@ -28,4 +28,3 @@
  */
 #define MATRIX_ROW_PINS { D4, E6, D7, C6 }
 #define MATRIX_COL_PINS { B6, B5, B4, F5, F6, F7 }
-#define UNUSED_PINS { D3, D5, C7, F1, F0, B7, F4 }
diff --git a/keyboards/odelia/config.h b/keyboards/odelia/config.h
index c3351725a6..c69ebcac30 100644
--- a/keyboards/odelia/config.h
+++ b/keyboards/odelia/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B3, B7, B1, B2, B0, F4, F0, F1, D4, B6}
 #define MATRIX_COL_PINS {B5, B4, D7, D6, E6, D0, D1, D2, D3, D5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
index 612fa7cecc..96fff1b590 100644
--- a/keyboards/ok60/config.h
+++ b/keyboards/ok60/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/orange75/config.h b/keyboards/orange75/config.h
index 4a867334f9..e2d37a26ac 100644
--- a/keyboards/orange75/config.h
+++ b/keyboards/orange75/config.h
@@ -7,7 +7,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6,F0, F1, F4, F5, F6, F7, C7, C6, B6, B4, D7, D4, D5, D6 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, B7, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
index 6f151c2f1c..a6a64476cd 100644
--- a/keyboards/org60/config.h
+++ b/keyboards/org60/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* Backlight Setup */
 #define BACKLIGHT_PIN F5
diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h
index 2254999b02..f8b8de4259 100644
--- a/keyboards/ortho5by12/config.h
+++ b/keyboards/ortho5by12/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                           0   1   2   3   4   5   6   7   8   9     */
 #define MATRIX_ROW_PINS { B5, B1, B2, B3, B4, C0, D5, D6, D7, B0 }
 #define MATRIX_COL_PINS { C2, D0, D1, D4, C3, C1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index 9bab689618..644d7ba255 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B0, B1, B2, B3, B4}
 #define MATRIX_COL_PINS {C4, C3, C2, C1, C0, D7, D6, A7, A4, A5, A6, A3, A2, A1, A0}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
index 301597df08..475a2bd442 100644
--- a/keyboards/p3d/glitch/config.h
+++ b/keyboards/p3d/glitch/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
 #define MATRIX_ROW_PINS { D5, D6, B6, D7, C7, B4, B5, D3, D4, C6 }
 #define MATRIX_COL_PINS { B2, D2, B3, B7, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 25
diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h
index 73c17b676a..a13313413d 100644
--- a/keyboards/pabile/p18/config.h
+++ b/keyboards/pabile/p18/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pin-out for PROMICRO */
 #define MATRIX_ROW_PINS { D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { D2, D7, E6, B4, B5 }
-#define UNUSED_PINS
  
 /* Encoder position for PROMICRO */
 #define ENCODERS_PAD_A { B6, F6 }
diff --git a/keyboards/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h
index 94c600106b..6b7ed83bd4 100644
--- a/keyboards/pabile/p20/ver1/config.h
+++ b/keyboards/pabile/p20/ver1/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pin-out */
 #define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 }
 #define MATRIX_COL_PINS { D0, B2, D4, B6 }
-#define UNUSED_PINS
  
 #define ENCODERS_PAD_A { F5, F7 }
 #define ENCODERS_PAD_B { F6, B1 }
diff --git a/keyboards/pabile/p20/ver2/config.h b/keyboards/pabile/p20/ver2/config.h
index 0997001836..f7b41099c4 100644
--- a/keyboards/pabile/p20/ver2/config.h
+++ b/keyboards/pabile/p20/ver2/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* pin-out */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { D1, D0, D4, B2 }
-#define UNUSED_PINS
  
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p40/config.h b/keyboards/pabile/p40/config.h
index 7a15886a44..f90aefef0c 100644
--- a/keyboards/pabile/p40/config.h
+++ b/keyboards/pabile/p40/config.h
@@ -32,7 +32,6 @@ for pro micro facing back of pcb
 #define MATRIX_ROW_PINS { D4, E6, B4, B5 }
 #define MATRIX_COL_PINS { D1, D0, B6, B2, B3, B1, F7, F6, F5, F4 }
 */
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p40_ortho/config.h b/keyboards/pabile/p40_ortho/config.h
index 176072f022..5a8c1625d5 100644
--- a/keyboards/pabile/p40_ortho/config.h
+++ b/keyboards/pabile/p40_ortho/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D1, D0, F4, F5 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B2, B3, B1, F7, F6 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p42/config.h b/keyboards/pabile/p42/config.h
index e66f14c854..0a6fe4a2fc 100644
--- a/keyboards/pabile/p42/config.h
+++ b/keyboards/pabile/p42/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2, C7, D6, B7, B6, B5 }
 */
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/palette1202/config.h b/keyboards/palette1202/config.h
index c4d231d298..d631ed8463 100644
--- a/keyboards/palette1202/config.h
+++ b/keyboards/palette1202/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B6, B2, B3 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define UNUSED_PINS { D2, D3, D4, B1 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h
index 6472195394..cc941d56af 100644
--- a/keyboards/panc40/config.h
+++ b/keyboards/panc40/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5 }
 #define MATRIX_COL_PINS { F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h
index ad48909009..5bf4d4edcd 100644
--- a/keyboards/panc60/config.h
+++ b/keyboards/panc60/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h
index aedb9083bd..318671f298 100644
--- a/keyboards/papercranekeyboards/gerald65/config.h
+++ b/keyboards/papercranekeyboards/gerald65/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { B7, D6, E6, B4, B5 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D7, D4, D3, D2, D1, D0, B6, C6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/parallel/parallel_65/hotswap/config.h b/keyboards/parallel/parallel_65/hotswap/config.h
index c953d92e64..6abeea3bc8 100644
--- a/keyboards/parallel/parallel_65/hotswap/config.h
+++ b/keyboards/parallel/parallel_65/hotswap/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/parallel/parallel_65/soldered/config.h b/keyboards/parallel/parallel_65/soldered/config.h
index c953d92e64..6abeea3bc8 100644
--- a/keyboards/parallel/parallel_65/soldered/config.h
+++ b/keyboards/parallel/parallel_65/soldered/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pdxkbc/config.h b/keyboards/pdxkbc/config.h
index 7215b481c9..b24592942f 100644
--- a/keyboards/pdxkbc/config.h
+++ b/keyboards/pdxkbc/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F7, B6, F4 }
 #define MATRIX_COL_PINS { D1, E6 }
-#define UNUSED_PINS { D0, D4, C6, D7, B4, B5, F5, F6, B1, B3, B2 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
index 5b93f4d28c..8f17638549 100644
--- a/keyboards/pearl/config.h
+++ b/keyboards/pearl/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 2ec131f0f0..a90e3e190b 100644
--- a/keyboards/pearlboards/atlas/config.h
+++ b/keyboards/pearlboards/atlas/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D6, E1, C0, C4, E3 }
 #define MATRIX_COL_PINS { D5, D4, C1, C2, C3, C5, C7, A7, A6, A5, A4, A3, A2, A1, A0, F7 }
-#define UNUSED_PINS { E4, E5, E6, E7, F0, F1, F2, F3, B0, B4, B5, B7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index 46a887c6ab..85661f2993 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, D7, D6, B3, B0 }
 #define MATRIX_COL_PINS { D2, D1, D0, D3, D5, B5, B6, B7, D4, C6, C7, F0, F1, F4, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index 19d14f701b..2a371716b5 100644
--- a/keyboards/pearlboards/zeus/config.h
+++ b/keyboards/pearlboards/zeus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, C1, E1, E0, D7, D6 }
 #define MATRIX_COL_PINS { F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C7, C2, C0 }
-#define UNUSED_PINS { E3, E4, E5, B0, B4, B5, B6, B7, D4 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
index e4182d05ed..484af3d2d9 100644
--- a/keyboards/pearlboards/zeuspad/config.h
+++ b/keyboards/pearlboards/zeuspad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D3, D5, F7, F4, F1 }
 #define MATRIX_COL_PINS { B0, F0, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/peej/lumberjack/config.h b/keyboards/peej/lumberjack/config.h
index 3142738330..f9f927f9d9 100644
--- a/keyboards/peej/lumberjack/config.h
+++ b/keyboards/peej/lumberjack/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 10
 #define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1 }
 #define MATRIX_COL_PINS { B0, D7, D6, D5, D4, D1, D0, C1, C2, C3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h
index 9efd6c0ff7..4389572588 100644
--- a/keyboards/peej/rosaline/config.h
+++ b/keyboards/peej/rosaline/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 8
 #define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1, C3, D5 }
 #define MATRIX_COL_PINS { B0, D7, D6, C2, D4, D1, D0, C1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/peej/tripel/config.h b/keyboards/peej/tripel/config.h
index 6f11bfb405..1ea4947f32 100644
--- a/keyboards/peej/tripel/config.h
+++ b/keyboards/peej/tripel/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 8
 #define MATRIX_ROW_PINS { C6, D4, D0, B4, E6, D7, D1, D2, D3 }
 #define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5 }
-#define UNUSED_PINS { F4 }
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pegasus/config.h b/keyboards/pegasus/config.h
index cf71fdab68..2729258198 100644
--- a/keyboards/pegasus/config.h
+++ b/keyboards/pegasus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, E6 }
 #define MATRIX_COL_PINS { D2, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
-//#define UNUSED_PINS { B0, B1, B2, B3, B7 }
 
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h
index fa69ad2a3f..03e4b3cae9 100644
--- a/keyboards/peranekofactory/tone/rev1/config.h
+++ b/keyboards/peranekofactory/tone/rev1/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS { \
     { D4, C6, D7, E6, F6, F7, B1, B3 } \
 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h
index fa69ad2a3f..03e4b3cae9 100644
--- a/keyboards/peranekofactory/tone/rev2/config.h
+++ b/keyboards/peranekofactory/tone/rev2/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS { \
     { D4, C6, D7, E6, F6, F7, B1, B3 } \
 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index ebaaae28d9..8b0c8ad8da 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index d7df79cebe..1f05360aae 100644
--- a/keyboards/percent/canoe_gen2/config.h
+++ b/keyboards/percent/canoe_gen2/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B1,B3,B2,F5,F4}
 #define MATRIX_COL_PINS {B0,D0,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,F6,F7}
-#define UNUSED_PINS
 
 /* Uncomment if your encoder doesn't react to every turn or skips */
 //#define ENCODER_RESOLUTION 2
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index 2966a84aed..0e61f5d2ff 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B5 }
 #define MATRIX_COL_PINS { C4, C2, D7, C7, C6, A0, A1, A2, A3, A7, A6, A4, A5, C5, C3}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index 35f2131fc5..2b1e6b1e5f 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
 #define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h
index 8ebfa35d09..6a3e76ba8c 100644
--- a/keyboards/picolab/frusta_fundamental/config.h
+++ b/keyboards/picolab/frusta_fundamental/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B2, B3, B7, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h
index 3060794b42..b9661afbaa 100755
--- a/keyboards/pimentoso/paddino02/rev1/config.h
+++ b/keyboards/pimentoso/paddino02/rev1/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, D4 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h
index 4bf4b1dcaf..9de375d0b3 100755
--- a/keyboards/pimentoso/paddino02/rev2/left/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/left/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D4, D1 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h
index 3393107a06..38253bb4a2 100755
--- a/keyboards/pimentoso/paddino02/rev2/right/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/right/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F6, F5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pinky/3/config.h b/keyboards/pinky/3/config.h
index ebb69a0119..f6b8dc4343 100644
--- a/keyboards/pinky/3/config.h
+++ b/keyboards/pinky/3/config.h
@@ -36,7 +36,6 @@
 // wiring of each half
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pinky/4/config.h b/keyboards/pinky/4/config.h
index c7f2ab8ef6..c980f9d302 100644
--- a/keyboards/pinky/4/config.h
+++ b/keyboards/pinky/4/config.h
@@ -36,7 +36,6 @@
 // wiring of each half
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h
index ce65056d1a..42db825e3e 100644
--- a/keyboards/pisces/config.h
+++ b/keyboards/pisces/config.h
@@ -45,7 +45,6 @@
  */
 #define MATRIX_ROW_PINS { C4, B0, C7 }
 #define MATRIX_COL_PINS { B1, B2, B3, B4, B5, B6, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pizzakeyboards/pizza65/config.h b/keyboards/pizzakeyboards/pizza65/config.h
index b0a6a3df2b..1789ead3e8 100644
--- a/keyboards/pizzakeyboards/pizza65/config.h
+++ b/keyboards/pizzakeyboards/pizza65/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B15, A10, F1, A0, A1 }
 #define MATRIX_COL_PINS { A9, A8, F0, A2, A3, A4, B9, B8, B7, B6, B5, B4, B3, A15, A14, A13}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h
index d6b690d0dd..c8d9692461 100644
--- a/keyboards/pjb/eros/config.h
+++ b/keyboards/pjb/eros/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { B2, B1, B0, D7, B7, D1 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
index c4c707d3e8..ab71d1633e 100644
--- a/keyboards/pkb65/config.h
+++ b/keyboards/pkb65/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C7, C6, B6, B7, F0 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index 8fb9dda32a..847480b3e2 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D0, D5, B5, B6 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#define UNUSED_PINS
 
 #define QMK_ESC_OUTPUT F1
 #define QMK_ESC_INPUT D5
diff --git a/keyboards/planck/keymaps/pvc/config.h b/keyboards/planck/keymaps/pvc/config.h
index 0fb08540d4..78e12d3120 100644
--- a/keyboards/planck/keymaps/pvc/config.h
+++ b/keyboards/planck/keymaps/pvc/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KEYBOARD_planck_light
 #define MATRIX_ROW_PINS { D0, D5, B5, B6 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#define UNUSED_PINS
 #endif
 
 /*
diff --git a/keyboards/planck/keymaps/zrichard/config.h b/keyboards/planck/keymaps/zrichard/config.h
index d12c19065c..eaedf65575 100755
--- a/keyboards/planck/keymaps/zrichard/config.h
+++ b/keyboards/planck/keymaps/zrichard/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KEYBOARD_planck_light
 #define MATRIX_ROW_PINS { D0, D5, B5, B6 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#define UNUSED_PINS
 #endif
 
 /* enable basic MIDI features:
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 778fa12fcc..65d613048a 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -44,7 +44,6 @@
 #define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
 
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B12 }
 #define ENCODERS_PAD_B { B13 }
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index f41d46b889..6869997ae2 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -48,7 +48,6 @@
 #define MATRIX_COL_PINS \
     { B11, B10, B2, B1, A7, B0 }
 
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A \
     { B12 }
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index 80dc8f1249..af3f2b2dbb 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins         0   1   2   3   4   5   6   7   8   9  10  11  12  13  14*/
 #define MATRIX_ROW_PINS { F5, F4, F1, B0, B3 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, F6, B7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index ae5735508a..d3aaa893e0 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index e74e9dee83..6a6713557b 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -41,7 +41,7 @@
 
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
-#define UNUSED_PINS \
+#define UNUSABLE_PINS \
     { B4, D6, F1, F5, F6, F7 }
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index 25ebd1ee2d..7caba1e1bb 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -199,8 +199,8 @@ void keyboard_pre_init_kb(void) {
      * 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.
      */
-#ifdef UNUSED_PINS
-    const pin_t unused_pins[] = UNUSED_PINS;
+#ifdef UNUSABLE_PINS
+    const pin_t unused_pins[] = UNUSABLE_PINS;
 
     for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
         setPinOutput(unused_pins[i]);
diff --git a/keyboards/ploopyco/trackball/rev1/config.h b/keyboards/ploopyco/trackball/rev1/config.h
index 2908f09602..3db085baf2 100644
--- a/keyboards/ploopyco/trackball/rev1/config.h
+++ b/keyboards/ploopyco/trackball/rev1/config.h
@@ -35,7 +35,7 @@
 
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
-#define UNUSED_PINS \
+#define UNUSABLE_PINS \
     { D1, D3, B4, B6, B7, D6, C7, F6, F5, F3, F7 }
 
 // If board has a debug LED, you can enable it by defining this
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index 83e70181de..321e3004d1 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -35,7 +35,7 @@
 
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
-#define UNUSED_PINS \
+#define UNUSABLE_PINS \
     { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
 
 // If board has a debug LED, you can enable it by defining this
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c
index bda21b5c88..7a576a586d 100644
--- a/keyboards/ploopyco/trackball/trackball.c
+++ b/keyboards/ploopyco/trackball/trackball.c
@@ -204,8 +204,8 @@ void keyboard_pre_init_kb(void) {
      * 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.
      */
-#ifdef UNUSED_PINS
-    const pin_t unused_pins[] = UNUSED_PINS;
+#ifdef UNUSABLE_PINS
+    const pin_t unused_pins[] = UNUSABLE_PINS;
 
     for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
         setPinOutput(unused_pins[i]);
diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/config.h b/keyboards/ploopyco/trackball_mini/rev1_001/config.h
index 06720b8fdf..d4c9d23bec 100644
--- a/keyboards/ploopyco/trackball_mini/rev1_001/config.h
+++ b/keyboards/ploopyco/trackball_mini/rev1_001/config.h
@@ -36,5 +36,5 @@
 
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
-#define UNUSED_PINS \
+#define UNUSABLE_PINS \
     { B5, C7, D0, D1, D3, D5, D6, F1, F3, F5, F6, F7 }
diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/config.h b/keyboards/ploopyco/trackball_mini/rev1_002/config.h
index 06720b8fdf..d4c9d23bec 100644
--- a/keyboards/ploopyco/trackball_mini/rev1_002/config.h
+++ b/keyboards/ploopyco/trackball_mini/rev1_002/config.h
@@ -36,5 +36,5 @@
 
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
-#define UNUSED_PINS \
+#define UNUSABLE_PINS \
     { B5, C7, D0, D1, D3, D5, D6, F1, F3, F5, F6, F7 }
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.c b/keyboards/ploopyco/trackball_mini/trackball_mini.c
index e4b4a47c2b..03cba2200e 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.c
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.c
@@ -200,8 +200,8 @@ void keyboard_pre_init_kb(void) {
      * 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.
      */
-#ifdef UNUSED_PINS
-    const pin_t unused_pins[] = UNUSED_PINS;
+#ifdef UNUSABLE_PINS
+    const pin_t unused_pins[] = UNUSABLE_PINS;
 
     for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
         setPinOutput(unused_pins[i]);
diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/config.h b/keyboards/ploopyco/trackball_nano/rev1_001/config.h
index 6d265d7233..3bde88487a 100644
--- a/keyboards/ploopyco/trackball_nano/rev1_001/config.h
+++ b/keyboards/ploopyco/trackball_nano/rev1_001/config.h
@@ -33,5 +33,5 @@
 
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
-#define UNUSED_PINS \
+#define UNUSABLE_PINS \
     { B5, B6, C7, D0, D1, D2, D3, D4, D5, D6, D7, E6, F1, F3, F5, F6, F7 }
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.c b/keyboards/ploopyco/trackball_nano/trackball_nano.c
index 0f2fbe2f72..eb1d8e10b0 100644
--- a/keyboards/ploopyco/trackball_nano/trackball_nano.c
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.c
@@ -86,8 +86,8 @@ void keyboard_pre_init_kb(void) {
      * 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.
      */
-#ifdef UNUSED_PINS
-    const pin_t unused_pins[] = UNUSED_PINS;
+#ifdef UNUSABLE_PINS
+    const pin_t unused_pins[] = UNUSABLE_PINS;
 
     for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
         setPinOutput(unused_pins[i]);
diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
index 56663e1d3e..152b8c3169 100644
--- a/keyboards/pluckey/config.h
+++ b/keyboards/pluckey/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, F5, F6, B6, B5 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, F7 }
-#define UNUSED_PINS { F4, B1 }
 #define DIODE_DIRECTION COL2ROW
 
 /* encoder support */
diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h
index 31b6d64a23..0a9cf3ceca 100644
--- a/keyboards/plume/plume65/config.h
+++ b/keyboards/plume/plume65/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D2, D5, E6, D0, D1 }
 #define MATRIX_COL_PINS { B7, F7, C7, C6, B6, F0, B5, F1, B4, F4, D7, F5, D6, F6, D4 }
-#define UNUSED_PINS { }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h
index 6e72462c45..86ec6d2f15 100644
--- a/keyboards/plut0nium/0x3e/config.h
+++ b/keyboards/plut0nium/0x3e/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D5, D4, D6, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/plywrks/ahgase/config.h b/keyboards/plywrks/ahgase/config.h
index f38aeba740..c1a90de131 100644
--- a/keyboards/plywrks/ahgase/config.h
+++ b/keyboards/plywrks/ahgase/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h
index c0f52dd312..e2ff5a06ac 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D7, C6, B4, E6 }
 #define MATRIX_COL_PINS { D4, B6, F4, F5, F6, F7, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h
index b48e99e6d5..8baa3b3162 100644
--- a/keyboards/polilla/rev1/config.h
+++ b/keyboards/polilla/rev1/config.h
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B1, B0, A7, F1, A0 }
 #define MATRIX_COL_PINS { A6, A5, A4, A3, A2, A1, F0, B7, B6, B5, B4, B3 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h
index 60016869f5..350f7dfff3 100644
--- a/keyboards/polycarbdiet/s20/config.h
+++ b/keyboards/polycarbdiet/s20/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         1   2   3   4   5
 #define MATRIX_ROW_PINS { B7, E6, D0, D1, D5 }
 #define MATRIX_COL_PINS { C6, C7, D4, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index 503ec1a900..e958aebd30 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B4, B0, D7, E6, D4, F5, D6, C6, B5 }
 #define MATRIX_COL_PINS { F4, F1, F0, F6, F7, D0, D1, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/portal_66/hotswap/config.h b/keyboards/portal_66/hotswap/config.h
index c953d92e64..6abeea3bc8 100644
--- a/keyboards/portal_66/hotswap/config.h
+++ b/keyboards/portal_66/hotswap/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/portal_66/soldered/config.h b/keyboards/portal_66/soldered/config.h
index c953d92e64..6abeea3bc8 100644
--- a/keyboards/portal_66/soldered/config.h
+++ b/keyboards/portal_66/soldered/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pos78/config.h b/keyboards/pos78/config.h
index afe6aa7dd1..b0136fb812 100644
--- a/keyboards/pos78/config.h
+++ b/keyboards/pos78/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B2, B1, D2, D3, D1, D0, C6, E6, B5, B6, B7, D6, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h
index 6bcfa26380..63fa2d7433 100644
--- a/keyboards/preonic/config.h
+++ b/keyboards/preonic/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#define UNUSED_PINS
 
 #define QMK_ESC_OUTPUT F1
 #define QMK_ESC_INPUT B5
diff --git a/keyboards/preonic/keymaps/kinesis/config.h b/keyboards/preonic/keymaps/kinesis/config.h
index f85be752e4..eabce5e790 100644
--- a/keyboards/preonic/keymaps/kinesis/config.h
+++ b/keyboards/preonic/keymaps/kinesis/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/preonic/keymaps/zach/config.h b/keyboards/preonic/keymaps/zach/config.h
index d69952fa88..37e85bf512 100644
--- a/keyboards/preonic/keymaps/zach/config.h
+++ b/keyboards/preonic/keymaps/zach/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index efa32d5916..700be3ae5f 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -31,7 +31,6 @@
 #undef MATRIX_COL_PINS
 #define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B12 }
 #define ENCODERS_PAD_B { B13 }
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 813675eb84..5475108dad 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -33,7 +33,6 @@
 #undef MATRIX_COL_PINS
 #define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B12 }
 #define ENCODERS_PAD_B { B13 }
diff --git a/keyboards/primekb/prime_e/keymaps/milestogo/config.h b/keyboards/primekb/prime_e/keymaps/milestogo/config.h
index 24a42bb185..c3f9e43415 100644
--- a/keyboards/primekb/prime_e/keymaps/milestogo/config.h
+++ b/keyboards/primekb/prime_e/keymaps/milestogo/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { E6, C7, B5, B4, C6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4, D5, D3, D2, D1, D0, B6, D7} 
-#define UNUSED_PINS
 
 // Babble config
 #define USE_BABBLEPASTE
diff --git a/keyboards/primekb/prime_l/v1/config.h b/keyboards/primekb/prime_l/v1/config.h
index afa8c62460..73f5cf8f30 100644
--- a/keyboards/primekb/prime_l/v1/config.h
+++ b/keyboards/primekb/prime_l/v1/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 }
 #define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B6
 /*#define BACKLIGHT_BREATHING*/
diff --git a/keyboards/primekb/prime_l/v2/config.h b/keyboards/primekb/prime_l/v2/config.h
index 1386a127fe..09d765ce26 100644
--- a/keyboards/primekb/prime_l/v2/config.h
+++ b/keyboards/primekb/prime_l/v2/config.h
@@ -31,4 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { E6, B2, B1, B0, B6 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D4, D0, D1, D2, D3, D5, B7, B3 }
-#define UNUSED_PINS
\ No newline at end of file
diff --git a/keyboards/primekb/prime_m/config.h b/keyboards/primekb/prime_m/config.h
index c9a415feb8..3468ea975e 100644
--- a/keyboards/primekb/prime_m/config.h
+++ b/keyboards/primekb/prime_m/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { C5, B5, B2, D5, D3 }
 #define MATRIX_COL_PINS { B3, C7, C6, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/primekb/prime_o/config.h b/keyboards/primekb/prime_o/config.h
index ba3976cc0e..60edde57e7 100644
--- a/keyboards/primekb/prime_o/config.h
+++ b/keyboards/primekb/prime_o/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D4, D6, B1, C5, B4, B3, C4, B2, B0, D5 }
 #define MATRIX_COL_PINS { B6, B5, C7, C6, D2, D1, D0, C2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h
index d6d35e4ae3..a75d608e3c 100644
--- a/keyboards/primekb/prime_r/config.h
+++ b/keyboards/primekb/prime_r/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 }
 #define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
index 156044d24a..c9ce4a9ac6 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D3, B1, B0 }
 #define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, D6, C2, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/projectcain/relic/config.h b/keyboards/projectcain/relic/config.h
index 75bcd815d3..026e139fd1 100644
--- a/keyboards/projectcain/relic/config.h
+++ b/keyboards/projectcain/relic/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D7, B2, B6, B5 }
 #define MATRIX_COL_PINS { D3, D5, B0, F0, F1, F4, F5, F6, C7, C6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
index a7edf78c23..f7fe8b17c7 100644
--- a/keyboards/projectcain/vault35/config.h
+++ b/keyboards/projectcain/vault35/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, D4, B0, C7 }
 #define MATRIX_COL_PINS { B1, D3, F0, F1, F4, F5, F6, F7, C6, B6, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index a6d9edcb3c..2ac39d277c 100644
--- a/keyboards/projectcain/vault45/config.h
+++ b/keyboards/projectcain/vault45/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, B6, B5, C7 }
 #define MATRIX_COL_PINS { B0, D5, D4, D6, D7, B4, D3, F0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h
index ef3fffb3a3..14124f7c99 100644
--- a/keyboards/prototypist/allison/config.h
+++ b/keyboards/prototypist/allison/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D2, D1, D0, B1, B2, D3}
 #define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h
index 312049ff01..6a442689d1 100644
--- a/keyboards/prototypist/allison_numpad/config.h
+++ b/keyboards/prototypist/allison_numpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS { F6, F5, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/prototypist/j01/config.h b/keyboards/prototypist/j01/config.h
index d1e861aaad..36858a6534 100644
--- a/keyboards/prototypist/j01/config.h
+++ b/keyboards/prototypist/j01/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B3, B2, B0, F6, F5 }
 #define MATRIX_COL_PINS { B1, F0, F7, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h
index baab1e89e8..907ed283cc 100644
--- a/keyboards/psuieee/pluto12/config.h
+++ b/keyboards/psuieee/pluto12/config.h
@@ -12,7 +12,6 @@
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D0, D4, C6 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* Encoder Assignments */
 #define ENCODERS_PAD_A { B6 }
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index 976bc11f6f..96b5b42f86 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, D7, B4, B5 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3,  B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/puck/config.h b/keyboards/puck/config.h
index a3d875b65a..71cea5ac64 100644
--- a/keyboards/puck/config.h
+++ b/keyboards/puck/config.h
@@ -8,7 +8,6 @@
 
 #define MATRIX_ROW_PINS { D2, D3, C6, C7 }
 #define MATRIX_COL_PINS { B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h
index de13a09e6d..fa87d13433 100644
--- a/keyboards/punk75/config.h
+++ b/keyboards/punk75/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D0, B1}
 #define ENCODERS_PAD_B { D1, B0 }
 
-#define UNUSED_PINS { C7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/q4z/config.h b/keyboards/q4z/config.h
index 19d618a025..64608f4879 100644
--- a/keyboards/q4z/config.h
+++ b/keyboards/q4z/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { F4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { D1, D0, D4, B6, B2, B3, B1, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h
index 50f05a0147..0faaeae1f5 100644
--- a/keyboards/qpockets/eggman/config.h
+++ b/keyboards/qpockets/eggman/config.h
@@ -25,7 +25,6 @@
 #define MATRIX_ROW_PINS { C4, C5, C2, D0, B5, B6, D6 }
 #define MATRIX_COL_PINS { B7, B4, B3, B2, D3, D2, D1 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
index 50ef5b3a20..0b87d47767 100644
--- a/keyboards/qpockets/space_space/rev1/config.h
+++ b/keyboards/qpockets/space_space/rev1/config.h
@@ -27,7 +27,6 @@
 #define MATRIX_COL_PINS \
     { D4, B4, B5, B6, C6, F7, F6, F0, B0, E6, B1 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index 5be679fa50..b762783d7e 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -27,7 +27,6 @@
 #define MATRIX_COL_PINS \
     { C6, F6, F1, F4, F5, E6, D6, B2, B5, D3, D2 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h
index f2723ef51c..feba6e742a 100644
--- a/keyboards/qpockets/wanten/config.h
+++ b/keyboards/qpockets/wanten/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F7, B3, D5 }
 #define MATRIX_COL_PINS { F4, F1, B5, B6, C6, C7, D4, E6, D2, B1, B2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index e5e9af0d7a..15041b1a8a 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D3, D5, F0, E6 }
 #define MATRIX_COL_PINS { D2, D1, D0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h
index e0e30baa63..f8da7ab014 100644
--- a/keyboards/quantrik/kyuu/config.h
+++ b/keyboards/quantrik/kyuu/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, D6 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, F0, B7, D0, D5, D3, D2, D1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index e3c38406db..31e0d8ded3 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Basic matrix config */
 #define MATRIX_ROW_PINS { C7, F7, F6}
 #define MATRIX_COL_PINS { F0, F1, F4, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rabbit/rabbit68/config.h b/keyboards/rabbit/rabbit68/config.h
index 548ab2bb44..9a5e4781a3 100644
--- a/keyboards/rabbit/rabbit68/config.h
+++ b/keyboards/rabbit/rabbit68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, D7, D0, B3, B7 }
 #define MATRIX_COL_PINS { D6, D1, B4, D2, B5, F7, F6, F5, F4, F1, F0, B0, B1, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/rad/config.h b/keyboards/rad/config.h
index 47048722b1..04ea4f9cb9 100644
--- a/keyboards/rad/config.h
+++ b/keyboards/rad/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D7, C6, B6, D0 }
 #define MATRIX_COL_PINS { B5, B4, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index b0ca5cb44d..498596eccd 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, B6, C6, C7 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F0, E6, D5, D3, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rainkeebs/rainkeeb/config.h b/keyboards/rainkeebs/rainkeeb/config.h
index f1f6ea5c14..a2049a87a4 100644
--- a/keyboards/rainkeebs/rainkeeb/config.h
+++ b/keyboards/rainkeebs/rainkeeb/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D3, D2, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index 438a925096..d595f6cbf0 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, C6, B5, E6 }
 #define MATRIX_COL_PINS { D7, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/aelith/config.h b/keyboards/ramonimbao/aelith/config.h
index 907acb8ff3..285a9b5e6a 100644
--- a/keyboards/ramonimbao/aelith/config.h
+++ b/keyboards/ramonimbao/aelith/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, D1, D0, D6, A7 }
 #define MATRIX_COL_PINS { D7, C0, C1, C2, C3, C4, C5, C6, C7, A6, A5, A0, A1, A2, A3, A4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/chevron/config.h b/keyboards/ramonimbao/chevron/config.h
index 454feec40f..4a2f1fe008 100644
--- a/keyboards/ramonimbao/chevron/config.h
+++ b/keyboards/ramonimbao/chevron/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D5, D6, C0, D7, NO_PIN }
 #define MATRIX_COL_PINS { A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, A4, A3, A2, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h
index 885940b17f..298f8cff56 100644
--- a/keyboards/ramonimbao/herringbone/pro/config.h
+++ b/keyboards/ramonimbao/herringbone/pro/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6, NO_PIN }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/herringbone/v1/config.h b/keyboards/ramonimbao/herringbone/v1/config.h
index 04b017f470..cbe83f71fc 100644
--- a/keyboards/ramonimbao/herringbone/v1/config.h
+++ b/keyboards/ramonimbao/herringbone/v1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/mona/v1/config.h b/keyboards/ramonimbao/mona/v1/config.h
index d2bacf04cd..bbe396b2f8 100644
--- a/keyboards/ramonimbao/mona/v1/config.h
+++ b/keyboards/ramonimbao/mona/v1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 }
 #define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/mona/v1_1/config.h b/keyboards/ramonimbao/mona/v1_1/config.h
index 326c661a81..ff99b86a06 100644
--- a/keyboards/ramonimbao/mona/v1_1/config.h
+++ b/keyboards/ramonimbao/mona/v1_1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 }
 #define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/mona/v32a/config.h b/keyboards/ramonimbao/mona/v32a/config.h
index e71c5d80e4..dce6c80d1f 100644
--- a/keyboards/ramonimbao/mona/v32a/config.h
+++ b/keyboards/ramonimbao/mona/v32a/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C2, C3, D6, D1, A6 }
 #define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A5, A4, A3, A7, D5, C7, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/squishyfrl/config.h b/keyboards/ramonimbao/squishyfrl/config.h
index cc7f422723..04e9a6039d 100644
--- a/keyboards/ramonimbao/squishyfrl/config.h
+++ b/keyboards/ramonimbao/squishyfrl/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B9, B8, A0, A1, A9, A8, B11, A6, A5}
 #define MATRIX_COL_PINS { A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/ramonimbao/squishytkl/config.h
index b9a3ce8016..c5843a2277 100644
--- a/keyboards/ramonimbao/squishytkl/config.h
+++ b/keyboards/ramonimbao/squishytkl/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B3, B4, B5, C13, B9, B8, A0, A1, A9, A8, B11, A6, A5, C0 }
 #define MATRIX_COL_PINS { A15, C10, C11, C12, D2, A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/ramonimbao/tkl_ff/config.h
index d0b3ee75ff..486956989d 100644
--- a/keyboards/ramonimbao/tkl_ff/config.h
+++ b/keyboards/ramonimbao/tkl_ff/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ramonimbao/wete/v2/config.h b/keyboards/ramonimbao/wete/v2/config.h
index 3d6ceb080b..8aec9abb3c 100644
--- a/keyboards/ramonimbao/wete/v2/config.h
+++ b/keyboards/ramonimbao/wete/v2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B3, B2, B6, C6, C7, E6, F7, F6, F5, F4, F1, F0, NO_PIN }
 #define MATRIX_COL_PINS { B1, B0, B7, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rart45/config.h b/keyboards/rart/rart45/config.h
index 20339c1fe9..0b8f0b7102 100644
--- a/keyboards/rart/rart45/config.h
+++ b/keyboards/rart/rart45/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { D1, C2, C1, B1, D0, C3, C0, D7, B0 }
 #define MATRIX_COL_PINS { D6, D4, B2, B5, B4, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index 29fe515367..b859a2f552 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, B6, B3, B1 }
 #define MATRIX_COL_PINS { F7, B2, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index 43ece277d9..a303b42cd2 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, B0 }
 #define MATRIX_COL_PINS { B3, B2, B1, D5, D4, D6, D7, B4, B5, F0, F7, F6, F5, F4, F1, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rart67m/config.h b/keyboards/rart/rart67m/config.h
index d0153e5a25..796b17d5b7 100644
--- a/keyboards/rart/rart67m/config.h
+++ b/keyboards/rart/rart67m/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { D3, D2, D4, F6, B3, B4, B2, B5 }
 #define MATRIX_COL_PINS { F4, F5, C6, F7, D7, B1, E6, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rart75/config.h b/keyboards/rart/rart75/config.h
index 91f263fc40..dcc2dff902 100644
--- a/keyboards/rart/rart75/config.h
+++ b/keyboards/rart/rart75/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, F4, F6, C7, D4, D0 }
 #define MATRIX_COL_PINS { D5, D3, D2, D1, C6, B6, B5, B4, D7, D6, B3, B1, F7, F5, B2, B7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index e1581ac2a1..7c797b19b2 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D5, D6, D7, D0, C5, C4 }
 #define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rart75m/config.h b/keyboards/rart/rart75m/config.h
index 2eb109e1ed..61173b183b 100644
--- a/keyboards/rart/rart75m/config.h
+++ b/keyboards/rart/rart75m/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { C7, B3, B1, B0, D3, D2 }
 #define MATRIX_COL_PINS { B2, D4, F0, C6, F1, D7, F4, E6, F5, B4, F6, B5, F7, B6 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_B { B7 }
 #define ENCODERS_PAD_A { D6 }
diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h
index bb3a6aefb6..adf7a9ed86 100644
--- a/keyboards/rart/rartand/config.h
+++ b/keyboards/rart/rartand/config.h
@@ -23,7 +23,6 @@
 
 #define MATRIX_ROW_PINS { C3, B2, C2, B1, C1, D7, C0, B0 }
 #define MATRIX_COL_PINS { D0, D1, B4, B5, B3, D4, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h
index 446e0aa65c..5994219592 100644
--- a/keyboards/rart/rartland/config.h
+++ b/keyboards/rart/rartland/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { B4, A7, A5, A6, C3 }
 #define MATRIX_COL_PINS { B0, A1, B1, A2, B2, A3, B3, A4, C7, C6, D0, C5, D1, C4 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN A0
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/rart/rartlite/config.h b/keyboards/rart/rartlite/config.h
index 8c8897be54..b73269195a 100644
--- a/keyboards/rart/rartlite/config.h
+++ b/keyboards/rart/rartlite/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, D2, B2, B4, B6, B5, D0, D1 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B3, F7, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index d35681aaa0..495f6f99ba 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B6, F6, D0, D4, C6 }
 #define MATRIX_COL_PINS { B2, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
index efffd3c9e2..3859a34ca1 100644
--- a/keyboards/rate/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D3}
-#define UNUSED_PINS
 
 #define USE_I2C
 
diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index 5363f76df4..bd682d1a90 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3}
-#define UNUSED_PINS
 
 #define USE_I2C
 
diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
index 06db2459d2..55f6456874 100644
--- a/keyboards/rate/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, E6, D7, C6, D4 }
 #define MATRIX_COL_PINS { B3, B1, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/rate/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h
index 40325c35eb..464a68af72 100644
--- a/keyboards/rate/pistachio_pro/config.h
+++ b/keyboards/rate/pistachio_pro/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { D4, C6, D7, B3, B4, B5 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, D6 }
-#define UNUSED_PINS
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/recompile_keys/choco60/rev1/config.h b/keyboards/recompile_keys/choco60/rev1/config.h
index c5efc6f5f0..d8b3d2904d 100644
--- a/keyboards/recompile_keys/choco60/rev1/config.h
+++ b/keyboards/recompile_keys/choco60/rev1/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/recompile_keys/choco60/rev2/config.h b/keyboards/recompile_keys/choco60/rev2/config.h
index 46aef108d8..5db3a06352 100644
--- a/keyboards/recompile_keys/choco60/rev2/config.h
+++ b/keyboards/recompile_keys/choco60/rev2/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* The last three NO_PIN are dummies to make the same size as MATRIX_ROW_PINS_RIGHT. */
 #define MATRIX_COL_PINS { C6, B4, B3, B2, B1, B0, NO_PIN, NO_PIN, NO_PIN }
 #define MATRIX_COL_PINS_RIGHT { C7, B7, B6, B5, B4, B3, B2, C6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/recompile_keys/cocoa40/config.h b/keyboards/recompile_keys/cocoa40/config.h
index e85bed8b14..caf109a72f 100644
--- a/keyboards/recompile_keys/cocoa40/config.h
+++ b/keyboards/recompile_keys/cocoa40/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
index 2a7668d3f5..155228fef6 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F1, F0, F4, F7, F6, F5 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/recompile_keys/nomu30/rev1/config.h b/keyboards/recompile_keys/nomu30/rev1/config.h
index 718c840bd6..e9ef483924 100644
--- a/keyboards/recompile_keys/nomu30/rev1/config.h
+++ b/keyboards/recompile_keys/nomu30/rev1/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D1, D0, D4 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/recompile_keys/nomu30/rev2/config.h b/keyboards/recompile_keys/nomu30/rev2/config.h
index 49d80a7162..f69bae591a 100644
--- a/keyboards/recompile_keys/nomu30/rev2/config.h
+++ b/keyboards/recompile_keys/nomu30/rev2/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B2, B1, B0 }
 #define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, D5, D4, D3 }
-#define UNUSED_PINS { C2, D0, D1, D2, D6 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/redscarf_i/config.h b/keyboards/redscarf_i/config.h
index 218874010d..494afb5e2b 100644
--- a/keyboards/redscarf_i/config.h
+++ b/keyboards/redscarf_i/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* Backlight */
diff --git a/keyboards/redscarf_iiplus/verb/config.h b/keyboards/redscarf_iiplus/verb/config.h
index 34a7dba6ac..07d3979bef 100755
--- a/keyboards/redscarf_iiplus/verb/config.h
+++ b/keyboards/redscarf_iiplus/verb/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { }
 #define MATRIX_COL_PINS { F4, F1, F0, B3, D0, D1, D4, D5, D6, D7, F7, F6, D2, D3, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/redscarf_iiplus/verc/config.h b/keyboards/redscarf_iiplus/verc/config.h
index 34a7dba6ac..07d3979bef 100755
--- a/keyboards/redscarf_iiplus/verc/config.h
+++ b/keyboards/redscarf_iiplus/verc/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { }
 #define MATRIX_COL_PINS { F4, F1, F0, B3, D0, D1, D4, D5, D6, D7, F7, F6, D2, D3, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h
index 281a6efb6c..44b08645b4 100644
--- a/keyboards/redscarf_iiplus/verd/config.h
+++ b/keyboards/redscarf_iiplus/verd/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { }
 #define MATRIX_COL_PINS { F4, F1, F0, B3, D0, D1, D4, D5, D6, D7, F7, F6, D2, D3, B6, B5, B4, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index fb695474f5..f2621902bf 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, B8 }
 #define MATRIX_COL_PINS { A5, A4, A3, F0, C15, C14, C13, A6, B11, B10, B2, B1, B0, A7, A14, A15 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index 9d498b0542..aa3e5b930b 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* NIU Mini PCB default pin-out */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index baf56d8035..4a009b053c 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7}
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B1, B3, B2, B6, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reviung/reviung34/config.h b/keyboards/reviung/reviung34/config.h
index a59e82be54..5bc0cf98fc 100755
--- a/keyboards/reviung/reviung34/config.h
+++ b/keyboards/reviung/reviung34/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7}
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reviung/reviung39/config.h b/keyboards/reviung/reviung39/config.h
index 88b229e684..f6b6403ffd 100644
--- a/keyboards/reviung/reviung39/config.h
+++ b/keyboards/reviung/reviung39/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 45e29b7baa..0ef09997bf 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F4, F5, F6, F7, B1, B3, B2 }
 #define MATRIX_COL_PINS \
     { D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index a3413cfe45..2e28af7a65 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F4 }
 #define MATRIX_COL_PINS \
     { D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index 7baa0f910f..fcfbe8194d 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { D0, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/reviung/reviung61/config.h b/keyboards/reviung/reviung61/config.h
index 82293a2e86..cc3039ab59 100644
--- a/keyboards/reviung/reviung61/config.h
+++ b/keyboards/reviung/reviung61/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rmkeebs/rm_numpad/config.h b/keyboards/rmkeebs/rm_numpad/config.h
index 3d7a6a7efa..1c3a48cba5 100644
--- a/keyboards/rmkeebs/rm_numpad/config.h
+++ b/keyboards/rmkeebs/rm_numpad/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B4, F7, C7, C6, F1, F0  }
 #define MATRIX_COL_PINS { F4, F5, F6, B5, B6 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h
index e7f7d92016..97a18443a1 100644
--- a/keyboards/rominronin/katana60/rev1/config.h
+++ b/keyboards/rominronin/katana60/rev1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F5, F6, F4, F1, D0 }
 #define MATRIX_COL_PINS { B7, B3, B2, B1, B0, C7, D1, D2, C6, B6, B5, B4, D4, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h
index e1441acdfc..0671c86044 100644
--- a/keyboards/rominronin/katana60/rev2/config.h
+++ b/keyboards/rominronin/katana60/rev2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, E6, D5, B4, B5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, D6, D4, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/roseslite/config.h b/keyboards/roseslite/config.h
index c323bbbfed..f499c29de3 100644
--- a/keyboards/roseslite/config.h
+++ b/keyboards/roseslite/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rotr/config.h b/keyboards/rotr/config.h
index c16d420910..d8cd526654 100644
--- a/keyboards/rotr/config.h
+++ b/keyboards/rotr/config.h
@@ -17,7 +17,6 @@
 /*Sets the number of pulses per increment*/
 #define ENCODER_RESOLUTION 2
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h
index fb5c072fff..13c6694b05 100644
--- a/keyboards/rpiguy9907/southpaw66/config.h
+++ b/keyboards/rpiguy9907/southpaw66/config.h
@@ -28,7 +28,6 @@
 
 #define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rubi/config.h b/keyboards/rubi/config.h
index 6e773bf055..b4efca2997 100644
--- a/keyboards/rubi/config.h
+++ b/keyboards/rubi/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { B3, B2, B1, F7 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { D7 }
 #define ENCODERS_PAD_B { D6 }
diff --git a/keyboards/runes/skjoldr/config.h b/keyboards/runes/skjoldr/config.h
index b74eed3904..bc4d4c0fe9 100644
--- a/keyboards/runes/skjoldr/config.h
+++ b/keyboards/runes/skjoldr/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D6, D7, B4, B5, B0 }
 #define MATRIX_COL_PINS { B7, D0, D1, D2, D3, B3, E6, D5, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
index 1a2f1a202e..060d6843ef 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B3, B7, B0, F7, C6 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, D0, D1, D6, D4, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index e7b1fd5b87..1df607db43 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { B2, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 7fe0e39988..447d2ca05a 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D7, C6, D4, D0, D1 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, F0, F1, B4, B5, B7, D5, C7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ryanbaekr/rb86/config.h b/keyboards/ryanbaekr/rb86/config.h
index af10504520..e2541efe2b 100644
--- a/keyboards/ryanbaekr/rb86/config.h
+++ b/keyboards/ryanbaekr/rb86/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, D7 }
 #define MATRIX_COL_PINS { B6, B5, D5, C7, F1, F0, D3, D2, D1, D0, D4, E6, B7, C6, F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index 4fea945a5c..92a35f9fdd 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
index 4a3b14a496..2c506e8bc2 100644
--- a/keyboards/sandwich/keeb68/config.h
+++ b/keyboards/sandwich/keeb68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { B6, C6, F7, E6, B7, D0, D1, D2, D3, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS { D5, B0 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sauce/mild/config.h b/keyboards/sauce/mild/config.h
index 99c89fdd16..989980b79e 100644
--- a/keyboards/sauce/mild/config.h
+++ b/keyboards/sauce/mild/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { C13, C14, C15, A15, F0, F1 }
 #define MATRIX_COL_PINS { A10, A9, A8, B11, B10, B2, B1, B0, A7, A5, A4, A3, A2, A1, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
index 2452804ff0..6643409761 100644
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ b/keyboards/sawnsprojects/amber80/solder/config.h
@@ -38,7 +38,6 @@
  */
 #define MATRIX_ROW_PINS { B1, B2, B3, B7, D0, D1, F1, F0, D7, B4, D5, D3 }
 #define MATRIX_COL_PINS { F4, F6, F7, C7, C6, B6, B5, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
index 66283bff69..5e0614f58e 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
index c48080d59f..d545886dc0 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, B2, D4, F1, F0 }
 #define MATRIX_COL_PINS { B7, B3, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D0, D5, D6, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
index 1638e35ac6..54318a485b 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 }
-#define UNUSED_PINS
 
 /* indicator */
 //  #define LED_CAPS_LOCK_PIN F0
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
index cec49e65ae..b536e66c1f 100644
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F6, F7, F0, F4, B1 }
 #define MATRIX_COL_PINS { B2, B5, F5, C7, B4, C6, D7, D6, D4, D5, D3, D2, B6, D1, D0 }
-#define UNUSED_PINS
 
 /* indicator */
 //  #define LED_CAPS_LOCK_PIN F0
diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h
index c72b7be68e..e271984760 100644
--- a/keyboards/scatter42/config.h
+++ b/keyboards/scatter42/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index 2f656805ea..fb0f5d3b4a 100644
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C4, C5, D1 }
 #define MATRIX_COL_PINS { B4, B5, B6, B7, C7, D0 }
-#define UNUSED_PINS
 
 
 #define ENCODERS_PAD_A { D2 }
diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h
index 97a8cf476f..95d9f66318 100644
--- a/keyboards/sck/m0116b/config.h
+++ b/keyboards/sck/m0116b/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { D5, D3, D2, D0, B3, B2, B1, B0, E6, B5, B6, C6, C7, F7, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h
index 2b0d3ec458..254e0a6d11 100644
--- a/keyboards/sck/neiso/config.h
+++ b/keyboards/sck/neiso/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F4 }
 #define MATRIX_COL_PINS \
     { B3, D2, F5, F7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 986047c35b..b83eee8dd5 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sekigon/grs_70ec/config.h b/keyboards/sekigon/grs_70ec/config.h
index 422d7e2fac..b2e1882574 100644
--- a/keyboards/sekigon/grs_70ec/config.h
+++ b/keyboards/sekigon/grs_70ec/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_CHANNELS { 2, 1, 0, 3, 5, 7, 6, 4 }
-#define UNUSED_PINS
 #define DISCHARGE_PIN B1
 #define ANALOG_PORT F6
 #define MUX_SEL_PINS { D1, D0, D4 }
diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index 2038c58f44..68571b63c7 100644
--- a/keyboards/senselessclay/ck65/config.h
+++ b/keyboards/senselessclay/ck65/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 }
 #define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
 
-//#define UNUSED_PINS { B0, B7, E6 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index 972befc147..724e47e797 100644
--- a/keyboards/senselessclay/gos65/config.h
+++ b/keyboards/senselessclay/gos65/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B1, B2, F1, F6, F5 }
 #define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
 
-//#define UNUSED_PINS { B0, B7, E6 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h
index ba4619b956..9ec21ffa84 100644
--- a/keyboards/senselessclay/had60/config.h
+++ b/keyboards/senselessclay/had60/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F1, F0, F7, F6, F5 }
 #define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, D4 }
 
-#define UNUSED_PINS { B0, B7, E6 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
index 341bad6b67..a3b13ac2f7 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_pad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F5, F0, B5, D6, D4 }
 #define MATRIX_COL_PINS { C7, D5, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h
index 3f08499531..07fe864df3 100644
--- a/keyboards/sentraq/s60_x/default/config.h
+++ b/keyboards/sentraq/s60_x/default/config.h
@@ -16,7 +16,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 }
-#define UNUSED_PINS { F0 }
 
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index 63abf8cc21..ad44cb80fc 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -16,7 +16,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
-#define UNUSED_PINS
 
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index e1e829b3ae..cc7fd7e753 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN B7
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index 61a468a33c..2381a7c7d1 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
-#define UNUSED_PINS
 
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h
index 9181a49be1..d83cc7c635 100644
--- a/keyboards/sergiopoverony/creator_pro/config.h
+++ b/keyboards/sergiopoverony/creator_pro/config.h
@@ -37,5 +37,4 @@
 #define ENCODERS_PAD_B { D3 }
 #define ENCODER_RESOLUTION 1
 
-#define UNUSED_PINS
 
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index f3828b023c..e24468054e 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -36,7 +36,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B2, B3, D3, D4, D5, D6 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, B1, B0, D0, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h
index 063c883381..52dc73121e 100644
--- a/keyboards/shambles/config.h
+++ b/keyboards/shambles/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F5, B3, B1, F7 }
 #define MATRIX_COL_PINS { D3, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, F4, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/shapeshifter4060/config.h b/keyboards/shapeshifter4060/config.h
index 2873ae72c9..0846a73e0a 100644
--- a/keyboards/shapeshifter4060/config.h
+++ b/keyboards/shapeshifter4060/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D0, D1, B1, B3, B2, B6, B5, B4, E6, D7, C6, D4 }
-#define UNUSED_PINS     { D2, D3 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h
index 1fd31866d2..c2bb97a1cc 100644
--- a/keyboards/shiro/config.h
+++ b/keyboards/shiro/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/shk9/config.h b/keyboards/shk9/config.h
index 589fad2c8d..a23a37cb53 100644
--- a/keyboards/shk9/config.h
+++ b/keyboards/shk9/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { B0, B1, B2 }
 #define MATRIX_COL_PINS { B3, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/signum/3_0/elitec/config.h b/keyboards/signum/3_0/elitec/config.h
index fdbfac3c93..0c8ad2e414 100644
--- a/keyboards/signum/3_0/elitec/config.h
+++ b/keyboards/signum/3_0/elitec/config.h
@@ -5,4 +5,3 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D1, F5, B5 }
 #define MATRIX_COL_PINS { B4, D7, D0, E6, D4, F6, F4, F7, B1, B3, C6, B2 }
-#define UNUSED_PINS
diff --git a/keyboards/signum/3_0/teensy/config.h b/keyboards/signum/3_0/teensy/config.h
index 343131fce0..2a81c0f565 100644
--- a/keyboards/signum/3_0/teensy/config.h
+++ b/keyboards/signum/3_0/teensy/config.h
@@ -19,5 +19,4 @@
 // clang-format off
 #define MATRIX_ROW_PINS { B0, B3, F6, C7 }
 #define MATRIX_COL_PINS { C6, D2, B7, D3, D0, F7, F5, B6, B5, B4, D1, D7 }
-#define UNUSED_PINS
 // clang-format on
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 185b3ef067..28339ff431 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
index 82e3ed00f1..e612ba93b2 100644
--- a/keyboards/singa/config.h
+++ b/keyboards/singa/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index 781eb23a7e..de3df5afbf 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index 3b5ce9692a..db7c1ab7a4 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index 164bce68bf..b9ea8fdb77 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, C6, C7, F7, F6 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
index 9668da656f..54c83eb469 100644
--- a/keyboards/skergo/config.h
+++ b/keyboards/skergo/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B4, B3, B2, B1 }
 #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
index 69aac0b560..ee624d5380 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ b/keyboards/skippys_custom_pcs/rooboard65/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h
index 7d8fe627e9..493de6ee32 100644
--- a/keyboards/skippys_custom_pcs/roopad/config.h
+++ b/keyboards/skippys_custom_pcs/roopad/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B5, F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { F0, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h
index 6aa113dcb6..7b20cd14bb 100644
--- a/keyboards/slz40/config.h
+++ b/keyboards/slz40/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, B5, B3, B2, B6 }
 #define MATRIX_COL_PINS { F4, D2, F5, D1, F6, D0, F7, D4, B1, C6, E6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 5d934dd937..20a9f2d88a 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -35,7 +35,6 @@
  */
 #define MATRIX_ROW_PINS {C7, C6 }
 #define MATRIX_COL_PINS {F7, F6, F5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h
index fdb3b9a909..7b764cb5a4 100644
--- a/keyboards/smk60/config.h
+++ b/keyboards/smk60/config.h
@@ -12,7 +12,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, F0, F1, F5, B2 }
 #define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F6, F7, F4, B1, B3, D0, D1, D2, D3, D5}
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h
index 816a0449be..5e776fe52c 100644
--- a/keyboards/snampad/config.h
+++ b/keyboards/snampad/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3  }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index 6d56aece7c..4f2ecec285 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
 #define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index 0218fc0675..87ce572c4e 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
 #define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index 7c7f3b0ad9..90112a26c1 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, B7 }
 #define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 1e02d62d76..90dc75d195 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, B0}
 #define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index 140cb58bf1..32c567f910 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, D0, D1, D2, D3}
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h
index f4810d0fa8..10f30a7283 100644
--- a/keyboards/soup10/config.h
+++ b/keyboards/soup10/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3
 #define MATRIX_ROW_PINS { D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 444ac403bb..44d75e670a 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -27,7 +27,6 @@
 // key matrix pins
 #define MATRIX_ROW_PINS { C14, C15, A0, A1, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10 }
-#define UNUSED_PINS
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index 9523e02e9d..e4752f9425 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -29,7 +29,6 @@
     { C14, C15, A0, A1, A2, A3 }
 #define MATRIX_COL_PINS \
     { A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3 }
-#define UNUSED_PINS
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h
index 6d8d5554c4..9800b3f13e 100644
--- a/keyboards/soy20/config.h
+++ b/keyboards/soy20/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, B6, B7, C7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
index 01786911ce..2a4b2889d0 100644
--- a/keyboards/spaceman/2_milk/config.h
+++ b/keyboards/spaceman/2_milk/config.h
@@ -25,7 +25,6 @@
     {D4}, \
     {C6}  \
 }
-#define UNUSED_PINS
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN B6
diff --git a/keyboards/spaceman/pancake/rev1/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h
index cb80721e46..c593147151 100644
--- a/keyboards/spaceman/pancake/rev1/feather/config.h
+++ b/keyboards/spaceman/pancake/rev1/feather/config.h
@@ -19,6 +19,5 @@
 /* Pancake default pinout */
 #define MATRIX_ROW_PINS { B5, D7, C6, D0 }
 #define MATRIX_COL_PINS { C7, D6, B7, B6, F0, D2, D3, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 #define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/spaceman/pancake/rev1/promicro/config.h b/keyboards/spaceman/pancake/rev1/promicro/config.h
index ee02bff2b8..e96d9f152c 100644
--- a/keyboards/spaceman/pancake/rev1/promicro/config.h
+++ b/keyboards/spaceman/pancake/rev1/promicro/config.h
@@ -19,4 +19,3 @@
 /* Pancake default pinout */
 #define MATRIX_ROW_PINS { B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, E6, B4, B5, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS
\ No newline at end of file
diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h
index f63b136140..15d483a82e 100644
--- a/keyboards/spaceman/pancake/rev2/config.h
+++ b/keyboards/spaceman/pancake/rev2/config.h
@@ -24,4 +24,3 @@
 
 #define MATRIX_ROW_PINS { C7, C6, B6, B5 }
 #define MATRIX_COL_PINS { B7, B3, B2, B1 ,B0, E6, F0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h
index 05fce09fb0..6f4c4e4050 100644
--- a/keyboards/spaceman/yun65/config.h
+++ b/keyboards/spaceman/yun65/config.h
@@ -24,4 +24,3 @@
 #define MATRIX_ROW_PINS { E6, D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7, D5, B3 }
 
-#define UNUSED_PINS
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index 7b0f43efcd..b331c8bcab 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h
index 0bf33d8afa..7d10b50460 100644
--- a/keyboards/specskeys/config.h
+++ b/keyboards/specskeys/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h
index a6988896af..5f97aa585d 100644
--- a/keyboards/splitish/config.h
+++ b/keyboards/splitish/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F4 , F5 , F6 , F7 , B1 , B3 , C6 , D4 , D0 , D1 , D2 , D3 }
 #define MATRIX_ROW_PINS { B4 , B5 , B2 , B6 }
 #define DIODE_DIRECTION COL2ROW
-#define UNUSED_PINS
 
 #define DEBOUNCE 5
 
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 2fc34070f4..87ec1021bf 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B4, E6, D7, D4 }
 #define MATRIX_COL_PINS \
     { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A \
     { C6 }
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 8ff3813964..15e4e7bd3b 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { D4, C6, D7, E6 }
 #define MATRIX_COL_PINS_RIGHT \
     { B4, B5, B6, B2, B3, B1, F7, F6 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A \
     { F4 }
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index 9e3fff8cd0..35782781c1 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { E6, F5, F6 }, \
     { F0, F1, F4 }, \
 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { B4 }
 #define ENCODERS_PAD_B { D7 }
diff --git a/keyboards/sporewoh/banime40/config.h b/keyboards/sporewoh/banime40/config.h
index 55b93ce1f5..0f292315f1 100644
--- a/keyboards/sporewoh/banime40/config.h
+++ b/keyboards/sporewoh/banime40/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { E6, D7, C6, D4 }
 #define MATRIX_COL_PINS { B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
 
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h
index 7f90993265..7efe58f50f 100644
--- a/keyboards/star75/config.h
+++ b/keyboards/star75/config.h
@@ -12,7 +12,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h
index e60b7d598b..555975b02d 100644
--- a/keyboards/stello65/beta/config.h
+++ b/keyboards/stello65/beta/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { C7, B6, B5, B4, D7, D6, D4, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h
index dbc5bf732c..3da4275402 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { F1, F0, D1, D2, B6, C6, C7, F7, F6, F5 }
 #define MATRIX_COL_PINS { E6, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h
index 1d98f23a17..f7096308a6 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { C7, B4, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h
index ae95db5162..13e54db7bc 100644
--- a/keyboards/stratos/config.h
+++ b/keyboards/stratos/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
 #define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h
index 219b2792bf..f1bf9769be 100644
--- a/keyboards/subatomic/config.h
+++ b/keyboards/subatomic/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
 #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, C6, C5 }
-#define UNUSED_PINS
 
 // #define AUDIO_VOICES
 // #define AUDIO_PIN C6
diff --git a/keyboards/subrezon/la_nc/config.h b/keyboards/subrezon/la_nc/config.h
index 3770bdc26e..3cd6391e16 100644
--- a/keyboards/subrezon/la_nc/config.h
+++ b/keyboards/subrezon/la_nc/config.h
@@ -12,7 +12,6 @@
 #define MATRIX_COLS 10
 #define MATRIX_COL_PINS {B3, B1, F7, F6, F5, D4, C6, D7, E6, B4}
 
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
 
diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h
index b377e8735b..84c71b0195 100644
--- a/keyboards/superuser/ext/config.h
+++ b/keyboards/superuser/ext/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { B2, B1, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h
index f025de6dc0..021cb0f57d 100644
--- a/keyboards/superuser/frl/config.h
+++ b/keyboards/superuser/frl/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h
index 9877485101..768cd26fa6 100644
--- a/keyboards/superuser/tkl/config.h
+++ b/keyboards/superuser/tkl/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B2, D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index af6c447091..5e3724c330 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -34,7 +34,6 @@
 */
 //#define MATRIX_ROW_PINS { D0, D5 }
 //#define MATRIX_COL_PINS { F1, F0, B0 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h
index f5ab736f40..7b159eb5d6 100644
--- a/keyboards/switchplate/southpaw_fullsize/config.h
+++ b/keyboards/switchplate/southpaw_fullsize/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E1, C0, C1, C2, C3, C4 }
 #define MATRIX_COL_PINS { A7, C7, C6, C5, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, E0, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h
index d0fb70988d..4e63d15919 100644
--- a/keyboards/switchplate/switchplate910/config.h
+++ b/keyboards/switchplate/switchplate910/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, D1 }
 #define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, B3, B2, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h
index b24710f78c..9ec51b0b58 100755
--- a/keyboards/sx60/config.h
+++ b/keyboards/sx60/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // MCP23018 pinout:
 // Rows: B4, B3, B2, B1, B0
 // Cols: A0, A1, A2, A3, A4, A5, A6, A7
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/synapse/config.h b/keyboards/synapse/config.h
index a06269b437..b4311c1402 100644
--- a/keyboards/synapse/config.h
+++ b/keyboards/synapse/config.h
@@ -27,7 +27,6 @@
 #define MATRIX_COL_PINS \
     { F0, D4, F5, B1, B2, B3, B7, D0, D1, D2, D3, B6 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 4a50e4d64c..50a6e6f9d7 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -30,7 +30,6 @@
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D7, C7, C6, B6, B5, B4, D6, D4, E6, D5, D3, D2, B7, B0 }
-#define UNUSED_PINS
 
 /*
  * Diode Direction
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h
index e6dfb6383b..2aac9d3174 100755
--- a/keyboards/tada68/config.h
+++ b/keyboards/tada68/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {D0,D1,F6,F7,D5}
 #define MATRIX_COL_PINS {F0,F1,E6,C7,C6,B7,D4,B1,B0,B5,B4,D7,D6,B3,F4}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index 0806c1068d..aa675c32ad 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D7, B2, B6, D0, D4, C6}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
index 3d769ab896..10c70e472b 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h
index ebb5d696c4..adcf8d7321 100644
--- a/keyboards/takashicompany/dogtag/config.h
+++ b/keyboards/takashicompany/dogtag/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS_RIGHT { B2, B6, B3 }
 #define MATRIX_COL_PINS_RIGHT { B1, F7, F6, F5, F4 }
 
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
index 5c8236c700..f74b828516 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B3, B2, B6, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index 4ca06fab2b..fa31dccb90 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
index 25a74dc4d7..0c8def659f 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index 24d5aa11fe..f71e3de280 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D0, D4, C6, D7}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index 49cb1f7e09..468a850f4b 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index 610ca4de66..05f1d35c83 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 }
 #define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 }
-#define UNUSED_PINS
 #define SOFT_SERIAL_PIN D1 // or D1, D2, D3, E6
 //#define USE_I2C
 
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index a91df15b08..74373a5752 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B4,B5 }
 #define MATRIX_COL_PINS { E6,D7,C6,D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index 402737dc71..4bb4a1fcde 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B2,B6 }
 #define MATRIX_COL_PINS { D7,E6,B4,B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
index a2ad901198..3eb84cc6b3 100644
--- a/keyboards/takashiski/otaku_split/rev0/config.h
+++ b/keyboards/takashiski/otaku_split/rev0/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B5,B4,E6,D7,C6 }
 #define MATRIX_COL_PINS { B6,B2,B3,B1,F7,F6,F5,F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
index 1fc9d4f16c..099f20f5d0 100644
--- a/keyboards/takashiski/otaku_split/rev1/config.h
+++ b/keyboards/takashiski/otaku_split/rev1/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 }
 #define MATRIX_ROW_PINS_RIGHT { B5,B4,E6,D7,C6 }
 #define MATRIX_COL_PINS_RIGHT { B6,B2,B3,B1,F7,F6,F5,F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
index f29c1384dd..c3d229bfc7 100644
--- a/keyboards/taleguers/taleguers75/config.h
+++ b/keyboards/taleguers/taleguers75/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index 164eac346f..52ecb78365 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_COL_PINS {  B3 , B2 , B6 , B5 , B4 , E6 , D7 , C6 , F4 , F5 , F6 }
 #define MATRIX_ROW_PINS {  F7 , B1 , D4 , D0 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h
index d7e6ffe1bb..f926f644e3 100755
--- a/keyboards/tau4/config.h
+++ b/keyboards/tau4/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F1, F0, B0, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index 11c4c71878..d021cdb21b 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4 }
 #define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3, D0, D1, D2}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/teleport/numpad/config.h b/keyboards/teleport/numpad/config.h
index e3a2f17898..6294ac7e5f 100644
--- a/keyboards/teleport/numpad/config.h
+++ b/keyboards/teleport/numpad/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D7, D4, D6, B4, B5 }
 #define MATRIX_COL_PINS { F6, F5, F7, F4 }
-#define UNUSED_PINS { B0, B1, B2, B3, B6, B7, D0, D1, D2, D3, D5, F0, F1, E6, C6, C7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tender/macrowo_pad/config.h b/keyboards/tender/macrowo_pad/config.h
index 17f5597ec8..bdfe120bf0 100644
--- a/keyboards/tender/macrowo_pad/config.h
+++ b/keyboards/tender/macrowo_pad/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, D7 }
 #define MATRIX_COL_PINS { E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h
index 7f810e7666..3be9c91d2e 100644
--- a/keyboards/tenki/config.h
+++ b/keyboards/tenki/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, B4, F6, B6, B2 }
 #define MATRIX_COL_PINS { F4, F5, D4, D0 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h
index 911a4f3be9..ec4ded7eb9 100644
--- a/keyboards/terrazzo/config.h
+++ b/keyboards/terrazzo/config.h
@@ -31,7 +31,6 @@
 #define MATRIX_ROW_PINS { D2, D7, E6, B4, B5, B6, B2, B3, F0 }
 #define MATRIX_COL_PINS { D3, F4, F5, F6, F7, B1 }
 
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 /* ROTARY ENCODERS */
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
index fe80aefa37..a9e539fb00 100755
--- a/keyboards/tetris/config.h
+++ b/keyboards/tetris/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, E6 }
 #define MATRIX_COL_PINS { D7, B4, B6, C6, C7, F6, F7, D4, D2, D3, D5, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 918eab800c..4fc734fb0f 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  //                        0   1   2   3   4   5   6   7
 #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1 }
 #define MATRIX_COL_PINS { D3, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h
index e2efccb633..9a12407b35 100644
--- a/keyboards/tgr/910/config.h
+++ b/keyboards/tgr/910/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
 #define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A1, A0 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
index f69f48a121..a7b88609c3 100644
--- a/keyboards/tgr/910ce/config.h
+++ b/keyboards/tgr/910ce/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                         0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B1, B2, B3, B4, B5, B6 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS {}
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/tgr/jane/v2/config.h b/keyboards/tgr/jane/v2/config.h
index 4618c99ce0..415455c929 100644
--- a/keyboards/tgr/jane/v2/config.h
+++ b/keyboards/tgr/jane/v2/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/tgr/jane/v2ce/config.h b/keyboards/tgr/jane/v2ce/config.h
index e0f8a7c861..37c3e962a6 100644
--- a/keyboards/tgr/jane/v2ce/config.h
+++ b/keyboards/tgr/jane/v2ce/config.h
@@ -24,7 +24,6 @@
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h
index f24759f4db..2066eefefb 100644
--- a/keyboards/the_royal/liminal/config.h
+++ b/keyboards/the_royal/liminal/config.h
@@ -8,7 +8,6 @@
 
 #define MATRIX_ROW_PINS { C6, B6, B7, C7 }
 #define MATRIX_COL_PINS { D6, C4, D3, D2, D1, D0, C2, B0, B1, B2, B3, B4, D5, C5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
index 5ea20a5e00..20fbae923f 100644
--- a/keyboards/the_royal/schwann/config.h
+++ b/keyboards/the_royal/schwann/config.h
@@ -8,7 +8,6 @@
 
 #define MATRIX_ROW_PINS { F0, F1, F6, C7 }
 #define MATRIX_COL_PINS { F4, F5, D5, D3, D2, C6, B6, B5, B4, D7, D6, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/the_uni/pro_micro/config.h b/keyboards/the_uni/pro_micro/config.h
index ff965d7744..61a866d8db 100644
--- a/keyboards/the_uni/pro_micro/config.h
+++ b/keyboards/the_uni/pro_micro/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, B2, B6 }
 #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B5, B4, E6, D7, C6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/the_uni/usb_c/config.h b/keyboards/the_uni/usb_c/config.h
index 3110c0d821..c45b450838 100644
--- a/keyboards/the_uni/usb_c/config.h
+++ b/keyboards/the_uni/usb_c/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, D6, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D5, D3, D2, D1, D0, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
index 042fd276d9..572d332a54 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/config.h
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* NCC-1701-KB PCB default pin-out */
 #define MATRIX_ROW_PINS { D4, D6, D7 }
 #define MATRIX_COL_PINS { B4, B5, B6 }
-#define UNUSED_PINS
 
 /* RGB BackLight */
 #define RGB_DI_PIN B7
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
index 042fd276d9..572d332a54 100644
--- a/keyboards/themadnoodle/noodlepad/config.h
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* NCC-1701-KB PCB default pin-out */
 #define MATRIX_ROW_PINS { D4, D6, D7 }
 #define MATRIX_COL_PINS { B4, B5, B6 }
-#define UNUSED_PINS
 
 /* RGB BackLight */
 #define RGB_DI_PIN B7
diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h
index b0acc5b039..2fd0f470ad 100644
--- a/keyboards/thevankeyboards/bananasplit/config.h
+++ b/keyboards/thevankeyboards/bananasplit/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 }
 #define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/thevankeyboards/caravan/config.h b/keyboards/thevankeyboards/caravan/config.h
index ec35e9e48e..51a98aa181 100644
--- a/keyboards/thevankeyboards/caravan/config.h
+++ b/keyboards/thevankeyboards/caravan/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS { F1, F4, F5, B4, B5, B6, B7, D2, D3, D5, D4, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h
index 74094a183a..143cf4e6ba 100644
--- a/keyboards/thevankeyboards/jetvan/config.h
+++ b/keyboards/thevankeyboards/jetvan/config.h
@@ -44,7 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { D7, B5, F7, D4 }
 #define MATRIX_COL_PINS { D2, D3, D5, D6, B4, B6, F6, F5, F4, F1, F0, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h
index b3ba58985b..69e2bd07af 100644
--- a/keyboards/thevankeyboards/minivan/config.h
+++ b/keyboards/thevankeyboards/minivan/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D7, B5, F7, D4 }
 #define MATRIX_COL_PINS { D2, D3, D5, D6, B4, B6, F6, F5, F4, F1, F0, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h
index 15414ab797..6fd9df7b52 100644
--- a/keyboards/thevankeyboards/roadkit/config.h
+++ b/keyboards/thevankeyboards/roadkit/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F5, D7, B4 }
 #define MATRIX_COL_PINS { F1, F4, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
index 17c7c7698b..3f8d4b58e7 100644
--- a/keyboards/tkc/california/config.h
+++ b/keyboards/tkc/california/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { C7, C6, B6, D4, D3, D0, E6, B0, B1, B2, D2, B3 }
 #define MATRIX_COL_PINS { B5, B4, D7, D6, F7, F6, F5, D5, D1, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 961c254a40..b8a60d8693 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F2, F1, F0, E1, E0 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, C0, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index 45269b5cc4..199954527b 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index eb33e2f2ad..d88d390b8f 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Column pin configuration
  */
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, C0, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 597839326f..5d34276336 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B1, F5, F7, B0, B2, B3 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F6, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h
index 69de5208c6..787c927039 100644
--- a/keyboards/tkw/stoutgat/v1/config.h
+++ b/keyboards/tkw/stoutgat/v1/config.h
@@ -28,6 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { B4, B0 }
 #define ENCODERS_PAD_B { B3, B1 }
 
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index be448dba71..115a652ac8 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D5, D3, D2, D0 }
 #define MATRIX_COL_PINS { D1, D4, F0, F1, F4, F5, F6, F7, D6, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
index c9d44db707..98669c3d99 100644
--- a/keyboards/toad/config.h
+++ b/keyboards/toad/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h
index 8f2d1b7865..9557f130c9 100644
--- a/keyboards/tokyokeyboard/alix40/config.h
+++ b/keyboards/tokyokeyboard/alix40/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D7, C6, C7, B5 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D0, D1, D2, D3, D5, D6 }
-#define UNUSED_PINS
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index 60ed4d8f86..ab36ab7354 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -24,7 +24,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B2, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tominabox1/adalyn/config.h b/keyboards/tominabox1/adalyn/config.h
index 10bcb0e4d5..136a8ae6df 100644
--- a/keyboards/tominabox1/adalyn/config.h
+++ b/keyboards/tominabox1/adalyn/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { C7, D6, B7, B3 }
 #define MATRIX_COL_PINS { D7, B4, B5, B6, C6, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h
index 27142b431c..9e95f1f5c7 100755
--- a/keyboards/tominabox1/bigboy/config.h
+++ b/keyboards/tominabox1/bigboy/config.h
@@ -24,7 +24,6 @@
     { B7, B2, B3 } \
 }
 
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { C6 }
 #define ENCODERS_PAD_B { B6 }
diff --git a/keyboards/tominabox1/le_chiffre/he/config.h b/keyboards/tominabox1/le_chiffre/he/config.h
index bfba9b96be..495cdbbd99 100644
--- a/keyboards/tominabox1/le_chiffre/he/config.h
+++ b/keyboards/tominabox1/le_chiffre/he/config.h
@@ -27,7 +27,6 @@
 
 #define MATRIX_ROW_PINS { B3, D4, F1, C6 }
 #define MATRIX_COL_PINS { F4, F5, B0, B2, B1, B4, D7, C7, D2, F7 }
-#define UNUSED_PINS
 
 /* Define encoder pads */
 #define ENCODERS_PAD_A { D5 }
diff --git a/keyboards/tominabox1/le_chiffre/rev1/config.h b/keyboards/tominabox1/le_chiffre/rev1/config.h
index 0e5b6887cd..220d5b27e0 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/config.h
+++ b/keyboards/tominabox1/le_chiffre/rev1/config.h
@@ -32,7 +32,6 @@
  */
 #define MATRIX_ROW_PINS { B3, D4, F1, C6 }
 #define MATRIX_COL_PINS { F4, F5, B0, B2, B1, B4, D7, C7, D2, F7 }
-#define UNUSED_PINS
 
 /* Define encoder pads */
 #define ENCODERS_PAD_A { D5 }
diff --git a/keyboards/tominabox1/le_chiffre/rev2/config.h b/keyboards/tominabox1/le_chiffre/rev2/config.h
index c37f4775aa..29a4c0bcc3 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/config.h
+++ b/keyboards/tominabox1/le_chiffre/rev2/config.h
@@ -31,7 +31,6 @@
  */
 #define MATRIX_ROW_PINS { B3, F6, F7, C7 }
 #define MATRIX_COL_PINS { B2, F0, F1, F4, F5, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* Define encoder pads */
 #define ENCODERS_PAD_A { B6 }
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/config.h b/keyboards/tominabox1/littlefoot_lx/rev1/config.h
index 2344c8d284..cdfa3ccef2 100644
--- a/keyboards/tominabox1/littlefoot_lx/rev1/config.h
+++ b/keyboards/tominabox1/littlefoot_lx/rev1/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D5, F4, D3, F1, F0 }
 #define MATRIX_COL_PINS { D7, D6, D4, E2, F5, F6, F7, B6, B5, B4 } // uncomment for original groupbuy
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/config.h b/keyboards/tominabox1/littlefoot_lx/rev2/config.h
index d498ca7ab7..15e8583f37 100644
--- a/keyboards/tominabox1/littlefoot_lx/rev2/config.h
+++ b/keyboards/tominabox1/littlefoot_lx/rev2/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D5, F4, D3, F1, F0 }
 #define MATRIX_COL_PINS { D7, D6, D4, C7, F5, F6, F7, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h
index 2181419594..9dc105c867 100644
--- a/keyboards/tominabox1/qaz/config.h
+++ b/keyboards/tominabox1/qaz/config.h
@@ -18,7 +18,6 @@
  */
 #define MATRIX_ROW_PINS { F4, D4, C6, E6, D1, D0 }
 #define MATRIX_COL_PINS { B4, D3, D2, F5, B5, F6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h
index e05b66e8a5..787924cae1 100644
--- a/keyboards/tominabox1/underscore33/rev1/config.h
+++ b/keyboards/tominabox1/underscore33/rev1/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { F5, F6, C6, D0 }
 #define MATRIX_COL_PINS { B4, B5, D5, F7, B1, F4, B3, D7, B0, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
index 9056a25467..c6031c86d4 100644
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ b/keyboards/tominabox1/underscore33/rev2/config.h
@@ -34,7 +34,6 @@
 
 #define MATRIX_ROW_PINS { C4, B0, B1, B2 }
 #define MATRIX_COL_PINS { C5, C6, C7, B7, B6, B5, B4, B3, C2, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/torn/config.h b/keyboards/torn/config.h
index a7043112e7..b36ad9b1d9 100644
--- a/keyboards/torn/config.h
+++ b/keyboards/torn/config.h
@@ -37,7 +37,6 @@
     { D4, D1, D0, D5 }
 #define MATRIX_COL_PINS \
     { B3, B4, B5, B0, D7, D6 }
-#define UNUSED_PINS
 
 #define SECONDARY_ROW_PINS \
     { (1 << 5), (1 << 6), (1 << 7), (1 << 4) }
diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h
index 80a641c6eb..d252e799a3 100644
--- a/keyboards/tr60w/config.h
+++ b/keyboards/tr60w/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, B1, B2, E6, B3 }
 #define MATRIX_COL_PINS { F5, F4, F1, F0, B0, D5, D3, D6, D7, B4, B5, B6, C6, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h
index 99e0148114..31a5602c71 100644
--- a/keyboards/treasure/type9/config.h
+++ b/keyboards/treasure/type9/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { E6, D7, C6 }
 #define MATRIX_COL_PINS { D1, D0, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/treasure/type9s2/config.h b/keyboards/treasure/type9s2/config.h
index ae68a415ea..a231e4523b 100644
--- a/keyboards/treasure/type9s2/config.h
+++ b/keyboards/treasure/type9s2/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments*/
 #define MATRIX_ROW_PINS { B4, B5, D2 }
 #define MATRIX_COL_PINS { B2, B3, C5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index c839cad67b..ba3d30a6bb 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B0, B1, D4, D7, B4 }
 /*                         0   1   2   3   4   5   6   7   8   9  10  11  12  13  14*/
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D6, D5, D3, D2, D1, B7, B3, B2 }
-#define UNUSED_PINS
 #define LED_CAPS_LOCK_PIN E6
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h
index 57307e218c..c813f740d3 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/tw40/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, D5, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
index 9413f09528..7ff07ad42f 100644
--- a/keyboards/uk78/config.h
+++ b/keyboards/uk78/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F3, F2, F1, F0, A0 }
 #define MATRIX_COL_PINS { A2, A1, F5, F4, E6, E7, E5, E4, B7, D0, D1, D2, D3, D4, D5, D6, D7, B5, E0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ungodly/nines/config.h b/keyboards/ungodly/nines/config.h
index 221ee0cf0a..127d462e26 100644
--- a/keyboards/ungodly/nines/config.h
+++ b/keyboards/ungodly/nines/config.h
@@ -27,7 +27,6 @@
     { F7, B1, B3 }, \
     { B2, B6, B5 }  \
 }
-#define UNUSED_PINS
 
 /* Rotary Encoder Assignments */
 #define ENCODERS_PAD_A { C6, E6 }
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
index feb2e32d57..d5fa9cf2f3 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
@@ -49,7 +49,6 @@
 
 #define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
 #define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
index feb2e32d57..d5fa9cf2f3 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
@@ -49,7 +49,6 @@
 
 #define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
 #define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
index 597d287b07..cf78172d43 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
@@ -49,7 +49,6 @@
 
 #define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
 #define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
index 597d287b07..cf78172d43 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
@@ -49,7 +49,6 @@
 
 #define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
 #define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
index 72544405c2..141fce0280 100644
--- a/keyboards/unikeyboard/diverge3/config.h
+++ b/keyboards/unikeyboard/diverge3/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h
index bfebd4563a..e10c1abc6e 100644
--- a/keyboards/unikeyboard/divergetm2/config.h
+++ b/keyboards/unikeyboard/divergetm2/config.h
@@ -35,7 +35,6 @@
 */
 #define MATRIX_ROW_PINS { D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
index e199d0792c..1e59a0dcc3 100644
--- a/keyboards/unikeyboard/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
@@ -18,7 +18,6 @@
 */
 #define MATRIX_ROW_PINS { B2, B3, B1, F7, F6 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h
index 0c6e5a9457..8108713e11 100644
--- a/keyboards/unikorn/config.h
+++ b/keyboards/unikorn/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index 49cbbd9ce5..bd9bba276d 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* NOTE: With Round-Robin matrix, set same pins for both. */
 #define MATRIX_ROW_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 }
 #define MATRIX_COL_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h
index a8a9d4ab7f..f7a1ad9f03 100644
--- a/keyboards/uranuma/config.h
+++ b/keyboards/uranuma/config.h
@@ -18,7 +18,6 @@
  */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D2, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index 9379432dab..7e97b8542c 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -25,7 +25,6 @@
 
 #define MATRIX_ROW_PINS { B4, D5, D0, B2, B3, B0 }
 #define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, C7, C6, D3, E6, D7, D6, D4, D2, D1 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index a076789f2c..7513eed22d 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/vagrant_10/config.h b/keyboards/vagrant_10/config.h
index 18f8e52dd9..1f3b433878 100755
--- a/keyboards/vagrant_10/config.h
+++ b/keyboards/vagrant_10/config.h
@@ -33,7 +33,6 @@ SOFTWARE.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F7, B1, B3, B2 }
 #define MATRIX_COL_PINS { F4, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/viktus/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h
index 0f93d225a6..9842d0ca6c 100644
--- a/keyboards/viktus/at101_bh/config.h
+++ b/keyboards/viktus/at101_bh/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, D4, F6, F5, F7, B6, B5, D5, C7, C6 }
 #define MATRIX_COL_PINS { D1, D0, B7, B3, B2, B1, B0, E6, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
index 456cd33f1d..ab2e130da8 100644
--- a/keyboards/viktus/omnikey_bh/config.h
+++ b/keyboards/viktus/omnikey_bh/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { C2, C3, C4, C7, C1, C0, E1, E0, D7, F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1, B2, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h
index 5d1a15c5f5..fe081689b3 100644
--- a/keyboards/viktus/smolka/config.h
+++ b/keyboards/viktus/smolka/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7, C7, C6 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, D4, B1, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/viktus/styrka/config.h b/keyboards/viktus/styrka/config.h
index a48422a577..118dafb1f7 100644
--- a/keyboards/viktus/styrka/config.h
+++ b/keyboards/viktus/styrka/config.h
@@ -41,7 +41,6 @@ EncA (B6) because it is not used in the default PCB
 All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
 B0, which is unconnected on the PCB
 */
-//#define UNUSED_PINS { B0, B6, B13, B14, B15, B8, B9, B5, B3 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
index 4b9626bc8c..813079bd9f 100644
--- a/keyboards/viktus/z150_bh/config.h
+++ b/keyboards/viktus/z150_bh/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C3, C2, C1, C0, E1 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D7, E0, C7, C6, C5, C4, F0, F1, F2, F3, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index e0caba7bf4..965f9d1893 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { F7, D5, D3, D2, B3, B2, C7, C6, B6, B5, B4, D7, D6, D4, B1 }
-#define UNUSED_PINS
 
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index db2e459d08..a162ff514c 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, D5, C7, C6 }
 #define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, B2, B3, D0, D1, D2, D3, B4, F6 }
-#define UNUSED_PINS
 
 #define ENCODERS_PAD_A { D6 }
 #define ENCODERS_PAD_B { D7 }
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index a2ccf3590e..a28b7c51c9 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D3, F5 }
 #define MATRIX_COL_PINS { F0, F7, F6, F4, F1, E6, D6, D2, B4, D7, B6, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 6b997ddb8f..ac7a26de9e 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { B3, B2, B1, F0, F1 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, D2, D1, D0, D3, D5, D4, B7, D6, D7, B4, B5, B6, C6, C7 }
-#define UNUSED_PINS { E6 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index 8d41112e1b..19eaa6f52d 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B4, D7, D6, B5, B6, D4 }
 #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h
index baac392a40..44b1ef434f 100644
--- a/keyboards/weirdo/tiger910/config.h
+++ b/keyboards/weirdo/tiger910/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, B6, B7, C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, D2, D3, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h
index 7df6be2684..03e179bb32 100644
--- a/keyboards/wekey/polaris/config.h
+++ b/keyboards/wekey/polaris/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, F1, F0, B7, F7, D5, C6, C7, F5, F6 }
 #define MATRIX_COL_PINS { E6, B4, B5, B6, D0, D1, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index 9d7c298863..a02bc1661a 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F1, D7, B4, B5, B6, F6 }
 #define MATRIX_COL_PINS { F4, F5, C7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index e21556b8be..a10c05a926 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS {B4,D7,D6,D4,B3}
 #define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/westfoxtrot/cyclops/config.h b/keyboards/westfoxtrot/cyclops/config.h
index 491ab6ad8b..2f12af61a6 100644
--- a/keyboards/westfoxtrot/cyclops/config.h
+++ b/keyboards/westfoxtrot/cyclops/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D1, D0, D7, B4, F0 }
 #define MATRIX_COL_PINS { D3, D2, D5, D6, B6, B1, B2, B3, C6, C7, F7, F6, F4, F5, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h
index 5c3baeab7f..efb79c1e54 100644
--- a/keyboards/westfoxtrot/cypher/rev1/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, F6, B6, B7, C6, C7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, E6, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index cbceb15e26..5041802a23 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h
index d729b1097e..1e5e7859ba 100644
--- a/keyboards/westfoxtrot/prophet/config.h
+++ b/keyboards/westfoxtrot/prophet/config.h
@@ -11,7 +11,6 @@
 */
 #define MATRIX_ROW_PINS { C13, B2, B1, A4, A3 }
 #define MATRIX_COL_PINS { A6, A7, B0, A9, A8, A14, A15, B3, B4, B5, B8, B7, B6, B9 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h
index 2b062912a6..3ce58330ed 100644
--- a/keyboards/wilba_tech/rama_works_kara/config.h
+++ b/keyboards/wilba_tech/rama_works_kara/config.h
@@ -24,7 +24,6 @@
 // M60-A PCB default pin-out
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h
index 71b0042563..8a02f0bd98 100644
--- a/keyboards/wilba_tech/rama_works_koyu/config.h
+++ b/keyboards/wilba_tech/rama_works_koyu/config.h
@@ -24,7 +24,6 @@
 // KOYU PCB pin-out
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h
index 182c20a97e..d7fe10a965 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_b/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { E6 }
 #define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h
index af1b114932..d42c329b96 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { E6 }
 #define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h
index 7df563cd09..fb6ffd8aba 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_a/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F5, F6 }
 #define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/config.h b/keyboards/wilba_tech/rama_works_m50_ax/config.h
index d01c35bab8..6910e7a7b0 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_ax/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F5, F6 }
 #define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h
index e64de23412..55fa484716 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/config.h
@@ -24,7 +24,6 @@
 // M60-A PCB default pin-out
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h
index 805bf3551e..c753a93841 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_b/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h
index 7aa08490a9..f0eb52940c 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h
@@ -33,7 +33,6 @@
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m6_a/config.h b/keyboards/wilba_tech/rama_works_m6_a/config.h
index 3cb0222b92..d77613628e 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_a/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { E6 }
 #define MATRIX_COL_PINS { D4, B5, F4, D7, C6, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m6_b/config.h b/keyboards/wilba_tech/rama_works_m6_b/config.h
index 0cdbceb124..d6978c8a16 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_b/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { E6 }
 #define MATRIX_COL_PINS { D4, B5, F4, D7, C6, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h
index 756d43231b..44582ada4f 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/config.h
+++ b/keyboards/wilba_tech/rama_works_u80_a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h
index d150fba600..8bd0e08508 100644
--- a/keyboards/wilba_tech/wt60_a/config.h
+++ b/keyboards/wilba_tech/wt60_a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h
index e853ea6cac..a68cfa5ec2 100644
--- a/keyboards/wilba_tech/wt60_b/config.h
+++ b/keyboards/wilba_tech/wt60_b/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h
index b528a2d9fb..cab8276545 100644
--- a/keyboards/wilba_tech/wt60_bx/config.h
+++ b/keyboards/wilba_tech/wt60_bx/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h
index f90acc71ad..47636eef4b 100644
--- a/keyboards/wilba_tech/wt60_c/config.h
+++ b/keyboards/wilba_tech/wt60_c/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_d/config.h b/keyboards/wilba_tech/wt60_d/config.h
index 322357af84..0286015ca0 100644
--- a/keyboards/wilba_tech/wt60_d/config.h
+++ b/keyboards/wilba_tech/wt60_d/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { E6, F0, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, D3, D2, B7, B0, B3, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_g/config.h b/keyboards/wilba_tech/wt60_g/config.h
index 173255ebff..d0087e9d88 100644
--- a/keyboards/wilba_tech/wt60_g/config.h
+++ b/keyboards/wilba_tech/wt60_g/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_g2/config.h b/keyboards/wilba_tech/wt60_g2/config.h
index 4bd0d789ed..f28767c441 100644
--- a/keyboards/wilba_tech/wt60_g2/config.h
+++ b/keyboards/wilba_tech/wt60_g2/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_h1/config.h b/keyboards/wilba_tech/wt60_h1/config.h
index 173255ebff..d0087e9d88 100644
--- a/keyboards/wilba_tech/wt60_h1/config.h
+++ b/keyboards/wilba_tech/wt60_h1/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_h2/config.h b/keyboards/wilba_tech/wt60_h2/config.h
index 173255ebff..d0087e9d88 100644
--- a/keyboards/wilba_tech/wt60_h2/config.h
+++ b/keyboards/wilba_tech/wt60_h2/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_h3/config.h b/keyboards/wilba_tech/wt60_h3/config.h
index 173255ebff..d0087e9d88 100644
--- a/keyboards/wilba_tech/wt60_h3/config.h
+++ b/keyboards/wilba_tech/wt60_h3/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt60_xt/config.h b/keyboards/wilba_tech/wt60_xt/config.h
index 0400af125d..df174cddd1 100644
--- a/keyboards/wilba_tech/wt60_xt/config.h
+++ b/keyboards/wilba_tech/wt60_xt/config.h
@@ -37,7 +37,6 @@
 */
 #define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h
index 37f9db0854..5a03ec52c1 100644
--- a/keyboards/wilba_tech/wt65_a/config.h
+++ b/keyboards/wilba_tech/wt65_a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h
index 2193af9b00..426a0b824b 100644
--- a/keyboards/wilba_tech/wt65_b/config.h
+++ b/keyboards/wilba_tech/wt65_b/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt65_d/config.h b/keyboards/wilba_tech/wt65_d/config.h
index bb707aa191..f0cf1acd52 100644
--- a/keyboards/wilba_tech/wt65_d/config.h
+++ b/keyboards/wilba_tech/wt65_d/config.h
@@ -11,7 +11,6 @@
 // Keyboard Matrix Assignments
 #define MATRIX_ROW_PINS { E6, F0, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, D3, D2, B7, B0, B3, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 // Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed
diff --git a/keyboards/wilba_tech/wt65_f/config.h b/keyboards/wilba_tech/wt65_f/config.h
index a3de9e2eab..0380f44d28 100644
--- a/keyboards/wilba_tech/wt65_f/config.h
+++ b/keyboards/wilba_tech/wt65_f/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt65_fx/config.h b/keyboards/wilba_tech/wt65_fx/config.h
index a3de9e2eab..0380f44d28 100644
--- a/keyboards/wilba_tech/wt65_fx/config.h
+++ b/keyboards/wilba_tech/wt65_fx/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt65_g/config.h b/keyboards/wilba_tech/wt65_g/config.h
index 3955d5b10c..b0f9fc2b54 100644
--- a/keyboards/wilba_tech/wt65_g/config.h
+++ b/keyboards/wilba_tech/wt65_g/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt65_g2/config.h b/keyboards/wilba_tech/wt65_g2/config.h
index 3955d5b10c..b0f9fc2b54 100644
--- a/keyboards/wilba_tech/wt65_g2/config.h
+++ b/keyboards/wilba_tech/wt65_g2/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt65_h1/config.h b/keyboards/wilba_tech/wt65_h1/config.h
index 3955d5b10c..b0f9fc2b54 100644
--- a/keyboards/wilba_tech/wt65_h1/config.h
+++ b/keyboards/wilba_tech/wt65_h1/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt65_xt/config.h b/keyboards/wilba_tech/wt65_xt/config.h
index c4ca70cddf..9cf5524d75 100644
--- a/keyboards/wilba_tech/wt65_xt/config.h
+++ b/keyboards/wilba_tech/wt65_xt/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt65_xtx/config.h b/keyboards/wilba_tech/wt65_xtx/config.h
index f48762e386..612b273b95 100644
--- a/keyboards/wilba_tech/wt65_xtx/config.h
+++ b/keyboards/wilba_tech/wt65_xtx/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt69_a/config.h b/keyboards/wilba_tech/wt69_a/config.h
index 7d3ddfd32f..ff67b45038 100644
--- a/keyboards/wilba_tech/wt69_a/config.h
+++ b/keyboards/wilba_tech/wt69_a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h
index b321563317..fbcfdc77ba 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/config.h
@@ -33,7 +33,6 @@
 */
 #define MATRIX_ROW_PINS { E6, F0, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, D3, D2, D1, D0, B7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h
index b25b50212a..415774aa17 100644
--- a/keyboards/wilba_tech/wt75_a/config.h
+++ b/keyboards/wilba_tech/wt75_a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h
index 50696248e3..d7abac199e 100644
--- a/keyboards/wilba_tech/wt75_b/config.h
+++ b/keyboards/wilba_tech/wt75_b/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B7, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B2, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h
index ff241d88a8..8562e8e18a 100644
--- a/keyboards/wilba_tech/wt75_c/config.h
+++ b/keyboards/wilba_tech/wt75_c/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B7, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h
index 4351e22597..f9708ab33b 100644
--- a/keyboards/wilba_tech/wt80_a/config.h
+++ b/keyboards/wilba_tech/wt80_a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h
index 4880c8a609..b82cbda0d0 100644
--- a/keyboards/wilba_tech/wt80_bc/config.h
+++ b/keyboards/wilba_tech/wt80_bc/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt80_g/config.h b/keyboards/wilba_tech/wt80_g/config.h
index 4880c8a609..b82cbda0d0 100644
--- a/keyboards/wilba_tech/wt80_g/config.h
+++ b/keyboards/wilba_tech/wt80_g/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h
index cf674e1a2c..4e7f58bd77 100644
--- a/keyboards/wilba_tech/wt8_a/config.h
+++ b/keyboards/wilba_tech/wt8_a/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { E6 }
 #define MATRIX_COL_PINS { F4, F1, B2, B6, F6, F7, D5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h
index f6cbbb6a52..b3c0477342 100644
--- a/keyboards/wilba_tech/zeal60/config.h
+++ b/keyboards/wilba_tech/zeal60/config.h
@@ -24,7 +24,6 @@
 // Zeal60 PCB default pin-out
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h
index 6bcc0bb145..27f4fd4b44 100644
--- a/keyboards/wilba_tech/zeal65/config.h
+++ b/keyboards/wilba_tech/zeal65/config.h
@@ -24,7 +24,6 @@
 // Zeal60 PCB default pin-out
 #define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
 #define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index 72477e92d9..71c86f0534 100644
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h
index b3cdc7d58c..7f8a0d6b4c 100644
--- a/keyboards/winkeys/mini_winni/config.h
+++ b/keyboards/winkeys/mini_winni/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key matrix pins */
 #define DIRECT_PINS { { F4, F5, B4, D7 }, { F6, F7, B6, B5 } }
-#define UNUSED_PINS
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
diff --git a/keyboards/wolf/kuku65/config.h b/keyboards/wolf/kuku65/config.h
index e1cd340bd8..3bca2424b9 100644
--- a/keyboards/wolf/kuku65/config.h
+++ b/keyboards/wolf/kuku65/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B3, B2, B1, B0, B7  }
 #define MATRIX_COL_PINS { D0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/ryujin/config.h b/keyboards/wolf/ryujin/config.h
index 01b8e33009..40ca7cb746 100644
--- a/keyboards/wolf/ryujin/config.h
+++ b/keyboards/wolf/ryujin/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { D5, D3, D2, D1, D0  }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h
index fc46723a06..57319a134d 100644
--- a/keyboards/wolf/sabre/config.h
+++ b/keyboards/wolf/sabre/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { D0, D1, F1, F0, B5, B6, C7, C6, F6, F7, F4, F5 }
 #define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
index 6a4ee8e82e..b4d4459bda 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { D2, D3, D6, D4, F6, F7, F5, F0, F4, F1 }
 #define MATRIX_COL_PINS { D1, D5, C7, C6, B6, B5, B4, D7}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index 4effa8de4e..edb6b318b6 100755
--- a/keyboards/woodkeys/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0 }
 #define MATRIX_COL_PINS { B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index 35be87ca2c..6cbad09abf 100755
--- a/keyboards/woodkeys/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0 }
 #define MATRIX_COL_PINS { B4, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index a21cd53189..b6d6997a96 100755
--- a/keyboards/woodkeys/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0 }
 #define MATRIX_COL_PINS { B4, B3, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index f657c86901..fa8ff3ff4a 100755
--- a/keyboards/woodkeys/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B5 }
 #define MATRIX_COL_PINS { B4, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/woodkeys/meira/featherble/config.h b/keyboards/woodkeys/meira/featherble/config.h
index 44f294a06a..fea16a1308 100644
--- a/keyboards/woodkeys/meira/featherble/config.h
+++ b/keyboards/woodkeys/meira/featherble/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { C7, B7, B6, C6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 #define MATRIX_COL_PINS_SCANNED { C7, B7, B6, C6 }
 #define LED_EN_PIN D2
-#define UNUSED_PINS
 
 #define QMK_SPEAKER B5
 #define AUDIO_PIN B5
diff --git a/keyboards/woodkeys/meira/promicro/config.h b/keyboards/woodkeys/meira/promicro/config.h
index 1b9b099d1a..c6d79acccc 100644
--- a/keyboards/woodkeys/meira/promicro/config.h
+++ b/keyboards/woodkeys/meira/promicro/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_SCANNED { B1, B3, B2, B6 }
 
 #define LED_EN_PIN D2
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index a2ad6030c8..6d06b88303 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS \
     { F5, NO_PIN }
 #define MATRIX_COL_PINS { B3, B2, B1, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index a7f5e165b1..f6a76fd88c 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F0, F1, F4, F5 }
 #define MATRIX_COL_PINS \
     { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION        COL2ROW
diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
index 57d481be50..119233ad9f 100644
--- a/keyboards/wren/config.h
+++ b/keyboards/wren/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D3, D2, C6, D4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D7, F0 }
-#define UNUSED_PINS
 
 // define encoders
 #define ENCODERS_PAD_A \
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index 9ebb234264..8957b1e6b3 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, B4, B5 }
 #define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5, D1, D0, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index 5dd30538fc..993ddde53d 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, B4, B5, D1 }
 #define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h
index 6ecd9189bc..61d2c33f79 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -10,7 +10,6 @@
 
 #define MATRIX_ROW_PINS { B5, B4, D7, D6 }
 #define MATRIX_COL_PINS { E6, F0, F1, C7, C6, B6, D4, D5, D3, D2, D1, D0, B7, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h
index da99ac4ae2..fec6e57d03 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -10,7 +10,6 @@
 
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h
index 6713d2ab10..5935d38845 100644
--- a/keyboards/wsk/houndstooth/config.h
+++ b/keyboards/wsk/houndstooth/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { C6, F7, D7, B1, B4, B2, B5, B6 }
 #define MATRIX_COL_PINS { D1, F4, D0, F5, D4, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h
index 972b135cf2..52f5f57dd2 100644
--- a/keyboards/wsk/jerkin/config.h
+++ b/keyboards/wsk/jerkin/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, B4, B5 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, B1, F7, F6, F5, F4, E6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index 5b93bd11e1..c67c3424f9 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, B5, B6, B2, B3, B1, F7, F6 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h
index 065eae17d8..be0f58a7dc 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, D0 }
 #define MATRIX_COL_PINS { D2, B3, F6, B1, B2, B6, D4, C6, D7, E6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index 7cc2cb566d..6377ebb3f7 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, D2, D0 }
 #define MATRIX_COL_PINS { D3, D1, F6, F7, B6, B2, B3, B1, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index c36e2ac105..e75b49ce4d 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, B5, F4 }
 #define MATRIX_COL_PINS { D3, D1, D0, D4, F7, C6, B1, D7, B3, E6, B2, B4, B6, F6, E5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h
index c46a035718..d1545ced61 100644
--- a/keyboards/x16/config.h
+++ b/keyboards/x16/config.h
@@ -34,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { E6, F7, D6, B6 }
 #define MATRIX_COL_PINS { C7, C6, B4, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index 8432076307..9a1eddcd28 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F5, F4, F1, F0, E6 }
 #define MATRIX_COL_PINS { B4, D7, D6, D4, D5, D3, D2, D1, D0, F6, F7, C7, C6, B6, B5 }
-#define UNUSED_PINS
 
 /* RGB Lighting */
 #define RGB_DI_PIN B0
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index 52dab44f48..1db0af867e 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -30,12 +30,10 @@
 //no underglow - prototype
 //#define MATRIX_ROW_PINS { B1, B3, B7, F6, F7 }
 //#define MATRIX_COL_PINS { B0, D5, B2, F5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7 }
-//#define UNUSED_PINS
 
 //underglow
 #define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
 #define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index 67c88efb4c..08fef5d7f3 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -31,7 +31,6 @@
 //underglow
 #define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
 #define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h
index 7f02bf3e61..08fd8fb8f8 100644
--- a/keyboards/xelus/dharma/config.h
+++ b/keyboards/xelus/dharma/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, B0 }
 #define MATRIX_COL_PINS { B3, B2, B1, D5, D4, E6, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 4b4105af42..40d53adb06 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, F0, F4, F5 }
 #define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 6f4dfa24d1..9eda99ed32 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B14, B13, B12, B2, A8, B15 }
 #define MATRIX_COL_PINS { C13, C14, C15, H0, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, H1, B10, B11 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index b5c85deb78..6295228c31 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { A5, A6, B0, A7, A8, B1, B4, B5, A15, B3, A13, A14 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A10, A9}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 4cc11eb20b..990c0aca55 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -21,7 +21,6 @@
 
 #define MATRIX_ROW_PINS { B5, B6, B7, A1, A0, C13, B0, A7, A5, A4, A3, A2 }
 #define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B1, B10, B4, B3, A15 }
-#define UNUSED_PINS
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
index ce0c2e1d02..23372d72eb 100644
--- a/keyboards/xelus/rs60/rev1/config.h
+++ b/keyboards/xelus/rs60/rev1/config.h
@@ -28,7 +28,6 @@
 
 #define MATRIX_ROW_PINS { B3, B7, F0, F4, F1 }
 #define MATRIX_COL_PINS { E6, D5, D3, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
-#define UNUSED_PINS
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/rs60/rev2/config.h b/keyboards/xelus/rs60/rev2/config.h
index 74258b1289..65ac383189 100644
--- a/keyboards/xelus/rs60/rev2/config.h
+++ b/keyboards/xelus/rs60/rev2/config.h
@@ -28,7 +28,6 @@
 
 #define MATRIX_ROW_PINS { B15, B14, B12, B1, B0 }
 #define MATRIX_COL_PINS { B13, A7, A6, A5, A4, A3, A2, B7, B6, B5, B4, B3, A15, A14 }
-#define UNUSED_PINS
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/snap96/config.h b/keyboards/xelus/snap96/config.h
index 736cbe81ed..a42ecb1931 100644
--- a/keyboards/xelus/snap96/config.h
+++ b/keyboards/xelus/snap96/config.h
@@ -9,7 +9,6 @@
 // key matrix pins
 #define MATRIX_ROW_PINS { B2, B1, B0, C7, F6, F7, B3, D1, D2, D7, B6, C6 }
 #define MATRIX_COL_PINS { E6, D5, B7, D0, F5, D3, B4, B5, D4, D6 }
-#define UNUSED_PINS
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
index a61645d74c..96e4835996 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, B2, C7, C6, B6 }
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* RGB Underglow */
 #define RGB_DI_PIN B0
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index edc1be8d6d..44a16e9b7e 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B11, B10, A3, A1, A2 }
 #define MATRIX_COL_PINS { B2, B1, B0, A7, A6, A5, A4, A13, B7, B6, B5, B4, B3, A15, A14 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/valor_frl_tkl/config.h b/keyboards/xelus/valor_frl_tkl/config.h
index 253ff17687..46c598c637 100644
--- a/keyboards/xelus/valor_frl_tkl/config.h
+++ b/keyboards/xelus/valor_frl_tkl/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { A15, A14, A1, B3, B4 }
 #define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, A0, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/xs60/config.h b/keyboards/xelus/xs60/config.h
index 097a833e98..a61cd22e53 100644
--- a/keyboards/xelus/xs60/config.h
+++ b/keyboards/xelus/xs60/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B4, B3, A15, A14, A7 }
 #define MATRIX_COL_PINS { B0, B1, A8, A9, B5, A6, C14, C15, A0, A5, A4, A3, A2, A1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
index 826540de4c..559699e159 100644
--- a/keyboards/xiudi/xd004/v1/config.h
+++ b/keyboards/xiudi/xd004/v1/config.h
@@ -46,7 +46,6 @@ where some things are disabled to save space as well.
     {                      \
         { D3, D0, C4, B4 } \
     }
-#define UNUSED_PINS
 
 /* Backlight Setup */
 // Looks like each backlight LED is connected to a single output, D5 is the one furtherst away from USB port
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index 38cfa415ff..d5bfc89a2d 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -42,7 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* Backlight Setup */
 #define BACKLIGHT_PIN F5
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index 8af56851ff..189b0222b0 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -42,7 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* Backlight Setup */
 #define BACKLIGHT_PIN F5
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index ac6989b9fe..ef3cae310b 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 604e9aec20..7080a2ca8b 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, B0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 742b7fce0b..0131e0dfa3 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -34,7 +34,6 @@
 */
 //#define MATRIX_ROW_PINS { D0, D5 }
 //#define MATRIX_COL_PINS { F1, F0, B0 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index abd2e0d8f1..3c43fb79ff 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -24,7 +24,6 @@
 
 #define MATRIX_ROW_PINS { F4, D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F7 }
-#define UNUSED_PINS { B0, E2 }
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 52fcb09f84..c6b4a0a682 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D1, B0, B1, C7, D3, D5 }
 
 #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5, B6, C6, D4, D6, D7, B4, B2, B3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 2291ca439e..8665cc5776 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -34,7 +34,6 @@
 */
 //#define MATRIX_ROW_PINS { D0, D5 }
 //#define MATRIX_COL_PINS { F1, F0, B0 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index 37b977a0fe..1e9f2c9398 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
 #define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xw60/config.h b/keyboards/xw60/config.h
index 2277a52a4c..4dd64632f3 100644
--- a/keyboards/xw60/config.h
+++ b/keyboards/xw60/config.h
@@ -8,7 +8,6 @@
 
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yatara/drink_me/config.h b/keyboards/yatara/drink_me/config.h
index 73fafe3a88..51d03c58e2 100644
--- a/keyboards/yatara/drink_me/config.h
+++ b/keyboards/yatara/drink_me/config.h
@@ -26,4 +26,3 @@
 #define DIRECT_PINS { \
     {B4, B5, B6, B7} \
 }
-#define UNUSED_PINS
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index 77eeff30ed..bb54f28e6e 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Column pin configuration
  */
 #define MATRIX_COL_PINS { D4, F6, F7, C7, C6, B6, B5, B4, D7, D6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h
index fc9fa4bdc2..16b205105d 100644
--- a/keyboards/ydkb/just60/config.h
+++ b/keyboards/ydkb/just60/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { E2, C7, B3, B2, B1 }
 #define MATRIX_COL_PINS { D6, D7, B4, B6, B5, B7, F7, F6, F5, F4, F1, F0, E6, B0 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 #define QMK_ESC_OUTPUT D6 // usually COL
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index ed6681cdf6..d1bd8bb1ca 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B5, C6, C7, D7, B4 }
 #define MATRIX_COL_PINS { B6, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3, D5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yiancardesigns/barleycorn/config.h b/keyboards/yiancardesigns/barleycorn/config.h
index 4b662525ac..2780cfccda 100644
--- a/keyboards/yiancardesigns/barleycorn/config.h
+++ b/keyboards/yiancardesigns/barleycorn/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
 #define MATRIX_ROW_PINS { B4, B3, B2, B1, C1 }
 #define MATRIX_COL_PINS { B0, D7, D6, D4, D1, D0, C3, C2, D5, D5, D5, D5, D5, D5, D5, D5, D5, D5 }
-#define UNUSED_PINS
 #define PORT_EXPANDER_ADDRESS 0x20
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/yiancardesigns/gingham/config.h b/keyboards/yiancardesigns/gingham/config.h
index de3bdc0320..34f8cb600e 100644
--- a/keyboards/yiancardesigns/gingham/config.h
+++ b/keyboards/yiancardesigns/gingham/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
 #define MATRIX_ROW_PINS { D0, C3, D1, C1, C2 }
 #define MATRIX_COL_PINS { D4, D4, C0, B5, D5, B4, D6, B1, B0, B2, D7, B3, D4, D4 }
-#define UNUSED_PINS
 #define PORT_EXPANDER_ADDRESS 0x20
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/yiancardesigns/seigaiha/config.h b/keyboards/yiancardesigns/seigaiha/config.h
index d6b071e9b3..3a5f5fe390 100644
--- a/keyboards/yiancardesigns/seigaiha/config.h
+++ b/keyboards/yiancardesigns/seigaiha/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* A Custom matrix.c is used to poll the port expander D5 shows that the pins are hardwired there */
 #define MATRIX_ROW_PINS { C0, B4, B3, B2, B5 }
 #define MATRIX_COL_PINS { B0, D7, D6, D4, B1, C1, C2, D1, C3, D0, D5, D5, D5, D5, D5 }
-#define UNUSED_PINS
 #define PORT_EXPANDER_ADDRESS 0x20
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h
index 0a4eff72b7..f43f5b5dc1 100644
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
 #define MATRIX_ROW_PINS { B7, B6, B5, B4, B3}
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7}
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index b5a62453ce..627a4850eb 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index 278e8f5b8a..8c959b062e 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
index a85e0d7a29..d99f31a9f4 100644
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h
index df82e6e375..3aa5415bd2 100644
--- a/keyboards/ymdk/yd60mq/config.h
+++ b/keyboards/ymdk/yd60mq/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h
index ab0b32fe00..383a070c54 100644
--- a/keyboards/ymdk/ymd09/config.h
+++ b/keyboards/ymdk/ymd09/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { F5, F4, F1 }
 #define MATRIX_COL_PINS { D6, D2, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h
index 9f282bc208..5b1aa59e27 100644
--- a/keyboards/ymdk/ymd67/config.h
+++ b/keyboards/ymdk/ymd67/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index f493155182..070327773d 100644
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { E6, B4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index 54cab3a657..85217bdb2b 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_mini/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { D4, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/yugo_m/model_m_101/config.h
index 283919c50f..c22bc610c3 100644
--- a/keyboards/yugo_m/model_m_101/config.h
+++ b/keyboards/yugo_m/model_m_101/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3, A15, A14 }
 #define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-#define UNUSED_PINS { A0, A1, A2, A10, A13, B9, C13, C14, C15 }
 
 
 
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 92ed6a5397..3595bf20c6 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F4, B3, B6 }
 #define MATRIX_COL_PINS { F5, D4, E6, F7, C6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h
index e9897a330a..8b801b1cc4 100644
--- a/keyboards/yushakobo/quick7/config.h
+++ b/keyboards/yushakobo/quick7/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D1, F5 }
 #define ENCODERS_PAD_B { D0, F6 }
 
-#define UNUSED_PINS
 
 
 
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index e64eba2f06..5a72cf2a54 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, B5, B4, E6, D7, C6, D4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
index 59dbe82558..0aa38ad350 100644
--- a/keyboards/yynmt/kagamidget/config.h
+++ b/keyboards/yynmt/kagamidget/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D1, D0, F4, F5 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/z12/config.h b/keyboards/z12/config.h
index 33ba6e7467..57b31e7c8b 100644
--- a/keyboards/z12/config.h
+++ b/keyboards/z12/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { F6, F5, F4, NO_PIN } \
 }
 
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/z34/config.h b/keyboards/z34/config.h
index 2b8d37bd0e..f63b2771fc 100644
--- a/keyboards/z34/config.h
+++ b/keyboards/z34/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
 }
 
-#define UNUSED_PINS
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index 3a23725496..fc3e39664d 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { F0 }
 #define MATRIX_COL_PINS { F1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ziggurat/config.h b/keyboards/ziggurat/config.h
index 757d46b120..f814b53023 100644
--- a/keyboards/ziggurat/config.h
+++ b/keyboards/ziggurat/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { A2, A1, A0, F7, A3 }
 #define MATRIX_COL_PINS { F6, F5, F4, F3, F2, F1, B5, B6, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h
index 355ad73aeb..91ffe6dfb4 100644
--- a/keyboards/zj68/config.h
+++ b/keyboards/zj68/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index 241f4a51c4..3d581266b9 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -9,7 +9,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, D4, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B7, D1, D2, D3, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index de2bf34b17..fea1dbc212 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { C13, C14, A5, A4, A3 }
 #define MATRIX_COL_PINS { A10, A9, A8, B12, A15, A13, A7, A2, A1, A0, F1, F0, B3, B4, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ztboards/after/config.h b/keyboards/ztboards/after/config.h
index 9cce817512..c314752055 100644
--- a/keyboards/ztboards/after/config.h
+++ b/keyboards/ztboards/after/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, F6, F5, D5, B2 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D7, D6, D4, C7, C6, B6, B5, B4, F7, F0, F4, F1 }
-#define UNUSED_PINS
 #define ENCODERS_PAD_A { B1 }
 #define ENCODERS_PAD_B { B0 }
 
diff --git a/keyboards/ztboards/noon/config.h b/keyboards/ztboards/noon/config.h
index ead53b1c04..4d9695aa11 100644
--- a/keyboards/ztboards/noon/config.h
+++ b/keyboards/ztboards/noon/config.h
@@ -25,7 +25,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, D5, D3, B1, F0 }
 #define MATRIX_COL_PINS { D2, D1, D0, D4, D6, B2, D7, B4, B6, C6, C7, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index bc07f68d7b..7ed636d0f9 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -374,11 +374,9 @@ def _extract_split_right_pins(info_data, config_c):
     # Figure out the right half matrix pins
     row_pins = config_c.get('MATRIX_ROW_PINS_RIGHT', '').replace('{', '').replace('}', '').strip()
     col_pins = config_c.get('MATRIX_COL_PINS_RIGHT', '').replace('{', '').replace('}', '').strip()
-    unused_pin_text = config_c.get('UNUSED_PINS_RIGHT')
-    unused_pins = unused_pin_text.replace('{', '').replace('}', '').strip() if isinstance(unused_pin_text, str) else None
     direct_pins = config_c.get('DIRECT_PINS_RIGHT', '').replace(' ', '')[1:-1]
 
-    if row_pins or col_pins or direct_pins or unused_pins:
+    if row_pins or col_pins or direct_pins:
         if info_data.get('split', {}).get('matrix_pins', {}).get('right') in info_data:
             _log_warning(info_data, 'Right hand matrix data is specified in both info.json and config.h, the config.h values win.')
 
@@ -400,17 +398,12 @@ def _extract_split_right_pins(info_data, config_c):
         if direct_pins:
             info_data['split']['matrix_pins']['right']['direct'] = _extract_direct_matrix(direct_pins)
 
-        if unused_pins:
-            info_data['split']['matrix_pins']['right']['unused'] = _extract_pins(unused_pins)
-
 
 def _extract_matrix_info(info_data, config_c):
     """Populate the matrix information.
     """
     row_pins = config_c.get('MATRIX_ROW_PINS', '').replace('{', '').replace('}', '').strip()
     col_pins = config_c.get('MATRIX_COL_PINS', '').replace('{', '').replace('}', '').strip()
-    unused_pin_text = config_c.get('UNUSED_PINS')
-    unused_pins = unused_pin_text.replace('{', '').replace('}', '').strip() if isinstance(unused_pin_text, str) else None
     direct_pins = config_c.get('DIRECT_PINS', '').replace(' ', '')[1:-1]
     info_snippet = {}
 
@@ -436,12 +429,6 @@ def _extract_matrix_info(info_data, config_c):
 
         info_snippet['direct'] = _extract_direct_matrix(direct_pins)
 
-    if unused_pins:
-        if 'matrix_pins' not in info_data:
-            info_data['matrix_pins'] = {}
-
-        info_snippet['unused'] = _extract_pins(unused_pins)
-
     if config_c.get('CUSTOM_MATRIX', 'no') != 'no':
         if 'matrix_pins' in info_data and 'custom' in info_data['matrix_pins']:
             _log_warning(info_data, 'Custom Matrix is specified in both info.json and config.h, the config.h values win.')

From 5408334083ef52beb3cc7ec01642515c70298f6c Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sat, 6 Aug 2022 16:29:06 -0400
Subject: [PATCH 166/959] Update ginkgo65hot to allow use of community layouts
 (#17911)

---
 keyboards/mokey/ginkgo65hot/ginkgo65hot.h     |   4 +-
 keyboards/mokey/ginkgo65hot/info.json         | 141 +++++++++---------
 keyboards/mokey/ginkgo65hot/rules.mk          |   2 +
 .../65_ansi_blocker/spidey3/config.h          |  12 ++
 .../65_ansi_blocker/spidey3/keymap.c          |  41 +++++
 .../65_ansi_blocker/spidey3/readme.md         |  14 ++
 .../65_ansi_blocker/spidey3/rules.mk          |  10 ++
 users/spidey3/config.h                        |   9 ++
 users/spidey3/init.c                          |   3 +
 users/spidey3/layer_rgb.c                     |   3 +
 users/spidey3/spidey3.c                       |   3 +
 users/spidey3/spidey3.h                       |   7 +-
 users/spidey3/unicode.c                       |   3 +
 users/spidey3/unicode.h                       |   3 +
 14 files changed, 181 insertions(+), 74 deletions(-)
 create mode 100644 layouts/community/65_ansi_blocker/spidey3/config.h
 create mode 100644 layouts/community/65_ansi_blocker/spidey3/keymap.c
 create mode 100644 layouts/community/65_ansi_blocker/spidey3/readme.md
 create mode 100644 layouts/community/65_ansi_blocker/spidey3/rules.mk

diff --git a/keyboards/mokey/ginkgo65hot/ginkgo65hot.h b/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
index 1a599291b8..e4a42d9ad9 100644
--- a/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
+++ b/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
@@ -19,7 +19,7 @@
 
 #define XXX KC_NO
 
-/*LAYOUT
+/*LAYOUT_65_ansi_blocker
   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
   * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│  k0D  │k0E│
   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
@@ -32,7 +32,7 @@
   * │k40 │k41 │k42 │  k44                   │k49 │k4A │ │k4C│k4D│k4E│
   * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 */
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json
index dbe99e1909..929e31e31b 100644
--- a/keyboards/mokey/ginkgo65hot/info.json
+++ b/keyboards/mokey/ginkgo65hot/info.json
@@ -8,81 +8,84 @@
         "pid": "0x3366",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Insert", "x":15, "y":0},
                 
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1d", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[", "x":11.5, "y":1},
+                {"label":"]", "x":12.5, "y":1},
+                {"label":"\\", "x":13.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":15, "y":1},
                 
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";", "x":10.75, "y":2},
+                {"label":"'", "x":11.75, "y":2},
+                {"label":"Return", "x":12.75, "y":2, "w":2.25},
+                {"label":"Page Up", "x":15, "y":2},
                 
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",", "x":9.25, "y":3},
+                {"label":".", "x":10.25, "y":3},
+                {"label":"/", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"Page Down", "x":15, "y":3},
 
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k44", "x":3.75, "y":4, "w":6.25},
-                {"label":"k49", "x":10, "y":4, "w":1.25},
-                {"label":"k4a", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mokey/ginkgo65hot/rules.mk b/keyboards/mokey/ginkgo65hot/rules.mk
index 02fbe72525..d04e1a74fa 100644
--- a/keyboards/mokey/ginkgo65hot/rules.mk
+++ b/keyboards/mokey/ginkgo65hot/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker
diff --git a/layouts/community/65_ansi_blocker/spidey3/config.h b/layouts/community/65_ansi_blocker/spidey3/config.h
new file mode 100644
index 0000000000..9439de45c9
--- /dev/null
+++ b/layouts/community/65_ansi_blocker/spidey3/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define NO_ACTION_ONESHOT
+#undef LOCKING_SUPPORT_ENABLE
+
+#define LAYER_STATE_8BIT
+#define MAX_LAYER 4
+
+#define SHIFT_BACKSPACE_DELETE
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
new file mode 100644
index 0000000000..687737c7cb
--- /dev/null
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "spidey3.h"
+
+#define FN_MENU LT(_FN,KC_APP)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Base
+    [_BASE] = LAYOUT_65_ansi_blocker(
+        KC_GESC,    KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_MINS,    KC_EQL,                 KC_BSPC,    KC_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,    FN_MENU,                KC_LEFT,    KC_DOWN,    KC_RGHT
+    ),
+    // Numpad
+    [_NUMPAD] = LAYOUT_65_ansi_blocker(
+        XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NUMLOCK, XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_0,    KC_PMNS,    KC_PEQL,                _______,    _______,
+        _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_PCMM,    _______,    _______,                _______,    _______,
+        KC_NUMLOCK, XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_PPLS,    KC_PAST,                            KC_PENT,    _______,
+        _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_0,    SPI_KP_00,  KC_PDOT,    KC_PSLS,                            _______,    _______,    _______,
+        _______,    _______,    _______,                                    _______,                                            _______,    _______,                _______,    _______,    _______
+    ),
+    // FN
+    [_FN] = LAYOUT_65_ansi_blocker(
+        KC_GRV,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_INS,    KC_SLCK,
+        XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
+        MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   SPI_LNX,    XXXXXXX,    XXXXXXX,                            CH_CPNL,    KC_BRID,
+        _______,    XXXXXXX,    XXXXXXX,    SPI_WIN,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),SPI_OSX,    XXXXXXX,    XXXXXXX,    DEBUG,                              _______,    KC_VOLU,    KC_MUTE,
+        _______,    _______,    _______,                                    KC_MPLY,                                            CH_ASST,    _______,                KC_MPRV,    KC_VOLD,    KC_MNXT
+    ),
+    // Glyph Transformation
+    [_GLYPH] = LAYOUT_65_ansi_blocker(
+        RESET,      X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     SPI_GFLOCK,             XXXXXXX,    XXXXXXX,
+        EEP_RST,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    XXXXXXX,                XXXXXXX,    XXXXXXX,
+        _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    XXXXXXX,
+        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    X(LARR),    X(RARR),    XXXXXXX,                            XXXXXXX,    XXXXXXX,    XXXXXXX,
+        XXXXXXX,    XXXXXXX,    XXXXXXX,                                    XXXXXXX,                                            XXXXXXX,    _______,                XXXXXXX,    XXXXXXX,    XXXXXXX
+    )
+};
diff --git a/layouts/community/65_ansi_blocker/spidey3/readme.md b/layouts/community/65_ansi_blocker/spidey3/readme.md
new file mode 100644
index 0000000000..a51106f84d
--- /dev/null
+++ b/layouts/community/65_ansi_blocker/spidey3/readme.md
@@ -0,0 +1,14 @@
+Copyright 2022 Joshua Diamond josh@windowoffire.com @spidey3
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/layouts/community/65_ansi_blocker/spidey3/rules.mk b/layouts/community/65_ansi_blocker/spidey3/rules.mk
new file mode 100644
index 0000000000..2d16a86ac6
--- /dev/null
+++ b/layouts/community/65_ansi_blocker/spidey3/rules.mk
@@ -0,0 +1,10 @@
+# Build Options
+#   comment out to disable the options.
+#
+MOUSEKEY_ENABLE = no	# Mouse keys
+UNICODEMAP_ENABLE = yes
+VELOCIKEY_ENABLE = yes
+GRAVE_ESC_ENABLE = yes
+
+# The following disabled to save space
+SPACE_CADET_ENABLE = no
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index 884cc11a5c..49409ed85d 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -1,3 +1,6 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #define LED_DISABLE_WHEN_USB_SUSPENDED
@@ -40,3 +43,9 @@
 
 #undef MANUFACTURER
 #define MANUFACTURER Window of Fire
+
+// Some keyboards enable BACKLIGHT_CAPS_LOCK without checking if backlight is enabled.
+// Undef as appropriate to avoid compiler warnings in that case.
+#ifndef BACKLIGHT_ENABLE
+#undef BACKLIGHT_CAPS_LOCK
+#endif
diff --git a/users/spidey3/init.c b/users/spidey3/init.c
index 014dfdc3c4..bd6ea5cac9 100644
--- a/users/spidey3/init.c
+++ b/users/spidey3/init.c
@@ -1,3 +1,6 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "spidey3.h"
 
 void keyboard_post_init_user(void) {
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index 77558016d0..671205362f 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -1,3 +1,6 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 #include "spidey3.h"
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index 651c750465..e993f4828e 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -1,3 +1,6 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 #include "spidey3.h"
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index 6d73c669bc..e96ab7a145 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -1,3 +1,6 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include QMK_KEYBOARD_H
@@ -10,6 +13,7 @@ enum userspace_layers {
     _BASE = 0,
     _NUMPAD,
     _FN,
+    _GLYPH,
 };
 
 enum custom_keycodes {
@@ -32,10 +36,7 @@ enum custom_keycodes {
     SPI_MATH,
     SPI_GFLOCK,
     SPI_KP_00,
-
-#ifdef RGBLIGHT_ENABLE
     SPI_GLO,
-#endif
 };
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/users/spidey3/unicode.c b/users/spidey3/unicode.c
index 39a990674c..5292b0809b 100644
--- a/users/spidey3/unicode.c
+++ b/users/spidey3/unicode.c
@@ -1,3 +1,6 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 
 #include "unicode.h"
 
diff --git a/users/spidey3/unicode.h b/users/spidey3/unicode.h
index 6182669fb0..ee8e00056c 100644
--- a/users/spidey3/unicode.h
+++ b/users/spidey3/unicode.h
@@ -1,3 +1,6 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include QMK_KEYBOARD_H

From ac25109312a49b6b50e54d61430c959652307810 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 7 Aug 2022 02:18:03 -0700
Subject: [PATCH 167/959] Always run pointing device init (#17936)

---
 quantum/pointing_device/pointing_device.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 09f9e5efb7..505a7a6ffd 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -139,14 +139,15 @@ __attribute__((weak)) uint8_t pointing_device_handle_buttons(uint8_t buttons, bo
  */
 __attribute__((weak)) void pointing_device_init(void) {
 #if defined(SPLIT_POINTING_ENABLE)
-    if (!(POINTING_DEVICE_THIS_SIDE)) {
-        return;
-    }
+    if ((POINTING_DEVICE_THIS_SIDE))
 #endif
-    pointing_device_driver.init();
+    {
+        pointing_device_driver.init();
 #ifdef POINTING_DEVICE_MOTION_PIN
-    setPinInputHigh(POINTING_DEVICE_MOTION_PIN);
+        setPinInputHigh(POINTING_DEVICE_MOTION_PIN);
 #endif
+    }
+
     pointing_device_init_kb();
     pointing_device_init_user();
 }

From 764c542befcdbaabf2be7ae50804671dd6a4d841 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 8 Aug 2022 03:13:16 +0100
Subject: [PATCH 168/959] Remove tmk_core 'serial' code (#17866)

---
 .../protocol => keyboards/hhkb}/serial.h      |   0
 .../protocol => keyboards/hhkb}/serial_uart.c |   0
 tmk_core/protocol/serial_soft.c               | 234 ------------------
 3 files changed, 234 deletions(-)
 rename {tmk_core/protocol => keyboards/hhkb}/serial.h (100%)
 rename {tmk_core/protocol => keyboards/hhkb}/serial_uart.c (100%)
 delete mode 100644 tmk_core/protocol/serial_soft.c

diff --git a/tmk_core/protocol/serial.h b/keyboards/hhkb/serial.h
similarity index 100%
rename from tmk_core/protocol/serial.h
rename to keyboards/hhkb/serial.h
diff --git a/tmk_core/protocol/serial_uart.c b/keyboards/hhkb/serial_uart.c
similarity index 100%
rename from tmk_core/protocol/serial_uart.c
rename to keyboards/hhkb/serial_uart.c
diff --git a/tmk_core/protocol/serial_soft.c b/tmk_core/protocol/serial_soft.c
deleted file mode 100644
index 8624ef733c..0000000000
--- a/tmk_core/protocol/serial_soft.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-Copyright 2012 Jun WAKO <wakojun@gmail.com>
-
-This software is licensed with a Modified BSD License.
-All of this is supposed to be Free Software, Open Source, DFSG-free,
-GPL-compatible, and OK to use in both free and proprietary applications.
-Additions and corrections to this file are welcome.
-
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in
-  the documentation and/or other materials provided with the
-  distribution.
-
-* Neither the name of the copyright holders nor the names of
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include "serial.h"
-
-/*
- *  Stupid Inefficient Busy-wait Software Serial
- *  which is still useful for negative logic signal like Sun protocol
- *  if it is not supported by hardware UART.
- *
- *  TODO: delay is not accurate enough. Instruction cycle should be counted and inline assemby is needed.
- */
-
-#define WAIT_US (1000000L / SERIAL_SOFT_BAUD)
-
-#ifdef SERIAL_SOFT_LOGIC_NEGATIVE
-#    define SERIAL_SOFT_RXD_IN() !(SERIAL_SOFT_RXD_READ())
-#    define SERIAL_SOFT_TXD_ON() SERIAL_SOFT_TXD_LO()
-#    define SERIAL_SOFT_TXD_OFF() SERIAL_SOFT_TXD_HI()
-#else
-#    define SERIAL_SOFT_RXD_IN() !!(SERIAL_SOFT_RXD_READ())
-#    define SERIAL_SOFT_TXD_ON() SERIAL_SOFT_TXD_HI()
-#    define SERIAL_SOFT_TXD_OFF() SERIAL_SOFT_TXD_LO()
-#endif
-
-#ifdef SERIAL_SOFT_PARITY_EVEN
-#    define SERIAL_SOFT_PARITY_VAL 0
-#elif defined(SERIAL_SOFT_PARITY_ODD)
-#    define SERIAL_SOFT_PARITY_VAL 1
-#endif
-
-/* debug for signal timing, see debug pin with oscilloscope */
-#ifdef SERIAL_SOFT_DEBUG
-#    define SERIAL_SOFT_DEBUG_INIT() (DDRD |= 1 << 7)
-#    define SERIAL_SOFT_DEBUG_TGL() (PORTD ^= 1 << 7)
-#else
-#    define SERIAL_SOFT_DEBUG_INIT()
-#    define SERIAL_SOFT_DEBUG_TGL()
-#endif
-
-void serial_init(void) {
-    SERIAL_SOFT_DEBUG_INIT();
-
-    SERIAL_SOFT_RXD_INIT();
-    SERIAL_SOFT_TXD_INIT();
-}
-
-/* RX ring buffer */
-#define RBUF_SIZE 8
-static uint8_t rbuf[RBUF_SIZE];
-static uint8_t rbuf_head = 0;
-static uint8_t rbuf_tail = 0;
-
-uint8_t serial_recv(void) {
-    uint8_t data = 0;
-    if (rbuf_head == rbuf_tail) {
-        return 0;
-    }
-
-    data      = rbuf[rbuf_tail];
-    rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE;
-    return data;
-}
-
-int16_t serial_recv2(void) {
-    uint8_t data = 0;
-    if (rbuf_head == rbuf_tail) {
-        return -1;
-    }
-
-    data      = rbuf[rbuf_tail];
-    rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE;
-    return data;
-}
-
-void serial_send(uint8_t data) {
-    /* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */
-
-#ifdef SERIAL_SOFT_BIT_ORDER_MSB
-#    ifdef SERIAL_SOFT_DATA_7BIT
-    uint8_t mask = 0x40;
-#    else
-    uint8_t mask = 0x80;
-#    endif
-#else
-    uint8_t mask = 0x01;
-#endif
-
-    uint8_t parity = 0;
-
-    /* start bit */
-    SERIAL_SOFT_TXD_OFF();
-    _delay_us(WAIT_US);
-
-#ifdef SERIAL_SOFT_DATA_7BIT
-    while (mask & 0x7F) {
-#else
-    while (mask & 0xFF) {
-#endif
-        if (data & mask) {
-            SERIAL_SOFT_TXD_ON();
-            parity ^= 1;
-        } else {
-            SERIAL_SOFT_TXD_OFF();
-        }
-        _delay_us(WAIT_US);
-
-#ifdef SERIAL_SOFT_BIT_ORDER_MSB
-        mask >>= 1;
-#else
-        mask <<= 1;
-#endif
-    }
-
-#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD)
-    /* to center of parity bit */
-    if (parity != SERIAL_SOFT_PARITY_VAL) {
-        SERIAL_SOFT_TXD_ON();
-    } else {
-        SERIAL_SOFT_TXD_OFF();
-    }
-    _delay_us(WAIT_US);
-#endif
-
-    /* stop bit */
-    SERIAL_SOFT_TXD_ON();
-    _delay_us(WAIT_US);
-}
-
-/* detect edge of start bit */
-ISR(SERIAL_SOFT_RXD_VECT) {
-    SERIAL_SOFT_DEBUG_TGL();
-    SERIAL_SOFT_RXD_INT_ENTER();
-
-    uint8_t data = 0;
-
-#ifdef SERIAL_SOFT_BIT_ORDER_MSB
-#    ifdef SERIAL_SOFT_DATA_7BIT
-    uint8_t mask = 0x40;
-#    else
-    uint8_t mask = 0x80;
-#    endif
-#else
-    uint8_t mask = 0x01;
-#endif
-
-    uint8_t parity = 0;
-
-    /* to center of start bit */
-    _delay_us(WAIT_US / 2);
-    SERIAL_SOFT_DEBUG_TGL();
-    do {
-        /* to center of next bit */
-        _delay_us(WAIT_US);
-
-        SERIAL_SOFT_DEBUG_TGL();
-        if (SERIAL_SOFT_RXD_IN()) {
-            data |= mask;
-            parity ^= 1;
-        }
-#ifdef SERIAL_SOFT_BIT_ORDER_MSB
-        mask >>= 1;
-#else
-        mask <<= 1;
-#endif
-#ifdef SERIAL_SOFT_DATA_7BIT
-    } while (mask & 0x7F);
-#else
-    } while (mask & 0xFF);
-#endif
-
-#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD)
-    /* to center of parity bit */
-    _delay_us(WAIT_US);
-    if (SERIAL_SOFT_RXD_IN()) {
-        parity ^= 1;
-    }
-    SERIAL_SOFT_DEBUG_TGL();
-#endif
-
-    /* to center of stop bit */
-    _delay_us(WAIT_US);
-
-    uint8_t next = (rbuf_head + 1) % RBUF_SIZE;
-#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD)
-    if ((parity == SERIAL_SOFT_PARITY_VAL) && next != rbuf_tail) {
-#else
-    if (next != rbuf_tail) {
-#endif
-        rbuf[rbuf_head] = data;
-        rbuf_head       = next;
-    }
-
-    SERIAL_SOFT_RXD_INT_EXIT();
-    SERIAL_SOFT_DEBUG_TGL();
-}

From 272f224dc6233e96fce4d0554d065bd403a7e0df Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Thu, 11 Aug 2022 13:28:48 -0400
Subject: [PATCH 169/959] Add cursor layer to DMQ Spin (#17996)

---
 .../spin/keymaps/spidey3_pad/keymap.c          | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
index bdf5dff0df..dcce444faa 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
@@ -20,7 +20,7 @@
 
 #define RGB_LAYER_ACK_DURATION 500
 
-enum layers { _MACRO, _NUMPAD, _RGB, _FN };
+enum layers { _MACRO, _NUMPAD, _CURSOR, _RGB, _FN };
 
 enum layer_base {
     LAYER_BASE     = _MACRO,
@@ -44,13 +44,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_NUMPAD] = LAYOUT(
         KC_KP_7,   KC_KP_8,   KC_KP_9,   KC_TRNS,
-        KC_KP_4,   KC_KP_5,   KC_KP_6,   KC_TRNS,
+        KC_KP_4,   KC_KP_5,   KC_KP_6,   TO(_CURSOR),
         KC_KP_1,   KC_KP_2,   KC_KP_3,   KC_TRNS,
         KC_KP_0,   KC_PDOT,   KC_PENT),
 
+    [_CURSOR] = LAYOUT(
+        KC_HOME,   KC_UP,     KC_PGUP,   KC_TRNS,
+        KC_LEFT,   KC_NO,     KC_RIGHT,  TO(_NUMPAD),
+        KC_END,    KC_DOWN,   KC_PGDN,   KC_TRNS,
+        KC_INS,    KC_DEL,    KC_PENT),
+
     [_RGB] = LAYOUT(
         RGB_HUI,   RGB_SAI,   RGB_VAI,   KC_TRNS,
-        RGB_HUD,   RGB_SAD,   RGB_VAD,   KC_TRNS,
+        RGB_HUD,   RGB_SAD,   RGB_VAD,   TO(_NUMPAD),
         RGB_SPD,   RGB_SPI,   KC_NO,     KC_TRNS,
         RGB_RMOD,  RGB_TOG,   RGB_MOD),
 
@@ -71,6 +77,7 @@ typedef enum layer_ack {
 #define LAYER_OFFSET 0
 const rgblight_segment_t PROGMEM _macro_layer[]  = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_TEAL});
 const rgblight_segment_t PROGMEM _numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_TEAL});
+const rgblight_segment_t PROGMEM _cursor_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_BLUE});
 const rgblight_segment_t PROGMEM _rgb_layer[]    = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_TEAL});
 const rgblight_segment_t PROGMEM _fn_layer[]     = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_PURPLE});
 
@@ -83,8 +90,9 @@ const rgblight_segment_t PROGMEM _meh_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, H
 const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
     [LAYER_OFFSET + 0] = _macro_layer,
     [LAYER_OFFSET + 1] = _numpad_layer,
-    [LAYER_OFFSET + 2] = _rgb_layer,
-    [LAYER_OFFSET + 3] = _fn_layer,
+    [LAYER_OFFSET + 2] = _cursor_layer,
+    [LAYER_OFFSET + 3] = _rgb_layer,
+    [LAYER_OFFSET + 4] = _fn_layer,
 
     [ACK_OFFSET + ACK_NO] = _no_layer,
     [ACK_OFFSET + ACK_YES] = _yes_layer,

From 9e443621796a150b244d49a784b77c744ea04d94 Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Fri, 12 Aug 2022 00:37:41 +0300
Subject: [PATCH 170/959] Add minimal STM32F103C6 support (#17853)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unfortunately, the crippled versions of “Bluepill” boards with
STM32F103C6xx chips instead of STM32F103C8xx are now sold all over the
place, sometimes advertised in a confusing way to make the difference
not noticeable until too late.  Add minimal support for these MCUs in
the common “Bluepill with stm32duino” configuration, so that it could be
possible to make something useful from those boards (although fitting
QMK into the available 24 KiB of flash may be rather hard).

(In fact, I'm not sure whether the “STM32” part of the chip name is
actually correct for those boards of uncertain origin, so the onekey
board name is `bluepill_f103c6`; another reason for that name is to
match the existing `blackpill_f401` and `blackpill_f411`.)

The EEPROM emulation support is not included on purpose, because
enabling it without having a working firmware size check would be
irresponsible with such flash size (the chance that someone would build
a firmware where the EEPROM backing store ends up overlapping some
firmware code is really high).  Other than that, enabling the EEPROM
emulation code is mostly trivial (the `wear_leveling` driver with the
`embedded_flash` backing store even works without any custom
configuration, although its code is significantly larger than the
`vendor` driver, which may also be important for such flash size).
---
 .../handwired/onekey/bluepill_f103c6/board.h  |  6 +++
 .../handwired/onekey/bluepill_f103c6/config.h | 40 +++++++++++++++++++
 .../onekey/bluepill_f103c6/halconf.h          | 26 ++++++++++++
 .../onekey/bluepill_f103c6/mcuconf.h          | 30 ++++++++++++++
 .../onekey/bluepill_f103c6/readme.md          |  7 ++++
 .../handwired/onekey/bluepill_f103c6/rules.mk | 27 +++++++++++++
 .../STM32_F103_STM32DUINO/board/board.c       |  2 +
 .../ld/STM32F103x6_stm32duino_bootloader.ld   | 23 +++++++++++
 .../ld/STM32F103x8_stm32duino_bootloader.ld   |  1 +
 .../ld/STM32F103xB_stm32duino_bootloader.ld   |  1 +
 .../ld/stm32duino_bootloader_common.ld        |  2 +-
 11 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/board.h
 create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/config.h
 create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/halconf.h
 create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
 create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/readme.md
 create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/rules.mk
 create mode 100644 platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino_bootloader.ld

diff --git a/keyboards/handwired/onekey/bluepill_f103c6/board.h b/keyboards/handwired/onekey/bluepill_f103c6/board.h
new file mode 100644
index 0000000000..4889f351a6
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/board.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include_next <board.h>
+
+#undef STM32F103xB
+#define STM32F103x6
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h
new file mode 100644
index 0000000000..e53aa63292
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h
@@ -0,0 +1,40 @@
+/* Copyright 2019
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT Onekey Bluepill STM32F103C6
+
+#define MATRIX_COL_PINS { B0 }
+#define MATRIX_ROW_PINS { A7 }
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN         A0
+#define BACKLIGHT_PWM_DRIVER  PWMD2
+#define BACKLIGHT_PWM_CHANNEL 1
+
+#define RGB_DI_PIN A1
+
+#define ADC_PIN A0
+
+// This code does not fit into the really small flash of STM32F103x6 together
+// with CONSOLE_ENABLE=yes, and the debugging console is probably more
+// important for the "okeney" testing firmware.  In a real firmware you may be
+// able to use these features if you keep the debugging console disabled.
+#define NO_ACTION_LAYER
+#define NO_ACTION_TAPPING
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/halconf.h b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
new file mode 100644
index 0000000000..923b4e52d2
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
new file mode 100644
index 0000000000..5e94a97e21
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 FALSE
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/readme.md b/keyboards/handwired/onekey/bluepill_f103c6/readme.md
new file mode 100644
index 0000000000..65ba9b0d4f
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/readme.md
@@ -0,0 +1,7 @@
+# STM32F103C6xx Bluepill onekey
+
+* Supported hardware: Bluepill boards with the STM32F103C**6**xx chips
+
+Note that STM32F103C6xx chips have only 32 KiB of flash and 10 KiB of RAM, and the stm32duino bootloader occupies 8 KiB of flash, leaving only 24 KiB for the firmware, therefore the capabilities of this board are severely restricted in comparison to proper Bluepill boards with STM32F103CBxx or STM32F103C8xx chips (128 or 64 KiB of flash and 20 KiB of RAM).  You may need to disable many features in the QMK firmware to bring its compiled size below 24 KiB.  Please avoid designing new keyboards with these MCUs unless you are stuck with some hardware that you already have and don't want to just throw away.
+
+To trigger keypress, short together pins *B0* and *A7*.
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
new file mode 100644
index 0000000000..f2280a1a59
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+# Cannot use `BOOTLOADER = stm32duino` due to the need to override
+# `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually.
+OPT_DEFS += -DBOOTLOADER_STM32DUINO
+MCU_LDSCRIPT = STM32F103x6_stm32duino_bootloader
+BOARD = STM32_F103_STM32DUINO
+BOOTLOADER_TYPE = stm32duino
+DFU_ARGS = -d 1EAF:0003 -a 2 -R
+DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# LTO is required to fit the firmware into the available 24K of flash
+LTO_ENABLE = yes
+
+# Disable some features which still don't fit into flash even with LTO
+MOUSEKEY_ENABLE = no
+NKRO_ENABLE = no
+
+# EEPROM emulation not supported yet (need to implement a proper firmware size
+# check first, otherwise the chance of the EEPROM backing store overwriting
+# some part of the firmware code is really high).
+EEPROM_DRIVER = transient
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.c b/platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.c
index cba977da77..e82e1d37ce 100644
--- a/platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.c
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/board/board.c
@@ -28,7 +28,9 @@ const PALConfig pal_default_config =
   {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
   {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
   {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
+#    if STM32_HAS_GPIOE
   {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},
+#    endif
 };
 #endif
 
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino_bootloader.ld
new file mode 100644
index 0000000000..18aaff2a23
--- /dev/null
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino_bootloader.ld
@@ -0,0 +1,23 @@
+/*
+    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.
+*/
+
+/*
+ * STM32F103x6 memory setup for use with the STM32Duino bootloader.
+ */
+f103_flash_size = 32k;
+f103_ram_size = 10k;
+
+INCLUDE stm32duino_bootloader_common.ld
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld
index a4bd566b59..465af12cab 100644
--- a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld
@@ -18,5 +18,6 @@
  * STM32F103x8 memory setup for use with the STM32Duino bootloader.
  */
 f103_flash_size = 64k;
+f103_ram_size = 20k;
 
 INCLUDE stm32duino_bootloader_common.ld
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld
index dc47400dc5..3a47a33156 100644
--- a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld
@@ -18,5 +18,6 @@
  * STM32F103xB memory setup for use with the STM32Duino bootloader.
  */
 f103_flash_size = 128k;
+f103_ram_size = 20k;
 
 INCLUDE stm32duino_bootloader_common.ld
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld
index 76cd3153be..1466ae7ed2 100644
--- a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/stm32duino_bootloader_common.ld
@@ -27,7 +27,7 @@ MEMORY
     flash5  : org = 0x00000000, len = 0
     flash6  : org = 0x00000000, len = 0
     flash7  : org = 0x00000000, len = 0
-    ram0    : org = 0x20000000, len = 20k
+    ram0    : org = 0x20000000, len = f103_ram_size
     ram1    : org = 0x00000000, len = 0
     ram2    : org = 0x00000000, len = 0
     ram3    : org = 0x00000000, len = 0

From cde9dd8b90ed41bd3f960833b7ceab891baf7560 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Fri, 12 Aug 2022 05:41:42 +0800
Subject: [PATCH 171/959] Refactor Pixel Fractal effect (#17602)

* Refactor effect with smaller array

* Add RGB_MATRIX_USE_LIMITS call

* Remove spaces

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../animations/pixel_fractal_anim.h           | 80 +++++++------------
 1 file changed, 29 insertions(+), 51 deletions(-)

diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index 906da1a48e..b26d5c4100 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -1,19 +1,5 @@
-/* Copyright (C) 2021 @filterpaper
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 (C) 2022 @filterpaper
+// SPDX-License-Identifier: GPL-2.0-or-later
 // Inspired from 4x12 fractal created by @schwarzgrau
 
 #ifdef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
@@ -22,12 +8,8 @@ RGB_MATRIX_EFFECT(PIXEL_FRACTAL)
 
 static bool PIXEL_FRACTAL(effect_params_t* params) {
 #        define MID_COL MATRIX_COLS / 2
-    static bool led[MATRIX_ROWS][MATRIX_COLS];
-
+    static bool     led[MATRIX_ROWS][MID_COL];
     static uint32_t wait_timer = 0;
-    if (wait_timer > g_rgb_timer) {
-        return false;
-    }
 
     inline uint32_t interval(void) {
         return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
@@ -37,44 +19,40 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
         rgb_matrix_set_color_all(0, 0, 0);
     }
 
-    RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
-    for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
-        for (uint8_t l = 0; l < MID_COL - 1; ++l) { // Light and move left columns outwards
-            if (led[h][l]) {
-                rgb_matrix_set_color(g_led_config.matrix_co[h][l], rgb.r, rgb.g, rgb.b);
-            } else {
-                rgb_matrix_set_color(g_led_config.matrix_co[h][l], 0, 0, 0);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    if (g_rgb_timer > wait_timer) {
+        RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
+        for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
+            // Light and copy columns outward
+            for (uint8_t l = 0; l < MID_COL - 1; ++l) {
+                if (led[h][l]) {
+                    rgb_matrix_set_color(g_led_config.matrix_co[h][l], rgb.r, rgb.g, rgb.b);
+                    rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], rgb.r, rgb.g, rgb.b);
+                } else {
+                    rgb_matrix_set_color(g_led_config.matrix_co[h][l], 0, 0, 0);
+                    rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - 1 - l], 0, 0, 0);
+                }
+                led[h][l] = led[h][l + 1];
             }
-            led[h][l] = led[h][l + 1];
-        }
 
-        for (uint8_t r = MATRIX_COLS - 1; r > MID_COL; --r) { // Light and move right columns outwards
-            if (led[h][r]) {
-                rgb_matrix_set_color(g_led_config.matrix_co[h][r], rgb.r, rgb.g, rgb.b);
+            // Light both middle columns
+            if (led[h][MID_COL - 1]) {
+                rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], rgb.r, rgb.g, rgb.b);
+                rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], rgb.r, rgb.g, rgb.b);
             } else {
-                rgb_matrix_set_color(g_led_config.matrix_co[h][r], 0, 0, 0);
+                rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], 0, 0, 0);
+                rgb_matrix_set_color(g_led_config.matrix_co[h][MATRIX_COLS - MID_COL], 0, 0, 0);
             }
-            led[h][r] = led[h][r - 1];
+
+            // Generate new random fractal column
+            led[h][MID_COL - 1] = (random8() & 3) ? false : true;
         }
 
-        // Light both middle columns
-        if (led[h][MID_COL]) {
-            rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL], rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL], 0, 0, 0);
-        }
-        if (led[h][MID_COL - 1]) {
-            rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(g_led_config.matrix_co[h][MID_COL - 1], 0, 0, 0);
-        }
-
-        // Generate new random fractal columns
-        led[h][MID_COL] = led[h][MID_COL - 1] = (random8() & 3) ? false : true;
+        wait_timer = g_rgb_timer + interval();
     }
 
-    wait_timer = g_rgb_timer + interval();
-    return false;
+    return rgb_matrix_check_finished_leds(led_max);
 }
 #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 #endif     // ENABLE_RGB_MATRIX_PIXEL_FRACTAL

From 8133f40c26322e639ae9f411ad7f7854829c5b56 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 13 Aug 2022 08:54:32 +1000
Subject: [PATCH 172/959] Update to latest ChibiOS-Contrib. (#18016)

---
 lib/chibios-contrib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 966c48894b..d03aa9cc2f 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 966c48894b12a2ebf8819e6316c2a5dabdd320f2
+Subproject commit d03aa9cc2f76468e431c71421015102956dd6ad7

From ccdba43e59fc42c9a91373c65eaa4a026539dc80 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 12 Aug 2022 16:22:34 -0700
Subject: [PATCH 173/959] Create generic Pointing Device Pin defines (#17776)

---
 docs/feature_pointing_device.md   | 70 +++++++++++++++++--------------
 drivers/sensors/adns5050.h        | 18 ++++++--
 drivers/sensors/adns9800.h        |  6 ++-
 drivers/sensors/cirque_pinnacle.h |  6 ++-
 drivers/sensors/paw3204.h         | 12 +++++-
 drivers/sensors/pmw33xx_common.h  |  8 +++-
 6 files changed, 80 insertions(+), 40 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index c46cf34ee6..999dd1272d 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -22,11 +22,13 @@ POINTING_DEVICE_DRIVER = adns5050
 
 The ADNS 5050 sensor uses a serial type protocol for communication, and requires an additional light source. 
 
-| Setting             | Description                                                         |
-| ------------------- | ------------------------------------------------------------------- |
-| `ADNS5050_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.        |
-| `ADNS5050_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.         |
-| `ADNS5050_CS_PIN`   | (Required) The pin connected to the cable select pin of the sensor. |
+| Setting             | Description                                                         | Default                    |
+| ------------------- | ------------------------------------------------------------------- | -------------------------- |
+| `ADNS5050_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.        | `POINTING_DEVICE_SCLK_PIN` |
+| `ADNS5050_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.         | `POINTING_DEVICE_SDIO_PIN` |
+| `ADNS5050_CS_PIN`   | (Required) The pin connected to the cable select pin of the sensor. | `POINTING_DEVICE_CS_PIN`   |
+
+
 
 The CPI range is 125-1375, in increments of 125. Defaults to 500 CPI.
 
@@ -40,13 +42,13 @@ POINTING_DEVICE_DRIVER = adns9800
 
 The ADNS 9800 is an SPI driven optical sensor, that uses laser output for surface tracking. 
 
-| Setting                 | Description                                                            | Default       |
-| ----------------------- | ---------------------------------------------------------------------- | ------------- |
-| `ADNS9800_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `2000000`     |
-| `ADNS9800_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
-| `ADNS9800_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `3`           |
-| `ADNS9800_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
-| `ADNS9800_CS_PIN`       | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
+| Setting                 | Description                                                            | Default                  |
+| ----------------------- | ---------------------------------------------------------------------- | ------------------------ |
+| `ADNS9800_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `2000000`                |
+| `ADNS9800_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`                  |
+| `ADNS9800_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `3`                      |
+| `ADNS9800_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_                 |
+| `ADNS9800_CS_PIN`       | (Required) Sets the Cable Select pin connected to the sensor.          | `POINTING_DEVICE_CS_PIN` |
 
 
 The CPI range is 800-8200, in increments of 200. Defaults to 1800 CPI. 
@@ -116,13 +118,13 @@ Default attenuation is set to 4X, although if you are using a thicker overlay (s
 | `CIRQUE_PINNACLE_ADDR`    | (Required) Sets the I2C Address for the Cirque Trackpad                         | `0x2A`  |
 | `CIRQUE_PINNACLE_TIMEOUT` | (Optional) The timeout for i2c communication with the trackpad in milliseconds. | `20`    |
 
-| SPI Setting                    | Description                                                            | Default       |
-| ------------------------------ | ---------------------------------------------------------------------- | ------------- |
-| `CIRQUE_PINNACLE_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `1000000`     |
-| `CIRQUE_PINNACLE_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
-| `CIRQUE_PINNACLE_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `1`           |
-| `CIRQUE_PINNACLE_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
-| `CIRQUE_PINNACLE_SPI_CS_PIN`   | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
+| SPI Setting                    | Description                                                            | Default                  |
+| ------------------------------ | ---------------------------------------------------------------------- | ------------------------ |
+| `CIRQUE_PINNACLE_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `1000000`                |
+| `CIRQUE_PINNACLE_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`                  |
+| `CIRQUE_PINNACLE_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `1`                      |
+| `CIRQUE_PINNACLE_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_                 |
+| `CIRQUE_PINNACLE_SPI_CS_PIN`   | (Required) Sets the Cable Select pin connected to the sensor.          | `POINTING_DEVICE_CS_PIN` |
 
 Default Scaling is 1024. Actual CPI depends on trackpad diameter.
 
@@ -170,10 +172,10 @@ POINTING_DEVICE_DRIVER = paw3204
 
 The paw 3204 sensor uses a serial type protocol for communication, and requires an additional light source. 
 
-| Setting            | Description                                                         |
-|--------------------|---------------------------------------------------------------------|
-|`PAW3204_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.        |
-|`PAW3204_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.         |
+| Setting            | Description                                                    | Default                    |
+| ------------------ |--------------------------------------------------------------- | -------------------------- |
+| `PAW3204_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.   | `POINTING_DEVICE_SCLK_PIN` |
+| `PAW3204_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.    | `POINTING_DEVICE_SDIO_PIN` |
 
 The CPI range is 400-1600, with supported values of (400, 500, 600, 800, 1000, 1200 and 1600).  Defaults to 1000 CPI.
 
@@ -217,15 +219,15 @@ The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
 
 Both PMW 3360 and PMW 3389 are SPI driven optical sensors, that use a built in IR LED for surface tracking.
 
-| Setting                      | Description                                                                                 | Default       |
-| ---------------------------- | ------------------------------------------------------------------------------------------- | ------------- |
-| `PMW33XX_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                               | _not defined_ |
-| `PMW33XX_CS_PINS`            | (Alternative) Sets the Cable Select pins connected to multiple sensors.                     | _not defined_ |
-| `PMW33XX_CPI`                | (Optional) Sets counts per inch sensitivity of the sensor.                                  | _varies_      |
-| `PMW33XX_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                    | `2000000`     |
-| `PMW33XX_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                 | _varies_      |
-| `PMW33XX_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                           | `0x02`        |
-| `ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`           |
+| Setting                      | Description                                                                                 | Default                  |
+| ---------------------------- | ------------------------------------------------------------------------------------------- | ------------------------ |
+| `PMW33XX_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                               | `POINTING_DEVICE_CS_PIN` |
+| `PMW33XX_CS_PINS`            | (Alternative) Sets the Cable Select pins connected to multiple sensors.                     | _not defined_            |
+| `PMW33XX_CPI`                | (Optional) Sets counts per inch sensitivity of the sensor.                                  | _varies_                 |
+| `PMW33XX_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                    | `2000000`                |
+| `PMW33XX_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                 | _varies_                 |
+| `PMW33XX_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                           | `0x02`                   |
+| `ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`                      |
 
 To use multiple sensors, instead of setting `PMW33XX_CS_PIN` you need to set `PMW33XX_CS_PINS` and also handle and merge the read from this sensor in user code.
 Note that different (per sensor) values of CPI, speed liftoff, rotational angle or flipping of X/Y is not currently supported.
@@ -290,9 +292,13 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 | `POINTING_DEVICE_TASK_THROTTLE_MS`             | (Optional) Limits the frequency that the sensor is polled for motion.                                                            | _not defined_ |
 | `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction.             | _not defined_ |
 | `POINTING_DEVICE_GESTURES_SCROLL_ENABLE`       | (Optional) Enable scroll gesture. The gesture that activates the scroll is device dependent.                                     | _not defined_ |
+| `POINTING_DEVICE_CS_PIN`                       | (Optional) Provides a default CS pin, useful for supporting multiple sensor configs.                                             | _not defined_ |
+| `POINTING_DEVICE_SDIO_PIN`                     | (Optional) Provides a default SDIO pin, useful for supporting multiple sensor configs.                                           | _not defined_ |
+| `POINTING_DEVICE_SCLK_PIN`                     | (Optional) Provides a default SCLK pin, useful for supporting multiple sensor configs.                                           | _not defined_ |
 
 !> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and `POINTING_DEVICE_TASK_THROTTLE_MS` will default to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
 
+The `POINTING_DEVICE_CS_PIN`, `POINTING_DEVICE_SDIO_PIN`, and `POINTING_DEVICE_SCLK_PIN` provide a convenient way to define a single pin that can be used for an interchangeable sensor config.  This allows you to have a single config, without defining each device.  Each sensor allows for this to be overridden with their own defines. 
 
 !> Any pointing device with a lift/contact status can integrate inertial cursor feature into its driver, controlled by `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE`. e.g. PMW3360 can use Lift_Stat from Motion register. Note that `POINTING_DEVICE_MOTION_PIN` cannot be used with this feature; continuous polling of `get_report()` is needed to generate glide reports.
 
diff --git a/drivers/sensors/adns5050.h b/drivers/sensors/adns5050.h
index e45a250196..f20c2f74bc 100644
--- a/drivers/sensors/adns5050.h
+++ b/drivers/sensors/adns5050.h
@@ -40,15 +40,27 @@
 
 // Definitions for the ADNS serial line.
 #ifndef ADNS5050_SCLK_PIN
-#    error "No clock pin defined -- missing ADNS5050_SCLK_PIN"
+#    ifdef POINTING_DEVICE_SCLK_PIN
+#        define ADNS5050_SCLK_PIN POINTING_DEVICE_SCLK_PIN
+#    else
+#        error "No clock pin defined -- missing POINTING_DEVICE_SCLK_PIN or ADNS5050_SCLK_PIN"
+#    endif
 #endif
 
 #ifndef ADNS5050_SDIO_PIN
-#    error "No data pin defined -- missing ADNS5050_SDIO_PIN"
+#    ifdef POINTING_DEVICE_SDIO_PIN
+#        define ADNS5050_SDIO_PIN POINTING_DEVICE_SDIO_PIN
+#    else
+#        error "No data pin defined -- missing POINTING_DEVICE_SDIO_PIN or ADNS5050_SDIO_PIN"
+#    endif
 #endif
 
 #ifndef ADNS5050_CS_PIN
-#    error "No chip select pin defined -- missing ADNS5050_CS_PIN"
+#    ifdef POINTING_DEVICE_CS_PIN
+#        define ADNS5050_CS_PIN POINTING_DEVICE_CS_PIN
+#    else
+#        error "No chip select pin defined -- missing POINTING_DEVICE_CS_PIN or ADNS5050_CS_PIN define"
+#    endif
 #endif
 
 typedef struct {
diff --git a/drivers/sensors/adns9800.h b/drivers/sensors/adns9800.h
index e75a869c03..3f1a005789 100644
--- a/drivers/sensors/adns9800.h
+++ b/drivers/sensors/adns9800.h
@@ -43,7 +43,11 @@
 #endif
 
 #ifndef ADNS9800_CS_PIN
-#    error "No chip select pin defined -- missing ADNS9800_CS_PIN"
+#    ifdef POINTING_DEVICE_CS_PIN
+#        define ADNS9800_CS_PIN POINTING_DEVICE_CS_PIN
+#    else
+#        error "No chip select pin defined -- missing POINTING_DEVICE_CS_PIN or ADNS9800_CS_PIN"
+#    endif
 #endif
 
 typedef struct {
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index 320e7d936e..fa06e047f2 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -78,7 +78,11 @@
 #            define CIRQUE_PINNACLE_SPI_DIVISOR 64
 #        endif
 #        ifndef CIRQUE_PINNACLE_SPI_CS_PIN
-#            error "No Chip Select pin has been defined -- missing CIRQUE_PINNACLE_SPI_CS_PIN define"
+#            ifdef POINTING_DEVICE_CS_PIN
+#                define CIRQUE_PINNACLE_SPI_CS_PIN POINTING_DEVICE_CS_PIN
+#            else
+#                error "No Chip Select pin has been defined -- missing POINTING_DEVICE_CS_PIN or CIRQUE_PINNACLE_SPI_CS_PIN define"
+#            endif
 #        endif
 #    endif
 #endif
diff --git a/drivers/sensors/paw3204.h b/drivers/sensors/paw3204.h
index bf6dbd04a0..7f487d90dc 100644
--- a/drivers/sensors/paw3204.h
+++ b/drivers/sensors/paw3204.h
@@ -20,10 +20,18 @@
 #include <stdbool.h>
 
 #ifndef PAW3204_SCLK_PIN
-#    error "No clock pin defined -- missing PAW3204_SCLK_PIN"
+#    ifdef POINTING_DEVICE_SCLK_PIN
+#        define PAW3204_SCLK_PIN POINTING_DEVICE_SCLK_PIN
+#    else
+#        error "No clock pin defined -- missing POINTING_DEVICE_SCLK_PIN or PAW3204_SCLK_PIN"
+#    endif
 #endif
 #ifndef PAW3204_SDIO_PIN
-#    error "No data pin defined -- missing PAW3204_SDIO_PIN"
+#    ifdef POINTING_DEVICE_SDIO_PIN
+#        define PAW3204_SDIO_PIN POINTING_DEVICE_SDIO_PIN
+#    else
+#        error "No data pin defined -- missing POINTING_DEVICE_SDIO_PIN or PAW3204_SDIO_PIN"
+#    endif
 #endif
 
 typedef struct {
diff --git a/drivers/sensors/pmw33xx_common.h b/drivers/sensors/pmw33xx_common.h
index 87e8b34d5c..c725e80f24 100644
--- a/drivers/sensors/pmw33xx_common.h
+++ b/drivers/sensors/pmw33xx_common.h
@@ -66,7 +66,13 @@ _Static_assert(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.moti
 // Support single and plural spellings
 #ifndef PMW33XX_CS_PINS
 #    ifndef PMW33XX_CS_PIN
-#        error "No chip select pin defined -- missing PMW33XX_CS_PIN or PMW33XX_CS_PINS"
+#        ifdef POINTING_DEVICE_CS_PIN
+#            define PMW33XX_CS_PIN POINTING_DEVICE_CS_PIN
+#            define PMW33XX_CS_PINS \
+                { PMW33XX_CS_PIN }
+#        else
+#            error "No chip select pin defined -- missing PMW33XX_CS_PIN or PMW33XX_CS_PINS"
+#        endif
 #    else
 #        define PMW33XX_CS_PINS \
             { PMW33XX_CS_PIN }

From aed82bc6a07ab72a3bec7b4b578b6cb644a92d51 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 12 Aug 2022 18:04:02 -0700
Subject: [PATCH 174/959] Move Encoder+Encoder Map from generic features
 (#18018)

---
 builddefs/common_features.mk  | 8 ++++++++
 builddefs/generic_features.mk | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 8d31f694a7..1f1f945760 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -893,3 +893,11 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
         QUANTUM_LIB_SRC += uart.c
     endif
 endif
+
+ifeq ($(strip $(ENCODER_ENABLE)), yes)
+    COMMON_VPATH += $(QUANTUM_DIR)/encoder.c
+    OPT_DEFS += -DENCODER_ENABLE
+    ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
+        OPT_DEFS += -DENCODER_MAP_ENABLE
+    endif
+endif
diff --git a/builddefs/generic_features.mk b/builddefs/generic_features.mk
index c3f1ec0f72..f195e9fd75 100644
--- a/builddefs/generic_features.mk
+++ b/builddefs/generic_features.mk
@@ -25,8 +25,6 @@ GENERIC_FEATURES = \
     DIP_SWITCH \
     DYNAMIC_KEYMAP \
     DYNAMIC_MACRO \
-    ENCODER \
-    ENCODER_MAP \
     GRAVE_ESC \
     HAPTIC \
     KEY_LOCK \

From 19ce1418badbf04b0b675c2e81a184e93b14141f Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Sat, 13 Aug 2022 09:14:33 +0800
Subject: [PATCH 175/959] Added implementation of WB32 MCU wear_leveling_efl.
 (#17579)

---
 .../chibios/drivers/wear_leveling/wear_leveling_efl_config.h    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
index 9e38c2965d..244c87cb7f 100644
--- a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
@@ -14,6 +14,8 @@
 #        define BACKING_STORE_WRITE_SIZE 2 // from hal_efl_lld.c
 #    elif defined(QMK_MCU_FAMILY_NUC123)
 #        define BACKING_STORE_WRITE_SIZE 4 // from hal_efl_lld.c
+#    elif defined(QMK_MCU_FAMILY_WB32)
+#        define BACKING_STORE_WRITE_SIZE 8 // from hal_efl_lld.c
 #    elif defined(QMK_MCU_FAMILY_STM32)
 #        if defined(STM32_FLASH_LINE_SIZE) // from some family's stm32_registry.h file
 #            define BACKING_STORE_WRITE_SIZE (STM32_FLASH_LINE_SIZE)

From db4c4b1f7868a99c094ee277f7b17ffffe2fea7b Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 13 Aug 2022 04:13:22 +0200
Subject: [PATCH 176/959] =?UTF-8?q?Fix=20B=C3=A9po's=20BP=5FNNBS=20(narrow?=
 =?UTF-8?q?=20non-breaking=20space)=20(#17999)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 quantum/keymap_extras/keymap_bepo.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 72d5b81f32..6361823242 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -237,4 +237,4 @@
 #define BP_DDAG S(ALGR(BP_H))    // ‡
 #define BP_FORD S(ALGR(BP_F))    // ª
 // Row 5
-#define BP_NNBS S(ALGR(BP_))     //   (narrow non-breaking space)
+#define BP_NNBS S(ALGR(KC_SPC))  //   (narrow non-breaking space)

From b4fbb340c51dc4353ec821a70adc529698549ef0 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 13 Aug 2022 04:13:43 +0200
Subject: [PATCH 177/959] Use LT_ZCAR in place of LT_PLUS for modded kc
 definitions (#18000)

---
 quantum/keymap_extras/keymap_lithuanian_qwerty.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/keymap_extras/keymap_lithuanian_qwerty.h b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
index 2dbb3649f7..fb0468a20a 100644
--- a/quantum/keymap_extras/keymap_lithuanian_qwerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
@@ -137,7 +137,7 @@
 #define LT_6    ALGR(LT_SCAR) // 6
 #define LT_7    ALGR(LT_UOGO) // 7
 #define LT_8    ALGR(LT_UMAC) // 8
-#define LT_EQL  ALGR(LT_PLUS) // =
+#define LT_EQL  ALGR(LT_ZCAR) // =
 // Row 2
 #define LT_EURO ALGR(LT_E)    // €
 
@@ -163,4 +163,4 @@
 #define LT_CIRC S(ALGR(LT_SCAR)) // ^
 #define LT_AMPR S(ALGR(LT_UOGO)) // &
 #define LT_ASTR S(ALGR(LT_UMAC)) // *
-#define LT_PLUS S(ALGR(LT_PLUS)) // +
+#define LT_PLUS S(ALGR(LT_ZCAR)) // +

From 20f0f402207e38d074aa4ca713fcc0d9c2e391c9 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 13 Aug 2022 04:16:50 +0200
Subject: [PATCH 178/959] Remove invisible variation selector-15 from
 keymap_japanese.h (#18007)

---
 quantum/keymap_extras/keymap_japanese.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/keymap_extras/keymap_japanese.h b/quantum/keymap_extras/keymap_japanese.h
index d10feb5856..df78af8399 100644
--- a/quantum/keymap_extras/keymap_japanese.h
+++ b/quantum/keymap_extras/keymap_japanese.h
@@ -28,7 +28,7 @@
 
 /*
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │Z↔︎H│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ^ │ ¥ │   │
+ * │Z↔H│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ^ │ ¥ │   │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
  * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ @ │ [ │     │
  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
@@ -40,7 +40,7 @@
  * └─────┴───┴─────┴─────┴─────────┴─────┴───┴───┴───┴───┴─────┘
  */
 // Row 1
-#define JP_ZKHK KC_GRV  // Zenkaku ↔︎ Hankaku ↔ Kanji (半角 ↔ 全角 ↔ 漢字)
+#define JP_ZKHK KC_GRV  // Zenkaku ↔ Hankaku ↔ Kanji (半角 ↔ 全角 ↔ 漢字)
 #define JP_1    KC_1    // 1
 #define JP_2    KC_2    // 2
 #define JP_3    KC_3    // 3

From e3415d6b973868e99eef83a9bb92726eba796e4f Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 13 Aug 2022 04:20:35 +0200
Subject: [PATCH 179/959] =?UTF-8?q?define=20CZ=5FPERC=20S(CZ=5FPLUS)=20?=
 =?UTF-8?q?=E2=86=92=20define=20CZ=5FPERC=20S(CZ=5FEQL)=20(#18008)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quantum/keymap_extras/keymap_czech.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/keymap_czech.h b/quantum/keymap_extras/keymap_czech.h
index 2b1fb5da29..a8f522d31c 100644
--- a/quantum/keymap_extras/keymap_czech.h
+++ b/quantum/keymap_extras/keymap_czech.h
@@ -111,7 +111,7 @@
 #define CZ_8    S(CZ_AACU) // 8
 #define CZ_9    S(CZ_IACU) // 9
 #define CZ_0    S(CZ_EACU) // 0
-#define CZ_PERC S(CZ_PLUS) // %
+#define CZ_PERC S(CZ_EQL)  // %
 #define CZ_CARN S(CZ_ACUT) // ˇ (dead)
 // Row 2
 #define CZ_SLSH S(CZ_UACU) // /

From 4ff39b5652b7f3338ac6e046e784da7a3d351d58 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 13 Aug 2022 04:20:58 +0200
Subject: [PATCH 180/959] =?UTF-8?q?KR=5FDQUO=20S(KR=5FCOLN)=20=E2=86=92=20?=
 =?UTF-8?q?KR=5FDQUO=20S(KR=5FQUOT)=20(#18011)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quantum/keymap_extras/keymap_korean.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/keymap_korean.h b/quantum/keymap_extras/keymap_korean.h
index 74be122dad..3d41a98b88 100644
--- a/quantum/keymap_extras/keymap_korean.h
+++ b/quantum/keymap_extras/keymap_korean.h
@@ -121,7 +121,7 @@
 #define KR_PIPE S(KR_WON)  // |
 // Row 3
 #define KR_COLN S(KR_SCLN) // :
-#define KR_DQUO S(KR_COLN) // "
+#define KR_DQUO S(KR_QUOT) // "
 // Row 4
 #define KR_LABK S(KR_COMM) // <
 #define KR_RABK S(KR_DOT)  // >

From 3d248450161b96fcfad5f04e3d278e7d48489321 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 12 Aug 2022 19:55:59 -0700
Subject: [PATCH 181/959] [Bug] Fix wrong varaible in encoder block (#18020)

---
 builddefs/common_features.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 1f1f945760..755a1735e0 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -895,7 +895,7 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(ENCODER_ENABLE)), yes)
-    COMMON_VPATH += $(QUANTUM_DIR)/encoder.c
+    SRC += $(QUANTUM_DIR)/encoder.c
     OPT_DEFS += -DENCODER_ENABLE
     ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
         OPT_DEFS += -DENCODER_MAP_ENABLE

From a02aff9c77c15ca9e248f84b09a88386a8f4b0a6 Mon Sep 17 00:00:00 2001
From: lokher <lokher@gmail.com>
Date: Sat, 13 Aug 2022 21:39:06 +0800
Subject: [PATCH 182/959] Add led matrix support for CKLED2001 (#17643)

---
 builddefs/common_features.mk            |   9 +-
 drivers/led/ckled2001-simple.c          | 218 +++++++++++++++
 drivers/led/ckled2001-simple.h          | 337 ++++++++++++++++++++++++
 drivers/led/ckled2001.c                 |  21 +-
 drivers/led/ckled2001.h                 |   4 +-
 quantum/led_matrix/led_matrix.h         |   3 +
 quantum/led_matrix/led_matrix_drivers.c |  51 +++-
 7 files changed, 627 insertions(+), 16 deletions(-)
 create mode 100644 drivers/led/ckled2001-simple.c
 create mode 100644 drivers/led/ckled2001-simple.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 755a1735e0..a23b5e82b9 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -332,7 +332,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
 endif
 
 LED_MATRIX_ENABLE ?= no
-VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A custom
+VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 custom
 # TODO: IS31FL3733 IS31FL3737 IS31FL3741
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
@@ -388,6 +388,13 @@ endif
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), CKLED2001)
+        OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led
+        SRC += ckled2001-simple.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
 endif
 
 RGB_MATRIX_ENABLE ?= no
diff --git a/drivers/led/ckled2001-simple.c b/drivers/led/ckled2001-simple.c
new file mode 100644
index 0000000000..da4bf20b99
--- /dev/null
+++ b/drivers/led/ckled2001-simple.c
@@ -0,0 +1,218 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ckled2001-simple.h"
+#include "i2c_master.h"
+#include "wait.h"
+
+#ifndef CKLED2001_TIMEOUT
+#    define CKLED2001_TIMEOUT 100
+#endif
+
+#ifndef CKLED2001_PERSISTENCE
+#    define CKLED2001_PERSISTENCE 0
+#endif
+
+#ifndef PHASE_CHANNEL
+#    define PHASE_CHANNEL MSKPHASE_12CHANNEL
+#endif
+
+#ifndef CKLED2001_CURRENT_TUNE
+#    define CKLED2001_CURRENT_TUNE \
+        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+#endif
+
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];
+
+// These buffers match the CKLED2001 PWM registers.
+// The control buffers match the PG0 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in CKLED2001_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+uint8_t g_pwm_buffer[DRIVER_COUNT][192];
+bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
+
+uint8_t g_led_control_registers[DRIVER_COUNT][24]             = {0};
+bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false};
+
+bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    // If the transaction fails function returns false.
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;
+
+#if CKLED2001_PERSISTENCE > 0
+    for (uint8_t i = 0; i < CKLED2001_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, CKLED2001_TIMEOUT) != 0) {
+            return false;
+        }
+    }
+#else
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, CKLED2001_TIMEOUT) != 0) {
+        return false;
+    }
+#endif
+    return true;
+}
+
+bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+    // Assumes PG1 is already selected.
+    // If any of the transactions fails function returns false.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+    // g_twi_transfer_buffer[] is 20 bytes
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (int i = 0; i < 192; i += 16) {
+        g_twi_transfer_buffer[0] = i;
+        // Copy the data from i to i+15.
+        // Device will auto-increment register for data after the first byte
+        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
+        for (int j = 0; j < 16; j++) {
+            g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
+        }
+
+#if CKLED2001_PERSISTENCE > 0
+        for (uint8_t i = 0; i < CKLED2001_PERSISTENCE; i++) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, CKLED2001_TIMEOUT) != 0) {
+                return false;
+            }
+        }
+#else
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, CKLED2001_TIMEOUT) != 0) {
+            return false;
+        }
+#endif
+    }
+    return true;
+}
+
+void CKLED2001_init(uint8_t addr) {
+    // Select to function page
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    // Setting LED driver to shutdown mode
+    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
+    // Setting internal channel pulldown/pullup
+    CKLED2001_write_register(addr, PDU_REG, MSKSET_CA_CB_CHANNEL);
+    // Select number of scan phase
+    CKLED2001_write_register(addr, SCAN_PHASE_REG, PHASE_CHANNEL);
+    // Setting PWM Delay Phase
+    CKLED2001_write_register(addr, SLEW_RATE_CONTROL_MODE1_REG, MSKPWM_DELAY_PHASE_ENABLE);
+    // Setting Driving/Sinking Channel Slew Rate
+    CKLED2001_write_register(addr, SLEW_RATE_CONTROL_MODE2_REG, MSKDRIVING_SINKING_CHHANNEL_SLEWRATE_ENABLE);
+    // Setting Iref
+    CKLED2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_DISABLE);
+    // Set LED CONTROL PAGE (Page 0)
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+    for (int i = 0; i < LED_CONTROL_ON_OFF_LENGTH; i++) {
+        CKLED2001_write_register(addr, i, 0x00);
+    }
+
+    // Set PWM PAGE (Page 1)
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
+    for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
+        CKLED2001_write_register(addr, i, 0x00);
+    }
+
+    // Set CURRENT PAGE (Page 4)
+    uint8_t current_tuen_reg_list[LED_CURRENT_TUNE_LENGTH] = CKLED2001_CURRENT_TUNE;
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, CURRENT_TUNE_PAGE);
+    for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
+        CKLED2001_write_register(addr, i, current_tuen_reg_list[i]);
+    }
+
+    // Enable LEDs ON/OFF
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+    for (int i = 0; i < LED_CONTROL_ON_OFF_LENGTH; i++) {
+        CKLED2001_write_register(addr, i, 0xFF);
+    }
+
+    // Select to function page
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    // Setting LED driver to normal mode
+    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
+}
+
+void CKLED2001_set_value(int index, uint8_t value) {
+    ckled2001_led led;
+    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+        memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
+
+        g_pwm_buffer[led.driver][led.v]          = value;
+        g_pwm_buffer_update_required[led.driver] = true;
+    }
+}
+
+void CKLED2001_set_value_all(uint8_t value) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        CKLED2001_set_value(i, value);
+    }
+}
+
+void CKLED2001_set_led_control_register(uint8_t index, bool value) {
+    ckled2001_led led;
+    memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
+
+    uint8_t control_register = led.v / 8;
+    uint8_t bit_value        = led.v % 8;
+
+    if (value) {
+        g_led_control_registers[led.driver][control_register] |= (1 << bit_value);
+    } else {
+        g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
+    }
+
+    g_led_control_registers_update_required[led.driver] = true;
+}
+
+void CKLED2001_update_pwm_buffers(uint8_t addr, uint8_t index) {
+    if (g_pwm_buffer_update_required[index]) {
+        CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
+
+        // If any of the transactions fail we risk writing dirty PG0,
+        // refresh page 0 just in case.
+        if (!CKLED2001_write_pwm_buffer(addr, g_pwm_buffer[index])) {
+            g_led_control_registers_update_required[index] = true;
+        }
+    }
+    g_pwm_buffer_update_required[index] = false;
+}
+
+void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index) {
+    if (g_led_control_registers_update_required[index]) {
+        CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+        for (int i = 0; i < 24; i++) {
+            CKLED2001_write_register(addr, i, g_led_control_registers[index][i]);
+        }
+    }
+    g_led_control_registers_update_required[index] = false;
+}
+
+void CKLED2001_sw_return_normal(uint8_t addr) {
+    // Select to function page
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    // Setting LED driver to normal mode
+    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
+}
+
+void CKLED2001_sw_shutdown(uint8_t addr) {
+    // Select to function page
+    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    // Setting LED driver to shutdown mode
+    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
+    // Write SW Sleep Register
+    CKLED2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_ENABLE);
+}
diff --git a/drivers/led/ckled2001-simple.h b/drivers/led/ckled2001-simple.h
new file mode 100644
index 0000000000..731da2e1cd
--- /dev/null
+++ b/drivers/led/ckled2001-simple.h
@@ -0,0 +1,337 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+
+typedef struct ckled2001_led {
+    uint8_t driver : 2;
+    uint8_t v;
+} __attribute__((packed)) ckled2001_led;
+
+extern const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL];
+
+void CKLED2001_init(uint8_t addr);
+bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+
+void CKLED2001_set_value(int index, uint8_t value);
+void CKLED2001_set_value_all(uint8_t value);
+
+void CKLED2001_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void CKLED2001_update_pwm_buffers(uint8_t addr, uint8_t index);
+void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index);
+
+void CKLED2001_sw_return_normal(uint8_t addr);
+void CKLED2001_sw_shutdown(uint8_t addr);
+
+// Registers Page Define
+#define CONFIGURE_CMD_PAGE 0xFD
+#define LED_CONTROL_PAGE 0x00
+#define LED_PWM_PAGE 0x01
+#define FUNCTION_PAGE 0x03
+#define CURRENT_TUNE_PAGE 0x04
+
+// Function Register: address 0x00
+#define CONFIGURATION_REG 0x00
+#define MSKSW_SHUT_DOWN_MODE (0x0 << 0)
+#define MSKSW_NORMAL_MODE (0x1 << 0)
+
+#define DRIVER_ID_REG 0x11
+#define CKLED2001_ID 0x8A
+
+#define PDU_REG 0x13
+#define MSKSET_CA_CB_CHANNEL 0xAA
+#define MSKCLR_CA_CB_CHANNEL 0x00
+
+#define SCAN_PHASE_REG 0x14
+#define MSKPHASE_12CHANNEL 0x00
+#define MSKPHASE_11CHANNEL 0x01
+#define MSKPHASE_10CHANNEL 0x02
+#define MSKPHASE_9CHANNEL 0x03
+#define MSKPHASE_8CHANNEL 0x04
+#define MSKPHASE_7CHANNEL 0x05
+#define MSKPHASE_6CHANNEL 0x06
+#define MSKPHASE_5CHANNEL 0x07
+#define MSKPHASE_4CHANNEL 0x08
+#define MSKPHASE_3CHANNEL 0x09
+#define MSKPHASE_2CHANNEL 0x0A
+#define MSKPHASE_1CHANNEL 0x0B
+
+#define SLEW_RATE_CONTROL_MODE1_REG 0x15
+#define MSKPWM_DELAY_PHASE_ENABLE 0x04
+#define MSKPWM_DELAY_PHASE_DISABLE 0x00
+
+#define SLEW_RATE_CONTROL_MODE2_REG 0x16
+#define MSKDRIVING_SINKING_CHHANNEL_SLEWRATE_ENABLE 0xC0
+#define MSKDRIVING_SINKING_CHHANNEL_SLEWRATE_DISABLE 0x00
+
+#define OPEN_SHORT_ENABLE_REG 0x17
+#define MSKOPEN_DETECTION_ENABLE (0x01 << 7)
+#define MSKOPEN_DETECTION_DISABLE (0x00)
+
+#define MSKSHORT_DETECTION_ENABLE (0x01 << 6)
+#define MSKSHORT_DETECTION_DISABLE (0x00)
+
+#define OPEN_SHORT_DUTY_REG 0x18
+#define OPEN_SHORT_FLAG_REG 0x19
+
+#define MSKOPEN_DETECTION_INTERRUPT_ENABLE (0x01 << 7)
+#define MSKOPEN_DETECTION_INTERRUPT_DISABLE (0x00)
+
+#define MSKSHORT_DETECTION_INTERRUPT_ENABLE (0x01 << 6)
+#define MSKSHORT_DETECTION_INTERRUPT_DISABLE (0x00)
+
+#define SOFTWARE_SLEEP_REG 0x1A
+#define MSKSLEEP_ENABLE 0x02
+#define MSKSLEEP_DISABLE 0x00
+
+// LED Control Registers
+#define LED_CONTROL_ON_OFF_FIRST_ADDR 0x0
+#define LED_CONTROL_ON_OFF_LAST_ADDR 0x17
+#define LED_CONTROL_ON_OFF_LENGTH ((LED_CONTROL_ON_OFF_LAST_ADDR - LED_CONTROL_ON_OFF_FIRST_ADDR) + 1)
+
+#define LED_CONTROL_OPEN_FIRST_ADDR 0x18
+#define LED_CONTROL_OPEN_LAST_ADDR 0x2F
+#define LED_CONTROL_OPEN_LENGTH ((LED_CONTROL_OPEN_LAST_ADDR - LED_CONTROL_OPEN_FIRST_ADDR) + 1)
+
+#define LED_CONTROL_SHORT_FIRST_ADDR 0x30
+#define LED_CONTROL_SHORT_LAST_ADDR 0x47
+#define LED_CONTROL_SHORT_LENGTH ((LED_CONTROL_SHORT_LAST_ADDR - LED_CONTROL_SHORT_FIRST_ADDR) + 1)
+
+#define LED_CONTROL_PAGE_LENGTH 0x48
+
+// LED Control Registers
+#define LED_PWM_FIRST_ADDR 0x00
+#define LED_PWM_LAST_ADDR 0xBF
+#define LED_PWM_LENGTH 0xC0
+
+// Current Tune Registers
+#define LED_CURRENT_TUNE_FIRST_ADDR 0x00
+#define LED_CURRENT_TUNE_LAST_ADDR 0x0B
+#define LED_CURRENT_TUNE_LENGTH 0x0C
+
+#define A_1 0x00
+#define A_2 0x01
+#define A_3 0x02
+#define A_4 0x03
+#define A_5 0x04
+#define A_6 0x05
+#define A_7 0x06
+#define A_8 0x07
+#define A_9 0x08
+#define A_10 0x09
+#define A_11 0x0A
+#define A_12 0x0B
+#define A_13 0x0C
+#define A_14 0x0D
+#define A_15 0x0E
+#define A_16 0x0F
+
+#define B_1 0x10
+#define B_2 0x11
+#define B_3 0x12
+#define B_4 0x13
+#define B_5 0x14
+#define B_6 0x15
+#define B_7 0x16
+#define B_8 0x17
+#define B_9 0x18
+#define B_10 0x19
+#define B_11 0x1A
+#define B_12 0x1B
+#define B_13 0x1C
+#define B_14 0x1D
+#define B_15 0x1E
+#define B_16 0x1F
+
+#define C_1 0x20
+#define C_2 0x21
+#define C_3 0x22
+#define C_4 0x23
+#define C_5 0x24
+#define C_6 0x25
+#define C_7 0x26
+#define C_8 0x27
+#define C_9 0x28
+#define C_10 0x29
+#define C_11 0x2A
+#define C_12 0x2B
+#define C_13 0x2C
+#define C_14 0x2D
+#define C_15 0x2E
+#define C_16 0x2F
+
+#define D_1 0x30
+#define D_2 0x31
+#define D_3 0x32
+#define D_4 0x33
+#define D_5 0x34
+#define D_6 0x35
+#define D_7 0x36
+#define D_8 0x37
+#define D_9 0x38
+#define D_10 0x39
+#define D_11 0x3A
+#define D_12 0x3B
+#define D_13 0x3C
+#define D_14 0x3D
+#define D_15 0x3E
+#define D_16 0x3F
+
+#define E_1 0x40
+#define E_2 0x41
+#define E_3 0x42
+#define E_4 0x43
+#define E_5 0x44
+#define E_6 0x45
+#define E_7 0x46
+#define E_8 0x47
+#define E_9 0x48
+#define E_10 0x49
+#define E_11 0x4A
+#define E_12 0x4B
+#define E_13 0x4C
+#define E_14 0x4D
+#define E_15 0x4E
+#define E_16 0x4F
+
+#define F_1 0x50
+#define F_2 0x51
+#define F_3 0x52
+#define F_4 0x53
+#define F_5 0x54
+#define F_6 0x55
+#define F_7 0x56
+#define F_8 0x57
+#define F_9 0x58
+#define F_10 0x59
+#define F_11 0x5A
+#define F_12 0x5B
+#define F_13 0x5C
+#define F_14 0x5D
+#define F_15 0x5E
+#define F_16 0x5F
+
+#define G_1 0x60
+#define G_2 0x61
+#define G_3 0x62
+#define G_4 0x63
+#define G_5 0x64
+#define G_6 0x65
+#define G_7 0x66
+#define G_8 0x67
+#define G_9 0x68
+#define G_10 0x69
+#define G_11 0x6A
+#define G_12 0x6B
+#define G_13 0x6C
+#define G_14 0x6D
+#define G_15 0x6E
+#define G_16 0x6F
+
+#define H_1 0x70
+#define H_2 0x71
+#define H_3 0x72
+#define H_4 0x73
+#define H_5 0x74
+#define H_6 0x75
+#define H_7 0x76
+#define H_8 0x77
+#define H_9 0x78
+#define H_10 0x79
+#define H_11 0x7A
+#define H_12 0x7B
+#define H_13 0x7C
+#define H_14 0x7D
+#define H_15 0x7E
+#define H_16 0x7F
+
+#define I_1 0x80
+#define I_2 0x81
+#define I_3 0x82
+#define I_4 0x83
+#define I_5 0x84
+#define I_6 0x85
+#define I_7 0x86
+#define I_8 0x87
+#define I_9 0x88
+#define I_10 0x89
+#define I_11 0x8A
+#define I_12 0x8B
+#define I_13 0x8C
+#define I_14 0x8D
+#define I_15 0x8E
+#define I_16 0x8F
+
+#define J_1 0x90
+#define J_2 0x91
+#define J_3 0x92
+#define J_4 0x93
+#define J_5 0x94
+#define J_6 0x95
+#define J_7 0x96
+#define J_8 0x97
+#define J_9 0x98
+#define J_10 0x99
+#define J_11 0x9A
+#define J_12 0x9B
+#define J_13 0x9C
+#define J_14 0x9D
+#define J_15 0x9E
+#define J_16 0x9F
+
+#define K_1 0xA0
+#define K_2 0xA1
+#define K_3 0xA2
+#define K_4 0xA3
+#define K_5 0xA4
+#define K_6 0xA5
+#define K_7 0xA6
+#define K_8 0xA7
+#define K_9 0xA8
+#define K_10 0xA9
+#define K_11 0xAA
+#define K_12 0xAB
+#define K_13 0xAC
+#define K_14 0xAD
+#define K_15 0xAE
+#define K_16 0xAF
+
+#define L_1 0xB0
+#define L_2 0xB1
+#define L_3 0xB2
+#define L_4 0xB3
+#define L_5 0xB4
+#define L_6 0xB5
+#define L_7 0xB6
+#define L_8 0xB7
+#define L_9 0xB8
+#define L_10 0xB9
+#define L_11 0xBA
+#define L_12 0xBB
+#define L_13 0xBC
+#define L_14 0xBD
+#define L_15 0xBE
+#define L_16 0xBF
\ No newline at end of file
diff --git a/drivers/led/ckled2001.c b/drivers/led/ckled2001.c
index 8d71805a24..b7e7db06cc 100644
--- a/drivers/led/ckled2001.c
+++ b/drivers/led/ckled2001.c
@@ -30,6 +30,11 @@
 #    define PHASE_CHANNEL MSKPHASE_12CHANNEL
 #endif
 
+#ifndef CKLED2001_CURRENT_TUNE
+#    define CKLED2001_CURRENT_TUNE \
+        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+#endif
+
 // Transfer buffer for TWITransmitData()
 uint8_t g_twi_transfer_buffer[20];
 
@@ -123,18 +128,10 @@ void CKLED2001_init(uint8_t addr) {
     }
 
     // Set CURRENT PAGE (Page 4)
+    uint8_t current_tuen_reg_list[LED_CURRENT_TUNE_LENGTH] = CKLED2001_CURRENT_TUNE;
     CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, CURRENT_TUNE_PAGE);
     for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
-        switch (i) {
-            case 2:
-            case 5:
-            case 8:
-            case 11:
-                CKLED2001_write_register(addr, i, 0xA0);
-                break;
-            default:
-                CKLED2001_write_register(addr, i, 0xFF);
-        }
+        CKLED2001_write_register(addr, i, current_tuen_reg_list[i]);
     }
 
     // Enable LEDs ON/OFF
@@ -220,14 +217,14 @@ void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index) {
     g_led_control_registers_update_required[index] = false;
 }
 
-void CKLED2001_return_normal(uint8_t addr) {
+void CKLED2001_sw_return_normal(uint8_t addr) {
     // Select to function page
     CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to normal mode
     CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
 }
 
-void CKLED2001_shutdown(uint8_t addr) {
+void CKLED2001_sw_shutdown(uint8_t addr) {
     // Select to function page
     CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to shutdown mode
diff --git a/drivers/led/ckled2001.h b/drivers/led/ckled2001.h
index 1967961d20..7d5ad34f95 100644
--- a/drivers/led/ckled2001.h
+++ b/drivers/led/ckled2001.h
@@ -45,8 +45,8 @@ void CKLED2001_set_led_control_register(uint8_t index, bool red, bool green, boo
 void CKLED2001_update_pwm_buffers(uint8_t addr, uint8_t index);
 void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index);
 
-void CKLED2001_return_normal(uint8_t addr);
-void CKLED2001_shutdown(uint8_t addr);
+void CKLED2001_sw_return_normal(uint8_t addr);
+void CKLED2001_sw_shutdown(uint8_t addr);
 
 // Registers Page Define
 #define CONFIGURE_CMD_PAGE 0xFD
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index b2abec7eb1..446f293c78 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -33,6 +33,9 @@
 #ifdef IS31FL3733
 #    include "is31fl3733-simple.h"
 #endif
+#ifdef CKLED2001
+#    include "ckled2001-simple.h"
+#endif
 
 #ifndef LED_MATRIX_LED_FLUSH_LIMIT
 #    define LED_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c
index 847ca1c310..f01b395c15 100644
--- a/quantum/led_matrix/led_matrix_drivers.c
+++ b/quantum/led_matrix/led_matrix_drivers.c
@@ -25,7 +25,7 @@
  * in their own files.
  */
 
-#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FLCOMMON)
+#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FLCOMMON) || defined(CKLED2001)
 #    include "i2c_master.h"
 
 static void init(void) {
@@ -78,6 +78,22 @@ static void init(void) {
 #                endif
 #            endif
 #        endif
+#    elif defined(CKLED2001)
+#        if defined(LED_DRIVER_SHUTDOWN_PIN)
+    setPinOutput(LED_DRIVER_SHUTDOWN_PIN);
+    writePinHigh(LED_DRIVER_SHUTDOWN_PIN);
+#        endif
+
+    CKLED2001_init(DRIVER_ADDR_1);
+#        if defined(DRIVER_ADDR_2)
+    CKLED2001_init(DRIVER_ADDR_2);
+#            if defined(DRIVER_ADDR_3)
+    CKLED2001_init(DRIVER_ADDR_3);
+#                if defined(DRIVER_ADDR_4)
+    CKLED2001_init(DRIVER_ADDR_4);
+#                endif
+#            endif
+#        endif
 #    endif
 
     for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
@@ -87,6 +103,8 @@ static void init(void) {
         IS31FL3733_set_led_control_register(index, true);
 #    elif defined(IS31FLCOMMON)
         IS31FL_simple_set_scaling_buffer(index, true);
+#    elif defined(CKLED2001)
+        CKLED2001_set_led_control_register(index, true);
 #    endif
     }
 
@@ -129,6 +147,17 @@ static void init(void) {
 #                endif
 #            endif
 #        endif
+#    elif defined(CKLED2001)
+    CKLED2001_update_led_control_registers(DRIVER_ADDR_1, 0);
+#        if defined(DRIVER_ADDR_2)
+    CKLED2001_update_led_control_registers(DRIVER_ADDR_2, 1);
+#            if defined(DRIVER_ADDR_3)
+    CKLED2001_update_led_control_registers(DRIVER_ADDR_3, 2);
+#                if defined(DRIVER_ADDR_4)
+    CKLED2001_update_led_control_registers(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
 #    endif
 }
 
@@ -194,5 +223,25 @@ const led_matrix_driver_t led_matrix_driver = {
     .set_value = IS31FL_simple_set_brightness,
     .set_value_all = IS31FL_simple_set_brigntness_all,
 };
+#    elif defined(CKLED2001)
+static void flush(void) {
+    CKLED2001_update_pwm_buffers(DRIVER_ADDR_1, 0);
+#        if defined(DRIVER_ADDR_2)
+    CKLED2001_update_pwm_buffers(DRIVER_ADDR_2, 1);
+#            if defined(DRIVER_ADDR_3)
+    CKLED2001_update_pwm_buffers(DRIVER_ADDR_3, 2);
+#                if defined(DRIVER_ADDR_4)
+    CKLED2001_update_pwm_buffers(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
+}
+
+const led_matrix_driver_t led_matrix_driver = {
+    .init = init,
+    .flush = flush,
+    .set_value = CKLED2001_set_value,
+    .set_value_all = CKLED2001_set_value_all,
+};
 #    endif
 #endif

From fc7e9efd215fee7ec8acd3e2740a6ab9d4633818 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 13 Aug 2022 14:39:56 +0100
Subject: [PATCH 183/959] Improve importer workflow (#17707)

---
 docs/hand_wire.md           |  29 ++++---
 lib/python/qmk/constants.py |   5 ++
 lib/python/qmk/importers.py | 147 +++++++++++++++++++++++-------------
 3 files changed, 118 insertions(+), 63 deletions(-)

diff --git a/docs/hand_wire.md b/docs/hand_wire.md
index e79a80375a..06809254df 100644
--- a/docs/hand_wire.md
+++ b/docs/hand_wire.md
@@ -177,20 +177,25 @@ From here, you should have a working keyboard once you program a firmware.
 
 Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website.  Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix).
 
-Go through the rest of the tabs, assigning keys until you get to the last one where you can compile and download your firmware.  The .hex file can be flashed straight onto your keyboard, and the .zip of source files can be modified for advanced functionality and compiled locally using the method described in [Building Your First Firmware](newbs_building_firmware?id=build-your-firmware).
+Go through the rest of the tabs, assigning keys until you get to the last one where you can compile and download your firmware.  The .hex file can be flashed straight onto your keyboard, or for advanced functionality, compiled locally after [Setting up Your Environment](newbs_getting_started.md).
 
-The source given by Keyboard Firmware Builder is QMK, but is based on a version of QMK from early 2017. To compile the code from your .zip file in a modern version of QMK Firmware, you'll need to open the .zip and follow these instructions:
+The source given by Keyboard Firmware Builder is QMK, but is based on a version of QMK from early 2017. To compile the firmware in a modern version of QMK Firmware, you'll need to export via the `Save Configuration` button, then run:
+
+    qmk import-kbfirmware /path/to/export.json
+
+For example:
+
+```
+$ qmk import-kbfirmware ~/Downloads/gh62.json 
+Ψ Importing gh62.json.
+
+⚠ Support here is basic - Consider using 'qmk new-keyboard' instead
+Ψ Imported a new keyboard named gh62.
+Ψ To start working on things, `cd` into keyboards/gh62,
+Ψ or open the directory in your preferred text editor.
+Ψ And build with qmk compile -kb gh62 -km default.
+```
 
-1. Extract the `kb` folder to `qmk_firmware/keyboards/handwired/`.
-2. Open the extracted `kb` folder, then proceed to the `keymaps/default/` folder, and open `keymap.c`.
-3. Locate and delete the `action_get_macro` code block:
-   ```
-    const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-        ...
-        return MACRO_NONE;
-    }
-   ```
-4. Save and close `keymap.c`.
 
 ## Flashing the Firmware
 
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 95fe9a61d0..5fe8326daf 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -58,6 +58,11 @@ MCU2BOOTLOADER = {
     "atmega328": "usbasploader",
 }
 
+# Map of legacy keycodes that can be automatically updated
+LEGACY_KEYCODES = {  # Comment here is to force multiline formatting
+    'RESET': 'QK_BOOT'
+}
+
 # Common format strings
 DATE_FORMAT = '%Y-%m-%d'
 DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z'
diff --git a/lib/python/qmk/importers.py b/lib/python/qmk/importers.py
index f9ecac02ae..307c66ee3c 100644
--- a/lib/python/qmk/importers.py
+++ b/lib/python/qmk/importers.py
@@ -1,10 +1,26 @@
 from dotty_dict import dotty
+from datetime import date
+from pathlib import Path
 import json
 
+from qmk.git import git_get_username
 from qmk.json_schema import validate
 from qmk.path import keyboard, keymap
-from qmk.constants import MCU2BOOTLOADER
+from qmk.constants import MCU2BOOTLOADER, LEGACY_KEYCODES
 from qmk.json_encoders import InfoJSONEncoder, KeymapJSONEncoder
+from qmk.json_schema import deep_update, json_load
+
+TEMPLATE = Path('data/templates/keyboard/')
+
+
+def replace_placeholders(src, dest, tokens):
+    """Replaces the given placeholders in each template file.
+    """
+    content = src.read_text()
+    for key, value in tokens.items():
+        content = content.replace(f'%{key}%', value)
+
+    dest.write_text(content)
 
 
 def _gen_dummy_keymap(name, info_data):
@@ -18,7 +34,47 @@ def _gen_dummy_keymap(name, info_data):
         "layers": [["KC_NO" for _ in range(0, layout_length)]],
     }
 
-    return json.dumps(keymap_data, cls=KeymapJSONEncoder)
+    return keymap_data
+
+
+def _extract_kbfirmware_layout(kbf_data):
+    layout = []
+    for key in kbf_data['keyboard.keys']:
+        item = {
+            'matrix': [key['row'], key['col']],
+            'x': key['state']['x'],
+            'y': key['state']['y'],
+        }
+        if key['state']['w'] != 1:
+            item['w'] = key['state']['w']
+        if key['state']['h'] != 1:
+            item['h'] = key['state']['h']
+        layout.append(item)
+
+    return layout
+
+
+def _extract_kbfirmware_keymap(kbf_data):
+    keymap_data = {
+        'keyboard': kbf_data['keyboard.settings.name'].lower(),
+        'layout': 'LAYOUT',
+        'layers': [],
+    }
+
+    for i in range(15):
+        layer = []
+        for key in kbf_data['keyboard.keys']:
+            keycode = key['keycodes'][i]['id']
+            keycode = LEGACY_KEYCODES.get(keycode, keycode)
+            if '()' in keycode:
+                fields = key['keycodes'][i]['fields']
+                keycode = f'{keycode.split(")")[0]}{",".join(map(str, fields))})'
+            layer.append(keycode)
+        if set(layer) == {'KC_TRNS'}:
+            break
+        keymap_data['layers'].append(layer)
+
+    return keymap_data
 
 
 def import_keymap(keymap_data):
@@ -40,7 +96,7 @@ def import_keymap(keymap_data):
     return (kb_name, km_name)
 
 
-def import_keyboard(info_data):
+def import_keyboard(info_data, keymap_data=None):
     # Validate to ensure we don't have to deal with bad data - handles stdin/file
     validate(info_data, 'qmk.api.keyboard.v1')
 
@@ -55,17 +111,36 @@ def import_keyboard(info_data):
     if kb_folder.exists():
         raise ValueError(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} already exists! Please choose a different name.')
 
+    if not keymap_data:
+        # TODO: if supports community then grab that instead
+        keymap_data = _gen_dummy_keymap(kb_name, info_data)
+
     keyboard_info = kb_folder / 'info.json'
-    keyboard_rules = kb_folder / 'rules.mk'
     keyboard_keymap = kb_folder / 'keymaps' / 'default' / 'keymap.json'
 
-    # This is the deepest folder in the expected tree
+    # begin with making the deepest folder in the tree
     keyboard_keymap.parent.mkdir(parents=True, exist_ok=True)
 
+    user_name = git_get_username()
+    if not user_name:
+        user_name = 'TODO'
+
+    tokens = {  # Comment here is to force multiline formatting
+        'YEAR': str(date.today().year),
+        'KEYBOARD': kb_name,
+        'USER_NAME': user_name,
+        'REAL_NAME': user_name,
+    }
+
     # Dump out all those lovely files
-    keyboard_info.write_text(json.dumps(info_data, cls=InfoJSONEncoder))
-    keyboard_rules.write_text("# This file intentionally left blank")
-    keyboard_keymap.write_text(_gen_dummy_keymap(kb_name, info_data))
+    for file in list(TEMPLATE.iterdir()):
+        replace_placeholders(file, kb_folder / file.name, tokens)
+
+    temp = json_load(keyboard_info)
+    deep_update(temp, info_data)
+
+    keyboard_info.write_text(json.dumps(temp, cls=InfoJSONEncoder))
+    keyboard_keymap.write_text(json.dumps(keymap_data, cls=KeymapJSONEncoder))
 
     return kb_name
 
@@ -77,21 +152,12 @@ def import_kbfirmware(kbfirmware_data):
     mcu = ["atmega32u2", "atmega32u4", "at90usb1286"][kbf_data['keyboard.controller']]
     bootloader = MCU2BOOTLOADER.get(mcu, "custom")
 
-    layout = []
-    for key in kbf_data['keyboard.keys']:
-        layout.append({
-            "matrix": [key["row"], key["col"]],
-            "x": key["state"]["x"],
-            "y": key["state"]["y"],
-            "w": key["state"]["w"],
-            "h": key["state"]["h"],
-        })
+    layout = _extract_kbfirmware_layout(kbf_data)
+    keymap_data = _extract_kbfirmware_keymap(kbf_data)
 
     # convert to d/d info.json
-    info_data = {
+    info_data = dotty({
         "keyboard_name": kbf_data['keyboard.settings.name'].lower(),
-        "manufacturer": "TODO",
-        "maintainer": "TODO",
         "processor": mcu,
         "bootloader": bootloader,
         "diode_direction": diode_direction,
@@ -99,50 +165,29 @@ def import_kbfirmware(kbfirmware_data):
             "cols": kbf_data['keyboard.pins.col'],
             "rows": kbf_data['keyboard.pins.row'],
         },
-        "usb": {
-            "vid": "0xFEED",
-            "pid": "0x0000",
-            "device_version": "0.0.1",
-        },
-        "features": {
-            "bootmagic": True,
-            "command": False,
-            "console": False,
-            "extrakey": True,
-            "mousekey": True,
-            "nkro": True,
-        },
         "layouts": {
             "LAYOUT": {
                 "layout": layout,
             }
         }
-    }
+    })
 
     if kbf_data['keyboard.pins.num'] or kbf_data['keyboard.pins.caps'] or kbf_data['keyboard.pins.scroll']:
-        indicators = {}
         if kbf_data['keyboard.pins.num']:
-            indicators['num_lock'] = kbf_data['keyboard.pins.num']
+            info_data['indicators.num_lock'] = kbf_data['keyboard.pins.num']
         if kbf_data['keyboard.pins.caps']:
-            indicators['caps_lock'] = kbf_data['keyboard.pins.caps']
+            info_data['indicators.caps_lock'] = kbf_data['keyboard.pins.caps']
         if kbf_data['keyboard.pins.scroll']:
-            indicators['scroll_lock'] = kbf_data['keyboard.pins.scroll']
-        info_data['indicators'] = indicators
+            info_data['indicators.scroll_lock'] = kbf_data['keyboard.pins.scroll']
 
     if kbf_data['keyboard.pins.rgb']:
-        info_data['rgblight'] = {
-            'animations': {
-                'all': True
-            },
-            'led_count': kbf_data['keyboard.settings.rgbNum'],
-            'pin': kbf_data['keyboard.pins.rgb'],
-        }
+        info_data['rgblight.animations.all'] = True
+        info_data['rgblight.led_count'] = kbf_data['keyboard.settings.rgbNum']
+        info_data['rgblight.pin'] = kbf_data['keyboard.pins.rgb']
 
     if kbf_data['keyboard.pins.led']:
-        info_data['backlight'] = {
-            'levels': kbf_data['keyboard.settings.backlightLevels'],
-            'pin': kbf_data['keyboard.pins.led'],
-        }
+        info_data['backlight.levels'] = kbf_data['keyboard.settings.backlightLevels']
+        info_data['backlight.pin'] = kbf_data['keyboard.pins.led']
 
     # delegate as if it were a regular keyboard import
-    return import_keyboard(info_data)
+    return import_keyboard(info_data.to_dict(), keymap_data)

From 4eeafbebabfac04eada98f75dedbecdbbd16298c Mon Sep 17 00:00:00 2001
From: Jay Greco <jayv.greco@gmail.com>
Date: Sat, 13 Aug 2022 06:48:30 -0700
Subject: [PATCH 184/959] Add Bit-C PRO converter (#17827)

---
 data/mappings/defaults.json                   |  6 +++
 data/schemas/keyboard.jsonschema              |  2 +-
 docs/feature_converters.md                    |  5 ++-
 .../promicro_to_bit_c_pro/_pin_defs.h         | 39 +++++++++++++++++++
 .../promicro_to_bit_c_pro/converter.mk        | 12 ++++++
 5 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h
 create mode 100644 platforms/chibios/converters/promicro_to_bit_c_pro/converter.mk

diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json
index b62e5450b3..5e25405c37 100644
--- a/data/mappings/defaults.json
+++ b/data/mappings/defaults.json
@@ -34,6 +34,12 @@
             "board": "QMK_PM2040",
             "pin_compatible": "promicro"
         },
+        "bit_c_pro": {
+            "processor": "RP2040",
+            "bootloader": "rp2040",
+            "board": "QMK_PM2040",
+            "pin_compatible": "promicro"
+        },
         "bluepill": {
             "processor": "STM32F103",
             "bootloader": "stm32duino",
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 14f84c5595..c55d66e6bb 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -34,7 +34,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bluepill", "blackpill_f401", "blackpill_f411"]
+            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "bluepill", "blackpill_f401", "blackpill_f411"]
         },
         "pin_compatible": {
             "type": "string",
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 11dcc62b2a..569cf0f17d 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -14,6 +14,7 @@ Currently the following converters are available:
 | `promicro` | `kb2040`          |
 | `promicro` | `promicro_rp2040` |
 | `promicro` | `blok`            |
+| `promicro` | `bit_c_pro`       |
 
 See below for more in depth information on each converter.
 
@@ -54,6 +55,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co
 | [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040)          | `kb2040`          |
 | [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) | `promicro_rp2040` |
 | [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)         | `blok`            |
+| [Bit-C PRO](https://nullbits.co/bit-c-pro)                             | `bit_c_pro`       |
 
 Converter summary:
 
@@ -63,6 +65,7 @@ Converter summary:
 | `kb2040`          | `-e CONVERT_TO=kb2040`          | `CONVERT_TO=kb2040`          | `#ifdef CONVERT_TO_KB2040`          |
 | `promicro_rp2040` | `-e CONVERT_TO=promicro_rp2040` | `CONVERT_TO=promicro_rp2040` | `#ifdef CONVERT_TO_PROMICRO_RP2040` |
 | `blok`            | `-e CONVERT_TO=blok`            | `CONVERT_TO=blok`            | `#ifdef CONVERT_TO_BLOK`            |
+| `bit_c_pro`       | `-e CONVERT_TO=bit_c_pro`       | `CONVERT_TO=bit_c_pro`       | `#ifdef CONVERT_TO_BIT_C_PRO`       |
 
 ### Proton C :id=proton_c
 
@@ -93,6 +96,6 @@ The following defaults are based on what has been implemented for [RP2040](platf
 | USB Host (e.g. USB-USB converter)            | Not supported (USB host code is AVR specific and is not currently supported on ARM)                              |
 | [Split keyboards](feature_split_keyboard.md) | Partial via `PIO` vendor driver - heavily dependent on enabled features                                          |
 
-### SparkFun Pro Micro - RP2040 and Blok :id=promicro_rp2040 
+### SparkFun Pro Micro - RP2040, Blok, and Bit-C PRO :id=promicro_rp2040 
 
 Currently identical to  [Adafruit KB2040](#kb2040).
diff --git a/platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h b/platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h
new file mode 100644
index 0000000000..92e8fbfa1a
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h
@@ -0,0 +1,39 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 0U
+#define D2 1U
+//      GND
+//      GND
+#define D1 2U
+#define D0 3U
+#define D4 4U
+#define C6 5U
+#define D7 6U
+#define E6 7U
+#define B4 8U
+#define B5 9U
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 29U
+#define F5 28U
+#define F6 27U
+#define F7 26U
+#define B1 22U
+#define B3 20U
+#define B2 23U
+#define B6 21U
+
+// LEDs (Mapped to R and G channel of the Bit-C PRO's RGB led)
+#define D5 16U
+#define B0 17U
+
+// Bit-C LED (mapped to B channel of the Bit-C PRO's RGB led)
+#define F0 18U
diff --git a/platforms/chibios/converters/promicro_to_bit_c_pro/converter.mk b/platforms/chibios/converters/promicro_to_bit_c_pro/converter.mk
new file mode 100644
index 0000000000..c0eaee8593
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_bit_c_pro/converter.mk
@@ -0,0 +1,12 @@
+# nullbits Bit-C PRO MCU settings for converting AVR projects
+MCU := RP2040
+BOARD := QMK_PM2040
+BOOTLOADER := rp2040
+
+# These are defaults based on what has been implemented for RP2040 boards
+SERIAL_DRIVER ?= vendor
+WS2812_DRIVER ?= vendor
+BACKLIGHT_DRIVER ?= software
+
+# Tell QMK to use the correct 2nd stage bootloader
+OPT_DEFS += -DRP2040_FLASH_W25X10CL

From 6a0d90f81a9b9938591b32f9321530e68e5cea0b Mon Sep 17 00:00:00 2001
From: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
Date: Sat, 13 Aug 2022 06:48:51 -0700
Subject: [PATCH 185/959] Fix Caps Word capitalization when used with Combos +
 Auto Shift. (#17549)

---
 quantum/process_keycode/process_auto_shift.c  |   7 +-
 quantum/process_keycode/process_caps_word.c   |   4 +
 quantum/process_keycode/process_combo.c       |   9 +
 .../test_caps_word_autoshift.cpp              |  64 ++++--
 tests/caps_word/caps_word_combo/config.h      |  20 ++
 tests/caps_word/caps_word_combo/test.mk       |  19 ++
 .../caps_word_combo/test_caps_word_combo.cpp  | 212 ++++++++++++++++++
 tests/test_common/test_fixture.cpp            |  16 ++
 tests/test_common/test_fixture.hpp            |   7 +
 9 files changed, 343 insertions(+), 15 deletions(-)
 create mode 100644 tests/caps_word/caps_word_combo/config.h
 create mode 100644 tests/caps_word/caps_word_combo/test.mk
 create mode 100644 tests/caps_word/caps_word_combo/test_caps_word_combo.cpp

diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index 8cb45bc0ae..3ff188ba7e 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -123,7 +123,12 @@ bool get_autoshift_shift_state(uint16_t keycode) {
 /** \brief Restores the shift key if it was cancelled by Auto Shift */
 static void autoshift_flush_shift(void) {
     autoshift_flags.holding_shift = false;
-    del_weak_mods(MOD_BIT(KC_LSFT));
+#    ifdef CAPS_WORD_ENABLE
+    if (!is_caps_word_on())
+#    endif // CAPS_WORD_ENABLE
+    {
+        del_weak_mods(MOD_BIT(KC_LSFT));
+    }
     if (autoshift_flags.cancelling_lshift) {
         autoshift_flags.cancelling_lshift = false;
         add_mods(MOD_BIT(KC_LSFT));
diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index ffd509a914..bc4369846c 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -131,7 +131,11 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
 #endif // SWAP_HANDS_ENABLE
         }
 
+#ifdef AUTO_SHIFT_ENABLE
+        del_weak_mods(get_autoshift_state() ? ~MOD_BIT(KC_LSFT) : 0xff);
+#else
         clear_weak_mods();
+#endif // AUTO_SHIFT_ENABLE
         if (caps_word_press_user(keycode)) {
             send_keyboard_report();
             return true;
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index d5a649adb3..e5135e5a64 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -227,7 +227,16 @@ static inline void dump_key_buffer(void) {
 #endif
         }
         record->event.time = 0;
+
+#if defined(CAPS_WORD_ENABLE) && defined(AUTO_SHIFT_ENABLE)
+        // Edge case: preserve the weak Left Shift mod if both Caps Word and
+        // Auto Shift are on. Caps Word capitalizes by setting the weak Left
+        // Shift mod during the press event, but Auto Shift doesn't send the
+        // key until it receives the release event.
+        del_weak_mods((is_caps_word_on() && get_autoshift_state()) ? ~MOD_BIT(KC_LSFT) : 0xff);
+#else
         clear_weak_mods();
+#endif // defined(CAPS_WORD_ENABLE) && defined(AUTO_SHIFT_ENABLE)
 
 #if TAP_CODE_DELAY > 0
         // only delay once and for a non-tapping key
diff --git a/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp b/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp
index deb4d95766..ba21c527a6 100644
--- a/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp
+++ b/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp
@@ -19,6 +19,14 @@
 #include "test_fixture.hpp"
 #include "test_keymap_key.hpp"
 
+// Allow reports with no keys or only KC_LSFT.
+// clang-format off
+#define EXPECT_EMPTY_OR_LSFT(driver)              \
+    EXPECT_CALL(driver, send_keyboard_mock(AnyOf( \
+            KeyboardReport(),                     \
+            KeyboardReport(KC_LSFT))))
+// clang-format on
+
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AnyOf;
@@ -39,13 +47,7 @@ TEST_F(CapsWord, AutoShiftKeys) {
     KeymapKey  key_spc(0, 1, 0, KC_SPC);
     set_keymap({key_a, key_spc});
 
-    // Allow any number of reports with no keys or only KC_LSFT.
-    // clang-format off
-    EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
-                KeyboardReport(),
-                KeyboardReport(KC_LSFT))))
-        .Times(AnyNumber());
-    // clang-format on
+    EXPECT_EMPTY_OR_LSFT(driver).Times(AnyNumber());
     { // Expect: "A, A, space, a".
         InSequence s;
         EXPECT_REPORT(driver, (KC_LSFT, KC_A));
@@ -65,6 +67,46 @@ TEST_F(CapsWord, AutoShiftKeys) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 }
 
+// Test Caps Word + Auto Shift where keys A and B are rolled.
+TEST_F(CapsWord, AutoShiftRolledShiftedKeys) {
+    TestDriver driver;
+    KeymapKey  key_a(0, 0, 0, KC_A);
+    KeymapKey  key_b(0, 0, 1, KC_B);
+    set_keymap({key_a, key_b});
+
+    EXPECT_EMPTY_OR_LSFT(driver).Times(AnyNumber());
+    { // Expect: "A, B, A, B".
+        InSequence s;
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_B));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_B));
+    }
+
+    caps_word_on();
+
+    key_a.press(); // Overlapping taps: A down, B down, A up, B up.
+    run_one_scan_loop();
+    key_b.press();
+    run_one_scan_loop();
+    key_a.release();
+    run_one_scan_loop();
+    key_b.release();
+    run_one_scan_loop();
+
+    key_a.press(); // Nested taps: A down, B down, B up, A up.
+    run_one_scan_loop();
+    key_b.press();
+    run_one_scan_loop();
+    key_b.release();
+    run_one_scan_loop();
+    key_a.release();
+    run_one_scan_loop();
+
+    caps_word_off();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
 // Tests that with tap-hold keys with Retro Shift, letter keys are shifted by
 // Caps Word regardless of whether they are retroshifted.
 TEST_F(CapsWord, RetroShiftKeys) {
@@ -73,13 +115,7 @@ TEST_F(CapsWord, RetroShiftKeys) {
     KeymapKey  key_layertap_b(0, 1, 0, LT(1, KC_B));
     set_keymap({key_modtap_a, key_layertap_b});
 
-    // Allow any number of reports with no keys or only KC_LSFT.
-    // clang-format off
-    EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
-                KeyboardReport(),
-                KeyboardReport(KC_LSFT))))
-        .Times(AnyNumber());
-    // clang-format on
+    EXPECT_EMPTY_OR_LSFT(driver).Times(AnyNumber());
     { // Expect: "B, A, B, A".
         InSequence s;
         EXPECT_REPORT(driver, (KC_LSFT, KC_B));
diff --git a/tests/caps_word/caps_word_combo/config.h b/tests/caps_word/caps_word_combo/config.h
new file mode 100644
index 0000000000..92dbe045b2
--- /dev/null
+++ b/tests/caps_word/caps_word_combo/config.h
@@ -0,0 +1,20 @@
+// Copyright 2022 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#include "test_common.h"
+
+#define TAPPING_TERM 200
diff --git a/tests/caps_word/caps_word_combo/test.mk b/tests/caps_word/caps_word_combo/test.mk
new file mode 100644
index 0000000000..9f2e157189
--- /dev/null
+++ b/tests/caps_word/caps_word_combo/test.mk
@@ -0,0 +1,19 @@
+# Copyright 2022 Google LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+CAPS_WORD_ENABLE = yes
+COMBO_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
+
diff --git a/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp b/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp
new file mode 100644
index 0000000000..3a0530b854
--- /dev/null
+++ b/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp
@@ -0,0 +1,212 @@
+// Copyright 2022 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Test Caps Word + Combos, with and without Auto Shift.
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "test_fixture.hpp"
+#include "test_keymap_key.hpp"
+
+// Allow reports with no keys or only KC_LSFT.
+// clang-format off
+#define EXPECT_EMPTY_OR_LSFT(driver)              \
+    EXPECT_CALL(driver, send_keyboard_mock(AnyOf( \
+            KeyboardReport(),                     \
+            KeyboardReport(KC_LSFT))))
+// clang-format on
+
+using ::testing::AnyNumber;
+using ::testing::AnyOf;
+using ::testing::InSequence;
+using ::testing::TestParamInfo;
+
+extern "C" {
+// Define some combos to use for the test, including overlapping combos and
+// combos that chord tap-hold keys.
+enum combo_events { AB_COMBO, BC_COMBO, AD_COMBO, DE_COMBO, FGHI_COMBO, COMBO_LENGTH };
+uint16_t COMBO_LEN = COMBO_LENGTH;
+
+const uint16_t ab_combo[] PROGMEM   = {KC_A, KC_B, COMBO_END};
+const uint16_t bc_combo[] PROGMEM   = {KC_B, KC_C, COMBO_END};
+const uint16_t ad_combo[] PROGMEM   = {KC_A, LCTL_T(KC_D), COMBO_END};
+const uint16_t de_combo[] PROGMEM   = {LCTL_T(KC_D), LT(1, KC_E), COMBO_END};
+const uint16_t fghi_combo[] PROGMEM = {KC_F, KC_G, KC_H, KC_I, COMBO_END};
+
+// clang-format off
+combo_t key_combos[] = {
+    [AB_COMBO] = COMBO(ab_combo, KC_SPC),  // KC_A + KC_B = KC_SPC
+    [BC_COMBO] = COMBO(bc_combo, KC_X),    // KC_B + KC_C = KC_X
+    [AD_COMBO] = COMBO(ad_combo, KC_Y),    // KC_A + LCTL_T(KC_D) = KC_Y
+    [DE_COMBO] = COMBO(de_combo, KC_Z),    // LCTL_T(KC_D) + LT(1, KC_E) = KC_Z
+    [FGHI_COMBO] = COMBO(fghi_combo, KC_W) // KC_F + KC_G + KC_H + KC_I = KC_W
+};
+// clang-format on
+} // extern "C"
+
+namespace {
+
+// To test combos thorougly, we test them with pressing the chord keys with
+// a few different orders and timings.
+struct TestParams {
+    std::string name;
+    bool        autoshift_on;
+
+    static const std::string& GetName(const TestParamInfo<TestParams>& info) {
+        return info.param.name;
+    }
+};
+
+class CapsWord : public ::testing::WithParamInterface<TestParams>, public TestFixture {
+   public:
+    void SetUp() override {
+        caps_word_off();
+        if (GetParam().autoshift_on) {
+            autoshift_enable();
+        } else {
+            autoshift_disable();
+        }
+    }
+};
+
+// Test pressing the keys in a combo with different orders and timings.
+TEST_P(CapsWord, SingleCombo) {
+    TestDriver driver;
+    KeymapKey  key_b(0, 0, 1, KC_B);
+    KeymapKey  key_c(0, 0, 2, KC_C);
+    set_keymap({key_b, key_c});
+
+    EXPECT_EMPTY_OR_LSFT(driver).Times(AnyNumber());
+    EXPECT_REPORT(driver, (KC_LSFT, KC_X));
+
+    caps_word_on();
+    tap_combo({key_b, key_c});
+
+    EXPECT_TRUE(is_caps_word_on());
+    caps_word_off();
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test a longer 4-key combo.
+TEST_P(CapsWord, LongerCombo) {
+    TestDriver driver;
+    KeymapKey  key_f(0, 0, 0, KC_F);
+    KeymapKey  key_g(0, 0, 1, KC_G);
+    KeymapKey  key_h(0, 0, 2, KC_H);
+    KeymapKey  key_i(0, 0, 3, KC_I);
+    set_keymap({key_f, key_g, key_h, key_i});
+
+    EXPECT_EMPTY_OR_LSFT(driver).Times(AnyNumber());
+    EXPECT_REPORT(driver, (KC_LSFT, KC_W));
+
+    caps_word_on();
+    tap_combo({key_f, key_g, key_h, key_i});
+
+    EXPECT_TRUE(is_caps_word_on());
+    caps_word_off();
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test with two overlapping combos on regular keys:
+// KC_A + KC_B = KC_SPC,
+// KC_B + KC_C = KC_X.
+TEST_P(CapsWord, ComboRegularKeys) {
+    TestDriver driver;
+    KeymapKey  key_a(0, 0, 0, KC_A);
+    KeymapKey  key_b(0, 0, 1, KC_B);
+    KeymapKey  key_c(0, 0, 2, KC_C);
+    KeymapKey  key_1(0, 0, 3, KC_1);
+    set_keymap({key_a, key_b, key_c, key_1});
+
+    EXPECT_EMPTY_OR_LSFT(driver).Times(AnyNumber());
+    { // Expect: "A, B, 1, X, 1, C, space, a".
+        InSequence s;
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_B));
+        EXPECT_REPORT(driver, (KC_1));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_X));
+        EXPECT_REPORT(driver, (KC_1));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_C));
+        EXPECT_REPORT(driver, (KC_SPC));
+        EXPECT_REPORT(driver, (KC_A));
+    }
+
+    caps_word_on();
+    tap_key(key_a);
+    tap_key(key_b);
+    tap_key(key_1);
+    tap_combo({key_b, key_c}); // BC combo types "x".
+    tap_key(key_1);
+    tap_key(key_c);
+    tap_combo({key_a, key_b}); // AB combo types space.
+    tap_key(key_a);
+
+    EXPECT_FALSE(is_caps_word_on());
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test where combo chords involve tap-hold keys:
+// KC_A + LCTL_T(KC_D) = KC_Y,
+// LCTL_T(KC_D) + LT(1, KC_E) = KC_Z,
+TEST_P(CapsWord, ComboModTapKey) {
+    TestDriver driver;
+    KeymapKey  key_a(0, 0, 0, KC_A);
+    KeymapKey  key_modtap_d(0, 0, 1, LCTL_T(KC_D));
+    KeymapKey  key_layertap_e(0, 0, 2, LT(1, KC_E));
+    set_keymap({key_a, key_modtap_d, key_layertap_e});
+
+    EXPECT_EMPTY_OR_LSFT(driver).Times(AnyNumber());
+    { // Expect: "A, D, E, Y, Z".
+        InSequence s;
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_D));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_E));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_Y));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_Z));
+    }
+
+    caps_word_on();
+    tap_key(key_a);
+    tap_key(key_modtap_d);
+    tap_key(key_layertap_e);
+    tap_combo({key_a, key_modtap_d});          // AD combo types "y".
+    tap_combo({key_modtap_d, key_layertap_e}); // DE combo types "z".
+
+    EXPECT_TRUE(is_caps_word_on());
+    caps_word_off();
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// clang-format off
+INSTANTIATE_TEST_CASE_P(
+    Combos,
+    CapsWord,
+    ::testing::Values(
+        TestParams{"AutoshiftDisabled", false},
+        TestParams{"AutoshiftEnabled", true}
+        ),
+    TestParams::GetName
+    );
+// clang-format on
+
+} // namespace
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 5fc6964054..44694cd390 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -108,6 +108,22 @@ void TestFixture::tap_key(KeymapKey key, unsigned delay_ms) {
     run_one_scan_loop();
 }
 
+void TestFixture::tap_combo(const std::vector<KeymapKey>& chord_keys, unsigned delay_ms) {
+    for (KeymapKey key : chord_keys) { // Press each key.
+        key.press();
+        run_one_scan_loop();
+    }
+
+    if (delay_ms > 1) {
+        idle_for(delay_ms - 1);
+    }
+
+    for (KeymapKey key : chord_keys) { // Release each key.
+        key.release();
+        run_one_scan_loop();
+    }
+}
+
 void TestFixture::set_keymap(std::initializer_list<KeymapKey> keys) {
     this->keymap.clear();
     for (auto& key : keys) {
diff --git a/tests/test_common/test_fixture.hpp b/tests/test_common/test_fixture.hpp
index 81906f76c7..2590acd006 100644
--- a/tests/test_common/test_fixture.hpp
+++ b/tests/test_common/test_fixture.hpp
@@ -53,6 +53,13 @@ class TestFixture : public testing::Test {
         }
     }
 
+    /**
+     * @brief Taps a combo with `delay_ms` delay between press and release.
+     *
+     * Example: `tap_combo({key_a, key_b})` to tap the chord A + B.
+     */
+    void tap_combo(const std::vector<KeymapKey>& chord_keys, unsigned delay_ms = 1);
+
     void run_one_scan_loop();
     void idle_for(unsigned ms);
 

From 69fa2d83781104fafd3992c1cece2ee98e862a69 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sat, 13 Aug 2022 21:57:07 +0800
Subject: [PATCH 186/959] [Core] Re-order user space rules inclusion (#17459)

---
 builddefs/build_keyboard.mk | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index fe95dcaf15..5840378d9c 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -118,6 +118,15 @@ MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
+# Userspace setup and definitions
+ifeq ("$(USER_NAME)","")
+    USER_NAME := $(KEYMAP)
+endif
+USER_PATH := users/$(USER_NAME)
+
+# Pull in user level rules.mk
+-include $(USER_PATH)/rules.mk
+
 # Check for keymap.json first, so we can regenerate keymap.c
 include $(BUILDDEFS_PATH)/build_json.mk
 
@@ -356,14 +365,7 @@ generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/def
 
 .INTERMEDIATE : generated-files
 
-# Userspace setup and definitions
-ifeq ("$(USER_NAME)","")
-    USER_NAME := $(KEYMAP)
-endif
-USER_PATH := users/$(USER_NAME)
-
-# Pull in user level rules.mk
--include $(USER_PATH)/rules.mk
+# Include user level config
 ifneq ("$(wildcard $(USER_PATH)/config.h)","")
     CONFIG_H += $(USER_PATH)/config.h
 endif

From 52dc16b75819a735b4939496c850ae7df9ce96b0 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Sun, 14 Aug 2022 00:00:42 +1000
Subject: [PATCH 187/959] [Keyboard] IDOBAO ID80v1 folder rename (#17265)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../id80/v1/ansi/keymaps/default/readme.md    |  1 -
 keyboards/idobao/id80/v1/ansi/readme.md       |  1 -
 .../id80/v1/iso/keymaps/default/readme.md     |  1 -
 keyboards/idobao/id80/v1/iso/readme.md        |  1 -
 keyboards/idobao/id80/v1/readme.md            | 30 +++++++-------
 keyboards/idobao/id80/v1/rules.mk             | 24 +----------
 .../idobao/id80/{v1 => v2}/ansi/config.h      |  0
 .../{v1 => v2}/ansi/keymaps/default/keymap.c  |  6 +--
 .../id80/{v1 => v2}/ansi/keymaps/msf/config.h |  0
 .../id80/{v1 => v2}/ansi/keymaps/msf/keymap.c |  8 ++--
 .../{v1 => v2}/ansi/keymaps/msf/readme.md     |  0
 .../id80/{v1 => v2}/ansi/keymaps/msf/rules.mk |  0
 .../{v1 => v2}/ansi/keymaps/rverst/keymap.c   | 14 +++----
 .../{v1 => v2}/ansi/keymaps/rverst/readme.md  |  4 +-
 .../ansi/keymaps/rverst/rverst.json           |  4 +-
 .../id80/{v1 => v2}/ansi/keymaps/via/keymap.c | 10 ++---
 .../id80/{v1 => v2}/ansi/keymaps/via/rules.mk |  0
 .../idobao/id80/{v1 => v2}/ansi/rules.mk      |  0
 keyboards/idobao/id80/{v1 => v2}/config.h     | 10 +++--
 keyboards/idobao/id80/{v1 => v2}/info.json    |  6 +--
 keyboards/idobao/id80/{v1 => v2}/iso/config.h |  0
 .../{v1 => v2}/iso/keymaps/default/keymap.c   |  2 +-
 .../id80/{v1 => v2}/iso/keymaps/via/keymap.c  |  2 +-
 .../id80/{v1 => v2}/iso/keymaps/via/rules.mk  |  0
 keyboards/idobao/id80/{v1 => v2}/iso/rules.mk |  0
 keyboards/idobao/id80/v2/readme.md            | 41 +++++++++++++++++++
 keyboards/idobao/id80/v2/rules.mk             | 19 +++++++++
 keyboards/idobao/id80/{v1/v1.c => v2/v2.c}    |  3 +-
 keyboards/idobao/id80/{v1/v1.h => v2/v2.h}    |  3 +-
 29 files changed, 114 insertions(+), 76 deletions(-)
 delete mode 100644 keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md
 delete mode 100644 keyboards/idobao/id80/v1/ansi/readme.md
 delete mode 100644 keyboards/idobao/id80/v1/iso/keymaps/default/readme.md
 delete mode 100644 keyboards/idobao/id80/v1/iso/readme.md
 rename keyboards/idobao/id80/{v1 => v2}/ansi/config.h (100%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/default/keymap.c (92%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/msf/config.h (100%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/msf/keymap.c (96%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/msf/readme.md (100%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/msf/rules.mk (100%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/rverst/keymap.c (97%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/rverst/readme.md (93%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/rverst/rverst.json (99%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/via/keymap.c (94%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/keymaps/via/rules.mk (100%)
 rename keyboards/idobao/id80/{v1 => v2}/ansi/rules.mk (100%)
 rename keyboards/idobao/id80/{v1 => v2}/config.h (94%)
 rename keyboards/idobao/id80/{v1 => v2}/info.json (98%)
 rename keyboards/idobao/id80/{v1 => v2}/iso/config.h (100%)
 rename keyboards/idobao/id80/{v1 => v2}/iso/keymaps/default/keymap.c (94%)
 rename keyboards/idobao/id80/{v1 => v2}/iso/keymaps/via/keymap.c (96%)
 rename keyboards/idobao/id80/{v1 => v2}/iso/keymaps/via/rules.mk (100%)
 rename keyboards/idobao/id80/{v1 => v2}/iso/rules.mk (100%)
 create mode 100644 keyboards/idobao/id80/v2/readme.md
 create mode 100644 keyboards/idobao/id80/v2/rules.mk
 rename keyboards/idobao/id80/{v1/v1.c => v2/v2.c} (97%)
 rename keyboards/idobao/id80/{v1/v1.h => v2/v2.h} (99%)

diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md
deleted file mode 100644
index 8ae9f656cd..0000000000
--- a/keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for id80
diff --git a/keyboards/idobao/id80/v1/ansi/readme.md b/keyboards/idobao/id80/v1/ansi/readme.md
deleted file mode 100644
index 1bfae43735..0000000000
--- a/keyboards/idobao/id80/v1/ansi/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The ANSI variant of the id80
diff --git a/keyboards/idobao/id80/v1/iso/keymaps/default/readme.md b/keyboards/idobao/id80/v1/iso/keymaps/default/readme.md
deleted file mode 100644
index 8ae9f656cd..0000000000
--- a/keyboards/idobao/id80/v1/iso/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for id80
diff --git a/keyboards/idobao/id80/v1/iso/readme.md b/keyboards/idobao/id80/v1/iso/readme.md
deleted file mode 100644
index 3e0d8ce231..0000000000
--- a/keyboards/idobao/id80/v1/iso/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The ISO variant of the id80
diff --git a/keyboards/idobao/id80/v1/readme.md b/keyboards/idobao/id80/v1/readme.md
index 8a26378b3b..9be4dffeae 100644
--- a/keyboards/idobao/id80/v1/readme.md
+++ b/keyboards/idobao/id80/v1/readme.md
@@ -1,27 +1,27 @@
 # IDOBAO ID80
 
-![ID80](https://ae01.alicdn.com/kf/H0f617c6129c24cfaa26a8c9e8e54851aj.jpg)
+![ID80](https://i.imgur.com/977ENjph.png)
 
 A 75% hotswap keyboard from IDOBAO.
 
-## ANSI support:
-
 * Keyboard Maintainer: [Sergey Vlasov](https://github.com/sigprof)
 * Hardware Supported: IDOBAO ID80
-* Hardware Availability: [AliExpress](https://www.aliexpress.com/item/4000590804514.html), [Drop](https://drop.com/buy/idobao-id80-75-hot-swappable-mechanical-keyboard-kit?mode=guest_open)
+* Hardware Availability: [Drop](https://drop.com/buy/idobao-id80-75-hot-swappable-mechanical-keyboard-kit?mode=guest_open)
+
+---
+> &#x26a0; **Please note:** The source folder for this keyboard has moved to `../v2`.
+---
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id80/v1/ansi:default
+    make idobao/id80/v2:default BACKLIGHT_ENABLE=no
     
-## ISO support:
-
-* Keyboard Maintainer: [Carsten Rose](https://github.com/cwr10010)
-* Hardware Supported: IDOBAO ID80v2
-* Hardware Availability: [IDOBAO](https://www.idobao.net/products/idobao-id80v2-75-hot-swappable-mechanical-keyboard-kit)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make idobao/id80/v1/iso:default
-
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+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 `RESET` if it is available
diff --git a/keyboards/idobao/id80/v1/rules.mk b/keyboards/idobao/id80/v1/rules.mk
index 0baebd07fc..20283f04be 100644
--- a/keyboards/idobao/id80/v1/rules.mk
+++ b/keyboards/idobao/id80/v1/rules.mk
@@ -1,24 +1,2 @@
 # Defalt to the ansi version
-DEFAULT_FOLDER = idobao/id80/v1/ansi
-
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes        # Audio control and System control
-CONSOLE_ENABLE = no          # Console for debug
-COMMAND_ENABLE = no          # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no            # Audio output
-
-# partially generated by KBFirmware JSON to QMK Parser
-# https://noroadsleft.github.io/kbf_qmk_converter/
+DEFAULT_FOLDER = idobao/id80/v2/ansi
diff --git a/keyboards/idobao/id80/v1/ansi/config.h b/keyboards/idobao/id80/v2/ansi/config.h
similarity index 100%
rename from keyboards/idobao/id80/v1/ansi/config.h
rename to keyboards/idobao/id80/v2/ansi/config.h
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/default/keymap.c
similarity index 92%
rename from keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c
rename to keyboards/idobao/id80/v2/ansi/keymaps/default/keymap.c
index ac2fb15b83..b09718dda0 100644
--- a/keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_ansi(
         KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_HOME,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-        QK_BOOT,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+    [1] = LAYOUT_ansi(
+        QK_BOOT,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h
similarity index 100%
rename from keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h
rename to keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
similarity index 96%
rename from keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c
rename to keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
index 6bb91f0f19..bc31cfb0b8 100644
--- a/keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [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,
@@ -24,15 +24,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-        RESET,     KC_CALC, _______, _______, _______,    KC_MUTE, KC_F6, KC_F7, KC_MPLY,      KC_MSTP, KC_BRID, KC_BRIU, KC_F11,     KC_F12,    _______,
+    [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_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
         _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_ansi(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md b/keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md
similarity index 100%
rename from keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md
rename to keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk b/keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk
rename to keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c
similarity index 97%
rename from keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c
rename to keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c
index 3656f48dfe..1e751e751d 100644
--- a/keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(
+	[0] = LAYOUT_ansi(
         KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , MO(4)  , KC_DEL ,
         KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_PGUP,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP,
         KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC ,                            OSL(1) , KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
-	[1] = LAYOUT(
+	[1] = LAYOUT_ansi(
         RV_SNAP, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_TRNS, KC_MUTE,
         RV_DEG , RV_SUP1, RV_SUP2, RV_SUP3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RV_UNEQ, RV_PM  , KC_TRNS, KC_VOLU,
         KC_TRNS, KC_TRNS, KC_TRNS, RV_EUR , RV_RT  , RV_TM  , KC_TRNS, RV_UUML, KC_TRNS, RV_OUML, KC_TRNS, RV_VDEC, RV_VINC, RV_SEQU, KC_VOLD,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, RV_CC  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RV_SDEC, KC_TRNS,          KC_MSTP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_RGUI,          KC_MPRV, KC_MPLY, KC_MNXT
     ),
-	[2] = LAYOUT(
+	[2] = LAYOUT_ansi(
         KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_TRNS, MO(4)  , 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_VOLU,
         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_VOLD,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP,
         KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC ,                            OSL(3) , KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
-	[3] = LAYOUT(
+	[3] = LAYOUT_ansi(
         RV_SNAP, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_TRNS, KC_MUTE,
         RV_DEG , RV_SUP1, RV_SUP2, RV_SUP3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RV_UNEQ, RV_PM  , KC_TRNS, KC_VOLU,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RV_LOCK, RV_UUML, KC_TRNS, KC_TRNS, RV_VDEC, RV_VINC, RV_SEQU, KC_VOLD,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, RV_CC  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RV_SDEC, KC_TRNS,          KC_MSTP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_RGUI,          KC_MPRV, KC_MPLY, KC_MNXT
     ),
-	[4] = LAYOUT(
+	[4] = LAYOUT_ansi(
         DEBUG  , RV_SM0 , RV_SM1 , RV_SM2 , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , DF(0)  , DF(2)  , KC_TRNS, MO(5)  ,
         RV_SAYM, RV_SM3 , RV_SM4 , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
         KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
@@ -60,8 +60,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,          RGB_TOG,
         KC_NO  , KC_NO  , GUI_ON ,                   KC_NO  ,                            KC_NO  , RCG_SWP,          RGB_RMOD,RGB_M_P, RGB_MOD
     ),
-	[5] = LAYOUT(
-        RESET  , RV_SM0S, RV_SM1S, RV_SM2S, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_TRNS,
+	[5] = LAYOUT_ansi(
+        QK_BOOT, RV_SM0S, RV_SM1S, RV_SM2S, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_TRNS,
         KC_NO  , RV_SM3S, RV_SM4S, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
         KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
         KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/readme.md
similarity index 93%
rename from keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md
rename to keyboards/idobao/id80/v2/ansi/keymaps/rverst/readme.md
index ba33980edb..66dd2b5287 100644
--- a/keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/readme.md
@@ -1,6 +1,6 @@
-# idobao id80
+# IDOBAO ID80
 
-This is my layout for the idobao id80. It depends of my [user files](../../../../users/rverst)
+This is my layout for the IDOBAO ID80. It depends of my [user files](../../../../users/rverst)
 and the main goal is to give an convenient and unified access to some special keys
 (umlauts, ß, €) for different operating systems (Mac, Windows and Linux).
 
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
similarity index 99%
rename from keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json
rename to keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
index 50235498fe..d0aab9b747 100644
--- a/keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
@@ -1,7 +1,7 @@
 {
-  "keyboard": "id80",
+  "keyboard": "ID80",
   "keymap": "rverst",
-  "layout": "LAYOUT",
+  "layout": "LAYOUT_ansi",
   "layers": [
     [
       "KC_ESC",
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/via/keymap.c
similarity index 94%
rename from keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c
rename to keyboards/idobao/id80/v2/ansi/keymaps/via/keymap.c
index 669eb702d8..4fc88dc592 100644
--- a/keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_ansi(
         KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_HOME,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,
@@ -24,15 +24,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-        QK_BOOT,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+    [1] = LAYOUT_ansi(
+        QK_BOOT,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
         _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_ansi(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_ansi(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
diff --git a/keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk b/keyboards/idobao/id80/v2/ansi/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v2/ansi/keymaps/via/rules.mk
diff --git a/keyboards/idobao/id80/v1/ansi/rules.mk b/keyboards/idobao/id80/v2/ansi/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/v1/ansi/rules.mk
rename to keyboards/idobao/id80/v2/ansi/rules.mk
diff --git a/keyboards/idobao/id80/v1/config.h b/keyboards/idobao/id80/v2/config.h
similarity index 94%
rename from keyboards/idobao/id80/v1/config.h
rename to keyboards/idobao/id80/v2/config.h
index c6cf667382..02bc0f6809 100644
--- a/keyboards/idobao/id80/v1/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -53,9 +53,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
-#define BACKLIGHT_PIN B6
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 3
+#ifdef BACKLIGHT_ENABLE
+    #define BACKLIGHT_PIN B6
+    #define BACKLIGHT_BREATHING
+    #define BACKLIGHT_LEVELS 3
+#endif
 
 #define LED_CAPS_LOCK_PIN C7
 #define LED_PIN_ON_STATE 0
@@ -66,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*== all animations enable ==*/
     #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/idobao/id80/v1/info.json b/keyboards/idobao/id80/v2/info.json
similarity index 98%
rename from keyboards/idobao/id80/v1/info.json
rename to keyboards/idobao/id80/v2/info.json
index 072b4ca4db..03093e7b13 100644
--- a/keyboards/idobao/id80/v1/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -1,9 +1,9 @@
 {
-    "keyboard_name": "ID80",
+    "keyboard_name": "IDOBAO ID80",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "IDOBAOKB",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ansi": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
                 {"label":"F1", "x":1.25, "y":0},
diff --git a/keyboards/idobao/id80/v1/iso/config.h b/keyboards/idobao/id80/v2/iso/config.h
similarity index 100%
rename from keyboards/idobao/id80/v1/iso/config.h
rename to keyboards/idobao/id80/v2/iso/config.h
diff --git a/keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c b/keyboards/idobao/id80/v2/iso/keymaps/default/keymap.c
similarity index 94%
rename from keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c
rename to keyboards/idobao/id80/v2/iso/keymaps/default/keymap.c
index 9784ce8253..01eaa2a44f 100644
--- a/keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c
+++ b/keyboards/idobao/id80/v2/iso/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_iso(
-        QK_BOOT,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+        QK_BOOT,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,                 _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c b/keyboards/idobao/id80/v2/iso/keymaps/via/keymap.c
similarity index 96%
rename from keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c
rename to keyboards/idobao/id80/v2/iso/keymaps/via/keymap.c
index 808c4d3c89..25ff6b084d 100644
--- a/keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c
+++ b/keyboards/idobao/id80/v2/iso/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_iso(
-        QK_BOOT,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+        QK_BOOT,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,                 _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk b/keyboards/idobao/id80/v2/iso/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v2/iso/keymaps/via/rules.mk
diff --git a/keyboards/idobao/id80/v1/iso/rules.mk b/keyboards/idobao/id80/v2/iso/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/v1/iso/rules.mk
rename to keyboards/idobao/id80/v2/iso/rules.mk
diff --git a/keyboards/idobao/id80/v2/readme.md b/keyboards/idobao/id80/v2/readme.md
new file mode 100644
index 0000000000..11d9856913
--- /dev/null
+++ b/keyboards/idobao/id80/v2/readme.md
@@ -0,0 +1,41 @@
+# IDOBAO ID80
+
+![ID80](https://i.imgur.com/977ENjph.png)
+
+A 75% hotswap keyboard from IDOBAO.
+
+## ANSI support *(v1 & v2)*:
+
+* Keyboard Maintainer: [Sergey Vlasov](https://github.com/sigprof)
+* Hardware Supported:
+    * IDOBAO ID80v1
+    * IDOBAO ID80v2
+* Hardware Availability: [IDOBAO.net](https://idobao.net/search?type=product&q=ID80*), [AliExpress](https://www.aliexpress.com/store/5072109/search?origin=y&SearchText=ID80)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id80/v2/ansi:default
+
+To compile for the **v1** please use:
+
+    make idobao/id80/v2:default BACKLIGHT_ENABLE=no
+    
+## ISO support *(v2-iso)*:
+
+* Keyboard Maintainer: [Carsten Rose](https://github.com/cwr10010)
+* Hardware Supported: IDOBAO ID80v2
+* Hardware Availability: [IDOBAO](https://www.idobao.net/products/idobao-id80v2-75-hot-swappable-mechanical-keyboard-kit)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id80/v2/iso:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+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 `RESET` if it is available *(default is [Fn]+[Esc])*
diff --git a/keyboards/idobao/id80/v2/rules.mk b/keyboards/idobao/id80/v2/rules.mk
new file mode 100644
index 0000000000..3966212230
--- /dev/null
+++ b/keyboards/idobao/id80/v2/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes        # Mouse keys
+EXTRAKEY_ENABLE = yes        # Audio control and System control
+CONSOLE_ENABLE = no          # Console for debug
+COMMAND_ENABLE = no          # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = yes       # Enable underkey LED backlight
+
+DEFAULT_FOLDER = idobao/id80/v2/ansi
diff --git a/keyboards/idobao/id80/v1/v1.c b/keyboards/idobao/id80/v2/v2.c
similarity index 97%
rename from keyboards/idobao/id80/v1/v1.c
rename to keyboards/idobao/id80/v2/v2.c
index 7147b6163e..f92f5e0629 100644
--- a/keyboards/idobao/id80/v1/v1.c
+++ b/keyboards/idobao/id80/v2/v2.c
@@ -13,4 +13,5 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1.h"
+
+#include "v2.h"
diff --git a/keyboards/idobao/id80/v1/v1.h b/keyboards/idobao/id80/v2/v2.h
similarity index 99%
rename from keyboards/idobao/id80/v1/v1.h
rename to keyboards/idobao/id80/v2/v2.h
index a016e39083..d45b75853b 100644
--- a/keyboards/idobao/id80/v1/v1.h
+++ b/keyboards/idobao/id80/v2/v2.h
@@ -13,11 +13,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #pragma once
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_ansi( \
     K50,  K51, K52, K53, K54,  K55, K56, K57, K58,  KA7, KA5, KA4, KA3,   KA6,  KA2,  \
     K40, K41, K42, K43, K44, K45, K46, K47, K48, K98, K97, K95, K94, K96,       K92,  \
     K30,   K31, K32, K33, K34, K35, K36, K37, K38, K88, K87, K85, K84, K83,     K82,  \

From 96731ba88e84e0cdd8144e6009fb086a9ccce743 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 13 Aug 2022 19:24:15 +0200
Subject: [PATCH 188/959] Fix LV_CCAR and LV_NCED (#18025)

---
 quantum/keymap_extras/keymap_latvian.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/keymap_extras/keymap_latvian.h b/quantum/keymap_extras/keymap_latvian.h
index 3eaa2df274..087138cb72 100644
--- a/quantum/keymap_extras/keymap_latvian.h
+++ b/quantum/keymap_extras/keymap_latvian.h
@@ -161,8 +161,8 @@
 #define LV_ACUT ALGR(LV_QUOT) // ´ (dead)
 // Row 4
 #define LV_ZCAR ALGR(LV_Z)    // Ž
-#define LV_CCAR ALGR(LV_Z)    // Č
-#define LV_NCED ALGR(LV_Z)    // Ņ
+#define LV_CCAR ALGR(LV_C)    // Č
+#define LV_NCED ALGR(LV_N)    // Ņ
 
 /* Shift+AltGr symbols
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐

From 2f87abd4ef8ef13d13ad10b80490bc74de7a5686 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sat, 13 Aug 2022 17:13:15 -0400
Subject: [PATCH 189/959] Revert "[Core] Re-order user space rules inclusion
 (#17459)" (#18032)

---
 builddefs/build_keyboard.mk | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 5840378d9c..fe95dcaf15 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -118,15 +118,6 @@ MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
-# Userspace setup and definitions
-ifeq ("$(USER_NAME)","")
-    USER_NAME := $(KEYMAP)
-endif
-USER_PATH := users/$(USER_NAME)
-
-# Pull in user level rules.mk
--include $(USER_PATH)/rules.mk
-
 # Check for keymap.json first, so we can regenerate keymap.c
 include $(BUILDDEFS_PATH)/build_json.mk
 
@@ -365,7 +356,14 @@ generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/def
 
 .INTERMEDIATE : generated-files
 
-# Include user level config
+# Userspace setup and definitions
+ifeq ("$(USER_NAME)","")
+    USER_NAME := $(KEYMAP)
+endif
+USER_PATH := users/$(USER_NAME)
+
+# Pull in user level rules.mk
+-include $(USER_PATH)/rules.mk
 ifneq ("$(wildcard $(USER_PATH)/config.h)","")
     CONFIG_H += $(USER_PATH)/config.h
 endif

From a83afb3fcd741d0de391f21196ea79066fe88076 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Sun, 14 Aug 2022 08:04:03 +0900
Subject: [PATCH 190/959] Improve avr wait_us() (#16879)

---
 platforms/avr/_wait.h | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/platforms/avr/_wait.h b/platforms/avr/_wait.h
index 683db6ae57..c1a598a428 100644
--- a/platforms/avr/_wait.h
+++ b/platforms/avr/_wait.h
@@ -17,6 +17,26 @@
 
 #include <util/delay.h>
 
+// http://ww1.microchip.com/downloads/en/devicedoc/atmel-0856-avr-instruction-set-manual.pdf
+// page 22: Table 4-2. Arithmetic and Logic Instructions
+/*
+    for (uint16_t i = times; i > 0; i--) {
+        __builtin_avr_delay_cycles(1);
+    }
+
+    .L3:  sbiw r24,0  // loop step 1
+          brne .L4    // loop step 2
+          ret
+    .L4:  nop         // __builtin_avr_delay_cycles(1);
+          sbiw r24,1  // loop step 3
+          rjmp .L3    // loop step 4
+*/
+
+#define AVR_sbiw_clocks 2
+#define AVR_rjmp_clocks 2
+#define AVR_brne_clocks 2
+#define AVR_WAIT_LOOP_OVERHEAD (AVR_sbiw_clocks + AVR_brne_clocks + AVR_sbiw_clocks + AVR_rjmp_clocks)
+
 #define wait_ms(ms)                             \
     do {                                        \
         if (__builtin_constant_p(ms)) {         \
@@ -27,15 +47,15 @@
             }                                   \
         }                                       \
     } while (0)
-#define wait_us(us)                             \
-    do {                                        \
-        if (__builtin_constant_p(us)) {         \
-            _delay_us(us);                      \
-        } else {                                \
-            for (uint16_t i = us; i > 0; i--) { \
-                _delay_us(1);                   \
-            }                                   \
-        }                                       \
+#define wait_us(us)                                                                     \
+    do {                                                                                \
+        if (__builtin_constant_p(us)) {                                                 \
+            _delay_us(us);                                                              \
+        } else {                                                                        \
+            for (uint16_t i = us; i > 0; i--) {                                         \
+                __builtin_avr_delay_cycles((F_CPU / 1000000) - AVR_WAIT_LOOP_OVERHEAD); \
+            }                                                                           \
+        }                                                                               \
     } while (0)
 #define wait_cpuclock(n) __builtin_avr_delay_cycles(n)
 #define CPU_CLOCK F_CPU

From 2c3b447641821c12b967058be6442fcfbc6c27d1 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sun, 14 Aug 2022 02:50:32 +0200
Subject: [PATCH 191/959] Use ANSI ASCII art and fix comments for LT_COLN and
 LT_UNDS in keymap_lithuanian_qwerty.h (#18028)

---
 .../keymap_extras/keymap_lithuanian_qwerty.h  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/quantum/keymap_extras/keymap_lithuanian_qwerty.h b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
index fb0468a20a..afca2dc750 100644
--- a/quantum/keymap_extras/keymap_lithuanian_qwerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
@@ -24,10 +24,10 @@
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
  * │ ` │ Ą │ Č │ Ę │ Ė │ Į │ Š │ Ų │ Ū │ 9 │ 0 │ - │ Ž │       │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │     │ 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 │ , │ . │ / │          │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
  * │    │    │    │                        │    │    │    │    │
@@ -72,7 +72,7 @@
 #define LT_L    KC_L    // L
 #define LT_SCLN KC_SCLN // ;
 #define LT_QUOT KC_QUOT // '
-#define LT_BSLS KC_NUHS // (backslash)
+#define LT_BSLS KC_BSLS // (backslash)
 // Row 4
 #define LT_Z    KC_Z    // Z
 #define LT_X    KC_X    // X
@@ -89,10 +89,10 @@
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
  * │ ~ │   │   │   │   │   │   │   │   │ ( │ ) │ _ │   │       │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │ : │ " │ | │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │  |  │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │ : │ " │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
  * │        │   │   │   │   │   │   │   │ < │ > │ ? │          │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
  * │    │    │    │                        │    │    │    │    │
@@ -102,12 +102,12 @@
 #define LT_TILD S(LT_GRV)  // ~
 #define LT_LPRN S(LT_9)    // (
 #define LT_RPRN S(LT_0)    // )
-#define LT_UNDS S(LT_MINS) // *
+#define LT_UNDS S(LT_MINS) // _
 // Row 2
 #define LT_LCBR S(LT_LBRC) // {
 #define LT_RCBR S(LT_RBRC) // }
 // Row 3
-#define LT_COLN S(LT_SCLN) // ;
+#define LT_COLN S(LT_SCLN) // :
 #define LT_DQUO S(LT_QUOT) // "
 #define LT_PIPE S(LT_BSLS) // |
 // Row 4
@@ -120,9 +120,9 @@
  * │   │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │   │   │   │ = │       │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
  * │     │   │   │ € │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
  * │        │   │   │   │   │   │   │   │   │   │   │          │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
  * │    │    │    │                        │    │    │    │    │
@@ -146,9 +146,9 @@
  * │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │   │   │   │ + │       │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
  * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
  * │        │   │   │   │   │   │   │   │   │   │   │          │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
  * │    │    │    │                        │    │    │    │    │

From 4eda139b8373a96aa4addcff47102d4443841b5d Mon Sep 17 00:00:00 2001
From: JJ48 <maxwellnvolanski@gmail.com>
Date: Sat, 13 Aug 2022 19:55:03 -0500
Subject: [PATCH 192/959] Add Gentleman 65 SE Solderd PCB support (#16992)

---
 data/mappings/keyboard_aliases.json           |  3 +
 .../{ => jkeys_design}/gentleman65/config.h   |  4 +-
 .../gentleman65/gentleman65.c                 |  0
 .../gentleman65/gentleman65.h                 |  0
 .../{ => jkeys_design}/gentleman65/info.json  |  0
 .../gentleman65/keymaps/default/keymap.c      |  0
 .../gentleman65/keymaps/via/keymap.c          |  0
 .../gentleman65/keymaps/via/rules.mk          |  0
 .../{ => jkeys_design}/gentleman65/readme.md  |  8 +--
 .../{ => jkeys_design}/gentleman65/rules.mk   |  0
 .../jkeys_design/gentleman65_se_s/config.h    | 59 +++++++++++++++++++
 .../gentleman65_se_s/gentleman65_se_s.c       | 32 ++++++++++
 .../gentleman65_se_s/gentleman65_se_s.h       | 33 +++++++++++
 .../jkeys_design/gentleman65_se_s/info.json   | 10 ++++
 .../gentleman65_se_s/keymaps/default/keymap.c | 36 +++++++++++
 .../gentleman65_se_s/keymaps/via/keymap.c     | 53 +++++++++++++++++
 .../gentleman65_se_s/keymaps/via/rules.mk     |  2 +
 .../jkeys_design/gentleman65_se_s/readme.md   | 24 ++++++++
 .../jkeys_design/gentleman65_se_s/rules.mk    | 21 +++++++
 19 files changed, 279 insertions(+), 6 deletions(-)
 rename keyboards/{ => jkeys_design}/gentleman65/config.h (96%)
 rename keyboards/{ => jkeys_design}/gentleman65/gentleman65.c (100%)
 rename keyboards/{ => jkeys_design}/gentleman65/gentleman65.h (100%)
 rename keyboards/{ => jkeys_design}/gentleman65/info.json (100%)
 rename keyboards/{ => jkeys_design}/gentleman65/keymaps/default/keymap.c (100%)
 rename keyboards/{ => jkeys_design}/gentleman65/keymaps/via/keymap.c (100%)
 rename keyboards/{ => jkeys_design}/gentleman65/keymaps/via/rules.mk (100%)
 rename keyboards/{ => jkeys_design}/gentleman65/readme.md (86%)
 rename keyboards/{ => jkeys_design}/gentleman65/rules.mk (100%)
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/config.h
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.h
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/info.json
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/keymaps/via/rules.mk
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/readme.md
 create mode 100644 keyboards/jkeys_design/gentleman65_se_s/rules.mk

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 93be17cf81..43186fc611 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -826,6 +826,9 @@
     geminate60: {
         target: 'weirdo/geminate60'
     },
+    gentleman65: {
+        target: 'jkeys_design/gentleman65'
+    },
     georgi: {
         target: 'gboards/georgi'
     },
diff --git a/keyboards/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h
similarity index 96%
rename from keyboards/gentleman65/config.h
rename to keyboards/jkeys_design/gentleman65/config.h
index 7ebaae3e5a..eed1d351a7 100644
--- a/keyboards/gentleman65/config.h
+++ b/keyboards/jkeys_design/gentleman65/config.h
@@ -46,6 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_PAD_A { F6 }
 #define ENCODERS_PAD_B { F5 }
-#define ENCODER_RESOLUTION 3
+#define ENCODER_RESOLUTION 4
 
-#define DRIVER_LED_TOTAL 14
\ No newline at end of file
+#define DRIVER_LED_TOTAL 14
diff --git a/keyboards/gentleman65/gentleman65.c b/keyboards/jkeys_design/gentleman65/gentleman65.c
similarity index 100%
rename from keyboards/gentleman65/gentleman65.c
rename to keyboards/jkeys_design/gentleman65/gentleman65.c
diff --git a/keyboards/gentleman65/gentleman65.h b/keyboards/jkeys_design/gentleman65/gentleman65.h
similarity index 100%
rename from keyboards/gentleman65/gentleman65.h
rename to keyboards/jkeys_design/gentleman65/gentleman65.h
diff --git a/keyboards/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json
similarity index 100%
rename from keyboards/gentleman65/info.json
rename to keyboards/jkeys_design/gentleman65/info.json
diff --git a/keyboards/gentleman65/keymaps/default/keymap.c b/keyboards/jkeys_design/gentleman65/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gentleman65/keymaps/default/keymap.c
rename to keyboards/jkeys_design/gentleman65/keymaps/default/keymap.c
diff --git a/keyboards/gentleman65/keymaps/via/keymap.c b/keyboards/jkeys_design/gentleman65/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/gentleman65/keymaps/via/keymap.c
rename to keyboards/jkeys_design/gentleman65/keymaps/via/keymap.c
diff --git a/keyboards/gentleman65/keymaps/via/rules.mk b/keyboards/jkeys_design/gentleman65/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/gentleman65/keymaps/via/rules.mk
rename to keyboards/jkeys_design/gentleman65/keymaps/via/rules.mk
diff --git a/keyboards/gentleman65/readme.md b/keyboards/jkeys_design/gentleman65/readme.md
similarity index 86%
rename from keyboards/gentleman65/readme.md
rename to keyboards/jkeys_design/gentleman65/readme.md
index b2b4e017ce..2754a0cfcd 100644
--- a/keyboards/gentleman65/readme.md
+++ b/keyboards/jkeys_design/gentleman65/readme.md
@@ -6,7 +6,7 @@ The Gentleman 65 combines the sleek look of natural wood, with the fun of froste
 
 
 * Keyboard Maintainer: [Omar Afzal](https://github.com/0marA)
-* Hardware Supported: Gentleman 65 PCB for Gentleman65
+* Hardware Supported: Gentleman 65 PCB for Gentleman65 & Gentleman 65 Suited Edition hotswap PCB
 * Hardware Availability: [Jkeys.Design](https://jkeys.design/)
 
 Getting the board into bootloader mode:
@@ -15,10 +15,10 @@ To flash firmware onto this board, you'll need to bring the PCB into bootloader
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gentleman65:default
+    make jkeys_design/gentleman65:default
 
 Flashing example for this keyboard:
 
-    make gentleman65:default:flash
+    make jkeys_design/gentleman65:default:flash
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/gentleman65/rules.mk b/keyboards/jkeys_design/gentleman65/rules.mk
similarity index 100%
rename from keyboards/gentleman65/rules.mk
rename to keyboards/jkeys_design/gentleman65/rules.mk
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
new file mode 100644
index 0000000000..3cdef92f6d
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -0,0 +1,59 @@
+/*
+Copyright 2021 Omar Afzal
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x00FA
+#define PRODUCT_ID      0x2322
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    JJ48_24 & Omar Afzal
+#define PRODUCT         Gentleman 65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, B7, B2, B3, D4, D6, D7, C7, C6, B6, B5, B4 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F7
+#define RGBLED_NUM 14
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define ENCODERS_PAD_A { B0 }
+#define ENCODERS_PAD_B { B1 }
+#define ENCODER_RESOLUTION 4
+
+#define DRIVER_LED_TOTAL 14
diff --git a/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c b/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c
new file mode 100644
index 0000000000..1b6133cf2a
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c
@@ -0,0 +1,32 @@
+  
+/* Copyright 2021 Omar Afzal
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gentleman65_se_s.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code_delay(KC_AUDIO_VOL_UP, 10);
+        } else {
+            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.h b/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.h
new file mode 100644
index 0000000000..c313e41102
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Omar Afzal
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+    K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
+    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
+    K400, K401,       K403,             K406,                   K410,       K412, K413, K414, K415  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
+    { K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
+    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
+    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
+    { K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412,  K413,  K414,  K415 }  \
+}
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
new file mode 100644
index 0000000000..da2f817a92
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -0,0 +1,10 @@
+{
+    "name": "The Gentleman 65 Suited Edition", 
+    "url": "https://jkeys.design/products/gentleman-65-suited-edition", 
+    "maintainer": "OmarA", 
+    "layouts": {
+        "LAYOUT_all": {
+          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c b/keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1a7b1f7192
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Omar Afzal
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(
+		KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_BSLS, KC_END, 
+		KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP, 
+		KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN, 
+		KC_LCTL,  KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+	
+	[1] = LAYOUT_all(
+		KC_TILD,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, RGB_TOG,
+		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, RGB_MOD, 
+		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_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,          RGB_HUI, RGB_VAD, 
+		RESET,    KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
+  ),
+
+};
diff --git a/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c b/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0dce806270
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 Omar Afzal
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(
+		KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_BSLS, KC_END, 
+		KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP, 
+		KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN, 
+		KC_LCTL,  KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+	
+	[1] = LAYOUT_all(
+		KC_TILD,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, RGB_TOG, 
+		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, RGB_MOD, 
+		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_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,          RGB_HUI, RGB_VAD, 
+		RESET,    KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
+	),
+
+	[2] = LAYOUT_all(
+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, 
+		_______,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+		_______,  _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+	),
+
+	[3] = LAYOUT_all(
+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, 
+		_______,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+		_______,  _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+	),
+
+};
+
diff --git a/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/rules.mk b/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jkeys_design/gentleman65_se_s/readme.md b/keyboards/jkeys_design/gentleman65_se_s/readme.md
new file mode 100644
index 0000000000..b7c9411701
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/readme.md
@@ -0,0 +1,24 @@
+# Gentleman65
+
+![Render](https://cdn.shopify.com/s/files/1/0526/3389/5105/products/render_1080x.png?v=1633234311)
+
+The Gentleman 65 Suited Edition aims to provide high levels of customization, unique features, and end game quality all at an accessible price. The board features a burger top mount for plates and an option for plateless mounting on soldered PCBs. The rear exposed brass weight and the knob add to the board's premium and minimalistic aesthetic, while the board's sound profile is accentuated with precut tape PCB backings.
+
+
+* Keyboard Maintainer: [Omar Afzal](https://github.com/0marA)
+* Hardware Supported: Gentleman 65 SE Solderd PCB for Gentleman 65 Suited Edition
+* Hardware Availability: [Jkeys.Design](https://jkeys.design/)
+
+Getting the board into bootloader mode:
+
+To flash firmware onto this board, you'll need to bring the PCB into bootloader mode. To enter bootloader mode, press the reset button on the back of the PCB twice. The reset button is located in the bottom center near the spacebar switch footprint.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jkeys_design/gentleman65_se_s:default
+
+Flashing example for this keyboard:
+
+    make jkeys_design/gentleman65_se_s:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/jkeys_design/gentleman65_se_s/rules.mk b/keyboards/jkeys_design/gentleman65_se_s/rules.mk
new file mode 100644
index 0000000000..fceba7b48c
--- /dev/null
+++ b/keyboards/jkeys_design/gentleman65_se_s/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
+ENCODER_ENABLE = yes
\ No newline at end of file

From 6b1c7d20aadf40655585df465c4680eca5eca7ae Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Sun, 14 Aug 2022 09:09:57 +0800
Subject: [PATCH 193/959] Added ws2812_spi support for WB32 MCU (#17143)

Co-authored-by: Joy <chang.li@westberrytech.com>
---
 platforms/chibios/drivers/ws2812.c     |  2 +-
 platforms/chibios/drivers/ws2812_spi.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/drivers/ws2812.c b/platforms/chibios/drivers/ws2812.c
index 1b3bb59842..55ac333b1e 100644
--- a/platforms/chibios/drivers/ws2812.c
+++ b/platforms/chibios/drivers/ws2812.c
@@ -6,7 +6,7 @@
 /* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
 
 #ifndef NOP_FUDGE
-#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(GD32VF103) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX)
+#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(GD32VF103) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
 #        define NOP_FUDGE 0.4
 #    else
 #        error("NOP_FUDGE configuration required")
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index 01d8148875..9ee552b187 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -5,7 +5,11 @@
 
 // Define the spi your LEDs are plugged to here
 #ifndef WS2812_SPI
-#    define WS2812_SPI SPID1
+#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
+#        define WS2812_SPI SPIDQ
+#    else
+#        define WS2812_SPI SPID1
+#    endif
 #endif
 
 #ifndef WS2812_SPI_MOSI_PAL_MODE
@@ -54,6 +58,7 @@
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #else
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0) // default
+#    define WS2812_SPI_DIVISOR 16
 #endif
 
 // Use SPI circular buffer
@@ -148,8 +153,14 @@ void ws2812_init(void) {
         NULL, // end_cb
         PAL_PORT(RGB_DI_PIN),
         PAL_PAD(RGB_DI_PIN),
+#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
+        0,
+        0,
+        WS2812_SPI_DIVISOR
+#    else
         WS2812_SPI_DIVISOR_CR1_BR_X,
         0
+#    endif
 #else
     // HAL_SPI_V2
 #    if SPI_SUPPORTS_CIRCULAR == TRUE

From c02d7ae86f5bc24f7f6201eccf09acec3d2879cf Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Sun, 14 Aug 2022 09:21:46 +0800
Subject: [PATCH 194/959] Added ws2812_pwm support for WB32 MCU. (#17142)

Co-authored-by: Joy <chang.li@westberrytech.com>
---
 platforms/chibios/drivers/ws2812_pwm.c | 27 ++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 57187676d7..37c613049f 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -17,13 +17,25 @@
 #    define WS2812_PWM_CHANNEL 2 // Channel
 #endif
 #ifndef WS2812_PWM_PAL_MODE
-#    define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
+#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
+#        define WS2812_PWM_PAL_MODE 1 // DI Pin's alternate function value
+#    else
+#        define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
+#    endif
 #endif
 #ifndef WS2812_DMA_STREAM
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
+#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
+#        define WS2812_DMA_STREAM WB32_DMA1_STREAM1 // DMA Stream for TIMx_UP
+#    else
+#        define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
+#    endif
 #endif
 #ifndef WS2812_DMA_CHANNEL
-#    define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
+#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
+#        define WS2812_DMA_CHANNEL WB32_DMAC_HWHIF_TIM2_UP // DMA Channel for TIM2_UP
+#    else
+#        define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
+#    endif
 #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"
@@ -284,11 +296,18 @@ 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));
+#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);
-    dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N);
     dmaStreamSetMode(WS2812_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3));
+#endif
+    dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N);
     // M2P: Memory 2 Periph; PL: Priority Level
 
 #if (STM32_DMA_SUPPORTS_DMAMUX == TRUE)

From dfc92d8f7b669af403c5be0121bbb678e5be8611 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Sun, 14 Aug 2022 02:36:34 +0100
Subject: [PATCH 195/959] Fix buffer size for WS2812 PWM driver (#17046)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: yiancar <yiancar@gmail.com>
---
 platforms/chibios/drivers/ws2812_pwm.c | 52 ++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 37c613049f..8c0259fb91 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -41,6 +41,22 @@
 #    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
 #endif
 
+/* Summarize https://www.st.com/resource/en/application_note/an4013-stm32-crossseries-timer-overview-stmicroelectronics.pdf to
+ * figure out if we are using a 32bit timer. This is needed to setup the DMA controller correctly.
+ * Ignore STM32H7XX and STM32U5XX as they are not supported by ChibiOS.
+ */
+#if !defined(STM32F1XX) && !defined(STM32L0XX) && !defined(STM32L1XX)
+#    define WS2812_PWM_TIMER_32BIT_PWMD2 1
+#endif
+#if !defined(STM32F1XX)
+#    define WS2812_PWM_TIMER_32BIT_PWMD5 1
+#endif
+#define WS2812_CONCAT1(a, b) a##b
+#define WS2812_CONCAT(a, b) WS2812_CONCAT1(a, b)
+#if WS2812_CONCAT(WS2812_PWM_TIMER_32BIT_, WS2812_PWM_DRIVER)
+#    define WS2812_PWM_TIMER_32BIT
+#endif
+
 #ifndef WS2812_PWM_COMPLEMENTARY_OUTPUT
 #    define WS2812_PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_HIGH
 #else
@@ -101,6 +117,9 @@
  * The duty cycle is calculated for a high period of 350 nS.
  */
 #define WS2812_DUTYCYCLE_0 (WS2812_PWM_FREQUENCY / (1000000000 / 350))
+#if (WS2812_DUTYCYCLE_0 > 255)
+#    error WS2812 PWM driver: High period for a 0 is more than a byte
+#endif
 
 /**
  * @brief   High period for a one, in ticks
@@ -117,6 +136,9 @@
  * This is in the middle of the specifications of the WS2812 and WS2812B.
  */
 #define WS2812_DUTYCYCLE_1 (WS2812_PWM_FREQUENCY / (1000000000 / 800))
+#if (WS2812_DUTYCYCLE_1 > 255)
+#    error WS2812 PWM driver: High period for a 1 is more than a byte
+#endif
 
 /* --- PRIVATE MACROS ------------------------------------------------------- */
 
@@ -259,13 +281,35 @@
 
 /* --- PRIVATE VARIABLES ---------------------------------------------------- */
 
-static uint32_t ws2812_frame_buffer[WS2812_BIT_N + 1]; /**< Buffer for a frame */
+// STM32F2XX, STM32F4XX and STM32F7XX do NOT zero pad DMA transfers of unequal data width. Buffer width must match TIMx CCR.
+// 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
+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
+typedef uint16_t ws2812_buffer_t;
+#    endif
+#else
+#    define WS2812_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_BYTE
+#    if defined(WS2812_PWM_TIMER_32BIT)
+#        define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD
+#    else
+#        define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD
+#    endif
+typedef uint8_t ws2812_buffer_t;
+#endif
+
+static ws2812_buffer_t ws2812_frame_buffer[WS2812_BIT_N + 1]; /**< Buffer for a frame */
 
 /* --- PUBLIC FUNCTIONS ----------------------------------------------------- */
 /*
  * Gedanke: Double-buffer type transactions: double buffer transfers using two memory pointers for
-the memory (while the DMA is reading/writing from/to a buffer, the application can
-write/read to/from the other buffer).
+ * the memory (while the DMA is reading/writing from/to a buffer, the application can
+ * write/read to/from the other buffer).
  */
 
 void ws2812_init(void) {
@@ -305,7 +349,7 @@ void ws2812_init(void) {
     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 | STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3));
+    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));
 #endif
     dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N);
     // M2P: Memory 2 Periph; PL: Priority Level

From e948fa6f6e184a3c9a317a7aa680e33e7629b0d4 Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Sun, 14 Aug 2022 12:00:12 +0800
Subject: [PATCH 196/959] Added support for gmmk pro rev2 keyboard. (#17655)

Co-authored-by: Joy <chang.li@westberrytech.com>
---
 keyboards/gmmk/pro/pro.h                      |   4 +
 keyboards/gmmk/pro/rev2/ansi/ansi.c           | 241 +++++++++++++++++
 keyboards/gmmk/pro/rev2/ansi/ansi.h           |  52 ++++
 keyboards/gmmk/pro/rev2/ansi/config.h         |  23 ++
 keyboards/gmmk/pro/rev2/ansi/info.json        | 109 ++++++++
 .../pro/rev2/ansi/keymaps/default/keymap.c    |  72 ++++++
 .../gmmk/pro/rev2/ansi/keymaps/via/keymap.c   |  88 +++++++
 .../gmmk/pro/rev2/ansi/keymaps/via/rules.mk   |   2 +
 keyboards/gmmk/pro/rev2/ansi/readme.md        |  37 +++
 keyboards/gmmk/pro/rev2/ansi/rules.mk         |  23 ++
 keyboards/gmmk/pro/rev2/config.h              |  26 ++
 keyboards/gmmk/pro/rev2/halconf.h             |  23 ++
 keyboards/gmmk/pro/rev2/iso/config.h          |  23 ++
 keyboards/gmmk/pro/rev2/iso/info.json         | 110 ++++++++
 keyboards/gmmk/pro/rev2/iso/iso.c             | 243 ++++++++++++++++++
 keyboards/gmmk/pro/rev2/iso/iso.h             |  52 ++++
 .../pro/rev2/iso/keymaps/default/keymap.c     |  72 ++++++
 .../gmmk/pro/rev2/iso/keymaps/via/keymap.c    |  90 +++++++
 .../gmmk/pro/rev2/iso/keymaps/via/rules.mk    |   2 +
 keyboards/gmmk/pro/rev2/iso/readme.md         |  37 +++
 keyboards/gmmk/pro/rev2/iso/rules.mk          |  26 ++
 keyboards/gmmk/pro/rev2/mcuconf.h             |  22 ++
 22 files changed, 1377 insertions(+)
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/ansi.c
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/ansi.h
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/config.h
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/info.json
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/readme.md
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/rules.mk
 create mode 100644 keyboards/gmmk/pro/rev2/config.h
 create mode 100644 keyboards/gmmk/pro/rev2/halconf.h
 create mode 100644 keyboards/gmmk/pro/rev2/iso/config.h
 create mode 100644 keyboards/gmmk/pro/rev2/iso/info.json
 create mode 100644 keyboards/gmmk/pro/rev2/iso/iso.c
 create mode 100644 keyboards/gmmk/pro/rev2/iso/iso.h
 create mode 100644 keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
 create mode 100644 keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c
 create mode 100644 keyboards/gmmk/pro/rev2/iso/keymaps/via/rules.mk
 create mode 100644 keyboards/gmmk/pro/rev2/iso/readme.md
 create mode 100644 keyboards/gmmk/pro/rev2/iso/rules.mk
 create mode 100644 keyboards/gmmk/pro/rev2/mcuconf.h

diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h
index 0e53ffe225..c83d6c99c5 100644
--- a/keyboards/gmmk/pro/pro.h
+++ b/keyboards/gmmk/pro/pro.h
@@ -22,4 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "rev1/ansi/ansi.h"
 #elif defined(KEYBOARD_gmmk_pro_rev1_iso)
 #    include "rev1/iso/iso.h"
+#elif defined(KEYBOARD_gmmk_pro_rev2_ansi)
+#    include "rev2/ansi/ansi.h"
+#elif defined(KEYBOARD_gmmk_pro_rev2_iso)
+#    include "rev2/iso/iso.h"
 #endif  // GMMK Pro revisions
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c
new file mode 100644
index 0000000000..9cf28e4648
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.c
@@ -0,0 +1,241 @@
+/* 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 "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = {{
+    { 4,      NO_LED, NO_LED, 95,     65,     79, 5,      28 },
+    { 8,      2,      9,      0,      10,     75, 1,      7  },
+    { 14,     3,      15,     NO_LED, 16,     86, 6,      13 },
+    { 20,     18,     21,     23,     22,     94, 12,     19 },
+    { 25,     30,     26,     31,     27,     32, 29,     24 },
+    { 41,     36,     42,     37,     43,     38, 35,     40 },
+    { 46,     89,     47,     34,     48,     72, 78,     45 },
+    { 52,     39,     53,     97,     54,     82, 44,     51 },
+    { 58,     63,     59,     64,     NO_LED, 60, 62,     57 },
+    { 11,     90,     55,     17,     33,     49, NO_LED, 69 },
+    { NO_LED, 85,     93,     61,     96,     66, 50,     56 }
+}, {
+    {0, 0},     // 0, ESC, k13
+    {0, 15},    // 1, ~, k16
+    {4, 26},    // 2, Tab, k11
+    {5, 38},    // 3, Caps, k21
+    {9, 49},    // 4, Sh_L, k00
+    {2, 61},    // 5, Ct_L, k06
+    {18, 0},    // 6, F1, k26
+    {14, 15},   // 7, 1, k17
+    {22, 26},   // 8, Q, k10
+    {25, 38},   // 9, A, k12
+    {33, 49},   // 10, Z, k14
+    {20, 61},   // 11, Win_L, k90
+    {33, 0},    // 12, F2, k36
+    {29, 15},   // 13, 2, k27
+    {36, 26},   // 14, W, k20
+    {40, 38},   // 15, S, k22
+    {47, 49},   // 16, X, k24
+    {38, 61},   // 17, Alt_L, k93
+    {47, 0},    // 18, F3, k31
+    {43, 15},   // 19, 3, k37
+    {51, 26},   // 20, E, k30
+    {54, 38},   // 21, D, k32
+    {61, 49},   // 22, C, k34
+    {61, 0},    // 23, F4, k33
+    {58, 15},   // 24, 4, k47
+    {65, 26},   // 25, R, k40
+    {69, 38},   // 26, F, k42
+    {76, 49},   // 27, V, k44
+    {79, 0},    // 28, F5, k07
+    {72, 15},   // 29, 5, k46
+    {79, 26},   // 30, T, k41
+    {83, 38},   // 31, G, k43
+    {90, 49},   // 32, B, k45
+    {92, 61},   // 33, SPACE, k94
+    {94, 0},    // 34, F6, k63
+    {87, 15},   // 35, 6, k56
+    {94, 26},   // 36, Y, k51
+    {98, 38},   // 37, H, k53
+    {105, 49},  // 38, N, k55
+    {108, 0},   // 39, F7, k71
+    {101, 15},  // 40, 7, k57
+    {108, 26},  // 41, U, k50
+    {112, 38},  // 42, J, k52
+    {119, 49},  // 43, M, k54
+    {123, 0},   // 44, F8, k76
+    {116, 15},  // 45, 8, k67
+    {123, 26},  // 46, I, k60
+    {126, 38},  // 47, K, k62
+    {134, 49},  // 48, ,, k64
+    {145, 61},  // 49, Alt_R, k95
+    {141, 0},   // 50, F9, ka6
+    {130, 15},  // 51, 9, k77
+    {137, 26},  // 52, O, k70
+    {141, 38},  // 53, L, k72
+    {148, 49},  // 54, ., k74
+    {159, 61},  // 55, FN, k92
+    {155, 0},   // 56, F10, ka7
+    {145, 15},  // 57, 0, k87
+    {152, 26},  // 58, P, k80
+    {155, 38},  // 59, ;, k82
+    {163, 49},  // 60, ?, k85
+    {170, 0},   // 61, F11, ka3
+    {159, 15},  // 62, -, k86
+    {166, 26},  // 63, [, k81
+    {170, 38},  // 64, ", k83
+    {173, 61},  // 65, Ct_R, k04
+    {184, 0},   // 66, F12, ka5
+    {0, 8},     // 67, LED, l01
+    {224, 8},   // 68, LED, l11
+    {202, 0},   // 69, Prt, k97
+    {0, 15},    // 70, LED, l02
+    {224, 15},  // 71, LED, l12
+    {224, 15},  // 72, Del, k65
+    {0, 21},    // 73, LED, l03
+    {224, 21},  // 74, LED, l13
+    {224, 26},  // 75, PgUp, k15
+    {0, 28},    // 76, LED, l04
+    {224, 28},  // 77, LED, l14
+    {173, 15},  // 78, =, k66
+    {220, 64},  // 79, Right, k05
+    {0, 35},    // 80, LED, l05
+    {224, 35},  // 81, LED, l15
+    {224, 49},  // 82, End, k75
+    {0, 42},    // 83, LED, l06
+    {224, 42},  // 84, LED, l16
+    {195, 15},  // 85, BSpc, ka1
+    {224, 38},  // 86, PgDn, k25
+    {0, 48},    // 87, LED, l07
+    {224, 48},  // 88, LED, l17
+    {181, 26},  // 89, ], k61
+    {182, 49},  // 90, Sh_R, k91
+    {0, 55},    // 91, LED, l08
+    {224, 55},  // 92, LED, l18
+    {199, 26},  // 93, \, ka2
+    {206, 52},  // 94, Up, k35
+    {191, 64},  // 95, Left, k03
+    {193, 38},  // 96, Enter, ka4
+    {206, 64}   // 97, Down, k73
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 4, 2, 2, 4, 2, 2,
+    4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
+}};
+
+const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+    {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
+
+    {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
+};
+// clang-format on
+#endif
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.h b/keyboards/gmmk/pro/rev2/ansi/ansi.h
new file mode 100644
index 0000000000..2f8a28b940
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.h
@@ -0,0 +1,52 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "pro.h"
+
+#define ___ KC_NO
+
+//  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    -    =    BSpc     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
+
+// clang-format off
+#define LAYOUT( \
+    k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97,     k01, \
+    k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1,     k65, \
+    k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, ka2,     k15, \
+    k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83,     ka4,      k25, \
+    k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85,    k91,       k35, k75, \
+    k06,    k90,    k93,       k94,           k95,    k92, k04,     k03, k73, k05  \
+) \
+{ \
+    { k00, k01, ___, k03, k04, k05, k06, k07}, \
+    { k10, k11, k12, k13, k14, k15, k16, k17}, \
+    { k20, k21, k22, ___, k24, k25, k26, k27}, \
+    { k30, k31, k32, k33, k34, k35, k36, k37}, \
+    { k40, k41, k42, k43, k44, k45, k46, k47}, \
+    { k50, k51, k52, k53, k54, k55, k56, k57}, \
+    { k60, k61, k62, k63, k64, k65, k66, k67}, \
+    { k70, k71, k72, k73, k74, k75, k76, k77}, \
+    { k80, k81, k82, k83, ___, k85, k86, k87}, \
+    { k90, k91, k92, k93, k94, k95, ___, k97}, \
+    { ___, ka1, ka2, ka3, ka4, ka5, ka6, ka7}  \
+}
+// clang-format on
diff --git a/keyboards/gmmk/pro/rev2/ansi/config.h b/keyboards/gmmk/pro/rev2/ansi/config.h
new file mode 100644
index 0000000000..996ee21afc
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 32
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
new file mode 100644
index 0000000000..c3e76391d1
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -0,0 +1,109 @@
+{
+    "keyboard_name": "GMMK Pro (ANSI)",
+    "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
+    "maintainer": "GloriousThrall",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+                {"x":15.5, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+
+                {"x":15.5, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.5, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":15.5, "y":3.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+
+                {"x":14.25, "y":4.5},
+
+                {"x":15.5, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25},
+                {"x":11, "y":5.25},
+                {"x":12, "y":5.25},
+
+                {"x":13.25, "y":5.5},
+                {"x":14.25, "y":5.5},
+                {"x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0d161e5bdd
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* 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 RESET key (to put the board into bootloader mode). Without
+    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+    // if that's your preference.
+    //
+    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
+    // it'll be back to normal when you plug it back in.
+    //
+    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
+    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
+    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+
+};
+// clang-format on
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+    return false;
+}
+#endif // ENCODER_ENABLE
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f3f3397874
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c
@@ -0,0 +1,88 @@
+/* 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 RESET key (to put the board into bootloader mode). Without
+    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+    // if that's your preference.
+    //
+    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
+    // it'll be back to normal when you plug it back in.
+    //
+    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
+    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
+    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+
+};
+// clang-format on
+
+/* encoder; start */
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev2/ansi/readme.md b/keyboards/gmmk/pro/rev2/ansi/readme.md
new file mode 100644
index 0000000000..dd60a0f138
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/readme.md
@@ -0,0 +1,37 @@
+# GMMK PRO (ANSI)
+
+A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the WestBerry G7 ARM Cortex-M4 microcontroller, with support for rotary encoders and three additional layouts. [More info at Glorious](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black)
+
+* Keyboard Maintainer: [GloriousThrall](https://github.com/GloriousThrall)
+* Hardware Supported: GMMK Pro
+* Hardware Availability: [GloriousPCGaming.com](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gmmk/pro/rev2/ansi:default
+
+Flashing example for this keyboard:
+
+    make gmmk/pro/rev2/ansi:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the bottom side of the PCB while connecting the USB cable
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+Backslash will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Case Screw Replacements
+
+Many users report stripped case screws when disassembling the board.
+
+The stock case screws are:
+* Thread: M2
+* Thread length: ~5 mm
+* Head diameter: ~3.8 mm
+* Head counterbore diameter: ~4.0 mm
+* Head counterbore depth: ~1.9 mm
+
+Most M2x5mm screws should fit fine, although it's best to ensure that the screw head will fit inside the counterbore.
+For reference, [this hex socket head screw](https://www.mcmaster.com/91292A005/) from McMaster-Carr should fit nearly flush (head will protrude above the counterbore by ~0.1 mm).
diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk
new file mode 100644
index 0000000000..8d81af0fdf
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = WB32F3G71
+
+# Bootloader selection
+BOOTLOADER = wb32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = AW20216
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/pro/rev2/config.h b/keyboards/gmmk/pro/rev2/config.h
new file mode 100644
index 0000000000..c2b3755d77
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B12
+#define WEAR_LEVELING_BACKING_SIZE 2048
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
diff --git a/keyboards/gmmk/pro/rev2/halconf.h b/keyboards/gmmk/pro/rev2/halconf.h
new file mode 100644
index 0000000000..8d9b60c234
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define 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/gmmk/pro/rev2/iso/config.h b/keyboards/gmmk/pro/rev2/iso/config.h
new file mode 100644
index 0000000000..82390fc147
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 33
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
new file mode 100644
index 0000000000..32fac89336
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "GMMK Pro (ISO)",
+    "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
+    "maintainer": "GloriousThrall",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+
+                {"label":"Printscreen", "x":14, "y":0},
+                {"label":"Rotary", "x":15.5, "y":0},
+
+                {"label":"`", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+
+                {"label":"Delete", "x":15.5, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+
+                {"label":"Page Up", "x":15.5, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Iso #", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Page Down", "x":15.5, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"Iso \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+
+                {"label":"Up", "x":14.25, "y":4.5},
+
+                {"label":"End", "x":15.5, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25},
+                {"label":"Fn", "x":11, "y":5.25},
+                {"label":"Ctrl", "x":12, "y":5.25},
+
+                {"label":"Left", "x":13.25, "y":5.5},
+                {"label":"Down", "x":14.25, "y":5.5},
+                {"label":"Right", "x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.c b/keyboards/gmmk/pro/rev2/iso/iso.c
new file mode 100644
index 0000000000..3567a52d0d
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/iso.c
@@ -0,0 +1,243 @@
+/* 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 "iso.h"
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = {{
+    { 4,      NO_LED, NO_LED, 96, 65, 80, 5,      28 },
+    { 8,      2,      9,      0,  10, 76, 1,      7  },
+    { 14,     3,      15,     67, 16, 87, 6,      13 },
+    { 20,     18,     21,     23, 22, 94, 12,     19 },
+    { 25,     30,     26,     31, 27, 32, 29,     24 },
+    { 41,     36,     42,     37, 43, 38, 35,     40 },
+    { 46,     90,     47,     34, 48, 73, 79,     45 },
+    { 52,     39,     53,     98, 54, 83, 44,     51 },
+    { 58,     63,     59,     64, 95, 60, 62,     57 },
+    { 11,     91,     55,     17, 33, 49, NO_LED, 70 },
+    { NO_LED, 86,     NO_LED, 61, 97, 66, 50,     56 }
+}, {
+    {0, 0},     // 0, ESC, k13
+    {0, 15},    // 1, `, k16
+    {4, 26},    // 2, Tab, k11
+    {5, 38},    // 3, Caps, k21
+    {2, 49},    // 4, Sh_L, k00
+    {2, 61},    // 5, Ct_L, k06
+    {18, 0},    // 6, F1, k26
+    {14, 15},   // 7, 1, k17
+    {22, 26},   // 8, Q, k10
+    {25, 38},   // 9, A, k12
+    {33, 49},   // 10, Z, k14
+    {20, 61},   // 11, Win_L, k90
+    {33, 0},    // 12, F2, k36
+    {29, 15},   // 13, 2, k27
+    {36, 26},   // 14, W, k20
+    {40, 38},   // 15, S, k22
+    {47, 49},   // 16, X, k24
+    {38, 61},   // 17, Alt_L, k93
+    {47, 0},    // 18, F3, k31
+    {43, 15},   // 19, 3, k37
+    {51, 26},   // 20, E, k30
+    {54, 38},   // 21, D, k32
+    {61, 49},   // 22, C, k34
+    {61, 0},    // 23, F4, k33
+    {58, 15},   // 24, 4, k47
+    {65, 26},   // 25, R, k40
+    {69, 38},   // 26, F, k42
+    {76, 49},   // 27, V, k44
+    {79, 0},    // 28, F5, k07
+    {72, 15},   // 29, 5, k46
+    {79, 26},   // 30, T, k41
+    {83, 38},   // 31, G, k43
+    {90, 49},   // 32, B, k45
+    {92, 61},   // 33, SPACE, k94
+    {94, 0},    // 34, F6, k63
+    {87, 15},   // 35, 6, k56
+    {94, 26},   // 36, Y, k51
+    {98, 38},   // 37, H, k53
+    {105, 49},  // 38, N, k55
+    {108, 0},   // 39, F7, k71
+    {101, 15},  // 40, 7, k57
+    {108, 26},  // 41, U, k50
+    {112, 38},  // 42, J, k52
+    {119, 49},  // 43, M, k54
+    {123, 0},   // 44, F8, k76
+    {116, 15},  // 45, 8, k67
+    {123, 26},  // 46, I, k60
+    {126, 38},  // 47, K, k62
+    {134, 49},  // 48, ,, k64
+    {145, 61},  // 49, Alt_R, k95
+    {141, 0},   // 50, F9, ka6
+    {130, 15},  // 51, 9, k77
+    {137, 26},  // 52, O, k70
+    {141, 38},  // 53, L, k72
+    {148, 49},  // 54, ., k74
+    {159, 61},  // 55, FN, k92
+    {155, 0},   // 56, F10, ka7
+    {145, 15},  // 57, 0, k87
+    {152, 26},  // 58, P, k80
+    {155, 38},  // 59, ;, k82
+    {163, 49},  // 60, /, k85
+    {170, 0},   // 61, F11, ka3
+    {159, 15},  // 62, -, k86
+    {166, 26},  // 63, [, k81
+    {170, 38},  // 64, ", k83
+    {173, 61},  // 65, Ct_R, k04
+    {184, 0},   // 66, F12, ka5
+    {18, 49},   // 67, \, k23
+    {0, 8},     // 68, LED, l01
+    {224, 8},   // 69, LED, l11
+    {202, 0},   // 70, Prt, k97
+    {0, 15},    // 71, LED, l02
+    {224, 15},  // 72, LED, l12
+    {224, 15},  // 73, Del, k65
+    {0, 21},    // 74, LED, l03
+    {224, 21},  // 75, LED, l13
+    {224, 26},  // 76, PgUp, k15
+    {0, 28},    // 77, LED, l04
+    {224, 28},  // 78, LED, l14
+    {173, 15},  // 79, =, k66
+    {220, 64},  // 80, Right, k05
+    {0, 35},    // 81, LED, l05
+    {224, 35},  // 82, LED, l15
+    {224, 49},  // 83, End, k75
+    {0, 42},    // 84, LED, l06
+    {224, 42},  // 85, LED, l16
+    {195, 15},  // 86, BSpc, ka1
+    {224, 38},  // 87, PgDn, k25
+    {0, 48},    // 88, LED, l07
+    {224, 48},  // 89, LED, l17
+    {181, 26},  // 90, ], k61
+    {182, 49},  // 91, Sh_R, k91
+    {0, 55},    // 92, LED, l08
+    {224, 55},  // 93, LED, l18
+    {206, 52},  // 94, Up, k35
+    {184, 38},  // 95, #, k84
+    {191, 64},  // 96, Left, k03
+    {201, 26},  // 97, Enter, ka4
+    {206, 64},  // 98, Down, k73
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 4, 2, 2, 4, 2,
+    2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
+}};
+
+const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+    {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
+
+    {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
+};
+// clang-format on
+#endif
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.h b/keyboards/gmmk/pro/rev2/iso/iso.h
new file mode 100644
index 0000000000..a5844e10eb
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/iso.h
@@ -0,0 +1,52 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "pro.h"
+
+#define ___ KC_NO
+
+//  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    -    =    BSpc     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
+
+// clang-format off
+#define LAYOUT( \
+    k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97,     k01, \
+    k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1,     k65, \
+    k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61,          k15, \
+    k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k84, ka4,     k25, \
+    k00, k23, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k91,     k35, k75, \
+    k06,    k90,    k93,       k94,           k95,    k92, k04,     k03, k73, k05  \
+) \
+{ \
+    { k00, k01, ___, k03, k04, k05, k06, k07}, \
+    { k10, k11, k12, k13, k14, k15, k16, k17}, \
+    { k20, k21, k22, k23, k24, k25, k26, k27}, \
+    { k30, k31, k32, k33, k34, k35, k36, k37}, \
+    { k40, k41, k42, k43, k44, k45, k46, k47}, \
+    { k50, k51, k52, k53, k54, k55, k56, k57}, \
+    { k60, k61, k62, k63, k64, k65, k66, k67}, \
+    { k70, k71, k72, k73, k74, k75, k76, k77}, \
+    { k80, k81, k82, k83, k84, k85, k86, k87}, \
+    { k90, k91, k92, k93, k94, k95, ___, k97}, \
+    { ___, ka1, ___, ka3, ka4, ka5, ka6, ka7}  \
+}
+// clang-format on
diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3bdacda6c8
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* 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 RESET 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_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_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, _______, _______,          _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+
+};
+// clang-format on
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c47e186c52
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c
@@ -0,0 +1,90 @@
+/* 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 RESET 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_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_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, _______, _______,          _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+
+
+};
+// clang-format on
+
+/* encoder; start */
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev2/iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev2/iso/readme.md b/keyboards/gmmk/pro/rev2/iso/readme.md
new file mode 100644
index 0000000000..7d46370e3a
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/readme.md
@@ -0,0 +1,37 @@
+# GMMK PRO (ISO)
+
+A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the WestBerry G7 ARM Cortex-M4 microcontroller, with support for rotary encoders and three additional layouts. [More info at Glorious](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-iso-black-slate)
+
+* Keyboard Maintainer: [GloriousThrall](https://github.com/GloriousThrall)
+* Hardware Supported: GMMK Pro
+* Hardware Availability: [GloriousPCGaming.com](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-iso-black-slate)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gmmk/pro/rev2/iso:default
+
+Flashing example for this keyboard:
+
+    make gmmk/pro/rev2/iso:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the bottom side of the PCB while connecting the USB cable
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+Backspace will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Case Screw Replacements
+
+Many users report stripped case screws when disassembling the board.
+
+The stock case screws are:
+* Thread: M2
+* Thread length: ~5 mm
+* Head diameter: ~3.8 mm
+* Head counterbore diameter: ~4.0 mm
+* Head counterbore depth: ~1.9 mm
+
+Most M2x5mm screws should fit fine, although it's best to ensure that the screw head will fit inside the counterbore.
+For reference, [this hex socket head screw](https://www.mcmaster.com/91292A005/) from McMaster-Carr should fit nearly flush (head will protrude above the counterbore by ~0.1 mm).
diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk
new file mode 100644
index 0000000000..cf6373ae46
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = WB32F3G71
+
+# Bootloader selection
+BOOTLOADER = wb32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# 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
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = AW20216
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/pro/rev2/mcuconf.h b/keyboards/gmmk/pro/rev2/mcuconf.h
new file mode 100644
index 0000000000..4fa7c1e256
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE

From ba04ecfabd4f254bb89ccd7d1de9ac7fb228ce5b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 14 Aug 2022 12:25:46 +0100
Subject: [PATCH 197/959] Align TO() max layers with other keycodes (#17989)

---
 quantum/action_code.h      |  1 +
 quantum/keymap_common.c    |  8 +++-----
 quantum/quantum_keycodes.h | 11 ++---------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/quantum/action_code.h b/quantum/action_code.h
index 20b3e459d2..e107f0a740 100644
--- a/quantum/action_code.h
+++ b/quantum/action_code.h
@@ -234,6 +234,7 @@ enum layer_param_tap_op {
 #define ACTION_LAYER_INVERT(layer, on) ACTION_LAYER_BIT_XOR((layer) / 4, 1 << ((layer) % 4), (on))
 #define ACTION_LAYER_ON(layer, on) ACTION_LAYER_BIT_OR((layer) / 4, 1 << ((layer) % 4), (on))
 #define ACTION_LAYER_OFF(layer, on) ACTION_LAYER_BIT_AND((layer) / 4, ~(1 << ((layer) % 4)), (on))
+#define ACTION_LAYER_GOTO(layer) ACTION_LAYER_SET(layer, ON_PRESS)
 #define ACTION_LAYER_SET(layer, on) ACTION_LAYER_BIT_SET((layer) / 4, 1 << ((layer) % 4), (on))
 #define ACTION_LAYER_ON_OFF(layer) ACTION_LAYER_TAP((layer), OP_ON_OFF)
 #define ACTION_LAYER_OFF_ON(layer) ACTION_LAYER_TAP((layer), OP_OFF_ON)
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index c1940f0fd3..8d7a8bda9a 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -47,10 +47,9 @@ action_t action_for_keycode(uint16_t keycode) {
     keycode = keycode_config(keycode);
 
     action_t action = {};
-    uint8_t  action_layer, when, mod;
+    uint8_t  action_layer, mod;
 
     (void)action_layer;
-    (void)when;
     (void)mod;
 
     switch (keycode) {
@@ -85,9 +84,8 @@ action_t action_for_keycode(uint16_t keycode) {
             break;
         case QK_TO ... QK_TO_MAX:;
             // Layer set "GOTO"
-            when         = (keycode >> 0x4) & 0x3;
-            action_layer = keycode & 0xF;
-            action.code  = ACTION_LAYER_SET(action_layer, when);
+            action_layer = keycode & 0xFF;
+            action.code  = ACTION_LAYER_GOTO(action_layer);
             break;
         case QK_MOMENTARY ... QK_MOMENTARY_MAX:;
             // Momentary action_layer
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 456fad6f1b..7228ee9e08 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -797,15 +797,8 @@ enum quantum_keycodes {
 #define EH_LEFT MAGIC_EE_HANDS_LEFT
 #define EH_RGHT MAGIC_EE_HANDS_RIGHT
 
-// GOTO layer - 16 layers max
-// when:
-// ON_PRESS    = 1
-// ON_RELEASE  = 2
-// Unless you have a good reason not to do so, prefer  ON_PRESS (1) as your default.
-// In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own
-// keycode modeled after the old version, kept below for this.
-/* #define TO(layer, when) (QK_TO | (when << 0x4) | (layer & 0xFF)) */
-#define TO(layer) (QK_TO | (ON_PRESS << 0x4) | ((layer)&0xFF))
+// GOTO layer - 256 layer max
+#define TO(layer) (QK_TO | ((layer)&0xFF))
 
 // Momentary switch layer - 256 layer max
 #define MO(layer) (QK_MOMENTARY | ((layer)&0xFF))

From fce99f38757d7ddbcaada0f5f0157ca24b6162b7 Mon Sep 17 00:00:00 2001
From: Mega Mind <68985133+megamind4089@users.noreply.github.com>
Date: Sun, 14 Aug 2022 19:27:26 +0800
Subject: [PATCH 198/959] [Controller] Added board config for custom controller
 STeMCell (#16287)

Co-authored-by: Mariappan Ramasamy <947300+Mariappan@users.noreply.github.com>
Co-authored-by: Mariappan Ramasamy <maari@basis-ai.com>
Co-authored-by: Sadek Baroudi <sadekbaroudi@gmail.com>
---
 builddefs/common_features.mk                  |   2 +-
 data/mappings/defaults.json                   |   6 +
 docs/feature_converters.md                    |  22 ++
 .../chibios/boards/STEMCELL/board/board.mk    |  15 ++
 .../chibios/boards/STEMCELL/configs/board.h   |   8 +
 .../chibios/boards/STEMCELL/configs/chconf.h  |   9 +
 .../chibios/boards/STEMCELL/configs/config.h  |  29 +++
 .../chibios/boards/STEMCELL/configs/halconf.h |  11 +
 .../chibios/boards/STEMCELL/configs/mcuconf.h | 231 ++++++++++++++++++
 .../promicro_to_stemcell/_pin_defs.h          |  57 +++++
 .../promicro_to_stemcell/converter.mk         |  22 ++
 11 files changed, 411 insertions(+), 1 deletion(-)
 create mode 100644 platforms/chibios/boards/STEMCELL/board/board.mk
 create mode 100644 platforms/chibios/boards/STEMCELL/configs/board.h
 create mode 100644 platforms/chibios/boards/STEMCELL/configs/chconf.h
 create mode 100644 platforms/chibios/boards/STEMCELL/configs/config.h
 create mode 100644 platforms/chibios/boards/STEMCELL/configs/halconf.h
 create mode 100644 platforms/chibios/boards/STEMCELL/configs/mcuconf.h
 create mode 100644 platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h
 create mode 100644 platforms/chibios/converters/promicro_to_stemcell/converter.mk

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index a23b5e82b9..3d416773f7 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -212,7 +212,7 @@ else
     ifeq ($(PLATFORM),AVR)
       # Automatically provided by avr-libc, nothing required
     else ifeq ($(PLATFORM),CHIBIOS)
-      ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+      ifneq ($(filter STM32F3xx_% STM32F1xx_% STM32F4xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
         # Emulated EEPROM
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
         COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json
index 5e25405c37..2c9fb317c9 100644
--- a/data/mappings/defaults.json
+++ b/data/mappings/defaults.json
@@ -54,6 +54,12 @@
             "processor": "STM32F411",
             "bootloader": "stm32-dfu",
             "board": "BLACKPILL_STM32_F411"
+        },
+        "stemcell": {
+            "processor": "STM32F411",
+            "bootloader": "tinyuf2",
+            "board": "STEMCELL",
+            "pin_compatible": "promicro"
         }
     }
 }
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 569cf0f17d..936ab44559 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -15,6 +15,7 @@ Currently the following converters are available:
 | `promicro` | `promicro_rp2040` |
 | `promicro` | `blok`            |
 | `promicro` | `bit_c_pro`       |
+| `promicro` | `stemcell`        |
 
 See below for more in depth information on each converter.
 
@@ -56,6 +57,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co
 | [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) | `promicro_rp2040` |
 | [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)         | `blok`            |
 | [Bit-C PRO](https://nullbits.co/bit-c-pro)                             | `bit_c_pro`       |
+| [STeMCell](https://github.com/megamind4089/STeMCell)                   | `stemcell`        |
 
 Converter summary:
 
@@ -66,6 +68,7 @@ Converter summary:
 | `promicro_rp2040` | `-e CONVERT_TO=promicro_rp2040` | `CONVERT_TO=promicro_rp2040` | `#ifdef CONVERT_TO_PROMICRO_RP2040` |
 | `blok`            | `-e CONVERT_TO=blok`            | `CONVERT_TO=blok`            | `#ifdef CONVERT_TO_BLOK`            |
 | `bit_c_pro`       | `-e CONVERT_TO=bit_c_pro`       | `CONVERT_TO=bit_c_pro`       | `#ifdef CONVERT_TO_BIT_C_PRO`       |
+| `stemcell`        | `-e CONVERT_TO=stemcell`        | `CONVERT_TO=stemcell`        | `#ifdef CONVERT_TO_STEMCELL`        |
 
 ### Proton C :id=proton_c
 
@@ -99,3 +102,22 @@ The following defaults are based on what has been implemented for [RP2040](platf
 ### SparkFun Pro Micro - RP2040, Blok, and Bit-C PRO :id=promicro_rp2040 
 
 Currently identical to  [Adafruit KB2040](#kb2040).
+
+### STeMCell :id=stemcell
+
+Feature set currently identical to [Proton C](#proton_c).
+There are two versions of STeMCell available, with different pinouts:
+  - v1.0.0
+  - v2.0.0 (pre-release v1.0.1, v1.0.2)
+Default official firmware only supports v2.0.0 STeMCell.
+
+STeMCell has support to swap UART and I2C pins, to enable single-wire uart communication in STM chips.
+
+The following additional flags has to be used while compiling, based on the pin used for split communication.
+
+| Split Pin | Compile flags |
+|-----------|---------------|
+| D3        | -e STMC_US=yes|
+| D2        | Not needed    |
+| D1        | -e STMC_IS=yes|
+| D0        | Not needed    |
diff --git a/platforms/chibios/boards/STEMCELL/board/board.mk b/platforms/chibios/boards/STEMCELL/board/board.mk
new file mode 100644
index 0000000000..b0d1c3c404
--- /dev/null
+++ b/platforms/chibios/boards/STEMCELL/board/board.mk
@@ -0,0 +1,15 @@
+# Copyright 2022 Mega Mind (@megamind4089)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Default pin config of nucleo64_411re has most pins in input pull up mode
+
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F411RE/board.c
+
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F411RE
+
+
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/boards/STEMCELL/configs/board.h b/platforms/chibios/boards/STEMCELL/configs/board.h
new file mode 100644
index 0000000000..39cf79ab09
--- /dev/null
+++ b/platforms/chibios/boards/STEMCELL/configs/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Mega Mind (@megamind4089)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSE_BYPASS
diff --git a/platforms/chibios/boards/STEMCELL/configs/chconf.h b/platforms/chibios/boards/STEMCELL/configs/chconf.h
new file mode 100644
index 0000000000..d25bea0d17
--- /dev/null
+++ b/platforms/chibios/boards/STEMCELL/configs/chconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Mega Mind (@megamind4089)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define CH_CFG_ST_RESOLUTION 16
+#define CH_CFG_ST_FREQUENCY 10000
+
+#include_next <chconf.h>
diff --git a/platforms/chibios/boards/STEMCELL/configs/config.h b/platforms/chibios/boards/STEMCELL/configs/config.h
new file mode 100644
index 0000000000..82f6c63636
--- /dev/null
+++ b/platforms/chibios/boards/STEMCELL/configs/config.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Mega Mind(@megamind4089)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
+
+/**======================
+ **    I2C Driver
+ *========================**/
+
+#if !defined(I2C1_SDA_PIN)
+#    define I2C1_SDA_PIN D0
+#endif
+
+#if !defined(I2C1_SCL_PIN)
+#    define I2C1_SCL_PIN D1
+#endif
+
+/**======================
+ **      SERIAL Driver
+ *========================**/
+
+#if !defined(SERIAL_USART_DRIVER)
+#    define SERIAL_USART_DRIVER SD2
+#endif
+
diff --git a/platforms/chibios/boards/STEMCELL/configs/halconf.h b/platforms/chibios/boards/STEMCELL/configs/halconf.h
new file mode 100644
index 0000000000..f38949e626
--- /dev/null
+++ b/platforms/chibios/boards/STEMCELL/configs/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2022 Mega Mind (@megamind4089)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define PAL_USE_WAIT TRUE
+#define PAL_USE_CALLBACKS TRUE
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/platforms/chibios/boards/STEMCELL/configs/mcuconf.h b/platforms/chibios/boards/STEMCELL/configs/mcuconf.h
new file mode 100644
index 0000000000..621d3fcace
--- /dev/null
+++ b/platforms/chibios/boards/STEMCELL/configs/mcuconf.h
@@ -0,0 +1,231 @@
+// Copyright 2022 Mega Mind (@megamind4089)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * STM32F4xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F4xx_MCUCONF
+#define STM32F411_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_CLOCK48_REQUIRED              TRUE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLM_VALUE                    8
+#define STM32_PLLN_VALUE                    336
+#define STM32_PLLP_VALUE                    4
+#define STM32_PLLQ_VALUE                    7
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV1
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+#define STM32_RTCPRE_VALUE                  8
+#define STM32_MCO1SEL                       STM32_MCO1SEL_HSI
+#define STM32_MCO1PRE                       STM32_MCO1PRE_DIV1
+#define STM32_MCO2SEL                       STM32_MCO2SEL_SYSCLK
+#define STM32_MCO2PRE                       STM32_MCO2PRE_DIV5
+#define STM32_I2SSRC                        STM32_I2SSRC_CKIN
+#define STM32_PLLI2SN_VALUE                 192
+#define STM32_PLLI2SR_VALUE                 5
+
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           15
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           6
+#define STM32_IRQ_EXTI20_PRIORITY           6
+#define STM32_IRQ_EXTI21_PRIORITY           15
+#define STM32_IRQ_EXTI22_PRIORITY           15
+
+#define STM32_IRQ_TIM1_BRK_TIM9_PRIORITY    7
+#define STM32_IRQ_TIM1_UP_TIM10_PRIORITY    7
+#define STM32_IRQ_TIM1_TRGCO_TIM11_PRIORITY 7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+#define STM32_IRQ_TIM2_PRIORITY             7
+#define STM32_IRQ_TIM3_PRIORITY             7
+#define STM32_IRQ_TIM4_PRIORITY             7
+#define STM32_IRQ_TIM5_PRIORITY             7
+
+#define STM32_IRQ_USART1_PRIORITY           12
+#define STM32_IRQ_USART2_PRIORITY           12
+#define STM32_IRQ_USART6_PRIORITY           12
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(2, 4)
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              6
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     6
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM9                  FALSE
+#define STM32_GPT_USE_TIM10                 FALSE
+#define STM32_GPT_USE_TIM11                 FALSE
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_USE_I2C3                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C3_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_I2C3_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * I2S driver system settings.
+ */
+#define STM32_I2S_USE_SPI2                  FALSE
+#define STM32_I2S_USE_SPI3                  FALSE
+#define STM32_I2S_SPI2_IRQ_PRIORITY         10
+#define STM32_I2S_SPI3_IRQ_PRIORITY         10
+#define STM32_I2S_SPI2_DMA_PRIORITY         1
+#define STM32_I2S_SPI3_DMA_PRIORITY         1
+#define STM32_I2S_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_I2S_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2S_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_I2S_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2S_DMA_ERROR_HOOK(i2sp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM9                  FALSE
+#define STM32_ICU_USE_TIM10                 FALSE
+#define STM32_ICU_USE_TIM11                 FALSE
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM9                  FALSE
+#define STM32_PWM_USE_TIM10                 FALSE
+#define STM32_PWM_USE_TIM11                 FALSE
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             TRUE
+#define STM32_SERIAL_USE_USART2             TRUE
+#define STM32_SERIAL_USE_USART6             FALSE
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 0)
+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 3)
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_SPI_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART6               FALSE
+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 5)
+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)
+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)
+#define STM32_UART_USART6_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 2)
+#define STM32_UART_USART6_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART6_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_OTG1                  TRUE
+#define STM32_USB_OTG1_IRQ_PRIORITY         14
+#define STM32_USB_OTG1_RX_FIFO_SIZE         512
+#define STM32_USB_HOST_WAKEUP_DURATION      2
+
+/*
+ * WDG driver system settings.
+ */
+#define STM32_WDG_USE_IWDG                  FALSE
+
+#endif /* MCUCONF_H */
diff --git a/platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h b/platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h
new file mode 100644
index 0000000000..f5dd55905d
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h
@@ -0,0 +1,57 @@
+// Copyright 2022 Mega Mind (@megamind4089)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Pindefs for v2.0.0
+// https://megamind4089.github.io/STeMCell/pinout/
+
+// Left side (front)
+#ifdef STEMCELL_UART_SWAP
+#    define D3 PAL_LINE(GPIOA, 3)
+#    define D2 PAL_LINE(GPIOA, 2)
+#else
+#    define D3 PAL_LINE(GPIOA, 2)
+#    define D2 PAL_LINE(GPIOA, 3)
+#endif
+//      GND
+//      GND
+#ifdef STEMCELL_I2C_SWAP
+#    define D1 PAL_LINE(GPIOB, 6)
+#    define D0 PAL_LINE(GPIOB, 7)
+#else
+#    define D1 PAL_LINE(GPIOB, 7)
+#    define D0 PAL_LINE(GPIOB, 6)
+#endif
+
+#define D4 PAL_LINE(GPIOA, 15)
+#define C6 PAL_LINE(GPIOB, 3)
+#define D7 PAL_LINE(GPIOB, 4)
+#define E6 PAL_LINE(GPIOB, 5)
+#define B4 PAL_LINE(GPIOB, 8)
+#define B5 PAL_LINE(GPIOB, 9)
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 PAL_LINE(GPIOB, 10)
+#define F5 PAL_LINE(GPIOB, 2)
+#define F6 PAL_LINE(GPIOB, 1)
+#define F7 PAL_LINE(GPIOB, 0)
+
+#define B1 PAL_LINE(GPIOA, 5)
+#define B3 PAL_LINE(GPIOA, 6)
+#define B2 PAL_LINE(GPIOA, 7)
+#define B6 PAL_LINE(GPIOA, 4)
+
+// Extra elite-c compatible pinout
+#define B7 PAL_LINE(GPIOC, 13)
+#define D5 PAL_LINE(GPIOC, 14)
+#define C7 PAL_LINE(GPIOC, 15)
+#define F1 PAL_LINE(GPIOA, 0)
+#define F0 PAL_LINE(GPIOA, 1)
+
+// TX/RX pins of promicro
+#define B0 PAL_LINE(GPIOA, 9) // unconnected pin
diff --git a/platforms/chibios/converters/promicro_to_stemcell/converter.mk b/platforms/chibios/converters/promicro_to_stemcell/converter.mk
new file mode 100644
index 0000000000..525492f96c
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_stemcell/converter.mk
@@ -0,0 +1,22 @@
+# Copyright 2022 Mega Mind (@megamind4089)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+MCU := STM32F411
+BOARD := STEMCELL
+BOOTLOADER := tinyuf2
+
+SERIAL_DRIVER ?= usart
+WS2812_DRIVER ?= bitbang
+
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = legacy
+
+
+ifeq ($(strip $(STMC_US)), yes)
+  OPT_DEFS += -DSTEMCELL_UART_SWAP
+endif
+
+ifeq ($(strip $(STMC_IS)), yes)
+  OPT_DEFS += -DSTEMCELL_I2C_SWAP
+endif
+

From 9f31fcace33b923b846182fccbaddaf174cb7a94 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 14 Aug 2022 09:03:40 -0700
Subject: [PATCH 199/959] [Keyboard] Fix compilation issues for Boardsource
 Microdox (#18037)

---
 keyboards/boardsource/microdox/v2/config.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
index 50207651ab..b2e6ba9335 100644
--- a/keyboards/boardsource/microdox/v2/config.h
+++ b/keyboards/boardsource/microdox/v2/config.h
@@ -1,6 +1,8 @@
 // Copyright 2022 jack (@waffle87)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+
+#undef RGB_DI_PIN
 #define RGB_DI_PIN B5
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define DRIVER_LED_TOTAL 44

From 0a6327d20c9cb63c80da2aff6e84c5b2d62c66e3 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sun, 14 Aug 2022 18:18:42 +0200
Subject: [PATCH 200/959] Replace ; by : in the shifted symbols ASCII art of
 keymap_norman (#18029)

Thanks!
---
 quantum/keymap_extras/keymap_norman.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/keymap_norman.h b/quantum/keymap_extras/keymap_norman.h
index 7a5c1cbeb2..9f20f66873 100644
--- a/quantum/keymap_extras/keymap_norman.h
+++ b/quantum/keymap_extras/keymap_norman.h
@@ -89,7 +89,7 @@
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
  * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │ ; │ { │ } │  |  │
+ * │     │   │   │   │   │   │   │   │   │   │ : │ { │ } │  |  │
  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
  * │      │   │   │   │   │   │   │   │   │   │   │ " │        │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤

From 4da34828720d6daa9fd45d811129370cf11ba874 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 14 Aug 2022 09:18:59 -0700
Subject: [PATCH 201/959] Fix Emulated EEPROM issue with F466 (#18039)

---
 builddefs/common_features.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 3d416773f7..a23b5e82b9 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -212,7 +212,7 @@ else
     ifeq ($(PLATFORM),AVR)
       # Automatically provided by avr-libc, nothing required
     else ifeq ($(PLATFORM),CHIBIOS)
-      ifneq ($(filter STM32F3xx_% STM32F1xx_% STM32F4xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+      ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
         # Emulated EEPROM
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
         COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash

From 6fc7c03e9581ddde68b32f2f76f8053628da6465 Mon Sep 17 00:00:00 2001
From: Chewxy <chewxy@gmail.com>
Date: Mon, 15 Aug 2022 05:24:52 +1000
Subject: [PATCH 202/959] Added emacs as an "operating system" for input mode. 
 (#16949)

---
 docs/feature_unicode.md                       |  3 +-
 .../process_keycode/process_unicode_common.c  | 40 ++++++++++++++++---
 .../process_keycode/process_unicode_common.h  |  1 +
 quantum/quantum_keycodes.h                    |  3 ++
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
index bced419a03..2389cb735c 100644
--- a/docs/feature_unicode.md
+++ b/docs/feature_unicode.md
@@ -127,7 +127,7 @@ The following input modes are available:
   By default, this mode uses Ctrl+Shift+U (`LCTL(LSFT(KC_U))`) to start Unicode input, but this can be changed by defining [`UNICODE_KEY_LNX`](#input-key-configuration) with a different keycode. This might be required for IBus versions ≥1.5.15, where Ctrl+Shift+U behavior is consolidated into Ctrl+Shift+E.
 
   Users who wish support in non-GTK apps without IBus may need to resort to a more indirect method, such as creating a custom keyboard layout ([more on this method](#custom-linux-layout)).
-  
+
 * **`UC_WIN`**: _(not recommended)_ Windows built-in hex numpad Unicode input. Supports code points up to `0xFFFF`.
 
   To enable, create a registry key under `HKEY_CURRENT_USER\Control Panel\Input Method` of type `REG_SZ` called `EnableHexNumpad` and set its value to `1`. This can be done from the Command Prompt by running `reg add "HKCU\Control Panel\Input Method" -v EnableHexNumpad -t REG_SZ -d 1` with administrator privileges. Reboot afterwards.
@@ -172,6 +172,7 @@ You can switch the input mode at any time by using the following keycodes. Addin
 |`UNICODE_MODE_WIN`    |`UC_M_WI`|`UC_WIN`    |Switch to Windows input                                                      |
 |`UNICODE_MODE_BSD`    |`UC_M_BS`|`UC_BSD`    |Switch to BSD input _(not implemented)_                                      |
 |`UNICODE_MODE_WINC`   |`UC_M_WC`|`UC_WINC`   |Switch to Windows input using WinCompose                                     |
+|`UNICODE_MODE_EMACS`  |`UC_M_EM`|`UC_EMACS`  |Switch to emacs (`C-x-8 RET`)                                               |
 
 You can also switch the input mode by calling `set_unicode_input_mode(x)` in your code, where _x_ is one of the above input mode constants (e.g. `UC_LNX`).
 
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 6cb2ba8dbb..8de31c055c 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -117,6 +117,12 @@ __attribute__((weak)) void unicode_input_start(void) {
             tap_code(UNICODE_KEY_WINC);
             tap_code(KC_U);
             break;
+        case UC_EMACS:
+            // The usual way to type unicode in emacs is C-x-8 <RET> then the unicode number in hex
+            tap_code16(LCTL(KC_X));
+            tap_code16(KC_8);
+            tap_code16(KC_ENTER);
+            break;
     }
 
     wait_ms(UNICODE_TYPE_DELAY);
@@ -142,6 +148,9 @@ __attribute__((weak)) void unicode_input_finish(void) {
         case UC_WINC:
             tap_code(KC_ENTER);
             break;
+        case UC_EMACS:
+            tap_code16(KC_ENTER);
+            break;
     }
 
     set_mods(unicode_saved_mods); // Reregister previously set mods
@@ -167,6 +176,9 @@ __attribute__((weak)) void unicode_input_cancel(void) {
                 tap_code(KC_NUM_LOCK);
             }
             break;
+        case UC_EMACS:
+            tap_code16(LCTL(KC_G)); // C-g cancels
+            break;
     }
 
     set_mods(unicode_saved_mods); // Reregister previously set mods
@@ -299,14 +311,30 @@ bool process_unicode_common(uint16_t keycode, keyrecord_t *record) {
                 cycle_unicode_input_mode(shifted ? +1 : -1);
                 audio_helper();
                 break;
-
-            case UNICODE_MODE_MAC ... UNICODE_MODE_WINC: {
-                // Keycodes and input modes follow the same ordering
-                uint8_t delta = keycode - UNICODE_MODE_MAC;
-                set_unicode_input_mode(UC_MAC + delta);
+            case UNICODE_MODE_MAC:
+                set_unicode_input_mode(UC_MAC);
+                audio_helper();
+                break;
+            case UNICODE_MODE_LNX:
+                set_unicode_input_mode(UC_LNX);
+                audio_helper();
+                break;
+            case UNICODE_MODE_WIN:
+                set_unicode_input_mode(UC_WIN);
+                audio_helper();
+                break;
+            case UNICODE_MODE_BSD:
+                set_unicode_input_mode(UC_BSD);
+                audio_helper();
+                break;
+            case UNICODE_MODE_WINC:
+                set_unicode_input_mode(UC_WINC);
+                audio_helper();
+                break;
+            case UNICODE_MODE_EMACS:
+                set_unicode_input_mode(UC_EMACS);
                 audio_helper();
                 break;
-            }
         }
     }
 
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index 8a4494c939..15e798dbb3 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -64,6 +64,7 @@ enum unicode_input_modes {
     UC_WIN,   // Windows using EnableHexNumpad
     UC_BSD,   // BSD (not implemented)
     UC_WINC,  // Windows using WinCompose (https://github.com/samhocevar/wincompose)
+    UC_EMACS, // Emacs is an operating system in search of a good text editor
     UC__COUNT // Number of available input modes (always leave at the end)
 };
 
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 7228ee9e08..c8f03fa1ce 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -609,6 +609,8 @@ enum quantum_keycodes {
     MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
     MAGIC_TOGGLE_ESCAPE_CAPSLOCK,
 
+    UNICODE_MODE_EMACS,
+
     // Start of custom keycode range for keyboards and keymaps - always leave at the end
     SAFE_RANGE
 };
@@ -894,6 +896,7 @@ enum quantum_keycodes {
 #define UC_M_WI UNICODE_MODE_WIN
 #define UC_M_BS UNICODE_MODE_BSD
 #define UC_M_WC UNICODE_MODE_WINC
+#define UC_M_EM UNICODE_MODE_EMACS
 
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))

From 95c43a275984fb57cdf6e5afd02190700e0205bc Mon Sep 17 00:00:00 2001
From: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
Date: Sun, 14 Aug 2022 12:25:32 -0700
Subject: [PATCH 203/959] Fix Caps Word to treat mod-taps more consistently.
 (#17463)

* Fix Caps Word to treat mod-taps more consistently.

Previously, holding any mod-tap key while Caps Word is active stops Caps
Word, and this happens regardless of `caps_word_press_user()`. Yet for
regular mod keys, AltGr (KC_RALT) is ignored, Shift keys are passed to
`caps_word_press_user()` to determine whether to continue, and
similarly, a key `RSFT(KC_RALT)` representing Right Shift + Alt is
passed to `caps_word_press_user()` to determine whether to continue.

This commit makes held mod-tap keys consistent with regular mod keys:

* Holding a `RALT_T` mod-tap is ignored.
* When holding a shift mod-tap key, `KC_LSFT` or `KC_RSFT` is passed to
  `caps_word_press_user()` to determine whether to continue.
* When holding a Right Shift + Alt (`RSA_T`) mod-tap, `RSFT(KC_RALT)` is
  passed to `caps_word_press_user()`.

Particularly, with this fix a user may choose to continue Caps Word when
a shift mod-tap key is held by adding `KC_LSFT` and `KC_RSFT` cases in
`caps_word_press_user()`. For instance as

```
bool caps_word_press_user(uint16_t keycode) {
  switch (keycode) {
    // Keycodes that continue Caps Word, with shift applied.
    case KC_A ... KC_Z:
    case KC_MINS:
      add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
      return true;

    // Keycodes that continue Caps Word, without shifting.
    case KC_1 ... KC_0:
    case KC_BSPC:
    case KC_DEL:
    case KC_UNDS:
    case KC_LSFT:  // <<< Added here.
    case KC_RSFT:
      return true;

    default:
      return false;  // Deactivate Caps Word.
  }
}
```

* Fix Caps Word to treat mod-taps more consistently.

Previously, holding any mod-tap key while Caps Word is active stops Caps
Word, and this happens regardless of `caps_word_press_user()`. Yet for
regular mod keys, AltGr (KC_RALT) is ignored, Shift keys are passed to
`caps_word_press_user()` to determine whether to continue, and
similarly, a key `RSFT(KC_RALT)` representing Right Shift + Alt is
passed to `caps_word_press_user()` to determine whether to continue.

This commit makes held mod-tap keys consistent with regular mod keys:

* Holding a `RALT_T` mod-tap is ignored.
* When holding a shift mod-tap key, `KC_LSFT` or `KC_RSFT` is passed to
  `caps_word_press_user()` to determine whether to continue.
* When holding a Right Shift + Alt (`RSA_T`) mod-tap, `RSFT(KC_RALT)` is
  passed to `caps_word_press_user()`.

Particularly, with this fix a user may choose to continue Caps Word when
a shift mod-tap key is held by adding `KC_LSFT` and `KC_RSFT` cases in
`caps_word_press_user()`. For instance as

```
bool caps_word_press_user(uint16_t keycode) {
  switch (keycode) {
    // Keycodes that continue Caps Word, with shift applied.
    case KC_A ... KC_Z:
    case KC_MINS:
      add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
      return true;

    // Keycodes that continue Caps Word, without shifting.
    case KC_1 ... KC_0:
    case KC_BSPC:
    case KC_DEL:
    case KC_UNDS:
    case KC_LSFT:  // <<< Added here.
    case KC_RSFT:
      return true;

    default:
      return false;  // Deactivate Caps Word.
  }
}
```

* Update quantum/process_keycode/process_caps_word.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 quantum/process_keycode/process_caps_word.c |  32 +++-
 tests/caps_word/test_caps_word.cpp          | 159 ++++++++++++++++++++
 2 files changed, 185 insertions(+), 6 deletions(-)

diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index bc4369846c..1b9583196d 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -101,14 +101,34 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
                 return true;
 
 #ifndef NO_ACTION_TAPPING
+            // Corresponding to mod keys above, a held mod-tap is handled as:
+            // * For shift mods, pass KC_LSFT or KC_RSFT to
+            //   caps_word_press_user() to determine whether to continue.
+            // * For Shift + AltGr (MOD_RSFT | MOD_RALT), pass RSFT(KC_RALT).
+            // * AltGr (MOD_RALT) is ignored.
+            // * Otherwise stop Caps Word.
             case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-                if (record->tap.count == 0) {
-                    // Deactivate if a mod becomes active through holding
-                    // a mod-tap key.
-                    caps_word_off();
-                    return true;
+                if (record->tap.count == 0) { // Mod-tap key is held.
+                    const uint8_t mods = (keycode >> 8) & 0x1f;
+                    switch (mods) {
+                        case MOD_LSFT:
+                            keycode = KC_LSFT;
+                            break;
+                        case MOD_RSFT:
+                            keycode = KC_RSFT;
+                            break;
+                        case MOD_RSFT | MOD_RALT:
+                            keycode = RSFT(KC_RALT);
+                            break;
+                        case MOD_RALT:
+                            return true;
+                        default:
+                            caps_word_off();
+                            return true;
+                    }
+                } else {
+                    keycode &= 0xff;
                 }
-                keycode &= 0xff;
                 break;
 
 #    ifndef NO_ACTION_LAYER
diff --git a/tests/caps_word/test_caps_word.cpp b/tests/caps_word/test_caps_word.cpp
index 0af4b0175d..3f59ed3744 100644
--- a/tests/caps_word/test_caps_word.cpp
+++ b/tests/caps_word/test_caps_word.cpp
@@ -25,10 +25,47 @@ using ::testing::AnyOf;
 using ::testing::InSequence;
 using ::testing::TestParamInfo;
 
+namespace {
+
+bool press_user_default(uint16_t keycode) {
+    switch (keycode) {
+        // Keycodes that continue Caps Word, with shift applied.
+        case KC_A ... KC_Z:
+        case KC_MINS:
+            add_weak_mods(MOD_BIT(KC_LSFT)); // Apply shift to next key.
+            return true;
+
+        // Keycodes that continue Caps Word, without shifting.
+        case KC_1 ... KC_0:
+        case KC_BSPC:
+        case KC_DEL:
+        case KC_UNDS:
+            return true;
+
+        default:
+            return false; // Deactivate Caps Word.
+    }
+}
+
+uint16_t passed_keycode;
+bool     press_user_save_passed_keycode(uint16_t keycode) {
+    passed_keycode = keycode;
+    return true;
+}
+
+bool (*press_user_fun)(uint16_t) = press_user_default;
+
+extern "C" {
+bool caps_word_press_user(uint16_t keycode) {
+    return press_user_fun(keycode);
+}
+} // extern "C"
+
 class CapsWord : public TestFixture {
    public:
     void SetUp() override {
         caps_word_off();
+        press_user_fun = press_user_default;
     }
 };
 
@@ -226,6 +263,126 @@ TEST_F(CapsWord, ShiftsAltGrSymbols) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 }
 
+// Tests typing "AltGr + A" using a mod-tap key.
+TEST_F(CapsWord, ShiftsModTapAltGrSymbols) {
+    TestDriver driver;
+    KeymapKey  key_a(0, 0, 0, KC_A);
+    KeymapKey  key_altgr_t(0, 1, 0, RALT_T(KC_B));
+    set_keymap({key_a, key_altgr_t});
+
+    // Allow any number of reports with no keys or only modifiers.
+    // clang-format off
+    EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
+                KeyboardReport(),
+                KeyboardReport(KC_RALT),
+                KeyboardReport(KC_LSFT, KC_RALT))))
+        .Times(AnyNumber());
+    // Expect "Shift + AltGr + A".
+    EXPECT_REPORT(driver, (KC_LSFT, KC_RALT, KC_A));
+    // clang-format on
+
+    // Turn on Caps Word and type "AltGr + A".
+    caps_word_on();
+
+    key_altgr_t.press();
+    idle_for(TAPPING_TERM + 1);
+    tap_key(key_a);
+    run_one_scan_loop();
+    key_altgr_t.release();
+
+    EXPECT_TRUE(is_caps_word_on());
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+struct CapsWordPressUserParams {
+    std::string name;
+    uint16_t    keycode;
+    uint16_t    delay_ms;
+    uint16_t    expected_passed_keycode;
+    bool        continues_caps_word;
+
+    static const std::string& GetName(const TestParamInfo<CapsWordPressUserParams>& info) {
+        return info.param.name;
+    }
+};
+
+class CapsWordPressUser : public ::testing::WithParamInterface<CapsWordPressUserParams>, public CapsWord {
+    void SetUp() override {
+        caps_word_on();
+        passed_keycode = KC_NO;
+        press_user_fun = press_user_save_passed_keycode;
+    }
+};
+
+// Tests keycodes passed to caps_word_press_user() function for various keys.
+TEST_P(CapsWordPressUser, KeyCode) {
+    TestDriver driver;
+    KeymapKey  key(0, 0, 0, GetParam().keycode);
+    set_keymap({key});
+
+    EXPECT_ANY_REPORT(driver).Times(AnyNumber());
+    tap_key(key, GetParam().delay_ms);
+
+    EXPECT_EQ(passed_keycode, GetParam().expected_passed_keycode);
+    EXPECT_EQ(is_caps_word_on(), GetParam().continues_caps_word);
+    clear_oneshot_mods();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+const uint16_t LT_1_KC_A = LT(1, KC_A);
+// clang-format off
+INSTANTIATE_TEST_CASE_P(
+    PressUser,
+    CapsWordPressUser,
+    ::testing::Values(
+        CapsWordPressUserParams{
+            "KC_A", KC_A, 1, KC_A, true},
+        CapsWordPressUserParams{
+            "KC_HASH", KC_HASH, 1, KC_HASH, true},
+        CapsWordPressUserParams{
+            "KC_LSFT", KC_LSFT, 1, KC_LSFT, true},
+        CapsWordPressUserParams{
+            "KC_RSFT", KC_RSFT, 1, KC_RSFT, true},
+        CapsWordPressUserParams{
+            "LSFT_T_tapped", LSFT_T(KC_A), 1, KC_A, true},
+        CapsWordPressUserParams{
+            "LSFT_T_held", LSFT_T(KC_A), TAPPING_TERM + 1, KC_LSFT, true},
+        CapsWordPressUserParams{
+            "RSFT_T_held", RSFT_T(KC_A), TAPPING_TERM + 1, KC_RSFT, true},
+        CapsWordPressUserParams{
+            "RSA_T_held", RSA_T(KC_A), TAPPING_TERM + 1, RSFT(KC_RALT), true},
+        // Holding a mod-tap other than Shift or AltGr stops Caps Word.
+        CapsWordPressUserParams{
+            "LCTL_T_held", LCTL_T(KC_A), TAPPING_TERM + 1, KC_NO, false},
+        CapsWordPressUserParams{
+            "LALT_T_held", LALT_T(KC_A), TAPPING_TERM + 1, KC_NO, false},
+        CapsWordPressUserParams{
+            "LGUI_T_held", LGUI_T(KC_A), TAPPING_TERM + 1, KC_NO, false},
+        // Layer keys are ignored and continue Caps Word.
+        CapsWordPressUserParams{
+            "MO", MO(1), 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "TO", TO(1), 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "TG", TG(1), 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "TT", TT(1), 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "OSL", OSL(1), 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "LT_held", LT_1_KC_A, TAPPING_TERM + 1, KC_NO, true},
+        // AltGr keys are ignored and continue Caps Word.
+        CapsWordPressUserParams{
+            "KC_RALT", KC_RALT, 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "OSM_MOD_RALT", OSM(MOD_RALT), 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "RALT_T_held", RALT_T(KC_A), TAPPING_TERM + 1, KC_NO, true}
+        ),
+    CapsWordPressUserParams::GetName
+    );
+// clang-format on
+
 struct CapsWordBothShiftsParams {
     std::string name;
     uint16_t    left_shift_keycode;
@@ -435,3 +592,5 @@ INSTANTIATE_TEST_CASE_P(
     CapsWordDoubleTapShiftParams::GetName
     );
 // clang-format on
+
+} // namespace

From 463fb72d29e6638f9a28f751e6a1f2a7f9e0bcf8 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 14 Aug 2022 20:48:44 +0100
Subject: [PATCH 204/959] Partially revert some WB32 specific changes (#18038)

---
 platforms/chibios/drivers/ws2812_pwm.c | 18 +++---------------
 platforms/chibios/drivers/ws2812_spi.c | 15 +++++++--------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 8c0259fb91..792de85ce9 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -17,25 +17,13 @@
 #    define WS2812_PWM_CHANNEL 2 // Channel
 #endif
 #ifndef WS2812_PWM_PAL_MODE
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_PWM_PAL_MODE 1 // DI Pin's alternate function value
-#    else
-#        define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
-#    endif
+#    define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
 #endif
 #ifndef WS2812_DMA_STREAM
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_DMA_STREAM WB32_DMA1_STREAM1 // DMA Stream for TIMx_UP
-#    else
-#        define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
-#    endif
+#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
 #endif
 #ifndef WS2812_DMA_CHANNEL
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_DMA_CHANNEL WB32_DMAC_HWHIF_TIM2_UP // DMA Channel for TIM2_UP
-#    else
-#        define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
-#    endif
+#    define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
 #endif
 #if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_DMAMUX_ID)
 #    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index 9ee552b187..a73eb69720 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -5,11 +5,7 @@
 
 // Define the spi your LEDs are plugged to here
 #ifndef WS2812_SPI
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_SPI SPIDQ
-#    else
-#        define WS2812_SPI SPID1
-#    endif
+#    define WS2812_SPI SPID1
 #endif
 
 #ifndef WS2812_SPI_MOSI_PAL_MODE
@@ -20,6 +16,10 @@
 #    define WS2812_SPI_SCK_PAL_MODE 5
 #endif
 
+#ifndef WS2812_SPI_DIVISOR
+#    define WS2812_SPI_DIVISOR 16
+#endif
+
 // Push Pull or Open Drain Configuration
 // Default Push Pull
 #ifndef WS2812_EXTERNAL_PULLUP
@@ -46,7 +46,7 @@
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 8
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1)
-#elif WS2812_SPI_DIVISOR == 16 // same as default
+#elif WS2812_SPI_DIVISOR == 16 // default
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 32
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2)
@@ -57,8 +57,7 @@
 #elif WS2812_SPI_DIVISOR == 256
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #else
-#    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0) // default
-#    define WS2812_SPI_DIVISOR 16
+#    error "Configured WS2812_SPI_DIVISOR value is not supported at this time."
 #endif
 
 // Use SPI circular buffer

From ed3b4bb606dd3729129bfbd0d5fae96a72c7303c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 15 Aug 2022 06:25:16 +0100
Subject: [PATCH 205/959] Fix missing development_board schema entry (#18050)

---
 data/schemas/keyboard.jsonschema | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index c55d66e6bb..2c6a7f527c 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -34,7 +34,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "bluepill", "blackpill_f401", "blackpill_f411"]
+            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411"]
         },
         "pin_compatible": {
             "type": "string",

From 8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Mon, 15 Aug 2022 07:25:37 +0200
Subject: [PATCH 206/959] Remove duplicate COMBINING HORN in
 keymap_us_extended.h (#18045)

---
 quantum/keymap_extras/keymap_us_extended.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/keymap_us_extended.h b/quantum/keymap_extras/keymap_us_extended.h
index fb3e9c7d36..8e71a8de25 100644
--- a/quantum/keymap_extras/keymap_us_extended.h
+++ b/quantum/keymap_extras/keymap_us_extended.h
@@ -145,7 +145,7 @@
 #define US_CURR ALGR(US_4)    // ¤
 #define US_EURO ALGR(US_5)    // €
 #define US_DCIR ALGR(US_6)    // ^ (dead)
-#define US_HORN ALGR(US_7)    // ̛̛  (dead)
+#define US_HORN ALGR(US_7)    // ̛  (dead)
 #define US_OGON ALGR(US_8)    // ˛ (dead)
 #define US_LSQU ALGR(US_9)    // ‘
 #define US_RSQU ALGR(US_0)    // ’

From 5e6175a553dd840a1a43b420097c126ecf770f14 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 15 Aug 2022 07:21:15 -0600
Subject: [PATCH 207/959] Fixup gmmk/pro/rev2 USB Data (#18056)

---
 keyboards/gmmk/pro/rev2/ansi/info.json | 8 +++++++-
 keyboards/gmmk/pro/rev2/iso/info.json  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index c3e76391d1..a78e608f2f 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "GMMK Pro (ANSI)",
+    "keyboard_name": "GMMK Pro ANSI",
+    "manufacturer": "Glorious",
     "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
     "maintainer": "GloriousThrall",
+    "usb": {
+       "vid": "0x320F",
+       "pid": "0x5044",
+       "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index 32fac89336..afec8e275b 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "GMMK Pro (ISO)",
+    "keyboard_name": "GMMK Pro ISO",
+    "manufacturer": "Glorious",
     "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
     "maintainer": "GloriousThrall",
+    "usb": {
+       "vid": "0x320F",
+       "pid": "0x5044",
+       "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

From 8ce946b5c8e7026b5d7337becf4719e2795af9bb Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 15 Aug 2022 16:40:51 +0200
Subject: [PATCH 208/959] [Bug] Add key event check to `is_tap_record` and
 remove `is_tap_key` (#18063)

---
 quantum/action.c                                    | 13 ++++---------
 quantum/action.h                                    |  1 -
 .../default_mod_tap/test_tap_hold.cpp               |  4 ----
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/quantum/action.c b/quantum/action.c
index 83f6e2a970..6b2e9104e0 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -1085,20 +1085,15 @@ void clear_keyboard_but_mods_and_keys() {
 #endif
 }
 
-/** \brief Utilities for actions. (FIXME: Needs better description)
- *
- * FIXME: Needs documentation.
- */
-bool is_tap_key(keypos_t key) {
-    action_t action = layer_switch_get_action(key);
-    return is_tap_action(action);
-}
-
 /** \brief Utilities for actions. (FIXME: Needs better description)
  *
  * FIXME: Needs documentation.
  */
 bool is_tap_record(keyrecord_t *record) {
+    if (IS_NOEVENT(record->event)) {
+        return false;
+    }
+
 #ifdef COMBO_ENABLE
     action_t action;
     if (record->keycode) {
diff --git a/quantum/action.h b/quantum/action.h
index 08e1f6ac29..2bc46429b2 100644
--- a/quantum/action.h
+++ b/quantum/action.h
@@ -105,7 +105,6 @@ void clear_keyboard(void);
 void clear_keyboard_but_mods(void);
 void clear_keyboard_but_mods_and_keys(void);
 void layer_switch(uint8_t new_layer);
-bool is_tap_key(keypos_t key);
 bool is_tap_record(keyrecord_t *record);
 bool is_tap_action(action_t action);
 
diff --git a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
index 687a4e0318..e798265623 100644
--- a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
@@ -140,8 +140,6 @@ TEST_F(DefaultTapHold, tap_regular_key_while_layer_tap_key_is_held) {
 }
 
 TEST_F(DefaultTapHold, tap_mod_tap_hold_key_two_times) {
-    GTEST_SKIP() << "TODO:Holding a modtap key results in out of bounds access to the keymap, this is a bug in QMK.";
-
     TestDriver driver;
     InSequence s;
     auto       mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
@@ -175,8 +173,6 @@ TEST_F(DefaultTapHold, tap_mod_tap_hold_key_two_times) {
 }
 
 TEST_F(DefaultTapHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
-    GTEST_SKIP() << "TODO:Holding a modtap key results in out of bounds access to the keymap, this is a bug in QMK.";
-
     TestDriver driver;
     InSequence s;
     auto       mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));

From f74ed5fc5331b6131538b347dd001e0e6acd23e0 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 15 Aug 2022 19:00:22 +0200
Subject: [PATCH 209/959] Fix GD32VF103 WS2812 PWM driver (#18067)

...by adding the missing STM32 DMA defines.
---
 platforms/chibios/gd32v_compatibility.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platforms/chibios/gd32v_compatibility.h b/platforms/chibios/gd32v_compatibility.h
index a3148fb6d2..d01c3d00a2 100644
--- a/platforms/chibios/gd32v_compatibility.h
+++ b/platforms/chibios/gd32v_compatibility.h
@@ -35,7 +35,9 @@
 #define STM32_DMA_STREAM_ID(peripheral, channel) GD32_DMA_STREAM_ID(peripheral - 1, channel - 1)
 #define STM32_DMA_CR_DIR_M2P GD32_DMA_CTL_DIR_M2P
 #define STM32_DMA_CR_PSIZE_WORD GD32_DMA_CTL_PWIDTH_WORD
+#define STM32_DMA_CR_PSIZE_HWORD GD32_DMA_CTL_PWIDTH_HWORD
 #define STM32_DMA_CR_MSIZE_WORD GD32_DMA_CTL_MWIDTH_WORD
+#define STM32_DMA_CR_MSIZE_BYTE GD32_DMA_CTL_MWIDTH_BYTE
 #define STM32_DMA_CR_MINC GD32_DMA_CTL_MNAGA
 #define STM32_DMA_CR_CIRC GD32_DMA_CTL_CMEN
 #define STM32_DMA_CR_PL GD32_DMA_CTL_PRIO

From 5021cf58ade469560fa0fd018f6b35b2b6f6907f Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Mon, 15 Aug 2022 19:41:05 +0200
Subject: [PATCH 210/959] Fix DV_SCLN and DV_COLN in keymap_spanish_dvorak.h
 (#18043)

---
 quantum/keymap_extras/keymap_spanish_dvorak.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/keymap_extras/keymap_spanish_dvorak.h b/quantum/keymap_extras/keymap_spanish_dvorak.h
index 29c4f1c44a..ea0c93f86a 100644
--- a/quantum/keymap_extras/keymap_spanish_dvorak.h
+++ b/quantum/keymap_extras/keymap_spanish_dvorak.h
@@ -114,8 +114,8 @@
 #define DV_QUES S(DV_QUOT) // ?
 #define DV_IQUE S(DV_IEXL) // ¿
 // Row 2
-#define DV_COLN S(KC_DOT)  // :
-#define DV_SCLN S(KC_COMM) // ;
+#define DV_COLN S(DV_DOT)  // :
+#define DV_SCLN S(DV_COMM) // ;
 #define DV_CIRC S(DV_GRV)  // ^ (dead)
 #define DV_ASTR S(DV_PLUS) // *
 // Row 3

From 6b78d07e647b488569cd6ee8666f2347f47051d9 Mon Sep 17 00:00:00 2001
From: ZhaoYou <gezhaoyou@126.com>
Date: Wed, 17 Aug 2022 15:26:35 +0800
Subject: [PATCH 211/959] [Keyboard] add 'soda/cherish' (#18057)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/soda/cherish/chconf.h               |  25 +++++
 keyboards/soda/cherish/cherish.c              |  18 +++
 keyboards/soda/cherish/cherish.h              |  38 +++++++
 keyboards/soda/cherish/config.h               |  80 ++++++++++++++
 keyboards/soda/cherish/info.json              | 103 ++++++++++++++++++
 .../soda/cherish/keymaps/default/keymap.c     |  33 ++++++
 keyboards/soda/cherish/keymaps/via/keymap.c   |  33 ++++++
 keyboards/soda/cherish/keymaps/via/rules.mk   |   1 +
 keyboards/soda/cherish/mcuconf.h              |  23 ++++
 keyboards/soda/cherish/readme.md              |  30 +++++
 keyboards/soda/cherish/rules.mk               |  21 ++++
 11 files changed, 405 insertions(+)
 create mode 100644 keyboards/soda/cherish/chconf.h
 create mode 100644 keyboards/soda/cherish/cherish.c
 create mode 100644 keyboards/soda/cherish/cherish.h
 create mode 100644 keyboards/soda/cherish/config.h
 create mode 100644 keyboards/soda/cherish/info.json
 create mode 100755 keyboards/soda/cherish/keymaps/default/keymap.c
 create mode 100755 keyboards/soda/cherish/keymaps/via/keymap.c
 create mode 100644 keyboards/soda/cherish/keymaps/via/rules.mk
 create mode 100644 keyboards/soda/cherish/mcuconf.h
 create mode 100644 keyboards/soda/cherish/readme.md
 create mode 100644 keyboards/soda/cherish/rules.mk

diff --git a/keyboards/soda/cherish/chconf.h b/keyboards/soda/cherish/chconf.h
new file mode 100644
index 0000000000..61b37ebf37
--- /dev/null
+++ b/keyboards/soda/cherish/chconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#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/soda/cherish/cherish.c b/keyboards/soda/cherish/cherish.c
new file mode 100644
index 0000000000..76b2481d25
--- /dev/null
+++ b/keyboards/soda/cherish/cherish.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "cherish.h"
diff --git a/keyboards/soda/cherish/cherish.h b/keyboards/soda/cherish/cherish.h
new file mode 100644
index 0000000000..e50da38177
--- /dev/null
+++ b/keyboards/soda/cherish/cherish.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_75_ansi( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, \
+	K500, K501, K502,             K505,                   K509, K510, K511, K512,       K514  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414 }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, K509,  K510,  K511,  K512,  KC_NO, K514 }  \
+}
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
new file mode 100644
index 0000000000..15df7c244f
--- /dev/null
+++ b/keyboards/soda/cherish/config.h
@@ -0,0 +1,80 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A14, A15, B3, B4, B5, B6, B7, B8}
+#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 }
+#define DIODE_DIRECTION COL2ROW
+
+//#define BACKLIGHT_PIN           A6
+//#define BACKLIGHT_PWM_DRIVER    PWMD3
+//#define BACKLIGHT_PWM_CHANNEL   1
+//#define BACKLIGHT_PAL_MODE      1
+//#define BACKLIGHT_LEVELS 6
+//#define BACKLIGHT_BREATHING
+//#define BREATHING_PERIOD 6
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define RGB_DI_PIN A13
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 1
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
\ No newline at end of file
diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json
new file mode 100644
index 0000000000..0b3914eb63
--- /dev/null
+++ b/keyboards/soda/cherish/info.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Cherish-75",
+    "url": "",
+    "maintainer": "qmk",
+    "manufacturer": "gezhaoyou",
+    "usb": {
+        "vid": "0xEB50",
+        "pid": "0xEB52",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1, "w":2},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.5},
+                {"x":1.5, "y":2},
+                {"x":2.5, "y":2},
+                {"x":3.5, "y":2},
+                {"x":4.5, "y":2},
+                {"x":5.5, "y":2},
+                {"x":6.5, "y":2},
+                {"x":7.5, "y":2},
+                {"x":8.5, "y":2},
+                {"x":9.5, "y":2},
+                {"x":10.5, "y":2},
+                {"x":11.5, "y":2},
+                {"x":12.5, "y":2},
+                {"x":13.5, "y":2, "w":1.5},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.75},
+                {"x":1.75, "y":3},
+                {"x":2.75, "y":3},
+                {"x":3.75, "y":3},
+                {"x":4.75, "y":3},
+                {"x":5.75, "y":3},
+                {"x":6.75, "y":3},
+                {"x":7.75, "y":3},
+                {"x":8.75, "y":3},
+                {"x":9.75, "y":3},
+                {"x":10.75, "y":3},
+                {"x":11.75, "y":3},
+                {"x":12.75, "y":3, "w":2.25},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":2.25},
+                {"x":2.25, "y":4},
+                {"x":3.25, "y":4},
+                {"x":4.25, "y":4},
+                {"x":5.25, "y":4},
+                {"x":6.25, "y":4},
+                {"x":7.25, "y":4},
+                {"x":8.25, "y":4},
+                {"x":9.25, "y":4},
+                {"x":10.25, "y":4},
+                {"x":11.25, "y":4},
+                {"x":12.25, "y":4, "w":1.75},
+                {"x":14, "y":4},
+                {"x":15, "y":4},
+
+                {"x":0, "y":5, "w":1.25},
+                {"x":1.25, "y":5, "w":1.25},
+                {"x":2.5, "y":5, "w":1.25},
+                {"x":3.75, "y":5, "w":6.25},
+                {"x":10, "y":5},
+                {"x":11, "y":5},
+                {"x":12, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/soda/cherish/keymaps/default/keymap.c b/keyboards/soda/cherish/keymaps/default/keymap.c
new file mode 100755
index 0000000000..3927f7f222
--- /dev/null
+++ b/keyboards/soda/cherish/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_75_ansi(
+    	KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, 
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
+		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+   [1] = LAYOUT_75_ansi(
+   		RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUD, RGB_SAD),
+};
diff --git a/keyboards/soda/cherish/keymaps/via/keymap.c b/keyboards/soda/cherish/keymaps/via/keymap.c
new file mode 100755
index 0000000000..3927f7f222
--- /dev/null
+++ b/keyboards/soda/cherish/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_75_ansi(
+    	KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, 
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
+		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+   [1] = LAYOUT_75_ansi(
+   		RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUD, RGB_SAD),
+};
diff --git a/keyboards/soda/cherish/keymaps/via/rules.mk b/keyboards/soda/cherish/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/soda/cherish/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/soda/cherish/mcuconf.h b/keyboards/soda/cherish/mcuconf.h
new file mode 100644
index 0000000000..033c89fa82
--- /dev/null
+++ b/keyboards/soda/cherish/mcuconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_DMA
+#define STM32_I2C_USE_DMA FALSE
+
diff --git a/keyboards/soda/cherish/readme.md b/keyboards/soda/cherish/readme.md
new file mode 100644
index 0000000000..d30ea11e4c
--- /dev/null
+++ b/keyboards/soda/cherish/readme.md
@@ -0,0 +1,30 @@
+# CHERISH-75
+
+A customizable 75%  keyboard, support both HOTSWAP and SOLDER.
+
+* Keyboard Maintainer: [gezhaoyou](https://github.com/gezhaoyou)
+* Hardware Supported: [gezhaoyou](https://github.com/gezhaoyou)
+* Hardware Availability: [Cherish-75](https://github.com/gezhaoyou/Cherish-75)
+
+Make example for this keyboard (after setting up your build environment):
+
+**default**:
+
+```shell
+qmk compile -kb soda/cherish -km default
+```
+
+**via:**
+
+```shell
+qmk compile -kb soda/cherish -km via
+```
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset]  on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk
new file mode 100644
index 0000000000..490b5aab76
--- /dev/null
+++ b/keyboards/soda/cherish/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = 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 = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From a645301c827705b04c8f19182153a1962c5c7bcb Mon Sep 17 00:00:00 2001
From: David Hoelscher <infinityis@users.noreply.github.com>
Date: Wed, 17 Aug 2022 19:01:54 -0500
Subject: [PATCH 212/959] Add Bonsai C4 converter (#17711)

---
 data/mappings/defaults.json                   |  6 ++
 data/schemas/keyboard.jsonschema              |  2 +-
 docs/feature_converters.md                    | 31 ++++++--
 .../bonsai_c4_template/bonsai_c4_template.c   | 23 ++++++
 .../custommk/bonsai_c4_template/config.h      | 79 +++++++++++++++++++
 .../custommk/bonsai_c4_template/halconf.h     | 35 ++++++++
 .../custommk/bonsai_c4_template/mcuconf.h     | 35 ++++++++
 .../custommk/bonsai_c4_template/readme.md     | 10 +++
 .../promicro_to_bonsai_c4/_pin_defs.h         | 40 ++++++++++
 .../promicro_to_bonsai_c4/converter.mk        |  4 +
 10 files changed, 256 insertions(+), 9 deletions(-)
 create mode 100644 keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c
 create mode 100644 keyboards/custommk/bonsai_c4_template/config.h
 create mode 100644 keyboards/custommk/bonsai_c4_template/halconf.h
 create mode 100644 keyboards/custommk/bonsai_c4_template/mcuconf.h
 create mode 100644 keyboards/custommk/bonsai_c4_template/readme.md
 create mode 100644 platforms/chibios/converters/promicro_to_bonsai_c4/_pin_defs.h
 create mode 100644 platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk

diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json
index 2c9fb317c9..c855e64d33 100644
--- a/data/mappings/defaults.json
+++ b/data/mappings/defaults.json
@@ -60,6 +60,12 @@
             "bootloader": "tinyuf2",
             "board": "STEMCELL",
             "pin_compatible": "promicro"
+        },
+        "bonsai_c4": {
+            "processor": "STM32F411",
+            "bootloader": "stm32-dfu",
+            "board": "GENERIC_STM32_F411XE",
+            "pin_compatible": "promicro"
         }
     }
 }
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 2c6a7f527c..77c5a584d4 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -34,7 +34,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411"]
+            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"]
         },
         "pin_compatible": {
             "type": "string",
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 936ab44559..fe12254efe 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -16,6 +16,7 @@ Currently the following converters are available:
 | `promicro` | `blok`            |
 | `promicro` | `bit_c_pro`       |
 | `promicro` | `stemcell`        |
+| `promicro` | `bonsai_c4`       |
 
 See below for more in depth information on each converter.
 
@@ -50,14 +51,15 @@ Once a converter is enabled, it exposes the `CONVERT_TO_<target_uppercase>` flag
 
 If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.com/products/12640) (or compatible board), the supported alternative controllers are:
 
-| Device                                                                 | Target            |
-|------------------------------------------------------------------------|-------------------|
-| [Proton C](https://qmk.fm/proton-c/)                                   | `proton_c`        |
-| [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040)          | `kb2040`          |
-| [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) | `promicro_rp2040` |
-| [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)         | `blok`            |
-| [Bit-C PRO](https://nullbits.co/bit-c-pro)                             | `bit_c_pro`       |
-| [STeMCell](https://github.com/megamind4089/STeMCell)                   | `stemcell`        |
+| Device                                                                                   | Target            |
+|------------------------------------------------------------------------------------------|-------------------|
+| [Proton C](https://qmk.fm/proton-c/)                                                     | `proton_c`        |
+| [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040)                            | `kb2040`          |
+| [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288)                   | `promicro_rp2040` |
+| [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)                           | `blok`            |
+| [Bit-C PRO](https://nullbits.co/bit-c-pro)                                               | `bit_c_pro`       |
+| [STeMCell](https://github.com/megamind4089/STeMCell)                                     | `stemcell`        |
+| [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4`       |
 
 Converter summary:
 
@@ -69,6 +71,7 @@ Converter summary:
 | `blok`            | `-e CONVERT_TO=blok`            | `CONVERT_TO=blok`            | `#ifdef CONVERT_TO_BLOK`            |
 | `bit_c_pro`       | `-e CONVERT_TO=bit_c_pro`       | `CONVERT_TO=bit_c_pro`       | `#ifdef CONVERT_TO_BIT_C_PRO`       |
 | `stemcell`        | `-e CONVERT_TO=stemcell`        | `CONVERT_TO=stemcell`        | `#ifdef CONVERT_TO_STEMCELL`        |
+| `bonsai_c4`       | `-e CONVERT_TO=bonsai_c4`       | `CONVERT_TO=bonsai_c4`       | `#ifdef CONVERT_TO_BONSAI_C4`       |
 
 ### Proton C :id=proton_c
 
@@ -121,3 +124,15 @@ The following additional flags has to be used while compiling, based on the pin
 | D2        | Not needed    |
 | D1        | -e STMC_IS=yes|
 | D0        | Not needed    |
+
+### Bonsai C4 :id=bonsai_c4
+
+The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro TXLED (D5) and RXLED (B0) are mapped to it. If you want only one of them mapped, you can undefine one and redefine it to another pin by adding these line to your `config.h`:
+
+```c
+#undef B0
+// If Vbus detection is unused, we can send RXLED to the Vbus detect pin instead
+#define B0 PAL_LINE(GPIOA, 9)
+```
+
+No peripherals are enabled by default at this time, but example code to enable SPI, I2C, PWM, and Serial communications can be found [here](/keyboards/custommk/bonsai_c4_template) 
\ No newline at end of file
diff --git a/keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c b/keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c
new file mode 100644
index 0000000000..2129a712cf
--- /dev/null
+++ b/keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c
@@ -0,0 +1,23 @@
+/* Copyright 2022 customMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Set up SPI slave select pin
+void keyboard_post_init_kb(void) {
+    #ifdef EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN
+        setPinOutput(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN);
+        writePinHigh(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN);
+    #endif
+}
diff --git a/keyboards/custommk/bonsai_c4_template/config.h b/keyboards/custommk/bonsai_c4_template/config.h
new file mode 100644
index 0000000000..192e9b0755
--- /dev/null
+++ b/keyboards/custommk/bonsai_c4_template/config.h
@@ -0,0 +1,79 @@
+/* Copyright 2022 customMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+// This file includes example #defines to enable commonly-used functionality 
+// (SPI, PWM backlight, etc.) on specific pins. Capabilities you want to include
+// should be added to the config.h for your keyboard. Not all capabilities are
+// shown; for example:
+// I2C is not shown because the QMK defaults are sufficient for SCL on B6 and SDA on B7
+// Serial communications (for split keyboards) is not shown because QMK defaults work
+// for either pins A15 or B6
+
+// If you need to change pins for PWM, SPI, I2C, or Serial communications, be aware that
+// doing this may require changing the driver, channel, PAL (Pin ALternate function) mode, 
+// DMA stream, and/or DMA channel.
+
+
+// Bonsai C4 wires up pin A9 for Vbus sensing pin by default. For spilt keyboards, this
+// can be used to determine which half of the keyboard is plugged into USB.
+// For boards using Bonsai C4 merely as a reference design, the VBUS sense pin A9
+// can be used for purposes other than Vbus sensing (e.g. the switch
+// matrix).
+//
+// If A9 is needed for Vbus sensing, uncomment the line
+// below. Most keyboards using Bonsai C4 can leave the line below
+// commented out.
+//
+// #undef BOARD_OTG_NOVBUSSENS 
+
+// FRAM configuration
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A0
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 8 // 96MHz / 8 = 12MHz; max supported by MB85R64 is 20MHz
+#define EXTERNAL_EEPROM_PAGE_SIZE 64 // does not matter for FRAM, just sets the RAM buffer size in STM32F chip
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
+
+// External flash configuration
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B12
+#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 1  // 96MHz; max supported by W25Q128JV is 133MHz
+#define EXTERNAL_FLASH_BYTE_COUNT (16 * 1024 * 1024)  //128Mbit or 16MByte
+#define EXTERNAL_FLASH_PAGE_SIZE 256
+#define EXTERNAL_FLASH_SPI_TIMEOUT 200000 //datasheet max is 200 seconds for flash chip erase
+
+// SPI Configuration (needed for FRAM and FLASH)
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+// Example code to set up PWM backlight on pin A6
+// If a different pin is used, a different PWM driver/channel settings may be necessary
+#define BACKLIGHT_PIN A6
+#define BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_CHANNEL 1
+
+// Example code for WS2812 underglow
+// Only pin A10 is wired to send 5V signals to the WS2812
+// This also usually requires adding special wiring during board assembly
+#define RGB_DI_PIN A10
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
diff --git a/keyboards/custommk/bonsai_c4_template/halconf.h b/keyboards/custommk/bonsai_c4_template/halconf.h
new file mode 100644
index 0000000000..a90ea163f3
--- /dev/null
+++ b/keyboards/custommk/bonsai_c4_template/halconf.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 customMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// If you are using I2C (e.g. for OLED), include this line
+#define HAL_USE_I2C TRUE
+
+// If you are using PWM (e.g. for WS2812, backlight, etc.) include this line
+#define HAL_USE_PWM TRUE
+
+// If you are using serial comms for split communications, include these lines
+#define HAL_USE_SERIAL TRUE
+#define SERIAL_BUFFERS_SIZE 256
+
+// If you are using SPI (e.g. for FRAM, flash, etc.) include these lines
+#define HAL_USE_SPI TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+// This enables interrupt-driven mode
+#define SPI_USE_WAIT TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/custommk/bonsai_c4_template/mcuconf.h b/keyboards/custommk/bonsai_c4_template/mcuconf.h
new file mode 100644
index 0000000000..4f926bd7de
--- /dev/null
+++ b/keyboards/custommk/bonsai_c4_template/mcuconf.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 customMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+// Used for underglow in example code
+#undef STM32_PWM_USE_TIM1 //timer 1 channel 3
+#define STM32_PWM_USE_TIM1 TRUE
+
+// Used for backlight in examples
+#undef STM32_PWM_USE_TIM3 //timer 3 channel 1
+#define STM32_PWM_USE_TIM3 TRUE
+
+// Used for FRAM and flash in example code
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+// Used for Split comms in example code
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
\ No newline at end of file
diff --git a/keyboards/custommk/bonsai_c4_template/readme.md b/keyboards/custommk/bonsai_c4_template/readme.md
new file mode 100644
index 0000000000..0c0fd8ed0c
--- /dev/null
+++ b/keyboards/custommk/bonsai_c4_template/readme.md
@@ -0,0 +1,10 @@
+# Bonsai C4 template code
+
+Currently, the converter for Pro Micro to Bonsai C4 only does pin mapping. This is sufficient for simple keyboards and also a good start for
+incorporating into more advanced keyboards with other features (like RGB, OLED, backlighting, split communiciations, etc.). However, to make
+use of the more advanced features--including using the FRAM and flash memory chip included on Bonsai C4--various peripheral hardware must
+be configured. Pro Micro does not requrie such configuration because such functionality is more limited and hard-wired to specific pins.
+
+The code here provides examples that can be used to operate SPI, I2C, PWM, and Serial comms. In addition to using the converter, you will
+need to take code (as-needed) and add it to existing config.h files, or add in new halconf.h and mcuconf.h files. If you are changing which 
+pins are used for certain functions, you should verify the new pins support that functionality, and check all assingments to ensure the correct settings are used (including as-applicable driver, channel, PAL (Pin ALternate function) mode, DMA stream, and/or DMA channel).
diff --git a/platforms/chibios/converters/promicro_to_bonsai_c4/_pin_defs.h b/platforms/chibios/converters/promicro_to_bonsai_c4/_pin_defs.h
new file mode 100644
index 0000000000..7e6b8ddaf2
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_bonsai_c4/_pin_defs.h
@@ -0,0 +1,40 @@
+// Copyright 2022 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 PAL_LINE(GPIOB, 7)
+#define D2 PAL_LINE(GPIOA, 15)
+//      GND
+//      GND
+#define D1 PAL_LINE(GPIOB, 9)
+#define D0 PAL_LINE(GPIOB, 6)
+#define D4 PAL_LINE(GPIOA, 4)
+#define C6 PAL_LINE(GPIOB, 8)
+#define D7 PAL_LINE(GPIOA, 3)
+#define E6 PAL_LINE(GPIOB, 10)
+#define B4 PAL_LINE(GPIOA, 8)
+#define B5 PAL_LINE(GPIOB, 0)
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 PAL_LINE(GPIOA, 7)
+#define F5 PAL_LINE(GPIOA, 6)
+#define F6 PAL_LINE(GPIOA, 5)
+#define F7 PAL_LINE(GPIOA, 1)
+#define B1 PAL_LINE(GPIOB, 13)
+#define B3 PAL_LINE(GPIOB, 14)
+#define B2 PAL_LINE(GPIOB, 15)
+#define B6 PAL_LINE(GPIOB, 1)
+
+// LEDs (only D5/B2 uses an actual LED)
+// Setting both RX and TX LEDs to the same pin as there
+// is only one LED availble
+// If this is undesirable, either B0 or B5 can be redefined by
+// using #undef and #define to change its assignment
+#define B0 PAL_LINE(GPIOB, 2)
+#define D5 PAL_LINE(GPIOB, 2)
\ No newline at end of file
diff --git a/platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk b/platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk
new file mode 100644
index 0000000000..7410209b67
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk
@@ -0,0 +1,4 @@
+# Proton C MCU settings for converting AVR projects
+MCU := STM32F411
+BOARD := GENERIC_STM32_F411XE
+BOOTLOADER := stm32-dfu
\ No newline at end of file

From 227e552f5cb1b1320752a9626a81dd4d128d7c7b Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Thu, 18 Aug 2022 07:23:34 +0700
Subject: [PATCH 213/959] Add support keyboard Feker IK75 (#17611)

---
 keyboards/feker/ik75/config.h                 | 108 +++++++++
 keyboards/feker/ik75/ik75.c                   | 191 +++++++++++++++
 keyboards/feker/ik75/ik75.h                   |  56 +++++
 keyboards/feker/ik75/info.json                | 105 ++++++++
 keyboards/feker/ik75/keymaps/bkzshen/keymap.c | 224 ++++++++++++++++++
 keyboards/feker/ik75/keymaps/bkzshen/rules.mk |   4 +
 keyboards/feker/ik75/keymaps/default/keymap.c | 166 +++++++++++++
 keyboards/feker/ik75/keymaps/default/rules.mk |   2 +
 keyboards/feker/ik75/keymaps/via/keymap.c     | 224 ++++++++++++++++++
 keyboards/feker/ik75/keymaps/via/rules.mk     |   4 +
 keyboards/feker/ik75/readme.md                |  25 ++
 keyboards/feker/ik75/rules.mk                 |  29 +++
 12 files changed, 1138 insertions(+)
 create mode 100644 keyboards/feker/ik75/config.h
 create mode 100644 keyboards/feker/ik75/ik75.c
 create mode 100644 keyboards/feker/ik75/ik75.h
 create mode 100644 keyboards/feker/ik75/info.json
 create mode 100644 keyboards/feker/ik75/keymaps/bkzshen/keymap.c
 create mode 100644 keyboards/feker/ik75/keymaps/bkzshen/rules.mk
 create mode 100644 keyboards/feker/ik75/keymaps/default/keymap.c
 create mode 100644 keyboards/feker/ik75/keymaps/default/rules.mk
 create mode 100644 keyboards/feker/ik75/keymaps/via/keymap.c
 create mode 100644 keyboards/feker/ik75/keymaps/via/rules.mk
 create mode 100644 keyboards/feker/ik75/readme.md
 create mode 100644 keyboards/feker/ik75/rules.mk

diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h
new file mode 100644
index 0000000000..541fb86b73
--- /dev/null
+++ b/keyboards/feker/ik75/config.h
@@ -0,0 +1,108 @@
+/* Copyright 2022 Feker
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, E2 }
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#ifdef ENCODER_ENABLE
+    /* Encoder pins */
+    #define ENCODERS_PAD_A { C6 }
+    #define ENCODERS_PAD_B { C7 }
+
+    /* Encoder config */
+    #define ENCODER_RESOLUTION 2
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+    #define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_KEYPRESSES
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+    /* RGB Matrix config */
+    #define DRIVER_ADDR_1 0b1011111
+    #define DRIVER_ADDR_2 0b1010000
+    #define DRIVER_COUNT 2
+    #define DRIVER_1_LED_TOTAL 63
+    #define DRIVER_2_LED_TOTAL 64
+
+    /* RGB Matrix effect */
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_SAT
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    #define ENABLE_RGB_MATRIX_RAINDROPS
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+    #define ENABLE_RGB_MATRIX_HUE_WAVE
+    #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+    #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+    #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_SPLASH
+    #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/feker/ik75/ik75.c b/keyboards/feker/ik75/ik75.c
new file mode 100644
index 0000000000..58464e1934
--- /dev/null
+++ b/keyboards/feker/ik75/ik75.c
@@ -0,0 +1,191 @@
+/* Copyright 2022 Feker
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ik75.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  G location
+ *   |  |     B location
+ *   |  |     |     R location
+ *   |  |     |     | */
+    {0, A_1,  C_1,  B_1},  // 0,   `~,              K10
+    {0, A_2,  C_2,  B_2},  // 1,   1!,              K11
+    {0, A_3,  C_3,  B_3},  // 2,   2@,              K12
+    {0, A_4,  C_4,  B_4},  // 3,   3#,              K13
+    {0, A_5,  C_5,  B_5},  // 4,   4$,              K14
+    {0, A_6,  C_6,  B_6},  // 5,   5%,              K15
+    {0, A_7,  C_7,  B_7},  // 6,   6^,              K16
+    {0, A_8,  C_8,  B_8},  // 7,   7&,              K17
+    {0, A_9,  C_9,  B_9},  // 8,   8*,              K18
+    {0, A_10, C_10, B_10}, // 9,   9(,              K19
+    {0, A_11, C_11, B_11}, // 10,  0),              K1A
+    {0, A_12, C_12, B_12}, // 11,  -_,              K1B
+    {0, A_13, C_13, B_13}, // 12,  =+,              K1C
+    {0, A_14, C_14, B_14}, // 13,  Backspace,       K1D
+    {0, A_15, C_15, B_15}, // 14,  Left Alt,        K52
+    {0, A_16, C_16, B_16}, // 15,  Space,           K56
+
+    {0, 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, 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, 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
+
+    {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, 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, 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, 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
+};
+
+led_config_t g_led_config = { {
+    { 79,     80,     81,     82,     83,     84,     85,     86,     87,     88,     89,     90,     91,     92, NO_LED, NO_LED },
+    {  0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13, NO_LED,    102 },
+    { 16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29, NO_LED,    105 },
+    { 32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42,     43, NO_LED,     44,    103,    106 },
+    { 48, NO_LED,     49,     50,     51,     52,     53,     54,     55,     56,     57,     58, NO_LED,     59,     45,    101 },
+    { 93,     94,     14, NO_LED, NO_LED, NO_LED,     15, NO_LED, NO_LED,     30,     31, NO_LED,     47,     60,     61,     62 }
+}, {
+    {0  , 15}, {14 , 15}, {29 , 15}, {43 , 15}, {58 , 15}, {72 , 15}, {87 , 15}, {101, 15}, {116, 15}, {130, 15}, {145, 15}, {159, 15}, {173, 15}, {195, 15}, {38 , 61}, {92 , 61},
+    {4  , 26}, {22 , 26}, {36 , 26}, {51 , 26}, {65 , 26}, {79 , 26}, {94 , 26}, {108, 26}, {123, 26}, {137, 26}, {152, 26}, {166, 26}, {181, 26}, {199, 26}, {173, 61}, {159, 61},
+    {5  , 38}, {25 , 38}, {40 , 38}, {54 , 38}, {69 , 38}, {83 , 38}, {98 , 38}, {112, 38}, {126, 38}, {141, 38}, {155, 38}, {170, 38}, {193, 38}, {206, 52}, {210, 12}, {145, 61},
+    {9  , 49},            {33 , 49}, {47 , 49}, {61 , 49}, {76 , 49}, {90 , 49}, {105, 49}, {119, 49}, {134, 49}, {148, 49}, {163, 49}, {182, 49}, {191, 64}, {206, 64}, {220, 64},
+    {14 ,  0}, {28 ,  0}, {53 ,  0}, {63 ,  0}, {74 ,  0}, {88 ,  0}, {102,  0}, {116,  0}, {130,  0}, {144,  0}, {158,  0}, {172,  0}, {189,  0}, {210,  0}, {224,  0}, {224, 11},
+    {0  ,  0}, {18 ,  0}, {33 ,  0}, {47 ,  0}, {61 ,  0}, {79 ,  0}, {94 ,  0}, {108,  0}, {123,  0}, {141,  0}, {155,  0}, {170,  0}, {184,  0}, {202,  0}, {2  , 61}, {20 , 61},
+    {0  ,  0}, {0  , 11}, {0  , 27}, {0  , 37}, {224,  5}, {210,  5}, {217,  0}, {224, 15}, {224, 38}, {210, 18}, {224, 26}, {224, 49}, {224, 56}, {224, 45}, {224, 35}, {224, 24},
+    {0  , 48}, {0  , 56}, {0  , 64}, {14 , 64}, {28 , 64}, {49 , 64}, {67 , 64}, {84 , 64}, {98 , 64}, {112, 64}, {126, 64}, {140, 64}, {158, 64}, {172, 64}, {196, 64}, {224, 64},
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+    8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 8, 1,
+    1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+    2, 2, 2, 2, 1, 1, 4, 4, 4, 8, 4, 4, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
+#endif
diff --git a/keyboards/feker/ik75/ik75.h b/keyboards/feker/ik75/ik75.h
new file mode 100644
index 0000000000..c4e5743bac
--- /dev/null
+++ b/keyboards/feker/ik75/ik75.h
@@ -0,0 +1,56 @@
+/* Copyright 2022 Feker
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │4F │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1F │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2F │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │ │3E │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │┌───┐│3F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│4E │└───┘
+ * │50  │51  │52  │56                      │5C │5A │59 │┌───┼───┼───┐
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┘│5D │5E │5F │
+ *                                                      └───┴───┴───┘
+ */
+
+#define LAYOUT( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K4F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,    K1F, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2F, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,    K3E, \
+        K40,   K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E, K3F, \
+    K50,  K51,  K52,               K56,               K5C, K5A, K59, K5D, K5E, K5F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, K59, K5A, XXX, K5C, K5D, K5E, K5F }  \
+}
diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/info.json
new file mode 100644
index 0000000000..bdba79703e
--- /dev/null
+++ b/keyboards/feker/ik75/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "IK75",
+    "manufacturer": "Feker",
+    "url": "https://epomaker.com/products/epomaker-feker-ik75-v3-qmk-via",
+    "maintainer": "Feker",
+    "usb": {
+        "vid": "0xF2E7",
+        "pid": "0x1226",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"Mute", "x":15.5, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.5, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"End", "x":15.5, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"PgUp", "x":15.5, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":4.5},
+                {"label":"PgDn", "x":15.5, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25},
+                {"label":"Fn", "x":11, "y":5.25},
+                {"label":"Ctrl", "x":12, "y":5.25},
+                {"label":"\u2190", "x":13.25, "y":5.5},
+                {"label":"\u2193", "x":14.25, "y":5.5},
+                {"label":"\u2192", "x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/feker/ik75/keymaps/bkzshen/keymap.c b/keyboards/feker/ik75/keymaps/bkzshen/keymap.c
new file mode 100644
index 0000000000..95d41853f9
--- /dev/null
+++ b/keyboards/feker/ik75/keymaps/bkzshen/keymap.c
@@ -0,0 +1,224 @@
+/* Copyright 2022 Feker
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN1,
+    _FN2,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││Del│ │Mut│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bckspc│ │Hom│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │ │End│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │ │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │┌───┐│PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│ ↑ │└───┘
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │Rcl│┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴───┴───┴───┘│ ← │ ↓ │ → │
+                                                            └───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │ │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │ │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │┌───┐│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│   │└───┘
+       │    │    │    │                        │   │   │   │┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴───┴───┴───┘│   │   │   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3      4      5      6       7      8      9        10       11       12       13       14       15     */
+    [_BASE] = LAYOUT(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6,  KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+                KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,   KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,   KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,
+                KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,  KC_H,   KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+                KC_LSFT,          KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,               KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │Rst││Mcm│Hom│Cal│Sel││Prv│Nxt│Ply│Stp││Mut│VoD│VoU│Mai││Ins│ │Tog│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │Spd│Spi│       │ │Mod│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │   │   │   │   │   │   │   │   │   │Prt│   │   │     │ │Hui│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │      │   │Scr│   │   │   │   │   │   │   │   │   │        │ │Sai│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │        │   │   │   │   │   │Num│   │   │   │   │      │┌───┐│Sad│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│Vai│└───┘
+       │    │GTog│    │                        │    │    │  ┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴────┴────┘  │   │Vad│   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN] = LAYOUT(
+                QK_BOOT, KC_MYCM, KC_WHOM, KC_CALC, KC_SLCT, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, KC_INS,           RGB_TOG,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_MOD,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RGB_HUI,
+                _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
+                _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RGB_VAI, RGB_SAD,
+                _______, GUI_TOG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │ │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│   │└───┘
+       │    │    │    │                        │    │    │  ┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴────┴────┘  │   │   │   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN1] = LAYOUT(
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │ │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│   │└───┘
+       │    │    │    │                        │    │    │  ┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴────┴────┘  │   │   │   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN2] = LAYOUT(
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______, _______
+            ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                    }
+                    break;
+                }
+            }
+            return false;
+	}
+
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    rgb_matrix_set_color(46, 0, 0, 0);
+    rgb_matrix_set_color(104, 0, 0, 0);
+
+    uint8_t red = host_keyboard_led_state().caps_lock ? 255 : 0;
+    uint8_t green = host_keyboard_led_state().scroll_lock ? 255 : 0;
+    uint8_t blue = keymap_config.no_gui ? 255 : 0;
+
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().num_lock) {
+            rgb_matrix_set_color(46, 255, 0, 0);
+        }
+        rgb_matrix_set_color(104, red, green, blue);
+    } else {
+        if (host_keyboard_led_state().num_lock) {
+            rgb_matrix_set_color(46, 255, 0, 0);
+        } else {
+            rgb_matrix_set_color(46, 0, 0, 0);
+        }
+        rgb_matrix_set_color(104, red, green, blue);
+    }
+}
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/feker/ik75/keymaps/bkzshen/rules.mk b/keyboards/feker/ik75/keymaps/bkzshen/rules.mk
new file mode 100644
index 0000000000..d76c12896f
--- /dev/null
+++ b/keyboards/feker/ik75/keymaps/bkzshen/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/feker/ik75/keymaps/default/keymap.c b/keyboards/feker/ik75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..582340650c
--- /dev/null
+++ b/keyboards/feker/ik75/keymaps/default/keymap.c
@@ -0,0 +1,166 @@
+/* Copyright 2022 Feker
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││Del│ │Mut│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bckspc│ │Ins│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │ │End│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │ │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │┌───┐│PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│ ↑ │└───┘
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │Rcl│┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴───┴───┴───┘│ ← │ ↓ │ → │
+                                                            └───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │ │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │ │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │┌───┐│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│   │└───┘
+       │    │    │    │                        │   │   │   │┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴───┴───┴───┘│   │   │   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3      4      5      6       7      8      9        10       11       12       13       14       15     */
+    [_BASE] = LAYOUT(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6,  KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+                KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,   KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_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_END,
+                KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,  KC_H,   KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+                KC_LSFT,          KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,               KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │Rst││Mcm│Hom│Cal│Sel││Prv│Nxt│Ply│Stp││Mut│VoD│VoU│Mai││   │ │Tog│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │Spd│Spi│       │ │Mod│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │   │   │   │   │   │   │   │   │   │Prt│   │   │     │ │Hui│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │      │   │Scr│   │   │   │   │   │   │   │   │   │        │ │Sai│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │        │   │   │   │   │   │Num│   │   │   │   │      │┌───┐│Sad│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│Vai│└───┘
+       │    │GTog│    │                        │    │    │  ┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴────┴────┘  │   │Vad│   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN] = LAYOUT(
+                QK_BOOT, KC_MYCM, KC_WHOM, KC_CALC, KC_SLCT, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, _______,          RGB_TOG,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_MOD,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RGB_HUI,
+                _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
+                _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RGB_VAI, RGB_SAD,
+                _______, GUI_TOG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
+            ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                    }
+                    break;
+                }
+            }
+            return false;
+	}
+
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    rgb_matrix_set_color(46, 0, 0, 0);
+    rgb_matrix_set_color(104, 0, 0, 0);
+
+    uint8_t red = host_keyboard_led_state().caps_lock ? 255 : 0;
+    uint8_t green = host_keyboard_led_state().scroll_lock ? 255 : 0;
+    uint8_t blue = keymap_config.no_gui ? 255 : 0;
+
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().num_lock) {
+            rgb_matrix_set_color(46, 255, 0, 0);
+        }
+        rgb_matrix_set_color(104, red, green, blue);
+    } else {
+        if (host_keyboard_led_state().num_lock) {
+            rgb_matrix_set_color(46, 255, 0, 0);
+        } else {
+            rgb_matrix_set_color(46, 0, 0, 0);
+        }
+        rgb_matrix_set_color(104, red, green, blue);
+    }
+}
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/feker/ik75/keymaps/default/rules.mk b/keyboards/feker/ik75/keymaps/default/rules.mk
new file mode 100644
index 0000000000..00003ba11b
--- /dev/null
+++ b/keyboards/feker/ik75/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/feker/ik75/keymaps/via/keymap.c b/keyboards/feker/ik75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6f0c6890ed
--- /dev/null
+++ b/keyboards/feker/ik75/keymaps/via/keymap.c
@@ -0,0 +1,224 @@
+/* Copyright 2022 Feker
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN1,
+    _FN2,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││Del│ │Mut│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bckspc│ │Ins│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │ │End│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │ │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │┌───┐│PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│ ↑ │└───┘
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │Rcl│┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴───┴───┴───┘│ ← │ ↓ │ → │
+                                                            └───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │ │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │ │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │┌───┐│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│   │└───┘
+       │    │    │    │                        │   │   │   │┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴───┴───┴───┘│   │   │   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3      4      5      6       7      8      9        10       11       12       13       14       15     */
+    [_BASE] = LAYOUT(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6,  KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+                KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,   KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_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_END,
+                KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,  KC_H,   KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+                KC_LSFT,          KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,               KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │Rst││Mcm│Hom│Cal│Sel││Prv│Nxt│Ply│Stp││Mut│VoD│VoU│Mai││   │ │Tog│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │Spd│Spi│       │ │Mod│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │   │   │   │   │   │   │   │   │   │Prt│   │   │     │ │Hui│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │      │   │Scr│   │   │   │   │   │   │   │   │   │        │ │Sai│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │        │   │   │   │   │   │Num│   │   │   │   │      │┌───┐│Sad│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│Vai│└───┘
+       │    │GTog│    │                        │    │    │  ┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴────┴────┘  │   │Vad│   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN] = LAYOUT(
+                QK_BOOT, KC_MYCM, KC_WHOM, KC_CALC, KC_SLCT, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, _______,          RGB_TOG,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_MOD,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RGB_HUI,
+                _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
+                _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RGB_VAI, RGB_SAD,
+                _______, GUI_TOG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │ │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│   │└───┘
+       │    │    │    │                        │    │    │  ┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴────┴────┘  │   │   │   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN1] = LAYOUT(
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
+       │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │ │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
+       │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│   │└───┘
+       │    │    │    │                        │    │    │  ┌───┼───┼───┐
+       └────┴────┴────┴────────────────────────┴────┴────┘  │   │   │   │
+                                                            └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN2] = LAYOUT(
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______, _______
+            ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                    }
+                    break;
+                }
+            }
+            return false;
+	}
+
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    rgb_matrix_set_color(46, 0, 0, 0);
+    rgb_matrix_set_color(104, 0, 0, 0);
+
+    uint8_t red = host_keyboard_led_state().caps_lock ? 255 : 0;
+    uint8_t green = host_keyboard_led_state().scroll_lock ? 255 : 0;
+    uint8_t blue = keymap_config.no_gui ? 255 : 0;
+
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().num_lock) {
+            rgb_matrix_set_color(46, 255, 0, 0);
+        }
+        rgb_matrix_set_color(104, red, green, blue);
+    } else {
+        if (host_keyboard_led_state().num_lock) {
+            rgb_matrix_set_color(46, 255, 0, 0);
+        } else {
+            rgb_matrix_set_color(46, 0, 0, 0);
+        }
+        rgb_matrix_set_color(104, red, green, blue);
+    }
+}
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/feker/ik75/keymaps/via/rules.mk b/keyboards/feker/ik75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..d76c12896f
--- /dev/null
+++ b/keyboards/feker/ik75/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/feker/ik75/readme.md b/keyboards/feker/ik75/readme.md
new file mode 100644
index 0000000000..ed88e6123e
--- /dev/null
+++ b/keyboards/feker/ik75/readme.md
@@ -0,0 +1,25 @@
+# Feker IK75
+
+A 75% exploded keyboard made by Feker, which controlled by an Atmega32u4 chipset. The keyboard features per-key RGB, RGB underglow and 1 encoder.
+
+* Keyboard Maintainer: Feker
+* Hardware Supported: Atmega32u4
+* Hardware Availability: https://epomaker.com/products/epomaker-feker-ik75-v3-qmk-via
+
+Make example for this keyboard (after setting up your build environment):
+
+    make feker/ik75:default
+
+Flashing example for this keyboard:
+
+    make feker/ik75:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to RESET if it is available
diff --git a/keyboards/feker/ik75/rules.mk b/keyboards/feker/ik75/rules.mk
new file mode 100644
index 0000000000..97a872d23e
--- /dev/null
+++ b/keyboards/feker/ik75/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Additional thing to reduce compiled size
+LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+
+# RGB Matrix enabled
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3733
+
+# Encoder enabled
+ENCODER_ENABLE = yes

From 0fcebdcdf1b193268c0e8979faa583fa6253a29c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 19 Aug 2022 00:52:50 +0100
Subject: [PATCH 214/959] Swap F4x1 default board files away from blackpill
 (#17522)

---
 builddefs/mcu_selection.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index 7528aa6842..597591a455 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -359,7 +359,7 @@ ifneq ($(findstring STM32F401, $(MCU)),)
 
   # Board: it should exist either in <chibios>/os/hal/boards/,
   # <keyboard_dir>/boards/, or drivers/boards/
-  BOARD ?= BLACKPILL_STM32_F401
+  BOARD ?= GENERIC_STM32_F401XC
 
   USE_FPU ?= yes
 
@@ -475,7 +475,7 @@ ifneq ($(findstring STM32F411, $(MCU)),)
 
   # Board: it should exist either in <chibios>/os/hal/boards/,
   # <keyboard_dir>/boards/, or drivers/boards/
-  BOARD ?= BLACKPILL_STM32_F411
+  BOARD ?= GENERIC_STM32_F411XE
 
   USE_FPU ?= yes
 

From 9550cc464cd0579071cf490b6f3c9d151d336bd9 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 19 Aug 2022 01:48:33 +0100
Subject: [PATCH 215/959] Fix new-keyboard default for RP2040 bootloader
 (#18100)

---
 lib/python/qmk/constants.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 5fe8326daf..7da9df1d8a 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -20,6 +20,7 @@ VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
 
 # Bootloaders of the supported processors
 MCU2BOOTLOADER = {
+    "RP2040": "rp2040",
     "MKL26Z64": "halfkay",
     "MK20DX128": "halfkay",
     "MK20DX256": "halfkay",

From 3c745caf6113cfe8778cf9c11edbc0217c34e236 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 19 Aug 2022 01:56:48 +0100
Subject: [PATCH 216/959] Remove legacy bootmagic cli parsing (#18099)

---
 lib/python/qmk/info.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 7ed636d0f9..c95b55916c 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -110,14 +110,7 @@ def info_json(keyboard):
 def _extract_features(info_data, rules):
     """Find all the features enabled in rules.mk.
     """
-    # Special handling for bootmagic which also supports a "lite" mode.
-    if rules.get('BOOTMAGIC_ENABLE') == 'lite':
-        rules['BOOTMAGIC_LITE_ENABLE'] = 'on'
-        del rules['BOOTMAGIC_ENABLE']
-    if rules.get('BOOTMAGIC_ENABLE') == 'full':
-        rules['BOOTMAGIC_ENABLE'] = 'on'
-
-    # Process the rest of the rules as booleans
+    # Process booleans rules
     for key, value in rules.items():
         if key.endswith('_ENABLE'):
             key = '_'.join(key.split('_')[:-1]).lower()

From 1eac095c0c200990c41966944c2b65e633d361f8 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Fri, 19 Aug 2022 14:20:44 +1000
Subject: [PATCH 217/959] Use the correct bootloader definition. (#18102)

---
 .../chibios/drivers/wear_leveling/wear_leveling_legacy_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h
index 1e4691a6c0..e64cab87d1 100644
--- a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy_config.h
@@ -39,7 +39,7 @@
 #    if defined(QMK_MCU_STM32F042) || defined(QMK_MCU_STM32F070) || defined(QMK_MCU_STM32F072)
 #        define WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS ((uintptr_t)(WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE) + WEAR_LEVELING_LEGACY_EMULATION_FLASH_SIZE * 1024 - (WEAR_LEVELING_LEGACY_EMULATION_PAGE_COUNT * WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE))
 #    elif defined(QMK_MCU_STM32F401) || defined(QMK_MCU_STM32F411)
-#        if defined(BOOTLOADER_STM32)
+#        if defined(BOOTLOADER_STM32_DFU)
 #            define WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS (WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE + (1 * (WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE))) // +16k
 #        elif defined(BOOTLOADER_TINYUF2)
 #            define WEAR_LEVELING_LEGACY_EMULATION_BASE_PAGE_ADDRESS (WEAR_LEVELING_LEGACY_EMULATION_FLASH_BASE + (3 * (WEAR_LEVELING_LEGACY_EMULATION_PAGE_SIZE))) // +48k

From 5e2ffe7d8f4187109514147469d7db93e075f6f0 Mon Sep 17 00:00:00 2001
From: Erovia <Erovia@users.noreply.github.com>
Date: Sat, 20 Aug 2022 06:39:19 +0100
Subject: [PATCH 218/959] CLI: Teaching the CLI to flash binaries (#16584)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/cli_commands.md               |  17 +++
 lib/python/qmk/cli/__init__.py     |   1 +
 lib/python/qmk/cli/doctor/linux.py |  57 +++-----
 lib/python/qmk/cli/flash.py        | 116 ++++++++++-------
 lib/python/qmk/constants.py        |  48 +++++++
 lib/python/qmk/flashers.py         | 203 +++++++++++++++++++++++++++++
 requirements.txt                   |   1 +
 util/udev/50-qmk.rules             |   9 ++
 8 files changed, 361 insertions(+), 91 deletions(-)
 create mode 100644 lib/python/qmk/flashers.py

diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 56767d962b..4608ed85b6 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -90,6 +90,8 @@ This command is similar to `qmk compile`, but can also target a bootloader. The
 
 This command is directory aware. It will automatically fill in KEYBOARD and/or KEYMAP if you are in a keyboard or keymap directory.
 
+This command can also flash binary firmware files (hex or bin) such as the ones produced by [Configurator](https://config.qmk.fm).
+
 **Usage for Configurator Exports**:
 
 ```
@@ -102,6 +104,21 @@ qmk flash [-bl <bootloader>] [-c] [-e <var>=<value>] [-j <num_jobs>] <configurat
 qmk flash -kb <keyboard_name> -km <keymap_name> [-bl <bootloader>] [-c] [-e <var>=<value>] [-j <num_jobs>]
 ```
 
+**Usage for pre-compiled firmwares**:
+
+**Note**: The microcontroller needs to be specified (`-m` argument) for keyboards with the following bootloaders:
+* HalfKay
+* QMK HID
+* USBaspLoader
+
+ISP flashing is also supported with the following flashers and require the microcontroller to be specified:
+* USBasp
+* USBtinyISP
+
+```
+qmk flash [-m <microcontroller>] <compiledFirmware.[bin|hex]>
+```
+
 **Listing the Bootloaders**
 
 ```
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 8a507677ef..f05b2a746e 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -15,6 +15,7 @@ from milc.questions import yesno
 import_names = {
     # A mapping of package name to importable name
     'pep8-naming': 'pep8ext_naming',
+    'pyserial': 'serial',
     'pyusb': 'usb.core',
     'qmk-dotty-dict': 'dotty_dict',
     'pillow': 'PIL'
diff --git a/lib/python/qmk/cli/doctor/linux.py b/lib/python/qmk/cli/doctor/linux.py
index 94683d3307..a803305c0d 100644
--- a/lib/python/qmk/cli/doctor/linux.py
+++ b/lib/python/qmk/cli/doctor/linux.py
@@ -6,7 +6,7 @@ from pathlib import Path
 
 from milc import cli
 
-from qmk.constants import QMK_FIRMWARE
+from qmk.constants import QMK_FIRMWARE, BOOTLOADER_VIDS_PIDS
 from .check import CheckStatus
 
 
@@ -26,6 +26,18 @@ def _udev_rule(vid, pid=None, *args):
     return rule
 
 
+def _generate_desired_rules(bootloader_vids_pids):
+    rules = dict()
+    for bl in bootloader_vids_pids.keys():
+        rules[bl] = set()
+        for vid_pid in bootloader_vids_pids[bl]:
+            if bl == 'caterina' or bl == 'md-boot':
+                rules[bl].add(_udev_rule(vid_pid[0], vid_pid[1], 'ENV{ID_MM_DEVICE_IGNORE}="1"'))
+            else:
+                rules[bl].add(_udev_rule(vid_pid[0], vid_pid[1]))
+    return rules
+
+
 def _deprecated_udev_rule(vid, pid=None):
     """ Helper function that return udev rules
 
@@ -47,47 +59,8 @@ def check_udev_rules():
         Path("/run/udev/rules.d/"),
         Path("/etc/udev/rules.d/"),
     ]
-    desired_rules = {
-        'atmel-dfu': {
-            _udev_rule("03eb", "2fef"),  # ATmega16U2
-            _udev_rule("03eb", "2ff0"),  # ATmega32U2
-            _udev_rule("03eb", "2ff3"),  # ATmega16U4
-            _udev_rule("03eb", "2ff4"),  # ATmega32U4
-            _udev_rule("03eb", "2ff9"),  # AT90USB64
-            _udev_rule("03eb", "2ffa"),  # AT90USB162
-            _udev_rule("03eb", "2ffb")  # AT90USB128
-        },
-        'kiibohd': {_udev_rule("1c11", "b007")},
-        'stm32': {
-            _udev_rule("1eaf", "0003"),  # STM32duino
-            _udev_rule("0483", "df11")  # STM32 DFU
-        },
-        'bootloadhid': {_udev_rule("16c0", "05df")},
-        'usbasploader': {_udev_rule("16c0", "05dc")},
-        'massdrop': {_udev_rule("03eb", "6124", 'ENV{ID_MM_DEVICE_IGNORE}="1"')},
-        'caterina': {
-            # Spark Fun Electronics
-            _udev_rule("1b4f", "9203", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Pro Micro 3V3/8MHz
-            _udev_rule("1b4f", "9205", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Pro Micro 5V/16MHz
-            _udev_rule("1b4f", "9207", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # LilyPad 3V3/8MHz (and some Pro Micro clones)
-            # Pololu Electronics
-            _udev_rule("1ffb", "0101", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # A-Star 32U4
-            # Arduino SA
-            _udev_rule("2341", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Leonardo
-            _udev_rule("2341", "0037", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Micro
-            # Adafruit Industries LLC
-            _udev_rule("239a", "000c", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Feather 32U4
-            _udev_rule("239a", "000d", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # ItsyBitsy 32U4 3V3/8MHz
-            _udev_rule("239a", "000e", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # ItsyBitsy 32U4 5V/16MHz
-            # dog hunter AG
-            _udev_rule("2a03", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Leonardo
-            _udev_rule("2a03", "0037", 'ENV{ID_MM_DEVICE_IGNORE}="1"')  # Micro
-        },
-        'hid-bootloader': {
-            _udev_rule("03eb", "2067"),  # QMK HID
-            _udev_rule("16c0", "0478")  # PJRC halfkay
-        }
-    }
+
+    desired_rules = _generate_desired_rules(BOOTLOADER_VIDS_PIDS)
 
     # These rules are no longer recommended, only use them to check for their presence.
     deprecated_rules = {
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py
index ebe739c50e..c39f4b36d4 100644
--- a/lib/python/qmk/cli/flash.py
+++ b/lib/python/qmk/cli/flash.py
@@ -4,6 +4,7 @@ You can compile a keymap already in the repo or using a QMK Configurator export.
 A bootloader must be specified.
 """
 from subprocess import DEVNULL
+import sys
 
 from argcomplete.completers import FilesCompleter
 from milc import cli
@@ -12,6 +13,7 @@ import qmk.path
 from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json
 from qmk.keyboard import keyboard_completer, keyboard_folder
+from qmk.flashers import flasher
 
 
 def print_bootloader_help():
@@ -38,9 +40,10 @@ def print_bootloader_help():
     cli.echo('For more info, visit https://docs.qmk.fm/#/flashing')
 
 
-@cli.argument('filename', nargs='?', arg_only=True, type=qmk.path.FileType('r'), completer=FilesCompleter('.json'), help='The configurator export JSON to compile.')
+@cli.argument('filename', nargs='?', arg_only=True, type=qmk.path.FileType('r'), completer=FilesCompleter('.json'), help='A configurator export JSON to be compiled and flashed or a pre-compiled binary firmware file (bin/hex) to be flashed.')
 @cli.argument('-b', '--bootloaders', action='store_true', help='List the available bootloaders.')
 @cli.argument('-bl', '--bootloader', default='flash', help='The flash command, corresponding to qmk\'s make options of bootloaders.')
+@cli.argument('-m', '--mcu', help='The MCU name. Required for HalfKay, HID, USBAspLoader and ISP flashing.')
 @cli.argument('-km', '--keymap', help='The keymap to build a firmware for. Use this if you dont have a configurator file. Ignored when a configurator file is supplied.')
 @cli.argument('-kb', '--keyboard', type=keyboard_folder, completer=keyboard_completer, help='The keyboard to build a firmware for. Use this if you dont have a configurator file. Ignored when a configurator file is supplied.')
 @cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Don't actually build, just show the make command to be run.")
@@ -53,6 +56,8 @@ def print_bootloader_help():
 def flash(cli):
     """Compile and or flash QMK Firmware or keyboard/layout
 
+    If a binary firmware is supplied, try to flash that.
+
     If a Configurator JSON export is supplied this command will create a new keymap. Keymap and Keyboard arguments
     will be ignored.
 
@@ -60,56 +65,69 @@ def flash(cli):
 
     If bootloader is omitted the make system will use the configured bootloader for that keyboard.
     """
-    if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
-        if cli.config.flash.keyboard and cli.config.flash.keymap:
-            command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean')
-            cli.run(command, capture_output=False, stdin=DEVNULL)
+    if cli.args.filename and cli.args.filename.suffix in ['.bin', '.hex']:
+        # Try to flash binary firmware
+        cli.echo('Flashing binary firmware...\nPlease reset your keyboard into bootloader mode now!\nPress Ctrl-C to exit.\n')
+        try:
+            err, msg = flasher(cli.args.mcu, cli.args.filename)
+            if err:
+                cli.log.error(msg)
+                return False
+        except KeyboardInterrupt:
+            cli.log.info('Ctrl-C was pressed, exiting...')
+            sys.exit(0)
+
+    else:
+        if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
+            if cli.config.flash.keyboard and cli.config.flash.keymap:
+                command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean')
+                cli.run(command, capture_output=False, stdin=DEVNULL)
+
+        # Build the environment vars
+        envs = {}
+        for env in cli.args.env:
+            if '=' in env:
+                key, value = env.split('=', 1)
+                envs[key] = value
+            else:
+                cli.log.warning('Invalid environment variable: %s', env)
+
+        # Determine the compile command
+        command = ''
+
+        if cli.args.bootloaders:
+            # Provide usage and list bootloaders
+            cli.echo('usage: qmk flash [-h] [-b] [-n] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
+            print_bootloader_help()
+            return False
+
+        if cli.args.filename:
+            # Handle compiling a configurator JSON
+            user_keymap = parse_configurator_json(cli.args.filename)
+            keymap_path = qmk.path.keymap(user_keymap['keyboard'])
+            command = compile_configurator_json(user_keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)
+
+            cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
 
-    # Build the environment vars
-    envs = {}
-    for env in cli.args.env:
-        if '=' in env:
-            key, value = env.split('=', 1)
-            envs[key] = value
         else:
-            cli.log.warning('Invalid environment variable: %s', env)
+            if cli.config.flash.keyboard and cli.config.flash.keymap:
+                # Generate the make command for a specific keyboard/keymap.
+                command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)
 
-    # Determine the compile command
-    command = ''
+            elif not cli.config.flash.keyboard:
+                cli.log.error('Could not determine keyboard!')
+            elif not cli.config.flash.keymap:
+                cli.log.error('Could not determine keymap!')
 
-    if cli.args.bootloaders:
-        # Provide usage and list bootloaders
-        cli.echo('usage: qmk flash [-h] [-b] [-n] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
-        print_bootloader_help()
-        return False
+        # Compile the firmware, if we're able to
+        if command:
+            cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
+            if not cli.args.dry_run:
+                cli.echo('\n')
+                compile = cli.run(command, capture_output=False, stdin=DEVNULL)
+                return compile.returncode
 
-    if cli.args.filename:
-        # Handle compiling a configurator JSON
-        user_keymap = parse_configurator_json(cli.args.filename)
-        keymap_path = qmk.path.keymap(user_keymap['keyboard'])
-        command = compile_configurator_json(user_keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)
-
-        cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
-
-    else:
-        if cli.config.flash.keyboard and cli.config.flash.keymap:
-            # Generate the make command for a specific keyboard/keymap.
-            command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)
-
-        elif not cli.config.flash.keyboard:
-            cli.log.error('Could not determine keyboard!')
-        elif not cli.config.flash.keymap:
-            cli.log.error('Could not determine keymap!')
-
-    # Compile the firmware, if we're able to
-    if command:
-        cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
-        if not cli.args.dry_run:
-            cli.echo('\n')
-            compile = cli.run(command, capture_output=False, stdin=DEVNULL)
-            return compile.returncode
-
-    else:
-        cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
-        cli.echo('usage: qmk flash [-h] [-b] [-n] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
-        return False
+        else:
+            cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
+            cli.echo('usage: qmk flash [-h] [-b] [-n] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
+            return False
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 7da9df1d8a..10da5e7e8e 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -64,6 +64,54 @@ LEGACY_KEYCODES = {  # Comment here is to force multiline formatting
     'RESET': 'QK_BOOT'
 }
 
+# Map VID:PID values to bootloaders
+BOOTLOADER_VIDS_PIDS = {
+    'atmel-dfu': {
+        ("03eb", "2fef"),  # ATmega16U2
+        ("03eb", "2ff0"),  # ATmega32U2
+        ("03eb", "2ff3"),  # ATmega16U4
+        ("03eb", "2ff4"),  # ATmega32U4
+        ("03eb", "2ff9"),  # AT90USB64
+        ("03eb", "2ffa"),  # AT90USB162
+        ("03eb", "2ffb")  # AT90USB128
+    },
+    'kiibohd': {("1c11", "b007")},
+    'stm32-dfu': {
+        ("1eaf", "0003"),  # STM32duino
+        ("0483", "df11")  # STM32 DFU
+    },
+    'apm32-dfu': {("314b", "0106")},
+    'gd32v-dfu': {("28e9", "0189")},
+    'bootloadhid': {("16c0", "05df")},
+    'usbasploader': {("16c0", "05dc")},
+    'usbtinyisp': {("1782", "0c9f")},
+    'md-boot': {("03eb", "6124")},
+    'caterina': {
+        # pid.codes shared PID
+        ("1209", "9203"),  # Keyboardio Atreus 2 Bootloader
+        # Spark Fun Electronics
+        ("1b4f", "9203"),  # Pro Micro 3V3/8MHz
+        ("1b4f", "9205"),  # Pro Micro 5V/16MHz
+        ("1b4f", "9207"),  # LilyPad 3V3/8MHz (and some Pro Micro clones)
+        # Pololu Electronics
+        ("1ffb", "0101"),  # A-Star 32U4
+        # Arduino SA
+        ("2341", "0036"),  # Leonardo
+        ("2341", "0037"),  # Micro
+        # Adafruit Industries LLC
+        ("239a", "000c"),  # Feather 32U4
+        ("239a", "000d"),  # ItsyBitsy 32U4 3V3/8MHz
+        ("239a", "000e"),  # ItsyBitsy 32U4 5V/16MHz
+        # dog hunter AG
+        ("2a03", "0036"),  # Leonardo
+        ("2a03", "0037")  # Micro
+    },
+    'hid-bootloader': {
+        ("03eb", "2067"),  # QMK HID
+        ("16c0", "0478")  # PJRC halfkay
+    }
+}
+
 # Common format strings
 DATE_FORMAT = '%Y-%m-%d'
 DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z'
diff --git a/lib/python/qmk/flashers.py b/lib/python/qmk/flashers.py
new file mode 100644
index 0000000000..a9cf726b44
--- /dev/null
+++ b/lib/python/qmk/flashers.py
@@ -0,0 +1,203 @@
+import shutil
+import time
+import os
+import signal
+
+import usb.core
+
+from qmk.constants import BOOTLOADER_VIDS_PIDS
+from milc import cli
+
+# yapf: disable
+_PID_TO_MCU = {
+    '2fef': 'atmega16u2',
+    '2ff0': 'atmega32u2',
+    '2ff3': 'atmega16u4',
+    '2ff4': 'atmega32u4',
+    '2ff9': 'at90usb64',
+    '2ffa': 'at90usb162',
+    '2ffb': 'at90usb128'
+}
+
+AVRDUDE_MCU = {
+    'atmega32a': 'm32',
+    'atmega328p': 'm328p',
+    'atmega328': 'm328',
+}
+# yapf: enable
+
+
+class DelayedKeyboardInterrupt:
+    # Custom interrupt handler to delay the processing of Ctrl-C
+    # https://stackoverflow.com/a/21919644
+    def __enter__(self):
+        self.signal_received = False
+        self.old_handler = signal.signal(signal.SIGINT, self.handler)
+
+    def handler(self, sig, frame):
+        self.signal_received = (sig, frame)
+
+    def __exit__(self, type, value, traceback):
+        signal.signal(signal.SIGINT, self.old_handler)
+        if self.signal_received:
+            self.old_handler(*self.signal_received)
+
+
+# TODO: Make this more generic, so cli/doctor/check.py and flashers.py can share the code
+def _check_dfu_programmer_version():
+    # Return True if version is higher than 0.7.0: supports '--force'
+    check = cli.run(['dfu-programmer', '--version'], combined_output=True, timeout=5)
+    first_line = check.stdout.split('\n')[0]
+    version_number = first_line.split()[1]
+    maj, min_, bug = version_number.split('.')
+    if int(maj) >= 0 and int(min_) >= 7:
+        return True
+    else:
+        return False
+
+
+def _find_bootloader():
+    # To avoid running forever in the background, only look for bootloaders for 10min
+    start_time = time.time()
+    while time.time() - start_time < 600:
+        for bl in BOOTLOADER_VIDS_PIDS:
+            for vid, pid in BOOTLOADER_VIDS_PIDS[bl]:
+                vid_hex = int(f'0x{vid}', 0)
+                pid_hex = int(f'0x{pid}', 0)
+                with DelayedKeyboardInterrupt():
+                    # PyUSB does not like to be interrupted by Ctrl-C
+                    # therefore we catch the interrupt with a custom handler
+                    # and only process it once pyusb finished
+                    dev = usb.core.find(idVendor=vid_hex, idProduct=pid_hex)
+                if dev:
+                    if bl == 'atmel-dfu':
+                        details = _PID_TO_MCU[pid]
+                    elif bl == 'caterina':
+                        details = (vid_hex, pid_hex)
+                    elif bl == 'hid-bootloader':
+                        if vid == '16c0' and pid == '0478':
+                            details = 'halfkay'
+                        else:
+                            details = 'qmk-hid'
+                    elif bl == 'stm32-dfu' or bl == 'apm32-dfu' or bl == 'gd32v-dfu' or bl == 'kiibohd':
+                        details = (vid, pid)
+                    else:
+                        details = None
+                    return (bl, details)
+        time.sleep(0.1)
+    return (None, None)
+
+
+def _find_serial_port(vid, pid):
+    if 'windows' in cli.platform.lower():
+        from serial.tools.list_ports_windows import comports
+        platform = 'windows'
+    else:
+        from serial.tools.list_ports_posix import comports
+        platform = 'posix'
+
+    start_time = time.time()
+    # Caterina times out after 8 seconds
+    while time.time() - start_time < 8:
+        for port in comports():
+            port, desc, hwid = port
+            if f'{vid:04x}:{pid:04x}' in hwid.casefold():
+                if platform == 'windows':
+                    time.sleep(1)
+                    return port
+                else:
+                    start_time = time.time()
+                    # Wait until the port becomes writable before returning
+                    while time.time() - start_time < 8:
+                        if os.access(port, os.W_OK):
+                            return port
+                        else:
+                            time.sleep(0.5)
+                return None
+    return None
+
+
+def _flash_caterina(details, file):
+    port = _find_serial_port(details[0], details[1])
+    if port:
+        cli.run(['avrdude', '-p', 'atmega32u4', '-c', 'avr109', '-U', f'flash:w:{file}:i', '-P', port], capture_output=False)
+        return False
+    else:
+        return True
+
+
+def _flash_atmel_dfu(mcu, file):
+    force = '--force' if _check_dfu_programmer_version() else ''
+    cli.run(['dfu-programmer', mcu, 'erase', force], capture_output=False)
+    cli.run(['dfu-programmer', mcu, 'flash', force, file], capture_output=False)
+    cli.run(['dfu-programmer', mcu, 'reset'], capture_output=False)
+
+
+def _flash_hid_bootloader(mcu, details, file):
+    if details == 'halfkay':
+        if shutil.which('teensy-loader-cli'):
+            cmd = 'teensy-loader-cli'
+        elif shutil.which('teensy_loader_cli'):
+            cmd = 'teensy_loader_cli'
+
+    # Use 'hid_bootloader_cli' for QMK HID and as a fallback for HalfKay
+    if not cmd:
+        if shutil.which('hid_bootloader_cli'):
+            cmd = 'hid_bootloader_cli'
+        else:
+            return True
+
+    cli.run([cmd, f'-mmcu={mcu}', '-w', '-v', file], capture_output=False)
+
+
+def _flash_dfu_util(details, file):
+    # STM32duino
+    if details[0] == '1eaf' and details[1] == '0003':
+        cli.run(['dfu-util', '-a', '2', '-d', f'{details[0]}:{details[1]}', '-R', '-D', file], capture_output=False)
+    # kiibohd
+    elif details[0] == '1c11' and details[1] == 'b007':
+        cli.run(['dfu-util', '-a', '0', '-d', f'{details[0]}:{details[1]}', '-D', file], capture_output=False)
+    # STM32, APM32, or GD32V DFU
+    else:
+        cli.run(['dfu-util', '-a', '0', '-d', f'{details[0]}:{details[1]}', '-s', '0x08000000:leave', '-D', file], capture_output=False)
+
+
+def _flash_isp(mcu, programmer, file):
+    programmer = 'usbasp' if programmer == 'usbasploader' else 'usbtiny'
+    # Check if the provide mcu has an avrdude-specific name, otherwise pass on what the user provided
+    mcu = AVRDUDE_MCU.get(mcu, mcu)
+    cli.run(['avrdude', '-p', mcu, '-c', programmer, '-U', f'flash:w:{file}:i'], capture_output=False)
+
+
+def _flash_mdloader(file):
+    cli.run(['mdloader', '--first', '--download', file, '--restart'], capture_output=False)
+
+
+def flasher(mcu, file):
+    bl, details = _find_bootloader()
+    # Add a small sleep to avoid race conditions
+    time.sleep(1)
+    if bl == 'atmel-dfu':
+        _flash_atmel_dfu(details, file.name)
+    elif bl == 'caterina':
+        if _flash_caterina(details, file.name):
+            return (True, "The Caterina bootloader was found but is not writable. Check 'qmk doctor' output for advice.")
+    elif bl == 'hid-bootloader':
+        if mcu:
+            if _flash_hid_bootloader(mcu, details, file.name):
+                return (True, "Please make sure 'teensy_loader_cli' or 'hid_bootloader_cli' is available on your system.")
+        else:
+            return (True, "Specifying the MCU with '-m' is necessary for HalfKay/HID bootloaders!")
+    elif bl == 'stm32-dfu' or bl == 'apm32-dfu' or bl == 'gd32v-dfu' or bl == 'kiibohd':
+        _flash_dfu_util(details, file.name)
+    elif bl == 'usbasploader' or bl == 'usbtinyisp':
+        if mcu:
+            _flash_isp(mcu, bl, file.name)
+        else:
+            return (True, "Specifying the MCU with '-m' is necessary for ISP flashing!")
+    elif bl == 'md-boot':
+        _flash_mdloader(file.name)
+    else:
+        return (True, "Known bootloader found but flashing not currently supported!")
+
+    return (False, None)
diff --git a/requirements.txt b/requirements.txt
index e09d58d829..9c192b0f0f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@ hjson
 jsonschema>=4
 milc>=1.4.2
 pygments
+pyserial
 pyusb
 qmk-dotty-dict
 pillow
diff --git a/util/udev/50-qmk.rules b/util/udev/50-qmk.rules
index 57806f9df0..86f1dc9004 100644
--- a/util/udev/50-qmk.rules
+++ b/util/udev/50-qmk.rules
@@ -28,6 +28,9 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05df", TAG+="uacc
 # USBAspLoader
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess"
 
+# USBtinyISP
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1782", ATTRS{idProduct}=="0c9f", TAG+="uaccess"
+
 # ModemManager should ignore the following devices
 # Atmel SAM-BA (Massdrop)
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
@@ -72,3 +75,9 @@ KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2067", TAG+="uaccess"
 ## PJRC's HalfKay
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess"
+
+# APM32 DFU
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="314b", ATTRS{idProduct}=="0106", TAG+="uaccess"
+
+# GD32V DFU
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="28e9", ATTRS{idProduct}=="0189", TAG+="uaccess"

From 7ee55b17540f1ec1dfae95e870cf29d74dcea8ad Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Sat, 20 Aug 2022 17:59:17 +0300
Subject: [PATCH 219/959] Fix PID value for the Keyboardio Atreus 2 bootloader
 (#18116)

Copy the correct PID from `util/udev/50-qmk.rules`.
---
 lib/python/qmk/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 10da5e7e8e..622199e46e 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -88,7 +88,7 @@ BOOTLOADER_VIDS_PIDS = {
     'md-boot': {("03eb", "6124")},
     'caterina': {
         # pid.codes shared PID
-        ("1209", "9203"),  # Keyboardio Atreus 2 Bootloader
+        ("1209", "2302"),  # Keyboardio Atreus 2 Bootloader
         # Spark Fun Electronics
         ("1b4f", "9203"),  # Pro Micro 3V3/8MHz
         ("1b4f", "9205"),  # Pro Micro 5V/16MHz

From 9b7965d3a962461355f7fa8c8bf06341b8eabc62 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 21 Aug 2022 18:38:17 +0100
Subject: [PATCH 220/959] Align CLI requirements (#18117)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 9c192b0f0f..6bee746324 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@
 appdirs
 argcomplete
 colorama
+dotty-dict
 hid
 hjson
 jsonschema>=4
@@ -9,5 +10,4 @@ milc>=1.4.2
 pygments
 pyserial
 pyusb
-qmk-dotty-dict
 pillow

From bbc3bc55f2d52b90881470695ee132f5a57bfaa3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 21 Aug 2022 23:55:30 +0100
Subject: [PATCH 221/959] RESET -> QK_BOOT user keymaps (#17940)

---
 .../0xcb/static/keymaps/bongocat/keymap.c     |  2 +-
 .../1up60hse/keymaps/vosechu/keymap.c         |  2 +-
 .../1up60hte/keymaps/badger/keymap.c          |  4 +-
 .../1up60hte/keymaps/hhkb/keymap.c            |  2 +-
 .../1up60rgb/keymaps/badger/keymap.c          |  4 +-
 .../1up60rgb/keymaps/raffle/keymap.c          |  2 +-
 .../super16/keymaps/ahk_companion/keymap.c    |  4 +-
 .../super16/keymaps/nblyumberg/keymap.c       |  2 +-
 .../super16v2/keymaps/mouse/keymap.c          |  2 +-
 .../25keys/zinc/keymaps/ginjake/keymap.c      |  2 +-
 keyboards/25keys/zinc/keymaps/monks/keymap.c  |  2 +-
 .../25keys/zinc/keymaps/toshi0383/keymap.c    |  2 +-
 .../gherkin/keymaps/midi/keymap.c             |  2 +-
 .../gherkin/keymaps/mjt/keymap.c              |  2 +-
 .../gherkin/keymaps/pierrec83/keymap.json     |  2 +-
 .../gherkin/keymaps/talljoe-gherkin/keymap.c  |  2 +-
 .../half_n_half/keymaps/Boy_314/keymap.c      |  2 +-
 .../nori/keymaps/wings_36key/keymap.c         |  4 +-
 .../ut47/keymaps/nordic/keymap.c              |  4 +-
 .../4pplet/steezy60/keymaps/4pplet/keymap.c   |  2 +-
 keyboards/9key/keymaps/bcat/keymap.c          |  2 +-
 keyboards/a_dux/keymaps/daliusd/keymap.c      |  2 +-
 .../breeze/keymaps/eithanshavit/keymap.c      |  2 +-
 keyboards/ai03/equinox/keymaps/crd/keymap.c   |  2 +-
 keyboards/ai03/lunar/keymaps/muzfuz/keymap.c  |  2 +-
 .../ai03/polaris/keymaps/mekberg/keymap.c     |  2 +-
 .../ai03/polaris/keymaps/testing/keymap.c     |  2 +-
 keyboards/ai03/quasar/keymaps/ai03/keymap.c   |  2 +-
 .../fine40/keymaps/default/keymap.c           |  2 +-
 .../fine40/keymaps/via/keymap.c               |  2 +-
 .../akb/raine/keymaps/mehadviceguy/keymap.c   |  2 +-
 keyboards/al1/keymaps/splitbs/keymap.c        |  2 +-
 keyboards/alf/x2/keymaps/hhkb_60/keymap.c     |  2 +-
 keyboards/alpha/keymaps/hvp/keymap.c          |  2 +-
 keyboards/alps64/keymaps/crd/keymap.c         |  2 +-
 .../amjkeyboard/amj40/keymaps/fabian/keymap.c |  2 +-
 .../amj40/keymaps/jetpacktuxedo/keymap.c      |  2 +-
 .../amjkeyboard/amj40/keymaps/myee/keymap.c   |  2 +-
 .../amjkeyboard/amjpad/keymaps/max/keymap.c   |  2 +-
 .../a65i/keymaps/ansi_splitbs/keymap.c        |  2 +-
 .../aos/tkl/keymaps/aholland909/keymap.c      |  2 +-
 keyboards/arisu/keymaps/fate/keymap.c         |  2 +-
 keyboards/arisu/keymaps/kresnak/keymap.c      |  2 +-
 keyboards/arisu/keymaps/stanrc85/keymap.c     |  2 +-
 keyboards/atomic/keymaps/pvc/keymap.c         |  4 +-
 keyboards/atreus/keymaps/clash/keymap.c       |  2 +-
 keyboards/atreus/keymaps/classic/keymap.c     |  2 +-
 .../atreus/keymaps/dvorak_42_key/keymap.c     |  2 +-
 keyboards/atreus/keymaps/erlandsona/keymap.c  |  2 +-
 keyboards/atreus/keymaps/gerb/keymap.c        |  2 +-
 keyboards/atreus/keymaps/henxing/keymap.c     |  2 +-
 keyboards/atreus/keymaps/jeremy/keymap.c      |  2 +-
 keyboards/atreus/keymaps/kejadlen/keymap.c    |  2 +-
 keyboards/atreus/keymaps/khitsule/keymap.c    |  2 +-
 keyboards/atreus/keymaps/nojjan/keymap.c      |  2 +-
 keyboards/atreus/keymaps/ptillemans/keymap.c  |  2 +-
 keyboards/atreus/keymaps/quartz64/keymap.c    |  4 +-
 .../atreus/keymaps/replicaJunction/keymap.c   |  2 +-
 keyboards/atreus/keymaps/talljoe/config.h     |  4 +-
 keyboards/atreus/keymaps/workman/keymap.c     |  2 +-
 keyboards/atreus/keymaps/xk/keymap.c          |  2 +-
 keyboards/atreus/keymaps/xyverz/keymap.c      |  4 +-
 keyboards/atreus/keymaps/yttyx/keymap.c       |  4 +-
 keyboards/atreus62/keymaps/194h/keymap.c      |  2 +-
 keyboards/atreus62/keymaps/d4mation/keymap.c  |  4 +-
 keyboards/atreus62/keymaps/hvp/keymap.c       |  2 +-
 keyboards/atreus62/keymaps/pcewing/keymap.c   |  2 +-
 keyboards/atreus62/keymaps/scheiklp/keymap.c  |  2 +-
 keyboards/atreus62/keymaps/xyverz/keymap.c    |  2 +-
 .../b_sides/rev41lp/keymaps/cyril/keymap.c    |  2 +-
 .../b_sides/rev41lp/keymaps/namnlos/keymap.c  |  2 +-
 .../bacca70/keymaps/debaccabean/keymap.c      |  2 +-
 .../bacca70/keymaps/dede-special/keymap.c     |  2 +-
 keyboards/bajjak/keymaps/5x6/keymap.c         |  4 +-
 keyboards/bajjak/keymaps/default/keymap.c     |  4 +-
 .../slice/rev1/keymaps/2moons/keymap.c        |  2 +-
 .../rev1_rgb/keymaps/2moons_rgb/keymap.c      |  2 +-
 .../scylla/keymaps/german_gaming/keymap.c     |  4 +-
 .../bastardkb/scylla/keymaps/xyverz/keymap.c  |  6 +-
 .../tbk/keymaps/german_gaming/keymap.c        |  4 +-
 .../bastardkb/tbk/keymaps/xyverz/keymap.c     |  6 +-
 keyboards/bfake/keymaps/mechmerlin/keymap.c   |  2 +-
 .../ergo42/keymaps/biacco-biacco/keymap.c     |  4 +-
 .../ergo42/keymaps/biacco-macOS/keymap.c      |  2 +-
 .../ergo42/keymaps/biacco-underglow/keymap.c  |  4 +-
 .../ergo42/keymaps/biacco-winjp/keymap.c      |  2 +-
 .../biacco42/ergo42/keymaps/biacco/keymap.c   |  2 +-
 .../biacco42/ergo42/keymaps/hdbx/keymap.c     |  4 +-
 .../biacco42/ergo42/keymaps/koba/keymap.c     |  2 +-
 .../biacco42/ergo42/keymaps/shinze/keymap.c   |  2 +-
 .../biacco42/ergo42/keymaps/yshrsmz/keymap.c  |  4 +-
 .../manibus/keymaps/samurai/keymap.c          |  2 +-
 .../bizarre/keymaps/nopunin10did/keymap.c     |  2 +-
 .../4x12/keymaps/codecoffeecode/keymap.c      |  2 +-
 .../the_mark/keymaps/stanrc85/keymap.c        |  2 +-
 .../boardwalk/keymaps/mcallaster/keymap.c     |  2 +-
 .../boardwalk/keymaps/nchristus/keymap.c      |  2 +-
 keyboards/boardwalk/keymaps/niclake/keymap.c  |  4 +-
 .../frosty_flake/keymaps/QFR_JM/keymap.c      |  2 +-
 .../pegasushoof/keymaps/blowrak/keymap.c      |  2 +-
 .../pegasushoof/keymaps/citadel/keymap.c      |  2 +-
 .../instant60/keymaps/via_standard/keymap.c   |  2 +-
 .../satisfaction75/keymaps/boy_314/keymap.c   |  2 +-
 .../tmov2/keymaps/brandonschlack/keymap.c     |  2 +-
 keyboards/centromere/keymaps/mattly/keymap.c  |  2 +-
 keyboards/centromere/keymaps/mini/keymap.c    |  2 +-
 .../charue/charon/keymaps/debug/keymap.c      |  2 +-
 .../sunsetter/keymaps/peott-fr/keymap.c       |  2 +-
 .../sunsetter_r2/keymaps/debug/keymap.c       |  2 +-
 .../axon40/keymaps/npspears/keymap.c          |  2 +-
 .../phoenix45_ortho/keymaps/6u/keymap.c       |  2 +-
 .../plexus75_he/keymaps/via/keymap.c          |  2 +-
 .../quark/keymaps/ajp10304/keymap.c           |  2 +-
 .../quark/keymaps/pezhore/keymap.c            |  2 +-
 .../quark_lp/keymaps/mit/keymap.c             |  4 +-
 .../quark_plus/keymaps/2u/keymap.c            |  4 +-
 .../quark_plus/keymaps/2x225u/keymap.c        |  4 +-
 .../quark_squared/keymaps/2u/keymap.c         |  4 +-
 .../quark_squared/keymaps/5_2u/keymap.c       |  4 +-
 .../quark_squared/keymaps/5_2x225u/keymap.c   |  4 +-
 .../ud40_ortho_alt/keymaps/600u/keymap.c      |  8 +-
 .../ud40_ortho_alt/keymaps/600u_alt/keymap.c  |  8 +-
 .../ud40_ortho_alt/keymaps/700u/keymap.c      |  8 +-
 .../ud40_ortho_alt/keymaps/npspears/keymap.c  |  8 +-
 .../cheshire/curiosity/keymaps/crd/keymap.c   |  2 +-
 .../curiosity/keymaps/madhatter/keymap.c      |  4 +-
 keyboards/chlx/merro60/keymaps/hhkb/keymap.c  |  2 +-
 .../chlx/str_merro60/keymaps/hhkb/keymap.c    |  2 +-
 .../clueboard/66/keymaps/badger/keymap.c      |  2 +-
 .../clueboard/66/keymaps/bloodlvst/keymap.c   |  2 +-
 .../clueboard/66/keymaps/caps_fn/keymap.c     |  2 +-
 .../clueboard/66/keymaps/colemak/keymap.c     |  2 +-
 .../clueboard/66/keymaps/jokrik/keymap.c      |  2 +-
 .../66/keymaps/mac_optimized/keymap.c         |  2 +-
 .../clueboard/66/keymaps/magicmonty/keymap.c  |  2 +-
 .../66/keymaps/manofinterests/keymap.c        |  2 +-
 .../clueboard/66/keymaps/maximised/keymap.c   |  2 +-
 .../clueboard/66/keymaps/mouse_keys/keymap.c  |  2 +-
 .../clueboard/66/keymaps/mrscooty/keymap.c    |  2 +-
 .../clueboard/66/keymaps/muzfuz/keymap.c      |  2 +-
 .../clueboard/66/keymaps/serubin/keymap.c     |  2 +-
 .../clueboard/66/keymaps/shift_fn/keymap.c    |  2 +-
 keyboards/clueboard/66/keymaps/smt/keymap.c   |  2 +-
 .../clueboard/66/keymaps/tetris/keymap.c      |  2 +-
 .../66/keymaps/unix_optimized/keymap.c        |  2 +-
 .../66/keymaps/win_optimized/keymap.c         |  2 +-
 keyboards/clueboard/66/rev4/keymaps/keymap.c  |  2 +-
 .../clueboard/66/rev4/keymaps/mine/keymap.c   |  2 +-
 .../66_hotswap/gen1/keymaps/json/keymap.json  |  2 +-
 .../coarse/ixora/keymaps/wntrmln/keymap.c     |  2 +-
 keyboards/contra/keymaps/alper/keymap.c       |  2 +-
 .../contra/keymaps/losinggeneration/keymap.c  |  4 +-
 keyboards/contra/keymaps/msiu/keymap.c        |  2 +-
 .../keymaps/dsanchezseco/keymap.c             |  2 +-
 .../keymaps/newbold/keymap.c                  |  2 +-
 .../usb_usb/keymaps/coloneljesus/keymap.c     |  2 +-
 .../converter/usb_usb/keymaps/narze/keymap.c  |  2 +-
 .../keymaps/brandonschlack/keymap.c           |  2 +-
 .../discipline/keymaps/briianpowell/keymap.c  |  2 +-
 .../discipline/keymaps/osx/keymap.c           |  2 +-
 .../mullet/keymaps/alternate/keymap.c         |  4 +-
 .../mysterium/keymaps/ansi_7u/keymap.c        |  2 +-
 .../romeo/keymaps/brandonschlack/keymap.c     |  2 +-
 .../speedo/v3/keymaps/pcewing/keymap.c        |  2 +-
 keyboards/crkbd/keymaps/ardakilic/keymap.c    |  4 +-
 keyboards/crkbd/keymaps/blipson/keymap.c      |  2 +-
 keyboards/crkbd/keymaps/crkdves/keymap.c      |  2 +-
 keyboards/crkbd/keymaps/crkqwes/keymap.c      |  2 +-
 keyboards/crkbd/keymaps/davidrambo/keymap.c   |  2 +-
 keyboards/crkbd/keymaps/devdev/keymap.c       |  4 +-
 keyboards/crkbd/keymaps/gotham/keymap.c       |  2 +-
 keyboards/crkbd/keymaps/hvp/keymap.c          |  2 +-
 keyboards/crkbd/keymaps/jpe230/keymap.c       |  2 +-
 keyboards/crkbd/keymaps/madhatter/keymap.c    |  2 +-
 keyboards/crkbd/keymaps/mb_via/keymap.c       |  2 +-
 keyboards/crkbd/keymaps/oled_sample/keymap.c  |  2 +-
 keyboards/crkbd/keymaps/ollyhayes/keymap.c    |  2 +-
 keyboards/crkbd/keymaps/rarick/keymap.c       |  2 +-
 keyboards/crkbd/keymaps/rmeli/keymap.c        |  2 +-
 keyboards/crkbd/keymaps/rpbaptist/keymap.c    |  2 +-
 keyboards/crkbd/keymaps/soundmonster/keymap.c |  2 +-
 keyboards/crkbd/keymaps/thumb_ctrl/keymap.c   |  2 +-
 keyboards/crkbd/keymaps/toinux/keymap.c       |  2 +-
 .../keymaps/vlukash_trackpad_left/keymap.c    |  2 +-
 .../keymaps/vlukash_trackpad_right/keymap.c   |  2 +-
 keyboards/crkbd/keymaps/xyverz/keymap.c       |  2 +-
 .../cutie_club/wraith/keymaps/amber/keymap.c  |  2 +-
 .../cutie_club/wraith/keymaps/timer/keymap.c  |  2 +-
 keyboards/cx60/keymaps/via_caps/keymap.c      |  2 +-
 .../dailycraft/claw44/keymaps/oled/keymap.c   |  4 +-
 .../keymaps/split_backspace/keymap.c          |  2 +-
 .../vaguettelite/keymaps/noclew/keymap.c      |  2 +-
 .../deltasplit75/keymaps/itsaferbie/keymap.c  |  2 +-
 .../deltasplit75/keymaps/mbsurfer/keymap.c    |  2 +-
 .../deltasplit75/keymaps/protosplit/keymap.c  |  2 +-
 .../plaid/keymaps/brickbots/keymap.c          |  2 +-
 .../plaid/keymaps/gipsy-king/keymap.c         |  2 +-
 .../plaid/keymaps/stephen-huan/keymap.c       |  2 +-
 .../plaid/keymaps/thehalfdeafchef/keymap.c    |  4 +-
 .../spin/keymaps/spidey3_pad/keymap.c         |  2 +-
 keyboards/do60/keymaps/crd/keymap.c           |  2 +-
 keyboards/do60/keymaps/test/keymap.c          |  2 +-
 .../budget96/keymaps/donut/keymap.c           |  2 +-
 .../scrabblepad/keymaps/random/keymap.c       |  2 +-
 keyboards/dp60/keymaps/allleds/keymap.c       |  2 +-
 keyboards/dp60/keymaps/indicator/keymap.c     |  2 +-
 keyboards/draculad/keymaps/pimoroni/keymap.c  |  4 +-
 .../elise/keymaps/blake_iso/keymap.c          |  4 +-
 .../elise_v2/keymaps/blake_iso/keymap.c       |  4 +-
 .../v2/keymaps/profanum429/keymap.c           |  2 +-
 .../duck/lightsaver/keymaps/rasmus/keymap.c   |  2 +-
 keyboards/dumbo/keymaps/trip-trap/keymap.c    |  4 +-
 .../dumbpad/v1x_oled/keymaps/default/keymap.c |  2 +-
 .../dumbpad/v1x_oled/keymaps/via/keymap.c     |  2 +-
 .../durgod/k3x0/keymaps/chimera/keymap.c      |  6 +-
 keyboards/durgod/k3x0/keymaps/typhon/keymap.c |  6 +-
 .../dz60/keymaps/60_plus_arrows/keymap.c      |  4 +-
 .../dz60/keymaps/Ansi_plus_fn_arrows/keymap.c |  2 +-
 keyboards/dz60/keymaps/LEdiodes/keymap.c      |  2 +-
 .../keymaps/_bonfire/keymap-parts/layers.c    |  4 +-
 keyboards/dz60/keymaps/atlacat/keymap.c       |  2 +-
 keyboards/dz60/keymaps/billiams/keymap.c      |  4 +-
 .../dz60/keymaps/billiams_layout2/keymap.c    |  4 +-
 .../dz60/keymaps/billiams_layout4/keymap.c    |  4 +-
 keyboards/dz60/keymaps/bingocaller/keymap.c   |  4 +-
 keyboards/dz60/keymaps/boris_burger/keymap.c  |  4 +-
 keyboards/dz60/keymaps/calbatr0ss/keymap.c    |  2 +-
 keyboards/dz60/keymaps/chrisae9/keymap.c      |  2 +-
 keyboards/dz60/keymaps/coppertop/keymap.c     |  4 +-
 keyboards/dz60/keymaps/crd_2u_lshift/keymap.c |  4 +-
 keyboards/dz60/keymaps/crd_ansi/keymap.c      |  2 +-
 keyboards/dz60/keymaps/crd_tsangan/keymap.c   |  2 +-
 keyboards/dz60/keymaps/danbee/keymap.c        |  2 +-
 keyboards/dz60/keymaps/doogle999/keymap.c     |  2 +-
 keyboards/dz60/keymaps/edulpn/keymap.c        |  2 +-
 keyboards/dz60/keymaps/eric/keymap.c          |  2 +-
 keyboards/dz60/keymaps/f3d3/keymap.c          |  4 +-
 keyboards/dz60/keymaps/frogger/keymap.c       |  4 +-
 keyboards/dz60/keymaps/gk64/keymap.c          |  2 +-
 keyboards/dz60/keymaps/hailbreno/keymap.c     |  2 +-
 keyboards/dz60/keymaps/iso_de_andys8/keymap.c |  2 +-
 keyboards/dz60/keymaps/itsaferbie/keymap.c    |  2 +-
 keyboards/dz60/keymaps/jarred/keymap.c        |  2 +-
 keyboards/dz60/keymaps/jkbone/keymap.c        |  2 +-
 keyboards/dz60/keymaps/joooosh_hhkb/keymap.c  |  4 +-
 keyboards/dz60/keymaps/kifinnsson/keymap.c    |  2 +-
 keyboards/dz60/keymaps/krusli/keymap.c        |  2 +-
 keyboards/dz60/keymaps/lint_kid/keymap.c      |  2 +-
 keyboards/dz60/keymaps/macos_64/keymap.c      |  4 +-
 keyboards/dz60/keymaps/macos_arrow/keymap.c   |  2 +-
 keyboards/dz60/keymaps/marianas/keymap.c      |  2 +-
 keyboards/dz60/keymaps/mechmerlin/keymap.c    |  2 +-
 keyboards/dz60/keymaps/model42/keymap.c       |  2 +-
 keyboards/dz60/keymaps/mpstewart/keymap.c     |  4 +-
 keyboards/dz60/keymaps/muralisc/keymap.c      |  4 +-
 keyboards/dz60/keymaps/muzfuz/keymap.c        |  2 +-
 keyboards/dz60/keymaps/n0velty/keymap.c       |  2 +-
 keyboards/dz60/keymaps/niclake/keymap.c       |  2 +-
 keyboards/dz60/keymaps/olivierko/keymap.c     |  2 +-
 .../dz60/keymaps/olligranlund_iso/keymap.c    |  2 +-
 .../dz60/keymaps/olligranlund_iso_v2/keymap.c |  2 +-
 keyboards/dz60/keymaps/ottodokto/keymap.c     |  2 +-
 keyboards/dz60/keymaps/pevecyan/keymap.c      |  2 +-
 keyboards/dz60/keymaps/pok3r/keymap.c         |  2 +-
 .../dz60/keymaps/split_space_arrows/keymap.c  |  2 +-
 keyboards/dz60/keymaps/spotpuff/keymap.c      |  4 +-
 keyboards/dz60/keymaps/stephengrier/keymap.c  |  4 +-
 keyboards/dz60/keymaps/tailcall/keymap.c      |  2 +-
 keyboards/dz60/keymaps/thomasviaud/keymap.c   |  2 +-
 .../dz60/keymaps/twschum_b_4_10/keymap.c      |  2 +-
 keyboards/dz60/keymaps/weeheavy/keymap.c      |  4 +-
 .../keymaps/weeheavy_2.25_lshift/keymap.c     |  4 +-
 keyboards/dz60/keymaps/xtonhasvim/keymap.c    |  2 +-
 keyboards/dz60/keymaps/zepol_layout/keymap.c  |  2 +-
 .../dztech/dz60rgb/keymaps/didel/keymap.c     |  4 +-
 .../dztech/dz60rgb/keymaps/kgreulich/keymap.c |  4 +-
 .../dz60rgb/keymaps/mechmaster48/keymap.c     |  8 +-
 .../dztech/dz60rgb/keymaps/mekanist/keymap.c  |  4 +-
 .../dztech/dz60rgb/keymaps/moults31/keymap.c  |  4 +-
 .../dztech/dz60rgb/keymaps/perseid/keymap.c   |  2 +-
 .../dztech/dz60rgb/keymaps/piv3rt/keymap.c    |  2 +-
 .../dztech/dz60rgb/keymaps/xunz/keymap.c      |  4 +-
 .../dz60rgb_ansi/keymaps/badger/keymap.c      |  4 +-
 .../dz60rgb_ansi/keymaps/bingocaller/keymap.c |  4 +-
 .../dztech/dz60rgb_ansi/keymaps/kuru/keymap.c |  6 +-
 .../dz60rgb_ansi/keymaps/muralisc/keymap.c    |  4 +-
 .../dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c  |  2 +-
 keyboards/dztech/dz65rgb/keymaps/adi/keymap.c |  2 +-
 .../dz65rgb/keymaps/catrielmuller/keymap.c    |  2 +-
 .../dztech/dz65rgb/keymaps/chocol8/keymap.c   |  2 +-
 .../dztech/dz65rgb/keymaps/jumper149/keymap.c |  2 +-
 .../dztech/dz65rgb/keymaps/pagondel/keymap.c  |  2 +-
 keyboards/eco/keymaps/bcat/keymap.c           |  2 +-
 keyboards/eco/keymaps/that_canadian/keymap.c  |  2 +-
 keyboards/eco/keymaps/xyverz/keymap.c         |  2 +-
 .../edi/hardlight/mk2/keymaps/kate/keymap.c   |  2 +-
 keyboards/eek/keymaps/ledtest/keymap.c        |  2 +-
 keyboards/ein_60/keymaps/ledtest/keymap.c     |  4 +-
 .../ergodox_ez/keymaps/danielo515/keymap.c    |  2 +-
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c |  2 +-
 .../keymaps/hacker_dvorak/hacker_dvorak.c     |  2 +-
 keyboards/ergodox_ez/keymaps/nfriend/keymap.c |  2 +-
 .../ergodox_ez/keymaps/rgb_layer/keymap.c     |  2 +-
 keyboards/ergodox_ez/keymaps/rishka/keymap.c  |  2 +-
 .../ergodox_ez/keymaps/smurmann/keymap.c      |  2 +-
 keyboards/ergodox_ez/keymaps/stamm/keymap.c   |  2 +-
 keyboards/ergodox_ez/keymaps/steno/keymap.c   |  4 +-
 .../ergodox_ez/keymaps/toshi0383/keymap.c     | 98 +++++++++++++++++++
 keyboards/ergotravel/keymaps/ian/keymap.c     |  2 +-
 keyboards/ergotravel/keymaps/yanfali/keymap.c |  2 +-
 .../eternal_keypad/keymaps/kyek/keymap.c      |  2 +-
 .../eternal_keypad/keymaps/lefty/keymap.c     |  2 +-
 .../evyd13/atom47/keymaps/LEdiodes/keymap.c   |  4 +-
 .../evyd13/atom47/keymaps/evyd13/keymap.c     |  2 +-
 .../atom47/keymaps/junonum_a47/keymap.c       |  2 +-
 .../evyd13/eon65/keymaps/mrsendyyk/keymap.c   |  2 +-
 .../evyd13/gud70/keymaps/evyd13/keymap.c      |  2 +-
 .../evyd13/nt660/keymaps/evyd13/keymap.c      |  2 +-
 .../evyd13/plain60/keymaps/audio/keymap.c     |  2 +-
 .../plain60/keymaps/kwerdenker/keymap.c       |  2 +-
 keyboards/evyd13/plain60/keymaps/rgb/keymap.c |  2 +-
 keyboards/evyd13/ta65/keymaps/evyd13/keymap.c |  2 +-
 .../evyd13/wonderland/keymaps/keebs/keymap.c  |  2 +-
 .../keymaps/rafael-azevedo/keymap.c           |  2 +-
 .../evyd13/wonderland/keymaps/rys/keymap.c    |  2 +-
 keyboards/exclusive/e65/keymaps/crd/keymap.c  |  2 +-
 .../exclusive/e65/keymaps/madhatter/keymap.c  |  2 +-
 .../exclusive/e65/keymaps/masterzen/keymap.c  |  2 +-
 .../exclusive/e6_rgb/keymaps/60_hhkb/keymap.c |  2 +-
 .../exclusive/e6_rgb/keymaps/allleds/keymap.c |  2 +-
 .../exclusive/e6v2/le/keymaps/eric/keymap.c   |  2 +-
 .../exclusive/e6v2/le/keymaps/johu/keymap.c   |  4 +-
 .../e6v2/oe/keymaps/amnesia0287/keymap.c      |  2 +-
 .../e7v1/keymaps/ansi_splitbs/keymap.c        |  2 +-
 .../exclusive/e7v1/keymaps/masterzen/keymap.c |  2 +-
 .../exclusive/e7v1se/keymaps/mac/keymap.c     |  2 +-
 .../e85/hotswap/keymaps/standard/keymap.c     |  2 +-
 .../e85/soldered/keymaps/standard/keymap.c    |  2 +-
 .../eyeohdesigns/babyv/keymaps/1u/keymap.c    |  2 +-
 .../eyeohdesigns/babyv/keymaps/1u2u/keymap.c  |  4 +-
 .../eyeohdesigns/babyv/keymaps/2u1u/keymap.c  |  2 +-
 .../babyv/keymaps/melonbred/keymap.c          |  2 +-
 .../eyeohdesigns/sprh/keymaps/acs/keymap.c    |  2 +-
 .../eyeohdesigns/sprh/keymaps/ad5/keymap.c    |  2 +-
 .../eyeohdesigns/sprh/keymaps/ads/keymap.c    |  2 +-
 .../eyeohdesigns/sprh/keymaps/bc5/keymap.c    |  2 +-
 .../eyeohdesigns/sprh/keymaps/bcs/keymap.c    |  2 +-
 .../eyeohdesigns/sprh/keymaps/bd5/keymap.c    |  2 +-
 .../eyeohdesigns/sprh/keymaps/bds/keymap.c    |  2 +-
 .../theboulevard/keymaps/ortho2/keymap.c      |  2 +-
 .../theboulevard/keymaps/ortho3/keymap.c      |  2 +-
 .../theboulevard/keymaps/ortho4/keymap.c      |  2 +-
 .../theboulevard/keymaps/ortho5/keymap.c      |  2 +-
 .../theboulevard/keymaps/stagger1/keymap.c    |  2 +-
 .../theboulevard/keymaps/stagger2/keymap.c    |  2 +-
 .../theboulevard/keymaps/stagger3/keymap.c    |  2 +-
 .../theboulevard/keymaps/stagger4/keymap.c    |  2 +-
 .../theboulevard/keymaps/stagger5/keymap.c    |  2 +-
 keyboards/fc660c/keymaps/siroleo/keymap.c     |  2 +-
 keyboards/fc660c/keymaps/via_rgb/keymap.c     |  2 +-
 keyboards/ferris/keymaps/madhatter/keymap.c   |  2 +-
 .../ferris/keymaps/pierrec83/keymap.json      |  2 +-
 .../fleuron/keymaps/dollartacos/keymap.c      |  4 +-
 .../cornelius/keymaps/gipsy-king/keymap.c     |  2 +-
 .../foostan/cornelius/keymaps/hvp/keymap.c    |  4 +-
 .../leaf60/hotswap/keymaps/crd/keymap.c       |  2 +-
 .../leaf60/universal/keymaps/jarred/keymap.c  |  2 +-
 .../leaf60/universal/keymaps/mguterl/keymap.c |  2 +-
 keyboards/free_willy/keymaps/colemak/keymap.c |  2 +-
 .../nano/keymaps/safe_mode/keymap.c           |  2 +-
 keyboards/ft/mars65/keymaps/default/keymap.c  |  2 +-
 keyboards/ft/mars65/keymaps/via/keymap.c      |  2 +-
 .../frogmini/fmh/keymaps/default/keymap.c     |  2 +-
 .../frogmini/fmh/keymaps/via/keymap.c         |  2 +-
 .../frogmini/fms/keymaps/default/keymap.c     |  2 +-
 .../frogmini/fms/keymaps/via/keymap.c         |  2 +-
 keyboards/gh60/revc/keymaps/bluezio/keymap.c  |  2 +-
 keyboards/gh60/revc/keymaps/chaser/keymap.c   |  2 +-
 .../gh60/satan/keymaps/addcninblue/keymap.c   |  6 +-
 keyboards/gh60/satan/keymaps/bri/keymap.c     |  6 +-
 keyboards/gh60/satan/keymaps/chaser/keymap.c  |  2 +-
 keyboards/gh60/satan/keymaps/colemak/keymap.c |  6 +-
 keyboards/gh60/satan/keymaps/dbroqua/keymap.c |  4 +-
 keyboards/gh60/satan/keymaps/denolfe/keymap.c |  8 +-
 .../gh60/satan/keymaps/dkrieger/keymap.c      |  8 +-
 keyboards/gh60/satan/keymaps/fakb/keymap.c    |  2 +-
 .../gh60/satan/keymaps/gipsy-king/keymap.c    |  2 +-
 keyboards/gh60/satan/keymaps/isoHHKB/keymap.c |  4 +-
 keyboards/gh60/satan/keymaps/jarred/keymap.c  |  2 +-
 keyboards/gh60/satan/keymaps/lepa/keymap.c    |  2 +-
 keyboards/gh60/satan/keymaps/poker/keymap.c   |  6 +-
 keyboards/gh60/satan/keymaps/rask63/keymap.c  |  2 +-
 keyboards/gh60/satan/keymaps/sethbc/keymap.c  |  4 +-
 keyboards/gh60/satan/keymaps/smt/keymap.c     |  4 +-
 .../gh60/satan/keymaps/spacemanspiff/keymap.c |  4 +-
 .../gh60/satan/keymaps/stanleylai/keymap.c    |  4 +-
 keyboards/gh60/satan/keymaps/unxmaal/keymap.c |  6 +-
 .../gh60/v1p3/keymaps/factory_hhkb/keymap.c   |  2 +-
 .../v1p3/keymaps/factory_layout5/keymap.c     |  2 +-
 .../v1p3/keymaps/factory_layout7/keymap.c     |  2 +-
 .../v1p3/keymaps/factory_layout9/keymap.c     |  2 +-
 .../gh60/v1p3/keymaps/factory_minila/keymap.c |  2 +-
 .../gh60/v1p3/keymaps/factory_poker/keymap.c  |  2 +-
 .../j73gl/keymaps/via_rgb_matrix/keymap.c     |  2 +-
 .../gl516/n51gl/keymaps/salicylic/keymap.c    |  2 +-
 .../gmmk2/p96/ansi/keymaps/default/keymap.c   |  2 +-
 .../gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c  |  2 +-
 .../gmmk2/p96/iso/keymaps/default/keymap.c    |  2 +-
 .../gmmk/gmmk2/p96/iso/keymaps/via/keymap.c   |  2 +-
 .../pro/rev1/ansi/keymaps/alexmarmon/keymap.c |  4 +-
 .../pro/rev1/ansi/keymaps/andrebrait/keymap.c |  6 +-
 .../rev1/ansi/keymaps/andrewcharnley/keymap.c |  4 +-
 .../gmmk/pro/rev1/ansi/keymaps/batin/keymap.c |  2 +-
 .../pro/rev1/ansi/keymaps/benschaeff/keymap.c |  4 +-
 .../pro/rev1/ansi/keymaps/byungyoonc/keymap.c |  2 +-
 .../pro/rev1/ansi/keymaps/cedrikl/keymap.c    |  4 +-
 .../rev1/ansi/keymaps/coryginsberg/keymap.c   |  4 +-
 .../pro/rev1/ansi/keymaps/hachetman/keymap.c  |  4 +-
 .../pro/rev1/ansi/keymaps/jackkenney/keymap.c |  6 +-
 .../pro/rev1/ansi/keymaps/jonavin/keymap.c    |  2 +-
 .../rev1/ansi/keymaps/lalitmaganti/keymap.c   |  2 +-
 .../gmmk/pro/rev1/ansi/keymaps/macos/keymap.c |  4 +-
 .../pro/rev1/ansi/keymaps/mattgauf/keymap.c   |  2 +-
 .../pro/rev1/ansi/keymaps/mike1808/mike1808.h |  2 +-
 .../pro/rev1/ansi/keymaps/moults31/keymap.c   |  4 +-
 .../pro/rev1/ansi/keymaps/paddlegame/keymap.c |  2 +-
 .../rev1/ansi/keymaps/stickandgum/keymap.c    |  2 +-
 .../rev1/ansi/keymaps/wholesomeducky/keymap.c |  2 +-
 .../pro/rev1/ansi/keymaps/willwm/keymap.c     |  2 +-
 .../pro/rev1/ansi/keymaps/willwm/keymap.json  |  2 +-
 .../pro/rev1/iso/keymaps/chofstede/keymap.c   |  4 +-
 .../pro/rev1/iso/keymaps/gourdo1/keymap.c     |  2 +-
 .../pro/rev1/iso/keymaps/jonavin/keymap.c     |  2 +-
 .../gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c |  6 +-
 .../pro/rev2/ansi/keymaps/default/keymap.c    |  4 +-
 .../gmmk/pro/rev2/ansi/keymaps/via/keymap.c   |  4 +-
 .../pro/rev2/iso/keymaps/default/keymap.c     |  4 +-
 .../gmmk/pro/rev2/iso/keymaps/via/keymap.c    |  4 +-
 keyboards/gon/nerd60/keymaps/mauin/keymap.c   |  2 +-
 .../gon/nerdtkl/keymaps/gam3cat/keymap.c      |  2 +-
 .../gopolar/gg86/keymaps/horrortroll/keymap.c |  2 +-
 .../gray_studio/cod67/keymaps/rys/keymap.c    |  2 +-
 .../gray_studio/cod67/keymaps/via/keymap.c    |  2 +-
 .../gray_studio/hb85/keymaps/stt/keymap.c     |  2 +-
 .../space65/keymaps/billiams/keymap.c         |  4 +-
 .../space65/keymaps/conor/keymap.c            |  2 +-
 .../space65/keymaps/madhatter/keymap.c        |  2 +-
 .../solder/keymaps/brandonschlack/keymap.c    |  2 +-
 .../solder/keymaps/dangjoeltang/keymap.c      |  2 +-
 .../think65/solder/keymaps/rys/keymap.c       |  2 +-
 .../hadron/ver2/keymaps/side_numpad/keymap.c  |  2 +-
 keyboards/hadron/ver3/keymaps/ishtob/keymap.c |  2 +-
 .../handwired/3dfoxc/keymaps/dlg/keymap.c     |  2 +-
 .../handwired/6macro/keymaps/osu/keymap.c     |  6 +-
 .../handwired/aek64/keymaps/4sstylz/keymap.c  |  2 +-
 .../handwired/aim65/keymaps/bonnee/keymap.c   |  2 +-
 .../aranck/keymaps/turkishish/keymap.c        |  2 +-
 .../arrow_pad/keymaps/pad_21/keymap.c         |  2 +-
 .../arrow_pad/keymaps/pad_24/keymap.c         |  2 +-
 .../atreus50/keymaps/ajp10304/keymap.c        |  2 +-
 .../baredev/rev1/keymaps/manoshu/keymap.c     |  2 +-
 .../handwired/bento/keymaps/mac/keymap.c      |  2 +-
 .../keymaps/jmdaly_hhkb_split_space/keymap.c  |  2 +-
 .../handwired/d48/keymaps/anderson/keymap.c   |  6 +-
 .../handwired/dactyl/keymaps/dvorak/keymap.c  |  4 +-
 .../dactyl/keymaps/erincalling/keymap.c       |  4 +-
 .../3x5_3/keymaps/dlford/keymap.c             |  2 +-
 .../4x5/keymaps/ibnuda/keymap.c               |  2 +-
 .../4x5_5/keymaps/default/keymap.c            |  2 +-
 .../4x5_5/keymaps/ssedrick/keymap.c           |  2 +-
 .../4x6/keymaps/scheikled/keymap.c            |  2 +-
 .../5x6/keymaps/333fred/keymap.c              |  2 +-
 .../5x6/keymaps/rishka/keymap.c               |  2 +-
 .../5x6/keymaps/scheiklp/keymap.c             |  2 +-
 .../5x6/keymaps/squirrel/keymap.c             |  8 +-
 .../5x6/keymaps/swedish/keymap.c              |  2 +-
 .../5x6/keymaps/thattolleyguy/keymap.c        |  4 +-
 .../5x6_5/keymaps/333fred/keymap.c            |  2 +-
 .../5x6_5/keymaps/cykedev/keymap.c            |  4 +-
 .../6x6/keymaps/dumam/keymap.c                |  2 +-
 .../dactyl_rah/keymaps/right/keymap.c         |  2 +-
 .../elrgo_s/keymaps/default/keymap.c          |  2 +-
 .../heisenberg/keymaps/turkishish/keymap.c    |  2 +-
 .../lagrange/keymaps/dpapavas/keymap.c        |  2 +-
 .../minorca/keymaps/ridingqwerty/keymap.c     |  2 +-
 .../handwired/onekey/keymaps/reset/keymap.c   |  2 +-
 .../handwired/ortho5x14/keymaps/2u/keymap.c   |  6 +-
 .../ortho5x14/keymaps/split1/keymap.c         |  4 +-
 .../handwired/prkl30/keymaps/erkhal/keymap.c  |  4 +-
 .../promethium/keymaps/priyadi/keymap.c       |  2 +-
 .../handwired/pteron/keymaps/FSund/keymap.c   |  2 +-
 .../pteron/keymaps/alzafacon/keymap.c         |  2 +-
 .../handwired/qc60/keymaps/wntrmln/keymap.c   |  2 +-
 .../steamvan/keymaps/jmdaly/keymap.c          |  2 +-
 .../tritium_numpad/keymaps/max/keymap.c       |  2 +-
 .../handwired/uthol/keymaps/numswap/keymap.c  |  2 +-
 .../handwired/uthol/keymaps/oled/keymap.c     |  2 +-
 .../videowriter/keymaps/oleg/keymap.c         |  2 +-
 .../wabi/keymaps/rossman360/keymap.c          |  2 +-
 .../handwired/z150/keymaps/zyxx/keymap.c      |  2 +-
 keyboards/helix/pico/keymaps/biacco/keymap.c  |  2 +-
 keyboards/helix/pico/keymaps/mtei/keymap.c    |  2 +-
 .../helix/rev2/keymaps/five_rows/keymap.c     |  2 +-
 .../helix/rev2/keymaps/five_rows_jis/keymap.c |  2 +-
 .../helix/rev2/keymaps/fraanrosi/keymap.c     |  2 +-
 keyboards/helix/rev2/keymaps/froggy/keymap.c  |  2 +-
 .../helix/rev2/keymaps/froggy_106/keymap.c    |  2 +-
 keyboards/helix/rev2/keymaps/yshrsmz/keymap.c |  4 +-
 .../rev3_5rows/keymaps/five_rows/keymap.c     |  2 +-
 keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c  |  2 +-
 .../hhkb/ansi/keymaps/tominabox1/keymap.c     |  2 +-
 keyboards/hhkb/ansi/keymaps/xyverz/keymap.c   |  2 +-
 .../bastyl/keymaps/german_gaming/keymap.c     |  4 +-
 .../hidtech/bastyl/keymaps/nstickney/keymap.c |  2 +-
 .../hidtech/bastyl/keymaps/xyverz/keymap.c    |  6 +-
 keyboards/hineybush/h60/keymaps/kei/keymap.c  |  2 +-
 .../h75_singa/keymaps/wkl_std/keymap.c        |  2 +-
 .../hineybush/h87a/keymaps/gam3cat/keymap.c   |  2 +-
 .../hineybush/h87a/keymaps/peott-fr/keymap.c  |  2 +-
 .../hineybush/hbcp/keymaps/hiney/keymap.c     |  2 +-
 keyboards/hotdox/keymaps/imchipwood/keymap.c  |  4 +-
 keyboards/hotdox/keymaps/ninjonas/keymap.c    |  2 +-
 .../hs60/v2/ansi/keymaps/stanrc85/keymap.c    |  2 +-
 .../hs60/v2/hhkb/keymaps/goatmaster/keymap.c  |  2 +-
 .../hs60/v2/iso/keymaps/win_osx_dual/keymap.c |  2 +-
 .../hub16/keymaps/ahk_companion/keymap.c      |  4 +-
 keyboards/hub16/keymaps/macro/keymap.c        |  2 +-
 keyboards/hub16/keymaps/peepeetee/keymap.c    |  8 +-
 .../hub20/keymaps/left_hand_numpad/keymap.c   |  2 +-
 keyboards/hub20/keymaps/macro/keymap.c        |  2 +-
 .../hub20/keymaps/right_hand_numpad/keymap.c  |  2 +-
 .../ibnuda/alicia_cook/keymaps/rick/keymap.c  |  2 +-
 .../keymaps/rick-complicated/keymap.c         |  2 +-
 .../ibnuda/squiggle/keymaps/rick/keymap.c     |  2 +-
 .../idb/idb_60/keymaps/all_keys/keymap.c      |  2 +-
 keyboards/idb/idb_60/keymaps/pngu/keymap.c    |  2 +-
 .../idobao/id75/keymaps/drewdobo/keymap.c     |  2 +-
 keyboards/idobao/id75/keymaps/egstad/keymap.c |  6 +-
 keyboards/idobao/id75/keymaps/gkbd/keymap.c   |  2 +-
 .../idobao/id75/keymaps/gkbd_75/keymap.c      |  2 +-
 .../idobao/id75/keymaps/gkbd_orthon/keymap.c  |  2 +-
 .../id75/keymaps/greenshadowmaker/keymap.c    |  4 +-
 .../idobao/id75/keymaps/pathnirvana/keymap.c  |  2 +-
 .../idobao/id75/keymaps/revok75/keymap.c      |  4 +-
 .../id75/keymaps/xaceofspaidsx/keymap.c       |  4 +-
 .../id80/v2/ansi/keymaps/rverst/rverst.json   |  2 +-
 keyboards/illusion/rosa/keymaps/oggi/keymap.c |  2 +-
 .../rosa/keymaps/split_bs_rshift/keymap.c     |  2 +-
 .../rosa/keymaps/split_rshift/keymap.c        |  2 +-
 .../keymaps/dudeofawesome/keymap.c            |  2 +-
 .../ergodox_infinity/keymaps/gordon/keymap.c  |  2 +-
 .../keymaps/halfkeyboard/keymap.c             |  4 +-
 .../keymaps/input_club/keymap.c               |  2 +-
 .../ergodox_infinity/keymaps/narze/keymap.c   |  2 +-
 .../keymaps/nordic_ergo/keymap.c              |  4 +-
 .../keymaps/not-quite-neo/keymap.c            |  6 +-
 .../ergodox_infinity/keymaps/rask/keymap.c    |  2 +-
 .../k_type/keymaps/andrew-fahmy/keymap.c      |  2 +-
 .../whitefox/keymaps/dudeofawesome/keymap.c   |  2 +-
 .../whitefox/keymaps/kim-kim/keymap.c         |  2 +-
 .../whitefox/keymaps/mattrighetti/keymap.c    |  2 +-
 .../bear_65/keymaps/stanrc85/keymap.c         |  2 +-
 .../jc65/v32a/keymaps/ptillemans/keymap.c     |  4 +-
 keyboards/jc65/v32a/keymaps/rys/keymap.c      |  2 +-
 keyboards/jc65/v32u4/keymaps/coth/keymap.c    |  2 +-
 .../v32u4/keymaps/dead_encryption/keymap.c    |  2 +-
 keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c |  2 +-
 .../jc65/v32u4/keymaps/jetpacktuxedo/keymap.c |  2 +-
 .../jc65/v32u4/keymaps/na7thana/keymap.c      |  2 +-
 keyboards/jc65/v32u4/keymaps/naut/keymap.c    |  2 +-
 keyboards/jd45/keymaps/blakedietz/keymap.c    |  2 +-
 keyboards/jd45/keymaps/jeebak/keymap.c        |  2 +-
 keyboards/jd45/keymaps/mjt6u/keymap.c         |  2 +-
 keyboards/jian/keymaps/advanced/keymap.c      |  2 +-
 keyboards/jian/keymaps/left_hand/keymap.c     |  2 +-
 .../gentleman65_se_s/keymaps/default/keymap.c |  2 +-
 .../gentleman65_se_s/keymaps/via/keymap.c     |  2 +-
 .../chidori/keymaps/extended/keymap.c         |  2 +-
 .../chidori/keymaps/oled_sample/keymap.c      |  2 +-
 .../halberd/keymaps/right_modifiers/keymap.c  |  2 +-
 .../scythe/keymaps/forties/keymap.c           |  2 +-
 .../kapcave/gskt00/keymaps/nachie/keymap.c    |  2 +-
 .../kapcave/paladinpad/keymaps/aek/keymap.c   |  2 +-
 .../kapcave/paladinpad/keymaps/ortho/keymap.c |  2 +-
 .../hotswap/keymaps/brandonschlack/keymap.c   |  4 +-
 .../kbd67/hotswap/keymaps/madhatter/keymap.c  |  2 +-
 .../kbd67/hotswap/keymaps/zunger/keymap.c     |  4 +-
 .../keymaps/adamdehaven/keymap.c              |  4 +-
 .../kbd67/mkii_soldered/keymaps/ai03/keymap.c |  2 +-
 .../keymaps/ansi_split_bs/keymap.c            |  2 +-
 .../kbd67/mkii_soldered/keymaps/king/keymap.c |  4 +-
 .../mkiirgb/keymaps/codecoffeecode/keymap.c   |  2 +-
 .../kbd67/mkiirgb/keymaps/cykedev/keymap.c    |  2 +-
 .../kbd67/mkiirgb/keymaps/dnsnrk/keymap.c     |  2 +-
 .../kbd67/mkiirgb/keymaps/jonavin/keymap.c    |  2 +-
 .../kemmeldev-4-layered-layout.json           |  2 +-
 .../kbd67/mkiirgb/keymaps/kemmeldev/keymap.c  |  4 +-
 .../mkiirgb/keymaps/kemmeldev/layers.json     |  2 +-
 .../kbd67/mkiirgb/keymaps/spx01/keymap.c      |  2 +-
 .../kbdfans/kbd67/rev1/keymaps/koba/keymap.c  |  2 +-
 .../kbdfans/kbd67/rev2/keymaps/adi/keymap.c   |  2 +-
 .../rev2/keymaps/brandonschlack/keymap.c      |  4 +-
 .../kbdfans/kbd67/rev2/keymaps/koba/keymap.c  |  2 +-
 .../kbd67/rev2/keymaps/tucznak/keymap.c       |  2 +-
 .../kbdfans/kbd6x/keymaps/dbroqua/keymap.c    |  2 +-
 .../keymaps/hhkb-default-improved/keymap.c    |  2 +-
 .../kbd6x/keymaps/hhkb-default/keymap.c       |  2 +-
 .../kbdfans/kbd6x/keymaps/mekberg/keymap.c    |  2 +-
 keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c |  4 +-
 .../kbdfans/kbd6x/keymaps/peott-fr/keymap.c   |  2 +-
 .../kbdfans/kbd6x/keymaps/wanleg/keymap.c     |  2 +-
 .../kbd75/keymaps/aaronireland/keymap.c       |  6 +-
 keyboards/kbdfans/kbd75/keymaps/adit/keymap.c |  2 +-
 .../kbdfans/kbd75/keymaps/broswen/keymap.c    |  2 +-
 .../kbdfans/kbd75/keymaps/digital/keymap.c    |  2 +-
 .../kbdfans/kbd75/keymaps/edulpn/keymap.c     |  2 +-
 .../kbdfans/kbd75/keymaps/ethan605/keymap.c   |  4 +-
 .../kbd75/keymaps/kingwangwong/keymap.c       |  6 +-
 keyboards/kbdfans/kbd75/keymaps/smt/keymap.c  |  4 +-
 .../kbd75/keymaps/spacemanspiff/keymap.c      |  4 +-
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |  2 +-
 .../kbdfans/niu_mini/keymaps/abhixec/keymap.c |  2 +-
 .../niu_mini/keymaps/codecoffeecode/keymap.c  |  2 +-
 .../kbdfans/niu_mini/keymaps/dyesub/keymap.c  |  2 +-
 .../kbdfans/niu_mini/keymaps/edvard/keymap.c  |  2 +-
 .../niu_mini/keymaps/framtava/keymap.c        |  2 +-
 .../kbdfans/niu_mini/keymaps/mason/keymap.c   |  2 +-
 .../kbdfans/niu_mini/keymaps/planck/keymap.c  |  2 +-
 .../kbdfans/niu_mini/keymaps/tobias/keymap.c  |  2 +-
 .../kbdfans/niu_mini/keymaps/tucznak/keymap.c |  2 +-
 .../niu_mini/keymaps/xtonhasvim/keymap.c      |  2 +-
 .../kbnordic/nordic60/keymaps/all/keymap.c    |  2 +-
 keyboards/kc60/keymaps/sgoodwin/keymap.c      |  2 +-
 keyboards/kc60/keymaps/stanleylai/keymap.c    |  4 +-
 keyboards/kc60/keymaps/wigguno/keymap.c       |  2 +-
 keyboards/kc60/keymaps/workman-dead/keymap.c  |  2 +-
 keyboards/kc60/keymaps/ws2812/keymap.c        |  2 +-
 keyboards/keebio/bdn9/keymaps/bcat/keymap.c   |  2 +-
 .../bdn9/keymaps/codecoffeecode/keymap.c      |  4 +-
 .../keebio/bdn9/keymaps/ghostseven/keymap.c   |  4 +-
 .../keebio/bdn9/keymaps/hbbisenieks/keymap.c  |  2 +-
 .../keebio/bdn9/keymaps/mousepad/keymap.c     |  2 +-
 keyboards/keebio/bdn9/keymaps/rishka/keymap.c |  4 +-
 .../bdn9/keymaps/vosechu-browser/keymap.c     |  2 +-
 .../keebio/bdn9/keymaps/vosechu-ksp/keymap.c  |  2 +-
 .../keymaps/insertsnideremarks/keymap.c       |  6 +-
 .../bfo9000/keymaps/shadyproject/keymap.c     |  4 +-
 .../bfo9000/keymaps/tuesdayjohn/keymap.c      |  6 +-
 .../keebio/chocopad/keymaps/khord/keymap.c    |  2 +-
 .../keebio/dsp40/keymaps/bakingpy/keymap.c    |  2 +-
 .../keebio/foldkb/keymaps/forrcaho/keymap.c   |  2 +-
 .../keebio/fourier/keymaps/maxim/keymap.c     |  2 +-
 .../iris/keymaps/antonlindstrom/keymap.c      |  2 +-
 keyboards/keebio/iris/keymaps/ave-63/keymap.c |  2 +-
 .../keebio/iris/keymaps/bmoorey/keymap.c      |  2 +-
 keyboards/keebio/iris/keymaps/boo/keymap.c    |  2 +-
 .../iris/keymaps/compilation-error/keymap.c   |  2 +-
 .../keebio/iris/keymaps/davidrambo/keymap.c   |  4 +-
 .../keebio/iris/keymaps/dcompact/keymap.c     |  2 +-
 keyboards/keebio/iris/keymaps/ddone/keymap.c  |  2 +-
 .../keebio_iris_rev2_layout_dvorak.json       |  2 +-
 keyboards/keebio/iris/keymaps/dvorak/keymap.c |  2 +-
 .../iris/keymaps/fluffactually/keymap.c       |  2 +-
 .../keebio/iris/keymaps/hbbisenieks/keymap.c  |  4 +-
 .../keebio/iris/keymaps/jerryhcooke/keymap.c  |  2 +-
 keyboards/keebio/iris/keymaps/khang/keymap.c  |  2 +-
 keyboards/keebio/iris/keymaps/khord/keymap.c  |  2 +-
 keyboards/keebio/iris/keymaps/krusli/keymap.c |  2 +-
 keyboards/keebio/iris/keymaps/mattly/keymap.c |  2 +-
 keyboards/keebio/iris/keymaps/mnil/keymap.c   |  2 +-
 .../keebio/iris/keymaps/mojitas/keymap.c      |  2 +-
 .../iris/keymaps/olligranlund_nordic/keymap.c |  2 +-
 keyboards/keebio/iris/keymaps/omgvee/keymap.c |  4 +-
 keyboards/keebio/iris/keymaps/osiris/keymap.c |  4 +-
 .../keebio/iris/keymaps/radlinskii/keymap.c   |  2 +-
 keyboards/keebio/iris/keymaps/sq5rix/keymap.c |  2 +-
 keyboards/keebio/iris/keymaps/xyverz/keymap.c |  2 +-
 .../keebio/iris/keymaps/yoonbae81/keymap.c    |  2 +-
 .../keebio/levinson/keymaps/atreus/keymap.c   |  2 +-
 .../keebio/levinson/keymaps/dcompact/keymap.c |  2 +-
 .../levinson/keymaps/issmirnov/keymap.c       |  2 +-
 .../keebio/levinson/keymaps/jyh/keymap.c      |  2 +-
 .../keebio/levinson/keymaps/jyh2/keymap.c     |  2 +-
 .../levinson/keymaps/ksamborski/keymap.c      |  2 +-
 .../keymaps/losinggeneration/keymap.c         |  4 +-
 .../levinson/keymaps/mmacdougall/keymap.c     |  2 +-
 .../keebio/levinson/keymaps/numpad/keymap.c   |  4 +-
 .../levinson/keymaps/treadwell/keymap.c       |  2 +-
 .../levinson/keymaps/xtonhasvim/keymap.c      |  4 +-
 .../keebio/nyquist/keymaps/DivergeJM/keymap.c |  4 +-
 .../keebio/nyquist/keymaps/bramver/keymap.c   |  2 +-
 .../keebio/nyquist/keymaps/jojiichan/keymap.c |  2 +-
 .../nyquist/keymaps/losinggeneration/keymap.c |  4 +-
 .../keebio/nyquist/keymaps/peott-fr/keymap.c  |  4 +-
 .../keebio/nyquist/keymaps/pipicanim/keymap.c |  2 +-
 .../keebio/nyquist/keymaps/pjanx/keymap.c     |  2 +-
 .../keebio/nyquist/keymaps/shovelpaw/keymap.c |  2 +-
 .../keebio/nyquist/keymaps/skug/keymap.c      |  2 +-
 .../keebio/nyquist/keymaps/tester/keymap.c    |  2 +-
 .../nyquist/keymaps/winternebs/keymap.c       |  2 +-
 .../keebio/nyquist/keymaps/yshrsmz/keymap.c   |  2 +-
 .../keebio/quefrency/keymaps/bcat/keymap.c    |  2 +-
 .../quefrency/keymaps/bfiedler/keymap.c       |  2 +-
 .../quefrency/keymaps/drashna_ms/keymap.c     |  2 +-
 .../quefrency/keymaps/kingwangwong/keymap.c   |  2 +-
 .../quefrency/keymaps/peott-fr/keymap.c       |  2 +-
 .../keymaps/insertsnideremarks/keymap.c       |  6 +-
 .../rorschach/keymaps/tuesdayjohn/keymap.c    |  6 +-
 .../tragicforce68/keymaps/buswerks/keymap.c   |  2 +-
 .../tragicforce68/keymaps/rossman360/keymap.c |  2 +-
 .../keebio/viterbi/keymaps/vosechu/keymap.c   |  2 +-
 .../mega/ansi/keymaps/jesusvallejo/keymap.c   |  2 +-
 .../nano_slider/keymaps/midi2vol/keymap.c     |  4 +-
 .../atreus/keymaps/ardumont/keymap.c          |  2 +-
 .../atreus/keymaps/dshields/keymap.c          |  2 +-
 .../atreus/keymaps/replicaJunction/keymap.c   |  2 +-
 .../keyboardio/atreus/keymaps/xyverz/keymap.c |  4 +-
 .../model01/keymaps/dshields/keymap.c         |  2 +-
 .../model01/keymaps/tw1t611/keymap.c          |  2 +-
 .../keycapsss/kimiko/keymaps/oriaj3/keymap.c  |  4 +-
 .../q1/rev_0100/keymaps/teimor/keymap.c       |  4 +-
 .../keyhive/opus/keymaps/thefoxcodes/keymap.c |  2 +-
 .../southpole/keymaps/foobeard/keymap.c       |  2 +-
 ...472_Annihilator6000_Configurator_file.json |  2 +-
 .../ut472/keymaps/annihilator6000/keymap.c    |  2 +-
 keyboards/keyhive/ut472/keymaps/hvp/keymap.c  |  4 +-
 .../ut472/keymaps/stefanopace/keymap.c        |  2 +-
 .../keyhive/ut472/keymaps/tucznak/keymap.c    |  2 +-
 .../keyprez/unicorn/keymaps/jorge/keymap.c    |  2 +-
 keyboards/kin80/keymaps/andrew/keymap.c       |  4 +-
 keyboards/kin80/keymaps/maxim/keymap.c        |  2 +-
 keyboards/kin80/keymaps/quartz64/keymap.c     |  2 +-
 keyboards/kinesis/keymaps/carpalx/keymap.c    |  4 +-
 keyboards/kinesis/keymaps/dvorak/keymap.c     |  2 +-
 keyboards/kinesis/keymaps/farmergreg/keymap.c |  4 +-
 keyboards/kinesis/keymaps/heatxsink/keymap.c  |  2 +-
 .../keymaps/insertsnideremarks/keymap.c       |  6 +-
 keyboards/kinesis/keymaps/jwon/keymap.c       |  2 +-
 keyboards/kinesis/keymaps/milestogo/keymap.c  |  8 +-
 keyboards/kinesis/keymaps/peott-fr/keymap.c   |  2 +-
 keyboards/kinesis/keymaps/stapelberg/keymap.c |  2 +-
 .../kinesis/keymaps/tuesdayjohn/keymap.c      |  6 +-
 keyboards/kinesis/keymaps/tw1t611/keymap.c    |  2 +-
 keyboards/kinesis/keymaps/xyverz/keymap.c     |  8 +-
 .../kinesis/kint36/keymaps/kzar/keymap.c      |  4 +-
 .../little_foot/keymaps/yanfali/keymap.c      |  2 +-
 .../romac/keymaps/stanrc85/keymap.c           |  2 +-
 .../ropro/keymaps/jdayton3/keymap.c           |  2 +-
 keyboards/kira80/keymaps/ansi_wkl/keymap.c    |  2 +-
 .../wanderland/keymaps/stanrc85/keymap.c      |  2 +-
 .../knobgoblin/keymaps/moults31/keymap.c      |  2 +-
 .../knops/mini/keymaps/mverteuil/keymap.c     |  2 +-
 .../kona_classic/keymaps/ansi_arrows/keymap.c |  2 +-
 .../keymaps/ansi_arrows_lcap/keymap.c         |  2 +-
 .../kona_classic/keymaps/ansi_split/keymap.c  |  2 +-
 .../keymaps/ansi_split_arrows/keymap.c        |  2 +-
 .../kprepublic/bm16a/keymaps/factory/keymap.c |  2 +-
 .../kprepublic/bm16s/keymaps/media/keymap.c   |  2 +-
 .../bm40hsrgb/keymaps/34keys/keymap.c         |  2 +-
 .../bm40hsrgb/keymaps/gabustoledo/keymap.c    |  2 +-
 .../bm40hsrgb/keymaps/signynt/keymap.c        |  2 +-
 .../bm40hsrgb/keymaps/signynt_2_loud/keymap.c |  2 +-
 .../keymaps/signynt_2_quiet/keymap.c          |  2 +-
 .../bm40hsrgb/keymaps/wolff_abnt2/keymap.c    |  2 +-
 .../bm43a/keymaps/stevexyz/keymap.c           |  2 +-
 .../bm43hsrgb/keymaps/bitstarr/keymap.c       |  2 +-
 .../rev1/keymaps/jbradforddillon/keymap.c     |  2 +-
 .../rev1/keymaps/david/keymap.c               |  2 +-
 .../rev1/keymaps/ipetepete/keymap.c           |  4 +-
 .../bm65hsrgb/keymaps/default/keymap.c        |  2 +-
 .../rev1/keymaps/deadolus/keymap.c            |  2 +-
 .../bm68hsrgb/rev1/keymaps/default/keymap.c   |  2 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/keymap.c |  2 +-
 .../bm68hsrgb/rev1/keymaps/via/keymap.c       |  2 +-
 .../bm80hsrgb/keymaps/default/keymap.c        |  2 +-
 .../bm80hsrgb/keymaps/peepeetee/keymap.c      |  2 +-
 .../kprepublic/bm80hsrgb/keymaps/via/keymap.c |  2 +-
 .../bm980hsrgb/keymaps/peepeetee/keymap.c     |  2 +-
 .../kprepublic/cospad/keymaps/detrus/keymap.c |  2 +-
 .../keymaps/split_plus_and_zero/keymap.c      |  2 +-
 .../cospad/keymaps/split_zero/keymap.c        |  2 +-
 .../jj40/keymaps/oscillope/keymap.c           |  4 +-
 .../kprepublic/jj40/keymaps/waples/keymap.c   |  2 +-
 .../jj50/keymaps/abstractkb/keymap.c          |  2 +-
 .../keymaps/abstractkb_gergomatch/keymap.c    |  2 +-
 .../jj50/keymaps/yoonbae81/keymap.c           |  2 +-
 keyboards/kv/revt/keymaps/default/keymap.c    |  2 +-
 .../dimple/staggered/keymaps/erovia/keymap.c  |  4 +-
 .../keymaps/oncesavedgaming/keymap.c          |  2 +-
 .../the40/keymaps/ortho/keymap.c              |  2 +-
 .../the50/keymaps/mikethetiger/keymap.c       |  2 +-
 .../leeku/finger65/keymaps/madhatter/keymap.c |  2 +-
 .../lets_split/keymaps/DE_simple/keymap.c     |  2 +-
 .../keymaps/aerialviews007/keymap.c           |  2 +-
 .../lets_split/keymaps/cpeters1982/keymap.c   |  2 +-
 keyboards/lets_split/keymaps/dlaroe/keymap.c  |  2 +-
 keyboards/lets_split/keymaps/fabian/keymap.c  |  2 +-
 .../lets_split/keymaps/geripgeri/keymap.c     |  2 +-
 keyboards/lets_split/keymaps/halvves/keymap.c |  4 +-
 .../keymaps/heartrobotninja/keymap.c          |  2 +-
 keyboards/lets_split/keymaps/henxing/keymap.c |  2 +-
 keyboards/lets_split/keymaps/hvp/keymap.c     |  2 +-
 keyboards/lets_split/keymaps/khord/keymap.c   |  2 +-
 keyboards/lets_split/keymaps/kris/keymap.c    |  2 +-
 keyboards/lets_split/keymaps/krusli/keymap.c  |  2 +-
 .../lets_split/keymaps/mbsurfer/keymap.c      |  2 +-
 keyboards/lets_split/keymaps/mekberg/keymap.c |  2 +-
 keyboards/lets_split/keymaps/mjt/keymap.c     |  2 +-
 .../lets_split/keymaps/normacos/keymap.c      |  2 +-
 keyboards/lets_split/keymaps/piemod/keymap.c  |  2 +-
 keyboards/lets_split/keymaps/pitty/keymap.c   |  4 +-
 keyboards/lets_split/keymaps/poker/keymap.c   |  2 +-
 keyboards/lets_split/keymaps/pyrol/keymap.c   |  2 +-
 .../lets_split/keymaps/shaymdev/keymap.c      |  2 +-
 keyboards/lets_split/keymaps/smt/keymap.c     |  2 +-
 .../lets_split/keymaps/that_canadian/keymap.c |  6 +-
 .../lets_split/keymaps/tylerwince/keymap.c    |  2 +-
 .../lets_split/keymaps/vim-mode/keymap.c      |  2 +-
 keyboards/lets_split/keymaps/waples/keymap.c  |  2 +-
 keyboards/lets_split/keymaps/xk/keymap.c      |  2 +-
 keyboards/lets_split/keymaps/yshrsmz/keymap.c |  2 +-
 keyboards/lets_split/keymaps/zer09/keymap.c   |  2 +-
 .../lfk78/keymaps/ca178858/keymap.c           |  2 +-
 .../lfk78/keymaps/split_bs_osx/keymap.c       |  2 +-
 .../lfk87/keymaps/ca178858/keymap.c           |  2 +-
 .../lfkeyboards/lfk87/keymaps/gbchk/keymap.c  |  2 +-
 .../lfkpad/keymaps/pascalpfeil/keymap.c       |  2 +-
 .../mini1800/keymaps/ca178858/keymap.c        |  2 +-
 keyboards/lily58/keymaps/bcat/keymap.c        |  2 +-
 keyboards/lily58/keymaps/druotoni/keymap.c    |  2 +-
 keyboards/lily58/keymaps/hvp/keymap.c         |  2 +-
 keyboards/lily58/keymaps/muppetjones/keymap.c |  2 +-
 .../default_65_ansi_blocker_wkl/keymap.c      |  2 +-
 .../keymap.c                                  |  2 +-
 keyboards/lyso1/lck75/keymaps/sbs/keymap.c    |  2 +-
 .../lyso1/lefishe/keymaps/wk_sbs/keymap.c     |  2 +-
 .../lyso1/lefishe/keymaps/wkl_sbs/keymap.c    |  2 +-
 keyboards/m10a/keymaps/gam3cat/keymap.c       |  2 +-
 .../launchpad/keymaps/brandonschlack/keymap.c |  2 +-
 .../keymaps/doxish_dvorak/keymap.c            |  4 +-
 .../keymaps/mikethetiger/keymap.c             |  4 +-
 .../lets_split_eh/keymaps/msiu/keymap.c       |  4 +-
 .../lets_split_eh/keymaps/resfury/keymap.c    |  4 +-
 .../keymaps/that_canadian/keymap.c            |  4 +-
 .../minidox/keymaps/alairock/keymap.c         |  2 +-
 .../minidox/keymaps/dustypomerleau/keymap.c   |  4 +-
 .../minidox/keymaps/khitsule/keymap.c         |  2 +-
 .../minidox/keymaps/norman/keymap.c           |  2 +-
 .../minidox/keymaps/rsthd_combos/keymap.c     |  2 +-
 .../minidox/keymaps/that_canadian/keymap.c    |  2 +-
 .../minidox/keymaps/tw1t611/keymap.c          |  2 +-
 .../minidox/keymaps/xyverz/keymap.c           |  6 +-
 .../rhymestone/keymaps/switch_tester/keymap.c |  2 +-
 .../treadstone32/keymaps/like_jis/keymap.c    |  2 +-
 .../treadstone48/keymaps/like_jis/keymap.c    |  2 +-
 .../rev1/keymaps/like_jis_rs/keymap.c         |  2 +-
 keyboards/massdrop/alt/keymaps/b_/keymap.c    |  2 +-
 .../alt/keymaps/charlesrocket/keymap.c        |  2 +-
 .../massdrop/alt/keymaps/xulkal/keymap.c      |  2 +-
 .../massdrop/ctrl/keymaps/xulkal/keymap.c     |  2 +-
 .../matrix/noah/keymaps/blockader/keymap.c    |  2 +-
 keyboards/matrix/noah/keymaps/rys/keymap.c    |  2 +-
 .../matrix/noah/keymaps/splitspace/keymap.c   |  2 +-
 keyboards/mb44/keymaps/2u1u_space/keymap.c    |  2 +-
 keyboards/mb44/keymaps/2u_space/keymap.c      |  2 +-
 keyboards/mb44/keymaps/3u_space/keymap.c      |  2 +-
 .../mechkeys/acr60/keymaps/mitch/keymap.c     |  2 +-
 .../mechkeys/espectro/keymaps/mac/keymap.c    |  4 +-
 .../mechkeys/espectro/keymaps/mapdev/keymap.c |  4 +-
 .../espectro/keymaps/mikethetiger/keymap.c    |  4 +-
 .../mechmini/v1/keymaps/pitty/keymap.c        |  2 +-
 .../v2/keymaps/2u_space_ortho/keymap.c        |  2 +-
 .../mechmini/v2/keymaps/625_space/keymap.c    |  2 +-
 .../mechmini/v2/keymaps/arkag/keymap.c        |  2 +-
 .../v2/keymaps/lbibass_625_space/keymap.c     |  4 +-
 .../v2/keymaps/lbibass_split_space/keymap.c   |  2 +-
 .../mechmini/v2/keymaps/ortho/keymap.c        |  2 +-
 .../v2/keymaps/spacebarracecar/keymap.c       |  4 +-
 .../mechmini/v2/keymaps/split_space/keymap.c  |  2 +-
 .../adelais/keymaps/brandonschlack/keymap.c   |  2 +-
 .../adelais/keymaps/default/keymap.c          |  2 +-
 .../mechlovin/adelais/keymaps/via/keymap.c    |  2 +-
 .../mechstudio/dawn/keymaps/default/keymap.c  |  2 +-
 .../mechstudio/dawn/keymaps/via/keymap.c      |  2 +-
 .../bde/keymaps/lefty_default/keymap.c        |  2 +-
 .../mechwild/bde/keymaps/lefty_fancy/keymap.c |  2 +-
 .../mechwild/bde/keymaps/lefty_via/keymap.c   |  2 +-
 .../bde/keymaps/righty_default/keymap.c       |  2 +-
 .../mechwild/bde/keymaps/righty_via/keymap.c  |  2 +-
 .../mercutio/keymaps/jonavin/keymap.c         |  4 +-
 .../mokulua/standard/keymaps/silly/keymap.c   |  2 +-
 .../murphpad/keymaps/jonavin/keymap.c         | 10 +-
 .../mechwild/obe/keymaps/jonavin/keymap.c     |  2 +-
 .../puckbuddy/keymaps/default/keymap.c        |  2 +-
 .../mechwild/puckbuddy/keymaps/via/keymap.c   |  2 +-
 keyboards/mehkee96/keymaps/johann/keymap.c    |  4 +-
 keyboards/melgeek/mach80/keymaps/tkl/keymap.c |  2 +-
 .../timberwolf/keymaps/a_ansi/keymap.c        |  2 +-
 .../timberwolf/keymaps/a_iso/keymap.c         |  2 +-
 .../timberwolf/keymaps/b_ansi/keymap.c        |  2 +-
 .../timberwolf/keymaps/b_iso/keymap.c         |  2 +-
 .../timberwolf/keymaps/prime_ansi/keymap.c    |  2 +-
 .../timberwolf/keymaps/prime_iso/keymap.c     |  2 +-
 .../mincedshon/ecila/keymaps/default/keymap.c |  2 +-
 .../mincedshon/ecila/keymaps/via/keymap.c     |  6 +-
 keyboards/miniaxe/keymaps/underglow/keymap.c  |  2 +-
 keyboards/mitosis/keymaps/datagrok/keymap.c   |  2 +-
 keyboards/mitosis/keymaps/mjt/keymap.c        |  2 +-
 keyboards/miuni32/keymaps/adam-lee/keymap.c   |  4 +-
 .../keymaps/cassdelacruzmunoz/keymap.c        |  4 +-
 keyboards/miuni32/keymaps/ht_156/keymap.c     |  4 +-
 keyboards/miuni32/keymaps/kifinnsson/keymap.c |  4 +-
 .../rebound/rev3/keymaps/rossman360/keymap.c  |  2 +-
 .../rebound/rev4/keymaps/rossman360/keymap.c  |  2 +-
 .../rewind/keymaps/rossman360/keymap.c        |  2 +-
 keyboards/mt/mt980/keymaps/walker/keymap.c    |  6 +-
 .../mw65_rgb/keymaps/horrortroll/keymap.c     |  2 +-
 .../mw65_rgb/keymaps/thearesia/keymap.c       |  2 +-
 .../nack/keymaps/farfalleflickan/keymap.c     |  2 +-
 .../splitreus62/keymaps/scheiklp/keymap.c     |  2 +-
 keyboards/neito/keymaps/olli_works/keymap.c   |  2 +-
 .../n60_s/keymaps/ansi_encoder/keymap.c       |  2 +-
 .../n60_s/keymaps/tsangan_encoder/keymap.c    |  2 +-
 .../n87/keymaps/symmetric_standard/keymap.c   |  2 +-
 .../nightmare/keymaps/brandonschlack/keymap.c |  2 +-
 .../jabberwocky/keymaps/nopunin10did/keymap.c |  4 +-
 .../kastenwagen48/keymaps/jonavin/keymap.c    |  2 +-
 .../novelkeys/nk65/keymaps/madhatter/keymap.c |  2 +-
 .../novelkeys/novelpad/keymaps/0xdec/keymap.c |  2 +-
 .../noxary/268/keymaps/sixtyeight/keymap.c    |  2 +-
 .../nullbitsco/nibble/keymaps/oled/keymap.c   |  2 +-
 .../nibble/keymaps/oled_bongocat/keymap.c     |  2 +-
 .../nibble/keymaps/oled_status/keymap.c       |  2 +-
 keyboards/numatreus/keymaps/hdbx/keymap.c     |  4 +-
 keyboards/numatreus/keymaps/like_jis/keymap.c |  2 +-
 keyboards/numatreus/keymaps/yohewi/keymap.c   |  2 +-
 .../obosob/arch_36/keymaps/obosob/keymap.c    |  6 +-
 keyboards/ok60/keymaps/ptillemans/keymap.c    |  2 +-
 .../mini/keymaps/toyoshimahidenori/keymap.c   |  2 +-
 .../rev1/keymaps/greenshadowmaker/keymap.c    |  2 +-
 .../rev1/keymaps/shadowprogr/keymap.c         |  2 +-
 .../ergodash/rev1/keymaps/tw1t611/keymap.c    |  2 +-
 .../omkbd/runner3680/5x8/keymaps/JIS/keymap.c |  4 +-
 keyboards/org60/keymaps/boardy/keymap.c       |  2 +-
 keyboards/org60/keymaps/jarred/keymap.c       |  2 +-
 keyboards/orthodox/keymaps/oscillope/keymap.c |  2 +-
 keyboards/orthodox/keymaps/rfvizarra/keymap.c |  2 +-
 keyboards/orthodox/keymaps/shaymdev/keymap.c  |  2 +-
 keyboards/orthodox/keymaps/xyverz/keymap.c    |  2 +-
 keyboards/pearl/keymaps/cijanzen/keymap.c     |  2 +-
 .../pearl/keymaps/jetpacktuxedo/keymap.c      |  2 +-
 keyboards/pearl/keymaps/phil/keymap.c         |  2 +-
 keyboards/pearl/keymaps/rask/keymap.c         |  2 +-
 keyboards/pegasus/keymaps/split/keymap.c      |  2 +-
 .../percent/canoe/keymaps/boy_314/keymap.c    |  4 +-
 .../percent/skog_lite/keymaps/binman/keymap.c |  2 +-
 keyboards/phantom/keymaps/rgbmod/keymap.c     |  2 +-
 .../keymaps/ansi_blocker_doublebs/keymap.c    |  2 +-
 keyboards/planck/keymaps/ab/keymap.c          |  2 +-
 keyboards/planck/keymaps/abhixec/keymap.c     |  2 +-
 keyboards/planck/keymaps/abishalom/keymap.c   |  2 +-
 keyboards/planck/keymaps/adamtabrams/keymap.c |  4 +-
 .../keymaps/altgr/common/chord_layout.h       |  2 +-
 keyboards/planck/keymaps/am/keymap.c          |  2 +-
 .../planck/keymaps/andylikescandy/keymap.c    |  2 +-
 keyboards/planck/keymaps/antosha417/keymap.c  |  2 +-
 keyboards/planck/keymaps/ariccb/keymap.c      |  4 +-
 keyboards/planck/keymaps/aviator/keymap.c     |  2 +-
 keyboards/planck/keymaps/badger/keymap.c      |  2 +-
 keyboards/planck/keymaps/basic/keymap.c       |  4 +-
 keyboards/planck/keymaps/bghull/keymap.c      |  8 +-
 keyboards/planck/keymaps/brandon/keymap.c     |  2 +-
 keyboards/planck/keymaps/buffet/keymap.c      |  2 +-
 keyboards/planck/keymaps/buhearns/keymap.c    |  2 +-
 keyboards/planck/keymaps/cbbrowne/keymap.c    |  2 +-
 keyboards/planck/keymaps/chance/keymap.c      |  2 +-
 .../planck/keymaps/charlesrocket/keymap.c     |  2 +-
 keyboards/planck/keymaps/circuit/keymap.c     |  2 +-
 .../planck/keymaps/coloneljesus/keymap.c      |  2 +-
 keyboards/planck/keymaps/copface/keymap.c     |  2 +-
 keyboards/planck/keymaps/corvec/keymap.c      |  2 +-
 keyboards/planck/keymaps/david/keymap.c       |  4 +-
 keyboards/planck/keymaps/davidrambo/keymap.c  |  2 +-
 keyboards/planck/keymaps/dbroqua/keymap.c     |  2 +-
 keyboards/planck/keymaps/dc/keymap.c          |  2 +-
 keyboards/planck/keymaps/dcompact/keymap.c    |  2 +-
 .../keymaps/dear_vehicle_owner/keymap.c       |  2 +-
 keyboards/planck/keymaps/deft/keymap.c        |  2 +-
 keyboards/planck/keymaps/dlaroe/keymap.c      |  2 +-
 keyboards/planck/keymaps/dodger/keymap.c      |  2 +-
 keyboards/planck/keymaps/dr0ck/keymap.c       |  2 +-
 .../planck/keymaps/dr_notsokind/keymap.c      |  2 +-
 .../planck/keymaps/dsanchezseco/keymap.c      |  2 +-
 keyboards/planck/keymaps/dshields/keymap.c    |  2 +-
 .../planck/keymaps/dudeofawesome/keymap.c     |  2 +-
 .../planck/keymaps/dvorak2space/keymap.c      |  2 +-
 keyboards/planck/keymaps/dvz/keymap.c         |  2 +-
 keyboards/planck/keymaps/emiller/keymap.c     |  2 +-
 keyboards/planck/keymaps/emilyh/keymap.c      |  2 +-
 keyboards/planck/keymaps/eosti/keymap.c       |  2 +-
 keyboards/planck/keymaps/eshesh2/keymap.c     |  2 +-
 keyboards/planck/keymaps/espynn/keymap.c      |  2 +-
 .../planck/keymaps/experimental/keymap.c      |  2 +-
 keyboards/planck/keymaps/fabian/keymap.c      |  2 +-
 .../planck/keymaps/foreveranapple/keymap.c    |  2 +-
 keyboards/planck/keymaps/fsck/keymap.c        |  2 +-
 keyboards/planck/keymaps/gitdrik/keymap.c     |  2 +-
 .../planck/keymaps/grahampheath/keymap.c      |  2 +-
 keyboards/planck/keymaps/grant24/keymap.c     |  2 +-
 keyboards/planck/keymaps/gunp/keymap.c        |  2 +-
 .../keymaps/handwired_binaryplease/keymap.c   |  2 +-
 .../planck/keymaps/hiea/common/chord_layout.h |  2 +-
 .../keymaps/hieax/common/chord_layout.h       |  2 +-
 keyboards/planck/keymaps/hvp/keymap.c         |  2 +-
 keyboards/planck/keymaps/impossible/keymap.c  |  4 +-
 keyboards/planck/keymaps/inkwell/keymap.c     |  2 +-
 keyboards/planck/keymaps/jasperla/keymap.c    |  2 +-
 keyboards/planck/keymaps/jdelkins/keymap.c    |  4 +-
 keyboards/planck/keymaps/jeebak/keymap.c      |  2 +-
 .../planck/keymaps/jetpacktuxedo/keymap.c     |  2 +-
 keyboards/planck/keymaps/jhenahan/keymap.c    |  2 +-
 .../planck/keymaps/jimmysjolund/keymap.c      |  2 +-
 keyboards/planck/keymaps/jirgn/keymap.c       |  2 +-
 keyboards/planck/keymaps/joe/keymap.c         |  2 +-
 keyboards/planck/keymaps/jweickm/keymap.c     |  4 +-
 keyboards/planck/keymaps/kanbara/keymap.c     |  2 +-
 keyboards/planck/keymaps/kelorean/keymap.c    |  2 +-
 keyboards/planck/keymaps/khord/keymap.c       |  2 +-
 keyboards/planck/keymaps/kifinnsson/keymap.c  |  2 +-
 keyboards/planck/keymaps/kloki/keymap.c       |  2 +-
 keyboards/planck/keymaps/kmontag42/keymap.c   |  2 +-
 keyboards/planck/keymaps/kuatsure/keymap.c    |  4 +-
 keyboards/planck/keymaps/lae3/keymap.c        |  2 +-
 keyboards/planck/keymaps/lja83/keymap.c       |  2 +-
 keyboards/planck/keymaps/lucas/keymap.c       |  2 +-
 keyboards/planck/keymaps/mason/keymap.c       |  2 +-
 keyboards/planck/keymaps/matrixman/keymap.c   |  6 +-
 keyboards/planck/keymaps/mattly/keymap.c      |  2 +-
 keyboards/planck/keymaps/max/keymap.c         |  4 +-
 keyboards/planck/keymaps/mgalisa/keymap.c     |  2 +-
 .../planck/keymaps/mikethetiger/keymap.c      |  2 +-
 keyboards/planck/keymaps/mjt/keymap.c         |  2 +-
 keyboards/planck/keymaps/mjtnumsym/keymap.c   |  2 +-
 keyboards/planck/keymaps/mjuma/keymap.c       |  4 +-
 keyboards/planck/keymaps/mnil/keymap.c        |  2 +-
 keyboards/planck/keymaps/mollat/keymap.c      |  2 +-
 keyboards/planck/keymaps/motform/keymap.c     |  2 +-
 keyboards/planck/keymaps/msiu/keymap.c        |  2 +-
 keyboards/planck/keymaps/muzfuz/keymap.c      |  2 +-
 keyboards/planck/keymaps/mwpeterson/keymap.c  |  2 +-
 keyboards/planck/keymaps/myoung34/keymap.c    |  2 +-
 keyboards/planck/keymaps/narze/keymap.c       |  2 +-
 keyboards/planck/keymaps/nick/keymap.c        |  2 +-
 keyboards/planck/keymaps/nico/keymap.c        |  4 +-
 .../planck/keymaps/not-quite-neo/keymap.c     |  4 +-
 keyboards/planck/keymaps/originerd/keymap.c   |  2 +-
 keyboards/planck/keymaps/orthodeluxe/keymap.c |  2 +-
 keyboards/planck/keymaps/oryx/keymap.c        |  2 +-
 keyboards/planck/keymaps/palleiko/keymap.c    |  2 +-
 keyboards/planck/keymaps/pascamel/keymap.c    |  2 +-
 keyboards/planck/keymaps/pete/keymap.c        |  2 +-
 keyboards/planck/keymaps/pevecyan/keymap.c    |  2 +-
 keyboards/planck/keymaps/pickle_jr/keymap.c   |  2 +-
 keyboards/planck/keymaps/piemod/keymap.c      |  2 +-
 keyboards/planck/keymaps/pjanx/keymap.c       |  2 +-
 keyboards/planck/keymaps/pok3r/keymap.c       |  2 +-
 keyboards/planck/keymaps/premek/keymap.c      |  2 +-
 keyboards/planck/keymaps/ptillemans/keymap.c  |  2 +-
 keyboards/planck/keymaps/pvc/keymap.c         |  4 +-
 keyboards/planck/keymaps/raffle/keymap.c      |  2 +-
 keyboards/planck/keymaps/rai-suta/keymap.c    |  2 +-
 keyboards/planck/keymaps/rodhaene/keymap.c    |  2 +-
 .../planck/keymaps/roguepullrequest/keymap.c  |  2 +-
 keyboards/planck/keymaps/sascha/keymap.c      |  2 +-
 keyboards/planck/keymaps/scottzach1/keymap.c  |  2 +-
 .../keymaps/sdothum/common/chord_layout.h     |  2 +-
 keyboards/planck/keymaps/sean/keymap.c        |  2 +-
 keyboards/planck/keymaps/sebas/keymap.c       |  2 +-
 keyboards/planck/keymaps/sgoodwin/keymap.c    |  2 +-
 keyboards/planck/keymaps/sigul/keymap.c       |  2 +-
 keyboards/planck/keymaps/skank/keymap.c       |  2 +-
 keyboards/planck/keymaps/skug/keymap.c        |  2 +-
 keyboards/planck/keymaps/smittey/keymap.c     |  2 +-
 keyboards/planck/keymaps/smt/keymap.c         |  2 +-
 .../planck/keymaps/spacebarracecar/keymap.c   |  4 +-
 keyboards/planck/keymaps/steno/keymap.c       |  2 +-
 keyboards/planck/keymaps/stuartfong1/keymap.c |  2 +-
 .../planck/keymaps/synth_sample/keymap.c      |  2 +-
 .../planck/keymaps/synth_wavetable/keymap.c   |  2 +-
 keyboards/planck/keymaps/tak3over/keymap.c    |  2 +-
 .../planck/keymaps/that_canadian/keymap.c     |  4 +-
 .../planck/keymaps/thermal_printer/keymap.c   |  2 +-
 keyboards/planck/keymaps/tk/keymap.c          |  2 +-
 keyboards/planck/keymaps/tom/keymap.c         |  2 +-
 keyboards/planck/keymaps/tomkonidas/keymap.c  |  2 +-
 keyboards/planck/keymaps/tong92/keymap.c      |  4 +-
 keyboards/planck/keymaps/ttys0/keymap.c       |  2 +-
 keyboards/planck/keymaps/tylerwince/keymap.c  |  2 +-
 keyboards/planck/keymaps/unagi/keymap.c       |  2 +-
 keyboards/planck/keymaps/unicode/keymap.c     |  2 +-
 keyboards/planck/keymaps/vaire/keymap.c       |  2 +-
 keyboards/planck/keymaps/vxid/keymap.c        |  2 +-
 keyboards/planck/keymaps/winternebs/keymap.c  |  4 +-
 keyboards/planck/keymaps/xjtian/keymap.c      |  4 +-
 keyboards/planck/keymaps/yang/keymap.c        |  4 +-
 keyboards/planck/keymaps/zach/keymap.c        |  2 +-
 keyboards/planck/keymaps/zrichard/keymap.c    |  4 +-
 keyboards/planck/thk/keymaps/thk/keymap.c     |  2 +-
 .../playkbtw/ca66/keymaps/kelorean/keymap.c   |  2 +-
 .../ca66/keymaps/kelorean/layers.json         |  2 +-
 .../playkbtw/ca66/keymaps/olivia/keymap.c     |  2 +-
 .../playkbtw/pk60/keymaps/rfvizarra/keymap.c  |  2 +-
 .../mouse/keymaps/drag_scroll/keymap.c        |  2 +-
 .../trackball_nano/keymaps/lkbm/keymap.c      |  2 +-
 keyboards/preonic/keymaps/0xdec/keymap.c      |  4 +-
 keyboards/preonic/keymaps/AlexDaigre/keymap.c |  2 +-
 .../preonic/keymaps/CMD-Preonic/keymap.c      |  4 +-
 keyboards/preonic/keymaps/arkag/keymap.c      |  2 +-
 keyboards/preonic/keymaps/badger/keymap.c     |  2 +-
 keyboards/preonic/keymaps/bghull/keymap.c     |  4 +-
 .../preonic/keymaps/blake-newman/keymap.c     |  2 +-
 keyboards/preonic/keymaps/boy314/keymap.c     |  2 +-
 .../preonic/keymaps/codecoffeecode/keymap.c   |  2 +-
 keyboards/preonic/keymaps/cranium/keymap.c    |  2 +-
 keyboards/preonic/keymaps/davidrambo/keymap.c |  4 +-
 keyboards/preonic/keymaps/dlaroe/keymap.c     |  2 +-
 keyboards/preonic/keymaps/drasbeck/keymap.c   |  2 +-
 .../preonic/keymaps/dudeofawesome/keymap.c    |  2 +-
 keyboards/preonic/keymaps/ekis_isa/keymap.c   |  2 +-
 keyboards/preonic/keymaps/elisiano/keymap.c   |  2 +-
 keyboards/preonic/keymaps/fig-r/keymap.c      |  2 +-
 keyboards/preonic/keymaps/fsck/keymap.c       |  2 +-
 keyboards/preonic/keymaps/jacwib/keymap.c     |  4 +-
 keyboards/preonic/keymaps/keelhauler/keymap.c |  2 +-
 keyboards/preonic/keymaps/kjwon15/keymap.c    |  2 +-
 keyboards/preonic/keymaps/kuatsure/keymap.c   |  4 +-
 .../preonic/keymaps/laurentlaurent/keymap.c   |  2 +-
 .../preonic/keymaps/mechmaster48/keymap.c     |  2 +-
 keyboards/preonic/keymaps/mguterl/keymap.c    |  2 +-
 .../preonic/keymaps/mikethetiger/keymap.c     |  2 +-
 keyboards/preonic/keymaps/muzfuz/keymap.c     |  2 +-
 keyboards/preonic/keymaps/mverteuil/keymap.c  |  2 +-
 .../preonic/keymaps/mverteuil_2x2u/keymap.c   |  2 +-
 keyboards/preonic/keymaps/nikchi/keymap.c     |  2 +-
 keyboards/preonic/keymaps/pcurt854/keymap.c   |  6 +-
 keyboards/preonic/keymaps/pezhore/keymap.c    |  2 +-
 keyboards/preonic/keymaps/pitty/keymap.c      |  2 +-
 keyboards/preonic/keymaps/pvillano/keymap.c   |  2 +-
 keyboards/preonic/keymaps/senseored/keymap.c  |  2 +-
 keyboards/preonic/keymaps/smt/keymap.c        |  2 +-
 .../preonic/keymaps/that_canadian/keymap.c    |  4 +-
 .../preonic/keymaps/trigotometry/keymap.c     |  2 +-
 keyboards/preonic/keymaps/ttys0/keymap.c      |  2 +-
 keyboards/preonic/keymaps/zach/keymap.c       |  2 +-
 .../prime_e/keymaps/brandonschlack/keymap.c   |  2 +-
 .../primekb/prime_e/keymaps/gwillad/keymap.c  |  2 +-
 .../prime_e/keymaps/madhatter/keymap.c        |  2 +-
 .../primekb/prime_e/keymaps/peott-fr/keymap.c |  2 +-
 .../primekb/prime_m/keymaps/numpad/keymap.c   |  2 +-
 .../keymaps/reasonsandreasons/keymap.c        |  4 +-
 .../prime_o/keymaps/spacebarracecar/keymap.c  |  4 +-
 .../ortho/keymaps/ortho_split/keymap.c        |  2 +-
 .../staggered/keymaps/split_bar/keymap.c      |  2 +-
 .../alice/keymaps/devinceble/keymap.c         |  2 +-
 .../projectkb/alice/keymaps/keithlo/keymap.c  |  2 +-
 .../alice/keymaps/madhatter/keymap.c          |  4 +-
 .../projectkb/alice/keymaps/stanrc85/keymap.c |  2 +-
 keyboards/q4z/keymaps/rjboone/keymap.c        |  2 +-
 .../rev1/keymaps/big_space/keymap.c           |  2 +-
 .../rev2/keymaps/big_space/keymap.c           |  2 +-
 .../rev2/keymaps/qpockets/keymap.c            |  2 +-
 .../qpockets/wanten/keymaps/2u_bars/keymap.c  |  2 +-
 .../qpockets/wanten/keymaps/625_bar/keymap.c  |  2 +-
 .../lb75/keymaps/divided_fnrow/keymap.c       |  2 +-
 .../rart/rartpad/keymaps/numpad/keymap.c      |  2 +-
 .../nomu30/keymaps/center_sprit/keymap.c      |  2 +-
 .../nomu30/keymaps/center_sprit/readme.md     |  2 +-
 .../nomu30/keymaps/like_jis/keymap.c          |  2 +-
 .../nomu30/keymaps/like_jis/readme.md         |  2 +-
 keyboards/redox/keymaps/KL1RL/keymap.c        |  2 +-
 keyboards/redox/keymaps/default/keymap.c      |  2 +-
 .../redox/keymaps/eightbitraptor/keymap.c     |  2 +-
 keyboards/redox/keymaps/fculpo/keymap.c       |  2 +-
 keyboards/redox/keymaps/finex/keymap.c        |  2 +-
 keyboards/redox/keymaps/german/keymap.c       |  2 +-
 keyboards/redox/keymaps/italian/keymap.c      |  2 +-
 keyboards/redox/keymaps/jeherve/keymap.c      |  2 +-
 keyboards/redox/keymaps/nrichers/keymap.c     |  2 +-
 keyboards/redox/keymaps/ptillemans/keymap.c   |  2 +-
 .../redox/keymaps/thattolleyguy/keymap.c      |  4 +-
 keyboards/redox/keymaps/tw1t611/keymap.c      |  2 +-
 keyboards/redox/keymaps/via/keymap.c          |  2 +-
 keyboards/redox_w/keymaps/danielo515/keymap.c |  2 +-
 keyboards/redox_w/keymaps/default/keymap.c    |  2 +-
 keyboards/redox_w/keymaps/italian/keymap.c    |  2 +-
 keyboards/redox_w/keymaps/via/keymap.c        |  2 +-
 .../retro_75/keymaps/split_backspace/keymap.c |  2 +-
 .../reviung39/keymaps/toshi0383/keymap.c      |  2 +-
 .../reviung41/keymaps/ciutadellla/keymap.c    |  4 +-
 keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c |  4 +-
 keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c  |  2 +-
 .../rgbkb/sol/keymaps/brianweyer/keymap.c     |  2 +-
 .../rgbkb/sol/keymaps/danielhklein/keymap.c   |  4 +-
 keyboards/rgbkb/sol/keymaps/xyverz/keymap.c   |  2 +-
 .../rgbkb/zen/rev1/keymaps/333fred/keymap.c   | 12 +--
 .../zen/rev1/keymaps/jwlawrence/keymap.c      |  4 +-
 .../rgbkb/zen/rev1/keymaps/samae/keymap.c     |  4 +-
 .../rev1/keymaps/starcalleramethyst/keymap.c  |  2 +-
 .../rgbkb/zen/rev1/keymaps/xyverz/keymap.c    |  2 +-
 .../rgbkb/zygomorph/keymaps/5x6pad/keymap.c   |  2 +-
 .../katana60/rev1/keymaps/colemak/keymap.c    |  2 +-
 .../rev1/keymaps/josefadamcik/keymap.c        |  6 +-
 .../katana60/rev1/keymaps/msiu/keymap.c       |  2 +-
 .../katana60/rev1/keymaps/rominronin/keymap.c |  2 +-
 .../rev2/keymaps/rominronin_7u/keymap.c       |  2 +-
 .../7skb/keymaps/salicylic/keymap.c           |  4 +-
 .../ergoarrows/keymaps/salicylic/keymap.c     |  2 +-
 .../naked48/keymaps/salicylic/keymap.c        |  2 +-
 .../keymaps/salicylic_with_nafuda/keymap.c    |  2 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |  2 +-
 .../naked48/keymaps/scheiklp/keymap.c         |  2 +-
 .../naked48/keymaps/via_rgb_matrix/keymap.c   |  2 +-
 .../naked60/keymaps/333fred/keymap.c          |  2 +-
 .../naked60/keymaps/salicylic/keymap.c        |  2 +-
 .../keymaps/salicylic_with_nafuda/keymap.c    |  2 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |  2 +-
 .../naked64/keymaps/salicylic/keymap.c        |  2 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |  2 +-
 .../nknl7en/keymaps/salicylic/keymap.c        |  2 +-
 .../nknl7jp/keymaps/salicylic/keymap.c        |  2 +-
 .../sandwich/keeb68/keymaps/grv_esc/keymap.c  |  2 +-
 keyboards/satt/comet46/keymaps/satt/keymap.c  |  2 +-
 keyboards/satt/vision/keymaps/satt/keymap.c   |  2 +-
 keyboards/sck/m0116b/keymaps/m0116/keymap.c   |  4 +-
 keyboards/sck/m0116b/keymaps/m0118/keymap.c   |  2 +-
 .../senselessclay/had60/keymaps/had/keymap.c  |  2 +-
 .../s60_x/keymaps/amnesia0287/keymap.c        |  2 +-
 .../s60_x/keymaps/ansi_qwertz/keymap.c        |  2 +-
 .../sentraq/s60_x/keymaps/bluebear/keymap.c   |  4 +-
 keyboards/sentraq/s65_x/keymaps/smt/keymap.c  |  4 +-
 .../shapeshifter4060/keymaps/default/keymap.c |  2 +-
 .../shapeshifter4060/keymaps/vosechu/keymap.c |  4 +-
 keyboards/singa/keymaps/amnesia0287/keymap.c  |  2 +-
 keyboards/singa/keymaps/test/keymap.c         |  4 +-
 .../unigo66/keymaps/danielhklein/keymap.c     |  4 +-
 keyboards/smk60/keymaps/60_hhkb/keymap.c      |  2 +-
 keyboards/smk60/keymaps/60_wkl/keymap.c       |  2 +-
 .../smk60/keymaps/60_wkl_split_bs/keymap.c    |  2 +-
 keyboards/sofle/keymaps/devdev/keymap.c       |  6 +-
 keyboards/sofle/keymaps/flare576/keymap.c     |  4 +-
 keyboards/sofle/keymaps/foureight84/keymap.c  |  4 +-
 keyboards/sofle/keymaps/helltm/keymap.c       |  8 +-
 keyboards/sofle/keymaps/killmaster/keymap.c   |  4 +-
 keyboards/sofle/keymaps/rgb_default/keymap.c  |  8 +-
 .../sowbug/ansi_tkl/keymaps/sowbug/keymap.c   |  2 +-
 .../splitkb/kyria/keymaps/asapjockey/keymap.c |  2 +-
 .../splitkb/kyria/keymaps/john-ezra/keymap.c  |  2 +-
 .../kyria/keymaps/maherma-adg/keymap.c        |  4 +-
 .../kyria/keymaps/muppetjones/keymap.c        |  4 +-
 .../splitkb/kyria/keymaps/tessachka/keymap.c  |  4 +-
 .../nascent/keymaps/default/keymap.c          |  2 +-
 .../studiokestra/nascent/keymaps/via/keymap.c |  2 +-
 keyboards/sx60/keymaps/amnobis/keymap.c       |  2 +-
 keyboards/tada68/keymaps/iso-nor/keymap.c     |  4 +-
 keyboards/tada68/keymaps/isoish/keymap.c      |  4 +-
 keyboards/tada68/keymaps/rys/keymap.c         |  2 +-
 .../tada68/keymaps/tokyovigilante/keymap.c    |  2 +-
 .../tada68/keymaps/tokyovigilante/layers.json |  2 +-
 keyboards/tanuki/keymaps/tucznak/keymap.c     |  2 +-
 keyboards/terrazzo/keymaps/ortho/keymap.c     |  2 +-
 keyboards/terrazzo/keymaps/ortho_all/keymap.c |  2 +-
 keyboards/terrazzo/keymaps/ortho_mit/keymap.c |  2 +-
 keyboards/tgr/alice/keymaps/mrkeebs/keymap.c  |  2 +-
 .../liminal/keymaps/brandonschlack/keymap.c   |  2 +-
 .../bananasplit/keymaps/0010/keymap.c         |  2 +-
 .../bananasplit/keymaps/cijanzen/keymap.c     |  2 +-
 .../bananasplit/keymaps/coloneljesus/keymap.c |  2 +-
 .../bananasplit/keymaps/nic/keymap.c          |  2 +-
 .../minivan/keymaps/budi/keymap.c             |  4 +-
 .../minivan/keymaps/danbee/keymap.c           |  2 +-
 .../minivan/keymaps/dcompact/keymap.c         |  2 +-
 .../minivan/keymaps/halvves/keymap.c          |  4 +-
 .../minivan/keymaps/hvp/keymap.c              |  2 +-
 .../minivan/keymaps/jeebak/keymap.c           |  2 +-
 .../minivan/keymaps/jetpacktuxedo/keymap.c    |  4 +-
 .../minivan/keymaps/king/keymap.c             |  4 +-
 .../minivan/keymaps/lexworth/keymap.c         |  2 +-
 .../minivan/keymaps/like_jis/keymap.c         |  2 +-
 .../minivan/keymaps/mjt/keymap.c              |  4 +-
 .../minivan/keymaps/smt/keymap.c              |  2 +-
 .../minivan/keymaps/tong92/keymap.c           |  4 +-
 .../minivan/keymaps/xyverz/keymap.c           |  2 +-
 .../roadkit/keymaps/khord/keymap.c            |  2 +-
 .../tkc/osav2/keymaps/brandonschlack/keymap.c |  2 +-
 keyboards/tkc/osav2/keymaps/stanrc85/keymap.c |  2 +-
 keyboards/tkc/tkc1800/keymaps/smt/keymap.c    |  2 +-
 .../tkc/tkc1800/keymaps/yanfali/keymap.c      |  2 +-
 keyboards/tmo50/keymaps/olivia/keymap.c       |  2 +-
 keyboards/tmo50/keymaps/ottodokto/keymap.c    |  2 +-
 keyboards/tmo50/keymaps/pyrol/keymap.c        |  2 +-
 keyboards/tmo50/keymaps/xerpocalypse/keymap.c |  2 +-
 keyboards/tr60w/keymaps/joule-flow/keymap.c   |  2 +-
 .../ketch/keymaps/jetpacktuxedo/keymap.c      |  4 +-
 keyboards/uk78/keymaps/rask/keymap.c          |  2 +-
 .../launch_pad/keymaps/warzone/keymap.c       |  2 +-
 .../diverge3/keymaps/workman/keymap.c         |  4 +-
 .../divergetm2/keymaps/xtonhasvim/keymap.c    |  4 +-
 .../keymaps/followingghosts/keymap.c          |  6 +-
 .../vertex/angler2/keymaps/default/keymap.c   |  2 +-
 keyboards/vertex/angler2/keymaps/via/keymap.c |  6 +-
 .../viktus/sp_mini/keymaps/peott-fr/keymap.c  |  2 +-
 keyboards/viktus/styrka/keymaps/all/keymap.c  |  2 +-
 .../viktus/styrka/keymaps/split_bs/keymap.c   |  2 +-
 .../vitamins_included/keymaps/numpad/keymap.c |  4 +-
 .../keymaps/vitavim/keymap.c                  |  2 +-
 .../neuron/keymaps/brandonschlack/keymap.c    |  2 +-
 keyboards/waterfowl/keymaps/cyanduck/keymap.c |  2 +-
 .../aanzee/keymaps/iso-default/keymap.c       |  2 +-
 .../cyclops/keymaps/peippo/keymap.c           |  2 +-
 .../cypher/rev1/keymaps/kwer/keymap.c         |  2 +-
 .../cypher/rev5/keymaps/max/keymap.c          |  2 +-
 .../rama_works_m60_a/keymaps/mguterl/keymap.c |  2 +-
 .../wt60_d/keymaps/madhatter/keymap.c         |  2 +-
 .../wt75_b/keymaps/madhatter/keymap.c         |  2 +-
 .../wilba_tech/wt8_a/keymaps/rys/keymap.c     |  2 +-
 .../wilba_tech/zeal60/keymaps/crd/keymap.c    |  2 +-
 .../wilba_tech/zeal60/keymaps/tusing/keymap.c |  2 +-
 .../woodkeys/meira/keymaps/cole/keymap.c      |  2 +-
 .../meira/keymaps/grahampheath/keymap.c       |  2 +-
 .../woodkeys/meira/keymaps/takmiya/keymap.c   |  2 +-
 keyboards/wsk/sl40/keymaps/prototype/keymap.c |  2 +-
 .../ikki68_aurora/keymaps/ewersp/keymap.c     |  4 +-
 keyboards/xiudi/xd60/keymaps/Jos/keymap.c     |  2 +-
 .../ansi_split_bs_rshift_space/keymap.c       |  2 +-
 keyboards/xiudi/xd60/keymaps/birkir/keymap.c  |  2 +-
 .../xiudi/xd60/keymaps/crd_ansi/keymap.c      |  2 +-
 keyboards/xiudi/xd60/keymaps/finnish/keymap.c |  2 +-
 .../xiudi/xd60/keymaps/fvolpe83/keymap.c      |  2 +-
 .../xiudi/xd60/keymaps/kmontag42/keymap.c     |  2 +-
 keyboards/xiudi/xd60/keymaps/krusli/keymap.c  |  2 +-
 keyboards/xiudi/xd60/keymaps/melka/keymap.c   |  2 +-
 .../xiudi/xd60/keymaps/petesmom/keymap.c      |  2 +-
 keyboards/xiudi/xd60/keymaps/rooski/keymap.c  |  4 +-
 .../xiudi/xd60/keymaps/stanleylai/keymap.c    |  2 +-
 .../xiudi/xd60/keymaps/suryanisaac/keymap.c   |  2 +-
 keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c |  2 +-
 keyboards/xiudi/xd75/keymaps/adi/keymap.c     |  2 +-
 .../xiudi/xd75/keymaps/arpinfidel/keymap.c    |  4 +-
 .../xiudi/xd75/keymaps/atomic_style/keymap.c  |  4 +-
 .../xd75/keymaps/atomic_style_jp/keymap.c     |  2 +-
 keyboards/xiudi/xd75/keymaps/boy_314/keymap.c |  8 +-
 keyboards/xiudi/xd75/keymaps/bramver/keymap.c |  2 +-
 .../xiudi/xd75/keymaps/bulbizarre/keymap.c    |  4 +-
 .../xiudi/xd75/keymaps/buzzlighter1/keymap.c  |  4 +-
 .../xd75/keymaps/c4software_bepo/keymap.c     |  4 +-
 .../xiudi/xd75/keymaps/cbbrowne/keymap.c      |  6 +-
 .../xiudi/xd75/keymaps/clanghans/keymap.c     |  2 +-
 keyboards/xiudi/xd75/keymaps/colinta/keymap.c |  4 +-
 keyboards/xiudi/xd75/keymaps/daniel/keymap.c  |  2 +-
 .../xiudi/xd75/keymaps/davidrambo/keymap.c    |  4 +-
 .../xd75/keymaps/developper_bepo/keymap.c     |  4 +-
 .../xd75/keymaps/dyn_macro_tap_dance/keymap.c |  4 +-
 keyboards/xiudi/xd75/keymaps/emilyh/keymap.c  |  6 +-
 keyboards/xiudi/xd75/keymaps/fabian/keymap.c  |  2 +-
 keyboards/xiudi/xd75/keymaps/french/keymap.c  |  4 +-
 .../xiudi/xd75/keymaps/germanized/keymap.c    |  2 +-
 keyboards/xiudi/xd75/keymaps/hybrid/keymap.c  |  2 +-
 keyboards/xiudi/xd75/keymaps/jarred/keymap.c  |  2 +-
 .../xiudi/xd75/keymaps/kim-kim-xd73/keymap.c  |  8 +-
 keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c |  8 +-
 keyboards/xiudi/xd75/keymaps/kloki/keymap.c   |  2 +-
 keyboards/xiudi/xd75/keymaps/markus/keymap.c  |  2 +-
 keyboards/xiudi/xd75/keymaps/minna/keymap.c   |  2 +-
 keyboards/xiudi/xd75/keymaps/msiu/keymap.c    |  2 +-
 .../xiudi/xd75/keymaps/neothefox/keymap.c     |  4 +-
 keyboards/xiudi/xd75/keymaps/odyssey/keymap.c |  2 +-
 keyboards/xiudi/xd75/keymaps/raoeus/keymap.c  |  2 +-
 .../xd75/keymaps/replicajunction/keymap.c     |  4 +-
 keyboards/xiudi/xd75/keymaps/revok75/keymap.c |  4 +-
 .../xiudi/xd75/keymaps/scheiklb/keymap.c      |  2 +-
 .../xiudi/xd75/keymaps/scheiklp/keymap.c      |  4 +-
 .../xiudi/xd75/keymaps/skewwhiffy/keymap.c    |  6 +-
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |  2 +-
 .../xiudi/xd75/keymaps/tomswartz07/keymap.c   |  6 +-
 keyboards/xiudi/xd75/keymaps/xo/keymap.c      |  4 +-
 .../xiudi/xd87/keymaps/mac_underglow/keymap.c |  2 +-
 keyboards/xiudi/xd96/keymaps/uuupah/keymap.c  |  2 +-
 keyboards/yampad/keymaps/traditional/keymap.c |  2 +-
 .../yanghu/unicorne/keymaps/bcat/keymap.c     |  2 +-
 .../ydkb/just60/keymaps/thinxer/keymap.c      |  2 +-
 .../gingham/keymaps/codecoffeecode/keymap.c   |  2 +-
 keyboards/ymdk/bface/keymaps/minila/keymap.c  |  2 +-
 .../ymdk/melody96/keymaps/crilith/keymap.c    |  2 +-
 keyboards/ymdk/melody96/keymaps/dvz/keymap.c  |  2 +-
 .../ymdk/melody96/keymaps/zunger/keymap.c     |  2 +-
 keyboards/ymdk/sp64/keymaps/daed/keymap.c     |  2 +-
 keyboards/ymdk/sp64/keymaps/walston/keymap.c  |  2 +-
 keyboards/ymdk/wings/keymaps/default/keymap.c |  2 +-
 .../ymdk/wingshs/keymaps/default/keymap.c     |  2 +-
 keyboards/ymdk/yd60mq/keymaps/64key/keymap.c  |  2 +-
 keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c |  2 +-
 .../ymdk/ymd40/v2/keymaps/factory/keymap.c    |  2 +-
 keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c |  2 +-
 keyboards/yosino58/keymaps/sakura/keymap.c    |  8 +-
 keyboards/zj68/keymaps/splitbs/keymap.c       |  2 +-
 .../ztboards/after/keymaps/ellicose/keymap.c  |  4 +-
 .../ztboards/after/keymaps/phlop/keymap.c     |  4 +-
 .../60_ansi/brandonschlack-ansi/keymap.c      |  2 +-
 .../60_ansi/mechmerlin-ansi/keymap.c          |  2 +-
 .../community/60_ansi/stanrc85-ansi/keymap.c  |  2 +-
 .../mrsendyyk/keymap.c                        |  2 +-
 .../60_ansi_split_bs_rshift/bcat/keymap.c     |  2 +-
 .../brandonschlack-split/keymap.c             |  2 +-
 .../mechmerlin-split/keymap.c                 |  4 +-
 .../60_ansi_split_bs_rshift/yanfali/keymap.c  |  2 +-
 layouts/community/60_hhkb/yanfali/keymap.c    |  2 +-
 layouts/community/60_iso/bifbofii/keymap.c    |  4 +-
 layouts/community/60_iso/bifbofii/readme.md   |  2 +-
 layouts/community/60_iso/unxmaal/keymap.c     |  2 +-
 .../community/60_tsangan_hhkb/bcat/keymap.c   |  2 +-
 .../brandonschlack-tsngn/keymap.c             |  2 +-
 .../60_tsangan_hhkb/dohmain/keymap.c          |  2 +-
 .../60_tsangan_hhkb/yanfali/keymap.c          |  2 +-
 .../60_tsangan_hhkb/yanfali_wkl/keymap.c      |  2 +-
 layouts/community/65_ansi/mechmerlin/keymap.c |  2 +-
 layouts/community/65_ansi/yanfali/keymap.c    |  2 +-
 .../65_ansi_blocker/brandonschlack/keymap.c   |  2 +-
 .../65_ansi_blocker/mechmerlin/keymap.c       |  2 +-
 .../65_ansi_blocker/spidey3/keymap.c          |  2 +-
 .../65_ansi_blocker/stanrc85/keymap.c         |  2 +-
 .../65_ansi_blocker_split_bs/bcat/keymap.c    |  2 +-
 .../brandonschlack-split/keymap.c             |  2 +-
 layouts/community/66_ansi/mechmerlin/keymap.c |  2 +-
 layouts/community/66_ansi/skully/keymap.c     |  2 +-
 layouts/community/66_ansi/xyverz/keymap.c     |  2 +-
 layouts/community/68_ansi/mechmerlin/keymap.c |  2 +-
 .../community/75_ansi/brandonschlack/keymap.c |  2 +-
 .../75_ansi/mechmerlin-75_ansi/keymap.c       |  2 +-
 layouts/community/75_ansi/spidey3/keymap.c    |  2 +-
 layouts/community/75_ansi/yanfali/keymap.c    |  2 +-
 .../community/alice/stanrc85-alice/keymap.c   |  2 +-
 layouts/community/ergodox/ab/keymap.c         |  2 +-
 layouts/community/ergodox/alexjj/keymap.c     |  2 +-
 layouts/community/ergodox/bepo_csa/keymap.c   |  4 +-
 .../community/ergodox/choromanski/keymap.c    |  6 +-
 .../ergodox/colemak_programmer/keymap.c       |  4 +-
 .../ergodox/common_nighthawk/keymap.c         |  2 +-
 layouts/community/ergodox/dragon788/keymap.c  |  2 +-
 layouts/community/ergodox/guni/keymap.c       |  2 +-
 layouts/community/ergodox/issmirnov/keymap.c  |  2 +-
 .../community/ergodox/jackhumbert/keymap.c    |  6 +-
 layouts/community/ergodox/josh/keymap.c       |  6 +-
 layouts/community/ergodox/kejadlen/keymap.c   |  2 +-
 .../community/ergodox/meagerfindings/keymap.c |  4 +-
 layouts/community/ergodox/naps62/keymap.c     |  2 +-
 .../ergodox/replicaJunction/keymap.c          |  2 +-
 layouts/community/ergodox/sethbc/keymap.c     |  2 +-
 .../community/ergodox/swedish-lindhe/keymap.c |  2 +-
 .../community/ergodox/swissgerman/keymap.c    |  6 +-
 layouts/community/ergodox/xyverz/keymap.c     |  2 +-
 .../community/numpad_5x6/bjohnson/keymap.c    |  2 +-
 .../community/ortho_3x10/bbaserdem/keymap.c   |  2 +-
 layouts/community/ortho_3x10/wanleg/readme.md |  8 +-
 .../community/ortho_4x12/ajp10304/keymap.c    |  2 +-
 .../community/ortho_4x12/bakingpy/keymap.c    |  2 +-
 .../community/ortho_4x12/bifbofii/keymap.c    |  4 +-
 .../community/ortho_4x12/bifbofii/readme.md   |  2 +-
 .../ortho_4x12/brandonschlack/keymap.c        |  2 +-
 .../community/ortho_4x12/bredfield/keymap.c   |  4 +-
 .../community/ortho_4x12/buswerks/keymap.c    |  2 +-
 .../ortho_4x12/colemak_mod_dh_wide/keymap.c   |  2 +-
 layouts/community/ortho_4x12/crs/keymap.c     |  2 +-
 .../community/ortho_4x12/ddeklerk/keymap.c    |  2 +-
 .../community/ortho_4x12/ergodoxish/keymap.c  |  2 +-
 .../community/ortho_4x12/greatwizard/keymap.c |  4 +-
 .../community/ortho_4x12/jackhumbert/keymap.c |  2 +-
 layouts/community/ortho_4x12/jotix/keymap.c   |  2 +-
 layouts/community/ortho_4x12/juno/keymap.c    |  2 +-
 layouts/community/ortho_4x12/junonum/keymap.c |  2 +-
 layouts/community/ortho_4x12/mguterl/keymap.c |  2 +-
 .../community/ortho_4x12/mindsound/keymap.c   |  2 +-
 .../community/ortho_4x12/symbolic/keymap.c    |  2 +-
 layouts/community/ortho_4x12/xyverz/keymap.c  |  2 +-
 .../ortho_5x12/brandonschlack/keymap.c        |  2 +-
 .../community/ortho_5x12/greatwizard/keymap.c |  4 +-
 layouts/community/ortho_5x12/riblee/keymap.c  |  2 +-
 layouts/community/ortho_5x12/xyverz/keymap.c  |  2 +-
 layouts/community/ortho_5x14/peej/keymap.c    |  2 +-
 .../planck_mit/guidoism/guidoism.json         |  2 +-
 .../community/planck_mit/guidoism/keymap.c    |  2 +-
 layouts/community/split_3x6_3/bcat/keymap.c   |  2 +-
 .../community/split_3x6_3/ddeklerk/keymap.c   |  2 +-
 .../tkl_ansi/brandonschlack/keymap.c          |  2 +-
 layouts/community/tkl_ansi/xyverz/keymap.c    |  2 +-
 layouts/community/tkl_ansi/yanfali/keymap.c   |  2 +-
 1495 files changed, 2006 insertions(+), 1908 deletions(-)
 create mode 100644 keyboards/ergodox_ez/keymaps/toshi0383/keymap.c

diff --git a/keyboards/0xcb/static/keymaps/bongocat/keymap.c b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
index 12cc75217e..6d0fc05d3a 100644
--- a/keyboards/0xcb/static/keymaps/bongocat/keymap.c
+++ b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
 ),
 [_FN2] = LAYOUT_all(
-                                                                                                       RESET,
+                                                                                                       QK_BOOT,
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,           _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
index d5b9f901a4..1bdf6dfec3 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [2] = LAYOUT_60_ansi(
-    KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , RESET   ,
+    KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , QK_BOOT,
     BL_TOGG , BL_INC   , BL_DEC  , BL_STEP , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ,
     RGB_TOG , RGB_MOD  , RGB_HUI , RGB_SAI , RGB_VAI , RGB_SPI , RGB_M_P  , RGB_M_B , RGB_M_R , RGB_M_SW , KC_TRNS , KC_TRNS , KC_TRNS ,
     KC_TRNS , RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , RGB_SPD , RGB_M_SN , RGB_M_K , RGB_M_X , RGB_M_G  , KC_TRNS , KC_TRNS ,
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
index 8e64c543d5..6708922899 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MOVE_LINUX] = LAYOUT_tsangan(\
      KC_GRV,     VD_1,     VD_2,     KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______, _______, \
-     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   RESET,    KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT, \
+     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   QK_BOOT,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT, \
      _______,    WM_LH,    WM_MAX,   WM_RH,    WD_FRWD,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______, \
      _______,    WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  WD_BACK,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   _______, \
      _______,    _______,  _______,  _______,  _______,  _______,  _______),
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG]     = LAYOUT_tsangan(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______, _______, \
-     _______,   NK_ON,    NK_OFF,   EEP_RST,  RESET,     _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
      _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   DF_1,     DF_2,     _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,  \
      _______,   _______,  _______,  _______,  _______,   _______,  _______)
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
index 525e02eef4..aff768048d 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT_60_hhkb(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
         KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_CLR,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
index 5229657bc6..2b8c539971 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MOVE_LINUX]  = LAYOUT_60_ansi_tsangan_split_rshift(\
      KC_GRV,     VD_1,     VD_2,     VD_3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
-     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   RESET,    KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT, \
+     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   QK_BOOT,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT, \
      _______,    WM_LH,    WM_MAX,   WM_RH,    WD_FRWD,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______, \
      _______,    WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  WD_BACK,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   _______, \
      _______,    _______,  _______,  _______,  _______,  _______,  _______),
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG]     = LAYOUT_60_ansi_tsangan_split_rshift(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
-     _______,   NK_ON,    NK_OFF,   EEP_RST,  RESET,     _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
      _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______, \
      _______,   _______,  _______,  _______,  _______,   _______,  _______)
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
index c4d82a4766..f3ccfb2ef7 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // adjust to handle firmware debug + reset mode
   [_adjust] = LAYOUT_all
   (
-   RESET, DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+   QK_BOOT, DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
index e62f3b6095..1bfe4e9b2a 100644
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [4] = LAYOUT_ortho_4x4(
                 KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
                 KC_NO,   KC_NO,   KC_NO,     KC_MUTE,
-                KC_NO,   RESET,   EEP_RST,   KC_VOLD,
+                KC_NO,   QK_BOOT, EEP_RST,   KC_VOLD,
                 TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [5] = LAYOUT_ortho_4x4(
                 RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
                 RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EEP_RST, RESET,     KC_LSHIFT,
+                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSHIFT,
                 KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
index 170d1ad8f1..3261058a9b 100644
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [4] = LAYOUT_ortho_4x4(
                 KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
                 RGB_TOG, RGB_MOD, RGB_RMOD,  KC_MUTE,
-                TO(0),   RESET,   EEP_RST, KC_VOLD,
+                TO(0),   QK_BOOT, EEP_RST, KC_VOLD,
                 KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
index 86ea58e8a5..8888fe35e4 100644
--- a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
+++ b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
     RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
     RGB_SPD,   RGB_SPI,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,    KC_TRNS,    RESET
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    QK_BOOT
   ),
 };
 
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
index 323d2c7d44..93dfc590e9 100644
--- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \
    * `-----------------------------------------'             `-----------------------------------------'
    */
     [_ADJUST] =  LAYOUT_ortho_4x12( \
-      _______, RESET,   RGBRST,  _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS, \
+      _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS, \
        AQOURS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,\
       _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, _______, _______,\
       _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KC_HOME, KC_PGDN, KC_PGUP, KC_END\
diff --git a/keyboards/25keys/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c
index a30e8ac5fc..8670a58efb 100644
--- a/keyboards/25keys/zinc/keymaps/monks/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/monks/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \
    * `-----------------------------------------'             `-----------------------------------------'
    */
     [_ADJUST] =  LAYOUT_ortho_4x12( \
-      _______, RESET,   RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_INS, \
+      _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_INS, \
       _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,\
       _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, KC_PGUP, _______,\
       _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KANA,    KC_HOME, KC_PGDN, KC_END\
diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
index a0f4f2895c..122ecd3611 100644
--- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] =  LAYOUT_ortho_4x12(
     RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  XXXXXXX,   RGB_TOG,    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  XXXXXXX,
     RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, XXXXXXX,   XXXXXXX,    KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  XXXXXXX,
-    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LANG1,  KC_LANG2,
+    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LANG1,  KC_LANG2,
     _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, KC_KANA
     ),
 };
diff --git a/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c b/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
index 965652441a..b4e8572f79 100644
--- a/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MENU] = LAYOUT_ortho_3x10(
     IONIAN,   LYDIAN,     LOCRIAN, _______, _______, _______, _______, _______, _______, _______,
     DORIAN,   MIXOLYDIAN, _______, _______, _______, _______, _______, _______, _______, _______,
-    PHRYGIAN, AEOLIAN,    _______, _______, _______, _______, _______, _______, RESET,   _______
+    PHRYGIAN, AEOLIAN,    _______, _______, _______, _______, _______, _______, QK_BOOT, _______
   )
 };
 
diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
index 2fd4c2a461..3a9e4d51fa 100644
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     EXT_PLV,  XXXXXXX,  KC_C,  KC_V,  XXXXXXX,  KC_N,  KC_M,  XXXXXXX,  XXXXXXX,  XXXXXXX
   ),
   [_ADJUST] = LAYOUT_ortho_3x10(
-    RESET,    _______,  _______,  _______,  _______,  QWERTY,   NUMBERS,  SYMBOLS,  PLOVER,    SONGS,
+    QK_BOOT,  _______,  _______,  _______,  _______,  QWERTY,   NUMBERS,  SYMBOLS,  PLOVER,    SONGS,
     MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   _______,  _______,  _______,  _______,  MACSLEEP,  _______,
     BACKLIT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______
   )
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
index 073eb568f0..21c84488dc 100644
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
+++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
@@ -1 +1 @@
-{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"40percentclub/gherkin","keymap":"pierrec83","layout":"LAYOUT_ortho_3x10","layers":[["KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_BSPC","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_Z","KC_X","KC_M","KC_C","KC_V","LT(7,KC_SPC)","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_K"],["KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","KC_TRNS","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","KC_TRNS","KC_MPRV","KC_WH_D","KC_MNXT","TG(1)"],["KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","BL_BRTG","BL_INC","KC_WH_U","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","BL_TOGG","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","BL_STEP","BL_DEC","KC_WH_D","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS"],["KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_LCTL","KC_NO","KC_LALT","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12"],["KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["LT(8,KC_TRNS)","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","RALT(KC_TRNS)","RCTL(KC_TRNS)","TG(1)"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","EEP_RST","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","RESET","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Anonymous"}
\ No newline at end of file
+{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"40percentclub/gherkin","keymap":"pierrec83","layout":"LAYOUT_ortho_3x10","layers":[["KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_BSPC","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_Z","KC_X","KC_M","KC_C","KC_V","LT(7,KC_SPC)","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_K"],["KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","KC_TRNS","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","KC_TRNS","KC_MPRV","KC_WH_D","KC_MNXT","TG(1)"],["KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","BL_BRTG","BL_INC","KC_WH_U","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","BL_TOGG","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","BL_STEP","BL_DEC","KC_WH_D","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS"],["KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_LCTL","KC_NO","KC_LALT","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12"],["KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["LT(8,KC_TRNS)","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","RALT(KC_TRNS)","RCTL(KC_TRNS)","TG(1)"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","EEP_RST","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Anonymous"}
\ No newline at end of file
diff --git a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c
index 2c3e872265..111264c378 100644
--- a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_ortho_3x10(
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ST_BOLT, ST_GEM,  TG_PLV,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT
   ),
 
 };
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
index bd467482fe..b7c31f9bd7 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 *                             `-------------'             `-------------'
 	 */
 	[_RAISE] = LAYOUT(/* Arrows, Shifted Numbers, Symbols, Delete, Macros */
-	  RESET,   KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, PRVWIN,  CLSTAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
+	  QK_BOOT, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, PRVWIN,  CLSTAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
 	  KC_GRV,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, NEWTAB,  ALTF4,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
 	  KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
 										                    KC_TRNS,                            KC_TRNS
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
index 7d9d516590..40d59ecf76 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------.
- * |PntSrn|      |      | PgUp |BrtUp |      |      | Mute |VolDw |VolUp |Ply/Ps|RESET |
+ * |PntSrn|      |      | PgUp |BrtUp |      |      | Mute |VolDw |VolUp |Ply/Ps|QK_BOOT |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |      |      | PgDw |BrtDw |      |      | Left | Down |  Up  |Right |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-  KC_PSCR, XXXXXXX, XXXXXXX, KC_PGUP, KC_BRIU, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, RESET,
+  KC_PSCR, XXXXXXX, XXXXXXX, KC_PGUP, KC_BRIU, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, QK_BOOT,
   XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_BRID, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
index 5e79cdb9a4..64bc4506da 100644
--- a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
@@ -96,7 +96,7 @@ LAYOUT( /* Left modifier - L2 */
    * |-------------------------------------------------------------------------+
    * |      |     |     |     |     |     |     |VolDn|VolUp|     |     |      |
    * |-------------------------------------------------------------------------+
-   * |       |LEDtg|LEDch|     |     |RESET|     | Mute|     |MouB1|MousU|MouB2|
+   * |       |LEDtg|LEDch|     |     |QK_BOOT|     | Mute|     |MouB1|MousU|MouB2|
    * |-------------------------------------------------------------------------+
    * |     |     |     |     |      |          |       |     |MousL|MousD|MousR|
    * `-------------------------------------------------------------------------'
@@ -105,7 +105,7 @@ LAYOUT( /* Left modifier - L2 */
 LAYOUT( /* Hold Tab down - L3 */
   KC_ESC,  KC_CALC, KC_WHOM, KC_MYCM, KC_WREF, _______, _______, _______, _______, _______, KC_PSCR, CTRADEL,
   _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______,
-  _______, LED_TOG, LED_CHG, _______, _______,   RESET, _______, KC_MUTE, _______, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2,
+  _______, LED_TOG, LED_CHG, _______, _______, QK_BOOT, _______, KC_MUTE, _______, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2,
   _______, _______, _______, _______, _______,     _______,      _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 ),
 
diff --git a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
index 67820f2ac0..5e0b36d499 100644
--- a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_BSPC, KC_UP,   KC_ENT,   _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    _______, KC_DEL,          
   KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, KC_PENT,         
   _______, _______, KC_MPRV, KC_MPLY,  KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
-  DF(1),   DF(0),   _______, _______,  _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, RESET )
+  DF(1),   DF(0),   _______, _______,  _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, QK_BOOT )
 };
 
 
diff --git a/keyboards/9key/keymaps/bcat/keymap.c b/keyboards/9key/keymaps/bcat/keymap.c
index 944a48c0d3..c445a19406 100644
--- a/keyboards/9key/keymaps/bcat/keymap.c
+++ b/keyboards/9key/keymaps/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LY_FN1,   KC_MUTE,  KY_MICM
     ),
     [LAYER_FUNCTION_1] = LAYOUT(
-        EEP_RST,  _______,  RESET,
+        EEP_RST,  _______,  QK_BOOT,
         _______,  _______,  _______,
         _______,  _______,  _______
     ),
diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c
index 2a65ce4580..aa45d10449 100644
--- a/keyboards/a_dux/keymaps/daliusd/keymap.c
+++ b/keyboards/a_dux/keymaps/daliusd/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MISC] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     RESET   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,XXXXXXX ,KC_PSCR ,K_PRINT ,
+     QK_BOOT,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,XXXXXXX ,KC_PSCR ,K_PRINT ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,DEBUG   ,XXXXXXX ,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,XXXXXXX ,KC_MNXT ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c b/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
index 61db52392e..521691d74f 100644
--- a/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
+++ b/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FUNCTION] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
-     RESET,   _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  LCA(KC_D),LCA(KC_F),LCA(KC_G),
+     QK_BOOT, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  LCA(KC_D),LCA(KC_F),LCA(KC_G),
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
      _______, _______, _______, _______, _______, _______,                            _______, _______, KC_UP,   _______, _______, _______,  LCA(KC_E),LCA(KC_ENT),LCA(KC_T),
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
diff --git a/keyboards/ai03/equinox/keymaps/crd/keymap.c b/keyboards/ai03/equinox/keymaps/crd/keymap.c
index 108a00d9d4..b945dc16d5 100644
--- a/keyboards/ai03/equinox/keymaps/crd/keymap.c
+++ b/keyboards/ai03/equinox/keymaps/crd/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, XXXXXXX, _______,          _______,          _______,          _______, _______, _______, _______
   ),
   [2] = LAYOUT_all( /* Num and FN */
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_MINS, KC_EQL,  _______, 
+    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_MINS, KC_EQL,  _______, 
     _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_SCLN, KC_QUOT, XXXXXXX, _______, 
     _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, 
     _______, XXXXXXX, _______,          _______,          _______,          _______, _______, XXXXXXX, _______
diff --git a/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c b/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
index 4bbea42af0..4846a220e3 100644
--- a/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
+++ b/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______,          _______,          _______,          _______,                    _______, _______, _______, _______, _______
 	),
 	[2] = LAYOUT( /* FN */
-		RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+		QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
 		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
 		_______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______, _______,
 		_______,          KC_RCTL, KC_RGUI, KC_RALT, _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______, _______,          KC_PGUP, _______,
diff --git a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
index fce03adfbe..a33a9247af 100644
--- a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
+++ b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FN] = LAYOUT_60_tsangan_hhkb(
 //  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 //  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______,
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______,
 //  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
 //  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
       _______,   _______,  _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______,   _______,
diff --git a/keyboards/ai03/polaris/keymaps/testing/keymap.c b/keyboards/ai03/polaris/keymaps/testing/keymap.c
index c819225103..9a8efc5d09 100644
--- a/keyboards/ai03/polaris/keymaps/testing/keymap.c
+++ b/keyboards/ai03/polaris/keymaps/testing/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
   ),
   [_FN] = LAYOUT_all( /* FN */
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC,
+    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_BSPC,
     _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_MPLY, KC_MNXT,          BL_STEP,
     _______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
     _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,          KC_PSCR, _______,
diff --git a/keyboards/ai03/quasar/keymaps/ai03/keymap.c b/keyboards/ai03/quasar/keymaps/ai03/keymap.c
index e2dca55cd1..95348ee113 100644
--- a/keyboards/ai03/quasar/keymaps/ai03/keymap.c
+++ b/keyboards/ai03/quasar/keymaps/ai03/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL,          KC_LALT,                                     KC_SPC,                                      KC_GRV,           KC_DEL,     KC_LEFT, KC_DOWN, KC_RGHT  
   ),
   [1] = LAYOUT( /* FN */
-    RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,    _______, _______, _______, 
+    QK_BOOT,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,    _______, _______, _______, 
 	_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,     _______, _______, _______, 
 	KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,    _______, _______, _______, 
 	_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLU, KC_VOLD, KC_HOME, KC_PGDN, KC_END,  _______, _______,                   _______,                               
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
index 37085b7c90..d157d9db31 100644
--- a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_TAB] = LAYOUT_2u_single_space( /* Tab */
-  KC_ESC  , RESET   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  KC_ESC  , QK_BOOT, _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
   _______ , KC_F11  , KC_F12  , KC_F13  , KC_F14  , KC_F15  , KC_F16  , KC_F17  , KC_F18  , KC_F19  , KC_F20  , _______ ,
   _______ , KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , _______ ,
   _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
index 37085b7c90..d157d9db31 100644
--- a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_TAB] = LAYOUT_2u_single_space( /* Tab */
-  KC_ESC  , RESET   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  KC_ESC  , QK_BOOT, _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
   _______ , KC_F11  , KC_F12  , KC_F13  , KC_F14  , KC_F15  , KC_F16  , KC_F17  , KC_F18  , KC_F19  , KC_F20  , _______ ,
   _______ , KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , _______ ,
   _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
diff --git a/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c b/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
index 0014d699a3..c2de091fef 100644
--- a/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
+++ b/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
@@ -70,6 +70,6 @@ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, K
 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, _______, KC_HOME, KC_UP,   KC_PGUP,
 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_DEL, 	KC_LEFT, KC_SLCK, KC_RGHT,
 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_END,  KC_DOWN, KC_PGDN,
-KC_LGUI, _______, _______, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, RESET),
+KC_LGUI, _______, _______, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, QK_BOOT),
 };
 
diff --git a/keyboards/al1/keymaps/splitbs/keymap.c b/keyboards/al1/keymaps/splitbs/keymap.c
index d896b10dbe..5214e23646 100644
--- a/keyboards/al1/keymaps/splitbs/keymap.c
+++ b/keyboards/al1/keymaps/splitbs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT_split_bs(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,           _______,          _______, _______, _______, _______,
-        _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                     _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______,                   BL_TOGG, BL_DEC,  BL_INC,           _______, _______
diff --git a/keyboards/alf/x2/keymaps/hhkb_60/keymap.c b/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
index 1f46c22ade..f8820570d2 100644
--- a/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
+++ b/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_all(
                  KC_MNXT, KC_MPRV,
         KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, RESET,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/alpha/keymaps/hvp/keymap.c b/keyboards/alpha/keymaps/hvp/keymap.c
index 9e8f2d3b9c..13071b0830 100755
--- a/keyboards/alpha/keymaps/hvp/keymap.c
+++ b/keyboards/alpha/keymaps/hvp/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		RGB_VAI, RGB_VAD, RGB_HUI, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU),
 
 	[OTHER] = LAYOUT(
-		KC_ESC, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL,
+		KC_ESC, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL,
 		KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, _______,
 		KC_F10, KC_F11, KC_F12, _______, _______, KC_NO, KC_NO, KC_NO),
 };
diff --git a/keyboards/alps64/keymaps/crd/keymap.c b/keyboards/alps64/keymaps/crd/keymap.c
index 9268083522..533a30b1bc 100644
--- a/keyboards/alps64/keymaps/crd/keymap.c
+++ b/keyboards/alps64/keymaps/crd/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_FL] = LAYOUT_aek_103(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-    _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, RESET,
+    _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______
diff --git a/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
index a35337a4e2..f3fa391105 100755
--- a/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL, \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______,          _______,          _______,          _______, _______, _______ \
diff --git a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
index caf6700bc3..365f4ac0c0 100755
--- a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // Fkey Layer
   [3] = LAYOUT( \
-      KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, RESET,\
+      KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, QK_BOOT,\
       KC_TRNS, KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
       KC_TRNS, TG(4),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS\
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
index ec8cdd87db..4a598d42a8 100644
--- a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		),
 	
     [_ADJUST] = LAYOUT( \
-        _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+        _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         \
 		KC_SYSTEM_SLEEP, _______, _______, _______, _______, _______, _______, _______                             \
diff --git a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
index 7bfaed5999..9579726594 100644
--- a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT_ortho_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, \
     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
-    KC_P7,   KC_P8,   KC_P9,   RESET,   \
+    KC_P7,   KC_P8,   KC_P9,   QK_BOOT, \
     KC_P4,   KC_P5,   KC_P6,   KC_PENT, \
     KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
     KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
diff --git a/keyboards/anomalykb/a65i/keymaps/ansi_splitbs/keymap.c b/keyboards/anomalykb/a65i/keymaps/ansi_splitbs/keymap.c
index 6c7b1094b5..e9e3f7a32a 100644
--- a/keyboards/anomalykb/a65i/keymaps/ansi_splitbs/keymap.c
+++ b/keyboards/anomalykb/a65i/keymaps/ansi_splitbs/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
   [1] = LAYOUT_65_ansi_blocker_split_bs(
-    RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,  KC_TRNS,
+    QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,  KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,           KC_TRNS,
     KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
diff --git a/keyboards/aos/tkl/keymaps/aholland909/keymap.c b/keyboards/aos/tkl/keymaps/aholland909/keymap.c
index 5e224811fc..511d1d44df 100644
--- a/keyboards/aos/tkl/keymaps/aholland909/keymap.c
+++ b/keyboards/aos/tkl/keymaps/aholland909/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,                KC_LALT,                    KC_SPC,                                KC_RGUI,          TG(1),   KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT_tkl_iso_wkl(
-    RESET,    KC_F13,  KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24,            _______,  _______,  _______,
+    QK_BOOT,  KC_F13,  KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24,            _______,  _______,  _______,
 
     _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,
     _______,  _______, KC_VOLU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           RGB_M_P,  RGB_M_B,  _______,
diff --git a/keyboards/arisu/keymaps/fate/keymap.c b/keyboards/arisu/keymaps/fate/keymap.c
index f737b4d19a..02f15febe1 100644
--- a/keyboards/arisu/keymaps/fate/keymap.c
+++ b/keyboards/arisu/keymaps/fate/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
     KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           KC_END,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,                   _______,
-    _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______,          KC_VOLU,
+    _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          KC_VOLU,
     _______,          _______,          _______, _______,          _______,          _______,                   KC_MPRV, KC_VOLD, KC_MNXT
   )
 };
diff --git a/keyboards/arisu/keymaps/kresnak/keymap.c b/keyboards/arisu/keymaps/kresnak/keymap.c
index 0a4b88367d..05a0e6ba4c 100644
--- a/keyboards/arisu/keymaps/kresnak/keymap.c
+++ b/keyboards/arisu/keymaps/kresnak/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_HOME,
-    _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          KC_END,
+    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          KC_END,
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, _______, _______, _______, _______,                   _______,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, KC_BSLS, _______,          _______,
     _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
diff --git a/keyboards/arisu/keymaps/stanrc85/keymap.c b/keyboards/arisu/keymaps/stanrc85/keymap.c
index a8430b9a33..6874d584dc 100644
--- a/keyboards/arisu/keymaps/stanrc85/keymap.c
+++ b/keyboards/arisu/keymaps/stanrc85/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_FN2_60] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,                   _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, TG(_DEFAULT)
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c
index 9ed79899d3..d4eee803ac 100644
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ b/keyboards/atomic/keymaps/pvc/keymap.c
@@ -217,7 +217,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
     | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX |
     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | VOICE+ | XXXXXX |
+    | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | QK_BOOT  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | VOICE+ | XXXXXX |
     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
     | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER  | XXXXXX . XXXXXX | LOWER  | XXXXXX | XXXXXX | XXXXXX | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
     '--------------------------------------------------------------------------------------------------------------------------------------'
@@ -226,7 +226,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, XXXXXXX, MU_TOG , AU_TOG , XXXXXXX, XXXXXXX,
     XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET  , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX,
+    XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, QK_BOOT, XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP
   ),
 };
diff --git a/keyboards/atreus/keymaps/clash/keymap.c b/keyboards/atreus/keymaps/clash/keymap.c
index 3a8b5bf479..9a1876ba74 100644
--- a/keyboards/atreus/keymaps/clash/keymap.c
+++ b/keyboards/atreus/keymaps/clash/keymap.c
@@ -36,6 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LW] = LAYOUT( /* [> LOWER <] */
     KC_INS,   KC_HOME, KC_MS_U, KC_END,  KC_PGUP,                   KC_BTN1, KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     OUT_USB,  KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN,                   KC_BTN2, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-    OUT_BT,   KC_VOLU, KC_NO,   KC_NO,   RESET,                     KC_BTN3, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
+    OUT_BT,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_BTN3, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
     OUT_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
 };
diff --git a/keyboards/atreus/keymaps/classic/keymap.c b/keyboards/atreus/keymaps/classic/keymap.c
index 5837bcfe74..2777edd8e5 100644
--- a/keyboards/atreus/keymaps/classic/keymap.c
+++ b/keyboards/atreus/keymaps/classic/keymap.c
@@ -27,6 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F12 ,
-    KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  DF(_QW), KC_TRNS, KC_TRNS, RESET
+    KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  DF(_QW), KC_TRNS, KC_TRNS, QK_BOOT
   ),
 };
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index eff7c8d577..50ff84388f 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MEH(KC_G), MEH(KC_H),MEH(KC_I), MEH(KC_J), MEH(KC_K),                    KC_TRNS,             RSFT(KC_HOME), RSFT(KC_UP),   RSFT(KC_END),   RSFT(KC_PGUP),
     MEH(KC_L), MEH(KC_M),MEH(KC_N), MEH(KC_O), MEH(KC_P),                    RSFT(RCTL(KC_LEFT)), RSFT(KC_LEFT), RSFT(KC_DOWN), RSFT(KC_RIGHT), RSFT(RCTL(KC_RIGHT)),
     MEH(KC_Q), MEH(KC_R),MEH(KC_S), MEH(KC_T), MEH(KC_U),                    KC_TRNS,             RCTL(KC_C),    RCTL(KC_X),    RCTL(KC_V),     RSFT(KC_PGDN),
-    RESET,     KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_ENTER, KC_SPACE,            KC_BSPC,       RCTL(KC_BSPC), KC_DELETE,      LCTL(KC_DELETE)
+    QK_BOOT,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_ENTER, KC_SPACE,            KC_BSPC,       RCTL(KC_BSPC), KC_DELETE,      LCTL(KC_DELETE)
   ),
 
   [COMBINED] = LAYOUT(
diff --git a/keyboards/atreus/keymaps/erlandsona/keymap.c b/keyboards/atreus/keymaps/erlandsona/keymap.c
index c261e892d4..75491e6869 100644
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ b/keyboards/atreus/keymaps/erlandsona/keymap.c
@@ -27,6 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9  ,                   KC_F8  , KC_F7  , KC_F6  , KC_F5  , KC_F4,
     KC_VOLD, KC_ACL0 , KC_ACL1, KC_ACL2, KC_VOLU,                   KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_F3,
     KC_MUTE, KC_MPRV , KC_MPLY, KC_MNXT, KC_MUTE,                   KC_WH_R, KC_WH_U, KC_WH_D, KC_WH_L, KC_F2,
-    _______, _______ , _______, _______, _______, _______, _______, KC_BTN1, TO(BASE), RESET  , KC_F12 , KC_F1
+    _______, _______ , _______, _______, _______, _______, _______, KC_BTN1, TO(BASE), QK_BOOT, KC_F12 , KC_F1
   ),
 };
diff --git a/keyboards/atreus/keymaps/gerb/keymap.c b/keyboards/atreus/keymaps/gerb/keymap.c
index f6ff7330db..e122c5f12f 100644
--- a/keyboards/atreus/keymaps/gerb/keymap.c
+++ b/keyboards/atreus/keymaps/gerb/keymap.c
@@ -42,6 +42,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,                   DF(_QW), KC_F7,   KC_F8,   KC_F9,   KC_F10,
     KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,                   DF(_CM), KC_F6,   KC_F5,   KC_F6,   KC_F11,
     KC_BTN4, KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,                   DF(_DV), KC_F1,   KC_F2,   KC_F3,   KC_F12,
-    KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, RESET
+    KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
   ),
 };
diff --git a/keyboards/atreus/keymaps/henxing/keymap.c b/keyboards/atreus/keymaps/henxing/keymap.c
index 51a46fa373..8a792dbc42 100644
--- a/keyboards/atreus/keymaps/henxing/keymap.c
+++ b/keyboards/atreus/keymaps/henxing/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_RAISE] = LAYOUT( \
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,  KC_F8,   KC_F9,   KC_F10, \
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,  KC_F5,   KC_F6,   KC_F11, \
-    KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, RESET,                     KC_TRNS, KC_F1,  KC_F2,   KC_F3,   KC_F12, \
+    KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, QK_BOOT,                   KC_TRNS, KC_F1,  KC_F2,   KC_F3,   KC_F12, \
     KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY, KC_PSCR, KC_SLCK, KC_PAUS \
   ),
 };
diff --git a/keyboards/atreus/keymaps/jeremy/keymap.c b/keyboards/atreus/keymaps/jeremy/keymap.c
index de2bedaa7f..7ca35b3d9a 100644
--- a/keyboards/atreus/keymaps/jeremy/keymap.c
+++ b/keyboards/atreus/keymaps/jeremy/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_BSPC,        KC_UP,          KC_DEL,  KC_PGUP,                   KC_TRNS, KM_SAVE, KC_TRNS,        KM_OPEN,        KC_TRNS,
     KC_TRNS, KC_LEFT,        KC_DOWN,        KC_RGHT, KC_PGDN,                   KM_UNDO, KC_LALT, KC_TRNS,        KC_LGUI,        KC_TRNS,
     KC_TRNS, KC_VOLD,        KC_MUTE,        KC_VOLU, KC_MPLY,                   KM_REDO, KM_CLSE, KC_TRNS,        KC_TRNS,        KC_TRNS,
-    KC_TRNS, KC_TRNS,        RESET,          KC_TRNS, KC_TAB,  KM_COPY, KM_CUT,  KM_PAST, KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS
+    KC_TRNS, KC_TRNS,        QK_BOOT,        KC_TRNS, KC_TAB,  KM_COPY, KM_CUT,  KM_PAST, KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS
   ),
   [SYMB] = LAYOUT(
     KC_BSLS, KC_EXLM,        KC_LABK,        KC_RABK, CM_COLN,                   KC_UNDS, KC_DLR,  KC_QUES,       KC_TRNS,         KC_PERC,
diff --git a/keyboards/atreus/keymaps/kejadlen/keymap.c b/keyboards/atreus/keymaps/kejadlen/keymap.c
index 3f6d01a594..45de7824c2 100644
--- a/keyboards/atreus/keymaps/kejadlen/keymap.c
+++ b/keyboards/atreus/keymaps/kejadlen/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [ETC] = LAYOUT(
-    RESET,         KC_NO,  KC_NO,    KC_NO,    KC_PGUP,                      KC_VOLU,  KC_F7,  KC_F8,  KC_F9,   KC_HOME,
+    QK_BOOT,       KC_NO,  KC_NO,    KC_NO,    KC_PGUP,                      KC_VOLU,  KC_F7,  KC_F8,  KC_F9,   KC_HOME,
     LT(ETC,KC_A),  KC_NO,  KC_NO,    KC_NO,    KC_PGDN,                      KC_VOLD,  KC_F4,  KC_F5,  KC_F6,   KC_END,
     KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_DEL,                       KC_MUTE,  KC_F1,  KC_F2,  KC_F3,   KC_INS,
     KC_TRNS,       KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,   KC_NO
diff --git a/keyboards/atreus/keymaps/khitsule/keymap.c b/keyboards/atreus/keymaps/khitsule/keymap.c
index 1190efa3cb..79f4da0b81 100644
--- a/keyboards/atreus/keymaps/khitsule/keymap.c
+++ b/keyboards/atreus/keymaps/khitsule/keymap.c
@@ -45,6 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_F6,    KC_F7,     KC_F8,     KC_F9,   KC_F10,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      TSKMGR,   KC_TRNS,   KC_TRNS,   KC_F11,  KC_F12,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,
-    RESET,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS
+    QK_BOOT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS
   )
 };
diff --git a/keyboards/atreus/keymaps/nojjan/keymap.c b/keyboards/atreus/keymaps/nojjan/keymap.c
index 42204b13e0..f7b8f0e51d 100644
--- a/keyboards/atreus/keymaps/nojjan/keymap.c
+++ b/keyboards/atreus/keymaps/nojjan/keymap.c
@@ -37,6 +37,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LW] = LAYOUT( /* [> LOWER <] */
   KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
   KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-  KC_NO,   KC_VOLU, KC_NO,   KC_NO,   RESET,                     KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
+  KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
   KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
 };
diff --git a/keyboards/atreus/keymaps/ptillemans/keymap.c b/keyboards/atreus/keymaps/ptillemans/keymap.c
index ea4edeca7d..9328d8ce53 100644
--- a/keyboards/atreus/keymaps/ptillemans/keymap.c
+++ b/keyboards/atreus/keymaps/ptillemans/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LW] = LAYOUT( /* [> LOWER <] */
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-    KC_NO,   KC_VOLU, KC_NO,   KC_NO,   RESET,                     KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
+    KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
     KC_NO,   KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______, TO(_QW), KC_PSCR, KC_SLCK, KC_MPLY
   )
 };
diff --git a/keyboards/atreus/keymaps/quartz64/keymap.c b/keyboards/atreus/keymaps/quartz64/keymap.c
index c62011e4b3..eb882bce31 100644
--- a/keyboards/atreus/keymaps/quartz64/keymap.c
+++ b/keyboards/atreus/keymaps/quartz64/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	|------+------+------+------+------|------.,------|------+------+------+------+------|
 	| trns |r_tog | r_hue| r_sat| r_val|      ||      |   +  |   1  |   2  |   3  | trns |
 	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	| trns | Esc  |RESET |capslk| trns |------'`------| trns |   0  |   -  |  +=  | trns |
+	| trns | Esc  |QK_BOOT |capslk| trns |------'`------| trns |   0  |   -  |  +=  | trns |
 	`----------------------------------'              `----------------------------------'
 */
 
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_PSLS, KC_7, KC_8,    KC_9,   KC_PDOT,
     _______, KC_CIRC, KC_AMPR, KC_ASTR, PWD3,                      KC_PAST, KC_4, KC_5,    KC_6,   _______,
     _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,                   KC_PPLS, KC_1, KC_2,    KC_3,   _______,
-    _______, KC_ESC , RESET,   KC_CAPS, _______, _______, _______, _______, KC_0, KC_PMNS, KC_EQL, _______
+    _______, KC_ESC , QK_BOOT, KC_CAPS, _______, _______, _______, _______, KC_0, KC_PMNS, KC_EQL, _______
     )
 };
 
diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 32cc95d2fd..fbefb52df6 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [L_FN] = LAYOUT(
-    RESET,  _______,_______,_______,_______,                KC_VOLU,KC_F9,  KC_F10, KC_F11, KC_F12,
+    QK_BOOT,  _______,_______,_______,_______,                KC_VOLU,KC_F9,  KC_F10, KC_F11, KC_F12,
     MS_JIGL,_______,_______,_______,_______,                KC_MUTE,KC_F5,  KC_F6,  KC_F7,  KC_F8,
     _______,K_SECR1,K_SECR2,K_SECR3,K_SECR4,                KC_VOLD,KC_F1,  KC_F2,  KC_F3,  KC_F4,
     DF_TYPE,DF_GAME,_______,_______,_______,KC_LCTL,KC_LALT,_______,_______,_______,_______,ooooooo
diff --git a/keyboards/atreus/keymaps/talljoe/config.h b/keyboards/atreus/keymaps/talljoe/config.h
index 64d5b58943..71c7864b7c 100644
--- a/keyboards/atreus/keymaps/talljoe/config.h
+++ b/keyboards/atreus/keymaps/talljoe/config.h
@@ -46,8 +46,8 @@
 )
 
 #define TEMPLATE_RESET LAYOUT( \
-  RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
 )
diff --git a/keyboards/atreus/keymaps/workman/keymap.c b/keyboards/atreus/keymaps/workman/keymap.c
index aef2c59590..3ca07c325a 100644
--- a/keyboards/atreus/keymaps/workman/keymap.c
+++ b/keyboards/atreus/keymaps/workman/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_VOLU, KC_F7,   KC_F8,   KC_F9,   KC_F10,
     KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EN_DASH, KC_TRNS, KC_TRNS, DIAERESIS, RESET  )
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EN_DASH, KC_TRNS, KC_TRNS, DIAERESIS, QK_BOOT  )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/atreus/keymaps/xk/keymap.c b/keyboards/atreus/keymaps/xk/keymap.c
index a03dee9ca9..8264618004 100644
--- a/keyboards/atreus/keymaps/xk/keymap.c
+++ b/keyboards/atreus/keymaps/xk/keymap.c
@@ -240,7 +240,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   //one_ring=2__rule__them-all
   [_GRVTABL] = LAYOUT( \
-    LALT(KC_PSCR), M(4),            KC_PWR,      KC_POWER,     RESET,                          RESET,        KC_R,         KC_E,        KC_I,            LALT(KC_PSCR), \
+    LALT(KC_PSCR), M(4),            KC_PWR,      KC_POWER,     QK_BOOT,                        QK_BOOT,      KC_R,         KC_E,        KC_I,            LALT(KC_PSCR), \
     TG(_NINEKEY),  TG(_FNCTION),    TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA),                   TG(_IKAPILA), KC_S,         KC_U,        KC_B,            TG(_NINEKEY),  \
     M(3),          TG(_GAMEQWERTY), XXXXXXX,     XXXXXXX,      XXXXXXX,                        KC_MYCM,      KC_CALC,      XXXXXXX,     TG(_GAMEQWERTY), M(3),          \
     TT(_GRVTABL),  TG(_FNCTION),    TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), _______, _______, TG(_IKAPILA), TG(_IKASHFT), TG(_MLAYER), TG(_MLAYER),     TG(_NINEKEY)   \
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
index 3f428058eb..98dface93c 100644
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -152,13 +152,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	|------+------+------+------+------|------.,------|------+------+------+------+------|
 	|      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
 	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	|      |      |      |      |      |------'`------|      |      |      |      | RESET|
+	|      |      |      |      |      |------'`------|      |      |      |      | QK_BOOT|
 	`----------------------------------'              `----------------------------------'*/
   [_ADJUST] = LAYOUT(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
     KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
     _______, QWERTY,  COLEMAK, DVORAK,  DVORMAC,                   _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
   ),
 };
 
diff --git a/keyboards/atreus/keymaps/yttyx/keymap.c b/keyboards/atreus/keymaps/yttyx/keymap.c
index dad36cad92..ad34182212 100644
--- a/keyboards/atreus/keymaps/yttyx/keymap.c
+++ b/keyboards/atreus/keymaps/yttyx/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
 
  /* RS: Reset
     .-------.------.-------.-----.-------.                                .------.-------.-----.-------.------.
-    | RESET |      |       |     |       |                                |      |       |     |       |      |
+    | QK_BOOT |      |       |     |       |                                |      |       |     |       |      |
     |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
     |       |      |       |     |       |                                |      |       |     |       |      |
     |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
                            '-----'-------'-----'                    '-----'------'-------'
   */
   [RS] = LAYOUT(
-    RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(BA),  XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/atreus62/keymaps/194h/keymap.c b/keyboards/atreus62/keymaps/194h/keymap.c
index b9587b03e8..31d286bfff 100644
--- a/keyboards/atreus62/keymaps/194h/keymap.c
+++ b/keyboards/atreus62/keymaps/194h/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [L5] = LAYOUT(
 	XXXXXXX,       TO(L1),       TO(L2),       TO(L3),       TO(L4),       XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      RESET,        XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
+	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      QK_BOOT,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
 	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
 	XXXXXXX,       XXXXXXX,      XXXXXXX,      KC_CAPS,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
 	XXXXXXX,       _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX
diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c
index 63b9d6142d..1f0cae666d 100644
--- a/keyboards/atreus62/keymaps/d4mation/keymap.c
+++ b/keyboards/atreus62/keymaps/d4mation/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,-----------------------------------------.                ,-----------------------------------------.
    * |  NO  |  NO  |  NO  |  NO  |  NO  |  NO  |                |  NO  |  NO  |  NO  |  NO  |  NO  |  NO  |
    * |------+------+------+------+------+------|                |------+------+------+------+------+------|
-   * |  NO  |RESET |  NO  |  NO  |  NO  |  NO  |                |  NO  |  NO  |  NO  |  NO  |  NO  |  NO  |
+   * |  NO  |QK_BOOT |  NO  |  NO  |  NO  |  NO  |                |  NO  |  NO  |  NO  |  NO  |  NO  |  NO  |
    * |------+------+------+------+------+------|                |------+------+------+------+------+------|
    * |  NO  |  NO  |  NO  |UC WIN|UC OSX|  NO  |,------.,------.|  NO  |Dvorak|Qwerty|  NO  |  NO  |  NO  |
    * |------+------+------+------+------+------|| Swap ||      ||------+------+------+------+------+------|
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, RESET,   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, UC_M_WI, UC_M_OS, XXXXXXX,                   XXXXXXX, DF(_DVR),DF(_QWR),XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, CG_SWAP, CG_NORM, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/atreus62/keymaps/hvp/keymap.c b/keyboards/atreus62/keymaps/hvp/keymap.c
index 9873897a5a..4b5615c809 100644
--- a/keyboards/atreus62/keymaps/hvp/keymap.c
+++ b/keyboards/atreus62/keymaps/hvp/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______, _______, _______, _______, _______,                     _______, KC_4, KC_5, KC_6, _______, _______ ,
     _______,  _______, _______, _______, _______, _______,                     KC_0, KC_1, KC_2, KC_3, _______, _______ ,
     KC_PSCR,  _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______ ,
-    RESET,  _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______
+    QK_BOOT,  _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______
   ),
   /*
   [_TRNS] = LAYOUT(
diff --git a/keyboards/atreus62/keymaps/pcewing/keymap.c b/keyboards/atreus62/keymaps/pcewing/keymap.c
index 709903c6cf..c8dfd5734b 100644
--- a/keyboards/atreus62/keymaps/pcewing/keymap.c
+++ b/keyboards/atreus62/keymaps/pcewing/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,               KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,               KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,               KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET
+    KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT
   )
 
   /*
diff --git a/keyboards/atreus62/keymaps/scheiklp/keymap.c b/keyboards/atreus62/keymaps/scheiklp/keymap.c
index 58bacaab91..13ad3e4f51 100644
--- a/keyboards/atreus62/keymaps/scheiklp/keymap.c
+++ b/keyboards/atreus62/keymaps/scheiklp/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_7] = LAYOUT(
-    KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+    KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
     KC_TAB,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/atreus62/keymaps/xyverz/keymap.c b/keyboards/atreus62/keymaps/xyverz/keymap.c
index 17a1ec01a3..2bab2c2efc 100644
--- a/keyboards/atreus62/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus62/keymaps/xyverz/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_ADJUST] = LAYOUT (
     _______, _______, _______, KC_F13,  KC_F14,  KC_F15,                    _______, _______, _______, _______, _______, _______,
-    _______, RESET,   _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+    _______, QK_BOOT, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  DESTINY, _______,
     _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c b/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
index 6db1e47a2f..fd87a98d19 100644
--- a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
+++ b/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_rev41lp(
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  BL_DEC, BL_TOGG,          BL_BRTG,  BL_INC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                         _______, _______, _______, _______, _______
   )
 };
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
index 408c911250..968f96f3b2 100644
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
+++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_rev41lp(
     XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,    BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   BL_STEP,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    XXXXXXX,   UC_M_WC, UC_M_MA,  UC_M_LN,  XXXXXXX,   XXXXXXX,            RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   UC_M_WC, UC_M_MA,  UC_M_LN,  XXXXXXX,   XXXXXXX,            QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
                                                _______, _______, _______,  _______,  _______
   )
 };
diff --git a/keyboards/bacca70/keymaps/debaccabean/keymap.c b/keyboards/bacca70/keymaps/debaccabean/keymap.c
index 66e3ec0b5f..da2ef7715b 100644
--- a/keyboards/bacca70/keymaps/debaccabean/keymap.c
+++ b/keyboards/bacca70/keymaps/debaccabean/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT_debaccabean(
-        RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,
diff --git a/keyboards/bacca70/keymaps/dede-special/keymap.c b/keyboards/bacca70/keymaps/dede-special/keymap.c
index 1c7514e81b..fc71850b6f 100644
--- a/keyboards/bacca70/keymaps/dede-special/keymap.c
+++ b/keyboards/bacca70/keymaps/dede-special/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [3] = LAYOUT_debaccabean(
-        RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,TG(1),
+        QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,TG(1),
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
         KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
         KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c
index e97d0360b7..01b3383780 100644
--- a/keyboards/bajjak/keymaps/5x6/keymap.c
+++ b/keyboards/bajjak/keymaps/5x6/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
  * |        |      | Lclk | MsUp | Rclk |MsWhUp|           |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
- * | RESET  |      |MsLeft|MsDown|MsRght|MsWhDw|           |      |      |      |      |      |        |
+ * | QK_BOOT  |      |MsLeft|MsDown|MsRght|MsWhDw|           |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|           |------|------+------+------+------+--------|
  * | LShift |      |MsWhL |      |MsWhR |      |           |      |      |      |      |      | RShift |
  *  -------------------------------------------             -------------------------------------------
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,     XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
     KC_SLEP,    KC_BRID,    KC_BRIU,    XXXXXXX,    XXXXXXX,      XXXXXXX,      KC_EJCT,       XXXXXXX,     KC_MPRV,    KC_MPLY,    KC_MNXT,  KC_MUTE,    KC_VOLD,    KC_VOLU,
     XXXXXXX,    XXXXXXX,    KC_BTN1,    KC_MS_U,    KC_BTN2,      KC_WH_U,      XXXXXXX,       XXXXXXX,     XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
-    RESET,      XXXXXXX,    KC_MS_L,    KC_MS_D,    KC_MS_R,      KC_WH_D,      XXXXXXX,       XXXXXXX,     XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
+    QK_BOOT,    XXXXXXX,    KC_MS_L,    KC_MS_D,    KC_MS_R,      KC_WH_D,      XXXXXXX,       XXXXXXX,     XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
     _______,    XXXXXXX,    KC_WH_L,    XXXXXXX,    KC_WH_R,      XXXXXXX,                                  DF(SYMB),   XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
     _______,    _______,    _______,    _______,    _______,                                                            _______,    _______,  XXXXXXX,    XXXXXXX,    DF(BASE),
                                                                        _______, _______,        _______, _______,
diff --git a/keyboards/bajjak/keymaps/default/keymap.c b/keyboards/bajjak/keymaps/default/keymap.c
index 4c79261307..3bed2c52e7 100644
--- a/keyboards/bajjak/keymaps/default/keymap.c
+++ b/keyboards/bajjak/keymaps/default/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------+------'           `------+------+------+------+------+------+--------|
  * | LShift |      |MsWhL |      |MsWhR |      |                         |      |      |      |      |      |        |
  * `--------+------+------+------+------+------'                          `-----+------+------+------+------+-------'
- *   | CTRL |GUI\'"|ALT \ | Left | Right|                                       |  Up  | Down |      |      | RESET |
+ *   | CTRL |GUI\'"|ALT \ | Left | Right|                                       |  Up  | Down |      |      | QK_BOOT |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |Ctrl/ESC|LALT|       | RGUI |Ctrl/Alt|
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,     _______,    KC_BTN1,            KC_MS_U,    KC_BTN2,      KC_WH_U,      _______,       _______,     _______,      _______,      _______,    _______,    _______,    _______,
     KC_CAPS,    _______,    KC_MS_L,            KC_MS_D,    KC_MS_R,      KC_WH_D,      _______,       _______,     _______,      _______,      _______,    _______,    _______,    _______,
     KC_LSFT,    _______,    KC_WH_L,            _______,    KC_WH_R,      _______,                                  _______,      _______,      _______,    _______,    _______,    _______,
-    KC_LCTRL,   KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                              KC_UP,        KC_DOWN,    _______,    _______,    RESET,
+    KC_LCTRL,   KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                              KC_UP,        KC_DOWN,    _______,    _______,    QK_BOOT,
                                                                  CTL_T(KC_ESC), KC_LALT,       KC_RGUI, CTL_T(KC_RALT),
                                                                                 KC_HOME,       KC_PGUP,
                                                                 KC_BSPC, KC_DEL, KC_END,       KC_PGDN, KC_ENT, KC_SPC
diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
index 1292f2d2ed..e0f73fab2f 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_all( /* Base */
   //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-   XXXXXXX, TG(_ADJUST), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,    RESET, XXXXXXX,
+   XXXXXXX, TG(_ADJUST), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,    QK_BOOT, XXXXXXX,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
      XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,  XXXXXXX,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
index 7e82c7b7d2..4b2de19761 100644
--- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
+++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT( /* Base */
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-      XXXXXXX,TG(_ADJUST),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,        RESET,
+      XXXXXXX,TG(_ADJUST),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,        QK_BOOT,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,  XXXXXXX,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
index 94dd182c69..f4f8cfd1da 100644
--- a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL,
 
                                   _______, KC_RGHT, _______,    _______, _______, _______,
-                                           KC_LEFT, _______,    RESET  , _______
+                                           KC_LEFT, _______,    QK_BOOT, _______
   ),
 
   [_RAISE] = LAYOUT_split_4x6_5(
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_split_4x6_5(
     _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, RESET  , _______,           _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, QK_BOOT, _______,           _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______,
 
diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c b/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
index b8f70bdc9b..b1f45951b7 100644
--- a/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  RESET,   _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, RESET,
+  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, QK_BOOT,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_split_4x6_5(
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, RESET,   _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
+  _______, QK_BOOT, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,     _______, WINDOWS, MAC,     _______, _______, _______,
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
                              _______, _______, _______,     _______, _______, _______,
diff --git a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
index 94dd182c69..f4f8cfd1da 100644
--- a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
+++ b/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL,
 
                                   _______, KC_RGHT, _______,    _______, _______, _______,
-                                           KC_LEFT, _______,    RESET  , _______
+                                           KC_LEFT, _______,    QK_BOOT, _______
   ),
 
   [_RAISE] = LAYOUT_split_4x6_5(
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_split_4x6_5(
     _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, RESET  , _______,           _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, QK_BOOT, _______,           _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______,
 
diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c b/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
index b8f70bdc9b..b1f45951b7 100644
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
+++ b/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  RESET,   _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, RESET,
+  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, QK_BOOT,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_split_4x6_5(
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, RESET,   _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
+  _______, QK_BOOT, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,     _______, WINDOWS, MAC,     _______, _______, _______,
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
                              _______, _______, _______,     _______, _______, _______,
diff --git a/keyboards/bfake/keymaps/mechmerlin/keymap.c b/keyboards/bfake/keymaps/mechmerlin/keymap.c
index 35b59e6a42..ecd3350876 100644
--- a/keyboards/bfake/keymaps/mechmerlin/keymap.c
+++ b/keyboards/bfake/keymaps/mechmerlin/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [3] = LAYOUT_all(
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
index 7cf40fa9a0..6a58e24bd4 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
   _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
   _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
 ),
 
 /* SYMB
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  KC_F12, \
   _______, KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
   _______, KC_1,    XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, SFT_T(KC_RO), \
-  _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+  _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
 ),
 
 /* SYMB
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
index bc6a8557e8..d0c7acc672 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
     _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
     _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
   /* SYMB
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
index 5b7fb7e66c..a2b276a847 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
     _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
     _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
   /* SYMB
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |   |      | TOG  | HUI  | SAI  | VAI  |HUANIM|      |
    * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      | MOD  | HUD  | SAD  | VAD  |RESET |      |
+   * |      |      |      |      |      |      |      |   |      | MOD  | HUD  | SAD  | VAD  |QK_BOOT |      |
    * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |   |      |      |      |      |      |=>RGB |      |
    * `------------------------------------------------'   `------------------------------------------------'
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
index 8db73ab8bd..8a91b625eb 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
     _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
     _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
   /* SYMB
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
index 12e55b75f1..5672ddd864 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
     _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
     _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
   /* SYMB
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
index 58f01bb322..22f28fa25d 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,-------------------------------------------------------.   ,-------------------------------------------------------.
    * |RGB_TOG| MCR1  | MCR2  | MCR3  |XXXXXXX|XXXXXXX|XXXXXXX|   |XXXXXXX|PLAY_M1|PLAY_M2|REC_M1 |REC_M2 |STP_REC| BSPC  |
    * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | RESET |       |       |       |       |       |       |   |XXXXXXX|XXXXXXX|QWERTY | GAME  |XXXXXXX|XXXXXXX|XXXXXXX|
+   * | QK_BOOT |       |       |       |       |       |       |   |XXXXXXX|XXXXXXX|QWERTY | GAME  |XXXXXXX|XXXXXXX|XXXXXXX|
    * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
    * | Shift |       |       |       |       |       |       |   |XXXXXXX| M-PLAY|M-MUTE |VOL_DWN|VOL_UP |PREV_TR|NEXT_TR|
    * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] = LAYOUT( \
     RGB_TOG,  MCR1,    MCR2,    MCR3,    XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, DYN_REC_START1, DYN_REC_START2, DYN_REC_STOP, KC_BSPC, \
-    RESET,    RGB_MOD, RGB_M_P, RGB_M_B, RGB_HUI, RGB_SAI, RGB_VAI,   XXXXXXX, XXXXXXX, QWERTY,  GAME,   XXXXXXX, XXXXXXX, XXXXXXX, \
+    QK_BOOT,  RGB_MOD, RGB_M_P, RGB_M_B, RGB_HUI, RGB_SAI, RGB_VAI,   XXXXXXX, XXXXXXX, QWERTY,  GAME,   XXXXXXX, XXXXXXX, XXXXXXX, \
     KC_LSFT,  RGB_M_R, RGB_M_SN,RGB_M_G, RGB_HUD, RGB_SAD, RGB_VAD,   XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, \
     DEBUG,    XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
   ),
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
index 5d7f337452..fcc00c411d 100644
--- a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------'   `------------------------------------------------'
    */
   [_FUNC] = LAYOUT( \
-    RESET,   KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, _______, \
+    QK_BOOT, KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, _______, \
     _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, WIN,      JP_ASTR, KC_SLSH, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, _______, \
     KC_CAPS, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACOS,    JP_PLUS, KC_MINS, KC_END,  KC_PGDN, XXXXXXX, KC_VOLU, _______, \
     _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY  \
diff --git a/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c b/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
index f5cc3c520e..4e3a24a39b 100644
--- a/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [SHORT] = LAYOUT( \
-    _______, _______, _______, _______,  _______, _______, _______,    _______, _______, _______, _______, _______, _______, RESET,   \
+    _______, _______, _______, _______,  _______, _______, _______,    _______, _______, _______, _______, _______, _______, QK_BOOT, \
     _______, _______, KC_UP,   _______,  _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, \
     _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, COPY,    PASTE,    _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
index 6239876bb1..84fa64c7b1 100644
--- a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, \
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGUP, _______, \
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME, KC_END,  LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______ \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
 ),
 
 /* SYMB
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILD, S(KC_1),  S(KC_2), S(KC_3), S(KC_4), S(KC_5), _______, _______, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), _______, \
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGUP, _______, \
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME, KC_END,  LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______ \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
 ),
 
 /* GAME
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c b/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
index 3d59cb307a..3e970b134e 100644
--- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
+++ b/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_UPPER] = LAYOUT(
 //   ┌────────┬────────┬────────┬────────┬────────┬────────┐                       ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+      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_NLCK, KC_P7,   KC_P8,   KC_P9,   _______, KC_F12,
 //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c b/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
index c0653be0c8..4b28cab796 100644
--- a/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
+++ b/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     [_FN] = LAYOUT_ansi(
        _MINMIZ,   _______,_______,   KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,                    KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10, KC_F11, KC_F12, _______,
-       KC_CALC,      _______,    _______,    _______,_______,RESET,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
+       KC_CALC,      _______,    _______,    _______,_______,QK_BOOT,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
                  KC_CAPS,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,
            _LSNUBS,          _______,        _______,_______,_______,KC_PAUS,_______,    KC_RGUI,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
                  _______,                                _CTLALT,    KC_DEL,             _______,                                          _______,    _______,KC_PGDN,_______
diff --git a/keyboards/boardsource/4x12/keymaps/codecoffeecode/keymap.c b/keyboards/boardsource/4x12/keymaps/codecoffeecode/keymap.c
index 0ea2b4cef4..102c3b2b42 100644
--- a/keyboards/boardsource/4x12/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/boardsource/4x12/keymaps/codecoffeecode/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
   _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, KC_F11,  KC_F12,  _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
 
   /* Layer _RAISE
diff --git a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
index eab59eb7ef..0d958b883a 100644
--- a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [_FN2_60] = LAYOUT_all(
   RGB_TOG,   RGB_MOD,     RGB_VAD,    RGB_VAI,    RGB_SAI,    RGB_HUD,    RGB_HUI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    RESET,      _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    QK_BOOT,    _______,
   _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                KC_MAKE,    _______,
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
   _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    TG(_DEFAULT)
diff --git a/keyboards/boardwalk/keymaps/mcallaster/keymap.c b/keyboards/boardwalk/keymaps/mcallaster/keymap.c
index ac1df1b033..efddd8aa0a 100644
--- a/keyboards/boardwalk/keymaps/mcallaster/keymap.c
+++ b/keyboards/boardwalk/keymaps/mcallaster/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_ortho_hhkb(
   __SLEEP, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, \
-  _______, RESET,   _______, KC_MPRV, KC_MNXT, _______, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______, \
+  _______, QK_BOOT, _______, KC_MPRV, KC_MNXT, _______, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______, \
   _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, RGB_SAD, RGB_HUD, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, \
   _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, \
            _______, _______, _______, _______,       _______,       _______,       _______, _______, _______, _______
diff --git a/keyboards/boardwalk/keymaps/nchristus/keymap.c b/keyboards/boardwalk/keymaps/nchristus/keymap.c
index 57b6736cbb..3f05e2bb1d 100644
--- a/keyboards/boardwalk/keymaps/nchristus/keymap.c
+++ b/keyboards/boardwalk/keymaps/nchristus/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL: Function Layer */
   [3] = LAYOUT_ortho_hhkb(
-  RESET,   _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, \
+  QK_BOOT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/boardwalk/keymaps/niclake/keymap.c b/keyboards/boardwalk/keymaps/niclake/keymap.c
index b6a986c0d0..986da6dd27 100644
--- a/keyboards/boardwalk/keymaps/niclake/keymap.c
+++ b/keyboards/boardwalk/keymaps/niclake/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * .-----------------------------------------------------------------------------------------------------------------------------.
      * |        | Static | Breath | Rainbw | Swirl  | Gradnt | Twnkle | Test   |        |        |        |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * |        | On/Off | ModeUp | Hue Up | Sat Up | Val Up |        |        |        |        |        |        | RESET  |        |
+     * |        | On/Off | ModeUp | Hue Up | Sat Up | Val Up |        |        |        |        |        |        | QK_BOOT  |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
      * | XXXXXX | MACWIN |        | Hue Dn | Sat Dn | Val Dn |        |        |        |        |        |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJ] = LAYOUT_ortho_hhkb(
         XXXXXXX, RGB_ON,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, RGB_M_TW, RGB_M_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI,  RGB_VAI, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX,
+        XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI,  RGB_VAI, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,
         XXXXXXX, MACWIN,  XXXXXXX, RGB_HUD, RGB_SAD,  RGB_VAD, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, COLEMAK, QWERTY,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,  XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
index 20ce6bd15f..9bb38d8b88 100644
--- a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        ),
 
 [_LOWER] = LAYOUT_tkl(\
-      RESET,    _______,    _______,   _______, _______,  KC_MPLY,   KC_MSTP,   KC_MPRV,   KC_MNXT,  _______, KC_MUTE, KC_VOLD, KC_VOLU,           QWERTY, COLEMAK,DVORAK, \
+      QK_BOOT,  _______,    _______,   _______, _______,  KC_MPLY,   KC_MSTP,   KC_MPRV,   KC_MNXT,  _______, KC_MUTE, KC_VOLD, KC_VOLU,           QWERTY, COLEMAK,DVORAK, \
       KC_TILD,  KC_EXLM,    KC_AT,     KC_HASH,  KC_DLR,  KC_PERC,   KC_CIRC,   KC_AMPR,   KC_ASTR,  KC_LBRC, KC_RBRC, KC_UNDS, KC_PLUS, KC_BSPC,  _______,_______,_______, \
       KC_TAB,   KC_PGUP,    KC_HOME,   KC_UP,    KC_END,  XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_PIPE,  _______,_______,_______, \
       KC_CAPS,  KC_PGDN,    KC_LEFT,   KC_DOWN,  KC_RGHT, XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, _______,          _______,                           \
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
index dc55cdf9fd..68e412ceb9 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   KC_MUTE,_______,KC_VOLD, \
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,                            \
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           KC_MPLY,         \
-		_______,_______,_______,                        _______,                        _______,_______,RESET  ,_______,   KC_MPRV,KC_MSTP,KC_MNXT),
+		_______,_______,_______,                        _______,                        _______,_______,QK_BOOT,_______,   KC_MPRV,KC_MSTP,KC_MNXT),
 	/* Layer 3: Programming layer */
 	[KM_HAXHAX] = LAYOUT( \
 		_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______, \
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
index 5036bcb3f5..a9b9b6e8b9 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [RES] = LAYOUT( \
   _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______, \
-  _______,_______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______, \
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,/*NUHS*/_______,                           \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,          _______,         \
   _______,_______,_______,                        _______,                        _______,_______,_______,_______,  _______,_______,_______),
diff --git a/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c b/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
index b182ac5f4f..52d3478ecb 100644
--- a/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
@@ -38,6 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-    _______,  _______, _______,                            _______,                            _______, _______, _______, RESET
+    _______,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
index 1680f90dc9..38fdb8880e 100644
--- a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
+++ b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
@@ -29,7 +29,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_2x2(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, OLED_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, RESET,   CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, QK_BOOT, CLOCK_SET,
     KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, _______,
     _______, _______,                            _______,                            _______,          _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
index 1d0cdf4f09..ff635b2d80 100644
--- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
      */
     [_ADJUST] = LAYOUT_default( \
-        TG_BASE,   QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        TG_BASE,   QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
         TG_REDR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
         TG_NAV,    _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
         TG_MOUS,                     _______, _______,                   _______, _______,                            _______, _______  \
diff --git a/keyboards/centromere/keymaps/mattly/keymap.c b/keyboards/centromere/keymaps/mattly/keymap.c
index 9ec77a7cf9..bee7e98e12 100644
--- a/keyboards/centromere/keymaps/mattly/keymap.c
+++ b/keyboards/centromere/keymaps/mattly/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FUNCT] = LAYOUT_split_3x6_3(
-    KC_F15,  KC_F12,  KC_F9,   KC_F8,   KC_F7,   KC_VOLU,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+    KC_F15,  KC_F12,  KC_F9,   KC_F8,   KC_F7,   KC_VOLU,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
     KC_F14,  KC_F11,  KC_F6,   KC_F5,   KC_F4,   KC_MUTE,            XXXXXXX, TOG_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_F13,  KC_F10,  KC_F3,   KC_F2,   KC_F1,   KC_VOLD,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                    _______, _______, _______,   _______, _______, _______
diff --git a/keyboards/centromere/keymaps/mini/keymap.c b/keyboards/centromere/keymaps/mini/keymap.c
index 4241e28a3d..4986dacc74 100644
--- a/keyboards/centromere/keymaps/mini/keymap.c
+++ b/keyboards/centromere/keymaps/mini/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT_split_3x5_3(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
   KC_F11,  KC_F12,  _______, _______, _______,      _______, _______, _______, TSKMGR, CALTDEL,
-  RESET,   _______, _______, _______, _______,      _______, _______, _______, _______,  _______,
+  QK_BOOT, _______, _______, _______, _______,      _______, _______, _______, _______,  _______,
                     _______, _______, _______,      _______,  _______, _______
 )
 };
diff --git a/keyboards/charue/charon/keymaps/debug/keymap.c b/keyboards/charue/charon/keymaps/debug/keymap.c
index 8e8c045b8b..51c19ee6f2 100644
--- a/keyboards/charue/charon/keymaps/debug/keymap.c
+++ b/keyboards/charue/charon/keymaps/debug/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTRL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT_all(
-      RESET,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
+      QK_BOOT,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
diff --git a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
index 4e0ca86c60..02b56ac4b0 100644
--- a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
+++ b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS
         ),
         [2] = LAYOUT_all(
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, 
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, 
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
         KC_NO, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, 
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
index bee4854f46..61dbc54e95 100644
--- a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
+++ b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_F9, KC_F10,  KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT_all(
-      KC_F11, KC_F12,  RESET,   KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
+      KC_F11, KC_F12,  QK_BOOT, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
       KC_F13, KC_F14,   KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F15, KC_F16,    KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F17, KC_F18, KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
diff --git a/keyboards/checkerboards/axon40/keymaps/npspears/keymap.c b/keyboards/checkerboards/axon40/keymaps/npspears/keymap.c
index f8fed200e8..b63e63595c 100644
--- a/keyboards/checkerboards/axon40/keymaps/npspears/keymap.c
+++ b/keyboards/checkerboards/axon40/keymaps/npspears/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   RGB_HUI,  RGB_SAI,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,  \
   RGB_HUD,  RGB_SAD,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,  \
   KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  \
-  RESET,    RGB_TOG,  _______,  _______,  RGB_MOD,  RGB_RMOD  \
+  QK_BOOT,  RGB_TOG,  _______,  _______,  RGB_MOD,  RGB_RMOD  \
 ),
 
 };
diff --git a/keyboards/checkerboards/phoenix45_ortho/keymaps/6u/keymap.c b/keyboards/checkerboards/phoenix45_ortho/keymaps/6u/keymap.c
index 53bc6a3286..d431b363e9 100644
--- a/keyboards/checkerboards/phoenix45_ortho/keymaps/6u/keymap.c
+++ b/keyboards/checkerboards/phoenix45_ortho/keymaps/6u/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, KC_UP,   _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
       _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-      RESET,   _______, _______,                            _______,                             _______, _______, _______
+      QK_BOOT, _______, _______,                            _______,                             _______, _______, _______
   )
 };
 
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c
index eb205a3787..5cb662d38b 100644
--- a/keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_2x3u(
         KC_GRV,    KC_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_DEL,
         _______, _______,  KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   QK_BOOT, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
         QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
index 273fbc536f..2e3d9742b1 100644
--- a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  M_CUSTOM, RESET,   QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
+  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
   KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
   TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______
diff --git a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
index 194fb7cfc4..528bc2cc00 100644
--- a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  _______,  RESET,    DEBUG,    _______,  _______,  _______,  _______,  TERM_ON,  TERM_OFF, _______,  _______,  KC_DEL,
+  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  TERM_ON,  TERM_OFF, _______,  _______,  KC_DEL,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/checkerboards/quark_lp/keymaps/mit/keymap.c b/keyboards/checkerboards/quark_lp/keymaps/mit/keymap.c
index f747f4f26b..338af5ea9e 100644
--- a/keyboards/checkerboards/quark_lp/keymaps/mit/keymap.c
+++ b/keyboards/checkerboards/quark_lp/keymaps/mit/keymap.c
@@ -68,13 +68,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
     * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-    * |     RESET    |           |          |         |         |         |        |         |
+    * |     QK_BOOT    |           |          |         |         |         |        |         |
     * `---------------------------------------------------------------------------------------'
        */
     [2] = LAYOUT_ortho_4x12_1x2uC(
         _______, _______, _______,   KC_UP,  _______, _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN,  KC_RGHT, _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,     KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-        RESET,   _______, _______, _______,  _______, _______,  _______, _______,  _______,  _______, _______
+        QK_BOOT, _______, _______, _______,  _______, _______,  _______, _______,  _______,  _______, _______
     )
 };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
index b62e60370e..dbd99bf3ee 100644
--- a/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
+++ b/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
@@ -70,13 +70,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
   * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
   * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-  * |RESET |    |      |       |       |            |      |       |      |       |        |
+  * |QK_BOOT |    |      |       |       |            |      |       |      |       |        |
   * `---------------------------------------------------------------------------------------'
      */
   [2] = LAYOUT_2u(
       _______,  _______,  _______,   KC_UP,   _______,   _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
       _______,  _______,   KC_LEFT, KC_DOWN,  KC_RGHT,   _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
       KC_F1,    KC_F2,     KC_F3,   KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,
-      RESET,    _______,   _______, _______,  _______,    _______,  _______, _______,  _______,  _______, _______
+      QK_BOOT,  _______,   _______, _______,  _______,    _______,  _______, _______,  _______,  _______, _______
     ),
     };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
index f490f76f9f..8ded461d5a 100644
--- a/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
@@ -70,13 +70,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
   * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
   * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-  * |     RESET    |           |          |         |         |         |        |         |
+  * |     QK_BOOT    |           |          |         |         |         |        |         |
   * `---------------------------------------------------------------------------------------'
      */
   [2] = LAYOUT_2x225u(
       _______,  _______,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
       _______,  _______,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
       KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-      RESET,  _______, _______, _______,  _______,  _______,  _______, _______
+      QK_BOOT,  _______, _______, _______,  _______,  _______,  _______, _______
     ),
     };
diff --git a/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c
index 0f37a1d080..8af07a13ef 100644
--- a/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c
+++ b/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c
@@ -68,13 +68,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
     * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-    * |     RESET    |           |          |         |         |         |        |         |
+    * |     QK_BOOT    |           |          |         |         |         |        |         |
     * `---------------------------------------------------------------------------------------'
        */
     [2] = LAYOUT_4_2u(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        RESET,   _______, _______, _______, _______, _______, _______, _______, _______
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c
index d7f7ff378d..e81759c5fe 100644
--- a/keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c
+++ b/keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
      * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-     * |     RESET    |              |             |            |                |            |
+     * |     QK_BOOT    |              |             |            |                |            |
      * `---------------------------------------------------------------------------------------'
      */
     [2] = LAYOUT_5_2u(
@@ -81,6 +81,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        RESET,   _______,    _______,       _______,       _______,     _______,    _______,   _______,    _______
+        QK_BOOT, _______,    _______,       _______,       _______,     _______,    _______,   _______,    _______
     )
 };
diff --git a/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c
index e116732b75..1d39ae9943 100644
--- a/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c
+++ b/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
      * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-     * |     RESET    |              |             |            |                |            |
+     * |     QK_BOOT    |              |             |            |                |            |
      * `---------------------------------------------------------------------------------------'
      */
     [2] = LAYOUT_5_2x225u(
@@ -81,6 +81,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        RESET,    _______,    _______,         _______,          _______,             _______,  _______,   _______
+        QK_BOOT,  _______,    _______,         _______,          _______,             _______,  _______,   _______
     )
 };
diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u/keymap.c
index 74bbd2918f..7ba92f40c2 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u/keymap.c
+++ b/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u/keymap.c
@@ -30,14 +30,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+------|------+------+------+------+------+------|
      * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
-     * | RESET  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+     * | QK_BOOT  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
      * `-----------------------------------------------------------------------------------------'
      */
     [0] = LAYOUT_600u(
        KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-       RESET,     RGB_TOG,         KC_LALT,              LT(2, KC_SPC),             TT(1),       KC_LGUI,       KC_CAPS
+       QK_BOOT,   RGB_TOG,         KC_LALT,              LT(2, KC_SPC),             TT(1),       KC_LGUI,       KC_CAPS
     ),
 
     /* [1]
@@ -68,13 +68,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
      * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-     * |     RESET    |           |          |         |         |         |        |         |
+     * |     QK_BOOT    |           |          |         |         |         |        |         |
      * `---------------------------------------------------------------------------------------'
      */
     [2] = LAYOUT_600u(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        RESET,        RESET,            _______,                  _______,         _______,   _______,     _______
+        QK_BOOT,      QK_BOOT,          _______,                  _______,         _______,   _______,     _______
     )
 };
diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u_alt/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u_alt/keymap.c
index 76c8b06cc4..91b7c59a07 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u_alt/keymap.c
+++ b/keyboards/checkerboards/ud40_ortho_alt/keymaps/600u_alt/keymap.c
@@ -30,14 +30,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+------|------+------+------+------+------+------|
      * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
-     * | RESET  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+     * | QK_BOOT  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
      * `-----------------------------------------------------------------------------------------'
      */
     [0] = LAYOUT_600u_alt(
        KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-       RESET,                   KC_LALT,                  LT(2, KC_SPC),                  TT(1),                KC_RGUI
+       QK_BOOT,                 KC_LALT,                  LT(2, KC_SPC),                  TT(1),                KC_RGUI
     ),
 
     /* [1]
@@ -68,13 +68,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
      * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-     * |     RESET    |           |          |         |         |         |        |         |
+     * |     QK_BOOT    |           |          |         |         |         |        |         |
      * `---------------------------------------------------------------------------------------'
      */
     [2] = LAYOUT_600u_alt(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        RESET,         RESET,                             _______,                             _______,    _______
+        QK_BOOT,       QK_BOOT,                           _______,                             _______,    _______
     )
 };
diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/700u/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/700u/keymap.c
index 37f46f72e3..786c700adb 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/700u/keymap.c
+++ b/keyboards/checkerboards/ud40_ortho_alt/keymaps/700u/keymap.c
@@ -30,14 +30,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+------|------+------+------+------+------+------|
      * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
-     * | RESET  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+     * | QK_BOOT  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
      * `-----------------------------------------------------------------------------------------'
      */
     [0] = LAYOUT_700u(
        KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-       RESET,                   KC_LALT,                  LT(2, KC_SPC),                  TT(1),                KC_RGUI
+       QK_BOOT,                 KC_LALT,                  LT(2, KC_SPC),                  TT(1),                KC_RGUI
     ),
 
     /* [1]
@@ -68,13 +68,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
      * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-     * |     RESET    |           |          |         |         |         |        |         |
+     * |     QK_BOOT    |           |          |         |         |         |        |         |
      * `---------------------------------------------------------------------------------------'
      */
     [2] = LAYOUT_700u(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        RESET,         RESET,                             _______,                             _______,     _______
+        QK_BOOT,       QK_BOOT,                           _______,                             _______,     _______
     )
 };
diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/keymap.c
index 59579383a5..c21cdc7661 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/keymap.c
+++ b/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/keymap.c
@@ -30,14 +30,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+------|------+------+------+------+------+------|
      * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
-     * | RESET  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+     * | QK_BOOT  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
      * `-----------------------------------------------------------------------------------------'
      */
     [0] = LAYOUT_default(
         KC_TAB,        KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,          KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
         CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,          KC_E,    KC_I,    KC_O,    KC_QUOT,
         KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,          KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-        RESET,         KC_LGUI, KC_LALT,          TT(1),                     LT(2, KC_SPC),          KC_LBRC, KC_RBRC, KC_CAPS
+        QK_BOOT,       KC_LGUI, KC_LALT,          TT(1),                     LT(2, KC_SPC),          KC_LBRC, KC_RBRC, KC_CAPS
     ),
 
     /* [1]
@@ -68,13 +68,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
      * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
      * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-     * |     RESET    |           |          |         |         |         |        |         |
+     * |     QK_BOOT    |           |          |         |         |         |        |         |
      * `---------------------------------------------------------------------------------------'
      */
     [2] = LAYOUT_default(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        RESET,   RESET, _______,          _______,                   _______,          _______, _______, _______
+        QK_BOOT, QK_BOOT, _______,          _______,                   _______,          _______, _______, _______
     )
 };
diff --git a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
index 5ccaafec3c..e21f840265 100644
--- a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_FL] = LAYOUT_default(
     KC_PGUP, KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-    KC_PGDN, KC_CAPS, _______, _______, EEP_RST, RESET,   _______,          _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+    KC_PGDN, KC_CAPS, _______, _______, EEP_RST, QK_BOOT, _______,          _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
     KC_ESC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
              _______, _______, _______, _______, _______, _______,          _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
              _______,          _______, _______, _______,                            _______,          _______,          _______
diff --git a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
index 2273ad938c..efb962f978 100644
--- a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FNMS] = LAYOUT_default(
     RGB_TOG, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-    RGB_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, RESET,
+    RGB_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
     VLK_TOG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
              _______, _______, _______, _______, _______, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
              AG_TOGG,                   _______,  _______, _______,        _______,          _______,                        _______
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NAVMED] = LAYOUT_default(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______,   KC_UP, _______, _______, _______, _______, RESET,
+    KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______,   KC_UP, _______, _______, _______, _______, QK_BOOT,
     KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,         EEP_RST,
              _______, _______, _______, _______, _______, KC_VOLD,        KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
              _______,                   _______,  _______, _______,        _______,          _______,                        _______
diff --git a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
index b7058cfc1b..1dba574063 100644
--- a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, RESET,
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
            _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
            _______, _______,                   _______,                                              _______, _______),
diff --git a/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
index 403a772dfc..7fea015564 100644
--- a/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, RESET,
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
            _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
            _______,                   _______, _______,                                     _______, _______),
diff --git a/keyboards/clueboard/66/keymaps/badger/keymap.c b/keyboards/clueboard/66/keymaps/badger/keymap.c
index 74fec0b58e..f7d35f4a3e 100644
--- a/keyboards/clueboard/66/keymaps/badger/keymap.c
+++ b/keyboards/clueboard/66/keymaps/badger/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST]      = LAYOUT_66_ansi(\
       KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,   KC_VOLU, \
-      _______,   NK_ON,    NK_OFF,   EEP_RST,  RESET,     KC_MSTP, KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  AG_SWAP,   AG_NORM,  KC_INS,   KC_VOLD, \
+      _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   KC_MSTP, KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  AG_SWAP,   AG_NORM,  KC_INS,   KC_VOLD, \
       _______,   GE_SWAP,  GE_NORM,  DEBUG,    AG_SWAP,   AG_NORM, KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,   _______, \
       _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV, KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   KC_BRIU, \
       _______,   _______,  _______,  _______,  _______,   _______, _______,  KC_HOME,  KC_BRID,  KC_END)
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
index 7c7faba9ce..a64c5dec03 100644
--- a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   KC_PWR,  _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,          RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  RGB_MOD,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,RGB_HUD, RGB_HUI,  _______,  _______,  _______,          KC_WAKE,
   _______, _______, MO(_FL), _______,        RGB_SAD,RGB_SAI,                        _______,  _______,  MO(_FL),  _______, _______, KC_SLEP, _______),
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
index fc0c56d9a7..4767f0f7ea 100644
--- a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c
index 4479556b65..daacbe9664 100644
--- a/keyboards/clueboard/66/keymaps/colemak/keymap.c
+++ b/keyboards/clueboard/66/keymaps/colemak/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   BL_STEP, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
index 9c6997c34e..0558dffd28 100644
--- a/keyboards/clueboard/66/keymaps/jokrik/keymap.c
+++ b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                      _______,  _______,  MO(_FL),  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
index 30e772900e..5c184e69e9 100644
--- a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   BL_STEP,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,        RGB_VAI,
-  _______,_______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
   MO(_FL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_SAI,
   _______,_______,_______,_______,        RGB_MOD,   RGB_MOD,                     _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index 7b7d2bdce0..c27b929b95 100644
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _CL: Control layer */
   [_CL] = LAYOUT(
     _______, RGB_RST, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______, RGB_TOG,          RGB_VAI,
-    _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______,  _______, _______,  _______, _______,                   RGB_VAD,
+    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,                   RGB_VAD,
     _______, _______,  MO_CTL, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,          RGB_SAI,
     _______, _______, _______, _______,                   RGB_MOD, RGB_MOD,                    _______, _______,  _______, _______, RGB_HUD, RGB_SAD, RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c b/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
index e71419980d..dbe73e55b9 100644
--- a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
+++ b/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,_______,RGB_TOG,        RGB_VAI,
-  _______,_______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
   MO(_FL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_SAI,
   _______,_______,_______,_______,        RGB_MOD,   RGB_MOD,                     _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
index c2e05a5a27..3a70478a5b 100644
--- a/keyboards/clueboard/66/keymaps/maximised/keymap.c
+++ b/keyboards/clueboard/66/keymaps/maximised/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
index be5634f103..3d64356e7b 100644
--- a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c b/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
index 302649c923..449f2ed1e7 100644
--- a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    
 [_CL] = LAYOUT(
   BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,_______,RGB_TOG,        RGB_VAI,
-  _______,_______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_SAI,
   _______,_______,_______,_______,        RGB_MOD,   RGB_MOD,                     _______,_______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/muzfuz/keymap.c b/keyboards/clueboard/66/keymaps/muzfuz/keymap.c
index d4af354831..bc911f045b 100644
--- a/keyboards/clueboard/66/keymaps/muzfuz/keymap.c
+++ b/keyboards/clueboard/66/keymaps/muzfuz/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [_CL] = LAYOUT(
         BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_VAD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_VAD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,
         _______, _______, _______, _______, RGB_MOD, RGB_MOD, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
index e77417c3c2..56b67763dd 100644
--- a/keyboards/clueboard/66/keymaps/serubin/keymap.c
+++ b/keyboards/clueboard/66/keymaps/serubin/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  MO(_FL),  _______,          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
index 8556f90803..196e6b620a 100644
--- a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,              RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                       RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                       RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),               RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
index 89fc495919..fb696fd75c 100644
--- a/keyboards/clueboard/66/keymaps/smt/keymap.c
+++ b/keyboards/clueboard/66/keymaps/smt/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,          RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,QWERTY, COLEMAK,DVORAK,  _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,QWERTY, COLEMAK,DVORAK,  _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
   _______, _______, _______,_______,         RGB_MOD,RGB_MOD,                        _______,  _______,  _______,  _______, RGB_HUD, RGB_SAD, RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
index 26dd97feec..1d223a6add 100644
--- a/keyboards/clueboard/66/keymaps/tetris/keymap.c
+++ b/keyboards/clueboard/66/keymaps/tetris/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
index 823959ee0d..472f24b2ef 100644
--- a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,         RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                  RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                  RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,RGB_MOD,                         _______,  _______,  _______,  _______, RGB_HUD, RGB_SAD,RGB_HUI),
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
index 2c5cb86398..9d21fa2617 100644
--- a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,RESET,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
+  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
   _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
diff --git a/keyboards/clueboard/66/rev4/keymaps/keymap.c b/keyboards/clueboard/66/rev4/keymaps/keymap.c
index df145eb488..27280406fe 100644
--- a/keyboards/clueboard/66/rev4/keymaps/keymap.c
+++ b/keyboards/clueboard/66/rev4/keymaps/keymap.c
@@ -9,5 +9,5 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_SPC, KC_HENK, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 	[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
-	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
+	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
 };
diff --git a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c b/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
index df145eb488..27280406fe 100644
--- a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
+++ b/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
@@ -9,5 +9,5 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_SPC, KC_HENK, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 	[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
-	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
+	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
 };
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json b/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
index 20aa9f0f6c..b2111dc3ca 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
@@ -1 +1 @@
-{"keyboard":"clueboard/66_hotswap/gen1","keymap":"default_66","layout":"LAYOUT","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","MO(1)","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_DEL","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_MPRV","KC_MPLY","KC_MNXT","KC_NO","KC_MUTE","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","MO(1)","KC_NO","KC_HOME","KC_PGDN","KC_END"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_TOGG","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","RESET","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_STEP","KC_NO","KC_NO","MO(1)","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"","notes":""}
\ No newline at end of file
+{"keyboard":"clueboard/66_hotswap/gen1","keymap":"default_66","layout":"LAYOUT","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","MO(1)","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_DEL","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_MPRV","KC_MPLY","KC_MNXT","KC_NO","KC_MUTE","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","MO(1)","KC_NO","KC_HOME","KC_PGDN","KC_END"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_TOGG","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_STEP","KC_NO","KC_NO","MO(1)","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/coarse/ixora/keymaps/wntrmln/keymap.c b/keyboards/coarse/ixora/keymaps/wntrmln/keymap.c
index 3e08c78015..bf26771b7c 100644
--- a/keyboards/coarse/ixora/keymaps/wntrmln/keymap.c
+++ b/keyboards/coarse/ixora/keymaps/wntrmln/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: (Base Layer) Default Layer
    * ,-----------------.
-   * |RESET|  2  |  3  |
+   * |QK_BOOT|  2  |  3  |
    * |-----------------|
    * |Caps |NmLk |ScLk |
    * `-----------------'
diff --git a/keyboards/contra/keymaps/alper/keymap.c b/keyboards/contra/keymaps/alper/keymap.c
index 8be7513556..af81040b58 100644
--- a/keyboards/contra/keymaps/alper/keymap.c
+++ b/keyboards/contra/keymaps/alper/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_mit(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
diff --git a/keyboards/contra/keymaps/losinggeneration/keymap.c b/keyboards/contra/keymaps/losinggeneration/keymap.c
index d4a336c338..0e2478e1ae 100644
--- a/keyboards/contra/keymaps/losinggeneration/keymap.c
+++ b/keyboards/contra/keymaps/losinggeneration/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |      | RESET| Game |Numpad|Mouse |      |Sleep |
+ * |      |  F1  |  F2  |  F3  |  F4  |      | QK_BOOT| Game |Numpad|Mouse |      |Sleep |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |  F5  |  F6  |  F7  |  F8  |      |      |Qwerty|Colmak|Workmn|Dvorak|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = CATMAP( \
-  _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , _______, RESET  , TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP, \
+  _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , _______, QK_BOOT, TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP, \
   _______, KC_F5  ,  KC_F6 , KC_F7  , KC_F8  , _______, _______, QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
   MT_CAPS, KC_F9  ,  KC_F10, KC_F11 , KC_F12 , _______, _______, _______, _______, _______, KC_UP  , _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT  \
diff --git a/keyboards/contra/keymaps/msiu/keymap.c b/keyboards/contra/keymaps/msiu/keymap.c
index ee0598533d..36dda9863a 100644
--- a/keyboards/contra/keymaps/msiu/keymap.c
+++ b/keyboards/contra/keymaps/msiu/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
   ),
 
   [_FUNC] = LAYOUT_ortho_4x12(
diff --git a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c b/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
index 3828f09f5d..f91c6cfb5b 100644
--- a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* system */
     [SYS] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
                                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
     _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,     _______, _______, _______,     KC_NLCK, _______, _______, _______,
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c b/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c
index e0f04557c6..0255798860 100644
--- a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c
+++ b/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS, \
     KC_BRMD,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS, \
     KC_BRMU,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS, \
-    KC_TRNS,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        RESET  \
+    KC_TRNS,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        QK_BOOT  \
   ),
 };
 
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
index ce4876536f..81d916edb9 100644
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -61,7 +61,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, ______, ______, ______,  ______,  ______, ______,  ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
     ______,  KC_MUTE, KC_VOLD, KC_MPLY, ______, ______, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, ______, ______,         ______, ______,                              ______,______,______,______,    ______,______,
     ______,  ______,  ______, ______,   ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,            ______,           ______,______,______,______,    ______,______,
-    ______,  ______,  ______, ______,   ______,         ______,           ______, ______,  ______, ______, ______, ______, RESET,      ______,______,______,    ______,       ______,______,    ______,______
+    ______,  ______,  ______, ______,   ______,         ______,           ______, ______,  ______, ______, ______, ______, QK_BOOT,    ______,______,______,    ______,       ______,______,    ______,______
     ),
 };
 
diff --git a/keyboards/converter/usb_usb/keymaps/narze/keymap.c b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
index a84d613a2d..13bc7a3eba 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
@@ -77,7 +77,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     ),
     [_SUPERDUPER] = LAYOUT_all(
                       ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
-    RESET,            ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
+    QK_BOOT,          ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
     ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
     ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  BRWS_L, BRWS_R, ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
     KC_SPC, KC_LALT, _______, _______, KC_BSPC,KC_LGUI,KC_LEFT, KC_DOWN,   KC_UP,KC_RGHT,  KC_DEL, ______,         ______, ______,                              ______,______,______,______,    ______,______,
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
index 4c63a3e14a..8dc554c3d3 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DELT, MC_SLPD, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_LHPD, KC_VOLU, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
-    _______,          _______, _______, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
+    _______,          _______, _______, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
     _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END   \
 )
 };
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
index 32199fd8ac..ed49188c5e 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------------------------------------------------------------'
      */
     [_FUNC] = LAYOUT_65_ansi(
-      _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,   RESET,
+      _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,   QK_BOOT,
       _______,KC_WH_U,KC_BTN1,KC_MS_U,KC_BTN2,_______,_______,AG_NORM,AG_SWAP,QWERTY,WORKMAN,_______,_______,_______,   KC_INS,
       _______,KC_WH_D,KC_MS_L,KC_MS_D,KC_MS_R,_______,_______,_______,_______,_______,_______,_______,       _______,  KC_PGUP,
       _______,KC_WH_L,KC_BTN3,KC_WH_R,_______,_______,_______,_______,_______,_______,_______,        _______,KC_VOLU, KC_PGDN,
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
index d224ca0e9d..dbd5d4409e 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /* esc      1        2        3        4       5       6       7       8       9         0        -         =     bkspc       `~  */
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PSCR,
      /*  tab      Q       W        E        R        T      Y        U      I        O        P        [         ]        \      delete*/ 
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PAUS, KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PAUS, KC_TRNS,  KC_TRNS,
      /*  caps     A       S        D        F        G      H        J      K        L        ;        '        enter             pg up*/
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPLY,            KC_HOME,
      /* shift             Z         X        C       V       B       N      M        ,        .        /        shift     up      pg dn*/
diff --git a/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c b/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
index 21ca2ffb63..0d11c9a9bb 100644
--- a/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
+++ b/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
@@ -36,7 +36,7 @@
    * .---------------------------------------------------------------------------------------------.
    * | ` ~ |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  Delete |     |
    * |---------------------------------------------------------------------------------------------+
-   * | Tab    |STATC|BRTHE|RNBOW|RESET|     |     |     |     |     |     |PrScr|     |  \   | Home|
+   * | Tab    |STATC|BRTHE|RNBOW|QK_BOOT|     |     |     |     |     |     |PrScr|     |  \   | Home|
    * |---------------------------------------------------------------------------------------------+
    * | Caps    |RGBH+|RGBS+|RGBB+|     |     |     |     |     |     |     |     |    Enter  | End |
    * |---------------------------------------------------------------------------------------------+
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /* esc      1        2        3        4       5       6       7       8       9         0        -         =     bkspc     delete */
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PSCR,
      /*  tab      Q       W        E        R        T      Y        U      I        O        P        [         ]        \       pg up */ 
-      KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PSCR, KC_BSLS,  KC_HOME,
+      KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PSCR, KC_BSLS,  KC_HOME,
      /*  caps     A       S        D        F        G      H        J      K        L        ;        '        enter             pg dn */
       KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS,            KC_END, 
      /* shift             Z         X        C       V       B       N      M        ,        .        /        shift     up        fn  */
diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c
index 71f357681e..9a851bec56 100644
--- a/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c
+++ b/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_tkl_ansi_7u(
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_VOLU,
       KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                         KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS, KC_VOLD, KC_TRNS)
diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
index 3be5d44ea3..fae2a144a0 100644
--- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
+++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * └────┴───┴───┴────────────────────────┴────┴───┴────┘
 */
 [_ADJUST] = LAYOUT_ansi_40( \
-    QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, \
+    QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______,                            _______,                   _______, _______, _______  \
diff --git a/keyboards/cozykeys/speedo/v3/keymaps/pcewing/keymap.c b/keyboards/cozykeys/speedo/v3/keymaps/pcewing/keymap.c
index 4bb9554677..51fb5ca67c 100644
--- a/keyboards/cozykeys/speedo/v3/keymaps/pcewing/keymap.c
+++ b/keyboards/cozykeys/speedo/v3/keymaps/pcewing/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[__LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [LAYER_FN] = LAYOUT(
-    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,                            _______, _______, _______, _______, _______, RESET,
+    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,                            _______, _______, _______, _______, _______, QK_BOOT,
     _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          RGB_TOG,          KC_YANK, KC_GRV,  KC_LBRC, KC_RBRC, KC_PUT,  _______,
     KC_CAPS, KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_INS,  RGB_N,            RGB_P,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_PAUS,          RGB_M_P,          KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
index a611c59223..f5cd85eb12 100644
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@@ -229,7 +229,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ADJUST LAYER
   [_TPL] = LAYOUT_wrapper( \
   //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |  RESET | EEPRST |        |        |        |        |      |        |        |        |        |        |       |
+    |  QK_BOOT | EEPRST |        |        |        |        |      |        |        |        |        |        |       |
   //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
     | RGBTog |  HUE▲  |  SAT▲  | BRGHT▲ |        |        |      |        |        |        |        |        |       |
   //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
@@ -241,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 */
   [_ADJUST] = LAYOUT_split_3x6_3(
-    RESET, EEP_RST, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+    QK_BOOT, EEP_RST, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
     RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                    _______, _______, _______, _______, _______, _______,
     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                    _______, _______, _______, _______, _______, _______,
                                           KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
diff --git a/keyboards/crkbd/keymaps/blipson/keymap.c b/keyboards/crkbd/keymaps/blipson/keymap.c
index ad7664c295..218933940c 100644
--- a/keyboards/crkbd/keymaps/blipson/keymap.c
+++ b/keyboards/crkbd/keymaps/blipson/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
    [3] = LAYOUT_split_3x6_3(
    //,-------------------------------------------------------------------------------.                    ,------------------------------------------------------------------.
-       KC_ESC,    KC_F1,       KC_F2,         KC_F3,          KC_F4,     KC_F5,                            KC_F6,       KC_F7,       KC_F8,       KC_F9,   KC_F10,  RESET,
+       KC_ESC,    KC_F1,       KC_F2,         KC_F3,          KC_F4,     KC_F5,                            KC_F6,       KC_F7,       KC_F8,       KC_F9,   KC_F10,  QK_BOOT,
    //|----------+------------+--------------+---------------+-----------+------------|                    |------------+------------+------------+--------+--------+---------|
        KC_LCTL,   A(KC_F12),   A(G(KC_LEFT)), A(G(KC_RIGHT)), S(KC_F6),  C(S(KC_D)),                       C(S(KC_R)),  G(KC_LBRC),  G(KC_RBRC),  KC_F11,  KC_F12, KC_MPLY,
    //|----------+------------+--------------+---------------+-----------+------------|                    |------------+------------+------------+--------+--------+---------|
diff --git a/keyboards/crkbd/keymaps/crkdves/keymap.c b/keyboards/crkbd/keymaps/crkdves/keymap.c
index 52ea9dedba..333e47e952 100644
--- a/keyboards/crkbd/keymaps/crkdves/keymap.c
+++ b/keyboards/crkbd/keymaps/crkdves/keymap.c
@@ -148,7 +148,7 @@ LSFT_T(ES_LABK), ES_MINS,    ES_Q,    ES_J,    ES_K,    ES_X,
 
     [_ADJUST] = LAYOUT_split_3x6_3(
     //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-          RESET,  RGBRST,RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+          QK_BOOT,  RGBRST,RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
         RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/crkqwes/keymap.c b/keyboards/crkbd/keymaps/crkqwes/keymap.c
index 2c80024c9d..817935d0b3 100644
--- a/keyboards/crkbd/keymaps/crkqwes/keymap.c
+++ b/keyboards/crkbd/keymaps/crkqwes/keymap.c
@@ -148,7 +148,7 @@ LSFT_T(ES_LABK),    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B,
 
     [_ADJUST] = LAYOUT_split_3x6_3(
     //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-          RESET,  RGBRST,RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+          QK_BOOT,  RGBRST,RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
         RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/davidrambo/keymap.c b/keyboards/crkbd/keymaps/davidrambo/keymap.c
index 98ab35bf75..b707192608 100644
--- a/keyboards/crkbd/keymaps/davidrambo/keymap.c
+++ b/keyboards/crkbd/keymaps/davidrambo/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,                     CTLPGUP, KC_LEFT , KC_DOWN, KC_RGHT, CTLPGDN, _______,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        RESET, _______, _______, _______, _______, _______,                      ATAB   , CBSPC , KC_HOME, KC_END,    G_GRV , _______,
+        QK_BOOT, _______, _______, _______, _______, _______,                      ATAB   , CBSPC , KC_HOME, KC_END,    G_GRV , _______,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,    _______, _______, KC_RALT
                                       //`--------------------------'  `--------------------------'
diff --git a/keyboards/crkbd/keymaps/devdev/keymap.c b/keyboards/crkbd/keymaps/devdev/keymap.c
index c00bee6da6..cbaa7c16e9 100644
--- a/keyboards/crkbd/keymaps/devdev/keymap.c
+++ b/keyboards/crkbd/keymaps/devdev/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// commands - both thumbs
 	[_COMMAND] = LAYOUT(
 	//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-	      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, 						 KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NO,
+	      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, 						 KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NO,
     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 	    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,   DF(1),   DF(0), 					 C(G(KC_LEFT)),   KC_NO,   KC_NO,   C(G(KC_RGHT)),   KC_NO,   KC_NO,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// layer switcher
 	[_SWITCH] = LAYOUT(
 	//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-	      TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5), 					     KC_NO,   TO(7),   KC_NO,   KC_NO,   KC_NO,   RESET,
+	      TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5), 					     KC_NO,   TO(7),   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 	      KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO, 						 KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EEP_RST,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/gotham/keymap.c b/keyboards/crkbd/keymaps/gotham/keymap.c
index a258794049..4c05e54999 100644
--- a/keyboards/crkbd/keymaps/gotham/keymap.c
+++ b/keyboards/crkbd/keymaps/gotham/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|-----------------------------------------------------|                    |-----------------------------------------------------|
      XXXXXXX, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG, RGB_TOG,                       MU_TOG, KC_F12,  KC_F7,   KC_F8,   KC_F9,   XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,                       MU_MOD, KC_F11,  KC_F4,   KC_F5,   KC_F6,   RESET,  \
+     XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,                       MU_MOD, KC_F11,  KC_F4,   KC_F5,   KC_F6,   QK_BOOT,  \
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
      XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGBRST,                        AU_TOG, KC_F10,  KC_F1,   KC_F2,   KC_F3,   _______,\
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/hvp/keymap.c b/keyboards/crkbd/keymaps/hvp/keymap.c
index c3d25cd99c..bdc8746199 100644
--- a/keyboards/crkbd/keymaps/hvp/keymap.c
+++ b/keyboards/crkbd/keymaps/hvp/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
     KC_F1,_______,_______,D_NAVI,_______,_______,                 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    RESET,KC_PSCR,_______,_______,_______,_______,                 KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______,
+    QK_BOOT,KC_PSCR,_______,_______,_______,_______,                 KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
                                 _______, KC_VOLD,KC_MPLY, KC_MNXT, KC_VOLU,_______
                               //`--------------------'  `--------------------'
diff --git a/keyboards/crkbd/keymaps/jpe230/keymap.c b/keyboards/crkbd/keymaps/jpe230/keymap.c
index c5ec473fed..28bb6c1fe1 100644
--- a/keyboards/crkbd/keymaps/jpe230/keymap.c
+++ b/keyboards/crkbd/keymaps/jpe230/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [3] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      KC_MUTE, KC_WBAK, KC_WFWD,   KC_F7,   KC_F8,   KC_F9,                      _______,    KC_7,    KC_8,    KC_9, _______, RESET,
+      KC_MUTE, KC_WBAK, KC_WFWD,   KC_F7,   KC_F8,   KC_F9,                      _______,    KC_7,    KC_8,    KC_9, _______, QK_BOOT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_VOLU, _______, KC_MNXT,   KC_F6,   KC_F5,   KC_F6,                      _______,    KC_6,    KC_5,    KC_4, _______, _______,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/madhatter/keymap.c b/keyboards/crkbd/keymaps/madhatter/keymap.c
index f833428a02..59b4cc7a20 100644
--- a/keyboards/crkbd/keymaps/madhatter/keymap.c
+++ b/keyboards/crkbd/keymaps/madhatter/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   RESET,
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           KC_TRNS,  LOWER, KC_TRNS,    KC_TRNS,   RAISE, KC_TRNS
                                       //`--------------------------'  `--------------------------'
diff --git a/keyboards/crkbd/keymaps/mb_via/keymap.c b/keyboards/crkbd/keymaps/mb_via/keymap.c
index b7fbc1c290..30a67de5c9 100644
--- a/keyboards/crkbd/keymaps/mb_via/keymap.c
+++ b/keyboards/crkbd/keymaps/mb_via/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [3] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/oled_sample/keymap.c b/keyboards/crkbd/keymaps/oled_sample/keymap.c
index 9daae9607d..2545f087f2 100644
--- a/keyboards/crkbd/keymaps/oled_sample/keymap.c
+++ b/keyboards/crkbd/keymaps/oled_sample/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] = LAYOUT_split_3x6_3(
-    RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                         GUIEI,   LOWER,   KC_SPC,  KC_ENT,  RAISE,   ALTKN
diff --git a/keyboards/crkbd/keymaps/ollyhayes/keymap.c b/keyboards/crkbd/keymaps/ollyhayes/keymap.c
index 80ce41df49..5b9bc6cd4e 100644
--- a/keyboards/crkbd/keymaps/ollyhayes/keymap.c
+++ b/keyboards/crkbd/keymaps/ollyhayes/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [MEDIA] = LAYOUT_split_3x6_3(
 //  +------------+-----------+---------+---------+---------+----------------+----------------+---------+---------+---------+----------+---------+
-	  RESET      , RGB_RMOD  , RGB_MOD , RGB_TOG , RGB_HUD , RGB_HUI        , RGB_HUD        , RGB_HUI , RGB_TOG , RGB_RMOD, RGB_MOD  , KC_SLEP ,
+	  QK_BOOT      , RGB_RMOD  , RGB_MOD , RGB_TOG , RGB_HUD , RGB_HUI        , RGB_HUD        , RGB_HUI , RGB_TOG , RGB_RMOD, RGB_MOD  , KC_SLEP ,
 	  KC_TRNS    , KC_TRNS   , KC_TRNS , KC_VOLD , KC_VOLU , RGB_MODE_PLAIN , RGB_MODE_PLAIN , KC_VOLD , KC_VOLU , KC_TRNS , KC_TRNS  , KC_TRNS ,
 	  KC_TRNS    , KC_TRNS   , RGB_VAD , RGB_VAI , RGB_SAD , RGB_SAI        , RGB_SAD        , RGB_SAI , RGB_VAD , RGB_VAI , KC_TRNS  , KC_TRNS ,
 										 KC_TRNS , KC_TRNS , KC_TRNS        , KC_TRNS        , KC_TRNS , KC_TRNS
diff --git a/keyboards/crkbd/keymaps/rarick/keymap.c b/keyboards/crkbd/keymaps/rarick/keymap.c
index adf9555421..72be5d3c36 100644
--- a/keyboards/crkbd/keymaps/rarick/keymap.c
+++ b/keyboards/crkbd/keymaps/rarick/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [3] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                        KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/rmeli/keymap.c b/keyboards/crkbd/keymaps/rmeli/keymap.c
index f7901d1cfd..f8d298bbdd 100644
--- a/keyboards/crkbd/keymaps/rmeli/keymap.c
+++ b/keyboards/crkbd/keymaps/rmeli/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG] = LAYOUT_split_3x6_3(
   //|-----------------------------------------------------|                    |-----------------------------------------------------|
-        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      UC_MOD,  KC_ASUP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      UC_MOD,  KC_ASUP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, KC_ASTG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index a098c73d2c..a0186bf28d 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_UTIL] = LAYOUT_split_3x6_3( \
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK,                      RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI,\
+        QK_BOOT, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK,                      RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_RST, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY,  GAMING,                      RGB_UND, RGB_DUO, RGB_SCR, RGB_SPI, RGB_SAD, RGB_SAI,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 70fe50e967..66839e8249 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_split_3x6_3(
   //,-----------------------------------------.                ,-----------------------------------------.
-      RESET,RGBRST, KC_NO, KC_NO, KC_NO, KC_NO,                  KC_NO,KC__MUTE, KC_NO, KC_NO, KC_NO, KC_NO,
+      QK_BOOT,RGBRST, KC_NO, KC_NO, KC_NO, KC_NO,                  KC_NO,KC__MUTE, KC_NO, KC_NO, KC_NO, KC_NO,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
     RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,KC_NO,               KC_PAUSE,KC__VOLUP, KC_NO, KC_NO, KC_NO, KC_NO,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
index a4b4f67fb4..387839c16e 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 #define KC_XXXXX KC_NO
 #define KC_LOWER LOWER
 #define KC_RAISE RAISE
-#define KC_RST   RESET
+#define KC_RST   QK_BOOT
 #define KC_LRST  RGBRST
 #define KC_LTOG  RGB_TOG
 #define KC_LHUI  RGB_HUI
diff --git a/keyboards/crkbd/keymaps/toinux/keymap.c b/keyboards/crkbd/keymaps/toinux/keymap.c
index ae3de00b79..9f5474ee2e 100644
--- a/keyboards/crkbd/keymaps/toinux/keymap.c
+++ b/keyboards/crkbd/keymaps/toinux/keymap.c
@@ -212,7 +212,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //                                      |        |        |        |  |        |        |        |
 //                                      `--------------------------'  `--------------------------'
   [_ADJUST] = LAYOUT_split_3x6_3(
-        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,                      KC_NLCK, KC_CAPS, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX,
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,                      KC_NLCK, KC_CAPS, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX,
       RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                           _______, _______, _______,    _______, _______, _______
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
index eb30873f5b..e47e2df539 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
@@ -28,7 +28,7 @@ enum custom_keycodes {
 
 #define KC_LOWER LOWER
 #define KC_RAISE RAISE
-#define KC_RST   RESET
+#define KC_RST   QK_BOOT
 #define KC_LRST  RGBRST
 #define KC_LTOG  RGB_TOG
 #define KC_LHUI  RGB_HUI
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
index 14a5b5d90a..703be80d96 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 #define KC_XXXXX KC_NO
 #define KC_LOWER LOWER
 #define KC_RAISE RAISE
-#define KC_RST   RESET
+#define KC_RST   QK_BOOT
 #define KC_LRST  RGBRST
 #define KC_LTOG  RGB_TOG
 #define KC_LHUI  RGB_HUI
diff --git a/keyboards/crkbd/keymaps/xyverz/keymap.c b/keyboards/crkbd/keymaps/xyverz/keymap.c
index 0b7fc0a0ac..95112ece54 100644
--- a/keyboards/crkbd/keymaps/xyverz/keymap.c
+++ b/keyboards/crkbd/keymaps/xyverz/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   RESET,
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,    _______, _______, _______
                                       //`--------------------------'  `--------------------------'
diff --git a/keyboards/cutie_club/wraith/keymaps/amber/keymap.c b/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
index f953b5e199..41d5b39c40 100644
--- a/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
+++ b/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CAPS,             KC_LALT,                                          KC_SPC,                                  KC_RALT,   KC_LEFT,   KC_DOWN,    KC_RGHT
   ),
   [1] = LAYOUT_all(
-    RESET,      KC_F13,     KC_F14,     KC_F15,     KC_F16,     KC_F17,     KC_F18,     KC_F19,     KC_F20,     KC_F21,     KC_F22,     KC_F23,     KC_F24,     _______,    _______,
+    QK_BOOT,    KC_F13,     KC_F14,     KC_F15,     KC_F16,     KC_F17,     KC_F18,     KC_F19,     KC_F20,     KC_F21,     KC_F22,     KC_F23,     KC_F24,     _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
 	  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,
 	  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_TRNS,
diff --git a/keyboards/cutie_club/wraith/keymaps/timer/keymap.c b/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
index 8b79709b39..57d894ebc9 100644
--- a/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
+++ b/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CAPS,             KC_LALT,                                          KC_SPC,                                  KC_RALT,   KC_LEFT,   KC_DOWN,    KC_RGHT
   ),
   [1] = LAYOUT_all(
-    RESET,      KC_F13,     KC_F14,     KC_F15,     KC_F16,     KC_F17,     KC_F18,     KC_F19,     KC_F20,     KC_F21,     KC_F22,     KC_F23,     KC_F24,     _______,    _______,
+    QK_BOOT,    KC_F13,     KC_F14,     KC_F15,     KC_F16,     KC_F17,     KC_F18,     KC_F19,     KC_F20,     KC_F21,     KC_F22,     KC_F23,     KC_F24,     _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_TRNS,
diff --git a/keyboards/cx60/keymaps/via_caps/keymap.c b/keyboards/cx60/keymaps/via_caps/keymap.c
index af2d862df4..8bbfb022ab 100644
--- a/keyboards/cx60/keymaps/via_caps/keymap.c
+++ b/keyboards/cx60/keymaps/via_caps/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 1: Function Layer */
     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, RESET,
+        KC_GRV,  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_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, RGB_TOG,
 		KC_TRNS, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_SPD, KC_VOLU, RGB_SPI,
diff --git a/keyboards/dailycraft/claw44/keymaps/oled/keymap.c b/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
index 1778ac6167..fd2d47b60c 100644
--- a/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
+++ b/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
         _______, _______, _______, _______, KC_LCBR, KC_LBRC,     KC_RBRC, KC_RCBR, _______, _______, _______, _______,
     //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
-                          _______, _______, _______, _______,     _______, _______, _______, RESET
+                          _______, _______, _______, _______,     _______, _______, _______, QK_BOOT
     //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
     ),
 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
         KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,     _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
     //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
-                          RESET  , _______, _______, _______,     _______, _______, _______, _______
+                          QK_BOOT, _______, _______, _______,     _______, _______, _______, _______
     //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
     ),
     [_ADJUST] = LAYOUT(
diff --git a/keyboards/daji/seis_cinco/keymaps/split_backspace/keymap.c b/keyboards/daji/seis_cinco/keymaps/split_backspace/keymap.c
index 82e2a166e6..0182874e23 100644
--- a/keyboards/daji/seis_cinco/keymaps/split_backspace/keymap.c
+++ b/keyboards/daji/seis_cinco/keymaps/split_backspace/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                          KC_RGUI,            KC_LEFT, KC_DOWN,          KC_RIGHT),
 
   [1] = LAYOUT_all(
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, KC_TRNS,
+    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
diff --git a/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
index 58bc0c7783..c8d1aa0846 100644
--- a/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_all(
-    RESET  ,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   DEBUG,
+    QK_BOOT,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   DEBUG,
     _______,                RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
     KC_CAPS,                RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    TG(_GAME),  _______,    _______,    _______,        _______,            _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    TG(_MAC),   _______,    _______,    _______,                _______,                _______,
diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c b/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c
index 8eadc7aee1..a0c8f04266 100644
--- a/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c
+++ b/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   LAYOUT_v2(
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
index cba17015de..0db3f6bb23 100644
--- a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
+++ b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `---------------------------      ----------------------------------------'
    */
 	LAYOUT_v2(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		KC_CAPSLOCK, KC_VOLU, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______,
 		M(1), KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, _______, _______,
diff --git a/keyboards/deltasplit75/keymaps/protosplit/keymap.c b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
index 7d6cb33949..31b764393e 100644
--- a/keyboards/deltasplit75/keymaps/protosplit/keymap.c
+++ b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   LAYOUT_protosplit(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_VOLU, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     M(1),    KC_LEFT, KC_DOWN, KC_RGHT, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
diff --git a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
index 646a942c58..819b76e739 100644
--- a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_plaid_grid(
-    RESET,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
+    QK_BOOT,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
index 0abd3f8495..f31b79c2c7 100644
--- a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT_plaid_grid( // F, media keys, reset
     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, RESET,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, QK_BOOT,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,_______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, AUTOCLICK
 )
diff --git a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c b/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
index c8d48c3955..354599f340 100644
--- a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_plaid_grid(
-    RESET  , LED_1  , LED_2  ,  LED_3  , LED_4  , LED_5  ,LED_6   , LED_7  , LED_8  , LED_9  , LED_0  , _______ ,
+    QK_BOOT, LED_1  , LED_2  ,  LED_3  , LED_4  , LED_5  ,LED_6   , LED_7  , LED_8  , LED_9  , LED_0  , _______ ,
     _______, KC_PWR , KC_SLEP,  KC_WAKE, KC_EJCT, _______, _______, _______, _______, _______, _______, _______ ,
     _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
     _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
index e617d0dd5f..9567c60bff 100644
--- a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Function (Lower + Raise)
      * ,-----------------------------------------------------------------------------------------------------------------------.
-     * | RESET| LCA_T(F1)  | LCA_T(F2) | LCA_T(F3) | LCA_T(F4) | LCA_T(F5) | LCA_T(F6) | LCA_T(F7) |      |      |      |      |
+     * | QK_BOOT| LCA_T(F1)  | LCA_T(F2) | LCA_T(F3) | LCA_T(F4) | LCA_T(F5) | LCA_T(F6) | LCA_T(F7) |      |      |      |      |
      * |------+------------+-----------+-----------+-----------+-----------+-----------+-----------+------+------+------+------+
      * |      |            |           |           |           | QWERTY    | DVORAK    | COLEMAK   |      |      |      |      |
      * |------+------------+-----------+-----------+-----------+-----------+-----------+-----------+------+------+------+------+
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------------------------------------------'
      */
 
-    [_FUNCTION] = LAYOUT_planck_mit(RESET, LCA_T(KC_F1), LCA_T(KC_F2), LCA_T(KC_F3), LCA_T(KC_F4), LCA_T(KC_F5), LCA_T(KC_F6), LCA_T(KC_F7), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QWERTY, DVORAK, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LED, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)};
+    [_FUNCTION] = LAYOUT_planck_mit(QK_BOOT, LCA_T(KC_F1), LCA_T(KC_F2), LCA_T(KC_F3), LCA_T(KC_F4), LCA_T(KC_F5), LCA_T(KC_F6), LCA_T(KC_F7), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QWERTY, DVORAK, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LED, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)};
 
 // constants to toggle LED behavior
 
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
index dcce444faa..58aa5554c2 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_RMOD,  RGB_TOG,   RGB_MOD),
 
     [_FN] = LAYOUT(
-        KC_TRNS,   DEBUG,     RESET,     KC_TRNS,
+        KC_TRNS,   DEBUG,     QK_BOOT,   KC_TRNS,
         KC_NO,     KC_NO,     EEP_RST,   KC_TRNS,
         KC_NO,     KC_NO,     KC_NO,     KC_TRNS,
         KC_NO,     KC_NO,     KC_NO),
diff --git a/keyboards/do60/keymaps/crd/keymap.c b/keyboards/do60/keymaps/crd/keymap.c
index 2c83df867f..aaec5c2f78 100644
--- a/keyboards/do60/keymaps/crd/keymap.c
+++ b/keyboards/do60/keymaps/crd/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FL] = LAYOUT_60_ansi_split_bs_rshift(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
-		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, RESET,
+		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
 		_______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
 		_______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/do60/keymaps/test/keymap.c b/keyboards/do60/keymaps/test/keymap.c
index 7ad21e3850..8188bde5e4 100644
--- a/keyboards/do60/keymaps/test/keymap.c
+++ b/keyboards/do60/keymaps/test/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 1: Function Layer
   [1] = LAYOUT_all(
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_NO,    KC_NO,
+      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_NO,    KC_NO,
       KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,          KC_DEL,
       KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
index 53e77437ff..3da74bb153 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* (3) Fn 2 */
     [_FN2] = LAYOUT_96_ansi(
-	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC_M_WC, EEP_RST, RESET, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC_M_WC, EEP_RST, QK_BOOT, 
 	VLK_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
diff --git a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
index bc07a619cd..025a506188 100644
--- a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
+++ b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
   RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
   RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RESET, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
+  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, QK_BOOT, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
   RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
   RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
   RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
diff --git a/keyboards/dp60/keymaps/allleds/keymap.c b/keyboards/dp60/keymaps/allleds/keymap.c
index 66cc628d4c..3d49bd268f 100644
--- a/keyboards/dp60/keymaps/allleds/keymap.c
+++ b/keyboards/dp60/keymaps/allleds/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_split_bs_rshift(
       _______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,
-      RESET,   RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
+      QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
       _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
       _______,_______,_______,                        _______,                        _______,_______,TG(0),_______),
diff --git a/keyboards/dp60/keymaps/indicator/keymap.c b/keyboards/dp60/keymaps/indicator/keymap.c
index 170d4eb954..0cfe07f3ae 100644
--- a/keyboards/dp60/keymaps/indicator/keymap.c
+++ b/keyboards/dp60/keymaps/indicator/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_hhkb(
       _______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,
-      RESET,   RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
+      QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
       KC_CAPS,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
               _______,_______,                        _______,                        _______,_______),
diff --git a/keyboards/draculad/keymaps/pimoroni/keymap.c b/keyboards/draculad/keymaps/pimoroni/keymap.c
index 5c20c69af9..a98c47fd39 100644
--- a/keyboards/draculad/keymaps/pimoroni/keymap.c
+++ b/keyboards/draculad/keymaps/pimoroni/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NUM] = LAYOUT(
         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
         KC_TAB,  KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                      KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
-        KC_LSFT, XXXXXXX, KC_MPRV, KC_MNXT, RESET,                        KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_RSFT,
+        KC_LSFT, XXXXXXX, KC_MPRV, KC_MNXT, QK_BOOT,                      KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_RSFT,
                                             XXXXXXX,                      KC_NO,
                                    KC_LCTL, KC_LALT, XXXXXXX,    KC_NO,   _______, KC_ENT
     ),
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    XXXXXXX, XXXXXXX,  XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX
     ),
     [_ADJ] = LAYOUT(
-        RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      BALL_HUI, BALL_WHT, BALL_DEC, XXXXXXX, XXXXXXX,
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      BALL_HUI, BALL_WHT, BALL_DEC, XXXXXXX, XXXXXXX,
         EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI, RGB_TOG,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_VAD, _______,
                                             XXXXXXX,                      _______,
diff --git a/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c b/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c
index 65e0629e1d..c8a0ecd959 100644
--- a/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c
+++ b/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ,----------------------------------------------------------------.
      * |~ `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Delete| Ins|
      * |----------------------------------------------------------------|
-     * |RESET|   | ↑ |   |   |   |   |   |   |   |   |   |   |     |    |
+     * |QK_BOOT|   | ↑ |   |   |   |   |   |   |   |   |   |   |     |    |
      * |-------------------------------------------------------    -----|
      * |       | ← | ↓ | → |   |   |   |   |   |   |   |  |   |    |    |
      * |----------------------------------------------------------------|
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FL] = 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_INS,
-        RESET,   _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        QK_BOOT, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
         RGB_HUD, RGB_SAD, RGB_VAD,                            RGB_TOG,                   _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c b/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c
index 65e0629e1d..c8a0ecd959 100644
--- a/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c
+++ b/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ,----------------------------------------------------------------.
      * |~ `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Delete| Ins|
      * |----------------------------------------------------------------|
-     * |RESET|   | ↑ |   |   |   |   |   |   |   |   |   |   |     |    |
+     * |QK_BOOT|   | ↑ |   |   |   |   |   |   |   |   |   |   |     |    |
      * |-------------------------------------------------------    -----|
      * |       | ← | ↓ | → |   |   |   |   |   |   |   |  |   |    |    |
      * |----------------------------------------------------------------|
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FL] = 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_INS,
-        RESET,   _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        QK_BOOT, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
         RGB_HUD, RGB_SAD, RGB_VAD,                            RGB_TOG,                   _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
index 6c6cfbd2f8..dfd733357d 100644
--- a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
+++ b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_viper( \
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  \
-    KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, RESET,   _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          KC_BSPC, \
+    KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          KC_BSPC, \
     _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,                   KC_ENT,  \
     _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN,          KC_DOWN, _______, _______, \
              _______, _______,                                     _______,                                     _______, _______           \
diff --git a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c b/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
index 65f128a26b..07becf96fa 100644
--- a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
+++ b/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_TOGG, _______, _______, _______,  \
       _______,  _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, _______,          _______, _______, _______, _______, _______,  \
       _______,  _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,                   _______, _______, _______, _______, _______,  \
-      _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, RESET,  \
+      _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, QK_BOOT,  \
       _______,  _______, _______,                                              _______,                   _______, _______, _______, _______, _______, _______, _______ ), \
 
 };
diff --git a/keyboards/dumbo/keymaps/trip-trap/keymap.c b/keyboards/dumbo/keymaps/trip-trap/keymap.c
index 73042f5f5e..56d27e3fbd 100644
--- a/keyboards/dumbo/keymaps/trip-trap/keymap.c
+++ b/keyboards/dumbo/keymaps/trip-trap/keymap.c
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Special functions: _SP
  *
  *     ,-------------------------------------------.                            ,-------------------------------------------.
- *     |        |QWERTY|      |      | RESET|      |                            |      |      |      |      |      |        |
+ *     |        |QWERTY|      |      | QK_BOOT|      |                            |      |      |      |      |      |        |
  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
  *     |        |      |      | DEBUG|      |      |                            |      |      |      |      |      |        |
  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  [_SP] = LAYOUT_split_3x6_4(
    //,-----------------------------------------------------.                            ,-----------------------------------------------------.
-       XXXXXXX,   QWERT, XXXXXXX, XXXXXXX,   RESET, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       XXXXXXX,   QWERT, XXXXXXX, XXXXXXX,   QK_BOOT, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
        XXXXXXX, XXXXXXX, XXXXXXX,   DEBUG, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
index ca95091464..84d23f665a 100644
--- a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     \-----------------------------------------------------'
     */
     [1] = LAYOUT(
-                    _______,     _______,     _______,      RESET,
+                    _______,     _______,     _______,      QK_BOOT,
                     _______,     _______,     _______,      KC_KP_PLUS,
                     _______,     _______,     _______,      KC_KP_MINUS,
         KC_LOCK,    _______,     _______,     _______,      KC_EQL
diff --git a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
index 0d280d8139..00f4500469 100644
--- a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
+++ b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     \-----------------------------------------------------'
     */
     [1] = LAYOUT(
-                    _______,     _______,     _______,      RESET,
+                    _______,     _______,     _______,      QK_BOOT,
                     _______,     _______,     _______,      KC_KP_PLUS,
                     _______,     _______,     _______,      KC_KP_MINUS,
         KC_LOCK,    _______,     _______,     _______,      KC_EQL
diff --git a/keyboards/durgod/k3x0/keymaps/chimera/keymap.c b/keyboards/durgod/k3x0/keymaps/chimera/keymap.c
index 8053da351a..5fa0d5eb4c 100644
--- a/keyboards/durgod/k3x0/keymaps/chimera/keymap.c
+++ b/keyboards/durgod/k3x0/keymaps/chimera/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
    */
     [_WSL] = LAYOUT_all( /* Windows Second / System Layer */
-        RESET,            KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
+        QK_BOOT,          KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
@@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
    */
     [_MSL] = LAYOUT_all( /* Mac Second / System Layer */
-        RESET,            XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
+        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
@@ -358,7 +358,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 layer_state_set(1UL<<_WFL | 1UL<<_WSL);
             }
             break;
-        case RESET:
+        case QK_BOOT:
             if (record->event.pressed) {
                 // Flash LEDs to indicate bootloader mode is enabled.
                 on_all_leds();
diff --git a/keyboards/durgod/k3x0/keymaps/typhon/keymap.c b/keyboards/durgod/k3x0/keymaps/typhon/keymap.c
index afd38392c1..21daf5687a 100644
--- a/keyboards/durgod/k3x0/keymaps/typhon/keymap.c
+++ b/keyboards/durgod/k3x0/keymaps/typhon/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
    */
     [_WSL] = LAYOUT_all( /* Windows Second / System Layer */
-        RESET,            KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
+        QK_BOOT,          KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
@@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
    */
     [_MSL] = LAYOUT_all( /* Mac Second / System Layer */
-        RESET,            XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
+        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
@@ -358,7 +358,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 layer_state_set(1UL<<_WFL | 1UL<<_WSL);
             }
             break;
-        case RESET:
+        case QK_BOOT:
             if (record->event.pressed) {
                 // Flash LEDs to indicate bootloader mode is enabled.
                 on_all_leds();
diff --git a/keyboards/dz60/keymaps/60_plus_arrows/keymap.c b/keyboards/dz60/keymaps/60_plus_arrows/keymap.c
index f38cdb2853..4758c38a64 100644
--- a/keyboards/dz60/keymaps/60_plus_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/60_plus_arrows/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* FN Layer
  * ,-----------------------------------------------------------------------------------------.
- * | Esc | BL- | BL+ | BL  |     |     |     |RESET|     |     |     |     |     |           |
+ * | Esc | BL- | BL+ | BL  |     |     |     |QK_BOOT|     |     |     |     |     |           |
  * |-----------------------------------------------------------------------------------------+
  * |        |RBGM |     |     |     |     |     |     |     |     |     | Val+ | Val- |RBGTOG|
  * |-----------------------------------------------------------------------------------------+
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   LAYOUT_directional(
-      KC_ESC, BL_TOGG, BL_STEP, BL_DEC, BL_INC, ______, ______, RESET, ______, ______, ______, ______, ______, ______, ______,
+      KC_ESC, BL_TOGG, BL_STEP, BL_DEC, BL_INC, ______, ______, QK_BOOT, ______, ______, ______, ______, ______, ______, ______,
       ______, RGB_MOD, ______, ______, ______, ______, ______, ______, ______, ______, ______, RGB_VAI, RGB_VAD, RGB_TOG,
       ______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, ______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_RCTL, ______,
diff --git a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
index 4c6552675a..863a02e726 100644
--- a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_LEFT, KC_DOWN, KC_RIGHT),
diff --git a/keyboards/dz60/keymaps/LEdiodes/keymap.c b/keyboards/dz60/keymaps/LEdiodes/keymap.c
index 9fb859dfe1..f7467db390 100644
--- a/keyboards/dz60/keymaps/LEdiodes/keymap.c
+++ b/keyboards/dz60/keymaps/LEdiodes/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------'
  */
 [_L1] = LAYOUT(
-      RESET,   KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,  KC_F6,    KC_F7,    KC_F8,    KC_F9,     KC_F10,   KC_F11,   KC_F12,  KC_F13,   KC_F14,              \
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,  KC_F6,    KC_F7,    KC_F8,    KC_F9,     KC_F10,   KC_F11,   KC_F12,  KC_F13,   KC_F14,              \
       _______, KC_WH_U, KC_UP,   KC_WH_D,  _______, _______,_______,  _______,  _______,  _______,   KC_PSCR, _______,  _______,                      _______,   \
       _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_HOME, _______,  _______,  _______,   KC_HOME, _______,                        _______,   \
       _______,           _______,  KC_APP,  BL_STEP,_______,  KC_END,   KC_VOLD,  KC_VOLU,   KC_MUTE, _______,  _______,  _______, KC_PGUP,   _______,   \
diff --git a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c b/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
index 9a44730b14..763fed6d26 100644
--- a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
+++ b/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * 
      * This is the KEYB/System layer.
      * Other keymaps call this a NAV layer, but it's more than just NAV-ing the board's layers.
-     * This Layer currently handles RGB and puts the board into RESET for flashing.
+     * This Layer currently handles RGB and puts the board into QK_BOOT for flashing.
      *
      * ~ key resets board to [BASE].
      * 1 key toggles [NRMN].
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * BACKSPACE puts board into reset.
      */
     [KEYB] = LAYOUT_bonfire(
-        TO(BASE), TG(NRMN), TO(GAME), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, 
+        TO(BASE), TG(NRMN), TO(GAME), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, 
         XXXXXXX,  RGB_TOG,  RGB_MOD,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX,  BL_DEC,   BL_TOGG,  BL_INC,  BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
diff --git a/keyboards/dz60/keymaps/atlacat/keymap.c b/keyboards/dz60/keymaps/atlacat/keymap.c
index 606698b755..1141a002cb 100644
--- a/keyboards/dz60/keymaps/atlacat/keymap.c
+++ b/keyboards/dz60/keymaps/atlacat/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT(
         KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_SLEP,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET  ,
+        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
         _______,          RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,
         _______, _______, BL_DEC , BL_TOGG, BL_INC , BL_STEP, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,          _______,
         _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
diff --git a/keyboards/dz60/keymaps/billiams/keymap.c b/keyboards/dz60/keymaps/billiams/keymap.c
index b59040d772..b41e2d7508 100644
--- a/keyboards/dz60/keymaps/billiams/keymap.c
+++ b/keyboards/dz60/keymaps/billiams/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------------------------------------+
    * |         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
    * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|RESET|
+   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|QK_BOOT|
    * |-----------------------------------------------------------------------------------------+
    * |      |       |       |                                   |     |      | HOME|PG_DN| END |
    * `-----------------------------------------------------------------------------------------'
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, _______, KC_DEL,
       _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC__VOLDOWN, KC__VOLUP, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
-      KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, RESET,
+      KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
       _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
       ),
 };
diff --git a/keyboards/dz60/keymaps/billiams_layout2/keymap.c b/keyboards/dz60/keymaps/billiams_layout2/keymap.c
index 6f0ae55d14..0ca8916541 100644
--- a/keyboards/dz60/keymaps/billiams_layout2/keymap.c
+++ b/keyboards/dz60/keymaps/billiams_layout2/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------------------------------------+
    * |         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
    * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |     |     |     |RESET|
+   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |     |     |     |QK_BOOT|
    * |-----------------------------------------------------------------------------------------+
    * |      |       |       |                                   |      |       |       |       |
    * `-----------------------------------------------------------------------------------------'
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, KC__VOLDOWN, KC__VOLUP,
       _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, KC_MUTE, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, KC_MPLY,
-      _______,  _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, RESET,
+      _______,  _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, QK_BOOT,
       _______, _______, _______, _______, _______, _______, _______, _______
       ),
 };
diff --git a/keyboards/dz60/keymaps/billiams_layout4/keymap.c b/keyboards/dz60/keymaps/billiams_layout4/keymap.c
index b1c75d9036..cc62b0d62a 100644
--- a/keyboards/dz60/keymaps/billiams_layout4/keymap.c
+++ b/keyboards/dz60/keymaps/billiams_layout4/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------------------------------------+
    * |         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
    * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|RESET|
+   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|QK_BOOT|
    * |-----------------------------------------------------------------------------------------+
    * |      |       |       |                                   |     |      | HOME|PG_DN| END |
    * `-----------------------------------------------------------------------------------------'
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, _______, KC_DEL,
       _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC__VOLDOWN, KC__VOLUP, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
-      KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, RESET,
+      KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
       _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
       ),
 };
diff --git a/keyboards/dz60/keymaps/bingocaller/keymap.c b/keyboards/dz60/keymaps/bingocaller/keymap.c
index c19f673f76..787665af78 100644
--- a/keyboards/dz60/keymaps/bingocaller/keymap.c
+++ b/keyboards/dz60/keymaps/bingocaller/keymap.c
@@ -73,12 +73,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         * F1-12
         * Del on backspace
         * RGB (underglow) controls
-        * RESET firmware on backslash
+        * QK_BOOT firmware on backslash
         * Screen brightness: Z (decrease), X (increase)
     */
     [_FN] = LAYOUT(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_BRMD, KC_BRMU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/dz60/keymaps/boris_burger/keymap.c b/keyboards/dz60/keymaps/boris_burger/keymap.c
index 5dcadf34c1..af9ced3877 100644
--- a/keyboards/dz60/keymaps/boris_burger/keymap.c
+++ b/keyboards/dz60/keymaps/boris_burger/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |-----------------------------------------------------------------------------------------+
     * |         | BL T| BL M| BL+ | BL- |     |     |     |     |     |     |     |             |
     * |-----------------------------------------------------------------------------------------+
-    * |           |     |     |     |     |RESET|     |     |     |     |     |     | PgUp|     |
+    * |           |     |     |     |     |QK_BOOT|     |     |     |     |     |     | PgUp|     |
     * |-----------------------------------------------------------------------------------------+
     * |      |       |       |                                   |     |      | Home| PgDn| End |
     * `-----------------------------------------------------------------------------------------'
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_DEL ,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______,          BL_TOGG, BL_STEP, BL_INC , BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, RESET  , _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
+        _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______,          _______, _______,          _______,          _______,          _______, _______, KC_HOME, KC_PGDN, KC_END
         ),
 };
diff --git a/keyboards/dz60/keymaps/calbatr0ss/keymap.c b/keyboards/dz60/keymaps/calbatr0ss/keymap.c
index 89f4418b1d..7c4921a36c 100644
--- a/keyboards/dz60/keymaps/calbatr0ss/keymap.c
+++ b/keyboards/dz60/keymaps/calbatr0ss/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,          RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP,   KC_PGUP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT,  KC_END,  KC_TRNS, KC_TRNS,
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT,  KC_MPLY,          KC_TRNS, KC_TRNS,
-      RESET,   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS),
+      QK_BOOT, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS),
 
 /*  LAYER 3
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
diff --git a/keyboards/dz60/keymaps/chrisae9/keymap.c b/keyboards/dz60/keymaps/chrisae9/keymap.c
index 5893de6e63..fbf4ec2eb7 100644
--- a/keyboards/dz60/keymaps/chrisae9/keymap.c
+++ b/keyboards/dz60/keymaps/chrisae9/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_HOME, KC_PGDN, KC_END),
 
 	LAYOUT_directional(
-		KC_PWR, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_NO, KC_PSCR,
+		KC_PWR, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_NO, KC_PSCR,
 		KC_TRNS, KC_PGUP, KC_MS_U, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE,
 		KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY,
 		KC_TRNS, RGB_RMOD, RGB_MOD, KC_BTN3, KC_BTN4, KC_BTN5, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, RGB_TOG, RGB_SAI, KC_TRNS, 
diff --git a/keyboards/dz60/keymaps/coppertop/keymap.c b/keyboards/dz60/keymaps/coppertop/keymap.c
index 8586f920f9..e3895b28de 100644
--- a/keyboards/dz60/keymaps/coppertop/keymap.c
+++ b/keyboards/dz60/keymaps/coppertop/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------------.
  * |     |     |     |     |     |     |     |     |  /  |  *  |  -  |  =  |     |Trns |Trns |
  * |-----------------------------------------------------------------------------------------+
- * |        |     | Prev | Play| Next|     |     |  7  |  8  |  9  |  +  |     |     | RESET |
+ * |        |     | Prev | Play| Next|     |     |  7  |  8  |  9  |  +  |     |     | QK_BOOT |
  * |-----------------------------------------------------------------------------------------+
  * |         |     |Mute | VUp | VDn |     |     |  4  |  5  |  6  |  +  |     |    Trns     |
  * |-----------------------------------------------------------------------------------------+
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_MEDIA] = LAYOUT_directional(
 		XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXXX, _______, _______, 
-		XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX, RESET, 
+		XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX, QK_BOOT, 
 		_______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, XXXXXXX, _______, 
 		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX, 
 		_______, _______, _______, _______, _______, KC_P0,   KC_PDOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
index 4d2ca279c2..55cba1098b 100644
--- a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
+++ b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* FN2 Layer (Media)
    * ,-----------------------------------------------------------------------------------------.
-   * |     |     |     |     |     |     |     |     |     |     |     |     |     |   RESET   |
+   * |     |     |     |     |     |     |     |     |     |     |     |     |     |   QK_BOOT   |
    * |-----------------------------------------------------------------------------------------+
    * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |Mute | Vol- | Vol+ |      |
    * |-----------------------------------------------------------------------------------------+
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   LAYOUT_directional(
-      KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,  _______, _______, RESET,
+      KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,  _______, _______, QK_BOOT,
       _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_MUTE,       KC_VOLD,  KC_VOLU, _______,
       _______, _______, _______, DEBUG,   _______, _______, _______, _______, _______, _______, KC_SCROLLLOCK, KC_PAUSE, _______, 
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       KC_MPLY,  KC_VOLU, KC_MUTE,
diff --git a/keyboards/dz60/keymaps/crd_ansi/keymap.c b/keyboards/dz60/keymaps/crd_ansi/keymap.c
index 5d7b24d187..cc2864d700 100644
--- a/keyboards/dz60/keymaps/crd_ansi/keymap.c
+++ b/keyboards/dz60/keymaps/crd_ansi/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FL] = LAYOUT_60_ansi(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, RESET,
+		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                   _______,                            _______, _______, _______, _______
diff --git a/keyboards/dz60/keymaps/crd_tsangan/keymap.c b/keyboards/dz60/keymaps/crd_tsangan/keymap.c
index 320de07a17..7703a139c3 100644
--- a/keyboards/dz60/keymaps/crd_tsangan/keymap.c
+++ b/keyboards/dz60/keymaps/crd_tsangan/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGLT, KC_RADN, KC_RCRT
 	),
 	[_FL] = LAYOUT_60_tsangan_hhkb(
-		_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RESET,
+		_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT,
 		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, KC_DEL,
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/dz60/keymaps/danbee/keymap.c b/keyboards/dz60/keymaps/danbee/keymap.c
index 814be29298..b2ec2f72df 100644
--- a/keyboards/dz60/keymaps/danbee/keymap.c
+++ b/keyboards/dz60/keymaps/danbee/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_PWR,   KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_EJCT,
     _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, RGB_M_T, RGB_MOD, _______, _______, _______, _______, _______, _______,
     KC_CAPS, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_SW,RGB_M_G, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, _______, _______,
-    _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_K, _______, RESET  , _______, _______, _______, _______, _______, _______,
+    _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_K, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
   ),
 };
diff --git a/keyboards/dz60/keymaps/doogle999/keymap.c b/keyboards/dz60/keymaps/doogle999/keymap.c
index deea641f70..787fc8890c 100644
--- a/keyboards/dz60/keymaps/doogle999/keymap.c
+++ b/keyboards/dz60/keymaps/doogle999/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_directional(
       KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ______, KC_CALC,
-      RESET, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_VOLD, KC_VOLU, KC_MUTE,
+      QK_BOOT, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_VOLD, KC_VOLU, KC_MUTE,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, BL_DEC, BL_INC, BL_TOGG, KC_APP,
       KC_LSFT, ______, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_TOG, KC_RSFT, KC_PGUP, KC_INSERT,
       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, TO(2), ______, KC_HOME, KC_PGDOWN, KC_END
diff --git a/keyboards/dz60/keymaps/edulpn/keymap.c b/keyboards/dz60/keymaps/edulpn/keymap.c
index 74d7ca4f21..f9eef56733 100644
--- a/keyboards/dz60/keymaps/edulpn/keymap.c
+++ b/keyboards/dz60/keymaps/edulpn/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, 	KC_LGUI,	KC_LALT,											KC_SPC,													KC_RALT,    KC_RGUI, 	KC_RCTL
 	),
 	[1] = LAYOUT_60_tsangan_hhkb(
-		KC_ESC,		KC_F1,		KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_F11,		KC_F12,		KC_TRNS,	RESET,
+		KC_ESC,		KC_F1,		KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_F11,		KC_F12,		KC_TRNS,	QK_BOOT,
 		KC_TRNS,	RGB_TOG,	RGB_MOD,	RGB_HUI,	RGB_HUD,	RGB_SAI,	RGB_SAD,	RGB_VAI,	RGB_VAD,	KC_TRNS,	KC_TRNS,	KC_UP,		KC_TRNS,	KC_DEL,
 		KC_TRNS,	KC_MPLY,	KC_MPRV,	KC_MNXT,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_LEFT,	KC_RIGHT, 				KC_TRNS,
 		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_DOWN,				KC_TRNS,	KC_TRNS,
diff --git a/keyboards/dz60/keymaps/eric/keymap.c b/keyboards/dz60/keymaps/eric/keymap.c
index a384de480c..571dd25baf 100644
--- a/keyboards/dz60/keymaps/eric/keymap.c
+++ b/keyboards/dz60/keymaps/eric/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS),
 
 	LAYOUT(
-		RESET, KC_A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+		QK_BOOT, KC_A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/dz60/keymaps/f3d3/keymap.c b/keyboards/dz60/keymaps/f3d3/keymap.c
index 1e92aabc18..ac75f7487a 100644
--- a/keyboards/dz60/keymaps/f3d3/keymap.c
+++ b/keyboards/dz60/keymaps/f3d3/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * ,-----------------------------------------------------------------------------------------.
 * | PWR | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     | Del |
 * |-----------------------------------------------------------------------------------------+
-* |       |RGBT |RGBM |Hue+ |Hue- |Sat+ |Sat- |Val+ |Val- |     |     |     |     |  RESET  |
+* |       |RGBT |RGBM |Hue+ |Hue- |Sat+ |Sat- |Val+ |Val- |     |     |     |     |  QK_BOOT  |
 * |-----------------------------------------------------------------------------------------+
 * |         |     |     |     |     |     |     |     |     |     |     |     |             |
 * |-----------------------------------------------------------------------------------------+
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_all(
 		KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,  KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  RESET,
+		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/dz60/keymaps/frogger/keymap.c b/keyboards/dz60/keymaps/frogger/keymap.c
index 75e805cd91..f9f22e4ad4 100644
--- a/keyboards/dz60/keymaps/frogger/keymap.c
+++ b/keyboards/dz60/keymaps/frogger/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Layer 2
    * ,-----------------------------------------------------------------------------------------.
-   * | RESET |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  RESET  |
+   * | QK_BOOT |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  QK_BOOT  |
    * |-----------------------------------------------------------------------------------------+
    * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |      |      |
    * |-----------------------------------------------------------------------------------------+
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   LAYOUT_all(
-      RESET, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, ______, RESET,
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, ______, QK_BOOT,
 
       ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, ______,
 
diff --git a/keyboards/dz60/keymaps/gk64/keymap.c b/keyboards/dz60/keymaps/gk64/keymap.c
index 9de1ec11c5..0d732f3784 100644
--- a/keyboards/dz60/keymaps/gk64/keymap.c
+++ b/keyboards/dz60/keymaps/gk64/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/dz60/keymaps/hailbreno/keymap.c b/keyboards/dz60/keymaps/hailbreno/keymap.c
index 130927e126..813bf00035 100644
--- a/keyboards/dz60/keymaps/hailbreno/keymap.c
+++ b/keyboards/dz60/keymaps/hailbreno/keymap.c
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_all(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   RESET,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   QK_BOOT,
   _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
   _______, X,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/dz60/keymaps/iso_de_andys8/keymap.c b/keyboards/dz60/keymaps/iso_de_andys8/keymap.c
index 3039914c6f..dfd5e75b54 100644
--- a/keyboards/dz60/keymaps/iso_de_andys8/keymap.c
+++ b/keyboards/dz60/keymaps/iso_de_andys8/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   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,   RESET,   KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_PSCR, KC_NO,   KC_NO,
+    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/itsaferbie/keymap.c b/keyboards/dz60/keymaps/itsaferbie/keymap.c
index 51345a2bcd..500d7a6221 100644
--- a/keyboards/dz60/keymaps/itsaferbie/keymap.c
+++ b/keyboards/dz60/keymaps/itsaferbie/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_FN] = LAYOUT_60_hhkb(
 		______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_INS,  KC_DEL,
-		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS,  KC_UP,   ______,  RESET,
+		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS,  KC_UP,   ______,  QK_BOOT,
 		______,           KC_VOLD, KC_VOLU, KC_MUTE, ______,  ______,  KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT,  KC_RGHT, ______,
 		______,           KC_MPRV, KC_MPLY, KC_MNXT, ______,  ______,  KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,           ______,  ______,
 		         ______,           ______,                    ______,                                      ______,            ______),
diff --git a/keyboards/dz60/keymaps/jarred/keymap.c b/keyboards/dz60/keymaps/jarred/keymap.c
index 2ef6794934..32ad434f6f 100644
--- a/keyboards/dz60/keymaps/jarred/keymap.c
+++ b/keyboards/dz60/keymaps/jarred/keymap.c
@@ -17,5 +17,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,RGB_TOG,RGB_MOD,_______,KC_DEL ,KC_BSPC,_______,KC_HOME,KC_UP  ,KC_END ,KC_INS ,_______,_______,_______,
         _______,RGB_HUI,RGB_HUD,KC_LSFT,KC_LCTL,KC_ENT ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,KC_DEL ,        _______,
         _______,XXXXXXX,RGB_SAD,RGB_SAI,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,_______,XXXXXXX,
-        _______,RGB_VAD,RGB_VAI,        _______,_______,_______,                _______,_______,XXXXXXX,  RESET,_______)
+        _______,RGB_VAD,RGB_VAI,        _______,_______,_______,                _______,_______,XXXXXXX,  QK_BOOT,_______)
 };
diff --git a/keyboards/dz60/keymaps/jkbone/keymap.c b/keyboards/dz60/keymaps/jkbone/keymap.c
index 1efcbe38f4..e51625d0b4 100644
--- a/keyboards/dz60/keymaps/jkbone/keymap.c
+++ b/keyboards/dz60/keymaps/jkbone/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LGUI,     KC_LALT,     KC_LCTL,                      ____,                             ____,    ____,    ____,    ____,    ____
   ),
   [_FL] = LAYOUT_60_iso_5x1u(
-    RESET,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,     KC_DEL,
+    QK_BOOT,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,     KC_DEL,
     ____,        ____,   DF(_BL),   DF(_ML),    ____,    ____,    ____,    ____,    ____,    ____,    ____,     ____,     ____,
     ____,         ____,    ____,    ____,    ____,    ____,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,    ____,     ____,     ____,     ____,
     ____,       RGB_000,  RGB_WAN, RGB_OAZ, RGB_VAZ, ____,    ____,    ____, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,          ____,
diff --git a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c b/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
index 05ceb27e5e..f7daafbfce 100644
--- a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
+++ b/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* FN1 LAYER
  *
  *  ,---------------------------------------------------------------------------------------------------------------------
- * |  KC_GRV | F1   | F2   | F3   | F4    | F5    | F6    | F7   | F8    | F9   | F10   | F11   | F12   | INSERT | RESET |
+ * |  KC_GRV | F1   | F2   | F3   | F4    | F5    | F6    | F7   | F8    | F9   | F10   | F11   | F12   | INSERT | QK_BOOT |
  * |---------------------------------------------------------------------------------------------------------------------+
  * |  RGB_TOG |   _  |   _  |   _   |    _  |    _  |    _  |    _  |  PSCR  |  SLCK  |  PAUS  |  UP   |   _   |   CLR   |
  * |---------------------------------------------------------------------------------------------------------------------+
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------------------------------------------------------------------------------------------------'
  */
 	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,   RESET,
+		KC_GRV, KC_F1,   KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,    KC_INS,   QK_BOOT,
 		RGB_TOG,         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR, KC_SLCK, KC_PAUS,  KC_UP,     _______,   KC_CLR,
 		KC_CAPS,         KC_VOLD, KC_VOLU,   KC_MUTE,  _______,  _______,  KC_PAST,  KC_PSLS,  KC_HOME, KC_PGUP, KC_LEFT,  KC_RIGHT,  KC_RETURN,
 		_______,         _______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,  KC_PGDN, KC_DOWN,  _______,   _______,
diff --git a/keyboards/dz60/keymaps/kifinnsson/keymap.c b/keyboards/dz60/keymaps/kifinnsson/keymap.c
index 7d88b6dbb4..49067a2ab5 100644
--- a/keyboards/dz60/keymaps/kifinnsson/keymap.c
+++ b/keyboards/dz60/keymaps/kifinnsson/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 		_______, XXXXXXX, KC_TAB,  KC_LSFT, KC_LCTL, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_CAPS, XXXXXXX,
 		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,,
-		_______, _______, XXXXXXX, KC_ENT,  KC_ENT,  KC_ENT,  _______, _______, _______, _______, RESET),
+		_______, _______, XXXXXXX, KC_ENT,  KC_ENT,  KC_ENT,  _______, _______, _______, _______, QK_BOOT),
 
 	LAYOUT_all(
 		KI_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KI_BKSP,
diff --git a/keyboards/dz60/keymaps/krusli/keymap.c b/keyboards/dz60/keymaps/krusli/keymap.c
index 59162675dd..e31f9a9f30 100644
--- a/keyboards/dz60/keymaps/krusli/keymap.c
+++ b/keyboards/dz60/keymaps/krusli/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		KC_GRV,  KC_F1,   KC_F2, 	 KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS, KC_DEL,
-		KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  _______, RESET,
+		KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  _______, QK_BOOT,
 		_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
 		_______, KC_NO, 	_______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/dz60/keymaps/lint_kid/keymap.c b/keyboards/dz60/keymaps/lint_kid/keymap.c
index 5134836a26..b16c988b5f 100644
--- a/keyboards/dz60/keymaps/lint_kid/keymap.c
+++ b/keyboards/dz60/keymaps/lint_kid/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // layer 3 FN
   LAYOUT_directional(
-      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, _______, RESET,
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, _______, QK_BOOT,
       KC_TILD, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
       TG(1), BL_TOGG, BL_STEP, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/dz60/keymaps/macos_64/keymap.c b/keyboards/dz60/keymaps/macos_64/keymap.c
index fd19bfe14e..32626b0ce3 100644
--- a/keyboards/dz60/keymaps/macos_64/keymap.c
+++ b/keyboards/dz60/keymaps/macos_64/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* ,-----------------------------------------------------------------------------------------.
    * | ` ~ | BR- | BR+ |     |     |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |    Delete   |
    * |-----------------------------------------------------------------------------------------+
-   * |        |     |     |  Up |     |     |     |     |  0  |  1  |  2  |  3  |     |  RESET |
+   * |        |     |     |  Up |     |     |     |     |  0  |  1  |  2  |  3  |     |  QK_BOOT |
    * |-----------------------------------------------------------------------------------------+
    * |         |     | Left| Down|Right|     |     |     |     |  4  |  5  |  6  |             |
    * |-----------------------------------------------------------------------------------------+
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   LAYOUT_all(
     KC_GRV , KC_SCROLLLOCK, KC_PAUSE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, KC_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_TRNS, RESET,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_TRNS, QK_BOOT,
     KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS,
     KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/dz60/keymaps/macos_arrow/keymap.c b/keyboards/dz60/keymaps/macos_arrow/keymap.c
index 0675a7954a..89feb20045 100644
--- a/keyboards/dz60/keymaps/macos_arrow/keymap.c
+++ b/keyboards/dz60/keymaps/macos_arrow/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ML] = LAYOUT_all(
     KC_MEDIA_EJECT, BR_DOWN, BR_UP, BL_TOGG, RGB_TOG, _______, _______, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_INC, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, RGB_MODE_REVERSE, BL_DEC, RGB_MODE_FORWARD),
diff --git a/keyboards/dz60/keymaps/marianas/keymap.c b/keyboards/dz60/keymaps/marianas/keymap.c
index a0451b5435..01addc4fe9 100644
--- a/keyboards/dz60/keymaps/marianas/keymap.c
+++ b/keyboards/dz60/keymaps/marianas/keymap.c
@@ -46,5 +46,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_CAPSLOCK, KC_MPRV, KC_MPLY, KC_MNXT, LWIN(KC_R), ____, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_BRK, ____,
       ____, KC_VOLD, KC_MUTE, KC_VOLU, ____, ____, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, KC_DEL, ____,
       ____, RGB_HUI, RGB_SAI, RGB_SAD, ____,  ____, KC_END, QWRTY, GAME, NAVS, ____, ____,
-      ____, ____, ____, _________________, ____, KC_HYPR, KC_MEH, RESET)
+      ____, ____, ____, _________________, ____, KC_HYPR, KC_MEH, QK_BOOT)
 };
diff --git a/keyboards/dz60/keymaps/mechmerlin/keymap.c b/keyboards/dz60/keymaps/mechmerlin/keymap.c
index f7ad17fd8c..eaaee21d86 100644
--- a/keyboards/dz60/keymaps/mechmerlin/keymap.c
+++ b/keyboards/dz60/keymaps/mechmerlin/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END),
 
   [_CL] = LAYOUT_60_b_ansi(
-      RESET,   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, KC_TRNS,
+      QK_BOOT, RGB_M_P,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/dz60/keymaps/model42/keymap.c b/keyboards/dz60/keymaps/model42/keymap.c
index 66604c6afe..9c760f2f52 100644
--- a/keyboards/dz60/keymaps/model42/keymap.c
+++ b/keyboards/dz60/keymaps/model42/keymap.c
@@ -15,7 +15,7 @@ LAYOUT_directional(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,
 
 // layer 1
 LAYOUT_directional(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+       KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/dz60/keymaps/mpstewart/keymap.c b/keyboards/dz60/keymaps/mpstewart/keymap.c
index 6e8ccb1934..3a84f51830 100644
--- a/keyboards/dz60/keymaps/mpstewart/keymap.c
+++ b/keyboards/dz60/keymaps/mpstewart/keymap.c
@@ -54,12 +54,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤  ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
  * │ctrl│lalt│lgui│       S P A C E        │rgui│ralt│menu│ctrl│  │40  │41  │43  │46                      │4a  │4b  │4d  │4e  │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘  └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- * XXX = RESET (dfu mode)
+ * XXX = QK_BOOT (dfu mode)
 */
 	[_FN] = LAYOUT_60_ansi_split_bs_rshift(
  //    _0       _1       _2       _3       _4        _5       _6       _7       _8       _9       _A       _B       _C       _D         _E
 /*0_*/ KC_SLEP, KC_F1,   KC_F2  , KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,    KC_DEL,
-/*1_*/ KC_CAPS,          KC_BRID,  KC_BRIU,  KC_NO,    RESET,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_NO,     KC_NO,
+/*1_*/ KC_CAPS,          KC_BRID,  KC_BRIU,  KC_NO,    QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_NO,     KC_NO,
 /*2_*/ KC_NO,            KC_VOLD,  KC_VOLU,  KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_RGHT, KC_RETURN,
 /*3_*/ KC_LSPO,          KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_PGDN, KC_DOWN,          KC_RSPC,   KC_TRNS,
 /*4_*/ KC_LCTL, KC_LALT,          KC_LGUI,                    KC_SPC,                             KC_RGUI, KC_RALT,          KC_APP,    AG_TOGG
diff --git a/keyboards/dz60/keymaps/muralisc/keymap.c b/keyboards/dz60/keymaps/muralisc/keymap.c
index d6c7bb40cb..2cd9df89a5 100644
--- a/keyboards/dz60/keymaps/muralisc/keymap.c
+++ b/keyboards/dz60/keymaps/muralisc/keymap.c
@@ -58,14 +58,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_END , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_END , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_HOME, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS),
 
 	LAYOUT_60_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
diff --git a/keyboards/dz60/keymaps/muzfuz/keymap.c b/keyboards/dz60/keymaps/muzfuz/keymap.c
index 848569f61e..695f012fad 100644
--- a/keyboards/dz60/keymaps/muzfuz/keymap.c
+++ b/keyboards/dz60/keymaps/muzfuz/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-		_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET,
+		_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/dz60/keymaps/n0velty/keymap.c b/keyboards/dz60/keymaps/n0velty/keymap.c
index 1b9c73eb95..b66fc13398 100644
--- a/keyboards/dz60/keymaps/n0velty/keymap.c
+++ b/keyboards/dz60/keymaps/n0velty/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		     _______,          KC_MSEL,                   KC_MUTE,                                     _______,          _______),
 
 [_F2] = LAYOUT_true_hhkb( //function Layer 2
-	RESET,   RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, _______, _______, _______, _______, KC_SLEP, KC_PWR,  \
+	QK_BOOT, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, _______, _______, _______, _______, KC_SLEP, KC_PWR,  \
 	RGB_TOG,          RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_ACL2, KC_BTN1, KC_MS_U, KC_BTN2, _______, \
 	RGB_MOD,          RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_ACL1, KC_MS_L, KC_MS_R, _______,          \
 	BL_TOGG, XXXXXXX, BL_STEP, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, KC_ACL0, KC_MS_D,          _______, _______, \
diff --git a/keyboards/dz60/keymaps/niclake/keymap.c b/keyboards/dz60/keymaps/niclake/keymap.c
index 6191e18c0b..7c1b0b7d7c 100644
--- a/keyboards/dz60/keymaps/niclake/keymap.c
+++ b/keyboards/dz60/keymaps/niclake/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] = LAYOUT(
         XXXXXXX, RGB_ON,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, RGB_M_TW, RGB_M_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX,          RGB_TOG, RGB_MOD, RGB_HUI,  RGB_SAI, RGB_VAI,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+        XXXXXXX,          RGB_TOG, RGB_MOD, RGB_HUI,  RGB_SAI, RGB_VAI,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
         ADJUST,           MACWIN,  XXXXXXX, RGB_HUD, RGB_SAD,  RGB_VAD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
         XXXXXXX, XXXXXXX,          XXXXXXX,                   XXXXXXX,                              XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX
diff --git a/keyboards/dz60/keymaps/olivierko/keymap.c b/keyboards/dz60/keymaps/olivierko/keymap.c
index 38d12d4d4b..8d3d4eb3d2 100644
--- a/keyboards/dz60/keymaps/olivierko/keymap.c
+++ b/keyboards/dz60/keymaps/olivierko/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 											
 	[_CL] = LAYOUT_olivierko(								
 		RGB_TOG,	RGB_MOD,	RGB_HUI,	RGB_HUD,	RGB_SAI,	RGB_SAD,	RGB_VAI,	RGB_VAD,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,			KC_NO,
-		KC_NO,		KC_NO,		KC_NO,		KC_NO,		RESET,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
+		KC_NO,		KC_NO,		KC_NO,		KC_NO,		QK_BOOT,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
 		KC_NO,		KC_NO,		KC_NO,		DEBUG,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,	
 		KC_LSFT,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_RSFT,	
 		KC_NO,		KC_NO,		KC_NO,											KC_NO,											KC_NO,		KC_NO,		KC_NO,		KC_NO),
diff --git a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
index b5cc920b56..e71bac47de 100644
--- a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
+++ b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// 3 FN with RGB and macros
 	LAYOUT_60_iso_split_space_bs_rshift(
-		KC_GRV,  RGB_TOG,   		RGB_MOD,   		RGB_RMOD,   		RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD,  RGB_SAD, RGB_VAD, KC_F10,  KC_F11,  KC_F12,  KC_DEL,  RESET,
+		KC_GRV,  RGB_TOG,   		RGB_MOD,   		RGB_RMOD,   		RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD,  RGB_SAD, RGB_VAD, KC_F10,  KC_F11,  KC_F12,  KC_DEL,  QK_BOOT,
 		KC_NO,   KC_NO, 			EMOJI_DANCERS, 	KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   EMOJI_PERJANTAI,   EMOJI_THISISFINE,EMOJI_KOVAAAJOA,	KC_NO,   KC_NO,   KC_NO,   KC_LEFT,  KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_LSFT, KC_NO, 			KC_NO, 			KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_END,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT, KC_CAPS,
diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c
index 76fdedbbd6..6aede3f13f 100644
--- a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c
+++ b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// 3 FN with RGB and macros
 	LAYOUT_60_iso_5x1u_split_bs_rshift_spc(
-		KC_GRV,  RGB_TOG,   		RGB_MOD,   		RGB_RMOD,   		RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD,  RGB_SAD, RGB_VAD, KC_F10,  KC_F11,  KC_F12,  KC_DEL,  RESET,
+		KC_GRV,  RGB_TOG,   		RGB_MOD,   		RGB_RMOD,   		RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD,  RGB_SAD, RGB_VAD, KC_F10,  KC_F11,  KC_F12,  KC_DEL,  QK_BOOT,
 		KC_NO,   KC_NO, 			EMOJI_DANCERS, 	KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   EMOJI_PERJANTAI,   EMOJI_THISISFINE,EMOJI_KOVAAAJOA,	KC_NO,   KC_NO,   KC_NO,   KC_LEFT,  KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_LSFT, KC_NO, 			KC_NO, 			KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_END,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT, KC_CAPS,
diff --git a/keyboards/dz60/keymaps/ottodokto/keymap.c b/keyboards/dz60/keymaps/ottodokto/keymap.c
index 347c6a0497..bccf718de6 100644
--- a/keyboards/dz60/keymaps/ottodokto/keymap.c
+++ b/keyboards/dz60/keymaps/ottodokto/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL 
 	),
     [_func] = LAYOUT_60_tsangan_hhkb(
-		RGB_TOG, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RESET, \
+		RGB_TOG, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT, \
 		_______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, RGB_SPI, RGB_HUD, RGB_VAI, RGB_HUI, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, RGB_SPD, RGB_SAD, RGB_VAD, RGB_SAI, KC_BRID, KC_BRIU, _______, \
 		_______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VLK_TOG, _______, _______, _______, _______, \
diff --git a/keyboards/dz60/keymaps/pevecyan/keymap.c b/keyboards/dz60/keymaps/pevecyan/keymap.c
index 8ae4899ac8..bfde76b07b 100644
--- a/keyboards/dz60/keymaps/pevecyan/keymap.c
+++ b/keyboards/dz60/keymaps/pevecyan/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT( \
     KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_DEL,  \
-    _______,        RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,_______,RESET,   \
+    _______,        RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,_______,QK_BOOT, \
     _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,         \
     _______,_______,_______,_______,BL_DEC, BL_TOGG,BL_INC, BL_STEP,_______,_______,_______,_______,        _______,_______, \
     _______,_______,        _______,_______,        _______,        _______,        _______,_______,_______,_______,_______  \
diff --git a/keyboards/dz60/keymaps/pok3r/keymap.c b/keyboards/dz60/keymaps/pok3r/keymap.c
index 614cb0069c..bd627a9bbb 100644
--- a/keyboards/dz60/keymaps/pok3r/keymap.c
+++ b/keyboards/dz60/keymaps/pok3r/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-		_______, KC_MPRV, KC_MPLY, KC_MNXT, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+		_______, KC_MPRV, KC_MPLY, KC_MNXT, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
 		KC_CAPS, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_DEL, _______,
 		_______, KC_APP, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/dz60/keymaps/split_space_arrows/keymap.c b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
index 6dbfaa9375..361c5b60a4 100644
--- a/keyboards/dz60/keymaps/split_space_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Layer 4: RGB lighting controls and keyboard config, reset */
     LAYOUT_b_4_10(
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,            KC_NO,     TO(5),
-        KC_NO, KC_NO, KC_NO, KC_NO, RESET, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,            KC_NO,     RGB_HUD,
+        KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,            KC_NO,     RGB_HUD,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   RGB_MODE_PLAIN, RGB_MODE_FORWARD, KC_RSHIFT,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   RGB_TOG,        RGB_VAI,          RGB_HUI,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_SAD, RGB_VAD, RGB_SAI
diff --git a/keyboards/dz60/keymaps/spotpuff/keymap.c b/keyboards/dz60/keymaps/spotpuff/keymap.c
index edbe635e39..6a921b8307 100644
--- a/keyboards/dz60/keymaps/spotpuff/keymap.c
+++ b/keyboards/dz60/keymaps/spotpuff/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------------.
  * |     |     |     |     |     |     |NumLk|     |  /  |  *  |  -  |  =  |     |Trns |Trns |
  * |-----------------------------------------------------------------------------------------+
- * |        |     | Prev | Play| Next|     |     |  7  |  8  |  9  |  +  |     |     | RESET |
+ * |        |     | Prev | Play| Next|     |     |  7  |  8  |  9  |  +  |     |     | QK_BOOT |
  * |-----------------------------------------------------------------------------------------+
  * |  Trns   |     |Mute | VUp | VDn |     |     |  4  |  5  |  6  |  +  |     |    Trns     |
  * |-----------------------------------------------------------------------------------------+
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MEDIA] = LAYOUT_directional(
 		XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXXX, _______, _______,
-		XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX, RESET,
+		XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX, QK_BOOT,
 		_______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, XXXXXXX, _______,
 		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX,
 		_______, _______, _______, _______, _______, KC_P0,   KC_PDOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/dz60/keymaps/stephengrier/keymap.c b/keyboards/dz60/keymaps/stephengrier/keymap.c
index f6bbe78932..b55915463d 100644
--- a/keyboards/dz60/keymaps/stephengrier/keymap.c
+++ b/keyboards/dz60/keymaps/stephengrier/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,-----------------------------------------------------------------------------------------.
    * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
    * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |     | RESET |
+   * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |     | QK_BOOT |
    * |-----------------------------------------------------------------------------------------+
    * |         | BL T| BL M| BL+ | BL- |     |     |     |     |     |     |     |             |
    * |-----------------------------------------------------------------------------------------+
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_directional(
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
-      ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, RESET,
+      ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, QK_BOOT,
       ______, BL_TOGG, BL_STEP, BL_INC, BL_DEC, ______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______
diff --git a/keyboards/dz60/keymaps/tailcall/keymap.c b/keyboards/dz60/keymaps/tailcall/keymap.c
index 3835b1f646..cc71a604c7 100644
--- a/keyboards/dz60/keymaps/tailcall/keymap.c
+++ b/keyboards/dz60/keymaps/tailcall/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT(
         KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_SLEP,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET  ,
+        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, BL_DEC , BL_TOGG, BL_INC , BL_STEP, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
diff --git a/keyboards/dz60/keymaps/thomasviaud/keymap.c b/keyboards/dz60/keymaps/thomasviaud/keymap.c
index 02fdb5a4a0..44b106858f 100644
--- a/keyboards/dz60/keymaps/thomasviaud/keymap.c
+++ b/keyboards/dz60/keymaps/thomasviaud/keymap.c
@@ -14,5 +14,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,					 	_______, 	KC_UP, 		_______, 	_______, 	_______, 	_______, 	_______, 	_______, 	_______, 	_______,  _______, _______,	
 		_______, 						KC_LEFT, 	KC_DOWN, 	KC_RIGHT,	_______,	_______,	_______,	_______,	_______, 	_______,	_______,	_______, _______,		_______,
 		_______, 	_______,	RGB_TOG, 	RGB_MOD, 	RGB_HUI, 	RGB_HUD, 	RGB_SAI, 	RGB_SAD, 	RGB_VAI, 	RGB_VAD, 	_______, 	_______, 					 _______,
-		_______, 	_______,						_______, 											RESET, 																  _______, 	_______, 					 _______, 	_______),
+		_______, 	_______,						_______, 											QK_BOOT, 																  _______, 	_______, 					 _______, 	_______),
 };
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
index 6efb567133..e355499704 100644
--- a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
+++ b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* RGB lighting controls and keyboard config, reset */
   LAYOUT_b_4_10(
     _______,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      TG_L0_RGB,      XXXXXXX,          XXXXXXX,   TO(_None),
-    XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,        XXXXXXX,          XXXXXXX,   RGB_HUD,
+    XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,        XXXXXXX,          XXXXXXX,   RGB_HUD,
     EN_CTRL_SHORTCUTS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LAYER_RGB, RGB_MODE_PLAIN, RGB_MODE_FORWARD, KC_RSHIFT,
     XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MAKE, XXXXXXX, XXXXXXX,      RGB_TOG,        RGB_VAI,          RGB_HUI,
     XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_VAD,      RGB_SAI
diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index cb9697e107..f5df06ae73 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Setup layer - Reset an additional "b" button
 [L2] = LAYOUT_all(
-	RESET, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-	KC_B, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, RESET,
+	QK_BOOT, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+	KC_B, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, QK_BOOT,
 	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
diff --git a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
index 38e4519b33..8138eaa5bb 100644
--- a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Utility layer - RGB and multimedia control, reset and additional "b" button
 [L1] = LAYOUT_all(
-	RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____, ____,
-	KC_B, RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_R, ____, ____, KC_PSCR, ____, KC_PAUS, KC_BRID, KC_BRIU, ____, RESET,
+	QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____, ____,
+	KC_B, RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_R, ____, ____, KC_PSCR, ____, KC_PAUS, KC_BRID, KC_BRIU, ____, QK_BOOT,
 	____, RGB_HUI, RGB_HUD, KC_DEL, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
 	____, ____, RGB_SAI, RGB_SAD, ____, ____, ____, ____, ____, KC_END, KC_PGDN, KC_MPLY, ____, KC_MUTE, KC_MUTE,
 	____, RGB_VAI, RGB_VAD, ____, ____, ____, ____, KC_MPRV, KC_VOLU, KC_VOLD, KC_MNXT),
diff --git a/keyboards/dz60/keymaps/xtonhasvim/keymap.c b/keyboards/dz60/keymaps/xtonhasvim/keymap.c
index 49bc20b576..aa54698e78 100644
--- a/keyboards/dz60/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/dz60/keymaps/xtonhasvim/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_FUN] = LAYOUT(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-		_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET,
+		_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)),
diff --git a/keyboards/dz60/keymaps/zepol_layout/keymap.c b/keyboards/dz60/keymaps/zepol_layout/keymap.c
index 4caf83b67e..cd4ff8cc81 100644
--- a/keyboards/dz60/keymaps/zepol_layout/keymap.c
+++ b/keyboards/dz60/keymaps/zepol_layout/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	LAYOUT(
-		RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
index d88bc1092f..59f2df42c0 100644
--- a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_MEDIA] = LAYOUT(
         TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_POWER,
-        _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RGB] = LAYOUT(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EEP_RST,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
index cf067bdeb2..713251af85 100644
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
@@ -10,14 +10,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRAVE,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, _______, _______,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            KC_SPC,                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
index 84cc76b112..3a4aad1b6c 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --Layer 1--
   _____________________________________________________________________________________
  |[TO(2)]    [F1]-[F2]-[F3]-[F4]-[F5]-[F6]-[F7]-[F8]-[F9]-[F10]-[F11]-[F12]   [   ▼   ]|
- |[ ▼ ]        [~]-[▼]-[▼]-[▼]-[▼]-[▼]-[PS]-[▼]-[▼]-[▼]-[play/pause]-[▼]      [ RESET ]|
+ |[ ▼ ]        [~]-[▼]-[▼]-[▼]-[▼]-[▼]-[PS]-[▼]-[▼]-[▼]-[play/pause]-[▼]      [ QK_BOOT ]|
  |[    ▼    ]        [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[PU]-[▼]-[▼]               [  ▼  ]|
  |[ Shift ]            [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[PD]-[▼]           [vol↑]  [ ▼ ]|
  |[ctrl][ ▼ ][alt]    [_________________▼________________] [▼][ ▼ ][←prvs][vol↓][next→]|
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --Layer 2--
   _________________________________________________________________________________________________
  |[ ▼ ]                   [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]             [     ▼     ]| 
- |[ ▼ ]     [RGBTgg]-[▼]-[Hue+]-[Hue-]-[Sat+]-[Sat-]-[Brt+]-[Brt-]-[RGBmd]-[▼]-[▼]-[▼]    [ RESET ]| 
+ |[ ▼ ]     [RGBTgg]-[▼]-[Hue+]-[Hue-]-[Sat+]-[Sat-]-[Brt+]-[Brt-]-[RGBmd]-[▼]-[▼]-[▼]    [ QK_BOOT ]| 
  |[    ▼    ]              [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]                      [  ▼  ]| 
  |[   ▼   ]                  [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]                 [  ▼  ][  ▼  ]| 
  |[  ▼  ][ ▼ ][▼]             [_______________TO(0)________________] [▼][ ▼ ] [  ▼  ][  ▼  ][  ▼  ]| 
@@ -64,14 +64,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         TO(2),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, KC_GRV, _______, _______, _______, _______, _______, KC_PSCR, _______,  _______, _______, KC_MPLY, _______, RESET,
+        _______, KC_GRV, _______, _______, _______, _______, _______, KC_PSCR, _______,  _______, _______, KC_MPLY, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, KC_VOLU, KC_MUTE,
         KC_LCTL, _______, KC_LALT,                            TO(0),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            TO(0),                   _______, _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index 6af35cf779..3fe99fd61b 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                KC_RGUI,  MO(1)  , KC_LEFT,         KC_DOWN,           KC_RGHT),
 	[_LAYER1] = LAYOUT( /* FN */
 		TO(3),    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LGUI(LSFT(KC_5)),   KC_SLCK,  KC_PAUS,  _______,  _______,   RESET,
+		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LGUI(LSFT(KC_5)),   KC_SLCK,  KC_PAUS,  _______,  _______,   QK_BOOT,
 		_______,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_EJCT,  _______,  KC_ASTR,  KC_PSLS,  KC_HOME,  KC_PGUP,  _______,  _______,  _______,  _______,
 		_______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  MO(5),              KC_MPLY,            _______,
 		_______,  _______,  _______,                      TO(4),                        _______,  _______, KC_MPRV,   KC_MSTP,            KC_MFFD),
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,  MO(5)  , KC_LEFT,         KC_DOWN,           KC_RIGHT),
 	[_LAYER5] = LAYOUT( /* FN */
 		_______,  KC_BRID,  KC_BRIU, LCTL(KC_UP), LSFT(KC_F12),     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
-		_______,  _______,  KC_UP,    _______,  _______,  _______,  KC_CALC,  _______,  KC_INS,   _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,
+		_______,  _______,  KC_UP,    _______,  _______,  _______,  KC_CALC,  _______,  KC_INS,   _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT,
 		_______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,            _______,
 		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDOWN, KC_VOLU,           KC_MUTE,
 		_______,  _______,  _______,                      TO(0),                        _______,  _______,  KC_MPRV,  KC_VOLD,            KC_MNXT),
diff --git a/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c b/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
index 98802270a6..8ca92d1012 100644
--- a/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
@@ -27,14 +27,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_HOME, KC_END,  RESET,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_HOME, KC_END,  QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         RGB_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,  KC_DEL,
-        _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, RESET,
+        _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT,
         _______, RGB_SAD, RGB_HUD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, _______,
         _______, _______, _______,                            _______,                   _______, _______, RGB_SPI, RGB_VAD, RGB_SPD
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
index daef7b271d..eeffe66f40 100644
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                FNM,     KC_RALT,  KC_LEFT,    KC_DOWN,           KC_RIGHT),
 	[_FNM] = LAYOUT( /* FN */
 		KC_TRNS,  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,    KC_F6,    KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,
-		KC_TRNS,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI,  RGB_SAD,  RGB_VAI, RGB_VAD,  KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, RESET,
+		KC_TRNS,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI,  RGB_SAD,  RGB_VAI, RGB_VAD,  KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,
 		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, RGB_SPI,  RGB_SPD, KC_HOME, KC_PGUP,    EEP_RST,
 		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_END,  KC_PGDN, KC_VOLU,    KC_MUTE,
 		KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,                     KC_TRNS,  KC_TRNS, KC_MPRV, KC_VOLD,    KC_MNXT)
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
index 38c5959374..b6644ed14b 100644
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_RGB] = LAYOUT(
         _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_DEL,
-        _______, RGB_TOG,  _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______,  _______,  _______, RESET,
+        _______, RGB_TOG,  _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______,  _______,  _______, QK_BOOT,
         _______, _______,  _______, _______, _______, RGB_PCY, _______, _______, RGB_SPI, RGB_SPD, _______,  _______,           EEP_RST,
         _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  RGB_000, _______,
         _______, _______,  _______,                            RGB_RST,                   _______, _______,  KC_PWR,   AMDREC,  AMDREP
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
index 523fd05555..1de0d2632d 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
@@ -10,12 +10,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 							KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2,KC_DEL), 
 							KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 	[_LAYER1] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, 
+							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, 
 							 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST, 
 							 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
 	[_LAYER2] = LAYOUT(KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_DEL, 
-								KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_PSLS, KC_PAST, RESET, 
+								KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_PSLS, KC_PAST, QK_BOOT, 
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, EEP_RST, 
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, 
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
index 1d2144d7f4..e4387eacfd 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MOVE_LINUX] = LAYOUT_60_ansi(\
      KC_GRV,     VD_1,     VD_2,     VD_3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
-     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   RESET,    KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT, \
+     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   QK_BOOT,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT, \
      _______,    WM_LH,    WM_MAX,   WM_RH,    WD_FRWD,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______, \
      _______,    WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  WD_BACK,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   \
      _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG]     = LAYOUT_60_ansi(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
-     _______,   NK_ON,    NK_OFF,   EEP_RST,  RESET,     _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
      _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   \
      _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______)
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
index 63282e8b6a..2d1d971f78 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
@@ -106,12 +106,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * F1-12
      * Del on backspace
      * Lots of RGB controls
-     * RESET firmware on backslash
+     * QK_BOOT firmware on backslash
      * Screen brightness: Z (decrease), X (increase)
      */
     [_FN] = LAYOUT_60_ansi(
         _______, KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P,  RGB_M_B,  RGB_M_R, _______, _______, _______, RESET,
+        _______, RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P,  RGB_M_B,  RGB_M_R, _______, _______, _______, QK_BOOT,
         _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SW, RGB_M_SN, RGB_M_K, _______, _______,          _______,
         _______,          KC_BRID,  KC_BRIU, _______, _______, _______, _______,  RGB_M_X,  RGB_M_G, RGB_M_T, _______,          _______,
         _______, _______, _______,                             _______,                              _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
index 9bbf99128e..20eaed8247 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
@@ -26,14 +26,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
         _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
     ),
     [2] = LAYOUT_60_ansi(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [4] = LAYOUT_60_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
         _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
         _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            TO(0)  ,                            _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
index 5285821bf2..aae1173988 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
@@ -52,14 +52,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [1] = LAYOUT_60_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
         _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
         _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
     ),
     [2] = LAYOUT_60_ansi(
         _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
index c5cdfa2326..8fe1c06792 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [2] = LAYOUT_60_tsangan_hhkb(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
index f3d3cbf9a4..2dd25c170c 100644
--- a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
-        KC_TRNS,         RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_PGUP,
+        KC_TRNS,         RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
         LCTL_T(KC_CAPS), RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_PGDN,
         KC_LSFT,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_VOLU, KC_MUTE,
         KC_TRNS,         KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 817c0fd2ff..b85b582b39 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -223,7 +223,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_CONFIG] = LAYOUT_65_ansi(
         TO(_MAIN), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL2,
-        KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, DEBUG, EEP_RST, KC_NO, KC_ACL1,
+        KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, DEBUG, EEP_RST, KC_NO, KC_ACL1,
         KC_NO, UC_RMOD, UC_MOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL0,
         KC_NO, MAGIC_TOGGLE_NKRO, MAGIC_UNHOST_NKRO, MAGIC_HOST_NKRO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
diff --git a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c b/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
index 6afa734cd6..b0ab0165f4 100644
--- a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FNM]    = LAYOUT_65_ansi(
 		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   _______,  _______, KC_MUTE, KC_VOLU, \
-		_______, RGB_TOG,  RGB_MOD, RGB_HUI ,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,  _______,  _______,   RESET, KC_VOLD, \
+		_______, RGB_TOG,  RGB_MOD, RGB_HUI ,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,  _______,  _______,   QK_BOOT, KC_VOLD, \
 		_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,           AG_TOGG, _______, \
 		_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_BTN1,           KC_MS_U, _______, \
 		_______, _______,  _______,                   _______,                            _______, _______,  _______,  KC_MS_L, KC_MS_D, KC_MS_R  \
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c b/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
index b166a5629d..4980bad134 100644
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,        KC_LGUI, KC_LALT,                            XXXXXXX,                   MO(_KB), XXXXXXX, KC_RCTL, KC_MPRV, KC_MPLY, KC_MNXT
     ),
     [_KB] = LAYOUT_65_ansi(
-        XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX,
+        XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,
         XXXXXXX,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX,        XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, _BASEEF, _KITTEF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          EEP_RST, XXXXXXX,
         KC_LSFT,                 RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, XXXXXXX, XXXXXXX,
diff --git a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
index 277323987c..2e24c370f1 100644
--- a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FL] = LAYOUT_65_ansi(
         KC_ESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SLCK, KC_PAUS, RESET,   _______,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SLCK, KC_PAUS, QK_BOOT, _______,
         _______,        RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
         _______,        _______, _______,                            KC_MPLY,                   _______, _______, _______, KC_HOME, KC_VOLD, KC_END
diff --git a/keyboards/eco/keymaps/bcat/keymap.c b/keyboards/eco/keymaps/bcat/keymap.c
index 8c50a9ed55..e3345a677a 100644
--- a/keyboards/eco/keymaps/bcat/keymap.c
+++ b/keyboards/eco/keymaps/bcat/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/b18aafa0327d7e83eaf485546c067a21 */
     [LAYER_ADJUST] = LAYOUT(
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/eco/keymaps/that_canadian/keymap.c b/keyboards/eco/keymaps/that_canadian/keymap.c
index f9696c77e5..6561491b14 100644
--- a/keyboards/eco/keymaps/that_canadian/keymap.c
+++ b/keyboards/eco/keymaps/that_canadian/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT(
-    TSKMGR,  RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
+    TSKMGR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/eco/keymaps/xyverz/keymap.c b/keyboards/eco/keymaps/xyverz/keymap.c
index 06054e9ac8..0050b79847 100644
--- a/keyboards/eco/keymaps/xyverz/keymap.c
+++ b/keyboards/eco/keymaps/xyverz/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] = LAYOUT(
     KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,   KC_NO,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-    _______, RESET,   _______, _______, _______, _______, KC_NO,   KC_NO,   _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+    _______, QK_BOOT, _______, _______, _______, _______, KC_NO,   KC_NO,   _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
     _______, _______, _______, _______, _______, _______, KC_NO,   KC_NO,   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
diff --git a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
index a493c2288a..6bf375c47c 100644
--- a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
+++ b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_SET] = LAYOUT_ortho_4x16(
   _______, KC_CAPS, KC_SLCK, KC_NLCK, VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, RESET,   _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, QK_BOOT, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, _______, _______, _______, _______, 
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
diff --git a/keyboards/eek/keymaps/ledtest/keymap.c b/keyboards/eek/keymaps/ledtest/keymap.c
index 8b046223c7..3a6cc6f38c 100644
--- a/keyboards/eek/keymaps/ledtest/keymap.c
+++ b/keyboards/eek/keymaps/ledtest/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_split_3x5_3(
     RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  RGB_TOG,      _______,  KC_F9,  KC_F10, KC_F11, KC_F12,
     RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,      _______,  KC_F5,  KC_F6,  KC_F7,  KC_F8,
-    _______,   _______, _______,  _______,  _______,      RESET,    KC_F1,  KC_F2,  KC_F3,  KC_F4,
+    _______,   _______, _______,  _______,  _______,      QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,
                         _______,  _______,  _______,      _______,  _______,  _______
   ),
 };
diff --git a/keyboards/ein_60/keymaps/ledtest/keymap.c b/keyboards/ein_60/keymaps/ledtest/keymap.c
index 5fb5217c98..dc0c31d5de 100644
--- a/keyboards/ein_60/keymaps/ledtest/keymap.c
+++ b/keyboards/ein_60/keymaps/ledtest/keymap.c
@@ -88,14 +88,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------+------|            |------+------+------+------+------+------|
      * |      |      |      |      |      |      |            |      |      |      |      |      |BLSTEP|
      * |------+------+------|--------------------+  ,------.  +--------------------|------+------+------|
-     * |      |      |      |      |      |      |  |      |  |      |      |      |      |      | RESET|
+     * |      |      |      |      |      |      |  |      |  |      |      |      |      |      | QK_BOOT|
      * `-----------------------------------------'  `------'  `-----------------------------------------'
      */
     [_ADJUST] = LAYOUT(
      _______, _______, _______, _______, _______, _______, _______, RGBRST,  RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, _______,
      _______, _______, _______, _______, _______, _______,          _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
      _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, BL_STEP,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
     ),
     /* Function
      * ,-----------------------------------------.  ,------.  ,-----------------------------------------.
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
index ee8c321352..68ddeedc22 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_AMPR            ,KC_LPRN            ,KC_RPRN            ,CLN_EQ             ,KC_KP_PLUS         ,KC_PIPE            ,
     LALT(LSFT(KC_DOWN)),KC_EXLM            ,KC_TILD            ,KC_CIRC            ,ARROW              ,KC_BSLASH          ,KC_BSLASH          ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
-    RESET              ,KC_TRANSPARENT     ,
+    QK_BOOT              ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_SPACE
 ),
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index 93b82df8cf..48b2dec636 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -267,7 +267,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TRNS,MEH(KC_L), MEH(KC_M),MEH(KC_N), MEH(KC_O), MEH(KC_P),
            KC_TRNS,MEH(KC_Q), MEH(KC_R),MEH(KC_S), MEH(KC_T), MEH(KC_U), KC_TRNS,
                    // bottom row
-                   RESET,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                   QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                            // thumb cluster
                                            KC_TRNS,KC_TRNS,
                                                    KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
index 71cf1053aa..7b2076e05b 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
@@ -336,7 +336,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left thumb
                XXXXXXX, XXXXXXX,
                         XXXXXXX,
-        RESET, XXXXXXX, XXXXXXX,
+        QK_BOOT, XXXXXXX, XXXXXXX,
 
         // right hand
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
index ba578dd1c5..39f2d5fe5b 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
@@ -918,7 +918,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         /*=========================================================================================================*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/  KC_F14,  /**/  KC_F15,  /**/ _______,  /**/ _______,  /**/ _______,  /**/   RESET,  /**/
+        /**/ _______,  /**/  KC_F14,  /**/  KC_F15,  /**/ _______,  /**/ _______,  /**/ _______,  /**/   QK_BOOT,  /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
index 595f3b4ee1..a41a21072c 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = LAYOUT_ergodox(
        // left hand
        VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       RESET,  KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
+       QK_BOOT,  KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
        KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
        EPRM,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
           KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/rishka/keymap.c b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
index 0d6ac9fe95..c39c0c476b 100644
--- a/keyboards/ergodox_ez/keymaps/rishka/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
@@ -101,7 +101,7 @@ _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,
                                                _______, _______,
                                                         _______,
-                                      RESET, _______, _______,
+                                      QK_BOOT, _______, _______,
   // right hand
   _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
index c8ddc23a8b..13ae246e85 100644
--- a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MDIA] = LAYOUT_ergodox(
        // left hand
           VRSN,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
-         RESET,_______,KC_BTN1,KC_MS_U,KC_BTN2,_______,_______,
+         QK_BOOT,_______,KC_BTN1,KC_MS_U,KC_BTN2,_______,_______,
        _______,_______,KC_MS_L,KC_MS_D,KC_MS_R,_______,
        _______,_______,KC_ACL0,KC_ACL1,KC_ACL2,_______,_______,
         _______,_______,_______,_______,_______,
diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
index 19eecae03d..c03c6525af 100644
--- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  _______,    _______,  _______,   _______,  _______,    _______,
   _______,  _______,    _______,  _______,   _______,  _______,
   _______,  _______,    _______,  _______,   _______,  _______,    _______,
-  RESET,    _______,    _______,  _______,   _______,
+  QK_BOOT,  _______,    _______,  _______,   _______,
                                               _______,  _______,
                                               _______,
                                               _______,  _______,    _______,
diff --git a/keyboards/ergodox_ez/keymaps/steno/keymap.c b/keyboards/ergodox_ez/keymaps/steno/keymap.c
index 96218bbe99..0e5d7e3a22 100644
--- a/keyboards/ergodox_ez/keymaps/steno/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/steno/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 2: Media and mouse keys
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | RESET  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * | QK_BOOT  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
-       RESET,   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_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,
diff --git a/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c b/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
new file mode 100644
index 0000000000..c419f8893f
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
@@ -0,0 +1,98 @@
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+#define LOWER  MO(_LOWER)
+#define RAISE  MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_ergodox(
+        // left hand
+        _______, _______, _______, _______, _______, _______, _______,
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    LGUI(KC_LCTL),
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+        KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    LGUI(KC_LALT),
+        _______, _______, _______, _______, LOWER,
+                                                       KC_LGUI, _______,
+                                                                _______,
+                                         KC_ENT, RGUI(KC_RCTL), _______,
+        // right hand
+        _______,       _______, _______, _______, _______, _______, _______,
+        RGUI(KC_RCTL), KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+                       KC_H,    KC_J,    KC_K,    KC_L,    KC_RSFT, KC_RGUI,
+        RGUI(KC_RALT), KC_N,    KC_M,    KC_RCTL, KC_DOT,  KC_RALT, RGUI(KC_RSFT),
+                                RAISE,   _______, _______, _______, _______,
+             _______, KC_RGUI,
+             _______,
+             _______, KC_BSPC, KC_ENT
+    ),
+
+    [_LOWER] = LAYOUT_ergodox(
+        // left hand
+        _______, _______, _______, _______, _______, _______, _______,
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
+        _______, KC_LT,   KC_GT,   KC_LPRN, KC_RPRN, KC_GRV,
+        KC_LALT, _______, _______, _______, KC_EQL,  KC_QUES, _______,
+        _______, _______, _______, _______, _______,
+                                                       _______, _______,
+                                                                _______,
+                                               KC_NO,  KC_NO,   _______,
+        // right hand
+        _______, _______, _______, _______, _______, _______, _______,
+        KC_NO,   KC_CIRC, KC_AMPR, KC_ASTR, _______, _______, _______,
+                 KC_MINS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
+        KC_NO,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
+                          KC_RGUI, _______, _______, _______, _______,
+             _______, KC_NO,
+             _______,
+             _______, KC_NO, KC_NO
+    ),
+
+    [_RAISE] = LAYOUT_ergodox(
+        // left hand
+        _______, _______, _______, _______, _______, _______, _______,
+        KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,
+        KC_NO,   KC_COLN, KC_SCLN, KC_DQT,  KC_QUOT, KC_BSLS,
+        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, KC_LGUI,
+                                                       _______, _______,
+                                                                _______,
+                                               KC_NO,  KC_NO,   _______,
+        // right hand
+        _______, _______, _______, _______, _______, _______, KC_NO,
+        KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+                 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, KC_NO,
+        _______, ADJUST,  _______, _______, _______, _______, _______,
+                          _______, _______, _______, _______, _______,
+             _______, KC_NO,
+             _______,
+             _______, KC_NO, KC_NO
+    ),
+
+    [_ADJUST] = LAYOUT_ergodox(
+        // left hand
+        _______,  _______,     _______,   _______, _______, _______, _______,
+        _______,  _______,     _______,   _______, _______, _______,
+        _______,  _______,     _______,   _______, _______, _______, _______,
+        KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, QK_BOOT, _______,
+        _______, _______, _______, _______, KC_LGUI,
+                                                       _______, _______,
+                                                                _______,
+                                               KC_NO,  KC_NO,   _______,
+        // right hand
+        _______, _______, _______, _______, _______, _______,  _______,
+        KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    _______,
+                 KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   _______,
+        _______, _______, _______, _______, _______, KC_LANG1, KC_LANG2,
+                          _______, _______, _______, _______,  _______,
+             _______, KC_NO,
+             _______,
+             _______, KC_NO, KC_NO
+    )
+};
diff --git a/keyboards/ergotravel/keymaps/ian/keymap.c b/keyboards/ergotravel/keymaps/ian/keymap.c
index 0dbf3278ac..cd1e01043e 100644
--- a/keyboards/ergotravel/keymaps/ian/keymap.c
+++ b/keyboards/ergotravel/keymaps/ian/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
     //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      BASELYR,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, RESET ,
+      BASELYR,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, QK_BOOT ,
     //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
       XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
diff --git a/keyboards/ergotravel/keymaps/yanfali/keymap.c b/keyboards/ergotravel/keymaps/yanfali/keymap.c
index 399dc9998c..b2b62484a9 100644
--- a/keyboards/ergotravel/keymaps/yanfali/keymap.c
+++ b/keyboards/ergotravel/keymaps/yanfali/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_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, RESET,
+     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, QK_BOOT,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/eternal_keypad/keymaps/kyek/keymap.c b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
index 7a7e121508..1dd2f2f0b3 100644
--- a/keyboards/eternal_keypad/keymaps/kyek/keymap.c
+++ b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		         _______, _______, KC_UP, _______, _______, RGB_MODE_PLAIN, RGB_HUD, 
 		_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_MODE_BREATHE, RGB_VAI, 
 		_______, _______, _______, _______, _______, _______, RGB_MODE_SWIRL, RGB_VAD, 
-		RESET,   _______, _______, _______, _______, _______
+		QK_BOOT, _______, _______, _______, _______, _______
     ),
   /* Function Layer
    * ,-------------------------------------.
diff --git a/keyboards/eternal_keypad/keymaps/lefty/keymap.c b/keyboards/eternal_keypad/keymaps/lefty/keymap.c
index 2fa6e6f7e5..2b14774aeb 100644
--- a/keyboards/eternal_keypad/keymaps/lefty/keymap.c
+++ b/keyboards/eternal_keypad/keymaps/lefty/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		         _______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD, 
 		_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD, 
 		_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD, 
-		RESET,   _______, _______, _______, _______, _______
+		QK_BOOT, _______, _______, _______, _______, _______
     ),
   /* Function Layer
    * ,-------------------------------------.
diff --git a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
index ae72a3fd94..06203112c0 100644
--- a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL,		KC_LGUI,	KC_LALT,	TG(_L3),	KC_SPC, 				KC_SPC,					MO(_L2),	KC_RALT,	KC_APP,					KC_RCTRL),
  
 [_L2] = LAYOUT_split_space(
-  _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	RESET,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SLCK,	KC_PAUS,
+  _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	QK_BOOT,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SLCK,	KC_PAUS,
   KC_CAPS,		KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	_______,	KC_HOME,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_INS,					_______,
   _______,		_______,	_______,	_______,	_______,	_______,	_______,	BL_TOGG,	BL_DEC,		BL_INC,		_______,				_______,
   _______,		_______,	_______,	_______,	_______, 				_______,				_______,	_______,	_______,				_______),
@@ -46,5 +46,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,		_______,	_______,	   KC_7,	   KC_8,	   KC_9,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
   _______,		_______,	_______,	   KC_4,	   KC_5,	   KC_6,	_______,	_______,	_______,	_______,	_______,				_______,
   _______,		_______,	_______,	   KC_1,	   KC_2,	   KC_3,	_______,	_______,	_______,	_______,	_______,				_______,
-  _______,		_______,	_______,	   _______,    KC_0,	  KC_DOT, 	        	            _______,	_______,	_______,				RESET)
+  _______,		_______,	_______,	   _______,    KC_0,	  KC_DOT, 	        	            _______,	_______,	_______,				QK_BOOT)
 };
diff --git a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c b/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
index 2150f33e2b..cb1eb4cf45 100644
--- a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,   KC_F1,    KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,    KC_F7,    KC_F8,    KC_F9,     KC_F10,   KC_F11,   KC_F12,
   KC_1,     KC_2,     KC_3,       KC_4,       KC_5,       KC_6,       KC_7,     KC_8,     KC_9,     KC_0,      KC_MINS,            KC_EQL,
   _______,            LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______,  _______,  KC_QUOT,  KC_LBRC,   KC_RBRC,  KC_BSLS,  _______,
-  _______,  _______,  _______,    _______,                _______,              _______,            _______,   _______,  _______,  RESET),
+  _______,  _______,  _______,    _______,                _______,              _______,            _______,   _______,  _______,  QK_BOOT),
 
 [_RA] = LAYOUT_split_space(
   _______,  _______,  _______,    _______,    _______,    _______,    _______,  KC_PGUP,  KC_UP,    KC_PGDN,   _______,  _______,  _______,
diff --git a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c b/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
index 8204bc32b4..6ccf1ba9e8 100644
--- a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Safety layer for special functions
 	[_ADJUST] = LAYOUT_split_space(
-	  _______,		RESET,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
+	  _______,		QK_BOOT,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
 	  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,				_______,
 	  _______,					_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	DP_ON,
 	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
diff --git a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c b/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
index f9c7178f6a..091b0749a9 100644
--- a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
+++ b/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
    */ 
      [1] = LAYOUT_65_ansi_blocker(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
-                                  KC_BRIU, KC_TRNS, KC_TRNS, KC_END, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_EJCT, KC_TRNS,
+                                  KC_BRIU, KC_TRNS, KC_TRNS, KC_END, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_EJCT, KC_TRNS,
 							      KC_BRID, KC_TRNS, KC_SLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS,
 							      KC_VOLU, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_NLCK, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS,
 							      KC_VOLD, KC_MRWD, KC_MFFD, KC_MPLY, KC_MSTP, KC_NO, KC_MPRV, KC_NO, KC_MNXT
diff --git a/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c b/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
index 45c332a5d7..2fd6f56f8c 100644
--- a/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(1),    KC_PGDN,
     KC_LCTL, KC_LGUI,	KC_LALT,                                     KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT, KC_APP),
   [1] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,  _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,  _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,  _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          _______,  _______,
diff --git a/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c b/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
index b7eaa5d6c1..86528ebfaf 100644
--- a/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______,                   KC_SPC,                             _______, _______, _______,  _______, _______, _______),
   
 [_FL] = LAYOUT_all(
-  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  RESET,   KC_PSCR,
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  QK_BOOT, KC_PSCR,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_INS,
   _______, _______, _______, _______, _______, TG(_GA), _______, _______, _______, _______, _______, _______,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______, _______,
diff --git a/keyboards/evyd13/plain60/keymaps/audio/keymap.c b/keyboards/evyd13/plain60/keymaps/audio/keymap.c
index 91ac37501c..6512cb3645 100644
--- a/keyboards/evyd13/plain60/keymaps/audio/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/audio/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FN] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
   AU_TOG,  MU_TOG,  MU_MOD,                             CK_TOGG,                            _______, _______, _______, _______)
diff --git a/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c b/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c
index 2d736212f4..986f55e040 100644
--- a/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ______, ______, ______,                              ______                        , ______, KC_LEFT, KC_DOWN,        KC_RIGHT  ),
 
   [_LED] = LAYOUT(
-      ______, ______,  ______,  ______,  ______,  ______,  ______,  ______, ______, ______, ______, ______, ______,   ______, RESET,    \
+      ______, ______,  ______,  ______,  ______,  ______,  ______,  ______, ______, ______, ______, ______, ______,   ______, QK_BOOT,  \
       ______, RGB_TOG, RGB_MI,  RGB_MD,  RGB_ST,  ______,  ______,  ______, ______, ______, ______, ______, ______,           ______,   \
       ______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, ______,  ______,  ______, ______, ______, ______, ______, ______,           ______,   \
       ______, ______,  RGB_VAI, RGB_VAD, ______,  ______,  ______,  ______, ______, ______, ______, ______,           ______, ______,   \
diff --git a/keyboards/evyd13/plain60/keymaps/rgb/keymap.c b/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
index abfb5f6b15..fa6aaa7f99 100644
--- a/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FN] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
   RGB_TOG, RGB_MOD, _______,                            _______,                            _______, _______, _______, _______)
diff --git a/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c b/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
index a8ce0f180e..04dba9da75 100644
--- a/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______,                   KC_SPC,                             _______, _______, _______,  _______, _______, _______),
 
 [_FL] = LAYOUT_65_ansi(
-  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  RESET,   KC_PSCR,
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  QK_BOOT, KC_PSCR,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_INS,
   _______, _______, _______, _______, _______, TG(_GA), _______, _______, _______, _______, _______, _______,           _______, KC_HOME,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______,          _______, KC_END,
diff --git a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
index ceb9856061..4781f3d63f 100644
--- a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_LCTL,    KC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, KC_RAPC,                   KC_RCTRL \
    ),
 [_FUNC] = LAYOUT(
- RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, RESET, \
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT, \
  RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
 RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, \
           KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, \
diff --git a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
index 5c59d53a7d..231922a144 100644
--- a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_MPLY,          KC_LALT, _______,  _______,          _______,                   KC_RALT,                            XXXXXXX
    ),
 [_RGB] = LAYOUT(
- RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, RESET,
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
  RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 RGB_RMOD, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
           KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
diff --git a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c b/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
index 7669df535e..998b53c012 100644
--- a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_LCTL,          KC_LGUI, KC_NUBS, KC_LALT,           KC_SPC,                   KC_NUHS,                            KC_RCTRL
    ),
 [_FUNC] = LAYOUT(
- RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12, XXXXXXX, RESET,
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12, XXXXXXX, QK_BOOT,
  RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
 RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,   KC_UP,  XXXXXXX,
           RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX,
diff --git a/keyboards/exclusive/e65/keymaps/crd/keymap.c b/keyboards/exclusive/e65/keymaps/crd/keymap.c
index 38a1944ef9..18b0920667 100644
--- a/keyboards/exclusive/e65/keymaps/crd/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/crd/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FL] = LAYOUT_65_ansi_7u_wk_splitbs(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  _______,
-        _______, _______, _______, _______, RESET,   _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______,                   _______,                                     _______, _______, _______, _______),
diff --git a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c b/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
index f8617f3ef4..bc2c3d7a62 100644
--- a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FNM] = LAYOUT_65_ansi_7u_wk_splitbs(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, KC_DEL, KC_MPLY,
-    _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          RESET, KC_VOLU,
+    _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          QK_BOOT, KC_VOLU,
     AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        EEP_RST,          KC_VOLD,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 KC_BTN1, KC_MS_U, KC_MNXT,
     _______, _______, _______,                   _______,                                     _______,                 KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
index 898a294f7e..f39a3b056d 100644
--- a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LALT, KC_LGUI,                  _______,                             KC_LGUI, KC_RALT, _______, _______, _______),
 
     [_ADJUST] = LAYOUT_65_ansi_blocker_splitbs(
-        RESET,   LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
+        QK_BOOT, LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
         BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______,
diff --git a/keyboards/exclusive/e6_rgb/keymaps/60_hhkb/keymap.c b/keyboards/exclusive/e6_rgb/keymaps/60_hhkb/keymap.c
index a1d8e5c784..ccb6d85482 100644
--- a/keyboards/exclusive/e6_rgb/keymaps/60_hhkb/keymap.c
+++ b/keyboards/exclusive/e6_rgb/keymaps/60_hhkb/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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,  _______, _______,
-        RESET,   RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                  _______, _______,                            _______,                                     _______, _______
diff --git a/keyboards/exclusive/e6_rgb/keymaps/allleds/keymap.c b/keyboards/exclusive/e6_rgb/keymaps/allleds/keymap.c
index b0b06766bf..4c719e7481 100644
--- a/keyboards/exclusive/e6_rgb/keymaps/allleds/keymap.c
+++ b/keyboards/exclusive/e6_rgb/keymaps/allleds/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_tsangan_hhkb(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR,
-        RESET,   RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
+        QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                                     _______, TG(0),   _______
diff --git a/keyboards/exclusive/e6v2/le/keymaps/eric/keymap.c b/keyboards/exclusive/e6v2/le/keymaps/eric/keymap.c
index 4d3052ef2c..34a4f60a3e 100644
--- a/keyboards/exclusive/e6v2/le/keymaps/eric/keymap.c
+++ b/keyboards/exclusive/e6v2/le/keymaps/eric/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Reset layer */
   [2] = LAYOUT(
-      RESET,   KC_A,    KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+      QK_BOOT, KC_A,    KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO, 
       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
diff --git a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
index 691f0e73cd..bb2f2a030c 100644
--- a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
+++ b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------------.
  * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
  * |-----------------------------------------------------------------------------------------+
- * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     | RESET  |
+ * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     | QK_BOOT  |
  * |-----------------------------------------------------------------------------------------+
  * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             |
  * |-----------------------------------------------------------------------------------------+
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_CL] = LAYOUT_60_hhkb(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
-      _______, BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  _______, _______, _______, _______, _______,  _______, _______, _______, RESET,
+      _______, BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  _______, _______, _______, _______, _______,  _______, _______, _______, QK_BOOT,
       _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
       KC_CAPS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,  _______,          _______, _______,
                _______, _______,                        _______,                       _______,  _______
diff --git a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
index 7e64b1212e..274e7395f2 100644
--- a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
+++ b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [_HL] = LAYOUT_hhkb(
         RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON, BL_DEC, BL_INC,     LALT(KC_F4),
-        RESET,   RGB_HUI, RGB_SAI,  RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        QK_BOOT, RGB_HUI, RGB_SAI,  RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_HUD, RGB_SAD,  RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,
         KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
                  KC_MPRV, KC_MNXT,               KC_MPLY,                               KC_TRNS, KC_TRNS
diff --git a/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c b/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c
index 242020b20a..dbc9dd2063 100644
--- a/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                      KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
 	[1] = LAYOUT_75_ansi_splitbs(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
index 2793cffe93..08899cd6bf 100644
--- a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LALT, KC_LGUI,                  _______,                             KC_LGUI, KC_RALT, _______, _______, _______),
 
 	[_ADJUST] = LAYOUT_75_ansi_splitbs(
-		RESET,   LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
+		QK_BOOT, LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c b/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c
index ab863fcafd..d9641f56f7 100644
--- a/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c
+++ b/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LALT, KC_LGUI,                  KC_SPC,                      KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
 	[1] = LAYOUT(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		BL_TOGG, BL_DEC, BL_INC, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c b/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c
index c6778180be..fe17ab3292 100644
--- a/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c
+++ b/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_ansi_standard(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______, _______, _______,
         RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______,     _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,     _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
         BL_TOGG,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
         _______,     _______, _______,                            _______,                                 _______, _______,   _______, _______,        _______, _______, _______
diff --git a/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c b/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c
index c6778180be..fe17ab3292 100644
--- a/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c
+++ b/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_ansi_standard(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______, _______, _______,
         RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______,     _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,     _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
         BL_TOGG,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
         _______,     _______, _______,                            _______,                                 _______, _______,   _______, _______,        _______, _______, _______
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/1u/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/1u/keymap.c
index 056c36d32a..2dcd7f9a37 100644
--- a/keyboards/eyeohdesigns/babyv/keymaps/1u/keymap.c
+++ b/keyboards/eyeohdesigns/babyv/keymaps/1u/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FUNCTN] = LAYOUT_1u(
         KC_VOLU, KC_Q,    KC_PGUP, RGB_TOG,    BL_STEP,    KC_T,    KC_Y,    KC_U,       KC_UP,      RGB_MOD,  RGB_RMOD, KC_DEL,
-        KC_VOLD, KC_HOME, KC_PGDN, KC_D,       KC_U,       KC_MINS, KC_EQL,  KC_LEFT,    KC_DOWN,    KC_RIGHT, KC_QUOT,  RESET,
+        KC_VOLD, KC_HOME, KC_PGDN, KC_D,       KC_U,       KC_MINS, KC_EQL,  KC_LEFT,    KC_DOWN,    KC_RIGHT, KC_QUOT,  QK_BOOT,
         KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI,    RGB_SAD,    KC_LBRC, KC_RBRC, RGB_VAI,    RGB_VAD,    KC_DOT,   KC_BSLS,  KC_RSFT,
         KC_LCTL,                   KC_TRNS,    KC_TRNS,    KC_SPC,  KC_SPC,  KC_TRNS,    KC_TRNS,                        KC_TRNS
     ),
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/1u2u/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/1u2u/keymap.c
index c161c714b3..1dcfdc2b50 100644
--- a/keyboards/eyeohdesigns/babyv/keymaps/1u2u/keymap.c
+++ b/keyboards/eyeohdesigns/babyv/keymaps/1u2u/keymap.c
@@ -31,9 +31,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FUNCTN] = LAYOUT_1u_2u(
         KC_VOLU, KC_Q,    KC_PGUP, RGB_TOG, BL_STEP,    KC_T,       KC_Y,    KC_U,    KC_UP,      RGB_MOD,  RGB_RMOD, KC_DEL,
-        KC_VOLD, KC_HOME, KC_PGDN, KC_D,    KC_U,       KC_MINS,    KC_EQL,  KC_LEFT, KC_DOWN,    KC_RIGHT, KC_QUOT,  RESET,
+        KC_VOLD, KC_HOME, KC_PGDN, KC_D,    KC_U,       KC_MINS,    KC_EQL,  KC_LEFT, KC_DOWN,    KC_RIGHT, KC_QUOT,  QK_BOOT,
         KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,    KC_LBRC,    KC_RBRC, RGB_VAI, RGB_VAD,    KC_DOT,   KC_BSLS,  KC_RSFT,
-        KC_LGUI,                   KC_LALT, KC_TRNS,    KC_TRNS,        KC_SPC,       KC_TRNS,                        RESET
+        KC_LGUI,                   KC_LALT, KC_TRNS,    KC_TRNS,        KC_SPC,       KC_TRNS,                        QK_BOOT
     ),
     [_NUMBRS] = LAYOUT_1u_2u(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,      KC_F7,   KC_F8,   KC_F9,      KC_F10,   KC_F11,   KC_F12,
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/2u1u/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/2u1u/keymap.c
index 3c5de89d65..b0fd634dce 100644
--- a/keyboards/eyeohdesigns/babyv/keymaps/2u1u/keymap.c
+++ b/keyboards/eyeohdesigns/babyv/keymaps/2u1u/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FUNCTN] = LAYOUT_2u_1u(
         KC_VOLU, KC_Q,    KC_PGUP, RGB_TOG, BL_STEP, KC_T,    KC_Y,       KC_U,       KC_UP,   RGB_MOD,  RGB_RMOD, KC_DEL,
-        KC_VOLD, KC_HOME, KC_PGDN, KC_D,    KC_U,    KC_MINS, KC_EQL,     KC_LEFT,    KC_DOWN, KC_RIGHT, KC_QUOT,  RESET,
+        KC_VOLD, KC_HOME, KC_PGDN, KC_D,    KC_U,    KC_MINS, KC_EQL,     KC_LEFT,    KC_DOWN, KC_RIGHT, KC_QUOT,  QK_BOOT,
         KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LBRC, KC_RBRC,    RGB_VAI,    RGB_VAD, KC_DOT,   KC_BSLS,  KC_RSFT,
         KC_LCTL,                   KC_TRNS,     KC_SPC,       KC_TRNS,    KC_TRNS,    KC_LGUI,                     KC_TRNS
     ),
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
index ea62241e9d..909c40ba5a 100644
--- a/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
+++ b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER2] = LAYOUT_2u(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-        KC_VOLD, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,  XXXXXXX, 
+        KC_VOLD, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,  XXXXXXX, 
         _______,                   KC_NLCK, XXXXXXX,                   XXXXXXX, XXXXXXX,                   XXXXXXX
     ),
 };
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
index 06f9af8811..2028e09daa 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_acs(/* Base */
-        RESET, 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,
+        QK_BOOT, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,   KC_DEL,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
            _______,         _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,        KC_PGUP,
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
index 0ceebfd3ce..37388cb15e 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_ad5(/* Base */
-        RESET, 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,
+        QK_BOOT, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,   KC_DEL,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
         _______, _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
index 614236bddc..9038281e3f 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_ads(/* Base */
-        RESET, 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,
+        QK_BOOT, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,   KC_DEL,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
         _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
index 0de227f085..bb0c60eb21 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_bc5(/* Base */
-        RESET, 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, _______, _______,
+        QK_BOOT, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12, _______, _______,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
            KC_LSFT,       _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,             KC_PGUP,
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
index bfb3bc5938..c6c878702e 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_bcs(/* Base */
-        RESET, 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, _______, _______,
+        QK_BOOT, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12, _______, _______,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
            KC_LSFT,       _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,             KC_PGUP,
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
index 022b62e932..ab2a313420 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_bd5(/* Base */
-        RESET, 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, _______, _______,
+        QK_BOOT, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12, _______, _______,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
         _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
index 7755bab5a8..ec7550b262 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_bds(/* Base */
-        RESET, 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, _______, _______,
+        QK_BOOT, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12, _______, _______,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
         _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c
index 38d4bbfb47..8956c71854 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_ortho2(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
         KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c
index d4dbd5aa92..21db5952d7 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_ortho3(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
         KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c
index 2c9f792e51..d24547f720 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_ortho4(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
         KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c
index 09fc9e5fac..fe3b7e6baa 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_ortho5(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
         KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
index f0a19ce659..6f08ef45d3 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_stagger1(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
         KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
index 189e584371..db24f6798b 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_stagger2(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
         KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
index da25899479..cc2071e72c 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_stagger3(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
         KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
index 2a4910965c..aef725fcd4 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_stagger4(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
         KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
index 367cf1ccb5..26e6865832 100644
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ),
 
     [_FUNCTN] = LAYOUT_stagger5(
-        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
         KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
         KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
         KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
diff --git a/keyboards/fc660c/keymaps/siroleo/keymap.c b/keyboards/fc660c/keymaps/siroleo/keymap.c
index 3711336713..82b7f7b473 100644
--- a/keyboards/fc660c/keymaps/siroleo/keymap.c
+++ b/keyboards/fc660c/keymaps/siroleo/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FNM] = LAYOUT(
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_MUTE,     KC_VOLU,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,  RESET,     KC_VOLD,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,  QK_BOOT,   KC_VOLD,
         _______,_______,_______, QWERTY,COLEMAK,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,KC_BTN1,     KC_MS_U,
         _______,_______,_______,                _______,               _______,_______,_______,       KC_MS_L,KC_MS_D,KC_MS_R
diff --git a/keyboards/fc660c/keymaps/via_rgb/keymap.c b/keyboards/fc660c/keymaps/via_rgb/keymap.c
index f9d95b332d..50bf58ffcb 100644
--- a/keyboards/fc660c/keymaps/via_rgb/keymap.c
+++ b/keyboards/fc660c/keymaps/via_rgb/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,_______,_______,                _______,                _______,MO(2),  _______,     KC_HOME,KC_PGDN,KC_END
     ),
   [2] = LAYOUT(
-        RESET,  EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,
+        QK_BOOT,  EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_MOD,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_VAI,
diff --git a/keyboards/ferris/keymaps/madhatter/keymap.c b/keyboards/ferris/keymaps/madhatter/keymap.c
index 5a3f416e74..1bdc8604f2 100644
--- a/keyboards/ferris/keymaps/madhatter/keymap.c
+++ b/keyboards/ferris/keymaps/madhatter/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_RAISE] = LAYOUT( /* [> RAISE <] */
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
     KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, RESET,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, QK_BOOT,
                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   )
 };
diff --git a/keyboards/ferris/keymaps/pierrec83/keymap.json b/keyboards/ferris/keymaps/pierrec83/keymap.json
index f42259be90..2cbc47d912 100644
--- a/keyboards/ferris/keymaps/pierrec83/keymap.json
+++ b/keyboards/ferris/keymaps/pierrec83/keymap.json
@@ -108,7 +108,7 @@
          "DF(1)"                  , "KC_LGUI"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
 
          "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-         "DF(0)"                  , "KC_TRNS"              , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)"       , "RESET",
+         "DF(0)"                  , "KC_TRNS"              , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)"       , "QK_BOOT",
 
          "KC_TRNS"                , "KC_TAB",
          "KC_NO"                  , "KC_TRNS"
diff --git a/keyboards/fleuron/keymaps/dollartacos/keymap.c b/keyboards/fleuron/keymaps/dollartacos/keymap.c
index f8535fdc78..445204f8b9 100644
--- a/keyboards/fleuron/keymaps/dollartacos/keymap.c
+++ b/keyboards/fleuron/keymaps/dollartacos/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_fleuron_grid(
   /* Lower
    * ,---------------------------------------------------------------------------------------------------------------.
-   * |RESET |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * |QK_BOOT |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |RGBtog|      |      |      |      |      |      |      |      | Home | PgUp | PgDn | End  |      |      |      |
    * `---------------------------------------------------------------------------------------------------------------'
    */
-  RESET,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
+  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_UNDS,  KC_PLUS,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
diff --git a/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c b/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
index 8f6adffa2e..f99bd7461b 100644
--- a/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
+++ b/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Some macros, Keyboard-reset, mouse and audio.
  */
 [3] = LAYOUT(
-  _______,_______,EMAIL_W,EMAIL,  _______,_______,_______,_______,_______,_______,_______,RESET,
+  _______,_______,EMAIL_W,EMAIL,  _______,_______,_______,_______,_______,_______,_______,QK_BOOT,
   _______,_______,_______,_______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,
   _______,_______,_______,_______,_______,_______,KC_BTN1,KC_MUTE,KC_VOLD,KC_VOLU,KC_BRID,KC_BRIU,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
diff --git a/keyboards/foostan/cornelius/keymaps/hvp/keymap.c b/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
index bac74edbce..c740017540 100644
--- a/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
+++ b/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
@@ -54,13 +54,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), KC_7, KC_8, KC_9, KC_BSPC,
      _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_4, KC_5, KC_6, KC_0,
      _______, _______, _______, _______, _______, _______, XXXXXXX, KC_0, KC_1, KC_2, KC_3, _______,
-     RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+     QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
 
 [5] = LAYOUT(
      _______,  G(S(KC_1)), G(S(KC_2)), G(S(KC_3)), G(S(KC_4)), G(S(KC_5)), G(S(KC_6)), G(S(KC_7)), G(S(KC_8)), G(S(KC_9)), G(S(KC_0)), _______,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
      KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS,
-     RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK
+     QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK
   ),
 };
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
index 117edf3524..4f5a60d91c 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 	[_FL] = LAYOUT_60_tsangan_hhkb(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-    _______, _______, _______, EEP_RST, RESET,   _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+    _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
     _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
     _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
     _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/foxlab/leaf60/universal/keymaps/jarred/keymap.c b/keyboards/foxlab/leaf60/universal/keymaps/jarred/keymap.c
index 5590ff8416..63374f401f 100644
--- a/keyboards/foxlab/leaf60/universal/keymaps/jarred/keymap.c
+++ b/keyboards/foxlab/leaf60/universal/keymaps/jarred/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, KC_DEL , KC_BSPC, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______, _______,          _______,
     _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_DEL ,                   _______,
     _______         , _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______,          _______, _______,
-                      _______, _______,                            ALT_TAB                           , _______, RESET                     
+                      _______, _______,                            ALT_TAB                           , _______, QK_BOOT                     
   ),
 
 };
diff --git a/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c b/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c
index 158bdde89c..0aa1dc6376 100644
--- a/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c
+++ b/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______, _______, KC_SPC,  _______, _______, _______, _______, _______),
 
 	[_UTIL] = LAYOUT_all(
-		RESET,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+		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, _______, _______,
 		TG_GAME, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, _______, _______,
 		_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/free_willy/keymaps/colemak/keymap.c b/keyboards/free_willy/keymaps/colemak/keymap.c
index 9d666e1bf0..5be593ad50 100644
--- a/keyboards/free_willy/keymaps/colemak/keymap.c
+++ b/keyboards/free_willy/keymaps/colemak/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT(
-    RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_NO,  KC_NO,    KC_NO,  KC_NO,  KC_NO,
+    QK_BOOT,  KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_NO,  KC_NO,    KC_NO,  KC_NO,  KC_NO,
     KC_LEFT,  KC_DOWN,  KC_UP,  KC_RGHT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,
     KC_NO,  KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_NO,   KC_NO,  KC_NO,
                    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
diff --git a/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
index d237438da3..83d7c07da2 100644
--- a/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
+++ b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
@@ -39,5 +39,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[5] = LAYOUT(
 		KC_TRNS, KC_TRNS,
-		RESET, TO(4))
+		QK_BOOT, TO(4))
 };
diff --git a/keyboards/ft/mars65/keymaps/default/keymap.c b/keyboards/ft/mars65/keymaps/default/keymap.c
index fd8ad0134e..c3fbf9cc3f 100644
--- a/keyboards/ft/mars65/keymaps/default/keymap.c
+++ b/keyboards/ft/mars65/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [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,  _______, RESET,   
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, QK_BOOT, 
         BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, 
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, 
diff --git a/keyboards/ft/mars65/keymaps/via/keymap.c b/keyboards/ft/mars65/keymaps/via/keymap.c
index fd8ad0134e..c3fbf9cc3f 100644
--- a/keyboards/ft/mars65/keymaps/via/keymap.c
+++ b/keyboards/ft/mars65/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [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,  _______, RESET,   
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, QK_BOOT, 
         BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, 
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, 
diff --git a/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c b/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
index bbda86c0c1..bc5dc1136a 100644
--- a/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
+++ b/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,  KC_BSPC         
 ),
 [1] = LAYOUT_all(
-    RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c b/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
index bbda86c0c1..bc5dc1136a 100644
--- a/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
+++ b/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,  KC_BSPC         
 ),
 [1] = LAYOUT_all(
-    RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
index 2e24e07990..1a259ce3ed 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_RCTL,  KC_BSPC         
 ),
 [1] = LAYOUT_all(
-    RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
index 2e24e07990..1a259ce3ed 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_RCTL,  KC_BSPC         
 ),
 [1] = LAYOUT_all(
-    RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/gh60/revc/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
index 98ca935053..daa8a290bc 100644
--- a/keyboards/gh60/revc/keymaps/bluezio/keymap.c
+++ b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        and caps lock where it used to be */
     LAYOUT_BZIO(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,     KC_F4,      KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, \
-        KC_TRNS,          KC_PGUP, KC_UP,   KC_PGDOWN, KC_INSERT,  KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   \
+        KC_TRNS,          KC_PGUP, KC_UP,   KC_PGDOWN, KC_INSERT,  KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
         KC_TRNS,          KC_LEFT, KC_DOWN, KC_RGHT,   KC_DELETE,  KC_MS_BTN1, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, \
         KC_TRNS, KC_TRNS, KC_HOME, KC_SPC,  KC_END,    KC_PSCREEN, KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, \
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/gh60/revc/keymaps/chaser/keymap.c b/keyboards/gh60/revc/keymaps/chaser/keymap.c
index 29228eec2d..5fca630a7c 100644
--- a/keyboards/gh60/revc/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/revc/keymaps/chaser/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Layer 1: Functions */
   [_FL] = LAYOUT_60_ansi_split_rshift(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  \
-    KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_INS,  _______, RESET,   _______, _______, KC_PSCR, \
+    KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_INS,  _______, QK_BOOT, _______, _______, KC_PSCR, \
     KC_CAPS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______,          KC_TILD, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, \
     _______, _______, _______,                   _______,                                     KC_RCTL, KC_HOME, KC_PGDN, KC_END   \
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
index 2b1a417fb5..0226624094 100644
--- a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
+++ b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_CAPS  , KC_VOLD , KC_MUTE , KC_VOLU , DYN_REC_START1 , DYN_MACRO_PLAY1 , DYN_REC_STOP , KC_PGUP  , KC_HOME , ______   , KC_PSCR , KC_UP   , ______       , KC_DEL , \
       KC_LCTL  , KC_END  , ______  , KC_PGDN , ______         , ______          , KC_LEFT      , KC_DOWN  , KC_UP   , KC_RIGHT , KC_LEFT , KC_RGHT , KC_ENT       , \
       KC_LSFT  , KC_MPRV , KC_MPLY , KC_MNXT , BL_DEC         , BL_TOGG         , BL_INC       , ______   , ______  , ______   , KC_DOWN , KC_RSFT , TO(_DEFAULT) , \
-      ______   , ______  , KC_LALT , KC_SPC  , KC_RALT        , RESET           , ______       , ______ \
+      ______   , ______  , KC_LALT , KC_SPC  , KC_RALT        , QK_BOOT           , ______       , ______ \
       ),
 
 /* VIM Layer
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       XXXXXX       , XXXXXX  , KC_NEXT_WORD , KC_NEXT_WORD , XXXXXX  , XXXXXX       , XXXXXX  , XXXXXX   , I_MACRO , O_MACRO  , XXXXXX , XXXXXX  , XXXXXX       , KC_DEL  , \
       XXXXXX       , A_MACRO , XXXXXX       , KC_PGDN      , XXXXXX  , XXXXXX       , KC_LEFT , KC_DOWN  , KC_UP   , KC_RIGHT , XXXXXX , XXXXXX  , KC_ENTER     , \
       XXXXXX       , XXXXXX  , XXXXXX       , XXXXXX       , XXXXXX  , KC_PREV_WORD , XXXXXX  , XXXXXX   , XXXXXX  , XXXXXX   , XXXXXX , KC_RSFT , TO(_DEFAULT) , \
-      XXXXXX       , XXXXXX  , KC_LALT      , KC_SPC       , KC_RALT , RESET        , XXXXXX  , XXXXXX \
+      XXXXXX       , XXXXXX  , KC_LALT      , KC_SPC       , KC_RALT , QK_BOOT        , XXXXXX  , XXXXXX \
       ),
 
 /* FN Layer
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       XXXXXX       , XXXXXX  , KC_NEXT_WORD , KC_NEXT_WORD , XXXXXX  , XXXXXX       , XXXXXX  , XXXXXX   , I_MACRO , O_MACRO  , XXXXXX , XXXXXX  , XXXXXX       , KC_DEL  , \
       XXXXXX       , A_MACRO , XXXXXX       , KC_PGDN      , XXXXXX  , XXXXXX       , KC_LEFT , KC_DOWN  , KC_UP   , KC_RIGHT , XXXXXX , XXXXXX  , KC_ENTER     , \
       XXXXXX       , XXXXXX  , XXXXXX       , XXXXXX       , XXXXXX  , KC_PREV_WORD , XXXXXX  , XXXXXX   , XXXXXX  , XXXXXX   , XXXXXX , KC_RSFT , TO(_DEFAULT) , \
-      XXXXXX       , XXXXXX  , KC_LALT      , KC_SPC       , KC_RALT , RESET        , XXXXXX  , XXXXXX \
+      XXXXXX       , XXXXXX  , KC_LALT      , KC_SPC       , KC_RALT , QK_BOOT        , XXXXXX  , XXXXXX \
       )            ,
 };
 
diff --git a/keyboards/gh60/satan/keymaps/bri/keymap.c b/keyboards/gh60/satan/keymaps/bri/keymap.c
index 2f742411d6..fd9bb7e672 100644
--- a/keyboards/gh60/satan/keymaps/bri/keymap.c
+++ b/keyboards/gh60/satan/keymaps/bri/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------|
    * |        | F1|F2 | F3|F4 | F5| F6| F7| F8|   |   |          |
    * |-----------------------------------------------------------|
-   * |RESET|    |    |                       |    |    |    |    |
+   * |QK_BOOT|    |    |                       |    |    |    |    |
    * `-----------------------------------------------------------'
    */
 [_FL] = LAYOUT_60_ansi(
@@ -48,13 +48,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______, \
   _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______, \
-  RESET  ,_______,_______,                 _______,                       _______,_______,_______, _______),
+  QK_BOOT,_______,_______,                 _______,                       _______,_______,_______, _______),
   #else
   KC_GRV, KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,_______,  \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC, BL_INC,BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  RESET  ,_______,_______,                _______,                        _______,_______,_______,_______),
+  QK_BOOT,_______,_______,                _______,                        _______,_______,_______,_______),
   #endif
     
 [_NAV] = LAYOUT_60_ansi(
diff --git a/keyboards/gh60/satan/keymaps/chaser/keymap.c b/keyboards/gh60/satan/keymaps/chaser/keymap.c
index 4427f793e8..41bc3c8cbf 100644
--- a/keyboards/gh60/satan/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/satan/keymaps/chaser/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_all(
     KC_GRV      , KC_F1     ,KC_F2      ,KC_F3      ,KC_F4        ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12     ,KC_DEL     ,_______,  \
-    KC_MS_BTN3  ,KC_MS_BTN2 ,KC_MS_UP   ,KC_MS_BTN1 ,KC_MS_WH_UP  ,_______,_______,_______,KC_INS ,_______,RESET  ,_______,_______    ,KC_PSCREEN ,          \
+    KC_MS_BTN3  ,KC_MS_BTN2 ,KC_MS_UP   ,KC_MS_BTN1 ,KC_MS_WH_UP  ,_______,_______,_______,KC_INS ,_______,QK_BOOT,_______,_______    ,KC_PSCREEN ,          \
     _______     ,KC_MS_LEFT ,KC_MS_DOWN ,KC_MS_RIGHT,KC_MS_WH_DOWN,_______,_______,_______,_______,_______,_______,_______,_______    ,_______    ,          \
     _______     ,_______    ,_______    ,_______    ,_______      ,_______,_______,_______,_______,_______,_______,_______,KC_PGUP    ,_______    ,          \
     KC_LCTL     ,_______    ,KC_LALT    ,                                  _______,                        KC_RCTL,KC_HOME,KC_PGDOWN  ,KC_END ),
diff --git a/keyboards/gh60/satan/keymaps/colemak/keymap.c b/keyboards/gh60/satan/keymaps/colemak/keymap.c
index 08d456d6ce..d55bbb9213 100644
--- a/keyboards/gh60/satan/keymaps/colemak/keymap.c
+++ b/keyboards/gh60/satan/keymaps/colemak/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL: Function Layer
    * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  RESET|
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
    * |-----------------------------------------------------------|
    * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
    * |-----------------------------------------------------------|
@@ -52,13 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
-  KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET,  \
+  KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,  \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______, \
   _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______, \
   _______,_______,_______,                 _______,                       _______,_______,_______, _______),
   #else
-  KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET,  \
+  KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,  \
   _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP, KC_END, BL_DEC, BL_INC,BL_TOGG, \
   KC_DEL, KC_VOLD,KC_MUTE,KC_VOLU,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
diff --git a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
index 79fa86d18d..ca6838d2aa 100644
--- a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* SFX Layer
  * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |RESET|
+ * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |QK_BOOT|
  * |-----------------------------------------------------------------------------------------+
  * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     |        |
  * |-----------------------------------------------------------------------------------------+
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         `-----------------------------------------------------------------'
  */
   [_SFX] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  RESET, \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  QK_BOOT, \
       ______,   BL_DEC, BL_INC, BL_TOGG,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,   \
       ______,   RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______, ______, ______,  \
diff --git a/keyboards/gh60/satan/keymaps/denolfe/keymap.c b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
index 612c5075e6..03c5007c8c 100644
--- a/keyboards/gh60/satan/keymaps/denolfe/keymap.c
+++ b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL: Function Layer
    * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  RESET|
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
    * |-----------------------------------------------------------|
    * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
    * |-----------------------------------------------------------|
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
-  KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   \
+  KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_INC,  BL_TOGG, \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, \
   KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI,  RGB_VAD, KC_TRNS, KC_TRNS,                   KC_TRNS, \
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,   KC_F1,    KC_F2,    KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,          KC_F8,        KC_F9,          KC_F10,   KC_F11,  KC_F12,  KC_DEL,  \
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PGDN,        KC_PGUP,      KC_TRNS,        KC_END,   KC_MPRV, KC_MNXT, KC_MPLY, \
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,        KC_UP,        KC_RIGHT,       KC_TRNS,  KC_TRNS,          KC_TRNS, \
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DEC,    BL_TOGG,  BL_INC,   KC_HOME,  LCTL(KC_LEFT),  LCTL(KC_END), LCTL(KC_RIGHT), KC_TRNS,                    RESET,   \
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DEC,    BL_TOGG,  BL_INC,   KC_HOME,  LCTL(KC_LEFT),  LCTL(KC_END), LCTL(KC_RIGHT), KC_TRNS,                    QK_BOOT, \
   KC_TRNS,  KC_TRNS,  LM(2, MOD_LSFT),                         KC_TRNS,                                                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
   #endif
 
@@ -66,6 +66,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,         KC_F7,               KC_F8,              KC_F9,                KC_F10,       KC_F11,  KC_F12,  KC_DEL,  \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_PGDN,             KC_PGUP,            KC_TRNS,              LSFT(KC_END), KC_MPRV, KC_MNXT, KC_MPLY, \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_LEFT), LSFT(KC_DOWN),       LSFT(KC_UP),        LSFT(KC_RIGHT),       KC_TRNS,      KC_TRNS,          KC_TRNS, \
-  KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  LSFT(KC_HOME), LCTL(LSFT(KC_LEFT)), LCTL(LSFT(KC_END)), LCTL(LSFT(KC_RIGHT)), KC_TRNS,                        RESET,   \
+  KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  LSFT(KC_HOME), LCTL(LSFT(KC_LEFT)), LCTL(LSFT(KC_END)), LCTL(LSFT(KC_RIGHT)), KC_TRNS,                        QK_BOOT, \
   KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                                                      KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/gh60/satan/keymaps/dkrieger/keymap.c b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
index ac688d7eaf..05df3ff194 100644
--- a/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* MOUSE Layer
  * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |RESET|
+ * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |QK_BOOT|
  * |-----------------------------------------------------------------------------------------
  * |        |     |     |     |     |     |     |     |     |     |     |UCurs|     |        |
  * |-----------------------------------------------------------------------------------------
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         `-----------------------------------------------------------------'
  */
   [_MOUSE] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  RESET, \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  QK_BOOT, \
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_UP, ______, ______,  \
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_LEFT, KC_MS_RIGHT, ______,   \
       MO(_MOUSESHIFT), ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_DOWN, MO(_MOUSESHIFT), ______,  \
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* UTIL Layer
  * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |RESET|
+ * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |QK_BOOT|
  * |-----------------------------------------------------------------------------------------
  * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
  * |-----------------------------------------------------------------------------------------
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         `-----------------------------------------------------------------'
  */
   [_UTIL] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, RESET, \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, QK_BOOT, \
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,   \
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
diff --git a/keyboards/gh60/satan/keymaps/fakb/keymap.c b/keyboards/gh60/satan/keymaps/fakb/keymap.c
index 93e11a5de2..b6dda8e3ef 100644
--- a/keyboards/gh60/satan/keymaps/fakb/keymap.c
+++ b/keyboards/gh60/satan/keymaps/fakb/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  _______,_______,_______,                _______,                                _______,_______,_______,_______),
 
 [2] = LAYOUT_all(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET  ,\
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,\
  KC_BTN5,KC_BTN4,KC_BTN3,KC_BTN2,KC_BTN1,KC_HOME,KC_END ,_______,_______,_______,_______,_______,_______,_______,\
  _______,_______,KC_WH_L,KC_WH_U,KC_WH_D,KC_WH_R,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,_______,_______,\
  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,\
diff --git a/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c b/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
index 6e0345d9a0..9f2e167399 100644
--- a/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
+++ b/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FL] = LAYOUT_60_ansi(
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME,
+    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME,
     RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG,
     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
     _______,          RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______,
diff --git a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
index d6647cbb30..3db6231353 100644
--- a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL: (Function Layer) Second Layer
    * ,-----------------------------------------------------------.
-   * |    |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|PSR|  RESET|
+   * |    |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|PSR|  QK_BOOT|
    * |-----------------------------------------------------------|
    * |     |   |VUP|   |   |   |   |   |   |   |   |   |   |     |
    * |-------------------------------------------------------.   |
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   [_FL] = LAYOUT_60_iso_split_rshift(\
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_PSCR, RESET,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_PSCR, QK_BOOT,
     _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, RGB_TOG, RGB_MOD, RGB_M_B, RGB_VAI, RGB_VAD, BL_INC,  BL_DEC,  _______,
     _______, _______, _______, _______, KC_CEDL, _______, BL_TOGG, _______, KC_MUTE, _______, _______, _______, _______, _______,
diff --git a/keyboards/gh60/satan/keymaps/jarred/keymap.c b/keyboards/gh60/satan/keymaps/jarred/keymap.c
index c6852e4eb5..767d1ff76b 100644
--- a/keyboards/gh60/satan/keymaps/jarred/keymap.c
+++ b/keyboards/gh60/satan/keymaps/jarred/keymap.c
@@ -17,6 +17,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,_______,_______,_______,KC_DEL ,KC_BSPC,_______,KC_HOME,KC_UP  ,KC_END ,KC_INS ,_______,_______,_______, \
   _______,_______,_______,KC_LSFT,KC_LCTL,KC_ENT ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,KC_DEL ,        _______, \
   _______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,_______, \
-  _______,_______,_______,                 _______,                       _______,_______,  RESET, _______),
+  _______,_______,_______,                 _______,                       _______,_______,  QK_BOOT, _______),
   
 };
diff --git a/keyboards/gh60/satan/keymaps/lepa/keymap.c b/keyboards/gh60/satan/keymaps/lepa/keymap.c
index 85fdb743d3..249df2c371 100644
--- a/keyboards/gh60/satan/keymaps/lepa/keymap.c
+++ b/keyboards/gh60/satan/keymaps/lepa/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT_60_ansi(
             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, DEBUG,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
             KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/gh60/satan/keymaps/poker/keymap.c b/keyboards/gh60/satan/keymaps/poker/keymap.c
index 13251a5645..18207f7c36 100644
--- a/keyboards/gh60/satan/keymaps/poker/keymap.c
+++ b/keyboards/gh60/satan/keymaps/poker/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _RL: Function Layer
    * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  RESET|
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
    * |-----------------------------------------------------------|
    * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
    * |-----------------------------------------------------------|
@@ -74,13 +74,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_RL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
-    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,                   _______, \
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
   #else
-    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, \
diff --git a/keyboards/gh60/satan/keymaps/rask63/keymap.c b/keyboards/gh60/satan/keymaps/rask63/keymap.c
index bbe15fde88..8c9ec35114 100644
--- a/keyboards/gh60/satan/keymaps/rask63/keymap.c
+++ b/keyboards/gh60/satan/keymaps/rask63/keymap.c
@@ -78,6 +78,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ________, ________, ________, ________, ________, ________, ________, ________, ________, KC_MPRV,  KC_MPLY,  KC_MNXT,  ________, ________, \
     KC_CAPS,  ________, ________, ________, ________, ________, ________, ________, ________, KC_VOLD,  KC_VOLU,  KC_MUTE,            ________, \
     ________,           ________, ________, ________, ________, ________, ________, ________, ________, KC_MSTP,  ________, ________, ________, \
-    RESET,    KC_MENU,  ________,                     ________,                                         ________, ________, ________, ________
+    QK_BOOT,  KC_MENU,  ________,                     ________,                                         ________, ________, ________, ________
   ),
 };
diff --git a/keyboards/gh60/satan/keymaps/sethbc/keymap.c b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
index 63d65ca23c..ad0a6a9948 100644
--- a/keyboards/gh60/satan/keymaps/sethbc/keymap.c
+++ b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
@@ -31,13 +31,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = LAYOUT_60_ansi_split_bs_rshift(
   #ifdef RGBLIGHT_ENABLE
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RESET, \
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT, \
     KC_CAPS, _______, RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_DEL,  \
     _______, KC_VOLD, RGB_HUD, RGB_SAI, RGB_SAD, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT, \
     _______,          RGB_VAI, RGB_VAD, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, \
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
   #else
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RESET, \
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT, \
     KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_DEL,  \
     _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT, \
     _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, \
diff --git a/keyboards/gh60/satan/keymaps/smt/keymap.c b/keyboards/gh60/satan/keymaps/smt/keymap.c
index 829032a829..7cbdf07766 100644
--- a/keyboards/gh60/satan/keymaps/smt/keymap.c
+++ b/keyboards/gh60/satan/keymaps/smt/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------|
    * |        |   |   |Prv|Ply|Nxt|   |   |   |Pg-|DN |          |
    * |-----------------------------------------------------------|
-   * |RESET|    |    |                       |    |    |    |    |
+   * |QK_BOOT|    |    |                       |    |    |    |    |
    * `-----------------------------------------------------------'
    */
   [_FUNC] = LAYOUT_60_ansi(
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_UP,   BL_DEC,  BL_INC,  \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT,          _______, \
     _______,          _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGDN, KC_DOWN,          _______, \
-    RESET,   _______, _______,                   _______,                                     _______, _______, _______, _______
+    QK_BOOT, _______, _______,                   _______,                                     _______, _______, _______, _______
   )
 };
 
diff --git a/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c b/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
index 8caa70e02a..3f92899a5f 100644
--- a/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
+++ b/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL: Function Layer
    * ,-----------------------------------------------------------.
-   * |  `|   |   |   |   |   |   |   |   |   |   |   |   |  RESET|
+   * |  `|   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
    * |-----------------------------------------------------------|
    * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |
    * |-----------------------------------------------------------|
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_FL] = LAYOUT_60_ansi(
-  KC_GRV,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,   \
+  KC_GRV,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT, \
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
   _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, \
   _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, \
diff --git a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
index e3cbae285d..49c65ac446 100644
--- a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
+++ b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
@@ -34,13 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // RGB Layer
   [_RGBL] = LAYOUT_60_ansi_split_bs_rshift(
   #ifdef RGBLIGHT_ENABLE
-    RESET,   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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
     XXXXXXX, BL_TOGG, BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
     _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, _______, _______, \
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
   #else
-    RESET,   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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
     XXXXXXX, BL_TOGG, BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
     _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, \
diff --git a/keyboards/gh60/satan/keymaps/unxmaal/keymap.c b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
index 8d9b1dc45d..9d585f4035 100644
--- a/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
+++ b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL: Function Layer
    * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  RESET|
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
    * |-----------------------------------------------------------|
    * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
    * |-----------------------------------------------------------|
@@ -68,13 +68,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,          _______, \
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
   #else
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
diff --git a/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
index b3908e7ef7..784a26ff93 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  _______, KC_BSPC,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        KC_BSPC,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_TILD, _______,
-        _______, _______, RESET,   KC_APP,  BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, KC_APP,  BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c
index 31003909a1..5a9a53e4a1 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_DEL,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, KC_HASH, _______,
-        _______, _______, RESET,   BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c
index ed08a087e2..3d80254de7 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_DEL,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, KC_HASH, _______,
-        _______, _______, RESET,   BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
index 5a779d9baf..13e807f319 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  _______,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
-        _______, _______, RESET,   BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
index 166ddd7c19..9f24f9b8e5 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
-        _______, _______, RESET,   BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
index 68d0ea01b4..c5cfce195c 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_DEL,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
-        _______, _______, RESET,   BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
index 942775e4b0..47fe094fee 100644
--- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
@@ -34,7 +34,7 @@ LT(1,JP_ZKHK),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,
   ),
   [1] = LAYOUT(
   //,-----------------------------------------------------+--------------------------------------------------------------------------------.
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL, KC_PSCR,
+        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,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
index fd0bc7f8e3..42b2204cf1 100644
--- a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
+++ b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_rotary_layer(
   //,--------------------------------------------------------------|        |--------------------------------------------------------------.
-        RESET,  KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LALT(KC_PSCR),KC_PSCR,
+        QK_BOOT,  KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LALT(KC_PSCR),KC_PSCR,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
               KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_TOG, RGB_MOD, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, _______,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
index 7ea51338aa..ba3e9828f6 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
index c61740193e..19f01f53b6 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
index 1b41235e3c..d9b0dce016 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
index 0656566cf7..6d33fdcccc 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    RESET,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
index 99504de956..d666454a3e 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      Ct_L     Alt_L    Win_L                               SPACE                               Ct_R        Alt_R   FN     Left     Down     Right
 
 
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            RGB_MODE_FORWARD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          RGB_MODE_FORWARD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          RGB_MODE_REVERSE,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, RGB_TOG,
         _______, _______, _______,                            _______,                            _______, _______, _______, KC_MEDIA_PREV_TRACK, _______, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index e521425f26..e5599a787d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [WIN_FN] = LAYOUT(
         _______, KC_BRID,  KC_BRIU, KC_TASK, KC_FLXP, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_INS,           XXXXXXX,
         XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_PSCR,
-        RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,            KC_PAUS,
+        RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,          KC_PAUS,
         TO_MACB, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_SCRL,
         _______,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
         _______, _______,  _______,                            XXXXXXX,                            _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_FN] = LAYOUT(
         _______, KC_BRID,  KC_BRIU, KC_MCTL, KC_LPAD, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_INS,           XXXXXXX,
         XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_PSCR,
-        RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,            KC_BRMU,
+        RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,          KC_BRMU,
         TO_WINB, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_BRMD,
         _______,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
         _______, _______,  _______,                            XXXXXXX,                            _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
index d044008a23..16f1acd68b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
@@ -25,7 +25,7 @@ enum userspace_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [FNLAYER] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MEDIA_PLAY_PAUSE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  ,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_VAD, _______
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c
index be88ea82f8..9d84e86889 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F10,  KC_F12,  _______, KC_MUTE, 
       _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-      _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______, 
+      _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, 
       _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
       _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          RGB_MOD, 
       _______, _______, _______,                   _______,                   _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
index 5f3e3f5fd8..86743acf73 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [FNLAYER] = LAYOUT(
         CLOSEAPPLICATION, CLOSETAB,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MEDIA_PLAY_PAUSE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, SWAP_L ,  MAXI  , SWAP_R , _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  ,          _______,
+        _______, SWAP_L ,  MAXI  , SWAP_R , _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______,  MINI  , _______, POPOUT,  _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, KC_TRNS, _______, _______, _______
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
index 1ad8417de2..fb60872ea8 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_BRID, KC_BRIU, KC_CALC, KC_MSEL, RGB_VAD, RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______,
         _______, KC_SEC1, KC_SEC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG,            _______,
-        _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, _______, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, RGB_HUI, RGB_HUD, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
         _______, GUI_TOG, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index 2361ab5660..09f8aa147a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT(
-        EEP_RST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,            KC_MUTE,
+        EEP_RST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,          KC_MUTE,
         KC_NLCK, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, KC_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_PSLS, KC_PAST, KC_BSLS,          KC_PGUP,
         KC_CAPS, RGB_VAD, RGB_TOG, RGB_VAI, KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_PENT,          KC_PGDN,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
index 41278868db..7d2c22506a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
 //      Ct_L     Alt_L    Win_L                               SPACE                               Ct_R        Alt_R   FN     Left     Down     Right
 
-   // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+   // 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.
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [4] = LAYOUT(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TD(1),                                    _______,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  _______,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_P, XXXXXXX, XXXXXXX, RESET,                                    RGB_MODE_FORWARD,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_P, XXXXXXX, XXXXXXX, QK_BOOT,                                  RGB_MODE_FORWARD,
         XXXXXXX, XXXXXXX, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,                                  RGB_MODE_REVERSE,
         _______,          XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______,             XXXXXXX,             RGB_TOG,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, XXXXXXX, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
index 19694d54c1..3be0e5e31b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_INS,           _______,
         _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
index cfca7960ca..98354b4654 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //      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 RESET key (to put the board into bootloader mode). Without
+      // 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.
@@ -45,10 +45,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [1] = LAYOUT(
           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,           KC_PSCR,
           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
           KC_INS,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
           _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-          _______, _______, _______,                            RESET,                              KC_RGUI, _______, _______, _______, _______, _______
+          _______, _______, _______,                            QK_BOOT,                            KC_RGUI, _______, _______, _______, _______, _______
       ),
 
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
index 0d318885f4..47490a0617 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CALC,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RESET,            KC_HOME,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, QK_BOOT,          KC_HOME,
         KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
         _______,          RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
         _______, KC_WINLCK, _______,                            _______,                          _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
index 7bedf05987..c87532990f 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24, RGB_TOG,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
index 1f8c47306a..8175cf68c8 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      Ct_L     Opt_L    Cmd_L                               SPACE                               Cmd_R    Opt_R    FN       Left     Down     Right
 
 
-  // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+  // 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.
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
     _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  _______,           RGB_TOG,
     LED_TLDE, LED_1,   LED_2,   LED_3,   LED_4,   LED_5,   LED_6,   LED_7,   LED_8,   LED_9,   LED_0,   LED_MINS, LED_EQL, _______,           KC_PSCR,
-    _______,  RGB_HUI, RGB_VAI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,  _______, RESET,             _______,
+    _______,  RGB_HUI, RGB_VAI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,  _______, QK_BOOT,           _______,
     _______,  RGB_HUD, RGB_VAD, RGB_SAD, TG(2),   _______, _______, _______, _______, _______, _______, _______,           _______,           _______,
     _______,           _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,           _______, RGB_MOD,  RGB_TOG,
     _______,  _______, _______,                            _______,                            _______, _______,  _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
index f96be6ffe9..020322085b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      _______,
                       _______, _______, _______,                   _______,                   _______, _______, _______,          _______, _______, _______),
 
-  [_DFUMODE] = LAYOUT(RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MG_F19,       DEBUG,
+  [_DFUMODE] = LAYOUT(QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MG_F19,       DEBUG,
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
index bc010108fb..30b1b389bc 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
@@ -55,7 +55,7 @@ enum git_macros {
     G_CONF,                   // git config --global
     G_ADD,                    // git add
     G_DIFF,                   // git diff
-    G_RESET,                  // git reset
+    G_QK_BOOT,                // git reset
     G_REBAS,                  // git rebase
     G_BRANH,                  // git branch
     G_CHECK,                  // git checkout
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c
index 90ac428c74..759c4034c0 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MUTE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, _______, _______, RESET,            _______,
+        _______, _______, _______, _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, _______, _______, QK_BOOT,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN,          _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
index 5c702b1686..e59db7b984 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT(
         KC_SLEP,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MNXT,  KC_MPLY,  KC_MSTP,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  KC_INS,             _______, 
         RGB_TOG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUD,  RGB_HUI,  _______,            RGB_M_P, 
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  TO(_MO2), RGB_SAD,  RGB_SAI,  RESET,              RGB_M_B, 
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  TO(_MO2), RGB_SAD,  RGB_SAI,  QK_BOOT,            RGB_M_B, 
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_RMOD, RGB_MOD,            _______,            RGB_M_R, 
         _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_VAI,  RGB_M_SW, 
         _______,  KC_WINLK, _______,                                _______,                                _______,  _______,  _______,  RGB_SPD,  RGB_VAD,  RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
index 762fe00df2..e4569ac3ad 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,  KC_WHOM, _______, _______, _______, _______, _______, KC_WAKE, KC_SLEP, KC_PAUS,         _______,
       LED_TILDE, LED_1,  LED_2,   LED_3,   LED_4,    LED_5,   LED_6,   LED_7,   LED_8,   LED_9,   LED_0,   LED_MINS, LED_EQL,  KC_INS,         KC_SLCK,
-        _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, RESET,           KC_BRIU,
+        _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,         KC_BRIU,
        _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_SPI, _______,  _______, _______, _______, QMKBEST, _______, _______,         _______,          KC_BRID,
         _______,          _______, _______, _______, _______,  _______, NK_TOGG, _______, _______, _______, _______,         _______, KC_MPLY, KC_PWR,
         _______, _______, _______,                             _______,                            KC_RALT, _______, KC_APP, KC_MPRV, KC_MSTP, KC_MNXT
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
index fded532562..fd64902108 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_INS,
         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_PSCR,   KC_SLCK,   KC_PAUS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_HOME,
         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_MPLY,  KC_TRNS,           KC_TRNS,          KC_END,
-        KC_TRNS,             KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_MPRV,   KC_MNXT,  RESET,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,             KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_MPRV,   KC_MNXT,  QK_BOOT,           KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS,   KC_TRNS,                                    KC_TRNS,                                    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_HOME, KC_TRNS, KC_END
     ),
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
index a32fef1041..2ee79eae79 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,            _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,             _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,           _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,           _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP,  _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, KC_HOME, KC_PGDN,  KC_END
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json
index d2325d2c13..bdb9e95264 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json
@@ -135,7 +135,7 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "RESET",
+      "QK_BOOT",
       "KC_NO",
       "KC_TRNS",
       "KC_NO",
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
index 84fbcf37ff..b28809fdf6 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, RGB_TOG, RGB_M_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_INS, _______,          _______,
         _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
index 776fd210f3..30e8fc5f44 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------+------+------+------+------+------+------+------+------+------+------+------+------+       ++------|
      * |  Capslock  |RGBHUD|RGBVAD|RGBHUI| ____|GMAIL |HTMAIL| ____ | ____ | ____ | ____ | ____ | ___ | ____ || End  |
      * |------------+------+------+------+-----+------+------+------+------+------+------+------|----+========+------|
-     * | ____ |QK_BOOT|RGBNIT| ____ | ____ | ____ | ____ |NumLk | ____ | ____ |DOTCOM| CAD  | ______ ||RGBMOD|| ____ |
+     * |  ____ |QK_BOOT|RGBNIT| ____ | ____ | ____ | ____ |NumLk | ____ | ____ |DOTCOM| CAD  | ______ ||RGBMOD|| ____ |
      * |--------------+------+------+------+------+------+------+------+------+------+------+--+=====++------++======|
      * |  ____  | WinKyLk |  ____  |               _____                  | ____ | ____ | ____ ||RGBSPD|RGBRMD|RGBSPI|
      * `------------------------------------------------------------------------------------------------------------'
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
index 3164ecbf68..e4b5711e8b 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
         _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,                   KC_HOME,
         KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_END,
-        _______, RESET,   RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
+        _______, QK_BOOT, RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
         _______, KC_WINLCK, _______,                            _______,                          _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
     ),
 
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
index d5b64c153a..1e32e7e9c0 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MOV] = LAYOUT(
-        RESET,   KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
+        QK_BOOT, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RGB] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            RGB_MOD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          RGB_MOD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_RMOD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,          RGB_SPI,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI, RGB_SPD,
@@ -136,7 +136,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
 
     switch (keycode) {
-        case RESET:  // when activating RESET mode for flashing
+        case QK_BOOT:  // when activating QK_BOOT mode for flashing
             if (record->event.pressed) {
                 rgb_matrix_set_color_all(63, 0, 0);
                 rgb_matrix_driver.flush();
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
index 0d161e5bdd..dc56a9ff8f 100644
--- a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
         _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c
index f3f3397874..d1c42ca26f 100644
--- a/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
         _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
index 3bdacda6c8..c44e4905d0 100644
--- a/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c
index c47e186c52..acd41ebec1 100644
--- a/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev2/iso/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      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 RESET key (to put the board into bootloader mode). Without
+    // 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.
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
diff --git a/keyboards/gon/nerd60/keymaps/mauin/keymap.c b/keyboards/gon/nerd60/keymaps/mauin/keymap.c
index 78a2eb353c..314b55199a 100644
--- a/keyboards/gon/nerd60/keymaps/mauin/keymap.c
+++ b/keyboards/gon/nerd60/keymaps/mauin/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   [_SY] = LAYOUT_all(
-      RESET,   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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
index bda83bb5da..39dcb175ab 100644
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *    *-----------------------------------------------------------------------*
     */
     [_AL] = LAYOUT_tkl( \
-        RESET,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 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_DEC,  BL_INC,  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,                            \
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
index 99817cec47..f5e398ecbe 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */
 	[_FN] = LAYOUT_all(
-                RESET,   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_RMOD, RGB_MOD, RGB_TOG,
+                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_RMOD, RGB_MOD, RGB_TOG,
                 NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, RGB_C_E,  _______, _______,
                 _______, G1_HUD,  G1_HUI,  G1_SAD,  G1_SAI,  G1_VAD,  G1_VAI,  _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
                 _______, G2_HUD,  G2_HUI,  G2_SAD,  G2_SAI,  G2_VAD,  G2_VAI,  _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/gray_studio/cod67/keymaps/rys/keymap.c b/keyboards/gray_studio/cod67/keymaps/rys/keymap.c
index 9f1d069b73..06532a8460 100644
--- a/keyboards/gray_studio/cod67/keymaps/rys/keymap.c
+++ b/keyboards/gray_studio/cod67/keymaps/rys/keymap.c
@@ -18,6 +18,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_MOD,RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG,
         _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,   RESET, _______, _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/gray_studio/cod67/keymaps/via/keymap.c b/keyboards/gray_studio/cod67/keymaps/via/keymap.c
index 12ffe56244..caca2febfa 100644
--- a/keyboards/gray_studio/cod67/keymaps/via/keymap.c
+++ b/keyboards/gray_studio/cod67/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_MOD,RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG,
         _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______
     ),
     [2] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/gray_studio/hb85/keymaps/stt/keymap.c b/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
index 5665e2f0e1..9a173d7885 100644
--- a/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
+++ b/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT_stt(
-        RESET,   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,                            \
+        QK_BOOT, RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_M_X,  RGB_M_G,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                            \
         EEP_RST, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
         BL_TOGG, BL_STEP,  BL_INC,   BL_DEC,   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, \
         RGB_TOG, RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
diff --git a/keyboards/gray_studio/space65/keymaps/billiams/keymap.c b/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
index 9a0a004033..d83be466ed 100644
--- a/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------------------------------------------------------------------------------------------------+
    * |         |     |     |     |     |     |     |     |    |    |      |      |            |       |
    * |------------------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |     |    | RESET |
+   * |           |     |     |     |     |     |     |     |     |     |     |     |     |    | QK_BOOT |
    * |------------------------------------------------------------------------------------------------+
    * |      |       |       |                                   |      |       |       |       |      |
    * `------------------------------------------------------------------------------------------------'
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   \
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,            \
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,          \
              KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS           \
     ),
 };
diff --git a/keyboards/gray_studio/space65/keymaps/conor/keymap.c b/keyboards/gray_studio/space65/keymaps/conor/keymap.c
index 39bec338c5..1ae64e1114 100644
--- a/keyboards/gray_studio/space65/keymaps/conor/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/conor/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                   _______, _______, MO(3),            _______, _______,                   _______, _______, _______
     ),
     [_FN4] = LAYOUT(
-        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c b/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
index 2fa47f427b..943d5eae4c 100644
--- a/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FNM] = LAYOUT(
         KC_GESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_VOLD, KC_VOLU, KC_MFFD,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD,  RGB_SPI, KC_TRNS, KC_TRNS, RESET, KC_MRWD,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD,  RGB_SPI, KC_TRNS, KC_TRNS, QK_BOOT, KC_MRWD,
         KC_TRNS, RGB_M_P, RGB_M_G, RGB_M_K, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS,
         AG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRID,  KC_BRIU, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
index 5955401998..0286444fe1 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
+++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DELT, KC_VOLU, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_SLPD, KC_VOLD, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD,          _______, XXXXXXX, \
-    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \
     _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END   \
 ),
 /* Blank Layout
diff --git a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
index 4994fb3fa0..f9c171f1ae 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
+++ b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
@@ -221,7 +221,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴────┴───┘
      */
     [1] = LAYOUT_65_ansi_blocker(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KVM_SW1,
+        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, _______,
diff --git a/keyboards/gray_studio/think65/solder/keymaps/rys/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/rys/keymap.c
index 658798ed67..e0d9e00448 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/rys/keymap.c
+++ b/keyboards/gray_studio/think65/solder/keymaps/rys/keymap.c
@@ -261,7 +261,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │    │    │    │                        │    │    │ │ESC│BDG│UGL│
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
         RGB_TOG, RGB_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CYC_LED,
diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
index 74f95b4b75..64e7841d8e 100644
--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -189,7 +189,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-  RESET,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, \
+  QK_BOOT,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, \
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,  KC_DEL, _______, _______, _______, \
   _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP,  QWERTY, _______, _______, _______, _______, _______, _______, _______, \
   _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG, _______, _______, _______, \
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index c1bfe1f1c1..569921c773 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_wrapper(
   _______, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST, _______, _______, _______, _______, _______, EEP_RST, \
-  RESET,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
+  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
   _______, MAGIC_TOGGLE_NKRO, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG\
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c b/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
index c4431acecc..2af9802049 100644
--- a/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
+++ b/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `--------------------------------------------------''-----------'
    */
     [_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,  RESET,   _______,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  QK_BOOT, _______,
         _______,      _______, _______, _______, _______, _______, _______, _______, TG(_MAC),_______, KC_PSCR, KC_BRID, KC_BRIU, _______,     KC_INS,
         _______,          _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,          KC_HOME,
         _______,               _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,     KC_PGUP, KC_END,
diff --git a/keyboards/handwired/6macro/keymaps/osu/keymap.c b/keyboards/handwired/6macro/keymaps/osu/keymap.c
index ffed7d909f..c3ee0f2ccf 100644
--- a/keyboards/handwired/6macro/keymaps/osu/keymap.c
+++ b/keyboards/handwired/6macro/keymaps/osu/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * ,-----------------------.
   * |RGB_TOG|RGBMOD+|       |
   * |-------+-------+-------|
-  * |RGBHUE+|RGBBRI+|Spec FN|   Hold along with previous to access special funtions (RESET)
+  * |RGBHUE+|RGBBRI+|Spec FN|   Hold along with previous to access special funtions (QK_BOOT)
   * `-------+-------+-------'
   */
   [1] = LAYOUT(
@@ -43,13 +43,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* LAYER 2
   * ,-----------------------.
-  * | RESET |RGBMOD-|       |
+  * | QK_BOOT |RGBMOD-|       |
   * |-------+-------+-------|
   * |RGBHUE-|RGBBRI-|       |
   * `-------+-------+-------'
   */
   [2] = LAYOUT(
-    RESET, RGB_RMOD, KC_NO, \
+    QK_BOOT, RGB_RMOD, KC_NO, \
     RGB_HUD, RGB_VAD, KC_TRNS  \
   )
   
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
index cb62fb001c..f063329104 100644
--- a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
+++ b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LALT(KC_F4), KC_F1     , KC_F2       , KC_F3       , KC_F4       , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9   , KC_F10 , KC_F11    , KC_F12 , KC_DEL ,
     _______    , _______   , SLC_ALL     , SLC_ROW     , SLC_WRD     , _______, KC_BSPC, KC_HOME, KC_UP  , KC_END  , KC_BRIU, KC_BRID   , KC_PSCR,
     _______    , _______   , LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), KC_DEL , KC_ENT , KC_LEFT, KC_DOWN, KC_RIGHT, BL_TOGG, BL_STEP   , BL_BRTG, _______,
-    _______    , _______   , KC_MUTE     , KC_VOLD     , KC_VOLU     , ALT_TAB, _______, _______, _______, _______ , _______, RESET     , _______         ,
+    _______    , _______   , KC_MUTE     , KC_VOLD     , KC_VOLU     , ALT_TAB, _______, _______, _______, _______ , _______, QK_BOOT     , _______         ,
     _______    , _______   , _______     ,                             _______,                                               _______   , _______, _______
   )
 };
diff --git a/keyboards/handwired/aim65/keymaps/bonnee/keymap.c b/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
index 62f2d21e95..7884841b21 100644
--- a/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
+++ b/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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, _______, _______, _______,   RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+     KC_TAB, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
          _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______, _______, _______, _______,
          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                                                              _______
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
index 4e7ef57b71..d69c705a42 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, RESET, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+    _______, QK_BOOT, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
     _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
     _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
index 8bb833b21d..e2ec848b59 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______,
   _______, _______, _______, _______,
   _______, _______, _______,
-  RESET,            _______, _______  ),
+  QK_BOOT,          _______, _______  ),
 
 };
 
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
index caee60d6ae..0126aa49fb 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______,
   _______, _______, _______, _______,
   _______, _______, _______, XXXXXXX,
-  RESET,   _______, _______, _______  ),
+  QK_BOOT, _______, _______, _______  ),
 
 };
 
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 49a53cfe21..5ac74e6f8a 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-  M_CUSTOM, RESET,   QWERTY,  _______, _______, DYN_REC_START1,                    DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
+  M_CUSTOM, QK_BOOT, QWERTY,  _______, _______, DYN_REC_START1,                    DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
   KC_CAPS,  _______, _______, _______, _______, DYN_MACRO_PLAY1,                   DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
   TG(_MAC), _______, _______, _______, _______, DYN_REC_STOP,                      DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______, _______, _______,         _______,             _______,           _______,              _______,  _______
diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
index 73113385d3..82277e2158 100644
--- a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
+++ b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [LAYER_FUNCTIONS] = LAYOUT(
         /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-              RESET,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  KC_PSBR,  KC_SNIP, 
+              QK_BOOT,           _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  KC_PSBR,  KC_SNIP, 
         /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_WMGM,  KC_WMGP,       _______,
         /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
diff --git a/keyboards/handwired/bento/keymaps/mac/keymap.c b/keyboards/handwired/bento/keymaps/mac/keymap.c
index bb584c9a5b..b90c086977 100644
--- a/keyboards/handwired/bento/keymaps/mac/keymap.c
+++ b/keyboards/handwired/bento/keymaps/mac/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * ---- | Shift+CMD+B (Build VS Code) | DFU Mode
     * Shift+CMD+C (FF Console) | Ctrl+Alt+U (Upload PIO) | Ctrl+Alt+S (Serial PIO) */
     [_CODE] = LAYOUT(
-            _______, S(G(KC_B)), RESET,
+            _______, S(G(KC_B)), QK_BOOT,
             G(A(KC_C)), C(A(KC_U)), C(A(KC_S))
     ),
 };
diff --git a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
index 0f19f9fbe3..f16f39e68e 100644
--- a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
+++ b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_LALT, KC_LGUI,       KC_ENT,              MO(_L3),       KC_SPC,  KC_LEAD, KC_RGUI, KC_RALT
   ),
   [_L3] = LAYOUT_60_hhkb_split_625u_space( /* Function */
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,    KC_F11,     KC_F12,   _______, _______,
+    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,    KC_F11,     KC_F12,   _______, _______,
     BL_BRTG, BL_TOGG, BL_INC,  BL_DEC, BL_ON, BL_OFF, _______, _______, _______, _______,   _______,   KC_PGUP,    KC_INSERT,  KC_DEL,
     _______, RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_HOME,   KC_END,     _______,
     _______, BL_DEC,  _______, _______, _______, _______, _______, DF(_L1), DF(_L2), _______,   KC_PGDOWN, _______, _______,
diff --git a/keyboards/handwired/d48/keymaps/anderson/keymap.c b/keyboards/handwired/d48/keymaps/anderson/keymap.c
index 11bc62e537..003c757ff8 100644
--- a/keyboards/handwired/d48/keymaps/anderson/keymap.c
+++ b/keyboards/handwired/d48/keymaps/anderson/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
        ┃L_MOD┃ F1  │ F2  │ F3  │ F4  │ F5  ┃ F6  │ F7  │ F8  │ F9  │ F10 ┃ F11 ┃
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
-       ┃     ┃RESET│DEBUG│     │     │TIME ┃SLEEP│ SEQ │  {  │  }  │PTSCR┃     ┃
+       ┃     ┃QK_BOOT│DEBUG│     │     │TIME ┃SLEEP│ SEQ │  {  │  }  │PTSCR┃     ┃
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
        ┃     ┃     │     │     │     │     ┃     │     │     │     │     ┃     ┃
        ┗━━━━━┻━━━━━┷━━━━━┷━━━━━┷━━━━━┷━━━━━┻━━━━━┷━━━━━┷━━━━━┷━━━━━┷━━━━━┻━━━━━┛
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,
 #endif
                  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  \
-        _______, RESET,   DEBUG,   _______, _______, KC_SET_TIME,KC_SLEP,KC_SEQ,KC_LCBR, KC_RCBR, KC_PSCR, _______, \
+        _______, QK_BOOT, DEBUG,   _______, _______, KC_SET_TIME,KC_SLEP,KC_SEQ,KC_LCBR, KC_RCBR, KC_PSCR, _______, \
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
     )
 };
@@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         beta_pressed = record->event.pressed;
     }
 
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         rgblight_setrgb(255, 255, 0);
     }
 #ifdef LIGHTMODE_ENABLE
diff --git a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
index 40ef3b019c..8d980f7818 100644
--- a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |      |   %  |   ^  |   [  |   ]  |   ~  |                    |   &  |   1  |   2  |   3  |   \  |      |
  * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
- * |RESET |      |      |      |      |                                  |      |   .  |   0  |   =  |      |
+ * |QK_BOOT |      |      |      |      |                                  |      |   .  |   0  |   =  |      |
  * `----------------------------------'                                  `----------------------------------'
  *                                      ,-------------.  ,-------------.
  *                                      |      |      |  |      |      |
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,  KC_EXLM,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_PIPE,
        KC_TRNS,  KC_HASH,   KC_DLR,  KC_LPRN,  KC_RPRN,   KC_GRV,
        KC_TRNS,  KC_PERC,  KC_CIRC,  KC_LBRC,  KC_RBRC,  KC_TILD,
-         RESET,  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,
diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
index e439af3e54..e54d31c184 100644
--- a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 1: Control layer (media keys, Fkeys, numpad)
  *
  * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  |  F10 | RESET|
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  |  F10 | QK_BOOT|
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |      |      | Mute | VolD | VolU |      |                    |      |   7  |   8  |   9  |   +  |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                    KC_TRNS,
                                                KC_TRNS,  KC_TRNS,  KC_TRNS,
        // right hand
-                KC_F6,      KC_F7,   KC_F8,   KC_F9,      KC_F10,    RESET,
+                KC_F6,      KC_F7,   KC_F8,   KC_F9,      KC_F10,    QK_BOOT,
                 KC_TRNS,     KC_7,    KC_8,    KC_9,  KC_KP_PLUS,  KC_TRNS,
                 KC_TRNS,     KC_4,    KC_5,    KC_6,      KC_EQL,  KC_TRNS,
                 KC_TRNS,     KC_1,    KC_2,    KC_3,     KC_COMM,  KC_TRNS,
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
index b403c2ce3b..cbb1b42fca 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
@@ -355,7 +355,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
          LGUI_FIND,LALT_HOME,LCTL_PGUP,LSFT_PGDN,KC_END,                     KC_LEFT,RSFT_DOWN,RCTL_UP,RALT_RGHT,RGUI_F11,
         //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-         DF_QWERTY,DF_COLEMAK,KC_VOLD, KC_VOLU, RESET,                        KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, KC_F12,
+         DF_QWERTY,DF_COLEMAK,KC_VOLD, KC_VOLU, QK_BOOT,                      KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, KC_F12,
         //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
                                         VVV,    TG(4),    VVV,         VVV,    VVV,     VVV
         //                           |--------+--------+--------|  |--------+--------+--------|
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
index bf2c08e805..092bd3e430 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_dm_base_wrapper(
     _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
     TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB,      DNTAB,  KC_ENT, KC_LGUI,_______,CALDL,
-    _______,CLSGUI, _______,CONPST, RESET,      _______,_______,_______,_______,_______,
+    _______,CLSGUI, _______,CONPST, QK_BOOT,    _______,_______,_______,_______,_______,
                     _______,_______,_______,    _______,_______,_______
 ),};
 // clang-format on
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
index fad361fffd..7362505f0f 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------|                  |------+------+------+------+------|
      * |   (  |   )  |   {  |   }  |   =  |                  |  -   |   4  |   5  |   6  |   ;  |
      * |------+------+------+------+------|                  |------+------+------+------+------|
-     * | RESET| BOOT |   [  |   ]  |      |                  |      |   1  |   2  |   3  |      |
+     * | QK_BOOT| BOOT |   [  |   ]  |      |                  |      |   1  |   2  |   3  |      |
      * |------+------+------+-------------|                  |------+------+------+------+------,
      *        |      |      |                                              |   0  |   .  |
      *        '-------------+------,                                ,------|-------------'
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
index ce6b663516..cf6d7d7120 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------|                  |------+------+------+------+------|
      * |   (  |   )  |   [  |   ]  |   =  |                  |   _  |   4  |   5  |   6  |   ;  |
      * |------+------+------+------+------|                  |------+------+------+------+------|
-     * | RESET| BOOT |      |      |      |                  |      |   1  |   2  |   3  |      |
+     * | QK_BOOT| BOOT |      |      |      |                  |      |   1  |   2  |   3  |      |
      * |------+------+------+-------------|                  |------+------+------+------+------,
      *        |MAC_LC|      |                                              |   0  |   .  |
      *        '-------------+------,                                ,------|-------------'
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
index 7f3fc2585f..2e92d4b86b 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_7] = LAYOUT(
 
-     KC_TAB  , KC_MS_WH_UP  , KC_MS_BTN2 , KC_MS_UP   , KC_MS_BTN1  , KC_MS_WH_DOWN ,      KC_TRNS , KC_F7    , KC_F8   , KC_F9   , RGB_HUI , RESET            ,
+     KC_TAB  , KC_MS_WH_UP  , KC_MS_BTN2 , KC_MS_UP   , KC_MS_BTN1  , KC_MS_WH_DOWN ,      KC_TRNS , KC_F7    , KC_F8   , KC_F9   , RGB_HUI , QK_BOOT            ,
      KC_TRNS , KC_MS_ACCEL0 , KC_MS_LEFT , KC_MS_DOWN , KC_MS_RIGHT , KC_TRNS       ,      KC_TRNS , KC_F4    , KC_F5   , KC_F6   , RGB_SAI , RGB_TOG          ,
      KC_LSFT , KC_MS_ACCEL1 , KC_TRNS    , KC_TRNS    , KC_TRNS     , KC_TRNS       ,      KC_TRNS , KC_F1    , KC_F2   , KC_F3   , RGB_VAI , RGB_MODE_FORWARD ,
                               KC_TRNS    , KC_PSCR    ,                                                         KC_F10  , KC_TRNS ,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
index 78c16fb554..326eded640 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [VIM] = LAYOUT_5x6(
-     _______, RESET,   _______, _______, _______, _______,                       _______, _______, _______, _______, RESET,   _______,
+     _______, QK_BOOT, _______, _______, _______, _______,                       _______, _______, _______, _______, QK_BOOT, _______,
      _______, _______, _______, _______, KC_LSFT, _______,                       _______, _______, _______, _______, _______, _______,
      _______, DLEFT,   DRIGHT,  KC_LCTL, KC_LGUI, _______,                       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
      _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
index 71a91cfd2a..54ecf8101d 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _________________SYMBOL_L3_________________,                      _________________SYMBOL_R3_________________, _______,
                                                _______, _______,            KC_P0 , KC_PDOT,
                                                _______, _______,            _______, _______,
-                                               RESET  , _______,            _______, _______,
+                                               QK_BOOT, _______,            _______, _______,
                                                RGB_TOG, _______,            _______, _______
   ),
   [MDIA] = LAYOUT_5x6_wrapper(
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c
index 001687b57d..1f9102e829 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_7] = LAYOUT_5x6(
 
-     KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+     KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
      KC_TAB,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
      KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
      KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
index 41d8ee94fa..a4bd37c27b 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  _______,_______,_______,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 , _______ , _______ ,_______ ,_______,
-                                       _______,_______,                                                       _______, RESET,
+                                       _______,_______,                                                       _______, QK_BOOT,
                                                           KC_BTN1,KC_BTN2,            _______,_______,
                                                           _______,KC_BTN2,            _______,_______,
                                                           _______,_______,            _______,_______
@@ -55,11 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                ),
   [_ARROWS] = LAYOUT_5x6(
 
-                   RESET,_______, _______ ,_______,_______ ,TG(_WINDOWS),                        _______,_______,_______,_______,_______,_______,
+                   QK_BOOT,_______, _______ ,_______,_______ ,TG(_WINDOWS),                        _______,_______,_______,_______,_______,_______,
                    _______,_______,_______,_______,_______,_______,                        _______, KC_HOME , KC_UP , KC_END ,_______,_______,
                    _______,_______,_______,_______,_______ ,_______,                        KC_HOME, KC_LEFT , KC_DOWN , KC_RIGHT ,KC_END,_______,
                    _______,_______,_______,_______,_______,_______,                        _______, KC_PGDOWN , _______ , KC_PGUP ,_______ ,_______,
-                                        RESET,_______,                                                       _______, _______,
+                                        QK_BOOT,_______,                                                       _______, _______,
                                                            _______,_______,            _______,_______,
                                                            _______,_______,            _______,_______,
                                                            _______,_______,            _______,_______
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  ),
   [_NUMBERS] = LAYOUT_5x6(
 
-                    RESET,_______, _______ ,_______,_______ ,_______,                        KC_PSLS,KC_PAST,KC_PPLS,KC_PMNS,_______,_______,
+                    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 ,_______ ,_______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/keymap.c
index de931feabd..d3ce17882f 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_5x6(
      KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                        KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-     _______, _______, _______, _______, _______, _______,                        RESET  , _______, _______, _______, KC_MUTE, SE_PIPE,
+     _______, _______, _______, _______, _______, _______,                        QK_BOOT, _______, _______, _______, KC_MUTE, SE_PIPE,
      _______, _______, _______, _______, _______, _______,                        KC_HOME, KC_PGDN, KC_PGUP, KC_END , KC_VOLU, SE_BSLS,
      _______, _______, _______, _______, _______, _______,                        _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, _______,
                        _______, _______,                                                            _______, _______, 
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
index b89b798fd6..055df1b87d 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //                                             ├────────┼────────┤        ├────────┼────────┤
                                                   _______, _______,          _______,  _______,
   //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  _______, RESET,            _______, _______
+                                                  _______, QK_BOOT,          _______, _______
   //                                             └────────┴────────┘        └────────┴────────┘
 
   ),
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //                                             ├────────┼────────┤        ├────────┼────────┤
                                                   KC_LGUI, KC_GRV,           KC_DEL,  KC_RALT,
   //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  XXXXXXX, XXXXXXX,          RESET,   XXXXXXX
+                                                  XXXXXXX, XXXXXXX,          QK_BOOT, XXXXXXX
   //                                             └────────┴────────┘        └────────┴────────┘
   ),
 };
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
index 1e164081f2..c341bdf0b6 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [VIM] = LAYOUT_5x6_5(
-     _______, RESET,   _______, _______, _______, _______,                                         _______, _______, _______, _______, RESET,   _______,
+     _______, QK_BOOT, _______, _______, _______, _______,                                         _______, _______, _______, _______, QK_BOOT, _______,
      _______, _______, _______, _______, KC_LSFT, _______,                                         _______, _______, _______, _______, _______, _______,
      _______, DLEFT,   DRIGHT,  KC_LCTL, KC_LGUI, _______,                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
      _______, _______, _______, _______, _______, _______,                                         _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c
index 3503bfd368..413fa70492 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    XXXXXXX, REDO   , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     KC_PERC, KC_DLR , KC_HASH, KC_GRV , XXXXXXX, KC_F12 ,
    XXXXXXX, ALL    , CUT    , COPY   , PASTE  , XXXXXXX,                                     KC_CIRC, KC_SLSH, KC_ASTR, KC_TILD, KC_QUES, XXXXXXX,
    _______, UNDO   , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, KC_AMPR, KC_PIPE, XXXXXXX, XXXXXXX, _______,
-                     RESET  , XXXXXXX,          _______, _______, _______, _______, _______, _______,          XXXXXXX, XXXXXXX,
+                     QK_BOOT, XXXXXXX,          _______, _______, _______, _______, _______, _______,          XXXXXXX, XXXXXXX,
                                                          _______, KC_PGUP, KC_PGDN, _______
    ),
   [_LOWER] = LAYOUT_5x6_5(
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX,                                     XXXXXXX, XXXXXXX, KC_UP  , XXXXXXX, XXXXXXX, KC_F12 ,
    KC_INS , KC_EXLM, KC_AT  , KC_LPRN, KC_RPRN, XXXXXXX,                                     XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUES, XXXXXXX,
    _______, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-                     XXXXXXX, XXXXXXX,          _______, _______, _______, _______, _______, _______,          XXXXXXX, RESET  ,
+                     XXXXXXX, XXXXXXX,          _______, _______, _______, _______, _______, _______,          XXXXXXX, QK_BOOT,
                                                          _______, KC_PGUP, KC_PGDN, _______
    ),
   [_ADJUST] = LAYOUT_5x6_5(
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
index 2fb783e0b8..ab258a0c5e 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
@@ -14,7 +14,7 @@ enum custom_layers {
 #define KC_SPEC KC_SFTENT //KC_SFTENT - Right Shift when held, Enter when tapped
 #define KC_INS_ KC_INS
 #define KC_TAB_ KC_TAB
-#define RESET__ RESET
+#define RESET__ QK_BOOT
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c b/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
index 6b07051c4b..6f0c25a4dd 100644
--- a/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
+++ b/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                 KC_BSPC,CTL_ESC,KC_LALT,        KC_RALT,KC_ENT ,KC_SPC
     ),
     [NAV] = LAYOUT_6x6(
-         RESET , KC_NO ,KC_MPRV,KC_MPLY,KC_MNXT, KC_NO ,                                        KC_BRIU,  KC_7 , KC_8  , KC_9  , KC_NO , RESET ,
+         QK_BOOT , KC_NO ,KC_MPRV,KC_MPLY,KC_MNXT, KC_NO ,                                        KC_BRIU,  KC_7 , KC_8  , KC_9  , KC_NO , QK_BOOT ,
         _______,KC_VOLU,KC_WBAK,KC_MS_U,KC_WFWD,KC_WH_U,                                        KC_BRID,  KC_4 , KC_5  , KC_6  , KC_NO , KC_F9 ,
         _______,KC_VOLD,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_D,                                        KC_PPLS,  KC_1 , KC_2  , KC_3  ,KC_PMNS, KC_F10,
          KC_NO , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NO ,                                        KC_PAST,  KC_0 , KC_NO ,_______,KC_PSLS, KC_F11,
diff --git a/keyboards/handwired/elrgo_s/keymaps/default/keymap.c b/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
index 075879bbf0..8049050f5c 100644
--- a/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
+++ b/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
@@ -53,6 +53,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO   , KC_SLEP , KC_VOLU , KC_BRIU , KC_NO   , KC_NO  ,                  KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NLCK ,
         KC_NO   , KC_WAKE , KC_VOLD , KC_BRID , KC_NO   , KC_NO  ,                  KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   ,
         KC_NO   , KC_NO   , KC_NO   , KC_F13  , KC_F14  , KC_F15 ,                  KC_F16  , KC_F17  , KC_F18  , KC_NO   , KC_NO   , MO(_ADJUST),
-                  QK_BOOT   , KC_NO   , KC_NO   , KC_TRNS , KC_NO  ,                  KC_NO   , KC_TRNS , KC_TRNS , KC_NO   , KC_NO
+                  QK_BOOT, KC_NO   , KC_NO   , KC_TRNS , KC_NO  ,                  KC_NO   , KC_TRNS , KC_TRNS , KC_NO   , KC_NO
     )
 };
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
index 2581e01bf8..bfce6420af 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, RESET, EEP_RST, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
+    _______, QK_BOOT, EEP_RST, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
     _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
index bbcb83913f..c2eb4406d1 100644
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
+++ b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, RESET,   RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
         ),
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
index ae490914d5..eac0802e33 100644
--- a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     },
     [_SECRET] = {
       //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-        {RESET,   _______, _______, _______, SECRET0, SECRET1, _______, _______, _______, _______, VERSION, _______ },
+        {QK_BOOT, _______, _______, _______, SECRET0, SECRET1, _______, _______, _______, _______, VERSION, _______ },
       //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
         {_______, SECRET4, SECRET8, DEBUG,   _______, _______, _______, _______, _______, SECRET7, XXXXXXX, MAKE    },
       //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
diff --git a/keyboards/handwired/onekey/keymaps/reset/keymap.c b/keyboards/handwired/onekey/keymaps/reset/keymap.c
index ec1b33e64f..0484209b35 100644
--- a/keyboards/handwired/onekey/keymaps/reset/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/reset/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ortho_1x1(RESET)
+    LAYOUT_ortho_1x1(QK_BOOT)
 };
diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
index d785825332..62d17206ee 100644
--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -497,7 +497,7 @@ KC_PAUS
 
 [_RAISE] = LAYOUT(
   KC_INS            , XXXXXXX  , KC_BRIU, KC_BRID, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_7 , KC_8   , KC_9     , KC_SLASH , KC_MINUS, KC_EQUAL,
-  KC_HOME           , KC_PSCR  , XXXXXXX, XXXXXXX, XXXXXXX, RESET  , XXXXXXX, XXXXXXX,  KC_4 , KC_5   , KC_6     , KC_ASTR  , XXXXXXX , XXXXXXX,
+  KC_HOME           , KC_PSCR  , XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX,  KC_4 , KC_5   , KC_6     , KC_ASTR  , XXXXXXX , XXXXXXX,
   KC_END            , KC_SLCK  , XXXXXXX, XXXXXXX, DEBUG  , XXXXXXX, XXXXXXX, XXXXXXX,  KC_1 , KC_2   , KC_3     , KC_MINUS , XXXXXXX , XXXXXXX,
   XXXXXXX           , KC_PAUSE , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_0 , KC_DOT , KC_COMMA , KC_PLUS  , XXXXXXX , XXXXXXX,
   LALT(LCTL(KC_DEL)), _______  , _______, _______, _______,     _______     ,   KC_KP_ENTER  , _______, _______  , _______  , _______ , _______
@@ -518,7 +518,7 @@ KC_PAUS
  */
 [_ADJUST] = LAYOUT(
   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,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, _______,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, _______,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,  AU_OFF, AG_NORM, AG_SWAP, QWERTY,    XXXXXXX, XXXXXXX, XXXXXXX, _______,
   XXXXXXX, XXXXXXX, XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,  MU_OFF,   MI_ON,  MI_OFF,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, _______, _______, _______, _______,     _______,        _______,       _______, _______, _______, _______, _______
@@ -562,7 +562,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed && is_oneshot_layer_active())
       clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
       return true;
-    case RESET:
+    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);
diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
index 3734510f8c..10f23c2735 100644
--- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
@@ -453,7 +453,7 @@ KC_PAUS
  */
 [_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,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
   XXXXXXX, XXXXXXX, XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, _______, _______, _______, _______,     _______,            _______,    _______,_______,_______, _______, _______
@@ -492,7 +492,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed && is_oneshot_layer_active())
       clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
       return true;
-    case RESET:
+    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);
diff --git a/keyboards/handwired/prkl30/keymaps/erkhal/keymap.c b/keyboards/handwired/prkl30/keymaps/erkhal/keymap.c
index 71e5ed529b..af5a01e64c 100644
--- a/keyboards/handwired/prkl30/keymaps/erkhal/keymap.c
+++ b/keyboards/handwired/prkl30/keymaps/erkhal/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  /* FN
  * ,------------------------------------------------------------------------------------------.
- * |RESET |   F1 |   F2 |   F3 |   F4 |   F5 |   F6 |   F7 |   F8 |   F9 |  F10 |  F11 | F12  |
+ * |QK_BOOT |   F1 |   F2 |   F3 |   F4 |   F5 |   F6 |   F7 |   F8 |   F9 |  F10 |  F11 | F12  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|------|
  * |      |RGB_P |RGB_HD|RGB_HI| VOL- | PREV | NEXT | VOL+ |      |      |      | PRKL |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|------'
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------+------+------+------+------+------+------+------+------+------+------+------'
  */
 [_FN] = LAYOUT_2u_space(
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+    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_M_P, RGB_HUD, RGB_HUI, KC_VOLD, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, _______, PRKL,    _______,
     RGB_MOD, RGB_VAD, RGB_VAI, RGB_TOG, _______, KC_MPLY, _______, _______, _______, LCA(KC_DEL), _______
 ),
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index faa096ce08..31ce811e53 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -943,7 +943,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_SYS] = LAYOUT(
-  DEBUG,   QWERTY,  WIN,     XXXXXXX, RESET,   XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
+  DEBUG,   QWERTY,  WIN,     XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
   XXXXXXX, FC_TOG,  XXXXXXX, DVORAK,  XXXXXXX, GLOW,    XXXXXXX, XXXXXXX, WORKMAN, LINUX,   XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT,  NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
diff --git a/keyboards/handwired/pteron/keymaps/FSund/keymap.c b/keyboards/handwired/pteron/keymaps/FSund/keymap.c
index 98acdcf339..0bcd44f65d 100644
--- a/keyboards/handwired/pteron/keymaps/FSund/keymap.c
+++ b/keyboards/handwired/pteron/keymaps/FSund/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT(
         _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, F_UML,   F_GRAVE, F_ACUTE, _______, RESET,            _______, _______, _______, _______, KC_PSCR, _______,
+        _______, F_UML,   F_GRAVE, F_ACUTE, _______, QK_BOOT,          _______, _______, _______, _______, KC_PSCR, _______,
         _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,          _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
                           _______, _______, _______, _______,          _______, _______, _______, _______
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c b/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
index bbb77fa87c..ea217fcc3e 100644
--- a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
+++ b/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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,
-  _______, RESET,   DEBUG,   _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
                     _______, _______, _______, _______,         _______, _______, _______, _______
diff --git a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c b/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
index f024ddb4b9..d904dfe85b 100644
--- a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
+++ b/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN] = LAYOUT_hhkb_split_lshift(
-    RESET,   _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, _______, \
+    QK_BOOT, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, KC_UP,   _______, _______, _______,                 _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                 _______, _______, _______, _______, _______, _______,     _______,      \
     _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,     _______,      _______, \
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
index 1c835bad1f..ad52fcfaf8 100644
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
+++ b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______,  _______,            _______, _______,                               _______, _______,          _______
   ),
   [_L4] = LAYOUT_standard( /* LAYER 4 */
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_PGUP,   _______,
+    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,                      _______, _______,              _______
diff --git a/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
index bba5c43bbb..9f1f8b014b 100644
--- a/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
+++ b/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT_ortho_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, 
     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
-    KC_P7,   KC_P8,   KC_P9,   RESET,   
+    KC_P7,   KC_P8,   KC_P9,   QK_BOOT, 
     KC_P4,   KC_P5,   KC_P6,   KC_PENT, 
     KC_P1,   KC_P2,   KC_P3,   KC_PENT, 
     KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
diff --git a/keyboards/handwired/uthol/keymaps/numswap/keymap.c b/keyboards/handwired/uthol/keymaps/numswap/keymap.c
index b571ba8b91..7e06ee4da1 100644
--- a/keyboards/handwired/uthol/keymaps/numswap/keymap.c
+++ b/keyboards/handwired/uthol/keymaps/numswap/keymap.c
@@ -30,5 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_COLEMAK]  = LAYOUT_uthol(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
   [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
   [_RAISE]    = LAYOUT_uthol(KC_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_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
-  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_NO, KC_NLCK, KC_CAPS, 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_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
+  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_NO, KC_NLCK, KC_CAPS, 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_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/handwired/uthol/keymaps/oled/keymap.c b/keyboards/handwired/uthol/keymaps/oled/keymap.c
index 3019a1fe85..6c25db3b6f 100644
--- a/keyboards/handwired/uthol/keymaps/oled/keymap.c
+++ b/keyboards/handwired/uthol/keymaps/oled/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_COLEMAK]  = LAYOUT_uthol(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
     [_RAISE]    = LAYOUT_uthol(KC_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_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
-    [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
+    [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
 };
 
 #define ANIM_SIZE 1024           // number of bytes in array, minimize for adequate firmware size, max is 1024
diff --git a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
index fec2ed31e7..9ae6e04054 100644
--- a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
   [_FN1] = LAYOUT(
-		      	_______, _______, _______,      _______, _______, _______, _______,    _______, RESET,  KC_PAUS,    KC_HOME, KC_PGDN, KC_PGUP, KC_END,
+		      	_______, _______, _______,      _______, _______, _______, _______,    _______, QK_BOOT,  KC_PAUS,    KC_HOME, KC_PGDN, KC_PGUP, KC_END,
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
 		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RCTRL,
 		_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,          _______,
diff --git a/keyboards/handwired/wabi/keymaps/rossman360/keymap.c b/keyboards/handwired/wabi/keymaps/rossman360/keymap.c
index dba4e77c25..3bd46bf191 100644
--- a/keyboards/handwired/wabi/keymaps/rossman360/keymap.c
+++ b/keyboards/handwired/wabi/keymaps/rossman360/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______,          BLINE  , KC_BSPC, BWORD  , KC_NO  , KC_NO  , _______,                   _______, _______, _______
   ),
 [_FN1] = LAYOUT(
-    RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NTAB,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NTAB,
     _______, _______, _______, _______, _______, _______, _______, UNDO   , _______, _______, _______, _______, _______, KC_SLSH,
     _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_UP  , KC_RIGHT,KC_END , _______, CTAB,
     _______, _______, XPANDR , _______, PMERGE , _______, _______, PMERGE , KC_DOWN, _______, _______, _______, _______,
diff --git a/keyboards/handwired/z150/keymaps/zyxx/keymap.c b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
index 446f392203..b342b66be2 100644
--- a/keyboards/handwired/z150/keymaps/zyxx/keymap.c
+++ b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------------------------------------------------------------------------------------------------------'
 */
     [_FN1] = LAYOUT(
-    RESET,   _______, _______,  KC_F11,  KC_F12,  AU_ON,   AU_OFF,  CK_TOGG, CK_UP,   CK_DOWN, CK_RST,  _______, _______, _______, _______, KC_DEL,    KC_NLCK,    KC_PSLS,       _______,
+    QK_BOOT, _______, _______,  KC_F11,  KC_F12,  AU_ON,   AU_OFF,  CK_TOGG, CK_UP,   CK_DOWN, CK_RST,  _______, _______, _______, _______, KC_DEL,    KC_NLCK,    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,
diff --git a/keyboards/helix/pico/keymaps/biacco/keymap.c b/keyboards/helix/pico/keymaps/biacco/keymap.c
index aa196c7e6a..8bec3647d2 100644
--- a/keyboards/helix/pico/keymaps/biacco/keymap.c
+++ b/keyboards/helix/pico/keymaps/biacco/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                      KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
     _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
     _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
   /* SYMB
diff --git a/keyboards/helix/pico/keymaps/mtei/keymap.c b/keyboards/helix/pico/keymaps/mtei/keymap.c
index f641829292..b3d988530e 100644
--- a/keyboards/helix/pico/keymaps/mtei/keymap.c
+++ b/keyboards/helix/pico/keymaps/mtei/keymap.c
@@ -223,7 +223,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------------------------------'
    */
   [_ADJUST] =  LAYOUT( \
-    XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP, XXXXXXX, QWERTY,  EUCALYN, COLEMAK,  DVORAK, \
+    XXXXXXX, QK_BOOT, RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP, XXXXXXX, QWERTY,  EUCALYN, COLEMAK,  DVORAK, \
     RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
     RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
     _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ___,___, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index 4d9dc16a9e..77d7f1607e 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -343,7 +343,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] =  LAYOUT(
       XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX,
-      XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX,
+      XXXXXXX, QK_BOOT, RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX,
       RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI,
       RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD,
       _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
index 23b45ef317..e8b3087701 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
@@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------------------------------'
    */
   [_ADJUST] =  LAYOUT( \
-    XXXXXXX, RESET,   RGBRST,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, RESET,   RGBRST,  XXXXXXX, XXXXXXX, XXXXXXX, \
+    XXXXXXX, QK_BOOT, RGBRST,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, QK_BOOT, RGBRST,  XXXXXXX, XXXXXXX, XXXXXXX, \
     XXXXXXX, DL_BAS,  DL_BASE, AG_NORM, AG_SWAP, XXXXXXX,                   XXXXXXX, DL_BAS,  DL_BASE, AG_NORM, AG_SWAP, XXXXXXX, \
     XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,                   XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, \
     XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, \
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c b/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
index 1ac0c8239e..69f54a9de2 100644
--- a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
+++ b/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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,  RESET,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   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 \
         )
 };
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
index 484a0a34b9..eb574f9778 100644
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------'
    */
   [_FUNC] = LAYOUT_half( \
-      RGBRST,RGB_HUI, _______, RESET,   MAC,     WIN,               \
+      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,   _______, \
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
index 2e1464bedf..a5a82eca98 100644
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
@@ -225,7 +225,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------'
    */
   [_FUNC] = LAYOUT_half( \
-      RGBRST,RGB_HUI, TO_101,  RESET,   MAC,     WIN,               \
+      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,   _______, \
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
index d9102cb59f..5fecc2f766 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_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, \
-      _______, RESET,   RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, \
+      _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, \
       _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \
@@ -274,7 +274,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------------------------------'
    */
   [_ADJUST] =  LAYOUT( \
-      _______, RESET,    RGBRST, _______, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, \
+      _______, QK_BOOT,  RGBRST, _______, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, \
       _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
       _______, _______, _______, _______, _______, _______,                   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
index 4d9dc16a9e..77d7f1607e 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
@@ -343,7 +343,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] =  LAYOUT(
       XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX,
-      XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX,
+      XXXXXXX, QK_BOOT, RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX,
       RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI,
       RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD,
       _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
index 55d482e062..d57d3ccdc7 100644
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [UTIL] = LAYOUT(
-        RESET, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DEBUG,
+        QK_BOOT, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DEBUG,
         ____, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, ____, KC_HOME, KC_PGDN, KC_PGUP, KC_END, ____, ____, ____, ____,
         ____, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ____, ____, ____,
         ____, ____, ____, ____, ____, KC_SPC, ____, ____, ____, ____, ____, ____, ____,
diff --git a/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c b/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
index d7aea97736..1adb6ce5be 100644
--- a/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
@@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[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_CAPS, KC_MFFD, 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__MUTE, KC__VOLDOWN, KC__VOLUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
-	[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, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_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),
+	[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, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS),
 
     [3] = LAYOUT(KC_GESC, KC_EXLM, KC_EML, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGDN, KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_TRNS)
 };
diff --git a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c b/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
index eebaede979..9bc5d59302 100644
--- a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   /* Layer 3: Functions */
   [_FL] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RESET  ,
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT,
     _______, _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
     KC_CAPS, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
     _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END,  _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
index 0b986a5099..16844a6c6e 100644
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL,
 
                                   _______, KC_RGHT, _______,    _______, _______, _______,
-                                           KC_LEFT, _______,    RESET  , _______
+                                           KC_LEFT, _______,    QK_BOOT, _______
   ),
 
   [_RAISE] = LAYOUT(
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
     _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, RESET  , _______,           _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, QK_BOOT, _______,           _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______,
 
diff --git a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
index 507dd0b151..96d94d253c 100644
--- a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
@@ -65,6 +65,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     //-------------------------------//
                     _______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
                     //-------------------------------//
-                    RESET, _______, _______, _______, _______, RESET,
+                    QK_BOOT, _______, _______, _______, _______, QK_BOOT,
                     //-------------------------------//
                     _______, KC_F11, KC_F12, _______)};
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c b/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
index 0ed6ca94e7..cb575caf88 100644
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_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, 
-  RESET,   _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, RESET,
+  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, QK_BOOT,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT(
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, RESET,   _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
+  _______, QK_BOOT, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,     _______, WINDOWS, MAC,     _______, _______, _______,
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
                              _______, _______, _______,     _______, _______, _______,
diff --git a/keyboards/hineybush/h60/keymaps/kei/keymap.c b/keyboards/hineybush/h60/keymaps/kei/keymap.c
index 528e1ac970..30a289b9ff 100644
--- a/keyboards/hineybush/h60/keymaps/kei/keymap.c
+++ b/keyboards/hineybush/h60/keymaps/kei/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI,  KC_RALT),
     [_FN] = LAYOUT_60_hhkb(
     KC_TRNS, BL_TOGG, BL_DEC,  BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_MPLY,                                     KC_TRNS, KC_TRNS),
diff --git a/keyboards/hineybush/h75_singa/keymaps/wkl_std/keymap.c b/keyboards/hineybush/h75_singa/keymaps/wkl_std/keymap.c
index 694d851d94..3b3aa15679 100644
--- a/keyboards/hineybush/h75_singa/keymaps/wkl_std/keymap.c
+++ b/keyboards/hineybush/h75_singa/keymaps/wkl_std/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_wkl_std(
     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, RESET,   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_MOD,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_MOD,
     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
index d505d5171d..8a0013b55e 100644
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *    *-----------------------------------------------------------------------*
     */
     [_AL] = LAYOUT_all( \
-        RESET,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, \
+        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          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_DEC,  BL_INC,  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,                                     \
diff --git a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
index 985baca2a7..8e3c1efcb7 100644
--- a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
@@ -23,5 +23,5 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [0] = LAYOUT_all(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_LSPO, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, LT(2,KC_HOME), KC_UP, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_APP, RCTL_T(KC_END), KC_LEFT, KC_DOWN, KC_RGHT),
         [1] = LAYOUT_all(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-        [2] = LAYOUT_all(KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_VAI, RGB_SPI, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
+        [2] = LAYOUT_all(KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_VAI, RGB_SPI, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
\ No newline at end of file
diff --git a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
index bcfb9ed5bc..aff976549d 100644
--- a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
+++ b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_wkl(
     KC_TRNS,  KC_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_SLCK,KC_HOME, KC_END,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  RGB_HUD, RGB_HUI,KC_TRNS, KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  RGB_SAD, RGB_SAI,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,  RGB_SAD, RGB_SAI,KC_TRNS, KC_TRNS,
     KC_CAPS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS,  RGB_VAD, RGB_VAI,KC_TRNS, KC_TRNS,
     KC_TRNS,           KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_VOLU,  RGB_TOG, RGB_MOD,KC_TRNS,
     KC_TRNS,  KC_TRNS,                         KC_MPLY,                                 KC_TRNS,  KC_TRNS, KC_MPRV, KC_VOLD,  KC_MNXT, KC_TRNS,KC_TRNS, KC_TRNS
diff --git a/keyboards/hotdox/keymaps/imchipwood/keymap.c b/keyboards/hotdox/keymaps/imchipwood/keymap.c
index c5d7bc34cf..6dda884fa6 100644
--- a/keyboards/hotdox/keymaps/imchipwood/keymap.c
+++ b/keyboards/hotdox/keymaps/imchipwood/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *           |      |      |      | Lclk | Rclk |                                               |      |      | Prev |VolDn | Next |
  *           `----------------------------------'                                               `----------------------------------'
  *                                                      ,-------------.   ,-------------.
- *                                                      |RESET |      |   |      |      |
+ *                                                      |QK_BOOT |      |   |      |      |
  *                                               ,------|------|------|   |------+------+------.
  *                                               |      |      |      |   |      |      |      |
  *                                               |MPENT |      |------|   |------|      |Play  |
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_BTN1,     KC_BTN2,                                                             KC_TRNS,     KC_TRNS,     KC_MPRV,     KC_VOLD,     KC_MNXT,
 //     `---------------------------------------------------------------'                                                       `----------------------------------------------------------------'
 //                                                                     ,-------------------------.   ,-------------------------.
-                                                                         RESET,       KC_TRNS,         KC_TRNS,     KC_TRNS,
+                                                                         QK_BOOT,     KC_TRNS,         KC_TRNS,     KC_TRNS,
 //                                                        ,------------+------------+------------|   |------------+------------+------------.
                                                                                       KC_TRNS,         KC_TRNS,
 //                                                        |            |            +------------|   |------------+            |            |
diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c
index 93c0b266b6..2f9609c5c5 100644
--- a/keyboards/hotdox/keymaps/ninjonas/keymap.c
+++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c
@@ -257,7 +257,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,----------------------------------------------------.
  * |        |      |      |      |      |      |      |           |       |      |      |      |      |       |        |
  * |--------+------+------+------+------+-------------|           |-------+------+------+------+------+-------+--------|
- * | M_MAKE |RESET |      |      |      |      |      |           |       |      |      |      |COLMAK|DVORAK |QWERTY  |
+ * | M_MAKE |QK_BOOT |      |      |      |      |      |           |       |      |      |      |COLMAK|DVORAK |QWERTY  |
  * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
  * | M_VRSN |M_MALL|      |      |      |      |------|           |-------|      |      |      |      |       |        |
  * |--------+------+------+------+------+------|      |           |       |------+------+------+------+-------+--------|
diff --git a/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
index 11d8048f13..b691b115fb 100644
--- a/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_60_ansi(
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST,
-	_______, EF_INC,  ES_INC,  S1_INC,  H1_INC,  S2_INC,  H2_INC,  BR_INC,  _______, _______, _______, _______, _______, RESET,
+	_______, EF_INC,  ES_INC,  S1_INC,  H1_INC,  S2_INC,  H2_INC,  BR_INC,  _______, _______, _______, _______, _______, QK_BOOT,
 	_______, EF_DEC,  ES_DEC,  S1_DEC,  H1_DEC,  S2_DEC,  H2_DEC,  BR_DEC,  _______, _______, _______, _______, KC_MAKE,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 	_______, _______, _______,                   _______,                   _______, _______, _______, TG(_DEFAULT))
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c
index 6273dbc646..0b94aa88da 100644
--- a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c
+++ b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,                KC_SPC,                            KC_RALT,  KC_RGUI,          KC_RCTL          ),
 
 [1] = LAYOUT_60_hhkb( /* FN */
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_TRNS,  KC_TRNS,\
+    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,\
diff --git a/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c b/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c
index 31d7ec1ed8..81abccb313 100644
--- a/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c
+++ b/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,    OSX_ALT,    KC_LGUI,                                KC_SPC,                                                 KC_RGUI,    KC_RALT,    RAISE ,     KC_RCTL),
 
 [_RAISE] = LAYOUT_60_iso( /* Configuration */
-    RESET,       KC_F1,     KC_F2,     KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,       KC_F10,     KC_F11,     KC_F12,     KC_DEL ,\
+    QK_BOOT,     KC_F1,     KC_F2,     KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,       KC_F10,     KC_F11,     KC_F12,     KC_DEL ,\
     KC_TRNS,     QWERTY,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    OSX,         KC_TRNS,    KC_TRNS,    KC_TRNS,            \
     KC_TRNS,     EF_INC,    H1_INC,    S1_INC,     H2_INC,     S2_INC,     BR_INC,     ES_INC,     KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,\
     KC_TRNS,     KC_UP,     EF_DEC,    H1_DEC,     S2_DEC,     H2_DEC,     S2_DEC,     BR_DEC,     ES_DEC,     KC_TRNS,     KC_TRNS,    KC_TRNS,                KC_TRNS,\
diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c
index 10f641b6f8..39d94b340b 100644
--- a/keyboards/hub16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/hub16/keymaps/ahk_companion/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_MPLY, KC_MUTE,
                 KC_MPRV, KC_MPLY, KC_U,   KC_K,
                 KC_NO,   KC_NO,   KC_ENT, KC_X,
-                KC_NO,   RESET,   LSFT(KC_HASH),   KC_J,
+                KC_NO,   QK_BOOT, LSFT(KC_HASH),   KC_J,
                 TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_MPLY, KC_MUTE,
                 RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
                 RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EEP_RST, RESET,     KC_LSHIFT,
+                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSHIFT,
                 KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/hub16/keymaps/macro/keymap.c b/keyboards/hub16/keymaps/macro/keymap.c
index e4cf9da5eb..1da30d564f 100755
--- a/keyboards/hub16/keymaps/macro/keymap.c
+++ b/keyboards/hub16/keymaps/macro/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, RGB_MOD, RGB_RMOD, RGB_TOG,
     RGB_VAD, RGB_VAI, RGB_HUD,  RGB_HUI,
     RGB_SAD, RGB_SAI, _______,  _______,
-    _______, _______, RESET,    TD(BASE)
+    _______, _______, QK_BOOT,  TD(BASE)
   ),
 };
 
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c
index 4790feda0a..ba4fe59235 100644
--- a/keyboards/hub16/keymaps/peepeetee/keymap.c
+++ b/keyboards/hub16/keymaps/peepeetee/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 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,  EEP_RST, RESET,     KC_TRNS
+                RGB_TOG,  EEP_RST, QK_BOOT,   KC_TRNS
         ),
 
         [3] = LAYOUT(
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 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,  EEP_RST, RESET,     KC_TRNS
+                RGB_TOG,  EEP_RST, QK_BOOT,   KC_TRNS
         )
 
 
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //                 KC_MPLY, KC_MUTE,
         //         KC_MPRV, KC_MPLY, KC_U,   KC_K,
         //         KC_NO,   KC_NO,   KC_ENT, KC_X,
-        //         KC_NO,   RESET,   LSFT(KC_HASH),   KC_J,
+        //         KC_NO,   QK_BOOT, LSFT(KC_HASH),   KC_J,
         //         TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         // ),
 
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //                 KC_MPLY, KC_MUTE,
         //         RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
         //         RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-        //         RGB_TOG,  EEP_RST, RESET,     KC_LSHIFT,
+        //         RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSHIFT,
         //         KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         // ),
 };
diff --git a/keyboards/hub20/keymaps/left_hand_numpad/keymap.c b/keyboards/hub20/keymaps/left_hand_numpad/keymap.c
index b5817ab3c5..2b522a9975 100644
--- a/keyboards/hub20/keymaps/left_hand_numpad/keymap.c
+++ b/keyboards/hub20/keymaps/left_hand_numpad/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_PENT,  KC_PDOT,    KC_P0
 ),
     [1] = LAYOUT_left_handed(
-                   RESET,  _______,
+                   QK_BOOT,  _______,
        RGB_TOG, RGB_RMOD,  RGB_MOD,    _______,
        _______,  RGB_VAD,  RGB_VAI,    _______,
                  RGB_HUD,  RGB_HUI,    _______,
diff --git a/keyboards/hub20/keymaps/macro/keymap.c b/keyboards/hub20/keymaps/macro/keymap.c
index 099fff8755..5fb1891ea7 100644
--- a/keyboards/hub20/keymaps/macro/keymap.c
+++ b/keyboards/hub20/keymaps/macro/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_Q,  KC_R,  KC_S,  KC_T
 ),
     [_CTRL] = LAYOUT_all(
-                   RESET,  _______,
+                   QK_BOOT,  _______,
        RGB_TOG, RGB_RMOD,  RGB_MOD,   TD(BASE),
        _______,  RGB_VAD,  RGB_VAI,    _______,
        _______,  RGB_HUD,  RGB_HUI,    _______,
diff --git a/keyboards/hub20/keymaps/right_hand_numpad/keymap.c b/keyboards/hub20/keymaps/right_hand_numpad/keymap.c
index ad3e5f49a3..d6244d652c 100644
--- a/keyboards/hub20/keymaps/right_hand_numpad/keymap.c
+++ b/keyboards/hub20/keymaps/right_hand_numpad/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P0,   KC_PDOT,          KC_PENT
 ),
     [1] = LAYOUT_right_handed(
-                   RESET,  _______,
+                   QK_BOOT,  _______,
        RGB_TOG, RGB_RMOD,  RGB_MOD,    _______,
        _______,  RGB_VAD,  RGB_VAI,
        _______,  RGB_HUD,  RGB_HUI,    _______,
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
index 35e0e1db97..909b1035c5 100644
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
@@ -240,7 +240,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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,   RESET,           KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1),
+        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/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
index eb5853e90e..66973a32ed 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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, RESET,      _______,_______,_______,_______,_______,
+    _______,CLSGUI, _______,CONPST, QK_BOOT,    _______,_______,_______,_______,_______,
                             _______,_______,    _______,_______,
                             _______,_______,    _______,_______
 ),
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
index 7dddeb4089..3e61839b14 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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, RESET,      _______,_______,_______,_______,_______,
+    _______,CLSGUI, _______,CONPST, QK_BOOT,    _______,_______,_______,_______,_______,
                             _______,_______,    _______,_______
 ),
 };
diff --git a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
index 87a6692090..eac16f142a 100644
--- a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RCTL
     ),
     [1] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  _______,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
index c34d1774ea..bda744bef3 100644
--- a/keyboards/idb/idb_60/keymaps/pngu/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI
     ),
     [1] = LAYOUT(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        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,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/idobao/id75/keymaps/drewdobo/keymap.c b/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
index 9dfc335e82..1fc047edcc 100644
--- a/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
+++ b/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, RESET,   XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, QK_BOOT, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, \
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, \
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, Z_MAC,   _______, XXXXXXX, KC_HOME, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, \
diff --git a/keyboards/idobao/id75/keymaps/egstad/keymap.c b/keyboards/idobao/id75/keymaps/egstad/keymap.c
index febbad7c6e..9bd350aa7e 100644
--- a/keyboards/idobao/id75/keymaps/egstad/keymap.c
+++ b/keyboards/idobao/id75/keymaps/egstad/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    TD_BRAC, \
     _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  \
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT_SHFT, \
-    LG_ZMOT, LG_ZMIN, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, _______, RESET,   _______, FN_SPC,  KC_ENT,  KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT  \
+    LG_ZMOT, LG_ZMIN, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, _______, QK_BOOT, _______, FN_SPC,  KC_ENT,  KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT  \
  ),
 
 
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | RGB    |        |        |        |        |        | RGB VD | RGB VI |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RESET  |        |        |        |        |        | RGB RMD| RGB MD |        |        | PLAY   | PREV   | VOL UP | VOL DN | NEXT   |
+ * | QK_BOOT  |        |        |        |        |        | RGB RMD| RGB MD |        |        | PLAY   | PREV   | VOL UP | VOL DN | NEXT   |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, \
     KC_ASTG, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______, \
     RGB_TOG, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, \
-    RESET,   _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, KC_MPLY, KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD  \
+    QK_BOOT, _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, KC_MPLY, KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD  \
  ),
 };
 
diff --git a/keyboards/idobao/id75/keymaps/gkbd/keymap.c b/keyboards/idobao/id75/keymaps/gkbd/keymap.c
index 16e16cd855..b4dec42cad 100644
--- a/keyboards/idobao/id75/keymaps/gkbd/keymap.c
+++ b/keyboards/idobao/id75/keymaps/gkbd/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 	),
 	[2] = LAYOUT_ortho_5x15(/* Function keys */
-		RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG,
+		QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG,
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_SLCK, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_PAUS,
 		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
index be67aead4e..b7f7477904 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
+++ b/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_PGDN, KC_PSCR, KC_INS, KC_DEL, LT(1,KC_F11), KC_BSPC, KC_LSFT, KC_RCTL, KC_SPC, LT(1,KC_F12), KC_HOME, KC_END, KC_LEFT, KC_DOWN, KC_RGHT
 		),
 	[1] = LAYOUT_ortho_5x15(
-			RESET, KC_NO, 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,
+			QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG,
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 			KC_NO, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_SLCK, KC_NO, KC_NO, KC_PAUS, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_NO, KC_NO,
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
index a603eae657..8fa10b0ac2 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
+++ b/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
@@ -73,6 +73,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 			KC_SLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS,
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-			RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG
+			QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG
 		)
 };
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
index d23bc7c7df..ffe2c6053b 100644
--- a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
+++ b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  /* ADJUST
  * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | RESET  |        |        |        |        |        |        |        |        |rgbplain|rgbtest | rgbmode|        |        |        |
+ * | QK_BOOT  |        |        |        |        |        |        |        |        |rgbplain|rgbtest | rgbmode|        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        |rgb tog | bl_tog |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_5x15( 
-    RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_M_P, RGB_M_T, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX,  
+    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_INC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
   EEP_RST, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
diff --git a/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c b/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
index ea6831d6da..e622660d96 100644
--- a/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
+++ b/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[2] = LAYOUT_ortho_5x15(
 		KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MUTE, KC_VOLD, KC_VOLU, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
 		KC_MSEL, BL_BRTG, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_UP), LSFT(KC_RGHT), KC_NO, KC_NO, 
-		KC_SLEP, BL_STEP, RGB_SAD, RGB_SAI, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, RESET, 
+		KC_SLEP, BL_STEP, RGB_SAD, RGB_SAI, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, QK_BOOT, 
 		KC_NO, BL_TOGG, RGB_VAD, RGB_VAI, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NO, LCTL(KC_LEFT), LCTL(KC_DOWN), LCTL(KC_UP), LCTL(KC_RGHT), KC_NO, KC_NO, 
 		KC_NO, RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO, KC_NO, KC_WBAK, KC_NO, KC_WFWD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
 	[3] = LAYOUT_ortho_5x15(
diff --git a/keyboards/idobao/id75/keymaps/revok75/keymap.c b/keyboards/idobao/id75/keymaps/revok75/keymap.c
index a380240326..3c23bfff5a 100644
--- a/keyboards/idobao/id75/keymaps/revok75/keymap.c
+++ b/keyboards/idobao/id75/keymaps/revok75/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	* .--------------------------------------------------------------------------------------------------------------------------------------.
 	* | ESC    | F1     | F2     | F3     | F4     | F5     | F6    | F7     | F8     | F9     | F10    | VOLDN   | VOLUP  | MUTE   | DEL    |
 	* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-	* | TAB    | -      | WIN    | -      | -      | RGB_TOG| -     | -      | OPTION  | RESET  | -      | [      | ]     | -       | -      |
+	* | TAB    | -      | WIN    | -      | -      | RGB_TOG| -     | -      | OPTION  | QK_BOOT  | -      | [      | ]     | -       | -      |
 	* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
 	* | CAP LK | MAC    | RAINBOW| PLAIN  | -      | -      | -     | -      | -      | -      | ;      | '       | ENTER |  ENTER  | REF    |
 	* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  	[_FN] = LAYOUT_ortho_5x15( /* OSLAYOUT + NUMPAD + MEDIA + LIGHTING */
   	KC_TRNS, KC_F1,     KC_F2,						 KC_F3,    		   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_VOLD, KC_VOLU, KC_MUTE, KC_DEL, \
-  	KC_TRNS, KC_NO,     DF(_QW_W),    		 KC_NO,    		   KC_NO,   RGB_TOG, KC_NO,   KC_NO,   KC_RALT, RESET,   KC_NO,   KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, \
+  	KC_TRNS, KC_NO,     DF(_QW_W),    		 KC_NO,    		   KC_NO,   RGB_TOG, KC_NO,   KC_NO,   KC_RALT, QK_BOOT, KC_NO,   KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, \
   	KC_TRNS, DF(_QW_M), RGB_MODE_RAINBOW,  RGB_MODE_PLAIN, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
   	KC_TRNS, RGB_VAI,   RGB_VAD,  				 RGB_HUI,  		   RGB_HUD, RGB_SAI, RGB_SAD, KC_NO,   KC_NO,   KC_DOT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, \
   	KC_TRNS, KC_TRNS,   KC_TRNS,  				 KC_TRNS,  		   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_END,	 KC_PGDN \
diff --git a/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c b/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
index c157317e2d..fee0df2b4b 100644
--- a/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
+++ b/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | SELECT | CALC   | UP     |        |        | NEXT   | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | LEFT   | DOWN   | RIGHT  | DEL    | PLAY   | P4     | P5     | P6     | +      |        | RESET  |        |        |        |
+ * | PREV   | LEFT   | DOWN   | RIGHT  | DEL    | PLAY   | P4     | P5     | P6     | +      |        | QK_BOOT  |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | VOL-   | MUTE   | VOL+   | APP    |        | STOP   | P1     | P2     | P3     | PENT   |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
    KC_MSEL, KC_CALC, KC_UP  , _______, _______, KC_MNXT, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, \
-   KC_MPRV, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_MPLY, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______, \
+   KC_MPRV, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_MPLY, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______, \
    KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  _______, KC_MSTP, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______, \
    _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______  \
  ),
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
index d0aab9b747..07a7b16229 100644
--- a/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
@@ -414,7 +414,7 @@
       "RGB_MOD"
     ],
     [
-      "RESET",
+      "QK_BOOT",
       "RV_SM0S",
       "RV_SM1S",
       "RV_SM2S",
diff --git a/keyboards/illusion/rosa/keymaps/oggi/keymap.c b/keyboards/illusion/rosa/keymaps/oggi/keymap.c
index 9fdb762f04..3ddf9b8d2c 100644
--- a/keyboards/illusion/rosa/keymaps/oggi/keymap.c
+++ b/keyboards/illusion/rosa/keymaps/oggi/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_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, RESET,   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, 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
diff --git a/keyboards/illusion/rosa/keymaps/split_bs_rshift/keymap.c b/keyboards/illusion/rosa/keymaps/split_bs_rshift/keymap.c
index 6cd4378c74..14b9ef10e6 100644
--- a/keyboards/illusion/rosa/keymaps/split_bs_rshift/keymap.c
+++ b/keyboards/illusion/rosa/keymaps/split_bs_rshift/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_60_ansi_tsangan_split_bs_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_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
+        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_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                                    KC_TRNS,                                      KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/illusion/rosa/keymaps/split_rshift/keymap.c b/keyboards/illusion/rosa/keymaps/split_rshift/keymap.c
index 15bbfef04a..072739c306 100644
--- a/keyboards/illusion/rosa/keymaps/split_rshift/keymap.c
+++ b/keyboards/illusion/rosa/keymaps/split_rshift/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_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, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
index 675b56edec..266194de35 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
@@ -311,7 +311,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ergodox(
   // left hand
   VRSN,    _______, _______, _______, _______, _______, _______,
-  _______, RESET,   DEBUG,   BL_TOGG, BL_STEP, _______, _______,
+  _______, QK_BOOT, DEBUG,   BL_TOGG, BL_STEP, _______, _______,
   KC_CAPS, _______, _______, _______, _______, AG_NORM,
   _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
index 50e3238a7d..a95302b3f6 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   //**************************MOUSE MOVEMENT LAYER**************************
   [_MOUSE] = LAYOUT_ergodox(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
-                    RESET,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________,
+                    QK_BOOT,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________,
                     ________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN,
                     KC_SECRET_5,KC_SECRET_4,KC_SECRET_3,_XXXXXX_,KC_SECRET_2,KC_SECRET_1,_XXXXXX_,
                     ________,________,HYPR(KC_F15),KC_MS_WH_LEFT,KC_MS_WH_RIGHT,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index c8498fe9e9..0498cb48bb 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -354,7 +354,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   LCTL(KC_Q),   LCTL(KC_W),LCTL(KC_E),LCTL(KC_R),LCTL(KC_T),   KC_NO,
         KC_BSPC,  LCTL(KC_A),   LCTL(KC_S),LCTL(KC_D),LCTL(KC_F),LCTL(KC_G),
         KC_LSFT,  LCTL(KC_Z),  	LCTL(KC_X),LCTL(KC_C),LCTL(KC_V),LCTL(KC_B),   KC_MINUS,
-        RESET, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRANSPARENT,
+        QK_BOOT, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRANSPARENT,
                                               TG(SYMB),  TG(DVORAK),
 
                                                               TG(FUNCTION),
@@ -364,7 +364,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              TG(SYMB),LCTL(KC_Y),LCTL(KC_U),LCTL(KC_I),LCTL(KC_O),LCTL(KC_P),KC_BSLS,
                           LCTL(KC_H),LCTL(KC_J),LCTL(KC_K),LCTL(KC_L),LCTL(KC_SCLN),KC_ENT,
              KC_EQL,LCTL(KC_N),LCTL(KC_M),LCTL(KC_COMM),LCTL(KC_DOT),LCTL(KC_SLASH),KC_RSFT,
-                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           RESET,
+                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           QK_BOOT,
              TG(PROPERSTENO),TG(PLVR),
              KC_NO,
              KC_NO,KC_NO, KC_NO
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
index e941cee154..13cf68e758 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |     |     |     |
  *                                  +-----+-----+-----+
  */
-       RESET,   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,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
index 184eb638c9..4869cfae20 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
@@ -427,7 +427,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
-        _______, RESET,    _______,   _______,   _______,   _______,   _______,
+        _______, QK_BOOT,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,   AG_NORM,
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index 70f49bb5c9..a122b83af8 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 3: Media and mouse keys
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | RESET  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * | QK_BOOT  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |      | Lclk | MsUp | Rclk |      |      |           |      |      |VolDwn| Mute |VolUp |      |   F12  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
-   RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
+   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,  _______,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
index 8cf51842a2..ad512082fb 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
@@ -215,7 +215,7 @@ L06 -> <TBD>: UNSPECIFIED
 
 /* LFN -> MO(FN): FUNCTION
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | RESET  |      |      |      |      |      |      |           |      |      |      |      |      |      | RESET  |
+ * | QK_BOOT  |      |      |      |      |      |      |           |      |      |      |      |      |      | QK_BOOT  |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |                                  |      |           |      |                                  | BACKSPC|
  * |--------+                                  |      |           |      |                                  +--------|
@@ -234,7 +234,7 @@ L06 -> <TBD>: UNSPECIFIED
  *                                 `--------------------'       `--------------------'
  */
 [LFN] = LAYOUT_ergodox_wrapper(
-  RESET,   _______, _______, _______, _______, _______, _______,
+  QK_BOOT, _______, _______, _______, _______, _______, _______,
   _______,                 L06_LEFT_01,                 _______,
   _______,                 L06_LEFT_02,
   _______,                 L06_LEFT_03,                 _______,
@@ -243,7 +243,7 @@ L06 -> <TBD>: UNSPECIFIED
                                                         _______,
                                       _______, _______, _______,
   //--
-  _______, _______, _______, _______, _______, _______, RESET,
+  _______, _______, _______, _______, _______, _______, QK_BOOT,
   _______,                 L06_RIGHT_01,                KC_BSPACE,
                            L06_RIGHT_02,                KC_INSERT,
   _______,                 L06_RIGHT_03,                KC_DELETE,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
index b202823c77..e8df522bee 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS,  KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS,
                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       RESET,   KC_TRNS,
+       QK_BOOT, KC_TRNS,
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
index 1611c25e41..96325514c9 100644
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, _______, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_L1), KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_L1] = LAYOUT_tkl_ansi(
-        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG, RGB_MOD, _______,
+        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,
diff --git a/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
index 2388201b7e..5c63d2e5e7 100644
--- a/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
@@ -111,7 +111,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------------------------------------------------------------'
      */
     [_FUNC] = LAYOUT( \
-      RESET,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,_______,_______,\
+      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_WH_D,KC_BTN2,KC_MS_U,KC_BTN1,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,\
       _______,KC_WH_U,KC_MS_L,KC_MS_D,KC_MS_R,AG_NORM,AG_SWAP,QWERTY, WORKMAN,DVORAK, COLEMAK,_______,_______,_______,        _______,\
       _______,_______,KC_WH_L,KC_BTN3,KC_WH_R,_______,_______,_______,_______,_______,_______,_______,_______,        KC_VOLU,_______,\
diff --git a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
index baaa136873..eab5ad85d7 100644
--- a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
@@ -46,7 +46,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT( \
         _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,_______,_______,\
         _______,KC_MPRV,KC_MNXT,KC_VOLU,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______ ,     BL_TOGG ,\
-        _______,KC_MPLY,KC_MSTP,KC_VOLD,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET,     BL_INC,\
+        _______,KC_MPLY,KC_MSTP,KC_VOLD,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,   BL_INC,\
         _______,_______,_______,KC_MUTE,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,BL_DEC,\
         _______,_______,_______,               _______,          _______,_______,_______,     KC_HOME,_______,KC_END  \
     ),
diff --git a/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
index 67aed537dd..584719ed25 100644
--- a/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______,
+        _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, MO(2), KC_TRNS, _______, _______, _______
diff --git a/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c b/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c
index 7ee14dda8b..8f0ce714ec 100644
--- a/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c
+++ b/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN2_60] = LAYOUT_full_bs(
              _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,  _______,     RGB_TOG,
-            _______,  _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______, _______, _______,  _______, RESET,
+            _______,  _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______, _______, _______,  _______, QK_BOOT,
            _______,   _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,  _______,   _______,   KC_MAKE,
                       _______, _______, _______, _______, _______, _______,                _______, NK_TOGG, _______, _______, _______, _______, RGB_MOD, RGB_VAI,
                       TG(_DEFAULT), _______, _______, _______,                             _______,     _______,                        RGB_HUD, RGB_VAD, RGB_HUI
diff --git a/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c b/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
index c384d36d3f..cbb5e8c237 100644
--- a/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
+++ b/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
@@ -17,8 +17,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_RAISE] = LAYOUT(
                  KC_GRV,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11,KC_F12,KC_BSLS,KC_BSPC, KC_DEL,
-                 KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,KC_PSCR,KC_LBRC,KC_RBRC,          RESET,KC_PGUP,
-                 KC_CTES,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,  RESET,         KC_ENT,KC_PGDN,
+                 KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,KC_PSCR,KC_LBRC,KC_RBRC,          QK_BOOT,KC_PGUP,
+                 KC_CTES,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,  QK_BOOT,       KC_ENT,KC_PGDN,
                  KC_LSFT,KC_NUBS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,  KC_UP,KC_HOME,
                  KC_LCTL,KC_LGUI,KC_LALT,         KC_SPC, KC_SPC, KC_SPC,                        KC_RALT,KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT
                  ),
diff --git a/keyboards/jc65/v32a/keymaps/rys/keymap.c b/keyboards/jc65/v32a/keymaps/rys/keymap.c
index f946c8eebf..a88c7a8685 100644
--- a/keyboards/jc65/v32a/keymaps/rys/keymap.c
+++ b/keyboards/jc65/v32a/keymaps/rys/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LALT, KC_LGUI,          XXXXXXX,  KC_SPC, XXXXXXX,                            XXXXXXX, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FUNC] = LAYOUT(
-        RGB_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,   RESET,
+        RGB_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,   QK_BOOT,
         RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
        RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, _______,
diff --git a/keyboards/jc65/v32u4/keymaps/coth/keymap.c b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
index 800516a2be..990d32220b 100644
--- a/keyboards/jc65/v32u4/keymaps/coth/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, RESET,
+      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_INC,   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_DEC,   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,
diff --git a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
index 528bde8852..d02b67a930 100644
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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(
-      RESET,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_PAUS, KC_TRNS,
+      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_INC,  BL_DEC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
index 453cd2360d..7d0902b967 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
@@ -167,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,          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,
-        RESET,   XXXXXXX,          XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMP2
+        QK_BOOT, XXXXXXX,          XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMP2
     ),
 };
 
diff --git a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
index 992640523a..7e24d2f96b 100644
--- a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_HOME, KC_PGDN, KC_END
       ),
   [2] = LAYOUT(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       MO(1), RGB_SAD, RGB_SAI, KC_TRNS, KC_TRNS, RGB_HUD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c b/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
index 68560464b6..e7e907972d 100644
--- a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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(
-      RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
+      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,
diff --git a/keyboards/jc65/v32u4/keymaps/naut/keymap.c b/keyboards/jc65/v32u4/keymaps/naut/keymap.c
index 2fa5ec47c4..33e0a264ff 100644
--- a/keyboards/jc65/v32u4/keymaps/naut/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/naut/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,
           KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,                  KC_NO,  KC_NO,
           KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,
-          RESET,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,                          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
+          QK_BOOT,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,                          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
     ),
 };
 
diff --git a/keyboards/jd45/keymaps/blakedietz/keymap.c b/keyboards/jd45/keymaps/blakedietz/keymap.c
index a40a2c604e..a6631c9d99 100644
--- a/keyboards/jd45/keymaps/blakedietz/keymap.c
+++ b/keyboards/jd45/keymaps/blakedietz/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET),
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT),
     /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
 
     /* VIM
diff --git a/keyboards/jd45/keymaps/jeebak/keymap.c b/keyboards/jd45/keymaps/jeebak/keymap.c
index bb6c829382..a14009a43b 100644
--- a/keyboards/jd45/keymaps/jeebak/keymap.c
+++ b/keyboards/jd45/keymaps/jeebak/keymap.c
@@ -277,7 +277,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET)
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT)
     /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
 };
 
diff --git a/keyboards/jd45/keymaps/mjt6u/keymap.c b/keyboards/jd45/keymaps/mjt6u/keymap.c
index dc7c3bb7e3..64b6139a50 100644
--- a/keyboards/jd45/keymaps/mjt6u/keymap.c
+++ b/keyboards/jd45/keymaps/mjt6u/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] = LAYOUT( \
-    _______, RESET,   _______, _______, _______,   _______, _______,    DYN_REC_START1,  DYN_REC_START2,  _______,  KC_PSCR, _______, _______, \
+    _______, QK_BOOT, _______, _______, _______,   _______, _______,    DYN_REC_START1,  DYN_REC_START2,  _______,  KC_PSCR, _______, _______, \
     _______, _______, _______, _______, USEFNMODS, _______, _______,    DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, MACSLEEP, _______,          _______, \
     _______, _______, _______, _______, _______,   _______, USENUMMODS, _______,         _______,         _______,  _______,          _______, \
     XXXXXXX, _______, _______, XXXXXXX,            XXXXXXX,             _______,                          XXXXXXX, __MOD__,  __MOD__, XXXXXXX  \
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 4aad7b65ad..721adaaee7 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -212,7 +212,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_symmetric(
-  RESET,   DEBUG,   KC_ASUP, CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,
+  QK_BOOT, DEBUG,   KC_ASUP, CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,
            KC_ASRP, KC_ASTG, XXXXXXX, XXXXXXX, QWERTY,  PLOVER,
            BL_ADJ,  KC_ASDN, XXXXXXX, XXXXXXX, ISO,     THUMB_ALT,
                                       _______, SW_TG,   _______
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index d2518a2535..ab24c63ed4 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      _______, _______, LT(_ADJUST, KC_ESC)
 ),
 [_ADJUST] = LAYOUT_symmetric_left(
-  RESET,   DEBUG,   XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
+  QK_BOOT, DEBUG,   XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
            XXXXXXX, XXXXXXX, BL_DEC,  RGB_VAD, RGB_SAD, RGB_SAI,
            XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
                                       _______, _______, _______
diff --git a/keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c b/keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c
index 1a7b1f7192..2123947ac1 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c
+++ b/keyboards/jkeys_design/gentleman65_se_s/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, RGB_MOD, 
 		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_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,          RGB_HUI, RGB_VAD, 
-		RESET,    KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
+		QK_BOOT,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
   ),
 
 };
diff --git a/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c b/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c
index 0dce806270..9f996bb43b 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c
+++ b/keyboards/jkeys_design/gentleman65_se_s/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, RGB_MOD, 
 		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_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,          RGB_HUI, RGB_VAD, 
-		RESET,    KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
+		QK_BOOT,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
 	),
 
 	[2] = LAYOUT_all(
diff --git a/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
index 174e9ff2e6..33fa31c261 100644
--- a/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
+++ b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'             `-----------------------------------------'
    */
     [_ADJUST] = LAYOUT_extended(
-      _______, RESET,   _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,        KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, KC_ESC,
+      _______, QK_BOOT, _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,        KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, KC_ESC,
       KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,       KC_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
       _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,       KC_P1,   KC_P2,   KC_P3,  KC_PENT, KC_PAST, KC_PEQL,
       _______, _______, _______, _______, _______, _______,           _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,        KC_P0,   _______, KC_PDOT,_______, KC_PMNS, KC_BSPC
diff --git a/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c b/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
index 78107a18ec..ee96358e81 100644
--- a/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
+++ b/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'
    */
     [_ADJUST] = LAYOUT(
-      _______, RESET,   _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,
+      _______, QK_BOOT, _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,
       KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,
       _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______,           _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
diff --git a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
index f74eef4541..d75b5b6079 100644
--- a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
+++ b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
   KC_F11,  KC_F12,  RGB_RMOD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
-  RESET,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,  KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______,
+  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,  KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______,
                     _______, _______, _______,  _______, _______,  _______, _______
 )
 };
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
index 4d2fc88243..ba1c970cf7 100644
--- a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
+++ b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
   _______, KC_F10,  KC_F12,  BL_TOGG, _______, BL_INC , BL_DEC ,      _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,      _______, _______, _______, _______, _______, _______, _______,
-  _______, RESET,   _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD,      _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______,
+  _______, QK_BOOT, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD,      _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______,
                              _______, _______, _______, _______,      _______, _______, _______, _______
 )
 
diff --git a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
index 8606d24841..d1b02d00bf 100755
--- a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
+++ b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 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, RESET, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_BSPC,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, 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
index 79c3baae44..bb4ca32cf0 100644
--- a/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
+++ b/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
@@ -33,6 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,
         RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,
-		         KC_TRNS, RESET, KC_NLCK)
+		         KC_TRNS, QK_BOOT, KC_NLCK)
 };
 
diff --git a/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c b/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
index a65b53b341..e2a43886ec 100644
--- a/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
+++ b/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,
         RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RESET,   KC_NLCK)
+		KC_TRNS, KC_TRNS, QK_BOOT, KC_NLCK)
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
index a73c961db0..5f2deda04b 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT(
   QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_MSSN, MC_SLPD, \
-  _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DEL,           KC_VOLU, \
+  _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DEL,           KC_VOLU, \
   _______, _______, _______, _______, _______, _______, _______, _______, QM_KYMP, _______, _______, _______,          TG_ADJT,          KC_VOLD, \
   _______, _______, _______, _______, QM_VRSN, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,                   KC_PGUP, KC_MUTE, \
   _______, _______, _______,                   _______,                            _______, _______,                   KC_HOME, KC_PGDN, KC_END ),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT(
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          TG_ADJT,          XXXXXXX, \
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                   XXXXXXX, XXXXXXX, \
   _______, _______, _______,                   XXXXXXX,                            _______, _______,                   XXXXXXX, XXXXXXX, XXXXXXX),
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/keymap.c
index 84c1791f81..cced6df8d7 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT(
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,  KC_TRNS, KC_MFFD,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   RESET,           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,   QK_BOOT,         KC_VOLU,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,           KC_VOLD,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index 0d542bf843..dc27913cca 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
 [_FUNCTION] = LAYOUT(
-   RESET,   KC_F1,   KC_F2,       KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR,  KC_MPLY, \
+   QK_BOOT, KC_F1,   KC_F2,       KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR,  KC_MPLY, \
    DEBUG,   KC_NO,   KC_NO,       KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,            _______,   \
    _______, KC_NO,   KC__VOLUP,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,          KC_NO,            KC_NO,   \
    _______, KC_MRWD, KC__VOLDOWN, KC_MFFD, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,                  KC_BTN1, KC_MS_U, KC_BTN2, \
@@ -141,7 +141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     shifted = record->event.pressed;
   } else if (keycode == MAGIC) {
     magic = record->event.pressed;
-  } else if (keycode == RESET) {
+  } else if (keycode == QK_BOOT) {
     // Safe reset: Only actually let this keycode through if shift is held as well. Since there's no
     // right-shift in the function layer, this means that reset is Fn+LShift+Esc, something you're
     // not likely to hit by accident. (Especially since AltGr+Esc is backtick!)
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
index ec5c0c8a8e..3248acff84 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 1: _FN1
      * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────────────────┬─────────┐
-     * │ RESET   │ KC_F1   │ KC_F2   │ KC_F3   │ KC_F4   │ KC_F5   │ KC_F6   │ KC_F7   │ KC_F8   │ KC_F9   │ KC_F10  │ KC_F11  │ KC_F12  │    _______ (2)    │ 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  │    _______ (2)    │ KC_MUTE │
      * ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤
      * │   _______    │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ KC_PSCR │ _______ │ _______ │   _______    │ KC_VOLU │
      * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────────┼─────────┤
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
      */
     [_FN1] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_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_MUTE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,          _______, KC_VOLU,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_VOLD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY, _______,
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
index 0e6cdf776a..d04874f182 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_GRV,  KC_DEL,           KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_all( /* FN */
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+	QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
 	KC_CAPS, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______, _______,
 	_______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          BL_INC,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, BL_DEC,
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c
index 1c443ae734..2d00724086 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_65_ansi_blocker_split_bs( /* FN */
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, BL_INC,
+	QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, BL_INC,
 	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
 	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, _______,
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/king/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/king/keymap.c
index 70e2237d3a..2158d6d126 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/king/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/king/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 1: _FN1
      * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────┬───────┬─────────┐
-     * │ GRAVE   │ KC_F1   │ KC_F2   │ KC_F3   │ KC_F4   │ KC_F5   │ KC_F6   │ KC_F7   │ KC_F8   │ KC_F9   │ KC_F10  │ KC_F11  │ KC_F12  │   ____│__ (2) │ RESET   │
+     * │ GRAVE   │ KC_F1   │ KC_F2   │ KC_F3   │ KC_F4   │ KC_F5   │ KC_F6   │ KC_F7   │ KC_F8   │ KC_F9   │ KC_F10  │ KC_F11  │ KC_F12  │   ____│__ (2) │ QK_BOOT   │
      * ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──┴───────┼─────────┤
      * │   _______    │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │  _______ │ KC_VOLU │
      * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────┼─────────┤
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────┴─────────┴─────────┴─────────┘
      */
     [1] = LAYOUT_all(
-        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   _______, _______,    KC_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_MUTE,
         _______,   _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______,          _______,        KC_VOLU,
         KC_CAPS,    _______, KC_LEFT,  KC_DOWN, KC_RIGHT, KC_PGDN,  _______, _______, _______, _______, _______, _______,            _______,        KC_VOLD,
         _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     _______,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
index 4ad4663ca8..ab13116a07 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_65_ansi_blocker( /* MO(1) - Fn */
         KC_GRV,        KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-        _______,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR,  KC_SLCK, KC_PAUS, RESET,    KC_PGUP,
+        _______,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,  KC_PGUP,
         CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          EEP_RST,  KC_PGDN,
         KC_LSFT,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          KC_VOLU,  KC_MUTE,
         _______,       _______,  _______,                  _______,                   _______,          _______,  KC_MPRV,          KC_VOLD,  KC_MNXT
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
index c77bbc756c..aeba99b928 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-------------------------------------------------------------------------┘   └-------------+------´
   */
 	[_FN2] = LAYOUT_65_ansi_blocker(
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RESET,     EEP_RST,
+		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   QK_BOOT,   EEP_RST,
 		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_RMOD,  RGB_MOD,   _______,   RGB_M_P,
 		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_SPD,   RGB_SPI,              _______,   RGB_VAI,
 		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              RGB_SAI,   RGB_VAD,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
index 889a1e5f1b..be5f251dac 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                        _______,  _______,  _______,                   _______,                   _______,          _______,          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, _______,
-                                       _______,  _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
+                                       _______,  _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
                                        _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, _______,
                                        _______,  _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,  _______,          _______, _______, _______,
                                        _______,  _______, _______,                   _______,                   _______,           _______,          _______, _______, _______)
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
index 98711fcd86..c2e409ed35 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT_65_ansi_blocker(
         KC_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_CALC,
-        _______,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_PSCR, KC_SLCK, KC_PAUS, _______,  _______,  _______, RESET,     KC_HOME,
+        _______,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_PSCR, KC_SLCK, KC_PAUS, _______,  _______,  _______, QK_BOOT,   KC_HOME,
         KC_CAPS,  RGB_SPI,  RGB_SPD, RGB_VAD,  RGB_VAI, _______, _______, _______, _______, _______, _______,  _______,           EEP_RST,   KC_END,
         KC_LSFT,  RGB_NITE, _______, _______,  _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, KC_MPLY,  _______,           KC_VOLU,   KC_MUTE,
         _______,  KC_WINLCK, _______,                   _______,                            _______, _______,            KC_MPRV, KC_VOLD,   KC_MNXT
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
index 65797f216d..e8df1d05bb 100644
--- 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
@@ -1 +1 @@
-{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_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_SLCK","KC_PAUS","RESET","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","EEP_RST","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"],["KC_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_SLCK","KC_PAUS","RESET","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","EEP_RST","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
+{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_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_SLCK","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","EEP_RST","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"],["KC_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_SLCK","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","EEP_RST","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
index 0aabb6d6fd..8c74707f26 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi_blocker(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_SLCK, KC_PAUS, RESET, 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, EEP_RST, 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),
+	[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_SLCK, 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, EEP_RST, 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(KC_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_SLCK, KC_PAUS, RESET, 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, EEP_RST, 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)
+	[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_SLCK, 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, EEP_RST, 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
index 9711685d4b..e6351271ea 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
@@ -1 +1 @@
-[["KC_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_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_SLCK", "KC_PAUS", "RESET", "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", "EEP_RST", "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"], ["KC_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_SLCK", "KC_PAUS", "RESET", "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", "EEP_RST", "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
+[["KC_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_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_SLCK", "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", "EEP_RST", "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"], ["KC_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_SLCK", "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", "EEP_RST", "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/spx01/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
index ca90c77b42..04b1afc691 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,              KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_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, RESET,    KC_TRNS,
+        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),
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
index 15e995bb1c..e44da80cf8 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------'  `------------'
    */
 [1] = LAYOUT_all(
-   RESET,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
+   QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
    _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
    _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
index 807b67d6f1..d5d07e1312 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_PGDN,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_MPLY, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_VOLD, KC_MFFD
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
index 235cb2e87e..94b94a8212 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT_all(
   QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_MSSN, MC_SLPD, \
-  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET,   _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DEL,           KC_VOLU, \
+  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, QK_BOOT, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DEL,           KC_VOLU, \
   _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, QM_KYMP, _______, _______, _______,          TG_ADJT,          KC_VOLD, \
   _______, XXXXXXX, RGB_TOG, RGB_LYR, RGB_THM, QM_VRSN, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,          KC_PGUP, KC_MUTE, \
   _______, _______, _______,                   XXXXXXX, _______, XXXXXXX,                   _______, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END ),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_all(
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          TG_ADJT,          XXXXXXX, \
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX, XXXXXXX, \
   _______, _______, _______,                   XXXXXXX, XXXXXXX, XXXXXXX,                   _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
index 15e995bb1c..e44da80cf8 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------'  `------------'
    */
 [1] = LAYOUT_all(
-   RESET,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
+   QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
    _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
    _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
index 7c6ef155b7..0a4648d41e 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,      KC_HOME, 
          _______,     VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,_______,_______,_______,_______,_______,      _______,      KC_END, 
          _______,_______,BL_TOGG, BL_DEC, BL_INC, BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,_______, 
-         KC_SLEP,RESET  ,_______,      LCA(KC_DEL),     LCA(KC_DEL),    LCA(KC_DEL),  LCA(KC_INS),KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
+         KC_SLEP,QK_BOOT,_______,      LCA(KC_DEL),     LCA(KC_DEL),    LCA(KC_DEL),  LCA(KC_INS),KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
        
     /* Keymap Numpad Layer
      * ,----------------------------------------------------------------.
diff --git a/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
index e7f6d90103..ef5533a59e 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *         `-------------------------------------------------------------------------´
      */
     [_RGB] = LAYOUT(
-        RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_INC, BL_DEC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
index 80c22e5d90..0e2d450496 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
 
   [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, RESET,
+      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, QK_BOOT,
       KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_DEL,
       KC_RCTL, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_MSTP, KC_ASTR, KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_PLUS, KC_UNDS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
index 03153b67ac..f59fa64ef2 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, RESET,
+      KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, QK_BOOT,
       KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MSTP, KC_TRNS, KC_ASTR, KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_PLUS, KC_UNDS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
index f3be992639..d78c51ef2d 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
 //  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 //  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______,  RESET,
+      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______,  QK_BOOT,
 //  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
 //  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
       _______,   _______,  _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______,   _______,
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
index ce341509a6..6282e1b895 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, 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,    _______,  _______,  RESET, KC_INS,
+      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),
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
 
   [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,  RESET, KC_INS,
+      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),
diff --git a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
index c33982a517..2e52bacd21 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
@@ -19,5 +19,5 @@
 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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, LT(2,KC_HOME), LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), RALT_T(KC_DEL), KC_APP, RCTL_T(KC_END)),
         [1] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_UP, KC_RBRC, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC, KC_TRNS, KC_WREF, KC_WBAK, KC_WFWD, KC_WHOM, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_PGDN),
-        [2] = LAYOUT(RGB_TOG, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_UP, KC_TRNS, KC_TRNS, KC_CAPS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS)
+        [2] = LAYOUT(RGB_TOG, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_UP, KC_TRNS, KC_TRNS, KC_CAPS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
index f3aa991f31..4bf95fb4c9 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
 
 [ONE] = LAYOUT_wrapper(
-      KC_GRV,  _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+      KC_GRV,  _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
       _______, BL_BRTG, BL_DEC,  BL_INC,  BL_TOGG, BL_STEP,  BL_ON,   KC_PGUP, KC_HOME, _______, _______, _______, _______, _______,
       _______, RGB_M_B, RGB_VAD, RGB_VAI, RGB_TOG, RGB_MOD,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
       _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______,  _______, KC_PGDN, KC_END,  _______, gGHERKIN,_______, _______,
diff --git a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c b/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
index d12ee6e1fb..32f59cfb10 100644
--- a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
@@ -160,11 +160,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *  QRT   - QWERTY Layout
    *  CLK   - COLEMAK Layout
    *  DVK   - DVORAK Layout
-   *  RESET - Put PCB into Bootstrap mode
+   *  QK_BOOT - Put PCB into Bootstrap mode
    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
    * │   │   │   │   │   │   │   │   │   │   │   │   │   │PSN│   │   │
    * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
-   * │   │TOG│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │   │   │ RESET │F13│
+   * │   │TOG│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │   │   │ QK_BOOT │F13│
    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
    * │ TAB │QRT│   │   │   │   │   │   │   │   │   │   │   │     │SNU│
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
@@ -178,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = LAYOUT_ansi_1u(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPP, _______, _______,
-    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET  ,          KC_F13 ,
+    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,          KC_F13 ,
     KC_TAB , QWERTY , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_SNU ,
     KC_CAPS, _______, _______, DVORAK , _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_SND ,
     _______,          _______, _______, COLEMAK, BL_DEC , BL_TOGG, BL_INC , BL_STEP, _______, _______, _______, _______,          KC_PAUS, KC_MUTE,
diff --git a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
index af4243c49d..c9f201ac60 100644
--- a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 	[1] = LAYOUT(
-    RESET,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
diff --git a/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c b/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
index 3828cb4a1f..bfbdd9111a 100644
--- a/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT(
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MNXT,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
diff --git a/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c b/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
index cb43052c22..ba751369bd 100644
--- a/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 	[1] = LAYOUT(
-    RESET,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,    KC_INS,
     _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
index 5a6d760355..9a3c61f7d4 100644
--- a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [MAC_FN_LAYER] = LAYOUT(
-    RESET,    KC_BRID,  KC_BRIU,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MRWD,  KC_MPLY,  KC_MFFD,  KC__MUTE,   KC__VOLDOWN,  KC__VOLUP,  KC_TRNS,  KC_TRNS,  KC_INS,
+    QK_BOOT,  KC_BRID,  KC_BRIU,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MRWD,  KC_MPLY,  KC_MFFD,  KC__MUTE,   KC__VOLDOWN,  KC__VOLUP,  KC_TRNS,  KC_TRNS,  KC_INS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS,            KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,                            KC_TRNS,  KC_TRNS,
diff --git a/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c b/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
index 4a987b9a90..79424226da 100644
--- a/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
    * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │ FN  │
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │   RESET   │     │
+   * │     │     │     │     │     │     │     │     │     │     │     │     │     │   QK_BOOT   │     │
    * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
    * │        │ TOG │ MOD │ HU+ │ HU- │ SA+ │ SA- │ VA+ │ VA- │     │     │     │     │        │     │ // RGB controls
    * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [1] = LAYOUT(
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
diff --git a/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c b/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
index fb074e1210..486294c980 100644
--- a/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 3: Control layer
    * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │RESET│QWERT│FORTY│     │     │     │     │     │     │     │     │     │     │     │     │     │
+   * │QK_BOOT│QWERT│FORTY│     │     │     │     │     │     │     │     │     │     │     │     │     │
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
    * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
    * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┤
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 3:  Control layer */
   [_CL] = LAYOUT(
-    RESET,    TO(_QW),  TO(_FO),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG, 
+    QK_BOOT,  TO(_QW),  TO(_FO),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG, 
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_MOD, 
     KC_GRV,   KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_DEL,   _______,  _______,            KC_VOLU, 
     _______,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSLS,            _______,            KC_VOLD, 
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 3: D control layer */
   [_DL] = LAYOUT(
-    RESET,    TO(_QW),  TO(_FO),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG, 
+    QK_BOOT,  TO(_QW),  TO(_FO),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG, 
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_MOD, 
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  _______,  _______,            KC_VOLU, 
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,            _______,            KC_VOLD, 
diff --git a/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c b/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c
index edf01c854e..87edeed1c9 100644
--- a/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
    * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │ RGB │
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │RESET│     │     │QWRTY│COLMK│DVORK│     │     │     │     │█████│RGBV+│
+   * │     │     │     │     │QK_BOOT│     │     │QWRTY│COLMK│DVORK│     │     │     │     │█████│RGBV+│
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
    * │     │     │ _CL │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│RGBV-│
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_CL] = LAYOUT(
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG, \
-    _______,  _______,  _______,  _______,  RESET,    _______,  _______,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______,  _______,  _______,            RGB_VAI, \
+    _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______,  _______,  _______,            RGB_VAI, \
     _______,  _______,  MO(_CL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            RGB_VAD, \
     MO(_FL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_SAI,  _______, \
     _______,  _______,  _______,                      _______,  RGB_MOD,  _______,                      _______,  MO(_FL),  _______,  RGB_HUD,  RGB_SAD,  RGB_HUI),
diff --git a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
index 05e7c56713..e0541293c7 100644
--- a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN] = LAYOUT(
-    RESET  ,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,
+    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index 1221e753a4..476b50b8e4 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FUNC] = LAYOUT_ansi_1u(
-        RESET, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLCK, KC_PAUS,
+        QK_BOOT, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLCK, KC_PAUS,
         KC_TRNS, MACRO1, MACRO2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         MACROTAB, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS,
         KC_TRNS, VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DYN_REC_START2, DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS,
diff --git a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
index 6d3ff8a376..a373b463ab 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, _______,  _______, _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______,  _______,
   _______, _______, _______,  _______, _______, _______,   _______,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
index 7c794b2037..523b6cf1a0 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11,  KC_F12,  _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        RESET,   _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+        QK_BOOT, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
     ),
 
     /* Layer 2 (r_ Indicates RGB Controls)
diff --git a/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
index d859062d39..752aa519c8 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
         _______, KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, RESET
+        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, QK_BOOT
     ),
 
     /* Layer 2 (r_ Indicates RGB Controls)
diff --git a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
index aca4a86b0e..69613cfbcf 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO, KC_NO, KC_PWR, KC_NO, RGB_M_G, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_NO, KC_BSPC,
     KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_4, KC_5, KC_6, KC_NO, KC_NO,
     KC_TRNS, KC_NO, RGB_RMOD, RGB_MOD, RGB_TOG, KC_NO, KC_NO, KC_1, KC_2, KC_3, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPC, KC_0, KC_COMM, KC_DOT, KC_NO, RESET
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPC, KC_0, KC_COMM, KC_DOT, KC_NO, QK_BOOT
 ),
 
 /* ARROWS
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
index 5ffbd1b49a..ec06d54d0c 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
index 4f2e2b37b5..d8b5b37c54 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_mit(
-    _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_POWER,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_POWER,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
index f7f933c7b1..bfd95e137f 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
index 8c03ae2df2..67f0111112 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  TO(_GAMEMODE), RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, WRKMOD,
+  TO(_GAMEMODE), QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, WRKMOD,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_MODE_FORWARD,
   _______, _______, _______, _______, _______, _______, _______, _______,  _______, RGB_M_P,  RGB_M_R, TO(_QWERTY)
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
index 94743fe2c8..47adafeffa 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, BL_STEP, _______,  KC_SLEP, _______, _______,     _______,     DYN_REC_START1, DYN_MACRO_PLAY1, DYN_REC_STOP, _______, KC_VOLU,
         _______, VLK_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,     _______,     DYN_REC_START2, DYN_MACRO_PLAY2, _______,      _______, KC_VOLD,
         _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,     _______,     _______,        _______,         _______,      KC_MSTP, KC_MUTE,
-        RESET,   _______, _______,  _______, _______, LCA(KC_DEL), LCA(KC_INS), _______,        _______,         KC_MPRV,      KC_MPLY, KC_MNXT
+        QK_BOOT, _______, _______,  _______, _______, LCA(KC_DEL), LCA(KC_INS), _______,        _______,         KC_MPRV,      KC_MPLY, KC_MNXT
     )
 };
 
diff --git a/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
index d3c6102b16..639d3b69e8 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    RGB_MODE_PLAIN,   RESET,       DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______,     KC_DEL,
+    RGB_MODE_PLAIN,   QK_BOOT,     DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______,     KC_DEL,
     RGB_MODE_REVERSE, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,     RGB_VAI,
     RGB_MODE_FORWARD, _______,     _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,     RGB_VAD,
     RGB_TOG,          TO(_QWERTY), _______, _______, _______,     _______,      _______, _______, _______, TO(_QWERTY), X_____X
diff --git a/keyboards/kbnordic/nordic60/keymaps/all/keymap.c b/keyboards/kbnordic/nordic60/keymaps/all/keymap.c
index 57475e95ed..2d677ab328 100644
--- a/keyboards/kbnordic/nordic60/keymaps/all/keymap.c
+++ b/keyboards/kbnordic/nordic60/keymaps/all/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL,  KC_LGUI,  KC_LALT,                                  KC_SPC,                                      KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
 // basic function layer
 [1] = LAYOUT_all(
-  RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
diff --git a/keyboards/kc60/keymaps/sgoodwin/keymap.c b/keyboards/kc60/keymaps/sgoodwin/keymap.c
index 79b0b8af4e..be439c365e 100644
--- a/keyboards/kc60/keymaps/sgoodwin/keymap.c
+++ b/keyboards/kc60/keymaps/sgoodwin/keymap.c
@@ -25,6 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    BL_INC,    BL_DEC,  BL_STEP,  \
       KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_NO,   KC_TRNS,  \
       KC_TRNS,  KC_NO,    KC_MPRV,  KC_MPLY,   KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_NO,   KC_TRNS,  \
-      KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_SPC,                                 KC_NO,    DEBUG,    RESET,     KC_TRNS, KC_NO     \
+      KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_SPC,                                 KC_NO,    DEBUG,    QK_BOOT,   KC_TRNS, KC_NO     \
       ),
 };
diff --git a/keyboards/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c
index 54428f2875..ccc2644d6a 100644
--- a/keyboards/kc60/keymaps/stanleylai/keymap.c
+++ b/keyboards/kc60/keymaps/stanleylai/keymap.c
@@ -33,13 +33,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // RGB Layer
 [_RGBL] = LAYOUT(
   #ifdef RGBLIGHT_ENABLE
-  RESET,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO, \
+  QK_BOOT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO, \
   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO, \
   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO,  \
   KC_TRNS,KC_NO,  RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,BL_STEP,BL_TOGG,  KC_TRNS,  KC_TRNS,\
   KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_NO,  KC_TRNS,KC_TRNS,  KC_TRNS,  KC_TRNS),
   #else
-  RESET,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO, \
+  QK_BOOT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO, \
   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO, \
   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO,  \
   KC_TRNS,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  BL_STEP,BL_TOGG,  KC_TRNS,  KC_TRNS,\
diff --git a/keyboards/kc60/keymaps/wigguno/keymap.c b/keyboards/kc60/keymaps/wigguno/keymap.c
index 00cf194336..add7ccec9a 100644
--- a/keyboards/kc60/keymaps/wigguno/keymap.c
+++ b/keyboards/kc60/keymaps/wigguno/keymap.c
@@ -47,6 +47,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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_DEC,   BL_INC,   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,   \
-      RESET,    KC_TRNS,  KC_TRNS,                      BL_TOGG,                                KC_NO,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS    \
+      QK_BOOT,  KC_TRNS,  KC_TRNS,                      BL_TOGG,                                KC_NO,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS    \
       ),
 };
diff --git a/keyboards/kc60/keymaps/workman-dead/keymap.c b/keyboards/kc60/keymaps/workman-dead/keymap.c
index b524b61cf7..6c3560d393 100644
--- a/keyboards/kc60/keymaps/workman-dead/keymap.c
+++ b/keyboards/kc60/keymaps/workman-dead/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,           KC_CMDQ, KC_CMDD, KC_CSTB, KC_C_TB, _______, _______, KC_PGDN, KC_UP,   KC_PGUP, _______, _______, _______, KC_INS,  \
   KC_LSFT,          KC_CMDA, KC_CMDS, KC_C_LF, KC_C_RT, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_END,  _______, KC_BSPC, \
   KC_LSFT, _______, KC_CMDZ, KC_CMDX, _______, KC_CMDC, KC_CMDV, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          _______, _______, \
-  KC_LCTL, KC_LALT, KC_LGUI,                   KC_TRNS,          _______, KC_RALT, KC_RGUI, KC_RCTL, RESET),
+  KC_LCTL, KC_LALT, KC_LGUI,                   KC_TRNS,          _______, KC_RALT, KC_RGUI, KC_RCTL, QK_BOOT),
 
 // mouse layer
 /*
diff --git a/keyboards/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c
index e0a5f600e7..aca89bf9a0 100644
--- a/keyboards/kc60/keymaps/ws2812/keymap.c
+++ b/keyboards/kc60/keymaps/ws2812/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
     ),
     [1] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
         XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
         _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
diff --git a/keyboards/keebio/bdn9/keymaps/bcat/keymap.c b/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
index 2028deb4f1..2313dec9d3 100644
--- a/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F1,    KC_F2,    KC_F3
     ),
     [LAYER_FUNCTION_1] = LAYOUT(
-        EEP_RST,  _______,  RESET,
+        EEP_RST,  _______,  QK_BOOT,
         KC_F10,   KC_F11,   KC_F12,
         KC_F7,    KC_F8,    KC_F9
     ),
diff --git a/keyboards/keebio/bdn9/keymaps/codecoffeecode/keymap.c b/keyboards/keebio/bdn9/keymaps/codecoffeecode/keymap.c
index bce81500d5..89956afd7c 100644
--- a/keyboards/keebio/bdn9/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/codecoffeecode/keymap.c
@@ -28,12 +28,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MPRV, MO(1),   KC_MNXT
     ),
     /*
-        |       RESET        | Home |    Media Stop      |
+        |       QK_BOOT        | Home |    Media Stop      |
         |                    | End  |                    |
         |      CTRL_END      |      |    CTRL_HOME       |
      */
     [1] = LAYOUT(
-        RESET  ,      KC_HOME, KC_STOP,
+        QK_BOOT,      KC_HOME, KC_STOP,
         _______,      KC_END,  _______,
         LCTL(KC_END), _______, LCTL(KC_HOME)
     ),
diff --git a/keyboards/keebio/bdn9/keymaps/ghostseven/keymap.c b/keyboards/keebio/bdn9/keymaps/ghostseven/keymap.c
index 4d323a3126..1a1df0d501 100644
--- a/keyboards/keebio/bdn9/keymaps/ghostseven/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/ghostseven/keymap.c
@@ -34,12 +34,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LEFT, KC_DOWN, KC_RGHT
     ),
     /*
-        | RESET          | Shift+CMD+B (Build VS Code) | Media Stop |
+        | QK_BOOT          | Shift+CMD+B (Build VS Code) | Media Stop |
         | Held: Layer 2  | Home | RGB Mode   |
         | Media Previous | End  | Media Next |
      */
     [1] = LAYOUT(
-        RESET  , S(G(KC_B)), KC_STOP,
+        QK_BOOT, S(G(KC_B)), KC_STOP,
         _______, KC_HOME, RGB_MOD,
         KC_MPRV, KC_END , KC_MNXT
     ),
diff --git a/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
index 50d44bea14..1b44e88ccf 100644
--- a/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //`-------+-------+-------'
     ),
     /*
-        | RESET          | N/A  | Media Stop |
+        | QK_BOOT          | N/A  | Media Stop |
         | Held: Layer 2  | Home | RGB Mode   |
         | Media Previous | End  | Media Next |
      */
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c b/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c
index 760bb3d5e5..268dd8002a 100644
--- a/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_WH_D, TT(1), KC_WH_R
     ),
     [1] = LAYOUT(
-        RESET,   KC_ACL0, KC_ACL1,
+        QK_BOOT, KC_ACL0, KC_ACL1,
         KC_VOLU, KC_ACL2, KC_BRIU,
         KC_VOLD, TO(1),  KC_BRID
     ),
diff --git a/keyboards/keebio/bdn9/keymaps/rishka/keymap.c b/keyboards/keebio/bdn9/keymaps/rishka/keymap.c
index 9777debc3e..f164f66567 100644
--- a/keyboards/keebio/bdn9/keymaps/rishka/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/rishka/keymap.c
@@ -28,12 +28,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LEFT, KC_DOWN, KC_RGHT
     ),
     /*
-        | RESET          | N/A  | Media Stop |
+        | QK_BOOT          | N/A  | Media Stop |
         | Held: Layer 2  | Home | RGB Mode   |
         | Media Previous | End  | Media Next |
      */
     [1] = LAYOUT(
-        RESET  , KC_HOME, _______,
+        QK_BOOT, KC_HOME, _______,
         _______, _______, _______,
         KC_MPRV, KC_END , KC_MNXT
     ),
diff --git a/keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c b/keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c
index f473c9a1f9..4b0fb147ec 100644
--- a/keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c
@@ -11,7 +11,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    RESET  , PAWFIVE, RELOAD ,
+    QK_BOOT, PAWFIVE, RELOAD ,
     SLACKUP, KC_UP  , KC_PGUP,
     SLACKDN, KC_DOWN, KC_PGDN
   ),
diff --git a/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c b/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
index 3b92657d4d..66483b51de 100644
--- a/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX
     ),
     [_PANIC] = LAYOUT(
-        RESET  , BASE   , XXXXXXX,
+        QK_BOOT, BASE   , XXXXXXX,
         _______, XXXXXXX, _______,
         KC_F2  , KC_F5  , KC_F9
     ),
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
index ba272ca63c..60bbbbdebe 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
@@ -272,7 +272,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
   |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
   |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |Colemak| Qwerty|       |ColmkGM|  QWGM |       |       |       |          |       |       |       | Numpad|       |       |       |       | RESET |
+  |       |Colemak| Qwerty|       |ColmkGM|  QWGM |       |       |       |          |       |       |       | Numpad|       |       |       |       | QK_BOOT |
   |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
   |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
   |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
@@ -285,7 +285,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_ADJUST] = LAYOUT(
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -294,7 +294,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST2] = LAYOUT(
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c b/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
index 56b21454d2..faa858da72 100644
--- a/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 QWERTY
 (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
  ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |   ESC  |  RESET |   F1   |   F2   |   F3   |   F4   |   F5   |        |        |   |        |        |   F6   |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |
+ |   ESC  |  QK_BOOT |   F1   |   F2   |   F3   |   F4   |   F5   |        |        |   |        |        |   F6   |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |
  |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
  |        |        |    1   |    2   |    3   |    4   |   5    |        |        |   |        |        |   6    |    7   |    8   |    9   |    0   |        |        |
  |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -45,7 +45,7 @@ QWERTY
  `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
 */
 [_QWERTY] = LAYOUT(
-  KC_ESC,  RESET,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______,   _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+  KC_ESC,  QK_BOOT,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______,   _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   _______, _______,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______,   _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, _______,
   _______,  KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______, KC_LBRC,   KC_RBRC, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,  _______,
   _______, _______,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_TAB,  MO(_FUNC), MO(_FUNC), KC_ENT, KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, _______, // TODO: use OSL instead of MO
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
index fe951ac019..604717b0c5 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
@@ -273,7 +273,7 @@ Adjust layer
  ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
  |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
  |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        | Colemak| Qwerty |        | Gaming |        |        |        |        |   |        |        |        | Numpad |        |        |        |        |  RESET |
+ |        | Colemak| Qwerty |        | Gaming |        |        |        |        |   |        |        |        | Numpad |        |        |        |        |  QK_BOOT |
  |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
  |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
  |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -286,7 +286,7 @@ Adjust layer
 */
 [_ADJUST] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, GAMING,  _______, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -295,7 +295,7 @@ Adjust layer
 
 [_ADJUST2] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, GAMING,  _______, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c
index 04811dfb4f..3459ffe8a6 100644
--- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c
+++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN2] = LAYOUT_ortho_4x4(
-    RESET,   XXXXXXX, XXXXXXX, XXXXXXX,
+    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX,
     RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
     BL_STEP, _______, XXXXXXX, XXXXXXX
diff --git a/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c b/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
index 7081eedbdd..29414c0976 100644
--- a/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
+++ b/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
   [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
+    _______, 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,_______, _______,
     _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c b/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
index 9ff1315f73..228cbd6079 100644
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
+++ b/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_PG] = LAYOUT(
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_MUTE, RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    KC_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,  _______, _______, _______,
 // ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
diff --git a/keyboards/keebio/fourier/keymaps/maxim/keymap.c b/keyboards/keebio/fourier/keymaps/maxim/keymap.c
index 68bd649ecc..23e65be477 100644
--- a/keyboards/keebio/fourier/keymaps/maxim/keymap.c
+++ b/keyboards/keebio/fourier/keymaps/maxim/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_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,
-    RESET,   RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_SCLN,          _______,
+    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
   ),
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c b/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
index 3e06ffff29..81426852a6 100644
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
+++ b/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
@@ -11,7 +11,7 @@
 
 #define KC_LOWR MO(_LOWER)
 #define KC_RASE MO(_RAISE)
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 
 #define KC_LBR SE_LBRC
 #define KC_RBR SE_RBRC
diff --git a/keyboards/keebio/iris/keymaps/ave-63/keymap.c b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
index 3d393a71c7..a3919c413c 100644
--- a/keyboards/keebio/iris/keymaps/ave-63/keymap.c
+++ b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                  KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS,  KC_TRNS 
 ),
 [_MEH] = LAYOUT(
-   LALT(KC_F4), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
+   LALT(KC_F4), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
    KC_TRNS, MEH(KC_Q), LCTL(KC_W), LSFT(KC_TAB), KC_DEL, MEH(KC_T),          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
    KC_TRNS, MEH(KC_A),LSFT(LCTL(KC_TAB)),KC_TAB,LCTL(KC_TAB),MEH(KC_G),      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
    KC_TRNS,MEH(KC_Z),MEH(KC_X),MEH(KC_C),MEH(KC_V),MEH(KC_B),KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/keymap.c b/keyboards/keebio/iris/keymaps/bmoorey/keymap.c
index 9484ccb3f4..5f7b026022 100644
--- a/keyboards/keebio/iris/keymaps/bmoorey/keymap.c
+++ b/keyboards/keebio/iris/keymaps/bmoorey/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_TILD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                            _______,   KC_P7,   KC_P8,   KC_P9, _______,  KC_DEL,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RESET,   _______,   KC_UP, _______, _______, _______,                            _______,   KC_P4,   KC_P5,   KC_P6, _______, _______,
+     QK_BOOT, _______,   KC_UP, _______, _______, _______,                            _______,   KC_P4,   KC_P5,   KC_P6, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC,                            KC_RBRC,   KC_P1,   KC_P2,   KC_P3, KC_PLUS, KC_PIPE,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/boo/keymap.c b/keyboards/keebio/iris/keymaps/boo/keymap.c
index 27cbc5daf2..7fc9162b47 100644
--- a/keyboards/keebio/iris/keymaps/boo/keymap.c
+++ b/keyboards/keebio/iris/keymaps/boo/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  ├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_GRAVE,KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE,                            KC_CIRC, KC_PLUS, KC_ASTR, KC_PERC, KC_UP,   KC_EQL,
 //  ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     RESET,   _______, _______, _______, _______, _______, KC_HOME,          KC_END,  KC_KAK,  COPY,    PASTE,   KC_LEFT, KC_DOWN, KC_RIGHT,
+     QK_BOOT, _______, _______, _______, _______, _______, KC_HOME,          KC_END,  KC_KAK,  COPY,    PASTE,   KC_LEFT, KC_DOWN, KC_RIGHT,
 //  └────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     _______, _______, _______,                   KC_DEL,  _______, _______
 //                                 └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c b/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
index 1b3f114607..c549b0dde0 100644
--- a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
+++ b/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, RESET,          EEP_RST, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
+     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, QK_BOOT,        EEP_RST, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     _______, _______, _______,                   _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
index b36abd4c56..188e3c3345 100644
--- a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
+++ b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    
     [_NAVMAC] = LAYOUT(
     
-    RESET  , _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
         
     _______, _______, _______, _______, _______, _______,                    C_TAB,   ALEFT  ,  KC_UP , ARGHT  , KC_DEL , _______,
         
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     [_NAVPC] = LAYOUT(
     
-    RESET , _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+    QK_BOOT , _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
         
     _______, _______, _______, _______, _______, _______,                   C_TAB  , CLEFT  , KC_UP  , CRGHT  , KC_DEL , _______,
         
diff --git a/keyboards/keebio/iris/keymaps/dcompact/keymap.c b/keyboards/keebio/iris/keymaps/dcompact/keymap.c
index baa7e5e583..447aff6f9a 100644
--- a/keyboards/keebio/iris/keymaps/dcompact/keymap.c
+++ b/keyboards/keebio/iris/keymaps/dcompact/keymap.c
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, RESET,   _______, _______, _______, _______,                            _______, _______, _______, _______, _______, KC_DEL,
+     _______, QK_BOOT, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, KC_DEL,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _______, _______, _______, _______, BL_STEP,                            RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/ddone/keymap.c b/keyboards/keebio/iris/keymaps/ddone/keymap.c
index 815174bf74..a3905181ea 100644
--- a/keyboards/keebio/iris/keymaps/ddone/keymap.c
+++ b/keyboards/keebio/iris/keymaps/ddone/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, RESET,
+     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, QK_BOOT,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _______, _______, RGB_VAD, RGB_VAI ,_______ ,                            KC_PSCR, KC_BTN1, KC_BTN2, KC_BTN3, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json b/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json
index be5cc37938..942116ef87 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json
+++ b/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json
@@ -72,7 +72,7 @@
             "KC_LPRN",
             "KC_RPRN",
             "KC_BSPC",
-            "RESET",
+            "QK_BOOT",
             "KC_1",
             "KC_2",
             "KC_3",
diff --git a/keyboards/keebio/iris/keymaps/dvorak/keymap.c b/keyboards/keebio/iris/keymaps/dvorak/keymap.c
index 3f0886521c..ce99d1a563 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/keymap.c
+++ b/keyboards/keebio/iris/keymaps/dvorak/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RESET,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRAVE,
+     QK_BOOT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRAVE,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_DEL,  _______, KC_LEFT, KC_RGHT, KC_UP,   KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_BSPC,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/keymap.c b/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
index 8761dcbd6c..6caaed18d4 100644
--- a/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
+++ b/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [4] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, RESET,
+     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, QK_BOOT,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
index 7c477f8502..ef98331ca7 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 #define KC_ESCC MT(MOD_LCTL, KC_ESC)
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 #define KC_BL_S BL_STEP
 
 // Left and right shift as mot-tap square braces
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RESET  , DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
+      QK_BOOT, DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
   //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
index bc04f9fbfd..5fe88a2289 100644
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
@@ -5,7 +5,7 @@
 #define _RAISE 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, LCTL_T(KC_LGUI), KC_Z, KC_X, KC_C, KC_D, KC_V, LGUI(KC_L), MEH_T(KC_MINS), KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LGUI, LT(1, KC_QUOT), KC_SFTENT, KC_SPC, LT(2, KC_BSLS), LALT_T(KC_APP)),
-                                                              [1] = LAYOUT(KC_MPLY, KC_NO, KC_DQUO, KC_NO, LALT(KC_F4), KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, RESET, KC_MPRV, KC_END, KC_UP, KC_HOME, KC_PGUP, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_SAI, RGB_SAD, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P1, KC_P2, KC_P3, KC_PAST, RGB_HUI, RGB_HUD, KC_NO, KC_WBAK, KC_WFWD, KC_WSTP, KC_WREF, KC_NO, LCA(KC_DEL), KC_NLCK, KC_P0, KC_P0, KC_PDOT, KC_PENT, RGB_SPI, RGB_SPD, KC_PSCR, KC_NO, KC_LGUI, RGB_TOG, RGB_VAI, RGB_VAD),
+                                                              [1] = LAYOUT(KC_MPLY, KC_NO, KC_DQUO, KC_NO, LALT(KC_F4), KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, QK_BOOT, KC_MPRV, KC_END, KC_UP, KC_HOME, KC_PGUP, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_SAI, RGB_SAD, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P1, KC_P2, KC_P3, KC_PAST, RGB_HUI, RGB_HUD, KC_NO, KC_WBAK, KC_WFWD, KC_WSTP, KC_WREF, KC_NO, LCA(KC_DEL), KC_NLCK, KC_P0, KC_P0, KC_PDOT, KC_PENT, RGB_SPI, RGB_SPD, KC_PSCR, KC_NO, KC_LGUI, RGB_TOG, RGB_VAI, RGB_VAD),
                                                               [2] = LAYOUT(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_K, KC_NO, KC_WH_D, KC_MS_U, KC_WH_U, KC_NO, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)};
 
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/keebio/iris/keymaps/khang/keymap.c b/keyboards/keebio/iris/keymaps/khang/keymap.c
index 71c36c8ff9..69c7d8fe64 100644
--- a/keyboards/keebio/iris/keymaps/khang/keymap.c
+++ b/keyboards/keebio/iris/keymaps/khang/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
         KC_NO  , ______ , ______ , ______ , ______ , ______ , ______ ,    ______ , ______ , ______ , ______ , ______ , ______ , KC_NO  ,
     //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                       ______ , ______ , ______ ,             RESET  , ______ , ______
+                                       ______ , ______ , ______ ,             QK_BOOT, ______ , ______
                                   // └────────┴────────┴────────┘           └────────┴────────┴────────┘
     )
 };
diff --git a/keyboards/keebio/iris/keymaps/khord/keymap.c b/keyboards/keebio/iris/keymaps/khord/keymap.c
index 379617a8b7..10ef4ce099 100644
--- a/keyboards/keebio/iris/keymaps/khord/keymap.c
+++ b/keyboards/keebio/iris/keymaps/khord/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RESET,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+     QK_BOOT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_DEL,  _______, KC_LEFT, KC_RGHT, KC_UP,   KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/krusli/keymap.c b/keyboards/keebio/iris/keymaps/krusli/keymap.c
index 095716621d..ef51a973f6 100644
--- a/keyboards/keebio/iris/keymaps/krusli/keymap.c
+++ b/keyboards/keebio/iris/keymaps/krusli/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______,  _______,  _______,  _______,                    _______,  _______,    _______,    _______,    _______,    _______,
     RGB_TOG, RGB_MOD, RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,                    _______,  _______,    _______,    _______,    _______,    _______,
     _______, _______, RGB_HUD,  RGB_SAD,  RGB_SAD,  RGB_VAD,                    _______,  _______,    _______,    _______,    _______,    _______,
-    BL_STEP, RESET,   _______,  _______,  _______,  _______,  _______, _______, _______,  _______,    _______,    _______,    _______,    _______,
+    BL_STEP, QK_BOOT, _______,  _______,  _______,  _______,  _______, _______, _______,  _______,    _______,    _______,    _______,    _______,
                                           _______,  _______,  _______, _______, _______,  _______
   ),
 };
diff --git a/keyboards/keebio/iris/keymaps/mattly/keymap.c b/keyboards/keebio/iris/keymaps/mattly/keymap.c
index 4c1057062f..a499d021a1 100644
--- a/keyboards/keebio/iris/keymaps/mattly/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mattly/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FUNCT] = 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,
-    RESET,   XXXXXXX, XXXXXXX, M_NXWIN, XXXXXXX, XXXXXXX,                            XXXXXXX, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_K, RESET,
+    QK_BOOT, XXXXXXX, XXXXXXX, M_NXWIN, XXXXXXX, XXXXXXX,                            XXXXXXX, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_K, QK_BOOT,
     DEBUG,   XXXXXXX, M_PVTAB, M_PVWIN, M_NXTAB, XXXXXXX,                            XXXXXXX, TOG_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD, KC_MPLY, _______,          _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                    _______, _______, _______,                   _______, _______, _______
diff --git a/keyboards/keebio/iris/keymaps/mnil/keymap.c b/keyboards/keebio/iris/keymaps/mnil/keymap.c
index 973122f0c4..1cac3be141 100644
--- a/keyboards/keebio/iris/keymaps/mnil/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mnil/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   [_NUMPAD] = LAYOUT(
                   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-                     RGB_TOG, RGB_M_P, RGB_M_B, KC_NO,   KC_NO,   KC_NO,                              KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,
+                     RGB_TOG, RGB_M_P, RGB_M_B, KC_NO,   KC_NO,   KC_NO,                              KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
                   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
                      KC_TRNS, QUIT,    WIN,     MVWSL  , MVWSR,   CRYWS,                              TERM,    KC_7,    KC_8,    KC_9,    KC_COMM, KC_NO,
                   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/mojitas/keymap.c b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
index e3ec651834..959abd1a00 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      _______, GAMING , DVORAK , COLEMAK , QWERTY , RESET,                           _______, _______, _______, _______, KC_PWR,    RESET,
+      _______, GAMING , DVORAK , COLEMAK , QWERTY , QK_BOOT,                         _______, _______, _______, _______, KC_PWR,    QK_BOOT,
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
       _______, _______, _______,LGUI(KC_UP),_______,LALT(KC_F4),                       _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
index dd7996a28d..c5911ae5d3 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
@@ -36,7 +36,7 @@ enum custom_keycodes {
 #define KC_LOWER LOWER
 #define KC_RAISE RAISE
 #define KC_ADJ ADJUST
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index 6f29ccecd3..7434a8d19e 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     BL_BRTG, _______, _______, _______, DEBUG,   RESET,                              RESET,   DEBUG,   _______, RGB_HUI, RGB_SAI, RGB_VAI,
+     BL_BRTG, _______, _______, _______, DEBUG,   QK_BOOT,                            QK_BOOT, DEBUG,   _______, RGB_HUI, RGB_SAI, RGB_VAI,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
       BL_INC, _______, _______, _______, _______, EEP_RST,                            EEP_RST, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_HWCT] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     BL_BRTG, _______, _______, _______, _______,   RESET,                              RESET, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
+     BL_BRTG, _______, _______, _______, _______,   QK_BOOT,                            QK_BOOT, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
       BL_INC, _______, _______, _______, _______, _______,                            _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/osiris/keymap.c b/keyboards/keebio/iris/keymaps/osiris/keymap.c
index 09ad74733d..3df073dbdf 100644
--- a/keyboards/keebio/iris/keymaps/osiris/keymap.c
+++ b/keyboards/keebio/iris/keymaps/osiris/keymap.c
@@ -19,7 +19,7 @@ enum custom_keycodes {
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
-#define KC_RST  RESET
+#define KC_RST  QK_BOOT
 #define KC_BL_S BL_STEP
 
 // left shift as a left key too - makes perfect sense
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|-------+-------+-------+-------+-------+-------|                          |-------+-------+-------+-------+-------+-------|
      _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_SAI,RGB_VAI,                           _______,_______,_______,_______,_______,_______,
   //|-------+-------+-------+-------+-------+-------|                          |-------+-------+-------+-------+-------+-------|
-     RESET  ,DEBUG  ,_______,RGB_HUD,RGB_SAD,RGB_VAD,                           _______,_______,_______,_______,_______,_______,
+     QK_BOOT,DEBUG  ,_______,RGB_HUD,RGB_SAD,RGB_VAD,                           _______,_______,_______,_______,_______,_______,
   //|-------+-------+-------+-------+-------+-------+-------.        ,-------|-------+-------+-------+-------+-------+-------|
      BL_STEP,_______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,_______,
   //`--------+-------+-------+----+--+-------+-------+-------/        \-------+-------+-------+---+---+-------+-------+-------'
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/keymap.c b/keyboards/keebio/iris/keymaps/radlinskii/keymap.c
index 380ff82a3c..b7d3e8f9b8 100644
--- a/keyboards/keebio/iris/keymaps/radlinskii/keymap.c
+++ b/keyboards/keebio/iris/keymaps/radlinskii/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_MEDIA_MISC] = LAYOUT(
     //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       RESET,   _______, _______, _______, _______, QWERTY,                             COLEMAK, _______, _______, _______, _______, _______,
+       QK_BOOT, _______, _______, _______, _______, QWERTY,                             COLEMAK, _______, _______, _______, _______, _______,
     //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
        _______, _______, _______, KC_MUTE, _______, _______,                            _______, _______, _______, _______, _______, _______,
     //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
index d3e0d680a1..752fc392f3 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
+++ b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_RAISE] = LAYOUT(
-     _______,  KC_VOLD, KC_VOLU, KC_MUTE, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,    KC_PSCREEN, _______, _______, _______, _______, RESET,
+     _______,  KC_VOLD, KC_VOLU, KC_MUTE, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,    KC_PSCREEN, _______, _______, _______, _______, QK_BOOT,
      _______,  KC_SLSH, KC_6,    KC_5,    KC_4,    KC_EQL,                            KC_CIRC, KC_PGUP, KC_UP,   KC_PGDN, _______, RGB_VAI,
      _______,  KC_3,    KC_2,    KC_1,    KC_0,    KC_DOT,                            KC_EQL,  KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
      _______,  KC_ASTR, KC_9,    KC_8,    KC_7,    KC_PLUS,  _______,        _______, KC_PLUS, KC_HOME, KC_COLN, KC_END,  _______, RGB_MOD,
diff --git a/keyboards/keebio/iris/keymaps/xyverz/keymap.c b/keyboards/keebio/iris/keymaps/xyverz/keymap.c
index e5e8aebd28..d59fd8fedf 100644
--- a/keyboards/keebio/iris/keymaps/xyverz/keymap.c
+++ b/keyboards/keebio/iris/keymaps/xyverz/keymap.c
@@ -25,7 +25,7 @@ enum custom_keycodes {
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 #define KC_BL_S BL_STEP
 #define KC_QWRT QWERTY
 #define KC_CLMK COLEMAK
diff --git a/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c b/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
index 58f115d6d1..07cd2cb094 100644
--- a/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
+++ b/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN3] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, RESET,   _______,
+     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, QK_BOOT, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/levinson/keymaps/atreus/keymap.c b/keyboards/keebio/levinson/keymaps/atreus/keymap.c
index 1eb12669ac..fc8d45b21a 100644
--- a/keyboards/keebio/levinson/keymaps/atreus/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/atreus/keymap.c
@@ -36,6 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LW] = LAYOUT_ortho_4x12( /* [> LOWER <] */
 	KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_NO,   KC_NO,   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
 	KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_NO,   KC_NO,   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-	KC_NO,   KC_VOLU, KC_NO,   KC_NO,   RESET,   KC_NO,   KC_NO,   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
+	KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
 	KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
 };
diff --git a/keyboards/keebio/levinson/keymaps/dcompact/keymap.c b/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
index a0556c09b4..74b554ba34 100644
--- a/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______,   RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
   _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP, RGB_TOG, RGB_MOD, _______, _______, _______, \
   _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
index 6de2279be4..1c71a5aa2b 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
@@ -30,7 +30,7 @@ _______ , ___________________BLANK___________________, _______ , _______ , KC_ES
 
 // Run `./qmk show levinson` from parent dir to see this layer.
 [_NUMP] = LAYOUT_ortho_4x12_wrapper(
-_______ , _________________NUMP_L1___________________ , _________________NUMP_R1___________________ , RESET   ,
+_______ , _________________NUMP_L1___________________ , _________________NUMP_R1___________________ , QK_BOOT,
 _______ , _________________NUMP_L2___________________ , _________________NUMP_R2___________________ , _______ ,
 _______ , _________________NUMP_L3___________________ , _________________NUMP_R3___________________ , _______ ,
 _______ , ___________________BLANK___________________ , _______ , _______ , _______ , _______ , TO(_OVERWATCH) , _______
diff --git a/keyboards/keebio/levinson/keymaps/jyh/keymap.c b/keyboards/keebio/levinson/keymaps/jyh/keymap.c
index 310356cd68..452bda619c 100644
--- a/keyboards/keebio/levinson/keymaps/jyh/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/jyh/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
 
     [_ADJUST] = LAYOUT_ortho_4x12(
-        RESET  , XXXXXXX, KC_UP  , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL ,
+        QK_BOOT, XXXXXXX, KC_UP  , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL ,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,    BL_TOGG, BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
index 4b7442928e..b82ad24602 100644
--- a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------'    `-----------------------------------------'
  */
     [_ADJUST] = LAYOUT_ortho_4x12(
-        RESET  , XXXXXXX,  KC_UP , XXXXXXX, XXXXXXX, DREC_1 ,    DREC_2 , RGB_M_P, RGB_M_SN,RGB_M_G, XXXXXXX, KC_DEL ,
+        QK_BOOT, XXXXXXX,  KC_UP , XXXXXXX, XXXXXXX, DREC_1 ,    DREC_2 , RGB_M_P, RGB_M_SN,RGB_M_G, XXXXXXX, KC_DEL ,
         KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, MKITPNK, DPLAY_1,    DPLAY_2, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,
         _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DSTOP  ,    DSTOP  , RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,
         _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/levinson/keymaps/ksamborski/keymap.c b/keyboards/keebio/levinson/keymaps/ksamborski/keymap.c
index 4fc77fb830..3833b6a223 100644
--- a/keyboards/keebio/levinson/keymaps/ksamborski/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/ksamborski/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------'    `-----------------------------------------'
  */
     [_AD] = LAYOUT_ortho_4x12(
-        RESET  , XXXXXXX,  KC_UP , XXXXXXX, XXXXXXX, DM_REC1,    DM_REC2, RGB_M_P, RGB_M_SN,RGB_M_G, XXXXXXX, KC_DEL ,
+        QK_BOOT, XXXXXXX,  KC_UP , XXXXXXX, XXXXXXX, DM_REC1,    DM_REC2, RGB_M_P, RGB_M_SN,RGB_M_G, XXXXXXX, KC_DEL ,
         KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, MKITPNK, DM_PLY1,    DM_PLY2, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,
         _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DM_RSTP,    DM_RSTP, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,
         _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/levinson/keymaps/losinggeneration/keymap.c b/keyboards/keebio/levinson/keymaps/losinggeneration/keymap.c
index aea6aed78c..0ea5e733f5 100644
--- a/keyboards/keebio/levinson/keymaps/losinggeneration/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------..-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |BL Off|| RESET| Game |Numpad|Mouse |      |Sleep |
+ * |      |  F1  |  F2  |  F3  |  F4  |BL Off|| QK_BOOT| Game |Numpad|Mouse |      |Sleep |
  * |------+------+------+------+------+------||------+------+------+------+------+------|
  * |      |  F5  |  F6  |  F7  |  F8  |BL Tg ||Aud on|Qwerty|Colmak|Workmn|Dvorak|      |
  * |------+------+------+------+------+------||------+------+------+------+------+------|
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------''-----------------------------------------'
  */
 [_ADJUST] = CATMAP( \
-  _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , BL_OFF , RESET  , TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP, \
+  _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , BL_OFF , QK_BOOT, TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP, \
   _______, KC_F5  ,  KC_F6 , KC_F7  , KC_F8  , BL_TOGG, AU_ON  , QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
   KC_CAPS, KC_F9  ,  KC_F10, KC_F11 , KC_F12 , BL_ON  , AU_OFF , _______, _______, _______, KC_UP  , _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT  \
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c b/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c
index 76d9c72998..3edaa6fed0 100644
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   BL_STEP, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/keebio/levinson/keymaps/numpad/keymap.c b/keyboards/keebio/levinson/keymaps/numpad/keymap.c
index da11ac35fe..ad7442a7c8 100644
--- a/keyboards/keebio/levinson/keymaps/numpad/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/numpad/keymap.c
@@ -55,14 +55,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|
  * | Right| M(3) | M(6) | M(9) |      |      |
  * |------+------+------+------+------+------|
- * |   NumLock   | RESET|      |      | Calc |
+ * |   NumLock   | QK_BOOT|      |      | Calc |
  * `-----------------------------------------'
  */
 [1] = LAYOUT_ortho_4x12(
     M0,         M1, M4, M7, KC_NO, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_LEFT,    M2, M5, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_RIGHT,   M3, M6, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NUMLOCK, RESET, KC_NO, KC_NO, KC_CALC, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    KC_NUMLOCK, QK_BOOT, KC_NO, KC_NO, KC_CALC, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
 )
 };
 
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/keymap.c b/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
index 55ac74e9d8..f94239af7b 100644
--- a/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
   [_ADJUST] = LAYOUT_ortho_4x12( \
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
+    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, GAME  ,  _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
index 014e6c9c23..84e37ce5ef 100644
--- a/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILD, KC_F1,       KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS, KC_LCBR, KC_RCBR,     KC_BSPC, \
   KC_DEL,  KC_EXLM,     KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR, KC_LPRN, KC_RPRN,     KC_PIPE, \
   _______, KC_F7,       KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  X_____X,    X_____X, X_____X, X_____X,     FIREY_RETURN, \
-  RESET,   TO(_QWERTY), _______, _______, _______, _______, _______, MO(_RAISE), _______, _______, TO(_QWERTY), X_____X \
+  QK_BOOT, TO(_QWERTY), _______, _______, _______, _______, _______, MO(_RAISE), _______, _______, TO(_QWERTY), X_____X \
 ),
 
 /* Raise
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  X_____X,     X_____X, X_____X, X_____X,    X_____X, X_____X, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,     KC_BSPC, \
   KC_DEL,  KC_1,        KC_2,    KC_3,    KC_4,       KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,        KC_BSLS, \
   _______, X_____X,     X_____X, X_____X, X_____X,    X_____X, X_____X, X_____X, X_____X, X_____X, X_____X,     FIREY_RETURN, \
-  X_____X, TO(_QWERTY), _______, _______, MO(_LOWER), _______, _______, _______, _______, _______, TO(_QWERTY), RESET \
+  X_____X, TO(_QWERTY), _______, _______, MO(_LOWER), _______, _______, _______, _______, _______, TO(_QWERTY), QK_BOOT \
 ),
 
 
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
index 605e9f1004..8e8743766b 100644
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------.     ,----------------------------------------.
- * |      |      |      |      |      |RESET |     |     |      |      |      |      |      |
+ * |      |      |      |      |      |QK_BOOT |     |     |      |      |      |      |      |
  * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
  * |      |      |      |      |      |      |     |     |TermOn|TermOf|      |      |  Del |
  * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
@@ -219,7 +219,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, RESET,        _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, QK_BOOT,      _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______,      _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \
   _______, _______, _______, _______, _______, _______,      _______, QWERTY,  COLEMAK, DVORAK, _______,  _______, \
   _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
index c671b7798c..108f910400 100644
--- a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   [_EMOJI] = LAYOUT( \
-    TO(0)   , XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     , /**/  RESET       ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   _______   , \
+    TO(0)   , XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     , /**/  QK_BOOT       ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   _______   , \
     _______ , X(CLAP)     ,   X(CUM)      ,   X(BNIS)     ,   X(BUTT)     ,   X(CAR)      , /**/  X(FIRE)     ,   X(REDB)     ,   X(MONY)     ,   X(HNDR)     ,   X(SOS)      ,   _______   , \
     XXXXXXX , X(CELE)     ,   X(PRAY)     ,   X(NAIL)     ,   X(OK)       ,   X(THNK)     , /**/  X(UNAM)     ,   X(HEYE)     ,   X(COOL)     ,   X(EYES)     ,   X(SMIR)     ,   KC_DEL    , \
     _______ , X(TRIU)     ,   X(SCRM)     ,   X(VOMI)     ,   X(DTIV)     ,   X(EXPL)     , /**/  X(HAIR)     ,   X(DANC)     ,   X(STRN)     ,   X(LEFT)     ,   X(RGHT)     ,   _______   , \
diff --git a/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c b/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c
index a0d8c46475..537d5cf2e4 100644
--- a/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_O, KC_7, KC_8, KC_9, KC_PLUS,
     KC_TRNS, KC_A, KC_S, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_4, KC_5, KC_6, KC_PLUS,
     KC_LSFT, KC_TRNS, KC_X, KC_C, KC_TRNS, KC_TRNS, KC_N, KC_TRNS, KC_1, KC_2, KC_3, KC_ENT,
-    RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_0, KC_0, KC_DOT, KC_ENT)
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_0, KC_0, KC_DOT, KC_ENT)
 
 };
 
diff --git a/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
index 3e2c6edb70..852b856c6a 100644
--- a/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------..-----------------------------------------.
- * | RESET|DEBUG |      |      |      |      ||      |      |      |      |      |      |
+ * | QK_BOOT|DEBUG |      |      |      |      ||      |      |      |      |      |      |
  * |------+------+------+------+------+------||------+------+------+------+------+------|
  * |      |  F1  |  F2  |  F3  |  F4  |      ||      | Game |Numpad| Mouse|      |Sleep |
  * |------+------+------+------+------+------||------+------+------+------+------+------|
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------''-----------------------------------------'
  */
 [_ADJUST] = CATMAP( \
-   RESET , DEBUG  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+   QK_BOOT , DEBUG  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , _______, _______, TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP, \
   _______, KC_F5  ,  KC_F6 , KC_F7  , KC_F8  , _______, _______, QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
   KC_CAPS, KC_F9  ,  KC_F10, KC_F11 , KC_F12 , _______, _______, _______, _______, _______, KC_UP  , _______, \
diff --git a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c b/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
index cff2e400c1..221e45a199 100644
--- a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */	
 
 	[_LEFTHAND] = LAYOUT(
-		KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_BSLS, 
+		KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_BSLS, 
 		KC_TRNS, KC_TRNS, KC_LBRC, KC_UP, KC_RBRC, KC_TRNS,   KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_RBRC, 
 		KC_LCTL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_ENT, 
 		KC_LSFT, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC,  KC_P1, KC_P2, KC_P3, KC_PEQL, KC_PGUP, KC_HOME, 
@@ -99,6 +99,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
 	),
 };
\ No newline at end of file
diff --git a/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c b/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
index 1aa9fffdb3..f8b3b5240d 100644
--- a/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
    ),
 	[3] = LAYOUT_ortho_4x12(
-     RGB_TOG,RGB_MOD,RGB_RMOD,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RESET,
+     RGB_TOG,RGB_MOD,RGB_RMOD,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,QK_BOOT,
      RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,KC_TRNS,KC_TRNS,KC_TRNS,KC_MPRV,KC_MPLY,KC_MNXT,KC_TRNS,KC_TRNS,
      RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU,KC_TRNS,KC_TRNS,
      KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
index 44a30063b8..96cf700bb8 100644
--- a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
index 87e44ff043..47510a22db 100644
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] =  LAYOUT( \
   QWERTY,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
-  _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, KC_7,    KC_8,    KC_9,    _______, KC_DEL, \
+  _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, KC_7,    KC_8,    KC_9,    _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_6,    KC_5,    KC_4,    _______, _______, \
   _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_1,    KC_2,    KC_3,    _______, _______, \
   _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_0,    KC_DOT,  _______, _______, _______ \
diff --git a/keyboards/keebio/nyquist/keymaps/skug/keymap.c b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
index f9f66892a3..70ad4b2a8a 100644
--- a/keyboards/keebio/nyquist/keymaps/skug/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] =  LAYOUT( \
   _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______, \
-  _______,  RESET  ,  RGB_TOG,  RGB_MOD,  RGB_HUD,  RGB_HUI,     RGB_SAD,  RGB_SAI,  RGB_VAD,  RGB_VAI,  _______,  _______, \
+  _______,  QK_BOOT,  RGB_TOG,  RGB_MOD,  RGB_HUD,  RGB_HUI,     RGB_SAD,  RGB_SAI,  RGB_VAD,  RGB_VAI,  _______,  _______, \
   _______,  _______,  _______,  AU_ON,    AU_OFF,   AG_NORM,     AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______, \
   _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______, \
   _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______  \
diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
index ae692782fa..6109661ffd 100644
--- a/keyboards/keebio/nyquist/keymaps/tester/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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,
-  _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL,
+  _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/nyquist/keymaps/winternebs/keymap.c b/keyboards/keebio/nyquist/keymaps/winternebs/keymap.c
index bb1ab6ca4d..b673a5f25f 100755
--- a/keyboards/keebio/nyquist/keymaps/winternebs/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/winternebs/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( 
-  RESET,   RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_WH_L, KC_WH_R, _______,
+  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_WH_L, KC_WH_R, _______,
   RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, AG_NORM, AG_SWAP, KC_HOME, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, 
   _______, _______, _______, QWERTY,  WORKMAN, _______, KC_END,  KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______,
   _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_VOLU, KC_MPLY, 
diff --git a/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c b/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c
index d4c2d4ba23..77eb7fd16b 100644
--- a/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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, \
-  _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, \
+  _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
index 3dd48623fa..cfa70f4cff 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
     [LAYER_FUNCTION_1] = LAYOUT_65(
         _______,  KC_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,   RGB_HUI,
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_TOG,            RGB_SAD,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      RGB_VAI,  RGB_HUD,
         _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,            RGB_RMOD, RGB_VAD,  RGB_MOD
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c b/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
index e47cba88c0..bafbbe8cb1 100644
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
@@ -16,7 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
index 445709bc3d..f679130130 100644
--- a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_65_with_macro(
-    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, RESET, \
+    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, QK_BOOT, \
     _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/keebio/quefrency/keymaps/kingwangwong/keymap.c b/keyboards/keebio/quefrency/keymaps/kingwangwong/keymap.c
index 7bdc115ab9..72197c0956 100644
--- a/keyboards/keebio/quefrency/keymaps/kingwangwong/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/kingwangwong/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, KC_HOME, KC_UP,   KC_END,  _______,              _______, _______, _______, _______, _______, _______, _______, _______, 
     _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,                       _______, KC_MINS, KC_EQL,  _______, _______, _______, _______, 
     _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______, _______, 
-    RESET,   _______, _______, _______, _______,                                _______, _______, _______, _______, _______, _______, _______
+    QK_BOOT, _______, _______, _______, _______,                                _______, _______, _______, _______, _______, _______, _______
 
   )
 };
diff --git a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
index 98f17f1870..6708d7a0ee 100644
--- a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_RALT, KC_HOME, KC_PGDN, KC_PGUP, KC_END
     ),
     [_NUM] = LAYOUT_60_with_macro(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P4,   KC_P5,   KC_P6,   KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
index d03916617f..d8cc5b0989 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
@@ -213,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Adjust layer
 *  (Enter/Number + Delete/Number2 to access; Numpad is a toggle)
 *  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |Colemak| Qwerty|       |       |       |                  | Numpad|       |       | Ctrl+Y|       | RESET |
+*  |       |Colemak| Qwerty|       |       |       |                  | Numpad|       |       | Ctrl+Y|       | QK_BOOT |
 *  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
 *  |       |       |       |       |       |       |                  |       |NKROTog|       |       |       |       |
 *  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
@@ -225,7 +225,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                          `---------------'  `---------------'
 */
 [_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
@@ -233,7 +233,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
index ceb75d4f46..9621fb9ba0 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
@@ -241,7 +241,7 @@ Numpad layer
 Adjust layer
 (Enter/Number + Delete/Number2 to access; Numpad is a toggle)
  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        | Colemak| Qwerty |        |        |        |                    | Numpad |        |        |        |        |  RESET |
+ |        | Colemak| Qwerty |        |        |        |                    | Numpad |        |        |        |        |  QK_BOOT |
  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
  |        |        |        |        |        |        |                    |        |NKRO Tog|        |        |        |        |
  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -253,7 +253,7 @@ Adjust layer
                                               `-----------------'  `-----------------'
 */
 [_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                      _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
@@ -261,7 +261,7 @@ Adjust layer
 ),
 
 [_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                      _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
index d74c0186d6..515f770eb2 100644
--- a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_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,       _______,      RESET,   KC_HOME,
+     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       _______,      QK_BOOT, KC_HOME,
   //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
      _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,    _______, KC_END,
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
diff --git a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
index 127a0fd1ee..b0bc70b179 100755
--- a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MOD] = LAYOUT_split_space(
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
-     RESET,   _______, _______,  _______, _______, _______,_______,  _______,KC_F8  , _______, _______, _______, _______,       _______,     KC_VOLD, KC_VOLU,
+     QK_BOOT, _______, _______,  _______, _______, _______,_______,  _______,KC_F8  , _______, _______, _______, _______,       _______,     KC_VOLD, KC_VOLU,
   //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
      _______,     _______, WREFRESH,_______, DF(_REV), _______, _______, UNDO,   _______, _______, _______,  _______, _______, _______,      _______, _______,
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
diff --git a/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c b/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c
index bbaa448574..32172690e5 100644
--- a/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   A(KC_LEFT), KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F9   ,
   SFT_SPC   , A(KC_F1), A(KC_F2), A(KC_F3), A(KC_F4), _______ , _______ ,
   A(KC_RGHT), C(KC_F1), C(KC_F2), C(KC_F3), C(KC_F4), _______ , _______ ,
-  _______   , RESET   , _______ , _______ , _LAYER_ , KC_DEL  , KC_ENT
+  _______   , QK_BOOT, _______ , _______ , _LAYER_ , KC_DEL  , KC_ENT
 ),
 [LFT] = LAYOUT_ortho_half_5x7( // Media
   _______ , KC_F10  , KC_F11  , KC_F12  , KC_PSCR , KC_SLCK , KC_PAUS ,
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
index 54e6ee4ac2..dde2e84e09 100644
--- a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
+++ b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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),
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
index 783790f020..07ba118e35 100644
--- a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
+++ b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
@@ -45,7 +45,7 @@ enum custom_layers {
     _DISCORD,  /* FXX unsused keys to interface with Discord: Mute , Silence */
     _LIGHTS,   /* Edits underglow and retroilumination */
     _EDIT,     /* Cut, Copy ,Paste */
-    _RESET,    /* Layer to set nano in bootloader mode */
+    _QK_BOOT,  /* Layer to set nano in bootloader mode */
     _TOOGLE,   /* Momentary layer to switch between layers */
 };
 
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_RESET] = LAYOUT(
         MO(_TOOGLE),
         KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, RESET 
+        KC_NO, KC_NO, KC_NO, QK_BOOT 
     ),
     [_TOOGLE] = LAYOUT(
         MO(_TOOGLE),
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
index 6faabbc3ed..373438e4b4 100644
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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,   DEBUG,   RESET,   EEP_RST, _______, KC_NO,   KC_NO,   KC_NO, KC_NO,  KC_NO ,
+    KC_NO,   KC_NO,   KC_NO,   DEBUG,   QK_BOOT, EEP_RST, _______, KC_NO,   KC_NO,   KC_NO, KC_NO,  KC_NO ,
     _______, _______, _______, _______, _______, FN2,     FN2,     _______, _______, KC_NO, KC_ESC, _______
   )
 };
diff --git a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
index e9daa7fab8..b10d80664c 100644
--- a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [FUN] = LAYOUT(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
         KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,                    _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,
-        _______, _______, _______, _______, _______, RESET,   EEP_RST, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3,
+        _______, _______, _______, _______, _______, QK_BOOT, EEP_RST, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
     )
 };
diff --git a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
index 9e47155f44..2d4685c53a 100644
--- a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [L_FN] = LAYOUT(
     _______,_______,_______,_______,_______,                KC_VOLU,KC_F9,  KC_F10, KC_F11, KC_F12,
     _______,_______,_______,_______,_______,                KC_MUTE,KC_F5,  KC_F6,  KC_F7,  KC_F8,
-    _______,K_SECR1,K_SECR2,K_SECR3,K_SECR4,MS_JIGL,RESET,  KC_VOLD,KC_F1,  KC_F2,  KC_F3,  KC_F4,
+    _______,K_SECR1,K_SECR2,K_SECR3,K_SECR4,MS_JIGL,QK_BOOT,  KC_VOLD,KC_F1,  KC_F2,  KC_F3,  KC_F4,
     DF_TYPE,DF_GAME,_______,_______,_______,KC_LCTL,KC_LALT,_______,_______,_______,_______,ooooooo
 ),
 
diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
index 2bd30bc586..9d7dc826fb 100644
--- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
@@ -167,13 +167,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	|------+------+------+------+------+------.,------+------+------+------+------+------|
 	|      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
 	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|      |      |      |      |      |      ||      |      |      |      |      | RESET|
+	|      |      |      |      |      |      ||      |      |      |      |      | QK_BOOT|
 	`-----------------------------------------'`-----------------------------------------'*/
   [_ADJUST] = LAYOUT(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
     KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
     _______, QWERTY,  COLEMAK, DVORAK,  DVORMAC, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
   ),
 };
 
diff --git a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
index 04887124f9..97ccd975cc 100644
--- a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
@@ -3,7 +3,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [DEF] = LAYOUT(
-    RESET  , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+    QK_BOOT, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
     KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , RGB_TOG,    DM_REC1, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_EQL ,
     KC_PGUP, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_TAB ,    KC_ENT , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
     KC_PGDN, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_ESC ,    DM_PLY1, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
diff --git a/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c b/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c
index 3171dd36f9..900a3f29aa 100644
--- a/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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, _______,    RESET  , DE_AT  , DE_EURO, DE_SCLN, DE_COLN, DE_UNDS, DE_PLUS,
+  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,
                                          _______,                                 _______,
                                             _______,                           _______,
                                                _______,                     _______,
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c b/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
index ce5d2170ed..fa90c8cce8 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 /* ADJUST (Press LOWER and RAISE together)
  * ,-----------------------------------------.                    ,-----------------------------------------.
- * |RESET |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |QK_BOOT |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |RGB ON| HUE+ | SAT+ | VAL+ |      |      |                    | PREV | PLAY | NEXT |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT(
-    RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                   KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                   KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/teimor/keymap.c b/keyboards/keychron/q1/rev_0100/keymaps/teimor/keymap.c
index 366bf02eba..3a0cddab7c 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/teimor/keymap.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/teimor/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,              _______,
+        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,  _______,  _______,  _______,  _______,            _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______),
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,              _______,
+        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,  _______,  _______,  _______,  _______,            _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______)
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
index e0adb2af32..6c8b278264 100644
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_POWER)),
       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), RESET,
+      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(
diff --git a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
index ef2710d0a3..76ff1f5637 100644
--- a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/
 
 	[_RAISE] = LAYOUT( 
-		RESET, _______, _______, _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_CALC, \
+		QK_BOOT, _______, _______, _______, KC_GRV, KC_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, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
index 45569d5588..68e5272045 100755
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
@@ -1 +1 @@
-{"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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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"],["RESET","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","DEBUG","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
+{"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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","DEBUG","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
index c4453279d2..8575da1901 100644
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
@@ -201,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------'
    */
 [_ADJUST] = LAYOUT(
-  RESET,   _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
+  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,  _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   DEBUG,   _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/keyhive/ut472/keymaps/hvp/keymap.c b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
index 80d2d036bd..e39bb46b8d 100644
--- a/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
@@ -55,13 +55,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), KC_7, KC_8, KC_9, KC_BSPC,
   _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_4, KC_5, KC_6, KC_0,
   _______, _______, _______, _______, _______, _______, XXXXXXX, KC_0, KC_1, KC_2, KC_3, _______,
-  RESET, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+  QK_BOOT, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 ),
 
 [5] = LAYOUT( /* Tab */
   _______,  G(S(KC_1)), G(S(KC_2)), G(S(KC_3)), G(S(KC_4)), G(S(KC_5)), G(S(KC_6)), G(S(KC_7)), G(S(KC_8)), G(S(KC_9)), G(S(KC_0)), _______,
   RGB_TOG, RGB_MOD, RGB_M_P, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
   KC_PSCR, _______, RGB_RMOD, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, KC_CAPS,
-  RESET, _______, RGB_VAD, RGB_VAI, _______,     _______,      _______, _______, _______, _______, KC_NLCK
+  QK_BOOT, _______, RGB_VAD, RGB_VAI, _______,     _______,      _______, _______, _______, _______, KC_NLCK
 ),
 };
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
index 7cc3b70082..25bb8cd984 100644
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,       _______,       _______,  _______,  _______,  _______,  RESET
+        _______,  _______,  _______,  _______,  _______,       _______,       _______,  _______,  _______,  _______,  QK_BOOT
     ),
 
        /* Fn Layer (Fn)
diff --git a/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
index 7fbbd0e76e..44ef2ee2ef 100644
--- a/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_FN] = LAYOUT(
-        RESET,   _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+        QK_BOOT, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
         _______, VLK_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_VOLD,
         _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, KC_MSTP, KC_MUTE,
         KC_SLEP, _______, _______,  _______, _______,  LCA(KC_DEL), LCA(KC_INS), _______, KC_MPRV, KC_MPLY, KC_MNXT
diff --git a/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c b/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
index f66e5670b0..6c21a3874c 100644
--- a/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
+++ b/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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,  _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_BRIU, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_BRIU, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC
     ),
diff --git a/keyboards/kin80/keymaps/andrew/keymap.c b/keyboards/kin80/keymaps/andrew/keymap.c
index d8773f9d72..8c63a6edc6 100644
--- a/keyboards/kin80/keymaps/andrew/keymap.c
+++ b/keyboards/kin80/keymaps/andrew/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
 * |        |      |      |      |      |      |                           | VRSN |      |      |      |      |        |
 * |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR |      |                           |RESET |      |      |      |      |        |
+* |        |      |  MbL |  MUp |  MbR |      |                           |QK_BOOT |      |      |      |      |        |
 * |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
 * |        |      |  ML  |  MDn |  MR  |      |                           |      |      |      |      |      |        |
 * |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_L2] = LAYOUT(
     KC_F1,   _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
     _______, _______, _______, _______, _______, _______,   VRSN,    _______, _______, _______, _______, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______,   RESET, _______, _______, _______, _______, _______,
+    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, QK_BOOT, _______, _______, _______, _______, _______,
     _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
              _______, KC_INS,  _______, _______,                     _______, _______, _______, _______,
diff --git a/keyboards/kin80/keymaps/maxim/keymap.c b/keyboards/kin80/keymaps/maxim/keymap.c
index a8be54a4dd..090a3bb6b6 100644
--- a/keyboards/kin80/keymaps/maxim/keymap.c
+++ b/keyboards/kin80/keymaps/maxim/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MC] = LAYOUT(
     VRSN,    _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, PWD3,    PWD2,    PWD1,
     _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, MC2,
-    _______, _______, _______, _______, RESET,   _______,   _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, QK_BOOT, _______,   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,   _______, _______, MC1,     _______, _______, _______,
              _______, _______, _______, _______,                     _______, _______, _______, _______,
diff --git a/keyboards/kin80/keymaps/quartz64/keymap.c b/keyboards/kin80/keymaps/quartz64/keymap.c
index 611c86a09d..3bb2cdb4b8 100644
--- a/keyboards/kin80/keymaps/quartz64/keymap.c
+++ b/keyboards/kin80/keymaps/quartz64/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MC] = LAYOUT_all(
     VRSN,    _______, _______, _______, _______, _______,   EMAIL1,  _______, PWD4,    PWD3,    PWD2,    PWD1,
     _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, MC2,
-    _______, _______, _______, _______, RESET,   _______,   _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, QK_BOOT, _______,   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,   _______, _______, MC1,     _______, _______, _______,
     _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/carpalx/keymap.c b/keyboards/kinesis/keymaps/carpalx/keymap.c
index 2e56946e76..28d724518a 100644
--- a/keyboards/kinesis/keymaps/carpalx/keymap.c
+++ b/keyboards/kinesis/keymaps/carpalx/keymap.c
@@ -18,7 +18,7 @@ extern keymap_config_t keymap_config;
         |  L0  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8   |
         `---------------------------------------------------------------'
         ,---------------------------------------------------------------.
-        |  F9  |  F10 |  F11 |  F12 | PSCR |  L1  |  L2  |  L2  | RESET |
+        |  F9  |  F10 |  F11 |  F12 | PSCR |  L1  |  L2  |  L2  | QK_BOOT |
         `---------------------------------------------------------------'
 
         L0 Carpalx layer:
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC,  KC_ESC,  MO(_KP),
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, TO(_QW), TO(_KP), TO(_KP),  RESET,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, TO(_QW), TO(_KP), TO(_KP),  QK_BOOT,
            KC_0,    KC_8,    KC_6,    KC_4,    KC_2,    KC_MINS,
            KC_B,    KC_Y,    KC_U,    KC_V,    KC_SCLN, KC_EQL,
            KC_I,    KC_A,    KC_E,    KC_O,    KC_H,    KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index 6f4d63a7d4..a81ac0cec5 100644
--- a/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      KC_HOME,
                    KC_BSPC, KC_DEL,  KC_END,
         // right hand
-        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, RESET,
+        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, QK_BOOT,
         KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH,
         KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS,
diff --git a/keyboards/kinesis/keymaps/farmergreg/keymap.c b/keyboards/kinesis/keymaps/farmergreg/keymap.c
index c861233691..1b6442cac5 100644
--- a/keyboards/kinesis/keymaps/farmergreg/keymap.c
+++ b/keyboards/kinesis/keymaps/farmergreg/keymap.c
@@ -18,7 +18,7 @@
  * qmk compile -kb kinesis/kint41 -km farmergreg
  *
  * Layout Details:
- * PROGM + F9 to RESET and load new firmware.
+ * PROGM + F9 to QK_BOOT and load new firmware.
  * Colemak (default / PROGM+C), Dvorak (PROGM + F4) and QWERTY (PROGM+F3) layouts are available for use
  * CAPS LOCK is ESC (for use in VIM). Double tap to activate CAPS Lock
  * UP and DOWN arrows are swapped to be more like VIM
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[_LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
 				_______,
 			_______,_______,_______,
 
-	RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,
+	QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,
 	_______,_______,_______,_______,_______,_______,
 	_______,_______,_______,_______,_______,_______,
 	_______,_______,_______,_______,_______,_______,
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
index 1f49c4622c..dd02def8c2 100644
--- a/keyboards/kinesis/keymaps/heatxsink/keymap.c
+++ b/keyboards/kinesis/keymaps/heatxsink/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_HOME,
         KC_BSPC,KC_DEL ,KC_END ,
         // RHAND
-        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KEYPAD ,RESET  ,
+        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KEYPAD ,QK_BOOT,
         KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
         _______,_______,_______,_______,_______,KC_BSLS,
         _______,_______,_______,_______,_______,KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 183b1c4303..7d39da8397 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -356,7 +356,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
   `-----------------------------------------------------------------------------------------------------------'
   ,-------------------------------------------.                   ,-------------------------------------------.
-  |        |Colmak|Qwerty|      |ClmkGM| QWGM |                   |Numpad|      |      |      |      | RESET  |
+  |        |Colmak|Qwerty|      |ClmkGM| QWGM |                   |Numpad|      |      |      |      | QK_BOOT  |
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
   |        |      |      |      |      |      |                   |      |      |      |      |      |        |
   |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
@@ -376,7 +376,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_ADJUST] = LAYOUT_pretty(
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,                                                         _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
@@ -388,7 +388,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST2] = LAYOUT_pretty(
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,                                                         _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/jwon/keymap.c b/keyboards/kinesis/keymaps/jwon/keymap.c
index d0e9d81231..fa75f95865 100644
--- a/keyboards/kinesis/keymaps/jwon/keymap.c
+++ b/keyboards/kinesis/keymaps/jwon/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_SPC,  MACCOPY,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, QWERTY,  RESET,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, QWERTY,  QK_BOOT,
            KC_EQL,  KC_RPRN, KC_RCBR, KC_RBRC, KC_ASTR, KC_EXLM,
            KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSLS,
            KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
diff --git a/keyboards/kinesis/keymaps/milestogo/keymap.c b/keyboards/kinesis/keymaps/milestogo/keymap.c
index 72687195ef..710ef97c59 100644
--- a/keyboards/kinesis/keymaps/milestogo/keymap.c
+++ b/keyboards/kinesis/keymaps/milestogo/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			   		KC_LCTL,KC_LALT,
 			   		KC_DEL,
               		KC_BSPC, KC_DEL ,TT(_MOUSE) ,
-        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,TT(_MOUSE) ,TG(_MOUSE)  ,TT(_SYMB), KC_NO, RESET,
+        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,TT(_MOUSE) ,TG(_MOUSE)  ,TT(_SYMB), KC_NO, QK_BOOT,
 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
 	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,
 	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    _______,  KC_COLON,  MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
                              _______,  _______,
                                        _______,
-                    _______, _______,  RESET,
+                    _______, _______,  QK_BOOT,
          _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
          _______,  _______,  _______,  _______,  _______,  _______,
          KC_AMPR,  KC_LBRC,  KC_LPRN, KC_RPRN,  KC_UNDS,  _______,
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    _______,  _______,  MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
                              _______,  _______,
                                        _______,
-                    _______, _______,  RESET,
+                    _______, _______,  QK_BOOT,
          _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
          _______,  _______,  _______,  KC_ASTR,  _______,  _______,
          _______,  _______,  KC_PLUS,  KC_MINS,  _______,  _______,
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                              _______,  _______,
                                        _______,
                     _______, _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE),RESET,
+         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE),QK_BOOT,
          KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_ACL2,
          KC_WH_U,  M(A_MUL), KC_MS_U,  M(A_MUR), KC_NO,  KC_ACL1,
          KC_NO,    KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_NO,  KC_ACL0,
diff --git a/keyboards/kinesis/keymaps/peott-fr/keymap.c b/keyboards/kinesis/keymaps/peott-fr/keymap.c
index e813f070d0..c56d3426f1 100644
--- a/keyboards/kinesis/keymaps/peott-fr/keymap.c
+++ b/keyboards/kinesis/keymaps/peott-fr/keymap.c
@@ -23,6 +23,6 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
 	[1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c
index d7a0a5e5c2..431c9f234f 100644
--- a/keyboards/kinesis/keymaps/stapelberg/keymap.c
+++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			   KC_LCTL,KC_LALT,
                                     KC_LGUI,
                            KC_BSPC,KC_ESC ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_NO, RESET,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_NO, QK_BOOT,
 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
 	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,
 	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
index 2e844f19b1..89a39c08b4 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
@@ -346,7 +346,7 @@ Adjust layer
 |      |      |      |      |      |      |      |      |      |                                     |      |      |      |      |      |      |      |      |      |
 `--------------------------------------------------------------'                                     `--------------------------------------------------------------'
 ,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|         | Colemak| QWERTY |        | Gaming |        |                                                     | Numpad |        |        |        |        |  RESET  |
+|         | Colemak| QWERTY |        | Gaming |        |                                                     | Numpad |        |        |        |        |  QK_BOOT  |
 |---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
 |         |        |        |        |        |        |                                                     |        |        |        |        |        |         |
 |---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
@@ -366,7 +366,7 @@ Adjust layer
 */
 [_ADJUST] = LAYOUT_pretty(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                                                       _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
@@ -378,7 +378,7 @@ Adjust layer
 
 [_ADJUST2] = LAYOUT_pretty(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, RESET,
+  _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                                                       _______, NKROTG,  _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
index e7a6ffd6e9..bfa8027352 100644
--- a/keyboards/kinesis/keymaps/tw1t611/keymap.c
+++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    KC_RCTL,KC_LALT,
                    KC_HOME,
                    KC_SPC ,KC_LSFT,KC_BSPC ,
-           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_NO ,RESET,
+           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_NO ,QK_BOOT,
            KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,DE_SS  ,
            KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,DE_ADIA,
            KC_H   ,KC_J   ,KC_K   ,KC_L   ,DE_SLSH,DE_ODIA,
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index ffc4459547..286d7ca7a7 100644
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, KEYPAD };
 	|  ESC |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   F7   |  F8   |
  	`-----------------------------------------------------------------'
         ,-----------------------------------------------------------------.
-        |  F9  |  F10 |  F11 |  F12 | PScr | SLck | Paus | Keypad | RESET |
+        |  F9  |  F10 |  F11 |  F12 | PScr | SLck | Paus | Keypad | QK_BOOT |
         `-----------------------------------------------------------------'
 
         Dvorak layer:
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  GUI_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  RESET,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
            KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
            KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  RESET,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS ,
            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  RESET,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
            KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
            KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
index 524792de81..57e703fd6f 100644
--- a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
+++ b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
@@ -161,7 +161,7 @@ enum my_keycodes {QWERTY = SAFE_RANGE, DVORAK, WIN, MAC, PC, STATUS, PROGRAM};
         |  STATUS  |      |      | QWERTY | DVORAK |          |        |        |       |
         `-------------------------------------------------------------------------------'
         ,-------------------------------------------------------------------------------.
-        |   RESET  |      |      |        |        |          |        |        |       |
+        |   QK_BOOT  |      |      |        |        |          |        |        |       |
         `-------------------------------------------------------------------------------'
         ,-------------------------------------------.,-------------------------------------------.
         |        |      |      |      |      |      ||      |      |      |      |      |        |
@@ -330,7 +330,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______, _______, _______,
 
            // Right Hand
-           RESET,   _______, _______, _______, _______, _______, _______, _______, _______,
+           QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c b/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
index 2ce2babf69..29df5f5713 100644
--- a/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
+++ b/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN] = LAYOUT_split_space_base(
-    LT(_LN, KC_ESC), _______, _______, _______, _______, _______, _______,  _______, KC_MINS, RESET,
+    LT(_LN, KC_ESC), _______, _______, _______, _______, _______, _______,  _______, KC_MINS, QK_BOOT,
     KC_TAB,  _______, _______, _______, _______, _______, _______, _______, LSFT(KC_MINS),    KC_BSLS,
     KC_LSFT, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC,          KC_QUOT,
     AU_TOG,  CK_TOGG , _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/keymap.c b/keyboards/kingly_keys/romac/keymaps/stanrc85/keymap.c
index ecca61cae0..1f19882d48 100644
--- a/keyboards/kingly_keys/romac/keymaps/stanrc85/keymap.c
+++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN1PAD] = LAYOUT(
 	KC_NO, KC_NO,   KC_NO,
-	KC_NO, KC_NO,   RESET,
+	KC_NO, KC_NO,   QK_BOOT,
 	KC_NO, KC_NO,   KC_MAKE,
 	KC_NO, KC_LSFT, D_LAYR)
 };
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
index 280fe22cc4..9cba0ccefb 100644
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
@@ -204,7 +204,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   	[_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,    _______,   RESET,    DEBUG,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_DEL ,
+    KC_NO,    _______,   QK_BOOT,  DEBUG,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_DEL ,
     KC_PGUP,  _______,   _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,    PLOVER,   _______,
     KC_HOME,  _______,   MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   TERM_ON,  TERM_OFF, _______,   _______,  _______,
     KC_PGDN,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______
diff --git a/keyboards/kira80/keymaps/ansi_wkl/keymap.c b/keyboards/kira80/keymaps/ansi_wkl/keymap.c
index 85411bbcd6..b2c2d96557 100644
--- a/keyboards/kira80/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/kira80/keymaps/ansi_wkl/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_tkl_ansi_wkl(
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY, KC_MNXT, KC_VOLD,
+        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_MPLY, 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_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/kiwikey/wanderland/keymaps/stanrc85/keymap.c b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
index c535306afc..ce36d1ba38 100644
--- a/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
+++ b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_alice(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, RESET,
+    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
     _______,  _______, _______, _______, _______, _______, _______,           _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/keyboards/knobgoblin/keymaps/moults31/keymap.c b/keyboards/knobgoblin/keymaps/moults31/keymap.c
index 20dda4ccd0..775f9d1b5d 100644
--- a/keyboards/knobgoblin/keymaps/moults31/keymap.c
+++ b/keyboards/knobgoblin/keymaps/moults31/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				 ),
 
 	[10] = LAYOUT_ortho(
-                  RESET,  KC_TRNS,    KC_TRNS, KC_TRNS,
+                  QK_BOOT,  KC_TRNS,    KC_TRNS, KC_TRNS,
                   TO(7),    TO(8),      TO(9),   KC_TRNS,
                   TO(4),    TO(5),      TO(6),   KC_TRNS,
          KC_TRNS, TO(1),    TO(2),      TO(3),   KC_TRNS,
diff --git a/keyboards/knops/mini/keymaps/mverteuil/keymap.c b/keyboards/knops/mini/keymaps/mverteuil/keymap.c
index 12afb57da2..8f28f4c617 100644
--- a/keyboards/knops/mini/keymaps/mverteuil/keymap.c
+++ b/keyboards/knops/mini/keymaps/mverteuil/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *
      */
     [_LAYER_SELECT] = LAYOUT(
-        _______, _______, RESET,
+        _______, _______, QK_BOOT,
         TO(_MEDIA),TO(_COPYPASTA),TO(_SPECTACLES)
     )
 };
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
index ac0ebf02a9..dc60f24dc3 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [_FN] = LAYOUT_ansi_arrows(
-    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_SAI, RGB_SAD, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
index 1163931076..ac52ba3585 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [_FN] = LAYOUT_ansi_arrows(
-    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_SAI, RGB_SAD, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kona_classic/keymaps/ansi_split/keymap.c b/keyboards/kona_classic/keymaps/ansi_split/keymap.c
index 4687b72ae7..3c331e1735 100644
--- a/keyboards/kona_classic/keymaps/ansi_split/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_split/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                   KC_ENT,  MO(_FN), KC_SPC,                    KC_LALT, KC_RGUI, MO(_FN), KC_RCTL
   ),
   [_FN] = LAYOUT_ansi_split(
-    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_SAI, RGB_SAD, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
index b53caf9ea3..7eaea8b4f2 100644
--- a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                   KC_ENT,  MO(_FN), KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [_FN] = LAYOUT_ansi_split_arrows(
-    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    RGB_TOG, RGB_MOD, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_SAI, RGB_SAD, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c b/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
index 8a01ff016d..ea61e608c3 100644
--- a/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
+++ b/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P0,    KC_PDOT,  KC_SPC,   MO(_FN1)
   ),
   [_FN1] = LAYOUT_ortho_4x4(
-    RESET,    KC_PAST,  KC_PSLS,  _______,
+    QK_BOOT,  KC_PAST,  KC_PSLS,  _______,
     BL_TOGG,  BL_DEC,   BL_INC,   BL_STEP,
     RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,
     RGB_SAI,  RGB_SAD,  _______,  _______
diff --git a/keyboards/kprepublic/bm16s/keymaps/media/keymap.c b/keyboards/kprepublic/bm16s/keymaps/media/keymap.c
index a2a9b72db9..8c592a4151 100755
--- a/keyboards/kprepublic/bm16s/keymaps/media/keymap.c
+++ b/keyboards/kprepublic/bm16s/keymaps/media/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MPRV, KC_MPLY, KC_MNXT, MO(1)
 	),
 	[1] = LAYOUT_ortho_4x4(
-		RESET,    _______, _______, _______,
+		QK_BOOT,  _______, _______, _______,
 		RGB_SPD,  RGB_BRU, RGB_SPI, _______,
 		RGB_RMOD, RGB_BRD, RGB_MOD, _______,
 		RGB_TOG,  _______, _______, _______
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
index f3a8522a2d..4c06536945 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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,        RESET,      KC_NO,     KC_NO,     KC_NO,     KC_NO,
+      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,   KC_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
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
index 1ebea18175..12db3f2eec 100755
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 
 	[FUN] = LAYOUT_planck_mit(
-		KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    RESET,
+		KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    QK_BOOT,
 		KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SLCK,   KC_NO,    KC_NO,    KC_NO,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
 		KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_PAUS,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_ALGR,  KC_NO,
 		KC_NO,   KC_NO,   KC_APP,  KC_SPC,  KC_TAB,         KC_NO,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
index b04f7ffb7c..1e97aba495 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
@@ -19,7 +19,7 @@
 #include QMK_KEYBOARD_H
 
 // non-KC_ keycodes
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 #define KC_TOG RGB_TOG
 #define KC_MOD RGB_MOD
 #define KC_HUI RGB_HUI
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
index 12539fe41c..e725e23214 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
@@ -19,7 +19,7 @@
 #include QMK_KEYBOARD_H
 
 // non-KC_ keycodes
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 #define KC_TOG RGB_TOG
 #define KC_MOD RGB_MOD
 #define KC_HUI RGB_HUI
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
index 999e6b18af..02ea122a03 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
@@ -19,7 +19,7 @@
 #include QMK_KEYBOARD_H
 
 // non-KC_ keycodes
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 #define KC_TOG RGB_TOG
 #define KC_MOD RGB_MOD
 #define KC_HUI RGB_HUI
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
index e72d83f9d0..ecce30e237 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // adjust layer ok
 [_ADJUST] = LAYOUT_planck_mit(
-    RESET,   RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______,
     KC_CAPS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, QWERTY,  DVORAK,  COLEMAK, WORKMAN, MIDI,
     _______, MI_ON,   MI_OFF,  MI_TOG,  MU_ON,   MU_OFF,  MU_TOG,  MU_MOD,  AU_ON,   AU_OFF,  _______, _______,
     RGB_TOG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
index 04df426ba9..7c7324f555 100644
--- a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 12+11+11+9
     DF(2), KC_MUTE, KC_VOLD, KC_VOLU, KC_COMM, KC_1, KC_2, KC_3, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2,
     DF(3), XXXXXXX, XXXXXXX, KC_SPC, KC_0, KC_DOT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT ),
   [3] = LAYOUT(
-    DF(0), KC_SLEP, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+    DF(0), KC_SLEP, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
     XXXXXXX, BL_TOGG, BL_DEC, BL_INC, BL_STEP, BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ),
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
index 366c755558..f201c3d88f 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, 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
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
index c43365356e..da5aa92901 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   KC_LALT,   KC_LGUI,                       KC_SPC,                              KC_RGUI, MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        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, _______, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
index 5050b25a90..fb7e9c33c3 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
 	                     KC_RSFT, KC_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,
-	                     RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_UP, KC_INS, KC_HOME, KC_END,
+	                     QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_UP, KC_INS, KC_HOME, KC_END,
 	                     KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
 	                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS, KC_TRNS,
 	                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
index e59660242e..4a438b822b 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
@@ -58,14 +58,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_fn] = LAYOUT_60_ansi(
         KC_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_SLCK, KC_PAUS, RESET,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, 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, _______, _______, _______, RESET,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/kprepublic/bm65hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm65hsrgb/keymaps/default/keymap.c
index 1e1aae0413..1b3ce7a456 100644
--- a/keyboards/kprepublic/bm65hsrgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRAVE,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______,   _______,
         _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,  _______, _______,
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,    _______,
-        _______,      _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______,     _______,   _______,  _______,
+        _______,      _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,     _______,   _______,  _______,
         _______,   _______,   _______,                    _______,                         _______, _______,          _______, _______,  _______
     ),
 
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
index 46de987a68..680f79a668 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______,          LGUI(KC_PAUSE),
       _______, TO(_GREEN_), TO(_BLUE_), TO(_CYAN_), TO(_MAGENTA_), TO(_YELLOW_), _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
       _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-      RESET,   _______,     _______,                               KC_LEAD,                                 _______, _______,          KC_MPLY, KC_VOLD, KC_MUTE
+      QK_BOOT, _______,     _______,                               KC_LEAD,                                 _______, _______,          KC_MPLY, KC_VOLD, KC_MUTE
       ),
 
 
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
index 878967718f..feea65f84c 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRAVE,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______,   _______,
         _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,  _______, _______,
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,    _______,
-        _______,      _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______,     _______,   _______,  _______,
+        _______,      _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,     _______,   _______,  _______,
         _______,   _______,   _______,                    _______,                         _______, _______, _______, _______, _______,  _______
     ),
 
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
index 934463b11f..bf842b138b 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_PGDOWN,
-        BL_TOGG,      _______, _______, _______, _______,   RESET, KC_KP_1, KC_KP_2, KC_KP_3, _______, _______,     _______,   KC_AUDIO_VOL_UP,  KC_END,
+        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
     ),
 
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
index 453853fc63..09df21f267 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRAVE,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______,   _______,
         _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,  _______, _______,
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,    _______,
-        _______,      _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______,     _______,   _______,  _______,
+        _______,      _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,     _______,   _______,  _______,
         _______,   _______,   _______,                    _______,                         _______, _______, _______, _______, _______,  _______
     ),
     [2] = LAYOUT_65_ansi(
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
index 0f0467060b..e84b2b5d53 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______,          _______,             _______,
+        _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,          _______,             _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
     )
 
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
index d4a188089b..38024a0911 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         RGB_MOD, RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         RGB_TOG, RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______,   RESET, _______, _______, _______, _______, _______,          _______,             KC_AUDIO_VOL_UP,
+        _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,          _______,             KC_AUDIO_VOL_UP,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,    KC_BRIGHTNESS_DOWN, KC_AUDIO_VOL_DOWN, KC_BRIGHTNESS_UP
     )
 
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
index 824f671ece..40354e785b 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______,          _______,             _______,
+        _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,          _______,             _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
     ),
 
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
index 9d6c64b33f..80deedc7b5 100644
--- a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT(
-       RESET,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   _______,   _______,                                   _______,    _______,    _______,  _______,
+       QK_BOOT, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   _______,   _______,                                   _______,    _______,    _______,  _______,
 	  _______,   _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,   _______,            _______,    _______,    _______,  _______,
 	  RGB_MOD, 	     RGB_HUI,     RGB_VAI,     RGB_SAI,     RGB_SPI,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,         _______,    _______,    _______,  _______,
 	  RGB_TOG,          RGB_HUD,     RGB_VAD,     RGB_SAD,     RGB_SPD,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,                   _______,    _______,    _______,
diff --git a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
index 84324c6e0d..77c6ea8424 100644
--- a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
@@ -266,7 +266,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			RGB_SAD, BL_ON,    COLEMAK,          \
 			RGB_SAI, RGB_TOG,  DVORAK,  _______, \
 			RGB_HUD, RGB_MOD,  KC_VOLD, _______, \
-			RGB_HUI, RGB_RMOD, KC_VOLU, RESET),
+			RGB_HUI, RGB_RMOD, KC_VOLU, QK_BOOT),
 };
 
 // Makes sure to update the good tri-layer if a layer changes
diff --git a/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c b/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
index dd2ff00cd1..d780a583e1 100644
--- a/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
@@ -76,6 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_HUD, RGB_HUI, BL_ON,   _______,
         RGB_SAD, RGB_SAI, BL_OFF,  _______,
         RGB_VAD, RGB_VAI, BL_STEP,
-        _______, _______, RESET,   _______
+        _______, _______, QK_BOOT, _______
     )
 };
diff --git a/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c b/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
index 3a0c7d6e4e..cd64e0c9ec 100644
--- a/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
@@ -76,6 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_HUD, RGB_HUI, BL_ON,
         RGB_SAD, RGB_SAI, BL_OFF,  _______,
         RGB_VAD, RGB_VAI, BL_STEP,
-        _______, _______, RESET,   _______
+        _______, _______, QK_BOOT, _______
     )
 };
diff --git a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
index 1a42261940..0d8adbffbc 100644
--- a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * | Ins  |      |      |  ()  |  []  |  {}  | Home | PgDn | PgUp | End  |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |RESET | Back | Fwd  |      |      |      |      |      | Mute | Vol- | Vol+ |      |
+ * |QK_BOOT | Back | Fwd  |      |      |      |      |      | Mute | Vol- | Vol+ |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      | Lock |      |             | Prev | Stop | Play | Next |
  * `-----------------------------------------------------------------------------------'
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_planck_1x2uR( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
   KC_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \
-  RESET,   KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
+  QK_BOOT, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
   _______, _______, _______, _______, KC_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
 ),
 
diff --git a/keyboards/kprepublic/jj40/keymaps/waples/keymap.c b/keyboards/kprepublic/jj40/keymaps/waples/keymap.c
index 1c8d58f792..ae35e5925a 100644
--- a/keyboards/kprepublic/jj40/keymaps/waples/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/waples/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_DUAL] = LAYOUT_ortho_4x12( \
-  RESET,   _______, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, RGB_HUD,  RGB_TOG,  RESET, \
+  QK_BOOT, _______, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, RGB_HUD,  RGB_TOG,  QK_BOOT, \
   _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, RGB_HUI,  RGB_MOD,  _______, \
   _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, RGB_SAD,  RGB_VAD,  _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,  RGB_VAI,  _______ \
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
index c096aaea10..603bce7798 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     [_FN] = LAYOUT( \
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
index af4c3c84bb..7ea34220b3 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     [_META] = LAYOUT( \
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c b/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
index 571f93be52..adb3b727d2 100644
--- a/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN3] = LAYOUT(
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
      _______, KC_MPRV, KC_MRWD, KC_MFFD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kv/revt/keymaps/default/keymap.c b/keyboards/kv/revt/keymaps/default/keymap.c
index 7f2d130e2c..dbbd4a9ed0 100644
--- a/keyboards/kv/revt/keymaps/default/keymap.c
+++ b/keyboards/kv/revt/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       _______,             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_MPLY, KC_MNXT, KC_VOLU,
 _______, _______, _______, _______,   _______, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MSTP, KC_MPRV, KC_VOLD,
-_______, _______, _______,            _______, KC_MS_L,    KC_MS_D, KC_MS_R,    KC_WH_D, _______, _______, _______,   QK_BOOT, _______, _______, _______,          _______,
+_______, _______, _______,            _______, KC_MS_L,    KC_MS_D, KC_MS_R,    KC_WH_D, _______, _______, _______, QK_BOOT, _______, _______, _______,          _______,
 _______, _______, _______, _______,   _______, _______,    _______, KC_CALC,    _______, _______, _______, KC_MUTE, _______, _______, _______,                   _______,            _______,
 _______,          _______,            _______, _______,    _______,                      _______,                                     _______, _______, _______, _______,   _______, _______, _______),
 
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
index 6f893e187f..ed8a25166c 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 	[_ADJUST] = LAYOUT(
-		EEP_RST, RESET,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		EEP_RST, QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_LEAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QWERTY,  COLEMAK, KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 	[_VIM] = LAYOUT(
-		EEP_RST, RESET,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		EEP_RST, QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,
 		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
index e4b4161b04..e490d68900 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
@@ -18,6 +18,6 @@
 
 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, RESET, 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),
+	[1] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, QK_BOOT, RGB_SPI, RGB_SPD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_SCLN, KC_NO, KC_LSFT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, MO(2), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
 	[2] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c b/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
index e81bdaa1c7..18f4ad9e9e 100644
--- a/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
+++ b/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [1] = LAYOUT_ortho(
         KC_GRV,    KC_1,    KC_2,    KC_3,     KC_4,     KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,       KC_NO,
-        RESET,     KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,   KC_F6,   KC_MINS, KC_EQL,   KC_LBRC,  KC_RBRC,    KC_NO,
+        QK_BOOT,   KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,   KC_F6,   KC_MINS, KC_EQL,   KC_LBRC,  KC_RBRC,    KC_NO,
         KC_NO,     KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,  KC_NO,   KC_NO,    KC_NO,    KC_NO,      KC_NO,
         KC_VOLD,   KC_MUTE, KC_VOLU, KC_TRNS,  KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,    KC_NO,      KC_NO
         ),
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
index 18261dbba6..ab1c35c51a 100644
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
@@ -62,7 +62,7 @@ _______, _______, _______,          _______,            _______,
  */
 
 [_L2] = LAYOUT(
-RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_DEL,     KC_HOME, KC_PGUP, _______,
+QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_DEL,     KC_HOME, KC_PGUP, _______,
 _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU,          _______,     KC_END,  KC_PGDN, _______,
 _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,     _______,   KC_UP, _______,
 EEP_RST, _______, _______,          _______,            _______,                 _______, _______, _______,     KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
index f73b0371a1..03bee2dcc7 100644
--- a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
+++ b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FNMS] = LAYOUT_65_ansi_split_bs(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, KC_DEL,  KC_MPLY,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         RESET,   KC_VOLU,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         QK_BOOT, KC_VOLU,
     AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST,         KC_VOLD,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_BTN1, KC_MS_U,KC_MNXT,
     _______, _______, _______,                            _______,                   _______,          _______,          KC_MS_L,KC_MS_D, KC_MS_R
diff --git a/keyboards/lets_split/keymaps/DE_simple/keymap.c b/keyboards/lets_split/keymaps/DE_simple/keymap.c
index c49da49cf0..7274d1fd2e 100644
--- a/keyboards/lets_split/keymaps/DE_simple/keymap.c
+++ b/keyboards/lets_split/keymaps/DE_simple/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( \
-  _______, RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTZ,  _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/aerialviews007/keymap.c b/keyboards/lets_split/keymaps/aerialviews007/keymap.c
index cc3dabf65e..ce031dd25b 100644
--- a/keyboards/lets_split/keymaps/aerialviews007/keymap.c
+++ b/keyboards/lets_split/keymaps/aerialviews007/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/lets_split/keymaps/cpeters1982/keymap.c b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
index 27cd9db8b4..34174ac8c9 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/keymap.c
+++ b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, KC_LEFT,  KC_DOWN, KC_RGHT, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PERC, KC_GRV, KC_TILD, \
   KC_ASDN, KC_ASUP, KC_ASRP, _______, _______, _______, _______, KC_RBRC, KC_LBRC, KC_MINS, KC_EQL, KC_BSLASH \
diff --git a/keyboards/lets_split/keymaps/dlaroe/keymap.c b/keyboards/lets_split/keymaps/dlaroe/keymap.c
index 65dad2d3d8..d68982c37d 100644
--- a/keyboards/lets_split/keymaps/dlaroe/keymap.c
+++ b/keyboards/lets_split/keymaps/dlaroe/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, RESET, M(0),  _______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), \
+  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), \
   _______, _______, _______, AU_ON,   AU_OFF,  GAME, AG_SWAP, AG_NORM,  _______, _______,  _______,  _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV, KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
   BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP \
diff --git a/keyboards/lets_split/keymaps/fabian/keymap.c b/keyboards/lets_split/keymaps/fabian/keymap.c
index 518eb0e731..fde91d1fe0 100644
--- a/keyboards/lets_split/keymaps/fabian/keymap.c
+++ b/keyboards/lets_split/keymaps/fabian/keymap.c
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_DEL , \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL , \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/geripgeri/keymap.c b/keyboards/lets_split/keymaps/geripgeri/keymap.c
index eb22a1509e..d6f6f0537f 100644
--- a/keyboards/lets_split/keymaps/geripgeri/keymap.c
+++ b/keyboards/lets_split/keymaps/geripgeri/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------'                `-----------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-  RESET,   EEP_RST, _______, RALT(KC_SCLN), _______, _______,       _______, TD(U),  RALT(KC_Z),      TD(O),   _______, _______,
+  QK_BOOT, EEP_RST, _______, RALT(KC_SCLN), _______, _______,       _______, TD(U),  RALT(KC_Z),      TD(O),   _______, _______,
   _______, RALT(KC_QUOT), _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______
diff --git a/keyboards/lets_split/keymaps/halvves/keymap.c b/keyboards/lets_split/keymaps/halvves/keymap.c
index 6fbd646519..c4702d8f2b 100644
--- a/keyboards/lets_split/keymaps/halvves/keymap.c
+++ b/keyboards/lets_split/keymaps/halvves/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_UTIL] = LAYOUT_ortho_4x12(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/keymap.c b/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
index 3a7ef9db39..950eda4a45 100644
--- a/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
+++ b/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
         [_AUX] = LAYOUT(
-            RESET, ____, ____, ____, ____, ____, ____, LGUI(KC_L), ____, ____, ____, KC_VOLU,
+            QK_BOOT, ____, ____, ____, ____, ____, ____, LGUI(KC_L), ____, ____, ____, KC_VOLU,
             ____, ____, LGUI(KC_R), ____, ____, ____, ____, ____, ____, ____, ____, KC_VOLD,
             ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, KC_PGUP, KC_MUTE,
             ____, ____, ____, ____, KC_TAB, KC_DEL, ____, ____, ____, KC_HOME, KC_PGDOWN, KC_END)
diff --git a/keyboards/lets_split/keymaps/henxing/keymap.c b/keyboards/lets_split/keymaps/henxing/keymap.c
index e3d7885cb8..7b28259f3b 100644
--- a/keyboards/lets_split/keymaps/henxing/keymap.c
+++ b/keyboards/lets_split/keymaps/henxing/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_RAISE] = LAYOUT( \
             KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_NO,   KC_NO,   KC_UP,   KC_F7,    KC_F8,   KC_F9,   KC_F10, \
             KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO,   KC_NO,   KC_DOWN, KC_F4,    KC_F5,   KC_F6,   KC_F11, \
-            KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, RESET,   KC_NO,   KC_NO,   KC_TRNS, KC_F1,    KC_F2,   KC_F3,   KC_F12, \
+            KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, QK_BOOT, KC_NO,   KC_NO,   KC_TRNS, KC_F1,    KC_F2,   KC_F3,   KC_F12, \
             KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY,   KC_PSCR, KC_SLCK, KC_PAUS \
             )
 
diff --git a/keyboards/lets_split/keymaps/hvp/keymap.c b/keyboards/lets_split/keymaps/hvp/keymap.c
index e9ebd46d64..1c86381f64 100644
--- a/keyboards/lets_split/keymaps/hvp/keymap.c
+++ b/keyboards/lets_split/keymaps/hvp/keymap.c
@@ -61,5 +61,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______,
   _______, RGB_M_P, RGB_HUD, RGB_HUI, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______,
   KC_PSCR, _______, RGB_SAD, RGB_SAI, _______, _______, KC_0, KC_1, KC_2, KC_3, _______, _______,
-  RESET, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______
 )};
diff --git a/keyboards/lets_split/keymaps/khord/keymap.c b/keyboards/lets_split/keymaps/khord/keymap.c
index 60b2973947..1cee03fe9e 100644
--- a/keyboards/lets_split/keymaps/khord/keymap.c
+++ b/keyboards/lets_split/keymaps/khord/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( \
-  _______, RESET,   _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, ADMIN,    SMSPC1,  KC_DEL, \
+  _______, QK_BOOT, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, ADMIN,    SMSPC1,  KC_DEL, \
   _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, _______, _______, \
   _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, RGB_M_G, RGB_M_X, RGB_M_K, RGB_M_SN, _______, C_A_INS, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, C_A_DEL \
diff --git a/keyboards/lets_split/keymaps/kris/keymap.c b/keyboards/lets_split/keymaps/kris/keymap.c
index ee47d7999a..f54807758b 100644
--- a/keyboards/lets_split/keymaps/kris/keymap.c
+++ b/keyboards/lets_split/keymaps/kris/keymap.c
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/krusli/keymap.c b/keyboards/lets_split/keymaps/krusli/keymap.c
index 002d22d302..afcee96d09 100644
--- a/keyboards/lets_split/keymaps/krusli/keymap.c
+++ b/keyboards/lets_split/keymaps/krusli/keymap.c
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/mbsurfer/keymap.c b/keyboards/lets_split/keymaps/mbsurfer/keymap.c
index da49f0c7aa..43c6bde98c 100644
--- a/keyboards/lets_split/keymaps/mbsurfer/keymap.c
+++ b/keyboards/lets_split/keymaps/mbsurfer/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------     ------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( \
-  RESET,   _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, KC_DEL,  \
+  QK_BOOT, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, KC_DEL,  \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,  AG_SWAP,  QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD,  RGB_SAI,  RGB_VAD, RGB_VAI, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, C_S_ESC, C_A_DEL \
diff --git a/keyboards/lets_split/keymaps/mekberg/keymap.c b/keyboards/lets_split/keymaps/mekberg/keymap.c
index e530623f1d..ddde0c4bd4 100644
--- a/keyboards/lets_split/keymaps/mekberg/keymap.c
+++ b/keyboards/lets_split/keymaps/mekberg/keymap.c
@@ -219,7 +219,7 @@ SPECIAL
    `-----------------------------------------------------´   `-----------------------------------------------------'
 */
 [_SPECIAL] = LAYOUT_ortho_4x12(
-    RESET,   _______, TO_WIN,  KC_VOLU, _______, _______,     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_DEL,
+    QK_BOOT, _______, TO_WIN,  KC_VOLU, _______, _______,     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_DEL,
     EEP_RST, _______, MY_PREV, KC_VOLD, MY_NEXT, _______,     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
     _______, _______, _______, KC_MUTE, _______, _______,     MY_LOCK, TO_MAC,  _______, _______, _______, _______,
     _______, _______, _______, _______, _______, MY_PLAY,     _______, _______, _______, _______, _______, KC_SLEP
diff --git a/keyboards/lets_split/keymaps/mjt/keymap.c b/keyboards/lets_split/keymaps/mjt/keymap.c
index a7fa4f55d3..13e21f8f7a 100644
--- a/keyboards/lets_split/keymaps/mjt/keymap.c
+++ b/keyboards/lets_split/keymaps/mjt/keymap.c
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/normacos/keymap.c b/keyboards/lets_split/keymaps/normacos/keymap.c
index b6b6b1c141..f43e72b682 100644
--- a/keyboards/lets_split/keymaps/normacos/keymap.c
+++ b/keyboards/lets_split/keymaps/normacos/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------' `-----------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12( \
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  XXXXXXX, NORMAN,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/lets_split/keymaps/piemod/keymap.c b/keyboards/lets_split/keymaps/piemod/keymap.c
index 68e7e0ba05..0711303d9c 100644
--- a/keyboards/lets_split/keymaps/piemod/keymap.c
+++ b/keyboards/lets_split/keymaps/piemod/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_PSCREEN,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6, \
   KC_NO,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_TRNS,  KC_NO,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12, \
   KC_NO,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_NO,  KC_NO, KC_NO,  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  KC_MEDIA_PLAY_PAUSE, \
-  RESET,  RGB_TOG,  RGB_MOD,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END \
+  QK_BOOT,  RGB_TOG,  RGB_MOD,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END \
 ),
 
 [_EMACS] = LAYOUT( \
diff --git a/keyboards/lets_split/keymaps/pitty/keymap.c b/keyboards/lets_split/keymaps/pitty/keymap.c
index 8bc32a1eb7..27ead4d29f 100644
--- a/keyboards/lets_split/keymaps/pitty/keymap.c
+++ b/keyboards/lets_split/keymaps/pitty/keymap.c
@@ -103,14 +103,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |DM_REC|      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | LShft|      |      |      |      |      |      | RESET|
+ * |      |      |      |      | LShft|      |      |      |      |      |      | QK_BOOT|
  * `-----------------------------------------------------------------------------------'
  */
 [_VIM] =  LAYOUT( \
   RGB_MOD, RGB_TOG,  _______, _______, _______, _______, _______, KC_RBRC, KC_NUBS, KC_EQL , KC_LBRC, KC_NUHS, \
   _______, _______,  _______, KC_LCTL, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
   _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______,  _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, RESET \
+  _______, _______,  _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, QK_BOOT \
 )
 
 
diff --git a/keyboards/lets_split/keymaps/poker/keymap.c b/keyboards/lets_split/keymaps/poker/keymap.c
index 7b202409e3..9bfb951001 100644
--- a/keyboards/lets_split/keymaps/poker/keymap.c
+++ b/keyboards/lets_split/keymaps/poker/keymap.c
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
  [_ADJUST] = LAYOUT( \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______,  _______, \
   KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/pyrol/keymap.c b/keyboards/lets_split/keymaps/pyrol/keymap.c
index 1a6cd75866..9bf82e6812 100644
--- a/keyboards/lets_split/keymaps/pyrol/keymap.c
+++ b/keyboards/lets_split/keymaps/pyrol/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______, _______, GAME, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \
+  _______, _______, GAME, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c
index 7ab16b3fe3..cb3e1fff54 100644
--- a/keyboards/lets_split/keymaps/shaymdev/keymap.c
+++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] =  LAYOUT( 
-    TO_DV, RESET,   _______, _______, _______, _______, 		_______, _______, _______, _______, _______, KC_DEL,  
+    TO_DV, QK_BOOT, _______, _______, _______, _______, 		_______, _______, _______, _______, _______, KC_DEL,  
   RGB_TOG, RGB_MOD, VLK_TOG, AU_ON,   AU_OFF,  AG_NORM, 		AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______, 
   RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 		_______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, 
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
diff --git a/keyboards/lets_split/keymaps/smt/keymap.c b/keyboards/lets_split/keymaps/smt/keymap.c
index 1b9b448008..8cdca05648 100644
--- a/keyboards/lets_split/keymaps/smt/keymap.c
+++ b/keyboards/lets_split/keymaps/smt/keymap.c
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------' `-----------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/lets_split/keymaps/that_canadian/keymap.c b/keyboards/lets_split/keymaps/that_canadian/keymap.c
index 07a165ad89..00cf26e74a 100644
--- a/keyboards/lets_split/keymaps/that_canadian/keymap.c
+++ b/keyboards/lets_split/keymaps/that_canadian/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
  * ,-----------------------------------------------------------------------------------.
- * | RESET|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * | QK_BOOT|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT( \
-  RESET,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+  QK_BOOT,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   RGB_TOG, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
   BACKLIT,  KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/tylerwince/keymap.c b/keyboards/lets_split/keymaps/tylerwince/keymap.c
index c781513c48..cb21a6f368 100644
--- a/keyboards/lets_split/keymaps/tylerwince/keymap.c
+++ b/keyboards/lets_split/keymaps/tylerwince/keymap.c
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------   ------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, RESET,   _______, _______, _______, _______, _______,   QWERTY,    COLEMAK,   DVORAK,    LCA(KC_7), LCA(KC_8),
+  _______, QK_BOOT, _______, _______, _______, _______, _______,   QWERTY,    COLEMAK,   DVORAK,    LCA(KC_7), LCA(KC_8),
   _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, LCA(KC_H), LCA(KC_J), LCA(KC_K), LCA(KC_L), LCA(KC_U), LCA(KC_I),
   _______, _______, _______, _______, _______, _______, _______,   RGB_SAI,   RGB_SAD,   RGB_VAI,   RGB_VAD,   LCA(KC_ENT),
   _______, _______, _______, _______, _______, _______, _______,   _______,   RGB_M_K,   RGB_M_B,   RGB_TOG,   _______
diff --git a/keyboards/lets_split/keymaps/vim-mode/keymap.c b/keyboards/lets_split/keymaps/vim-mode/keymap.c
index 4b25aa5dc7..a33d8c11f7 100644
--- a/keyboards/lets_split/keymaps/vim-mode/keymap.c
+++ b/keyboards/lets_split/keymaps/vim-mode/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______, RESET,   _______,  QWERTY,  COLEMAK, DVORAK,  _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_DEL,  \
+  _______, QK_BOOT, _______,  QWERTY,  COLEMAK, DVORAK,  _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_DEL,  \
   _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/lets_split/keymaps/waples/keymap.c b/keyboards/lets_split/keymaps/waples/keymap.c
index 42b86aad2a..f357607ace 100644
--- a/keyboards/lets_split/keymaps/waples/keymap.c
+++ b/keyboards/lets_split/keymaps/waples/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_DUAL] =  LAYOUT( \
-  RESET,   _______, _______, _______, _______, QWERTY,  GAME,    _______, _______, _______, _______, RESET, \
+  QK_BOOT, _______, _______, _______, _______, QWERTY,  GAME,    _______, _______, _______, _______, QK_BOOT, \
   _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
   _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, DVORAK,  _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/xk/keymap.c b/keyboards/lets_split/keymaps/xk/keymap.c
index 89197beb07..66be11e01c 100755
--- a/keyboards/lets_split/keymaps/xk/keymap.c
+++ b/keyboards/lets_split/keymaps/xk/keymap.c
@@ -301,7 +301,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_GRVTABL] =  LAYOUT( \
-    TG(5),LALT(KC_PSCR),    M(4),  KC_PWR,KC_POWER,   RESET,           RESET,    KC_R,    KC_E,    KC_I,LALT(KC_PSCR),TG(3), \
+    TG(5),LALT(KC_PSCR),    M(4),  KC_PWR,KC_POWER,   QK_BOOT,         QK_BOOT,  KC_R,    KC_E,    KC_I,LALT(KC_PSCR),TG(3), \
     TG(1),        TG(6),   TG(7),   TG(9),   TG(3),   TG(2),           TG(2),    KC_S,    KC_U,    KC_B,   TG(6),   TG(1), \
      M(3),        TG(8), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,         KC_MYCM, KC_CALC, XXXXXXX, XXXXXXX,   TG(8),    M(3), \
    TT(15),        TG(6),   TG(7),   TG(9),   TG(3),   TG(2),           TG(2),   TG(3),   TG(9),   TG(7),   TG(6), _______ \
diff --git a/keyboards/lets_split/keymaps/yshrsmz/keymap.c b/keyboards/lets_split/keymaps/yshrsmz/keymap.c
index ccb3557b4a..b02d86398f 100644
--- a/keyboards/lets_split/keymaps/yshrsmz/keymap.c
+++ b/keyboards/lets_split/keymaps/yshrsmz/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lets_split/keymaps/zer09/keymap.c b/keyboards/lets_split/keymaps/zer09/keymap.c
index cb6744433a..628e334a29 100644
--- a/keyboards/lets_split/keymaps/zer09/keymap.c
+++ b/keyboards/lets_split/keymaps/zer09/keymap.c
@@ -33,7 +33,7 @@ extern keymap_config_t keymap_config;
 #define _astdLayer LAYOUT( \
   KC_MPRV,     KC_MUTE,      _______,      _______,      _______,/**/KC_PSCR,   KC_SLCK,  KC_PAUSE, _______, KC_RGUP,  \
   KC_MPLY,     KC_VOLD,      _______,      _______,      _______,/**/_______,   _______,  _______,  _______, KC_RGDWN, \
-  KC_MNXT,     KC_VOLU,      RESET,        _______,      _______,/**/_______,   _______,  RESET,    _______, _______,  \
+  KC_MNXT,     KC_VOLU,      QK_BOOT,      _______,      _______,/**/_______,   _______,  QK_BOOT,  _______, _______,  \
   _______,     _______,      _______,      _______,      _______,/**/_______,   _______,  _______,  _______, _______,  \
   _______,     _______,      _______,      _______,      _______,/**/_______,   _______,  _______,  _______, _______)
 
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
index bd35bfbf22..a55e5ab18b 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [SETTINGS] = LAYOUT_split_rshift(
         XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,       BL_TOGG,            RGB_TOG,     RGB_VAI,
         XXXXXXX, XXXXXXX, DEBUG,           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,               RESET,
+        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
     )
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
index 0a9c2aa4f9..b4efe94f06 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [SETTINGS] = LAYOUT_split_bs(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  XXXXXXX, XXXXXXX,          RGB_TOG, RGB_VAI,
         XXXXXXX, XXXXXXX, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG,                   RGB_MOD, RGB_VAD,
-        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                   RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_SAD, RGB_HUD, RGB_SAI
     )
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
index b62ea93440..4e919da84f 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
         MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
     )
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
index c946856dbe..b53fb19e1c 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
         MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOG,  KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        AU_TOG,  KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
     )
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
index b2b97f442d..667e8859e2 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* RGB */
     [1] = LAYOUT_numpad_6x4(
         RGB_SAI, RGB_VAI, RGB_HUI, _______,
-        RGB_SAD, RGB_VAD, RGB_HUD, RESET,
+        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,
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
index f5faf7215a..88e60c89af 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [SETTINGS] = LAYOUT(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,                  RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX,
         MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
-        AU_TOG,  KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        AU_TOG,  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_TOG,  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
     )
diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c
index a0856d0fdd..eced2f2655 100644
--- a/keyboards/lily58/keymaps/bcat/keymap.c
+++ b/keyboards/lily58/keymaps/bcat/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */
     [LAYER_ADJUST] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/lily58/keymaps/druotoni/keymap.c b/keyboards/lily58/keymaps/druotoni/keymap.c
index 2db32047e0..2ab26bbd24 100644
--- a/keyboards/lily58/keymaps/druotoni/keymap.c
+++ b/keyboards/lily58/keymaps/druotoni/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     [_LOWER] =  LAYOUT(
     KC_ESC, KC_F1,      KC_F2,  KC_F3,      KC_F4,          KC_F5,                          KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_DELETE,
-    RESET,  KC_F11,     KC_F12, KC_DELETE,  RCTL(FR_V),     RCTL(FR_C),                     KC_HOME,    KC_PGUP,    KC_PSCR,    RCTL(FR_Y), RCTL(KC_RIGHT), _______,
+    QK_BOOT,  KC_F11,     KC_F12, KC_DELETE,  RCTL(FR_V),     RCTL(FR_C),                     KC_HOME,    KC_PGUP,    KC_PSCR,    RCTL(FR_Y), RCTL(KC_RIGHT), _______,
     _______,RCTL(FR_A), _______,RCTL(FR_S), RCTL(FR_Z),     KC_BSPC,                        KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   _______,        _______,
     KC_F9,  KC_F11,     KC_F10, KC_F5,      LALT(KC_TAB),   RCTL(FR_X), KC_ENT, _______,    KC_END,     KC_PGDN,    _______,    _______,    _______,        _______,
     _______,TT(_RAISE), _______, _______,                                                   _______,    _______,    KC_APP,     _______),
diff --git a/keyboards/lily58/keymaps/hvp/keymap.c b/keyboards/lily58/keymaps/hvp/keymap.c
index 67e2541f6b..91f3590757 100644
--- a/keyboards/lily58/keymaps/hvp/keymap.c
+++ b/keyboards/lily58/keymaps/hvp/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______,                   _______, KC_7, KC_8, KC_9, KC_0, _______, 
   _______, RGB_M_P, RGB_HUD, RGB_HUI, _______, _______,                   _______, KC_4, KC_5, KC_6, _______, _______, 
   KC_PSCR, _______, RGB_SAD, RGB_SAI, _______, _______,                   KC_0, KC_1, KC_2, KC_3, _______, _______, 
-  RESET, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  QK_BOOT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                              _______, KC_VOLD, KC_MPRV, KC_MSTP, KC_MPLY,  KC_MNXT, KC_VOLU, _______ 
   )
 };
diff --git a/keyboards/lily58/keymaps/muppetjones/keymap.c b/keyboards/lily58/keymaps/muppetjones/keymap.c
index 6e02482289..5a507eb9cb 100644
--- a/keyboards/lily58/keymaps/muppetjones/keymap.c
+++ b/keyboards/lily58/keymaps/muppetjones/keymap.c
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_wrapper(
     _______, __BLANK____________________________________,                   _______, CLMK_DH, QWERTY,  _______, _______, _______,
-    RESET,   __ADJUST_L1________________________________,                   __MEDIA_R1_________________________________, _______,
+    QK_BOOT, __ADJUST_L1________________________________,                   __MEDIA_R1_________________________________, _______,
     _______, __ADJUST_L2________________________________,                   __MEDIA_R2_________________________________, _______,
     _______, __ADJUST_L3________________________________, _______, _______, __MEDIA_R3_________________________________, _______,
                                _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
index 373b2137f0..5c7efc6d83 100644
--- a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_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, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
+        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_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
diff --git a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
index f91436414f..b3a91f7a22 100644
--- a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
+        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_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
diff --git a/keyboards/lyso1/lck75/keymaps/sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/sbs/keymap.c
index 7671765619..a2f0fee195 100644
--- a/keyboards/lyso1/lck75/keymaps/sbs/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/sbs/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_sbs(
       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RESET,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  
+      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  
       KC_CAPS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  
       KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS, 
       KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_RALT,  MO(1),    KC_TRNS,            KC_TRNS,  KC_TRNS)
diff --git a/keyboards/lyso1/lefishe/keymaps/wk_sbs/keymap.c b/keyboards/lyso1/lefishe/keymaps/wk_sbs/keymap.c
index 36c7d73b86..071746e1bf 100644
--- a/keyboards/lyso1/lefishe/keymaps/wk_sbs/keymap.c
+++ b/keyboards/lyso1/lefishe/keymaps/wk_sbs/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FN] = LAYOUT_wk_sbs(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/lyso1/lefishe/keymaps/wkl_sbs/keymap.c b/keyboards/lyso1/lefishe/keymaps/wkl_sbs/keymap.c
index 91a707db78..2bd1c508b5 100644
--- a/keyboards/lyso1/lefishe/keymaps/wkl_sbs/keymap.c
+++ b/keyboards/lyso1/lefishe/keymaps/wkl_sbs/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FN] = LAYOUT_wkl_sbs(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c
index 86231f8406..c5ca7df2e8 100644
--- a/keyboards/m10a/keymaps/gam3cat/keymap.c
+++ b/keyboards/m10a/keymaps/gam3cat/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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] = {{_______, _______, RESET  }, {_______, _______, _______}, {_______, _______, _______}, {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, _______}},
 };
 
diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c
index 1ef77ccc6e..6fc28dccc2 100644
--- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └──────┴──────┘
  */
 [_ADJUST] = LAYOUT( \
-    QM_MAKE, RESET, \
+    QM_MAKE, QK_BOOT, \
     DF_REDR, DF_MEDA, \
     DF_NAVI, DF_KBNR, \
     TG_LGHT, XXXXXXX \
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
index 06ddace84c..552ed7b183 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
@@ -94,14 +94,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | RESET|
+ * |      |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
   TSKMGR,  _______, _______, _______, _______, _______, KC_DEL,  _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
   _______, _______, _______, _______, _______, _______, _______, DVORAK,  RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET    \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT    \
 ),
 
 /* Function
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
index 9e67b7dda8..0a892da6a0 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------.
- * | RESET|      |      |      |      |      |      |RGBMOD|RGBVAI|RGBSAI|RGBHUI|caltde|
+ * | QK_BOOT|      |      |      |      |      |      |RGBMOD|RGBVAI|RGBSAI|RGBHUI|caltde|
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |RGBRMO|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
-  RESET,  _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
+  QK_BOOT,  _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
   _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______    \
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
index af5c98241a..195de46801 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
@@ -99,14 +99,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | RESET|
+ * |      |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
   RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, \
   RGB_MOD, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET    \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT    \
 ),
 
 /* FUNC
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
index 17f790675b..b434661865 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
@@ -132,14 +132,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |_DVORAK|     |      |      |      |      |      |      |      |      |RGBMOD|BLSTEP|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |_QWERTY|     |      |      |      |      |      |      |      |      |      | RESET|
+ * |_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),  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET    \
+  DF(_QWERTY),  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT    \
 ),
 
 /* Function
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
index bba9a02c8c..09f9a2329c 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
@@ -90,14 +90,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | RESET|
+ * |      |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
   TSKMGR,  _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
   _______, _______, _______, _______, _______, _______, _______, QWERTY,  RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET    \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT    \
 ),
 
 /* Function
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
index c592b1a6a9..c25c0b00d0 100644
--- a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_UP,   KC_F9,   KC_F10, \
   KC_F11,  KC_F12, RGB_RMOD, RGB_SAI, RGB_SAD,      _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL, \
-  RESET,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      RGB_VAI, RGB_VAD, KC_F8, TSKMGR,  _______, \
+  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      RGB_VAI, RGB_VAD, KC_F8, TSKMGR,  _______, \
                     _______, _______, _______,      _______,  _______, _______                    \
 )
 };
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
index e93a09f64a..c665e955a3 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * If you use QWERTY + the Vanilla numbers primarily, change NUMLK_E to NUMLK_N here.
  *
  * ,----------------------------------.           ,----------------------------------.
- * | RESET|DEBUG |QWERTY|CMKDHM|      |           |      | VOL--| VOL++|BRITE-|BRITE+|
+ * | QK_BOOT|DEBUG |QWERTY|CMKDHM|      |           |      | VOL--| VOL++|BRITE-|BRITE+|
  * |------+------+------+------+------|           |------+------+------+------+------|
  * | SHIFT| CTRL |  ALT |  GUI |NAV LK|           | POWER| VOL- | VOL+ | MUTE | MPLY |
  * |------+------+------+------+------|           |------+------+------+------+------|
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                `------'    `------'
  */
 [_SYS] = LAYOUT( \
-  RESET,   DEBUG,   QWERTY,  CMK_DHM, _______,       _______,  KC_VOLD, KC_VOLU, KC_BRID,  KC_BRIU, \
+  QK_BOOT, DEBUG,   QWERTY,  CMK_DHM, _______,       _______,  KC_VOLD, KC_VOLU, KC_BRID,  KC_BRIU, \
   KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK,        KC_POWER, VOL_DN,  VOL_UP,  KC__MUTE, KC_MPLY, \
   _______, _______, AU_OFF,  AU_ON,   _______,       _______,  NUMLK_E, KC_MRWD, KC_MFFD,  _______, \
                     _______, _______, _______,       _______,  _______, _______                     \
diff --git a/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c b/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
index 1c6b6749f3..05301f4b8e 100644
--- a/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,    KC_F8,   KC_F9,    KC_F10, \
   _______, DSK_LFT, _______, DSK_RT,  _______,      TSKMGR,  CALTDEL,  _______, KC_F11,   KC_F12, \
-  RESET,   _______, _______, _______, _______,      _______, _______,  _______, _______,  _______, \
+  QK_BOOT, _______, _______, _______, _______,      _______, _______,  _______, _______,  _______, \
                     _______, _______, _______,      _______, _______,  _______                    \
 )
 };
diff --git a/keyboards/maple_computing/minidox/keymaps/norman/keymap.c b/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
index 2786b7dd93..0147e8fb98 100644
--- a/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,    KC_F8,   KC_F9,    KC_F10, \
   _______, DSK_LFT, _______, DSK_RT,  _______,      TSKMGR,  CALTDEL,  _______, KC_F11,   KC_F12, \
-  RESET,   _______, _______, _______, _______,      _______, _______,  _______, _______,  _______, \
+  QK_BOOT, _______, _______, _______, _______,      _______, _______,  _______, _______,  _______, \
                     _______, _______, _______,      _______, _______,  _______                    \
 )
 
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
index d80febecaf..7d6b211379 100644
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT(
   _______,     KC_F7, KC_F8, KC_F9,  SCRCAP,        _______, KC_F10,  KC_F11, KC_F12, _______,
   _______,     KC_F1, KC_F2, KC_F3, _______,        _______, KC_F4, KC_F5,  KC_F6, _______,
-  OSM(MOD_LCTL),_______, _______, _______, RESET,    KILL, _______, _______,  _______, OSM(MOD_RCTL),
+  OSM(MOD_LCTL),_______, _______, _______, QK_BOOT,  KILL, _______, _______,  _______, OSM(MOD_RCTL),
                     _______, _______, _______,       _______, _______,  _______
 )
 
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
index 78ddca30e8..cacf1ec543 100644
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_UP,   KC_F9,   KC_F10, \
   KC_F11,  KC_F12,  _______, RGB_SAI, RGB_SAD,      _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL, \
-  RESET,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      RGB_VAI, RGB_VAD, KC_F8, TSKMGR,  _______, \
+  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      RGB_VAI, RGB_VAD, KC_F8, TSKMGR,  _______, \
                     _______, _______, _______,      _______,  _______, _______                    \
 )
 };
diff --git a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
index f479b10f67..c50571c78d 100644
--- a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT( \
   _______,  _______,  _______,  _______,  _______,             _______,   KC_F7,    KC_F8,    KC_F9,   KC_F10,  \
   CALTESC,  CALTDEL,  _______,  CALT,     _______,             _______,   KC_F4,    KC_F5,    KC_F6,   KC_F11,  \
-  RESET,    _______,  _______,  _______,  _______,             _______,   KC_F1,     KC_F2,    KC_F3,   KC_F12,  \
+  QK_BOOT,  _______,  _______,  _______,  _______,             _______,   KC_F1,     KC_F2,    KC_F3,   KC_F12,  \
                           _______,  _______,  _______,      _______,  _______,  _______  \
 )};
 
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
index 4c7a05227f..e1d1d2644c 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------|           |------+------+------+------+------|
  * |  F11 |      |      |      |      |           |      | PrSc | ScLk | Paus | F12  |
  * |------+------+------+------+------|           |------+------+------+------+------|
- * |      |QWERTY|COLEMK|DVORAK|      |           |RESET |      |      |      |      |
+ * |      |QWERTY|COLEMK|DVORAK|      |           |QK_BOOT |      |      |      |      |
  * `----------------------------------'           `----------------------------------'
  *                  ,--------------------.    ,------,-------------.
  *                  |      |      |      |    |      |      |      |
@@ -152,8 +152,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] =  LAYOUT ( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_UP,   KC_F9,   KC_F10,  \
-  KC_F11,  RESET,   _______, _______, _______,    _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12,  \
-  _______, QWERTY,  COLEMAK, DVORAK,  _______,    RESET,   _______, _______, _______, _______, \
+  KC_F11,  QK_BOOT, _______, _______, _______,    _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12,  \
+  _______, QWERTY,  COLEMAK, DVORAK,  _______,    QK_BOOT, _______, _______, _______, _______, \
                     _______, _______, _______,    _______, _______, _______                    \
   )
 };
diff --git a/keyboards/marksard/rhymestone/keymaps/switch_tester/keymap.c b/keyboards/marksard/rhymestone/keymaps/switch_tester/keymap.c
index 1d4e78af80..1012d63de6 100644
--- a/keyboards/marksard/rhymestone/keymaps/switch_tester/keymap.c
+++ b/keyboards/marksard/rhymestone/keymaps/switch_tester/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_ortho_4x10(
   //,---------------------------------------------------------------------------------------------------.
-         RESET,   RGBRST,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+         QK_BOOT, RGBRST,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
index 49c1870fa9..4f7465986b 100644
--- a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
+++ b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //,---------------------------------------------------------------------------------------------------.
-         RESET,   RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   KC_INS,  KC_PSCR,
+         QK_BOOT, RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   KC_INS,  KC_PSCR,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_NLCK,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
index 1e90a2416e..c8dd24ef5d 100644
--- a/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_base( \
   //,--------------------------------------------------------------------------------------------------------------------.
-      XXXXXXX,   RESET,  RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,          XXXXXXX,\
+      XXXXXXX,   QK_BOOT,  RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,          XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|
       XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D,  KC_END, KC_PGDN,          XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
index e1f0835881..0fa0d9a8a9 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_rs( \
   // Treadstone48                                                                                                           Rhymestone
   //,--------------------------------------------------------------------------------------------------------------------.  --------------------------------------------.
-      XXXXXXX,   RESET,  RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,          XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+      XXXXXXX,   QK_BOOT,  RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,          XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|  --------+--------+--------+--------+--------|
       XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D,  KC_END, KC_PGDN,          XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
diff --git a/keyboards/massdrop/alt/keymaps/b_/keymap.c b/keyboards/massdrop/alt/keymaps/b_/keymap.c
index 8285d5108f..7fe909c0df 100644
--- a/keyboards/massdrop/alt/keymaps/b_/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/b_/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD // miscellaneous silly keys, subject to change
       ),
 	[4] = LAYOUT_65_ansi_blocker( /* tab+b */
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, /* backspace */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, /* backspace */
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
index 8d4b3523eb..51799ed089 100644
--- a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, UC_RMOD, UC_MOD,  _______, _______, RESET,   _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, UC_RMOD, UC_MOD,  _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, LAG_SWP, LAG_NRM,                            _______,                            _______, TG(3),   _______, _______, _______
     ),
     [3] = LAYOUT(
diff --git a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
index 9fe1c8643a..3863086150 100644
--- a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LOWER] = LAYOUT(
         _______, RGB_RMOD,RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-        RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, RESET,   QWERTY,  _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______, _______, \
+        RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, QK_BOOT, QWERTY,  _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______, _______, \
         RGB_SPD, RGB_SAD, RGB_VAD, RGB_HUD, RGBRST,  GAME,    _______, _______, _______, _______, _______, _______,          _______, _______, \
         _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,          _______, _______, \
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______ \
diff --git a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
index debfa3b478..9de2947cc9 100644
--- a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LOWER] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, _______, \
         _______, RGB_RMOD,RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU, \
-        RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, RESET,   QWERTY,  _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD, \
+        RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, QK_BOOT, QWERTY,  _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD, \
         RGB_SPD, RGB_SAD, RGB_VAD, RGB_HUD, RGBRST,  GAME,    _______, _______, _______, _______, _______, _______, _______, \
         _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,                              _______, \
         _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______ \
diff --git a/keyboards/matrix/noah/keymaps/blockader/keymap.c b/keyboards/matrix/noah/keymaps/blockader/keymap.c
index 433fa9f9ef..e64821d33e 100644
--- a/keyboards/matrix/noah/keymaps/blockader/keymap.c
+++ b/keyboards/matrix/noah/keymaps/blockader/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KEY_FORWARD_LAYER(LAYER_WINDOW), LGUI(KC_SPC), LCTL(KC_SPC), KC_ESC, KC_TILD, KC_EXLM, KC_PEQL, KC_PLUS, KC_MINUS, KC_PIPE, KC_COLN, KC_LCBR, KC_RCBR, KEY_CREATE_PREVIOUS_LINE, KEY_FORWARD_LAYER(LAYER_LEGACY_BASE),
         KEY_CUT_WORD, LALT(KC_LEFT), LALT(KC_RIGHT), KC_BSPC, LGUI(KC_LEFT), LCTL(KC_E), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LGUI(KC_V), KC_DQUO, KEY_CREATE_NEXT_LINE, KEY_FORWARD_LAYER(LAYER_DESKTOP),
         KC_LSFT, LGUI(KC_Z), KEY_CUT_SELECTION, KC_LPRN, KC_RPRN, KC_UNDS, KC_LBRC, KC_RBRC, KC_LT, KC_GT, KC_QUES, KC_RSFT, KC_NO, LCTL(KC_LEFT),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KEY_FORWARD_LAYER(LAYER_CONTROL), KC_SPC, KC_RALT, KC_RGUI, KC_NO, RESET, LCTL(KC_RIGHT)),
+        KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KEY_FORWARD_LAYER(LAYER_CONTROL), KC_SPC, KC_RALT, KC_RGUI, KC_NO, QK_BOOT, LCTL(KC_RIGHT)),
     [LAYER_RACE_BASE] = LAYOUT_default_splitspace(
         KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, KC_NO, KC_NO, KC_NO, KEY_BACK_LAYER,
         KC_NO, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LCBR, KC_RCBR, KC_BSLS, KC_NO,
diff --git a/keyboards/matrix/noah/keymaps/rys/keymap.c b/keyboards/matrix/noah/keymaps/rys/keymap.c
index 73ee8e1fec..6c63ad829f 100644
--- a/keyboards/matrix/noah/keymaps/rys/keymap.c
+++ b/keyboards/matrix/noah/keymaps/rys/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │    │    │    │                        │    │    │ │   │   │   │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
         RGB_TOG, RGB_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/matrix/noah/keymaps/splitspace/keymap.c b/keyboards/matrix/noah/keymaps/splitspace/keymap.c
index e18de67d41..dd7b5f0c11 100644
--- a/keyboards/matrix/noah/keymaps/splitspace/keymap.c
+++ b/keyboards/matrix/noah/keymaps/splitspace/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_LGUI,  KC_LALT, KC_SPC,     KC_SPC, KC_SPC,           KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
     [1] = LAYOUT_default_splitspace(
         KC_BSLS,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, _______, _______,
-          RESET, RGB_TOG, RGB_MOD, _______,  KC_F13,  KC_F14,  KC_F24, _______, _______, _______, _______, _______, _______, _______, _______,
+          QK_BOOT, RGB_TOG, RGB_MOD, _______,  KC_F13,  KC_F14,  KC_F24, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, _______, _______),
diff --git a/keyboards/mb44/keymaps/2u1u_space/keymap.c b/keyboards/mb44/keymaps/2u1u_space/keymap.c
index d231d63301..5c9b53b23c 100644
--- a/keyboards/mb44/keymaps/2u1u_space/keymap.c
+++ b/keyboards/mb44/keymaps/2u1u_space/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER2] = LAYOUT_2u1u_space(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
         _______, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
     ),
 };
diff --git a/keyboards/mb44/keymaps/2u_space/keymap.c b/keyboards/mb44/keymaps/2u_space/keymap.c
index c3f654337a..320dfc4a85 100644
--- a/keyboards/mb44/keymaps/2u_space/keymap.c
+++ b/keyboards/mb44/keymaps/2u_space/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER2] = LAYOUT_2u_space(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
         _______, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
     ),
 };
diff --git a/keyboards/mb44/keymaps/3u_space/keymap.c b/keyboards/mb44/keymaps/3u_space/keymap.c
index 924b3f4abb..a0b412bb36 100644
--- a/keyboards/mb44/keymaps/3u_space/keymap.c
+++ b/keyboards/mb44/keymaps/3u_space/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER2] = LAYOUT_3u_space(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,  KC_VOLD,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,  KC_VOLD,
         XXXXXXX, _______, XXXXXXX, XXXXXXX,                   XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
     ),
 
diff --git a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
index 1567b14813..97899700f1 100644
--- a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Layer 2: "special effects": RGB lighting, backlighting, bootloader */
   [_SFX] = LAYOUT_mitchsplit(
       ______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G,______, ______, ______,  ______, ______,  \
-      ______,  BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  ______,  ______,  ______,  ______, ______, ______, ______,  ______,  RESET,  \
+      ______,  BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  ______,  ______,  ______,  ______, ______, ______, ______,  ______,  QK_BOOT,  \
       ______,  RGB_TOG, RGB_MOD,______,  ______,  ______,  ______,  ______,  ______, ______, ______, ______,  ______,  \
       ______,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______,  ______, ______, ______, ______,  ______,  \
       ______,  ______,  ______,             ______, ______, ______,                   ______, ______,TO(_DFT),______   \
diff --git a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
index 9bd75d61d6..e07e74d5ab 100644
--- a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
@@ -68,7 +68,7 @@ ________________________________________________________________________________
 /* FN1 - SEE readme.md
 ____________________________________________________________________________________________________________________________________________________________________________
 |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-| QUIT   |   F1   |   F2   |   F3   |   F4   |  F5    |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |   F12  |        |        |        |  HOME  |  END   | RESET  |
+| QUIT   |   F1   |   F2   |   F3   |   F4   |  F5    |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |   F12  |        |        |        |  HOME  |  END   | QK_BOOT  |
 |_ALL____|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
 |        |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |        |        |        |        |                 |        |        |        |        |
 |        | TOGGLE |  MODE  |INCREASE|DECREASE|  HUE   |  HUE   |  SAT   |        |        |        |        |        |      DELETE     |        |        |        |        |
@@ -89,7 +89,7 @@ ________________________________________________________________________________
 
 
 	[_FUNCTION] = LAYOUT_default(
-		QALL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, KC_HOME, KC_END,  RESET,
+		QALL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, KC_HOME, KC_END,  QK_BOOT,
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,      KC_DEL,     _______, _______, _______, _______,
       _______, BL_TOGG,  BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,
diff --git a/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
index 89d412b2dd..689ea869b1 100644
--- a/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
@@ -55,7 +55,7 @@ ________________________________________________________________________________
 /* FN_1
 ____________________________________________________________________________________________________________________________________________________________________________
 |        |        |        |        |        |        |        |        |        |        |        |        |        |        |  VOL   |  VOL   | NEXT   |        |        |
-| RESET  |        |        |        |        |        |        |        |        |        |        |        |        |  MUTE  |  DOWN  |   UP   | TRACK  |  HOME  |  END   |
+| QK_BOOT  |        |        |        |        |        |        |        |        |        |        |        |        |  MUTE  |  DOWN  |   UP   | TRACK  |  HOME  |  END   |
 |________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
 |        |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |        |        |        |        |                 |        |        |        |        |
 |        | TOGGLE |  MODE  |INCREASE|DECREASE|  HUE   |  HUE   |  SAT   |        |        |        |        |        |      DELETE     |        |        |        |        |
@@ -75,7 +75,7 @@ ________________________________________________________________________________
  */
 
 	[_FN1] = LAYOUT_default(
-    RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_END, _______, _______,  _______,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_END, _______, _______,  _______,
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,      KC_DEL,    _______, _______, _______, _______,
       _______, BL_TOGG,  BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______, _______,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______,
diff --git a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
index 30688ab5c4..cc8d0c2cad 100644
--- a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
@@ -56,7 +56,7 @@ ________________________________________________________________________________
 /* FN_1
 ____________________________________________________________________________________________________________________________________________________________________________
 |        |        |        |        |        |        |        |        |        |        |        |        |        |        |  VOL   |  VOL   | NEXT   |        |        |
-| RESET  |        |        |        |        |        |        |        |        |        |        |        |        |  MUTE  |  DOWN  |   UP   | TRACK  |  HOME  |  END   |
+| QK_BOOT  |        |        |        |        |        |        |        |        |        |        |        |        |  MUTE  |  DOWN  |   UP   | TRACK  |  HOME  |  END   |
 |________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
 |        |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |        |        |        |        |                 |        |        |        |        |
 |        | TOGGLE |  MODE  |INCREASE|DECREASE|  HUE   |  HUE   |  SAT   |  SAT   |        |        |        |        |      DELETE     |        |        |        |        |
@@ -76,7 +76,7 @@ ________________________________________________________________________________
  */
 
 	[_FN1] = LAYOUT_default(
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME, KC_END,  \
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME, KC_END,  \
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______, \
     _______, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,    _______, _______, _______,          \
diff --git a/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
index 7db2dc1836..6b5c108e28 100644
--- a/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
+++ b/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
@@ -49,6 +49,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_F1,        KC_F2,      KC_F3,      KC_F4,    KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,   KC_F12,
      _______,      KC_INS,     KC_HOME,    KC_PGUP,  _______,    _______,    _______,    _______,    _______,    _______,    _______,
      _______,      KC_DEL,     KC_END,     KC_PGDN,  _______,    _______,    _______,    _______,    _______,    _______,    _______,
-     _______,      _______,      _______,            RGB_TOG,        RGB_MOD,         _______,                   _______,    RESET
+     _______,      _______,      _______,            RGB_TOG,        RGB_MOD,         _______,                   _______,    QK_BOOT
    )
 };
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
index 90bb2ddd60..b78584c3aa 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
 		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
 		KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_HOME, KC_END, KC_TRNS,
-		RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_PGDN, KC_PGUP, KC_MPLY),
+		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_PGDN, KC_PGUP, KC_MPLY),
 
 };
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
index 4344d6d2bc..eb194be203 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN2] = LAYOUT_625_space(
-		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RESET,
+		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
 		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_END,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
index 2c64c5aac0..8de45ea5c4 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
@@ -58,6 +58,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, BL_TOGG, BL_STEP, BL_INC,  BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______,
     RGB_M_P, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______,
-    RESET,   _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______),
+    QK_BOOT, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______),
 
 };
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
index fba582e1b7..e39e6d00b2 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
@@ -36,13 +36,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN2] = LAYOUT_625_space(
-        KC_PWR, KC_BRID, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, RESET,
+        KC_PWR, KC_BRID, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, QK_BOOT,
         MT(KC_LGUI, KC_ESC), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(1), KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS,
         KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN3] = LAYOUT_625_space(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RESET,
+        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
         MT(KC_LGUI, KC_ESC), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(1), KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS,
         KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
index 7ad2aa81e9..91e2f8e739 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN2] = LAYOUT_split_space(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RESET,
+        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
         MT(KC_LGUI, KC_ESC), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(1), KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_END,
         KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
index 31ccfa82a3..e931aab63b 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
 		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
 		KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_HOME, KC_END, KC_TRNS,
-		RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_PGDN, KC_PGUP, KC_MPLY),
+		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_PGDN, KC_PGUP, KC_MPLY),
 
 };
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
index c0fb3695f9..13179a5f1a 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
 |         |Prev     |Pause    |Next     |LowerVol |RaiseVol |Mute     |         |         |         |         |         |
 |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-|RESET    |ESCT     |         |         |         |         |         |         |         |         |         |Game     |
+|QK_BOOT    |ESCT     |         |         |         |         |         |         |         |         |         |Game     |
 `-----------------------------------------------------------------------------------------------------------------------'
 */
 
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  KC_PGDN,  KC_UP,    KC_PGUP,  KC_HOME,  XXXXXXX,  XXXXXXX,  XXXXXXX,  GUIU,     XXXXXXX,  XXXXXXX,  KC_DEL,
   _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_END,   XXXXXXX,  XXXXXXX,  GUIL,     GUID,     GUIR,     EMOJI,   KC_ENT,
   _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  RGB_TOG,  RGB_MOD,  RGB_HUI,  CU_RGBV,  _______,
-  RESET,    CU_ESCT,  ALTF4,    _______,  _______,  KC_SPC,   CTLENT,   RGB_M_P,  _______,  _______,  _______,  CU_GAME
+  QK_BOOT,  CU_ESCT,  ALTF4,    _______,  _______,  KC_SPC,   CTLENT,   RGB_M_P,  _______,  _______,  _______,  CU_GAME
 )
 
 };
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
index 635b4eacb3..5764123179 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[_FN2] = LAYOUT_split_space(
-		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RESET,
+		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
 		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_END,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
index fb2d43ca96..7c2b259063 100644
--- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, \
-             _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET,   RESET,   _______, _______, _______, _______, _______, _______, _______, \
+             _______, RGB_LYR, RGB_THM, _______, EEP_RST, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
              _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
 
 )
diff --git a/keyboards/mechlovin/adelais/keymaps/default/keymap.c b/keyboards/mechlovin/adelais/keymaps/default/keymap.c
index 716a10affa..bb514bf15b 100644
--- a/keyboards/mechlovin/adelais/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
               KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                  KC_TRNS,          KC_TRNS,                            KC_TRNS ),
     [2] = LAYOUT_all(
-       RESET, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,        KC_F19, KC_F20, KC_F21,   KC_F22, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       QK_BOOT, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,        KC_F19, KC_F20, KC_F21,   KC_F22, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
      KC_TRNS, KC_TRNS, KC_TRNS,   KC_P4,   KC_P5,   KC_P6, KC_PAST,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
               KC_TRNS,          KC_TRNS,   KC_P1,   KC_P2,   KC_P3, KC_PPLS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/mechlovin/adelais/keymaps/via/keymap.c b/keyboards/mechlovin/adelais/keymaps/via/keymap.c
index f38d7b2e57..c83d398f64 100644
--- a/keyboards/mechlovin/adelais/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
               KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                  KC_TRNS,          KC_TRNS,                            KC_TRNS ),
     [2] = LAYOUT_all(
-     RESET,   KC_TRNS, BL_TOG, BL_EFFECT, BL_ISPD, BL_DSPD, BL_IHUE, BL_DHUE,         BL_ISAT, BL_DSAT, BL_IVAL, BL_DVAL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     QK_BOOT, KC_TRNS, BL_TOG, BL_EFFECT, BL_ISPD, BL_DSPD, BL_IHUE, BL_DHUE,         BL_ISAT, BL_DSAT, BL_IVAL, BL_DVAL, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
      KC_TRNS, KC_TRNS, KC_TRNS,   KC_P4,   KC_P5,   KC_P6, KC_PAST,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
               KC_TRNS,          KC_TRNS,   KC_P1,   KC_P2,   KC_P3, KC_PPLS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/mechstudio/dawn/keymaps/default/keymap.c b/keyboards/mechstudio/dawn/keymaps/default/keymap.c
index 6d12760f67..50dd2412d7 100644
--- a/keyboards/mechstudio/dawn/keymaps/default/keymap.c
+++ b/keyboards/mechstudio/dawn/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT(
-        QK_BOOT   , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ ,
+        QK_BOOT, _______ , _______ , _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ ,
         _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  
         _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
         _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
diff --git a/keyboards/mechstudio/dawn/keymaps/via/keymap.c b/keyboards/mechstudio/dawn/keymaps/via/keymap.c
index e6b92fc98c..e8ed0034a9 100644
--- a/keyboards/mechstudio/dawn/keymaps/via/keymap.c
+++ b/keyboards/mechstudio/dawn/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT(
-        QK_BOOT   , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ ,
+        QK_BOOT, _______ , _______ , _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ ,
         _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  
         _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
         _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
diff --git a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c
index 3501a5e350..3f7b092bc7 100644
--- a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c
+++ b/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT(
-    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
     KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c
index 940575ce10..61c59932cf 100644
--- a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c
+++ b/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT(
-    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
     KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c
index 68ff334279..cf1f8451d0 100644
--- a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c
+++ b/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT(
-    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
     KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
diff --git a/keyboards/mechwild/bde/keymaps/righty_default/keymap.c b/keyboards/mechwild/bde/keymaps/righty_default/keymap.c
index 5310cea051..c832b83617 100644
--- a/keyboards/mechwild/bde/keymaps/righty_default/keymap.c
+++ b/keyboards/mechwild/bde/keymaps/righty_default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT(
-    _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
+    _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
     _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4,   KC_F5,   KC_F6,
     _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
   ),
diff --git a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c b/keyboards/mechwild/bde/keymaps/righty_via/keymap.c
index 5310cea051..c832b83617 100644
--- a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c
+++ b/keyboards/mechwild/bde/keymaps/righty_via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT(
-    _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
+    _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
     _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4,   KC_F5,   KC_F6,
     _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
   ),
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
index 5447279e56..5c22abee3f 100755
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
@@ -68,7 +68,7 @@ static const keycodedescType PROGMEM keyselection[] = {
         {"C-A-D",   KC_CAD},  // Ctrl-Alt-Del
         {"AltF4",   KC_AF4},
         {"PLAY",    KC_MEDIA_PLAY_PAUSE},
-        {"FLASH",   RESET},   // firmware flash mode
+        {"FLASH",   QK_BOOT},   // firmware flash mode
 };
 
 #define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0])
@@ -93,7 +93,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
     case ENCFUNC:
         if (record->event.pressed) {
-            selectedkey_rec.keycode == RESET ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle RESET code
+            selectedkey_rec.keycode == QK_BOOT ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle QK_BOOT code
         } else {
             // when keycode is released
         }
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
index 104377f876..61df3e000f 100644
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
+++ b/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN2] = LAYOUT(                                                                                   
         _______, KC_F11,  KC_F12,  _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, RESET,   _______, _______,                         _______, _______, _______,  _______,    _______,   _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______,                         _______, _______, _______,  _______,    _______,   _______,
         _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______,     _______, _______,      _______,    _______,      _______, _______,     _______, _______, _______, _______
diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
index d7c03bd228..b0288c5d7a 100644
--- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  _______, _______, _______
     ),
 	[_FN2] = LAYOUT_landscape(
-        _______,  _______, RESET,
+        _______,  _______, QK_BOOT,
 
         _______,  _______,  KC_MPLY,  KC_MPRV, KC_MNXT,     _______,
         _______,  _______,  _______,  _______, _______,     _______,
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				          TT(_FN3), TT(_FN4), TT(_RGB)
     ),
     [_FN1] = LAYOUT(
-                  _______, _______, _______, RESET,
+                  _______, _______, _______, QK_BOOT,
                   KC_CALC, _______, _______, _______,
                   _______, _______, _______, _______,
         ENCFUNC,  KC_TAB,  _______, _______, _______,
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______, _______, _______, _______,
                   _______, _______, KC_MPLY, KC_MPRV,
                   _______, _______, _______, KC_MNXT,
-        RESET,    _______, _______, _______, _______,
+        QK_BOOT,  _______, _______, _______, _______,
         _______,  _______, _______, _______, _______,
         _______,  _______, _______, _______, _______,
 
@@ -175,7 +175,7 @@ static const keycodedescType PROGMEM keyselection[] = {
         {"Break",   KC_PAUS},
         {"C-A-D",   KC_CAD},  // Ctrl-Alt-Del
         {"AltF4",   KC_AF4},
-        {"RESET",   RESET},   // firmware flash mode
+        {"QK_BOOT",   QK_BOOT},   // firmware flash mode
 };
 
 #define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0])
@@ -200,7 +200,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
     case ENCFUNC:
         if (record->event.pressed) {
-            selectedkey_rec.keycode == RESET ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle RESET code
+            selectedkey_rec.keycode == QK_BOOT ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle QK_BOOT code
         } else {
             // when keycode is released
         }
diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
index 27d09c718d..5d68d9213d 100644
--- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
     KC_MUTE, KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_INS,
-    KC_HOME, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,   KC_NO,   KC_NO,   RESET,
+    KC_HOME, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
     KC_END,  KC_CAPS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_TRNS,
              KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_NLCK, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PGUP, KC_TRNS,
              KC_TRNS,KC_WINLCK,KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_NO,   KC_NO,   KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c b/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c
index 9c7dabcc6a..614d70469d 100644
--- a/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c
+++ b/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_FN3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RESET,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
     KC_TRNS,                                     KC_TRNS,
     KC_TRNS,                                     KC_TRNS,
     KC_TRNS,                                     KC_TRNS,
diff --git a/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c b/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c
index 9c7dabcc6a..614d70469d 100644
--- a/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c
+++ b/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_FN3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RESET,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
     KC_TRNS,                                     KC_TRNS,
     KC_TRNS,                                     KC_TRNS,
     KC_TRNS,                                     KC_TRNS,
diff --git a/keyboards/mehkee96/keymaps/johann/keymap.c b/keyboards/mehkee96/keymaps/johann/keymap.c
index a0212702ab..0aea5a8203 100644
--- a/keyboards/mehkee96/keymaps/johann/keymap.c
+++ b/keyboards/mehkee96/keymaps/johann/keymap.c
@@ -39,7 +39,7 @@ ________________________________________________________________________________
   /* Layer 1, function layer
 ____________________________________________________________________________________________________________________________________________________________________________
 |        |        |        |        |        |        |        |        |        |        |        |        |        |        |  VOL   |  VOL   |        |        |        |
-| RESET  |        |        |        |        |        |        |        |        |        |        |        |        | MUTE   |  DOWN  |   UP   |        |        |        |
+| QK_BOOT  |        |        |        |        |        |        |        |        |        |        |        |        | MUTE   |  DOWN  |   UP   |        |        |        |
 |________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
 |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
 |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
@@ -61,7 +61,7 @@ BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs
 
 
 	LAYOUT(
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
diff --git a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
index 17aa4e6d36..a7c481baa7 100755
--- a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_tkl_ansi( /* FN */
 	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
-	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  RESET,    _______,  KC_INS,   _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,  _______,  KC_INS,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,   
 	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  
 	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c
index 7d66af49bc..5727d78784 100644
--- a/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RCTL                ,KC_LEFT,KC_DOWN,KC_RGHT,KC_PENT 
     ),
     [1] = LAYOUT_a_ansi(
-		RESET  ,RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
+		QK_BOOT,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______        ,_______        , 
diff --git a/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c
index 78a77d0f83..e10dd0116a 100644
--- a/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RCTL                ,KC_LEFT,KC_DOWN,KC_RGHT,KC_PENT 
     ),
     [1] = LAYOUT_a_iso(
-		RESET  ,RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
+		QK_BOOT,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______                ,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______        , 
diff --git a/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
index 9f435715d5..5155eb2487 100644
--- a/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
     [1] = LAYOUT_b_ansi(
-		RESET  ,RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
+		QK_BOOT,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______        ,_______,_______, 
diff --git a/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
index 85217a940b..19de0b7b61 100644
--- a/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
     [1] = LAYOUT_b_iso(
-		RESET  ,RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
+		QK_BOOT,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______                ,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______, 
diff --git a/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
index 4a49bdf0ad..bef8809f37 100644
--- a/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
     [1] = LAYOUT_prime_ansi(
-		RESET  ,RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
+		QK_BOOT,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______        ,_______,_______, 
diff --git a/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
index 1818ea4a3b..f65bc3bae4 100644
--- a/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
     [1] = LAYOUT_prime_iso(
-		RESET  ,RESET  ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
+		QK_BOOT,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______                ,_______,_______, 
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,_______,_______, 
diff --git a/keyboards/mincedshon/ecila/keymaps/default/keymap.c b/keyboards/mincedshon/ecila/keymaps/default/keymap.c
index 27d65d7403..082b8133df 100644
--- a/keyboards/mincedshon/ecila/keymaps/default/keymap.c
+++ b/keyboards/mincedshon/ecila/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,    KC_TRNS,   KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,         KC_F10,     KC_F11,     KC_F12,     KC_TRNS,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,    KC_VOLD,    KC_VOLU,    RGB_TOG,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_MOD,    RGB_RMOD,      RGB_VAD,    RGB_VAI,                KC_TRNS,
-      RESET,      KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    KC_TRNS,    KC_TRNS,
+      QK_BOOT,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    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/mincedshon/ecila/keymaps/via/keymap.c b/keyboards/mincedshon/ecila/keymaps/via/keymap.c
index 4f1aaf1032..60bb6a37df 100644
--- a/keyboards/mincedshon/ecila/keymaps/via/keymap.c
+++ b/keyboards/mincedshon/ecila/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,    KC_TRNS,   KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,         KC_F10,     KC_F11,     KC_F12,     KC_TRNS,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,    KC_VOLD,    KC_VOLU,    RGB_TOG,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_MOD,    RGB_RMOD,      RGB_VAD,    RGB_VAI,                KC_TRNS,
-      RESET,      KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    KC_TRNS,    KC_TRNS,
+      QK_BOOT,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    KC_TRNS,    KC_TRNS,
                   KC_TRNS,               KC_TRNS,                KC_TRNS,    KC_TRNS,                KC_TRNS,                KC_TRNS,                   KC_TRNS,    KC_TRNS,    KC_TRNS
 
     ),
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,    KC_TRNS,   KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,         KC_F10,     KC_F11,     KC_F12,     KC_TRNS,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,    KC_VOLD,    KC_VOLU,    RGB_TOG,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_MOD,    RGB_RMOD,      RGB_VAD,    RGB_VAI,                KC_TRNS,
-      RESET,      KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    KC_TRNS,    KC_TRNS,
+      QK_BOOT,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    KC_TRNS,    KC_TRNS,
                   KC_TRNS,               KC_TRNS,                KC_TRNS,    KC_TRNS,                KC_TRNS,                KC_TRNS,                   KC_TRNS,    KC_TRNS,    KC_TRNS
 
     ),
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,    KC_TRNS,   KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,         KC_F10,     KC_F11,     KC_F12,     KC_TRNS,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,    KC_VOLD,    KC_VOLU,    RGB_TOG,
       KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_MOD,    RGB_RMOD,      RGB_VAD,    RGB_VAI,                KC_TRNS,
-      RESET,      KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    KC_TRNS,    KC_TRNS,
+      QK_BOOT,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    RGB_HUD,    RGB_HUI,       RGB_SPD,    RGB_SPI,    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/miniaxe/keymaps/underglow/keymap.c b/keyboards/miniaxe/keymaps/underglow/keymap.c
index 362b29c608..2cadbb824f 100644
--- a/keyboards/miniaxe/keymaps/underglow/keymap.c
+++ b/keyboards/miniaxe/keymaps/underglow/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, \
   KC_F11,  KC_F12,  RGB_RMOD, RGB_SAI, RGB_SAD,     RGB_VAI, RGB_VAD, _______, _______, _______, \
-  RESET,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, \
+  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, \
                     _______, _______, _______,      _______,  _______, _______                   \
 )
 };
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index 2611e1194c..7c77eb882f 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       /*,      */ _______, _______, TT(_xF), _______,        _______, TT(_xF), KC_0,    KC_DOT,
       /*,      */ _______, _______, _______, _______,        _______, _______, _______, _______),
   [_xF] = LAYOUT(
-      RESET,   KC_INS,     KC_PGUP, DEBUG,   KC_VOLU,        KC_PPLS, KC_P7,   KC_P8,   KC_P9,    KC_PMNS,
+      QK_BOOT, KC_INS,     KC_PGUP, DEBUG,   KC_VOLU,        KC_PPLS, KC_P7,   KC_P8,   KC_P9,    KC_PMNS,
       CK_TOGG, KC_HOME,    KC_PGDN, KC_END,  KC_VOLD,        KC_NLCK, KC_P4,   KC_P5,   KC_P6,    KC_PENT,
       KC_LAYO, KC_MPRV,    KC_MPLY, KC_MNXT, KC_MUTE,        KC_PAST, KC_P1,   KC_P2,   KC_P3,    KC_PSLS,
       /*,      */ CK_UP,   MU_TOG,  _______, _______,        _______, _______, KC_P0,   KC_PDOT,
diff --git a/keyboards/mitosis/keymaps/mjt/keymap.c b/keyboards/mitosis/keymaps/mjt/keymap.c
index 0946e40b8e..e9e9a2ba42 100644
--- a/keyboards/mitosis/keymaps/mjt/keymap.c
+++ b/keyboards/mitosis/keymaps/mjt/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
   [_ADJUST] = LAYOUT( /* Adjust layer for fancy stuff and macros */
-    RESET,   FNPC,    _______, _______,  _______,       _______, DYN_REC_START1,  DYN_REC_START2,  _______,  _______,
+    QK_BOOT, FNPC,    _______, _______,  _______,       _______, DYN_REC_START1,  DYN_REC_START2,  _______,  _______,
     FNMAC,   _______,   AU_ON, AU_OFF,   _______,       _______, _______,         _______,         MACSLEEP, _______,
     MUV_DE,  MUV_IN,    MU_ON, MU_OFF,   _______,       _______, KC_MUTE,         KC_MPRV,         KC_MNXT,  KC_MPLY,
              __MOD__, _______, _______,  _______,       _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,  _______,
diff --git a/keyboards/miuni32/keymaps/adam-lee/keymap.c b/keyboards/miuni32/keymaps/adam-lee/keymap.c
index 87519de546..d6f5f40fdd 100644
--- a/keyboards/miuni32/keymaps/adam-lee/keymap.c
+++ b/keyboards/miuni32/keymaps/adam-lee/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   /* Level 3: RGB Layer
      * ,---------------------------------------------------------------------------------------.
-     * | RESET |  TRNS |  TRNS |  TRNS |  TRNS |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
+     * | 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 |
      * |---------------------------------------------------------------------------------------|
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------------------------------------------------------------------------------------|
      */
   [3] = LAYOUT(
-    RESET,   _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+    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/cassdelacruzmunoz/keymap.c b/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
index d7979bc464..bae9ed4f4a 100644
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
+++ b/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   /* Level 4: F-keys and Media Layer
      * ,---------------------------------------------------------------------------------------.
-     * | RESET |  MUTE |  VOLU |  MPLY |  TRNS |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
+     * | QK_BOOT |  MUTE |  VOLU |  MPLY |  TRNS |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
      * |---------------------------------------------------------------------------------------|
      * |  LGUI |  MPRV |  VOLD |  MNXT |  TRNS |  TRNS |  TRNS |  TRNS |  TRNS |  TRNS | TG(4) |
      * |---------------------------------------------------------------------------------------|
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------------------------------------------------------------------------------------|
      */
   [4] = LAYOUT(
-    RESET,   KC_MUTE, KC_VOLU, KC_MPLY, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5,  KC_F6,
+    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
   ),
diff --git a/keyboards/miuni32/keymaps/ht_156/keymap.c b/keyboards/miuni32/keymaps/ht_156/keymap.c
index 54e4bcf52d..f0cbc2c659 100644
--- a/keyboards/miuni32/keymaps/ht_156/keymap.c
+++ b/keyboards/miuni32/keymaps/ht_156/keymap.c
@@ -45,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ,---------------------------------------------------------------------------------------.
      * |   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |   _   |   =   |   ?   |
      * |---------------------------------------------------------------------------------------|
-     * | RESET |  LSFT |   ~   |   {   |   }   |   \   |   |   |   ;   |   :   |   `   |   "   |
+     * | QK_BOOT |  LSFT |   ~   |   {   |   }   |   \   |   |   |   ;   |   :   |   `   |   "   |
      * |---------------------------------------------------------------------------------------|
      * | !TRNS!|  LCTL |  TRNS |   [   |   ]   |  TAB  |   <   |   >   |  TRNS |  RCTL |  TRNS |
      * |---------------------------------------------------------------------------------------|
      */
   [SYMBOLS] = LAYOUT_ortho_3x11(
     KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_EQL, KC_QUES,
-    RESET,   KC_LSFT, KC_TILD, KC_LCBR, KC_RCBR, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_GRV, KC_DQUO,
+    QK_BOOT, KC_LSFT, KC_TILD, KC_LCBR, KC_RCBR, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_GRV, KC_DQUO,
     _______, KC_LCTL, _______, KC_LBRC, KC_RBRC, KC_TAB,  KC_LABK, KC_RABK, _______, KC_RCTL, _______
   ),
   /* Level 3: Media Layer
diff --git a/keyboards/miuni32/keymaps/kifinnsson/keymap.c b/keyboards/miuni32/keymaps/kifinnsson/keymap.c
index 59d2e285cb..3ce4e14575 100644
--- a/keyboards/miuni32/keymaps/kifinnsson/keymap.c
+++ b/keyboards/miuni32/keymaps/kifinnsson/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   /* Union
      * ,---------------------------------------------------------------------------------------.
-     * | RESET |       |       |       |       |       |       |       |       |       |  Del  |
+     * | QK_BOOT |       |       |       |       |       |       |       |       |       |  Del  |
      * |---------------------------------------------------------------------------------------|
      * |       |       |       |       |       |       |       |       |       |       |       |
      * |---------------------------------------------------------------------------------------|
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------------------------------------------------------------------------------------|
      */
   [_UNION] = LAYOUT_ortho_3x11(
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
diff --git a/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
index 207f907f6d..6d9c31ba80 100644
--- a/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
+++ b/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 [_DEL] = LAYOUT_all(
-    RESET,   _______, _______, _______, _______, _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
+    QK_BOOT, _______, _______, _______, _______, _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
     REMCAPS, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP  ,KC_RIGHT, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, _______,
     _______, _______, _______, KC_DEL , KC_BSPC, BWORD  , _______, KC_NO  , KC_NO  , _______, _______, _______, _______
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
index d49465eea9..00ae6c6981 100644
--- a/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
+++ b/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 [_DEL] = LAYOUT_all(
-    RESET,   _______, _______, _______, _______, _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
+    QK_BOOT, _______, _______, _______, _______, _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
     REMCAPS, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP  ,KC_RIGHT, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, _______,
     _______, _______, _______, BLINE  , KC_BSPC, BWORD  , _______, KC_NO  , KC_NO  , _______, _______, _______, _______
diff --git a/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c b/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c
index 152a305237..ef27d37596 100644
--- a/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c
+++ b/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_FN1] = LAYOUT_ortho_5x10(
-   XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+   XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
    JUMPBACK,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_LEFT, KC_UP,   KC_RIGHT,KC_END,
    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, PMERGE,  KC_DOWN, XXXXXXX, XXXXXXX,
diff --git a/keyboards/mt/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c
index 83a3fb8167..f3f028aeba 100644
--- a/keyboards/mt/mt980/keymaps/walker/keymap.c
+++ b/keyboards/mt/mt980/keymaps/walker/keymap.c
@@ -36,11 +36,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [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_SLCK,  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,  RESET,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
+    KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   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,                      RESET,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_MOD,            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)  
 
 };
 
@@ -107,7 +107,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed && is_oneshot_layer_active())
       clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
       return true;
-    case RESET:
+    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);
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
index 2ca3152589..ef5ea90b61 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12        13       14     */
 	[_RN] = LAYOUT(
-                RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______,
+                QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______,
                 _______, G1_HUD,  G1_HUI,  G1_SAD,  G1_SAI,  G1_VAD,  G1_VAI,  _______, RGB_HUD, RGB_HUI, _______, RGB_C_E, _______,  _______, RGB_TOG,
                 _______, G2_HUD,  G2_HUI,  G2_SAD,  G2_SAI,  G2_VAD,  G2_VAI,  _______, RGB_SAD, RGB_SAI, _______, _______,           _______, _______,
                 _______,          G_PRE,   REF_G,   G_FLIP,  _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______,  RGB_VAI, _______,
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
index 70279c3347..216ae1e09f 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12        13        14     */
 	[_FN] = LAYOUT(
                 KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_HOME,    _______, _______, _______,
-                RESET,   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______,  KC_PAUSE, KC_INS,
+                QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______,  KC_PAUSE, KC_INS,
                 _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______,           KC_PSCR,  KC_DEL,
                 _______,          _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______,  RGB_VAI,  RGB_TOG,
                 _______, _______, _______,                            _______,                   _______, _______,          RGB_RMOD, RGB_VAD,  RGB_MOD
diff --git a/keyboards/nack/keymaps/farfalleflickan/keymap.c b/keyboards/nack/keymaps/farfalleflickan/keymap.c
index 6e447bee1d..cf09a46b72 100644
--- a/keyboards/nack/keymaps/farfalleflickan/keymap.c
+++ b/keyboards/nack/keymaps/farfalleflickan/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [FN] = LAYOUT(
 /*   __________________________________________________________________________________________________________________________________________________________________________
     | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--|
+//  | |-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_TOG,      KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
diff --git a/keyboards/nacly/splitreus62/keymaps/scheiklp/keymap.c b/keyboards/nacly/splitreus62/keymaps/scheiklp/keymap.c
index b192e357f0..f2d839b358 100644
--- a/keyboards/nacly/splitreus62/keymaps/scheiklp/keymap.c
+++ b/keyboards/nacly/splitreus62/keymaps/scheiklp/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_7] = LAYOUT(
-    KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+    KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
     KC_TAB,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/neito/keymaps/olli_works/keymap.c b/keyboards/neito/keymaps/olli_works/keymap.c
index 31763e1169..c17d1f95ab 100644
--- a/keyboards/neito/keymaps/olli_works/keymap.c
+++ b/keyboards/neito/keymaps/olli_works/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN2] = LAYOUT(
         KC_ESC, RGB_TOG, RGB_MOD,   RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI,           RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,            KC_TRNS, KC_TRNS, KC_DEL,               KC_TRNS,
-        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,            RESET,
+        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, 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_LGUI, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS,       KC_TRNS,
         KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS,                                                   KC_TRNS, KC_TRNS,  KC_TRNS
diff --git a/keyboards/nightly_boards/n60_s/keymaps/ansi_encoder/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/ansi_encoder/keymap.c
index 7d91fa1d72..9316b20c75 100644
--- a/keyboards/nightly_boards/n60_s/keymaps/ansi_encoder/keymap.c
+++ b/keyboards/nightly_boards/n60_s/keymaps/ansi_encoder/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, MO(1),   KC_LALT,                   KC_SPC,                                      KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
     ),
     [1] = LAYOUT_60_ansi_split_bs_rshift_encoder(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
         KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/nightly_boards/n60_s/keymaps/tsangan_encoder/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/tsangan_encoder/keymap.c
index 8cf3f84c0d..cc25ac42e7 100644
--- a/keyboards/nightly_boards/n60_s/keymaps/tsangan_encoder/keymap.c
+++ b/keyboards/nightly_boards/n60_s/keymaps/tsangan_encoder/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, MO(1),   KC_LALT,                   KC_SPC,                                               KC_RALT,  KC_RGUI, KC_RCTL
     ),
     [1] = LAYOUT_60_ansi_split_bs_rshift_tsangan_encoder(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
         KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c b/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
index c8b2da0f9e..a3527ac500 100644
--- a/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   MO(1),   KC_LALT,                       KC_SPC,                              KC_LALT,   KC_LGUI,   		         KC_LCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_tkl_ansi_split_bs_rshift_symmetric(
-        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CLICKY_UP, CLICKY_RESET, RESET,
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CLICKY_UP, CLICKY_RESET, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CLICKY_DOWN, _______, _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        CLICKY_TOGGLE, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c
index 16da418453..0fa93ac357 100644
--- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c
+++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
  */
 [_ADJUST] = LAYOUT_default( \
-    TG_BASE,   QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_BASE,   QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_REDR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     TG_NAV,             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_MOUS,                     _______, _______,                            _______,                            _______, _______  \
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
index 0a177dec16..0ce0ba6156 100644
--- a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
+++ b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
@@ -40,9 +40,9 @@ KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,LSA_DEL,FN_CALC,KC_N   ,
     
     
 [1] = LAYOUT_rh_any(
-RESET  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
+QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
         XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NLCK,XXXXXXX,XXXXXXX,XXXXXXX,    
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RESET  ,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_JYEN,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
+        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_JYEN,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
         KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SLCK,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
 LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,_______,     
         _______,_______,        _______,_______,XXXXXXX,                _______,        _______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,KC_PCMM,_______)
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
index 29c12b0419..d364a0b2bf 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______  ,_______  ,KC_WINLCK,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END
     ),
 [_LOWER] = LAYOUT_48(
-    KC_TILD  ,KC_EXLM, KC_AT, KC_HASH,KC_DLR,KC_PERC,KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN,KC_MINS,KC_EQL     , RESET,
+    KC_TILD  ,KC_EXLM, KC_AT, KC_HASH,KC_DLR,KC_PERC,KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN,KC_MINS,KC_EQL     , QK_BOOT,
     _______  ,KC_MINS, KC_EQL,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_QUES,KC_SLSH,KC_PIPE,KC_BSLS,KC_TILD,  XXXXXXX   ,XXXXXXX,
     _______  ,KC_UNDS, KC_PLUS,XXXXXXX,KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC,KC_LT,KC_GT, XXXXXXX ,_______ ,XXXXXXX,XXXXXXX,
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX
diff --git a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
index e5e0fea461..093d929699 100755
--- a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
+++ b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FNMS] = LAYOUT_65_ansi( /* FN */
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,\
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS,\
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,\
     AG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,\
     KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  KC_TRNS,          KC_TRNS, KC_TRNS,\
     KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
index bb8c977c92..3131fb008c 100755
--- a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
+++ b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT(
-    _______,  RESET,    BL_STEP,  RGB_TOG,
+    _______,  QK_BOOT,  BL_STEP,  RGB_TOG,
     RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_MOD,
     RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_RMOD,
     RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW,
diff --git a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
index 151ac1f73d..1af41535e6 100644
--- a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
+++ b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_FL1] = LAYOUT_all(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR, KC_INS,
-        _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE, KC_MUTE, KC_VOLU, _______,
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______, _______, KC_VOLD, _______),
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c
index 300af70737..39e6cd04ef 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F16, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT_ansi(
-                 RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
+                 QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
index a4e484f9cf..586de79af3 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_VIA1] = LAYOUT_all(
-              RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
+              QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
     RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_status/keymap.c
index fa72a78905..2b024b7758 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_status/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F16, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT_ansi(
-                 RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
+                 QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/numatreus/keymaps/hdbx/keymap.c b/keyboards/numatreus/keymaps/hdbx/keymap.c
index 5bc8c4d0e6..a221f9fe19 100644
--- a/keyboards/numatreus/keymaps/hdbx/keymap.c
+++ b/keyboards/numatreus/keymaps/hdbx/keymap.c
@@ -152,14 +152,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------+------+------+------+------|             |------+------+------+------+------|
    * |      |      |      |      |      |             |      |      |      |      |      |
    * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |RESET |      |      |      |      |      |      |      |      |      |      |      |
+   * |QK_BOOT |      |      |      |      |      |      |      |      |      |      |      |
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] =  LAYOUT(
       MCR1,    MCR2,    MCR3,    MCR4,    MCR5,                DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP,
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, GAME,                      XXXXXXX, QWERTY,  HDBX,    XXXXXXX, XXXXXXX,
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      RESET,   XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
       )
 };
 
diff --git a/keyboards/numatreus/keymaps/like_jis/keymap.c b/keyboards/numatreus/keymaps/like_jis/keymap.c
index 4189373e46..24c554d20c 100644
--- a/keyboards/numatreus/keymaps/like_jis/keymap.c
+++ b/keyboards/numatreus/keymaps/like_jis/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //,----------------------------------.             ,----------------------------------.
-   RESET,  RGBRST, AG_NORM, AG_SWAP, KC_CAPS,        XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,
+   QK_BOOT,  RGBRST, AG_NORM, AG_SWAP, KC_CAPS,        XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,
   //|------+------+------+------+------|             |------+------+------+------+------|
    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_SLCK,      XXXXXXX, KC_WH_R, KC_WH_D,  KC_END, KC_PGDN,
   //|------+------+------+------+------|             |------+------+------+------+------|
diff --git a/keyboards/numatreus/keymaps/yohewi/keymap.c b/keyboards/numatreus/keymaps/yohewi/keymap.c
index 8027a972e4..5b53389f98 100644
--- a/keyboards/numatreus/keymaps/yohewi/keymap.c
+++ b/keyboards/numatreus/keymaps/yohewi/keymap.c
@@ -56,6 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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,   RESET,                     KC_TRNS,   KC_TRNS,   KC_QUOT,   KC_UP,   KC_BSLS  ,
+    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/obosob/arch_36/keymaps/obosob/keymap.c b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
index 104ee378f5..552e5cb045 100644
--- a/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
+++ b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
@@ -203,8 +203,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    QUESSPC, QUOT,    DQUOT,    COMMSPC, DOTSPC,  EXLMSPC
         ),
 //   Adjust            ________                                                          ________
-//            ________|  RESET |________                                        ________|        |________
-//           |        | EEPROM |  RESET |________                      ________|        |        |        |
+//            ________|  QK_BOOT |________                                        ________|        |________
+//           |        | EEPROM |  QK_BOOT |________                      ________|        |        |        |
 //   ________|        |________|        |        |                    |        |        |________|        |________
 //  |        |________| RGB    |________|        |                    |        |________|        |________|        |
 //  |        | RGB    | Hue+   | RGB    |________|                    |________|        |        |        |        |
@@ -219,7 +219,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //                                      |________|        |  |        |________|
 //                                               |________|  |________|
     [_ADJUST] = LAYOUT_split_3x5_3(
-        XXXXXXX, WOKE,    EEP_RST, RESET,   XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, WOKE,    EEP_RST, QK_BOOT, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,                     XXXXXXX, QWERTY,  COLEMAK, XXXXXXX, XXXXXXX,
         XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                    XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/ok60/keymaps/ptillemans/keymap.c b/keyboards/ok60/keymaps/ptillemans/keymap.c
index ff777847f6..44e9f39973 100644
--- a/keyboards/ok60/keymaps/ptillemans/keymap.c
+++ b/keyboards/ok60/keymaps/ptillemans/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT_60_iso(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, AG_NORM, AG_SWAP, _______, _______, _______, _______,
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
index 7224af7a00..5be2825861 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
+++ b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,----------------------------------------------------------------------------------------------------------------------.
    */
   [_ADJUST] = LAYOUT(
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______,                       _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
+    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______,                       _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
     _______, _______, BL_TOGG, BL_BRTG, BL_INC , BL_DEC ,_______,                       _______, _______, _______, _______, _______, _______, _______,
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6 ,_______,                       _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
     _______, _______, _______, _______,          _______,_______,_______,       _______,_______, _______,          _______, _______, _______, _______
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
index ea79ae194b..f8b36dff03 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,----------------------------------------------------------------------------------------------------------------------.
    */
   [_ADJUST] = LAYOUT(
-      RESET, 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, XXXXXXX, XXXXXXX, RGB_TOG, BL_TOGG, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       RAISE, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI,  BL_INC, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     EEP_RST, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
index 9c450bca97..8f58643840 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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, \
-    RESET,   XXXXXXX, XXXXXXX, BL_BRTG, BL_INC,  XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, \
+    QK_BOOT, XXXXXXX, XXXXXXX, BL_BRTG, BL_INC,  XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, \
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  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  \
   )
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
index 6d080f2af1..938f3950fd 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______ ,_______ ,_______ ,_______ ,         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 ,                        RESET   ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F12  ,
+    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 ,
diff --git a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
index 515a6fcb07..14302bee5a 100644
--- a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
+++ b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ,-------------------------------------------------------.      ,--------------------------------------------------------.
      * |      |      |      |   F1 |   F2 |   F3 |   F4 |   F5 |      |   F6 |   F7 |   F8 |   F9 |  F10 |  F11 |  F12 |      |
      * |------+------+------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
-     * |      |      |      |RGBRST| RESET|      |      |      |      |      |      |      |      |      |      |      |      |
+     * |      |      |      |RGBRST| QK_BOOT|      |      |      |      |      |      |      |      |      |      |      |      |
      * |------+------+------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
      * |      |      |      |  TOG |  HUI |  SAI |  VAI |      |      |      |      |      |      |      |      |      |      |
      * |------+------+------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
   [_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,  _______,
-      _______, _______, _______, RGBRST,  RESET,   _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, RGBRST,  QK_BOOT, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/org60/keymaps/boardy/keymap.c b/keyboards/org60/keymaps/boardy/keymap.c
index b85e475824..52eea78a8d 100644
--- a/keyboards/org60/keymaps/boardy/keymap.c
+++ b/keyboards/org60/keymaps/boardy/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    //--------------------------------------------------------------------------------------------------------------------------------------|
    //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
    //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-     RESET,       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,      
+     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,      
    //--------------------------------------------------------------------------------------------------------------------------------------|
    //               |        |        |        |        |        |        |        |        |        |        |        |                   |
    //               |        |        |        |        |        |        |        |        |        |        |        |                   |
diff --git a/keyboards/org60/keymaps/jarred/keymap.c b/keyboards/org60/keymaps/jarred/keymap.c
index 3397a1909c..3e0b5d45c8 100644
--- a/keyboards/org60/keymaps/jarred/keymap.c
+++ b/keyboards/org60/keymaps/jarred/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, KC_DEL ,KC_BSPC,_______,KC_HOME,KC_UP  ,KC_END , KC_INS , _______,  _______,          _______, \
       _______, _______, _______, KC_LSFT,KC_LCTL, KC_ENT, _______,KC_LEFT,KC_DOWN,KC_RGHT, KC_DEL , KC_DEL ,  _______,          _______, \
       _______, _______, _______, _______, _______,_______,_______,_______,KC_PGUP,KC_PGDN, _______, _______,  _______, _______, _______, \
-      _______, _______, _______,                          _______,                         _______, _______,  _______,   RESET, _______),
+      _______, _______, _______,                          _______,                         _______, _______,  _______, QK_BOOT, _______),
 
 };
 
diff --git a/keyboards/orthodox/keymaps/oscillope/keymap.c b/keyboards/orthodox/keymaps/oscillope/keymap.c
index 1f4aefca90..07496ddb43 100644
--- a/keyboards/orthodox/keymaps/oscillope/keymap.c
+++ b/keyboards/orthodox/keymaps/oscillope/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT( \
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                                  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
     KC_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,           _______, _______,          _______, _______,          KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU \
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU \
   ),
 
   [_RAISE] = LAYOUT( \
diff --git a/keyboards/orthodox/keymaps/rfvizarra/keymap.c b/keyboards/orthodox/keymaps/rfvizarra/keymap.c
index d8c836dc12..1fc88ce722 100644
--- a/keyboards/orthodox/keymaps/rfvizarra/keymap.c
+++ b/keyboards/orthodox/keymaps/rfvizarra/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] =  LAYOUT(                                                  \
-    _______, RESET,   _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, _______,  \
+    _______, QK_BOOT, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, _______,  \
     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,          _______, _______,          _______, _______,          AG_SWAP, QWERTY , COLEMAK, DVORAK,  _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
   )
diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c
index 54ae7e3972..4c955fa2bb 100644
--- a/keyboards/orthodox/keymaps/shaymdev/keymap.c
+++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] =  LAYOUT( 
-    TO_DV, RESET,   _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_SLEP,  
+    TO_DV, QK_BOOT, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_SLEP,  
   RGB_TOG, RGB_MOD, VLK_TOG,  AU_ON,   AU_OFF,  AG_NORM, _______,          _______,          _______,          _______, AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______, 
   RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  
 )
diff --git a/keyboards/orthodox/keymaps/xyverz/keymap.c b/keyboards/orthodox/keymaps/xyverz/keymap.c
index 0417c1a4a0..4e78aaf347 100644
--- a/keyboards/orthodox/keymaps/xyverz/keymap.c
+++ b/keyboards/orthodox/keymaps/xyverz/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT ( \
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                                  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 , \
-  _______, RESET,   _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, QWERTY , COLEMAK, DVORAK,  _______, _______, \
+  _______, QK_BOOT, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, QWERTY , COLEMAK, DVORAK,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______ \
 )
 
diff --git a/keyboards/pearl/keymaps/cijanzen/keymap.c b/keyboards/pearl/keymaps/cijanzen/keymap.c
index 5a3f1eb1cd..1b23cab992 100644
--- a/keyboards/pearl/keymaps/cijanzen/keymap.c
+++ b/keyboards/pearl/keymaps/cijanzen/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // UTIL (Fn1+Fn3)
     [4] = LAYOUT_all(
-        KC_SLP,    ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      KC_PSCR,    RESET,
+        KC_SLP,    ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      KC_PSCR,    QK_BOOT,
         ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,                  ____,
         ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,                  ____,
                    ____,      ____,      ____,      ____,      ____,                 ____,                 ____,      ____
diff --git a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
index 4fd35f63ce..69118a59df 100644
--- a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
   ),
   [3] = LAYOUT_all(
-    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS, RESET,
+    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS, QK_BOOT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, BL_TOGG, KC_TRNS, BL_INC,  BL_DEC,  KC_TRNS, KC_TRNS, KC_TRNS, 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/pearl/keymaps/phil/keymap.c b/keyboards/pearl/keymaps/phil/keymap.c
index 492c4cb0c5..bca1278939 100755
--- a/keyboards/pearl/keymaps/phil/keymap.c
+++ b/keyboards/pearl/keymaps/phil/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       TG(LIGHT), KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS
       ),
   [LIGHT] = LAYOUT_all(
-      RESET, KC_NO,  BL_ON,   BL_INC,  BL_BRTG, RGB_M_P,  RGB_M_B, RGB_MOD,  RGB_HUI,  RGB_SAI, RGB_VAI, KC_NO,  KC_NO,
+      QK_BOOT, KC_NO,  BL_ON,   BL_INC,  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_DEC,  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
diff --git a/keyboards/pearl/keymaps/rask/keymap.c b/keyboards/pearl/keymaps/rask/keymap.c
index 30c8b6344f..1ab4badb51 100644
--- a/keyboards/pearl/keymaps/rask/keymap.c
+++ b/keyboards/pearl/keymaps/rask/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   ____,       ____,   ____,       KC_PSCR,    ____,
         ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   ____,       KC_PGUP,____,                   ____,
         ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   KC_HOME,    KC_PGDN,KC_END,                 ____,
-                    RESET,      ____,       ____,       ____,           ____,           ____,       ____,               ____
+                    QK_BOOT,    ____,       ____,       ____,           ____,           ____,       ____,               ____
     ),
 };
 
diff --git a/keyboards/pegasus/keymaps/split/keymap.c b/keyboards/pegasus/keymaps/split/keymap.c
index 964cfa2df7..9f3d69f9b9 100644
--- a/keyboards/pegasus/keymaps/split/keymap.c
+++ b/keyboards/pegasus/keymaps/split/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER2] = LAYOUT_split(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, KC_RALT, KC_RCTL, KC_DEL,  KC_VOLD,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, KC_RALT, KC_RCTL, KC_DEL,  KC_VOLD,
         _______, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX,          KC_MPLY
     ),
 };
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index e3b4c88d28..f9b70764ff 100644
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
@@ -33,14 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_F1] = LAYOUT(
 	  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_TRNS,    \
-      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, RESET,   KC_PSCR, KC_TRNS,  KC_PAUS, KC_BSLS,  KC_TRNS, \
+      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_TRNS,  KC_PAUS, KC_BSLS,  KC_TRNS, \
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,   \
       KC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSPC, KC_VOLU,  KC_TRNS,      \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_MPLY, KC_VOLD,  KC_MNXT),
 	  
   [_F2] = LAYOUT(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PAUS,    \
-      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, RESET,   KC_PSCR, KC_SLCK,  KC_PAUS, KC_BSLS,  KC_SLCK, \
+      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SLCK,  KC_PAUS, KC_BSLS,  KC_SLCK, \
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,   \
       KC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSPC, KC_PGUP,  KC_TRNS,       \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDOWN,KC_END)
diff --git a/keyboards/percent/skog_lite/keymaps/binman/keymap.c b/keyboards/percent/skog_lite/keymaps/binman/keymap.c
index 40308e1a6e..67f74eeb90 100755
--- a/keyboards/percent/skog_lite/keymaps/binman/keymap.c
+++ b/keyboards/percent/skog_lite/keymaps/binman/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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,   RESET,   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,   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/phantom/keymaps/rgbmod/keymap.c b/keyboards/phantom/keymaps/rgbmod/keymap.c
index 9be30fbae7..cbddcebeb3 100644
--- a/keyboards/phantom/keymaps/rgbmod/keymap.c
+++ b/keyboards/phantom/keymaps/rgbmod/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FL] = LAYOUT_tkl_ansi(
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,         _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,       _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,            _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,          _______,                _______,
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
index 6111144b1d..b020ba61f9 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
-        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
+        QK_BOOT, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
     ),
 };
diff --git a/keyboards/planck/keymaps/ab/keymap.c b/keyboards/planck/keymaps/ab/keymap.c
index 8835bfc87d..e10d5e4422 100644
--- a/keyboards/planck/keymaps/ab/keymap.c
+++ b/keyboards/planck/keymaps/ab/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV,  KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE
 ),
 [_CUSTOM] = LAYOUT_planck_grid( /* CUSTOM */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/planck/keymaps/abhixec/keymap.c b/keyboards/planck/keymaps/abhixec/keymap.c
index d840bf4721..e95aa344d6 100644
--- a/keyboards/planck/keymaps/abhixec/keymap.c
+++ b/keyboards/planck/keymaps/abhixec/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/abishalom/keymap.c b/keyboards/planck/keymaps/abishalom/keymap.c
index c88dced41f..91dadb2c3a 100644
--- a/keyboards/planck/keymaps/abishalom/keymap.c
+++ b/keyboards/planck/keymaps/abishalom/keymap.c
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______,  _______,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c
index 4b041aa2af..f1f5e6379a 100644
--- a/keyboards/planck/keymaps/adamtabrams/keymap.c
+++ b/keyboards/planck/keymaps/adamtabrams/keymap.c
@@ -200,8 +200,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_FMWARE] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, RESET,   DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, QK_BOOT, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______
 )
diff --git a/keyboards/planck/keymaps/altgr/common/chord_layout.h b/keyboards/planck/keymaps/altgr/common/chord_layout.h
index b6922705f3..cb1b7f6785 100644
--- a/keyboards/planck/keymaps/altgr/common/chord_layout.h
+++ b/keyboards/planck/keymaps/altgr/common/chord_layout.h
@@ -36,6 +36,6 @@
   [_ADJUST] = LAYOUT_planck_grid(
     PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
   ),
diff --git a/keyboards/planck/keymaps/am/keymap.c b/keyboards/planck/keymaps/am/keymap.c
index d521484a1c..757e56bc2d 100644
--- a/keyboards/planck/keymaps/am/keymap.c
+++ b/keyboards/planck/keymaps/am/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/andylikescandy/keymap.c b/keyboards/planck/keymaps/andylikescandy/keymap.c
index e873130f46..f0bf4fa2c3 100644
--- a/keyboards/planck/keymaps/andylikescandy/keymap.c
+++ b/keyboards/planck/keymaps/andylikescandy/keymap.c
@@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  RESET,               XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
+  QK_BOOT,             XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
   LALT(LCTL(KC_DEL)),  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,
   KC_CAPSLOCK,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX,
   _______,             _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK, XXXXXXX  //PLOVER
diff --git a/keyboards/planck/keymaps/antosha417/keymap.c b/keyboards/planck/keymaps/antosha417/keymap.c
index a3d46c2311..b034221e3e 100644
--- a/keyboards/planck/keymaps/antosha417/keymap.c
+++ b/keyboards/planck/keymaps/antosha417/keymap.c
@@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______, _______, BRUDERSCHAFT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index 33d0a26273..2647880705 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -235,7 +235,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* MIT Layout (ADJUST)
  *
  * ,-----------------------------------------------------------------------------.
- * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | RESET|
+ * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | QK_BOOT|
  * |-----------------------------------------------------------------------------|
  * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| DEBUG|
  * |-----------------------------------------------------------------------------|
@@ -245,7 +245,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid( /* ADJUST LAYER */
-  RGB_TOG, KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RESET,
+  RGB_TOG, KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QK_BOOT,
   RGB_MOD, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, GAMING,  KC_NO,       AU_ON,   AU_OFF,  MU_ON,   MU_OFF,  DEBUG,
   KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, QWERTY,  COLEMAK_VCP, MI_ON,   MI_OFF,  KC_TRNS, KC_TRNS, MU_MOD,
   KC_NO,   KC_NO,   KC_NO,   KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO
diff --git a/keyboards/planck/keymaps/aviator/keymap.c b/keyboards/planck/keymaps/aviator/keymap.c
index 7ff410c767..143c1bc926 100644
--- a/keyboards/planck/keymaps/aviator/keymap.c
+++ b/keyboards/planck/keymaps/aviator/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  KC_ESC,  RESET,   DEBUG,   ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_DEL,
+  KC_ESC,  QK_BOOT, DEBUG,   ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_DEL,
   _______, ___x___, ___x___, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DATA,    ___x___, ___x___, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  ___x___, ___x___, ___x___, ___x___, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/badger/keymap.c b/keyboards/planck/keymaps/badger/keymap.c
index 3321425190..6bbe034382 100644
--- a/keyboards/planck/keymaps/badger/keymap.c
+++ b/keyboards/planck/keymaps/badger/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  KC_0,     KC_DOT,   KC_ENT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______),
 
   [_ADJUST]   = LAYOUT_ortho_4x12(
-      _______,  NK_ON,    NK_OFF,   EEP_RST,  RESET,    KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
+      _______,  NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
       _______,  GE_SWAP,  GE_NORM,  DEBUG,    AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
       _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______)
diff --git a/keyboards/planck/keymaps/basic/keymap.c b/keyboards/planck/keymaps/basic/keymap.c
index 09efbc146f..7ce327302f 100644
--- a/keyboards/planck/keymaps/basic/keymap.c
+++ b/keyboards/planck/keymaps/basic/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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),_______, _______, _______,
-  RESET,   _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
 /* Raise
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_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, _______, _______, _______,
-  RESET,   _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
 
diff --git a/keyboards/planck/keymaps/bghull/keymap.c b/keyboards/planck/keymaps/bghull/keymap.c
index 3539ac7bf7..8abdc884dd 100644
--- a/keyboards/planck/keymaps/bghull/keymap.c
+++ b/keyboards/planck/keymaps/bghull/keymap.c
@@ -70,21 +70,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      | Mute | VolD | VolU |  `~  |   _  |  =   |   1  |   2  |   3  | PgUp | \  | |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |RESET |      |      |             |      |   .  | Home | PgDn | End  |
+ * |      |      |QK_BOOT |      |      |             |      |   .  | Home | PgDn | End  |
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_planck_grid(
   _______, KC_BTN2, KC_MS_U, KC_BTN1,  KC_WH_U, KC_LPRN, KC_RPRN,    KC_7,     KC_8,    KC_9,    KC_0, _______,
   _______, KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D, KC_LBRC, KC_RBRC,    KC_4,     KC_5,    KC_6, KC_PPLS, KC_MINS,
   _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_GRAVE, KC_UNDS,  KC_EQL,    KC_1,     KC_2,    KC_3, KC_PGUP, KC_BSLS,
-  _______, XXXXXXX,   RESET, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
+  _______, XXXXXXX,   QK_BOOT, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
 ),
 
 /* Dynamic macros + Winkey combos
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  W2  |      |      |      |      |      |      |      |      |      |      | RESET|
+ * |  W2  |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |  W3  |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FUNC] = LAYOUT_planck_grid(
      KC_F1  ,  KC_F2 ,  KC_F3 ,  KC_F4  , KC_F5  , KC_F6 ,  KC_F7 ,  KC_F8 ,  KC_F9 ,  KC_F10 , KC_F11 , KC_F12,
-  LGUI(KC_2), _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, RESET,
+  LGUI(KC_2), _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, QK_BOOT,
   LGUI(KC_3), _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
   LGUI(KC_4), _______, DM_REC1, DM_PLY1, DM_RSTP, _______, _______, _______, _______,  _______, _______, _______
 ),
diff --git a/keyboards/planck/keymaps/brandon/keymap.c b/keyboards/planck/keymaps/brandon/keymap.c
index 66533e53a2..cd228c3579 100644
--- a/keyboards/planck/keymaps/brandon/keymap.c
+++ b/keyboards/planck/keymaps/brandon/keymap.c
@@ -217,7 +217,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                                    \_____________\_ Backlight _/
    */
   [KEYBOARD_LAYER] = LAYOUT_planck_grid(
-    ___x___, RESET,   ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
+    ___x___, QK_BOOT, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
     ___x___, QWERTY,  COLEMAK, STENO,   ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
     ___x___, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  ___x___, ___x___, AU_ON,   AU_OFF,  ___x___,
     ___x___, ___x___, ___x___, ___x___, LOWER,   BL_TOGG, BL_TOGG, RAISE,   BL_TOGG, BL_DEC,  BL_INC,  ___x___
diff --git a/keyboards/planck/keymaps/buffet/keymap.c b/keyboards/planck/keymaps/buffet/keymap.c
index 78a9f711c4..966ec23a6f 100644
--- a/keyboards/planck/keymaps/buffet/keymap.c
+++ b/keyboards/planck/keymaps/buffet/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ____,   ____, ____, ____, ____, ____, XXXX, ____,    KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
     ),
     [PHI] = LAYOUT_planck_grid(
-        RESET, KC_F1,   KC_F2,   KC_F3,  KC_F4,  ____, ____, ____,       ____,       ____,     ____,    KC_DEL,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,  KC_F4,  ____, ____, ____,       ____,       ____,     ____,    KC_DEL,
         ____,  KC_F5,   KC_F6,   KC_F7,  KC_F8,  ____, ____, DF(QWERTY), DF(NORMAL), DF(GAME), ____,    KC_F13,
         ____,  KC_F9,   KC_F10,  KC_F11, KC_F12, ____, ____, ____,       ____,       ____,     ____,    ____,
         ____,  RGB_TOG, RGB_MOD, ____,   ____,   ____, XXXX, ____,       KC_MNXT,    KC_VOLD,  KC_VOLU, KC_MPLY
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
index 4821ece571..074c33e453 100644
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ b/keyboards/planck/keymaps/buhearns/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [4] = LAYOUT_planck_grid(
-  KC_TRNS, RESET,   DEBUG,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_MOD,  MUV_IN,  MU_ON,   AU_ON,    KC_EJCT,
+  KC_TRNS, QK_BOOT, DEBUG,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_MOD,  MUV_IN,  MU_ON,   AU_ON,    KC_EJCT,
   KC_TRNS, EEP_RST, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MUV_DE,  MU_OFF,  AU_OFF,   KC_TRNS,
   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MUTE, KC_MPRV, KC_MNXT,  KC_NO,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_VOLU,  KC_MPLY
diff --git a/keyboards/planck/keymaps/cbbrowne/keymap.c b/keyboards/planck/keymaps/cbbrowne/keymap.c
index 683b9342d8..22e0cbc492 100644
--- a/keyboards/planck/keymaps/cbbrowne/keymap.c
+++ b/keyboards/planck/keymaps/cbbrowne/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid( /* Adjustments - gonna shift the wild tools in here */
   ROT_LED,USERNAME,MVERSION, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
   _______, RANDDIG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-  _______, RANDALP, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______ ,
+  _______, RANDALP, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ ,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 
 )
 };
diff --git a/keyboards/planck/keymaps/chance/keymap.c b/keyboards/planck/keymaps/chance/keymap.c
index 46d077ddc3..458e9a4f53 100644
--- a/keyboards/planck/keymaps/chance/keymap.c
+++ b/keyboards/planck/keymaps/chance/keymap.c
@@ -170,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
    M(1)  , _______, _______, _______, _______, _______,  NUMPAD,  QWERTY, COLEMAK,  DVORAK,  PLOVER,  _______,
   KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index bfe61294af..f6229d2d69 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_planck_grid(
     _______,   CK_UP,   _______, _______, _______, _______, _______, _______, _______,_______,  _______, _______,
-    KC_DELETE, CK_TOGG, AU_ON,   AU_OFF,  AU_TOG,  _______, _______, _______, RGB_VAI,RGB_VAD , _______, RESET,
+    KC_DELETE, CK_TOGG, AU_ON,   AU_OFF,  AU_TOG,  _______, _______, _______, RGB_VAI,RGB_VAD , _______, QK_BOOT,
     _______,   CK_DOWN, MU_ON,   MU_OFF,  MU_TOG,  _______, _______, _______, _______, _______, _______, _______,
     _______,   _______, _______, _______, _______, _______, KC_NO,   _______, _______, _______, _______, _______
   ),
diff --git a/keyboards/planck/keymaps/circuit/keymap.c b/keyboards/planck/keymaps/circuit/keymap.c
index 805ebd7fd3..d259914d8a 100644
--- a/keyboards/planck/keymaps/circuit/keymap.c
+++ b/keyboards/planck/keymaps/circuit/keymap.c
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12 ,
     KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24 ,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERTY,  DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    RESET,   XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    QK_BOOT, XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 )
 
 };
diff --git a/keyboards/planck/keymaps/coloneljesus/keymap.c b/keyboards/planck/keymaps/coloneljesus/keymap.c
index f60adc43e6..832287f224 100644
--- a/keyboards/planck/keymaps/coloneljesus/keymap.c
+++ b/keyboards/planck/keymaps/coloneljesus/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/copface/keymap.c b/keyboards/planck/keymaps/copface/keymap.c
index b448d9c7dd..2ba55c6a52 100644
--- a/keyboards/planck/keymaps/copface/keymap.c
+++ b/keyboards/planck/keymaps/copface/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, CG_TOGG, XXXXXXX,
     XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT
 )
 };
 
diff --git a/keyboards/planck/keymaps/corvec/keymap.c b/keyboards/planck/keymaps/corvec/keymap.c
index a927c522a2..fc9f2e4985 100644
--- a/keyboards/planck/keymaps/corvec/keymap.c
+++ b/keyboards/planck/keymaps/corvec/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   COLEMAK, _______,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QWERTY ,
   _______, _______, MU_MOD,   AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, KC_ASON, KC_ASUP,
   _______, MUV_DE,  MUV_IN,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,KC_ASRP, KC_ASOFF,KC_ASDN,
-  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, RESET  
+  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
 )
 
 
diff --git a/keyboards/planck/keymaps/david/keymap.c b/keyboards/planck/keymaps/david/keymap.c
index d093efe04a..59a23d9223 100644
--- a/keyboards/planck/keymaps/david/keymap.c
+++ b/keyboards/planck/keymaps/david/keymap.c
@@ -16,13 +16,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [2] = LAYOUT_planck_grid( /* RAISE */
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TRNS, DF(0), DF(1), RESET, M(0), M(1), M(2), KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_TRNS, DF(0), DF(1), QK_BOOT, M(0), M(1), M(2), KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
   KC_TRNS, KC_F11,  KC_F12,  M(0),   M(1),   M(2),   M(3),   M(4),   M(5),   M(6),   M(7), KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 [3] = LAYOUT_planck_grid( /* LOWER */
   S(KC_GRV),  S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0), KC_BSPC,
-  KC_TRNS, DF(0), DF(1), RESET, M(0), M(1), M(2), S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS),
+  KC_TRNS, DF(0), DF(1), QK_BOOT, M(0), M(1), M(2), S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS),
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 )
diff --git a/keyboards/planck/keymaps/davidrambo/keymap.c b/keyboards/planck/keymaps/davidrambo/keymap.c
index fa524180fb..66151adcbc 100644
--- a/keyboards/planck/keymaps/davidrambo/keymap.c
+++ b/keyboards/planck/keymaps/davidrambo/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, C_TAB  , A_LEFT,  KC_UP,   A_RGHT , KC_DEL , _______,
     _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
     _______, _______, _______, _______, _______, _______, G_TAB  , A_BSPC , KC_HOME, KC_END,  G_GRV  , _______,
-    RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
 
diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c
index 75087eb9c9..1d425ea3d1 100644
--- a/keyboards/planck/keymaps/dbroqua/keymap.c
+++ b/keyboards/planck/keymaps/dbroqua/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dc/keymap.c b/keyboards/planck/keymaps/dc/keymap.c
index fdafd03a53..7cbc9dfaf2 100644
--- a/keyboards/planck/keymaps/dc/keymap.c
+++ b/keyboards/planck/keymaps/dc/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-----------------------------------------------------------------------------------'
     */
     [_ACTIONS] = LAYOUT_planck_grid(
-        BL_STEP,   _______,    _______,    _______,    _______,    KC_SLEP,    RESET,      _______,    _______,    _______,    _______,    KC_DEL,
+        BL_STEP,   _______,    _______,    _______,    _______,    KC_SLEP,    QK_BOOT,    _______,    _______,    _______,    _______,    KC_DEL,
         _______,   LCTL(KC_Y),     _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_MPRV,    KC_MNXT,    _______,    _______,
         _______,   LCTL(KC_Z),     LCTL(KC_X),     LCTL(KC_C),     LCTL(KC_V),     _______,    _______,    KC_MUTE,    KC_VOLD,    KC_VOLU,    _______,    _______,
         _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
diff --git a/keyboards/planck/keymaps/dcompact/keymap.c b/keyboards/planck/keymaps/dcompact/keymap.c
index 0b48f30ac4..0c0f23d85b 100644
--- a/keyboards/planck/keymaps/dcompact/keymap.c
+++ b/keyboards/planck/keymaps/dcompact/keymap.c
@@ -248,7 +248,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-   _______,   RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
    _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP, RGB_TOG, RGB_MOD, _______, _______, _______,
    _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
index c25df20a5b..c34130f36f 100644
--- a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/deft/keymap.c b/keyboards/planck/keymaps/deft/keymap.c
index d7d40f146b..0d7611f371 100644
--- a/keyboards/planck/keymaps/deft/keymap.c
+++ b/keyboards/planck/keymaps/deft/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-      RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dlaroe/keymap.c b/keyboards/planck/keymaps/dlaroe/keymap.c
index 41b3064132..86e4365781 100644
--- a/keyboards/planck/keymaps/dlaroe/keymap.c
+++ b/keyboards/planck/keymaps/dlaroe/keymap.c
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, RESET, M(0),  _______, _______, _______, _______, PLOVER, LALT(LCTL(KC_DEL)),
+  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, _______, _______, _______, PLOVER, LALT(LCTL(KC_DEL)),
   KC_CAPS, ARROW, _______, AU_ON,   AU_OFF,  GAME, AG_SWAP, AG_NORM,  KC_PSCR, KC_SLCK, KC_PAUS,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV, KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
   BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP
diff --git a/keyboards/planck/keymaps/dodger/keymap.c b/keyboards/planck/keymaps/dodger/keymap.c
index 80f8445cc6..2a7486f2de 100644
--- a/keyboards/planck/keymaps/dodger/keymap.c
+++ b/keyboards/planck/keymaps/dodger/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  EEP_RST, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  EEP_RST, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______,  _______,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______,  TERM_ON, TERM_OFF, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dr0ck/keymap.c b/keyboards/planck/keymaps/dr0ck/keymap.c
index 0d28698d29..0449477fae 100644
--- a/keyboards/planck/keymaps/dr0ck/keymap.c
+++ b/keyboards/planck/keymaps/dr0ck/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
index 1055c754f0..410015708c 100644
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,
 	KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 	XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, MUV_IN,  KC_SYSREQ,
-	RESET,   XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE,  AG_SWAP
+	QK_BOOT, XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE,  AG_SWAP
 )
 
 };
diff --git a/keyboards/planck/keymaps/dsanchezseco/keymap.c b/keyboards/planck/keymaps/dsanchezseco/keymap.c
index 901709429b..f20f68667b 100644
--- a/keyboards/planck/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/planck/keymaps/dsanchezseco/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, _______, _______,  _______,
     _______, KC_PSCR, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, _______, _______,  _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______
diff --git a/keyboards/planck/keymaps/dshields/keymap.c b/keyboards/planck/keymaps/dshields/keymap.c
index 7b768603cb..948f978330 100644
--- a/keyboards/planck/keymaps/dshields/keymap.c
+++ b/keyboards/planck/keymaps/dshields/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
     ),
     [FUN] = LAYOUT_planck_grid(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   RESET,   EEP_RST, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   QK_BOOT, EEP_RST, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
         KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  _______, DM_RSTP, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,
         LGT_TOG, LGT_MOD, LGT_BRT, LGT_INC, LGT_DEC, DM_REC1, DM_REC2, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
diff --git a/keyboards/planck/keymaps/dudeofawesome/keymap.c b/keyboards/planck/keymaps/dudeofawesome/keymap.c
index eac7470d25..ad515032b6 100644
--- a/keyboards/planck/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/planck/keymaps/dudeofawesome/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
     KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dvorak2space/keymap.c b/keyboards/planck/keymaps/dvorak2space/keymap.c
index 4b07759452..9abdaf800a 100644
--- a/keyboards/planck/keymaps/dvorak2space/keymap.c
+++ b/keyboards/planck/keymaps/dvorak2space/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F13,      KC_F14,      KC_F15,      KC_F16,      KC_F17,      KC_F18,      KC_F19,      KC_F20,      KC_F21,      KC_F22,      KC_F23,      KC_F24,
     LCTL(KC_F13),LCTL(KC_F14),LCTL(KC_F15),LCTL(KC_F16),LCTL(KC_F17),LCTL(KC_F18),LCTL(KC_F19),LCTL(KC_F20),LCTL(KC_F21),LCTL(KC_F22),LCTL(KC_F23),LCTL(KC_F24),
     LSFT(KC_F13),LSFT(KC_F14),LSFT(KC_F15),LSFT(KC_F16),LSFT(KC_F17),LSFT(KC_F18),LSFT(KC_F19),LSFT(KC_F20),LSFT(KC_F21),LSFT(KC_F22),LSFT(KC_F23),LSFT(KC_F24),
-    RESET,       LALT(KC_F14),LALT(KC_F15),OSL(PASS_L),              CAD,         LALT(KC_F19),             LALT(KC_F21),LALT(KC_F22),HK_SLP,      HK_COSL
+    QK_BOOT,     LALT(KC_F14),LALT(KC_F15),OSL(PASS_L),              CAD,         LALT(KC_F19),             LALT(KC_F21),LALT(KC_F22),HK_SLP,      HK_COSL
   ),
 //Locked Screen
   [5] = LAYOUT_planck_2x2u(
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index f1d213b42c..1d5ea41c74 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -147,7 +147,7 @@ LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     KC_POWER,_______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/emiller/keymap.c b/keyboards/planck/keymaps/emiller/keymap.c
index 7dcd99d3b7..cab0193ceb 100644
--- a/keyboards/planck/keymaps/emiller/keymap.c
+++ b/keyboards/planck/keymaps/emiller/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/emilyh/keymap.c b/keyboards/planck/keymaps/emilyh/keymap.c
index 3beadd8e2d..fd71b0e905 100644
--- a/keyboards/planck/keymaps/emilyh/keymap.c
+++ b/keyboards/planck/keymaps/emilyh/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/eosti/keymap.c b/keyboards/planck/keymaps/eosti/keymap.c
index 3f1c750cfc..54e1c7f4c7 100644
--- a/keyboards/planck/keymaps/eosti/keymap.c
+++ b/keyboards/planck/keymaps/eosti/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
             RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,  KC_NO,   KC_INS,  KC_HOME,  AU_ON,   KC_NO,   GAME,
         // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-             KC_NO,  RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_SLEP,  KC_DEL,  KC_END,  AU_OFF,  KC_NO,   RESET,
+             KC_NO,  RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_SLEP,  KC_DEL,  KC_END,  AU_OFF,  KC_NO,   QK_BOOT,
         // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
             _______, _______, _______, _______,  UTILS,  _______, _______,  UTILS,  _______, _______, _______, _______
         // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
diff --git a/keyboards/planck/keymaps/eshesh2/keymap.c b/keyboards/planck/keymaps/eshesh2/keymap.c
index c13af1d3fc..672d28ea3c 100644
--- a/keyboards/planck/keymaps/eshesh2/keymap.c
+++ b/keyboards/planck/keymaps/eshesh2/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX,  XXXXXXX, NUMPAD,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/espynn/keymap.c b/keyboards/planck/keymaps/espynn/keymap.c
index 305fb6e759..fb7abd5c8d 100644
--- a/keyboards/planck/keymaps/espynn/keymap.c
+++ b/keyboards/planck/keymaps/espynn/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,              KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, CUS0,    CUS3,    CUS4,    KC_TRNS, KC_F12,  KC_TRNS,
     KC_TRNS, KC_TRNS, CUT,                COPY,    PASTE,   CUS1,    CUS5,    CUS2,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    BL,      RESET,   LALT(LCTL(KC_DEL)), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    BL,      QK_BOOT, LALT(LCTL(KC_DEL)), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 )
 };
 
diff --git a/keyboards/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c
index 2024552004..7252b5b5d3 100644
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ b/keyboards/planck/keymaps/experimental/keymap.c
@@ -167,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/fabian/keymap.c b/keyboards/planck/keymaps/fabian/keymap.c
index 9969d4337e..54d17cd51e 100644
--- a/keyboards/planck/keymaps/fabian/keymap.c
+++ b/keyboards/planck/keymaps/fabian/keymap.c
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/foreveranapple/keymap.c b/keyboards/planck/keymaps/foreveranapple/keymap.c
index 3c5ab7cd02..ade51d5a3c 100644
--- a/keyboards/planck/keymaps/foreveranapple/keymap.c
+++ b/keyboards/planck/keymaps/foreveranapple/keymap.c
@@ -203,7 +203,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NIXQWERTY, OSX,     PLOVER,  COLEMAK,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,  DVORAK,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______
diff --git a/keyboards/planck/keymaps/fsck/keymap.c b/keyboards/planck/keymaps/fsck/keymap.c
index cac5d554ec..f1043d53d2 100644
--- a/keyboards/planck/keymaps/fsck/keymap.c
+++ b/keyboards/planck/keymaps/fsck/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/gitdrik/keymap.c b/keyboards/planck/keymaps/gitdrik/keymap.c
index 58db078281..d9f1e5a4fc 100644
--- a/keyboards/planck/keymaps/gitdrik/keymap.c
+++ b/keyboards/planck/keymaps/gitdrik/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
  [_RIGHTER] = LAYOUT_planck_grid(
-    KC_TRNS, RESET,   DEBUG,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, KC_WH_U,
+    KC_TRNS, QK_BOOT, DEBUG,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, KC_WH_U,
     KC_TRNS, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_WH_D,
     KC_TRNS, KC_TRNS, MU_MOD,  MU_ON,   MU_OFF,  KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_BTN3, KC_TRNS, KC_TRNS,
     KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_NO
diff --git a/keyboards/planck/keymaps/grahampheath/keymap.c b/keyboards/planck/keymaps/grahampheath/keymap.c
index eb5401eabd..cfb15ab9a5 100644
--- a/keyboards/planck/keymaps/grahampheath/keymap.c
+++ b/keyboards/planck/keymaps/grahampheath/keymap.c
@@ -213,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/grant24/keymap.c b/keyboards/planck/keymaps/grant24/keymap.c
index a82403d197..3af4642af5 100644
--- a/keyboards/planck/keymaps/grant24/keymap.c
+++ b/keyboards/planck/keymaps/grant24/keymap.c
@@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, _______,
+    _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, _______,
     _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, _______, _______, MU_ON,   MU_OFF,  _______, _______, KC_CAPS, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index 04af006a7b..3e5abb947f 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MC(KC_W), KC_DELETE,    KC_APP
 ),
 [LY_1101] = LAYOUT_gunp(
-  SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       RESET,
+  SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT,
   KC_WAKE,   KC_CLCK,    USER_NAME,    USER_EMAIL, RGB_MOD,       DEBUG,
   KC_SLEP,   KC_NLCK,    DM_REC1,      DM_PLY1,    XXXXXXX,       EEP_RST,
   KC_PWR,    KC_SLCK,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
index 58f9cea2a5..abc31a2ee6 100644
--- a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
+++ b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, QWERTY,  COLEMAK,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/hiea/common/chord_layout.h b/keyboards/planck/keymaps/hiea/common/chord_layout.h
index b6922705f3..cb1b7f6785 100644
--- a/keyboards/planck/keymaps/hiea/common/chord_layout.h
+++ b/keyboards/planck/keymaps/hiea/common/chord_layout.h
@@ -36,6 +36,6 @@
   [_ADJUST] = LAYOUT_planck_grid(
     PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
   ),
diff --git a/keyboards/planck/keymaps/hieax/common/chord_layout.h b/keyboards/planck/keymaps/hieax/common/chord_layout.h
index b6922705f3..cb1b7f6785 100644
--- a/keyboards/planck/keymaps/hieax/common/chord_layout.h
+++ b/keyboards/planck/keymaps/hieax/common/chord_layout.h
@@ -36,6 +36,6 @@
   [_ADJUST] = LAYOUT_planck_grid(
     PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
   ),
diff --git a/keyboards/planck/keymaps/hvp/keymap.c b/keyboards/planck/keymaps/hvp/keymap.c
index 95d3646dfa..1aad239301 100644
--- a/keyboards/planck/keymaps/hvp/keymap.c
+++ b/keyboards/planck/keymaps/hvp/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  AG_NORM, AG_SWAP, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______,
   _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, KC_4, KC_5, KC_6, _______, _______,
   KC_PSCR, MUV_DE, MUV_IN, MU_ON, MU_OFF, _______, _______,  KC_0, KC_1, KC_2, KC_3, _______,
-  RESET, _______, TERM_ON, TERM_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, DEBUG
+  QK_BOOT, _______, TERM_ON, TERM_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, DEBUG
 )};
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/impossible/keymap.c b/keyboards/planck/keymaps/impossible/keymap.c
index 63541d5798..70ae70dd5d 100644
--- a/keyboards/planck/keymaps/impossible/keymap.c
+++ b/keyboards/planck/keymaps/impossible/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust
  * ,-----------------------------------------------------------------------------------------------.
- * |       |       |       |       |       |       |       |       | Insert| PrtSc | Pause | RESET |
+ * |       |       |       |       |       |       |       |       | Insert| PrtSc | Pause | QK_BOOT |
  * |-------+-------+-------+-------+-------+---------------+-------+-------+-------+-------+-------|
  * |       |       |       |       |       |       |       | CapLk |Voice +| Audio |MIDIoff|       |
  * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJ] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_PSCR, KC_PAUSE, RESET,
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_PSCR, KC_PAUSE, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, KC_CLCK, MUV_IN,  AU_TOG,  MI_OFF,   _______,
   _______, _______, _______, _______, _______, _______, _______, KC_SLCK, MUV_DE,  MU_TOG,  MI_ON,    _______,
   _______, _______, _______, _______, _______, _______, _______, KC_NLCK, WORKMAN, QWERTY,  PLOVER,   _______
diff --git a/keyboards/planck/keymaps/inkwell/keymap.c b/keyboards/planck/keymaps/inkwell/keymap.c
index f5192d0bb4..2c11ac61b0 100644
--- a/keyboards/planck/keymaps/inkwell/keymap.c
+++ b/keyboards/planck/keymaps/inkwell/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    RESET,   _______,  _______,  _______,  _______, _______, _______, KC_BTN1, KC_MS_BTN2, KC_ACL1, KC_ACL2,  KC_BSPC ,
+    QK_BOOT, _______,  _______,  _______,  _______, _______, _______, KC_BTN1, KC_MS_BTN2, KC_ACL1, KC_ACL2,  KC_BSPC ,
     _______, KC_CALC,  KC_MAIL,  KC_MSEL,  DEBUG,   _______, _______, KC_MS_L, KC_MS_D,    KC_MS_U, KC_MS_R,  RGB_TOG,
     KC_LSFT, _______,  _______,  _______,  _______, _______, _______, _______, _______,    _______, _______,  KC_ENT,
     RSFT_T(KC_MPLY),   KC_LCTL,  KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,     KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
diff --git a/keyboards/planck/keymaps/jasperla/keymap.c b/keyboards/planck/keymaps/jasperla/keymap.c
index f51af78b52..8153aa33b7 100644
--- a/keyboards/planck/keymaps/jasperla/keymap.c
+++ b/keyboards/planck/keymaps/jasperla/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, _______, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, _______, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/jdelkins/keymap.c b/keyboards/planck/keymaps/jdelkins/keymap.c
index af438f704e..8a039bc00e 100644
--- a/keyboards/planck/keymaps/jdelkins/keymap.c
+++ b/keyboards/planck/keymaps/jdelkins/keymap.c
@@ -159,14 +159,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
     KC_RCTL, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, TG(_KP), KC_BRID, KC_BRIU, KC_MUTE,
     _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS,  _______, _______, _______, KC_MPLY,
     KC_RCTL, _______, _______, _______,      _______,          _______,     KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
 )
 
 /* [_ADJUST] = LAYOUT( */
-/*     _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL , */
+/*     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL , */
 /*     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______, */
 /*     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______, */
 /*     _______, _______, _______, _______,      _______,          _______,     _______, _______, _______,  _______ */
diff --git a/keyboards/planck/keymaps/jeebak/keymap.c b/keyboards/planck/keymaps/jeebak/keymap.c
index 9ac547bb82..adf72a5ac3 100644
--- a/keyboards/planck/keymaps/jeebak/keymap.c
+++ b/keyboards/planck/keymaps/jeebak/keymap.c
@@ -239,7 +239,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   RESET
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   QK_BOOT
 )
 
 
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
index 2e7d8e876b..31855f7685 100644
--- a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RESET,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  QK_BOOT,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/jhenahan/keymap.c b/keyboards/planck/keymaps/jhenahan/keymap.c
index e8d7456040..c05f678576 100644
--- a/keyboards/planck/keymaps/jhenahan/keymap.c
+++ b/keyboards/planck/keymaps/jhenahan/keymap.c
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, PLOVER,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
index aaf8600faf..f3439096e3 100644
--- a/keyboards/planck/keymaps/jimmysjolund/keymap.c
+++ b/keyboards/planck/keymaps/jimmysjolund/keymap.c
@@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/jirgn/keymap.c b/keyboards/planck/keymaps/jirgn/keymap.c
index d89d702c2c..edbb3fbed7 100644
--- a/keyboards/planck/keymaps/jirgn/keymap.c
+++ b/keyboards/planck/keymaps/jirgn/keymap.c
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *              `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  PLOVER,  _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/joe/keymap.c b/keyboards/planck/keymaps/joe/keymap.c
index 49b2948e65..b520da9fa9 100644
--- a/keyboards/planck/keymaps/joe/keymap.c
+++ b/keyboards/planck/keymaps/joe/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [6] = LAYOUT_planck_grid( /* Joe SPECIAL fn3 */
     KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   KC_NO           ,
-    KC_NO,   KC_MPLY, KC_MPRV, KC_MNXT, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   RESET           ,
+    KC_NO,   KC_MPLY, KC_MPRV, KC_MNXT, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   QK_BOOT           ,
     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   KC_NO           ,
     DF(0),   DF(1),   DF(2),   DF(3),   MO(4), KC_TRNS, KC_TRNS, MO(5), KC_POWER, KC_WAKE, KC_SLEP, LCTL(LALT(KC_L))
   )
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
index 02138a876c..1825cec36f 100644
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ b/keyboards/planck/keymaps/jweickm/keymap.c
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* _ADJUST
      * ,-----------------------------------------------------------------------------------.
-     * | A-SFT| RESET| DEBUG|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
+     * | A-SFT| QK_BOOT| DEBUG|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * | A-GRV|EEPRST|MU_MOD| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
      * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -209,7 +209,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        LALT(KC_LSFT), RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DE_SWITCH, 
+        LALT(KC_LSFT), QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DE_SWITCH, 
         LALT(KC_GRV), EEP_RST, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, HRWIDECOLEMAK, WIDECOLEMAK, LALT(KC_GRV), LANG_SWITCH, GAMING, 
         KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_SVD_BD, KC_MPLY, KC_SVU_BU, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEPROM_RESET
diff --git a/keyboards/planck/keymaps/kanbara/keymap.c b/keyboards/planck/keymaps/kanbara/keymap.c
index 711411f65d..383069bd43 100644
--- a/keyboards/planck/keymaps/kanbara/keymap.c
+++ b/keyboards/planck/keymaps/kanbara/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,
+    QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, COLEMAK,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LEAGUE,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kelorean/keymap.c b/keyboards/planck/keymaps/kelorean/keymap.c
index f6bc65b62b..8128f62302 100644
--- a/keyboards/planck/keymaps/kelorean/keymap.c
+++ b/keyboards/planck/keymaps/kelorean/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/khord/keymap.c b/keyboards/planck/keymaps/khord/keymap.c
index ccd4386c92..19166dbf4e 100644
--- a/keyboards/planck/keymaps/khord/keymap.c
+++ b/keyboards/planck/keymaps/khord/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, ADMIN,   SMSPC1,  KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, ADMIN,   SMSPC1,  KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  M_BRDFT, M_BRINC, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  M_BRTOG, M_BRDEC, C_A_INS,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, C_A_DEL
diff --git a/keyboards/planck/keymaps/kifinnsson/keymap.c b/keyboards/planck/keymaps/kifinnsson/keymap.c
index 3917462fa3..daee15842c 100644
--- a/keyboards/planck/keymaps/kifinnsson/keymap.c
+++ b/keyboards/planck/keymaps/kifinnsson/keymap.c
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, _______,
         _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, TERM_ON, TERM_OFF, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/kloki/keymap.c b/keyboards/planck/keymaps/kloki/keymap.c
index c22ca15b4e..4320e12a72 100644
--- a/keyboards/planck/keymaps/kloki/keymap.c
+++ b/keyboards/planck/keymaps/kloki/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, _______, QWERTY,  WORKMAN, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kmontag42/keymap.c b/keyboards/planck/keymaps/kmontag42/keymap.c
index 6910dbc250..f3d3a6dcfb 100644
--- a/keyboards/planck/keymaps/kmontag42/keymap.c
+++ b/keyboards/planck/keymaps/kmontag42/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kuatsure/keymap.c b/keyboards/planck/keymaps/kuatsure/keymap.c
index 6ce1049b80..6609683c1e 100644
--- a/keyboards/planck/keymaps/kuatsure/keymap.c
+++ b/keyboards/planck/keymaps/kuatsure/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |      | MAKE | FLSH |      |      |      |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | RESET| DEBUG|      |      |Aud on|AudOff| Game |Mouse |      |      |      |
+ * |      | QK_BOOT| DEBUG|      |      |Aud on|AudOff| Game |Mouse |      |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      | VRSN |      |      |MusMod|Mus on|MusOff|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid_wrapper(
     _______, KB_MAKE, KB_FLSH, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-    _______, RESET,   DEBUG,   _______, _______, AU_ON,   AU_OFF,  GAME,    MOUSE,   _______, _______, _______,
+    _______, QK_BOOT, DEBUG,   _______, _______, AU_ON,   AU_OFF,  GAME,    MOUSE,   _______, _______, _______,
     _______, KB_VRSN, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
diff --git a/keyboards/planck/keymaps/lae3/keymap.c b/keyboards/planck/keymaps/lae3/keymap.c
index 249bcb87a7..1b5bbfd10e 100644
--- a/keyboards/planck/keymaps/lae3/keymap.c
+++ b/keyboards/planck/keymaps/lae3/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, BL_STEP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QWERTY,  ARROW,   NUMPAD,  _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/lja83/keymap.c b/keyboards/planck/keymaps/lja83/keymap.c
index 82862a77ed..8aaeef3a0f 100644
--- a/keyboards/planck/keymaps/lja83/keymap.c
+++ b/keyboards/planck/keymaps/lja83/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/lucas/keymap.c b/keyboards/planck/keymaps/lucas/keymap.c
index 01a2af7b19..703dea81ea 100644
--- a/keyboards/planck/keymaps/lucas/keymap.c
+++ b/keyboards/planck/keymaps/lucas/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
   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_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,   KC_PMNS, KC_PPLS, KC_NO,   KC_NO,   KC_NO,   RESET,   KC_NO,
+  KC_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,   KC_PMNS, KC_PPLS, KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,
   KC_NO,  BL_TOGG, BL_DEC, BL_INC, MO(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 [5] = LAYOUT_planck_grid( /* Gaming
diff --git a/keyboards/planck/keymaps/mason/keymap.c b/keyboards/planck/keymaps/mason/keymap.c
index 9cf65c172d..ad12e2520c 100644
--- a/keyboards/planck/keymaps/mason/keymap.c
+++ b/keyboards/planck/keymaps/mason/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_POWER,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_POWER,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/matrixman/keymap.c b/keyboards/planck/keymaps/matrixman/keymap.c
index f13198cfa0..48219262fa 100644
--- a/keyboards/planck/keymaps/matrixman/keymap.c
+++ b/keyboards/planck/keymaps/matrixman/keymap.c
@@ -32,21 +32,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
     // accessed via the left nav-layer key, includes a F10 where the right nav-layer key was
 [_NAV_L] = LAYOUT_planck_grid(
-   KC_TRNS,    KC_F2,    KC_F3,      KC_F4,         KC_F5,    RESET,      BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10
+   KC_TRNS,    KC_F2,    KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10
   ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCREEN, KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
   ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     KC_F12
   ,KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
 ),
     // accessed via the right nav-layer key, includes a F1 where the left nav-layer key was
 [_NAV_R] = LAYOUT_planck_grid(
-   KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    RESET,      BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_TRNS
+   KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_TRNS
   ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCREEN, KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
   ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     KC_F12
   ,KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
 ),
     // accessed via the lower alt keys, moves tab and delete to make alt+tab and ctrl+alt+del feel more standard
 [_NAV_ALT] = LAYOUT_planck_grid(
-   KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    RESET,      BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_DELETE
+   KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_DELETE
   ,KC_TAB,   KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCREEN, KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
   ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     KC_F12
   ,KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
diff --git a/keyboards/planck/keymaps/mattly/keymap.c b/keyboards/planck/keymaps/mattly/keymap.c
index 52ade86432..c9e0a1c3af 100644
--- a/keyboards/planck/keymaps/mattly/keymap.c
+++ b/keyboards/planck/keymaps/mattly/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_FUNCT] = LAYOUT_planck_grid(
-    RESET,   XALLWIN, XPRVSPC, NWIN,    XNXTSPC, XDESKTP, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F13,
+    QK_BOOT, XALLWIN, XPRVSPC, NWIN,    XNXTSPC, XDESKTP, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F13,
     DEBUG,   XNOTIFY, PTAB,    PWIN,    NTAB,    NAVBACK, NAVFWD,  KC_F4,   KC_F5,   KC_F6,   KC_F11,  KC_F14,
     KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD, KC_MPLY, XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F12,  KC_F15,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/max/keymap.c b/keyboards/planck/keymaps/max/keymap.c
index b84404e1e5..d947b6a1a0 100644
--- a/keyboards/planck/keymaps/max/keymap.c
+++ b/keyboards/planck/keymaps/max/keymap.c
@@ -16,13 +16,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [2] = LAYOUT_planck_grid( /* RAISE */
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TRNS, DF(0), DF(1), RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_TRNS,
+  KC_TRNS, DF(0), DF(1), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_TRNS,
   KC_TRNS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, KC_BSLS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 [3] = LAYOUT_planck_grid( /* LOWER */
   S(KC_GRV),  S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0), KC_BSPC,
-  KC_TRNS, DF(0), DF(1), RESET, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), KC_TRNS,
+  KC_TRNS, DF(0), DF(1), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), KC_TRNS,
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  S(KC_BSLS),
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 )
diff --git a/keyboards/planck/keymaps/mgalisa/keymap.c b/keyboards/planck/keymaps/mgalisa/keymap.c
index 09e829564c..11fb309851 100644
--- a/keyboards/planck/keymaps/mgalisa/keymap.c
+++ b/keyboards/planck/keymaps/mgalisa/keymap.c
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/mikethetiger/keymap.c b/keyboards/planck/keymaps/mikethetiger/keymap.c
index 2fe9321501..35c6917bbf 100644
--- a/keyboards/planck/keymaps/mikethetiger/keymap.c
+++ b/keyboards/planck/keymaps/mikethetiger/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/mjt/keymap.c b/keyboards/planck/keymaps/mjt/keymap.c
index 4862526e12..371085ee15 100644
--- a/keyboards/planck/keymaps/mjt/keymap.c
+++ b/keyboards/planck/keymaps/mjt/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______ , RESET,   _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
+  _______ , QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
   _______ , _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,  PLOVER, _______,
   _______ , MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/mjtnumsym/keymap.c b/keyboards/planck/keymaps/mjtnumsym/keymap.c
index 6274a9a602..2068eebd83 100644
--- a/keyboards/planck/keymaps/mjtnumsym/keymap.c
+++ b/keyboards/planck/keymaps/mjtnumsym/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______ , RESET,   _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
+  _______ , QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
   _______ , _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,  PLOVER, _______,
   _______ , MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/mjuma/keymap.c b/keyboards/planck/keymaps/mjuma/keymap.c
index 8aaa05864f..db9b46b9bf 100644
--- a/keyboards/planck/keymaps/mjuma/keymap.c
+++ b/keyboards/planck/keymaps/mjuma/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------.
- * |      |RESET |DEBUG |      |      |      |      |DMREC1|DMREC2|      |      |      |
+ * |      |QK_BOOT |DEBUG |      |      |      |      |DMREC1|DMREC2|      |      |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |GAMING|      |      |      |      |      |DMPLY1|DMPLY2|Audoff|Aud on|      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,     _______,   _______,  _______, _______, DM_REC1, DM_REC2,   _______,   _______,   _______,
+    _______, QK_BOOT, DEBUG,     _______,   _______,  _______, _______, DM_REC1, DM_REC2,   _______,   _______,   _______,
     _______, TG(_GAMING), ___,   _______,   _______,  _______, _______, DM_PLY1, DM_PLY2,   AU_OFF,    AU_ON,     _______,
     _______, _______, _______,   _______,   _______,  _______, _______, DM_RSTP, _______,   MU_OFF,    MU_ON,     MU_MOD,
     _______, _______, _______,   AG_TOGG,   _______,  _______, _______, _______, _______,   MUV_DE,    MUV_IN,    _______
diff --git a/keyboards/planck/keymaps/mnil/keymap.c b/keyboards/planck/keymaps/mnil/keymap.c
index 74a2f57654..5aa85340bd 100644
--- a/keyboards/planck/keymaps/mnil/keymap.c
+++ b/keyboards/planck/keymaps/mnil/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_NUMPAD] = LAYOUT_planck_2x2u(
-    KC_TRNS, QUIT,    WIN,     MVWSL,   MVWSR,   CRYWS,   TERM,    KC_7,    KC_8,    KC_9,    KC_COMM, RESET,
+    KC_TRNS, QUIT,    WIN,     MVWSL,   MVWSR,   CRYWS,   TERM,    KC_7,    KC_8,    KC_9,    KC_COMM, QK_BOOT,
     KC_TRNS, CS_TAB,  C_TAB,   PRVWS,   NXTWS,   I3MOD,   OPEN,    KC_4,    KC_5,    KC_6,    KC_0,    KC_NO,
     KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, MOVWS,   BROWSER, KC_1,    KC_2,    KC_3,    KC_DOT,  KC_NO,
     QWE_COL, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/planck/keymaps/mollat/keymap.c b/keyboards/planck/keymaps/mollat/keymap.c
index f993d299b6..fc2a8bc47c 100644
--- a/keyboards/planck/keymaps/mollat/keymap.c
+++ b/keyboards/planck/keymaps/mollat/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    __________, __________, __________, KC_END,     __________, __________, __________, __________, KC_INS,     __________, KC_DEL,     RALT(KC_Y) ,
    KC_TRNS,    __________, RALT(KC_S), __________, KC_PGDN,    RALT(KC_5), KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    RALT(KC_P), RALT(KC_Q) ,
    __________, KC_HOME,    __________, __________, __________, KC_PGUP,    __________, __________, __________, __________, __________, KC_ENT     ,
-   RESET,      __________, __________, __________, __________, KC_SPC,     KC_SPC,     __________, __________, __________, __________, __________
+   QK_BOOT,    __________, __________, __________, __________, KC_SPC,     KC_SPC,     __________, __________, __________, __________, __________
 ),
 
 // function key layer and some shift + (missing key at the small form factor)
diff --git a/keyboards/planck/keymaps/motform/keymap.c b/keyboards/planck/keymaps/motform/keymap.c
index 0dd046a93a..3e38e9fa63 100644
--- a/keyboards/planck/keymaps/motform/keymap.c
+++ b/keyboards/planck/keymaps/motform/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid
 (
- _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+ _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, _______,
  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/msiu/keymap.c b/keyboards/planck/keymaps/msiu/keymap.c
index 559767f1fb..afcc799c44 100644
--- a/keyboards/planck/keymaps/msiu/keymap.c
+++ b/keyboards/planck/keymaps/msiu/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,_______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
 [_FUNC] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/muzfuz/keymap.c b/keyboards/planck/keymaps/muzfuz/keymap.c
index 5e21660d01..985f4b9dee 100644
--- a/keyboards/planck/keymaps/muzfuz/keymap.c
+++ b/keyboards/planck/keymaps/muzfuz/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
     [_ADJUST] = LAYOUT_planck_grid(
-        _______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+        _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
         _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
         _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/planck/keymaps/mwpeterson/keymap.c b/keyboards/planck/keymaps/mwpeterson/keymap.c
index dbe2f246f7..8c29e57779 100644
--- a/keyboards/planck/keymaps/mwpeterson/keymap.c
+++ b/keyboards/planck/keymaps/mwpeterson/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *               Swap GUI/Alt _/________/             \_____________\_           _/
    */
   [ADJUST_LAYER] = LAYOUT_planck_grid(
-    XXXXXXX, RESET,   SEND_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SEND_VERSION, XXXXXXX,
+    XXXXXXX, QK_BOOT, SEND_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SEND_VERSION, XXXXXXX,
     QWERTY,  XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,
     XXXXXXX, MUV_DE,  MUV_IN,    MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,       XXXXXXX,
     STENO,   XXXXXXX, AG_SWAP,   AG_NORM, LOWER,   XXXXXXX, XXXXXXX, RAISE,   XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX
diff --git a/keyboards/planck/keymaps/myoung34/keymap.c b/keyboards/planck/keymaps/myoung34/keymap.c
index 2529df7422..714b7b3a89 100644
--- a/keyboards/planck/keymaps/myoung34/keymap.c
+++ b/keyboards/planck/keymaps/myoung34/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/narze/keymap.c b/keyboards/planck/keymaps/narze/keymap.c
index b5fd3356ea..84864db0ce 100644
--- a/keyboards/planck/keymaps/narze/keymap.c
+++ b/keyboards/planck/keymaps/narze/keymap.c
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+    _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, QWOC,    PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  SDTOGG,  _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BACKLIT
diff --git a/keyboards/planck/keymaps/nick/keymap.c b/keyboards/planck/keymaps/nick/keymap.c
index d75a91edb6..219665c201 100644
--- a/keyboards/planck/keymaps/nick/keymap.c
+++ b/keyboards/planck/keymaps/nick/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______,  _______, KC_DEL,
+    _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,  _______, KC_DEL,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/nico/keymap.c b/keyboards/planck/keymaps/nico/keymap.c
index 7836517890..bc3a3f94d8 100644
--- a/keyboards/planck/keymaps/nico/keymap.c
+++ b/keyboards/planck/keymaps/nico/keymap.c
@@ -36,13 +36,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RS] = LAYOUT_planck_grid( /* RAISE */
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), RESET,   KC_TRNS,
+  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
   M(0),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14,  KC_F15,  KC_TRNS, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 [_LW] = LAYOUT_planck_grid( /* LOWER */
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), RESET,   KC_TRNS,
+  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
   M(0),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14,  KC_F15,  KC_TRNS, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
 )
 };
diff --git a/keyboards/planck/keymaps/not-quite-neo/keymap.c b/keyboards/planck/keymaps/not-quite-neo/keymap.c
index 42ed71d0ad..4d18f9d32a 100644
--- a/keyboards/planck/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/planck/keymaps/not-quite-neo/keymap.c
@@ -111,7 +111,7 @@ L06 -> <TBD>: UNSPECIFIED
 
 /* LFN -> MO(FN): FUNCTION
  * ,-----------------------------------------------------------------------------------.
- * | RESET|                                  |                                  | BACKS|
+ * | QK_BOOT|                                  |                                  | BACKS|
  * |------+                                  |                                  +------|
  * |      |             L06_LEFT             |             L06_RIGHT            |INSERT|
  * |------+                                  |                                  +------|
@@ -121,7 +121,7 @@ L06 -> <TBD>: UNSPECIFIED
  * `-----------------------------------------------------------------------------------'
  */
 [LFN] = LAYOUT_planck_grid(
-  RESET,                  L06_LEFT_01,                                 L06_RIGHT_01,                 KC_BSPC,
+  QK_BOOT,                L06_LEFT_01,                                 L06_RIGHT_01,                 KC_BSPC,
   _______,                L06_LEFT_02,                                 L06_RIGHT_02,                 KC_INS,
   _______,                L06_LEFT_03,                                 L06_RIGHT_03,                 KC_DEL,
   MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______
diff --git a/keyboards/planck/keymaps/originerd/keymap.c b/keyboards/planck/keymaps/originerd/keymap.c
index 7604959119..17e6124280 100644
--- a/keyboards/planck/keymaps/originerd/keymap.c
+++ b/keyboards/planck/keymaps/originerd/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, NERD,    _______, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/orthodeluxe/keymap.c b/keyboards/planck/keymaps/orthodeluxe/keymap.c
index f7a4834227..c1da44e970 100644
--- a/keyboards/planck/keymaps/orthodeluxe/keymap.c
+++ b/keyboards/planck/keymaps/orthodeluxe/keymap.c
@@ -214,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_UTILSLAYER] = LAYOUT_planck_grid(
-    _______, XXXXXXX, WINDOWS, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PAUS, _______,
+    _______, XXXXXXX, WINDOWS, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PAUS, _______,
     _______, XXXXXXX, KC_SLCK, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
     _______, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, XXXXXXX, KC_NLCK, MACOS,   XXXXXXX, XXXXXXX, XXXXXXX, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index fae5a94713..9e451a010a 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_planck_grid(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_DEL,  _______, AU_ON,   AU_OFF,  AU_TOG,  _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, LED_LEVEL, RESET,
+    KC_DEL,  _______, AU_ON,   AU_OFF,  AU_TOG,  _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, LED_LEVEL, QK_BOOT,
     _______, _______, MU_ON,   MU_OFF,  MU_TOG,  _______, _______, RGB_MOD, RGB_HUI, RGB_HUD, TOGGLE_LAYER_COLOR, _______,
     _______, _______, _______, _______, _______, _______, KC_NO,   _______, _______, _______, _______, _______
   ),
diff --git a/keyboards/planck/keymaps/palleiko/keymap.c b/keyboards/planck/keymaps/palleiko/keymap.c
index d3798c6518..a86cb698ff 100644
--- a/keyboards/planck/keymaps/palleiko/keymap.c
+++ b/keyboards/planck/keymaps/palleiko/keymap.c
@@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/pascamel/keymap.c b/keyboards/planck/keymaps/pascamel/keymap.c
index 13553dc399..bc03824452 100644
--- a/keyboards/planck/keymaps/pascamel/keymap.c
+++ b/keyboards/planck/keymaps/pascamel/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/pete/keymap.c b/keyboards/planck/keymaps/pete/keymap.c
index 6b95a2eafb..cc73a251e2 100644
--- a/keyboards/planck/keymaps/pete/keymap.c
+++ b/keyboards/planck/keymaps/pete/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, WIN,     MAC,     _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, RESET,   RESET,   _______, _______, _______, _______, _______
+  _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
 ),
 [_MAC] = LAYOUT_planck_grid( /* Mac */
   CYCLWIN,MACSLEEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_DEL ,
diff --git a/keyboards/planck/keymaps/pevecyan/keymap.c b/keyboards/planck/keymaps/pevecyan/keymap.c
index 553dd84a5d..2b7518f22c 100644
--- a/keyboards/planck/keymaps/pevecyan/keymap.c
+++ b/keyboards/planck/keymaps/pevecyan/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/pickle_jr/keymap.c b/keyboards/planck/keymaps/pickle_jr/keymap.c
index 31853819c6..48ce0e645a 100644
--- a/keyboards/planck/keymaps/pickle_jr/keymap.c
+++ b/keyboards/planck/keymaps/pickle_jr/keymap.c
@@ -167,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+  _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
   _______, _______, _______, _______, _______, KC_TRNS, KC_TRNS, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/piemod/keymap.c b/keyboards/planck/keymaps/piemod/keymap.c
index d75b8bf53b..974b3d3646 100644
--- a/keyboards/planck/keymaps/piemod/keymap.c
+++ b/keyboards/planck/keymaps/piemod/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_PSCREEN,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,  KC_NO,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,
      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, KC_NO,  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  KC_MEDIA_PLAY_PAUSE,
-     RESET,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
+     QK_BOOT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
     ),
 
     [EMACS] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/pjanx/keymap.c b/keyboards/planck/keymaps/pjanx/keymap.c
index cf2e52623d..9e191324c3 100644
--- a/keyboards/planck/keymaps/pjanx/keymap.c
+++ b/keyboards/planck/keymaps/pjanx/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
diff --git a/keyboards/planck/keymaps/pok3r/keymap.c b/keyboards/planck/keymaps/pok3r/keymap.c
index 8c10ee3401..c3a52d2e4e 100644
--- a/keyboards/planck/keymaps/pok3r/keymap.c
+++ b/keyboards/planck/keymaps/pok3r/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/premek/keymap.c b/keyboards/planck/keymaps/premek/keymap.c
index 4bcfbd91a0..72fa2faa03 100644
--- a/keyboards/planck/keymaps/premek/keymap.c
+++ b/keyboards/planck/keymaps/premek/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
 ),
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/ptillemans/keymap.c b/keyboards/planck/keymaps/ptillemans/keymap.c
index e671fd59ca..cb240e80aa 100644
--- a/keyboards/planck/keymaps/ptillemans/keymap.c
+++ b/keyboards/planck/keymaps/ptillemans/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  QWERTY,  DVORAK,  PLOVER,  _______,
     BACKLIT, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/pvc/keymap.c b/keyboards/planck/keymaps/pvc/keymap.c
index 8428c2335f..e03e692d4e 100644
--- a/keyboards/planck/keymaps/pvc/keymap.c
+++ b/keyboards/planck/keymaps/pvc/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
   | XXXXXX | BRTOG  | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | VOICE+ | XXXXXX |
+  | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | QK_BOOT  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | VOICE+ | XXXXXX |
   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
   | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER  | XXXXXX | XXXXXX | LOWER  | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
   '-----------------------------------------------------------------------------------------------------------'
@@ -205,7 +205,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [LAYER_ADJUST] = LAYOUT_planck_grid(
    XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, MU_TOG , AU_TOG  ,
    XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET  , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX ,
+   XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, QK_BOOT, XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX ,
    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP
 ),
 
diff --git a/keyboards/planck/keymaps/raffle/keymap.c b/keyboards/planck/keymaps/raffle/keymap.c
index 52727f35b1..436db90e2c 100644
--- a/keyboards/planck/keymaps/raffle/keymap.c
+++ b/keyboards/planck/keymaps/raffle/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/rai-suta/keymap.c b/keyboards/planck/keymaps/rai-suta/keymap.c
index 07dae2b2ab..bfaf28d8d9 100644
--- a/keyboards/planck/keymaps/rai-suta/keymap.c
+++ b/keyboards/planck/keymaps/rai-suta/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GESC, KC_EXLM,  JK_DQT, KC_HASH,  KC_DLR, KC_PERC, JK_AMPR,  JK_SQT, JK_LPRN, JK_RPRN,   JK_S0,  KC_DEL,
     _______, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT,  KC_DEL, KC_BSPC,   JK_EQ,  JK_TLD,  JK_GRV, JK_LCBR, JK_PIPE,
     _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_Y), XXXXXXX,  KC_ENT, KC_LABK, KC_RABK, JK_RCBR, JK_UNDS,
-      RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+      QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
 
   [KL_RAISE] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/rodhaene/keymap.c b/keyboards/planck/keymaps/rodhaene/keymap.c
index 8aded36b82..1732e19a3d 100644
--- a/keyboards/planck/keymaps/rodhaene/keymap.c
+++ b/keyboards/planck/keymaps/rodhaene/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NUMPAD, _______, _______,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/roguepullrequest/keymap.c b/keyboards/planck/keymaps/roguepullrequest/keymap.c
index 177cb2b671..47331af90c 100644
--- a/keyboards/planck/keymaps/roguepullrequest/keymap.c
+++ b/keyboards/planck/keymaps/roguepullrequest/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 
 	[_FUNCTION] = LAYOUT_planck_grid(
-		KC_F11, KC_F7, KC_F5, KC_F3, KC_F1, KC_F9, KC_F12, KC_F2, KC_F4, KC_F6, KC_F8, RESET,
+		KC_F11, KC_F7, KC_F5, KC_F3, KC_F1, KC_F9, KC_F12, KC_F2, KC_F4, KC_F6, KC_F8, QK_BOOT,
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
diff --git a/keyboards/planck/keymaps/sascha/keymap.c b/keyboards/planck/keymaps/sascha/keymap.c
index d17d4deaa4..ec4781c78b 100644
--- a/keyboards/planck/keymaps/sascha/keymap.c
+++ b/keyboards/planck/keymaps/sascha/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TILD   , KC_1     , KC_2     , KC_3     , KC_4     , KC_5      , KC_6     , KC_7     , KC_8     , KC_9     , KC_0     , KC_DEL,
         KC_GRV    , KC_EXLM  , KC_AT    , KC_HASH  , KC_DLR   , KC_PERC   , KC_CIRC  , KC_AMPR  , KC_ASTR  , UC(L'ü') , UC(L'ö') , UC(L'ä'),
         S(KC_INS) , UC(L'…') , UC(L'’') , UC(L'“') , UC(L'”') , UC(L'←')  , UC(L'→') , UC(L'€') , UC(L'ß') , UC(L'Ü') , UC(L'Ö') , UC(L'Ä'),
-        RESET     , BL_STEP  , KC_F1    , KC_HOME  , KC_END   , KC_PGUP   , KC_PGDN  , KC_LEFT  , KC_DOWN  , KC_UP    , KC_RGHT  , KC_TRNS
+        QK_BOOT     , BL_STEP  , KC_F1    , KC_HOME  , KC_END   , KC_PGUP   , KC_PGDN  , KC_LEFT  , KC_DOWN  , KC_UP    , KC_RGHT  , KC_TRNS
     )
 };
 
diff --git a/keyboards/planck/keymaps/scottzach1/keymap.c b/keyboards/planck/keymaps/scottzach1/keymap.c
index f3cd6c46ec..ce1c70d318 100755
--- a/keyboards/planck/keymaps/scottzach1/keymap.c
+++ b/keyboards/planck/keymaps/scottzach1/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------------------'
  */
 [_DEBUG] = LAYOUT_ortho_4x12(
-    RESET,   DEBUG,   xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, EEP_RST,
+    QK_BOOT, DEBUG,   xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, EEP_RST,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx
diff --git a/keyboards/planck/keymaps/sdothum/common/chord_layout.h b/keyboards/planck/keymaps/sdothum/common/chord_layout.h
index b6922705f3..cb1b7f6785 100644
--- a/keyboards/planck/keymaps/sdothum/common/chord_layout.h
+++ b/keyboards/planck/keymaps/sdothum/common/chord_layout.h
@@ -36,6 +36,6 @@
   [_ADJUST] = LAYOUT_planck_grid(
     PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
   ),
diff --git a/keyboards/planck/keymaps/sean/keymap.c b/keyboards/planck/keymaps/sean/keymap.c
index b4024909f5..e01dcc6ccf 100644
--- a/keyboards/planck/keymaps/sean/keymap.c
+++ b/keyboards/planck/keymaps/sean/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______,     RESET,   _______, _______, _______, AG_NORM,   AG_SWAP, _______, _______,    HRVL,  HRESET,  HMENU,
+  _______,     QK_BOOT, _______, _______, _______, AG_NORM,   AG_SWAP, _______, _______,    HRVL,  HRESET,  HMENU,
    KC_PWR,   KC_EJCT,       CUT,    COPY,   PASTE, KC_PSCR, KC_SYSREQ, KC_CAPS, KC_MRWD, KC_MFFD, KC_MUTE, KC_MSTP,
      DVRK, TO(_NMPD), TO(_MVMT),    SDRK, _______, _______,   _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
   BACKLIT,   BACKTOG,   _______, _______, _______, _______,   _______, _______, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
diff --git a/keyboards/planck/keymaps/sebas/keymap.c b/keyboards/planck/keymaps/sebas/keymap.c
index 1076531f13..631ad6fc23 100644
--- a/keyboards/planck/keymaps/sebas/keymap.c
+++ b/keyboards/planck/keymaps/sebas/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_FN] = LAYOUT_planck_grid(
-    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11,  KC_F12,  _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/sgoodwin/keymap.c b/keyboards/planck/keymaps/sgoodwin/keymap.c
index 1b70524825..ad380ce6ab 100644
--- a/keyboards/planck/keymaps/sgoodwin/keymap.c
+++ b/keyboards/planck/keymaps/sgoodwin/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, QWERTY,  COLEMAK, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/sigul/keymap.c b/keyboards/planck/keymaps/sigul/keymap.c
index 2b100509b9..6c5da45224 100644
--- a/keyboards/planck/keymaps/sigul/keymap.c
+++ b/keyboards/planck/keymaps/sigul/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, DF(QWERTY), _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______,
+    _______, DF(QWERTY), _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
     _______, _______,    _______, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______,    _______, _______, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______,
     _______, _______,    _______, _______, _______, _______, _______, _______, MUV_DE,  AU_ON,   AU_OFF,  MUV_IN
diff --git a/keyboards/planck/keymaps/skank/keymap.c b/keyboards/planck/keymaps/skank/keymap.c
index 9601cd31fb..da7b471085 100644
--- a/keyboards/planck/keymaps/skank/keymap.c
+++ b/keyboards/planck/keymaps/skank/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,   QWERTY, COLEMAK, _______, _______, _______, _______,   RESET,
+    _______, _______, _______, AU_ON,   AU_OFF,   QWERTY, COLEMAK, _______, _______, _______, _______,   QK_BOOT,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,   MI_ON,   MI_OFF, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/planck/keymaps/skug/keymap.c b/keyboards/planck/keymaps/skug/keymap.c
index 6367d3c346..ce9c15e099 100644
--- a/keyboards/planck/keymaps/skug/keymap.c
+++ b/keyboards/planck/keymaps/skug/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9   , KC_F10 , KC_F11 , KC_F12 ,
-    _______, RESET  , MU_MOD , AU_ON  , AU_OFF , AG_NORM, AG_SWAP, DEFAULT, XXXXXXX , XXXXXXX, UTILITY, _______,
+    _______, QK_BOOT, MU_MOD , AU_ON  , AU_OFF , AG_NORM, AG_SWAP, DEFAULT, XXXXXXX , XXXXXXX, UTILITY, _______,
     _______, SE_PIPE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/planck/keymaps/smittey/keymap.c b/keyboards/planck/keymaps/smittey/keymap.c
index 537b60c103..f8d3f4b1bb 100644
--- a/keyboards/planck/keymaps/smittey/keymap.c
+++ b/keyboards/planck/keymaps/smittey/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-----------------------------------------------------------------------------------'
   */
   [_ADJUST] = LAYOUT_planck_grid(
-      RESET,   QWERTY,  XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MI_OFF,   MI_ON,   KC_DEL,
+      QK_BOOT, QWERTY,  XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MI_OFF,   MI_ON,   KC_DEL,
       XXXXXXX, XXXXXXX, XXXXXXX,   DVORAK,    XXXXXXX,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX,   AU_OFF,   AU_ON,   XXXXXXX,
       XXXXXXX, XXXXXXX, XXXXXXX,   COLEMAK,   XXXXXXX,  XXXXXXX, XXXXXXX, TERM_ON, TERM_OFF,  MU_OFF,   MU_ON,   XXXXXXX,
       PLOVER,  XXXXXXX, XXXXXXX,   XXXXXXX,   _______,  XXXXXXX, XXXXXXX, _______, XXXXXXX,   MUV_DE,   MUV_IN,  XXXXXXX
diff --git a/keyboards/planck/keymaps/smt/keymap.c b/keyboards/planck/keymaps/smt/keymap.c
index 55115b0c84..ff71e99377 100644
--- a/keyboards/planck/keymaps/smt/keymap.c
+++ b/keyboards/planck/keymaps/smt/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/spacebarracecar/keymap.c b/keyboards/planck/keymaps/spacebarracecar/keymap.c
index 5efced81a3..5b9f0eb444 100644
--- a/keyboards/planck/keymaps/spacebarracecar/keymap.c
+++ b/keyboards/planck/keymaps/spacebarracecar/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
 |         |Prev     |Pause    |Next     |LowerVol |RaiseVol |Mute     |         |         |         |         |         |
 |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-|RESET    |ESCT     |         |         |         |         |         |         |         |         |         |Game     |
+|QK_BOOT    |ESCT     |         |         |         |         |         |         |         |         |         |Game     |
 `-----------------------------------------------------------------------------------------------------------------------'
 */
 
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  KC_PGDN,  KC_UP,    KC_PGUP,  KC_HOME,  XXXXXXX,  XXXXXXX,  XXXXXXX,  GUIU,     XXXXXXX,  XXXXXXX,  KC_DEL,
   _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_END,   XXXXXXX,  XXXXXXX,  GUIL,     GUID,     GUIR,     EMOJI,    KC_ENT,
   _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  MU_ON,    XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
-  RESET,    CU_ESCT,  ALTF4,    _______,  _______,  KC_SPC,   CTLENT,   _______,  _______,  _______,  _______,  CU_GAME
+  QK_BOOT,  CU_ESCT,  ALTF4,    _______,  _______,  KC_SPC,   CTLENT,   _______,  _______,  _______,  _______,  CU_GAME
 )
 
 };
diff --git a/keyboards/planck/keymaps/steno/keymap.c b/keyboards/planck/keymaps/steno/keymap.c
index c2db4746cc..aac974f6a6 100644
--- a/keyboards/planck/keymaps/steno/keymap.c
+++ b/keyboards/planck/keymaps/steno/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, ST_BOLT, ST_GEM,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/stuartfong1/keymap.c b/keyboards/planck/keymaps/stuartfong1/keymap.c
index b15afb788e..c394a9db81 100644
--- a/keyboards/planck/keymaps/stuartfong1/keymap.c
+++ b/keyboards/planck/keymaps/stuartfong1/keymap.c
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        XXXXXXX, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, XXXXXXX, 
+        XXXXXXX, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, XXXXXXX, 
         XXXXXXX, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,   XXXXXXX, XXXXXXX, XXXXXXX, 
         XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, XXXXXXX, XXXXXXX, XXXXXXX, 
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/planck/keymaps/synth_sample/keymap.c b/keyboards/planck/keymaps/synth_sample/keymap.c
index 124c01cb05..397e64bbb3 100644
--- a/keyboards/planck/keymaps/synth_sample/keymap.c
+++ b/keyboards/planck/keymaps/synth_sample/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/synth_wavetable/keymap.c b/keyboards/planck/keymaps/synth_wavetable/keymap.c
index a5c5491ebd..c8c243ee20 100644
--- a/keyboards/planck/keymaps/synth_wavetable/keymap.c
+++ b/keyboards/planck/keymaps/synth_wavetable/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/tak3over/keymap.c b/keyboards/planck/keymaps/tak3over/keymap.c
index 1b9f91b0bd..7e8b953dd2 100644
--- a/keyboards/planck/keymaps/tak3over/keymap.c
+++ b/keyboards/planck/keymaps/tak3over/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LW] = LAYOUT_planck_grid(
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TRNS, RESET,   KC_INS,  KC_HOME, KC_PGUP, DF(_CM), KC_LEFT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_TRNS, QK_BOOT, KC_INS,  KC_HOME, KC_PGUP, DF(_CM), KC_LEFT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
   KC_TRNS, M(0),    KC_DEL,  KC_END,  KC_PGDN, DF(_QW), KC_DEL,  KC_UNDS, KC_PLUS, 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
 ),
diff --git a/keyboards/planck/keymaps/that_canadian/keymap.c b/keyboards/planck/keymaps/that_canadian/keymap.c
index 8974555fb9..a9762e6e88 100644
--- a/keyboards/planck/keymaps/that_canadian/keymap.c
+++ b/keyboards/planck/keymaps/that_canadian/keymap.c
@@ -91,14 +91,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | RESET|
+ * |      |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
   TSKMGR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
   _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
 /* Function
diff --git a/keyboards/planck/keymaps/thermal_printer/keymap.c b/keyboards/planck/keymaps/thermal_printer/keymap.c
index 9a1d0d0494..6e23014ac5 100644
--- a/keyboards/planck/keymaps/thermal_printer/keymap.c
+++ b/keyboards/planck/keymaps/thermal_printer/keymap.c
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, PRINT_ON, PRINT_OFF, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, PRINT_ON, PRINT_OFF, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/tk/keymap.c b/keyboards/planck/keymaps/tk/keymap.c
index 1ceb6cc5bb..c471141baa 100644
--- a/keyboards/planck/keymaps/tk/keymap.c
+++ b/keyboards/planck/keymaps/tk/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     */
     [_HYPER] = LAYOUT_planck_grid(
-        R_MODES, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RESET,
+        R_MODES, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  QK_BOOT,
         AU_TOG,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  MU_TOG,
         CK_TOGG, KC_F21,  KC_F22,  KC_F23,  KC_F24,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_MOD,
         XXXXXXX, KC_WAKE, KC_SLEP, KC_PSCR, XXXXXXX, BASE,    BASE,    XXXXXXX, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
index d888fb7b05..89175e0115 100644
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ b/keyboards/planck/keymaps/tom/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    C(G(S(KC_4))), RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+    C(G(S(KC_4))), QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______,  _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/tomkonidas/keymap.c b/keyboards/planck/keymaps/tomkonidas/keymap.c
index 39933e8a21..e0232f69ec 100644
--- a/keyboards/planck/keymaps/tomkonidas/keymap.c
+++ b/keyboards/planck/keymaps/tomkonidas/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/tong92/keymap.c b/keyboards/planck/keymaps/tong92/keymap.c
index de43024c40..cf535d6c8c 100644
--- a/keyboards/planck/keymaps/tong92/keymap.c
+++ b/keyboards/planck/keymaps/tong92/keymap.c
@@ -131,7 +131,7 @@ KC_TRNS,_______            ,_______             ,MOUSE  ,MOUSE           ,XXXXXX
 ),
 /* 10: mouse layer
 * ,-----------------------------------------------------------------------.
-* |     |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     |RESET|
+* |     |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     |QK_BOOT|
 * |-----------------------------------------------------------------------|
 * |     |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |     |
 * |-----------------------------------------------------------------------|
@@ -141,7 +141,7 @@ KC_TRNS,_______            ,_______             ,MOUSE  ,MOUSE           ,XXXXXX
 * `-----------------------------------------------------------------------'
 */
 [_MOUSE] = LAYOUT_planck_grid(
-XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,RESET,
+XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,QK_BOOT,
 XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,XXXXXXX,KC_BTN1,KC_WH_D,KC_BTN2,XXXXXXX,XXXXXXX,
 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_ACL0,KC_ACL1,KC_ACL2,XXXXXXX,WINDOW,
 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EXT_MOUSE,EXT_MOUSE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,MAC
diff --git a/keyboards/planck/keymaps/ttys0/keymap.c b/keyboards/planck/keymaps/ttys0/keymap.c
index ed392bfb93..9dd1fa4ffd 100644
--- a/keyboards/planck/keymaps/ttys0/keymap.c
+++ b/keyboards/planck/keymaps/ttys0/keymap.c
@@ -128,7 +128,7 @@
 #define move MO(MOVE)
 #define func MO(FUNC)
 
-#define rset RESET
+#define rset QK_BOOT
 #define powr KC_POWER
 
 #define ____ KC_TRNS
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index b4c0f9af52..e6d174fbce 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              * `-----------------------------------------------------------------------------------'
              */
 
-          RESET,   _______, _______, _______,          _______,          LALT(LCTL(KC_7)), LALT(LCTL(KC_8)), _______,          _______,           _______, LALT(LCTL(KC_L)), _______,
+          QK_BOOT, _______, _______, _______,          _______,          LALT(LCTL(KC_7)), LALT(LCTL(KC_8)), _______,          _______,           _______, LALT(LCTL(KC_L)), _______,
           _______, _______, _______, _______,          _______,          LALT(LCTL(KC_U)), LALT(LCTL(KC_I)), LALT(LCTL(KC_H)), _______,           _______, _______,          _______,
           _______, _______, _______, LALT(LCTL(KC_J)), LALT(LCTL(KC_K)), _______,          _______,          _______,          _______,           _______, _______,          LALT(LCTL(KC_ENTER)),
           TO(0),   TO(4),   _______, _______,          _______,          _______,          KC_NO,            _______,          KC_AUDIO_VOL_DOWN, KC_F14,  KC_F15,           KC_AUDIO_VOL_UP
diff --git a/keyboards/planck/keymaps/unagi/keymap.c b/keyboards/planck/keymaps/unagi/keymap.c
index 1fc1814796..e75e7386bc 100644
--- a/keyboards/planck/keymaps/unagi/keymap.c
+++ b/keyboards/planck/keymaps/unagi/keymap.c
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/unicode/keymap.c b/keyboards/planck/keymaps/unicode/keymap.c
index 215acaa3ab..24e7a7d901 100644
--- a/keyboards/planck/keymaps/unicode/keymap.c
+++ b/keyboards/planck/keymaps/unicode/keymap.c
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/vaire/keymap.c b/keyboards/planck/keymaps/vaire/keymap.c
index 71cbcd8bd0..0bd4d5893f 100644
--- a/keyboards/planck/keymaps/vaire/keymap.c
+++ b/keyboards/planck/keymaps/vaire/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_planck_grid(
     TO(0),      KC_LSCR,    	WIN_LEFT,       KC_MS_WH_UP,    WIN_RIGHT,  	KC_TRNS,        KC_TRNS,    	KC_MS_BTN1, 	KC_MS_U,    	KC_MS_BTN2,    	KC_TRNS,        KC_TRNS, 
     KC_TRNS,    KC_INS,    	    KC_MS_WH_LEFT,  KC_MS_WH_DOWN,  KC_MS_WH_RIGHT, KC_TRNS,        KC_TRNS,    	KC_MS_L,    	KC_MS_D,    	KC_MS_R,        KC_TRNS,        KC_TRNS, 
-    RESET,      KC_APP,    	    KC_MS_ACCEL0,   KC_MS_ACCEL0,   KC_MS_ACCEL0,   KC_TRNS,        KC_TRNS,    	TO(0),      	TO(1),      	TO(2),          TO(3),          TO(4), 
+    QK_BOOT,    KC_APP,    	    KC_MS_ACCEL0,   KC_MS_ACCEL0,   KC_MS_ACCEL0,   KC_TRNS,        KC_TRNS,    	TO(0),      	TO(1),      	TO(2),          TO(3),          TO(4), 
     TO(0),      KC_MENU,    	KC_TRNS,        KC_TRNS,        KC_LALT,        KC_LCTL,        KC_TRNS,     	KC_TRNS,    	KC_TRNS,    	KC_LEFT,        KC_DOWN,   	KC_RCTL),
 
   LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/vxid/keymap.c b/keyboards/planck/keymaps/vxid/keymap.c
index 0494056ea2..397befcdda 100644
--- a/keyboards/planck/keymaps/vxid/keymap.c
+++ b/keyboards/planck/keymaps/vxid/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_planck_grid(
-    RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/winternebs/keymap.c b/keyboards/planck/keymaps/winternebs/keymap.c
index 4bb97b27ac..614d1c1e92 100755
--- a/keyboards/planck/keymaps/winternebs/keymap.c
+++ b/keyboards/planck/keymaps/winternebs/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------
- * |RESET |DEBUG|       |Aud on|Audoff|      |      |      |      |      |      |Reset |
+ * |QK_BOOT |DEBUG|       |Aud on|Audoff|      |      |      |      |      |      |Reset |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |QWERTY|WORKMAN|      |      | Help |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    RESET,   DEBUG,   _______, _______, AU_ON,    AU_OFF, _______, _______, _______, _______, _______, _______ ,
+    QK_BOOT, DEBUG,   _______, _______, AU_ON,    AU_OFF, _______, _______, _______, _______, _______, _______ ,
     _______, _______, _______, QWERTY, WORKMAN , _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  KC_VOLU, KC_MPLY,
     MAGIC_TOGGLE_NKRO, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/planck/keymaps/xjtian/keymap.c b/keyboards/planck/keymaps/xjtian/keymap.c
index f3287738d3..b338ddee0e 100644
--- a/keyboards/planck/keymaps/xjtian/keymap.c
+++ b/keyboards/planck/keymaps/xjtian/keymap.c
@@ -99,13 +99,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |Rewind| Vol- | Stop | Play | Vol+ | Skip |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |RESET |      |      |      |      |      |      |      |      |      |      |      |
+ * |QK_BOOT |      |      |      |      |      |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
     KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_MRWD, KC_VOLD, KC_MSTP, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_MRWD, KC_VOLD, KC_MSTP, KC_MPLY, KC_VOLU, KC_MFFD, KC_NO,   KC_NO, KC_NO,
-    RESET, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO
+    QK_BOOT, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO
 ),
 };
diff --git a/keyboards/planck/keymaps/yang/keymap.c b/keyboards/planck/keymaps/yang/keymap.c
index e9c69c9989..0a77b2be2f 100644
--- a/keyboards/planck/keymaps/yang/keymap.c
+++ b/keyboards/planck/keymaps/yang/keymap.c
@@ -36,13 +36,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RS] = LAYOUT_planck_grid( /* RAISE */
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), RESET,   KC_TRNS,
+  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 [_LW] = LAYOUT_planck_grid( /* LOWER */
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), RESET,   KC_TRNS,
+  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 [_RGB] = LAYOUT_planck_grid( /* RGBLIGHT */
diff --git a/keyboards/planck/keymaps/zach/keymap.c b/keyboards/planck/keymaps/zach/keymap.c
index ba0338e39a..f4a79e0108 100644
--- a/keyboards/planck/keymaps/zach/keymap.c
+++ b/keyboards/planck/keymaps/zach/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   UNIWIN,  XXXXXXX, XXXXXXX, PENGY,   DUCK,    KC_INS,  KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX,
   UNILIN,  XXXXXXX, XXXXXXX, RANDIG,  RANDIG,  SWCOLE,  COLEMAK, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX,
   _______, CADKEY,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
-  _______, _______, _______, _______, _______, RESET,   RESET,   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+  _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 ),
 
 [_UNICODES] = LAYOUT_planck_grid( /* UNICODES - Extra layer for unicode stuff */
diff --git a/keyboards/planck/keymaps/zrichard/keymap.c b/keyboards/planck/keymaps/zrichard/keymap.c
index f3f60b7d1d..6494231a2a 100755
--- a/keyboards/planck/keymaps/zrichard/keymap.c
+++ b/keyboards/planck/keymaps/zrichard/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
   | XXXXXX | BRTOG  | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | VOICE+ | MACRO  |
+  | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | QK_BOOT  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | VOICE+ | MACRO  |
   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
   | XXXXXX | XXXXXX | XXXXXX | XXXXXX | LOWER  | XXXXXX | XXXXXX | UPPER  | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
   '-----------------------------------------------------------------------------------------------------------'
@@ -214,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [LAYER_ADJUST] = LAYOUT_planck_grid(
    XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, MU_TOG , AU_TOG  ,
    XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET  , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , MY_MACRO,
+   XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, QK_BOOT, XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , MY_MACRO,
    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP
 ),
 
diff --git a/keyboards/planck/thk/keymaps/thk/keymap.c b/keyboards/planck/thk/keymaps/thk/keymap.c
index ae2420250e..e7d58d2d0b 100644
--- a/keyboards/planck/thk/keymaps/thk/keymap.c
+++ b/keyboards/planck/thk/keymaps/thk/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
   _______, _______, _______,  _______,   _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
   _______, _______,  _______,  _______,   _______,  _______,   _______,  TERM_ON, TERM_OFF, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c b/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
index a3450118a1..6258e8d7a9 100644
--- a/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	//Layer4, soft reset on Tab
 	[4] = LAYOUT(
 		KC_NO, 			   KC_NO, 	 KC_NO,    KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 	 KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 		KC_NO, 	 KC_NO, 		KC_NO, 
-		RESET, 			   KC_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,
+		QK_BOOT, 			   KC_NO, 	 KC_NO,    KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 	 KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 		KC_TRNS, 				KC_NO,
 		KC_NO, 			   KC_NO, 	 KC_NO,    KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 	 KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 				KC_NO, 					KC_NO, 
 		KC_NO, KC_NO, 	   KC_NO, 	 KC_NO,    KC_NO, 	KC_NO, 	 KC_NO,	  KC_NO, 	KC_NO, 	 KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO,								KC_NO, 
 		KC_NO, 			   KC_NO, 	 KC_NO,    KC_NO, 			 KC_NO,   			KC_NO, 	 KC_NO, 	KC_NO, 	 		     KC_NO, KC_NO, KC_NO),
diff --git a/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json b/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
index 9d7caa327d..fd28fc3f48 100644
--- a/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
+++ b/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
@@ -1 +1 @@
-[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_BSPC", "KC_PSCR", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "MO(3)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_PGDN", "KC_UP", "KC_NO", "KC_LCTL", "KC_LALT", "KC_BSPC", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_HUD", "RGB_HUI", "KC_NO", "KC_NO", "KC_NO", "BL_TOGG", "BL_DEC", "BL_INC", "BL_STEP", "KC_NO", "KC_NO", "MO(4)", "KC_NO", "KC_TRNS", "RGB_TOG", "RGB_RMOD", "RGB_MOD", "RGB_VAD", "RGB_VAI", "KC_MSTP", "KC_MPLY", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_SAD", "RGB_SAI", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RESET", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_BSPC", "KC_PSCR", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "MO(3)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_PGDN", "KC_UP", "KC_NO", "KC_LCTL", "KC_LALT", "KC_BSPC", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_HUD", "RGB_HUI", "KC_NO", "KC_NO", "KC_NO", "BL_TOGG", "BL_DEC", "BL_INC", "BL_STEP", "KC_NO", "KC_NO", "MO(4)", "KC_NO", "KC_TRNS", "RGB_TOG", "RGB_RMOD", "RGB_MOD", "RGB_VAD", "RGB_VAI", "KC_MSTP", "KC_MPLY", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_SAD", "RGB_SAI", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "QK_BOOT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
index ed3d625e47..5dcd0f8a1b 100644
--- a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_NO,            KC_LALT, KC_LGUI,          KC_NO,            KC_SPC,           KC_NO,   KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
 
   LAYOUT(
-	KC_PWR,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, RESET,
+	KC_PWR,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, QK_BOOT,
     KC_CAPS,          RGB_RMOD,RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_TOG, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,         KC_TRNS,
     KC_TRNS,          KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_TRNS,         KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,                  KC_TRNS,
diff --git a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c b/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
index e439d4462e..193185e58d 100644
--- a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
+++ b/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT_minila(
-        RESET,   KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        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_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
diff --git a/keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c
index da328fff04..a072dfceca 100644
--- a/keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c
@@ -22,6 +22,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(/* Base */
                  C(KC_C), KC_BTN1, KC_BTN3, LT(1, KC_BTN2), C(KC_V), KC_BTN4, KC_BTN5, DPI_CONFIG),
     [1] = LAYOUT(/* Base */
-                 _______, DRAG_SCROLL, _______, _______, _______, _______, _______, RESET),
+                 _______, DRAG_SCROLL, _______, _______, _______, _______, _______, QK_BOOT),
 
 };
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c
index 533597b478..6c3a38d127 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c
@@ -107,7 +107,7 @@ uint32_t command_timeout(uint32_t trigger_time, void *cb_arg) {
             break;
         case CMD_RESET:
 #           ifdef CONSOLE_ENABLE
-            uprint("RESET)\n");
+            uprint("QK_BOOT)\n");
 #           endif
             reset_keyboard();
             break;
diff --git a/keyboards/preonic/keymaps/0xdec/keymap.c b/keyboards/preonic/keymaps/0xdec/keymap.c
index 28277bd5f4..4393ab9f69 100644
--- a/keyboards/preonic/keymaps/0xdec/keymap.c
+++ b/keyboards/preonic/keymaps/0xdec/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      | BACK | STOP | RFRSH| FRWRD| MUTE |BL TOG| HOME | PGDN | PGUP | END  |INSERT|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RESET|      |      |      |      | DEL  |      |      |      |      |      |      |
+ * | QK_BOOT|      |      |      |      | DEL  |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_preonic_grid( \
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_INC ,COLEMAK,GAME   ,MU_TOG ,KC_MENU,KC_SLCK, \
   KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DEC ,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_PAUS, \
   XXXXXXX,KC_WBAK,KC_WSTP,KC_WREF,KC_WFWD,KC_MUTE,BL_TOGG,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_INS,  \
-  RESET  ,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______  \
+  QK_BOOT,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______  \
 )
 
 };
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
index ef4707f64b..c4e0f132d8 100644
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, _______,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, _______,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
index a572770788..b20568506c 100644
--- a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
+++ b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
@@ -188,10 +188,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   _______, _______,  QWERTY, COLEMAK,  DVORAK, _______,          _______,        _______, _______, _______, _______, _______, \
-  _______, RESET,   _______, AG_NORM, AG_SWAP, _______,          _______,        _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, _______, AG_NORM, AG_SWAP, _______,          _______,        _______, _______, _______, _______, KC_DEL,  \
   _______, _______, _______, AU_ON,   AU_OFF,  MI_ON,            MI_OFF,         QWERTY,  COLEMAK,  DVORAK, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_SYSTEM_SLEEP,  KC_SYSTEM_WAKE, ARROW,      GAME,  NUMPAD, _______, _______, \
-  _______, _______, _______, _______, _______,              RESET,                _______, _______, _______, _______, _______  \
+  _______, _______, _______, _______, _______,              QK_BOOT,              _______, _______, _______, _______, _______  \
 )
 
 
diff --git a/keyboards/preonic/keymaps/arkag/keymap.c b/keyboards/preonic/keymaps/arkag/keymap.c
index 5e50c584af..c2a32277ed 100644
--- a/keyboards/preonic/keymaps/arkag/keymap.c
+++ b/keyboards/preonic/keymaps/arkag/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     M_USSR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, BL_TOGG, BL_STEP, BL_INC,  BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______,
     RGB_M_P, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______,
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
 };
 
diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c
index 761beb861f..edf96db2e9 100644
--- a/keyboards/preonic/keymaps/badger/keymap.c
+++ b/keyboards/preonic/keymaps/badger/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST_ORTHO]   = LAYOUT_preonic_2x2u(
       KC_ESC,   AU_ON,    AU_OFF,   CK_TOGG,  CK_UP,    CK_DOWN,  CK_RST,   MU_ON,    MU_OFF,   MU_TOG,   MU_MOD,   KC_DEL,  \
-      _______,  NK_ON,    NK_OFF,   EEP_RST,  RESET,    KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
+      _______,  NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
       _______,  GE_SWAP,  GE_NORM,  DEBUG,    AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
       _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
       _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______)
diff --git a/keyboards/preonic/keymaps/bghull/keymap.c b/keyboards/preonic/keymaps/bghull/keymap.c
index 9a3ca0af4f..eba6cd4f85 100644
--- a/keyboards/preonic/keymaps/bghull/keymap.c
+++ b/keyboards/preonic/keymaps/bghull/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      | Mute | VolD | VolU |  `~  |   _  |  =   |   1  |   2  |   3  | PgUp | \  | |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | RESET|      |      |             |      |   .  | Home | PgDn | End  |
+ * |      |      | QK_BOOT|      |      |             |      |   .  | Home | PgDn | End  |
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_preonic_grid(
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_BTN2, KC_MS_U, KC_BTN1,  KC_WH_U, KC_LPRN, KC_RPRN,    KC_7,     KC_8,    KC_9,    KC_0, _______,
   _______, KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D, KC_LBRC, KC_RBRC,    KC_4,     KC_5,    KC_6, KC_PPLS, KC_MINS,
   _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_GRAVE, KC_UNDS,  KC_EQL,    KC_1,     KC_2,    KC_3, KC_PGUP, KC_BSLS,
-  _______, XXXXXXX, RESET, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
+  _______, XXXXXXX, QK_BOOT, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
 )
 
 };
diff --git a/keyboards/preonic/keymaps/blake-newman/keymap.c b/keyboards/preonic/keymaps/blake-newman/keymap.c
index 2b50eaf6b9..53a4cf78f0 100644
--- a/keyboards/preonic/keymaps/blake-newman/keymap.c
+++ b/keyboards/preonic/keymaps/blake-newman/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [_ADJUST] = LAYOUT_preonic_1x2uC( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
-    _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,  \
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,  \
     KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  NUMPAD,  KC_INS,  \
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
diff --git a/keyboards/preonic/keymaps/boy314/keymap.c b/keyboards/preonic/keymaps/boy314/keymap.c
index 04404f69f9..67d1fe4cf8 100644
--- a/keyboards/preonic/keymaps/boy314/keymap.c
+++ b/keyboards/preonic/keymaps/boy314/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  DVORAK,  _______, _______, _______, _______, \
   _______, ARROWS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/codecoffeecode/keymap.c b/keyboards/preonic/keymaps/codecoffeecode/keymap.c
index 9264927ecb..c41c9757cf 100644
--- a/keyboards/preonic/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/preonic/keymaps/codecoffeecode/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [2] = LAYOUT_preonic_1x2uC(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, KC_F12,  _______,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, KC_F12,  _______,
   _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/cranium/keymap.c b/keyboards/preonic/keymaps/cranium/keymap.c
index 2c1337d843..8267a0a4be 100644
--- a/keyboards/preonic/keymaps/cranium/keymap.c
+++ b/keyboards/preonic/keymaps/cranium/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP,
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, _______,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, _______,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, KC_PSCR
diff --git a/keyboards/preonic/keymaps/davidrambo/keymap.c b/keyboards/preonic/keymaps/davidrambo/keymap.c
index 322089d917..823bcb6862 100755
--- a/keyboards/preonic/keymaps/davidrambo/keymap.c
+++ b/keyboards/preonic/keymaps/davidrambo/keymap.c
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, C_TAB  , A_LEFT , KC_UP  , A_RGHT , KC_DEL , _______,
   _______, _______, _______, _______, _______, _______,S(C_TAB), KC_LEFT, KC_DOWN, KC_RGHT, C_TAB  , _______,
   _______, _______, _______, _______, _______, _______, G_TAB  , A_BSPC , KC_HOME, KC_END , G_GRV  , _______,
-  RESET  , _______, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, _______, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______
 ),
 
 [_NAVPC] = LAYOUT_preonic_grid(
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, C_TAB  , C_LEFT , KC_UP  , C_RGHT , KC_DEL , _______,
     _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
     _______, _______, _______, _______, _______, _______, A_TAB  , C_BSPC , KC_HOME, KC_END , G_GRV  , _______,
-    RESET  , _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______, _______
+    QK_BOOT, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______, _______
 ),
   
 [_NAVQUD] = LAYOUT_preonic_grid(
diff --git a/keyboards/preonic/keymaps/dlaroe/keymap.c b/keyboards/preonic/keymaps/dlaroe/keymap.c
index 888a21c063..796ef64550 100644
--- a/keyboards/preonic/keymaps/dlaroe/keymap.c
+++ b/keyboards/preonic/keymaps/dlaroe/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, RESET, M(0),  _______, MAGIC_TOGGLE_NKRO, _______, _______, _______, LALT(LCTL(KC_DEL)),
+  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, MAGIC_TOGGLE_NKRO, _______, _______, _______, LALT(LCTL(KC_DEL)),
   KC_CAPS, ARROW, _______, AU_ON,   AU_OFF,  _______, AG_SWAP, AG_NORM,  KC_PSCR, KC_SLCK, KC_PAUS,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV,  KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
   BACKLIT, _______, _______, _______, _______,     KC_MPLY,     _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP
diff --git a/keyboards/preonic/keymaps/drasbeck/keymap.c b/keyboards/preonic/keymaps/drasbeck/keymap.c
index ae4804ce3f..a3bfbb4760 100644
--- a/keyboards/preonic/keymaps/drasbeck/keymap.c
+++ b/keyboards/preonic/keymaps/drasbeck/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/dudeofawesome/keymap.c b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
index 812bf35a20..932b76df3e 100644
--- a/keyboards/preonic/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/ekis_isa/keymap.c b/keyboards/preonic/keymaps/ekis_isa/keymap.c
index b256a6bff7..ff2bfdb0f1 100644
--- a/keyboards/preonic/keymaps/ekis_isa/keymap.c
+++ b/keyboards/preonic/keymaps/ekis_isa/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/elisiano/keymap.c b/keyboards/preonic/keymaps/elisiano/keymap.c
index d885d1f028..c7ec076ca7 100644
--- a/keyboards/preonic/keymaps/elisiano/keymap.c
+++ b/keyboards/preonic/keymaps/elisiano/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12,
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON,    TERM_OFF, _______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON,    TERM_OFF, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,     COLEMAK,  DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TG(_MOUSE), _______,  _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______
diff --git a/keyboards/preonic/keymaps/fig-r/keymap.c b/keyboards/preonic/keymaps/fig-r/keymap.c
index 86c87b0aca..b031a4027e 100644
--- a/keyboards/preonic/keymaps/fig-r/keymap.c
+++ b/keyboards/preonic/keymaps/fig-r/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/fsck/keymap.c b/keyboards/preonic/keymaps/fsck/keymap.c
index dea1523600..cdb5bf1acc 100644
--- a/keyboards/preonic/keymaps/fsck/keymap.c
+++ b/keyboards/preonic/keymaps/fsck/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/jacwib/keymap.c b/keyboards/preonic/keymaps/jacwib/keymap.c
index e4cd76b84d..4cacafb120 100644
--- a/keyboards/preonic/keymaps/jacwib/keymap.c
+++ b/keyboards/preonic/keymaps/jacwib/keymap.c
@@ -165,9 +165,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, \
-  _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, TO(0),   TO(5),   _______, _______, RESET,   \
+  _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, TO(0),   TO(5),   _______, _______, QK_BOOT, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 
diff --git a/keyboards/preonic/keymaps/keelhauler/keymap.c b/keyboards/preonic/keymaps/keelhauler/keymap.c
index dc0cffe094..d6adc08adb 100644
--- a/keyboards/preonic/keymaps/keelhauler/keymap.c
+++ b/keyboards/preonic/keymaps/keelhauler/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/kjwon15/keymap.c b/keyboards/preonic/keymaps/kjwon15/keymap.c
index 2f25cdfa85..45db32be92 100644
--- a/keyboards/preonic/keymaps/kjwon15/keymap.c
+++ b/keyboards/preonic/keymaps/kjwon15/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  KC_LOCK, RESET,   CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
+  KC_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
   _______, AU_ON,   AU_OFF,  KC_BTN2, KC_BTN1, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_ACL0, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_ACL1, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL2  \
diff --git a/keyboards/preonic/keymaps/kuatsure/keymap.c b/keyboards/preonic/keymaps/kuatsure/keymap.c
index 5bd7321d49..becb8dc559 100644
--- a/keyboards/preonic/keymaps/kuatsure/keymap.c
+++ b/keyboards/preonic/keymaps/kuatsure/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      | MAKE | FLSH |      |      |      |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | RESET| DEBUG|      |      |Aud on|AudOff|      |      |      |      |      |
+ * |      | QK_BOOT| DEBUG|      |      |Aud on|AudOff|      |      |      |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      | VRSN |      |      |MusMod|Mus on|MusOff|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid_wrapper( \
   ____________FUNCTION_1____________, ____________FUNCTION_2____________, ____________FUNCTION_3____________, \
   _______, KB_MAKE, KB_FLSH, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, RESET,   DEBUG,   _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, \
+  _______, QK_BOOT, DEBUG,   _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, \
   _______, KB_VRSN, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,  GAME,    _______, _______  \
 ),
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index 62943a420c..d9df9f16ef 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -277,7 +277,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_preonic_grid( \
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,
-        KC_TAB,  RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, XXXXXXX,
+        KC_TAB,  QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, XXXXXXX,
     /*_______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,	 QWERTY,  COLEMAK, DVORAK,  _______, _______, \ Remove this if adding Colemak and Dvorak*/
         _______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,   QWERTY,  QWWIN,   _______, _______, KC_F12,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
diff --git a/keyboards/preonic/keymaps/mechmaster48/keymap.c b/keyboards/preonic/keymaps/mechmaster48/keymap.c
index ede3765238..9fcb737490 100644
--- a/keyboards/preonic/keymaps/mechmaster48/keymap.c
+++ b/keyboards/preonic/keymaps/mechmaster48/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/mguterl/keymap.c b/keyboards/preonic/keymaps/mguterl/keymap.c
index 87a9cd32b3..184c111aef 100644
--- a/keyboards/preonic/keymaps/mguterl/keymap.c
+++ b/keyboards/preonic/keymaps/mguterl/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  TG_GAME, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  TG_GAME, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/mikethetiger/keymap.c b/keyboards/preonic/keymaps/mikethetiger/keymap.c
index 36e09e5501..1fb41129cd 100644
--- a/keyboards/preonic/keymaps/mikethetiger/keymap.c
+++ b/keyboards/preonic/keymaps/mikethetiger/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/muzfuz/keymap.c b/keyboards/preonic/keymaps/muzfuz/keymap.c
index c0c7ae07e6..6baf32a51e 100644
--- a/keyboards/preonic/keymaps/muzfuz/keymap.c
+++ b/keyboards/preonic/keymaps/muzfuz/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [_ADJUST] = LAYOUT_preonic_grid(
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
-        _______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+        _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
         _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
         _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index ef01851690..03388d785b 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -228,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC (
-  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   RESET,
+  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TERM_ON, TERM_OFF,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSHIFT,
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index 4b28058540..a54b547d8c 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -204,7 +204,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_2x2u (
-  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   RESET,
+  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TERM_ON, TERM_OFF,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSHIFT,
diff --git a/keyboards/preonic/keymaps/nikchi/keymap.c b/keyboards/preonic/keymaps/nikchi/keymap.c
index 34d837cd64..861c2ae03b 100644
--- a/keyboards/preonic/keymaps/nikchi/keymap.c
+++ b/keyboards/preonic/keymaps/nikchi/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/pcurt854/keymap.c b/keyboards/preonic/keymaps/pcurt854/keymap.c
index 4620f32390..9d82aa9fd4 100644
--- a/keyboards/preonic/keymaps/pcurt854/keymap.c
+++ b/keyboards/preonic/keymaps/pcurt854/keymap.c
@@ -212,8 +212,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |      | F11  | F12  | F13  | F14  | F15  | F16  | F17  | F18  | F19  | F20  |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Qwerty|Colemk|Dvorak|      |      |      |      |      |      |Print |RESET |
- * |      |      |      |      |      |      |      |      |      |      |screen|RESET |
+ * |      |Qwerty|Colemk|Dvorak|      |      |      |      |      |      |Print |QK_BOOT |
+ * |      |      |      |      |      |      |      |      |      |      |screen|QK_BOOT |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |Sleep |show  |      |      |finder|mv win|      |Lock  |      |      |
  * |      |      |      |Dsktp |      |      |Hddn  |clkw  |      |screen|      |      |
@@ -227,7 +227,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   XXXXXXX, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  XXXXXXX,
-  XXXXXXX, QWERTY,  COLEMAK, DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SCMD(KC_5), RESET,
+  XXXXXXX, QWERTY,  COLEMAK, DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SCMD(KC_5), QK_BOOT,
   XXXXXXX, XXXXXXX, C(LCMD(KC_PAUSE)),
                              LCMD(KC_F4),
                                       XXXXXXX, XXXXXXX, SCMD(KC_DOT),
diff --git a/keyboards/preonic/keymaps/pezhore/keymap.c b/keyboards/preonic/keymaps/pezhore/keymap.c
index c41fb4500f..46addbca48 100644
--- a/keyboards/preonic/keymaps/pezhore/keymap.c
+++ b/keyboards/preonic/keymaps/pezhore/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-  _______,  RESET,    DEBUG,    _______,  _______,  _______,  _______,  TERM_ON,  TERM_OFF, _______,  _______,  KC_DEL,
+  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  TERM_ON,  TERM_OFF, _______,  _______,  KC_DEL,
   _______,  _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  _______,  _______,  _______,  _______,  _______,
   _______,  MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/preonic/keymaps/pitty/keymap.c b/keyboards/preonic/keymaps/pitty/keymap.c
index 25c648eea6..249ff16a76 100644
--- a/keyboards/preonic/keymaps/pitty/keymap.c
+++ b/keyboards/preonic/keymaps/pitty/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
diff --git a/keyboards/preonic/keymaps/pvillano/keymap.c b/keyboards/preonic/keymaps/pvillano/keymap.c
index 093948e093..5800a9490b 100644
--- a/keyboards/preonic/keymaps/pvillano/keymap.c
+++ b/keyboards/preonic/keymaps/pvillano/keymap.c
@@ -92,7 +92,7 @@
    */
   [_FUN] = LAYOUT_preonic_grid(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, _______, _______, KC_DEL,
-      _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______, _______, _______,   RESET, _______,
+      _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______, _______, _______, QK_BOOT, _______,
       _______, KC_F9,   KC_F10,  KC_F11,  KC_F12, TG(_GAME),_______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, KC_NLCK, MU_TOG,  _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
index 0f896700e6..531b08285f 100644
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ b/keyboards/preonic/keymaps/senseored/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  TO(_GAMEMODE), RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  TO(_GAMEMODE), QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
diff --git a/keyboards/preonic/keymaps/smt/keymap.c b/keyboards/preonic/keymaps/smt/keymap.c
index bb561a72cf..3600a15e66 100644
--- a/keyboards/preonic/keymaps/smt/keymap.c
+++ b/keyboards/preonic/keymaps/smt/keymap.c
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/that_canadian/keymap.c b/keyboards/preonic/keymaps/that_canadian/keymap.c
index d1d274f293..5b5e8266a9 100644
--- a/keyboards/preonic/keymaps/that_canadian/keymap.c
+++ b/keyboards/preonic/keymaps/that_canadian/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |RESET |
+ * |      |      |      |      |      |      |      |      |      |      |      |QK_BOOT |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   TSKMGR,  _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CALTDEL, \
   _______, _______, _______, AU_ON,   AU_OFF,      AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
   _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, RESET    \
+  _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, QK_BOOT    \
 ),
 
 /* Function
diff --git a/keyboards/preonic/keymaps/trigotometry/keymap.c b/keyboards/preonic/keymaps/trigotometry/keymap.c
index 31cee4a4cd..f44c8becbe 100644
--- a/keyboards/preonic/keymaps/trigotometry/keymap.c
+++ b/keyboards/preonic/keymaps/trigotometry/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, XXXXXXX, XXXXXXX, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
   _______, KC_PIPE, KC_LBRC, KC_LCBR, KC_LPRN, KC_LABK, KC_RABK, KC_RPRN, KC_RCBR, KC_RBRC, KC_PIPE, XXXXXXX, \
   _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_PPLS, KC_PMNS, KC_UNDS, KC_EQL,  XXXXXXX, XXXXXXX, XXXXXXX, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, QWERTY ,  GAMING, XXXXXXX, RESET    \
+  _______, _______, _______, _______, _______, _______, _______, _______, QWERTY ,  GAMING, XXXXXXX, QK_BOOT    \
 )
 
 };
diff --git a/keyboards/preonic/keymaps/ttys0/keymap.c b/keyboards/preonic/keymaps/ttys0/keymap.c
index 577e69e741..38d816de48 100644
--- a/keyboards/preonic/keymaps/ttys0/keymap.c
+++ b/keyboards/preonic/keymaps/ttys0/keymap.c
@@ -127,7 +127,7 @@
 #define move MO(MOVE)
 #define func MO(FUNC)
 
-#define rset RESET
+#define rset QK_BOOT
 #define powr KC_POWER
 
 #define ____ KC_TRNS
diff --git a/keyboards/preonic/keymaps/zach/keymap.c b/keyboards/preonic/keymaps/zach/keymap.c
index 8e29d59731..7423f9639d 100644
--- a/keyboards/preonic/keymaps/zach/keymap.c
+++ b/keyboards/preonic/keymaps/zach/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   UNILIN,  SUPA2,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,    KC_F2,   KC_F3,   KC_F4,  XXXXXXX, \
   XXXXXXX, DEGREE,  IBANG,   LAROW,   RAROW,   SWCOLE,  COLEMAK, KC_F5,    KC_F6,   KC_F7,   KC_F8,  BL_INC,  \
   _______, CADKEY,  MICRO,   WOMEGA,  OMEGA,   XXXXXXX, XXXXXXX, KC_F9,    KC_F10,  KC_F11,  KC_F12, BL_DEC,  \
-  _______, _______, _______, _______, _______,      RESET,       _______,  XXXXXXX, MUV_DE,  MUV_IN, BL_TOGG  \
+  _______, _______, _______, _______, _______,      QK_BOOT,     _______,  XXXXXXX, MUV_DE,  MUV_IN, BL_TOGG  \
 ),
 
 [_UNICODES] = LAYOUT_preonic_1x2uC(  /* UNICODES - Extra layer for unicode stuff */
diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
index a92fcbfec6..29b2f3214b 100644
--- a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT( \
-        QM_MAKE, _______, _______, EEP_RST, RESET,   _______,         _______, _______, _______, _______, _______, _______, _______, \
+        QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______,         _______, _______, _______, _______, _______, _______, _______, \
         _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______,          _______, \
         _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, \
         _______, _______,                   _______, _______,         _______,          _______,                   _______, _______  \
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
index 7b10be8c01..5dbdc4cfc8 100644
--- a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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,
-		RESET,     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
     )
 };
 
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
index 099d6e0325..e02cedcec9 100644
--- a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,  KC_DEL,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_ENT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    RESET,   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
   )
 };
 
diff --git a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
index 7724c2b435..3ad641179a 100644
--- a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, 				  KC_TRNS, KC_RGUI, KC_RALT, KC_RCTL
 		),
 	[_FUNC] = LAYOUT(
-		RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,    KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
+		QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,    KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
 		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS, KC_TRNS, KC_TRNS, 
 		KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_RSFT, 
 		KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS,          KC_TRNS, KC_RGUI, KC_RALT, KC_RCTL
diff --git a/keyboards/primekb/prime_m/keymaps/numpad/keymap.c b/keyboards/primekb/prime_m/keymaps/numpad/keymap.c
index 35ff30a0c8..80c572db1b 100644
--- a/keyboards/primekb/prime_m/keymaps/numpad/keymap.c
+++ b/keyboards/primekb/prime_m/keymaps/numpad/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, TG(1),      KC_P0,       KC_PDOT, KC_PENT
     ),
 	[1] = LAYOUT_numpad_5x6(
-		RESET,   KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
+		QK_BOOT, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
 		KC_A,    KC_B,    KC_HOME, KC_UP,   KC_PGUP,
 		KC_C,    KC_D,    KC_LEFT, KC_NO,   KC_RGHT, KC_PPLS,
 		KC_E,    KC_F,    KC_END,  KC_DOWN, KC_PGDN,
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
index 2a320aecf2..e8ca64c908 100644
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      | PgUp | Home |  Up  | End  |      |      | Vol- | Vol+ | Mute |      |      |      |      |      |      |
  * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | PgDn | Left | Down |Right |      |      | Play | Prev | Next |      |      |      |      |      | RESET|
+ * |      | PgDn | Left | Down |Right |      |      | Play | Prev | Next |      |      |      |      |      | QK_BOOT|
  * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[3] = LAYOUT(
     _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,      _______,    _______,   _______,  _______,  _______,  _______,  _______,   _______,
     _______,  KC_PGUP,  KC_HOME,  KC_UP,    KC_END,  _______,  _______,  KC__VOLDOWN,  KC__VOLUP,  KC__MUTE,  _______,  _______,  _______,  _______,  _______,   _______,
-    _______,  KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  KC_MPLY,     KC_MRWD,    KC_MFFD,   _______,  _______,  _______,  _______,  _______,   RESET,
+    _______,  KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  KC_MPLY,     KC_MRWD,    KC_MFFD,   _______,  _______,  _______,  _______,  _______,   QK_BOOT,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,    _______,   _______,  _______,  _______,  _______,  _______,   BL_TOGG,
     DF(1),    _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,    _______,   _______,  _______,  _______,  _______,  BL_STEP,  BL_TOGG
   ),
diff --git a/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c b/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c
index dbcc8c31a3..040827308b 100644
--- a/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
 |         |1        |2        |3        |         |Prev     |Pause    |Next     |LowerVol |RaiseVol |Mute     |         |         |         |         |         |
 |Enter    |---------+---------+---------|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-|         |.        |0        |00       |RESET    |ESCT     |         |         |         |         |         |         |         |         |         |Game     |
+|         |.        |0        |00       |QK_BOOT    |ESCT     |         |         |         |         |         |         |         |         |         |Game     |
 `---------------------------------------------------------------------------------------------------------------------------------------------------------------'
 */
 
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   CU_EQL,   _______,  _______,  _______,  _______,  KC_PGDN,  KC_UP,    KC_PGUP,  KC_HOME,  XXXXXXX,  XXXXXXX,  XXXXXXX,  GUIU,     XXXXXXX,  XXXXXXX,  KC_DEL,
   CU_EQL,   _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_END,   XXXXXXX,  XXXXXXX,  GUIL,     GUID,     GUIR,     EMOJI,    KC_ENT,
   _______,  _______,  _______,  _______,  _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
-  _______,  _______,  _______,  _______,  RESET,    ALTF4,    _______,  _______,  _______,  KC_SPC,   CTLENT,   _______,  _______,  _______,  _______,  CU_GAME
+  _______,  _______,  _______,  _______,  QK_BOOT,  ALTF4,    _______,  _______,  _______,  KC_SPC,   CTLENT,   _______,  _______,  _______,  _______,  CU_GAME
 ),
 
 // Can be used to place macros on the numpad
diff --git a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
index 9ffc617f08..837dc1e754 100644
--- a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
+++ b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER2] = LAYOUT_ortho_split(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_K, RGB_M_G, RGB_M_R, RGB_M_SW,  _______, RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD,   _______, RGB_HUD,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD,   _______, RGB_HUD,
         _______, RGB_TOG, _______,          _______,          XXXXXXX,        XXXXXXX, XXXXXXX,  KC_DEL,   KC_RALT,  KC_RCTL
     ),
 };
diff --git a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
index 7bbde7bd01..d37722e7bc 100644
--- a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
+++ b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER2] = LAYOUT_split_bar(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_K, RGB_M_G, RGB_M_R, RGB_M_SW,         RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD,          RGB_HUD,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD,          RGB_HUD,
         _______, RGB_TOG, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, KC_DEL,  KC_RALT,          KC_RCTL
     ),
 };
diff --git a/keyboards/projectkb/alice/keymaps/devinceble/keymap.c b/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
index bf46aa95b6..01d281bc68 100644
--- a/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
@@ -36,6 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_MOD, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_RMOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, BL_INC, BL_DEC, BL_TOGG, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
     ),
 };
diff --git a/keyboards/projectkb/alice/keymaps/keithlo/keymap.c b/keyboards/projectkb/alice/keymaps/keithlo/keymap.c
index c6801308aa..49c6ccfd12 100644
--- a/keyboards/projectkb/alice/keymaps/keithlo/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/keithlo/keymap.c
@@ -38,6 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, KC_F11,  KC_F12, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          KC_LEFT, KC_DOWN, KC_UP  , KC_RIGHT, _______, _______,          _______,
               _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, _______,
-              _______,          _______, _______, _______,                            _______,          _______,          RESET
+              _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT
   )
 };
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
index 7a671402c0..c61619e32e 100644
--- a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NAVMED] = LAYOUT_default(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, RESET,
+    KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,         EEP_RST,
              _______, _______, _______, _______, _______, KC_VOLD,        KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
              _______,                   _______,  _______, _______,        _______,          _______,                        _______
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FNMS] = LAYOUT_default(
     RGB_TOG, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-    RGB_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, RESET,
+    RGB_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
     VLK_TOG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
              _______, BL_INC,   BL_DEC, BL_TOGG, BL_BRTG, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
              AG_TOGG,                   _______,  _______, _______,        _______,          _______,                        _______
diff --git a/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c b/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
index 300362c281..482765a9c0 100644
--- a/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_default(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, RESET,
+    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/keyboards/q4z/keymaps/rjboone/keymap.c b/keyboards/q4z/keymaps/rjboone/keymap.c
index aa8a77dae6..8e764e4735 100644
--- a/keyboards/q4z/keymaps/rjboone/keymap.c
+++ b/keyboards/q4z/keymaps/rjboone/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NAV] = LAYOUT(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, 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
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
index 62241532e8..9755cdec3f 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
+++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT_big_space(
-    KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
+    KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
     KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB,
     KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT,
                     KC_TRNS,   KC_TRNS,   KC_TRNS
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
index a272c001b4..afde5f7b20 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
+++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT_big_space(
-    KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
+    KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
     KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB,
     KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT,
                     KC_TRNS,   KC_TRNS,   KC_TRNS 
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
index 986e435957..c163c6eac9 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
+++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT_default(
-    KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP, RESET,   KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_BSPC,
+    KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP, QK_BOOT, KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_BSPC,
     KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_TAB,
     KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS, KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT,
                     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS 
diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
index 5e2dd8aa09..8283ea9608 100644
--- a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT_2u_bars(
-    KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP,  RESET,   KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC,
+    KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP,  QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC,
     KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN,  KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8, KC_TAB,
     KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS,  KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,    KC_TRNS
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
index b1cc213d1b..37a5c3fb37 100644
--- a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT_625_bar(
-    KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP,  RESET,   KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC,
+    KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP,  QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC,
     KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN,  KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8, KC_TAB,
     KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS,  KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS
diff --git a/keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c b/keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c
index 5a3a58482d..34edfc511c 100644
--- a/keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c
+++ b/keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_divided_fnrow( /* Fn */
-    RESET,       _______, _______, _______, _______,      _______, _______, _______, _______,      _______, _______, _______, _______,     _______,
+    QK_BOOT,     _______, _______, _______, _______,      _______, _______, _______, _______,      _______, _______, _______, _______,     _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_STEP, _______, _______,          _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
diff --git a/keyboards/rart/rartpad/keymaps/numpad/keymap.c b/keyboards/rart/rartpad/keymaps/numpad/keymap.c
index e149dd6b1d..a576f9df9d 100644
--- a/keyboards/rart/rartpad/keymaps/numpad/keymap.c
+++ b/keyboards/rart/rartpad/keymaps/numpad/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P0,            MO(1),   KC_PENT
     ),
     [1] = LAYOUT_numpad_5x4(
-        KC_TRNS, KC_TRNS, KC_TRNS,  RESET,
+        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,
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
index 45a1b8a566..4f789fdc50 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //,-------------------------------------------------------------------------------------------------------------.
-         RESET,   RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+         QK_BOOT, RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
index 754e37f46b..ef35e0a405 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
@@ -57,7 +57,7 @@ At first, Move to Lower layer with long push. After that Adjust key with long pu
 
   [_ADJUST] = LAYOUT(
   //,-------------------------------------------------------------------------------------------------------------.
-         RESET,   RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+         QK_BOOT, RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
index efdf01b2e7..9d9e9fe42f 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //,-----------------------------------------------------------------------------------------------------------------------.
-                   RESET,   RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
+                   QK_BOOT, RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md b/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
index ad64f06b15..1e3e63a460 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
@@ -53,7 +53,7 @@ At first, Move to Lower layer with long push. After that Adjust key with long pu
 
   [_ADJUST] = LAYOUT(
   //,-----------------------------------------------------------------------------------------------------------------------.
-                   RESET,   RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
+                   QK_BOOT, RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/redox/keymaps/KL1RL/keymap.c b/keyboards/redox/keymaps/KL1RL/keymap.c
index 2986a51ceb..a024cd1d56 100644
--- a/keyboards/redox/keymaps/KL1RL/keymap.c
+++ b/keyboards/redox/keymaps/KL1RL/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/default/keymap.c b/keyboards/redox/keymaps/default/keymap.c
index 3f56fa5f3c..ecf3ff4f80 100644
--- a/keyboards/redox/keymaps/default/keymap.c
+++ b/keyboards/redox/keymaps/default/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/eightbitraptor/keymap.c b/keyboards/redox/keymaps/eightbitraptor/keymap.c
index dd1ed01c24..110abb8368 100644
--- a/keyboards/redox/keymaps/eightbitraptor/keymap.c
+++ b/keyboards/redox/keymaps/eightbitraptor/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_MUTE ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/fculpo/keymap.c b/keyboards/redox/keymaps/fculpo/keymap.c
index b5aeca99dd..24c4767869 100644
--- a/keyboards/redox/keymaps/fculpo/keymap.c
+++ b/keyboards/redox/keymaps/fculpo/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/finex/keymap.c b/keyboards/redox/keymaps/finex/keymap.c
index 8cc822f1ce..724bf564f6 100644
--- a/keyboards/redox/keymaps/finex/keymap.c
+++ b/keyboards/redox/keymaps/finex/keymap.c
@@ -373,7 +373,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
        XXXXXXX ,LR1     ,LR2     ,LR3     ,LR4     ,XXXXXXX ,                                            XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+       XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
        XXXXXXX ,XXXXXXX ,RGB_M_B ,RGB_M_R ,RGB_M_SW,RGB_M_SN,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/german/keymap.c b/keyboards/redox/keymaps/german/keymap.c
index 06928b2304..c4325ea73e 100644
--- a/keyboards/redox/keymaps/german/keymap.c
+++ b/keyboards/redox/keymaps/german/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/italian/keymap.c b/keyboards/redox/keymaps/italian/keymap.c
index 5059a810b9..97f2f53294 100644
--- a/keyboards/redox/keymaps/italian/keymap.c
+++ b/keyboards/redox/keymaps/italian/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c
index 226d14aae1..cd1dbdce3e 100644
--- a/keyboards/redox/keymaps/jeherve/keymap.c
+++ b/keyboards/redox/keymaps/jeherve/keymap.c
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,RESET   ,DEBUG   ,AU_TOG  ,XXXXXXX ,_______ ,
+     _______ ,XXXXXXX ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,QK_BOOT,DEBUG   ,AU_TOG  ,XXXXXXX ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/nrichers/keymap.c b/keyboards/redox/keymaps/nrichers/keymap.c
index 7434b43682..cfe6895cde 100755
--- a/keyboards/redox/keymaps/nrichers/keymap.c
+++ b/keyboards/redox/keymaps/nrichers/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/ptillemans/keymap.c b/keyboards/redox/keymaps/ptillemans/keymap.c
index 3d9b90be5b..eea5a32808 100644
--- a/keyboards/redox/keymaps/ptillemans/keymap.c
+++ b/keyboards/redox/keymaps/ptillemans/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/thattolleyguy/keymap.c b/keyboards/redox/keymaps/thattolleyguy/keymap.c
index 825addbbbf..5bcb7e52cc 100644
--- a/keyboards/redox/keymaps/thattolleyguy/keymap.c
+++ b/keyboards/redox/keymaps/thattolleyguy/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,XXXXXXX, _______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_P1   ,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,KC_PSCR
+     XXXXXXX ,QK_BOOT,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,KC_PSCR
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   ),
 
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_END  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,RESET   ,XXXXXXX
+     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,QK_BOOT,XXXXXXX
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   )
 };
diff --git a/keyboards/redox/keymaps/tw1t611/keymap.c b/keyboards/redox/keymaps/tw1t611/keymap.c
index 3ea10a7528..da978de9fa 100644
--- a/keyboards/redox/keymaps/tw1t611/keymap.c
+++ b/keyboards/redox/keymaps/tw1t611/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_F12  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     DE_CIRC ,DE_QUOT ,DE_DQUO ,DE_LCBR ,DE_RCBR ,DE_GRV  ,RGB_MOD ,                          RESET   ,DE_PERC ,DE_PLUS ,DE_MINS ,DE_ASTR  ,DE_SLSH ,DE_BSLS ,
+     DE_CIRC ,DE_QUOT ,DE_DQUO ,DE_LCBR ,DE_RCBR ,DE_GRV  ,RGB_MOD ,                          QK_BOOT,DE_PERC ,DE_PLUS ,DE_MINS ,DE_ASTR  ,DE_SLSH ,DE_BSLS ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      DE_TILD ,DE_EXLM ,DE_DLR  ,DE_LPRN ,DE_RPRN ,DE_AMPR ,RGB_TOG ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,DE_QUES ,DE_PIPE ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox/keymaps/via/keymap.c b/keyboards/redox/keymaps/via/keymap.c
index 13c95bdd53..474f03ecd7 100644
--- a/keyboards/redox/keymaps/via/keymap.c
+++ b/keyboards/redox/keymaps/via/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,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 ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox_w/keymaps/danielo515/keymap.c b/keyboards/redox_w/keymaps/danielo515/keymap.c
index b76a72cf18..5a9fa4e5ee 100644
--- a/keyboards/redox_w/keymaps/danielo515/keymap.c
+++ b/keyboards/redox_w/keymaps/danielo515/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                            XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,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 ,XXXXXXX ,XXXXXXX ,TG(_GAMING) ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox_w/keymaps/default/keymap.c b/keyboards/redox_w/keymaps/default/keymap.c
index a91d3725f4..a463bfc673 100644
--- a/keyboards/redox_w/keymaps/default/keymap.c
+++ b/keyboards/redox_w/keymaps/default/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,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 ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox_w/keymaps/italian/keymap.c b/keyboards/redox_w/keymaps/italian/keymap.c
index b4c815e4f5..fd4dffeecb 100644
--- a/keyboards/redox_w/keymaps/italian/keymap.c
+++ b/keyboards/redox_w/keymaps/italian/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,RESET   ,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 ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redox_w/keymaps/via/keymap.c b/keyboards/redox_w/keymaps/via/keymap.c
index b9af344a46..2ec63ec852 100644
--- a/keyboards/redox_w/keymaps/via/keymap.c
+++ b/keyboards/redox_w/keymaps/via/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,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 ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/retro_75/keymaps/split_backspace/keymap.c b/keyboards/retro_75/keymaps/split_backspace/keymap.c
index 58993b8bb3..f962b75b5c 100644
--- a/keyboards/retro_75/keymaps/split_backspace/keymap.c
+++ b/keyboards/retro_75/keymaps/split_backspace/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT_split_bs(
-    RESET,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
index 8079b48f52..36d643370a 100644
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
+++ b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_reviung39(
     _______, RCMD(LALT(KC_1)), RCMD(LALT(KC_2)), RCMD(LALT(KC_3)), RCMD(LALT(KC_4)), RCMD(LALT(KC_5)), RCMD(LALT(KC_6)), RCMD(LALT(KC_7)), _______, _______, RCMD(LALT(KC_0)), _______,
     RGB_SAI, RGB_HUI,  RGB_MOD,  _______,   RGB_TOG,    RGB_VAI,   RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,   _______,
-    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  RESET,    _______,  _______,  _______,  _______,  _______,  _______,
+    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,
                                                    KC_LGUI,  _______,  _______
   ),
 };
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
index a35b677197..751a1c51b1 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
@@ -247,12 +247,12 @@
     * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
     * |       |       |       |         |       |         |     | M_L  | M_D  | M_I  | M_R  |      | SLEEP |
     * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
-    * |       |       |       |         | SCRLFT| SCRRGHT |     | M_B1 |  M_B2|  M0  |  M2  |      | RESET |
+    * |       |       |       |         | 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, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+     [_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 |
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
index 66eaa144ec..ff763394b4 100644
--- a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_PGDN, KC_PGUP, KC_PGDN, KC_PGUP, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV, RGB_HUI, RGB_HUD, RGB_RMOD, RGB_TOG, RGB_MOD
 			),
     [_LHAND] = LAYOUT(
-			RESET,    KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,		KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS, 
+			QK_BOOT,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,		KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS, 
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, 
 			KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_PGUP, 		KC_PGDN, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
 			KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT,  KC_BSPC, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_RSFT, 
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 			),
     [_FUNC] = LAYOUT(
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RESET, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, QK_BOOT, 
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
index 0b01d43eb2..11149bbe0d 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT(
         KC_GRV,  _______, _______, _______, _______, _______, _______,    _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL,
-        _______, KC_HOME, KC_UP,   KC_END,  RESET,   TCH_TOG, _______,    _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, _______,
+        _______, 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, _______,
         _______, _______, _______, _______, _______, EEP_RST, _______,    _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
         _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, KC_KP_0, KC_PDOT, KC_PENT, _______,
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
index d6867ffa9b..3ccd96036a 100644
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJ] =  LAYOUT( \
   //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-        RESET, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______,   RESET, \
+        QK_BOOT, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______,   QK_BOOT, \
   //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
       _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_SPI, RGB_TOG,    _______,      _______,    _______, _______, _______, _______, _______, _______, \
   //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
index c24d382704..c63356b3e5 100644
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* ADJ
    * ,------------------------------------------------.  ,------------------------------------------------.
-   * |RESET |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  |      |   =  |   /  |   *  |   -  |      |      |
+   * |QK_BOOT |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  |      |   =  |   /  |   *  |   -  |      |      |
    * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
    * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  |      |   7  |   8  |   9  |   +  |      |      |
    * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   [_ADJ] =  LAYOUT( \
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   XXXXXXX, KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, \
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   XXXXXXX, KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, \
       XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX, \
       XXXXXXX, RGB_SAD, RGB_VAI, RGB_SAI, XXXXXXX,  XXXXXXX, COLEMAK, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PENT, XXXXXXX, XXXXXXX, \
       XXXXXXX, RGB_HUD, RGB_VAD, RGB_HUI, XXXXXXX,  XXXXXXX, QWERTY,  XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_SPC,  XXXXXXX, XXXXXXX, \
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
index bc0884c8e4..cdd0c6620a 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] =  LAYOUT( \
-      _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, \
+      _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_NLCK, _______, _______, \
       KC_CAPS, _______, QWERTY,  COLEMAK, DVORAK,  DESTINY, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, \
       _______, _______, _______, RGB_SPI, RGB_SPD, _______, XXXXXXX, XXXXXXX, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, \
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
index 946ca79efd..4cde20a7ef 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|              |------+------+------+------+------+------|
  * | APscr|   %  |   ^  |   [  |   ]  |   ~  |              |   1  |   2  |   3  |   \  | Vol- | Vol+ |
  * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
- * | Pscr |      | RESET|      |      | GAME |      ||      |   0  |   .  |   =  | Prev | Next | Play |
+ * | Pscr |      | QK_BOOT|      |      | GAME |      ||      |   0  |   .  |   =  | Prev | Next | Play |
  * `------------------------------------------------- -------------------------------------------------'
  */
 [SYMB] = LAYOUT( \
@@ -66,12 +66,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,     KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, KC_PIPE,                    KC_7,  KC_8,   KC_9,   KC_ASTR, KC_RPRN, KC_F12, \
     _______,     KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, KC_GRV,                     KC_4,  KC_5,   KC_6,   KC_PLUS, KC_RCBR, KC_PIPE, \
     PSCREEN_APP, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                    KC_1,  KC_2,   KC_3,   KC_BSLS, KC_VOLD, KC_VOLU, \
-    KC_PSCR,     _______, RESET,   _______, _______, TO(GAME), _______, _______, KC_0,  KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \
+    KC_PSCR,     _______, QK_BOOT, _______, _______, TO(GAME), _______, _______, KC_0,  KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \
 ),
 
 /* Vim Movement
  * ,-----------------------------------------.              .-----------------------------------------.
- * |      |      |      |      |      |      |              |      |      |      |      | RESET|      |
+ * |      |      |      |      |      |      |              |      |      |      |      | QK_BOOT|      |
  * |------+------+------+------+------+------|              |------+------+------+------+------+------|
  * |      |RGBSAI|RGBVAI|RGBSAD| LSFT |      |              |      |      |      |      |      |      |
  * |------+------+------+------+------+------|              |------+------+------+------+------+------|
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------------..------------------------------------------------'
  */
 [VIM] =  LAYOUT( \
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, RESET,   _______, \
+    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, QK_BOOT, _______, \
     _______, RGB_SAI, RGB_VAI, RGB_SAD, KC_LSFT, _______,                   _______, _______, _______, _______, _______, _______, \
     _______, DLEFT,   DRIGHT,  KC_LCTL, KC_LGUI, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
     _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______,                   _______, _______, _______, _______, _______, _______, \
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|              |------+------+------+------+------+------|
  * | Shift|   Z  |      |      |      |      |              |      |      |      |      |      |  GUI |
  * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
- * | Enter|      | Lock | Bksp |  Alt |  Spc | RESET||      | Lower| Left |  Up  | Down | Right|QWERTY|
+ * | Enter|      | Lock | Bksp |  Alt |  Spc | QK_BOOT||      | Lower| Left |  Up  | Down | Right|QWERTY|
  * `------------------------------------------------..-----------------------------------------------'
  */
 [GAME] =  LAYOUT( \
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|              |------+------+------+------+------+------|
  * | Shift|   Z  |      |      |      |      |              |      |      |      |      |      |  GUI |
  * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
- * | Enter|      | Lock | Bksp |  Alt |  Spc | RESET||      | Lower| Left |  Up  | Down | Right|QWERTY|
+ * | Enter|      | Lock | Bksp |  Alt |  Spc | QK_BOOT||      | Lower| Left |  Up  | Down | Right|QWERTY|
  * `------------------------------------------------..-----------------------------------------------'
  */
 [GAME_ARROW] =  LAYOUT( \
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
index bca4684dc5..c8d45933f5 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,-----------------------------------------.             .-----------------------------------------.
    * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |RGBSAI|RGBVAI|RGBSAD| RESET|  [   |             |   ]  | Pgup |  Up  | Pgdn |Insert| Home |
+   * |      |RGBSAI|RGBVAI|RGBSAD| QK_BOOT|  [   |             |   ]  | Pgup |  Up  | Pgdn |Insert| Home |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |RGBHUD|RGBVAD|RGBHUI|RGBMOD|      |             |      | Left | Down | Right|Delete| End  |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_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, RESET,   KC_LBRC,                   KC_RBRC,           KC_PGUP,  KC_UP,   KC_PGDN, KC_INS,  KC_HOME, \
+    _______, 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 \
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
index 673ea4054a..9e5d2212ea 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------+------+------+------+------+------|                            |------+------+------+------+------+------|
    * |Shift |      |      |      |      |      |                            |      |      |      | Pause| Back | Next |
    * |------+------+------+------+------+------+------.              .------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |RGBMOD|      |      |      |              | RESET|      |      |      | Mute | VOLUP| VOLDN|
+   * | Ctrl | GUI  | Alt  |RGBMOD|      |      |      |              | QK_BOOT|      |      |      | Mute | VOLUP| VOLDN|
    * `------------------------------------------------'              '------------------------------------------------'
    */
   [_NAV] = LAYOUT(
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, 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, _______, _______, _______, RESET,   _______, _______,  _______, KC_MUTE, KC_VOLU, KC_VOLD
+    KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, _______, _______, _______, QK_BOOT, _______, _______,  _______, KC_MUTE, KC_VOLU, KC_VOLD
   ),
 
 };
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
index b9b21102b1..a8d93e5639 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
@@ -124,7 +124,7 @@ KC_CCCV,   KC_LGUI, KC_LALT, RGB_TOG, MO(1), TD(TD_SPC_DOT), KC_BSPC, KC_ENT, TD
 
 	[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, RESET, KC_LBRC, 			KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, 
+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),
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
index 6250086ed9..e98bab84eb 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] = LAYOUT( \
-    RESET,   _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, \
+    QK_BOOT, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, \
     _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_SNK,                   _______, QWERTY,  COLEMAK, DVORAK,  WOW,     _______, \
     RGB_TOG, RGB_MOD, RGB_SWR, RGB_M_K, RGB_M_G, RGB_HUI,                   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, \
diff --git a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
index 1c5b242c0b..dde27eae24 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJ] =  LAYOUT_ortho_5x6(
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-      _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET,   _______,
+      _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______,
       _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST,  _______,
       _______, _______, _______, _______, _______, _______,
       _______, _______, _______, RGB_MOD, _______, _______
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c
index bb1752ba1b..29e9ddf825 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______,                   KC_BTN1, _______, KC_P0,            KC_PDOT, KC_PENT, _______, _______, _______
     ),
 [SYMB] = LAYOUT(
-  RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+  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, _______,
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
index 8556ee424c..02bd23a9b4 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
@@ -98,21 +98,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______,                   KC_BTN1, _______, KC_P0,            KC_PDOT, _______, _______, _______, _______
 ),
 [_SYMB] = LAYOUT(
-    RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+    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(
-    RESET  ,M_COLEMAK,M_QWERTY,W_COLEMAK,W_QWERTY,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______,
+    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(
-    RESET  ,M_COLEMAK,M_QWERTY,W_COLEMAK,W_QWERTY,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______,
+    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,  _______, _______,
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
index 72b795baa5..a65a5260b5 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______,                   _______, _______, _______,          _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
     ),
 [_FN] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, KC_UP,   _______, KC_PSCR, _______,
   _______, _______, _______, _______, _______, _______, _______,          _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
index 5666dba9d5..6fa09146ed 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______,                   KC_BTN1, _______, KC_P0,            KC_PDOT, KC_PENT, _______, _______, _______
     ),
 [SYMB] = LAYOUT(
-  RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+  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, _______,
diff --git a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c b/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c
index 5450892123..6919b46990 100644
--- a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c
+++ b/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______,                                     KC_P0,                               KC_PDOT, KC_PENT, _______, _______
   ),
   [SYMB] = LAYOUT_7u_a(
-    RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+    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, _______,
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
index 4ef540a299..b63cdff3cc 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
@@ -109,7 +109,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX
 
   [_ADJUST] = LAYOUT( /* Base */
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   RESET,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
@@ -117,7 +117,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               XXXXXXX, XXXXXXX, _______,   RESET,                RESET, _______,          KC_STOP, XXXXXXX 
+               XXXXXXX, XXXXXXX, _______,   QK_BOOT,              QK_BOOT, _______,          KC_STOP, XXXXXXX 
           //`---------------------------------------------|   |--------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
index 8f2c4151f8..dd2cad91d9 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
@@ -88,7 +88,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, _______,     XXXXXXX
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,   RESET, 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    
   //|--------------------------------------------------------------|   |--------------------------------------------------------------'
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
index 3807d9b6f3..249a5659f5 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
@@ -73,7 +73,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______
+               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
index d2abe704c6..86eca6b9f6 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
@@ -96,7 +96,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,        RGB_MOD, RGB_TOG, RGB_SAI,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______
+               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
index d22f9ecb2f..1f58511c89 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
@@ -75,7 +75,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,       _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______,                        RGB_MOD,        RGB_TOG,_______,_______
+               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______,                        RGB_MOD,        RGB_TOG,_______,_______
           //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
   )
 };
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
index d8549e0e8b..cff7873804 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_7] = LAYOUT( /* Layer 7 */
-    KC_ESC,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+    KC_ESC,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
     KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                           RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
              KC_LCTRL,     KC_TRNS,    KC_HOME,    KC_LALT,     KC_ENTER,  N_COPY, N_PASTE, KC_SPC, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
index 8d0c6f901b..0c663e1b4d 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______
+               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c
index 7185ec78b7..83a6154fb1 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [VIM] = LAYOUT( /* Base */
   //,-----------------------------------------------------|                 |-----------------------------------------------------.
-      _______,   RESET, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+      _______, QK_BOOT, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, KC_LSFT, _______,                   _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
index b70e68da54..2466833b2a 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
@@ -97,7 +97,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______
+               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
index c43803be35..1ab1e9a150 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
@@ -133,7 +133,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______
+               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
index 6dd2ef8863..a1f3379364 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
@@ -103,7 +103,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),            RGB_MOD,        RGB_TOG,_______,_______,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______
+               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
index ae7843341a..abc4350201 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT( /* Base */
   //,--------------------------------------------------------------|             |--------------------------------------------------------------.
-      _______,   RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, \
+      _______,   QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, \
   //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
       _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
   //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
index 6e2dd0886f..8514ae5a22 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] = LAYOUT_with_setta21( /* Base */
     //,--------------------------------------------------------------|             |------------------------------------------------------------------------.             ,-----------------------------------.
-        _______,   RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,       KC_F9,        KC_F10,  KC_F11,  KC_F12,               _______, _______, _______, _______,
+        _______,   QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,       KC_F9,        KC_F10,  KC_F11,  KC_F12,               _______, _______, _______, _______,
     //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+------------+--------------+--------+--------|             |--------+--------+--------+--------|
         _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_RST, XXXXXXX, XXXXXXX,     XXXXXXX,       XXXXXXX, XXXXXXX, _______,               XXXXXXX, XXXXXXX, XXXXXXX, _______,
     //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+------------+--------------+--------+--------|             |--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
index 5944c00fc5..c1d042a5f2 100644
--- a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
@@ -90,7 +90,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,          _______, _______,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, _______,   RESET,              _______,          _______, _______, _______,          _______, _______, _______ 
+      XXXXXXX, XXXXXXX, XXXXXXX, _______,   QK_BOOT,            _______,          _______, _______, _______,          _______, _______, _______ 
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
index e6004ba111..9252d2e58e 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
@@ -88,7 +88,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,   RESET,       RESET, _______, _______, _______, _______,          _______, _______, _______ 
+      XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,   QK_BOOT,     QK_BOOT, _______, _______, _______, _______,          _______, _______, _______ 
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
index eb5452a7c4..0a8fa898c3 100644
--- a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
+++ b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
@@ -35,6 +35,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
         _______, BL_TOGG, BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
-        _______, RESET,   _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
+        _______, QK_BOOT, _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
     )
 };
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
index 505b7eaf0a..0f5c6876e7 100644
--- a/keyboards/satt/comet46/keymaps/satt/keymap.c
+++ b/keyboards/satt/comet46/keymaps/satt/keymap.c
@@ -70,7 +70,7 @@ enum custom_keycodes {
 #define KC_IMON ALT_T(KC_F13)
 #define KC_IMOF GUI_T(KC_F14)
 #define KC_CAD LCA(KC_DEL)
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/keyboards/satt/vision/keymaps/satt/keymap.c b/keyboards/satt/vision/keymaps/satt/keymap.c
index 4289fbc20a..cc088d94f3 100644
--- a/keyboards/satt/vision/keymaps/satt/keymap.c
+++ b/keyboards/satt/vision/keymaps/satt/keymap.c
@@ -100,7 +100,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 	[_ADJUST] = LAYOUT(
-        RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         _______, _______, _______, _______, QWERTY,  PSEU_US, CTALDEL, _______, _______, _______, _______, _______,     _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                  _______,          _______,     _______,      _______,     _______,      _______, _______,                   _______
diff --git a/keyboards/sck/m0116b/keymaps/m0116/keymap.c b/keyboards/sck/m0116b/keymaps/m0116/keymap.c
index 8a6f831fe6..56bb777f7a 100644
--- a/keyboards/sck/m0116b/keymaps/m0116/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/m0116/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 /* Keymap Layer 1: (Layer 1) Layer 1
    * ,---------------------------------------------------------------------------------.
-   * |                     |RESET|                                                     |
+   * |                     |QK_BOOT|                                                     |
    * `---------------------------------------------------------------------------------'
    * ,-----------------------------------------------------------. .-------------------.
    * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|       | |    |    |    |    |
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------' `-------------------'
    */
 [1] = LAYOUT_m0116_ansi( /* Layer 1 */
-	                                                          RESET,
+	                                                          QK_BOOT,
 		KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/sck/m0116b/keymaps/m0118/keymap.c b/keyboards/sck/m0116b/keymaps/m0118/keymap.c
index 5d718e9a77..7a54952f97 100644
--- a/keyboards/sck/m0116b/keymaps/m0118/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/m0118/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------' `-------------------'
    */
 [1] = LAYOUT_m0118_iso( /* Layer 1 */
-	                                                          RESET,
+	                                                          QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/senselessclay/had60/keymaps/had/keymap.c b/keyboards/senselessclay/had60/keymaps/had/keymap.c
index 0776a740ef..add0595522 100644
--- a/keyboards/senselessclay/had60/keymaps/had/keymap.c
+++ b/keyboards/senselessclay/had60/keymaps/had/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     [2] = LAYOUT_all(
-        MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS, RESET, 
+        MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS, QK_BOOT, 
 		MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
diff --git a/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
index c17c9e7449..238c744ee3 100644
--- a/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [_HL] = LAYOUT(
         RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON,   BL_DEC,  BL_INC,  KC_TRNS, LALT(KC_F4),
-        RESET,   RGB_HUI, RGB_SAI,  RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        QK_BOOT, RGB_HUI, RGB_SAI,  RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_HUD, RGB_SAD,  RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
index 2bfe82977c..e0644f0a21 100644
--- a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-----------------------------------------------------------'
     */
     [FUNCTION] = 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,   RESET,   \
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,   QK_BOOT, \
         _______, _______, KC_CM_W, KC_CM_E, KC_MPRV, KC_MPLY, KC_MNXT, KC_CM_U, KC_CM_I, KC_CM_O, KC_CM_P, KC_PSCR, KC_SLCK, KC_PAUS, \
         _______, KC_CM_A, KC_CM_S, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_CM_K, KC_CM_L, _______, _______, _______, KC_PENT,          \
         _______, _______, KC_CM_Y, _______, KC_CM_C, MICMUTE, KC_CALC, KC_CM_N, KC_CM_M, _______, _______, _______,          KC_PGUP, KC_GMLK, \
diff --git a/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c b/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
index 2ba29b09ee..17c39d0b37 100644
--- a/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* 2: Mouse Keys Layer
 
 	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-	 │RESET│ F13 │ F14 │ F15 │ F16 │ F17 │ F18 │ F19 │ F20 │ F21 │ F22 │ F23 │ F24 │     │     │
+	 │QK_BOOT│ F13 │ F14 │ F15 │ F16 │ F17 │ F18 │ F19 │ F20 │ F21 │ F22 │ F23 │ F24 │     │     │
 	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
 	 │DEBUG│     │     │     │     │     │     │BTN1 │MS_UP│BTN2 │WH_UP│     │     │     │█████│
 	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [MOUSE] = LAYOUT(
 
-				   RESET,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21, KC_F22,  KC_F23,  KC_F24,  KC_NO,  KC_NO,  \
+				   QK_BOOT,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21, KC_F22,  KC_F23,  KC_F24,  KC_NO,  KC_NO,  \
 				   DEBUG,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BTN1,  KC_MS_UP,  KC_BTN2,  KC_WH_U,  KC_NO,  KC_NO,  KC_NO, \
 				   TFS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_RIGHT,  KC_WH_D,  KC_BTN3,  KC_NO,  KC_TRNS,  \
 				   MAGSYS,  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, \
diff --git a/keyboards/sentraq/s65_x/keymaps/smt/keymap.c b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
index 8c3984c21f..ab5eb8d820 100644
--- a/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
    * │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │ RGB │
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │RESET│     │     │QWRTY│COLMK│DVORK│     │     │     │     │█████│RGBV+│
+   * │     │     │     │     │QK_BOOT│     │     │QWRTY│COLMK│DVORK│     │     │     │     │█████│RGBV+│
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
    * │     │     │ _CL │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│RGBV-│
    * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* 4: ANSI control layer */
   [_CL] = LAYOUT_65_ansi(
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, RGB_TOG, \
-    _______,  _______,  _______,  _______,  RESET,    _______,  _______,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______,  _______,  _______, RGB_VAI, \
+    _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______,  _______,  _______, RGB_VAI, \
     _______,  _______,  MO(_CL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, RGB_VAD, \
     MO(_FL),            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SAI, _______, \
     _______,  _______,  _______,                      RGB_MOD,                                _______,  MO(_FL),  _______,  RGB_HUD,  RGB_SAD, RGB_HUI),
diff --git a/keyboards/shapeshifter4060/keymaps/default/keymap.c b/keyboards/shapeshifter4060/keymaps/default/keymap.c
index 88ea5a7138..15f8d3a82f 100644
--- a/keyboards/shapeshifter4060/keymaps/default/keymap.c
+++ b/keyboards/shapeshifter4060/keymaps/default/keymap.c
@@ -86,6 +86,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______ , BWSR_BK , TAB_LFT , KC_UP   , TAB_RGT , BWSR_FW , KC_MUTE , XXXXXXX , SCR_LFT , SCR_FUL , SCR_RGT , _______ ,
     _______ , XXXXXXX , KC_LEFT , KC_DOWN , KC_RGHT , KC_PGUP , KC_VOLU , SLACKUP , XXXXXXX , XXXXXXX , TO_QW   , _______ ,
     _______ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_PGDN , KC_VOLD , SLACKDN , XXXXXXX , XXXXXXX , TO_DV   , _______ ,
-    _______ , QK_BOOT   , _______ , _______ , _LAYER_ , KC_BSPC , _______ , KC_LSFT , KC_LGUI , KC_LALT , KC_LCTL , _______
+    _______ , QK_BOOT, _______ , _______ , _LAYER_ , KC_BSPC , _______ , KC_LSFT , KC_LGUI , KC_LALT , KC_LCTL , _______
   )
 };
diff --git a/keyboards/shapeshifter4060/keymaps/vosechu/keymap.c b/keyboards/shapeshifter4060/keymaps/vosechu/keymap.c
index eb04506ec0..f2a75c38cc 100644
--- a/keyboards/shapeshifter4060/keymaps/vosechu/keymap.c
+++ b/keyboards/shapeshifter4060/keymaps/vosechu/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [DV] = LAYOUT(
-    PAWFIVE , KC_QUOT , KC_COMM , KC_DOT  , KC_P    , KC_Y    , KC_F    , KC_G    , KC_C    , KC_R    , KC_L    , RESET   ,
+    PAWFIVE , KC_QUOT , KC_COMM , KC_DOT  , KC_P    , KC_Y    , KC_F    , KC_G    , KC_C    , KC_R    , KC_L    , QK_BOOT,
     KC_ESC  , KC_A    , KC_O    , KC_E    , LWR_U   , KC_I    , KC_D    , RSE_H   , KC_T    , KC_N    , KC_S    , XXXXXXX ,
     XXXXXXX , KC_SCLN , KC_Q    , KC_J    , KC_K    , KC_X    , KC_B    , KC_M    , KC_W    , KC_V    , KC_Z    , KC_ENT  ,
     XXXXXXX , CTL_GRV , ALT_TAB , KC_LGUI , LFT_BK  , SFT_SPC , KC_SPC  , LFT_ENT , KC_MINS , KC_EQL  , KC_SLSH , KC_BSLS
@@ -48,6 +48,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______ , BWSR_BK , TAB_LFT , KC_UP   , TAB_RGT , BWSR_FW , KC_MUTE , XXXXXXX , SCR_LFT , SCR_FUL , SCR_RGT , _______ ,
     _______ , XXXXXXX , KC_LEFT , KC_DOWN , KC_RGHT , KC_PGUP , KC_VOLU , SLACKUP , XXXXXXX , XXXXXXX , TO(QW)  , _______ ,
     _______ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_PGDN , KC_VOLD , SLACKDN , XXXXXXX , XXXXXXX , TO(DV)  , _______ ,
-    _______ , RESET   , _______ , _______ , _LAYER_ , KC_BSPC , _______ , KC_LSFT , KC_LGUI , KC_LALT , KC_LCTL , _______
+    _______ , QK_BOOT, _______ , _______ , _LAYER_ , KC_BSPC , _______ , KC_LSFT , KC_LGUI , KC_LALT , KC_LCTL , _______
   )
 };
diff --git a/keyboards/singa/keymaps/amnesia0287/keymap.c b/keyboards/singa/keymaps/amnesia0287/keymap.c
index dc52122db6..c42b73fdce 100644
--- a/keyboards/singa/keymaps/amnesia0287/keymap.c
+++ b/keyboards/singa/keymaps/amnesia0287/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FL] = LAYOUT_wkl(
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, \
     KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, \
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, \
diff --git a/keyboards/singa/keymaps/test/keymap.c b/keyboards/singa/keymaps/test/keymap.c
index 6e284a4ac1..d31c277198 100644
--- a/keyboards/singa/keymaps/test/keymap.c
+++ b/keyboards/singa/keymaps/test/keymap.c
@@ -27,7 +27,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT( /* Base */
-    KC_ESC,  RESET,   KC_F2,   KC_F3,  KC_F4, KC_F5,  KC_F6, KC_F7,   KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_DEL,
+    KC_ESC,  QK_BOOT, KC_F2,   KC_F3,  KC_F4, KC_F5,  KC_F6, KC_F7,   KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_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_NO,   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_NO,   KC_ENT,  KC_PGDN,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT( /* Base */
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_NO,   KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c b/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
index 2425572bdc..e511cd5089 100644
--- a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
+++ b/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
@@ -74,7 +74,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
 /* FN
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | RESET  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * | QK_BOOT  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * | MAC    |      |      |      |      |      |      |           |      |      | PgDn |  Up  | PgUp | Print|  Home  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -91,7 +91,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
  *                                        `-------------'       `--------------'
  */
     [_FN] = LAYOUT(
-  RESET,   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,
   MAC,     XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP,   KC_PGUP, KC_PSCR, KC_HOME,
   WINDOWS, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,                     XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_END, 
   _______, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,   XXXXXXX, XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
diff --git a/keyboards/smk60/keymaps/60_hhkb/keymap.c b/keyboards/smk60/keymaps/60_hhkb/keymap.c
index 2732abc06b..e4742f5b18 100644
--- a/keyboards/smk60/keymaps/60_hhkb/keymap.c
+++ b/keyboards/smk60/keymaps/60_hhkb/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_LGUI,  KC_LALT,                        KC_SPC,                          KC_RALT,  MO(1)),
     [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,_______,_______,
-      RESET, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+      QK_BOOT, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
                      _______,_______,                        _______,                                _______,_______),
diff --git a/keyboards/smk60/keymaps/60_wkl/keymap.c b/keyboards/smk60/keymaps/60_wkl/keymap.c
index 979fc93d67..4345998a9c 100644
--- a/keyboards/smk60/keymaps/60_wkl/keymap.c
+++ b/keyboards/smk60/keymaps/60_wkl/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_CAPS,  KC_LGUI,  KC_LALT,                        LT(1,KC_SPC),                   KC_RALT,  TG(1),   KC_RCTL),
     [1] = LAYOUT_60_wkl(
       KC_ESC,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,KC_DEL,
-      RESET,   RGB_TOG, RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
+      QK_BOOT, RGB_TOG, RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
       _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,_______,_______,_______,
       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
       _______,_______,_______,                        _______,                                _______,TG(0),_______),
diff --git a/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c b/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c
index 22405cdc5f..12c4b8ce41 100644
--- a/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c
+++ b/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_CAPS,  KC_LGUI,  KC_LALT,                        LT(1,KC_SPC),                   KC_RALT,  TG(1),   KC_RCTL),
     [1] = LAYOUT_60_wkl_split_bs(
       _______,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,
-      RESET,   RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
+      QK_BOOT, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
       _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,_______,_______,_______,
       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
       _______,_______,_______,                        _______,                                _______,TG(0),_______),
diff --git a/keyboards/sofle/keymaps/devdev/keymap.c b/keyboards/sofle/keymaps/devdev/keymap.c
index b805f7f176..7209c2d33b 100644
--- a/keyboards/sofle/keymaps/devdev/keymap.c
+++ b/keyboards/sofle/keymaps/devdev/keymap.c
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                    ,-----------------------------------------.
  * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | RESET|      |      |      |      |      |                    |      |      |      |      |      |      |
+ * | QK_BOOT|      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |RGB_TOG|hue^ |sat ^ | bri ^|      |COLEMAK|-------.   ,-------|desk <|      |      |desk >|      |      |
  * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
@@ -245,7 +245,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,------------------------------------------------.                    ,---------------------------------------------------.
   EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
-  RESET,   XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  QK_BOOT, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK,             C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
@@ -301,7 +301,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,------------------------------------------------.                    ,---------------------------------------------------.
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
-  TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5), 					          KC_NO,   TO(7),   KC_NO,   KC_NO,   KC_NO,   RESET,
+  TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5), 					          KC_NO,   TO(7),   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO, 					         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EEP_RST,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
diff --git a/keyboards/sofle/keymaps/flare576/keymap.c b/keyboards/sofle/keymaps/flare576/keymap.c
index 68f611a1b5..720232ad48 100644
--- a/keyboards/sofle/keymaps/flare576/keymap.c
+++ b/keyboards/sofle/keymaps/flare576/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* SYMS
  * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  | F5   |                    |      |      |   {  |   }  |      | RESET|
+ * |      |  F1  |  F2  |  F3  |  F4  | F5   |                    |      |      |   {  |   }  |      | QK_BOOT|
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * | TRNS |  F6  |  F7  |  F8  |  F9  | F10  |                    |      |      |   (  |   )  |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            `----------------------------------'           '------''---------------------------'
  */
 [_SYMS] = LAYOUT(
-  XXXXXXX, KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                      XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, RESET,
+  XXXXXXX, KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                      XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, QK_BOOT,
   _______, KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,                     XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX,
   _______, KC_F11,     KC_F12,     KC_F13,     KC_F14,     KC_F15,                     XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX,
   _______, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), KC_F20,  _______,  _______, XXXXXXX, XXXXXXX, KC_LT,   KC_GT,   XXXXXXX, XXXXXXX,
diff --git a/keyboards/sofle/keymaps/foureight84/keymap.c b/keyboards/sofle/keymaps/foureight84/keymap.c
index cec805593d..b2dd6a3cd6 100644
--- a/keyboards/sofle/keymaps/foureight84/keymap.c
+++ b/keyboards/sofle/keymaps/foureight84/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                    ,-----------------------------------------.
  * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | RESET|      |QWERTY|COLEMAK|      |      |                    |      |      |      |      |      |      |
+ * | QK_BOOT|      |QWERTY|COLEMAK|      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |      |      |MACWIN|      |      |      |-------.    ,-------|      | VOLDO| MUTE | VOLUP|      |      |
  * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_ADJUST] = LAYOUT( \
   XXXXXXX , XXXXXXX,  XXXXXXX ,  XXXXXXX , XXXXXXX, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  RESET  , XXXXXXX,KC_QWERTY,KC_COLEMAK,CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  QK_BOOT, XXXXXXX,KC_QWERTY,KC_COLEMAK,CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX , XXXXXXX,CG_TOGG, XXXXXXX,    XXXXXXX,  XXXXXXX,                     XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, \
   XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,  XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, \
                    _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______ \
diff --git a/keyboards/sofle/keymaps/helltm/keymap.c b/keyboards/sofle/keymaps/helltm/keymap.c
index 8d6289af42..c0fd5edb5e 100644
--- a/keyboards/sofle/keymaps/helltm/keymap.c
+++ b/keyboards/sofle/keymaps/helltm/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                    ,-----------------------------------------.
  * | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |      |  Up  |      | RESET|      |                    | PWrd | NWrd | Pscr |Scroll| Pause| F12  |
+ * | Tab  |      |  Up  |      | QK_BOOT|      |                    | PWrd | NWrd | Pscr |Scroll| Pause| F12  |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * | Caps | Left | Down | Rigth|      |      |-------.    ,-------|      |      |  Ins | Home | PUp  |      |
  * |------+------+------+------+------+------|  play |    | mute  |------+------+------+------+------+------|
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT(
   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-  _______, XXXXXXX,   KC_UP, XXXXXXX,   RESET, XXXXXXX,                       KC_PRVWD, KC_NXTWD, KC_PSCR,  KC_SLCK, KC_PAUS,  KC_F12,
+  _______, XXXXXXX,   KC_UP, XXXXXXX,   QK_BOOT, XXXXXXX,                       KC_PRVWD, KC_NXTWD, KC_PSCR,  KC_SLCK, KC_PAUS,  KC_F12,
   _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,                       XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGUP, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,       _______, XXXXXXX, KC_APP, KC_DEL, KC_END, KC_PGDN, XXXXXXX,
                     CG_TOGG, KC_RALT, _______, KC_RCTL, _______,       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                    ,-----------------------------------------.
  * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | RESET|      |QWERTY|      |      |      |                    |      |      |      |      |      |      |
+ * | QK_BOOT|      |QWERTY|      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |      |      |MACWIN|      |      |      |-------.    ,-------|      | VOLDO| MUTE | VOLUP|      |      |
  * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_ADJUST] = LAYOUT(
   XXXXXXX , XXXXXXX,  XXXXXXX ,  XXXXXXX , XXXXXXX, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  RESET  , XXXXXXX,KC_QWERTY,XXXXXXX,CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  QK_BOOT, XXXXXXX,KC_QWERTY,XXXXXXX,CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX , XXXXXXX,CG_TOGG, XXXXXXX,    XXXXXXX,  XXXXXXX,                     XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
   XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,  XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
                    _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
diff --git a/keyboards/sofle/keymaps/killmaster/keymap.c b/keyboards/sofle/keymaps/killmaster/keymap.c
index 71db0fc853..5db76bbb72 100644
--- a/keyboards/sofle/keymaps/killmaster/keymap.c
+++ b/keyboards/sofle/keymaps/killmaster/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                    ,-----------------------------------------.
  * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | RESET|      |QWERTY|COLEMAK|      |      |                    |      |      |      |      |      |      |
+ * | QK_BOOT|      |QWERTY|COLEMAK|      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |      |      |MACWIN|      |      |      |-------.    ,-------|      | VOLDO| MUTE | VOLUP|      |      |
  * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_ADJUST] = LAYOUT(
   XXXXXXX , XXXXXXX,  XXXXXXX ,  XXXXXXX , XXXXXXX, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  RESET  , XXXXXXX, KC_QWERTY,  XXXXXXX , CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  QK_BOOT, XXXXXXX, KC_QWERTY,  XXXXXXX , CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX , XXXXXXX,CG_TOGG, XXXXXXX,    XXXXXXX,  XXXXXXX,                     XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
   XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,  XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
                    _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index 30f374f296..b6608b86a3 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                    ,-----------------------------------------.
  * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | RESET|      |      |      |      |      |                    |      |      |      |      |      |      |
+ * | QK_BOOT|      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |RGB_TOG|hue^ |sat ^ | bri ^|      |COLEMAK|-------.   ,-------|desk <|      |      |desk >|      |      |
  * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
@@ -245,7 +245,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,------------------------------------------------.                    ,---------------------------------------------------.
   EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
-  RESET,   XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  QK_BOOT, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK,             C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
@@ -286,7 +286,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.                    ,-----------------------------------------.
  * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | qwer | cole |col_dh| low  | raise| adj  |                    |numpad|      |      |      |      |RESET |
+ * | qwer | cole |col_dh| low  | raise| adj  |                    |numpad|      |      |      |      |QK_BOOT |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |EEP_RST|
  * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
@@ -301,7 +301,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,------------------------------------------------.                    ,---------------------------------------------------.
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
-  TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5),                      TO(6),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,
+  TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5),                      TO(6),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO,                      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   EEP_RST,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
diff --git a/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c b/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
index 82414382eb..5a32dcc016 100644
--- a/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
+++ b/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RALT, KC_RCTL, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT \
     ),
     [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, RESET  , \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, QK_BOOT, \
         _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU, \
         _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD, \
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
index baf46eeac6..9794a557f4 100644
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______,                                     _______, _______, KC_UP,   _______, _______, RGB_TOG,
       _______, _______, _______, _______, _______, _______,                                     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_HUI,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
-                                 _______, _______, _______, _______, _______, _______, _______, RESET,   DEBUG,   _______
+                                 _______, _______, _______, _______, _______, _______, _______, QK_BOOT, DEBUG,   _______
     ),
 // /*
 //  * Layer template
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
index 6937007e5c..71af5f80bd 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT(
-   RESET,   _______, _______, _______, _______, _______,                                     _______, NK_TOGG, CG_TOGG, _______,    GAME,    HNTS,
+   QK_BOOT, _______, _______, _______, _______, _______,                                     _______, NK_TOGG, CG_TOGG, _______,    GAME,    HNTS,
    _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     _______, KC_BRIU, KC_BRID, _______, _______, _______,
    _______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
                              _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
index 240bc6edf5..56f998e24f 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
@@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Adjust Layer: Default layer settings, RGB
  *
  * ,-------------------------------------------.                              ,-------------------------------------------.
- * | NumPad |      |      |QWERTY|      |      |                              |      |      |      |      |      | RESET  |
+ * | NumPad |      |      |QWERTY|      |      |                              |      |      |      |      |      | QK_BOOT  |
  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
  * | Mouse  |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  | DEBUG  |
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
@@ -229,7 +229,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                        `----------------------------------'  `----------------------------------'
  */
     [_ADJUST] = LAYOUT(
-      NUMPAD , _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, RESET  ,
+      NUMPAD , _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, QK_BOOT,
       MOUSE  , _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, DEBUG  ,
       DNAV   , _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, EEPROM_RESET,
                                  _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
index ca4a306341..ec0b7a1a31 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * Adjust Layer: Function keys, RGB
      *
      * ,-------------------------------------------.                              ,-------------------------------------------.
-     * | RESET  |RESET |DEBUG |      |      |      |                              |      | F1   |  F2  | F3   | F4   |        |
+     * | QK_BOOT  |QK_BOOT |DEBUG |      |      |      |                              |      | F1   |  F2  | F3   | F4   |        |
      * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
      * |        | TOG  | SAI  | HUI  | VAI  | MOD  |                              |      | F5   |  F6  | F7   | F8   |        |
      * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                        `----------------------------------'  `----------------------------------'
      */
     [_ADJUST] = LAYOUT_wrapper(
-        RESET,   __ADJUST_L1________________________________,                                     __MEDIA_R1_________________________________, _______,
+        QK_BOOT, __ADJUST_L1________________________________,                                     __MEDIA_R1_________________________________, _______,
         _______, __ADJUST_L2________________________________,                                     __MEDIA_R2_________________________________, _______,
         _______, __ADJUST_L3________________________________, _______, _______, _______, _______, __MEDIA_R3_________________________________, _______,
                                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
index 16d2bad8a4..2f1b56effe 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
  * |        |      |EEPRST|      |      |      |                              |      |      |      |      |      | F12    |
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LSHIFT | TAB  | RESET|      |      |      |      |      |  |      |      | Play |      |      |      |      |        |
+ * | LSHIFT | TAB  | QK_BOOT|      |      |      |      |      |  |      |      | Play |      |      |      |      |        |
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
  *                        |      |      |      |      | Space|  | MYCM | Prev | Next  |      |      |
  *                        |      |      | Ctrl | LAlt |      |  | Raise|      |      |      |      |
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [RAISE] = LAYOUT(
       KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
       KC_NO,   KC_NO,   EEP_RST, KC_NO,   KC_NO,   KC_NO,                                       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F12,
-      KC_LSFT, KC_TAB,  RESET,   KC_NO,   KC_NO,   KC_NO,   _______, _______, _______, _______, KC_MPLY, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+      KC_LSFT, KC_TAB,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   _______, _______, _______, _______, KC_MPLY, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
                                  _______, _______, _______, _______, KC_SPC , KC_MPRV, KC_MNXT, _______, _______, _______
     ),
 /*
diff --git a/keyboards/studiokestra/nascent/keymaps/default/keymap.c b/keyboards/studiokestra/nascent/keymaps/default/keymap.c
index 4802a45d3b..c3c71e7494 100644
--- a/keyboards/studiokestra/nascent/keymaps/default/keymap.c
+++ b/keyboards/studiokestra/nascent/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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),
diff --git a/keyboards/studiokestra/nascent/keymaps/via/keymap.c b/keyboards/studiokestra/nascent/keymaps/via/keymap.c
index e2d83ff634..3339561d9a 100644
--- a/keyboards/studiokestra/nascent/keymaps/via/keymap.c
+++ b/keyboards/studiokestra/nascent/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN,  KC_RGHT),
     [_FN1] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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),
diff --git a/keyboards/sx60/keymaps/amnobis/keymap.c b/keyboards/sx60/keymaps/amnobis/keymap.c
index 1fcfa3d429..014fed6cab 100644
--- a/keyboards/sx60/keymaps/amnobis/keymap.c
+++ b/keyboards/sx60/keymaps/amnobis/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_SPC, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT ),
 
 	LAYOUT_ansi_split_bs_rshift(
-			 RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			 QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_TRNS, KC_TRNS, 
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/tada68/keymaps/iso-nor/keymap.c b/keyboards/tada68/keymaps/iso-nor/keymap.c
index ae0fccccc8..c4d8978716 100644
--- a/keyboards/tada68/keymaps/iso-nor/keymap.c
+++ b/keyboards/tada68/keymaps/iso-nor/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL1: Function Layer
    * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  RESET|PSCR|
+   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  QK_BOOT|PSCR|
    * |----------------------------------------------------------------|
    * |     |   | Up|   |   |   |   |   |   |   |   |BL-|BL+|BL   | INS|
    * |----------------------------------------------------------------|
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
   [_FL] = LAYOUT_iso(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,   KC_PSCR, \
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_PSCR, \
     _______, _______,   KC_UP, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, _______,          KC_INS,  \
     _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_END,  \
diff --git a/keyboards/tada68/keymaps/isoish/keymap.c b/keyboards/tada68/keymaps/isoish/keymap.c
index adbf32251b..69b382e1c2 100644
--- a/keyboards/tada68/keymaps/isoish/keymap.c
+++ b/keyboards/tada68/keymaps/isoish/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Keymap _FL1: Function Layer 1
    * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  RESET|PSCR|
+   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  QK_BOOT|PSCR|
    * |----------------------------------------------------------------|
    * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   | INS|
    * |----------------------------------------------------------------|
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
   [_FL] = LAYOUT_ansi_split_enter(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,   KC_PSCR, \
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_PSCR, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, KC_INS,  \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, \
     _______,          _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_END,  \
diff --git a/keyboards/tada68/keymaps/rys/keymap.c b/keyboards/tada68/keymaps/rys/keymap.c
index 012f2cc05c..118c30c4e7 100644
--- a/keyboards/tada68/keymaps/rys/keymap.c
+++ b/keyboards/tada68/keymaps/rys/keymap.c
@@ -64,6 +64,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_BTN1, KC_UP,   KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME, \
     _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  QSTOKEN, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_MS_U, KC_END,  \
-    _______, _______, _______,                   RESET,                              _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+    _______, _______, _______,                   QK_BOOT,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 	),
 };
diff --git a/keyboards/tada68/keymaps/tokyovigilante/keymap.c b/keyboards/tada68/keymaps/tokyovigilante/keymap.c
index 13159c0d4c..3bf18d357b 100644
--- a/keyboards/tada68/keymaps/tokyovigilante/keymap.c
+++ b/keyboards/tada68/keymaps/tokyovigilante/keymap.c
@@ -3,5 +3,5 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ansi(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 	[1] = LAYOUT_ansi(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R),
-	[2] = LAYOUT_ansi(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
+	[2] = LAYOUT_ansi(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/tada68/keymaps/tokyovigilante/layers.json b/keyboards/tada68/keymaps/tokyovigilante/layers.json
index d6604042e3..e3d20aed88 100644
--- a/keyboards/tada68/keymaps/tokyovigilante/layers.json
+++ b/keyboards/tada68/keymaps/tokyovigilante/layers.json
@@ -1 +1 @@
-[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "MO(1)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DEC", "BL_TOGG", "BL_INC", "KC_TRNS", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_TRNS", "MO(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RESET", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "MO(1)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DEC", "BL_TOGG", "BL_INC", "KC_TRNS", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_TRNS", "MO(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "QK_BOOT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/tanuki/keymaps/tucznak/keymap.c b/keyboards/tanuki/keymaps/tucznak/keymap.c
index 301f0f8419..35272e641c 100644
--- a/keyboards/tanuki/keymaps/tucznak/keymap.c
+++ b/keyboards/tanuki/keymaps/tucznak/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 	 
     [_FN] = LAYOUT(
-        RESET,   _______, _______,  _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, _______, 
+        QK_BOOT, _______, _______,  _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, _______, 
         KC_SLEP, VLK_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, 
         _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, 
                  _______, _______,  _______, _______,          _______,          _______, _______
diff --git a/keyboards/terrazzo/keymaps/ortho/keymap.c b/keyboards/terrazzo/keymaps/ortho/keymap.c
index 986cb884d7..bea5f344eb 100644
--- a/keyboards/terrazzo/keymaps/ortho/keymap.c
+++ b/keyboards/terrazzo/keymaps/ortho/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		  _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
 		  _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  _______, _______,
 		  _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, CG_TOGG,
-		  _______,          RESET,   _______, _______,      _______,          _______,     _______, _______, _______
+		  _______,          QK_BOOT, _______, _______,      _______,          _______,     _______, _______, _______
   )
 };
 
diff --git a/keyboards/terrazzo/keymaps/ortho_all/keymap.c b/keyboards/terrazzo/keymaps/ortho_all/keymap.c
index b0ecd9c911..75c4bb1f6c 100644
--- a/keyboards/terrazzo/keymaps/ortho_all/keymap.c
+++ b/keyboards/terrazzo/keymaps/ortho_all/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  	  _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
 	  	  _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  _______, _______,
 	  	  _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, CG_TOGG,
-	  	  _______,          RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______
+	  	  _______,          QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
 
diff --git a/keyboards/terrazzo/keymaps/ortho_mit/keymap.c b/keyboards/terrazzo/keymaps/ortho_mit/keymap.c
index 87e6d3f786..b0b4bb925c 100644
--- a/keyboards/terrazzo/keymaps/ortho_mit/keymap.c
+++ b/keyboards/terrazzo/keymaps/ortho_mit/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  	  _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
 	  	  _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  _______, _______,
 	  	  _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, CG_TOGG,
-	  	  _______,          RESET,   _______, _______, _______,     _______,      _______, _______, _______, _______
+	  	  _______,          QK_BOOT, _______, _______, _______,     _______,      _______, _______, _______, _______
     )
 };
 
diff --git a/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c b/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
index 3d8099c413..5ba309f8de 100644
--- a/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
+++ b/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     KC_LGUI,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL           \
     ),
     [1] = LAYOUT(
-        RESET,      KC_GRV , KC_F1,   KC_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,  \
+        QK_BOOT,    KC_GRV , KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,  \
         _______,    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_UP  , _______, _______,          \
         _______,    _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,                   \
                     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,          \
diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
index 4180e9464f..6394460c41 100644
--- a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
+++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
  */
 [_ADJUST] = LAYOUT_base_kit_all( \
-    _______, QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \
     _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
index 2744c91000..458475bf14 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
@@ -64,6 +64,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ______, ______,   KC_UP,   ______, ______, ______, ______, ______, ______,   ______,  ______, ______, ______, KC_PSCR, \
     ______,  KC_LEFT, KC_DOWN, KC_RGHT, ______, ______, ______, ______,       ______,          ______, ______, ______, KC_SLEP, \
     ______,           ______,  ______,  ______,  ______, ______,  ______, ______,   ______,  ______, ______, ______, KC_PGUP, \
-    ______,  ______,  ______,           ______,  RESET, ______,                 ______,         ______,  ______, ______, KC_PGDN \
+    ______,  ______,  ______,           ______,  QK_BOOT, ______,                 ______,         ______,  ______, ______, KC_PGDN \
 ),
 };
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
index 48f079515d..45c433fe2b 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [HHKB_NAV_LAYER] = LAYOUT_hhkb_arrow(
-    RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
+    QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
     _______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_UP, _______, KC_DEL,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_HOME,   KC_PGUP, KC_LEFT,  KC_RGHT, KC_ENT,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_END,  KC_PGDN,  KC_DOWN,  _______, _______,
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
index 8a35f896f0..dc64295bd8 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END,  _______, _______, _______, KC_PSCR, \
     _______, KC_MUTE, KC_VOLD, KC_MPLY, KC_PGDN, KC_DEL, KC_LEFT, KC_DOWN,       KC_UP,         KC_RGHT, _______, _______, _______, \
     _______,          BL_STEP, BL_BRTG, _______, _______,_______, LCTL(KC_BSPC), LCTL(KC_DEL),  _______, _______, _______, _______, _______, \
-    _______, _______, _______,          _______, _______,_______,                _______,       _______, _______, _______, RESET \
+    _______, _______, _______,          _______, _______,_______,                _______,       _______, _______, _______, QK_BOOT \
 ),
 };
 
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
index 39cfc0d8fe..92dd8ed903 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [MOD_LAYER] = LAYOUT_hhkb_arrow( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______,  _______,   _______,   _______,  RESET,  _______,   _______,   _______,   _______,   _______,   _______,   _______, _______, _______, \
+    _______,  _______,   _______,   _______,  QK_BOOT,  _______,   _______,   _______,   _______,   _______,   _______,   _______, _______, _______, \
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______, _______, \
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, \
     _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______ \
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
index f8b42cb79b..bc820230e3 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
@@ -178,14 +178,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |----------`------`------`------`------`------`------`------`------`------`------`-----------|
  * |   LSFT    |      |      |      |      |      |      |      |      |      |       |         |
  * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- * |---TRNS---|   CAPS   |   LALT   |              |   SWTCH    |  RALT |       | RESET |--TRNS-|
+ * |---TRNS---|   CAPS   |   LALT   |              |   SWTCH    |  RALT |       | QK_BOOT |--TRNS-|
  *  `---------+----------+----------+-----^^^------+----^^^-----+-------+-------+-------+-------'
  */
   [_FN] = LAYOUT_arrow(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
     _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  XXXXXXX,
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,  KC_SLEP, KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, KC_CAPS, _______,                   XXXXXXX, SWTCH,            KC_RALT, XXXXXXX, RESET,   _______
+    _______, KC_CAPS, _______,                   XXXXXXX, SWTCH,            KC_RALT, XXXXXXX, QK_BOOT, _______
   )
 
 
diff --git a/keyboards/thevankeyboards/minivan/keymaps/danbee/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/danbee/keymap.c
index b675b09b4f..22a39d6398 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/danbee/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/danbee/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     │    │     │    │        │ Pause │    │     │      │
     └────┴─────┴────┴────────┴───────┴────┴─────┴──────┘*/
   [_L2] = LAYOUT( /* LAYER 2 */
-    KC_NUBS, KC_BRID, KC_BRIU, _______, RESET,   _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_EJCT,
+    KC_NUBS, KC_BRID, KC_BRIU, _______, QK_BOOT, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_EJCT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  _______,
     _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
     _______, _______, _______,                   _______, KC_MPLY,                   _______, _______, _______
diff --git a/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c
index 188dd3386b..a036d563a1 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT(
-     RESET, KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX,
+     QK_BOOT, KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX,
    XXXXXXX, KC_WAKE, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX,
    XXXXXXX,  KC_PWR, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX,
    _______, _______, _______,                   XXXXXXX, XXXXXXX,                   _______, _______, XXXXXXX
diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/halvves/keymap.c
index 7054d97ff1..6ef5ecc2c6 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/halvves/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/halvves/keymap.c
@@ -151,7 +151,7 @@ XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,          XXXXXXX,
 
 /* Adjust
 * ,--------------------------------------------------------------------------.
-* |      |     |     |     |     |QWRTY|COLMK|DVRAK|     |     |     | RESET |
+* |      |     |     |     |     |QWRTY|COLMK|DVRAK|     |     |     | QK_BOOT |
 * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
 * |       |     |     |     |     |     |     |     |     |     |     |      |
 * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
@@ -161,7 +161,7 @@ XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,          XXXXXXX,
 * `--------------------------------------------------------------------------'
 */
 [_ADJUST] = LAYOUT_arrow(
-XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERTY,  COLEMAK, DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERTY,  COLEMAK, DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c
index 779292fb3c..780694f335 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c
@@ -49,6 +49,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______,
     _______, RGB_M_P, RGB_HUD, RGB_HUI, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______,
     KC_PSCR, _______, RGB_SAD, RGB_SAI, _______, _______, KC_0, KC_1, KC_2, KC_3, _______, _______,
-    RESET, _______, RGB_VAD, RGB_VAI, _______,     _______,    _______, _______, _______
+    QK_BOOT, _______, RGB_VAD, RGB_VAI, _______,     _______,    _______, _______, _______
   )
 };
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
index a7ace39e39..acf01cd9a4 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
@@ -275,7 +275,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
     _______  ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______    ,
 /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    _______   ,    _______    , _______ ,     _______    ,     _______     , _______ ,     _______     ,    RESET     )
+    _______   ,    _______    , _______ ,     _______    ,     _______     , _______ ,     _______     ,    QK_BOOT     )
 /*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
 };
 
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
index 0c1ea9dd09..7674038a46 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(5, KC_SLSH),
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_SPACE, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
-  [5] = LAYOUT_arrow_command( /* RESET Layer*/
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  [5] = LAYOUT_arrow_command( /* QK_BOOT Layer*/
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/thevankeyboards/minivan/keymaps/king/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/king/keymap.c
index 032aaf5c73..4c9019c669 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/king/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/king/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         /* 4: Reset Layer
    * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-   * │RESET│     │     │     │     │     │     │     │     │     │     │         │
+   * │QK_BOOT│     │     │     │     │     │     │     │     │     │     │         │
    * ├─────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────────┤
    * │      │     │     │     │     │     │     │     │     │     │     │        │
    * ├──────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬─────┤
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────────┴────────┴─────┴────────────┴────────────────┴─────┴─────┴─────────┘
    */
     [_RL] = LAYOUT(
-        RESET,   XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   
+        QK_BOOT, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   
         XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           
         XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           
         XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,           XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
index 1824f3cf39..98d0f63858 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
@@ -25,5 +25,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR,   KC_TRNS, 
 	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,  KC_PIPE, 
 	KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, 
-	BL_TOGG,  BL_DEC,    BL_INC,    KC_TRNS,            KC_TRNS,        KC_TRNS,             KC_TRNS,       RESET)
+	BL_TOGG,  BL_DEC,    BL_INC,    KC_TRNS,            KC_TRNS,        KC_TRNS,             KC_TRNS,       QK_BOOT)
 };
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c
index 1332367f85..4403dd662a 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT(
   //,-----------------------------------------------------------------------------------------------------------.
   //             Reset LEDReset  MacMode  WinMode              Home PageDown   PageUp      End
-      _______,   RESET,  RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, XXXXXXX, XXXXXXX,
+      _______,   QK_BOOT,  RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
   //           LED On/Off Hue/Saturation/Value Increment    Mouse Left Down Up Right
       _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, _______,
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
index a9d3a802dc..2414faf62d 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   {_______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5, KC_F6, KC_F7,  KC_F8,  KC_F9,  KC_F10, _______},
   {KC_DEL, KC_F11, KC_F12,  KC_F13,  KC_F14,  KC_F15, _______, _______,  _______,  MACSLEEP, DYN_REC_START1, DYN_REC_START2 },
   {KC_CAPS,  _______, _______,  _______,  _______, _______, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,_______,DYN_REC_STOP},
-  {_______,_______,_______,LAYERRESET,XXXXXXX,XXXXXXX,XXXXXXX,LAYERRESET,    KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
+  {_______,_______,_______,LAYERRESET,XXXXXXX,XXXXXXX,XXXXXXX,LAYERQK_BOOT,  KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 },
 [_PLOVER] = {
   {KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   },
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   {LAYERRESET, XXXXXXX, KC_C,    KC_V,   XXXXXXX ,  XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX}
 },
 [_ADJUST] = {
- {_______ , RESET,   _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_PSCR, KC_DEL },
+ {_______ , QK_BOOT, _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_PSCR, KC_DEL },
  {_______ , _______, _______, _______, _______,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,  PLOVER, _______},
  {_______ , _______,  _______,  _______,   _______,  _______,   _______,  _______, _______, _______, _______, _______},
  {BACKLIT, _______, _______, LAYERRESET, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
index 371bcd4719..f21d779163 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
@@ -155,7 +155,7 @@ ALT_T(BACKLIT),   _______   , _______ ,     KC_MPLY    ,     KC_MNXT     , _____
  */
 [_ADJUST] = LAYOUT_arrow(
 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    _______, RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______,      RESET      ,
+    _______, QK_BOOT , _______, _______, _______, _______, _______, _______, _______, _______, _______,      QK_BOOT      ,
 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
     _______ ,_______, _______, _______, _______, AG_NORM, AG_SWAP,  QWERTY, COLEMAK,  DVORAK, _______,    _______     ,
 /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
index b4d5234561..efba49e1ea 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
@@ -136,7 +136,7 @@ _______,_______,_______, _______,_______,        MOUSE  ,XXXXXXX ,XXXXXXX,BACKLI
 ),
 /* MOUSE
  * ,--------------------------------------------------------------------------.
- * |      |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     | RESET |
+ * |      |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     | QK_BOOT |
  * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
  * |       |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |      |
  * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
@@ -146,7 +146,7 @@ _______,_______,_______, _______,_______,        MOUSE  ,XXXXXXX ,XXXXXXX,BACKLI
  * `--------------------------------------------------------------------------'
  */
 [_MOUSE] = LAYOUT_arrow(
-XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,RESET,
+XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,QK_BOOT,
 XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,XXXXXXX,KC_BTN1,KC_WH_D,KC_BTN2,XXXXXXX,XXXXXXX,
 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_ACL0,KC_ACL1,KC_ACL2,XXXXXXX,WINDOW,
 XXXXXXX,XXXXXXX,XXXXXXX,                EXT_MOUSE,EXT_MOUSE,        XXXXXXX,XXXXXXX,XXXXXXX,MAC
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
index f5649573d8..cbd6aa8b3d 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
     KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, RESET,   _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+    _______, QK_BOOT, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_HOME, KC_END,  _______,                   _______, _______,                   _______, KC_PGUP, KC_PGDN
   )
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
index 674f3f37ab..867ca07c7c 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----`-----`-----`-----'
    */
   [_L1] = LAYOUT_ortho_4x4( /* LAYER 1 */
-    RESET,   XXXXXXX, XXXXXXX, KC_DEL, \
+    QK_BOOT, XXXXXXX, XXXXXXX, KC_DEL, \
     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, \
     STR192,  STR255,  XXXXXXX, XXXXXXX, \
     _______, BL_STEP, _______, XXXXXXX
diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
index 5e3debd8d3..cdb06d7bc5 100755
--- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, \
-             _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET,   RESET,   _______, _______, _______, _______, _______, _______, _______, \
+             _______, RGB_LYR, RGB_THM, _______, EEP_RST, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
              _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
 
 )
diff --git a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c b/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
index 0dfd0d54af..ce45cd436f 100644
--- a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
+++ b/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_all(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, RESET,
+    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
index 9eceaa5bda..6d90018fe8 100644
--- a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [FUNCTION] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, \
                                                                                                                                            KC_DEL,  KC_END,  KC_PGDN, KC_SLCK, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, \
     _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______, _______,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
     _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX, \
diff --git a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
index 2ebfe33c3d..ec657be274 100644
--- a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[FUNCTION] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, \
                                                                                                                                            _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   XXXXXXX, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          _______, _______, _______, _______, \
     _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,      _______,     _______, _______, _______, XXXXXXX, \
diff --git a/keyboards/tmo50/keymaps/olivia/keymap.c b/keyboards/tmo50/keymaps/olivia/keymap.c
index c1e86f9b90..897ab54a2b 100644
--- a/keyboards/tmo50/keymaps/olivia/keymap.c
+++ b/keyboards/tmo50/keymaps/olivia/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // Fn3 layer
   [3] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/tmo50/keymaps/ottodokto/keymap.c b/keyboards/tmo50/keymaps/ottodokto/keymap.c
index 688395c9d9..a14c9541de 100644
--- a/keyboards/tmo50/keymaps/ottodokto/keymap.c
+++ b/keyboards/tmo50/keymaps/ottodokto/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   // RGB Control Layer
   [3] = LAYOUT_all(
-		RGB_SPI, RGB_TOG, RGB_HUD, RGB_VAI, RGB_HUI, _______, _______, _______, _______, _______,    _______,   _______,    _______, _______, RESET,
+		RGB_SPI, RGB_TOG, RGB_HUD, RGB_VAI, RGB_HUI, _______, _______, _______, _______, _______,    _______,   _______,    _______, _______, QK_BOOT,
 		RGB_SPD, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______, _______, _______, _______,    _______,   _______, _______, _______,
 		_______, _______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VLK_TOG, _______, _______, _______, EEP_RST,
 		_______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/tmo50/keymaps/pyrol/keymap.c b/keyboards/tmo50/keymaps/pyrol/keymap.c
index f67d26092f..53534f56e3 100644
--- a/keyboards/tmo50/keymaps/pyrol/keymap.c
+++ b/keyboards/tmo50/keymaps/pyrol/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // Fn4 layer
   [4] = LAYOUT_all(
-    	RESET, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
+    	QK_BOOT, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
 		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/tmo50/keymaps/xerpocalypse/keymap.c b/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
index ca93f9aa88..50abdcd00b 100644
--- a/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
+++ b/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // Fn3 layer
   [3] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DEC, KC_TRNS, 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/tr60w/keymaps/joule-flow/keymap.c b/keyboards/tr60w/keymaps/joule-flow/keymap.c
index bfe0db0d5e..3adc9a84f9 100644
--- a/keyboards/tr60w/keymaps/joule-flow/keymap.c
+++ b/keyboards/tr60w/keymaps/joule-flow/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			),
 
     LAYOUT_60_tsangan_hhkb(
-        RESET,   KC_F1,   KC_F2,			KC_F3,   		KC_F4,   		KC_F5,   		KC_F6,   	KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS,
+        QK_BOOT, KC_F1,   KC_F2,			KC_F3,   		KC_F4,   		KC_F5,   		KC_F6,   	KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS,
         _______, KC_BSPC, KC_UP, 			KC_ENT, 		_______, 		_______, 		_______, 	KC_WH_U, 	KC_BTN1 , KC_MS_U , KC_BTN2, KC_WH_L, _______, KC_DEL,
         _______, KC_LEFT, KC_DOWN,		KC_RIGHT, 	_______, 		_______, 		_______, 	KC_WH_D, 	KC_MS_L , KC_MS_D , KC_MS_R, KC_WH_R,          _______,
         _______,          RCTL(KC_Y), RCTL(KC_X),	RCTL(KC_C),	RCTL(KC_V),	_______,  _______, 	_______, 	_______, 	_______, _______, _______, _______,
diff --git a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
index 50b1f7a62e..0cbe1bb7f9 100644
--- a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
@@ -54,8 +54,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(5, KC_SLSH),
         KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [5] = LAYOUT_jetvan( /* RESET Layer*/
-        RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    [5] = LAYOUT_jetvan( /* QK_BOOT Layer*/
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/uk78/keymaps/rask/keymap.c b/keyboards/uk78/keymaps/rask/keymap.c
index 6caee229ba..f29177fa0c 100644
--- a/keyboards/uk78/keymaps/rask/keymap.c
+++ b/keyboards/uk78/keymaps/rask/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL2] = LAYOUT_all(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, RESET,   _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,          _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,          _______, _______, _______, _______, _______,
     KC_CAPS, _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  BL_INC,  KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_APP,  KC_APP,                             BL_TOGG,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
index 63f142d913..23d3c5edc7 100644
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
+++ b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       RGB_HUD,  RGB_HUI,  XXXXXXX,   RGB_M_P,
       RGB_SAD,  RGB_SAI,  XXXXXXX,   RGB_MOD,
       RGB_VAD,  RGB_VAI,  XXXXXXX,   XXXXXXX,
-        RESET,    RESET,  XXXXXXX,   XXXXXXX
+        QK_BOOT,  QK_BOOT,  XXXXXXX,   XXXXXXX
   ),
 };
 
diff --git a/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
index 415df2eead..d3cecbff8b 100644
--- a/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_Q,    KC_D,      KC_R,      KC_W,    KC_B,    KC_LPRN,                         KC_RPRN,   KC_J,        KC_F,    KC_U,    KC_P,   KC_SCLN, KC_EQL,
         KC_TAB,  KC_A,    KC_S,      KC_H,      KC_T,    KC_G,    KC_LCBR,                         KC_RCBR,   KC_Y,        KC_N,    KC_E,    KC_O,   KC_I,    KC_BSLS,
         KC_LCTL, KC_Z,    KC_X,      KC_M,      KC_C,    KC_V,    KC_LBRC,                         KC_RBRC,   KC_K,        KC_L,    KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
-        KC_LSFT, RESET,   PAGE_PREV, PAGE_NEXT, KC_END,  KC_LGUI, KC_LALT, TG(_GAME),     LO_BSPC, ENT_RAISE, SPACE_RAISE, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_RCTL),
+        KC_LSFT, QK_BOOT, PAGE_PREV, PAGE_NEXT, KC_END,  KC_LGUI, KC_LALT, TG(_GAME),     LO_BSPC, ENT_RAISE, SPACE_RAISE, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_RCTL),
 
     [_GAME] = LAYOUT(
         KC_ESC,  KC_1,    KC_2,      KC_3,      KC_4,    KC_5,    KC_6,                            KC_6,      KC_7,        KC_8,    KC_9,    KC_0,   KC_MINS, KC_ESC,
@@ -201,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_F1,   KC_F2,     KC_3,      KC_F5,   KC_SPC,  KC_LALT, TG(_GAME),     LO_BSPC, ENT_RAISE, SPACE_RAISE, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_RCTL),
 
     [_RAISE] = LAYOUT(
-        _______, KC_F1,   KC_F2,     KC_F3,     KC_F4,   KC_F5,   KC_F6,                           KC_F6,     KC_F7,       KC_F8,   KC_F9,   KC_F10,  KC_F11,  RESET,
+        _______, KC_F1,   KC_F2,     KC_F3,     KC_F4,   KC_F5,   KC_F6,                           KC_F6,     KC_F7,       KC_F8,   KC_F9,   KC_F10,  KC_F11,  QK_BOOT,
         _______, _______, _______,   _______,   _______, _______, BL_INC,                          KC_VOLU,   _______,     _______, _______, _______, _______, KC_F12,
         _______, _______, _______,   _______,   _______, _______, BL_DEC,                          KC_VOLD,   KC_LEFT,     KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
         _______, _______, _______,   _______,   _______, _______, BL_BRTG,                         KC_MUTE,   _______,     _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,
diff --git a/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
index 5f478c1df1..a7371d47c1 100644
--- a/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILD,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_BSPC, \
   KC_DEL, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_PIPE, \
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  X_____X, X_____X, X_____X, X_____X, FIREY_RETURN, \
-  RESET, TO(_QWERTY), _______, _______, _______,              MO(_RAISE), _______, _______, TO(_QWERTY), X_____X \
+  QK_BOOT, TO(_QWERTY), _______, _______, _______,              MO(_RAISE), _______, _______, TO(_QWERTY), X_____X \
 ),
 
 /* Raise
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  X_____X,   X_____X,   X_____X,   X_____X,   X_____X,   X_____X,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSPC, \
   KC_DEL,  KC_1,      KC_2,      KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
   _______, X_____X, X_____X,   X_____X,   X_____X,  X_____X,  X_____X,  X_____X, X_____X, X_____X, X_____X, FIREY_RETURN, \
-  X_____X, TO(_QWERTY), _______, _______, MO(_LOWER),                      _______, _______, _______, TO(_QWERTY), RESET \
+  X_____X, TO(_QWERTY), _______, _______, MO(_LOWER),                      _______, _______, _______, TO(_QWERTY), QK_BOOT \
 ),
 
 
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
index cca95c509d..dffa9a1fd2 100644
--- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
+++ b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          * |-----------------------------------------------------------|
          * |      |Lft|Dwn|Rig|HUD|SAD|VAD|   |Hme|PgU|Lef|Rig|        |
          * |-----------------------------------------------------------|
-         * |        |BLD|BLT|BLI|   |VolD|VolU|Mut|End|PgD|Dwn|  RESET |
+         * |        |BLD|BLT|BLI|   |VolD|VolU|Mut|End|PgD|Dwn|  QK_BOOT |
          * |-----------------------------------------------------------|
          * |    |    |    |                        |    |AGSW|    |    |
          * `-----------------------------------------------------------'
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	       KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL, \
 	       KC_TRNS,   KC_TRNS,  KC_UP,    RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS, \
 	       KC_TRNS,   KC_LEFT,  KC_DOWN,  KC_RIGHT, RGB_HUD, RGB_SAD, RGB_VAD,   KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          KC_TRNS,          \
-	       KC_TRNS,   BL_INC,  BL_STEP,  BL_DEC,  KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           RESET,  \
+	       KC_TRNS,   BL_INC,  BL_STEP,  BL_DEC,  KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           QK_BOOT,  \
 	       KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  AG_SWAP, KC_TRNS, KC_TRNS),
 
 /*
@@ -89,7 +89,7 @@ WASD are Up Left Right Down respectively
                 KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS, \
                 KC_TRNS,   KC_BTN1,  KC_MS_U,    KC_BTN2,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,    KC_TRNS,          KC_TRNS, \
                 KC_TRNS,   KC_MS_L,  KC_MS_D,  KC_MS_R, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT,          KC_TRNS,          \
-                KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,           RESET,  \
+                KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,           QK_BOOT,  \
                 KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
 
 
diff --git a/keyboards/vertex/angler2/keymaps/default/keymap.c b/keyboards/vertex/angler2/keymaps/default/keymap.c
index 332fc63c11..ae6d76e326 100644
--- a/keyboards/vertex/angler2/keymaps/default/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_all(
 
-    RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
+    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
diff --git a/keyboards/vertex/angler2/keymaps/via/keymap.c b/keyboards/vertex/angler2/keymaps/via/keymap.c
index f149b6b462..03c46eee3a 100644
--- a/keyboards/vertex/angler2/keymaps/via/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_all(
 
-    RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
+    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [2] = LAYOUT_all(
 
-    RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
+    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [3] = LAYOUT_all(
 
-    RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
+    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
diff --git a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c b/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
index 93d65c93a2..6d0727be2c 100644
--- a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
+++ b/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, L_CTRL,  KC_LGUI, L_ALT, KC_NO, LHAND,          RHAND, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_LHAND] = LAYOUT_all(
-        RESET,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,
+        QK_BOOT, KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,
         KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS,
         KC_PGUP, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT,  KC_TRNS,
         KC_PGDN, KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT,  KC_BSPC,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSPC, KC_TRNS,
diff --git a/keyboards/viktus/styrka/keymaps/all/keymap.c b/keyboards/viktus/styrka/keymaps/all/keymap.c
index 01c8362e24..7a61b3a3fa 100644
--- a/keyboards/viktus/styrka/keymaps/all/keymap.c
+++ b/keyboards/viktus/styrka/keymaps/all/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 [1] = LAYOUT_all( /* Styrka Base */
-	RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
diff --git a/keyboards/viktus/styrka/keymaps/split_bs/keymap.c b/keyboards/viktus/styrka/keymaps/split_bs/keymap.c
index 435bcf0a44..45cbe86cdb 100644
--- a/keyboards/viktus/styrka/keymaps/split_bs/keymap.c
+++ b/keyboards/viktus/styrka/keymaps/split_bs/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 [1] = LAYOUT_split_bs( /* Styrka Base */
-	RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
diff --git a/keyboards/vitamins_included/keymaps/numpad/keymap.c b/keyboards/vitamins_included/keymaps/numpad/keymap.c
index 5bff826145..03cfafda11 100644
--- a/keyboards/vitamins_included/keymaps/numpad/keymap.c
+++ b/keyboards/vitamins_included/keymaps/numpad/keymap.c
@@ -42,14 +42,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      | RESET RESET |      |      |      |      |RGBMOD|
+ * |      |      |      |      |      | QK_BOOT QK_BOOT |      |      |      |      |RGBMOD|
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
   _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, RESET, RESET, _______, _______, _______, _______, RGB_MOD
+  _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, RGB_MOD
 )
 
 
diff --git a/keyboards/vitamins_included/keymaps/vitavim/keymap.c b/keyboards/vitamins_included/keymaps/vitavim/keymap.c
index e90f0e076e..d59ff88029 100644
--- a/keyboards/vitamins_included/keymaps/vitavim/keymap.c
+++ b/keyboards/vitamins_included/keymaps/vitavim/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------'
  */
 [_VIM] =  LAYOUT_ortho_4x12(
-    KC_TAB,         KC_QUOT, KC_B,    KC_W,    KC_E,          KC_D,   KC_Y,         KC_VOLD,       KC_VOLU,       TO(0),   TG(2),         RESET,
+    KC_TAB,         KC_QUOT, KC_B,    KC_W,    KC_E,          KC_D,   KC_Y,         KC_VOLD,       KC_VOLU,       TO(0),   TG(2),         QK_BOOT,
     LCTL_T(KC_ESC), KC_HOME, KC_HOME, KC_PGUP, KC_PGDN,       KC_END, KC_LEFT,      KC_DOWN,       KC_UP,         KC_RGHT, LT(2,KC_SCLN), KC_ENT,
     KC_LSFT,        KC_SCLN, KC_Q,    KC_CIRC, KC_DLR,        KC_X,   RALT(KC_EQL), RCTL(KC_PLUS), RCTL(KC_PMNS), KC_NO,   KC_NO,         KC_TRNS,
     KC_LCTL,        KC_LGUI, KC_LALT, KC_LSFT, LSFT(KC_LCTL), KC_SPC, KC_DEL,       KC_BSPC,       KC_NO,         KC_NO,   KC_NO,         KC_TRNS
diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
index 1193fa32c2..b7ab190862 100644
--- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
+++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT( \
-    QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, \
+    QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
              _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
diff --git a/keyboards/waterfowl/keymaps/cyanduck/keymap.c b/keyboards/waterfowl/keymaps/cyanduck/keymap.c
index ffcf18ae26..ac52c7454d 100644
--- a/keyboards/waterfowl/keymaps/cyanduck/keymap.c
+++ b/keyboards/waterfowl/keymaps/cyanduck/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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,
-  RESET,   KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F13,
+  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
 ),
 
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
index bec31246ca..877b042361 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTRL,KC_LGUI,KC_LALT,               KC_SPC,                        KC_RALT,MO(_F1),     KC_LEFT,KC_DOWN, KC_RGHT),
 
   [_F1] = LAYOUT_iso(
-    RESET,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,_______,_______,
+    QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
diff --git a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
index 902645d177..e607f8ade1 100644
--- a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
+++ b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT(
 		KC_ESC,  _______, _______,    _______, _______, _______, _______, _______, RALT(KC_8),  RALT(KC_9), _______, _______, _______, KC_DEL,  KC__VOLUP,
 		_______, _______, _______,    _______, _______, _______, _______, KC_PGUP, KC_UP,       KC_PGDN,    _______, _______, _______,          KC__VOLDOWN,
-		_______, _______, SGUI(KC_5), KC_F11,  _______, _______, _______, KC_LEFT, KC_DOWN,     KC_RGHT,    _______, _______, RESET  , _______,
+		_______, _______, SGUI(KC_5), KC_F11,  _______, _______, _______, KC_LEFT, KC_DOWN,     KC_RGHT,    _______, _______, QK_BOOT, _______,
 		KC_LSFT, _______, _______,    _______, _______, _______, _______, _______, _______,     _______,    _______, _______, KC_RSFT, _______, KC_MPLY,
 		_______, _______, _______,                               _______,                                   _______, _______,          KC_MRWD, KC__MUTE, KC_MFFD),
 };
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
index c0df375a77..4a937cf394 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_LE] = LAYOUT_iso (
-      _______, _______, _______, _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,      _______, _______, _______, RESET,
+      _______, _______, _______, _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,      _______, _______, _______, QK_BOOT,
       _______, _______, _______, _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______,                        RGB_TOG, RGB_MOD, RGB_RMOD,_______,
       _______, _______, _______, _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,               RGB_HUI, RGB_SAI, RGB_VAI, _______,
       _______, _______, _______, _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,               RGB_HUD, RGB_SAD, RGB_VAD, _______,
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
index e23b83e142..6d6da28ee7 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_CAPS, KC_LGUI,KC_LALT,                    KC_NO,KC_SPC,KC_NO,        KC_RALT,KC_RALT,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
 
 [_F1] = LAYOUT_all( /* Function Layer */
-  RESET,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,       _______, _______, _______, _______,
+  QK_BOOT, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,       _______, _______, _______, _______,
   _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
index fc81220e41..b1ed28b001 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	         _______, _______,                            _______,                            _______, _______),
 
 [LIGHTING] = LAYOUT_60_hhkb(
-	RESET,   EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  _______, _______, _______, _______, BR_DEC,  BR_INC,  _______, _______,
+	QK_BOOT, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  _______, _______, _______, _______, BR_DEC,  BR_INC,  _______, _______,
 	TG_GAME, _______, _______, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  _______, _______, _______, _______, ES_DEC,  ES_INC,  _______,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c b/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
index b97474f23d..ae1dadf15c 100644
--- a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
+++ b/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [_FNMS] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSLS,  KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, RESET,
+	KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,
 	AG_TOGG, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/keymap.c b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/keymap.c
index 8b650dee35..32062982bf 100644
--- a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/keymap.c
+++ b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FNMS] = LAYOUT_all(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, RESET,            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, QK_BOOT,          KC_VOLU,
 		AG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_VOLD,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1,                   KC_MS_U, KC_BTN2,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_MS_L, KC_MS_D, KC_MS_R),
diff --git a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c b/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
index f0a6edc0b8..d4f7e3448a 100644
--- a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
+++ b/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
    [_FL1] = LAYOUT(
      _______, _______, _______, _______,
-     _______, STOKEN5, KC_NUBS, RESET),
+     _______, STOKEN5, KC_NUBS, QK_BOOT),
   /* Keymap base layer (_FL2) - function layer 2
    * ,---------------------------.
    * |      |      |      |      |
diff --git a/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
index 971782561c..d612582d84 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_CL] = LAYOUT_60_ansi_split_bs_rshift(
 		_______, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  _______, _______, _______, _______, BR_DEC,  BR_INC,  _______,  _______,
-		_______, _______, _______, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  _______, _______, _______, _______, ES_DEC,  ES_INC,  RESET,
+		_______, _______, _______, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  _______, _______, _______, _______, ES_DEC,  ES_INC,  QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
index 755ace8618..e9f5056343 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // 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] = {
-        {RESET,   EF_DEC,  EF_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  _______, _______, _______, _______, _______, _______, _______},
+        {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_  },
diff --git a/keyboards/woodkeys/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
index 94806c5da2..a4c6fbfc10 100644
--- a/keyboards/woodkeys/meira/keymaps/cole/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          * `-----------------------------------------------------------------------------------'
          */
         [_ADJUST] =  LAYOUT( \
-                RESET, _______,   _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
+                QK_BOOT, _______,   _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
                 BL_STEP, RGB_MOD, _______, AU_ON,   AU_OFF,  _______, _______, _______,  _______, _______,  _______, _______, \
                 BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
                 _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, OUT_AUTO, OUT_USB, OUT_BT \
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
index 35fa31b8b8..bd6a7d3434 100644
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] =  LAYOUT( \
-    _______, RESET,   _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_DEL, \
+    _______, QK_BOOT, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_DEL, \
     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
index 25f50abc49..00ca6a9db9 100644
--- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          * `-----------------------------------------------------------------------------------'
          */
         [_ADJUST] =  LAYOUT( \
-                BL_TOGG, RESET,   _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
+                BL_TOGG, QK_BOOT, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
                 BL_STEP, RGB_MOD, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______, \
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
                 _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/wsk/sl40/keymaps/prototype/keymap.c b/keyboards/wsk/sl40/keymaps/prototype/keymap.c
index cc5a2eb8a1..4d03604441 100644
--- a/keyboards/wsk/sl40/keymaps/prototype/keymap.c
+++ b/keyboards/wsk/sl40/keymaps/prototype/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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, KC_EQL,  KC_DEL,
-        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   RESET,   KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT,          KC_TRNS,
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   QK_BOOT, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT,          KC_TRNS,
         KC_TRNS,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPLY, KC_MSTP, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_HOME, KC_PGDN, KC_END
     )
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
index 5983625adc..5d8fd4a0a9 100644
--- a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
+++ b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,    KC_END,  KC_VOLU,
         _______, RGB_HUD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_M_P, _______, _______, _______, KC_BRIU, KC_PAUS, KC_PSCR, _______, _______,             KC_MUTE, KC_VOLD,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_SAD, RGB_M_B, _______, _______, _______, KC_BRID, _______, _______,          _______,
-        _______, _______, RGB_TOG, LED_TOG, _______, EEP_RST, RESET,   _______, _______, TG(MAC), TG(ALT), _______, _______, _______,             KC_PGUP,
+        _______, _______, RGB_TOG, LED_TOG, _______, EEP_RST, QK_BOOT, _______, _______, TG(MAC), TG(ALT), _______, _______, _______,             KC_PGUP,
         _______, _______, KC_LALT,          _______,          _______,          _______,          _______, _______, _______,             KC_HOME, KC_PGDN, KC_END
     ),
     [SUPR] = LAYOUT_all(
@@ -191,7 +191,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 eeconfig_update_user(user_config.raw);
             }
             return false;
-        case RESET:
+        case QK_BOOT:
             if (record->event.pressed) {
                 key_timer = timer_read32();
             } else {
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
index c57f634f2b..8e28156aa5 100644
--- a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                            
   // 1: Function 1 Layers                                                                                                                  
   LAYOUT_all(                                                                                                                                  
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PAUS,   KC_PSCR,    \
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PAUS,   KC_PSCR,    \
       KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,    \
       KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT,  KC_MSTP,  KC_TRNS,   KC_NO,               KC_TRNS,    \
       KC_TRNS, TG(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,   KC_TRNS,  KC_PGUP,   KC_TRNS,    \
diff --git a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
index e630851db5..1dfda06f2f 100644
--- a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,          KC_LSFT,                KC_SPC,         KC_ESC,  KC_RGUI, MO(1),    KC_LEFT, KC_DOWN,  KC_RIGHT
     ),
     [1] = LAYOUT_60_ansi_split_bs_rshift_space(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
         KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
         KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
         KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
index ab129332c9..1e0dcacc22 100644
--- a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 2: Cool Layer
   LAYOUT_all(
-    RESET,   BL_DEC,   BL_INC,  BL_ON,   BL_OFF, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_MODE_PLAIN, KC_TRNS,    \
+    QK_BOOT, BL_DEC,   BL_INC,  BL_ON,   BL_OFF, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_MODE_PLAIN, KC_TRNS,    \
     KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,       \
     KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,       \
     KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),       \
diff --git a/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c b/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
index 6964ca3158..584611c53c 100644
--- a/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FL] = LAYOUT_60_ansi(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, RESET,
+		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, RGB_TOG,
 		_______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, RGB_MOD, _______,
 		_______, _______,          _______,                   _______,                            _______, _______, _______, _______
diff --git a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c b/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
index 84a4a63afe..38dfd2ca35 100644
--- a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 1: Function Layer
   LAYOUT_all(
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
       KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
index 0a18678dcc..5817e61dbf 100755
--- a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                  KC_RALT,     KC_APP, KC_NO,  KC_TRNS, KC_RCTL),
 	
 	[2] = LAYOUT_all(
-		KC_NO, KC_NO,   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, RESET,
+		KC_NO, KC_NO,   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, QK_BOOT,
 		KC_NO, BL_TOGG, BL_STEP, BL_ON,    BL_OFF,   BL_INC,   BL_DEC,  BL_BRTG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
 		KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI,  RGB_HUD,  RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_NO, KC_NO,
 		KC_NO, RGB_M_P, RGB_M_B, RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_TRNS,
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
index d17fc2f35d..30e6e688e8 100644
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 1: Function Layer
   LAYOUT_all(
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13, KC_F14,    \
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13, KC_F14,    \
       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO, \
       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO, \
       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,  KC_NO,      \
diff --git a/keyboards/xiudi/xd60/keymaps/krusli/keymap.c b/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
index 697d6d7f1f..92591567d3 100644
--- a/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_all(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   _______,      \
-      RESET,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_INS,                 \
+      QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_INS,                 \
       _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_NO,        _______,           \
       _______, KC_NO,   _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,  _______,      \
       _______, _______, _______,                          _______,                              _______, _______, _______, _______, _______),
diff --git a/keyboards/xiudi/xd60/keymaps/melka/keymap.c b/keyboards/xiudi/xd60/keymaps/melka/keymap.c
index bb3159981f..b80a8da5ae 100644
--- a/keyboards/xiudi/xd60/keymaps/melka/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/melka/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 2: RGB Layer
   LAYOUT_melka(
-      RGB_TOG,  RGB_M_P,    RGB_RMOD,   RGB_MOD,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_X,    RGB_M_G,    RGB_M_T,    _______,    _______,    RESET,
+      RGB_TOG,  RGB_M_P,    RGB_RMOD,   RGB_MOD,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_X,    RGB_M_G,    RGB_M_T,    _______,    _______,    QK_BOOT,
       _______,  RGB_HUD,    RGB_HUI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
       _______,  RGB_SAD,    RGB_SAI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
       TO(0),    _______,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    PASS_A,      PASS_B,    _______,    _______,
diff --git a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
index d6c9035c28..b48d997ecf 100644
--- a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_DEL,    \
       KC_TRNS,   RGB_MOD, RGB_VAI,  KC_TRNS,  KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPLY,  KC_MRWD,  KC_MFFD,            KC_MSTP, \
       KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_NO,              KC_ENT,    \
-      KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS,KC__VOLDOWN,KC__VOLUP,KC_NO,   KC__MUTE,KC_PGUP,  RESET,   \
+      KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS,KC__VOLDOWN,KC__VOLUP,KC_NO,   KC__MUTE,KC_PGUP,  QK_BOOT, \
       KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDOWN,KC_END
       ),
 
diff --git a/keyboards/xiudi/xd60/keymaps/rooski/keymap.c b/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
index 71d5451dc4..9eb68ca368 100644
--- a/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
@@ -48,9 +48,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  // 2: Lighting Keys
   [_LK] = LAYOUT_all(
-      TO(_BL), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   RESET,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,   \
+      TO(_BL), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   QK_BOOT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,   \
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX,           \
-      RESET  , KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           \
+      QK_BOOT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           \
       XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, RGB_VAI, BL_STEP,  \
       XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            TO(_BL), XXXXXXX, RGB_TOG, RGB_VAD, RGB_MOD),
 
diff --git a/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c b/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
index a827744c14..d1417281ee 100644
--- a/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 1: Function Layer
   LAYOUT_all(
-      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,    \
+      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,    \
       KC_CAPS, KC_MPRV, KC_UP,   KC_MNXT, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_DEL,    \
       MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_ENT,    \
       KC_LSFT, KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_PGUP,  KC_INS,    \
diff --git a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
index fa0be3d9d3..46e9b5aae6 100644
--- a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
@@ -24,6 +24,6 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_ansi(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, 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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, TG(1)),
-	[1] = LAYOUT_60_ansi(RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_UP, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+	[1] = LAYOUT_60_ansi(QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_UP, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
index 497ca40a98..b37e25500b 100644
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
     LALT(KC_F4), KC_F1  , KC_F2       , KC_F3       , KC_F4       , KC_F5  , BL_TOGG, KC_F6  , KC_F7  , KC_F8      , KC_F9      , KC_F10    , KC_F11  , KC_F12 , KC_NLCK,
     _______    , _______, SLC_ALL     , SLC_ROW     , SLC_WRD     , KC_BRIU, BL_STEP, _______, _______, LSFT(KC_7) , LSFT(KC_8) , LSFT(KC_9), KC_8    , _______, _______,
-    _______    , _______, LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), KC_BRID, BL_BRTG, _______, _______, LSFT(KC_4) , LSFT(KC_5) , LSFT(KC_6), KC_7    , _______, RESET  ,
+    _______    , _______, LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), KC_BRID, BL_BRTG, _______, _______, LSFT(KC_4) , LSFT(KC_5) , LSFT(KC_6), KC_7    , _______, QK_BOOT,
     _______    , _______, KC_MUTE     , KC_VOLD     , KC_VOLU     , KC_MPLY, RGB_TOG, _______, _______, LSFT(KC_1) , LSFT(KC_2) , LSFT(KC_3), KC_ENT  , _______, _______,
     _______    , _______, _______     , _______     , _______     , _______, RGB_MOD, _______, _______, LSFT(KC_0) , KC_00      , KC_V      , _______ , _______, _______
   )
diff --git a/keyboards/xiudi/xd75/keymaps/adi/keymap.c b/keyboards/xiudi/xd75/keymaps/adi/keymap.c
index aa45d598e3..93bc5a2ccd 100644
--- a/keyboards/xiudi/xd75/keymaps/adi/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/adi/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  RESET, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+  QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
   KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
   KC_CAPS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______,
   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_PGUP, KC_WH_D,
diff --git a/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c b/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
index c278df1b21..0705cff938 100644
--- a/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        |        |        | RGB VD | BL TG  | RGB VI |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | FN     | RGB TG |        | MS W L | MS W R |        | RESET  |        | MS 1   | MS 2   | RGB RMD| RGB MD | FN     |        |
+ * |        | FN     | RGB TG |        | MS W L | MS W R |        | QK_BOOT  |        | MS 1   | MS 2   | RGB RMD| RGB MD | FN     |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_WH_U, _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, RGB_SAD, _______, RGB_SAI, KC_LBRC, KC_RBRC, KC_UP  , _______ , KC_EQL , KC_BSLS,
   KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, RGB_VAD, _______, RGB_VAI, KC_MINS, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
   _______, _______, _______, _______, _______, _______, RGB_RMOD,A_BL_TG, RGB_MOD, _______, _______, _______, _______ , _______, _______,
-  _______, TT(_FN), RGB_TOG, _______, KC_WH_L, KC_WH_R, TT(_FN), RESET  , TT(_FN), KC_BTN1, KC_BTN2, _______, _______ , TT(_FN), _______
+  _______, TT(_FN), RGB_TOG, _______, KC_WH_L, KC_WH_R, TT(_FN), QK_BOOT, TT(_FN), KC_BTN1, KC_BTN2, _______, _______ , TT(_FN), _______
  )
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
index 9bd1e58a05..004bd12da9 100644
--- a/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
  * | RGB TG | RGB MD | RGB HI | RGB HD | RGB SI | RGB SD | RGB VI | RGB VD | BL TOG | BL INC | BL DEC | XXXXXX .        | MOUS U | WHEEL- |
  * |--------+--------+--------+--------+--------+-- 2u -----------+--------+--------+--------+--------+-----------------+--------+--------|
- * | RESET  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
+ * | QK_BOOT  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
   KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D,
-  RESET  , _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+  QK_BOOT, _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
  )
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
index 6084a1cbe6..b7d2272b02 100644
--- a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
    KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______,
    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   _______,KC_WH_U, KC_MS_U, KC_WH_D,
-   RESET  , DF(_QW), DF(_EASY_QW), _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+   QK_BOOT, DF(_QW), DF(_EASY_QW), _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 	 ),
  [_CURSOR] = LAYOUT(
   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_JYEN,  KC_BSPC,
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
index 89d6569ddc..595d7cb936 100644
--- a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |   `    |   !    |   @    |   #    |   $    |   %    |        |        |        |    ^   |   &    |   *    |   (    |   )    | BACKSP |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   ~    |   !    |   @    |   #    |   $    |   %    | RESET  |RGB HUE-|RGB HUE+|    ^   |   &    |   *    |   (    |   )    | DEL    |
+ * |   ~    |   !    |   @    |   #    |   $    |   %    | QK_BOOT  |RGB HUE-|RGB HUE+|    ^   |   &    |   *    |   (    |   )    | DEL    |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | DEL    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |RGB SAT-|RGB SAT+| DVORAK |   _    |   +    |   {    |   }    |   |    |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  
  [_FN1] = LAYOUT_ortho_5x15( /* FUNCTION1 */
   KC_GRV , KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,   RESET, RGB_HUD, RGB_HUI, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+  KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,   QK_BOOT, RGB_HUD, RGB_HUI, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
   KC_DEL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, RGB_SAD, RGB_SAI, TO(_DV), KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
   _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, RGB_VAD, RGB_VAI, TO(_QW), _______, _______, KC_HOME,  KC_END, _______,
   _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |   `    | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      | 0      | BACKSP |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   `    |        |        |   UP   |        |        | RESET  |RGB HUE-|RGB HUE+| NUMPAD |        |        |        |        |        |
+ * |   `    |        |        |   UP   |        |        | QK_BOOT  |RGB HUE-|RGB HUE+| NUMPAD |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | DEL    |        |  LEFT  |  DOWN  | RIGHT  |        |        |RGB SAT-|RGB SAT+| DVORAK |   -    |   =    |   [    |   ]    |   \    |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  
  [_FN2] = LAYOUT_ortho_5x15( /* FUNCTION2 */
   KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, _______, _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_GRV, _______, _______,   KC_UP, _______, _______,   RESET, RGB_HUD, RGB_HUI, TG(_NP), _______, _______, _______, _______, KC_DEL,
+  KC_GRV, _______, _______,   KC_UP, _______, _______,   QK_BOOT, RGB_HUD, RGB_HUI, TG(_NP), _______, _______, _______, _______, KC_DEL,
   KC_DEL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_SAI, TG(_DV), KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
   _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, TG(_QW), _______, _______, KC_PGDN, KC_PGUP, _______,
   _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
index 7cbb0bae82..77ebfe6a03 100644
--- a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_EMOJIFY] = LAYOUT_ortho_5x15(
-    TO(0)   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , RESET  ,
+    TO(0)   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , QK_BOOT,
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
     _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , _______ , _______ , _______ , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______,
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
diff --git a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
index f35eea73c4..c263d569da 100644
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
  * | RGB_H+ | RGB-   | BL-    | E      | R      | T      | Y      | U      | I      | O      | 7      | 8      | 9      | ENTER  | DEL    |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | RGB_H- | RGB_M+ | BL+    | VOL+   | F      | G      | H      | J      | K      | L      | 4      | 5      | 6      | ENTER  | RESET  |
+ * | RGB_H- | RGB_M+ | BL+    | VOL+   | F      | G      | H      | J      | K      | L      | 4      | 5      | 6      | ENTER  | QK_BOOT  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
  * | RGB_S+ | RGB_M- | BL_S   | VOL-   | V      | B      | B      | N      | M      | ,      | 1      | 2      | 3      | UP     | END    |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FS] = LAYOUT_ortho_5x15( /* FUNCTION */
         _______, RGB_VAI, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
         RGB_HUI, RGB_VAD, BL_INC,  _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
-        RGB_HUD, RGB_RMOD,BL_DEC,  KC_VOLU, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, RESET,
+        RGB_HUD, RGB_RMOD,BL_DEC,  KC_VOLU, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, QK_BOOT,
         RGB_SAI, RGB_MOD, BL_STEP, KC_VOLD, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
         RGB_SAD, RGB_TOG, BL_TOGG, KC_MUTE, _______, _______, _______, _______, _______, TO(_FN), TO(_QW), KC_P0,   KC_PDOT, KC_DOT,  _______
     )
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
index 09eea933e1..25040fe342 100644
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | _______| P7     | P8     | P9     | +      | P*     | XXXXXXX| PR SCR | SCR LK | PAUSE  | XXXXXXX| BL_DEC | BL_INC | RGB HD | RGB HI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P4     | P5     | P6     | NumLk  | CALC   | XXXXXXX| POWER  | XXXXXXX| RESET  | XXXXXXX| BL_BRTG| BL_STEP| RGB SD | RGB SI |
+ * | _______| P4     | P5     | P6     | NumLk  | CALC   | XXXXXXX| POWER  | XXXXXXX| QK_BOOT  | XXXXXXX| BL_BRTG| BL_STEP| RGB SD | RGB SI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | _______| P1     | P2     | P3     | -      | P/     | XXXXXXX| OS     |  PLAY  | PREV   | NXT    | BL_OFF | BL_ON  | RGB VD | RGB VI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
     XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
     _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PAST, XXXXXXX, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI,
-    _______, KC_P4,   KC_P5,   KC_P6,   KC_NLCK, KC_CALC, XXXXXXX, KC_PWR,  XXXXXXX, RESET,   XXXXXXX, BL_BRTG, BL_STEP, RGB_SAD, RGB_SAI,
+    _______, KC_P4,   KC_P5,   KC_P6,   KC_NLCK, KC_CALC, XXXXXXX, KC_PWR,  XXXXXXX, QK_BOOT, XXXXXXX, BL_BRTG, BL_STEP, RGB_SAD, RGB_SAI,
     _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, KC_PSLS, XXXXXXX, KC_LWIN, KC_MPLY, KC_MPRV, KC_MNXT, BL_OFF,  BL_ON,   RGB_VAD, RGB_VAI,
     _______, KC_P0,   KC_PDOT, KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD
   )
diff --git a/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c b/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c
index fdfe3be16d..991cb31b55 100644
--- a/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        | VOL-   | MUTE   | VOL+   |        |        |        |        | P1     | P2     | P3     | ENT    | RGB_VAD| Home   | RGB_HUD|
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RESET  |        | FN     |        |        |        |        |        | P0     | P0     | .      | FN     |        | End    |        |
+ * | QK_BOOT  |        | FN     |        |        |        |        |        | P0     | P0     | .      | FN     |        | End    |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
@@ -63,6 +63,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, RGB_TOG, RGB_MOD, RGB_HUI,
   KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, RGB_SAI, RGB_SAD, RGB_VAI,
   KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_ENT,  RGB_VAD, KC_HOME, RGB_HUD,
-  RESET,   KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_KP_0, KC_PDOT, MO(_FN), KC_TRNS, KC_END,  KC_TRNS
+  QK_BOOT, KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_KP_0, KC_PDOT, MO(_FN), KC_TRNS, KC_END,  KC_TRNS
  )
 };
diff --git a/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c b/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
index a0295f2f45..de90a83484 100644
--- a/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
@@ -172,16 +172,16 @@ keys needing to be assigned:
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
  * | RGB TG | RGB MD | RGB HI | RGB HD | RGB SI | RGB SD | RGB VI | RGB VD | BL TOG | BL INC | BL DEC | XXXXXX |        | MOUS U | WHEEL- |
  * |--------+--------+--------+--------+--------+-- 2u -----------+--------+--------+--------+--------+-----------------+--------+--------|
- * | RESET  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
+ * | QK_BOOT  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
 [_FUNCTION] = LAYOUT_ortho_5x15( /* FUNCTION */
-   KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET, RESET,
+   KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, QK_BOOT,
    KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  ,
    KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  ,
    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D  ,
-   RESET  , _______, DF(_QWERTY), DF(_QWERTY), DF(_QWERTY), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+   QK_BOOT, _______, DF(_QWERTY), DF(_QWERTY), DF(_QWERTY), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
  )
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c b/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
index 09a2bec55c..62f420d264 100755
--- a/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      [_FN] = LAYOUT(
         LALT(KC_F4), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NLCK,
         _______,     _______, _______, _______, RGB_HUI, RGB_TOG, _______, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______, _______, _______, _______,
-        _______,     _______, _______, _______, RGB_SAI, RGB_MOD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______, _______, _______, RESET,
+        _______,     _______, _______, _______, RGB_SAI, RGB_MOD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______, _______, _______, QK_BOOT,
         _______,     _______, _______, _______, RGB_VAI, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______, _______, _______, _______,
         _______,     _______, _______, _______, _______, _______, _______, KC_P0,   _______, KC_PDOT, KC_PPLS, _______, _______, _______, _______
     )
diff --git a/keyboards/xiudi/xd75/keymaps/colinta/keymap.c b/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
index 257caad339..4d7c2d2007 100644
--- a/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        | RESET  |         DM_CLEAR         |        |        | RESET  |        |        |        |        |
+ * |        |        |        |        | QK_BOOT  |         DM_CLEAR         |        |        | QK_BOOT  |        |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,          KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,          KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,          KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO,   KC_NO,   KC_NO, KC_NO, RESET,    KC_NO, DM_CLEAR, KC_NO,             KC_NO, KC_NO, RESET, KC_NO, KC_NO, KC_NO, KC_NO
+    KC_NO,   KC_NO,   KC_NO, KC_NO, QK_BOOT,  KC_NO, DM_CLEAR, KC_NO,             KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO
   )
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/daniel/keymap.c b/keyboards/xiudi/xd75/keymaps/daniel/keymap.c
index e9f2740b15..c2e49d87e5 100644
--- a/keyboards/xiudi/xd75/keymaps/daniel/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/daniel/keymap.c
@@ -24,6 +24,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  )
 };
diff --git a/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c b/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
index f380ebdb11..97010c39e1 100644
--- a/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______, _______, _______, _______, _______, _______, CTAB   , ALEFT  , KC_UP  , ARGHT  , KC_DEL , _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, GTAB   , ABSPC  , KC_HOME, KC_END , GGRV   , _______,
-   RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  ),
 
  [_NAVPC] = LAYOUT_ortho_5x15( /* NAVIGATION FOR PC: replaces Alt with Control, GUI with Alt, and browser tab shortcuts*/
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______, _______, _______, _______, _______, _______, CTAB   , CLEFT  , KC_UP  , CRGHT  , KC_DEL , _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, ATAB   , CBSPC  , KC_HOME, KC_END , _______, _______,
-   RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  ),
     
  [_NAVQUD] = LAYOUT_ortho_5x15( /* NAVIGATION for Mac */
diff --git a/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c b/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
index 121b18438e..d07e1f48a3 100644
--- a/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        |        |        |        |        |        |        | <      | >      | @      |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        | _      | MO(_FN)|        |        |        |        | MO(_FN)| _      |        |        |        | RESET  |
+ * |        |        |        | _      | MO(_FN)|        |        |        |        | MO(_FN)| _      |        |        |        | QK_BOOT  |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, S(BP_DQUO), S(BP_LDAQ), S(BP_RDAQ), S(BP_LPRN), S(BP_RPRN),     _______, _______, _______, S(BP_AT),       S(BP_PLUS), S(BP_MINS), S(BP_SLSH), S(BP_ASTR), S(BP_EQL),
   _______, RALT(BP_B), BP_BSLS,    BP_LBRC,    BP_RBRC,    RALT(BP_P),     _______, _______, _______, _______,        KC_LEFT,    KC_DOWN,     KC_UP  ,     KC_RGHT,    _______,
   _______, BP_BSLS,    _______,    _______,    _______,    _______,        _______, _______, _______, _______,        BP_LABK,    BP_RABK,     BP_AT  ,     _______,    _______,
-  _______, _______,    _______,    _______,    _______,    LT(_FN,KC_ENT), _______, _______, _______, LT(_FN,KC_SPC), _______,    _______,     _______,     _______,    RESET
+  _______, _______,    _______,    _______,    _______,    LT(_FN,KC_ENT), _______, _______, _______, LT(_FN,KC_SPC), _______,    _______,     _______,     _______,    QK_BOOT
  )
 
 };
diff --git a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
index 679684976b..705efb1b8b 100644
--- a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | SELECT | CALC   | MYCOMP | MAIL   | RGB HD | RGB HI | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | RESET  |        |        |        |
+ * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | QK_BOOT  |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | VOL-   | MUTE   | VOL+   | APP    | RGB VD | RGB VI | P1     | P2     | P3     | PENT   |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
-  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
+  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______,
   KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
   _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
  )
diff --git a/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c b/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
index 3197b6bde9..e325dbd664 100644
--- a/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
   _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS,
-  RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
+  QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  ),
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
  * | RGB TG | RGB MD | RGB HI | RGB HD | RGB SI | RGB SD | RGB VI | RGB VD | BL TOG | BL INC | BL DEC | XXXXXX .        | MOUS U | WHEEL- |
  * |--------+--------+--------+--------+--------+-- 2u -----------+--------+--------+--------+--------+-----------------+--------+--------|
- * | RESET  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
+ * | QK_BOOT  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
   KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D,
-  RESET  , _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+  QK_BOOT, _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
  )
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/fabian/keymap.c b/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
index 0d59e4ce8f..a88790048f 100644
--- a/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_ortho_5x15(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_DEL,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   _______, _______, _______, MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/xiudi/xd75/keymaps/french/keymap.c b/keyboards/xiudi/xd75/keymaps/french/keymap.c
index 8d5d2b634f..42dfa076dc 100644
--- a/keyboards/xiudi/xd75/keymaps/french/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/french/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        |        |        |        |        |        | 1      | 2      | 3      | +      |        | LEDMAX |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RESET  |        |        | FN     |        |        |        |        |        |        | 0      | .      | PENT   |        | LEDLVL |
+ * | QK_BOOT  |        |        | FN     |        |        |        |        |        |        | 0      | .      | PENT   |        | LEDLVL |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
@@ -51,6 +51,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   FR_EMPT,	FR_MPRV,	FR_MPLY,	FR_MNXT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_NUML,  	FR_7,     	FR_8,   	FR_9,    	FR_MULT,  	FR_EMPT,	BL_INC,
   FR_EMPT,	FR_MVDN,	FR_MUTE,	FR_MVUP,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_4,     	FR_5,   	FR_6,    	FR_MOIN,  	FR_EMPT,	BL_DEC,
   FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_1,     	FR_2,   	FR_3,    	FR_PLUS,  	FR_EMPT,	BL_ON,
-  RESET,	FR_EMPT,	FR_EMPT,	FR_TRANS,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_EMPT,  	FR_0,   	FR_DOT,  	FR_ENTK,  	FR_EMPT,	BL_STEP
+  QK_BOOT,	FR_EMPT,	FR_EMPT,	FR_TRANS,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_EMPT,  	FR_0,   	FR_DOT,  	FR_ENTK,  	FR_EMPT,	BL_STEP
  )
 };
diff --git a/keyboards/xiudi/xd75/keymaps/germanized/keymap.c b/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
index 3b00a4b670..a525c5a585 100644
--- a/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * °-----------------------------------------------------------------------------------------------------------------------°
 */	
 	[_FNC] = LAYOUT_ortho_5x15(
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+	QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS,
 	KC_CAPS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
index e8b5a3536b..337b75c190 100644
--- a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
@@ -264,7 +264,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LY1] = LAYOUT_ortho_5x15(
     KC_ESC, RGB_TOG, RGB_RMOD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_K, RGB_M_G, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_LY2), DF(_MAIN),
     DEBUG, KC_PSCR, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-    RESET, KC_NO, KC_S, KC_D, KC_F, KC_G, KC_Z, KC_J, KC_K, KC_L, KC_M, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_LSFT,
+    QK_BOOT, KC_NO, KC_S, KC_D, KC_F, KC_G, KC_Z, KC_J, KC_K, KC_L, KC_M, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_LSFT,
     KC_NO, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_SCLN, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PEQL, KC_LCBR,
     KC_NO, KC_NO, KC_NO, KC_SPC, KC_SPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS, KC_P0,  KC_P1, KC_P2, KC_P3, KC_TRNS
     ),
diff --git a/keyboards/xiudi/xd75/keymaps/jarred/keymap.c b/keyboards/xiudi/xd75/keymaps/jarred/keymap.c
index a875165078..ff45939ba9 100644
--- a/keyboards/xiudi/xd75/keymaps/jarred/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/jarred/keymap.c
@@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______,
-  RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  )
 };
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
index fdcc47cabe..d14cd084e1 100644
--- a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
@@ -92,13 +92,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
  ),
 
-/* RESET
+/* QK_BOOT
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        | RESET  |        |        |        |        |        |        |        |
+ * |        |        |        |        |        |        |        | QK_BOOT  |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
@@ -106,10 +106,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RT] = LAYOUT_ortho_5x15( /* RESET */
+ [_RT] = LAYOUT_ortho_5x15( /* QK_BOOT */
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  )
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
index 486a3743a4..7b73348f39 100644
--- a/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
@@ -92,13 +92,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
  ),
 
-/* RESET
+/* QK_BOOT
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        | RESET  |        |        |        |        |        |        |        |
+ * |        |        |        |        |        |        |        | QK_BOOT  |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
@@ -106,10 +106,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RT] = LAYOUT_ortho_5x15( /* RESET */
+ [_RT] = LAYOUT_ortho_5x15( /* QK_BOOT */
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  )
diff --git a/keyboards/xiudi/xd75/keymaps/kloki/keymap.c b/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
index d25a16fbb6..2a8fde5f35 100644
--- a/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______
  ),
  [_FUN] = LAYOUT_ortho_5x15( /* FUN */
-  _______,  RGB_RMOD,RGB_MOD, RGB_TOG, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, RESET,
+  _______,  RGB_RMOD,RGB_MOD, RGB_TOG, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, QK_BOOT,
   _______,  RGB_HUD, RGB_HUI, RGB_MODE_PLAIN, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
   _______,  RGB_SAD, RGB_SAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
   _______,  RGB_VAD, RGB_VAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
diff --git a/keyboards/xiudi/xd75/keymaps/markus/keymap.c b/keyboards/xiudi/xd75/keymaps/markus/keymap.c
index 4a7efad11b..dc1590749b 100644
--- a/keyboards/xiudi/xd75/keymaps/markus/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/markus/keymap.c
@@ -163,7 +163,7 @@ KC_F13,   KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   KC_BRID,  ___xx___,
 ________, QWERTZ,   UC_M_LN,  ___xx___, ___xx___, KC_PWR,   RGB_TOG,  RGB_M_P,  RGB_MOD,  ___xx___, KC_PGUP,  KC_UP,    KC_PGDN,  ___xx___, ___xx___,
 ________, QWERTY,   UC_M_WC,  UC(L'›'), UC(L'‹'), KC_SLEP,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_END,   ________,
 ________, GAMING,   UC_M_MA,  UC(L'»'), UC(L'«'), KC_WAKE,  RGB_HUD,  RGB_SAD,  RGB_VAD,  UC(L' '), UC(L' '), UC(L' '), UC(L' '), UC(L'‑'), ________,
-________, ________, ________, ________, ________, ________, ________, RESET,    ________, ________, ________, ________, ________, ________, ________
+________, ________, ________, ________, ________, ________, ________, QK_BOOT,  ________, ________, ________, ________, ________, ________, ________
 )
 
 };
diff --git a/keyboards/xiudi/xd75/keymaps/minna/keymap.c b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
index ef3f400bc1..615762fa75 100644
--- a/keyboards/xiudi/xd75/keymaps/minna/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_ortho_5x15(
     KC_MUTE, QMKBEST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
     KC_MSEL, KC_NO,   KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_CALC, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_MPRV, KC_NO,   KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_MPLY, KC_P4, KC_P5, KC_P6, KC_PLUS, RESET, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_MPRV, KC_NO,   KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_MPLY, KC_P4, KC_P5, KC_P6, KC_PLUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, MO(1),   RGB_TOG, KC_NO,   RGB_RMOD,RGB_MOD, KC_NO, KC_P0, KC_NO, KC_PDOT, KC_PENT, KC_PENT, MO(1), UC_RMOD, UC_MOD)
 };
diff --git a/keyboards/xiudi/xd75/keymaps/msiu/keymap.c b/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
index d1a4154ec1..62931ba088 100644
--- a/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, KC_PSCR, _______,
   _______, _______, _______, TO(_DV), TO(_QW), _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  )
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
index 7fa04b2c63..a08449c605 100644
--- a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* SYSTEM
  * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | RESET  | DEBUG  |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * | QK_BOOT  | DEBUG  |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        |        |        |RGB_TOG |RGB_VAI |RGB VAD |        |        | PASTE  | PR SCR | SCR LK | PAUSE  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_SYSTEM] = LAYOUT_ortho_5x15( /* FUNCTION */
-    RESET,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, _______, _______, MPASTE,  KC_PSCR, KC_SLCK, KC_PAUSE,
     _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
index 35510379c7..651a80a585 100644
--- a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
@@ -136,7 +136,7 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______,
   ),
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
 KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,  KC_F7,   KC_F8,   KC_F9,   KC_F10,        KC_F11,        KC_F12,
-RESET,   KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_WH_U, KC_P4,   KC_P5,   KC_P6,  _______, _______, _______, RSFT(KC_MINS), LSFT(KC_MINS), _______,
+QK_BOOT, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_WH_U, KC_P4,   KC_P5,   KC_P6,  _______, _______, _______, RSFT(KC_MINS), LSFT(KC_MINS), _______,
 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_MINS, KC_WH_D, KC_P1,   KC_P2,   KC_P3,  _______, KC_PPLS, KC_ACL0, KC_ACL1,       KC_ACL2,       _______,
 _______, KC_ACL0, KC_ACL1, KC_ACL2, KC_WH_L, KC_WH_R, KC_NLCK, KC_PGUP, KC_P0,  _______, _______, _______, _______,       _______,       _______,
 RGB_TOG, _______, _______, _______, KC_BSPC, KC_BSPC, KC_HOME, KC_PGDN, KC_END, KC_BSPC, KC_BSPC, _______, _______,       _______,       _______
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
index 07ecbcd848..6d1c9d812e 100644
--- a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BOTH] = LAYOUT_ortho_5x15(
 	KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, 
-	_______,  RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, _______, _______, KC_DEL,  _______, _______, _______, 
+	_______,  QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, _______, _______, KC_DEL,  _______, _______, _______, 
 	_______,  _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  STENO,    _______, _______, RGB_M_P, _______, _______, _______, 
 	RGB_MOD,  _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI,  RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, 
 	RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______)
diff --git a/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c b/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c
index 71ef2a6683..41a7da189a 100644
--- a/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [L_FN] = LAYOUT_ortho_5x15(
         DF_TYPE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, MS_JIGL, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
         DF_GAME, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, KC_F12,
-        _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_CAPS, RESET,   _______, KC_MUTE, _______, _______, _______, _______, _______,
+        _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_CAPS, QK_BOOT, _______, KC_MUTE, _______, _______, _______, _______, _______,
         _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, KC_VOLD, K_SECR1, K_SECR2, K_SECR3, K_SECR4, _______,
         _______, _______, _______, ooooooo, _______, _______, _______, _______, _______, _______, _______, ooooooo, _______, _______, _______
     ),
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
     //     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
     //     KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_F12,
-    //     KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
+    //     KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______,
     //     KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
     //     _______, _______, RGB_TOG, ooooooo, RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, ooooooo, _______, _______, _______
     // )
diff --git a/keyboards/xiudi/xd75/keymaps/revok75/keymap.c b/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
index 44e2c52033..4e8b821ca7 100644
--- a/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * .--------------------------------------------------------------------------------------------------------------------------------------.
 * | ESC    | F1     | F2     | F3     | F4     | F5     | F6    | F7     | F8     | F9     | F10    | VOLDN   | VOLUP  | MUTE   | DEL    |
 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-* | TAB    | -      | WIN    | -      | -      | RGB_TOG| -     | -      | OPTION  | RESET  | -     | [       | ]      | -      | -      |
+* | TAB    | -      | WIN    | -      | -      | RGB_TOG| -     | -      | OPTION  | QK_BOOT  | -     | [       | ]      | -      | -      |
 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
 * | CAP LK | MAC    | RAINBOW| PLAIN  | -      | -      | -     | -      | -      | -      | ;      | '       | ENTER  |  ENTER | REF    |
 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_FN] = LAYOUT_ortho_5x15( /* OSLAYOUT + NUMPAD + MEDIA + LIGHTING */
    	KC_TRNS, KC_F1,     KC_F2,						 KC_F3,    		   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_VOLD, KC_VOLU, KC_MUTE, KC_DEL, \
-  	KC_TRNS, KC_NO,     DF(_QW_W),    		 KC_NO,    		   KC_NO,   RGB_TOG, KC_NO,   KC_NO,   KC_RALT, RESET,   KC_NO,   KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, \
+  	KC_TRNS, KC_NO,     DF(_QW_W),    		 KC_NO,    		   KC_NO,   RGB_TOG, KC_NO,   KC_NO,   KC_RALT, QK_BOOT, KC_NO,   KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, \
   	KC_TRNS, DF(_QW_M), RGB_MODE_RAINBOW,  RGB_MODE_PLAIN, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
   	KC_TRNS, RGB_VAI,   RGB_VAD,  				 RGB_HUI,  		   RGB_HUD, RGB_SAI, RGB_SAD, KC_NO,   KC_NO,   KC_DOT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, \
   	KC_TRNS, KC_TRNS,   KC_TRNS,  				 KC_TRNS,  		   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_END,	 KC_PGDN \
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
index 3dc011a2cb..d54699ada4 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     },
 
 	[_FNC] = {
-	{ RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_TRNS, KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12},
+	{ QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_TRNS, KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12},
 	{ KC_TAB,  DE_AT,   KC_TRNS, DE_EURO, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_TILD },
 	{ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
 	{ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT },
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
index 594d34ce33..dcd1ac563f 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Layer 7
  * .--------------------------------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC     |          |          | Button 3 |          |            |           |           |        |         |        |        |        |           |  RESET  |
+ * | ESC     |          |          | Button 3 |          |            |           |           |        |         |        |        |        |           |  QK_BOOT  |
  * |---------+----------+----------+----------+----------+------------+-----------+-----------+--------+---------+--------+--------+--------+-----------+---------|
  * | TAB     | Wheel up | Button 2 | Up       | Button 1 | Wheel down |           |           |        |         |        |        |        |           |         |
  * |---------+----------+----------+----------+----------+------------+-----------+-----------+--------+---------+--------+--------+--------+-----------+---------|
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------------------------------'
  */
   [_7] = LAYOUT_ortho_5x15( /* Layer 7 */
-    KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+    KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
     KC_TAB,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
index 3db29a3636..b668f23a57 100644
--- a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
  * Navigation _NA
  * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | RESET  | COLEMA | DVORAK | QWERTY |        | RGB_TG |        |        |        |        |        |        |        |        |        |
+ * | QK_BOOT  | COLEMA | DVORAK | QWERTY |        | RGB_TG |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | Esc    | Ctrl L | Up     | Ctrl R |        | RGB HD | RGB HI |        |        |        |        | PtSn   | ScLk   | Pause  |        |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -206,14 +206,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
   [nal] = LAYOUT_ortho_5x15( \
-    RESET,   DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    QK_BOOT, DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
     KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM  , \
     _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_SLCK, KC_END,  KC_PGDN, _______, \
     _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______ \
   ),
   [nar] = LAYOUT_ortho_5x15( \
-    RESET,   DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    QK_BOOT, DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
     KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM  , \
     _S_TAB,  _A_LEFT, IJ_OMN,  _A_RGHT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, __NAR,   KC_END,  KC_PGDN, _______, \
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index f48eb94214..e0cc76a2bb 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -144,7 +144,7 @@ LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,_______
    LAYOUT_ortho_5x15(
      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
      KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,________,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,QWERTY  ,COLEMAK ,___XX___,RESET,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,QWERTY  ,COLEMAK ,___XX___,QK_BOOT,
      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
      ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
    ),
diff --git a/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c b/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
index 175ddb53b2..54913b29b4 100644
--- a/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        | RGB HD | RGB HI |        |        |        |        |        |        | PR SCR | SCR LK | INSERT |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | PLAY   | NEXT   |        | RGB SD | RGB SI | LEFT   | DOWN   | UP     | RIGHT  |        | RESET  |        |        |        |
+ * | PREV   | PLAY   | NEXT   |        | RGB SD | RGB SI | LEFT   | DOWN   | UP     | RIGHT  |        | QK_BOOT  |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | VOL-   | MUTE   | VOL+   |RGB RMD | RGB VD | RGB VI |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -113,8 +113,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_ortho_5x15( /* ADJUST */
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NLCK, KC_SLSH,
-    _______, RESET,   _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_INS,
-    KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_SAD, RGB_SAI, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, RESET,   _______, _______, _______,
+    _______, QK_BOOT, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_INS,
+    KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_SAD, RGB_SAI, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, QK_BOOT, _______, _______, _______,
     KC_VOLD, KC_MUTE, KC_VOLU, RGB_RMOD,RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
diff --git a/keyboards/xiudi/xd75/keymaps/xo/keymap.c b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
index 6fe547e87a..58dd1a616a 100644
--- a/keyboards/xiudi/xd75/keymaps/xo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
@@ -27,11 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_ortho_5x15(
     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_P7, KC_P8, KC_P9, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
     LCTL(KC_GRV), KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P4, KC_P5, KC_P6, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
-    KC_CAPSLOCK, KC_TRNS, KC_TRNS, KC_MSTP, RGB_SAD, RGB_SAI, KC_P1, KC_P2, KC_P3, KC_PLUS, KC_TRNS, RESET, KC_MUTE, KC_VOLD, KC_VOLU,
+    KC_CAPSLOCK, KC_TRNS, KC_TRNS, KC_MSTP, RGB_SAD, RGB_SAI, KC_P1, KC_P2, KC_P3, KC_PLUS, KC_TRNS, QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU,
     MO(2), KC_PSCR, KC_PAUS, KC_APP, RGB_VAD, RGB_VAI, KC_P0, KC_SLSH, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,
     TG(1), KC_TRNS, RGB_TOG, KC_SLCK, RGB_RMOD, RGB_MOD, KC_NLCK, KC_TRNS, KC_ASTR, KC_PENT, KC_PENT, MO(1), KC_TRNS, KC_TRNS, TG(1)),
   [2] = LAYOUT_ortho_5x15(
-    RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_DEC, BL_INC, BL_TOGG,
diff --git a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
index db27e5ea3b..5ea4bb5a9a 100755
--- a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [1] = LAYOUT_tkl_ansi(
-      RESET,            EEP_RST, DEBUG, KC_TRNS, 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,          EEP_RST, DEBUG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_TOGG, BL_INC,
       KC_TRNS, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DEC,
       KC_TRNS, KC_TRNS, RGB_VAD, RGB_RMOD,RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
diff --git a/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c b/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
index a3a3da91db..39ca291a8d 100644
--- a/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RESET,   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, QK_BOOT, _______, _______, _______, _______,
 	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 	  _______, KC_MPLY, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   KC_PSCR, _______,          _______, _______, _______, _______,
 	  _______, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, _______,          _______, _______, _______, _______,
diff --git a/keyboards/yampad/keymaps/traditional/keymap.c b/keyboards/yampad/keymaps/traditional/keymap.c
index 78778cc34b..155a9e36a3 100644
--- a/keyboards/yampad/keymaps/traditional/keymap.c
+++ b/keyboards/yampad/keymaps/traditional/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_HUD,  RGB_HUI,  XXXXXXX,
     RGB_SAD,  RGB_SAI,  XXXXXXX,   XXXXXXX,
     RGB_VAD,  RGB_VAI,  XXXXXXX,
-    RESET,    XXXXXXX,  XXXXXXX,   XXXXXXX
+    QK_BOOT,  XXXXXXX,  XXXXXXX,   XXXXXXX
   ),
 };
 
diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
index 3da9f880ae..af1e92a984 100644
--- a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/7eb0f1c437169f30cc18eac271ad2302 */
     [LAYER_ADJUST] = LAYOUT(
-        _______,  MU_TOG,   KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  MU_TOG,   KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  MU_MOD,   KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
                                       _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______
diff --git a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
index da034e0e44..b23cb57ce9 100644
--- a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
+++ b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_PGUP,  KC_END
      ),
     [_COMMAND] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST,   RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST,   QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
index 5c3891845d..062cc26bfe 100644
--- a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_60_ansi_split_bs_rshift( /* FN */
     KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL, KC_DEL,
-    KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RESET,    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,  QK_BOOT,  KC_TRNS,
     KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
     KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
     KC_VOLU,  KC_VOLD,  KC_MUTE,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
diff --git a/keyboards/ymdk/bface/keymaps/minila/keymap.c b/keyboards/ymdk/bface/keymaps/minila/keymap.c
index 4038e8f762..5505dfcff7 100644
--- a/keyboards/ymdk/bface/keymaps/minila/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/minila/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     //FN Layer
     [_FL] = LAYOUT_all(
-		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RESET, 
+		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, 
 		_______, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, NK_TOGG, KC_PSCR, KC_SLCK, KC_PAUS, _______, BL_STEP, BL_TOGG, 
 		_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_INS, KC_HOME, KC_PGUP, KC_BSPC, _______, _______, _______, 
 		_______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, 
diff --git a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
index 40ae691435..d11be1679b 100644
--- a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             TT(1),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
 
 	LAYOUT(
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
     _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, KC_TAB,
     BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, KC_TAB,
diff --git a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
index cea3970e18..9a6994ae72 100644
--- a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
@@ -52,7 +52,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_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
 
 	[1] = LAYOUT(
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
     KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
     BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
diff --git a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
index d0d2698b7a..624797c5c3 100644
--- a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
@@ -236,7 +236,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Function layer is mostly for keyboard meta-control operations, but also contains the combining
   // accent marks. These are deliberately placed to match where the analogous controls go on Mac OS.
 	[_FUNCTION] = LAYOUT_hotswap(
-    KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RESET,
+    KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT,
     KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______, KC_CAGU, _______, _______, _______, KC_CDIA, KC_CCIR, _______, _______, _______, _______,          _______, _______, _______, _______,
     _______, _______, _______, UC_M_OS, UC_M_LN, UC_M_WI, UC_M_BS, UC_M_WC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
diff --git a/keyboards/ymdk/sp64/keymaps/daed/keymap.c b/keyboards/ymdk/sp64/keymaps/daed/keymap.c
index 7174c108b3..8512ef799f 100644
--- a/keyboards/ymdk/sp64/keymaps/daed/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/daed/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_MODE] = LAYOUT(
   KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-  RGB_TOG, RGB_RMOD, RGB_VAI, RGB_MOD, _______, _______,        _______, _______, _______, _______, _______, _______, _______, RESET,
+  RGB_TOG, RGB_RMOD, RGB_VAI, RGB_MOD, _______, _______,        _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
   _______, RGB_SPD,  RGB_VAD, RGB_SPI, _______, _______,        KC_LEFT, KC_DOWN,   KC_UP, KC_RIGHT, _______, _______,          _______,
   _______, _______,  _______, _______, _______, _______,        _______, _______, _______, TO(_GAMER), TO(_BASE), _______, _______, _______,
   _______, _______,  _______, _______,          _______,        _______,          _______, _______,          _______, _______, _______
diff --git a/keyboards/ymdk/sp64/keymaps/walston/keymap.c b/keyboards/ymdk/sp64/keymaps/walston/keymap.c
index ada3073fb9..248cf5f445 100644
--- a/keyboards/ymdk/sp64/keymaps/walston/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/walston/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
  */
 [BASE] = LAYOUT(
-  MT(RESET, KC_GRAVE),   KC_1,      KC_2,    KC_3,    KC_4,    KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
+  MT(QK_BOOT, KC_GRAVE),   KC_1,      KC_2,    KC_3,    KC_4,    KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
   KC_TAB,                KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRACKET, KC_RBRACKET,   KC_BSLS,
   KC_LCTL,               KC_A,      KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,    KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                  KC_ENTER,
   KC_LSFT,               KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,     KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,     OSL(_MEDIA),
diff --git a/keyboards/ymdk/wings/keymaps/default/keymap.c b/keyboards/ymdk/wings/keymaps/default/keymap.c
index fb017650fe..17b3bb6a25 100644
--- a/keyboards/ymdk/wings/keymaps/default/keymap.c
+++ b/keyboards/ymdk/wings/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_all(
     _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
-    _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,           _______,
+    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,           _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                    _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, 
     _______, _______,          _______, _______,          _______,          _______,                            _______, _______, _______ 
diff --git a/keyboards/ymdk/wingshs/keymaps/default/keymap.c b/keyboards/ymdk/wingshs/keymaps/default/keymap.c
index 61366f75dd..31da48fa69 100644
--- a/keyboards/ymdk/wingshs/keymaps/default/keymap.c
+++ b/keyboards/ymdk/wingshs/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_all(
     QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______,          _______,
-    _______, _______, _______, _______,   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,           _______,
+    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,           _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                    _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, 
     _______, _______,          _______, _______,          _______,          _______,                            _______, _______, _______ 
diff --git a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
index 3c27f14d11..effa594af2 100644
--- a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 	[1] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,     KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, KC_DEL,
+        QK_BOOT, KC_F1,   KC_F2,     KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_PSCR, KC_SLCK, KC_PAUS,  KC_GRV,
         _______, BL_TOGG, BL_DEC,   BL_INC, BL_BRTG, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, MO(2),   _______, KC_PGUP, _______,
diff --git a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
index d9c2765659..ede3573384 100644
--- a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, RESET,
+        KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
         _______, KC_NO,	  _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/ymdk/ymd40/v2/keymaps/factory/keymap.c b/keyboards/ymdk/ymd40/v2/keymaps/factory/keymap.c
index 3c7de8bc6a..a63f572021 100644
--- a/keyboards/ymdk/ymd40/v2/keymaps/factory/keymap.c
+++ b/keyboards/ymdk/ymd40/v2/keymaps/factory/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_LCTL, KC_LALT, KC_LGUI, KC_DEL,  KC_SPC,  KC_SPC,  RGB_MOD, KC_UP,   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_ortho_4x12(
-        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
index cb7a3eb1e7..fdd7ad253a 100644
--- a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*  |       |       |       |                                             |      |      |MPrev |      |      | MNext|      |      |      |
 	*/ 
 	[_RAISE] = LAYOUT(
-			RESET,RGB_TOG,  BL_TOGG,  BL_STEP,    ______,  ______,  ______,  ______,  ______,  ______,  ______, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
+			QK_BOOT,RGB_TOG,  BL_TOGG,  BL_STEP,    ______,  ______,  ______,  ______,  ______,  ______,  ______, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
 			______,  BL_INC,  BL_DEC,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
 			______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_F22,  KC_F23,  KC_F24,  ______,  ______,  ______,  ______,  ______, \
 			______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_MODE_FORWARD	,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
diff --git a/keyboards/yosino58/keymaps/sakura/keymap.c b/keyboards/yosino58/keymaps/sakura/keymap.c
index 2ed734292a..6979539d33 100644
--- a/keyboards/yosino58/keymaps/sakura/keymap.c
+++ b/keyboards/yosino58/keymaps/sakura/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* RAISE
  * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |RESET |      |      |      |      |      |                                  | Mute | Vol+ | Play |      |      |      |
+ * |QK_BOOT |      |      |      |      |      |                                  | Mute | Vol+ | Play |      |      |      |
  * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
  * |      |      |      |      |      |      |                                  | Prev | Vol- | Next |      |      |      |
  * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                          `-----------------------------'         '------------------------------'
  */
  [_RAISE] = LAYOUT( \
-  RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,                                     KC_MUTE, KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX, \
+  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,                                     KC_MUTE, KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,                                     KC_MPRV, KC_VOLD, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U,    KC_WH_L,                                     XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,    KC_WH_R, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, RGBRST,  RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, \
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /*   ADJUST
  * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |RESET |      |      |      |      |      |                                  |      |      |      |      |      |      |
+ * |QK_BOOT |      |      |      |      |      |                                  |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
  * |      |      |      |      |      |      |                                  |      |      |      |      |      |      |
  * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                          `-----------------------------'         '------------------------------'
 
  [_ADJUST] = LAYOUT( \
-  RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
diff --git a/keyboards/zj68/keymaps/splitbs/keymap.c b/keyboards/zj68/keymaps/splitbs/keymap.c
index 6403c0353f..260025b449 100644
--- a/keyboards/zj68/keymaps/splitbs/keymap.c
+++ b/keyboards/zj68/keymaps/splitbs/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MO(1),   KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     LAYOUT_65_ansi_split_bs(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
         KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
diff --git a/keyboards/ztboards/after/keymaps/ellicose/keymap.c b/keyboards/ztboards/after/keymaps/ellicose/keymap.c
index 88c1d5839a..e0ce04b8a9 100644
--- a/keyboards/ztboards/after/keymaps/ellicose/keymap.c
+++ b/keyboards/ztboards/after/keymaps/ellicose/keymap.c
@@ -11,8 +11,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		),
 
     [1] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS
diff --git a/keyboards/ztboards/after/keymaps/phlop/keymap.c b/keyboards/ztboards/after/keymaps/phlop/keymap.c
index 5d4fd97599..15f101fc34 100644
--- a/keyboards/ztboards/after/keymaps/phlop/keymap.c
+++ b/keyboards/ztboards/after/keymaps/phlop/keymap.c
@@ -11,8 +11,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		),
 
     [1] = LAYOUT_all(
-        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS
diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
index 5282ff98b0..82ddd37fd5 100644
--- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
+++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DELT, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_PGUP, MC_LHPD, MC_SLPD, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END,           KC_MPLY, \
-    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_PGDN,          _______, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_PGDN,          _______, \
     _______, _______, _______,                            _______,                            _______, _______, _______, _______  \
 ),
 /*  Layer
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
index 97116462ac..f87c294c4c 100644
--- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
+++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_CL] = LAYOUT_60_ansi(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-	_______, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+	_______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
     _______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______,                   \
     _______, _______, _______,       _______,                               _______, _______, _______, _______),
diff --git a/layouts/community/60_ansi/stanrc85-ansi/keymap.c b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
index 6d4ceca40f..32542352ca 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/keymap.c
+++ b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_60_ansi(
 	_______, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 	_______, _______, _______,                   _______,                   _______, _______, _______, TG(_DEFAULT))
diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
index 8b285c9fbb..07cc46ac77 100644
--- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
+++ b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_RESET] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______, _______,          _______,                   _______,                                     _______, _______, _______, _______
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
index b40148e995..acf16f41d9 100644
--- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
     [LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  RESET,    _______,  _______,  _______,  RGB_VAI,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
         _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,  _______,  _______
diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
index 906925ab96..237a0f8e38 100644
--- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_VOLU, KC_MPRV, KC_MNXT, KC_UP,   MC_MSSN, KC_DELT, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_MPLY, \
-    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, KC_MUTE, KC_END,  KC_PGDN, KC_DOWN, PGU_SFT, _______, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, KC_MUTE, KC_END,  KC_PGDN, KC_DOWN, PGU_SFT, _______, \
     _______, _______, _______,                            _______,                            _______, HOM_OPT, PGD_FN1, END_CTL  \
 )
 /*  Layer
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index 2cea4fd44f..f48b53e303 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FL] = LAYOUT_60_ansi_split_bs_rshift(
     KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL, \
-  	BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______,        \
+  	BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,        \
     RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,                 \
     VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,                 \
     _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_CL] = LAYOUT_60_ansi_split_bs_rshift(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-	_______, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
+	_______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   \
     _______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______,   _______,                 \
     _______, _______, _______,       _______,                               _______, _______, _______, _______)
diff --git a/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
index 49a906c273..77921f9b1a 100644
--- a/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [YFL] = LAYOUT_60_ansi_split_bs_rshift(
     _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______,  KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, RESET,          \
+    _______, _______,  KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT,        \
     KC_CAPS, KC_LEFT,  KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 \
     _______, _______,  _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,                 \
     _______, _______,  _______,             _______,                               _______, _______, _______, _______),
diff --git a/layouts/community/60_hhkb/yanfali/keymap.c b/layouts/community/60_hhkb/yanfali/keymap.c
index 798f581e96..7e56d5b5ac 100644
--- a/layouts/community/60_hhkb/yanfali/keymap.c
+++ b/layouts/community/60_hhkb/yanfali/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 [FN]= LAYOUT_60_hhkb(
        KC_PWR,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, \
-       _______,  RGB_TOG, KC_UP,   RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, KC_TRNS, RESET,  \
+       _______,  RGB_TOG, KC_UP,   RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, KC_TRNS, QK_BOOT,  \
        KC_CAPS,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,       KC_PENT,       \
        KC_TRNS,  RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,  KC_MUTE, KC_VOLD, KC_VOLU,       KC_TRNS, KC_TRNS, \
                  KC_TRNS, KC_TRNS,                   KC_TRNS,                         KC_TRNS, KC_TRNS ),
diff --git a/layouts/community/60_iso/bifbofii/keymap.c b/layouts/community/60_iso/bifbofii/keymap.c
index d22004c201..9c95384360 100755
--- a/layouts/community/60_iso/bifbofii/keymap.c
+++ b/layouts/community/60_iso/bifbofii/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----------------------------------------------------------------------------------+ tog +
      * |         |     |     |     |     |Gamin|     |     |     | Lnx |     |     |       |     |
      * |-----------------------------------------------------------------------------------------+
-     * |           |     |     |     |     |RESET|     |     |     |     |     |                 |
+     * |           |     |     |     |     |QK_BOOT|     |     |     |     |     |                 |
      * |-----------------------------------------------------------------------------------------+
      * |      |       |       |                                   |       |       |       | Trans|
      * `-----------------------------------------------------------------------------------------'
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, XXXXXXX,
         XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, UC_M_OS, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(GAMING), XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    RESET,   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, KC_TRNS
     ),
 
diff --git a/layouts/community/60_iso/bifbofii/readme.md b/layouts/community/60_iso/bifbofii/readme.md
index 7a8a034196..030e03a117 100755
--- a/layouts/community/60_iso/bifbofii/readme.md
+++ b/layouts/community/60_iso/bifbofii/readme.md
@@ -85,7 +85,7 @@ By pressing Special and G you can toggle a layer for gaming that has normal keym
 |-----------------------------------------------------------------------------------+ tog +
 |         |     |     |     |     |Gamin|     |     |     | Lnx |     |     |       |     |
 |-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |RESET|     |     |     |     |     |                 |
+|           |     |     |     |     |QK_BOOT|     |     |     |     |     |                 |
 |-----------------------------------------------------------------------------------------+
 |      |       |       |                                   |       |       |       | Trans|
 `-----------------------------------------------------------------------------------------'
diff --git a/layouts/community/60_iso/unxmaal/keymap.c b/layouts/community/60_iso/unxmaal/keymap.c
index e1c0454fb6..52403745f1 100644
--- a/layouts/community/60_iso/unxmaal/keymap.c
+++ b/layouts/community/60_iso/unxmaal/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------'
    */
 	[_FL] = LAYOUT_60_iso(
-        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,RESET, \
+        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,QK_BOOT, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PGUP,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_TRNS,KC_HOME,KC_PGDN,KC_END,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
index 9ec75f3c4d..ae35f947e8 100644
--- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */
     [LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  RESET,    _______,  _______,  _______,  RGB_VAI,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
         _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,            _______
diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
index b6db28ed9d..8fd0739d91 100644
--- a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, BL_INC,  _______, _______, _______, _______, _______, _______, KC_UP,   MC_MSSN, KC_DELT, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  _______, _______, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_RGHT,          KC_MPLY, \
-    _______,          RGB_LYR, RGB_THM, BL_TOGG, _______, RESET,   _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_DOWN, PGU_SFT, _______, \
+    _______,          RGB_LYR, RGB_THM, BL_TOGG, _______, QK_BOOT, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_DOWN, PGU_SFT, _______, \
     _______, _______, _______,                            _______,                                     HOM_CMD, PGD_OPT, END_CTL  \
 )
 /*  Layer
diff --git a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
index 2d92fd9c4d..d6c0d9ec30 100644
--- a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [ADJUST] = LAYOUT_60_tsangan_hhkb(
         C(A(KC_DEL)),  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_BRID,  KC_BRIU,  XXXXXXX, XXXXXXX,
-        C(S(KC_ESC)),  TO(0),    XXXXXXX,  XXXXXXX,  RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+        C(S(KC_ESC)),  TO(0),    XXXXXXX,  XXXXXXX,  QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
         XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
         XXXXXXX,            XXXXXXX,  XXXXXXX,  TO(1),    XXXXXXX,  XXXXXXX,  NK_TOGG,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
         XXXXXXX,  XXXXXXX,  XXXXXXX,                                          _______,                                          XXXXXXX,  XXXXXXX, XXXXXXX
diff --git a/layouts/community/60_tsangan_hhkb/yanfali/keymap.c b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
index 31f0a66f29..1af9eebf5b 100644
--- a/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FN] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,  RESET,
+        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,  QK_BOOT,
         KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c b/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
index 697807bdab..19d14eb374 100644
--- a/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FN] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,  RESET,
+        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,  QK_BOOT,
         KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/layouts/community/65_ansi/mechmerlin/keymap.c b/layouts/community/65_ansi/mechmerlin/keymap.c
index 4799083661..9e3e0752b5 100644
--- a/layouts/community/65_ansi/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi/mechmerlin/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_CL] = LAYOUT_65_ansi(
         _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______,  _______, EEP_RST,  RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, EEP_RST,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,           _______, _______,  _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______,                            _______,                    _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/65_ansi/yanfali/keymap.c b/layouts/community/65_ansi/yanfali/keymap.c
index a0887da2bf..a4cda26469 100755
--- a/layouts/community/65_ansi/yanfali/keymap.c
+++ b/layouts/community/65_ansi/yanfali/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [FN] = 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, RESET,   KC_TRNS,\
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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)
diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
index 6b67cfdca5..ea39959d7e 100644
--- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
+++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DELT, MC_SLPD, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_LHPD, KC_VOLU, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
-    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
     _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END   \
 ),
 /* Blank Layout
diff --git a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
index d82a6327d1..6371153066 100644
--- a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_CL] = LAYOUT_65_ansi_blocker(
         _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,  _______, _______, EEP_RST,  RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,  _______, _______, EEP_RST,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,           _______, _______, _______,  KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______,  _______,           _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index 687737c7cb..aa4378fdcc 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // Glyph Transformation
     [_GLYPH] = LAYOUT_65_ansi_blocker(
-        RESET,      X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     SPI_GFLOCK,             XXXXXXX,    XXXXXXX,
+        QK_BOOT,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     SPI_GFLOCK,             XXXXXXX,    XXXXXXX,
         EEP_RST,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    XXXXXXX,                XXXXXXX,    XXXXXXX,
         _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    XXXXXXX,
         XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    X(LARR),    X(RARR),    XXXXXXX,                            XXXXXXX,    XXXXXXX,    XXXXXXX,
diff --git a/layouts/community/65_ansi_blocker/stanrc85/keymap.c b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
index 46fa4025d9..ce6efb235e 100644
--- a/layouts/community/65_ansi_blocker/stanrc85/keymap.c
+++ b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_65_ansi_blocker(
     RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_SAD, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, BL_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   BL_INC,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, BL_INC,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,          BL_DEC,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______, _______, _______,                            _______,                   TG(_DEFAULT), _______,     _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
index c099d36e25..37111c9508 100644
--- a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
     [LAYER_FUNCTION_1] = LAYOUT_65_ansi_blocker_split_bs(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   _______,
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            _______,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
         _______,  _______,  _______,                      _______,                                _______,  _______,                      _______,  _______,  _______
diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
index 9482b12c44..2d76ce1d15 100644
--- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_MSSN, MC_SLPD, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DELT, KC_VOLU, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
-    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
     _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END   \
 ),
 /* Blank Layout
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
index 737b52e84c..050c93a57e 100644
--- a/layouts/community/66_ansi/mechmerlin/keymap.c
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_CL] = LAYOUT_66_ansi(
   BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   _______,           RGB_VAI, \
-  _______,_______,_______,EEP_RST,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______,                 RGB_VAD, \
+  _______,_______,_______,EEP_RST,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______,                 RGB_VAD, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,                             \
   VLK_TOG,        _______,_______,_______,KC_VER,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,         \
   CK_TOGG,_______,_______,                       _______,                                _______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/layouts/community/66_ansi/skully/keymap.c b/layouts/community/66_ansi/skully/keymap.c
index 9337cfe02b..fa138ce445 100644
--- a/layouts/community/66_ansi/skully/keymap.c
+++ b/layouts/community/66_ansi/skully/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT_66_ansi(
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,            RGB_VAI,
-  CK_TOGG,    _______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_VAD,
+  CK_TOGG,    _______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_VAD,
   _______,      _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
   MO(_FL),           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,         RGB_SAI,
   _______,  _______,  _______,  RGB_MOD,                                          _______,  _______,_______,  RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/layouts/community/66_ansi/xyverz/keymap.c b/layouts/community/66_ansi/xyverz/keymap.c
index d7231db5cb..3f9594f78a 100644
--- a/layouts/community/66_ansi/xyverz/keymap.c
+++ b/layouts/community/66_ansi/xyverz/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT_66_ansi (
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,                   RGB_VAI, \
-  _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_VAD, \
+  _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_VAD, \
   _______, _______, MO(_CL), _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______,                                     \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_SAI,                            \
   _______, _______, _______,                   RGB_MOD,                            _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI),
diff --git a/layouts/community/68_ansi/mechmerlin/keymap.c b/layouts/community/68_ansi/mechmerlin/keymap.c
index 19f30f8f00..63bdb6f69e 100644
--- a/layouts/community/68_ansi/mechmerlin/keymap.c
+++ b/layouts/community/68_ansi/mechmerlin/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_CL] = LAYOUT_68_ansi(\
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, 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_VER, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c
index 0f9d63c7c0..91c215ed80 100644
--- a/layouts/community/75_ansi/brandonschlack/keymap.c
+++ b/layouts/community/75_ansi/brandonschlack/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DELT, MC_SLPD, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_VOLD, \
-    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, _______, _______, _______, _______, _______,          KC_PGUP, KC_MUTE, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          KC_PGUP, KC_MUTE, \
     _______, _______, _______,                            _______,                            _______, _______, _______, KC_HOME, KC_PGDN, KC_END   \
 ),
 /* Blank Layer
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
index 387f2d9edb..57d4517acf 100644
--- a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
+++ b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CL] = LAYOUT_75_ansi(\
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______,  _______, EEP_RST, RESET,    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, EEP_RST, QK_BOOT,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, KC_VER,  _______,  _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______,          _______,            _______, _______, _______, _______, _______, _______),
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index d500f11031..37851830de 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // FN
     [_FN] = LAYOUT_75_ansi(
-        RESET,      SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
+        QK_BOOT,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
         EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SLCK,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   SPI_LNX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
diff --git a/layouts/community/75_ansi/yanfali/keymap.c b/layouts/community/75_ansi/yanfali/keymap.c
index f63da237c1..66ff76555c 100644
--- a/layouts/community/75_ansi/yanfali/keymap.c
+++ b/layouts/community/75_ansi/yanfali/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [FN] = LAYOUT_75_ansi(\
         _______,   RGB_M_P,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, EEP_RST, RESET,   _______,
+        BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT, _______,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI,  _______, _______, _______, _______, _______, _______, _______, _______,
         VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PGUP, _______,
         _______, _______,  _______,          _______,            _______, _______, _______, KC_HOME, KC_PGDN, KC_END)
diff --git a/layouts/community/alice/stanrc85-alice/keymap.c b/layouts/community/alice/stanrc85-alice/keymap.c
index d1ace8b8e5..dcbd570777 100644
--- a/layouts/community/alice/stanrc85-alice/keymap.c
+++ b/layouts/community/alice/stanrc85-alice/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_alice(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, RESET,
+    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/layouts/community/ergodox/ab/keymap.c b/layouts/community/ergodox/ab/keymap.c
index e85d5d528c..0046f5ed21 100644
--- a/layouts/community/ergodox/ab/keymap.c
+++ b/layouts/community/ergodox/ab/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_BTN1, KC_BTN3, KC_BTN2, KC_TRNS, KC_TRNS,
-	RESET, KC_TRNS, ZM_NRM,  ZM_OUT,  ZM_IN,
+	QK_BOOT, KC_TRNS, ZM_NRM,  ZM_OUT,  ZM_IN,
 	KC_TRNS, KC_TRNS,
 	KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ergodox/alexjj/keymap.c b/layouts/community/ergodox/alexjj/keymap.c
index c9adf7af63..77250e6ded 100644
--- a/layouts/community/ergodox/alexjj/keymap.c
+++ b/layouts/community/ergodox/alexjj/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
-       RESET, 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_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,
diff --git a/layouts/community/ergodox/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c
index d869c5bb9f..8345d820c1 100644
--- a/layouts/community/ergodox/bepo_csa/keymap.c
+++ b/layouts/community/ergodox/bepo_csa/keymap.c
@@ -323,7 +323,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |      |      |      |      |      |VolUp |           |      |      |      |      |      |      | Pause  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  RESET |      |      | Calc | Mail |Browsr|------|           |------|      |      |      |      |      |        |
+ * |  QK_BOOT |      |      | Calc | Mail |Browsr|------|           |------|      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |        | App  | cut  | copy |paste | Mute |VolDn |           |      |      |      |      |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
@@ -341,7 +341,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [LR_FN] = LAYOUT_ergodox(
        TG(LR_CSA), KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_INS,
        KC_TRNS,    KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_VOLU,
-       RESET,      KC_TRNS, KC_TRNS,      KC_CALC,     KC_MAIL,      KC_WHOM,
+       QK_BOOT,    KC_TRNS, KC_TRNS,      KC_CALC,     KC_MAIL,      KC_WHOM,
        KC_TRNS,    KC_APP,  S(KC_DEL),    LCTL(KC_INS),S(KC_INS),    KC_MUTE, KC_VOLD,
        KC_TRNS,    KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
 
diff --git a/layouts/community/ergodox/choromanski/keymap.c b/layouts/community/ergodox/choromanski/keymap.c
index 933f13b25f..01786aab3c 100644
--- a/layouts/community/ergodox/choromanski/keymap.c
+++ b/layouts/community/ergodox/choromanski/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 4: Numlock
  *
  * ,--------------------------------------------------.         ,--------------------------------------------------.
- * | POWER  |SLEEP |      |MOUSE3|      |      | RESET|         |RESET |SCROL | NUML |  /   |  *   |  -   |        |
+ * | POWER  |SLEEP |      |MOUSE3|      |      | QK_BOOT|         |QK_BOOT |SCROL | NUML |  /   |  *   |  -   |        |
  * |--------+------+------+------+------+-------------|         |------+------+------+------+------+------+--------|
  * |        |      |MOUSE1|MOUSEU|MOUSE2|SCROLU|      |         |      |      |  7   |  8   |  9   |  +   | ACCEL0 |
  * |--------+------+------+------+------+------|      |         |      |------+------+------+------+------+--------|
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               `--------------------'        `--------------------'
  */
   [4] = LAYOUT_ergodox(
-	KC_PWR,		KC_SLEP,	KC_TRNS,	KC_BTN3,	KC_TRNS,	KC_TRNS,	RESET,
+	KC_PWR,		KC_SLEP,	KC_TRNS,	KC_BTN3,	KC_TRNS,	KC_TRNS,	QK_BOOT,
 	KC_TRNS,	KC_TRNS,	KC_BTN1,	KC_MS_U,	KC_BTN2,	KC_WH_U,	KC_TRNS,
 	KC_TRNS,	KC_TRNS,	KC_MS_L,	KC_MS_D,	KC_MS_R,	KC_WH_D,
 	KC_TRNS,	KC_TRNS,	KC_ACL0,	KC_ACL1,	KC_ACL2,	KC_TRNS,	KC_TRNS,
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 																			KC_MUTE,
 													KC_TRNS,	KC_TRNS,	KC_MYCM,
 
-	RESET,		KC_SLCK,	KC_NLCK,	KC_SLSH,	KC_ASTR,	KC_MINS,	KC_TRNS,
+	QK_BOOT,		KC_SLCK,	KC_NLCK,	KC_SLSH,	KC_ASTR,	KC_MINS,	KC_TRNS,
 	KC_TRNS,	KC_TRNS,	KC_7,		KC_8,		KC_9,		KC_PLUS,	KC_ACL2,
 				KC_TRNS,	KC_4,		KC_5,		KC_6,		KC_PLUS,	KC_ACL1,
 	KC_TRNS,	KC_TRNS,	KC_1,		KC_2,		KC_3,		KC_ENT,		KC_ACL0,
diff --git a/layouts/community/ergodox/colemak_programmer/keymap.c b/layouts/community/ergodox/colemak_programmer/keymap.c
index b4ace197de..aa60d8d11b 100644
--- a/layouts/community/ergodox/colemak_programmer/keymap.c
+++ b/layouts/community/ergodox/colemak_programmer/keymap.c
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 4: Numlock
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | RESET  |      |      |      |P-SCRE|S-LOCK|PAUSE |           |NLOCK | CALC |  =   |  /   |  *   |      |        |
+ * | QK_BOOT  |      |      |      |P-SCRE|S-LOCK|PAUSE |           |NLOCK | CALC |  =   |  /   |  *   |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |      |      |      |      |      |      |           |      | Vol+ |  7   |  8   |  9   |  -   |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 [4] = LAYOUT_ergodox(
-       RESET,          KC_LSFT,    KC_LSFT,    KC_SYSREQ,  KC_PSCR,    KC_SLCK,    KC_PAUSE,
+       QK_BOOT,        KC_LSFT,    KC_LSFT,    KC_SYSREQ,  KC_PSCR,    KC_SLCK,    KC_PAUSE,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_HYPR,
diff --git a/layouts/community/ergodox/common_nighthawk/keymap.c b/layouts/community/ergodox/common_nighthawk/keymap.c
index a7ed10d715..976fb68982 100644
--- a/layouts/community/ergodox/common_nighthawk/keymap.c
+++ b/layouts/community/ergodox/common_nighthawk/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         M(1),            KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
         KC_LSFT,         KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
         KC_LALT,         KC_1,          KC_1,          KC_1,            KC_LEFT,
-                                                                        RESET,    KC_VOLU,
+                                                                        QK_BOOT,  KC_VOLU,
                                                                         KC_VOLD,
                                                                         LT(SYMB, KC_SPC),  TG(MDIA), KC_MUTE,
         // right hand
diff --git a/layouts/community/ergodox/dragon788/keymap.c b/layouts/community/ergodox/dragon788/keymap.c
index b32346a9df..b41cf2c9b3 100644
--- a/layouts/community/ergodox/dragon788/keymap.c
+++ b/layouts/community/ergodox/dragon788/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 LAYOUT_ergodox(
-         RESET, 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_BTN2, KC_BTN1, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ergodox/guni/keymap.c b/layouts/community/ergodox/guni/keymap.c
index cc67fbdeaa..d39599a1b1 100644
--- a/layouts/community/ergodox/guni/keymap.c
+++ b/layouts/community/ergodox/guni/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     LAYOUT_ergodox(  // layer 3 : teensy bootloader functions
         // left hand
-        RESET, 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,
diff --git a/layouts/community/ergodox/issmirnov/keymap.c b/layouts/community/ergodox/issmirnov/keymap.c
index 2743a04e93..c5a7a29121 100644
--- a/layouts/community/ergodox/issmirnov/keymap.c
+++ b/layouts/community/ergodox/issmirnov/keymap.c
@@ -61,7 +61,7 @@ TO(0)   , XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
                                                         XXXXXXX  ,
                                             KC_SPACE , KC_BSPACE , KC_DEL ,
 
-KC_EQL  , ___________________XXXXX___________________ , RESET   ,
+KC_EQL  , ___________________XXXXX___________________ , QK_BOOT   ,
 KC_PLUS , _________________NUMP_R1___________________ , XXXXXXX ,
           _________________NUMP_R2___________________ , XXXXXXX                                     ,
 KC_MINS , _________________NUMP_R3___________________ , XXXXXXX ,
diff --git a/layouts/community/ergodox/jackhumbert/keymap.c b/layouts/community/ergodox/jackhumbert/keymap.c
index b6d1b33e33..2e1678d8b2 100644
--- a/layouts/community/ergodox/jackhumbert/keymap.c
+++ b/layouts/community/ergodox/jackhumbert/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                               KC_HOME,
                                                KC_SPC,KC_SPC,KC_END,
         // right hand
-             KC_NO,     M(1),   RESET,   KC_8,   KC_9,   KC_0,             KC_NO,
+             KC_NO,     M(1),   QK_BOOT, KC_8,   KC_9,   KC_0,             KC_NO,
              KC_NO,     RGB_TOG,   RGB_MOD,   RGB_HUI,   RGB_HUD,   KC_P,             KC_BSPC,
                         RGB_SAI,   RGB_SAD,   RGB_VAI,   RGB_VAD,   KC_SCLN,          KC_QUOT,
              KC_NO,     KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_ENT,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
        KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
                 KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-       KC_TRNS, KC_F12,  KC_NO,   KC_NO, KC_NO, RESET,   KC_TRNS,
+       KC_TRNS, KC_F12,  KC_NO,   KC_NO, KC_NO, QK_BOOT, KC_TRNS,
                          KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS,  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
                  KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-       KC_TRNS,  KC_F12,  KC_NO,   KC_NO, KC_NO, RESET,   KC_TRNS,
+       KC_TRNS,  KC_F12,  KC_NO,   KC_NO, KC_NO, QK_BOOT, KC_TRNS,
                           KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
diff --git a/layouts/community/ergodox/josh/keymap.c b/layouts/community/ergodox/josh/keymap.c
index 3f9d8779e1..d98b98b236 100644
--- a/layouts/community/ergodox/josh/keymap.c
+++ b/layouts/community/ergodox/josh/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 2: Media and mouse keys
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |RESET |           |RESET |      |      |      |      |      |        |
+ * |        |      |      |      |      |      |QK_BOOT |           |QK_BOOT |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
        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,
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     KC_TRNS,
                                   KC_TRNS, KC_TRNS, KC_TRNS,
     // right hand
-       RESET,    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_MPLY,
        KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ergodox/kejadlen/keymap.c b/layouts/community/ergodox/kejadlen/keymap.c
index 92a667dec0..86d42aa740 100644
--- a/layouts/community/ergodox/kejadlen/keymap.c
+++ b/layouts/community/ergodox/kejadlen/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [ETC] = LAYOUT_ergodox(
-    RESET,    KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_NO,    KC_NO,
+    QK_BOOT,  KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_NO,    KC_NO,
     KC_TRNS,  KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_PGUP,  KC_TRNS,
     KC_TRNS,  LT(ETC,KC_A),  KC_NO,  KC_NO,    KC_NO,    KC_PGDN,
     KC_TRNS,  KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_DEL,   KC_TRNS,
diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c
index c780c1a9fb..9d4eba205d 100644
--- a/layouts/community/ergodox/meagerfindings/keymap.c
+++ b/layouts/community/ergodox/meagerfindings/keymap.c
@@ -287,7 +287,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Keymap 5: Arrows
     *
     * ,--------------------------------------------------.           ,--------------------------------------------------.
-    * |  RESET |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+    * |  QK_BOOT |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
     * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
     * |        |      | Opt+L|  Up  |Opt+R |      |      |           |      |      | Opt+L|  Up  |Opt+R |      |        |
     * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -312,7 +312,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [ARROWS] = LAYOUT_ergodox(
   //left hand
-    RESET,       _______,       _______,       _______,        _______,         _______,       _______,
+    QK_BOOT,     _______,       _______,       _______,        _______,         _______,       _______,
     _______,     _______,        CHRM_L,       KC_UP,           CHRM_R,         _______,       _______,
     _______,LCTL(KC_LEFT),      KC_LEFT,       KC_DOWN,       KC_RIGHT,    LCTL(KC_RIGHT),
     _______,    _______,       _______,       _______,        _______,         _______,       _______,
diff --git a/layouts/community/ergodox/naps62/keymap.c b/layouts/community/ergodox/naps62/keymap.c
index fe6289097b..e9697497a0 100644
--- a/layouts/community/ergodox/naps62/keymap.c
+++ b/layouts/community/ergodox/naps62/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 LAYOUT_ergodox(
-         RESET, 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,        LGUI(KC_W),  LGUI(KC_E),     KC_BTN1, LGUI(KC_T), KC_TRNS,
        KC_TRNS, LGUI(KC_A),     LGUI(KC_S),  LGUI(KC_D),     KC_MS_D, KC_MS_R,
        KC_TRNS, KC_TRNS,        KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS,    KC_TRNS,
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index 0c36abcf74..8bd24a1233 100644
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_MUTE,KC_F5,  KC_F6,  KC_F7,  KC_F8,  _______,
     _______,KC_VOLD,KC_F1,  KC_F2,  KC_F3,  KC_F4,  _______,
                     _______,ooooooo,_______,_______,_______,
-    _______,RESET,
+    _______,QK_BOOT,
     _______,
     _______,_______,KC_LALT
 ),
diff --git a/layouts/community/ergodox/sethbc/keymap.c b/layouts/community/ergodox/sethbc/keymap.c
index f3a1f64309..ea6fc465ef 100644
--- a/layouts/community/ergodox/sethbc/keymap.c
+++ b/layouts/community/ergodox/sethbc/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 // FN2
 [FN2] = LAYOUT_ergodox(
-       RESET,   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,
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index b0abff9ec6..6b8ff9d9c8 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_7,    KC_8,    KC_9,    KC_PPLS, KC_TRNS,
                 KC_TRNS, KC_4,    KC_5,    KC_6,    KC_PPLS, KC_TRNS,
-       RESET,   KC_TRNS, KC_1,    KC_2,    KC_3,    KC_PENT, KC_TRNS,
+       QK_BOOT, KC_TRNS, KC_1,    KC_2,    KC_3,    KC_PENT, KC_TRNS,
                          KC_0,    KC_COMM, KC_DOT,  KC_PENT, KC_TRNS,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
diff --git a/layouts/community/ergodox/swissgerman/keymap.c b/layouts/community/ergodox/swissgerman/keymap.c
index 8766d16ae0..9677be43b9 100644
--- a/layouts/community/ergodox/swissgerman/keymap.c
+++ b/layouts/community/ergodox/swissgerman/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 2: Media and mouse keys
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | RESET  |      |      |      |      |      |      |           |      |      |      |      |      |      | RESET  |
+ * | QK_BOOT  |      |      |      |      |      |      |           |      |      |      |      |      |      | QK_BOOT  |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |      |      | MsUp |      |      |      |           |      |      |H_UL  |      |H_OL  |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
-       RESET, 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_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, HTML_CODE, KC_TRNS, HTML_BR, KC_TRNS,
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     KC_TRNS,
                                   KC_ENT, KC_TRNS, KC_TRNS,
     // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
        KC_TRNS,  KC_TRNS, HTML_UL, KC_TRNS, HTML_OL, KC_TRNS, KC_TRNS,
                  KC_TRNS, KC_TRNS, KC_TRNS, HTML_LI, KC_TRNS, KC_MPLY,
        KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ergodox/xyverz/keymap.c b/layouts/community/ergodox/xyverz/keymap.c
index f348736c6e..cb23782330 100644
--- a/layouts/community/ergodox/xyverz/keymap.c
+++ b/layouts/community/ergodox/xyverz/keymap.c
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_MEDIA] = LAYOUT_ergodox(
         // left hand
-        KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   RESET,
+        KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
         KC_CAPS, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______,
diff --git a/layouts/community/numpad_5x6/bjohnson/keymap.c b/layouts/community/numpad_5x6/bjohnson/keymap.c
index 4b15ccdfb9..45b339f7ff 100644
--- a/layouts/community/numpad_5x6/bjohnson/keymap.c
+++ b/layouts/community/numpad_5x6/bjohnson/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F9,   KC_F10,        KC_P0,       KC_PDOT, KC_PENT
   ),
 	[1] = LAYOUT_numpad_5x6(
-		RGB_TOG, _______,  _______, _______, _______, RESET,
+		RGB_TOG, _______,  _______, _______, _______, QK_BOOT,
 		RGB_MOD, RGB_RMOD, _______, _______, _______,
 		RGB_HUI, RGB_HUD,  _______, _______, _______, _______,
 		RGB_SAI, RGB_SAD,  _______, _______, _______,
diff --git a/layouts/community/ortho_3x10/bbaserdem/keymap.c b/layouts/community/ortho_3x10/bbaserdem/keymap.c
index cf81f7036e..4cc1a25caf 100644
--- a/layouts/community/ortho_3x10/bbaserdem/keymap.c
+++ b/layouts/community/ortho_3x10/bbaserdem/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MEDI] = LAYOUT_ortho_3x10(
         CK_TOGG,RGB_TOG,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,RGB_MOD,RGB_RMOD,
         _______,BL_TOGG,BL_BRTG,BL_INC, BL_DEC, XXXXXXX,XXXXXXX,VLK_TOG,RGB_SPI,RGB_SPD,
-        AU_TOG, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EEP_RST,RESET
+        AU_TOG, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EEP_RST,QK_BOOT
     ),
     [_MUSI] = LAYOUT_ortho_3x10_wrapper(
         MU_FAST,_MU_08_,MU_REC,
diff --git a/layouts/community/ortho_3x10/wanleg/readme.md b/layouts/community/ortho_3x10/wanleg/readme.md
index 255e19c2a4..17d2277f82 100644
--- a/layouts/community/ortho_3x10/wanleg/readme.md
+++ b/layouts/community/ortho_3x10/wanleg/readme.md
@@ -14,7 +14,7 @@ Q//Esc | KC_Q | escape | *null*
 2. If you have never flashed your ProMicro with QMK before, you will need to short the RST pin to GND to put it into bootloader mode (you only have 7 seconds to flash once it enters bootloader mode). You may need to touch the RST pin to GND **TWICE** in quick succession if it doesn't flash with just one touch.  
 3. Once connected to your computer, you should be able to flash using  
 `make gherkin:wanleg:avrdude`  
-4. Once you've been able to successfully flash the ProMicro, you should be able to use the `RESET` key for future flashes instead of shorting the RST pin.
+4. Once you've been able to successfully flash the ProMicro, you should be able to use the `QK_BOOT` key for future flashes instead of shorting the RST pin.
 
 ## Linux  
 ### First Flash with QMK  
@@ -34,8 +34,8 @@ If you miss the 7 second window, the ProMicro will leave bootloader mode and the
 ### Subsequent Flashes with QMK
 1. Re-flashing is similar to the initial flash procedure. Plug in your keyboard, open a terminal and run
 `ls /dev/tty*`
-2. Next, hit the `RESET` key on your keyboard and re-run the `ls /dev/tty*` command to find your keyboard's serial port.  
-3. Flash your keyboard with the avrdude command you used for the initial flash within 7 seconds after hitting `RESET`.
+2. Next, hit the `QK_BOOT` key on your keyboard and re-run the `ls /dev/tty*` command to find your keyboard's serial port.  
+3. Flash your keyboard with the avrdude command you used for the initial flash within 7 seconds after hitting `QK_BOOT`.
 
 # ProMicro Bootloader Replacement (Caterina to QMK DFU)
 If you have an Arduino (or clone), you can replace the bootloader for a few extra features (e.g. no more 7 second "flash window", simplified Linux flashing, blinking LED when the ProMicro is in bootloader mode, ability to exit bootloader mode without unplugging your keyboard, among others).
@@ -61,7 +61,7 @@ The instructions below have been adapted from https://www.reddit.com/r/olkb/comm
 #define QMK_LED B0
 ```
 The `QMK_ESC_` lines define where the bootloader escape key is. Refer to the `MATRIX_ROW_PINS` and `MATRIX_COL_PINS` lines in your keyboard's `config.h` to choose your preferred key.  
-You hit the bootloader escape key to exit bootloader mode after you've hit the RESET key to enter bootloader mode (e.g. if you change your mind and don't want to flash just then).  
+You hit the bootloader escape key to exit bootloader mode after you've hit the QK_BOOT key to enter bootloader mode (e.g. if you change your mind and don't want to flash just then).  
 On a Gherkin, B4/F7 corresponds to the top-left corner key.  
 `B0` is an indicator light on one of the ProMicro's onboard LEDs. With QMK DFU, it will flash to indicate the ProMicro is in bootloader mode.  
 You can add `#define QMK_SPEAKER C6` if you have a speaker hooked up to pin C6. The Gherkin PCB already uses pin C6 in its switch layout, so you cannot use a speaker on a standard Gherkin.  
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 7f817e21c1..6652d003c2 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  M_CUSTOM, RESET,   QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
+  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
   KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
   TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______
diff --git a/layouts/community/ortho_4x12/bakingpy/keymap.c b/layouts/community/ortho_4x12/bakingpy/keymap.c
index eb3b420ee6..9638ee25b8 100644
--- a/layouts/community/ortho_4x12/bakingpy/keymap.c
+++ b/layouts/community/ortho_4x12/bakingpy/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
   [_ADJUST] = LAYOUT_ortho_4x12( \
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
+    _______, 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,_______, _______, \
     _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______ \
diff --git a/layouts/community/ortho_4x12/bifbofii/keymap.c b/layouts/community/ortho_4x12/bifbofii/keymap.c
index 6ce39a4a38..6d24fc14cf 100644
--- a/layouts/community/ortho_4x12/bifbofii/keymap.c
+++ b/layouts/community/ortho_4x12/bifbofii/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
  * | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | Lnx | XXX | XXX |
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
- * | XXX | XXX | XXX | XXX | XXX |RESET| XXX | XXX | XXX | XXX | XXX | XXX |
+ * | XXX | XXX | XXX | XXX | XXX |QK_BOOT| XXX | XXX | XXX | XXX | XXX | XXX |
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
  * | XXX | XXX | XXX | XXX | XXX |    XXX    | XXX | XXX | XXX | XXX | XXX |
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SPECIALS] = LAYOUT_ortho_4x12(
     XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_OS, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 )
 
diff --git a/layouts/community/ortho_4x12/bifbofii/readme.md b/layouts/community/ortho_4x12/bifbofii/readme.md
index e077ffba28..0d17f3a07e 100644
--- a/layouts/community/ortho_4x12/bifbofii/readme.md
+++ b/layouts/community/ortho_4x12/bifbofii/readme.md
@@ -82,7 +82,7 @@ Holding the Space Bar switches to the Function layer.
 +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
 | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | Lnx | XXX | XXX |
 +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
-| XXX | XXX | XXX | XXX | XXX |RESET| XXX | XXX | XXX | XXX | XXX | XXX |
+| XXX | XXX | XXX | XXX | XXX |QK_BOOT| XXX | XXX | XXX | XXX | XXX | XXX |
 +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
 | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX |
 +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index 4877a0b446..07ba5e167c 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Adjust (Lower + Raise) */
 [_ADJUST] = LAYOUT_ortho_4x12( \
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    QM_MAKE, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \
+    QM_MAKE, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
     QM_FLSH, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/layouts/community/ortho_4x12/bredfield/keymap.c b/layouts/community/ortho_4x12/bredfield/keymap.c
index 78fa8c89f1..af704ca398 100644
--- a/layouts/community/ortho_4x12/bredfield/keymap.c
+++ b/layouts/community/ortho_4x12/bredfield/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Keyboard
  * ,--------------------------------------------------------------------------------+--------+-----------------.
- * |        |        |        |        |        |        |        |        |        |        |        | RESET  |
+ * |        |        |        |        |        |        |        |        |        |        |        | QK_BOOT  |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
  * |        |        |        |        |        |        |        |        |        |        |        | DEBUG  |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------------------------+--------|
@@ -167,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------------------'
  */
 [_KEYBOARD_LAYER] = LAYOUT_ortho_4x12(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
index 455db2a8a5..df0f2c6a0f 100644
--- a/layouts/community/ortho_4x12/buswerks/keymap.c
+++ b/layouts/community/ortho_4x12/buswerks/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             ),
 
     [_ADJUST] = LAYOUT_ortho_4x12(
-            _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
+            _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
             _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  GAME,    _______,
             _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
             _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/layouts/community/ortho_4x12/colemak_mod_dh_wide/keymap.c b/layouts/community/ortho_4x12/colemak_mod_dh_wide/keymap.c
index c8da7f589f..b4df69cf40 100644
--- a/layouts/community/ortho_4x12/colemak_mod_dh_wide/keymap.c
+++ b/layouts/community/ortho_4x12/colemak_mod_dh_wide/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/layouts/community/ortho_4x12/crs/keymap.c b/layouts/community/ortho_4x12/crs/keymap.c
index 2ec2ffba9f..e0d553362c 100644
--- a/layouts/community/ortho_4x12/crs/keymap.c
+++ b/layouts/community/ortho_4x12/crs/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12( \
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, RESET, M(0),  _______, _______, _______, _______, PLOVER, LALT(LCTL(KC_DEL)), \
+  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, _______, _______, _______, PLOVER, LALT(LCTL(KC_DEL)), \
   KC_CAPS, ARROW, _______, AU_ON,   AU_OFF,  GAME, AG_SWAP, AG_NORM,  KC_PSCR, KC_SLCK,  KC_PAUS,  _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV, KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
   BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP \
diff --git a/layouts/community/ortho_4x12/ddeklerk/keymap.c b/layouts/community/ortho_4x12/ddeklerk/keymap.c
index ec36a50616..a48565d570 100644
--- a/layouts/community/ortho_4x12/ddeklerk/keymap.c
+++ b/layouts/community/ortho_4x12/ddeklerk/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
     [_ADJUST] = LAYOUT_ortho_4x12(
-        XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, GAME,    BASE,    XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/layouts/community/ortho_4x12/ergodoxish/keymap.c b/layouts/community/ortho_4x12/ergodoxish/keymap.c
index 7c844c6b3a..3e6dc1a42b 100644
--- a/layouts/community/ortho_4x12/ergodoxish/keymap.c
+++ b/layouts/community/ortho_4x12/ergodoxish/keymap.c
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12( \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/layouts/community/ortho_4x12/greatwizard/keymap.c b/layouts/community/ortho_4x12/greatwizard/keymap.c
index a895aaf942..1796254c16 100644
--- a/layouts/community/ortho_4x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_4x12/greatwizard/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_ortho_4x12_wrapper(
         KC_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, RESET,   EEP_RST, _______, _______, _______, GAME,    QWERTY,  WORKMAN, COLEMAK, DVORAK,  _______,
+        KC_CAPS, QK_BOOT, EEP_RST, _______, _______, _______, GAME,    QWERTY,  WORKMAN, COLEMAK, DVORAK,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
    /* GIT
      * ,-----------------------------------------------------------------------------------.
-     * |      |CHRPCK| SHOW |REBASE|RESET | TAG  |      | PULL | INIT |REMOTE| PUSH |      |
+     * |      |CHRPCK| SHOW |REBASE|QK_BOOT | TAG  |      | PULL | INIT |REMOTE| PUSH |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * |      | ADD  |STATUS| DIFF |FETCH | GREP |STASH |      |CHECKT| LOG  |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/layouts/community/ortho_4x12/jackhumbert/keymap.c b/layouts/community/ortho_4x12/jackhumbert/keymap.c
index 08abf78d14..ed637b7c30 100644
--- a/layouts/community/ortho_4x12/jackhumbert/keymap.c
+++ b/layouts/community/ortho_4x12/jackhumbert/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, _______,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, _______,
     _______, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, XXXXXXX, XXXXXXX, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index 421e6b3043..ffffbe75d2 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-    _______,RESET  ,_______,_______,RGB_TOG,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,_______,_______,_______,
+    _______,QK_BOOT,_______,_______,RGB_TOG,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
     _______,_______,RGB_SAI,RGB_SAD,_______,_______,RGB_HUI,RGB_HUD,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
diff --git a/layouts/community/ortho_4x12/juno/keymap.c b/layouts/community/ortho_4x12/juno/keymap.c
index 344759ed19..1c9b4af891 100644
--- a/layouts/community/ortho_4x12/juno/keymap.c
+++ b/layouts/community/ortho_4x12/juno/keymap.c
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 * `-----------------------------------------------------------------------------------'
 	 */
 	[_ADJUST] = LAYOUT_ortho_4x12(
-		_______, RESET,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+		_______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
 		_______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
 		_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_4x12/junonum/keymap.c b/layouts/community/ortho_4x12/junonum/keymap.c
index 9ed82640e0..d6fb1a4b07 100644
--- a/layouts/community/ortho_4x12/junonum/keymap.c
+++ b/layouts/community/ortho_4x12/junonum/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_ortho_4x12(
-        _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+        _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
         _______, _______, MU_MOD,  AU_ON,   AU_OFF,  CG_NORM, CG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/layouts/community/ortho_4x12/mguterl/keymap.c b/layouts/community/ortho_4x12/mguterl/keymap.c
index f18ae14d4a..e57fb0c47f 100644
--- a/layouts/community/ortho_4x12/mguterl/keymap.c
+++ b/layouts/community/ortho_4x12/mguterl/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    TG_GAME, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    TG_GAME, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/layouts/community/ortho_4x12/mindsound/keymap.c b/layouts/community/ortho_4x12/mindsound/keymap.c
index 336545502f..a4205fe92d 100644
--- a/layouts/community/ortho_4x12/mindsound/keymap.c
+++ b/layouts/community/ortho_4x12/mindsound/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,                  \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,                  \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,                 \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, BL_TOGG, BL_DEC,  BL_INC,  BL_FLICKER,                 \
   _______, _______, _______, _______, _______, _______, _______, _______, CLICKY_TOGGLE, CLICKY_DOWN, CLICKY_UP, CLICKY_RESET \
diff --git a/layouts/community/ortho_4x12/symbolic/keymap.c b/layouts/community/ortho_4x12/symbolic/keymap.c
index c292373711..5aac13e8f7 100644
--- a/layouts/community/ortho_4x12/symbolic/keymap.c
+++ b/layouts/community/ortho_4x12/symbolic/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    XXXXXXX,  KC_PPLS,  KC_PMNS,  KC_P1,    KC_P2,    KC_P3,     _______, \
   _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    XXXXXXX,  KC_PAST,  KC_PSLS,  KC_P4,    KC_P5,    KC_P6,     _______, \
   _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   XXXXXXX,  KC_PDOT,  KC_COMM,  KC_P7,    KC_P8,    KC_P9,     _______, \
-  _______,  _______,  _______,  RESET,    _______,  _______,  _______,  _______,  RESET,    KC_P0,    _______,   _______  \
+  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  _______,  _______,  QK_BOOT,  KC_P0,    _______,   _______  \
 )
 
 
diff --git a/layouts/community/ortho_4x12/xyverz/keymap.c b/layouts/community/ortho_4x12/xyverz/keymap.c
index 9872a43414..be9ac8e8de 100644
--- a/layouts/community/ortho_4x12/xyverz/keymap.c
+++ b/layouts/community/ortho_4x12/xyverz/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_4x12 ( \
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 , \
-  _______, RESET,   RGB_M_P, RGB_M_B, RGB_M_R, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, QK_BOOT, RGB_M_P, RGB_M_B, RGB_M_R, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   RGB_TOG, RGB_MOD, RGB_SWR, RGB_M_K, RGB_M_G, RGB_HUI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MACLOCK \
   )
diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c
index 1b423157bc..1b66886e6b 100644
--- a/layouts/community/ortho_5x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
     KC_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    QM_MAKE, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \
+    QM_MAKE, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     QM_FLSH, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/layouts/community/ortho_5x12/greatwizard/keymap.c b/layouts/community/ortho_5x12/greatwizard/keymap.c
index 77d758b0f0..30e7ca6676 100644
--- a/layouts/community/ortho_5x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_5x12/greatwizard/keymap.c
@@ -292,7 +292,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_ortho_5x12_wrapper(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, RESET,   EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, QK_BOOT, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         KC_CAPS, _______, _______, _______, _______, _______, GAME,    QWERTY,  WORKMAN, COLEMAK, DVORAK,  _______,
         _______, _______, _______, _______, _______, _______, _______, QWERTYP, WORKMNP, COLEMKP, DVORAKP, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
@@ -323,7 +323,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ,-----------------------------------------------------------------------------------.
      * |      |      |      |      |      |      |      |      |      |      |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |CHRPCK| SHOW |REBASE|RESET | TAG  |      | PULL | INIT |REMOTE| PUSH |      |
+     * |      |CHRPCK| SHOW |REBASE|QK_BOOT | TAG  |      | PULL | INIT |REMOTE| PUSH |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * |      | ADD  |STATUS| DIFF |FETCH | GREP |STASH |      |CHECKT| LOG  |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index fd748b03d4..5a07fa09ad 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,    KC_F12,
-    _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, KC_INS,  KC_PSCR,   KC_DEL,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, KC_INS,  KC_PSCR,   KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  HUNGARIAN, WORKMAN,
     _______, _______, _______, _______, UC_MOD,  UC_RMOD, NK_TOGG, CG_NORM, CG_SWAP,  _______, _______,   _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______
diff --git a/layouts/community/ortho_5x12/xyverz/keymap.c b/layouts/community/ortho_5x12/xyverz/keymap.c
index 22147c3a0a..fe2287918b 100644
--- a/layouts/community/ortho_5x12/xyverz/keymap.c
+++ b/layouts/community/ortho_5x12/xyverz/keymap.c
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12 ( \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   RGB_TOG, RGB_MOD, RGB_SWR, RGB_M_K, RGB_M_G, RGB_HUI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MACLOCK \
diff --git a/layouts/community/ortho_5x14/peej/keymap.c b/layouts/community/ortho_5x14/peej/keymap.c
index 3abd418537..ac0b4d9631 100644
--- a/layouts/community/ortho_5x14/peej/keymap.c
+++ b/layouts/community/ortho_5x14/peej/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /*
  * ,----------------------------------------Backlight-------------------------RGB-----Bright---Sat------Hue----------------------.
- * | LOCK   | RESET  |        |        | STEP   | TOGGLE |        |        | TOGGLE | UP     | UP     | UP     |        | LOCK   |
+ * | LOCK   | QK_BOOT  |        |        | STEP   | TOGGLE |        |        | TOGGLE | UP     | UP     | UP     |        | LOCK   |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        |        |        |        |        | MODE   | DOWN   | DOWN   | DOWN   |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/layouts/community/planck_mit/guidoism/guidoism.json b/layouts/community/planck_mit/guidoism/guidoism.json
index 6a4364c6be..123bd74182 100644
--- a/layouts/community/planck_mit/guidoism/guidoism.json
+++ b/layouts/community/planck_mit/guidoism/guidoism.json
@@ -1 +1 @@
-{"keyboard":"planck/rev4","keymap":"guidoism","layout":"LAYOUT_planck_mit","layers":[["KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSPC","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_COLN","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_NO","MO(3)","KC_ESC","KC_LALT","KC_LGUI","MO(1)","LSFT_T(KC_SPC)","MO(2)","KC_RGUI","KC_RALT","KC_SCLN","MO(5)"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_NO","KC_NO","KC_UNDO","KC_TRNS","KC_NO","KC_CUT","KC_COPY","KC_PSTE","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_DQUO","KC_QUOT","KC_PIPE","KC_CAPS","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_TRNS","KC_MNXT","KC_VOLD","KC_VOLU","KC_MPLY"],["KC_GRV","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_LBRC","KC_RBRC","KC_LPRN","KC_RPRN","KC_NO","KC_NO","KC_PMNS","KC_PEQL","KC_NO","KC_NO","KC_BSLS","KC_TRNS","KC_LT","KC_GT","KC_LCBR","KC_RCBR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["RESET","DEBUG","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_UP","KC_PGDN","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LEFT","KC_DOWN","KC_RGHT","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_HOME","KC_NO","KC_END","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PERC","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_DLR","KC_P4","KC_P5","KC_P6","KC_PDOT","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_P0","KC_P1","KC_P2","KC_P3","KC_PCMM","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_P0","KC_NO","KC_NO","KC_TRNS"],["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_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_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"]]}
\ No newline at end of file
+{"keyboard":"planck/rev4","keymap":"guidoism","layout":"LAYOUT_planck_mit","layers":[["KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSPC","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_COLN","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_NO","MO(3)","KC_ESC","KC_LALT","KC_LGUI","MO(1)","LSFT_T(KC_SPC)","MO(2)","KC_RGUI","KC_RALT","KC_SCLN","MO(5)"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_NO","KC_NO","KC_UNDO","KC_TRNS","KC_NO","KC_CUT","KC_COPY","KC_PSTE","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_DQUO","KC_QUOT","KC_PIPE","KC_CAPS","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_TRNS","KC_MNXT","KC_VOLD","KC_VOLU","KC_MPLY"],["KC_GRV","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_LBRC","KC_RBRC","KC_LPRN","KC_RPRN","KC_NO","KC_NO","KC_PMNS","KC_PEQL","KC_NO","KC_NO","KC_BSLS","KC_TRNS","KC_LT","KC_GT","KC_LCBR","KC_RCBR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["QK_BOOT","DEBUG","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_UP","KC_PGDN","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LEFT","KC_DOWN","KC_RGHT","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_HOME","KC_NO","KC_END","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PERC","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_DLR","KC_P4","KC_P5","KC_P6","KC_PDOT","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_P0","KC_P1","KC_P2","KC_P3","KC_PCMM","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_P0","KC_NO","KC_NO","KC_TRNS"],["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_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_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"]]}
\ No newline at end of file
diff --git a/layouts/community/planck_mit/guidoism/keymap.c b/layouts/community/planck_mit/guidoism/keymap.c
index 2027e2bfa4..57c1042dbe 100644
--- a/layouts/community/planck_mit/guidoism/keymap.c
+++ b/layouts/community/planck_mit/guidoism/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
 */
 [_MOVEMENT] = LAYOUT_planck_mit(
-    RESET, DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_NO, KC_TRNS,
+    QK_BOOT, DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_NO, KC_TRNS,
     KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS,
     KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_END, KC_NO, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/layouts/community/split_3x6_3/bcat/keymap.c b/layouts/community/split_3x6_3/bcat/keymap.c
index cfac93d1e3..b7cbfa1bfd 100644
--- a/layouts/community/split_3x6_3/bcat/keymap.c
+++ b/layouts/community/split_3x6_3/bcat/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */
     [LAYER_ADJUST] = LAYOUT_split_3x6_3(
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
                                                 _______,  _______,  _______,  RGB_TOG,  _______,  _______
diff --git a/layouts/community/split_3x6_3/ddeklerk/keymap.c b/layouts/community/split_3x6_3/ddeklerk/keymap.c
index 6ffc5732cf..6c564c0bd5 100644
--- a/layouts/community/split_3x6_3/ddeklerk/keymap.c
+++ b/layouts/community/split_3x6_3/ddeklerk/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                             _______, _______, _______,          _______, _______, _______
     ),
     [_ADJUST] = LAYOUT_split_3x6_3(
-        XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, GAME,    BASE,    XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                             XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c
index 6f13d33b4a..e4f6c53a32 100644
--- a/layouts/community/tkl_ansi/brandonschlack/keymap.c
+++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT,          KC_MPLY, MC_SLPD, KC_VOLU, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______,                                     \
-    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, _______, _______, _______, _______,          _______,                   KC_PGUP,          \
+    _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,          _______,                   KC_PGUP,          \
     _______, _______, _______,                           _______,                             _______, _______, _______, _______,          KC_HOME, KC_PGDN, KC_END   \
 )
 /* Blank Template
diff --git a/layouts/community/tkl_ansi/xyverz/keymap.c b/layouts/community/tkl_ansi/xyverz/keymap.c
index 1f79f87d1b..aec179bc12 100644
--- a/layouts/community/tkl_ansi/xyverz/keymap.c
+++ b/layouts/community/tkl_ansi/xyverz/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FL] = LAYOUT_tkl_ansi( /* Layer 3: Functions */ \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,        KC_MPRV, KC_MPLY, KC_MNXT, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,      KC_MPRV, KC_MPLY, KC_MNXT, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      KC_MUTE, KC_VOLD, KC_VOLU, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                 \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,          \
diff --git a/layouts/community/tkl_ansi/yanfali/keymap.c b/layouts/community/tkl_ansi/yanfali/keymap.c
index 06c9507aff..9cdc0c4149 100644
--- a/layouts/community/tkl_ansi/yanfali/keymap.c
+++ b/layouts/community/tkl_ansi/yanfali/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[FN] = LAYOUT_tkl_ansi( \
 		_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   KC_WAKE,KC_PWR, KC_SLEP, \
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,EEP_RST,   _______,_______,KC_VOLU, \
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET,     _______,_______,KC_VOLD, \
+		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,   _______,_______,KC_VOLD, \
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,                            \
 		_______,_______,_______,_______,_______,_______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______,                _______,           KC_MPLY,         \
 		_______,_______,_______,                        _______,                        _______,_______,MO(FN) ,_______,   KC_MPRV,KC_MSTP,KC_MNXT)

From 7c0e5ce91790e2639ae0868c5cd1185cdc580acd Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Tue, 23 Aug 2022 04:59:33 +0300
Subject: [PATCH 222/959] Nix shell updates for `develop` (#18131)

* shell.nix: Update `tomlkit` to 0.11.4 using a Nixpkgs overlay

The used Nixpkgs snapshot contains `tomlkit` version 0.7.0, which is
affected by https://www.github.com/sdispater/tomlkit/issues/148; that
bug is triggered by `pyproject.toml` from `jsonschema` >= 4.11.0,
preventing the build of that module.

Just adding `tomlkit = "*"` to the `[tool.poetry.dev-dependencies]`
section of `nix/pyproject.toml` does not fix the `jsonschema` build,
because `makeRemoveSpecialDependenciesHook` inside `poetry2nix` is not
affected by `nix/pyproject.toml`.  Add a Nixpkgs overlay which updates
the `tomlkit` Python module globally, so that `poetry2nix` would also
use the updated version internally.

* shell.nix: Bump `poetry2nix` to the most recent version

The new `poetry2nix` version includes overrides which are required for
recent versions of some Python packages (in particular, `jsonschema` and
`dotty-dict`).

* shell.nix: Bump QMK CLI to 1.1.1; update other Python deps

Update `pyproject.toml` to match `requirements*.txt`:

- add `pyserial = "*"`
- replace `qmk-dotty-dict = "*"` with `dotty-dict = "*"` (#18117, also
  required for compatibility with `qmk` 1.1.1, where this replacement
  had already been performed)

Add build dependencies of various Python modules to `pyproject.toml`:

- `hatchling`, `hatch-vcs`, `hatch-fancy-pypi-readme` (required by
  `jsonschema` >= 4.11.0)
- `pytest` (a newer version is required to solve the dependency conflict
  with the `hatchling` module due to the upper bound on `pluggy`)
- `flit-core` (a more recent version is required to build `tomli`)
- `poetry-core` (required for `dotty-dict` >= 1.3.1, and the version
  from Nixpkgs does not build on Darwin due to NixOS/nix#4758)

Update `poetry.lock` to use the most recent versions of Python modules.

The complete list of Python module updates as listed in `poetry.lock`
(note that other modules might be present in the Python environment,
e.g., if they come from Nixpkgs):

- `atomicwrites`: none -> 1.4.1 (but this module is not actually used,
  because the corresponding dependency of `pytest` is win32-only)
- `attrs`: 21.4.0 -> 22.1.0
- `colorama`: 0.4.4 -> 0.4.5
- `coverage`: 6.4 -> none
- `dotty-dict`: none -> 1.3.1 (used instead of `qmk-dotty-dict`)
- `editables`: none -> 0.3
- `flake8`: 4.0.1 -> 5.0.4
- `flake8-polyfill`: 1.0.2 -> none
- `flit-core`: none -> 3.7.1
- `hatch-fancy-pypi-readme`: none -> 22.3.0
- `hatch-vcs`: none -> 0.2.0
- `hatchling`: none -> 1.8.0
- `hjson`: 3.0.2 -> 3.1.0
- `importlib-resources`: 5.7.1 -> 5.9.0
- `iniconfig`: none -> 1.1.1
- `jsonschema`: 4.5.1 -> 4.14.0
- `mccabe`: 0.6.1 -> 0.7.0
- `nose2`: 0.11.0 -> 0.12.0
- `packaging`: none -> 21.3
- `pathspec`: none -> 0.9.0
- `pep8-naming`: 0.12.1 -> 0.13.2
- `pillow`: 9.1.1 -> 9.2.0
- `pkgutil-resolve-name`: none -> 1.3.10
- `pluggy`: none -> 1.0.0
- `poetry-core`: none -> 1.0.8
- `py`: none -> 1.11.0
- `pycodestyle`: 2.8.0 -> 2.9.1
- `pyflakes`: 2.4.0 -> 2.5.0
- `pygments`: 2.12.0 -> 2.13.0
- `pyparsing`: none -> 3.0.9
- `pyserial`: none -> 3.5
- `pytest`: none -> 7.1.2
- `qmk`: 1.1.0 -> 1.1.1
- `qmk-dotty-dict`: 1.3.0.post1 -> none (replaced by `dotty-dict`)
- `setuptools-scm`: none -> 7.0.5
- `tomli`: none -> 2.0.1
- `typing-extensions`: none -> 4.3.0
- `zipp`: 3.8.0 -> 3.8.1
---
 shell.nix               |  22 +-
 util/nix/poetry.lock    | 594 ++++++++++++++++++++++++++++------------
 util/nix/pyproject.toml |  25 +-
 util/nix/sources.json   |   6 +-
 4 files changed, 461 insertions(+), 186 deletions(-)

diff --git a/shell.nix b/shell.nix
index 7e3704d010..63e5af0525 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,9 +1,29 @@
 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 { }
+{ pkgs ? import sources.nixpkgs { overlays = [ pythonOverlay ]; }
 , poetry2nix ? pkgs.callPackage (import sources.poetry2nix) { }
 , avr ? true
 , arm ? true
diff --git a/util/nix/poetry.lock b/util/nix/poetry.lock
index e87672f193..dc1b38be84 100644
--- a/util/nix/poetry.lock
+++ b/util/nix/poetry.lock
@@ -15,64 +15,74 @@ optional = false
 python-versions = ">=3.6"
 
 [package.extras]
-test = ["coverage", "flake8", "pexpect", "wheel"]
+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.*"
 
 [[package]]
 name = "attrs"
-version = "21.4.0"
+version = "22.1.0"
 description = "Classes Without Boilerplate"
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.5"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
-docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
+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)"]
 
 [[package]]
 name = "colorama"
-version = "0.4.4"
+version = "0.4.5"
 description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
-name = "coverage"
-version = "6.4"
-description = "Code coverage measurement for Python"
+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"
 
-[package.extras]
-toml = ["tomli"]
-
 [[package]]
 name = "flake8"
-version = "4.0.1"
+version = "5.0.4"
 description = "the modular source code checker: pep8 pyflakes and co"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.6.1"
 
 [package.dependencies]
-mccabe = ">=0.6.0,<0.7.0"
-pycodestyle = ">=2.8.0,<2.9.0"
-pyflakes = ">=2.4.0,<2.5.0"
+mccabe = ">=0.7.0,<0.8.0"
+pycodestyle = ">=2.9.0,<2.10.0"
+pyflakes = ">=2.5.0,<2.6.0"
 
 [[package]]
-name = "flake8-polyfill"
-version = "1.0.2"
-description = "Polyfill package for Flake8 plugins"
+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 = "*"
-
-[package.dependencies]
-flake8 = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "halo"
@@ -90,7 +100,50 @@ spinners = ">=0.0.24"
 termcolor = ">=1.1.0"
 
 [package.extras]
-ipython = ["IPython (==5.7.0)", "ipywidgets (==7.1.0)"]
+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\""}
 
 [[package]]
 name = "hid"
@@ -102,7 +155,7 @@ python-versions = "*"
 
 [[package]]
 name = "hjson"
-version = "3.0.2"
+version = "3.1.0"
 description = "Hjson, a user interface for JSON."
 category = "main"
 optional = false
@@ -110,7 +163,7 @@ python-versions = "*"
 
 [[package]]
 name = "importlib-resources"
-version = "5.7.1"
+version = "5.9.0"
 description = "Read resources from Python packages"
 category = "main"
 optional = false
@@ -120,12 +173,20 @@ python-versions = ">=3.7"
 zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""}
 
 [package.extras]
-docs = ["sphinx", "jaraco.packaging (>=9)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)"]
+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 = "*"
 
 [[package]]
 name = "jsonschema"
-version = "4.5.1"
+version = "4.14.0"
 description = "An implementation of JSON Schema validation for Python"
 category = "main"
 optional = false
@@ -134,11 +195,12 @@ python-versions = ">=3.7"
 [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"
 
 [package.extras]
-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)"]
+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"]
 
 [[package]]
 name = "log-symbols"
@@ -153,11 +215,11 @@ colorama = ">=0.3.9"
 
 [[package]]
 name = "mccabe"
-version = "0.6.1"
+version = "0.7.0"
 description = "McCabe checker, plugin for flake8"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "milc"
@@ -176,68 +238,132 @@ spinners = "*"
 
 [[package]]
 name = "nose2"
-version = "0.11.0"
-description = "unittest2 with plugins, the succesor to nose"
+version = "0.12.0"
+description = "unittest2 with plugins, the successor to nose"
 category = "dev"
 optional = false
 python-versions = "*"
 
-[package.dependencies]
-coverage = ">=4.4.1"
-six = ">=1.7"
-
 [package.extras]
-coverage_plugin = ["coverage (>=4.4.1)"]
-dev = ["Sphinx (>=1.6.5)", "sphinx-rtd-theme", "mock", "coverage", "sphinx-issues"]
+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"
 
 [[package]]
 name = "pep8-naming"
-version = "0.12.1"
+version = "0.13.2"
 description = "Check PEP-8 naming conventions, plugin for flake8"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
 
 [package.dependencies]
 flake8 = ">=3.9.1"
-flake8-polyfill = ">=1.0.2,<2"
 
 [[package]]
 name = "pillow"
-version = "9.1.1"
+version = "9.2.0"
 description = "Python Imaging Library (Fork)"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-issues (>=3.0.1)", "sphinx-removed-in", "sphinx-rtd-theme (>=1.0)", "sphinxext-opengraph"]
-tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
+tests = ["pytest-timeout", "pytest-cov", "pytest", "pyroma", "packaging", "olefile", "markdown2", "defusedxml", "coverage", "check-manifest"]
+docs = ["sphinxext-opengraph", "sphinx-removed-in", "sphinx-issues (>=3.0.1)", "sphinx-copybutton", "sphinx (>=2.4)", "olefile", "furo"]
 
 [[package]]
-name = "pycodestyle"
-version = "2.8.0"
-description = "Python style guide checker"
+name = "pkgutil-resolve-name"
+version = "1.3.10"
+description = "Resolve a name to an object."
+category = "main"
+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"
+
+[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.*"
+
+[[package]]
+name = "pycodestyle"
+version = "2.9.1"
+description = "Python style guide checker"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "pyflakes"
-version = "2.4.0"
+version = "2.5.0"
 description = "passive checker of Python programs"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "pygments"
-version = "2.12.0"
+version = "2.13.0"
 description = "Pygments is a syntax highlighting package written in Python."
 category = "main"
 optional = false
 python-versions = ">=3.6"
 
+[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"
@@ -246,6 +372,38 @@ category = "main"
 optional = false
 python-versions = ">=3.7"
 
+[[package]]
+name = "pyserial"
+version = "3.5"
+description = "Python Serial Port Extension"
+category = "main"
+optional = false
+python-versions = "*"
+
+[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"
@@ -256,29 +414,39 @@ python-versions = ">=3.6.0"
 
 [[package]]
 name = "qmk"
-version = "1.1.0"
+version = "1.1.1"
 description = "A program to help users work with QMK Firmware."
 category = "main"
 optional = false
 python-versions = ">=3.7"
 
 [package.dependencies]
+dotty-dict = "*"
 hid = "*"
 hjson = "*"
 jsonschema = ">=4"
 milc = ">=1.4.2"
 pillow = "*"
 pygments = "*"
+pyserial = "*"
 pyusb = "*"
-qmk-dotty-dict = "*"
 
 [[package]]
-name = "qmk-dotty-dict"
-version = "1.3.0.post1"
-description = "Dictionary wrapper for quick access to deeply nested keys."
-category = "main"
+name = "setuptools-scm"
+version = "7.0.5"
+description = "the blessed package to manage your versions by scm tags"
+category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
+
+[package.dependencies]
+packaging = ">=20.0"
+tomli = ">=1.0.0"
+typing-extensions = "*"
+
+[package.extras]
+toml = ["setuptools (>=42)"]
+test = ["virtualenv (>20)", "pytest (>=6.2)"]
 
 [[package]]
 name = "six"
@@ -304,6 +472,22 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[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"
@@ -314,20 +498,20 @@ python-versions = "*"
 
 [[package]]
 name = "zipp"
-version = "3.8.0"
+version = "3.8.1"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["sphinx", "jaraco.packaging (>=9)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)"]
+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 = "81755c384679b0cb4ef4b58ff575468d833dc79c7e6e1a9ccdea7be37ad65c7e"
+content-hash = "71855d16c0f315ff383322272ddfca2b4917dbba9fa5ca1863b3bd537e35fee1"
 
 [metadata.files]
 appdirs = [
@@ -338,156 +522,188 @@ 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-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
-    {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
+    {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.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
-    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
+    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
 ]
-coverage = [
-    {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"},
-    {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"},
-    {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"},
-    {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"},
-    {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"},
-    {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"},
-    {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"},
-    {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"},
-    {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"},
-    {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"},
-    {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"},
-    {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"},
-    {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"},
-    {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"},
-    {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"},
-    {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"},
-    {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"},
-    {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"},
-    {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"},
-    {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"},
-    {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"},
-    {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"},
-    {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"},
-    {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"},
-    {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"},
-    {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"},
-    {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"},
-    {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"},
-    {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"},
-    {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"},
-    {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"},
-    {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"},
-    {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"},
-    {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"},
-    {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"},
-    {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"},
-    {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"},
-    {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"},
-    {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"},
-    {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"},
-    {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"},
+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-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"},
-    {file = "flake8-4.0.1.tar.gz", hash = "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"},
+    {file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"},
+    {file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"},
 ]
-flake8-polyfill = [
-    {file = "flake8-polyfill-1.0.2.tar.gz", hash = "sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda"},
-    {file = "flake8_polyfill-1.0.2-py2.py3-none-any.whl", hash = "sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9"},
+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.0.2-py3-none-any.whl", hash = "sha256:5546438bf4e1b52bc964c6a47c4ed10fa5fba8a1b264e22efa893e333baad2db"},
-    {file = "hjson-3.0.2.tar.gz", hash = "sha256:2838fd7200e5839ea4516ece953f3a19892c41089f0d933ba3f68e596aacfcd5"},
+    {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.7.1-py3-none-any.whl", hash = "sha256:e447dc01619b1e951286f3929be820029d48c75eb25d265c28b92a16548212b8"},
-    {file = "importlib_resources-5.7.1.tar.gz", hash = "sha256:b6062987dfc51f0fcb809187cffbd60f35df7acb4589091f154214af6d0d49d3"},
+    {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.5.1-py3-none-any.whl", hash = "sha256:71b5e39324422543546572954ce71c67728922c104902cb7ce252e522235b33f"},
-    {file = "jsonschema-4.5.1.tar.gz", hash = "sha256:7c6d882619340c3347a1bf7315e147e6d3dae439033ae6383d6acb908c101dfc"},
+    {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.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
-    {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
+    {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.11.0-py2.py3-none-any.whl", hash = "sha256:d37e75e3010bb4739fe6045a29d4c633ac3146cb5704ee4e4a9e4abeceb2dee3"},
-    {file = "nose2-0.11.0.tar.gz", hash = "sha256:6d208d7d6ec9f9d55c74dac81c9394bc3906dbef81a8ca5420b2b9b7f8e69de9"},
+    {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.12.1.tar.gz", hash = "sha256:bb2455947757d162aa4cad55dba4ce029005cd1692f2899a21d51d8630ca7841"},
-    {file = "pep8_naming-0.12.1-py2.py3-none-any.whl", hash = "sha256:4a8daeaeb33cfcde779309fc0c9c0a68a3bbe2ad8a8308b763c5068f86eb9f37"},
+    {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.1.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:42dfefbef90eb67c10c45a73a9bc1599d4dac920f7dfcbf4ec6b80cb620757fe"},
-    {file = "Pillow-9.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"},
-    {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c857532c719fb30fafabd2371ce9b7031812ff3889d75273827633bca0c4602"},
-    {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:59789a7d06c742e9d13b883d5e3569188c16acb02eeed2510fd3bfdbc1bd1530"},
-    {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4d45dbe4b21a9679c3e8b3f7f4f42a45a7d3ddff8a4a16109dff0e1da30a35b2"},
-    {file = "Pillow-9.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e9ed59d1b6ee837f4515b9584f3d26cf0388b742a11ecdae0d9237a94505d03a"},
-    {file = "Pillow-9.1.1-cp310-cp310-win32.whl", hash = "sha256:b3fe2ff1e1715d4475d7e2c3e8dabd7c025f4410f79513b4ff2de3d51ce0fa9c"},
-    {file = "Pillow-9.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5b650dbbc0969a4e226d98a0b440c2f07a850896aed9266b6fedc0f7e7834108"},
-    {file = "Pillow-9.1.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:0b4d5ad2cd3a1f0d1df882d926b37dbb2ab6c823ae21d041b46910c8f8cd844b"},
-    {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9370d6744d379f2de5d7fa95cdbd3a4d92f0b0ef29609b4b1687f16bc197063d"},
-    {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b761727ed7d593e49671d1827044b942dd2f4caae6e51bab144d4accf8244a84"},
-    {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a66fe50386162df2da701b3722781cbe90ce043e7d53c1fd6bd801bca6b48d4"},
-    {file = "Pillow-9.1.1-cp37-cp37m-win32.whl", hash = "sha256:2b291cab8a888658d72b575a03e340509b6b050b62db1f5539dd5cd18fd50578"},
-    {file = "Pillow-9.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:1d4331aeb12f6b3791911a6da82de72257a99ad99726ed6b63f481c0184b6fb9"},
-    {file = "Pillow-9.1.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8844217cdf66eabe39567118f229e275f0727e9195635a15e0e4b9227458daaf"},
-    {file = "Pillow-9.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b6617221ff08fbd3b7a811950b5c3f9367f6e941b86259843eab77c8e3d2b56b"},
-    {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20d514c989fa28e73a5adbddd7a171afa5824710d0ab06d4e1234195d2a2e546"},
-    {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:088df396b047477dd1bbc7de6e22f58400dae2f21310d9e2ec2933b2ef7dfa4f"},
-    {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53c27bd452e0f1bc4bfed07ceb235663a1df7c74df08e37fd6b03eb89454946a"},
-    {file = "Pillow-9.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3f6c1716c473ebd1649663bf3b42702d0d53e27af8b64642be0dd3598c761fb1"},
-    {file = "Pillow-9.1.1-cp38-cp38-win32.whl", hash = "sha256:c67db410508b9de9c4694c57ed754b65a460e4812126e87f5052ecf23a011a54"},
-    {file = "Pillow-9.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:f054b020c4d7e9786ae0404278ea318768eb123403b18453e28e47cdb7a0a4bf"},
-    {file = "Pillow-9.1.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:c17770a62a71718a74b7548098a74cd6880be16bcfff5f937f900ead90ca8e92"},
-    {file = "Pillow-9.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a"},
-    {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f372d0f08eff1475ef426344efe42493f71f377ec52237bf153c5713de987251"},
-    {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09e67ef6e430f90caa093528bd758b0616f8165e57ed8d8ce014ae32df6a831d"},
-    {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66daa16952d5bf0c9d5389c5e9df562922a59bd16d77e2a276e575d32e38afd1"},
-    {file = "Pillow-9.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d78ca526a559fb84faaaf84da2dd4addef5edb109db8b81677c0bb1aad342601"},
-    {file = "Pillow-9.1.1-cp39-cp39-win32.whl", hash = "sha256:55e74faf8359ddda43fee01bffbc5bd99d96ea508d8a08c527099e84eb708f45"},
-    {file = "Pillow-9.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:7c150dbbb4a94ea4825d1e5f2c5501af7141ea95825fadd7829f9b11c97aaf6c"},
-    {file = "Pillow-9.1.1-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:769a7f131a2f43752455cc72f9f7a093c3ff3856bf976c5fb53a59d0ccc704f6"},
-    {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:488f3383cf5159907d48d32957ac6f9ea85ccdcc296c14eca1a4e396ecc32098"},
-    {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b525a356680022b0af53385944026d3486fc8c013638cf9900eb87c866afb4c"},
-    {file = "Pillow-9.1.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6e760cf01259a1c0a50f3c845f9cad1af30577fd8b670339b1659c6d0e7a41dd"},
-    {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4165205a13b16a29e1ac57efeee6be2dfd5b5408122d59ef2145bc3239fa340"},
-    {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:937a54e5694684f74dcbf6e24cc453bfc5b33940216ddd8f4cd8f0f79167f765"},
-    {file = "Pillow-9.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:baf3be0b9446a4083cc0c5bb9f9c964034be5374b5bc09757be89f5d2fa247b8"},
-    {file = "Pillow-9.1.1.tar.gz", hash = "sha256:7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0"},
+    {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.8.0-py2.py3-none-any.whl", hash = "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20"},
-    {file = "pycodestyle-2.8.0.tar.gz", hash = "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"},
+    {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.4.0-py2.py3-none-any.whl", hash = "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e"},
-    {file = "pyflakes-2.4.0.tar.gz", hash = "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"},
+    {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.12.0-py3-none-any.whl", hash = "sha256:dc9c10fb40944260f6ed4c688ece0cd2048414940f1cea51b8b226318411c519"},
-    {file = "Pygments-2.12.0.tar.gz", hash = "sha256:5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb"},
+    {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"},
@@ -512,17 +728,25 @@ pyrsistent = [
     {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.0-py2.py3-none-any.whl", hash = "sha256:af74c508d2113389781f2c3d83115acdccd85590bc12e31eb66a4cbd4eb8a166"},
-    {file = "qmk-1.1.0.tar.gz", hash = "sha256:771577c9e68eb7fe08969bab36aeb420713a525062dce52a06eda40da8cda5e1"},
+    {file = "qmk-1.1.1-py2.py3-none-any.whl", hash = "sha256:8694300678d9be1e594a500e82bfc9fb08a8ac0983b25fcb663ddd72b4861d97"},
+    {file = "qmk-1.1.1.tar.gz", hash = "sha256:dd028e09ebcd61f8bdf8cb82929dfafc0e007d97a5a3803b45819b4641773269"},
 ]
-qmk-dotty-dict = [
-    {file = "qmk_dotty_dict-1.3.0.post1-py3-none-any.whl", hash = "sha256:a9cb7fc3ff9631190fee0ecac14986a0ac7b4b6892347dc9d7486a4c4ea24492"},
-    {file = "qmk_dotty_dict-1.3.0.post1.tar.gz", hash = "sha256:3b611e393660bfaa6835c68e94784bae80fe07b8490978b5ecab03a0d2fc7ea2"},
+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"},
@@ -535,11 +759,19 @@ spinners = [
 termcolor = [
     {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"},
 ]
+tomli = [
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
+typing-extensions = [
+    {file = "typing_extensions-4.3.0-py3-none-any.whl", hash = "sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02"},
+    {file = "typing_extensions-4.3.0.tar.gz", hash = "sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6"},
+]
 yapf = [
     {file = "yapf-0.32.0-py2.py3-none-any.whl", hash = "sha256:8fea849025584e486fd06d6ba2bed717f396080fd3cc236ba10cb97c4c51cf32"},
     {file = "yapf-0.32.0.tar.gz", hash = "sha256:a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b"},
 ]
 zipp = [
-    {file = "zipp-3.8.0-py3-none-any.whl", hash = "sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099"},
-    {file = "zipp-3.8.0.tar.gz", hash = "sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad"},
+    {file = "zipp-3.8.1-py3-none-any.whl", hash = "sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009"},
+    {file = "zipp-3.8.1.tar.gz", hash = "sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2"},
 ]
diff --git a/util/nix/pyproject.toml b/util/nix/pyproject.toml
index f06b977999..ff484dbe79 100644
--- a/util/nix/pyproject.toml
+++ b/util/nix/pyproject.toml
@@ -12,13 +12,14 @@ python = "^3.8"
 appdirs = "*"
 argcomplete = "*"
 colorama = "*"
+dotty-dict = "*"
 hid = "*"
 hjson = "*"
 jsonschema = ">=4"
 milc = ">=1.4.2"
 Pygments = "*"
+pyserial = "*"
 pyusb = "*"
-qmk-dotty-dict = "*"
 pillow = "*"
 
 # This dependency is not mentioned in requirements.txt (QMK CLI is not a
@@ -33,6 +34,28 @@ 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 ee4bd270e8..8cdb9e4996 100644
--- a/util/nix/sources.json
+++ b/util/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "88ffae91c605aaafc2797f4096ca9f065152796a",
-        "sha256": "0iq9jlzz92r3ax1ymg00cn4s8c1wi3jgh1693abyyn0baq7gixrb",
+        "rev": "11c0df8e348c0f169cd73a2e3d63f65c92baf666",
+        "sha256": "0i3wbp2p0x6bpj07sqpvkbx4lvjm0irvpmv2bjqx8k02mpjm7dg2",
         "type": "tarball",
-        "url": "https://github.com/nix-community/poetry2nix/archive/88ffae91c605aaafc2797f4096ca9f065152796a.tar.gz",
+        "url": "https://github.com/nix-community/poetry2nix/archive/11c0df8e348c0f169cd73a2e3d63f65c92baf666.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

From ee416048d974e6a40c0eef48126c19a6fc6f53f4 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 23 Aug 2022 14:42:23 +0100
Subject: [PATCH 223/959] Use correct board files for cantor (#18144)

---
 keyboards/cantor/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
index 9669227bc3..6d599f4300 100644
--- a/keyboards/cantor/info.json
+++ b/keyboards/cantor/info.json
@@ -12,7 +12,7 @@
         "nkro": true
     },
     "processor": "STM32F401",
-    "board": "BLACKPILL_STM32_F411",
+    "board": "BLACKPILL_STM32_F401",
     "url": "https://github.com/diepala/cantor",
     "usb": {
         "device_version": "1.0.0",

From 78393966147bd7e862fd42ca0f0c3236ac45f10f Mon Sep 17 00:00:00 2001
From: Kyle McCreery <mccreery.kyle@gmail.com>
Date: Tue, 23 Aug 2022 13:50:19 -0400
Subject: [PATCH 224/959] [Keyboard] Add Clunker (#18141)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/mechwild/clunker/config.h           | 26 ++++++
 keyboards/mechwild/clunker/info.json          | 86 +++++++++++++++++++
 .../mechwild/clunker/keymaps/default/keymap.c | 63 ++++++++++++++
 .../mechwild/clunker/keymaps/via/keymap.c     | 63 ++++++++++++++
 .../mechwild/clunker/keymaps/via/rules.mk     |  2 +
 keyboards/mechwild/clunker/readme.md          | 25 ++++++
 keyboards/mechwild/clunker/rules.mk           |  1 +
 7 files changed, 266 insertions(+)
 create mode 100644 keyboards/mechwild/clunker/config.h
 create mode 100644 keyboards/mechwild/clunker/info.json
 create mode 100644 keyboards/mechwild/clunker/keymaps/default/keymap.c
 create mode 100644 keyboards/mechwild/clunker/keymaps/via/keymap.c
 create mode 100644 keyboards/mechwild/clunker/keymaps/via/rules.mk
 create mode 100644 keyboards/mechwild/clunker/readme.md
 create mode 100644 keyboards/mechwild/clunker/rules.mk

diff --git a/keyboards/mechwild/clunker/config.h b/keyboards/mechwild/clunker/config.h
new file mode 100644
index 0000000000..19dab9b25d
--- /dev/null
+++ b/keyboards/mechwild/clunker/config.h
@@ -0,0 +1,26 @@
+// Copyright 2022 Kyle McCreery (@kylemccreery)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define ENCODERS_PAD_A { D2 }
+#define ENCODERS_PAD_B { D3 }
+#define ENCODER_RESOLUTION 4
+
+#define SOLENOID_PIN F4
diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json
new file mode 100644
index 0000000000..6b10a04f13
--- /dev/null
+++ b/keyboards/mechwild/clunker/info.json
@@ -0,0 +1,86 @@
+{
+    "manufacturer": "MechWild",
+    "keyboard_name": "Clunker",
+    "maintainer": "kylemccreery",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "encoder_map": true,
+        "haptic": true
+    },
+    "matrix_pins": {
+        "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"],
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://mechwild.com/product/clunker/",
+    "usb": {
+        "device_version": "1.3.0",
+        "pid": "0x1711",
+        "vid": "0x6D77"
+    },
+    "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": [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": [5, 7], "x":8.5, "y":1}, 
+            { "matrix": [5, 6], "x":9.5, "y":1}, 
+            { "matrix": [5, 5], "x":10.5, "y":1}, 
+            { "matrix": [5, 4], "x":11.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": [5, 1], "x":8.75, "y":2}, 
+            { "matrix": [5, 2], "x":9.75, "y":2}, 
+            { "matrix": [5, 3], "x":10.75, "y":2, "w":1.75}, 
+            { "matrix": [3, 0], "x":0, "y":3, "w":1.25}, 
+            { "matrix": [3, 1], "x":1.25, "y":3}, 
+            { "matrix": [3, 2], "x":2.25, "y":3}, 
+            { "matrix": [3, 3], "x":3.25, "y":3}, 
+            { "matrix": [3, 4], "x":4.25, "y":3}, 
+            { "matrix": [3, 5], "x":5.25, "y":3}, 
+            { "matrix": [3, 6], "x":6.25, "y":3}, 
+            { "matrix": [3, 7], "x":7.25, "y":3}, 
+            { "matrix": [6, 7], "x":8.25, "y":3}, 
+            { "matrix": [6, 6], "x":9.25, "y":3}, 
+            { "matrix": [6, 5], "x":10.25, "y":3}, 
+            { "matrix": [6, 4], "x":11.25, "y":3, "w":1.25}, 
+            { "matrix": [4, 0], "x":0, "y":4, "w":1.25}, 
+            { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25}, 
+            { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25}, 
+            { "matrix": [4, 3], "x":3.75, "y":4, "w":2.75},
+            { "matrix": [4, 4], "x":6.5, "y":4, "w":2.25}, 
+            { "matrix": [4, 5], "x":8.75, "y":4, "w":1.25},
+            { "matrix": [4, 6], "x":10, "y":4, "w":1.25}, 
+            { "matrix": [4, 7], "x":11.25, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/clunker/keymaps/default/keymap.c b/keyboards/mechwild/clunker/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e6b5db9011
--- /dev/null
+++ b/keyboards/mechwild/clunker/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+// Copyright 2022 Kyle McCreery (@kylemccreery)
+// 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,
+  _FN1,
+  _FN2,
+  _FN3
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    /* 
+    k00, k01, k02, k03, k04, k05, k06, k07,                     \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, \
+    k50, k51, k52,      k54,      k56,           k59, k5A, k5B  \
+    */
+    [_BASE] = LAYOUT(
+    KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_MUTE,
+    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_BSPC,
+    MO(_FN1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,              KC_ENT,
+    KC_LSFT,  KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_RSFT,
+    KC_LCTL,  KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,                    KC_RALT, MO(_FN2), KC_RCTL
+    ),
+    [_FN1] = LAYOUT(
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   HPT_TOG,
+    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN,          KC_QUOT,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_UP,   KC_SLSH,
+    _______, _______, _______,          _______,          _______,                   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN2] = LAYOUT(
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,          _______,          _______,                   _______, _______, _______
+    ),
+	[_FN3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,          _______,          _______,                   _______, _______, _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =  { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT)  },
+    [2] =  { ENCODER_CCW_CW(KC_HOME, KC_END)  },
+    [3] =  { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/mechwild/clunker/keymaps/via/keymap.c b/keyboards/mechwild/clunker/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e6b5db9011
--- /dev/null
+++ b/keyboards/mechwild/clunker/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+// Copyright 2022 Kyle McCreery (@kylemccreery)
+// 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,
+  _FN1,
+  _FN2,
+  _FN3
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    /* 
+    k00, k01, k02, k03, k04, k05, k06, k07,                     \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, \
+    k50, k51, k52,      k54,      k56,           k59, k5A, k5B  \
+    */
+    [_BASE] = LAYOUT(
+    KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_MUTE,
+    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_BSPC,
+    MO(_FN1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,              KC_ENT,
+    KC_LSFT,  KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_RSFT,
+    KC_LCTL,  KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,                    KC_RALT, MO(_FN2), KC_RCTL
+    ),
+    [_FN1] = LAYOUT(
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   HPT_TOG,
+    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN,          KC_QUOT,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_UP,   KC_SLSH,
+    _______, _______, _______,          _______,          _______,                   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN2] = LAYOUT(
+    QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,          _______,          _______,                   _______, _______, _______
+    ),
+	[_FN3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,          _______,          _______,                   _______, _______, _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =  { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT)  },
+    [2] =  { ENCODER_CCW_CW(KC_HOME, KC_END)  },
+    [3] =  { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/mechwild/clunker/keymaps/via/rules.mk b/keyboards/mechwild/clunker/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mechwild/clunker/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mechwild/clunker/readme.md b/keyboards/mechwild/clunker/readme.md
new file mode 100644
index 0000000000..b567e74190
--- /dev/null
+++ b/keyboards/mechwild/clunker/readme.md
@@ -0,0 +1,25 @@
+# Clunker
+
+![clunker](https://i.imgur.com/6X5ijDoh.jpg)
+
+The Clunker is a 40% DIY kit with a knob and solenoid.
+
+* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
+* Hardware Supported: Clunker v1.3
+* Hardware Availability: [Clunker on MechWild](https://mechwild.com/product/clunker/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechwild/clunker:default
+
+Flashing example for this keyboard:
+
+    make mechwild/clunker:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the top of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/mechwild/clunker/rules.mk b/keyboards/mechwild/clunker/rules.mk
new file mode 100644
index 0000000000..3e6a4da7db
--- /dev/null
+++ b/keyboards/mechwild/clunker/rules.mk
@@ -0,0 +1 @@
+HAPTIC_DRIVER += SOLENOID

From a53ef56946212cb8d71051c61b88b34c84e4430d Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Wed, 24 Aug 2022 01:55:59 +0800
Subject: [PATCH 225/959] [Keyboard] Add Plywrks Lune (#17057)

* Add Plywrks Lune

* Add OLED functionality

* Update keyboards/plywrks/lune/keymaps/default/keymap.c

* Update keyboards/plywrks/lune/keymaps/via/keymap.c

* Update keyboards/plywrks/lune/keymaps/via/keymap.c

* Update keyboards/plywrks/lune/lune.c

* Add the missing 2 layers in the keymap

Also added a missing parenthesis in lune.c, and removed
the oled_task_user in the default keymap.

* Update keyboards/plywrks/lune/info.json

* Update keyboards/plywrks/lune/info.json

* Update keyboards/plywrks/lune/info.json

* Update keyboards/plywrks/lune/config.h
---
 keyboards/plywrks/lune/config.h               | 83 ++++++++++++++++++
 keyboards/plywrks/lune/info.json              | 87 +++++++++++++++++++
 .../plywrks/lune/keymaps/default/keymap.c     | 33 +++++++
 keyboards/plywrks/lune/keymaps/via/keymap.c   | 48 ++++++++++
 keyboards/plywrks/lune/keymaps/via/rules.mk   |  2 +
 keyboards/plywrks/lune/lune.c                 | 38 ++++++++
 keyboards/plywrks/lune/lune.h                 | 47 ++++++++++
 keyboards/plywrks/lune/readme.md              | 21 +++++
 keyboards/plywrks/lune/rules.mk               | 19 ++++
 9 files changed, 378 insertions(+)
 create mode 100644 keyboards/plywrks/lune/config.h
 create mode 100644 keyboards/plywrks/lune/info.json
 create mode 100644 keyboards/plywrks/lune/keymaps/default/keymap.c
 create mode 100644 keyboards/plywrks/lune/keymaps/via/keymap.c
 create mode 100644 keyboards/plywrks/lune/keymaps/via/rules.mk
 create mode 100644 keyboards/plywrks/lune/lune.c
 create mode 100644 keyboards/plywrks/lune/lune.h
 create mode 100644 keyboards/plywrks/lune/readme.md
 create mode 100644 keyboards/plywrks/lune/rules.mk

diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
new file mode 100644
index 0000000000..065cc52d93
--- /dev/null
+++ b/keyboards/plywrks/lune/config.h
@@ -0,0 +1,83 @@
+/*
+Copyright 2022 Ramon Imbao
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 8
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F1, F0, B7, B0, B6, B5, D7, B4, D6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, D4, D5, D3, D2 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 8
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json
new file mode 100644
index 0000000000..83ccfe12f3
--- /dev/null
+++ b/keyboards/plywrks/lune/info.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "Lune",
+    "manufacturer": "plywrks",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0x706C",
+        "pid": "0x7901",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0.5, "y":0},
+                {"x":1.75, "y":0},
+                {"x":2.75, "y":0},
+                {"x":3.75, "y":0},
+                {"x":4.75, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                {"x":16, "y":0},
+                {"x":17, "y":0},
+
+                {"x":0.25, "y":1},
+                {"x":1.5, "y":1, "w":1.5},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1},
+                {"x":14.5, "y":1},
+                {"x":15.5, "y":1},
+                {"x":16.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2},
+                {"x":1.5, "y":2, "w":1.75},
+                {"x":3.25, "y":2},
+                {"x":4.25, "y":2},
+                {"x":5.25, "y":2},
+                {"x":6.25, "y":2},
+                {"x":7.25, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2},
+                {"x":14.75, "y":2},
+                {"x":15.75, "y":2, "w":2.25},
+
+                {"x":1.5, "y":3, "w":2.25},
+                {"x":3.75, "y":3},
+                {"x":4.75, "y":3},
+                {"x":5.75, "y":3},
+                {"x":6.75, "y":3},
+                {"x":7.75, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3},
+                {"x":13.25, "y":3},
+                {"x":14.25, "y":3},
+                {"x":15.25, "y":3, "w":1.75},
+                {"x":17, "y":3},
+
+                {"x":1.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":1.5},
+                {"x":5.5, "y":4, "w":2},
+                {"x":7.5, "y":4, "w":1.25},
+                {"x":9.25, "y":4, "w":2.75},
+                {"x":12, "y":4, "w":1.5},
+                {"x":16.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/plywrks/lune/keymaps/default/keymap.c b/keyboards/plywrks/lune/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8fb0746f43
--- /dev/null
+++ b/keyboards/plywrks/lune/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_DEL,  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LALT, KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                                              KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
+        KC_HOME, _______, _______, KC_UP,   _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
+        KC_END,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______, _______, _______,          _______, _______,                                              _______
+    )
+};
diff --git a/keyboards/plywrks/lune/keymaps/via/keymap.c b/keyboards/plywrks/lune/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b2a7abb603
--- /dev/null
+++ b/keyboards/plywrks/lune/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_DEL,  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LALT, KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                                              KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
+        KC_HOME, _______, _______, KC_UP,   _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
+        KC_END,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______, _______, _______,          _______, _______,                                              _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______, _______, _______,          _______, _______,                                              _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______, _______, _______,          _______, _______,                                              _______
+    )
+};
+
diff --git a/keyboards/plywrks/lune/keymaps/via/rules.mk b/keyboards/plywrks/lune/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/plywrks/lune/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/plywrks/lune/lune.c b/keyboards/plywrks/lune/lune.c
new file mode 100644
index 0000000000..1437f3fee6
--- /dev/null
+++ b/keyboards/plywrks/lune/lune.c
@@ -0,0 +1,38 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "lune.h"
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer :"), false);
+    oled_write(get_u8_str(get_highest_layer(layer_state), ' '), false);
+
+    oled_advance_page(true);
+
+        // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+
+    return false;
+}
+#endif
diff --git a/keyboards/plywrks/lune/lune.h b/keyboards/plywrks/lune/lune.h
new file mode 100644
index 0000000000..444f855123
--- /dev/null
+++ b/keyboards/plywrks/lune/lune.h
@@ -0,0 +1,47 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define ___ KC_NO
+
+#define LAYOUT_all( \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
+    k20, k30, k21, k31, k22, k32, k23,      k24, k34, k25, k35, k26, k36, k27, k37, \
+    k40, k50, k41, k51, k42, k52, k43,      k44, k54, k45, k55, k46, k56,      k57, \
+         k70, k61, k71, k62, k72, k63,      k64, k74, k65, k75, k66, k76, k67, k77, \
+         k80,      k81, k82,      k83,           k84,      k85,                k87  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, ___, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, ___ }, \
+    { k50, k51, k52, ___, k54, k55, k56, k57 }, \
+    { ___, k61, k62, k63, k64, k65, k66, k67 }, \
+    { k70, k71, k72, ___, k74, k75, k75, k77 }, \
+    { k80, k81, k82, k83, k84, k85, ___, k87 }, \
+}
diff --git a/keyboards/plywrks/lune/readme.md b/keyboards/plywrks/lune/readme.md
new file mode 100644
index 0000000000..bab2356a45
--- /dev/null
+++ b/keyboards/plywrks/lune/readme.md
@@ -0,0 +1,21 @@
+# Lune
+
+![Lune](https://i.imgur.com/GgOzXRUl.jpg)
+
+Lune: a plateless, screwless ergonomic 60 percent with an OLED screen.
+Specs: 16.5mm front height, 5 degrees typing angle, interchangeable brass top, daughterboard
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: ATmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make plywrks/lune:default
+    
+To get to the bootloader, simply press the reset button located on the back of the PCB. You can then flash new firmware onto it.
+
+Flashing example for this keyboard:
+
+    make plywrks/lune:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/plywrks/lune/rules.mk b/keyboards/plywrks/lune/rules.mk
new file mode 100644
index 0000000000..89f7f10840
--- /dev/null
+++ b/keyboards/plywrks/lune/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+OLED_ENABLE = yes           # Enable OLED

From cf41c24db853f825150802d30dce73ba507b69c0 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 25 Aug 2022 00:28:38 +1000
Subject: [PATCH 226/959] Move keyboard USB IDs and strings to data driven:
 develop (#18152)

* Move keyboard USB IDs and strings to data driven: develop

* Also do new onekeys
---
 keyboards/adafruit/macropad/config.h          |  6 ------
 keyboards/adafruit/macropad/info.json         |  8 ++++++-
 keyboards/gmmk/gmmk2/p96/ansi/config.h        | 21 -------------------
 keyboards/gmmk/gmmk2/p96/ansi/info.json       |  6 ++++++
 keyboards/gmmk/gmmk2/p96/config.h             |  7 -------
 keyboards/gmmk/gmmk2/p96/iso/config.h         | 21 -------------------
 keyboards/gmmk/gmmk2/p96/iso/info.json        |  6 ++++++
 .../handwired/onekey/bluepill_f103c6/config.h |  2 --
 .../onekey/bluepill_f103c6/info.json          |  3 +++
 keyboards/handwired/onekey/kb2040/config.h    |  1 -
 keyboards/handwired/onekey/kb2040/info.json   |  3 +++
 keyboards/handwired/onekey/rp2040/config.h    |  1 -
 keyboards/handwired/onekey/rp2040/info.json   |  3 +++
 keyboards/handwired/onekey/teensy_35/config.h |  2 --
 .../handwired/onekey/teensy_35/info.json      |  3 +++
 .../jkeys_design/gentleman65_se_s/config.h    |  7 -------
 .../jkeys_design/gentleman65_se_s/info.json   |  8 ++++++-
 17 files changed, 38 insertions(+), 70 deletions(-)
 delete mode 100644 keyboards/gmmk/gmmk2/p96/ansi/config.h
 delete mode 100644 keyboards/gmmk/gmmk2/p96/iso/config.h
 create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/info.json
 create mode 100644 keyboards/handwired/onekey/kb2040/info.json
 create mode 100644 keyboards/handwired/onekey/rp2040/info.json
 create mode 100644 keyboards/handwired/onekey/teensy_35/info.json

diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 1e055e273b..cc4cbc940c 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -22,12 +22,6 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 3
 
-#define VENDOR_ID    0x239A
-#define PRODUCT_ID   0x0108
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Adafruit
-#define PRODUCT      Macropad RP2040
-
 /* Keyboard Matrix Assignments */
 // clang-format off
 #define DIRECT_PINS { \
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index ffa31780a9..e9bd7d85b1 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Adafruit Macropad RP2040",
+    "keyboard_name": "Macropad RP2040",
+    "manufacturer": "Adafruit",
     "url": "https://learn.adafruit.com/adafruit-macropad-rp2040",
     "maintainer": "Jpe230",
+    "usb": {
+        "vid": "0x239A",
+        "pid": "0x0108",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/config.h b/keyboards/gmmk/gmmk2/p96/ansi/config.h
deleted file mode 100644
index 9f386a4211..0000000000
--- a/keyboards/gmmk/gmmk2/p96/ansi/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-#define PRODUCT_ID 0x504B
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
index 1fe1530e4e..a5a1d6c3d5 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "GMMK V2 96 ANSI",
+    "manufacturer": "Glorious",
     "url": "http://www.pcgamingrace.com",
     "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x504B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index fec383c240..03a7f58538 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0001
-#define VENDOR_ID 0x320F
-#define MANUFACTURER Glorious
-
-#define PRODUCT GMMK 2 96
-
 /* key matrix size */
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 8
diff --git a/keyboards/gmmk/gmmk2/p96/iso/config.h b/keyboards/gmmk/gmmk2/p96/iso/config.h
deleted file mode 100644
index 97a391b09c..0000000000
--- a/keyboards/gmmk/gmmk2/p96/iso/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-#define PRODUCT_ID 0x505A
diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
index 96e9f1312b..df30007a01 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "GMMK V2 96 ISO",
+    "manufacturer": "Glorious",
     "url": "http://www.pcgamingrace.com",
     "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x505A",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h
index e53aa63292..903277bd3b 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/config.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h
@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Bluepill STM32F103C6
-
 #define MATRIX_COL_PINS { B0 }
 #define MATRIX_ROW_PINS { A7 }
 #define UNUSED_PINS
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json
new file mode 100644
index 0000000000..0ef180f6ec
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json
@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Bluepill STM32F103C6"
+}
diff --git a/keyboards/handwired/onekey/kb2040/config.h b/keyboards/handwired/onekey/kb2040/config.h
index 24a7d3a3eb..0bf7adf37f 100644
--- a/keyboards/handwired/onekey/kb2040/config.h
+++ b/keyboards/handwired/onekey/kb2040/config.h
@@ -5,7 +5,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Raspberry Pi RP2040
 #define MATRIX_COL_PINS \
     { GP4 }
 #define MATRIX_ROW_PINS \
diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json
new file mode 100644
index 0000000000..696b772142
--- /dev/null
+++ b/keyboards/handwired/onekey/kb2040/info.json
@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey KB2040"
+}
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index f4e45a8981..c0ef468aa9 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -5,7 +5,6 @@
 
 #include "config_common.h"
 
-#define PRODUCT Onekey Raspberry Pi RP2040
 #define MATRIX_COL_PINS \
     { GP4 }
 #define MATRIX_ROW_PINS \
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json
new file mode 100644
index 0000000000..696b021dc1
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/info.json
@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey RP2040"
+}
diff --git a/keyboards/handwired/onekey/teensy_35/config.h b/keyboards/handwired/onekey/teensy_35/config.h
index 18eebcaffd..13eaf1a4f6 100644
--- a/keyboards/handwired/onekey/teensy_35/config.h
+++ b/keyboards/handwired/onekey/teensy_35/config.h
@@ -19,8 +19,6 @@
 // TODO: including this causes "error: expected identifier before '(' token" errors
 //#include "config_common.h"
 
-#define PRODUCT Onekey Teensy 3.5
-
 #define MATRIX_COL_PINS { D5 } // 20/A6
 #define MATRIX_ROW_PINS { B2 } // 19/A5
 
diff --git a/keyboards/handwired/onekey/teensy_35/info.json b/keyboards/handwired/onekey/teensy_35/info.json
new file mode 100644
index 0000000000..99b6a236c5
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_35/info.json
@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Onekey Teensy 3.5"
+}
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index 3cdef92f6d..effdb281e6 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00FA
-#define PRODUCT_ID      0x2322
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    JJ48_24 & Omar Afzal
-#define PRODUCT         Gentleman 65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
index da2f817a92..477940ffa6 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/info.json
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -1,7 +1,13 @@
 {
-    "name": "The Gentleman 65 Suited Edition", 
+    "keyboard_name": "Gentleman 65", 
+    "manufacturer": "JJ48_24 & Omar Afzal",
     "url": "https://jkeys.design/products/gentleman-65-suited-edition", 
     "maintainer": "OmarA", 
+    "usb": {
+        "vid": "0x00FA",
+        "pid": "0x2322",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
           "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

From 7fab889696423376712f996af393dd1830d3bb70 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 24 Aug 2022 19:10:52 +0100
Subject: [PATCH 227/959] Fix use of encoder map in mechwild/clunker (#18156)

---
 keyboards/mechwild/clunker/info.json                | 1 -
 keyboards/mechwild/clunker/keymaps/default/rules.mk | 1 +
 keyboards/mechwild/clunker/keymaps/via/rules.mk     | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/mechwild/clunker/keymaps/default/rules.mk

diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json
index 6b10a04f13..cc9b8a1c59 100644
--- a/keyboards/mechwild/clunker/info.json
+++ b/keyboards/mechwild/clunker/info.json
@@ -12,7 +12,6 @@
         "mousekey": true,
         "nkro": true,
         "encoder": true,
-        "encoder_map": true,
         "haptic": true
     },
     "matrix_pins": {
diff --git a/keyboards/mechwild/clunker/keymaps/default/rules.mk b/keyboards/mechwild/clunker/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/mechwild/clunker/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechwild/clunker/keymaps/via/rules.mk b/keyboards/mechwild/clunker/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/mechwild/clunker/keymaps/via/rules.mk
+++ b/keyboards/mechwild/clunker/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

From 3d8c6246980cc52a150fb568503d491edcb8c696 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 24 Aug 2022 20:25:16 +0100
Subject: [PATCH 228/959] Update invalid pip install flag (#18146)

---
 lib/python/qmk/cli/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 02c6d1cbf4..1e15c28758 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -91,7 +91,7 @@ def _install_deps(requirements):
 
     elif not os.access(sys.prefix, os.W_OK):
         # We can't write to sys.prefix, attempt to install locally
-        command.append('--local')
+        command.append('--user')
 
     return _run_cmd(*command, '-r', requirements)
 

From b2db8becf9d0b7d4c56ddc1ab4a6556b0f92548b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 24 Aug 2022 21:38:07 +0100
Subject: [PATCH 229/959] Fix use of encoder map in mechlovin/foundation
 (#18157)

---
 keyboards/mechlovin/foundation/keymaps/default/rules.mk | 1 +
 keyboards/mechlovin/foundation/keymaps/via/rules.mk     | 3 ++-
 keyboards/mechlovin/foundation/rules.mk                 | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/mechlovin/foundation/keymaps/default/rules.mk

diff --git a/keyboards/mechlovin/foundation/keymaps/default/rules.mk b/keyboards/mechlovin/foundation/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/mechlovin/foundation/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechlovin/foundation/keymaps/via/rules.mk b/keyboards/mechlovin/foundation/keymaps/via/rules.mk
index 036bd6d1c3..f1adcab005 100644
--- a/keyboards/mechlovin/foundation/keymaps/via/rules.mk
+++ b/keyboards/mechlovin/foundation/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechlovin/foundation/rules.mk b/keyboards/mechlovin/foundation/rules.mk
index 49dd70e15d..5a0af7c463 100644
--- a/keyboards/mechlovin/foundation/rules.mk
+++ b/keyboards/mechlovin/foundation/rules.mk
@@ -18,4 +18,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes
 AUDIO_ENABLE = no           # Audio output
-ENCODER_MAP_ENABLE = yes

From e95aa2a35272d2ad1e61cfccca4819c357084ec3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 24 Aug 2022 21:38:53 +0100
Subject: [PATCH 230/959] Fix use of encoder map in mechlovin/zed65/retro66
 (#18158)

---
 keyboards/mechlovin/zed65/retro66/keymaps/default/rules.mk | 1 +
 keyboards/mechlovin/zed65/retro66/keymaps/via/rules.mk     | 3 ++-
 keyboards/mechlovin/zed65/retro66/rules.mk                 | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/mechlovin/zed65/retro66/keymaps/default/rules.mk

diff --git a/keyboards/mechlovin/zed65/retro66/keymaps/default/rules.mk b/keyboards/mechlovin/zed65/retro66/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/mechlovin/zed65/retro66/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechlovin/zed65/retro66/keymaps/via/rules.mk b/keyboards/mechlovin/zed65/retro66/keymaps/via/rules.mk
index 43061db1dd..1189f4ad19 100644
--- a/keyboards/mechlovin/zed65/retro66/keymaps/via/rules.mk
+++ b/keyboards/mechlovin/zed65/retro66/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechlovin/zed65/retro66/rules.mk b/keyboards/mechlovin/zed65/retro66/rules.mk
index 2f4f54e74b..5af1ba8536 100644
--- a/keyboards/mechlovin/zed65/retro66/rules.mk
+++ b/keyboards/mechlovin/zed65/retro66/rules.mk
@@ -1,2 +1 @@
 ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
\ No newline at end of file

From 4a6712331092ecba79f4e6fa1e533317171c0b08 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 24 Aug 2022 21:39:49 +0100
Subject: [PATCH 231/959] Refactor pianoforte for configurator (#18159)

---
 keyboards/aliceh66/pianoforte/info.json       | 42 +++++++++----------
 .../pianoforte/keymaps/default/keymap.c       | 14 +++----
 .../aliceh66/pianoforte/keymaps/iso/keymap.c  | 14 +++----
 .../aliceh66/pianoforte/keymaps/via/keymap.c  | 28 ++++++-------
 keyboards/aliceh66/pianoforte/pianoforte.h    | 10 ++---
 keyboards/aliceh66/pianoforte/rules.mk        |  2 +-
 6 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json
index 3e3f8ea8b5..7128937a74 100644
--- a/keyboards/aliceh66/pianoforte/info.json
+++ b/keyboards/aliceh66/pianoforte/info.json
@@ -9,7 +9,7 @@
         "vid": "0x6168"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
 				{"label":"Esc", "x":0, "y":0}, 
 				{"label":"F1", "x":1.25, "y":0}, 
@@ -81,7 +81,7 @@
 				{"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
 				
 				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25, "w":1}, 
+				{"label":"ISO Pipe", "x":1.25, "y":4.25}, 
 				{"label":"Z", "x":2.25, "y":4.25}, 
 				{"label":"X", "x":3.25, "y":4.25}, 
 				{"label":"C", "x":4.25, "y":4.25}, 
@@ -93,25 +93,25 @@
 				{"label":">", "x":10.25, "y":4.25}, 
 				{"label":"?", "x":11.25, "y":4.25}, 
 				{"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-				{"label":"Shift", "x":12.24, "y":4.25, "w":2.75},
+				{"label":"Shift", "x":12.24, "y":4.25, "w":1.75},
 				{"label":"Fn", "x":14, "y":4.25},
 				{"label":"\u2191", "x":16.25, "y":4.25}, 
 				
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
 				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":4, "y":5.25, "w":7},
-				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
-				{"label":"Alt", "x":11, "y":5.25, "w":1.25},
-				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-				{"label": "MO(1)", "x":12.5, "y": 5.25, "w":1.25},
-				{"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
+				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+				{"label":"Alt", "x":10, "y":5.25},
+				{"label":"Alt", "x":11, "y":5.25},
+				{"label":"Win", "x":12, "y":5.25},
+				{"label": "MO(1)", "x":13, "y": 5.25},
+				{"label":"Ctrl", "x":14, "y":5.25}, 
 				{"label":"\u2190", "x":15.25, "y":5.25}, 
 				{"label":"\u2193", "x":16.25, "y":5.25}, 
 				{"label":"\u2192", "x":17.25, "y":5.25}
 			]
         },
-		"LAYOUT_tkl_ansi": {
+		"LAYOUT_tkl_f13_ansi": {
 			"layout": [
 				{"label":"Esc", "x":0, "y":0}, 
 				{"label":"F1", "x":1.25, "y":0}, 
@@ -198,7 +198,7 @@
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
 				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":4, "y":5.25, "w":6.25},
+				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
 				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
 				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
 				{"label":"MO(1)", "x":12.5, "y":5.25, "w":1.25},
@@ -208,7 +208,7 @@
 				{"label":"\u2192", "x":17.25, "y":5.25}
 			]
         },
-		"LAYOUT_tkl_iso": {
+		"LAYOUT_tkl_f13_iso": {
 			"layout": [
 				{"label":"Esc", "x":0, "y":0}, 
 				{"label":"F1", "x":1.25, "y":0}, 
@@ -278,8 +278,8 @@
 				{"label":"ISO #", "x":12.75, "y":3.25}, 
 				{"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, 
 				
-				{"label":"Shift", "x":0, "y":4.25, "w":2.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25, "w":1},
+				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
+				{"label":"ISO Pipe", "x":1.25, "y":4.25},
 				{"label":"Z", "x":2.25, "y":4.25}, 
 				{"label":"X", "x":3.25, "y":4.25}, 
 				{"label":"C", "x":4.25, "y":4.25}, 
@@ -296,7 +296,7 @@
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
 				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":4, "y":5.25, "w":6.25},
+				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
 				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
 				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
 				{"label":"MO(1)", "x":12.5, "y":5.25, "w":1.25},
@@ -391,11 +391,11 @@
 				{"label":"\u2191", "x":16.25, "y":4.25}, 
 				
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-				{"label":"Win", "x":1.5, "y":5.25, "w":1},
+				{"label":"Win", "x":1.5, "y":5.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
 				{"label":"Space", "x":4, "y":5.25, "w":7},
 				{"label":"Alt", "x":11, "y":5.25, "w":1.5},
-				{"label":"Win", "x":12.5, "y":5.25, "w":1},
+				{"label":"Win", "x":12.5, "y":5.25},
 				{"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, 
 				{"label":"\u2190", "x":15.25, "y":5.25}, 
 				{"label":"\u2193", "x":16.25, "y":5.25}, 
@@ -472,8 +472,8 @@
 				{"label":"ISO #", "x":12.75, "y":3.25}, 
 				{"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, 
 				
-				{"label":"Shift", "x":0, "y":4.25, "w":2.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25, "w":1},
+				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
+				{"label":"ISO Pipe", "x":1.25, "y":4.25},
 				{"label":"Z", "x":2.25, "y":4.25}, 
 				{"label":"X", "x":3.25, "y":4.25}, 
 				{"label":"C", "x":4.25, "y":4.25}, 
@@ -488,11 +488,11 @@
 				{"label":"\u2191", "x":16.25, "y":4.25}, 
 				
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-				{"label":"Win", "x":1.5, "y":5.25, "w":1},
+				{"label":"Win", "x":1.5, "y":5.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
 				{"label":"Space", "x":4, "y":5.25, "w":7},
 				{"label":"Alt", "x":11, "y":5.25, "w":1.5},
-				{"label":"Win", "x":12.5, "y":5.25, "w":1},
+				{"label":"Win", "x":12.5, "y":5.25},
 				{"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, 
 				{"label":"\u2190", "x":15.25, "y":5.25}, 
 				{"label":"\u2193", "x":16.25, "y":5.25}, 
diff --git a/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
index 00acfe82c9..a63648bcf7 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
@@ -21,13 +21,13 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_LAYER0] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,       MO(1),
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_RSFT,      MO(1),   KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_RGUI,    MO(1),      KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+  [_LAYER0] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                   KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
 )
 
 };
diff --git a/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
index c8c4e8498e..72892846f9 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
@@ -21,13 +21,13 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_LAYER0] = LAYOUT_tkl_iso(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,                          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_RGUI,    MO(1),      KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
+  [_LAYER0] = LAYOUT_tkl_f13_iso(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC         ,          KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
 )
 
 };
diff --git a/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
index aa0f8a5e0d..234b1baf76 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
@@ -23,21 +23,21 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_LAYER0] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,       MO(1),
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_RSFT,      MO(1),   KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_RGUI,    MO(1),      KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+  [_LAYER0] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                   KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [_LAYER1] = LAYOUT(
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,                            KC_TRNS,                                                    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+  [_LAYER1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
   )
 };
diff --git a/keyboards/aliceh66/pianoforte/pianoforte.h b/keyboards/aliceh66/pianoforte/pianoforte.h
index 02749b7eb3..614af44cfe 100644
--- a/keyboards/aliceh66/pianoforte/pianoforte.h
+++ b/keyboards/aliceh66/pianoforte/pianoforte.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ____ KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_all( \
 	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }
 
-#define LAYOUT_tkl_ansi( \
+#define LAYOUT_tkl_f13_ansi( \
 	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
@@ -64,7 +64,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }	
 
-#define LAYOUT_tkl_iso( \
+#define LAYOUT_tkl_f13_iso( \
 	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,       K047, K057, K048, \
@@ -104,7 +104,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
 	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
 	{ ____, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
+	{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }
 
@@ -126,6 +126,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
 	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
 	{ K090, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
+	{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }
diff --git a/keyboards/aliceh66/pianoforte/rules.mk b/keyboards/aliceh66/pianoforte/rules.mk
index 4fecee4ef8..c7f0b93fef 100644
--- a/keyboards/aliceh66/pianoforte/rules.mk
+++ b/keyboards/aliceh66/pianoforte/rules.mk
@@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
-LAYOUTS = tkl_ansi tkl_iso
\ No newline at end of file
+LAYOUTS = tkl_f13_ansi tkl_f13_iso
\ No newline at end of file

From fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 25 Aug 2022 07:20:05 +1000
Subject: [PATCH 232/959] Add missing DD mapping for RGB_MATRIX_DRIVER (#18160)

---
 data/mappings/info_rules.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index 93de321ab1..fb54d2bdc0 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -19,6 +19,7 @@
     "MOUSE_SHARED_EP": {"info_key": "usb.shared_endpoint.mouse", "value_type": "bool"},
     "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
     "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
+    "RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
     "LTO_ENABLE": {"info_key": "build.lto", "value_type": "bool"},
     "MCU": {"info_key": "processor", "warn_duplicate": false},
     "MOUSEKEY_ENABLE": {"info_key": "mouse_key.enabled", "value_type": "bool"},

From 43fd6471305d3ebd9e6cb537d4d39c71e480922e Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 25 Aug 2022 12:17:41 +0100
Subject: [PATCH 233/959] Add eeprom defaults for tinyuf2 bootloader (#18042)

---
 builddefs/bootloader.mk                       |  1 +
 builddefs/mcu_selection.mk                    |  6 +-
 keyboards/mechwild/puckbuddy/config.h         |  8 --
 .../mechwild/puckbuddy/ld/STM32F401xE.ld      | 88 -------------------
 keyboards/mechwild/puckbuddy/post_rules.mk    |  7 --
 keyboards/mlego/m48/rev1/config.h             |  3 -
 keyboards/mlego/m48/rev1/ld/STM32F401xE.ld    | 88 -------------------
 keyboards/mlego/m48/rev1/rules.mk             |  2 -
 keyboards/mlego/m60/rev1/config.h             |  3 -
 keyboards/mlego/m60/rev1/ld/STM32F401xE.ld    | 88 -------------------
 keyboards/mlego/m60/rev1/rules.mk             |  2 -
 keyboards/mlego/m60_split/rev1/config.h       |  3 -
 .../mlego/m60_split/rev1/ld/STM32F401xE.ld    | 88 -------------------
 keyboards/mlego/m60_split/rev1/rules.mk       |  2 -
 keyboards/mlego/m65/rev3/config.h             |  3 -
 keyboards/mlego/m65/rev3/ld/STM32F401xE.ld    | 88 -------------------
 keyboards/mlego/m65/rev3/rules.mk             |  2 -
 keyboards/mlego/m65/rev4/config.h             |  3 -
 keyboards/mlego/m65/rev4/ld/STM32F401xE.ld    | 88 -------------------
 keyboards/mlego/m65/rev4/rules.mk             |  2 -
 .../promicro_to_stemcell/converter.mk         |  4 -
 21 files changed, 5 insertions(+), 574 deletions(-)
 delete mode 100644 keyboards/mechwild/puckbuddy/ld/STM32F401xE.ld
 delete mode 100644 keyboards/mechwild/puckbuddy/post_rules.mk
 delete mode 100644 keyboards/mlego/m48/rev1/ld/STM32F401xE.ld
 delete mode 100644 keyboards/mlego/m60/rev1/ld/STM32F401xE.ld
 delete mode 100644 keyboards/mlego/m60_split/rev1/ld/STM32F401xE.ld
 delete mode 100644 keyboards/mlego/m65/rev3/ld/STM32F401xE.ld
 delete mode 100644 keyboards/mlego/m65/rev4/ld/STM32F401xE.ld

diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 51e9b7d558..9f55536423 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -199,6 +199,7 @@ endif
 ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     OPT_DEFS += -DBOOTLOADER_TINYUF2
     BOOTLOADER_TYPE = tinyuf2
+    FIRMWARE_FORMAT = uf2
 endif
 ifeq ($(strip $(BOOTLOADER)), rp2040)
     OPT_DEFS += -DBOOTLOADER_RP2040
diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index 597591a455..0ea9630d59 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -348,7 +348,8 @@ ifneq ($(findstring STM32F401, $(MCU)),)
   #   or <keyboard_dir>/ld/
   ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
-    FIRMWARE_FORMAT ?= uf2
+    EEPROM_DRIVER ?= wear_leveling
+    WEAR_LEVELING_DRIVER ?= legacy
   else
     MCU_LDSCRIPT ?= STM32F401xC
   endif
@@ -464,7 +465,8 @@ ifneq ($(findstring STM32F411, $(MCU)),)
   #   or <keyboard_dir>/ld/
   ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
-    FIRMWARE_FORMAT ?= uf2
+    EEPROM_DRIVER ?= wear_leveling
+    WEAR_LEVELING_DRIVER ?= legacy
   else
     MCU_LDSCRIPT ?= STM32F411xE
   endif
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 0dbf1f694c..656fa2e7d1 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -9,14 +9,6 @@
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
 
-#ifdef UF2_BUILD
-#define EXTERNAL_EEPROM_BYTE_COUNT 2048
-#define EXTERNAL_EEPROM_PAGE_SIZE 128
-#define EXTERNAL_EEPROM_ADDRESS_SIZE 1
-#define EXTERNAL_EEPROM_WRITE_TIME 0
-#define FEE_PAGE_BASE_ADDRESS 0x08008000
-#endif
-
 /* Define custom font */
 #define OLED_FONT_H "keyboards/mechwild/puckbuddy/glcdfont.c"
 
diff --git a/keyboards/mechwild/puckbuddy/ld/STM32F401xE.ld b/keyboards/mechwild/puckbuddy/ld/STM32F401xE.ld
deleted file mode 100644
index daec7d8583..0000000000
--- a/keyboards/mechwild/puckbuddy/ld/STM32F401xE.ld
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * STM32F401xE memory setup.
- */
-MEMORY
-{
-    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
-    flash1 (rx) : org = 0x08004000, len = 16k
-    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
-    flash3 (rx) : org = 0x0800C000, len = 16k
-    flash4 (rx) : org = 0x08010000, len = 512k - 64k
-    flash5 (rx) : org = 0x00000000, len = 0
-    flash6 (rx) : org = 0x00000000, len = 0
-    flash7 (rx) : org = 0x00000000, len = 0
-    ram0   (wx) : org = 0x20000000, len = 96k
-    ram1   (wx) : org = 0x00000000, len = 0
-    ram2   (wx) : org = 0x00000000, len = 0
-    ram3   (wx) : org = 0x00000000, len = 0
-    ram4   (wx) : org = 0x00000000, len = 0
-    ram5   (wx) : org = 0x00000000, len = 0
-    ram6   (wx) : org = 0x00000000, len = 0
-    ram7   (wx) : org = 0x00000000, len = 0
-}
-
-/* For each data/text section two region are defined, a virtual region
-   and a load region (_LMA suffix).*/
-
-/* Flash region to be used for exception vectors.*/
-REGION_ALIAS("VECTORS_FLASH", flash4);
-REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for constructors and destructors.*/
-REGION_ALIAS("XTORS_FLASH", flash4);
-REGION_ALIAS("XTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for code text.*/
-REGION_ALIAS("TEXT_FLASH", flash4);
-REGION_ALIAS("TEXT_FLASH_LMA", flash4);
-
-/* Flash region to be used for read only data.*/
-REGION_ALIAS("RODATA_FLASH", flash4);
-REGION_ALIAS("RODATA_FLASH_LMA", flash4);
-
-/* Flash region to be used for various.*/
-REGION_ALIAS("VARIOUS_FLASH", flash4);
-REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
-
-/* Flash region to be used for RAM(n) initialization data.*/
-REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts.*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-REGION_ALIAS("DATA_RAM_LMA", flash4);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-/* RAM region to be used for the default heap.*/
-REGION_ALIAS("HEAP_RAM", ram0);
-
-/* Generic rules inclusion.*/
-INCLUDE rules.ld
-
-/* TinyUF2 bootloader reset support */
-_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mechwild/puckbuddy/post_rules.mk b/keyboards/mechwild/puckbuddy/post_rules.mk
deleted file mode 100644
index ac527500d2..0000000000
--- a/keyboards/mechwild/puckbuddy/post_rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-ifeq ($(strip $(BOOTLOADER)), tinyuf2)
-    ifndef EEPROM_DRIVER
-        MCU_LDSCRIPT = STM32F401xE
-        EEPROM_DRIVER = vendor
-        UF2_BUILD = yes
-    endif
-endif
\ No newline at end of file
diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
index 5f20d8c980..b0fa3e95a5 100644
--- a/keyboards/mlego/m48/rev1/config.h
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -51,6 +51,3 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #endif
-
-// you want to comment this if using stm32-dfu as bootloader
-#define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m48/rev1/ld/STM32F401xE.ld b/keyboards/mlego/m48/rev1/ld/STM32F401xE.ld
deleted file mode 100644
index daec7d8583..0000000000
--- a/keyboards/mlego/m48/rev1/ld/STM32F401xE.ld
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * STM32F401xE memory setup.
- */
-MEMORY
-{
-    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
-    flash1 (rx) : org = 0x08004000, len = 16k
-    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
-    flash3 (rx) : org = 0x0800C000, len = 16k
-    flash4 (rx) : org = 0x08010000, len = 512k - 64k
-    flash5 (rx) : org = 0x00000000, len = 0
-    flash6 (rx) : org = 0x00000000, len = 0
-    flash7 (rx) : org = 0x00000000, len = 0
-    ram0   (wx) : org = 0x20000000, len = 96k
-    ram1   (wx) : org = 0x00000000, len = 0
-    ram2   (wx) : org = 0x00000000, len = 0
-    ram3   (wx) : org = 0x00000000, len = 0
-    ram4   (wx) : org = 0x00000000, len = 0
-    ram5   (wx) : org = 0x00000000, len = 0
-    ram6   (wx) : org = 0x00000000, len = 0
-    ram7   (wx) : org = 0x00000000, len = 0
-}
-
-/* For each data/text section two region are defined, a virtual region
-   and a load region (_LMA suffix).*/
-
-/* Flash region to be used for exception vectors.*/
-REGION_ALIAS("VECTORS_FLASH", flash4);
-REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for constructors and destructors.*/
-REGION_ALIAS("XTORS_FLASH", flash4);
-REGION_ALIAS("XTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for code text.*/
-REGION_ALIAS("TEXT_FLASH", flash4);
-REGION_ALIAS("TEXT_FLASH_LMA", flash4);
-
-/* Flash region to be used for read only data.*/
-REGION_ALIAS("RODATA_FLASH", flash4);
-REGION_ALIAS("RODATA_FLASH_LMA", flash4);
-
-/* Flash region to be used for various.*/
-REGION_ALIAS("VARIOUS_FLASH", flash4);
-REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
-
-/* Flash region to be used for RAM(n) initialization data.*/
-REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts.*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-REGION_ALIAS("DATA_RAM_LMA", flash4);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-/* RAM region to be used for the default heap.*/
-REGION_ALIAS("HEAP_RAM", ram0);
-
-/* Generic rules inclusion.*/
-INCLUDE rules.ld
-
-/* TinyUF2 bootloader reset support */
-_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mlego/m48/rev1/rules.mk b/keyboards/mlego/m48/rev1/rules.mk
index 8ddaf1d5be..20a1e60817 100644
--- a/keyboards/mlego/m48/rev1/rules.mk
+++ b/keyboards/mlego/m48/rev1/rules.mk
@@ -4,8 +4,6 @@ BOARD = BLACKPILL_STM32_F401
 
 # Bootloader selection
 BOOTLOADER = tinyuf2
-MCU_LDSCRIPT = STM32F401xE
-EEPROM_DRIVER = vendor
 #BOOTLOADER = stm32-dfu
 
 # Build Options
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index 49c9492aa2..7507dcd427 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -51,6 +51,3 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-
-// you want to comment this if using stm32-dfu as bootloader
-#define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m60/rev1/ld/STM32F401xE.ld b/keyboards/mlego/m60/rev1/ld/STM32F401xE.ld
deleted file mode 100644
index daec7d8583..0000000000
--- a/keyboards/mlego/m60/rev1/ld/STM32F401xE.ld
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * STM32F401xE memory setup.
- */
-MEMORY
-{
-    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
-    flash1 (rx) : org = 0x08004000, len = 16k
-    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
-    flash3 (rx) : org = 0x0800C000, len = 16k
-    flash4 (rx) : org = 0x08010000, len = 512k - 64k
-    flash5 (rx) : org = 0x00000000, len = 0
-    flash6 (rx) : org = 0x00000000, len = 0
-    flash7 (rx) : org = 0x00000000, len = 0
-    ram0   (wx) : org = 0x20000000, len = 96k
-    ram1   (wx) : org = 0x00000000, len = 0
-    ram2   (wx) : org = 0x00000000, len = 0
-    ram3   (wx) : org = 0x00000000, len = 0
-    ram4   (wx) : org = 0x00000000, len = 0
-    ram5   (wx) : org = 0x00000000, len = 0
-    ram6   (wx) : org = 0x00000000, len = 0
-    ram7   (wx) : org = 0x00000000, len = 0
-}
-
-/* For each data/text section two region are defined, a virtual region
-   and a load region (_LMA suffix).*/
-
-/* Flash region to be used for exception vectors.*/
-REGION_ALIAS("VECTORS_FLASH", flash4);
-REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for constructors and destructors.*/
-REGION_ALIAS("XTORS_FLASH", flash4);
-REGION_ALIAS("XTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for code text.*/
-REGION_ALIAS("TEXT_FLASH", flash4);
-REGION_ALIAS("TEXT_FLASH_LMA", flash4);
-
-/* Flash region to be used for read only data.*/
-REGION_ALIAS("RODATA_FLASH", flash4);
-REGION_ALIAS("RODATA_FLASH_LMA", flash4);
-
-/* Flash region to be used for various.*/
-REGION_ALIAS("VARIOUS_FLASH", flash4);
-REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
-
-/* Flash region to be used for RAM(n) initialization data.*/
-REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts.*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-REGION_ALIAS("DATA_RAM_LMA", flash4);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-/* RAM region to be used for the default heap.*/
-REGION_ALIAS("HEAP_RAM", ram0);
-
-/* Generic rules inclusion.*/
-INCLUDE rules.ld
-
-/* TinyUF2 bootloader reset support */
-_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mlego/m60/rev1/rules.mk b/keyboards/mlego/m60/rev1/rules.mk
index 4e071f302f..6c3ff56a08 100644
--- a/keyboards/mlego/m60/rev1/rules.mk
+++ b/keyboards/mlego/m60/rev1/rules.mk
@@ -5,8 +5,6 @@ BOARD = BLACKPILL_STM32_F401
 # Bootloader selection
 BOOTLOADER = tinyuf2
 #BOOTLOADER = stm32-dfu
-MCU_LDSCRIPT = STM32F401xE
-EEPROM_DRIVER = vendor
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index 0256bcc924..d1053a2291 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -78,6 +78,3 @@
 #define BOOTMAGIC_LITE_ROW_RIGHT 5
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 0
 #endif
-
-// you want to comment this if using stm32-dfu as bootloader
-#define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m60_split/rev1/ld/STM32F401xE.ld b/keyboards/mlego/m60_split/rev1/ld/STM32F401xE.ld
deleted file mode 100644
index daec7d8583..0000000000
--- a/keyboards/mlego/m60_split/rev1/ld/STM32F401xE.ld
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * STM32F401xE memory setup.
- */
-MEMORY
-{
-    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
-    flash1 (rx) : org = 0x08004000, len = 16k
-    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
-    flash3 (rx) : org = 0x0800C000, len = 16k
-    flash4 (rx) : org = 0x08010000, len = 512k - 64k
-    flash5 (rx) : org = 0x00000000, len = 0
-    flash6 (rx) : org = 0x00000000, len = 0
-    flash7 (rx) : org = 0x00000000, len = 0
-    ram0   (wx) : org = 0x20000000, len = 96k
-    ram1   (wx) : org = 0x00000000, len = 0
-    ram2   (wx) : org = 0x00000000, len = 0
-    ram3   (wx) : org = 0x00000000, len = 0
-    ram4   (wx) : org = 0x00000000, len = 0
-    ram5   (wx) : org = 0x00000000, len = 0
-    ram6   (wx) : org = 0x00000000, len = 0
-    ram7   (wx) : org = 0x00000000, len = 0
-}
-
-/* For each data/text section two region are defined, a virtual region
-   and a load region (_LMA suffix).*/
-
-/* Flash region to be used for exception vectors.*/
-REGION_ALIAS("VECTORS_FLASH", flash4);
-REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for constructors and destructors.*/
-REGION_ALIAS("XTORS_FLASH", flash4);
-REGION_ALIAS("XTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for code text.*/
-REGION_ALIAS("TEXT_FLASH", flash4);
-REGION_ALIAS("TEXT_FLASH_LMA", flash4);
-
-/* Flash region to be used for read only data.*/
-REGION_ALIAS("RODATA_FLASH", flash4);
-REGION_ALIAS("RODATA_FLASH_LMA", flash4);
-
-/* Flash region to be used for various.*/
-REGION_ALIAS("VARIOUS_FLASH", flash4);
-REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
-
-/* Flash region to be used for RAM(n) initialization data.*/
-REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts.*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-REGION_ALIAS("DATA_RAM_LMA", flash4);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-/* RAM region to be used for the default heap.*/
-REGION_ALIAS("HEAP_RAM", ram0);
-
-/* Generic rules inclusion.*/
-INCLUDE rules.ld
-
-/* TinyUF2 bootloader reset support */
-_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk
index 1a09f141b7..076a334510 100644
--- a/keyboards/mlego/m60_split/rev1/rules.mk
+++ b/keyboards/mlego/m60_split/rev1/rules.mk
@@ -5,8 +5,6 @@ BOARD = BLACKPILL_STM32_F401
 # Bootloader selection
 BOOTLOADER = tinyuf2
 #BOOTLOADER = stm32-dfu
-MCU_LDSCRIPT = STM32F401xE
-EEPROM_DRIVER = vendor
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index d8a9c2a463..e58a84f3d8 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -55,6 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #endif
-
-// you want to comment this if using stm32-dfu as bootloader
-#define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m65/rev3/ld/STM32F401xE.ld b/keyboards/mlego/m65/rev3/ld/STM32F401xE.ld
deleted file mode 100644
index daec7d8583..0000000000
--- a/keyboards/mlego/m65/rev3/ld/STM32F401xE.ld
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * STM32F401xE memory setup.
- */
-MEMORY
-{
-    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
-    flash1 (rx) : org = 0x08004000, len = 16k
-    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
-    flash3 (rx) : org = 0x0800C000, len = 16k
-    flash4 (rx) : org = 0x08010000, len = 512k - 64k
-    flash5 (rx) : org = 0x00000000, len = 0
-    flash6 (rx) : org = 0x00000000, len = 0
-    flash7 (rx) : org = 0x00000000, len = 0
-    ram0   (wx) : org = 0x20000000, len = 96k
-    ram1   (wx) : org = 0x00000000, len = 0
-    ram2   (wx) : org = 0x00000000, len = 0
-    ram3   (wx) : org = 0x00000000, len = 0
-    ram4   (wx) : org = 0x00000000, len = 0
-    ram5   (wx) : org = 0x00000000, len = 0
-    ram6   (wx) : org = 0x00000000, len = 0
-    ram7   (wx) : org = 0x00000000, len = 0
-}
-
-/* For each data/text section two region are defined, a virtual region
-   and a load region (_LMA suffix).*/
-
-/* Flash region to be used for exception vectors.*/
-REGION_ALIAS("VECTORS_FLASH", flash4);
-REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for constructors and destructors.*/
-REGION_ALIAS("XTORS_FLASH", flash4);
-REGION_ALIAS("XTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for code text.*/
-REGION_ALIAS("TEXT_FLASH", flash4);
-REGION_ALIAS("TEXT_FLASH_LMA", flash4);
-
-/* Flash region to be used for read only data.*/
-REGION_ALIAS("RODATA_FLASH", flash4);
-REGION_ALIAS("RODATA_FLASH_LMA", flash4);
-
-/* Flash region to be used for various.*/
-REGION_ALIAS("VARIOUS_FLASH", flash4);
-REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
-
-/* Flash region to be used for RAM(n) initialization data.*/
-REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts.*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-REGION_ALIAS("DATA_RAM_LMA", flash4);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-/* RAM region to be used for the default heap.*/
-REGION_ALIAS("HEAP_RAM", ram0);
-
-/* Generic rules inclusion.*/
-INCLUDE rules.ld
-
-/* TinyUF2 bootloader reset support */
-_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk
index 59eebe9489..57908335fd 100644
--- a/keyboards/mlego/m65/rev3/rules.mk
+++ b/keyboards/mlego/m65/rev3/rules.mk
@@ -5,8 +5,6 @@ BOARD = BLACKPILL_STM32_F401
 # Bootloader selection
 BOOTLOADER = tinyuf2
 #BOOTLOADER = stm32-dfu
-MCU_LDSCRIPT = STM32F401xE
-EEPROM_DRIVER = vendor
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index f50356954f..afd8c86bcc 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -64,6 +64,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define OLED_BRIGHTNESS 128
 #define OLED_FONT_H "keyboards/mlego/m65/lib/glcdfont.c"
 #endif
-
-// you want to comment this if using stm32-dfu as bootloader
-#define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m65/rev4/ld/STM32F401xE.ld b/keyboards/mlego/m65/rev4/ld/STM32F401xE.ld
deleted file mode 100644
index daec7d8583..0000000000
--- a/keyboards/mlego/m65/rev4/ld/STM32F401xE.ld
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * STM32F401xE memory setup.
- */
-MEMORY
-{
-    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
-    flash1 (rx) : org = 0x08004000, len = 16k
-    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
-    flash3 (rx) : org = 0x0800C000, len = 16k
-    flash4 (rx) : org = 0x08010000, len = 512k - 64k
-    flash5 (rx) : org = 0x00000000, len = 0
-    flash6 (rx) : org = 0x00000000, len = 0
-    flash7 (rx) : org = 0x00000000, len = 0
-    ram0   (wx) : org = 0x20000000, len = 96k
-    ram1   (wx) : org = 0x00000000, len = 0
-    ram2   (wx) : org = 0x00000000, len = 0
-    ram3   (wx) : org = 0x00000000, len = 0
-    ram4   (wx) : org = 0x00000000, len = 0
-    ram5   (wx) : org = 0x00000000, len = 0
-    ram6   (wx) : org = 0x00000000, len = 0
-    ram7   (wx) : org = 0x00000000, len = 0
-}
-
-/* For each data/text section two region are defined, a virtual region
-   and a load region (_LMA suffix).*/
-
-/* Flash region to be used for exception vectors.*/
-REGION_ALIAS("VECTORS_FLASH", flash4);
-REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for constructors and destructors.*/
-REGION_ALIAS("XTORS_FLASH", flash4);
-REGION_ALIAS("XTORS_FLASH_LMA", flash4);
-
-/* Flash region to be used for code text.*/
-REGION_ALIAS("TEXT_FLASH", flash4);
-REGION_ALIAS("TEXT_FLASH_LMA", flash4);
-
-/* Flash region to be used for read only data.*/
-REGION_ALIAS("RODATA_FLASH", flash4);
-REGION_ALIAS("RODATA_FLASH_LMA", flash4);
-
-/* Flash region to be used for various.*/
-REGION_ALIAS("VARIOUS_FLASH", flash4);
-REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
-
-/* Flash region to be used for RAM(n) initialization data.*/
-REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts.*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-REGION_ALIAS("DATA_RAM_LMA", flash4);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-/* RAM region to be used for the default heap.*/
-REGION_ALIAS("HEAP_RAM", ram0);
-
-/* Generic rules inclusion.*/
-INCLUDE rules.ld
-
-/* TinyUF2 bootloader reset support */
-_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk
index 2a7cc74889..a16dbefe32 100644
--- a/keyboards/mlego/m65/rev4/rules.mk
+++ b/keyboards/mlego/m65/rev4/rules.mk
@@ -5,8 +5,6 @@ BOARD = BLACKPILL_STM32_F401
 # Bootloader selection
 BOOTLOADER = tinyuf2
 #BOOTLOADER = stm32-dfu
-MCU_LDSCRIPT = STM32F401xE
-EEPROM_DRIVER = vendor
 
 # Build Options
 #   change yes to no to disable
diff --git a/platforms/chibios/converters/promicro_to_stemcell/converter.mk b/platforms/chibios/converters/promicro_to_stemcell/converter.mk
index 525492f96c..1bbe9bf09e 100644
--- a/platforms/chibios/converters/promicro_to_stemcell/converter.mk
+++ b/platforms/chibios/converters/promicro_to_stemcell/converter.mk
@@ -8,10 +8,6 @@ BOOTLOADER := tinyuf2
 SERIAL_DRIVER ?= usart
 WS2812_DRIVER ?= bitbang
 
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = legacy
-
-
 ifeq ($(strip $(STMC_US)), yes)
   OPT_DEFS += -DSTEMCELL_UART_SWAP
 endif

From 24720400a854e5954c75baef67161469bc6a3e8e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 26 Aug 2022 12:19:34 +1000
Subject: [PATCH 234/959] Update LUFA submodule (#18168)

---
 lib/lufa                                  | 2 +-
 lib/python/qmk/cli/generate/dfu_header.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/lufa b/lib/lufa
index 35cc3d92f5..549b97320d 160000
--- a/lib/lufa
+++ b/lib/lufa
@@ -1 +1 @@
-Subproject commit 35cc3d92f557bc8874ca602d2f22642d77cfe129
+Subproject commit 549b97320d515bfca2f95c145a67bd13be968faa
diff --git a/lib/python/qmk/cli/generate/dfu_header.py b/lib/python/qmk/cli/generate/dfu_header.py
index e873117387..aa0252ca86 100644
--- a/lib/python/qmk/cli/generate/dfu_header.py
+++ b/lib/python/qmk/cli/generate/dfu_header.py
@@ -33,8 +33,8 @@ def generate_dfu_header(cli):
     kb_info_json = dotty(info_json(cli.config.generate_dfu_header.keyboard))
 
     keyboard_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
-    keyboard_h_lines.append(f'#define MANUFACTURER {kb_info_json["manufacturer"]}')
-    keyboard_h_lines.append(f'#define PRODUCT {kb_info_json["keyboard_name"]} Bootloader')
+    keyboard_h_lines.append(f'#define MANUFACTURER "{kb_info_json["manufacturer"]}"')
+    keyboard_h_lines.append(f'#define PRODUCT "{kb_info_json["keyboard_name"]} Bootloader"')
 
     # Optional
     if 'qmk_lufa_bootloader.esc_output' in kb_info_json:

From a2765bfe1998abdd4571556bff236a3d89b0c16d Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 27 Aug 2022 00:41:10 +0100
Subject: [PATCH 235/959] Add missing SS_LOPT and SS_ROPT defines (#18175)

---
 quantum/send_string/send_string_keycodes.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quantum/send_string/send_string_keycodes.h b/quantum/send_string/send_string_keycodes.h
index 7017e03d5a..802d9a8240 100644
--- a/quantum/send_string/send_string_keycodes.h
+++ b/quantum/send_string/send_string_keycodes.h
@@ -419,6 +419,7 @@
 #define SS_LSFT(string) SS_DOWN(X_LSFT) string SS_UP(X_LSFT)
 #define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT)
 #define SS_LGUI(string) SS_DOWN(X_LGUI) string SS_UP(X_LGUI)
+#define SS_LOPT(string) SS_LALT(string)
 #define SS_LCMD(string) SS_LGUI(string)
 #define SS_LWIN(string) SS_LGUI(string)
 
@@ -427,6 +428,7 @@
 #define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT)
 #define SS_RGUI(string) SS_DOWN(X_RGUI) string SS_UP(X_RGUI)
 #define SS_ALGR(string) SS_RALT(string)
+#define SS_ROPT(string) SS_RALT(string)
 #define SS_RCMD(string) SS_RGUI(string)
 #define SS_RWIN(string) SS_RGUI(string)
 

From 9b5b0722555891ba94f240760ef3a6d4c870fd13 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 28 Aug 2022 14:20:52 +1000
Subject: [PATCH 236/959] 2022q3 Changelog. (#18180)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 data/mappings/keyboard_aliases.json |  14 +-
 docs/ChangeLog/20220827.md          | 343 ++++++++++++++++++++++++++++
 docs/_summary.md                    |   2 +-
 docs/breaking_changes.md            |  29 ++-
 docs/breaking_changes_history.md    |   1 +
 readme.md                           |   4 -
 6 files changed, 372 insertions(+), 21 deletions(-)
 create mode 100644 docs/ChangeLog/20220827.md

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 43186fc611..3e96451086 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -242,9 +242,6 @@
     honeycomb: {
         target: 'keyhive/honeycomb'
     },
-    id80: {
-          target: 'id80/ansi'
-    },
     idb_60: {
           target: 'idb/idb_60',
           layouts: {
@@ -847,6 +844,9 @@
     halberd: {
         target: 'kagizaraya/halberd'
     },
+    handwired/hillside/0_1: {
+        target: 'handwired/hillside/48'
+    }
     hecomi/alpha: {
         target: 'takashiski/hecomi/alpha'
     },
@@ -860,7 +860,13 @@
         target: 'idobao/id67/rgb'
     },
     id80: {
-        target: 'idobao/id80/v1'
+        target: 'idobao/id80/v2/ansi'
+    },
+    idobao/id80/v1/ansi: {
+        target: 'idobao/id80/v2/ansi'
+    },
+    idobao/id80/v1/iso: {
+        target: 'idobao/id80/v2/iso'
     },
     id87: {
         target: 'idobao/id87/v1'
diff --git a/docs/ChangeLog/20220827.md b/docs/ChangeLog/20220827.md
new file mode 100644
index 0000000000..b672b57cb8
--- /dev/null
+++ b/docs/ChangeLog/20220827.md
@@ -0,0 +1,343 @@
+# QMK Breaking Changes - 2022 August 27 Changelog
+
+## Notable Features :id=notable-features
+
+### Add Raspberry Pi RP2040 support ([#14877](https://github.com/qmk/qmk_firmware/pull/14877), [#17514](https://github.com/qmk/qmk_firmware/pull/17514), [#17516](https://github.com/qmk/qmk_firmware/pull/17516), [#17519](https://github.com/qmk/qmk_firmware/pull/17519), [#17612](https://github.com/qmk/qmk_firmware/pull/17612), [#17512](https://github.com/qmk/qmk_firmware/pull/17512), [#17557](https://github.com/qmk/qmk_firmware/pull/17557), [#17817](https://github.com/qmk/qmk_firmware/pull/17817), [#17839](https://github.com/qmk/qmk_firmware/pull/17839), [#18100](https://github.com/qmk/qmk_firmware/pull/18100)) :id=rp2040-support
+
+QMK _finally_ picked up support for RP2040-based boards, such as the Raspberry Pi Pico, the Sparkfun Pro Micro RP2040, and the Adafruit KB2040. One of QMK's newest collaborators, _@KarlK90_, effectively did `/micdrop` with RP2040, with a massive set of changes to both QMK and the repository QMK uses for the base platform support, ChibiOS[-Contrib]. There has been a flurry of development this breaking changes cycle related to RP2040 from a large number of contributors -- so much so that almost all standard QMK hardware subsystems are supported.
+
+Check the [RP2040 platform development page](platformdev_rp2040.md) for all supported peripherals and other hardware implementation details.
+
+### Allow `qmk flash` to use prebuilt firmware binaries ([#16584](https://github.com/qmk/qmk_firmware/pull/16584)) :id=cli-flash-binaries
+
+A long-requested capability of the QMK CLI has been the ability to flash binaries directly, without needing to build a firmware. QMK provides prebuilt `develop`-based default firmwares on our [CI page](https://qmk.tzarc.io/) -- normally people would need [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases/latest) to flash them. This new functionality written by _@Erovia_ allows `qmk flash` to be provided the prebuilt file instead, simplifying the workflow for people who haven't got Toolbox available.
+
+## Changes Requiring User Action :id=changes-requiring-user-action
+
+### Default layers dropped from 32 to 16 ([#15286](https://github.com/qmk/qmk_firmware/pull/15286))
+
+QMK allows for controlling the maximum number of layers it supports through `LAYER_STATE_(8|16|32)BIT`. Each definition allows for the same number of maximum layers -- `LAYER_STATE_8BIT` => 8 layers. There is also a corresponding firmware size decrease that goes along with smaller numbers -- given the vast majority of users don't use more than 16 layers the default has been swapped to 16. AVR users who were not previously specifying their max layer count may see some space freed up as a result.
+
+### `RESET` => `QK_BOOT` ([#17940](https://github.com/qmk/qmk_firmware/pull/17940)) :id=reset-2-qk_boot
+
+Following the last breaking changes cycle, QMK has been migrating usages of `RESET` to `QK_BOOT` due to naming collisions with our upstream board support packages. [#17940](https://github.com/qmk/qmk_firmware/pull/17940) converts user keymaps across to use the new keycode name. `RESET` should also move to `QK_BOOT`.
+
+### Updated Keyboard Codebases :id=updated-keyboard-codebases
+
+The following keyboards have had their source moved within QMK:
+
+| Old Keyboard Name      | New Keyboard Name        |
+|------------------------|--------------------------|
+| gentleman65            | jkeys_design/gentleman65 |
+| handwired/hillside/0_1 | handwired/hillside/48    |
+| idobao/id80/v1/ansi    | idobao/id80/v2/ansi      |
+| idobao/id80/v1/iso     | idobao/id80/v2/iso       |
+
+### Data-driven USB IDs Refactoring ([#18152](https://github.com/qmk/qmk_firmware/pull/18152)) :id=usb-ids-Refactoring
+
+QMK has decided to deprecate the specification of USB IDs inside `config.h` in favour of `info.json`, eventually leaving data-driven as the only method to specify USB information.
+
+A significant number of keyboards have already been changed on `master` in a like-for-like fashion, and [#18152](https://github.com/qmk/qmk_firmware/pull/18152) performs the same transformations for keyboards already on `develop`.
+
+Previously in `config.h`:
+```c
+#define VENDOR_ID    0x1234
+#define PRODUCT_ID   0x5678
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Me
+#define PRODUCT      MyKeyboard
+```
+
+Replaced by `info.json`:
+```json
+{
+    "keyboard_name": "MyKeyboard",
+    "manufacturer": "Me",
+    "usb": {
+        "vid": "0x1234",
+        "pid": "0x5678",
+        "device_version": "0.0.1"
+    },
+    // ... layouts, etc. ...
+}
+```
+
+#### Deprecation Schedule
+
+- From 2022 Aug 27, specifying USB information in `config.h` will produce warnings during build but will still function as previously.
+- From 2022 Nov 26, specifying USB information in `config.h` will cause compilation to fail.
+
+## Notable core changes :id=notable-core
+
+### Board converters ([#17514](https://github.com/qmk/qmk_firmware/pull/17514), [#17603](https://github.com/qmk/qmk_firmware/pull/17603), [#17711](https://github.com/qmk/qmk_firmware/pull/17711), [#17827](https://github.com/qmk/qmk_firmware/pull/17827), [#17593](https://github.com/qmk/qmk_firmware/pull/17593), [#17652](https://github.com/qmk/qmk_firmware/pull/17652), [#17595](https://github.com/qmk/qmk_firmware/pull/17595)) :id=board-converters
+
+Historically QMK had a `CONVERT_TO_PROTON_C` directive for `rules.mk` to allow people to replace an AVR-based Pro Micro with a QMK Proton C. Global parts shortages have prompted people to create their own pin-compatible boards -- QMK has made this conversion generic and now allows for drop-in replacements for a lot more boards. see the [Converters Feature](feature_converters.md) documentation for the full list of supported replacement boards -- in this breaking changes cycle we've gone from 1 to 7.
+
+### Add cli command to import keyboard|keymap|kbfirmware ([#16668](https://github.com/qmk/qmk_firmware/pull/16668)) :id=cli-import
+
+To help with importing keyboards and keymaps from other sources, _@zvecr_ added [#16668](https://github.com/qmk/qmk_firmware/pull/16668) which adds a new set of commands to the CLI to automatically import keyboards (`qmk import-keyboard -h`), keymaps (`qmk import-keymap -h`), and kbfirmware definitions (`qmk import-kbfirmware -h`) into QMK.
+
+The now-EOL kbfirmware allowed people who aren't set up with QMK the ability to create keyboard firmwares without requiring a full installation of QMK. Unfortunately, it targets a 7-year-old version of QMK -- adding frustration for users who want the newest features, as well as for QMK maintainers who have to spend time explaining why QMK can't just accept a drive-by code drop from kbfirmware. With any luck, this new command helps both camps!
+
+### Generic wear-leveling for EEPROM emulation ([#16996](https://github.com/qmk/qmk_firmware/pull/16996), [#17376](https://github.com/qmk/qmk_firmware/pull/17376), [#18102](https://github.com/qmk/qmk_firmware/pull/18102)) :id=wear-leveling
+
+QMK has had the ability to write to internal MCU flash in order to emulate EEPROM for some time now, but it was only limited to a small number of MCUs. The base HAL used by QMK for a large number of ARM devices provides a "proper" embedded MCU flash driver, so _@tzarc_ decoupled the wear-leveling algorithm from the old flash writing code, improved it, wrote some tests, and enabled its use for a much larger number of other devices... including RP2040's XIP flash, and external SPI NOR Flash.
+
+See the [EEPROM Driver](eeprom_driver.md) documentation for more information.
+
+### Pointing Device Improvements ([#16371](https://github.com/qmk/qmk_firmware/pull/16371), [#17111](https://github.com/qmk/qmk_firmware/pull/17111), [#17176](https://github.com/qmk/qmk_firmware/pull/17176), [#17482](https://github.com/qmk/qmk_firmware/pull/17482), [#17776](https://github.com/qmk/qmk_firmware/pull/17776), [#17613](https://github.com/qmk/qmk_firmware/pull/17613)) :id=pointing-device-improvements
+
+Ever since Pointing Device Driver support and Split Pointing Device support were added by _@drashna_ and _@daskygit_, there has been increased interest in the development of the pointing device subsystem and its associated code.
+
+Both the PMW33xx and the Cirque Pinnacle implementations have seen a lot of improvement to their code, as has the mouse code in general. Features like circular/edge scrolling for the Cirque, and Kinetic movement for any sensor with "lift detection" ([#17482](https://github.com/qmk/qmk_firmware/pull/17482)). Additionally, for those that make fast motions with their pointing devices, support for much larger mouse movement reports has been added ([#16371](https://github.com/qmk/qmk_firmware/pull/16371)).
+
+Other related changes:
+
+* Add support for large Mouse Reports ([#16371](https://github.com/qmk/qmk_firmware/pull/16371))
+* Improve PS/2 mouse performance ([#17111](https://github.com/qmk/qmk_firmware/pull/17111))
+* Mouse key kinetic mode fix ([#17176](https://github.com/qmk/qmk_firmware/pull/17176))
+* Circular scroll, inertial cursor ([#17482](https://github.com/qmk/qmk_firmware/pull/17482))
+* Create generic Pointing Device Pin defines ([#17776](https://github.com/qmk/qmk_firmware/pull/17776))
+* PMW33XX drivers overhaul ([#17613](https://github.com/qmk/qmk_firmware/pull/17613))
+
+---
+
+## Full changelist :id=full-changelist
+
+Core:
+* Tentative Teensy 3.5 support ([#14420](https://github.com/qmk/qmk_firmware/pull/14420))
+* Make default layer size 16-bit ([#15286](https://github.com/qmk/qmk_firmware/pull/15286))
+* Process all changed keys in one scan loop, deprecate `QMK_KEYS_PER_SCAN` ([#15292](https://github.com/qmk/qmk_firmware/pull/15292))
+* Do not enable PERMISSIVE_HOLD when TAPPING_TERM exceeds 500ms ([#15674](https://github.com/qmk/qmk_firmware/pull/15674))
+* Allow usage of ChibiOS's SIO driver for split keyboards ([#15907](https://github.com/qmk/qmk_firmware/pull/15907))
+* [Controller] Added board config for custom controller STeMCell ([#16287](https://github.com/qmk/qmk_firmware/pull/16287))
+* PoC: Swap Escape and Caps ([#16336](https://github.com/qmk/qmk_firmware/pull/16336))
+* Add support for large Mouse Reports ([#16371](https://github.com/qmk/qmk_firmware/pull/16371))
+* tap-dance: Restructure code and document in more detail ([#16394](https://github.com/qmk/qmk_firmware/pull/16394))
+* Teaching the CLI to flash binaries ([#16584](https://github.com/qmk/qmk_firmware/pull/16584))
+* Split ChibiOS usart split driver in protocol and hardware driver part ([#16669](https://github.com/qmk/qmk_firmware/pull/16669))
+* Added Wait time to sending each Keys for Dynamic Macros function ([#16800](https://github.com/qmk/qmk_firmware/pull/16800))
+* Added Delay time to sending each Keys for VIA Macros function feature ([#16810](https://github.com/qmk/qmk_firmware/pull/16810))
+* Improve avr wait_us() ([#16879](https://github.com/qmk/qmk_firmware/pull/16879))
+* Improve ENCODER_DEFAULT_POS to recognize lost ticks ([#16932](https://github.com/qmk/qmk_firmware/pull/16932))
+* Added emacs as an "operating system" for input mode. ([#16949](https://github.com/qmk/qmk_firmware/pull/16949))
+* 24LC32A EEPROM addition ([#16990](https://github.com/qmk/qmk_firmware/pull/16990))
+* Refactor steno and add `STENO_PROTOCOL = [all|txbolt|geminipr]` ([#17065](https://github.com/qmk/qmk_firmware/pull/17065))
+* improvements for Cirque Pinnacle trackpads ([#17091](https://github.com/qmk/qmk_firmware/pull/17091))
+* Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK ([#17099](https://github.com/qmk/qmk_firmware/pull/17099))
+* Improve PS/2 mouse performance ([#17111](https://github.com/qmk/qmk_firmware/pull/17111))
+* Update C standard to GNU11, C++ to GNU++14 ([#17114](https://github.com/qmk/qmk_firmware/pull/17114))
+* Added ws2812_pwm support for WB32 MCU. ([#17142](https://github.com/qmk/qmk_firmware/pull/17142))
+* Added ws2812_spi support for WB32 MCU ([#17143](https://github.com/qmk/qmk_firmware/pull/17143))
+* Make bootloader_jump for dualbank STM32 respect STM32_BOOTLOADER_DUAL_BANK_DELAY ([#17178](https://github.com/qmk/qmk_firmware/pull/17178))
+* Expose the time of the last change to the LED state ([#17222](https://github.com/qmk/qmk_firmware/pull/17222))
+* [Code] Add solid reactive gradient mode ([#17228](https://github.com/qmk/qmk_firmware/pull/17228))
+* Add keymap wrappers for introspection into the keymap. ([#17229](https://github.com/qmk/qmk_firmware/pull/17229))
+* Ensure eeconfig initialised before reading EEPROM handedness. ([#17256](https://github.com/qmk/qmk_firmware/pull/17256))
+* Add uf2-split-* make targets. ([#17257](https://github.com/qmk/qmk_firmware/pull/17257))
+* Removes terminal from QMK. ([#17258](https://github.com/qmk/qmk_firmware/pull/17258))
+* Make SPI Mode configurable for AW20216 and change default mode to 3 ([#17263](https://github.com/qmk/qmk_firmware/pull/17263))
+* Move SPLIT_HAND_PIN setup to split_pre_init ([#17271](https://github.com/qmk/qmk_firmware/pull/17271))
+* Allow larger SPLIT_USB_TIMEOUT with default SPLIT_USB_TIMEOUT_POLL ([#17272](https://github.com/qmk/qmk_firmware/pull/17272))
+* Feature-ify Send String ([#17275](https://github.com/qmk/qmk_firmware/pull/17275))
+* Rework paths for eeprom locations. ([#17326](https://github.com/qmk/qmk_firmware/pull/17326))
+* Pca9505/6 driver ([#17333](https://github.com/qmk/qmk_firmware/pull/17333))
+* Cirque Attenuation Setting ([#17342](https://github.com/qmk/qmk_firmware/pull/17342))
+* Scale brigthness for VIA ([#17352](https://github.com/qmk/qmk_firmware/pull/17352))
+* Ensure that rgb+via compiles in all cases ([#17355](https://github.com/qmk/qmk_firmware/pull/17355))
+* Wear-leveling EEPROM drivers: `embedded_flash`, `spi_flash`, `legacy` ([#17376](https://github.com/qmk/qmk_firmware/pull/17376))
+* In honor of king terry ([#17387](https://github.com/qmk/qmk_firmware/pull/17387))
+* tap-dance: Rename tests so that tap_dance is used consistently ([#17396](https://github.com/qmk/qmk_firmware/pull/17396))
+* IS31FL3737 Global Current Setting ([#17420](https://github.com/qmk/qmk_firmware/pull/17420))
+* [QP] Add ILI9488 support. ([#17438](https://github.com/qmk/qmk_firmware/pull/17438))
+* Mark GD32VF103 as ChibiOS-Contrib ([#17444](https://github.com/qmk/qmk_firmware/pull/17444))
+* ISSI Drivers Global Current Option ([#17448](https://github.com/qmk/qmk_firmware/pull/17448))
+* [Split] pointing transport check ([#17481](https://github.com/qmk/qmk_firmware/pull/17481))
+* Cirque trackpad features: circular scroll, inertial cursor ([#17482](https://github.com/qmk/qmk_firmware/pull/17482))
+* RGB heatmap skip NO_LED ([#17488](https://github.com/qmk/qmk_firmware/pull/17488))
+* Add kb2040 and sparkfun rp2040 converters ([#17514](https://github.com/qmk/qmk_firmware/pull/17514))
+* [style] rp2040 stage2 formatting ([#17516](https://github.com/qmk/qmk_firmware/pull/17516))
+* Also check /run/media/ for uf2 drives ([#17517](https://github.com/qmk/qmk_firmware/pull/17517))
+* RP2040 emulated EEPROM. ([#17519](https://github.com/qmk/qmk_firmware/pull/17519))
+* Make debounce algorithms signal matrix changes ([#17554](https://github.com/qmk/qmk_firmware/pull/17554))
+* Update PM2040 I2C pins ([#17578](https://github.com/qmk/qmk_firmware/pull/17578))
+* Added implementation of WB32 MCU wear_leveling_efl. ([#17579](https://github.com/qmk/qmk_firmware/pull/17579))
+* Use Pro Micro SDA/SCL pinout for PM2040 ([#17595](https://github.com/qmk/qmk_firmware/pull/17595))
+* Refactor Pixel Fractal effect ([#17602](https://github.com/qmk/qmk_firmware/pull/17602))
+* Add Blok RP2040 converter ([#17603](https://github.com/qmk/qmk_firmware/pull/17603))
+* Use polled waiting on ChibiOS platforms that support it ([#17607](https://github.com/qmk/qmk_firmware/pull/17607))
+* Stabilize Half-duplex RP2040 PIO split comms ([#17612](https://github.com/qmk/qmk_firmware/pull/17612))
+* PMW33XX drivers overhaul ([#17613](https://github.com/qmk/qmk_firmware/pull/17613))
+* Include stdint.h in avr/i2c_master.h ([#17639](https://github.com/qmk/qmk_firmware/pull/17639))
+* Add led matrix support for CKLED2001 ([#17643](https://github.com/qmk/qmk_firmware/pull/17643))
+* `STM32_USB_USE_OTG1` => `USB_ENDPOINTS_ARE_REORDERABLE` ([#17647](https://github.com/qmk/qmk_firmware/pull/17647))
+* Allow MCU-specific overrides for SPI flags. ([#17650](https://github.com/qmk/qmk_firmware/pull/17650))
+* Update LED/RGB Matrix flag function behavior ([#17651](https://github.com/qmk/qmk_firmware/pull/17651))
+* Cirque circular scroll: Support POINTING_DEVICE_COMBINED ([#17654](https://github.com/qmk/qmk_firmware/pull/17654))
+* Add support for PAW3204 Optical Sensor ([#17669](https://github.com/qmk/qmk_firmware/pull/17669))
+* Add LED limits call ([#17679](https://github.com/qmk/qmk_firmware/pull/17679))
+* Move Pointing Device code to a subdirectory ([#17684](https://github.com/qmk/qmk_firmware/pull/17684))
+* Avoid OOB in dynamic_keymap_reset ([#17695](https://github.com/qmk/qmk_firmware/pull/17695))
+* Allow dynamic keymap to compile without `via.h` ([#17703](https://github.com/qmk/qmk_firmware/pull/17703))
+* Use correct angle tune range of +/-127 on PMW33XX ([#17708](https://github.com/qmk/qmk_firmware/pull/17708))
+* Add Bonsai C4 converter ([#17711](https://github.com/qmk/qmk_firmware/pull/17711))
+* VIA Encoder Map Support ([#17734](https://github.com/qmk/qmk_firmware/pull/17734))
+* Move Pointing Device Initialization to after Split Post Initialization ([#17740](https://github.com/qmk/qmk_firmware/pull/17740))
+* Add ability to enter bootloader mode from `QK_MAKE` ([#17745](https://github.com/qmk/qmk_firmware/pull/17745))
+* Add `tap_code16_delay` ([#17748](https://github.com/qmk/qmk_firmware/pull/17748))
+* Implement relative mode for Cirque trackpad ([#17760](https://github.com/qmk/qmk_firmware/pull/17760))
+* Create generic Pointing Device Pin defines ([#17776](https://github.com/qmk/qmk_firmware/pull/17776))
+* Constrain Cirque Pinnacle coordinates ([#17803](https://github.com/qmk/qmk_firmware/pull/17803))
+* Refactor/rename postprocess_steno_user → post_process_steno_user ([#17823](https://github.com/qmk/qmk_firmware/pull/17823))
+* Add Bit-C PRO converter ([#17827](https://github.com/qmk/qmk_firmware/pull/17827))
+* guard RPC invocation by checking RPC info against crc checksum ([#17840](https://github.com/qmk/qmk_firmware/pull/17840))
+* Add ST7735 driver to Quantum Painter ([#17848](https://github.com/qmk/qmk_firmware/pull/17848))
+* Add minimal STM32F103C6 support ([#17853](https://github.com/qmk/qmk_firmware/pull/17853))
+* Remove legacy AVR ssd1306 driver ([#17864](https://github.com/qmk/qmk_firmware/pull/17864))
+* Remove tmk_core 'serial' code ([#17866](https://github.com/qmk/qmk_firmware/pull/17866))
+* Use LT_ZCAR in place of LT_PLUS for modded kc definitions of keymap_lithuanian_qwerty.h ([#18000](https://github.com/qmk/qmk_firmware/pull/18000))
+* Remove invisible variation selector-15 from keymap_japanese.h ([#18007](https://github.com/qmk/qmk_firmware/pull/18007))
+* define CZ_PERC S(CZ_PLUS) → define CZ_PERC S(CZ_EQL) ([#18008](https://github.com/qmk/qmk_firmware/pull/18008))
+* KR_DQUO S(KR_COLN) → KR_DQUO S(KR_QUOT) in keymap_korean.h ([#18011](https://github.com/qmk/qmk_firmware/pull/18011))
+* Replace ; by : in the shifted symbols ASCII art of keymap_norman ([#18029](https://github.com/qmk/qmk_firmware/pull/18029))
+* Add eeprom defaults for tinyuf2 bootloader ([#18042](https://github.com/qmk/qmk_firmware/pull/18042))
+* Remove duplicate COMBINING HORN in keymap_us_extended.h ([#18045](https://github.com/qmk/qmk_firmware/pull/18045))
+* Nix shell updates for `develop` ([#18131](https://github.com/qmk/qmk_firmware/pull/18131))
+
+CLI:
+* Add cli command to import keyboard|keymap|kbfirmware ([#16668](https://github.com/qmk/qmk_firmware/pull/16668))
+* Publish data as part of API generation ([#17020](https://github.com/qmk/qmk_firmware/pull/17020))
+* Allow encoder config from info.json ([#17295](https://github.com/qmk/qmk_firmware/pull/17295))
+* `qmk doctor`: show arch for macOS ([#17356](https://github.com/qmk/qmk_firmware/pull/17356))
+* Use --exclude-from=.gitignore in place of --exclude-standard ([#17399](https://github.com/qmk/qmk_firmware/pull/17399))
+* Improve importer workflow ([#17707](https://github.com/qmk/qmk_firmware/pull/17707))
+* Remove legacy bootmagic cli parsing ([#18099](https://github.com/qmk/qmk_firmware/pull/18099))
+* Align CLI requirements ([#18117](https://github.com/qmk/qmk_firmware/pull/18117))
+
+Submodule updates:
+* Add Raspberry Pi RP2040 support ([#14877](https://github.com/qmk/qmk_firmware/pull/14877))
+* Update mpaland/printf to eyalroz/printf fork ([#16163](https://github.com/qmk/qmk_firmware/pull/16163))
+* Generic wear-leveling algorithm ([#16996](https://github.com/qmk/qmk_firmware/pull/16996))
+* Update LUFA submodule ([#17368](https://github.com/qmk/qmk_firmware/pull/17368))
+* Update V-USB submodule ([#17385](https://github.com/qmk/qmk_firmware/pull/17385))
+* Update ChibiOS-Contrib ([#17540](https://github.com/qmk/qmk_firmware/pull/17540))
+* Update to latest ChibiOS-Contrib. ([#18016](https://github.com/qmk/qmk_firmware/pull/18016))
+* Update LUFA submodule ([#18168](https://github.com/qmk/qmk_firmware/pull/18168))
+
+Keyboards:
+* GMMK 2 WBG7 MCU compatibility ([#16436](https://github.com/qmk/qmk_firmware/pull/16436))
+* bastardkb: restructure folder hierarchy ([#16778](https://github.com/qmk/qmk_firmware/pull/16778))
+* Add Gentleman 65 SE Solderd PCB support ([#16992](https://github.com/qmk/qmk_firmware/pull/16992))
+* Move/Rename to Hillside48, simplify default keymap ([#17210](https://github.com/qmk/qmk_firmware/pull/17210))
+* IDOBAO ID67 code touch-ups and include factory keymap ([#17231](https://github.com/qmk/qmk_firmware/pull/17231))
+* IDOBAO ID87v2 code rewrite and include factory keymap ([#17232](https://github.com/qmk/qmk_firmware/pull/17232))
+* IDOBAO ID80v3 code rewrite and include factory keymap ([#17234](https://github.com/qmk/qmk_firmware/pull/17234))
+* IDOBAO ID80v1 folder rename ([#17265](https://github.com/qmk/qmk_firmware/pull/17265))
+* Fine!40 PCB Support ([#17426](https://github.com/qmk/qmk_firmware/pull/17426))
+* Update Charybdis code for Extended Mouse reports ([#17435](https://github.com/qmk/qmk_firmware/pull/17435))
+* (develop)AP2: Enable support for WL EEPROM Driver ([#17506](https://github.com/qmk/qmk_firmware/pull/17506))
+* (develop)Keychron Q2: Enable support for WL EEPROM Driver ([#17507](https://github.com/qmk/qmk_firmware/pull/17507))
+* Add Adafruit Macropad RP2040 ([#17512](https://github.com/qmk/qmk_firmware/pull/17512))
+* Add RP2040 config defaults ([#17557](https://github.com/qmk/qmk_firmware/pull/17557))
+* Add support keyboard Feker IK75 ([#17611](https://github.com/qmk/qmk_firmware/pull/17611))
+* boardsource/holiday/spooky data driven ([#17632](https://github.com/qmk/qmk_firmware/pull/17632))
+* boardsource/lulu data driven ([#17638](https://github.com/qmk/qmk_firmware/pull/17638))
+* Added support for gmmk pro rev2 keyboard. ([#17655](https://github.com/qmk/qmk_firmware/pull/17655))
+* boardsource/microdox data driven ([#17675](https://github.com/qmk/qmk_firmware/pull/17675))
+* Remove full bootmagic config from user files ([#17702](https://github.com/qmk/qmk_firmware/pull/17702))
+* (develop) Update bootmagic for Adafruit Macropad ([#17755](https://github.com/qmk/qmk_firmware/pull/17755))
+* Add a kb2040 version of the onkey keyboard that works with the oled keymap ([#17786](https://github.com/qmk/qmk_firmware/pull/17786))
+* Enable mousekeys by default for RGBKB Sol3 ([#17842](https://github.com/qmk/qmk_firmware/pull/17842))
+* More glyph transformations for spidey3 userspace ([#17854](https://github.com/qmk/qmk_firmware/pull/17854))
+* Default rgblight ([#17855](https://github.com/qmk/qmk_firmware/pull/17855))
+* Refactor satt/comet46 to use core OLED driver ([#17856](https://github.com/qmk/qmk_firmware/pull/17856))
+* Convert yosino58 to use split common ([#17861](https://github.com/qmk/qmk_firmware/pull/17861))
+* Migrate crkbd keymaps to oled driver ([#17863](https://github.com/qmk/qmk_firmware/pull/17863))
+* Overhaul uzu42 ([#17868](https://github.com/qmk/qmk_firmware/pull/17868))
+* Update ginkgo65hot to allow use of community layouts ([#17911](https://github.com/qmk/qmk_firmware/pull/17911))
+* Remove `UNUSED_PINS` ([#17931](https://github.com/qmk/qmk_firmware/pull/17931))
+* RESET -> QK_BOOT user keymaps ([#17940](https://github.com/qmk/qmk_firmware/pull/17940))
+* Add cursor layer to DMQ Spin ([#17996](https://github.com/qmk/qmk_firmware/pull/17996))
+* add new keyboard 'soda/cherish' ([#18057](https://github.com/qmk/qmk_firmware/pull/18057))
+* Move keyboard USB IDs and strings to data driven: develop ([#18152](https://github.com/qmk/qmk_firmware/pull/18152))
+
+Keyboard fixes:
+* Fixup SPI mode 3 => 0 on tzarc/djinn, `develop`. ([#17440](https://github.com/qmk/qmk_firmware/pull/17440))
+* Fixup doio/kb16 ([#17545](https://github.com/qmk/qmk_firmware/pull/17545))
+* Adafruit Macropad: Add VIA keymap, fix default km ([#17735](https://github.com/qmk/qmk_firmware/pull/17735))
+* Fix compilation issues for Charybdis/Dilemma ([#17791](https://github.com/qmk/qmk_firmware/pull/17791))
+* bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop` ([#17800](https://github.com/qmk/qmk_firmware/pull/17800))
+* Fixup uzu42 ([#17867](https://github.com/qmk/qmk_firmware/pull/17867))
+* use correct function in Dilemma splinky ([#17923](https://github.com/qmk/qmk_firmware/pull/17923))
+* Fix compilation issues for Boardsource Microdox ([#18037](https://github.com/qmk/qmk_firmware/pull/18037))
+* Fixup gmmk/pro/rev2 USB Data ([#18056](https://github.com/qmk/qmk_firmware/pull/18056))
+
+Others:
+* backlight|led 'on state' for DD configuration ([#17383](https://github.com/qmk/qmk_firmware/pull/17383))
+* Dump out the largest symbols in flash and in RAM. ([#17397](https://github.com/qmk/qmk_firmware/pull/17397))
+* Re-order user space rules inclusion ([#17459](https://github.com/qmk/qmk_firmware/pull/17459))
+* Update feature_split_keyboard.md to add extra detail about left and right matrices. ([#17492](https://github.com/qmk/qmk_firmware/pull/17492))
+* Swap F4x1 default board files away from blackpill ([#17522](https://github.com/qmk/qmk_firmware/pull/17522))
+* Add converter docs ([#17593](https://github.com/qmk/qmk_firmware/pull/17593))
+* Updates to Pointing Device Docs ([#17777](https://github.com/qmk/qmk_firmware/pull/17777))
+* Add deprecated check for RGBLIGHT_ANIMATIONS ([#17832](https://github.com/qmk/qmk_firmware/pull/17832))
+* Remove OLED driver Split Common warning ([#17862](https://github.com/qmk/qmk_firmware/pull/17862))
+* Revert " Re-order user space rules inclusion (#17459)" ([#18032](https://github.com/qmk/qmk_firmware/pull/18032))
+
+Bugs:
+* Minor schema fixes ([#14200](https://github.com/qmk/qmk_firmware/pull/14200))
+* Fix buffer size for WS2812 PWM driver ([#17046](https://github.com/qmk/qmk_firmware/pull/17046))
+* Fix AVR I2C master 1ms timeout ([#17174](https://github.com/qmk/qmk_firmware/pull/17174))
+* Mouse key kinetic mode fix ([#17176](https://github.com/qmk/qmk_firmware/pull/17176))
+* Fix RGB heatmap to use XY positions and use correct led limits. ([#17184](https://github.com/qmk/qmk_firmware/pull/17184))
+* Fix keys being discarded after using the leader key ([#17287](https://github.com/qmk/qmk_firmware/pull/17287))
+* Fixup pimoroni trackball ([#17335](https://github.com/qmk/qmk_firmware/pull/17335))
+* Fix via builds broken by brightness scaling ([#17354](https://github.com/qmk/qmk_firmware/pull/17354))
+* SPI Bugfix for ChibiOS `21.11.1` => `21.11.2` ([#17371](https://github.com/qmk/qmk_firmware/pull/17371))
+* Additional schema fixes ([#17414](https://github.com/qmk/qmk_firmware/pull/17414))
+* Fix deadlocks on disconnected secondary half ([#17423](https://github.com/qmk/qmk_firmware/pull/17423))
+* [Fix] Fix compilation warning for non-split keebs after #17423 ([#17439](https://github.com/qmk/qmk_firmware/pull/17439))
+* Fix Caps Word to treat mod-taps more consistently. ([#17463](https://github.com/qmk/qmk_firmware/pull/17463))
+* Fix docs regarding `USB_SUSPEND_WAKEUP_DELAY` ([#17501](https://github.com/qmk/qmk_firmware/pull/17501))
+* Fixup SSD1351 build after #17438 ([#17533](https://github.com/qmk/qmk_firmware/pull/17533))
+* Fixup SPI init procedure, SPI EEPROM sequencing ([#17534](https://github.com/qmk/qmk_firmware/pull/17534))
+* Fix Caps Word capitalization when used with Combos + Auto Shift. ([#17549](https://github.com/qmk/qmk_firmware/pull/17549))
+* Allow for `keymaps` array to be implemented in a file other than `$(KEYMAP_C)` ([#17559](https://github.com/qmk/qmk_firmware/pull/17559))
+* [Fix] printf update aftermath ([#17584](https://github.com/qmk/qmk_firmware/pull/17584))
+* Fix rgbkb/sol/rev2 build issues ([#17601](https://github.com/qmk/qmk_firmware/pull/17601))
+* More DD encoder fixes ([#17615](https://github.com/qmk/qmk_firmware/pull/17615))
+* [Fix] Make ChibiOS `_wait.h` independent of `quantum.h` ([#17645](https://github.com/qmk/qmk_firmware/pull/17645))
+* Grammar fixes for docs/feature_converters.md ([#17652](https://github.com/qmk/qmk_firmware/pull/17652))
+* Fix compilation issue with Cirque Guestures file ([#17656](https://github.com/qmk/qmk_firmware/pull/17656))
+* Fix compile issue with LED Matrix ([#17658](https://github.com/qmk/qmk_firmware/pull/17658))
+* Post-bootloader EFL/SPI fixes. ([#17661](https://github.com/qmk/qmk_firmware/pull/17661))
+* Fix LED limit loop ([#17678](https://github.com/qmk/qmk_firmware/pull/17678))
+* [Fix] Use correct angle tune range of +/-30 on PMW33XX ([#17693](https://github.com/qmk/qmk_firmware/pull/17693))
+* Fix AVR compilation of FNV by using standard integer typenames. ([#17716](https://github.com/qmk/qmk_firmware/pull/17716))
+* fix syntax error in header file ([#17732](https://github.com/qmk/qmk_firmware/pull/17732))
+* Fix custom debug function and sample output ([#17790](https://github.com/qmk/qmk_firmware/pull/17790))
+* Fix QK_MAKE's reboot check ([#17795](https://github.com/qmk/qmk_firmware/pull/17795))
+* Chibios: Stop I2C peripheral on transaction error ([#17798](https://github.com/qmk/qmk_firmware/pull/17798))
+* Fix ChibiOS `i2c_master` error codes ([#17808](https://github.com/qmk/qmk_firmware/pull/17808))
+* Update ChibiOS Contrib for RP2040 fixes ([#17817](https://github.com/qmk/qmk_firmware/pull/17817))
+* RP2040 disable PIO IRQs on serial timeout ([#17839](https://github.com/qmk/qmk_firmware/pull/17839))
+* Fix POINTING_DEVICE_GESTURES_SCROLL_ENABLE typo ([#17850](https://github.com/qmk/qmk_firmware/pull/17850))
+* Fixup compilation of printf-like functions with uint32_t args. ([#17904](https://github.com/qmk/qmk_firmware/pull/17904))
+* Fix issue with #17904. ([#17905](https://github.com/qmk/qmk_firmware/pull/17905))
+* Always run pointing device init ([#17936](https://github.com/qmk/qmk_firmware/pull/17936))
+* Align TO() max layers with other keycodes ([#17989](https://github.com/qmk/qmk_firmware/pull/17989))
+* Fix Bépo's BP_NNBS (narrow non-breaking space) ([#17999](https://github.com/qmk/qmk_firmware/pull/17999))
+* Move Encoder+Encoder Map from generic features ([#18018](https://github.com/qmk/qmk_firmware/pull/18018))
+* Fix wrong varaible in encoder block ([#18020](https://github.com/qmk/qmk_firmware/pull/18020))
+* Fix LV_CCAR and LV_NCED in keymap_latvian.h ([#18025](https://github.com/qmk/qmk_firmware/pull/18025))
+* Use ANSI ASCII art and fix comments for LT_COLN and LT_UNDS in keymap_lithuanian_qwerty.h ([#18028](https://github.com/qmk/qmk_firmware/pull/18028))
+* Partially revert some WB32 specific changes ([#18038](https://github.com/qmk/qmk_firmware/pull/18038))
+* Fix Emulated EEPROM issue with F466 ([#18039](https://github.com/qmk/qmk_firmware/pull/18039))
+* Fix DV_SCLN and DV_COLN in keymap_spanish_dvorak.h ([#18043](https://github.com/qmk/qmk_firmware/pull/18043))
+* Fix missing development_board schema entry ([#18050](https://github.com/qmk/qmk_firmware/pull/18050))
+* Add key event check to `is_tap_record` and remove `is_tap_key` ([#18063](https://github.com/qmk/qmk_firmware/pull/18063))
+* Fix GD32VF103 WS2812 PWM driver ([#18067](https://github.com/qmk/qmk_firmware/pull/18067))
+* Fix new-keyboard default for RP2040 bootloader ([#18100](https://github.com/qmk/qmk_firmware/pull/18100))
+* Fixup F4xx wear-leveling bootloader check ([#18102](https://github.com/qmk/qmk_firmware/pull/18102))
+* Fix PID value for the Keyboardio Atreus 2 bootloader ([#18116](https://github.com/qmk/qmk_firmware/pull/18116))
+* Add missing SS_LOPT and SS_ROPT defines ([#18175](https://github.com/qmk/qmk_firmware/pull/18175))
diff --git a/docs/_summary.md b/docs/_summary.md
index 2c9a81eca0..f2bdcd5ccd 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -135,7 +135,7 @@
   * Breaking Changes
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
-    * [Most Recent ChangeLog](ChangeLog/20220528.md "QMK v0.17.0 - 2022 May 28")
+    * [Most Recent ChangeLog](ChangeLog/20220827.md "QMK v0.18.0 - 2022 Aug 27")
     * [Past Breaking Changes](breaking_changes_history.md)
 
   * C Development
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index cae6bf49d0..b701a70eeb 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -8,6 +8,7 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## What has been included in past Breaking Changes?
 
+* [2022 Aug 27](ChangeLog/20220827.md)
 * [2022 May 28](ChangeLog/20220528.md)
 * [2022 Feb 26](ChangeLog/20220226.md)
 * [2021 Nov 27](ChangeLog/20211127.md)
@@ -22,18 +23,18 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for August 27, 2022.
+The next Breaking Change is scheduled for November 26, 2022.
 
 ### Important Dates
 
-* 2022 May 28 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2022 Jul 31 - `develop` closed to new PR's.
-* 2022 Jul 31 - Call for testers.
-* 2022 Aug 13 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2022 Aug 20 - `develop` is locked, only critical bugfix PR's merged.
-* 2022 Aug 25 - `master` is locked, no PR's merged.
-* 2022 Aug 27 - Merge `develop` to `master`.
-* 2022 Aug 27 - `master` is unlocked. PR's can be merged again.
+* 2022 Aug 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2022 Oct 29 - `develop` closed to new PR's.
+* 2022 Oct 29 - Call for testers.
+* 2022 Nov 12 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2022 Nov 19 - `develop` is locked, only critical bugfix PR's merged.
+* 2022 Nov 24 - `master` is locked, no PR's merged.
+* 2022 Nov 26 - Merge `develop` to `master`.
+* 2022 Nov 26 - `master` is unlocked. PR's can be merged again.
 
 ## What changes will be included?
 
@@ -44,7 +45,7 @@ If you want your breaking change to be included in this round you need to create
 Criteria for acceptance:
 
 * The PR is complete and ready to merge
-* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20220827`.
+* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20221126`.
     * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PR's ID.
     * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability.
 
@@ -110,7 +111,7 @@ This happens immediately after the previous `develop` branch is merged to `maste
     * `git pull --ff-only`
     * `git merge --no-ff master`
     * Edit `readme.md`
-        * Add a big notice at the top that this is a testing branch.
+        * Add a big notice at the top that this is a testing branch. See previous revisions of the `develop` branch.
         * Include a link to this document
     * `git commit -m 'Branch point for <DATE> Breaking Change'`
     * `git tag breakpoint_<YYYY>_<MM>_<DD>`
@@ -121,15 +122,19 @@ This happens immediately after the previous `develop` branch is merged to `maste
     * Validate each submodule SHA1 matches the qmk fork, e.g. for ChibiOS:
         * Go to [qmk/ChibiOS](https://github.com/qmk/ChibiOS)
         * Compare the commit hash in the above output to the commit hash in the repository
-        * If there's a mismatch:
+        * If there's a mismatch, that repository needs to have its `master` branch updated to match (otherwise Configurator won't work):
             * `cd lib/chibios`
             * `git fetch --all`
             * `git checkout master`
             * `git reset --hard <commit hash>`
             * `git push origin master --force-with-lease`
 
+* Announce that both `master` and `develop` are now unlocked -- message `@Breaking Changes Updates` on `#qmk_firmware` in Discord:
+    * `@Breaking Changes Updates -- Hey folks, develop has now been merged into master -- newest batch of changes are now available for everyone to use!`
+
 * (Optional) [update ChibiOS + ChibiOS-Contrib on `develop`](chibios_upgrade_instructions.md)
 
+
 ### Set up Discord events for the next cycle
 
 * Update this file with the new dates: `docs/breaking_changes.md`
diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
index 4c38456e94..38af505701 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.
 
+* [2022 Aug 27](ChangeLog/20220827.md) - version 0.18.0
 * [2022 May 28](ChangeLog/20220528.md) - version 0.17.0
 * [2022 Feb 26](ChangeLog/20220226.md) - version 0.16.0
 * [2021 Nov 27](ChangeLog/20211127.md) - version 0.15.0
diff --git a/readme.md b/readme.md
index 63b483c744..5649ddfa09 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,3 @@
-# This is the `develop` branch!
-
-See the [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) document for more information.
-
 # Quantum Mechanical Keyboard Firmware
 
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)

From 1258fdb9eeb4a6d6c2edeeb77e56da10fa525376 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 28 Aug 2022 14:27:52 +1000
Subject: [PATCH 237/959] Branch point for 2022 Nov 26 Breaking Change

---
 readme.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/readme.md b/readme.md
index 5649ddfa09..c2fcda103e 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,7 @@
+# THIS IS THE DEVELOP BRANCH
+
+Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
+
 # Quantum Mechanical Keyboard Firmware
 
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)

From efdd4f4d50e09e0f71d09333d15acf197406a09c Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 27 Aug 2022 23:13:44 -0700
Subject: [PATCH 238/959] Clean-up of `#define _ADJUST 16` instances (#18182)

* enum layer_names: 40percentclub/nori default keymap

* enum layer_names: ergotravel default keymap

* enum layer_names: handwired/atreus50 default keymap

* enum layer_names: handwired/ortho5x13 default keymap

* enum layer_names: keebio/levinson default keymap

* enum layer_names: keebio/nyquist default keymap

* enum layer_names: keebio/rorschach default keymap

* enum layer_names: keebio/viterbi default keymap

* enum layer_names: keebio/wavelet default keymap

* enum layer_names: lets_split default keymap

* enum layer_names: maple_computing/launchpad reference keymaps

Update `default` and `default_rgb` keymaps.

* enum layer_names: maple_computing/minidox default keymap

* enum layer_names: miniaxe reference keymaps

Update `default` and `underglow` keymaps.

* enum layer_names: omkbd/ergodash/mini default keymap

* enum layer_names: omkbd/ergodash/rev1 default keymap

* enum layer_names: orthodox default keymap

* enum layer_names: unikeyboard/divergetm2 default keymap

* enum layer_names: woodkeys/scarletbandana default keymap

* add _Static_assert to keymap_introspection.c
---
 .../40percentclub/nori/keymaps/default/keymap.c  | 14 ++++++++------
 keyboards/ergotravel/keymaps/default/keymap.c    | 14 ++++++++------
 .../handwired/atreus50/keymaps/default/keymap.c  | 16 +++++++++-------
 .../handwired/ortho5x13/keymaps/default/keymap.c | 14 ++++++++------
 .../keebio/levinson/keymaps/default/keymap.c     | 14 ++++++++------
 .../keebio/nyquist/keymaps/default/keymap.c      | 14 ++++++++------
 .../keebio/rorschach/keymaps/default/keymap.c    | 10 ++++++----
 .../keebio/viterbi/keymaps/default/keymap.c      | 10 ++++++----
 .../keebio/wavelet/keymaps/default/keymap.c      | 14 ++++++++------
 keyboards/lets_split/keymaps/default/keymap.c    | 14 ++++++++------
 .../launchpad/keymaps/default/keymap.c           |  7 ++++---
 .../launchpad/keymaps/default_rgb/keymap.c       |  8 +++++---
 .../minidox/keymaps/default/keymap.c             | 10 ++++++----
 keyboards/miniaxe/keymaps/default/keymap.c       | 10 ++++++----
 keyboards/miniaxe/keymaps/underglow/keymap.c     | 10 ++++++----
 .../omkbd/ergodash/mini/keymaps/default/keymap.c | 10 ++++++----
 .../omkbd/ergodash/rev1/keymaps/default/keymap.c | 10 ++++++----
 keyboards/orthodox/keymaps/default/keymap.c      | 14 ++++++++------
 .../divergetm2/keymaps/default/keymap.c          | 14 ++++++++------
 .../scarletbandana/keymaps/default/keymap.c      | 14 ++++++++------
 quantum/keymap_introspection.c                   |  2 ++
 21 files changed, 142 insertions(+), 101 deletions(-)

diff --git a/keyboards/40percentclub/nori/keymaps/default/keymap.c b/keyboards/40percentclub/nori/keymaps/default/keymap.c
index 25d5c89af3..f7760a268f 100644
--- a/keyboards/40percentclub/nori/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/nori/keymaps/default/keymap.c
@@ -4,12 +4,14 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/ergotravel/keymaps/default/keymap.c b/keyboards/ergotravel/keymaps/default/keymap.c
index 7c96296a16..2a43968814 100644
--- a/keyboards/ergotravel/keymaps/default/keymap.c
+++ b/keyboards/ergotravel/keymaps/default/keymap.c
@@ -1,10 +1,12 @@
 #include QMK_KEYBOARD_H
 
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
@@ -39,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_RAISE] = LAYOUT(
- 
+
   KC_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,     _______,          _______,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
   _______, KC_4,    KC_5,  KC_6,   KC_PLUS, _______,  _______,          _______,   _______,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   KC_ENT,  KC_7,    KC_8,  KC_9,   KC_MINS, _______,  _______,          _______,   _______,   KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
   _______, KC_COMM, KC_0,  KC_DOT, _______, KC_BSPC,                                 KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  
+
   ),
 
   [_ADJUST] = LAYOUT(
diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c
index 68724c0506..52a450c3a0 100644
--- a/keyboards/handwired/atreus50/keymaps/default/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/default/keymap.c
@@ -4,13 +4,15 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // 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 _MOVEMENT 5
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _MOVEMENT,
+    _ADJUST,
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
index 39ae1872a2..aeecfa1d8e 100644
--- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
@@ -4,12 +4,14 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/keebio/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c
index ed4c7243d1..72da4addc3 100644
--- a/keyboards/keebio/levinson/keymaps/default/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/default/keymap.c
@@ -5,12 +5,14 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/keebio/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c
index 03de74a80d..a06cde9555 100644
--- a/keyboards/keebio/nyquist/keymaps/default/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c
@@ -5,12 +5,14 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/keebio/rorschach/keymaps/default/keymap.c b/keyboards/keebio/rorschach/keymaps/default/keymap.c
index 00f2a9cffb..c1efce8f2b 100644
--- a/keyboards/keebio/rorschach/keymaps/default/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/default/keymap.c
@@ -1,10 +1,12 @@
 #include QMK_KEYBOARD_H
 
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 #define LOWER MO(_LOWER)
 #define RAISE MO(_RAISE)
diff --git a/keyboards/keebio/viterbi/keymaps/default/keymap.c b/keyboards/keebio/viterbi/keymaps/default/keymap.c
index 1db80b7452..d23ebe6797 100644
--- a/keyboards/keebio/viterbi/keymaps/default/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/default/keymap.c
@@ -5,10 +5,12 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/keebio/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c
index ed4c7243d1..72da4addc3 100644
--- a/keyboards/keebio/wavelet/keymaps/default/keymap.c
+++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c
@@ -5,12 +5,14 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c
index bc240b5f00..34b470d533 100644
--- a/keyboards/lets_split/keymaps/default/keymap.c
+++ b/keyboards/lets_split/keymaps/default/keymap.c
@@ -4,12 +4,14 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/maple_computing/launchpad/keymaps/default/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default/keymap.c
index 62dee131f8..efd67e8c1b 100644
--- a/keyboards/maple_computing/launchpad/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/default/keymap.c
@@ -6,9 +6,10 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // 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 _FUNC 15
+enum layer_names {
+    _QWERTY,
+    _FUNC
+};
 
 // Defines for task manager and such
 #define CALTDEL LCTL(LALT(KC_DEL))
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
index 529fa91f65..69fb3ce561 100644
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
@@ -7,9 +7,11 @@ extern keymap_config_t keymap_config;
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // 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 _RGB 1
-#define _FUNC 15
+enum layer_names {
+    _QWERTY,
+    _RGB,
+    _FUNC
+};
 
 // Defines for task manager and such
 #define CALTDEL LCTL(LALT(KC_DEL))
diff --git a/keyboards/maple_computing/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
index 7886eec172..d71e5b6e55 100644
--- a/keyboards/maple_computing/minidox/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
@@ -5,10 +5,12 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/miniaxe/keymaps/default/keymap.c b/keyboards/miniaxe/keymaps/default/keymap.c
index 45e1e131e8..81f8004e69 100644
--- a/keyboards/miniaxe/keymaps/default/keymap.c
+++ b/keyboards/miniaxe/keymaps/default/keymap.c
@@ -16,10 +16,12 @@
 #include QMK_KEYBOARD_H
 
 // Defines the keycodes used by our macros in process_record_user
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/miniaxe/keymaps/underglow/keymap.c b/keyboards/miniaxe/keymaps/underglow/keymap.c
index 2cadbb824f..31a7ccddf9 100644
--- a/keyboards/miniaxe/keymaps/underglow/keymap.c
+++ b/keyboards/miniaxe/keymaps/underglow/keymap.c
@@ -16,10 +16,12 @@
 #include QMK_KEYBOARD_H
 
 // Defines the keycodes used by our macros in process_record_user
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
index 1d18383652..d1016ecc5d 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
+++ b/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
@@ -1,10 +1,12 @@
 #include QMK_KEYBOARD_H
 
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
index c5e0a30147..0251700433 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
@@ -1,10 +1,12 @@
 #include QMK_KEYBOARD_H
 
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/orthodox/keymaps/default/keymap.c b/keyboards/orthodox/keymaps/default/keymap.c
index 1e06d7106d..3ad20a288a 100644
--- a/keyboards/orthodox/keymaps/default/keymap.c
+++ b/keyboards/orthodox/keymaps/default/keymap.c
@@ -25,12 +25,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
index e4ba788b70..d4f38e4a19 100644
--- a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
+++ b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
@@ -22,12 +22,14 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
index 707e9fa132..b9cf12cd7e 100644
--- a/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
@@ -20,12 +20,14 @@
 extern rgblight_config_t rgblight_config;
 #endif
 
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c
index 7a96f802ef..179b5eb037 100644
--- a/quantum/keymap_introspection.c
+++ b/quantum/keymap_introspection.c
@@ -17,6 +17,8 @@ uint8_t keymap_layer_count(void) {
     return NUM_KEYMAP_LAYERS;
 }
 
+_Static_assert(NUM_KEYMAP_LAYERS <= MAX_LAYER, "Number of keymap layers exceeds maximum set by LAYER_STATE_(8|16|32)BIT");
+
 #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
 
 #    define NUM_ENCODERMAP_LAYERS ((uint8_t)(sizeof(encoder_map) / ((NUM_ENCODERS) * (2) * sizeof(uint16_t))))

From ef0c87c976ff298f2e34e417808ed816f7ecb0b5 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 29 Aug 2022 00:59:07 +0800
Subject: [PATCH 239/959] Exclude uf2 files in VS Code (#18186)

---
 .vscode/settings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5fedaf477b..76117e52e0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,7 +6,8 @@
     "files.exclude": {
         "**/.build": true,
         "**/*.hex": true,
-        "**/*.bin": true
+        "**/*.bin": true,
+        "**/*.uf2": true
     },
     "files.associations": {
         "*.h": "c",

From d983251c10c4bb152c746dc4e94bc954b1b82c8c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 29 Aug 2022 02:59:40 +1000
Subject: [PATCH 240/959] Switch over MANUFACTURER and PRODUCT to string
 literals (#18183)

---
 data/mappings/info_config.json                |   4 +-
 docs/config_options.md                        |   6 +-
 .../gherkin/keymaps/mjt/config.h              |   3 +-
 .../mf68/keymaps/68keys/config.h              |   4 +-
 .../mf68/keymaps/delivrance/config.h          |   4 +-
 .../charybdis/3x5/keymaps/drashna/config.h    |   2 +-
 .../pegasushoof/keymaps/citadel/config.h      |   2 +-
 .../crkbd/keymaps/julian_turner/config.h      |   2 +-
 keyboards/crkbd/keymaps/kidbrazil/config.h    |   2 +-
 keyboards/crkbd/keymaps/rpbaptist/config.h    |   2 +-
 keyboards/dz60/keymaps/LEdiodes/config.h      |  45 +-----
 .../satan/keymaps/admiralStrokers/config.h    |  86 +----------
 keyboards/gh60/satan/keymaps/ben_iso/config.h |  51 +------
 keyboards/gh60/satan/keymaps/fakb/config.h    |  74 +--------
 .../space65/keymaps/madhatter/config.h        |   2 +-
 .../arrow_pad/keymaps/pad_21/config.h         | 136 ++---------------
 .../arrow_pad/keymaps/pad_21/rules.mk         |   2 -
 .../arrow_pad/keymaps/pad_24/config.h         | 140 +-----------------
 .../arrow_pad/keymaps/pad_24/rules.mk         |   2 -
 keyboards/hhkb/ansi/keymaps/cinaeco/config.h  |  14 +-
 keyboards/hhkb/ansi/keymaps/mjt/config.h      |  70 +--------
 keyboards/hhkb/ansi/keymaps/shela/config.h    |   6 +-
 .../kbd67/hotswap/keymaps/madhatter/config.h  |   2 +-
 .../kbdfans/kbd67/rev2/keymaps/droxx/config.h |   4 +-
 .../kbd67/rev2/keymaps/tucznak/config.h       |   4 +-
 .../kbd75/keymaps/noroadsleft/config.h        |   5 -
 .../kbdfans/kbd75/keymaps/tucznak/config.h    |   4 +-
 .../kbdfans/niu_mini/keymaps/tucznak/config.h |   4 +-
 .../keebio/iris/keymaps/drashna/config.h      |   6 +-
 keyboards/keebio/iris/keymaps/pvinis/config.h |   2 +-
 keyboards/keebio/iris/keymaps/xyverz/config.h |  28 +---
 .../keebio/viterbi/keymaps/drashna/config.h   |   2 +-
 .../keyhive/ut472/keymaps/tucznak/config.h    |   4 +-
 keyboards/massdrop/alt/config.h               |   2 -
 keyboards/massdrop/alt/info.json              |   3 +-
 keyboards/massdrop/ctrl/config.h              |   2 -
 keyboards/massdrop/ctrl/info.json             |   3 +-
 .../moonlander/keymaps/jjerrell/config.h      |   2 +-
 .../splitreus62/keymaps/scheiklp/config.h     |  31 ----
 keyboards/orthodox/keymaps/drashna/config.h   |   4 +-
 .../keymaps/handwired_binaryplease/config.h   |   4 +-
 keyboards/preonic/keymaps/kinesis/config.h    |  78 +---------
 keyboards/preonic/keymaps/zach/config.h       |  82 +---------
 .../prime_e/keymaps/madhatter/config.h        |   2 +-
 keyboards/sofle/keymaps/flare576/config.h     |   2 +-
 keyboards/tanuki/keymaps/tucznak/config.h     |  11 +-
 .../wt75_b/keymaps/madhatter/config.h         |   2 +-
 keyboards/xiudi/xd75/keymaps/mtdjr/config.h   |   3 +-
 .../ymd96/keymaps/AnthonyWharton/config.h     |  25 +---
 layouts/community/ergodox/drashna/config.h    |   2 +-
 layouts/community/ergodox/jjerrell/config.h   |   2 +-
 .../community/ergodox/meagerfindings/config.h |   4 +-
 layouts/community/numpad_5x6/drashna/config.h |   2 +-
 layouts/community/ortho_4x12/drashna/config.h |   6 +-
 .../community/ortho_4x12/jjerrell/config.h    |   2 +-
 .../community/split_3x6_3/bbaserdem/config.h  |   4 +-
 .../community/split_3x6_3/drashna/config.h    |   4 +-
 lib/python/qmk/tests/test_cli_commands.py     |   4 +-
 quantum/util.h                                |   3 -
 tmk_core/protocol/usb_descriptor.c            |  12 +-
 tmk_core/protocol/vusb/vusb.c                 |  12 +-
 tmk_core/protocol/vusb/vusb.h                 |   2 -
 users/spidey3/config.h                        |   2 +-
 63 files changed, 113 insertions(+), 928 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 582b5149ea..d0f67f4e3a 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -40,7 +40,7 @@
     "LED_COMPOSE_PIN": {"info_key": "indicators.compose"},
     "LED_KANA_PIN": {"info_key": "indicators.kana"},
     "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"},
-    "MANUFACTURER": {"info_key": "manufacturer"},
+    "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str"},
     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
     "MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"},
@@ -78,7 +78,7 @@
     "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"},
     "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},
     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
-    "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false},
+    "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"},
     "QMK_ESC_OUTPUT": {"info_key": "qmk_lufa_bootloader.esc_output"},
diff --git a/docs/config_options.md b/docs/config_options.md
index 3e011a5cc9..05e27a835c 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -39,11 +39,11 @@ This is a C header file that is one of the first things included, and will persi
   * defines your VID, and for most DIY projects, can be whatever you want
 * `#define PRODUCT_ID 0x5678`
   * defines your PID, and for most DIY projects, can be whatever you want
-* `#define DEVICE_VER 0`
+* `#define DEVICE_VER 0x0100`
   * defines the device version (often used for revisions)
-* `#define MANUFACTURER Me`
+* `#define MANUFACTURER "Me"`
   * generally who/whatever brand produced the board
-* `#define PRODUCT Board`
+* `#define PRODUCT "Board"`
   * the name of the keyboard
 * `#define MATRIX_ROWS 5`
   * the number of rows in your keyboard's matrix
diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/config.h b/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
index ce9d5ab2ae..5a295a06ca 100644
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
-/* USB Device descriptor parameter */
 #undef MANUFACTURER
-#define MANUFACTURER    Some Guy
+#define MANUFACTURER    "Some Guy"
diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/config.h b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
index 651c17069d..66e7bbed99 100644
--- a/keyboards/40percentclub/mf68/keymaps/68keys/config.h
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
@@ -9,5 +9,5 @@
 #define VENDOR_ID 0xFEED
 #define PRODUCT_ID 0x0A0C
 #define DEVICE_VER 0x0068
-#define MANUFACTURER 68Keys.io
-#define PRODUCT The 68Keys.io Keyboard
+#define MANUFACTURER "68Keys.io"
+#define PRODUCT "The 68Keys.io Keyboard"
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/config.h b/keyboards/40percentclub/mf68/keymaps/delivrance/config.h
index 7ae8805765..50c64b4b51 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/config.h
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/config.h
@@ -21,10 +21,10 @@
 #pragma once
 
 #undef MANUFACTURER
-#define MANUFACTURER Dan
+#define MANUFACTURER "Dan"
 
 #undef PRODUCT
-#define PRODUCT Magicforce 68 QMK
+#define PRODUCT "Magicforce 68 QMK"
 
 #undef BACKLIGHT_LEVELS
 #define BACKLIGHT_LEVELS 20
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
index 39204a3667..f3e8f83b2a 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #undef PRODUCT
-#define PRODUCT Charybdis Nano (Blackpill)
+#define PRODUCT "Charybdis Nano (Blackpill)"
 
 #undef MATRIX_ROW_PINS
 #define MATRIX_ROW_PINS \
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h b/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h
index 122627e88f..9ff01f7e84 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h
+++ b/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h
@@ -3,4 +3,4 @@
 /* overridden settings: */
 
 #undef PRODUCT
-#define PRODUCT Pegasus Hoof Citadel
+#define PRODUCT "Pegasus Hoof Citadel"
diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h
index cf3e80b23e..fbe5277c40 100644
--- a/keyboards/crkbd/keymaps/julian_turner/config.h
+++ b/keyboards/crkbd/keymaps/julian_turner/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #undef MANUFACTURER
-#define MANUFACTURER Trner
+#define MANUFACTURER "Trner"
 
 /* Select hand configuration */
 #define MASTER_LEFT
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
index 2801436709..fefb8eb0ee 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ b/keyboards/crkbd/keymaps/kidbrazil/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 150
 #undef PRODUCT
-#define PRODUCT         CRKBD Loose Transistor Ed.
+#define PRODUCT         "CRKBD Loose Transistor Ed."
 
 #ifdef RGBLIGHT_ENABLE
     //#undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 994aef314e..fd53b57c68 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -131,7 +131,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_ONESHOT
 
 #undef PRODUCT
-#define PRODUCT Corne Keyboard
+#define PRODUCT "Corne Keyboard"
 
 #define LCPC_KEYS KC_LCTL, KC_LSFT, KC_9
 #define RCPC_KEYS KC_RCTL, KC_RSFT, KC_0
diff --git a/keyboards/dz60/keymaps/LEdiodes/config.h b/keyboards/dz60/keymaps/LEdiodes/config.h
index e5ead20c12..bb6c5c55e4 100644
--- a/keyboards/dz60/keymaps/LEdiodes/config.h
+++ b/keyboards/dz60/keymaps/LEdiodes/config.h
@@ -1,48 +1,5 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x2260
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KBDFans
-#define PRODUCT         DZ60
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* number of backlight levels */
-#define BACKLIGHT_PIN B6
-#define BACKLIGHT_LEVELS 5
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
+#pragma once
 
 /* sets 'Auto Shift' timeouts */
 #define AUTO_SHIFT_TIMEOUT 150
 #define NO_AUTO_SHIFT_SPECIAL
-
-#endif
diff --git a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
index 5bb9bd59a8..60c6ad4a12 100644
--- a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
+++ b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
@@ -1,87 +1,3 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H_ADMSTROK
-#define CONFIG_H_ADMSTROK
-
-#include "config_common.h"
-#include "../../config.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    SATAN
-#define PRODUCT         GH60
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-
-#define BACKLIGHT_PIN B6
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* 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
-
-/* Backlight configuration */
-#define BACKLIGHT_LEVELS 4
-
-/* Underlight configuration */
-#define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 8     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
+#pragma once
 
 #define DISABLE_SPACE_CADET_ROLLOVER
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/config.h b/keyboards/gh60/satan/keymaps/ben_iso/config.h
index e59015dcbd..34add12727 100644
--- a/keyboards/gh60/satan/keymaps/ben_iso/config.h
+++ b/keyboards/gh60/satan/keymaps/ben_iso/config.h
@@ -1,57 +1,8 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H_BEN
-#define CONFIG_H_BEN
-
-#include "config_common.h"
-#include "../../config.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    SATAN
-#define PRODUCT         GH60
+#pragma once
 
 /*MOUSE CONFIG OPTIONS */
-
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
 #define MOUSEKEY_TIME_TO_MAX    45
 #define MOUSEKEY_MAX_SPEED      3
 #define MOUSEKEY_WHEEL_DELAY 	0
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/gh60/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
index 720b359c1e..f7314a8671 100644
--- a/keyboards/gh60/satan/keymaps/fakb/config.h
+++ b/keyboards/gh60/satan/keymaps/fakb/config.h
@@ -1,76 +1,9 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    SATAN
-#define PRODUCT         GH60
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-
-#define BACKLIGHT_PIN B6
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* 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
-
-/* Backlight configuration
- */
+#undef BACKLIGHT_LEVELS
 #define BACKLIGHT_LEVELS 8
 
-/* Underlight configuration
- */
-
-#define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 8     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#endif
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
 
 #define MOUSEKEY_DELAY             0
 #define MOUSEKEY_INTERVAL          1
@@ -79,8 +12,5 @@
 #define MOUSEKEY_WHEEL_MAX_SPEED   1
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 255
 
-// only change
 #undef RGB_DI_PIN
 #define RGB_DI_PIN B2
-
-#endif
diff --git a/keyboards/gray_studio/space65/keymaps/madhatter/config.h b/keyboards/gray_studio/space65/keymaps/madhatter/config.h
index e297ebedc5..b591b6d76f 100644
--- a/keyboards/gray_studio/space65/keymaps/madhatter/config.h
+++ b/keyboards/gray_studio/space65/keymaps/madhatter/config.h
@@ -1,4 +1,4 @@
 #pragma once
 
 #undef PRODUCT
-#define PRODUCT MadHatter\x27s Custom Spacc
+#define PRODUCT "MadHatter's Custom Spacc"
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h b/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h
index 1f07965555..0bff14a28d 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/config.h
@@ -15,137 +15,25 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
+#undef VENDOR_ID
+#undef PRODUCT_ID
+#undef DEVICE_VER
+#undef MANUFACTURER
+#undef PRODUCT
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x4097
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Nobody
-#define PRODUCT         Arrow Pad 21
+#define MANUFACTURER    "Nobody"
+#define PRODUCT         "Arrow Pad 21"
 
-/* key matrix size */
+#undef MATRIX_ROWS
+#undef MATRIX_COLS
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 11
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
+#undef MATRIX_ROW_PINS
+#undef MATRIX_COL_PINS
 #define MATRIX_ROW_PINS { D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* 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
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk b/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk
index 6fae940a50..d3e5864916 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/rules.mk
@@ -10,5 +10,3 @@ 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. 
-
-CONFIG_H = keymaps/$(KEYMAP)/config.h
\ No newline at end of file
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h b/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h
index 4bc89f5ce7..3f9997b380 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/config.h
@@ -15,139 +15,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
+#undef VENDOR_ID
+#undef PRODUCT_ID
+#undef DEVICE_VER
+#undef MANUFACTURER
+#undef PRODUCT
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x4096
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Nobody
-#define PRODUCT         Arrow Pad 24
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3 }
-
-#define BACKLIGHT_PIN B7
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* 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
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
+#define MANUFACTURER    "Nobody"
+#define PRODUCT         "Arrow Pad 24"
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk b/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk
index 1cf01b79e4..d7fdd82dfe 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/rules.mk
@@ -10,5 +10,3 @@ 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. 
-
-CONFIG_H = keymaps/$(KEYMAP)/config.h
\ No newline at end of file
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h
index 1c714deca4..ed660722c2 100644
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h
+++ b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h
@@ -1,18 +1,10 @@
-#ifndef CONFIG_CINAECO_H
-#define CONFIG_CINAECO_H
-
-#include "../../config.h"
+#pragma once
 
 #undef MANUFACTURER
 #undef PRODUCT
-#define MANUFACTURER    QMK
-#define PRODUCT         HHKB QMK cinaeco
+#define MANUFACTURER    "QMK"
+#define PRODUCT         "HHKB QMK cinaeco"
 
 // Increase "Tap" detection window. Avoid missing 'q' or 'z' when typing slowly.
 #undef TAPPING_TERM
 #define TAPPING_TERM 230
-
-// Uncomment to enable NKRO by default. May cause issues with KVM switches.
-//#define FORCE_NKRO
-
-#endif
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/config.h b/keyboards/hhkb/ansi/keymaps/mjt/config.h
index b98ec52311..41d1557c6f 100644
--- a/keyboards/hhkb/ansi/keymaps/mjt/config.h
+++ b/keyboards/hhkb/ansi/keymaps/mjt/config.h
@@ -1,71 +1,3 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xCAFE
-#define DEVICE_VER      0x0104
-#define MANUFACTURER    q.m.k
-#define PRODUCT         HHKB mod
-
-/* key matrix size */
-#ifdef HHKB_JP
-#   define MATRIX_ROWS 16
-#else
-#   define MATRIX_ROWS 8
-#endif
-#define MATRIX_COLS 8
-
-#define TAPPING_TERM    200
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
+#pragma once
 
 #define USB_MAX_POWER_CONSUMPTION 50
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE    5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
-*/
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/hhkb/ansi/keymaps/shela/config.h b/keyboards/hhkb/ansi/keymaps/shela/config.h
index 25794900c3..db66659165 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/config.h
+++ b/keyboards/hhkb/ansi/keymaps/shela/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "../../config.h"
-
 /* USB Device descriptor parameter */
 #undef VENDOR_ID
 #define VENDOR_ID 0x0853
@@ -26,9 +24,9 @@
 #undef DEVICE_VER
 #define DEVICE_VER 0x0102
 #undef MANUFACTURER
-#define MANUFACTURER Topre Corporation
+#define MANUFACTURER "Topre Corporation"
 #undef PRODUCT
-#define PRODUCT HHKB Professional
+#define PRODUCT "HHKB Professional"
 
 #undef TAPPING_TERM
 #define TAPPING_TERM 210
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/config.h
index bf28016ea4..798dd7b297 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/config.h
@@ -17,4 +17,4 @@
 #pragma once
 
 #undef PRODUCT
-#define PRODUCT MadHatter\x27s Hotswap Kbd67 rev1
+#define PRODUCT "MadHatter's Hotswap Kbd67 rev1"
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
index 911051c31a..f6aa35176a 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef PRODUCT
 
 #define VENDOR_ID       0xAF88
-#define MANUFACTURER    Droxx-FurFuzz
-#define PRODUCT         Carbon v2 4rk
+#define MANUFACTURER    "Droxx-FurFuzz"
+#define PRODUCT         "Carbon v2 4rk"
 
 /* force N key rollover even on startup regardless of EEPROM setting */
 #define FORCE_NKRO
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
index e387c84b2f..234a44ae70 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
@@ -3,8 +3,8 @@
 #undef MANUFACTURER
 #undef PRODUCT
 
-#define MANUFACTURER    Potato Inc.
-#define PRODUCT         Qt3.14
+#define MANUFACTURER    "Potato Inc."
+#define PRODUCT         "Qt3.14"
 
 /* send tap key if no layer key was used even after tap delay */
 #define TAPPING_TERM 50
diff --git a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/config.h b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/config.h
index 73bb22aea4..0b28746081 100644
--- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/config.h
+++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#undef MANUFACTURER
-#undef PRODUCT
-#define MANUFACTURER    KBDfans
-#define PRODUCT         KBD75 rev1
-
 #define BACKLIGHT_BREATHING
 
 #define ANSI_NUBS_ROW 4
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
index a5578b235f..dd05076444 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
@@ -3,8 +3,8 @@
 #undef MANUFACTURER
 #undef PRODUCT
 
-#define MANUFACTURER    Potato Inc.
-#define PRODUCT         Qt3.14
+#define MANUFACTURER    "Potato Inc."
+#define PRODUCT         "Qt3.14"
 
 /* send tap key if no layer key was used even after tap delay */
 #define TAPPING_TERM 250
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
index 429955b3a0..cfcda1bf7d 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
@@ -3,8 +3,8 @@
 #undef MANUFACTURER
 #undef PRODUCT
 
-#define MANUFACTURER    Potato Inc.
-#define PRODUCT         Qt3.14
+#define MANUFACTURER    "Potato Inc."
+#define PRODUCT         "Qt3.14"
 
 /* turn off RGB when computer sleeps */
 #ifdef RGB_DI_PIN
diff --git a/keyboards/keebio/iris/keymaps/drashna/config.h b/keyboards/keebio/iris/keymaps/drashna/config.h
index cf67aa6984..0569f30744 100644
--- a/keyboards/keebio/iris/keymaps/drashna/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna/config.h
@@ -51,11 +51,11 @@
 
 #undef PRODUCT
 #if defined(KEYBOARD_keebio_iris_rev2)
-#    define PRODUCT Drashna Hacked Iris Rev 2
+#    define PRODUCT "Drashna Hacked Iris Rev 2"
 #elif defined(KEYBOARD_keebio_iris_rev3)
-#    define PRODUCT Drashna Hacked Iris Rev 3
+#    define PRODUCT "Drashna Hacked Iris Rev 3"
 #elif defined(KEYBOARD_keebio_iris_rev4)
-#    define PRODUCT Drashna Hacked Iris Rev 4
+#    define PRODUCT "Drashna Hacked Iris Rev 4"
 #endif
 
 #define SHFT_LED1 6
diff --git a/keyboards/keebio/iris/keymaps/pvinis/config.h b/keyboards/keebio/iris/keymaps/pvinis/config.h
index c2870eba0b..19925d3a91 100644
--- a/keyboards/keebio/iris/keymaps/pvinis/config.h
+++ b/keyboards/keebio/iris/keymaps/pvinis/config.h
@@ -2,7 +2,7 @@
 
 #ifdef PRODUCT
 #    undef PRODUCT
-#    define PRODUCT Iris Keyboard - pvinis
+#    define PRODUCT "Iris Keyboard - pvinis"
 #endif
 
 // Use I2C or Serial, not both.
diff --git a/keyboards/keebio/iris/keymaps/xyverz/config.h b/keyboards/keebio/iris/keymaps/xyverz/config.h
index d3fc22ca76..fab8591844 100644
--- a/keyboards/keebio/iris/keymaps/xyverz/config.h
+++ b/keyboards/keebio/iris/keymaps/xyverz/config.h
@@ -1,33 +1,13 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
+#pragma once
 
 #define USE_SERIAL
 #define EE_HANDS
 
 #undef PRODUCT
-#define PRODUCT Iris Keyboard
+#define PRODUCT "Iris Keyboard"
 
 #undef MANUFACTURER
-#define MANUFACTURER Ian Sterling
+#define MANUFACTURER "Ian Sterling"
 
 #undef RGBLED_NUM
 #define RGBLIGHT_ANIMATIONS
@@ -35,5 +15,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/config.h b/keyboards/keebio/viterbi/keymaps/drashna/config.h
index 2decb3b3e9..cd640ec8d5 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/config.h
+++ b/keyboards/keebio/viterbi/keymaps/drashna/config.h
@@ -31,7 +31,7 @@
 #endif  // RGBLIGHT_ENABLE
 
 #undef PRODUCT
-#define PRODUCT Drashnas Viterbi Macro Pad
+#define PRODUCT "Drashnas Viterbi Macro Pad"
 
 #ifdef AUDIO_ENABLE
 #    define AUDIO_PIN C6
diff --git a/keyboards/keyhive/ut472/keymaps/tucznak/config.h b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
index b3d402337a..bc3587f542 100644
--- a/keyboards/keyhive/ut472/keymaps/tucznak/config.h
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
@@ -3,8 +3,8 @@
 #undef MANUFACTURER
 #undef PRODUCT
 
-#define MANUFACTURER    Potato Inc.
-#define PRODUCT         Qt3.14
+#define MANUFACTURER    "Potato Inc."
+#define PRODUCT         "Qt3.14"
 
 /* turn off RGB when computer sleeps */
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h
index 2a3b5b3311..364e8325b1 100644
--- a/keyboards/massdrop/alt/config.h
+++ b/keyboards/massdrop/alt/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define MANUFACTURER        "Massdrop Inc."
-#define PRODUCT             "ALT Keyboard"
 #define SERIAL_NUM          "Unavailable"
 
 /* key matrix size */
diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json
index 909ca8904a..6e87648d95 100644
--- a/keyboards/massdrop/alt/info.json
+++ b/keyboards/massdrop/alt/info.json
@@ -1,5 +1,6 @@
 {
-    "keyboard_name": "ALT",
+    "keyboard_name": "ALT Keyboard",
+    "manufacturer": "Massdrop Inc.",
     "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard",
     "maintainer": "Massdrop",
     "usb": {
diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h
index 8b8625e700..77967e17d3 100644
--- a/keyboards/massdrop/ctrl/config.h
+++ b/keyboards/massdrop/ctrl/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define MANUFACTURER        "Massdrop Inc."
-#define PRODUCT             "CTRL Keyboard"
 #define SERIAL_NUM          "Unavailable"
 
 /* key matrix size */
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
index 7d0810c630..34c60ca088 100644
--- a/keyboards/massdrop/ctrl/info.json
+++ b/keyboards/massdrop/ctrl/info.json
@@ -1,5 +1,6 @@
 {
-    "keyboard_name": "CTRL",
+    "keyboard_name": "CTRL Keyboard",
+    "manufacturer": "Massdrop Inc.",
     "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",
     "maintainer": "Massdrop",
     "usb": {
diff --git a/keyboards/moonlander/keymaps/jjerrell/config.h b/keyboards/moonlander/keymaps/jjerrell/config.h
index 1fd17fbbe3..aa4bf3885e 100644
--- a/keyboards/moonlander/keymaps/jjerrell/config.h
+++ b/keyboards/moonlander/keymaps/jjerrell/config.h
@@ -22,6 +22,6 @@
 #define ORYX_CONFIGURATOR
 
 #undef PRODUCT
-#define PRODUCT         Moonlander Mark I - Modified by <@jjerrell>
+#define PRODUCT         "Moonlander Mark I - Modified by <@jjerrell>"
 
 #define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/nacly/splitreus62/keymaps/scheiklp/config.h b/keyboards/nacly/splitreus62/keymaps/scheiklp/config.h
index 04af418d8f..da8287df64 100644
--- a/keyboards/nacly/splitreus62/keymaps/scheiklp/config.h
+++ b/keyboards/nacly/splitreus62/keymaps/scheiklp/config.h
@@ -18,37 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xBEEF
-#define PRODUCT_ID      0xFED0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    NaCly
-#define PRODUCT         Splitreus62
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, D1, D4, C6, D7 }
-#define MATRIX_COL_PINS { E6, B4, B5, B6, B2, B3 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define SPLIT_HAND_PIN F4
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
-/* 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 AUTO_SHIFT_TIMEOUT 100
 #define NO_AUTO_SHIFT_SPECIAL
 #define NO_AUTO_SHIFT_NUMERIC
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index e3a89bce6a..caa69821a0 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -58,9 +58,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef PRODUCT
 #ifdef KEYBOARD_orthodox_rev1
-#    define PRODUCT Drashna Hacked Orthodox Rev .1
+#    define PRODUCT "Drashna Hacked Orthodox Rev .1"
 #elif KEYBOARD_orthodox_rev3
-#    define PRODUCT Drashna Hacked Orthodox Rev .3
+#    define PRODUCT "Drashna Hacked Orthodox Rev .3"
 #endif
 
 #define QMK_ESC_OUTPUT D7  // usually COL
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/config.h b/keyboards/planck/keymaps/handwired_binaryplease/config.h
index abf9f5771f..065bc2d688 100644
--- a/keyboards/planck/keymaps/handwired_binaryplease/config.h
+++ b/keyboards/planck/keymaps/handwired_binaryplease/config.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #undef MANUFACTURER
-#define MANUFACTURER binaryplease
+#define MANUFACTURER "binaryplease"
 #undef PRODUCT
-#define PRODUCT      Teensy_Planck
+#define PRODUCT      "Teensy_Planck"
 
 #undef MATRIX_ROW_PINS
 #define MATRIX_ROW_PINS { D3, D2, D1, D0 }
diff --git a/keyboards/preonic/keymaps/kinesis/config.h b/keyboards/preonic/keymaps/kinesis/config.h
index eabce5e790..2e8585d0eb 100644
--- a/keyboards/preonic/keymaps/kinesis/config.h
+++ b/keyboards/preonic/keymaps/kinesis/config.h
@@ -1,58 +1,4 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6061
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ortholinear Keyboards
-#define PRODUCT         The Preonic Keyboard
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-
-#define BACKLIGHT_PIN B7
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+#pragma once
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D1
@@ -61,25 +7,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-#define TAPPING_TERM 200
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/preonic/keymaps/zach/config.h b/keyboards/preonic/keymaps/zach/config.h
index 37e85bf512..f5e4d2c204 100644
--- a/keyboards/preonic/keymaps/zach/config.h
+++ b/keyboards/preonic/keymaps/zach/config.h
@@ -1,85 +1,7 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6061
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ortholinear Keyboards
-#define PRODUCT         The Preonic Keyboard
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-
-#define BACKLIGHT_PIN B7
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
+#pragma once
 
 #define BACKLIGHT_BREATHING     // LED breathing
-/* number of backlight levels */
+#undef BACKLIGHT_LEVELS
 #define BACKLIGHT_LEVELS 5
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-//#define RGB_DI_PIN D1
-
-//#define RGBLED_NUM 28     // Number of LEDs
-//#define RGBLIGHT_HUE_STEP 10
-//#define RGBLIGHT_SAT_STEP 17
-//#define RGBLIGHT_VAL_STEP 17
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
 #define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-//#define DYNAMIC_MACRO_ENABLE    // Enable if you need to use the macro functionality
-//#define SPACE_CADET             // Parenthesis on L/R shift
-
-#endif
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/config.h b/keyboards/primekb/prime_e/keymaps/madhatter/config.h
index 8075bb73d5..3ec816d7ee 100644
--- a/keyboards/primekb/prime_e/keymaps/madhatter/config.h
+++ b/keyboards/primekb/prime_e/keymaps/madhatter/config.h
@@ -3,4 +3,4 @@
 #define TAPPING_TERM 150
 
 #undef PRODUCT
-#define PRODUCT MadHatter\x27s Custom Ilpse
+#define PRODUCT "MadHatter's Custom Ilpse"
diff --git a/keyboards/sofle/keymaps/flare576/config.h b/keyboards/sofle/keymaps/flare576/config.h
index c0f0a7d563..c89f38c127 100644
--- a/keyboards/sofle/keymaps/flare576/config.h
+++ b/keyboards/sofle/keymaps/flare576/config.h
@@ -37,4 +37,4 @@
 #define TAPPING_TERM 200
 
 #undef MANUFACTURER
-#define MANUFACTURER Flare576
+#define MANUFACTURER "Flare576"
diff --git a/keyboards/tanuki/keymaps/tucznak/config.h b/keyboards/tanuki/keymaps/tucznak/config.h
index 4f2a778ff2..37d42c0814 100644
--- a/keyboards/tanuki/keymaps/tucznak/config.h
+++ b/keyboards/tanuki/keymaps/tucznak/config.h
@@ -3,23 +3,16 @@
 #undef MANUFACTURER
 #undef PRODUCT
 
-#define MANUFACTURER    Potato Inc.
-#define PRODUCT         Trash Panda
+#define MANUFACTURER    "Potato Inc."
+#define PRODUCT         "Trash Panda"
 
 /* for bootloader */
 #define QMK_ESC_OUTPUT B2
 #define QMK_ESC_INPUT D0
 #define QMK_LED B0
 
-/* turn off RGB when computer sleeps */
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SLEEP
-#endif
-
 /* send tap key if no layer key was used even after tap delay */
-#ifdef TAPPING_TERM
 #undef TAPPING_TERM
-#endif
 #define TAPPING_TERM 250
 #define RETRO_TAPPING
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h
index afb1d86d6c..dc2a125b1e 100644
--- a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h
+++ b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h
@@ -1,4 +1,4 @@
 #pragma once
 
 #undef PRODUCT
-#define PRODUCT MadHatter\x27s Custom Singa V3
+#define PRODUCT "MadHatter's Custom Singa V3"
diff --git a/keyboards/xiudi/xd75/keymaps/mtdjr/config.h b/keyboards/xiudi/xd75/keymaps/mtdjr/config.h
index 3c8b17df1f..f70569b024 100644
--- a/keyboards/xiudi/xd75/keymaps/mtdjr/config.h
+++ b/keyboards/xiudi/xd75/keymaps/mtdjr/config.h
@@ -18,5 +18,4 @@
 
 // place overrides here
 #undef MANUFACTURER
-#define MANUFACTURER    mtdjr
-#define PRODUCT         XD75
+#define MANUFACTURER    "mtdjr"
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
index e730e99b27..27a2fcd6a7 100644
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
+++ b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
@@ -19,36 +19,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define VENDOR_ID       0x20A0
-#define PRODUCT_ID      0x422D
-// Edit usbconfig.h to change these.
-#define MANUFACTURER    ymdkey
-#define PRODUCT         ymd96
-
-/* Matrix Size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 15
-#define DIODE_DIRECTION COL2ROW
-
 /* Required for MX Locks installed */
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
-#define PREVENT_STUCK_MODIFIERS
-#define TAPPING_TOGGLE 3
-#define NO_UART 1
-
+#undef BACKLIGHT_LEVELS
 #define BACKLIGHT_LEVELS 12
 
-/* RGB Underglow  */
-// The RGB_DI_PING value seems to be shared between all PS2AVRGB boards.
-// The same pin is used on the JJ40, at least.
-#define RGBLED_NUM 18
-#define RGB_DI_PIN E2 // NOTE: for PS2AVRGB boards, underglow commands are send
-                      //       via I2C to 0xB0
-
-#define RGBLIGHT_ANIMATIONS
-
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1.0-2.7
 #define RGBLIGHT_EFFECT_BREATHE_MAX 255     // 1-255
 #define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h
index d669f27298..aa1d05779b 100644
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@@ -28,7 +28,7 @@
 #endif  // RGBLIGHT_ENABLE
 
 #undef PRODUCT
-#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Hybrid Monstrosity
+#define PRODUCT "DrashnaDox - Hacked ErgoDox EZ Hybrid Monstrosity"
 
 #undef DEBOUNCE
 #define DEBOUNCE 20
diff --git a/layouts/community/ergodox/jjerrell/config.h b/layouts/community/ergodox/jjerrell/config.h
index 8223108d15..6aeaef35ce 100644
--- a/layouts/community/ergodox/jjerrell/config.h
+++ b/layouts/community/ergodox/jjerrell/config.h
@@ -17,5 +17,5 @@
 
 #ifdef KEYBOARD_ergodox_ez
 #undef   PRODUCT
-#define  PRODUCT  ErgoDox EZ - Modified by <@jjerrell>
+#define  PRODUCT  "ErgoDox EZ - Modified by <@jjerrell>"
 #endif
diff --git a/layouts/community/ergodox/meagerfindings/config.h b/layouts/community/ergodox/meagerfindings/config.h
index d69aaf79dd..28a92e2bf6 100644
--- a/layouts/community/ergodox/meagerfindings/config.h
+++ b/layouts/community/ergodox/meagerfindings/config.h
@@ -5,9 +5,9 @@
 #undef DEVICE_VER
 #define DEVICE_VER      0x0001
 #undef MANUFACTURER
-#define MANUFACTURER    meagerfindings
+#define MANUFACTURER    "meagerfindings"
 #undef PRODUCT
-#define PRODUCT         ErgoDox
+#define PRODUCT         "ErgoDox"
 
 #define USB_MAX_POWER_CONSUMPTION 500
 
diff --git a/layouts/community/numpad_5x6/drashna/config.h b/layouts/community/numpad_5x6/drashna/config.h
index aa0c201232..83e8766b27 100644
--- a/layouts/community/numpad_5x6/drashna/config.h
+++ b/layouts/community/numpad_5x6/drashna/config.h
@@ -32,5 +32,5 @@
 
 #if defined(KEYBOARD_primekb_prime_m)
 #    undef PRODUCT
-#    define PRODUCT Drashna Hacked Prime_M Macro Pad
+#    define PRODUCT "Drashna Hacked Prime_M Macro Pad"
 #endif
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index d6197ece29..0b10a64eaa 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -70,11 +70,11 @@
 #if defined(KEYBOARD_planck)
 #    undef PRODUCT
 #    if defined(KEYBOARD_planck_light)
-#        define PRODUCT Drashna Hacked RGB Beacon(Planck Light)
+#        define PRODUCT "Drashna Hacked RGB Beacon(Planck Light)"
 #    elif defined(KEYBOARD_planck_rev6)
-#        define PRODUCT Drashna Hacked Planck Rev6
+#        define PRODUCT "Drashna Hacked Planck Rev6"
 #    elif defined(KEYBOARD_planck_ez)
-#        define PRODUCT Drashna Hacked Planck EZ
+#        define PRODUCT "Drashna Hacked Planck EZ"
 #        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
 #    endif
 #endif
diff --git a/layouts/community/ortho_4x12/jjerrell/config.h b/layouts/community/ortho_4x12/jjerrell/config.h
index aee885b8d0..8d2080d868 100644
--- a/layouts/community/ortho_4x12/jjerrell/config.h
+++ b/layouts/community/ortho_4x12/jjerrell/config.h
@@ -32,7 +32,7 @@
 
 #ifdef KEYBOARD_planck_ez_glow
 #undef   PRODUCT
-#define  PRODUCT  Planck EZ Glow - Modified by <@jjerrell>
+#define  PRODUCT  "Planck EZ Glow - Modified by <@jjerrell>"
 #endif
 
 /*
diff --git a/layouts/community/split_3x6_3/bbaserdem/config.h b/layouts/community/split_3x6_3/bbaserdem/config.h
index adf707d1ba..1d269335fe 100644
--- a/layouts/community/split_3x6_3/bbaserdem/config.h
+++ b/layouts/community/split_3x6_3/bbaserdem/config.h
@@ -26,9 +26,9 @@
 
     // Rebrand the PCB
 #   undef PRODUCT
-#   define PRODUCT Protorne Keyboard
+#   define PRODUCT "Protorne Keyboard"
 #   undef MANUFACTURER
-#   define MANUFACTURER Waffles
+#   define MANUFACTURER "Waffles"
 
     // Remove OLED definitions? 
 #   undef USE_I2C
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index cfcb873a80..a84d6eef2e 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -87,9 +87,9 @@
 
 #undef PRODUCT
 #ifdef CONVERT_TO_PROTON_C
-#    define PRODUCT Drashna Hacked ARM Corne Keyboard
+#    define PRODUCT "Drashna Hacked ARM Corne Keyboard"
 #else
-#    define PRODUCT Drashna Hacked Corne Keyboard
+#    define PRODUCT "Drashna Hacked Corne Keyboard"
 #endif
 
 #define TAPPING_TERM_PER_KEY
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index fde8b079a3..185abb5f21 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -265,8 +265,8 @@ def test_generate_config_h():
     check_returncode(result)
     assert '#   define DEVICE_VER 0x0001' in result.stdout
     assert '#   define DIODE_DIRECTION COL2ROW' in result.stdout
-    assert '#   define MANUFACTURER none' in result.stdout
-    assert '#   define PRODUCT pytest' in result.stdout
+    assert '#   define MANUFACTURER "none"' in result.stdout
+    assert '#   define PRODUCT "pytest"' in result.stdout
     assert '#   define PRODUCT_ID 0x6465' in result.stdout
     assert '#   define VENDOR_ID 0xFEED' in result.stdout
     assert '#   define MATRIX_COLS 1' in result.stdout
diff --git a/quantum/util.h b/quantum/util.h
index ab96ce4bde..21c290013c 100644
--- a/quantum/util.h
+++ b/quantum/util.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "bitwise.h"
 
-// convert to L string
-#define LSTR(s) XLSTR(s)
-#define XLSTR(s) L## #s
 // convert to string
 #define STR(s) XSTR(s)
 #define XSTR(s) #s
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index 52e3276d35..635e4c6cd7 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -1043,7 +1043,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
  */
 const USB_Descriptor_String_t PROGMEM LanguageString = {
     .Header = {
-        .Size                   = USB_STRING_LEN(1),
+        .Size                   = 4,
         .Type                   = DTYPE_String
     },
     .UnicodeString              = {LANGUAGE_ID_ENG}
@@ -1051,24 +1051,24 @@ const USB_Descriptor_String_t PROGMEM LanguageString = {
 
 const USB_Descriptor_String_t PROGMEM ManufacturerString = {
     .Header = {
-        .Size                   = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1), // Subtract 1 for null terminator
+        .Size                   = sizeof(USBSTR(MANUFACTURER)),
         .Type                   = DTYPE_String
     },
-    .UnicodeString              = LSTR(MANUFACTURER)
+    .UnicodeString              = USBSTR(MANUFACTURER)
 };
 
 const USB_Descriptor_String_t PROGMEM ProductString = {
     .Header = {
-        .Size                   = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1), // Subtract 1 for null terminator
+        .Size                   = sizeof(USBSTR(PRODUCT)),
         .Type                   = DTYPE_String
     },
-    .UnicodeString              = LSTR(PRODUCT)
+    .UnicodeString              = USBSTR(PRODUCT)
 };
 
 #if defined(SERIAL_NUMBER)
 const USB_Descriptor_String_t PROGMEM SerialNumberString = {
     .Header = {
-        .Size                   = USB_STRING_LEN(sizeof(SERIAL_NUMBER) - 1), // Subtract 1 for null terminator
+        .Size                   = sizeof(USBSTR(SERIAL_NUMBER)),
         .Type                   = DTYPE_String
     },
     .UnicodeString              = USBSTR(SERIAL_NUMBER)
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index d07cc0d27e..65f5027574 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -672,7 +672,7 @@ const PROGMEM uchar console_hid_report[] = {
 // clang-format off
 const PROGMEM usbStringDescriptor_t usbStringDescriptorZero = {
     .header = {
-        .bLength         = USB_STRING_LEN(1),
+        .bLength         = 4,
         .bDescriptorType = USBDESCR_STRING
     },
     .bString             = {0x0409} // US English
@@ -680,24 +680,24 @@ const PROGMEM usbStringDescriptor_t usbStringDescriptorZero = {
 
 const PROGMEM usbStringDescriptor_t usbStringDescriptorManufacturer = {
     .header = {
-        .bLength         = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1),
+        .bLength         = sizeof(USBSTR(MANUFACTURER)),
         .bDescriptorType = USBDESCR_STRING
     },
-    .bString             = LSTR(MANUFACTURER)
+    .bString             = USBSTR(MANUFACTURER)
 };
 
 const PROGMEM usbStringDescriptor_t usbStringDescriptorProduct = {
     .header = {
-        .bLength         = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1),
+        .bLength         = sizeof(USBSTR(PRODUCT)),
         .bDescriptorType = USBDESCR_STRING
     },
-    .bString             = LSTR(PRODUCT)
+    .bString             = USBSTR(PRODUCT)
 };
 
 #if defined(SERIAL_NUMBER)
 const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = {
     .header = {
-        .bLength         = USB_STRING_LEN(sizeof(SERIAL_NUMBER) - 1),
+        .bLength         = sizeof(USBSTR(SERIAL_NUMBER)),
         .bDescriptorType = USBDESCR_STRING
     },
     .bString             = USBSTR(SERIAL_NUMBER)
diff --git a/tmk_core/protocol/vusb/vusb.h b/tmk_core/protocol/vusb/vusb.h
index b1ecc98f37..c5cb27ded6 100644
--- a/tmk_core/protocol/vusb/vusb.h
+++ b/tmk_core/protocol/vusb/vusb.h
@@ -118,8 +118,6 @@ typedef struct usbConfigurationDescriptor {
 #endif
 } __attribute__((packed)) usbConfigurationDescriptor_t;
 
-#define USB_STRING_LEN(s) (sizeof(usbDescriptorHeader_t) + ((s) << 1))
-
 extern bool vusb_suspended;
 
 host_driver_t *vusb_driver(void);
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index 49409ed85d..69ae5cdcdb 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -42,7 +42,7 @@
 #define SPI_DEBUG_SCAN_RATE
 
 #undef MANUFACTURER
-#define MANUFACTURER Window of Fire
+#define MANUFACTURER "Window of Fire"
 
 // Some keyboards enable BACKLIGHT_CAPS_LOCK without checking if backlight is enabled.
 // Undef as appropriate to avoid compiler warnings in that case.

From 37a85e1f9b5d6ad28e52b800f1b17d68ee5e4892 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sun, 28 Aug 2022 13:10:28 -0400
Subject: [PATCH 241/959] More spidey3 userspace cleanup (#18049)

---
 .../spin/keymaps/spidey3_pad/config.h         |  2 +-
 .../spin/keymaps/spidey3_pad/keymap.c         | 64 ++++++++-----------
 .../spin/keymaps/spidey3_pad/rules.mk         |  6 +-
 .../65_ansi_blocker/spidey3/keymap.c          |  6 +-
 layouts/community/75_ansi/spidey3/config.h    |  2 -
 layouts/community/75_ansi/spidey3/keymap.c    |  4 +-
 users/spidey3/config.h                        |  4 +-
 users/spidey3/layer_rgb.c                     | 20 ++++--
 users/spidey3/rules.mk                        |  1 +
 users/spidey3/spidey3.c                       | 11 ++--
 users/spidey3/spidey3.h                       |  5 +-
 11 files changed, 56 insertions(+), 69 deletions(-)

diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
index 1851f07f1d..b9a0b53fbf 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
@@ -24,7 +24,7 @@
 #undef LOCKING_SUPPORT_ENABLE
 
 #define LAYER_STATE_8BIT
-#define MAX_LAYER 4
+#define MAX_LAYER 5
 
 #undef RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
index 58aa5554c2..8c9af7202b 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
@@ -61,11 +61,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_RMOD,  RGB_TOG,   RGB_MOD),
 
     [_FN] = LAYOUT(
-        KC_TRNS,   DEBUG,     QK_BOOT,   KC_TRNS,
+        KC_NO,     DEBUG,     QK_BOOT,   KC_TRNS,
         KC_NO,     KC_NO,     EEP_RST,   KC_TRNS,
         KC_NO,     KC_NO,     KC_NO,     KC_TRNS,
-        KC_NO,     KC_NO,     KC_NO),
+        KC_TRNS,   KC_NO,     KC_NO),
 };
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_MACRO]  = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
+    [_NUMPAD] = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
+    [_CURSOR] = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
+    [_RGB]    = { ENCODER_CCW_CW(RGB_HUD,       RGB_HUI     ), ENCODER_CCW_CW(RGB_SAD,    RGB_SAI  ), ENCODER_CCW_CW(RGB_VAD,    RGB_VAI) },
+    [_FN]     = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
+};
+
 // clang-format on
 
 typedef enum layer_ack {
@@ -153,9 +162,22 @@ void spidey_glow(void) {
     rgblight_sethsv(255, 230, 128);
 }
 
-void eeconfig_init_user(void) { spidey_glow(); }
+void eeconfig_init_user(void) {
+    spidey_glow();
+}
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    dprintf("key event: kc: %02X, col: %02u, row: %02u, pressed: %u mods: %08b "
+#if !defined(NO_ACTION_ONESHOT)
+            "os: %08b "
+#endif
+            "weak: %08b\n",
+            keycode, record->event.key.col, record->event.key.row, record->event.pressed, bitrev(get_mods()),
+#if !defined(NO_ACTION_ONESHOT)
+            bitrev(get_oneshot_mods()),
+#endif
+            bitrev(get_weak_mods()));
+
     if (record->event.pressed) {
         switch (keycode) {
             // Re-implement this here, but fix the persistence!
@@ -208,39 +230,3 @@ void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
 }
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch (get_highest_layer(layer_state)) {
-        case _RGB:
-            if (index == 0) {
-                if (clockwise) {
-                    rgblight_increase_hue();
-                } else {
-                    rgblight_decrease_hue();
-                }
-            } else if (index == 1) {
-                if (clockwise) {
-                    rgblight_increase_sat();
-                } else {
-                    rgblight_decrease_sat();
-                }
-            } else if (index == 2) {
-                if (clockwise) {
-                    rgblight_increase_val();
-                } else {
-                    rgblight_decrease_val();
-                }
-            }
-            break;
-
-        default:
-            if (index == 0) {
-                tap_code16(C(S(clockwise ? KC_EQL : KC_MINS)));
-            } else if (index == 1) {
-                tap_code16(C(clockwise ? KC_EQL : KC_MINS));
-            } else if (index == 2) {
-                tap_code(clockwise ? KC_VOLU : KC_VOLD);
-            }
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/rules.mk b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/rules.mk
index 7fe1f992aa..5d543e2c7e 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/rules.mk
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/rules.mk
@@ -1,7 +1,7 @@
 MOUSEKEY_ENABLE    = no
 MIDI_ENABLE        = no
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE   = yes
 LTO_ENABLE         = yes
-CONSOLE_ENABLE     = yes    # Console for debug
+CONSOLE_ENABLE     = yes
 GRAVE_ESC_ENABLE   = no
-
+ENCODER_MAP_ENABLE = yes
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index aa4378fdcc..e682a281aa 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -24,10 +24,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // FN
     [_FN] = LAYOUT_65_ansi_blocker(
-        KC_GRV,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_INS,    KC_SLCK,
+        KC_GRV,     KC_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_SLCK,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
-        MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   SPI_LNX,    XXXXXXX,    XXXXXXX,                            CH_CPNL,    KC_BRID,
-        _______,    XXXXXXX,    XXXXXXX,    SPI_WIN,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),SPI_OSX,    XXXXXXX,    XXXXXXX,    DEBUG,                              _______,    KC_VOLU,    KC_MUTE,
+        MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            CH_CPNL,    KC_BRID,
+        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    XXXXXXX,    XXXXXXX,    DEBUG,                              _______,    KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            CH_ASST,    _______,                KC_MPRV,    KC_VOLD,    KC_MNXT
     ),
     // Glyph Transformation
diff --git a/layouts/community/75_ansi/spidey3/config.h b/layouts/community/75_ansi/spidey3/config.h
index 3fb06b2363..93fc4faf71 100644
--- a/layouts/community/75_ansi/spidey3/config.h
+++ b/layouts/community/75_ansi/spidey3/config.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 #define NO_ACTION_ONESHOT
 #undef LOCKING_SUPPORT_ENABLE
 
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index 37851830de..5ede802676 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
         EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SLCK,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
-        XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   SPI_LNX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
-        _______,    XXXXXXX,    XXXXXXX,    SPI_WIN,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),SPI_OSX,    X(LARR),    X(RARR),    DEBUG,      _______,                            KC_VOLU,    KC_MUTE,
+        XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
+        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DEBUG,      _______,                            KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            CH_ASST,    _______,    CH_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
     )
 };
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index 49409ed85d..91bcf910ee 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -9,7 +9,7 @@
 #ifdef RGBLIGHT_ENABLE
 
 #    define RGBLIGHT_LAYERS
-#    define RGBLIGHT_MAX_LAYERS 17
+#    define RGBLIGHT_MAX_LAYERS 18
 #    define RGBLIGHT_LAYER_BLINK
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_STARTUP_ANIMATION
@@ -37,7 +37,7 @@
 
 #endif
 
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC
+#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC, UC_EMACS
 
 #define SPI_DEBUG_SCAN_RATE
 
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index 671205362f..c867468194 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -65,6 +65,7 @@ const rgblight_segment_t PROGMEM _uc_mac_layer[]  = RGBLIGHT_LAYER_SEGMENTS(CORN
 // UC_WIN disabled in config.h
 // UC_BSD not implemented
 const rgblight_segment_t PROGMEM _uc_winc_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_CYAN));
+const rgblight_segment_t PROGMEM _uc_emacs_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_GREEN));
 
 // Now define the array of layers. Higher numbered layers take precedence.
 const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
@@ -89,6 +90,7 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
     [UNICODE_OFFSET + UC_WIN]  = _none,
     [UNICODE_OFFSET + UC_BSD]  = _none,
     [UNICODE_OFFSET + UC_WINC] = _uc_winc_layer,
+    [UNICODE_OFFSET + UC_EMACS] = _uc_emacs_layer,
 
     [UNICODE_OFFSET + UC__COUNT] = NULL
 };
@@ -300,8 +302,8 @@ void matrix_scan_user_rgb(void) {
 #    ifdef STARTUP_ANIMATION_DEBUG
                     dprintf("sua RAMP_DOWN counter=%u\n", counter);
 #    endif
+                    rgblight_sethsv_noeeprom(old_config.hue, STARTUP_ANIMATION_SATURATION, counter);
                     if (counter >= STARTUP_ANIMATION_FADE_STEP) {
-                        rgblight_sethsv_noeeprom(old_config.hue, STARTUP_ANIMATION_SATURATION, counter);
                         counter -= STARTUP_ANIMATION_FADE_STEP;
                     } else {
                         startup_animation_state = CLEAN_UP;
@@ -456,7 +458,9 @@ void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case RGB_TOG:
-            rgb_layer_ack_yn(rgblight_config.enable);
+            // Hack - we only get called on the press for RGB_TOG, 
+            // but the flag is only flipped on the release...
+            rgb_layer_ack_yn(!rgblight_config.enable);
             break;
 
 #ifdef VELOCIKEY_ENABLE
@@ -473,10 +477,14 @@ void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
             break;
 #endif
 
-#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
-        case SPI_LNX:
-        case SPI_OSX:
-        case SPI_WIN:
+#if defined(UNICODE_COMMON_ENABLE)
+        case UC_M_MA:
+        case UC_M_LN:
+        case UC_M_WI:
+        case UC_M_BS:
+        case UC_M_WC:
+        case UC_M_EM:
+
         case UC_MOD:
         case UC_RMOD:
             rgb_layer_ack(ACK_MEH);
diff --git a/users/spidey3/rules.mk b/users/spidey3/rules.mk
index de8ed113e7..c95582e176 100644
--- a/users/spidey3/rules.mk
+++ b/users/spidey3/rules.mk
@@ -1,6 +1,7 @@
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 CONSOLE_ENABLE = yes   # Console for debug
 BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+NKRO_ENABLE = yes
 LTO_ENABLE = yes
 
 SRC += init.c
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index e993f4828e..842bb465f7 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -55,7 +55,8 @@ void matrix_scan_user(void) {
 }
 
 static uint32_t math_glyph_exceptions(const uint16_t keycode, const bool shifted) {
-    if (shifted) {
+    bool caps = host_keyboard_led_state().caps_lock;
+    if (shifted != caps) {
         switch (keycode) {
             // clang-format off
             case KC_C: return 0x2102;
@@ -97,7 +98,8 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
                     clear_oneshot_mods();
 #endif
 
-                    uint32_t base = shifted ? baseAlphaUpper : baseAlphaLower;
+                    bool caps = host_keyboard_led_state().caps_lock;
+                    uint32_t base = ((shifted == caps) ? baseAlphaLower : baseAlphaUpper);
                     _register(base + (keycode - KC_A));
                     set_mods(temp_mod);
                 }
@@ -201,11 +203,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             case CH_ASST: host_consumer_send(AL_ASSISTANT); return false;
             case CH_SUSP: tap_code16(LGUI(LSFT(KC_L))); return true;
 
-#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
-            case SPI_LNX: set_unicode_input_mode(UC_LNX); break;
-            case SPI_OSX: set_unicode_input_mode(UC_OSX); break;
-            case SPI_WIN: set_unicode_input_mode(UC_WINC); break;
-#endif
                 // clang-format on
 
             case SPI_NORMAL ... SPI_MATH:
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index e96ab7a145..e91b299e55 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -17,10 +17,7 @@ enum userspace_layers {
 };
 
 enum custom_keycodes {
-    SPI_LNX = SAFE_RANGE,  // Mode: Linux
-    SPI_OSX,               // Mode: Mac
-    SPI_WIN,               // Mode: Windows
-    CH_CPNL,               // AL Control Panel
+    CH_CPNL = SAFE_RANGE,  // AL Control Panel
     CH_ASST,               // AL Context-aware Desktop Assistant
     CH_SUSP,               // Suspend
 

From 585b134729a5a66015f379127e4ff8b06430498c Mon Sep 17 00:00:00 2001
From: Matt Chan <5021+mattchan@users.noreply.github.com>
Date: Sun, 28 Aug 2022 13:12:18 -0400
Subject: [PATCH 242/959] [Keyboard] Add Kegen G-Boy (#18048)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/kegen/gboy/config.h                 | 60 +++++++++++++
 keyboards/kegen/gboy/gboy.c                   | 18 ++++
 keyboards/kegen/gboy/gboy.h                   | 68 ++++++++++++++
 keyboards/kegen/gboy/info.json                | 90 +++++++++++++++++++
 keyboards/kegen/gboy/keymaps/default/keymap.c | 54 +++++++++++
 keyboards/kegen/gboy/keymaps/via/keymap.c     | 54 +++++++++++
 keyboards/kegen/gboy/keymaps/via/rules.mk     |  1 +
 keyboards/kegen/gboy/readme.md                | 28 ++++++
 keyboards/kegen/gboy/rules.mk                 | 18 ++++
 9 files changed, 391 insertions(+)
 create mode 100644 keyboards/kegen/gboy/config.h
 create mode 100644 keyboards/kegen/gboy/gboy.c
 create mode 100644 keyboards/kegen/gboy/gboy.h
 create mode 100644 keyboards/kegen/gboy/info.json
 create mode 100644 keyboards/kegen/gboy/keymaps/default/keymap.c
 create mode 100644 keyboards/kegen/gboy/keymaps/via/keymap.c
 create mode 100644 keyboards/kegen/gboy/keymaps/via/rules.mk
 create mode 100644 keyboards/kegen/gboy/readme.md
 create mode 100644 keyboards/kegen/gboy/rules.mk

diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
new file mode 100644
index 0000000000..77f9ef3b21
--- /dev/null
+++ b/keyboards/kegen/gboy/config.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 Matt Chan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F1, F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { E2, E6, C6, C7, D7, B6, B5, B4, B3, B2, B1, B0, D4, D6, D5, F0 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+#define BACKLIGHT_PIN B7
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 15
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+#define RGB_DI_PIN D1
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 14
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
diff --git a/keyboards/kegen/gboy/gboy.c b/keyboards/kegen/gboy/gboy.c
new file mode 100644
index 0000000000..cd6869748d
--- /dev/null
+++ b/keyboards/kegen/gboy/gboy.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2022 Matt Chan
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "gboy.h"
diff --git a/keyboards/kegen/gboy/gboy.h b/keyboards/kegen/gboy/gboy.h
new file mode 100644
index 0000000000..5a51343e95
--- /dev/null
+++ b/keyboards/kegen/gboy/gboy.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2022 Matt Chan
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/*
+ * This diagram is based off the QK65 layout but without the blocker.
+ *
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │1D │0D │0E │    │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ ┌─┴───┴────┤
+ * │30      │   │30  │3C │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3D │3E │ │3B        │ 2.75u Shift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤ └──────────┘
+ *              │40  │41  │42  │46                      │47   │49   │4C │4D │4E │
+ *              └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
+ *              1.25u, 1.25u, 1.25u, 6.25u, 1.5u, 1.5u
+ *
+ *              ┌────┬────┬────┬────────────────────────┬───┬───┬───┐
+ *              │40  │41  │42  │46                      │47 │48 │49 │
+ *              └────┴────┴────┴────────────────────────┴───┴───┴───┘
+ *              1.25u, 1.25u, 1.25u, 6.25u, 1u, 1u, 1u
+ *
+ *              ┌─────┬─────┬───────────────────────────┬───┬───┬───┐
+ *              │40   │42   │46                         │47 │48 │49 │
+ *              └─────┴─────┴───────────────────────────┴───┴───┴───┘
+ *              1.5u, 1.5u, 7u, 1u, 1u, 1u
+ *
+ *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐
+ *              │40   │42   │46                         │47   │49   │
+ *              └─────┴─────┴───────────────────────────┴─────┴─────┘
+ *              1.5u, 1.5u, 7u, 1.5u, 1.5u
+ */
+
+
+
+#define LAYOUT_all( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
+	K400, K401, K402,                   K406,             K409, K410, K411, K412, K413, K414  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
+	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  K411,  K412,  K413,  K414,  KC_NO }  \
+}
diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
new file mode 100644
index 0000000000..059dafd89b
--- /dev/null
+++ b/keyboards/kegen/gboy/info.json
@@ -0,0 +1,90 @@
+{
+    "keyboard_name": "Kegen G-Boy", 
+    "url": "", 
+    "maintainer": "@mattchan", 
+    "usb": {
+        "vid": "0x4B65",
+        "pid": "0x6762",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2, "w":1.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kegen/gboy/keymaps/default/keymap.c b/keyboards/kegen/gboy/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f4b5d3c090
--- /dev/null
+++ b/keyboards/kegen/gboy/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 Matt Chan
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_SLSH, KC_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_all(
+        KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL, QK_BOOT,
+        RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_SPD,  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, KC_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_MPRV, KC_VOLD, KC_MNXT
+    ),
+
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
diff --git a/keyboards/kegen/gboy/keymaps/via/keymap.c b/keyboards/kegen/gboy/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f4b5d3c090
--- /dev/null
+++ b/keyboards/kegen/gboy/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 Matt Chan
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_SLSH, KC_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_all(
+        KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL, QK_BOOT,
+        RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_SPD,  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, KC_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_MPRV, KC_VOLD, KC_MNXT
+    ),
+
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
diff --git a/keyboards/kegen/gboy/keymaps/via/rules.mk b/keyboards/kegen/gboy/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kegen/gboy/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kegen/gboy/readme.md b/keyboards/kegen/gboy/readme.md
new file mode 100644
index 0000000000..942d50d308
--- /dev/null
+++ b/keyboards/kegen/gboy/readme.md
@@ -0,0 +1,28 @@
+# G-Boy
+
+![G-Boy](https://i.imgur.com/APwppRwh.png)
+
+65% board that resembles a handheld gaming console
+
+* Keyboard Maintainer: [Matt Chan](https://github.com/mattchan)
+* Hardware Supported: Kegen G-Boy
+* Hardware Availability: Unfortunately, there is no site for this, and the Kegen Discord is ghost town.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kegen/gboy:default
+
+Flashing example for this keyboard:
+
+    make kegen/gboy:default:flash
+
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/kegen/gboy/rules.mk b/keyboards/kegen/gboy/rules.mk
new file mode 100644
index 0000000000..8723047c1e
--- /dev/null
+++ b/keyboards/kegen/gboy/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = yes	# Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes   # Mouse keys
+EXTRAKEY_ENABLE = yes   # Audio control and System control
+CONSOLE_ENABLE = no	    # Console for debug
+COMMAND_ENABLE = no     # Commands for debug and configuration
+NKRO_ENABLE = yes       # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+AUDIO_ENABLE = no       # Audio output
+RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow

From 4adb64a91b3c8bf665bd9f7357fb806d30ac09f5 Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Sun, 28 Aug 2022 13:16:20 -0400
Subject: [PATCH 243/959] [Keyboard] mechwild/bde cleanup and refactor (#18149)

---
 keyboards/mechwild/bde/bde.c                  | 17 ----
 keyboards/mechwild/bde/bde.h                  | 26 -------
 keyboards/mechwild/bde/config.h               |  8 +-
 keyboards/mechwild/bde/info.json              | 30 ++++++--
 keyboards/mechwild/bde/keymaps/via/rules.mk   |  3 -
 keyboards/mechwild/bde/lefty/config.h         | 46 -----------
 keyboards/mechwild/bde/lefty/info.json        | 70 +++++++++++++++++
 .../keymaps/default}/config.h                 |  2 +-
 .../keymaps/default}/keymap.c                 | 36 ++++-----
 .../bde/lefty/keymaps/default/rules.mk        |  9 +++
 .../keymaps/fancy}/config.h                   |  0
 .../keymaps/fancy}/keymap.c                   | 44 +++++------
 .../keymaps/fancy}/rules.mk                   |  0
 .../lefty_via => lefty/keymaps/via}/config.h  |  0
 .../lefty_via => lefty/keymaps/via}/keymap.c  | 36 ++++-----
 .../lefty_via => lefty/keymaps/via}/rules.mk  |  0
 keyboards/mechwild/bde/lefty/lefty.c          | 17 ----
 keyboards/mechwild/bde/lefty/lefty.h          | 30 --------
 keyboards/mechwild/bde/lefty/rules.mk         |  1 +
 keyboards/mechwild/bde/readme.md              | 18 +++++
 keyboards/mechwild/bde/rev2/config.h          | 39 +---------
 keyboards/mechwild/bde/rev2/info.json         | 65 ++++++++++++++++
 .../bde/{ => rev2}/keymaps/default/keymap.c   | 62 ++++++++-------
 .../bde/rev2/keymaps/default/rules.mk         | 13 ++++
 .../bde/{ => rev2}/keymaps/via/config.h       |  0
 .../bde/{ => rev2}/keymaps/via/keymap.c       | 61 ++++++++-------
 .../mechwild/bde/rev2/keymaps/via/rules.mk    |  3 +
 keyboards/mechwild/bde/rev2/rev2.c            | 77 +++++++++----------
 keyboards/mechwild/bde/rev2/rev2.h            | 13 ----
 keyboards/mechwild/bde/righty/config.h        | 46 -----------
 keyboards/mechwild/bde/righty/info.json       | 70 +++++++++++++++++
 .../keymaps/default}/config.h                 |  2 +-
 .../keymaps/default}/keymap.c                 | 38 ++++-----
 .../bde/righty/keymaps/default/rules.mk       |  9 +++
 .../keymaps/via}/config.h                     |  2 +-
 .../keymaps/via}/keymap.c                     |  6 +-
 .../keymaps/via}/rules.mk                     |  0
 keyboards/mechwild/bde/righty/righty.c        | 17 ----
 keyboards/mechwild/bde/righty/righty.h        | 30 --------
 keyboards/mechwild/bde/righty/rules.mk        |  1 +
 keyboards/mechwild/bde/rules.mk               | 19 -----
 41 files changed, 479 insertions(+), 487 deletions(-)
 delete mode 100644 keyboards/mechwild/bde/bde.c
 delete mode 100644 keyboards/mechwild/bde/bde.h
 delete mode 100644 keyboards/mechwild/bde/keymaps/via/rules.mk
 delete mode 100644 keyboards/mechwild/bde/lefty/config.h
 rename keyboards/mechwild/bde/{keymaps/righty_via => lefty/keymaps/default}/config.h (98%)
 rename keyboards/mechwild/bde/{keymaps/lefty_default => lefty/keymaps/default}/keymap.c (82%)
 create mode 100644 keyboards/mechwild/bde/lefty/keymaps/default/rules.mk
 rename keyboards/mechwild/bde/{keymaps/lefty_fancy => lefty/keymaps/fancy}/config.h (100%)
 rename keyboards/mechwild/bde/{keymaps/lefty_fancy => lefty/keymaps/fancy}/keymap.c (88%)
 rename keyboards/mechwild/bde/{keymaps/lefty_fancy => lefty/keymaps/fancy}/rules.mk (100%)
 rename keyboards/mechwild/bde/{keymaps/lefty_via => lefty/keymaps/via}/config.h (100%)
 rename keyboards/mechwild/bde/{keymaps/lefty_via => lefty/keymaps/via}/keymap.c (82%)
 rename keyboards/mechwild/bde/{keymaps/lefty_via => lefty/keymaps/via}/rules.mk (100%)
 delete mode 100644 keyboards/mechwild/bde/lefty/lefty.c
 delete mode 100644 keyboards/mechwild/bde/lefty/lefty.h
 create mode 100644 keyboards/mechwild/bde/lefty/rules.mk
 rename keyboards/mechwild/bde/{ => rev2}/keymaps/default/keymap.c (74%)
 create mode 100644 keyboards/mechwild/bde/rev2/keymaps/default/rules.mk
 rename keyboards/mechwild/bde/{ => rev2}/keymaps/via/config.h (100%)
 rename keyboards/mechwild/bde/{ => rev2}/keymaps/via/keymap.c (76%)
 create mode 100644 keyboards/mechwild/bde/rev2/keymaps/via/rules.mk
 delete mode 100644 keyboards/mechwild/bde/righty/config.h
 rename keyboards/mechwild/bde/{keymaps/righty_default => righty/keymaps/default}/config.h (98%)
 rename keyboards/mechwild/bde/{keymaps/righty_via => righty/keymaps/default}/keymap.c (84%)
 create mode 100644 keyboards/mechwild/bde/righty/keymaps/default/rules.mk
 rename keyboards/mechwild/bde/{keymaps/lefty_default => righty/keymaps/via}/config.h (98%)
 rename keyboards/mechwild/bde/{keymaps/righty_default => righty/keymaps/via}/keymap.c (96%)
 rename keyboards/mechwild/bde/{keymaps/righty_via => righty/keymaps/via}/rules.mk (100%)
 delete mode 100644 keyboards/mechwild/bde/righty/righty.c
 delete mode 100644 keyboards/mechwild/bde/righty/righty.h
 create mode 100644 keyboards/mechwild/bde/righty/rules.mk

diff --git a/keyboards/mechwild/bde/bde.c b/keyboards/mechwild/bde/bde.c
deleted file mode 100644
index 911d1c0434..0000000000
--- a/keyboards/mechwild/bde/bde.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-#include "bde.h"
diff --git a/keyboards/mechwild/bde/bde.h b/keyboards/mechwild/bde/bde.h
deleted file mode 100644
index 3d16bdb8db..0000000000
--- a/keyboards/mechwild/bde/bde.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechwild_bde_rev2
-    #include "rev2.h"
-#elif KEYBOARD_mechwild_bde_lefty
-    #include "lefty.h"
-#elif KEYBOARD_mechwild_bde_righty
-    #include "righty.h"
-#endif
diff --git a/keyboards/mechwild/bde/config.h b/keyboards/mechwild/bde/config.h
index 5130918c08..ad54af1aa8 100644
--- a/keyboards/mechwild/bde/config.h
+++ b/keyboards/mechwild/bde/config.h
@@ -17,4 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
\ No newline at end of file
+#include "config_common.h"
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json
index 682038c681..0177b4c949 100644
--- a/keyboards/mechwild/bde/info.json
+++ b/keyboards/mechwild/bde/info.json
@@ -5,13 +5,27 @@
     "usb": {
         "vid": "0x6D77"
     },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0},  {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},   {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"Mute", "x":13, "y":0},            
-                {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1},  {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":"ESC", "x":9, "y":1}, {"label":"4", "x":10, "y":1}, {"label":"5", "x":11, "y":1}, {"label":"6", "x":12, "y":1}, {"label":"0", "x":13, "y":1},
-                {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"BS", "x":4, "y":2}, {"label":"", "x":5, "y":2},  {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"ENT", "x":9, "y":2}, {"label":"1", "x":10, "y":2}, {"label":"2", "x":11, "y":2}, {"label":"3", "x":12, "y":2}, {"label":"EQL", "x":13, "y":2}
-            ]
-        }
+    "debounce": 5,
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "debug": false,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "development_board": "promicro",
+    "rgblight": {
+        "sleep": true,
+        "max_brightness": 255
+    },
+    "tapping": {
+        "tap_keycode_delay": 10,
+        "tap_capslock_delay": 10
     }
 }
diff --git a/keyboards/mechwild/bde/keymaps/via/rules.mk b/keyboards/mechwild/bde/keymaps/via/rules.mk
deleted file mode 100644
index 07681b4f2c..0000000000
--- a/keyboards/mechwild/bde/keymaps/via/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-VIA_ENABLE = yes
-LTO_ENABLE = no
diff --git a/keyboards/mechwild/bde/lefty/config.h b/keyboards/mechwild/bde/lefty/config.h
deleted file mode 100644
index 702a6d81b4..0000000000
--- a/keyboards/mechwild/bde/lefty/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 14
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D7, D3}
-#define MATRIX_COL_PINS { F7, B1, B6, B2, B3, F6, F5, F4, D0, D4, C6, E6, B5, B4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* If RGBLIGHT_ENABLE is set to yes in the rules,  ensure the RGBLED_NUM is accurate for how many you have attached. */
-#define RGB_DI_PIN D2
-#define RGBLED_NUM 16 
-#define RGBLIGHT_ANIMATIONS
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json
index 293df18387..5aa4ac1e80 100644
--- a/keyboards/mechwild/bde/lefty/info.json
+++ b/keyboards/mechwild/bde/lefty/info.json
@@ -3,5 +3,75 @@
     "usb": {
         "pid": "0x1701",
         "device_version": "2.0.3"
+    },
+    "matrix_pins": {
+        "rows": ["D1", "D7", "D3"],
+        "cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"]
+    },
+    "diode_direction": "ROW2COL",
+    "rgblight": {
+        "led_count": 16,
+        "pin": "D2",
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "label":"7", "x":0, "y":0 },
+                { "matrix": [0, 1], "label":"8", "x":1, "y":0 },
+                { "matrix": [0, 2], "label":"9", "x":2, "y":0 },
+                { "matrix": [0, 3], "label":"0", "x":3, "y":0 },
+                { "matrix": [0, 4], "label":"Q", "x":4, "y":0 },
+                { "matrix": [0, 5], "label":"W", "x":5, "y":0 },
+                { "matrix": [0, 6], "label":"E", "x":6, "y":0 },
+                { "matrix": [0, 7], "label":"R", "x":7, "y":0 },
+                { "matrix": [0, 8], "label":"T", "x":8, "y":0 },
+                { "matrix": [0, 9], "label":"Y", "x":9, "y":0 },
+                { "matrix": [0, 10], "label":"U", "x":10, "y":0 },
+                { "matrix": [0, 11], "label":"I", "x":11, "y":0 },
+                { "matrix": [0, 12], "label":"O", "x":12, "y":0 },
+                { "matrix": [0, 13], "label":"P", "x":13, "y":0 },
+
+                { "matrix": [1, 0], "label":"4", "x":0, "y":1 },
+                { "matrix": [1, 1], "label":"5", "x":1, "y":1 },
+                { "matrix": [1, 2], "label":"6", "x":2, "y":1 },
+                { "matrix": [1, 3], "label":"Enter", "x":3, "y":1, "h":2 },
+                { "matrix": [1, 4], "label":"A", "x":4, "y":1 },
+                { "matrix": [1, 5], "label":"S", "x":5, "y":1 },
+                { "matrix": [1, 6], "label":"D", "x":6, "y":1 },
+                { "matrix": [1, 7], "label":"F", "x":7, "y":1 },
+                { "matrix": [1, 8], "label":"G", "x":8, "y":1 },
+                { "matrix": [1, 9], "label":"H", "x":9, "y":1 },
+                { "matrix": [1, 10], "label":"J", "x":10, "y":1 },
+                { "matrix": [1, 11], "label":"K", "x":11, "y":1 },
+                { "matrix": [1, 12], "label":"L", "x":12, "y":1 },
+                { "matrix": [1, 13], "label":"Esc", "x":13, "y":1 },
+
+                { "matrix": [2, 0], "label":"1", "x":0, "y":2 },
+                { "matrix": [2, 1], "label":"2", "x":1, "y":2 },
+                { "matrix": [2, 2], "label":"3", "x":2, "y":2 },
+                { "matrix": [2, 4], "label":"Z", "x":4, "y":2 },
+                { "matrix": [2, 5], "label":"X", "x":5, "y":2 },
+                { "matrix": [2, 6], "label":"C", "x":6, "y":2 },
+                { "matrix": [2, 7], "label":"V", "x":7, "y":2 },
+                { "matrix": [2, 8], "label":"Back", "x":8, "y":2 },
+                { "matrix": [2, 9], "label":"Space", "x":9, "y":2 },
+                { "matrix": [2, 10], "label":"B", "x":10, "y":2 },
+                { "matrix": [2, 11], "label":"N", "x":11, "y":2 },
+                { "matrix": [2, 12], "label":"M", "x":12, "y":2 },
+                { "matrix": [2, 13], "label":"Shift", "x":13, "y":2 }
+            ]
+        }
     }
 }
diff --git a/keyboards/mechwild/bde/keymaps/righty_via/config.h b/keyboards/mechwild/bde/lefty/keymaps/default/config.h
similarity index 98%
rename from keyboards/mechwild/bde/keymaps/righty_via/config.h
rename to keyboards/mechwild/bde/lefty/keymaps/default/config.h
index 80e8e2e015..5c2d15a006 100644
--- a/keyboards/mechwild/bde/keymaps/righty_via/config.h
+++ b/keyboards/mechwild/bde/lefty/keymaps/default/config.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
-
+#pragma once
 /* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
 #define IGNORE_MOD_TAP_INTERRUPT
 
diff --git a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c
similarity index 82%
rename from keyboards/mechwild/bde/keymaps/lefty_default/keymap.c
rename to keyboards/mechwild/bde/lefty/keymaps/default/keymap.c
index 3f7b092bc7..804c29824c 100644
--- a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c
+++ b/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Kyle McCreery
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -25,21 +25,21 @@
 #define ALT_N       ALGR_T(KC_N)
 #define CTL_M       RCTL_T(KC_M)
 #define SFT_ENT     RSFT_T(KC_ENT)
-#define WIN_C		LGUI_T(KC_C)
+#define WIN_C       LGUI_T(KC_C)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
     KC_7,    KC_8,    KC_9,    KC_0,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
     KC_4,    KC_5,    KC_6,    SFT_ENT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,
-    KC_1,    KC_2,    KC_3,     	    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
+    KC_1,    KC_2,    KC_3,             CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
   ),
 
   [1] = LAYOUT(
     KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
-    KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    KC_F1,   KC_F2,   KC_F3,            _______, _______, KC_LGUI, _______, KC_DEL,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
-	
+
   [2] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/rules.mk b/keyboards/mechwild/bde/lefty/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a4c9ac387a
--- /dev/null
+++ b/keyboards/mechwild/bde/lefty/keymaps/default/rules.mk
@@ -0,0 +1,9 @@
+# If you are using a custom Pro Micro-compatible dev board (Elite-C, Sea-Micro, etc)
+# you may need to uncomment and modify this BOOTLOADER setting to use the correct
+# bootloader. (e.g. Elite-Cs use "atmel-dfu", not "caterina".)
+#
+# See the QMK docs for more information:
+# https://docs.qmk.fm/#/flashing
+# https://docs.qmk.fm/#/driver_installation_zadig?id=list-of-known-bootloaders
+
+# BOOTLOADER = caterina
diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/config.h b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
similarity index 100%
rename from keyboards/mechwild/bde/keymaps/lefty_fancy/config.h
rename to keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c
similarity index 88%
rename from keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c
rename to keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c
index 61c59932cf..3240dbdfb2 100644
--- a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c
+++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Kyle McCreery
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -26,7 +26,7 @@
 #define ALT_N       ALGR_T(KC_N)
 #define CTL_M       RCTL_T(KC_M)
 #define SFT_ENT     RSFT_T(KC_ENT)
-#define WIN_C		LGUI_T(KC_C)
+#define WIN_C       LGUI_T(KC_C)
 
 typedef struct {
     bool is_press_action;
@@ -55,15 +55,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
     KC_7,    KC_8,    KC_9,    KC_0,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
     KC_4,    KC_5,    KC_6,    TD(left_enter), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,
-    KC_1,    KC_2,    KC_3,     	           CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
+    KC_1,    KC_2,    KC_3,                    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
   ),
 
   [1] = LAYOUT(
     KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
-    KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    KC_F1,   KC_F2,   KC_F3,            _______, _______, KC_LGUI, _______, KC_DEL,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
-	
+
   [2] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_M_SN, RGB_M_K, RGB_M_X,  RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______,  _______, _______, _______, _______, _______,
     RGB_M_B,  RGB_M_R, RGB_M_SW,          _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______
   )
-  
+
 };
 
 
@@ -84,9 +84,9 @@ uint8_t cur_dance(qk_tap_dance_state_t *state) {
         if (state->interrupted || !state->pressed) return SINGLE_TAP;
         // Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'.
         else return SINGLE_HOLD;
-	} else return DOUBLE_TAP;
+    } else return DOUBLE_TAP;
     //} else if (state->count >= 2) {
-	//	return DOUBLE_TAP;
+    //    return DOUBLE_TAP;
     //}else return 8; // Magic number. At some point this method will expand to work for more presses
 }
 
@@ -101,7 +101,7 @@ void left_enter_finished(qk_tap_dance_state_t *state, void *user_data) {
         //case SINGLE_TAP: register_code(KC_ENT); break;
         case SINGLE_HOLD: register_code(KC_LSFT); break;
         case DOUBLE_TAP: register_code(KC_ENT); break;
-		}
+    }
 }
 
 void left_enter_reset(qk_tap_dance_state_t *state, void *user_data) {
diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk b/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk
similarity index 100%
rename from keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk
rename to keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk
diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/config.h b/keyboards/mechwild/bde/lefty/keymaps/via/config.h
similarity index 100%
rename from keyboards/mechwild/bde/keymaps/lefty_via/config.h
rename to keyboards/mechwild/bde/lefty/keymaps/via/config.h
diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c
similarity index 82%
rename from keyboards/mechwild/bde/keymaps/lefty_via/keymap.c
rename to keyboards/mechwild/bde/lefty/keymaps/via/keymap.c
index cf1f8451d0..722062935a 100644
--- a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c
+++ b/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Kyle McCreery
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -25,22 +25,22 @@
 #define ALT_N       ALGR_T(KC_N)
 #define CTL_M       RCTL_T(KC_M)
 #define SFT_ENT     RSFT_T(KC_ENT)
-#define WIN_C		LGUI_T(KC_C)
+#define WIN_C       LGUI_T(KC_C)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
     KC_7,    KC_8,    KC_9,    KC_0,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
     KC_4,    KC_5,    KC_6,    SFT_ENT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,
-    KC_1,    KC_2,    KC_3,     	    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
+    KC_1,    KC_2,    KC_3,             CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
   ),
 
   [1] = LAYOUT(
     KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
-    KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    KC_F1,   KC_F2,   KC_F3,            _______, _______, KC_LGUI, _______, KC_DEL,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
-	
+
   [2] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/rules.mk b/keyboards/mechwild/bde/lefty/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechwild/bde/keymaps/lefty_via/rules.mk
rename to keyboards/mechwild/bde/lefty/keymaps/via/rules.mk
diff --git a/keyboards/mechwild/bde/lefty/lefty.c b/keyboards/mechwild/bde/lefty/lefty.c
deleted file mode 100644
index 6873ed36a0..0000000000
--- a/keyboards/mechwild/bde/lefty/lefty.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-#include "bde.h"
diff --git a/keyboards/mechwild/bde/lefty/lefty.h b/keyboards/mechwild/bde/lefty/lefty.h
deleted file mode 100644
index 37b8771db6..0000000000
--- a/keyboards/mechwild/bde/lefty/lefty.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	 K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D ,   \
-	 K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D ,   \
-	 K20,  K21,  K22,        K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D     \
-) { \
-    {K00,  K01,  K02,  K03,   K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D},   \
-    {K10,  K11,  K12,  K13,   K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D},   \
-    {K20,  K21,  K22,  KC_NO, K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D}    \
-}
diff --git a/keyboards/mechwild/bde/lefty/rules.mk b/keyboards/mechwild/bde/lefty/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/mechwild/bde/lefty/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechwild/bde/readme.md b/keyboards/mechwild/bde/readme.md
index 5481b47160..623903b4e7 100644
--- a/keyboards/mechwild/bde/readme.md
+++ b/keyboards/mechwild/bde/readme.md
@@ -12,4 +12,22 @@ Make example for this keyboard (after setting up your build environment):
 
     make mechwild/bde:default
 
+Flashing example for this keyboard:
+
+    make mechwild/bde:default:flash
+
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Press the 6x6mm button on the underside of the keyboard. On Rev1, it is above the Pro Micro; on Rev2, it is below the OLED.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the R key.
+
+As a Pro Micro-compatible board, the BDE defines `caterina` as its bootloader by default. Many popular Pro Micro alternatives like the Elite-C, Bit-C, Sea-Micro, Puchi-C etc should be flashed with a different bootloader such as `atmel-dfu`.
+
+**If the incorrect bootloader is specified, bootmagic reset and the `QK_BOOT` keycode will not work**.
+
+To avoid this problem, set the correct bootloader in your custom keymap's `rules.mk` file before compiling, or flash using an appropriate target (e.g. `make mechwild/bde:default:dfu`). See [flashing instructions and bootloader information](https://docs.qmk.fm/#/flashing) for more details.
diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h
index 7ea5536055..3d045762ca 100644
--- a/keyboards/mechwild/bde/rev2/config.h
+++ b/keyboards/mechwild/bde/rev2/config.h
@@ -17,46 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* Key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 7
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { C6, D7, B4, D4, E6, B2 }
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B5 }
-
 /* Encoder pins */
-#define ENCODERS_PAD_A { D3 }
-#define ENCODERS_PAD_B { D2 }
+#define ENCODERS_PAD_A { D2 }
+#define ENCODERS_PAD_B { D3 }
 
 /* Encoder resolution */
 #define ENCODER_RESOLUTION 4
-#define TAP_CODE_DELAY 10
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 
 #define OLED_FONT_H "keyboards/mechwild/bde/lib/rev2.c"
-
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
-#    define RGBLED_NUM 8
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== Chosen enabled animations ==*/
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json
index 9c9aa3e2c2..29ddb0e017 100644
--- a/keyboards/mechwild/bde/rev2/info.json
+++ b/keyboards/mechwild/bde/rev2/info.json
@@ -3,5 +3,70 @@
     "usb": {
         "pid": "0x170A",
         "device_version": "1.0.1"
+    },
+    "matrix_pins": {
+        "rows":[ "C6", "D7", "B4", "D4", "E6", "B2" ],
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5" ]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 8,
+        "pin": "B6",
+        "animations": {
+            "rainbow_swirl": true
+        },
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "label":"Q", "x":0, "y":0},
+                { "matrix": [0, 1], "label":"W", "x":1, "y":0},
+                { "matrix": [0, 2], "label":"E", "x":2, "y":0},
+                { "matrix": [0, 3], "label":"R", "x":3, "y":0},
+                { "matrix": [0, 4], "label":"T", "x":4, "y":0},
+                { "matrix": [0, 5], "label":"Y", "x":5, "y":0},
+                { "matrix": [0, 6], "label":"U", "x":6, "y":0},
+                { "matrix": [3, 6], "label":"I", "x":7, "y":0},
+                { "matrix": [3, 5], "label":"O", "x":8, "y":0},
+                { "matrix": [3, 4], "label":"P", "x":9, "y":0},
+                { "matrix": [3, 3], "label":"7", "x":10, "y":0},
+                { "matrix": [3, 2], "label":"8", "x":11, "y":0},
+                { "matrix": [3, 1], "label":"9", "x":12, "y":0},
+                { "matrix": [3, 0], "label":"Mute", "x":13, "y":0},
+
+                { "matrix": [1, 0], "label":"A", "x":0, "y":1},
+                { "matrix": [1, 1], "label":"S", "x":1, "y":1},
+                { "matrix": [1, 2], "label":"D", "x":2, "y":1},
+                { "matrix": [1, 3], "label":"F", "x":3, "y":1},
+                { "matrix": [1, 4], "label":"G", "x":4, "y":1},
+                { "matrix": [1, 5], "label":"H", "x":5, "y":1},
+                { "matrix": [1, 6], "label":"J", "x":6, "y":1},
+                { "matrix": [4, 6], "label":"K", "x":7, "y":1},
+                { "matrix": [4, 5], "label":"L", "x":8, "y":1},
+                { "matrix": [4, 4], "label":"Esc", "x":9, "y":1},
+                { "matrix": [4, 3], "label":"4", "x":10, "y":1},
+                { "matrix": [4, 2], "label":"5", "x":11, "y":1},
+                { "matrix": [4, 1], "label":"6", "x":12, "y":1},
+                { "matrix": [4, 0], "label":"0", "x":13, "y":1},
+
+                { "matrix": [2, 0], "label":"Z", "x":0, "y":2},
+                { "matrix": [2, 1], "label":"X", "x":1, "y":2},
+                { "matrix": [2, 2], "label":"C", "x":2, "y":2},
+                { "matrix": [2, 3], "label":"V", "x":3, "y":2},
+                { "matrix": [2, 4], "label":"Back", "x":4, "y":2},
+                { "matrix": [2, 5], "label":"Space", "x":5, "y":2},
+                { "matrix": [2, 6], "label":"B", "x":6, "y":2},
+                { "matrix": [5, 6], "label":"N", "x":7, "y":2},
+                { "matrix": [5, 5], "label":"M", "x":8, "y":2},
+                { "matrix": [5, 4], "label":"Enter", "x":9, "y":2},
+                { "matrix": [5, 3], "label":"1", "x":10, "y":2},
+                { "matrix": [5, 2], "label":"2", "x":11, "y":2},
+                { "matrix": [5, 1], "label":"3", "x":12, "y":2},
+                { "matrix": [5, 0], "label":"EQL", "x":13, "y":2}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechwild/bde/keymaps/default/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
similarity index 74%
rename from keyboards/mechwild/bde/keymaps/default/keymap.c
rename to keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
index 8222af7576..375dc25ae2 100644
--- a/keyboards/mechwild/bde/keymaps/default/keymap.c
+++ b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2022 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2022 Kyle McCreery
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -25,7 +25,7 @@
 #define ALT_N       ALGR_T(KC_N)
 #define CTL_M       RCTL_T(KC_M)
 #define SFT_ENT     RSFT_T(KC_ENT)
-#define WIN_C		LGUI_T(KC_C)
+#define WIN_C       LGUI_T(KC_C)
 
 enum layer_names {
   _BASE,
@@ -36,24 +36,34 @@ enum layer_names {
 
 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_P7,   KC_P8,   KC_P9,   KC_MUTE,       
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_P7,   KC_P8,   KC_P9,   KC_MUTE,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,     KC_K,    KC_L,    KC_ESC,  KC_P4,   KC_P5,   KC_P6,   KC_P0,
     CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN1_BSPC, FN2_SPC, FN3_B,    ALT_N,   CTL_M,   SFT_ENT, KC_P1,   KC_P2,   KC_P3,   KC_MINS
-  ),                                                                                                     
-  [_FN1] = LAYOUT(                                                                                       
-    _______, _______, _______, QK_BOOT,   _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,       
-    _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0, 
+  ),
+  [_FN1] = LAYOUT(
+    _______, _______, _______, QK_BOOT, _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,
+    _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0,
     _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
   ),
   [_FN2] = LAYOUT(
-    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,       
-    _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN, 
+    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,
+    _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN,
     _______, _______, _______, _______, KC_DEL,   _______,  _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS
-  ),                                                        
-  [_FN3] = 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,  _______, _______,       
-    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______,  
+  ),
+  [_FN3] = 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,  _______, _______,
+    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______
   )
 
 };
+
+// If you are not using an encoder, remember to set ENCODER_ENABLE and ENCODER_MAP_ENABLE to no in rules.mk.
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+        [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_FN3]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    };
+#endif
diff --git a/keyboards/mechwild/bde/rev2/keymaps/default/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/default/rules.mk
new file mode 100644
index 0000000000..d976f24919
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/keymaps/default/rules.mk
@@ -0,0 +1,13 @@
+# If you are using a custom Pro Micro-compatible dev board (Elite-C, Sea-Micro, etc)
+# you may need to uncomment and modify this BOOTLOADER setting to use the correct
+# bootloader. (e.g. Elite-Cs use "atmel-dfu", not "caterina".)
+#
+# See the QMK docs for more information:
+# https://docs.qmk.fm/#/flashing
+# https://docs.qmk.fm/#/driver_installation_zadig?id=list-of-known-bootloaders
+
+# BOOTLOADER = caterina
+
+# If you are not using an encoder, set these options to no.
+ENCODER_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechwild/bde/keymaps/via/config.h b/keyboards/mechwild/bde/rev2/keymaps/via/config.h
similarity index 100%
rename from keyboards/mechwild/bde/keymaps/via/config.h
rename to keyboards/mechwild/bde/rev2/keymaps/via/config.h
diff --git a/keyboards/mechwild/bde/keymaps/via/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
similarity index 76%
rename from keyboards/mechwild/bde/keymaps/via/keymap.c
rename to keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
index e28c1b6db8..8ce001cff8 100644
--- a/keyboards/mechwild/bde/keymaps/via/keymap.c
+++ b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2022 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2022 Kyle McCreery
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -25,7 +25,7 @@
 #define ALT_N       ALGR_T(KC_N)
 #define CTL_M       RCTL_T(KC_M)
 #define SFT_ENT     RSFT_T(KC_ENT)
-#define WIN_C		LGUI_T(KC_C)
+#define WIN_C       LGUI_T(KC_C)
 
 enum layer_names {
   _BASE,
@@ -36,24 +36,33 @@ enum layer_names {
 
 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_P7,   KC_P8,   KC_P9,   KC_MUTE,       
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_P7,   KC_P8,   KC_P9,   KC_MUTE,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,     KC_K,    KC_L,    KC_ESC,  KC_P4,   KC_P5,   KC_P6,   KC_P0,
     CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN1_BSPC, FN2_SPC, FN3_B,    ALT_N,   CTL_M,   SFT_ENT, KC_P1,   KC_P2,   KC_P3,   KC_MINS
-  ),                                                                                                     
-  [_FN1] = LAYOUT(                                                                                       
-    _______, _______, _______, QK_BOOT,   _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,       
-    _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0, 
+  ),
+  [_FN1] = LAYOUT(
+    _______, _______, _______, QK_BOOT, _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,
+    _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0,
     _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
   ),
   [_FN2] = LAYOUT(
-    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,       
-    _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN, 
+    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,
+    _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN,
     _______, _______, _______, _______, KC_DEL,   _______,  _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS
-  ),                                                        
-  [_FN3] = LAYOUT(                                          
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_TOG,       
-    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  
+  ),
+  [_FN3] = LAYOUT(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_TOG,
+    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,
     _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD
   )
 
 };
+
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+        [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_FN3]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    };
+#endif
diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..9ff50262fb
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+ENCODER_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechwild/bde/rev2/rev2.c b/keyboards/mechwild/bde/rev2/rev2.c
index 88c06988d9..3dae312e2b 100644
--- a/keyboards/mechwild/bde/rev2/rev2.c
+++ b/keyboards/mechwild/bde/rev2/rev2.c
@@ -1,21 +1,20 @@
-/* Copyright 2022 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2022 Kyle McCreery
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "bde.h"
+#include "rev2.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
@@ -34,30 +33,25 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 #endif
 
 #ifdef OLED_ENABLE
-	oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-		return OLED_ROTATION_270;       // flips the display 270 degrees
-	}
+static const char PROGMEM mw_logo[] = {
+    0x8A, 0x8B, 0x8C, 0x8D, '\r',
+    0xAA, 0xAB, 0xAC, 0xAD, 0xAE,
+    0xCA, 0xCB, 0xCC, 0xCD, '\r',
+    0x20, 0x8E, 0x8F, 0x90, 0x00};
 
-	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);
-	}
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;       // flips the display 270 degrees
+}
 
-	bool oled_task_user(void) {
-		render_logo();
-		oled_set_cursor(0,6);
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
 
-		oled_write_ln_P(PSTR("Layer"), false);
+    oled_write_P(mw_logo, false);     // Render MechWild "MW" Logo
+    oled_set_cursor(0,6);
+
+    oled_write_ln_P(PSTR("Layer"), false);
 
     switch (get_highest_layer(layer_state)) {
         case 0:
@@ -75,14 +69,13 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
         default:
             oled_write_ln_P(PSTR("Undef"), false);
     }
-	oled_write_ln_P(PSTR(""), 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;
-        
-	}
+
+    return true;
+}
 #endif
diff --git a/keyboards/mechwild/bde/rev2/rev2.h b/keyboards/mechwild/bde/rev2/rev2.h
index 8c8191710a..bb37c7ef69 100644
--- a/keyboards/mechwild/bde/rev2/rev2.h
+++ b/keyboards/mechwild/bde/rev2/rev2.h
@@ -16,16 +16,3 @@
 #pragma once
 
 #include "quantum.h"
-
-#define LAYOUT( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26 }, \
-	{ K0D,   K0C,   K0B,   K0A,   K09,   K08,   K07 }, \
-	{ K1D,   K1C,   K1B,   K1A,   K19,   K18,   K17 }, \
-	{ K2D,   K2C,   K2B,   K2A,   K29,   K28,   K27 }  \
-}
diff --git a/keyboards/mechwild/bde/righty/config.h b/keyboards/mechwild/bde/righty/config.h
deleted file mode 100644
index 732e125bf9..0000000000
--- a/keyboards/mechwild/bde/righty/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 14
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D7, D3}
-#define MATRIX_COL_PINS { B4, B5, E6, C6, D4, D0, F4, F5, F6, B6, B3, B2, B1, F7}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* If RGBLIGHT_ENABLE is set to yes in the rules, ensure the RGBLED_NUM is accurate for how many you have attached. */
-#define RGB_DI_PIN D2
-#define RGBLED_NUM 16 
-#define RGBLIGHT_ANIMATIONS
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json
index 93161bfcec..af23e6e293 100644
--- a/keyboards/mechwild/bde/righty/info.json
+++ b/keyboards/mechwild/bde/righty/info.json
@@ -3,5 +3,75 @@
     "usb": {
         "pid": "0x1702",
         "device_version": "2.0.3"
+    },
+    "matrix_pins": {
+        "rows": ["D1", "D7", "D3"],
+        "cols": [ "B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "rgblight": {
+        "led_count": 16,
+        "pin": "D2",
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "label":"Q", "x":0, "y":0 },
+                { "matrix": [0, 1], "label":"W", "x":1, "y":0 },
+                { "matrix": [0, 2], "label":"E", "x":2, "y":0 },
+                { "matrix": [0, 3], "label":"R", "x":3, "y":0 },
+                { "matrix": [0, 4], "label":"T", "x":4, "y":0 },
+                { "matrix": [0, 5], "label":"Y", "x":5, "y":0 },
+                { "matrix": [0, 6], "label":"U", "x":6, "y":0 },
+                { "matrix": [0, 7], "label":"I", "x":7, "y":0 },
+                { "matrix": [0, 8], "label":"O", "x":8, "y":0 },
+                { "matrix": [0, 9], "label":"P", "x":9, "y":0 },
+                { "matrix": [0, 10], "label":"0", "x":10, "y":0 },
+                { "matrix": [0, 11], "label":"7", "x":11, "y":0 },
+                { "matrix": [0, 12], "label":"8", "x":12, "y":0 },
+                { "matrix": [0, 13], "label":"9", "x":13, "y":0 },
+
+                { "matrix": [1, 0], "label":"A", "x":0, "y":1 },
+                { "matrix": [1, 1], "label":"S", "x":1, "y":1 },
+                { "matrix": [1, 2], "label":"D", "x":2, "y":1 },
+                { "matrix": [1, 3], "label":"F", "x":3, "y":1 },
+                { "matrix": [1, 4], "label":"G", "x":4, "y":1 },
+                { "matrix": [1, 5], "label":"H", "x":5, "y":1 },
+                { "matrix": [1, 6], "label":"J", "x":6, "y":1 },
+                { "matrix": [1, 7], "label":"K", "x":7, "y":1 },
+                { "matrix": [1, 8], "label":"L", "x":8, "y":1 },
+                { "matrix": [1, 9], "label":"Esc", "x":9, "y":1 },
+                { "matrix": [1, 10], "label":"Enter", "x":10, "y":1 , "h":2 },
+                { "matrix": [1, 11], "label":"4", "x":11, "y":1 },
+                { "matrix": [1, 12], "label":"5", "x":12, "y":1 },
+                { "matrix": [1, 13], "label":"6", "x":13, "y":1 },
+
+                { "matrix": [2, 0], "label":"Z", "x":0, "y":2 },
+                { "matrix": [2, 1], "label":"X", "x":1, "y":2 },
+                { "matrix": [2, 2], "label":"C", "x":2, "y":2 },
+                { "matrix": [2, 3], "label":"V", "x":3, "y":2 },
+                { "matrix": [2, 4], "label":"Back", "x":4, "y":2 },
+                { "matrix": [2, 5], "label":"Space", "x":5, "y":2 },
+                { "matrix": [2, 6], "label":"B", "x":6, "y":2 },
+                { "matrix": [2, 7], "label":"N", "x":7, "y":2 },
+                { "matrix": [2, 8], "label":"M", "x":8, "y":2 },
+                { "matrix": [2, 9], "label":"Esc", "x":9, "y":2 },
+                { "matrix": [2, 11], "label":"1", "x":11, "y":2 },
+                { "matrix": [2, 12], "label":"2", "x":12, "y":2 },
+                { "matrix": [2, 13], "label":"3", "x":13, "y":2 }
+            ]
+        }
     }
 }
diff --git a/keyboards/mechwild/bde/keymaps/righty_default/config.h b/keyboards/mechwild/bde/righty/keymaps/default/config.h
similarity index 98%
rename from keyboards/mechwild/bde/keymaps/righty_default/config.h
rename to keyboards/mechwild/bde/righty/keymaps/default/config.h
index 80e8e2e015..5c2d15a006 100644
--- a/keyboards/mechwild/bde/keymaps/righty_default/config.h
+++ b/keyboards/mechwild/bde/righty/keymaps/default/config.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
-
+#pragma once
 /* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
 #define IGNORE_MOD_TAP_INTERRUPT
 
diff --git a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c b/keyboards/mechwild/bde/righty/keymaps/default/keymap.c
similarity index 84%
rename from keyboards/mechwild/bde/keymaps/righty_via/keymap.c
rename to keyboards/mechwild/bde/righty/keymaps/default/keymap.c
index c832b83617..dea0054d95 100644
--- a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c
+++ b/keyboards/mechwild/bde/righty/keymaps/default/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Kyle McCreery
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -24,22 +24,22 @@
 #define ALT_X       ALT_T(KC_X)
 #define ALT_N       ALGR_T(KC_N)
 #define CTL_M       RCTL_T(KC_M)
-#define WIN_C		LGUI_T(KC_C)
+#define WIN_C       LGUI_T(KC_C)
 
 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_0,   KC_7,    KC_8,    KC_9,       
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,  KC_ENT, KC_4,    KC_5,    KC_6,  
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_0,   KC_7,    KC_8,    KC_9,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,  KC_ENT, KC_4,    KC_5,    KC_6,
     CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   KC_RSFT,         KC_1,    KC_2,    KC_3
   ),
 
   [1] = LAYOUT(
     _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
     _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4,   KC_F5,   KC_F6,
-    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
+    _______, _______, KC_LGUI, _______, KC_DEL,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
   ),
-	
+
   [2] = LAYOUT(
     _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, _______, _______, _______, _______,
diff --git a/keyboards/mechwild/bde/righty/keymaps/default/rules.mk b/keyboards/mechwild/bde/righty/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a4c9ac387a
--- /dev/null
+++ b/keyboards/mechwild/bde/righty/keymaps/default/rules.mk
@@ -0,0 +1,9 @@
+# If you are using a custom Pro Micro-compatible dev board (Elite-C, Sea-Micro, etc)
+# you may need to uncomment and modify this BOOTLOADER setting to use the correct
+# bootloader. (e.g. Elite-Cs use "atmel-dfu", not "caterina".)
+#
+# See the QMK docs for more information:
+# https://docs.qmk.fm/#/flashing
+# https://docs.qmk.fm/#/driver_installation_zadig?id=list-of-known-bootloaders
+
+# BOOTLOADER = caterina
diff --git a/keyboards/mechwild/bde/keymaps/lefty_default/config.h b/keyboards/mechwild/bde/righty/keymaps/via/config.h
similarity index 98%
rename from keyboards/mechwild/bde/keymaps/lefty_default/config.h
rename to keyboards/mechwild/bde/righty/keymaps/via/config.h
index 80e8e2e015..5c2d15a006 100644
--- a/keyboards/mechwild/bde/keymaps/lefty_default/config.h
+++ b/keyboards/mechwild/bde/righty/keymaps/via/config.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
-
+#pragma once
 /* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
 #define IGNORE_MOD_TAP_INTERRUPT
 
diff --git a/keyboards/mechwild/bde/keymaps/righty_default/keymap.c b/keyboards/mechwild/bde/righty/keymaps/via/keymap.c
similarity index 96%
rename from keyboards/mechwild/bde/keymaps/righty_default/keymap.c
rename to keyboards/mechwild/bde/righty/keymaps/via/keymap.c
index c832b83617..b8238b152f 100644
--- a/keyboards/mechwild/bde/keymaps/righty_default/keymap.c
+++ b/keyboards/mechwild/bde/righty/keymaps/via/keymap.c
@@ -24,7 +24,7 @@
 #define ALT_X       ALT_T(KC_X)
 #define ALT_N       ALGR_T(KC_N)
 #define CTL_M       RCTL_T(KC_M)
-#define WIN_C		LGUI_T(KC_C)
+#define WIN_C       LGUI_T(KC_C)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -37,9 +37,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
     _______, _______, _______, QK_BOOT, _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
     _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4,   KC_F5,   KC_F6,
-    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
+    _______, _______, KC_LGUI, _______, KC_DEL,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
   ),
-	
+    
   [2] = LAYOUT(
     _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, _______, _______, _______, _______,
diff --git a/keyboards/mechwild/bde/keymaps/righty_via/rules.mk b/keyboards/mechwild/bde/righty/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechwild/bde/keymaps/righty_via/rules.mk
rename to keyboards/mechwild/bde/righty/keymaps/via/rules.mk
diff --git a/keyboards/mechwild/bde/righty/righty.c b/keyboards/mechwild/bde/righty/righty.c
deleted file mode 100644
index 6873ed36a0..0000000000
--- a/keyboards/mechwild/bde/righty/righty.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-#include "bde.h"
diff --git a/keyboards/mechwild/bde/righty/righty.h b/keyboards/mechwild/bde/righty/righty.h
deleted file mode 100644
index f1f29554a1..0000000000
--- a/keyboards/mechwild/bde/righty/righty.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	 K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,   K0B,  K0C,  K0D ,   \
-	 K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,   K1B,  K1C,  K1D ,   \
-	 K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,         K2B,  K2C,  K2D     \
-) { \
-    {K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,   K0B,  K0C,  K0D},   \
-    {K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,   K1B,  K1C,  K1D},   \
-    {K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  KC_NO, K2B,  K2C,  K2D}    \
-}
diff --git a/keyboards/mechwild/bde/righty/rules.mk b/keyboards/mechwild/bde/righty/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/mechwild/bde/righty/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechwild/bde/rules.mk b/keyboards/mechwild/bde/rules.mk
index 2ae725a20b..138a291916 100644
--- a/keyboards/mechwild/bde/rules.mk
+++ b/keyboards/mechwild/bde/rules.mk
@@ -1,20 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = mechwild/bde/rev2

From d4a6ee1cad73ab88ac3faecf2d40204c8e706b5a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 29 Aug 2022 04:24:11 +1000
Subject: [PATCH 244/959] Clean up schema syntax (#18192)

---
 data/schemas/api_keyboard.jsonschema |  1 -
 data/schemas/keyboard.jsonschema     | 46 ++++++++++++++++++++--------
 data/schemas/keymap.jsonschema       |  2 +-
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/data/schemas/api_keyboard.jsonschema b/data/schemas/api_keyboard.jsonschema
index d638658a1d..6a30b5d990 100644
--- a/data/schemas/api_keyboard.jsonschema
+++ b/data/schemas/api_keyboard.jsonschema
@@ -9,7 +9,6 @@
                     "properties": {
                         "url": {"type": "string"}
                     }
-
                 },
                 "parse_errors": {"$ref": "qmk.definitions.v1#/string_array"},
                 "parse_warnings": {"$ref": "qmk.definitions.v1#/string_array"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 77c5a584d4..0308f45116 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -76,7 +76,7 @@
                     "type": "string",
                     "enum": ["BluefruitLE", "RN42"]
                 },
-                "lto": {"type": "boolean"},
+                "lto": {"type": "boolean"}
             }
         },
         "board": {
@@ -86,7 +86,29 @@
         },
         "bootloader": {
             "type": "string",
-            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2", "rp2040"],
+            "enum": [
+                "atmel-dfu",
+                "bootloadhid",
+                "bootloadHID",
+                "caterina",
+                "custom",
+                "gd32v-dfu",
+                "halfkay",
+                "kiibohd",
+                "lufa-dfu",
+                "lufa-ms",
+                "md-boot",
+                "qmk-dfu",
+                "qmk-hid",
+                "rp2040",
+                "stm32-dfu",
+                "stm32duino",
+                "tinyuf2",
+                "unknown",
+                "usbasploader",
+                "USBasp",
+                "wb32-dfu"
+            ]
         },
         "bootloader_instructions": {
             "type": "string",
@@ -104,7 +126,7 @@
                     "type": "string",
                     "enum": ["bin", "hex", "uf2"]
                 },
-                "lto": {"type": "boolean"},
+                "lto": {"type": "boolean"}
             }
         },
         "diode_direction": {
@@ -119,8 +141,8 @@
                 "enabled": {"type": "boolean"},
                 "both_shifts_turns_on": {"type": "boolean"},
                 "double_tap_shift_turns_on": {"type": "boolean"},
-                "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-            },
+                "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
+            }
         },
         "combo": {
             "type": "object",
@@ -228,10 +250,10 @@
             "type": "object",
             "properties": {
                 "enabled": {"type": "boolean"},
-                "delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
-                "interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
-                "max_speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
-                "time_to_max": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
+                "delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "max_speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "time_to_max": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "wheel_delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
             }
         },
@@ -458,7 +480,7 @@
                 "retro_per_key": {"type": "boolean"},
                 "term": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "term_per_key": {"type": "boolean"},
-                "toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"}
             }
         },
         "usb": {
@@ -482,7 +504,7 @@
                     }
                 },
                 "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "wait_for": {"type": "boolean"},
+                "wait_for": {"type": "boolean"}
             }
         },
         "qmk": {
@@ -491,7 +513,7 @@
             "properties": {
                 "keys_per_scan": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "tap_keycode_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "tap_capslock_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "tap_capslock_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}
             }
         },
         "qmk_lufa_bootloader": {
diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema
index 92a1ce533d..0a4fb5d453 100644
--- a/data/schemas/keymap.jsonschema
+++ b/data/schemas/keymap.jsonschema
@@ -31,7 +31,7 @@
                             "properties": {
                                 "action": {
                                     "type": "string",
-                                    "enum": ['beep', 'delay', 'down', 'tap', 'up']
+                                    "enum": ["beep", "delay", "down", "tap", "up"]
                                 },
                                 "keycodes": {
                                     "type": "array",

From 3adaf6a46ae6bac75997e9f2d2e97f550f1c8e87 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 29 Aug 2022 04:35:17 +1000
Subject: [PATCH 245/959] Handle escaping of manufacturer/product strings
 (#18194)

---
 keyboards/adpenrose/shisaku/info.json   | 1 +
 keyboards/karlb/kbic65/info.json        | 1 +
 keyboards/keebio/bamfk4/info.json       | 1 +
 lib/python/qmk/cli/generate/config_h.py | 3 ++-
 lib/python/qmk/info.py                  | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json
index 6f765ba648..a93898c33b 100644
--- a/keyboards/adpenrose/shisaku/info.json
+++ b/keyboards/adpenrose/shisaku/info.json
@@ -1,5 +1,6 @@
 {
     "keyboard_name": "shisaku",
+    "manufacturer": "ADPenrose",
     "url": "https://github.com/ADPenrose/shisaku_keeb",
     "maintainer": "ADPenrose",
     "usb": {
diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json
index d572a92fc2..2d9d7ab037 100644
--- a/keyboards/karlb/kbic65/info.json
+++ b/keyboards/karlb/kbic65/info.json
@@ -1,5 +1,6 @@
 {
     "keyboard_name": "KBIC65",
+    "manufacturer": "b-karl",
     "url": "https://karlb.eu/kbic65/",
     "maintainer": "b-karl",
     "diode_direction": "ROW2COL",
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 1d04f4348b..0704d0e1d2 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -1,5 +1,6 @@
 {
     "keyboard_name": "BAMFK-4",
+    "manufacturer": "Keebio",
     "url": "https://keeb.io",
     "maintainer": "nooges",
     "usb": {
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index a26dcdf7d7..a2178bf1e9 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -117,9 +117,10 @@ def generate_config_items(kb_info_json, config_h_lines):
                 config_h_lines.append(f'#   define {key} {value}')
                 config_h_lines.append(f'#endif // {key}')
         elif key_type == 'str':
+            escaped_str = config_value.replace('\\', '\\\\').replace('"', '\\"')
             config_h_lines.append('')
             config_h_lines.append(f'#ifndef {config_key}')
-            config_h_lines.append(f'#   define {config_key} "{config_value}"')
+            config_h_lines.append(f'#   define {config_key} "{escaped_str}"')
             config_h_lines.append(f'#endif // {config_key}')
         elif key_type == 'bcd_version':
             (major, minor, revision) = config_value.split('.')
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index c95b55916c..e0a46e7ed1 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -479,7 +479,7 @@ def _config_to_json(key_type, config_value):
         return int(config_value)
 
     elif key_type == 'str':
-        return config_value.strip('"')
+        return config_value.strip('"').replace('\\"', '"').replace('\\\\', '\\')
 
     elif key_type == 'bcd_version':
         major = int(config_value[2:4])

From fa08cb2478e8c13a9f1c785956c95cb49bbebba3 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 28 Aug 2022 12:55:19 -0700
Subject: [PATCH 246/959] [Keymap] Drashna keymap updates for 0.18.0 (#18184)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../charybdis/4x6/keymaps/drashna/config.h    |  24 +-
 .../charybdis/4x6/keymaps/drashna/keymap.c    |   4 +-
 .../charybdis/4x6/keymaps/drashna/rules.mk    |   1 +
 .../dilemma/keymaps/drashna/config.h          |   8 +
 .../dilemma/keymaps/drashna/keymap.c          | 160 ++++++++++++
 .../dilemma/keymaps/drashna/rules.mk          |   8 +
 .../tractyl_manuform/5x6_right/f411/config.h  |   2 +-
 .../tractyl_manuform/5x6_right/f411/f411.c    |   2 +-
 .../5x6_right/keymaps/drashna/config.h        |   6 +
 .../ploopyco/mouse/keymaps/drashna/keymap.c   |  19 +-
 .../ploopyco/mouse/keymaps/drashna/rules.mk   |   3 +-
 .../splitkb/kyria/keymaps/drashna/config.h    |   5 +
 users/drashna/autocorrect_data.h              |  90 ++++++-
 users/drashna/callbacks.c                     |  20 +-
 users/drashna/config.h                        | 232 ++----------------
 users/drashna/drashna.c                       | 143 +++++++----
 users/drashna/drashna.h                       |   1 -
 .../autocorrection/autocorrection_data.h      |   1 +
 users/drashna/keyrecords/process_records.c    |   5 +-
 users/drashna/keyrecords/tapping.c            |  14 +-
 users/drashna/keyrecords/unicode.c            |   2 +-
 users/drashna/oled/oled_config.h              |  63 +++++
 users/drashna/oled/oled_stuff.c               |  24 +-
 users/drashna/oled/oled_stuff.h               |   2 +
 users/drashna/pointing/pointing.c             |   6 +-
 users/drashna/post_config.h                   |  16 +-
 users/drashna/rgb/rgb_matrix_config.h         | 107 ++++++++
 users/drashna/rgb/rgblight_config.h           |   8 +
 users/drashna/rules.mk                        |   9 +
 users/drashna/split/split_config.h            |  21 ++
 users/drashna/split/transport_sync.c          |  14 +-
 users/drashna/split/transport_sync.h          |   1 +
 32 files changed, 720 insertions(+), 301 deletions(-)
 create mode 100644 keyboards/bastardkb/dilemma/keymaps/drashna/config.h
 create mode 100644 keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c
 create mode 100644 keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
 create mode 100644 users/drashna/keyrecords/autocorrection/autocorrection_data.h
 create mode 100644 users/drashna/oled/oled_config.h
 create mode 100644 users/drashna/rgb/rgb_matrix_config.h
 create mode 100644 users/drashna/rgb/rgblight_config.h
 create mode 100644 users/drashna/split/split_config.h

diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
index 6711212cb1..7e47953d63 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -16,6 +16,9 @@
  */
 #pragma once
 
+#undef PRODUCT
+#define PRODUCT "Charybdis (4x6) Blackpill"
+
 #undef MATRIX_COL_PINS
 #define MATRIX_COL_PINS \
     { B0, B1, B12, B3, B4, B5 }
@@ -34,7 +37,7 @@
 #define DIODE_DIRECTION ROW2COL
 #define SPLIT_HAND_PIN A3
 #undef MASTER_RIGHT
-// #define USB_VBUS_PIN B10
+#define USB_VBUS_PIN B10
 
 #undef RGB_DI_PIN
 #define RGB_DI_PIN A1
@@ -55,6 +58,8 @@
 #define AUDIO_PWM_PAL_MODE 2
 #define AUDIO_STATE_TIMER  GPTD3
 #define AUDIO_INIT_DELAY
+#define AUDIO_ENABLE_TONE_MULTIPLEXING
+#define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
 
 #undef SOFT_SERIAL_PIN
 // #define SERIAL_USART_FULL_DUPLEX  // Enable full duplex operation mode.
@@ -64,12 +69,8 @@
 // #define SERIAL_USART_TX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 // #define SERIAL_USART_RX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 // #define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
-// // #define SERIAL_USART_PIN_SWAP // swap RX and TX pins on master
-// // To use the highest possible baudrate (3.75Mbit/s) uncomment the following
-// // line, this can result in dropped communications so lower the speed if there
-// // are many timeouts.
-// // #define SERIAL_USART_SPEED (STM32_PCLK2 >> 4)
-#define SERIAL_USART_SPEED       921600
+// #define SERIAL_USART_SPEED       921600
+#define SERIAL_USART_SPEED (1.5 * 1024 * 1024)
 
 #define CRC8_USE_TABLE
 #define CRC8_OPTIMIZE_SPEED
@@ -103,3 +104,12 @@
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
 #define CHARYBDIS_CONFIG_SYNC
+
+#define BOOTMAGIC_LITE_ROW    0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT    5
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+#define BOOTMAGIC_LITE_EEPROM_ROW    1
+#define BOOTMAGIC_LITE_EEPROM_COLUMN 0
+#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT    1
+#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
index 1268d1a8ba..a0f290ad57 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -26,8 +26,8 @@
      KC_ESC,  ________________NUMBER_LEFT________________,            ________________NUMBER_RIGHT_______________, UC_CLUE, \
      SH_TT,   K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A,     SH_TT, \
      LALT_T(KC_TAB), K11, K12,  K13,     K14,     K15,                K16,     K17,     K18,     K19,     K1A,     RALT_T(K1B), \
-     OS_LSFT,CTL_T(K21),ALT_T(K22),GUI_T(K23),K24,K25,                K26,K27,RGUI_T(K28),RALT_T(K29),RCTL_T(K2A), OS_RSFT, \
-                           SFT_T(KC_GRV), UC_IRNY, OS_LGUI,    TT(_MOUSE),  KC_ENT, \
+     OS_LSFT,CTL_T(K21),  K22,  K23,     K24,     K25,                K26,K27,RGUI_T(K28),RALT_T(K29),RCTL_T(K2A), OS_RSFT, \
+                           SFT_T(KC_GRV), OS_LALT, OS_LGUI,    TT(_MOUSE),  KC_ENT, \
                                            KC_SPC, BK_LWER,     DL_RAIS \
     )
 
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
index d9c1a5a9ba..336750bc90 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
@@ -31,3 +31,4 @@ TAP_DANCE_ENABLE      = yes
 DEBOUNCE_TYPE         = asym_eager_defer_pk
 WPM_ENABLE            = yes
 LTO_ENABLE            = no
+# OPT                   = 3
diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/config.h b/keyboards/bastardkb/dilemma/keymaps/drashna/config.h
new file mode 100644
index 0000000000..d7b1351d89
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/keymaps/drashna/config.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define CIRQUE_PINNACLE_TAP_ENABLE
+#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
+#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c
new file mode 100644
index 0000000000..9cd21c3c1f
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c
@@ -0,0 +1,160 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "drashna.h"
+
+// clang-format off
+#define LAYOUT_split_3x5_2_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__)
+#define LAYOUT_split_3x5_2_base( \
+    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
+    ) \
+    LAYOUT_split_3x5_2 ( \
+       K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A, \
+       ALT_T(K11), K12,  K13,     K14,     GUI_T(K15),  LGUI_T(K16),    K17,     K18,     K19, LALT_T(K1A), \
+       CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), \
+                              KC_SPC,  BK_LWER,              DL_RAIS, RSFT_T(KC_ENT) \
+    )
+
+#define LAYOUT_split_3x5_2_base_wrapper(...)       LAYOUT_split_3x5_2_base(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_DEFAULT_LAYER_1] = LAYOUT_split_3x5_2_base_wrapper(
+        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+    ),
+
+    [_DEFAULT_LAYER_2] = LAYOUT_split_3x5_2_base_wrapper(
+        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
+        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
+        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
+    ),
+    [_DEFAULT_LAYER_3] = LAYOUT_split_3x5_2_base_wrapper(
+        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
+        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
+        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
+    ),
+
+    [_DEFAULT_LAYER_4] = LAYOUT_split_3x5_2_base_wrapper(
+        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
+        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
+        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
+    ),
+
+    [_MOUSE] = LAYOUT_split_3x5_2(
+        _______, _______, _______, _______, _______,    KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD,
+        _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
+        _______, _______, _______, _______, _______,    KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
+                                    SNIPING, _______,    _______, _______
+    ),
+    [_LOWER] = LAYOUT_split_3x5_2_wrapper(
+        _________________LOWER_L1__________________,    _________________LOWER_R1__________________,
+        _________________LOWER_L2__________________,    _________________LOWER_R2__________________,
+        _________________LOWER_L3__________________,    _________________LOWER_R3__________________,
+                                   _______, _______,    _______, AUTO_CTN
+    ),
+    [_RAISE] = LAYOUT_split_3x5_2_wrapper(
+        _________________RAISE_L1__________________,    _________________RAISE_R1__________________,
+        _________________RAISE_L2__________________,    _________________RAISE_R2__________________,
+        _________________RAISE_L3__________________,    _________________RAISE_R3__________________,
+                                   _______, _______,    _______, _______
+    ),
+    [_ADJUST] = LAYOUT_split_3x5_2_wrapper(
+        _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________,
+        _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________,
+        _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________,
+                                   KC_NUKE, _______,    _______, QK_BOOT
+    ),
+};
+
+
+void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
+    for (int32_t i = 0; i < 40; i++) {
+        __asm__ volatile("nop" ::: "memory");
+    }
+}
+
+
+#if defined(OLED_ENABLE) && defined(OLED_DISPLAY_128X128)
+#    ifdef UNICODE_COMMON_ENABLE
+#        include "process_unicode_common.h"
+#        include "keyrecords/unicode.h"
+#    endif
+
+extern const char PROGMEM display_border[3];
+
+
+extern uint32_t oled_timer;
+extern bool is_oled_enabled;
+
+
+bool oled_task_keymap(void) {
+    static const char PROGMEM header_image[] = {
+        0, 192, 32, 16, 8, 4, 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, 7, 15, 31, 63, 127, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 127, 63, 31, 15, 7, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 192, 0,
+        //         0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  0
+    };
+    oled_write_raw_P(header_image, sizeof(header_image));
+    oled_set_cursor(7, 0);
+    oled_write_P(PSTR("Rock On"), true);
+
+    render_default_layer_state(1, 1);
+    render_layer_state(1, 2);
+    render_kitty(0, 5);
+    render_wpm(1, 7, 5);
+#   if defined(POINTING_DEVICE_ENABLE)
+    render_pointing_dpi_status(dilemma_get_pointer_sniping_enabled() ? dilemma_get_pointer_sniping_dpi() : dilemma_get_pointer_default_dpi(), 1, 7, 6);
+    render_mouse_mode(17, 6);
+#    elif defined(WPM_ENABLE) && defined(DEBUG_MATRIX_SCAN_RATE)
+    render_matrix_scan_rate(1, 7, 6);
+#    endif
+    render_bootmagic_status(7, 7);
+    render_user_status(1, 9);
+
+    render_mod_status(get_mods() | get_oneshot_mods(), 1, 10);
+    render_keylock_status(host_keyboard_led_state(), 1, 11);
+    render_unicode_mode(1, 12);
+
+//    render_rgb_hsv(1, 13);
+    oled_set_cursor(1, 13);
+    // oled_write_P(PSTR("Timer:"), false);
+    // oled_write(get_u8_str((uint8_t)(timer_elapsed32(oled_timer) / 1000), ' '), false);
+    oled_write_P(PSTR("Status: "), false);
+    if (is_oled_enabled) {
+        oled_write_P(PSTR("on "), false);
+    } else {
+        oled_write_P(PSTR("off"), false);
+    }
+
+    render_keylogger_status(1, 14);
+
+    for (uint8_t i = 1; i < 15; i++) {
+        oled_set_cursor(0, i);
+        oled_write_raw_P(display_border, sizeof(display_border));
+        oled_set_cursor(21, i);
+        oled_write_raw_P(display_border, sizeof(display_border));
+    }
+
+    static const char PROGMEM footer_image[] = {0, 3, 4, 8, 16, 32, 64, 128, 128, 128, 128, 128, 128, 128, 192, 224, 240, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 240, 224, 192, 128, 128, 128, 128, 128, 128, 128, 64, 32, 16, 8, 4, 3, 0};
+    oled_set_cursor(0, 15);
+    oled_write_raw_P(footer_image, sizeof(footer_image));
+
+    return false;
+}
+#endif
diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
new file mode 100644
index 0000000000..5f4afb7259
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
@@ -0,0 +1,8 @@
+SWAP_HANDS_ENABLE     = no
+AUTOCORRECTION_ENABLE = yes
+CAPS_WORD_ENABLE      = yes
+CONSOLE_ENABLE        = yes
+KEYLOGGER_ENABLE      = no
+WPM_ENABLE            = yes
+OLED_ENABLE           = yes
+OLED_DRIVER           = custom
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 791317b9e9..f7e9cfb7d6 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -75,7 +75,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_SDA_PAL_MODE 4
 #define I2C1_CLOCK_SPEED  400000
-#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
 
 /* encoder config */
 #define ENCODERS_PAD_A \
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index 990b835843..09f1b57008 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) {
     }
 }
 
-void bootmagic_lite(void) {
+__attribute__((weak)) void bootmagic_lite(void) {
     // We need multiple scans because debouncing can't be turned off.
     matrix_scan();
 #if defined(DEBOUNCE) && DEBOUNCE > 0
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index daaad5f5e3..f159a69174 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -28,3 +28,9 @@
 #define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 200
 
 #define ENCODER_DEFAULT_POS 0x3
+
+
+#define BOOTMAGIC_LITE_EEPROM_ROW          1
+#define BOOTMAGIC_LITE_EEPROM_COLUMN       0
+#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT    7
+#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 5
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
index ee0f653dee..056a1f7903 100644
--- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
@@ -19,20 +19,23 @@
 
 // safe range starts at `PLOOPY_SAFE_RANGE` instead.
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(/* Base */
+    [0] = LAYOUT(
                  C(KC_C), KC_BTN1, KC_BTN3, KC_BTN2, MO(1), KC_BTN4, KC_BTN5, DPI_CONFIG),
-    [1] = LAYOUT(/* Base */
+    [1] = LAYOUT(
                  RGB_HUI, RGB_MOD, RGB_TOG, RGB_RMOD, MO(1), KC_VOLU, KC_VOLD, QK_BOOT)
-
 };
+// clang-format on
 
+#ifdef RGBLIGHT_ENABLE
 void eeconkfig_init_user(void) {
     rgblight_enable();
-#ifdef RGBLIGHT_EFFECT_TWINKLE
-    rgblight_mode(RGBLIGHT_MODE_TWINKLE+5);
-#else
-    rgblight_mode(RGBLIGHT_MODE_BREATHING+5);
-#endif
+#    ifdef RGBLIGHT_EFFECT_TWINKLE
+    rgblight_mode(RGBLIGHT_MODE_TWINKLE + 5);
+#    else
+    rgblight_mode(RGBLIGHT_MODE_BREATHING + 5);
+#    endif
     rgblight_sethsv(HSV_MAGENTA);
 }
+#endif
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/rules.mk b/keyboards/ploopyco/mouse/keymaps/drashna/rules.mk
index 655dbfdfa0..bd3927a4b1 100644
--- a/keyboards/ploopyco/mouse/keymaps/drashna/rules.mk
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/rules.mk
@@ -1,5 +1,6 @@
 USER_NAME := not_drashna
+BOOTLOADER = qmk-hid
 
 RGBLIGHT_ENABLE = yes
 CONSOLE_ENABLE  = no
-LTO_ENABLE = yes
+LTO_ENABLE      = yes
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/config.h b/keyboards/splitkb/kyria/keymaps/drashna/config.h
index 1de3615d98..ffd17ebd8f 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/config.h
+++ b/keyboards/splitkb/kyria/keymaps/drashna/config.h
@@ -46,4 +46,9 @@
 #define BOOTMAGIC_LITE_ROW_RIGHT    4
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 7
 
+#define BOOTMAGIC_LITE_EEPROM_ROW          1
+#define BOOTMAGIC_LITE_EEPROM_COLUMN       7
+#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT    5
+#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 7
+
 #define SERIAL_USART_SPEED       921600
diff --git a/users/drashna/autocorrect_data.h b/users/drashna/autocorrect_data.h
index bcb5858aa8..52ed7fa9a7 100644
--- a/users/drashna/autocorrect_data.h
+++ b/users/drashna/autocorrect_data.h
@@ -1,5 +1,93 @@
 #if __has_include("../qmk_secrets/autocorrection_data.h")
+#    pragma message "Loading custom library"
 #    include "../qmk_secrets/autocorrection_data.h"
+#    define AUTOCORRECTION_MIN_LENGTH AUTOCORRECT_MIN_LENGTH
+#    define AUTOCORRECTION_MAX_LENGTH AUTOCORRECT_MAX_LENGTH
+
 #else
-#    include "autocorrect_data_default.h"
+// Generated code.
+
+// Autocorrection dictionary (70 entries):
+//   :guage     -> gauge
+//   :the:the:  -> the
+//   :thier     -> their
+//   :ture      -> true
+//   accomodate -> accommodate
+//   acommodate -> accommodate
+//   aparent    -> apparent
+//   aparrent   -> apparent
+//   apparant   -> apparent
+//   apparrent  -> apparent
+//   aquire     -> acquire
+//   becuase    -> because
+//   cauhgt     -> caught
+//   cheif      -> chief
+//   choosen    -> chosen
+//   cieling    -> ceiling
+//   collegue   -> colleague
+//   concensus  -> consensus
+//   contians   -> contains
+//   cosnt      -> const
+//   dervied    -> derived
+//   fales      -> false
+//   fasle      -> false
+//   fitler     -> filter
+//   flase      -> false
+//   foward     -> forward
+//   frequecy   -> frequency
+//   gaurantee  -> guarantee
+//   guaratee   -> guarantee
+//   heigth     -> height
+//   heirarchy  -> hierarchy
+//   inclued    -> include
+//   interator  -> iterator
+//   intput     -> input
+//   invliad    -> invalid
+//   lenght     -> length
+//   liasion    -> liaison
+//   libary     -> library
+//   listner    -> listener
+//   looses:    -> loses
+//   looup      -> lookup
+//   manefist   -> manifest
+//   namesapce  -> namespace
+//   namespcae  -> namespace
+//   occassion  -> occasion
+//   occured    -> occurred
+//   ouptut     -> output
+//   ouput      -> output
+//   overide    -> override
+//   postion    -> position
+//   priviledge -> privilege
+//   psuedo     -> pseudo
+//   recieve    -> receive
+//   refered    -> referred
+//   relevent   -> relevant
+//   repitition -> repetition
+//   retrun     -> return
+//   retun      -> return
+//   reuslt     -> result
+//   reutrn     -> return
+//   saftey     -> safety
+//   seperate   -> separate
+//   singed     -> signed
+//   stirng     -> string
+//   strign     -> string
+//   swithc     -> switch
+//   swtich     -> switch
+//   thresold   -> threshold
+//   udpate     -> update
+//   widht      -> width
+
+#define AUTOCORRECT_MIN_LENGTH 5  // ":ture"
+#define AUTOCORRECT_MAX_LENGTH 10 // "accomodate"
+
+#define DICTIONARY_SIZE 1104
+
+static const uint8_t autocorrect_data[DICTIONARY_SIZE] PROGMEM = {108, 43,  0,   6,   71, 0,  7,   81, 0,   8,   199, 0,   9,   240, 1,  10,  250, 1,  11,  26,  2,   17,  53,  2,   18, 190, 2,   19,  202, 2,   21,  212, 2,   22,  20,  3,   23,  67,  3,   28,  16,  4,   0,  72,  50,  0,   22,  60,  0,   0,   11,  23,  44, 8,   11, 23,  44,  0,   132, 0,   8,   22,  18,  18,  15,  0,  132, 115, 101, 115, 0,   11,  23,  12,  26,  22,  0,   129, 99,  104, 0,   68,  94,  0,   8,   106, 0,   15, 174, 0,   21, 187, 0,   0,   12,  15,  25,  17,  12,  0,   131, 97,  108, 105, 100, 0,   74,  119, 0,   12,  129, 0,   21,  140, 0,   24,  165, 0,   0,   17,  12,  22,  0,   131, 103, 110, 101, 100, 0,   25,  21, 8,   7,   0,   131, 105, 118, 101, 100, 0,   72,  147, 0,  24,  156, 0,  0,   9,   8,   21,  0,   129, 114, 101, 100, 0,   6,   6,   18,  0,   129, 114, 101, 100, 0,   15,  6,   17,  12,  0,   129, 100, 101, 0,   18, 22,  8,   21,  11,  23,  0,   130, 104, 111,
+                                                                  108, 100, 0,   4,   26, 18, 9,   0,  131, 114, 119, 97,  114, 100, 0,  68,  233, 0,  6,   246, 0,   7,   4,   1,   8,  16,  1,   10,  52,  1,   15,  81,  1,   21,  90,  1,   22,  117, 1,   23,  144, 1,   24, 215, 1,   25,  228, 1,   0,   6,   19,  22,  8,  16,  4,  17,  0,   130, 97,  99,  101, 0,   19,  4,   22,  8,  16,  4,   17,  0,   131, 112, 97,  99,  101, 0,   12,  21,  8,   25,  18,  0,   130, 114, 105, 100, 101, 0,  23,  0,   68, 25,  1,   17,  36,  1,   0,   21,  4,   24,  10,  0,   130, 110, 116, 101, 101, 0,   4,   21,  24,  4,   10,  0,   135, 117, 97,  114, 97,  110, 116, 101, 101, 0,   68,  59,  1,   7,   69,  1,   0,  24,  10,  44,  0,   131, 97,  117, 103, 101, 0,   8,   15, 12,  25,  12, 21,  19,  0,   130, 103, 101, 0,   22,  4,   9,   0,   130, 108, 115, 101, 0,   76,  97,  1,   24,  109, 1,   0,   24,  20,  4,   0,   132, 99, 113, 117, 105, 114, 101, 0,   23,  44,  0,
+                                                                  130, 114, 117, 101, 0,  4,  0,   79, 126, 1,   24,  134, 1,   0,   9,  0,   131, 97, 108, 115, 101, 0,   6,   8,   5,  0,   131, 97,  117, 115, 101, 0,   4,   0,   71,  156, 1,   19,  193, 1,   21,  203, 1,  0,   18,  16,  0,   80,  166, 1,   18,  181, 1,  0,   18, 6,   4,   0,   135, 99,  111, 109, 109, 111, 100, 97, 116, 101, 0,   6,   6,   4,   0,   132, 109, 111, 100, 97,  116, 101, 0,   7,   24,  0,   132, 112, 100, 97, 116, 101, 0,  8,   19,  8,   22,  0,   132, 97,  114, 97,  116, 101, 0,   10,  8,   15,  15,  18,  6,   0,   130, 97,  103, 117, 101, 0,   8,   12,  6,   8,   21,  0,   131, 101, 105, 118, 101, 0,   12,  8,   11, 6,   0,   130, 105, 101, 102, 0,   17,  0,   76,  3,   2,  21,  16,  2,  0,   15,  8,   12,  6,   0,   133, 101, 105, 108, 105, 110, 103, 0,   12,  23,  22,  0,   131, 114, 105, 110, 103, 0,   70,  33,  2,   23,  44, 2,   0,   12,  23,  26,  22,  0,   131, 105,
+                                                                  116, 99,  104, 0,   10, 12, 8,   11, 0,   129, 104, 116, 0,   72,  69, 2,   10,  80, 2,   18,  89,  2,   21,  156, 2,  24,  167, 2,   0,   22,  18,  18,  11,  6,   0,   131, 115, 101, 110, 0,   12,  21,  23, 22,  0,   129, 110, 103, 0,   12,  0,   86,  98, 2,   23, 124, 2,   0,   68,  105, 2,   22,  114, 2,   0,   12, 15,  0,   131, 105, 115, 111, 110, 0,   4,   6,   6,   18,  0,   131, 105, 111, 110, 0,   76,  131, 2,   22, 146, 2,   0,  23,  12,  19,  8,   21,  0,   134, 101, 116, 105, 116, 105, 111, 110, 0,   18,  19,  0,   131, 105, 116, 105, 111, 110, 0,   23,  24,  8,   21,  0,   131, 116, 117, 114, 110, 0,   85,  174, 2,   23, 183, 2,   0,   23,  8,   21,  0,   130, 117, 114, 110, 0,  8,   21,  0,  128, 114, 110, 0,   7,   8,   24,  22,  19,  0,   131, 101, 117, 100, 111, 0,   24,  18,  18,  15,  0,   129, 107, 117, 112, 0,   72,  219, 2,  18,  3,   3,   0,   76,  229, 2,   15,  238,
+                                                                  2,   17,  248, 2,   0,  11, 23,  44, 0,   130, 101, 105, 114, 0,   23, 12,  9,   0,  131, 108, 116, 101, 114, 0,   23, 22,  12,  15,  0,   130, 101, 110, 101, 114, 0,   23,  4,   21,  8,   23,  17,  12,  0,  135, 116, 101, 114, 97,  116, 111, 114, 0,   72, 30,  3,  17,  38,  3,   24,  51,  3,   0,   15,  4,   9,   0,  129, 115, 101, 0,   4,   12,  23,  17,  18,  6,   0,   131, 97,  105, 110, 115, 0,   22,  17,  8,   6,   17, 18,  6,   0,  133, 115, 101, 110, 115, 117, 115, 0,   74,  86,  3,   11,  96,  3,   15,  118, 3,   17,  129, 3,   22,  218, 3,   24,  232, 3,   0,   11,  24,  4,   6,   0,   130, 103, 104, 116, 0,   71,  103, 3,  10,  110, 3,   0,   12,  26,  0,   129, 116, 104, 0,   17, 8,   15,  0,  129, 116, 104, 0,   22,  24,  8,   21,  0,   131, 115, 117, 108, 116, 0,   68,  139, 3,   8,   150, 3,   22,  210, 3,   0,   21,  4,   19,  19, 4,   0,   130, 101, 110, 116, 0,   85,  157,
+                                                                  3,   25,  200, 3,   0,  68, 164, 3,  21,  175, 3,   0,   19,  4,   0,  132, 112, 97, 114, 101, 110, 116, 0,   4,   19, 0,   68,  185, 3,   19,  193, 3,   0,   133, 112, 97,  114, 101, 110, 116, 0,   4,   0,  131, 101, 110, 116, 0,   8,   15,  8,   21,  0,  130, 97, 110, 116, 0,   18,  6,   0,   130, 110, 115, 116, 0,  12,  9,   8,   17,  4,   16,  0,   132, 105, 102, 101, 115, 116, 0,   83,  239, 3,   23,  6,   4,   0,   87, 246, 3,   24, 254, 3,   0,   17,  12,  0,   131, 112, 117, 116, 0,   18,  0,   130, 116, 112, 117, 116, 0,   19,  24,  18,  0,   131, 116, 112, 117, 116, 0,   70,  29,  4,   8,   41,  4,   11,  51,  4,   21,  69, 4,   0,   8,   24,  20,  8,   21,  9,   0,   129, 110, 99, 121, 0,   23, 9,   4,   22,  0,   130, 101, 116, 121, 0,   6,   21,  4,   21,  12,  8,   11,  0,   135, 105, 101, 114, 97,  114, 99,  104, 121, 0,   4,   5,  12,  15,  0,   130, 114, 97,  114, 121, 0};
 #endif
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c
index f9a3f598d3..111b5f79d7 100644
--- a/users/drashna/callbacks.c
+++ b/users/drashna/callbacks.c
@@ -3,6 +3,12 @@
 
 #include "drashna.h"
 
+
+#ifdef I2C_SCANNER_ENABLE
+void matrix_scan_i2c(void);
+void keyboard_post_init_i2c(void);
+#endif
+
 __attribute__((weak)) void keyboard_pre_init_keymap(void) {}
 void                       keyboard_pre_init_user(void) {
     userspace_config.raw = eeconfig_read_user();
@@ -42,6 +48,10 @@ void                       keyboard_post_init_user(void) {
 #if defined(SPLIT_KEYBOARD) && defined(SPLIT_TRANSACTION_IDS_USER)
     keyboard_post_init_transport_sync();
 #endif
+#ifdef I2C_SCANNER_ENABLE
+    matrix_scan_i2c();
+#endif
+
     keyboard_post_init_keymap();
 }
 
@@ -54,10 +64,10 @@ void                       shutdown_user(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(1);
-    rgblight_setrgb_red();
+    rgblight_setrgb(rgblight_get_val(), 0x00, 0x00);
 #endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
+    rgb_matrix_set_color_all(rgb_matrix_get_val(), 0x00, 0x00);
     rgb_matrix_update_pwm_buffers();
 #endif // RGB_MATRIX_ENABLE
 #ifdef OLED_ENABLE
@@ -112,6 +122,12 @@ void                       matrix_scan_user(void) {
 #endif
 #if defined(CUSTOM_RGB_MATRIX)
     matrix_scan_rgb_matrix();
+#endif
+#ifdef I2C_SCANNER_ENABLE
+    matrix_scan_i2c();
+#endif
+#ifdef CUSTOM_OLED_DRIVER
+    matrix_scan_oled();
 #endif
     matrix_scan_secret();
 
diff --git a/users/drashna/config.h b/users/drashna/config.h
index fd1530a100..57b26786b3 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -11,26 +11,20 @@
 #endif
 #define IS_COMMAND() (((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) == MOD_MASK_SHIFT)
 
-/* Set Polling rate to 1000Hz */
-#define USB_POLLING_INTERVAL_MS 1
 
 #if defined(SPLIT_KEYBOARD)
-// #    define SPLIT_TRANSPORT_MIRROR
-#    define SPLIT_LAYER_STATE_ENABLE
-#    define SPLIT_LED_STATE_ENABLE
-#    define SPLIT_MODS_ENABLE
-#    ifdef WPM_ENABLE
-#        define SPLIT_WPM_ENABLE
-#    endif
-#    ifdef OLED_ENABLE
-#        define SPLIT_OLED_ENABLE
-#    endif
-#    if defined(__AVR__) && !defined(SELECT_SOFT_SERIAL_SPEED)
-#        define SELECT_SOFT_SERIAL_SPEED 1
-#    endif
-#    ifdef CUSTOM_SPLIT_TRANSPORT_SYNC
-#        define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_WATCHDOG_SYNC, RPC_ID_USER_KEYLOG_STR
-#    endif
+#    include "split/split_config.h"
+#endif
+#ifdef RGBLIGHT_ENABLE
+#    include "rgb/rgblight_config.h"
+#endif // RGBLIGHT_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb/rgb_matrix_config.h"
+#endif // RGB_MATRIX_ENABLE
+
+#ifdef OLED_ENABLE
+#    include "oled/oled_config.h"
 #endif
 
 #if defined(WPM_ENABLE)
@@ -71,157 +65,6 @@
 
 #define UNICODE_SELECTED_MODES UC_WINC, UC_MAC
 
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_SLEEP
-#    define RGBLIGHT_EFFECT_TWINKLE_LIFE 250
-#    define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1 / 24
-#endif // RGBLIGHT_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-// #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_HUE_BREATHING
-#    undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    undef ENABLE_RGB_MATRIX_HUE_WAVE
-#    undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    if !defined(SPLIT_KEYBOARD) && !defined(KEYBOARD_ergodox_ez) && !defined(KEYBOARD_moonlander)
-#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    endif
-#    if defined(__arm__) || defined(__AVR_AT90USB1286__) || defined(KEYBOARD_launchpad)
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#        define ENABLE_RGB_MATRIX_BREATHING
-#        define ENABLE_RGB_MATRIX_BAND_SAT
-#        define ENABLE_RGB_MATRIX_BAND_VAL
-#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#        define ENABLE_RGB_MATRIX_CYCLE_ALL
-#        define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#        define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#        define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#        define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#        define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#        define ENABLE_RGB_MATRIX_DUAL_BEACON
-#        define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#        define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#        define ENABLE_RGB_MATRIX_RAINDROPS
-#        define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#        define ENABLE_RGB_MATRIX_HUE_BREATHING
-#        define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#        define ENABLE_RGB_MATRIX_HUE_WAVE
-#        define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#        define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#        define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#        define ENABLE_RGB_MATRIX_SPLASH
-#        define ENABLE_RGB_MATRIX_MULTISPLASH
-#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#    endif // AVR
-#endif     // RGB_MATRIX_ENABLE
-
-#ifdef OLED_ENABLE
-#    ifndef OLED_UPDATE_INTERVAL
-#        ifdef OLED_DRIVER_SH1107
-#            define OLED_UPDATE_INTERVAL 75
-#        else
-#            ifdef SPLIT_KEYBOARD
-#                define OLED_UPDATE_INTERVAL 60
-#            else
-#                define OLED_UPDATE_INTERVAL 15
-#            endif
-#        endif
-#    endif
-#    define OLED_DISABLE_TIMEOUT
-#    ifdef OLED_FONT_H
-#        undef OLED_FONT_H
-#    endif
-#    define OLED_FONT_H "oled/drashna_font.h"
-#    define OLED_FONT_END 255
-// #    define OLED_FONT_5X5
-// #    define OLED_FONT_AZTECH
-// #    define OLED_FONT_BMPLAIN
-// #    define OLED_FONT_CRACKERS
-#    define OLED_FONT_DEAD_MEAL
-// #    define OLED_FONT_EIN
-// #    define OLED_FONT_HISKYF21
-// #    define OLED_FONT_SQUASH
-// #    define OLED_FONT_ZXPIX
-// #    define OLED_FONT_SUPER_DIGG
-
-// #    define OLED_LOGO_BEBOP
-// #    define OLED_LOGO_CORNE
-// #    define OLED_LOGO_GMK_BAD
-// #    define OLED_LOGO_GOTHAM
-// #    define OLED_LOGO_HUE_MANITEE
-// #    define OLED_LOGO_LOOSE
-#    define OLED_LOGO_SCIFI
-// #    define OLED_LOGO_SETS3N
-// #    define OLED_LOGO_SKEEB
-#endif
-
 // #define WPM_ESTIMATED_WORD_SIZE 5
 #define WPM_ALLOW_COUNT_REGRESSION
 // #define WPM_UNFILTERED
@@ -237,11 +80,18 @@
 #    define ONESHOT_TIMEOUT 3000
 #endif // !ONESHOT_TIMEOUT
 
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-#define PERMISSIVE_HOLD_PER_KEY
-#define TAPPING_FORCE_HOLD_PER_KEY
-#define RETRO_TAPPING_PER_KEY
-#define TAPPING_TERM_PER_KEY
+#if defined(PER_KEY_TAPPING)
+#    define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
+#    define PERMISSIVE_HOLD_PER_KEY
+#    define TAPPING_FORCE_HOLD_PER_KEY
+#    define HOLD_ON_OTHER_KEY
+#    define RETRO_TAPPING_PER_KEY
+#    define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+#    define TAPPING_TERM_PER_KEY
+#else
+#    define IGNORE_MOD_TAP_INTERRUPT
+#    undef PERMISSIVE_HOLD
+#endif
 
 #ifndef TAPPING_TOGGLE
 #    define TAPPING_TOGGLE 1
@@ -276,41 +126,7 @@
 #    define C15 PAL_LINE(GPIOC, 15)
 #endif
 
-#ifdef OLED_DRIVER_SH1107
-#    define OLED_DISPLAY_CUSTOM
-#    define OLED_IC_SH1107 2
-#    define OLED_DISPLAY_128X128
-#    define OLED_DISPLAY_WIDTH 128
-#    define OLED_DISPLAY_HEIGHT 128
-#    define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)
-#    define OLED_BLOCK_TYPE uint32_t
-#    define OLED_SOURCE_MAP \
-        { 0, 8, 16, 24, 32, 40, 48, 56 }
-#    define OLED_TARGET_MAP \
-        { 56, 48, 40, 32, 24, 16, 8, 0 }
-#    define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)
-#    define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)
-#    define OLED_COM_PINS COM_PINS_ALT
-#    define OLED_IC OLED_IC_SH1107
-#    ifndef OLED_BRIGHTNESS
-#        define OLED_BRIGHTNESS 50
-#    endif
-#endif
-
-#ifdef USE_I2CV1
-#    define I2C1_CLOCK_SPEED 400000
-#    define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-#endif
 
 #define ENABLE_COMPILE_KEYCODE
 
 #define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
-
-#ifndef SECURE_UNLOCK_SEQUENCE
-#    define SECURE_UNLOCK_SEQUENCE    \
-        {                             \
-            {2, 1}, {2, 2}, {2, 3}, { \
-                2, 4                  \
-            }                         \
-        }
-#endif
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 6e8d4ac9bd..85f47c8cb4 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -76,49 +76,110 @@ void tap_code16_nomods(uint16_t kc) {
     set_mods(temp_mod);
 }
 
-/**
- * @brief Run shutdown routine and soft reboot firmware.
- *
- */
+#ifdef I2C_SCANNER_ENABLE
+#    include "i2c_master.h"
+#    include "debug.h"
 
-#ifdef HAPTIC_ENABLE
-#    include "haptic.h"
-#endif
-
-#ifdef AUDIO_ENABLE
-#    ifndef GOODBYE_SONG
-#        define GOODBYE_SONG SONG(GOODBYE_SOUND)
+#    ifndef I2C_SCANNER_TIMEOUT
+#        define I2C_SCANNER_TIMEOUT 50
 #    endif
-float reset_song[][2] = GOODBYE_SONG;
-#endif
 
-void software_reset(void) {
-    clear_keyboard();
-#if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
-    process_midi_all_notes_off();
-#endif
-#ifdef AUDIO_ENABLE
-#    ifndef NO_MUSIC_MODE
-    music_all_notes_off();
-#    endif
-    uint16_t timer_start = timer_read();
-    PLAY_SONG(reset_song);
-    shutdown_user();
-    while (timer_elapsed(timer_start) < 250) wait_ms(1);
-    stop_all_notes();
-#else
-    shutdown_user();
-    wait_ms(250);
-#endif
-#ifdef HAPTIC_ENABLE
-    haptic_shutdown();
-#endif
+i2c_status_t i2c_start_bodge(uint8_t address, uint16_t timeout) {
+    i2c_start(address);
 
-#if defined(PROTOCOL_LUFA)
-    wdt_enable(WDTO_250MS);
-#elif defined(PROTOCOL_CHIBIOS)
-#    if defined(MCU_STM32) || defined(MCU_KINETIS)
-    NVIC_SystemReset();
-#    endif
-#endif
+    // except on ChibiOS where the only way is do do "something"
+    uint8_t data = 0;
+    return i2c_readReg(address, 0, &data, sizeof(data), I2C_SCANNER_TIMEOUT);
+}
+
+#    define i2c_start i2c_start_bodge
+
+void do_scan(void) {
+    uint8_t nDevices = 0;
+
+    dprintf("Scanning...\n");
+
+    for (uint8_t address = 1; address < 127; address++) {
+        // The i2c_scanner uses the return value of
+        // i2c_start to see if a device did acknowledge to the address.
+        i2c_status_t error = i2c_start(address << 1, I2C_SCANNER_TIMEOUT);
+        if (error == I2C_STATUS_SUCCESS) {
+            i2c_stop();
+            xprintf("  I2C device found at address 0x%02X\n", I2C_SCANNER_TIMEOUT);
+            nDevices++;
+        } else {
+            // dprintf("  Unknown error (%u) at address 0x%02X\n", error, address);
+        }
+    }
+
+    if (nDevices == 0)
+        xprintf("No I2C devices found\n");
+    else
+        xprintf("done\n");
+}
+
+uint16_t scan_timer = 0;
+
+void matrix_scan_i2c(void) {
+    if (timer_elapsed(scan_timer) > 5000) {
+        do_scan();
+        scan_timer = timer_read();
+    }
+}
+
+void keyboard_post_init_i2c(void) {
+    i2c_init();
+    scan_timer = timer_read();
+}
+#endif
+
+void bootmagic_lite(void) {
+    bool perform_reset = false;
+    // We need multiple scans because debouncing can't be turned off.
+    matrix_scan();
+#if defined(DEBOUNCE) && DEBOUNCE > 0
+    wait_ms(DEBOUNCE * 2);
+#else
+    wait_ms(30);
+#endif
+    matrix_scan();
+
+    // If the configured key (commonly Esc) is held down on power up,
+    // reset the EEPROM valid state and jump to bootloader.
+    // This isn't very generalized, but we need something that doesn't
+    // rely on user's keymaps in firmware or EEPROM.
+    uint8_t row = BOOTMAGIC_LITE_ROW, col = BOOTMAGIC_LITE_COLUMN;
+#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN)
+    uint8_t row_e = BOOTMAGIC_LITE_EEPROM_ROW, col_e = BOOTMAGIC_LITE_EEPROM_COLUMN;
+#endif
+
+#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT)
+    if (!is_keyboard_left()) {
+        row = BOOTMAGIC_LITE_ROW_RIGHT;
+        col = BOOTMAGIC_LITE_COLUMN_RIGHT;
+#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN) && defined(BOOTMAGIC_LITE_EEPROM_ROW_RIGHT) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT)
+        row_e = BOOTMAGIC_LITE_EEPROM_ROW_RIGHT;
+        col_e = BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT;
+#    endif
+    }
+#endif
+
+#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN)
+    if (matrix_get_row(row_e) & (1 << col_e)) {
+        eeconfig_disable();
+        perform_reset = true;
+    }
+#endif
+    if (matrix_get_row(row) & (1 << col)) {
+        perform_reset = true;
+    }
+#ifdef STM32F411xE
+    if (!readPin(A0)) {
+        perform_reset = true;
+    }
+#endif
+
+    if (perform_reset) {
+        bootloader_jump();
+    }
 }
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 0bf1de84cf..16d7cda638 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -79,7 +79,6 @@ bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed);
 bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
 bool hasAllBitsInMask(uint8_t value, uint8_t mask);
 void tap_code16_nomods(uint16_t kc);
-void software_reset(void);
 
 // clang-format off
 typedef union {
diff --git a/users/drashna/keyrecords/autocorrection/autocorrection_data.h b/users/drashna/keyrecords/autocorrection/autocorrection_data.h
new file mode 100644
index 0000000000..90484d3b12
--- /dev/null
+++ b/users/drashna/keyrecords/autocorrection/autocorrection_data.h
@@ -0,0 +1 @@
+#include "autocorrect_data.h"
diff --git a/users/drashna/keyrecords/process_records.c b/users/drashna/keyrecords/process_records.c
index c328451b75..197fd94171 100644
--- a/users/drashna/keyrecords/process_records.c
+++ b/users/drashna/keyrecords/process_records.c
@@ -6,9 +6,6 @@
 #ifdef AUTOCORRECTION_ENABLE
 #    include "autocorrection/autocorrection.h"
 #endif
-#ifdef __AVR__
-#    include <avr/wdt.h>
-#endif
 
 uint16_t copy_paste_timer;
 bool     host_driver_disabled = false;
@@ -49,7 +46,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #endif
     // If console is enabled, it will print the matrix position and status of each key pressed
 #ifdef KEYLOGGER_ENABLE
-    uprintf("KL: kc: 0x%04X, col: %2u, row: %2u, pressed: %b, time: %5u, int: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
+    uprintf("KL: kc: 0x%04X, col: %2u, row: %2u, pressed: %1d, time: %5u, int: %1d, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
 #endif // KEYLOGGER_ENABLE
 #if defined(OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
     process_record_user_oled(keycode, record);
diff --git a/users/drashna/keyrecords/tapping.c b/users/drashna/keyrecords/tapping.c
index daba25bd72..7496610c2f 100644
--- a/users/drashna/keyrecords/tapping.c
+++ b/users/drashna/keyrecords/tapping.c
@@ -3,6 +3,7 @@
 
 #include "drashna.h"
 
+#ifdef TAPPING_TERM_PER_KEY
 __attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case BK_LWER:
@@ -11,7 +12,9 @@ __attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *r
             return TAPPING_TERM;
     }
 }
+#endif // TAPPING_TERM_PER_KEY
 
+#ifdef PERMISSIVE_HOLD_PER_KEY
 __attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
     // Immediately select the hold action when another key is tapped:
     // return true;
@@ -22,7 +25,9 @@ __attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *re
             return false;
     }
 }
+#endif // PERMISSIVE_HOLD_PER_KEY
 
+#ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 __attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
     // Immediately select the hold action when another key is pressed.
     // return true;
@@ -32,10 +37,12 @@ __attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyreco
 //        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
 //            return true;
         default:
-            return true;
+            return false;
     }
 }
+#endif // HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 
+#ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY
 __attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
     // Do not force the mod-tap key press to be handled as a modifier
     // if any other key was pressed while the mod-tap key is held down.
@@ -48,17 +55,22 @@ __attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrec
             return true;
     }
 }
+#endif // IGNORE_MOD_TAP_INTERRUPT_PER_KEY
 
+#ifdef TAPPING_FORCE_HOLD_PER_KEY
 __attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         default:
             return false;
     }
 }
+#endif // TAPPING_FORCE_HOLD_PER_KEY
 
+#ifdef RETRO_TAPPING_PER_KEY
 __attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         default:
             return false;
     }
 }
+#endif // RETRO_TAPPING_PER_KEY
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index ea51b26061..b3fc71cb09 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -142,7 +142,7 @@ DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_super,
                               0x2071, // i
                               0x02B2, // j
                               0x1D4F, // k
-                              0x1D4F, // l
+                              0x02E1, // l
                               0x1D50, // m
                               0x207F, // n
                               0x1D52, // o
diff --git a/users/drashna/oled/oled_config.h b/users/drashna/oled/oled_config.h
new file mode 100644
index 0000000000..c46c0c39ce
--- /dev/null
+++ b/users/drashna/oled/oled_config.h
@@ -0,0 +1,63 @@
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifndef OLED_UPDATE_INTERVAL
+#    ifdef OLED_DRIVER_SH1107
+#        define OLED_UPDATE_INTERVAL 75
+#    else
+#        ifdef SPLIT_KEYBOARD
+#            define OLED_UPDATE_INTERVAL 60
+#        else
+#            define OLED_UPDATE_INTERVAL 15
+#        endif
+#    endif
+#endif
+#define OLED_DISABLE_TIMEOUT
+#ifdef OLED_FONT_H
+#    undef OLED_FONT_H
+#endif
+#define OLED_FONT_H "oled/drashna_font.h"
+#define OLED_FONT_END 255
+// #    define OLED_FONT_5X5
+// #    define OLED_FONT_AZTECH
+// #    define OLED_FONT_BMPLAIN
+// #    define OLED_FONT_CRACKERS
+#define OLED_FONT_DEAD_MEAL
+// #    define OLED_FONT_EIN
+// #    define OLED_FONT_HISKYF21
+// #    define OLED_FONT_SQUASH
+// #    define OLED_FONT_ZXPIX
+// #    define OLED_FONT_SUPER_DIGG
+
+// #    define OLED_LOGO_BEBOP
+// #    define OLED_LOGO_CORNE
+// #    define OLED_LOGO_GMK_BAD
+// #    define OLED_LOGO_GOTHAM
+// #    define OLED_LOGO_HUE_MANITEE
+// #    define OLED_LOGO_LOOSE
+#define OLED_LOGO_SCIFI
+// #    define OLED_LOGO_SETS3N
+// #    define OLED_LOGO_SKEEB
+
+#ifdef OLED_DRIVER_SH1107
+#    define OLED_DISPLAY_CUSTOM
+#    define OLED_IC_SH1107 2
+#    define OLED_DISPLAY_128X128
+#    define OLED_DISPLAY_WIDTH 128
+#    define OLED_DISPLAY_HEIGHT 128
+#    define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)
+#    define OLED_BLOCK_TYPE uint32_t
+#    define OLED_SOURCE_MAP \
+        { 0, 8, 16, 24, 32, 40, 48, 56 }
+#    define OLED_TARGET_MAP \
+        { 56, 48, 40, 32, 24, 16, 8, 0 }
+#    define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)
+#    define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)
+#    define OLED_COM_PINS COM_PINS_ALT
+#    define OLED_IC OLED_IC_SH1107
+#    ifndef OLED_BRIGHTNESS
+#        define OLED_BRIGHTNESS 50
+#    endif
+#endif
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 5baf5b558b..e082f8ab3e 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -28,6 +28,8 @@
 #endif
 #include <string.h>
 
+bool is_oled_enabled = true;
+
 extern bool host_driver_disabled;
 
 uint32_t        oled_timer                        = 0;
@@ -850,7 +852,7 @@ void render_status_right(void) {
     render_layer_state(1, 2);
     render_mod_status(get_mods() | get_oneshot_mods(), 1, 5);
 #if !defined(OLED_DISPLAY_VERBOSE) && defined(WPM_ENABLE) && !defined(STM32F303xC)
-    render_wpm(2);
+    render_wpm(2, 7, 1);
 #endif
     render_keylock_status(host_keyboard_led_state(), 1, 6);
 }
@@ -929,16 +931,14 @@ __attribute__((weak)) bool oled_task_keymap(void) {
 }
 
 bool oled_task_user(void) {
-    if (is_keyboard_master()) {
 #ifndef OLED_DISPLAY_TEST
-        if (timer_elapsed32(oled_timer) > 60000) {
-            oled_off();
-            return false;
-        } else
+    if (!is_oled_enabled) {
+        oled_off();
+        return false;
+    } else
 #endif
-        {
-            oled_on();
-        }
+    {
+        oled_on();
     }
 
     if (!oled_task_keymap()) {
@@ -990,3 +990,9 @@ bool oled_task_user(void) {
 
     return false;
 }
+
+extern bool oled_initialized;
+
+__attribute__((weak)) void matrix_scan_oled(void) {
+    is_oled_enabled = !(timer_elapsed32(oled_timer) > 60000);
+}
diff --git a/users/drashna/oled/oled_stuff.h b/users/drashna/oled/oled_stuff.h
index 17bd9319d1..df1a6d1805 100644
--- a/users/drashna/oled/oled_stuff.h
+++ b/users/drashna/oled/oled_stuff.h
@@ -44,6 +44,8 @@ void            render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offse
 void            render_kitty(uint8_t col, uint8_t line);
 void            render_unicode_mode(uint8_t col, uint8_t line);
 void            render_rgb_hsv(uint8_t col, uint8_t line);
+void            render_mouse_mode(uint8_t col, uint8_t line);
+void            matrix_scan_oled(void);
 
 void oled_pan_section(bool left, uint16_t y_start, uint16_t y_end, uint16_t x_start, uint16_t x_end);
 
diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c
index 551034ff45..c9a7945a84 100644
--- a/users/drashna/pointing/pointing.c
+++ b/users/drashna/pointing/pointing.c
@@ -22,7 +22,7 @@ __attribute__((weak)) report_mouse_t pointing_device_task_keymap(report_mouse_t
 }
 
 report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
-    int8_t x = mouse_report.x, y = mouse_report.y;
+    mouse_xy_report_t x = mouse_report.x, y = mouse_report.y;
     mouse_report.x = 0;
     mouse_report.y = 0;
 
@@ -33,8 +33,8 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
 #endif
         if (timer_elapsed(mouse_debounce_timer) > TAP_CHECK) {
             if (enable_acceleration) {
-                x = (x > 0 ? x * x / 16 + x : -x * x / 16 + x);
-                y = (y > 0 ? y * y / 16 + y : -y * y / 16 + y);
+                x = (mouse_xy_report_t)(x > 0 ? x * x / 16 + x : -x * x / 16 + x);
+                y = (mouse_xy_report_t)(y > 0 ? y * y / 16 + y : -y * y / 16 + y);
             }
             mouse_report.x = x;
             mouse_report.y = y;
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index 85c028076e..ec9aa49462 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -113,13 +113,17 @@
 #    endif
 #endif  // MOUSEKEY_ENABLE
 
-#if !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_32BIT)
-#    define LAYER_STATE_16BIT
-#endif
-#ifndef DYNAMIC_KEYMAP_LAYER_COUNT
-#    define DYNAMIC_KEYMAP_LAYER_COUNT 11
-#endif
+#define MOUSE_EXTENDED_REPORT
 
 #ifndef TAPPING_TERM
 #    define TAPPING_TERM 175
 #endif
+
+#ifndef SECURE_UNLOCK_SEQUENCE
+#    define SECURE_UNLOCK_SEQUENCE    \
+        {                             \
+            {2, 1}, {2, 2}, {2, 3}, { \
+                2, 4                  \
+            }                         \
+        }
+#endif
diff --git a/users/drashna/rgb/rgb_matrix_config.h b/users/drashna/rgb/rgb_matrix_config.h
new file mode 100644
index 0000000000..33979a198e
--- /dev/null
+++ b/users/drashna/rgb/rgb_matrix_config.h
@@ -0,0 +1,107 @@
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+// #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+
+#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
+#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#undef ENABLE_RGB_MATRIX_BREATHING
+#undef ENABLE_RGB_MATRIX_BAND_SAT
+#undef ENABLE_RGB_MATRIX_BAND_VAL
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#undef ENABLE_RGB_MATRIX_CYCLE_ALL
+#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#undef ENABLE_RGB_MATRIX_DUAL_BEACON
+#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#undef ENABLE_RGB_MATRIX_RAINDROPS
+#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#undef ENABLE_RGB_MATRIX_HUE_BREATHING
+#undef ENABLE_RGB_MATRIX_HUE_PENDULUM
+#undef ENABLE_RGB_MATRIX_HUE_WAVE
+#undef ENABLE_RGB_MATRIX_PIXEL_RAIN
+#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
+#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_MULTISPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#if !defined(SPLIT_KEYBOARD) && !defined(KEYBOARD_ergodox_ez) && !defined(KEYBOARD_moonlander)
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#endif
+#if defined(__arm__) || defined(__AVR_AT90USB1286__) || defined(KEYBOARD_launchpad)
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif // AVR
diff --git a/users/drashna/rgb/rgblight_config.h b/users/drashna/rgb/rgblight_config.h
new file mode 100644
index 0000000000..bb2bc3b3ef
--- /dev/null
+++ b/users/drashna/rgb/rgblight_config.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#    define RGBLIGHT_SLEEP
+#    define RGBLIGHT_EFFECT_TWINKLE_LIFE 250
+#    define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1 / 24
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 38d34fb275..13ed761ba8 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -36,6 +36,10 @@ ifeq ($(strip $(PROTOCOL)), VUSB)
     NKRO_ENABLE       := no
 endif
 
+ifeq ($(strip $(PER_KEY_TAPPING)), yes)
+    OPT_DEFS += -DPER_KEY_TAPPING
+endif
+
 CUSTOM_UNICODE_ENABLE ?= yes
 ifeq ($(strip $(CUSTOM_UNICODE_ENABLE)), yes)
     UNICODE_ENABLE        := no
@@ -83,6 +87,11 @@ ifdef CONSOLE_ENABLE
     endif
 endif
 
+ifeq ($(strip $(I2C_SCANNER_ENABLE)), yes)
+    OPT_DEFS += -DI2C_SCANNER_ENABLE
+    CONSOLE_ENABLE := yes
+endif
+
 CUSTOM_OLED_DRIVER ?= yes
 ifeq ($(strip $(OLED_ENABLE)), yes)
     ifeq ($(strip $(OLED_DRIVER)), custom)
diff --git a/users/drashna/split/split_config.h b/users/drashna/split/split_config.h
new file mode 100644
index 0000000000..66c12392d9
--- /dev/null
+++ b/users/drashna/split/split_config.h
@@ -0,0 +1,21 @@
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// #    define SPLIT_TRANSPORT_MIRROR
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_MODS_ENABLE
+#ifdef WPM_ENABLE
+#    define SPLIT_WPM_ENABLE
+#endif
+#ifdef OLED_ENABLE
+#    undef SPLIT_OLED_ENABLE
+#endif
+#if defined(__AVR__) && !defined(SELECT_SOFT_SERIAL_SPEED)
+#    define SELECT_SOFT_SERIAL_SPEED 1
+#endif
+#ifdef CUSTOM_SPLIT_TRANSPORT_SYNC
+#    define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_WATCHDOG_SYNC, RPC_ID_USER_KEYLOG_STR
+#endif
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c
index 2050d687ae..6b5c384480 100644
--- a/users/drashna/split/transport_sync.c
+++ b/users/drashna/split/transport_sync.c
@@ -4,9 +4,6 @@
 #include "transport_sync.h"
 #include "transactions.h"
 #include <string.h>
-#ifdef __AVR__
-#    include <avr/wdt.h>
-#endif
 
 #ifdef UNICODE_COMMON_ENABLE
 #    include "process_unicode_common.h"
@@ -18,6 +15,9 @@ extern unicode_config_t unicode_config;
 extern audio_config_t audio_config;
 extern bool           delayed_tasks_run;
 #endif
+#if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
+extern bool is_oled_enabled;
+#endif
 #if defined(POINTING_DEVICE_ENABLE) && defined(KEYBOARD_handwired_tractyl_manuform)
 extern bool tap_toggling;
 #endif
@@ -95,6 +95,9 @@ void user_transport_update(void) {
         user_state.audio_enable        = is_audio_on();
         user_state.audio_clicky_enable = is_clicky_on();
 #endif
+#if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
+        user_state.is_oled_enabled = is_oled_enabled;
+#endif
 #if defined(CUSTOM_POINTING_DEVICE)
         user_state.tap_toggling = tap_toggling;
 #endif
@@ -116,6 +119,9 @@ void user_transport_update(void) {
         unicode_config.input_mode = user_state.unicode_mode;
         typing_mode               = user_state.unicode_typing_mode;
 #endif
+#if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
+        is_oled_enabled = user_state.is_oled_enabled;
+#endif
 #if defined(CUSTOM_POINTING_DEVICE)
         tap_toggling = user_state.tap_toggling;
 #endif
@@ -226,7 +232,7 @@ void user_transport_sync(void) {
             }
         } else {
             if (timer_elapsed32(watchdog_timer) > 3500) {
-                software_reset();
+                mcu_reset();
                 while (1) {
                 }
             }
diff --git a/users/drashna/split/transport_sync.h b/users/drashna/split/transport_sync.h
index ceb8f81875..8bfb49bf63 100644
--- a/users/drashna/split/transport_sync.h
+++ b/users/drashna/split/transport_sync.h
@@ -19,6 +19,7 @@ typedef union {
         bool    swap_hands           :1;
         bool    host_driver_disabled :1;
         uint8_t unicode_typing_mode  :3;
+        bool    is_oled_enabled      :1;
     };
 } user_runtime_config_t;
 

From 8e113c5991503121ed504a2755a9dfa0433c1f3e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 29 Aug 2022 05:55:35 +1000
Subject: [PATCH 247/959] kegen/gboy: add manufacturer string (#18196)

---
 keyboards/kegen/gboy/info.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index 059dafd89b..ad274c1957 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -1,5 +1,6 @@
 {
-    "keyboard_name": "Kegen G-Boy", 
+    "keyboard_name": "G-Boy", 
+    "manufacturer": "Kegen",
     "url": "", 
     "maintainer": "@mattchan", 
     "usb": {

From 0633e71a1824abe8ed118ce33bbffc6b52e03532 Mon Sep 17 00:00:00 2001
From: Davide Masserut <dm@mssdvd.com>
Date: Sun, 28 Aug 2022 22:20:30 +0200
Subject: [PATCH 248/959] [Keymap] Add Miryoku keymap for Hillside 48 (#18191)

---
 .../48/keymaps/manna-harbour_miryoku/config.h | 38 +++++++++++++++++++
 .../48/keymaps/manna-harbour_miryoku/keymap.c |  4 ++
 2 files changed, 42 insertions(+)
 create mode 100644 keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/config.h
 create mode 100644 keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/keymap.c

diff --git a/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..e779de8a99
--- /dev/null
+++ b/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,38 @@
+// Copyright 2022 Davide Masserut (@mssdvd)
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#define XXX KC_NO
+
+// clang-format off
+#if defined MIRYOKU_MAPPING_EXTENDED_THUMBS
+#define LAYOUT_miryoku( \
+     K00, K01, K02, K03, K04,                          K05, K06, K07, K08, K09, \
+     K10, K11, K12, K13, K14,                          K15, K16, K17, K18, K19, \
+     K20, K21, K22, K23, K24,                          K25, K26, K27, K28, K29, \
+     N30, N31, K32, K33, K34,                          K35, K36, K37, N38, N39 \
+) \
+LAYOUT( \
+XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX, \
+          XXX, XXX, K32, K33, K34,      K35, K36, K37, XXX, XXX \
+)
+#else
+#define LAYOUT_miryoku( \
+     K00, K01, K02, K03, K04,                          K05, K06, K07, K08, K09, \
+     K10, K11, K12, K13, K14,                          K15, K16, K17, K18, K19, \
+     K20, K21, K22, K23, K24,                          K25, K26, K27, K28, K29, \
+     N30, N31, K32, K33, K34,                          K35, K36, K37, N38, N39 \
+) \
+LAYOUT( \
+XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX, \
+          XXX, K32, K33, K34, XXX,      XXX, K35, K36, K37, XXX \
+)
+#endif
diff --git a/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..dbab7f9820
--- /dev/null
+++ b/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.

From d18698a8e8d83d47d48b8501932e6a046148f95a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 29 Aug 2022 06:20:43 +1000
Subject: [PATCH 249/959] Remove deprecated USBasp and bootloadHID bootloader
 types (#18195)

---
 builddefs/bootloader.mk          | 4 ++--
 data/schemas/keyboard.jsonschema | 2 --
 platforms/avr/flash.mk           | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 9f55536423..31004cab98 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -116,13 +116,13 @@ ifeq ($(strip $(BOOTLOADER)), caterina)
 
     BOOTLOADER_SIZE = 4096
 endif
-ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
+ifeq ($(strip $(BOOTLOADER)), bootloadhid)
     OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
     BOOTLOADER_TYPE = bootloadhid
 
     BOOTLOADER_SIZE = 4096
 endif
-ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
+ifeq ($(strip $(BOOTLOADER)), usbasploader)
     OPT_DEFS += -DBOOTLOADER_USBASP
     BOOTLOADER_TYPE = usbasploader
 
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 0308f45116..b534f28c9f 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -89,7 +89,6 @@
             "enum": [
                 "atmel-dfu",
                 "bootloadhid",
-                "bootloadHID",
                 "caterina",
                 "custom",
                 "gd32v-dfu",
@@ -106,7 +105,6 @@
                 "tinyuf2",
                 "unknown",
                 "usbasploader",
-                "USBasp",
                 "wb32-dfu"
             ]
         },
diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk
index 6d50e72534..cd980b9733 100644
--- a/platforms/avr/flash.mk
+++ b/platforms/avr/flash.mk
@@ -177,9 +177,9 @@ else ifeq ($(strip $(BOOTLOADER)), halfkay)
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY)
 else ifeq (dfu,$(findstring dfu,$(BOOTLOADER)))
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU)
-else ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
+else ifeq ($(strip $(BOOTLOADER)), usbasploader)
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP)
-else ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
+else ifeq ($(strip $(BOOTLOADER)), bootloadhid)
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID)
 else ifeq ($(strip $(BOOTLOADER)), qmk-hid)
 	$(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA)

From 3c3f55c0e9d4023dbee1f3dd6495ee2549237e33 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 28 Aug 2022 15:40:10 -0500
Subject: [PATCH 250/959] Add an ez_maker directpins for rp2040 (#17908)

* Add an ez_maker directpins for rp2040

This allows all exposed pins on the Raspberry Pi Pico to be used
as up to 26 individual keys. Keys use a common ground arrangement.

The firmware is also expected to work on generic RP2040 boards, check
manufacturer pinout diagrams or use trial and error to find out the GP#s
of the pins.

* Update keyboards/ez_maker/directpins/rp2040/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

* Changes based on review comments

Co-authored-by: Joel Challis <git@zvecr.com>
---
 .../ez_maker/directpins/rp2040/info.json      | 64 +++++++++++++++++++
 .../rp2040/keymaps/default/keymap.json        | 25 ++++++++
 .../ez_maker/directpins/rp2040/readme.md      | 19 ++++++
 keyboards/ez_maker/directpins/rp2040/rules.mk |  1 +
 4 files changed, 109 insertions(+)
 create mode 100644 keyboards/ez_maker/directpins/rp2040/info.json
 create mode 100644 keyboards/ez_maker/directpins/rp2040/keymaps/default/keymap.json
 create mode 100644 keyboards/ez_maker/directpins/rp2040/readme.md
 create mode 100644 keyboards/ez_maker/directpins/rp2040/rules.mk

diff --git a/keyboards/ez_maker/directpins/rp2040/info.json b/keyboards/ez_maker/directpins/rp2040/info.json
new file mode 100644
index 0000000000..9b707d257f
--- /dev/null
+++ b/keyboards/ez_maker/directpins/rp2040/info.json
@@ -0,0 +1,64 @@
+{
+    "manufacturer": "Raspberry Pi",
+    "keyboard_name": "DirectPins RP2040",
+    "maintainer": "jepler",
+    "bootloader": "rp2040",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP0", null],
+            ["GP1", null],
+
+            ["GP2", null],
+            ["GP3", null],
+            ["GP4", null],
+            ["GP5", "GP28"],
+
+            ["GP6", "GP27"],
+            ["GP7", "GP26"],
+            ["GP8", null],
+            ["GP9", "GP22"],
+
+            ["GP10", "GP21"],
+            ["GP11", "GP20"],
+            ["GP12", "GP19"],
+            ["GP13", "GP18"],
+
+            ["GP14", "GP17"],
+            ["GP15", "GP16"]
+        ]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x2326",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"GP0", "matrix": [0, 0], "x":0, "y":0},
+                {"label":"GP1", "matrix": [1, 0], "x":0, "y":1},
+                {"label":"GP2", "matrix": [2, 0], "x":0, "y":3},
+                {"label":"GP3", "matrix": [3, 0], "x":0, "y":4},
+                {"label":"GP4", "matrix": [4, 0], "x":0, "y":5},
+                {"label":"GP5", "matrix": [5, 0], "x":0, "y":6}, {"label":"GP28", "matrix": [5, 1], "x":2, "y":6},
+                {"label":"GP6", "matrix": [6, 0], "x":0, "y":8}, {"label":"GP27", "matrix": [6, 1], "x":2, "y":8},
+                {"label":"GP7", "matrix": [7, 0], "x":0, "y":9}, {"label":"GP26", "matrix": [7, 1], "x":2, "y":9},
+                {"label":"GP8", "matrix": [8, 0], "x":0, "y":10},
+                {"label":"GP9", "matrix": [9, 0], "x":0, "y":11}, {"label":"GP22", "matrix": [9, 1], "x":2, "y":11},
+                {"label":"GP10", "matrix": [10, 0], "x":0, "y":13}, {"label":"GP21", "matrix": [10, 1], "x":2, "y":13},
+                {"label":"GP11", "matrix": [11, 0], "x":0, "y":14}, {"label":"GP20", "matrix": [11, 1], "x":2, "y":14},
+                {"label":"GP12", "matrix": [12, 0], "x":0, "y":15}, {"label":"GP19", "matrix": [12, 1], "x":2, "y":15},
+                {"label":"GP13", "matrix": [13, 0], "x":0, "y":16}, {"label":"GP18", "matrix": [13, 1], "x":2, "y":16},
+                {"label":"GP14", "matrix": [14, 0], "x":0, "y":18}, {"label":"GP17", "matrix": [14, 1], "x":2, "y":18},
+                {"label":"GP15", "matrix": [15, 0], "x":0, "y":19}, {"label":"GP16", "matrix": [15, 1], "x":2, "y":19}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ez_maker/directpins/rp2040/keymaps/default/keymap.json b/keyboards/ez_maker/directpins/rp2040/keymaps/default/keymap.json
new file mode 100644
index 0000000000..3bae28a360
--- /dev/null
+++ b/keyboards/ez_maker/directpins/rp2040/keymaps/default/keymap.json
@@ -0,0 +1,25 @@
+{
+    "keyboard": "ez_maker/directpins/rp2040",
+    "keymap": "default",
+    "layout": "LAYOUT_all",
+    "layers": [
+        [
+            "KC_0",
+            "KC_1",
+            "KC_2",
+            "KC_3",
+            "KC_4",
+            "KC_5", "KC_P",
+            "KC_6", "KC_O",
+            "KC_7", "KC_N",
+            "KC_8",
+            "KC_9", "KC_M",
+            "KC_A", "KC_L",
+            "KC_B", "KC_K",
+            "KC_C", "KC_J",
+            "KC_D", "KC_I",
+            "KC_E", "KC_H",
+            "KC_F", "KC_G"
+        ]
+    ]
+}
diff --git a/keyboards/ez_maker/directpins/rp2040/readme.md b/keyboards/ez_maker/directpins/rp2040/readme.md
new file mode 100644
index 0000000000..945ee88c9b
--- /dev/null
+++ b/keyboards/ez_maker/directpins/rp2040/readme.md
@@ -0,0 +1,19 @@
+# DirectPins
+
+![Raspberry Pi Pico pinout guide](https://learn.adafruit.com/getting-started-with-raspberry-pi-pico-circuitpython/pinouts)
+
+Easily assign keys to pins for your custom project using QMK Configurator.
+
+* Keyboard Maintainer: [Jeff Epler](https://github.com/jepler)
+* Hardware Supported: Raspberry Pi Pico, other RP2040 boards
+* Hardware Availability: Raspberry Pi, SparkFun, Adafruit, other makers
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb ez_maker/directpins/rp2040 -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb ez_maker/directpins/rp2040 -km default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ez_maker/directpins/rp2040/rules.mk b/keyboards/ez_maker/directpins/rp2040/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/ez_maker/directpins/rp2040/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 1cc0b1e3713b8d96603a4ff746d75dda327e9abd Mon Sep 17 00:00:00 2001
From: Juno Nguyen <juno.ngx@gmail.com>
Date: Mon, 29 Aug 2022 09:34:47 +0800
Subject: [PATCH 251/959] Update junonum keymap: add AG_NORM recovery (#18170)

---
 layouts/community/ortho_4x12/junonum/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/community/ortho_4x12/junonum/keymap.c b/layouts/community/ortho_4x12/junonum/keymap.c
index d6fb1a4b07..b5ed159f6a 100644
--- a/layouts/community/ortho_4x12/junonum/keymap.c
+++ b/layouts/community/ortho_4x12/junonum/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] = LAYOUT_ortho_4x12(
         _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-        _______, _______, MU_MOD,  AU_ON,   AU_OFF,  CG_NORM, CG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
+        _______, AG_NORM, MU_MOD,  AU_ON,   AU_OFF,  CG_NORM, CG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
     ),

From 3f99c42800167a7be8829a8e8fbb1c64cf966eeb Mon Sep 17 00:00:00 2001
From: biesigrr <biesigrr@users.noreply.github.com>
Date: Mon, 29 Aug 2022 03:37:29 +0200
Subject: [PATCH 252/959] Expose Moonlander split detection to user code
 (#18040)

---
 keyboards/moonlander/matrix.c     |  4 ++++
 keyboards/moonlander/moonlander.h |  2 ++
 keyboards/moonlander/readme.md    | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index b6bac9515e..36017fcd12 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -227,3 +227,7 @@ void matrix_power_up(void) {
     }
 
 }
+
+bool is_transport_connected(void) {
+    return mcp23018_initd;
+}
\ No newline at end of file
diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h
index 8598260211..90ce84b3e3 100644
--- a/keyboards/moonlander/moonlander.h
+++ b/keyboards/moonlander/moonlander.h
@@ -82,3 +82,5 @@ typedef union {
 } keyboard_config_t;
 
 extern keyboard_config_t keyboard_config;
+
+bool is_transport_connected(void);
\ No newline at end of file
diff --git a/keyboards/moonlander/readme.md b/keyboards/moonlander/readme.md
index bf80f05569..733780abde 100644
--- a/keyboards/moonlander/readme.md
+++ b/keyboards/moonlander/readme.md
@@ -41,4 +41,18 @@ If you're using the Smart LED (layer indication) feature from the Oryx Configura
 
 This changes the `RGB_TOG` keycode so that it will toggle the lights on and off, in a way that will allow the Smart LEDs to continue to work, even with the rest of the LEDs turned off. 
 
-Additionally, a new keycode has been added to toggle the Smart LEDs.  Use `TOGGLE_LAYER_COLOR`, if you aren't already.  
+Additionally, a new keycode has been added to toggle the Smart LEDs.  Use `TOGGLE_LAYER_COLOR`, if you aren't already.
+
+### Detecting split / Gaming mode
+
+To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak).
+
+Example for enabling a specific layer while right side is disconnected:
+
+```
+void housekeeping_task_user(void) {
+    if (!is_transport_connected()) {
+        // set layer
+    }
+}
+```
\ No newline at end of file

From 8b9f0a58b4a100bbae0fabeaa4ee29f2955d3dbf Mon Sep 17 00:00:00 2001
From: NGatti1997 <41117774+NGatti1997@users.noreply.github.com>
Date: Sun, 28 Aug 2022 18:43:24 -0700
Subject: [PATCH 253/959] Swap KC_VOLD and KC_VOLU on GMMK2 to correct places
 (#18193)

---
 keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
index ba3e9828f6..f03eda7e37 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,

From f2edb73974d15b88ea9614002b18b045551b71d8 Mon Sep 17 00:00:00 2001
From: Drzony <drzony@gmail.com>
Date: Mon, 29 Aug 2022 06:34:42 +0200
Subject: [PATCH 254/959] Fix mouse report comparison failing on shared EP
 (#18060)

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 quantum/pointing_device/pointing_device.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 505a7a6ffd..ae3f122e89 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -166,11 +166,9 @@ __attribute__((weak)) void pointing_device_send(void) {
         host_mouse_send(&local_mouse_report);
     }
     // send it and 0 it out except for buttons, so those stay until they are explicity over-ridden using update_pointing_device
-    local_mouse_report.x = 0;
-    local_mouse_report.y = 0;
-    local_mouse_report.v = 0;
-    local_mouse_report.h = 0;
-
+    uint8_t buttons = local_mouse_report.buttons;
+    memset(&local_mouse_report, 0, sizeof(local_mouse_report));
+    local_mouse_report.buttons = buttons;
     memcpy(&old_report, &local_mouse_report, sizeof(local_mouse_report));
 }
 

From 38de991fda2bdb813b2acd067762a22c59607207 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Mon, 29 Aug 2022 11:39:45 +0700
Subject: [PATCH 255/959] [Keyboard] Add chord/zero (#18190)

---
 keyboards/chord/zero/config.h                 |  4 ++
 keyboards/chord/zero/info.json                | 65 +++++++++++++++++++
 keyboards/chord/zero/keymaps/default/keymap.c | 25 +++++++
 keyboards/chord/zero/keymaps/default/rules.mk |  1 +
 keyboards/chord/zero/readme.md                | 37 +++++++++++
 keyboards/chord/zero/rules.mk                 |  1 +
 6 files changed, 133 insertions(+)
 create mode 100644 keyboards/chord/zero/config.h
 create mode 100644 keyboards/chord/zero/info.json
 create mode 100644 keyboards/chord/zero/keymaps/default/keymap.c
 create mode 100644 keyboards/chord/zero/keymaps/default/rules.mk
 create mode 100644 keyboards/chord/zero/readme.md
 create mode 100644 keyboards/chord/zero/rules.mk

diff --git a/keyboards/chord/zero/config.h b/keyboards/chord/zero/config.h
new file mode 100644
index 0000000000..9d552d5af4
--- /dev/null
+++ b/keyboards/chord/zero/config.h
@@ -0,0 +1,4 @@
+// Copyright (c) 2022 Simon Hengel <sol@typeful.net>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
diff --git a/keyboards/chord/zero/info.json b/keyboards/chord/zero/info.json
new file mode 100644
index 0000000000..c49a8a3c2f
--- /dev/null
+++ b/keyboards/chord/zero/info.json
@@ -0,0 +1,65 @@
+{
+    "manufacturer": "Simon Hengel",
+    "keyboard_name": "CHORD ZERO",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0x1D50",
+        "pid": "0x617C"
+    },
+    "url": "https://github.com/sol/chord-zero#readme",
+    "maintainer": "sol",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "steno": true
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP22", "GP9", "GP21", "GP11", "GP19", "GP12"],
+        "rows": ["GP26", "GP20", "GP18", "GP17", "GP7", "GP10", "GP13", "GP14"]
+    },
+    "layouts": {
+        "LAYOUT_zero": {
+            "layout": [
+                { "matrix": [0, 0], "y": 0, "x": 0 },
+                { "matrix": [0, 1], "y": 0, "x": 1 },
+                { "matrix": [0, 2], "y": 0, "x": 2 },
+                { "matrix": [0, 3], "y": 0, "x": 3 },
+                { "matrix": [0, 4], "y": 0, "x": 4 },
+                { "matrix": [0, 5], "y": 0, "x": 5 },
+                { "matrix": [4, 5], "y": 0, "x": 8 },
+                { "matrix": [4, 4], "y": 0, "x": 9 },
+                { "matrix": [4, 3], "y": 0, "x": 10 },
+                { "matrix": [4, 2], "y": 0, "x": 11 },
+                { "matrix": [4, 1], "y": 0, "x": 12 },
+                { "matrix": [4, 0], "y": 0, "x": 13 },
+
+                { "matrix": [1, 0], "y": 1, "x": 0 },
+                { "matrix": [1, 1], "y": 1, "x": 1 },
+                { "matrix": [1, 2], "y": 1, "x": 2 },
+                { "matrix": [1, 3], "y": 1, "x": 3 },
+                { "matrix": [1, 4], "y": 1, "x": 4 },
+                { "matrix": [1, 5], "y": 1, "x": 5 },
+                { "matrix": [5, 5], "y": 1, "x": 8 },
+                { "matrix": [5, 4], "y": 1, "x": 9 },
+                { "matrix": [5, 3], "y": 1, "x": 10 },
+                { "matrix": [5, 2], "y": 1, "x": 11 },
+                { "matrix": [5, 1], "y": 1, "x": 12 },
+                { "matrix": [5, 0], "y": 1, "x": 13 },
+
+                { "matrix": [3, 3], "y": 3, "x": 3 },
+                { "matrix": [3, 4], "y": 3, "x": 4 },
+                { "matrix": [3, 5], "y": 3, "x": 5 },
+                { "matrix": [7, 5], "y": 3, "x": 8 },
+                { "matrix": [7, 4], "y": 3, "x": 9 },
+                { "matrix": [7, 3], "y": 3, "x": 10 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/chord/zero/keymaps/default/keymap.c b/keyboards/chord/zero/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a394893e1b
--- /dev/null
+++ b/keyboards/chord/zero/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright (c) 2022 Simon Hengel <sol@typeful.net>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "keymap_steno.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_zero(
+        STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1,          STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
+        STN_PWR, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2,          STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,
+                                   STN_N1,  STN_A,   STN_O,            STN_E,   STN_U,   STN_N7
+    )
+};
+
+const uint16_t PROGMEM bootloader_combo[] = {
+    keymaps[0][0][0],           keymaps[0][4][0],
+    keymaps[0][1][0],           keymaps[0][5][0],
+        keymaps[0][3][3],   keymaps[0][7][3]
+, COMBO_END };
+
+combo_t key_combos[] = {
+    COMBO(bootloader_combo, QK_BOOTLOADER),
+};
+
+uint16_t COMBO_LEN = sizeof(key_combos) / sizeof(key_combos[0]);
diff --git a/keyboards/chord/zero/keymaps/default/rules.mk b/keyboards/chord/zero/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/chord/zero/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/chord/zero/readme.md b/keyboards/chord/zero/readme.md
new file mode 100644
index 0000000000..51e3f2ce10
--- /dev/null
+++ b/keyboards/chord/zero/readme.md
@@ -0,0 +1,37 @@
+# CHORD ZERO Stenographic Keyboard
+
+![CHORD ZERO](https://i.imgur.com/aS2MPQ2h.jpg)
+
+CHORD ZERO is a stenographic keyboard that can be used with
+[Plover](https://www.openstenoproject.org/plover/) or any other application
+that supports the [TX
+Bolt](https://docs.qmk.fm/#/feature_stenography?id=tx-bolt) or
+[GeminiPR](https://docs.qmk.fm/#/feature_stenography?id=geminipr) protocol.
+
+* Keyboard Maintainer: [Simon Hengel](https://github.com/sol)
+* Hardware Supported: REV 0, REV 1
+* Hardware Availability: https://github.com/sol/chord-zero#readme
+
+Make example for this keyboard (after setting up your build environment):
+
+    make chord/zero:default
+
+or
+
+    qmk compile -kb chord/zero -km default
+
+This will generate `chord_zero_default.uf2`.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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:
+
+* **Reset key combo**: Press the six keys at the outer columns on each side of the keyboard simultaneously while it is plugged in 
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Press the button on the back of the PCB and plug in the keyboard
+
+Once the keyboard is in bootloader mode you can mount it as a USB mass storage
+device and copy the firmware (the file `chord_zero_default.uf2`) onto it.  Once
+copying is completed the keyboard will reboot automatically.
diff --git a/keyboards/chord/zero/rules.mk b/keyboards/chord/zero/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/chord/zero/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From a2294bcc979c26eb60b6fcd0d1166952ed32fd3d Mon Sep 17 00:00:00 2001
From: bbrfkr <bbrfkr@gmail.com>
Date: Mon, 29 Aug 2022 13:47:30 +0900
Subject: [PATCH 256/959] [Keyboard] Update dynamis keyboard (#17625)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/bbrfkr/dynamis/dynamis.c            | 16 ++--
 keyboards/bbrfkr/dynamis/info.json            | 76 +++++++++----------
 .../bbrfkr/dynamis/keymaps/default/keymap.c   | 40 +++++-----
 keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c | 40 +++++-----
 keyboards/bbrfkr/dynamis/keymaps/via/keymap.c | 49 +++++++-----
 keyboards/bbrfkr/dynamis/keymaps/via/rules.mk |  1 +
 keyboards/bbrfkr/dynamis/readme.md            |  4 +-
 7 files changed, 116 insertions(+), 110 deletions(-)

diff --git a/keyboards/bbrfkr/dynamis/dynamis.c b/keyboards/bbrfkr/dynamis/dynamis.c
index e7f780ef1a..8655cbc7bc 100644
--- a/keyboards/bbrfkr/dynamis/dynamis.c
+++ b/keyboards/bbrfkr/dynamis/dynamis.c
@@ -18,16 +18,12 @@
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false; 
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (clockwise) {
+        tap_code(layer_state == 0 ? KC_WH_D : KC_VOLD);
+    } else {
+        tap_code(layer_state == 0 ? KC_WH_U : KC_VOLU);
     }
-   if (index == 0) { /* First encoder */
-      if (clockwise) {
-         tap_code(KC_WH_D);
-      } else {
-         tap_code(KC_WH_U);
-      }
-   }
-   return false;
+    return true;
 }
 #endif
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index b29666b98e..b59fef9946 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -17,62 +17,62 @@
                     "y": 0
                 },
                 {
-                    "label": "F1",
+                    "label": "1",
                     "x": 1,
                     "y": 0
                 },
                 {
-                    "label": "F2",
+                    "label": "2",
                     "x": 2,
                     "y": 0
                 },
                 {
-                    "label": "F3",
+                    "label": "3",
                     "x": 3,
                     "y": 0
                 },
                 {
-                    "label": "F4",
+                    "label": "4",
                     "x": 4,
                     "y": 0
                 },
                 {
-                    "label": "F5",
+                    "label": "5",
                     "x": 5,
                     "y": 0
                 },
                 {
-                    "label": "F6",
+                    "label": "6",
                     "x": 6,
                     "y": 0
                 },
                 {
-                    "label": "F7",
+                    "label": "7",
                     "x": 7,
                     "y": 0
                 },
                 {
-                    "label": "F8",
+                    "label": "8",
                     "x": 8,
                     "y": 0
                 },
                 {
-                    "label": "F9",
+                    "label": "9",
                     "x": 9,
                     "y": 0
                 },
                 {
-                    "label": "F10",
+                    "label": "0",
                     "x": 10,
                     "y": 0
                 },
                 {
-                    "label": "F11",
+                    "label": "-",
                     "x": 11,
                     "y": 0
                 },
                 {
-                    "label": "F12",
+                    "label": "=",
                     "x": 12,
                     "y": 0
                 },
@@ -292,7 +292,7 @@
                     "w": 1.75
                 },
                 {
-                    "label": "Raise",
+                    "label": "Lower",
                     "x": 14,
                     "y": 3
                 },
@@ -308,13 +308,13 @@
                     "w": 1.25
                 },
                 {
-                    "label": "Super",
+                    "label": "Alt",
                     "x": 1.25,
                     "y": 4,
                     "w": 1.25
                 },
                 {
-                    "label": "Alt",
+                    "label": "Lower",
                     "x": 2.5,
                     "y": 4,
                     "w": 1.25
@@ -326,25 +326,25 @@
                     "w": 2.25
                 },
                 {
-                    "label": "Lower",
+                    "label": "Space",
                     "x": 6,
                     "y": 4,
                     "w": 1.25
                 },
                 {
-                    "label": "Raise",
+                    "label": "Enter",
                     "x": 7.25,
                     "y": 4,
                     "w": 2.75
                 },
                 {
-                    "label": "Alt",
+                    "label": "Raise",
                     "x": 10,
                     "y": 4,
                     "w": 1.25
                 },
                 {
-                    "label": "Super",
+                    "label": "Alt",
                     "x": 11.25,
                     "y": 4,
                     "w": 1.25
@@ -380,62 +380,62 @@
                     "y": 0
                 },
                 {
-                    "label": "F1",
+                    "label": "1",
                     "x": 1,
                     "y": 0
                 },
                 {
-                    "label": "F2",
+                    "label": "2",
                     "x": 2,
                     "y": 0
                 },
                 {
-                    "label": "F3",
+                    "label": "3",
                     "x": 3,
                     "y": 0
                 },
                 {
-                    "label": "F4",
+                    "label": "4",
                     "x": 4,
                     "y": 0
                 },
                 {
-                    "label": "F5",
+                    "label": "5",
                     "x": 5,
                     "y": 0
                 },
                 {
-                    "label": "F6",
+                    "label": "6",
                     "x": 6,
                     "y": 0
                 },
                 {
-                    "label": "F7",
+                    "label": "7",
                     "x": 7,
                     "y": 0
                 },
                 {
-                    "label": "F8",
+                    "label": "8",
                     "x": 8,
                     "y": 0
                 },
                 {
-                    "label": "F9",
+                    "label": "9",
                     "x": 9,
                     "y": 0
                 },
                 {
-                    "label": "F10",
+                    "label": "0",
                     "x": 10,
                     "y": 0
                 },
                 {
-                    "label": "F11",
+                    "label": "-",
                     "x": 11,
                     "y": 0
                 },
                 {
-                    "label": "F12",
+                    "label": "=",
                     "x": 12,
                     "y": 0
                 },
@@ -655,7 +655,7 @@
                     "w": 1.75
                 },
                 {
-                    "label": "Raise",
+                    "label": "Lower",
                     "x": 14,
                     "y": 3
                 },
@@ -671,13 +671,13 @@
                     "w": 1.25
                 },
                 {
-                    "label": "Super",
+                    "label": "Alt",
                     "x": 1.25,
                     "y": 4,
                     "w": 1.25
                 },
                 {
-                    "label": "Alt",
+                    "label": "Lower",
                     "x": 2.5,
                     "y": 4,
                     "w": 1.25
@@ -689,25 +689,25 @@
                     "w": 2.25
                 },
                 {
-                    "label": "Lower",
+                    "label": "Space",
                     "x": 6,
                     "y": 4,
                     "w": 1.25
                 },
                 {
-                    "label": "Raise",
+                    "label": "Enter",
                     "x": 7.25,
                     "y": 4,
                     "w": 2.75
                 },
                 {
-                    "label": "Alt",
+                    "label": "Raise",
                     "x": 10,
                     "y": 4,
                     "w": 1.25
                 },
                 {
-                    "label": "Super",
+                    "label": "Alt",
                     "x": 11.25,
                     "y": 4,
                     "w": 1.25
diff --git a/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
index d31ef59f32..686c016242 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
@@ -20,40 +20,40 @@ enum layer_names {
     _QWERTY,
     _LOWER,
     _RAISE,
-    _SETTINGS
+    _SETTINGS,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_ansi(
-      KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, 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_TAB, KC_Q, KC_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_TAB, 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_UP,
-      KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC,      MO(1),     MO(2), KC_RALT, KC_RGUI, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+      KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
+      KC_LCTL, KC_LALT, MO(1),   KC_SPC,      KC_SPC,     KC_ENT, MO(2), KC_RALT, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
   [_LOWER] = LAYOUT_ansi(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_WH_D, KC_BTN1, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, MO(3), KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS,   MO(3), KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS
+      KC_ESC, KC_F1, KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_LGUI, KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS, MO(3), KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
   ),
 
   [_RAISE] = LAYOUT_ansi(
-      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_DEL, KC_TRNS,
-      KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_QUOT, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_LCBR, KC_RCBR, KC_TRNS, MO(3), KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     MO(3),     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS
+      KC_ESC, KC_F1, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_LGUI, MO(3),   KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
   ),
 
   [_SETTINGS] = LAYOUT_ansi(
-      QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-  )
+      QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO,   KC_NO,     KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,       KC_NO, KC_NO, KC_NO
+  ),
 };
diff --git a/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
index 3099b482a9..c715dc3577 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
@@ -20,40 +20,40 @@ enum layer_names {
     _QWERTY,
     _LOWER,
     _RAISE,
-    _SETTINGS
+    _SETTINGS,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_iso(
-      KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, 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_TAB, KC_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_TAB, 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_UP,
-      KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC,      MO(1),     MO(2), KC_RALT, KC_RGUI, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+      KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
+      KC_LCTL, KC_LALT, MO(1),   KC_SPC,      KC_SPC,     KC_ENT, MO(2), KC_RALT, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
   [_LOWER] = LAYOUT_iso(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS,
-      KC_PSCR, KC_TRNS, KC_TRNS, KC_WH_U, 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_BTN3, KC_BTN2, KC_WH_D, KC_BTN1, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, MO(3), KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS,   MO(3), KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS
+      KC_ESC, KC_F1, KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_LGUI, KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS, MO(3), KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
   ),
 
   [_RAISE] = LAYOUT_iso(
-      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_DEL, KC_TRNS,
-      KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_QUOT, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_LCBR, KC_RCBR, KC_TRNS, MO(3), KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     MO(3),     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS
+      KC_ESC, KC_F1, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_LGUI, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
   ),
 
   [_SETTINGS] = LAYOUT_iso(
-      QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_TOG, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      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_NO, KC_NO, KC_NO, 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_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO,   KC_NO,     KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,       KC_NO, KC_NO, KC_NO
+  ),
 };
diff --git a/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
index 2c93213d99..cef34da6b3 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
@@ -20,40 +20,49 @@ enum layer_names {
     _QWERTY,
     _LOWER,
     _RAISE,
-    _SETTINGS
+    _SETTINGS,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_ansi(
-      KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, 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_TAB, KC_Q, KC_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_TAB, 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_UP,
-      KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC,      MO(1),     MO(2), KC_RALT, KC_RGUI, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+      KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
+      KC_LCTL, KC_LALT, MO(1),   KC_SPC,      KC_SPC,     KC_ENT, MO(2), KC_RALT, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
   [_LOWER] = LAYOUT_ansi(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_WH_D, KC_BTN1, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, MO(3), KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS,   MO(3), KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS
+      KC_ESC, KC_F1, KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_LGUI, KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS, MO(3), KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
   ),
 
   [_RAISE] = LAYOUT_ansi(
-      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_DEL, KC_TRNS,
-      KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_QUOT, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_LCBR, KC_RCBR, KC_TRNS, MO(3), KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     MO(3),     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS
+      KC_ESC, KC_F1, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_LGUI, MO(3),   KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
   ),
 
   [_SETTINGS] = LAYOUT_ansi(
-      QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-      KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-  )
+      QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_NO, KC_NO, KC_NO,   KC_NO,     KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,       KC_NO, KC_NO, KC_NO
+  ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_QWERTY] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D), },
+    [_LOWER] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [_RAISE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
+    [_SETTINGS] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+};
+#endif
diff --git a/keyboards/bbrfkr/dynamis/keymaps/via/rules.mk b/keyboards/bbrfkr/dynamis/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/via/rules.mk
+++ b/keyboards/bbrfkr/dynamis/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/bbrfkr/dynamis/readme.md b/keyboards/bbrfkr/dynamis/readme.md
index 1db398f08b..2cfd225b1b 100644
--- a/keyboards/bbrfkr/dynamis/readme.md
+++ b/keyboards/bbrfkr/dynamis/readme.md
@@ -1,13 +1,13 @@
 # dynamis
 
 ## general information
-![dynamis](https://i.imgur.com/q2C3D2ul.jpg)
+![dynamis](https://i.imgur.com/GRPE5hzh.jpg)
 
 Gasket mounted 65% row staggered keyboard integrated a trackball
 
 * Keyboard Maintainer: [bbrfkr](https://github.com/bbrfkr/)
 * Hardware Supported: dynamis PCBs
-* Hardware Availability: http://github.com/bbrfkr/keyboards
+* Hardware Availability: https://github.com/bbrfkr/dynamis-keyboard
 
 ## bootloader
 

From b719a16b03460924f5306cd0536542082fc5430d Mon Sep 17 00:00:00 2001
From: TJ <tom.campie@gmail.com>
Date: Sun, 28 Aug 2022 23:48:41 -0500
Subject: [PATCH 257/959] [Keyboard] add Nearfield, fix typo in Le Chiffre
 Readme (#17914)

---
 keyboards/cannonkeys/nearfield/config.h       |  35 ++
 keyboards/cannonkeys/nearfield/info.json      | 376 ++++++++++++++++++
 .../nearfield/keymaps/default/keymap.c        |  30 ++
 keyboards/cannonkeys/nearfield/nearfield.c    |  18 +
 keyboards/cannonkeys/nearfield/nearfield.h    |  35 ++
 keyboards/cannonkeys/nearfield/readme.md      |  31 ++
 keyboards/cannonkeys/nearfield/rules.mk       |  18 +
 keyboards/tominabox1/le_chiffre/readme.md     |   2 +-
 8 files changed, 544 insertions(+), 1 deletion(-)
 create mode 100755 keyboards/cannonkeys/nearfield/config.h
 create mode 100644 keyboards/cannonkeys/nearfield/info.json
 create mode 100755 keyboards/cannonkeys/nearfield/keymaps/default/keymap.c
 create mode 100755 keyboards/cannonkeys/nearfield/nearfield.c
 create mode 100755 keyboards/cannonkeys/nearfield/nearfield.h
 create mode 100644 keyboards/cannonkeys/nearfield/readme.md
 create mode 100755 keyboards/cannonkeys/nearfield/rules.mk

diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h
new file mode 100755
index 0000000000..7d8f904915
--- /dev/null
+++ b/keyboards/cannonkeys/nearfield/config.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2021 Dr.Doof
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B4, D2, D4, D6, D7 }
+#define MATRIX_COL_PINS { D3, D5, C6, C7, B6, B5, B7, F0, F1, F4, F5, F6, F7, B3, B2, D1 }
+#define UNUSED_PINS { E2, E6, D0, B1, B0 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 0
diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json
new file mode 100644
index 0000000000..ffd1bf6ac6
--- /dev/null
+++ b/keyboards/cannonkeys/nearfield/info.json
@@ -0,0 +1,376 @@
+{
+    "keyboard_name":"Nearfield",
+    "manufacturer":"JLC",
+    "url":"",
+    "maintainer":"tominabox1",
+    "usb":{
+       "vid":"0x0004",
+       "pid":"0x0002",
+       "device_version":"0.0.1"
+    },
+    "layouts":{
+       "LAYOUT_all":{
+          "layout":[
+             {
+                "label":"~",
+                "x":0,
+                "y":0
+             },
+             {
+                "label":"!",
+                "x":1,
+                "y":0
+             },
+             {
+                "label":"@",
+                "x":2,
+                "y":0
+             },
+             {
+                "label":"#",
+                "x":3,
+                "y":0
+             },
+             {
+                "label":"$",
+                "x":4,
+                "y":0
+             },
+             {
+                "label":"%",
+                "x":5,
+                "y":0
+             },
+             {
+                "label":"^",
+                "x":7.5,
+                "y":0
+             },
+             {
+                "label":"&",
+                "x":8.5,
+                "y":0
+             },
+             {
+                "label":"*",
+                "x":9.5,
+                "y":0
+             },
+             {
+                "label":"(",
+                "x":10.5,
+                "y":0
+             },
+             {
+                "label":")",
+                "x":11.5,
+                "y":0
+             },
+             {
+                "label":"_",
+                "x":12.5,
+                "y":0
+             },
+             {
+                "label":"+",
+                "x":13.5,
+                "y":0
+             },
+             {
+                "label":"Insert",
+                "x":15.5,
+                "y":0
+             },
+             {
+                "label":"Home",
+                "x":16.5,
+                "y":0
+             },
+             {
+                "label":"PgUp",
+                "x":17.5,
+                "y":0
+             },
+             {
+                "label":"Tab",
+                "x":0,
+                "y":1.5
+             },
+             {
+                "label":"Q",
+                "x":1,
+                "y":1.5
+             },
+             {
+                "label":"W",
+                "x":2,
+                "y":1.5
+             },
+             {
+                "label":"E",
+                "x":3,
+                "y":1.5
+             },
+             {
+                "label":"R",
+                "x":4,
+                "y":1.5
+             },
+             {
+                "label":"T",
+                "x":5,
+                "y":1.5
+             },
+             {
+                "label":"Y",
+                "x":7.5,
+                "y":1.5
+             },
+             {
+                "label":"U",
+                "x":8.5,
+                "y":1.5
+             },
+             {
+                "label":"I",
+                "x":9.5,
+                "y":1.5
+             },
+             {
+                "label":"O",
+                "x":10.5,
+                "y":1.5
+             },
+             {
+                "label":"P",
+                "x":11.5,
+                "y":1.5
+             },
+             {
+                "label":"{",
+                "x":12.5,
+                "y":1.5
+             },
+             {
+                "label":"}",
+                "x":13.5,
+                "y":1.5
+             },
+             {
+                "label":"Insert",
+                "x":15.5,
+                "y":1.5
+             },
+             {
+                "label":"Home",
+                "x":16.5,
+                "y":1.5
+             },
+             {
+                "label":"PgUp",
+                "x":17.5,
+                "y":1.5
+             },
+             {
+                "label":"Caps Lock",
+                "x":0,
+                "y":2.5,
+                "w":1.25
+             },
+             {
+                "label":"A",
+                "x":1.25,
+                "y":2.5
+             },
+             {
+                "label":"S",
+                "x":2.25,
+                "y":2.5
+             },
+             {
+                "label":"D",
+                "x":3.25,
+                "y":2.5
+             },
+             {
+                "label":"F",
+                "x":4.25,
+                "y":2.5
+             },
+             {
+                "label":"G",
+                "x":5.25,
+                "y":2.5
+             },
+             {
+                "label":"H",
+                "x":7.75,
+                "y":2.5
+             },
+             {
+                "label":"J",
+                "x":8.75,
+                "y":2.5
+             },
+             {
+                "label":"K",
+                "x":9.75,
+                "y":2.5
+             },
+             {
+                "label":"L",
+                "x":10.75,
+                "y":2.5
+             },
+             {
+                "label":"\"",
+                "x":11.75,
+                "y":2.5
+             },
+             {
+                "label":"Enter",
+                "x":12.75,
+                "y":2.5,
+                "w":1.75
+             },
+             {
+                "label":"Delete",
+                "x":15.5,
+                "y":2.5
+             },
+             {
+                "label":"End",
+                "x":16.5,
+                "y":2.5
+             },
+             {
+                "label":"PgDn",
+                "x":17.5,
+                "y":2.5
+             },
+             {
+                "label":"Shift",
+                "x":0,
+                "y":3.5,
+                "w":1.75
+             },
+             {
+                "label":"Z",
+                "x":1.75,
+                "y":3.5
+             },
+             {
+                "label":"X",
+                "x":2.75,
+                "y":3.5
+             },
+             {
+                "label":"C",
+                "x":3.75,
+                "y":3.5
+             },
+             {
+                "label":"V",
+                "x":4.75,
+                "y":3.5
+             },
+             {
+                "label":"B",
+                "x":5.75,
+                "y":3.5
+             },
+             {
+                "label":"N",
+                "x":8.25,
+                "y":3.5
+             },
+             {
+                "label":"M",
+                "x":9.25,
+                "y":3.5
+             },
+             {
+                "label":"<",
+                "x":10.25,
+                "y":3.5
+             },
+             {
+                "label":">",
+                "x":11.25,
+                "y":3.5
+             },
+             {
+                "label":"?",
+                "x":12.25,
+                "y":3.5
+             },
+             {
+                "label":"r4 dogshift",
+                "x":13.25,
+                "y":3.5,
+                "w":1.25
+             },
+             {
+                "label":"Ctrl",
+                "x":0,
+                "y":4.5,
+                "w":1.25
+             },
+             {
+                "label":"Alt",
+                "x":2.5,
+                "y":4.5,
+                "w":1.25
+             },
+             {
+                "x":3.75,
+                "y":4.5
+             },
+             {
+                "label":"",
+                "x":4.75,
+                "y":4.5,
+                "w":2
+             },
+             {
+                "label":"",
+                "x":8.25,
+                "y":4.5,
+                "w":2.25
+             },
+             {
+                "label":"Alt",
+                "x":10.5,
+                "y":4.5,
+                "w":1.25
+             },
+             {
+                "label":"Ctrl",
+                "x":13,
+                "y":4.5,
+                "w":1.5
+             },
+             {
+                "label":"\u2191",
+                "x":16.5,
+                "y":4.5
+             },
+             {
+                "label":"\u2190",
+                "x":15.5,
+                "y":5.5
+             },
+             {
+                "label":"\u2193",
+                "x":16.5,
+                "y":5.5
+             },
+             {
+                "label":"\u2192",
+                "x":17.5,
+                "y":5.5
+             }
+          ]
+       }
+    }
+ }
diff --git a/keyboards/cannonkeys/nearfield/keymaps/default/keymap.c b/keyboards/cannonkeys/nearfield/keymaps/default/keymap.c
new file mode 100755
index 0000000000..62f2fa68b9
--- /dev/null
+++ b/keyboards/cannonkeys/nearfield/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+/*
+Copyright 2021 Dr.Doof
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this 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_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INS,  KC_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_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_QUOT, KC_ENT,           KC_DEL,  KC_END,  KC_PGDN,
+		         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+		         KC_LCTL, KC_LALT,          KC_SPC,  KC_NO,            KC_SPC,           KC_LALT,          KC_LCTL,          KC_UP,   KC_LEFT,   KC_DOWN,   KC_RIGHT
+
+	)
+};
diff --git a/keyboards/cannonkeys/nearfield/nearfield.c b/keyboards/cannonkeys/nearfield/nearfield.c
new file mode 100755
index 0000000000..7a635209de
--- /dev/null
+++ b/keyboards/cannonkeys/nearfield/nearfield.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Dr.Doof
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "nearfield.h"
diff --git a/keyboards/cannonkeys/nearfield/nearfield.h b/keyboards/cannonkeys/nearfield/nearfield.h
new file mode 100755
index 0000000000..610c6489b5
--- /dev/null
+++ b/keyboards/cannonkeys/nearfield/nearfield.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2021 Dr.Doof
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+	     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+	     K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+	     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, K2G, \
+	     K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
+	     K41, K42,      K44, K45,      K47,      K49,      K4B,      K4D, K4E, K4F, K4G \
+) { \
+	{ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+	{ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+	{ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
+	{ K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, XXX, XXX, XXX }, \
+	{ K41, K42, XXX, K44, K45, XXX, K47, XXX, K49, XXX, K4B, XXX, K4D, K4E, K4F, K4G } \
+}
diff --git a/keyboards/cannonkeys/nearfield/readme.md b/keyboards/cannonkeys/nearfield/readme.md
new file mode 100644
index 0000000000..ea63a5f221
--- /dev/null
+++ b/keyboards/cannonkeys/nearfield/readme.md
@@ -0,0 +1,31 @@
+# Nearfield
+
+![Nearfield](https://i.imgur.com/hNj44FYh.jpg)
+
+The LZ ErGO is a classic ergonomic design, predating the alice layout, and drawing inspiration from the "Microsoft natural ergonomic" series.
+Nearfield expands on this by increasing the rotation of the two halves of the alpha cluster, each half is rotated 15 degrees towards the center of the board.
+This increased angle forces the user to widen their elbow stance, and align their hands straighter with their forearms while typing.
+
+Aesthetic design: Aside from the obvious layout homage to the ergo, retaining the nav cluster,
+the case design draws inspiration from the M0110 keyboard series from Apple.
+
+bog standard mx and alps support pcb, uses unified c3 daughterboard. 100mm JST cable recommended.
+
+ 
+* Keyboard Maintainer: [TJ Campie](https://github.com/tominabox1)
+* Hardware Supported: Nearfield
+* Hardware Availability: [Cannonkeys](https://cannonkeys.com/collections/nearfield/products/nearfield-extra-pcb-and-daughterboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nearfield:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/cannonkeys/nearfield/rules.mk b/keyboards/cannonkeys/nearfield/rules.mk
new file mode 100755
index 0000000000..476cf49f27
--- /dev/null
+++ b/keyboards/cannonkeys/nearfield/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/tominabox1/le_chiffre/readme.md b/keyboards/tominabox1/le_chiffre/readme.md
index d2d688289e..9ac3d6c81c 100644
--- a/keyboards/tominabox1/le_chiffre/readme.md
+++ b/keyboards/tominabox1/le_chiffre/readme.md
@@ -2,7 +2,7 @@
 
 ![Le Chiffre](https://i.imgur.com/X1WsUmdl.png)
 
-Le Chiffre (ironically, "the number" in French is a 30% keyboard designed by tominabox1.  The purpose of the board is to provide a platform for MX and Choc ergo in one package for when ones wrists need a break. The board supports an RGB LED strip with DI on port F0. The board is also fitted with support for run-of-the-mill .91" OLED and EC11 rotary encoder.  
+Le Chiffre (ironically, "the number" in French) is a 30% keyboard designed by tominabox1.  The purpose of the board is to provide a platform for MX and Choc ergo in one package for when ones wrists need a break. The board supports an RGB LED strip with DI on port F0. The board is also fitted with support for run-of-the-mill .91" OLED and EC11 rotary encoder.  
 
 There are 3 PCB revisions: Rev 1 (Original), Rev 2 (P3D version sold with the Le Chiffre Plus), and HE (Hotswap Edition from Checkerboards.xyz).
 

From 56b93a3ad8d40e17f0ee37728cf1b59f576123b4 Mon Sep 17 00:00:00 2001
From: Stefan <stef9998@mail.de>
Date: Mon, 29 Aug 2022 06:49:17 +0200
Subject: [PATCH 258/959] [Keyboard] Add handwired Split 5x7 (#18128)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../handwired/stef9998/split_5x7/config.h     |  20 ++
 .../handwired/stef9998/split_5x7/info.json    |  97 +++++++++
 .../split_5x7/keymaps/default/config.h        |  28 +++
 .../split_5x7/keymaps/default/keymap.c        |  96 +++++++++
 .../split_5x7/keymaps/default/readme.md       |   7 +
 .../split_5x7/keymaps/stef9998/config.h       |  34 ++++
 .../split_5x7/keymaps/stef9998/keymap.c       | 188 ++++++++++++++++++
 .../split_5x7/keymaps/stef9998/readme.md      |   4 +
 .../split_5x7/keymaps/stef9998/rules.mk       |   2 +
 .../handwired/stef9998/split_5x7/readme.md    |  26 +++
 .../stef9998/split_5x7/rev1/config.h          |  58 ++++++
 .../handwired/stef9998/split_5x7/rev1/rev1.c  |  17 ++
 .../handwired/stef9998/split_5x7/rev1/rev1.h  |  40 ++++
 .../stef9998/split_5x7/rev1/rules.mk          |   4 +
 .../handwired/stef9998/split_5x7/rules.mk     |  22 ++
 .../handwired/stef9998/split_5x7/split_5x7.c  |  33 +++
 .../handwired/stef9998/split_5x7/split_5x7.h  |  23 +++
 17 files changed, 699 insertions(+)
 create mode 100644 keyboards/handwired/stef9998/split_5x7/config.h
 create mode 100644 keyboards/handwired/stef9998/split_5x7/info.json
 create mode 100644 keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
 create mode 100644 keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/stef9998/split_5x7/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
 create mode 100644 keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
 create mode 100644 keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/readme.md
 create mode 100644 keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/rules.mk
 create mode 100644 keyboards/handwired/stef9998/split_5x7/readme.md
 create mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/config.h
 create mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
 create mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
 create mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/rules.mk
 create mode 100644 keyboards/handwired/stef9998/split_5x7/rules.mk
 create mode 100644 keyboards/handwired/stef9998/split_5x7/split_5x7.c
 create mode 100644 keyboards/handwired/stef9998/split_5x7/split_5x7.h

diff --git a/keyboards/handwired/stef9998/split_5x7/config.h b/keyboards/handwired/stef9998/split_5x7/config.h
new file mode 100644
index 0000000000..d04675e7db
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json
new file mode 100644
index 0000000000..a1248b2d9e
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/info.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "Split_5x7",
+  "url": "",
+  "maintainer": "stef9998",
+  "manufacturer": "Stef9998",
+  "usb": {
+    "vid": "0x57EF",
+    "pid": "0x6063",
+    "device_version": "1.0.0"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"label":"Esc", "x":0, "y":0},
+        {"label":"1", "x":1, "y":0},
+        {"label":"2", "x":2, "y":0},
+        {"label":"3", "x":3, "y":0},
+        {"label":"4", "x":4, "y":0},
+        {"label":"5", "x":5, "y":0},
+        {"label":"F1", "x":6, "y":0},
+
+        {"label":"Tab", "x":0, "y":1},
+        {"label":"Q", "x":1, "y":1},
+        {"label":"W", "x":2, "y":1},
+        {"label":"E", "x":3, "y":1},
+        {"label":"R", "x":4, "y":1},
+        {"label":"T", "x":5, "y":1},
+        {"label":"[", "x":6, "y":1},
+
+        {"label":"Caps Lock", "x":0, "y":2},
+        {"label":"A", "x":1, "y":2},
+        {"label":"S", "x":2, "y":2},
+        {"label":"D", "x":3, "y":2},
+        {"label":"F", "x":4, "y":2},
+        {"label":"G", "x":5, "y":2},
+        {"label":"=", "x":6, "y":2},
+
+        {"label":"Shift", "x":0, "y":3},
+        {"label":"Z", "x":1, "y":3},
+        {"label":"X", "x":2, "y":3},
+        {"label":"C", "x":3, "y":3},
+        {"label":"V", "x":4, "y":3},
+        {"label":"B", "x":5, "y":3},
+        {"label":"F3", "x":6, "y":3},
+
+        {"label":"Ctrl", "x":0, "y":4},
+        {"label":"Ctrl", "x":1, "y":4},
+        {"label":"Gui", "x":2, "y":4, "w":1.25},
+        {"label":"Alt", "x":3.25, "y":4, "w":1.25},
+        {"label":"Space", "x":4.5, "y":4, "w":1.5},
+        {"label":"F5", "x":6, "y":4},
+
+
+        {"label":"F2", "x":14, "y":0},
+        {"label":"6", "x":9, "y":0},
+        {"label":"7", "x":10, "y":0},
+        {"label":"8", "x":11, "y":0},
+        {"label":"9", "x":12, "y":0},
+        {"label":"0", "x":13, "y":0},
+        {"label":"Backspace", "x":14, "y":0},
+
+        {"label":"]", "x":8, "y":1},
+        {"label":"Y", "x":9, "y":1},
+        {"label":"U", "x":10, "y":1},
+        {"label":"I", "x":11, "y":1},
+        {"label":"O", "x":12, "y":1},
+        {"label":"P", "x":13, "y":1},
+        {"label":"\\", "x":14, "y":1},
+
+        {"label":"-", "x":8, "y":2},
+        {"label":"H", "x":9, "y":2},
+        {"label":"J", "x":10, "y":2},
+        {"label":"K", "x":11, "y":2},
+        {"label":"L", "x":12, "y":2},
+        {"label":";", "x":13, "y":2},
+        {"label":"Enter", "x":14, "y":2},
+
+        {"label":"F4", "x":8, "y":3},
+        {"label":"N", "x":9, "y":3},
+        {"label":"M", "x":10, "y":3},
+        {"label":",", "x":11, "y":3},
+        {"label":".", "x":12, "y":3},
+        {"label":"/", "x":13, "y":3},
+        {"label":"Shift", "x":14, "y":3},
+
+        {"label":"F5", "x":8, "y":4},
+        {"label":"Space", "x":9, "y":4, "w":1.5},
+        {"label":"AltGr", "x":10.5, "y":4, "w":1.25},
+        {"label":"Fn", "x":11.75, "y":4, "w":1.25},
+        {"label":"Ctrl", "x":13, "y":4},
+        {"label":"Ctrl", "x":13, "y":4}
+
+
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
new file mode 100644
index 0000000000..2a19e47502
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
@@ -0,0 +1,28 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 USE_SERIAL
+#define USE_I2C
+
+/* Select hand configuration */
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
+
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ce130d6e79
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c
@@ -0,0 +1,96 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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.
+// You can also skip layer-names entirely and just use numbers.
+enum custom_layer {
+    _QWERTY,
+    _FN,
+    _SYM, //symbols & numbers
+    _CFG, //config
+};
+
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    FN,
+    SYM,
+    CONFIG,
+};
+
+// Shortcut to make keymap more readable
+#define KC_FN MO(_FN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_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_LBRC ,                          KC_RBRC ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_CAPS ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_EQL  ,                          KC_MINS ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,SH_OS   ,                          KC_NO   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    KC_LCTL ,KC_LCPO ,KC_LGUI   ,KC_LALT   ,KC_SPC       ,MO(_SYM),                          MO(_SYM),KC_SPC       ,KC_RALT   ,MO(_FN)   ,KC_RCPC ,KC_RCTL
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_FN] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,KC_DEL ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,KC_PGUP ,KC_HOME ,KC_UP   ,KC_END  ,KC_PSCR ,XXXXXXX ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,KC_PGDN ,KC_LEFT ,KC_DOWN ,KC_RIGHT,_______ ,KC_QUOT ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,                          _______ ,KC_MSEL ,KC_MPLY ,KC_MPRV ,KC_MNXT ,KC_MPLY ,_______ ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    _______ ,_______ ,_______   ,_______   ,_______      ,_______ ,                          _______ ,_______      ,_______   ,_______   ,_______ ,_______
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_SYM] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F11  ,                          KC_F12  ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_DEL ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,_______ ,                          _______ ,KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_LPRN ,KC_RPRN ,XXXXXXX ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,_______ ,                          _______ ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_MSEL ,KC_MPLY ,XXXXXXX , KC_MPRV, KC_MNXT,_______ ,                          _______ ,KC_MSEL ,KC_MPLY , KC_MPRV, KC_MNXT,KC_MPLY ,_______ ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    QK_BOOT ,_______ ,_______   ,_______   ,_______      ,TG(_CFG),                          TG(_CFG),_______      ,_______   ,_______   ,_______ ,QK_BOOT
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_CFG] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    TG(_CFG),_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    _______ ,_______ ,_______   ,_______   ,_______      ,_______ ,                          _______ ,_______      ,_______   ,_______   ,_______ ,_______
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+};
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/default/readme.md b/keyboards/handwired/stef9998/split_5x7/keymaps/default/readme.md
new file mode 100644
index 0000000000..9d3e057bc6
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+![Split_5x7 Layout Image](https://i.imgur.com/XnDWlJOh.png)
+
+# Default Layout
+
+This is the default layout.
+For the most part it's a straightforward and easy to follow layout.
+The only thing to note is the apostrophe key which is on the second layer under return.
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
new file mode 100644
index 0000000000..3b7ee90f92
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 USE_SERIAL
+#define USE_I2C
+
+/* Select hand configuration */
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
+
+#define LCPO_KEYS KC_LCTL,KC_TRNS,KC_LBRC
+#define RCPC_KEYS KC_RCTL,KC_TRNS,KC_RBRC
+
+#define TAPPING_TERM_PER_KEY
+#define IGNORE_MOD_TAP_INTERRUPT
+#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
new file mode 100644
index 0000000000..0be1e4cbb3
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
@@ -0,0 +1,188 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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_layer {
+    _QWERTY,
+    _HOMEMOD,
+    _FN,
+    _SYM, //symbols & numbers
+    _SPARE,
+    _CFG, //config
+};
+
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    HOMEMOD,
+    FN,
+    SYM,
+    SPARE,
+    CONFIG,
+};
+
+// Shortcut to make keymap more readable
+#define KC_FN MO(_FN)
+
+bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_LSPO:
+            // Do not force the mod-tap key press to be handled as a modifier
+            // if any other key was pressed while the mod-tap key is held down.
+            return false;
+//        case MT(MOD_LSFT,KC_9):
+//            return false;
+        case KC_RSPC:
+            return false;
+        default:
+            // Force the mod-tap key press to be handled as a modifier if any
+            // other key was pressed while the mod-tap key is held down.
+            return true;
+    }
+}
+
+//layer_state_t layer_state_set_user(layer_state_t state) {
+//    return update_tri_layer_state(state, _ESS, _SYM, _SYM_ESS);
+//}
+
+//Modified from default, cause I want CapsLock to still be there even when I swap hands
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+{ {0, 5},  {1, 5},  {2, 5},  {3, 5}, {4, 5}, {5, 5}, {6, 5}},
+{ {0, 6},  {1, 6},  {2, 6},  {3, 6}, {4, 6}, {5, 6}, {6, 6}},
+{ {0, 2},  {1, 7},  {2, 7},  {3, 7}, {4, 7}, {5, 7}, {6, 7}}, // caps won't be switched, because of extend
+{ {0, 8},  {1, 8},  {2, 8},  {3, 8}, {4, 8}, {5, 8}, {6, 8}},
+{ {0, 9},  {1, 9},  {2, 9},  {3, 9}, {4, 9}, {5, 9}, {6, 9}},
+
+{ {0, 0},  {1, 0},  {2, 0},  {3, 0}, {4, 0}, {5, 0}, {6, 0}},
+{ {0, 1},  {1, 1},  {2, 1},  {3, 1}, {4, 1}, {5, 1}, {6, 1}},
+{ {0, 2},  {1, 2},  {2, 2},  {3, 2}, {4, 2}, {5, 2}, {6, 2}},
+{ {0, 3},  {1, 3},  {2, 3},  {3, 3}, {4, 3}, {5, 3}, {6, 3}},
+{ {0, 4},  {1, 4},  {2, 4},  {3, 4}, {4, 4}, {5, 4}, {6, 4}},
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case SH_T(KC_SPC):
+            return TAPPING_TERM + 300;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_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_LBRC ,                          KC_RBRC ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_CAPS ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_EQL  ,                          KC_MINS ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,SH_OS   ,                          KC_NO   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    KC_LCTL ,KC_LCPO ,KC_LGUI   ,KC_LALT   ,SH_T(KC_SPC) ,MO(_SYM),                          MO(_SYM),KC_SPC       ,KC_RALT   ,MO(_FN)   ,KC_RCPC ,KC_RCTL
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_HOMEMOD] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+_______ ,_______ ,RALT_T(KC_S),LCTL_T(KC_D),LSFT_T(KC_F),LT(_SYM,KC_G),_______ ,           _______ ,LT(_SYM,KC_H),RSFT_T(KC_J),RCTL_T(KC_K),LALT_T(KC_L),_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSFT ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,KC_RSFT ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    _______ ,_______ ,_______   ,_______   ,_______      ,_______ ,                          _______ ,_______      ,_______   ,_______   ,_______ ,_______
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_FN] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,KC_DEL ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,KC_PGUP ,KC_HOME ,KC_UP   ,KC_END  ,KC_PSCR ,XXXXXXX ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,KC_PGDN ,KC_LEFT ,KC_DOWN ,KC_RIGHT,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,                          _______ ,KC_MSEL ,KC_MPLY ,KC_MPRV ,KC_MNXT ,KC_MPLY ,_______ ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    _______ ,_______ ,_______   ,_______   ,_______      ,_______ ,                          _______ ,_______      ,_______   ,_______   ,_______ ,_______
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_SYM] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F11  ,                          KC_F12  ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_DEL ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,_______ ,                          _______ ,KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_LPRN ,KC_RPRN ,XXXXXXX ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    CAPSWRD ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,_______ ,                          _______ ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_QUOT ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,KC_MSEL ,KC_MPLY ,XXXXXXX ,KC_EQL  ,KC_PLUS ,_______ ,                          _______ ,KC_UNDS ,KC_MINS , KC_MPRV, KC_MNXT,KC_MPLY ,_______ ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    QK_BOOT ,_______ ,_______   ,_______   ,_______      ,TG(_CFG),                          TG(_CFG),_______      ,_______   ,_______   ,_______ ,QK_BOOT
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_CFG] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    TG(_CFG),_______ ,TG(_HOMEMOD),_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,KC_1    ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    _______ ,_______ ,_______   ,_______   ,_______      ,_______ ,                          _______ ,_______      ,_______   ,_______   ,_______ ,_______
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+
+[_SPARE] = 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 ,QK_BOOT ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX  ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    XXXXXXX ,XXXXXXX ,XXXXXXX   ,XXXXXXX   ,XXXXXXX      ,XXXXXXX ,                          XXXXXXX ,XXXXXXX      ,XXXXXXX   ,XXXXXXX   ,XXXXXXX ,XXXXXXX
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+)
+};
+
+/*
+[_] = LAYOUT(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+// ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
+    _______ ,_______ ,_______   ,_______   ,_______      ,_______ ,                          _______ ,_______      ,_______   ,_______   ,_______ ,_______
+// └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
+),
+ */
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/readme.md b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/readme.md
new file mode 100644
index 0000000000..329ba39a4a
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/readme.md
@@ -0,0 +1,4 @@
+![Split_5x7 Layout Image](https://i.imgur.com/m9LkQsWh.png)
+
+# The keymap I currently use
+Pretty much a default qwerty on a 60%-ish with some function-layers
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/rules.mk b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/rules.mk
new file mode 100644
index 0000000000..f18f03c2c7
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/rules.mk
@@ -0,0 +1,2 @@
+CAPS_WORD_ENABLE = yes
+SWAP_HANDS_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/readme.md b/keyboards/handwired/stef9998/split_5x7/readme.md
new file mode 100644
index 0000000000..bf6c9ef719
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/readme.md
@@ -0,0 +1,26 @@
+# Split_5x7
+
+![Split_5x7](https://i.imgur.com/fVw8al1h.jpg)
+
+A handwired Split keyboard with the unusual layout of 5x7 on either side.
+
+3d print files will be made available soon. 
+
+* Keyboard Maintainer: [Stefan](https://github.com/stef9998)
+* Hardware Supported: Pro Micro
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/stef9998/split_5x7/rev1:default
+
+Flashing example for left side:
+
+    make handwired/stef9998/split_5x7/rev1:default:avrdude-split-left
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+How to enter the bootloader:
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`.\
+In the default keymap it's accessible by pressing either of the buttons bringing you to layer `_SYM` and then pressing one of the outer Ctrl's.
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/config.h b/keyboards/handwired/stef9998/split_5x7/rev1/config.h
new file mode 100644
index 0000000000..6308b1cf19
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { B2, B6, B1, B3, F7, F5, F6 }
+
+#define MATRIX_ROW_PINS_RIGHT { B5, B4, E6, D7, C6 }
+#define MATRIX_COL_PINS_RIGHT { F5, F6, F7, B1, B3, B2, B6 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
new file mode 100644
index 0000000000..cf8e7d9fa3
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "split_5x7.h"
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
new file mode 100644
index 0000000000..9ffed66727
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 stef9998
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 "split_5x7.h"
+
+
+#define LAYOUT( \
+  k00, k01, k02, k03, k04, k05, k06,                k07, k08, k09, k10, k11, k12, k13, \
+  k14, k15, k16, k17, k18, k19, k20,                k21, k22, k23, k24, k25, k26, k27, \
+  k28, k29, k30, k31, k32, k33, k34,                k35, k36, k37, k38, k39, k40, k41, \
+  k42, k43, k44, k45, k46, k47, k48,                k49, k50, k51, k52, k53, k54, k55, \
+  k56, k57, k58, k59,      k61, k62,                k63, k64,      k66, k67, k68, k69  \
+) \
+{ \
+    { k00, k01, k02, k03, k04  , k05, k06 }, \
+    { k14, k15, k16, k17, k18  , k19, k20 }, \
+    { k28, k29, k30, k31, k32  , k33, k34 }, \
+    { k42, k43, k44, k45, k46  , k47, k48 }, \
+    { k56, k57, k58, k59, KC_NO, k61, k62 }, \
+    { k13, k12, k11, k10, k09  , k08, k07 }, \
+    { k27, k26, k25, k24, k23  , k22, k21 }, \
+    { k41, k40, k39, k38, k37  , k36, k35 }, \
+    { k55, k54, k53, k52, k51  , k50, k49 }, \
+    { k69, k68, k67, k66, KC_NO, k64, k63 }  \
+}
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rules.mk b/keyboards/handwired/stef9998/split_5x7/rev1/rules.mk
new file mode 100644
index 0000000000..3cd6d040b8
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/rules.mk
@@ -0,0 +1,4 @@
+# Disable unsupported hardware
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
+RGBLIGHT_SUPPORTED = no
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/rules.mk b/keyboards/handwired/stef9998/split_5x7/rules.mk
new file mode 100644
index 0000000000..01f4b93976
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+SPLIT_KEYBOARD = yes
+
+DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/split_5x7.c
new file mode 100644
index 0000000000..5e19d47175
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/split_5x7.c
@@ -0,0 +1,33 @@
+/* Copyright 2017 REPLACE_WITH_YOUR_NAME
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "split_5x7.h"
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+{{0, 5},  {1, 5},  {2, 5},  {3, 5}, {4, 5}, {5, 5}, {6, 5}},
+{{0, 6},  {1, 6},  {2, 6},  {3, 6}, {4, 6}, {5, 6}, {6, 6}},
+{{0, 7},  {1, 7},  {2, 7},  {3, 7}, {4, 7}, {5, 7}, {6, 7}},
+{{0, 8},  {1, 8},  {2, 8},  {3, 8}, {4, 8}, {5, 8}, {6, 8}},
+{{0, 9},  {1, 9},  {2, 9},  {3, 9}, {4, 9}, {5, 9}, {6, 9}},
+
+{{0, 0},  {1, 0},  {2, 0},  {3, 0}, {4, 0}, {5, 0}, {6, 0}},
+{{0, 1},  {1, 1},  {2, 1},  {3, 1}, {4, 1}, {5, 1}, {6, 1}},
+{{0, 2},  {1, 2},  {2, 2},  {3, 2}, {4, 2}, {5, 2}, {6, 2}},
+{{0, 3},  {1, 3},  {2, 3},  {3, 3}, {4, 3}, {5, 3}, {6, 3}},
+{{0, 4},  {1, 4},  {2, 4},  {3, 4}, {4, 4}, {5, 4}, {6, 4}},
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.h b/keyboards/handwired/stef9998/split_5x7/split_5x7.h
new file mode 100644
index 0000000000..55ed1cc98f
--- /dev/null
+++ b/keyboards/handwired/stef9998/split_5x7/split_5x7.h
@@ -0,0 +1,23 @@
+/* Copyright 2017 REPLACE_WITH_YOUR_NAME
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#if defined(KEYBOARD_handwired_stef9998_split_5x7_rev1)
+#     include "rev1.h"
+#endif
+
+#include "quantum.h"

From d910e8df77150bab0b9cc2c3794554b4c8c81d71 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 29 Aug 2022 14:53:08 +1000
Subject: [PATCH 259/959] Use `TAP_CODE_DELAY` for encoder mapping by default
 (#18098)

---
 docs/feature_encoders.md | 14 +++++++++++---
 quantum/encoder.c        |  8 +++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index fdde03ac23..f93ab9fd2d 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -88,6 +88,14 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 ```
 
+Using encoder mapping pumps events through the normal QMK keycode processing pipeline, resulting in a _keydown/keyup_ combination pushed through `process_record_xxxxx()`. To configure the amount of time between the encoder "keyup" and "keydown", you can add the following to your `config.h`:
+
+```c
+#define ENCODER_MAP_KEY_DELAY 10
+```
+
+?> By default, the encoder map delay matches the value of `TAP_CODE_DELAY`.
+
 ## Callbacks
 
 When not using `ENCODER_MAP_ENABLE = yes`, the callback functions can be inserted into your `<keyboard>.c`:
@@ -119,7 +127,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 ```
 
-!> If you return `true`, it will allow the keyboard level code to run as well. Returning `false` will override the keyboard level code, depending on how the keyboard function is set up. 
+!> If you return `true`, it will allow the keyboard level code to run as well. Returning `false` will override the keyboard level code, depending on how the keyboard function is set up.
 
 Layer conditions can also be used with the callback function like the following:
 
@@ -172,7 +180,7 @@ The A an B lines of the encoders should be wired directly to the MCU, and the C/
 Multiple encoders may share pins so long as each encoder has a distinct pair of pins when the following conditions are met:
 - using detent encoders
 - pads must be high at the detent stability point which is called 'default position' in QMK
-- no more than two encoders sharing a pin can be turned at the same time 
+- no more than two encoders sharing a pin can be turned at the same time
 
 For example you can support two encoders using only 3 pins like this
 ```
@@ -185,4 +193,4 @@ You could even support three encoders using only three pins (one per encoder) ho
 #define ENCODERS_PAD_A { B1, B1, B2 }
 #define ENCODERS_PAD_B { B2, B3, B3 }
 ```
-Here rotating Encoder 0 `B1 B2` and Encoder 1 `B1 B3` could be interpreted as rotating Encoder 2 `B2 B3` or `B3 B2` depending on the timing. This may still be a useful configuration depending on your use case 
+Here rotating Encoder 0 `B1 B2` and Encoder 1 `B1 B3` could be interpreted as rotating Encoder 2 `B2 B3` or `B3 B2` depending on the timing. This may still be a useful configuration depending on your use case
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 5f8a7ce080..1393e34868 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -24,7 +24,8 @@
 #include <string.h>
 
 #ifndef ENCODER_MAP_KEY_DELAY
-#    define ENCODER_MAP_KEY_DELAY 2
+#    include "action.h"
+#    define ENCODER_MAP_KEY_DELAY TAP_CODE_DELAY
 #endif
 
 #if !defined(ENCODER_RESOLUTIONS) && !defined(ENCODER_RESOLUTION)
@@ -143,9 +144,14 @@ void encoder_init(void) {
 static void encoder_exec_mapping(uint8_t index, bool clockwise) {
     // The delays below cater for Windows and its wonderful requirements.
     action_exec(clockwise ? ENCODER_CW_EVENT(index, true) : 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 ? ENCODER_CW_EVENT(index, false) : 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
 

From e99ec28f5fffc41ce2662e883f7e9b56383d758b Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 29 Aug 2022 19:16:49 +0200
Subject: [PATCH 260/959] [Core] Introduce pointing device specific debug
 messages (#17663)

---
 docs/feature_pointing_device.md               | 10 +++++++++
 drivers/sensors/cirque_pinnacle.c             |  8 -------
 drivers/sensors/cirque_pinnacle.h             |  1 +
 drivers/sensors/cirque_pinnacle_i2c.c         | 10 ++-------
 drivers/sensors/cirque_pinnacle_spi.c         | 10 ++-------
 drivers/sensors/pimoroni_trackball.c          | 21 ++++++++----------
 drivers/sensors/pmw33xx_common.c              | 13 +++++------
 .../pointing_device/pointing_device_drivers.c | 22 ++++++-------------
 quantum/pointing_device_internal.h            | 14 ++++++++++++
 9 files changed, 50 insertions(+), 59 deletions(-)
 create mode 100644 quantum/pointing_device_internal.h

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 999dd1272d..afc57ed493 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -487,3 +487,13 @@ report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, re
     return pointing_device_combine_reports(left_report, right_report);
 }
 ```
+
+# Troubleshooting
+
+If you are having issues with pointing device drivers debug messages can be enabled that will give you insights in the inner workings. To enable these add to your keyboards `config.h` file:
+
+```c
+#define POINTING_DEVICE_DEBUG
+```
+ 
+?> The messages will be printed out to the `CONSOLE` output. For additional information, refer to [Debugging/Troubleshooting QMK](faq_debug.md).
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index 8bd4eb736e..4aed5fe67a 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -4,8 +4,6 @@
 // refer to documentation: Gen2 and Gen3 (Pinnacle ASIC) at https://www.cirque.com/documentation
 
 #include "cirque_pinnacle.h"
-#include "print.h"
-#include "debug.h"
 #include "wait.h"
 #include "timer.h"
 
@@ -27,12 +25,6 @@ void cirque_pinnacle_enable_feed(bool feedEnable);
 void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count);
 void RAP_Write(uint8_t address, uint8_t data);
 
-#ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) {
-    xprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
-}
-#endif
-
 #if CIRQUE_PINNACLE_POSITION_MODE
 /*  Logical Scaling Functions */
 // Clips raw coordinates to "reachable" window of sensor
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index fa06e047f2..8717b32991 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -5,6 +5,7 @@
 #include "cirque_pinnacle_regdefs.h"
 #include <stdint.h>
 #include <stdbool.h>
+#include "pointing_device_internal.h"
 
 #ifndef CIRQUE_PINNACLE_TIMEOUT
 #    define CIRQUE_PINNACLE_TIMEOUT 20 // I2C timeout in milliseconds
diff --git a/drivers/sensors/cirque_pinnacle_i2c.c b/drivers/sensors/cirque_pinnacle_i2c.c
index b328dd9a7a..3c11e5f079 100644
--- a/drivers/sensors/cirque_pinnacle_i2c.c
+++ b/drivers/sensors/cirque_pinnacle_i2c.c
@@ -1,8 +1,6 @@
 // Copyright (c) 2018 Cirque Corp. Restrictions apply. See: www.cirque.com/sw-license
 #include "cirque_pinnacle.h"
 #include "i2c_master.h"
-#include "print.h"
-#include "debug.h"
 #include "stdio.h"
 
 // Masks for Cirque Register Access Protocol (RAP)
@@ -18,9 +16,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
     if (touchpad_init) {
         i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, NULL, 0, CIRQUE_PINNACLE_TIMEOUT);
         if (i2c_readReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, data, count, CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
-#ifdef CONSOLE_ENABLE
-            dprintf("error cirque_pinnacle i2c_readReg\n");
-#endif
+            pd_dprintf("error cirque_pinnacle i2c_readReg\n");
             touchpad_init = false;
         }
         i2c_stop();
@@ -33,9 +29,7 @@ void RAP_Write(uint8_t address, uint8_t data) {
 
     if (touchpad_init) {
         if (i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, &data, sizeof(data), CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
-#ifdef CONSOLE_ENABLE
-            dprintf("error cirque_pinnacle i2c_writeReg\n");
-#endif
+            pd_dprintf("error cirque_pinnacle i2c_writeReg\n");
             touchpad_init = false;
         }
         i2c_stop();
diff --git a/drivers/sensors/cirque_pinnacle_spi.c b/drivers/sensors/cirque_pinnacle_spi.c
index bd980fc863..5cb39aebb0 100644
--- a/drivers/sensors/cirque_pinnacle_spi.c
+++ b/drivers/sensors/cirque_pinnacle_spi.c
@@ -1,8 +1,6 @@
 // Copyright (c) 2018 Cirque Corp. Restrictions apply. See: www.cirque.com/sw-license
 #include "cirque_pinnacle.h"
 #include "spi_master.h"
-#include "print.h"
-#include "debug.h"
 
 // Masks for Cirque Register Access Protocol (RAP)
 #define WRITE_MASK 0x80
@@ -24,9 +22,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
                 data[i] = spi_write(FILLER_BYTE); // write filler, receive data on the third filler send
             }
         } else {
-#ifdef CONSOLE_ENABLE
-            dprintf("error cirque_pinnacle spi_start read\n");
-#endif
+            pd_dprintf("error cirque_pinnacle spi_start read\n");
             touchpad_init = false;
         }
         spi_stop();
@@ -42,9 +38,7 @@ void RAP_Write(uint8_t address, uint8_t data) {
             spi_write(cmdByte);
             spi_write(data);
         } else {
-#ifdef CONSOLE_ENABLE
-            dprintf("error cirque_pinnacle spi_start write\n");
-#endif
+            pd_dprintf("error cirque_pinnacle spi_start write\n");
             touchpad_init = false;
         }
         spi_stop();
diff --git a/drivers/sensors/pimoroni_trackball.c b/drivers/sensors/pimoroni_trackball.c
index 88a351316b..326e59744f 100644
--- a/drivers/sensors/pimoroni_trackball.c
+++ b/drivers/sensors/pimoroni_trackball.c
@@ -14,10 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "pointing_device_internal.h"
 #include "pimoroni_trackball.h"
 #include "i2c_master.h"
-#include "print.h"
-#include "debug.h"
 #include "timer.h"
 
 // clang-format off
@@ -58,20 +58,17 @@ void pimoroni_trackball_set_rgbw(uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
     uint8_t                              data[4] = {r, g, b, w};
     __attribute__((unused)) i2c_status_t status  = i2c_writeReg(PIMORONI_TRACKBALL_ADDRESS << 1, PIMORONI_TRACKBALL_REG_LED_RED, data, sizeof(data), PIMORONI_TRACKBALL_TIMEOUT);
 
-#ifdef CONSOLE_ENABLE
-    if (debug_mouse) dprintf("Trackball RGBW i2c_status_t: %d\n", status);
-#endif
+    pd_dprintf("Trackball RGBW i2c_status_t: %d\n", status);
 }
 
 i2c_status_t read_pimoroni_trackball(pimoroni_data_t* data) {
     i2c_status_t status = i2c_readReg(PIMORONI_TRACKBALL_ADDRESS << 1, PIMORONI_TRACKBALL_REG_LEFT, (uint8_t*)data, sizeof(*data), PIMORONI_TRACKBALL_TIMEOUT);
-#ifdef CONSOLE_ENABLE
-    if (debug_mouse) {
-        static uint16_t d_timer;
-        if (timer_elapsed(d_timer) > PIMORONI_TRACKBALL_DEBUG_INTERVAL) {
-            dprintf("Trackball READ i2c_status_t: %d L: %d R: %d Up: %d D: %d SW: %d\n", status, data->left, data->right, data->up, data->down, data->click);
-            d_timer = timer_read();
-        }
+
+#ifdef POINTING_DEVICE_DEBUG
+    static uint16_t d_timer;
+    if (timer_elapsed(d_timer) > PIMORONI_TRACKBALL_DEBUG_INTERVAL) {
+        pd_dprintf("Trackball READ i2c_status_t: %d L: %d R: %d Up: %d D: %d SW: %d\n", status, data->left, data->right, data->up, data->down, data->click);
+        d_timer = timer_read();
     }
 #endif
 
diff --git a/drivers/sensors/pmw33xx_common.c b/drivers/sensors/pmw33xx_common.c
index 13164cb150..4993cc2d34 100644
--- a/drivers/sensors/pmw33xx_common.c
+++ b/drivers/sensors/pmw33xx_common.c
@@ -7,9 +7,8 @@
 // Copyright 2020 Ploopy Corporation
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "debug.h"
+#include "pointing_device_internal.h"
 #include "pmw33xx_common.h"
-#include "print.h"
 #include "string.h"
 #include "wait.h"
 #include "spi_master.h"
@@ -154,7 +153,7 @@ bool pmw33xx_init(uint8_t sensor) {
     pmw33xx_read(sensor, REG_Delta_Y_H);
 
     if (!pmw33xx_upload_firmware(sensor)) {
-        dprintf("PMW33XX (%d): firmware upload failed!\n", sensor);
+        pd_dprintf("PMW33XX (%d): firmware upload failed!\n", sensor);
         return false;
     }
 
@@ -170,7 +169,7 @@ bool pmw33xx_init(uint8_t sensor) {
     pmw33xx_write(sensor, REG_Lift_Config, PMW33XX_LIFTOFF_DISTANCE);
 
     if (!pmw33xx_check_signature(sensor)) {
-        dprintf("PMW33XX (%d): firmware signature verification failed!\n", sensor);
+        pd_dprintf("PMW33XX (%d): firmware signature verification failed!\n", sensor);
         return false;
     }
 
@@ -185,7 +184,7 @@ pmw33xx_report_t pmw33xx_read_burst(uint8_t sensor) {
     }
 
     if (!in_burst[sensor]) {
-        dprintf("PMW33XX (%d): burst\n", sensor);
+        pd_dprintf("PMW33XX (%d): burst\n", sensor);
         if (!pmw33xx_write(sensor, REG_Motion_Burst, 0x00)) {
             return report;
         }
@@ -208,9 +207,7 @@ pmw33xx_report_t pmw33xx_read_burst(uint8_t sensor) {
 
     spi_stop();
 
-    if (debug_config.mouse) {
-        dprintf("PMW33XX (%d): motion: 0x%x dx: %i dy: %i\n", sensor, report.motion.w, report.delta_x, report.delta_y);
-    }
+    pd_dprintf("PMW33XX (%d): motion: 0x%x dx: %i dy: %i\n", sensor, report.motion.w, report.delta_x, report.delta_y);
 
     report.delta_x *= -1;
     report.delta_y *= -1;
diff --git a/quantum/pointing_device/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
index b96f8ff4b3..096ad5d028 100644
--- a/quantum/pointing_device/pointing_device_drivers.c
+++ b/quantum/pointing_device/pointing_device_drivers.c
@@ -17,6 +17,7 @@
  */
 
 #include "pointing_device.h"
+#include "pointing_device_internal.h"
 #include "debug.h"
 #include "wait.h"
 #include "timer.h"
@@ -32,10 +33,7 @@ report_mouse_t adns5050_get_report(report_mouse_t mouse_report) {
     report_adns5050_t data = adns5050_read_burst();
 
     if (data.dx != 0 || data.dy != 0) {
-#    ifdef CONSOLE_ENABLE
-        if (debug_mouse) dprintf("Raw ] X: %d, Y: %d\n", data.dx, data.dy);
-#    endif
-
+        pd_dprintf("Raw ] X: %d, Y: %d\n", data.dx, data.dy);
         mouse_report.x = (mouse_xy_report_t)data.dx;
         mouse_report.y = (mouse_xy_report_t)data.dy;
     }
@@ -76,9 +74,7 @@ const pointing_device_driver_t pointing_device_driver = {
 report_mouse_t analog_joystick_get_report(report_mouse_t mouse_report) {
     report_analog_joystick_t data = analog_joystick_read();
 
-#    ifdef CONSOLE_ENABLE
-    if (debug_mouse) dprintf("Raw ] X: %d, Y: %d\n", data.x, data.y);
-#    endif
+    pd_dprintf("Raw ] X: %d, Y: %d\n", data.x, data.y);
 
     mouse_report.x = data.x;
     mouse_report.y = data.y;
@@ -140,11 +136,9 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
         return mouse_report;
     }
 
-#        if CONSOLE_ENABLE
-    if (debug_mouse && touchData.touchDown) {
-        dprintf("cirque_pinnacle touchData x=%4d y=%4d z=%2d\n", touchData.xValue, touchData.yValue, touchData.zValue);
+    if (touchData.touchDown) {
+        pd_dprintf("cirque_pinnacle touchData x=%4d y=%4d z=%2d\n", touchData.xValue, touchData.yValue, touchData.zValue);
     }
-#        endif
 
     // Scale coordinates to arbitrary X, Y resolution
     cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());
@@ -227,9 +221,7 @@ const pointing_device_driver_t pointing_device_driver = {
 report_mouse_t paw3204_get_report(report_mouse_t mouse_report) {
     report_paw3204_t data = paw3204_read();
     if (data.isMotion) {
-#    ifdef CONSOLE_ENABLE
-        dprintf("Raw ] X: %d, Y: %d\n", data.x, data.y);
-#    endif
+        pd_dprintf("Raw ] X: %d, Y: %d\n", data.x, data.y);
 
         mouse_report.x = data.x;
         mouse_report.y = data.y;
@@ -329,7 +321,7 @@ report_mouse_t pmw33xx_get_report(report_mouse_t mouse_report) {
 
     if (!in_motion) {
         in_motion = true;
-        dprintf("PWM3360 (0): starting motion\n");
+        pd_dprintf("PWM3360 (0): starting motion\n");
     }
 
     mouse_report.x = CONSTRAIN_HID_XY(report.delta_x);
diff --git a/quantum/pointing_device_internal.h b/quantum/pointing_device_internal.h
new file mode 100644
index 0000000000..ef649407ca
--- /dev/null
+++ b/quantum/pointing_device_internal.h
@@ -0,0 +1,14 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef POINTING_DEVICE_DEBUG
+#    include "debug.h"
+#    include "print.h"
+#    define pd_dprintf(...) dprintf(__VA_ARGS__)
+#else
+#    define pd_dprintf(...) \
+        do {                \
+        } while (0)
+#endif

From ef775d0fc8ae70ac2d7add1a494427010f79049c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 30 Aug 2022 04:05:05 +1000
Subject: [PATCH 261/959] Fix incorrect `bluetooth.driver` rules.mk mapping
 (#18205)

---
 data/mappings/info_rules.json    | 2 +-
 data/schemas/keyboard.jsonschema | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index 3f140277fe..87a4b795b6 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -12,7 +12,7 @@
     # replace_with: use with a key marked deprecated or invalid to designate a replacement
     "BOARD": {"info_key": "board"},
     "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
-    "BLUETOOTH": {"info_key": "bluetooth.driver"},
+    "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
     "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"},
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index b534f28c9f..e425d13dd8 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -75,8 +75,7 @@
                 "driver": {
                     "type": "string",
                     "enum": ["BluefruitLE", "RN42"]
-                },
-                "lto": {"type": "boolean"}
+                }
             }
         },
         "board": {

From 22136f813511eae8841bce1d6cd35e5e1980b4ac Mon Sep 17 00:00:00 2001
From: Christian Solje <csolje@gmail.com>
Date: Mon, 29 Aug 2022 20:22:01 +0200
Subject: [PATCH 262/959] [Keymap] Add csolje 42 keymap for the cantor (#18125)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Christian Solje <csolje@gn.com>
---
 keyboards/cantor/keymaps/zeromist/keymap.c | 107 +++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 keyboards/cantor/keymaps/zeromist/keymap.c

diff --git a/keyboards/cantor/keymaps/zeromist/keymap.c b/keyboards/cantor/keymaps/zeromist/keymap.c
new file mode 100644
index 0000000000..1c4f56a727
--- /dev/null
+++ b/keyboards/cantor/keymaps/zeromist/keymap.c
@@ -0,0 +1,107 @@
+// Copyright 2022 Diego Palacios (@diepala)
+// SPDX-License-Identifier: GPL-2.0
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┬───┐           ┌───┬───┬───┬───┬───┬───┐
+      * │Tab│ Q │ W │ E │ R │ T │           │ Y │ U │ I │ O │ P │Bsp│
+      * ├───┼───┼───┼───┼───┼───┤           ├───┼───┼───┼───┼───┼───┤
+      * │ESC│ A │ S │ D │ F │ G │           │ H │ J │ K │ L │ ; │ ' │
+      * ├───┼───┼───┼───┼───┼───┤           ├───┼───┼───┼───┼───┼───┤
+      * │Sft│ Z │ X │ C │ V │ B │           │ N │ M │ , │ . │ / │Sft│
+      * └───┴───┴───┴───┴───┴───┘           └───┴───┴───┴───┴───┴───┘
+      *          ┌────┐                                ┌───┐
+      *          │LCTL├───────┐                  ┌─────┤Alt│
+      *          └────┤GUI/Bsp├───────┐      ┌───┤TO(1)├───┘
+      *               └───────┤ALT/ENT│      │SPC├─────┘
+      *                       └───────┘      └───┘
+      */
+    [0] = LAYOUT_split_3x6_3(
+      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_ESCAPE, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                 KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
+                              KC_LCTL, MT(MOD_LGUI, KC_BSPC), MT(MOD_LALT, KC_ENT),           KC_SPC, TO(1), KC_RALT
+      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
+    ),
+     /*
+      * ┌───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┐
+      * │`~ │ 1  │ 2 │ 3 │ 4 │ 5 │       │ 6 │ 7 │ 8 │ 9 │ 0 │Bsp│
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │   │ !  │ @ │ # │ $ │ % │       │ ^ │ &  │ * │ ( │ ) │ |  │
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Sft│ += │ -_│ + │ { │ } │       │ [ │ ] │ ; │ : │ \  │    │
+      * └───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┘
+      *           ┌────────┐                       ┌─────┐
+      *           │ MLCKSCN ├─────┐           ┌────┤TO(3)│
+      *           └────────┤TO(0)├───┐   ┌───┤TO(2)├─────┘
+      *                     └─────┤ < │   │ > ├────┘
+      *                           └───┘   └───┘
+      */
+    [1] = LAYOUT_split_3x6_3(
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_GRV,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_TRNS, KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_LSFT, KC_EQL,   KC_MINS,  KC_PLUS,  KC_LCBR,  KC_RCBR,                KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, KC_RSFT,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+                                            KC_TRNS, TO(0), KC_LT,               KC_GT, TO(2), TO(3)
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+    ),
+     /*
+      * ┌────┬──────┬──────┬──────┬──────────┬──────┐       ┌──────┬──────┬──────┬───────┬──────┬───┐
+      * │MSTP│ Play │ PRVS │ Next   │          │ CAPS  │       │ PgDn │ PgUp  │ INS   │ Print │      │Bsp│
+      * ├────┼──────┼──────┼───────┼─────────┼──────┤       ├──────┼──────┼──────┼───────┼──────┼───┤
+      * │    │ HOME │ END  │ LCTRL+C │ LCTRL+V │      │       │ Left │ Down │ Up │ Right │ Del  │   │
+      * ├────┼──────┼──────┼───────┼────────┼──────┤       ├──────┼──────┼──────┼───────┼──────┼───┤
+      * │Sft │ UNDO │ CUT  │ COPY │ PASTE │ RApp │       │ Vol- │ Vol+ │ Mute │       │ RGui │   │
+      * └────┴──────┴──────┴──────┴───────┴──────┘       └──────┴──────┴──────┴───────┴──────┴───┘
+      *                                ┌─────┐                       ┌─────┐
+      *                                │LCTRL├─────┐           ┌─────┤TO(3)│
+      *                                └─────┤TO(0)├───┐   ┌───┤TO(0)├─────┘
+      *                                      └─────┤ALT│   │SPC├─────┘
+      *                                            └───┘   └───┘
+      */
+    [2] = LAYOUT_split_3x6_3(
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_MSTP, KC_MPLY,    KC_MPRV,   KC_MNXT,  KC_NO,    KC_CAPS,              KC_PGDOWN,    KC_PGUP,    KC_INS,      KC_PSCR,    KC_NO,    KC_BSPC,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_NO,   KC_HOME,    KC_END,    C(KC_C),    C(KC_V),   KC_NO,         KC_LEFT,    KC_DOWN,   KC_UP,    KC_RGHT,    KC_DEL,   KC_NO,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_TAB,  KC_UNDO,    KC_CUT,    KC_COPY,  KC_PASTE, KC_APP,             KC_VOLD,    KC_VOLU,   KC_MUTE,    KC_NO,      KC_NO,  KC_RSFT,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+                                            KC_LCTL, TO(0), KC_LALT,            KC_TRNS, KC_TRNS, TO(3)
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+    ),
+     /*
+      * ┌──┬────┬────┬────┬────┬────┐       ┌────┬────┬────┬────┬─────┬─────┐
+      * │  │ F1 │ F2   │ F3 │ F4 │ F5 │       │ F6 │ F7 │ F8 │ F9  │ F10 │ F11 │
+      * ├──┼────┼────┼────┼────┼────┤       ├────┼────┼────┼────┼─────┼─────┤
+      * │  │    │     │    │    │     │       │    │    │    │    │      │ F12 │
+      * ├──┼────┼────┼────┼────┼────┤       ├────┼────┼────┼────┼─────┼─────┤
+      * │  │    │     │    │    │    │       │     │    │    │    │      │     │
+      * └──┴────┴────┴────┴────┴────┘       └────┴────┴────┴────┴─────┴─────┘
+      *                   ┌───┐                        ┌───┐
+      *                   │   ├─────┐           ┌─────┤   │
+      *                   └───┤TO(0)├───┐   ┌───┤     ├───┘
+      *                       └─────┤ENT│   │   ├─────┘
+      *                             └───┘   └───┘
+      */
+    [3] = LAYOUT_split_3x6_3(
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_NO, KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                   KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_NO, KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,                   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,     KC_F12,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+        KC_NO, KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,                   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,     KC_NO,
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+                                              KC_NO, TO(0), KC_NO,              KC_NO, KC_NO, KC_NO
+      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
+    )
+};

From ccb244d5ed868c139deed8ef421d8ebd1e929f8b Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 29 Aug 2022 11:22:54 -0700
Subject: [PATCH 263/959] [Keyboard] Add Trailblazer Avalon (#17568)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/fjlabs/avalon/avalon.c              | 14 +++
 keyboards/fjlabs/avalon/avalon.h              | 32 +++++++
 keyboards/fjlabs/avalon/config.h              | 76 +++++++++++++++
 keyboards/fjlabs/avalon/info.json             | 94 +++++++++++++++++++
 .../fjlabs/avalon/keymaps/default/keymap.c    | 39 ++++++++
 keyboards/fjlabs/avalon/keymaps/via/keymap.c  | 57 +++++++++++
 keyboards/fjlabs/avalon/keymaps/via/rules.mk  |  1 +
 keyboards/fjlabs/avalon/readme.md             | 19 ++++
 keyboards/fjlabs/avalon/rules.mk              | 21 +++++
 9 files changed, 353 insertions(+)
 create mode 100644 keyboards/fjlabs/avalon/avalon.c
 create mode 100644 keyboards/fjlabs/avalon/avalon.h
 create mode 100644 keyboards/fjlabs/avalon/config.h
 create mode 100644 keyboards/fjlabs/avalon/info.json
 create mode 100644 keyboards/fjlabs/avalon/keymaps/default/keymap.c
 create mode 100644 keyboards/fjlabs/avalon/keymaps/via/keymap.c
 create mode 100644 keyboards/fjlabs/avalon/keymaps/via/rules.mk
 create mode 100644 keyboards/fjlabs/avalon/readme.md
 create mode 100644 keyboards/fjlabs/avalon/rules.mk

diff --git a/keyboards/fjlabs/avalon/avalon.c b/keyboards/fjlabs/avalon/avalon.c
new file mode 100644
index 0000000000..9f6b63e4c8
--- /dev/null
+++ b/keyboards/fjlabs/avalon/avalon.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "avalon.h"
diff --git a/keyboards/fjlabs/avalon/avalon.h b/keyboards/fjlabs/avalon/avalon.h
new file mode 100644
index 0000000000..c24b0e53ce
--- /dev/null
+++ b/keyboards/fjlabs/avalon/avalon.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 <hello@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should 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"
+
+/* Phantom Keymap Definitions */
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
+    K40, K41, K42, K43,                K47,           K4A, K4B,      K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C,   K0D, K0E, K0F   }, \
+    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F   }, \
+    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D, K2E, K2F   }, \
+    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39,   K3A, K3B,   K3C,   K3D, K3E, KC_NO }, \
+    { K40, K41, K42, K43,   KC_NO,   KC_NO, KC_NO, K47,   KC_NO, KC_NO, K4A, K4B,   KC_NO, K4D, K4E, K4F   }  \
+}
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
new file mode 100644
index 0000000000..2d2c53c14e
--- /dev/null
+++ b/keyboards/fjlabs/avalon/config.h
@@ -0,0 +1,76 @@
+/*
+Copyright 2022 <hello@fjlaboratories.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *å
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
+#define MATRIX_COL_PINS { B0, F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 Indicator LED's */
+#define LED_CAPS_LOCK_PIN C7
+
+/* Define RGB Underglow */
+#define RGB_DI_PIN D6
+#define RGBLED_NUM 6
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LIMIT_VAL 255
+#define RGB_VAL_STEP 12
+#define RGBLIGHT_DEFAULT_SPD 144
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
+
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
new file mode 100644
index 0000000000..040db5f197
--- /dev/null
+++ b/keyboards/fjlabs/avalon/info.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "Avalon",
+    "manufacturer": "Trailblazer Keyboards",
+    "url": "https://fjlaboratories.com/",
+    "maintainer": "FJLaboratories",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0015",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+                {"x": 5.25, "y": 0},
+                {"x": 6.25, "y": 0},
+                {"x": 7.25, "y": 0},
+                {"x": 8.25, "y": 0},
+                {"x": 9.25, "y": 0},
+                {"x": 10.25, "y": 0},
+                {"x": 11.25, "y": 0},
+                {"x": 12.25, "y": 0},
+                {"x": 13.25, "y": 0},
+                {"x": 14.25, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.5, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1.25, "y": 1, "w": 1.5},
+                {"x": 2.75, "y": 1},
+                {"x": 3.75, "y": 1},
+                {"x": 4.75, "y": 1},
+                {"x": 5.75, "y": 1},
+                {"x": 6.75, "y": 1},
+                {"x": 7.75, "y": 1},
+                {"x": 8.75, "y": 1},
+                {"x": 9.75, "y": 1},
+                {"x": 10.75, "y": 1},
+                {"x": 11.75, "y": 1},
+                {"x": 12.75, "y": 1},
+                {"x": 13.75, "y": 1},
+                {"x": 14.75, "y": 1, "w": 1.5},
+                {"x": 16.5, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1.25, "y": 2, "w": 1.75},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2, "w": 2.25},
+                {"x": 16.5, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1.25, "y": 3, "w": 1.25},
+                {"x": 2.5, "y": 3},
+                {"x": 3.5, "y": 3},
+                {"x": 4.5, "y": 3},
+                {"x": 5.5, "y": 3},
+                {"x": 6.5, "y": 3},
+                {"x": 7.5, "y": 3},
+                {"x": 8.5, "y": 3},
+                {"x": 9.5, "y": 3},
+                {"x": 19.5, "y": 3},
+                {"x": 11.5, "y": 3},
+                {"x": 12.5, "y": 3},
+                {"x": 13.5, "y": 3, "w": 1.75},
+                {"x": 15.25, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 1.25},
+                {"x": 5, "y": 4, "w": 6.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 14.25, "y": 4},
+                {"x": 15.25, "y": 4},
+                {"x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/avalon/keymaps/default/keymap.c b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3601ba8fed
--- /dev/null
+++ b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+        [_LAYER0] = LAYOUT_all(
+        KC_F1, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        KC_F2, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_F3, KC_CAPS, KC_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_F4, 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_F5, KC_LCTL, KC_LALT, KC_LGUI,                                     KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_all(
+        KC_TRNS, KC_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_DEL,  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_SLCK, KC_PAUS, RESET,   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_PGDN,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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/fjlabs/avalon/keymaps/via/keymap.c b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
new file mode 100644
index 0000000000..08869cc59d
--- /dev/null
+++ b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/*
+Copyright 2022 <hello@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+        [_LAYER0] = LAYOUT_all(
+        KC_F1, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        KC_F2, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_F3, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_DEL,  KC_PGDN,
+        KC_F4, 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_F5, KC_LCTL, KC_LALT, KC_LGUI,                                     KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_all(
+        KC_TRNS, KC_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_DEL,  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_SLCK, KC_PAUS, RESET,   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_PGDN,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                   KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+
+    [_LAYER2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/fjlabs/avalon/keymaps/via/rules.mk b/keyboards/fjlabs/avalon/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/fjlabs/avalon/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/fjlabs/avalon/readme.md b/keyboards/fjlabs/avalon/readme.md
new file mode 100644
index 0000000000..30e2c49044
--- /dev/null
+++ b/keyboards/fjlabs/avalon/readme.md
@@ -0,0 +1,19 @@
+# Avalon PCB by FJLaboratories
+
+The following is the QMK Firmware for the Avalon PCB, both Solder and Hotswap, for Trailblazer Keyboards.
+* Keyboard Maintainer: FJLaboratories
+* Hardware Supported: Avalon
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fjlabs/avalon:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
\ No newline at end of file
diff --git a/keyboards/fjlabs/avalon/rules.mk b/keyboards/fjlabs/avalon/rules.mk
new file mode 100644
index 0000000000..f54595dd64
--- /dev/null
+++ b/keyboards/fjlabs/avalon/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From a6b47de7325df78ebfb78f700f6ac0587787c23b Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 29 Aug 2022 11:23:23 -0700
Subject: [PATCH 264/959] [Keyboard] Add Peaker keyboard (#17920)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/fjlabs/peaker/config.h              | 93 ++++++++++++++++++
 keyboards/fjlabs/peaker/info.json             | 94 +++++++++++++++++++
 .../fjlabs/peaker/keymaps/default/keymap.c    | 39 ++++++++
 keyboards/fjlabs/peaker/keymaps/via/keymap.c  | 57 +++++++++++
 keyboards/fjlabs/peaker/keymaps/via/rules.mk  |  1 +
 keyboards/fjlabs/peaker/peaker.c              | 14 +++
 keyboards/fjlabs/peaker/peaker.h              | 32 +++++++
 keyboards/fjlabs/peaker/readme.md             | 13 +++
 keyboards/fjlabs/peaker/rules.mk              | 21 +++++
 9 files changed, 364 insertions(+)
 create mode 100644 keyboards/fjlabs/peaker/config.h
 create mode 100644 keyboards/fjlabs/peaker/info.json
 create mode 100644 keyboards/fjlabs/peaker/keymaps/default/keymap.c
 create mode 100644 keyboards/fjlabs/peaker/keymaps/via/keymap.c
 create mode 100644 keyboards/fjlabs/peaker/keymaps/via/rules.mk
 create mode 100644 keyboards/fjlabs/peaker/peaker.c
 create mode 100644 keyboards/fjlabs/peaker/peaker.h
 create mode 100644 keyboards/fjlabs/peaker/readme.md
 create mode 100644 keyboards/fjlabs/peaker/rules.mk

diff --git a/keyboards/fjlabs/peaker/config.h b/keyboards/fjlabs/peaker/config.h
new file mode 100644
index 0000000000..c7d19f0c6c
--- /dev/null
+++ b/keyboards/fjlabs/peaker/config.h
@@ -0,0 +1,93 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *å
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { B5, B6, C0, E1, E0 }
+#define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * 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/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json
new file mode 100644
index 0000000000..92e622725c
--- /dev/null
+++ b/keyboards/fjlabs/peaker/info.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "Peaker",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "Lucid",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0020",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_tkl_all": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Back Space", "x":13, "y":0},
+                {"label":"Back Space", "x":14, "y":0},
+                {"label":"Insert", "x":15.25, "y":0},
+                {"label":"Home", "x":16.25, "y":0},
+                {"label":"PgUp", "x":17.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":1},
+                {"label":"End", "x":16.25, "y":1},
+                {"label":"PgDn", "x":17.25, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"SQ", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Shift", "x":14, "y":3},
+                {"label":"\u2191", "x":16.25, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":4},
+                {"label":"\u2193", "x":16.25, "y":4},
+                {"label":"\u2192", "x":17.25, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/peaker/keymaps/default/keymap.c b/keyboards/fjlabs/peaker/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ab46cd89db
--- /dev/null
+++ b/keyboards/fjlabs/peaker/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_tkl_all(
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_BSPC, KC_ENT, 
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_tkl_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/fjlabs/peaker/keymaps/via/keymap.c b/keyboards/fjlabs/peaker/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9e8ece8ff9
--- /dev/null
+++ b/keyboards/fjlabs/peaker/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_tkl_all(
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_BSPC, KC_ENT, 
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_tkl_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER1] = LAYOUT_tkl_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER1] = LAYOUT_tkl_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/fjlabs/peaker/keymaps/via/rules.mk b/keyboards/fjlabs/peaker/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/fjlabs/peaker/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/fjlabs/peaker/peaker.c b/keyboards/fjlabs/peaker/peaker.c
new file mode 100644
index 0000000000..2c8830a731
--- /dev/null
+++ b/keyboards/fjlabs/peaker/peaker.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "peaker.h"
diff --git a/keyboards/fjlabs/peaker/peaker.h b/keyboards/fjlabs/peaker/peaker.h
new file mode 100644
index 0000000000..a1f53a87d6
--- /dev/null
+++ b/keyboards/fjlabs/peaker/peaker.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should 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"
+
+/* === All used matrix spots populated === */
+#define LAYOUT_tkl_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D,      K3F,      \
+    K40, K41, K42,           K45,                K49, K4A, K4B,      K4D, K4E, K4F, K4G  \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K21,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,   KC_NO, KC_NO, KC_NO }, \
+    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   K3D,   KC_NO, K3F,   KC_NO }, \
+    { K40, K41,   K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   KC_NO, K4D,   K4E,   K4F,   K4G   } \
+}
diff --git a/keyboards/fjlabs/peaker/readme.md b/keyboards/fjlabs/peaker/readme.md
new file mode 100644
index 0000000000..ca85b99629
--- /dev/null
+++ b/keyboards/fjlabs/peaker/readme.md
@@ -0,0 +1,13 @@
+# Peaker Hotswap PCB by FJLaboratories
+
+The following is the QMK Firmware for the Peaker by [FJLaboratories](http://www.fjlaboratories.com).
+* Keyboard Maintainer: FJLaboratories
+* Hardware Supported: Peaker
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fjlabs/peaker: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).
+
+You can enter the bootloader by pressing the Reset button on the back of the PCB.
\ No newline at end of file
diff --git a/keyboards/fjlabs/peaker/rules.mk b/keyboards/fjlabs/peaker/rules.mk
new file mode 100644
index 0000000000..aed2d80b8b
--- /dev/null
+++ b/keyboards/fjlabs/peaker/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = at90usb646
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From de1d6b6f15ee9ab8b52747dcd98f45df8f5ee38a Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 29 Aug 2022 11:25:20 -0700
Subject: [PATCH 265/959] [Keyboard] Add sinanju WK (#17736)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/fjlabs/sinanjuwk/config.h           | 96 +++++++++++++++++++
 keyboards/fjlabs/sinanjuwk/info.json          | 84 ++++++++++++++++
 .../fjlabs/sinanjuwk/keymaps/default/keymap.c | 39 ++++++++
 .../fjlabs/sinanjuwk/keymaps/via/keymap.c     | 58 +++++++++++
 .../fjlabs/sinanjuwk/keymaps/via/rules.mk     |  1 +
 keyboards/fjlabs/sinanjuwk/readme.md          | 17 ++++
 keyboards/fjlabs/sinanjuwk/rules.mk           | 21 ++++
 keyboards/fjlabs/sinanjuwk/sinanjuwk.c        | 14 +++
 keyboards/fjlabs/sinanjuwk/sinanjuwk.h        | 32 +++++++
 9 files changed, 362 insertions(+)
 create mode 100644 keyboards/fjlabs/sinanjuwk/config.h
 create mode 100644 keyboards/fjlabs/sinanjuwk/info.json
 create mode 100644 keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
 create mode 100644 keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
 create mode 100644 keyboards/fjlabs/sinanjuwk/keymaps/via/rules.mk
 create mode 100644 keyboards/fjlabs/sinanjuwk/readme.md
 create mode 100644 keyboards/fjlabs/sinanjuwk/rules.mk
 create mode 100644 keyboards/fjlabs/sinanjuwk/sinanjuwk.c
 create mode 100644 keyboards/fjlabs/sinanjuwk/sinanjuwk.h

diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h
new file mode 100644
index 0000000000..01d81a2f3d
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/config.h
@@ -0,0 +1,96 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
+#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 Indicator LED's */
+#define LED_CAPS_LOCK_PIN C7
+
+/* Define less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * 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/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json
new file mode 100644
index 0000000000..3f1d7b4463
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "Sinanju WK",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1023",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25}
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e5dcc81c4f
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+        [_LAYER0] = LAYOUT_all(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS, KC_EQL,  KC_BSPC, 
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT, KC_ENT,  KC_DEL,
+        KC_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_LWIN, KC_LALT,                            KC_SPC,                             MO(1), KC_RALT, KC_RWIN, KC_RCTL
+    ),
+
+    [_LAYER1] = LAYOUT_all(
+        KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2520da0cda
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_all(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_DEL,
+        KC_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_LWIN, KC_LALT,                            KC_SPC,                             MO(1), KC_RALT, KC_RWIN, KC_RCTL
+    ),
+
+    [_LAYER1] = LAYOUT_all(
+        KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/via/rules.mk b/keyboards/fjlabs/sinanjuwk/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/fjlabs/sinanjuwk/readme.md b/keyboards/fjlabs/sinanjuwk/readme.md
new file mode 100644
index 0000000000..126fc73ec8
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/readme.md
@@ -0,0 +1,17 @@
+# Sinanju WK
+
+The following is the QMK Firmware for the Windz Sinanju WK PCB. 
+ 
+
+* Keyboard Maintainer: FJLabs
+* Hardware Supported: Sinanju WK
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fjlabs/sinanjuwk: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
+
+Bootloader can be entered by pressing the reset button near the main microcontroller while the board is plugged in. Alternatively, it may be entered by holding the top-left-most switch and plugging in the PCB while held.
\ No newline at end of file
diff --git a/keyboards/fjlabs/sinanjuwk/rules.mk b/keyboards/fjlabs/sinanjuwk/rules.mk
new file mode 100644
index 0000000000..67f00abb1e
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/sinanjuwk/sinanjuwk.c b/keyboards/fjlabs/sinanjuwk/sinanjuwk.c
new file mode 100644
index 0000000000..e6af5203ad
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/sinanjuwk.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "sinanjuwk.h"
diff --git a/keyboards/fjlabs/sinanjuwk/sinanjuwk.h b/keyboards/fjlabs/sinanjuwk/sinanjuwk.h
new file mode 100644
index 0000000000..045e34621d
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/sinanjuwk.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should 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"
+
+/* Midway60 Keymap Definitions */
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                     K47,           K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01,   K02, K03,   K04,     K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D }, \
+    { K10, K11,   K12, K13,   K14,     K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D }, \
+    { K20, K21,   K22, K23,   K24,     K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D }, \
+    { K30, KC_NO, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D }, \
+    { K40, K41,   K42, KC_NO, KC_NO,   KC_NO, KC_NO, K47,   KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D }  \
+}

From f04336ff461a56799b79e5691f7b48e59f45ec08 Mon Sep 17 00:00:00 2001
From: 3araht <69518343+3araht@users.noreply.github.com>
Date: Tue, 30 Aug 2022 04:18:53 +0900
Subject: [PATCH 266/959] Redefinition of MIN is avoided in midi.c (#18203)

---
 tmk_core/protocol/midi/midi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tmk_core/protocol/midi/midi.c b/tmk_core/protocol/midi/midi.c
index f3792552f4..1ba3e73a40 100644
--- a/tmk_core/protocol/midi/midi.c
+++ b/tmk_core/protocol/midi/midi.c
@@ -19,7 +19,9 @@
 #include "midi.h"
 #include <string.h> //for memcpy
 
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#ifndef MIN
+#    define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#endif
 
 #ifndef NULL
 #    define NULL 0

From 7eb71f72a76562aa0f5df934e57c95b9e37c9023 Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Mon, 29 Aug 2022 23:03:16 -0400
Subject: [PATCH 267/959] [Keyboard] jacky_studio/piggy60 refactor (#18197)

---
 keyboards/jacky_studio/piggy60/config.h       |   6 -
 .../jacky_studio/piggy60/hotswap/info.json    |   3 +-
 keyboards/jacky_studio/piggy60/info.json      | 465 +----------------
 .../piggy60/keymaps/via/keymap.json           |   6 +-
 keyboards/jacky_studio/piggy60/rules.mk       |   1 -
 .../jacky_studio/piggy60/solder/info.json     | 476 +++++++++++++++++-
 6 files changed, 482 insertions(+), 475 deletions(-)
 delete mode 100644 keyboards/jacky_studio/piggy60/config.h

diff --git a/keyboards/jacky_studio/piggy60/config.h b/keyboards/jacky_studio/piggy60/config.h
deleted file mode 100644
index ab0e4531a1..0000000000
--- a/keyboards/jacky_studio/piggy60/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 The QMK Community (@qmk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/jacky_studio/piggy60/hotswap/info.json b/keyboards/jacky_studio/piggy60/hotswap/info.json
index e3fa1b8b84..8b10920700 100644
--- a/keyboards/jacky_studio/piggy60/hotswap/info.json
+++ b/keyboards/jacky_studio/piggy60/hotswap/info.json
@@ -1,3 +1,4 @@
 {
-    "diode_direction": "ROW2COL"
+    "diode_direction": "ROW2COL",
+    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"]
 }
diff --git a/keyboards/jacky_studio/piggy60/info.json b/keyboards/jacky_studio/piggy60/info.json
index 46b274b211..2805209f47 100644
--- a/keyboards/jacky_studio/piggy60/info.json
+++ b/keyboards/jacky_studio/piggy60/info.json
@@ -29,7 +29,8 @@
         "pid": "0x1001"
     },
     "indicators": {
-        "caps_lock": "F4"
+        "caps_lock": "F4",
+        "on_state": 0
     },
     "rgblight": {
         "led_count": 14,
@@ -115,202 +116,6 @@
                 { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
             ]
         },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
-            ]
-        },
         "LAYOUT_60_hhkb": {
             "layout": [
                 { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
@@ -375,272 +180,6 @@
                 { "label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4 }
             ]
         },
-        "LAYOUT_60_iso": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_hhkb": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
-            ]
-        },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
diff --git a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
index 8f14e6d0c0..b166c6771f 100644
--- a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
+++ b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
@@ -9,21 +9,21 @@
             "LT(1,KC_CAPS)",  "KC_A",     "KC_S",     "KC_D",     "KC_F",     "KC_G",     "KC_H",     "KC_J",     "KC_K",          "KC_L",     "KC_SCLN",  "KC_QUOT",  "KC_NUHS",  "KC_ENT",
             "KC_LSFT",        "KC_NUBS",  "KC_Z",     "KC_X",     "KC_C",     "KC_V",     "KC_B",     "KC_N",     "KC_M",          "KC_COMM",  "KC_DOT",   "KC_SLSH",              "KC_RSFT",  "LT(1,KC_MUTE)",
             "KC_LCTL",        "KC_LGUI",  "KC_LALT",                                      "KC_SPC",               "LT(1,KC_APP)",  "KC_RALT",              "KC_RGUI",  "KC_RCTL"
-        ]
+        ],
         [
             "KC_GRV",   "KC_F1",    "KC_F2",    "KC_F3",    "KC_F4",    "KC_F5",    "KC_F6",    "KC_F7",    "KC_F8",    "KC_F9",    "KC_F10",   "KC_F11",   "KC_F12",   "KC_PSCR",  "KC_DEL",
             "KC_TRNS",  "KC_TRNS",  "KC_UP",    "KC_TRNS",  "KC_PGUP",  "KC_HOME",  "KC_TRNS",  "KC_VOLU",  "KC_BRIU",  "KC_TRNS",  "KC_WH_U",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
             "KC_TRNS",  "KC_LEFT",  "KC_DOWN",  "KC_RGHT",  "KC_PGDN",  "KC_END",   "KC_TRNS",  "KC_VOLD",  "KC_BRID",  "KC_TRNS",  "KC_WH_D",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
             "RGB_TOG",  "KC_TRNS",  "RGB_MOD",  "RGB_HUI",  "RGB_SAI",  "RGB_VAI",  "RGB_SPI",  "KC_TRNS",  "KC_MUTE",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",              "KC_TRNS",  "KC_TRNS",
             "KC_TRNS",  "KC_TRNS",  "KC_TRNS",                                      "KC_TRNS",              "KC_TRNS",  "KC_TRNS",              "KC_TRNS",  "KC_TRNS"
-        ]
+        ],
         [
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",            "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS"
-        ]
+        ],
         [
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "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/jacky_studio/piggy60/rules.mk b/keyboards/jacky_studio/piggy60/rules.mk
index eebe701e8e..530e6598df 100644
--- a/keyboards/jacky_studio/piggy60/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rules.mk
@@ -1,2 +1 @@
 DEFAULT_FOLDER = jacky_studio/piggy60/solder
-LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_hhkb 60_iso 60_iso_split_bs_rshift 60_iso_tsangan 60_tsangan_hhkb
diff --git a/keyboards/jacky_studio/piggy60/solder/info.json b/keyboards/jacky_studio/piggy60/solder/info.json
index beded82262..6a4cacb0fc 100644
--- a/keyboards/jacky_studio/piggy60/solder/info.json
+++ b/keyboards/jacky_studio/piggy60/solder/info.json
@@ -1,3 +1,477 @@
 {
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "community_layouts": [
+       "60_ansi",
+       "60_ansi_split_bs_rshift",
+       "60_ansi_tsangan",
+       "60_hhkb",
+       "60_iso",
+       "60_iso_split_bs_rshift",
+       "60_iso_tsangan",
+       "60_tsangan_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_hhkb": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        }
+    }
 }

From f3d52d8fe81da5044db4bb675ae788393d7c06a5 Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Tue, 30 Aug 2022 13:03:30 +1000
Subject: [PATCH 268/959] [Keyboard] Kangaroo Rev2 (#18199)

---
 keyboards/xelus/kangaroo/info.json            |  8 ++--
 keyboards/xelus/kangaroo/kangaroo.c           |  7 +---
 keyboards/xelus/kangaroo/{ => rev1}/config.h  |  0
 keyboards/xelus/kangaroo/{ => rev1}/halconf.h |  0
 keyboards/xelus/kangaroo/rev1/info.json       |  6 +++
 keyboards/xelus/kangaroo/{ => rev1}/mcuconf.h |  0
 keyboards/xelus/kangaroo/{ => rev1}/readme.md |  5 ++-
 .../xelus/kangaroo/{chconf.h => rev1/rev1.c}  | 21 +++-------
 keyboards/xelus/kangaroo/rev1/rev1.h          | 17 +++++++++
 keyboards/xelus/kangaroo/{ => rev1}/rules.mk  |  0
 keyboards/xelus/kangaroo/rev2/config.h        | 38 +++++++++++++++++++
 keyboards/xelus/kangaroo/rev2/info.json       |  6 +++
 keyboards/xelus/kangaroo/rev2/readme.md       | 14 +++++++
 keyboards/xelus/kangaroo/rev2/rules.mk        | 24 ++++++++++++
 14 files changed, 118 insertions(+), 28 deletions(-)
 rename keyboards/xelus/kangaroo/{ => rev1}/config.h (100%)
 rename keyboards/xelus/kangaroo/{ => rev1}/halconf.h (100%)
 create mode 100644 keyboards/xelus/kangaroo/rev1/info.json
 rename keyboards/xelus/kangaroo/{ => rev1}/mcuconf.h (100%)
 rename keyboards/xelus/kangaroo/{ => rev1}/readme.md (86%)
 rename keyboards/xelus/kangaroo/{chconf.h => rev1/rev1.c} (66%)
 create mode 100644 keyboards/xelus/kangaroo/rev1/rev1.h
 rename keyboards/xelus/kangaroo/{ => rev1}/rules.mk (100%)
 create mode 100644 keyboards/xelus/kangaroo/rev2/config.h
 create mode 100644 keyboards/xelus/kangaroo/rev2/info.json
 create mode 100644 keyboards/xelus/kangaroo/rev2/readme.md
 create mode 100644 keyboards/xelus/kangaroo/rev2/rules.mk

diff --git a/keyboards/xelus/kangaroo/info.json b/keyboards/xelus/kangaroo/info.json
index d70cb92e93..adb6450826 100644
--- a/keyboards/xelus/kangaroo/info.json
+++ b/keyboards/xelus/kangaroo/info.json
@@ -1,12 +1,10 @@
 {
-    "keyboard_name": "Kangaroo", 
     "manufacturer": "Xelus",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo", 
-    "maintainer": "qmk", 
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo",
+    "maintainer": "qmk",
     "usb": {
         "vid": "0x5845",
-        "pid": "0x524F",
-        "device_version": "0.0.1"
+        "pid": "0x524F"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/xelus/kangaroo/kangaroo.c b/keyboards/xelus/kangaroo/kangaroo.c
index a7a3d24800..585d33d498 100644
--- a/keyboards/xelus/kangaroo/kangaroo.c
+++ b/keyboards/xelus/kangaroo/kangaroo.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 Harrison Chan (Xelus)
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * This 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,9 +16,4 @@
 
 #include "kangaroo.h"
 
-void board_init(void) {
-  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
-  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
-}
-
 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/keyboards/xelus/kangaroo/config.h b/keyboards/xelus/kangaroo/rev1/config.h
similarity index 100%
rename from keyboards/xelus/kangaroo/config.h
rename to keyboards/xelus/kangaroo/rev1/config.h
diff --git a/keyboards/xelus/kangaroo/halconf.h b/keyboards/xelus/kangaroo/rev1/halconf.h
similarity index 100%
rename from keyboards/xelus/kangaroo/halconf.h
rename to keyboards/xelus/kangaroo/rev1/halconf.h
diff --git a/keyboards/xelus/kangaroo/rev1/info.json b/keyboards/xelus/kangaroo/rev1/info.json
new file mode 100644
index 0000000000..523aef4aaa
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev1/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Kangaroo Rev 1.0",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/xelus/kangaroo/mcuconf.h b/keyboards/xelus/kangaroo/rev1/mcuconf.h
similarity index 100%
rename from keyboards/xelus/kangaroo/mcuconf.h
rename to keyboards/xelus/kangaroo/rev1/mcuconf.h
diff --git a/keyboards/xelus/kangaroo/readme.md b/keyboards/xelus/kangaroo/rev1/readme.md
similarity index 86%
rename from keyboards/xelus/kangaroo/readme.md
rename to keyboards/xelus/kangaroo/rev1/readme.md
index e91f32f96a..800497b698 100644
--- a/keyboards/xelus/kangaroo/readme.md
+++ b/keyboards/xelus/kangaroo/rev1/readme.md
@@ -1,4 +1,4 @@
-# Kangaroo
+# Kangaroo Rev 1
 
 Left Hand Fullsized Keyboard designed by Jono.
 
@@ -8,6 +8,7 @@ Left Hand Fullsized Keyboard designed by Jono.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make xelus/kangaroo:default
+    make xelus/kangaroo/rev1:default
+    make xelus/kangaroo/rev1:via
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/xelus/kangaroo/chconf.h b/keyboards/xelus/kangaroo/rev1/rev1.c
similarity index 66%
rename from keyboards/xelus/kangaroo/chconf.h
rename to keyboards/xelus/kangaroo/rev1/rev1.c
index 71b34b0591..a71f476498 100644
--- a/keyboards/xelus/kangaroo/chconf.h
+++ b/keyboards/xelus/kangaroo/rev1/rev1.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,18 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/xelus/kangaroo/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>
+#include "rev1.h"
 
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
diff --git a/keyboards/xelus/kangaroo/rev1/rev1.h b/keyboards/xelus/kangaroo/rev1/rev1.h
new file mode 100644
index 0000000000..f146b4f964
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev1/rev1.h
@@ -0,0 +1,17 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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"
diff --git a/keyboards/xelus/kangaroo/rules.mk b/keyboards/xelus/kangaroo/rev1/rules.mk
similarity index 100%
rename from keyboards/xelus/kangaroo/rules.mk
rename to keyboards/xelus/kangaroo/rev1/rules.mk
diff --git a/keyboards/xelus/kangaroo/rev2/config.h b/keyboards/xelus/kangaroo/rev2/config.h
new file mode 100644
index 0000000000..a2f89a0ab1
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 11
+
+#define MATRIX_COL_PINS { B10, B2, B11, A10, B7, B6, B5, B4, B3, A15, A14 }
+#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12, A4, A5, A6, A7, B0, B1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2
diff --git a/keyboards/xelus/kangaroo/rev2/info.json b/keyboards/xelus/kangaroo/rev2/info.json
new file mode 100644
index 0000000000..8f7a2c6ce9
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Kangaroo Rev 2.0",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}
diff --git a/keyboards/xelus/kangaroo/rev2/readme.md b/keyboards/xelus/kangaroo/rev2/readme.md
new file mode 100644
index 0000000000..b94bd43cd1
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/readme.md
@@ -0,0 +1,14 @@
+# Kangaroo Rev 2
+
+Left Hand Fullsized Keyboard designed by Jono.
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: Kangaroo
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/kangaroo/rev2:default
+    make xelus/kangaroo/rev2:via
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/xelus/kangaroo/rev2/rules.mk b/keyboards/xelus/kangaroo/rev2/rules.mk
new file mode 100644
index 0000000000..44ac92bb81
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32L412
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+EEPROM_DRIVER = i2c
+
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From 035e7fdb8ba2e4533c809b2dfe0f15ea7116c508 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 30 Aug 2022 01:20:05 -0600
Subject: [PATCH 269/959] Add boardsource/lulu RP2040 support (#18200)

by waffle87
---
 keyboards/boardsource/lulu/avr/info.json    | 21 ++++++++++++++++++++
 keyboards/boardsource/lulu/avr/rules.mk     |  1 +
 keyboards/boardsource/lulu/config.h         |  2 --
 keyboards/boardsource/lulu/info.json        | 22 +++++++--------------
 keyboards/boardsource/lulu/readme.md        | 13 +++++++++---
 keyboards/boardsource/lulu/rp2040/config.h  | 11 +++++++++++
 keyboards/boardsource/lulu/rp2040/halconf.h |  5 +++++
 keyboards/boardsource/lulu/rp2040/info.json | 17 ++++++++++++++++
 keyboards/boardsource/lulu/rp2040/mcuconf.h |  6 ++++++
 keyboards/boardsource/lulu/rp2040/rules.mk  |  2 ++
 keyboards/boardsource/lulu/rules.mk         |  2 +-
 11 files changed, 81 insertions(+), 21 deletions(-)
 create mode 100644 keyboards/boardsource/lulu/avr/info.json
 create mode 100644 keyboards/boardsource/lulu/avr/rules.mk
 create mode 100644 keyboards/boardsource/lulu/rp2040/config.h
 create mode 100644 keyboards/boardsource/lulu/rp2040/halconf.h
 create mode 100644 keyboards/boardsource/lulu/rp2040/info.json
 create mode 100644 keyboards/boardsource/lulu/rp2040/mcuconf.h
 create mode 100644 keyboards/boardsource/lulu/rp2040/rules.mk

diff --git a/keyboards/boardsource/lulu/avr/info.json b/keyboards/boardsource/lulu/avr/info.json
new file mode 100644
index 0000000000..ad7eefa77f
--- /dev/null
+++ b/keyboards/boardsource/lulu/avr/info.json
@@ -0,0 +1,21 @@
+{
+  "build": {
+    "lto": true
+  },
+  "development_board": "elite_c",
+  "matrix_pins": {
+    "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "split": {
+    "soft_serial_pin": "D2"
+  },
+  "rgblight": {
+     "pin": "D3"
+  },
+  "encoder": {
+    "rotary": [
+      { "pin_a": "F0", "pin_b": "F1" }
+    ]
+  }
+}
diff --git a/keyboards/boardsource/lulu/avr/rules.mk b/keyboards/boardsource/lulu/avr/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/boardsource/lulu/avr/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h
index f96a228429..8e635a24eb 100644
--- a/keyboards/boardsource/lulu/config.h
+++ b/keyboards/boardsource/lulu/config.h
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-#include "config_common.h"
-#define RGB_DI_PIN D3
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define DRIVER_LED_TOTAL 70
 #define RGB_MATRIX_SPLIT { 35, 35 }
diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
index 5ee5c59c1a..3418cd6e7a 100644
--- a/keyboards/boardsource/lulu/info.json
+++ b/keyboards/boardsource/lulu/info.json
@@ -2,11 +2,7 @@
   "manufacturer": "Boardsource",
   "keyboard_name": "lulu",
   "maintainer": "waffle87",
-  "bootloader": "atmel-dfu",
   "diode_direction": "COL2ROW",
-  "build": {
-    "lto": true
-  },
   "features": {
     "bootmagic": true,
     "extrakey": true,
@@ -15,11 +11,6 @@
     "rgb_matrix": true,
     "oled": true
   },
-  "matrix_pins": {
-    "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["C6", "D7", "E6", "B4", "B5"]
-  },
-  "processor": "atmega32u4",
   "url": "https://boardsource.xyz/projects/60de24d6847112054777bbdd",
   "usb": {
     "device_version": "1.0.0",
@@ -27,16 +18,17 @@
     "vid": "0x4273"
   },
   "split": {
-    "enabled": true,
-    "soft_serial_pin": "D2"
+    "enabled": true
   },
   "encoder": {
-    "enabled": true,
-    "rotary": [
-      { "pin_a": "F0", "pin_b": "F1" }
-    ]
+    "enabled": true
+  },
+  "matrix_size": {
+     "cols": 6,
+     "rows": 10
   },
   "rgb_matrix": {
+    "driver": "WS2812",
     "layout": [
       { "flags": 2, "x": 86, "y": 55 },
       { "flags": 2, "x": 51, "y": 55 },
diff --git a/keyboards/boardsource/lulu/readme.md b/keyboards/boardsource/lulu/readme.md
index e7c530161b..a1c184eaac 100644
--- a/keyboards/boardsource/lulu/readme.md
+++ b/keyboards/boardsource/lulu/readme.md
@@ -12,13 +12,20 @@ The lulu is what the ergo community has needed for a long time, a high-end aesth
 
 Make example for this keyboard (after setting up your build environment):
 
-    make boardsource/lulu:default
+    make boardsource/lulu/rp2040:default
+    make boardsource/lulu/avr:default
 
 Flashing example for this keyboard:
 
-    make boardsource/lulu:default:flash
+    make boardsource/lulu/rp2040:default:flash
+    make boardsource/lulu/avr:default:flash
 
-Reset keyboard by holding down top left key while you plug in the usb cable. Or by pushing the reset switch on the pcb.
+
+Compile `rp2040` firmware if you purchased PCB in lulu group buy (integrated microcontroller).
+Compile `avr` firmware if your PCB uses a drop-in microcontroller like Pro Micro.
+
+
+Enter bootloader by holding down the upper outer key while you plug in the usb cable, or by pushing the reset switch on the pcb.
 
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/boardsource/lulu/rp2040/config.h b/keyboards/boardsource/lulu/rp2040/config.h
new file mode 100644
index 0000000000..2e02e03500
--- /dev/null
+++ b/keyboards/boardsource/lulu/rp2040/config.h
@@ -0,0 +1,11 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+#define I2C_DRIVER I2CD2
+#define I2C1_SDA_PIN GP22
+#define I2C1_SCL_PIN GP23
diff --git a/keyboards/boardsource/lulu/rp2040/halconf.h b/keyboards/boardsource/lulu/rp2040/halconf.h
new file mode 100644
index 0000000000..9b8ab5d023
--- /dev/null
+++ b/keyboards/boardsource/lulu/rp2040/halconf.h
@@ -0,0 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#define HAL_USE_I2C TRUE
+#include_next <halconf.h>
diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/info.json
new file mode 100644
index 0000000000..a384241944
--- /dev/null
+++ b/keyboards/boardsource/lulu/rp2040/info.json
@@ -0,0 +1,17 @@
+{
+  "bootloader": "rp2040",
+  "matrix_pins": {
+    "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"],
+    "rows": ["GP14", "GP15", "GP16", "GP17", "GP18"]
+  },
+  "processor": "RP2040",
+  "rgblight": {
+     "pin": "GP29",
+     "led_count": 70
+  },
+  "encoder": {
+    "rotary": [
+      { "pin_a": "GP8", "pin_b": "GP9" }
+    ]
+  }
+}
diff --git a/keyboards/boardsource/lulu/rp2040/mcuconf.h b/keyboards/boardsource/lulu/rp2040/mcuconf.h
new file mode 100644
index 0000000000..6f05b8bbe8
--- /dev/null
+++ b/keyboards/boardsource/lulu/rp2040/mcuconf.h
@@ -0,0 +1,6 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include_next <mcuconf.h>
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/boardsource/lulu/rp2040/rules.mk b/keyboards/boardsource/lulu/rp2040/rules.mk
new file mode 100644
index 0000000000..8fb51ec82d
--- /dev/null
+++ b/keyboards/boardsource/lulu/rp2040/rules.mk
@@ -0,0 +1,2 @@
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/boardsource/lulu/rules.mk b/keyboards/boardsource/lulu/rules.mk
index 32afd21635..6e7633bfe0 100644
--- a/keyboards/boardsource/lulu/rules.mk
+++ b/keyboards/boardsource/lulu/rules.mk
@@ -1 +1 @@
-RGB_MATRIX_DRIVER = WS2812
+# This file intentionally left blank

From 6f2c1737431d69088c7fda23b33bcac18c40cf6f Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Tue, 30 Aug 2022 10:03:25 +0200
Subject: [PATCH 270/959] Expand on the differences between Caps Word and Caps
 Lock (#18139)

* Expand on the differences between Caps Word and Caps Lock

* Add the equiv default KC_ next to intl alias

* It's configurable so it's not a problem
---
 docs/feature_caps_word.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/feature_caps_word.md b/docs/feature_caps_word.md
index 0b71119917..283f0f5288 100644
--- a/docs/feature_caps_word.md
+++ b/docs/feature_caps_word.md
@@ -6,9 +6,9 @@ a modern alternative to Caps Lock:
 
 * Letters are capitalized while active, and Caps Word automatically disables
   itself at the end of the word. That is, it stops by default once a space or
-  any key other than `a`--`z`, `0`--`9`, `-`, `_`, delete, or backspace is
-  pressed. Caps Word also disables itself if the keyboard is idle for 5 seconds.
-  This is configurable, see below.
+  any key other than `KC_A`--`KC_Z`, `KC_0`--`KC_9`, `KC_MINS`, `KC_UNDS`,
+  `KC_DELETE`, or `KC_BACKSPACE` is pressed. Caps Word also disables itself if
+  the keyboard is idle for 5 seconds. This is configurable, see below.
 
 * To avoid requiring a dedicated key for Caps Word, there is an option
   (`BOTH_SHIFTS_TURNS_ON_CAPS_WORD`) to activate Caps Word by simultaneously
@@ -16,7 +16,17 @@ a modern alternative to Caps Lock:
 
 * The implementation does not use the Caps Lock (`KC_CAPS`) keycode. Caps Word
   works even if you're remapping Caps Lock at the OS level to Ctrl or something
-  else, as Emacs and Vim users often do.
+  else, as Emacs and Vim users often do. As a consequence, Caps Word does not
+  follow the typical Caps Lock behaviour and may thus act in potentially
+  unexpected ways, especially when using an *OS* keyboard layout other than US
+  or UK. For example, Dvorak's <kbd>, <</kbd> key (`DV_COMM` aka `KC_W`) will
+  get shifted because Caps Word interprets that keycode as the letter 'W' by
+  default, the Spanish <kbd>Ñ</kbd> key (`ES_NTIL` aka `KC_SCLN`) will not get
+  capitalized because Caps Word interprets it as the semicolon ';' punctuation
+  character, and the US hyphen key (`KC_MINS`), while unaffected by Caps Lock,
+  is shifted by Caps Word. However, this is not really a problem because you can
+  [configure which keys should Caps Word
+  shift](#configure-which-keys-are-word-breaking).
 
 
 ## How do I enable Caps Word :id=how-do-i-enable-caps-word
@@ -60,7 +70,7 @@ time, since both use the Left Shift + Right Shift key combination."**
 
 Many keyboards enable the [Command feature](feature_command.md), which by
 default is also activated using the Left Shift + Right Shift key combination. To
-fix this conflict, please disable Command by adding in rules.mk: 
+fix this conflict, please disable Command by adding in rules.mk:
 
 ```make
 COMMAND_ENABLE = no
@@ -81,7 +91,7 @@ by defining `IS_COMMAND()` in config.h:
 
 Caps Word turns off automatically if no keys are pressed for
 `CAPS_WORD_IDLE_TIMEOUT` milliseconds. The default is 5000 (5 seconds).
-Configure the timeout duration in config.h, for instance 
+Configure the timeout duration in config.h, for instance
 
 ```c
 #define CAPS_WORD_IDLE_TIMEOUT 3000  // 3 seconds.

From 9632360caa5e6511b0ec13cb4c55eb64408232b5 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 30 Aug 2022 03:20:04 -0500
Subject: [PATCH 271/959] Use a macro to compute the size of arrays at compile
 time (#18044)

* Add ARRAY_SIZE and CEILING utility macros

* Apply a coccinelle patch to use ARRAY_SIZE

* fix up some straggling items

* Fix 'make test:secure'

* Enhance ARRAY_SIZE macro to reject acting on pointers

The previous definition would not produce a diagnostic for
```
int *p;
size_t num_elem = ARRAY_SIZE(p)
```
but the new one will.

* explicitly get definition of ARRAY_SIZE

* Convert to ARRAY_SIZE when const is involved

The following spatch finds additional instances where the array is
const and the division is by the size of the type, not the size of
the first element:
```
@ rule5a using "empty.iso" @
type T;
const T[] E;
@@

- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)

@ rule6a using "empty.iso" @
type T;
const T[] E;
@@

- sizeof(E)/sizeof(T)
+ ARRAY_SIZE(E)
```

* New instances of ARRAY_SIZE added since initial spatch run

* Use `ARRAY_SIZE` in docs (found by grep)

* Manually use ARRAY_SIZE

hs_set is expected to be the same size as uint16_t, though it's made
of two 8-bit integers

* Just like char, sizeof(uint8_t) is guaranteed to be 1

This is at least true on any plausible system where qmk is actually used.

Per my understanding it's universally true, assuming that uint8_t exists:
https://stackoverflow.com/questions/48655310/can-i-assume-that-sizeofuint8-t-1

* Run qmk-format on core C files touched in this branch

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
---
 docs/feature_combo.md                         |  2 +-
 drivers/haptic/solenoid.c                     |  5 +-
 drivers/sensors/pmw33xx_common.c              |  6 +--
 .../25keys/zinc/keymaps/ginjake/keymap.c      |  2 +-
 .../shark/beta/keymaps/gondolindrim/keymap.c  |  2 +-
 .../adafruit/macropad/lib/ssd1306_sh1106.c    |  2 -
 keyboards/crkbd/keymaps/gotham/oled.c         |  2 +-
 .../crkbd/keymaps/thunderbird2086/oled.c      |  2 +-
 .../plaid/keymaps/brickbots/keymap.c          |  2 +-
 .../dm9records/plaid/keymaps/default/keymap.c |  2 +-
 .../plaid/keymaps/stephen-huan/keymap.c       |  2 +-
 .../spin/keymaps/spidey3_pad/keymap.c         |  2 +-
 keyboards/evolv/keymaps/gondolindrim/keymap.c |  2 +-
 .../butterstick/keymaps/default/keymap.c      |  2 +-
 keyboards/gboards/butterstick/sten.c          |  2 +-
 keyboards/gboards/engine/keymap_engine.h      | 10 ++--
 keyboards/gboards/g/keymap_engine.h           | 10 ++--
 .../georgi/keymaps/colemak-dh/keymap.c        |  4 +-
 .../georgi/keymaps/default-flipped/keymap.c   |  2 +-
 .../gboards/georgi/keymaps/default/keymap.c   |  2 +-
 .../gboards/georgi/keymaps/minimal/keymap.c   |  2 +-
 .../gboards/georgi/keymaps/norman/keymap.c    |  2 +-
 keyboards/gboards/georgi/sten.c               |  2 +-
 .../pro/rev1/ansi/keymaps/cedrikl/keymap.c    | 21 ++++++---
 .../pro/rev1/ansi/keymaps/gourdo1/keymap.c    |  2 +-
 .../pro/rev1/ansi/keymaps/paddlegame/keymap.c | 12 ++---
 .../pro/rev1/iso/keymaps/chofstede/keymap.c   |  4 +-
 .../pro/rev1/iso/keymaps/gourdo1/keymap.c     |  2 +-
 .../gg86/keymaps/horrortroll/keymap_stuff.h   |  2 +-
 keyboards/gopolar/gg86/lib/wave.h             |  2 +-
 .../lagrange/keymaps/dpapavas/keymap.c        |  4 +-
 keyboards/handwired/myskeeb/oled.c            |  2 +-
 .../nicekey/keymaps/default/keymap.c          |  2 +-
 .../keymaps/chibios_waiting_test/keymap.c     |  4 +-
 .../promethium/keymaps/default/keymap.c       |  2 +-
 .../promethium/keymaps/priyadi/keymap.c       |  2 +-
 .../symmetric70_proto/matrix_debug/matrix.c   |  2 +-
 .../keymaps/default/keymap_stuff.h            |  2 +-
 .../handwired_k552/keymaps/via/keymap_stuff.h |  2 +-
 .../horrortroll/handwired_k552/lib/wave.c     |  2 +-
 .../lfkpad/keymaps/pascalpfeil/keymap.c       |  2 +-
 .../ctrl/keymaps/responsive_pattern/keymap.c  |  3 +-
 .../mercutio/keymaps/fearless_spiff/keymap.c  |  2 +-
 .../keymaps/fearless_spiff_en/keymap.c        |  2 +-
 .../mercutio/keymaps/jonavin/keymap.c         |  2 +-
 .../murphpad/keymaps/jonavin/keymap.c         |  2 +-
 keyboards/mechwild/puckbuddy/puckbuddy.c      |  2 +-
 keyboards/mitosis/keymaps/datagrok/keymap.c   |  2 +-
 .../keymaps/horrortroll/keymap_stuff.h        |  2 +-
 keyboards/mxss/keymaps/default/keymap.c       |  2 +-
 keyboards/mxss/mxss_frontled.c                |  2 +-
 keyboards/mxss/templates/keymap.c             |  2 +-
 keyboards/ploopyco/mouse/mouse.c              |  4 +-
 keyboards/ploopyco/trackball/trackball.c      |  4 +-
 .../ploopyco/trackball_mini/trackball_mini.c  |  4 +-
 .../ploopyco/trackball_nano/trackball_nano.c  |  4 +-
 keyboards/rgbkb/pan/pan.c                     |  2 +-
 keyboards/rgbkb/sol/keymaps/default/keymap.c  |  2 +-
 keyboards/rgbkb/sol/keymaps/xyverz/keymap.c   |  2 +-
 keyboards/rocketboard_16/keycode_lookup.c     |  2 +-
 keyboards/torn/bongocat.c                     |  2 -
 keyboards/tzarc/djinn/djinn_portscan_matrix.c |  8 ++--
 .../ymdk/melody96/keymaps/konstantin/keymap.c |  2 +-
 lib/usbhost/USB_Host_Shield_2.0/SPP.cpp       |  2 +-
 .../examples/Bluetooth/PS3Multi/PS3Multi.ino  |  2 +-
 .../examples/Bluetooth/WiiMulti/WiiMulti.ino  |  2 +-
 .../examples/HID/le3dp/le3dp_rptparser.h      |  2 +-
 .../examples/HID/scale/scale_rptparser.h      |  2 +-
 platforms/chibios/drivers/ws2812_spi.c        |  6 +--
 quantum/backlight/backlight_driver_common.c   |  2 +-
 quantum/backlight/backlight_software.c        |  2 +-
 quantum/dip_switch.c                          |  4 +-
 quantum/encoder.h                             |  8 ++--
 quantum/process_keycode/process_leader.c      |  2 +-
 .../process_keycode/process_unicode_common.c  |  2 +-
 quantum/rgb_matrix/rgb_matrix_drivers.c       |  2 +-
 quantum/secure.c                              |  3 +-
 quantum/util.h                                | 47 +++++++++++++------
 .../arm_atsam/md_rgb_matrix_programs.c        |  2 +-
 users/brandonschlack/rgb_bs.c                 |  2 +-
 users/curry/oled.c                            |  2 +-
 users/davidkristoffersen/util/functions.c     |  8 ++--
 users/davidkristoffersen/util/functions.h     |  2 -
 users/drashna/keyrecords/tap_dance.md         |  2 +-
 users/drashna/keyrecords/tap_dances.c         |  2 +-
 users/drashna/keyrecords/unicode.c            |  2 +-
 users/drashna/oled/oled_stuff.c               |  2 +-
 users/gourdo1/gourdo1.h                       |  3 --
 users/jonavin/jonavin.h                       |  3 --
 users/spidey3/layer_rgb.c                     |  2 +-
 users/uqs/uqs.c                               | 20 ++++----
 91 files changed, 177 insertions(+), 164 deletions(-)

diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 42d965509b..bb0b5d7aa0 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -255,7 +255,7 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
 ```
 
 ## Variable Length Combos
-If you leave `COMBO_COUNT` undefined in `config.h`, it allows you to programmatically declare the size of the Combo data structure and avoid updating `COMBO_COUNT`. Instead a variable called `COMBO_LEN` has to be set. It can be set with something similar to the following in `keymap.c`: `uint16_t COMBO_LEN = sizeof(key_combos) / sizeof(key_combos[0]);` or by adding `COMBO_LENGTH` as the *last* entry in the combo enum and then `uint16_t COMBO_LEN = COMBO_LENGTH;` as such:
+If you leave `COMBO_COUNT` undefined in `config.h`, it allows you to programmatically declare the size of the Combo data structure and avoid updating `COMBO_COUNT`. Instead a variable called `COMBO_LEN` has to be set. It can be set with something similar to the following in `keymap.c`: `uint16_t COMBO_LEN = ARRAY_SIZE(key_combos);` or by adding `COMBO_LENGTH` as the *last* entry in the combo enum and then `uint16_t COMBO_LEN = COMBO_LENGTH;` as such:
 ```c
 enum myCombos {
     ...,
diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c
index 637a77da3d..4e43903255 100644
--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -20,11 +20,12 @@
 #include "haptic.h"
 #include "gpio.h"
 #include "usb_device_state.h"
+#include "util.h"
 #include <stdlib.h>
 
 uint8_t      solenoid_dwell  = SOLENOID_DEFAULT_DWELL;
 static pin_t solenoid_pads[] = SOLENOID_PINS;
-#define NUMBER_OF_SOLENOIDS (sizeof(solenoid_pads) / sizeof(pin_t))
+#define NUMBER_OF_SOLENOIDS ARRAY_SIZE(solenoid_pads)
 bool     solenoid_on[NUMBER_OF_SOLENOIDS]      = {false};
 bool     solenoid_buzzing[NUMBER_OF_SOLENOIDS] = {false};
 uint16_t solenoid_start[NUMBER_OF_SOLENOIDS]   = {0};
@@ -147,7 +148,7 @@ void solenoid_check(void) {
 void solenoid_setup(void) {
 #ifdef SOLENOID_PINS_ACTIVE_STATE
     bool    state_temp[] = SOLENOID_PINS_ACTIVE_STATE;
-    uint8_t bound_check  = (sizeof(state_temp) / sizeof(bool));
+    uint8_t bound_check  = ARRAY_SIZE(state_temp);
 #endif
 
     for (uint8_t i = 0; i < NUMBER_OF_SOLENOIDS; i++) {
diff --git a/drivers/sensors/pmw33xx_common.c b/drivers/sensors/pmw33xx_common.c
index 4993cc2d34..b8d4e532ca 100644
--- a/drivers/sensors/pmw33xx_common.c
+++ b/drivers/sensors/pmw33xx_common.c
@@ -17,10 +17,10 @@
 extern const uint8_t pmw33xx_firmware_data[PMW33XX_FIRMWARE_LENGTH] PROGMEM;
 extern const uint8_t pmw33xx_firmware_signature[3] PROGMEM;
 
-static const pin_t cs_pins[]                                 = PMW33XX_CS_PINS;
-static bool        in_burst[sizeof(cs_pins) / sizeof(pin_t)] = {0};
+static const pin_t cs_pins[]                     = PMW33XX_CS_PINS;
+static bool        in_burst[ARRAY_SIZE(cs_pins)] = {0};
 
-const size_t pmw33xx_number_of_sensors = sizeof(cs_pins) / sizeof(pin_t);
+const size_t pmw33xx_number_of_sensors = ARRAY_SIZE(cs_pins);
 
 bool __attribute__((cold)) pmw33xx_upload_firmware(uint8_t sensor);
 bool __attribute__((cold)) pmw33xx_check_signature(uint8_t sensor);
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
index 93dfc590e9..26190a2a91 100644
--- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
@@ -333,7 +333,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       aqours_num++;
       aqours_next_color_timer_count = 0;
       target_col = 0;
-      if (aqours_num == sizeof(aqours_h) / sizeof(int)) {
+      if (aqours_num == ARRAY_SIZE(aqours_h)) {
         aqours_num = 0;
       }
     }
diff --git a/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c b/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c
index cae98411d6..fd7f556b56 100755
--- a/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c
+++ b/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c
@@ -94,7 +94,7 @@ encoder_mode_t encoder_modes[] = {
 	// Insert your custom encoder mode here
 };
 
-#define NUM_ENCODER_MODES (sizeof(encoder_modes)/sizeof(encoder_modes[0]))
+#define NUM_ENCODER_MODES ARRAY_SIZE(encoder_modes)
 
 // This counter is used to track what encoder mode is being used at a certain time
 int encoder_mode_count = 0;
diff --git a/keyboards/adafruit/macropad/lib/ssd1306_sh1106.c b/keyboards/adafruit/macropad/lib/ssd1306_sh1106.c
index dc1289fdb1..1b05809640 100644
--- a/keyboards/adafruit/macropad/lib/ssd1306_sh1106.c
+++ b/keyboards/adafruit/macropad/lib/ssd1306_sh1106.c
@@ -94,8 +94,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define OLED_ALL_BLOCKS_MASK (((((OLED_BLOCK_TYPE)1 << (OLED_BLOCK_COUNT - 1)) - 1) << 1) | 1)
 
-#define ARRAY_SIZE(arr) sizeof(arr)/sizeof(arr[0])
-
 // spi defines
 #define OLED_STATUS_SUCCESS SPI_STATUS_SUCCESS
 
diff --git a/keyboards/crkbd/keymaps/gotham/oled.c b/keyboards/crkbd/keymaps/gotham/oled.c
index c4ac5e736c..c285a37c5b 100644
--- a/keyboards/crkbd/keymaps/gotham/oled.c
+++ b/keyboards/crkbd/keymaps/gotham/oled.c
@@ -176,7 +176,7 @@ void add_keylog(uint16_t keycode) {
     keylog_str[i] = keylog_str[i - 1];
   }
 
-  if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+  if (keycode < ARRAY_SIZE(code_to_name)) {
     keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
   }
 }
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/oled.c b/keyboards/crkbd/keymaps/thunderbird2086/oled.c
index bee9bc26de..108f3e0cdd 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/oled.c
+++ b/keyboards/crkbd/keymaps/thunderbird2086/oled.c
@@ -189,7 +189,7 @@ void add_keylog(uint16_t keycode) {
         keylog_str[i] = keylog_str[i - 1];
     }
 
-    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+    if (keycode < ARRAY_SIZE(code_to_name)) {
         keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
     }
 }
diff --git a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
index 819b76e739..0442c930fe 100644
--- a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
@@ -242,7 +242,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrecord_t *record) {
     switch (led_mode) {
       case LEDMODE_MODS:
-        for (int i=0;i<sizeof(modifiers) / sizeof(modifiers[0]);i++) {
+        for (int i=0;i<ARRAY_SIZE(modifiers);i++) {
           if(keycode==modifiers[i]) {
             if (record->event.pressed) {
               writePinHigh(led);
diff --git a/keyboards/dm9records/plaid/keymaps/default/keymap.c b/keyboards/dm9records/plaid/keymaps/default/keymap.c
index d96c250609..aa0bd8b093 100644
--- a/keyboards/dm9records/plaid/keymaps/default/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/default/keymap.c
@@ -245,7 +245,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrecord_t *record) {
     switch (led_mode) {
       case LEDMODE_MODS:
-        for (int i=0;i<sizeof(modifiers) / sizeof(modifiers[0]);i++) {
+        for (int i=0;i<ARRAY_SIZE(modifiers);i++) {
           if(keycode==modifiers[i]) {
             if (record->event.pressed) {
               writePinHigh(led);
diff --git a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c b/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
index 354599f340..9a0e89bd89 100644
--- a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
@@ -184,7 +184,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrecord_t *record) {
     switch (led_mode) {
       case LEDMODE_MODS:
-        for (int i=0;i<sizeof(modifiers) / sizeof(modifiers[0]);i++) {
+        for (int i=0;i<ARRAY_SIZE(modifiers);i++) {
           if(keycode==modifiers[i]) {
             if (record->event.pressed) {
               writePinHigh(led);
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
index 8c9af7202b..77534b9a75 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
@@ -111,7 +111,7 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
 };
 // clang-format off
 
-const uint8_t PROGMEM _n_rgb_layers = sizeof(_rgb_layers) / sizeof(_rgb_layers[0]) - 1;
+const uint8_t PROGMEM _n_rgb_layers = ARRAY_SIZE(_rgb_layers) - 1;
 
 void clear_rgb_layers(void) {
     dprint("clear_rgb_layers()\n");
diff --git a/keyboards/evolv/keymaps/gondolindrim/keymap.c b/keyboards/evolv/keymaps/gondolindrim/keymap.c
index 3ab66bd056..bf0944fbd1 100755
--- a/keyboards/evolv/keymaps/gondolindrim/keymap.c
+++ b/keyboards/evolv/keymaps/gondolindrim/keymap.c
@@ -129,7 +129,7 @@ const encoder_mode_t encoder_modes[] = {
 	// Insert your custom encoder mode here
 };
 
-#define NUM_ENCODER_MODES (sizeof(encoder_modes)/sizeof(encoder_modes[0])) // DO NOT CHANGE THIS. NUM_ENCODER_MODES calculates how many modes there are.
+#define NUM_ENCODER_MODES ARRAY_SIZE(encoder_modes) // DO NOT CHANGE THIS. NUM_ENCODER_MODES calculates how many modes there are.
 
 // This counter is used to track what encoder mode is being used at a certain time
 int encoder_mode_count = 0;
diff --git a/keyboards/gboards/butterstick/keymaps/default/keymap.c b/keyboards/gboards/butterstick/keymaps/default/keymap.c
index 749e9ba071..d0c6af65df 100644
--- a/keyboards/gboards/butterstick/keymaps/default/keymap.c
+++ b/keyboards/gboards/butterstick/keymaps/default/keymap.c
@@ -180,4 +180,4 @@ uint32_t processQwerty(bool lookup) {
 }
 
 // Don't fuck with this, thanks.
-size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
+size_t keymapsCount  = ARRAY_SIZE(keymaps);
diff --git a/keyboards/gboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c
index 197abaf92f..8820127848 100644
--- a/keyboards/gboards/butterstick/sten.c
+++ b/keyboards/gboards/butterstick/sten.c
@@ -21,7 +21,7 @@ uint32_t tChord			= 0;		// Protects state of cChord
 
 #ifndef STENOLAYERS
 uint32_t stenoLayers[] = { PWR };
-size_t 	 stenoLayerCount = sizeof(stenoLayers)/sizeof(stenoLayers[0]);
+size_t 	 stenoLayerCount = ARRAY_SIZE(stenoLayers);
 #endif
 
 // Mode state
diff --git a/keyboards/gboards/engine/keymap_engine.h b/keyboards/gboards/engine/keymap_engine.h
index c8a42a052b..599c1ca3e4 100644
--- a/keyboards/gboards/engine/keymap_engine.h
+++ b/keyboards/gboards/engine/keymap_engine.h
@@ -114,8 +114,8 @@ void testCollisions(void) {
 #include "dicts.def"
 
 // Get size data back into the engine
-size_t funcsLen   = sizeof(funDict) / sizeof(funDict[0]);
-size_t stringLen  = sizeof(strDict) / sizeof(strDict[0]);
-size_t keyLen     = sizeof(keyDict) / sizeof(keyDict[0]);
-size_t comboLen   = sizeof(cmbDict) / sizeof(cmbDict[0]);
-size_t specialLen = sizeof(spcDict) / sizeof(spcDict[0]);
+size_t funcsLen   = ARRAY_SIZE(funDict);
+size_t stringLen  = ARRAY_SIZE(strDict);
+size_t keyLen     = ARRAY_SIZE(keyDict);
+size_t comboLen   = ARRAY_SIZE(cmbDict);
+size_t specialLen = ARRAY_SIZE(spcDict);
diff --git a/keyboards/gboards/g/keymap_engine.h b/keyboards/gboards/g/keymap_engine.h
index 93a4423340..055b5941e4 100644
--- a/keyboards/gboards/g/keymap_engine.h
+++ b/keyboards/gboards/g/keymap_engine.h
@@ -115,8 +115,8 @@ void testCollisions(void) {
 #include "dicts.def"
 
 // Get size data back into the engine
-size_t funcsLen   = sizeof(funDict) / sizeof(funDict[0]);
-size_t stringLen  = sizeof(strDict) / sizeof(strDict[0]);
-size_t keyLen     = sizeof(keyDict) / sizeof(keyDict[0]);
-size_t comboLen   = sizeof(cmbDict) / sizeof(cmbDict[0]);
-size_t specialLen = sizeof(spcDict) / sizeof(spcDict[0]);
+size_t funcsLen   = ARRAY_SIZE(funDict);
+size_t stringLen  = ARRAY_SIZE(strDict);
+size_t keyLen     = ARRAY_SIZE(keyDict);
+size_t comboLen   = ARRAY_SIZE(cmbDict);
+size_t specialLen = ARRAY_SIZE(spcDict);
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index 29b35f6abd..af7edc2a9b 100644
--- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
@@ -302,5 +302,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Don't fuck with this, thanks.
-size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
-size_t stenoLayerCount = sizeof(stenoLayers)/sizeof(stenoLayers[0]);
+size_t keymapsCount  = ARRAY_SIZE(keymaps);
+size_t stenoLayerCount = ARRAY_SIZE(stenoLayers);
diff --git a/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
index 09243f2a24..a3324b11cd 100644
--- a/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
@@ -234,4 +234,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Don't fuck with this, thanks.
-size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
+size_t keymapsCount  = ARRAY_SIZE(keymaps);
diff --git a/keyboards/gboards/georgi/keymaps/default/keymap.c b/keyboards/gboards/georgi/keymaps/default/keymap.c
index 93c551af27..78964dc840 100644
--- a/keyboards/gboards/georgi/keymaps/default/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/default/keymap.c
@@ -244,4 +244,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Don't fuck with this, thanks.
-size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
+size_t keymapsCount  = ARRAY_SIZE(keymaps);
diff --git a/keyboards/gboards/georgi/keymaps/minimal/keymap.c b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
index e9294c5cc8..c4e78033bd 100644
--- a/keyboards/gboards/georgi/keymaps/minimal/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
@@ -219,4 +219,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 // Don't fuck with this, thanks.
-size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
+size_t keymapsCount  = ARRAY_SIZE(keymaps);
diff --git a/keyboards/gboards/georgi/keymaps/norman/keymap.c b/keyboards/gboards/georgi/keymaps/norman/keymap.c
index 4591aab22f..870e460e2c 100644
--- a/keyboards/gboards/georgi/keymaps/norman/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/norman/keymap.c
@@ -263,4 +263,4 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_PGDN, KC_LEFT, KC
 			  KC_TRNS, KC_TRNS, KC_TRNS,	                        KC_TRNS, KC_TRNS, KC_TRNS)
 };
 // Don't fuck with this, thanks.
-size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
+size_t keymapsCount  = ARRAY_SIZE(keymaps);
diff --git a/keyboards/gboards/georgi/sten.c b/keyboards/gboards/georgi/sten.c
index c7469b6394..bd96dee758 100644
--- a/keyboards/gboards/georgi/sten.c
+++ b/keyboards/gboards/georgi/sten.c
@@ -21,7 +21,7 @@ uint32_t tChord			= 0;		// Protects state of cChord
 
 #ifndef STENOLAYERS
 uint32_t stenoLayers[] = { PWR };
-size_t 	 stenoLayerCount = sizeof(stenoLayers)/sizeof(stenoLayers[0]);
+size_t 	 stenoLayerCount = ARRAY_SIZE(stenoLayers);
 #endif
 
 // Mode state
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index 09f8aa147a..3aa3fd828e 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
@@ -107,16 +107,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Capslock, Scroll lock and Numlock  indicator on Left side lights.
     void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-        loop_colorset(LED_REGION_A,      (sizeof(LED_REGION_A) / sizeof(LED_REGION_A[0])),           hsv_cl_blue);
-        loop_colorset(LED_REGION_B,      (sizeof(LED_REGION_B) / sizeof(LED_REGION_B[0])),           hsv_cl_purple);
-        loop_colorset(LED_REGION_L_SIDE, (sizeof(LED_REGION_L_SIDE) / sizeof(LED_REGION_L_SIDE[0])), hsv_cl_purple);
-        loop_colorset(LED_REGION_R_SIDE, (sizeof(LED_REGION_R_SIDE) / sizeof(LED_REGION_R_SIDE[0])), hsv_cl_purple);
+        loop_colorset(LED_REGION_A,      ARRAY_SIZE(LED_REGION_A),
+                                 hsv_cl_blue);
+        loop_colorset(LED_REGION_B,      ARRAY_SIZE(LED_REGION_B),
+                                 hsv_cl_purple);
+        loop_colorset(LED_REGION_L_SIDE, ARRAY_SIZE(LED_REGION_L_SIDE),
+                      hsv_cl_purple);
+        loop_colorset(LED_REGION_R_SIDE, ARRAY_SIZE(LED_REGION_R_SIDE),
+                      hsv_cl_purple);
 
         switch(get_highest_layer(layer_state)){  // special handling per layer
             case 1:  //layer 1
                 //rgb_matrix_set_color_all(RGB_AZURE);
-                loop_colorset(LED_REGION_NUMPAD, (sizeof(LED_REGION_NUMPAD) / sizeof(LED_REGION_NUMPAD[0])), hsv_cl_numpad);
-                loop_colorset(LED_REGION_OTHER,  (sizeof(LED_REGION_OTHER) / sizeof(LED_REGION_OTHER[0])),   hsv_cl_mods);
+                loop_colorset(LED_REGION_NUMPAD,
+                              ARRAY_SIZE(LED_REGION_NUMPAD), hsv_cl_numpad);
+                loop_colorset(LED_REGION_OTHER,  ARRAY_SIZE(LED_REGION_OTHER),
+                                 hsv_cl_mods);
             break;
             default: //layer 0
                 //
@@ -148,7 +154,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             rgb_matrix_set_color(LED_L6,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
             rgb_matrix_set_color(LED_L7,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
             rgb_matrix_set_color(LED_L8,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
-            loop_colorset(LED_REGION_CAPS, (sizeof(LED_REGION_CAPS) / sizeof(LED_REGION_CAPS[0])), hsv_cl_bad);
+            loop_colorset(LED_REGION_CAPS, ARRAY_SIZE(LED_REGION_CAPS),
+                          hsv_cl_bad);
         }
     }
 #endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
index ab98693649..9b20399e00 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
@@ -538,7 +538,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
         } else if (paddle_lives == 0) {
             // Game over
-            for (uint8_t i = 0; i < sizeof(LED_GAME_OVER) / sizeof(LED_GAME_OVER[0]); i++) {
+            for (uint8_t i = 0; i < ARRAY_SIZE(LED_GAME_OVER); i++) {
                 rgb_matrix_set_color(LED_GAME_OVER[i], RGB_RED);
             }
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
index e59db7b984..164ff67e22 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
@@ -201,15 +201,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				else { ++rgb_value.r; }
 			}
 			
-            for (uint8_t i=0; i<sizeof(LED_RGB)/sizeof(LED_RGB[0]); i++) {
+            for (uint8_t i=0; i<ARRAY_SIZE(LED_RGB); i++) {
                 rgb_matrix_set_color(LED_RGB[i], rgb_value.r, rgb_value.g, rgb_value.b);
             }
 			
-            for (uint8_t i=0; i<sizeof(LED_WHITE)/sizeof(LED_WHITE[0]); i++) {
+            for (uint8_t i=0; i<ARRAY_SIZE(LED_WHITE); i++) {
                 rgb_matrix_set_color(LED_WHITE[i], RGB_WHITE);
             }
 
-            for (uint8_t i=0; i<sizeof(LED_GREEN)/sizeof(LED_GREEN[0]); i++) {
+            for (uint8_t i=0; i<ARRAY_SIZE(LED_GREEN); i++) {
                 rgb_matrix_set_color(LED_GREEN[i], RGB_GREEN);
             }
 			
@@ -274,7 +274,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 			} else if (paddle_lives == 0) {
 				// Game over
-				for (uint8_t i=0; i<sizeof(LED_GAME_OVER)/sizeof(LED_GAME_OVER[0]); i++) {
+				for (uint8_t i=0; i<ARRAY_SIZE(LED_GAME_OVER); i++) {
 					rgb_matrix_set_color(LED_GAME_OVER[i], RGB_RED);
 				}
 			
@@ -439,12 +439,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
             rgb_matrix_set_color(LED_CAPS, RGB_WHITE);
             if (caps_flash_on) {
-				for (uint8_t i=0; i<sizeof(LED_SIDE_LEFT)/sizeof(LED_SIDE_LEFT[0]); i++) {
+				for (uint8_t i=0; i<ARRAY_SIZE(LED_SIDE_LEFT); i++) {
 					rgb_matrix_set_color(LED_SIDE_LEFT[i], RGB_RED);
 					rgb_matrix_set_color(LED_SIDE_RIGHT[i], RGB_RED);
 				}
 			} else {
-				for (uint8_t i=0; i<sizeof(LED_SIDE_LEFT)/sizeof(LED_SIDE_LEFT[0]); i++) {
+				for (uint8_t i=0; i<ARRAY_SIZE(LED_SIDE_LEFT); i++) {
 					rgb_matrix_set_color(LED_SIDE_LEFT[i], 0, 0, 0);
 					rgb_matrix_set_color(LED_SIDE_RIGHT[i], 0, 0, 0);
 				}
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
index b28809fdf6..fd941883c5 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
@@ -84,7 +84,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         }
     HSV tempHSV = {.h = 0, .s = 255, .v = current_value};
     RGB tempRGB = hsv_to_rgb(tempHSV);
-    for (uint8_t i = 0; i < sizeof(left_side_leds) / sizeof(left_side_leds[0]); i++) {
+    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);
         }
@@ -95,7 +95,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
        case 2:  //layer one
          break;
        case 1:
-         for (uint8_t i = 0; i < sizeof(l2_functions) / sizeof(l2_functions[0]); i++) {
+         for (uint8_t i = 0; i < ARRAY_SIZE(l2_functions); i++) {
              RGB_MATRIX_INDICATOR_SET_COLOR(l2_functions[i], 255, 0, 0);
          }
          break;
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
index 30e8fc5f44..004a8c2014 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
@@ -551,7 +551,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
         } else if (paddle_lives == 0) {
             // Game over
-            for (uint8_t i = 0; i < sizeof(LED_GAME_OVER) / sizeof(LED_GAME_OVER[0]); i++) {
+            for (uint8_t i = 0; i < ARRAY_SIZE(LED_GAME_OVER); i++) {
                 rgb_matrix_set_color(LED_GAME_OVER[i], RGB_RED);
             }
 
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
index ad7a3238ce..e5f5c91151 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
@@ -118,7 +118,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     {{205, 250, 255}, {140, 215, 125}, false },
     };
 
-    uint8_t gp_length = sizeof(gradient_presets)/sizeof(gradient_presets[0]);
+    uint8_t gp_length = ARRAY_SIZE(gradient_presets);
 
     switch (keycode) {
         case G1_HUI:
diff --git a/keyboards/gopolar/gg86/lib/wave.h b/keyboards/gopolar/gg86/lib/wave.h
index 11a3198ab1..f4e5e5052c 100644
--- a/keyboards/gopolar/gg86/lib/wave.h
+++ b/keyboards/gopolar/gg86/lib/wave.h
@@ -69,7 +69,7 @@ void add_keylog(uint16_t keycode) {
         keycode = 0;
     }
 
-    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+    if (keycode < ARRAY_SIZE(code_to_name)) {
         char log_char = pgm_read_byte(&code_to_name[keycode]);
 
         for (uint8_t j = 0; j < OLED_FONT_WIDTH; j++) {
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
index c2eb4406d1..bc5b025b48 100644
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
+++ b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
@@ -191,8 +191,8 @@ void keyboard_post_init_user(void) {
     const pin_t pins[] = {D0, D1, D2};
     uint8_t i, j;
 
-    for (i = 0 ; i < sizeof(pins) / sizeof(pins[0]) + 2 ; i += 1) {
-        for (j = 0 ; j < sizeof(pins) / sizeof(pins[0]) ; j += 1) {
+    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));
         }
diff --git a/keyboards/handwired/myskeeb/oled.c b/keyboards/handwired/myskeeb/oled.c
index 081ca8395a..3f43590b8e 100644
--- a/keyboards/handwired/myskeeb/oled.c
+++ b/keyboards/handwired/myskeeb/oled.c
@@ -183,7 +183,7 @@ void add_keylog(uint16_t keycode) {
         keylog_str[i] = keylog_str[i - 1];
     }
 
-    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+    if (keycode < ARRAY_SIZE(code_to_name)) {
         keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
     }
 }
diff --git a/keyboards/handwired/nicekey/keymaps/default/keymap.c b/keyboards/handwired/nicekey/keymaps/default/keymap.c
index d7539a5c17..a4391eaa30 100644
--- a/keyboards/handwired/nicekey/keymaps/default/keymap.c
+++ b/keyboards/handwired/nicekey/keymaps/default/keymap.c
@@ -116,7 +116,7 @@ PGM_P const sentences[] PROGMEM = {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-        int sentences_size = sizeof(sentences) / sizeof(sentences[0]);
+        int sentences_size = ARRAY_SIZE(sentences);
         int i = rand() % sentences_size;
 
         switch (keycode) {
diff --git a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
index ecf67d3b3c..65983c8dd8 100644
--- a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
@@ -34,11 +34,11 @@ static const uint32_t waiting_values[] = {0, 1, 5, 10, 25, 50, 100, 150, 200, 50
 void housekeeping_task_user(void) {
     static uint32_t last_bench = 0;
     if (timer_elapsed32(last_bench) > 500) {
-        for (int i = 0; i < (sizeof(waiting_values) / sizeof(waiting_values[0])); i++) {
+        for (int i = 0; i < ARRAY_SIZE(waiting_values); i++) {
             wait_us_polling_with_strobe(waiting_values[i]);
             wait_us(10);
         }
-        for (int i = 0; i < (sizeof(waiting_values) / sizeof(waiting_values[0])); i++) {
+        for (int i = 0; i < ARRAY_SIZE(waiting_values); i++) {
             wait_us_yield_with_strobe(waiting_values[i]);
             wait_us(10);
         }
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 77f83361e6..fcfcf51f24 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #include "outputselect.h"
 #include "led.h"
-#define COUNT(x) (sizeof (x) / sizeof (*(x)))
+#define COUNT(x) ARRAY_SIZE((x))
 
 #define KC_WWWB KC_WWW_BACK
 #define KC_WWWF KC_WWW_FORWARD
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 31ce811e53..4df95111a7 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -57,7 +57,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "outputselect.h"
 #endif
 #include "led.h"
-#define COUNT(x) (sizeof (x) / sizeof (*(x)))
+#define COUNT(x) ARRAY_SIZE((x))
 
 #define KC_WWWB KC_WWW_BACK
 #define KC_WWWF KC_WWW_FORWARD
diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
index ba0018a70f..7e15761a98 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
@@ -159,7 +159,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         do {
             MATRIX_DEBUG_DELAY_START();
             is_pressed = false;
-            for (uint8_t i = 0; i < sizeof(delay_ports) / sizeof(pin_t); i++) {
+            for (uint8_t i = 0; i < ARRAY_SIZE(delay_ports); i++) {
 #            ifdef MATRIX_IO_DELAY_MULSEL
                 writePin(MATRIX_MUL_SELECT, delay_sel[i]);
                 waitInputPinDelay();
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
index a97b46e5e4..8c4f9d0d4b 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
@@ -110,7 +110,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     {{205, 250, 255}, {140, 215, 125}, false },
     };
 
-    uint8_t gp_length = sizeof(gradient_presets)/sizeof(gradient_presets[0]);
+    uint8_t gp_length = ARRAY_SIZE(gradient_presets);
 
     switch (keycode) {
         case G1_HUI:
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
index a97b46e5e4..8c4f9d0d4b 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
@@ -110,7 +110,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     {{205, 250, 255}, {140, 215, 125}, false },
     };
 
-    uint8_t gp_length = sizeof(gradient_presets)/sizeof(gradient_presets[0]);
+    uint8_t gp_length = ARRAY_SIZE(gradient_presets);
 
     switch (keycode) {
         case G1_HUI:
diff --git a/keyboards/horrortroll/handwired_k552/lib/wave.c b/keyboards/horrortroll/handwired_k552/lib/wave.c
index 79b4e0ced7..700f73aee5 100644
--- a/keyboards/horrortroll/handwired_k552/lib/wave.c
+++ b/keyboards/horrortroll/handwired_k552/lib/wave.c
@@ -68,7 +68,7 @@ void add_keylog(uint16_t keycode) {
         keycode = 0;
     }
 
-    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+    if (keycode < ARRAY_SIZE(code_to_name)) {
         char log_char = pgm_read_byte(&code_to_name[keycode]);
 
         for (uint8_t j = 0; j < OLED_FONT_WIDTH; j++) {
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
index 667e8859e2..38eb656892 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const uint8_t number_leds[] = {8, 9, 10, 11, 12, 13, 15, 16, 17};
-const uint8_t number_leds_size = sizeof(number_leds) / sizeof(uint8_t);
+const uint8_t number_leds_size = ARRAY_SIZE(number_leds);
 
 bool led_update_user(led_t led_state) {
     for (uint8_t i = 0; i < number_leds_size; i++)
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
index ddcf30b68d..eee2eaf628 100644
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
@@ -129,8 +129,7 @@ static uint8_t COLOR_PATTERNS[][COLOR_PATTERN_RGB_COUNT][3] = {
         { 66,  66,  66}, { 45,  45,  45}, { 23,  23,  23},
     },
 };
-static const uint8_t COLOR_PATTERNS_COUNT = (
-        sizeof(COLOR_PATTERNS) / sizeof(COLOR_PATTERNS[0]));
+static const uint8_t COLOR_PATTERNS_COUNT = ARRAY_SIZE(COLOR_PATTERNS);
 
 /**
  * trimed down version of `ISSI3733_LED_MAP`:
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
index 50b1b6471c..9dbd4d3f19 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
@@ -83,7 +83,7 @@ static const encoder_key PROGMEM encoder_keys[] = {
     {"Play", "", "", KC_MEDIA_PLAY_PAUSE}
 };
 
-#define NUMBER_OF_ENCODER_KEYS sizeof(encoder_keys)/sizeof(encoder_keys[0])
+#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys)
 
 static uint8_t selected_encoder_key_id = 0;
 static encoder_key selected_encoder_key;
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
index 267d3add14..9b28c68672 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
@@ -82,7 +82,7 @@ static const encoder_key PROGMEM encoder_keys[] = {
     {"Play", "", "", KC_MEDIA_PLAY_PAUSE}
 };
 
-#define NUMBER_OF_ENCODER_KEYS sizeof(encoder_keys)/sizeof(encoder_keys[0])
+#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys)
 
 static uint8_t selected_encoder_key_id = 0;
 static encoder_key selected_encoder_key;
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
index 5c22abee3f..a8f1d488d4 100755
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
@@ -71,7 +71,7 @@ static const keycodedescType PROGMEM keyselection[] = {
         {"FLASH",   QK_BOOT},   // firmware flash mode
 };
 
-#define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0])
+#define MAX_KEYSELECTION ARRAY_SIZE(keyselection)
 
 static uint8_t selectedkey_idx = 0;
 static keycodedescType selectedkey_rec;
diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
index b0288c5d7a..58db97d093 100644
--- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
@@ -178,7 +178,7 @@ static const keycodedescType PROGMEM keyselection[] = {
         {"QK_BOOT",   QK_BOOT},   // firmware flash mode
 };
 
-#define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0])
+#define MAX_KEYSELECTION ARRAY_SIZE(keyselection)
 
 static uint8_t selectedkey_idx = 0;
 static keycodedescType selectedkey_rec;
diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.c b/keyboards/mechwild/puckbuddy/puckbuddy.c
index b82d06f565..495cb7e825 100644
--- a/keyboards/mechwild/puckbuddy/puckbuddy.c
+++ b/keyboards/mechwild/puckbuddy/puckbuddy.c
@@ -16,7 +16,7 @@
 
 keyboard_config_t keyboard_config;
 uint16_t          dpi_array[] = GLIDEPOINT_DPI_OPTIONS;
-#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array)
 
 void board_init(void) {
     // B9 is configured as I2C1_SDA in the board file; that function must be
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index 7c77eb882f..848af3de00 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -97,7 +97,7 @@ const bool defaultlayers[] = {
   [_xN] = false,
   [_xF] = false,
 };
-const size_t defaultlayers_n = sizeof(defaultlayers) / sizeof(defaultlayers[0]);
+const size_t defaultlayers_n = ARRAY_SIZE(defaultlayers);
 
 // New keycode KC_LAYO rotates between available default layers (for e.g.,
 // selecting a base layout). Shift+KC_LAYO makes the current one persistent.
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
index c8b8015363..eea031698a 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
@@ -116,7 +116,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     {{205, 250, 255}, {140, 215, 125}, false },
     };
 
-    uint8_t gp_length = sizeof(gradient_presets)/sizeof(gradient_presets[0]);
+    uint8_t gp_length = ARRAY_SIZE(gradient_presets);
 
     switch (keycode) {
         case G1_HUI:
diff --git a/keyboards/mxss/keymaps/default/keymap.c b/keyboards/mxss/keymaps/default/keymap.c
index 519547f15a..3b7150f7fa 100644
--- a/keyboards/mxss/keymaps/default/keymap.c
+++ b/keyboards/mxss/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ hs_set layer_colors[4] = {
     [2] = {.hue = 36,    .sat = 255},  // Color for Layer 2
     [3] = {.hue = 185,   .sat = 255},  // Color for Layer 3
 };
-size_t lc_size = sizeof(layer_colors) / sizeof(uint16_t);
+size_t lc_size = ARRAY_SIZE(layer_colors);
 
 // Use NEW_SAFE_RANGE to define new custom keycodes in order to not overwrite the ones used for front LED control
 enum custom_keycodes {
diff --git a/keyboards/mxss/mxss_frontled.c b/keyboards/mxss/mxss_frontled.c
index 8bb93d5fd8..2ab9a27bea 100644
--- a/keyboards/mxss/mxss_frontled.c
+++ b/keyboards/mxss/mxss_frontled.c
@@ -36,7 +36,7 @@ __attribute__ ((weak))
 hs_set caps_color;
 
 __attribute__ ((weak))
-size_t lc_size = sizeof(layer_colors) / sizeof(hs_set);
+size_t lc_size = ARRAY_SIZE(layer_colors);
 
 void fled_init(void) {
     // This checks both an EEPROM reset (from bootmagic lite, keycodes)
diff --git a/keyboards/mxss/templates/keymap.c b/keyboards/mxss/templates/keymap.c
index a18cff77f0..48cab22852 100644
--- a/keyboards/mxss/templates/keymap.c
+++ b/keyboards/mxss/templates/keymap.c
@@ -27,7 +27,7 @@ hs_set layer_colors[4] = {
     [2] = {.hue = 36,    .sat = 255},  // Color for Layer 2
     [3] = {.hue = 185,   .sat = 255},  // Color for Layer 3
 };
-size_t lc_size = sizeof(layer_colors) / sizeof(uint16_t);
+size_t lc_size = ARRAY_SIZE(layer_colors);
 
 // Use NEW_SAFE_RANGE to define new custom keycodes in order to not overwrite the ones used for front LED control
 enum custom_keycodes {
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index 19bc17738e..abcaa276d9 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -49,7 +49,7 @@
 
 keyboard_config_t keyboard_config;
 uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
-#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array)
 
 // TODO: Implement libinput profiles
 // https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html
@@ -202,7 +202,7 @@ void keyboard_pre_init_kb(void) {
 #ifdef UNUSABLE_PINS
     const pin_t unused_pins[] = UNUSABLE_PINS;
 
-    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
+    for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) {
         setPinOutput(unused_pins[i]);
         writePinLow(unused_pins[i]);
     }
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c
index 786b40f9e8..c96bf15cba 100644
--- a/keyboards/ploopyco/trackball/trackball.c
+++ b/keyboards/ploopyco/trackball/trackball.c
@@ -49,7 +49,7 @@
 
 keyboard_config_t keyboard_config;
 uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
-#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array)
 
 // TODO: Implement libinput profiles
 // https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html
@@ -207,7 +207,7 @@ void keyboard_pre_init_kb(void) {
 #ifdef UNUSABLE_PINS
     const pin_t unused_pins[] = UNUSABLE_PINS;
 
-    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
+    for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) {
         setPinOutput(unused_pins[i]);
         writePinLow(unused_pins[i]);
     }
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.c b/keyboards/ploopyco/trackball_mini/trackball_mini.c
index df13912af4..dc3708fd51 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.c
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.c
@@ -57,7 +57,7 @@
 
 keyboard_config_t keyboard_config;
 uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
-#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array)
 
 // TODO: Implement libinput profiles
 // https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html
@@ -203,7 +203,7 @@ void keyboard_pre_init_kb(void) {
 #ifdef UNUSABLE_PINS
     const pin_t unused_pins[] = UNUSABLE_PINS;
 
-    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
+    for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) {
         setPinOutput(unused_pins[i]);
         writePinLow(unused_pins[i]);
     }
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.c b/keyboards/ploopyco/trackball_nano/trackball_nano.c
index eb1d8e10b0..366918e134 100644
--- a/keyboards/ploopyco/trackball_nano/trackball_nano.c
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.c
@@ -50,7 +50,7 @@
 
 keyboard_config_t keyboard_config;
 uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
-#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array)
 
 void cycle_dpi(void) {
   keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
@@ -89,7 +89,7 @@ void keyboard_pre_init_kb(void) {
 #ifdef UNUSABLE_PINS
     const pin_t unused_pins[] = UNUSABLE_PINS;
 
-    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
+    for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) {
         setPinOutput(unused_pins[i]);
         writePinLow(unused_pins[i]);
     }
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index c367550e49..6a17456390 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -51,7 +51,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
 }
 
 static void setled_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i = 0; i < sizeof(rgb_matrix_ws2812_array) / sizeof(rgb_matrix_ws2812_array[0]); i++) {
+    for (int i = 0; i < ARRAY_SIZE(rgb_matrix_ws2812_array); i++) {
         setled(i, r, g, b);
     }
 }
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index 1ce18bc1ab..87241521ae 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -202,7 +202,7 @@ const rgb_matrix_f rgb_matrix_functions[6][2] = {
 #ifdef ENCODER_ENABLE
 
 static pin_t encoders_pad_a[] = ENCODERS_PAD_A;
-#define NUMBER_OF_ENCODERS (sizeof(encoders_pad_a)/sizeof(pin_t))
+#define NUMBER_OF_ENCODERS ARRAY_SIZE(encoders_pad_a)
 
 const uint16_t PROGMEM encoders[][NUMBER_OF_ENCODERS * 2][2]  = {
     [_QWERTY] = ENCODER_LAYOUT(
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
index cdd0c6620a..d042a4fe27 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
@@ -232,7 +232,7 @@ const rgb_matrix_f rgb_matrix_functions[6][2] = {
 #ifdef ENCODER_ENABLE
 
 static pin_t encoders_pad_a[] = ENCODERS_PAD_A;
-#define NUMBER_OF_ENCODERS (sizeof(encoders_pad_a)/sizeof(pin_t))
+#define NUMBER_OF_ENCODERS ARRAY_SIZE(encoders_pad_a)
 
 const uint16_t PROGMEM encoders[][NUMBER_OF_ENCODERS * 2][2]  = {
     [_QWERTY] = ENCODER_LAYOUT( \
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index d967a03c31..cf25726880 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -18,7 +18,7 @@
 #include "print.h"
 #include "via.h"
 
-#define num_keycodes (sizeof(lookup_table)/sizeof(lookup_table[0]))
+#define num_keycodes ARRAY_SIZE(lookup_table)
 static char UNKNOWN_KEYCODE[] = "UNKNOWN";
 
 int cmp(const void *v1, const void *v2)
diff --git a/keyboards/torn/bongocat.c b/keyboards/torn/bongocat.c
index 21322c9536..9d6d9a85f5 100644
--- a/keyboards/torn/bongocat.c
+++ b/keyboards/torn/bongocat.c
@@ -18,8 +18,6 @@
 
 #ifdef OLED_ENABLE
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
-
 #define IDLE_SPEED 20 // idle below this wpm
 #define TAP_SPEED 60 // tap above this wpm
 
diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
index f0ae9721f9..6fcfd48bba 100644
--- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c
+++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
@@ -92,11 +92,11 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
 
 void matrix_wait_for_interrupt(void) {
     // Set up row/col pins and attach callback
-    for (int i = 0; i < sizeof(col_pins) / sizeof(pin_t); ++i) {
+    for (int i = 0; i < ARRAY_SIZE(col_pins); ++i) {
         setPinOutput(col_pins[i]);
         writePinLow(col_pins[i]);
     }
-    for (int i = 0; i < sizeof(row_pins) / sizeof(pin_t); ++i) {
+    for (int i = 0; i < ARRAY_SIZE(row_pins); ++i) {
         setPinInputHigh(row_pins[i]);
         palEnableLineEvent(row_pins[i], PAL_EVENT_MODE_BOTH_EDGES);
     }
@@ -105,12 +105,12 @@ void matrix_wait_for_interrupt(void) {
     __WFI();
 
     // Now that the interrupt has woken us up, reset all the row/col pins back to defaults
-    for (int i = 0; i < sizeof(row_pins) / sizeof(pin_t); ++i) {
+    for (int i = 0; i < ARRAY_SIZE(row_pins); ++i) {
         palDisableLineEvent(row_pins[i]);
         writePinHigh(row_pins[i]);
         setPinInputHigh(row_pins[i]);
     }
-    for (int i = 0; i < sizeof(col_pins) / sizeof(pin_t); ++i) {
+    for (int i = 0; i < ARRAY_SIZE(col_pins); ++i) {
         writePinHigh(col_pins[i]);
         setPinInputHigh(col_pins[i]);
     }
diff --git a/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
index 1ee7ca1e77..cc6cbd90c2 100644
--- a/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
@@ -2,7 +2,7 @@
 #include "konstantin.h"
 
 static const HSV *colors[] = { &godspeed_blue, &godspeed_yellow };
-static const size_t cnum = sizeof colors / sizeof *colors;
+static const size_t cnum = ARRAY_SIZE(colors);
 static size_t cidx = 0;
 
 enum keycodes_keymap {
diff --git a/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp b/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp
index 0f4ee5e981..8169707661 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp
+++ b/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp
@@ -757,7 +757,7 @@ size_t SPP::write(const uint8_t *data, size_t size) {
 void SPP::write(const uint8_t *data, size_t size) {
 #endif
         for(uint8_t i = 0; i < size; i++) {
-                if(sppIndex >= sizeof (sppOutputBuffer) / sizeof (sppOutputBuffer[0]))
+                if(sppIndex >= ARRAY_SIZE(sppOutputBuffer))
                         send(); // Send the current data in the buffer
                 sppOutputBuffer[sppIndex++] = data[i]; // All the bytes are put into a buffer and then send using the send() function
         }
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino
index 5ebfd7819c..11833334d0 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino
@@ -19,7 +19,7 @@ USB Usb;
 
 BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 PS3BT *PS3[2]; // We will use this pointer to store the two instance, you can easily make it larger if you like, but it will use a lot of RAM!
-const uint8_t length = sizeof(PS3) / sizeof(PS3[0]); // Get the lenght of the array
+const uint8_t length = ARRAY_SIZE(PS3); // Get the lenght of the array
 bool printAngle[length];
 bool oldControllerState[length];
 
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino
index 07c6f13d2b..93cd084651 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino
@@ -19,7 +19,7 @@ USB Usb;
 
 BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 WII *Wii[2]; // We will use this pointer to store the two instance, you can easily make it larger if you like, but it will use a lot of RAM!
-const uint8_t length = sizeof(Wii) / sizeof(Wii[0]); // Get the lenght of the array
+const uint8_t length = ARRAY_SIZE(Wii); // Get the lenght of the array
 bool printAngle[length];
 bool oldControllerState[length];
 
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h
index 2400364e65..05dab14afe 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h
@@ -25,7 +25,7 @@ public:
 	virtual void OnGamePadChanged(const GamePadEventData *evt);
 };
 
-#define RPT_GAMEPAD_LEN	sizeof(GamePadEventData)/sizeof(uint8_t)
+#define RPT_GAMEPAD_LEN	sizeof(GamePadEventData)
 
 class JoystickReportParser : public HIDReportParser
 {
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h
index 57fbb033bf..7af18b88f7 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h
@@ -38,7 +38,7 @@ public:
 	virtual void OnScaleChanged(const ScaleEventData *evt);
 };
 
-#define RPT_SCALE_LEN	sizeof(ScaleEventData)/sizeof(uint8_t)
+#define RPT_SCALE_LEN	sizeof(ScaleEventData)
 
 class ScaleReportParser : public HIDReportParser
 {
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index a73eb69720..390884a2a4 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -181,7 +181,7 @@ void ws2812_init(void) {
     spiStart(&WS2812_SPI, &spicfg); /* Setup transfer parameters.       */
     spiSelect(&WS2812_SPI);         /* Slave Select assertion.          */
 #ifdef WS2812_SPI_USE_CIRCULAR_BUFFER
-    spiStartSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf);
+    spiStartSend(&WS2812_SPI, ARRAY_SIZE(txbuf), txbuf);
 #endif
 }
 
@@ -200,9 +200,9 @@ void ws2812_setleds(LED_TYPE* ledarray, uint16_t leds) {
     // Instead spiSend can be used to send synchronously (or the thread logic can be added back).
 #ifndef WS2812_SPI_USE_CIRCULAR_BUFFER
 #    ifdef WS2812_SPI_SYNC
-    spiSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf);
+    spiSend(&WS2812_SPI, ARRAY_SIZE(txbuf), txbuf);
 #    else
-    spiStartSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf);
+    spiStartSend(&WS2812_SPI, ARRAY_SIZE(txbuf), txbuf);
 #    endif
 #endif
 }
diff --git a/quantum/backlight/backlight_driver_common.c b/quantum/backlight/backlight_driver_common.c
index e4c2e90b5f..1eb8969084 100644
--- a/quantum/backlight/backlight_driver_common.c
+++ b/quantum/backlight/backlight_driver_common.c
@@ -9,7 +9,7 @@
 #if defined(BACKLIGHT_PINS)
 static const pin_t backlight_pins[] = BACKLIGHT_PINS;
 #    ifndef BACKLIGHT_LED_COUNT
-#        define BACKLIGHT_LED_COUNT (sizeof(backlight_pins) / sizeof(pin_t))
+#        define BACKLIGHT_LED_COUNT ARRAY_SIZE(backlight_pins)
 #    endif
 
 #    define FOR_EACH_LED(x)                                 \
diff --git a/quantum/backlight/backlight_software.c b/quantum/backlight/backlight_software.c
index 3d412cab52..27ccbd2c9f 100644
--- a/quantum/backlight/backlight_software.c
+++ b/quantum/backlight/backlight_software.c
@@ -26,7 +26,7 @@ static const uint16_t backlight_duty_table[] = {
     0b1110111011101110,
     0b1111111111111111,
 };
-#define backlight_duty_table_size (sizeof(backlight_duty_table) / sizeof(backlight_duty_table[0]))
+#define backlight_duty_table_size ARRAY_SIZE(backlight_duty_table)
 
 // clang-format on
 
diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index eee29aaf91..e180cfccdf 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef DIP_SWITCH_PINS
-#    define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
+#    define NUMBER_OF_DIP_SWITCHES (ARRAY_SIZE(dip_switch_pad))
 static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
 #endif
 
@@ -43,7 +43,7 @@ typedef struct matrix_index_t {
     uint8_t col;
 } matrix_index_t;
 
-#    define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(matrix_index_t))
+#    define NUMBER_OF_DIP_SWITCHES (ARRAY_SIZE(dip_switch_pad))
 static matrix_index_t dip_switch_pad[] = DIP_SWITCH_MATRIX_GRID;
 extern bool           peek_matrix(uint8_t row_index, uint8_t col_index, bool read_raw);
 static uint16_t       scan_count;
diff --git a/quantum/encoder.h b/quantum/encoder.h
index 82f95b4931..4eb67fa25d 100644
--- a/quantum/encoder.h
+++ b/quantum/encoder.h
@@ -32,17 +32,17 @@ void encoder_state_raw(uint8_t* slave_state);
 void encoder_update_raw(uint8_t* slave_state);
 
 #    if defined(ENCODERS_PAD_A_RIGHT)
-#        define NUM_ENCODERS_LEFT (sizeof(((pin_t[])ENCODERS_PAD_A)) / sizeof(pin_t))
-#        define NUM_ENCODERS_RIGHT (sizeof(((pin_t[])ENCODERS_PAD_A_RIGHT)) / sizeof(pin_t))
+#        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 (sizeof(((pin_t[])ENCODERS_PAD_A)) / sizeof(pin_t))
+#        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
 
-#    define NUM_ENCODERS (sizeof(((pin_t[])ENCODERS_PAD_A)) / sizeof(pin_t))
+#    define NUM_ENCODERS ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
 #    define NUM_ENCODERS_LEFT NUM_ENCODERS
 #    define NUM_ENCODERS_RIGHT 0
 
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index ae00b3227a..3593f75f0d 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -58,7 +58,7 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
                     keycode = keycode & 0xFF;
                 }
 #    endif // LEADER_KEY_STRICT_KEY_PROCESSING
-                if (leader_sequence_size < (sizeof(leader_sequence) / sizeof(leader_sequence[0]))) {
+                if (leader_sequence_size < ARRAY_SIZE(leader_sequence)) {
                     leader_sequence[leader_sequence_size] = keycode;
                     leader_sequence_size++;
                 } else {
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 8de31c055c..1c1aab8f48 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -25,7 +25,7 @@ bool             unicode_saved_num_lock;
 
 #if UNICODE_SELECTED_MODES != -1
 static uint8_t selected[]     = {UNICODE_SELECTED_MODES};
-static int8_t  selected_count = sizeof selected / sizeof *selected;
+static int8_t  selected_count = ARRAY_SIZE(selected);
 static int8_t  selected_index;
 #endif
 
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 27fa7369bf..99151e5a92 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -369,7 +369,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
 }
 
 static void setled_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i = 0; i < sizeof(rgb_matrix_ws2812_array) / sizeof(rgb_matrix_ws2812_array[0]); i++) {
+    for (int i = 0; i < ARRAY_SIZE(rgb_matrix_ws2812_array); i++) {
         setled(i, r, g, b);
     }
 }
diff --git a/quantum/secure.c b/quantum/secure.c
index f07f6af2cb..f2a567f31d 100644
--- a/quantum/secure.c
+++ b/quantum/secure.c
@@ -3,6 +3,7 @@
 
 #include "secure.h"
 #include "timer.h"
+#include "util.h"
 
 #ifndef SECURE_UNLOCK_TIMEOUT
 #    define SECURE_UNLOCK_TIMEOUT 5000
@@ -59,7 +60,7 @@ void secure_activity_event(void) {
 
 void secure_keypress_event(uint8_t row, uint8_t col) {
     static const uint8_t sequence[][2] = SECURE_UNLOCK_SEQUENCE;
-    static const uint8_t sequence_len  = sizeof(sequence) / sizeof(sequence[0]);
+    static const uint8_t sequence_len  = ARRAY_SIZE(sequence);
 
     static uint8_t offset = 0;
     if ((sequence[offset][0] == row) && (sequence[offset][1] == col)) {
diff --git a/quantum/util.h b/quantum/util.h
index 21c290013c..9c034cc404 100644
--- a/quantum/util.h
+++ b/quantum/util.h
@@ -1,19 +1,7 @@
-/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
+// Copyright 2022 Stefan Kerkmann (KarlK90)
+// Copyright 2011 Jun Wako <wakojun@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 "bitwise.h"
@@ -29,3 +17,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if !defined(MAX)
 #    define MAX(x, y) (((x) > (y)) ? (x) : (y))
 #endif
+
+#if !defined(CEILING)
+/**
+ * @brief Computes the rounded up result of a division of two integers at
+ * compile time.
+ */
+#    define CEILING(dividend, divisor) (((dividend) + (divisor)-1) / (divisor))
+#endif
+
+#if !defined(IS_ARRAY)
+/**
+ * @brief Returns true if the value is an array, false if it's a pointer.
+ *
+ * This macro is ill-formed for scalars, which is OK for its intended use in
+ * ARRAY_SIZE.
+ */
+#    define IS_ARRAY(value) (!__builtin_types_compatible_p(typeof((value)), typeof(&(value)[0])))
+#endif
+
+#if !defined(ARRAY_SIZE)
+/**
+ * @brief Computes the number of elements of the given array at compile time.
+ *
+ * This Macro can only be used for statically allocated arrays that have not
+ * been decayed into a pointer. This is detected at compile time, though the
+ * error message for scalar values is poor.
+ */
+#    define ARRAY_SIZE(array) (__builtin_choose_expr(IS_ARRAY((array)), sizeof((array)) / sizeof((array)[0]), (void)0))
+#endif
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
index 69b3ad574c..58fc4efd9c 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
@@ -95,7 +95,7 @@ led_setup_t leds_rainbow_s[] = {
 
 void *led_setups[] = {leds_rainbow_s, leds_rainbow_ns, leds_teal_salmon, leds_yellow, leds_red, leds_green, leds_blue, leds_white, leds_white_with_red_stripe, leds_black_with_red_stripe, leds_off};
 
-const uint8_t led_setups_count = sizeof(led_setups) / sizeof(led_setups[0]);
+const uint8_t led_setups_count = ARRAY_SIZE(led_setups);
 
 #    endif // USE_MASSDROP_CONFIGURATOR
 #endif     // RGB_MATRIX_ENABLE
\ No newline at end of file
diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c
index 1abf785b49..94842021cd 100644
--- a/users/brandonschlack/rgb_bs.c
+++ b/users/brandonschlack/rgb_bs.c
@@ -75,7 +75,7 @@ void rgb_theme_step_reverse(void) {
 
 rgb_theme_color_t get_rgb_theme_color(uint8_t index) {
     rgb_theme_t theme = get_rgb_theme();
-    size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors;
+    size_t rgb_theme_color_max = ARRAY_SIZE(theme.colors);
 
     if (index == _ADJUST) {
         return default_adjust;
diff --git a/users/curry/oled.c b/users/curry/oled.c
index 5a8f0de61d..89112af121 100644
--- a/users/curry/oled.c
+++ b/users/curry/oled.c
@@ -41,7 +41,7 @@ void add_keylog(uint16_t keycode) {
         keylog_str[i] = keylog_str[i - 1];
     }
 
-    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+    if (keycode < ARRAY_SIZE(code_to_name)) {
         keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
     }
 
diff --git a/users/davidkristoffersen/util/functions.c b/users/davidkristoffersen/util/functions.c
index 781d8f214d..3ab4ace2d6 100644
--- a/users/davidkristoffersen/util/functions.c
+++ b/users/davidkristoffersen/util/functions.c
@@ -33,14 +33,14 @@ code_set_t EN_SHIFT_CODES [] = {
 const shift_code_t SHIFT_CODES [] = {
 #ifdef LAYER_NO
     {.lang = LAYER_NO,
-     .size = ARR_LEN(NO_SHIFT_CODES),
+     .size = ARRAY_SIZE(NO_SHIFT_CODES),
      .codes = NO_SHIFT_CODES},
 #endif
     {.lang = LAYER_EN,
-     .size = ARR_LEN(EN_SHIFT_CODES),
+     .size = ARRAY_SIZE(EN_SHIFT_CODES),
      .codes = EN_SHIFT_CODES},
 };
-const int SHIFT_CODES_SIZE = ARR_LEN(SHIFT_CODES);
+const int SHIFT_CODES_SIZE = ARRAY_SIZE(SHIFT_CODES);
 #endif
 
 #ifdef LAYER_NO
@@ -72,7 +72,7 @@ const code_set_t EN2NO_CODES [] = {
     {KC_DLR,  NO_DLR},
     {KC_GRV,  NO_GRV}
 };
-const int EN2NO_CODES_SIZE = ARR_LEN(EN2NO_CODES);
+const int EN2NO_CODES_SIZE = ARRAY_SIZE(EN2NO_CODES);
 #endif
 
 // Check if layer is an active default layer
diff --git a/users/davidkristoffersen/util/functions.h b/users/davidkristoffersen/util/functions.h
index eee1dadc57..5fef010694 100644
--- a/users/davidkristoffersen/util/functions.h
+++ b/users/davidkristoffersen/util/functions.h
@@ -15,8 +15,6 @@
 
 // Return false if test equal false
 #define HANDLE_FALSE(bool) if (!bool) return false;
-// Generic array lenght define
-#define ARR_LEN(arr) (sizeof(arr) / sizeof(arr)[0])
 // Printf-like functionality for send_string
 #define SEND_VAR(str, ...) \
     do { \
diff --git a/users/drashna/keyrecords/tap_dance.md b/users/drashna/keyrecords/tap_dance.md
index 0bf67cbd5a..fef1435918 100644
--- a/users/drashna/keyrecords/tap_dance.md
+++ b/users/drashna/keyrecords/tap_dance.md
@@ -88,7 +88,7 @@ void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) {
     diablo_timer[diablo_keys->index].keycode = diablo_keys->keycode;
 
     // if the tapdance is hit more than the number of elemints in the array, reset
-    if (state->count >= (sizeof(diablo_times) / sizeof(uint8_t) ) ) {
+    if (state->count >= ARRAY_SIZE(diablo_times) ) {
         diablo_timer[diablo_keys->index].key_interval = 0;
         reset_tap_dance(state);
     }  else { // else set the interval (tapdance count starts at 1, array starts at 0, so offset by one)
diff --git a/users/drashna/keyrecords/tap_dances.c b/users/drashna/keyrecords/tap_dances.c
index 6caf6b6b3e..7bdea3cae3 100644
--- a/users/drashna/keyrecords/tap_dances.c
+++ b/users/drashna/keyrecords/tap_dances.c
@@ -23,7 +23,7 @@ void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) {
     diablo_timer[diablo_keys->index].keycode = diablo_keys->keycode;
 
     // if the tapdance is hit more than the number of elemints in the array, reset
-    if (state->count >= (sizeof(diablo_times) / sizeof(uint8_t))) {
+    if (state->count >= ARRAY_SIZE(diablo_times)) {
         diablo_timer[diablo_keys->index].key_interval = 0;
         reset_tap_dance(state);
     } else { // else set the interval (tapdance count starts at 1, array starts at 0, so offset by one)
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index b3fc71cb09..bfce38f555 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -43,7 +43,7 @@ typedef uint32_t (*translator_function_t)(bool is_shifted, uint32_t keycode);
     static inline uint32_t translator_name(bool is_shifted, uint32_t keycode) { \
         static const uint32_t translation[] = {__VA_ARGS__};                    \
         uint32_t              ret           = keycode;                          \
-        if ((keycode - KC_A) < (sizeof(translation) / sizeof(uint32_t))) {      \
+        if ((keycode - KC_A) < ARRAY_SIZE(translation)) {      \
             ret = translation[keycode - KC_A];                                  \
         }                                                                       \
         return ret;                                                             \
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index e082f8ab3e..68801b80a4 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -87,7 +87,7 @@ void add_keylog(uint16_t keycode, keyrecord_t *record) {
 
     memmove(keylog_str, keylog_str + 1, OLED_KEYLOGGER_LENGTH - 1);
 
-    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+    if (keycode < ARRAY_SIZE(code_to_name)) {
         keylog_str[(OLED_KEYLOGGER_LENGTH - 1)] = pgm_read_byte(&code_to_name[keycode]);
     }
 
diff --git a/users/gourdo1/gourdo1.h b/users/gourdo1/gourdo1.h
index ecf6eaf25d..a198fd0805 100644
--- a/users/gourdo1/gourdo1.h
+++ b/users/gourdo1/gourdo1.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// DEFINE MACROS
-#define ARRAYSIZE(arr) sizeof(arr) / sizeof(arr[0])
-
 // LAYERS -- Note: to avoid compile problems, make sure total layers matches DYNAMIC_KEYMAP_LAYER_COUNT defined in config.h (where _COLEMAK layer is defined)
 enum custom_user_layers {
     _BASE,
diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h
index ab2ce0dff2..c3e383bd3a 100644
--- a/users/jonavin/jonavin.h
+++ b/users/jonavin/jonavin.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// DEFINE MACROS
-#define ARRAYSIZE(arr)  sizeof(arr)/sizeof(arr[0])
-
 
 // LAYERS
 enum custom_user_layers {
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index c867468194..b34b91679d 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -97,7 +97,7 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
 
 // clang-format on
 
-const uint8_t PROGMEM _n_rgb_layers = sizeof(_rgb_layers) / sizeof(_rgb_layers[0]) - 1;
+const uint8_t PROGMEM _n_rgb_layers = ARRAY_SIZE(_rgb_layers) - 1;
 
 void clear_rgb_layers() {
     for (uint8_t i = 0; i < _n_rgb_layers; i++) {
diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c
index 72284143c6..7e2d09e0f6 100644
--- a/users/uqs/uqs.c
+++ b/users/uqs/uqs.c
@@ -78,9 +78,9 @@ const rgblight_segment_t* const PROGMEM my_rgb_layers[] = {
     my_rgb_segments[L_MOUSE],
 };
 
-_Static_assert(sizeof(my_rgb_layers) / sizeof(my_rgb_layers[0]) ==
-        sizeof(my_rgb_segments) / sizeof(my_rgb_segments[0]),
-        "Number of rgb_segment definitions does not match up!");
+_Static_assert(ARRAY_SIZE(my_rgb_layers) ==
+	       ARRAY_SIZE(my_rgb_segments),
+	       "Number of rgb_segment definitions does not match up!");
 #endif
 
 #ifdef COMBO_ENABLE
@@ -125,7 +125,7 @@ const uint16_t PROGMEM my_combos[][4] = {
     {KC_BTN1, KC_BTN2, KC_BTN3, COMBO_END},
 };
 
-const uint16_t COMBO_LEN = sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0]);
+const uint16_t COMBO_LEN = ARRAY_SIZE(my_action_combos) + ARRAY_SIZE(my_combos);
 
 #define MY_ACTION_COMBO(ck) \
     [ck] = { .keys = &(my_action_combos[ck][0]) }
@@ -162,11 +162,11 @@ combo_t key_combos[] = {
   MY_COMBO(14),
 };
 
-_Static_assert(sizeof(key_combos) / sizeof(key_combos[0]) ==
-        (sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0])),
-        "Number of combo definitions does not match up!");
+_Static_assert(ARRAY_SIZE(key_combos) ==
+	       (ARRAY_SIZE(my_action_combos) + ARRAY_SIZE(my_combos)),
+	       "Number of combo definitions does not match up!");
 #else
-combo_t key_combos[sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0])];
+combo_t key_combos[ARRAY_SIZE(my_action_combos) + ARRAY_SIZE(my_combos)];
 #endif
 
 void process_combo_event(uint16_t combo_index, bool pressed) {
@@ -235,10 +235,10 @@ void keyboard_post_init_user(void) {
 #endif
 #if defined(COMBO_ENABLE) && !defined(COMBO_STATICALLY)
     uint8_t i = 0;
-    for (; i < sizeof(my_action_combos) / sizeof(my_action_combos[0]); i++) {
+    for (; i < ARRAY_SIZE(my_action_combos); i++) {
         key_combos[i].keys = &(my_action_combos[i][0]);
     }
-    for (uint8_t j = 0; j < sizeof(my_combos) / sizeof(my_combos[0]); j++, i++) {
+    for (uint8_t j = 0; j < ARRAY_SIZE(my_combos); j++, i++) {
         key_combos[i].keycode = my_combos[j][0];
         key_combos[i].keys = &(my_combos[j][1]);
     }

From df4b01b433ee80d33401627276aa8944997e6601 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 30 Aug 2022 02:34:39 -0600
Subject: [PATCH 272/959] fix boardsource/lulu (#18217)

---
 keyboards/boardsource/lulu/rules.mk | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 keyboards/boardsource/lulu/rules.mk

diff --git a/keyboards/boardsource/lulu/rules.mk b/keyboards/boardsource/lulu/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/boardsource/lulu/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank

From 092dd58e34744b4118052082ce2020622d92d809 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 30 Aug 2022 01:40:35 -0700
Subject: [PATCH 273/959] [Keyboard] Fix layout macro for Cannonkeys Atlas
 keyboard (#18216)

---
 keyboards/cannonkeys/atlas/atlas.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/cannonkeys/atlas/atlas.h b/keyboards/cannonkeys/atlas/atlas.h
index b2f64dab73..2a6bf7d88a 100644
--- a/keyboards/cannonkeys/atlas/atlas.h
+++ b/keyboards/cannonkeys/atlas/atlas.h
@@ -37,12 +37,12 @@
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,   k46   , k48, k49, k4a, k4b \
+    k40, k41, k42, k43,    k45,     k47,    k48, k49, k4a, k4b \
 ) \
 { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, KC_NO, k46, KC_NO, k48, k49, k4a, k4b }, \
+    { k40, k41, k42, k43, KC_NO, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
 }

From 907d7bfc5471b97c45420b31cd8ba2202f0b04e5 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Tue, 30 Aug 2022 10:50:00 +0100
Subject: [PATCH 274/959] [Keyboard] Add NK87B (#18210)

Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/novelkeys/nk87b/config.h            | 135 ++++++++++++++++++
 keyboards/novelkeys/nk87b/halconf.h           |  21 +++
 keyboards/novelkeys/nk87b/info.json           |  16 +++
 .../novelkeys/nk87b/keymaps/default/keymap.c  |  34 +++++
 .../novelkeys/nk87b/keymaps/default/readme.md |   7 +
 .../novelkeys/nk87b/keymaps/via/keymap.c      |  50 +++++++
 .../novelkeys/nk87b/keymaps/via/readme.md     |   7 +
 .../novelkeys/nk87b/keymaps/via/rules.mk      |   1 +
 keyboards/novelkeys/nk87b/mcuconf.h           |  22 +++
 keyboards/novelkeys/nk87b/nk87b.c             |  58 ++++++++
 keyboards/novelkeys/nk87b/nk87b.h             |  38 +++++
 keyboards/novelkeys/nk87b/readme.md           |  34 +++++
 keyboards/novelkeys/nk87b/rules.mk            |  29 ++++
 13 files changed, 452 insertions(+)
 create mode 100644 keyboards/novelkeys/nk87b/config.h
 create mode 100644 keyboards/novelkeys/nk87b/halconf.h
 create mode 100755 keyboards/novelkeys/nk87b/info.json
 create mode 100644 keyboards/novelkeys/nk87b/keymaps/default/keymap.c
 create mode 100644 keyboards/novelkeys/nk87b/keymaps/default/readme.md
 create mode 100644 keyboards/novelkeys/nk87b/keymaps/via/keymap.c
 create mode 100644 keyboards/novelkeys/nk87b/keymaps/via/readme.md
 create mode 100644 keyboards/novelkeys/nk87b/keymaps/via/rules.mk
 create mode 100644 keyboards/novelkeys/nk87b/mcuconf.h
 create mode 100644 keyboards/novelkeys/nk87b/nk87b.c
 create mode 100644 keyboards/novelkeys/nk87b/nk87b.h
 create mode 100644 keyboards/novelkeys/nk87b/readme.md
 create mode 100644 keyboards/novelkeys/nk87b/rules.mk

diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
new file mode 100644
index 0000000000..32bbb5e69e
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -0,0 +1,135 @@
+/*
+Copyright 2022 Yiancar
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_ROW_PINS { B11, B10, B2, B1, A9, A5 }
+#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10, A14, A15, B3, B4, B5, B6, B7, B8, B9, A0, A1 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Indicator LEDs */
+#define LED_CAPS_LOCK_PIN A2
+#define LED_PIN_ON_STATE 0
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+// #define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+// #define FORCE_NKRO
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* RGB options */
+
+#define RGB_DI_PIN B0
+#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 RGBLED_NUM 87
+#define DRIVER_LED_TOTAL 87
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 114
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/novelkeys/nk87b/halconf.h b/keyboards/novelkeys/nk87b/halconf.h
new file mode 100644
index 0000000000..ce14bc0c41
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
new file mode 100755
index 0000000000..01518c9b2f
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "NK87B",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E50",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,12", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":2.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.5}, {"label":"5,1", "x":1.5, "y":5.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.5}, {"label":"5,6", "x":4, "y":5.25, "w":7}, {"label":"5,11", "x":11, "y":5.25, "w":1.5}, {"label":"5,12", "x":12.5, "y":5.25}, {"label":"5,13", "x":13.5, "y":5.25, "w":1.5}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/nk87b/keymaps/default/keymap.c b/keyboards/novelkeys/nk87b/keymaps/default/keymap.c
new file mode 100644
index 0000000000..37c7feb4fd
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all( /* Base */
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                            KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_all( /* FN */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, 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_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, 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)
+};
diff --git a/keyboards/novelkeys/nk87b/keymaps/default/readme.md b/keyboards/novelkeys/nk87b/keymaps/default/readme.md
new file mode 100644
index 0000000000..c0ca436184
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+# The default keymap for NK87
+
+![Layer 0](https://i.imgur.com/nw29fvc.png)
+Fn Layer:
+![Layer 1](https://i.imgur.com/SyijLFt.png)
+
+Default layer is normal ANSI TKL
diff --git a/keyboards/novelkeys/nk87b/keymaps/via/keymap.c b/keyboards/novelkeys/nk87b/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d4f4a0fa9d
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                            KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_all( /* FN */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, 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_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, 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),
+
+[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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),
+};
diff --git a/keyboards/novelkeys/nk87b/keymaps/via/readme.md b/keyboards/novelkeys/nk87b/keymaps/via/readme.md
new file mode 100644
index 0000000000..22f342c376
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/keymaps/via/readme.md
@@ -0,0 +1,7 @@
+# The default VIA keymap for NK87. VIA support enabled.
+
+![Layer 0](https://i.imgur.com/nw29fvc.png)
+Fn Layer:
+![Layer 1](https://i.imgur.com/SyijLFt.png)
+
+Default layer is normal ANSI TKL
diff --git a/keyboards/novelkeys/nk87b/keymaps/via/rules.mk b/keyboards/novelkeys/nk87b/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/novelkeys/nk87b/mcuconf.h b/keyboards/novelkeys/nk87b/mcuconf.h
new file mode 100644
index 0000000000..7cf6a48904
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/novelkeys/nk87b/nk87b.c b/keyboards/novelkeys/nk87b/nk87b.c
new file mode 100644
index 0000000000..639eba6817
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/nk87b.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nk87b.h"
+#include <lib/lib8tion/lib8tion.h>
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(A3, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(A4, PAL_MODE_OUTPUT_OPENDRAIN);
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    writePin(A3, !layer_state_cmp(state, 1));
+    writePin(A4, !layer_state_cmp(state, 2));
+    return layer_state_set_user(state);
+}
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {   
+    {   0,      1,  2,      3,      4,      5,  6,      7,      8,      9,     10,  11,  12,     13,     14,    15,      16 }, 
+    {  33,     32, 31,     30,     29,     28, 27,     26,     25,     24,     23,  22,  21,     20,     19,    18,      17 }, 
+    {  34,     35, 36,     37,     38,     39, 40,     41,     42,     43,     44,  45,  46, NO_LED,     48,    49,      50 }, 
+    {  63,     62, 61,     60,     59,     58, 57,     56,     55,     54,     53,  52,  47,     51, NO_LED, NO_LED, NO_LED }, 
+    {  64, NO_LED, 65,     66,     67,     68, 69,     70,     71,     72,     73,  74,  75, NO_LED, NO_LED,     76, NO_LED }, 
+    {  86,     85, 84, NO_LED, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, NO_LED,  82,  81,     80,     79,     78,     77 }, 
+}, {
+    {  0,0  }, { 16,0  }, { 29,0  }, { 42,0  }, { 55,0  }, { 71,0  }, { 84,0  }, { 97,0  }, {110,0  }, {127,0  }, {140,0  }, {153,0  }, {166,0  }, {182,0  }, {198,0  }, {211,0  }, {224,0  }, 
+    {224,15 }, {211,15 }, {198,15 }, {175,15 }, {156,15 }, {143,15 }, {130,15 }, {117,15 }, {104,15 }, { 91,15 }, { 78,15 }, { 65,15 }, { 52,15 }, { 39,15 }, { 26,15 }, { 13,15 }, {  0,15 }, 
+    {  3,27 }, { 19,27 }, { 32,27 }, { 45,27 }, { 58,27 }, { 71,27 }, { 84,27 }, { 97,27 }, {110,27 }, {123,27 }, {136,27 }, {149,27 }, {162,27 }, {179,27 }, {198,27 }, {211,27 }, {224,27 }, 
+    {174,40 }, {153,40 }, {140,40 }, {127,40 }, {114,40 }, {101,40 }, { 88,40 }, { 75,40 }, { 62,40 }, { 49,40 }, { 36,40 }, { 23,40 }, {  5,40 }, {  8,52 }, { 29,52 }, { 42,52 }, { 55,52 }, 
+    { 68,52 }, { 81,52 }, { 94,52 }, {107,52 }, {120,52 }, {133,52 }, {146,52 }, {170,52 }, {211,52 }, {224,64 }, {211,64 }, {198,64 }, {179,64 }, {162,64 }, {146,64 }, { 91,64 }, { 36,64 }, 
+    { 19,64 }, {  3,64 }
+}, {
+    1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 1,
+    1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+    1, 1, 1, 1, 1, 1, 4, 1, 1, 1
+} };
+// clang-format on
+#endif
diff --git a/keyboards/novelkeys/nk87b/nk87b.h b/keyboards/novelkeys/nk87b/nk87b.h
new file mode 100644
index 0000000000..5e48d36baf
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/nk87b.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define XXX KC_NO
+
+#include "quantum.h"
+
+// This a shortcut to help you visually see your layout.
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,      \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
diff --git a/keyboards/novelkeys/nk87b/readme.md b/keyboards/novelkeys/nk87b/readme.md
new file mode 100644
index 0000000000..d993fb6ef4
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/readme.md
@@ -0,0 +1,34 @@
+# NK87B
+
+![NK87B](https://i.imgur.com/nw29fvc.png)
+
+This is a standard fixed layout TKL PCB. It supports VIA and full per-key RGB. This is revision B.
+
+* Keyboard Maintainer: [Yiancar](https://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A TKL keyboard with STM32F072CB or APM compatible
+* Hardware Availability: https://novelkeys.xyz/
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make novelkeys/nk87b:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or dfu-util (`make nk87b:<keymap>:dfu-util`)
diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
new file mode 100644
index 0000000000..230cc1ec14
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
+RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
+WS2812_DRIVER = pwm         # Per-key RGB MCU Driver

From a9e726501d94906ef8ea8a48f156581e03534ba6 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Tue, 30 Aug 2022 10:50:43 +0100
Subject: [PATCH 275/959] [Keyboard] Add NK65B (#18211)

Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/novelkeys/nk65b/config.h            | 135 ++++++++++++++++++
 keyboards/novelkeys/nk65b/halconf.h           |  21 +++
 keyboards/novelkeys/nk65b/info.json           |  17 +++
 .../novelkeys/nk65b/keymaps/default/keymap.c  |  32 +++++
 .../novelkeys/nk65b/keymaps/default/readme.md |   7 +
 .../novelkeys/nk65b/keymaps/via/keymap.c      |  46 ++++++
 .../novelkeys/nk65b/keymaps/via/readme.md     |   7 +
 .../novelkeys/nk65b/keymaps/via/rules.mk      |   1 +
 keyboards/novelkeys/nk65b/mcuconf.h           |  22 +++
 keyboards/novelkeys/nk65b/nk65b.c             |  54 +++++++
 keyboards/novelkeys/nk65b/nk65b.h             |  36 +++++
 keyboards/novelkeys/nk65b/readme.md           |  34 +++++
 keyboards/novelkeys/nk65b/rules.mk            |  29 ++++
 13 files changed, 441 insertions(+)
 create mode 100755 keyboards/novelkeys/nk65b/config.h
 create mode 100644 keyboards/novelkeys/nk65b/halconf.h
 create mode 100755 keyboards/novelkeys/nk65b/info.json
 create mode 100755 keyboards/novelkeys/nk65b/keymaps/default/keymap.c
 create mode 100755 keyboards/novelkeys/nk65b/keymaps/default/readme.md
 create mode 100755 keyboards/novelkeys/nk65b/keymaps/via/keymap.c
 create mode 100755 keyboards/novelkeys/nk65b/keymaps/via/readme.md
 create mode 100755 keyboards/novelkeys/nk65b/keymaps/via/rules.mk
 create mode 100644 keyboards/novelkeys/nk65b/mcuconf.h
 create mode 100755 keyboards/novelkeys/nk65b/nk65b.c
 create mode 100755 keyboards/novelkeys/nk65b/nk65b.h
 create mode 100755 keyboards/novelkeys/nk65b/readme.md
 create mode 100755 keyboards/novelkeys/nk65b/rules.mk

diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
new file mode 100755
index 0000000000..45603267a1
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -0,0 +1,135 @@
+/*
+Copyright 2022 Yiancar
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { A0, A1, A2, B11, B6 }
+#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B12, B13, B14, B15, A8, A9 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Indicator LEDs */
+#define LED_CAPS_LOCK_PIN A14
+#define LED_PIN_ON_STATE 0
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+// #define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+// #define FORCE_NKRO
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* RGB options */
+
+#define RGB_DI_PIN B4
+#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 RGBLED_NUM 68
+#define DRIVER_LED_TOTAL 68
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/novelkeys/nk65b/halconf.h b/keyboards/novelkeys/nk65b/halconf.h
new file mode 100644
index 0000000000..ce14bc0c41
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
new file mode 100755
index 0000000000..8868b78531
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -0,0 +1,17 @@
+{
+    "keyboard_name": "NK65B",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "url": "", 
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E4F",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/novelkeys/nk65b/keymaps/default/keymap.c b/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
new file mode 100755
index 0000000000..420db9503c
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_65_ansi( /* Base */
+    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/novelkeys/nk65b/keymaps/default/readme.md b/keyboards/novelkeys/nk65b/keymaps/default/readme.md
new file mode 100755
index 0000000000..7cf0885d6e
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+# The default keymap for NK65. VIA support disabled.
+
+![Layer 1](https://i.imgur.com/1UwdR5q.png)
+
+![Layer 2](https://i.imgur.com/dRe7dfG.png)
+
+Default layer is normal ANSI 65%
diff --git a/keyboards/novelkeys/nk65b/keymaps/via/keymap.c b/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
new file mode 100755
index 0000000000..39776b421f
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_65_ansi( /* Base */
+    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_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),
+};
diff --git a/keyboards/novelkeys/nk65b/keymaps/via/readme.md b/keyboards/novelkeys/nk65b/keymaps/via/readme.md
new file mode 100755
index 0000000000..14fe08420f
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/keymaps/via/readme.md
@@ -0,0 +1,7 @@
+# The default keymap for NK65. VIA support enabled.
+
+![Layer 1](https://i.imgur.com/1UwdR5q.png)
+
+![Layer 2](https://i.imgur.com/dRe7dfG.png)
+
+Default layer is normal ANSI 65%
diff --git a/keyboards/novelkeys/nk65b/keymaps/via/rules.mk b/keyboards/novelkeys/nk65b/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/novelkeys/nk65b/mcuconf.h b/keyboards/novelkeys/nk65b/mcuconf.h
new file mode 100644
index 0000000000..7cf6a48904
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/novelkeys/nk65b/nk65b.c b/keyboards/novelkeys/nk65b/nk65b.c
new file mode 100755
index 0000000000..f4ed25c2d1
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/nk65b.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nk65b.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(A15, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(B3, PAL_MODE_OUTPUT_OPENDRAIN);
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    writePin(A15, !layer_state_cmp(state, 1));
+    writePin(B3, !layer_state_cmp(state, 2));
+    return layer_state_set_user(state);
+}
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+    {  0,      1,  2,      3,      4,      5,  6,      7,     8,   9, 10, 11, 12,     13, 14 },
+    { 29,     28, 27,     26,     25,     24, 23,     22,     21, 20, 19, 18, 17, NO_LED, 15 },
+    { 30,     31, 32,     33,     34,     35, 36,     37,     38, 39, 40, 41, 42,     16, 43 },
+    { 57, NO_LED, 56,     55,     54,     53, 52,     51,     50, 49, 48, 47, 46,     45, 44 },
+    { 58,     59, 60, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, 61, 62, 63, 64,     65, 66 }
+}, {
+    {  0,0  }, { 15,0  }, { 30,0  }, { 45,0  }, { 60,0  }, { 75,0  }, { 90,0  }, {105,0  }, {120,0  }, {135,0  }, {150,0  }, {165,0  }, {180,0  }, {203,0  }, 
+    {225,0  }, {225,16 }, {206,16 }, {188,16 }, {173,16 }, {158,16 }, {143,16 }, {128,16 }, {113,16 }, { 98,16 }, { 83,16 }, { 68,16 }, { 53,16 }, { 38,16 }, 
+    { 23,16 }, {  4,16 }, {  6,32 }, { 26,32 }, { 41,32 }, { 56,32 }, { 71,32 }, { 86,32 }, {101,32 }, {116,32 }, {131,32 }, {146,32 }, {161,32 }, {176,32 }, 
+    {201,32 }, {225,32 }, {225,48 }, {210,48 }, {189,48 }, {169,48 }, {154,48 }, {139,48 }, {124,48 }, {109,48 }, { 94,48 }, { 79,48 }, { 64,48 }, { 49,48 }, 
+    { 34,48 }, {  9,48 }, {  2,64 }, { 21,64 }, { 39,64 }, { 96,64 }, {150,64 }, {165,64 }, {180,64 }, {195,64 }, {210,64 }, {225,64 }
+}, {
+    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, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1, 1
+} };
+// clang-format on
+#endif
diff --git a/keyboards/novelkeys/nk65b/nk65b.h b/keyboards/novelkeys/nk65b/nk65b.h
new file mode 100755
index 0000000000..9fd75c26ab
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/nk65b.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define XXX KC_NO
+
+#include "quantum.h"
+
+// This a shortcut to help you visually see your layout.
+
+#define LAYOUT_65_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/novelkeys/nk65b/readme.md b/keyboards/novelkeys/nk65b/readme.md
new file mode 100755
index 0000000000..d7cefc93c8
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/readme.md
@@ -0,0 +1,34 @@
+# NK65B
+
+This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB. This is revision B.
+
+![NK65](https://i.imgur.com/EXNbVpL.jpg)
+
+Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+Hardware Supported: A 65% keyboard with STM32F072CB or APM compatible
+Hardware Availability: https://novelkeys.xyz/
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make novelkeys/nk65b:via
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or dfu-util (`make nk65b:<keymap>:flash`)
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
new file mode 100755
index 0000000000..230cc1ec14
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
+RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
+WS2812_DRIVER = pwm         # Per-key RGB MCU Driver

From bc538e37761206885c226d849ec20d1771a5ed43 Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@klaviyo.com>
Date: Tue, 30 Aug 2022 14:29:05 -0400
Subject: [PATCH 276/959] [Keyboard] CannonKeys Malicious Ergo (#17076)

* Add Malicious Ergo keyboard to QMK

* Update layout

* update info.json

* update info.json again

* Update info.json again

* i h8 info.json

* its default not all

* Update keyboards/cannonkeys/malicious_ergo/config.h

* Add bootloader instructions and license header

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Remove rotation from info.json

* Remove labels

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h

* Revise info.json again

* whitespace fix

* Apply suggestions from code review

Move pid/vid into info json
Fix rounding errors in info json

Thanks to fauxpark and noroadsleft!
---
 keyboards/cannonkeys/malicious_ergo/chconf.h  | 31 ++++++
 keyboards/cannonkeys/malicious_ergo/config.h  | 96 +++++++++++++++++++
 keyboards/cannonkeys/malicious_ergo/halconf.h | 31 ++++++
 keyboards/cannonkeys/malicious_ergo/info.json | 16 ++++
 .../malicious_ergo/keymaps/default/keymap.c   | 42 ++++++++
 .../malicious_ergo/keymaps/via/keymap.c       | 60 ++++++++++++
 .../malicious_ergo/keymaps/via/rules.mk       |  1 +
 .../malicious_ergo/malicious_ergo.c           | 16 ++++
 .../malicious_ergo/malicious_ergo.h           | 34 +++++++
 keyboards/cannonkeys/malicious_ergo/mcuconf.h | 33 +++++++
 keyboards/cannonkeys/malicious_ergo/readme.md | 18 ++++
 keyboards/cannonkeys/malicious_ergo/rules.mk  | 25 +++++
 12 files changed, 403 insertions(+)
 create mode 100644 keyboards/cannonkeys/malicious_ergo/chconf.h
 create mode 100644 keyboards/cannonkeys/malicious_ergo/config.h
 create mode 100644 keyboards/cannonkeys/malicious_ergo/halconf.h
 create mode 100644 keyboards/cannonkeys/malicious_ergo/info.json
 create mode 100644 keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/malicious_ergo/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/malicious_ergo/malicious_ergo.c
 create mode 100644 keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
 create mode 100644 keyboards/cannonkeys/malicious_ergo/mcuconf.h
 create mode 100644 keyboards/cannonkeys/malicious_ergo/readme.md
 create mode 100644 keyboards/cannonkeys/malicious_ergo/rules.mk

diff --git a/keyboards/cannonkeys/malicious_ergo/chconf.h b/keyboards/cannonkeys/malicious_ergo/chconf.h
new file mode 100644
index 0000000000..308855ab7a
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/chconf.h
@@ -0,0 +1,31 @@
+/* Copyright 2022 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/alice/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/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
new file mode 100644
index 0000000000..1f9eecf119
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -0,0 +1,96 @@
+#pragma once
+
+/*
+Copyright 2022 Andrew Kannan
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
+#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 }
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN           A6
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
+#define BACKLIGHT_LEVELS 6
+#define BACKLIGHT_BREATHING
+#define BREATHING_PERIOD 6
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGB_DI_PIN B15
+#define RGBLED_NUM 14
+#define WS2812_SPI SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PAL_MODE 0
+#define WS2812_SPI_SCK_PIN B13
+
+// Indicator LEDs
+#define LED_CAPS_LOCK_PIN A8
+#define LED_NUM_LOCK_PIN A9
+#define LED_SCROLL_LOCK_PIN B12
+#define LED_PIN_ON_STATE 0
+
+
+
+// 2 bits for 4 layout options
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+
+#define SLEEP_LED_GPT_DRIVER GPTD1
+
+/*
+ * 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/malicious_ergo/halconf.h b/keyboards/cannonkeys/malicious_ergo/halconf.h
new file mode 100644
index 0000000000..d696c3bd22
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/halconf.h
@@ -0,0 +1,31 @@
+/* Copyright 2022 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/alice/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#define HAL_USE_GPT TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
new file mode 100644
index 0000000000..b6ec458917
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Malicious Ergo",
+    "manufacturer": "CannonKeys",
+    "url": "https://cannonkeys.com",
+    "maintainer": "awkannan",
+    "usb": {
+        "vid": "0xCA04",
+        "pid": "0x0009",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [{"x":0.5, "y":0}, {"x":1.75, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":18, "y":0}, {"x":0.25, "y":1}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5}, {"x":18.25, "y":1}, {"x":0, "y":2}, {"x":1.375, "y":2, "w":1.75}, {"x":3.125, "y":2}, {"x":4.13, "y":2}, {"x":5.13, "y":2}, {"x":6.13, "y":2}, {"x":7.13, "y":2}, {"x":9.88, "y":2}, {"x":10.88, "y":2}, {"x":11.88, "y":2}, {"x":12.88, "y":2}, {"x":13.88, "y":2}, {"x":14.88, "y":2}, {"x":15.88, "y":2, "w":2.25}, {"x":18.5, "y":2}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":14.25, "y":4, "w":1.5}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c b/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e5c58bfc0f
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_default(
+    KC_ESC,  KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_DEL,
+    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
+    KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_END,
+             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+             KC_LCTL,          KC_LALT, KC_SPC,  MO(_FN1),                          KC_SPC,           KC_RALT,          KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+  ),
+
+  [_FN1] = LAYOUT_default(
+    RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL, _______,
+    RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, _______,
+    RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______, _______,
+              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT,   _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c b/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f8d3753f43
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c
@@ -0,0 +1,60 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_default(
+    KC_ESC,  KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_DEL,
+    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
+    KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_END,
+             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+             KC_LCTL,          KC_LALT, KC_SPC,  MO(_FN1),                          KC_SPC,           KC_RALT,          KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+  ),
+
+  [_FN1] = LAYOUT_default(
+    RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL, _______,
+    RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, _______,
+    RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______, _______,
+              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT,   _______, _______, _______
+  ),
+
+  [_FN2] = LAYOUT_default(
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,          _______, _______,
+              _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______,          _______, _______, _______,                            _______,          _______,          _______, _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_default(
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,          _______, _______,
+              _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______,          _______, _______, _______,                            _______,          _______,          _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/via/rules.mk b/keyboards/cannonkeys/malicious_ergo/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c
new file mode 100644
index 0000000000..58e33a3889
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c
@@ -0,0 +1,16 @@
+/* Copyright 2022 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "malicious_ergo.h"
diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
new file mode 100644
index 0000000000..191baf768f
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_default( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,\
+  K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,\
+  K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G,\
+       K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,     \
+       K41,      K43, K44,      K46,           K49,      K4B,      K4D, K4E, K4F, K3G \
+) { \
+  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G  }, \
+  {  K10, K11, K12, K13, K14, K15, K16, ___, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G  }, \
+  {  K20, K21, K22, K23, K24, K25, K26, ___, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, K2G  }, \
+  {  ___, K31, K32, K33, K34, K35, K36, ___, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, ___ }, \
+  {  ___, K41, ___, K43, K44, ___, K46, ___, ___, K49, ___, K4B, ___, K4D, K4E, K4F, K3G  }  \
+}
diff --git a/keyboards/cannonkeys/malicious_ergo/mcuconf.h b/keyboards/cannonkeys/malicious_ergo/mcuconf.h
new file mode 100644
index 0000000000..d1335e0f44
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/mcuconf.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/alice/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
+
+#undef STM32_GPT_USE_TIM1
+#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/cannonkeys/malicious_ergo/readme.md b/keyboards/cannonkeys/malicious_ergo/readme.md
new file mode 100644
index 0000000000..2103fe04db
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/readme.md
@@ -0,0 +1,18 @@
+# CannonKeys Malicious Ergo
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/malicious_ergo:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: 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 `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk
new file mode 100644
index 0000000000..0d99007c16
--- /dev/null
+++ b/keyboards/cannonkeys/malicious_ergo/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+WS2812_DRIVER = spi
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From 6f804f76b4b1ce13245ea061df4bcb081b322f43 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 31 Aug 2022 15:20:00 +1000
Subject: [PATCH 277/959] `qmk lint`: fix TypeError (#18226)

---
 lib/python/qmk/cli/lint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py
index 38b6457c43..6b077c250f 100644
--- a/lib/python/qmk/cli/lint.py
+++ b/lib/python/qmk/cli/lint.py
@@ -87,7 +87,7 @@ def keymap_check(kb, km):
         return ok
 
     # Additional checks
-    invalid_files = git_get_ignored_files(keymap_path.parent)
+    invalid_files = git_get_ignored_files(keymap_path.parent.as_posix())
     for file in invalid_files:
         cli.log.error(f'{kb}/{km}: The file "{file}" should not exist!')
         ok = False

From 0237ff0c62d4278df3c0c93f5f85f84c1a0ed519 Mon Sep 17 00:00:00 2001
From: Marek Kraus <gamelaster@users.noreply.github.com>
Date: Wed, 31 Aug 2022 09:16:07 +0200
Subject: [PATCH 278/959] [Core] Rework PS/2 driver selection (#17892)

* [Core] Rework PS/2 driver selection

Enabling and selecting PS/2 driver was using old approach,
so it was reworked to current approach, inspired by Serial
and WS2812 driver selections.

* [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection

* [Docs] Update PS/2 documentation to use new PS/2 driver selection

* Fix indentation

* [Core] Add PS2 to data driver

* Fix oversight in property name

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add PS/2 pins to data driven mappings

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 builddefs/common_features.mk                  | 34 ++++++++-----------
 builddefs/show_options.mk                     |  2 ++
 data/mappings/info_config.json                |  2 ++
 data/mappings/info_rules.json                 |  3 ++
 data/schemas/keyboard.jsonschema              | 14 ++++++++
 docs/feature_ps2_mouse.md                     | 18 ++++++----
 docs/ja/feature_ps2_mouse.md                  | 16 +++++----
 keyboards/buzzard/rev1/config.h               |  2 +-
 keyboards/buzzard/rev1/rules.mk               |  3 +-
 keyboards/converter/ibm_terminal/config.h     |  6 ++--
 .../ibm_terminal/keymaps/default/rules.mk     |  3 +-
 .../ibm_terminal/keymaps/priyadi/rules.mk     |  7 ++--
 keyboards/converter/ibm_terminal/rules.mk     |  3 +-
 .../evyd13/gh80_3700/keymaps/ps2/config.h     |  4 +--
 .../evyd13/gh80_3700/keymaps/ps2/rules.mk     |  3 +-
 .../handwired/108key_trackpoint/config.h      |  2 +-
 .../handwired/108key_trackpoint/rules.mk      |  3 +-
 keyboards/handwired/promethium/config.h       |  6 ++--
 .../promethium/keymaps/default/rules.mk       |  3 +-
 .../promethium/keymaps/priyadi/rules.mk       |  3 +-
 keyboards/handwired/promethium/rules.mk       |  3 +-
 keyboards/handwired/trackpoint/config.h       |  2 +-
 keyboards/handwired/trackpoint/rules.mk       |  3 +-
 keyboards/kapcave/paladin64/config.h          |  4 +--
 keyboards/pierce/keymaps/durken1/config.h     |  2 +-
 keyboards/pierce/post_rules.mk                |  3 +-
 26 files changed, 93 insertions(+), 61 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index a23b5e82b9..9fa9e18814 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -805,31 +805,25 @@ ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
     OPT_DEFS += -DMOUSE_ENABLE
 endif
 
-ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
-    PS2_ENABLE := yes
-    SRC += ps2_busywait.c
-    SRC += ps2_io.c
-    OPT_DEFS += -DPS2_USE_BUSYWAIT
-endif
-
-ifeq ($(strip $(PS2_USE_INT)), yes)
-    PS2_ENABLE := yes
-    SRC += ps2_interrupt.c
-    SRC += ps2_io.c
-    OPT_DEFS += -DPS2_USE_INT
-endif
-
-ifeq ($(strip $(PS2_USE_USART)), yes)
-    PS2_ENABLE := yes
-    SRC += ps2_usart.c
-    SRC += ps2_io.c
-    OPT_DEFS += -DPS2_USE_USART
-endif
+VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
 
+PS2_DRIVER ?= busywait
 ifeq ($(strip $(PS2_ENABLE)), yes)
+    ifeq ($(filter $(PS2_DRIVER),$(VALID_PS2_DRIVER_TYPES)),)
+        $(call CATASTROPHIC_ERROR,Invalid PS2_DRIVER,PS2_DRIVER="$(PS2_DRIVER)" is not a valid PS/2 driver)
+    endif
+
+    OPT_DEFS += -DPS2_DRIVER_$(strip $(shell echo $(PS2_DRIVER) | tr '[:lower:]' '[:upper:]'))
+
     COMMON_VPATH += $(DRIVER_PATH)/ps2
     COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/ps2
     OPT_DEFS += -DPS2_ENABLE
+
+    ifneq ($(strip $(PS2_DRIVER)), vendor)
+        SRC += ps2_io.c
+    endif
+
+    SRC += ps2_$(strip $(PS2_DRIVER)).c
 endif
 
 JOYSTICK_ENABLE ?= no
diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
index 98537e6da2..8d992c080c 100644
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@@ -66,7 +66,9 @@ OTHER_OPTION_NAMES = \
   KEYLOGGER_ENABLE \
   LCD_BACKLIGHT_ENABLE \
   MACROS_ENABLED \
+  PS2_ENABLE \
   PS2_MOUSE_ENABLE \
+  PS2_DRIVER \
   RAW_ENABLE \
   SWAP_HANDS_ENABLE \
   RING_BUFFERED_6KRO_REPORT_ENABLE \
diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index d0f67f4e3a..cc13a7cea4 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -52,6 +52,8 @@
     "ONESHOT_TAP_TOGGLE": {"info_key": "oneshot.tap_toggle", "value_type": "int"},
     "PERMISSIVE_HOLD": {"info_key": "tapping.permissive_hold", "value_type": "bool"},
     "PERMISSIVE_HOLD_PER_KEY": {"info_key": "tapping.permissive_hold_per_key", "value_type": "bool"},
+    "PS2_CLOCK_PIN": {"info_key": "ps2.clock_pin"},
+    "PS2_DATA_PIN": {"info_key": "ps2.data_pin"},
     "RETRO_TAPPING": {"info_key": "tapping.retro", "value_type": "bool"},
     "RETRO_TAPPING_PER_KEY": {"info_key": "tapping.retro_per_key", "value_type": "bool"},
     "RGB_DI_PIN": {"info_key": "rgblight.pin"},
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index 87a4b795b6..eaeafeda79 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -32,6 +32,9 @@
     "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"},
     "STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"},
     "STENO_PROTOCOL": {"info_key": "stenography.protocol"},
+    "PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
+    "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
+    "PS2_DRIVER": {"info_key": "ps2.driver"},
 
     # Items we want flagged in lint
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index e425d13dd8..d0375fcdc4 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -390,6 +390,20 @@
                 }
             }
         },
+        "ps2": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "enabled": {"type": "boolean"},
+                "mouse_enabled": {"type": "boolean"},
+                "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "driver": {
+                    "type": "string",
+                    "enum": ["busywait", "interrupt", "usart", "vendor"]
+                }
+            }
+        },
         "split": {
             "type": "object",
             "additionalProperties": false,
diff --git a/docs/feature_ps2_mouse.md b/docs/feature_ps2_mouse.md
index c980705ae7..e714d9b867 100644
--- a/docs/feature_ps2_mouse.md
+++ b/docs/feature_ps2_mouse.md
@@ -32,13 +32,14 @@ In rules.mk:
 
 ```make
 PS2_MOUSE_ENABLE = yes
-PS2_USE_BUSYWAIT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = busywait
 ```
 
 In your keyboard config.h:
 
 ```c
-#ifdef PS2_USE_BUSYWAIT
+#ifdef PS2_DRIVER_BUSYWAIT
 #   define PS2_CLOCK_PIN   D1
 #   define PS2_DATA_PIN    D2
 #endif
@@ -52,13 +53,14 @@ In rules.mk:
 
 ```make
 PS2_MOUSE_ENABLE = yes
-PS2_USE_INT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = interrupt
 ```
 
 In your keyboard config.h:
 
 ```c
-#ifdef PS2_USE_INT
+#ifdef PS2_DRIVER_INTERRUPT
 #define PS2_CLOCK_PIN   D2
 #define PS2_DATA_PIN    D5
 
@@ -84,7 +86,8 @@ In rules.mk:
 
 ```
 PS2_MOUSE_ENABLE = yes
-PS2_USE_INT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = interrupt
 ```
 
 In your keyboard config.h:
@@ -108,13 +111,14 @@ In rules.mk:
 
 ```make
 PS2_MOUSE_ENABLE = yes
-PS2_USE_USART = yes
+PS2_ENABLE = yes
+PS2_DRIVER = usart
 ```
 
 In your keyboard config.h:
 
 ```c
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
 
diff --git a/docs/ja/feature_ps2_mouse.md b/docs/ja/feature_ps2_mouse.md
index 569934c187..2798f61283 100644
--- a/docs/ja/feature_ps2_mouse.md
+++ b/docs/ja/feature_ps2_mouse.md
@@ -36,13 +36,14 @@ rules.mk で:
 
 ```makefile
 PS2_MOUSE_ENABLE = yes
-PS2_USE_BUSYWAIT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = busywait
 ```
 
 キーボードの config.h で:
 
 ```c
-#ifdef PS2_USE_BUSYWAIT
+#ifdef PS2_DRIVER_BUSYWAIT
 #   define PS2_CLOCK_PIN   D1
 #   define PS2_DATA_PIN    D2
 #endif
@@ -56,13 +57,14 @@ rules.mk で:
 
 ```makefile
 PS2_MOUSE_ENABLE = yes
-PS2_USE_INT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = interrupt
 ```
 
 キーボードの config.h で:
 
 ```c
-#ifdef PS2_USE_INT
+#ifdef PS2_DRIVER_INTERRUPT
 #define PS2_CLOCK_PIN   D2
 #define PS2_DATA_PIN    D5
 
@@ -88,14 +90,14 @@ rules.mk で:
 
 ```makefile
 PS2_MOUSE_ENABLE = yes
-PS2_USE_USART = yes
+PS2_ENABLE = yes
+PS2_DRIVER = usart
 ```
 
 キーボードの config.h で:
 
 ```c
-#ifdef PS2_USE_USART
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
 
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index 66c1a9a42e..67555ba92c 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -35,7 +35,7 @@
 #define SPLIT_OLED_ENABLE
 #endif
 
-#ifdef PS2_USE_INT
+#ifdef PS2_DRIVER_INTERRUPT
 #define PS2_CLOCK_PIN   E6
 #define PS2_DATA_PIN    D7
 
diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk
index 9a479c64e6..13c63d5b17 100644
--- a/keyboards/buzzard/rev1/rules.mk
+++ b/keyboards/buzzard/rev1/rules.mk
@@ -1,3 +1,4 @@
 OLED_DRIVER = SSD1306
 
-PS2_USE_INT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = interrupt
diff --git a/keyboards/converter/ibm_terminal/config.h b/keyboards/converter/ibm_terminal/config.h
index 9e7d140809..9b44bfa3ea 100644
--- a/keyboards/converter/ibm_terminal/config.h
+++ b/keyboards/converter/ibm_terminal/config.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
  * PS/2 USART configuration for ATMega32U4
  */
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 /* XCK for clock line */
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
@@ -77,7 +77,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
  * PS/2 Interrupt configuration
  */
-#ifdef PS2_USE_INT
+#ifdef PS2_DRIVER_INTERRUPT
 /* uses INT1 for clock line(ATMega32U4) */
 #define PS2_CLOCK_PIN   D1
 #define PS2_DATA_PIN    D0
@@ -99,7 +99,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
  * PS/2 Busywait configuration
  */
-#ifdef PS2_USE_BUSYWAIT
+#ifdef PS2_DRIVER_BUSYWAIT
 #define PS2_CLOCK_PIN   D1
 #define PS2_DATA_PIN    D0
 #endif
diff --git a/keyboards/converter/ibm_terminal/keymaps/default/rules.mk b/keyboards/converter/ibm_terminal/keymaps/default/rules.mk
index e3cb087a76..10f43dc416 100644
--- a/keyboards/converter/ibm_terminal/keymaps/default/rules.mk
+++ b/keyboards/converter/ibm_terminal/keymaps/default/rules.mk
@@ -7,4 +7,5 @@ NKRO_ENABLE = yes
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-PS2_USE_USART = yes
+PS2_ENABLE = yes
+PS2_DRIVER = usart
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk b/keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk
index 8c5f3d7034..b18dc2d4d8 100644
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk
+++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk
@@ -1,5 +1,5 @@
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   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
@@ -14,8 +14,9 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-PS2_USE_USART = yes
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+PS2_ENABLE = yes
+PS2_DRIVER = usart
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk
index 277e828269..6304e20fb4 100644
--- a/keyboards/converter/ibm_terminal/rules.mk
+++ b/keyboards/converter/ibm_terminal/rules.mk
@@ -16,7 +16,8 @@ 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.
-PS2_USE_USART = yes
+PS2_ENABLE = yes
+PS2_DRIVER = usart
 CUSTOM_MATRIX = yes
 
 SRC = matrix.c led.c
diff --git a/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h b/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h
index b77ac95d7d..5f6d855966 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h
+++ b/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
 
@@ -51,7 +51,7 @@
 #define PS2_USART_ERROR         (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
 #define PS2_USART_RX_VECT       USART1_RX_vect
 #define PS2_MOUSE_ENABLE_SCROLLING
-#define PS2_MOUSE_INIT_DELAY 1000 
+#define PS2_MOUSE_INIT_DELAY 1000
 #define PS2_MOUSE_BTN_LEFT      0
 #define PS2_MOUSE_BTN_RIGHT     1
 #define PS2_MOUSE_BTN_MIDDLE    2
diff --git a/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk b/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk
index c58a93b73a..3218145955 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk
+++ b/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk
@@ -2,4 +2,5 @@
 #   change yes to no to disable
 #
 PS2_MOUSE_ENABLE = yes
-PS2_USE_USART = yes
+PS2_ENABLE = yes
+PS2_DRIVER = usart
diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h
index 703cd93e64..fccdf6424c 100644
--- a/keyboards/handwired/108key_trackpoint/config.h
+++ b/keyboards/handwired/108key_trackpoint/config.h
@@ -5,7 +5,7 @@
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 23
 
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
 
diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk
index ab84b088bc..24f1d9b652 100644
--- a/keyboards/handwired/108key_trackpoint/rules.mk
+++ b/keyboards/handwired/108key_trackpoint/rules.mk
@@ -17,4 +17,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 PS2_MOUSE_ENABLE = yes
-PS2_USE_USART = yes
+PS2_ENABLE = yes
+PS2_DRIVER = usart
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index a447a70abd..9ebcc0bf53 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -210,13 +210,13 @@ enum led_sequence {
 #endif
 
 /* PS/2 mouse */
-#ifdef PS2_USE_BUSYWAIT
+#ifdef PS2_DRIVER_BUSYWAIT
 #    define PS2_CLOCK_PIN  D3
 #    define PS2_DATA_PIN   D2
 #endif
 
 /* PS/2 mouse interrupt version */
-#ifdef PS2_USE_INT
+#ifdef PS2_DRIVER_INTERRUPT
 /* uses INT1 for clock line(ATMega32U4) */
 #    define PS2_CLOCK_PIN  D3
 #    define PS2_DATA_PIN   D2
@@ -237,7 +237,7 @@ enum led_sequence {
 #endif
 
 /* PS/2 mouse USART version */
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 /* XCK for clock line and RXD for data line */
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
diff --git a/keyboards/handwired/promethium/keymaps/default/rules.mk b/keyboards/handwired/promethium/keymaps/default/rules.mk
index 0183f5fa91..598ade50b8 100644
--- a/keyboards/handwired/promethium/keymaps/default/rules.mk
+++ b/keyboards/handwired/promethium/keymaps/default/rules.mk
@@ -9,4 +9,5 @@ AUDIO_ENABLE = no           # Audio output
 UNICODEMAP_ENABLE = yes
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 PS2_MOUSE_ENABLE = yes
-PS2_USE_INT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = interrupt
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/rules.mk b/keyboards/handwired/promethium/keymaps/priyadi/rules.mk
index 96db4fcbbc..9db01c0a68 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/rules.mk
+++ b/keyboards/handwired/promethium/keymaps/priyadi/rules.mk
@@ -17,7 +17,8 @@ UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 PS2_MOUSE_ENABLE = yes
-PS2_USE_INT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = interrupt
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index 383800ee01..3960980dff 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -20,7 +20,8 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 PS2_MOUSE_ENABLE = yes
-PS2_USE_INT = yes
+PS2_ENABLE = yes
+PS2_DRIVER = interrupt
 CUSTOM_MATRIX = yes
 BLUETOOTH_ENABLE = yes
 BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/trackpoint/config.h b/keyboards/handwired/trackpoint/config.h
index a4b468faef..ed6b4f2180 100644
--- a/keyboards/handwired/trackpoint/config.h
+++ b/keyboards/handwired/trackpoint/config.h
@@ -5,7 +5,7 @@
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3
 
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
 
diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk
index f471f00dfc..1a452149c9 100644
--- a/keyboards/handwired/trackpoint/rules.mk
+++ b/keyboards/handwired/trackpoint/rules.mk
@@ -17,4 +17,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 PS2_MOUSE_ENABLE = yes
-PS2_USE_USART = yes
+PS2_ENABLE = yes
+PS2_DRIVER = usart
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index 4ab6863c4f..7d913d8f15 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BOOTMAGIC_LITE_COLUMN 6
 
 /* Only required if you add in a trackpoint hardware to the pcb */
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
 
@@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define PS2_USART_RX_VECT       USART1_RX_vect
 #endif
 
-#ifdef PS2_USE_INT
+#ifdef PS2_DRIVER_INTERRUPT
 #define PS2_CLOCK_PIN   D2
 #define PS2_DATA_PIN    D5
 
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
index bc0bb1c4b8..7c9970c5a9 100644
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ b/keyboards/pierce/keymaps/durken1/config.h
@@ -31,7 +31,7 @@
 #define COMBO_COUNT 3
 #define COMBO_TERM 35
 
-#ifdef PS2_USE_USART
+#ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
 
diff --git a/keyboards/pierce/post_rules.mk b/keyboards/pierce/post_rules.mk
index e0360a3391..9cc6739d78 100644
--- a/keyboards/pierce/post_rules.mk
+++ b/keyboards/pierce/post_rules.mk
@@ -1,6 +1,7 @@
 ifeq ($(strip $(TRACKPOINT)), yes)
   PS2_MOUSE_ENABLE = yes
-  PS2_USE_USART = yes
+  PS2_ENABLE = yes
+  PS2_DRIVER = usart
   OPT_DEFS += -DUSART
 endif
 

From bb6f02883363b815de8e2510964787634f86d635 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 1 Sep 2022 00:17:24 +1000
Subject: [PATCH 279/959] Move bootloader.mk to platforms (#18228)

---
 builddefs/build_keyboard.mk                   |   2 +-
 keyboards/handwired/pytest/basic/rules.mk     |   1 -
 .../handwired/pytest/has_community/rules.mk   |   2 -
 .../handwired/pytest/has_template/rules.mk    |   1 -
 keyboards/handwired/pytest/info.json          |   4 +-
 keyboards/handwired/pytest/macro/rules.mk     |   1 -
 lib/python/qmk/info.py                        |   6 -
 lib/python/qmk/keymap.py                      |   2 +-
 platforms/arm_atsam/bootloader.mk             |  46 +++++++
 {builddefs => platforms/avr}/bootloader.mk    |  93 +------------
 platforms/chibios/bootloader.mk               | 122 ++++++++++++++++++
 11 files changed, 180 insertions(+), 100 deletions(-)
 create mode 100644 platforms/arm_atsam/bootloader.mk
 rename {builddefs => platforms/avr}/bootloader.mk (62%)
 create mode 100644 platforms/chibios/bootloader.mk

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index fe95dcaf15..65bc0451f7 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -428,7 +428,6 @@ include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(TMK_PATH)/protocol.mk
 include $(PLATFORM_PATH)/common.mk
-include $(BUILDDEFS_PATH)/bootloader.mk
 
 SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
 SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
@@ -443,6 +442,7 @@ ifneq ($(REQUIRE_PLATFORM_KEY),)
     endif
 endif
 
+-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/bootloader.mk
 include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
 
diff --git a/keyboards/handwired/pytest/basic/rules.mk b/keyboards/handwired/pytest/basic/rules.mk
index 6b42774dbf..e69de29bb2 100644
--- a/keyboards/handwired/pytest/basic/rules.mk
+++ b/keyboards/handwired/pytest/basic/rules.mk
@@ -1 +0,0 @@
-MCU = atmega32u4
diff --git a/keyboards/handwired/pytest/has_community/rules.mk b/keyboards/handwired/pytest/has_community/rules.mk
index 4161649cbc..051634b3a4 100644
--- a/keyboards/handwired/pytest/has_community/rules.mk
+++ b/keyboards/handwired/pytest/has_community/rules.mk
@@ -1,3 +1 @@
-MCU = atmega32u4
-
 LAYOUTS = ortho_1x1
diff --git a/keyboards/handwired/pytest/has_template/rules.mk b/keyboards/handwired/pytest/has_template/rules.mk
index 6b42774dbf..e69de29bb2 100644
--- a/keyboards/handwired/pytest/has_template/rules.mk
+++ b/keyboards/handwired/pytest/has_template/rules.mk
@@ -1 +0,0 @@
-MCU = atmega32u4
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
index 331472762c..2ba7d34d52 100644
--- a/keyboards/handwired/pytest/info.json
+++ b/keyboards/handwired/pytest/info.json
@@ -6,5 +6,7 @@
         "vid": "0xFEED",
         "pid": "0x6465",
         "device_version": "0.0.1"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/handwired/pytest/macro/rules.mk b/keyboards/handwired/pytest/macro/rules.mk
index 6b42774dbf..e69de29bb2 100644
--- a/keyboards/handwired/pytest/macro/rules.mk
+++ b/keyboards/handwired/pytest/macro/rules.mk
@@ -1 +0,0 @@
-MCU = atmega32u4
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index e0a46e7ed1..637a27b764 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -755,9 +755,6 @@ def arm_processor_rules(info_data, rules):
     info_data['processor_type'] = 'arm'
     info_data['protocol'] = 'ChibiOS'
 
-    if 'bootloader' not in info_data:
-        info_data['bootloader'] = 'unknown'
-
     if 'STM32' in info_data['processor']:
         info_data['platform'] = 'STM32'
     elif 'MCU_SERIES' in rules:
@@ -775,9 +772,6 @@ def avr_processor_rules(info_data, rules):
     info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown'
     info_data['protocol'] = 'V-USB' if rules.get('MCU') in VUSB_PROCESSORS else 'LUFA'
 
-    if 'bootloader' not in info_data:
-        info_data['bootloader'] = 'atmel-dfu'
-
     # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk:
     # info_data['protocol'] = 'V-USB' if rules.get('PROTOCOL') == 'VUSB' else 'LUFA'
 
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index f317f4d11e..fc1421962f 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -412,7 +412,7 @@ def list_keymaps(keyboard, c=True, json=True, additional_files=None, fullpath=Fa
     rules = rules_mk(keyboard)
     names = set()
 
-    if rules:
+    if rules is not None:
         keyboards_dir = Path('keyboards')
         kb_path = keyboards_dir / keyboard
 
diff --git a/platforms/arm_atsam/bootloader.mk b/platforms/arm_atsam/bootloader.mk
new file mode 100644
index 0000000000..1ec42edeb6
--- /dev/null
+++ b/platforms/arm_atsam/bootloader.mk
@@ -0,0 +1,46 @@
+# Copyright 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/>.
+
+# If it's possible that multiple bootloaders can be used for one project,
+# you can leave this unset, and the correct size will be selected
+# automatically.
+#
+# Sets the bootloader defined in the keyboard's/keymap's rules.mk
+#
+# Current options for ARM (ATSAM):
+#     md-boot      Atmel SAM-BA (only used by Drop boards)
+#
+# If you need to provide your own implementation, you can set inside `rules.mk`
+# `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
+# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
+# which functions may be overridden.
+
+ifeq ($(strip $(BOOTLOADER)), custom)
+    OPT_DEFS += -DBOOTLOADER_CUSTOM
+    BOOTLOADER_TYPE = custom
+endif
+
+ifeq ($(strip $(BOOTLOADER)), md-boot)
+    OPT_DEFS += -DBOOTLOADER_MD_BOOT
+    BOOTLOADER_TYPE = md_boot
+endif
+
+ifeq ($(strip $(BOOTLOADER_TYPE)),)
+    ifneq ($(strip $(BOOTLOADER)),)
+        $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,Invalid bootloader specified. Please set an appropriate bootloader in your rules.mk or info.json.)
+    else
+        $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate bootloader in your rules.mk or info.json.)
+    endif
+endif
diff --git a/builddefs/bootloader.mk b/platforms/avr/bootloader.mk
similarity index 62%
rename from builddefs/bootloader.mk
rename to platforms/avr/bootloader.mk
index 31004cab98..63fe635d96 100644
--- a/builddefs/bootloader.mk
+++ b/platforms/avr/bootloader.mk
@@ -18,9 +18,8 @@
 # automatically.
 #
 # Sets the bootloader defined in the keyboard's/keymap's rules.mk
-# Current options:
 #
-# AVR:
+# Current options for AVR:
 #     halfkay      PJRC Teensy
 #     caterina     Pro Micro (Sparkfun/generic)
 #     atmel-dfu    Atmel factory DFU
@@ -29,14 +28,6 @@
 #     qmk-hid      QMK HID (LUFA + blinkenlight)
 #     bootloadhid  HIDBootFlash compatible (ATmega32A)
 #     usbasploader USBaspLoader (ATmega328P)
-# ARM:
-#     halfkay      PJRC Teensy
-#     kiibohd      Input:Club Kiibohd bootloader (only used on their boards)
-#     stm32duino   STM32Duino (STM32F103x8)
-#     stm32-dfu    STM32 USB DFU in ROM
-#     apm32-dfu    APM32 USB DFU in ROM
-# RISC-V:
-#     gd32v-dfu    GD32V USB DFU in ROM
 #
 # If you need to provide your own implementation, you can set inside `rules.mk`
 # `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
@@ -50,6 +41,7 @@ ifeq ($(strip $(BOOTLOADER)), custom)
     OPT_DEFS += -DBOOTLOADER_CUSTOM
     BOOTLOADER_TYPE = custom
 endif
+
 ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
     OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
     OPT_DEFS += -DBOOTLOADER_DFU
@@ -105,10 +97,6 @@ ifeq ($(strip $(BOOTLOADER)), halfkay)
     ifeq ($(strip $(MCU)), at90usb1286)
         BOOTLOADER_SIZE = 1024
     endif
-    # Teensy LC, 3.0, 3.1/2, 3.5, 3.6
-    ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK64FX512 MK66FX1M0))
-        FIRMWARE_FORMAT = hex
-    endif
 endif
 ifeq ($(strip $(BOOTLOADER)), caterina)
     OPT_DEFS += -DBOOTLOADER_CATERINA
@@ -147,77 +135,10 @@ ifdef BOOTLOADER_SIZE
     OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
 endif
 
-ifeq ($(strip $(BOOTLOADER)), stm32-dfu)
-    OPT_DEFS += -DBOOTLOADER_STM32_DFU
-    BOOTLOADER_TYPE = stm32_dfu
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
-    DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
-endif
-ifeq ($(strip $(BOOTLOADER)), apm32-dfu)
-    OPT_DEFS += -DBOOTLOADER_APM32_DFU
-    BOOTLOADER_TYPE = stm32_dfu
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS ?= -d 314B:0106 -a 0 -s 0x08000000:leave
-    DFU_SUFFIX_ARGS ?= -v 314B -p 0106
-endif
-ifeq ($(strip $(BOOTLOADER)), gd32v-dfu)
-    OPT_DEFS += -DBOOTLOADER_GD32V_DFU
-    BOOTLOADER_TYPE = gd32v_dfu
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS ?= -d 28E9:0189 -a 0 -s 0x08000000:leave
-    DFU_SUFFIX_ARGS ?= -v 28E9 -p 0189
-endif
-ifeq ($(strip $(BOOTLOADER)), kiibohd)
-    OPT_DEFS += -DBOOTLOADER_KIIBOHD
-    BOOTLOADER_TYPE = kiibohd
-
-    ifeq ($(strip $(MCU_ORIG)), MK20DX128)
-        MCU_LDSCRIPT = MK20DX128BLDR4
-    endif
-    ifeq ($(strip $(MCU_ORIG)), MK20DX256)
-        MCU_LDSCRIPT = MK20DX256BLDR8
-    endif
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS = -d 1C11:B007
-    DFU_SUFFIX_ARGS = -v 1C11 -p B007
-endif
-ifeq ($(strip $(BOOTLOADER)), stm32duino)
-    OPT_DEFS += -DBOOTLOADER_STM32DUINO
-    MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
-    BOARD = STM32_F103_STM32DUINO
-    BOOTLOADER_TYPE = stm32duino
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS = -d 1EAF:0003 -a 2 -R
-    DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-endif
-ifeq ($(strip $(BOOTLOADER)), tinyuf2)
-    OPT_DEFS += -DBOOTLOADER_TINYUF2
-    BOOTLOADER_TYPE = tinyuf2
-    FIRMWARE_FORMAT = uf2
-endif
-ifeq ($(strip $(BOOTLOADER)), rp2040)
-    OPT_DEFS += -DBOOTLOADER_RP2040
-    BOOTLOADER_TYPE = rp2040
-endif
-ifeq ($(strip $(BOOTLOADER)), halfkay)
-    OPT_DEFS += -DBOOTLOADER_HALFKAY
-    BOOTLOADER_TYPE = halfkay
-endif
-ifeq ($(strip $(BOOTLOADER)), md-boot)
-    OPT_DEFS += -DBOOTLOADER_MD_BOOT
-    BOOTLOADER_TYPE = md_boot
-endif
-ifeq ($(strip $(BOOTLOADER)), wb32-dfu)
-    OPT_DEFS += -DBOOTLOADER_WB32_DFU
-    BOOTLOADER_TYPE = wb32_dfu
-endif
-
 ifeq ($(strip $(BOOTLOADER_TYPE)),)
-    $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)
+    ifneq ($(strip $(BOOTLOADER)),)
+        $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,Invalid bootloader specified. Please set an appropriate bootloader in your rules.mk or info.json.)
+    else
+        $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate bootloader in your rules.mk or info.json.)
+    endif
 endif
diff --git a/platforms/chibios/bootloader.mk b/platforms/chibios/bootloader.mk
new file mode 100644
index 0000000000..0568d35321
--- /dev/null
+++ b/platforms/chibios/bootloader.mk
@@ -0,0 +1,122 @@
+# Copyright 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/>.
+
+# If it's possible that multiple bootloaders can be used for one project,
+# you can leave this unset, and the correct size will be selected
+# automatically.
+#
+# Sets the bootloader defined in the keyboard's/keymap's rules.mk
+#
+# Current options for ARM:
+#     halfkay      PJRC Teensy
+#     kiibohd      Input:Club Kiibohd bootloader (only used on their boards)
+#     stm32duino   STM32Duino (STM32F103x8)
+#     stm32-dfu    STM32 USB DFU in ROM
+#     apm32-dfu    APM32 USB DFU in ROM
+#     wb32-dfu     WB32 USB DFU in ROM
+#     tinyuf2      TinyUF2
+#     rp2040       Raspberry Pi RP2040
+# Current options for RISC-V:
+#     gd32v-dfu    GD32V USB DFU in ROM
+#
+# If you need to provide your own implementation, you can set inside `rules.mk`
+# `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
+# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
+# which functions may be overridden.
+
+ifeq ($(strip $(BOOTLOADER)), custom)
+    OPT_DEFS += -DBOOTLOADER_CUSTOM
+    BOOTLOADER_TYPE = custom
+endif
+
+ifeq ($(strip $(BOOTLOADER)), halfkay)
+    OPT_DEFS += -DBOOTLOADER_HALFKAY
+    BOOTLOADER_TYPE = halfkay
+
+    # Teensy LC, 3.0, 3.1/2, 3.5, 3.6
+    ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK64FX512 MK66FX1M0))
+        FIRMWARE_FORMAT = hex
+    endif
+endif
+ifeq ($(strip $(BOOTLOADER)), stm32-dfu)
+    OPT_DEFS += -DBOOTLOADER_STM32_DFU
+    BOOTLOADER_TYPE = stm32_dfu
+
+    # Options to pass to dfu-util when flashing
+    DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
+    DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
+endif
+ifeq ($(strip $(BOOTLOADER)), apm32-dfu)
+    OPT_DEFS += -DBOOTLOADER_APM32_DFU
+    BOOTLOADER_TYPE = stm32_dfu
+
+    # Options to pass to dfu-util when flashing
+    DFU_ARGS ?= -d 314B:0106 -a 0 -s 0x08000000:leave
+    DFU_SUFFIX_ARGS ?= -v 314B -p 0106
+endif
+ifeq ($(strip $(BOOTLOADER)), gd32v-dfu)
+    OPT_DEFS += -DBOOTLOADER_GD32V_DFU
+    BOOTLOADER_TYPE = gd32v_dfu
+
+    # Options to pass to dfu-util when flashing
+    DFU_ARGS ?= -d 28E9:0189 -a 0 -s 0x08000000:leave
+    DFU_SUFFIX_ARGS ?= -v 28E9 -p 0189
+endif
+ifeq ($(strip $(BOOTLOADER)), kiibohd)
+    OPT_DEFS += -DBOOTLOADER_KIIBOHD
+    BOOTLOADER_TYPE = kiibohd
+
+    ifeq ($(strip $(MCU_ORIG)), MK20DX128)
+        MCU_LDSCRIPT = MK20DX128BLDR4
+    endif
+    ifeq ($(strip $(MCU_ORIG)), MK20DX256)
+        MCU_LDSCRIPT = MK20DX256BLDR8
+    endif
+
+    # Options to pass to dfu-util when flashing
+    DFU_ARGS = -d 1C11:B007
+    DFU_SUFFIX_ARGS = -v 1C11 -p B007
+endif
+ifeq ($(strip $(BOOTLOADER)), stm32duino)
+    OPT_DEFS += -DBOOTLOADER_STM32DUINO
+    MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
+    BOARD = STM32_F103_STM32DUINO
+    BOOTLOADER_TYPE = stm32duino
+
+    # Options to pass to dfu-util when flashing
+    DFU_ARGS = -d 1EAF:0003 -a 2 -R
+    DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+endif
+ifeq ($(strip $(BOOTLOADER)), tinyuf2)
+    OPT_DEFS += -DBOOTLOADER_TINYUF2
+    BOOTLOADER_TYPE = tinyuf2
+    FIRMWARE_FORMAT = uf2
+endif
+ifeq ($(strip $(BOOTLOADER)), rp2040)
+    OPT_DEFS += -DBOOTLOADER_RP2040
+    BOOTLOADER_TYPE = rp2040
+endif
+ifeq ($(strip $(BOOTLOADER)), wb32-dfu)
+    OPT_DEFS += -DBOOTLOADER_WB32_DFU
+    BOOTLOADER_TYPE = wb32_dfu
+endif
+
+ifeq ($(strip $(BOOTLOADER_TYPE)),)
+    ifneq ($(strip $(BOOTLOADER)),)
+        $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,Invalid bootloader specified. Please set an appropriate bootloader in your rules.mk or info.json.)
+    else
+        $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate bootloader in your rules.mk or info.json.)
+    endif
+endif

From 50c4ca3426f555310441268275c635929eaef3a0 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 1 Sep 2022 02:36:41 +1000
Subject: [PATCH 280/959] Ensure all keyboards have a bootloader set (#18234)

---
 keyboards/clueboard/17/info.json                          | 1 +
 keyboards/clueboard/66/rev1/info.json                     | 1 +
 keyboards/clueboard/66/rev2/info.json                     | 1 +
 keyboards/clueboard/66/rev3/info.json                     | 1 +
 keyboards/clueboard/66_hotswap/prototype/info.json        | 1 +
 keyboards/clueboard/card/info.json                        | 1 +
 keyboards/handwired/3dortho14u/rev1/info.json             | 1 +
 keyboards/handwired/3dortho14u/rev2/info.json             | 1 +
 keyboards/handwired/dactyl_manuform/4x5_5/rules.mk        | 2 +-
 keyboards/handwired/dactyl_manuform/dmote/62key/info.json | 2 ++
 keyboards/handwired/hillside/46/info.json                 | 1 +
 keyboards/handwired/hillside/48/info.json                 | 1 +
 keyboards/handwired/hillside/52/info.json                 | 1 +
 keyboards/handwired/wakizashi40/info.json                 | 1 +
 keyboards/lfkeyboards/lfk65_hs/rules.mk                   | 5 +----
 15 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index 5ea4937e50..5d87806703 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -4,6 +4,7 @@
   "maintainer": "skullydazed",
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "features": {
     "backlight": true,
     "bootmagic": false,
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json
index bc3e1e23b6..76aa685768 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -3,6 +3,7 @@
   "keyboard_name": "Clueboard 66%",
   "maintainer": "skullydazed",
   "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "debounce": 5,
   "diode_direction": "COL2ROW",
   "features": {
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index 0cfb690388..7ee7a88df0 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -3,6 +3,7 @@
   "keyboard_name": "Clueboard 66%",
   "maintainer": "skullydazed",
   "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "debounce": 5,
   "diode_direction": "COL2ROW",
   "features": {
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json
index 208bc22dd1..0dc0097a52 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -3,6 +3,7 @@
   "keyboard_name": "Clueboard 66% rev3",
   "maintainer": "skullydazed",
   "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "debounce": 5,
   "diode_direction": "COL2ROW",
   "features": {
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index 4940af8439..21db54513f 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -5,6 +5,7 @@
   "debounce": 5,
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "features": {
     "audio": true,
     "backlight": true,
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index aaeda61b94..739d253971 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -4,6 +4,7 @@
   "maintainer": "skullydazed",
   "debounce": 20,
   "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "diode_direction": "ROW2COL",
   "features": {
     "audio": true,
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json
index bd9220281c..2c8e229c02 100644
--- a/keyboards/handwired/3dortho14u/rev1/info.json
+++ b/keyboards/handwired/3dortho14u/rev1/info.json
@@ -4,6 +4,7 @@
     "url": "",
     "maintainer": "xia0",
     "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "debounce": 5,
     "diode_direction": "COL2ROW",
     "features": {
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json
index 7f241f35ff..28986f295e 100644
--- a/keyboards/handwired/3dortho14u/rev2/info.json
+++ b/keyboards/handwired/3dortho14u/rev2/info.json
@@ -4,6 +4,7 @@
     "url": "",
     "maintainer": "xia0",
     "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "debounce": 5,
     "diode_direction": "COL2ROW",
     "features": {
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
index fec29f5419..3da6aa269a 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
@@ -3,7 +3,7 @@
 MCU = atmega32u4
 
 # BOOTLOADER for Elite-C
-# BOOTLOADER = atmel-dfu
+BOOTLOADER = atmel-dfu
 # BOOTLOADER for Pro Micro
 # BOOTLOADER = caterina
 
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index 7860fe6c6a..7f15634131 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -3,6 +3,8 @@
     "manufacturer": "tshort",
     "url": "",
     "maintainer": "veikman",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "usb": {
         "vid": "0x444D",
         "pid": "0x3632",
diff --git a/keyboards/handwired/hillside/46/info.json b/keyboards/handwired/hillside/46/info.json
index 538da4e7c0..93e21aea82 100644
--- a/keyboards/handwired/hillside/46/info.json
+++ b/keyboards/handwired/hillside/46/info.json
@@ -8,6 +8,7 @@
     "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
 
     "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
 
     "matrix_pins": {
         "rows": ["C6", "D7", "E6", "B5"],
diff --git a/keyboards/handwired/hillside/48/info.json b/keyboards/handwired/hillside/48/info.json
index 2325c2d8d3..1b6d5a6828 100644
--- a/keyboards/handwired/hillside/48/info.json
+++ b/keyboards/handwired/hillside/48/info.json
@@ -8,6 +8,7 @@
     "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
 
     "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
 
     "matrix_pins": {
         "rows": ["D7", "E6", "B4", "B5"],
diff --git a/keyboards/handwired/hillside/52/info.json b/keyboards/handwired/hillside/52/info.json
index 407d76a548..9e6103dc53 100644
--- a/keyboards/handwired/hillside/52/info.json
+++ b/keyboards/handwired/hillside/52/info.json
@@ -8,6 +8,7 @@
     "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
 
     "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
 
     "matrix_pins": {
         "rows": ["C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json
index b97d61171b..12a17643a8 100644
--- a/keyboards/handwired/wakizashi40/info.json
+++ b/keyboards/handwired/wakizashi40/info.json
@@ -4,6 +4,7 @@
   "maintainer": "xia0",
   "debounce": 5,
   "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": false,
diff --git a/keyboards/lfkeyboards/lfk65_hs/rules.mk b/keyboards/lfkeyboards/lfk65_hs/rules.mk
index bfae80e0c7..618c502e06 100644
--- a/keyboards/lfkeyboards/lfk65_hs/rules.mk
+++ b/keyboards/lfkeyboards/lfk65_hs/rules.mk
@@ -1,8 +1,5 @@
 MCU = atmega32u4
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-FLASH_SIZE_KB = 32
-BOOT_SECTION_SIZE_KB = 4
-BOOT_LOADER = BootloaderHID
+BOOTLOADER = atmel-dfu
 
 # Extra source files for IS3731 lighting
 SRC = TWIlib.c issi.c lighting.c

From de0d342b82dee8abff84957843253fc5acd7101a Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Thu, 1 Sep 2022 00:41:14 +0800
Subject: [PATCH 281/959] [Keyboard] add tg67 (#18225)

---
 keyboards/yandrstudio/tg67/board.h            |  21 +
 keyboards/yandrstudio/tg67/config.h           | 101 +++++
 keyboards/yandrstudio/tg67/halconf.h          |  23 ++
 keyboards/yandrstudio/tg67/info.json          | 362 ++++++++++++++++++
 .../yandrstudio/tg67/keymaps/default/keymap.c |  31 ++
 .../yandrstudio/tg67/keymaps/via/keymap.c     |  43 +++
 .../yandrstudio/tg67/keymaps/via/rules.mk     |   1 +
 keyboards/yandrstudio/tg67/mcuconf.h          |  25 ++
 keyboards/yandrstudio/tg67/readme.md          |  22 ++
 keyboards/yandrstudio/tg67/rules.mk           |  18 +
 keyboards/yandrstudio/tg67/tg67.c             |  46 +++
 keyboards/yandrstudio/tg67/tg67.h             |  33 ++
 12 files changed, 726 insertions(+)
 create mode 100644 keyboards/yandrstudio/tg67/board.h
 create mode 100644 keyboards/yandrstudio/tg67/config.h
 create mode 100644 keyboards/yandrstudio/tg67/halconf.h
 create mode 100644 keyboards/yandrstudio/tg67/info.json
 create mode 100644 keyboards/yandrstudio/tg67/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/tg67/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/tg67/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/tg67/mcuconf.h
 create mode 100644 keyboards/yandrstudio/tg67/readme.md
 create mode 100644 keyboards/yandrstudio/tg67/rules.mk
 create mode 100644 keyboards/yandrstudio/tg67/tg67.c
 create mode 100644 keyboards/yandrstudio/tg67/tg67.h

diff --git a/keyboards/yandrstudio/tg67/board.h b/keyboards/yandrstudio/tg67/board.h
new file mode 100644
index 0000000000..d83804babd
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
new file mode 100644
index 0000000000..729375f987
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -0,0 +1,101 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_COL_PINS {  B2,  B10, B11, A8,  A9,  A10, B5,  A15, B3,  A2,  A3,  B4,  A4,  A5,  A6 }
+#define MATRIX_ROW_PINS {  B0,  B6,  B1,  B7,  A1 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* RGB Matrix */
+#ifdef RGB_MATRIX_ENABLE
+
+#    define RGB_DI_PIN A7
+#    define RGBLED_NUM 69
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250
+#    define RGBLIGHT_VAL_STEP 5
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_CENTER { 112, 32 }
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGBLIGHT_ANIMATIONS
+
+#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#   define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#   define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#   define ENABLE_RGB_MATRIX_BREATHING
+#   define ENABLE_RGB_MATRIX_BAND_SAT
+#   define ENABLE_RGB_MATRIX_BAND_VAL
+#   define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#   define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#   define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#   define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#   define ENABLE_RGB_MATRIX_CYCLE_ALL
+#   define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#   define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#   define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#   define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#   define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#   define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#   define ENABLE_RGB_MATRIX_DUAL_BEACON
+#   define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#   define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#   define ENABLE_RGB_MATRIX_RAINDROPS
+#   define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#   define ENABLE_RGB_MATRIX_HUE_BREATHING
+#   define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#   define ENABLE_RGB_MATRIX_HUE_WAVE
+#   define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#   define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#   define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#   define ENABLE_RGB_MATRIX_SPLASH
+#   define ENABLE_RGB_MATRIX_MULTISPLASH
+#   define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#   define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+
+#   define WS2812_PWM_DRIVER PWMD3
+#   define WS2812_PWM_CHANNEL 2
+#   define WS2812_PWM_PAL_MODE 2
+#   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#   define WS2812_DMA_CHANNEL 3
+
+#endif
diff --git a/keyboards/yandrstudio/tg67/halconf.h b/keyboards/yandrstudio/tg67/halconf.h
new file mode 100644
index 0000000000..1f5f3e7009
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM    TRUE
+
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
new file mode 100644
index 0000000000..d48809128f
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -0,0 +1,362 @@
+{
+    "keyboard_name": "tg67",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA8D",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "~",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "!",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "@",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "#",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "$",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "%",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "^",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "&",
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "label": "*",
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "label": "(",
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "label": ")",
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "label": "_",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "Backspace",
+                    "x": 13,
+                    "y": 0,
+                    "w": 2
+                },
+                {
+                    "label": "Home",
+                    "x": 15,
+                    "y": 0
+                },
+                {
+                    "label": "Tab",
+                    "x": 0,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "Q",
+                    "x": 1.5,
+                    "y": 1
+                },
+                {
+                    "label": "W",
+                    "x": 2.5,
+                    "y": 1
+                },
+                {
+                    "label": "E",
+                    "x": 3.5,
+                    "y": 1
+                },
+                {
+                    "label": "R",
+                    "x": 4.5,
+                    "y": 1
+                },
+                {
+                    "label": "T",
+                    "x": 5.5,
+                    "y": 1
+                },
+                {
+                    "label": "Y",
+                    "x": 6.5,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 7.5,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 8.5,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 9.5,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 10.5,
+                    "y": 1
+                },
+                {
+                    "label": "{",
+                    "x": 11.5,
+                    "y": 1
+                },
+                {
+                    "label": "}",
+                    "x": 12.5,
+                    "y": 1
+                },
+                {
+                    "label": "|",
+                    "x": 13.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "End",
+                    "x": 15,
+                    "y": 1
+                },
+                {
+                    "label": "Caps Lock",
+                    "x": 0,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "label": "A",
+                    "x": 1.75,
+                    "y": 2
+                },
+                {
+                    "label": "S",
+                    "x": 2.75,
+                    "y": 2
+                },
+                {
+                    "label": "D",
+                    "x": 3.75,
+                    "y": 2
+                },
+                {
+                    "label": "F",
+                    "x": 4.75,
+                    "y": 2
+                },
+                {
+                    "label": "G",
+                    "x": 5.75,
+                    "y": 2
+                },
+                {
+                    "label": "H",
+                    "x": 6.75,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 7.75,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 8.75,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 9.75,
+                    "y": 2
+                },
+                {
+                    "label": ":",
+                    "x": 10.75,
+                    "y": 2
+                },
+                {
+                    "label": "\"",
+                    "x": 11.75,
+                    "y": 2
+                },
+                {
+                    "label": "Enter",
+                    "x": 12.75,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "label": "PgUp",
+                    "x": 15,
+                    "y": 2
+                },
+                {
+                    "label": "Shift",
+                    "x": 0,
+                    "y": 3,
+                    "w": 2.25
+                },
+                {
+                    "label": "Z",
+                    "x": 2.25,
+                    "y": 3
+                },
+                {
+                    "label": "X",
+                    "x": 3.25,
+                    "y": 3
+                },
+                {
+                    "label": "C",
+                    "x": 4.25,
+                    "y": 3
+                },
+                {
+                    "label": "V",
+                    "x": 5.25,
+                    "y": 3
+                },
+                {
+                    "label": "B",
+                    "x": 6.25,
+                    "y": 3
+                },
+                {
+                    "label": "N",
+                    "x": 7.25,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 8.25,
+                    "y": 3
+                },
+                {
+                    "label": "<",
+                    "x": 9.25,
+                    "y": 3
+                },
+                {
+                    "label": ">",
+                    "x": 10.25,
+                    "y": 3
+                },
+                {
+                    "label": "?",
+                    "x": 11.25,
+                    "y": 3
+                },
+                {
+                    "label": "Shift",
+                    "x": 12.25,
+                    "y": 3,
+                    "w": 1.75
+                },
+                {
+                    "label": "\u2191",
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "PgDn",
+                    "x": 15,
+                    "y": 3
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 0,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 1.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 2.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 4,
+                    "w": 6.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 10,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Fn",
+                    "x": 11.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "\u2190",
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "\u2193",
+                    "x": 14,
+                    "y": 4
+                },
+                {
+                    "label": "\u2192",
+                    "x": 15,
+                    "y": 4
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/tg67/keymaps/default/keymap.c b/keyboards/yandrstudio/tg67/keymaps/default/keymap.c
new file mode 100644
index 0000000000..17e31d90c5
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#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_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+    [1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/tg67/keymaps/via/keymap.c b/keyboards/yandrstudio/tg67/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d955a72114
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#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_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+    [1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/tg67/keymaps/via/rules.mk b/keyboards/yandrstudio/tg67/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/tg67/mcuconf.h b/keyboards/yandrstudio/tg67/mcuconf.h
new file mode 100644
index 0000000000..3ec9c20128
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef  STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/tg67/readme.md b/keyboards/yandrstudio/tg67/readme.md
new file mode 100644
index 0000000000..7dabbc13d4
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/readme.md
@@ -0,0 +1,22 @@
+# tg67
+
+![tg67](https://imgur.com/gKRrQLkh.png)
+A 65% keyboard with RGBs.
+This keyboard use 16mhz HSE and APM32F103 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: tg67
+- Hardware Availability: https://kineticlabs.com/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/tg67:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/tg67/rules.mk b/keyboards/yandrstudio/tg67/rules.mk
new file mode 100644
index 0000000000..4f60885efd
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/rules.mk
@@ -0,0 +1,18 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB Matrix
+RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
+WS2812_DRIVER = pwm         # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/tg67/tg67.c b/keyboards/yandrstudio/tg67/tg67.c
new file mode 100644
index 0000000000..b1f3907a22
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/tg67.c
@@ -0,0 +1,46 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "tg67.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+led_config_t g_led_config = {
+    {
+        {54,  55,  56,  57,  58,  59,  60,  61,  62,  63,  64,  65,  66,  67,  68},
+        {53,  52,  51,  50,  49,  48,  47,  46,  45,  44,  43,  42,  41,  40,  39},
+        {25,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,   NO_LED,  37,  38},
+        {24,  23,  22,  21,  20,  19,  18,  17,  16,  15,  14,   NO_LED,  13,  12,  11},
+        {0,  1,  2,  NO_LED,   NO_LED,  4,   NO_LED,  NO_LED,   NO_LED,  6,  7,   NO_LED,  8,  9,  10}
+    },
+    {
+        {0,64},{16,64},{32,64},{48,64},       {80,64},       {112,64},       {144,64},{160,64},       {192,64},{208,64},{224,64},
+        {224,48},{208,48},{192,48},       {160,48},{144,48},{128,48},{112,48},{96,48},{80,48},{64,48},{48,48},{32,48},{16,48},{0,48},
+        {0,32},{16,32},{32,32},{48,32},{64,32},{80,32},{96,32},{112,32},{128,32},{144,32},{160,32},{176,32},       {208,32},{224,32},
+        {224,16},{208,16},{192,16},{176,16},{160,16},{144,16},{128,16},{112,16},{96,16},{80,16},{64,16},{48,16},{32,16},{16,16},{0,16},
+        {0,0},{16,0},{32,0},{48,0},{64,0},{80,0},{96,0},{112,0},{128,0},{144,0},{160,0},{176,0},{192,0},{208,0},{224,0}
+    },
+    {
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4
+    }
+};
+
+#endif
diff --git a/keyboards/yandrstudio/tg67/tg67.h b/keyboards/yandrstudio/tg67/tg67.h
new file mode 100644
index 0000000000..efb7d68059
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/tg67.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, K314, \
+	K400, K401, K402,             K405,                   K409, K410,       K412, K413, K414  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO, K312,  K313,  K314 }, \
+	{ K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  K413,  K414 }  \
+}
+

From 0faedb11cc1cc6629bb55172c818fc633eb8559c Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 31 Aug 2022 09:44:00 -0700
Subject: [PATCH 282/959] [Keyboard] Updates to Work Louder keyboards (#18232)

by Drashna
---
 keyboards/work_louder/loop/config.h           |   1 -
 keyboards/work_louder/loop/info.json          |   3 +-
 keyboards/work_louder/loop/rev1/config.h      |   6 +
 keyboards/work_louder/loop/rev1/info.json     |   5 +
 keyboards/work_louder/loop/rev1/rules.mk      |   0
 keyboards/work_louder/loop/rev3/config.h      |   6 +
 keyboards/work_louder/loop/rev3/info.json     |   5 +
 keyboards/work_louder/loop/rev3/rules.mk      |   0
 keyboards/work_louder/loop/rules.mk           |   2 +
 .../work_louder/nano/keymaps/via/keymap.c     |  10 +-
 keyboards/work_louder/work_board/config.h     |   1 -
 keyboards/work_louder/work_board/info.json    |   3 +-
 .../work_board/keymaps/default/keymap.c       | 164 +++---------------
 .../work_board/keymaps/via/keymap.c           |   4 +-
 .../work_louder/work_board/rev1/config.h      |   6 +
 .../work_louder/work_board/rev1/info.json     |   5 +
 .../work_louder/work_board/rev1/rules.mk      |   0
 .../work_louder/work_board/rev3/config.h      |   6 +
 .../work_louder/work_board/rev3/info.json     |   5 +
 .../work_louder/work_board/rev3/rules.mk      |   0
 keyboards/work_louder/work_board/rules.mk     |   2 +
 21 files changed, 81 insertions(+), 153 deletions(-)
 create mode 100644 keyboards/work_louder/loop/rev1/config.h
 create mode 100644 keyboards/work_louder/loop/rev1/info.json
 create mode 100644 keyboards/work_louder/loop/rev1/rules.mk
 create mode 100644 keyboards/work_louder/loop/rev3/config.h
 create mode 100644 keyboards/work_louder/loop/rev3/info.json
 create mode 100644 keyboards/work_louder/loop/rev3/rules.mk
 create mode 100644 keyboards/work_louder/work_board/rev1/config.h
 create mode 100644 keyboards/work_louder/work_board/rev1/info.json
 create mode 100644 keyboards/work_louder/work_board/rev1/rules.mk
 create mode 100644 keyboards/work_louder/work_board/rev3/config.h
 create mode 100644 keyboards/work_louder/work_board/rev3/info.json
 create mode 100644 keyboards/work_louder/work_board/rev3/rules.mk

diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 057be6df34..32856ecebf 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -52,7 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BACKLIGHT_BREATHING
 
 #define RGBLIGHT_DI_PIN E6
-#    define RGBLED_NUM 24
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
 //#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index f83124a32d..67b9d1f06d 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -5,8 +5,7 @@
     "maintainer": "Work Louder",
     "usb": {
         "vid": "0x574C",
-        "pid": "0x1DF9",
-        "device_version": "0.0.1"
+        "pid": "0x1DF9"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/work_louder/loop/rev1/config.h b/keyboards/work_louder/loop/rev1/config.h
new file mode 100644
index 0000000000..1bc02d08a6
--- /dev/null
+++ b/keyboards/work_louder/loop/rev1/config.h
@@ -0,0 +1,6 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#    define RGBLED_NUM 24
diff --git a/keyboards/work_louder/loop/rev1/info.json b/keyboards/work_louder/loop/rev1/info.json
new file mode 100644
index 0000000000..90ac25f360
--- /dev/null
+++ b/keyboards/work_louder/loop/rev1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/work_louder/loop/rev1/rules.mk b/keyboards/work_louder/loop/rev1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/work_louder/loop/rev3/config.h b/keyboards/work_louder/loop/rev3/config.h
new file mode 100644
index 0000000000..5451d4466e
--- /dev/null
+++ b/keyboards/work_louder/loop/rev3/config.h
@@ -0,0 +1,6 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLED_NUM 11
diff --git a/keyboards/work_louder/loop/rev3/info.json b/keyboards/work_louder/loop/rev3/info.json
new file mode 100644
index 0000000000..b377cdff00
--- /dev/null
+++ b/keyboards/work_louder/loop/rev3/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    }
+}
diff --git a/keyboards/work_louder/loop/rev3/rules.mk b/keyboards/work_louder/loop/rev3/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
index 6414533ce0..ac0a513785 100644
--- a/keyboards/work_louder/loop/rules.mk
+++ b/keyboards/work_louder/loop/rules.mk
@@ -24,3 +24,5 @@ RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
 SRC += rgb_functions.c
+
+DEFAULT_FOLDER = work_louder/loop/rev3
diff --git a/keyboards/work_louder/nano/keymaps/via/keymap.c b/keyboards/work_louder/nano/keymaps/via/keymap.c
index 612e8c8c03..84c5895d5e 100644
--- a/keyboards/work_louder/nano/keymaps/via/keymap.c
+++ b/keyboards/work_louder/nano/keymaps/via/keymap.c
@@ -18,10 +18,10 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT(
-        KC_PSCR, MACRO00, MO(1)
+        TG(1),   C(KC_C), C(KC_V)
     ),
     [1] = LAYOUT(
-        QK_BOOT,   MACRO01, _______
+        TG(1)  , G(KC_C), G(KC_V)
     ),
     [2] = LAYOUT(
         _______, _______, _______
@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [0] = { ENCODER_CCW_CW(KC_PGDN, KC_PGDN) },
-    [1] = { ENCODER_CCW_CW(_______, _______) },
+    [0] = { ENCODER_CCW_CW(C(KC_Z), C(KC_Y)) },
+    [1] = { ENCODER_CCW_CW(G(KC_Z), G(S(KC_Z))) },
     [2] = { ENCODER_CCW_CW(_______, _______) },
-    [3] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) }
 };
 #endif
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 9b507f56ca..512c282794 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION        COL2ROW
 
 #define RGBLIGHT_DI_PIN        D2
-#define RGBLED_NUM             26
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
 //#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index cfb6e92810..570e5c21db 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -5,8 +5,7 @@
     "maintainer": "Work Louder",
     "usb": {
       "vid": "0x574C",
-      "pid": "0xDCD1",
-      "device_version": "0.0.1"
+      "pid": "0xDCD1"
     },
     "layouts": {
         "LAYOUT_2u_space": {
diff --git a/keyboards/work_louder/work_board/keymaps/default/keymap.c b/keyboards/work_louder/work_board/keymaps/default/keymap.c
index cae65ff5c2..3489274fea 100644
--- a/keyboards/work_louder/work_board/keymaps/default/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/default/keymap.c
@@ -18,19 +18,11 @@
 
 enum planck_layers {
   _QWERTY,
-  _COLEMAK,
-  _DVORAK,
   _LOWER,
   _RAISE,
   _ADJUST
 };
 
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-};
-
 enum tap_dances {
     ENC_TAP,
 };
@@ -39,117 +31,33 @@ enum tap_dances {
 #define RAISE MO(_RAISE)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, TD(ENC_TAP),
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+        MO(3),   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, TD(ENC_TAP),
-    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_LSFT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
+    [_LOWER] = LAYOUT(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_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
+    ),
 
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   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(
-    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, _______,
-    KC_TAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | 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, _______,
-    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,    KC_ENT ,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-    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(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, _______,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , _______,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
-)
+    [_RAISE] = LAYOUT(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, _______,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
 
+    [_ADJUST] = LAYOUT(
+        _______, QK_BOOT,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , R_M_TOG,
+        _______, _______, MU_MOD,  R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
 };
 
 
@@ -181,27 +89,3 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 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;
-  }
-  return true;
-}
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index e68babc1a0..999ffd9019 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -35,8 +35,8 @@ 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, USER09,
         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_LSFT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+        MO(3),   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LOWER] = LAYOUT(
diff --git a/keyboards/work_louder/work_board/rev1/config.h b/keyboards/work_louder/work_board/rev1/config.h
new file mode 100644
index 0000000000..b7d85d490d
--- /dev/null
+++ b/keyboards/work_louder/work_board/rev1/config.h
@@ -0,0 +1,6 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#    define RGBLED_NUM 26
diff --git a/keyboards/work_louder/work_board/rev1/info.json b/keyboards/work_louder/work_board/rev1/info.json
new file mode 100644
index 0000000000..90ac25f360
--- /dev/null
+++ b/keyboards/work_louder/work_board/rev1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/work_louder/work_board/rev1/rules.mk b/keyboards/work_louder/work_board/rev1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/work_louder/work_board/rev3/config.h b/keyboards/work_louder/work_board/rev3/config.h
new file mode 100644
index 0000000000..8e3cd8bce8
--- /dev/null
+++ b/keyboards/work_louder/work_board/rev3/config.h
@@ -0,0 +1,6 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLED_NUM 19
diff --git a/keyboards/work_louder/work_board/rev3/info.json b/keyboards/work_louder/work_board/rev3/info.json
new file mode 100644
index 0000000000..b377cdff00
--- /dev/null
+++ b/keyboards/work_louder/work_board/rev3/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    }
+}
diff --git a/keyboards/work_louder/work_board/rev3/rules.mk b/keyboards/work_louder/work_board/rev3/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
index ddbd9618d0..b89d0adf1e 100644
--- a/keyboards/work_louder/work_board/rules.mk
+++ b/keyboards/work_louder/work_board/rules.mk
@@ -23,3 +23,5 @@ RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 
 SRC += rgb_functions.c
+
+DEFAULT_FOLDER = work_louder/work_board/rev3

From 786b5d310d864c594ad3cd7b3e351f68ff515b9e Mon Sep 17 00:00:00 2001
From: 3araht <69518343+3araht@users.noreply.github.com>
Date: Thu, 1 Sep 2022 02:17:54 +0900
Subject: [PATCH 283/959] Bandominedoni encoder fix (#18229)

by 3araht
---
 keyboards/bandominedoni/bandominedoni.c       | 52 -------------------
 keyboards/bandominedoni/bandominedoni.h       |  7 +--
 keyboards/bandominedoni/config.h              | 10 ++--
 keyboards/bandominedoni/info.json             |  3 --
 .../bandominedoni/keymaps/default/keymap.c    | 14 +++--
 .../bandominedoni/keymaps/default/rules.mk    |  1 +
 keyboards/bandominedoni/keymaps/led/keymap.c  | 23 +++++---
 keyboards/bandominedoni/keymaps/led/rules.mk  |  2 +
 .../bandominedoni/keymaps/lednotg/keymap.c    | 33 ++++++++----
 .../bandominedoni/keymaps/lednotg/rules.mk    |  2 +
 keyboards/bandominedoni/keymaps/via/keymap.c  | 17 ++++--
 keyboards/bandominedoni/keymaps/via/rules.mk  |  2 +
 12 files changed, 76 insertions(+), 90 deletions(-)
 create mode 100644 keyboards/bandominedoni/keymaps/default/rules.mk

diff --git a/keyboards/bandominedoni/bandominedoni.c b/keyboards/bandominedoni/bandominedoni.c
index eacbb40fa0..27df3598d4 100644
--- a/keyboards/bandominedoni/bandominedoni.c
+++ b/keyboards/bandominedoni/bandominedoni.c
@@ -117,55 +117,3 @@ static enum { UNKNOWN, LEFT, RIGHT } hand_side = UNKNOWN;
         return (hand_side == LEFT);
     }
 }
-
-#ifdef ENCODER_ENABLE
-#   ifdef ENCODERS
-static uint8_t  encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
-#   endif
-
-void encoder_action_unregister(void) {
-#   ifdef ENCODERS
-    for (int index = 0; index < ENCODERS; ++index) {
-        if (encoder_state[index]) {
-            keyevent_t encoder_event = (keyevent_t) {
-                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
-                .pressed = false,
-                .time = (timer_read() | 1)
-            };
-            encoder_state[index] = 0;
-            action_exec(encoder_event);
-        }
-    }
-#   endif
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-#   ifdef ENCODERS
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = true,
-        .time = (timer_read() | 1)
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-#       ifdef CONSOLE_ENABLE
-    uprintf("encoder_action_register index = %u, clockwise = %u, row = %u, col = %u\n", index, clockwise, encoder_event.key.row, encoder_event.key.col);
-#       endif
-    action_exec(encoder_event);
-#   endif
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    // don't return user actions, because they are in the keymap
-    // encoder_update_user(index, clockwise);
-    return true;
-};
-
-#endif
diff --git a/keyboards/bandominedoni/bandominedoni.h b/keyboards/bandominedoni/bandominedoni.h
index 1eca4f8d98..6011a2cc71 100644
--- a/keyboards/bandominedoni/bandominedoni.h
+++ b/keyboards/bandominedoni/bandominedoni.h
@@ -38,7 +38,7 @@
     l40, l41, l42, l43, l44, l45, l46, l47,  \
     \
     oc,         r00, r01, r02, r03,         fn, \
-             r10, r11, r12, r13, r14,      ccw, cw,\
+             r10, r11, r12, r13, r14, \
            r20, r21, r22, r23, r24, r25, \
     r30, r31, r32, r33, r34, r35, r36, r37, \
       r40, r41, r42, r43, r44, r45, r46, r47, \
@@ -49,7 +49,7 @@
     {   l20,   l21,   l22,   l23,   l24,   l25,   l26 }, \
     {   l30,   l31,   l32,   l33,   l34,   l35,   l36 }, \
     {   l41,   l42,   l43,   l44,   l45,   l46,   l47 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   ccw,    cw }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
     {   r50,   r40,   r31,   r20,   r10,   r00,   r30 }, \
     {   r51,   r41,   r32,   r21,   r11,   r01,    oc }, \
     {   r52,   r42,   r33,   r22,   r12,   r02,    fn }, \
@@ -83,6 +83,3 @@
 //          However, It enables to decide the handedness by the HW by adding one condition: "not to press any keys (especially r30) dusing startup."
 bool is_keyboard_left(void);
 
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 2e7317889c..17f5675f60 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -248,13 +248,11 @@
  * Encoder options
  */
 #ifdef ENCODER_ENABLE
-#   define ENCODERS_PAD_A { C7 }  // dummy
-#   define ENCODERS_PAD_B { B7 }  // dummy
+#   define ENCODERS_PAD_A { }
+#   define ENCODERS_PAD_B { }
+#   define ENCODER_RESOLUTIONS { }
 #   define ENCODERS_PAD_A_RIGHT { F5 }
 #   define ENCODERS_PAD_B_RIGHT { F4 }
-#   define ENCODER_RESOLUTION 4
+#   define ENCODER_RESOLUTIONS_RIGHT { 4 }
 #   define TAP_CODE_DELAY 10
-#   define ENCODERS 2
-#   define ENCODERS_CW_KEY  { {4, 5}, {6, 5} }
-#   define ENCODERS_CCW_KEY { {3, 5}, {5, 5} }
 #endif  // ENCODER_ENABLE
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
index 040526b39c..f78621ec41 100644
--- a/keyboards/bandominedoni/info.json
+++ b/keyboards/bandominedoni/info.json
@@ -65,9 +65,6 @@
                 {"label": "r13", "x": 14, "y": 1},
                 {"label": "r14", "x": 15, "y": 1},
 
-                {"label": "ccw", "x": 16.5, "y": 1},
-                {"label": "cw", "x": 17.5, "y": 1},
-
                 {"label": "r20", "x": 10.5, "y": 2},
                 {"label": "r21", "x": 11.5, "y": 2},
                 {"label": "r22", "x": 12.5, "y": 2},
diff --git a/keyboards/bandominedoni/keymaps/default/keymap.c b/keyboards/bandominedoni/keymaps/default/keymap.c
index e01253c216..90e3f3417e 100644
--- a/keyboards/bandominedoni/keymaps/default/keymap.c
+++ b/keyboards/bandominedoni/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
 
      MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
         MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
      TG_SWAP, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
        MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
 
      MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
         MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
      TG_SWAP, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
        MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
      _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@@ -79,6 +79,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_OPEN]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_CLOSE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]       = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
 void keyboard_post_init_user(void) {
     //  Set octave to MI_OCT_0
     midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
diff --git a/keyboards/bandominedoni/keymaps/default/rules.mk b/keyboards/bandominedoni/keymaps/default/rules.mk
new file mode 100644
index 0000000000..8006608ea9
--- /dev/null
+++ b/keyboards/bandominedoni/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 3b1ebc57d3..8659697a91 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
 
      MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
         MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
      TG_SWAP, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
        MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
 
      MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
         MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
      TG_SWAP, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
        MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
 
      MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC, _______, _______,
+                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
                 _________________QWERTY_R1_________________, KC_DEL,
      KC_PGUP, KC_G, _________________QWERTY_R2_________________, KC_ENT,
             KC_PGDN, KC_B, _________________QWERTY_R3_________________, KC_RSFT,
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_CAPS, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
 
      MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC, _______, _______,
+                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
                 _________________COLEMAK_R1________________, KC_DEL,
      KC_PGUP, KC_D, _________________COLEMAK_R2________________, KC_ENT,
             KC_PGDN, KC_B, _________________COLEMAK_R3________________, KC_RSFT,
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______, _______, _______, _______, _______, _______, _______, _______,
 
      _______,        _______, _______, _______, KC_F10,         _______,
-                  KC_F6, KC_F7, KC_F8, KC_F9, _______, _______, _______,
+                  KC_F6, KC_F7, KC_F8, KC_F9, _______,
                 _______, _______, _______, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, KC_QUOT, _______,
             _______, _______, _______, _______, _______, _______, _______, _______,
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
      _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_RMOD, RGB_MOD,
+                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
@@ -154,6 +154,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_OPEN]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_CLOSE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_QWERTY]   = { ENCODER_CCW_CW(_______, _______) },
+    [_COLEMAK]  = { ENCODER_CCW_CW(_______, _______) },
+    [_MISC]     = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]       = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
+
 void my_init(void){
     //  Set octave to MI_OCT_0
     midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
diff --git a/keyboards/bandominedoni/keymaps/led/rules.mk b/keyboards/bandominedoni/keymaps/led/rules.mk
index 08ed472ad6..0a1c4b1858 100644
--- a/keyboards/bandominedoni/keymaps/led/rules.mk
+++ b/keyboards/bandominedoni/keymaps/led/rules.mk
@@ -1,2 +1,4 @@
 RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
 RGB_MATRIX_CUSTOM_KB = yes   #
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/bandominedoni/keymaps/lednotg/keymap.c b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
index fa523793b1..ba25c1d55f 100644
--- a/keyboards/bandominedoni/keymaps/lednotg/keymap.c
+++ b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
@@ -49,10 +49,10 @@ enum layer_names {
 #ifdef PEDAL_NORMALLY_CLOSED
     _OPEN,
 #endif
-     _QWERTY,
-     _COLEMAK,
-     _MISC,
-     _FN
+    _QWERTY,
+    _COLEMAK,
+    _MISC,
+    _FN
 };
 
 enum custom_keycodes {
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
 
      MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
         MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
      MI_G_2, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
        MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
 
      MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
         MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
      MI_G_2, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
        MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
 
      MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC, _______, _______,
+                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
                 _________________QWERTY_R1_________________, KC_DEL,
      KC_PGUP, KC_G, _________________QWERTY_R2_________________, KC_ENT,
             KC_PGDN, KC_B, _________________QWERTY_R3_________________, KC_RSFT,
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_CAPS, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
 
      MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC, _______, _______,
+                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
                 _________________COLEMAK_R1________________, KC_DEL,
      KC_PGUP, KC_D, _________________COLEMAK_R2________________, KC_ENT,
             KC_PGDN, KC_B, _________________COLEMAK_R3________________, KC_RSFT,
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______, _______, _______, _______, _______, _______, _______, _______,
 
      _______,        _______, _______, _______, KC_F10,         _______,
-                  KC_F6, KC_F7, KC_F8, KC_F9, _______, _______, _______,
+                  KC_F6, KC_F7, KC_F8, KC_F9, _______,
                 _______, _______, _______, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, KC_QUOT, _______,
             _______, _______, _______, _______, _______, _______, _______, _______,
@@ -145,8 +145,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
      XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
-     _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_RMOD, RGB_MOD,
+     _______,        KC_VOLD, KC_VOLU, MI_VELD, MI_VELU,         _______,
+                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
@@ -154,6 +154,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_OPEN]     = { ENCODER_CCW_CW(MI_OCTD, MI_OCTU) },
+    [_CLOSE]    = { ENCODER_CCW_CW(MI_OCTD, MI_OCTU) },
+    [_QWERTY]   = { ENCODER_CCW_CW(_______, _______) },
+    [_COLEMAK]  = { ENCODER_CCW_CW(_______, _______) },
+    [_MISC]     = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]       = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
+
 void my_init(void){
     //  Set octave to MI_OCT_0
     midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
diff --git a/keyboards/bandominedoni/keymaps/lednotg/rules.mk b/keyboards/bandominedoni/keymaps/lednotg/rules.mk
index 08ed472ad6..0a1c4b1858 100644
--- a/keyboards/bandominedoni/keymaps/lednotg/rules.mk
+++ b/keyboards/bandominedoni/keymaps/lednotg/rules.mk
@@ -1,2 +1,4 @@
 RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
 RGB_MATRIX_CUSTOM_KB = yes   #
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index 7264853b55..aa668af154 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
 
      MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
         MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
      TG_SWAP, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
        MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
 
      MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5, KC_VOLD, KC_VOLU,
+         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
         MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
      TG_SWAP, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
        MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______, _______, _______, _______, _______, _______, _______, _______,
 
      _______,        _______, _______, _______, _______,         _______,
-                  _______, _______, _______, _______, _______, _______, _______,
+                  _______, _______, _______, _______, _______,
                 _______, _______, _______, _______, _______, _______,
      _______, _______, _______, _______, _______, _______, _______, _______,
             _______, _______, _______, _______, _______, _______, _______, _______,
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
      _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD,
+                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
@@ -95,6 +95,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_OPEN]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_CLOSE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_MISC]     = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]       = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
+
 void my_init(void){
     //  Set octave to MI_OCT_0
     midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
diff --git a/keyboards/bandominedoni/keymaps/via/rules.mk b/keyboards/bandominedoni/keymaps/via/rules.mk
index 71eb1ebf8e..8fa76afafc 100644
--- a/keyboards/bandominedoni/keymaps/via/rules.mk
+++ b/keyboards/bandominedoni/keymaps/via/rules.mk
@@ -1,3 +1,5 @@
 RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
 RGB_MATRIX_CUSTOM_KB = yes   #
 VIA_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.

From 6104b660145215ec00cc5f258e550c335d99cf96 Mon Sep 17 00:00:00 2001
From: Benjamin Collet <benjamin.collet@protonmail.ch>
Date: Wed, 31 Aug 2022 19:19:42 +0200
Subject: [PATCH 284/959] Add bepo variant to massdrop/thekey keymaps (#18129)

by mrBen
---
 .../thekey/keymaps/default-bepo/keymap.c      | 24 +++++++++++
 .../keymaps/url-copy-paste-bepo/keymap.c      | 41 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 keyboards/massdrop/thekey/keymaps/default-bepo/keymap.c
 create mode 100644 keyboards/massdrop/thekey/keymaps/url-copy-paste-bepo/keymap.c

diff --git a/keyboards/massdrop/thekey/keymaps/default-bepo/keymap.c b/keyboards/massdrop/thekey/keymaps/default-bepo/keymap.c
new file mode 100644
index 0000000000..b9d419a086
--- /dev/null
+++ b/keyboards/massdrop/thekey/keymaps/default-bepo/keymap.c
@@ -0,0 +1,24 @@
+/* Copyright 2022 Benjamin Collet <benjamin.collet@protonmail.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_bepo.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(KC_LCTL, BP_C, BP_V),
+
+};
diff --git a/keyboards/massdrop/thekey/keymaps/url-copy-paste-bepo/keymap.c b/keyboards/massdrop/thekey/keymaps/url-copy-paste-bepo/keymap.c
new file mode 100644
index 0000000000..feafa02ac2
--- /dev/null
+++ b/keyboards/massdrop/thekey/keymaps/url-copy-paste-bepo/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2022 Benjamin Collet <benjamin.collet@protonmail.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "sendstring_bepo.h"
+
+enum custom_keycodes {
+    TK_URL = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(TK_URL, C(BP_C), C(BP_V)),
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TK_URL:
+            if (record->event.pressed) {
+                // when keycode TK_URL is pressed
+                SEND_STRING("https://stackoverflow.com/");
+            }
+            break;
+        default:
+            break;
+    }
+    return true;
+}

From d4c935d8fa6495f7f925c3109db8e9390136bf79 Mon Sep 17 00:00:00 2001
From: Ryan Neff <ryan.ray.neff@fluke.com>
Date: Wed, 31 Aug 2022 12:29:26 -0700
Subject: [PATCH 285/959] Added personal Iris Rev6a layout and Milk 2% layout
 (#17600)

by JellyTitan
---
 .../keebio/iris/keymaps/two_knob/config.h     |  62 +++++
 .../keebio/iris/keymaps/two_knob/keymap.c     | 261 ++++++++++++++++++
 .../keebio/iris/keymaps/two_knob/readme.md    |  15 +
 .../keebio/iris/keymaps/two_knob/rules.mk     |  15 +
 .../iris/keymaps/two_knob/two_knob.json       | 185 +++++++++++++
 .../keymaps/copypasta_macfancy/config.h       |   6 +
 .../keymaps/copypasta_macfancy/keymap.c       |  56 ++++
 .../keymaps/copypasta_macfancy/readme.md      |  18 ++
 .../keymaps/copypasta_macfancy/rules.mk       |   4 +
 9 files changed, 622 insertions(+)
 create mode 100644 keyboards/keebio/iris/keymaps/two_knob/config.h
 create mode 100644 keyboards/keebio/iris/keymaps/two_knob/keymap.c
 create mode 100644 keyboards/keebio/iris/keymaps/two_knob/readme.md
 create mode 100644 keyboards/keebio/iris/keymaps/two_knob/rules.mk
 create mode 100644 keyboards/keebio/iris/keymaps/two_knob/two_knob.json
 create mode 100644 keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h
 create mode 100644 keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
 create mode 100644 keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md
 create mode 100644 keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk

diff --git a/keyboards/keebio/iris/keymaps/two_knob/config.h b/keyboards/keebio/iris/keymaps/two_knob/config.h
new file mode 100644
index 0000000000..37ffb20a2f
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/two_knob/config.h
@@ -0,0 +1,62 @@
+// Copyright 2022 Ryan Neff (@JellyTitan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define EE_HANDS
+
+/* Turn off RGB light when host is asleep. (Doesn't seem to work for mac)? */
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_LAYERS
+/* Decrease decay of heatmap rgb effect */
+#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
+/* If you're setting colors per key, this is required. */
+#define SPLIT_LAYER_STATE_ENABLE
+
+/* If you type too fast, it confuses the Mod key combos. This resolves it: */
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Set tapdance speed */
+#define TAPPING_TERM 210
+
+/* Allows for the setting of constant mouse speed levels. */
+/* Delay between pressing a movement key and cursor movement */
+#define MOUSEKEY_DELAY 10
+/* Time between cursor movements in milliseconds */
+#define MOUSEKEY_INTERVAL 16
+/* Step size */
+#define MOUSEKEY_MOVE_DELTA 8
+/* Maximum cursor speed at which acceleration stops */
+#define MOUSEKEY_MAX_SPEED 2
+/* Time until maximum cursor speed is reached */
+#define MOUSEKEY_TIME_TO_MAX 40
+/* Maximum number of scroll steps per scroll action */
+#define MOUSEKEY_WHEEL_MAX_SPEED 42
+/* Time until maximum scroll speed is reached */
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 15
+
+// Tweak how the mouse cursor moves. https://docs.qmk.fm/#/feature_mouse_keys
+// Accelerated mode (default).
+// MOUSEKEY_DELAY  10  Delady between pressing a movement key and cursor movement
+// MOUSEKEY_INTERVAL 20  Time between cursor movements in milliseconds
+// MOUSEKEY_MOVE_DELTA 8 Step size
+// MOUSEKEY_MAX_SPEED  10  Maximum cursor speed at which acceleration stops
+// MOUSEKEY_TIME_TO_MAX  30  Time until maximum cursor speed is reached
+// MOUSEKEY_WHEEL_DELAY  10  Delay between pressing a wheel key and wheel movement
+// MOUSEKEY_WHEEL_INTERVAL 80  Time between wheel movements
+// MOUSEKEY_WHEEL_MAX_SPEED  8 Maximum number of scroll steps per scroll action
+// MOUSEKEY_WHEEL_TIME_TO_MAX  40  Time until maximum scroll speed is reached
+
+// Kinetic mode, alternate to the default mode.
+// MK_KINETIC_SPEED  undefined Enable kinetic mode
+// MOUSEKEY_DELAY  5 Delay between pressing a movement key and cursor movement
+// MOUSEKEY_INTERVAL 10  Time between cursor movements in milliseconds
+// MOUSEKEY_MOVE_DELTA 5 Step size for accelerating from initial to base speed
+// MOUSEKEY_INITIAL_SPEED  100 Initial speed of the cursor in pixel per second
+// MOUSEKEY_BASE_SPEED 1000  Maximum cursor speed at which acceleration stops
+// MOUSEKEY_DECELERATED_SPEED  400 Decelerated cursor speed
+// MOUSEKEY_ACCELERATED_SPEED  3000  Accelerated cursor speed
+// MOUSEKEY_WHEEL_INITIAL_MOVEMENTS  16  Initial number of movements of the mouse wheel
+// MOUSEKEY_WHEEL_BASE_MOVEMENTS 32  Maximum number of movements at which acceleration stops
+// MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS  48  Accelerated wheel movements
+// MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS  8 Decelerated wheel movements
diff --git a/keyboards/keebio/iris/keymaps/two_knob/keymap.c b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
new file mode 100644
index 0000000000..aeeb2df905
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
@@ -0,0 +1,261 @@
+// Copyright 2022 Ryan Neff (@JellyTitan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+/* Defines macros for use with the configurators "Any" key. (These are non-standard macros). */
+/* Move active application right half. */
+#define KC_CSGRA LCTL(LSFT(LGUI(KC_RGHT)))
+/* Move active application to left half. */
+#define KC_CSGLA LCTL(LSFT(LGUI(KC_LEFT)))
+/* Maximize active application. */
+#define KC_MAXIM LCTL(LSFT(LGUI(KC_UP)))
+/* Minimize active application. */
+#define KC_MINIM LCTL(LSFT(LGUI(KC_DOWN)))
+
+/* Rotary encoder variables used to hold down Command (GUI) key while cycling through open programs. */
+bool is_cmd_tab_active = false;
+uint16_t cmd_tab_timer = 0;  
+
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    LOWER,
+    RAISE,
+    ADJUST,
+    CMD_TAB_CW,
+    CMD_TAB_CCW,
+};
+
+/**
+ * Tap Dance declarations
+ */
+enum tapdances {
+    _TD_FIVE_ENTER,
+};
+
+/* Tapdance */
+#define TD_FIVE_ENTER TD(_TD_FIVE_ENTER)
+
+/**
+ * Tap Dance definitions
+ *
+ * NOTE - if your not using tapdance, comment out:
+ * TAP_DANCE_ENABLE = yes in rules.mk
+ * define TAPPING_TERM 175 in config.h
+ * else you'll get a compile error.
+ *
+ * To use this in the configurator, enter the name 'TD_FIVE_ENTER' in the "Any" key.
+ */
+qk_tap_dance_action_t tap_dance_actions[] = {
+    /* Tap once for 5, twice for Enter. */
+    [_TD_FIVE_ENTER] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_ENT),
+};
+
+/**
+ * Keymap. Generated via configurator.
+ *
+ * You can download/upload the two_know.json to the configurator:
+ * https://config.qmk.fm/#/keebio/iris/rev6a/LAYOUT
+ *
+ * If you make changes and download the json, you can run qmk json2c two_knob.json to get converted text. 
+ * You can copy and paste it here.
+ * You will have to reneame the array keys from ints to the custom keycode names.
+ *
+ * The rotary encoders are programmed manually below because the configurator does not support them yet.
+ */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(KC_EQL, KC_1, KC_2, KC_3, KC_4, TD_FIVE_ENTER, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, LT(1, KC_DEL), LT(2, KC_A), LCTL_T(KC_S), KC_D, LGUI_T(KC_F), KC_G, KC_H, RGUI_T(KC_J), KC_K, RCTL_T(KC_L), LT(2, KC_SCLN), LT(1, KC_QUOT), KC_LSPO, LALT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_MINIM, KC_MAXIM, KC_N, KC_M, KC_COMM, KC_DOT, RALT_T(KC_SLSH), KC_RSPC, QK_GESC, KC_SPC, KC_BSPC, KC_TAB, KC_ENT, KC_DEL),
+    [_LOWER]  = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, DT_PRNT, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, DT_UP, KC_4, KC_5, KC_6, KC_PPLS, KC_TRNS, KC_TRNS, KC_HASH, KC_DLR, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS, DT_DOWN, KC_1, KC_2, KC_3, KC_PSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0),
+    [_RAISE]  = LAYOUT(RGB_TOG, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_UP, KC_BTN2, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_CSGLA, KC_CSGRA, KC_TRNS, KC_TRNS),
+    [_ADJUST] = LAYOUT(
+        //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+        _______, _______, _______, _______, _______, _______
+        // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LOWER:
+            if (record->event.pressed) {
+                layer_on(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+            break;
+        case RAISE:
+            if (record->event.pressed) {
+                layer_on(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+        case CMD_TAB_CW:
+            if (record->event.pressed) {
+                if (!is_cmd_tab_active) {
+                    is_cmd_tab_active = true;
+                    register_code(KC_LGUI);
+                }
+                cmd_tab_timer = timer_read();
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_TAB);
+            }
+            break;
+        case CMD_TAB_CCW:
+            if (record->event.pressed) {
+                if (!is_cmd_tab_active) {
+                    is_cmd_tab_active = true;
+                    register_code(KC_LGUI);
+                }
+                cmd_tab_timer = timer_read();
+                tap_code16(S(KC_TAB));
+            } else {
+                unregister_code(KC_TAB);
+            }
+            break;
+    }
+    return true;
+}
+
+/**
+ * Define lighting layers.
+ *
+ * Iris rev6a uses WS2812 RGB Matrix lighting.
+ * The RGB Matrix lighting option has already been enabled in ../../rev6a/config.h
+ * You'll need to add #define SPLIT_LAYER_STATE_ENABLE to config.h if you
+ * will be customizing the LED's per key.
+ *
+ * Here's how to customize the colors per layer and per key:
+ * https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgb_matrix.md#direct-operation-iddirect-operation
+ *
+ * If you start getting real weird with it, your likely to exceed the firmware limit of 28672.
+ * You may need to selectively disable some effects:
+ * https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgb_matrix.md#rgb-matrix-effects-idrgb-matrix-effects
+ *
+ * There are 68 Leds. Printed on the board itself, the led numbers are 1-68.
+ * For color addressing, use 0-67 as the index number.
+ * rgb_matrix_set_color(index, r, g, b)
+ *
+ * Here's an LED number guide:
+ * FRONT
+ * Left Hand                    Right Hand
+ * |00|01|02|03|04|05|          |39|38|37|36|35|34|
+ * |11|10|09|08|07|06|          |40|41|42|43|44|45|
+ * |12|13|14|15|16|17|          |51|50|49|48|47|46|
+ * |23|22|21|20|19|18|27|    |61|52|53|54|55|56|57|
+ *             |24|25|26|    |60|59|58|
+ * REVERSE
+ * Right Hand                   Left Hand
+ * |65|--|--|66|--|67|          |33|--|32|--|--|31|
+ * |--|--|--|--|--|--|          |--|--|--|--|--|--|
+ * |--|--|--|--|--|--|          |--|--|--|--|--|--|
+ * |64|--|--|63|--|--|--|    |--|--|--|29|--|--|30|
+ *             |--|62|--|    |--|28|--|
+ */
+// void rgb_matrix_indicators_user(void) {
+//   if (IS_LAYER_ON(1)) {
+//     /* Upperleft most key red: */
+//     rgb_matrix_set_color(0,255,0,0);
+//     /* Upperright most front key blue: */
+//     rgb_matrix_set_color(0,0,255,0);
+//     /* Bottom right on lefthand Green: */
+//     rgb_matrix_set_color(0, RGB_GREEN);
+//   }
+//   else if (IS_LAYER_ON(2)) {
+//     /* RGB +/- controls. */
+//     rgb_matrix_set_color(35, RGB_RED);
+//     rgb_matrix_set_color(34, RGB_BLUE);
+//     rgb_matrix_set_color(37, RGB_RED);
+//     rgb_matrix_set_color(36, RGB_BLUE);
+//     rgb_matrix_set_color(44, RGB_RED);
+//     rgb_matrix_set_color(45, RGB_BLUE);
+//     rgb_matrix_set_color(47, RGB_RED);
+//     rgb_matrix_set_color(46, RGB_BLUE);
+//     rgb_matrix_set_color(56, RGB_RED);
+//     rgb_matrix_set_color(57, RGB_BLUE);
+//     /* RGB Toggle. */
+//     rgb_matrix_set_color(00, RGB_PURPLE);
+//     /* Move screen left/right. */
+//     rgb_matrix_set_color(26, RGB_YELLOW);
+//     rgb_matrix_set_color(60, RGB_YELLOW);
+//     /* Arrow keys. */
+//     rgb_matrix_set_color(50, RGB_PURPLE);
+//     rgb_matrix_set_color(49, RGB_PURPLE);
+//     rgb_matrix_set_color(48, RGB_PURPLE);
+//     rgb_matrix_set_color(42, RGB_PURPLE);
+//     /* Mouse movement arrows. */
+//     rgb_matrix_set_color(14, RGB_ORANGE);
+//     rgb_matrix_set_color(15, RGB_ORANGE);
+//     rgb_matrix_set_color(16, RGB_ORANGE);
+//     rgb_matrix_set_color(8, RGB_ORANGE);
+//     /* Mouse buttons. */
+//     rgb_matrix_set_color(41, RGB_ORANGE);
+//     rgb_matrix_set_color(43, RGB_ORANGE);
+//     /* Mouse acceleration. */
+//     rgb_matrix_set_color(01, 200, 165, 0);
+//     rgb_matrix_set_color(02, 255, 200, 0);
+//     rgb_matrix_set_color(03, 255, 235, 0);
+//   }
+// }
+
+/**
+ * Rotary Encoder.
+ *
+ * This can't be programmed through configurator. You must do it here.
+ *
+ * This uses the amazing "Encoder map" feature which replicates the normal keyswitch layer handling functionality, but with encoders.
+ * https://docs.qmk.fm/#/feature_encoders?id=encoder-map 
+ * 
+ * Uses a variant of the Super-alt-tab macro to switch between open applications on a mac. (Command-tab)
+ * https://docs.qmk.fm/#/feature_macros?id=super-alt%e2%86%aftab
+ */
+#if defined(ENCODER_MAP_ENABLE)
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+        /* Left Hand */                                                     /* Right Hand */
+        /* Switch between tabs. (Control + Tab). */                         /* Switch between open apps on Mac. (Command + Tab + timer logic) */
+        [_QWERTY] =  { ENCODER_CCW_CW(S(C(KC_TAB)), C(KC_TAB)),             ENCODER_CCW_CW(CMD_TAB_CCW, CMD_TAB_CW)  },
+        /* Scrolls left & right. (Shift + Mouse Wheel Up). */               /* Scrolls up and down. (Page Down & Page Up - mouse wheel scroll incraments are too small) */
+        [_LOWER] =  { ENCODER_CCW_CW(S(KC_MS_WH_UP), S(KC_MS_WH_DOWN)),     ENCODER_CCW_CW(KC_PGDN, KC_PGUP)  },
+        /* Selects adjacent words. (Command + Shift + Right Arrow). */      /* Jumps to end/start of line. Hold shift to select. (Gui + arrow). */
+        [_RAISE] =  { ENCODER_CCW_CW(C(S(KC_LEFT)), C(S(KC_RGHT))),         ENCODER_CCW_CW(G(KC_LEFT), G(KC_RGHT))  },
+        /* Scroll through RGB Modes */                                      /* Right & left arrow */
+        [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD),                    ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+    };
+#endif
+
+
+/**
+ * Helper function for rotary encoder.
+ *
+ * If the timer has elapsed, the Command/Gui tab will be released.
+ * You can adjust the milliseconds to speed up the CMD key release.
+ */
+void matrix_scan_user(void) {
+    if (is_cmd_tab_active) {
+        if (timer_elapsed(cmd_tab_timer) > 900) {
+            unregister_code(KC_LGUI);
+            is_cmd_tab_active = false;
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/keymaps/two_knob/readme.md b/keyboards/keebio/iris/keymaps/two_knob/readme.md
new file mode 100644
index 0000000000..728650fcb9
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/two_knob/readme.md
@@ -0,0 +1,15 @@
+# Two Knob Keymap for Iris Rev6a
+![two_knobs](https://i.imgur.com/JqGPWCn.png)
+
+This keymap is derived from Ergodox layouts and is adapted for the [Iris6a](https://docs.keeb.io/iris-rev6-build-guide). It is notable for it's semi-complex programming examples that include the use of rotary encoders.
+
+Plenty of useful examples:
+* Advanced knob programming! (Three-layer usage + clicks)
+* Advanced RGB! (Per-key lighting)
+* Macros! (Fancy key combos tied to the rotary encoders)
+* Tap Dance! (Double tap your '5' key for 'Enter')
+* Dynamic Tapping term! (Dial in the double tap speed)
+
+The qwerty key layout is my adaptation of the ergodox defaults. If this is your first split keyboard, you probably want a different key layout. 
+
+I stopped using the fancy RGB programming pretty quickly. It was a complex to get working initially, so I'm leaving the examples here for others. (As a touch typist - not terribly helpful, but it looks nice). YMMV.
diff --git a/keyboards/keebio/iris/keymaps/two_knob/rules.mk b/keyboards/keebio/iris/keymaps/two_knob/rules.mk
new file mode 100644
index 0000000000..dd49f77547
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/two_knob/rules.mk
@@ -0,0 +1,15 @@
+# Copyright 2022 Ryan Neff (@JellyTitan)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Turn on mouse:
+MOUSEKEY_ENABLE = yes
+# Turn on tap dance:
+TAP_DANCE_ENABLE = yes
+# Dynamic Tapping Term:
+DYNAMIC_TAPPING_TERM_ENABLE = yes
+# Replicates the normal keyswitch layer handling functionality, but with encoders:
+ENCODER_MAP_ENABLE = yes
+# Console for debug:
+# This is enabled by the parent iris rev6a config - turning it off saves us some space.
+# You can find the other iris default options here:  keyboards/keebio/iris/rev6a/rules.mk
+CONSOLE_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/two_knob/two_knob.json b/keyboards/keebio/iris/keymaps/two_knob/two_knob.json
new file mode 100644
index 0000000000..62fb931873
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/two_knob/two_knob.json
@@ -0,0 +1,185 @@
+{
+  "version": 1,
+  "notes": "Based on legacy Ergodox layouts.",
+  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+  "keyboard": "keebio/iris/rev6a",
+  "keymap": "two_knob",
+  "layout": "LAYOUT",
+  "layers": [
+    [
+      "KC_EQL",
+      "KC_1",
+      "KC_2",
+      "KC_3",
+      "KC_4",
+      "ANY(TD_FIVE_ENTER)",
+      "KC_6",
+      "KC_7",
+      "KC_8",
+      "KC_9",
+      "KC_0",
+      "KC_MINS",
+      "KC_TAB",
+      "KC_Q",
+      "KC_W",
+      "KC_E",
+      "KC_R",
+      "KC_T",
+      "KC_Y",
+      "KC_U",
+      "KC_I",
+      "KC_O",
+      "KC_P",
+      "KC_BSLS",
+      "LT(1,KC_DEL)",
+      "LT(2,KC_A)",
+      "LCTL_T(KC_S)",
+      "KC_D",
+      "LGUI_T(KC_F)",
+      "KC_G",
+      "KC_H",
+      "RGUI_T(KC_J)",
+      "KC_K",
+      "RCTL_T(KC_L)",
+      "LT(2,KC_SCLN)",
+      "LT(1,KC_QUOT)",
+      "KC_LSPO",
+      "LALT_T(KC_Z)",
+      "KC_X",
+      "KC_C",
+      "KC_V",
+      "KC_B",
+      "ANY(KC_MINIM)",
+      "ANY(KC_MAXIM)",
+      "KC_N",
+      "KC_M",
+      "KC_COMM",
+      "KC_DOT",
+      "RALT_T(KC_SLSH)",
+      "KC_RSPC",
+      "QK_GESC",
+      "KC_SPC",
+      "KC_BSPC",
+      "KC_TAB",
+      "KC_ENT",
+      "KC_DEL"
+    ],
+    [
+      "KC_TRNS",
+      "KC_F1",
+      "KC_F2",
+      "KC_F3",
+      "KC_F4",
+      "KC_F5",
+      "KC_F6",
+      "KC_F7",
+      "KC_F8",
+      "KC_F9",
+      "KC_F10",
+      "KC_F11",
+      "KC_TRNS",
+      "KC_EXLM",
+      "KC_AT",
+      "KC_LCBR",
+      "KC_RCBR",
+      "KC_PIPE",
+      "ANY(DT_PRNT)",
+      "KC_7",
+      "KC_8",
+      "KC_9",
+      "KC_ASTR",
+      "KC_F12",
+      "KC_TRNS",
+      "KC_HASH",
+      "KC_DLR",
+      "KC_LPRN",
+      "KC_RPRN",
+      "KC_GRV",
+      "ANY(DT_UP)",
+      "KC_4",
+      "KC_5",
+      "KC_6",
+      "KC_PPLS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_HASH",
+      "KC_DLR",
+      "KC_LBRC",
+      "KC_RBRC",
+      "KC_TILD",
+      "KC_TRNS",
+      "KC_TRNS",
+      "ANY(DT_DOWN)",
+      "KC_1",
+      "KC_2",
+      "KC_3",
+      "KC_PSLS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_P0"
+    ],
+    [
+      "RGB_TOG",
+      "KC_ACL0",
+      "KC_ACL1",
+      "KC_ACL2",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "RGB_MOD",
+      "RGB_RMOD",
+      "RGB_HUI",
+      "RGB_HUD",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_MS_U",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_BTN1",
+      "KC_UP",
+      "KC_BTN2",
+      "RGB_SAI",
+      "RGB_SAD",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_MS_L",
+      "KC_MS_D",
+      "KC_MS_R",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_LEFT",
+      "KC_DOWN",
+      "KC_RGHT",
+      "RGB_VAI",
+      "RGB_VAD",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "RGB_SPI",
+      "RGB_SPD",
+      "KC_TRNS",
+      "KC_TRNS",
+      "ANY(KC_CSGLA)",
+      "ANY(KC_CSGRA)",
+      "KC_TRNS",
+      "KC_TRNS"
+    ]
+  ],
+  "author": "https://github.com/JellyTitan"
+}
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h
new file mode 100644
index 0000000000..bbd93cfc16
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Ryan Neff (@JellyTitan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define TAPPING_TERM 200
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
new file mode 100644
index 0000000000..6f21c630bf
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
@@ -0,0 +1,56 @@
+// Copyright 2022 Ryan Neff (@JellyTitan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum tapdance_keycodes { 
+    TD_KEY_1,
+    TD_KEY_2
+};
+
+void dance_key_one(qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        /* Copy for Mac. */
+        /* Windows & Linux use Ctrl+C: tap_code16(C(KC_C)) */
+        tap_code16(G(KC_C));
+        reset_tap_dance(state);
+    } else if (state->count == 2) {
+        /* Cut for Mac. */
+        /* Windows & Linux use Ctrl+X: tap_code16(C(KC_X)) */
+        tap_code16(G(KC_X));
+        reset_tap_dance(state);
+    } else if (state->count == 3) {
+        /* Plain old Tab. */
+        tap_code(KC_TAB);
+        reset_tap_dance(state);
+    }
+}
+
+void dance_key_two(qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        /* Paste for Mac. */
+        /* Windows & Linux use Ctrl+V: tap_code16(C(KC_V)) */
+        tap_code16(G(KC_V));
+        reset_tap_dance(state);
+    } else if (state->count == 2) {
+        /* Paste as value Gui+Shift+V for Mac. */
+        /* Windows & Linux use Ctrl+Shift V: tap_code16(C(S(KC_V))) */
+        tap_code16(G(S(KC_V)));
+        reset_tap_dance(state);
+    } else if (state->count == 3) {
+        /* Tab between programs for mac Gui+Tab.  */
+        /* Windows & Linux use Ctrl+Tab: tap_code16(C(KC_TAB)) */
+        tap_code16(G(KC_TAB));
+        reset_tap_dance(state);
+    }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_KEY_1] = ACTION_TAP_DANCE_FN(dance_key_one), 
+    [TD_KEY_2] = ACTION_TAP_DANCE_FN(dance_key_two)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(TD(TD_KEY_1),
+    TD(TD_KEY_2))
+};
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md
new file mode 100644
index 0000000000..722e7491bc
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md
@@ -0,0 +1,18 @@
+# Copypasta Macfancy Keymap for Milk 2%
+
+![copypasta_macfancy](https://i.imgur.com/7LMZZrL.png)
+
+Extra fancy copy/paste utilities for the Milk 2% keyboard on MacOS. Milk 2% designed by [Spaceman](https://github.com/Spaceboards/SpaceboardsHardware/tree/master/Keyboards/2%25%20Milk).
+
+Uses Tapping term for double and tripple tapping.
+Tapping speed can be adjusted with TAPPING_TERM in config.h
+
+### Key One
+- 1 Tap: Copy
+- 2 Taps: Cut
+- 3 Taps: Tab
+
+### Key Two
+- 1 Tap: Paste
+- 2 Taps: Paste as Value
+- 3 Taps: Tab between programs
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk
new file mode 100644
index 0000000000..628a960a71
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2022 Ryan Neff (@JellyTitan)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+TAP_DANCE_ENABLE = yes	# Tap Dance

From 1ccd0c19da8a8b3e0032ffb0446c543dd6c96155 Mon Sep 17 00:00:00 2001
From: 3araht <69518343+3araht@users.noreply.github.com>
Date: Thu, 1 Sep 2022 05:05:43 +0900
Subject: [PATCH 286/959] Add giabalanai keyboard (#10125)

by 3araht
---
 keyboards/giabalanai/config.h                 | 294 +++++++
 keyboards/giabalanai/giabalanai.c             | 255 ++++++
 keyboards/giabalanai/giabalanai.h             | 132 +++
 keyboards/giabalanai/info.json                | 125 +++
 .../giabalanai/keymaps/2firmware/config.h     |   9 +
 .../giabalanai/keymaps/2firmware/keymap.c     | 739 ++++++++++++++++
 .../giabalanai/keymaps/2firmware/readme.md    |  12 +
 .../giabalanai/keymaps/2firmware/rules.mk     |   4 +
 keyboards/giabalanai/keymaps/3araht/keymap.c  | 754 +++++++++++++++++
 keyboards/giabalanai/keymaps/3araht/readme.md |   1 +
 keyboards/giabalanai/keymaps/3araht/rules.mk  |   4 +
 keyboards/giabalanai/keymaps/default/keymap.c | 259 ++++++
 .../giabalanai/keymaps/default/readme.md      |   1 +
 keyboards/giabalanai/keymaps/default/rules.mk |   1 +
 .../keymaps/default_giabarinaix2/config.h     |  26 +
 .../keymaps/default_giabarinaix2/info.json    | 146 ++++
 .../keymaps/default_giabarinaix2/keymap.c     | 262 ++++++
 .../keymaps/default_giabarinaix2/readme.md    |   1 +
 .../keymaps/default_giabarinaix2/rules.mk     |   3 +
 .../keymaps/giabarinaix2led/config.h          |  26 +
 .../keymaps/giabarinaix2led/info.json         | 146 ++++
 .../keymaps/giabarinaix2led/keymap.c          | 464 ++++++++++
 .../keymaps/giabarinaix2led/readme.md         |   1 +
 .../keymaps/giabarinaix2led/rules.mk          |   3 +
 keyboards/giabalanai/keymaps/party/keymap.c   | 792 ++++++++++++++++++
 keyboards/giabalanai/keymaps/party/readme.md  |   3 +
 .../keymaps/party/rgb_matrix_user.inc         |  57 ++
 keyboards/giabalanai/keymaps/party/rules.mk   |   6 +
 keyboards/giabalanai/keymaps/via/config.h     |   3 +
 keyboards/giabalanai/keymaps/via/keymap.c     | 260 ++++++
 keyboards/giabalanai/keymaps/via/readme.md    |   1 +
 keyboards/giabalanai/keymaps/via/rules.mk     |   3 +
 .../keymaps/via_giabarinaix2/config.h         |  27 +
 .../keymaps/via_giabarinaix2/info.json        | 146 ++++
 .../keymaps/via_giabarinaix2/keymap.c         | 262 ++++++
 .../keymaps/via_giabarinaix2/readme.md        |   1 +
 .../keymaps/via_giabarinaix2/rules.mk         |   4 +
 keyboards/giabalanai/readme.md                |  24 +
 keyboards/giabalanai/rules.mk                 |  26 +
 39 files changed, 5283 insertions(+)
 create mode 100644 keyboards/giabalanai/config.h
 create mode 100644 keyboards/giabalanai/giabalanai.c
 create mode 100644 keyboards/giabalanai/giabalanai.h
 create mode 100644 keyboards/giabalanai/info.json
 create mode 100644 keyboards/giabalanai/keymaps/2firmware/config.h
 create mode 100644 keyboards/giabalanai/keymaps/2firmware/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/2firmware/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/2firmware/rules.mk
 create mode 100644 keyboards/giabalanai/keymaps/3araht/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/3araht/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/3araht/rules.mk
 create mode 100644 keyboards/giabalanai/keymaps/default/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/default/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/default/rules.mk
 create mode 100644 keyboards/giabalanai/keymaps/default_giabarinaix2/config.h
 create mode 100644 keyboards/giabalanai/keymaps/default_giabarinaix2/info.json
 create mode 100644 keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/default_giabarinaix2/rules.mk
 create mode 100644 keyboards/giabalanai/keymaps/giabarinaix2led/config.h
 create mode 100644 keyboards/giabalanai/keymaps/giabarinaix2led/info.json
 create mode 100644 keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/giabarinaix2led/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/giabarinaix2led/rules.mk
 create mode 100644 keyboards/giabalanai/keymaps/party/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/party/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
 create mode 100644 keyboards/giabalanai/keymaps/party/rules.mk
 create mode 100644 keyboards/giabalanai/keymaps/via/config.h
 create mode 100644 keyboards/giabalanai/keymaps/via/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/via/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/via/rules.mk
 create mode 100644 keyboards/giabalanai/keymaps/via_giabarinaix2/config.h
 create mode 100644 keyboards/giabalanai/keymaps/via_giabarinaix2/info.json
 create mode 100644 keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
 create mode 100644 keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md
 create mode 100644 keyboards/giabalanai/keymaps/via_giabarinaix2/rules.mk
 create mode 100644 keyboards/giabalanai/readme.md
 create mode 100644 keyboards/giabalanai/rules.mk

diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h
new file mode 100644
index 0000000000..efad053aae
--- /dev/null
+++ b/keyboards/giabalanai/config.h
@@ -0,0 +1,294 @@
+/*
+Copyright 2020 3araht
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 10
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 }
+#define MATRIX_COL_PINS { B1, F7, F6, F5, F4, B3, B2, B6, D0, D1 }
+#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, E6 }
+#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, C7, B7, F1 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2
+#define SELECT_SOFT_SERIAL_SPEED 1
+/*Sets the protocol speed when using serial communication*/
+//Speeds:
+//0: about 189kbps (Experimental only)
+//1: about 137kbps (default)
+//2: about 75kbps
+//3: about 39kbps
+//4: about 26kbps
+//5: about 20kbps
+
+// Right side has to be the master since 1, LED data is output from right side, and 2, Audio pin is prepared on right side as a reserve.
+#define MASTER_RIGHT
+
+// for "Generic" Promicro to be detected correctly as lefthand side (slave)
+#define SPLIT_USB_DETECT
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+
+#ifdef RGBLIGHT_ENABLE
+#   define RGBLED_NUM 123
+
+// Do not define "RGBLED_SPLIT" since somehow it doesn't work well yet.
+// Even thhough "#define RGBLED_SPLIT { 60, 63 }" was set, LEDs on the sub keyboad side didn't turn on.
+// Not sure but rgblight_sethsv_at() might not support RGBLED_SPLIT yet.
+// Instead, LED data is tranferred from right side to the left via TRRS cable.
+
+#   define RGBLIGHT_LIMIT_VAL 80
+#   define RGBLIGHT_LAYERS
+
+// By default, LEDs of the buttons which are pressed turn on.
+// #    define RGBLIGHT_EFFECT_TWINKLE
+// #    define RGBLIGHT_EFFECT_KNIGHT
+
+
+// RGBLIGHT LED MAP
+//     Right 1st row (12 LEDs)
+//     ENCODER
+//     Right 2nd .. 5th row(13, 12, 13, 12 LEDs)
+//     Left 1st .. 5th row (12 LEDs x 5 rows)
+
+#   define RGBLIGHT_LED_MAP { \
+    60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71, \
+    97, \
+    84,  83,  82,  81,  80,  79,  78,  77,  76,  75,  74,  73,  72, \
+    85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,  96, \
+    110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99,  98, \
+    111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, \
+    \
+    11,  10,  9,   8,   7,   6,   5,   4,   3,   2,   1,   0,  \
+    12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23, \
+    35,  34,  33,  32,  31,  30,  29,  28,  27,  26,  25,  24, \
+    36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47, \
+    59,  58,  57,  56,  55,  54,  53,  52,  51,  50,  49,  48  \
+    }
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+/* ws2812 RGB MATRIX */
+#   define DRIVER_LED_TOTAL 123
+#   define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
+
+//  for all fingers used at once.
+#   define LED_HITS_TO_REMEMBER 10
+
+#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
+
+// the above brighness setting has no effect on rgb_matrix_set_color().
+// Use darker colors instead.
+/*              RGB darker COLORS             */
+#   define RGB_DARKWHITE 0x66, 0x66, 0x66
+#   define RGB_DARKRED 0x66, 0x0, 0x0
+#   define RGB_DARKCORAL 0x66, 0x31, 0x1E
+#   define RGB_DARKORANGE 0x66, 0x33, 0x0
+#   define RGB_DARKGOLDENROD 0x56, 0x42, 0xD
+#   define RGB_DARKGOLD 0x66, 0x56, 0x0
+#   define RGB_DARKYELLOW 0x66, 0x66, 0x0
+#   define RGB_DARKCHARTREUSE 0x33, 0x66, 0x0
+#   define RGB_DARKGREEN 0x0, 0x66, 0x0
+#   define RGB_DARKSPRINGGREEN 0x0, 0x66, 0x33
+#   define RGB_DARKTURQUOISE 0x1C, 0x2C, 0x2A
+#   define RGB_DARKTEAL 0x0, 0x33, 0x33
+#   define RGB_DARKCYAN 0x0, 0x66, 0x66
+#   define RGB_DARKAZURE 0x3D, 0x62, 0x66
+#   define RGB_DARKBLUE 0x0, 0x0, 0x66
+#   define RGB_DARKPURPLE 0x30, 0x0, 0x66
+#   define RGB_DARKMAGENTA 0x66, 0x0, 0x66
+#   define RGB_DARKPINK 0x66, 0x33, 0x4C
+
+//  https://docs.qmk.fm/#/feature_rgb_matrix
+//  Enable suspend mode.
+// #    define RGB_DISABLE_WHEN_USB_SUSPENDED true
+
+#   define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+// #define ENABLE_RGB_MATRIX_CYCLE_ALL
+// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+// #define ENABLE_RGB_MATRIX_DUAL_BEACON
+// #   define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#   define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #define ENABLE_RGB_MATRIX_SPLASH
+#   define ENABLE_RGB_MATRIX_MULTISPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif  // RGB_MATRIX_ENABLE
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+// /* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * 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
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+/* Audio */
+#ifdef AUDIO_ENABLE
+#   define AUDIO_PIN B5  // use EX1 = PB5 = PIN9 as Audio output
+// #define DAC_SAMPLE_MAX 32768U
+#   define DAC_SAMPLE_MAX 65535U
+// #define AUDIO_CLICKY
+#   define NO_MUSIC_MODE
+// #define STARTUP_SONG SONG(FANTASIE_IMPROMPTU)
+// #define STARTUP_SONG SONG(NOCTURNE_OP_9_NO_1)
+// #define STARTUP_SONG SONG(USSR_ANTHEM)
+// #define STARTUP_SONG SONG(CAMPANELLA)
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+#ifdef MIDI_ENABLE
+#   define MIDI_ADVANCED
+// Initial velocity value (avoid using 127 since it is used as a special number in some sound sources.)
+#   define MIDI_INITIAL_VELOCITY 117
+#endif  //  MIDI_ENABLE
+
+/*
+ * Encoder options
+ */
+#ifdef ENCODER_ENABLE
+#   define ENCODERS_PAD_A { }
+#   define ENCODERS_PAD_B { }
+#   define ENCODER_RESOLUTIONS { }
+#   define ENCODERS_PAD_A_RIGHT { B4 }
+#   define ENCODERS_PAD_B_RIGHT { B6 }
+#   define ENCODER_RESOLUTIONS_RIGHT { 4 }
+#   define TAP_CODE_DELAY 10
+#endif  // ENCODER_ENABLE
+
+/* 2021/01/22 added to shrink firmware size */
+// NO_ACTION_TAPPING -1964 bytes, however, this disables Layer mods...
+// #define NO_ACTION_TAPPING
+// NO_ACTION_ONESHOT -388 bytes
+#define NO_ACTION_ONESHOT
diff --git a/keyboards/giabalanai/giabalanai.c b/keyboards/giabalanai/giabalanai.c
new file mode 100644
index 0000000000..6f8e359479
--- /dev/null
+++ b/keyboards/giabalanai/giabalanai.c
@@ -0,0 +1,255 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "giabalanai.h"
+
+// the velocity difference from the velocity of the root note.
+#define UNISON_VELOCITY_OFFSET 30
+
+#ifdef RGBLIGHT_ENABLE
+#    define NO_LED 255
+/* Conversion map from keylocation (MATRIX_ROWS x2(split) x MATRIX_COLS) to led IDs.
+  led IDs are the number starts "0" from upper left corner of left side,
+  enumerated from left to right, from top to bottom.
+  Then emumeration follows to the right side, starting from "60".
+
+  Note that the conversion from physical LED serial alighment to
+    the led IDs is done with RGBLIGHT_LED_MAP beforehand.                          */
+
+#    ifdef GIABARINAIX2
+const uint8_t PROGMEM convert_key_to_led[] =
+{
+    0,  12,  24,  36,  48,  11,  23,  35,  47,  59,
+    1,  13,  25,  37,  49,  10,  22,  34,  46,  58,
+    2,  14,  26,  38,  50,  9,   21,  33,  45,  57,
+    3,  15,  27,  39,  51,  8,   20,  32,  44,  56,
+    4,  16,  28,  40,  52,  7,   19,  31,  43,  55,
+    5,  17,  29,  41,  53,  6,   18,  30,  42,  54,
+  119, 107,  95,  83,  71, 108,  96,  84,  72,  60,
+  118, 106,  94,  82,  70, 109,  97,  85,  73,  61,
+  117, 105,  93,  81,  69, 110,  98,  86,  74,  62,
+  116, 104,  92,  80,  68, 111,  99,  87,  75,  63,
+  115, 103,  91,  79,  67, 112, 100,  88,  76,  64,
+  114, 102,  90,  78,  66, 113, 101,  89,  77,  65
+};
+
+#    else
+const uint8_t PROGMEM convert_key_to_led[] =
+{
+0,      12,    24,    36,    48,      11,    23,    35,     47,     59,
+1,      13,    25,    37,    49,      10,    22,    34,     46,     58,
+2,      14,    26,    38,    50,      9,     21,    33,     45,     57,
+3,      15,    27,    39,    51,      8,     20,    32,     44,     56,
+4,      16,    28,    40,    52,      7,     19,    31,     43,     55,
+5,      17,    29,    41,    53,      6,     18,    30,     42,     54,
+
+85,     86,    87,    88,    89,      90,    91,    NO_LED, NO_LED, NO_LED,
+98,     99,    100,   101,   102,     103,   104,   NO_LED, NO_LED, NO_LED,
+NO_LED, 111,   112,   113,   114,     115,   116,   NO_LED, NO_LED, NO_LED,
+NO_LED, 97,    96,    95,    94,      93,    92,    NO_LED, NO_LED, NO_LED,
+NO_LED, 110,   109,   108,   107,     106,   105,   NO_LED, NO_LED, NO_LED,
+NO_LED, 122,   121,   120,   119,     118,   117,   NO_LED, NO_LED, NO_LED
+};
+
+/* Top 2 rows on the right side (LED:60-84) are
+ duplicates of the bottom 2 rows (LED:85-122).
+ LED:97 = Encoder,
+ LED:110 don't have a duplicate on the top row,
+ LED:72 is used when r20 is pressed (not a duplicate) */
+const uint8_t PROGMEM convert_key_to_led2[] =
+{
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+60,     61,     62,     63,     64,       65,     66,     NO_LED, NO_LED, NO_LED,
+72,     73,     74,     75,     76,       77,     78,     NO_LED, NO_LED, NO_LED,
+NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,   NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,
+NO_LED, NO_LED, 71,     70,     69,       68,     67,     NO_LED, NO_LED, NO_LED,
+NO_LED, 84,     83,     82,     81,       80,     79,     NO_LED, NO_LED, NO_LED
+};
+#    endif
+#endif  //  RGBLIGHT_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+
+led_config_t g_led_config = {
+    {
+        { 74,     75, 98,  99, 122, 63, 86,     87,    110,    111 },
+        { 73,     76, 97, 100, 121, 64, 85,     88,    109,    112 },
+        { 72,     77, 96, 101, 120, 65, 84,     89,    108,    113 },
+        { 71,     78, 95, 102, 119, 66, 83,     90,    107,    114 },
+        { 70,     79, 94, 103, 118, 67, 82,     91,    106,    115 },
+        { 69,     80, 93, 104, 117, 68, 81,     92,    105,    116 },
+        { 26,     27, 28,  29,  30, 31, 32, NO_LED, NO_LED, NO_LED },
+        { 50,     49, 48,  47,  46, 45, 44, NO_LED, NO_LED, NO_LED },
+        { 25,     51, 52,  53,  54, 55, 56, NO_LED, NO_LED, NO_LED },
+        { NO_LED, 12, 37,  36,  35, 34, 33, NO_LED, NO_LED, NO_LED },
+        { NO_LED, 38, 39,  40,  41, 42, 43, NO_LED, NO_LED, NO_LED },
+        { NO_LED, 62, 61,  60,  59, 58, 57, NO_LED, NO_LED, NO_LED }
+    }, {
+        { 120,  0 }, { 128,  0 }, { 136,  0 }, { 144,  0 }, { 152,  0 }, { 160,  0 }, { 168,  0 }, { 176,  0 }, { 184,  0 }, { 192,  0 }, { 200,  0 }, { 208,  0 },
+        { 224, 32 },
+        { 212, 16 }, { 204, 16 }, { 196, 16 }, { 188, 16 }, { 180, 16 }, { 172, 16 }, { 164, 16 }, { 156, 16 }, { 148, 16 }, { 140, 16 }, { 132, 16 }, { 124, 16 }, { 116, 16 },
+        { 120, 32 }, { 128, 32 }, { 136, 32 }, { 144, 32 }, { 152, 32 }, { 160, 32 }, { 168, 32 }, { 176, 32 }, { 184, 32 }, { 192, 32 }, { 200, 32 }, { 208, 32 },
+        { 212, 48 }, { 204, 48 }, { 196, 48 }, { 188, 48 }, { 180, 48 }, { 172, 48 }, { 164, 48 }, { 156, 48 }, { 148, 48 }, { 140, 48 }, { 132, 48 }, { 124, 48 }, { 116, 48 },
+        { 120, 64 }, { 128, 64 }, { 136, 64 }, { 144, 64 }, { 152, 64 }, { 160, 64 }, { 168, 64 }, { 176, 64 }, { 184, 64 }, { 192, 64 }, { 200, 64 }, { 208, 64 },
+
+        {  88,  0 }, {  80,  0 }, {  72,  0 }, {  64,  0 }, {  56,  0 }, {  48,  0 }, {  40,  0 }, {  32,  0 }, {  24,  0 }, {  16,  0 }, {   8,  0 }, {   0,  0 },
+        {   4, 16 }, {  12, 16 }, {  20, 16 }, {  28, 16 }, {  36, 16 }, {  44, 16 }, {  52, 16 }, {  60, 16 }, {  68, 16 }, {  76, 16 }, {  84, 16 }, {  92, 16 },
+        {  96, 32 }, {  88, 32 }, {  80, 32 }, {  72, 32 }, {  64, 32 }, {  56, 32 }, {  48, 32 }, {  40, 32 }, {  32, 32 }, {  24, 32 }, {  16, 32 }, {   8, 32 },
+        {  12, 48 }, {  20, 48 }, {  28, 48 }, {  36, 48 }, {  44, 48 }, {  52, 48 }, {  60, 48 }, {  68, 48 }, {  76, 48 }, {  84, 48 }, {  92, 48 }, { 100, 48 },
+        { 104, 64 }, {  96, 64 }, {  88, 64 }, {  80, 64 }, {  72, 64 }, {  64, 64 }, {  56, 64 }, {  48, 64 }, {  40, 64 }, {  32, 64 }, {  24, 64 }, {  16, 64 }
+    }, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    }
+};
+
+// const uint8_t PROGMEM convert_led_location2number[] = {
+//     74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63,
+//     75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+//     98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87,
+//     99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+//     122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112, 111,
+//
+//     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+//     25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13,
+//     26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,     12,
+//     50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38,
+//     51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62
+// };
+#endif
+
+void my_process_midi4Bass(uint8_t channel, keyrecord_t *record,
+                          uint8_t *chord_status, uint8_t chord, uint16_t root_note, bool is_single_bass) {
+    uint8_t velocity = midi_config.velocity;
+    if (record->event.pressed) {
+        if (chord_status[chord] == MIDI_INVALID_NOTE) {
+            uint8_t note = midi_compute_note(root_note);
+            if (is_single_bass) {
+                midi_send_noteon(&midi_device, channel, note, velocity);
+            } else {
+                midi_send_noteon(&midi_device, channel, note, velocity);
+                midi_send_noteon(&midi_device, channel, note + 12, velocity);  // +1 Octave
+            }
+            dprintf("midi noteon channel:%d note:%d velocity:%d\n", channel, note, velocity);
+            chord_status[chord] = note;  // store root_note status.
+        }
+    } else {
+        uint8_t note = chord_status[chord];
+        if (note != MIDI_INVALID_NOTE) {
+            if (is_single_bass) {
+                midi_send_noteoff(&midi_device, channel, note, velocity);
+            } else {
+                midi_send_noteoff(&midi_device, channel, note, velocity);
+                midi_send_noteoff(&midi_device, channel, note + 12, velocity);  // +1 Octave
+            }
+            dprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, velocity);
+        }
+        chord_status[chord] = MIDI_INVALID_NOTE;
+    }
+}
+
+void my_process_midi4TriadChords(uint8_t channel, keyrecord_t *record,
+                                 uint8_t *chord_status, uint8_t chord, uint16_t root_note,
+                                 int8_t offset1, int8_t offset2, int8_t offset3) {
+    uint8_t velocity = midi_config.velocity;
+    if (record->event.pressed) {
+        if (chord_status[chord] == MIDI_INVALID_NOTE) {
+            uint8_t note = midi_compute_note(root_note);
+            midi_send_noteon(&midi_device, channel, note + offset1, velocity);
+            midi_send_noteon(&midi_device, channel, note + offset2, velocity);
+            midi_send_noteon(&midi_device, channel, note + offset3, velocity);
+            dprintf("midi noteon channel:%d note:%d velocity:%d\n", channel, note, velocity);
+            chord_status[chord] = note;  // store root_note status.
+        }
+    } else {
+        uint8_t note = chord_status[chord];
+        if (note != MIDI_INVALID_NOTE) {
+            midi_send_noteoff(&midi_device, channel, note + offset1, velocity);
+            midi_send_noteoff(&midi_device, channel, note + offset2, velocity);
+            midi_send_noteoff(&midi_device, channel, note + offset3, velocity);
+            dprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, velocity);
+        }
+    chord_status[chord] = MIDI_INVALID_NOTE;
+    }
+}
+
+void my_process_midi(uint8_t channel, uint16_t keycode, keyrecord_t *record, uint8_t *my_tone_status, int8_t offset, bool melody_unison_suppress) {
+
+    uint8_t tone     = keycode - MIDI_TONE_MIN;
+
+    uint8_t melody_unison_velocity;
+    if (melody_unison_suppress) {
+        if (midi_config.velocity > UNISON_VELOCITY_OFFSET){
+            melody_unison_velocity = midi_config.velocity - UNISON_VELOCITY_OFFSET;
+        } else {
+            melody_unison_velocity = 0;
+        }
+    } else {
+        melody_unison_velocity = midi_config.velocity;
+    }
+
+    if (record->event.pressed) {
+        if (my_tone_status[tone] == MIDI_INVALID_NOTE) {
+            uint8_t note = midi_compute_note(keycode);
+            midi_send_noteon(&midi_device, channel, note + offset, melody_unison_velocity);
+            dprintf("midi noteon channel:%d note:%d tone:%d velocity:%d\n", channel, note, tone, melody_unison_velocity);
+            my_tone_status[tone] = note;  // store root_note status.
+        }
+    } else {
+        uint8_t note = my_tone_status[tone];
+        if (note != MIDI_INVALID_NOTE) {
+            midi_send_noteoff(&midi_device, channel, note + offset, melody_unison_velocity);
+            dprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, melody_unison_velocity);
+        }
+    my_tone_status[tone] = MIDI_INVALID_NOTE;
+    }
+}
+
+#ifdef RGBLIGHT_ENABLE
+void keylight_manager(keyrecord_t *record, uint8_t hue, uint8_t sat, uint8_t val, uint8_t keylocation) {
+    if (keylocation == NO_LED) {
+        return;  // do nothing.
+#    ifdef CONSOLE_ENABLE
+        uprintf("keylight_manager, NO_LED\n");
+#    endif
+    }
+
+    if (record->event.pressed) {
+        rgblight_sethsv_at(hue, sat, val, keylocation);
+    } else {
+        rgblight_sethsv_at(HSV_BLACK, keylocation);
+    }
+}
+
+#endif  // RGBLIGHT_ENABLE
+
diff --git a/keyboards/giabalanai/giabalanai.h b/keyboards/giabalanai/giabalanai.h
new file mode 100644
index 0000000000..df4759f00f
--- /dev/null
+++ b/keyboards/giabalanai/giabalanai.h
@@ -0,0 +1,132 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \
+      l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \
+        l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \
+          l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \
+            l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \
+    \
+    r20, \
+      r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b,   renc,  \
+    r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, r1c,  \
+      r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, r2c   \
+) { \
+    { l00,   l10,  l20, l30, l40, l0b, l1b, l2b,   l3b,   l4b }, \
+    { l01,   l11,  l21, l31, l41, l0a, l1a, l2a,   l3a,   l4a }, \
+    { l02,   l12,  l22, l32, l42, l09, l19, l29,   l39,   l49 }, \
+    { l03,   l13,  l23, l33, l43, l08, l18, l28,   l38,   l48 }, \
+    { l04,   l14,  l24, l34, l44, l07, l17, l27,   l37,   l47 }, \
+    { l05,   l15,  l25, l35, l45, l06, l16, l26,   l36,   l46 }, \
+    \
+    { r00,   r01,  r02, r03, r04, r05, r06, KC_NO, KC_NO, KC_NO }, \
+    { r10,   r11,  r12, r13, r14, r15, r16, KC_NO, KC_NO, KC_NO }, \
+    { r20,   r21,  r22, r23, r24, r25, r26, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, renc, r0b, r0a, r09, r08, r07, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, r1c,  r1b, r1a, r19, r18, r17, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, r2c,  r2b, r2a, r29, r28, r27, KC_NO, KC_NO, KC_NO }  \
+}
+
+#define LAYOUT_giabarinaix2( \
+    l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \
+      l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \
+        l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \
+          l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \
+            l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \
+    \
+    r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b, \
+      r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, \
+        r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, \
+          r30, r31, r32, r33, r34, r35, r36, r37, r38, r39, r3a, r3b, \
+            r40, r41, r42, r43, r44, r45, r46, r47, r48, r49, r4a, r4b  \
+) { \
+    { l00, l10, l20, l30, l40, l0b, l1b, l2b, l3b, l4b }, \
+    { l01, l11, l21, l31, l41, l0a, l1a, l2a, l3a, l4a }, \
+    { l02, l12, l22, l32, l42, l09, l19, l29, l39, l49 }, \
+    { l03, l13, l23, l33, l43, l08, l18, l28, l38, l48 }, \
+    { l04, l14, l24, l34, l44, l07, l17, l27, l37, l47 }, \
+    { l05, l15, l25, l35, l45, l06, l16, l26, l36, l46 }, \
+    \
+    { r4b, r3b, r2b, r1b, r0b, r40, r30, r20, r10, r00 }, \
+    { r4a, r3a, r2a, r1a, r0a, r41, r31, r21, r11, r01 }, \
+    { r49, r39, r29, r19, r09, r42, r32, r22, r12, r02 }, \
+    { r48, r38, r28, r18, r08, r43, r33, r23, r13, r03 }, \
+    { r47, r37, r27, r17, r07, r44, r34, r24, r14, r04 }, \
+    { r46, r36, r26, r16, r06, r45, r35, r25, r15, r05 }  \
+}
+
+
+#define _________________QWERTY_L1_________________ KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
+#define _________________QWERTY_L2_________________ KC_A,    KC_S,    KC_D,    KC_F,    KC_G
+#define _________________QWERTY_L3_________________ KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
+
+#define _________________QWERTY_R1_________________ KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
+#define _________________QWERTY_R2_________________ KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN
+#define _________________QWERTY_R3_________________ KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
+
+#define _________________COLEMAK_L1________________ KC_Q,    KC_W,    KC_F,    KC_P,    KC_G
+#define _________________COLEMAK_L2________________ KC_A,    KC_R,    KC_S,    KC_T,    KC_D
+#define _________________COLEMAK_L3________________ KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
+
+#define _________________COLEMAK_R1________________ KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN
+#define _________________COLEMAK_R2________________ KC_H,    KC_N,    KC_E,    KC_I,    KC_O
+#define _________________COLEMAK_R3________________ KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
+
+#define _________________NUMBER_L__________________ KC_1,    KC_2,    KC_3,    KC_4,    KC_5
+#define _________________NUMBER_R__________________ KC_6,    KC_7,    KC_8,    KC_9,    KC_0
+
+#define _________________FUNC__L___________________ KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
+#define _________________FUNC__R___________________ KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
+
+#ifdef RGBLIGHT_ENABLE
+
+extern const uint8_t PROGMEM convert_key_to_led[];
+#    ifndef GIABARINAIX2
+extern const uint8_t PROGMEM convert_key_to_led2[];
+#    endif
+#endif  //  RGBLIGHT_ENABLE
+
+// #ifdef RGB_MATRIX_ENABLE
+// extern const uint8_t PROGMEM convert_led_location2number[];
+// #endif
+
+extern MidiDevice midi_device;
+void my_process_midi4Bass(uint8_t channel, keyrecord_t *record,
+                          uint8_t *chord_status, uint8_t chord, uint16_t root_note, bool is_single_bass);
+
+void my_process_midi4TriadChords(uint8_t channel, keyrecord_t *record,
+                                 uint8_t *chord_status, uint8_t chord, uint16_t root_note,
+                                 int8_t offset1, int8_t offset2, int8_t offset3);
+
+void my_process_midi(uint8_t channel, uint16_t keycode, keyrecord_t *record, uint8_t *my_tone_status, int8_t offset, bool melody_unison_suppress);
+
+
+#ifdef RGBLIGHT_ENABLE
+void keylight_manager(keyrecord_t *record, uint8_t hue, uint8_t sat, uint8_t val, uint8_t keylocation);
+#endif  // RGBLIGHT_ENABLE
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
new file mode 100644
index 0000000000..b0b52b4ab8
--- /dev/null
+++ b/keyboards/giabalanai/info.json
@@ -0,0 +1,125 @@
+{
+    "keyboard_name": "giabalanai",
+    "manufacturer": "3araht",
+    "url": "https://github.com/3araht",
+    "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B0",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+          "layout": [
+              {"label": "l00", "x": 0,  "y": 0},
+              {"label": "l01", "x": 1,  "y": 0},
+              {"label": "l02", "x": 2,  "y": 0},
+              {"label": "l03", "x": 3,  "y": 0},
+              {"label": "l04", "x": 4,  "y": 0},
+              {"label": "l05", "x": 5,  "y": 0},
+              {"label": "l06", "x": 6,  "y": 0},
+              {"label": "l07", "x": 7,  "y": 0},
+              {"label": "l08", "x": 8,  "y": 0},
+              {"label": "l09", "x": 9,  "y": 0},
+              {"label": "l0a", "x": 10, "y": 0},
+              {"label": "l0b", "x": 11, "y": 0},
+
+              {"label": "l10", "x": 0.5,  "y": 1},
+              {"label": "l11", "x": 1.5,  "y": 1},
+              {"label": "l12", "x": 2.5,  "y": 1},
+              {"label": "l13", "x": 3.5,  "y": 1},
+              {"label": "l14", "x": 4.5,  "y": 1},
+              {"label": "l15", "x": 5.5,  "y": 1},
+              {"label": "l16", "x": 6.5,  "y": 1},
+              {"label": "l17", "x": 7.5,  "y": 1},
+              {"label": "l18", "x": 8.5,  "y": 1},
+              {"label": "l19", "x": 9.5,  "y": 1},
+              {"label": "l1a", "x": 10.5, "y": 1},
+              {"label": "l1b", "x": 11.5, "y": 1},
+
+              {"label": "r20", "x": 14.5, "y": 1},
+
+              {"label": "l20", "x": 1,  "y": 2},
+              {"label": "l21", "x": 2,  "y": 2},
+              {"label": "l22", "x": 3,  "y": 2},
+              {"label": "l23", "x": 4,  "y": 2},
+              {"label": "l24", "x": 5,  "y": 2},
+              {"label": "l25", "x": 6,  "y": 2},
+              {"label": "l26", "x": 7,  "y": 2},
+              {"label": "l27", "x": 8,  "y": 2},
+              {"label": "l28", "x": 9,  "y": 2},
+              {"label": "l29", "x": 10, "y": 2},
+              {"label": "l2a", "x": 11, "y": 2},
+              {"label": "l2b", "x": 12, "y": 2},
+
+              {"label": "r00", "x": 15,   "y": 2},
+              {"label": "r01", "x": 16,   "y": 2},
+              {"label": "r02", "x": 17,   "y": 2},
+              {"label": "r03", "x": 18,   "y": 2},
+              {"label": "r04", "x": 19,   "y": 2},
+              {"label": "r05", "x": 20,   "y": 2},
+              {"label": "r06", "x": 21,   "y": 2},
+              {"label": "r07", "x": 22,   "y": 2},
+              {"label": "r08", "x": 23,   "y": 2},
+              {"label": "r09", "x": 24,   "y": 2},
+              {"label": "r0a", "x": 25,   "y": 2},
+              {"label": "r0b", "x": 26,   "y": 2},
+
+              {"label": "renc", "x": 27.5, "y": 2},
+
+              {"label": "l30", "x": 1.5,  "y": 3},
+              {"label": "l31", "x": 2.5,  "y": 3},
+              {"label": "l32", "x": 3.5,  "y": 3},
+              {"label": "l33", "x": 4.5,  "y": 3},
+              {"label": "l34", "x": 5.5,  "y": 3},
+              {"label": "l35", "x": 6.5,  "y": 3},
+              {"label": "l36", "x": 7.5,  "y": 3},
+              {"label": "l37", "x": 8.5,  "y": 3},
+              {"label": "l38", "x": 9.5,  "y": 3},
+              {"label": "l39", "x": 10.5, "y": 3},
+              {"label": "l3a", "x": 11.5, "y": 3},
+              {"label": "l3b", "x": 12.5, "y": 3},
+
+              {"label": "r10", "x": 14.5, "y": 3},
+              {"label": "r11", "x": 15.5, "y": 3},
+              {"label": "r12", "x": 16.5, "y": 3},
+              {"label": "r13", "x": 17.5, "y": 3},
+              {"label": "r14", "x": 18.5, "y": 3},
+              {"label": "r15", "x": 19.5, "y": 3},
+              {"label": "r16", "x": 20.5, "y": 3},
+              {"label": "r17", "x": 21.5, "y": 3},
+              {"label": "r18", "x": 22.5, "y": 3},
+              {"label": "r19", "x": 23.5, "y": 3},
+              {"label": "r1a", "x": 24.5, "y": 3},
+              {"label": "r1b", "x": 25.5, "y": 3},
+              {"label": "r1c", "x": 26.5, "y": 3},
+
+              {"label": "l40", "x": 2,  "y": 4},
+              {"label": "l41", "x": 3,  "y": 4},
+              {"label": "l42", "x": 4,  "y": 4},
+              {"label": "l43", "x": 5,  "y": 4},
+              {"label": "l44", "x": 6,  "y": 4},
+              {"label": "l45", "x": 7,  "y": 4},
+              {"label": "l46", "x": 8,  "y": 4},
+              {"label": "l47", "x": 9,  "y": 4},
+              {"label": "l48", "x": 10, "y": 4},
+              {"label": "l49", "x": 11, "y": 4},
+              {"label": "l4a", "x": 12, "y": 4},
+              {"label": "l4b", "x": 13, "y": 4},
+
+              {"label": "r21", "x": 15, "y": 4},
+              {"label": "r22", "x": 16, "y": 4},
+              {"label": "r23", "x": 17, "y": 4},
+              {"label": "r24", "x": 18, "y": 4},
+              {"label": "r25", "x": 19, "y": 4},
+              {"label": "r26", "x": 20, "y": 4},
+              {"label": "r27", "x": 21, "y": 4},
+              {"label": "r28", "x": 22, "y": 4},
+              {"label": "r29", "x": 23, "y": 4},
+              {"label": "r2a", "x": 24, "y": 4},
+              {"label": "r2b", "x": 25, "y": 4},
+              {"label": "r2c", "x": 26, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/giabalanai/keymaps/2firmware/config.h b/keyboards/giabalanai/keymaps/2firmware/config.h
new file mode 100644
index 0000000000..a9c772adef
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/2firmware/config.h
@@ -0,0 +1,9 @@
+#pragma once
+
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
diff --git a/keyboards/giabalanai/keymaps/2firmware/keymap.c b/keyboards/giabalanai/keymaps/2firmware/keymap.c
new file mode 100644
index 0000000000..2877f8ecd8
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/2firmware/keymap.c
@@ -0,0 +1,739 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "split_util.h"
+#include "print.h"
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+#define DF_QWER  DF(_QWERTY)
+#define DF_COLE  DF(_COLEMAK)
+#define MO_ADJ   MO(_ADJUST)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE  LT(_FN, KC_MUTE)
+#define SHIF_UP  RSFT_T(KC_UP)
+#define ADJ_EIS  LT(_ADJUST,KC_LANG2)
+#define MIS_KAN  LT(_MISC,KC_LANG1)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+// UNISON flags
+static bool melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
+static bool melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
+
+static bool melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
+
+// To record the status of Bass Chord (single or dyad, default: dyad.)
+typedef union {
+    uint32_t raw;
+    struct {
+        bool isSingleBass:1;
+    };
+} user_config_t;
+user_config_t user_config;
+
+#define IS_SINGLE_BASS()   (user_config.isSingleBass)
+
+#ifdef RGBLIGHT_ENABLE
+/* used to specify there is no LED on the keylocation. */
+#    define NO_LED 255
+#endif  //  RGBLIGHT_ENABLE
+
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,      //  MIDI C-system
+    _FAKE_B_SYSTEM,      //  MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system.
+    _C_SYSTEM_BASS2ROW,  //  counter bass system
+    _C_SYSTEM_ENTIRELY,  //  single notes for both left and right keybaords.
+    _CHROMATONE,
+    _CFLIP_BASS2ROW,     //  180 degree flipped layout on right side keyboard
+    _QWERTY,
+    _COLEMAK,
+    _ADJUST,             //  for Fn keys, etc.
+    _FN                  //  for changing layers, octaves, etc.
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION,
+    CSYSTEM,  // C-SYSTEM layout
+    BSYSTEM,  // B-SYSTEM layout
+    CNTBASC,  // CouNTer BASs C-system layout
+    CSYSALL,  // C-SYStem ALL layout
+    CHRTONE,  // CHRomaTONE layout
+    CFLIP2B,  // C-system FLIPped 2(to) Backwards
+    TGLBASS,  // ToGgLe BASS unison
+    TGLMICH,  // ToGgLe MIdi CHannel separation
+    MELDYAL,  // MELody DYad Low
+    MELODYS,  // MELODY Single
+    MELDYAH,  // MELody DYad High
+    TGLUVEL   // ToGgLe Unison VELocity
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+static uint8_t my_tone_status[MIDI_TONE_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* fake B-system */
+  [_FAKE_B_SYSTEM] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+    MI_Ab_2,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Gb_3, MI_A_3, MI_C_4,  MI_Eb_4, MI_Gb_4, MI_A_4, MI_C_5,  MI_Eb_5, MI_Gb_5,     _______,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3, MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4, MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3, MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4, MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5
+  ),
+
+  /* BASS2row */
+  [_C_SYSTEM_BASS2ROW] = LAYOUT(
+    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
+      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    _______,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* C-system entirely */
+  [_C_SYSTEM_ENTIRELY] = LAYOUT(
+    MI_BENDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
+      MI_BENDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* Chromatone */
+  [_CHROMATONE] = LAYOUT(
+    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,
+      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,
+        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2,
+          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,  MI_D_2,
+            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2, MI_Eb_2,
+
+    MI_C_2,
+      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3,    FN_MUTE,
+    MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3, MI_C_4,
+      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3
+  ),
+
+  [_CFLIP_BASS2ROW] = LAYOUT(
+    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
+      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+
+    MI_G_5,
+      MI_F_5,  MI_D_5,  MI_B_4,  MI_Ab_4, MI_F_4,  MI_D_4,  MI_B_3,  MI_Ab_3, MI_F_3,  MI_D_3,  MI_B_2,  MI_Ab_2,   FN_MUTE,
+    MI_Fs_5, MI_Eb_5, MI_C_5,  MI_A_4,  MI_Fs_4, MI_Eb_4, MI_C_4,  MI_A_3,  MI_Fs_3, MI_Eb_3, MI_C_3,  MI_A_2,  MI_Fs_2,
+      MI_E_5,  MI_Db_5, MI_Bb_4, MI_G_4,  MI_E_4,  MI_Db_4, MI_Bb_3, MI_G_3,  MI_E_3,  MI_Db_3, MI_Bb_2, MI_G_2
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  /* COLEMAK */
+  [_COLEMAK] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
+        KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
+          KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
+            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  /* ADJUST */
+  [_ADJUST] = LAYOUT_wrapper(
+    _______, _________________FUNC__L___________________, _________________FUNC__R___________________, _______,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  _______,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_GRV,  _______,
+          _______, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_BSLS, _______,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+
+  /* Fn */
+  [_FN] = LAYOUT(
+    CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
+      DF_QWER, TGLBASS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TGLMICH,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    XXXXXXX,
+      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EEP_RST,   _______,
+    CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, XXXXXXX, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
+      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]        = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FAKE_B_SYSTEM]        = { ENCODER_CCW_CW(_______, _______) },
+    [_C_SYSTEM_BASS2ROW]    = { ENCODER_CCW_CW(_______, _______) },
+    [_C_SYSTEM_ENTIRELY]    = { ENCODER_CCW_CW(_______, _______) },
+    [_CHROMATONE]           = { ENCODER_CCW_CW(_______, _______) },
+    [_CFLIP_BASS2ROW]       = { ENCODER_CCW_CW(_______, _______) },
+    [_QWERTY]               = { ENCODER_CCW_CW(_______, _______) },
+    [_COLEMAK]              = { ENCODER_CCW_CW(_______, _______) },
+    [_ADJUST]               = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]                   = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+
+// Light up adjust layer keys (left keyboard)
+const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS({1,  10, HSV_ORANGE},
+                                                                             {21,  2, HSV_ORANGE},
+                                                                             {25,  3, HSV_ORANGE},
+                                                                             {30,  5, HSV_ORANGE},
+                                                                             {37,  2, HSV_ORANGE},
+                                                                             {45,  2, HSV_ORANGE},
+                                                                             {57,  2, HSV_ORANGE}
+);
+
+// Light up fn layer keys
+const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(                           //  left keyboard
+                                                                         {0,   6, HSV_ORANGE},      //  MIDI layouts
+                                                                         {11,  1, HSV_RED},         //  RGB_TOG
+                                                                         {12,  1, HSV_WHITE},       //  DF_QWER
+                                                                         {13,  1, HSV_CORAL},       //  TGLBASS
+                                                                         {24,  1, HSV_WHITE},       //  DF_COLE
+                                                                         {35,  1, HSV_TEAL},        //  TGLMICH
+#if 0  //  Color Test
+                                                                         {36,  1, HSV_WHITE},
+                                                                         {37,  1, HSV_RED},
+                                                                         {38,  1, HSV_CORAL},
+                                                                         {39,  1, HSV_ORANGE},
+                                                                         {40,  1, HSV_GOLDENROD},
+                                                                         {41,  1, HSV_GOLD},
+                                                                         {42,  1, HSV_YELLOW},
+                                                                         {43,  1, HSV_CHARTREUSE},
+                                                                         {44,  1, HSV_GREEN},
+                                                                         {45,  1, HSV_SPRINGGREEN},
+                                                                         {46,  1, HSV_TURQUOISE},
+                                                                         {47,  1, HSV_TEAL},
+                                                                         {48,  1, HSV_CYAN},
+                                                                         {49,  1, HSV_AZURE},
+                                                                         {50,  1, HSV_BLUE},
+                                                                         {51,  1, HSV_PURPLE},
+                                                                         {52,  1, HSV_MAGENTA},
+                                                                         {53,  1, HSV_PINK},
+#endif
+                                                                                                    //  right keyboard
+                                                                         {60,  6, HSV_ORANGE},      //  MIDI layouts
+                                                                         {74,  1, HSV_CORAL},       //  TGLBASS
+                                                                         {85,  1, HSV_BLUE},        //  MIDI Oct
+                                                                         {86,  1, HSV_CYAN},        //  MIDI Oct
+                                                                         {87,  1, HSV_SPRINGGREEN}, //  MIDI Oct
+                                                                         {88,  1, HSV_GREEN},       //  MIDI Oct
+                                                                         {89,  1, HSV_CHARTREUSE},  //  MIDI Oct
+                                                                         {96,  1, HSV_PINK},        //  EEP_RST
+                                                                         {98,  6, HSV_ORANGE},      //  MIDI layouts
+                                                                         {107, 1, HSV_YELLOW},      //  MI_VELD
+                                                                         {108, 1, HSV_GREEN},       //  MI_VELU
+                                                                         {110, 1, HSV_RED},         //  RGB_TOG
+                                                                         {112, 1, HSV_CORAL},       //  TGLBASS
+                                                                         {119, 1, HSV_CORAL},       //  TGLUVEL
+                                                                         {120, 1, HSV_CYAN},        //  MELDYAL
+                                                                         {121, 1, HSV_GOLD},        //  MELODYS
+                                                                         {122, 1, HSV_SPRINGGREEN}  //  MELDYAH
+);
+
+
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_fn_layer, my_adjust_layer);
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // Both layers will light up if both kb layers are active
+    rgblight_set_layer_state(0, layer_state_cmp(state, _FN));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _ADJUST));
+    return state;
+};
+
+#endif  //  RGBLIGHT_ENABLE
+
+void my_init(void){
+    //  Set octave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+}
+
+void eeconfig_init_user(void) {
+    midi_init();
+    my_init();
+
+    // Used to set octave to MI_OCT_0
+    midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+    // UNISON flags
+    melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
+    melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
+    melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
+
+    //  Reset Bass setting
+    user_config.raw = 0;  // default: dyad
+    eeconfig_update_user(user_config.raw);
+
+    //  Reset the midi keyboard layout
+    set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
+}
+
+void keyboard_post_init_user(void) {
+    my_init();
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+    for (uint8_t i = 0; i < MIDI_TONE_COUNT; i++) {
+        my_tone_status[i] = MIDI_INVALID_NOTE;
+    }
+    //  load EEPROM data for isSingleBass
+    user_config.raw = eeconfig_read_user();
+
+    // When USB cable is connected to the left side keyboard, use QWERTY layout by default.
+    if (is_keyboard_master() && isLeftHand) {
+        default_layer_set(1UL << _QWERTY);
+    }
+
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_layers = my_rgb_layers;
+
+    // Reset LED off
+    rgblight_sethsv(HSV_BLACK);
+#    if defined(RGBLIGHT_EFFECT_KNIGHT) || defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_sethsv(30, 50, 40);
+#        ifdef RGBLIGHT_EFFECT_KNIGHT
+    rgblight_mode(RGBLIGHT_MODE_KNIGHT);
+#        elif defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_mode(RGBLIGHT_MODE_TWINKLE+3);
+#        endif
+#    endif
+#endif  // RGBLIGHT_ENABLE
+};
+
+void toggle_isSingleBass(void) {
+#ifdef CONSOLE_ENABLE
+    uprintf("isSingleBass(before) %u\n", user_config.isSingleBass);
+#endif
+    user_config.isSingleBass = !user_config.isSingleBass;
+#ifdef CONSOLE_ENABLE
+    uprintf("isSingleBass(after) %u\n", user_config.isSingleBass);
+#endif
+
+    eeconfig_update_user(user_config.raw);
+}
+
+void toggle_MIDI_channel_separation(void) {
+    if (midi_chord_ch > 0) {
+        midi_chord_ch = 0;
+        midi_bass_ch  = 0;
+    } else {
+        midi_chord_ch = 1;
+        midi_bass_ch  = 2;
+    }
+}
+
+#ifdef RGBLIGHT_ENABLE
+void switch_keylight_color4bass(keyrecord_t *record, uint8_t keylocation){
+    switch (biton32(default_layer_state)) {
+        case _C_SYSTEM_BASE:
+            keylight_manager(record, HSV_GREEN, keylocation);
+            break;
+        case _FAKE_B_SYSTEM:
+            keylight_manager(record, HSV_ORANGE, keylocation);
+            break;
+        case _C_SYSTEM_BASS2ROW:
+            keylight_manager(record, HSV_YELLOW, keylocation);
+            break;
+        case _CFLIP_BASS2ROW:
+            keylight_manager(record, HSV_PURPLE, keylocation);
+            break;
+    }
+}
+void switch_keylight_color4chords(keyrecord_t *record, uint8_t keylocation){
+    switch (biton32(default_layer_state)) {
+        case _C_SYSTEM_BASE:
+            keylight_manager(record, HSV_SPRINGGREEN, keylocation);
+            break;
+        case _FAKE_B_SYSTEM:
+            keylight_manager(record, HSV_YELLOW, keylocation);
+            break;
+        case _C_SYSTEM_BASS2ROW:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+        case _CFLIP_BASS2ROW:
+            keylight_manager(record, HSV_MAGENTA, keylocation);
+            break;
+    }
+}
+#endif  // RGBLIGHT_ENABLE
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+#ifdef RGBLIGHT_ENABLE
+    /* prepare for turning on LEDs when keys are pressed. */
+    uint8_t r            = record->event.key.row;
+    uint8_t c            = record->event.key.col;
+    // uint8_t keylocation  = convert_key_to_led[MATRIX_COLS * r + c];
+    // uint8_t keylocation2 = convert_key_to_led2[MATRIX_COLS * r + c];
+    uint8_t keylocation  = pgm_read_byte(&convert_key_to_led[MATRIX_COLS * r + c]);
+    uint8_t keylocation2 = pgm_read_byte(&convert_key_to_led2[MATRIX_COLS * r + c]);
+#endif  // RGBLIGHT_ENABLE
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        //  set default layer and save it to EEPROM when MIDI key layers are selected.
+        case CSYSTEM:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASE);
+            }
+            break;
+
+        case BSYSTEM:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_FAKE_B_SYSTEM);
+            }
+            break;
+
+        case CNTBASC:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
+            }
+            break;
+
+        case CSYSALL:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_ENTIRELY);
+            }
+            break;
+
+        case CHRTONE:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_CHROMATONE);
+            }
+            break;
+
+        case CFLIP2B:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_CFLIP_BASS2ROW);
+            }
+            break;
+
+        case TGLBASS:
+            if (record->event.pressed) {
+                toggle_isSingleBass();
+            };
+            break;
+
+        case TGLMICH:
+            if (record->event.pressed) {
+                toggle_MIDI_channel_separation();
+            };
+            break;
+
+        case MELDYAL:
+            if (record->event.pressed) {
+                melody_dyad_low  = true;
+                melody_dyad_high = false;
+            };
+            break;
+
+        case MELODYS:
+            if (record->event.pressed) {
+                melody_dyad_low  = false;
+                melody_dyad_high = false;
+            };
+            break;
+
+        case MELDYAH:
+            if (record->event.pressed) {
+                melody_dyad_low  = false;
+                melody_dyad_high = true;
+            };
+            break;
+
+        case TGLUVEL:
+            if (record->event.pressed) {
+                melody_unison_suppress = !melody_unison_suppress;
+            };
+            break;
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, IS_SINGLE_BASS());
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4bass(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+#ifdef RGBLIGHT_ENABLE
+        case KC_A ... KC_RGUI:                // for QWERTY
+        case KC_GESC:
+        case ADJ_EIS:
+        case MO_ADJ:
+        case SHIF_UP:
+            keylight_manager(record, HSV_RED, keylocation);
+            break;
+#endif
+
+        // Keycodes on the right side.
+        case MIDI_TONE_MIN ... MIDI_TONE_MAX:  // notes on the right side keyboard.
+            //  root_note is played by process_midi().
+            if ( melody_dyad_high == true ) {        //  play 1 octave higher as well.
+                my_process_midi(0, keycode, record, my_tone_status, 12, melody_unison_suppress);
+#ifdef RGBLIGHT_ENABLE
+                keylight_manager(record, HSV_RED, keylocation);
+                keylight_manager(record, HSV_RED, keylocation2);
+#endif
+            } else if ( melody_dyad_low == true ) {  //  play 1 octave lower as well.
+                my_process_midi(0, keycode, record, my_tone_status, -12, melody_unison_suppress);
+#ifdef RGBLIGHT_ENABLE
+                keylight_manager(record, HSV_CYAN, keylocation);
+                keylight_manager(record, HSV_CYAN, keylocation2);
+#endif
+            } else {
+                uprintf("layer=%u, default_layer_state = %u\n", biton32(default_layer_state), default_layer_state);
+#ifdef RGBLIGHT_ENABLE
+                keylight_manager(record, HSV_GOLDENROD, keylocation);
+                keylight_manager(record, HSV_GOLDENROD, keylocation2);
+#endif
+            }
+            break;
+
+#ifdef RGBLIGHT_ENABLE
+        // case KC_MUTE:
+        case FN_MUTE:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+#endif
+    }
+    // If console is enabled, it will print the matrix position and status of each key pressed
+#if defined(CONSOLE_ENABLE) && defined(RGBLIGHT_ENABLE)
+    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+    uprintf("r=%d, c=%d, keyloc=%d, keyloc2=%d, matrix_col x r + c = %d\n", r, c, keylocation, keylocation2, MATRIX_COLS * r + c);
+#endif
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/2firmware/readme.md b/keyboards/giabalanai/keymaps/2firmware/readme.md
new file mode 100644
index 0000000000..e851c97af8
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/2firmware/readme.md
@@ -0,0 +1,12 @@
+# A personal keymap for giabalanai with RGBLIGHT_ENABLE = yes in rules.mk, which 3araht is using.
+"2firmware" requires writing the firmware separately to left and right keyboards in order to have different functionality when USB cable is connected to the left side keyboard. It can be used without the right side.
+(EE_HANDS is defined in 2firmware/config.h).  
+
+When USB cable is connected to the left side keyboard, QWERTY layout is used by default.
+
+
+Use below for writing the firmware to the left side keyboard.
+> make giabalanai:2firmware:avrdude-split-left  
+
+Use below for writing the firmware to the right side keyboard.
+> make giabalanai:2firmware:avrdude-split-right  
diff --git a/keyboards/giabalanai/keymaps/2firmware/rules.mk b/keyboards/giabalanai/keymaps/2firmware/rules.mk
new file mode 100644
index 0000000000..2ecc5f55c1
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/2firmware/rules.mk
@@ -0,0 +1,4 @@
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+CONSOLE_ENABLE =  no        # Console for debug
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/3araht/keymap.c b/keyboards/giabalanai/keymaps/3araht/keymap.c
new file mode 100644
index 0000000000..418b6e0ceb
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/3araht/keymap.c
@@ -0,0 +1,754 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "print.h"
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+#define DF_QWER  DF(_QWERTY)
+#define DF_COLE  DF(_COLEMAK)
+#define MO_ADJ   MO(_ADJUST)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE  LT(_FN, KC_MUTE)
+#define SHIF_UP  RSFT_T(KC_UP)
+#define ADJ_EIS  LT(_ADJUST,KC_LANG2)
+#define MIS_KAN  LT(_MISC,KC_LANG1)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+// UNISON flags
+static bool melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
+static bool melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
+
+static bool melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
+
+// To record the status of Bass Chord (single or dyad, default: dyad.)
+typedef union {
+    uint32_t raw;
+    struct {
+        bool isSingleBass:1;
+    };
+} user_config_t;
+user_config_t user_config;
+
+#define IS_SINGLE_BASS()   (user_config.isSingleBass)
+
+#ifdef RGBLIGHT_ENABLE
+/* used to specify there is no LED on the keylocation. */
+#    define NO_LED 255
+#endif  //  RGBLIGHT_ENABLE
+
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,      //  MIDI C-system
+    _FAKE_B_SYSTEM,      //  MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system.
+    _C_SYSTEM_BASS2ROW,  //  counter bass system
+    _C_SYSTEM_ENTIRELY,  //  single notes for both left and right keybaords.
+    _C_SYSTEM_FREEBASS,  //  C-system Free Bass
+    _CHROMATONE,
+    _CFLIP_BASS2ROW,     //  180 degree flipped layout on right side keyboard
+    _QWERTY,
+    _COLEMAK,
+    _ADJUST,             //  for Fn keys, etc.
+    _FN                  //  for changing layers, octaves, etc.
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION,
+    CSYSTEM,  // C-SYSTEM layout
+    BSYSTEM,  // B-SYSTEM layout
+    CNTBASC,  // CouNTer BASs C-system layout
+    CSYSALL,  // C-SYStem ALL layout
+    CSYSFBS,  // C-SYStem Free BaSs
+    CHRTONE,  // CHRomaTONE layout
+    CFLIP2B,  // C-system FLIPped 2(to) Backwards
+    TGLBASS,  // ToGgLe BASS unison
+    TGLMICH,  // ToGgLe MIdi CHannel separation
+    MELDYAL,  // MELody DYad Low
+    MELODYS,  // MELODY Single
+    MELDYAH,  // MELody DYad High
+    TGLUVEL   // ToGgLe Unison VELocity
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+static uint8_t my_tone_status[MIDI_TONE_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* fake B-system */
+  [_FAKE_B_SYSTEM] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+    MI_Ab_2,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Gb_3, MI_A_3, MI_C_4,  MI_Eb_4, MI_Gb_4, MI_A_4, MI_C_5,  MI_Eb_5, MI_Gb_5,     _______,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3, MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4, MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3, MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4, MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5
+  ),
+
+  /* BASS2row */
+  [_C_SYSTEM_BASS2ROW] = LAYOUT(
+    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
+      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    _______,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* C-system entirely */
+  [_C_SYSTEM_ENTIRELY] = LAYOUT(
+    MI_BENDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
+      MI_BENDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* C-system free bass */
+  [_C_SYSTEM_FREEBASS] = LAYOUT(
+    MI_Db_3,  MI_Bb_2,  MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,   MI_E_1,  MI_Db_1,  MI_Bb,  MI_G,  MI_E,
+      MI_C_3,   MI_A_2,   MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,  MI_Eb_1,  MI_C_1,  MI_A,   MI_Fs, MI_Eb,
+        MI_B_2,   MI_Ab_2,  MI_F_2,   MI_D_2,   MI_B_1,  MI_Ab_1,   MI_F_1,  MI_D_1,   MI_B,    MI_Ab,  MI_F,  MI_D,
+          MI_Bb_2, MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,    MI_E_1,  MI_Db_1,   MI_Bb,  MI_G,   MI_E,  MI_Db,
+            MI_A_2,  MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,   MI_Eb_1,  MI_C_1,   MI_A,   MI_Fs,  MI_Eb, MI_C,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* Chromatone */
+  [_CHROMATONE] = LAYOUT(
+    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,
+      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,
+        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2,
+          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,  MI_D_2,
+            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2, MI_Eb_2,
+
+    MI_C_2,
+      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3,    FN_MUTE,
+    MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3, MI_C_4,
+      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3
+  ),
+
+  [_CFLIP_BASS2ROW] = LAYOUT(
+    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
+      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+
+    MI_G_5,
+      MI_F_5,  MI_D_5,  MI_B_4,  MI_Ab_4, MI_F_4,  MI_D_4,  MI_B_3,  MI_Ab_3, MI_F_3,  MI_D_3,  MI_B_2,  MI_Ab_2,   FN_MUTE,
+    MI_Fs_5, MI_Eb_5, MI_C_5,  MI_A_4,  MI_Fs_4, MI_Eb_4, MI_C_4,  MI_A_3,  MI_Fs_3, MI_Eb_3, MI_C_3,  MI_A_2,  MI_Fs_2,
+      MI_E_5,  MI_Db_5, MI_Bb_4, MI_G_4,  MI_E_4,  MI_Db_4, MI_Bb_3, MI_G_3,  MI_E_3,  MI_Db_3, MI_Bb_2, MI_G_2
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  /* COLEMAK */
+  [_COLEMAK] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
+        KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
+          KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
+            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  /* ADJUST */
+  [_ADJUST] = LAYOUT_wrapper(
+    _______, _________________FUNC__L___________________, _________________FUNC__R___________________, _______,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  _______,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_GRV,  _______,
+          _______, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_BSLS, _______,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+
+  /* Fn */
+  [_FN] = LAYOUT(
+    CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
+      DF_QWER, TGLBASS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TGLMICH,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    XXXXXXX,
+      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EEP_RST,   _______,
+    CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
+      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]        = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FAKE_B_SYSTEM]        = { ENCODER_CCW_CW(_______, _______) },
+    [_C_SYSTEM_BASS2ROW]    = { ENCODER_CCW_CW(_______, _______) },
+    [_C_SYSTEM_ENTIRELY]    = { ENCODER_CCW_CW(_______, _______) },
+    [_C_SYSTEM_FREEBASS]    = { ENCODER_CCW_CW(_______, _______) },
+    [_CHROMATONE]           = { ENCODER_CCW_CW(_______, _______) },
+    [_CFLIP_BASS2ROW]       = { ENCODER_CCW_CW(_______, _______) },
+    [_QWERTY]               = { ENCODER_CCW_CW(_______, _______) },
+    [_COLEMAK]              = { ENCODER_CCW_CW(_______, _______) },
+    [_ADJUST]               = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]                   = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+
+// Light up adjust layer keys (left keyboard)
+const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS({1,  10, HSV_ORANGE},
+                                                                             {21,  2, HSV_ORANGE},
+                                                                             {25,  3, HSV_ORANGE},
+                                                                             {30,  5, HSV_ORANGE},
+                                                                             {37,  2, HSV_ORANGE},
+                                                                             {45,  2, HSV_ORANGE},
+                                                                             {57,  2, HSV_ORANGE}
+);
+
+// Light up fn layer keys
+const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(                           //  left keyboard
+                                                                         {0,   7, HSV_ORANGE},      //  MIDI layouts
+                                                                         {11,  1, HSV_RED},         //  RGB_TOG
+                                                                         {12,  1, HSV_WHITE},       //  DF_QWER
+                                                                         {13,  1, HSV_CORAL},       //  TGLBASS
+                                                                         {24,  1, HSV_WHITE},       //  DF_COLE
+                                                                         {35,  1, HSV_TEAL},        //  TGLMICH
+#if 0  //  Color Test
+                                                                         {36,  1, HSV_WHITE},
+                                                                         {37,  1, HSV_RED},
+                                                                         {38,  1, HSV_CORAL},
+                                                                         {39,  1, HSV_ORANGE},
+                                                                         {40,  1, HSV_GOLDENROD},
+                                                                         {41,  1, HSV_GOLD},
+                                                                         {42,  1, HSV_YELLOW},
+                                                                         {43,  1, HSV_CHARTREUSE},
+                                                                         {44,  1, HSV_GREEN},
+                                                                         {45,  1, HSV_SPRINGGREEN},
+                                                                         {46,  1, HSV_TURQUOISE},
+                                                                         {47,  1, HSV_TEAL},
+                                                                         {48,  1, HSV_CYAN},
+                                                                         {49,  1, HSV_AZURE},
+                                                                         {50,  1, HSV_BLUE},
+                                                                         {51,  1, HSV_PURPLE},
+                                                                         {52,  1, HSV_MAGENTA},
+                                                                         {53,  1, HSV_PINK},
+#endif
+                                                                                                    //  right keyboard
+                                                                         {60,  7, HSV_ORANGE},      //  MIDI layouts
+                                                                         {74,  1, HSV_CORAL},       //  TGLBASS
+                                                                         {85,  1, HSV_BLUE},        //  MIDI Oct
+                                                                         {86,  1, HSV_CYAN},        //  MIDI Oct
+                                                                         {87,  1, HSV_SPRINGGREEN}, //  MIDI Oct
+                                                                         {88,  1, HSV_GREEN},       //  MIDI Oct
+                                                                         {89,  1, HSV_CHARTREUSE},  //  MIDI Oct
+                                                                         {96,  1, HSV_PINK},        //  EEP_RST
+                                                                         {98,  7, HSV_ORANGE},      //  MIDI layouts
+                                                                         {107, 1, HSV_YELLOW},      //  MI_VELD
+                                                                         {108, 1, HSV_GREEN},       //  MI_VELU
+                                                                         {110, 1, HSV_RED},         //  RGB_TOG
+                                                                         {112, 1, HSV_CORAL},       //  TGLBASS
+                                                                         {119, 1, HSV_CORAL},       //  TGLUVEL
+                                                                         {120, 1, HSV_CYAN},        //  MELDYAL
+                                                                         {121, 1, HSV_GOLD},        //  MELODYS
+                                                                         {122, 1, HSV_SPRINGGREEN}  //  MELDYAH
+);
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_fn_layer, my_adjust_layer);
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // Both layers will light up if both kb layers are active
+    rgblight_set_layer_state(0, layer_state_cmp(state, _FN));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _ADJUST));
+    return state;
+};
+
+#endif  //  RGBLIGHT_ENABLE
+
+void my_init(void){
+    //  Set octave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+}
+
+void eeconfig_init_user(void) {
+    midi_init();
+    my_init();
+
+    // Used to set octave to MI_OCT_0
+    midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+    // UNISON flags
+    melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
+    melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
+    melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
+
+    //  Reset Bass setting
+    user_config.raw = 0;  // default: dyad
+    eeconfig_update_user(user_config.raw);
+
+    //  Reset the midi keyboard layout
+    set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
+}
+
+void keyboard_post_init_user(void) {
+    my_init();
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+    for (uint8_t i = 0; i < MIDI_TONE_COUNT; i++) {
+        my_tone_status[i] = MIDI_INVALID_NOTE;
+    }
+    //  load EEPROM data for isSingleBass
+    user_config.raw = eeconfig_read_user();
+
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_layers = my_rgb_layers;
+
+    // Reset LED off
+    rgblight_sethsv(HSV_BLACK);
+#    if defined(RGBLIGHT_EFFECT_KNIGHT) || defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_sethsv(30, 50, 40);
+#        ifdef RGBLIGHT_EFFECT_KNIGHT
+    rgblight_mode(RGBLIGHT_MODE_KNIGHT);
+#        elif defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_mode(RGBLIGHT_MODE_TWINKLE+3);
+#        endif
+#    endif
+#endif  // RGBLIGHT_ENABLE
+};
+
+void toggle_isSingleBass(void) {
+#ifdef CONSOLE_ENABLE
+    uprintf("isSingleBass(before) %u\n", user_config.isSingleBass);
+#endif
+    user_config.isSingleBass = !user_config.isSingleBass;
+#ifdef CONSOLE_ENABLE
+    uprintf("isSingleBass(after) %u\n", user_config.isSingleBass);
+#endif
+
+    eeconfig_update_user(user_config.raw);
+}
+
+void toggle_MIDI_channel_separation(void) {
+    if (midi_chord_ch > 0) {
+        midi_chord_ch = 0;
+        midi_bass_ch  = 0;
+    } else {
+        midi_chord_ch = 1;
+        midi_bass_ch  = 2;
+    }
+}
+
+#ifdef RGBLIGHT_ENABLE
+void switch_keylight_color4bass(keyrecord_t *record, uint8_t keylocation){
+    switch (biton32(default_layer_state)) {
+        case _C_SYSTEM_BASE:
+            keylight_manager(record, HSV_GREEN, keylocation);
+            break;
+        case _FAKE_B_SYSTEM:
+            keylight_manager(record, HSV_ORANGE, keylocation);
+            break;
+        case _C_SYSTEM_BASS2ROW:
+            keylight_manager(record, HSV_YELLOW, keylocation);
+            break;
+        case _CFLIP_BASS2ROW:
+            keylight_manager(record, HSV_PURPLE, keylocation);
+            break;
+    }
+}
+void switch_keylight_color4chords(keyrecord_t *record, uint8_t keylocation){
+    switch (biton32(default_layer_state)) {
+        case _C_SYSTEM_BASE:
+            keylight_manager(record, HSV_SPRINGGREEN, keylocation);
+            break;
+        case _FAKE_B_SYSTEM:
+            keylight_manager(record, HSV_YELLOW, keylocation);
+            break;
+        case _C_SYSTEM_BASS2ROW:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+        case _CFLIP_BASS2ROW:
+            keylight_manager(record, HSV_MAGENTA, keylocation);
+            break;
+    }
+}
+#endif  // RGBLIGHT_ENABLE
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+#ifdef RGBLIGHT_ENABLE
+    /* prepare for turning on LEDs when keys are pressed. */
+    uint8_t r            = record->event.key.row;
+    uint8_t c            = record->event.key.col;
+    // uint8_t keylocation  = convert_key_to_led[MATRIX_COLS * r + c];
+    // uint8_t keylocation2 = convert_key_to_led2[MATRIX_COLS * r + c];
+    uint8_t keylocation  = pgm_read_byte(&convert_key_to_led[MATRIX_COLS * r + c]);
+    uint8_t keylocation2 = pgm_read_byte(&convert_key_to_led2[MATRIX_COLS * r + c]);
+#endif  // RGBLIGHT_ENABLE
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        //  set default layer and save it to EEPROM when MIDI key layers are selected.
+        case CSYSTEM:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASE);
+            }
+            break;
+
+        case BSYSTEM:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_FAKE_B_SYSTEM);
+            }
+            break;
+
+        case CNTBASC:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
+            }
+            break;
+
+        case CSYSALL:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_ENTIRELY);
+            }
+            break;
+
+        case CHRTONE:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_CHROMATONE);
+            }
+            break;
+
+        case CFLIP2B:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_CFLIP_BASS2ROW);
+            }
+            break;
+
+        case CSYSFBS:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_FREEBASS);
+            }
+            break;
+
+        case TGLBASS:
+            if (record->event.pressed) {
+                toggle_isSingleBass();
+            };
+            break;
+
+        case TGLMICH:
+            if (record->event.pressed) {
+                toggle_MIDI_channel_separation();
+            };
+            break;
+
+        case MELDYAL:
+            if (record->event.pressed) {
+                melody_dyad_low  = true;
+                melody_dyad_high = false;
+            };
+            break;
+
+        case MELODYS:
+            if (record->event.pressed) {
+                melody_dyad_low  = false;
+                melody_dyad_high = false;
+            };
+            break;
+
+        case MELDYAH:
+            if (record->event.pressed) {
+                melody_dyad_low  = false;
+                melody_dyad_high = true;
+            };
+            break;
+
+        case TGLUVEL:
+            if (record->event.pressed) {
+                melody_unison_suppress = !melody_unison_suppress;
+            };
+            break;
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, IS_SINGLE_BASS());
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4bass(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+#ifdef RGBLIGHT_ENABLE
+        case KC_A ... KC_RGUI:                // for QWERTY
+        case KC_GESC:
+        case ADJ_EIS:
+        case MO_ADJ:
+        case SHIF_UP:
+            keylight_manager(record, HSV_RED, keylocation);
+            break;
+#endif
+
+        // Keycodes on the right side.
+        case MIDI_TONE_MIN ... MIDI_TONE_MAX:  // notes on the right side keyboard.
+            //  root_note is played by process_midi().
+            if ( melody_dyad_high == true ) {        //  play 1 octave higher as well.
+                my_process_midi(0, keycode, record, my_tone_status, 12, melody_unison_suppress);
+#ifdef RGBLIGHT_ENABLE
+                keylight_manager(record, HSV_RED, keylocation);
+                keylight_manager(record, HSV_RED, keylocation2);
+#endif
+            } else if ( melody_dyad_low == true ) {  //  play 1 octave lower as well.
+                my_process_midi(0, keycode, record, my_tone_status, -12, melody_unison_suppress);
+#ifdef RGBLIGHT_ENABLE
+                keylight_manager(record, HSV_CYAN, keylocation);
+                keylight_manager(record, HSV_CYAN, keylocation2);
+#endif
+            } else {
+                uprintf("layer=%u, default_layer_state = %u\n", biton32(default_layer_state), default_layer_state);
+#ifdef RGBLIGHT_ENABLE
+                keylight_manager(record, HSV_GOLDENROD, keylocation);
+                keylight_manager(record, HSV_GOLDENROD, keylocation2);
+#endif
+            }
+            break;
+
+#ifdef RGBLIGHT_ENABLE
+        // case KC_MUTE:
+        case FN_MUTE:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+#endif
+    }
+    // If console is enabled, it will print the matrix position and status of each key pressed
+#if defined(CONSOLE_ENABLE) && defined(RGBLIGHT_ENABLE)
+    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+    uprintf("r=%d, c=%d, keyloc=%d, keyloc2=%d, matrix_col x r + c = %d\n", r, c, keylocation, keylocation2, MATRIX_COLS * r + c);
+#endif
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/3araht/readme.md b/keyboards/giabalanai/keymaps/3araht/readme.md
new file mode 100644
index 0000000000..a731456db6
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/3araht/readme.md
@@ -0,0 +1 @@
+# A personal keymap for giabalanai with RGBLIGHT_ENABLE = yes in rules.mk, which 3araht is using.
diff --git a/keyboards/giabalanai/keymaps/3araht/rules.mk b/keyboards/giabalanai/keymaps/3araht/rules.mk
new file mode 100644
index 0000000000..2ecc5f55c1
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/3araht/rules.mk
@@ -0,0 +1,4 @@
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+CONSOLE_ENABLE =  no        # Console for debug
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/default/keymap.c b/keyboards/giabalanai/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7b5f524a4f
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default/keymap.c
@@ -0,0 +1,259 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+#define DFCBASE DF(_C_SYSTEM_BASE)
+#define DF_QWER DF(_QWERTY)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE LT(_FN, KC_MUTE)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,  //  MIDI C-system
+    _QWERTY,         //  just in case
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  /* Fn */
+  [_FN] = LAYOUT(
+    DFCBASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX,   _______,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_QWERTY]           = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]               = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+void keyboard_post_init_user(void) {
+    //  Set otave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+    default_layer_set(1UL << _C_SYSTEM_BASE);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
+            break;
+
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+            break;
+
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+            break;
+
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+            break;
+
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/default/readme.md b/keyboards/giabalanai/keymaps/default/readme.md
new file mode 100644
index 0000000000..d929aa1f5e
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for giabalanai
diff --git a/keyboards/giabalanai/keymaps/default/rules.mk b/keyboards/giabalanai/keymaps/default/rules.mk
new file mode 100644
index 0000000000..8006608ea9
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h b/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h
new file mode 100644
index 0000000000..684287ba98
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#define GIABARINAIX2
+#ifdef GIABARINAIX2
+#    undef MATRIX_ROW_PINS_RIGHT
+#    undef MATRIX_COL_PINS_RIGHT
+
+#    ifdef RGBLIGHT_ENABLE
+#        undef RGBLED_NUM
+#        define RGBLED_NUM 120
+#        undef RGBLIGHT_LED_MAP
+#        define RGBLIGHT_LED_MAP { \
+           108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \
+           107, 106, 105, 104, 103, 102, 101, 100, 99,  98,  97,  96, \
+           84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95, \
+           83,  82,  81,  80,  79,  78,  77,  76,  75,  74,  73,  72, \
+           60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71, \
+           \
+           11,  10,  9,   8,   7,   6,   5,   4,   3,   2,   1,   0,  \
+           12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23, \
+           35,  34,  33,  32,  31,  30,  29,  28,  27,  26,  25,  24, \
+           36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47, \
+           59,  58,  57,  56,  55,  54,  53,  52,  51,  50,  49,  48  \
+           }
+#    endif
+#endif
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json b/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json
new file mode 100644
index 0000000000..20a52326dd
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json
@@ -0,0 +1,146 @@
+{
+    "keyboard_name": "giabarinaix2",
+    "manufacturer": "3araht",
+    "url": "https://github.com/3araht",
+    "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B2",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+          "layout": [
+              {"label": "l00", "x": 0,    "y": 0},
+              {"label": "l01", "x": 1,    "y": 0},
+              {"label": "l02", "x": 2,    "y": 0},
+              {"label": "l03", "x": 3,    "y": 0},
+              {"label": "l04", "x": 4,    "y": 0},
+              {"label": "l05", "x": 5,    "y": 0},
+              {"label": "l06", "x": 6,    "y": 0},
+              {"label": "l07", "x": 7,    "y": 0},
+              {"label": "l08", "x": 8,    "y": 0},
+              {"label": "l09", "x": 9,    "y": 0},
+              {"label": "l0a", "x": 10,   "y": 0},
+              {"label": "l0b", "x": 11,   "y": 0},
+
+              {"label": "r00", "x": 14.5, "y": 0},
+              {"label": "r01", "x": 15.5, "y": 0},
+              {"label": "r02", "x": 16.5, "y": 0},
+              {"label": "r03", "x": 17.5, "y": 0},
+              {"label": "r04", "x": 18.5, "y": 0},
+              {"label": "r05", "x": 19.5, "y": 0},
+              {"label": "r06", "x": 20.5, "y": 0},
+              {"label": "r07", "x": 21.5, "y": 0},
+              {"label": "r08", "x": 22.5, "y": 0},
+              {"label": "r09", "x": 23.5, "y": 0},
+              {"label": "r0a", "x": 24.5, "y": 0},
+              {"label": "r0b", "x": 25.5, "y": 0},
+
+              {"label": "l10", "x": 0.5,  "y": 1},
+              {"label": "l11", "x": 1.5,  "y": 1},
+              {"label": "l12", "x": 2.5,  "y": 1},
+              {"label": "l13", "x": 3.5,  "y": 1},
+              {"label": "l14", "x": 4.5,  "y": 1},
+              {"label": "l15", "x": 5.5,  "y": 1},
+              {"label": "l16", "x": 6.5,  "y": 1},
+              {"label": "l17", "x": 7.5,  "y": 1},
+              {"label": "l18", "x": 8.5,  "y": 1},
+              {"label": "l19", "x": 9.5,  "y": 1},
+              {"label": "l1a", "x": 10.5, "y": 1},
+              {"label": "l1b", "x": 11.5, "y": 1},
+
+              {"label": "r10", "x": 15,   "y": 1},
+              {"label": "r11", "x": 16,   "y": 1},
+              {"label": "r12", "x": 17,   "y": 1},
+              {"label": "r13", "x": 18,   "y": 1},
+              {"label": "r14", "x": 19,   "y": 1},
+              {"label": "r15", "x": 20,   "y": 1},
+              {"label": "r16", "x": 21,   "y": 1},
+              {"label": "r17", "x": 22,   "y": 1},
+              {"label": "r18", "x": 23,   "y": 1},
+              {"label": "r19", "x": 24,   "y": 1},
+              {"label": "r1a", "x": 25,   "y": 1},
+              {"label": "r1b", "x": 26,   "y": 1},
+
+              {"label": "l20", "x": 1,    "y": 2},
+              {"label": "l21", "x": 2,    "y": 2},
+              {"label": "l22", "x": 3,    "y": 2},
+              {"label": "l23", "x": 4,    "y": 2},
+              {"label": "l24", "x": 5,    "y": 2},
+              {"label": "l25", "x": 6,    "y": 2},
+              {"label": "l26", "x": 7,    "y": 2},
+              {"label": "l27", "x": 8,    "y": 2},
+              {"label": "l28", "x": 9,    "y": 2},
+              {"label": "l29", "x": 10,   "y": 2},
+              {"label": "l2a", "x": 11,   "y": 2},
+              {"label": "l2b", "x": 12,   "y": 2},
+
+              {"label": "r20", "x": 15.5, "y": 2},
+              {"label": "r21", "x": 16.5, "y": 2},
+              {"label": "r22", "x": 17.5, "y": 2},
+              {"label": "r23", "x": 18.5, "y": 2},
+              {"label": "r24", "x": 19.5, "y": 2},
+              {"label": "r25", "x": 20.5, "y": 2},
+              {"label": "r26", "x": 21.5, "y": 2},
+              {"label": "r27", "x": 22.5, "y": 2},
+              {"label": "r28", "x": 23.5, "y": 2},
+              {"label": "r29", "x": 24.5, "y": 2},
+              {"label": "r2a", "x": 25.5, "y": 2},
+              {"label": "r2b", "x": 26.5, "y": 2},
+
+              {"label": "l30", "x": 1.5,  "y": 3},
+              {"label": "l31", "x": 2.5,  "y": 3},
+              {"label": "l32", "x": 3.5,  "y": 3},
+              {"label": "l33", "x": 4.5,  "y": 3},
+              {"label": "l34", "x": 5.5,  "y": 3},
+              {"label": "l35", "x": 6.5,  "y": 3},
+              {"label": "l36", "x": 7.5,  "y": 3},
+              {"label": "l37", "x": 8.5,  "y": 3},
+              {"label": "l38", "x": 9.5,  "y": 3},
+              {"label": "l39", "x": 10.5, "y": 3},
+              {"label": "l3a", "x": 11.5, "y": 3},
+              {"label": "l3b", "x": 12.5, "y": 3},
+
+              {"label": "r30", "x": 16,   "y": 3},
+              {"label": "r31", "x": 17,   "y": 3},
+              {"label": "r32", "x": 18,   "y": 3},
+              {"label": "r33", "x": 19,   "y": 3},
+              {"label": "r34", "x": 20,   "y": 3},
+              {"label": "r35", "x": 21,   "y": 3},
+              {"label": "r36", "x": 22,   "y": 3},
+              {"label": "r37", "x": 23,   "y": 3},
+              {"label": "r38", "x": 24,   "y": 3},
+              {"label": "r39", "x": 25,   "y": 3},
+              {"label": "r3a", "x": 26,   "y": 3},
+              {"label": "r3b", "x": 27,   "y": 3},
+
+              {"label": "l40", "x": 2,    "y": 4},
+              {"label": "l41", "x": 3,    "y": 4},
+              {"label": "l42", "x": 4,    "y": 4},
+              {"label": "l43", "x": 5,    "y": 4},
+              {"label": "l44", "x": 6,    "y": 4},
+              {"label": "l45", "x": 7,    "y": 4},
+              {"label": "l46", "x": 8,    "y": 4},
+              {"label": "l47", "x": 9,    "y": 4},
+              {"label": "l48", "x": 10,   "y": 4},
+              {"label": "l49", "x": 11,   "y": 4},
+              {"label": "l4a", "x": 12,   "y": 4},
+              {"label": "l4b", "x": 13,   "y": 4},
+
+              {"label": "r40", "x": 16.5, "y": 4},
+              {"label": "r41", "x": 17.5, "y": 4},
+              {"label": "r42", "x": 18.5, "y": 4},
+              {"label": "r43", "x": 19.5, "y": 4},
+              {"label": "r44", "x": 20.5, "y": 4},
+              {"label": "r45", "x": 21.5, "y": 4},
+              {"label": "r46", "x": 22.5, "y": 4},
+              {"label": "r47", "x": 23.5, "y": 4},
+              {"label": "r48", "x": 24.5, "y": 4},
+              {"label": "r49", "x": 25.5, "y": 4},
+              {"label": "r4a", "x": 26.5, "y": 4},
+              {"label": "r4b", "x": 27.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
new file mode 100644
index 0000000000..82d86594df
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
@@ -0,0 +1,262 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper_giabarinaix2(...) LAYOUT_giabarinaix2(__VA_ARGS__)
+
+#define DFCBASE DF(_C_SYSTEM_BASE)
+#define DF_QWER DF(_QWERTY)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE LT(_FN, KC_MUTE)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,  //  MIDI C-system
+    _QWERTY,         //  just in case
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT_giabarinaix2(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
+      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
+        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
+          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
+            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper_giabarinaix2(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, _______
+  ),
+
+  /* Fn */
+  [_FN] = LAYOUT_giabarinaix2(
+    DFCBASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    DFCBASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]        = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_QWERTY]               = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]                   = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+void keyboard_post_init_user(void) {
+    //  Set otave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+    default_layer_set(1UL << _C_SYSTEM_BASE);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
+            break;
+
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+            break;
+
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+            break;
+
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+            break;
+
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md b/keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md
new file mode 100644
index 0000000000..ecdae4723d
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md
@@ -0,0 +1 @@
+# The default keymap for giabarinaix2
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/rules.mk b/keyboards/giabalanai/keymaps/default_giabarinaix2/rules.mk
new file mode 100644
index 0000000000..3542233884
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/rules.mk
@@ -0,0 +1,3 @@
+ENCODER_ENABLE = no        # encoder on mute button
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/config.h b/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
new file mode 100644
index 0000000000..684287ba98
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#define GIABARINAIX2
+#ifdef GIABARINAIX2
+#    undef MATRIX_ROW_PINS_RIGHT
+#    undef MATRIX_COL_PINS_RIGHT
+
+#    ifdef RGBLIGHT_ENABLE
+#        undef RGBLED_NUM
+#        define RGBLED_NUM 120
+#        undef RGBLIGHT_LED_MAP
+#        define RGBLIGHT_LED_MAP { \
+           108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \
+           107, 106, 105, 104, 103, 102, 101, 100, 99,  98,  97,  96, \
+           84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95, \
+           83,  82,  81,  80,  79,  78,  77,  76,  75,  74,  73,  72, \
+           60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71, \
+           \
+           11,  10,  9,   8,   7,   6,   5,   4,   3,   2,   1,   0,  \
+           12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23, \
+           35,  34,  33,  32,  31,  30,  29,  28,  27,  26,  25,  24, \
+           36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47, \
+           59,  58,  57,  56,  55,  54,  53,  52,  51,  50,  49,  48  \
+           }
+#    endif
+#endif
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/info.json b/keyboards/giabalanai/keymaps/giabarinaix2led/info.json
new file mode 100644
index 0000000000..20a52326dd
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/info.json
@@ -0,0 +1,146 @@
+{
+    "keyboard_name": "giabarinaix2",
+    "manufacturer": "3araht",
+    "url": "https://github.com/3araht",
+    "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B2",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+          "layout": [
+              {"label": "l00", "x": 0,    "y": 0},
+              {"label": "l01", "x": 1,    "y": 0},
+              {"label": "l02", "x": 2,    "y": 0},
+              {"label": "l03", "x": 3,    "y": 0},
+              {"label": "l04", "x": 4,    "y": 0},
+              {"label": "l05", "x": 5,    "y": 0},
+              {"label": "l06", "x": 6,    "y": 0},
+              {"label": "l07", "x": 7,    "y": 0},
+              {"label": "l08", "x": 8,    "y": 0},
+              {"label": "l09", "x": 9,    "y": 0},
+              {"label": "l0a", "x": 10,   "y": 0},
+              {"label": "l0b", "x": 11,   "y": 0},
+
+              {"label": "r00", "x": 14.5, "y": 0},
+              {"label": "r01", "x": 15.5, "y": 0},
+              {"label": "r02", "x": 16.5, "y": 0},
+              {"label": "r03", "x": 17.5, "y": 0},
+              {"label": "r04", "x": 18.5, "y": 0},
+              {"label": "r05", "x": 19.5, "y": 0},
+              {"label": "r06", "x": 20.5, "y": 0},
+              {"label": "r07", "x": 21.5, "y": 0},
+              {"label": "r08", "x": 22.5, "y": 0},
+              {"label": "r09", "x": 23.5, "y": 0},
+              {"label": "r0a", "x": 24.5, "y": 0},
+              {"label": "r0b", "x": 25.5, "y": 0},
+
+              {"label": "l10", "x": 0.5,  "y": 1},
+              {"label": "l11", "x": 1.5,  "y": 1},
+              {"label": "l12", "x": 2.5,  "y": 1},
+              {"label": "l13", "x": 3.5,  "y": 1},
+              {"label": "l14", "x": 4.5,  "y": 1},
+              {"label": "l15", "x": 5.5,  "y": 1},
+              {"label": "l16", "x": 6.5,  "y": 1},
+              {"label": "l17", "x": 7.5,  "y": 1},
+              {"label": "l18", "x": 8.5,  "y": 1},
+              {"label": "l19", "x": 9.5,  "y": 1},
+              {"label": "l1a", "x": 10.5, "y": 1},
+              {"label": "l1b", "x": 11.5, "y": 1},
+
+              {"label": "r10", "x": 15,   "y": 1},
+              {"label": "r11", "x": 16,   "y": 1},
+              {"label": "r12", "x": 17,   "y": 1},
+              {"label": "r13", "x": 18,   "y": 1},
+              {"label": "r14", "x": 19,   "y": 1},
+              {"label": "r15", "x": 20,   "y": 1},
+              {"label": "r16", "x": 21,   "y": 1},
+              {"label": "r17", "x": 22,   "y": 1},
+              {"label": "r18", "x": 23,   "y": 1},
+              {"label": "r19", "x": 24,   "y": 1},
+              {"label": "r1a", "x": 25,   "y": 1},
+              {"label": "r1b", "x": 26,   "y": 1},
+
+              {"label": "l20", "x": 1,    "y": 2},
+              {"label": "l21", "x": 2,    "y": 2},
+              {"label": "l22", "x": 3,    "y": 2},
+              {"label": "l23", "x": 4,    "y": 2},
+              {"label": "l24", "x": 5,    "y": 2},
+              {"label": "l25", "x": 6,    "y": 2},
+              {"label": "l26", "x": 7,    "y": 2},
+              {"label": "l27", "x": 8,    "y": 2},
+              {"label": "l28", "x": 9,    "y": 2},
+              {"label": "l29", "x": 10,   "y": 2},
+              {"label": "l2a", "x": 11,   "y": 2},
+              {"label": "l2b", "x": 12,   "y": 2},
+
+              {"label": "r20", "x": 15.5, "y": 2},
+              {"label": "r21", "x": 16.5, "y": 2},
+              {"label": "r22", "x": 17.5, "y": 2},
+              {"label": "r23", "x": 18.5, "y": 2},
+              {"label": "r24", "x": 19.5, "y": 2},
+              {"label": "r25", "x": 20.5, "y": 2},
+              {"label": "r26", "x": 21.5, "y": 2},
+              {"label": "r27", "x": 22.5, "y": 2},
+              {"label": "r28", "x": 23.5, "y": 2},
+              {"label": "r29", "x": 24.5, "y": 2},
+              {"label": "r2a", "x": 25.5, "y": 2},
+              {"label": "r2b", "x": 26.5, "y": 2},
+
+              {"label": "l30", "x": 1.5,  "y": 3},
+              {"label": "l31", "x": 2.5,  "y": 3},
+              {"label": "l32", "x": 3.5,  "y": 3},
+              {"label": "l33", "x": 4.5,  "y": 3},
+              {"label": "l34", "x": 5.5,  "y": 3},
+              {"label": "l35", "x": 6.5,  "y": 3},
+              {"label": "l36", "x": 7.5,  "y": 3},
+              {"label": "l37", "x": 8.5,  "y": 3},
+              {"label": "l38", "x": 9.5,  "y": 3},
+              {"label": "l39", "x": 10.5, "y": 3},
+              {"label": "l3a", "x": 11.5, "y": 3},
+              {"label": "l3b", "x": 12.5, "y": 3},
+
+              {"label": "r30", "x": 16,   "y": 3},
+              {"label": "r31", "x": 17,   "y": 3},
+              {"label": "r32", "x": 18,   "y": 3},
+              {"label": "r33", "x": 19,   "y": 3},
+              {"label": "r34", "x": 20,   "y": 3},
+              {"label": "r35", "x": 21,   "y": 3},
+              {"label": "r36", "x": 22,   "y": 3},
+              {"label": "r37", "x": 23,   "y": 3},
+              {"label": "r38", "x": 24,   "y": 3},
+              {"label": "r39", "x": 25,   "y": 3},
+              {"label": "r3a", "x": 26,   "y": 3},
+              {"label": "r3b", "x": 27,   "y": 3},
+
+              {"label": "l40", "x": 2,    "y": 4},
+              {"label": "l41", "x": 3,    "y": 4},
+              {"label": "l42", "x": 4,    "y": 4},
+              {"label": "l43", "x": 5,    "y": 4},
+              {"label": "l44", "x": 6,    "y": 4},
+              {"label": "l45", "x": 7,    "y": 4},
+              {"label": "l46", "x": 8,    "y": 4},
+              {"label": "l47", "x": 9,    "y": 4},
+              {"label": "l48", "x": 10,   "y": 4},
+              {"label": "l49", "x": 11,   "y": 4},
+              {"label": "l4a", "x": 12,   "y": 4},
+              {"label": "l4b", "x": 13,   "y": 4},
+
+              {"label": "r40", "x": 16.5, "y": 4},
+              {"label": "r41", "x": 17.5, "y": 4},
+              {"label": "r42", "x": 18.5, "y": 4},
+              {"label": "r43", "x": 19.5, "y": 4},
+              {"label": "r44", "x": 20.5, "y": 4},
+              {"label": "r45", "x": 21.5, "y": 4},
+              {"label": "r46", "x": 22.5, "y": 4},
+              {"label": "r47", "x": 23.5, "y": 4},
+              {"label": "r48", "x": 24.5, "y": 4},
+              {"label": "r49", "x": 25.5, "y": 4},
+              {"label": "r4a", "x": 26.5, "y": 4},
+              {"label": "r4b", "x": 27.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
new file mode 100644
index 0000000000..1e773bd233
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
@@ -0,0 +1,464 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper_giabarinaix2(...) LAYOUT_giabarinaix2(__VA_ARGS__)
+
+#define DFCBASE DF(_C_SYSTEM_BASE)
+#define DF_QWER DF(_QWERTY)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE LT(_FN, KC_MUTE)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+#ifdef RGBLIGHT_ENABLE
+/* used to specify there is no LED on the keylocation. */
+#    define NO_LED 255
+#endif  //  RGBLIGHT_ENABLE
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,      //  MIDI C-system
+    _C_SYSTEM_BASS2ROW,  //  counter bass system
+    _C_SYSTEM_ENTIRELY,  //  single notes for both left and right keybaords.
+    _CHROMATONE,
+    _QWERTY,             //  just in case
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION,
+    CSYSTEM,  // C-SYSTEM layout
+    CNTBASC,  // CouNTer BASs C-system layout
+    CSYSALL,  // C-SYStem ALL layout
+    CHRTONE,  // CHRomaTONE layout
+    TGLMICH   // ToGgLe MIdi CHannel separation
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT_giabarinaix2(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
+      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
+        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
+          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
+            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+  ),
+
+  /* BASS2row */
+  [_C_SYSTEM_BASS2ROW] = LAYOUT_giabarinaix2(
+    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
+      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+
+
+    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
+      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
+        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
+          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
+            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+  ),
+
+  /* C-system entirely */
+  [_C_SYSTEM_ENTIRELY] = LAYOUT_giabarinaix2(
+    XXXXXXX, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
+      XXXXXXX, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+
+    MI_E_2,  MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,   MI_G_4, MI_Bb_4, MI_Db_5,
+      MI_Fs_2, MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4,  MI_A_4, MI_C_5,  MI_Eb_5,
+        MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,
+          MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+            MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5,  FN_MUTE
+  ),
+
+  /* Chromatone */
+  [_CHROMATONE] = LAYOUT_giabarinaix2(
+    XXXXXXX, XXXXXXX, MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1,  MI_Eb_1,  MI_F_1,   MI_G_1,
+        XXXXXXX,  MI_C,    MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1,
+             XXXXXXX, MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1,  MI_Eb_1,  MI_F_1,   MI_G_1,   MI_A_1,
+                  MI_C,    MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1,
+                      MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1,  MI_Eb_1,  MI_F_1,   MI_G_1,   MI_A_1,  MI_B_1,
+
+    MI_A_1,  MI_B_1, MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3,  MI_Eb_3,  MI_F_3,   MI_G_3,
+         MI_Bb_1, MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3,
+             MI_B_1, MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3,  MI_Eb_3,  MI_F_3,   MI_G_3,   MI_A_3,
+                  MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3,
+                     MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3,  MI_Eb_3,  MI_F_3,   MI_G_3,   MI_A_3,  FN_MUTE
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper_giabarinaix2(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, _______
+  ),
+
+  /* Fn */
+  [_FN] = LAYOUT_giabarinaix2(
+    CSYSTEM, CNTBASC, CSYSALL, CHRTONE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TGLMICH,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    CSYSTEM, CNTBASC, CSYSALL, CHRTONE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, TGLMICH,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]        = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_C_SYSTEM_BASS2ROW]    = { ENCODER_CCW_CW(_______, _______) },
+    [_C_SYSTEM_ENTIRELY]    = { ENCODER_CCW_CW(_______, _______) },
+    [_CHROMATONE]           = { ENCODER_CCW_CW(_______, _______) },
+    [_QWERTY]               = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]                   = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+
+// Light up fn layer keys
+const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(                           //  left keyboard
+                                                                         {0,   4, HSV_ORANGE},      //  MIDI layouts
+                                                                         {11,  1, HSV_RED},         //  RGB_TOG
+                                                                         {12,  1, HSV_WHITE},       //  DF_QWER
+                                                                         {35,  1, HSV_TEAL},        //  TGLMICH
+
+                                                                                                    //  right keyboard
+                                                                         {60,  4, HSV_ORANGE},      //  MIDI layouts
+                                                                         {71 , 1, HSV_RED},         //  RGB_TOG
+                                                                         {72,  1, HSV_WHITE},       //  DF_QWER
+                                                                         {83,  1, HSV_TEAL}         //  TGLMICH
+);
+
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_fn_layer);
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // Both layers will light up if both kb layers are active
+    rgblight_set_layer_state(0, layer_state_cmp(state, _FN));
+    return state;
+};
+
+#endif  //  RGBLIGHT_ENABLE
+void keyboard_post_init_user(void) {
+    //  Set otave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_layers = my_rgb_layers;
+
+    // Reset LED off
+    rgblight_sethsv(HSV_BLACK);
+#    if defined(RGBLIGHT_EFFECT_KNIGHT) || defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_sethsv(30, 50, 40);
+#        ifdef RGBLIGHT_EFFECT_KNIGHT
+    rgblight_mode(RGBLIGHT_MODE_KNIGHT);
+#        elif defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_mode(RGBLIGHT_MODE_TWINKLE+3);
+#        endif
+#    endif
+#endif  // RGBLIGHT_ENABLE
+};
+
+void toggle_MIDI_channel_separation(void) {
+    if (midi_chord_ch > 0) {
+        midi_chord_ch = 0;
+        midi_bass_ch  = 0;
+    } else {
+        midi_chord_ch = 1;
+        midi_bass_ch  = 2;
+    }
+}
+
+#ifdef RGBLIGHT_ENABLE
+void switch_keylight_color4bass(keyrecord_t *record, uint8_t keylocation){
+    switch (biton32(default_layer_state)) {
+        case _C_SYSTEM_BASE:
+            keylight_manager(record, HSV_GREEN, keylocation);
+            break;
+        case _C_SYSTEM_BASS2ROW:
+            keylight_manager(record, HSV_YELLOW, keylocation);
+            break;
+    }
+}
+void switch_keylight_color4chords(keyrecord_t *record, uint8_t keylocation){
+    switch (biton32(default_layer_state)) {
+        case _C_SYSTEM_BASE:
+            keylight_manager(record, HSV_SPRINGGREEN, keylocation);
+            break;
+        case _C_SYSTEM_BASS2ROW:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+    }
+}
+#endif  // RGBLIGHT_ENABLE
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+    #ifdef RGBLIGHT_ENABLE
+        /* prepare for turning on LEDs when keys are pressed. */
+        uint8_t r            = record->event.key.row;
+        uint8_t c            = record->event.key.col;
+        uint8_t keylocation  = pgm_read_byte(&convert_key_to_led[MATRIX_COLS * r + c]);
+    #endif  // RGBLIGHT_ENABLE
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        //  set default layer and save it to EEPROM when MIDI key layers are selected.
+        case CSYSTEM:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASE);
+            }
+            break;
+
+        case CNTBASC:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
+            }
+            break;
+
+        case CSYSALL:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_ENTIRELY);
+            }
+            break;
+
+        case CHRTONE:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_CHROMATONE);
+            }
+            break;
+
+        case TGLMICH:
+            if (record->event.pressed) {
+                toggle_MIDI_channel_separation();
+            };
+            break;
+
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4bass(record, keylocation);
+#endif
+            break;
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+#ifdef RGBLIGHT_ENABLE
+            switch_keylight_color4chords(record, keylocation);
+#endif
+            break;
+
+#ifdef RGBLIGHT_ENABLE
+        case KC_A ... KC_RGUI:                // for QWERTY
+        case KC_GESC:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+#endif
+            // Keycodes on the right side.
+#ifdef RGBLIGHT_ENABLE
+        case MIDI_TONE_MIN ... MIDI_TONE_MAX:  // notes on the right side.
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+        // case KC_MUTE:
+        case FN_MUTE:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+#endif
+    }
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/readme.md b/keyboards/giabalanai/keymaps/giabarinaix2led/readme.md
new file mode 100644
index 0000000000..89139ec1b3
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/readme.md
@@ -0,0 +1 @@
+# A keymap for giabarinaix2 with LEDs.
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/rules.mk b/keyboards/giabalanai/keymaps/giabarinaix2led/rules.mk
new file mode 100644
index 0000000000..d8dc6a10e7
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/rules.mk
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
new file mode 100644
index 0000000000..5a4361e5ae
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/party/keymap.c
@@ -0,0 +1,792 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "print.h"
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+#define DF_QWER  DF(_QWERTY)
+#define DF_COLE  DF(_COLEMAK)
+#define MO_ADJ   MO(_ADJUST)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE  LT(_FN, KC_MUTE)
+#define SHIF_UP  RSFT_T(KC_UP)
+#define ADJ_EIS  LT(_ADJUST,KC_LANG2)
+#define MIS_KAN  LT(_MISC,KC_LANG1)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+// UNISON flags
+static bool melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
+static bool melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
+
+static bool melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
+
+// To record the status of Bass Chord (single or dyad, default: dyad.)
+typedef union {
+    uint32_t raw;
+    struct {
+        bool isSingleBass:1;
+    };
+} user_config_t;
+user_config_t user_config;
+
+#define IS_SINGLE_BASS()   (user_config.isSingleBass)
+
+#ifdef RGBLIGHT_ENABLE
+/* used to specify there is no LED on the keylocation. */
+#    define NO_LED 255
+#endif  //  RGBLIGHT_ENABLE
+
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,      //  MIDI C-system
+    _FAKE_B_SYSTEM,      //  MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system.
+    _C_SYSTEM_BASS2ROW,  //  counter bass system
+    _C_SYSTEM_ENTIRELY,  //  single notes for both left and right keybaords.
+    _C_SYSTEM_FREEBASS,  //  C-system Free Bass
+    _CHROMATONE,
+    _CFLIP_BASS2ROW,     //  180 degree flipped layout on right side keyboard
+    _QWERTY,
+    _COLEMAK,
+    _ADJUST,             //  for Fn keys, etc.
+    _FN                  //  for changing layers, octaves, etc.
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION,
+    CSYSTEM,  // C-SYSTEM layout
+    BSYSTEM,  // B-SYSTEM layout
+    CNTBASC,  // CouNTer BASs C-system layout
+    CSYSALL,  // C-SYStem ALL layout
+    CSYSFBS,  // C-SYStem Free BaSs
+    CHRTONE,  // CHRomaTONE layout
+    CFLIP2B,  // C-system FLIPped 2(to) Backwards
+    TGLBASS,  // ToGgLe BASS unison
+    TGLMICH,  // ToGgLe MIdi CHannel separation
+    MELDYAL,  // MELody DYad Low
+    MELODYS,  // MELODY Single
+    MELDYAH,  // MELody DYad High
+    TGLUVEL   // ToGgLe Unison VELocity
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+static uint8_t my_tone_status[MIDI_TONE_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* fake B-system */
+  [_FAKE_B_SYSTEM] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+    MI_Ab_2,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Gb_3, MI_A_3, MI_C_4,  MI_Eb_4, MI_Gb_4, MI_A_4, MI_C_5,  MI_Eb_5, MI_Gb_5,     _______,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3, MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4, MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3, MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4, MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5
+  ),
+
+  /* BASS2row */
+  [_C_SYSTEM_BASS2ROW] = LAYOUT(
+    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
+      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    _______,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* C-system entirely */
+  [_C_SYSTEM_ENTIRELY] = LAYOUT(
+    MI_BENDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
+      MI_BENDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* C-system free bass */
+  [_C_SYSTEM_FREEBASS] = LAYOUT(
+    MI_Db_3,  MI_Bb_2,  MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,   MI_E_1,  MI_Db_1,  MI_Bb,  MI_G,  MI_E,
+      MI_C_3,   MI_A_2,   MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,  MI_Eb_1,  MI_C_1,  MI_A,   MI_Fs, MI_Eb,
+        MI_B_2,   MI_Ab_2,  MI_F_2,   MI_D_2,   MI_B_1,  MI_Ab_1,   MI_F_1,  MI_D_1,   MI_B,    MI_Ab,  MI_F,  MI_D,
+          MI_Bb_2, MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,    MI_E_1,  MI_Db_1,   MI_Bb,  MI_G,   MI_E,  MI_Db,
+            MI_A_2,  MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,   MI_Eb_1,  MI_C_1,   MI_A,   MI_Fs,  MI_Eb, MI_C,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* Chromatone */
+  [_CHROMATONE] = LAYOUT(
+    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,
+      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,
+        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2,
+          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,  MI_D_2,
+            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2, MI_Eb_2,
+
+    MI_C_2,
+      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3,    FN_MUTE,
+    MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3, MI_C_4,
+      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3
+  ),
+
+  [_CFLIP_BASS2ROW] = LAYOUT(
+    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
+      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+
+    MI_G_5,
+      MI_F_5,  MI_D_5,  MI_B_4,  MI_Ab_4, MI_F_4,  MI_D_4,  MI_B_3,  MI_Ab_3, MI_F_3,  MI_D_3,  MI_B_2,  MI_Ab_2,   FN_MUTE,
+    MI_Fs_5, MI_Eb_5, MI_C_5,  MI_A_4,  MI_Fs_4, MI_Eb_4, MI_C_4,  MI_A_3,  MI_Fs_3, MI_Eb_3, MI_C_3,  MI_A_2,  MI_Fs_2,
+      MI_E_5,  MI_Db_5, MI_Bb_4, MI_G_4,  MI_E_4,  MI_Db_4, MI_Bb_3, MI_G_3,  MI_E_3,  MI_Db_3, MI_Bb_2, MI_G_2
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  /* COLEMAK */
+  [_COLEMAK] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
+        KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
+          KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
+            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  /* ADJUST */
+  [_ADJUST] = LAYOUT_wrapper(
+    _______, _________________FUNC__L___________________, _________________FUNC__R___________________, _______,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  _______,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_GRV,  _______,
+          _______, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_BSLS, _______,
+
+    _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+
+  /* Fn */
+  [_FN] = LAYOUT(
+    CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_TOG,
+      DF_QWER, TGLBASS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TGLMICH,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    XXXXXXX,
+      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EEP_RST,   _______,
+    CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, RGB_MOD, RGB_TOG,
+      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]        = { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
+    [_FAKE_B_SYSTEM]        = { ENCODER_CCW_CW(_______,  _______) },
+    [_C_SYSTEM_BASS2ROW]    = { ENCODER_CCW_CW(_______,  _______) },
+    [_C_SYSTEM_ENTIRELY]    = { ENCODER_CCW_CW(_______,  _______) },
+    [_C_SYSTEM_FREEBASS]    = { ENCODER_CCW_CW(_______,  _______) },
+    [_CHROMATONE]           = { ENCODER_CCW_CW(_______,  _______) },
+    [_CFLIP_BASS2ROW]       = { ENCODER_CCW_CW(_______,  _______) },
+    [_QWERTY]               = { ENCODER_CCW_CW(_______,  _______) },
+    [_COLEMAK]              = { ENCODER_CCW_CW(_______,  _______) },
+    [_ADJUST]               = { ENCODER_CCW_CW(_______,  _______) },
+    [_FN]                   = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+
+// Light up adjust layer keys (left keyboard)
+const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS({1,  10, HSV_ORANGE},
+                                                                             {21,  2, HSV_ORANGE},
+                                                                             {25,  3, HSV_ORANGE},
+                                                                             {30,  5, HSV_ORANGE},
+                                                                             {37,  2, HSV_ORANGE},
+                                                                             {45,  2, HSV_ORANGE},
+                                                                             {57,  2, HSV_ORANGE}
+);
+
+// Light up fn layer keys
+const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(                           //  left keyboard
+                                                                         {0,   7, HSV_ORANGE},      //  MIDI layouts
+                                                                         {11,  1, HSV_RED},         //  RGB_TOG
+                                                                         {12,  1, HSV_WHITE},       //  DF_QWER
+                                                                         {13,  1, HSV_CORAL},       //  TGLBASS
+                                                                         {24,  1, HSV_WHITE},       //  DF_COLE
+                                                                         {35,  1, HSV_TEAL},        //  TGLMICH
+#if 0  //  Color Test
+                                                                         {36,  1, HSV_WHITE},
+                                                                         {37,  1, HSV_RED},
+                                                                         {38,  1, HSV_CORAL},
+                                                                         {39,  1, HSV_ORANGE},
+                                                                         {40,  1, HSV_GOLDENROD},
+                                                                         {41,  1, HSV_GOLD},
+                                                                         {42,  1, HSV_YELLOW},
+                                                                         {43,  1, HSV_CHARTREUSE},
+                                                                         {44,  1, HSV_GREEN},
+                                                                         {45,  1, HSV_SPRINGGREEN},
+                                                                         {46,  1, HSV_TURQUOISE},
+                                                                         {47,  1, HSV_TEAL},
+                                                                         {48,  1, HSV_CYAN},
+                                                                         {49,  1, HSV_AZURE},
+                                                                         {50,  1, HSV_BLUE},
+                                                                         {51,  1, HSV_PURPLE},
+                                                                         {52,  1, HSV_MAGENTA},
+                                                                         {53,  1, HSV_PINK},
+#endif
+                                                                                                    //  right keyboard
+                                                                         {60,  7, HSV_ORANGE},      //  MIDI layouts
+                                                                         {74,  1, HSV_CORAL},       //  TGLBASS
+                                                                         {85,  1, HSV_BLUE},        //  MIDI Oct
+                                                                         {86,  1, HSV_CYAN},        //  MIDI Oct
+                                                                         {87,  1, HSV_SPRINGGREEN}, //  MIDI Oct
+                                                                         {88,  1, HSV_GREEN},       //  MIDI Oct
+                                                                         {89,  1, HSV_CHARTREUSE},  //  MIDI Oct
+                                                                         {96,  1, HSV_PINK},        //  EEP_RST
+                                                                         {98,  7, HSV_ORANGE},      //  MIDI layouts
+                                                                         {107, 1, HSV_YELLOW},      //  MI_VELD
+                                                                         {108, 1, HSV_GREEN},       //  MI_VELU
+                                                                         {110, 1, HSV_RED},         //  RGB_TOG
+                                                                         {112, 1, HSV_CORAL},       //  TGLBASS
+                                                                         {119, 1, HSV_CORAL},       //  TGLUVEL
+                                                                         {120, 1, HSV_CYAN},        //  MELDYAL
+                                                                         {121, 1, HSV_GOLD},        //  MELODYS
+                                                                         {122, 1, HSV_SPRINGGREEN}  //  MELDYAH
+);
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_fn_layer, my_adjust_layer);
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // Both layers will light up if both kb layers are active
+    rgblight_set_layer_state(0, layer_state_cmp(state, _FN));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _ADJUST));
+    return state;
+};
+
+#endif  //  RGBLIGHT_ENABLE
+
+void my_init(void){
+    //  Set octave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+}
+
+void eeconfig_init_user(void) {
+    midi_init();
+    my_init();
+
+    // Used to set octave to MI_OCT_0
+    midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+    // UNISON flags
+    melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
+    melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
+    melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
+
+    //  Reset Bass setting
+    user_config.raw = 0;  // default: dyad
+    eeconfig_update_user(user_config.raw);
+
+    //  Reset the midi keyboard layout
+    set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
+
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_sethsv(HSV_BLUE);
+        //  party mode (for LED soldering test.)
+    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+#endif
+}
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_indicators_user(void) {
+    uint8_t i;
+    // uint32_t mode = rgblight_get_mode();
+
+    if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
+
+        uint8_t layer = biton32(layer_state);
+
+        switch (layer) {
+            case _ADJUST:
+                rgb_matrix_set_color(30, RGB_DARKORANGE);
+                rgb_matrix_set_color(34, RGB_DARKORANGE);
+                // rgb_matrix_set_color(72, RGB_DARKORANGE);
+                break;
+            case _FN:
+                for (i = 0;i < 7;i++) {
+                    rgb_matrix_set_color(74 - i, RGB_DARKORANGE);      //  MIDI layouts
+                    //  right keyboard
+                    rgb_matrix_set_color(i, RGB_DARKORANGE);      //  MIDI layouts
+                    rgb_matrix_set_color(50 - i, RGB_DARKORANGE);      //  MIDI layouts
+                }
+
+                // rgb_matrix_set_color(pgm_read_byte(&convert_led_location2number[11]),  RGB_RED);         //  RGB_TOG  <- too heavy.
+                rgb_matrix_set_color(64,  RGB_DARKBLUE);         //  RGB_MOD
+                rgb_matrix_set_color(63,  RGB_DARKRED);         //  RGB_TOG
+                rgb_matrix_set_color(76,  RGB_DARKCORAL);       //  TGLBASS
+
+                rgb_matrix_set_color(75,  RGB_DARKWHITE);       //  DF_QWER
+                rgb_matrix_set_color(98,  RGB_DARKWHITE);       //  DF_COLE
+                rgb_matrix_set_color(87,  RGB_DARKTEAL);        //  TGLMICH
+
+                rgb_matrix_set_color(23, RGB_DARKCORAL);       //  TGLBASS
+                rgb_matrix_set_color(26, RGB_DARKBLUE);        //  MIDI Oct
+                rgb_matrix_set_color(27, RGB_DARKCYAN);        //  MIDI Oct
+                rgb_matrix_set_color(28, RGB_DARKSPRINGGREEN); //  MIDI Oct
+                rgb_matrix_set_color(29, RGB_DARKGREEN);       //  MIDI Oct
+                rgb_matrix_set_color(30, RGB_DARKCHARTREUSE);  //  MIDI Oct
+                rgb_matrix_set_color(37, RGB_DARKPINK);        //  EEP_RST
+                rgb_matrix_set_color(41, RGB_DARKYELLOW);      //  MI_VELD
+                rgb_matrix_set_color(40, RGB_DARKGREEN);       //  MI_VELU
+                rgb_matrix_set_color(39, RGB_DARKBLUE);        //  RGB_MOD
+                rgb_matrix_set_color(38, RGB_DARKRED);         //  RGB_TOG
+                rgb_matrix_set_color(52, RGB_DARKCORAL);       //  TGLBASS
+                rgb_matrix_set_color(59, RGB_DARKCORAL);       //  TGLUVEL
+                rgb_matrix_set_color(60, RGB_DARKCYAN);        //  MELDYAL
+                rgb_matrix_set_color(61, RGB_DARKGOLD);        //  MELODYS
+                rgb_matrix_set_color(62, RGB_DARKSPRINGGREEN);  //  MELDYAH
+                break;
+        }
+    }
+}
+#endif
+
+void keyboard_post_init_user(void) {
+    my_init();
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+    for (uint8_t i = 0; i < MIDI_TONE_COUNT; i++) {
+        my_tone_status[i] = MIDI_INVALID_NOTE;
+    }
+    //  load EEPROM data for isSingleBass
+    user_config.raw = eeconfig_read_user();
+
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_layers = my_rgb_layers;
+
+    // Reset LED off
+    rgblight_sethsv(HSV_BLACK);
+#    if defined(RGBLIGHT_EFFECT_KNIGHT) || defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_sethsv(30, 50, 40);
+#        ifdef RGBLIGHT_EFFECT_KNIGHT
+    rgblight_mode(RGBLIGHT_MODE_KNIGHT);
+#        elif defined(RGBLIGHT_EFFECT_TWINKLE)
+    rgblight_mode(RGBLIGHT_MODE_TWINKLE+3);
+#        endif
+#    endif
+#endif  // RGBLIGHT_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_sethsv(HSV_BLUE);
+    //  party mode (for LED soldering test.)
+    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+#endif
+};
+
+void toggle_isSingleBass(void) {
+#ifdef CONSOLE_ENABLE
+    uprintf("isSingleBass(before) %u\n", user_config.isSingleBass);
+#endif
+    user_config.isSingleBass = !user_config.isSingleBass;
+#ifdef CONSOLE_ENABLE
+    uprintf("isSingleBass(after) %u\n", user_config.isSingleBass);
+#endif
+
+    eeconfig_update_user(user_config.raw);
+}
+
+void toggle_MIDI_channel_separation(void) {
+    if (midi_chord_ch > 0) {
+        midi_chord_ch = 0;
+        midi_bass_ch  = 0;
+    } else {
+        midi_chord_ch = 1;
+        midi_bass_ch  = 2;
+    }
+}
+
+#ifdef RGBLIGHT_ENABLE
+void keylight_manager(keyrecord_t *record, uint8_t hue, uint8_t sat, uint8_t val, uint8_t keylocation) {
+    if (keylocation == NO_LED) {
+        return;  // do nothing.
+#    ifdef CONSOLE_ENABLE
+        uprintf("keylight_manager, NO_LED\n");
+#    endif
+    }
+
+    if (record->event.pressed) {
+        rgblight_sethsv_at(hue, sat, val, keylocation);
+    } else {
+        rgblight_sethsv_at(HSV_BLACK, keylocation);
+    }
+}
+#endif  // RGBLIGHT_ENABLE
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+#ifdef RGBLIGHT_ENABLE
+    /* prepare for turning on LEDs when keys are pressed. */
+    uint8_t r            = record->event.key.row;
+    uint8_t c            = record->event.key.col;
+    // uint8_t keylocation  = convert_key_to_led[MATRIX_COLS * r + c];
+    // uint8_t keylocation2 = convert_key_to_led2[MATRIX_COLS * r + c];
+    uint8_t keylocation  = pgm_read_byte(&convert_key_to_led[MATRIX_COLS * r + c]);
+    uint8_t keylocation2 = pgm_read_byte(&convert_key_to_led2[MATRIX_COLS * r + c]);
+#endif  // RGBLIGHT_ENABLE
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        //  set default layer and save it to EEPROM when MIDI key layers are selected.
+        case CSYSTEM:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASE);
+            }
+            break;
+
+        case BSYSTEM:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_FAKE_B_SYSTEM);
+            }
+            break;
+
+        case CNTBASC:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
+            }
+            break;
+
+        case CSYSALL:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_ENTIRELY);
+            }
+            break;
+
+        case CHRTONE:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_CHROMATONE);
+            }
+            break;
+
+        case CFLIP2B:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_CFLIP_BASS2ROW);
+            }
+            break;
+
+        case CSYSFBS:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_C_SYSTEM_FREEBASS);
+            }
+            break;
+
+        case TGLBASS:
+            if (record->event.pressed) {
+                toggle_isSingleBass();
+            };
+            break;
+
+        case TGLMICH:
+            if (record->event.pressed) {
+                toggle_MIDI_channel_separation();
+            };
+            break;
+
+        case MELDYAL:
+            if (record->event.pressed) {
+                melody_dyad_low  = true;
+                melody_dyad_high = false;
+            };
+            break;
+
+        case MELODYS:
+            if (record->event.pressed) {
+                melody_dyad_low  = false;
+                melody_dyad_high = false;
+            };
+            break;
+
+        case MELDYAH:
+            if (record->event.pressed) {
+                melody_dyad_low  = false;
+                melody_dyad_high = true;
+            };
+            break;
+
+        case TGLUVEL:
+            if (record->event.pressed) {
+                melody_unison_suppress = !melody_unison_suppress;
+            };
+            break;
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, IS_SINGLE_BASS());
+#ifdef RGBLIGHT_ENABLE
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+#endif
+            break;
+
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+#ifdef RGBLIGHT_ENABLE
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+#endif
+            break;
+
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+#ifdef RGBLIGHT_ENABLE
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+#endif
+            break;
+
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+#ifdef RGBLIGHT_ENABLE
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+#endif
+            break;
+
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+#ifdef RGBLIGHT_ENABLE
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+#endif
+            break;
+
+#ifdef RGBLIGHT_ENABLE
+        case KC_A ... KC_RGUI:                // for QWERTY
+        case KC_GESC:
+        case ADJ_EIS:
+        case MO_ADJ:
+        case SHIF_UP:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+#endif
+
+        // Keycodes on the right side.
+        case MIDI_TONE_MIN ... MIDI_TONE_MAX:  // notes on the right side keyboard.
+            //  root_note is played by process_midi().
+            if ( melody_dyad_high == true ) {        //  play 1 octave higher as well.
+                my_process_midi(0, keycode, record, my_tone_status, 12, melody_unison_suppress);
+            } else if ( melody_dyad_low == true ) {  //  play 1 octave lower as well.
+                my_process_midi(0, keycode, record, my_tone_status, -12, melody_unison_suppress);
+            }
+#ifdef RGBLIGHT_ENABLE
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            keylight_manager(record, HSV_GOLDENROD, keylocation2);
+#endif
+            break;
+
+#ifdef RGBLIGHT_ENABLE
+        // case KC_MUTE:
+        case FN_MUTE:
+            keylight_manager(record, HSV_GOLDENROD, keylocation);
+            break;
+#endif
+    }
+    // If console is enabled, it will print the matrix position and status of each key pressed
+#if defined(CONSOLE_ENABLE) && defined(RGBLIGHT_ENABLE)
+    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+    uprintf("r=%d, c=%d, keyloc=%d, keyloc2=%d, matrix_col x r + c = %d\n", r, c, keylocation, keylocation2, MATRIX_COLS * r + c);
+#endif
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/party/readme.md b/keyboards/giabalanai/keymaps/party/readme.md
new file mode 100644
index 0000000000..797fed76f8
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/party/readme.md
@@ -0,0 +1,3 @@
+# The fancy LED ver. for giabalanai
+# warning: There is little space left for the firmware. You can't do anything further with this firmware.
+#          Power consumption might exceed 5 V * 500 mA = 2.5 W or so.
diff --git a/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc b/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
new file mode 100644
index 0000000000..40ce7148d3
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
@@ -0,0 +1,57 @@
+#ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
+RGB_MATRIX_EFFECT(my_solid_reactive_with_CnoteIndicator)
+RGB_MATRIX_EFFECT(my_party_rocks)
+
+#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+bool my_solid_reactive_with_CnoteIndicator(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t max_tick = 65535 / rgb_matrix_config.speed;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        HSV hsv = rgb_matrix_config.hsv;
+        switch (i) {
+            //  C note indicator
+            case 15:
+            case 19:
+            case 23:
+            case 52:
+            case 56:
+            case 60:
+            case 80:  //  left hand side, bass C note when counter bass is chosen.
+                // HSV_GOLDENROD
+                hsv.h = 30;
+                hsv.s = 218;
+                hsv.v = 218;
+                break;
+        }
+        uint16_t tick = max_tick;
+        // Reverse search to find most recent key hit
+        for (int8_t j = g_last_hit_tracker.count - 1; j >= 0; j--) {
+            if (g_last_hit_tracker.x[j] == g_led_config.point[i].x && g_last_hit_tracker.y[j] == g_led_config.point[i].y && g_last_hit_tracker.tick[j] < tick) {
+                tick = g_last_hit_tracker.tick[j];
+                break;
+            }
+        }
+
+        uint16_t offset = scale16by8(tick, rgb_matrix_config.speed);
+        hsv.h += qsub8(130, offset);
+        RGB      rgb    = rgb_matrix_hsv_to_rgb(hsv);
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool my_party_rocks(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    HSV hsv = {rand() & 0xFF, rand() & 0xFF, rgb_matrix_config.hsv.v};
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    // rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    rgb_matrix_set_color_all(rgb.r, rgb.g, rgb.b);
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+
+#    endif      // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/giabalanai/keymaps/party/rules.mk b/keyboards/giabalanai/keymaps/party/rules.mk
new file mode 100644
index 0000000000..c05207feeb
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/party/rules.mk
@@ -0,0 +1,6 @@
+# RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+CONSOLE_ENABLE =  no        # Console for debug
+RGB_MATRIX_ENABLE = yes    # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
+RGB_MATRIX_CUSTOM_USER = yes  #
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/via/config.h b/keyboards/giabalanai/keymaps/via/config.h
new file mode 100644
index 0000000000..a3b77a5b4d
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c
new file mode 100644
index 0000000000..774260d052
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via/keymap.c
@@ -0,0 +1,260 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+#define DFCBASE DF(_C_SYSTEM_BASE)
+#define DF_QWER DF(_QWERTY)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE LT(_FN, KC_MUTE)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,  //  MIDI C-system
+    _QWERTY,         //  just in case
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION = USER00
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Fs_2,
+      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
+    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
+      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+
+    KC_GESC,
+      _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_MINS, KC_BSPC,   _______,
+    KC_LCTL, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, KC_ENT,
+      KC_LALT, _________________QWERTY_L3_________________, KC_N, KC_M, KC_COMM, KC_DOT, KC_SPC, KC_RSFT
+  ),
+
+  /* Fn */
+  [_FN] = LAYOUT(
+    DFCBASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    _______,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX,   _______,
+    DFCBASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]        = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_QWERTY]               = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]                   = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+void keyboard_post_init_user(void) {
+    //  Set otave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+    default_layer_set(1UL << _C_SYSTEM_BASE);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
+            break;
+
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+            break;
+
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+            break;
+
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+            break;
+
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/via/readme.md b/keyboards/giabalanai/keymaps/via/readme.md
new file mode 100644
index 0000000000..3c599bfe0e
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default VIA keymap for giabalanai
diff --git a/keyboards/giabalanai/keymaps/via/rules.mk b/keyboards/giabalanai/keymaps/via/rules.mk
new file mode 100644
index 0000000000..da4a83087f
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h b/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h
new file mode 100644
index 0000000000..01905b8dfe
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define GIABARINAIX2
+#ifdef GIABARINAIX2
+#    undef MATRIX_ROW_PINS_RIGHT
+#    undef MATRIX_COL_PINS_RIGHT
+
+#    ifdef RGBLIGHT_ENABLE
+#        undef RGBLED_NUM
+#        define RGBLED_NUM 120
+#        undef RGBLIGHT_LED_MAP
+#        define RGBLIGHT_LED_MAP { \
+           108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \
+           107, 106, 105, 104, 103, 102, 101, 100, 99,  98,  97,  96, \
+           84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95, \
+           83,  82,  81,  80,  79,  78,  77,  76,  75,  74,  73,  72, \
+           60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71, \
+           \
+           11,  10,  9,   8,   7,   6,   5,   4,   3,   2,   1,   0,  \
+           12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23, \
+           35,  34,  33,  32,  31,  30,  29,  28,  27,  26,  25,  24, \
+           36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47, \
+           59,  58,  57,  56,  55,  54,  53,  52,  51,  50,  49,  48  \
+           }
+#    endif
+#endif
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json b/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json
new file mode 100644
index 0000000000..20a52326dd
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json
@@ -0,0 +1,146 @@
+{
+    "keyboard_name": "giabarinaix2",
+    "manufacturer": "3araht",
+    "url": "https://github.com/3araht",
+    "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B2",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+          "layout": [
+              {"label": "l00", "x": 0,    "y": 0},
+              {"label": "l01", "x": 1,    "y": 0},
+              {"label": "l02", "x": 2,    "y": 0},
+              {"label": "l03", "x": 3,    "y": 0},
+              {"label": "l04", "x": 4,    "y": 0},
+              {"label": "l05", "x": 5,    "y": 0},
+              {"label": "l06", "x": 6,    "y": 0},
+              {"label": "l07", "x": 7,    "y": 0},
+              {"label": "l08", "x": 8,    "y": 0},
+              {"label": "l09", "x": 9,    "y": 0},
+              {"label": "l0a", "x": 10,   "y": 0},
+              {"label": "l0b", "x": 11,   "y": 0},
+
+              {"label": "r00", "x": 14.5, "y": 0},
+              {"label": "r01", "x": 15.5, "y": 0},
+              {"label": "r02", "x": 16.5, "y": 0},
+              {"label": "r03", "x": 17.5, "y": 0},
+              {"label": "r04", "x": 18.5, "y": 0},
+              {"label": "r05", "x": 19.5, "y": 0},
+              {"label": "r06", "x": 20.5, "y": 0},
+              {"label": "r07", "x": 21.5, "y": 0},
+              {"label": "r08", "x": 22.5, "y": 0},
+              {"label": "r09", "x": 23.5, "y": 0},
+              {"label": "r0a", "x": 24.5, "y": 0},
+              {"label": "r0b", "x": 25.5, "y": 0},
+
+              {"label": "l10", "x": 0.5,  "y": 1},
+              {"label": "l11", "x": 1.5,  "y": 1},
+              {"label": "l12", "x": 2.5,  "y": 1},
+              {"label": "l13", "x": 3.5,  "y": 1},
+              {"label": "l14", "x": 4.5,  "y": 1},
+              {"label": "l15", "x": 5.5,  "y": 1},
+              {"label": "l16", "x": 6.5,  "y": 1},
+              {"label": "l17", "x": 7.5,  "y": 1},
+              {"label": "l18", "x": 8.5,  "y": 1},
+              {"label": "l19", "x": 9.5,  "y": 1},
+              {"label": "l1a", "x": 10.5, "y": 1},
+              {"label": "l1b", "x": 11.5, "y": 1},
+
+              {"label": "r10", "x": 15,   "y": 1},
+              {"label": "r11", "x": 16,   "y": 1},
+              {"label": "r12", "x": 17,   "y": 1},
+              {"label": "r13", "x": 18,   "y": 1},
+              {"label": "r14", "x": 19,   "y": 1},
+              {"label": "r15", "x": 20,   "y": 1},
+              {"label": "r16", "x": 21,   "y": 1},
+              {"label": "r17", "x": 22,   "y": 1},
+              {"label": "r18", "x": 23,   "y": 1},
+              {"label": "r19", "x": 24,   "y": 1},
+              {"label": "r1a", "x": 25,   "y": 1},
+              {"label": "r1b", "x": 26,   "y": 1},
+
+              {"label": "l20", "x": 1,    "y": 2},
+              {"label": "l21", "x": 2,    "y": 2},
+              {"label": "l22", "x": 3,    "y": 2},
+              {"label": "l23", "x": 4,    "y": 2},
+              {"label": "l24", "x": 5,    "y": 2},
+              {"label": "l25", "x": 6,    "y": 2},
+              {"label": "l26", "x": 7,    "y": 2},
+              {"label": "l27", "x": 8,    "y": 2},
+              {"label": "l28", "x": 9,    "y": 2},
+              {"label": "l29", "x": 10,   "y": 2},
+              {"label": "l2a", "x": 11,   "y": 2},
+              {"label": "l2b", "x": 12,   "y": 2},
+
+              {"label": "r20", "x": 15.5, "y": 2},
+              {"label": "r21", "x": 16.5, "y": 2},
+              {"label": "r22", "x": 17.5, "y": 2},
+              {"label": "r23", "x": 18.5, "y": 2},
+              {"label": "r24", "x": 19.5, "y": 2},
+              {"label": "r25", "x": 20.5, "y": 2},
+              {"label": "r26", "x": 21.5, "y": 2},
+              {"label": "r27", "x": 22.5, "y": 2},
+              {"label": "r28", "x": 23.5, "y": 2},
+              {"label": "r29", "x": 24.5, "y": 2},
+              {"label": "r2a", "x": 25.5, "y": 2},
+              {"label": "r2b", "x": 26.5, "y": 2},
+
+              {"label": "l30", "x": 1.5,  "y": 3},
+              {"label": "l31", "x": 2.5,  "y": 3},
+              {"label": "l32", "x": 3.5,  "y": 3},
+              {"label": "l33", "x": 4.5,  "y": 3},
+              {"label": "l34", "x": 5.5,  "y": 3},
+              {"label": "l35", "x": 6.5,  "y": 3},
+              {"label": "l36", "x": 7.5,  "y": 3},
+              {"label": "l37", "x": 8.5,  "y": 3},
+              {"label": "l38", "x": 9.5,  "y": 3},
+              {"label": "l39", "x": 10.5, "y": 3},
+              {"label": "l3a", "x": 11.5, "y": 3},
+              {"label": "l3b", "x": 12.5, "y": 3},
+
+              {"label": "r30", "x": 16,   "y": 3},
+              {"label": "r31", "x": 17,   "y": 3},
+              {"label": "r32", "x": 18,   "y": 3},
+              {"label": "r33", "x": 19,   "y": 3},
+              {"label": "r34", "x": 20,   "y": 3},
+              {"label": "r35", "x": 21,   "y": 3},
+              {"label": "r36", "x": 22,   "y": 3},
+              {"label": "r37", "x": 23,   "y": 3},
+              {"label": "r38", "x": 24,   "y": 3},
+              {"label": "r39", "x": 25,   "y": 3},
+              {"label": "r3a", "x": 26,   "y": 3},
+              {"label": "r3b", "x": 27,   "y": 3},
+
+              {"label": "l40", "x": 2,    "y": 4},
+              {"label": "l41", "x": 3,    "y": 4},
+              {"label": "l42", "x": 4,    "y": 4},
+              {"label": "l43", "x": 5,    "y": 4},
+              {"label": "l44", "x": 6,    "y": 4},
+              {"label": "l45", "x": 7,    "y": 4},
+              {"label": "l46", "x": 8,    "y": 4},
+              {"label": "l47", "x": 9,    "y": 4},
+              {"label": "l48", "x": 10,   "y": 4},
+              {"label": "l49", "x": 11,   "y": 4},
+              {"label": "l4a", "x": 12,   "y": 4},
+              {"label": "l4b", "x": 13,   "y": 4},
+
+              {"label": "r40", "x": 16.5, "y": 4},
+              {"label": "r41", "x": 17.5, "y": 4},
+              {"label": "r42", "x": 18.5, "y": 4},
+              {"label": "r43", "x": 19.5, "y": 4},
+              {"label": "r44", "x": 20.5, "y": 4},
+              {"label": "r45", "x": 21.5, "y": 4},
+              {"label": "r46", "x": 22.5, "y": 4},
+              {"label": "r47", "x": 23.5, "y": 4},
+              {"label": "r48", "x": 24.5, "y": 4},
+              {"label": "r49", "x": 25.5, "y": 4},
+              {"label": "r4a", "x": 26.5, "y": 4},
+              {"label": "r4b", "x": 27.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
new file mode 100644
index 0000000000..afe1faff1b
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
@@ -0,0 +1,262 @@
+/* Copyright 2020 3araht
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+// Alias layout macros that expand groups of keys.
+#define LAYOUT_wrapper_giabarinaix2(...) LAYOUT_giabarinaix2(__VA_ARGS__)
+
+#define DFCBASE DF(_C_SYSTEM_BASE)
+#define DF_QWER DF(_QWERTY)
+// Long press: go to _FN layer, tap: MUTE
+#define FN_MUTE LT(_FN, KC_MUTE)
+
+// Used to set octave to MI_OCT_0
+extern midi_config_t midi_config;
+uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _C_SYSTEM_BASE,  //  MIDI C-system
+    _QWERTY,         //  just in case
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+
+    // MIDI Chord Keycodes - Root notes
+    MY_CHORD_MIN = SAFE_RANGE,
+
+    MI_CH_Cr = MY_CHORD_MIN,
+    MI_CH_Csr,
+    MI_CH_Dbr = MI_CH_Csr,
+    MI_CH_Dr,
+    MI_CH_Dsr,
+    MI_CH_Ebr = MI_CH_Dsr,
+    MI_CH_Er,
+    MI_CH_Fr,
+    MI_CH_Fsr,
+    MI_CH_Gbr = MI_CH_Fsr,
+    MI_CH_Gr,
+    MI_CH_Gsr,
+    MI_CH_Abr = MI_CH_Gsr,
+    MI_CH_Ar,
+    MI_CH_Asr,
+    MI_CH_Bbr = MI_CH_Asr,
+    MI_CH_Br,
+
+    // MIDI Chord Keycodes - Major
+
+    MI_CH_C,
+    MI_CH_Cs,
+    MI_CH_Db = MI_CH_Cs,
+    MI_CH_D,
+    MI_CH_Ds,
+    MI_CH_Eb = MI_CH_Ds,
+    MI_CH_E,
+    MI_CH_F,
+    MI_CH_Fs,
+    MI_CH_Gb = MI_CH_Fs,
+    MI_CH_G,
+    MI_CH_Gs,
+    MI_CH_Ab = MI_CH_Gs,
+    MI_CH_A,
+    MI_CH_As,
+    MI_CH_Bb = MI_CH_As,
+    MI_CH_B,
+
+    // MIDI Chord Keycodes Minor
+
+    MI_CH_Cm,
+    MI_CH_Csm,
+    MI_CH_Dbm = MI_CH_Csm,
+    MI_CH_Dm,
+    MI_CH_Dsm,
+    MI_CH_Ebm = MI_CH_Dsm,
+    MI_CH_Em,
+    MI_CH_Fm,
+    MI_CH_Fsm,
+    MI_CH_Gbm = MI_CH_Fsm,
+    MI_CH_Gm,
+    MI_CH_Gsm,
+    MI_CH_Abm = MI_CH_Gsm,
+    MI_CH_Am,
+    MI_CH_Asm,
+    MI_CH_Bbm = MI_CH_Asm,
+    MI_CH_Bm,
+
+    //MIDI Chord Keycodes Dominant Seventh
+
+    MI_CH_CDom7,
+    MI_CH_CsDom7,
+    MI_CH_DbDom7 = MI_CH_CsDom7,
+    MI_CH_DDom7,
+    MI_CH_DsDom7,
+    MI_CH_EbDom7 = MI_CH_DsDom7,
+    MI_CH_EDom7,
+    MI_CH_FDom7,
+    MI_CH_FsDom7,
+    MI_CH_GbDom7 = MI_CH_FsDom7,
+    MI_CH_GDom7,
+    MI_CH_GsDom7,
+    MI_CH_AbDom7 = MI_CH_GsDom7,
+    MI_CH_ADom7,
+    MI_CH_AsDom7,
+    MI_CH_BbDom7 = MI_CH_AsDom7,
+    MI_CH_BDom7,
+
+    // MIDI Chord Keycodes Diminished Seventh
+
+    MI_CH_CDim7,
+    MI_CH_CsDim7,
+    MI_CH_DbDim7 = MI_CH_CsDim7,
+    MI_CH_DDim7,
+    MI_CH_DsDim7,
+    MI_CH_EbDim7 = MI_CH_DsDim7,
+    MI_CH_EDim7,
+    MI_CH_FDim7,
+    MI_CH_FsDim7,
+    MI_CH_GbDim7 = MI_CH_FsDim7,
+    MI_CH_GDim7,
+    MI_CH_GsDim7,
+    MI_CH_AbDim7 = MI_CH_GsDim7,
+    MI_CH_ADim7,
+    MI_CH_AsDim7,
+    MI_CH_BbDim7 = MI_CH_AsDim7,
+    MI_CH_BDim7,
+
+    MY_CHORD_MAX = MI_CH_BDim7,
+
+    VERSION = USER00
+};
+
+#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
+static uint8_t chord_status[MY_CHORD_COUNT];
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* C-system Base */
+  [_C_SYSTEM_BASE] = LAYOUT_giabarinaix2(
+    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
+      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
+        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
+          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
+            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
+
+    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
+      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
+        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
+          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
+            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+  ),
+
+  /* QWERTY */
+  [_QWERTY] = LAYOUT_wrapper_giabarinaix2(
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+
+    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
+        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
+          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, _______
+  ),
+
+  /* Fn */
+  [_FN] = LAYOUT_giabarinaix2(
+    DFCBASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    DFCBASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX,
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_C_SYSTEM_BASE]        = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_QWERTY]               = { ENCODER_CCW_CW(_______, _______) },
+    [_FN]                   = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+void keyboard_post_init_user(void) {
+    //  Set otave to MI_OCT_0
+    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+
+    // avoid using 127 since it is used as a special number in some sound sources.
+    midi_config.velocity = MIDI_INITIAL_VELOCITY;
+
+    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
+        chord_status[i] = MIDI_INVALID_NOTE;
+    }
+
+    default_layer_set(1UL << _C_SYSTEM_BASE);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
+
+    uint8_t chord        = keycode - MY_CHORD_MIN;
+
+    switch (keycode) {
+        case VERSION: // Output firmware info.
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
+            }
+            break;
+
+        // MIDI Chord Keycodes, on the left side.
+        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
+            root_note = keycode - MI_CH_Cr + MI_C_1;
+            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
+            break;
+
+        case MI_CH_C ... MI_CH_B:  // Major Chords
+            root_note = keycode - MI_CH_C + MI_C_2;
+            // Root, Major Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
+            break;
+
+        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
+            root_note = keycode - MI_CH_Cm + MI_C_2;
+            // Root, Minor Third, and Fifth Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
+            break;
+
+        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
+            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            // Major Third, Major Fifth, and Minor Seventh Notes
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
+            break;
+
+        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
+            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            // Root, Minor Third, and Diminished 5th Note
+            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md b/keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md
new file mode 100644
index 0000000000..04c1613d53
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md
@@ -0,0 +1 @@
+# The default keymap for giabarinaix2, VIA version.
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/rules.mk b/keyboards/giabalanai/keymaps/via_giabarinaix2/rules.mk
new file mode 100644
index 0000000000..f4836fd4f2
--- /dev/null
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+ENCODER_ENABLE = no        # encoder on mute button
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/readme.md b/keyboards/giabalanai/readme.md
new file mode 100644
index 0000000000..30b1b60cd1
--- /dev/null
+++ b/keyboards/giabalanai/readme.md
@@ -0,0 +1,24 @@
+# giabalanai
+
+<p align=center>
+<img width="700" alt="giabalanai_logo" src="https://github.com/3araht/giabalanai/blob/main/pictures/giabalanai_logo.png">
+</p>
+
+![giabalanai overview](https://github.com/3araht/giabalanai/blob/main/pictures/giabalanai_overview.jpg)
+
+giabalanai keyboard is a simple-design Chromatic Button Accordion-ish MIDI keyboard (60 bass + C-system 62 keys = 38 notes) that doesn't have bellows nor register switches.  
+
+* Keyboard Maintainer: [3araht](https://github.com/3araht)
+* Hardware Supported: giabalanai keyboard, a split keyboard mainly work as MIDI keyboard.
+* Hardware Availability: [Yushakobo](https://yushakobo.jp/shop/consign_giabalanai/) or [BOOTH](https://3araht.booth.pm/). Click [here](https://www.tenso.com/en/static/lp_shop_booth) for BOOTH overseas shipping!
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make giabalanai:default
+
+Flashing example for this keyboard:
+
+    make giabalanai:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk
new file mode 100644
index 0000000000..b642aa9aa3
--- /dev/null
+++ b/keyboards/giabalanai/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+MIDI_ENABLE = yes           # MIDI support
+ENCODER_ENABLE = yes        # encoder on mute button
+SPLIT_KEYBOARD = yes        # Enables split keyboard support
+# RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys).
+RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
+RGB_MATRIX_DRIVER = WS2812  # 2021/01/23 added.
+
+LTO_ENABLE = yes

From e4bf8323688b56cd5fc0f4f27c531f3406d40f6d Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Wed, 31 Aug 2022 19:39:16 -0400
Subject: [PATCH 287/959] Add unicode mode change callbacks (#18235)

---
 docs/feature_unicode.md                       | 11 +++++++
 .../process_keycode/process_unicode_common.c  | 17 ++++++++++
 .../process_keycode/process_unicode_common.h  |  3 ++
 users/spidey3/layer_rgb.c                     | 31 +++++++------------
 users/spidey3/spidey3.c                       | 18 ++++++++---
 users/spidey3/spidey3.h                       | 11 +++++--
 6 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
index 2389cb735c..94873d2827 100644
--- a/docs/feature_unicode.md
+++ b/docs/feature_unicode.md
@@ -206,6 +206,17 @@ The functions for starting and finishing Unicode input on your platform can be o
 
 You can find the default implementations of these functions in [`process_unicode_common.c`](https://github.com/qmk/qmk_firmware/blob/master/quantum/process_keycode/process_unicode_common.c).
 
+### Input Mode Callbacks
+
+There are callbacks functions available that are called whenever the unicode input mode changes. The new input mode is passed to the function.
+
+|Callback                                           |Description                                          |
+|---------------------------------------------------|-----------------------------------------------------|
+| `unicode_input_mode_set_kb(uint8_t input_mode)`   | Callback for unicode input mode set, for keyboard.  |
+| `unicode_input_mode_set_user(uint8_t input_mode)` | Callback for unicode input mode set, for users.     |
+
+This feature can be used, for instance, to implement LED indicators for the current unicode input mode.
+
 ### Input Key Configuration
 
 You can customize the keys used to trigger Unicode input for macOS, Linux and WinCompose by adding corresponding defines to your `config.h`. The default values match the platforms' default settings, so you shouldn't need to change this unless Unicode input isn't working, or you want to use a different key (e.g. in order to free up left or right Alt).
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 1c1aab8f48..94809cf029 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -29,6 +29,20 @@ static int8_t  selected_count = ARRAY_SIZE(selected);
 static int8_t  selected_index;
 #endif
 
+/** \brief Uunicode input mode set at user level
+ *
+ * Run user code on unicode input mode change
+ */
+__attribute__((weak)) void unicode_input_mode_set_user(uint8_t input_mode) {}
+
+/** \brief unicode input mode set at keyboard level
+ *
+ *  Run keyboard code on unicode input mode change
+ */
+__attribute__((weak)) void unicode_input_mode_set_kb(uint8_t input_mode) {
+    unicode_input_mode_set_user(input_mode);
+}
+
 void unicode_input_mode_init(void) {
     unicode_config.raw = eeprom_read_byte(EECONFIG_UNICODEMODE);
 #if UNICODE_SELECTED_MODES != -1
@@ -50,6 +64,7 @@ void unicode_input_mode_init(void) {
     unicode_config.input_mode = selected[selected_index = 0];
 #    endif
 #endif
+    unicode_input_mode_set_kb(unicode_config.input_mode);
     dprintf("Unicode input mode init to: %u\n", unicode_config.input_mode);
 }
 
@@ -60,6 +75,7 @@ uint8_t get_unicode_input_mode(void) {
 void set_unicode_input_mode(uint8_t mode) {
     unicode_config.input_mode = mode;
     persist_unicode_input_mode();
+    unicode_input_mode_set_kb(mode);
     dprintf("Unicode input mode set to: %u\n", unicode_config.input_mode);
 }
 
@@ -73,6 +89,7 @@ void cycle_unicode_input_mode(int8_t offset) {
 #    if UNICODE_CYCLE_PERSIST
     persist_unicode_input_mode();
 #    endif
+    unicode_input_mode_set_kb(unicode_config.input_mode);
     dprintf("Unicode input mode cycle to: %u\n", unicode_config.input_mode);
 #endif
 }
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index 15e798dbb3..bdc7a1dedd 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -87,6 +87,9 @@ void unicode_input_start(void);
 void unicode_input_finish(void);
 void unicode_input_cancel(void);
 
+void unicode_input_mode_set_user(uint8_t input_mode);
+void unicode_input_mode_set_kb(uint8_t input_mode);
+
 void register_hex(uint16_t hex);
 void register_hex32(uint32_t hex);
 void register_unicode(uint32_t code_point);
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index b34b91679d..bdf4584ef1 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -112,8 +112,7 @@ void do_rgb_layers(layer_state_t state, uint8_t start, uint8_t end) {
     }
 }
 
-void do_rgb_unicode(void) {
-    uint8_t uc_mode = get_unicode_input_mode();
+void do_rgb_unicode(uint8_t uc_mode) {
     for (uint8_t i = 0; i < UC__COUNT; i++) {
         bool is_on = i == uc_mode;
         rgblight_set_layer_state(UNICODE_OFFSET + i, is_on);
@@ -123,7 +122,7 @@ void do_rgb_unicode(void) {
 void do_rgb_all(void) {
     do_rgb_layers(default_layer_state, LAYER_BASE_DEFAULT, LAYER_BASE_REGULAR);
     do_rgb_layers(layer_state, LAYER_BASE_REGULAR, LAYER_BASE_END);
-    do_rgb_unicode();
+    do_rgb_unicode(get_unicode_input_mode());
     rgblight_set_layer_state(MISC_OFFSET + 0, spi_gflock);
     rgblight_set_layer_state(MISC_OFFSET + 1, spi_replace_mode != SPI_NORMAL);
 }
@@ -148,7 +147,7 @@ extern rgblight_status_t rgblight_status;
 #    define STARTUP_ANIMATION_CYCLE_STEP 2
 #    define STARTUP_ANIMATION_RAMP_TO_STEPS 70
 #    define STARTUP_ANIMATION_STEP_TIME 10
-#    define STARTUP_ANIMATION_INITIAL_DELAY 0  // milliseconds, must be < 255 * STEP_TIME
+#    define STARTUP_ANIMATION_INITIAL_DELAY 0 // milliseconds, must be < 255 * STEP_TIME
 
 // clang-format off
 typedef enum {
@@ -382,6 +381,13 @@ bool led_update_user_rgb(led_t led_state) {
     return true;
 }
 
+#if defined(UNICODE_COMMON_ENABLE)
+void unicode_input_mode_set_user_rgb(uint8_t input_mode) {
+    rgb_layer_ack(ACK_MEH);
+    do_rgb_unicode(input_mode);
+}
+#endif
+
 void rgb_layer_ack_yn(bool yn) { rgb_layer_ack(yn ? ACK_YES : ACK_NO); }
 
 void rgb_layer_ack(layer_ack_t n) {
@@ -458,7 +464,7 @@ void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case RGB_TOG:
-            // Hack - we only get called on the press for RGB_TOG, 
+            // Hack - we only get called on the press for RGB_TOG,
             // but the flag is only flipped on the release...
             rgb_layer_ack_yn(!rgblight_config.enable);
             break;
@@ -476,20 +482,5 @@ void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
             rgb_layer_ack_yn(keymap_config.nkro);
             break;
 #endif
-
-#if defined(UNICODE_COMMON_ENABLE)
-        case UC_M_MA:
-        case UC_M_LN:
-        case UC_M_WI:
-        case UC_M_BS:
-        case UC_M_WC:
-        case UC_M_EM:
-
-        case UC_MOD:
-        case UC_RMOD:
-            rgb_layer_ack(ACK_MEH);
-            do_rgb_unicode();
-            break;
-#endif
     }
 }
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index 842bb465f7..d9b893814a 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -98,14 +98,14 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
                     clear_oneshot_mods();
 #endif
 
-                    bool caps = host_keyboard_led_state().caps_lock;
+                    bool     caps = host_keyboard_led_state().caps_lock;
                     uint32_t base = ((shifted == caps) ? baseAlphaLower : baseAlphaUpper);
                     _register(base + (keycode - KC_A));
                     set_mods(temp_mod);
                 }
                 return false;
             case KC_0:
-                if (shifted) {  // skip shifted numbers, so that we can still use symbols etc.
+                if (shifted) { // skip shifted numbers, so that we can still use symbols etc.
                     return true;
                 }
                 if (record->event.pressed) {
@@ -113,7 +113,7 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
                 }
                 return false;
             case KC_1 ... KC_9:
-                if (shifted) {  // skip shifted numbers, so that we can still use symbols etc.
+                if (shifted) { // skip shifted numbers, so that we can still use symbols etc.
                     return true;
                 }
                 if (record->event.pressed) {
@@ -122,7 +122,7 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
                 return false;
             case KC_SPACE:
                 if (record->event.pressed) {
-                    _register(spaceGlyph);  // em space
+                    _register(spaceGlyph); // em space
                 }
                 return false;
         }
@@ -338,7 +338,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     set_mods(mods);
                     return false;
                 }
-            } else {  // on release of KC_BSPC
+            } else { // on release of KC_BSPC
                 // In case KC_DEL is still being sent even after the release of KC_BSPC
                 if (delkey_registered) {
                     unregister_code(KC_DEL);
@@ -387,3 +387,11 @@ bool led_update_user(led_t led_state) {
     return true;
 #endif
 }
+
+#if defined(UNICODE_COMMON_ENABLE)
+void unicode_input_mode_set_user(uint8_t input_mode) {
+#    ifdef RGBLIGHT_ENABLE
+    unicode_input_mode_set_user_rgb(input_mode);
+#    endif
+}
+#endif
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index e91b299e55..7a9407969e 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -17,9 +17,9 @@ enum userspace_layers {
 };
 
 enum custom_keycodes {
-    CH_CPNL = SAFE_RANGE,  // AL Control Panel
-    CH_ASST,               // AL Context-aware Desktop Assistant
-    CH_SUSP,               // Suspend
+    CH_CPNL = SAFE_RANGE, // AL Control Panel
+    CH_ASST,              // AL Context-aware Desktop Assistant
+    CH_SUSP,              // Suspend
 
     SPI_NORMAL,
     SPI_WIDE,
@@ -65,6 +65,11 @@ void          rgb_layer_ack(layer_ack_t n);
 void          rgb_layer_ack_yn(bool yn);
 void          clear_rgb_layers(void);
 void          shutdown_user_rgb(void);
+
+#    if defined(UNICODE_COMMON_ENABLE)
+void unicode_input_mode_set_user_rgb(uint8_t input_mode);
+#    endif
+
 #endif
 
 #ifdef UNICODEMAP_ENABLE

From 7adef85fa4178109998674c1ea9b6166e3dbc7bf Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 1 Sep 2022 23:38:52 +0100
Subject: [PATCH 288/959] Remove non promicro pins from converters (#18239)

---
 .../converters/promicro_to_bit_c_pro/_pin_defs.h       |  3 ---
 .../converters/promicro_to_stemcell/_pin_defs.h        | 10 ++--------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h b/platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h
index 92e8fbfa1a..a693e33011 100644
--- a/platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h
+++ b/platforms/chibios/converters/promicro_to_bit_c_pro/_pin_defs.h
@@ -34,6 +34,3 @@
 // LEDs (Mapped to R and G channel of the Bit-C PRO's RGB led)
 #define D5 16U
 #define B0 17U
-
-// Bit-C LED (mapped to B channel of the Bit-C PRO's RGB led)
-#define F0 18U
diff --git a/platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h b/platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h
index f5dd55905d..a7b709f837 100644
--- a/platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h
+++ b/platforms/chibios/converters/promicro_to_stemcell/_pin_defs.h
@@ -46,12 +46,6 @@
 #define B2 PAL_LINE(GPIOA, 7)
 #define B6 PAL_LINE(GPIOA, 4)
 
-// Extra elite-c compatible pinout
-#define B7 PAL_LINE(GPIOC, 13)
-#define D5 PAL_LINE(GPIOC, 14)
-#define C7 PAL_LINE(GPIOC, 15)
-#define F1 PAL_LINE(GPIOA, 0)
-#define F0 PAL_LINE(GPIOA, 1)
-
-// TX/RX pins of promicro
+// LEDs
+#define D5 PAL_LINE(GPIOA, 8) // User LED
 #define B0 PAL_LINE(GPIOA, 9) // unconnected pin

From 101d7b533745947ef2b92a919d5f02a137428235 Mon Sep 17 00:00:00 2001
From: jpuerto96 <jpuerto96@hotmail.com>
Date: Thu, 1 Sep 2022 19:32:47 -0400
Subject: [PATCH 289/959] [Keyboard] Add Ingrained Keyboard (#15928)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Juan Puerto <jpuerto@psc.edu>
Co-authored-by: jpuerto-psc <68066250+jpuerto-psc@users.noreply.github.com>
---
 keyboards/ingrained/config.h                  |  51 ++++
 keyboards/ingrained/info.json                 | 276 ++++++++++++++++++
 keyboards/ingrained/ingrained.c               |   4 +
 keyboards/ingrained/ingrained.h               |  47 +++
 keyboards/ingrained/keymaps/3x5/keymap.c      |  23 ++
 keyboards/ingrained/keymaps/3x5/readme.md     |   1 +
 keyboards/ingrained/keymaps/default/keymap.c  |  23 ++
 keyboards/ingrained/keymaps/default/readme.md |   1 +
 keyboards/ingrained/matrix.c                  | 253 ++++++++++++++++
 keyboards/ingrained/readme.md                 |  19 ++
 keyboards/ingrained/rules.mk                  |  27 ++
 11 files changed, 725 insertions(+)
 create mode 100644 keyboards/ingrained/config.h
 create mode 100644 keyboards/ingrained/info.json
 create mode 100644 keyboards/ingrained/ingrained.c
 create mode 100644 keyboards/ingrained/ingrained.h
 create mode 100644 keyboards/ingrained/keymaps/3x5/keymap.c
 create mode 100644 keyboards/ingrained/keymaps/3x5/readme.md
 create mode 100644 keyboards/ingrained/keymaps/default/keymap.c
 create mode 100644 keyboards/ingrained/keymaps/default/readme.md
 create mode 100644 keyboards/ingrained/matrix.c
 create mode 100644 keyboards/ingrained/readme.md
 create mode 100644 keyboards/ingrained/rules.mk

diff --git a/keyboards/ingrained/config.h b/keyboards/ingrained/config.h
new file mode 100644
index 0000000000..7741dde0f7
--- /dev/null
+++ b/keyboards/ingrained/config.h
@@ -0,0 +1,51 @@
+// Copyright 2021 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 12
+
+#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
+#define MATRIX_COLS_PER_SIDE (MATRIX_COLS / 2)
+
+#define UNUSED_MCU 13
+#define UNUSED_MCP 6
+
+
+// wiring
+#define MATRIX_ROW_PINS_MCU \
+    { B0, B1, B2, B3 }
+#define MATRIX_COL_PINS_MCU \
+    { F7, F6, F5, F4, F1, F0 }
+#define UNUSED_PINS_MCU \
+    { B4, B5, B6, B7, C6, C7, D2, D3, D4, D5, D6, D7, E6}
+#define MATRIX_ROW_PINS_MCP \
+    { B0, B1, B2, B3 }
+#define MATRIX_COL_PINS_MCP \
+    { A0, A1, A2, A3, A4, A5 }
+#define UNUSED_PINS_MCP \
+    { B4, B5, B6, B7, A6, A7 }
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json
new file mode 100644
index 0000000000..1db1c930f6
--- /dev/null
+++ b/keyboards/ingrained/info.json
@@ -0,0 +1,276 @@
+{
+    "keyboard_name": "ingrained",
+    "manufacturer": "s8erdude"
+    "url": "https://github.com/jpuerto96",
+    "maintainer": "jpuerto96 (s8erdude)",
+    "usb": {
+        "vid": "0xB33F",
+        "pid": "0x58E4",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {
+                    "label": "Esc",
+                    "x": 0,
+                    "y": 0.3
+                },
+                {
+                    "label": "Q",
+                    "x": 1,
+                    "y": 0.3
+                },
+                {
+                    "label": "W",
+                    "x": 2,
+                    "y": 0.1
+                },
+                {
+                    "label": "E",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "R",
+                    "x": 4,
+                    "y": 0.1
+                },
+                {
+                    "label": "T",
+                    "x": 5,
+                    "y": 0.2
+                },
+                {
+                    "label": "Y",
+                    "x": 9,
+                    "y": 0.2
+                },
+                {
+                    "label": "U",
+                    "x": 10,
+                    "y": 0.1
+                },
+                {
+                    "label": "I",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "O",
+                    "x": 12,
+                    "y": 0.1
+                },
+                {
+                    "label": "P",
+                    "x": 13,
+                    "y": 0.3
+                },
+                {
+                    "label": "Back Space",
+                    "x": 14,
+                    "y": 0.3
+                },
+                {
+                    "label": "Tab",
+                    "x": 0,
+                    "y": 1.3
+                },
+                {
+                    "label": "A",
+                    "x": 1,
+                    "y": 1.3
+                },
+                {
+                    "label": "S",
+                    "x": 2,
+                    "y": 1.1
+                },
+                {
+                    "label": "D",
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "F",
+                    "x": 4,
+                    "y": 1.1
+                },
+                {
+                    "label": "G",
+                    "x": 5,
+                    "y": 1.2
+                },
+                {
+                    "label": "H",
+                    "x": 9,
+                    "y": 1.2
+                },
+                {
+                    "label": "J",
+                    "x": 10,
+                    "y": 1.1
+                },
+                {
+                    "label": "K",
+                    "x": 11,
+                    "y": 1
+                },
+                {
+                    "label": "L",
+                    "x": 12,
+                    "y": 1.1
+                },
+                {
+                    "label": ";",
+                    "x": 13,
+                    "y": 1.3
+                },
+                {
+                    "label": "'",
+                    "x": 14,
+                    "y": 1.3
+                },
+                {
+                    "label": "Shift",
+                    "x": 0,
+                    "y": 2.3
+                },
+                {
+                    "label": "Z",
+                    "x": 1,
+                    "y": 2.3
+                },
+                {
+                    "label": "X",
+                    "x": 2,
+                    "y": 2.1
+                },
+                {
+                    "label": "C",
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "label": "V",
+                    "x": 4,
+                    "y": 2.1
+                },
+                {
+                    "label": "B",
+                    "x": 5,
+                    "y": 2.2
+                },
+                {
+                    "label": "N",
+                    "x": 9,
+                    "y": 2.2
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 2.1
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 2
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 2.1
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 2.3
+                },
+                {
+                    "label": "Shift",
+                    "x": 14,
+                    "y": 2.3
+                },
+                {
+                    "label": "GUI",
+                    "x": 4,
+                    "y": 3.7
+                },
+                {
+                    "label": "Lower",
+                    "x": 5,
+                    "y": 3.7
+                },
+                {
+                    "label": "Space",
+                    "x": 6,
+                    "y": 3.2,
+                    "h": 1.5
+                },
+                {
+                    "label": "Enter",
+                    "x": 8,
+                    "y": 3.2,
+                    "h": 1.5
+                },
+                {
+                    "label": "Raise",
+                    "x": 9,
+                    "y": 3.7
+                },
+                {
+                    "label": "Alt",
+                    "x": 10,
+                    "y": 3.7
+                }
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+          "layout": [
+            {"label":"Q", "x":0, "y":0.3},
+            {"label":"W", "x":1, "y":0.1},
+            {"label":"E", "x":2, "y":0},
+            {"label":"R", "x":3, "y":0.1},
+            {"label":"T", "x":4, "y":0.2},
+
+            {"label":"Y", "x":8, "y":0.2},
+            {"label":"U", "x":9, "y":0.1},
+            {"label":"I", "x":10, "y":0},
+            {"label":"O", "x":11, "y":0.1},
+            {"label":"P", "x":12, "y":0.3},
+
+            {"label":"A", "x":0, "y":1.3},
+            {"label":"S", "x":1, "y":1.1},
+            {"label":"D", "x":2, "y":1},
+            {"label":"F", "x":3, "y":1.1},
+            {"label":"G", "x":4, "y":1.2},
+
+            {"label":"H", "x":8, "y":1.2},
+            {"label":"J", "x":9, "y":1.1},
+            {"label":"K", "x":10, "y":1},
+            {"label":"L", "x":11, "y":1.1},
+            {"label":";", "x":12, "y":1.3},
+
+            {"label":"Z", "x":0, "y":2.3},
+            {"label":"X", "x":1, "y":2.1},
+            {"label":"C", "x":2, "y":2},
+            {"label":"V", "x":3, "y":2.1},
+            {"label":"B", "x":4, "y":2.2},
+
+            {"label":"N", "x":8, "y":2.2},
+            {"label":"M", "x":9, "y":2.1},
+            {"label":",", "x":10, "y":2},
+            {"label":".", "x":11, "y":2.1},
+            {"label":"/", "x":12, "y":2.3},
+
+            {"label":"GUI", "x":3, "y":3.7},
+            {"label":"Lower", "x":4, "y":3.7},
+            {"label":"Space", "x":5, "y":3.2, "h":1.5},
+
+            {"label":"Enter", "x":7, "y":3.2, "h":1.5},
+            {"label":"Raise", "x":8, "y":3.7},
+            {"label":"Alt", "x":9, "y":3.7}
+          ]
+        }
+    }
+}
diff --git a/keyboards/ingrained/ingrained.c b/keyboards/ingrained/ingrained.c
new file mode 100644
index 0000000000..80aa82f840
--- /dev/null
+++ b/keyboards/ingrained/ingrained.c
@@ -0,0 +1,4 @@
+// Copyright 2021 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "ingrained.h"
diff --git a/keyboards/ingrained/ingrained.h b/keyboards/ingrained/ingrained.h
new file mode 100644
index 0000000000..d2e3055951
--- /dev/null
+++ b/keyboards/ingrained/ingrained.h
@@ -0,0 +1,47 @@
+// Copyright 2021 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define XXX KC_NO
+
+#define LAYOUT_split_3x6_3( \
+    k00, k01, k02, k03, k04, k05,	k011, k010, k09, k08, k07, k06,\
+    k10, k11, k12, k13, k14, k15,	k111, k110, k19, k18, k17, k16,\
+    k20, k21, k22, k23, k24, k25,	k211, k210, k29, k28, k27, k26,\
+                   k33, k34, k35,	k311, k310, k39\
+) { \
+    { k00, k01, k02, k03, k04, k05 },\
+    { k10, k11, k12, k13, k14, k15 },\
+    { k20, k21, k22, k23, k24, k25 },\
+    { XXX, XXX, XXX, k33, k34, k35 },\
+    { k06, k07, k08, k09, k010, k011 },\
+    { k16, k17, k18, k19, k110, k111 },\
+    { k26, k27, k28, k29, k210, k211 },\
+    { XXX, XXX, XXX, k39, k310, k311 }\
+}
+#define LAYOUT_split_3x5_3( \
+    k01, k02, k03, k04, k05,	k011, k010, k09, k08, k07,\
+    k11, k12, k13, k14, k15,	k111, k110, k19, k18, k17,\
+    k21, k22, k23, k24, k25,	k211, k210, k29, k28, k27,\
+                   k33, k34, k35,	k311, k310, k39\
+) { \
+    { XXX, k01, k02, k03, k04, k05 },\
+    { XXX, k11, k12, k13, k14, k15 },\
+    { XXX, k21, k22, k23, k24, k25 },\
+    { XXX, XXX, XXX, k33, k34, k35 },\
+    { XXX, k07, k08, k09, k010, k011 },\
+    { XXX, k17, k18, k19, k110, k111 },\
+    { XXX, k27, k28, k29, k210, k211 },\
+    { XXX, XXX, XXX, k39, k310, k311 }\
+}
diff --git a/keyboards/ingrained/keymaps/3x5/keymap.c b/keyboards/ingrained/keymaps/3x5/keymap.c
new file mode 100644
index 0000000000..ed34809b42
--- /dev/null
+++ b/keyboards/ingrained/keymaps/3x5/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2021 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+  _BASE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_split_3x5_3(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN,
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH,
+                      KC_LGUI, KC_SPC,  KC_TAB,        KC_BSPC, KC_ENT,  KC_RALT
+  )
+};
diff --git a/keyboards/ingrained/keymaps/3x5/readme.md b/keyboards/ingrained/keymaps/3x5/readme.md
new file mode 100644
index 0000000000..c2a997fcbf
--- /dev/null
+++ b/keyboards/ingrained/keymaps/3x5/readme.md
@@ -0,0 +1 @@
+# The 3x5 keymap for ingrained
diff --git a/keyboards/ingrained/keymaps/default/keymap.c b/keyboards/ingrained/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b09702e9ee
--- /dev/null
+++ b/keyboards/ingrained/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2021 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+  _BASE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_split_3x6_3(
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_BSPC,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+                               KC_LGUI, KC_SPC,  KC_TAB,        KC_BSPC, KC_ENT,  KC_RALT
+  ),
+};
diff --git a/keyboards/ingrained/keymaps/default/readme.md b/keyboards/ingrained/keymaps/default/readme.md
new file mode 100644
index 0000000000..804feead66
--- /dev/null
+++ b/keyboards/ingrained/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for ingrained
diff --git a/keyboards/ingrained/matrix.c b/keyboards/ingrained/matrix.c
new file mode 100644
index 0000000000..0dfb150b6c
--- /dev/null
+++ b/keyboards/ingrained/matrix.c
@@ -0,0 +1,253 @@
+/*
+Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
+          2020 Pierre Chevalier <pierrechevalier83@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+ * This code was heavily inspired by the ergodox_ez keymap, and modernized
+ * to take advantage of the quantum.h microcontroller agnostics gpio control
+ * abstractions and use the macros defined in config.h for the wiring as opposed
+ * to repeating that information all over the place.
+ */
+
+#include QMK_KEYBOARD_H
+#include "i2c_master.h"
+
+extern i2c_status_t mcp23017_status;
+#define I2C_TIMEOUT 1000
+
+// For a better understanding of the i2c protocol, this is a good read:
+// https://www.robot-electronics.co.uk/i2c-tutorial
+
+// I2C address:
+// See the datasheet, section 3.3.1 on addressing I2C devices and figure 3-6 for an
+// illustration
+// http://ww1.microchip.com/downloads/en/devicedoc/20001952c.pdf
+// All address pins of the mcp23017 are connected to the ground on the ferris
+// | 0  | 1  | 0  | 0  | A2 | A1 | A0 |
+// | 0  | 1  | 0  | 0  | 0  | 0  | 0  |
+#define I2C_ADDR 0b0100000
+#define I2C_ADDR_WRITE ((I2C_ADDR << 1) | I2C_WRITE)
+#define I2C_ADDR_READ ((I2C_ADDR << 1) | I2C_READ)
+
+// Register addresses
+// See https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library/blob/master/Adafruit_MCP23017.h
+#define IODIRA 0x00  // i/o direction register
+#define IODIRB 0x01
+#define GPPUA 0x0C  // GPIO pull-up resistor register
+#define GPPUB 0x0D
+#define GPIOA 0x12  // general purpose i/o port register (write modifies OLAT)
+#define GPIOB 0x13
+#define OLATA 0x14  // output latch register
+#define OLATB 0x15
+
+bool         i2c_initialized = 0;
+i2c_status_t mcp23017_status = I2C_ADDR;
+
+uint8_t init_mcp23017(void) {
+    print("starting init");
+    mcp23017_status = I2C_ADDR;
+
+    // I2C subsystem
+    if (i2c_initialized == 0) {
+        i2c_init();  // on pins D(1,0)
+        i2c_initialized = true;
+        wait_ms(I2C_TIMEOUT);
+    }
+
+    // set pin direction
+    // - unused  : input  : 1
+    // - input   : input  : 1
+    // - driving : output : 0
+    // This means: we will read all the bits on GPIOA
+    // This means: we will write to the pins 0-4 on GPIOB (in select_rows)
+    uint8_t buf[]   = {IODIRA, 0b11111111, 0b11110000};
+    mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+    if (!mcp23017_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        // This means: we will read all the bits on GPIOA
+        // This means: we will write to the pins 0-4 on GPIOB (in select_rows)
+        uint8_t pullup_buf[] = {GPPUA, 0b11111111, 0b11110000};
+        mcp23017_status      = i2c_transmit(I2C_ADDR_WRITE, pullup_buf, sizeof(pullup_buf), I2C_TIMEOUT);
+    }
+    return mcp23017_status;
+}
+
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];  // debounced values
+
+static matrix_row_t read_cols(uint8_t row);
+static void         init_cols(void);
+static void         unselect_rows(void);
+static void         select_row(uint8_t row);
+
+static uint8_t mcp23017_reset_loop;
+
+void matrix_init_custom(void) {
+    // initialize row and col
+
+    mcp23017_status = init_mcp23017();
+
+    unselect_rows();
+    init_cols();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+    }
+}
+
+void matrix_power_up(void) {
+    mcp23017_status = init_mcp23017();
+
+    unselect_rows();
+    init_cols();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+    }
+}
+
+// Reads and stores a row, returning
+// whether a change occurred.
+static inline bool store_matrix_row(matrix_row_t current_matrix[], uint8_t index) {
+    matrix_row_t temp = read_cols(index);
+    if (current_matrix[index] != temp) {
+        current_matrix[index] = temp;
+        return true;
+    }
+    return false;
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    if (mcp23017_status) {  // if there was an error
+        if (++mcp23017_reset_loop == 0) {
+            // if (++mcp23017_reset_loop >= 1300) {
+            // since mcp23017_reset_loop is 8 bit - we'll try to reset once in 255 matrix scans
+            // this will be approx bit more frequent than once per second
+            dprint("trying to reset mcp23017\n");
+            mcp23017_status = init_mcp23017();
+            if (mcp23017_status) {
+                dprint("right side not responding\n");
+            } else {
+                dprint("right side attached\n");
+            }
+        }
+    }
+
+    bool changed = false;
+    for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) {
+        // select rows from left and right hands
+        uint8_t left_index  = i;
+        uint8_t right_index = i + MATRIX_ROWS_PER_SIDE;
+        select_row(left_index);
+        select_row(right_index);
+
+        // we don't need a 30us delay anymore, because selecting a
+        // left-hand row requires more than 30us for i2c.
+
+        changed |= store_matrix_row(current_matrix, left_index);
+        changed |= store_matrix_row(current_matrix, right_index);
+
+        unselect_rows();
+    }
+
+    return changed;
+}
+
+static void init_cols(void) {
+    // init on mcp23017
+    // not needed, already done as part of init_mcp23017()
+
+    // init on mcu
+    pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_MCU;
+    for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) {
+        pin_t pin = matrix_col_pins_mcu[pin_index];
+        setPinInput(pin);
+        writePinHigh(pin);
+    }
+}
+
+static matrix_row_t read_cols(uint8_t row) {
+    if (row < MATRIX_ROWS_PER_SIDE) {
+        pin_t        matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_MCU;
+        matrix_row_t current_row_value                         = 0;
+        // For each col...
+        for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) {
+            // Select the col pin to read (active low)
+            uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]);
+
+            // Populate the matrix row with the state of the col pin
+            current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+        }
+        return current_row_value;
+    } else {
+        if (mcp23017_status) {  // if there was an error
+            return 0;
+        } else {
+            uint8_t buf[]   = {GPIOA};
+            mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+            // We read all the pins on GPIOA.
+            // The initial state was all ones and any depressed key at a given column for the currently selected row will have its bit flipped to zero.
+            // The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys.
+            // Since the pins connected to eact columns are sequential, and counting from zero up (col 5 -> GPIOA0, col 6 -> GPIOA1 and so on), the only transformation needed is a bitwise not to swap all zeroes and ones.
+            uint8_t data[] = {0};
+            if (!mcp23017_status) {
+                mcp23017_status = i2c_receive(I2C_ADDR_READ, data, sizeof(data), I2C_TIMEOUT);
+                data[0]         = ~(data[0]);
+            }
+            return data[0];
+        }
+    }
+}
+
+static void unselect_rows(void) {
+    // no need to unselect on mcp23017, because the select step sets all
+    // the other row bits high, and it's not changing to a different
+    // direction
+
+    // unselect rows on microcontroller
+    pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU;
+    for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) {
+        pin_t pin = matrix_row_pins_mcu[pin_index];
+        setPinInput(pin);
+        writePinLow(pin);
+    }
+}
+
+static void select_row(uint8_t row) {
+    if (row < MATRIX_ROWS_PER_SIDE) {
+        // select on atmega32u4
+        pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU;
+        pin_t pin                                       = matrix_row_pins_mcu[row];
+        setPinOutput(pin);
+        writePinLow(pin);
+    } else {
+        // select on mcp23017
+        if (mcp23017_status) {  // if there was an error
+                                // do nothing
+        } else {
+            // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one.
+            // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus.
+            uint8_t buf[]   = {GPIOB, 0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))};
+            mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+        }
+    }
+}
diff --git a/keyboards/ingrained/readme.md b/keyboards/ingrained/readme.md
new file mode 100644
index 0000000000..3e616e52bb
--- /dev/null
+++ b/keyboards/ingrained/readme.md
@@ -0,0 +1,19 @@
+# ingrained
+
+This PCB is an integrated, USB-C to USB-C, Corne replacement.
+
+* Keyboard Maintainer: [s8erdude](https://github.com/jpuerto96)
+* Hardware Supported: Ingrained PCB
+* Hardware Availability: [Open Source PCB](https://github.com/jpuerto96/crkbd)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ingrained:default
+
+Flashing example for this keyboard:
+
+    make ingrained:default:flash
+
+To reset the board, you will want to short the pad labeled RESET on the main half (near the USB-C interconnect).
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/ingrained/rules.mk b/keyboards/ingrained/rules.mk
new file mode 100644
index 0000000000..03e074deda
--- /dev/null
+++ b/keyboards/ingrained/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes
+CUSTOM_MATRIX = lite
+NO_USB_STARTUP_CHECK = yes
+LTO_ENABLE = yes
+
+SRC += matrix.c
+QUANTUM_LIB_SRC += i2c_master.c
+
+LAYOUTS = split_3x5_3 split_3x6_3

From 423826a34a2b5839a10188f2be84e518ac44bd47 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 1 Sep 2022 20:43:06 -0700
Subject: [PATCH 290/959] Better handle EEPROM reset keycode (#18244)

---
 quantum/quantum.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 9a0016b150..acafd8025c 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -361,8 +361,10 @@ bool process_record_quantum(keyrecord_t *record) {
 #endif
                 return false;
             case QK_CLEAR_EEPROM:
+#ifdef NO_RESET
                 eeconfig_init();
-#ifndef NO_RESET
+#else
+                eeconfig_disable();
                 soft_reset_keyboard();
 #endif
                 return false;

From 26814ca060829e68e167c90b24c59c37159a2cce Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 2 Sep 2022 04:43:19 +0100
Subject: [PATCH 291/959] Install correct package on Fedora (#18243)

---
 util/install/fedora.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index b140438b42..4227906ad9 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -8,7 +8,7 @@ _qmk_install() {
         clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
         make unzip wget zip python3 avr-binutils avr-gcc avr-libc \
         arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
-        avrdude dfu-programmer dfu-util hidapi libusb1-devel
+        avrdude dfu-programmer dfu-util hidapi libusb-devel
 
     python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
 }

From b5a52b4cff55520462559bf6b79b3ce5b32d661e Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Fri, 2 Sep 2022 11:48:02 +0800
Subject: [PATCH 292/959] Prevent USB peripheral fault when restarting USB on
 WB32 MCUs (#18058)

Co-authored-by: Joy <chang.li@westberrytech.com>
---
 platforms/chibios/boards/GENERIC_WB32_F3G71XX/board/board.c   | 4 ++++
 platforms/chibios/boards/GENERIC_WB32_FQ95XX/board/board.c    | 4 ++++
 platforms/chibios/boards/GENERIC_WB32_FQ95XX/configs/config.h | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/platforms/chibios/boards/GENERIC_WB32_F3G71XX/board/board.c b/platforms/chibios/boards/GENERIC_WB32_F3G71XX/board/board.c
index e38a7e0054..f74c9e8be7 100644
--- a/platforms/chibios/boards/GENERIC_WB32_F3G71XX/board/board.c
+++ b/platforms/chibios/boards/GENERIC_WB32_F3G71XX/board/board.c
@@ -80,3 +80,7 @@ void __early_init(void) {
 void boardInit(void) {
 
 }
+
+void restart_usb_driver(USBDriver *usbp) {
+  // Do nothing. Restarting the USB driver on these boards breaks it.
+}
diff --git a/platforms/chibios/boards/GENERIC_WB32_FQ95XX/board/board.c b/platforms/chibios/boards/GENERIC_WB32_FQ95XX/board/board.c
index 22b4ff73b5..a99537fc27 100644
--- a/platforms/chibios/boards/GENERIC_WB32_FQ95XX/board/board.c
+++ b/platforms/chibios/boards/GENERIC_WB32_FQ95XX/board/board.c
@@ -80,3 +80,7 @@ void __early_init(void) {
 void boardInit(void) {
 
 }
+
+void restart_usb_driver(USBDriver *usbp) {
+  // Do nothing. Restarting the USB driver on these boards breaks it.
+}
diff --git a/platforms/chibios/boards/GENERIC_WB32_FQ95XX/configs/config.h b/platforms/chibios/boards/GENERIC_WB32_FQ95XX/configs/config.h
index e02e526113..d4c7e54642 100644
--- a/platforms/chibios/boards/GENERIC_WB32_FQ95XX/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_WB32_FQ95XX/configs/config.h
@@ -18,3 +18,5 @@
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 #    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #endif
+
+#define USB_ENDPOINTS_ARE_REORDERABLE

From 8c793c1a43c5429b2204b55b6ba507ed822e08d4 Mon Sep 17 00:00:00 2001
From: Jannik Becker <89019698+JannikB5825@users.noreply.github.com>
Date: Fri, 2 Sep 2022 05:48:24 +0200
Subject: [PATCH 293/959] [Keyboard] Add Shoc Keyboard (#18143)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/shoc/config.h                 |  34 +++++
 keyboards/shoc/info.json                |  83 +++++++++++
 keyboards/shoc/keymaps/bongo/keymap.c   | 176 ++++++++++++++++++++++++
 keyboards/shoc/keymaps/default/keymap.c |  41 ++++++
 keyboards/shoc/readme.md                |  21 +++
 keyboards/shoc/rules.mk                 |  15 ++
 keyboards/shoc/shoc.c                   |  16 +++
 keyboards/shoc/shoc.h                   |  38 +++++
 8 files changed, 424 insertions(+)
 create mode 100644 keyboards/shoc/config.h
 create mode 100644 keyboards/shoc/info.json
 create mode 100644 keyboards/shoc/keymaps/bongo/keymap.c
 create mode 100644 keyboards/shoc/keymaps/default/keymap.c
 create mode 100644 keyboards/shoc/readme.md
 create mode 100644 keyboards/shoc/rules.mk
 create mode 100644 keyboards/shoc/shoc.c
 create mode 100644 keyboards/shoc/shoc.h

diff --git a/keyboards/shoc/config.h b/keyboards/shoc/config.h
new file mode 100644
index 0000000000..98084059af
--- /dev/null
+++ b/keyboards/shoc/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 JannikB5825
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+#define OLED_DISPLAY_128X64
+#define OLED_TIMEOUT 300000
+
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 8
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B6, B2 }
+#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6, B4, B5 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json
new file mode 100644
index 0000000000..d398e67956
--- /dev/null
+++ b/keyboards/shoc/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Shoc",
+    "manufacturer": "JannikB5825",
+    "url": "https://github.com/JannikB5825/Shoc",
+    "maintainer": "JannikB5825",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 0, "y": 1 },
+                { "x": 1, "y": 1 },
+                { "x": 2, "y": 1 },
+                { "x": 3, "y": 1 },
+                { "x": 4, "y": 1 },
+                { "x": 5, "y": 1 },
+                { "x": 6, "y": 1 },
+                { "x": 7, "y": 1 },
+                { "x": 0, "y": 2, "w": 1.5 },
+                { "x": 1.5, "y": 2 },
+                { "x": 2.5, "y": 2 },
+                { "x": 3.5, "y": 2 },
+                { "x": 4.5, "y": 2 },
+                { "x": 5.5, "y": 2 },
+                { "x": 6.5, "y": 2 },
+                { "x": 7.5, "y": 2 },
+                { "x": 0, "y": 3, "w": 2 },
+                { "x": 2, "y": 3 },
+                { "x": 3, "y": 3 },
+                { "x": 4, "y": 3 },
+                { "x": 5, "y": 3 },
+                { "x": 6, "y": 3 },
+                { "x": 7, "y": 3 },
+                { "x": 8, "y": 3 },
+                { "x": 0, "y": 4, "w": 1.5 },
+                { "x": 1.5, "y": 4 },
+                { "x": 2.5, "y": 4, "w": 1.5 },
+                { "x": 4, "y": 4, "w": 2 },
+                { "x": 6, "y": 4 },
+                { "x": 7, "y": 4, "w": 2 },
+                { "x": 9, "y": 4 },
+                { "x": 10, "y": 4 },
+                { "x": 12, "y": 0, "w": 2 },
+                { "x": 11, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 8, "y": 1 },
+                { "x": 9, "y": 1 },
+                { "x": 10, "y": 1 },
+                { "x": 13, "y": 4 },
+                { "x": 12, "y": 4 },
+                { "x": 11, "y": 4 },
+                { "x": 13, "y": 3 },
+                { "x": 12, "y": 3 },
+                { "x": 11, "y": 3 },
+                { "x": 10, "y": 3 },
+                { "x": 9, "y": 3 },
+                { "x": 11, "y": 1 },
+                { "x": 12, "y": 1 },
+                { "x": 13, "y": 1 },
+                { "x": 12.5, "y": 2, "w": 1.5 },
+                { "x": 11.5, "y": 2 },
+                { "x": 10.5, "y": 2 },
+                { "x": 9.5, "y": 2 },
+                { "x": 8.5, "y": 2 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/shoc/keymaps/bongo/keymap.c b/keyboards/shoc/keymaps/bongo/keymap.c
new file mode 100644
index 0000000000..14779f1d75
--- /dev/null
+++ b/keyboards/shoc/keymaps/bongo/keymap.c
@@ -0,0 +1,176 @@
+/* Copyright 2022 JannikB5825
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
+		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
+		KC_BSPC, KC_MINS, KC_0, KC_9, KC_8, KC_I, KC_O, KC_P,
+		KC_RGHT, KC_DOWN, KC_LEFT, KC_EQL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
+		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K),
+
+    [1] = LAYOUT(
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
+		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
+		KC_BSPC, KC_F11, KC_F10, KC_F9, KC_F8, KC_I, KC_O, KC_P,
+		KC_RGHT, KC_DOWN, KC_LEFT, KC_DEL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
+		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K)
+
+
+};
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+	return OLED_ROTATION_0;
+}
+//full credit goes to https://www.reddit.com/user/Pop-X-/ only small feature comforts were added
+
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 30 // below this wpm value your animation will idle
+#define TAP_FRAMES 2
+#define TAP_SPEED 60 // above this wpm value typing animation to triggere
+
+#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
+#define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+uint32_t anim_timer = 0;
+uint32_t anim_sleep = 0;
+uint8_t current_idle_frame = 0;
+uint8_t current_tap_frame = 0;
+
+// Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach.
+static void render_anim(void) {
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  4,  4,  4,  8, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,100,130,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 56,  4,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        },
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  4,  4,  4,  8, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,100,130,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 56,  4,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        },
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16,  8,  4,  2,  2,  4, 24, 96,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 60,194,  1,  1,  2,  2,  4,  4,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96, 96,  0,129,130,130,132,  8, 16, 32, 64,128,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 25,  6,  0,  0,  0,  0,  0,  0,  0, 24, 24, 24, 27,  3,  0, 64,160, 34, 36, 20, 18, 18, 18, 11,  8,  8,  8,  8,  5,  5,  9,  9, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        },
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        },
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  4,  2,  2,  2,  4, 56, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28,226,  1,  1,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        }
+    };
+    static const char PROGMEM prep[][ANIM_SIZE] = {
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,129,128,128,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,225, 26,  6,  9, 49, 53,  1,138,124,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0, 24,  6,  5,152,153,132,195,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  4,  4,  4,  4,  2,  2,  2,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        }
+    };
+    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,248,248,248,248,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,129,128,128,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,  1,  2,  4,  8, 16, 32, 67,135,  7,  1,  0,184,188,190,159, 95, 95, 79, 76, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0, 24,  6,  5,152,153,132, 67,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1, 61,124,252,252,252,252,252, 60, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        },
+        {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,225, 26,  6,  9, 49, 53,  1,138,124,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  4,  4,  4,  4,  2,  2,  2,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,122,122,121,121,121,121, 57, 49,  2,  2,  4,  4,  8,  8,  8,136,136,135,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
+        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,120,124,254,255, 63,  7,  0,  0,  0,  0,255,255,127,127, 63, 62, 28, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
+        },
+    };
+
+    //assumes 1 frame prep stage
+    void animation_phase(void) {
+        if(get_current_wpm() <=IDLE_SPEED){
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
+         }
+         if(get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED){
+             oled_write_raw_P(prep[0], ANIM_SIZE);
+         }
+         if(get_current_wpm() >=TAP_SPEED){
+             current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+             oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
+         }
+    }
+    if(get_current_wpm() != 000) {
+        oled_on();
+        if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+        anim_sleep = timer_read32();
+    } else {
+        if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+
+bool oled_task_user(void) {
+    render_anim();
+    oled_set_cursor(0,6);
+    oled_write_P(PSTR("       WPM: "), false);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false);
+    if(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)){
+        oled_set_cursor(0,5);
+        oled_write_P(PSTR("      CAPS  LOCK"), false);
+    }
+    else{
+        oled_set_cursor(0,5);
+        oled_write_P(PSTR("                 "), false);
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/shoc/keymaps/default/keymap.c b/keyboards/shoc/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a5916db65a
--- /dev/null
+++ b/keyboards/shoc/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2022 JannikB5825
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
+		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
+		KC_BSPC, KC_MINS, KC_0, KC_9, KC_8, KC_I, KC_O, KC_P,
+		KC_RGHT, KC_DOWN, KC_LEFT, KC_EQL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
+		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K),
+
+    [1] = LAYOUT(
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
+		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
+		KC_BSPC, KC_F11, KC_F10, KC_F9, KC_F8, KC_I, KC_O, KC_P,
+		KC_RGHT, KC_DOWN, KC_LEFT, KC_DEL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
+		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K)
+
+
+};
diff --git a/keyboards/shoc/readme.md b/keyboards/shoc/readme.md
new file mode 100644
index 0000000000..4f81d47efb
--- /dev/null
+++ b/keyboards/shoc/readme.md
@@ -0,0 +1,21 @@
+# Shoc
+
+![Shoc](https://i.imgur.com/k00Uz6wh.jpg)
+
+A 64 Key keyboard with an Oled Display.
+
+* Keyboard Maintainer: [JannikB5825](https://github.com/JannikB5825)
+* Hardware Supported: Shoc PCB, Pro Micro 5V/16MHz and compatible.
+* Hardware Availability: [Shoc](https://github.com/JannikB5825/Shoc).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make shoc:default
+
+Flashing example for this keyboard:
+
+    make shoc:default:flash
+
+## Bootloader
+
+Briefly press the button along the outer edge of the PCB next to the microcontroller.
diff --git a/keyboards/shoc/rules.mk b/keyboards/shoc/rules.mk
new file mode 100644
index 0000000000..806df50421
--- /dev/null
+++ b/keyboards/shoc/rules.mk
@@ -0,0 +1,15 @@
+# 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 = no            # 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
+OLED_DRIVER = SSD1306
+WPM_ENABLE = yes
diff --git a/keyboards/shoc/shoc.c b/keyboards/shoc/shoc.c
new file mode 100644
index 0000000000..eabb767d28
--- /dev/null
+++ b/keyboards/shoc/shoc.c
@@ -0,0 +1,16 @@
+/* Copyright 2022 JannikB5825
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "shoc.h"
diff --git a/keyboards/shoc/shoc.h b/keyboards/shoc/shoc.h
new file mode 100644
index 0000000000..3ea48781e0
--- /dev/null
+++ b/keyboards/shoc/shoc.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 JannikB5825
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+	k00, k01, k02, k03, k04, k05, k06, k07, \
+	k10, k11, k12, k13, k14, k15, k16, k17, \
+	k20, k21, k22, k23, k24, k25, k26, k27, \
+	k30, k31, k32, k33, k34, k35, k36, k37, \
+	k40, k41, k42, k43, k44, k45, k46, k47, \
+	k50, k51, k52, k53, k54, k55, k56, k57, \
+	k60, k61, k62, k63, k64, k65, k66, k67, \
+	k70, k71, k72, k73, k74, k75, k76, k77  \
+) { \
+	{ k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07 }, \
+	{ k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17 }, \
+	{ k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27 }, \
+	{ k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37 }, \
+	{ k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47 }, \
+	{ k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57 }, \
+	{ k60,   k61,   k62,   k63,   k64,   k65,   k66,   k67 }, \
+	{ k70,   k71,   k72,   k73,   k74,   k75,   k76,   k77 }  \
+}
+

From 27671d8a43bbca7b65defb94ab95102ac0334f44 Mon Sep 17 00:00:00 2001
From: Yoichiro Tanaka <yoichiro@eisbahn.jp>
Date: Fri, 2 Sep 2022 12:54:33 +0900
Subject: [PATCH 294/959] [Keyboard] Add Lunakey Pico (#18202)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/yoichiro/lunakey_pico/config.h      |  38 +++++++
 keyboards/yoichiro/lunakey_pico/halconf.h     |   8 ++
 keyboards/yoichiro/lunakey_pico/info.json     | 106 ++++++++++++++++++
 .../lunakey_pico/keymaps/default/keymap.c     |  69 ++++++++++++
 .../lunakey_pico/keymaps/via/keymap.c         |  65 +++++++++++
 .../lunakey_pico/keymaps/via/rules.mk         |   1 +
 .../yoichiro/lunakey_pico/lunakey_pico.c      |   4 +
 .../yoichiro/lunakey_pico/lunakey_pico.h      |  23 ++++
 keyboards/yoichiro/lunakey_pico/mcuconf.h     |  11 ++
 keyboards/yoichiro/lunakey_pico/readme.md     |  27 +++++
 keyboards/yoichiro/lunakey_pico/rules.mk      |   2 +
 11 files changed, 354 insertions(+)
 create mode 100644 keyboards/yoichiro/lunakey_pico/config.h
 create mode 100644 keyboards/yoichiro/lunakey_pico/halconf.h
 create mode 100644 keyboards/yoichiro/lunakey_pico/info.json
 create mode 100644 keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c
 create mode 100644 keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c
 create mode 100644 keyboards/yoichiro/lunakey_pico/keymaps/via/rules.mk
 create mode 100644 keyboards/yoichiro/lunakey_pico/lunakey_pico.c
 create mode 100644 keyboards/yoichiro/lunakey_pico/lunakey_pico.h
 create mode 100644 keyboards/yoichiro/lunakey_pico/mcuconf.h
 create mode 100644 keyboards/yoichiro/lunakey_pico/readme.md
 create mode 100644 keyboards/yoichiro/lunakey_pico/rules.mk

diff --git a/keyboards/yoichiro/lunakey_pico/config.h b/keyboards/yoichiro/lunakey_pico/config.h
new file mode 100644
index 0000000000..be9b505794
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/config.h
@@ -0,0 +1,38 @@
+// Copyright 2022 Yoichiro Tanaka (@yoichiro)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+
+//#define SERIAL_DEBUG
+
+#define WS2812_PIO_USE_PIO1
+
+#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \
+                           11, 10, 9, 8, 7, 6 }
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/*
+ * 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/yoichiro/lunakey_pico/halconf.h b/keyboards/yoichiro/lunakey_pico/halconf.h
new file mode 100644
index 0000000000..21b3de7d6d
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Yoichiro Tanaka (@yoichiro)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SIO TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json
new file mode 100644
index 0000000000..d914f8687f
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/info.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Lunakey Pico",
+    "manufacturer": "yoichiro",
+    "maintainer": "Yoichiro Tanaka",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": false,
+        "rgblight": true,
+        "audio": false
+    },
+    "matrix_pins": {
+        "cols": ["GP21", "GP20", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP12", "GP13", "GP14", "GP15"]
+    },
+    "debounce": 5,
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "3.0.0",
+        "pid": "0x0003",
+        "vid": "0x5954"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "pin": "GP6",
+        "sleep": true,
+        "split": true,
+        "split_count": [6, 6],
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": false,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "max_brightness": 255
+    },
+    "split": {
+        "enabled": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_4"
+    },
+    "layouts": {
+        "LAYOUT_split_3x6_4": {
+            "layout": [
+                {"label":"L00", "x":0, "y":1.5},
+                {"label":"L01", "x":1, "y":1.25},
+                {"label":"L02", "x":2, "y":0.5},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0.25},
+                {"label":"L05", "x":5, "y":0.5},
+                {"label":"R00", "x":8.75, "y":0.5},
+                {"label":"R01", "x":9.75, "y":0.25},
+                {"label":"R02", "x":10.75, "y":0},
+                {"label":"R03", "x":11.75, "y":0.5},
+                {"label":"R04", "x":12.75, "y":1.25},
+                {"label":"R05", "x":13.75, "y":1.5},
+                {"label":"L10", "x":0, "y":2.5},
+                {"label":"L11", "x":1, "y":2.25},
+                {"label":"L12", "x":2, "y":1.5},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1.25},
+                {"label":"L15", "x":5, "y":1.5},
+                {"label":"R10", "x":8.75, "y":1.5},
+                {"label":"R11", "x":9.75, "y":1.25},
+                {"label":"R12", "x":10.75, "y":1},
+                {"label":"R13", "x":11.75, "y":1.5},
+                {"label":"R14", "x":12.75, "y":2.25},
+                {"label":"R15", "x":13.75, "y":2.5},
+                {"label":"L20", "x":0, "y":3.5},
+                {"label":"L21", "x":1, "y":3.25},
+                {"label":"L22", "x":2, "y":2.5},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2.25},
+                {"label":"L25", "x":5, "y":2.5},
+                {"label":"R20", "x":8.75, "y":2.5},
+                {"label":"R21", "x":9.75, "y":2.25},
+                {"label":"R22", "x":10.75, "y":2},
+                {"label":"R23", "x":11.75, "y":2.5},
+                {"label":"R24", "x":12.75, "y":3.25},
+                {"label":"R25", "x":13.75, "y":3.5},
+                {"label":"L30", "x":3, "y":4},
+                {"label":"L31", "x":4, "y":3.75},
+                {"label":"L32", "x":5, "y":3.75},
+                {"label":"L33", "x":6, "y":4},
+                {"label":"R30", "x":7.75, "y":4},
+                {"label":"R31", "x":8.75, "y":3.75},
+                {"label":"R32", "x":9.75, "y":3.75},
+                {"label":"R33", "x":10.75, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c b/keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c
new file mode 100644
index 0000000000..83a326c33a
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+// Copyright 2022 Yoichiro Tanaka (@yoichiro)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_LOWER] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_RAISE] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, KC_TILD, _______, _______, _______, _______,                   KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_ADJUST] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   QK_BOOT,   _______, _______, _______, _______, _______,                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d664eb5a03
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c
@@ -0,0 +1,65 @@
+// Copyright 2022 Yoichiro Tanaka (@yoichiro)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+#define LOWER FN_MO13
+#define RAISE FN_MO23
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_LOWER] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_RAISE] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, KC_TILD, _______, _______, _______, _______,                   KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_ADJUST] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   QK_BOOT,   _______, _______, _______, _______, _______,                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  )
+};
diff --git a/keyboards/yoichiro/lunakey_pico/keymaps/via/rules.mk b/keyboards/yoichiro/lunakey_pico/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.c b/keyboards/yoichiro/lunakey_pico/lunakey_pico.c
new file mode 100644
index 0000000000..3e57edad68
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/lunakey_pico.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Yoichiro Tanaka (@yoichiro)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "lunakey_pico.h"
diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h b/keyboards/yoichiro/lunakey_pico/lunakey_pico.h
new file mode 100644
index 0000000000..0725054f0f
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/lunakey_pico.h
@@ -0,0 +1,23 @@
+// Copyright 2022 Yoichiro Tanaka (@yoichiro)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_split_3x6_4( \
+  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, R30, R31, R32, R33 \
+  ) \
+  { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { KC_NO, KC_NO, L30, L31, L32, L33 }, \
+    { R05, R04, R03, R02, R01, R00 }, \
+    { R15, R14, R13, R12, R11, R10 }, \
+    { R25, R24, R23, R22, R21, R20 }, \
+    { KC_NO, KC_NO, R33, R32, R31, R30 } \
+  }
diff --git a/keyboards/yoichiro/lunakey_pico/mcuconf.h b/keyboards/yoichiro/lunakey_pico/mcuconf.h
new file mode 100644
index 0000000000..482df316e9
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/mcuconf.h
@@ -0,0 +1,11 @@
+// Copyright 2022 Yoichiro Tanaka (@yoichiro)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_SIO_USE_UART0
+#define RP_SIO_USE_UART0 TRUE
+#undef RP_SIO_USE_UART1
+#define RP_SIO_USE_UART1 FALSE
diff --git a/keyboards/yoichiro/lunakey_pico/readme.md b/keyboards/yoichiro/lunakey_pico/readme.md
new file mode 100644
index 0000000000..cb565220af
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/readme.md
@@ -0,0 +1,27 @@
+# Lunakey Pico
+
+![lunakey_pico](https://i.imgur.com/S5N8AFhh.jpg)
+
+This is a 40% split keyboard which has 3x6 vertically staggered keys and 4 thumbnail keys.
+
+* Keyboard Maintainer: [Yoichiro Tanaka](https://github.com/yoichiro)
+* Hardware Supported: Lunakey Pico PCB, Raspberry Pi Pico MCU.
+* Hardware Availability: https://booth.pm/ja/items/3324672
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb yoichiro/lunakey_pico -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb yoichiro/lunakey_pico -km default -bl avrdude
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/yoichiro/lunakey_pico/rules.mk b/keyboards/yoichiro/lunakey_pico/rules.mk
new file mode 100644
index 0000000000..26c3aca886
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_pico/rules.mk
@@ -0,0 +1,2 @@
+WS2812_DRIVER = vendor
+SERIAL_DRIVER = vendor

From 90418b371f7ca669e801f6adcd10d387d958b7cd Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 2 Sep 2022 08:32:38 -0700
Subject: [PATCH 295/959] [Keymap] Fix bootmagic compilation issue with Drashna
 keymaps (#18223)

---
 users/drashna/bootmagic_better.c | 56 ++++++++++++++++++++++++++++++++
 users/drashna/drashna.c          | 54 ------------------------------
 users/drashna/rules.mk           |  4 +++
 3 files changed, 60 insertions(+), 54 deletions(-)
 create mode 100644 users/drashna/bootmagic_better.c

diff --git a/users/drashna/bootmagic_better.c b/users/drashna/bootmagic_better.c
new file mode 100644
index 0000000000..4932e25f1d
--- /dev/null
+++ b/users/drashna/bootmagic_better.c
@@ -0,0 +1,56 @@
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "drashna.h"
+#include "bootmagic_lite.h"
+
+void bootmagic_lite(void) {
+    bool perform_reset = false;
+    // We need multiple scans because debouncing can't be turned off.
+    matrix_scan();
+#if defined(DEBOUNCE) && DEBOUNCE > 0
+    wait_ms(DEBOUNCE * 2);
+#else
+    wait_ms(30);
+#endif
+    matrix_scan();
+
+    // If the configured key (commonly Esc) is held down on power up,
+    // reset the EEPROM valid state and jump to bootloader.
+    // This isn't very generalized, but we need something that doesn't
+    // rely on user's keymaps in firmware or EEPROM.
+    uint8_t row = BOOTMAGIC_LITE_ROW, col = BOOTMAGIC_LITE_COLUMN;
+#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN)
+    uint8_t row_e = BOOTMAGIC_LITE_EEPROM_ROW, col_e = BOOTMAGIC_LITE_EEPROM_COLUMN;
+#endif
+
+#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT)
+    if (!is_keyboard_left()) {
+        row = BOOTMAGIC_LITE_ROW_RIGHT;
+        col = BOOTMAGIC_LITE_COLUMN_RIGHT;
+#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN) && defined(BOOTMAGIC_LITE_EEPROM_ROW_RIGHT) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT)
+        row_e = BOOTMAGIC_LITE_EEPROM_ROW_RIGHT;
+        col_e = BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT;
+#    endif
+    }
+#endif
+
+#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN)
+    if (matrix_get_row(row_e) & (1 << col_e)) {
+        eeconfig_disable();
+        perform_reset = true;
+    }
+#endif
+    if (matrix_get_row(row) & (1 << col)) {
+        perform_reset = true;
+    }
+#ifdef STM32F411xE
+    if (!readPin(A0)) {
+        perform_reset = true;
+    }
+#endif
+
+    if (perform_reset) {
+        bootloader_jump();
+    }
+}
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 85f47c8cb4..91f3a06b7c 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "drashna.h"
-#ifdef __AVR__
-#    include <avr/wdt.h>
-#endif
 
 userspace_config_t userspace_config;
 
@@ -132,54 +129,3 @@ void keyboard_post_init_i2c(void) {
     scan_timer = timer_read();
 }
 #endif
-
-void bootmagic_lite(void) {
-    bool perform_reset = false;
-    // We need multiple scans because debouncing can't be turned off.
-    matrix_scan();
-#if defined(DEBOUNCE) && DEBOUNCE > 0
-    wait_ms(DEBOUNCE * 2);
-#else
-    wait_ms(30);
-#endif
-    matrix_scan();
-
-    // If the configured key (commonly Esc) is held down on power up,
-    // reset the EEPROM valid state and jump to bootloader.
-    // This isn't very generalized, but we need something that doesn't
-    // rely on user's keymaps in firmware or EEPROM.
-    uint8_t row = BOOTMAGIC_LITE_ROW, col = BOOTMAGIC_LITE_COLUMN;
-#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN)
-    uint8_t row_e = BOOTMAGIC_LITE_EEPROM_ROW, col_e = BOOTMAGIC_LITE_EEPROM_COLUMN;
-#endif
-
-#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT)
-    if (!is_keyboard_left()) {
-        row = BOOTMAGIC_LITE_ROW_RIGHT;
-        col = BOOTMAGIC_LITE_COLUMN_RIGHT;
-#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN) && defined(BOOTMAGIC_LITE_EEPROM_ROW_RIGHT) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT)
-        row_e = BOOTMAGIC_LITE_EEPROM_ROW_RIGHT;
-        col_e = BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT;
-#    endif
-    }
-#endif
-
-#if defined(BOOTMAGIC_LITE_EEPROM_ROW) && defined(BOOTMAGIC_LITE_EEPROM_COLUMN)
-    if (matrix_get_row(row_e) & (1 << col_e)) {
-        eeconfig_disable();
-        perform_reset = true;
-    }
-#endif
-    if (matrix_get_row(row) & (1 << col)) {
-        perform_reset = true;
-    }
-#ifdef STM32F411xE
-    if (!readPin(A0)) {
-        perform_reset = true;
-    }
-#endif
-
-    if (perform_reset) {
-        bootloader_jump();
-    }
-}
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 13ed761ba8..5644aad2c4 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -133,3 +133,7 @@ ifeq ($(strip $(AUTOCORRECTION_ENABLE)), yes)
     $(shell touch $(USER_PATH)/keyrecords/autocorrection/autocorrection.c)
     OPT_DEFS += -DAUTOCORRECTION_ENABLE
 endif
+
+ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
+    SRC += bootmagic_better.c
+endif

From 5d932e2612aef86a1db7d182bd509026c8f6a064 Mon Sep 17 00:00:00 2001
From: Brian <Bapowell00@gmail.com>
Date: Fri, 2 Sep 2022 09:10:05 -0700
Subject: [PATCH 296/959] [Keymap] Fixing location of my Keymap for the
 Gentleman65 (#18246)

---
 .../{ => jkeys_design}/gentleman65/keymaps/briianpowell/keymap.c  | 0
 .../{ => jkeys_design}/gentleman65/keymaps/briianpowell/readme.md | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename keyboards/{ => jkeys_design}/gentleman65/keymaps/briianpowell/keymap.c (100%)
 rename keyboards/{ => jkeys_design}/gentleman65/keymaps/briianpowell/readme.md (100%)

diff --git a/keyboards/gentleman65/keymaps/briianpowell/keymap.c b/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/keymap.c
similarity index 100%
rename from keyboards/gentleman65/keymaps/briianpowell/keymap.c
rename to keyboards/jkeys_design/gentleman65/keymaps/briianpowell/keymap.c
diff --git a/keyboards/gentleman65/keymaps/briianpowell/readme.md b/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/readme.md
similarity index 100%
rename from keyboards/gentleman65/keymaps/briianpowell/readme.md
rename to keyboards/jkeys_design/gentleman65/keymaps/briianpowell/readme.md

From 09d668eb0ed3ff6fa48ce1db98910b022bca2d90 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 3 Sep 2022 05:38:27 +1000
Subject: [PATCH 297/959] Simplify extrakeys sending at the host driver level
 (#18230)

* Simplify extrakeys sending at the host driver level

* There are two arguments here

* Wrong syntax

* Adjust keyboards which use a custom host driver
---
 keyboards/annepro2/annepro2_ble.c            | 21 +++++----
 keyboards/bioi/ble.c                         | 47 +++++++++-----------
 keyboards/hhkb/rn42/rn42.c                   | 38 +++++++---------
 tests/test_common/test_driver.cpp            | 10 ++---
 tests/test_common/test_driver.hpp            |  6 +--
 tmk_core/protocol/arm_atsam/main_arm_atsam.c | 17 +------
 tmk_core/protocol/chibios/chibios.c          |  5 +--
 tmk_core/protocol/chibios/usb_main.c         | 14 +-----
 tmk_core/protocol/host.c                     |  4 +-
 tmk_core/protocol/host_driver.h              |  5 +--
 tmk_core/protocol/lufa/lufa.c                | 35 +++------------
 tmk_core/protocol/vusb/vusb.c                | 17 +------
 12 files changed, 70 insertions(+), 149 deletions(-)

diff --git a/keyboards/annepro2/annepro2_ble.c b/keyboards/annepro2/annepro2_ble.c
index 0336d6a76c..c75de6720c 100644
--- a/keyboards/annepro2/annepro2_ble.c
+++ b/keyboards/annepro2/annepro2_ble.c
@@ -24,15 +24,14 @@
 /* -------------------- Static Function Prototypes -------------------------- */
 static uint8_t ap2_ble_leds(void);
 static void    ap2_ble_mouse(report_mouse_t *report);
-static void    ap2_ble_system(uint16_t data);
-static void    ap2_ble_consumer(uint16_t data);
+static void    ap2_ble_extra(uint8_t report_id, uint16_t data);
 static void    ap2_ble_keyboard(report_keyboard_t *report);
 
 static void ap2_ble_swtich_ble_driver(void);
 
 /* -------------------- Static Local Variables ------------------------------ */
 static host_driver_t ap2_ble_driver = {
-    ap2_ble_leds, ap2_ble_keyboard, ap2_ble_mouse, ap2_ble_system, ap2_ble_consumer,
+    ap2_ble_leds, ap2_ble_keyboard, ap2_ble_mouse, ap2_ble_extra
 };
 
 static uint8_t ble_mcu_wakeup[11] = {0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x01, 0x7d, 0x02, 0x01, 0x02};
@@ -131,8 +130,6 @@ static uint8_t ap2_ble_leds(void) {
 
 static void ap2_ble_mouse(report_mouse_t *report) {}
 
-static void ap2_ble_system(uint16_t data) {}
-
 static inline uint16_t CONSUMER2AP2(uint16_t usage) {
     switch (usage) {
         case AUDIO_VOL_DOWN:
@@ -152,12 +149,14 @@ static inline uint16_t CONSUMER2AP2(uint16_t usage) {
     }
 }
 
-static void ap2_ble_consumer(uint16_t data) {
-    sdPut(&SD1, 0x0);
-    sdWrite(&SD1, ble_mcu_send_consumer_report, sizeof(ble_mcu_send_consumer_report));
-    sdPut(&SD1, CONSUMER2AP2(data));
-    static const uint8_t dummy[3] = {0};
-    sdWrite(&SD1, dummy, sizeof(dummy));
+static void ap2_ble_extra(uint8_t report_id, uint16_t data) {
+    if (report_id == REPORT_ID_CONSUMER) {
+        sdPut(&SD1, 0x0);
+        sdWrite(&SD1, ble_mcu_send_consumer_report, sizeof(ble_mcu_send_consumer_report));
+        sdPut(&SD1, CONSUMER2AP2(data));
+        static const uint8_t dummy[3] = {0};
+        sdWrite(&SD1, dummy, sizeof(dummy));
+    }
 }
 
 /*!
diff --git a/keyboards/bioi/ble.c b/keyboards/bioi/ble.c
index d941f7c43d..b050b2f6cb 100644
--- a/keyboards/bioi/ble.c
+++ b/keyboards/bioi/ble.c
@@ -96,15 +96,14 @@ static void bluefruit_serial_send(uint8_t data)
 static uint8_t keyboard_leds(void);
 static void send_keyboard(report_keyboard_t *report);
 static void send_mouse(report_mouse_t *report);
-static void send_system(uint16_t data);
-static void send_consumer(uint16_t data);
+static void send_extra(uint8_t report_id, uint16_t data);
 
 host_driver_t bluefruit_driver = {
     keyboard_leds,
     send_keyboard,
     send_mouse,
-    send_system,
-    send_consumer};
+    send_extra
+};
 
 host_driver_t null_driver = {};
 
@@ -156,10 +155,6 @@ static void send_mouse(report_mouse_t *report)
 #endif
 }
 
-static void send_system(uint16_t data)
-{
-}
-
 /*
 +-----------------+-------------------+-------+
 | Consumer Key    | Bit Map           | Hex   |
@@ -182,30 +177,32 @@ static void send_system(uint16_t data)
 #define CONSUMER2BLUEFRUIT(usage) \
     (usage == AUDIO_MUTE ? 0x00e2 : (usage == AUDIO_VOL_UP ? 0x00e9 : (usage == AUDIO_VOL_DOWN ? 0x00ea : (usage == TRANSPORT_NEXT_TRACK ? 0x00b5 : (usage == TRANSPORT_PREV_TRACK ? 0x00b6 : (usage == TRANSPORT_STOP ? 0x00b7 : (usage == TRANSPORT_STOP_EJECT ? 0x00b8 : (usage == TRANSPORT_PLAY_PAUSE ? 0x00b1 : (usage == AL_CC_CONFIG ? 0x0183 : (usage == AL_EMAIL ? 0x018c : (usage == AL_CALCULATOR ? 0x0192 : (usage == AL_LOCAL_BROWSER ? 0x0196 : (usage == AC_SEARCH ? 0x021f : (usage == AC_HOME ? 0x0223 : (usage == AC_BACK ? 0x0224 : (usage == AC_FORWARD ? 0x0225 : (usage == AC_STOP ? 0x0226 : (usage == AC_REFRESH ? 0x0227 : (usage == AC_BOOKMARKS ? 0x022a : 0)))))))))))))))))))
 
-static void send_consumer(uint16_t data)
+static void send_extra(uint8_t report_id, uint16_t data)
 {
-    static uint16_t last_data = 0;
-    if (data == last_data)
-        return;
-    last_data = data;
+    if (report_id == REPORT_ID_CONSUMER) {
+        static uint16_t last_data = 0;
+        if (data == last_data)
+            return;
+        last_data = data;
 
-    uint16_t bitmap = CONSUMER2BLUEFRUIT(data);
+        uint16_t bitmap = CONSUMER2BLUEFRUIT(data);
 
 #ifdef BLUEFRUIT_TRACE_SERIAL
-    dprintf("\nData: ");
-    debug_hex16(data);
-    dprintf("; bitmap: ");
-    debug_hex16(bitmap);
-    dprintf("\n");
-    bluefruit_trace_header();
+        dprintf("\nData: ");
+        debug_hex16(data);
+        dprintf("; bitmap: ");
+        debug_hex16(bitmap);
+        dprintf("\n");
+        bluefruit_trace_header();
 #endif
-    send_str(PSTR("AT+BLEHIDCONTROLKEY=0x"));
-    send_bytes((bitmap >> 8) & 0xFF);
-    send_bytes(bitmap & 0xFF);
-    send_str(PSTR("\r\n"));
+        send_str(PSTR("AT+BLEHIDCONTROLKEY=0x"));
+        send_bytes((bitmap >> 8) & 0xFF);
+        send_bytes(bitmap & 0xFF);
+        send_str(PSTR("\r\n"));
 #ifdef BLUEFRUIT_TRACE_SERIAL
-    bluefruit_trace_footer();
+        bluefruit_trace_footer();
 #endif
+    }
 }
 
 void usart_init(void)
diff --git a/keyboards/hhkb/rn42/rn42.c b/keyboards/hhkb/rn42/rn42.c
index 06665425ce..b35b319352 100644
--- a/keyboards/hhkb/rn42/rn42.c
+++ b/keyboards/hhkb/rn42/rn42.c
@@ -12,15 +12,13 @@
 static uint8_t keyboard_leds(void);
 static void send_keyboard(report_keyboard_t *report);
 static void send_mouse(report_mouse_t *report);
-static void send_system(uint16_t data);
-static void send_consumer(uint16_t data);
+static void send_extra(uint8_t report_id, uint16_t data);
 
 host_driver_t rn42_driver = {
     keyboard_leds,
     send_keyboard,
     send_mouse,
-    send_system,
-    send_consumer
+    send_extra
 };
 
 
@@ -198,12 +196,6 @@ static void send_mouse(report_mouse_t *report)
     serial_send(report->v);
 }
 
-static void send_system(uint16_t data)
-{
-    // Table 5-6 of RN-BT-DATA-UB
-    // 81,82,83 scan codes can be used?
-}
-
 
 static uint16_t usage2bits(uint16_t usage)
 {
@@ -228,14 +220,17 @@ static uint16_t usage2bits(uint16_t usage)
     return 0;
 }
 
-static void send_consumer(uint16_t data)
+
+static void send_extra(uint8_t report_id, uint16_t data)
 {
-    uint16_t bits = usage2bits(data);
-    serial_send(0xFD);  // Raw report mode
-    serial_send(3);     // length
-    serial_send(3);     // descriptor type
-    serial_send(bits&0xFF);
-    serial_send((bits>>8)&0xFF);
+    if (report_id == REPORT_ID_CONSUMER) {
+        uint16_t bits = usage2bits(data);
+        serial_send(0xFD);  // Raw report mode
+        serial_send(3);     // length
+        serial_send(3);     // descriptor type
+        serial_send(bits&0xFF);
+        serial_send((bits>>8)&0xFF);
+    }
 }
 
 
@@ -243,19 +238,16 @@ static void send_consumer(uint16_t data)
 static uint8_t config_keyboard_leds(void);
 static void config_send_keyboard(report_keyboard_t *report);
 static void config_send_mouse(report_mouse_t *report);
-static void config_send_system(uint16_t data);
-static void config_send_consumer(uint16_t data);
+static void config_send_extra(uint8_t report_id, uint16_t data);
 
 host_driver_t rn42_config_driver = {
     config_keyboard_leds,
     config_send_keyboard,
     config_send_mouse,
-    config_send_system,
-    config_send_consumer
+    config_send_extra
 };
 
 static uint8_t config_keyboard_leds(void) { return leds; }
 static void config_send_keyboard(report_keyboard_t *report) {}
 static void config_send_mouse(report_mouse_t *report) {}
-static void config_send_system(uint16_t data) {}
-static void config_send_consumer(uint16_t data) {}
+static void config_send_extra(uint8_t report_id, uint16_t data) {}
diff --git a/tests/test_common/test_driver.cpp b/tests/test_common/test_driver.cpp
index 86644ab6bd..7ecd4931ed 100644
--- a/tests/test_common/test_driver.cpp
+++ b/tests/test_common/test_driver.cpp
@@ -31,7 +31,7 @@ uint8_t hex_digit_to_keycode(uint8_t digit) {
 }
 } // namespace
 
-TestDriver::TestDriver() : m_driver{&TestDriver::keyboard_leds, &TestDriver::send_keyboard, &TestDriver::send_mouse, &TestDriver::send_system, &TestDriver::send_consumer} {
+TestDriver::TestDriver() : m_driver{&TestDriver::keyboard_leds, &TestDriver::send_keyboard, &TestDriver::send_mouse, &TestDriver::send_extra} {
     host_set_driver(&m_driver);
     m_this = this;
 }
@@ -53,12 +53,8 @@ void TestDriver::send_mouse(report_mouse_t* report) {
     m_this->send_mouse_mock(*report);
 }
 
-void TestDriver::send_system(uint16_t data) {
-    m_this->send_system_mock(data);
-}
-
-void TestDriver::send_consumer(uint16_t data) {
-    m_this->send_consumer(data);
+void TestDriver::send_extra(uint8_t report_id, uint16_t data) {
+    m_this->send_extra_mock(report_id, data);
 }
 
 namespace internal {
diff --git a/tests/test_common/test_driver.hpp b/tests/test_common/test_driver.hpp
index b58cfd1ebc..666bfb1fba 100644
--- a/tests/test_common/test_driver.hpp
+++ b/tests/test_common/test_driver.hpp
@@ -32,15 +32,13 @@ class TestDriver {
 
     MOCK_METHOD1(send_keyboard_mock, void(report_keyboard_t&));
     MOCK_METHOD1(send_mouse_mock, void(report_mouse_t&));
-    MOCK_METHOD1(send_system_mock, void(uint16_t));
-    MOCK_METHOD1(send_consumer_mock, void(uint16_t));
+    MOCK_METHOD2(send_extra_mock, void(uint8_t, uint16_t));
 
    private:
     static uint8_t     keyboard_leds(void);
     static void        send_keyboard(report_keyboard_t* report);
     static void        send_mouse(report_mouse_t* report);
-    static void        send_system(uint16_t data);
-    static void        send_consumer(uint16_t data);
+    static void        send_extra(uint8_t report_id, uint16_t data);
     host_driver_t      m_driver;
     uint8_t            m_leds = 0;
     static TestDriver* m_this;
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index 8ee9e042e7..a2f20db66e 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -37,14 +37,13 @@ void    main_subtasks(void);
 uint8_t keyboard_leds(void);
 void    send_keyboard(report_keyboard_t *report);
 void    send_mouse(report_mouse_t *report);
-void    send_system(uint16_t data);
-void    send_consumer(uint16_t data);
+void    send_extra(uint8_t report_id, uint16_t data);
 
 #ifdef DEFERRED_EXEC_ENABLE
 void deferred_exec_task(void);
 #endif // DEFERRED_EXEC_ENABLE
 
-host_driver_t arm_atsam_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
+host_driver_t arm_atsam_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
 
 uint8_t led_states;
 
@@ -132,18 +131,6 @@ void send_extra(uint8_t report_id, uint16_t data) {
 }
 #endif // EXTRAKEY_ENABLE
 
-void send_system(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    send_extra(REPORT_ID_SYSTEM, data);
-#endif // EXTRAKEY_ENABLE
-}
-
-void send_consumer(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    send_extra(REPORT_ID_CONSUMER, data);
-#endif // EXTRAKEY_ENABLE
-}
-
 #ifdef CONSOLE_ENABLE
 #    define CONSOLE_PRINTBUF_SIZE 512
 static char     console_printbuf[CONSOLE_PRINTBUF_SIZE];
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index c9a480c325..024160a925 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -58,13 +58,12 @@
 uint8_t keyboard_leds(void);
 void    send_keyboard(report_keyboard_t *report);
 void    send_mouse(report_mouse_t *report);
-void    send_system(uint16_t data);
-void    send_consumer(uint16_t data);
+void    send_extra(uint8_t report_id, uint16_t data);
 void    send_programmable_button(uint32_t data);
 void    send_digitizer(report_digitizer_t *report);
 
 /* host struct */
-host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer, send_programmable_button};
+host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra, send_programmable_button};
 
 #ifdef VIRTSER_ENABLE
 void virtser_task(void);
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index eb9ef82554..d218deb6f9 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -947,7 +947,7 @@ void shared_in_cb(USBDriver *usbp, usbep_t ep) {
  */
 
 #ifdef EXTRAKEY_ENABLE
-static void send_extra(uint8_t report_id, uint16_t data) {
+void send_extra(uint8_t report_id, uint16_t data) {
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
         osalSysUnlock();
@@ -973,18 +973,6 @@ static void send_extra(uint8_t report_id, uint16_t data) {
 }
 #endif
 
-void send_system(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    send_extra(REPORT_ID_SYSTEM, data);
-#endif
-}
-
-void send_consumer(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    send_extra(REPORT_ID_CONSUMER, data);
-#endif
-}
-
 void send_programmable_button(uint32_t data) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
     osalSysLock();
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 3d8604d541..2ebd176ea4 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -107,7 +107,7 @@ void host_system_send(uint16_t report) {
     last_system_report = report;
 
     if (!driver) return;
-    (*driver->send_system)(report);
+    (*driver->send_extra)(REPORT_ID_SYSTEM, report);
 }
 
 void host_consumer_send(uint16_t report) {
@@ -115,7 +115,7 @@ void host_consumer_send(uint16_t report) {
     last_consumer_report = report;
 
     if (!driver) return;
-    (*driver->send_consumer)(report);
+    (*driver->send_extra)(REPORT_ID_CONSUMER, report);
 }
 
 void host_digitizer_send(digitizer_t *digitizer) {
diff --git a/tmk_core/protocol/host_driver.h b/tmk_core/protocol/host_driver.h
index affd0dcb34..680d9727d3 100644
--- a/tmk_core/protocol/host_driver.h
+++ b/tmk_core/protocol/host_driver.h
@@ -27,9 +27,8 @@ typedef struct {
     uint8_t (*keyboard_leds)(void);
     void (*send_keyboard)(report_keyboard_t *);
     void (*send_mouse)(report_mouse_t *);
-    void (*send_system)(uint16_t);
-    void (*send_consumer)(uint16_t);
+    void (*send_extra)(uint8_t, uint16_t);
     void (*send_programmable_button)(uint32_t);
 } host_driver_t;
 
-void send_digitizer(report_digitizer_t *report);
\ No newline at end of file
+void send_digitizer(report_digitizer_t *report);
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index b4b03357a3..5c1a9b600e 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -101,10 +101,9 @@ static report_keyboard_t keyboard_report_sent;
 static uint8_t keyboard_leds(void);
 static void    send_keyboard(report_keyboard_t *report);
 static void    send_mouse(report_mouse_t *report);
-static void    send_system(uint16_t data);
-static void    send_consumer(uint16_t data);
+static void    send_extra(uint8_t report_id, uint16_t data);
 static void    send_programmable_button(uint32_t data);
-host_driver_t  lufa_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer, send_programmable_button};
+host_driver_t  lufa_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra, send_programmable_button};
 
 #ifdef VIRTSER_ENABLE
 // clang-format off
@@ -748,30 +747,8 @@ static void send_report(void *report, size_t size) {
  */
 #ifdef EXTRAKEY_ENABLE
 static void send_extra(uint8_t report_id, uint16_t data) {
-    static report_extra_t r;
-    r = (report_extra_t){.report_id = report_id, .usage = data};
-    send_report(&r, sizeof(r));
-}
-#endif
-
-/** \brief Send System
- *
- * FIXME: Needs doc
- */
-static void send_system(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    send_extra(REPORT_ID_SYSTEM, data);
-#endif
-}
-
-/** \brief Send Consumer
- *
- * FIXME: Needs doc
- */
-static void send_consumer(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
 #    ifdef BLUETOOTH_ENABLE
-    if (where_to_send() == OUTPUT_BLUETOOTH) {
+    if (report_id == REPORT_ID_CONSUMER && where_to_send() == OUTPUT_BLUETOOTH) {
 #        ifdef BLUETOOTH_BLUEFRUIT_LE
         bluefruit_le_send_consumer_key(data);
 #        elif BLUETOOTH_RN42
@@ -781,9 +758,11 @@ static void send_consumer(uint16_t data) {
     }
 #    endif
 
-    send_extra(REPORT_ID_CONSUMER, data);
-#endif
+    static report_extra_t r;
+    r = (report_extra_t){.report_id = report_id, .usage = data};
+    send_report(&r, sizeof(r));
 }
+#endif
 
 static void send_programmable_button(uint32_t data) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 65f5027574..ed90b1151a 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -224,11 +224,10 @@ void console_task(void) {
 static uint8_t keyboard_leds(void);
 static void    send_keyboard(report_keyboard_t *report);
 static void    send_mouse(report_mouse_t *report);
-static void    send_system(uint16_t data);
-static void    send_consumer(uint16_t data);
+static void    send_extra(uint8_t report_id, uint16_t data);
 static void    send_programmable_button(uint32_t data);
 
-static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer, send_programmable_button};
+static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_extra, send_programmable_button};
 
 host_driver_t *vusb_driver(void) {
     return &driver;
@@ -285,18 +284,6 @@ static void send_extra(uint8_t report_id, uint16_t data) {
 }
 #endif
 
-static void send_system(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    send_extra(REPORT_ID_SYSTEM, data);
-#endif
-}
-
-static void send_consumer(uint16_t data) {
-#ifdef EXTRAKEY_ENABLE
-    send_extra(REPORT_ID_CONSUMER, data);
-#endif
-}
-
 void send_digitizer(report_digitizer_t *report) {
 #ifdef DIGITIZER_ENABLE
     if (usbInterruptIsReadyShared()) {

From f76b55d5add98a70331338d4bee11ffd963a886a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 3 Sep 2022 06:50:36 +1000
Subject: [PATCH 298/959] Adjust `EXTRAKEY_ENABLE` ifdefs for `send_extra()`
 (#18249)

---
 tmk_core/protocol/arm_atsam/main_arm_atsam.c | 4 ++--
 tmk_core/protocol/chibios/usb_main.c         | 4 ++--
 tmk_core/protocol/lufa/lufa.c                | 4 ++--
 tmk_core/protocol/vusb/vusb.c                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index a2f20db66e..0537e3937d 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -113,8 +113,8 @@ void send_mouse(report_mouse_t *report) {
 #endif // MOUSEKEY_ENABLE
 }
 
-#ifdef EXTRAKEY_ENABLE
 void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
     uint32_t irqflags;
 
     irqflags = __get_PRIMASK();
@@ -128,8 +128,8 @@ void send_extra(uint8_t report_id, uint16_t data) {
 
     __DMB();
     __set_PRIMASK(irqflags);
-}
 #endif // EXTRAKEY_ENABLE
+}
 
 #ifdef CONSOLE_ENABLE
 #    define CONSOLE_PRINTBUF_SIZE 512
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index d218deb6f9..222a867e3c 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -946,8 +946,8 @@ void shared_in_cb(USBDriver *usbp, usbep_t ep) {
  * ---------------------------------------------------------
  */
 
-#ifdef EXTRAKEY_ENABLE
 void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
         osalSysUnlock();
@@ -970,8 +970,8 @@ void send_extra(uint8_t report_id, uint16_t data) {
 
     usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report_extra_t));
     osalSysUnlock();
-}
 #endif
+}
 
 void send_programmable_button(uint32_t data) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 5c1a9b600e..03e19745f8 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -745,8 +745,8 @@ static void send_report(void *report, size_t size) {
  *
  * FIXME: Needs doc
  */
-#ifdef EXTRAKEY_ENABLE
 static void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
 #    ifdef BLUETOOTH_ENABLE
     if (report_id == REPORT_ID_CONSUMER && where_to_send() == OUTPUT_BLUETOOTH) {
 #        ifdef BLUETOOTH_BLUEFRUIT_LE
@@ -761,8 +761,8 @@ static void send_extra(uint8_t report_id, uint16_t data) {
     static report_extra_t r;
     r = (report_extra_t){.report_id = report_id, .usage = data};
     send_report(&r, sizeof(r));
-}
 #endif
+}
 
 static void send_programmable_button(uint32_t data) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index ed90b1151a..013d637b6f 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -268,8 +268,8 @@ static void send_mouse(report_mouse_t *report) {
 #endif
 }
 
-#ifdef EXTRAKEY_ENABLE
 static void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
     static uint8_t  last_id   = 0;
     static uint16_t last_data = 0;
     if ((report_id == last_id) && (data == last_data)) return;
@@ -281,8 +281,8 @@ static void send_extra(uint8_t report_id, uint16_t data) {
     if (usbInterruptIsReadyShared()) {
         usbSetInterruptShared((void *)&report, sizeof(report_extra_t));
     }
-}
 #endif
+}
 
 void send_digitizer(report_digitizer_t *report) {
 #ifdef DIGITIZER_ENABLE

From 5c0e87608fb63cac3bd1dc4453d8de875497a87e Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 3 Sep 2022 06:50:44 +0100
Subject: [PATCH 299/959] Remove more RESET keycode references (#18252)

---
 keyboards/ai/readme.md                            |  2 +-
 keyboards/aidansmithdotdev/fine40/readme.md       |  2 +-
 keyboards/at_at/660m/config.h                     |  2 +-
 keyboards/boardrun/bizarre/readme.md              |  2 +-
 keyboards/boardrun/classic/readme.md              |  2 +-
 keyboards/cannonkeys/malicious_ergo/readme.md     |  2 +-
 keyboards/cannonkeys/nearfield/readme.md          |  2 +-
 keyboards/cannonkeys/satisfaction75/config.h      |  2 +-
 keyboards/capsunlocked/cu75/cu75.c                |  2 +-
 keyboards/carbo65/config.h                        |  2 +-
 keyboards/clueboard/66/rev4/mine/keymap.c         | 13 -------------
 keyboards/emery65/config.h                        |  2 +-
 keyboards/feker/ik75/readme.md                    |  2 +-
 keyboards/fjlabs/avalon/readme.md                 |  2 +-
 keyboards/foostan/cornelius/readme.md             |  2 +-
 keyboards/hand88/config.h                         |  2 +-
 keyboards/handwired/cyberstar/config.h            |  2 +-
 keyboards/handwired/dactyl/readme.md              |  4 ++--
 keyboards/idobao/id80/v1/readme.md                |  2 +-
 keyboards/idobao/id80/v2/readme.md                |  2 +-
 keyboards/jacky_studio/s7_elephant/readme.md      |  2 +-
 keyboards/jacky_studio/s7_elephant/rev1/readme.md |  2 +-
 keyboards/kegen/gboy/readme.md                    |  2 +-
 keyboards/lazydesigners/bolt/readme.md            |  2 +-
 keyboards/lazydesigners/cassette8/readme.md       |  2 +-
 keyboards/lazydesigners/dimple/readme.md          |  2 +-
 keyboards/lazydesigners/dimpleplus/readme.md      |  2 +-
 keyboards/lazydesigners/the40/readme.md           |  2 +-
 keyboards/lazydesigners/the50/readme.md           |  2 +-
 keyboards/lazydesigners/the60/rev2/readme.md      |  2 +-
 keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c         |  2 +-
 keyboards/lfkeyboards/lfk78/lfk78.c               |  2 +-
 keyboards/lfkeyboards/lfk87/lfk87.c               |  2 +-
 keyboards/lfkeyboards/mini1800/mini1800.c         |  2 +-
 keyboards/lfkeyboards/smk65/revb/revb.c           |  2 +-
 keyboards/loki65/config.h                         |  2 +-
 keyboards/mechlovin/zed65/readme.md               |  2 +-
 keyboards/mechlovin/zed65/retro66/readme.md       |  2 +-
 keyboards/mechlovin/zed65/wearhaus66/readme.md    |  2 +-
 keyboards/mnk1800s/config.h                       |  2 +-
 keyboards/mnk50/config.h                          |  2 +-
 keyboards/mnk75/config.h                          |  2 +-
 keyboards/moonlander/moonlander.c                 |  2 +-
 keyboards/nasu/config.h                           |  2 +-
 keyboards/nullbitsco/tidbit/tidbit.c              |  2 +-
 keyboards/planck/ez/ez.c                          |  2 +-
 keyboards/plywrks/lune/keymaps/default/keymap.c   |  2 +-
 keyboards/plywrks/lune/keymaps/via/keymap.c       |  2 +-
 keyboards/protozoa/cassini/config.h               |  2 +-
 keyboards/rocketboard_16/keycode_lookup.c         |  2 +-
 keyboards/soda/cherish/readme.md                  |  2 +-
 keyboards/spaceholdings/nebula12/config.h         |  4 ++--
 keyboards/system76/launch_1/launch_1.c            |  2 +-
 keyboards/w1_at/config.h                          |  2 +-
 keyboards/westm/westm68/config.h                  |  2 +-
 keyboards/westm/westm9/config.h                   |  2 +-
 keyboards/woodkeys/meira/meira.c                  |  2 +-
 keyboards/yoichiro/lunakey_pico/readme.md         |  2 +-
 58 files changed, 59 insertions(+), 72 deletions(-)
 delete mode 100644 keyboards/clueboard/66/rev4/mine/keymap.c

diff --git a/keyboards/ai/readme.md b/keyboards/ai/readme.md
index 670996640f..f61e4933ac 100644
--- a/keyboards/ai/readme.md
+++ b/keyboards/ai/readme.md
@@ -31,4 +31,4 @@ Enter the bootloader in 3 ways:
 
 -   **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 -   **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
--   **Keycode in layout**: Press the key mapped to `RESET` if it is available
+-   **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/aidansmithdotdev/fine40/readme.md b/keyboards/aidansmithdotdev/fine40/readme.md
index ad3eba7c5c..19d23fb914 100644
--- a/keyboards/aidansmithdotdev/fine40/readme.md
+++ b/keyboards/aidansmithdotdev/fine40/readme.md
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h
index b3676e9704..cdb9b81967 100644
--- a/keyboards/at_at/660m/config.h
+++ b/keyboards/at_at/660m/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* LSE clock */
diff --git a/keyboards/boardrun/bizarre/readme.md b/keyboards/boardrun/bizarre/readme.md
index 5c73313d38..3ca84dfac2 100644
--- a/keyboards/boardrun/bizarre/readme.md
+++ b/keyboards/boardrun/bizarre/readme.md
@@ -18,6 +18,6 @@ Flashing example for this keyboard:
 
     make boardrun/bizarre:default:flash
     
-The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured `QK_BOOT` shortcut (which may vary depending on when the PCB was flashed).
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/boardrun/classic/readme.md b/keyboards/boardrun/classic/readme.md
index 2ed4ff1bd0..eeb2c0d55c 100644
--- a/keyboards/boardrun/classic/readme.md
+++ b/keyboards/boardrun/classic/readme.md
@@ -18,6 +18,6 @@ Flashing example for this keyboard:
     
     make boardrun/classic:default:flash
 
-The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured `QK_BOOT` shortcut (which may vary depending on when the PCB was flashed).
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/cannonkeys/malicious_ergo/readme.md b/keyboards/cannonkeys/malicious_ergo/readme.md
index 2103fe04db..72cb963070 100644
--- a/keyboards/cannonkeys/malicious_ergo/readme.md
+++ b/keyboards/cannonkeys/malicious_ergo/readme.md
@@ -13,6 +13,6 @@ 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 `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/cannonkeys/nearfield/readme.md b/keyboards/cannonkeys/nearfield/readme.md
index ea63a5f221..fca9388ce7 100644
--- a/keyboards/cannonkeys/nearfield/readme.md
+++ b/keyboards/cannonkeys/nearfield/readme.md
@@ -26,6 +26,6 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the top left key and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index ef4123770d..615ad1d056 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* LSE clock */
diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c
index e52edd90fa..690d72055a 100644
--- a/keyboards/capsunlocked/cu75/cu75.c
+++ b/keyboards/capsunlocked/cu75/cu75.c
@@ -91,7 +91,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         reset_keyboard_kb();
     } else {
     }
diff --git a/keyboards/carbo65/config.h b/keyboards/carbo65/config.h
index 2e547604d1..dfbd4db1ac 100644
--- a/keyboards/carbo65/config.h
+++ b/keyboards/carbo65/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */
diff --git a/keyboards/clueboard/66/rev4/mine/keymap.c b/keyboards/clueboard/66/rev4/mine/keymap.c
deleted file mode 100644
index df145eb488..0000000000
--- a/keyboards/clueboard/66/rev4/mine/keymap.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* THIS FILE WAS GENERATED!
- *
- * This file was generated by qmk json2c. You may or may not want to
- * edit it directly.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_SPC, KC_HENK, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-	[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
-	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
-};
diff --git a/keyboards/emery65/config.h b/keyboards/emery65/config.h
index 2e547604d1..dfbd4db1ac 100644
--- a/keyboards/emery65/config.h
+++ b/keyboards/emery65/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */
diff --git a/keyboards/feker/ik75/readme.md b/keyboards/feker/ik75/readme.md
index ed88e6123e..e533f4a200 100644
--- a/keyboards/feker/ik75/readme.md
+++ b/keyboards/feker/ik75/readme.md
@@ -22,4 +22,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB
-* **Keycode in layout**: Press the key mapped to RESET if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/fjlabs/avalon/readme.md b/keyboards/fjlabs/avalon/readme.md
index 30e2c49044..154f48ac6c 100644
--- a/keyboards/fjlabs/avalon/readme.md
+++ b/keyboards/fjlabs/avalon/readme.md
@@ -16,4 +16,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
\ No newline at end of file
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/foostan/cornelius/readme.md b/keyboards/foostan/cornelius/readme.md
index ffd6b60a16..ce0854dd75 100644
--- a/keyboards/foostan/cornelius/readme.md
+++ b/keyboards/foostan/cornelius/readme.md
@@ -16,6 +16,6 @@ Flashing example for this keyboard:
 
     make foostan/cornelius:default:flash
 
-The board reset into bootloader mode via either the reset button (on the back of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+The board reset into bootloader mode via either the reset button (on the back of the PCB) or a configured `QK_BOOT` shortcut (which may vary depending on when the PCB was flashed).
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/hand88/config.h b/keyboards/hand88/config.h
index 78e7dadc9b..cb2c25cb8f 100755
--- a/keyboards/hand88/config.h
+++ b/keyboards/hand88/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index 755fa5b6c0..bedeb157be 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* RGB Light */
diff --git a/keyboards/handwired/dactyl/readme.md b/keyboards/handwired/dactyl/readme.md
index 698ef29e01..e99df7f5a2 100644
--- a/keyboards/handwired/dactyl/readme.md
+++ b/keyboards/handwired/dactyl/readme.md
@@ -21,7 +21,7 @@ To flash the firmware:
   - Load the .hex file into it.
 
   - Put the Teensy in firmware-loading mode:
-    * If your current layout has a RESET key, press it.
+    * If your current layout has a `QK_BOOT` key, press it.
     * If you lack a RESET key, press the reset button on the Teensy board itself.
 
   - Click the button in the Teensy app to download the firmware.
@@ -35,5 +35,5 @@ To flash with ´teensy-loader-cli´:
   - If you like, you can do both at once: `make handwired/dactyl:<keymapname>:teensy`
 
   - Put the Teensy in firmware-loading mode:
-    * If your current layout has a RESET key, press it.
+    * If your current layout has a `QK_BOOT` key, press it.
     * If you lack a RESET key, press the reset button on the Teensy board itself.
diff --git a/keyboards/idobao/id80/v1/readme.md b/keyboards/idobao/id80/v1/readme.md
index 9be4dffeae..c9c446e1b7 100644
--- a/keyboards/idobao/id80/v1/readme.md
+++ b/keyboards/idobao/id80/v1/readme.md
@@ -24,4 +24,4 @@ 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 `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/idobao/id80/v2/readme.md b/keyboards/idobao/id80/v2/readme.md
index 11d9856913..333de28523 100644
--- a/keyboards/idobao/id80/v2/readme.md
+++ b/keyboards/idobao/id80/v2/readme.md
@@ -38,4 +38,4 @@ 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 `RESET` if it is available *(default is [Fn]+[Esc])*
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available *(default is [Fn]+[Esc])*
diff --git a/keyboards/jacky_studio/s7_elephant/readme.md b/keyboards/jacky_studio/s7_elephant/readme.md
index 1cfeefb209..7e441ac8ea 100644
--- a/keyboards/jacky_studio/s7_elephant/readme.md
+++ b/keyboards/jacky_studio/s7_elephant/readme.md
@@ -15,6 +15,6 @@ Make example for this keyboard (after setting up your build environment):
     make jacky_studio/s7_elephant/rev1:default # 2018 run
     make jacky_studio/s7_elephant/rev2:default # 2019 run
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/jacky_studio/s7_elephant/rev1/readme.md b/keyboards/jacky_studio/s7_elephant/rev1/readme.md
index 702be4c3a7..8308f60f62 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/readme.md
+++ b/keyboards/jacky_studio/s7_elephant/rev1/readme.md
@@ -12,6 +12,6 @@ Make example for this keyboard (after setting up your build environment):
 
     make s7_elephant/rev1:default
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/kegen/gboy/readme.md b/keyboards/kegen/gboy/readme.md
index 942d50d308..25ca760ff4 100644
--- a/keyboards/kegen/gboy/readme.md
+++ b/keyboards/kegen/gboy/readme.md
@@ -25,4 +25,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/lazydesigners/bolt/readme.md b/keyboards/lazydesigners/bolt/readme.md
index d89bca097e..4d759ea706 100644
--- a/keyboards/lazydesigners/bolt/readme.md
+++ b/keyboards/lazydesigners/bolt/readme.md
@@ -16,6 +16,6 @@ Flashing example for this keyboard:
 
     make lazydesigners/bolt:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/lazydesigners/cassette8/readme.md b/keyboards/lazydesigners/cassette8/readme.md
index 7211bf5e97..b973c45037 100755
--- a/keyboards/lazydesigners/cassette8/readme.md
+++ b/keyboards/lazydesigners/cassette8/readme.md
@@ -16,6 +16,6 @@ Flashing example for this keyboard:
 
     make lazydesigners/cassette8:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/lazydesigners/dimple/readme.md b/keyboards/lazydesigners/dimple/readme.md
index 2e15cec2b9..b6e59272d6 100644
--- a/keyboards/lazydesigners/dimple/readme.md
+++ b/keyboards/lazydesigners/dimple/readme.md
@@ -21,6 +21,6 @@ Make example for this keyboard (after setting up your build environment):
     make lazydesigners/dimple/staggered/rev2:default
     make lazydesigners/dimple/ortho:default
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/lazydesigners/dimpleplus/readme.md b/keyboards/lazydesigners/dimpleplus/readme.md
index fc5881cdc1..78db492427 100644
--- a/keyboards/lazydesigners/dimpleplus/readme.md
+++ b/keyboards/lazydesigners/dimpleplus/readme.md
@@ -14,6 +14,6 @@ Flashing example for this keyboard:
 
     make lazydesigners/dimpleplus:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/lazydesigners/the40/readme.md b/keyboards/lazydesigners/the40/readme.md
index e618967561..2b0a163628 100644
--- a/keyboards/lazydesigners/the40/readme.md
+++ b/keyboards/lazydesigners/the40/readme.md
@@ -21,6 +21,6 @@ Flashing example for this keyboard:
 
     make lazydesigners/the40:default:flash
 
-**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/lazydesigners/the50/readme.md b/keyboards/lazydesigners/the50/readme.md
index d90dc59de6..5b9e7c7bf7 100644
--- a/keyboards/lazydesigners/the50/readme.md
+++ b/keyboards/lazydesigners/the50/readme.md
@@ -12,6 +12,6 @@ Make example for this keyboard (after setting up your build environment):
 
     make lazydesigners/the50:default:dfu
 
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
+To enter the bootloader, either short the pins on the PCB or the `QK_BOOT` key on the FN layer.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/lazydesigners/the60/rev2/readme.md b/keyboards/lazydesigners/the60/rev2/readme.md
index 2c01cee1d8..12f51a06af 100755
--- a/keyboards/lazydesigners/the60/rev2/readme.md
+++ b/keyboards/lazydesigners/the60/rev2/readme.md
@@ -16,6 +16,6 @@
 
      make lazydesigners/the60/rev2:default:flash
 
- **Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+ **Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the `QK_BOOT` key on the FN layer.
 
  See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
index 86573ce17f..7326e812ec 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
@@ -6,7 +6,7 @@
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         reset_keyboard_kb();
     } else {
     }
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 96fe96f03f..54a2b45840 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -127,7 +127,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
         clicking_notes(click_hz, click_time);
     }
 
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         reset_keyboard_kb();
     }
 
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index 17eeeeffe8..553c66da6d 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -109,7 +109,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         reset_keyboard_kb();
     } else {
     }
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index 8819d3465a..ac6b0533b4 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -115,7 +115,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         reset_keyboard_kb();
     } else {
     }
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index 9b34eff1c3..9e78107eca 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -74,7 +74,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         reset_keyboard_kb();
     } else {
     }
diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h
index aea771f623..0f4e2c8629 100644
--- a/keyboards/loki65/config.h
+++ b/keyboards/loki65/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */
diff --git a/keyboards/mechlovin/zed65/readme.md b/keyboards/mechlovin/zed65/readme.md
index 3dc4b4cf67..7da1e7c365 100644
--- a/keyboards/mechlovin/zed65/readme.md
+++ b/keyboards/mechlovin/zed65/readme.md
@@ -22,4 +22,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/mechlovin/zed65/retro66/readme.md b/keyboards/mechlovin/zed65/retro66/readme.md
index 5533020662..af568441d7 100644
--- a/keyboards/mechlovin/zed65/retro66/readme.md
+++ b/keyboards/mechlovin/zed65/retro66/readme.md
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/mechlovin/zed65/wearhaus66/readme.md b/keyboards/mechlovin/zed65/wearhaus66/readme.md
index a1ede033dd..c3f46ae76d 100644
--- a/keyboards/mechlovin/zed65/wearhaus66/readme.md
+++ b/keyboards/mechlovin/zed65/wearhaus66/readme.md
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **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
diff --git a/keyboards/mnk1800s/config.h b/keyboards/mnk1800s/config.h
index 49cae28b57..e0f17b50a0 100755
--- a/keyboards/mnk1800s/config.h
+++ b/keyboards/mnk1800s/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
diff --git a/keyboards/mnk50/config.h b/keyboards/mnk50/config.h
index 5458dc44a8..ef36c3422e 100755
--- a/keyboards/mnk50/config.h
+++ b/keyboards/mnk50/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
diff --git a/keyboards/mnk75/config.h b/keyboards/mnk75/config.h
index 1e64e8074e..67d5f857c5 100755
--- a/keyboards/mnk75/config.h
+++ b/keyboards/mnk75/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index e2e163f116..927c88925e 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -320,7 +320,7 @@ bool music_mask_kb(uint16_t keycode) {
         case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
         case AU_ON ... MUV_DE:
-        case RESET:
+        case QK_BOOT:
         case EEP_RST:
             return false;
         default:
diff --git a/keyboards/nasu/config.h b/keyboards/nasu/config.h
index ec0a22a9a6..01fe94ceb1 100644
--- a/keyboards/nasu/config.h
+++ b/keyboards/nasu/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index 6e7ef460e5..ac29777841 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -127,7 +127,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     }
 
     switch (keycode) {
-        case RESET:
+        case QK_BOOT:
             if (record->event.pressed) {
                 set_bitc_LED(LED_DIM);
                 rgblight_disable_noeeprom();
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 2dcf2f63b3..25dfe9adfb 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -322,7 +322,7 @@ bool music_mask_kb(uint16_t keycode) {
     case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
     case QK_MOD_TAP ... QK_MOD_TAP_MAX:
     case AU_ON ... MUV_DE:
-    case RESET:
+    case QK_BOOT:
     case EEP_RST:
         return false;
     default:
diff --git a/keyboards/plywrks/lune/keymaps/default/keymap.c b/keyboards/plywrks/lune/keymaps/default/keymap.c
index 8fb0746f43..10471fa35f 100644
--- a/keyboards/plywrks/lune/keymaps/default/keymap.c
+++ b/keyboards/plywrks/lune/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL,          KC_LALT, KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                                              KC_RCTL
     ),
     [1] = LAYOUT_all(
-        RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
+        QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
         KC_HOME, _______, _______, KC_UP,   _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
         KC_END,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/plywrks/lune/keymaps/via/keymap.c b/keyboards/plywrks/lune/keymaps/via/keymap.c
index b2a7abb603..f5b11f210a 100644
--- a/keyboards/plywrks/lune/keymaps/via/keymap.c
+++ b/keyboards/plywrks/lune/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL,          KC_LALT, KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                                              KC_RCTL
     ),
     [1] = LAYOUT_all(
-        RESET,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
+        QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_DEL,
         KC_HOME, _______, _______, KC_UP,   _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
         KC_END,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/protozoa/cassini/config.h b/keyboards/protozoa/cassini/config.h
index 991a33db40..2c95c7be2a 100644
--- a/keyboards/protozoa/cassini/config.h
+++ b/keyboards/protozoa/cassini/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index d967a03c31..0e6e47ba0d 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -288,7 +288,7 @@ lookup_table_t lookup_table[334] =
  {"KC_LT", KC_LT},
  {"KC_GT", KC_GT},
  {"KC_QUES", KC_QUES},
- {"RESET", RESET},
+ {"RESET", QK_BOOT},
  {"DEBUG", DEBUG},
  {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},
  {"KC_GESC", KC_GESC},
diff --git a/keyboards/soda/cherish/readme.md b/keyboards/soda/cherish/readme.md
index d30ea11e4c..9a22e635b2 100644
--- a/keyboards/soda/cherish/readme.md
+++ b/keyboards/soda/cherish/readme.md
@@ -25,6 +25,6 @@ qmk compile -kb soda/cherish -km via
 Enter the bootloader in 2 ways:
 
 * **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset]  on the back of the PCB
-* **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
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 6a2ac596fb..97623f0ff0 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* LSE clock */
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Setting up 400KHz I2C Clock for a 48MHz system clock */
diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c
index 74288edf03..fd780f6fee 100644
--- a/keyboards/system76/launch_1/launch_1.c
+++ b/keyboards/system76/launch_1/launch_1.c
@@ -182,7 +182,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     }
 
     switch (keycode) {
-        case RESET:
+        case QK_BOOT:
             if (record->event.pressed) {
                 system76_ec_unlock();
             }
diff --git a/keyboards/w1_at/config.h b/keyboards/w1_at/config.h
index 884b292447..e04d3b15ef 100644
--- a/keyboards/w1_at/config.h
+++ b/keyboards/w1_at/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* Indicator LEDs */
diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 1d4d028e9f..3909c3e5e2 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -18,7 +18,7 @@
 
 #include "config_common.h"
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* key matrix size */
diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h
index 6d0bf729ac..51ccf743a0 100644
--- a/keyboards/westm/westm9/config.h
+++ b/keyboards/westm/westm9/config.h
@@ -18,7 +18,7 @@
 
 #include "config_common.h"
 
-/* Ensure we jump to bootloader if the RESET keycode was pressed */
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 /* key matrix size */
diff --git a/keyboards/woodkeys/meira/meira.c b/keyboards/woodkeys/meira/meira.c
index e900fd0dd6..87a6d11b4e 100644
--- a/keyboards/woodkeys/meira/meira.c
+++ b/keyboards/woodkeys/meira/meira.c
@@ -79,7 +79,7 @@ void matrix_scan_kb(void)
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     // Test code that turns on the switch led for the key that is pressed
     // set_backlight_by_keymap(record->event.key.col, record->event.key.row);
-    if (keycode == RESET) {
+    if (keycode == QK_BOOT) {
         reset_keyboard_kb();
     } else {
     }
diff --git a/keyboards/yoichiro/lunakey_pico/readme.md b/keyboards/yoichiro/lunakey_pico/readme.md
index cb565220af..9017ad9d36 100644
--- a/keyboards/yoichiro/lunakey_pico/readme.md
+++ b/keyboards/yoichiro/lunakey_pico/readme.md
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

From f27c70fffcde0d903e8dd25ec3721877ab0886fd Mon Sep 17 00:00:00 2001
From: Tim Traversy <timtrav@gmail.com>
Date: Sat, 3 Sep 2022 10:47:20 -0400
Subject: [PATCH 300/959] Add absolute key positions to microdox info.json
 (#18238)

---
 keyboards/boardsource/microdox/info.json | 70 ++++++++++++------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/keyboards/boardsource/microdox/info.json b/keyboards/boardsource/microdox/info.json
index 37f190d42d..c61ae23048 100644
--- a/keyboards/boardsource/microdox/info.json
+++ b/keyboards/boardsource/microdox/info.json
@@ -28,42 +28,42 @@
   "layouts": {
     "LAYOUT_split_3x5_3": {
       "layout": [
-        { "matrix": [0, 0], "x": 0, "y": 0 },
-        { "matrix": [0, 1], "x": 1, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 0.375 },
+        { "matrix": [0, 1], "x": 1, "y": 0.125 },
         { "matrix": [0, 2], "x": 2, "y": 0 },
-        { "matrix": [0, 3], "x": 3, "y": 0 },
-        { "matrix": [0, 4], "x": 4, "y": 0 },
-        { "matrix": [4, 4], "x": 5, "y": 0 },
-        { "matrix": [4, 3], "x": 6, "y": 0 },
-        { "matrix": [4, 2], "x": 7, "y": 0 },
-        { "matrix": [4, 1], "x": 8, "y": 0 },
-        { "matrix": [4, 0], "x": 9, "y": 0 },
-        { "matrix": [1, 0], "x": 10, "y": 0 },
-        { "matrix": [1, 1], "x": 11, "y": 0 },
-        { "matrix": [1, 2], "x": 12, "y": 0 },
-        { "matrix": [1, 3], "x": 13, "y": 0 },
-        { "matrix": [1, 4], "x": 14, "y": 0 },
-        { "matrix": [5, 4], "x": 15, "y": 0 },
-        { "matrix": [5, 3], "x": 16, "y": 0 },
-        { "matrix": [5, 2], "x": 17, "y": 0 },
-        { "matrix": [5, 1], "x": 18, "y": 0 },
-        { "matrix": [5, 0], "x": 19, "y": 0 },
-        { "matrix": [2, 0], "x": 20, "y": 0 },
-        { "matrix": [2, 1], "x": 21, "y": 0 },
-        { "matrix": [2, 2], "x": 22, "y": 0 },
-        { "matrix": [2, 3], "x": 23, "y": 0 },
-        { "matrix": [2, 4], "x": 24, "y": 0 },
-        { "matrix": [6, 4], "x": 25, "y": 0 },
-        { "matrix": [6, 3], "x": 26, "y": 0 },
-        { "matrix": [6, 2], "x": 27, "y": 0 },
-        { "matrix": [6, 1], "x": 28, "y": 0 },
-        { "matrix": [6, 0], "x": 29, "y": 0 },
-        { "matrix": [3, 2], "x": 30, "y": 0 },
-        { "matrix": [3, 3], "x": 31, "y": 0 },
-        { "matrix": [3, 4], "x": 32, "y": 0 },
-        { "matrix": [7, 4], "x": 33, "y": 0 },
-        { "matrix": [7, 3], "x": 34, "y": 0 },
-        { "matrix": [7, 2], "x": 35, "y": 0 }
+        { "matrix": [0, 3], "x": 3, "y": 0.125 },
+        { "matrix": [0, 4], "x": 4, "y": 0.375 },
+        { "matrix": [4, 4], "x": 7, "y": 0.375 },
+        { "matrix": [4, 3], "x": 8, "y": 0.125 },
+        { "matrix": [4, 2], "x": 9, "y": 0 },
+        { "matrix": [4, 1], "x": 10, "y": 0.125 },
+        { "matrix": [4, 0], "x": 11, "y": 0.375 },
+        { "matrix": [1, 0], "x": 0, "y": 1.375 },
+        { "matrix": [1, 1], "x": 1, "y": 1.125 },
+        { "matrix": [1, 2], "x": 2, "y": 1 },
+        { "matrix": [1, 3], "x": 3, "y": 1.125 },
+        { "matrix": [1, 4], "x": 4, "y": 1.375 },
+        { "matrix": [5, 4], "x": 7, "y": 1.375 },
+        { "matrix": [5, 3], "x": 8, "y": 1.125 },
+        { "matrix": [5, 2], "x": 9, "y": 1 },
+        { "matrix": [5, 1], "x": 10, "y": 1.125 },
+        { "matrix": [5, 0], "x": 11, "y": 1.375 },
+        { "matrix": [2, 0], "x": 0, "y": 2.375 },
+        { "matrix": [2, 1], "x": 1, "y": 2.125 },
+        { "matrix": [2, 2], "x": 2, "y": 2 },
+        { "matrix": [2, 3], "x": 3, "y": 2.125 },
+        { "matrix": [2, 4], "x": 4, "y": 2.375 },
+        { "matrix": [6, 4], "x": 7, "y": 2.375 },
+        { "matrix": [6, 3], "x": 8, "y": 2.125 },
+        { "matrix": [6, 2], "x": 9, "y": 2 },
+        { "matrix": [6, 1], "x": 10, "y": 2.125 },
+        { "matrix": [6, 0], "x": 11, "y": 2.375 },
+        { "matrix": [3, 2], "x": 2, "y": 4 },
+        { "matrix": [3, 3], "x": 3, "y": 4.125},
+        { "matrix": [3, 4], "x": 4, "y": 4.375 },
+        { "matrix": [7, 4], "x": 7, "y": 4.375 },
+        { "matrix": [7, 3], "x": 8, "y": 4.125 },
+        { "matrix": [7, 2], "x": 9, "y": 4 }
       ]
     }
   }

From 0c76a3c7d0a3d353c06956760b2ccdb16df98390 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Sun, 4 Sep 2022 01:21:00 +1000
Subject: [PATCH 301/959] [Keyboard] Add IDOBAO Abacus ID42 Keyboard (#16923)

by vinorodrigues
---
 keyboards/idobao/id42/config.h                |  76 +++++++++++
 keyboards/idobao/id42/id42.c                  |  45 +++++++
 keyboards/idobao/id42/id42.h                  |   6 +
 keyboards/idobao/id42/info.json               |  80 ++++++++++++
 .../idobao/id42/keymaps/default/keymap.c      | 114 +++++++++++++++++
 keyboards/idobao/id42/keymaps/idobao/keymap.c | 119 ++++++++++++++++++
 keyboards/idobao/id42/keymaps/idobao/rules.mk |   3 +
 keyboards/idobao/id42/keymaps/via/keymap.c    |  82 ++++++++++++
 keyboards/idobao/id42/keymaps/via/rules.mk    |   3 +
 keyboards/idobao/id42/readme.md               |  35 ++++++
 keyboards/idobao/id42/rules.mk                |   5 +
 11 files changed, 568 insertions(+)
 create mode 100755 keyboards/idobao/id42/config.h
 create mode 100755 keyboards/idobao/id42/id42.c
 create mode 100755 keyboards/idobao/id42/id42.h
 create mode 100644 keyboards/idobao/id42/info.json
 create mode 100644 keyboards/idobao/id42/keymaps/default/keymap.c
 create mode 100644 keyboards/idobao/id42/keymaps/idobao/keymap.c
 create mode 100644 keyboards/idobao/id42/keymaps/idobao/rules.mk
 create mode 100644 keyboards/idobao/id42/keymaps/via/keymap.c
 create mode 100644 keyboards/idobao/id42/keymaps/via/rules.mk
 create mode 100644 keyboards/idobao/id42/readme.md
 create mode 100755 keyboards/idobao/id42/rules.mk

diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h
new file mode 100755
index 0000000000..ca26f503c0
--- /dev/null
+++ b/keyboards/idobao/id42/config.h
@@ -0,0 +1,76 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* Other settings */
+
+/* NKRO by default is required to be turned on. This forces it on
+   during keyboard startup regardless of EEPROM setting. */
+#define FORCE_NKRO
+
+/* Change the USB polling rate [default = 1000Hz (1ms)] and
+ * use larger value of keys per scan for elite games */
+#define USB_POLLING_INTERVAL_MS  2  // 500Hz
+#define QMK_KEYS_PER_SCAN  12
+
+/* LED Matrix & Animations */
+#ifdef RGB_MATRIX_ENABLE
+
+    #define RGB_DI_PIN B3
+    #define DRIVER_LED_TOTAL 42
+
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
+
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+
+    #define RGB_MATRIX_KEYPRESSES              // enable key press effects
+
+    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
+    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
+    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
+    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
+
+    /* #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) */
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+    /* #endif  // RGB_MATRIX_KEYPRESSES | RGB_MATRIX_KEYRELEASES */
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id42/id42.c b/keyboards/idobao/id42/id42.c
new file mode 100755
index 0000000000..ea3dccdfed
--- /dev/null
+++ b/keyboards/idobao/id42/id42.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "id42.h"
+
+#define __ NO_LED
+
+#ifdef RGB_MATRIX_ENABLE
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │41 │40 │39 │38 │37 │36 │35 │34 │33 │32 │31 │30 │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │ 29 │28 │27 │26 │25 │24 │23 │22 │21 │20 │  19  │
+ * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+ * │ 18  │17 │16 │15 │14 │13 │12 │11 │ 10  │ 9 │ 8 │
+ * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+ * │ 7  │ 6 │ 5  │    4    │    3    │ │ 2 │ 1 │ 0 │
+ * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+ */
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    // WS2812 LED strings are addressed from 0 (1st) to DRIVER_LED_TOTAL-1 (last)
+    { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30 },
+    { 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, __, 19 },
+    { 18, 17, 16, 15, 14, 13, 12, 11, 10, __, 9,  8  },
+    { 7,  6,  5,  4,  __, __, 3,  __, __, 2,  1,  0  }
+}, {
+    // LED Index to Physical Position
+    // **NB**: Reversed order
+    // Generated from: https://xelus.netlify.app/guides/KLE_to_RGB_parser
+    {224,64 }, {204,64 }, {183,64 },                       {135,64 },                       { 84,64 }, { 48,64 }, { 25,64 }, {  3,64 },
+    {224,43 }, {204,43 },            {181,43 }, {158,43 }, {137,43 }, {117,43 }, { 97,43 }, { 76,43 }, { 56,43 }, { 36,43 }, {  8,43 },
+    {216,21 },            {188,21 }, {168,21 }, {148,21 }, {127,21 }, {107,21 }, { 87,21 }, { 66,21 }, { 46,21 }, { 25,21 }, {  3,21 },
+    {224,0  }, {204,0  }, {183,0  }, {163,0  }, {143,0  }, {122,0  }, {102,0  }, { 81,0  }, { 61,0  }, { 41,0  }, { 20,0  }, {  0,0  }
+}, {
+    // LED Index to Flag
+    // **NB**: Reversed order
+    4, 4, 4,       4,       4, 4, 4, 4,
+    4, 4,    4, 1, 1, 1, 1, 1, 1, 1, 4,
+    4,    1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
+    4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4
+} };
+
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id42/id42.h b/keyboards/idobao/id42/id42.h
new file mode 100755
index 0000000000..d9bef6d021
--- /dev/null
+++ b/keyboards/idobao/id42/id42.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json
new file mode 100644
index 0000000000..8e9029b04e
--- /dev/null
+++ b/keyboards/idobao/id42/info.json
@@ -0,0 +1,80 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "Abacus ID42",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
+        "rows": ["D5", "C6", "B6", "E6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID42*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0042",
+        "device_version": "1.0.0"
+      },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
+                { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 },
+                { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 },
+                { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 },
+                { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 },
+                { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 },
+                { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 },
+                { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 },
+                { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 },
+                { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 },
+                { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 },
+                { "matrix": [0, 11], "label": "BSpc", "x": 11, "y": 0 },
+
+                { "matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
+                { "matrix": [1, 1], "label": "A", "x": 1.25, "y": 1 },
+                { "matrix": [1, 2], "label": "S", "x": 2.25, "y": 1 },
+                { "matrix": [1, 3], "label": "D", "x": 3.25, "y": 1 },
+                { "matrix": [1, 4], "label": "F", "x": 4.25, "y": 1 },
+                { "matrix": [1, 5], "label": "G", "x": 5.25, "y": 1 },
+                { "matrix": [1, 6], "label": "H", "x": 6.25, "y": 1 },
+                { "matrix": [1, 7], "label": "J", "x": 7.25, "y": 1 },
+                { "matrix": [1, 8], "label": "K", "x": 8.25, "y": 1 },
+                { "matrix": [1, 9], "label": "L", "x": 9.25, "y": 1 },
+                { "matrix": [1, 11], "label": "Ent", "x": 10.25, "y": 1, "w": 1.75 },
+
+                { "matrix": [2, 0], "label": "Shft", "x": 0, "y": 2, "w": 1.75 },
+                { "matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "label": "X", "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "label": "C", "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "label": "V", "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "label": "B", "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "label": "N", "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "label": "M", "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "label": "Shft", "x": 8.75, "y": 2, "w": 1.25 },
+                { "matrix": [2, 10], "label": "\u21E7", "x": 10, "y": 2 },
+                { "matrix": [2, 11], "label": "Del", "x": 11, "y": 2 },
+
+                { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
+                { "matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "label": "Alt", "x": 2.25, "y": 3, "w": 1.25 },
+                { "matrix": [3, 3], "label": "", "x": 3.5, "y": 3, "w": 2.75 },
+                { "matrix": [3, 6], "label": "Fn", "x": 6.25, "y": 3, "w": 2.75 },
+                { "matrix": [3, 9], "label": "\u21E6", "x": 9, "y": 3 },
+                { "matrix": [3, 10], "label": "\u21E9", "x": 10, "y": 3 },
+                { "matrix": [3, 11], "label": "\u21E8", "x": 11, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id42/keymaps/default/keymap.c b/keyboards/idobao/id42/keymaps/default/keymap.c
new file mode 100644
index 0000000000..bce2096ea5
--- /dev/null
+++ b/keyboards/idobao/id42/keymaps/default/keymap.c
@@ -0,0 +1,114 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    FN_MO13 = SAFE_RANGE,
+    FN_MO23,
+};
+
+// more Layer Tap stuff
+#define SPC_FN1 LT(1, KC_SPC)
+#define SPC_FN2 LT(2, KC_SPC)
+#define SPC_FN3 LT(3, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Layer 1
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │BSp│
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ Tab│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Entr │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │ Sft │ Z │ X │ C │ V │ B │ N │ M │ Sft │ ↑ │Del│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │Ctrl│Win│ Alt│Space/Fn2│ Fn1/Fn3 │ │ ← │ ↓ │ → │
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_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_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,          SPC_FN2,          FN_MO13,                   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    /* Layer 2
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │   │   │   │   │-_ │=+ │[{ │]} │\| │  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │   │   │;: │'" │,< │.> │/? │  ▿  │PUp│Ins│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │   Fn3   │    ▿    │ │Hom│Pdn│End│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,          _______,
+        _______,          XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_COMM, KC_DOT,  KC_SLSH, _______, KC_PGUP, KC_INS,
+        _______, _______, _______,          MO(3),            _______,                   KC_HOME, KC_PGDN, KC_END
+    ),
+
+    /* Layer 3
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │   │   │   │   │F11│F12│Psc│SLk│Pau│  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │   │   │   │   │   │   │   │Menu │Vl+│Mut│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │    ▿    │    ▿    │ │Sto│Vl-│Ply│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  KC_VOLU, KC_MUTE,
+        KC_RCTL, KC_RGUI, KC_RALT,          _______,          _______,                   KC_MSTP, KC_VOLD, KC_MPLY
+    ),
+
+    /* Layer 4
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ▿ │   │   │   │Rst│   │   │   │   │   │   │ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │Tog│Mod│Hu-│Hu+│St-│St+│   │   │   │  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │mod│   │   │   │   │NRO│   │     │Br+│   │
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │    ▿    │    ▿    │ │Sp-│Br-│Sp+│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [3] = LAYOUT(
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX,          _______,
+        _______,         RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX,
+        _______, _______, _______,          _______,          _______,                   RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case FN_MO13:
+            if (record->event.pressed) {
+                layer_on(1);
+                update_tri_layer(1, 2, 3);
+            } else {
+                layer_off(1);
+                update_tri_layer(1, 2, 3);
+            }
+            return false;
+            break;
+        case FN_MO23:
+            if (record->event.pressed) {
+                layer_on(2);
+                update_tri_layer(1, 2, 3);
+            } else {
+                layer_off(2);
+                update_tri_layer(1, 2, 3);
+            }
+            return false;
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/idobao/id42/keymaps/idobao/keymap.c b/keyboards/idobao/id42/keymaps/idobao/keymap.c
new file mode 100644
index 0000000000..6a52c476ca
--- /dev/null
+++ b/keyboards/idobao/id42/keymaps/idobao/keymap.c
@@ -0,0 +1,119 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* ------------------------------------------------------------------
+ * This is the IDOBAO factory default keymap ;)
+ * ------------------------------------------------------------------ */
+
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+enum {
+    KB_VRSN = USER09   // debug, type version
+};
+
+#define SPC_FN1 LT(1, KC_SPC)
+#define SPC_FN2 LT(2, KC_SPC)
+#define SPC_FN3 LT(3, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Layer 0
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │BSp│
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ Tab│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Entr │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │ Sft │ Z │ X │ C │ V │ B │ N │ M │ Sft │ ↑ │Del│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │Ctrl│Win│ Alt│Space/Fn2│ Fn1/Fn3 │ │ ← │ ↓ │ → │
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_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_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,          SPC_FN2,          FN_MO13,                   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    /* Layer 1
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │   │   │   │   │-_ │=+ │[{ │]} │\| │  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │   │   │;: │'" │,< │.> │/? │  ▿  │PUp│Ins│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │   Fn3   │    ▿    │ │Hom│Pdn│End│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,          _______,
+        _______,          XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_COMM, KC_DOT,  KC_SLSH, _______, KC_PGUP, KC_INS,
+        _______, _______, _______,          MO(3),            _______,                   KC_HOME, KC_PGDN, KC_END
+    ),
+
+    /* Layer 2
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │   │   │   │   │F11│F12│Psc│SLk│Pau│  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │   │   │   │   │   │   │   │Menu │Vl+│Mut│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │    ▿    │    ▿    │ │Sto│Vl-│Ply│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  KC_VOLU, KC_MUTE,
+        KC_RCTL, KC_RGUI, KC_RALT,          _______,          _______,                   KC_MSTP, KC_VOLD, KC_MPLY
+    ),
+
+    /* Layer 3
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ▿ │   │   │   │Rst│   │   │   │   │   │   │ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │Tog│Mod│Hu-│Hu+│St-│St+│   │   │   │  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │mod│   │   │Ver│   │NRO│   │     │Br+│   │
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │    ▿    │    ▿    │ │Sp-│Br-│Sp+│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [3] = LAYOUT(
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX,          _______,
+        _______,         RGB_RMOD, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX,
+        _______, _______, _______,          _______,          _______,                   RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+
+        #ifdef RGB_MATRIX_ENABLE
+
+        case QK_BOOT:
+            if (record->event.pressed) {
+                rgb_matrix_set_color_all(RGB_MATRIX_MAXIMUM_BRIGHTNESS, 0, 0);  // All red
+                rgb_matrix_driver.flush();
+            }
+            return true;
+
+        #endif  // RGB_MATRIX_ENABLE
+
+        // 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/id42/keymaps/idobao/rules.mk b/keyboards/idobao/id42/keymaps/idobao/rules.mk
new file mode 100644
index 0000000000..974ef99660
--- /dev/null
+++ b/keyboards/idobao/id42/keymaps/idobao/rules.mk
@@ -0,0 +1,3 @@
+
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id42/keymaps/via/keymap.c b/keyboards/idobao/id42/keymaps/via/keymap.c
new file mode 100644
index 0000000000..590b8b54a3
--- /dev/null
+++ b/keyboards/idobao/id42/keymaps/via/keymap.c
@@ -0,0 +1,82 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define SPC_FN1 LT(1, KC_SPC)
+#define SPC_FN2 LT(2, KC_SPC)
+#define SPC_FN3 LT(3, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │BSp│
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ Tab│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Entr │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │ Sft │ Z │ X │ C │ V │ B │ N │ M │ Sft │ ↑ │Del│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │Ctrl│Win│ Alt│Space/Fn2│ Fn1/Fn3 │ │ ← │ ↓ │ → │
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_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_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,          SPC_FN2,          FN_MO13,                   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │   │   │   │   │-_ │=+ │[{ │]} │\| │  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │   │   │;: │'" │,< │.> │/? │  ▿  │PUp│Ins│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │   Fn3   │    ▿    │ │Hom│Pdn│End│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,          _______,
+        _______,          XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_COMM, KC_DOT,  KC_SLSH, _______, KC_PGUP, KC_INS,
+        _______, _______, _______,          MO(3),            _______,                   KC_HOME, KC_PGDN, KC_END
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │   │   │   │   │F11│F12│Psc│SLk│Pau│  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │   │   │   │   │   │   │   │Menu │Vl+│Mut│
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │    ▿    │    ▿    │ │Sto│Vl-│Ply│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  KC_VOLU, KC_MUTE,
+        KC_RCTL, KC_RGUI, KC_RALT,          _______,          _______,                   KC_MSTP, KC_VOLD, KC_MPLY
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ▿ │   │   │   │Rst│   │   │   │   │   │   │ ▿ │
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ▿  │Tog│Mod│Hu-│Hu+│St-│St+│   │   │   │  ▿   │
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──┬┴──┬───┤
+     * │  ▿  │mod│   │   │   │   │NRO│   │     │Br+│   │
+     * ├────┬┴──┬┴───┼───┴───┴─┬─┴───┴───┼─┬───┼───┼───┤
+     * │ ▿  │ ▿ │ ▿  │    ▿    │    ▿    │ │Sp-│Br-│Sp+│
+     * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
+     */
+    [3] = LAYOUT(
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX,          _______,
+        _______,         RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX,
+        _______, _______, _______,          _______,          _______,                   RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
diff --git a/keyboards/idobao/id42/keymaps/via/rules.mk b/keyboards/idobao/id42/keymaps/via/rules.mk
new file mode 100644
index 0000000000..974ef99660
--- /dev/null
+++ b/keyboards/idobao/id42/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id42/readme.md b/keyboards/idobao/id42/readme.md
new file mode 100644
index 0000000000..5921bffca1
--- /dev/null
+++ b/keyboards/idobao/id42/readme.md
@@ -0,0 +1,35 @@
+# IDOBAO Abacus ID42
+
+![IDOBAO Abacus ID42](https://idobao.github.io/assets/img/idobao-id42.png)
+
+Sized just right at 40% — with a compact configuration the IDOBAO Abacus ID42 makes a great fit for any desk.
+
+## 42 Keys
+
+* Keyboard Maintainer: [Vino Rodrigues](https://github.com/vinorodrigues)
+* Hardware Supported: **IDOBAO Abacus ID42**
+* Hardware Availability: [IDOBAO.net](https://idobao.net/search?type=product&q=ID42*)
+
+## Layout
+
+![](https://cdn.jsdelivr.net/gh/Idobao/idobao.github.io/kle/idobao-id42-all.png)
+
+## Compiling and Flashing
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id42:default
+
+Flashing example for this keyboard:
+
+    make idobao/id42:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. <br>Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the [Esc] key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to *`RESET`* *(Default = `[Fn]`+`[R]`)* if it is available
diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk
new file mode 100755
index 0000000000..eab741fd0a
--- /dev/null
+++ b/keyboards/idobao/id42/rules.mk
@@ -0,0 +1,5 @@
+# This file intentionally left blank
+# ** settings are data driven & stored in `info.json` **
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812

From 489b287e1ff2d4140f28b17f439daa5efdef5382 Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Sun, 4 Sep 2022 01:27:00 +1000
Subject: [PATCH 302/959] [Keyboard] RS60 Rev2 change to eeprom emulation
 (#18201)

by xelus
---
 keyboards/xelus/rs60/rev1/info.json           |  2 +-
 keyboards/xelus/rs60/rev2/info.json           |  5 ---
 .../xelus/rs60/{rev2 => rev2_0}/config.h      |  0
 .../xelus/rs60/{rev2 => rev2_0}/halconf.h     |  0
 keyboards/xelus/rs60/rev2_0/info.json         |  5 +++
 .../xelus/rs60/{rev2 => rev2_0}/mcuconf.h     |  0
 keyboards/xelus/rs60/rev2_0/readme.md         | 20 +++++++++
 .../rs60/{rev2/rev2.c => rev2_0/rev2_0.c}     |  4 +-
 .../rs60/{rev2/rev2.h => rev2_0/rev2_0.h}     |  2 +-
 .../xelus/rs60/{rev2 => rev2_0}/rules.mk      |  1 -
 keyboards/xelus/rs60/rev2_1/config.h          | 45 +++++++++++++++++++
 keyboards/xelus/rs60/rev2_1/info.json         |  5 +++
 keyboards/xelus/rs60/rev2_1/readme.md         | 20 +++++++++
 .../rs60/{rev2/chconf.h => rev2_1/rev2_1.c}   | 18 +-------
 keyboards/xelus/rs60/rev2_1/rev2_1.h          | 34 ++++++++++++++
 keyboards/xelus/rs60/rev2_1/rules.mk          | 29 ++++++++++++
 keyboards/xelus/rs60/rs60.h                   |  6 ++-
 17 files changed, 168 insertions(+), 28 deletions(-)
 delete mode 100644 keyboards/xelus/rs60/rev2/info.json
 rename keyboards/xelus/rs60/{rev2 => rev2_0}/config.h (100%)
 rename keyboards/xelus/rs60/{rev2 => rev2_0}/halconf.h (100%)
 create mode 100644 keyboards/xelus/rs60/rev2_0/info.json
 rename keyboards/xelus/rs60/{rev2 => rev2_0}/mcuconf.h (100%)
 create mode 100644 keyboards/xelus/rs60/rev2_0/readme.md
 rename keyboards/xelus/rs60/{rev2/rev2.c => rev2_0/rev2_0.c} (91%)
 rename keyboards/xelus/rs60/{rev2/rev2.h => rev2_0/rev2_0.h} (97%)
 rename keyboards/xelus/rs60/{rev2 => rev2_0}/rules.mk (99%)
 create mode 100644 keyboards/xelus/rs60/rev2_1/config.h
 create mode 100644 keyboards/xelus/rs60/rev2_1/info.json
 create mode 100644 keyboards/xelus/rs60/rev2_1/readme.md
 rename keyboards/xelus/rs60/{rev2/chconf.h => rev2_1/rev2_1.c} (66%)
 create mode 100644 keyboards/xelus/rs60/rev2_1/rev2_1.h
 create mode 100644 keyboards/xelus/rs60/rev2_1/rules.mk

diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json
index 90ac25f360..cf78bc4ec7 100644
--- a/keyboards/xelus/rs60/rev1/info.json
+++ b/keyboards/xelus/rs60/rev1/info.json
@@ -1,5 +1,5 @@
 {
     "usb": {
-        "device_version": "0.0.1"
+        "device_version": "0.1.0"
     }
 }
diff --git a/keyboards/xelus/rs60/rev2/info.json b/keyboards/xelus/rs60/rev2/info.json
deleted file mode 100644
index e557e4d307..0000000000
--- a/keyboards/xelus/rs60/rev2/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    }
-}
diff --git a/keyboards/xelus/rs60/rev2/config.h b/keyboards/xelus/rs60/rev2_0/config.h
similarity index 100%
rename from keyboards/xelus/rs60/rev2/config.h
rename to keyboards/xelus/rs60/rev2_0/config.h
diff --git a/keyboards/xelus/rs60/rev2/halconf.h b/keyboards/xelus/rs60/rev2_0/halconf.h
similarity index 100%
rename from keyboards/xelus/rs60/rev2/halconf.h
rename to keyboards/xelus/rs60/rev2_0/halconf.h
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
new file mode 100644
index 0000000000..f9f8400732
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_0/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.2.0"
+    }
+}
diff --git a/keyboards/xelus/rs60/rev2/mcuconf.h b/keyboards/xelus/rs60/rev2_0/mcuconf.h
similarity index 100%
rename from keyboards/xelus/rs60/rev2/mcuconf.h
rename to keyboards/xelus/rs60/rev2_0/mcuconf.h
diff --git a/keyboards/xelus/rs60/rev2_0/readme.md b/keyboards/xelus/rs60/rev2_0/readme.md
new file mode 100644
index 0000000000..692e4a9f0d
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_0/readme.md
@@ -0,0 +1,20 @@
+# RS60 Rev2 Prototype Version
+
+60% PCB with daughterboard in collaboration with Bisoromi and Mekibo
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: RS60
+* Hardware Availability: Custom Keyboard Group Buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/rs60/rev2_0:default
+    make xelus/rs60/rev2_0:via
+
+Reset your keyboard in 3 ways:
+
+* Software reset on Fn [MO(1)] + Backspace
+* Bootmagic reset: hold down the top left key (usually escape) and plugin the keyboard
+* Physical reset button: on the back of the PCB, there should be a small golden button you can press
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/xelus/rs60/rev2/rev2.c b/keyboards/xelus/rs60/rev2_0/rev2_0.c
similarity index 91%
rename from keyboards/xelus/rs60/rev2/rev2.c
rename to keyboards/xelus/rs60/rev2_0/rev2_0.c
index f51e262ea0..d2abbda521 100644
--- a/keyboards/xelus/rs60/rev2/rev2.c
+++ b/keyboards/xelus/rs60/rev2_0/rev2_0.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 Harrison Chan (Xelus)
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * This 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,4 +13,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- #include "rev2.h"
+ #include "rev2_0.h"
diff --git a/keyboards/xelus/rs60/rev2/rev2.h b/keyboards/xelus/rs60/rev2_0/rev2_0.h
similarity index 97%
rename from keyboards/xelus/rs60/rev2/rev2.h
rename to keyboards/xelus/rs60/rev2_0/rev2_0.h
index 9b8e841de5..dd43418964 100644
--- a/keyboards/xelus/rs60/rev2/rev2.h
+++ b/keyboards/xelus/rs60/rev2_0/rev2_0.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 Harrison Chan (Xelus)
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/xelus/rs60/rev2/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk
similarity index 99%
rename from keyboards/xelus/rs60/rev2/rules.mk
rename to keyboards/xelus/rs60/rev2_0/rules.mk
index 3bf99c0be7..df66f7dd37 100644
--- a/keyboards/xelus/rs60/rev2/rules.mk
+++ b/keyboards/xelus/rs60/rev2_0/rules.mk
@@ -17,7 +17,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
 EEPROM_DRIVER = i2c
 
 # Save hid interface
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
new file mode 100644
index 0000000000..9f5925f784
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_1/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS { B15, B14, B12, B1, B0 }
+#define MATRIX_COL_PINS { B13, A7, A6, A5, A4, A3, A2, B7, B6, B5, B4, B3, A15, A14 }
+
+// COL2ROW or ROW2COL
+#define DIODE_DIRECTION COL2ROW
+
+// Set 0 if debouncing isn't needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
+
+//Indicator
+#define LED_CAPS_LOCK_PIN A1
+
+// Emulated EEPROM
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2
+
+//Force NKRO
+#define FORCE_NKRO
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
new file mode 100644
index 0000000000..79768e0009
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.2.1"
+    }
+}
diff --git a/keyboards/xelus/rs60/rev2_1/readme.md b/keyboards/xelus/rs60/rev2_1/readme.md
new file mode 100644
index 0000000000..2454fec271
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_1/readme.md
@@ -0,0 +1,20 @@
+# RS60 Rev2 Production Version
+
+60% PCB with daughterboard in collaboration with Bisoromi and Mekibo
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: RS60
+* Hardware Availability: Custom Keyboard Group Buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/rs60/rev2_1:default
+    make xelus/rs60/rev2_1:via
+
+Reset your keyboard in 3 ways:
+
+* Software reset on Fn [MO(1)] + Backspace
+* Bootmagic reset: hold down the top left key (usually escape) and plugin the keyboard
+* Physical reset button: on the back of the PCB, there should be a small golden button you can press
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/xelus/rs60/rev2/chconf.h b/keyboards/xelus/rs60/rev2_1/rev2_1.c
similarity index 66%
rename from keyboards/xelus/rs60/rev2/chconf.h
rename to keyboards/xelus/rs60/rev2_1/rev2_1.c
index a9608a4c75..dc234542b5 100644
--- a/keyboards/xelus/rs60/rev2/chconf.h
+++ b/keyboards/xelus/rs60/rev2_1/rev2_1.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 QMK
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * This 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,18 +13,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/acheron/austin/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>
+ #include "rev2_1.h"
diff --git a/keyboards/xelus/rs60/rev2_1/rev2_1.h b/keyboards/xelus/rs60/rev2_1/rev2_1.h
new file mode 100644
index 0000000000..dd43418964
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_1/rev2_1.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39,      K3B, K3C, K3D, \
+    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D }  \
+}
diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk
new file mode 100644
index 0000000000..da1f821141
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_1/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = STM32L412
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Save hid interface
+KEYBOARD_SHARED_EP = yes
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+LAYOUTS = 60_ansi_split_bs_rshift
diff --git a/keyboards/xelus/rs60/rs60.h b/keyboards/xelus/rs60/rs60.h
index 81e4470db5..5a52d37a7f 100644
--- a/keyboards/xelus/rs60/rs60.h
+++ b/keyboards/xelus/rs60/rs60.h
@@ -19,6 +19,8 @@
 
 #if defined(KEYBOARD_xelus_rs60_rev1)
     #include "rev1.h"
-#elif defined(KEYBOARD_xelus_rs60_rev2)
-    #include "rev2.h"
+#elif defined(KEYBOARD_xelus_rs60_rev2_0)
+    #include "rev2_0.h"
+#elif defined(KEYBOARD_xelus_rs60_rev2_1)
+    #include "rev2_1.h"
 #endif

From 39e611794d3ac5c0e56d4d7faaf28f930a221690 Mon Sep 17 00:00:00 2001
From: coliss86 <coliss86@users.noreply.github.com>
Date: Sat, 3 Sep 2022 19:46:42 +0200
Subject: [PATCH 303/959] [Docs] Update 'Process Record' according to the code
 (#18209)

* [doc] Update 'Process Record' according to the code

* [doc] fix link
---
 docs/understanding_qmk.md | 73 +++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/docs/understanding_qmk.md b/docs/understanding_qmk.md
index c1bcfe3ce9..ba47fc3ad3 100644
--- a/docs/understanding_qmk.md
+++ b/docs/understanding_qmk.md
@@ -71,7 +71,7 @@ At the keyboard level we define a C macro (typically named `LAYOUT()`) which map
 
 Notice how the second block of our `LAYOUT()` macro matches the Matrix Scanning array above? This macro is what will map the matrix scanning array to keycodes. However, if you look at a 17 key numpad you'll notice that it has 3 places where the matrix could have a switch but doesn't, due to larger keys. We have populated those spaces with `KC_NO` so that our keymap definition doesn't have to.
 
-You can also use this macro to handle unusual matrix layouts, for example the [Clueboard rev 2](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/keyboards/clueboard/66/rev2/rev2.h). Explaining that is outside the scope of this document.
+You can also use this macro to handle unusual matrix layouts, for example the [Alice](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/keyboards/sneakbox/aliceclone/aliceclone.h#L24). Explaining that is outside the scope of this document.
 
 ##### Keycode Assignment
 
@@ -127,39 +127,52 @@ Comparing against our keymap we can see that the pressed key is `KC_NUM`. From h
 
 The `process_record()` function itself is deceptively simple, but hidden within is a gateway to overriding functionality at various levels of QMK. The chain of events is listed below, using cluecard whenever we need to look at the keyboard/keymap level functions. Depending on options set in `rules.mk` or elsewhere, only a subset of the functions below will be included in final firmware.
 
-* [`void action_exec(keyevent_t event)`](https://github.com/qmk/qmk_firmware/blob/88fe5c16a5cdca5e3cf13ef3cd91f5f1e4898c37/quantum/action.c#L70-L131)
-    * [`void pre_process_record_quantum(keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/ed49dbeac4c0deba1c6b511ac1ce8f4c542e1b3e/quantum/quantum.c#L176-L185)
-      * [`bool process_combo(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_combo.c#L115)
-  * [`void process_record(keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/tmk_core/common/action.c#L172)
-    * [`bool process_record_quantum(keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/quantum.c#L206)
-      * [Map this record to a keycode](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/quantum.c#L226)
-      * [`void velocikey_accelerate(void)`](https://github.com/qmk/qmk_firmware/blob/c1c5922aae7b60b7c7d13d3769350eed9dda17ab/quantum/velocikey.c#L27)
-      * [`void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_tap_dance.c#L119)
-      * [`bool process_key_lock(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_key_lock.c#L62)
-      * [`bool process_clicky(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_clicky.c#L79)
-      * [`bool process_haptic(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/2cee371bf125a6ec541dd7c5a809573facc7c456/drivers/haptic/haptic.c#L216)
-      * [`bool process_record_kb(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/keyboards/clueboard/card/card.c#L20)
-        * [`bool process_record_user(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/keyboards/clueboard/card/keymaps/default/keymap.c#L58)
-      * [`bool process_midi(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_midi.c#L81)
-      * [`bool process_audio(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_audio.c#L19)
-      * [`bool process_steno(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_steno.c#L160)
-      * [`bool process_music(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_music.c#L114)
+* [`void action_exec(keyevent_t event)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/action.c#L78-L140)
+    * [`void pre_process_record_quantum(keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/quantum.c#L204)
+      * [`bool process_combo(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_combo.c#L521)
+  * [`void process_record(keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/action.c#L254)
+    * [`bool process_record_quantum(keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/quantum.c#L224)
+      * [Map this record to a keycode](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/quantum.c#L225)
+      * [`void velocikey_accelerate(void)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/velocikey.c#L27)
+      * [`void update_wpm(uint16_t keycode)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/wpm.c#L109)
+      * [`void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_tap_dance.c#L118)
+      * [`bool process_key_lock(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_key_lock.c#L64)
+      * [`bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_dynamic_macro.c#L160)
+      * [`bool process_clicky(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_clicky.c#L84)
+      * [`bool process_haptic(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_haptic.c#L87)
+      * [`bool process_record_via(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/via.c#L160)
+      * [`bool process_record_kb(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/keyboards/planck/ez/ez.c#L271)
+        * [`bool process_record_user(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/keyboards/planck/keymaps/default/keymap.c#L183)
+      * [`bool process_secure(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_secure.c#L23)
+      * [`bool process_sequencer(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_sequencer.c#L19)
+      * [`bool process_midi(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_midi.c#L75)
+      * [`bool process_audio(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_audio.c#L18)
+      * [`bool process_backlight(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_backlight.c#L25)
+      * [`bool process_steno(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_steno.c#L159)
+      * [`bool process_music(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_music.c#L103)
       * [`bool process_key_override(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/5a1b857dea45a17698f6baa7dd1b7a7ea907fb0a/quantum/process_keycode/process_key_override.c#L397)
-      * [`bool process_tap_dance(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_tap_dance.c#L141)
-      * [`bool process_unicode_common(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_unicode_common.c#L169)
+      * [`bool process_tap_dance(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_tap_dance.c#L135)
+      * [`bool process_caps_word(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_caps_word.c#L17)
+      * [`bool process_unicode_common(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_unicode_common.c#L290)
         calls one of:
-          * [`bool process_unicode(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_unicode.c#L20)
-          * [`bool process_unicodemap(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_unicodemap.c#L46)
-          * [`bool process_ucis(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_ucis.c#L95)
-      * [`bool process_leader(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_leader.c#L51)
-      * [`bool process_printer(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_printer.c#L77)
-      * [`bool process_auto_shift(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_auto_shift.c#L94)
-      * `bool process_dynamic_tapping_term(uint16_t keycode, keyrecord_t *record)`
-      * [Identify and process Quantum-specific keycodes](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/quantum.c#L291)
+          * [`bool process_unicode(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_unicode.c#L21)
+          * [`bool process_unicodemap(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_unicodemap.c#L42)
+          * [`bool process_ucis(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_ucis.c#L70)
+      * [`bool process_leader(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_leader.c#L48)
+      * [`bool process_printer(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_printer.c#L77)
+      * [`bool process_auto_shift(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_auto_shift.c#L353)
+      * [`bool process_dynamic_tapping_term(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_dynamic_tapping_term.c#L35)
+      * [`bool process_space_cadet(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_space_cadet.c#L123)
+      * [`bool process_magic(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_magic.c#L40)
+      * [`bool process_grave_esc(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_grave_esc.c#L23)
+      * [`bool process_rgb(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_rgb.c#L53)
+      * [`bool process_joystick(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_joystick.c#L9)
+      * [`bool process_programmable_button(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_programmable_button.c#L21)
+      * [Identify and process Quantum-specific keycodes](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/quantum.c#L343)
 
 At any step during this chain of events a function (such as `process_record_kb()`) can `return false` to halt all further processing.
 
-After this is called, `post_process_record()` is called, which can be used to handle additional cleanup that needs to be run after the keycode is normally handled. 
+After this is called, `post_process_record()` is called, which can be used to handle additional cleanup that needs to be run after the keycode is normally handled.
 
 * [`void post_process_record(keyrecord_t *record)`]()
   * [`void post_process_record_quantum(keyrecord_t *record)`]()
@@ -167,7 +180,7 @@ After this is called, `post_process_record()` is called, which can be used to ha
     * [`void post_process_clicky(uint16_t keycode, keyrecord_t *record)`]()
     * [`void post_process_record_kb(uint16_t keycode, keyrecord_t *record)`]()
       * [`void post_process_record_user(uint16_t keycode, keyrecord_t *record)`]()
-      
+
 <!--
 #### Mouse Handling
 

From bfec30a9feef1fecff99a5203ce69c6a3acb93cc Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 4 Sep 2022 04:44:42 +1000
Subject: [PATCH 304/959] Clean up data driven mappings syntax (#18257)

---
 data/mappings/info_config.json | 4 ++--
 data/mappings/info_rules.json  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 582b5149ea..608fe4e9ad 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -111,9 +111,9 @@
     "NO_ACTION_MACRO": {"info_key": "_invalid.no_action_macro", "invalid": true},
     "NO_ACTION_FUNCTION": {"info_key": "_invalid.no_action_function", "invalid": true},
     "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true},
-    "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true, replace_with: "DEBOUNCE"},
+    "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true, "replace_with": "DEBOUNCE"},
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
     "UNUSED_PINS": {"info_key": "_invalid.unused_pins", "deprecated": true},
     "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool", "deprecated": true},
-    "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
+    "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}
 }
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index 3f140277fe..a4da10fd31 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -36,5 +36,5 @@
     # Items we want flagged in lint
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
     "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
-    "VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true},
+    "VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true}
 }

From 3c09db41fe70572a60898bdd3a8bc2291becde30 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 4 Sep 2022 04:47:22 +1000
Subject: [PATCH 305/959] Fix a couple of boards still using `usb.device_ver`
 (#18258)

---
 keyboards/dyz/dyz60_hs/info.json       | 2 +-
 keyboards/handwired/reclined/info.json | 2 +-
 keyboards/synthlabs/solo/info.json     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json
index 214d6b9ded..d98e7ecf1c 100644
--- a/keyboards/dyz/dyz60_hs/info.json
+++ b/keyboards/dyz/dyz60_hs/info.json
@@ -24,7 +24,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x001A",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json
index 1398a9a2df..a5f308fa75 100644
--- a/keyboards/handwired/reclined/info.json
+++ b/keyboards/handwired/reclined/info.json
@@ -23,7 +23,7 @@
   },
   "processor": "atmega32u4",
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x0000",
     "vid": "0xFEED"
   },
diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json
index 14a51fda36..3fd7b1b8f3 100644
--- a/keyboards/synthlabs/solo/info.json
+++ b/keyboards/synthlabs/solo/info.json
@@ -16,7 +16,7 @@
   "usb": {
     "vid": "0x534E",
     "pid": "0x3031",
-    "device_ver": "0x0001"
+    "device_version": "0.0.1"
   },
   "layouts": {
     "LAYOUT": {

From 288808526b663c96a1ae2aa6dda96f6a963e470a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 3 Sep 2022 14:43:52 -0700
Subject: [PATCH 306/959] dyz60_hs Layout Additions (#18261)

* dyz60_hs: add matrix diagram

* add LAYOUT_60_ansi

* add LAYOUT_60_ansi_split_bs_rshift

* add LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_iso

* add LAYOUT_60_iso_split_bs_rshift

* enable Community Layouts support

* readme.md: correct keyboard references

Replace `dyz60` with `dyz60_hs` as needed.
---
 keyboards/dyz/dyz60_hs/dyz60_hs.h |  87 ++++++++
 keyboards/dyz/dyz60_hs/info.json  | 353 ++++++++++++++++++++++++++++++
 keyboards/dyz/dyz60_hs/readme.md  |   8 +-
 3 files changed, 444 insertions(+), 4 deletions(-)

diff --git a/keyboards/dyz/dyz60_hs/dyz60_hs.h b/keyboards/dyz/dyz60_hs/dyz60_hs.h
index ea416ef389..792f57402f 100644
--- a/keyboards/dyz/dyz60_hs/dyz60_hs.h
+++ b/keyboards/dyz/dyz60_hs/dyz60_hs.h
@@ -18,6 +18,23 @@
 #include "quantum.h"
 #define _X_ KC_NO
 
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │45 │06 │07 │08 │09 │0A │0B │0C │0D │      │0C     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │     │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   │3C        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
+ *              │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_all( \
     K00, K01, K02, K03, K04, K05, K45,     K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15,          K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
@@ -31,3 +48,73 @@
     { K30,  K31,  K32,  K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
     { K40,  K41,  K42,  _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \
 }
+
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _X_ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _X_ }, \
+    { K30, _X_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _X_ }, \
+    { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \
+}
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _X_ }, \
+    { K30, _X_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \
+}
+
+#define LAYOUT_60_tsangan_hhkb( \
+    K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K46,                     K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _X_ }, \
+    { K30, _X_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, _X_, K4B, K4C, K4D }  \
+}
+
+#define LAYOUT_60_iso( \
+    K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _X_ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _X_ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _X_ }, \
+    { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \
+}
+
+#define LAYOUT_60_iso_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _X_ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \
+}
diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json
index d98e7ecf1c..b40b0f0590 100644
--- a/keyboards/dyz/dyz60_hs/info.json
+++ b/keyboards/dyz/dyz60_hs/info.json
@@ -26,6 +26,7 @@
         "pid": "0x001A",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb", "60_iso", "60_iso_split_bs_rshift"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -90,6 +91,358 @@
                 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
                 {"label":"Fn", "x":14, "y":3},
 
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"\\|", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"\\|", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Menu", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`\u00ac", "x":13, "y":0},
+                {"label":"\\|", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
                 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
                 {"label":"Win", "x":1.25, "y":4, "w":1.25},
                 {"label":"Alt", "x":2.5, "y":4, "w":1.25},
diff --git a/keyboards/dyz/dyz60_hs/readme.md b/keyboards/dyz/dyz60_hs/readme.md
index bf94db30da..ae55d30d37 100644
--- a/keyboards/dyz/dyz60_hs/readme.md
+++ b/keyboards/dyz/dyz60_hs/readme.md
@@ -1,11 +1,11 @@
-# dyz60
+# dyz60_hs
 
 ![dyz60 pcb](https://i.imgur.com/l9z5KuJh.jpg)
 
 60% layout has flexcut with multiple layout and mounting support.
 
 * Keyboard Maintainer: [dayatz](https://github.com/dayatz)
-* Hardware Supported: dyz60, ATmega32U4
+* Hardware Supported: dyz60_hs, ATmega32U4
 * Hardware Availability: Local Indonesia GB.
 
 #### Enter Bootloader
@@ -20,10 +20,10 @@ Enter the bootloader in 3 ways:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dyz/dyz60:default
+    make dyz/dyz60_hs:default
 
 Flashing example for this keyboard:
 
-    make dyz/dyz60:default:flash
+    make dyz/dyz60_hs:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

From 3e02b70d28ae3f39ad41c83400dda2eb8e29e6a6 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 5 Sep 2022 06:36:33 +1000
Subject: [PATCH 307/959] Rename keyboards with uppercase letters (#18268)

---
 data/schemas/definitions.jsonschema              | 16 ++--------------
 .../config.h                                     |  0
 .../info.json                                    |  0
 .../keymaps/default/keymap.c                     |  0
 .../keymaps/default/readme.md                    |  0
 .../keymaps/newbold/config.h                     |  0
 .../keymaps/newbold/keymap.c                     |  0
 .../keymaps/newbold/readme.md                    |  0
 .../numeric_keypad_iie.c}                        |  2 +-
 .../numeric_keypad_iie.h}                        |  0
 .../readme.md                                    |  2 +-
 .../rules.mk                                     |  0
 keyboards/emptystring/NQG/NQG.c                  |  1 -
 keyboards/emptystring/{NQG => nqg}/.noci         |  0
 keyboards/emptystring/{NQG => nqg}/config.h      |  0
 keyboards/emptystring/{NQG => nqg}/info.json     |  0
 .../{NQG => nqg}/keymaps/default/keymap.c        |  0
 .../{NQG => nqg}/keymaps/default/rules.mk        |  0
 keyboards/emptystring/nqg/nqg.c                  |  1 +
 keyboards/emptystring/{NQG/NQG.h => nqg/nqg.h}   |  0
 keyboards/emptystring/{NQG => nqg}/readme.md     |  2 +-
 keyboards/emptystring/{NQG => nqg}/rules.mk      |  0
 .../maple_computing/christmas_tree/V2017/V2017.c |  1 -
 .../maple_computing/christmas_tree/readme.md     |  2 +-
 .../maple_computing/christmas_tree/rules.mk      |  2 +-
 .../christmas_tree/{V2017 => v2017}/info.json    |  0
 .../christmas_tree/{V2017 => v2017}/rules.mk     |  0
 .../maple_computing/christmas_tree/v2017/v2017.c |  1 +
 .../{V2017/V2017.h => v2017/v2017.h}             |  0
 29 files changed, 9 insertions(+), 21 deletions(-)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/config.h (100%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/info.json (100%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/keymaps/default/keymap.c (100%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/keymaps/default/readme.md (100%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/keymaps/newbold/config.h (100%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/keymaps/newbold/keymap.c (100%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/keymaps/newbold/readme.md (100%)
 rename keyboards/converter/{numeric_keypad_IIe/numeric_keypad_IIe.c => numeric_keypad_iie/numeric_keypad_iie.c} (95%)
 rename keyboards/converter/{numeric_keypad_IIe/numeric_keypad_IIe.h => numeric_keypad_iie/numeric_keypad_iie.h} (100%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/readme.md (96%)
 rename keyboards/converter/{numeric_keypad_IIe => numeric_keypad_iie}/rules.mk (100%)
 delete mode 100644 keyboards/emptystring/NQG/NQG.c
 rename keyboards/emptystring/{NQG => nqg}/.noci (100%)
 rename keyboards/emptystring/{NQG => nqg}/config.h (100%)
 rename keyboards/emptystring/{NQG => nqg}/info.json (100%)
 rename keyboards/emptystring/{NQG => nqg}/keymaps/default/keymap.c (100%)
 rename keyboards/emptystring/{NQG => nqg}/keymaps/default/rules.mk (100%)
 create mode 100644 keyboards/emptystring/nqg/nqg.c
 rename keyboards/emptystring/{NQG/NQG.h => nqg/nqg.h} (100%)
 rename keyboards/emptystring/{NQG => nqg}/readme.md (96%)
 rename keyboards/emptystring/{NQG => nqg}/rules.mk (100%)
 delete mode 100644 keyboards/maple_computing/christmas_tree/V2017/V2017.c
 rename keyboards/maple_computing/christmas_tree/{V2017 => v2017}/info.json (100%)
 rename keyboards/maple_computing/christmas_tree/{V2017 => v2017}/rules.mk (100%)
 create mode 100644 keyboards/maple_computing/christmas_tree/v2017/v2017.c
 rename keyboards/maple_computing/christmas_tree/{V2017/V2017.h => v2017/v2017.h} (100%)

diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 8b68a58482..94a94157c0 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -68,20 +68,8 @@
         "type": "number"
     },
     "keyboard": {
-        "oneOf": [
-            {
-                "type": "string",
-                "enum": [
-                    "converter/numeric_keypad_IIe",
-                    "emptystring/NQG",
-                    "maple_computing/christmas_tree/V2017"
-                ]
-            },
-            {
-                "type": "string",
-                "pattern": "^[0-9a-z][0-9a-z_/]*$"
-            }
-        ]
+        "type": "string",
+        "pattern": "^[0-9a-z][0-9a-z_/]*$"
     },
     "mcu_pin_array": {
         "type": "array",
diff --git a/keyboards/converter/numeric_keypad_IIe/config.h b/keyboards/converter/numeric_keypad_iie/config.h
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/config.h
rename to keyboards/converter/numeric_keypad_iie/config.h
diff --git a/keyboards/converter/numeric_keypad_IIe/info.json b/keyboards/converter/numeric_keypad_iie/info.json
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/info.json
rename to keyboards/converter/numeric_keypad_iie/info.json
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c
rename to keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/default/readme.md b/keyboards/converter/numeric_keypad_iie/keymaps/default/readme.md
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/default/readme.md
rename to keyboards/converter/numeric_keypad_iie/keymaps/default/readme.md
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/config.h b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/config.h
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/newbold/config.h
rename to keyboards/converter/numeric_keypad_iie/keymaps/newbold/config.h
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c
rename to keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/readme.md b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/readme.md
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/newbold/readme.md
rename to keyboards/converter/numeric_keypad_iie/keymaps/newbold/readme.md
diff --git a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
similarity index 95%
rename from keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
rename to keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
index a2f8a5bd6e..341af05b31 100644
--- a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
+++ b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
@@ -13,4 +13,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "numeric_keypad_IIe.h"
+#include "numeric_keypad_iie.h"
diff --git a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.h
rename to keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
diff --git a/keyboards/converter/numeric_keypad_IIe/readme.md b/keyboards/converter/numeric_keypad_iie/readme.md
similarity index 96%
rename from keyboards/converter/numeric_keypad_IIe/readme.md
rename to keyboards/converter/numeric_keypad_iie/readme.md
index 9eba41610a..0de562d808 100644
--- a/keyboards/converter/numeric_keypad_IIe/readme.md
+++ b/keyboards/converter/numeric_keypad_iie/readme.md
@@ -11,6 +11,6 @@ Hardware Supported: Internal Numeric Keypad IIe PCB (Apple part 820.0081.c), ATm
 
 Make example for this keyboard (after setting up your build environment):
 
-    make converter/numeric_keypad_IIe:default
+    make converter/numeric_keypad_iie: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/converter/numeric_keypad_IIe/rules.mk b/keyboards/converter/numeric_keypad_iie/rules.mk
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/rules.mk
rename to keyboards/converter/numeric_keypad_iie/rules.mk
diff --git a/keyboards/emptystring/NQG/NQG.c b/keyboards/emptystring/NQG/NQG.c
deleted file mode 100644
index eedf25e881..0000000000
--- a/keyboards/emptystring/NQG/NQG.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "NQG.h"
diff --git a/keyboards/emptystring/NQG/.noci b/keyboards/emptystring/nqg/.noci
similarity index 100%
rename from keyboards/emptystring/NQG/.noci
rename to keyboards/emptystring/nqg/.noci
diff --git a/keyboards/emptystring/NQG/config.h b/keyboards/emptystring/nqg/config.h
similarity index 100%
rename from keyboards/emptystring/NQG/config.h
rename to keyboards/emptystring/nqg/config.h
diff --git a/keyboards/emptystring/NQG/info.json b/keyboards/emptystring/nqg/info.json
similarity index 100%
rename from keyboards/emptystring/NQG/info.json
rename to keyboards/emptystring/nqg/info.json
diff --git a/keyboards/emptystring/NQG/keymaps/default/keymap.c b/keyboards/emptystring/nqg/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/emptystring/NQG/keymaps/default/keymap.c
rename to keyboards/emptystring/nqg/keymaps/default/keymap.c
diff --git a/keyboards/emptystring/NQG/keymaps/default/rules.mk b/keyboards/emptystring/nqg/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/emptystring/NQG/keymaps/default/rules.mk
rename to keyboards/emptystring/nqg/keymaps/default/rules.mk
diff --git a/keyboards/emptystring/nqg/nqg.c b/keyboards/emptystring/nqg/nqg.c
new file mode 100644
index 0000000000..85eb47e6d3
--- /dev/null
+++ b/keyboards/emptystring/nqg/nqg.c
@@ -0,0 +1 @@
+#include "nqg.h"
diff --git a/keyboards/emptystring/NQG/NQG.h b/keyboards/emptystring/nqg/nqg.h
similarity index 100%
rename from keyboards/emptystring/NQG/NQG.h
rename to keyboards/emptystring/nqg/nqg.h
diff --git a/keyboards/emptystring/NQG/readme.md b/keyboards/emptystring/nqg/readme.md
similarity index 96%
rename from keyboards/emptystring/NQG/readme.md
rename to keyboards/emptystring/nqg/readme.md
index 5e78420e2b..b2ceeeb87d 100644
--- a/keyboards/emptystring/NQG/readme.md
+++ b/keyboards/emptystring/nqg/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: Kits are available from [SA_EndlessGame](http://twitter.c
 
 Make example for this keyboard (after setting up your build environment):
 
-    make emptystring/NQG:default
+    make emptystring/nqg: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/emptystring/NQG/rules.mk b/keyboards/emptystring/nqg/rules.mk
similarity index 100%
rename from keyboards/emptystring/NQG/rules.mk
rename to keyboards/emptystring/nqg/rules.mk
diff --git a/keyboards/maple_computing/christmas_tree/V2017/V2017.c b/keyboards/maple_computing/christmas_tree/V2017/V2017.c
deleted file mode 100644
index e367270592..0000000000
--- a/keyboards/maple_computing/christmas_tree/V2017/V2017.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "V2017.h"
\ No newline at end of file
diff --git a/keyboards/maple_computing/christmas_tree/readme.md b/keyboards/maple_computing/christmas_tree/readme.md
index 3ba255a18c..2ede444ce4 100644
--- a/keyboards/maple_computing/christmas_tree/readme.md
+++ b/keyboards/maple_computing/christmas_tree/readme.md
@@ -9,6 +9,6 @@ Keyboard Maintainer: [That-Canadian](https://github.com/That-Canadian)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make maple_computing/christmas_tree/V2017:default
+    make maple_computing/christmas_tree/v2017:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
index 45ac883163..ed78c6fabe 100644
--- a/keyboards/maple_computing/christmas_tree/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-DEFAULT_FOLDER = maple_computing/christmas_tree/V2017
+DEFAULT_FOLDER = maple_computing/christmas_tree/v2017
diff --git a/keyboards/maple_computing/christmas_tree/V2017/info.json b/keyboards/maple_computing/christmas_tree/v2017/info.json
similarity index 100%
rename from keyboards/maple_computing/christmas_tree/V2017/info.json
rename to keyboards/maple_computing/christmas_tree/v2017/info.json
diff --git a/keyboards/maple_computing/christmas_tree/V2017/rules.mk b/keyboards/maple_computing/christmas_tree/v2017/rules.mk
similarity index 100%
rename from keyboards/maple_computing/christmas_tree/V2017/rules.mk
rename to keyboards/maple_computing/christmas_tree/v2017/rules.mk
diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.c b/keyboards/maple_computing/christmas_tree/v2017/v2017.c
new file mode 100644
index 0000000000..22067e5367
--- /dev/null
+++ b/keyboards/maple_computing/christmas_tree/v2017/v2017.c
@@ -0,0 +1 @@
+#include "v2017.h"
\ No newline at end of file
diff --git a/keyboards/maple_computing/christmas_tree/V2017/V2017.h b/keyboards/maple_computing/christmas_tree/v2017/v2017.h
similarity index 100%
rename from keyboards/maple_computing/christmas_tree/V2017/V2017.h
rename to keyboards/maple_computing/christmas_tree/v2017/v2017.h

From a36c95db60dc4adf47de70ba34346fa6371e68d1 Mon Sep 17 00:00:00 2001
From: AMing Lau <cyberming@gmail.com>
Date: Sun, 4 Sep 2022 18:00:44 -0700
Subject: [PATCH 308/959] Fix compilation error for GH60 satan HHKB 7u layout
 (#18250)

* Fix compilation error for GH60 satan HHKB 7u layout

* Update keyboards/gh60/satan/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/gh60/satan/info.json                |  8 +++++
 keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c | 31 +++++++++----------
 .../gh60/satan/keymaps/hhkb_7u/readme.md      | 13 +++++---
 keyboards/gh60/satan/rules.mk                 |  2 +-
 keyboards/gh60/satan/satan.h                  | 27 ++++++++++++++++
 5 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json
index bfd44c42e4..8374cad110 100644
--- a/keyboards/gh60/satan/info.json
+++ b/keyboards/gh60/satan/info.json
@@ -29,6 +29,14 @@
     },
     "LAYOUT_60_iso_split_rshift": {
       "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0}, {"label":"k05", "x":5, "y":0}, {"label":"k06", "x":6, "y":0}, {"label":"k07", "x":7, "y":0}, {"label":"k08", "x":8, "y":0}, {"label":"k09", "x":9, "y":0}, {"label":"k0a", "x":10, "y":0}, {"label":"k0b", "x":11, "y":0}, {"label":"k0c", "x":12, "y":0}, {"label":"k0d", "x":13, "y":0, "w":2}, {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k16", "x":6.5, "y":1}, {"label":"k17", "x":7.5, "y":1}, {"label":"k18", "x":8.5, "y":1}, {"label":"k19", "x":9.5, "y":1}, {"label":"k1a", "x":10.5, "y":1}, {"label":"k1b", "x":11.5, "y":1}, {"label":"k1c", "x":12.5, "y":1}, {"label":"k20", "x":0, "y":2, "w":1.75}, {"label":"k21", "x":1.75, "y":2}, {"label":"k22", "x":2.75, "y":2}, {"label":"k23", "x":3.75, "y":2}, {"label":"k24", "x":4.75, "y":2}, {"label":"k25", "x":5.75, "y":2}, {"label":"k26", "x":6.75, "y":2}, {"label":"k27", "x":7.75, "y":2}, {"label":"k28", "x":8.75, "y":2}, {"label":"k29", "x":9.75, "y":2}, {"label":"k2a", "x":10.75, "y":2}, {"label":"k2b", "x":11.75, "y":2}, {"label":"k2c", "x":12.75, "y":2}, {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"k30", "x":0, "y":3, "w":1.25}, {"label":"k31", "x":1.25, "y":3}, {"label":"k32", "x":2.25, "y":3}, {"label":"k33", "x":3.25, "y":3}, {"label":"k34", "x":4.25, "y":3}, {"label":"k35", "x":5.25, "y":3}, {"label":"k36", "x":6.25, "y":3}, {"label":"k37", "x":7.25, "y":3}, {"label":"k38", "x":8.25, "y":3}, {"label":"k39", "x":9.25, "y":3}, {"label":"k3a", "x":10.25, "y":3}, {"label":"k3b", "x":11.25, "y":3}, {"label":"k3d", "x":12.25, "y":3, "w":1.75}, {"label":"k3c", "x":14, "y":3}, {"label":"k40", "x":0, "y":4, "w":1.25}, {"label":"k41", "x":1.25, "y":4, "w":1.25}, {"label":"k42", "x":2.5, "y":4, "w":1.25}, {"label":"k45", "x":3.75, "y":4, "w":6.25}, {"label":"k4a", "x":10, "y":4, "w":1.25}, {"label":"k4b", "x":11.25, "y":4, "w":1.25}, {"label":"k4c", "x":12.5, "y":4, "w":1.25}, {"label":"k4d", "x":13.75, "y":4, "w":1.25}]
+    },
+    "LAYOUT_60_hhkb": {
+      "layout": [
+        {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0}, {"label":"k05", "x":5, "y":0}, {"label":"k06", "x":6, "y":0}, {"label":"k07", "x":7, "y":0}, {"label":"k08", "x":8, "y":0}, {"label":"k09", "x":9, "y":0}, {"label":"k0a", "x":10, "y":0}, {"label":"k0b", "x":11, "y":0}, {"label":"k0c", "x":12, "y":0}, {"label":"k0d", "x":13, "y":0}, {"label":"k49", "x":14, "y":0},
+        {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k16", "x":6.5, "y":1}, {"label":"k17", "x":7.5, "y":1}, {"label":"k18", "x":8.5, "y":1}, {"label":"k19", "x":9.5, "y":1}, {"label":"k1a", "x":10.5, "y":1}, {"label":"k1b", "x":11.5, "y":1}, {"label":"k1c", "x":12.5, "y":1}, {"label":"k1d", "x":13.5, "y":1, "w":1.5},
+        {"label":"k20", "x":0, "y":2, "w":1.75}, {"label":"k21", "x":1.75, "y":2}, {"label":"k22", "x":2.75, "y":2}, {"label":"k23", "x":3.75, "y":2}, {"label":"k24", "x":4.75, "y":2}, {"label":"k25", "x":5.75, "y":2}, {"label":"k26", "x":6.75, "y":2}, {"label":"k27", "x":7.75, "y":2}, {"label":"k28", "x":8.75, "y":2}, {"label":"k29", "x":9.75, "y":2}, {"label":"k2a", "x":10.75, "y":2}, {"label":"k2b", "x":11.75, "y":2}, {"label":"k2d", "x":12.75, "y":2, "w":2.25},
+        {"label":"k30", "x":0, "y":3, "w":2.25}, {"label":"k32", "x":2.25, "y":3}, {"label":"k33", "x":3.25, "y":3}, {"label":"k34", "x":4.25, "y":3}, {"label":"k35", "x":5.25, "y":3}, {"label":"k36", "x":6.25, "y":3}, {"label":"k37", "x":7.25, "y":3}, {"label":"k38", "x":8.25, "y":3}, {"label":"k39", "x":9.25, "y":3}, {"label":"k3a", "x":10.25, "y":3}, {"label":"k3b", "x":11.25, "y":3}, {"label":"k3d", "x":12.25, "y":3, "w":1.75}, {"label":"k3c", "x":14, "y":3},
+        {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4, "w":1.5}, {"label":"k45", "x":4, "y":4, "w":7}, {"label":"k4b", "x":11, "y":4, "w":1.5}, {"label":"k4c", "x":12.5, "y":4}]
     }
   }
 }
diff --git a/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
index b0bc48b455..68e362b59c 100644
--- a/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
+++ b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
@@ -8,9 +8,6 @@ enum planck_keycodes {
   DEFAULT = SAFE_RANGE
 };
 
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Qwerty gui/alt/space/alt/gui
  * ,-----------------------------------------------------------------------------------------.
@@ -22,15 +19,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |-----------------------------------------------------------------------------------------+
  * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
  * |-----------------------------------------------------------------------------------------+
- *         |LGUI | LAlt  |              7U Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
+ * |       |LGUI | LAlt  |              7U Space                | RAlt   |RGUI |             |
+ * `-----------------------------------------------------------------------------------------'
  */
   [_DEFAULT] = LAYOUT_60_hhkb( /* Basic QWERTY */
-      KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,       KC_MINS,    KC_EQL, KC_BSLS,    KC_GRV, \
-      KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,       KC_LBRC,    KC_RBRC,KC_BSPC,  \
-      KC_LCTL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN,    KC_QUOT,    KC_ENT,   \
-      KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,    MO(_FN), \
-      ______,   KC_LGUI,KC_LALT,                KC_SPC,                          ______,KC_RALT,    KC_RGUI,     ______ \
+      KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSLS,KC_GRV, \
+      KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSPC,\
+      KC_LCTL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_ENT, \
+      KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT, MO(_FN),\
+            KC_LGUI,KC_LALT,                   KC_SPC,                            KC_RALT,KC_RGUI\
       ),
 
 /* FN Layer
@@ -43,14 +40,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |-----------------------------------------------------------------------------------------+
  * |           | BL  | BL- | BL+ |     |     | +   | -   | End  |PgDn| Down|           |     |
  * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
+ * |       |       |       |                                 |       |       |               |
+ * `-----------------------------------------------------------------------------------------'
  */
   [_FN] = LAYOUT_60_hhkb( /* Layer 1 */
-      ______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,  KC_DEL, \
-      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   ______, ______,  \
-      ______,   KC_VOLD,KC_VOLU,KC_MUTE,______, ______, KC_PAST,KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______,   \
-      ______,   BL_DEC,BL_INC,BL_TOGG,______, ______, KC_PPLS,KC_PMNS,KC_END,  KC_PGDN, KC_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, KC_INS, KC_DEL, \
+      KC_CAPS, _______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,KC_UP,  _______,_______,\
+      _______,  KC_VOLD,KC_VOLU,KC_MUTE,_______, _______, KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,_______,\
+      _______,   BL_DEC, BL_INC, BL_TOGG,_______, _______, KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,_______,_______,\
+            _______,_______,                   _______,                     _______,_______\
       )
 };
diff --git a/keyboards/gh60/satan/keymaps/hhkb_7u/readme.md b/keyboards/gh60/satan/keymaps/hhkb_7u/readme.md
index 39e71beedd..3ea92f79f9 100644
--- a/keyboards/gh60/satan/keymaps/hhkb_7u/readme.md
+++ b/keyboards/gh60/satan/keymaps/hhkb_7u/readme.md
@@ -1,9 +1,14 @@
-# Dbroqua HHKB like Layout
+#  HHKB like Layout with 7u Space
 
-Like the HHKB but with a Satan GH60 PCB :D.
+Like the HHKB but on a Satan GH60 PCB :D.
 
 # Programming Instructions:
+Compile the firmware
+```
+$ qmk compile -kb gh60/satan -km hhkb_7u
+```
+
 Enter into programming mode and run the following command.
 ```
-$ sudo KEYMAP=dbroqua_hhkb make dfu
-```
\ No newline at end of file
+$ qmk flash -kb gh60/satan -km hhkb_7u
+```
diff --git a/keyboards/gh60/satan/rules.mk b/keyboards/gh60/satan/rules.mk
index 14a7691e0f..a7da68cf01 100644
--- a/keyboards/gh60/satan/rules.mk
+++ b/keyboards/gh60/satan/rules.mk
@@ -17,4 +17,4 @@ RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
 BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 
-LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift
+LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_hhkb
diff --git a/keyboards/gh60/satan/satan.h b/keyboards/gh60/satan/satan.h
index baa669fc96..9cb01a0af1 100644
--- a/keyboards/gh60/satan/satan.h
+++ b/keyboards/gh60/satan/satan.h
@@ -201,3 +201,30 @@
   { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
   { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d }, \
 }
+
+/* HHKB layout
+ * ,-----------------------------------------------------------.
+ * | 00| 01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d| 49|
+ * |-----------------------------------------------------------|
+ * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d |
+ * |-----------------------------------------------------------|
+ * | 20   | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b|   2d   |
+ * |-----------------------------------------------------------|
+ * |   30   | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|   3d | 3c|
+ * |-----------------------------------------------------------|
+ *      | 41|  42  |        45                 |  4b  |4c |
+ *      `-------------------------------------------------'
+ */
+#define LAYOUT_60_hhkb( \
+  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k49,\
+  k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,    \
+  k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2d,     \
+  k30,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,   k3d,    k3c,  \
+       k41, k42,             k45,                        k4b, k4c           \
+) { \
+  { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+  { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d }, \
+  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+  { XXX, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4b, k4c, XXX }, \
+}

From 5f1273fca6206a435455aaa17c45094a3f5a281a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 5 Sep 2022 06:14:25 -0700
Subject: [PATCH 309/959] EU ISOlation: fix QMK Configurator key sequence
 (#18272)

* eu_isolation.h: physically arrange layout macros

Whitespace only; no logic changes.

* info.json: apply friendly formatting

Add line breaks between physical rows.

* info.json: correct key sequence
---
 keyboards/eu_isolation/eu_isolation.h | 12 +++++-----
 keyboards/eu_isolation/info.json      | 33 +++++++++++++++++----------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/keyboards/eu_isolation/eu_isolation.h b/keyboards/eu_isolation/eu_isolation.h
index f4c9f11085..90ff29e69f 100644
--- a/keyboards/eu_isolation/eu_isolation.h
+++ b/keyboards/eu_isolation/eu_isolation.h
@@ -20,10 +20,10 @@
 #define ___ KC_NO
 
 #define LAYOUT_euiso_mit( \
-    k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+              k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k32, k33, k34, k35, k36,      k37, k39, k3a, k3b, k3c, k3d \
+              k32, k33, k34, k35, k36,      k37, k39, k3a, k3b, k3c, k3d \
 ) \
 { \
     { ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
@@ -33,10 +33,10 @@
 }
 
 #define LAYOUT_euiso_ortho( \
-    k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+              k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d  \
+              k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d  \
 ) \
 { \
     { ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
@@ -46,10 +46,10 @@
 }
 
 #define LAYOUT_euiso_bigspace( \
-    k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+              k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k32, k33,                    k37,                 k3c, k3d \
+              k32, k33,                    k37,                 k3c, k3d \
 ) \
 { \
     { ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
diff --git a/keyboards/eu_isolation/info.json b/keyboards/eu_isolation/info.json
index 5713a2ddb8..5d82ca333b 100644
--- a/keyboards/eu_isolation/info.json
+++ b/keyboards/eu_isolation/info.json
@@ -23,6 +23,9 @@
                 {"x":11, "y":0},
                 {"x":12, "y":0},
                 {"x":13, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
                 {"x":4, "y":1},
@@ -35,8 +38,9 @@
                 {"x":11, "y":1},
                 {"x":12, "y":1},
                 {"x":13, "y":1},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
                 {"x":4, "y":2},
@@ -49,8 +53,7 @@
                 {"x":11, "y":2},
                 {"x":12, "y":2},
                 {"x":13, "y":2},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+
                 {"x":2, "y":3},
                 {"x":3, "y":3},
                 {"x":4, "y":3},
@@ -80,6 +83,9 @@
                 {"x":11, "y":0},
                 {"x":12, "y":0},
                 {"x":13, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
                 {"x":4, "y":1},
@@ -92,8 +98,9 @@
                 {"x":11, "y":1},
                 {"x":12, "y":1},
                 {"x":13, "y":1},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
                 {"x":4, "y":2},
@@ -106,8 +113,7 @@
                 {"x":11, "y":2},
                 {"x":12, "y":2},
                 {"x":13, "y":2},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+
                 {"x":2, "y":3},
                 {"x":3, "y":3},
                 {"x":4, "y":3},
@@ -136,6 +142,9 @@
                 {"x":11, "y":0},
                 {"x":12, "y":0},
                 {"x":13, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
                 {"x":4, "y":1},
@@ -148,8 +157,9 @@
                 {"x":11, "y":1},
                 {"x":12, "y":1},
                 {"x":13, "y":1},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
                 {"x":4, "y":2},
@@ -162,8 +172,7 @@
                 {"x":11, "y":2},
                 {"x":12, "y":2},
                 {"x":13, "y":2},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+
                 {"x":2, "y":3, "w":1.25},
                 {"x":3.25, "y":3, "w":1.25},
                 {"x":4.5, "y":3, "w":7},

From 0306bdf7fdb2f48f833c8887fd13e91b17d7c3c9 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 6 Sep 2022 05:25:32 +0100
Subject: [PATCH 310/959] Remove use of legacy keycode (#18281)

---
 quantum/process_keycode/process_auto_shift.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/process_keycode/process_auto_shift.h b/quantum/process_keycode/process_auto_shift.h
index ac6a143746..86adb04985 100644
--- a/quantum/process_keycode/process_auto_shift.h
+++ b/quantum/process_keycode/process_auto_shift.h
@@ -32,7 +32,7 @@
 #define AUTO_SHIFT_SPECIAL          \
              KC_TAB:                \
         case KC_MINUS ... KC_SLASH: \
-        case KC_NONUS_BSLASH
+        case KC_NONUS_BACKSLASH
 // clang-format on
 
 bool process_auto_shift(uint16_t keycode, keyrecord_t *record);

From 712aa7b1cd1b02f586c163cad763ee4169b1f022 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 5 Sep 2022 21:26:11 -0700
Subject: [PATCH 311/959] Mars 6.5 Layout Additions (#18282)

* info.json: apply friendly formatting

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_split_bs

* enable Community Layouts support

* info.json: correct maintainer value
---
 keyboards/ft/mars65/info.json | 741 +++++++++++++++++-----------------
 keyboards/ft/mars65/mars65.h  |  56 +++
 2 files changed, 436 insertions(+), 361 deletions(-)

diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json
index e9040ce9de..f2307b60c1 100644
--- a/keyboards/ft/mars65/info.json
+++ b/keyboards/ft/mars65/info.json
@@ -2,375 +2,394 @@
   "keyboard_name": "Mars 6.5",
   "manufacturer": "FT",
   "url": "",
-  "maintainer": "qmk",
+  "maintainer": "wonderbeel",
   "usb": {
     "vid": "0x20A0",
     "pid": "0x422F",
     "device_version": "0.0.1"
   },
+  "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        {
-          "label": "K00 (B0,C6)",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "K01 (B0,C7)",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "K02 (B0,D0)",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "K03 (B0,D1)",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "K04 (B0,D2)",
-          "x": 4,
-          "y": 0
-        },
-        {
-          "label": "K05 (B0,D3)",
-          "x": 5,
-          "y": 0
-        },
-        {
-          "label": "K06 (B0,D4)",
-          "x": 6,
-          "y": 0
-        },
-        {
-          "label": "K07 (B0,D5)",
-          "x": 7,
-          "y": 0
-        },
-        {
-          "label": "K08 (B0,D6)",
-          "x": 8,
-          "y": 0
-        },
-        {
-          "label": "K09 (B0,D7)",
-          "x": 9,
-          "y": 0
-        },
-        {
-          "label": "K0A (B0,F0)",
-          "x": 10,
-          "y": 0
-        },
-        {
-          "label": "K0B (B0,F1)",
-          "x": 11,
-          "y": 0
-        },
-        {
-          "label": "K0C (B0,F4)",
-          "x": 12,
-          "y": 0
-        },
-        {
-          "label": "K0D (B0,F5)",
-          "x": 13,
-          "y": 0
-        },
-        {
-          "label": "K0E (B0,F6)",
-          "x": 14,
-          "y": 0
-        },
-        {
-          "label": "K0F (B0,F7)",
-          "x": 15,
-          "y": 0
-        },
-        {
-          "label": "K10 (B1,C6)",
-          "x": 0,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "K12 (B1,D0)",
-          "x": 1.5,
-          "y": 1
-        },
-        {
-          "label": "K13 (B1,D1)",
-          "x": 2.5,
-          "y": 1
-        },
-        {
-          "label": "K14 (B1,D2)",
-          "x": 3.5,
-          "y": 1
-        },
-        {
-          "label": "K15 (B1,D3)",
-          "x": 4.5,
-          "y": 1
-        },
-        {
-          "label": "K16 (B1,D4)",
-          "x": 5.5,
-          "y": 1
-        },
-        {
-          "label": "K17 (B1,D5)",
-          "x": 6.5,
-          "y": 1
-        },
-        {
-          "label": "K18 (B1,D6)",
-          "x": 7.5,
-          "y": 1
-        },
-        {
-          "label": "K19 (B1,D7)",
-          "x": 8.5,
-          "y": 1
-        },
-        {
-          "label": "K1A (B1,F0)",
-          "x": 9.5,
-          "y": 1
-        },
-        {
-          "label": "K1B (B1,F1)",
-          "x": 10.5,
-          "y": 1
-        },
-        {
-          "label": "K1C (B1,F4)",
-          "x": 11.5,
-          "y": 1
-        },
-        {
-          "label": "K1D (B1,F5)",
-          "x": 12.5,
-          "y": 1
-        },
-        {
-          "label": "K1E (B1,F6)",
-          "x": 13.5,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "K1F (B1,F7)",
-          "x": 15,
-          "y": 1
-        },
-        {
-          "label": "K20 (B2,C6)",
-          "x": 0,
-          "y": 2,
-          "w": 1.75
-        },
-        {
-          "label": "K22 (B2,D0)",
-          "x": 1.75,
-          "y": 2
-        },
-        {
-          "label": "K23 (B2,D1)",
-          "x": 2.75,
-          "y": 2
-        },
-        {
-          "label": "K24 (B2,D2)",
-          "x": 3.75,
-          "y": 2
-        },
-        {
-          "label": "K25 (B2,D3)",
-          "x": 4.75,
-          "y": 2
-        },
-        {
-          "label": "K26 (B2,D4)",
-          "x": 5.75,
-          "y": 2
-        },
-        {
-          "label": "K27 (B2,D5)",
-          "x": 6.75,
-          "y": 2
-        },
-        {
-          "label": "K28 (B2,D6)",
-          "x": 7.75,
-          "y": 2
-        },
-        {
-          "label": "K29 (B2,D7)",
-          "x": 8.75,
-          "y": 2
-        },
-        {
-          "label": "K2A (B2,F0)",
-          "x": 9.75,
-          "y": 2
-        },
-        {
-          "label": "K2B (B2,F1)",
-          "x": 10.75,
-          "y": 2
-        },
-        {
-          "label": "K2C (B2,F4)",
-          "x": 11.75,
-          "y": 2
-        },
-        {
-          "label": "K2E (B2,F6)",
-          "x": 12.75,
-          "y": 2,
-          "w": 2.25
-        },
-        {
-          "label": "K2F (B2,F7)",
-          "x": 15,
-          "y": 2
-        },
-        {
-          "label": "K30 (B3,C6)",
-          "x": 0,
-          "y": 3,
-          "w": 1.25
-        },
-        {
-          "label": "K31 (B3,C7)",
-          "x": 1.25,
-          "y": 3
-        },
-        {
-          "label": "K32 (B3,D0)",
-          "x": 2.25,
-          "y": 3
-        },
-        {
-          "label": "K33 (B3,D1)",
-          "x": 3.25,
-          "y": 3
-        },
-        {
-          "label": "K34 (B3,D2)",
-          "x": 4.25,
-          "y": 3
-        },
-        {
-          "label": "K35 (B3,D3)",
-          "x": 5.25,
-          "y": 3
-        },
-        {
-          "label": "K36 (B3,D4)",
-          "x": 6.25,
-          "y": 3
-        },
-        {
-          "label": "K37 (B3,D5)",
-          "x": 7.25,
-          "y": 3
-        },
-        {
-          "label": "K38 (B3,D6)",
-          "x": 8.25,
-          "y": 3
-        },
-        {
-          "label": "K39 (B3,D7)",
-          "x": 9.25,
-          "y": 3
-        },
-        {
-          "label": "K3A (B3,F0)",
-          "x": 10.25,
-          "y": 3
-        },
-        {
-          "label": "K3B (B3,F1)",
-          "x": 11.25,
-          "y": 3
-        },
-        {
-          "label": "K3D (B3,F5)",
-          "x": 12.25,
-          "y": 3,
-          "w": 1.75
-        },
-        {
-          "label": "K3E (B3,F6)",
-          "x": 14,
-          "y": 3
-        },
-        {
-          "label": "K3F (B3,F7)",
-          "x": 15,
-          "y": 3
-        },
-        {
-          "label": "K40 (B4,C6)",
-          "x": 0,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "K41 (B4,C7)",
-          "x": 1.25,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "K43 (B4,D1)",
-          "x": 2.5,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "K46 (B4,D4)",
-          "x": 3.75,
-          "y": 4,
-          "w": 6.25
-        },
-        {
-          "label": "K4A (B4,F0)",
-          "x": 10,
-          "y": 4
-        },
-        {
-          "label": "K4B (B4,F1)",
-          "x": 11,
-          "y": 4
-        },
-        {
-          "label": "K4C (B4,F4)",
-          "x": 12,
-          "y": 4
-        },
-        {
-          "label": "K4D (B4,F5)",
-          "x": 13,
-          "y": 4
-        },
-        {
-          "label": "K4E (B4,F6)",
-          "x": 14,
-          "y": 4
-        },
-        {
-          "label": "K4F (B4,F7)",
-          "x": 15,
-          "y": 4
-        }
+        {"label":"K00 (B0,C6)", "x":0, "y":0},
+        {"label":"K01 (B0,C7)", "x":1, "y":0},
+        {"label":"K02 (B0,D0)", "x":2, "y":0},
+        {"label":"K03 (B0,D1)", "x":3, "y":0},
+        {"label":"K04 (B0,D2)", "x":4, "y":0},
+        {"label":"K05 (B0,D3)", "x":5, "y":0},
+        {"label":"K06 (B0,D4)", "x":6, "y":0},
+        {"label":"K07 (B0,D5)", "x":7, "y":0},
+        {"label":"K08 (B0,D6)", "x":8, "y":0},
+        {"label":"K09 (B0,D7)", "x":9, "y":0},
+        {"label":"K0A (B0,F0)", "x":10, "y":0},
+        {"label":"K0B (B0,F1)", "x":11, "y":0},
+        {"label":"K0C (B0,F4)", "x":12, "y":0},
+        {"label":"K0D (B0,F5)", "x":13, "y":0},
+        {"label":"K0E (B0,F6)", "x":14, "y":0},
+        {"label":"K0F (B0,F7)", "x":15, "y":0},
+
+        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
+        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
+        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
+        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
+        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
+        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
+        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
+        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
+        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
+        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
+        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
+        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
+        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
+        {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
+        {"label":"K1F (B1,F7)", "x":15, "y":1},
+
+        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
+        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
+        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
+        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
+        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
+        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
+        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
+        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
+        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
+        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
+        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
+        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
+        {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
+        {"label":"K2F (B2,F7)", "x":15, "y":2},
+
+        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
+        {"label":"K31 (B3,C7)", "x":1.25, "y":3},
+        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
+        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
+        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
+        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
+        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
+        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
+        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
+        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
+        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
+        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
+        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
+        {"label":"K3E (B3,F6)", "x":14, "y":3},
+        {"label":"K3F (B3,F7)", "x":15, "y":3},
+
+        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
+        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
+        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
+        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
+        {"label":"K4A (B4,F0)", "x":10, "y":4},
+        {"label":"K4B (B4,F1)", "x":11, "y":4},
+        {"label":"K4C (B4,F4)", "x":12, "y":4},
+        {"label":"K4D (B4,F5)", "x":13, "y":4},
+        {"label":"K4E (B4,F6)", "x":14, "y":4},
+        {"label":"K4F (B4,F7)", "x":15, "y":4}
+      ]
+    },
+    "LAYOUT_65_ansi_blocker": {
+      "layout": [
+        {"label":"K00 (B0,C6)", "x":0, "y":0},
+        {"label":"K01 (B0,C7)", "x":1, "y":0},
+        {"label":"K02 (B0,D0)", "x":2, "y":0},
+        {"label":"K03 (B0,D1)", "x":3, "y":0},
+        {"label":"K04 (B0,D2)", "x":4, "y":0},
+        {"label":"K05 (B0,D3)", "x":5, "y":0},
+        {"label":"K06 (B0,D4)", "x":6, "y":0},
+        {"label":"K07 (B0,D5)", "x":7, "y":0},
+        {"label":"K08 (B0,D6)", "x":8, "y":0},
+        {"label":"K09 (B0,D7)", "x":9, "y":0},
+        {"label":"K0A (B0,F0)", "x":10, "y":0},
+        {"label":"K0B (B0,F1)", "x":11, "y":0},
+        {"label":"K0C (B0,F4)", "x":12, "y":0},
+        {"label":"K0D (B0,F5)", "x":13, "y":0, "w":2},
+        {"label":"K0F (B0,F7)", "x":15, "y":0},
+
+        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
+        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
+        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
+        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
+        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
+        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
+        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
+        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
+        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
+        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
+        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
+        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
+        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
+        {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
+        {"label":"K1F (B1,F7)", "x":15, "y":1},
+
+        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
+        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
+        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
+        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
+        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
+        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
+        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
+        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
+        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
+        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
+        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
+        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
+        {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
+        {"label":"K2F (B2,F7)", "x":15, "y":2},
+
+        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":2.25},
+        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
+        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
+        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
+        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
+        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
+        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
+        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
+        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
+        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
+        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
+        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
+        {"label":"K3E (B3,F6)", "x":14, "y":3},
+        {"label":"K3F (B3,F7)", "x":15, "y":3},
+
+        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
+        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
+        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
+        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
+        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
+        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
+        {"label":"K4D (B4,F5)", "x":13, "y":4},
+        {"label":"K4E (B4,F6)", "x":14, "y":4},
+        {"label":"K4F (B4,F7)", "x":15, "y":4}
+      ]
+    },
+    "LAYOUT_65_ansi_blocker_split_bs": {
+      "layout": [
+        {"label":"K00 (B0,C6)", "x":0, "y":0},
+        {"label":"K01 (B0,C7)", "x":1, "y":0},
+        {"label":"K02 (B0,D0)", "x":2, "y":0},
+        {"label":"K03 (B0,D1)", "x":3, "y":0},
+        {"label":"K04 (B0,D2)", "x":4, "y":0},
+        {"label":"K05 (B0,D3)", "x":5, "y":0},
+        {"label":"K06 (B0,D4)", "x":6, "y":0},
+        {"label":"K07 (B0,D5)", "x":7, "y":0},
+        {"label":"K08 (B0,D6)", "x":8, "y":0},
+        {"label":"K09 (B0,D7)", "x":9, "y":0},
+        {"label":"K0A (B0,F0)", "x":10, "y":0},
+        {"label":"K0B (B0,F1)", "x":11, "y":0},
+        {"label":"K0C (B0,F4)", "x":12, "y":0},
+        {"label":"K0D (B0,F5)", "x":13, "y":0},
+        {"label":"K0E (B0,F6)", "x":14, "y":0},
+        {"label":"K0F (B0,F7)", "x":15, "y":0},
+
+        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
+        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
+        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
+        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
+        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
+        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
+        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
+        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
+        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
+        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
+        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
+        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
+        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
+        {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
+        {"label":"K1F (B1,F7)", "x":15, "y":1},
+
+        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
+        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
+        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
+        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
+        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
+        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
+        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
+        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
+        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
+        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
+        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
+        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
+        {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
+        {"label":"K2F (B2,F7)", "x":15, "y":2},
+
+        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":2.25},
+        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
+        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
+        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
+        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
+        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
+        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
+        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
+        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
+        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
+        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
+        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
+        {"label":"K3E (B3,F6)", "x":14, "y":3},
+        {"label":"K3F (B3,F7)", "x":15, "y":3},
+
+        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
+        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
+        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
+        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
+        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
+        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
+        {"label":"K4D (B4,F5)", "x":13, "y":4},
+        {"label":"K4E (B4,F6)", "x":14, "y":4},
+        {"label":"K4F (B4,F7)", "x":15, "y":4}
+      ]
+    },
+    "LAYOUT_65_iso_blocker": {
+      "layout": [
+        {"label":"K00 (B0,C6)", "x":0, "y":0},
+        {"label":"K01 (B0,C7)", "x":1, "y":0},
+        {"label":"K02 (B0,D0)", "x":2, "y":0},
+        {"label":"K03 (B0,D1)", "x":3, "y":0},
+        {"label":"K04 (B0,D2)", "x":4, "y":0},
+        {"label":"K05 (B0,D3)", "x":5, "y":0},
+        {"label":"K06 (B0,D4)", "x":6, "y":0},
+        {"label":"K07 (B0,D5)", "x":7, "y":0},
+        {"label":"K08 (B0,D6)", "x":8, "y":0},
+        {"label":"K09 (B0,D7)", "x":9, "y":0},
+        {"label":"K0A (B0,F0)", "x":10, "y":0},
+        {"label":"K0B (B0,F1)", "x":11, "y":0},
+        {"label":"K0C (B0,F4)", "x":12, "y":0},
+        {"label":"K0D (B0,F5)", "x":13, "y":0, "w":2},
+        {"label":"K0F (B0,F7)", "x":15, "y":0},
+
+        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
+        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
+        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
+        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
+        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
+        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
+        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
+        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
+        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
+        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
+        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
+        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
+        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
+        {"label":"K1F (B1,F7)", "x":15, "y":1},
+
+        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
+        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
+        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
+        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
+        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
+        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
+        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
+        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
+        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
+        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
+        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
+        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
+        {"label":"K2E (B2,F6)", "x":12.75, "y":2},
+        {"label":"K1E (B1,F6)", "x":13.75, "y":1, "w":1.25, "h":2},
+        {"label":"K2F (B2,F7)", "x":15, "y":2},
+
+        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
+        {"label":"K31 (B3,C7)", "x":1.25, "y":3},
+        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
+        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
+        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
+        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
+        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
+        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
+        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
+        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
+        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
+        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
+        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
+        {"label":"K3E (B3,F6)", "x":14, "y":3},
+        {"label":"K3F (B3,F7)", "x":15, "y":3},
+
+        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
+        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
+        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
+        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
+        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
+        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
+        {"label":"K4D (B4,F5)", "x":13, "y":4},
+        {"label":"K4E (B4,F6)", "x":14, "y":4},
+        {"label":"K4F (B4,F7)", "x":15, "y":4}
+      ]
+    },
+    "LAYOUT_65_iso_blocker_split_bs": {
+      "layout": [
+        {"label":"K00 (B0,C6)", "x":0, "y":0},
+        {"label":"K01 (B0,C7)", "x":1, "y":0},
+        {"label":"K02 (B0,D0)", "x":2, "y":0},
+        {"label":"K03 (B0,D1)", "x":3, "y":0},
+        {"label":"K04 (B0,D2)", "x":4, "y":0},
+        {"label":"K05 (B0,D3)", "x":5, "y":0},
+        {"label":"K06 (B0,D4)", "x":6, "y":0},
+        {"label":"K07 (B0,D5)", "x":7, "y":0},
+        {"label":"K08 (B0,D6)", "x":8, "y":0},
+        {"label":"K09 (B0,D7)", "x":9, "y":0},
+        {"label":"K0A (B0,F0)", "x":10, "y":0},
+        {"label":"K0B (B0,F1)", "x":11, "y":0},
+        {"label":"K0C (B0,F4)", "x":12, "y":0},
+        {"label":"K0D (B0,F5)", "x":13, "y":0},
+        {"label":"K0E (B0,F6)", "x":14, "y":0},
+        {"label":"K0F (B0,F7)", "x":15, "y":0},
+
+        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
+        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
+        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
+        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
+        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
+        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
+        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
+        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
+        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
+        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
+        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
+        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
+        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
+        {"label":"K1F (B1,F7)", "x":15, "y":1},
+
+        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
+        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
+        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
+        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
+        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
+        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
+        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
+        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
+        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
+        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
+        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
+        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
+        {"label":"K2E (B2,F6)", "x":12.75, "y":2},
+        {"label":"K1E (B1,F6)", "x":13.75, "y":1, "w":1.25, "h":2},
+        {"label":"K2F (B2,F7)", "x":15, "y":2},
+
+        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
+        {"label":"K31 (B3,C7)", "x":1.25, "y":3},
+        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
+        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
+        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
+        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
+        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
+        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
+        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
+        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
+        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
+        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
+        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
+        {"label":"K3E (B3,F6)", "x":14, "y":3},
+        {"label":"K3F (B3,F7)", "x":15, "y":3},
+
+        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
+        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
+        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
+        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
+        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
+        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
+        {"label":"K4D (B4,F5)", "x":13, "y":4},
+        {"label":"K4E (B4,F6)", "x":14, "y":4},
+        {"label":"K4F (B4,F7)", "x":15, "y":4}
       ]
     }
   },
diff --git a/keyboards/ft/mars65/mars65.h b/keyboards/ft/mars65/mars65.h
index 73850e51c6..8627ad09bb 100644
--- a/keyboards/ft/mars65/mars65.h
+++ b/keyboards/ft/mars65/mars65.h
@@ -50,6 +50,62 @@
     { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }, \
 }
 
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
+    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
+}
+
+#define LAYOUT_65_ansi_blocker_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
+}
+
+#define LAYOUT_65_iso_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
+    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K1E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
+}
+
+#define LAYOUT_65_iso_blocker_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K1E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
+}
+
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
 

From 8833b283610ce34e9be65ed3fc2c477258188de7 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 7 Sep 2022 03:07:08 +1000
Subject: [PATCH 312/959] Remove `UNICODE_KEY_OSX` and `UC_OSX` (#18290)

---
 docs/feature_unicode.md                                  | 2 --
 keyboards/atreus/keymaps/xk/keymap.c                     | 2 +-
 keyboards/atreus62/keymaps/d4mation/keymap.c             | 2 +-
 .../converter/ibm_terminal/keymaps/priyadi/keymap.c      | 2 +-
 keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h  | 2 +-
 keyboards/handwired/promethium/keymaps/default/keymap.c  | 4 ++--
 keyboards/handwired/promethium/keymaps/priyadi/keymap.c  | 4 ++--
 keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c  | 2 +-
 keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h | 2 +-
 .../kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md      | 2 +-
 keyboards/lets_split/keymaps/xk/keymap.c                 | 2 +-
 .../mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c      | 4 ++--
 keyboards/planck/keymaps/buhearns/config.h               | 2 +-
 keyboards/planck/keymaps/luke/keymap.c                   | 2 +-
 keyboards/planck/keymaps/snowkuma/keymap.c               | 2 +-
 keyboards/spaceman/2_milk/keymaps/emoji/config.h         | 2 +-
 keyboards/spaceman/2_milk/keymaps/emoji/readme.md        | 2 +-
 keyboards/yatara/drink_me/keymaps/queen/config.h         | 2 +-
 keyboards/yatara/drink_me/keymaps/queen/keymap.c         | 2 +-
 quantum/process_keycode/process_unicode_common.h         | 9 ---------
 users/arkag/arkag.c                                      | 2 +-
 users/sigma/sigma.c                                      | 2 +-
 22 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
index 94873d2827..0b06cae6c2 100644
--- a/docs/feature_unicode.md
+++ b/docs/feature_unicode.md
@@ -119,8 +119,6 @@ The following input modes are available:
 
   !> Using the _Unicode Hex Input_ input source may disable some Option-based shortcuts, such as Option+Left and Option+Right.
 
-  !> `UC_OSX` is a deprecated alias of `UC_MAC` that will be removed in future versions of QMK. All new keymaps should use `UC_MAC`.
-
 * **`UC_LNX`**: Linux built-in IBus Unicode input. Supports code points up to `0x10FFFF` (all possible code points).
 
   Enabled by default and works almost anywhere on IBus-enabled distros. Without IBus, this mode works under GTK apps, but rarely anywhere else.
diff --git a/keyboards/atreus/keymaps/xk/keymap.c b/keyboards/atreus/keymaps/xk/keymap.c
index 8264618004..e981d20ac2 100644
--- a/keyboards/atreus/keymaps/xk/keymap.c
+++ b/keyboards/atreus/keymaps/xk/keymap.c
@@ -302,7 +302,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
         return false;
         break;
       case OSX:
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
         return false;
         break;
     }
diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c
index 1f0cae666d..becf036233 100644
--- a/keyboards/atreus62/keymaps/d4mation/keymap.c
+++ b/keyboards/atreus62/keymaps/d4mation/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Runs just one time when the keyboard initializes. */
 void eeconfig_init_keymap( void ) {
-  set_unicode_input_mode( UC_OSX );
+  set_unicode_input_mode( UC_MAC );
 };
 
 bool process_record_keymap( uint16_t keycode, keyrecord_t *record ) {
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
index 3d6da6eab8..a530a4b83a 100644
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
+++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
@@ -289,7 +289,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
     case OS_MAC:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
       return false;
       break;
 
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
index f57ac64041..966bc5d064 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
@@ -1,3 +1,3 @@
 #define LEADER_TIMEOUT 300
 #define FORCE_NKRO
-#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
\ No newline at end of file
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
\ No newline at end of file
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index fcfcf51f24..7a6f7f09f2 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -606,7 +606,7 @@ void led_set_unicode_input_mode(void) {
     case UC_LNX:
       rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
       break;
-    case UC_OSX:
+    case UC_MAC:
       rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
       break;
     case UC_WIN:
@@ -1213,7 +1213,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
     case OSX:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 4df95111a7..17fd7a8419 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -609,7 +609,7 @@ void led_set_unicode_input_mode(void) {
     case UC_LNX:
       rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
       break;
-    case UC_OSX:
+    case UC_MAC:
       rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
       break;
     case UC_WIN:
@@ -1216,7 +1216,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
     case OSX:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index dc27913cca..d18b9928cb 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -161,7 +161,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void eeconfig_init_user(void) {
-  set_unicode_input_mode(UC_OSX);
+  set_unicode_input_mode(UC_MAC);
 }
 
 void matrix_init_user(void) {
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
index 2283439493..496e9d2b2c 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX, UC_OSX
+#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX, UC_MAC
 #define UNICODE_CYCLE_PERSIST false
 
 #ifdef RGB_DI_PIN
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
index f43610a28d..f277cc284a 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
@@ -88,7 +88,7 @@ UNI Layer
 * Umlauts
 * Punctuation
 * Special Characters
-* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UC_WINC, UC_WIN, UC_LNX, UC_OSX)
+* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UC_WINC, UC_WIN, UC_LNX, UC_MAC)
 
 ## 5 UNI2 Layer
 ```
diff --git a/keyboards/lets_split/keymaps/xk/keymap.c b/keyboards/lets_split/keymaps/xk/keymap.c
index 66be11e01c..2b5bf5bfef 100755
--- a/keyboards/lets_split/keymaps/xk/keymap.c
+++ b/keyboards/lets_split/keymaps/xk/keymap.c
@@ -358,7 +358,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
     return false;
     break;
   case OSX:
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
     return false;
     break;
    }
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
index 689a9ce36e..90020fd3f5 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
@@ -65,7 +65,7 @@ void matrix_scan_user(void) {
     }
     //tableflip (LEADER - TF)
     SEQ_TWO_KEYS(KC_T, KC_F) {
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
         send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
     }
     //screencap (LEADER - SC)
@@ -74,7 +74,7 @@ void matrix_scan_user(void) {
     }
     //screencap (LEADER - TM)
     SEQ_TWO_KEYS(KC_T, KC_M) {
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
         register_unicode(0x2122); // ™
     }
     /*
diff --git a/keyboards/planck/keymaps/buhearns/config.h b/keyboards/planck/keymaps/buhearns/config.h
index b8f3c18430..142fa1df21 100644
--- a/keyboards/planck/keymaps/buhearns/config.h
+++ b/keyboards/planck/keymaps/buhearns/config.h
@@ -2,7 +2,7 @@
 
 #ifdef AUDIO_ENABLE
   #define STARTUP_SONG      SONG(MARIO_MUSHROOM)
-  #define UNICODE_SONG_OSX  SONG(COIN_SOUND)
+  #define UNICODE_SONG_MAC  SONG(COIN_SOUND)
   #define UNICODE_SONG_LNX  SONG(UNICODE_LINUX)
   #define UNICODE_SONG_WIN  SONG(UNICODE_WINDOWS)
   #define UNICODE_SONG_WINC SONG(UNICODE_WINDOWS)
diff --git a/keyboards/planck/keymaps/luke/keymap.c b/keyboards/planck/keymaps/luke/keymap.c
index 1fa0ea0745..8f20a55867 100644
--- a/keyboards/planck/keymaps/luke/keymap.c
+++ b/keyboards/planck/keymaps/luke/keymap.c
@@ -325,7 +325,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
       set_unicode_input_mode(UC_LNX);
       break;
     case M_OSX:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
       break;
     case M_FUNCTION:
       if (record->event.pressed) {
diff --git a/keyboards/planck/keymaps/snowkuma/keymap.c b/keyboards/planck/keymaps/snowkuma/keymap.c
index fef6246b4a..3dbf680d95 100644
--- a/keyboards/planck/keymaps/snowkuma/keymap.c
+++ b/keyboards/planck/keymaps/snowkuma/keymap.c
@@ -369,5 +369,5 @@ void matrix_scan_user(void) {
 }
 
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
 }
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/config.h b/keyboards/spaceman/2_milk/keymaps/emoji/config.h
index 90e4d63102..2d86c008d5 100644
--- a/keyboards/spaceman/2_milk/keymaps/emoji/config.h
+++ b/keyboards/spaceman/2_milk/keymaps/emoji/config.h
@@ -1,2 +1,2 @@
-#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
 #define TAPPING_TERM 300
\ No newline at end of file
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/readme.md b/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
index 1d5a08730d..3bcc4831b3 100644
--- a/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
+++ b/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
@@ -16,7 +16,7 @@ You can change it permanently tapping 2 times the KeyOne to select the next mode
 
 ## Unicode Mode List
 - UC_LNX
-- UC_OSX
+- UC_MAC
 - UC_WIN
 - UC_WINC
 
diff --git a/keyboards/yatara/drink_me/keymaps/queen/config.h b/keyboards/yatara/drink_me/keymaps/queen/config.h
index 037c4737f6..ed8565a311 100644
--- a/keyboards/yatara/drink_me/keymaps/queen/config.h
+++ b/keyboards/yatara/drink_me/keymaps/queen/config.h
@@ -1 +1 @@
-#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
diff --git a/keyboards/yatara/drink_me/keymaps/queen/keymap.c b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
index 44da2b31ec..70b24be79d 100644
--- a/keyboards/yatara/drink_me/keymaps/queen/keymap.c
+++ b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
@@ -23,7 +23,7 @@ void td_diamond_osx (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_unicode(0x2666); // ♦
     } else {
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
     }
     reset_tap_dance(state);
 }
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index bdc7a1dedd..0fe672d26a 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -49,15 +49,6 @@
 #    define UNICODE_TYPE_DELAY 10
 #endif
 
-// Deprecated aliases
-#if !defined(UNICODE_KEY_MAC) && defined(UNICODE_KEY_OSX)
-#    define UNICODE_KEY_MAC UNICODE_KEY_OSX
-#endif
-#if !defined(UNICODE_SONG_MAC) && defined(UNICODE_SONG_OSX)
-#    define UNICODE_SONG_MAC UNICODE_SONG_OSX
-#endif
-#define UC_OSX UC_MAC
-
 enum unicode_input_modes {
     UC_MAC,   // macOS using Unicode Hex Input
     UC_LNX,   // Linux using IBus
diff --git a/users/arkag/arkag.c b/users/arkag/arkag.c
index da85d4f6d4..00abbf2ae3 100644
--- a/users/arkag/arkag.c
+++ b/users/arkag/arkag.c
@@ -190,7 +190,7 @@ void set_os (uint8_t os, bool update) {
   }
   switch (os) {
   case OS_MAC:
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
     underglow = (Color){ 213, 255, 255 };
     break;
   case OS_WIN:
diff --git a/users/sigma/sigma.c b/users/sigma/sigma.c
index 8470060a53..64fa68228b 100644
--- a/users/sigma/sigma.c
+++ b/users/sigma/sigma.c
@@ -67,7 +67,7 @@ void set_os(uint8_t os) {
 #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
   switch (os) {
   case _OS_MACOS:
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
     break;
   case _OS_LINUX:
     set_unicode_input_mode(UC_LNX);

From 60cac6d93811e931eea4438f04c2029d140afe96 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 6 Sep 2022 18:08:48 +0100
Subject: [PATCH 313/959] Discourage use of ENCODER_MAP at keyboard level
 (#18286)

* Discourage use of ENCODER_MAP at keyboard level

* Update docs/feature_encoders.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/feature_encoders.md | 4 +++-
 docs/pr_checklist.md     | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index fdde03ac23..2e4a4fe324 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -69,7 +69,7 @@ Additionally, if one side does not have an encoder, you can specify `{}` for the
 
 ## Encoder map :id=encoder-map
 
-Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your `rules.mk`:
+Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your keymap's `rules.mk`:
 
 ```make
 ENCODER_MAP_ENABLE = yes
@@ -88,6 +88,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 ```
 
+?> This should only be enabled at the keymap level.
+
 ## Callbacks
 
 When not using `ENCODER_MAP_ENABLE = yes`, the callback functions can be inserted into your `<keyboard>.c`:
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index ae5cb5eef6..1034631863 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -67,6 +67,9 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - no `(-/+size)` comments related to enabling features
     - remove the list of alternate bootloaders if one has been specified
     - no re-definitions of the default MCU parameters if same value, when compared to the equivalent MCU in [mcu_selection.mk](https://github.com/qmk/qmk_firmware/blob/master/builddefs/mcu_selection.mk)
+    - no "keymap only" features enabled
+      - `COMBO_ENABLE`
+      - `ENCODER_MAP_ENABLE`
 - keyboard `config.h`
     - don't repeat `MANUFACTURER` in the `PRODUCT` value
     - no `#define DESCRIPTION`

From 7160487ccdd1ea6d07816290a95c42e49cc350ef Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 6 Sep 2022 10:36:37 -0700
Subject: [PATCH 314/959] Fungo rev1: fix QMK Configurator key sequence
 (#18293)

* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence
---
 keyboards/fungo/rev1/info.json | 168 +++++++++++++++------------------
 1 file changed, 77 insertions(+), 91 deletions(-)

diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index d34e95d578..6941d70d81 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -11,101 +11,87 @@
   "layouts": {
     "LAYOUT_fungo_split_num": {
       "layout": [
-                {"x": 0, "y": 0.375},
-                {"x": 1, "y": 0.375},
-                {"x": 2, "y": 0.125},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0.125},
-                {"x": 5, "y": 0.25},
-                {"x": 6, "y": 0.5},
+        {"x":0, "y":0.375},
+        {"x":1, "y":0.375},
+        {"x":2, "y":0.125},
+        {"x":3, "y":0},
+        {"x":4, "y":0.125},
+        {"x":5, "y":0.25},
+        {"x":6, "y":0.5},
+        {"x":12, "y":0.5},
+        {"x":13, "y":0.25},
+        {"x":14, "y":0.125},
+        {"x":15, "y":0},
+        {"x":16, "y":0.125},
+        {"x":17, "y":0.375},
+        {"x":18, "y":0.375},
 
-                {"x": 12, "y": 0.5},
-                {"x": 13, "y": 0.25},
-                {"x": 14, "y": 0.125},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0.125},
-                {"x": 17, "y": 0.375},
-                {"x": 18, "y": 0.375},
-				
+        {"x":0, "y":1.375},
+        {"x":1, "y":1.375},
+        {"x":2, "y":1.125},
+        {"x":3, "y":1},
+        {"x":4, "y":1.125},
+        {"x":5, "y":1.25},
+        {"x":6, "y":1.5},
+        {"x":12, "y":1.5},
+        {"x":13, "y":1.25},
+        {"x":14, "y":1.125},
+        {"x":15, "y":1},
+        {"x":16, "y":1.125},
+        {"x":17, "y":1.375},
+        {"x":18, "y":1.375},
 
-                {"x": 0, "y": 1.375},
-                {"x": 1, "y": 1.375},
-                {"x": 2, "y": 1.125},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1.125},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.5},
+        {"x":0, "y":2.375},
+        {"x":1, "y":2.375},
+        {"x":2, "y":2.125},
+        {"x":3, "y":2},
+        {"x":4, "y":2.125},
+        {"x":5, "y":2.25},
+        {"x":6, "y":2.5},
+        {"x":12, "y":2.5},
+        {"x":13, "y":2.25},
+        {"x":14, "y":2.125},
+        {"x":15, "y":2},
+        {"x":16, "y":2.125},
+        {"x":17, "y":2.375},
+        {"x":18, "y":2.375},
 
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.125},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1.125},
-                {"x": 17, "y": 1.375},
-                {"x": 18, "y": 1.375},
-				
-		{"x": 0, "y": 2.375},
-                {"x": 1, "y": 2.375},
-                {"x": 2, "y": 2.125},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2.125},
-                {"x": 5, "y": 2.25},
-                {"x": 6, "y": 2.5},
+        {"x":0, "y":3.375},
+        {"x":1, "y":3.375},
+        {"x":2, "y":3.125},
+        {"x":3, "y":3},
+        {"x":4, "y":3.125},
+        {"x":5, "y":3.25},
+        {"x":6, "y":3.5},
+        {"x":7, "y":4},
+        {"x":8.25, "y":3.75},
+        {"x":9.75, "y":3.75},
+        {"x":11, "y":4},
+        {"x":12, "y":3.5},
+        {"x":13, "y":3.25},
+        {"x":14, "y":3.125},
+        {"x":15, "y":3},
+        {"x":16, "y":3.125},
+        {"x":17, "y":3.375},
+        {"x":18, "y":3.375},
 
-                {"x": 12, "y": 2.5},
-                {"x": 13, "y": 2.25},
-                {"x": 14, "y": 2.125},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2.125},
-                {"x": 17, "y": 2.375},
-                {"x": 18, "y": 2.375},
-				
-		{"x": 0, "y": 3.375},
-                {"x": 1, "y": 3.375},
-                {"x": 2, "y": 3.125},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3.125},
-                {"x": 5, "y": 3.25},
-                {"x": 6, "y": 3.5},
-
-                {"x": 12, "y": 3.5},
-                {"x": 13, "y": 3.25},
-                {"x": 14, "y": 3.125},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3.125},
-                {"x": 17, "y": 3.375},
-                {"x": 18, "y": 3.375},
-				
-		{"x": 0, "y": 4.375},
-                {"x": 1, "y": 4.375},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-                {"x": 5.25, "y": 3},
-		{"x": 5.75, "y": 5},
-		{"x": 7, "y": 4},
-					
-                {"x": 11, "y": 4},	
-                {"x": 13.25, "y": 5},	
-		{"x": 13.75, "y": 3},
-                {"x": 15, "y": 4.25},		
-                {"x": 16, "y": 4.25},				
-                {"x": 17, "y": 4.375},
-                {"x": 18, "y": 4.375},
-
-
-                {"x": 7, "y": 5},
-		{"x": 8.25, "y": 3.75},
-		{"x": 8.25, "y": 4.75},
-
-		{"x": 9.75, "y": 4.75},
-		{"x": 9.75, "y": 3.75},
-		{"x": 11, "y": 5},
-
-				
-				
-    
-                
-            ]
+        {"x":0, "y":4.375},
+        {"x":1, "y":4.375},
+        {"x":2, "y":4.25},
+        {"x":3, "y":4.25},
+        {"x":4.333, "y":4.25},
+        {"x":5.667, "y":4.625},
+        {"x":7, "y":5},
+        {"x":8.25, "y":4.75},
+        {"x":9.75, "y":4.75},
+        {"x":11, "y":5},
+        {"x":12.333, "y":4.625},
+        {"x":13.667, "y":4.25},
+        {"x":15, "y":4.25},
+        {"x":16, "y":4.25},
+        {"x":17, "y":4.375},
+        {"x":18, "y":4.375}
+      ]
     }
   }
 }

From dc4af81e0b375b559d270bbeb3495d61933f8c54 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:46:34 +0100
Subject: [PATCH 315/959] Remove legacy USE_SERIAL define (#18292)

* Remove legacy USE_SERIAL define

* tidy up missed comments
---
 keyboards/25keys/zinc/rev1/config.h           |  1 -
 keyboards/25keys/zinc/reva/config.h           |  1 -
 keyboards/40percentclub/25/config.h           |  1 -
 keyboards/40percentclub/6lit/config.h         |  2 --
 keyboards/40percentclub/foobar/config.h       |  2 --
 keyboards/40percentclub/half_n_half/config.h  |  1 -
 keyboards/a_dux/config.h                      |  3 --
 keyboards/adkb96/keymaps/default/config.h     |  2 --
 keyboards/alt34/rev1/config.h                 |  2 --
 keyboards/arabica37/rev1/config.h             |  1 -
 .../ergo42/keymaps/biacco-biacco/config.h     |  3 --
 .../ergo42/keymaps/biacco-macOS/config.h      |  5 ----
 .../ergo42/keymaps/biacco-underglow/config.h  |  5 ----
 .../ergo42/keymaps/biacco-winjp/config.h      |  5 ----
 .../biacco42/ergo42/keymaps/biacco/config.h   |  5 ----
 .../keymaps/default-illustrator/config.h      |  5 ----
 .../ergo42/keymaps/default-underglow/config.h |  5 ----
 .../biacco42/ergo42/keymaps/default/config.h  |  5 ----
 .../biacco42/ergo42/keymaps/hdbx/config.h     |  5 ----
 .../biacco42/ergo42/keymaps/ichi-t/config.h   |  5 ----
 .../biacco42/ergo42/keymaps/koba/config.h     |  5 ----
 .../biacco42/ergo42/keymaps/shinze/config.h   |  5 ----
 .../biacco42/ergo42/keymaps/yshrsmz/config.h  |  5 ----
 keyboards/boardsource/microdox/config.h       |  2 +-
 keyboards/cradio/config.h                     |  2 --
 keyboards/crkbd/config.h                      |  2 --
 keyboards/crkbd/keymaps/dsanchezseco/config.h |  3 --
 keyboards/crkbd/keymaps/joe_scotto/config.h   |  4 +--
 keyboards/crkbd/r2g/config.h                  |  1 -
 keyboards/crkbd/rev1/config.h                 |  1 -
 .../deltasplit75/keymaps/default/config.h     |  2 --
 .../deltasplit75/keymaps/itsaferbie/config.h  |  2 --
 .../deltasplit75/keymaps/mbsurfer/config.h    |  2 --
 .../deltasplit75/keymaps/protosplit/config.h  |  2 --
 keyboards/dm9records/ergoinu/config.h         |  2 --
 keyboards/draculad/config.h                   |  2 --
 keyboards/ergoslab/keymaps/default/config.h   |  5 ----
 keyboards/ergotravel/keymaps/default/config.h |  5 ----
 keyboards/ergotravel/keymaps/ian/config.h     |  5 ----
 keyboards/ergotravel/keymaps/jarred/config.h  |  3 --
 keyboards/ergotravel/keymaps/rs/config.h      |  5 ----
 keyboards/ergotravel/keymaps/via/config.h     |  5 ----
 keyboards/ergotravel/keymaps/yanfali/config.h |  5 ----
 keyboards/ferris/sweep/config.h               |  2 --
 .../fortitude60/keymaps/default/config.h      |  2 --
 keyboards/fortitude60/keymaps/via/config.h    |  2 --
 keyboards/fungo/rev1/config.h                 |  4 +--
 .../brain/keymaps/klackygears/config.h        |  2 --
 .../handwired/chiron/keymaps/default/config.h |  1 -
 .../handwired/dactyl_manuform/3x5_3/config.h  |  4 ---
 .../4x5/keymaps/default/config.h              |  4 ---
 .../4x5/keymaps/dvorak/config.h               |  5 ----
 .../4x5/keymaps/ibnuda/config.h               |  5 ----
 .../4x6/keymaps/default/config.h              |  4 ---
 .../5x6/keymaps/333fred/config.h              |  1 -
 .../5x6/keymaps/default/config.h              |  2 --
 .../5x6/keymaps/impstyle/config.h             |  2 --
 .../5x6/keymaps/rishka/config.h               |  2 --
 .../5x6/keymaps/squirrel/config.h             |  3 --
 .../5x6/keymaps/swedish/config.h              |  3 --
 .../5x6/keymaps/thattolleyguy/config.h        |  4 ---
 .../dactyl_manuform/5x6/keymaps/uqs/config.h  |  2 --
 .../5x6_2_5/keymaps/default/config.h          |  2 --
 .../5x6_5/keymaps/333fred/config.h            |  1 -
 .../5x6_5/keymaps/cykedev/config.h            |  1 -
 .../5x6_5/keymaps/default/config.h            |  2 --
 .../5x6_5/keymaps/via/config.h                |  4 +--
 .../5x7/keymaps/default/config.h              |  2 --
 .../dactyl_manuform/5x7/keymaps/via/config.h  |  2 --
 .../6x6/keymaps/default/config.h              |  2 --
 .../dmote/62key/keymaps/default/config.h      |  2 --
 .../dactyl_promicro/keymaps/default/config.h  |  2 --
 .../dactyl_promicro/keymaps/impstyle/config.h |  2 --
 .../elrgo_s/keymaps/default/config.h          |  4 +--
 keyboards/handwired/ks63/config.h             |  1 -
 keyboards/handwired/myskeeb/config.h          |  1 -
 keyboards/handwired/not_so_minidox/config.h   |  2 --
 .../handwired/qc60/keymaps/wntrmln/config.h   |  2 --
 keyboards/handwired/split89/config.h          |  1 -
 .../split_5x7/keymaps/default/config.h        |  2 --
 .../split_5x7/keymaps/stef9998/config.h       |  4 +--
 .../handwired/unk/keymaps/default/config.h    |  2 --
 keyboards/handwired/unk/rev1/config.h         |  1 -
 keyboards/handwired/xealous/config.h          |  1 -
 keyboards/helix/pico/config.h                 |  4 ---
 keyboards/helix/rev2/config.h                 |  4 ---
 keyboards/ibnuda/squiggle/config.h            |  2 --
 keyboards/jian/rev1/config.h                  |  2 --
 keyboards/jian/rev2/config.h                  |  2 --
 keyboards/kagizaraya/scythe/config.h          |  3 +-
 keyboards/kakunpc/suihankey/alpha/config.h    |  2 --
 keyboards/kakunpc/suihankey/rev1/config.h     |  2 --
 .../kakunpc/suihankey/split/alpha/config.h    |  1 -
 .../kakunpc/suihankey/split/rev1/config.h     |  1 -
 keyboards/kapl/rev1/config.h                  |  3 --
 .../bfo9000/keymaps/abstractkb/config.h       |  5 ----
 .../keymaps/andylikescandy6x18/config.h       |  5 ----
 .../keymaps/insertsnideremarks/config.h       |  5 +---
 .../bfo9000/keymaps/tuesdayjohn/config.h      |  5 +---
 .../keebio/fourier/keymaps/default/config.h   |  1 -
 .../keebio/fourier/keymaps/maxim/config.h     |  5 ----
 .../keebio/iris/keymaps/333fred/config.h      |  1 -
 .../iris/keymaps/antonlindstrom/config.h      |  5 ----
 keyboards/keebio/iris/keymaps/ave-63/config.h |  5 ----
 .../keebio/iris/keymaps/bmoorey/config.h      |  7 +----
 keyboards/keebio/iris/keymaps/boo/config.h    |  3 --
 .../keebio/iris/keymaps/davidrambo/config.h   |  5 ----
 keyboards/keebio/iris/keymaps/dvorak/config.h |  4 ---
 .../keebio/iris/keymaps/edvorakjp/config.h    |  4 ---
 keyboards/keebio/iris/keymaps/emp/config.h    |  2 --
 keyboards/keebio/iris/keymaps/gary/config.h   |  5 ----
 .../keebio/iris/keymaps/gsigler/config.h      |  5 ----
 .../keebio/iris/keymaps/hbbisenieks/config.h  |  6 ----
 .../keebio/iris/keymaps/impstyle/config.h     |  3 --
 .../keebio/iris/keymaps/isolike/config.h      |  5 ----
 .../iris/keymaps/jasondunsmore/config.h       |  1 -
 keyboards/keebio/iris/keymaps/khord/config.h  |  5 ----
 keyboards/keebio/iris/keymaps/krusli/config.h |  5 ----
 .../keebio/iris/keymaps/mojitas/config.h      |  5 ----
 .../keebio/iris/keymaps/moonfall/config.h     |  5 ----
 .../iris/keymaps/olligranlund_nordic/config.h |  3 --
 .../keymaps/olligranlund_nordic_v2/config.h   |  5 +---
 keyboards/keebio/iris/keymaps/omgvee/config.h |  5 ----
 keyboards/keebio/iris/keymaps/pvinis/config.h |  4 ---
 keyboards/keebio/iris/keymaps/rs/config.h     |  5 ----
 .../keebio/iris/keymaps/sethBarberee/config.h |  5 ----
 keyboards/keebio/iris/keymaps/vyolle/config.h |  4 ---
 keyboards/keebio/iris/keymaps/wanleg/config.h |  3 --
 keyboards/keebio/iris/keymaps/xyverz/config.h |  1 -
 .../levinson/keymaps/drogglbecher/config.h    |  5 ----
 .../levinson/keymaps/issmirnov/config.h       |  5 ----
 .../keymaps/losinggeneration/config.h         |  5 ----
 .../levinson/keymaps/mmacdougall/config.h     |  5 ----
 .../keebio/levinson/keymaps/steno/config.h    |  4 ---
 .../levinson/keymaps/treadwell/config.h       |  5 ----
 .../levinson/keymaps/xtonhasvim/config.h      |  2 --
 .../keebio/nyquist/keymaps/DivergeJM/config.h |  2 --
 .../keebio/nyquist/keymaps/bramver/config.h   |  1 -
 .../nyquist/keymaps/danielhklein/config.h     |  3 +-
 .../keebio/nyquist/keymaps/jojiichan/config.h |  5 ----
 .../keebio/nyquist/keymaps/kim-kim/config.h   |  7 +----
 .../nyquist/keymaps/losinggeneration/config.h |  5 ----
 .../keebio/nyquist/keymaps/pitty/config.h     |  5 ----
 .../keebio/nyquist/keymaps/shovelpaw/config.h |  5 ----
 .../keebio/nyquist/keymaps/skug/config.h      |  3 --
 .../keebio/nyquist/keymaps/yshrsmz/config.h   |  5 ----
 .../keebio/quefrency/keymaps/bcat/config.h    |  7 -----
 .../quefrency/keymaps/bfiedler/config.h       |  5 ----
 .../quefrency/keymaps/bjohnson/config.h       |  5 ----
 .../keebio/quefrency/keymaps/bramver/config.h |  1 -
 .../quefrency/keymaps/default60/config.h      |  5 ----
 .../quefrency/keymaps/default65/config.h      |  4 ---
 .../quefrency/keymaps/joestrong/config.h      |  5 ----
 .../keebio/quefrency/keymaps/jonavin/config.h |  5 ----
 .../quefrency/keymaps/kingwangwong/config.h   |  4 ---
 .../quefrency/keymaps/rogthefrog/config.h     |  5 ----
 .../keymaps/unausgeschlafen/config.h          |  5 ----
 .../keebio/quefrency/keymaps/yoryer/config.h  |  5 ----
 .../keymaps/insertsnideremarks/config.h       |  3 --
 .../rorschach/keymaps/tuesdayjohn/config.h    |  3 --
 .../keebio/sinc/keymaps/sethBarberee/config.h |  5 ----
 .../gameroyadvance/keymaps/default/config.h   |  3 +-
 .../keymaps/default_all/config.h              |  3 +-
 keyboards/kudox/config.h                      |  2 --
 keyboards/kudox_full/config.h                 |  2 --
 keyboards/kudox_game/config.h                 |  2 --
 .../keymaps/DE_programming/config.h           |  4 ---
 .../lets_split/keymaps/DE_simple/config.h     |  5 ----
 keyboards/lets_split/keymaps/adam/config.h    |  5 ----
 .../keymaps/aerialviews007/config.h           |  4 ---
 .../lets_split/keymaps/cpeters1982/config.h   |  5 ----
 keyboards/lets_split/keymaps/default/config.h |  4 ---
 keyboards/lets_split/keymaps/dlaroe/config.h  |  5 ----
 keyboards/lets_split/keymaps/fabian/config.h  |  2 --
 keyboards/lets_split/keymaps/halvves/config.h |  4 ---
 .../keymaps/heartrobotninja/config.h          |  6 +---
 keyboards/lets_split/keymaps/henxing/config.h |  5 ----
 keyboards/lets_split/keymaps/hvp/config.h     |  4 ---
 keyboards/lets_split/keymaps/khord/config.h   |  5 ----
 .../lets_split/keymaps/mbsurfer/config.h      |  5 ----
 .../lets_split/keymaps/mekberg/README.md      |  4 ---
 keyboards/lets_split/keymaps/mekberg/config.h |  4 ---
 keyboards/lets_split/keymaps/mjt/config.h     |  2 --
 .../lets_split/keymaps/normacos/config.h      |  5 ----
 keyboards/lets_split/keymaps/pdl/config.h     |  5 ----
 keyboards/lets_split/keymaps/piemod/config.h  |  5 ----
 keyboards/lets_split/keymaps/pitty/config.h   |  5 ----
 keyboards/lets_split/keymaps/poker/config.h   |  5 ----
 keyboards/lets_split/keymaps/pyrol/config.h   |  2 --
 .../lets_split/keymaps/shaymdev/config.h      |  4 ---
 keyboards/lets_split/keymaps/smt/config.h     |  5 ----
 .../lets_split/keymaps/tylerwince/config.h    |  5 ----
 keyboards/lets_split/keymaps/via/config.h     |  4 ---
 .../lets_split/keymaps/vim-mode/config.h      |  5 ----
 keyboards/lets_split/keymaps/waples/config.h  |  4 ---
 keyboards/lets_split/keymaps/yshrsmz/config.h |  5 ----
 keyboards/lets_split/keymaps/zer09/config.h   |  5 ----
 keyboards/lime/rev1/config.h                  |  1 -
 keyboards/malevolti/lyra/rev1/config.h        | 29 +++++++++----------
 .../minidox/keymaps/alairock/config.h         |  2 --
 .../minidox/keymaps/bepo/config.h             |  2 --
 .../minidox/keymaps/dustypomerleau/config.h   |  1 -
 .../minidox/keymaps/rsthd_combos/config.h     |  1 -
 .../minidox/keymaps/that_canadian/config.h    |  4 +--
 .../minidox/keymaps/xyverz/config.h           |  2 --
 .../maple_computing/minidox/rev1/config.h     |  2 --
 keyboards/miniaxe/config.h                    |  4 +--
 keyboards/mint60/keymaps/default/config.h     |  4 ---
 keyboards/mint60/keymaps/eucalyn/config.h     |  4 ---
 keyboards/molecule/config.h                   |  1 -
 keyboards/momoka_ergo/config.h                |  5 ++--
 keyboards/obosob/steal_this_keyboard/config.h |  2 --
 .../ergodash/mini/keymaps/default/config.h    |  6 ----
 .../mini/keymaps/toyoshimahidenori/config.h   |  6 ----
 .../mini/keymaps/yoshimaru46/config.h         |  6 ----
 .../ergodash/rev1/keymaps/333fred/config.h    |  1 -
 .../ergodash/rev1/keymaps/default/config.h    |  6 ----
 .../rev1/keymaps/greenshadowmaker/config.h    |  6 ----
 .../ergodash/rev1/keymaps/m47ch4n/config.h    |  6 ----
 .../rev1/keymaps/nopunin10did/config.h        |  8 +----
 .../rev1/keymaps/shadowprogr/config.h         |  8 +----
 .../ergodash/rev1/keymaps/tw1t611/config.h    |  6 ----
 .../keymaps/yet-another-developer/config.h    |  5 ----
 keyboards/orthodox/keymaps/default/config.h   |  5 ----
 keyboards/orthodox/keymaps/drashna/config.h   |  3 --
 keyboards/orthodox/keymaps/oscillope/config.h |  3 --
 keyboards/orthodox/keymaps/pdl/config.h       |  6 ----
 keyboards/orthodox/keymaps/rfvizarra/config.h |  3 --
 keyboards/orthodox/keymaps/shaymdev/config.h  |  4 ---
 keyboards/orthodox/keymaps/xyverz/config.h    |  7 +----
 keyboards/pico/config.h                       |  2 --
 keyboards/pisces/config.h                     |  2 --
 keyboards/pluckey/config.h                    |  1 -
 keyboards/pteron36/config.h                   |  1 -
 keyboards/qwertyydox/keymaps/default/config.h |  5 ----
 keyboards/redox/keymaps/KL1RL/config.h        |  2 --
 keyboards/redox/keymaps/cykedev/config.h      |  1 -
 keyboards/redox/keymaps/default/config.h      |  4 ---
 .../redox/keymaps/eightbitraptor/config.h     |  4 ---
 keyboards/redox/keymaps/fculpo/config.h       |  4 ---
 keyboards/redox/keymaps/finex/config.h        |  4 ---
 keyboards/redox/keymaps/finex/readme.md       |  1 -
 keyboards/redox/keymaps/german/config.h       |  4 ---
 keyboards/redox/keymaps/italian/config.h      |  4 ---
 keyboards/redox/keymaps/jeherve/config.h      |  4 ---
 keyboards/redox/keymaps/nrichers/config.h     |  4 ---
 keyboards/redox/keymaps/ptillemans/config.h   |  4 ---
 .../redox/keymaps/thattolleyguy/config.h      |  3 --
 keyboards/redox/keymaps/tw1t611/config.h      |  4 ---
 keyboards/redox/keymaps/via/config.h          |  4 ---
 .../redox_media/keymaps/default/config.h      |  6 +---
 .../rgbkb/zen/rev1/keymaps/333fred/config.h   |  4 ---
 .../rgbkb/zen/rev1/keymaps/cwebster2/config.h |  4 ---
 .../rgbkb/zen/rev1/keymaps/default/config.h   |  5 ----
 .../zen/rev1/keymaps/jwlawrence/config.h      |  5 ----
 .../rgbkb/zen/rev1/keymaps/samae/config.h     |  5 ----
 .../rev1/keymaps/starcalleramethyst/config.h  |  8 +----
 .../rgbkb/zen/rev1/keymaps/xyverz/config.h    |  3 --
 .../naked48/keymaps/default/config.h          |  2 --
 keyboards/scatter42/config.h                  |  1 -
 keyboards/sofle/rev1/config.h                 |  1 -
 keyboards/spacetime/config.h                  |  1 -
 .../diverge3/keymaps/workman/readme.md        |  2 +-
 keyboards/z34/config.h                        |  2 --
 .../community/ortho_4x12/buswerks/config.h    | 15 ++++------
 .../ortho_4x12/colemak_mod_dh_wide/config.h   |  5 ----
 layouts/community/ortho_4x12/crs/config.h     |  4 ---
 layouts/community/ortho_4x12/drashna/config.h |  1 -
 .../community/ortho_4x12/ergodoxish/config.h  |  5 ----
 .../ortho_4x12/grahampheath/config.h          |  5 ----
 .../community/ortho_4x12/symbolic/config.h    |  7 -----
 layouts/community/ortho_4x12/wanleg/config.h  |  3 +-
 layouts/community/ortho_4x12/xyverz/config.h  |  2 --
 layouts/community/ortho_5x12/333fred/config.h |  1 -
 layouts/community/ortho_5x12/xyverz/config.h  |  1 -
 users/gary/gary.h                             |  1 -
 276 files changed, 46 insertions(+), 966 deletions(-)

diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 1b2ae25cd8..947f5ccfb1 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 /* Use I2C or Serial */
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* Select hand configuration */
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index f740f4d011..54a26cd5bc 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 /* Use I2C or Serial */
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* Select hand configuration */
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 9027cdac5f..06ace32eb5 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -18,7 +18,6 @@
 
 #include "config_common.h"
 
-#define USE_SERIAL
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index c886eb48da..4b2b97fcba 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index d507a2c445..502bbf38e3 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index f47788ce87..2851b909f1 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
-#define USE_SERIAL
 
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h
index ffda0a301c..c7e3775028 100644
--- a/keyboards/a_dux/config.h
+++ b/keyboards/a_dux/config.h
@@ -59,9 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Serial settings */
-#define USE_SERIAL
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D1
 
diff --git a/keyboards/adkb96/keymaps/default/config.h b/keyboards/adkb96/keymaps/default/config.h
index bef279a6d0..3f8d841423 100644
--- a/keyboards/adkb96/keymaps/default/config.h
+++ b/keyboards/adkb96/keymaps/default/config.h
@@ -20,9 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
 
-#define USE_SERIAL
 //#define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h
index 7027d449ec..38b4e5b50a 100644
--- a/keyboards/alt34/rev1/config.h
+++ b/keyboards/alt34/rev1/config.h
@@ -38,9 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Use I2C or Serial, not both */
 #define USE_I2C
-// #define USE_SERIAL
 
 /* Select hand configuration */
 #define EE_HANDS
diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
index b3a9fd3f89..b68709f63b 100644
--- a/keyboards/arabica37/rev1/config.h
+++ b/keyboards/arabica37/rev1/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* key matrix size */
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
index 360d6a5621..f12d6fb3d4 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 // #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
index efadfa8143..ee8c84e1ee 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/biacco/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h b/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
index efadfa8143..ee8c84e1ee 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/default/config.h b/keyboards/biacco42/ergo42/keymaps/default/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/default/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/default/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/config.h b/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
index 4f0704ae1a..7a67860718 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h b/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/config.h b/keyboards/biacco42/ergo42/keymaps/koba/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/koba/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/koba/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/shinze/config.h b/keyboards/biacco42/ergo42/keymaps/shinze/config.h
index 360d6a5621..f0717a4632 100644
--- a/keyboards/biacco42/ergo42/keymaps/shinze/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/shinze/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h b/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
index 1892ef6529..eb2dbd6dd0 100644
--- a/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/boardsource/microdox/config.h b/keyboards/boardsource/microdox/config.h
index 517e0e7376..aaab2bf0f6 100644
--- a/keyboards/boardsource/microdox/config.h
+++ b/keyboards/boardsource/microdox/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring of each half
 #define MATRIX_COL_PINS \
     { F4, F5, F6, F7, B1 }
-#define USE_SERIAL
+
 #define SOFT_SERIAL_PIN D2
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h
index 90a5401590..8a1127b47c 100644
--- a/keyboards/cradio/config.h
+++ b/keyboards/cradio/config.h
@@ -43,8 +43,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Serial settings */
-#define USE_SERIAL
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h
index 21f3aa0ab4..df17352d9c 100644
--- a/keyboards/crkbd/config.h
+++ b/keyboards/crkbd/config.h
@@ -61,5 +61,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define USE_SERIAL
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/config.h b/keyboards/crkbd/keymaps/dsanchezseco/config.h
index bece69ba67..4fd8fc94c4 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/config.h
+++ b/keyboards/crkbd/keymaps/dsanchezseco/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_MATRIX_I2C
-#define USE_SERIAL
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/crkbd/keymaps/joe_scotto/config.h b/keyboards/crkbd/keymaps/joe_scotto/config.h
index e38d4a9183..c76937eae4 100644
--- a/keyboards/crkbd/keymaps/joe_scotto/config.h
+++ b/keyboards/crkbd/keymaps/joe_scotto/config.h
@@ -61,6 +61,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define USE_SERIAL
-
-#define TAPPING_TERM 50
\ No newline at end of file
+#define TAPPING_TERM 50
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index e451612484..877a59fcc6 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* ws2812 RGB LED */
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 9f196a7166..d2a5a6b2c8 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* ws2812 RGB LED */
diff --git a/keyboards/deltasplit75/keymaps/default/config.h b/keyboards/deltasplit75/keymaps/default/config.h
index 307531da66..7a05469173 100644
--- a/keyboards/deltasplit75/keymaps/default/config.h
+++ b/keyboards/deltasplit75/keymaps/default/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/config.h b/keyboards/deltasplit75/keymaps/itsaferbie/config.h
index 24c3d5be23..f837c90ad4 100644
--- a/keyboards/deltasplit75/keymaps/itsaferbie/config.h
+++ b/keyboards/deltasplit75/keymaps/itsaferbie/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/config.h b/keyboards/deltasplit75/keymaps/mbsurfer/config.h
index f14678a223..2a2e4ece9f 100644
--- a/keyboards/deltasplit75/keymaps/mbsurfer/config.h
+++ b/keyboards/deltasplit75/keymaps/mbsurfer/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/deltasplit75/keymaps/protosplit/config.h b/keyboards/deltasplit75/keymaps/protosplit/config.h
index f14678a223..2a2e4ece9f 100644
--- a/keyboards/deltasplit75/keymaps/protosplit/config.h
+++ b/keyboards/deltasplit75/keymaps/protosplit/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 7e6743d677..2171f37241 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index c4a3f82117..3570fb41e9 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DEBOUNCE 5
 
-
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 #ifdef OLED_ENABLE
diff --git a/keyboards/ergoslab/keymaps/default/config.h b/keyboards/ergoslab/keymaps/default/config.h
index 2c47a7440d..e15fd605f4 100644
--- a/keyboards/ergoslab/keymaps/default/config.h
+++ b/keyboards/ergoslab/keymaps/default/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/ergotravel/keymaps/default/config.h b/keyboards/ergotravel/keymaps/default/config.h
index 7461cf321d..b827d9ef32 100644
--- a/keyboards/ergotravel/keymaps/default/config.h
+++ b/keyboards/ergotravel/keymaps/default/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/ergotravel/keymaps/ian/config.h b/keyboards/ergotravel/keymaps/ian/config.h
index dea5b121ea..501919e057 100644
--- a/keyboards/ergotravel/keymaps/ian/config.h
+++ b/keyboards/ergotravel/keymaps/ian/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/ergotravel/keymaps/jarred/config.h b/keyboards/ergotravel/keymaps/jarred/config.h
index d64187b598..c2948493ed 100644
--- a/keyboards/ergotravel/keymaps/jarred/config.h
+++ b/keyboards/ergotravel/keymaps/jarred/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/ergotravel/keymaps/rs/config.h b/keyboards/ergotravel/keymaps/rs/config.h
index eeca26ce1d..e50534e99d 100644
--- a/keyboards/ergotravel/keymaps/rs/config.h
+++ b/keyboards/ergotravel/keymaps/rs/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/ergotravel/keymaps/via/config.h b/keyboards/ergotravel/keymaps/via/config.h
index 9b26bf4c9d..6d9ccb8d6d 100644
--- a/keyboards/ergotravel/keymaps/via/config.h
+++ b/keyboards/ergotravel/keymaps/via/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/ergotravel/keymaps/yanfali/config.h b/keyboards/ergotravel/keymaps/yanfali/config.h
index 072554991f..52ab36f2db 100644
--- a/keyboards/ergotravel/keymaps/yanfali/config.h
+++ b/keyboards/ergotravel/keymaps/yanfali/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
index 1708ec6e2b..a1043b73b5 100644
--- a/keyboards/ferris/sweep/config.h
+++ b/keyboards/ferris/sweep/config.h
@@ -42,8 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Serial settings */
-#define USE_SERIAL
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
diff --git a/keyboards/fortitude60/keymaps/default/config.h b/keyboards/fortitude60/keymaps/default/config.h
index ac47978bab..7e9b510ff6 100644
--- a/keyboards/fortitude60/keymaps/default/config.h
+++ b/keyboards/fortitude60/keymaps/default/config.h
@@ -16,5 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-#define USE_SERIAL
diff --git a/keyboards/fortitude60/keymaps/via/config.h b/keyboards/fortitude60/keymaps/via/config.h
index ac47978bab..7e9b510ff6 100644
--- a/keyboards/fortitude60/keymaps/via/config.h
+++ b/keyboards/fortitude60/keymaps/via/config.h
@@ -16,5 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-#define USE_SERIAL
diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h
index 5026099f7d..ff0444c71c 100644
--- a/keyboards/fungo/rev1/config.h
+++ b/keyboards/fungo/rev1/config.h
@@ -20,8 +20,6 @@
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D3	// RX8
 
 /* select keyboard  master board  - I2C or Serial communication master    */
@@ -38,7 +36,7 @@
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5}
 
 #define MATRIX_COL_PINS_RIGHT {F7, F6, F5, F4, B5, B4, E6}
-#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, D3}    	// TX   
+#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, D3}    	// TX
 
 
 
diff --git a/keyboards/handwired/brain/keymaps/klackygears/config.h b/keyboards/handwired/brain/keymaps/klackygears/config.h
index 4dd99c8b3a..5115f01801 100644
--- a/keyboards/handwired/brain/keymaps/klackygears/config.h
+++ b/keyboards/handwired/brain/keymaps/klackygears/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_SERIAL
-
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 150
 #define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index 08134a720b..e67664253c 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define MASTER_RIGHT
 //#define MASTER_LEFT
 
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
index 804db6c7e3..ccd9d0cdc4 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-// Communication
-// #define USE_I2C
-#define USE_SERIAL
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
index 18320c0952..335ac8cd3e 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-//#define USE_I2C
-
 /* Select hand configuration */
 //#define MASTER_LEFT
 //#define MASTER_RIGHT
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
index 6b0ddbfe8e..cbacb25ca4 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/config.h
index 07a1323db2..a597d848e2 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
index 18320c0952..335ac8cd3e 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-//#define USE_I2C
-
 /* Select hand configuration */
 //#define MASTER_LEFT
 //#define MASTER_RIGHT
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
index 87b5b66375..9ee1c3e3cb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define EE_HANDS
 
 #undef TAPPING_TERM
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
index 5a20f9473f..4d83c191f3 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 //#define MASTER_RIGHT
 
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
index d046806eaa..68900af390 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 //#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
index 98dc760031..bcfea1f14f 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// #define USE_SERIAL
 #define USE_I2C
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
index e8899a3689..626fe3cbdc 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 //#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
index 29ab59ad66..b63c5788d1 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 //#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
index 2caa5b5bd1..8625389eba 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define USE_SERIAL
-// #define USE_I2C
-
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
 #define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
index 4eca68c542..af5842e602 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define USE_SERIAL
-
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT {6,6}
 #define RGBLIGHT_LIMIT_VAL 127
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h
index c4fb3742d9..9c1430e431 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define EE_HANDS
 
 #define KINETIC_SPEED
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/config.h
index eea543ae24..68ea3f1933 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/config.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define EE_HANDS
 
 #undef TAPPING_TERM
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h
index 9ae7b44a69..5a94cd1760 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h
@@ -25,7 +25,6 @@
 #undef BOOTMAGIC_LITE_COLUMN_RIGHT
 
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 #define EE_HANDS
 // #define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h
index c4fb3742d9..9c1430e431 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define EE_HANDS
 
 #define KINETIC_SPEED
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/config.h
index dc2d3ee111..f898b9cbd3 100755
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define EE_HANDS
 
-#define KINETIC_SPEED
\ No newline at end of file
+#define KINETIC_SPEED
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
index 5a20f9473f..4d83c191f3 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 //#define MASTER_RIGHT
 
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
index 5a20f9473f..4d83c191f3 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 //#define MASTER_RIGHT
 
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
index 5a20f9473f..4d83c191f3 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 //#define MASTER_RIGHT
 
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
index 2e1d4f8dc3..1809262044 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
@@ -1,5 +1,3 @@
 #pragma once
 
-#define USE_SERIAL
-
 #define EE_HANDS
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/default/config.h b/keyboards/handwired/dactyl_promicro/keymaps/default/config.h
index ce8f3501ad..bbcd4fdcf6 100644
--- a/keyboards/handwired/dactyl_promicro/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_promicro/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_RIGHT
 // #define MASTER_RIGHT
 //#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/config.h b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/config.h
index ce8f3501ad..bbcd4fdcf6 100644
--- a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/config.h
+++ b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_RIGHT
 // #define MASTER_RIGHT
 //#define EE_HANDS
diff --git a/keyboards/handwired/elrgo_s/keymaps/default/config.h b/keyboards/handwired/elrgo_s/keymaps/default/config.h
index f3ef42b9b4..b5f8c85421 100644
--- a/keyboards/handwired/elrgo_s/keymaps/default/config.h
+++ b/keyboards/handwired/elrgo_s/keymaps/default/config.h
@@ -12,11 +12,9 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */ 
+ */
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h
index 565c48ab9e..31ea4bbe32 100644
--- a/keyboards/handwired/ks63/config.h
+++ b/keyboards/handwired/ks63/config.h
@@ -68,5 +68,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 #define MASTER_LEFT
-#define USE_SERIAL
 
diff --git a/keyboards/handwired/myskeeb/config.h b/keyboards/handwired/myskeeb/config.h
index 0e64b01274..06e8782290 100644
--- a/keyboards/handwired/myskeeb/config.h
+++ b/keyboards/handwired/myskeeb/config.h
@@ -15,7 +15,6 @@
 
 // Comunication and Split Detection
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D3
 #define SELECT_SOFT_SERIAL_SPEED 1
 #define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
index e137931a1a..66615a3927 100644
--- a/keyboards/handwired/not_so_minidox/config.h
+++ b/keyboards/handwired/not_so_minidox/config.h
@@ -31,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, D4 }
 
-#define USE_SERIAL
-
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
diff --git a/keyboards/handwired/qc60/keymaps/wntrmln/config.h b/keyboards/handwired/qc60/keymaps/wntrmln/config.h
index fabebda534..10887bdf18 100644
--- a/keyboards/handwired/qc60/keymaps/wntrmln/config.h
+++ b/keyboards/handwired/qc60/keymaps/wntrmln/config.h
@@ -1,5 +1,3 @@
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h
index 8cb8f4e1ea..b6e8157d2c 100644
--- a/keyboards/handwired/split89/config.h
+++ b/keyboards/handwired/split89/config.h
@@ -54,7 +54,6 @@ COLS = number of cols per side which curently needs to be equal so there are bla
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-#define USE_SERIAL
 
 //#define LED_NUM_LOCK_PIN B0
 //#define LED_CAPS_LOCK_PIN B1
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
index 2a19e47502..4afee280a0 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
index 3b7ee90f92..d8a98f8d40 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-//#define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
@@ -31,4 +29,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM_PER_KEY
 #define IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
\ No newline at end of file
+#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
diff --git a/keyboards/handwired/unk/keymaps/default/config.h b/keyboards/handwired/unk/keymaps/default/config.h
index 3d2b4c7be7..3d8851ac43 100644
--- a/keyboards/handwired/unk/keymaps/default/config.h
+++ b/keyboards/handwired/unk/keymaps/default/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
index 611b415d7a..a3e09f1aad 100644
--- a/keyboards/handwired/unk/rev1/config.h
+++ b/keyboards/handwired/unk/rev1/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D0
 
 /* define if matrix has ghost */
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index 2502b4d196..1d94be5a7e 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
 #define USE_I2C
 #define SCL_CLOCK  800000UL
 
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index 461fbd426b..b96c9c51cf 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -22,10 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
-/* Use I2C or Serial */
-#define USE_SERIAL
-//#define USE_MATRIX_I2C
-
 /* Soft Serial defines */
 #define SOFT_SERIAL_PIN D2
 #define SERIAL_SLAVE_BUFFER_LENGTH  ((MATRIX_ROWS)/2)
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index c7e9e35db5..2183bf7227 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 
-/* Use I2C or Serial */
-#define USE_SERIAL
-//#define USE_MATRIX_I2C
-
 /* Soft Serial defines */
 #define SOFT_SERIAL_PIN D2
 #define SERIAL_USE_MULTI_TRANSACTION
diff --git a/keyboards/ibnuda/squiggle/config.h b/keyboards/ibnuda/squiggle/config.h
index 9e4c4f71bc..c12bc97dd8 100644
--- a/keyboards/ibnuda/squiggle/config.h
+++ b/keyboards/ibnuda/squiggle/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 988b6d5176..9ac9ad9551 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D3, D2, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
 
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index 52c8b6ad0e..d44a2b099a 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F4, F5, B1, B3 }
 #define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
 
-//#define USE_I2C
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D1
 
 //#define EE_HANDS
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 1df0fb6593..8baa3816f5 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 9 
+#define RGBLED_NUM 9
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -114,7 +114,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define BOOTMAGIC_LITE_COLUMN 0
 
 /* Serial settings */
-#define USE_SERIAL
 //#define EE_HANDS
 #define I2C_MASTER_LEFT
 //#define I2C_MASTER_RIGHT
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index 2d20aa16e9..a0d75d4407 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -35,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-// #define USE_I2C
-// #undef USE_SERIAL
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index a1e7183124..3757b6cad7 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -35,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7 }
-//#define USE_I2C
-//#undef USE_SERIAL
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index b58b370e66..109eeee7eb 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
 #define USE_I2C
-#undef USE_SERIAL
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index 14b5b2ad9d..2667ed6bb6 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7 }
 #define USE_I2C
-#undef USE_SERIAL
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index ef6e5449f6..ae88c86572 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -18,9 +18,6 @@
 #define DEBOUNCE 5
 
 
-/* Serial settings */
-#define USE_SERIAL
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h b/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
index 67c64fd8e8..c44c64603d 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
index be57e385ef..786e107f9c 100644
--- a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
index 344634063c..2e2f45ea1f 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
@@ -39,4 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGBLED_NUM 12
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
\ No newline at end of file
+// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
index 344634063c..2e2f45ea1f 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
@@ -39,4 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGBLED_NUM 12
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
\ No newline at end of file
+// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/fourier/keymaps/default/config.h b/keyboards/keebio/fourier/keymaps/default/config.h
index 8cea392181..fa952ef4c3 100644
--- a/keyboards/keebio/fourier/keymaps/default/config.h
+++ b/keyboards/keebio/fourier/keymaps/default/config.h
@@ -20,5 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
 // #define USE_I2C
diff --git a/keyboards/keebio/fourier/keymaps/maxim/config.h b/keyboards/keebio/fourier/keymaps/maxim/config.h
index fb13b56cdc..446b011153 100644
--- a/keyboards/keebio/fourier/keymaps/maxim/config.h
+++ b/keyboards/keebio/fourier/keymaps/maxim/config.h
@@ -22,8 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
diff --git a/keyboards/keebio/iris/keymaps/333fred/config.h b/keyboards/keebio/iris/keymaps/333fred/config.h
index 3c8ba4cb25..0c0250291c 100644
--- a/keyboards/keebio/iris/keymaps/333fred/config.h
+++ b/keyboards/keebio/iris/keymaps/333fred/config.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define EE_HANDS
 #define NO_ACTION_MACRO
 
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h b/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
index 0997e72512..36b3e42d7e 100644
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
+++ b/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/ave-63/config.h b/keyboards/keebio/iris/keymaps/ave-63/config.h
index 381a494b75..0d0c4764bb 100644
--- a/keyboards/keebio/iris/keymaps/ave-63/config.h
+++ b/keyboards/keebio/iris/keymaps/ave-63/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 #define PREVENT_STUCK_MODIFIERS
 #define TAPPING_TERM 150
 
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/config.h b/keyboards/keebio/iris/keymaps/bmoorey/config.h
index 9f8a9afab8..8f173a128b 100644
--- a/keyboards/keebio/iris/keymaps/bmoorey/config.h
+++ b/keyboards/keebio/iris/keymaps/bmoorey/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_RIGHT
@@ -35,4 +30,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define NO_ACTION_TAPPING
-#define NO_ACTION_ONESHOT
\ No newline at end of file
+#define NO_ACTION_ONESHOT
diff --git a/keyboards/keebio/iris/keymaps/boo/config.h b/keyboards/keebio/iris/keymaps/boo/config.h
index 6af7d40852..101fd6e8ce 100644
--- a/keyboards/keebio/iris/keymaps/boo/config.h
+++ b/keyboards/keebio/iris/keymaps/boo/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-
 /* Select hand configuration */
 #define MASTER_LEFT
 
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/config.h b/keyboards/keebio/iris/keymaps/davidrambo/config.h
index 0c4bf8c8f4..bfa48ce0ce 100644
--- a/keyboards/keebio/iris/keymaps/davidrambo/config.h
+++ b/keyboards/keebio/iris/keymaps/davidrambo/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define PERMISSIVE_HOLD
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/dvorak/config.h b/keyboards/keebio/iris/keymaps/dvorak/config.h
index d37d3c3123..4576a6d639 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/config.h
+++ b/keyboards/keebio/iris/keymaps/dvorak/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index f296e29769..864cedae98 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h
index a08db4d170..9f1982935a 100644
--- a/keyboards/keebio/iris/keymaps/emp/config.h
+++ b/keyboards/keebio/iris/keymaps/emp/config.h
@@ -17,9 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
 #undef USE_I2C
-#define USE_SERIAL
 
 /* Select hand configuration */
 #undef MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/gary/config.h b/keyboards/keebio/iris/keymaps/gary/config.h
index 186aee502c..e337f4403f 100644
--- a/keyboards/keebio/iris/keymaps/gary/config.h
+++ b/keyboards/keebio/iris/keymaps/gary/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/gsigler/config.h b/keyboards/keebio/iris/keymaps/gsigler/config.h
index e1793fb1b8..f568452d0a 100644
--- a/keyboards/keebio/iris/keymaps/gsigler/config.h
+++ b/keyboards/keebio/iris/keymaps/gsigler/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
index bb3fe25085..20384f4582 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/impstyle/config.h b/keyboards/keebio/iris/keymaps/impstyle/config.h
index 6fc14133f8..68b45c217d 100644
--- a/keyboards/keebio/iris/keymaps/impstyle/config.h
+++ b/keyboards/keebio/iris/keymaps/impstyle/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-//#define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/keebio/iris/keymaps/isolike/config.h b/keyboards/keebio/iris/keymaps/isolike/config.h
index 7986b50416..6d3194157e 100644
--- a/keyboards/keebio/iris/keymaps/isolike/config.h
+++ b/keyboards/keebio/iris/keymaps/isolike/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/jasondunsmore/config.h b/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
index 8799e01c18..e6fa61d3dd 100644
--- a/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
+++ b/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
 #define EE_HANDS
 #define TAPPING_TERM 150
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/keebio/iris/keymaps/khord/config.h b/keyboards/keebio/iris/keymaps/khord/config.h
index 9b44bca792..22e11c8798 100644
--- a/keyboards/keebio/iris/keymaps/khord/config.h
+++ b/keyboards/keebio/iris/keymaps/khord/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/krusli/config.h b/keyboards/keebio/iris/keymaps/krusli/config.h
index 72e35c4728..ec8bdffe88 100644
--- a/keyboards/keebio/iris/keymaps/krusli/config.h
+++ b/keyboards/keebio/iris/keymaps/krusli/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/mojitas/config.h b/keyboards/keebio/iris/keymaps/mojitas/config.h
index 24aecb9f84..d1c8bda27c 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/config.h
+++ b/keyboards/keebio/iris/keymaps/mojitas/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/moonfall/config.h b/keyboards/keebio/iris/keymaps/moonfall/config.h
index 7986b50416..6d3194157e 100644
--- a/keyboards/keebio/iris/keymaps/moonfall/config.h
+++ b/keyboards/keebio/iris/keymaps/moonfall/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
index 16c4302373..b78c52a460 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-//#define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
index c1acce7c38..5e06cb3ac3 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-//#define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
@@ -28,4 +25,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#undef RGBLED_NUM
\ No newline at end of file
+#undef RGBLED_NUM
diff --git a/keyboards/keebio/iris/keymaps/omgvee/config.h b/keyboards/keebio/iris/keymaps/omgvee/config.h
index c5899f45f0..c47ec74287 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/config.h
+++ b/keyboards/keebio/iris/keymaps/omgvee/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/pvinis/config.h b/keyboards/keebio/iris/keymaps/pvinis/config.h
index 19925d3a91..861c474e54 100644
--- a/keyboards/keebio/iris/keymaps/pvinis/config.h
+++ b/keyboards/keebio/iris/keymaps/pvinis/config.h
@@ -5,10 +5,6 @@
 #    define PRODUCT "Iris Keyboard - pvinis"
 #endif
 
-// Use I2C or Serial, not both.
-#define USE_SERIAL
-// #define USE_I2C
-
 // Select hand configuration.
 // #define MASTER_LEFT
 #define MASTER_RIGHT
diff --git a/keyboards/keebio/iris/keymaps/rs/config.h b/keyboards/keebio/iris/keymaps/rs/config.h
index 412862c872..8aed71e202 100644
--- a/keyboards/keebio/iris/keymaps/rs/config.h
+++ b/keyboards/keebio/iris/keymaps/rs/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/sethBarberee/config.h b/keyboards/keebio/iris/keymaps/sethBarberee/config.h
index bd2ec41210..61aa24ff01 100644
--- a/keyboards/keebio/iris/keymaps/sethBarberee/config.h
+++ b/keyboards/keebio/iris/keymaps/sethBarberee/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-//#define USE_I2C
-
 /* Select hand configuration */
 
 //#define MASTER_LEFT
diff --git a/keyboards/keebio/iris/keymaps/vyolle/config.h b/keyboards/keebio/iris/keymaps/vyolle/config.h
index 1adbd65b5a..49ad181d9b 100644
--- a/keyboards/keebio/iris/keymaps/vyolle/config.h
+++ b/keyboards/keebio/iris/keymaps/vyolle/config.h
@@ -17,11 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
 #define USE_I2C
-// #define USE_SERIAL
-
 
 #define FORCE_NKRO  //Cause it's suprisingly handy.
 
diff --git a/keyboards/keebio/iris/keymaps/wanleg/config.h b/keyboards/keebio/iris/keymaps/wanleg/config.h
index 9b90007688..6e774d9de7 100644
--- a/keyboards/keebio/iris/keymaps/wanleg/config.h
+++ b/keyboards/keebio/iris/keymaps/wanleg/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 #undef USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/keebio/iris/keymaps/xyverz/config.h b/keyboards/keebio/iris/keymaps/xyverz/config.h
index fab8591844..f6eb967943 100644
--- a/keyboards/keebio/iris/keymaps/xyverz/config.h
+++ b/keyboards/keebio/iris/keymaps/xyverz/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#define USE_SERIAL
 #define EE_HANDS
 
 #undef PRODUCT
diff --git a/keyboards/keebio/levinson/keymaps/drogglbecher/config.h b/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
index ef96ff00b1..1beb80a649 100644
--- a/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
+++ b/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
@@ -3,11 +3,6 @@
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-/* #define USE_I2C */
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/config.h b/keyboards/keebio/levinson/keymaps/issmirnov/config.h
index 2f0fbaf33c..6f6f362a8f 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/config.h
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-// Use serial comms for split keyboard
-// DO NOT enable USE_IDC - board will not respond.
-#define USE_SERIAL
-//#define USE_I2C
-
 #ifdef RGBLIGHT_ENABLE
    // Enable animations. +5500 bytes
    #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
index 13023939eb..41bfb4651f 100644
--- a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
@@ -18,11 +18,6 @@ long with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-/* #define USE_I2C */
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
index 63dd5bc88f..e3012bbe06 100644
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/steno/config.h b/keyboards/keebio/levinson/keymaps/steno/config.h
index 9cbc148e42..630cc6238f 100644
--- a/keyboards/keebio/levinson/keymaps/steno/config.h
+++ b/keyboards/keebio/levinson/keymaps/steno/config.h
@@ -17,11 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
 #define USE_I2C
-// #define USE_SERIAL
-
 
 #define FORCE_NKRO  //For Steno.
 
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/config.h b/keyboards/keebio/levinson/keymaps/treadwell/config.h
index 69783937b2..47f85f6dc3 100644
--- a/keyboards/keebio/levinson/keymaps/treadwell/config.h
+++ b/keyboards/keebio/levinson/keymaps/treadwell/config.h
@@ -3,11 +3,6 @@
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h b/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
index aaf1b7f049..53847db93a 100644
--- a/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/config.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define USE_SERIAL
-
 // #define MUSIC_MASK (keycode != KC_NO)
 
 /*
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h b/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
index 776834111d..43696b046c 100644
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 150 //reduce time required to register a held key
 
-#define USE_SERIAL
-
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
 #define EE_HANDS
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/config.h b/keyboards/keebio/nyquist/keymaps/bramver/config.h
index c908386e28..468e59af07 100644
--- a/keyboards/keebio/nyquist/keymaps/bramver/config.h
+++ b/keyboards/keebio/nyquist/keymaps/bramver/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define MASTER_LEFT
 
 #define TAPPING_TERM 200
diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
index 398b285b89..74499ede71 100644
--- a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
@@ -16,8 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define TAPPING_TERM 150 
-#define USE_SERIAL
+#define TAPPING_TERM 150
 #define EE_HANDS
 
 #ifdef SUBPROJECT_rev1
diff --git a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
index 39a3df26bf..544b7b7371 100644
--- a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
+++ b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
index a6246262e5..f3d8ae0a40 100644
--- a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
+++ b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
@@ -38,4 +33,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
index 56cacd843e..38d1939580 100644
--- a/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h
@@ -18,11 +18,6 @@ long with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-/* #define USE_I2C */
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/pitty/config.h b/keyboards/keebio/nyquist/keymaps/pitty/config.h
index efc75b22c7..b393e6a5f6 100644
--- a/keyboards/keebio/nyquist/keymaps/pitty/config.h
+++ b/keyboards/keebio/nyquist/keymaps/pitty/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
index d0adbfe0c8..72e0e422d6 100644
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/keebio/nyquist/keymaps/skug/config.h b/keyboards/keebio/nyquist/keymaps/skug/config.h
index c366863294..532cdafa97 100644
--- a/keyboards/keebio/nyquist/keymaps/skug/config.h
+++ b/keyboards/keebio/nyquist/keymaps/skug/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
index 5cbe3b7010..aafb73fa05 100644
--- a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
+++ b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* auto shift config */
 #define AUTO_SHIFT_TIMEOUT 140
 
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/config.h b/keyboards/keebio/quefrency/keymaps/bcat/config.h
index 69771d36ba..32510e9031 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bcat/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* Quefrency lacks I2C resistors on the right PCB, so the right half doesn't
- * work independently. (Presumably the floating I2C lines cause a problem.)
- * Using serial seems sufficiently fast in practice and allows both halves to be
- * used independently.
- */
-#define USE_SERIAL
-
 /* Use an extra LED on the right side since it's wider on the 65% PCB. */
 #undef RGBLED_NUM
 #define RGBLED_NUM 17
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
index e7d5ba9ca8..8a35b6f197 100644
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 // https://docs.qmk.fm/#/tap_hold?id=tap-hold-configuration-options
 #define TAPPING_TERM 120
 //#define PERMISSIVE_HOLD
diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
index 37c6d6672d..82ace2ef68 100644
--- a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
@@ -21,11 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 #define TAPPING_TERM 500
 
 #define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/config.h b/keyboards/keebio/quefrency/keymaps/bramver/config.h
index c908386e28..468e59af07 100644
--- a/keyboards/keebio/quefrency/keymaps/bramver/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bramver/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define MASTER_LEFT
 
 #define TAPPING_TERM 200
diff --git a/keyboards/keebio/quefrency/keymaps/default60/config.h b/keyboards/keebio/quefrency/keymaps/default60/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/default60/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default60/config.h
@@ -20,8 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/default65/config.h b/keyboards/keebio/quefrency/keymaps/default65/config.h
index f9efe78c5b..9aae0fdfc2 100644
--- a/keyboards/keebio/quefrency/keymaps/default65/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default65/config.h
@@ -21,7 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/config.h b/keyboards/keebio/quefrency/keymaps/joestrong/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/joestrong/config.h
+++ b/keyboards/keebio/quefrency/keymaps/joestrong/config.h
@@ -20,8 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/config.h b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
index b7883424bc..495638123a 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/config.h
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 #define TAPPING_TOGGLE 2
 // TT set to two taps
 
diff --git a/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h b/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
index bf632842e9..f636c95454 100644
--- a/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
+++ b/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
@@ -21,10 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-//#define USE_I2C
 #define USB_MAX_POWER_CONSUMPTION 50
 
 
diff --git a/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h b/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
index 2332c4f523..0eefd14dfe 100644
--- a/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
+++ b/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
@@ -21,8 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
+++ b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
@@ -20,8 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/yoryer/config.h b/keyboards/keebio/quefrency/keymaps/yoryer/config.h
index f9efe78c5b..497e05b540 100644
--- a/keyboards/keebio/quefrency/keymaps/yoryer/config.h
+++ b/keyboards/keebio/quefrency/keymaps/yoryer/config.h
@@ -20,8 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
index ed948a4b3b..0915bbba18 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
index 2048232c9c..3b95b3c4d7 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/keebio/sinc/keymaps/sethBarberee/config.h b/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
index 2d66aefc3e..343567273d 100644
--- a/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
+++ b/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-//
-//#define USE_SERIAL
-//#define USE_I2C
-
 //#ifdef RGBLIGHT_ENABLE
 //#   ifdef NORMAL_MODE
 //#       undef NORMAL_MODE
diff --git a/keyboards/keystonecaps/gameroyadvance/keymaps/default/config.h b/keyboards/keystonecaps/gameroyadvance/keymaps/default/config.h
index 693d5684c1..89e9628be8 100644
--- a/keyboards/keystonecaps/gameroyadvance/keymaps/default/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/keymaps/default/config.h
@@ -21,5 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_SERIAL
-#define EE_HANDS
\ No newline at end of file
+#define EE_HANDS
diff --git a/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/config.h b/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/config.h
index 693d5684c1..89e9628be8 100644
--- a/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/config.h
@@ -21,5 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_SERIAL
-#define EE_HANDS
\ No newline at end of file
+#define EE_HANDS
diff --git a/keyboards/kudox/config.h b/keyboards/kudox/config.h
index 36c8f68b90..e18d46f583 100644
--- a/keyboards/kudox/config.h
+++ b/keyboards/kudox/config.h
@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/kudox_full/config.h b/keyboards/kudox_full/config.h
index 82b8da8a41..82ea44faf2 100644
--- a/keyboards/kudox_full/config.h
+++ b/keyboards/kudox_full/config.h
@@ -5,8 +5,6 @@
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/kudox_game/config.h b/keyboards/kudox_game/config.h
index 0b789c1768..121e6632c8 100644
--- a/keyboards/kudox_game/config.h
+++ b/keyboards/kudox_game/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/DE_programming/config.h b/keyboards/lets_split/keymaps/DE_programming/config.h
index 145be14226..990d4ed8d5 100644
--- a/keyboards/lets_split/keymaps/DE_programming/config.h
+++ b/keyboards/lets_split/keymaps/DE_programming/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/DE_simple/config.h b/keyboards/lets_split/keymaps/DE_simple/config.h
index 5a6261c4f7..470fc07854 100644
--- a/keyboards/lets_split/keymaps/DE_simple/config.h
+++ b/keyboards/lets_split/keymaps/DE_simple/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
index 59a2e5db72..2819051c11 100644
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/aerialviews007/config.h b/keyboards/lets_split/keymaps/aerialviews007/config.h
index 60e23f816d..d9787a247f 100644
--- a/keyboards/lets_split/keymaps/aerialviews007/config.h
+++ b/keyboards/lets_split/keymaps/aerialviews007/config.h
@@ -26,10 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                               SONG(DVORAK_SOUND) \
                             }
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/cpeters1982/config.h b/keyboards/lets_split/keymaps/cpeters1982/config.h
index 3639b9c3f2..bff85f1414 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/config.h
+++ b/keyboards/lets_split/keymaps/cpeters1982/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/default/config.h b/keyboards/lets_split/keymaps/default/config.h
index 60e23f816d..d9787a247f 100644
--- a/keyboards/lets_split/keymaps/default/config.h
+++ b/keyboards/lets_split/keymaps/default/config.h
@@ -26,10 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                               SONG(DVORAK_SOUND) \
                             }
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/dlaroe/config.h b/keyboards/lets_split/keymaps/dlaroe/config.h
index 6b31e8d14e..e898e2ed2a 100644
--- a/keyboards/lets_split/keymaps/dlaroe/config.h
+++ b/keyboards/lets_split/keymaps/dlaroe/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/fabian/config.h b/keyboards/lets_split/keymaps/fabian/config.h
index 6ae40cc2ba..d05757233d 100644
--- a/keyboards/lets_split/keymaps/fabian/config.h
+++ b/keyboards/lets_split/keymaps/fabian/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/halvves/config.h b/keyboards/lets_split/keymaps/halvves/config.h
index 70f6d13c7b..4ba90f2cae 100644
--- a/keyboards/lets_split/keymaps/halvves/config.h
+++ b/keyboards/lets_split/keymaps/halvves/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/config.h b/keyboards/lets_split/keymaps/heartrobotninja/config.h
index bb3556e574..d4193609ad 100644
--- a/keyboards/lets_split/keymaps/heartrobotninja/config.h
+++ b/keyboards/lets_split/keymaps/heartrobotninja/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
@@ -55,4 +51,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../rev2fliphalf/config.h"
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/lets_split/keymaps/henxing/config.h b/keyboards/lets_split/keymaps/henxing/config.h
index 5a6261c4f7..470fc07854 100644
--- a/keyboards/lets_split/keymaps/henxing/config.h
+++ b/keyboards/lets_split/keymaps/henxing/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/hvp/config.h b/keyboards/lets_split/keymaps/hvp/config.h
index df24c53cde..43d8b0f597 100644
--- a/keyboards/lets_split/keymaps/hvp/config.h
+++ b/keyboards/lets_split/keymaps/hvp/config.h
@@ -26,10 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                               SONG(DVORAK_SOUND) \
                             }
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/khord/config.h b/keyboards/lets_split/keymaps/khord/config.h
index 71ec20dbc8..9d3cfca20d 100644
--- a/keyboards/lets_split/keymaps/khord/config.h
+++ b/keyboards/lets_split/keymaps/khord/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 150
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 //#define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/mbsurfer/config.h b/keyboards/lets_split/keymaps/mbsurfer/config.h
index 6469b4846d..666a2012bd 100644
--- a/keyboards/lets_split/keymaps/mbsurfer/config.h
+++ b/keyboards/lets_split/keymaps/mbsurfer/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 100
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 //#define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/mekberg/README.md b/keyboards/lets_split/keymaps/mekberg/README.md
index 5202ec8366..a24a573561 100644
--- a/keyboards/lets_split/keymaps/mekberg/README.md
+++ b/keyboards/lets_split/keymaps/mekberg/README.md
@@ -36,10 +36,6 @@ The special layer has Reset and EEP Reset keys on the left half, along with medi
 
 This option is used because otherwise modtap functions would fail to trigger. This increases reliability for me.
 
-### USE_SERIAL
-
-N/A
-
 ### EE_HANDS
 
 Prepared for EEPROM settings and different keymaps depending on USB port connected, but default master side remains left regardless.
diff --git a/keyboards/lets_split/keymaps/mekberg/config.h b/keyboards/lets_split/keymaps/mekberg/config.h
index 5523ecb5a3..41ce1b1566 100644
--- a/keyboards/lets_split/keymaps/mekberg/config.h
+++ b/keyboards/lets_split/keymaps/mekberg/config.h
@@ -24,10 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define TAPPING_TERM 150
 #define PERMISSIVE_HOLD
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 //#define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/mjt/config.h b/keyboards/lets_split/keymaps/mjt/config.h
index 735a58b11a..b82efab6b0 100644
--- a/keyboards/lets_split/keymaps/mjt/config.h
+++ b/keyboards/lets_split/keymaps/mjt/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/normacos/config.h b/keyboards/lets_split/keymaps/normacos/config.h
index 9f95a869df..e7b95250f3 100644
--- a/keyboards/lets_split/keymaps/normacos/config.h
+++ b/keyboards/lets_split/keymaps/normacos/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/pdl/config.h b/keyboards/lets_split/keymaps/pdl/config.h
index e79e132c64..89fd6ac202 100644
--- a/keyboards/lets_split/keymaps/pdl/config.h
+++ b/keyboards/lets_split/keymaps/pdl/config.h
@@ -24,11 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 200
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 //#define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/piemod/config.h b/keyboards/lets_split/keymaps/piemod/config.h
index c3975da3ca..b0ccdb0699 100644
--- a/keyboards/lets_split/keymaps/piemod/config.h
+++ b/keyboards/lets_split/keymaps/piemod/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/pitty/config.h b/keyboards/lets_split/keymaps/pitty/config.h
index 3798f9a647..9becb13968 100644
--- a/keyboards/lets_split/keymaps/pitty/config.h
+++ b/keyboards/lets_split/keymaps/pitty/config.h
@@ -3,11 +3,6 @@
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/poker/config.h b/keyboards/lets_split/keymaps/poker/config.h
index 5a6261c4f7..470fc07854 100644
--- a/keyboards/lets_split/keymaps/poker/config.h
+++ b/keyboards/lets_split/keymaps/poker/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/pyrol/config.h b/keyboards/lets_split/keymaps/pyrol/config.h
index f3502585d4..bc0ee4be35 100644
--- a/keyboards/lets_split/keymaps/pyrol/config.h
+++ b/keyboards/lets_split/keymaps/pyrol/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 #undef RGBLED_NUM
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h
index 300dc47c2e..1a46cdf108 100644
--- a/keyboards/lets_split/keymaps/shaymdev/config.h
+++ b/keyboards/lets_split/keymaps/shaymdev/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define _MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/smt/config.h b/keyboards/lets_split/keymaps/smt/config.h
index 5a6261c4f7..470fc07854 100644
--- a/keyboards/lets_split/keymaps/smt/config.h
+++ b/keyboards/lets_split/keymaps/smt/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/tylerwince/config.h b/keyboards/lets_split/keymaps/tylerwince/config.h
index 6fff5478da..1dc693d24b 100644
--- a/keyboards/lets_split/keymaps/tylerwince/config.h
+++ b/keyboards/lets_split/keymaps/tylerwince/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/via/config.h b/keyboards/lets_split/keymaps/via/config.h
index 334be75194..479470a93e 100644
--- a/keyboards/lets_split/keymaps/via/config.h
+++ b/keyboards/lets_split/keymaps/via/config.h
@@ -26,10 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                               SONG(DVORAK_SOUND) \
                             }
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/vim-mode/config.h b/keyboards/lets_split/keymaps/vim-mode/config.h
index 25512a5c97..1fe4384a25 100644
--- a/keyboards/lets_split/keymaps/vim-mode/config.h
+++ b/keyboards/lets_split/keymaps/vim-mode/config.h
@@ -26,11 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                               SONG(DVORAK_SOUND) \
                             }
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/lets_split/keymaps/waples/config.h b/keyboards/lets_split/keymaps/waples/config.h
index 5221fd011a..17172f729c 100644
--- a/keyboards/lets_split/keymaps/waples/config.h
+++ b/keyboards/lets_split/keymaps/waples/config.h
@@ -3,10 +3,6 @@
 
 #include "../../config.h"
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 //	#define MASTER_LEFT
 //  #define MASTER_RIGHT
diff --git a/keyboards/lets_split/keymaps/yshrsmz/config.h b/keyboards/lets_split/keymaps/yshrsmz/config.h
index 301f1ffc60..23426411d9 100644
--- a/keyboards/lets_split/keymaps/yshrsmz/config.h
+++ b/keyboards/lets_split/keymaps/yshrsmz/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* auto shift config */
 #define AUTO_SHIFT_TIMEOUT 150
 
diff --git a/keyboards/lets_split/keymaps/zer09/config.h b/keyboards/lets_split/keymaps/zer09/config.h
index 3990c3dc5b..36d94824d5 100644
--- a/keyboards/lets_split/keymaps/zer09/config.h
+++ b/keyboards/lets_split/keymaps/zer09/config.h
@@ -37,11 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USB_MAX_POWER_CONSUMPTION 50
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 /* #define MASTER_LEFT */
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index 3eaa4e2b60..942cb9c7b8 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -48,7 +48,6 @@
 #define TAP_CODE_DELAY 10
 
 /* communication between sides */
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 #define SPLIT_USB_DETECT
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
index 1e0628c6d3..5e4e98d1ff 100644
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ b/keyboards/malevolti/lyra/rev1/config.h
@@ -1,18 +1,18 @@
  /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 #pragma once
 
 /* key matrix size */
@@ -35,5 +35,4 @@
 #define DEBOUNCE 5
 
 /* communication between sides */
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
index 6b0069f4b2..c8f5acdea7 100644
--- a/keyboards/maple_computing/minidox/keymaps/alairock/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
@@ -24,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-#define USE_SERIAL
-
 #define EE_HANDS
 
 /* ws2812 RGB LED */
diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
index 7338c24c68..f2a669ec94 100644
--- a/keyboards/maple_computing/minidox/keymaps/bepo/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
@@ -1,6 +1,4 @@
 #pragma once
 
-#define USE_SERIAL
-
 #define EE_HANDS
 #define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
index b2169947b7..0cd6c2b994 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
@@ -6,7 +6,6 @@
 #define IGNORE_MOD_TAP_INTERRUPT
 #define ONESHOT_TIMEOUT 1000
 #define TAPPING_TERM 200
-#define USE_SERIAL
 
 // optional configuration:
 
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
index 1106412b59..37602b9163 100644
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#define USE_SERIAL
 #define EE_HANDS
 
 
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
index b85609127e..12ff1d970e 100644
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-#define USE_SERIAL
-
 #define EE_HANDS
 
 /* ws2812 RGB LED */
@@ -36,4 +34,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
index ae26f94999..ee2a418183 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-#define USE_SERIAL
-
 #define EE_HANDS
 
 /* ws2812 RGB LED */
diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h
index 6867fee4b5..fb12f4175a 100644
--- a/keyboards/maple_computing/minidox/rev1/config.h
+++ b/keyboards/maple_computing/minidox/rev1/config.h
@@ -23,6 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SOFT_SERIAL_PIN D0
 
-#define USE_SERIAL
-
 //#define EE_HANDS
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index 99ebf5b9af..a874688171 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -54,7 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 6 
+#define RGBLED_NUM 6
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -119,8 +119,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
 
-/* Serial settings */
-#define USE_SERIAL
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/mint60/keymaps/default/config.h b/keyboards/mint60/keymaps/default/config.h
index 9af2f45cfb..a044163108 100644
--- a/keyboards/mint60/keymaps/default/config.h
+++ b/keyboards/mint60/keymaps/default/config.h
@@ -16,8 +16,4 @@
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
-// #define USE_I2C
-
 // #define MASTER_RIGHT
diff --git a/keyboards/mint60/keymaps/eucalyn/config.h b/keyboards/mint60/keymaps/eucalyn/config.h
index 9af2f45cfb..a044163108 100644
--- a/keyboards/mint60/keymaps/eucalyn/config.h
+++ b/keyboards/mint60/keymaps/eucalyn/config.h
@@ -16,8 +16,4 @@
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
-// #define USE_I2C
-
 // #define MASTER_RIGHT
diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h
index 8f7396dfc8..d7f218f74f 100755
--- a/keyboards/molecule/config.h
+++ b/keyboards/molecule/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 // #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-// #define USE_SERIAL
 
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index e480581220..03bd5fdfc0 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 3	
+#define DEBOUNCE 3
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
@@ -107,8 +107,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0	
+//#define BOOTMAGIC_LITE_COLUMN 0
 
-#define USE_SERIAL
 #define SPLIT_USB_DETECT
 #define EE_HANDS
diff --git a/keyboards/obosob/steal_this_keyboard/config.h b/keyboards/obosob/steal_this_keyboard/config.h
index acb0d64b79..7060e2ae6a 100644
--- a/keyboards/obosob/steal_this_keyboard/config.h
+++ b/keyboards/obosob/steal_this_keyboard/config.h
@@ -51,8 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Serial settings */
-#define USE_SERIAL
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/default/config.h b/keyboards/omkbd/ergodash/mini/keymaps/default/config.h
index df04873a97..a597d848e2 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/default/config.h
+++ b/keyboards/omkbd/ergodash/mini/keymaps/default/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
index df04873a97..a597d848e2 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
+++ b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
index df04873a97..a597d848e2 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
+++ b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/333fred/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/config.h
index a8ad1e4fe7..cb50d1a34b 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/333fred/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/config.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define MASTER_LEFT
 
 #undef TAPPING_TERM
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h
index df04873a97..a597d848e2 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
index df04873a97..a597d848e2 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
index df04873a97..a597d848e2 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h
index b5c45669d4..9f734138b4 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
@@ -33,4 +27,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef TAPPING_TERM
-#define TAPPING_TERM 300
\ No newline at end of file
+#define TAPPING_TERM 300
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
index 4dcefdbcc6..2493fe09e2 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
@@ -33,4 +27,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 250
\ No newline at end of file
+#define LEADER_TIMEOUT 250
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
index df04873a97..a597d848e2 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/config.h
index 1005c48046..09bc62a14f 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/config.h
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 //#define MASTER_LEFT
diff --git a/keyboards/orthodox/keymaps/default/config.h b/keyboards/orthodox/keymaps/default/config.h
index ce4538b08a..3ba91a8fb2 100644
--- a/keyboards/orthodox/keymaps/default/config.h
+++ b/keyboards/orthodox/keymaps/default/config.h
@@ -21,11 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index caa69821a0..f82d427c05 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/orthodox/keymaps/oscillope/config.h b/keyboards/orthodox/keymaps/oscillope/config.h
index 3b1fd50007..363a637790 100644
--- a/keyboards/orthodox/keymaps/oscillope/config.h
+++ b/keyboards/orthodox/keymaps/oscillope/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/orthodox/keymaps/pdl/config.h b/keyboards/orthodox/keymaps/pdl/config.h
index 5fd46b41c6..ad9b6207b3 100644
--- a/keyboards/orthodox/keymaps/pdl/config.h
+++ b/keyboards/orthodox/keymaps/pdl/config.h
@@ -22,12 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/orthodox/keymaps/rfvizarra/config.h b/keyboards/orthodox/keymaps/rfvizarra/config.h
index 7ac207f0d3..fbe7ceb629 100644
--- a/keyboards/orthodox/keymaps/rfvizarra/config.h
+++ b/keyboards/orthodox/keymaps/rfvizarra/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
 #endif
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h
index 749302284a..39f7c8accd 100644
--- a/keyboards/orthodox/keymaps/shaymdev/config.h
+++ b/keyboards/orthodox/keymaps/shaymdev/config.h
@@ -21,10 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 #define EE_HANDS
 
 #undef RGBLED_NUM
diff --git a/keyboards/orthodox/keymaps/xyverz/config.h b/keyboards/orthodox/keymaps/xyverz/config.h
index a44d2b5aed..d8e91fa6d8 100644
--- a/keyboards/orthodox/keymaps/xyverz/config.h
+++ b/keyboards/orthodox/keymaps/xyverz/config.h
@@ -21,13 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
 // #define _MASTER_RIGHT
-// #define EE_HANDS
\ No newline at end of file
+// #define EE_HANDS
diff --git a/keyboards/pico/config.h b/keyboards/pico/config.h
index 36c8f68b90..e18d46f583 100644
--- a/keyboards/pico/config.h
+++ b/keyboards/pico/config.h
@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h
index 42db825e3e..8690a4e5f1 100644
--- a/keyboards/pisces/config.h
+++ b/keyboards/pisces/config.h
@@ -18,8 +18,6 @@
 
 #include "config_common.h"
 
-#define USE_SERIAL
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
index 152b8c3169..7aa146aa17 100644
--- a/keyboards/pluckey/config.h
+++ b/keyboards/pluckey/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODER_RESOLUTION_RIGHT 2
 
 /* communication between sides */
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index 96b5b42f86..32c962dcc0 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
- #define USE_SERIAL
 #define SOFT_SERIAL_PIN D3  // or D1, D2, D3, E6
 
 //#define LED_NUM_LOCK_PIN B0
diff --git a/keyboards/qwertyydox/keymaps/default/config.h b/keyboards/qwertyydox/keymaps/default/config.h
index cc85e4e2e8..504bee96de 100644
--- a/keyboards/qwertyydox/keymaps/default/config.h
+++ b/keyboards/qwertyydox/keymaps/default/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/redox/keymaps/KL1RL/config.h b/keyboards/redox/keymaps/KL1RL/config.h
index ea7525b388..5b9a8c161c 100644
--- a/keyboards/redox/keymaps/KL1RL/config.h
+++ b/keyboards/redox/keymaps/KL1RL/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/redox/keymaps/cykedev/config.h b/keyboards/redox/keymaps/cykedev/config.h
index 05ff248b6d..47bc84bd67 100644
--- a/keyboards/redox/keymaps/cykedev/config.h
+++ b/keyboards/redox/keymaps/cykedev/config.h
@@ -15,7 +15,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define MASTER_LEFT
 #undef  RGBLED_NUM
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/redox/keymaps/default/config.h b/keyboards/redox/keymaps/default/config.h
index a3ef209a05..39972d3e82 100644
--- a/keyboards/redox/keymaps/default/config.h
+++ b/keyboards/redox/keymaps/default/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/eightbitraptor/config.h b/keyboards/redox/keymaps/eightbitraptor/config.h
index d1b0012147..1810a97c9f 100644
--- a/keyboards/redox/keymaps/eightbitraptor/config.h
+++ b/keyboards/redox/keymaps/eightbitraptor/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/fculpo/config.h b/keyboards/redox/keymaps/fculpo/config.h
index bff76aef26..f14e8233f6 100644
--- a/keyboards/redox/keymaps/fculpo/config.h
+++ b/keyboards/redox/keymaps/fculpo/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 //#define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/finex/config.h b/keyboards/redox/keymaps/finex/config.h
index 8852a4cc87..bfad3bc6bf 100644
--- a/keyboards/redox/keymaps/finex/config.h
+++ b/keyboards/redox/keymaps/finex/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/finex/readme.md b/keyboards/redox/keymaps/finex/readme.md
index 9b88469a13..ae092e8064 100644
--- a/keyboards/redox/keymaps/finex/readme.md
+++ b/keyboards/redox/keymaps/finex/readme.md
@@ -3,7 +3,6 @@
 
 ## Features
 
-- Enabled USE_SERIAL for Falba.Tech Redox keyboards.
 - PC Layouts: Colemak Mod DH-MK, Qwerty.
 - Mac Layouts: same as above with CTRL-GUI keys inverted.
 - Added redundant `Space`, `Esc`, `Ctrl` and `Enter` keys. I like to have this
diff --git a/keyboards/redox/keymaps/german/config.h b/keyboards/redox/keymaps/german/config.h
index a3ef209a05..39972d3e82 100644
--- a/keyboards/redox/keymaps/german/config.h
+++ b/keyboards/redox/keymaps/german/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/italian/config.h b/keyboards/redox/keymaps/italian/config.h
index a3ef209a05..39972d3e82 100644
--- a/keyboards/redox/keymaps/italian/config.h
+++ b/keyboards/redox/keymaps/italian/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/jeherve/config.h b/keyboards/redox/keymaps/jeherve/config.h
index e3ed839f44..d467cc801e 100644
--- a/keyboards/redox/keymaps/jeherve/config.h
+++ b/keyboards/redox/keymaps/jeherve/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Change the default tapping toggle value (normally 5) */
 #define TAPPING_TOGGLE 2
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-//#define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/nrichers/config.h b/keyboards/redox/keymaps/nrichers/config.h
index a3ef209a05..39972d3e82 100755
--- a/keyboards/redox/keymaps/nrichers/config.h
+++ b/keyboards/redox/keymaps/nrichers/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/ptillemans/config.h b/keyboards/redox/keymaps/ptillemans/config.h
index a3ef209a05..39972d3e82 100644
--- a/keyboards/redox/keymaps/ptillemans/config.h
+++ b/keyboards/redox/keymaps/ptillemans/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/thattolleyguy/config.h b/keyboards/redox/keymaps/thattolleyguy/config.h
index 6e8de527cd..cf32745193 100644
--- a/keyboards/redox/keymaps/thattolleyguy/config.h
+++ b/keyboards/redox/keymaps/thattolleyguy/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-
 /* Select hand configuration */
 // #define MASTER_LEFT
 #define EE_HANDS
diff --git a/keyboards/redox/keymaps/tw1t611/config.h b/keyboards/redox/keymaps/tw1t611/config.h
index 2110642c54..894d50238a 100644
--- a/keyboards/redox/keymaps/tw1t611/config.h
+++ b/keyboards/redox/keymaps/tw1t611/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox/keymaps/via/config.h b/keyboards/redox/keymaps/via/config.h
index a3ef209a05..39972d3e82 100644
--- a/keyboards/redox/keymaps/via/config.h
+++ b/keyboards/redox/keymaps/via/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
diff --git a/keyboards/redox_media/keymaps/default/config.h b/keyboards/redox_media/keymaps/default/config.h
index 5da1f9060a..5970733b20 100644
--- a/keyboards/redox_media/keymaps/default/config.h
+++ b/keyboards/redox_media/keymaps/default/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 // #define MASTER_LEFT
-#define EE_HANDS
\ No newline at end of file
+#define EE_HANDS
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h b/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
index 38e5590d38..3d3186342f 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
@@ -24,10 +24,6 @@
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-
 /* Select hand configuration */
 //#define MASTER_LEFT
 #define EE_HANDS
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
index cdffe6fd50..c150da1cdd 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-
 #define EE_HANDS
 
 #ifdef COMBO_ENABLE
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
index 4a549c5b1f..76598a3ee5 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
index d813085e46..fa8d58e6c4 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // place overrides here
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h b/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h
index d7b37d5252..debae6aeb8 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
index d3d1a60ca9..91f63a55ba 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 starcalleramethyst 
+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
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
index d3e21ea172..f0ded5f66f 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
@@ -19,9 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 #define EE_HANDS
 
 #undef RGBLED_NUM
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
index 0e452bdb4a..4f3a44d6bb 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
@@ -22,7 +22,5 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-//#define USE_SERIAL
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h
index e271984760..a2c5cc6ec6 100644
--- a/keyboards/scatter42/config.h
+++ b/keyboards/scatter42/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-#define USE_SERIAL
 
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
index 26d35982df..f66588b43c 100644
--- a/keyboards/sofle/rev1/config.h
+++ b/keyboards/sofle/rev1/config.h
@@ -23,6 +23,5 @@
 #define TAP_CODE_DELAY 10
 
 /* communication between sides */
-#define USE_SERIAL
 #define SERIAL_USE_MULTI_TRANSACTION
 #define SOFT_SERIAL_PIN D2
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index b331c8bcab..14e305f2ab 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
-#define USE_SERIAL
 
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
diff --git a/keyboards/unikeyboard/diverge3/keymaps/workman/readme.md b/keyboards/unikeyboard/diverge3/keymaps/workman/readme.md
index 48ba482fe6..07a5fd9ed6 100644
--- a/keyboards/unikeyboard/diverge3/keymaps/workman/readme.md
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/readme.md
@@ -16,6 +16,6 @@ Reverts the number row to the normal 1, 2, 3, etc... for better gaming compatibi
 
 ## Layer 3 - Raise Layer
 
-Volume and backlight controls (although backlight is not fully functional using `USE_SERIAL` in `../config.h`).
+Volume and backlight controls.
 
 ![Raise Layer Misc Buttons Picture](https://i.imgur.com/50L3O62.png)
diff --git a/keyboards/z34/config.h b/keyboards/z34/config.h
index f63b2771fc..13e1188891 100644
--- a/keyboards/z34/config.h
+++ b/keyboards/z34/config.h
@@ -47,8 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Serial settings */
-#define USE_SERIAL
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
diff --git a/layouts/community/ortho_4x12/buswerks/config.h b/layouts/community/ortho_4x12/buswerks/config.h
index 8d6e26287e..f96d099db5 100644
--- a/layouts/community/ortho_4x12/buswerks/config.h
+++ b/layouts/community/ortho_4x12/buswerks/config.h
@@ -1,24 +1,19 @@
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
 // #define _MASTER_RIGHT
 // #define EE_HANDS
 
-#ifdef AUDIO_ENABLE 
-    #define STARTUP_SONG SONG(PLANCK_SOUND) 
-    // #define STARTUP_SONG SONG(NO_SOUND) 
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
     #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
                                 	SONG(COLEMAK_SOUND), \
                                     SONG(DVORAK_SOUND) \
-                                } 
-#endif 
+                                }
+#endif
 
 // MIDI notes can be sent when in Music mode
 #define MIDI_BASIC
diff --git a/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h b/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h
index 33e9342039..2f0c23b7f1 100644
--- a/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h
+++ b/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/crs/config.h b/layouts/community/ortho_4x12/crs/config.h
index 33e9342039..9ba64c921b 100644
--- a/layouts/community/ortho_4x12/crs/config.h
+++ b/layouts/community/ortho_4x12/crs/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
 
 /* Select hand configuration */
 
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 0b10a64eaa..1c88d66f3b 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -46,7 +46,6 @@
 #endif
 
 #if defined(KEYBOARD_lets_split_rev2)
-#    define USE_SERIAL
 #    undef USE_I2C
 #    define EE_HANDS
 #endif
diff --git a/layouts/community/ortho_4x12/ergodoxish/config.h b/layouts/community/ortho_4x12/ergodoxish/config.h
index 33e9342039..2f0c23b7f1 100644
--- a/layouts/community/ortho_4x12/ergodoxish/config.h
+++ b/layouts/community/ortho_4x12/ergodoxish/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/grahampheath/config.h b/layouts/community/ortho_4x12/grahampheath/config.h
index 8bc3d7762d..342c55cdea 100644
--- a/layouts/community/ortho_4x12/grahampheath/config.h
+++ b/layouts/community/ortho_4x12/grahampheath/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "keyboards/lets_split/config.h"
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 #define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/symbolic/config.h b/layouts/community/ortho_4x12/symbolic/config.h
index 3f88b4cc17..db74d0fdfa 100644
--- a/layouts/community/ortho_4x12/symbolic/config.h
+++ b/layouts/community/ortho_4x12/symbolic/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
 /* Select hand configuration */
 
 //#define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/wanleg/config.h b/layouts/community/ortho_4x12/wanleg/config.h
index bcf2756f6b..7ec47302bc 100644
--- a/layouts/community/ortho_4x12/wanleg/config.h
+++ b/layouts/community/ortho_4x12/wanleg/config.h
@@ -15,7 +15,6 @@
 #define QMK_LED B0
 #define QMK_ESC_OUTPUT F6 // usually COL
 #define QMK_ESC_INPUT D7 // usually ROW
-#define USE_SERIAL
 #undef USE_I2C
 #define EE_HANDS
 #endif
@@ -36,7 +35,7 @@
 
 // use alternate settings for 4x4 board using ProMicro instead of Micro
 // usage: make 4x4:wanleg PM=yes
-#if defined(KEYBOARD_40percentclub_4x4) && defined(PRO_MICRO) 
+#if defined(KEYBOARD_40percentclub_4x4) && defined(PRO_MICRO)
 #define QMK_ESC_OUTPUT F4 // usually COL
 #define QMK_ESC_INPUT D1 // usually ROW
 #define QMK_LED B0
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 287f4cc2b7..6486e0831c 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -3,8 +3,6 @@
 
 #define MIDI_BASIC
 
-#define USE_SERIAL
-
 #define EE_HANDS
 
 #undef RGBLED_NUM
diff --git a/layouts/community/ortho_5x12/333fred/config.h b/layouts/community/ortho_5x12/333fred/config.h
index bdbeead547..4327d154c2 100644
--- a/layouts/community/ortho_5x12/333fred/config.h
+++ b/layouts/community/ortho_5x12/333fred/config.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define MASTER_LEFT
 
 #undef  TAPPING_TERM
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index 5f9f6e5c11..46175c2eb1 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -23,7 +23,6 @@
 #endif
 
 // for the split boards //
-#define USE_SERIAL
 #define EE_HANDS
 
 #endif
diff --git a/users/gary/gary.h b/users/gary/gary.h
index 10f2331591..ce920cf776 100644
--- a/users/gary/gary.h
+++ b/users/gary/gary.h
@@ -1,7 +1,6 @@
 #include QMK_KEYBOARD_H
 
 #pragma once
-#define USE_SERIAL
 #define MASTER_LEFT
 
 // Layers

From a4d1d8b7450e409d007f6e795ffb1cee42a8e511 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Tue, 6 Sep 2022 17:42:43 -0400
Subject: [PATCH 316/959] Resolve conflict merging master to develop  (#18297)

* Discourage use of ENCODER_MAP at keyboard level (#18286)

* Discourage use of ENCODER_MAP at keyboard level

* Update docs/feature_encoders.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>

* Fungo rev1: fix QMK Configurator key sequence (#18293)

* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 docs/feature_encoders.md       |   4 +-
 docs/pr_checklist.md           |   3 +
 keyboards/fungo/rev1/info.json | 168 +++++++++++++++------------------
 3 files changed, 83 insertions(+), 92 deletions(-)

diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index f93ab9fd2d..60b613d6a5 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -69,7 +69,7 @@ Additionally, if one side does not have an encoder, you can specify `{}` for the
 
 ## Encoder map :id=encoder-map
 
-Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your `rules.mk`:
+Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your keymap's `rules.mk`:
 
 ```make
 ENCODER_MAP_ENABLE = yes
@@ -88,6 +88,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 ```
 
+?> This should only be enabled at the keymap level.
+
 Using encoder mapping pumps events through the normal QMK keycode processing pipeline, resulting in a _keydown/keyup_ combination pushed through `process_record_xxxxx()`. To configure the amount of time between the encoder "keyup" and "keydown", you can add the following to your `config.h`:
 
 ```c
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index ae5cb5eef6..1034631863 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -67,6 +67,9 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - no `(-/+size)` comments related to enabling features
     - remove the list of alternate bootloaders if one has been specified
     - no re-definitions of the default MCU parameters if same value, when compared to the equivalent MCU in [mcu_selection.mk](https://github.com/qmk/qmk_firmware/blob/master/builddefs/mcu_selection.mk)
+    - no "keymap only" features enabled
+      - `COMBO_ENABLE`
+      - `ENCODER_MAP_ENABLE`
 - keyboard `config.h`
     - don't repeat `MANUFACTURER` in the `PRODUCT` value
     - no `#define DESCRIPTION`
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index d34e95d578..6941d70d81 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -11,101 +11,87 @@
   "layouts": {
     "LAYOUT_fungo_split_num": {
       "layout": [
-                {"x": 0, "y": 0.375},
-                {"x": 1, "y": 0.375},
-                {"x": 2, "y": 0.125},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0.125},
-                {"x": 5, "y": 0.25},
-                {"x": 6, "y": 0.5},
+        {"x":0, "y":0.375},
+        {"x":1, "y":0.375},
+        {"x":2, "y":0.125},
+        {"x":3, "y":0},
+        {"x":4, "y":0.125},
+        {"x":5, "y":0.25},
+        {"x":6, "y":0.5},
+        {"x":12, "y":0.5},
+        {"x":13, "y":0.25},
+        {"x":14, "y":0.125},
+        {"x":15, "y":0},
+        {"x":16, "y":0.125},
+        {"x":17, "y":0.375},
+        {"x":18, "y":0.375},
 
-                {"x": 12, "y": 0.5},
-                {"x": 13, "y": 0.25},
-                {"x": 14, "y": 0.125},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0.125},
-                {"x": 17, "y": 0.375},
-                {"x": 18, "y": 0.375},
-				
+        {"x":0, "y":1.375},
+        {"x":1, "y":1.375},
+        {"x":2, "y":1.125},
+        {"x":3, "y":1},
+        {"x":4, "y":1.125},
+        {"x":5, "y":1.25},
+        {"x":6, "y":1.5},
+        {"x":12, "y":1.5},
+        {"x":13, "y":1.25},
+        {"x":14, "y":1.125},
+        {"x":15, "y":1},
+        {"x":16, "y":1.125},
+        {"x":17, "y":1.375},
+        {"x":18, "y":1.375},
 
-                {"x": 0, "y": 1.375},
-                {"x": 1, "y": 1.375},
-                {"x": 2, "y": 1.125},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1.125},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.5},
+        {"x":0, "y":2.375},
+        {"x":1, "y":2.375},
+        {"x":2, "y":2.125},
+        {"x":3, "y":2},
+        {"x":4, "y":2.125},
+        {"x":5, "y":2.25},
+        {"x":6, "y":2.5},
+        {"x":12, "y":2.5},
+        {"x":13, "y":2.25},
+        {"x":14, "y":2.125},
+        {"x":15, "y":2},
+        {"x":16, "y":2.125},
+        {"x":17, "y":2.375},
+        {"x":18, "y":2.375},
 
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.125},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1.125},
-                {"x": 17, "y": 1.375},
-                {"x": 18, "y": 1.375},
-				
-		{"x": 0, "y": 2.375},
-                {"x": 1, "y": 2.375},
-                {"x": 2, "y": 2.125},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2.125},
-                {"x": 5, "y": 2.25},
-                {"x": 6, "y": 2.5},
+        {"x":0, "y":3.375},
+        {"x":1, "y":3.375},
+        {"x":2, "y":3.125},
+        {"x":3, "y":3},
+        {"x":4, "y":3.125},
+        {"x":5, "y":3.25},
+        {"x":6, "y":3.5},
+        {"x":7, "y":4},
+        {"x":8.25, "y":3.75},
+        {"x":9.75, "y":3.75},
+        {"x":11, "y":4},
+        {"x":12, "y":3.5},
+        {"x":13, "y":3.25},
+        {"x":14, "y":3.125},
+        {"x":15, "y":3},
+        {"x":16, "y":3.125},
+        {"x":17, "y":3.375},
+        {"x":18, "y":3.375},
 
-                {"x": 12, "y": 2.5},
-                {"x": 13, "y": 2.25},
-                {"x": 14, "y": 2.125},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2.125},
-                {"x": 17, "y": 2.375},
-                {"x": 18, "y": 2.375},
-				
-		{"x": 0, "y": 3.375},
-                {"x": 1, "y": 3.375},
-                {"x": 2, "y": 3.125},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3.125},
-                {"x": 5, "y": 3.25},
-                {"x": 6, "y": 3.5},
-
-                {"x": 12, "y": 3.5},
-                {"x": 13, "y": 3.25},
-                {"x": 14, "y": 3.125},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3.125},
-                {"x": 17, "y": 3.375},
-                {"x": 18, "y": 3.375},
-				
-		{"x": 0, "y": 4.375},
-                {"x": 1, "y": 4.375},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-                {"x": 5.25, "y": 3},
-		{"x": 5.75, "y": 5},
-		{"x": 7, "y": 4},
-					
-                {"x": 11, "y": 4},	
-                {"x": 13.25, "y": 5},	
-		{"x": 13.75, "y": 3},
-                {"x": 15, "y": 4.25},		
-                {"x": 16, "y": 4.25},				
-                {"x": 17, "y": 4.375},
-                {"x": 18, "y": 4.375},
-
-
-                {"x": 7, "y": 5},
-		{"x": 8.25, "y": 3.75},
-		{"x": 8.25, "y": 4.75},
-
-		{"x": 9.75, "y": 4.75},
-		{"x": 9.75, "y": 3.75},
-		{"x": 11, "y": 5},
-
-				
-				
-    
-                
-            ]
+        {"x":0, "y":4.375},
+        {"x":1, "y":4.375},
+        {"x":2, "y":4.25},
+        {"x":3, "y":4.25},
+        {"x":4.333, "y":4.25},
+        {"x":5.667, "y":4.625},
+        {"x":7, "y":5},
+        {"x":8.25, "y":4.75},
+        {"x":9.75, "y":4.75},
+        {"x":11, "y":5},
+        {"x":12.333, "y":4.625},
+        {"x":13.667, "y":4.25},
+        {"x":15, "y":4.25},
+        {"x":16, "y":4.25},
+        {"x":17, "y":4.375},
+        {"x":18, "y":4.375}
+      ]
     }
   }
 }

From f73330755153912f18619cfeaefe0270394e0daf Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Wed, 7 Sep 2022 00:13:12 +0200
Subject: [PATCH 317/959] keymaps/stapelberg: keypad layer for multimedia keys,
 wake on escape (#18295)

This makes more keys function as printed on the actual keyboard :)
---
 keyboards/kinesis/keymaps/stapelberg/keymap.c | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c
index 431c9f234f..9518c017bc 100644
--- a/keyboards/kinesis/keymaps/stapelberg/keymap.c
+++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c
@@ -17,6 +17,7 @@
 #include QMK_KEYBOARD_H
 
 #define QWERTY 0 // Base qwerty
+#define LAYER1 1
 
 
 /****************************************************************************************************
@@ -56,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			   KC_LCTL,KC_LALT,
                                     KC_LGUI,
                            KC_BSPC,KC_ESC ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_NO, QK_BOOT,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, MO(1), QK_BOOT,
 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
 	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,
 	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
@@ -65,5 +66,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_RALT,KC_RCTL,
            KC_PGUP,
            KC_PGDN,KC_ENTER ,KC_SPC
-    )
+    ),
+
+// LAYER1 is activated by the keypad key. It has WAKE on Escape (left-most key),
+// and volume keys on PSCR (mute), SLCK (volume down) and PAUS (volume up),
+// as printed on the Kinesis Advantage 2.
+[LAYER1] = LAYOUT(
+
+           KC_WAKE,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO,
+           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+                   KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+			   KC_NO  ,KC_NO  ,
+                                    KC_NO  ,
+                           KC_NO  ,KC_NO  ,KC_NO  ,
+    KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_MUTE ,KC_VOLD  ,KC_VOLU, KC_TRNS, KC_NO  ,
+	KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+	KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+	KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+	KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+		KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
+           KC_NO  ,KC_NO  ,
+           KC_NO  ,
+           KC_NO  ,KC_NO    ,KC_NO
+    ),
 };

From c2b35b2327d9033371192e20e9ee8821867a33b0 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Wed, 7 Sep 2022 00:35:47 +0100
Subject: [PATCH 318/959] Remove legacy define USE_SERIAL_PD2 (#18298)

---
 keyboards/crkbd/keymaps/armand1m/config.h                     | 4 +---
 keyboards/crkbd/keymaps/crkqwes/config.h                      | 2 --
 keyboards/crkbd/keymaps/curry/config.h                        | 1 -
 keyboards/crkbd/keymaps/gotham/config.h                       | 2 --
 keyboards/crkbd/keymaps/hvp/config.h                          | 2 --
 keyboards/crkbd/keymaps/jarred/config.h                       | 2 --
 keyboards/crkbd/keymaps/kidbrazil/config.h                    | 2 --
 keyboards/crkbd/keymaps/madhatter/config.h                    | 2 --
 keyboards/crkbd/keymaps/ninjonas/config.h                     | 2 --
 keyboards/crkbd/keymaps/oled_sample/config.h                  | 2 --
 keyboards/crkbd/keymaps/rjhilgefort/config.h                  | 2 --
 keyboards/crkbd/keymaps/rpbaptist/config.h                    | 2 --
 keyboards/crkbd/keymaps/rs/config.h                           | 2 --
 keyboards/crkbd/keymaps/snowe/config.h                        | 2 --
 keyboards/crkbd/keymaps/soundmonster/config.h                 | 2 --
 keyboards/crkbd/keymaps/thumb_ctrl/config.h                   | 2 --
 keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h        | 2 --
 keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h       | 2 --
 keyboards/crkbd/keymaps/vxid/config.h                         | 2 --
 keyboards/crkbd/keymaps/xyverz/config.h                       | 4 +---
 keyboards/lily58/keymaps/barabas/config.h                     | 1 -
 keyboards/lily58/keymaps/chuan/config.h                       | 2 --
 keyboards/lily58/keymaps/curry/config.h                       | 1 -
 keyboards/lily58/keymaps/cykedev/config.h                     | 1 -
 keyboards/lily58/keymaps/domnantas/config.h                   | 4 +---
 keyboards/lily58/keymaps/drasbeck/config.h                    | 4 +---
 keyboards/lily58/keymaps/hvp/config.h                         | 4 +---
 keyboards/lily58/keymaps/jhelvy/config.h                      | 2 --
 keyboards/lily58/keymaps/mikefightsbears/config.h             | 2 --
 keyboards/lily58/keymaps/muuko/config.h                       | 1 -
 keyboards/lily58/keymaps/narze/config.h                       | 2 --
 keyboards/lily58/keymaps/ninjonas/config.h                    | 3 +--
 keyboards/lily58/keymaps/via/config.h                         | 2 --
 keyboards/lily58/keymaps/yshrsmz/config.h                     | 2 --
 keyboards/lily58/keymaps/yuchi/config.h                       | 4 +---
 keyboards/pinky/3/keymaps/default/config.h                    | 2 --
 keyboards/pinky/3/keymaps/ninjonas/config.h                   | 4 +---
 keyboards/pinky/3/keymaps/via/config.h                        | 2 --
 keyboards/pinky/4/keymaps/default/config.h                    | 2 --
 keyboards/pinky/4/keymaps/via/config.h                        | 2 --
 .../naked48/keymaps/default_with_nafuda/config.h              | 1 -
 .../naked48/keymaps/default_with_setta21/config.h             | 1 -
 .../naked48/keymaps/salicylic_with_nafuda/config.h            | 2 --
 .../naked48/keymaps/salicylic_with_setta21/config.h           | 1 -
 .../naked60/keymaps/default_with_nafuda/config.h              | 1 -
 .../naked60/keymaps/default_with_setta21/config.h             | 1 -
 .../naked60/keymaps/salicylic_with_nafuda/config.h            | 2 --
 .../naked60/keymaps/salicylic_with_setta21/config.h           | 1 -
 .../naked64/keymaps/default_with_setta21/config.h             | 1 -
 .../naked64/keymaps/salicylic_with_setta21/config.h           | 1 -
 50 files changed, 8 insertions(+), 94 deletions(-)

diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h
index 405d329640..27f01a445a 100644
--- a/keyboards/crkbd/keymaps/armand1m/config.h
+++ b/keyboards/crkbd/keymaps/armand1m/config.h
@@ -28,11 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 // #define TAPPING_FORCE_HOLD
 // #define PERMISSIVE_HOLD
-#define TAPPING_TERM 300 
+#define TAPPING_TERM 300
 #define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index 1ff720909c..aacd9c04f4 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -32,8 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef USE_I2C
 #undef SSD1306OLED
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
 // #define RETRO_TAPPING
diff --git a/keyboards/crkbd/keymaps/curry/config.h b/keyboards/crkbd/keymaps/curry/config.h
index ba9c69ed26..a82b4439cf 100644
--- a/keyboards/crkbd/keymaps/curry/config.h
+++ b/keyboards/crkbd/keymaps/curry/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define OLED_DISABLE_TIMEOUT
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/crkbd/keymaps/gotham/config.h b/keyboards/crkbd/keymaps/gotham/config.h
index 2a35f60dad..f7144fb008 100644
--- a/keyboards/crkbd/keymaps/gotham/config.h
+++ b/keyboards/crkbd/keymaps/gotham/config.h
@@ -3,8 +3,6 @@
 #define EE_HANDS
 #define SPLIT_USB_DETECT
 
-#define USE_SERIAL_PD2
-
 #define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 250
diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h
index 106e7535e3..2a161236eb 100644
--- a/keyboards/crkbd/keymaps/hvp/config.h
+++ b/keyboards/crkbd/keymaps/hvp/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 //#define TAPPING_FORCE_HOLD
 //#define TAPPING_TERM 100
 
diff --git a/keyboards/crkbd/keymaps/jarred/config.h b/keyboards/crkbd/keymaps/jarred/config.h
index e5c2029a52..a0b7c6ff30 100644
--- a/keyboards/crkbd/keymaps/jarred/config.h
+++ b/keyboards/crkbd/keymaps/jarred/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 //#define TAPPING_FORCE_HOLD
 //#define TAPPING_TERM 100
 
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
index fefb8eb0ee..ab67b42829 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ b/keyboards/crkbd/keymaps/kidbrazil/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 150
 #undef PRODUCT
diff --git a/keyboards/crkbd/keymaps/madhatter/config.h b/keyboards/crkbd/keymaps/madhatter/config.h
index 6cbe5befb8..086dd40925 100644
--- a/keyboards/crkbd/keymaps/madhatter/config.h
+++ b/keyboards/crkbd/keymaps/madhatter/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/crkbd/keymaps/ninjonas/config.h b/keyboards/crkbd/keymaps/ninjonas/config.h
index 0c0819130f..174c678769 100644
--- a/keyboards/crkbd/keymaps/ninjonas/config.h
+++ b/keyboards/crkbd/keymaps/ninjonas/config.h
@@ -24,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MASTER_LEFT
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/crkbd/keymaps/oled_sample/config.h b/keyboards/crkbd/keymaps/oled_sample/config.h
index 450653e46c..056eb32dd6 100644
--- a/keyboards/crkbd/keymaps/oled_sample/config.h
+++ b/keyboards/crkbd/keymaps/oled_sample/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/config.h b/keyboards/crkbd/keymaps/rjhilgefort/config.h
index cbc7eb03d8..727167b5e2 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/config.h
+++ b/keyboards/crkbd/keymaps/rjhilgefort/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200 // 200 is default
 
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index fd53b57c68..95485797cc 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define OLED_TIMEOUT 600000
 #endif
 
-#define USE_SERIAL_PD2
-
 // #define FORCE_NKRO
 
 #define QMK_ESC_OUTPUT F4  // usually COL
diff --git a/keyboards/crkbd/keymaps/rs/config.h b/keyboards/crkbd/keymaps/rs/config.h
index 60f33e7585..f40e008034 100644
--- a/keyboards/crkbd/keymaps/rs/config.h
+++ b/keyboards/crkbd/keymaps/rs/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 300
 
diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h
index 575e39892d..7826ab72ec 100644
--- a/keyboards/crkbd/keymaps/snowe/config.h
+++ b/keyboards/crkbd/keymaps/snowe/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
 
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index 2d2b394369..12d62175ae 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 // #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 150
 #define RETRO_TAPPING
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/config.h b/keyboards/crkbd/keymaps/thumb_ctrl/config.h
index 10b89aede5..4916668244 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/config.h
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 150
 
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
index 94494bafd8..b6f4420056 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
@@ -5,8 +5,6 @@
 #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
index 8cbd8e9078..1cd6ead191 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
@@ -12,8 +12,6 @@
 /* Select hand configuration */
 #define MASTER_RIGHT
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 300
 
diff --git a/keyboards/crkbd/keymaps/vxid/config.h b/keyboards/crkbd/keymaps/vxid/config.h
index 7a4596f3b2..79e4eadabb 100644
--- a/keyboards/crkbd/keymaps/vxid/config.h
+++ b/keyboards/crkbd/keymaps/vxid/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h
index 3390396807..fc5b2bd74c 100644
--- a/keyboards/crkbd/keymaps/xyverz/config.h
+++ b/keyboards/crkbd/keymaps/xyverz/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
@@ -53,4 +51,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define DRIVER_LED_TOTAL RGBLED_NUM
 #endif
 
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
\ No newline at end of file
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/lily58/keymaps/barabas/config.h b/keyboards/lily58/keymaps/barabas/config.h
index c57f19e537..5c9d0a8ec7 100644
--- a/keyboards/lily58/keymaps/barabas/config.h
+++ b/keyboards/lily58/keymaps/barabas/config.h
@@ -22,4 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define MASTER_LEFT
-#define USE_SERIAL_PD2
diff --git a/keyboards/lily58/keymaps/chuan/config.h b/keyboards/lily58/keymaps/chuan/config.h
index fa93060db1..a6d1c04f57 100644
--- a/keyboards/lily58/keymaps/chuan/config.h
+++ b/keyboards/lily58/keymaps/chuan/config.h
@@ -32,8 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define SSD1306OLED
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 
 /* define tapping term */
diff --git a/keyboards/lily58/keymaps/curry/config.h b/keyboards/lily58/keymaps/curry/config.h
index b3e82389d8..f724d23167 100644
--- a/keyboards/lily58/keymaps/curry/config.h
+++ b/keyboards/lily58/keymaps/curry/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define OLED_DISABLE_TIMEOUT
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/lily58/keymaps/cykedev/config.h b/keyboards/lily58/keymaps/cykedev/config.h
index 4403031cad..dac88dff77 100644
--- a/keyboards/lily58/keymaps/cykedev/config.h
+++ b/keyboards/lily58/keymaps/cykedev/config.h
@@ -15,7 +15,6 @@
 
 #pragma once
 
-#define USE_SERIAL_PD2
 #define MASTER_LEFT
 #define TAPPING_TERM 200
 #define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
diff --git a/keyboards/lily58/keymaps/domnantas/config.h b/keyboards/lily58/keymaps/domnantas/config.h
index 00104a1365..f32a066c14 100644
--- a/keyboards/lily58/keymaps/domnantas/config.h
+++ b/keyboards/lily58/keymaps/domnantas/config.h
@@ -30,7 +30,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define SSD1306OLED
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
\ No newline at end of file
+#define TAPPING_TERM 100
diff --git a/keyboards/lily58/keymaps/drasbeck/config.h b/keyboards/lily58/keymaps/drasbeck/config.h
index ffaf5f4bc3..21444216aa 100644
--- a/keyboards/lily58/keymaps/drasbeck/config.h
+++ b/keyboards/lily58/keymaps/drasbeck/config.h
@@ -1,5 +1,5 @@
 /*
-Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck 
+Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck
  *
  * You are free to:
  *
@@ -20,8 +20,6 @@ Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define ENCODERS_PAD_A { F4 }
 #define ENCODERS_PAD_B { F5 }
 #define ENCODER_RESOLUTION 4
diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h
index 3367748de8..3da6ad8efd 100644
--- a/keyboards/lily58/keymaps/hvp/config.h
+++ b/keyboards/lily58/keymaps/hvp/config.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SSD1306OLED
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_TERM 100
 #undef TAPPING_TERM
 #define TAPPING_TERM 150
@@ -53,4 +51,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
-*/
\ No newline at end of file
+*/
diff --git a/keyboards/lily58/keymaps/jhelvy/config.h b/keyboards/lily58/keymaps/jhelvy/config.h
index 019f68ef56..2424011537 100644
--- a/keyboards/lily58/keymaps/jhelvy/config.h
+++ b/keyboards/lily58/keymaps/jhelvy/config.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SSD1306OLED
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
diff --git a/keyboards/lily58/keymaps/mikefightsbears/config.h b/keyboards/lily58/keymaps/mikefightsbears/config.h
index 6b9e52c05e..67adc930dd 100644
--- a/keyboards/lily58/keymaps/mikefightsbears/config.h
+++ b/keyboards/lily58/keymaps/mikefightsbears/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h
index e963355bd5..377ee816fe 100644
--- a/keyboards/lily58/keymaps/muuko/config.h
+++ b/keyboards/lily58/keymaps/muuko/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define OLED_TIMEOUT 300000
 
diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h
index c494429af7..6466ab910d 100644
--- a/keyboards/lily58/keymaps/narze/config.h
+++ b/keyboards/lily58/keymaps/narze/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define COMBO_TERM 20
 #define COMBO_COUNT 3
 
diff --git a/keyboards/lily58/keymaps/ninjonas/config.h b/keyboards/lily58/keymaps/ninjonas/config.h
index 19fb5cd92b..d67ac41a17 100644
--- a/keyboards/lily58/keymaps/ninjonas/config.h
+++ b/keyboards/lily58/keymaps/ninjonas/config.h
@@ -26,8 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
 #define TAPPING_FORCE_HOLD
 
 #define OLED_FONT_H "keyboards/lily58/lib/glcdfont.c"
-#define OLED_DISABLE_TIMEOUT
\ No newline at end of file
+#define OLED_DISABLE_TIMEOUT
diff --git a/keyboards/lily58/keymaps/via/config.h b/keyboards/lily58/keymaps/via/config.h
index a3f0fb0a19..38ede27f45 100644
--- a/keyboards/lily58/keymaps/via/config.h
+++ b/keyboards/lily58/keymaps/via/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/lily58/keymaps/yshrsmz/config.h b/keyboards/lily58/keymaps/yshrsmz/config.h
index 6b9e52c05e..67adc930dd 100644
--- a/keyboards/lily58/keymaps/yshrsmz/config.h
+++ b/keyboards/lily58/keymaps/yshrsmz/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/lily58/keymaps/yuchi/config.h b/keyboards/lily58/keymaps/yuchi/config.h
index 130b5642e1..1335b805cd 100644
--- a/keyboards/lily58/keymaps/yuchi/config.h
+++ b/keyboards/lily58/keymaps/yuchi/config.h
@@ -30,7 +30,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define OLED_DRIVER
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
\ No newline at end of file
+#define TAPPING_TERM 100
diff --git a/keyboards/pinky/3/keymaps/default/config.h b/keyboards/pinky/3/keymaps/default/config.h
index db79776729..63e8168b47 100644
--- a/keyboards/pinky/3/keymaps/default/config.h
+++ b/keyboards/pinky/3/keymaps/default/config.h
@@ -24,8 +24,6 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
 #define RETRO_TAPPPING
diff --git a/keyboards/pinky/3/keymaps/ninjonas/config.h b/keyboards/pinky/3/keymaps/ninjonas/config.h
index 585bd8cb5d..63e8168b47 100644
--- a/keyboards/pinky/3/keymaps/ninjonas/config.h
+++ b/keyboards/pinky/3/keymaps/ninjonas/config.h
@@ -24,8 +24,6 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
-#define RETRO_TAPPPING
\ No newline at end of file
+#define RETRO_TAPPPING
diff --git a/keyboards/pinky/3/keymaps/via/config.h b/keyboards/pinky/3/keymaps/via/config.h
index db79776729..63e8168b47 100644
--- a/keyboards/pinky/3/keymaps/via/config.h
+++ b/keyboards/pinky/3/keymaps/via/config.h
@@ -24,8 +24,6 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
 #define RETRO_TAPPPING
diff --git a/keyboards/pinky/4/keymaps/default/config.h b/keyboards/pinky/4/keymaps/default/config.h
index db79776729..63e8168b47 100644
--- a/keyboards/pinky/4/keymaps/default/config.h
+++ b/keyboards/pinky/4/keymaps/default/config.h
@@ -24,8 +24,6 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
 #define RETRO_TAPPPING
diff --git a/keyboards/pinky/4/keymaps/via/config.h b/keyboards/pinky/4/keymaps/via/config.h
index db79776729..63e8168b47 100644
--- a/keyboards/pinky/4/keymaps/via/config.h
+++ b/keyboards/pinky/4/keymaps/via/config.h
@@ -24,8 +24,6 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
 #define RETRO_TAPPPING
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
index 314fe55c30..4d52c01805 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
index 2ad4d0adeb..7cb5d61e2b 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
index 7ce6416010..4d52c01805 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
@@ -22,8 +22,6 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
index 2ad4d0adeb..7cb5d61e2b 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
index 0761e5b6d3..603c9ab026 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
index 0761e5b6d3..603c9ab026 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
index 47da6d4418..603c9ab026 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
@@ -22,7 +22,5 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
index 0761e5b6d3..603c9ab026 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
index c88277da20..cba07919ff 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
index 0761e5b6d3..603c9ab026 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
@@ -21,7 +21,6 @@
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180

From d30f0f71d0b438b959943bf606ec524496c12d27 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Wed, 7 Sep 2022 00:42:28 +0100
Subject: [PATCH 319/959] Remove legacy define SERIAL_USE_MULTI_TRANSACTION
 (#18299)

---
 keyboards/aleblazer/zodiark/config.h                             | 1 -
 .../tractyl_manuform/4x6_right/keymaps/drashna/config.h          | 1 -
 keyboards/helix/rev2/config.h                                    | 1 -
 keyboards/helix/rev2/serial_config_simpleapi.h                   | 1 -
 keyboards/lily58/config.h                                        | 1 -
 keyboards/lily58/rev1/config.h                                   | 1 -
 keyboards/sofle/rev1/config.h                                    | 1 -
 keyboards/uzu42/config.h                                         | 1 -
 8 files changed, 8 deletions(-)

diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 90ecb7ce96..2958e8daed 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 #define SOFT_SERIAL_PIN D3
-#define SERIAL_USE_MULTI_TRANSACTION
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 /* key matrix size */
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/config.h
index 21bc8e616a..d7bc0f5bd5 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/config.h
@@ -18,7 +18,6 @@
 
 // #define USE_I2C
 // #define SELECT_SOFT_SERIAL_SPEED 1
-// #define SERIAL_USE_MULTI_TRANSACTION
 #define SPLIT_MODS_ENABLE
 #define EE_HANDS
 
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 2183bf7227..dcf88cc09c 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Soft Serial defines */
 #define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
 
 /* Select hand configuration */
 #define MASTER_LEFT
diff --git a/keyboards/helix/rev2/serial_config_simpleapi.h b/keyboards/helix/rev2/serial_config_simpleapi.h
index 0e1dd9e4ac..b51e6f281b 100644
--- a/keyboards/helix/rev2/serial_config_simpleapi.h
+++ b/keyboards/helix/rev2/serial_config_simpleapi.h
@@ -1,5 +1,4 @@
 #pragma once
 
-#undef SERIAL_USE_MULTI_TRANSACTION
 #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
 #define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h
index 57fc7fa7f9..740a3a5b1c 100644
--- a/keyboards/lily58/config.h
+++ b/keyboards/lily58/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
 #endif
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index 8205899f5e..b0ef4d165b 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
 
 #define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
index f66588b43c..1556dc716e 100644
--- a/keyboards/sofle/rev1/config.h
+++ b/keyboards/sofle/rev1/config.h
@@ -23,5 +23,4 @@
 #define TAP_CODE_DELAY 10
 
 /* communication between sides */
-#define SERIAL_USE_MULTI_TRANSACTION
 #define SOFT_SERIAL_PIN D2
diff --git a/keyboards/uzu42/config.h b/keyboards/uzu42/config.h
index 3364d3063d..72bdafd38d 100644
--- a/keyboards/uzu42/config.h
+++ b/keyboards/uzu42/config.h
@@ -22,5 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
 #endif

From a082fcc933e29fc28fe91a9e954a44b2f5c5f1c0 Mon Sep 17 00:00:00 2001
From: ddeklerk <966801+ddeklerk@users.noreply.github.com>
Date: Wed, 7 Sep 2022 12:38:54 +0200
Subject: [PATCH 320/959] Delete my keymaps (#18302)

---
 .../community/ortho_4x12/ddeklerk/keymap.c    | 78 -------------------
 .../community/split_3x6_3/ddeklerk/keymap.c   | 78 -------------------
 .../community/split_3x6_3/ddeklerk/rules.mk   |  1 -
 3 files changed, 157 deletions(-)
 delete mode 100644 layouts/community/ortho_4x12/ddeklerk/keymap.c
 delete mode 100644 layouts/community/split_3x6_3/ddeklerk/keymap.c
 delete mode 100644 layouts/community/split_3x6_3/ddeklerk/rules.mk

diff --git a/layouts/community/ortho_4x12/ddeklerk/keymap.c b/layouts/community/ortho_4x12/ddeklerk/keymap.c
deleted file mode 100644
index a48565d570..0000000000
--- a/layouts/community/ortho_4x12/ddeklerk/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BASE,
-    _GAME,
-    _FN1,
-    _FN2,
-    _FN3,
-    _ADJUST
-};
-
-#define BASE DF(_BASE)
-#define GAME DF(_GAME)
-#define FN1 LT(_FN1, KC_BSPC)
-#define FN2 LT(_FN2, KC_ENT)
-#define FN3SPC LT(_FN3, KC_SPC)
-
-#define CTRLESC MT(MOD_LCTL, KC_ESC)
-#define CTRLMIN MT(MOD_RCTL, KC_MINS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_ortho_4x12(
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    XXXXXXX,
-        CTRLESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    CTRLMIN,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-        XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, FN1,     FN3SPC,  FN3SPC,  FN2,     KC_RALT, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [_GAME] = LAYOUT_ortho_4x12(
-        KC_3,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-        KC_2,    CTRLESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_BSPC,
-        KC_1,    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_UP,   KC_ENT,
-        XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, _______, KC_SPC,  XXXXXXX, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN1] = LAYOUT_ortho_4x12(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        KC_DEL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PIPE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-    [_FN2] = LAYOUT_ortho_4x12(
-        KC_GRV,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_LCBR, KC_RCBR, KC_QUES, KC_PLUS, _______,
-        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_LBRC, KC_RBRC, KC_SLSH, KC_EQL,  KC_BSLS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-    [_FN3] = LAYOUT_ortho_4x12(
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_BSPC, _______,
-        _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-        _______, KC_APP,  _______, _______, _______, _______, KC_PGDN, KC_DEL,  _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-    [_ADJUST] = LAYOUT_ortho_4x12(
-        XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, GAME,    BASE,    XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _FN1, _FN2, _ADJUST);
-};
diff --git a/layouts/community/split_3x6_3/ddeklerk/keymap.c b/layouts/community/split_3x6_3/ddeklerk/keymap.c
deleted file mode 100644
index 6c564c0bd5..0000000000
--- a/layouts/community/split_3x6_3/ddeklerk/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BASE,
-    _GAME,
-    _FN1,
-    _FN2,
-    _FN3,
-    _ADJUST
-};
-
-#define BASE DF(_BASE)
-#define GAME DF(_GAME)
-#define FN1 LT(_FN1, KC_BSPC)
-#define FN2 LT(_FN2, KC_ENT)
-#define FN3SPC LT(_FN3, KC_SPC)
-
-#define CTRLESC MT(MOD_LCTL, KC_ESC)
-#define CTRLMIN MT(MOD_RCTL, KC_MINS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_split_3x6_3(
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                               KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    XXXXXXX,
-        CTRLESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                               KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    CTRLMIN,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                               KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                                            KC_LGUI, FN1,     FN3SPC,           FN3SPC,  FN2,     KC_RALT
-    ),
-    [_GAME] = LAYOUT_split_3x6_3(
-        KC_3,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,                               KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_BSPC,
-        KC_2,    CTRLESC, KC_A,    KC_S,    KC_D,    KC_F,                               KC_G,    KC_H,    KC_J,    KC_K,    KC_UP,   KC_ENT,
-        KC_1,    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,                               KC_B,    KC_N,    KC_M,    KC_LEFT, KC_DOWN, KC_RGHT,
-                                            KC_LALT, _______, KC_SPC,           _______, _______, _______
-    ),
-    [_FN1] = LAYOUT_split_3x6_3(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        KC_DEL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PIPE,
-        _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-                                            _______, _______, _______,          _______, _______, _______
-    ),
-    [_FN2] = LAYOUT_split_3x6_3(
-        KC_GRV,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,                             KC_F12,  KC_LCBR, KC_RCBR, KC_QUES, KC_PLUS, _______,
-        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_LBRC, KC_RBRC, KC_SLSH, KC_EQL,  KC_BSLS,
-        _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-                                            _______, _______, _______,          _______, _______, _______
-    ),
-    [_FN3] = LAYOUT_split_3x6_3(
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,                            KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_BSPC, _______,
-        _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,                            KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-        _______, KC_APP,  _______, _______, _______, _______,                            KC_PGDN, KC_DEL,  _______, _______, _______, _______,
-                                            _______, _______, _______,          _______, _______, _______
-    ),
-    [_ADJUST] = LAYOUT_split_3x6_3(
-        XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, GAME,    BASE,    XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                            XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _FN1, _FN2, _ADJUST);
-};
diff --git a/layouts/community/split_3x6_3/ddeklerk/rules.mk b/layouts/community/split_3x6_3/ddeklerk/rules.mk
deleted file mode 100644
index a05fa26681..0000000000
--- a/layouts/community/split_3x6_3/ddeklerk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EXTRAKEY_ENABLE = yes # Audio control and System control

From 8a0c0f72a541f59bf1e172ac870cd29a5685ade5 Mon Sep 17 00:00:00 2001
From: syntax-magic <dkim.8881@gmail.com>
Date: Wed, 7 Sep 2022 09:14:46 -0700
Subject: [PATCH 321/959] added a new kprepublic/bm40hsrgb keymap called dan
 (#18301)

by syntax-magic
---
 .../kprepublic/bm40hsrgb/keymaps/dan/keymap.c | 333 ++++++++++++++++++
 .../bm40hsrgb/keymaps/dan/readme.md           |   3 +
 2 files changed, 336 insertions(+)
 create mode 100644 keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
 create mode 100644 keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md

diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
new file mode 100644
index 0000000000..fbebbb966d
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
@@ -0,0 +1,333 @@
+/* Copyright 2020 tominabox1
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum layers {
+  _ALPHA,
+  _LEFTFN,
+  _RIGHTFN,
+  _NUMPAD,
+  _LEAGUE,
+  _PUBG,
+  _OVERWATCH,
+  _STARCRAFT,
+  _TETRIS,
+  _CLEAN,
+  _RGB
+};
+
+#define ALPHA TO(_ALPHA)
+#define LEFTFN MO(_LEFTFN)
+#define RIGHTFN MO(_RIGHTFN)
+#define NUMPAD MO(_NUMPAD)
+#define LEAGUE TG(_LEAGUE)
+#define PUBG TG(_PUBG)
+#define OVERWATCH TG(_OVERWATCH)
+#define STARCRAFT TG(_STARCRAFT)
+#define TETRIS TG(_TETRIS)
+#define CLEAN TG(_CLEAN)
+#define RGB MO(_RGB)
+
+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/NP|  KOR | 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+/|HANJA |   [  |   ]  |   )  |   :  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift| PGUP | PGDN | Home | End  | CAPS |PRNTSR|   (  |   ,  |   .  |   /  | Enter|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | RGB  |  [   |  ]   | Alt  | Trns |    Space    |   _  |   +  | INS  |   |  | Ent. |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_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_LNG2, KC_LBRC, KC_RBRC, KC_RPRN, KC_COLN, KC_DQUO,
+    KC_LSFT, KC_PGUP, KC_PGDN, KC_HOME, KC_END,   KC_CAPS,        KC_PSCR, KC_LPRN, KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    RGB,     KC_LBRC, KC_RBRC, KC_LALT, KC_TRNS,           KC_SPC,         KC_UNDS, KC_PLUS, KC_INS,  KC_PIPE, KC_PENT
+),
+
+
+/* RIGHTFN
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      | Pause|SCRLCK|      | F11  |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F4  |  F5  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|      |      |      |      |      |      |  F6  |  F7  |  F8  |  F9  |  F10 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |  Alt |      |    Space    | Trns |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RIGHTFN] = LAYOUT_planck_mit(
+    KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_PAUS, KC_SCRL, KC_NO, KC_F11, KC_F12,
+    KC_LCTL, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F1,   KC_F2,   KC_F3, KC_F4,  KC_F5,
+    KC_LSFT, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F6,   KC_F7,   KC_F8, KC_F9,  KC_F10,
+    KC_NO,   KC_NO, KC_NO, KC_LALT, KC_NO,    KC_SPC,    KC_TRNS, KC_NO,   KC_NO, KC_NO,  KC_NO
+),
+
+/* NUMPAD
+ * ,-----------------------------------------------------------------------------------.
+ * |   *  |   7  |   8  |   9  | NumLk|      |      |      |      |      |      | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  Alt |   4  |   5  |   6  | Enter|      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   -  |   1  |   2  |   3  | Bksp |      |      |      |      | Ctrl | Shift|Return|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Trns |   ,  |  +   |   .  |   0  |    Space    |LEAGUE| PUBG | OVWCh|  SC  |TETRIS|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_NUMPAD] = LAYOUT_planck_mit(
+    KC_PAST, KC_P7,   KC_P8,   KC_P9,   KC_NLCK, 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_NO,     KC_NO,
+    KC_PMNS, KC_P1,   KC_P2,   KC_P3,   KC_BSPC, KC_NO, KC_NO, KC_NO,  KC_NO, KC_LCTL,   KC_LSFT,   KC_ENT,
+    KC_TRNS, KC_COMM, KC_PPLS, KC_PDOT, KC_0,       KC_SPC,    LEAGUE, PUBG,  OVERWATCH, STARCRAFT, TETRIS
+),
+
+/* LEAGUE
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   5  |   Y  |      |      |   O  |   P  | ESC  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |   A  |   S  |   D  |   F  |      |      |      |      |   L  |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   6  |   4  |   1  |   B  |      |      |      |      |      | Enter|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   3  |   X  |   C  |  Alt |   2  |    Space    |      |      |      |      | ALPHA|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LEAGUE] = 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
+),
+
+/* PUBG
+ * ,-----------------------------------------------------------------------------------.
+ * | 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|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_PUBG] = 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_DOT, KC_NO, 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
+),
+
+/* OVERWATCH
+ * ,-----------------------------------------------------------------------------------.
+ * | 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  |   ,  |   .  |   /  | Enter|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |      |      | Alt  |   2  |    Space    | Bksp |      |      |      | ALPHA|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_OVERWATCH] = 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
+),
+
+/* STARCRAFT
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Enter|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |      |      | Alt  |   F1 |    Space    |  F10 | Pause|Delete|      | ALPHA|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_STARCRAFT] = 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
+),
+
+/* TETRIS
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |  Up  |   E  |   R  |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   A  | Left | Down | Right|   F  |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |      |      |  Alt |   S  |    Space    |      |      |      |      | ALPHA|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_TETRIS] = 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
+
+),
+
+/* TETRIS
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      | 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
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|      |      |      |      |      |      |      |      |      | CLEAN|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |RGBTGL| MOD+ | BRT+ | SAT+ |      |      |      | FX+  | HUE+ |      | MOD R| MODES|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | MOD- | BRT- | SAT- | Trns |             | FX-  | HUE- |      | MOD B| MOD P|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RGB] = LAYOUT_planck_mit(
+    KC_NO,   QK_BOOT,  KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,   CLEAN,
+    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_VAI, RGB_SAI, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_HUI, KC_NO, RGB_M_R, RGB_M_SW,
+    KC_NO,   RGB_RMOD, RGB_VAD, RGB_SAD, KC_TRNS,   KC_NO,    RGB_SPD, RGB_HUD, KC_NO, RGB_M_B, RGB_M_P
+)
+
+};
+
+/*
+
+// 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}
+
+*/
+void rgb_matrix_indicators_user(void) {
+    switch (get_highest_layer(layer_state)) {
+        case _ALPHA:
+            break;
+        case _LEFTFN:
+            break;
+        case _RIGHTFN:
+            break;
+        case _NUMPAD:
+            break;
+        case _LEAGUE:
+            rgb_matrix_set_color(1, 15, 15, 15);
+            rgb_matrix_set_color(2, 15, 15, 15);
+            rgb_matrix_set_color(3, 15, 15, 15);
+            rgb_matrix_set_color(4, 15, 15, 15);
+            rgb_matrix_set_color(15, 50, 40, 0);
+            rgb_matrix_set_color(16, 50, 5, 0);
+            rgb_matrix_set_color(29, 0, 15, 50);
+            rgb_matrix_set_color(10, 20, 2, 15);
+            break;
+
+        case _PUBG:
+            rgb_matrix_set_color(12, 15, 15, 15);
+            rgb_matrix_set_color(40, 15, 15, 15);
+            rgb_matrix_set_color(42, 3, 3, 50);
+            rgb_matrix_set_color(43, 5, 50, 8);
+            rgb_matrix_set_color(44, 50, 35, 0);
+            rgb_matrix_set_color(45, 30, 30, 15);
+            break;
+
+        case _OVERWATCH:
+            rgb_matrix_set_color(11, 80, 20, 0);
+            rgb_matrix_set_color(46, 80, 20, 0);
+            break;
+
+        case _STARCRAFT:
+            rgb_matrix_set_color(11, 5, 80, 15);
+            rgb_matrix_set_color(46, 5, 80, 15);
+            break;
+
+        case _TETRIS:
+            rgb_matrix_set_color(2, 60, 10, 20);
+            rgb_matrix_set_color(13, 60, 10, 20);
+            rgb_matrix_set_color(14, 60, 10, 20);
+            rgb_matrix_set_color(15, 60, 10, 20);
+            break;
+
+        case _CLEAN:
+            rgb_matrix_set_color_all(255, 255, 255);
+            break;
+
+        case _RGB:
+            break;
+    }
+
+	led_t led_state = host_keyboard_led_state();
+
+    //Capslock led
+    if (led_state.caps_lock) {
+        rgb_matrix_set_color(12, 145, 145, 145);
+    }
+
+    //Numlock led
+    if (led_state.num_lock) {
+    } else {
+        rgb_matrix_set_color(0, 145, 145, 145);
+    }
+
+    //Scroll lock led
+    if (led_state.scroll_lock) {
+        rgb_matrix_set_color(24, 145, 145, 145);
+    }
+
+}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
new file mode 100644
index 0000000000..4a706c7315
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
@@ -0,0 +1,3 @@
+# Dan's kprepublic bm40 layout
+
+Dan's personal keymap with LED indicator support.

From 6321cbaadd614c70d96cd3fd2fbae397b96d1245 Mon Sep 17 00:00:00 2001
From: syntax-magic <dkim.8881@gmail.com>
Date: Wed, 7 Sep 2022 11:52:32 -0700
Subject: [PATCH 322/959] [Keymap] removed else in numlock led if statement
 (#18304)

---
 keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
index fbebbb966d..5029d557dd 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
@@ -320,8 +320,7 @@ void rgb_matrix_indicators_user(void) {
     }
 
     //Numlock led
-    if (led_state.num_lock) {
-    } else {
+    if (!led_state.num_lock) {
         rgb_matrix_set_color(0, 145, 145, 145);
     }
 

From f7d2b001bc4f79164e9ea3a4ff7faa54be0b7d82 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 8 Sep 2022 04:59:24 +1000
Subject: [PATCH 323/959] Move Bluetooth-related function calls up to
 host/keyboard level (#18274)

* Move Bluetooth-related function calls up to host/keyboard level

* Remove pointless set_output() call

* Move bluetooth (rn42) init to end of keyboard_init()

* Enable SPI/UART for ChibiOS targets

* Some more slight tweaks
---
 builddefs/common_features.mk       |  6 ++--
 drivers/bluetooth/bluefruit_le.cpp |  8 ++---
 drivers/bluetooth/bluefruit_le.h   |  2 --
 quantum/keyboard.c                 | 15 +++++++--
 tmk_core/protocol/host.c           | 43 +++++++++++++++++++++++++
 tmk_core/protocol/lufa/lufa.c      | 51 ------------------------------
 6 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 9fa9e18814..f9618709c9 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -882,14 +882,14 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     SRC += outputselect.c
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
-        OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE
-        SRC += analog.c
+        OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
+        QUANTUM_LIB_SRC += analog.c
         QUANTUM_LIB_SRC += spi_master.c
     endif
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
-        OPT_DEFS += -DBLUETOOTH_RN42
+        OPT_DEFS += -DBLUETOOTH_RN42 -DHAL_USE_SERIAL=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
         QUANTUM_LIB_SRC += uart.c
     endif
diff --git a/drivers/bluetooth/bluefruit_le.cpp b/drivers/bluetooth/bluefruit_le.cpp
index 19310767cf..50170b83fe 100644
--- a/drivers/bluetooth/bluefruit_le.cpp
+++ b/drivers/bluetooth/bluefruit_le.cpp
@@ -79,9 +79,7 @@ struct sdep_msg {
 enum queue_type {
     QTKeyReport, // 1-byte modifier + 6-byte key report
     QTConsumer,  // 16-bit key code
-#ifdef MOUSE_ENABLE
     QTMouseMove, // 4-byte mouse report
-#endif
 };
 
 struct queue_item {
@@ -442,7 +440,7 @@ bool bluefruit_le_enable_keyboard(void) {
     // Disable command echo
     static const char kEcho[] PROGMEM = "ATE=0";
     // Make the advertised name match the keyboard
-    static const char kGapDevName[] PROGMEM = "AT+GAPDEVNAME=" STR(PRODUCT);
+    static const char kGapDevName[] PROGMEM = "AT+GAPDEVNAME=" PRODUCT;
     // Turn on keyboard support
     static const char kHidEnOn[] PROGMEM = "AT+BLEHIDEN=1";
 
@@ -581,10 +579,12 @@ static bool process_queue_item(struct queue_item *item, uint16_t timeout) {
             snprintf(cmdbuf, sizeof(cmdbuf), fmtbuf, item->key.modifier, item->key.keys[0], item->key.keys[1], item->key.keys[2], item->key.keys[3], item->key.keys[4], item->key.keys[5]);
             return at_command(cmdbuf, NULL, 0, true, timeout);
 
+#ifdef EXTRAKEY_ENABLE
         case QTConsumer:
             strcpy_P(fmtbuf, PSTR("AT+BLEHIDCONTROLKEY=0x%04x"));
             snprintf(cmdbuf, sizeof(cmdbuf), fmtbuf, item->consumer);
             return at_command(cmdbuf, NULL, 0, true, timeout);
+#endif
 
 #ifdef MOUSE_ENABLE
         case QTMouseMove:
@@ -658,7 +658,6 @@ void bluefruit_le_send_consumer_key(uint16_t usage) {
     }
 }
 
-#ifdef MOUSE_ENABLE
 void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons) {
     struct queue_item item;
 
@@ -673,7 +672,6 @@ void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan,
         send_buf_send_one();
     }
 }
-#endif
 
 uint32_t bluefruit_le_read_battery_voltage(void) {
     return state.vbat;
diff --git a/drivers/bluetooth/bluefruit_le.h b/drivers/bluetooth/bluefruit_le.h
index de301c6167..731ba2e370 100644
--- a/drivers/bluetooth/bluefruit_le.h
+++ b/drivers/bluetooth/bluefruit_le.h
@@ -40,12 +40,10 @@ extern void bluefruit_le_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uin
  * (milliseconds) */
 extern void bluefruit_le_send_consumer_key(uint16_t usage);
 
-#ifdef MOUSE_ENABLE
 /* Send a mouse/wheel movement report.
  * The parameters are signed and indicate positive or negative direction
  * change. */
 extern void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons);
-#endif
 
 /* Compute battery voltage by reading an analog pin.
  * Returns the integer number of millivolts */
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 1c62a43d9d..3b5e9b0200 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -107,6 +107,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
+#    ifdef BLUETOOTH_BLUEFRUIT_LE
+#        include "bluefruit_le.h"
+#    elif BLUETOOTH_RN42
+#        include "rn42.h"
+#    endif
 #endif
 #ifdef CAPS_WORD_ENABLE
 #    include "caps_word.h"
@@ -346,9 +351,6 @@ void quantum_init(void) {
 #ifdef HAPTIC_ENABLE
     haptic_init();
 #endif
-#if defined(BLUETOOTH_ENABLE) && defined(OUTPUT_AUTO_ENABLE)
-    set_output(OUTPUT_AUTO);
-#endif
 }
 
 /** \brief keyboard_init
@@ -410,6 +412,9 @@ void keyboard_init(void) {
     // init after split init
     pointing_device_init();
 #endif
+#if defined(BLUETOOTH_RN42)
+    rn42_init();
+#endif
 
 #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
     debug_enable = true;
@@ -670,5 +675,9 @@ void keyboard_task(void) {
     programmable_button_send();
 #endif
 
+#ifdef BLUETOOTH_BLUEFRUIT_LE
+    bluefruit_le_task();
+#endif
+
     led_task();
 }
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 2ebd176ea4..53854b94fb 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -24,6 +24,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "digitizer.h"
 
+#ifdef BLUETOOTH_ENABLE
+#    include "outputselect.h"
+#    ifdef BLUETOOTH_BLUEFRUIT_LE
+#        include "bluefruit_le.h"
+#    elif BLUETOOTH_RN42
+#        include "rn42.h"
+#    endif
+#endif
+
 #ifdef NKRO_ENABLE
 #    include "keycode_config.h"
 extern keymap_config_t keymap_config;
@@ -63,6 +72,17 @@ led_t host_keyboard_led_state(void) {
 
 /* send report */
 void host_keyboard_send(report_keyboard_t *report) {
+#ifdef BLUETOOTH_ENABLE
+    if (where_to_send() == OUTPUT_BLUETOOTH) {
+#    ifdef BLUETOOTH_BLUEFRUIT_LE
+        bluefruit_le_send_keys(report->mods, report->keys, sizeof(report->keys));
+#    elif BLUETOOTH_RN42
+        rn42_send_keyboard(report);
+#    endif
+        return;
+    }
+#endif
+
     if (!driver) return;
 #if defined(NKRO_ENABLE) && defined(NKRO_SHARED_EP)
     if (keyboard_protocol && keymap_config.nkro) {
@@ -90,6 +110,18 @@ void host_keyboard_send(report_keyboard_t *report) {
 }
 
 void host_mouse_send(report_mouse_t *report) {
+#ifdef BLUETOOTH_ENABLE
+    if (where_to_send() == OUTPUT_BLUETOOTH) {
+#    ifdef BLUETOOTH_BLUEFRUIT_LE
+        // FIXME: mouse buttons
+        bluefruit_le_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
+#    elif BLUETOOTH_RN42
+        rn42_send_mouse(report);
+#    endif
+        return;
+    }
+#endif
+
     if (!driver) return;
 #ifdef MOUSE_SHARED_EP
     report->report_id = REPORT_ID_MOUSE;
@@ -114,6 +146,17 @@ void host_consumer_send(uint16_t report) {
     if (report == last_consumer_report) return;
     last_consumer_report = report;
 
+#ifdef BLUETOOTH_ENABLE
+    if (where_to_send() == OUTPUT_BLUETOOTH) {
+#    ifdef BLUETOOTH_BLUEFRUIT_LE
+        bluefruit_le_send_consumer_key(report);
+#    elif BLUETOOTH_RN42
+        rn42_send_consumer(report);
+#    endif
+        return;
+    }
+#endif
+
     if (!driver) return;
     (*driver->send_extra)(REPORT_ID_CONSUMER, report);
 }
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 03e19745f8..2a3f5fd883 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -65,15 +65,6 @@ extern keymap_config_t keymap_config;
 #    include "audio.h"
 #endif
 
-#ifdef BLUETOOTH_ENABLE
-#    include "outputselect.h"
-#    ifdef BLUETOOTH_BLUEFRUIT_LE
-#        include "bluefruit_le.h"
-#    elif BLUETOOTH_RN42
-#        include "rn42.h"
-#    endif
-#endif
-
 #ifdef VIRTSER_ENABLE
 #    include "virtser.h"
 #endif
@@ -648,17 +639,6 @@ static uint8_t keyboard_leds(void) {
 static void send_keyboard(report_keyboard_t *report) {
     uint8_t timeout = 255;
 
-#ifdef BLUETOOTH_ENABLE
-    if (where_to_send() == OUTPUT_BLUETOOTH) {
-#    ifdef BLUETOOTH_BLUEFRUIT_LE
-        bluefruit_le_send_keys(report->mods, report->keys, sizeof(report->keys));
-#    elif BLUETOOTH_RN42
-        rn42_send_keyboard(report);
-#    endif
-        return;
-    }
-#endif
-
     /* Select the Keyboard Report Endpoint */
     uint8_t ep   = KEYBOARD_IN_EPNUM;
     uint8_t size = KEYBOARD_REPORT_SIZE;
@@ -695,18 +675,6 @@ static void send_mouse(report_mouse_t *report) {
 #ifdef MOUSE_ENABLE
     uint8_t timeout = 255;
 
-#    ifdef BLUETOOTH_ENABLE
-    if (where_to_send() == OUTPUT_BLUETOOTH) {
-#        ifdef BLUETOOTH_BLUEFRUIT_LE
-        // FIXME: mouse buttons
-        bluefruit_le_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
-#        elif BLUETOOTH_RN42
-        rn42_send_mouse(report);
-#        endif
-        return;
-    }
-#    endif
-
     /* Select the Mouse Report Endpoint */
     Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);
 
@@ -747,17 +715,6 @@ static void send_report(void *report, size_t size) {
  */
 static void send_extra(uint8_t report_id, uint16_t data) {
 #ifdef EXTRAKEY_ENABLE
-#    ifdef BLUETOOTH_ENABLE
-    if (report_id == REPORT_ID_CONSUMER && where_to_send() == OUTPUT_BLUETOOTH) {
-#        ifdef BLUETOOTH_BLUEFRUIT_LE
-        bluefruit_le_send_consumer_key(data);
-#        elif BLUETOOTH_RN42
-        rn42_send_consumer(data);
-#        endif
-        return;
-    }
-#    endif
-
     static report_extra_t r;
     r = (report_extra_t){.report_id = report_id, .usage = data};
     send_report(&r, sizeof(r));
@@ -1007,10 +964,6 @@ void protocol_pre_init(void) {
     setup_usb();
     sei();
 
-#if defined(BLUETOOTH_RN42)
-    rn42_init();
-#endif
-
     /* wait for USB startup & debug output */
 
 #ifdef WAIT_FOR_USB
@@ -1062,10 +1015,6 @@ void protocol_post_task(void) {
     MIDI_Device_USBTask(&USB_MIDI_Interface);
 #endif
 
-#ifdef BLUETOOTH_BLUEFRUIT_LE
-    bluefruit_le_task();
-#endif
-
 #ifdef VIRTSER_ENABLE
     virtser_task();
     CDC_Device_USBTask(&cdc_device);

From 76910eece1dc1aa2f213e6bf4c628a241a20b923 Mon Sep 17 00:00:00 2001
From: David Luo <davidl2381@gmail.com>
Date: Wed, 7 Sep 2022 15:17:52 -0400
Subject: [PATCH 324/959] enable RGB matrix effects for drop ctrl (#18291)

---
 keyboards/massdrop/ctrl/keymaps/via/config.h | 22 ++++++++++++++++++++
 keyboards/massdrop/ctrl/keymaps/via/keymap.c |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/massdrop/ctrl/keymaps/via/config.h

diff --git a/keyboards/massdrop/ctrl/keymaps/via/config.h b/keyboards/massdrop/ctrl/keymaps/via/config.h
new file mode 100644
index 0000000000..c80e648221
--- /dev/null
+++ b/keyboards/massdrop/ctrl/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 dsluo (me@dsluo.dev)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// Enable additional LED functionality
+#define USB_LED_INDICATOR_ENABLE
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/massdrop/ctrl/keymaps/via/keymap.c b/keyboards/massdrop/ctrl/keymaps/via/keymap.c
index 4fb4f3cbde..294ce2e772 100644
--- a/keyboards/massdrop/ctrl/keymaps/via/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 enum ctrl_keycodes {
-    U_T_AUTO = USER00, //USB Extra Port Toggle Auto Detect / Always Active
+    U_T_AUTO = USER00,     //USB Extra Port Toggle Auto Detect / Always Active
     U_T_AGCR,              //USB Toggle Automatic GCR control
     DBG_TOG,               //DEBUG Toggle On / Off
     DBG_MTRX,              //DEBUG Toggle Matrix Prints

From b0dc789a1bd1e9f99d73bd929364d1c0bb8edd52 Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Thu, 8 Sep 2022 02:18:48 +0700
Subject: [PATCH 325/959] [Keyboard] Wearhaus66 correct matrix (#18284)

---
 keyboards/mechlovin/zed65/wearhaus66/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/mechlovin/zed65/wearhaus66/config.h b/keyboards/mechlovin/zed65/wearhaus66/config.h
index d582d36973..5b79931a03 100644
--- a/keyboards/mechlovin/zed65/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/wearhaus66/config.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define MATRIX_ROW_PINS { B13, B14, A10, A1, A0 }
+#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 }
 #define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 }
 
 

From 3f65d48539d1a552ecc44c5524867d2ad9adeae7 Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Wed, 7 Sep 2022 17:04:46 -0400
Subject: [PATCH 326/959] Update Iris VIA configuration (#18306)

* Update RGB matrix max brightness

* Remove old VIA workaround code

* Fix default encoder rotations	for encoder map
---
 keyboards/keebio/iris/keymaps/via/keymap.c |  6 +--
 keyboards/keebio/iris/rev6a/config.h       |  8 +---
 keyboards/keebio/iris/rev6a/rev6a.c        | 55 ----------------------
 keyboards/keebio/iris/rev7/config.h        |  2 +-
 4 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c
index c0916cc213..cfd274cd9a 100644
--- a/keyboards/keebio/iris/keymaps/via/keymap.c
+++ b/keyboards/keebio/iris/keymaps/via/keymap.c
@@ -70,12 +70,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #   if defined(KEYBOARD_keebio_iris_rev7)
     [_MAIN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
-    [_FN1] = { ENCODER_CCW_CW(KC_MNXT, KC_MPRV), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_MNXT, KC_MPRV), ENCODER_CCW_CW(KC_HOME, KC_END) },
+    [_FN1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END) },
     [_FN2] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [_FN3] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_UP, KC_DOWN) },
 #   else
-    [_MAIN] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-    [_FN1] = { ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
+    [_MAIN] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN1] = { ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
     [_FN2] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
     [_FN3] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
 #   endif
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 71ba638852..08863797fb 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -111,7 +111,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_MULTISPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
+#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define DRIVER_LED_TOTAL RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
@@ -119,9 +119,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
 #endif
-
-#define VIA_QMK_RGBLIGHT_ENABLE
-
-// Enable the workaround for the speed parameter mismatch between RGBLIGHT and
-// RGB Matrix, so that the speed slider in VIA behaves in a more useful way.
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/keebio/iris/rev6a/rev6a.c b/keyboards/keebio/iris/rev6a/rev6a.c
index 51f3348714..a78c6a7c08 100644
--- a/keyboards/keebio/iris/rev6a/rev6a.c
+++ b/keyboards/keebio/iris/rev6a/rev6a.c
@@ -63,61 +63,6 @@ led_config_t g_led_config = { {
 
 } };
 
-
-#    if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
-
-// VIA supports only 4 discrete values for effect speed; map these to some
-// useful speed values for RGB Matrix.
-enum speed_values {
-    RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects
-    RGBLIGHT_SPEED_1 = UINT8_MAX / 4,
-    RGBLIGHT_SPEED_2 = UINT8_MAX / 2,     // matches the default value
-    RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast
-};
-
-static uint8_t speed_from_rgblight(uint8_t rgblight_speed) {
-    switch (rgblight_speed) {
-        case 0:
-            return RGBLIGHT_SPEED_0;
-        case 1:
-            return RGBLIGHT_SPEED_1;
-        case 2:
-        default:
-            return RGBLIGHT_SPEED_2;
-        case 3:
-            return RGBLIGHT_SPEED_3;
-    }
-}
-
-static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) {
-    if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) {
-        return 0;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) {
-        return 1;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) {
-        return 2;
-    } else {
-        return 3;
-    }
-}
-
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
-    switch (data[0]) {
-        case id_lighting_get_value:
-            if (data[1] == id_qmk_rgblight_effect_speed) {
-                data[2] = speed_to_rgblight(rgb_matrix_get_speed());
-            }
-            break;
-        case id_lighting_set_value:
-            if (data[1] == id_qmk_rgblight_effect_speed) {
-                rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2]));
-            }
-            break;
-    }
-}
-
-#    endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
-
 #endif
 
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 8673d83a07..005f78e8a9 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -111,7 +111,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_MULTISPLASH
 //#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 //#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
+#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define DRIVER_LED_TOTAL RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }

From ce90be09610861e8a74fd5651efab706cb5ce06d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 7 Sep 2022 14:30:17 -0700
Subject: [PATCH 327/959] GeonWorks Frog Mini Hotswap Layout Rework (#18305)

* fmh.h: add matrix diagram

* info.json: apply friendly formatting

* physically arrange LAYOUT_all macro

Move position `K5D` (right half of Split Backspace) to the end of the top row.

* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_ansi_tsangan

* add LAYOUT_60_hhkb

* add LAYOUT_60_ansi_wkl

* add LAYOUT_60_ansi_wkl_split_bs_rshift

* enable Community Layouts support
---
 keyboards/geonworks/frogmini/fmh/fmh.h        |  90 ++++-
 keyboards/geonworks/frogmini/fmh/info.json    | 330 ++++++++++++++++--
 .../frogmini/fmh/keymaps/default/keymap.c     |  32 +-
 .../frogmini/fmh/keymaps/via/keymap.c         |  32 +-
 4 files changed, 424 insertions(+), 60 deletions(-)

diff --git a/keyboards/geonworks/frogmini/fmh/fmh.h b/keyboards/geonworks/frogmini/fmh/fmh.h
index fdb9a1f527..e352cdc003 100644
--- a/keyboards/geonworks/frogmini/fmh/fmh.h
+++ b/keyboards/geonworks/frogmini/fmh/fmh.h
@@ -19,12 +19,32 @@
 
 #include "quantum.h"
 
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │5D │   │0D     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   │3C        │ 2.75u RShift
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤   └──────────┘
+ * │40   │41 │42   │56                         │5A   │5B │5C   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *       ┌───┬─────┬───────────────────────────┬─────┬───┐
+ *       │41 │42   │56                         │5A   │5B │ HHKB
+ *       └───┴─────┴───────────────────────────┴─────┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │40   │   │42   │56                         │5A   │   │5C   │ WKL
+ * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+ */
+
+#define LAYOUT_60_tsangan_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B     , K2D, \
     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K40, K41, K42,                K56,                K5A, K5B, K5C, K5D  \
+    K40, K41, K42,                K56,                     K5A, K5B, K5C  \
 )\
 {\
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
@@ -34,3 +54,67 @@
     { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
     { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D }  \
 }
+
+#define LAYOUT_60_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K56,                     K5A, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, ___ }  \
+}
+
+#define LAYOUT_60_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+         K41, K42,                K56,                     K5A, K5B       \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { ___, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, ___, K5D }  \
+}
+
+#define LAYOUT_60_ansi_wkl( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40,      K42,                K56,                     K5A,      K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, ___, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, ___ }  \
+}
+
+#define LAYOUT_60_ansi_wkl_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40,      K42,                K56,                     K5A,      K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, ___, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D }  \
+}
diff --git a/keyboards/geonworks/frogmini/fmh/info.json b/keyboards/geonworks/frogmini/fmh/info.json
index 0f1d3f8388..3961df2fc9 100644
--- a/keyboards/geonworks/frogmini/fmh/info.json
+++ b/keyboards/geonworks/frogmini/fmh/info.json
@@ -8,23 +8,29 @@
         "pid": "0x2D28",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": ["60_tsangan_hhkb", "60_ansi_tsangan", "60_hhkb"],
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
                 {"label":"Bksp", "x":13, "y":0},
                 {"label":"Bksp", "x":14, "y":0},
+
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
                 {"label":"W", "x":2.5, "y":1},
@@ -36,9 +42,10 @@
                 {"label":"I", "x":8.5, "y":1},
                 {"label":"O", "x":9.5, "y":1},
                 {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
                 {"label":"A", "x":1.75, "y":2},
                 {"label":"S", "x":2.75, "y":2},
@@ -49,9 +56,10 @@
                 {"label":"J", "x":7.75, "y":2},
                 {"label":"K", "x":8.75, "y":2},
                 {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
                 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
                 {"label":"Shift", "x":0, "y":3, "w":2.25},
                 {"label":"Z", "x":2.25, "y":3},
                 {"label":"X", "x":3.25, "y":3},
@@ -60,18 +68,290 @@
                 {"label":"B", "x":6.25, "y":3},
                 {"label":"N", "x":7.25, "y":3},
                 {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
                 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
+                {"label":"Fn", "x":14, "y":3},
+
                 {"label":"Ctrl", "x":0, "y":4, "w":1.5},
                 {"label":"Win", "x":1.5, "y":4},
                 {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
+                {"label":"Space", "x":4, "y":4, "w":7},
                 {"label":"Alt", "x":11, "y":4, "w":1.5},
                 {"label":"Win", "x":12.5, "y":4},
-                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c b/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
index bc5dc1136a..1c69068bd6 100644
--- a/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
+++ b/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
@@ -16,32 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
-    KC_GESC , KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, 
-    KC_TAB,   KC_Q,    KC_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_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,  KC_BSPC         
+[0] = LAYOUT_60_tsangan_hhkb( /* Base */
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_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_all(
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[1] = LAYOUT_60_tsangan_hhkb(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[2] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[2] = LAYOUT_60_tsangan_hhkb(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[3] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[3] = LAYOUT_60_tsangan_hhkb(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
-) 
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
+)
 };
diff --git a/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c b/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
index bc5dc1136a..1c69068bd6 100644
--- a/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
+++ b/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
@@ -16,32 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
-    KC_GESC , KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, 
-    KC_TAB,   KC_Q,    KC_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_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,  KC_BSPC         
+[0] = LAYOUT_60_tsangan_hhkb( /* Base */
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_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_all(
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[1] = LAYOUT_60_tsangan_hhkb(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[2] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[2] = LAYOUT_60_tsangan_hhkb(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[3] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[3] = LAYOUT_60_tsangan_hhkb(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
-) 
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
+)
 };

From 7b4dc5a7e4af30c27e453c55230f80adb8721c13 Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Wed, 7 Sep 2022 17:52:11 -0400
Subject: [PATCH 328/959] Add Iris Rev. 6b (#18307)

---
 keyboards/keebio/iris/iris.h          |   2 +
 keyboards/keebio/iris/rev6b/config.h  | 121 ++++++++++++++++++++++++++
 keyboards/keebio/iris/rev6b/info.json |   7 ++
 keyboards/keebio/iris/rev6b/rev6b.c   |  85 ++++++++++++++++++
 keyboards/keebio/iris/rev6b/rev6b.h   |  42 +++++++++
 keyboards/keebio/iris/rev6b/rules.mk  |  24 +++++
 6 files changed, 281 insertions(+)
 create mode 100644 keyboards/keebio/iris/rev6b/config.h
 create mode 100644 keyboards/keebio/iris/rev6b/info.json
 create mode 100644 keyboards/keebio/iris/rev6b/rev6b.c
 create mode 100644 keyboards/keebio/iris/rev6b/rev6b.h
 create mode 100644 keyboards/keebio/iris/rev6b/rules.mk

diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h
index fabd8e5150..b7be3fc59e 100644
--- a/keyboards/keebio/iris/iris.h
+++ b/keyboards/keebio/iris/iris.h
@@ -16,6 +16,8 @@
     #include "rev6.h"
 #elif defined(KEYBOARD_keebio_iris_rev6a)
     #include "rev6a.h"
+#elif defined(KEYBOARD_keebio_iris_rev6b)
+    #include "rev6b.h"
 #elif defined(KEYBOARD_keebio_iris_rev7)
     #include "rev7.h"
 #endif
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
new file mode 100644
index 0000000000..08863797fb
--- /dev/null
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -0,0 +1,121 @@
+/*
+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
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
+#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
+#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
+#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
+#define SPLIT_HAND_PIN D5
+
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B2 }
+#define ENCODERS_PAD_A_RIGHT { B3 }
+#define ENCODERS_PAD_B_RIGHT { B2 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+// #define BACKLIGHT_LEVELS 3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN E6
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 68
+#    define RGBLED_SPLIT { 34, 34 }
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== enabled animations ==*/
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_DEFAULT_VAL 120
+#    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
+// RGB Matrix
+//#    ifdef RGB_MATRIX_ENABLE
+#        define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_BREATHING
+#        define ENABLE_RGB_MATRIX_BAND_SAT
+#        define ENABLE_RGB_MATRIX_BAND_VAL
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#        define ENABLE_RGB_MATRIX_CYCLE_ALL
+#        define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#        define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#        define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#        define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#        define ENABLE_RGB_MATRIX_DUAL_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#        define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#        define ENABLE_RGB_MATRIX_SPLASH
+#        define ENABLE_RGB_MATRIX_MULTISPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
+#        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_SPLIT { 34, 34 }
+#        define RGB_DISABLE_WHEN_USB_SUSPENDED
+#        define RGB_MATRIX_KEYPRESSES
+//#    endif
+#endif
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
new file mode 100644
index 0000000000..eafae19202
--- /dev/null
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Iris Rev. 6b",
+    "usb": {
+        "pid": "0x6456",
+        "device_version": "6.2.0"
+    }
+}
diff --git a/keyboards/keebio/iris/rev6b/rev6b.c b/keyboards/keebio/iris/rev6b/rev6b.c
new file mode 100644
index 0000000000..f4d9a6830b
--- /dev/null
+++ b/keyboards/keebio/iris/rev6b/rev6b.c
@@ -0,0 +1,85 @@
+/*
+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 "rev6b.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    // Left Half
+    { 0, 1, 2, 3, 4, 5 },
+    { 11, 10, 9, 8, 7, 6 },
+    { 12, 13, 14, 15, 16, 17 },
+    { 23, 22, 21, 20, 19, 18 },
+    { NO_LED, NO_LED, 24, 25, 26, 27 },
+    // Right Half
+    { 34, 35, 36, 37, 38, 39 },
+    { 45, 44, 43, 42, 41, 40 },
+    { 46, 47, 48, 49, 50, 51 },
+    { 57, 56, 55, 54, 53, 52 },
+    { NO_LED, NO_LED, 58, 59, 60, 61 }
+}, {
+    // LED Index to Physical Position
+    // Left Half
+    { 0, 5 }, { 16, 5 }, { 32, 2 }, { 48, 0 }, { 64, 2 }, { 80, 3 },
+    { 80, 17 }, { 64, 15 }, { 48, 13 }, { 32, 15 }, { 16, 18 }, { 0, 18 },
+    { 0, 32 }, { 16, 32 }, { 32, 28 }, { 48, 27 }, { 64, 28 }, { 80, 30 },
+    { 80, 43 }, { 64, 42 }, { 48, 40 }, { 32, 42 }, { 16, 45 }, { 0, 45 },
+    { 56, 47 }, { 72, 58 }, { 90, 64 }, { 98, 52 },
+    { 80, 58 }, { 40, 50 }, { 8, 43 }, { 8, 5 }, { 40, 1 }, { 72, 3 },
+    // Right Half
+    { 224, 5 }, { 208, 5 }, { 192, 2 }, { 176, 0 }, { 160, 2 }, { 144, 3 },
+    { 144, 18 }, { 160, 18 }, { 176, 15 }, { 192, 13 }, { 208, 15 }, { 224, 17 },
+    { 224, 32 }, { 208, 32 }, { 192, 28 }, { 176, 27 }, { 160, 28 }, { 144, 30 },
+    { 144, 45 }, { 160, 45 }, { 176, 42 }, { 192, 40 }, { 208, 42 }, { 224, 43 },
+    { 168, 47 }, { 152, 58 }, { 134, 64 }, { 126, 52 },
+    { 144, 58 }, { 184, 50 }, { 216, 43 }, { 216, 5 }, { 184, 1 }, { 152, 3 }
+}, {
+    // LED Index to Flag
+    // Left Half
+    4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4,
+          4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2,
+    // Right Half
+    4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2
+
+} };
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/keebio/iris/rev6b/rev6b.h b/keyboards/keebio/iris/rev6b/rev6b.h
new file mode 100644
index 0000000000..d13e24410e
--- /dev/null
+++ b/keyboards/keebio/iris/rev6b/rev6b.h
@@ -0,0 +1,42 @@
+/*
+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
+
+#include "iris.h"
+#include "quantum.h"
+
+
+#define LAYOUT( \
+    LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
+    LB1, LB2, LB3, LB4, LB5, LB6,           RB6, RB5, RB4, RB3, RB2, RB1, \
+    LC1, LC2, LC3, LC4, LC5, LC6,           RC6, RC5, RC4, RC3, RC2, RC1, \
+    LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \
+                        LE3, LE4, LE5, RE5, RE4, RE3 \
+    ) \
+    { \
+        { LA1, LA2, LA3, LA4, LA5, LA6 }, \
+        { LB1, LB2, LB3, LB4, LB5, LB6 }, \
+        { LC1, LC2, LC3, LC4, LC5, LC6 }, \
+        { LD1, LD2, LD3, LD4, LD5, LD6 }, \
+        { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \
+        { RA1, RA2, RA3, RA4, RA5, RA6 }, \
+        { RB1, RB2, RB3, RB4, RB5, RB6 }, \
+        { RC1, RC2, RC3, RC4, RC5, RC6 }, \
+        { RD1, RD2, RD3, RD4, RD5, RD6 }, \
+        { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \
+    }
diff --git a/keyboards/keebio/iris/rev6b/rules.mk b/keyboards/keebio/iris/rev6b/rules.mk
new file mode 100644
index 0000000000..87f19b5fc1
--- /dev/null
+++ b/keyboards/keebio/iris/rev6b/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+ENCODER_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+LTO_ENABLE = yes

From fb6e82154140df1b87f74f80dac911c96163e82e Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Thu, 8 Sep 2022 14:59:27 -0400
Subject: [PATCH 329/959] Add Elite-Pi converter (#18236)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 data/mappings/defaults.json                   |  6 ++++
 data/schemas/keyboard.jsonschema              |  2 +-
 docs/feature_converters.md                    |  7 ++--
 docs/squeezing_avr.md                         |  1 +
 .../promicro_to_elite_pi/_pin_defs.h          | 36 +++++++++++++++++++
 .../promicro_to_elite_pi/converter.mk         |  9 +++++
 6 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h
 create mode 100644 platforms/chibios/converters/promicro_to_elite_pi/converter.mk

diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json
index c855e64d33..ea9f6972c5 100644
--- a/data/mappings/defaults.json
+++ b/data/mappings/defaults.json
@@ -10,6 +10,12 @@
             "bootloader": "atmel-dfu",
             "pin_compatible": "promicro"
         },
+        "elite_pi": {
+            "processor": "RP2040",
+            "bootloader": "rp2040",
+            "board": "QMK_PM2040",
+            "pin_compatible": "promicro"
+        },
         "proton_c": {
             "processor": "STM32F303",
             "bootloader": "stm32-dfu",
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index d0375fcdc4..7e0400d7f7 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -34,7 +34,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"]
+            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"]
         },
         "pin_compatible": {
             "type": "string",
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index fe12254efe..1323bdb372 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -17,6 +17,7 @@ Currently the following converters are available:
 | `promicro` | `bit_c_pro`       |
 | `promicro` | `stemcell`        |
 | `promicro` | `bonsai_c4`       |
+| `promicro` | `elite_pi`        |
 
 See below for more in depth information on each converter.
 
@@ -60,6 +61,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co
 | [Bit-C PRO](https://nullbits.co/bit-c-pro)                                               | `bit_c_pro`       |
 | [STeMCell](https://github.com/megamind4089/STeMCell)                                     | `stemcell`        |
 | [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4`       |
+| [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)         | `elite_pi`        |
 
 Converter summary:
 
@@ -72,6 +74,7 @@ Converter summary:
 | `bit_c_pro`       | `-e CONVERT_TO=bit_c_pro`       | `CONVERT_TO=bit_c_pro`       | `#ifdef CONVERT_TO_BIT_C_PRO`       |
 | `stemcell`        | `-e CONVERT_TO=stemcell`        | `CONVERT_TO=stemcell`        | `#ifdef CONVERT_TO_STEMCELL`        |
 | `bonsai_c4`       | `-e CONVERT_TO=bonsai_c4`       | `CONVERT_TO=bonsai_c4`       | `#ifdef CONVERT_TO_BONSAI_C4`       |
+| `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |
 
 ### Proton C :id=proton_c
 
@@ -102,7 +105,7 @@ The following defaults are based on what has been implemented for [RP2040](platf
 | USB Host (e.g. USB-USB converter)            | Not supported (USB host code is AVR specific and is not currently supported on ARM)                              |
 | [Split keyboards](feature_split_keyboard.md) | Partial via `PIO` vendor driver - heavily dependent on enabled features                                          |
 
-### SparkFun Pro Micro - RP2040, Blok, and Bit-C PRO :id=promicro_rp2040 
+### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO, and Elite-Pi :id=promicro_rp2040 
 
 Currently identical to  [Adafruit KB2040](#kb2040).
 
@@ -135,4 +138,4 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro
 #define B0 PAL_LINE(GPIOA, 9)
 ```
 
-No peripherals are enabled by default at this time, but example code to enable SPI, I2C, PWM, and Serial communications can be found [here](/keyboards/custommk/bonsai_c4_template) 
\ No newline at end of file
+No peripherals are enabled by default at this time, but example code to enable SPI, I2C, PWM, and Serial communications can be found [here](/keyboards/custommk/bonsai_c4_template)
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index bb8e460024..caf18002c0 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -192,6 +192,7 @@ That said, there are a number of Pro Micro replacements with ARM controllers:
 * [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040)
 * [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288)
 * [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)
+* [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)
 
 There are other, non-Pro Micro compatible boards out there. The most popular being:
 * [WeAct Blackpill F411](https://www.aliexpress.com/item/1005001456186625.html) (~$6 USD)
diff --git a/platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h b/platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h
new file mode 100644
index 0000000000..1372bef79e
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h
@@ -0,0 +1,36 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 0U
+#define D2 1U
+//      GND
+//      GND
+#define D1 2U
+#define D0 3U
+#define D4 4U
+#define C6 5U
+#define D7 6U
+#define E6 7U
+#define B4 8U
+#define B5 9U
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 29U
+#define F5 28U
+#define F6 27U
+#define F7 26U
+#define B1 22U
+#define B3 20U
+#define B2 23U
+#define B6 21U
+
+// LEDs
+#define D5 12U
+#define B0 13U
diff --git a/platforms/chibios/converters/promicro_to_elite_pi/converter.mk b/platforms/chibios/converters/promicro_to_elite_pi/converter.mk
new file mode 100644
index 0000000000..590a004189
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_elite_pi/converter.mk
@@ -0,0 +1,9 @@
+# Elite-Pi MCU settings for converting AVR projects
+MCU := RP2040
+BOARD := QMK_PM2040
+BOOTLOADER := rp2040
+
+# These are defaults based on what has been implemented for RP2040 boards
+SERIAL_DRIVER ?= vendor
+WS2812_DRIVER ?= vendor
+BACKLIGHT_DRIVER ?= software

From 107ccc56b4cbf15d223e5946c74c8495c160eb7b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 8 Sep 2022 18:57:46 -0700
Subject: [PATCH 330/959] Hillside 46 & 52: remove dead space from QMK
 Configurator renderings (#18315)

* Hillside 46 info.json: fix syntax error

* Hillside 46 info.json: remove dead space

* Hillside 52 info.json: remove dead space
---
 keyboards/handwired/hillside/46/info.json |  92 +++++++++----------
 keyboards/handwired/hillside/52/info.json | 104 +++++++++++-----------
 2 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/keyboards/handwired/hillside/46/info.json b/keyboards/handwired/hillside/46/info.json
index 538da4e7c0..b21906818c 100644
--- a/keyboards/handwired/hillside/46/info.json
+++ b/keyboards/handwired/hillside/46/info.json
@@ -43,62 +43,62 @@
         "LAYOUT": {
             "layout": [
 
-                {"label": "`~", "x": 0.8, "y": 1.13},
-                {"label": "Q", "x": 1.8, "y": 0.93},
-                {"label": "W", "x": 2.9, "y": 0.31},
-                {"label": "E", "x": 4, "y": 0},
-                {"label": "R", "x": 5, "y": 0.28},
-                {"label": "T", "x": 6, "y": 0.42},
+                {"label": "`~", "x": 0, "y": 1.13},
+                {"label": "Q", "x": 1, "y": 0.93},
+                {"label": "W", "x": 2.1, "y": 0.31},
+                {"label": "E", "x": 3.2, "y": 0},
+                {"label": "R", "x": 4.2, "y": 0.28},
+                {"label": "T", "x": 5.2, "y": 0.42},
 
-                {"label": "Y", "x": 10.5, "y": 0.42},
-                {"label": "U", "x": 11.5, "y": 0.28},
-                {"label": "I", "x": 12.5, "y": 0},
-                {"label": "O", "x": 13.6, "y": 0.31},
-                {"label": "P", "x": 14.7, "y": 0.93},
-                {"label": "Backspace", "x": 15.7, "y": 1.13},
+                {"label": "Y", "x": 9.7, "y": 0.42},
+                {"label": "U", "x": 10.7, "y": 0.28},
+                {"label": "I", "x": 11.7, "y": 0},
+                {"label": "O", "x": 12.8, "y": 0.31},
+                {"label": "P", "x": 13.9, "y": 0.93},
+                {"label": "Backspace", "x": 14.9, "y": 1.13},
 
 
-                {"label": "Tab", "x": 0.9, "y": 2.13},
-                {"label": "A", "x": 1.9, "y": 1.93},
-                {"label": "S", "x": 2.95, "y": 1.31},
-                {"label": "D", "x": 4, "y": 1},
-                {"label": "F", "x": 5, "y": 1.28},
-                {"label": "G", "x": 6, "y": 1.42},
+                {"label": "Tab", "x": 0.1, "y": 2.13},
+                {"label": "A", "x": 1.1, "y": 1.93},
+                {"label": "S", "x": 2.15, "y": 1.31},
+                {"label": "D", "x": 3.2, "y": 1},
+                {"label": "F", "x": 4.2, "y": 1.28},
+                {"label": "G", "x": 5.2, "y": 1.42},
 
-                {"label": "H", "x": 10.5, "y": 1.42},
-                {"label": "J", "x": 11.5, "y": 1.28},
-                {"label": "K", "x": 12.5, "y": 1},
-                {"label": "L", "x": 13.55, "y": 1.31},
-                {"label": ";", "x": 14.6, "y": 1.93},
-                {"label": "Enter", "x": 15.6, "y": 2.13},
+                {"label": "H", "x": 9.7, "y": 1.42},
+                {"label": "J", "x": 10.7, "y": 1.28},
+                {"label": "K", "x": 11.7, "y": 1},
+                {"label": "L", "x": 12.75, "y": 1.31},
+                {"label": ";", "x": 13.8, "y": 1.93},
+                {"label": "Enter", "x": 14.8, "y": 2.13},
 
 
-                {"label": "Ctrl", "x": 1, "y": 3.13},
-                {"label": "Z", "x": 2, "y": 2.93},
-                {"label": "X", "x": 3, "y": 2.31},
-                {"label": "C", "x": 4, "y": 2},
-                {"label": "V", "x": 5, "y": 2.28},
-                {"label": "B", "x": 6, "y": 2.42},
-                {"label": "ESC", "x": 7, "y": 2.88},
+                {"label": "Ctrl", "x": 0.2, "y": 3.13},
+                {"label": "Z", "x": 1.2, "y": 2.93},
+                {"label": "X", "x": 2.2, "y": 2.31},
+                {"label": "C", "x": 3.2, "y": 2},
+                {"label": "V", "x": 4.2, "y": 2.28},
+                {"label": "B", "x": 5.2, "y": 2.42},
+                {"label": "ESC", "x": 6.2, "y": 2.88},
 
-                {"label": "CAP", "x": 9.5, "y": 2.88},
-                {"label": "N", "x": 10.5, "y": 2.42},
-                {"label": "M", "x": 11.5, "y": 2.28},
-                {"label": ",", "x": 12.5, "y": 2},
-                {"label": ".", "x": 13.5, "y": 2.31},
-                {"label": "/", "x": 14.5, "y": 2.93},
-                {"label": "'", "x": 15.5, "y": 3.13},
+                {"label": "CAP", "x": 8.7, "y": 2.88},
+                {"label": "N", "x": 9.7, "y": 2.42},
+                {"label": "M", "x": 10.7, "y": 2.28},
+                {"label": ",", "x": 11.7, "y": 2},
+                {"label": ".", "x": 12.7, "y": 2.31},
+                {"label": "/", "x": 13.7, "y": 2.93},
+                {"label": "'", "x": 14.7, "y": 3.13},
 
 
-                {"label": "Gui", "x": 4.5, "y": 3.28},
-                {"label": "Alt", "x": 5.5, "y": 3.42},
-                {"label": "Shift", "x": 6.5, "y": 3.88},
-                {"label": "Nav", "x": 7.5, "y": 4.44},
+                {"label": "Gui", "x": 3.7, "y": 3.28},
+                {"label": "Alt", "x": 4.7, "y": 3.42},
+                {"label": "Shift", "x": 5.7, "y": 3.88},
+                {"label": "Nav", "x": 6.7, "y": 4.44},
 
-                {"label": "Sym", "x": 9, "y": 4.44},
-                {"label": "Space", "x": 10, "y": 3.88},
-                {"label": "Alt", "x": 11, "y": 3.42},
-                {"label": "Gui", "x": 12, "y": 3.28},
+                {"label": "Sym", "x": 8.2, "y": 4.44},
+                {"label": "Space", "x": 9.2, "y": 3.88},
+                {"label": "Alt", "x": 10.2, "y": 3.42},
+                {"label": "Gui", "x": 11.2, "y": 3.28}
             ]
         }
     }
diff --git a/keyboards/handwired/hillside/52/info.json b/keyboards/handwired/hillside/52/info.json
index 407d76a548..2a78ccd9b6 100644
--- a/keyboards/handwired/hillside/52/info.json
+++ b/keyboards/handwired/hillside/52/info.json
@@ -43,68 +43,68 @@
         "LAYOUT": {
             "layout": [
 
-                {"label": "`~", "x": 0.8, "y": 1.13},
-                {"label": "Q", "x": 1.8, "y": 0.93},
-                {"label": "W", "x": 2.9, "y": 0.31},
-                {"label": "E", "x": 4, "y": 0},
-                {"label": "R", "x": 5, "y": 0.28},
-                {"label": "T", "x": 6, "y": 0.42},
+                {"label": "`~", "x": 0, "y": 1.13},
+                {"label": "Q", "x": 1, "y": 0.93},
+                {"label": "W", "x": 2.1, "y": 0.31},
+                {"label": "E", "x": 3.2, "y": 0},
+                {"label": "R", "x": 4.2, "y": 0.28},
+                {"label": "T", "x": 5.2, "y": 0.42},
 
-                {"label": "Y", "x": 10.5, "y": 0.42},
-                {"label": "U", "x": 11.5, "y": 0.28},
-                {"label": "I", "x": 12.5, "y": 0},
-                {"label": "O", "x": 13.6, "y": 0.31},
-                {"label": "P", "x": 14.7, "y": 0.93},
-                {"label": "Backspace", "x": 15.7, "y": 1.13},
+                {"label": "Y", "x": 9.7, "y": 0.42},
+                {"label": "U", "x": 10.7, "y": 0.28},
+                {"label": "I", "x": 11.7, "y": 0},
+                {"label": "O", "x": 12.8, "y": 0.31},
+                {"label": "P", "x": 13.9, "y": 0.93},
+                {"label": "Backspace", "x": 14.9, "y": 1.13},
 
 
-                {"label": "Tab", "x": 0.9, "y": 2.13},
-                {"label": "A", "x": 1.9, "y": 1.93},
-                {"label": "S", "x": 2.95, "y": 1.31},
-                {"label": "D", "x": 4, "y": 1},
-                {"label": "F", "x": 5, "y": 1.28},
-                {"label": "G", "x": 6, "y": 1.42},
+                {"label": "Tab", "x": 0.1, "y": 2.13},
+                {"label": "A", "x": 1.1, "y": 1.93},
+                {"label": "S", "x": 2.15, "y": 1.31},
+                {"label": "D", "x": 3.2, "y": 1},
+                {"label": "F", "x": 4.2, "y": 1.28},
+                {"label": "G", "x": 5.2, "y": 1.42},
 
-                {"label": "H", "x": 10.5, "y": 1.42},
-                {"label": "J", "x": 11.5, "y": 1.28},
-                {"label": "K", "x": 12.5, "y": 1},
-                {"label": "L", "x": 13.55, "y": 1.31},
-                {"label": ";", "x": 14.6, "y": 1.93},
-                {"label": "Enter", "x": 15.6, "y": 2.13},
+                {"label": "H", "x": 9.7, "y": 1.42},
+                {"label": "J", "x": 10.7, "y": 1.28},
+                {"label": "K", "x": 11.7, "y": 1},
+                {"label": "L", "x": 12.75, "y": 1.31},
+                {"label": ";", "x": 13.8, "y": 1.93},
+                {"label": "Enter", "x": 14.8, "y": 2.13},
 
 
-                {"label": "Shift", "x": 1, "y": 3.13},
-                {"label": "Z", "x": 2, "y": 2.93},
-                {"label": "X", "x": 3, "y": 2.31},
-                {"label": "C", "x": 4, "y": 2},
-                {"label": "V", "x": 5, "y": 2.28},
-                {"label": "B", "x": 6, "y": 2.42},
-                {"label": "'", "x": 7, "y": 2.88},
+                {"label": "Shift", "x": 0.2, "y": 3.13},
+                {"label": "Z", "x": 1.2, "y": 2.93},
+                {"label": "X", "x": 2.2, "y": 2.31},
+                {"label": "C", "x": 3.2, "y": 2},
+                {"label": "V", "x": 4.2, "y": 2.28},
+                {"label": "B", "x": 5.2, "y": 2.42},
+                {"label": "'", "x": 6.2, "y": 2.88},
 
-                {"label": "/", "x": 9.5, "y": 2.88},
-                {"label": "N", "x": 10.5, "y": 2.42},
-                {"label": "M", "x": 11.5, "y": 2.28},
-                {"label": ",", "x": 12.5, "y": 2},
-                {"label": ".", "x": 13.5, "y": 2.31},
-                {"label": "Up", "x": 14.5, "y": 2.93},
-                {"label": "Shift", "x": 15.5, "y": 3.13},
+                {"label": "/", "x": 8.7, "y": 2.88},
+                {"label": "N", "x": 9.7, "y": 2.42},
+                {"label": "M", "x": 10.7, "y": 2.28},
+                {"label": ", ", "x": 11.7, "y": 2},
+                {"label": ".", "x": 12.7, "y": 2.31},
+                {"label": "Up", "x": 13.7, "y": 2.93},
+                {"label": "Shift", "x": 14.7, "y": 3.13},
 
 
-                {"label": "Mute", "x": 1.1, "y": 4.13},
-                {"label": "Esc", "x": 2.1, "y": 3.93},
-                {"label": "Ctrl", "x": 3.1, "y": 3.73},
-                {"label": "Gui", "x": 4.5, "y": 3.28},
-                {"label": "Alt", "x": 5.5, "y": 3.42},
-                {"label": "Shift", "x": 6.5, "y": 3.88},
-                {"label": "Nav", "x": 7.5, "y": 4.44},
+                {"label": "Mute", "x": 0.3, "y": 4.13},
+                {"label": "Esc", "x": 1.3, "y": 3.93},
+                {"label": "Ctrl", "x": 2.3, "y": 3.73},
+                {"label": "Gui", "x": 3.7, "y": 3.28},
+                {"label": "Alt", "x": 4.7, "y": 3.42},
+                {"label": "Shift", "x": 5.7, "y": 3.88},
+                {"label": "Nav", "x": 6.7, "y": 4.44},
 
-                {"label": "Sym", "x": 9, "y": 4.44},
-                {"label": "Space", "x": 10, "y": 3.88},
-                {"label": "Alt", "x": 11, "y": 3.42},
-                {"label": "Gui", "x": 12, "y": 3.28},
-                {"label": "Left", "x": 13.4, "y": 3.73},
-                {"label": "Down", "x": 14.4, "y": 3.93},
-                {"label": "Right", "x": 15.4, "y": 4.13}
+                {"label": "Sym", "x": 8.2, "y": 4.44},
+                {"label": "Space", "x": 9.2, "y": 3.88},
+                {"label": "Alt", "x": 10.2, "y": 3.42},
+                {"label": "Gui", "x": 11.2, "y": 3.28},
+                {"label": "Left", "x": 12.6, "y": 3.73},
+                {"label": "Down", "x": 13.6, "y": 3.93},
+                {"label": "Right", "x": 14.6, "y": 4.13}
             ]
         }
     }

From 88555d8e18e90c2571c5d6553aae46c697c3341b Mon Sep 17 00:00:00 2001
From: Jacqueline Liang <8636194+Bratzworth@users.noreply.github.com>
Date: Fri, 9 Sep 2022 05:41:18 -0700
Subject: [PATCH 331/959] Add via support for 6key (#18082)

---
 keyboards/handwired/6key/6key.c               | 38 +++++++++++--------
 keyboards/handwired/6key/6key.h               | 30 +++++++--------
 keyboards/handwired/6key/config.h             | 28 +++++++-------
 keyboards/handwired/6key/info.json            |  9 +++--
 .../handwired/6key/keymaps/default/keymap.c   | 27 +++----------
 keyboards/handwired/6key/keymaps/via/keymap.c | 35 +++++++++++++++++
 keyboards/handwired/6key/keymaps/via/rules.mk |  2 +
 keyboards/handwired/6key/rules.mk             |  2 +-
 8 files changed, 102 insertions(+), 69 deletions(-)
 create mode 100644 keyboards/handwired/6key/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/6key/keymaps/via/rules.mk

diff --git a/keyboards/handwired/6key/6key.c b/keyboards/handwired/6key/6key.c
index ab4263bde4..22c766a30f 100644
--- a/keyboards/handwired/6key/6key.c
+++ b/keyboards/handwired/6key/6key.c
@@ -1,16 +1,24 @@
- /* Copyright 2020 Bratzworth 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+ /* Copyright 2020 Bratzworth
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 #include "6key.h"
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) { return false; }
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 1 : 0));
+    }
+    return true;
+}
diff --git a/keyboards/handwired/6key/6key.h b/keyboards/handwired/6key/6key.h
index fe02df44e9..f63abc35d2 100644
--- a/keyboards/handwired/6key/6key.h
+++ b/keyboards/handwired/6key/6key.h
@@ -1,17 +1,17 @@
- /* Copyright 2020 Bratzworth 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ /* Copyright 2020 Bratzworth
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 #pragma once
 
@@ -24,4 +24,4 @@
 { \
     { k00, k01, k02 },  \
     { k03, k04, k05 }   \
-} 
+}
diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h
index b7d983d75f..42d7a5cb32 100644
--- a/keyboards/handwired/6key/config.h
+++ b/keyboards/handwired/6key/config.h
@@ -1,17 +1,17 @@
- /* Copyright 2020 Bratzworth 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ /* Copyright 2020 Bratzworth
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
 #pragma once
diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json
index 4b1e69de86..b069f067c5 100644
--- a/keyboards/handwired/6key/info.json
+++ b/keyboards/handwired/6key/info.json
@@ -1,16 +1,19 @@
 {
     "keyboard_name": "6key",
-    "manufacturer": "Bratzworth",
+    "manufacturer": "bratzworth",
     "url": "https://github.com/Bratzworth/6key",
     "maintainer": "bratzworth",
     "usb": {
-      "vid": "0xBEED",
+      "vid": "0xD143",
       "pid": "0x0007",
       "device_version": "0.0.1"
     },
     "layouts": {
       "LAYOUT": {
-        "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]
+        "layout": [
+            {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0},
+            {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}
+        ]
       }
     }
   }
diff --git a/keyboards/handwired/6key/keymaps/default/keymap.c b/keyboards/handwired/6key/keymaps/default/keymap.c
index ad73597bab..ab93024064 100644
--- a/keyboards/handwired/6key/keymaps/default/keymap.c
+++ b/keyboards/handwired/6key/keymaps/default/keymap.c
@@ -15,33 +15,18 @@
   */
 #include QMK_KEYBOARD_H
 
-#define _MAIN 0
-#define _FN 1
-
-#define KC_UNDO LCTL(KC_Z)
-#define KC_REDO LCTL(KC_Y)
+enum layers{
+  _MAIN,
+  _FN
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MAIN] = LAYOUT(
-    KC_UNDO,  KC_REDO,  KC_A,
-    KC_C,     KC_D,     KC_S
+    KC_Z, KC_Y, KC_A,
+    KC_C, KC_D, KC_S
   ),
-
   [_FN] = LAYOUT(
     KC_F13, KC_F14, KC_F15,
     KC_F16, KC_F17, KC_F18
   )
 };
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-            if (active) {
-                set_single_persistent_default_layer(_FN);
-            } else {
-                set_single_persistent_default_layer(_MAIN);
-            }
-        }
-    }
-    return true;
-}
diff --git a/keyboards/handwired/6key/keymaps/via/keymap.c b/keyboards/handwired/6key/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4e1922da56
--- /dev/null
+++ b/keyboards/handwired/6key/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+ /* Copyright 2022 Bratzworth
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        LCTL(KC_Z), LCTL(KC_Y), KC_A,
+        KC_C,       KC_D,       KC_S
+    ),
+    [1] = LAYOUT(
+        KC_F13, KC_F14, KC_F15,
+        KC_F16, KC_F17, KC_F18
+    ),
+    [2] = LAYOUT(
+        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
+        ),
+};
diff --git a/keyboards/handwired/6key/keymaps/via/rules.mk b/keyboards/handwired/6key/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/handwired/6key/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/6key/rules.mk b/keyboards/handwired/6key/rules.mk
index 5be28d8a57..3cb12386cc 100644
--- a/keyboards/handwired/6key/rules.mk
+++ b/keyboards/handwired/6key/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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

From 9ad75dbf4705f4916e3f976423ab065c500cb959 Mon Sep 17 00:00:00 2001
From: "ZhaoYou.Ge" <gezhaoyou@126.com>
Date: Sat, 10 Sep 2022 02:17:10 +0800
Subject: [PATCH 332/959] 'soda/cherish' support apm32f072 (#18316)

---
 keyboards/soda/cherish/rules.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk
index 490b5aab76..55f433aaaa 100644
--- a/keyboards/soda/cherish/rules.mk
+++ b/keyboards/soda/cherish/rules.mk
@@ -17,5 +17,8 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From 9e242621611ac97a9fe8f12133812019af41e072 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 9 Sep 2022 21:21:48 +0100
Subject: [PATCH 333/959] Fix DD use within boardsource/microdox (#18319)

---
 keyboards/boardsource/microdox/config.h     | 77 ---------------------
 keyboards/boardsource/microdox/v1/config.h  | 16 +----
 keyboards/boardsource/microdox/v1/info.json |  4 +-
 keyboards/boardsource/microdox/v2/config.h  |  1 -
 4 files changed, 3 insertions(+), 95 deletions(-)
 delete mode 100644 keyboards/boardsource/microdox/config.h

diff --git a/keyboards/boardsource/microdox/config.h b/keyboards/boardsource/microdox/config.h
deleted file mode 100644
index 517e0e7376..0000000000
--- a/keyboards/boardsource/microdox/config.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2020 Cole Smith <cole@boadsource.xyz>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-#define MATRIX_ROW_PINS \
-    { B2, B6, B4, B5 }
-
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { F4, F5, F6, F7, B1 }
-#define USE_SERIAL
-#define SOFT_SERIAL_PIN D2
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 12 // Number of LEDs
-#    define RGBLED_SPLIT \
-        { 6, 6 }
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-
-#endif
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardsource/microdox/v1/config.h b/keyboards/boardsource/microdox/v1/config.h
index 111033dd67..01b894afd6 100644
--- a/keyboards/boardsource/microdox/v1/config.h
+++ b/keyboards/boardsource/microdox/v1/config.h
@@ -3,18 +3,4 @@
 
 #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
+// Just here to please quantum/split_common/split_util.c
diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json
index a79153a73c..85f2e61457 100644
--- a/keyboards/boardsource/microdox/v1/info.json
+++ b/keyboards/boardsource/microdox/v1/info.json
@@ -2,7 +2,7 @@
   "features": {
     "rgblight": true
   },
-    "matrix_pins": {
+  "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1"],
     "rows": ["B2", "B6", "B4", "B5"]
   },
@@ -12,7 +12,7 @@
   "split": {
     "soft_serial_pin": "D2"
   },
-    "rgblight": {
+  "rgblight": {
     "pin": "D3",
     "sleep": true,
     "led_count": 12,
diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
index b2e6ba9335..e6a7ddc16b 100644
--- a/keyboards/boardsource/microdox/v2/config.h
+++ b/keyboards/boardsource/microdox/v2/config.h
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#undef RGB_DI_PIN
 #define RGB_DI_PIN B5
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define DRIVER_LED_TOTAL 44

From 725df1278bcb7d4b2c2744fd23a850c186f964b9 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 9 Sep 2022 21:22:55 +0100
Subject: [PATCH 334/959] Fix '_RIGHT' matrix pins lint error (#18320)

---
 lib/python/qmk/info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index c95b55916c..7460d84ad3 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -370,7 +370,7 @@ def _extract_split_right_pins(info_data, config_c):
     direct_pins = config_c.get('DIRECT_PINS_RIGHT', '').replace(' ', '')[1:-1]
 
     if row_pins or col_pins or direct_pins:
-        if info_data.get('split', {}).get('matrix_pins', {}).get('right') in info_data:
+        if info_data.get('split', {}).get('matrix_pins', {}).get('right', None):
             _log_warning(info_data, 'Right hand matrix data is specified in both info.json and config.h, the config.h values win.')
 
         if 'split' not in info_data:

From f20883fef1bc9980d86682a05f763f12679b8c45 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 10 Sep 2022 06:36:39 +1000
Subject: [PATCH 335/959] RN42 driver: small cleanups (#18310)

* RN42 driver: small cleanups

* Include header

* Fix mouse report per RN42 UG

* Spacing for consistency
---
 drivers/bluetooth/rn42.c | 32 ++++++++++++++++++--------------
 drivers/bluetooth/rn42.h |  4 +++-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/drivers/bluetooth/rn42.c b/drivers/bluetooth/rn42.c
index 5d497cda20..0eb1733723 100644
--- a/drivers/bluetooth/rn42.c
+++ b/drivers/bluetooth/rn42.c
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "rn42.h"
+
 #include "report.h"
 #include "uart.h"
 
@@ -69,33 +71,35 @@ void rn42_send_keyboard(report_keyboard_t *report) {
     uart_write(0xFD);
     uart_write(0x09);
     uart_write(0x01);
+
     uart_write(report->mods);
     uart_write(0x00);
-    for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-        uart_write(report->keys[i]);
-    }
+    uart_write(report->keys[0]);
+    uart_write(report->keys[1]);
+    uart_write(report->keys[2]);
+    uart_write(report->keys[3]);
+    uart_write(report->keys[4]);
+    uart_write(report->keys[5]);
 }
 
 void rn42_send_mouse(report_mouse_t *report) {
     uart_write(0xFD);
-    uart_write(0x00);
-    uart_write(0x03);
+    uart_write(0x05);
+    uart_write(0x02);
+
     uart_write(report->buttons);
     uart_write(report->x);
     uart_write(report->y);
-    uart_write(report->v); // should try sending the wheel v here
-    uart_write(report->h); // should try sending the wheel h here
-    uart_write(0x00);
+    uart_write(report->v);
 }
 
-void rn42_send_consumer(uint16_t data) {
-    static uint16_t last_data = 0;
-    if (data == last_data) return;
-    last_data       = data;
-    uint16_t bitmap = rn42_consumer_usage_to_bitmap(data);
+void rn42_send_consumer(uint16_t usage) {
+    uint16_t bitmap = rn42_consumer_usage_to_bitmap(usage);
+
     uart_write(0xFD);
     uart_write(0x03);
     uart_write(0x03);
+
     uart_write(bitmap & 0xFF);
-    uart_write((bitmap >> 8) & 0xFF);
+    uart_write(bitmap >> 8);
 }
diff --git a/drivers/bluetooth/rn42.h b/drivers/bluetooth/rn42.h
index 4747759111..89b716bfcd 100644
--- a/drivers/bluetooth/rn42.h
+++ b/drivers/bluetooth/rn42.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+
 #include "report.h"
 
 void rn42_init(void);
@@ -22,4 +24,4 @@ void rn42_send_keyboard(report_keyboard_t *report);
 
 void rn42_send_mouse(report_mouse_t *report);
 
-void rn42_send_consumer(uint16_t data);
+void rn42_send_consumer(uint16_t usage);

From 405a32ddf4d81374b490bf2a413eb485f76f2658 Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Sat, 10 Sep 2022 06:12:48 +0800
Subject: [PATCH 336/959] Added gmmk v2 p65 keyboard. (#18185)

---
 keyboards/gmmk/gmmk2/p65/ansi/ansi.c          | 236 +++++++++++++++++
 keyboards/gmmk/gmmk2/p65/ansi/ansi.h          |  47 ++++
 keyboards/gmmk/gmmk2/p65/ansi/info.json       |  90 +++++++
 .../gmmk2/p65/ansi/keymaps/default/keymap.c   |  44 ++++
 .../gmmk2/p65/ansi/keymaps/default/readme.md  |   1 +
 .../gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c  |  51 ++++
 .../gmmk/gmmk2/p65/ansi/keymaps/via/rules.mk  |   1 +
 keyboards/gmmk/gmmk2/p65/ansi/readme.md       |  23 ++
 keyboards/gmmk/gmmk2/p65/ansi/rules.mk        |  22 ++
 keyboards/gmmk/gmmk2/p65/config.h             | 117 +++++++++
 keyboards/gmmk/gmmk2/p65/halconf.h            |  29 +++
 keyboards/gmmk/gmmk2/p65/iso/info.json        |  91 +++++++
 keyboards/gmmk/gmmk2/p65/iso/iso.c            | 238 ++++++++++++++++++
 keyboards/gmmk/gmmk2/p65/iso/iso.h            |  47 ++++
 .../gmmk2/p65/iso/keymaps/default/keymap.c    |  44 ++++
 .../gmmk2/p65/iso/keymaps/default/readme.md   |   1 +
 .../gmmk/gmmk2/p65/iso/keymaps/via/keymap.c   |  50 ++++
 .../gmmk/gmmk2/p65/iso/keymaps/via/rules.mk   |   1 +
 keyboards/gmmk/gmmk2/p65/iso/readme.md        |  23 ++
 keyboards/gmmk/gmmk2/p65/iso/rules.mk         |  22 ++
 keyboards/gmmk/gmmk2/p65/mcuconf.h            |  27 ++
 keyboards/gmmk/gmmk2/p65/p65.c                |  17 ++
 keyboards/gmmk/gmmk2/p65/p65.h                |  25 ++
 23 files changed, 1247 insertions(+)
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/ansi.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/ansi.h
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/info.json
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p65/config.h
 create mode 100644 keyboards/gmmk/gmmk2/p65/halconf.h
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/info.json
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/iso.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/iso.h
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/keymaps/via/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/readme.md
 create mode 100644 keyboards/gmmk/gmmk2/p65/iso/rules.mk
 create mode 100644 keyboards/gmmk/gmmk2/p65/mcuconf.h
 create mode 100644 keyboards/gmmk/gmmk2/p65/p65.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/p65.h

diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
new file mode 100644
index 0000000000..437b50648e
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
@@ -0,0 +1,236 @@
+/* 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 "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1  },  //  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, 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, 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, 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, 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
+
+    {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
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {{
+    { 44, 57, __, 64, __, 66, 58, 55},
+    { 16, 15, 31,  0, 45, 59, __,  1},
+    { 17, 30, 32, 60, 46, 14, 29,  2},
+    { 18, 61, 33, 63, 47, 56, 62,  3},
+    { 19, 20, 34, 35, 48, 49,  5,  4},
+    { 22, 21, 37, 36, 51, 50,  6,  7},
+    { 23, 27, 38, __, 52, 43, 12,  8},
+    { 24, 13, 39, 65, 53, __, 28,  9},
+    { 25, 26, 40, 41, 42, 54, 11, 10}
+}, {
+    {14,  0 }, //  0  Esc
+    {28,  0 }, //  1  1
+    {42,  0 }, //  2  2
+    {56,  0 }, //  3  3
+    {70,  0 }, //  4  4
+    {84,  0 }, //  5  5
+    {98,  0 }, //  6  6
+    {112, 0 }, //  7  7
+    {126, 0 }, //  8  8
+    {140, 0 }, //  9  9
+    {154, 0 }, //  10 0
+    {168, 0 }, //  11 -
+    {182, 0 }, //  12 =
+    {196, 0 }, //  13 Backspace
+    {210, 0 }, //  14 Del
+
+    {14,  16}, //  15 Tab
+    {28,  16}, //  16 Q
+    {42,  16}, //  17 W
+    {56,  16}, //  18 E
+    {70,  16}, //  19 R
+    {84,  16}, //  20 T
+    {98,  16}, //  21 Y
+    {112, 16}, //  22 U
+    {126, 16}, //  23 I
+    {140, 16}, //  24 O
+    {154, 16}, //  25 P
+    {168, 16}, //  26 [
+    {182, 16}, //  27 ]
+    {196, 16}, //  28 \|
+    {210, 16}, //  29 PgUp
+
+    {14,  32}, //  30 Caps Lock
+    {28,  32}, //  31 A
+    {42,  32}, //  32 S
+    {56,  32}, //  33 D
+    {70,  32}, //  34 F
+    {84,  32}, //  35 G
+    {98,  32}, //  36 H
+    {112, 32}, //  37 J
+    {126, 32}, //  38 K
+    {140, 32}, //  39 L
+    {154, 32}, //  40 ;
+    {168, 32}, //  41 '
+    {196, 32}, //  42 Enter
+    {210, 32}, //  43 PgDn
+
+    {14,  48}, //  44 Shift_L
+    {42,  48}, //  45 Z
+    {56,  48}, //  46 X
+    {70,  48}, //  47 C
+    {84,  48}, //  48 V
+    {98,  48}, //  49 B
+    {112, 48}, //  50 N
+    {126, 48}, //  51 M
+    {140, 48}, //  52 ,
+    {154, 48}, //  53 .
+    {168, 48}, //  54 /
+    {182, 48}, //  55 Shift_R
+    {196, 48}, //  56 Up
+    {210, 48}, //  57 END
+
+    {14,  64}, //  58 Ctrl_L
+    {28,  64}, //  59 Win_L
+    {42,  64}, //  60 Alt_L
+    {84,  64}, //  61 Space
+    {126, 64}, //  62 Alt_R
+    {140, 64}, //  63 FN
+    {182, 64}, //  64 Left
+    {196, 64}, //  65 Down
+    {210, 64}, //  66 Right
+
+    {0,   0},  //  69 LED 1
+    {0,   7},  //  70 LED 2
+    {0,   14}, //  71 LED 3
+    {0,   21}, //  72 LED 4
+    {0,   28}, //  73 LED 5
+    {0,   35}, //  74 LED 6
+    {0,   42}, //  75 LED 7
+    {0,   49}, //  76 LED 8
+    {0,   56}, //  77 LED 9
+    {0,   64}, //  78 LED 10
+    {224, 0 }, //  79 LED 11
+    {224, 7 }, //  80 LED 12
+    {224, 14}, //  81 LED 13
+    {224, 21}, //  82 LED 14
+    {224, 28}, //  83 LED 15
+    {224, 35}, //  84 LED 16
+    {224, 42}, //  85 LED 17
+    {224, 49}, //  86 LED 18
+    {224, 56}, //  87 LED 19
+    {224, 64}, //  88 LED 20
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
+#endif
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.h b/keyboards/gmmk/gmmk2/p65/ansi/ansi.h
new file mode 100644
index 0000000000..2c25a72bef
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.h
@@ -0,0 +1,47 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+//  ESC    1    2    3    4    5    6    7    8    9    0    -    =     BS     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      Left   Down   Right
+
+// clang-format off
+#define LAYOUT( \
+    k13, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, k71, k25,\
+    k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k76, k26,\
+    k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83,      k84, k65,\
+    k00,      k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k07, k35, k01,\
+    k06,    k15,    k23,         k31,            k36, k33,      k03, k73, k05 \
+)\
+{\
+    { k00, k01, ___, k03, ___, k05, k06, k07},\
+    { k10, k11, k12, k13, k14, k15, ___, k17},\
+    { k20, k21, k22, k23, k24, k25, k26, k27},\
+    { k30, k31, k32, k33, k34, k35, k36, k37},\
+    { k40, k41, k42, k43, k44, k45, k46, k47},\
+    { k50, k51, k52, k53, k54, k55, k56, k57},\
+    { k60, k61, k62, ___, k64, k65, k66, k67},\
+    { k70, k71, k72, k73, k74, ___, k76, k77},\
+    { k80, k81, k82, k83, k84, k85, k86, k87} \
+}
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
new file mode 100644
index 0000000000..8aedd894ae
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json
@@ -0,0 +1,90 @@
+{
+    "keyboard_name": "GMMK V2 65 ANSI",
+    "manufacturer": "Glorious",
+    "url": "http://www.pcgamingrace.com",
+    "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x5045",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "`", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+                { "label": "7", "x": 7, "y": 0 },
+                { "label": "8", "x": 8, "y": 0 },
+                { "label": "9", "x": 9, "y": 0 },
+                { "label": "0", "x": 10, "y": 0 },
+                { "label": "-", "x": 11, "y": 0 },
+                { "label": "=", "x": 12, "y": 0 },
+                { "label": "Backspace", "x": 13, "y": 0, "w": 2.25},
+                { "label": "PgUp", "x": 15.25, "y": 0 },
+
+
+                { "label": "Tab", "x": 0, "y": 1, "w": 1.5},
+                { "label": "Q", "x": 1.5, "y": 1 },
+                { "label": "W", "x": 2.5, "y": 1 },
+                { "label": "E", "x": 3.5, "y": 1 },
+                { "label": "R", "x": 4.5, "y": 1 },
+                { "label": "T", "x": 5.5, "y": 1 },
+                { "label": "Y", "x": 6.5, "y": 1 },
+                { "label": "U", "x": 7.5, "y": 1 },
+                { "label": "I", "x": 8.5, "y": 1 },
+                { "label": "O", "x": 9.5, "y": 1 },
+                { "label": "P", "x": 10.5, "y": 1 },
+                { "label": "[", "x": 11.5, "y": 1 },
+                { "label": "]", "x": 12.5, "y": 1 },
+                { "label": "\\", "x": 13.5, "y": 1 , "w": 1.75},
+                { "label": "PgDn", "x": 15.25, "y": 1 },
+
+                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
+                { "label": "A", "x": 1.75, "y": 2 },
+                { "label": "S", "x": 2.75, "y": 2 },
+                { "label": "D", "x": 3.75, "y": 2 },
+                { "label": "F", "x": 4.75, "y": 2 },
+                { "label": "G", "x": 5.75, "y": 2 },
+                { "label": "H", "x": 6.75, "y": 2 },
+                { "label": "J", "x": 7.75, "y": 2 },
+                { "label": "K", "x": 8.75, "y": 2 },
+                { "label": "L", "x": 9.75, "y": 2 },
+                { "label": ";", "x": 10.75, "y": 2 },
+                { "label": "'", "x": 11.75, "y": 2 },
+                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "HOME", "x": 15.25, "y": 2 },
+
+
+                { "label": "Shift", "x": 0, "y": 3, "w": 2.25},
+                { "label": "Z", "x": 2.25, "y": 3 },
+                { "label": "X", "x": 3.25, "y": 3 },
+                { "label": "C", "x": 4.25, "y": 3 },
+                { "label": "V", "x": 5.25, "y": 3 },
+                { "label": "B", "x": 6.25, "y": 3 },
+                { "label": "N", "x": 7.25, "y": 3 },
+                { "label": "M", "x": 8.25, "y": 3 },
+                { "label": ",", "x": 9.25, "y": 3 },
+                { "label": ".", "x": 10.25, "y": 3 },
+                { "label": "/", "x": 11.25, "y": 3 },
+                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75},
+                { "label": "Up", "x": 14.25, "y": 3 },
+                { "label": "END", "x": 15.25, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
+                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
+                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25},
+                { "label": "Alt", "x": 10, "y": 4, "w": 1.25},
+                { "label": "FN", "x": 11.25, "y": 4, "w": 1.25},
+                { "label": "Left", "x": 13.25, "y": 4 },
+                { "label": "Down", "x": 14.25, "y": 4 },
+                { "label": "Right", "x": 15.25, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e331d60c4e
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* 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(
+  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_PGUP,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,            KC_PGDN,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT(
+   KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,  KC_INS,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  KC_HOME,
+  _______,  _______,  _______,                                QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD)
+};
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md
new file mode 100644
index 0000000000..4f80a5b956
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md
@@ -0,0 +1 @@
+# ANSI GMMKV2 65% Layout
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..365c7578cc
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* 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] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[0] = LAYOUT(
+  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_PGUP,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,            KC_PGDN,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   */
+[1] = LAYOUT(
+   KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,  KC_INS,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  KC_HOME,
+  _______,  _______,  _______,                                QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD),
+
+[2] = LAYOUT(
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
+  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,   _______,  _______),
+[3] = LAYOUT(
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
+  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,   _______,  _______)
+};
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/readme.md
new file mode 100644
index 0000000000..b231b48883
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/readme.md
@@ -0,0 +1,23 @@
+# GMMK V2 65% (ANSI)
+
+A keyboard made and sold by Glorious LLC. Equipped with the WestBerry G7 ARM Cortex-M4 microcontroller
+
+* Keyboard Maintainer: [GloriousThrall](https://github.com/GloriousThrall)
+* Hardware Supported: GMMK V2
+* Hardware Availability: [GloriousPCGaming.com](https://www.pcgamingrace.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gmmk/gmmk2/p65/ansi:default
+
+Flashing example for this keyboard:
+
+    make gmmk/gmmk2/p65/ansi:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB while connecting the USB cable (remove the spacebar key and press and hold the pin on the right side)
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+Backslash will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
new file mode 100644
index 0000000000..1cf9d7a709
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = WB32F3G71
+
+# Bootloader selection
+BOOTLOADER = wb32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite.
+MOUSEKEY_ENABLE = yes        # Mouse keys.
+EXTRAKEY_ENABLE = yes        # Audio control and System control.
+CONSOLE_ENABLE = no          # Console for debug.
+COMMAND_ENABLE = no          # Commands for debug and configuration.
+NKRO_ENABLE = yes            # Enable NKRO Rollover.
+BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
+RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
+AUDIO_ENABLE = no            # Audio output.
+RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
+RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h
new file mode 100644
index 0000000000..6a6c22c6f0
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/config.h
@@ -0,0 +1,117 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 8
+
+#define MATRIX_ROW_PINS \
+    { B0, B1, B2, B3, B4, B5, B6, B7, B8 }
+#define MATRIX_COL_PINS \
+    { A0, A1, A2, A3, A4, A8, A9, A10 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Hold ESC on start up to clear EEPROM and boot into bootloader mode */
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 3
+
+#define TAP_CODE_DELAY 10
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDM2
+#define SPI_SCK_PIN B13
+#define SPI_MOSI_PIN B15
+#define SPI_MISO_PIN B14
+
+#define DRIVER_1_CS A15
+#define DRIVER_2_CS B9
+#define DRIVER_1_EN C13
+#define DRIVER_2_EN C13
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 54
+#define DRIVER_2_LED_TOTAL 34
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+/* Set debounce time to 5ms */
+#define DEBOUNCE 5
+
+/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */
+// #define FORCE_NKRO
diff --git a/keyboards/gmmk/gmmk2/p65/halconf.h b/keyboards/gmmk/gmmk2/p65/halconf.h
new file mode 100644
index 0000000000..293d182917
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/halconf.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/wb_support/gmmk2/halconf.h -r platforms/chibios/boards/common/configs/halconf.h`
+ */
+
+#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/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json
new file mode 100644
index 0000000000..9f0285abbb
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/info.json
@@ -0,0 +1,91 @@
+{
+    "keyboard_name": "GMMK V2 65 ISO",
+    "manufacturer": "Glorious",
+    "url": "http://www.pcgamingrace.com",
+    "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x504A",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "`", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+                { "label": "7", "x": 7, "y": 0 },
+                { "label": "8", "x": 8, "y": 0 },
+                { "label": "9", "x": 9, "y": 0 },
+                { "label": "0", "x": 10, "y": 0 },
+                { "label": "-", "x": 11, "y": 0 },
+                { "label": "=", "x": 12, "y": 0 },
+                { "label": "Backspace", "x": 13, "y": 0, "w": 2.25},
+                { "label": "PgUp", "x": 15.25, "y": 0 },
+
+
+                { "label": "Tab", "x": 0, "y": 1, "w": 1.5},
+                { "label": "Q", "x": 1.5, "y": 1 },
+                { "label": "W", "x": 2.5, "y": 1 },
+                { "label": "E", "x": 3.5, "y": 1 },
+                { "label": "R", "x": 4.5, "y": 1 },
+                { "label": "T", "x": 5.5, "y": 1 },
+                { "label": "Y", "x": 6.5, "y": 1 },
+                { "label": "U", "x": 7.5, "y": 1 },
+                { "label": "I", "x": 8.5, "y": 1 },
+                { "label": "O", "x": 9.5, "y": 1 },
+                { "label": "P", "x": 10.5, "y": 1 },
+                { "label": "[", "x": 11.5, "y": 1 },
+                { "label": "]", "x": 12.5, "y": 1 },
+                { "label": "Enter", "x": 13.5, "y": 1 ,"h":2, "w": 1.75},
+                { "label": "PgDn", "x": 15.25, "y": 1 },
+
+                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
+                { "label": "A", "x": 1.75, "y": 2 },
+                { "label": "S", "x": 2.75, "y": 2 },
+                { "label": "D", "x": 3.75, "y": 2 },
+                { "label": "F", "x": 4.75, "y": 2 },
+                { "label": "G", "x": 5.75, "y": 2 },
+                { "label": "H", "x": 6.75, "y": 2 },
+                { "label": "J", "x": 7.75, "y": 2 },
+                { "label": "K", "x": 8.75, "y": 2 },
+                { "label": "L", "x": 9.75, "y": 2 },
+                { "label": ";", "x": 10.75, "y": 2 },
+                { "label": "'", "x": 11.75, "y": 2 },
+                { "label": "#", "x": 12.75, "y": 2 },
+                { "label": "HOME", "x": 15.25, "y": 2 },
+
+
+                { "label": "Shift", "x": 0, "y": 3, "w": 1.25},
+                { "label": "\\", "x": 1.25, "y": 3 },
+                { "label": "Z", "x": 2.25, "y": 3 },
+                { "label": "X", "x": 3.25, "y": 3 },
+                { "label": "C", "x": 4.25, "y": 3 },
+                { "label": "V", "x": 5.25, "y": 3 },
+                { "label": "B", "x": 6.25, "y": 3 },
+                { "label": "N", "x": 7.25, "y": 3 },
+                { "label": "M", "x": 8.25, "y": 3 },
+                { "label": ",", "x": 9.25, "y": 3 },
+                { "label": ".", "x": 10.25, "y": 3 },
+                { "label": "/", "x": 11.25, "y": 3 },
+                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75},
+                { "label": "Up", "x": 14.25, "y": 3 },
+                { "label": "END", "x": 15.25, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
+                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
+                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25},
+                { "label": "Alt", "x": 10, "y": 4, "w": 1.25},
+                { "label": "FN", "x": 11.25, "y": 4, "w": 1.25},
+                { "label": "Left", "x": 13.25, "y": 4 },
+                { "label": "Down", "x": 14.25, "y": 4 },
+                { "label": "Right", "x": 15.25, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c
new file mode 100644
index 0000000000..651a612a58
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c
@@ -0,0 +1,238 @@
+/* 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 "iso.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1  },  //  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, 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, 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, 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, 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
+
+    {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
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {{
+    { 44, 58, 45, 65, __, 67, 59, 56},
+    { 16, 15, 31,  0, 46, 60, __,  1},
+    { 17, 30, 32, 61, 47, 14, 29,  2},
+    { 18, 62, 33, 64, 48, 57, 63,  3},
+    { 19, 20, 34, 35, 49, 50,  5,  4},
+    { 22, 21, 37, 36, 52, 51,  6,  7},
+    { 23, 27, 38, __, 53, 43, 12,  8},
+    { 24, 13, 39, 66, 54, 42, __,  9},
+    { 25, 26, 40, 41, 28, 55, 11, 10}
+}, {
+    {14,  0 }, //  0  Esc
+    {28,  0 }, //  1  1
+    {42,  0 }, //  2  2
+    {56,  0 }, //  3  3
+    {70,  0 }, //  4  4
+    {84,  0 }, //  5  5
+    {98,  0 }, //  6  6
+    {112, 0 }, //  7  7
+    {126, 0 }, //  8  8
+    {140, 0 }, //  9  9
+    {154, 0 }, //  10 0
+    {168, 0 }, //  11 -
+    {182, 0 }, //  12 =
+    {196, 0 }, //  13 Backspace
+    {210, 0 }, //  14 HOME
+
+    {14,  16}, //  15 Tab
+    {28,  16}, //  16 Q
+    {42,  16}, //  17 W
+    {56,  16}, //  18 E
+    {70,  16}, //  19 R
+    {84,  16}, //  20 T
+    {98,  16}, //  21 Y
+    {112, 16}, //  22 U
+    {126, 16}, //  23 I
+    {140, 16}, //  24 O
+    {154, 16}, //  25 P
+    {168, 16}, //  26 [
+    {182, 16}, //  27 ]
+    {196, 16}, //  28 ENTER
+    {210, 16}, //  29 PgUp
+
+    {14,  32}, //  30 Caps Lock
+    {28,  32}, //  31 A
+    {42,  32}, //  32 S
+    {56,  32}, //  33 D
+    {70,  32}, //  34 F
+    {84,  32}, //  35 G
+    {98,  32}, //  36 H
+    {112, 32}, //  37 J
+    {126, 32}, //  38 K
+    {140, 32}, //  39 L
+    {154, 32}, //  40 ;
+    {168, 32}, //  41 '
+    {182, 32}, //  42 k42
+    {210, 32}, //  43 PgDn
+
+    {14,  48}, //  44 Shift_L
+    {28,  48}, //  45 k45
+    {42,  48}, //  46 Z
+    {56,  48}, //  47 X
+    {70,  48}, //  48 C
+    {84,  48}, //  49 V
+    {98,  48}, //  50 B
+    {112, 48}, //  51 N
+    {126, 48}, //  52 M
+    {140, 48}, //  53 ,
+    {154, 48}, //  54 .
+    {168, 48}, //  55 /
+    {182, 48}, //  56 Shift_R
+    {196, 48}, //  57 Up
+    {210, 48}, //  58 END
+
+    {14,  64}, //  59 Ctrl_L
+    {28,  64}, //  60 Win_L
+    {42,  64}, //  61 Alt_L
+    {84,  64}, //  62 Space
+    {126, 64}, //  63 Alt_R
+    {140, 64}, //  64 FN
+    {182, 64}, //  65 Left
+    {196, 64}, //  66 Down
+    {210, 64}, //  67 Right
+
+    {0,   0}, //  68 LED 1
+    {0,   7}, //  69 LED 2
+    {0,   14}, //  70 LED 3
+    {0,   21}, //  71 LED 4
+    {0,   28}, //  72 LED 5
+    {0,   35}, //  73 LED 6
+    {0,   42}, //  74 LED 7
+    {0,   49}, //  75 LED 8
+    {0,   56}, //  76 LED 9
+    {0,   64}, //  77 LED 10
+    {224, 0 }, //  78 LED 11
+    {224, 7 }, //  79 LED 12
+    {224, 14}, //  80 LED 13
+    {224, 21}, //  81 LED 14
+    {224, 28}, //  82 LED 15
+    {224, 35}, //  83 LED 16
+    {224, 42}, //  84 LED 17
+    {224, 49}, //  85 LED 18
+    {224, 56}, //  86 LED 19
+    {224, 64}, //  87 LED 20
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
+#endif
diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.h b/keyboards/gmmk/gmmk2/p65/iso/iso.h
new file mode 100644
index 0000000000..206647cf79
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/iso.h
@@ -0,0 +1,47 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+//  ESC    1    2    3    4    5    6    7    8    9    0    -    =     BS     PgUp  
+//  Tab    Q    W    E    R    T    Y    U    I    O    P    [    ]     Enter  PgUp  
+//  Caps   A    S    D    F    G    H    J    K    L    ;    '    \     Enter  HOME  
+//  Sh_L   \    Z    X    C    V    B    N    M    ,    .    /   Sh_R   Up     END   
+//  Ct_L    Win_L   Alt_L      SPACE             Alt_R   FN      Left   Down   Right 
+
+// clang-format off
+#define LAYOUT( \
+    k13, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, k71, k25,\
+    k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k84, k26,\
+    k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k75,      k65,\
+    k00, k02, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k07, k35, k01,\
+    k06,    k15,    k23,         k31,            k36, k33,      k03, k73, k05 \
+)\
+{\
+    { k00, k01, k02, k03, ___, k05, k06, k07},\
+    { k10, k11, k12, k13, k14, k15, ___, k17},\
+    { k20, k21, k22, k23, k24, k25, k26, k27},\
+    { k30, k31, k32, k33, k34, k35, k36, k37},\
+    { k40, k41, k42, k43, k44, k45, k46, k47},\
+    { k50, k51, k52, k53, k54, k55, k56, k57},\
+    { k60, k61, k62, ___, k64, k65, k66, k67},\
+    { k70, k71, k72, k73, k74, k75, ___, k77},\
+    { k80, k81, k82, k83, k84, k85, k86, k87} \
+}
diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..61072536d7
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* 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(
+  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_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_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_PGDN,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_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_INS,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  KC_HOME,
+  _______,  _______,  _______,                                QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD) 
+};
diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md
new file mode 100644
index 0000000000..89d52f6afa
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md
@@ -0,0 +1 @@
+# ISO GMMKV2 65% Layout
diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..53918fc1e1
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[0] = LAYOUT(
+  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_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_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_PGDN,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   */
+[1] = LAYOUT(
+  _______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,  KC_INS,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  KC_HOME,
+  _______,  _______,  _______,                                QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD),
+
+[2] = LAYOUT(
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,   _______,  _______),
+[3] = LAYOUT(
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,   _______,  _______)
+};
diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gmmk/gmmk2/p65/iso/readme.md b/keyboards/gmmk/gmmk2/p65/iso/readme.md
new file mode 100644
index 0000000000..1775862e0f
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/readme.md
@@ -0,0 +1,23 @@
+# GMMK V2 65% (ISO)
+
+A keyboard made and sold by Glorious LLC. Equipped with the WestBerry G7 ARM Cortex-M4 microcontroller
+
+* Keyboard Maintainer: [GloriousThrall](https://github.com/GloriousThrall)
+* Hardware Supported: GMMK V2
+* Hardware Availability: [GloriousPCGaming.com](https://www.pcgamingrace.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gmmk/gmmk2/p65/iso:default
+
+Flashing example for this keyboard:
+
+    make gmmk/gmmk2/p65/iso:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB while connecting the USB cable (remove the spacebar key and press and hold the pin on the right side)
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+Backslash will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/gmmk/gmmk2/p65/iso/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/rules.mk
new file mode 100644
index 0000000000..1cf9d7a709
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/iso/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = WB32F3G71
+
+# Bootloader selection
+BOOTLOADER = wb32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite.
+MOUSEKEY_ENABLE = yes        # Mouse keys.
+EXTRAKEY_ENABLE = yes        # Audio control and System control.
+CONSOLE_ENABLE = no          # Console for debug.
+COMMAND_ENABLE = no          # Commands for debug and configuration.
+NKRO_ENABLE = yes            # Enable NKRO Rollover.
+BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
+RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
+AUDIO_ENABLE = no            # Audio output.
+RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
+RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/gmmk/gmmk2/p65/mcuconf.h b/keyboards/gmmk/gmmk2/p65/mcuconf.h
new file mode 100644
index 0000000000..e5b8188e9e
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/wb_support/gmmk2/mcuconf.h -r platforms/chibios/GENERIC_WB32_F3G71XX/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/gmmk/gmmk2/p65/p65.c b/keyboards/gmmk/gmmk2/p65/p65.c
new file mode 100644
index 0000000000..d7e06f6488
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/p65.c
@@ -0,0 +1,17 @@
+/* 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 "p65.h"
diff --git a/keyboards/gmmk/gmmk2/p65/p65.h b/keyboards/gmmk/gmmk2/p65/p65.h
new file mode 100644
index 0000000000..7a6339c2e0
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/p65.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_gmmk_gmmk2_p65_ansi)
+#    include "ansi/ansi.h"
+#elif defined(KEYBOARD_gmmk_gmmk2_p65_iso)
+#    include "iso/iso.h"
+#endif  // GMMK V2 revisions

From 4087251da6ffcbfd16a9b655b7816803a565f0a6 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 10 Sep 2022 01:14:12 +0100
Subject: [PATCH 337/959] Reboot wb32 devices after flashing (#18323)

---
 platforms/chibios/flash.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk
index 790c4f3316..2802368b5d 100644
--- a/platforms/chibios/flash.mk
+++ b/platforms/chibios/flash.mk
@@ -23,6 +23,7 @@ define EXEC_DFU_UTIL
 	$(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin
 endef
 
+WB32_DFU_UPDATER ?= wb32-dfu-updater_cli
 
 define EXEC_WB32_DFU_UPDATER
 	if ! wb32-dfu-updater_cli -l | grep -q "Found DFU"; then \
@@ -34,7 +35,7 @@ define EXEC_WB32_DFU_UPDATER
 		done ;\
 		printf "\n" ;\
 	fi
-	wb32-dfu-updater_cli -D $(BUILD_DIR)/$(TARGET).bin
+	$(WB32_DFU_UPDATER) -D $(BUILD_DIR)/$(TARGET).bin && $(WB32_DFU_UPDATER) -R
 endef
 
 dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter

From 16c2b528dfdbcef2ef888e901fa5d51b59a62840 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 10 Sep 2022 13:31:46 +0100
Subject: [PATCH 338/959] GMMK2: Fix 'ISO' within product name (#18322)

---
 tmk_core/protocol/usb_descriptor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index 52e3276d35..21795cef60 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -45,6 +45,9 @@
 #    include "joystick.h"
 #endif
 
+// TODO: wb32 support defines ISO macro which breaks PRODUCT stringification
+#undef ISO
+
 // clang-format off
 
 /*

From f46379f308783994b8178f95adc686f4b4c3ebd8 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Sun, 11 Sep 2022 22:07:32 +1000
Subject: [PATCH 339/959] fixed missing x coordinate on spacebar (#18330)

---
 keyboards/idobao/id80/v3/ansi/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index c7768130e1..fccff8efda 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -108,7 +108,7 @@
                 { "matrix": [0, 0], "x":0, "y":5.25, "w":1.25},
                 { "matrix": [1, 0], "x":1.25, "y":5.25, "w":1.25},
                 { "matrix": [2, 0], "x":2.5, "y":5.25, "w":1.25},
-                { "matrix": [6, 0], "y":5.25, "w":6.25},
+                { "matrix": [6, 0], "x":3.75, "y":5.25, "w":6.25},
                 { "matrix": [8, 0], "x":10, "y":5.25, "w":1.5},
                 { "matrix": [7, 0], "x":11.5, "y":5.25, "w":1.5},
 

From 3d667f09705fa780bd5881cfa3b3cb10fa41b1fe Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 13 Sep 2022 01:49:04 +1000
Subject: [PATCH 340/959] Refactor Unicode feature (#18333)

---
 builddefs/common_features.mk                  |   4 +-
 quantum/painter/rules.mk                      |   5 +-
 quantum/process_keycode/process_ucis.c        |  17 +-
 quantum/process_keycode/process_ucis.h        |   6 +-
 quantum/process_keycode/process_unicode.c     |  12 +-
 quantum/process_keycode/process_unicode.h     |   5 +-
 .../process_keycode/process_unicode_common.c  | 315 +--------------
 .../process_keycode/process_unicode_common.h  | 178 +--------
 quantum/process_keycode/process_unicodemap.c  |   5 +
 quantum/process_keycode/process_unicodemap.h  |   6 +-
 quantum/quantum.h                             |   1 +
 quantum/unicode/unicode.c                     | 376 ++++++++++++++++++
 quantum/unicode/unicode.h                     | 165 ++++++++
 quantum/{ => unicode}/utf8.c                  |   0
 quantum/{ => unicode}/utf8.h                  |   2 +-
 15 files changed, 591 insertions(+), 506 deletions(-)
 create mode 100644 quantum/unicode/unicode.c
 create mode 100644 quantum/unicode/unicode.h
 rename quantum/{ => unicode}/utf8.c (100%)
 rename quantum/{ => unicode}/utf8.h (91%)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index f9618709c9..3d34c673d3 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -773,8 +773,10 @@ endif
 
 ifeq ($(strip $(UNICODE_COMMON)), yes)
     OPT_DEFS += -DUNICODE_COMMON_ENABLE
+    COMMON_VPATH += $(QUANTUM_DIR)/unicode
     SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c \
-           $(QUANTUM_DIR)/utf8.c
+           $(QUANTUM_DIR)/unicode/unicode.c \
+           $(QUANTUM_DIR)/unicode/utf8.c
 endif
 
 MAGIC_ENABLE ?= yes
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index 91787dfe0e..4420bccf63 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -8,9 +8,10 @@ VALID_QUANTUM_PAINTER_DRIVERS := ili9163_spi ili9341_spi ili9488_spi st7789_spi
 #-------------------------------------------------------------------------------
 
 OPT_DEFS += -DQUANTUM_PAINTER_ENABLE
-COMMON_VPATH += $(QUANTUM_DIR)/painter
+COMMON_VPATH += $(QUANTUM_DIR)/painter \
+                $(QUANTUM_DIR)/unicode
 SRC += \
-    $(QUANTUM_DIR)/utf8.c \
+    $(QUANTUM_DIR)/unicode/utf8.c \
     $(QUANTUM_DIR)/color.c \
     $(QUANTUM_DIR)/painter/qp.c \
     $(QUANTUM_DIR)/painter/qp_stream.c \
diff --git a/quantum/process_keycode/process_ucis.c b/quantum/process_keycode/process_ucis.c
index 6a8d8f0ff6..646471bc4d 100644
--- a/quantum/process_keycode/process_ucis.c
+++ b/quantum/process_keycode/process_ucis.c
@@ -15,6 +15,9 @@
  */
 
 #include "process_ucis.h"
+#include "unicode.h"
+#include "keycode.h"
+#include "wait.h"
 
 qk_ucis_state_t qk_ucis_state;
 
@@ -26,9 +29,7 @@ void qk_ucis_start(void) {
 }
 
 __attribute__((weak)) void qk_ucis_start_user(void) {
-    unicode_input_start();
-    register_hex(0x2328); // ⌨
-    unicode_input_finish();
+    register_unicode(0x2328); // ⌨
 }
 
 __attribute__((weak)) void qk_ucis_success(uint8_t symbol_index) {}
@@ -51,10 +52,7 @@ static bool is_uni_seq(char *seq) {
 
 __attribute__((weak)) void qk_ucis_symbol_fallback(void) {
     for (uint8_t i = 0; i < qk_ucis_state.count - 1; i++) {
-        uint8_t keycode = qk_ucis_state.codes[i];
-        register_code(keycode);
-        unregister_code(keycode);
-        wait_ms(UNICODE_TYPE_DELAY);
+        tap_code(qk_ucis_state.codes[i]);
     }
 }
 
@@ -63,7 +61,6 @@ __attribute__((weak)) void qk_ucis_cancel(void) {}
 void register_ucis(const uint32_t *code_points) {
     for (int i = 0; i < UCIS_MAX_CODE_POINTS && code_points[i]; i++) {
         register_unicode(code_points[i]);
-        wait_ms(UNICODE_TYPE_DELAY);
     }
 }
 
@@ -94,9 +91,7 @@ bool process_ucis(uint16_t keycode, keyrecord_t *record) {
         case KC_ENTER:
         case KC_ESCAPE:
             for (uint8_t i = 0; i < qk_ucis_state.count; i++) {
-                register_code(KC_BACKSPACE);
-                unregister_code(KC_BACKSPACE);
-                wait_ms(UNICODE_TYPE_DELAY);
+                tap_code(KC_BACKSPACE);
             }
 
             if (keycode == KC_ESCAPE) {
diff --git a/quantum/process_keycode/process_ucis.h b/quantum/process_keycode/process_ucis.h
index a667430bda..3de0707762 100644
--- a/quantum/process_keycode/process_ucis.h
+++ b/quantum/process_keycode/process_ucis.h
@@ -16,8 +16,10 @@
 
 #pragma once
 
-#include "quantum.h"
-#include "process_unicode_common.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "action.h"
 
 #ifndef UCIS_MAX_SYMBOL_LENGTH
 #    define UCIS_MAX_SYMBOL_LENGTH 32
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index 18a1d8bc1f..99cc2f5f26 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -15,14 +15,14 @@
  */
 
 #include "process_unicode.h"
-#include "action_util.h"
-#include "eeprom.h"
+#include "unicode.h"
+#include "quantum_keycodes.h"
 
 bool process_unicode(uint16_t keycode, keyrecord_t *record) {
-    if (keycode >= QK_UNICODE && keycode <= QK_UNICODE_MAX && record->event.pressed) {
-        unicode_input_start();
-        register_hex(keycode & 0x7FFF);
-        unicode_input_finish();
+    if (record->event.pressed) {
+        if (keycode >= QK_UNICODE && keycode <= QK_UNICODE_MAX) {
+            register_unicode(keycode & 0x7FFF);
+        }
     }
     return true;
 }
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 22765ad560..341bc8d861 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -16,6 +16,9 @@
 
 #pragma once
 
-#include "process_unicode_common.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "action.h"
 
 bool process_unicode(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 94809cf029..bd5fc560f3 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -15,342 +15,45 @@
  */
 
 #include "process_unicode_common.h"
-#include "eeprom.h"
-#include "utf8.h"
+#include "unicode.h"
+#include "action_util.h"
+#include "keycode.h"
 
-unicode_config_t unicode_config;
-uint8_t          unicode_saved_mods;
-bool             unicode_saved_caps_lock;
-bool             unicode_saved_num_lock;
-
-#if UNICODE_SELECTED_MODES != -1
-static uint8_t selected[]     = {UNICODE_SELECTED_MODES};
-static int8_t  selected_count = ARRAY_SIZE(selected);
-static int8_t  selected_index;
+#if defined(UNICODE_ENABLE)
+#    include "process_unicode.h"
+#elif defined(UNICODEMAP_ENABLE)
+#    include "process_unicodemap.h"
+#elif defined(UCIS_ENABLE)
+#    include "process_ucis.h"
 #endif
 
-/** \brief Uunicode input mode set at user level
- *
- * Run user code on unicode input mode change
- */
-__attribute__((weak)) void unicode_input_mode_set_user(uint8_t input_mode) {}
-
-/** \brief unicode input mode set at keyboard level
- *
- *  Run keyboard code on unicode input mode change
- */
-__attribute__((weak)) void unicode_input_mode_set_kb(uint8_t input_mode) {
-    unicode_input_mode_set_user(input_mode);
-}
-
-void unicode_input_mode_init(void) {
-    unicode_config.raw = eeprom_read_byte(EECONFIG_UNICODEMODE);
-#if UNICODE_SELECTED_MODES != -1
-#    if UNICODE_CYCLE_PERSIST
-    // Find input_mode in selected modes
-    int8_t i;
-    for (i = 0; i < selected_count; i++) {
-        if (selected[i] == unicode_config.input_mode) {
-            selected_index = i;
-            break;
-        }
-    }
-    if (i == selected_count) {
-        // Not found: input_mode isn't selected, change to one that is
-        unicode_config.input_mode = selected[selected_index = 0];
-    }
-#    else
-    // Always change to the first selected input mode
-    unicode_config.input_mode = selected[selected_index = 0];
-#    endif
-#endif
-    unicode_input_mode_set_kb(unicode_config.input_mode);
-    dprintf("Unicode input mode init to: %u\n", unicode_config.input_mode);
-}
-
-uint8_t get_unicode_input_mode(void) {
-    return unicode_config.input_mode;
-}
-
-void set_unicode_input_mode(uint8_t mode) {
-    unicode_config.input_mode = mode;
-    persist_unicode_input_mode();
-    unicode_input_mode_set_kb(mode);
-    dprintf("Unicode input mode set to: %u\n", unicode_config.input_mode);
-}
-
-void cycle_unicode_input_mode(int8_t offset) {
-#if UNICODE_SELECTED_MODES != -1
-    selected_index = (selected_index + offset) % selected_count;
-    if (selected_index < 0) {
-        selected_index += selected_count;
-    }
-    unicode_config.input_mode = selected[selected_index];
-#    if UNICODE_CYCLE_PERSIST
-    persist_unicode_input_mode();
-#    endif
-    unicode_input_mode_set_kb(unicode_config.input_mode);
-    dprintf("Unicode input mode cycle to: %u\n", unicode_config.input_mode);
-#endif
-}
-
-void persist_unicode_input_mode(void) {
-    eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode);
-}
-
-__attribute__((weak)) void unicode_input_start(void) {
-    unicode_saved_caps_lock = host_keyboard_led_state().caps_lock;
-    unicode_saved_num_lock  = host_keyboard_led_state().num_lock;
-
-    // Note the order matters here!
-    // Need to do this before we mess around with the mods, or else
-    // UNICODE_KEY_LNX (which is usually Ctrl-Shift-U) might not work
-    // correctly in the shifted case.
-    if (unicode_config.input_mode == UC_LNX && unicode_saved_caps_lock) {
-        tap_code(KC_CAPS_LOCK);
-    }
-
-    unicode_saved_mods = get_mods(); // Save current mods
-    clear_mods();                    // Unregister mods to start from a clean state
-    clear_weak_mods();
-
-    switch (unicode_config.input_mode) {
-        case UC_MAC:
-            register_code(UNICODE_KEY_MAC);
-            break;
-        case UC_LNX:
-            tap_code16(UNICODE_KEY_LNX);
-            break;
-        case UC_WIN:
-            // For increased reliability, use numpad keys for inputting digits
-            if (!unicode_saved_num_lock) {
-                tap_code(KC_NUM_LOCK);
-            }
-            register_code(KC_LEFT_ALT);
-            wait_ms(UNICODE_TYPE_DELAY);
-            tap_code(KC_KP_PLUS);
-            break;
-        case UC_WINC:
-            tap_code(UNICODE_KEY_WINC);
-            tap_code(KC_U);
-            break;
-        case UC_EMACS:
-            // The usual way to type unicode in emacs is C-x-8 <RET> then the unicode number in hex
-            tap_code16(LCTL(KC_X));
-            tap_code16(KC_8);
-            tap_code16(KC_ENTER);
-            break;
-    }
-
-    wait_ms(UNICODE_TYPE_DELAY);
-}
-
-__attribute__((weak)) void unicode_input_finish(void) {
-    switch (unicode_config.input_mode) {
-        case UC_MAC:
-            unregister_code(UNICODE_KEY_MAC);
-            break;
-        case UC_LNX:
-            tap_code(KC_SPACE);
-            if (unicode_saved_caps_lock) {
-                tap_code(KC_CAPS_LOCK);
-            }
-            break;
-        case UC_WIN:
-            unregister_code(KC_LEFT_ALT);
-            if (!unicode_saved_num_lock) {
-                tap_code(KC_NUM_LOCK);
-            }
-            break;
-        case UC_WINC:
-            tap_code(KC_ENTER);
-            break;
-        case UC_EMACS:
-            tap_code16(KC_ENTER);
-            break;
-    }
-
-    set_mods(unicode_saved_mods); // Reregister previously set mods
-}
-
-__attribute__((weak)) void unicode_input_cancel(void) {
-    switch (unicode_config.input_mode) {
-        case UC_MAC:
-            unregister_code(UNICODE_KEY_MAC);
-            break;
-        case UC_LNX:
-            tap_code(KC_ESCAPE);
-            if (unicode_saved_caps_lock) {
-                tap_code(KC_CAPS_LOCK);
-            }
-            break;
-        case UC_WINC:
-            tap_code(KC_ESCAPE);
-            break;
-        case UC_WIN:
-            unregister_code(KC_LEFT_ALT);
-            if (!unicode_saved_num_lock) {
-                tap_code(KC_NUM_LOCK);
-            }
-            break;
-        case UC_EMACS:
-            tap_code16(LCTL(KC_G)); // C-g cancels
-            break;
-    }
-
-    set_mods(unicode_saved_mods); // Reregister previously set mods
-}
-
-// clang-format off
-
-static void send_nibble_wrapper(uint8_t digit) {
-    if (unicode_config.input_mode == UC_WIN) {
-        uint8_t kc = digit < 10
-                   ? KC_KP_1 + (10 + digit - 1) % 10
-                   : KC_A + (digit - 10);
-        tap_code(kc);
-        return;
-    }
-    send_nibble(digit);
-}
-
-// clang-format on
-
-void register_hex(uint16_t hex) {
-    for (int i = 3; i >= 0; i--) {
-        uint8_t digit = ((hex >> (i * 4)) & 0xF);
-        send_nibble_wrapper(digit);
-    }
-}
-
-void register_hex32(uint32_t hex) {
-    bool onzerostart = true;
-    for (int i = 7; i >= 0; i--) {
-        if (i <= 3) {
-            onzerostart = false;
-        }
-        uint8_t digit = ((hex >> (i * 4)) & 0xF);
-        if (digit == 0) {
-            if (!onzerostart) {
-                send_nibble_wrapper(digit);
-            }
-        } else {
-            send_nibble_wrapper(digit);
-            onzerostart = false;
-        }
-    }
-}
-
-void register_unicode(uint32_t code_point) {
-    if (code_point > 0x10FFFF || (code_point > 0xFFFF && unicode_config.input_mode == UC_WIN)) {
-        // Code point out of range, do nothing
-        return;
-    }
-
-    unicode_input_start();
-    if (code_point > 0xFFFF && unicode_config.input_mode == UC_MAC) {
-        // Convert code point to UTF-16 surrogate pair on macOS
-        code_point -= 0x10000;
-        uint32_t lo = code_point & 0x3FF, hi = (code_point & 0xFFC00) >> 10;
-        register_hex32(hi + 0xD800);
-        register_hex32(lo + 0xDC00);
-    } else {
-        register_hex32(code_point);
-    }
-    unicode_input_finish();
-}
-
-void send_unicode_string(const char *str) {
-    if (!str) {
-        return;
-    }
-
-    while (*str) {
-        int32_t code_point = 0;
-        str                = decode_utf8(str, &code_point);
-
-        if (code_point >= 0) {
-            register_unicode(code_point);
-        }
-    }
-}
-
-// clang-format off
-
-static void audio_helper(void) {
-#ifdef AUDIO_ENABLE
-    switch (get_unicode_input_mode()) {
-#    ifdef UNICODE_SONG_MAC
-        static float song_mac[][2] = UNICODE_SONG_MAC;
-        case UC_MAC:
-            PLAY_SONG(song_mac);
-            break;
-#    endif
-#    ifdef UNICODE_SONG_LNX
-        static float song_lnx[][2] = UNICODE_SONG_LNX;
-        case UC_LNX:
-            PLAY_SONG(song_lnx);
-            break;
-#    endif
-#    ifdef UNICODE_SONG_WIN
-        static float song_win[][2] = UNICODE_SONG_WIN;
-        case UC_WIN:
-            PLAY_SONG(song_win);
-            break;
-#    endif
-#    ifdef UNICODE_SONG_BSD
-        static float song_bsd[][2] = UNICODE_SONG_BSD;
-        case UC_BSD:
-            PLAY_SONG(song_bsd);
-            break;
-#    endif
-#    ifdef UNICODE_SONG_WINC
-        static float song_winc[][2] = UNICODE_SONG_WINC;
-        case UC_WINC:
-            PLAY_SONG(song_winc);
-            break;
-#    endif
-    }
-#endif
-}
-
-// clang-format on
-
 bool process_unicode_common(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         bool shifted = get_mods() & MOD_MASK_SHIFT;
         switch (keycode) {
             case UNICODE_MODE_FORWARD:
                 cycle_unicode_input_mode(shifted ? -1 : +1);
-                audio_helper();
                 break;
             case UNICODE_MODE_REVERSE:
                 cycle_unicode_input_mode(shifted ? +1 : -1);
-                audio_helper();
                 break;
             case UNICODE_MODE_MAC:
                 set_unicode_input_mode(UC_MAC);
-                audio_helper();
                 break;
             case UNICODE_MODE_LNX:
                 set_unicode_input_mode(UC_LNX);
-                audio_helper();
                 break;
             case UNICODE_MODE_WIN:
                 set_unicode_input_mode(UC_WIN);
-                audio_helper();
                 break;
             case UNICODE_MODE_BSD:
                 set_unicode_input_mode(UC_BSD);
-                audio_helper();
                 break;
             case UNICODE_MODE_WINC:
                 set_unicode_input_mode(UC_WINC);
-                audio_helper();
                 break;
             case UNICODE_MODE_EMACS:
                 set_unicode_input_mode(UC_EMACS);
-                audio_helper();
                 break;
         }
     }
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index 0fe672d26a..fd09a41818 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -16,181 +16,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
+#include <stdint.h>
 
-#if defined(UNICODE_ENABLE) + defined(UNICODEMAP_ENABLE) + defined(UCIS_ENABLE) > 1
-#    error "Cannot enable more than one Unicode method (UNICODE, UNICODEMAP, UCIS) at the same time"
-#endif
-
-// Keycodes used for starting Unicode input on different platforms
-#ifndef UNICODE_KEY_MAC
-#    define UNICODE_KEY_MAC KC_LEFT_ALT
-#endif
-#ifndef UNICODE_KEY_LNX
-#    define UNICODE_KEY_LNX LCTL(LSFT(KC_U))
-#endif
-#ifndef UNICODE_KEY_WINC
-#    define UNICODE_KEY_WINC KC_RIGHT_ALT
-#endif
-
-// Comma-delimited, ordered list of input modes selected for use (e.g. in cycle)
-// Example: #define UNICODE_SELECTED_MODES UC_WINC, UC_LNX
-#ifndef UNICODE_SELECTED_MODES
-#    define UNICODE_SELECTED_MODES -1
-#endif
-
-// Whether input mode changes in cycle should be written to EEPROM
-#ifndef UNICODE_CYCLE_PERSIST
-#    define UNICODE_CYCLE_PERSIST true
-#endif
-
-// Delay between starting Unicode input and sending a sequence, in ms
-#ifndef UNICODE_TYPE_DELAY
-#    define UNICODE_TYPE_DELAY 10
-#endif
-
-enum unicode_input_modes {
-    UC_MAC,   // macOS using Unicode Hex Input
-    UC_LNX,   // Linux using IBus
-    UC_WIN,   // Windows using EnableHexNumpad
-    UC_BSD,   // BSD (not implemented)
-    UC_WINC,  // Windows using WinCompose (https://github.com/samhocevar/wincompose)
-    UC_EMACS, // Emacs is an operating system in search of a good text editor
-    UC__COUNT // Number of available input modes (always leave at the end)
-};
-
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t input_mode : 8;
-    };
-} unicode_config_t;
-
-extern unicode_config_t unicode_config;
-
-void    unicode_input_mode_init(void);
-uint8_t get_unicode_input_mode(void);
-void    set_unicode_input_mode(uint8_t mode);
-void    cycle_unicode_input_mode(int8_t offset);
-void    persist_unicode_input_mode(void);
-
-void unicode_input_start(void);
-void unicode_input_finish(void);
-void unicode_input_cancel(void);
-
-void unicode_input_mode_set_user(uint8_t input_mode);
-void unicode_input_mode_set_kb(uint8_t input_mode);
-
-void register_hex(uint16_t hex);
-void register_hex32(uint32_t hex);
-void register_unicode(uint32_t code_point);
-
-void send_unicode_string(const char *str);
+#include "action.h"
 
 bool process_unicode_common(uint16_t keycode, keyrecord_t *record);
-
-#define UC_BSPC UC(0x0008)
-#define UC_SPC UC(0x0020)
-
-#define UC_EXLM UC(0x0021)
-#define UC_DQUT UC(0x0022)
-#define UC_HASH UC(0x0023)
-#define UC_DLR UC(0x0024)
-#define UC_PERC UC(0x0025)
-#define UC_AMPR UC(0x0026)
-#define UC_QUOT UC(0x0027)
-#define UC_LPRN UC(0x0028)
-#define UC_RPRN UC(0x0029)
-#define UC_ASTR UC(0x002A)
-#define UC_PLUS UC(0x002B)
-#define UC_COMM UC(0x002C)
-#define UC_DASH UC(0x002D)
-#define UC_DOT UC(0x002E)
-#define UC_SLSH UC(0x002F)
-
-#define UC_0 UC(0x0030)
-#define UC_1 UC(0x0031)
-#define UC_2 UC(0x0032)
-#define UC_3 UC(0x0033)
-#define UC_4 UC(0x0034)
-#define UC_5 UC(0x0035)
-#define UC_6 UC(0x0036)
-#define UC_7 UC(0x0037)
-#define UC_8 UC(0x0038)
-#define UC_9 UC(0x0039)
-
-#define UC_COLN UC(0x003A)
-#define UC_SCLN UC(0x003B)
-#define UC_LT UC(0x003C)
-#define UC_EQL UC(0x003D)
-#define UC_GT UC(0x003E)
-#define UC_QUES UC(0x003F)
-#define UC_AT UC(0x0040)
-
-#define UC_A UC(0x0041)
-#define UC_B UC(0x0042)
-#define UC_C UC(0x0043)
-#define UC_D UC(0x0044)
-#define UC_E UC(0x0045)
-#define UC_F UC(0x0046)
-#define UC_G UC(0x0047)
-#define UC_H UC(0x0048)
-#define UC_I UC(0x0049)
-#define UC_J UC(0x004A)
-#define UC_K UC(0x004B)
-#define UC_L UC(0x004C)
-#define UC_M UC(0x004D)
-#define UC_N UC(0x004E)
-#define UC_O UC(0x004F)
-#define UC_P UC(0x0050)
-#define UC_Q UC(0x0051)
-#define UC_R UC(0x0052)
-#define UC_S UC(0x0053)
-#define UC_T UC(0x0054)
-#define UC_U UC(0x0055)
-#define UC_V UC(0x0056)
-#define UC_W UC(0x0057)
-#define UC_X UC(0x0058)
-#define UC_Y UC(0x0059)
-#define UC_Z UC(0x005A)
-
-#define UC_LBRC UC(0x005B)
-#define UC_BSLS UC(0x005C)
-#define UC_RBRC UC(0x005D)
-#define UC_CIRM UC(0x005E)
-#define UC_UNDR UC(0x005F)
-
-#define UC_GRV UC(0x0060)
-
-#define UC_a UC(0x0061)
-#define UC_b UC(0x0062)
-#define UC_c UC(0x0063)
-#define UC_d UC(0x0064)
-#define UC_e UC(0x0065)
-#define UC_f UC(0x0066)
-#define UC_g UC(0x0067)
-#define UC_h UC(0x0068)
-#define UC_i UC(0x0069)
-#define UC_j UC(0x006A)
-#define UC_k UC(0x006B)
-#define UC_l UC(0x006C)
-#define UC_m UC(0x006D)
-#define UC_n UC(0x006E)
-#define UC_o UC(0x006F)
-#define UC_p UC(0x0070)
-#define UC_q UC(0x0071)
-#define UC_r UC(0x0072)
-#define UC_s UC(0x0073)
-#define UC_t UC(0x0074)
-#define UC_u UC(0x0075)
-#define UC_v UC(0x0076)
-#define UC_w UC(0x0077)
-#define UC_x UC(0x0078)
-#define UC_y UC(0x0079)
-#define UC_z UC(0x007A)
-
-#define UC_LCBR UC(0x007B)
-#define UC_PIPE UC(0x007C)
-#define UC_RCBR UC(0x007D)
-#define UC_TILD UC(0x007E)
-#define UC_DEL UC(0x007F)
diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index 459397014d..979d773b05 100644
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -15,6 +15,11 @@
  */
 
 #include "process_unicodemap.h"
+#include "unicode.h"
+#include "quantum_keycodes.h"
+#include "keycode.h"
+#include "action_util.h"
+#include "host.h"
 
 __attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
     if (keycode >= QK_UNICODEMAP_PAIR) {
diff --git a/quantum/process_keycode/process_unicodemap.h b/quantum/process_keycode/process_unicodemap.h
index c429859bbb..73f5449864 100644
--- a/quantum/process_keycode/process_unicodemap.h
+++ b/quantum/process_keycode/process_unicodemap.h
@@ -16,7 +16,11 @@
 
 #pragma once
 
-#include "process_unicode_common.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "action.h"
+#include "progmem.h"
 
 extern const uint32_t PROGMEM unicode_map[];
 
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 8d74f2be38..51360c3d2a 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -109,6 +109,7 @@ extern layer_state_t layer_state;
 #endif
 
 #ifdef UNICODE_COMMON_ENABLE
+#    include "unicode.h"
 #    include "process_unicode_common.h"
 #endif
 
diff --git a/quantum/unicode/unicode.c b/quantum/unicode/unicode.c
new file mode 100644
index 0000000000..f9f429e7af
--- /dev/null
+++ b/quantum/unicode/unicode.c
@@ -0,0 +1,376 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "unicode.h"
+
+#include "eeprom.h"
+#include "eeconfig.h"
+#include "action.h"
+#include "action_util.h"
+#include "host.h"
+#include "keycode.h"
+#include "wait.h"
+#include "audio.h"
+#include "send_string.h"
+#include "utf8.h"
+
+#if defined(UNICODE_ENABLE) + defined(UNICODEMAP_ENABLE) + defined(UCIS_ENABLE) > 1
+#    error "Cannot enable more than one Unicode method (UNICODE, UNICODEMAP, UCIS) at the same time"
+#endif
+
+// Keycodes used for starting Unicode input on different platforms
+#ifndef UNICODE_KEY_MAC
+#    define UNICODE_KEY_MAC KC_LEFT_ALT
+#endif
+#ifndef UNICODE_KEY_LNX
+#    define UNICODE_KEY_LNX LCTL(LSFT(KC_U))
+#endif
+#ifndef UNICODE_KEY_WINC
+#    define UNICODE_KEY_WINC KC_RIGHT_ALT
+#endif
+
+// Comma-delimited, ordered list of input modes selected for use (e.g. in cycle)
+// Example: #define UNICODE_SELECTED_MODES UC_WINC, UC_LNX
+#ifndef UNICODE_SELECTED_MODES
+#    define UNICODE_SELECTED_MODES -1
+#endif
+
+// Whether input mode changes in cycle should be written to EEPROM
+#ifndef UNICODE_CYCLE_PERSIST
+#    define UNICODE_CYCLE_PERSIST true
+#endif
+
+// Delay between starting Unicode input and sending a sequence, in ms
+#ifndef UNICODE_TYPE_DELAY
+#    define UNICODE_TYPE_DELAY 10
+#endif
+
+unicode_config_t unicode_config;
+uint8_t          unicode_saved_mods;
+led_t            unicode_saved_led_state;
+
+#if UNICODE_SELECTED_MODES != -1
+static uint8_t selected[]     = {UNICODE_SELECTED_MODES};
+static int8_t  selected_count = ARRAY_SIZE(selected);
+static int8_t  selected_index;
+#endif
+
+/** \brief unicode input mode set at user level
+ *
+ * Run user code on unicode input mode change
+ */
+__attribute__((weak)) void unicode_input_mode_set_user(uint8_t input_mode) {}
+
+/** \brief unicode input mode set at keyboard level
+ *
+ *  Run keyboard code on unicode input mode change
+ */
+__attribute__((weak)) void unicode_input_mode_set_kb(uint8_t input_mode) {
+    unicode_input_mode_set_user(input_mode);
+}
+
+#ifdef AUDIO_ENABLE
+#    ifdef UNICODE_SONG_MAC
+static float song_mac[][2] = UNICODE_SONG_MAC;
+#    endif
+#    ifdef UNICODE_SONG_LNX
+static float song_lnx[][2] = UNICODE_SONG_LNX;
+#    endif
+#    ifdef UNICODE_SONG_WIN
+static float song_win[][2] = UNICODE_SONG_WIN;
+#    endif
+#    ifdef UNICODE_SONG_BSD
+static float song_bsd[][2] = UNICODE_SONG_BSD;
+#    endif
+#    ifdef UNICODE_SONG_WINC
+static float song_winc[][2] = UNICODE_SONG_WINC;
+#    endif
+#    ifdef UNICODE_SONG_EMACS
+static float song_emacs[][2] = UNICODE_SONG_EMACS;
+#    endif
+
+static void unicode_play_song(uint8_t mode) {
+    switch (mode) {
+#    ifdef UNICODE_SONG_MAC
+        case UC_MAC:
+            PLAY_SONG(song_mac);
+            break;
+#    endif
+#    ifdef UNICODE_SONG_LNX
+        case UC_LNX:
+            PLAY_SONG(song_lnx);
+            break;
+#    endif
+#    ifdef UNICODE_SONG_WIN
+        case UC_WIN:
+            PLAY_SONG(song_win);
+            break;
+#    endif
+#    ifdef UNICODE_SONG_BSD
+        case UC_BSD:
+            PLAY_SONG(song_bsd);
+            break;
+#    endif
+#    ifdef UNICODE_SONG_WINC
+        case UC_WINC:
+            PLAY_SONG(song_winc);
+            break;
+#    endif
+#    ifdef UNICODE_SONG_EMACS
+        case UC_EMACS:
+            PLAY_SONG(song_emacs);
+            break;
+#    endif
+    }
+}
+#endif
+
+void unicode_input_mode_init(void) {
+    unicode_config.raw = eeprom_read_byte(EECONFIG_UNICODEMODE);
+#if UNICODE_SELECTED_MODES != -1
+#    if UNICODE_CYCLE_PERSIST
+    // Find input_mode in selected modes
+    int8_t i;
+    for (i = 0; i < selected_count; i++) {
+        if (selected[i] == unicode_config.input_mode) {
+            selected_index = i;
+            break;
+        }
+    }
+    if (i == selected_count) {
+        // Not found: input_mode isn't selected, change to one that is
+        unicode_config.input_mode = selected[selected_index = 0];
+    }
+#    else
+    // Always change to the first selected input mode
+    unicode_config.input_mode = selected[selected_index = 0];
+#    endif
+#endif
+    unicode_input_mode_set_kb(unicode_config.input_mode);
+    dprintf("Unicode input mode init to: %u\n", unicode_config.input_mode);
+}
+
+uint8_t get_unicode_input_mode(void) {
+    return unicode_config.input_mode;
+}
+
+void set_unicode_input_mode(uint8_t mode) {
+    unicode_config.input_mode = mode;
+    persist_unicode_input_mode();
+#ifdef AUDIO_ENABLE
+    unicode_play_song(mode);
+#endif
+    unicode_input_mode_set_kb(mode);
+    dprintf("Unicode input mode set to: %u\n", unicode_config.input_mode);
+}
+
+void cycle_unicode_input_mode(int8_t offset) {
+#if UNICODE_SELECTED_MODES != -1
+    selected_index = (selected_index + offset) % selected_count;
+    if (selected_index < 0) {
+        selected_index += selected_count;
+    }
+    unicode_config.input_mode = selected[selected_index];
+#    if UNICODE_CYCLE_PERSIST
+    persist_unicode_input_mode();
+#    endif
+#    ifdef AUDIO_ENABLE
+    unicode_play_song(unicode_config.input_mode);
+#    endif
+    unicode_input_mode_set_kb(unicode_config.input_mode);
+    dprintf("Unicode input mode cycle to: %u\n", unicode_config.input_mode);
+#endif
+}
+
+void persist_unicode_input_mode(void) {
+    eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode);
+}
+
+__attribute__((weak)) void unicode_input_start(void) {
+    unicode_saved_led_state = host_keyboard_led_state();
+
+    // Note the order matters here!
+    // Need to do this before we mess around with the mods, or else
+    // UNICODE_KEY_LNX (which is usually Ctrl-Shift-U) might not work
+    // correctly in the shifted case.
+    if (unicode_config.input_mode == UC_LNX && unicode_saved_led_state.caps_lock) {
+        tap_code(KC_CAPS_LOCK);
+    }
+
+    unicode_saved_mods = get_mods(); // Save current mods
+    clear_mods();                    // Unregister mods to start from a clean state
+    clear_weak_mods();
+
+    switch (unicode_config.input_mode) {
+        case UC_MAC:
+            register_code(UNICODE_KEY_MAC);
+            break;
+        case UC_LNX:
+            tap_code16(UNICODE_KEY_LNX);
+            break;
+        case UC_WIN:
+            // For increased reliability, use numpad keys for inputting digits
+            if (!unicode_saved_led_state.num_lock) {
+                tap_code(KC_NUM_LOCK);
+            }
+            register_code(KC_LEFT_ALT);
+            wait_ms(UNICODE_TYPE_DELAY);
+            tap_code(KC_KP_PLUS);
+            break;
+        case UC_WINC:
+            tap_code(UNICODE_KEY_WINC);
+            tap_code(KC_U);
+            break;
+        case UC_EMACS:
+            // The usual way to type unicode in emacs is C-x-8 <RET> then the unicode number in hex
+            tap_code16(LCTL(KC_X));
+            tap_code16(KC_8);
+            tap_code16(KC_ENTER);
+            break;
+    }
+
+    wait_ms(UNICODE_TYPE_DELAY);
+}
+
+__attribute__((weak)) void unicode_input_finish(void) {
+    switch (unicode_config.input_mode) {
+        case UC_MAC:
+            unregister_code(UNICODE_KEY_MAC);
+            break;
+        case UC_LNX:
+            tap_code(KC_SPACE);
+            if (unicode_saved_led_state.caps_lock) {
+                tap_code(KC_CAPS_LOCK);
+            }
+            break;
+        case UC_WIN:
+            unregister_code(KC_LEFT_ALT);
+            if (!unicode_saved_led_state.num_lock) {
+                tap_code(KC_NUM_LOCK);
+            }
+            break;
+        case UC_WINC:
+            tap_code(KC_ENTER);
+            break;
+        case UC_EMACS:
+            tap_code16(KC_ENTER);
+            break;
+    }
+
+    set_mods(unicode_saved_mods); // Reregister previously set mods
+}
+
+__attribute__((weak)) void unicode_input_cancel(void) {
+    switch (unicode_config.input_mode) {
+        case UC_MAC:
+            unregister_code(UNICODE_KEY_MAC);
+            break;
+        case UC_LNX:
+            tap_code(KC_ESCAPE);
+            if (unicode_saved_led_state.caps_lock) {
+                tap_code(KC_CAPS_LOCK);
+            }
+            break;
+        case UC_WINC:
+            tap_code(KC_ESCAPE);
+            break;
+        case UC_WIN:
+            unregister_code(KC_LEFT_ALT);
+            if (!unicode_saved_led_state.num_lock) {
+                tap_code(KC_NUM_LOCK);
+            }
+            break;
+        case UC_EMACS:
+            tap_code16(LCTL(KC_G)); // C-g cancels
+            break;
+    }
+
+    set_mods(unicode_saved_mods); // Reregister previously set mods
+}
+
+// clang-format off
+
+static void send_nibble_wrapper(uint8_t digit) {
+    if (unicode_config.input_mode == UC_WIN) {
+        uint8_t kc = digit < 10
+                   ? KC_KP_1 + (10 + digit - 1) % 10
+                   : KC_A + (digit - 10);
+        tap_code(kc);
+        return;
+    }
+    send_nibble(digit);
+}
+
+// clang-format on
+
+void register_hex(uint16_t hex) {
+    for (int i = 3; i >= 0; i--) {
+        uint8_t digit = ((hex >> (i * 4)) & 0xF);
+        send_nibble_wrapper(digit);
+    }
+}
+
+void register_hex32(uint32_t hex) {
+    bool onzerostart = true;
+    for (int i = 7; i >= 0; i--) {
+        if (i <= 3) {
+            onzerostart = false;
+        }
+        uint8_t digit = ((hex >> (i * 4)) & 0xF);
+        if (digit == 0) {
+            if (!onzerostart) {
+                send_nibble_wrapper(digit);
+            }
+        } else {
+            send_nibble_wrapper(digit);
+            onzerostart = false;
+        }
+    }
+}
+
+void register_unicode(uint32_t code_point) {
+    if (code_point > 0x10FFFF || (code_point > 0xFFFF && unicode_config.input_mode == UC_WIN)) {
+        // Code point out of range, do nothing
+        return;
+    }
+
+    unicode_input_start();
+    if (code_point > 0xFFFF && unicode_config.input_mode == UC_MAC) {
+        // Convert code point to UTF-16 surrogate pair on macOS
+        code_point -= 0x10000;
+        uint32_t lo = code_point & 0x3FF, hi = (code_point & 0xFFC00) >> 10;
+        register_hex32(hi + 0xD800);
+        register_hex32(lo + 0xDC00);
+    } else {
+        register_hex32(code_point);
+    }
+    unicode_input_finish();
+}
+
+void send_unicode_string(const char *str) {
+    if (!str) {
+        return;
+    }
+
+    while (*str) {
+        int32_t code_point = 0;
+        str                = decode_utf8(str, &code_point);
+
+        if (code_point >= 0) {
+            register_unicode(code_point);
+        }
+    }
+}
diff --git a/quantum/unicode/unicode.h b/quantum/unicode/unicode.h
new file mode 100644
index 0000000000..b3e43799ff
--- /dev/null
+++ b/quantum/unicode/unicode.h
@@ -0,0 +1,165 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#include "quantum.h"
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t input_mode : 8;
+    };
+} unicode_config_t;
+
+extern unicode_config_t unicode_config;
+
+enum unicode_input_modes {
+    UC_MAC,   // macOS using Unicode Hex Input
+    UC_LNX,   // Linux using IBus
+    UC_WIN,   // Windows using EnableHexNumpad
+    UC_BSD,   // BSD (not implemented)
+    UC_WINC,  // Windows using WinCompose (https://github.com/samhocevar/wincompose)
+    UC_EMACS, // Emacs is an operating system in search of a good text editor
+    UC__COUNT // Number of available input modes (always leave at the end)
+};
+
+void    unicode_input_mode_init(void);
+uint8_t get_unicode_input_mode(void);
+void    set_unicode_input_mode(uint8_t mode);
+void    cycle_unicode_input_mode(int8_t offset);
+void    persist_unicode_input_mode(void);
+
+void unicode_input_mode_set_user(uint8_t input_mode);
+void unicode_input_mode_set_kb(uint8_t input_mode);
+
+void unicode_input_start(void);
+void unicode_input_finish(void);
+void unicode_input_cancel(void);
+
+void register_hex(uint16_t hex);
+void register_hex32(uint32_t hex);
+void register_unicode(uint32_t code_point);
+
+void send_unicode_string(const char *str);
+
+// clang-format off
+
+#define UC_BSPC UC(0x0008) // (backspace)
+
+#define UC_SPC  UC(0x0020) // (space)
+#define UC_EXLM UC(0x0021) // !
+#define UC_DQUT UC(0x0022) // "
+#define UC_HASH UC(0x0023) // #
+#define UC_DLR  UC(0x0024) // $
+#define UC_PERC UC(0x0025) // %
+#define UC_AMPR UC(0x0026) // &
+#define UC_QUOT UC(0x0027) // '
+#define UC_LPRN UC(0x0028) // (
+#define UC_RPRN UC(0x0029) // )
+#define UC_ASTR UC(0x002A) // *
+#define UC_PLUS UC(0x002B) // +
+#define UC_COMM UC(0x002C) // ,
+#define UC_DASH UC(0x002D) // -
+#define UC_DOT  UC(0x002E) // .
+#define UC_SLSH UC(0x002F) // /
+
+#define UC_0    UC(0x0030) // 0
+#define UC_1    UC(0x0031) // 1
+#define UC_2    UC(0x0032) // 2
+#define UC_3    UC(0x0033) // 3
+#define UC_4    UC(0x0034) // 4
+#define UC_5    UC(0x0035) // 5
+#define UC_6    UC(0x0036) // 6
+#define UC_7    UC(0x0037) // 7
+#define UC_8    UC(0x0038) // 8
+#define UC_9    UC(0x0039) // 9
+#define UC_COLN UC(0x003A) // :
+#define UC_SCLN UC(0x003B) // ;
+#define UC_LT   UC(0x003C) // <
+#define UC_EQL  UC(0x003D) // =
+#define UC_GT   UC(0x003E) // >
+#define UC_QUES UC(0x003F) // ?
+
+#define UC_AT   UC(0x0040) // @
+#define UC_A    UC(0x0041) // A
+#define UC_B    UC(0x0042) // B
+#define UC_C    UC(0x0043) // C
+#define UC_D    UC(0x0044) // D
+#define UC_E    UC(0x0045) // E
+#define UC_F    UC(0x0046) // F
+#define UC_G    UC(0x0047) // G
+#define UC_H    UC(0x0048) // H
+#define UC_I    UC(0x0049) // I
+#define UC_J    UC(0x004A) // J
+#define UC_K    UC(0x004B) // K
+#define UC_L    UC(0x004C) // L
+#define UC_M    UC(0x004D) // M
+#define UC_N    UC(0x004E) // N
+#define UC_O    UC(0x004F) // O
+
+#define UC_P    UC(0x0050) // P
+#define UC_Q    UC(0x0051) // Q
+#define UC_R    UC(0x0052) // R
+#define UC_S    UC(0x0053) // S
+#define UC_T    UC(0x0054) // T
+#define UC_U    UC(0x0055) // U
+#define UC_V    UC(0x0056) // V
+#define UC_W    UC(0x0057) // W
+#define UC_X    UC(0x0058) // X
+#define UC_Y    UC(0x0059) // Y
+#define UC_Z    UC(0x005A) // Z
+#define UC_LBRC UC(0x005B) // [
+#define UC_BSLS UC(0x005C) // (backslash)
+#define UC_RBRC UC(0x005D) // ]
+#define UC_CIRM UC(0x005E) // ^
+#define UC_UNDR UC(0x005F) // _
+
+#define UC_GRV  UC(0x0060) // `
+#define UC_a    UC(0x0061) // a
+#define UC_b    UC(0x0062) // b
+#define UC_c    UC(0x0063) // c
+#define UC_d    UC(0x0064) // d
+#define UC_e    UC(0x0065) // e
+#define UC_f    UC(0x0066) // f
+#define UC_g    UC(0x0067) // g
+#define UC_h    UC(0x0068) // h
+#define UC_i    UC(0x0069) // i
+#define UC_j    UC(0x006A) // j
+#define UC_k    UC(0x006B) // k
+#define UC_l    UC(0x006C) // l
+#define UC_m    UC(0x006D) // m
+#define UC_n    UC(0x006E) // n
+#define UC_o    UC(0x006F) // o
+
+#define UC_p    UC(0x0070) // p
+#define UC_q    UC(0x0071) // q
+#define UC_r    UC(0x0072) // r
+#define UC_s    UC(0x0073) // s
+#define UC_t    UC(0x0074) // t
+#define UC_u    UC(0x0075) // u
+#define UC_v    UC(0x0076) // v
+#define UC_w    UC(0x0077) // w
+#define UC_x    UC(0x0078) // x
+#define UC_y    UC(0x0079) // y
+#define UC_z    UC(0x007A) // z
+#define UC_LCBR UC(0x007B) // {
+#define UC_PIPE UC(0x007C) // |
+#define UC_RCBR UC(0x007D) // }
+#define UC_TILD UC(0x007E) // ~
+#define UC_DEL  UC(0x007F) // (delete)
diff --git a/quantum/utf8.c b/quantum/unicode/utf8.c
similarity index 100%
rename from quantum/utf8.c
rename to quantum/unicode/utf8.c
diff --git a/quantum/utf8.h b/quantum/unicode/utf8.h
similarity index 91%
rename from quantum/utf8.h
rename to quantum/unicode/utf8.h
index fb10910944..521dd1918c 100644
--- a/quantum/utf8.h
+++ b/quantum/unicode/utf8.h
@@ -18,4 +18,4 @@
 
 #include <stdint.h>
 
-const char *decode_utf8(const char *str, int32_t *code_point);
\ No newline at end of file
+const char *decode_utf8(const char *str, int32_t *code_point);

From 55c637f28f710aaf29645748903fe6b4832ad797 Mon Sep 17 00:00:00 2001
From: Thomas <mail@tpreisner.de>
Date: Mon, 12 Sep 2022 17:56:21 +0200
Subject: [PATCH 341/959] [Docs] Fix docs regarding cirque pinnacle attenuation
 (#18279)

---
 docs/feature_pointing_device.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index afc57ed493..f2a8994fd2 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -93,20 +93,20 @@ This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the
 
 #### Common settings
 
-| Setting                          | Description                                                | Default            |
-| -------------------------------- | ---------------------------------------------------------- | ------------------ |
-| `CIRQUE_PINNACLE_DIAMETER_MM`    | (Optional) Diameter of the trackpad sensor in millimeters. | `40`               |
-| `CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.        | `ADC_ATTENUATE_4X` |
-| `CIRQUE_PINNACLE_CURVED_OVERLAY` | (Optional) Applies settings tuned for curved overlay.      | _not defined_      |
-| `CIRQUE_PINNACLE_POSITION_MODE`  | (Optional) Mode of operation.                              | _not defined_      |
+| Setting                          | Description                                                | Default                                     |
+| -------------------------------- | ---------------------------------------------------------- | ------------------------------------------- |
+| `CIRQUE_PINNACLE_DIAMETER_MM`    | (Optional) Diameter of the trackpad sensor in millimeters. | `40`                                        |
+| `CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.        | `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_4X` |
+| `CIRQUE_PINNACLE_CURVED_OVERLAY` | (Optional) Applies settings tuned for curved overlay.      | _not defined_                               |
+| `CIRQUE_PINNACLE_POSITION_MODE`  | (Optional) Mode of operation.                              | _not defined_                               |
 
 **`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be.
 
 Default attenuation is set to 4X, although if you are using a thicker overlay (such as the curved overlay) you will want a lower attenuation such as 2X. The possible values are:
-* `ADC_ATTENUATE_4X`: Least sensitive
-* `ADC_ATTENUATE_3X`
-* `ADC_ATTENUATE_2X`
-* `ADC_ATTENUATE_1X`: Most sensitive
+* `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_4X`: Least sensitive
+* `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_3X`
+* `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_2X`
+* `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_1X`: Most sensitive
 
 **`CIRQUE_PINNACLE_POSITION_MODE`** can be `CIRQUE_PINNACLE_ABSOLUTE_MODE` or `CIRQUE_PINNACLE_RELATIVE_MODE`. Modes differ in supported features/gestures.
 

From 110de0b512375d33a0936424e05404e4edbee147 Mon Sep 17 00:00:00 2001
From: ebastler <moritz.plattner@gmx.net>
Date: Mon, 12 Sep 2022 18:17:01 +0200
Subject: [PATCH 342/959] Add EM.8 keyboard  (#18328)

by ebastler
---
 keyboards/linworks/em8/config.h               |   8 +
 keyboards/linworks/em8/info.json              | 190 ++++++++++++++++++
 .../linworks/em8/keymaps/default/keymap.c     |  52 +++++
 keyboards/linworks/em8/keymaps/via/keymap.c   |  52 +++++
 keyboards/linworks/em8/keymaps/via/rules.mk   |   1 +
 keyboards/linworks/em8/readme.md              |  22 ++
 keyboards/linworks/em8/rules.mk               |   1 +
 7 files changed, 326 insertions(+)
 create mode 100644 keyboards/linworks/em8/config.h
 create mode 100644 keyboards/linworks/em8/info.json
 create mode 100644 keyboards/linworks/em8/keymaps/default/keymap.c
 create mode 100644 keyboards/linworks/em8/keymaps/via/keymap.c
 create mode 100644 keyboards/linworks/em8/keymaps/via/rules.mk
 create mode 100644 keyboards/linworks/em8/readme.md
 create mode 100644 keyboards/linworks/em8/rules.mk

diff --git a/keyboards/linworks/em8/config.h b/keyboards/linworks/em8/config.h
new file mode 100644
index 0000000000..176c814e35
--- /dev/null
+++ b/keyboards/linworks/em8/config.h
@@ -0,0 +1,8 @@
+// Copyright 2022 moritz plattner (@moritz plattner)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Move Bootmagic key from ~ to ESC (0,0 to 1,0)
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json
new file mode 100644
index 0000000000..e4d58708e5
--- /dev/null
+++ b/keyboards/linworks/em8/info.json
@@ -0,0 +1,190 @@
+{
+    "manufacturer": "Linworks",
+    "keyboard_name": "EM.8",
+    "maintainer": "ebastler",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": [ "B5", "B4", "D0", "D1", "D4", "D6", "D7", "F6", "F5", "F4", "F1", "B2", "B6", "C6", "C7" ],
+        "rows": [ "B7", "B0", "F0", "E6", "F7" ]
+    },
+    "processor": "atmega32u4",
+    "url": "https://klc-playground.com/",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0006",
+        "vid": "0x4C58"
+    },
+    "indicators": {
+        "num_lock": "D2",
+        "caps_lock": "D3",
+        "scroll_lock": "D5",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT_em8_2u_backsp": {
+            "layout": [
+                {"x":0, "y":0, "matrix":[1,0] },
+                {"x":1.25, "y":0, "matrix":[0,0] },
+                {"x":2.25, "y":0, "matrix":[0,1] },
+                {"x":3.25, "y":0, "matrix":[0,2] },
+                {"x":4.25, "y":0, "matrix":[0,3] },
+                {"x":5.25, "y":0, "matrix":[0,4] },
+                {"x":6.25, "y":0, "matrix":[0,5] },
+                {"x":7.25, "y":0, "matrix":[0,6] },
+                {"x":10.25, "y":0, "matrix":[0,7] },
+                {"x":11.25, "y":0, "matrix":[0,8] },
+                {"x":12.25, "y":0, "matrix":[0,9] },
+                {"x":13.25, "y":0, "matrix":[0,10] },
+                {"x":14.25, "y":0, "matrix":[0,11] },
+                {"x":15.25, "y":0, "matrix":[0,12] },
+                {"x":16.25, "y":0, "w": 2, "matrix":[0,13] },
+                {"x":18.5, "y":0, "matrix":[0,14] },
+
+                {"x":0, "y":1, "matrix":[2,0] },
+                {"x":1.25, "y":1, "w":1.5, "matrix":[1,1] },
+                {"x":2.75, "y":1, "matrix":[1,2] },
+                {"x":3.75, "y":1, "matrix":[1,3] },
+                {"x":4.75, "y":1, "matrix":[1,4] },
+                {"x":5.75, "y":1, "matrix":[1,5] },
+                {"x":6.75, "y":1, "matrix":[1,6] },
+                {"x":9.75, "y":1, "matrix":[1,7] },
+                {"x":10.75, "y":1, "matrix":[1,8] },
+                {"x":11.75, "y":1, "matrix":[1,9] },
+                {"x":12.75, "y":1, "matrix":[1,10] },
+                {"x":13.75, "y":1, "matrix":[1,11] },
+                {"x":14.75, "y":1, "matrix":[1,12] },
+                {"x":15.75, "y":1, "matrix":[1,13] },
+                {"x":16.75, "y":1, "w":1.5, "matrix":[1,14] },
+                {"x":18.5, "y":1, "matrix":[2,14] },
+
+                {"x":0, "y":2, "matrix":[3,0] },
+                {"x":1.25, "y":2, "w":1.75, "matrix":[2,1] },
+                {"x":3, "y":2, "matrix":[2,2] },
+                {"x":4, "y":2, "matrix":[2,3] },
+                {"x":5, "y":2, "matrix":[2,4] },
+                {"x":6, "y":2, "matrix":[2,5] },
+                {"x":7, "y":2, "matrix":[2,6] },
+                {"x":10, "y":2, "matrix":[2,7] },
+                {"x":11, "y":2, "matrix":[2,8] },
+                {"x":12, "y":2, "matrix":[2,9] },
+                {"x":13, "y":2, "matrix":[2,10] },
+                {"x":14, "y":2, "matrix":[2,11] },
+                {"x":15, "y":2, "matrix":[2,12] },
+                {"x":16, "y":2, "w":2.25, "matrix":[2,13] },
+
+                {"x":1.25, "y":3, "w":2.25, "matrix":[3,1] },
+                {"x":3.5, "y":3, "matrix":[3,2] },
+                {"x":4.5, "y":3, "matrix":[3,3] },
+                {"x":5.5, "y":3, "matrix":[3,4] },
+                {"x":6.5, "y":3, "matrix":[3,5] },
+                {"x":7.5, "y":3, "matrix":[3,6] },
+                {"x":9.5, "y":3, "matrix":[3,7] },
+                {"x":10.5, "y":3, "matrix":[3,8] },
+                {"x":11.5, "y":3, "matrix":[3,9] },
+                {"x":12.5, "y":3, "matrix":[3,10] },
+                {"x":13.5, "y":3, "matrix":[3,11] },
+                {"x":14.5, "y":3, "matrix":[3,12] },
+                {"x":15.5, "y":3, "w":1.75, "matrix":[3,13] },
+                {"x":17.5, "y":3.25, "matrix":[3,14] },
+
+                {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] },
+                {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] },
+                {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] },
+                {"x":8, "y":4, "w":1, "matrix":[4,6] },
+                {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] },
+                {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] },
+                {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] },
+                {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] },
+                {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] }
+            ]
+        },
+
+        "LAYOUT_em8_all": {
+            "layout": [
+                {"x":0, "y":0, "matrix":[1,0] },
+                {"x":1.25, "y":0, "matrix":[0,0] },
+                {"x":2.25, "y":0, "matrix":[0,1] },
+                {"x":3.25, "y":0, "matrix":[0,2] },
+                {"x":4.25, "y":0, "matrix":[0,3] },
+                {"x":5.25, "y":0, "matrix":[0,4] },
+                {"x":6.25, "y":0, "matrix":[0,5] },
+                {"x":7.25, "y":0, "matrix":[0,6] },
+                {"x":10.25, "y":0, "matrix":[0,7] },
+                {"x":11.25, "y":0, "matrix":[0,8] },
+                {"x":12.25, "y":0, "matrix":[0,9] },
+                {"x":13.25, "y":0, "matrix":[0,10] },
+                {"x":14.25, "y":0, "matrix":[0,11] },
+                {"x":15.25, "y":0, "matrix":[0,12] },
+                {"x":16.25, "y":0, "matrix":[0,13] },
+                {"x":17.25, "y":0, "matrix":[4,11] },
+                {"x":18.5, "y":0, "matrix":[0,14] },
+
+                {"x":0, "y":1, "matrix":[2,0] },
+                {"x":1.25, "y":1, "w":1.5, "matrix":[1,1] },
+                {"x":2.75, "y":1, "matrix":[1,2] },
+                {"x":3.75, "y":1, "matrix":[1,3] },
+                {"x":4.75, "y":1, "matrix":[1,4] },
+                {"x":5.75, "y":1, "matrix":[1,5] },
+                {"x":6.75, "y":1, "matrix":[1,6] },
+                {"x":9.75, "y":1, "matrix":[1,7] },
+                {"x":10.75, "y":1, "matrix":[1,8] },
+                {"x":11.75, "y":1, "matrix":[1,9] },
+                {"x":12.75, "y":1, "matrix":[1,10] },
+                {"x":13.75, "y":1, "matrix":[1,11] },
+                {"x":14.75, "y":1, "matrix":[1,12] },
+                {"x":15.75, "y":1, "matrix":[1,13] },
+                {"x":16.75, "y":1, "w":1.5, "matrix":[1,14] },
+                {"x":18.5, "y":1, "matrix":[2,14] },
+
+                {"x":0, "y":2, "matrix":[3,0] },
+                {"x":1.25, "y":2, "w":1.75, "matrix":[2,1] },
+                {"x":3, "y":2, "matrix":[2,2] },
+                {"x":4, "y":2, "matrix":[2,3] },
+                {"x":5, "y":2, "matrix":[2,4] },
+                {"x":6, "y":2, "matrix":[2,5] },
+                {"x":7, "y":2, "matrix":[2,6] },
+                {"x":10, "y":2, "matrix":[2,7] },
+                {"x":11, "y":2, "matrix":[2,8] },
+                {"x":12, "y":2, "matrix":[2,9] },
+                {"x":13, "y":2, "matrix":[2,10] },
+                {"x":14, "y":2, "matrix":[2,11] },
+                {"x":15, "y":2, "matrix":[2,12] },
+                {"x":16, "y":2, "w":2.25, "matrix":[2,13] },
+
+                {"x":1.25, "y":3, "w":2.25, "matrix":[3,1] },
+                {"x":3.5, "y":3, "matrix":[3,2] },
+                {"x":4.5, "y":3, "matrix":[3,3] },
+                {"x":5.5, "y":3, "matrix":[3,4] },
+                {"x":6.5, "y":3, "matrix":[3,5] },
+                {"x":7.5, "y":3, "matrix":[3,6] },
+                {"x":9.5, "y":3, "matrix":[3,7] },
+                {"x":10.5, "y":3, "matrix":[3,8] },
+                {"x":11.5, "y":3, "matrix":[3,9] },
+                {"x":12.5, "y":3, "matrix":[3,10] },
+                {"x":13.5, "y":3, "matrix":[3,11] },
+                {"x":14.5, "y":3, "matrix":[3,12] },
+                {"x":15.5, "y":3, "w":1.75, "matrix":[3,13] },
+                {"x":17.5, "y":3.25, "matrix":[3,14] },
+
+                {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] },
+                {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] },
+                {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] },
+                {"x":8, "y":4, "w":1, "matrix":[4,6] },
+                {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] },
+                {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] },
+                {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] },
+                {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] },
+                {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/linworks/em8/keymaps/default/keymap.c b/keyboards/linworks/em8/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f195907db9
--- /dev/null
+++ b/keyboards/linworks/em8/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2022 Moritz Plattner
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_em8_all(
+    KC_ESC,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,
+    KC_PGUP,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,      KC_BSLS,        KC_DEL,
+    KC_PGDN,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,                KC_ENT,
+              KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,
+              KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),              KC_SPC,             KC_RALT,                                KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_em8_all(
+    KC_TRNS,  KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,        KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS,
+              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_VOLU,
+              KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,                                KC_MPRV,  KC_VOLD,  KC_MNXT
+  ),
+
+  [2] = LAYOUT_em8_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,        KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS,
+              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+              KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+
+  [3] = LAYOUT_em8_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,        KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS,
+              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+              KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS
+  )
+};
diff --git a/keyboards/linworks/em8/keymaps/via/keymap.c b/keyboards/linworks/em8/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f195907db9
--- /dev/null
+++ b/keyboards/linworks/em8/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2022 Moritz Plattner
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_em8_all(
+    KC_ESC,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,
+    KC_PGUP,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,      KC_BSLS,        KC_DEL,
+    KC_PGDN,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,                KC_ENT,
+              KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,
+              KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),              KC_SPC,             KC_RALT,                                KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_em8_all(
+    KC_TRNS,  KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,        KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS,
+              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_VOLU,
+              KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,                                KC_MPRV,  KC_VOLD,  KC_MNXT
+  ),
+
+  [2] = LAYOUT_em8_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,        KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS,
+              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+              KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+
+  [3] = LAYOUT_em8_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,        KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS,
+              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+              KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS
+  )
+};
diff --git a/keyboards/linworks/em8/keymaps/via/rules.mk b/keyboards/linworks/em8/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/linworks/em8/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/linworks/em8/readme.md b/keyboards/linworks/em8/readme.md
new file mode 100644
index 0000000000..cd8f6a5ba3
--- /dev/null
+++ b/keyboards/linworks/em8/readme.md
@@ -0,0 +1,22 @@
+# EM.8
+
+The Ergonomic Modified 8 is a tented ergonomic keyboard and the successor to the EM.7, designed by Syryan and Lx3.The default PCB supports hotswap and the layout options are limited to split or regular backpsace, as well as regular or stepped caps lock.
+
+* Keyboard maintainer: [ebastler](https://github.com/ebastler)
+* Hardware supported: Lin EM.8
+* Hardware availability: Groupbuy. More infos on [the Linworks Discord](https://discord.gg/UC8gTdVnsj)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make linworks/em8:default
+
+Flash example for this keyboard:
+
+    make linworks/em8:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+
+## How to enter the bootloader
+* **Bootmagic reset**: Hold down the key `ESC` key and plug in the keyboard (Top left most switch). On older firmware revisions, `~` (top left most switch of the alpha cluster) may be needed instead.
+* **Physical reset button**: Briefly press the button on the back of the PCB
\ No newline at end of file
diff --git a/keyboards/linworks/em8/rules.mk b/keyboards/linworks/em8/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/linworks/em8/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 7c49b8caa989b34886847689d992827eeaa9c895 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Mon, 12 Sep 2022 16:32:52 -0400
Subject: [PATCH 343/959] Adapt to unicode refactoring (#18345)

---
 users/spidey3/rules.mk                         | 2 +-
 users/spidey3/spidey3.h                        | 2 +-
 users/spidey3/{unicode.c => spidey3_unicode.c} | 2 +-
 users/spidey3/{unicode.h => spidey3_unicode.h} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename users/spidey3/{unicode.c => spidey3_unicode.c} (96%)
 rename users/spidey3/{unicode.h => spidey3_unicode.h} (100%)

diff --git a/users/spidey3/rules.mk b/users/spidey3/rules.mk
index c95582e176..35cfdb4187 100644
--- a/users/spidey3/rules.mk
+++ b/users/spidey3/rules.mk
@@ -11,5 +11,5 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
   SRC += layer_rgb.c
 endif
 ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
-  SRC += unicode.c
+  SRC += spidey3_unicode.c
 endif
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index 7a9407969e..e344b08895 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -6,7 +6,7 @@
 #include QMK_KEYBOARD_H
 
 #ifdef UNICODEMAP_ENABLE
-#    include "unicode.h"
+#    include "spidey3_unicode.h"
 #endif
 
 enum userspace_layers {
diff --git a/users/spidey3/unicode.c b/users/spidey3/spidey3_unicode.c
similarity index 96%
rename from users/spidey3/unicode.c
rename to users/spidey3/spidey3_unicode.c
index 5292b0809b..c2804d8805 100644
--- a/users/spidey3/unicode.c
+++ b/users/spidey3/spidey3_unicode.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 
-#include "unicode.h"
+#include "spidey3_unicode.h"
 
 const uint32_t PROGMEM unicode_map[] = {
     [BUL1]     = 0x2022,   // •
diff --git a/users/spidey3/unicode.h b/users/spidey3/spidey3_unicode.h
similarity index 100%
rename from users/spidey3/unicode.h
rename to users/spidey3/spidey3_unicode.h

From b2ad047d7f09be14667927d058b36737d8248994 Mon Sep 17 00:00:00 2001
From: Purdea Andrei <andrei@purdea.ro>
Date: Tue, 13 Sep 2022 01:10:17 +0300
Subject: [PATCH 344/959] Fix keyboard_name for Unicomp Classic/Ultra Classic
 keyboards (#18327)

---
 keyboards/unicomp/classic_ultracl_post_2013/info.json | 2 +-
 keyboards/unicomp/classic_ultracl_pre_2013/info.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json
index fa1a563970..bfb70eb880 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Unicomp Spacesaver M", 
+    "keyboard_name": "Unicomp Classic / Ultra Classic (post-2013)", 
     "manufacturer": "Unicomp/Purdea Andrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", 
     "maintainer": "purdeaandrei", 
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index d7f8e9dcbf..618a7c1c46 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Unicomp Spacesaver M", 
+    "keyboard_name": "Unicomp Classic / Ultra Classic (pre-2013)", 
     "manufacturer": "Unicomp/Purdea Andrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", 
     "maintainer": "purdeaandrei", 

From 2800cd31ae5312c3057e7fb0aa5480aaaf8e541d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 21:10:52 +1000
Subject: [PATCH 345/959] Bump anothrNick/github-tag-action from 1.39.0 to
 1.42.0 (#18344)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto_tag.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index aa6576947c..598613a0fd 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.39.0
+      uses: anothrNick/github-tag-action@1.42.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

From 6984c6d3b3b19c00089cad385f21e751a31b4409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reibl=20J=C3=A1nos=20D=C3=A1niel?=
 <janos.daniel.reibl@protonmail.com>
Date: Wed, 14 Sep 2022 02:20:34 +0200
Subject: [PATCH 346/959] fix: Remove TERM_ON/TERM_OFF from my keymap (#18354)

---
 layouts/community/ortho_5x12/riblee/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index 5a07fa09ad..8ccdf41da6 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,    KC_F12,
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, KC_INS,  KC_PSCR,   KC_DEL,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  KC_INS,  KC_PSCR,   KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  HUNGARIAN, WORKMAN,
     _______, _______, _______, _______, UC_MOD,  UC_RMOD, NK_TOGG, CG_NORM, CG_SWAP,  _______, _______,   _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______

From 23666150e968cd7518db77b837a7f0895a8ec063 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 10:36:20 +1000
Subject: [PATCH 347/959] Bump anothrNick/github-tag-action from 1.42.0 to
 1.45.0 (#18355)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto_tag.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index 598613a0fd..0e46cb6b13 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.42.0
+      uses: anothrNick/github-tag-action@1.45.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

From fc3f2dcb43f2aacdac017ac6c3f0b6ac0241162a Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Wed, 14 Sep 2022 23:16:54 +0800
Subject: [PATCH 348/959] [Keyboard] Replace Nayeon ATmega32u4 config with
 RP2040 (#18265)

---
 keyboards/abatskeyboardclub/nayeon/config.h   | 113 +-----------------
 keyboards/abatskeyboardclub/nayeon/info.json  |  15 ++-
 .../nayeon/keymaps/default/keymap.c           |  34 ------
 .../nayeon/keymaps/iso/keymap.c               |  34 ------
 .../nayeon/keymaps/via/keymap.c               |  34 ------
 keyboards/abatskeyboardclub/nayeon/nayeon.c   |  27 +++++
 keyboards/abatskeyboardclub/nayeon/readme.md  |   2 +-
 keyboards/abatskeyboardclub/nayeon/rules.mk   |  21 ++--
 8 files changed, 54 insertions(+), 226 deletions(-)

diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h
index cb591b8e24..449f2da113 100644
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ b/keyboards/abatskeyboardclub/nayeon/config.h
@@ -19,111 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
-#    define RGBLED_NUM 26
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== or choose animations ==*/
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_EFFECT_ALTERNATING
-/*== 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 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * 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
-
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
+/* RGB Matrix setup */
+#define RGB_DI_PIN GP19
+#define DRIVER_LED_TOTAL 2
+#define RGBLED_NUM 2
+#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json
index acba956b06..8cafe5aebf 100644
--- a/keyboards/abatskeyboardclub/nayeon/info.json
+++ b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -7,10 +7,23 @@
         "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi_tsangan",
         "LAYOUT_iso": "LAYOUT_tkl_f13_iso_tsangan"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": false
+    },
     "usb": {
         "vid": "0x4B47",
         "pid": "0x0001",
-        "device_version": "0.0.1"
+        "device_version": "2.0.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12", "GP11", "GP5"],
+        "rows": ["GP0", "GP1", "GP2", "GP21", "GP3", "GP4"]
     },
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
diff --git a/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c b/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c
index 3ea63b5b24..134fbd4972 100644
--- a/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c
+++ b/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c
@@ -25,37 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_OFF},
-    {1, 1, HSV_OFF}
-);
-
-const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 1, HSV_OFF}
-);
-
-const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_OFF}
-);
-
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl);
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = rgb_layers;
-}
-
-bool led_update_user(led_t led_state) {
-    uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock;
-    for (uint8_t i=0; i<3; i++) {
-        rgblight_set_layer_state(i, false);
-    }
-    if (lock_bits < 3) {
-        rgblight_set_layer_state(lock_bits, true);
-    }
-
-    return false;
-}
-#endif
diff --git a/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c b/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c
index ae81182acc..74e74207a3 100644
--- a/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c
+++ b/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c
@@ -25,37 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_OFF},
-    {1, 1, HSV_OFF}
-);
-
-const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 1, HSV_OFF}
-);
-
-const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_OFF}
-);
-
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl);
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = rgb_layers;
-}
-
-bool led_update_user(led_t led_state) {
-    uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock;
-    for (uint8_t i=0; i<3; i++) {
-        rgblight_set_layer_state(i, false);
-    }
-    if (lock_bits < 3) {
-        rgblight_set_layer_state(lock_bits, true);
-    }
-
-    return false;
-}
-#endif
diff --git a/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c b/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c
index a212b820f4..062b05ec49 100644
--- a/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c
+++ b/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c
@@ -49,37 +49,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                                     _______, _______, _______,          _______, _______, _______
     )
 };
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_OFF},
-    {1, 1, HSV_OFF}
-);
-
-const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 1, HSV_OFF}
-);
-
-const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_OFF}
-);
-
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl);
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = rgb_layers;
-}
-
-bool led_update_user(led_t led_state) {
-    uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock;
-    for (uint8_t i=0; i<3; i++) {
-        rgblight_set_layer_state(i, false);
-    }
-    if (lock_bits < 3) {
-        rgblight_set_layer_state(lock_bits, true);
-    }
-
-    return false;
-}
-#endif
diff --git a/keyboards/abatskeyboardclub/nayeon/nayeon.c b/keyboards/abatskeyboardclub/nayeon/nayeon.c
index 14fb22a486..6f367d3ed6 100644
--- a/keyboards/abatskeyboardclub/nayeon/nayeon.c
+++ b/keyboards/abatskeyboardclub/nayeon/nayeon.c
@@ -15,3 +15,30 @@
  */
 
 #include "nayeon.h"
+
+led_config_t g_led_config = {{
+    // Key Matrix to LED Index
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      1, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    {      0, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
+}, {
+    // LED Index to Physical Position
+    { 5, 40 }, { 211, 0 }
+}, {
+    // LED Index to Flag
+    LED_FLAG_INDICATOR, LED_FLAG_INDICATOR
+}};
+
+void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
+    }
+    if (!host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
+    }
+
+    rgb_matrix_indicators_advanced_user(led_min, led_max);
+}
diff --git a/keyboards/abatskeyboardclub/nayeon/readme.md b/keyboards/abatskeyboardclub/nayeon/readme.md
index f88c1e187d..7c7c91c1f1 100644
--- a/keyboards/abatskeyboardclub/nayeon/readme.md
+++ b/keyboards/abatskeyboardclub/nayeon/readme.md
@@ -5,7 +5,7 @@
 Nayeon is a screwless TKL keyboard with an extra key, inspired by a K-pop artist named Im-Nayeon.
 
 * Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
-* Hardware Supported: ATmega32u4
+* Hardware Supported: RP2040
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk
index e94c1ace18..d106ef4d6a 100644
--- a/keyboards/abatskeyboardclub/nayeon/rules.mk
+++ b/keyboards/abatskeyboardclub/nayeon/rules.mk
@@ -1,20 +1,13 @@
 # MCU name
-MCU = atmega32u4
+MCU = RP2040
 
 # Bootloader selection
-BOOTLOADER = atmel-dfu
+BOOTLOADER = rp2040
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# RGB Matrix
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+WS2812_DRIVER = vendor
 
 LAYOUTS = tkl_f13_ansi_tsangan tkl_f13_ansi_tsangan_split_bs_rshift tkl_f13_iso_tsangan tkl_f13_iso_tsangan_split_bs_rshift
+

From 87b1b560cbacdadd277450a29e214b35ecacd7c3 Mon Sep 17 00:00:00 2001
From: satorusaka <40286047+satorusaka@users.noreply.github.com>
Date: Wed, 14 Sep 2022 23:40:18 +0800
Subject: [PATCH 349/959] [Keyboard] Add skmt/15k keyboard (#18321)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/skmt/15k/config.h                 | 79 +++++++++++++++++++++
 keyboards/skmt/15k/info.json                | 68 ++++++++++++++++++
 keyboards/skmt/15k/keymaps/default/keymap.c | 26 +++++++
 keyboards/skmt/15k/keymaps/fns/keymap.c     | 25 +++++++
 keyboards/skmt/15k/keymaps/qwert/keymap.c   | 25 +++++++
 keyboards/skmt/15k/keymaps/via/keymap.c     | 35 +++++++++
 keyboards/skmt/15k/keymaps/via/rules.mk     |  1 +
 keyboards/skmt/15k/readme.md                | 26 +++++++
 keyboards/skmt/15k/rules.mk                 |  3 +
 9 files changed, 288 insertions(+)
 create mode 100644 keyboards/skmt/15k/config.h
 create mode 100644 keyboards/skmt/15k/info.json
 create mode 100644 keyboards/skmt/15k/keymaps/default/keymap.c
 create mode 100644 keyboards/skmt/15k/keymaps/fns/keymap.c
 create mode 100644 keyboards/skmt/15k/keymaps/qwert/keymap.c
 create mode 100644 keyboards/skmt/15k/keymaps/via/keymap.c
 create mode 100644 keyboards/skmt/15k/keymaps/via/rules.mk
 create mode 100644 keyboards/skmt/15k/readme.md
 create mode 100644 keyboards/skmt/15k/rules.mk

diff --git a/keyboards/skmt/15k/config.h b/keyboards/skmt/15k/config.h
new file mode 100644
index 0000000000..6144e332ea
--- /dev/null
+++ b/keyboards/skmt/15k/config.h
@@ -0,0 +1,79 @@
+// Copyright 2022 Jimmy Lye (@satorusaka)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define FORCE_NKRO
+
+#define RGB_DI_PIN GP1 // RGB LED pin
+#define RGBLED_NUM 15 // Number of LEDs
+#define DRIVER_LED_TOTAL 15 // Number of LEDs
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16
+#define RGB_MATRIX_KEYPRESSES
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json
new file mode 100644
index 0000000000..71f3bc24d7
--- /dev/null
+++ b/keyboards/skmt/15k/info.json
@@ -0,0 +1,68 @@
+{
+    "manufacturer": "SKMT",
+    "keyboard_name": "SKMT 15k",
+    "maintainer": "satorusaka",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
+        "rows": ["GP7", "GP8", "GP9"]
+        },
+    "processor": "RP2040",
+    "url": "https://github.com/satorusaka/15k-macropad",
+    "usb": {
+        "device_version": "1.1.0",
+        "pid": "0x3488",
+        "vid": "0xFEFE"
+    },
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [1, 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": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 }
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 4, "matrix": [2, 4], "x": 224, "y": 64 },
+            { "flags": 4, "matrix": [2, 3], "x": 168, "y": 64 },
+            { "flags": 4, "matrix": [2, 2], "x": 112, "y": 64 },
+            { "flags": 4, "matrix": [2, 1], "x": 56, "y": 64 },
+            { "flags": 4, "matrix": [2, 0], "x": 0, "y": 64 },
+            { "flags": 4, "matrix": [1, 4], "x": 224, "y": 32 },
+            { "flags": 4, "matrix": [1, 3], "x": 168, "y": 32 },
+            { "flags": 4, "matrix": [1, 2], "x": 112, "y": 32 },
+            { "flags": 4, "matrix": [1, 1], "x": 56, "y": 32 },
+            { "flags": 4, "matrix": [1, 0], "x": 0, "y": 32 },
+            { "flags": 4, "matrix": [0, 4], "x": 224, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 168, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 112, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 56, "y": 0 },
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }
+        ]
+    }
+}
diff --git a/keyboards/skmt/15k/keymaps/default/keymap.c b/keyboards/skmt/15k/keymaps/default/keymap.c
new file mode 100644
index 0000000000..bc34dd7ca2
--- /dev/null
+++ b/keyboards/skmt/15k/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+// Copyright 2022 Jimmy Lye (@satorusaka)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌────┬───┬───┬───┬────┐
+     * │ F3 │ 9 │ 6 │ 3 │ fn │
+     * ├────┼───┼───┼───┼────┤
+     * │ F2 │ 8 │ 5 │ 2 │ .  │
+     * ├────┼───┼───┼───┼────┤
+     * │ F1 │ 7 │ 4 │ 1 │ O  │
+     * └────┴───┴───┴───┴────┘
+     */
+    [0] = LAYOUT_default(
+        KC_F3,   KC_KP_9,   KC_KP_6,   KC_KP_3,   LT(1, KC_KP_ENTER),
+        KC_F2,   KC_KP_8,   KC_KP_5,   KC_KP_2,   KC_KP_DOT,
+        KC_F1,   KC_KP_7,   KC_KP_4,   KC_KP_1,   KC_KP_0
+    ),
+    [1] = LAYOUT_default(
+        RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
+        RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
+    )
+};
diff --git a/keyboards/skmt/15k/keymaps/fns/keymap.c b/keyboards/skmt/15k/keymaps/fns/keymap.c
new file mode 100644
index 0000000000..8933260d5f
--- /dev/null
+++ b/keyboards/skmt/15k/keymaps/fns/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 Jimmy Lye (@satorusaka)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌────┬───┬───┬───┬────┐
+     * │ F3 │ 9 │ 6 │ 3 │ fn │
+     * ├────┼───┼───┼───┼────┤
+     * │ F2 │ 8 │ 5 │ 2 │ .  │
+     * ├────┼───┼───┼───┼────┤
+     * │ F1 │ 7 │ 4 │ 1 │ O  │
+     * └────┴───┴───┴───┴────┘
+     */
+    [0] = LAYOUT_default(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   LT(1, KC_KB_MUTE),
+        KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_KB_VOLUME_UP,
+        KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_KB_VOLUME_DOWN
+    ),
+    [1] = LAYOUT_default(
+        RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
+        RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
+    )
+};
diff --git a/keyboards/skmt/15k/keymaps/qwert/keymap.c b/keyboards/skmt/15k/keymaps/qwert/keymap.c
new file mode 100644
index 0000000000..16464c93bc
--- /dev/null
+++ b/keyboards/skmt/15k/keymaps/qwert/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 Jimmy Lye (@satorusaka)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬─────────────────────┐
+     * │ Q │ W │ E │ R │ BACKSPACE (LAYER 1) │
+     * ├───┼───┼───┼───┼─────────────────────┤
+     * │ A │ S │ D │ F │ ENTER               │
+     * ├───┼───┼───┼───┼─────────────────────┤
+     * │ Z │ X │ C │ V │ SPACE               │
+     * └───┴───┴───┴───┴─────────────────────┘
+     */
+    [0] = LAYOUT_default(
+        KC_Q,   KC_W,   KC_E,   KC_R,   LT(1, KC_BSPC),
+        KC_A,   KC_S,   KC_D,   KC_F,   KC_ENT,
+        KC_Z,   KC_X,   KC_C,   KC_V,   KC_SPC
+    ),
+    [1] = LAYOUT_default(
+        RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
+        RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
+    )
+};
diff --git a/keyboards/skmt/15k/keymaps/via/keymap.c b/keyboards/skmt/15k/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d0384efba0
--- /dev/null
+++ b/keyboards/skmt/15k/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2022 Jimmy Lye (@satorusaka)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬─────────────────────┐
+     * │ Q │ W │ E │ R │ BACKSPACE (LAYER 1) │
+     * ├───┼───┼───┼───┼─────────────────────┤
+     * │ A │ S │ D │ F │ ENTER               │
+     * ├───┼───┼───┼───┼─────────────────────┤
+     * │ Z │ X │ C │ V │ SPACE               │
+     * └───┴───┴───┴───┴─────────────────────┘
+     */
+    [0] = LAYOUT_default(
+        KC_Q,   KC_W,   KC_E,   KC_R,   LT(1, KC_BSPC),
+        KC_A,   KC_S,   KC_D,   KC_F,   LT(2, KC_ENT),
+        KC_Z,   KC_X,   KC_C,   KC_V,   LT(3, KC_SPC)
+    ),
+    [1] = LAYOUT_default(
+        RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
+        RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
+    ),
+    [2] = LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,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_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+    )
+};
diff --git a/keyboards/skmt/15k/keymaps/via/rules.mk b/keyboards/skmt/15k/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/skmt/15k/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/skmt/15k/readme.md b/keyboards/skmt/15k/readme.md
new file mode 100644
index 0000000000..679fb76ca0
--- /dev/null
+++ b/keyboards/skmt/15k/readme.md
@@ -0,0 +1,26 @@
+# skmt_15k_macropad
+
+![skmt_15k_macropad](https://i.imgur.com/Sl6t4Lmh.jpg)
+![skmt_15k_macropad](https://i.imgur.com/SihSIVth.jpg)
+
+A diy, 3d-printed, 15 key (3x5), hotswap, RGB macropad.
+
+* Keyboard Maintainer: [Jimmy Lye](https://github.com/satorusaka)
+* Hardware Supported: skmt_15k_macropad on rpi pico
+* Hardware Availability: [satorusaka/15k-macropad](https://github.com/satorusaka/15k-macropad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make skmt/15k:default
+
+Flashing example for this keyboard:
+
+    make skmt/15k:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
diff --git a/keyboards/skmt/15k/rules.mk b/keyboards/skmt/15k/rules.mk
new file mode 100644
index 0000000000..848cfec5a3
--- /dev/null
+++ b/keyboards/skmt/15k/rules.mk
@@ -0,0 +1,3 @@
+WS2812_DRIVER = vendor
+
+LTO_ENABLE = yes

From 083ac400e21baefc3d629e28226d5953e473f483 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 14 Sep 2022 08:59:17 -0700
Subject: [PATCH 350/959] GeonWorks Frog Mini Soldered Layout Rework (#18308)

---
 keyboards/geonworks/frogmini/fms/fms.h        |  292 ++++-
 keyboards/geonworks/frogmini/fms/info.json    | 1165 ++++++++++++++++-
 .../frogmini/fms/keymaps/default/keymap.c     |   24 +-
 .../keymap.c                                  |   47 +
 .../default_60_hhkb_10u_space/keymap.c        |   47 +
 .../keymap.c                                  |   47 +
 .../frogmini/fms/keymaps/via/keymap.c         |   24 +-
 7 files changed, 1589 insertions(+), 57 deletions(-)
 create mode 100644 keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c
 create mode 100644 keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c
 create mode 100644 keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c

diff --git a/keyboards/geonworks/frogmini/fms/fms.h b/keyboards/geonworks/frogmini/fms/fms.h
index de3ee90f6f..89880a3c64 100644
--- a/keyboards/geonworks/frogmini/fms/fms.h
+++ b/keyboards/geonworks/frogmini/fms/fms.h
@@ -19,12 +19,44 @@
 
 #include "quantum.h"
 
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │5D │      │0E     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │     │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   │3C        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
+ *              │40  │41  │42  │56                      │59  │5A  │5B  │5C  │ Standard
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │40   │41 │42   │56                         │59   │5B │5C   │ Tsangan/WKL/HHKB
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │40   │   │42   │56                         │59   │   │5C   │ WKL
+ *              └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+ *                    ┌───┬─────┬───────────────────────────┬─────┬───┐
+ *                    │41 │42   │56                         │59   │5B │ ˂──── HHKB
+ *                    └───┴─────┴───────────────────────────┴─────┴───┘
+ *              ┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+ *              │40   │41 │56                                     │5B │5C   │ Tsangan 10u Space
+ *              └─────┴───┴───────────────────────────────────────┴───┴─────┘
+ *              ┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+ *              │40   │   │56                                     │   │5C   │ WKL 10u Space
+ *              └─────┘   └───────────────────────────────────────┘   └─────┘
+ *                    ┌───┬───────────────────────────────────────┬───┐
+ *                    │41 │56                                     │5B │ ˂──── HHKB 10u Space
+ *                    └───┴───────────────────────────────────────┴───┘
+ */
+
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K40, K41, K42,                K56,           K59, K5A, K5B, K5C, K5D  \
+    K40, K41, K42,                K56,                K59, K5A, K5B, K5C  \
 )\
 {\
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
@@ -34,3 +66,259 @@
     { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
     { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, K5D }  \
 }
+
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K56,                K59, K5A, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, ___ }  \
+}
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K56,                K59, K5A, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, K5D }  \
+}
+
+#define LAYOUT_60_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K56,                     K59, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, K5B, K5C, ___ }  \
+}
+
+#define LAYOUT_60_tsangan_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K56,                     K59, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, K5B, K5C, K5D }  \
+}
+
+#define LAYOUT_60_ansi_wkl( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40,      K42,                K56,                     K59,      K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, ___, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, ___, K5C, ___ }  \
+}
+
+#define LAYOUT_60_ansi_wkl_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40,      K42,                K56,                     K59,      K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, ___, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, ___, K5C, K5D }  \
+}
+
+#define LAYOUT_60_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+         K41, K42,                K56,                     K59, K5B       \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { ___, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, K5B, ___, K5D }  \
+}
+
+#define LAYOUT_60_tsangan_hhkb_10u_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41,                     K56,                          K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D }  \
+}
+
+#define LAYOUT_60_hhkb_10u_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+         K41,                     K56,                          K5B       \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { ___, K41, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, ___, K5B, ___, K5D }  \
+}
+
+#define LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40,                          K56,                               K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, ___, ___, K5C, K5D }  \
+}
+
+#define LAYOUT_60_iso( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K56,                K59, K5A, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, ___ }  \
+}
+
+#define LAYOUT_60_iso_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K56,                K59, K5A, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, K5D }  \
+}
+
+#define LAYOUT_60_iso_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K56,                     K59, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, K5B, K5C, ___ }  \
+}
+
+#define LAYOUT_60_iso_tsangan_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K56,                     K59, K5B, K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, K5B, K5C, K5D }  \
+}
+
+#define LAYOUT_60_iso_wkl( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40,      K42,                K56,                     K59,      K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, ___, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, ___, K5C, ___ }  \
+}
+
+#define LAYOUT_60_iso_wkl_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40,      K42,                K56,                     K59,      K5C  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, ___, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K56, ___, ___, K59, ___, ___, K5C, K5D }  \
+}
diff --git a/keyboards/geonworks/frogmini/fms/info.json b/keyboards/geonworks/frogmini/fms/info.json
index 05210ca2a5..34f7f63251 100644
--- a/keyboards/geonworks/frogmini/fms/info.json
+++ b/keyboards/geonworks/frogmini/fms/info.json
@@ -1,30 +1,32 @@
 {
-    "keyboard_name": "Frog Mini FM-S", 
+    "keyboard_name": "Frog Mini FM-S",
     "manufacturer": "GeonWorks",
-    "url": "https://geon.works/", 
-    "maintainer": "gondolindrim", 
+    "url": "https://geon.works/",
+    "maintainer": "gondolindrim",
     "usb": {
         "vid": "0x6777",
         "pid": "0x2D33",
-        "device_version": "0.0.1",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
-            "layout": [ 
+            "layout": [
                 {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
                 {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
                 {"label":"W", "x":2.5, "y":1},
@@ -36,9 +38,10 @@
                 {"label":"I", "x":8.5, "y":1},
                 {"label":"O", "x":9.5, "y":1},
                 {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
                 {"label":"Caps", "x":0, "y":2, "w":1.75},
                 {"label":"A", "x":1.75, "y":2},
                 {"label":"S", "x":2.75, "y":2},
@@ -49,12 +52,13 @@
                 {"label":"J", "x":7.75, "y":2},
                 {"label":"K", "x":8.75, "y":2},
                 {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"x":12.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
                 {"label":"Enter", "x":13.75, "y":2, "w":1.25},
+
                 {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
+                {"label":"\\|", "x":1.25, "y":3},
                 {"label":"Z", "x":2.25, "y":3},
                 {"label":"X", "x":3.25, "y":3},
                 {"label":"C", "x":4.25, "y":3},
@@ -62,20 +66,1119 @@
                 {"label":"B", "x":6.25, "y":3},
                 {"label":"N", "x":7.25, "y":3},
                 {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
                 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
+                {"label":"Fn", "x":14, "y":3},
+
                 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
                 {"label":"Win", "x":1.25, "y":4, "w":1.25},
                 {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
                 {"label":"Alt", "x":10, "y":4, "w":1.25},
                 {"label":"Win", "x":11.25, "y":4, "w":1.25},
                 {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25},
-                {"label":"Bksp", "x":14, "y":0}]
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Menu", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Menu", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Menu", "x":12.5, "y":4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb_10u_space": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Space", "x":2.5, "y":4, "w":10},
+                {"label":"Menu", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb_10u_space": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Space", "x":2.5, "y":4, "w":10},
+                {"label":"Menu", "x":12.5, "y":4}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Space", "x":2.5, "y":4, "w":10},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Menu", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Menu", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+
+                {"label":"Caps", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'@", "x":11.75, "y":2},
+                {"label":"#~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
index 1a259ce3ed..e09b7d830d 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
@@ -17,31 +17,31 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC , KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, 
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, 
-    KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENT , 
-    KC_LSFT,  KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,  MO(1),   
-    KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_RCTL,  KC_BSPC         
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
 ),
 [1] = LAYOUT_all(
-    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,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 ),
 [2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 ),
 [3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
-) 
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+)
 };
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c
new file mode 100644
index 0000000000..49a78a3382
--- /dev/null
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space( /* Base */
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_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_SPC,                                                        KC_RCTL
+),
+[1] = LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,                                              KC_TRNS,                                                       KC_TRNS
+),
+[2] = LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,                                              KC_TRNS,                                                       KC_TRNS
+),
+[3] = LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,                                              KC_TRNS,                                                       KC_TRNS
+)
+};
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c
new file mode 100644
index 0000000000..bcb4ea1aea
--- /dev/null
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_60_hhkb_10u_space( /* Base */
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+             KC_LGUI,                                     KC_SPC,                                               MO(1)
+),
+[1] = LAYOUT_60_hhkb_10u_space(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS,                                     KC_TRNS,                                              KC_TRNS
+),
+[2] = LAYOUT_60_hhkb_10u_space(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, 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_10u_space(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS,                                     KC_TRNS,                                              KC_TRNS
+)
+};
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c
new file mode 100644
index 0000000000..384669101d
--- /dev/null
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_60_tsangan_hhkb_10u_space( /* Base */
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_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_SPC,                                               MO(1),   KC_RCTL
+),
+[1] = LAYOUT_60_tsangan_hhkb_10u_space(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,                                     KC_TRNS,                                              KC_TRNS, KC_TRNS
+),
+[2] = LAYOUT_60_tsangan_hhkb_10u_space(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_tsangan_hhkb_10u_space(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,                                     KC_TRNS,                                              KC_TRNS, KC_TRNS
+)
+};
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
index 1a259ce3ed..e09b7d830d 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
@@ -17,31 +17,31 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC , KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, 
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, 
-    KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENT , 
-    KC_LSFT,  KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,  MO(1),   
-    KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_RCTL,  KC_BSPC         
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
 ),
 [1] = LAYOUT_all(
-    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,
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 ),
 [2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 ),
 [3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS        
-) 
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+)
 };

From 624ab64750ed05e6da46ce3c261e97c7e39c6206 Mon Sep 17 00:00:00 2001
From: jels <66403163+Jels02@users.noreply.github.com>
Date: Thu, 15 Sep 2022 03:56:09 +1000
Subject: [PATCH 351/959] [Keyboard] Add Calice (#17929)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/qwertlekeys/calice/calice.c         | 17 ++++
 keyboards/qwertlekeys/calice/calice.h         | 44 +++++++++
 keyboards/qwertlekeys/calice/config.h         | 47 +++++++++
 keyboards/qwertlekeys/calice/info.json        | 98 +++++++++++++++++++
 .../calice/keymaps/default/keymap.c           | 38 +++++++
 .../qwertlekeys/calice/keymaps/via/keymap.c   | 54 ++++++++++
 .../qwertlekeys/calice/keymaps/via/rules.mk   |  1 +
 keyboards/qwertlekeys/calice/readme.md        | 23 +++++
 keyboards/qwertlekeys/calice/rules.mk         | 19 ++++
 9 files changed, 341 insertions(+)
 create mode 100644 keyboards/qwertlekeys/calice/calice.c
 create mode 100644 keyboards/qwertlekeys/calice/calice.h
 create mode 100644 keyboards/qwertlekeys/calice/config.h
 create mode 100644 keyboards/qwertlekeys/calice/info.json
 create mode 100644 keyboards/qwertlekeys/calice/keymaps/default/keymap.c
 create mode 100644 keyboards/qwertlekeys/calice/keymaps/via/keymap.c
 create mode 100644 keyboards/qwertlekeys/calice/keymaps/via/rules.mk
 create mode 100644 keyboards/qwertlekeys/calice/readme.md
 create mode 100644 keyboards/qwertlekeys/calice/rules.mk

diff --git a/keyboards/qwertlekeys/calice/calice.c b/keyboards/qwertlekeys/calice/calice.c
new file mode 100644
index 0000000000..d284544964
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/calice.c
@@ -0,0 +1,17 @@
+/*  copyright 2021 Joah Nelson (jels)
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERAHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General 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 "calice.h"
diff --git a/keyboards/qwertlekeys/calice/calice.h b/keyboards/qwertlekeys/calice/calice.h
new file mode 100644
index 0000000000..e418266dd9
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/calice.h
@@ -0,0 +1,44 @@
+/*  copyright 2021 Joah Nelson (jels)
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERAHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define ____ KC_NO
+
+
+#define LAYOUT_all( \
+    K0B0, K0A0, K0B1, K0A1, K0B2, K0A2, K0B3, K0A4, K0B4, K0A5, K0B5, K0A6, K0B6, K0A7, K0B7, \
+    K1B0, K1A0, K1B1, K1A1, K1B2, K1A2, K1B3, K1A4, K1B4, K1A5, K1B5, K1A6, K1B6, K2B6, K1A7, K1B7, \
+    K2B0, K2A0, K2B1, K2A1, K2B2, K2A2, K2B3, K2A4, K2B4, K2A5, K2B5, K2A6, K3B6, K2A7, K2B7, \
+    K3B0, K3A0, K3B1, K3A1, K3B2, K3A2, K3B3, K3A4, K3B4, K3A5, K3B5, K3A6, K3A7, K3B7, \
+    K4B0, K4A0, K4B1, K4A1, K4B2, K4A2, K4B3, K4A4, K4B4, K4A5, K4B5, K4A6, K4B6, K4A7, \
+    K5B0,       K5A0,       K5B2, K5A2,       K5A4,       K5A5,             K5B6, K5A7, K5B7 \
+){ \
+    {K0A0, K0A1, K0A2, ____, K0A4, K0A5, K0A6, K0A7}, \
+    {K0B0, K0B1, K0B2, K0B3, K0B4, K0B5, K0B6, K0B7}, \
+    {K1A0, K1A1, K1A2, ____, K1A4, K1A5, K1A6, K1A7}, \
+    {K1B0, K1B1, K1B2, K1B3, K1B4, K1B5, K1B6, K1B7}, \
+    {K2A0, K2A1, K2A2, ____, K2A4, K2A5, K2A6, K2A7}, \
+    {K2B0, K2B1, K2B2, K2B3, K2B4, K2B5, K2B6, K2B7}, \
+    {K3A0, K3A1, K3A2, ____, K3A4, K3A5, K3A6, K3A7}, \
+    {K3B0, K3B1, K3B2, K3B3, K3B4, K3B5, K3B6, K3B7}, \
+    {K4A0, K4A1, K4A2, ____, K4A4, K4A5, K4A6, K4A7}, \
+    {K4B0, K4B1, K4B2, K4B3, K4B4, K4B5, K4B6, ____}, \
+    {K5A0, ____, K5A2, ____, K5A4, K5A5, ____, K5A7}, \
+    {K5B0, ____, K5B2, ____, ____, ____, K5B6, K5B7}  \
+}
diff --git a/keyboards/qwertlekeys/calice/config.h b/keyboards/qwertlekeys/calice/config.h
new file mode 100644
index 0000000000..b23c5d642a
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/config.h
@@ -0,0 +1,47 @@
+ /* Copyright 2021 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* Define Matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 8
+
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW 1
+
+/*Define Matrix Pins */
+#define MATRIX_ROW_PINS {F0, F1, F5, F4, C6, C7, B5, B6, D4, D2, D5, D3}
+#define MATRIX_COL_PINS {D7, B4, F7, F6, D1, B7, B3, B2} 
+
+#define LED_CAPS_LOCK_PIN D6
+
+/* Envoder */
+#define ENCODERS_PAD_A {B0}
+#define ENCODERS_PAD_B {B1}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json
new file mode 100644
index 0000000000..d88ada3894
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/info.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "Calice", 
+    "manufacturer": "QwertleKeys",
+    "url": "", 
+    "maintainer": "Jels", 
+    "usb": {
+        "vid": "0x716B",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"1,0", "x":0.5, "y":0},
+                {"label":"0,0", "x":1.75, "y":0},
+                {"label":"1,1", "x":2.75, "y":0},
+                {"label":"0,1", "x":3.75, "y":0},
+                {"label":"1,2", "x":4.75, "y":0},
+                {"label":"0,2", "x":6.25, "y":0},
+                {"label":"1,3", "x":7.25, "y":0},
+                {"label":"0,4", "x":8.25, "y":0},
+                {"label":"1,4", "x":9.25, "y":0},
+                {"label":"0,5", "x":10.75, "y":0},
+                {"label":"1,5", "x":11.75, "y":0},
+                {"label":"0,6", "x":12.75, "y":0},
+                {"label":"1,6", "x":13.75, "y":0},
+                {"label":"0,7", "x":15, "y":0},
+                {"label":"1,7", "x":16.75, "y":0},
+                {"label":"3,7", "x":17, "y":1},
+                {"label":"3,0", "x":1.25, "y":1.25},
+                {"label":"2,0", "x":2.25, "y":1.25},
+                {"label":"3,1", "x":3.25, "y":1.25},
+                {"label":"2,1", "x":4.25, "y":1.25},
+                {"label":"3,2", "x":5.25, "y":1.25},
+                {"label":"2,2", "x":6.25, "y":1.25},
+                {"label":"3,3", "x":7.25, "y":1.25},
+                {"label":"2,4", "x":8.75, "y":1.25},
+                {"label":"3,4", "x":9.75, "y":1.25},
+                {"label":"2,5", "x":10.75, "y":1.25},
+                {"label":"3,5", "x":11.75, "y":1.25},
+                {"label":"2,6", "x":12.75, "y":1.25},
+                {"label":"3,6", "x":13.75, "y":1.25},
+                {"label":"5,6", "x":14.75, "y":1.25},
+                {"label":"2,7", "x":15.75, "y":1.25},
+                {"label":"5,7", "x":17.25, "y":2},
+                {"label":"5,0", "x":1, "y":2.25, "w":1.5},
+                {"label":"4,0", "x":2.5, "y":2.25},
+                {"label":"5,1", "x":3.5, "y":2.25},
+                {"label":"4,1", "x":4.5, "y":2.25},
+                {"label":"5,2", "x":5.5, "y":2.25},
+                {"label":"4,2", "x":6.5, "y":2.25},
+                {"label":"5,3", "x":8.5, "y":2.25},
+                {"label":"4,4", "x":9.5, "y":2.25},
+                {"label":"5,4", "x":10.5, "y":2.25},
+                {"label":"4,5", "x":11.5, "y":2.25},
+                {"label":"5,5", "x":12.5, "y":2.25},
+                {"label":"4,6", "x":13.5, "y":2.25},
+                {"label":"7,6", "x":14.5, "y":2.25},
+                {"label":"4,7", "x":15.5, "y":2.25, "w":1.5},
+                {"label":"7,7", "x":17.5, "y":3},
+                {"label":"7,0", "x":0.75, "y":3.25, "w":1.75},
+                {"label":"6,0", "x":2.5, "y":3.25},
+                {"label":"7,1", "x":3.5, "y":3.25},
+                {"label":"6,1", "x":4.5, "y":3.25},
+                {"label":"7,2", "x":5.5, "y":3.25},
+                {"label":"6,2", "x":6.5, "y":3.25},
+                {"label":"7,3", "x":9, "y":3.25},
+                {"label":"6,4", "x":10, "y":3.25},
+                {"label":"7,4", "x":11, "y":3.25},
+                {"label":"6,5", "x":12, "y":3.25},
+                {"label":"7,5", "x":13, "y":3.25},
+                {"label":"6,6", "x":14, "y":3.25},
+                {"label":"6,7", "x":15, "y":3.25, "w":2.25},
+                {"label":"9,0", "x":0.5, "y":4.25, "w":2.25},
+                {"label":"8,0", "x":2.75, "y":4.25},
+                {"label":"9,1", "x":3.75, "y":4.25},
+                {"label":"8,1", "x":4.75, "y":4.25},
+                {"label":"9,2", "x":5.75, "y":4.25},
+                {"label":"8,2", "x":6.75, "y":4.25},
+                {"label":"9,3", "x":8.75, "y":4.25},
+                {"label":"8,4", "x":9.75, "y":4.25},
+                {"label":"9,4", "x":10.75, "y":4.25},
+                {"label":"8,5", "x":11.75, "y":4.25},
+                {"label":"9,5", "x":12.75, "y":4.25},
+                {"label":"8,6", "x":13.75, "y":4.25},
+                {"label":"9,6", "x":14.75, "y":4.25, "w":1.75},
+                {"label":"8,7", "x":16.5, "y":4.25},
+                {"label":"11,0", "x":0.5, "y":5.25, "w":1.5},
+                {"label":"10,0", "x":3.25, "y":5.25, "w":1.5},
+                {"label":"11,2", "x":4.75, "y":5.25, "w":2.25},
+                {"label":"10,2", "x":7, "y":5.25},
+                {"label":"10,4", "x":8.25, "y":5.25, "w":2.75},
+                {"label":"10,5", "x":11, "y":5.25, "w":1.5},
+                {"label":"11,6", "x":15.5, "y":5.25},
+                {"label":"10,7", "x":16.5, "y":5.25},
+                {"label":"11,7", "x":17.5, "y":5.25}]
+            }
+        }
+}
diff --git a/keyboards/qwertlekeys/calice/keymaps/default/keymap.c b/keyboards/qwertlekeys/calice/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d9876034de
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/*  copyright 2021 Joah Nelson (jels)
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERAHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  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_GRV,  KC_HOME, 
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, 
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+    KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RIGHT  
+),
+[1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/qwertlekeys/calice/keymaps/via/keymap.c b/keyboards/qwertlekeys/calice/keymaps/via/keymap.c
new file mode 100644
index 0000000000..102b20aa5c
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/*  copyright 2021 Joah Nelson (jels)
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERAHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  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_GRV,  KC_HOME, 
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, 
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+    KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RIGHT  
+),
+[1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/qwertlekeys/calice/keymaps/via/rules.mk b/keyboards/qwertlekeys/calice/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertlekeys/calice/readme.md b/keyboards/qwertlekeys/calice/readme.md
new file mode 100644
index 0000000000..9fc7d570cf
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/readme.md
@@ -0,0 +1,23 @@
+# Calice
+
+![Calice](https://i.imgur.com/5Xsw1ojl.jpg)
+
+## A 75% Alice
+
+* Keyboard Maintainer: [jels](https://github.com/Jels02)
+* Hardware Supported: Calice PCB
+* Hardware Availabililty: Groupbuy 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qwertlekeys/calice:default
+
+Flashing example for this keyboard:
+
+    make qwertlekeys/calice:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+* **Bootmagic reset**: Hold down the top left key (ESC) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/qwertlekeys/calice/rules.mk b/keyboards/qwertlekeys/calice/rules.mk
new file mode 100644
index 0000000000..cef940efac
--- /dev/null
+++ b/keyboards/qwertlekeys/calice/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader Selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From 017398c283fe5a189d7d029f60587342be47b002 Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Wed, 14 Sep 2022 14:13:13 -0400
Subject: [PATCH 352/959] [Keyboard] Add Vector PCB (#17380)

---
 keyboards/cannonkeys/vector/info.json         | 35 +++++++++++++++
 .../vector/keymaps/default/keymap.c           | 45 +++++++++++++++++++
 .../cannonkeys/vector/keymaps/via/keymap.c    | 45 +++++++++++++++++++
 .../cannonkeys/vector/keymaps/via/rules.mk    |  1 +
 keyboards/cannonkeys/vector/readme.md         | 25 +++++++++++
 keyboards/cannonkeys/vector/rules.mk          |  2 +
 6 files changed, 153 insertions(+)
 create mode 100644 keyboards/cannonkeys/vector/info.json
 create mode 100644 keyboards/cannonkeys/vector/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/vector/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/vector/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/vector/readme.md
 create mode 100644 keyboards/cannonkeys/vector/rules.mk

diff --git a/keyboards/cannonkeys/vector/info.json b/keyboards/cannonkeys/vector/info.json
new file mode 100644
index 0000000000..1247fa3903
--- /dev/null
+++ b/keyboards/cannonkeys/vector/info.json
@@ -0,0 +1,35 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Vector",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["C14", "A1", "B14", "B15", "A8"]
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xCA04",
+        "pid": "0x000C"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"matrix": [0,0], "x":0, "y":0}, {"matrix": [0,1], "x":1, "y":0}, {"matrix": [0,2], "x":2, "y":0}, {"matrix": [0,3], "x":3, "y":0}, {"matrix": [0,4], "x":4, "y":0}, {"matrix": [0,5], "x":5, "y":0}, {"matrix": [0,6], "x":6, "y":0}, {"matrix": [0,7], "x":7, "y":0}, {"matrix": [0,8], "x":8, "y":0}, {"matrix": [0,9], "x":9, "y":0}, {"matrix": [0,10], "x":10, "y":0}, {"matrix": [0,11], "x":11, "y":0}, {"matrix": [0,12], "x":12, "y":0}, {"matrix": [0,13], "x":13, "y":0}, {"matrix": [2,12], "x":14, "y":0}, {"matrix": [1,0], "x":0, "y":1, "w":1.5}, {"matrix": [1,1], "x":1.5, "y":1}, {"matrix": [1,2], "x":2.5, "y":1}, {"matrix": [1,3], "x":3.5, "y":1}, {"matrix": [1,4], "x":4.5, "y":1}, {"matrix": [1,5], "x":5.5, "y":1}, {"matrix": [1,6], "x":6.5, "y":1}, {"matrix": [1,7], "x":7.5, "y":1}, {"matrix": [1,8], "x":8.5, "y":1}, {"matrix": [1,9], "x":9.5, "y":1}, {"matrix": [1,10], "x":10.5, "y":1}, {"matrix": [1,11], "x":11.5, "y":1}, {"matrix": [1,12], "x":12.5, "y":1}, {"matrix": [1,13], "x":13.5, "y":1, "w":1.5}, {"matrix": [2,0], "x":0, "y":2, "w":1.75}, {"matrix": [2,1], "x":1.75, "y":2}, {"matrix": [2,2], "x":2.75, "y":2}, {"matrix": [2,3], "x":3.75, "y":2}, {"matrix": [2,4], "x":4.75, "y":2}, {"matrix": [2,5], "x":5.75, "y":2}, {"matrix": [2,6], "x":6.75, "y":2}, {"matrix": [2,7], "x":7.75, "y":2}, {"matrix": [2,8], "x":8.75, "y":2}, {"matrix": [2,9], "x":9.75, "y":2}, {"matrix": [2,10], "x":10.75, "y":2}, {"matrix": [2,11], "x":11.75, "y":2}, {"matrix": [2,13], "x":12.75, "y":2, "w":2.25}, {"matrix": [3,0], "x":0, "y":3, "w":1.25}, {"matrix": [3,1], "x":1.25, "y":3}, {"matrix": [3,2], "x":2.25, "y":3}, {"matrix": [3,3], "x":3.25, "y":3}, {"matrix": [3,4], "x":4.25, "y":3}, {"matrix": [3,5], "x":5.25, "y":3}, {"matrix": [3,6], "x":6.25, "y":3}, {"matrix": [3,7], "x":7.25, "y":3}, {"matrix": [3,8], "x":8.25, "y":3}, {"matrix": [3,9], "x":9.25, "y":3}, {"matrix": [3,10], "x":10.25, "y":3}, {"matrix": [3,11], "x":11.25, "y":3}, {"matrix": [3,12], "x":12.25, "y":3, "w":1.75}, {"matrix": [3,13], "x":14, "y":3}, {"matrix": [4,0], "x":0, "y":4, "w":1.5}, {"matrix": [4,1], "x":1.5, "y":4}, {"matrix": [4,2], "x":2.5, "y":4, "w":1.5}, {"matrix": [4,5], "x":4, "y":4, "w":3}, {"matrix": [4,7], "x":7, "y":4}, {"matrix": [4,9], "x":8, "y":4, "w":3}, {"matrix": [4,11], "x":11, "y":4, "w":1.5}, {"matrix": [4,12], "x":12.5, "y":4}, {"matrix": [4,13], "x":13.5, "y":4, "w":1.5}]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/vector/keymaps/default/keymap.c b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7def0bb31d
--- /dev/null
+++ b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_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(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                 KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, RESET
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______, _______,                            _______, _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______, _______,                            _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/vector/keymaps/via/keymap.c b/keyboards/cannonkeys/vector/keymaps/via/keymap.c
new file mode 100644
index 0000000000..28b3492f0e
--- /dev/null
+++ b/keyboards/cannonkeys/vector/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_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(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                 KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, RESET
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______, _______,                            _______, _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______, _______,                            _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/vector/keymaps/via/rules.mk b/keyboards/cannonkeys/vector/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/vector/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/vector/readme.md b/keyboards/cannonkeys/vector/readme.md
new file mode 100644
index 0000000000..1abbb25819
--- /dev/null
+++ b/keyboards/cannonkeys/vector/readme.md
@@ -0,0 +1,25 @@
+# Vector
+
+*A PCB mount 60% designed by ai03*
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/vector:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/vector:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/vector/rules.mk b/keyboards/cannonkeys/vector/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/cannonkeys/vector/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

From 8d715fc16b7c44007bc41117341fe92272e7ba2f Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 14 Sep 2022 19:15:57 +0100
Subject: [PATCH 353/959] Remove deprecated RESET keycode alias (#18271)

---
 quantum/keymap.h                  | 23 +----------------------
 quantum/quantum_keycodes_legacy.h |  4 ++--
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/quantum/keymap.h b/quantum/keymap.h
index edff484129..67e35c4e2f 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -19,38 +19,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "platform_deps.h"
 #include "action.h"
-#if defined(__AVR__)
-#    include <avr/pgmspace.h>
-#elif defined PROTOCOL_CHIBIOS
-// We need to ensure that chibios is include before redefining reset
-#    include <ch.h>
-#endif
 #include "keycode.h"
 #include "report.h"
 #include "host.h"
-// #include "print.h"
 #include "debug.h"
 #include "keycode_config.h"
 #include "gpio.h" // for pin_t
 
-// ChibiOS uses RESET in its FlagStatus enumeration
-// Therefore define it as QK_BOOTLOADER here, to avoid name collision
-#if defined(PROTOCOL_CHIBIOS)
-#    define RESET QK_BOOTLOADER
-#endif
-// Gross hack, remove me and change RESET keycode to QK_BOOT
-#if defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)
-#    undef RESET
-#endif
-
 #include "quantum_keycodes.h"
 
-// Gross hack, remove me and change RESET keycode to QK_BOOT
-#if defined(MCU_RP)
-#    undef RESET
-#endif
-
 // translates key to keycode
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
 
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 51380d9c50..1de81b4c0f 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -4,7 +4,6 @@
 
 // Deprecated Quantum keycodes
 
-#define RESET        QK_BOOTLOADER
 #define DEBUG        QK_DEBUG_TOGGLE
 #define GRAVE_ESC    QK_GRAVE_ESCAPE
 #define EEPROM_RESET QK_CLEAR_EEPROM
@@ -13,4 +12,5 @@
 #define EEP_RST QK_CLEAR_EEPROM
 
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
-#define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
\ No newline at end of file
+#define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
+// #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")

From 0abde386ae46600d0ac12b13a480c060e3292bd9 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Wed, 14 Sep 2022 16:54:24 -0600
Subject: [PATCH 354/959] Remove `RESET` keycodes from fjlabs keyboards
 (#18364)

---
 keyboards/fjlabs/avalon/keymaps/default/keymap.c    | 2 +-
 keyboards/fjlabs/avalon/keymaps/via/keymap.c        | 2 +-
 keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c | 2 +-
 keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/fjlabs/avalon/keymaps/default/keymap.c b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
index 3601ba8fed..b5e2b84480 100644
--- a/keyboards/fjlabs/avalon/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_TRNS, KC_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_DEL,  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_SLCK, KC_PAUS, RESET,   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_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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/fjlabs/avalon/keymaps/via/keymap.c b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
index 08869cc59d..61aa6f155c 100644
--- a/keyboards/fjlabs/avalon/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_TRNS, KC_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_DEL,  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_SLCK, KC_PAUS, RESET,   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_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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/fjlabs/sinanjuwk/keymaps/default/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
index e5dcc81c4f..1dd28d8d13 100644
--- a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
index 2520da0cda..dc1fd0d4f5 100644
--- a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS

From 01f31bf28ebcb5721229697c93dc6e0b2d5b66d7 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 15 Sep 2022 01:03:55 +0100
Subject: [PATCH 355/959] [Docs] RESET -> QK_BOOT (#18365)

---
 docs/api_docs.md                           |  2 +-
 docs/configurator_default_keymaps.md       |  4 ++--
 docs/driver_installation_zadig.md          |  2 +-
 docs/faq_misc.md                           |  2 +-
 docs/feature_audio.md                      |  4 ++--
 docs/flashing.md                           | 26 +++++++++++-----------
 docs/flashing_bootloadhid.md               |  2 +-
 docs/ja/api_docs.md                        |  2 +-
 docs/ja/faq_misc.md                        |  2 +-
 docs/ja/feature_audio.md                   |  2 +-
 docs/ja/flashing.md                        | 12 +++++-----
 docs/ja/flashing_bootloadhid.md            |  2 +-
 docs/ja/keycodes.md                        |  8 +++----
 docs/ja/quantum_keycodes.md                |  8 +++----
 docs/platformdev_chibios_earlyinit.md      |  2 +-
 docs/zh-cn/api_docs.md                     |  2 +-
 docs/zh-cn/configurator_default_keymaps.md |  4 ++--
 docs/zh-cn/flashing.md                     | 20 ++++++++---------
 docs/zh-cn/flashing_bootloadhid.md         |  2 +-
 19 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/docs/api_docs.md b/docs/api_docs.md
index eefb61a54d..e2f970f3ab 100644
--- a/docs/api_docs.md
+++ b/docs/api_docs.md
@@ -16,7 +16,7 @@ This service is an asynchronous API for compiling custom keymaps. You POST some
   "layers": [
     ["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_GRV","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_LSFT","KC_NUBS","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RO","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_MHEN","KC_SPC","KC_SPC","KC_HENK","KC_RALT","KC_RCTL","MO(1)","KC_LEFT","KC_DOWN","KC_RIGHT"],
     ["KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_TRNS","KC_DEL","BL_STEP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","_______","KC_TRNS","KC_PSCR","KC_SLCK","KC_PAUS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_LEFT","KC_PGDN","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","RESET","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
+    ["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","QK_BOOT","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
   ]
 }
 ```
diff --git a/docs/configurator_default_keymaps.md b/docs/configurator_default_keymaps.md
index d2b14ec411..3fea15166a 100644
--- a/docs/configurator_default_keymaps.md
+++ b/docs/configurator_default_keymaps.md
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_all(
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DEC,  BL_INC,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPLY, KC_MNXT, KC_VOLD,
+    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_MPLY, 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_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS),
@@ -84,7 +84,7 @@ The default keymap uses the `LAYOUT_all` macro, so that will be the value of the
     [
       "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUD", "RGB_HUI", "RGB_SAD", "RGB_SAI", "RGB_VAD", "RGB_VAI",               "BL_TOGG", "BL_DEC",  "BL_INC",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_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", "RESET",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",               "KC_MPLY", "KC_MNXT", "KC_VOLD",
+      "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_MPLY", "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_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",                          "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/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md
index 003629ba9a..3b2c0b74dc 100644
--- a/docs/driver_installation_zadig.md
+++ b/docs/driver_installation_zadig.md
@@ -8,7 +8,7 @@ We recommend the use of the [Zadig](https://zadig.akeo.ie/) utility. If you have
 
 ## Installation
 
-Put your keyboard into bootloader mode, either by hitting the `RESET` keycode (which may be on a different layer), or by pressing the reset switch that's usually located on the underside of the board. If your keyboard has neither, try holding Escape or Space+`B` as you plug it in (see the [Bootmagic Lite](feature_bootmagic.md) docs for more details). Some boards use [Command](feature_command.md) instead of Bootmagic; in this case, you can enter bootloader mode by hitting Left Shift+Right Shift+`B` or Left Shift+Right Shift+Escape at any point while the keyboard is plugged in.
+Put your keyboard into bootloader mode, either by hitting the `QK_BOOT` keycode (which may be on a different layer), or by pressing the reset switch that's usually located on the underside of the board. If your keyboard has neither, try holding Escape or Space+`B` as you plug it in (see the [Bootmagic Lite](feature_bootmagic.md) docs for more details). Some boards use [Command](feature_command.md) instead of Bootmagic; in this case, you can enter bootloader mode by hitting Left Shift+Right Shift+`B` or Left Shift+Right Shift+Escape at any point while the keyboard is plugged in.
 Some keyboards may have specific instructions for entering the bootloader. For example, the [Bootmagic Lite](feature_bootmagic.md) key (default: Escape) might be on a different key, e.g. Left Control; or the magic combination for Command (default: Left Shift+Right Shift) might require you to hold something else, e.g. Left Control+Right Control. Refer to the board's README file if you are unsure.
 
 To put a device in bootloader mode with USBaspLoader, tap the `RESET` button while holding down the `BOOT` button.
diff --git a/docs/faq_misc.md b/docs/faq_misc.md
index 9e34a04815..287ca7711d 100644
--- a/docs/faq_misc.md
+++ b/docs/faq_misc.md
@@ -10,7 +10,7 @@ You probably don't want to "brick" your keyboard, making it impossible
 to rewrite firmware onto it.  Here are some of the parameters to show
 what things are (and likely aren't) too risky.
 
-- If your keyboard map does not include RESET, then, to get into DFU
+- If your keyboard map does not include QK_BOOT, then, to get into DFU
   mode, you will need to press the reset button on the PCB, which
   requires unscrewing the bottom.
 - Messing with tmk_core / common files might make the keyboard
diff --git a/docs/feature_audio.md b/docs/feature_audio.md
index 5b84dc7747..8c02f7c153 100644
--- a/docs/feature_audio.md
+++ b/docs/feature_audio.md
@@ -114,7 +114,7 @@ The audio core offers interface functions to get/set/change the tone multiplexin
 There's a couple of different sounds that will automatically be enabled without any other configuration:
 ```
 STARTUP_SONG // plays when the keyboard starts up (audio.c)
-GOODBYE_SONG // plays when you press the RESET key (quantum.c)
+GOODBYE_SONG // plays when you press the QK_BOOT key (quantum.c)
 AG_NORM_SONG // plays when you press AG_NORM (quantum.c)
 AG_SWAP_SONG // plays when you press AG_SWAP (quantum.c)
 CG_NORM_SONG // plays when you press CG_NORM (quantum.c)
@@ -177,7 +177,7 @@ The available keycodes for audio are:
 |`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 RESET key (quantum.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)                                 |
diff --git a/docs/flashing.md b/docs/flashing.md
index 5e5dcb34e4..b3f055f6cb 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -34,7 +34,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Press the `RESET` keycode
+    * Press the `QK_BOOT` keycode
     * Press the `RESET` button on the PCB if available
     * Short RST to GND quickly
 2. Wait for the OS to detect the device
@@ -87,7 +87,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods (you only have 7 seconds to flash once it enters; some variants may require you to reset twice within 750 milliseconds):
-    * Press the `RESET` keycode
+    * Press the `QK_BOOT` keycode
     * Press the `RESET` button on the PCB if available
     * Short RST to GND quickly
 2. Wait for the OS to detect the device
@@ -123,7 +123,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods (you only have 7 seconds to flash once it enters):
-    * Press the `RESET` keycode
+    * Press the `QK_BOOT` keycode
     * Press the `RESET` button on the Teensy or PCB if available
     * short RST to GND quickly
 2. Wait for the OS to detect the device
@@ -153,7 +153,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Press the `RESET` keycode
+    * Press the `QK_BOOT` keycode
     * Keep the `BOOT` button held while quickly tapping the `RESET` button on the PCB
 2. Wait for the OS to detect the device
 3. Flash a .hex file
@@ -182,7 +182,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `RESET` keycode
+    * Tap the `QK_BOOT` keycode
     * Hold the salt key while plugging the keyboard in - for PS2AVRGB boards, this is usually the key connected to MCU pins A0 and B0, otherwise it will be documented in your keyboard's readme
 2. Wait for the OS to detect the device
 3. Flash a .hex file
@@ -223,7 +223,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Press the `RESET` keycode
+    * Press the `QK_BOOT` keycode
     * Press the `RESET` button on the PCB if available
     * short RST to GND quickly
 2. Wait for the OS to detect the device
@@ -256,7 +256,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `RESET` keycode (may not work on STM32F042 devices)
+    * Tap the `QK_BOOT` keycode (may not work on STM32F042 devices)
     * If a reset circuit is present, tap the `RESET` button on the PCB; some boards may also have a toggle switch that must be flipped
     * Otherwise, you need to bridge `BOOT0` to VCC (via `BOOT0` button or jumper), short `RESET` to GND (via `RESET` button or jumper), and then let go of the `BOOT0` bridge
 2. Wait for the OS to detect the device
@@ -292,7 +292,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `RESET` keycode
+    * Tap the `QK_BOOT` keycode
     * If a reset circuit is present, tap the `RESET` button on the PCB
     * Otherwise, you need to bridge `BOOT0` to VCC (via `BOOT0` button or jumper), short `RESET` to GND (via `RESET` button or jumper), and then let go of the `BOOT0` bridge
 2. Wait for the OS to detect the device
@@ -316,7 +316,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `RESET` keycode
+    * Tap the `QK_BOOT` keycode
     * Press the `RESET` button on the PCB
 2. Wait for the OS to detect the device
 3. Flash a .bin file
@@ -342,7 +342,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `RESET` keycode
+    * Tap the `QK_BOOT` keycode
     * Double-tap the `nRST` button on the PCB.
 2. Wait for the OS to detect the device
 3. Copy the .uf2 file to the new USB disk
@@ -353,7 +353,7 @@ or
 CLI Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `RESET` keycode
+    * Tap the `QK_BOOT` keycode
     * Double-tap the `nRST` button on the PCB.
 2. Wait for the OS to detect the device
 3. Flash via QMK CLI eg. `qmk flash --keyboard handwired/onekey/blackpill_f411_tinyuf2 --keymap default`
@@ -381,7 +381,7 @@ Compatible flashers:
 Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `QK_BOOTLOADER` keycode
+    * Tap the `QK_BOOT` keycode
     * Hold the `BOOTSEL` button on the PCB while plugin in the usb cable.
     * Double-tap the `RESET` button on the PCB<sup>1</sup>.
 2. Wait for the OS to detect the device
@@ -393,7 +393,7 @@ or
 CLI Flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `QK_BOOTLOADER` keycode
+    * Tap the `QK_BOOT` keycode
     * Hold the `BOOTSEL` button on the PCB while plugin in the usb cable.
     * Double-tap the `RESET` button on the PCB<sup>1</sup>.
 2. Wait for the OS to detect the device
diff --git a/docs/flashing_bootloadhid.md b/docs/flashing_bootloadhid.md
index 213c7c1321..aacf2cc2c4 100644
--- a/docs/flashing_bootloadhid.md
+++ b/docs/flashing_bootloadhid.md
@@ -5,7 +5,7 @@ ps2avr(GB) boards use an ATmega32A microcontroller and a different bootloader. I
 General flashing sequence:
 
 1. Enter the bootloader using any of the following methods:
-    * Tap the `RESET` keycode (may not work on all devices)
+    * Tap the `QK_BOOT` keycode (may not work on all devices)
     * Hold the salt key while plugging the keyboard in (usually documented within keyboard readme) 
 2. Wait for the OS to detect the device
 3. Flash a .hex file
diff --git a/docs/ja/api_docs.md b/docs/ja/api_docs.md
index 34ed50c497..96ddbb5618 100644
--- a/docs/ja/api_docs.md
+++ b/docs/ja/api_docs.md
@@ -21,7 +21,7 @@
   "layers": [
     ["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_GRV","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_LSFT","KC_NUBS","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RO","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_MHEN","KC_SPC","KC_SPC","KC_HENK","KC_RALT","KC_RCTL","MO(1)","KC_LEFT","KC_DOWN","KC_RIGHT"],
     ["KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_TRNS","KC_DEL","BL_STEP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","_______","KC_TRNS","KC_PSCR","KC_SLCK","KC_PAUS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_LEFT","KC_PGDN","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","RESET","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
+    ["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","QK_BOOT","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
   ]
 }
 ```
diff --git a/docs/ja/faq_misc.md b/docs/ja/faq_misc.md
index 38917df2ee..24a0e18235 100644
--- a/docs/ja/faq_misc.md
+++ b/docs/ja/faq_misc.md
@@ -13,7 +13,7 @@
 
 あなたはおそらくキーボードを「文鎮化」したくないでしょう。文鎮化するとファームウェアを書き換えられないようになります。リスクがあまりに高い(そしてそうでないかもしれない)ものの一部のリストを示します。
 
-- キーボードマップに RESET が含まれない場合、DFU モードに入るには、PCB のリセットボタンを押す必要があります。底部のネジを外す必要があります。
+- キーボードマップに QK_BOOT が含まれない場合、DFU モードに入るには、PCB のリセットボタンを押す必要があります。底部のネジを外す必要があります。
 - tmk_core / common にあるファイルを触るとキーボードが操作不能になるかもしれません。
 - .hex ファイルが大きすぎると問題を引き起こします; `make dfu` コマンドはブロックを削除し、サイズを検査し(おっと、間違った順序です！)、エラーを出力し、
 キーボードへの書き込みに失敗し、DFU モードのままになります。
diff --git a/docs/ja/feature_audio.md b/docs/ja/feature_audio.md
index ca7820e3c4..2d1fd8f78a 100644
--- a/docs/ja/feature_audio.md
+++ b/docs/ja/feature_audio.md
@@ -23,7 +23,7 @@ Timer 3:
 
 ```
 STARTUP_SONG // キーボードの起動時に再生 (audio.c)
-GOODBYE_SONG // RESET キーを押すと再生 (quantum.c)
+GOODBYE_SONG // QK_BOOT キーを押すと再生 (quantum.c)
 AG_NORM_SONG // AG_NORM キーを押すと再生 (quantum.c)
 AG_SWAP_SONG // AG_SWAP キーを押すと再生 (quantum.c)
 CG_NORM_SONG // CG_NORM キーを押すと再生 (quantum.c)
diff --git a/docs/ja/flashing.md b/docs/ja/flashing.md
index 0245250cee..ce6646d4fe 100644
--- a/docs/ja/flashing.md
+++ b/docs/ja/flashing.md
@@ -34,7 +34,7 @@ BOOTLOADER = atmel-dfu
 
 書き込み手順:
 
-1. `RESET` キーコードを押すか、RESET ボタンをタップします(または RST を GND にショートします)。
+1. `QK_BOOT` キーコードを押すか、RESET ボタンをタップします(または RST を GND にショートします)。
 2. OS がデバイスを検知するのを待ちます。
 3. メモリを消去します(自動的に実行されるかもしれません)
 4. .hex ファイルを書き込みます
@@ -94,7 +94,7 @@ BOOTLOADER = caterina
 
 書き込み手順:
 
-1. `RESET` キーコードを押すか、RST をすばやく GND にショートします (入力後7秒で書き込みます)
+1. `QK_BOOT` キーコードを押すか、RST をすばやく GND にショートします (入力後7秒で書き込みます)
 2. OS がデバイスを検知するのを待ちます。
 3. .hex ファイルを書き込みます
 4. デバイスが自動的にリセットされるのを待ちます
@@ -141,7 +141,7 @@ BOOTLOADER = halfkay
 
 書き込み手順:
 
-1. `RESET` キーコードを押すか、RST をすばやく GND にショートします (入力後7秒で書き込みます)
+1. `QK_BOOT` キーコードを押すか、RST をすばやく GND にショートします (入力後7秒で書き込みます)
 2. OS がデバイスを検知するのを待ちます。
 3. .hex ファイルを書き込みます
 4. デバイスをアプリケーションモードにリセットします(自動的に実行されるかもしれません)
@@ -172,7 +172,7 @@ BOOTLOADER = USBasp
 
 書き込み手順:
 
-1. `RESET` キーコードを押すか、RST を GND にすばやくショートしながら、ブートピンを GND にショートしたままにします。
+1. `QK_BOOT` キーコードを押すか、RST を GND にすばやくショートしながら、ブートピンを GND にショートしたままにします。
 2. OS がデバイスを検知するのを待ちます。
 3. .hex ファイルを書き込みます
 4. デバイスをアプリケーションモードにリセットします(自動的に実行されるかもしれません)
@@ -203,7 +203,7 @@ BOOTLOADER = bootloadHID
 書き込み手順:
 
 1. 以下のいずれかの方法を使ってブートローダに入ります:
-   * `RESET` キーコードをタップします (全てのデバイスでは動作しないかもしれません)
+   * `QK_BOOT` キーコードをタップします (全てのデバイスでは動作しないかもしれません)
    * キーボードを接続しながらソルトキーを押し続けます (通常はキーボードの readme に書かれています)
 2. OS がデバイスを検知するのを待ちます。
 3. .hex ファイルを書き込みます
@@ -227,7 +227,7 @@ BOOTLOADER = bootloadHID
 書き込み手順:
 
 1. 以下のいずれかの方法を使ってブートローダに入ります:
-   * `RESET` キーコードをタップします (STM32F042 デバイスでは動作しないかもしれません)
+   * `QK_BOOT` キーコードをタップします (STM32F042 デバイスでは動作しないかもしれません)
    * リセット回路が存在する場合、RESET ボタンをタップします
    * それ以外の場合は、(BOOT0 ボタンあるいはブリッジ経由で)BOOT0 を VCC にブリッジし、(REEST ボタンあるいはブリッジ経由で)RESET を GND にショートし、BOOT0 ブリッジを放す必要があります。
 2. OS がデバイスを検知するのを待ちます。
diff --git a/docs/ja/flashing_bootloadhid.md b/docs/ja/flashing_bootloadhid.md
index ddcd776c24..5c67bd5f29 100644
--- a/docs/ja/flashing_bootloadhid.md
+++ b/docs/ja/flashing_bootloadhid.md
@@ -10,7 +10,7 @@ ps2avr(GB) キーボードは ATmega32A マイクロコントローラを使い
 一般的な書き込みシーケンス:
 
 1. 以下のいずれかの方法を使ってブートローダに入ります:
-   * `RESET` キーコードをタップします (全てのデバイスでは動作しないかもしれません)
+   * `QK_BOOT` キーコードをタップします (全てのデバイスでは動作しないかもしれません)
    * ソルトキーを押し続けながらキーボードを接続します (通常はキーボードの readme に書かれています)
 2. OS がデバイスを検知するのを待ちます。
 3. .hex ファイルを書き込みます
diff --git a/docs/ja/keycodes.md b/docs/ja/keycodes.md
index c5c075bb2b..aa8c722372 100644
--- a/docs/ja/keycodes.md
+++ b/docs/ja/keycodes.md
@@ -228,10 +228,10 @@
 [Quantum キーコード](ja/quantum_keycodes.md#qmk-keycodes) も見てください。
 
 |キー          |エイリアス |説明                                                     |
-|--------------|-----------|---------------------------------------------------------|
-|`RESET`       |           |ファームウエア書き込みのためにキーボードをブートローダーモードにします |
-|`DEBUG`       |           |デバッグモードを切り替えます                             |
-|`EEPROM_RESET`|`EEP_RST`  |キーボードの EEPROM (不揮発メモリ) を再初期化します      |
+|-----------------|---------|---------------------------------------------------------|
+|`QK_BOOTLOADER`  |`QK_BOOT`|ファームウエア書き込みのためにキーボードをブートローダーモードにします |
+|`QK_DEBUG_TOGGLE`|`DB_TOGG`|デバッグモードを切り替えます                             |
+|`QK_CLEAR_EEPROM`|`EE_CLR` |キーボードの EEPROM (不揮発メモリ) を再初期化します      |
 
 ## オーディオキー :id=audio-keys
 
diff --git a/docs/ja/quantum_keycodes.md b/docs/ja/quantum_keycodes.md
index ffcc494460..0795520c6e 100644
--- a/docs/ja/quantum_keycodes.md
+++ b/docs/ja/quantum_keycodes.md
@@ -14,7 +14,7 @@ quantum 内の全てのキーコードは `0x0000` と `0xFFFF` の間の数値
 ## QMK キーコード :id=qmk-keycodes
 
 | キー           | エイリアス | 説明                                                   |
-|----------------|------------|--------------------------------------------------------|
-| `RESET`        |            | 書き込みのために、キーボードを bootloader モードにする |
-| `DEBUG`        |            | デバッグモードの切り替え                               |
-| `EEPROM_RESET` | `EEP_RST`  | キーボードの EEPROM (永続化メモリ) を再初期化する      |
+|-----------------|---------|--------------------------------------------------------|
+|`QK_BOOTLOADER`  |`QK_BOOT`| 書き込みのために、キーボードを bootloader モードにする |
+|`QK_DEBUG_TOGGLE`|`DB_TOGG`| デバッグモードの切り替え                               |
+|`QK_CLEAR_EEPROM`|`EE_CLR` | キーボードの EEPROM (永続化メモリ) を再初期化する      |
diff --git a/docs/platformdev_chibios_earlyinit.md b/docs/platformdev_chibios_earlyinit.md
index e1256f2714..bc49247222 100644
--- a/docs/platformdev_chibios_earlyinit.md
+++ b/docs/platformdev_chibios_earlyinit.md
@@ -12,7 +12,7 @@ The function `early_hardware_init_pre` is the earliest possible code that can be
 
 This is executed before RAM gets cleared, and before clocks or GPIOs are configured; for example, ChibiOS delays are not likely to work at this point. After executing this function, RAM on the MCU may be zero'ed. Assigning values to variables during execution of this function may be overwritten.
 
-As such, if you wish to override this API consider limiting use to writing to low-level registers. The default implementation of this function can be configured to jump to bootloader if a `RESET` key was pressed:
+As such, if you wish to override this API consider limiting use to writing to low-level registers. The default implementation of this function can be configured to jump to bootloader if a `QK_BOOT` key was pressed:
 
 | `config.h` override                           | Description                                                                                                                                                                                                                                                                            | Default  |
 |-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
diff --git a/docs/zh-cn/api_docs.md b/docs/zh-cn/api_docs.md
index a2df9ec20a..b853a1bca5 100644
--- a/docs/zh-cn/api_docs.md
+++ b/docs/zh-cn/api_docs.md
@@ -21,7 +21,7 @@
   "layers": [
     ["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_GRV","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_LSFT","KC_NUBS","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RO","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_MHEN","KC_SPC","KC_SPC","KC_HENK","KC_RALT","KC_RCTL","MO(1)","KC_LEFT","KC_DOWN","KC_RIGHT"],
     ["KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_TRNS","KC_DEL","BL_STEP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","_______","KC_TRNS","KC_PSCR","KC_SLCK","KC_PAUS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_LEFT","KC_PGDN","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","RESET","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
+    ["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","QK_BOOT","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
   ]
 }
 ```
diff --git a/docs/zh-cn/configurator_default_keymaps.md b/docs/zh-cn/configurator_default_keymaps.md
index 135029b7e2..82e4ca818d 100644
--- a/docs/zh-cn/configurator_default_keymaps.md
+++ b/docs/zh-cn/configurator_default_keymaps.md
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_all(
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DEC,  BL_INC,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPLY, KC_MNXT, KC_VOLD,
+    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_MPLY, 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_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS),
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [
       "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUD", "RGB_HUI", "RGB_SAD", "RGB_SAI", "RGB_VAD", "RGB_VAI",               "BL_TOGG", "BL_DEC",  "BL_INC",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_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", "RESET",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",               "KC_MPLY", "KC_MNXT", "KC_VOLD",
+      "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_MPLY", "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_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",                          "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/docs/zh-cn/flashing.md b/docs/zh-cn/flashing.md
index 5833cd38fa..559b8742d0 100644
--- a/docs/zh-cn/flashing.md
+++ b/docs/zh-cn/flashing.md
@@ -34,7 +34,7 @@ BOOTLOADER = atmel-dfu
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式：
-    * 点击 `RESET` 键码
+    * 点击 `QK_BOOT` 键码
     * 如果PCB上有 `RESET` 键，点击之
     * 快速短接一下RST到GND
 2. 等待操作系统识别到设备
@@ -84,7 +84,7 @@ BOOTLOADER = caterina
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写；一些型号需要你在750ms内重置两次）：
-    * 点击 `RESET` 键码
+    * 点击 `QK_BOOT` 键码
     * 如果PCB上有 `RESET` 键，点击之
     * 快速短接一下RST到GND
 2. 等待操作系统识别到设备
@@ -117,7 +117,7 @@ BOOTLOADER = halfkay
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写）：
-    * 点击 `RESET` 键码
+    * 点击 `QK_BOOT` 键码
     * 如果Teensy上或PCB上有 `RESET` 键，点击之
     * 快速短接一下RST到GND
 2. 等待操作系统识别到设备
@@ -144,7 +144,7 @@ BOOTLOADER = usbasploader
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式：
-    * 点击 `RESET` 键码
+    * 点击 `QK_BOOT` 键码
     * 在按住 `BOOT` 按钮时，快速点击一下PCB上的 `RESET`
 2. 等待操作系统识别到设备
 3. 将.hex文件刷写进去
@@ -171,7 +171,7 @@ BOOTLOADER = bootloadhid
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式：
-    * 点击 `RESET` 键码
+    * 点击 `QK_BOOT` 键码
     * 在按住“盐键”（salt key）时插入键盘 - 在PS2AVRGB板上，通常在MCU的A0及B0引脚上有这个按键，否则请查看键盘的使用说明。
 2. 等待操作系统识别到设备
 3. 将.hex文件刷写进去
@@ -212,7 +212,7 @@ BOOTLOADER = qmk-hid
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式：
-    * 点击 `RESET` 键码
+    * 点击 `QK_BOOT` 键码
     * 如果PCB上有 `RESET` 键，点击之
     * 快速短接一下RST到GND
 2. 等待操作系统识别到设备
@@ -242,7 +242,7 @@ BOOTLOADER = stm32-dfu
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写）：
-    * 点击 `RESET` 键码（对STM32F042设备可能无效）
+    * 点击 `QK_BOOT` 键码（对STM32F042设备可能无效）
     * 如果有重置电路，点击PCB上的 `RESET` 键；有些主控板上可能会有一个开关需要先打开
     * 否则，你需要将 `BOOT0` 接线到VCC（通过 `BOOT0` 按钮或跳线），短接 `RESET` 至GND（通过 `RESET` 按钮或条线），然后断开 `BOOT0` 的接线。
 2. 等待操作系统识别到设备
@@ -275,7 +275,7 @@ BOOTLOADER = stm32duino
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写）：
-    * 点击 `RESET` 键码（对STM32F042设备可能无效）
+    * 点击 `QK_BOOT` 键码（对STM32F042设备可能无效）
     * 如果有重置电路，点击PCB上的 `RESET` 键；有些主控板上可能会有一个开关需要先打开
     * 否则，你需要将 `BOOT0` 接线到VCC（通过 `BOOT0` 按钮或跳线），短接 `RESET` 至GND（通过 `RESET` 按钮或条线），然后断开 `BOOT0` 的接线。
 2. 等待操作系统识别到设备
@@ -296,7 +296,7 @@ Input Club出品的键盘使用NXP Kinetis微控制器而非STM32，并使用了
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式：
-    * 点击 `RESET` 键码（有可能只能进入到“安全”bootloader模式，参见[这里](https://github.com/qmk/qmk_firmware/issues/6112)）
+    * 点击 `QK_BOOT` 键码（有可能只能进入到“安全”bootloader模式，参见[这里](https://github.com/qmk/qmk_firmware/issues/6112)）
     * 如果PCB上有 `RESET` 键，点击之
 2. 等待操作系统识别到设备
 3. 将.bin文件刷写进去
@@ -322,7 +322,7 @@ BOOTLOADER = tinyuf2
 刷写过程：
 
 1. 使用如下任一方式进入bootloader模式：
-    * 点击 `RESET` 键码
+    * 点击 `QK_BOOT` 键码
     * 双击PCB上的 `nRST` 键
 2. 等待操作系统识别到设备
 3. 将.uf2文件拷贝到新出现的USB存储设备上
diff --git a/docs/zh-cn/flashing_bootloadhid.md b/docs/zh-cn/flashing_bootloadhid.md
index 70139c1e12..c5e944f947 100644
--- a/docs/zh-cn/flashing_bootloadhid.md
+++ b/docs/zh-cn/flashing_bootloadhid.md
@@ -10,7 +10,7 @@ ps2avr(GB)基于一片ATmega32A微控制器及特殊的bootloader，无法使用
 常规刷写过程：
 
 1. 使用如下任一方式进入bootloader模式：
-    * 点击 `RESET` 键码（一些设备上不管用）
+    * 点击 `QK_BOOT` 键码（一些设备上不管用）
     * 在按住“盐键”（salt key）时插入键盘（该键一般会在键盘使用说明上写明）
 2. 等待操作系统识别到设备
 3. 将.hex文件刷写进去

From 3fbc3ac8ad9fbd08a26da46ef09482570839ebb4 Mon Sep 17 00:00:00 2001
From: Drew Hamilton <awh@awh.org>
Date: Thu, 15 Sep 2022 09:04:40 +0900
Subject: [PATCH 356/959] [Keyboard] Add a new keyboard 'plum47' (#18359)

---
 keyboards/plum47/info.json                | 80 ++++++++++++++++++++
 keyboards/plum47/keymaps/default/keymap.c | 84 +++++++++++++++++++++
 keyboards/plum47/keymaps/via/keymap.c     | 92 +++++++++++++++++++++++
 keyboards/plum47/keymaps/via/rules.mk     |  1 +
 keyboards/plum47/readme.md                | 28 +++++++
 keyboards/plum47/rules.mk                 |  1 +
 6 files changed, 286 insertions(+)
 create mode 100644 keyboards/plum47/info.json
 create mode 100644 keyboards/plum47/keymaps/default/keymap.c
 create mode 100644 keyboards/plum47/keymaps/via/keymap.c
 create mode 100644 keyboards/plum47/keymaps/via/rules.mk
 create mode 100644 keyboards/plum47/readme.md
 create mode 100644 keyboards/plum47/rules.mk

diff --git a/keyboards/plum47/info.json b/keyboards/plum47/info.json
new file mode 100644
index 0000000000..9ad37d1768
--- /dev/null
+++ b/keyboards/plum47/info.json
@@ -0,0 +1,80 @@
+{
+    "manufacturer": "Masayuki Takagi",
+    "keyboard_name": "plum47",
+    "maintainer": "awh-tokyo",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"],
+        "rows": ["D1", "D0", "D4", "C6"]
+    },
+    "processor": "atmega32u4",
+    "url": "ihttps://github.com/takagi/plum47_buildguide",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5E14",
+        "vid": "0xFEED"
+    },
+    "debounce": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+                { "matrix": [1, 11], "x": 11, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+                { "matrix": [2, 11], "x": 11, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "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, "w": 2 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 },
+                { "matrix": [3, 9], "x": 9, "y": 3 },
+                { "matrix": [3, 10], "x": 10, "y": 3 },
+                { "matrix": [3, 11], "x": 11, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/plum47/keymaps/default/keymap.c b/keyboards/plum47/keymaps/default/keymap.c
new file mode 100644
index 0000000000..dc6642d7f1
--- /dev/null
+++ b/keyboards/plum47/keymaps/default/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2020 Masayuki Takagi
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY = 0,
+    _LOWER,
+    _RAISE
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_NO,   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 |      |      | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+)
+
+};
+
diff --git a/keyboards/plum47/keymaps/via/keymap.c b/keyboards/plum47/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8927fa4f76
--- /dev/null
+++ b/keyboards/plum47/keymaps/via/keymap.c
@@ -0,0 +1,92 @@
+/* Copyright 2020 Masayuki Takagi
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY = 0,
+    _LOWER,
+    _RAISE,
+    _BLANK
+};
+
+#define LOWER FN_MO13
+#define RAISE FN_MO23
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_NO,   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 |      |      | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+// Blank layer because via needs 4 by default
+[_BLANK] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
+)
+};
+
diff --git a/keyboards/plum47/keymaps/via/rules.mk b/keyboards/plum47/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/plum47/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/plum47/readme.md b/keyboards/plum47/readme.md
new file mode 100644
index 0000000000..7e8745249c
--- /dev/null
+++ b/keyboards/plum47/readme.md
@@ -0,0 +1,28 @@
+# plum47
+
+![plum47](https://i.imgur.com/t3rjsWIh.png)
+
+Plum47 is a 4-row, 12-column (47 key) ortholinear keyboard sold domestically in Japan as a 
+home build kit.  It features MX sockets for hot-swap keyswitch support, and a bezel-less
+acrylic sandwich case.  The controller is a Pro Micro.
+
+* Keyboard Developer: [Masayuki Takagi](https://github.com/takagi)
+* Keyboard submitted by [Andrew Hamilton](https://github.com/awh-tokyo)
+* Hardware Supported: plum47 keyboard kit including PCB and Pro Micro controller
+* Hardware Availability: https://shop.yushakobo.jp/products/consign_plum47
+
+Make example for this keyboard (after setting up your build environment):
+
+    make plum47:default
+
+Flashing example for this keyboard:
+
+    make plum47:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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 as follows:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
diff --git a/keyboards/plum47/rules.mk b/keyboards/plum47/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/plum47/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From f483520ff9b66cebacf880c4b079b2c490a7e80a Mon Sep 17 00:00:00 2001
From: ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
Date: Thu, 15 Sep 2022 09:14:19 +0900
Subject: [PATCH 357/959] Fix problem that Chidori is not recognized by host
 computer. (#17882)

---
 keyboards/kagizaraya/chidori/config.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
index 90de362e8b..cf9c38b64f 100644
--- a/keyboards/kagizaraya/chidori/config.h
+++ b/keyboards/kagizaraya/chidori/config.h
@@ -152,3 +152,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
+
+/* USB config */
+#define USB_MAX_POWER_CONSUMPTION 100
+#define USB_COUNT_SOF 0
+#define USB_INTR_CFG_SET (1 << ISC01)
+#define USB_INTR_ENABLE_BIT INT0
+#define USB_INTR_PENDING_BIT INTF0
+#define USB_INTR_VECTOR INT0_vect

From 40b0b3a9830097ac6be2a2acfd2aa3cf7300fd8f Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Thu, 15 Sep 2022 07:48:43 +0100
Subject: [PATCH 358/959] Fix cirque tap from secondary side (#18351)

---
 drivers/sensors/cirque_pinnacle_gestures.c        | 8 --------
 quantum/pointing_device/pointing_device_drivers.c | 5 ++++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/sensors/cirque_pinnacle_gestures.c b/drivers/sensors/cirque_pinnacle_gestures.c
index a73b745e59..ae3eca71c2 100644
--- a/drivers/sensors/cirque_pinnacle_gestures.c
+++ b/drivers/sensors/cirque_pinnacle_gestures.c
@@ -37,14 +37,6 @@ static report_mouse_t trackpad_tap(report_mouse_t mouse_report, pinnacle_data_t
         if (!touchData.zValue) {
             if (timer_elapsed(tap.timer) < CIRQUE_PINNACLE_TAPPING_TERM && tap.timer != 0) {
                 mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, true, POINTING_DEVICE_BUTTON1);
-                pointing_device_set_report(mouse_report);
-                pointing_device_send();
-#    if TAP_CODE_DELAY > 0
-                wait_ms(TAP_CODE_DELAY);
-#    endif
-                mouse_report.buttons = pointing_device_handle_buttons(mouse_report.buttons, false, POINTING_DEVICE_BUTTON1);
-                pointing_device_set_report(mouse_report);
-                pointing_device_send();
             }
         }
         tap.timer = timer_read();
diff --git a/quantum/pointing_device/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
index 096ad5d028..d7e0b90917 100644
--- a/quantum/pointing_device/pointing_device_drivers.c
+++ b/quantum/pointing_device/pointing_device_drivers.c
@@ -117,8 +117,11 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     pinnacle_data_t   touchData = cirque_pinnacle_read_data();
     mouse_xy_report_t report_x = 0, report_y = 0;
     static uint16_t   x = 0, y = 0;
+#        if defined(CIRQUE_PINNACLE_TAP_ENABLE)
+    mouse_report.buttons        = pointing_device_handle_buttons(mouse_report.buttons, false, POINTING_DEVICE_BUTTON1);
+#        endif
 #        ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
-    cursor_glide_t    glide_report = {0};
+    cursor_glide_t glide_report = {0};
 
     if (cursor_glide_enable) {
         glide_report = cursor_glide_check(&glide);

From 56bad5d357d0d670a64db12107e9d687e566e759 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Thu, 15 Sep 2022 16:52:38 +1000
Subject: [PATCH 359/959] [Keyboard] Removal of deprecated defines in IDOBAO
 keyboards (#18358)

---
 keyboards/idobao/id42/config.h      |  1 -
 keyboards/idobao/id75/v1/config.h   | 21 ++++++++++++++++-----
 keyboards/idobao/id80/v2/config.h   | 24 ++++++++++++------------
 keyboards/idobao/id87/v1/config.h   | 21 ++++++++++++++++-----
 keyboards/idobao/montex/v1/config.h | 23 ++++++++++++++++-------
 keyboards/idobao/montex/v2/config.h |  1 -
 6 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h
index ca26f503c0..a95578a9b3 100755
--- a/keyboards/idobao/id42/config.h
+++ b/keyboards/idobao/id42/config.h
@@ -14,7 +14,6 @@
 /* Change the USB polling rate [default = 1000Hz (1ms)] and
  * use larger value of keys per scan for elite games */
 #define USB_POLLING_INTERVAL_MS  2  // 500Hz
-#define QMK_KEYS_PER_SCAN  12
 
 /* LED Matrix & Animations */
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 8671bbcd75..0bb05a810c 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -45,11 +45,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
+    // RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_EFFECT_ALTERNATING
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_TWINKLE
+
+    #define RGBLED_NUM 16
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
index 02bc0f6809..a007cff40c 100644
--- a/keyboards/idobao/id80/v2/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -70,18 +70,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//    #define RGBLIGHT_EFFECT_BREATHING
-//    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//    #define RGBLIGHT_EFFECT_SNAKE
-//    #define RGBLIGHT_EFFECT_KNIGHT
-//    #define RGBLIGHT_EFFECT_CHRISTMAS
-//    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//    #define RGBLIGHT_EFFECT_RGB_TEST
-//    #define RGBLIGHT_EFFECT_ALTERNATING
+
+    // RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_EFFECT_ALTERNATING
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 /* Bootmagic Lite key configuration: use the Esc key */
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index 3d60f14f1e..6c2d6fc9ce 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/config.h
@@ -50,9 +50,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 22 /* 16 Bottom 6 top*/
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
+    // RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_EFFECT_ALTERNATING
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_TWINKLE
+
+    #define RGBLED_NUM 22 /* 16 Bottom 6 top*/
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
 #endif
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 6cd45b2598..fe1ea61d35 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -44,13 +44,22 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
+    // RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_EFFECT_ALTERNATING
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_TWINKLE
+
+    #define RGBLED_NUM 4
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
 #endif
diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h
index 47d43ca458..98ba567203 100755
--- a/keyboards/idobao/montex/v2/config.h
+++ b/keyboards/idobao/montex/v2/config.h
@@ -15,7 +15,6 @@
         #define DRIVER_LED_TOTAL 27  // -4 disabled underglow LEDs
     #endif
 
-    // #define RGBLIGHT_ANIMATIONS  // don't use, please explicitly define
     // #define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // don't use, too few key to make it look good
     #define RGB_MATRIX_KEYPRESSES
 

From 57c35bd8177d975f3a62505e51d531d1f4587215 Mon Sep 17 00:00:00 2001
From: ziptyze <mwcordier@gmail.com>
Date: Thu, 15 Sep 2022 14:16:58 -0400
Subject: [PATCH 360/959] [Keyboard] Add pi40 (#18207)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/1upkeyboards/pi40/config.h          |  99 ++++++
 keyboards/1upkeyboards/pi40/halconf.h         |   7 +
 keyboards/1upkeyboards/pi40/info.json         | 115 +++++++
 .../pi40/keymaps/default/keymap.c             | 124 +++++++
 .../pi40/keymaps/default/rules.mk             |   1 +
 .../1upkeyboards/pi40/keymaps/via/keymap.c    | 268 +++++++++++++++
 .../1upkeyboards/pi40/keymaps/via/rules.mk    |   4 +
 keyboards/1upkeyboards/pi40/lib/glcdfont.c    | 231 +++++++++++++
 keyboards/1upkeyboards/pi40/mcuconf.h         |  10 +
 keyboards/1upkeyboards/pi40/pi40.c            | 312 ++++++++++++++++++
 keyboards/1upkeyboards/pi40/readme.md         |  38 +++
 keyboards/1upkeyboards/pi40/rules.mk          |  26 ++
 12 files changed, 1235 insertions(+)
 create mode 100644 keyboards/1upkeyboards/pi40/config.h
 create mode 100644 keyboards/1upkeyboards/pi40/halconf.h
 create mode 100644 keyboards/1upkeyboards/pi40/info.json
 create mode 100644 keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
 create mode 100644 keyboards/1upkeyboards/pi40/keymaps/default/rules.mk
 create mode 100644 keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
 create mode 100644 keyboards/1upkeyboards/pi40/keymaps/via/rules.mk
 create mode 100644 keyboards/1upkeyboards/pi40/lib/glcdfont.c
 create mode 100644 keyboards/1upkeyboards/pi40/mcuconf.h
 create mode 100644 keyboards/1upkeyboards/pi40/pi40.c
 create mode 100644 keyboards/1upkeyboards/pi40/readme.md
 create mode 100644 keyboards/1upkeyboards/pi40/rules.mk

diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
new file mode 100644
index 0000000000..5bda238430
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -0,0 +1,99 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 10
+
+#ifdef OLED_ENABLE
+#    define OLED_DISPLAY_128X32
+#define I2C1_SCL_PIN        GP17
+#define I2C1_SDA_PIN        GP16
+#define I2C_DRIVER I2CD1
+#define OLED_BRIGHTNESS 128
+#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
+#endif
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 }
+#define MATRIX_COL_PINS { GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12 }
+
+#define ENCODERS_PAD_A { GP14 }
+#define ENCODERS_PAD_B { GP13 }
+
+#define RGB_DI_PIN GP0
+#define DRIVER_LED_TOTAL 47
+#define RGBLED_NUM 47
+#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS  
+#    define RGBLIGHT_LIMIT_VAL 150
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/halconf.h b/keyboards/1upkeyboards/pi40/halconf.h
new file mode 100644
index 0000000000..39fbe3e88c
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json
new file mode 100644
index 0000000000..69f95e3be3
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/info.json
@@ -0,0 +1,115 @@
+{
+    "keyboard_name": "pi40",
+    "manufacturer": "1upkeyboards",
+    "usb": {
+        "vid": "0x6F75",
+        "pid": "0x5600",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [3, 6], "x": 11, "y": 0 },
+                { "matrix": [0, 0], "x": 0, "y": 1 },
+                { "matrix": [0, 1], "x": 1, "y": 1 },
+                { "matrix": [0, 2], "x": 2, "y": 1 },
+                { "matrix": [0, 3], "x": 3, "y": 1 },
+                { "matrix": [0, 4], "x": 4, "y": 1 },
+                { "matrix": [0, 5], "x": 5, "y": 1 },
+                { "matrix": [0, 6], "x": 6, "y": 1 },
+                { "matrix": [0, 7], "x": 7, "y": 1 },
+                { "matrix": [0, 8], "x": 8, "y": 1 },
+                { "matrix": [0, 9], "x": 9, "y": 1 },
+                { "matrix": [0, 10], "x": 10, "y": 1 },
+                { "matrix": [0, 11], "x": 11, "y": 1 },
+                { "matrix": [1, 0], "x": 0, "y": 2 },
+                { "matrix": [1, 1], "x": 1, "y": 2 },
+                { "matrix": [1, 2], "x": 2, "y": 2 },
+                { "matrix": [1, 3], "x": 3, "y": 2 },
+                { "matrix": [1, 4], "x": 4, "y": 2 },
+                { "matrix": [1, 5], "x": 5, "y": 2 },
+                { "matrix": [1, 6], "x": 6, "y": 2 },
+                { "matrix": [1, 7], "x": 7, "y": 2 },
+                { "matrix": [1, 8], "x": 8, "y": 2 },
+                { "matrix": [1, 9], "x": 9, "y": 2 },
+                { "matrix": [1, 10], "x": 10, "y": 2 },
+                { "matrix": [1, 11], "x": 11, "y": 2 },
+                { "matrix": [2, 0], "x": 0, "y": 3 },
+                { "matrix": [2, 1], "x": 1, "y": 3 },
+                { "matrix": [2, 2], "x": 2, "y": 3 },
+                { "matrix": [2, 3], "x": 3, "y": 3 },
+                { "matrix": [2, 4], "x": 4, "y": 3 },
+                { "matrix": [2, 5], "x": 5, "y": 3 },
+                { "matrix": [2, 6], "x": 6, "y": 3 },
+                { "matrix": [2, 7], "x": 7, "y": 3 },
+                { "matrix": [2, 8], "x": 8, "y": 3 },
+                { "matrix": [2, 9], "x": 9, "y": 3 },
+                { "matrix": [2, 10], "x": 10, "y": 3 },
+                { "matrix": [2, 11], "x": 11, "y": 3 },
+                { "matrix": [3, 0], "x": 0, "y": 4 },
+                { "matrix": [3, 1], "x": 1, "y": 4 },
+                { "matrix": [3, 2], "x": 2, "y": 4 },
+                { "matrix": [3, 3], "x": 3, "y": 4 },
+                { "matrix": [3, 4], "x": 4, "y": 4 },
+                { "matrix": [3, 5], "x": 5, "y": 4, "w": 2},
+                { "matrix": [3, 7], "x": 7, "y": 4 },
+                { "matrix": [3, 8], "x": 8, "y": 4 },
+                { "matrix": [3, 9], "x": 9, "y": 4 },
+                { "matrix": [3, 10], "x": 10, "y": 4 },
+                { "matrix": [3, 11], "x": 11, "y": 4 }
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+                { "matrix": [1, 11], "x": 11, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+                { "matrix": [2, 11], "x": 11, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "x": 5, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3, "label": "ENC" },
+                { "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 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e417828f72
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
@@ -0,0 +1,124 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _ONE = 0,
+    _TWO,
+    _THREE,
+    _FOUR
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Qwerty
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |RGBTOG|
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |Adjust| Ctrl | Alt  | GUI  |Lower |   Space     |Raise | Left | Down |  Up  |Right |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_ONE] =  LAYOUT (
+                                                                                                           RGB_TOG,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+        MO(3),   KC_LCTL, KC_LALT, KC_LGUI, MO(1),       KC_SPC,       MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Lower
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              | MUTE |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_TWO] = LAYOUT (
+                                                                                                                 KC_MUTE,
+        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
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              | MUTE |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |   `  |   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 |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      | Mute |      | Next | Vol- | Vol+ | Play |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_THREE] = LAYOUT (
+                                                                                                           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_BSPC,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+
+    /* Adjust (Lower + Raise)
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              | MUTE |
+    *                       v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+    * |------+------+------+------+------+------+------+------+------+------+------+------| 
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      | Mute |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_FOUR] = LAYOUT (
+                                                                                                           KC_MUTE,
+        _______, QK_BOOT,   DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_ONE]   =  { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+    [_TWO]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
+    [_THREE] =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
+    [_FOUR]  =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) }
+};
+#endif
diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/rules.mk b/keyboards/1upkeyboards/pi40/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
new file mode 100644
index 0000000000..48c201f0a3
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
@@ -0,0 +1,268 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _ONE = 0,
+    _TWO,
+    _THREE,
+    _FOUR,
+    _FIVE,
+    _SIX,
+    _SEVEN,
+    _EIGHT,
+    _NINE,
+    _TEN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Qwerty
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |RGBTOG|
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |Adjust| Ctrl | Alt  | GUI  |Lower |   Space     |Raise | Left | Down |  Up  |Right |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_ONE] =  LAYOUT (
+                                                                                                           RGB_TOG,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+        MO(3),   KC_LCTL, KC_LALT, KC_LGUI, MO(1),       KC_SPC,       MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Lower
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              | MUTE |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_TWO] = LAYOUT (
+                                                                                                                 KC_MUTE,
+        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
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              | MUTE |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |   `  |   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 |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      | Mute |      | Next | Vol- | Vol+ | Play |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_THREE] = LAYOUT (
+                                                                                                           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_BSPC,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+
+    /* Adjust (Lower + Raise)
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              | MUTE |
+    *                       v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+    * |------+------+------+------+------+------+------+------+------+------+------+------| 
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      | Mute |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_FOUR] = LAYOUT (
+                                                                                                           KC_MUTE,
+        _______, QK_BOOT,   DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    ),
+
+    /* Placeholder
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |      |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_FIVE] = LAYOUT (
+                                                                                                           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    ),
+
+    /* Placeholder
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |      |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_SIX] = LAYOUT (
+                                                                                                           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    ),
+
+    /* Placeholder
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |      |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_SEVEN] = LAYOUT (
+                                                                                                           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    ),
+
+    /* Placeholder
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |      |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_EIGHT] = LAYOUT (
+                                                                                                           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    ),
+
+    /* Placeholder
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |      |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_NINE] = LAYOUT (
+                                                                                                           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    ),
+
+    /* Placeholder
+    *                                                                               ╱⎺⎺⎺⎺╲
+    *                                                                              |      |
+    *                                                                              ╲⎽⎽⎽⎽╱ 
+    * ,-----------------------------------------------------------------------------------.
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * |------+------+------+------+------+------+------+------+------+------+------+------|
+    * |      |      |      |      |      |      |      |      |      |      |      |      |
+    * `-----------------------------------------------------------------------------------'
+    */
+    [_TEN] = LAYOUT (
+                                                                                                           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_ONE]   =  { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+    [_TWO]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
+    [_THREE] =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
+    [_FOUR]  =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
+    [_FIVE]  =  { ENCODER_CCW_CW(_______,  _______) },
+    [_SIX]   =  { ENCODER_CCW_CW(_______,  _______) },
+    [_SEVEN] =  { ENCODER_CCW_CW(_______,  _______) },
+    [_EIGHT] =  { ENCODER_CCW_CW(_______,  _______) },
+    [_NINE]  =  { ENCODER_CCW_CW(_______,  _______) },
+    [_TEN]   =  { ENCODER_CCW_CW(_______,  _______) },
+};
+#endif
diff --git a/keyboards/1upkeyboards/pi40/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi40/keymaps/via/rules.mk
new file mode 100644
index 0000000000..bf70b1f3e0
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/lib/glcdfont.c b/keyboards/1upkeyboards/pi40/lib/glcdfont.c
new file mode 100644
index 0000000000..4b354756b6
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/lib/glcdfont.c
@@ -0,0 +1,231 @@
+// Copyright 2022 @filterpaper
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "progmem.h"
+
+static const unsigned char PROGMEM font[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
+    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xE0, 0x18, 0x02,
+    0x00, 0x3C, 0x1E, 0x06, 0x0E, 0x0A,
+    0x1A, 0x0E, 0x26, 0xFF, 0xBF, 0x0D,
+    0x00, 0x80, 0x80, 0x81, 0xFF, 0xFE,
+    0xF8, 0x01, 0x01, 0x03, 0x03, 0x03,
+    0x03, 0x05, 0x05, 0x02, 0x02, 0x0A,
+    0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
+    0x0C, 0x04, 0x10, 0x18, 0x20, 0xC0,
+    0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xD0, 0x58, 0x78,
+    0x68, 0x2C, 0x24, 0x34, 0xF4, 0xF4,
+    0x3C, 0x3C, 0xFC, 0xF8, 0xF8, 0x70,
+    0xF0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xC0, 0x7C, 0x07, 0x80, 0xE0,
+    0x60, 0x64, 0xE2, 0x60, 0x10, 0x10,
+    0x20, 0x22, 0x12, 0x17, 0x3F, 0x0B,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x21,
+    0x6F, 0xFC, 0xE0, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+    0x60, 0x60, 0x70, 0x70, 0xF0, 0xF0,
+    0xD0, 0xD0, 0xD0, 0xD0, 0x50, 0x50,
+    0x50, 0x70, 0x78, 0x78, 0x78, 0x7C,
+    0x7F, 0x7D, 0x7C, 0x5E, 0x4F, 0x44,
+    0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x38, 0x30, 0x30, 0x30, 0x30,
+    0x30, 0x30, 0x58, 0x46, 0x47, 0x41,
+    0x41, 0x01, 0x01, 0x03, 0x03, 0x42,
+    0x42, 0x42, 0x46, 0x46, 0x46, 0x46,
+    0x42, 0x43, 0x43, 0x73, 0x77, 0x72,
+    0x70, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x60, 0x61, 0x67, 0x6F, 0x7E, 0x78,
+    0x78, 0x70, 0x70, 0x70, 0x70, 0x70,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x40, 0x40, 0x40, 0x48, 0x58, 0x58,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    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/1upkeyboards/pi40/mcuconf.h b/keyboards/1upkeyboards/pi40/mcuconf.h
new file mode 100644
index 0000000000..df94cb0346
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mcuconf.h
@@ -0,0 +1,10 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_I2C_USE_I2C0
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C0 TRUE
+#define RP_I2C_USE_I2C1 FALSE
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/pi40.c b/keyboards/1upkeyboards/pi40/pi40.c
new file mode 100644
index 0000000000..8e2fc4c3d3
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/pi40.c
@@ -0,0 +1,312 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+
+static uint32_t oled_logo_timer = 0;
+static bool clear_logo = true;
+static const char PROGMEM my_logo[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+        0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x0f, 
+        0x0f, 0x0f, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+        0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 
+        0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xfb, 
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 
+        0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11 },
+    { 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12 },
+    { 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 },
+    { 46, 45, 44, 43, 42, 41, NO_LED, 40, 39, 38, 37, 36 }
+}, {
+    // LED Index to Physical Position
+    {   9,  8 }, {  28,  8 }, {  46,  8 }, {  65,  8 }, {  84,  8 }, { 102,  8 }, { 121,  8 }, { 140,  8 }, { 159,  8 }, { 177,  8 }, { 196,  8 }, { 215,  8 },
+    { 215, 24 }, { 196, 24 }, { 177, 24 }, { 159, 24 }, { 140, 24 }, { 121, 24 }, { 102, 24 }, {  84, 24 }, {  65, 24 }, {  46, 24 }, {  28, 24 }, {   9, 24 },
+    {   9, 40 }, {  28, 40 }, {  46, 40 }, {  65, 40 }, {  84, 40 }, { 102, 40 }, { 121, 40 }, { 140, 40 }, { 159, 40 }, { 177, 40 }, { 196, 40 }, { 215, 40 },
+    { 215, 56 }, { 196, 56 }, { 177, 56 }, { 159, 56 }, { 140, 56 }, { 112, 56 }, {  84, 56 }, {  65, 56 }, {  46, 56 }, {  28, 56 }, {   9, 56 }
+}, {
+    // LED Index to Flag
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+} };
+#endif
+
+#ifdef OLED_ENABLE
+
+void init_timer(void){
+   oled_logo_timer = timer_read32();
+};
+
+void user_oled_magic(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("One\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("Two\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Three\n"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Four\n"), false);
+            break;
+        case 4:
+            oled_write_P(PSTR("Five\n"), false);
+            break;
+        case 5:
+            oled_write_P(PSTR("Six\n"), false);
+            break;
+        case 6:
+            oled_write_P(PSTR("Seven\n"), false);
+            break;
+        case 7:
+            oled_write_P(PSTR("Eight\n"), false);
+            break;
+        case 8:
+            oled_write_P(PSTR("Nine\n"), false);
+            break;
+        case 9:
+            oled_write_P(PSTR("Ten\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.caps_lock ? PSTR("Cap(x) ") : PSTR("Cap( ) "), false);
+    oled_write_P(led_state.num_lock ? PSTR("Num(x) ") : PSTR("Num( ) "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("Scrl(x)") : PSTR("Scrl( )"), false);
+
+
+    switch (rgb_matrix_get_mode()) {
+        case 1:
+            oled_write_P(PSTR("Solid Color\n                  "), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Alphas Mods\n                  "), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Gradient Up Down\n                  "), false);
+            break;
+        case 4:
+            oled_write_P(PSTR("Gradient Left Right\n                  "), false);
+            break;
+        case 5:
+            oled_write_P(PSTR("Breathing\n                  "), false);
+            break;
+        case 6:
+            oled_write_P(PSTR("Band Sat\n                  "), false);
+            break;
+        case 7:
+            oled_write_P(PSTR("Band Val\n                  "), false);
+            break;
+        case 8:
+            oled_write_P(PSTR("Band Pinwheel Sat\n                  "), false);
+            break;
+        case 9:
+            oled_write_P(PSTR("Band Pinwheel Val\n                  "), false);
+            break;
+        case 10:
+            oled_write_P(PSTR("Band Spiral Sat\n                  "), false);
+            break;
+        case 11:
+            oled_write_P(PSTR("Band Spiral Val\n                  "), false);
+            break;
+        case 12:
+            oled_write_P(PSTR("Cycle All\n                  "), false);
+            break;
+        case 13:
+            oled_write_P(PSTR("Cycle Left Right\n                  "), false);
+            break;
+        case 14:
+            oled_write_P(PSTR("Cycle Up Down\n                  "), false);
+            break;
+        case 15:
+            oled_write_P(PSTR("Rainbow\nMoving Chevron    "), false);
+            break;
+        case 16:
+            oled_write_P(PSTR("Cycle Out In\n                  "), false);
+            break;
+        case 17:
+            oled_write_P(PSTR("Cycle Out In Dual\n                  "), false);
+            break;
+        case 18:
+            oled_write_P(PSTR("Cycle Pinwheel\n                  "), false);
+            break;
+        case 19:
+            oled_write_P(PSTR("Cycle Spiral\n                  "), false);
+            break;
+        case 20:
+            oled_write_P(PSTR("Dual Beacon\n                  "), false);
+            break;
+        case 21:
+            oled_write_P(PSTR("Rainbow Beacon\n                  "), false);
+            break;
+        case 22:
+            oled_write_P(PSTR("Rainbow Pinwheels\n                  "), false);
+            break;
+        case 23:
+            oled_write_P(PSTR("Raindrops\n                  "), false);
+            break;
+        case 24:
+            oled_write_P(PSTR("Jellybean Raindrops\n                  "), false);
+            break;
+        case 25:
+            oled_write_P(PSTR("Hue Breathing\n                  "), false);
+            break;
+        case 26:
+            oled_write_P(PSTR("Hue Pendulum\n                  "), false);
+            break;
+        case 27:
+            oled_write_P(PSTR("Hue Wave\n                  "), false);
+            break;
+        case 28:
+            oled_write_P(PSTR("Pixel Rain\n                  "), false);
+            break;
+        case 29:
+            oled_write_P(PSTR("Pixel Flow\n                  "), false);
+            break;
+        case 30:
+            oled_write_P(PSTR("Pixel Fractal\n                  "), false);
+            break;
+        case 31:
+            oled_write_P(PSTR("Typing Heatmap\n                  "), false);
+            break;
+        case 32:
+            oled_write_P(PSTR("Digital Rain\n                  "), false);
+            break;
+        case 33:
+            oled_write_P(PSTR("Solid Reactive\nSimple            "), false);
+            break;
+        case 34:
+            oled_write_P(PSTR("Solid Reactive\n                  "), false);
+            break;
+        case 35:
+            oled_write_P(PSTR("Solid Reactive\nWide              "), false);
+            break;
+        case 36:
+            oled_write_P(PSTR("Solid Reactive\nMultiwide         "), false);
+            break;
+        case 37:
+            oled_write_P(PSTR("Solid Reactive\nCross             "), false);
+            break;
+        case 38:
+            oled_write_P(PSTR("Solid Reactive\nMulticross        "), false);
+            break;
+        case 39:
+            oled_write_P(PSTR("Solid Reactive\nNexus             "), false);
+            break;
+        case 40:
+            oled_write_P(PSTR("Solid Reactive\nMultinexus        "), false);
+            break;
+        case 41:
+            oled_write_P(PSTR("Splash\n                  "), false);
+            break;
+        case 42:
+            oled_write_P(PSTR("Multisplash\n                  "), false);
+            break;
+        case 43:
+            oled_write_P(PSTR("Solid Splash\n                  "), false);
+            break;
+        case 44:
+            oled_write_P(PSTR("Solid Multisplash\n                  "), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined\n                  "), false);
+    }
+
+}
+
+void render_logo(void) {
+    oled_write_raw_P(my_logo, sizeof(my_logo));
+}
+
+void clear_screen(void) {
+    if (clear_logo){
+      for (uint8_t i = 0; i < OLED_DISPLAY_HEIGHT; ++i) {
+        for (uint8_t j = 0; j < OLED_DISPLAY_WIDTH; ++j) {
+          oled_write_raw_byte(0x0, i*OLED_DISPLAY_WIDTH + j);
+        }
+      }
+      clear_logo = false;
+    }
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+void keyboard_post_init_kb(void) {
+    init_timer();
+
+    keyboard_post_init_user();
+}
+
+#    define SHOW_LOGO 5000
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    if ((timer_elapsed32(oled_logo_timer) < SHOW_LOGO)){
+        render_logo();
+    }else{
+      clear_screen();
+      user_oled_magic();
+    }
+    return false;
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/readme.md b/keyboards/1upkeyboards/pi40/readme.md
new file mode 100644
index 0000000000..95ddec4358
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/readme.md
@@ -0,0 +1,38 @@
+# pi40
+
+![pi40](https://i.imgur.com/ONVtaVZh.jpeg)
+
+The pi40 is a 4x12 ortholinear keyboard with a fixed 2u spacebar using a Raspberry Pi Pico for the controller.
+
+It includes options for a rotary encoder, SSD1306 oled, and per-key in-switch RGB LEDs.
+
+All unused GPIO pins are broken out on the main pcb, as well as the available voltage pins.
+
+This firmware also includes the option for VIA which includes configuration options for the rotary encoder, matrix lighting, and up to 10 layers.
+
+Default oled configuration displays:
+   - current layer
+   - caps lock status
+   - num lock status
+   - scroll lock status
+   - current RGB lighting mode
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+* Hardware Availability: (https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/pi40-keyboard-kit/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/pi40:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/pi40:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix, the top left key, and plug in the keyboard
+* **BOOTSEL button**: Hold down the BOOTSEL button on the pico, and plug in the keyboard
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
new file mode 100644
index 0000000000..ecf7a9ce3a
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = RP2040
+BOOTLOADER = rp2040
+BOARD = GENERIC_RP_RP2040
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+WS2812_DRIVER = vendor
+ENCODER_ENABLE = yes
+
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
\ No newline at end of file

From e1aed8da08468fd04bb9e33129a5a26b80c0e093 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Fri, 16 Sep 2022 00:06:00 +0100
Subject: [PATCH 361/959] Move fake EE_HANDS (#18352)

---
 quantum/eeconfig.c                | 10 ----------
 quantum/split_common/split_util.c | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 0ff9996ca4..0b7ae39907 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -57,16 +57,6 @@ void eeconfig_init_quantum(void) {
     eeprom_update_dword(EECONFIG_RGB_MATRIX, 0);
     eeprom_update_word(EECONFIG_RGB_MATRIX_EXTENDED, 0);
 
-    // TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS
-    //        within the emulated eeprom via dfu-util or another tool
-#if defined INIT_EE_HANDS_LEFT
-#    pragma message "Faking EE_HANDS for left hand"
-    eeprom_update_byte(EECONFIG_HANDEDNESS, 1);
-#elif defined INIT_EE_HANDS_RIGHT
-#    pragma message "Faking EE_HANDS for right hand"
-    eeprom_update_byte(EECONFIG_HANDEDNESS, 0);
-#endif
-
 #if defined(HAPTIC_ENABLE)
     haptic_reset();
 #else
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 4892b7f8d8..0b3338ed6f 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -139,6 +139,20 @@ void split_pre_init(void) {
     if (!eeconfig_is_enabled()) {
         eeconfig_init();
     }
+    // TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS within the emulated eeprom via dfu-util or another tool
+#    if defined(INIT_EE_HANDS_LEFT) || defined(INIT_EE_HANDS_RIGHT)
+#        if defined(INIT_EE_HANDS_LEFT)
+#            pragma message "Faking EE_HANDS for left hand"
+    const bool should_be_left = true;
+#        else
+#            pragma message "Faking EE_HANDS for right hand"
+    const bool should_be_left = false;
+#        endif
+    bool       is_left        = eeconfig_read_handedness();
+    if (is_left != should_be_left) {
+        eeconfig_update_handedness(should_be_left);
+    }
+#    endif // defined(INIT_EE_HANDS_LEFT) || defined(INIT_EE_HANDS_RIGHT)
 #endif
     isLeftHand = is_keyboard_left();
 

From 617f957e82d8c5213f77ce8003c4c17439d26077 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 16 Sep 2022 02:03:18 +0100
Subject: [PATCH 362/959] Fix handwired/swiftrax/bumblebee layout macro
 (#18377)

---
 keyboards/handwired/swiftrax/bumblebee/bumblebee.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
index 2d1fdf7a46..1ab4c00abc 100644
--- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
+++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define KC_NO XXX
+#define XXX KC_NO
 
 #include "quantum.h"
 

From bc0756f294f9555267dbd7007478804f537614c1 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 16 Sep 2022 12:05:25 +1000
Subject: [PATCH 363/959] Disconnect `usb.device_ver` (#18259)

---
 data/mappings/info_config.json         |  4 +---
 lib/python/qmk/cli/generate/layouts.py |  6 ------
 lib/python/qmk/info.py                 | 14 --------------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index af7ae0749c..eb11f87e7d 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -20,9 +20,7 @@
     "COMBO_COUNT": {"info_key": "combo.count", "value_type": "int"},
     "COMBO_TERM": {"info_key": "combo.term", "value_type": "int"},
     "DEBOUNCE": {"info_key": "debounce", "value_type": "int"},
-    "DEVICE_VER": {"info_key": "usb.device_ver", "value_type": "hex"},
-    # TODO: Replace ^^^ with vvv
-    #"DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"},
+    "DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"},
     "DIODE_DIRECTION": {"info_key": "diode_direction"},
     "DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.double_tap_shift_turns_on", "value_type": "bool"},
     "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "bool"},
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
index 193633baf6..8336f36b50 100755
--- a/lib/python/qmk/cli/generate/layouts.py
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -9,12 +9,6 @@ from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.path import is_keyboard, normpath
 from qmk.commands import dump_lines
 
-usb_properties = {
-    'vid': 'VENDOR_ID',
-    'pid': 'PRODUCT_ID',
-    'device_ver': 'DEVICE_VER',
-}
-
 
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index b039c2c424..834f7d9170 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -437,19 +437,6 @@ def _extract_matrix_info(info_data, config_c):
     return info_data
 
 
-# TODO: kill off usb.device_ver in favor of usb.device_version
-def _extract_device_version(info_data):
-    if info_data.get('usb'):
-        if info_data['usb'].get('device_version') and not info_data['usb'].get('device_ver'):
-            (major, minor, revision) = info_data['usb']['device_version'].split('.', 3)
-            info_data['usb']['device_ver'] = f'0x{major.zfill(2)}{minor}{revision}'
-        if not info_data['usb'].get('device_version') and info_data['usb'].get('device_ver'):
-            major = int(info_data['usb']['device_ver'][2:4])
-            minor = int(info_data['usb']['device_ver'][4])
-            revision = int(info_data['usb']['device_ver'][5])
-            info_data['usb']['device_version'] = f'{major}.{minor}.{revision}'
-
-
 def _config_to_json(key_type, config_value):
     """Convert config value using spec
     """
@@ -535,7 +522,6 @@ def _extract_config_h(info_data, config_c):
     _extract_split_right_pins(info_data, config_c)
     _extract_encoders(info_data, config_c)
     _extract_split_encoders(info_data, config_c)
-    _extract_device_version(info_data)
 
     return info_data
 

From cf88d956130ef847677cf4defd1f21d4e72c677f Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Fri, 16 Sep 2022 18:19:10 +1000
Subject: [PATCH 364/959] Add ability to remove temporary files during
 multibuild. (#18381)

---
 lib/python/qmk/cli/multibuild.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py
index a1db669ca8..5e0f0b5188 100755
--- a/lib/python/qmk/cli/multibuild.py
+++ b/lib/python/qmk/cli/multibuild.py
@@ -28,6 +28,7 @@ def _is_split(keyboard_name):
     return True if 'SPLIT_KEYBOARD' in rules_mk and rules_mk['SPLIT_KEYBOARD'].lower() == 'yes' else False
 
 
+@cli.argument('-t', '--no-temp', arg_only=True, action='store_true', help="Remove temporary files during build.")
 @cli.argument('-j', '--parallel', type=int, default=1, help="Set the number of parallel make jobs; 0 means unlimited.")
 @cli.argument('-c', '--clean', arg_only=True, action='store_true', help="Remove object files before compiling.")
 @cli.argument('-f', '--filter', arg_only=True, action='append', default=[], help="Filter the list of keyboards based on the supplied value in rules.mk. Supported format is 'SPLIT_KEYBOARD=yes'. May be passed multiple times.")
@@ -77,11 +78,26 @@ all: {keyboard_safe}_binary
 		|| {{ grep '\[WARNINGS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;33m[WARNINGS]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" ; }} \\
 		|| printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}"
 	@rm -f "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" || true
-
 """# noqa
                 )
                 # yapf: enable
 
+                if cli.args.no_temp:
+                    # yapf: disable
+                    f.write(
+                        f"""\
+	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{cli.args.keymap}.elf" 2>/dev/null || true
+	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{cli.args.keymap}.map" 2>/dev/null || true
+	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{cli.args.keymap}.hex" 2>/dev/null || true
+	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{cli.args.keymap}.bin" 2>/dev/null || true
+	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{cli.args.keymap}.uf2" 2>/dev/null || true
+	@rm -rf "{QMK_FIRMWARE}/.build/obj_{keyboard_safe}" || true
+	@rm -rf "{QMK_FIRMWARE}/.build/obj_{keyboard_safe}_{cli.args.keymap}" || true
+"""# noqa
+                    )
+                    # yapf: enable
+                f.write('\n')
+
     cli.run([make_cmd, *get_make_parallel_args(cli.args.parallel), '-f', makefile.as_posix(), 'all'], capture_output=False, stdin=DEVNULL)
 
     # Check for failures

From 1ec8ae8a49f02ae732cc5315d75bf2a6505fe00d Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Fri, 16 Sep 2022 17:25:16 +0100
Subject: [PATCH 365/959] Initial support for Tetromino added (#18341)

by the spherical lad @an-achronism
---
 keyboards/an_achronism/tetromino/README.md    |  42 ++++
 keyboards/an_achronism/tetromino/config.h     |  31 +++
 keyboards/an_achronism/tetromino/info.json    | 184 ++++++++++++++++++
 .../tetromino/keymaps/default/keymap.c        |  62 ++++++
 .../tetromino/keymaps/indicators/config.h     |  30 +++
 .../tetromino/keymaps/indicators/keymap.c     | 124 ++++++++++++
 keyboards/an_achronism/tetromino/rules.mk     |   2 +
 7 files changed, 475 insertions(+)
 create mode 100644 keyboards/an_achronism/tetromino/README.md
 create mode 100644 keyboards/an_achronism/tetromino/config.h
 create mode 100644 keyboards/an_achronism/tetromino/info.json
 create mode 100644 keyboards/an_achronism/tetromino/keymaps/default/keymap.c
 create mode 100644 keyboards/an_achronism/tetromino/keymaps/indicators/config.h
 create mode 100644 keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
 create mode 100644 keyboards/an_achronism/tetromino/rules.mk

diff --git a/keyboards/an_achronism/tetromino/README.md b/keyboards/an_achronism/tetromino/README.md
new file mode 100644
index 0000000000..0fae9a821d
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/README.md
@@ -0,0 +1,42 @@
+# tetromino
+
+![tetromino](https://i.postimg.cc/RSfJkbTP/IMG-2428.jpg)
+* Keyboard Maintainer: [an_achronism](https://github.com/an-achronism)
+* Hardware Availability: Currently in prototyping stage, so only via [Discord](https://discord.gg/8hpygm4PgW)
+
+This project started for one reason alone: I suspected that I would hate typing on an ortholinear keyboard and wanted to find out if I was correct.
+
+It ended up turning into something a little more interesting, at least from my perspective. Much of this was driven by my general dissatisfaction with how RGB LEDs tend to be used in keyboards. I'd been talking for quite some time about how I'd like to build RGB behaviours into my keyboards that had a purely functional purpose, rather than existing mostly to look cool. Specifically, I wanted to represent layer and lock statuses in a way I've never seen anybody else do. For instance, turning on Caps Lock would not switch on a single Caps Lock indicator LED, but rather light up all of the keys that would behave differently because of Caps Lock being switched on, meaning A-Z but nothing else. The other indicators (Num and Scroll Lock) would do something very similar. Activating a custom keymap layer would also light up only the keys that were mapped differently on that layer compared to the base layer.
+
+I managed to implement a custom function to achieve exactly the desired RGB LED functionality, but for reasons that mostly have to do with following general QMK guidelines, this (relatively large) custom function is not included in the default keymap. If you want it, flash the "indicators" keymap instead.
+
+## Compiling the firmware
+
+You'll first need to set up a build environment for QMK (see below). Once you've done that, you can run a `make` for the keymap of your choice.
+
+The default keymap does NOT have my preferred custom RGB behaviour in it, in the interests of keeping with QMK repository's preference of keeping the default keymap as straightforward as possible (the custom RGB function is relatively large). If you don't care about having that, you can just do this:
+
+    make tetromino:default
+
+If however you do want my custom RGB matrix behaviour, do this:
+
+    make tetromino:indicators
+
+This will give you the RGB behaviour described in the section above.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Entering the bootloader
+
+You'll need to do this to flash or reflash the firmware. You can enter the bootloader in a number of different ways:
+
+* **Physical reset button**: If you have a reset button soldered on, and the keyboard is fully assembled, you should be able to reach into the hole in the underside of the case while the keyboard is connected and double-press the reset button (push it twice in quick succession). Only pressing it once will reset the microcontroller, but won't put it into bootloader mode.
+* **Physical BOOTSEL button**: Regardless of whether you have a reset button soldered into place, there is a BOOTSEL button included onboard the Raspberry Pi Pico that hosts the microcontroller. With the keyboard disconnected, press and hold down the BOOTSEL button and connect the keyboard, then release BOOTSEL.
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard (similar to the BOOTSEL method above).
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available in your keymap.
+
+Once that's done, you should see a USB mass storage device appear in your operating system pertaining to the RP2040's bootloader. This indicates that the MCU is ready to flash a firmware of your choice.
+
+## Flashing the firmware
+
+The RP2040 MCU comes preflashed with a UF2 bootloader which, once activated by one of the methods above, allows the user to flash a firmware by simply dragging and dropping the firmware file into the USB mass storage device that appears in the OS. In this case, drag and drop the .uf2 file for your corresponding QMK firmware (compiled previously as per instructions above) into the relevant USB device and the firmware should flash, then the keyboard will immediately restart with the firmware on it, ready to use. Happy typing!
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
new file mode 100644
index 0000000000..6208224465
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 an_achronism (@an-achronism)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define DRIVER_LED_TOTAL 70
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json
new file mode 100644
index 0000000000..b8aae9d201
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/info.json
@@ -0,0 +1,184 @@
+{
+    "manufacturer": "an_achronism",
+    "keyboard_name": "tetromino",
+    "maintainer": "an-achronism",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "url": "https://github.com/an-achronism/tetromino",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3435",
+        "vid": "0x4161"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": false,
+        "rgb_matrix": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP0",  "GP1",  "GP2",  "GP3",  "GP4",  "GP5",  "GP6",
+                 "GP9",  "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"],
+        "rows": ["GP16", "GP17", "GP18", "GP19", "GP20"]
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x14": {
+            "layout": [
+                { "matrix": [0,  0], "x": 0,  "y": 0 },
+                { "matrix": [0,  1], "x": 1,  "y": 0 },
+                { "matrix": [0,  2], "x": 2,  "y": 0 },
+                { "matrix": [0,  3], "x": 3,  "y": 0 },
+                { "matrix": [0,  4], "x": 4,  "y": 0 },
+                { "matrix": [0,  5], "x": 5,  "y": 0 },
+                { "matrix": [0,  6], "x": 6,  "y": 0 },
+                { "matrix": [0,  7], "x": 7,  "y": 0 },
+                { "matrix": [0,  8], "x": 8,  "y": 0 },
+                { "matrix": [0,  9], "x": 9,  "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [1,  0], "x": 0,  "y": 1 },
+                { "matrix": [1,  1], "x": 1,  "y": 1 },
+                { "matrix": [1,  2], "x": 2,  "y": 1 },
+                { "matrix": [1,  3], "x": 3,  "y": 1 },
+                { "matrix": [1,  4], "x": 4,  "y": 1 },
+                { "matrix": [1,  5], "x": 5,  "y": 1 },
+                { "matrix": [1,  6], "x": 6,  "y": 1 },
+                { "matrix": [1,  7], "x": 7,  "y": 1 },
+                { "matrix": [1,  8], "x": 8,  "y": 1 },
+                { "matrix": [1,  9], "x": 9,  "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+                { "matrix": [1, 11], "x": 11, "y": 1 },
+                { "matrix": [1, 12], "x": 12, "y": 1 },
+                { "matrix": [1, 13], "x": 13, "y": 1 },
+                { "matrix": [2,  0], "x": 0,  "y": 2 },
+                { "matrix": [2,  1], "x": 1,  "y": 2 },
+                { "matrix": [2,  2], "x": 2,  "y": 2 },
+                { "matrix": [2,  3], "x": 3,  "y": 2 },
+                { "matrix": [2,  4], "x": 4,  "y": 2 },
+                { "matrix": [2,  5], "x": 5,  "y": 2 },
+                { "matrix": [2,  6], "x": 6,  "y": 2 },
+                { "matrix": [2,  7], "x": 7,  "y": 2 },
+                { "matrix": [2,  8], "x": 8,  "y": 2 },
+                { "matrix": [2,  9], "x": 9,  "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+                { "matrix": [2, 11], "x": 11, "y": 2 },
+                { "matrix": [2, 12], "x": 12, "y": 2 },
+                { "matrix": [2, 13], "x": 13, "y": 2 },
+                { "matrix": [3,  0], "x": 0,  "y": 3 },
+                { "matrix": [3,  1], "x": 1,  "y": 3 },
+                { "matrix": [3,  2], "x": 2,  "y": 3 },
+                { "matrix": [3,  3], "x": 3,  "y": 3 },
+                { "matrix": [3,  4], "x": 4,  "y": 3 },
+                { "matrix": [3,  5], "x": 5,  "y": 3 },
+                { "matrix": [3,  6], "x": 6,  "y": 3 },
+                { "matrix": [3,  7], "x": 7,  "y": 3 },
+                { "matrix": [3,  8], "x": 8,  "y": 3 },
+                { "matrix": [3,  9], "x": 9,  "y": 3 },
+                { "matrix": [3, 10], "x": 10, "y": 3 },
+                { "matrix": [3, 11], "x": 11, "y": 3 },
+                { "matrix": [3, 12], "x": 12, "y": 3 },
+                { "matrix": [3, 13], "x": 13, "y": 3 },
+                { "matrix": [4,  0], "x": 0,  "y": 4 },
+                { "matrix": [4,  1], "x": 1,  "y": 4 },
+                { "matrix": [4,  2], "x": 2,  "y": 4 },
+                { "matrix": [4,  3], "x": 3,  "y": 4 },
+                { "matrix": [4,  4], "x": 4,  "y": 4 },
+                { "matrix": [4,  5], "x": 5,  "y": 4 },
+                { "matrix": [4,  6], "x": 6,  "y": 4 },
+                { "matrix": [4,  7], "x": 7,  "y": 4 },
+                { "matrix": [4,  8], "x": 8,  "y": 4 },
+                { "matrix": [4,  9], "x": 9,  "y": 4 },
+                { "matrix": [4, 10], "x": 10, "y": 4 },
+                { "matrix": [4, 11], "x": 11, "y": 4 },
+                { "matrix": [4, 12], "x": 12, "y": 4 },
+                { "matrix": [4, 13], "x": 13, "y": 4 }
+            ]
+        }
+    },
+    "rgblight": {
+        "led_count": 70,
+        "pin": "GP26"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 4, "matrix": [0,  0], "x": 0,   "y": 0  },
+            { "flags": 4, "matrix": [0,  1], "x": 17,  "y": 0  },
+            { "flags": 4, "matrix": [0,  2], "x": 34,  "y": 0  },
+            { "flags": 4, "matrix": [0,  3], "x": 52,  "y": 0  },
+            { "flags": 4, "matrix": [0,  4], "x": 69,  "y": 0  },
+            { "flags": 4, "matrix": [0,  5], "x": 86,  "y": 0  },
+            { "flags": 4, "matrix": [0,  6], "x": 103, "y": 0  },
+            { "flags": 4, "matrix": [0,  7], "x": 121, "y": 0  },
+            { "flags": 4, "matrix": [0,  8], "x": 138, "y": 0  },
+            { "flags": 4, "matrix": [0,  9], "x": 155, "y": 0  },
+            { "flags": 4, "matrix": [0, 10], "x": 172, "y": 0  },
+            { "flags": 4, "matrix": [0, 11], "x": 190, "y": 0  },
+            { "flags": 4, "matrix": [0, 12], "x": 207, "y": 0  },
+            { "flags": 4, "matrix": [0, 13], "x": 224, "y": 0  },
+            { "flags": 4, "matrix": [1,  0], "x": 0,   "y": 16 },
+            { "flags": 4, "matrix": [1,  1], "x": 17,  "y": 16 },
+            { "flags": 4, "matrix": [1,  2], "x": 34,  "y": 16 },
+            { "flags": 4, "matrix": [1,  3], "x": 52,  "y": 16 },
+            { "flags": 4, "matrix": [1,  4], "x": 69,  "y": 16 },
+            { "flags": 4, "matrix": [1,  5], "x": 86,  "y": 16 },
+            { "flags": 4, "matrix": [1,  6], "x": 103, "y": 16 },
+            { "flags": 4, "matrix": [1,  7], "x": 121, "y": 16 },
+            { "flags": 4, "matrix": [1,  8], "x": 138, "y": 16 },
+            { "flags": 4, "matrix": [1,  9], "x": 155, "y": 16 },
+            { "flags": 4, "matrix": [1, 10], "x": 172, "y": 16 },
+            { "flags": 4, "matrix": [1, 11], "x": 190, "y": 16 },
+            { "flags": 4, "matrix": [1, 12], "x": 207, "y": 16 },
+            { "flags": 4, "matrix": [1, 13], "x": 224, "y": 16 },
+            { "flags": 4, "matrix": [2,  0], "x": 0,   "y": 32 },
+            { "flags": 4, "matrix": [2,  1], "x": 17,  "y": 32 },
+            { "flags": 4, "matrix": [2,  2], "x": 34,  "y": 32 },
+            { "flags": 4, "matrix": [2,  3], "x": 52,  "y": 32 },
+            { "flags": 4, "matrix": [2,  4], "x": 69,  "y": 32 },
+            { "flags": 4, "matrix": [2,  5], "x": 86,  "y": 32 },
+            { "flags": 4, "matrix": [2,  6], "x": 103, "y": 32 },
+            { "flags": 4, "matrix": [2,  7], "x": 121, "y": 32 },
+            { "flags": 4, "matrix": [2,  8], "x": 138, "y": 32 },
+            { "flags": 4, "matrix": [2,  9], "x": 155, "y": 32 },
+            { "flags": 4, "matrix": [2, 10], "x": 172, "y": 32 },
+            { "flags": 4, "matrix": [2, 11], "x": 190, "y": 32 },
+            { "flags": 4, "matrix": [2, 12], "x": 207, "y": 32 },
+            { "flags": 4, "matrix": [2, 13], "x": 224, "y": 32 },
+            { "flags": 4, "matrix": [3,  0], "x": 0,   "y": 48 },
+            { "flags": 4, "matrix": [3,  1], "x": 17,  "y": 48 },
+            { "flags": 4, "matrix": [3,  2], "x": 34,  "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": 86,  "y": 48 },
+            { "flags": 4, "matrix": [3,  6], "x": 103, "y": 48 },
+            { "flags": 4, "matrix": [3,  7], "x": 121, "y": 48 },
+            { "flags": 4, "matrix": [3,  8], "x": 138, "y": 48 },
+            { "flags": 4, "matrix": [3,  9], "x": 155, "y": 48 },
+            { "flags": 4, "matrix": [3, 10], "x": 172, "y": 48 },
+            { "flags": 4, "matrix": [3, 11], "x": 190, "y": 48 },
+            { "flags": 4, "matrix": [3, 12], "x": 207, "y": 48 },
+            { "flags": 4, "matrix": [3, 13], "x": 224, "y": 48 },
+            { "flags": 4, "matrix": [4,  0], "x": 0,   "y": 64 },
+            { "flags": 4, "matrix": [4,  1], "x": 17,  "y": 64 },
+            { "flags": 4, "matrix": [4,  2], "x": 34,  "y": 64 },
+            { "flags": 4, "matrix": [4,  3], "x": 52,  "y": 64 },
+            { "flags": 4, "matrix": [4,  4], "x": 69,  "y": 64 },
+            { "flags": 4, "matrix": [4,  5], "x": 86,  "y": 64 },
+            { "flags": 4, "matrix": [4,  6], "x": 103, "y": 64 },
+            { "flags": 4, "matrix": [4,  7], "x": 121, "y": 64 },
+            { "flags": 4, "matrix": [4,  8], "x": 138, "y": 64 },
+            { "flags": 4, "matrix": [4,  9], "x": 155, "y": 64 },
+            { "flags": 4, "matrix": [4, 10], "x": 172, "y": 64 },
+            { "flags": 4, "matrix": [4, 11], "x": 190, "y": 64 },
+            { "flags": 4, "matrix": [4, 12], "x": 207, "y": 64 },
+            { "flags": 4, "matrix": [4, 13], "x": 224, "y": 64 }
+        ]
+    }
+}
diff --git a/keyboards/an_achronism/tetromino/keymaps/default/keymap.c b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4f47154c69
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/keymaps/default/keymap.c
@@ -0,0 +1,62 @@
+/*
+Copyright 2022 an_achronism (@an-achronism)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Del│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Tab| Q │ W │ E | R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bsp│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Ctl│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │UK#│Rtn|
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Sft│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Sft│ ↑ │App|
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Esc│Ctl│Alt│GUI│L_1│Spc│L_2|GUI│Alt│Ctl|UK\│ ← │ ↓ │ → │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_5x14(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
+        KC_ESC,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  MO(2),   KC_RGUI, KC_RALT, KC_RCTL, KC_NUBS, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ortho_5x14(
+        KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL, _______, _______, _______, KC_PWR,
+        _______, _______, KC_UP,   _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_PAUS, KC_ESC,  _______, KC_SLEP,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______, _______, _______, KC_CALC,
+        KC_CAPS, _______, _______, _______, _______, KC_PAUS, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, KC_CAPS, _______, _______,
+        _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, _______, _______, _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_ortho_5x14(
+        _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,
+        _______, KC_F4,   KC_F3,   KC_F2,   KC_F1,   _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, C(KC_BRK), KC_ESC, _______, _______,
+        _______, KC_F8,   KC_F7,   KC_F6,   KC_F5,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, KC_MPRV, KC_MNXT, KC_MPLY,
+        KC_CAPS, KC_F12,  KC_F11,  KC_F10,  KC_F9,  C(KC_BRK),_______, _______, _______, _______, _______, KC_CAPS, _______, KC_PSCR,
+        _______, _______, _______, _______, MO(3),   _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_ortho_5x14(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/an_achronism/tetromino/keymaps/indicators/config.h b/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
new file mode 100644
index 0000000000..f117063fb1
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
@@ -0,0 +1,30 @@
+/*
+Copyright 2022 an_achronism (@an-achronism)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+#define RGB_TRIGGER_ON_KEYDOWN
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
new file mode 100644
index 0000000000..8f56c41be6
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
@@ -0,0 +1,124 @@
+/*
+Copyright 2022 an_achronism (@an-achronism)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Del│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Tab| Q │ W │ E | R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bsp│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Ctl│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │UK#│Rtn|
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Sft│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Sft│ ↑ │App|
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Esc│Ctl│Alt│GUI│L_1│Spc│L_2|GUI│Alt│Ctl|UK\│ ← │ ↓ │ → │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_5x14(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, RSFT_T(KC_APP),
+        KC_ESC,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  MO(2),   KC_RGUI, KC_RALT, KC_RCTL, KC_NUBS, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ortho_5x14(
+        KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL, _______, _______, _______, KC_PWR,
+        _______, _______, KC_UP,   _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_PAUS, KC_ESC,  _______, KC_SLEP,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______, _______, _______, KC_CALC,
+        KC_CAPS, _______, _______, _______, _______, KC_PAUS, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, KC_CAPS, _______, _______,
+        _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, _______, _______, _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_ortho_5x14(
+        _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,
+        _______, KC_F4,   KC_F3,   KC_F2,   KC_F1,   _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, C(KC_BRK), KC_ESC, _______, _______,
+        _______, KC_F8,   KC_F7,   KC_F6,   KC_F5,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, KC_MPRV, KC_MNXT, KC_MPLY,
+        KC_CAPS, KC_F12,  KC_F11,  KC_F10,  KC_F9,  C(KC_BRK),_______, _______, _______, _______, _______, KC_CAPS, _______, KC_PSCR,
+        _______, _______, _______, _______, MO(3),   _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_ortho_5x14(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
+
+// Initialise RBG matrix with all LEDs set to solid colour and zero HSV (i.e. off):
+void keyboard_post_init_user(void) {
+    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
+    rgb_matrix_sethsv_noeeprom(HSV_OFF);
+};
+
+// Custom RGB indicator behaviour:
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    uint8_t led_processed_count = 0;
+    for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
+        for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
+            if (led_processed_count == RGB_MATRIX_LED_PROCESS_LIMIT){
+                return;
+            }
+            uint8_t led_index = g_led_config.matrix_co[row][col];
+            uint16_t keycode = keymap_key_to_keycode(0, (keypos_t){col,row});
+            if (led_index >= led_min && led_index <= led_max && led_index != NO_LED) {
+                // Light base layer arrow keys orange if Scroll Lock is on, otherwise light them magenta:
+                led_processed_count++;
+                if (keycode >= KC_RIGHT && keycode <= KC_UP) {
+                    if (host_keyboard_led_state().scroll_lock) {
+                        rgb_matrix_set_color(led_index, RGB_ORANGE);
+                    } else {
+                        rgb_matrix_set_color(led_index, RGB_MAGENTA);
+                    }
+                }
+                // Light alpha keys (A-Z only) red if Caps Lock is on:
+                if (host_keyboard_led_state().caps_lock && keycode >= KC_A && keycode <= KC_Z) {
+                    rgb_matrix_set_color(led_index, RGB_RED);
+                }
+                // Whenever a layer above base is active, recolour only the keys that are different on that layer:
+                if (get_highest_layer(layer_state) > 0) {
+                    uint8_t layer = get_highest_layer(layer_state);
+                    uint16_t momentary_keycode = keymap_key_to_keycode(layer, (keypos_t){col,row});
+                    if (momentary_keycode > KC_TRNS) {
+                        switch(layer) {
+                            case 2:
+                                // The uppermost layer is blue:
+                                rgb_matrix_set_color(led_index, RGB_BLUE);
+                                break;
+                            case 1:
+                                // The middle layer is green, except that the numpad section turns
+                                // orange when Num Lock is on:
+                                if (host_keyboard_led_state().num_lock &&
+                                (momentary_keycode == KC_KP_EQUAL ||
+                                (momentary_keycode >= KC_NUM_LOCK && momentary_keycode <= KC_KP_DOT)
+                                )) {
+                                    rgb_matrix_set_color(led_index, RGB_ORANGE);
+                                } else {
+                                    rgb_matrix_set_color(led_index, RGB_GREEN);
+                                }
+                                break;
+                            default:
+                                break;
+                        }   
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/keyboards/an_achronism/tetromino/rules.mk b/keyboards/an_achronism/tetromino/rules.mk
new file mode 100644
index 0000000000..ff20f6e38e
--- /dev/null
+++ b/keyboards/an_achronism/tetromino/rules.mk
@@ -0,0 +1,2 @@
+# Use dedicated PIO on Raspberry Pi Pico for RGB LEDs:
+WS2812_DRIVER = vendor

From 799046fd9de389f15651d121d64f5be373e7dffe Mon Sep 17 00:00:00 2001
From: npspears <40127181+npspears@users.noreply.github.com>
Date: Fri, 16 Sep 2022 12:37:39 -0500
Subject: [PATCH 366/959] Quark revision - rotary encoder and 7u support
 (#17664)

by npspears
---
 keyboards/checkerboards/quark/config.h        | 21 ++---
 keyboards/checkerboards/quark/info.json       | 57 ++++++++++++
 .../quark/keymaps/default_5x12_7u/config.h    | 19 ++++
 .../quark/keymaps/default_5x12_7u/keymap.c    | 86 +++++++++++++++++++
 .../checkerboards/quark/keymaps/via/keymap.c  |  8 ++
 .../checkerboards/quark/keymaps/via/rules.mk  |  1 +
 keyboards/checkerboards/quark/quark.c         | 12 +++
 keyboards/checkerboards/quark/quark.h         | 18 +++-
 keyboards/checkerboards/quark/rules.mk        |  4 +-
 9 files changed, 207 insertions(+), 19 deletions(-)
 create mode 100644 keyboards/checkerboards/quark/keymaps/default_5x12_7u/config.h
 create mode 100644 keyboards/checkerboards/quark/keymaps/default_5x12_7u/keymap.c

diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index dda0f9f189..295629f885 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -38,22 +38,6 @@
 /* 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
-
 // ws2812 options
 #define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_ANIMATIONS // run RGB animations
@@ -61,3 +45,8 @@
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
 #define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
+
+// rotary encoder parameters
+#define ENCODERS_PAD_A { B0 }
+#define ENCODERS_PAD_B { D1 }
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json
index 6b08316a0f..d3a571d627 100644
--- a/keyboards/checkerboards/quark/info.json
+++ b/keyboards/checkerboards/quark/info.json
@@ -127,6 +127,63 @@
                 {"x": 10.5, "y": 4, "w": 1.5}
             ]
         },
+        "LAYOUT_ortho_5x12_7u": {
+            "layout": [
+              {"x":0, "y":0},
+              {"x":1, "y":0},
+              {"x":2, "y":0},
+              {"x":3, "y":0},
+              {"x":4, "y":0},
+              {"x":5, "y":0},
+              {"x":6, "y":0},
+              {"x":7, "y":0},
+              {"x":8, "y":0},
+              {"x":9, "y":0},
+              {"x":10, "y":0},
+              {"x":11, "y":0},
+              {"x":0, "y":1},
+              {"x":1, "y":1},
+              {"x":2, "y":1},
+              {"x":3, "y":1},
+              {"x":4, "y":1},
+              {"x":5, "y":1},
+              {"x":6, "y":1},
+              {"x":7, "y":1},
+              {"x":8, "y":1},
+              {"x":9, "y":1},
+              {"x":10, "y":1},
+              {"x":11, "y":1},
+              {"x":0, "y":2},
+              {"x":1, "y":2},
+              {"x":2, "y":2},
+              {"x":3, "y":2},
+              {"x":4, "y":2},
+              {"x":5, "y":2},
+              {"x":6, "y":2},
+              {"x":7, "y":2},
+              {"x":8, "y":2},
+              {"x":9, "y":2},
+              {"x":10, "y":2},
+              {"x":11, "y":2},
+              {"x":0, "y":3},
+              {"x":1, "y":3},
+              {"x":2, "y":3},
+              {"x":3, "y":3},
+              {"x":4, "y":3},
+              {"x":5, "y":3},
+              {"x":6, "y":3},
+              {"x":7, "y":3},
+              {"x":8, "y":3},
+              {"x":9, "y":3},
+              {"x":10, "y":3},
+              {"x":11, "y":3},
+              {"x":0, "y":4, "w":1.25},
+              {"x":1.25, "y":4, "w":1.25},
+              {"x":2.5, "y":4, "w":7},
+              {"x":9.5, "y":4, "w":1.25},
+              {"x":10.75, "y":4, "w":1.25}
+            ]
+        },
         "LAYOUT_ortho_4x12": {
             "layout": [
                 {"x": 0, "y": 0},
diff --git a/keyboards/checkerboards/quark/keymaps/default_5x12_7u/config.h b/keyboards/checkerboards/quark/keymaps/default_5x12_7u/config.h
new file mode 100644
index 0000000000..c6f30237d1
--- /dev/null
+++ b/keyboards/checkerboards/quark/keymaps/default_5x12_7u/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark/keymaps/default_5x12_7u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_5x12_7u/keymap.c
new file mode 100644
index 0000000000..e5797a4e9e
--- /dev/null
+++ b/keyboards/checkerboards/quark/keymaps/default_5x12_7u/keymap.c
@@ -0,0 +1,86 @@
+/* Copyright 2020 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* [0]
+     * ,-----------------------------------------------------------------------------------------.
+     * |   =        |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
+     * |------------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+     * |------------+------+------+------+------+-------------+------+------+------+------+------|
+     * | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+     * |------------+------+------+------+------+------|------+------+------+------+------+------|
+     * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+     * |   OS   |   Alt   |              Space & Layer            |     Caps     |    Layer 2    |
+     * `-----------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_ortho_5x12_7u(
+        KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,          KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,          KC_I,    KC_O,    KC_P,    KC_DEL,
+        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,          KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,          KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+        KC_LGUI,                KC_LALT,                      LT(1, KC_SPC),                           KC_CAPS,          TT(2)
+    ),
+
+    /* [1]
+     * ,---------------------------------------------------------------------------------------.
+     * |   =    |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0   |   -   |
+     * |------------+------+------+------+------+------+------+------+------+------+------+----|
+     * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+     * |------------+------+------+------+------+-------------+------+------+------+------+----|
+     * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+     * |------------+------+------+------+------+------|------+------+------+------+------+----|
+     * |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+     * |    ESC  |    CTRL-ALT-DEL        |             |           |      '|'     |    `      |
+     * `---------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_ortho_5x12_7u(
+        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_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL,  _______, _______, _______,
+        KC_ESC,           CALTDEL,                       _______,                                 KC_NUBS, KC_GRV
+    ),
+
+    /* [2]
+     * ,---------------------------------------------------------------------------------------.
+     * |   =    |   1  |   2  |   3  |   4  |   5  |  6  |   7  |   8  |   9  |   0   |   -   |
+     * |------------+------+------+------+------+------+------+------+------+------+------+---|
+     * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+     * |------------+------+------+------+------+-------------+------+------+------+------+---|
+     * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+     * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+     * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+     * |     QK_BOOT    |              |             |            |                |            |
+     * `---------------------------------------------------------------------------------------'
+     */
+    [2] = LAYOUT_ortho_5x12_7u(
+        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_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        QK_BOOT,                 _______,                   _______,          _______,          _______
+    )
+};
diff --git a/keyboards/checkerboards/quark/keymaps/via/keymap.c b/keyboards/checkerboards/quark/keymaps/via/keymap.c
index 01e916bfe4..f8a5c215f1 100644
--- a/keyboards/checkerboards/quark/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/via/keymap.c
@@ -84,3 +84,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   _______, _______,          _______,                   _______,          _______, _______, _______
     )
 };
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/checkerboards/quark/keymaps/via/rules.mk b/keyboards/checkerboards/quark/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/checkerboards/quark/keymaps/via/rules.mk
+++ b/keyboards/checkerboards/quark/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/checkerboards/quark/quark.c b/keyboards/checkerboards/quark/quark.c
index 02610c4203..736b955424 100644
--- a/keyboards/checkerboards/quark/quark.c
+++ b/keyboards/checkerboards/quark/quark.c
@@ -15,3 +15,15 @@
  */
 
 #include "quark.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLD, 10);
+        } else {
+            tap_code_delay(KC_VOLU, 10);
+        }
+    }
+    return true;
+}
diff --git a/keyboards/checkerboards/quark/quark.h b/keyboards/checkerboards/quark/quark.h
index e1af96eb76..be2cc3f932 100644
--- a/keyboards/checkerboards/quark/quark.h
+++ b/keyboards/checkerboards/quark/quark.h
@@ -39,13 +39,27 @@
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41,      k43,                     k48,      k4A, k4B \
+    k40, k41,           k44,           k47,           k4A, k4B  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, XXX, XXX, k43, XXX, XXX, k48, XXX, XXX, k4A, k4B } \
+    { k40, k41, XXX, XXX, k44, XXX, XXX, k47, XXX, XXX, k4A, k4B } \
+}
+
+#define LAYOUT_ortho_5x12_7u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
+    k40, k41,           k44,                          k4A, k4B \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
+    { k40, k41, XXX, XXX, k44, XXX, XXX, XXX, XXX, XXX, k4A, k4B } \
 }
 
 #define LAYOUT_ortho_4x12( \
diff --git a/keyboards/checkerboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk
index f56c1ed29e..a161eb06d3 100644
--- a/keyboards/checkerboards/quark/rules.mk
+++ b/keyboards/checkerboards/quark/rules.mk
@@ -17,9 +17,11 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
+ENCODER_ENABLE = yes	    # Enable Rotary Encoders
 
-LAYOUTS = ortho_4x12 planck_mit
 
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
+
+LAYOUTS = ortho_4x12 planck_mit

From 4781a798cab353397cf2ab92908a49096d505891 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Sep 2022 22:03:32 +0100
Subject: [PATCH 367/959] Bump anothrNick/github-tag-action from 1.45.0 to
 1.46.0 (#18386)

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.45.0 to 1.46.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.45.0...1.46.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto_tag.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index 0e46cb6b13..6205dbe11c 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.45.0
+      uses: anothrNick/github-tag-action@1.46.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

From 33c47fe0106b5b1ec307d81bc6ee92cce3be50d5 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 17 Sep 2022 11:24:03 +1000
Subject: [PATCH 368/959] Add UART support for Kinetis boards (#18370)

* Add UART support for Kinetis boards

* Default PAL mode for GPIOV1
---
 platforms/chibios/drivers/uart.c | 12 ++++++---
 platforms/chibios/drivers/uart.h | 46 ++++++++++++++++++++++----------
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
index 396803f33b..b16130d80b 100644
--- a/platforms/chibios/drivers/uart.c
+++ b/platforms/chibios/drivers/uart.c
@@ -18,7 +18,9 @@
 
 #include "quantum.h"
 
-#if defined(WB32F3G71xx) || defined(WB32FQ95xx)
+#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};
@@ -30,11 +32,15 @@ void uart_init(uint32_t baud) {
     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, PAL_MODE_ALTERNATE_OPENDRAIN);
-        palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE_OPENDRAIN);
+        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_OPENDRAIN);
         palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE(SD1_RX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);
diff --git a/platforms/chibios/drivers/uart.h b/platforms/chibios/drivers/uart.h
index 603d51037b..db97840270 100644
--- a/platforms/chibios/drivers/uart.h
+++ b/platforms/chibios/drivers/uart.h
@@ -28,32 +28,50 @@
 #    define SD1_TX_PIN A9
 #endif
 
-#ifndef SD1_TX_PAL_MODE
-#    define SD1_TX_PAL_MODE 7
-#endif
-
 #ifndef SD1_RX_PIN
 #    define SD1_RX_PIN A10
 #endif
 
-#ifndef SD1_RX_PAL_MODE
-#    define SD1_RX_PAL_MODE 7
-#endif
-
 #ifndef SD1_CTS_PIN
 #    define SD1_CTS_PIN A11
 #endif
 
-#ifndef SD1_CTS_PAL_MODE
-#    define SD1_CTS_PAL_MODE 7
-#endif
-
 #ifndef SD1_RTS_PIN
 #    define SD1_RTS_PIN A12
 #endif
 
-#ifndef SD1_RTS_PAL_MODE
-#    define SD1_RTS_PAL_MODE 7
+#ifdef USE_GPIOV1
+#    ifndef SD1_TX_PAL_MODE
+#        define SD1_TX_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+
+#    ifndef SD1_RX_PAL_MODE
+#        define SD1_RX_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+
+#    ifndef SD1_CTS_PAL_MODE
+#        define SD1_CTS_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+
+#    ifndef SD1_RTS_PAL_MODE
+#        define SD1_RTS_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+#else
+#    ifndef SD1_TX_PAL_MODE
+#        define SD1_TX_PAL_MODE 7
+#    endif
+
+#    ifndef SD1_RX_PAL_MODE
+#        define SD1_RX_PAL_MODE 7
+#    endif
+
+#    ifndef SD1_CTS_PAL_MODE
+#        define SD1_CTS_PAL_MODE 7
+#    endif
+
+#    ifndef SD1_RTS_PAL_MODE
+#        define SD1_RTS_PAL_MODE 7
+#    endif
 #endif
 
 #ifndef SD1_CR1

From a26f1ddafa05c04cc9446109db250c59f689b35a Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sat, 17 Sep 2022 01:48:09 -0400
Subject: [PATCH 369/959] Chromeos keycodes (#18212)

---
 docs/keycodes.md                                    |  2 ++
 docs/keycodes_basic.md                              |  2 ++
 .../dmqdesign/spin/keymaps/spidey3_pad/keymap.c     | 13 +------------
 layouts/community/65_ansi_blocker/spidey3/keymap.c  |  4 ++--
 layouts/community/75_ansi/spidey3/keymap.c          |  2 +-
 quantum/keycode.h                                   |  8 ++++++--
 quantum/keymap_common.c                             |  2 +-
 quantum/via_ensure_keycode.h                        |  2 ++
 tmk_core/protocol/report.h                          |  4 ++++
 users/spidey3/spidey3.c                             |  7 -------
 users/spidey3/spidey3.h                             |  4 +---
 11 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index d0ba8e25bf..9121385f1a 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -207,6 +207,8 @@ See also: [Basic Keycodes](keycodes_basic.md)
 |`KC_MEDIA_REWIND`       |`KC_MRWD`                      |Previous Track                         |✔<sup>6</sup>|✔<sup>5</sup>|✔                |
 |`KC_BRIGHTNESS_UP`      |`KC_BRIU`                      |Brightness Up                          |✔            |✔            |✔                |
 |`KC_BRIGHTNESS_DOWN`    |`KC_BRID`                      |Brightness Down                        |✔            |✔            |✔                |
+|`KC_CONTROL_PANEL`      |`KC_CPNL`                      |Open Control Panel                     |✔            |             |                 |
+|`KC_ASSISTANT`          |`KC_ASST`                      |Launch Context-Aware Assistant         |✔            |             |                 |
 
 <sup>1. The Linux kernel HID driver recognizes [nearly all keycodes](https://github.com/torvalds/linux/blob/master/drivers/hid/hid-input.c), but the default bindings depend on the DE/WM.</sup><br/>
 <sup>2. Treated as F13-F15.</sup><br/>
diff --git a/docs/keycodes_basic.md b/docs/keycodes_basic.md
index 6f6ef7a3fd..d2a49100d1 100644
--- a/docs/keycodes_basic.md
+++ b/docs/keycodes_basic.md
@@ -221,6 +221,8 @@ These keycodes are not part of the Keyboard/Keypad usage page. The `SYSTEM_` key
 |`KC_MEDIA_REWIND`      |`KC_MRWD`|Previous Track     |
 |`KC_BRIGHTNESS_UP`     |`KC_BRIU`|Brightness Up      |
 |`KC_BRIGHTNESS_DOWN`   |`KC_BRID`|Brightness Down    |
+|`KC_CONTROL_PANEL`     |`KC_CPNL`|Open Control Panel |
+|`KC_ASSISTANT`         |`KC_ASST`|Launch Assistant   |
 
 ## Number Pad
 
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
index 77534b9a75..4722e41d07 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
@@ -29,8 +29,6 @@ enum layer_base {
 
 enum custom_keycodes {
     HELLO = SAFE_RANGE,
-    CH_CPNL,  // AL Control Panel
-    CH_ASST,  // AL Context-aware Desktop Assistant
     CH_SUSP,  // Suspend
 };
 
@@ -40,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         A(S(KC_N)),    HELLO,         CH_SUSP,       TO(_MACRO),
         KC_MPRV,       KC_MPLY,       KC_MNXT,       TO(_NUMPAD),
         C(A(KC_COMM)), KC_F5,         C(A(KC_DOT)),  TO(_RGB),
-        MO(_FN),       CH_ASST,       CH_CPNL),
+        MO(_FN),       KC_ASST,       KC_CPNL),
 
     [_NUMPAD] = LAYOUT(
         KC_KP_7,   KC_KP_8,   KC_KP_9,   KC_TRNS,
@@ -199,19 +197,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 return false;
 
                 // clang-format off
-            case CH_CPNL: host_consumer_send(AL_CONTROL_PANEL); return false;
-            case CH_ASST: host_consumer_send(AL_ASSISTANT); return false;
             case CH_SUSP: tap_code16(LGUI(LSFT(KC_L))); return true;
             case HELLO:   SEND_STRING("Hello, world!"); return true;
                 // clang-format on
         }
-    } else {
-        switch (keycode) {
-            case CH_CPNL:
-            case CH_ASST:
-                host_consumer_send(0);
-                return false;
-        }
     }
 
     return true;
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index e682a281aa..09e612ae6c 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_65_ansi_blocker(
         KC_GRV,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_INS,     KC_SLCK,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
-        MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            CH_CPNL,    KC_BRID,
+        MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            KC_CPNL,    KC_BRID,
         _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    XXXXXXX,    XXXXXXX,    DEBUG,                              _______,    KC_VOLU,    KC_MUTE,
-        _______,    _______,    _______,                                    KC_MPLY,                                            CH_ASST,    _______,                KC_MPRV,    KC_VOLD,    KC_MNXT
+        _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,                KC_MPRV,    KC_VOLD,    KC_MNXT
     ),
     // Glyph Transformation
     [_GLYPH] = LAYOUT_65_ansi_blocker(
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index 5ede802676..abd941ff32 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -28,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
         _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DEBUG,      _______,                            KC_VOLU,    KC_MUTE,
-        _______,    _______,    _______,                                    KC_MPLY,                                            CH_ASST,    _______,    CH_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
+        _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,    KC_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
     )
 };
diff --git a/quantum/keycode.h b/quantum/keycode.h
index 3c80a386d1..c2103ebaa7 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define IS_SPECIAL(code) ((0xA5 <= (code) && (code) <= 0xDF) || (0xE8 <= (code) && (code) <= 0xFF))
 #define IS_SYSTEM(code) (KC_PWR <= (code) && (code) <= KC_WAKE)
-#define IS_CONSUMER(code) (KC_MUTE <= (code) && (code) <= KC_BRID)
+#define IS_CONSUMER(code) (KC_MUTE <= (code) && (code) <= KC_ASST)
 
 #define IS_MOUSEKEY(code) (KC_MS_UP <= (code) && (code) <= KC_MS_ACCEL2)
 #define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT)
@@ -205,6 +205,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KC_MRWD KC_MEDIA_REWIND
 #define KC_BRIU KC_BRIGHTNESS_UP
 #define KC_BRID KC_BRIGHTNESS_DOWN
+#define KC_CPNL KC_CONTROL_PANEL
+#define KC_ASST KC_ASSISTANT
 
 /* System Specific */
 #define KC_BRMU KC_PAUSE
@@ -502,7 +504,9 @@ enum internal_special_keycodes {
     KC_MEDIA_FAST_FORWARD,
     KC_MEDIA_REWIND,
     KC_BRIGHTNESS_UP,
-    KC_BRIGHTNESS_DOWN
+    KC_BRIGHTNESS_DOWN,
+    KC_CONTROL_PANEL,
+    KC_ASSISTANT // 0xC0
 };
 
 enum mouse_keys {
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 8d7a8bda9a..1d5ef9b403 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -61,7 +61,7 @@ action_t action_for_keycode(uint16_t keycode) {
         case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
             action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode));
             break;
-        case KC_AUDIO_MUTE ... KC_BRIGHTNESS_DOWN:
+        case KC_AUDIO_MUTE ... KC_ASSISTANT:
             action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode));
             break;
 #endif
diff --git a/quantum/via_ensure_keycode.h b/quantum/via_ensure_keycode.h
index 75f816b560..010e1d92d4 100644
--- a/quantum/via_ensure_keycode.h
+++ b/quantum/via_ensure_keycode.h
@@ -195,6 +195,8 @@ _Static_assert(KC_MFFD                == 0x00BB, "");
 _Static_assert(KC_MRWD                == 0x00BC, "");
 _Static_assert(KC_BRIU                == 0x00BD, "");
 _Static_assert(KC_BRID                == 0x00BE, "");
+_Static_assert(KC_CPNL                == 0x00BF, "");
+_Static_assert(KC_ASST                == 0x00C0, "");
 
 _Static_assert(KC_LEFT_CTRL           == 0x00E0, "");
 _Static_assert(KC_LEFT_SHIFT          == 0x00E1, "");
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 735ccdb4a1..b4dbf92a8f 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -292,6 +292,10 @@ static inline uint16_t KEYCODE2CONSUMER(uint8_t key) {
             return AL_CALCULATOR;
         case KC_MY_COMPUTER:
             return AL_LOCAL_BROWSER;
+        case KC_CONTROL_PANEL:
+            return AL_CONTROL_PANEL;
+        case KC_ASSISTANT:
+            return AL_ASSISTANT;
         case KC_WWW_SEARCH:
             return AC_SEARCH;
         case KC_WWW_HOME:
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index d9b893814a..b4c261ce1d 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -199,8 +199,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
                 // clang-format off
 
-            case CH_CPNL: host_consumer_send(AL_CONTROL_PANEL); return false;
-            case CH_ASST: host_consumer_send(AL_ASSISTANT); return false;
             case CH_SUSP: tap_code16(LGUI(LSFT(KC_L))); return true;
 
                 // clang-format on
@@ -285,11 +283,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         }
     } else {
         switch (keycode) {
-            case CH_CPNL:
-            case CH_ASST:
-                host_consumer_send(0);
-                return false;
-
             case SPI_KP_00:
                 unregister_code(KC_KP_0);
                 return false;
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index e344b08895..2b2cac0a20 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -17,9 +17,7 @@ enum userspace_layers {
 };
 
 enum custom_keycodes {
-    CH_CPNL = SAFE_RANGE, // AL Control Panel
-    CH_ASST,              // AL Context-aware Desktop Assistant
-    CH_SUSP,              // Suspend
+    CH_SUSP = SAFE_RANGE,  // Suspend
 
     SPI_NORMAL,
     SPI_WIDE,

From d67d388e776eeb8596181894639b6ed46c8a2d7d Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 16 Sep 2022 22:49:00 -0700
Subject: [PATCH 370/959] Move mousekey keycodes into newly freed up keycode
 block (#16076)

---
 quantum/keycode.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quantum/keycode.h b/quantum/keycode.h
index c2103ebaa7..b492e4292a 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -514,11 +514,11 @@ enum mouse_keys {
 #ifdef VIA_ENABLE
     KC_MS_UP = 0xF0,
 #else
-    KC_MS_UP = 0xED,
+    KC_MS_UP = 0xCD,
 #endif
     KC_MS_DOWN,
     KC_MS_LEFT,
-    KC_MS_RIGHT, // 0xF0
+    KC_MS_RIGHT,
     KC_MS_BTN1,
     KC_MS_BTN2,
     KC_MS_BTN3,
@@ -543,7 +543,7 @@ enum mouse_keys {
     /* Acceleration */
     KC_MS_ACCEL0,
     KC_MS_ACCEL1,
-    KC_MS_ACCEL2 // 0xFF
+    KC_MS_ACCEL2 // 0xDF, or 0xFF if via enabled
 };
 
 #include "keycode_legacy.h"

From fb29c0ae53e32fb049516fcbe0f7863882ca9173 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 17 Sep 2022 00:50:54 -0700
Subject: [PATCH 371/959] [Core] Add getreuer's Autocorrect feature to core
 (#15699)

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
---
 builddefs/generic_features.mk                 |   1 +
 builddefs/show_options.mk                     |   3 +-
 docs/_summary.md                              |   1 +
 docs/feature_autocorrect.md                   | 295 ++++++++++++++++++
 lib/python/qmk/cli/__init__.py                |   1 +
 .../qmk/cli/generate/autocorrect_data.py      | 289 +++++++++++++++++
 quantum/eeconfig.c                            |   2 +-
 quantum/keycode_config.h                      |   1 +
 .../autocorrect_data_default.h                |  85 +++++
 quantum/process_keycode/process_autocorrect.c | 287 +++++++++++++++++
 quantum/process_keycode/process_autocorrect.h |  17 +
 quantum/quantum.c                             |   3 +
 quantum/quantum.h                             |   4 +
 quantum/quantum_keycodes.h                    |   8 +
 tests/autocorrect/config.h                    |   6 +
 tests/autocorrect/test.mk                     |   8 +
 tests/autocorrect/test_autocorrect.cpp        | 204 ++++++++++++
 17 files changed, 1213 insertions(+), 2 deletions(-)
 create mode 100644 docs/feature_autocorrect.md
 create mode 100644 lib/python/qmk/cli/generate/autocorrect_data.py
 create mode 100644 quantum/process_keycode/autocorrect_data_default.h
 create mode 100644 quantum/process_keycode/process_autocorrect.c
 create mode 100644 quantum/process_keycode/process_autocorrect.h
 create mode 100644 tests/autocorrect/config.h
 create mode 100644 tests/autocorrect/test.mk
 create mode 100644 tests/autocorrect/test_autocorrect.cpp

diff --git a/builddefs/generic_features.mk b/builddefs/generic_features.mk
index f195e9fd75..0d897bc1c8 100644
--- a/builddefs/generic_features.mk
+++ b/builddefs/generic_features.mk
@@ -17,6 +17,7 @@ SPACE_CADET_ENABLE ?= yes
 GRAVE_ESC_ENABLE ?= yes
 
 GENERIC_FEATURES = \
+    AUTOCORRECT \
     CAPS_WORD \
     COMBO \
     COMMAND \
diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
index 8d992c080c..fac6576ba1 100644
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@@ -84,7 +84,8 @@ OTHER_OPTION_NAMES = \
   LTO_ENABLE \
   PROGRAMMABLE_BUTTON_ENABLE \
   SECURE_ENABLE \
-  CAPS_WORD_ENABLE
+  CAPS_WORD_ENABLE \
+  AUTOCORRECT_ENABLE
 
 define NAME_ECHO
        @printf "  %-30s = %-16s # %s\\n" "$1" "$($1)" "$(origin $1)"
diff --git a/docs/_summary.md b/docs/_summary.md
index f2bdcd5ccd..bf49bbb140 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -76,6 +76,7 @@
 
   * Software Features
     * [Auto Shift](feature_auto_shift.md)
+    * [Autocorrect](feature_autocorrect.md)
     * [Caps Word](feature_caps_word.md)
     * [Combos](feature_combo.md)
     * [Debounce API](feature_debounce_type.md)
diff --git a/docs/feature_autocorrect.md b/docs/feature_autocorrect.md
new file mode 100644
index 0000000000..480131e5fc
--- /dev/null
+++ b/docs/feature_autocorrect.md
@@ -0,0 +1,295 @@
+# Autocorrect
+
+There are a lot of words that are prone to being typed incorrectly, due to habit, sequence or just user error.  This feature leverages your firmware to automatically correct these errors, to help reduce typos.
+
+## How does it work? :id=how-does-it-work
+
+The feature maintains a small buffer of recent key presses. On each key press, it checks whether the buffer ends in a recognized typo, and if so, automatically sends keystrokes to correct it.
+
+The tricky part is how to efficiently check the buffer for typos. We don’t want to spend too much memory or time on storing or searching the typos. A good solution is to represent the typos with a trie data structure. A trie is a tree data structure where each node is a letter, and words are formed by following a path to one of the leaves.
+
+![An example trie](https://i.imgur.com/HL5DP8H.png)
+
+Since we search whether the buffer ends in a typo, we store the trie writing in reverse. The trie is queried starting from the last letter, then second to last letter, and so on, until either a letter doesn’t match or we reach a leaf, meaning a typo was found.
+
+## How do I enable Autocorrection :id=how-do-i-enable-autocorrection
+
+In your `rules.mk`, add this:
+
+```make
+AUTOCORRECT_ENABLE = yes
+```
+
+Additionally, you will need a library for autocorrection.  A small sample library is included by default, so that you can get up and running right away, but you can provide a customized library.
+
+By default, autocorrect is disabled.  To enable it, you need to use the `AUTOCORRECT_TOGGLE` keycode to enable it. The status is stored in persistent memory, so you shouldn't need to enabled it again.
+
+## Customizing autocorrect library :id=customizing-autocorrect-library
+
+To provide a custom library, you need to create a text file with the corrections.  For instance:
+
+```text
+:thier        -> their
+fitler        -> filter
+lenght        -> length
+ouput         -> output
+widht         -> width
+```
+
+The syntax is `typo  ->  correction`. Typos and corrections are case insensitive, and any whitespace before or after the typo and correction is ignored. The typo must be only the letters a–z, or the special character : representing a word break. The correction may have any non-unicode characters.
+
+Then, run:
+
+```sh
+qmk generate-autocorrect-data autocorrect_dictionary.txt
+```
+
+This will process the file and produce an `autocorrect_data.h` file with the trie library, in the folder that you are at.  You can specify the keyboard and keymap (eg `-kb planck/rev6 -km jackhumbert`), and it will place the file in that folder instead. But as long as the file is located in your keymap folder, or user folder, it should be picked up automatically.
+
+This file will look like this:
+
+```c
+// :thier        -> their
+// fitler        -> filter
+// lenght        -> length
+// ouput         -> output
+// widht         -> width
+
+#define AUTOCORRECT_MIN_LENGTH 5  // "ouput"
+#define AUTOCORRECT_MAX_LENGTH 6  // ":thier"
+
+#define DICTIONARY_SIZE 74
+
+static const uint8_t autocorrect_data[DICTIONARY_SIZE] PROGMEM = {85, 7, 0, 23, 35, 0, 0, 8, 0, 76, 16, 0, 15, 25, 0, 0,
+    11, 23, 44, 0, 130, 101, 105, 114, 0, 23, 12, 9, 0, 131, 108, 116, 101, 114, 0, 75, 42, 0, 24, 64, 0, 0, 71, 49, 0,
+    10, 56, 0, 0, 12, 26, 0, 129, 116, 104, 0, 17, 8, 15, 0, 129, 116, 104, 0, 19, 24, 18, 0, 130, 116, 112, 117, 116,
+    0};
+```
+
+### Avoiding false triggers :id=avoiding-false-triggers
+
+By default, typos are searched within words, to find typos within longer identifiers like maxFitlerOuput. While this is useful, a consequence is that autocorrection will falsely trigger when a typo happens to be a substring of a correctly-spelled word. For instance, if we had thier -> their as an entry, it would falsely trigger on (correct, though relatively uncommon) words like “wealthier” and “filthier.”
+
+The solution is to set a word break : before and/or after the typo to constrain matching. : matches space, period, comma, underscore, digits, and most other non-alpha characters.
+
+|Text             |thier   |:thier  |thier:  |:thier: |
+|-----------------|:------:|:------:|:------:|:------:|
+|see `thier` typo |matches |matches |matches |matches |
+|it’s `thiers`    |matches |matches |no      |no      |
+|wealthier words  |matches |no      |matches |no      |
+
+:thier: is most restrictive, matching only when thier is a whole word.
+
+The `qmk generate-autocorrect-data` commands can make an effort to check for entries that would false trigger as substrings of correct words. It searches each typo against a dictionary of 25K English words from the english_words Python package, provided it’s installed. (run `python3 -m pip install english_words` to install it.)
+
+?> Unfortunately, this is limited to just english words, at this point.
+
+## Overriding Autocorrect
+
+Occasionally you might actually want to type a typo (for instance, while editing autocorrection_dict.txt) without being autocorrected. There are a couple of ways to do this:
+
+1. Begin typing the typo.
+2. Before typing the last letter, press and release the Ctrl or Alt key.
+3. Type the remaining letters.
+
+This works because the autocorrection implementation doesn’t understand hotkeys, so it resets itself whenever a modifier other than shift is held.
+
+Additionally, you can use the `AUTOCORRECT_TOGGLE` keycode to toggle the on/off status for Autocorrect.
+
+### Keycodes :id=keycodes
+
+|Keycode              | Short keycode | Description                                    |
+|---------------------|---------------|------------------------------------------------|
+|`AUTOCORRECT_ON`     | `CRT_ON`      | Turns on the Autocorrect feature.              |
+|`AUTOCORRECT_OFF`    | `CRT_OFF`     | Turns off the Autocorrect feature.             |
+|`AUTOCORRECT_TOGGLE` | `CRT_TOG`     | Toggles the status of the Autocorrect feature. |
+
+## User Callback Functions
+
+### Process Autocorrect
+
+Callback function `bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods)` is available to customise incoming keycodes and handle exceptions. You can use this function to sanitise input before they are passed onto the autocorrect engine
+
+?> Sanitisation of input is required because autocorrect will only match 8-bit [basic keycodes](keycodes_basic.md) for typos. If valid modifier keys or 16-bit keycodes that are part of a user's word input (such as Shift + A) is passed through, they will fail typo letter detection. For example a [Mod-Tap](mod_tap.md) key such as `LCTL_T(KC_A)` is 16-bit and should be masked for the 8-bit `KC_A`.
+
+The default user callback function is found inside `quantum/process_keycode/process_autocorrect.c`. It covers most use-cases for QMK special functions and quantum keycodes, including [overriding autocorrect](#overriding-autocorrect) with a modifier other than shift. The `process_autocorrect_user` function is `weak` defined to allow user's copy inside `keymap.c` (or code files) to overwrite it.
+
+#### Process Autocorrect Example
+
+If you have a custom keycode `QMKBEST` that should be ignored as part of a word, and another custom keycode `QMKLAYER` that should override autocorrect, both can be added to the bottom of the `process_autocorrect_user` `switch` statement in your source code:
+
+```c
+bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods) {
+    // See quantum_keycodes.h for reference on these matched ranges.
+    switch (*keycode) {
+        // Exclude these keycodes from processing.
+        case KC_LSFT:
+        case KC_RSFT:
+        case KC_CAPS:
+        case QK_TO ... QK_ONE_SHOT_LAYER_MAX:
+        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
+        case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
+            return false;
+
+        // Mask for base keycode from shifted keys.
+        case QK_LSFT ... QK_LSFT + 255:
+        case QK_RSFT ... QK_RSFT + 255:
+            if (*keycode >= QK_LSFT && *keycode <= (QK_LSFT + 255)) {
+                *mods |= MOD_LSFT;
+            } else {
+                *mods |= MOD_RSFT;
+            }
+            *keycode &= 0xFF; // Get the basic keycode.
+            return true;
+#ifndef NO_ACTION_TAPPING
+        // Exclude tap-hold keys when they are held down
+        // and mask for base keycode when they are tapped.
+        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+#    ifdef NO_ACTION_LAYER
+            // Exclude Layer Tap, if layers are disabled
+            // but action tapping is still enabled.
+            return false;
+#    endif
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+            // Exclude hold if mods other than Shift is not active
+            if (!record->tap.count) {
+                return false;
+            }
+            *keycode &= 0xFF;
+            break;
+#else
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+            // Exclude if disabled
+            return false;
+#endif
+        // Exclude swap hands keys when they are held down
+        // and mask for base keycode when they are tapped.
+        case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
+#ifdef SWAP_HANDS_ENABLE
+            if (*keycode >= 0x56F0 || !record->tap.count) {
+                return false;
+            }
+            *keycode &= 0xFF;
+            break;
+#else
+            // Exclude if disabled
+            return false;
+#endif
+        // Handle custom keycodes
+        case QMKBEST:
+            return false;
+        case QMKLAYER:
+            *typo_buffer_size = 0;
+            return false;
+    }
+
+    // Disable autocorrect while a mod other than shift is active.
+    if ((*mods & ~MOD_MASK_SHIFT) != 0) {
+        *typo_buffer_size = 0;
+        return false;
+    }
+
+    return true;
+}
+```
+
+?> In this callback function, `return false` will skip processing of that keycode for autocorrect. Adding `*typo_buffer_size = 0` will also reset the autocorrect buffer at the same time, cancelling any current letters already stored in the buffer.
+
+### Apply Autocorrect
+
+Additionally, `apply_autocorrect(uint8_t backspaces, const char *str)` allows for users to add additional handling to the autocorrection, or replace the functionality entirely. This passes on the number of backspaces needed to replace the words, as well as the replacement string (partial word, not the full word).
+
+#### Apply Autocorrect Example
+
+This following example will play a sound when a typo is autocorrected and execute the autocorrection itself:
+
+```c
+#ifdef AUDIO_ENABLE
+float autocorrect_song[][2] = SONG(TERMINAL_SOUND);
+#endif
+
+bool apply_autocorrect(uint8_t backspaces, const char *str) {
+#ifdef AUDIO_ENABLE
+    PLAY_SONG(autocorrect_song);
+#endif
+    for (uint8_t i = 0; i < backspaces; ++i) {
+        tap_code(KC_BSPC);
+    }
+    send_string_P(str);
+    return false;
+}
+```
+
+?> In this callback function, `return false` will stop the normal processing of autocorrect, which requires manually handling of removing the "bad" characters and typing the new characters.
+
+!> ***IMPORTANT***: `str` is a pointer to `PROGMEM` data for the autocorrection.  If you return false, and want to send the string, this needs to use `send_string_P` and not `send_string` or `SEND_STRING`.
+
+You can also use `apply_autocorrect` to detect and display the event but allow internal code to execute the autocorrection with `return true`:
+
+```c
+bool apply_autocorrect(uint8_t backspaces, const char *str) {
+#ifdef OLED_ENABLE
+    oled_write_P(PSTR("Auto-corrected"), false);
+#endif
+    return true;
+}
+```
+
+## Appendix: Trie binary data format :id=appendix
+
+This section details how the trie is serialized to byte data in autocorrection_data. You don’t need to care about this to use this autocorrection implementation. But it is documented for the record in case anyone is interested in modifying the implementation, or just curious how it works.
+
+What I did here is fairly arbitrary, but it is simple to decode and gets the job done.
+
+### Encoding :id=encoding
+
+All autocorrection data is stored in a single flat array autocorrection_data. Each trie node is associated with a byte offset into this array, where data for that node is encoded, beginning with root at offset 0. There are three kinds of nodes. The highest two bits of the first byte of the node indicate what kind:
+
+* 00 ⇒ chain node: a trie node with a single child.
+* 01 ⇒ branching node: a trie node with multiple children.
+* 10 ⇒ leaf node: a leaf, corresponding to a typo and storing its correction.
+
+![An example trie](https://i.imgur.com/HL5DP8H.png)
+
+**Branching node**. Each branch is encoded with one byte for the keycode (KC_A–KC_Z) followed by a link to the child node. Links between nodes are 16-bit byte offsets relative to the beginning of the array, serialized in little endian order.
+
+All branches are serialized this way, one after another, and terminated with a zero byte. As described above, the node is identified as a branch by setting the two high bits of the first byte to 01, done by bitwise ORing the first keycode with 64. keycode. The root node for the above figure would be serialized like:
+
+```
++-------+-------+-------+-------+-------+-------+-------+
+| R|64  |    node 2     |   T   |    node 3     |   0   |
++-------+-------+-------+-------+-------+-------+-------+
+```
+
+**Chain node**. Tries tend to have long chains of single-child nodes, as seen in the example above with f-i-t-l in fitler. So to save space, we use a different format to encode chains than branching nodes. A chain is encoded as a string of keycodes, beginning with the node closest to the root, and terminated with a zero byte. The child of the last node in the chain is encoded immediately after. That child could be either a branching node or a leaf.
+
+In the figure above, the f-i-t-l chain is encoded as
+
+```
++-------+-------+-------+-------+-------+
+|   L   |   T   |   I   |   F   |   0   |
++-------+-------+-------+-------+-------+
+```
+
+If we were to encode this chain using the same format used for branching nodes, we would encode a 16-bit node link with every node, costing 8 more bytes in this example. Across the whole trie, this adds up. Conveniently, we can point to intermediate points in the chain and interpret the bytes in the same way as before. E.g. starting at the i instead of the l, and the subchain has the same format.
+
+**Leaf node**. A leaf node corresponds to a particular typo and stores data to correct the typo. The leaf begins with a byte for the number of backspaces to type, and is followed by a null-terminated ASCII string of the replacement text. The idea is, after tapping backspace the indicated number of times, we can simply pass this string to the `send_string_P` function. For fitler, we need to tap backspace 3 times (not 4, because we catch the typo as the final ‘r’ is pressed) and replace it with lter. To identify the node as a leaf, the two high bits are set to 10 by ORing the backspace count with 128:
+
+```
++-------+-------+-------+-------+-------+-------+
+| 3|128 |  'l'  |  't'  |  'e'  |  'r'  |   0   |
++-------+-------+-------+-------+-------+-------+
+```
+
+### Decoding :id=decoding
+
+This format is by design decodable with fairly simple logic. A 16-bit variable state represents our current position in the trie, initialized with 0 to start at the root node. Then, for each keycode, test the highest two bits in the byte at state to identify the kind of node.
+
+* 00 ⇒ **chain node**: If the node’s byte matches the keycode, increment state by one to go to the next byte. If the next byte is zero, increment again to go to the following node.
+* 01 ⇒ **branching node**: Search the branches for one that matches the keycode, and follow its node link.
+* 10 ⇒ **leaf node**: a typo has been found! We read its first byte for the number of backspaces to type, then pass its following bytes to send_string_P to type the correction.
+
+## Credits
+
+Credit goes to [getreuer](https://github.com/getreuer) for originally implementing this [here](https://getreuer.info/posts/keyboards/autocorrection/#how-does-it-work).  As well as to [filterpaper](https://github.com/filterpaper) for converting the code to use PROGMEM, and additional improvements.
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 98e212c47b..02561da1fb 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -47,6 +47,7 @@ subcommands = [
     'qmk.cli.format.python',
     'qmk.cli.format.text',
     'qmk.cli.generate.api',
+    'qmk.cli.generate.autocorrect_data',
     'qmk.cli.generate.compilation_database',
     'qmk.cli.generate.config_h',
     'qmk.cli.generate.develop_pr_list',
diff --git a/lib/python/qmk/cli/generate/autocorrect_data.py b/lib/python/qmk/cli/generate/autocorrect_data.py
new file mode 100644
index 0000000000..00ab6180ab
--- /dev/null
+++ b/lib/python/qmk/cli/generate/autocorrect_data.py
@@ -0,0 +1,289 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Python program to make autocorrect_data.h.
+This program reads from a prepared dictionary file and generates a C source file
+"autocorrect_data.h" with a serialized trie embedded as an array. Run this
+program and pass it as the first argument like:
+$ qmk generate-autocorrect-data autocorrect_dict.txt
+Each line of the dict file defines one typo and its correction with the syntax
+"typo -> correction". Blank lines or lines starting with '#' are ignored.
+Example:
+  :thier        -> their
+  fitler        -> filter
+  lenght        -> length
+  ouput         -> output
+  widht         -> width
+For full documentation, see QMK Docs
+"""
+
+import sys
+import textwrap
+from typing import Any, Dict, Iterator, List, Tuple
+
+from milc import cli
+
+import qmk.path
+from qmk.keyboard import keyboard_completer, keyboard_folder
+from qmk.keymap import keymap_completer, locate_keymap
+
+KC_A = 4
+KC_SPC = 0x2c
+KC_QUOT = 0x34
+
+TYPO_CHARS = dict([
+    ("'", KC_QUOT),
+    (':', KC_SPC),  # "Word break" character.
+] + [(chr(c), c + KC_A - ord('a')) for c in range(ord('a'),
+                                                  ord('z') + 1)])  # Characters a-z.
+
+
+def parse_file(file_name: str) -> List[Tuple[str, str]]:
+    """Parses autocorrections dictionary file.
+  Each line of the file defines one typo and its correction with the syntax
+  "typo -> correction". Blank lines or lines starting with '#' are ignored. The
+  function validates that typos only have characters a-z and that typos are not
+  substrings of other typos, otherwise the longer typo would never trigger.
+  Args:
+    file_name: String, path of the autocorrections dictionary.
+  Returns:
+    List of (typo, correction) tuples.
+  """
+
+    try:
+        from english_words import english_words_lower_alpha_set as correct_words
+    except ImportError:
+        cli.echo('Autocorrection will falsely trigger when a typo is a substring of a correctly spelled word.')
+        cli.echo('To check for this, install the english_words package and rerun this script:')
+        cli.echo('  {fg_cyan}python3 -m pip install english_words')
+        # Use a minimal word list as a fallback.
+        correct_words = ('information', 'available', 'international', 'language', 'loosest', 'reference', 'wealthier', 'entertainment', 'association', 'provides', 'technology', 'statehood')
+
+    autocorrections = []
+    typos = set()
+    for line_number, typo, correction in parse_file_lines(file_name):
+        if typo in typos:
+            cli.log.warning('{fg_red}Error:%d:{fg_reset} Ignoring duplicate typo: "{fg_cyan}%s{fg_reset}"', line_number, typo)
+            continue
+
+        # Check that `typo` is valid.
+        if not (all([c in TYPO_CHARS for c in typo])):
+            cli.log.error('{fg_red}Error:%d:{fg_reset} Typo "{fg_cyan}%s{fg_reset}" has characters other than a-z, \' and :.', line_number, typo)
+            sys.exit(1)
+        for other_typo in typos:
+            if typo in other_typo or other_typo in typo:
+                cli.log.error('{fg_red}Error:%d:{fg_reset} Typos may not be substrings of one another, otherwise the longer typo would never trigger: "{fg_cyan}%s{fg_reset}" vs. "{fg_cyan}%s{fg_reset}".', line_number, typo, other_typo)
+                sys.exit(1)
+        if len(typo) < 5:
+            cli.log.warning('{fg_yellow}Warning:%d:{fg_reset} It is suggested that typos are at least 5 characters long to avoid false triggers: "{fg_cyan}%s{fg_reset}"', line_number, typo)
+        if len(typo) > 127:
+            cli.log.error('{fg_red}Error:%d:{fg_reset} Typo exceeds 127 chars: "{fg_cyan}%s{fg_reset}"', line_number, typo)
+            sys.exit(1)
+
+        check_typo_against_dictionary(typo, line_number, correct_words)
+
+        autocorrections.append((typo, correction))
+        typos.add(typo)
+
+    return autocorrections
+
+
+def make_trie(autocorrections: List[Tuple[str, str]]) -> Dict[str, Any]:
+    """Makes a trie from the the typos, writing in reverse.
+  Args:
+    autocorrections: List of (typo, correction) tuples.
+  Returns:
+    Dict of dict, representing the trie.
+  """
+    trie = {}
+    for typo, correction in autocorrections:
+        node = trie
+        for letter in typo[::-1]:
+            node = node.setdefault(letter, {})
+        node['LEAF'] = (typo, correction)
+
+    return trie
+
+
+def parse_file_lines(file_name: str) -> Iterator[Tuple[int, str, str]]:
+    """Parses lines read from `file_name` into typo-correction pairs."""
+
+    line_number = 0
+    for line in open(file_name, 'rt'):
+        line_number += 1
+        line = line.strip()
+        if line and line[0] != '#':
+            # Parse syntax "typo -> correction", using strip to ignore indenting.
+            tokens = [token.strip() for token in line.split('->', 1)]
+            if len(tokens) != 2 or not tokens[0]:
+                print(f'Error:{line_number}: Invalid syntax: "{line}"')
+                sys.exit(1)
+
+            typo, correction = tokens
+            typo = typo.lower()  # Force typos to lowercase.
+            typo = typo.replace(' ', ':')
+
+            yield line_number, typo, correction
+
+
+def check_typo_against_dictionary(typo: str, line_number: int, correct_words) -> None:
+    """Checks `typo` against English dictionary words."""
+
+    if typo.startswith(':') and typo.endswith(':'):
+        if typo[1:-1] in correct_words:
+            cli.log.warning('{fg_yellow}Warning:%d:{fg_reset} Typo "{fg_cyan}%s{fg_reset}" is a correctly spelled dictionary word.', line_number, typo)
+    elif typo.startswith(':') and not typo.endswith(':'):
+        for word in correct_words:
+            if word.startswith(typo[1:]):
+                cli.log.warning('{fg_yellow}Warning:%d: {fg_reset}Typo "{fg_cyan}%s{fg_reset}" would falsely trigger on correctly spelled word "{fg_cyan}%s{fg_reset}".', line_number, typo, word)
+    elif not typo.startswith(':') and typo.endswith(':'):
+        for word in correct_words:
+            if word.endswith(typo[:-1]):
+                cli.log.warning('{fg_yellow}Warning:%d:{fg_reset} Typo "{fg_cyan}%s{fg_reset}" would falsely trigger on correctly spelled word "{fg_cyan}%s{fg_reset}".', line_number, typo, word)
+    elif not typo.startswith(':') and not typo.endswith(':'):
+        for word in correct_words:
+            if typo in word:
+                cli.log.warning('{fg_yellow}Warning:%d:{fg_reset} Typo "{fg_cyan}%s{fg_reset}" would falsely trigger on correctly spelled word "{fg_cyan}%s{fg_reset}".', line_number, typo, word)
+
+
+def serialize_trie(autocorrections: List[Tuple[str, str]], trie: Dict[str, Any]) -> List[int]:
+    """Serializes trie and correction data in a form readable by the C code.
+  Args:
+    autocorrections: List of (typo, correction) tuples.
+    trie: Dict of dicts.
+  Returns:
+    List of ints in the range 0-255.
+  """
+    table = []
+
+    # Traverse trie in depth first order.
+    def traverse(trie_node):
+        if 'LEAF' in trie_node:  # Handle a leaf trie node.
+            typo, correction = trie_node['LEAF']
+            word_boundary_ending = typo[-1] == ':'
+            typo = typo.strip(':')
+            i = 0  # Make the autocorrection data for this entry and serialize it.
+            while i < min(len(typo), len(correction)) and typo[i] == correction[i]:
+                i += 1
+            backspaces = len(typo) - i - 1 + word_boundary_ending
+            assert 0 <= backspaces <= 63
+            correction = correction[i:]
+            bs_count = [backspaces + 128]
+            data = bs_count + list(bytes(correction, 'ascii')) + [0]
+
+            entry = {'data': data, 'links': [], 'byte_offset': 0}
+            table.append(entry)
+        elif len(trie_node) == 1:  # Handle trie node with a single child.
+            c, trie_node = next(iter(trie_node.items()))
+            entry = {'chars': c, 'byte_offset': 0}
+
+            # It's common for a trie to have long chains of single-child nodes. We
+            # find the whole chain so that we can serialize it more efficiently.
+            while len(trie_node) == 1 and 'LEAF' not in trie_node:
+                c, trie_node = next(iter(trie_node.items()))
+                entry['chars'] += c
+
+            table.append(entry)
+            entry['links'] = [traverse(trie_node)]
+        else:  # Handle trie node with multiple children.
+            entry = {'chars': ''.join(sorted(trie_node.keys())), 'byte_offset': 0}
+            table.append(entry)
+            entry['links'] = [traverse(trie_node[c]) for c in entry['chars']]
+        return entry
+
+    traverse(trie)
+
+    def serialize(e: Dict[str, Any]) -> List[int]:
+        if not e['links']:  # Handle a leaf table entry.
+            return e['data']
+        elif len(e['links']) == 1:  # Handle a chain table entry.
+            return [TYPO_CHARS[c] for c in e['chars']] + [0]  # + encode_link(e['links'][0]))
+        else:  # Handle a branch table entry.
+            data = []
+            for c, link in zip(e['chars'], e['links']):
+                data += [TYPO_CHARS[c] | (0 if data else 64)] + encode_link(link)
+            return data + [0]
+
+    byte_offset = 0
+    for e in table:  # To encode links, first compute byte offset of each entry.
+        e['byte_offset'] = byte_offset
+        byte_offset += len(serialize(e))
+        assert 0 <= byte_offset <= 0xffff
+
+    return [b for e in table for b in serialize(e)]  # Serialize final table.
+
+
+def encode_link(link: Dict[str, Any]) -> List[int]:
+    """Encodes a node link as two bytes."""
+    byte_offset = link['byte_offset']
+    if not (0 <= byte_offset <= 0xffff):
+        cli.log.error('{fg_red}Error:{fg_reset} The autocorrection table is too large, a node link exceeds 64KB limit. Try reducing the autocorrection dict to fewer entries.')
+        sys.exit(1)
+    return [byte_offset & 255, byte_offset >> 8]
+
+
+def write_generated_code(autocorrections: List[Tuple[str, str]], data: List[int], file_name: str) -> None:
+    """Writes autocorrection data as generated C code to `file_name`.
+  Args:
+    autocorrections: List of (typo, correction) tuples.
+    data: List of ints in 0-255, the serialized trie.
+    file_name: String, path of the output C file.
+  """
+    assert all(0 <= b <= 255 for b in data)
+
+    def typo_len(e: Tuple[str, str]) -> int:
+        return len(e[0])
+
+    min_typo = min(autocorrections, key=typo_len)[0]
+    max_typo = max(autocorrections, key=typo_len)[0]
+    generated_code = ''.join([
+        '// Generated code.\n\n', f'// Autocorrection dictionary ({len(autocorrections)} entries):\n', ''.join(sorted(f'//   {typo:<{len(max_typo)}} -> {correction}\n' for typo, correction in autocorrections)),
+        f'\n#define AUTOCORRECT_MIN_LENGTH {len(min_typo)}  // "{min_typo}"\n', f'#define AUTOCORRECT_MAX_LENGTH {len(max_typo)}  // "{max_typo}"\n\n', f'#define DICTIONARY_SIZE {len(data)}\n\n',
+        textwrap.fill('static const uint8_t autocorrect_data[DICTIONARY_SIZE] PROGMEM = {%s};' % (', '.join(map(str, data))), width=120, subsequent_indent='    '), '\n\n'
+    ])
+
+    with open(file_name, 'wt') as f:
+        f.write(generated_code)
+
+
+@cli.argument('filename', default='autocorrect_dict.txt', help='The autocorrection database file')
+@cli.argument('-kb', '--keyboard', type=keyboard_folder, completer=keyboard_completer, help='The keyboard to build a firmware for. Ignored when a configurator export is supplied.')
+@cli.argument('-km', '--keymap', completer=keymap_completer, help='The keymap to build a firmware for. Ignored when a configurator export is supplied.')
+@cli.argument('-o', '--output', arg_only=True, type=qmk.path.normpath, help='File to write to')
+@cli.subcommand('Generate the autocorrection data file from a dictionary file.')
+def generate_autocorrect_data(cli):
+    autocorrections = parse_file(cli.args.filename)
+    trie = make_trie(autocorrections)
+    data = serialize_trie(autocorrections, trie)
+    # Environment processing
+    if cli.args.output == '-':
+        cli.args.output = None
+
+    if cli.args.output:
+        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
+        cli.log.info('Creating autocorrect database at {fg_cyan}%s', cli.args.output)
+        write_generated_code(autocorrections, data, cli.args.output)
+
+    else:
+        current_keyboard = cli.args.keyboard or cli.config.user.keyboard or cli.config.generate_autocorrect_data.keyboard
+        current_keymap = cli.args.keymap or cli.config.user.keymap or cli.config.generate_autocorrect_data.keymap
+
+        if current_keyboard and current_keymap:
+            filename = locate_keymap(current_keyboard, current_keymap).parent / 'autocorrect_data.h'
+            cli.log.info('Creating autocorrect database at {fg_cyan}%s', filename)
+            write_generated_code(autocorrections, data, filename)
+
+        else:
+            write_generated_code(autocorrections, data, 'autocorrect_data.h')
+
+    cli.log.info('Processed %d autocorrection entries to table with %d bytes.', len(autocorrections), len(data))
diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 0b7ae39907..7c0431fd12 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -46,7 +46,7 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_DEFAULT_LAYER, 0);
     default_layer_state = 0;
     eeprom_update_byte(EECONFIG_KEYMAP_LOWER_BYTE, 0);
-    eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, 0x4);
+    eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, 0xC);
     eeprom_update_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
     eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
     eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default
diff --git a/quantum/keycode_config.h b/quantum/keycode_config.h
index 81a8e61471..eef048d95c 100644
--- a/quantum/keycode_config.h
+++ b/quantum/keycode_config.h
@@ -39,6 +39,7 @@ typedef union {
         bool swap_rctl_rgui : 1;
         bool oneshot_enable : 1;
         bool swap_escape_capslock : 1;
+        bool autocorrect_enable : 1;
     };
 } keymap_config_t;
 
diff --git a/quantum/process_keycode/autocorrect_data_default.h b/quantum/process_keycode/autocorrect_data_default.h
new file mode 100644
index 0000000000..bfc29666df
--- /dev/null
+++ b/quantum/process_keycode/autocorrect_data_default.h
@@ -0,0 +1,85 @@
+// Generated code.
+
+// Autocorrection dictionary (70 entries):
+//   :guage     -> gauge
+//   :the:the:  -> the
+//   :thier     -> their
+//   :ture      -> true
+//   accomodate -> accommodate
+//   acommodate -> accommodate
+//   aparent    -> apparent
+//   aparrent   -> apparent
+//   apparant   -> apparent
+//   apparrent  -> apparent
+//   aquire     -> acquire
+//   becuase    -> because
+//   cauhgt     -> caught
+//   cheif      -> chief
+//   choosen    -> chosen
+//   cieling    -> ceiling
+//   collegue   -> colleague
+//   concensus  -> consensus
+//   contians   -> contains
+//   cosnt      -> const
+//   dervied    -> derived
+//   fales      -> false
+//   fasle      -> false
+//   fitler     -> filter
+//   flase      -> false
+//   foward     -> forward
+//   frequecy   -> frequency
+//   gaurantee  -> guarantee
+//   guaratee   -> guarantee
+//   heigth     -> height
+//   heirarchy  -> hierarchy
+//   inclued    -> include
+//   interator  -> iterator
+//   intput     -> input
+//   invliad    -> invalid
+//   lenght     -> length
+//   liasion    -> liaison
+//   libary     -> library
+//   listner    -> listener
+//   looses:    -> loses
+//   looup      -> lookup
+//   manefist   -> manifest
+//   namesapce  -> namespace
+//   namespcae  -> namespace
+//   occassion  -> occasion
+//   occured    -> occurred
+//   ouptut     -> output
+//   ouput      -> output
+//   overide    -> override
+//   postion    -> position
+//   priviledge -> privilege
+//   psuedo     -> pseudo
+//   recieve    -> receive
+//   refered    -> referred
+//   relevent   -> relevant
+//   repitition -> repetition
+//   retrun     -> return
+//   retun      -> return
+//   reuslt     -> result
+//   reutrn     -> return
+//   saftey     -> safety
+//   seperate   -> separate
+//   singed     -> signed
+//   stirng     -> string
+//   strign     -> string
+//   swithc     -> switch
+//   swtich     -> switch
+//   thresold   -> threshold
+//   udpate     -> update
+//   widht      -> width
+
+#define AUTOCORRECT_MIN_LENGTH 5  // ":ture"
+#define AUTOCORRECT_MAX_LENGTH 10 // "accomodate"
+
+#define DICTIONARY_SIZE 1104
+
+static const uint8_t autocorrect_data[DICTIONARY_SIZE] PROGMEM = {108, 43,  0,   6,   71, 0,  7,   81, 0,   8,   199, 0,   9,   240, 1,  10,  250, 1,  11,  26,  2,   17,  53,  2,   18, 190, 2,   19,  202, 2,   21,  212, 2,   22,  20,  3,   23,  67,  3,   28,  16,  4,   0,  72,  50,  0,   22,  60,  0,   0,   11,  23,  44, 8,   11, 23,  44,  0,   132, 0,   8,   22,  18,  18,  15,  0,  132, 115, 101, 115, 0,   11,  23,  12,  26,  22,  0,   129, 99,  104, 0,   68,  94,  0,   8,   106, 0,   15, 174, 0,   21, 187, 0,   0,   12,  15,  25,  17,  12,  0,   131, 97,  108, 105, 100, 0,   74,  119, 0,   12,  129, 0,   21,  140, 0,   24,  165, 0,   0,   17,  12,  22,  0,   131, 103, 110, 101, 100, 0,   25,  21, 8,   7,   0,   131, 105, 118, 101, 100, 0,   72,  147, 0,  24,  156, 0,  0,   9,   8,   21,  0,   129, 114, 101, 100, 0,   6,   6,   18,  0,   129, 114, 101, 100, 0,   15,  6,   17,  12,  0,   129, 100, 101, 0,   18, 22,  8,   21,  11,  23,  0,   130, 104, 111,
+                                                                  108, 100, 0,   4,   26, 18, 9,   0,  131, 114, 119, 97,  114, 100, 0,  68,  233, 0,  6,   246, 0,   7,   4,   1,   8,  16,  1,   10,  52,  1,   15,  81,  1,   21,  90,  1,   22,  117, 1,   23,  144, 1,   24, 215, 1,   25,  228, 1,   0,   6,   19,  22,  8,  16,  4,  17,  0,   130, 97,  99,  101, 0,   19,  4,   22,  8,  16,  4,   17,  0,   131, 112, 97,  99,  101, 0,   12,  21,  8,   25,  18,  0,   130, 114, 105, 100, 101, 0,  23,  0,   68, 25,  1,   17,  36,  1,   0,   21,  4,   24,  10,  0,   130, 110, 116, 101, 101, 0,   4,   21,  24,  4,   10,  0,   135, 117, 97,  114, 97,  110, 116, 101, 101, 0,   68,  59,  1,   7,   69,  1,   0,  24,  10,  44,  0,   131, 97,  117, 103, 101, 0,   8,   15, 12,  25,  12, 21,  19,  0,   130, 103, 101, 0,   22,  4,   9,   0,   130, 108, 115, 101, 0,   76,  97,  1,   24,  109, 1,   0,   24,  20,  4,   0,   132, 99, 113, 117, 105, 114, 101, 0,   23,  44,  0,
+                                                                  130, 114, 117, 101, 0,  4,  0,   79, 126, 1,   24,  134, 1,   0,   9,  0,   131, 97, 108, 115, 101, 0,   6,   8,   5,  0,   131, 97,  117, 115, 101, 0,   4,   0,   71,  156, 1,   19,  193, 1,   21,  203, 1,  0,   18,  16,  0,   80,  166, 1,   18,  181, 1,  0,   18, 6,   4,   0,   135, 99,  111, 109, 109, 111, 100, 97, 116, 101, 0,   6,   6,   4,   0,   132, 109, 111, 100, 97,  116, 101, 0,   7,   24,  0,   132, 112, 100, 97, 116, 101, 0,  8,   19,  8,   22,  0,   132, 97,  114, 97,  116, 101, 0,   10,  8,   15,  15,  18,  6,   0,   130, 97,  103, 117, 101, 0,   8,   12,  6,   8,   21,  0,   131, 101, 105, 118, 101, 0,   12,  8,   11, 6,   0,   130, 105, 101, 102, 0,   17,  0,   76,  3,   2,  21,  16,  2,  0,   15,  8,   12,  6,   0,   133, 101, 105, 108, 105, 110, 103, 0,   12,  23,  22,  0,   131, 114, 105, 110, 103, 0,   70,  33,  2,   23,  44, 2,   0,   12,  23,  26,  22,  0,   131, 105,
+                                                                  116, 99,  104, 0,   10, 12, 8,   11, 0,   129, 104, 116, 0,   72,  69, 2,   10,  80, 2,   18,  89,  2,   21,  156, 2,  24,  167, 2,   0,   22,  18,  18,  11,  6,   0,   131, 115, 101, 110, 0,   12,  21,  23, 22,  0,   129, 110, 103, 0,   12,  0,   86,  98, 2,   23, 124, 2,   0,   68,  105, 2,   22,  114, 2,   0,   12, 15,  0,   131, 105, 115, 111, 110, 0,   4,   6,   6,   18,  0,   131, 105, 111, 110, 0,   76,  131, 2,   22, 146, 2,   0,  23,  12,  19,  8,   21,  0,   134, 101, 116, 105, 116, 105, 111, 110, 0,   18,  19,  0,   131, 105, 116, 105, 111, 110, 0,   23,  24,  8,   21,  0,   131, 116, 117, 114, 110, 0,   85,  174, 2,   23, 183, 2,   0,   23,  8,   21,  0,   130, 117, 114, 110, 0,  8,   21,  0,  128, 114, 110, 0,   7,   8,   24,  22,  19,  0,   131, 101, 117, 100, 111, 0,   24,  18,  18,  15,  0,   129, 107, 117, 112, 0,   72,  219, 2,  18,  3,   3,   0,   76,  229, 2,   15,  238,
+                                                                  2,   17,  248, 2,   0,  11, 23,  44, 0,   130, 101, 105, 114, 0,   23, 12,  9,   0,  131, 108, 116, 101, 114, 0,   23, 22,  12,  15,  0,   130, 101, 110, 101, 114, 0,   23,  4,   21,  8,   23,  17,  12,  0,  135, 116, 101, 114, 97,  116, 111, 114, 0,   72, 30,  3,  17,  38,  3,   24,  51,  3,   0,   15,  4,   9,   0,  129, 115, 101, 0,   4,   12,  23,  17,  18,  6,   0,   131, 97,  105, 110, 115, 0,   22,  17,  8,   6,   17, 18,  6,   0,  133, 115, 101, 110, 115, 117, 115, 0,   74,  86,  3,   11,  96,  3,   15,  118, 3,   17,  129, 3,   22,  218, 3,   24,  232, 3,   0,   11,  24,  4,   6,   0,   130, 103, 104, 116, 0,   71,  103, 3,  10,  110, 3,   0,   12,  26,  0,   129, 116, 104, 0,   17, 8,   15,  0,  129, 116, 104, 0,   22,  24,  8,   21,  0,   131, 115, 117, 108, 116, 0,   68,  139, 3,   8,   150, 3,   22,  210, 3,   0,   21,  4,   19,  19, 4,   0,   130, 101, 110, 116, 0,   85,  157,
+                                                                  3,   25,  200, 3,   0,  68, 164, 3,  21,  175, 3,   0,   19,  4,   0,  132, 112, 97, 114, 101, 110, 116, 0,   4,   19, 0,   68,  185, 3,   19,  193, 3,   0,   133, 112, 97,  114, 101, 110, 116, 0,   4,   0,  131, 101, 110, 116, 0,   8,   15,  8,   21,  0,  130, 97, 110, 116, 0,   18,  6,   0,   130, 110, 115, 116, 0,  12,  9,   8,   17,  4,   16,  0,   132, 105, 102, 101, 115, 116, 0,   83,  239, 3,   23,  6,   4,   0,   87, 246, 3,   24, 254, 3,   0,   17,  12,  0,   131, 112, 117, 116, 0,   18,  0,   130, 116, 112, 117, 116, 0,   19,  24,  18,  0,   131, 116, 112, 117, 116, 0,   70,  29,  4,   8,   41,  4,   11,  51,  4,   21,  69, 4,   0,   8,   24,  20,  8,   21,  9,   0,   129, 110, 99, 121, 0,   23, 9,   4,   22,  0,   130, 101, 116, 121, 0,   6,   21,  4,   21,  12,  8,   11,  0,   135, 105, 101, 114, 97,  114, 99,  104, 121, 0,   4,   5,  12,  15,  0,   130, 114, 97,  114, 121, 0};
diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
new file mode 100644
index 0000000000..abae5e7811
--- /dev/null
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -0,0 +1,287 @@
+// Copyright 2021 Google LLC
+// Copyright 2021 @filterpaper
+// SPDX-License-Identifier: Apache-2.0
+// Original source: https://getreuer.info/posts/keyboards/autocorrection
+
+#include "process_autocorrect.h"
+#include <string.h>
+#include "keycode_config.h"
+
+#if __has_include("autocorrect_data.h")
+#    include "autocorrect_data.h"
+#else
+#    pragma message "Autocorrect is using the default library."
+#    include "autocorrect_data_default.h"
+#endif
+
+static uint8_t typo_buffer[AUTOCORRECT_MAX_LENGTH] = {KC_SPC};
+static uint8_t typo_buffer_size                    = 1;
+
+/**
+ * @brief function for querying the enabled state of autocorrect
+ *
+ * @return true if enabled
+ * @return false if disabled
+ */
+bool autocorrect_is_enabled(void) {
+    return keymap_config.autocorrect_enable;
+}
+
+/**
+ * @brief Enables autocorrect and saves state to eeprom
+ *
+ */
+void autocorrect_enable(void) {
+    keymap_config.autocorrect_enable = true;
+    eeconfig_update_keymap(keymap_config.raw);
+}
+
+/**
+ * @brief Disables autocorrect and saves state to eeprom
+ *
+ */
+void autocorrect_disable(void) {
+    keymap_config.autocorrect_enable = false;
+    typo_buffer_size                 = 0;
+    eeconfig_update_keymap(keymap_config.raw);
+}
+
+/**
+ * @brief Toggles autocorrect's status and save state to eeprom
+ *
+ */
+void autocorrect_toggle(void) {
+    keymap_config.autocorrect_enable = !keymap_config.autocorrect_enable;
+    typo_buffer_size                 = 0;
+    eeconfig_update_keymap(keymap_config.raw);
+}
+
+/**
+ * @brief handler for determining if autocorrect should process keypress
+ *
+ * @param keycode Keycode registered by matrix press, per keymap
+ * @param record keyrecord_t structure
+ * @param typo_buffer_size passed along to allow resetting of autocorrect buffer
+ * @param mods allow processing of mod status
+ * @return true Allow autocorection
+ * @return false Stop processing and escape from autocorrect.
+ */
+__attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods) {
+    // See quantum_keycodes.h for reference on these matched ranges.
+    switch (*keycode) {
+        // Exclude these keycodes from processing.
+        case KC_LSFT:
+        case KC_RSFT:
+        case KC_CAPS:
+        case QK_TO ... QK_ONE_SHOT_LAYER_MAX:
+        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
+        case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
+            return false;
+
+        // Mask for base keycode from shifted keys.
+        case QK_LSFT ... QK_LSFT + 255:
+        case QK_RSFT ... QK_RSFT + 255:
+            if (*keycode >= QK_LSFT && *keycode <= (QK_LSFT + 255)) {
+                *mods |= MOD_LSFT;
+            } else {
+                *mods |= MOD_RSFT;
+            }
+            *keycode &= 0xFF; // Get the basic keycode.
+            return true;
+#ifndef NO_ACTION_TAPPING
+        // Exclude tap-hold keys when they are held down
+        // and mask for base keycode when they are tapped.
+        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+#    ifdef NO_ACTION_LAYER
+            // Exclude Layer Tap, if layers are disabled
+            // but action tapping is still enabled.
+            return false;
+#    endif
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+            // Exclude hold keycode
+            if (!record->tap.count) {
+                return false;
+            }
+            *keycode &= 0xFF;
+            break;
+#else
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+            // Exclude if disabled
+            return false;
+#endif
+        // Exclude swap hands keys when they are held down
+        // and mask for base keycode when they are tapped.
+        case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
+#ifdef SWAP_HANDS_ENABLE
+            if (*keycode >= 0x56F0 || !record->tap.count) {
+                return false;
+            }
+            *keycode &= 0xFF;
+            break;
+#else
+            // Exclude if disabled
+            return false;
+#endif
+    }
+
+    // Disable autocorrect while a mod other than shift is active.
+    if ((*mods & ~MOD_MASK_SHIFT) != 0) {
+        *typo_buffer_size = 0;
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * @brief handling for when autocorrection has been triggered
+ *
+ * @param backspaces number of characters to remove
+ * @param str pointer to PROGMEM string to replace mistyped seletion with
+ * @return true apply correction
+ * @return false user handled replacement
+ */
+__attribute__((weak)) bool apply_autocorrect(uint8_t backspaces, const char *str) {
+    return true;
+}
+
+/**
+ * @brief Process handler for autocorrect feature
+ *
+ * @param keycode Keycode registered by matrix press, per keymap
+ * @param record keyrecord_t structure
+ * @return true Continue processing keycodes, and send to host
+ * @return false Stop processing keycodes, and don't send to host
+ */
+bool process_autocorrect(uint16_t keycode, keyrecord_t *record) {
+    uint8_t mods = get_mods();
+#ifndef NO_ACTION_ONESHOT
+    mods |= get_oneshot_mods();
+#endif
+
+    if ((keycode >= AUTOCORRECT_ON && keycode <= AUTOCORRECT_TOGGLE) && record->event.pressed) {
+        if (keycode == AUTOCORRECT_ON) {
+            autocorrect_enable();
+        } else if (keycode == AUTOCORRECT_OFF) {
+            autocorrect_disable();
+        } else if (keycode == AUTOCORRECT_TOGGLE) {
+            autocorrect_toggle();
+        } else {
+            return true;
+        }
+
+        return false;
+    }
+
+    if (!keymap_config.autocorrect_enable) {
+        typo_buffer_size = 0;
+        return true;
+    }
+
+    if (!record->event.pressed) {
+        return true;
+    }
+
+    // autocorrect keycode verification and extraction
+    if (!process_autocorrect_user(&keycode, record, &typo_buffer_size, &mods)) {
+        return true;
+    }
+
+    // keycode buffer check
+    switch (keycode) {
+        case KC_A ... KC_Z:
+            // process normally
+            break;
+        case KC_1 ... KC_0:
+        case KC_TAB ... KC_SEMICOLON:
+        case KC_GRAVE ... KC_SLASH:
+            // Set a word boundary if space, period, digit, etc. is pressed.
+            keycode = KC_SPC;
+            break;
+        case KC_ENTER:
+            // Behave more conservatively for the enter key. Reset, so that enter
+            // can't be used on a word ending.
+            typo_buffer_size = 0;
+            keycode          = KC_SPC;
+            break;
+        case KC_BSPC:
+            // Remove last character from the buffer.
+            if (typo_buffer_size > 0) {
+                --typo_buffer_size;
+            }
+            return true;
+        case KC_QUOTE:
+            // Treat " (shifted ') as a word boundary.
+            if ((mods & MOD_MASK_SHIFT) != 0) {
+                keycode = KC_SPC;
+            }
+            break;
+        default:
+            // Clear state if some other non-alpha key is pressed.
+            typo_buffer_size = 0;
+            return true;
+    }
+
+    // Rotate oldest character if buffer is full.
+    if (typo_buffer_size >= AUTOCORRECT_MAX_LENGTH) {
+        memmove(typo_buffer, typo_buffer + 1, AUTOCORRECT_MAX_LENGTH - 1);
+        typo_buffer_size = AUTOCORRECT_MAX_LENGTH - 1;
+    }
+
+    // Append `keycode` to buffer.
+    typo_buffer[typo_buffer_size++] = keycode;
+    // Return if buffer is smaller than the shortest word.
+    if (typo_buffer_size < AUTOCORRECT_MIN_LENGTH) {
+        return true;
+    }
+
+    // Check for typo in buffer using a trie stored in `autocorrect_data`.
+    uint16_t state = 0;
+    uint8_t  code  = pgm_read_byte(autocorrect_data + state);
+    for (int8_t i = typo_buffer_size - 1; i >= 0; --i) {
+        uint8_t const key_i = typo_buffer[i];
+
+        if (code & 64) { // Check for match in node with multiple children.
+            code &= 63;
+            for (; code != key_i; code = pgm_read_byte(autocorrect_data + (state += 3))) {
+                if (!code) return true;
+            }
+            // Follow link to child node.
+            state = (pgm_read_byte(autocorrect_data + state + 1) | pgm_read_byte(autocorrect_data + state + 2) << 8);
+            // Check for match in node with single child.
+        } else if (code != key_i) {
+            return true;
+        } else if (!(code = pgm_read_byte(autocorrect_data + (++state)))) {
+            ++state;
+        }
+
+        // Stop if `state` becomes an invalid index. This should not normally
+        // happen, it is a safeguard in case of a bug, data corruption, etc.
+        if (state >= DICTIONARY_SIZE) {
+            return true;
+        }
+
+        code = pgm_read_byte(autocorrect_data + state);
+
+        if (code & 128) { // A typo was found! Apply autocorrect.
+            const uint8_t backspaces = (code & 63) + !record->event.pressed;
+            if (apply_autocorrect(backspaces, (char const *)(autocorrect_data + state + 1))) {
+                for (uint8_t i = 0; i < backspaces; ++i) {
+                    tap_code(KC_BSPC);
+                }
+                send_string_P((char const *)(autocorrect_data + state + 1));
+            }
+
+            if (keycode == KC_SPC) {
+                typo_buffer[0]   = KC_SPC;
+                typo_buffer_size = 1;
+                return true;
+            } else {
+                typo_buffer_size = 0;
+                return false;
+            }
+        }
+    }
+    return true;
+}
diff --git a/quantum/process_keycode/process_autocorrect.h b/quantum/process_keycode/process_autocorrect.h
new file mode 100644
index 0000000000..c7596107e5
--- /dev/null
+++ b/quantum/process_keycode/process_autocorrect.h
@@ -0,0 +1,17 @@
+// Copyright 2021 Google LLC
+// Copyright 2021 @filterpaper
+// SPDX-License-Identifier: Apache-2.0
+// Original source: https://getreuer.info/posts/keyboards/autocorrection
+
+#pragma once
+
+#include "quantum.h"
+
+bool process_autocorrect(uint16_t keycode, keyrecord_t *record);
+bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods);
+bool apply_autocorrect(uint8_t backspaces, const char *str);
+
+bool autocorrect_is_enabled(void);
+void autocorrect_enable(void);
+void autocorrect_disable(void);
+void autocorrect_toggle(void);
diff --git a/quantum/quantum.c b/quantum/quantum.c
index acafd8025c..9f1d3502fb 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -335,6 +335,9 @@ bool process_record_quantum(keyrecord_t *record) {
 #endif
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
             process_programmable_button(keycode, record) &&
+#endif
+#ifdef AUTOCORRECT_ENABLE
+            process_autocorrect(keycode, record) &&
 #endif
             true)) {
         return false;
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 51360c3d2a..9c1b9952b8 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -236,6 +236,10 @@ extern layer_state_t layer_state;
 #    include "process_caps_word.h"
 #endif
 
+#ifdef AUTOCORRECT_ENABLE
+#    include "process_autocorrect.h"
+#endif
+
 // For tri-layer
 void          update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
 layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3);
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index c8f03fa1ce..abf3f1a384 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -611,6 +611,10 @@ enum quantum_keycodes {
 
     UNICODE_MODE_EMACS,
 
+    AUTOCORRECT_ON,
+    AUTOCORRECT_OFF,
+    AUTOCORRECT_TOGGLE,
+
     // Start of custom keycode range for keyboards and keymaps - always leave at the end
     SAFE_RANGE
 };
@@ -799,6 +803,10 @@ enum quantum_keycodes {
 #define EH_LEFT MAGIC_EE_HANDS_LEFT
 #define EH_RGHT MAGIC_EE_HANDS_RIGHT
 
+#define CRT_ON AUTOCORRECT_ON
+#define CRT_OFF AUTOCORRECT_OFF
+#define CRT_TOG AUTOCORRECT_TOGGLE
+
 // GOTO layer - 256 layer max
 #define TO(layer) (QK_TO | ((layer)&0xFF))
 
diff --git a/tests/autocorrect/config.h b/tests/autocorrect/config.h
new file mode 100644
index 0000000000..b68bf0c2d5
--- /dev/null
+++ b/tests/autocorrect/config.h
@@ -0,0 +1,6 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "test_common.h"
diff --git a/tests/autocorrect/test.mk b/tests/autocorrect/test.mk
new file mode 100644
index 0000000000..7b97d8cce3
--- /dev/null
+++ b/tests/autocorrect/test.mk
@@ -0,0 +1,8 @@
+# Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
+
+AUTOCORRECT_ENABLE = yes
diff --git a/tests/autocorrect/test_autocorrect.cpp b/tests/autocorrect/test_autocorrect.cpp
new file mode 100644
index 0000000000..509c1c9ea4
--- /dev/null
+++ b/tests/autocorrect/test_autocorrect.cpp
@@ -0,0 +1,204 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "keycode.h"
+#include "test_common.hpp"
+
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::InSequence;
+
+class AutoCorrect : public TestFixture {
+   public:
+    void SetUp() override {
+        autocorrect_enable();
+    }
+    // Convenience function to tap `key`.
+    void TapKey(KeymapKey key) {
+        key.press();
+        run_one_scan_loop();
+        key.release();
+        run_one_scan_loop();
+    }
+
+    // Taps in order each key in `keys`.
+    template <typename... Ts>
+    void TapKeys(Ts... keys) {
+        for (KeymapKey key : {keys...}) {
+            TapKey(key);
+        }
+    }
+};
+
+// Test that verifies enable/disable/toggling works
+TEST_F(AutoCorrect, OnOffToggle) {
+    TestDriver driver;
+
+    EXPECT_EQ(autocorrect_is_enabled(), true);
+
+    autocorrect_disable();
+    EXPECT_EQ(autocorrect_is_enabled(), false);
+    autocorrect_disable();
+    EXPECT_EQ(autocorrect_is_enabled(), false);
+
+    autocorrect_enable();
+    EXPECT_EQ(autocorrect_is_enabled(), true);
+    autocorrect_enable();
+    EXPECT_EQ(autocorrect_is_enabled(), true);
+
+    autocorrect_toggle();
+    EXPECT_EQ(autocorrect_is_enabled(), false);
+    autocorrect_toggle();
+    EXPECT_EQ(autocorrect_is_enabled(), true);
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test that typing "fales" autocorrects to "false"
+TEST_F(AutoCorrect, fales_to_false_autocorrection) {
+    TestDriver driver;
+    auto       key_f = KeymapKey(0, 0, 0, KC_F);
+    auto       key_a = KeymapKey(0, 1, 0, KC_A);
+    auto       key_l = KeymapKey(0, 2, 0, KC_L);
+    auto       key_e = KeymapKey(0, 3, 0, KC_E);
+    auto       key_s = KeymapKey(0, 4, 0, KC_S);
+
+    set_keymap({key_f, key_a, key_l, key_e, key_s});
+
+    // Allow any number of empty reports.
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(AnyNumber());
+    { // Expect the following reports in this order.
+        InSequence s;
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_F)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_BACKSPACE)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_S)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E)));
+    }
+
+    TapKeys(key_f, key_a, key_l, key_e, key_s);
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test that typing "fales" doesn't autocorrect if disabled
+TEST_F(AutoCorrect, fales_disabled_autocorrect) {
+    TestDriver driver;
+    auto       key_f = KeymapKey(0, 0, 0, KC_F);
+    auto       key_a = KeymapKey(0, 1, 0, KC_A);
+    auto       key_l = KeymapKey(0, 2, 0, KC_L);
+    auto       key_e = KeymapKey(0, 3, 0, KC_E);
+    auto       key_s = KeymapKey(0, 4, 0, KC_S);
+
+    set_keymap({key_f, key_a, key_l, key_e, key_s});
+
+    // Allow any number of empty reports.
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(AnyNumber());
+    { // Expect the following reports in this order.
+        InSequence s;
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_F)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_S)));
+    }
+
+    autocorrect_disable();
+    TapKeys(key_f, key_a, key_l, key_e, key_s);
+    autocorrect_enable();
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test that typing "falsify" doesn't autocorrect if disabled
+TEST_F(AutoCorrect, falsify_should_not_autocorrect) {
+    TestDriver driver;
+    auto       key_f = KeymapKey(0, 0, 0, KC_F);
+    auto       key_a = KeymapKey(0, 1, 0, KC_A);
+    auto       key_l = KeymapKey(0, 2, 0, KC_L);
+    auto       key_s = KeymapKey(0, 3, 0, KC_S);
+    auto       key_i = KeymapKey(0, 4, 0, KC_I);
+    auto       key_y = KeymapKey(0, 5, 0, KC_Y);
+
+    set_keymap({key_f, key_a, key_l, key_s, key_i, key_y});
+
+    // Allow any number of empty reports.
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(AnyNumber());
+    { // Expect the following reports in this order.
+        InSequence s;
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_F)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_S)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_I)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_F)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_Y)));
+    }
+
+    TapKeys(key_f, key_a, key_l, key_s, key_i, key_f, key_y);
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test that  typing "ture" autocorrect to "true"
+TEST_F(AutoCorrect, ture_to_true_autocorrect) {
+    TestDriver driver;
+    auto       key_t_code = KeymapKey(0, 0, 0, KC_T);
+    auto       key_r      = KeymapKey(0, 1, 0, KC_R);
+    auto       key_u      = KeymapKey(0, 2, 0, KC_U);
+    auto       key_e      = KeymapKey(0, 3, 0, KC_E);
+    auto       key_space  = KeymapKey(0, 4, 0, KC_SPACE);
+
+    set_keymap({key_t_code, key_r, key_u, key_e, key_space});
+
+    // Allow any number of empty reports.
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(AnyNumber());
+    { // Expect the following reports in this order.
+        InSequence s;
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_SPACE)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_T)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_U)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_R)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_BACKSPACE))).Times(2);
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_R)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_U)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E)));
+    }
+
+    TapKeys(key_space, key_t_code, key_u, key_r, key_e);
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+// Test that  typing "overture" does not autocorrect
+TEST_F(AutoCorrect, overture_should_not_autocorrect) {
+    TestDriver driver;
+    auto       key_t_code = KeymapKey(0, 0, 0, KC_T);
+    auto       key_r      = KeymapKey(0, 1, 0, KC_R);
+    auto       key_u      = KeymapKey(0, 2, 0, KC_U);
+    auto       key_e      = KeymapKey(0, 3, 0, KC_E);
+    auto       key_o      = KeymapKey(0, 4, 0, KC_O);
+    auto       key_v      = KeymapKey(0, 5, 0, KC_V);
+
+    set_keymap({key_t_code, key_r, key_u, key_e, key_o, key_v});
+
+    // Allow any number of empty reports.
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(AnyNumber());
+    { // Expect the following reports in this order.
+        InSequence s;
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_O)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_V)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_R)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_T)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_U)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_R)));
+        EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E)));
+    }
+
+    TapKeys(key_o, key_v, key_e, key_r, key_t_code, key_u, key_r, key_e);
+
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}

From db6a637398a64df343f8317cd1f25dd4268e6a16 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sat, 17 Sep 2022 20:58:46 +0100
Subject: [PATCH 372/959] Fix EECONFIG_KEYMAP_UPPER_BYTE init (#18394)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 quantum/eeconfig.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 7c0431fd12..27a0f6d48f 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -46,7 +46,8 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_DEFAULT_LAYER, 0);
     default_layer_state = 0;
     eeprom_update_byte(EECONFIG_KEYMAP_LOWER_BYTE, 0);
-    eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, 0xC);
+    // Enable oneshot and autocorrect by default: 0b0001 0100
+    eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, 0x14);
     eeprom_update_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
     eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
     eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default

From 3444dd5e2d9c5438bf919eb4b6afd3cba3cb65b2 Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Sun, 18 Sep 2022 02:01:46 -0400
Subject: [PATCH 373/959] [keyboard] kbdfans/kbd75rgb info.json fix (#18391)

---
 keyboards/kbdfans/kbd75rgb/info.json | 95 ++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index 4c008f0310..32201ff192 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -7,5 +7,100 @@
         "vid": "0x4B42",
         "pid": "0x6063",
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"label": "Esc", "x":0, "y":0},
+                {"label": "F1", "x":1, "y":0},
+                {"label": "F2", "x":2, "y":0},
+                {"label": "F3", "x":3, "y":0},
+                {"label": "F4", "x":4, "y":0},
+                {"label": "F5", "x":5, "y":0},
+                {"label": "F6", "x":6, "y":0},
+                {"label": "F7", "x":7, "y":0},
+                {"label": "F8", "x":8, "y":0},
+                {"label": "F9", "x":9, "y":0},
+                {"label": "F10", "x":10, "y":0},
+                {"label": "F11", "x":11, "y":0},
+                {"label": "F12", "x":12, "y":0},
+                {"label": "PrintScr", "x":13, "y":0},
+                {"label": "Ins", "x":14, "y":0},
+                {"label": "Home", "x":15, "y":0},
+
+                {"label": "`~", "x":0, "y":1},
+                {"label": "1!", "x":1, "y":1},
+                {"label": "2@", "x":2, "y":1},
+                {"label": "3#", "x":3, "y":1},
+                {"label": "4$", "x":4, "y":1},
+                {"label": "5%", "x":5, "y":1},
+                {"label": "6^", "x":6, "y":1},
+                {"label": "7&", "x":7, "y":1},
+                {"label": "8*", "x":8, "y":1},
+                {"label": "9(", "x":9, "y":1},
+                {"label": "0)", "x":10, "y":1},
+                {"label": "-_", "x":11, "y":1},
+                {"label": "+=", "x":12, "y":1},
+                {"label": "Backspace", "x":13, "y":1, "w":2},
+                {"label": "End", "x":15, "y":1},
+
+                {"label": "Tab", "x":0, "y":2, "w":1.5},
+                {"label": "Q", "x":1.5, "y":2},
+                {"label": "W", "x":2.5, "y":2},
+                {"label": "E", "x":3.5, "y":2},
+                {"label": "R", "x":4.5, "y":2},
+                {"label": "T", "x":5.5, "y":2},
+                {"label": "Y", "x":6.5, "y":2},
+                {"label": "U", "x":7.5, "y":2},
+                {"label": "I", "x":8.5, "y":2},
+                {"label": "O", "x":9.5, "y":2},
+                {"label": "P", "x":10.5, "y":2},
+                {"label": "[{", "x":11.5, "y":2},
+                {"label": "]}", "x":12.5, "y":2},
+                {"label": "\\|", "x":13.5, "y":2, "w":1.5},
+                {"label": "Pg Up", "x":15, "y":2},
+
+                {"label": "Caps Lock", "x":0, "y":3, "w":1.75},
+                {"label": "A", "x":1.75, "y":3},
+                {"label": "S", "x":2.75, "y":3},
+                {"label": "D", "x":3.75, "y":3},
+                {"label": "F", "x":4.75, "y":3},
+                {"label": "G", "x":5.75, "y":3},
+                {"label": "H", "x":6.75, "y":3},
+                {"label": "J", "x":7.75, "y":3},
+                {"label": "K", "x":8.75, "y":3},
+                {"label": "L", "x":9.75, "y":3},
+                {"label": ";:", "x":10.75, "y":3},
+                {"label": "\"'", "x":11.75, "y":3},
+                {"label": "Enter", "x":12.75, "y":3, "w":2.25},
+                {"label": "Pg Dn", "x":15, "y":3},
+
+                {"label": "Shift", "x":0, "y":4, "w":2.25},
+                {"label": "Z", "x":2.25, "y":4},
+                {"label": "X", "x":3.25, "y":4},
+                {"label": "C", "x":4.25, "y":4},
+                {"label": "V", "x":5.25, "y":4},
+                {"label": "B", "x":6.25, "y":4},
+                {"label": "N", "x":7.25, "y":4},
+                {"label": "M", "x":8.25, "y":4},
+                {"label": ",<", "x":9.25, "y":4},
+                {"label": ".>", "x":10.25, "y":4},
+                {"label": "/?", "x":11.25, "y":4},
+                {"label": "Shift", "x":12.25, "y":4, "w":1.75},
+                {"label": "Up", "x":14, "y":4},
+                {"label": "Del", "x":15, "y":4},
+
+                {"label": "Ctrl", "x":0, "y":5, "w":1.25},
+                {"label": "GUI", "x":1.25, "y":5, "w":1.25},
+                {"label": "Alt", "x":2.5, "y":5, "w":1.25},
+                {"label": "Space", "x":3.75, "y":5, "w":6.25},
+                {"label": "Alt", "x":10, "y":5},
+                {"label": "GUI", "x":11, "y":5},
+                {"label": "Ctrl", "x":12, "y":5},
+                {"label": "Left", "x":13, "y":5},
+                {"label": "Down", "x":14, "y":5},
+                {"label": "Right", "x":15, "y":5}
+            ]
+        }
     }
 }

From a3a47a6556b42645cee43025fb0863e057d70a09 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sun, 18 Sep 2022 11:51:04 -0400
Subject: [PATCH 374/959] Work around WinCompose issue for U+Axxx or U+Exxx
 (#18260)

* Work around WinCompose issue for U+Axxx or U+Exxx

* tzarc's more efficient version

Co-authored-by: Thomas <mail@tpreisner.de>
---
 quantum/unicode/unicode.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/quantum/unicode/unicode.c b/quantum/unicode/unicode.c
index f9f429e7af..3f934c9277 100644
--- a/quantum/unicode/unicode.c
+++ b/quantum/unicode/unicode.c
@@ -324,19 +324,26 @@ void register_hex(uint16_t hex) {
 }
 
 void register_hex32(uint32_t hex) {
-    bool onzerostart = true;
+    bool first_digit        = true;
+    bool needs_leading_zero = (unicode_config.input_mode == UC_WINC);
     for (int i = 7; i >= 0; i--) {
-        if (i <= 3) {
-            onzerostart = false;
-        }
+        // Work out the digit we're going to transmit
         uint8_t digit = ((hex >> (i * 4)) & 0xF);
-        if (digit == 0) {
-            if (!onzerostart) {
-                send_nibble_wrapper(digit);
-            }
-        } else {
+
+        // If we're still searching for the first digit, and found one
+        // that needs a leading zero sent out, send the zero.
+        if (first_digit && needs_leading_zero && digit > 9) {
+            send_nibble_wrapper(0);
+        }
+
+        // Always send digits (including zero) if we're down to the last
+        // two bytes of nibbles.
+        bool must_send = i < 4;
+
+        // If we've found a digit worth transmitting, do so.
+        if (digit != 0 || !first_digit || must_send) {
             send_nibble_wrapper(digit);
-            onzerostart = false;
+            first_digit = false;
         }
     }
 }

From 11551406317578085bcac124d6857c0aca4133e0 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 18 Sep 2022 20:30:27 +0100
Subject: [PATCH 375/959] Add Elite-C to converters (#18309)

---
 data/schemas/keyboard.jsonschema              |  2 +-
 docs/feature_converters.md                    | 47 +++++++++++++++-
 keyboards/cozykeys/speedo/v3/rules.mk         |  2 +
 .../elite_c_to_elite_pi/_pin_defs.h           | 39 ++++++++++++++
 .../elite_c_to_elite_pi/converter.mk          |  9 ++++
 .../elite_c_to_stemcell/_pin_defs.h           | 54 +++++++++++++++++++
 .../elite_c_to_stemcell/converter.mk          | 18 +++++++
 7 files changed, 168 insertions(+), 3 deletions(-)
 create mode 100644 platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h
 create mode 100644 platforms/chibios/converters/elite_c_to_elite_pi/converter.mk
 create mode 100644 platforms/chibios/converters/elite_c_to_stemcell/_pin_defs.h
 create mode 100644 platforms/chibios/converters/elite_c_to_stemcell/converter.mk

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 7e0400d7f7..1b62f30eba 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -38,7 +38,7 @@
         },
         "pin_compatible": {
             "type": "string",
-            "enum": ["promicro"]
+            "enum": ["promicro", "elite_c"]
         },
         "processor": {
             "type": "string",
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 1323bdb372..3dabae915d 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -18,6 +18,8 @@ Currently the following converters are available:
 | `promicro` | `stemcell`        |
 | `promicro` | `bonsai_c4`       |
 | `promicro` | `elite_pi`        |
+| `elite_c`  | `stemcell`        |
+| `elite_c`  | `elite_pi`        |
 
 See below for more in depth information on each converter.
 
@@ -48,6 +50,23 @@ Once a converter is enabled, it exposes the `CONVERT_TO_<target_uppercase>` flag
 #endif
 ```
 
+### Pin Compatibility
+
+To ensure compatibility, provide validation, and power future workflows, a keyboard should declare its `pin compatibility`. For legacy reasons, this is currently assumed to be `promicro`.
+
+Currently the following pin compatibility interfaces are defined:
+
+| Pinout     | Notes                             |
+|------------|-----------------------------------|
+| `promicro` | Includes RX/TX LEDs               |
+| `elite_c`  | Includes bottom row pins, no LEDs |
+
+To declare the base for conversions, add this line to your keyboard's `rules.mk`:
+
+```makefile
+PIN_COMPATIBLE = elite_c
+```
+
 ## Pro Micro
 
 If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.com/products/12640) (or compatible board), the supported alternative controllers are:
@@ -107,7 +126,7 @@ The following defaults are based on what has been implemented for [RP2040](platf
 
 ### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO, and Elite-Pi :id=promicro_rp2040 
 
-Currently identical to  [Adafruit KB2040](#kb2040).
+Currently identical to [Adafruit KB2040](#kb2040).
 
 ### STeMCell :id=stemcell
 
@@ -138,4 +157,28 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro
 #define B0 PAL_LINE(GPIOA, 9)
 ```
 
-No peripherals are enabled by default at this time, but example code to enable SPI, I2C, PWM, and Serial communications can be found [here](/keyboards/custommk/bonsai_c4_template)
+No peripherals are enabled by default at this time, but example code to enable SPI, I2C, PWM, and Serial communications can be found [here](/keyboards/custommk/bonsai_c4_template).
+
+## Elite-C
+
+If a board currently supported in QMK uses an [Elite-C](https://keeb.io/products/elite-c-low-profile-version-usb-c-pro-micro-replacement-atmega32u4), the supported alternative controllers are:
+
+| Device                                                                           | Target            |
+|----------------------------------------------------------------------------------|-------------------|
+| [STeMCell](https://github.com/megamind4089/STeMCell)                             | `stemcell`        |
+| [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi`        |
+
+Converter summary:
+
+| Target            | Argument                        | `rules.mk`                   | Condition                           |
+|-------------------|---------------------------------|------------------------------|-------------------------------------|
+| `stemcell`        | `-e CONVERT_TO=stemcell`        | `CONVERT_TO=stemcell`        | `#ifdef CONVERT_TO_STEMCELL`        |
+| `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |
+
+### STeMCell :id=stemcell_elite
+
+Currently identical to [STeMCell](#stemcell) with support for the additional bottom row of pins.
+
+### Elite-Pi :id=elite_pi
+
+Currently identical to [Adafruit KB2040](#kb2040), with support for the additional bottom row of pins.
diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk
index 561e8f4ca1..8b77971b7e 100644
--- a/keyboards/cozykeys/speedo/v3/rules.mk
+++ b/keyboards/cozykeys/speedo/v3/rules.mk
@@ -4,6 +4,8 @@ MCU = atmega32u4
 # Bootloader selection
 BOOTLOADER = atmel-dfu
 
+PIN_COMPATIBLE = elite_c
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h b/platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h
new file mode 100644
index 0000000000..98dd37e279
--- /dev/null
+++ b/platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h
@@ -0,0 +1,39 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 0U
+#define D2 1U
+//      GND
+//      GND
+#define D1 2U
+#define D0 3U
+#define D4 4U
+#define C6 5U
+#define D7 6U
+#define E6 7U
+#define B4 8U
+#define B5 9U
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 29U
+#define F5 28U
+#define F6 27U
+#define F7 26U
+#define B1 22U
+#define B3 20U
+#define B2 23U
+#define B6 21U
+
+// Bottom row
+#define B7 12U
+#define D5 13U
+#define C7 14U
+#define F1 15U
+#define F0 16U
diff --git a/platforms/chibios/converters/elite_c_to_elite_pi/converter.mk b/platforms/chibios/converters/elite_c_to_elite_pi/converter.mk
new file mode 100644
index 0000000000..590a004189
--- /dev/null
+++ b/platforms/chibios/converters/elite_c_to_elite_pi/converter.mk
@@ -0,0 +1,9 @@
+# Elite-Pi MCU settings for converting AVR projects
+MCU := RP2040
+BOARD := QMK_PM2040
+BOOTLOADER := rp2040
+
+# These are defaults based on what has been implemented for RP2040 boards
+SERIAL_DRIVER ?= vendor
+WS2812_DRIVER ?= vendor
+BACKLIGHT_DRIVER ?= software
diff --git a/platforms/chibios/converters/elite_c_to_stemcell/_pin_defs.h b/platforms/chibios/converters/elite_c_to_stemcell/_pin_defs.h
new file mode 100644
index 0000000000..4458abfa1c
--- /dev/null
+++ b/platforms/chibios/converters/elite_c_to_stemcell/_pin_defs.h
@@ -0,0 +1,54 @@
+// Copyright 2022 Mega Mind (@megamind4089)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Pindefs for v2.0.0
+// https://megamind4089.github.io/STeMCell/pinout/
+
+// Left side (front)
+#ifdef STEMCELL_UART_SWAP
+#    define D3 PAL_LINE(GPIOA, 3)
+#    define D2 PAL_LINE(GPIOA, 2)
+#else
+#    define D3 PAL_LINE(GPIOA, 2)
+#    define D2 PAL_LINE(GPIOA, 3)
+#endif
+//      GND
+//      GND
+#ifdef STEMCELL_I2C_SWAP
+#    define D1 PAL_LINE(GPIOB, 6)
+#    define D0 PAL_LINE(GPIOB, 7)
+#else
+#    define D1 PAL_LINE(GPIOB, 7)
+#    define D0 PAL_LINE(GPIOB, 6)
+#endif
+
+#define D4 PAL_LINE(GPIOA, 15)
+#define C6 PAL_LINE(GPIOB, 3)
+#define D7 PAL_LINE(GPIOB, 4)
+#define E6 PAL_LINE(GPIOB, 5)
+#define B4 PAL_LINE(GPIOB, 8)
+#define B5 PAL_LINE(GPIOB, 9)
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 PAL_LINE(GPIOB, 10)
+#define F5 PAL_LINE(GPIOB, 2)
+#define F6 PAL_LINE(GPIOB, 1)
+#define F7 PAL_LINE(GPIOB, 0)
+
+#define B1 PAL_LINE(GPIOA, 5)
+#define B3 PAL_LINE(GPIOA, 6)
+#define B2 PAL_LINE(GPIOA, 7)
+#define B6 PAL_LINE(GPIOA, 4)
+
+// Bottom row
+#define B7 PAL_LINE(GPIOC, 13)
+#define D5 PAL_LINE(GPIOC, 14)
+#define C7 PAL_LINE(GPIOC, 15)
+#define F1 PAL_LINE(GPIOA, 0)
+#define F0 PAL_LINE(GPIOA, 1)
diff --git a/platforms/chibios/converters/elite_c_to_stemcell/converter.mk b/platforms/chibios/converters/elite_c_to_stemcell/converter.mk
new file mode 100644
index 0000000000..1bbe9bf09e
--- /dev/null
+++ b/platforms/chibios/converters/elite_c_to_stemcell/converter.mk
@@ -0,0 +1,18 @@
+# Copyright 2022 Mega Mind (@megamind4089)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+MCU := STM32F411
+BOARD := STEMCELL
+BOOTLOADER := tinyuf2
+
+SERIAL_DRIVER ?= usart
+WS2812_DRIVER ?= bitbang
+
+ifeq ($(strip $(STMC_US)), yes)
+  OPT_DEFS += -DSTEMCELL_UART_SWAP
+endif
+
+ifeq ($(strip $(STMC_IS)), yes)
+  OPT_DEFS += -DSTEMCELL_I2C_SWAP
+endif
+

From 0f5cfc0363b95f61a54bf83135780ac6e51de8ea Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 19 Sep 2022 05:32:47 +1000
Subject: [PATCH 376/959] Add DD mapping for LED/RGB Matrix max brightness
 (#18403)

---
 data/mappings/info_config.json   | 2 ++
 data/schemas/keyboard.jsonschema | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index eb11f87e7d..fd69c01f08 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -38,6 +38,7 @@
     "LED_COMPOSE_PIN": {"info_key": "indicators.compose"},
     "LED_KANA_PIN": {"info_key": "indicators.kana"},
     "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"},
+    "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
     "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str"},
     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
@@ -77,6 +78,7 @@
     "RGBLIGHT_VAL_STEP": {"info_key": "rgblight.brightness_steps", "value_type": "int"},
     "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"},
     "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},
+    "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"},
     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 1b62f30eba..bf095aadfd 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -265,6 +265,7 @@
             "type": "object",
             "properties": {
                 "driver": {"type": "string"},
+                "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "layout": {
                     "type": "array",
                     "items": {
@@ -292,6 +293,7 @@
             "type": "object",
             "properties": {
                 "driver": {"type": "string"},
+                "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "layout": {
                     "type": "array",
                     "items": {

From c56dc9c0bbe8ba1449e39923e3de2f562707eb40 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 19 Sep 2022 07:19:03 +1000
Subject: [PATCH 377/959] Fixup axon40 lint. (#18409)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/checkerboards/axon40/config.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index 08d505f494..920206e565 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -45,4 +45,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 290

From 1849897444629403fc2e473da6d6f74f8f4f1b8c Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 19 Sep 2022 07:30:08 +1000
Subject: [PATCH 378/959] [QP] Add RGB565 surface. Docs clarification, cleanup,
 tabsification, and reordering. (#18396)

---
 docs/quantum_painter.md                     | 566 ++++++++++++--------
 drivers/painter/generic/qp_rgb565_surface.c | 277 ++++++++++
 drivers/painter/generic/qp_rgb565_surface.h |  42 ++
 drivers/painter/tft_panel/qp_tft_panel.c    |   4 +-
 quantum/painter/qp.h                        |   4 +
 quantum/painter/qp_draw_image.c             |  43 +-
 quantum/painter/qp_draw_text.c              |  49 +-
 quantum/painter/qp_stream.c                 |  47 +-
 quantum/painter/qp_stream.h                 |   5 +-
 quantum/painter/rules.mk                    |  39 +-
 10 files changed, 782 insertions(+), 294 deletions(-)
 create mode 100644 drivers/painter/generic/qp_rgb565_surface.c
 create mode 100644 drivers/painter/generic/qp_rgb565_surface.h

diff --git a/docs/quantum_painter.md b/docs/quantum_painter.md
index 6d4e2764d4..ed9cec171b 100644
--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -8,7 +8,7 @@ To enable overall Quantum Painter to be built into your firmware, add the follow
 
 ```make
 QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = ......
+QUANTUM_PAINTER_DRIVERS += ......
 ```
 
 You will also likely need to select an appropriate driver in `rules.mk`, which is listed below.
@@ -17,17 +17,18 @@ You will also likely need to select an appropriate driver in `rules.mk`, which i
 
 The QMK CLI can be used to convert from normal images such as PNG files or animated GIFs, as well as fonts from TTF files.
 
-Hardware supported:
+Supported devices:
 
-| Display Panel | Panel Type         | Size             | Comms Transport | Driver                                  |
-|---------------|--------------------|------------------|-----------------|-----------------------------------------|
-| GC9A01        | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = gc9a01_spi`  |
-| ILI9163       | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ili9163_spi` |
-| ILI9341       | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ili9341_spi` |
-| ILI9488       | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ili9488_spi` |
-| SSD1351       | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = ssd1351_spi` |
-| ST7789        | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = st7789_spi`  |
-| ST7735        | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS = st7735_spi`  |
+| Display Panel  | Panel Type         | Size             | Comms Transport | Driver                                      |
+|----------------|--------------------|------------------|-----------------|---------------------------------------------|
+| GC9A01         | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += gc9a01_spi`     |
+| ILI9163        | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9163_spi`    |
+| ILI9341        | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9341_spi`    |
+| ILI9488        | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9488_spi`    |
+| SSD1351        | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ssd1351_spi`    |
+| ST7735         | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7735_spi`     |
+| ST7789         | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7789_spi`     |
+| RGB565 Surface | Virtual            | User-defined     | None            | `QUANTUM_PAINTER_DRIVERS += rgb565_surface` |
 
 ## Quantum Painter Configuration :id=quantum-painter-config
 
@@ -45,7 +46,9 @@ Drivers have their own set of configurable options, and are described in their r
 
 ## Quantum Painter CLI Commands :id=quantum-painter-cli
 
-### `qmk painter-convert-graphics`
+<!-- tabs:start -->
+
+### ** `qmk painter-convert-graphics` **
 
 This command converts images to a format usable by QMK, i.e. the QGF File Format.
 
@@ -93,7 +96,7 @@ Writing /home/qmk/qmk_firmware/keyboards/my_keeb/generated/my_image.qgf.h...
 Writing /home/qmk/qmk_firmware/keyboards/my_keeb/generated/my_image.qgf.c...
 ```
 
-### `qmk painter-make-font-image`
+### ** `qmk painter-make-font-image` **
 
 This command converts a TTF font to an intermediate format for editing, before converting to the QFF File Format.
 
@@ -126,7 +129,7 @@ The `UNICODE_GLYPHS` argument allows for specifying extra unicode glyphs to gene
 $ qmk painter-make-font-image --font NotoSans-ExtraCondensedBold.ttf --size 11 -o noto11.png --unicode-glyphs "ĄȽɂɻɣɈʣ"
 ```
 
-### `qmk painter-convert-font-image`
+### ** `qmk painter-convert-font-image` **
 
 This command converts an intermediate font image to the QFF File Format.
 
@@ -170,6 +173,255 @@ Writing /home/qmk/qmk_firmware/keyboards/my_keeb/generated/noto11.qff.h...
 Writing /home/qmk/qmk_firmware/keyboards/my_keeb/generated/noto11.qff.c...
 ```
 
+<!-- tabs:end -->
+
+## Quantum Painter Display Drivers :id=quantum-painter-drivers
+
+<!-- tabs:start -->
+
+### ** Common: Standard TFT (SPI + D/C + RST) **
+
+Most TFT display panels use a 5-pin interface -- SPI SCK, SPI MOSI, SPI CS, D/C, and RST pins.
+
+For these displays, QMK's `spi_master` must already be correctly configured for the platform you're building for.
+
+The pin assignments for SPI CS, D/C, and RST are specified during device construction.
+
+<!-- tabs:start -->
+
+#### ** GC9A01 **
+
+Enabling support for the GC9A01 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += gc9a01_spi
+```
+
+Creating a GC9A01 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_gc9a01_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);
+```
+
+The device handle returned from the `qp_gc9a01_make_spi_device` function 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 GC9A01_NUM_DEVICES 3
+```
+
+#### ** ILI9163 **
+
+Enabling support for the ILI9163 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += ili9163_spi
+```
+
+Creating a ILI9163 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_ili9163_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);
+```
+
+The device handle returned from the `qp_ili9163_make_spi_device` function 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 ILI9163_NUM_DEVICES 3
+```
+
+#### ** ILI9341 **
+
+Enabling support for the ILI9341 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += ili9341_spi
+```
+
+Creating a ILI9341 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_ili9341_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);
+```
+
+The device handle returned from the `qp_ili9341_make_spi_device` function 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 ILI9341_NUM_DEVICES 3
+```
+
+#### ** ILI9488 **
+
+Enabling support for the ILI9488 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += ili9488_spi
+```
+
+Creating a ILI9488 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_ili9488_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);
+```
+
+The device handle returned from the `qp_ili9488_make_spi_device` function 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 ILI9488_NUM_DEVICES 3
+```
+
+#### ** SSD1351 **
+
+Enabling support for the SSD1351 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += ssd1351_spi
+```
+
+Creating a SSD1351 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_ssd1351_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);
+```
+
+The device handle returned from the `qp_ssd1351_make_spi_device` function 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 SSD1351_NUM_DEVICES 3
+```
+
+#### ** ST7735 **
+
+Enabling support for the ST7735 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += st7735_spi
+```
+
+Creating a ST7735 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_st7735_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);
+```
+
+The device handle returned from the `qp_st7735_make_spi_device` function 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 ST7735_NUM_DEVICES 3
+```
+
+!> Some ST7735 devices are known to have different drawing offsets -- despite being a 132x162 pixel display controller internally, some display panels are only 80x160, or smaller. These may require an offset to be applied; see `qp_set_viewport_offsets` above for information on how to override the offsets if they aren't correctly rendered.
+
+#### ** ST7789 **
+
+Enabling support for the ST7789 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += st7789_spi
+```
+
+Creating a ST7789 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_st7789_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);
+```
+
+The device handle returned from the `qp_st7789_make_spi_device` function 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 ST7789_NUM_DEVICES 3
+```
+
+!> Some ST7789 devices are known to have different drawing offsets -- despite being a 240x320 pixel display controller internally, some display panels are only 240x240, or smaller. These may require an offset to be applied; see `qp_set_viewport_offsets` above for information on how to override the offsets if they aren't correctly rendered.
+
+<!-- tabs:end -->
+
+### ** Common: Surfaces **
+
+Quantum Painter has surface drivers which are able to target a buffer in RAM. In general, surfaces keep track of the "dirty" region -- the area that has been drawn to since the last flush -- so that when transferring to the display they can transfer the minimal amount of data to achieve the end result.
+
+!> These generally require significant amounts of RAM, so at large sizes and/or higher bit depths, they may not be usable on all MCUs.
+
+<!-- tabs:start -->
+
+#### ** RGB565 Surface **
+
+Enabling support for RGB565 surfaces in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += rgb565_surface
+```
+
+Creating a RGB565 surface in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_rgb565_make_surface(uint16_t panel_width, uint16_t panel_height, void *buffer);
+```
+
+The `buffer` is a user-supplied area of memory, and is assumed to be of the size `sizeof(uint16_t) * panel_width * panel_height`.
+
+The device handle returned from the `qp_rgb565_make_surface` function can be used to perform all other drawing operations.
+
+Example:
+
+```c
+static painter_device_t my_surface;
+static uint16_t my_framebuffer[320 * 240]; // Allocate a buffer for a 320x240 RGB565 display
+void keyboard_post_init_kb(void) {
+    my_surface = qp_rgb565_make_surface(320, 240, my_framebuffer);
+    qp_init(my_surface, QP_ROTATION_0);
+}
+```
+
+The maximum number of RGB565 surfaces can be configured by changing the following in your `config.h` (default is 1):
+
+```c
+// 3 surfaces:
+#define RGB565_SURFACE_NUM_DEVICES 3
+```
+
+To transfer the contents of the RGB565 surface to another display, the following API can be invoked:
+
+```c
+bool qp_rgb565_surface_draw(painter_device_t surface, painter_device_t display, uint16_t x, uint16_t y);
+```
+
+The `surface` is the surface to copy out from. The `display` is the target display to draw into. `x` and `y` are the target location to draw the surface pixel data. Under normal circumstances, the location should be consistent, as the dirty region is calculated with respect to the `x` and `y` coordinates -- changing those will result in partial, overlapping draws.
+
+?> Calling `qp_flush()` on the surface resets its dirty region. Copying the surface contents to the display also automatically resets the dirty region.
+
+<!-- tabs:end -->
+
+<!-- tabs:end -->
+
 ## Quantum Painter Drawing API :id=quantum-painter-api
 
 All APIs require a `painter_device_t` object as their first parameter -- this object comes from the specific device initialisation, and instructions on creating it can be found in each driver's respective section.
@@ -179,7 +431,9 @@ To use any of the APIs, you need to include `qp.h`:
 #include <qp.h>
 ```
 
-### General Notes :id=quantum-painter-api-general
+<!-- tabs:start -->
+
+### ** General Notes **
 
 The coordinate system used in Quantum Painter generally accepts `left`, `top`, `right`, and `bottom` instead of x/y/width/height, and each coordinate is inclusive of where pixels should be drawn. This is required as some datatypes used by display panels have a maximum value of `255` -- for any value or geometry extent that matches `256`, this would be represented as a `0`, instead.
 
@@ -193,9 +447,11 @@ All color data matches the standard QMK HSV triplet definitions:
 
 ?> Colors used in Quantum Painter are not subject to the RGB lighting CIE curve, if it is enabled.
 
-### Device Control :id=quantum-painter-api-device-control
+### ** Device Control **
 
-#### Display Initialisation :id=quantum-painter-api-init
+<!-- tabs:start -->
+
+#### ** Display Initialisation **
 
 ```c
 bool qp_init(painter_device_t device, painter_rotation_t rotation);
@@ -211,7 +467,7 @@ void keyboard_post_init_kb(void) {
 }
 ```
 
-#### Display Power :id=quantum-painter-api-power
+#### ** Display Power **
 
 ```c
 bool qp_power(painter_device_t device, bool power_on);
@@ -242,7 +498,7 @@ void suspend_wakeup_init_user(void) {
 }
 ```
 
-#### Display Clear :id=quantum-painter-api-clear
+#### ** Display Clear **
 
 ```c
 bool qp_clear(painter_device_t device);
@@ -250,7 +506,7 @@ bool qp_clear(painter_device_t device);
 
 The `qp_clear` function clears the display's screen.
 
-#### Display Flush :id=quantum-painter-api-flush
+#### ** Display Flush **
 
 ```c
 bool qp_flush(painter_device_t device);
@@ -272,9 +528,13 @@ void housekeeping_task_user(void) {
 }
 ```
 
-### Drawing Primitives :id=quantum-painter-api-primitives
+<!-- tabs:end -->
 
-#### Set Pixel :id=quantum-painter-api-setpixel
+### ** Drawing Primitives **
+
+<!-- tabs:start -->
+
+#### ** Set Pixel **
 
 ```c
 bool qp_setpixel(painter_device_t device, uint16_t x, uint16_t y, uint8_t hue, uint8_t sat, uint8_t val);
@@ -298,7 +558,7 @@ void housekeeping_task_user(void) {
 }
 ```
 
-#### Draw Line :id=quantum-painter-api-line
+#### ** Draw Line **
 
 ```c
 bool qp_line(painter_device_t device, uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t hue, uint8_t sat, uint8_t val);
@@ -320,7 +580,7 @@ void housekeeping_task_user(void) {
 }
 ```
 
-#### Draw Rect :id=quantum-painter-api-rect
+#### ** Draw Rect **
 
 ```c
 bool qp_rect(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, uint8_t hue, uint8_t sat, uint8_t val, bool filled);
@@ -342,7 +602,7 @@ void housekeeping_task_user(void) {
 }
 ```
 
-#### Draw Circle :id=quantum-painter-api-circle
+#### ** Draw Circle **
 
 ```c
 bool qp_circle(painter_device_t device, uint16_t x, uint16_t y, uint16_t radius, uint8_t hue, uint8_t sat, uint8_t val, bool filled);
@@ -364,7 +624,7 @@ void housekeeping_task_user(void) {
 }
 ```
 
-#### Draw Ellipse :id=quantum-painter-api-ellipse
+#### ** Draw Ellipse **
 
 ```c
 bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex, uint16_t sizey, uint8_t hue, uint8_t sat, uint8_t val, bool filled);
@@ -386,9 +646,24 @@ void housekeeping_task_user(void) {
 }
 ```
 
-### Image Functions :id=quantum-painter-api-images
+<!-- tabs:end -->
 
-#### Load Image :id=quantum-painter-api-load-image
+### ** Image Functions **
+
+Making an image available for use requires compiling it into your firmware. To do so, assuming you've created `my_image.qgf.c` and `my_image.qgf.h` as per the CLI examples above, you'd add the following to your `rules.mk`:
+
+```make
+SRC += my_image.qgf.c
+```
+
+...and in your `keymap.c`, you'd add to the top of the file:
+```c
+#include "my_image.qgf.h"
+```
+
+<!-- tabs:start -->
+
+#### ** Load Image **
 
 ```c
 painter_image_handle_t qp_load_image_mem(const void *buffer);
@@ -396,7 +671,7 @@ painter_image_handle_t qp_load_image_mem(const void *buffer);
 
 The `qp_load_image_mem` function loads a QGF image from memory or flash.
 
-`qp_load_image_mem` returns a handle to the loaded image, which can then be used to draw to the screen using `qp_drawimage`, `qp_drawimage_recolor`, `qp_animate`, or `qp_animate_recolor`. If an image is no longer required, it can be unloaded by calling `qp_close_image` below. 
+`qp_load_image_mem` returns a handle to the loaded image, which can then be used to draw to the screen using `qp_drawimage`, `qp_drawimage_recolor`, `qp_animate`, or `qp_animate_recolor`. If an image is no longer required, it can be unloaded by calling `qp_close_image` below.
 
 See the [CLI Commands](quantum_painter.md?id=quantum-painter-cli) for instructions on how to convert images to [QGF](quantum_painter_qgf.md).
 
@@ -410,7 +685,7 @@ Image information is available through accessing the handle:
 | Height      | `image->height`      |
 | Frame Count | `image->frame_count` |
 
-#### Unload Image :id=quantum-painter-api-close-image
+#### ** Unload Image **
 
 ```c
 bool qp_close_image(painter_image_handle_t image);
@@ -418,7 +693,7 @@ bool qp_close_image(painter_image_handle_t image);
 
 The `qp_close_image` function releases resources related to the loading of the supplied image.
 
-#### Draw image :id=quantum-painter-api-draw-image
+#### ** Draw image **
 
 ```c
 bool qp_drawimage(painter_device_t device, uint16_t x, uint16_t y, painter_image_handle_t image);
@@ -438,7 +713,7 @@ void keyboard_post_init_kb(void) {
 }
 ```
 
-#### Animate Image :id=quantum-painter-api-animate-image
+#### ** Animate Image **
 
 ```c
 deferred_token qp_animate(painter_device_t device, uint16_t x, uint16_t y, painter_image_handle_t image);
@@ -463,7 +738,7 @@ void keyboard_post_init_kb(void) {
 }
 ```
 
-#### Stop Animation :id=quantum-painter-api-stop-animation
+#### ** Stop Animation **
 
 ```c
 void qp_stop_animation(deferred_token anim_token);
@@ -478,9 +753,24 @@ void housekeeping_task_user(void) {
 }
 ```
 
-### Font Functions :id=quantum-painter-api-fonts
+<!-- tabs:end -->
 
-#### Load Font :id=quantum-painter-api-load-font
+### ** Font Functions **
+
+Making a font available for use requires compiling it into your firmware. To do so, assuming you've created `my_font.qff.c` and `my_font.qff.h` as per the CLI examples above, you'd add the following to your `rules.mk`:
+
+```make
+SRC += noto11.qff.c
+```
+
+...and in your `keymap.c`, you'd add to the top of the file:
+```c
+#include "noto11.qff.h"
+```
+
+<!-- tabs: start -->
+
+#### ** Load Font **
 
 ```c
 painter_font_handle_t qp_load_font_mem(const void *buffer);
@@ -488,7 +778,7 @@ painter_font_handle_t qp_load_font_mem(const void *buffer);
 
 The `qp_load_font_mem` function loads a QFF font from memory or flash.
 
-`qp_load_font_mem` returns a handle to the loaded font, which can then be measured using `qp_textwidth`, or drawn to the screen using `qp_drawtext`, or `qp_drawtext_recolor`. If a font is no longer required, it can be unloaded by calling `qp_close_font` below. 
+`qp_load_font_mem` returns a handle to the loaded font, which can then be measured using `qp_textwidth`, or drawn to the screen using `qp_drawtext`, or `qp_drawtext_recolor`. If a font is no longer required, it can be unloaded by calling `qp_close_font` below.
 
 See the [CLI Commands](quantum_painter.md?id=quantum-painter-cli) for instructions on how to convert TTF fonts to [QFF](quantum_painter_qff.md).
 
@@ -500,7 +790,7 @@ Font information is available through accessing the handle:
 |-------------|----------------------|
 | Line Height | `image->line_height` |
 
-#### Unload Font :id=quantum-painter-api-close-font
+#### ** Unload Font **
 
 ```c
 bool qp_close_font(painter_font_handle_t font);
@@ -508,7 +798,7 @@ bool qp_close_font(painter_font_handle_t font);
 
 The `qp_close_font` function releases resources related to the loading of the supplied font.
 
-#### Measure Text :id=quantum-painter-api-textwidth
+#### ** Measure Text **
 
 ```c
 int16_t qp_textwidth(painter_font_handle_t font, const char *str);
@@ -516,7 +806,7 @@ int16_t qp_textwidth(painter_font_handle_t font, const char *str);
 
 The `qp_textwidth` function allows measurement of how many pixels wide the supplied string would result in, for the given font.
 
-#### Draw Text :id=quantum-painter-api-drawtext
+#### ** Draw Text **
 
 ```c
 int16_t qp_drawtext(painter_device_t device, uint16_t x, uint16_t y, painter_font_handle_t font, const char *str);
@@ -529,7 +819,7 @@ The `qp_drawtext` and `qp_drawtext_recolor` functions draw the supplied string t
 // Draw a text message on the bottom-right of the 240x320 display on initialisation
 static painter_font_handle_t my_font;
 void keyboard_post_init_kb(void) {
-    my_font = qp_load_font_mem(font_opensans);
+    my_font = qp_load_font_mem(font_noto11);
     if (my_font != NULL) {
         static const char *text = "Hello from QMK!";
         int16_t width = qp_textwidth(my_font, text);
@@ -538,9 +828,13 @@ void keyboard_post_init_kb(void) {
 }
 ```
 
-### Advanced Functions :id=quantum-painter-api-advanced
+<!-- tabs:end -->
 
-#### Get Geometry :id=quantum-painter-api-get-geometry
+### ** Advanced Functions **
+
+<!-- tabs:start -->
+
+#### ** Get Geometry **
 
 ```c
 void qp_get_geometry(painter_device_t device, uint16_t *width, uint16_t *height, painter_rotation_t *rotation, uint16_t *offset_x, uint16_t *offset_y);
@@ -548,7 +842,7 @@ void qp_get_geometry(painter_device_t device, uint16_t *width, uint16_t *height,
 
 The `qp_get_geometry` function allows external code to retrieve the current width, height, rotation, and drawing offsets.
 
-#### Set Viewport Offsets :id=quantum-painter-api-set-viewport
+#### ** Set Viewport Offsets **
 
 ```c
 void qp_set_viewport_offsets(painter_device_t device, uint16_t offset_x, uint16_t offset_y);
@@ -556,7 +850,7 @@ void qp_set_viewport_offsets(painter_device_t device, uint16_t offset_x, uint16_
 
 The `qp_set_viewport_offsets` function can be used to offset all subsequent drawing operations. For example, if a display controller is internally 240x320, but the display panel is 240x240 and has a Y offset of 80 pixels, you could invoke `qp_set_viewport_offsets(display, 0, 80);` and the drawing positioning would be corrected.
 
-#### Set Viewport :id=quantum-painter-api-viewport
+#### ** Set Viewport **
 
 ```c
 bool qp_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom);
@@ -564,7 +858,7 @@ bool qp_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t
 
 The `qp_viewport` function controls where raw pixel data is written to.
 
-#### Stream Pixel Data :id=quantum-painter-api-pixdata
+#### ** Stream Pixel Data **
 
 ```c
 bool qp_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count);
@@ -574,184 +868,6 @@ The `qp_pixdata` function allows raw pixel data to be streamed to the display. I
 
 !> Under normal circumstances, users will not need to manually call either `qp_viewport` or `qp_pixdata`. These allow for writing of raw pixel information, in the display panel's native format, to the area defined by the viewport.
 
-## Quantum Painter Display Drivers :id=quantum-painter-drivers
+<!-- tabs:end -->
 
-### Common: Standard TFT (SPI + D/C + RST)
-
-Most TFT display panels use a 5-pin interface -- SPI SCK, SPI MOSI, SPI CS, D/C, and RST pins.
-
-For these displays, QMK's `spi_master` must already be correctly configured for the platform you're building for.
-
-The pin assignments for SPI CS, D/C, and RST are specified during device construction.
-
-### GC9A01 :id=qp-driver-gc9a01
-
-Enabling support for the GC9A01 in Quantum Painter is done by adding the following to `rules.mk`:
-
-```make
-QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = gc9a01_spi
-```
-
-Creating a GC9A01 device in firmware can then be done with the following API:
-
-```c
-painter_device_t qp_gc9a01_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);
-```
-
-The device handle returned from the `qp_gc9a01_make_spi_device` function 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 GC9A01_NUM_DEVICES 3
-```
-
-### ILI9163 :id=qp-driver-ili9163
-
-Enabling support for the ILI9163 in Quantum Painter is done by adding the following to `rules.mk`:
-
-```make
-QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = ili9163_spi
-```
-
-Creating a ILI9163 device in firmware can then be done with the following API:
-
-```c
-painter_device_t qp_ili9163_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);
-```
-
-The device handle returned from the `qp_ili9163_make_spi_device` function 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 ILI9163_NUM_DEVICES 3
-```
-
-### ILI9341 :id=qp-driver-ili9341
-
-Enabling support for the ILI9341 in Quantum Painter is done by adding the following to `rules.mk`:
-
-```make
-QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = ili9341_spi
-```
-
-Creating a ILI9341 device in firmware can then be done with the following API:
-
-```c
-painter_device_t qp_ili9341_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);
-```
-
-The device handle returned from the `qp_ili9341_make_spi_device` function 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 ILI9341_NUM_DEVICES 3
-```
-
-### ILI9488 :id=qp-driver-ili9488
-
-Enabling support for the ILI9488 in Quantum Painter is done by adding the following to `rules.mk`:
-
-```make
-QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = ili9488_spi
-```
-
-Creating a ILI9488 device in firmware can then be done with the following API:
-
-```c
-painter_device_t qp_ili9488_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);
-```
-
-The device handle returned from the `qp_ili9488_make_spi_device` function 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 ILI9488_NUM_DEVICES 3
-```
-
-### SSD1351 :id=qp-driver-ssd1351
-
-Enabling support for the SSD1351 in Quantum Painter is done by adding the following to `rules.mk`:
-
-```make
-QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = ssd1351_spi
-```
-
-Creating a SSD1351 device in firmware can then be done with the following API:
-
-```c
-painter_device_t qp_ssd1351_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);
-```
-
-The device handle returned from the `qp_ssd1351_make_spi_device` function 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 SSD1351_NUM_DEVICES 3
-```
-
-### ST7789 :id=qp-driver-st7789
-
-Enabling support for the ST7789 in Quantum Painter is done by adding the following to `rules.mk`:
-
-```make
-QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = st7789_spi
-```
-
-Creating a ST7789 device in firmware can then be done with the following API:
-
-```c
-painter_device_t qp_st7789_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);
-```
-
-The device handle returned from the `qp_st7789_make_spi_device` function 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 ST7789_NUM_DEVICES 3
-```
-
-!> Some ST7789 devices are known to have different drawing offsets -- despite being a 240x320 pixel display controller internally, some display panels are only 240x240, or smaller. These may require an offset to be applied; see `qp_set_viewport_offsets` above for information on how to override the offsets if they aren't correctly rendered.
-
-### ST7735 :id=qp-driver-st7735
-
-Enabling support for the ST7735 in Quantum Painter is done by adding the following to `rules.mk`:
-
-```make
-QUANTUM_PAINTER_ENABLE = yes
-QUANTUM_PAINTER_DRIVERS = st7735_spi
-```
-
-Creating a ST7735 device in firmware can then be done with the following API:
-
-```c
-painter_device_t qp_st7735_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);
-```
-
-The device handle returned from the `qp_st7735_make_spi_device` function 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 ST7735_NUM_DEVICES 3
-```
-
-!> Some ST7735 devices are known to have different drawing offsets -- despite being a 132x162 pixel display controller internally, some display panels are only 80x160, or smaller. These may require an offset to be applied; see `qp_set_viewport_offsets` above for information on how to override the offsets if they aren't correctly rendered.
\ No newline at end of file
+<!-- tabs:end -->
diff --git a/drivers/painter/generic/qp_rgb565_surface.c b/drivers/painter/generic/qp_rgb565_surface.c
new file mode 100644
index 0000000000..c4de336535
--- /dev/null
+++ b/drivers/painter/generic/qp_rgb565_surface.c
@@ -0,0 +1,277 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "color.h"
+#include "qp_rgb565_surface.h"
+#include "qp_draw.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Common
+
+// Device definition
+typedef struct rgb565_surface_painter_device_t {
+    struct painter_driver_t base; // must be first, so it can be cast to/from the painter_device_t* type
+
+    // The target buffer
+    uint16_t *buffer;
+
+    // Manually manage the viewport for streaming pixel data to the display
+    uint16_t viewport_l;
+    uint16_t viewport_t;
+    uint16_t viewport_r;
+    uint16_t viewport_b;
+
+    // Current write location to the display when streaming pixel data
+    uint16_t pixdata_x;
+    uint16_t pixdata_y;
+
+    // Maintain a dirty region so we can stream only what we need
+    bool     is_dirty;
+    uint16_t dirty_l;
+    uint16_t dirty_t;
+    uint16_t dirty_r;
+    uint16_t dirty_b;
+
+} rgb565_surface_painter_device_t;
+
+// Driver storage
+rgb565_surface_painter_device_t surface_drivers[RGB565_SURFACE_NUM_DEVICES] = {0};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Helpers
+
+static inline void increment_pixdata_location(rgb565_surface_painter_device_t *surface) {
+    // Increment the X-position
+    surface->pixdata_x++;
+
+    // If the x-coord has gone past the right-side edge, loop it back around and increment the y-coord
+    if (surface->pixdata_x > surface->viewport_r) {
+        surface->pixdata_x = surface->viewport_l;
+        surface->pixdata_y++;
+    }
+
+    // If the y-coord has gone past the bottom, loop it back to the top
+    if (surface->pixdata_y > surface->viewport_b) {
+        surface->pixdata_y = surface->viewport_t;
+    }
+}
+
+static inline void setpixel(rgb565_surface_painter_device_t *surface, uint16_t x, uint16_t y, uint16_t rgb565) {
+    // Skip messing with the dirty info if the original value already matches
+    if (surface->buffer[y * surface->base.panel_width + x] != rgb565) {
+        // Maintain dirty region
+        if (surface->dirty_l > x) {
+            surface->dirty_l = x;
+        }
+        if (surface->dirty_r < x) {
+            surface->dirty_r = x;
+        }
+        if (surface->dirty_t > y) {
+            surface->dirty_t = y;
+        }
+        if (surface->dirty_b < y) {
+            surface->dirty_b = y;
+        }
+
+        // Always dirty after a setpixel
+        surface->is_dirty = true;
+
+        // Update the pixel data in the buffer
+        surface->buffer[y * surface->base.panel_width + x] = rgb565;
+    }
+}
+
+static inline void append_pixel(rgb565_surface_painter_device_t *surface, uint16_t rgb565) {
+    setpixel(surface, surface->pixdata_x, surface->pixdata_y, rgb565);
+    increment_pixdata_location(surface);
+}
+
+static inline void stream_pixdata(rgb565_surface_painter_device_t *surface, const uint16_t *data, uint32_t native_pixel_count) {
+    for (uint32_t pixel_counter = 0; pixel_counter < native_pixel_count; ++pixel_counter) {
+        append_pixel(surface, data[pixel_counter]);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Driver vtable
+
+static bool qp_rgb565_surface_init(painter_device_t device, painter_rotation_t rotation) {
+    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
+    memset(surface->buffer, 0, driver->panel_width * driver->panel_height * driver->native_bits_per_pixel / 8);
+    return true;
+}
+
+static bool qp_rgb565_surface_power(painter_device_t device, bool power_on) {
+    // No-op.
+    return true;
+}
+
+static bool qp_rgb565_surface_clear(painter_device_t device) {
+    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    driver->driver_vtable->init(device, driver->rotation); // Re-init the surface
+    return true;
+}
+
+static bool qp_rgb565_surface_flush(painter_device_t device) {
+    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
+    surface->dirty_l = surface->dirty_t = UINT16_MAX;
+    surface->dirty_r = surface->dirty_b = 0;
+    surface->is_dirty                   = false;
+    return true;
+}
+
+static bool qp_rgb565_surface_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
+    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
+
+    // Set the viewport locations
+    surface->viewport_l = left;
+    surface->viewport_t = top;
+    surface->viewport_r = right;
+    surface->viewport_b = bottom;
+
+    // Reset the write location to the top left
+    surface->pixdata_x = left;
+    surface->pixdata_y = top;
+    return true;
+}
+
+// Stream pixel data to the current write position in GRAM
+static bool qp_rgb565_surface_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count) {
+    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
+    stream_pixdata(surface, (const uint16_t *)pixel_data, native_pixel_count);
+    return true;
+}
+
+// Pixel colour conversion
+static bool qp_rgb565_surface_palette_convert_rgb565_swapped(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) {
+    for (int16_t i = 0; i < palette_size; ++i) {
+        RGB      rgb      = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v});
+        uint16_t rgb565   = (((uint16_t)rgb.r) >> 3) << 11 | (((uint16_t)rgb.g) >> 2) << 5 | (((uint16_t)rgb.b) >> 3);
+        palette[i].rgb565 = __builtin_bswap16(rgb565);
+    }
+    return true;
+}
+
+// Append pixels to the target location, keyed by the pixel index
+static bool qp_rgb565_surface_append_pixels_rgb565(painter_device_t device, uint8_t *target_buffer, qp_pixel_t *palette, uint32_t pixel_offset, uint32_t pixel_count, uint8_t *palette_indices) {
+    uint16_t *buf = (uint16_t *)target_buffer;
+    for (uint32_t i = 0; i < pixel_count; ++i) {
+        buf[pixel_offset + i] = palette[palette_indices[i]].rgb565;
+    }
+    return true;
+}
+
+const struct painter_driver_vtable_t rgb565_surface_driver_vtable = {
+    .init            = qp_rgb565_surface_init,
+    .power           = qp_rgb565_surface_power,
+    .clear           = qp_rgb565_surface_clear,
+    .flush           = qp_rgb565_surface_flush,
+    .pixdata         = qp_rgb565_surface_pixdata,
+    .viewport        = qp_rgb565_surface_viewport,
+    .palette_convert = qp_rgb565_surface_palette_convert_rgb565_swapped,
+    .append_pixels   = qp_rgb565_surface_append_pixels_rgb565,
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Comms vtable
+
+static bool qp_rgb565_surface_comms_init(painter_device_t device) {
+    // No-op.
+    return true;
+}
+static bool qp_rgb565_surface_comms_start(painter_device_t device) {
+    // No-op.
+    return true;
+}
+static void qp_rgb565_surface_comms_stop(painter_device_t device) {
+    // No-op.
+}
+uint32_t qp_rgb565_surface_comms_send(painter_device_t device, const void *data, uint32_t byte_count) {
+    // No-op.
+    return byte_count;
+}
+
+struct painter_comms_vtable_t rgb565_surface_driver_comms_vtable = {
+    // These are all effective no-op's because they're not actually needed.
+    .comms_init  = qp_rgb565_surface_comms_init,
+    .comms_start = qp_rgb565_surface_comms_start,
+    .comms_stop  = qp_rgb565_surface_comms_stop,
+    .comms_send  = qp_rgb565_surface_comms_send};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Factory function for creating a handle to an rgb565 surface
+
+painter_device_t qp_rgb565_make_surface(uint16_t panel_width, uint16_t panel_height, void *buffer) {
+    for (uint32_t i = 0; i < RGB565_SURFACE_NUM_DEVICES; ++i) {
+        rgb565_surface_painter_device_t *driver = &surface_drivers[i];
+        if (!driver->base.driver_vtable) {
+            driver->base.driver_vtable         = &rgb565_surface_driver_vtable;
+            driver->base.comms_vtable          = &rgb565_surface_driver_comms_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;
+            driver->buffer                     = (uint16_t *)buffer;
+            return (painter_device_t)driver;
+        }
+    }
+    return NULL;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Drawing routine to copy out the dirty region and send it to another device
+
+bool qp_rgb565_surface_draw(painter_device_t surface, painter_device_t display, uint16_t x, uint16_t y) {
+    struct painter_driver_t *        surface_driver = (struct painter_driver_t *)surface;
+    rgb565_surface_painter_device_t *surface_handle = (rgb565_surface_painter_device_t *)surface_driver;
+
+    // If we're not dirty... we're done.
+    if (!surface_handle->is_dirty) {
+        return true;
+    }
+
+    // Set the target drawing area
+    bool ok = qp_viewport(display, x + surface_handle->dirty_l, y + surface_handle->dirty_t, x + surface_handle->dirty_r, y + surface_handle->dirty_b);
+    if (!ok) {
+        return false;
+    }
+
+    // Housekeeping of the amount of pixels to transfer
+    uint32_t  total_pixel_count = QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE / sizeof(uint16_t);
+    uint32_t  pixel_counter     = 0;
+    uint16_t *target_buffer     = (uint16_t *)qp_internal_global_pixdata_buffer;
+
+    // Fill the global pixdata area so that we can start transferring to the panel
+    for (uint16_t y = surface_handle->dirty_t; y <= surface_handle->dirty_b; ++y) {
+        for (uint16_t x = surface_handle->dirty_l; x <= surface_handle->dirty_r; ++x) {
+            // Update the target buffer
+            target_buffer[pixel_counter++] = surface_handle->buffer[y * surface_handle->base.panel_width + x];
+
+            // If we've accumulated enough data, send it
+            if (pixel_counter == total_pixel_count) {
+                ok = qp_pixdata(display, qp_internal_global_pixdata_buffer, pixel_counter);
+                if (!ok) {
+                    return false;
+                }
+                // Reset the counter
+                pixel_counter = 0;
+            }
+        }
+    }
+
+    // If there's any leftover data, send it
+    if (pixel_counter > 0) {
+        ok = qp_pixdata(display, qp_internal_global_pixdata_buffer, pixel_counter);
+        if (!ok) {
+            return false;
+        }
+    }
+
+    // Clear the dirty info for the surface
+    return qp_flush(surface);
+}
diff --git a/drivers/painter/generic/qp_rgb565_surface.h b/drivers/painter/generic/qp_rgb565_surface.h
new file mode 100644
index 0000000000..19e919bb91
--- /dev/null
+++ b/drivers/painter/generic/qp_rgb565_surface.h
@@ -0,0 +1,42 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "qp_internal.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter RGB565 surface configurables (add to your keyboard's config.h)
+
+#ifndef RGB565_SURFACE_NUM_DEVICES
+/**
+ * @def This controls the maximum number of surface devices that Quantum Painter can use at any one time.
+ *      Increasing this number allows for multiple framebuffers to be used. Each requires its own RAM allocation.
+ */
+#    define RGB565_SURFACE_NUM_DEVICES 1
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Forward declarations
+
+#ifdef QUANTUM_PAINTER_RGB565_SURFACE_ENABLE
+/**
+ * Factory method for an RGB565 surface (aka framebuffer).
+ *
+ * @param panel_width[in] the width of the display panel
+ * @param panel_height[in] the height of the display panel
+ * @param buffer[in] pointer to a preallocated buffer of size `(sizeof(uint16_t) * panel_width * panel_height)`
+ * @return the device handle used with all drawing routines in Quantum Painter
+ */
+painter_device_t qp_rgb565_make_surface(uint16_t panel_width, uint16_t panel_height, void *buffer);
+
+/**
+ * Helper method to draw the dirty contents of the framebuffer to the target device.
+ *
+ * After successful completion, the dirty area is reset.
+ *
+ * @param surface[in] the surface to copy from
+ * @param display[in] the display to copy into
+ * @param x[in] the x-location of the original position of the framebuffer
+ * @param y[in] the y-location of the original position of the framebuffer
+ * @return whether the draw operation completed successfully
+ */
+bool qp_rgb565_surface_draw(painter_device_t surface, painter_device_t display, uint16_t x, uint16_t y);
+#endif // QUANTUM_PAINTER_RGB565_SURFACE_ENABLE
diff --git a/drivers/painter/tft_panel/qp_tft_panel.c b/drivers/painter/tft_panel/qp_tft_panel.c
index ad83b6c792..e7c744ab34 100644
--- a/drivers/painter/tft_panel/qp_tft_panel.c
+++ b/drivers/painter/tft_panel/qp_tft_panel.c
@@ -7,8 +7,6 @@
 #include "qp_draw.h"
 #include "qp_tft_panel.h"
 
-#define BYTE_SWAP(x) (((((uint16_t)(x)) >> 8) & 0x00FF) | ((((uint16_t)(x)) << 8) & 0xFF00))
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Quantum Painter API implementations
 
@@ -94,7 +92,7 @@ bool qp_tft_panel_palette_convert_rgb565_swapped(painter_device_t device, int16_
     for (int16_t i = 0; i < palette_size; ++i) {
         RGB      rgb      = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v});
         uint16_t rgb565   = (((uint16_t)rgb.r) >> 3) << 11 | (((uint16_t)rgb.g) >> 2) << 5 | (((uint16_t)rgb.b) >> 3);
-        palette[i].rgb565 = BYTE_SWAP(rgb565);
+        palette[i].rgb565 = __builtin_bswap16(rgb565);
     }
     return true;
 }
diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h
index fb6904de22..69bc435961 100644
--- a/quantum/painter/qp.h
+++ b/quantum/painter/qp.h
@@ -432,6 +432,10 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Quantum Painter Drivers
 
+#ifdef QUANTUM_PAINTER_RGB565_SURFACE_ENABLE
+#    include "qp_rgb565_surface.h"
+#endif // QUANTUM_PAINTER_RGB565_SURFACE_ENABLE
+
 #ifdef QUANTUM_PAINTER_ILI9163_ENABLE
 #    include "qp_ili9163.h"
 #endif // QUANTUM_PAINTER_ILI9163_ENABLE
diff --git a/quantum/painter/qp_draw_image.c b/quantum/painter/qp_draw_image.c
index 5822758dce..e9b975f23a 100644
--- a/quantum/painter/qp_draw_image.c
+++ b/quantum/painter/qp_draw_image.c
@@ -25,10 +25,10 @@ typedef struct qgf_image_handle_t {
 static qgf_image_handle_t image_descriptors[QUANTUM_PAINTER_NUM_IMAGES] = {0};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Quantum Painter External API: qp_load_image_mem
+// Helper: load image from stream
 
-painter_image_handle_t qp_load_image_mem(const void *buffer) {
-    qp_dprintf("qp_load_image_mem: entry\n");
+static painter_image_handle_t qp_load_image_internal(bool (*stream_factory)(qgf_image_handle_t *image, void *arg), void *arg) {
+    qp_dprintf("qp_load_image: entry\n");
     qgf_image_handle_t *image = NULL;
 
     // Find a free slot
@@ -41,20 +41,18 @@ painter_image_handle_t qp_load_image_mem(const void *buffer) {
 
     // Drop out if not found
     if (!image) {
-        qp_dprintf("qp_load_image_mem: fail (no free slot)\n");
+        qp_dprintf("qp_load_image: fail (no free slot)\n");
         return NULL;
     }
 
-    // Assume we can read the graphics descriptor
-    image->mem_stream = qp_make_memory_stream((void *)buffer, sizeof(qgf_graphics_descriptor_v1_t));
-
-    // Update the length of the stream to match, and rewind to the start
-    image->mem_stream.length   = qgf_get_total_size(&image->stream);
-    image->mem_stream.position = 0;
+    if (!stream_factory(image, arg)) {
+        qp_dprintf("qp_load_image: fail (could not create stream)\n");
+        return NULL;
+    }
 
     // Now that we know the length, validate the input data
     if (!qgf_validate_stream(&image->stream)) {
-        qp_dprintf("qp_load_image_mem: fail (failed validation)\n");
+        qp_dprintf("qp_load_image: fail (failed validation)\n");
         return NULL;
     }
 
@@ -63,10 +61,30 @@ painter_image_handle_t qp_load_image_mem(const void *buffer) {
 
     // Validation success, we can return the handle
     image->validate_ok = true;
-    qp_dprintf("qp_load_image_mem: ok\n");
+    qp_dprintf("qp_load_image: ok\n");
     return (painter_image_handle_t)image;
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter External API: qp_load_image_mem
+
+static inline bool image_mem_stream_factory(qgf_image_handle_t *image, void *arg) {
+    void *buffer = arg;
+
+    // Assume we can read the graphics descriptor
+    image->mem_stream = qp_make_memory_stream((void *)buffer, sizeof(qgf_graphics_descriptor_v1_t));
+
+    // Update the length of the stream to match, and rewind to the start
+    image->mem_stream.length   = qgf_get_total_size(&image->stream);
+    image->mem_stream.position = 0;
+
+    return true;
+}
+
+painter_image_handle_t qp_load_image_mem(const void *buffer) {
+    return qp_load_image_internal(image_mem_stream_factory, (void *)buffer);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Quantum Painter External API: qp_close_image
 
@@ -79,6 +97,7 @@ bool qp_close_image(painter_image_handle_t image) {
 
     // Free up this image for use elsewhere.
     qgf_image->validate_ok = false;
+    qp_stream_close(&qgf_image->stream);
     return true;
 }
 
diff --git a/quantum/painter/qp_draw_text.c b/quantum/painter/qp_draw_text.c
index f99e082cad..0f5473abd0 100644
--- a/quantum/painter/qp_draw_text.c
+++ b/quantum/painter/qp_draw_text.c
@@ -36,10 +36,10 @@ typedef struct qff_font_handle_t {
 static qff_font_handle_t font_descriptors[QUANTUM_PAINTER_NUM_FONTS] = {0};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Quantum Painter External API: qp_load_font_mem
+// Helper: load font from stream
 
-painter_font_handle_t qp_load_font_mem(const void *buffer) {
-    qp_dprintf("qp_load_font_mem: entry\n");
+static painter_font_handle_t qp_load_font_internal(bool (*stream_factory)(qff_font_handle_t *font, void *arg), void *arg) {
+    qp_dprintf("qp_load_font: entry\n");
     qff_font_handle_t *font = NULL;
 
     // Find a free slot
@@ -52,20 +52,18 @@ painter_font_handle_t qp_load_font_mem(const void *buffer) {
 
     // Drop out if not found
     if (!font) {
-        qp_dprintf("qp_load_font_mem: fail (no free slot)\n");
+        qp_dprintf("qp_load_font: fail (no free slot)\n");
         return NULL;
     }
 
-    // Assume we can read the graphics descriptor
-    font->mem_stream = qp_make_memory_stream((void *)buffer, sizeof(qff_font_descriptor_v1_t));
-
-    // Update the length of the stream to match, and rewind to the start
-    font->mem_stream.length   = qff_get_total_size(&font->stream);
-    font->mem_stream.position = 0;
+    if (!stream_factory(font, arg)) {
+        qp_dprintf("qp_load_font: fail (could not create stream)\n");
+        return NULL;
+    }
 
     // Now that we know the length, validate the input data
     if (!qff_validate_stream(&font->stream)) {
-        qp_dprintf("qp_load_font_mem: fail (failed validation)\n");
+        qp_dprintf("qp_load_font: fail (failed validation)\n");
         return NULL;
     }
 
@@ -76,12 +74,12 @@ painter_font_handle_t qp_load_font_mem(const void *buffer) {
 
     void *ram_buffer = malloc(font->mem_stream.length);
     if (ram_buffer == NULL) {
-        qp_dprintf("qp_load_font_mem: could not allocate enough RAM for font, falling back to original\n");
+        qp_dprintf("qp_load_font: could not allocate enough RAM for font, falling back to original\n");
     } else {
         do {
             // Copy the data into RAM
             if (qp_stream_read(ram_buffer, 1, font->mem_stream.length, &font->mem_stream) != font->mem_stream.length) {
-                qp_dprintf("qp_load_font_mem: could not copy from flash to RAM, falling back to original\n");
+                qp_dprintf("qp_load_font: could not copy from flash to RAM, falling back to original\n");
                 break;
             }
 
@@ -102,17 +100,37 @@ painter_font_handle_t qp_load_font_mem(const void *buffer) {
     qff_read_font_descriptor(&font->stream, &font->base.line_height, &font->has_ascii_table, &font->num_unicode_glyphs, &font->bpp, &font->has_palette, &font->compression_scheme, NULL);
 
     if (!qp_internal_bpp_capable(font->bpp)) {
-        qp_dprintf("qp_load_font_mem: fail (image bpp too high (%d), check QUANTUM_PAINTER_SUPPORTS_256_PALETTE)\n", (int)font->bpp);
+        qp_dprintf("qp_load_font: fail (image bpp too high (%d), check QUANTUM_PAINTER_SUPPORTS_256_PALETTE)\n", (int)font->bpp);
         qp_close_font((painter_font_handle_t)font);
         return NULL;
     }
 
     // Validation success, we can return the handle
     font->validate_ok = true;
-    qp_dprintf("qp_load_font_mem: ok\n");
+    qp_dprintf("qp_load_font: ok\n");
     return (painter_font_handle_t)font;
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter External API: qp_load_font_mem
+
+static inline bool font_mem_stream_factory(qff_font_handle_t *font, void *arg) {
+    void *buffer = arg;
+
+    // Assume we can read the graphics descriptor
+    font->mem_stream = qp_make_memory_stream(buffer, sizeof(qff_font_descriptor_v1_t));
+
+    // Update the length of the stream to match, and rewind to the start
+    font->mem_stream.length   = qff_get_total_size(&font->stream);
+    font->mem_stream.position = 0;
+
+    return true;
+}
+
+painter_font_handle_t qp_load_font_mem(const void *buffer) {
+    return qp_load_font_internal(font_mem_stream_factory, (void *)buffer);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Quantum Painter External API: qp_close_font
 
@@ -133,6 +151,7 @@ bool qp_close_font(painter_font_handle_t font) {
 #endif // QUANTUM_PAINTER_LOAD_FONTS_TO_RAM
 
     // Free up this font for use elsewhere.
+    qp_stream_close(&qff_font->stream);
     qff_font->validate_ok = false;
     return true;
 }
diff --git a/quantum/painter/qp_stream.c b/quantum/painter/qp_stream.c
index f00ae5ed38..1198cf793d 100644
--- a/quantum/painter/qp_stream.c
+++ b/quantum/painter/qp_stream.c
@@ -38,7 +38,7 @@ uint32_t qp_stream_write_impl(const void *input_buf, uint32_t member_size, uint3
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Memory streams
 
-int16_t mem_get(qp_stream_t *stream) {
+static inline int16_t mem_get(qp_stream_t *stream) {
     qp_memory_stream_t *s = (qp_memory_stream_t *)stream;
     if (s->position >= s->length) {
         s->is_eof = true;
@@ -47,7 +47,7 @@ int16_t mem_get(qp_stream_t *stream) {
     return s->buffer[s->position++];
 }
 
-bool mem_put(qp_stream_t *stream, uint8_t c) {
+static inline bool mem_put(qp_stream_t *stream, uint8_t c) {
     qp_memory_stream_t *s = (qp_memory_stream_t *)stream;
     if (s->position >= s->length) {
         s->is_eof = true;
@@ -57,7 +57,7 @@ bool mem_put(qp_stream_t *stream, uint8_t c) {
     return true;
 }
 
-int mem_seek(qp_stream_t *stream, int32_t offset, int origin) {
+static inline int mem_seek(qp_stream_t *stream, int32_t offset, int origin) {
     qp_memory_stream_t *s = (qp_memory_stream_t *)stream;
 
     // Handle as per fseek
@@ -95,26 +95,23 @@ int mem_seek(qp_stream_t *stream, int32_t offset, int origin) {
     return 0;
 }
 
-int32_t mem_tell(qp_stream_t *stream) {
+static inline int32_t mem_tell(qp_stream_t *stream) {
     qp_memory_stream_t *s = (qp_memory_stream_t *)stream;
     return s->position;
 }
 
-bool mem_is_eof(qp_stream_t *stream) {
+static inline bool mem_is_eof(qp_stream_t *stream) {
     qp_memory_stream_t *s = (qp_memory_stream_t *)stream;
     return s->is_eof;
 }
 
+static inline void mem_close(qp_stream_t *stream) {
+    // No-op.
+}
+
 qp_memory_stream_t qp_make_memory_stream(void *buffer, int32_t length) {
     qp_memory_stream_t stream = {
-        .base =
-            {
-                .get    = mem_get,
-                .put    = mem_put,
-                .seek   = mem_seek,
-                .tell   = mem_tell,
-                .is_eof = mem_is_eof,
-            },
+        .base     = {.get = mem_get, .put = mem_put, .seek = mem_seek, .tell = mem_tell, .is_eof = mem_is_eof, .close = mem_close},
         .buffer   = (uint8_t *)buffer,
         .length   = length,
         .position = 0,
@@ -127,43 +124,41 @@ qp_memory_stream_t qp_make_memory_stream(void *buffer, int32_t length) {
 
 #ifdef QP_STREAM_HAS_FILE_IO
 
-int16_t file_get(qp_stream_t *stream) {
+static inline int16_t file_get(qp_stream_t *stream) {
     qp_file_stream_t *s = (qp_file_stream_t *)stream;
     int               c = fgetc(s->file);
     if (c < 0 || feof(s->file)) return STREAM_EOF;
     return (uint16_t)c;
 }
 
-bool file_put(qp_stream_t *stream, uint8_t c) {
+static inline bool file_put(qp_stream_t *stream, uint8_t c) {
     qp_file_stream_t *s = (qp_file_stream_t *)stream;
     return fputc(c, s->file) == c;
 }
 
-int file_seek(qp_stream_t *stream, int32_t offset, int origin) {
+static inline int file_seek(qp_stream_t *stream, int32_t offset, int origin) {
     qp_file_stream_t *s = (qp_file_stream_t *)stream;
     return fseek(s->file, offset, origin);
 }
 
-int32_t file_tell(qp_stream_t *stream) {
+static inline int32_t file_tell(qp_stream_t *stream) {
     qp_file_stream_t *s = (qp_file_stream_t *)stream;
     return (int32_t)ftell(s->file);
 }
 
-bool file_is_eof(qp_stream_t *stream) {
+static inline bool file_is_eof(qp_stream_t *stream) {
     qp_file_stream_t *s = (qp_file_stream_t *)stream;
     return (bool)feof(s->file);
 }
 
+static inline void file_close(qp_stream_t *stream) {
+    qp_file_stream_t *s = (qp_file_stream_t *)stream;
+    fclose(s->file);
+}
+
 qp_file_stream_t qp_make_file_stream(FILE *f) {
     qp_file_stream_t stream = {
-        .base =
-            {
-                .get    = file_get,
-                .put    = file_put,
-                .seek   = file_seek,
-                .tell   = file_tell,
-                .is_eof = file_is_eof,
-            },
+        .base = {.get = file_get, .put = file_put, .seek = file_seek, .tell = file_tell, .is_eof = file_is_eof, .close = file_close},
         .file = f,
     };
     return stream;
diff --git a/quantum/painter/qp_stream.h b/quantum/painter/qp_stream.h
index 878b9bf530..c0e745adc1 100644
--- a/quantum/painter/qp_stream.h
+++ b/quantum/painter/qp_stream.h
@@ -41,6 +41,8 @@ typedef struct qp_stream_t qp_stream_t;
 uint32_t qp_stream_read_impl(void *output_buf, uint32_t member_size, uint32_t num_members, qp_stream_t *stream);
 uint32_t qp_stream_write_impl(const void *input_buf, uint32_t member_size, uint32_t num_members, qp_stream_t *stream);
 
+#define qp_stream_close(stream_ptr) (((qp_stream_t *)(stream_ptr))->close((qp_stream_t *)(stream_ptr)))
+
 #define STREAM_EOF ((int16_t)(-1))
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -52,6 +54,7 @@ struct qp_stream_t {
     int (*seek)(qp_stream_t *stream, int32_t offset, int origin);
     int32_t (*tell)(qp_stream_t *stream);
     bool (*is_eof)(qp_stream_t *stream);
+    void (*close)(qp_stream_t *stream);
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -77,6 +80,6 @@ typedef struct qp_file_stream_t {
     FILE *      file;
 } qp_file_stream_t;
 
-qp_file_stream_t qo_make_file_stream(FILE *f);
+qp_file_stream_t qp_make_file_stream(FILE *f);
 
 #endif // QP_STREAM_HAS_FILE_IO
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index 4420bccf63..5ac374a96e 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -3,7 +3,15 @@ QUANTUM_PAINTER_DRIVERS ?=
 QUANTUM_PAINTER_ANIMATIONS_ENABLE ?= yes
 
 # The list of permissible drivers that can be listed in QUANTUM_PAINTER_DRIVERS
-VALID_QUANTUM_PAINTER_DRIVERS := ili9163_spi ili9341_spi ili9488_spi st7789_spi st7735_spi gc9a01_spi ssd1351_spi
+VALID_QUANTUM_PAINTER_DRIVERS := \
+	rgb565_surface \
+	ili9163_spi \
+	ili9341_spi \
+	ili9488_spi \
+	st7735_spi \
+	st7789_spi \
+	gc9a01_spi \
+	ssd1351_spi
 
 #-------------------------------------------------------------------------------
 
@@ -40,6 +48,13 @@ define handle_quantum_painter_driver
     ifeq ($$(filter $$(strip $$(CURRENT_PAINTER_DRIVER)),$$(VALID_QUANTUM_PAINTER_DRIVERS)),)
         $$(error "$$(CURRENT_PAINTER_DRIVER)" is not a valid Quantum Painter driver)
 
+    else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),rgb565_surface)
+        OPT_DEFS += -DQUANTUM_PAINTER_RGB565_SURFACE_ENABLE
+        COMMON_VPATH += \
+            $(DRIVER_PATH)/painter/generic
+        SRC += \
+            $(DRIVER_PATH)/painter/generic/qp_rgb565_surface.c \
+
     else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),ili9163_spi)
         QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
         QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
@@ -73,17 +88,6 @@ define handle_quantum_painter_driver
             $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
             $(DRIVER_PATH)/painter/ili9xxx/qp_ili9488.c \
 
-    else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),st7789_spi)
-        QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
-        QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
-        OPT_DEFS += -DQUANTUM_PAINTER_ST7789_ENABLE -DQUANTUM_PAINTER_ST7789_SPI_ENABLE
-        COMMON_VPATH += \
-            $(DRIVER_PATH)/painter/tft_panel \
-            $(DRIVER_PATH)/painter/st77xx
-        SRC += \
-            $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
-            $(DRIVER_PATH)/painter/st77xx/qp_st7789.c
-
     else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),st7735_spi)
         QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
         QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
@@ -95,6 +99,17 @@ define handle_quantum_painter_driver
             $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
             $(DRIVER_PATH)/painter/st77xx/qp_st7735.c
 
+    else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),st7789_spi)
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
+        OPT_DEFS += -DQUANTUM_PAINTER_ST7789_ENABLE -DQUANTUM_PAINTER_ST7789_SPI_ENABLE
+        COMMON_VPATH += \
+            $(DRIVER_PATH)/painter/tft_panel \
+            $(DRIVER_PATH)/painter/st77xx
+        SRC += \
+            $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
+            $(DRIVER_PATH)/painter/st77xx/qp_st7789.c
+
     else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),gc9a01_spi)
         QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
         QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes

From 8beb61b790d215a365298d3aa865ebf1ebf78d8c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 19 Sep 2022 07:57:50 +1000
Subject: [PATCH 379/959] Add DD mapping for LED/RGB Matrix split count
 (#18408)

---
 data/mappings/info_config.json   |  2 ++
 data/schemas/keyboard.jsonschema | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index fd69c01f08..34c46d6d89 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -39,6 +39,7 @@
     "LED_KANA_PIN": {"info_key": "indicators.kana"},
     "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"},
     "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
+    "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
     "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str"},
     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
@@ -79,6 +80,7 @@
     "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"},
     "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},
     "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"},
+    "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index bf095aadfd..e82dacaac4 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -266,6 +266,12 @@
             "properties": {
                 "driver": {"type": "string"},
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "split_count": {
+                    "type": "array",
+                    "minItems": 2,
+                    "maxItems": 2,
+                    "items": {"$ref": "qmk.definitions.v1#/unsigned_int"}
+                },
                 "layout": {
                     "type": "array",
                     "items": {
@@ -294,6 +300,12 @@
             "properties": {
                 "driver": {"type": "string"},
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "split_count": {
+                    "type": "array",
+                    "minItems": 2,
+                    "maxItems": 2,
+                    "items": {"$ref": "qmk.definitions.v1#/unsigned_int"}
+                },
                 "layout": {
                     "type": "array",
                     "items": {

From c6ff10a2577e0dcee1c8dc1ec25c84c3355d9986 Mon Sep 17 00:00:00 2001
From: jonavin <71780717+Jonavin@users.noreply.github.com>
Date: Sun, 18 Sep 2022 18:57:37 -0400
Subject: [PATCH 380/959] FIx ARRAYSIZE def and Murphpad string array (#18392)

Co-authored-by: Jonavin <=>
---
 keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c | 2 +-
 users/jonavin/jonavin.h                              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
index b0288c5d7a..88c017cbff 100644
--- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
@@ -175,7 +175,7 @@ static const keycodedescType PROGMEM keyselection[] = {
         {"Break",   KC_PAUS},
         {"C-A-D",   KC_CAD},  // Ctrl-Alt-Del
         {"AltF4",   KC_AF4},
-        {"QK_BOOT",   QK_BOOT},   // firmware flash mode
+        {"RESET",   QK_BOOT},   // firmware flash mode
 };
 
 #define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0])
diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h
index ab2ce0dff2..3ebd3fe9f2 100644
--- a/users/jonavin/jonavin.h
+++ b/users/jonavin/jonavin.h
@@ -18,7 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // DEFINE MACROS
+#ifndef ARRAYSIZE
 #define ARRAYSIZE(arr)  sizeof(arr)/sizeof(arr[0])
+#endif // !ARRAYSIZE
 
 
 // LAYERS

From ecb4ba70b1d48835e75da6b0a8ad566c2f126b9f Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Sun, 18 Sep 2022 19:01:05 -0400
Subject: [PATCH 381/959] Add encoder map to BDN9 VIA keymap (#18388)

---
 keyboards/keebio/bdn9/keymaps/via/keymap.c | 33 ++++++++++++----------
 keyboards/keebio/bdn9/keymaps/via/rules.mk |  1 +
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/keyboards/keebio/bdn9/keymaps/via/keymap.c b/keyboards/keebio/bdn9/keymaps/via/keymap.c
index fc5f22cd8b..6efb6003de 100644
--- a/keyboards/keebio/bdn9/keymaps/via/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/via/keymap.c
@@ -1,42 +1,45 @@
 #include QMK_KEYBOARD_H
 
-enum encoder_names {
-  _LEFT,
-  _RIGHT,
-  _MIDDLE,
-};
-
 enum layer_names {
-  _ZERO,
-  _ONE,
-  _TWO,
-  _THREE
+  _MAIN,
+  _FN1,
+  _FN2,
+  _FN3
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_ZERO] = LAYOUT(
+[_MAIN] = LAYOUT(
     KC_MPLY, KC_HOME, KC_MUTE,
     MO(1),   KC_UP,   RGB_MOD,
     KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
-[_ONE] = LAYOUT(
-    QK_BOOT,   BL_STEP, KC_STOP,
+[_FN1] = LAYOUT(
+    QK_BOOT, BL_STEP, KC_STOP,
     _______, KC_HOME, RGB_MOD,
     KC_MPRV, KC_END , KC_MNXT
 ),
 
-[_TWO] = LAYOUT(
+[_FN2] = LAYOUT(
     _______, _______, _______,
     _______, _______, _______,
     _______, _______, _______
 ),
 
-[_THREE] = LAYOUT(
+[_FN3] = LAYOUT(
     _______, _______, _______,
     _______, _______, _______,
     _______, _______, _______
 )
 
 };
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [_FN1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [_FN2] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+    [_FN3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/keebio/bdn9/keymaps/via/rules.mk b/keyboards/keebio/bdn9/keymaps/via/rules.mk
index d96967a608..a7017de2b6 100644
--- a/keyboards/keebio/bdn9/keymaps/via/rules.mk
+++ b/keyboards/keebio/bdn9/keymaps/via/rules.mk
@@ -3,3 +3,4 @@ LTO_ENABLE = yes
 MOUSEKEY_ENABLE = yes
 CONSOLE_ENABLE = yes
 COMMAND_ENABLE = no
+ENCODER_MAP_ENABLE = yes

From e7e08030d20afd513138531762018cdacea55e65 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 19 Sep 2022 00:09:02 +0100
Subject: [PATCH 382/959] Reduce charue/sunsetter_r2 firmware size (#18378)

* Reduce charue/sunsetter_r2 firmware size

* add rules.mk
---
 keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk | 1 +
 keyboards/charue/sunsetter_r2/rules.mk               | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk

diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk b/keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk
new file mode 100644
index 0000000000..15b7f725b2
--- /dev/null
+++ b/keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk
@@ -0,0 +1 @@
+CONSOLE_ENABLE = yes
diff --git a/keyboards/charue/sunsetter_r2/rules.mk b/keyboards/charue/sunsetter_r2/rules.mk
index 0edc71f6e9..3ff392a61f 100644
--- a/keyboards/charue/sunsetter_r2/rules.mk
+++ b/keyboards/charue/sunsetter_r2/rules.mk
@@ -10,9 +10,9 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes         # Console for debug
-COMMAND_ENABLE = yes         # Commands for debug and configuration
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output

From d8ef2ea7dd59e018a816a519f74c1813d198498c Mon Sep 17 00:00:00 2001
From: Daniel Shields <1530706+shieldsd@users.noreply.github.com>
Date: Mon, 19 Sep 2022 00:10:50 +0100
Subject: [PATCH 383/959] Add home row modifiers to dshields keymaps. (#18376)

---
 keyboards/keyboardio/atreus/keymaps/dshields/keymap.c  | 2 +-
 keyboards/keyboardio/model01/keymaps/dshields/keymap.c | 2 +-
 keyboards/planck/keymaps/dshields/keymap.c             | 2 +-
 users/dshields/dshields.h                              | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
index b10d80664c..0077c4d836 100644
--- a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [DEF] = 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,
+        MT_A,    MT_S,    MT_D,    MT_F,    KC_G,                      KC_H,    MT_J,    MT_K,    MT_L,    MT_SCLN,
         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_TAB,  KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
         OSMLCTL, MT_ESC,  OSMLALT, OSL_FUN, MT_BSPC, OSL_LWR, OSL_RSE, MT_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
diff --git a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
index 97ccd975cc..2d257fe371 100644
--- a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
@@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [DEF] = LAYOUT(
     QK_BOOT, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
     KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , RGB_TOG,    DM_REC1, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_EQL ,
-    KC_PGUP, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_TAB ,    KC_ENT , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+    KC_PGUP, MT_A   , MT_S   , MT_D   , MT_F   , KC_G   , KC_TAB ,    KC_ENT , KC_H   , MT_J   , MT_K   , MT_L   , MT_SCLN, KC_QUOT,
     KC_PGDN, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_ESC ,    DM_PLY1, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
                                            OSMLCTL,                                 OSMRCTL,
                                               KC_BSPC,                           KC_SPC ,
diff --git a/keyboards/planck/keymaps/dshields/keymap.c b/keyboards/planck/keymaps/dshields/keymap.c
index 948f978330..538c41922a 100644
--- a/keyboards/planck/keymaps/dshields/keymap.c
+++ b/keyboards/planck/keymaps/dshields/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [DEF] = LAYOUT_planck_grid(
         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_ESC,  KC_BSPC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
-        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_TAB,  KC_ENT,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+        MT_A,    MT_S,    MT_D,    MT_F,    KC_G,    KC_TAB,  KC_ENT,  KC_H,    MT_J,    MT_K,    MT_L,    MT_SCLN,
         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    OSMLSFT, DM_PLY1, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
         OSMLCTL, KC_LGUI, OSMLALT, OSL_FUN, OSL_LWR, MT_SPC,  MT_SPC,  OSL_RSE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h
index 54268210c9..34544b0260 100644
--- a/users/dshields/dshields.h
+++ b/users/dshields/dshields.h
@@ -17,6 +17,14 @@
 #define MT_SPC  SFT_T(KC_SPC)
 #define MT_BSPC SFT_T(KC_BSPC)
 #define MT_ESC  LGUI_T(KC_ESC)
+#define MT_A    LGUI_T(KC_A)
+#define MT_S    LALT_T(KC_S)
+#define MT_D    LSFT_T(KC_D)
+#define MT_F    LCTL_T(KC_F)
+#define MT_J    RCTL_T(KC_J)
+#define MT_K    RSFT_T(KC_K)
+#define MT_L    RALT_T(KC_L)
+#define MT_SCLN RGUI_T(KC_SCLN)
 
 // LED/RGB controls
 #ifdef KEYBOARD_planck_light

From 20f142a7723b0362c0d936d600fb01c649cec951 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 19 Sep 2022 01:35:46 +0100
Subject: [PATCH 384/959] Tidy up LAYOUT macro generation (#18262)

---
 builddefs/build_keyboard.mk               | 24 +++----
 keyboards/ktec/ergodone/ergodone.h        |  1 -
 lib/python/qmk/cli/__init__.py            |  1 -
 lib/python/qmk/cli/generate/keyboard_h.py | 69 ++++++++++++++++---
 lib/python/qmk/cli/generate/layouts.py    | 84 -----------------------
 lib/python/qmk/tests/test_cli_commands.py |  6 --
 6 files changed, 68 insertions(+), 117 deletions(-)
 delete mode 100755 lib/python/qmk/cli/generate/layouts.py

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 65bc0451f7..91cd851ef6 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -241,21 +241,20 @@ endif
 #
 #    https://docs.qmk.fm/#/feature_layouts?id=tips-for-making-layouts-keyboard-agnostic
 #
-QMK_KEYBOARD_H = $(KEYBOARD_OUTPUT)/src/default_keyboard.h
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/$(KEYBOARD_FOLDER_1).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_2)/$(KEYBOARD_FOLDER_2).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_2).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_2).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_3)/$(KEYBOARD_FOLDER_3).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_3).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_3).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_4)/$(KEYBOARD_FOLDER_4).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_4).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_4).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h
 endif
 
 # Determine and set parameters based on the keyboard's processor family.
@@ -329,7 +328,7 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
     INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
 endif
 
-CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
+CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h
 KEYBOARD_SRC += $(KEYBOARD_OUTPUT)/src/default_keyboard.c
 
 $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
@@ -344,15 +343,10 @@ $(KEYBOARD_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
 
 $(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
+	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
 	@$(BUILD_CMD)
 
-$(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h)
-	@$(BUILD_CMD)
-
-generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h
+generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h
 
 .INTERMEDIATE : generated-files
 
@@ -471,7 +465,7 @@ ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
 OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
 $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
--DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \
+-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD_OUTPUT)/src/default_keyboard.h\" \
 -DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
 $(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
 $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
diff --git a/keyboards/ktec/ergodone/ergodone.h b/keyboards/ktec/ergodone/ergodone.h
index 191b1ca2a9..7e7f848d50 100644
--- a/keyboards/ktec/ergodone/ergodone.h
+++ b/keyboards/ktec/ergodone/ergodone.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "quantum.h"
-#include "layouts.h" // Ensure access to info.json layouts
 
 // This file only exists to pull in....
 #include "ergodox_compat.h"
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 02561da1fb..cf5b5ad87e 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -56,7 +56,6 @@ subcommands = [
     'qmk.cli.generate.info_json',
     'qmk.cli.generate.keyboard_c',
     'qmk.cli.generate.keyboard_h',
-    'qmk.cli.generate.layouts',
     'qmk.cli.generate.rgb_breathe_table',
     'qmk.cli.generate.rules_mk',
     'qmk.cli.generate.version_h',
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index 54ddb4cffd..910bd6a08d 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -1,33 +1,72 @@
 """Used by the make system to generate keyboard.h from info.json.
 """
+from pathlib import Path
+
 from milc import cli
 
+from qmk.path import normpath
 from qmk.info import info_json
 from qmk.commands import dump_lines
 from qmk.keyboard import keyboard_completer, keyboard_folder
-from qmk.path import normpath
-from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
+from qmk.constants import COL_LETTERS, ROW_LETTERS, GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
-def would_populate_layout_h(keyboard):
-    """Detect if a given keyboard is doing data driven layouts
+def _generate_layouts(keyboard):
+    """Generates the layouts.h file.
     """
     # Build the info.json file
     kb_info_json = info_json(keyboard)
 
+    if 'matrix_size' not in kb_info_json:
+        cli.log.error(f'{keyboard}: Invalid matrix config.')
+        return []
+
+    col_num = kb_info_json['matrix_size']['cols']
+    row_num = kb_info_json['matrix_size']['rows']
+
+    lines = []
     for layout_name in kb_info_json['layouts']:
         if kb_info_json['layouts'][layout_name]['c_macro']:
             continue
 
         if 'matrix' not in kb_info_json['layouts'][layout_name]['layout'][0]:
-            cli.log.debug('%s/%s: No matrix data!', keyboard, layout_name)
+            cli.log.debug(f'{keyboard}/{layout_name}: No matrix data!')
             continue
 
-        return True
+        layout_keys = []
+        layout_matrix = [['KC_NO' for i in range(col_num)] for i in range(row_num)]
 
-    return False
+        for i, key in enumerate(kb_info_json['layouts'][layout_name]['layout']):
+            row = key['matrix'][0]
+            col = key['matrix'][1]
+            identifier = 'k%s%s' % (ROW_LETTERS[row], COL_LETTERS[col])
+
+            try:
+                layout_matrix[row][col] = identifier
+                layout_keys.append(identifier)
+            except IndexError:
+                key_name = key.get('label', identifier)
+                cli.log.error(f'Matrix data out of bounds for layout {layout_name} at index {i} ({key_name}): [{row}, {col}]')
+                return []
+
+        lines.append('')
+        lines.append('#define %s(%s) {\\' % (layout_name, ', '.join(layout_keys)))
+
+        rows = ', \\\n'.join(['\t {' + ', '.join(row) + '}' for row in layout_matrix])
+        rows += ' \\'
+        lines.append(rows)
+        lines.append('}')
+
+    for alias, target in kb_info_json.get('layout_aliases', {}).items():
+        lines.append('')
+        lines.append(f'#ifndef {alias}')
+        lines.append(f'#   define {alias} {target}')
+        lines.append('#endif')
+
+    return lines
 
 
+@cli.argument('-i', '--include', nargs='?', arg_only=True, help='Optional file to include')
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
 @cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, required=True, help='Keyboard to generate keyboard.h for.')
@@ -35,13 +74,23 @@ def would_populate_layout_h(keyboard):
 def generate_keyboard_h(cli):
     """Generates the keyboard.h file.
     """
-    has_layout_h = would_populate_layout_h(cli.args.keyboard)
+    keyboard_h = cli.args.include
+    dd_layouts = _generate_layouts(cli.args.keyboard)
+    valid_config = dd_layouts or keyboard_h
 
     # Build the layouts.h file.
     keyboard_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "quantum.h"']
 
-    if not has_layout_h:
-        keyboard_h_lines.append('#error("<keyboard>.h is only optional for data driven keyboards - kb.h == bad times")')
+    keyboard_h_lines.append('')
+    keyboard_h_lines.append('// Layout content')
+    if dd_layouts:
+        keyboard_h_lines.extend(dd_layouts)
+    if keyboard_h:
+        keyboard_h_lines.append(f'#include "{Path(keyboard_h).name}"')
+
+    # Protect against poorly configured keyboards
+    if not valid_config:
+        keyboard_h_lines.append('#error("<keyboard>.h is required unless your keyboard uses data-driven configuration. Please rename your keyboard\'s header file to <keyboard>.h")')
 
     # Show the results
     dump_lines(cli.args.output, keyboard_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
deleted file mode 100755
index 8336f36b50..0000000000
--- a/lib/python/qmk/cli/generate/layouts.py
+++ /dev/null
@@ -1,84 +0,0 @@
-"""Used by the make system to generate layouts.h from info.json.
-"""
-from milc import cli
-
-from qmk.constants import COL_LETTERS, ROW_LETTERS, GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
-from qmk.decorators import automagic_keyboard, automagic_keymap
-from qmk.info import info_json
-from qmk.keyboard import keyboard_completer, keyboard_folder
-from qmk.path import is_keyboard, normpath
-from qmk.commands import dump_lines
-
-
-@cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
-@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
-@cli.argument('-kb', '--keyboard', type=keyboard_folder, completer=keyboard_completer, help='Keyboard to generate config.h for.')
-@cli.subcommand('Used by the make system to generate layouts.h from info.json', hidden=True)
-@automagic_keyboard
-@automagic_keymap
-def generate_layouts(cli):
-    """Generates the layouts.h file.
-    """
-    # Determine our keyboard(s)
-    if not cli.config.generate_layouts.keyboard:
-        cli.log.error('Missing parameter: --keyboard')
-        cli.subcommands['info'].print_help()
-        return False
-
-    if not is_keyboard(cli.config.generate_layouts.keyboard):
-        cli.log.error('Invalid keyboard: "%s"', cli.config.generate_layouts.keyboard)
-        return False
-
-    # Build the info.json file
-    kb_info_json = info_json(cli.config.generate_layouts.keyboard)
-
-    # Build the layouts.h file.
-    layouts_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
-
-    if 'matrix_size' not in kb_info_json:
-        cli.log.error('%s: Invalid matrix config.', cli.config.generate_layouts.keyboard)
-        return False
-
-    col_num = kb_info_json['matrix_size']['cols']
-    row_num = kb_info_json['matrix_size']['rows']
-
-    for layout_name in kb_info_json['layouts']:
-        if kb_info_json['layouts'][layout_name]['c_macro']:
-            continue
-
-        if 'matrix' not in kb_info_json['layouts'][layout_name]['layout'][0]:
-            cli.log.debug('%s/%s: No matrix data!', cli.config.generate_layouts.keyboard, layout_name)
-            continue
-
-        layout_keys = []
-        layout_matrix = [['KC_NO' for i in range(col_num)] for i in range(row_num)]
-
-        for i, key in enumerate(kb_info_json['layouts'][layout_name]['layout']):
-            row = key['matrix'][0]
-            col = key['matrix'][1]
-            identifier = 'k%s%s' % (ROW_LETTERS[row], COL_LETTERS[col])
-
-            try:
-                layout_matrix[row][col] = identifier
-                layout_keys.append(identifier)
-            except IndexError:
-                key_name = key.get('label', identifier)
-                cli.log.error('Matrix data out of bounds for layout %s at index %s (%s): %s, %s', layout_name, i, key_name, row, col)
-                return False
-
-        layouts_h_lines.append('')
-        layouts_h_lines.append('#define %s(%s) {\\' % (layout_name, ', '.join(layout_keys)))
-
-        rows = ', \\\n'.join(['\t {' + ', '.join(row) + '}' for row in layout_matrix])
-        rows += ' \\'
-        layouts_h_lines.append(rows)
-        layouts_h_lines.append('}')
-
-    for alias, target in kb_info_json.get('layout_aliases', {}).items():
-        layouts_h_lines.append('')
-        layouts_h_lines.append(f'#ifndef {alias}')
-        layouts_h_lines.append(f'#   define {alias} {target}')
-        layouts_h_lines.append('#endif')
-
-    # Show the results
-    dump_lines(cli.args.output, layouts_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 185abb5f21..c8c4e2f80c 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -288,12 +288,6 @@ def test_generate_version_h():
     assert '#define QMK_VERSION' in result.stdout
 
 
-def test_generate_layouts():
-    result = check_subcommand('generate-layouts', '-kb', 'handwired/pytest/basic')
-    check_returncode(result)
-    assert '#define LAYOUT_custom(k0A) {' in result.stdout
-
-
 def test_format_json_keyboard():
     result = check_subcommand('format-json', '--format', 'keyboard', 'lib/python/qmk/tests/minimal_info.json')
     check_returncode(result)

From 2c516fab292fdd6bb9b42ad528f83118a3831cf6 Mon Sep 17 00:00:00 2001
From: coliss86 <coliss86@users.noreply.github.com>
Date: Mon, 19 Sep 2022 03:20:22 +0200
Subject: [PATCH 385/959] [Docs] Extract 'Layer Change Code' and EEPROM
 (#18174)

* [Docs] Extract 'Layer Change Code' and EEPROM

* adjust wording

* Update docs/custom_quantum_functions.md

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
---
 docs/_summary.md                  |   1 +
 docs/custom_quantum_functions.md  | 199 +++---------------------------
 docs/feature_advanced_keycodes.md |   2 +-
 docs/feature_eeprom.md            | 134 ++++++++++++++++++++
 docs/feature_layers.md            |  49 +++++++-
 5 files changed, 198 insertions(+), 187 deletions(-)
 create mode 100644 docs/feature_eeprom.md

diff --git a/docs/_summary.md b/docs/_summary.md
index f2bdcd5ccd..a0d2b2a949 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -79,6 +79,7 @@
     * [Caps Word](feature_caps_word.md)
     * [Combos](feature_combo.md)
     * [Debounce API](feature_debounce_type.md)
+    * [EEPROM](feature_eeprom.md)
     * [Key Lock](feature_key_lock.md)
     * [Key Overrides](feature_key_overrides.md)
     * [Layers](feature_layers.md)
diff --git a/docs/custom_quantum_functions.md b/docs/custom_quantum_functions.md
index 7b7849ad07..2917fbad26 100644
--- a/docs/custom_quantum_functions.md
+++ b/docs/custom_quantum_functions.md
@@ -102,11 +102,11 @@ These are the three main initialization functions, listed in the order that they
 
 ## Keyboard Pre Initialization code
 
-This runs very early during startup, even before the USB has been started. 
+This runs very early during startup, even before the USB has been started.
 
 Shortly after this, the matrix is initialized.
 
-For most users, this shouldn't be used, as it's primarily for hardware oriented initialization. 
+For most users, this shouldn't be used, as it's primarily for hardware oriented initialization.
 
 However, if you have hardware stuff that you need initialized, this is the best place for it (such as initializing LED pins).
 
@@ -134,9 +134,9 @@ void keyboard_pre_init_user(void) {
 
 ## Matrix Initialization Code
 
-This is called when the matrix is initialized, and after some of the hardware has been set up, but before many of the features have been initialized. 
+This is called when the matrix is initialized, and after some of the hardware has been set up, but before many of the features have been initialized.
 
-This is useful for setting up stuff that you may need elsewhere, but isn't hardware related nor is dependant on where it's started. 
+This is useful for setting up stuff that you may need elsewhere, but isn't hardware related nor is dependant on where it's started.
 
 
 ### `matrix_init_*` Function Documentation
@@ -227,185 +227,6 @@ void suspend_wakeup_init_user(void) {
 * Keyboard/Revision: `void suspend_power_down_kb(void)` and `void suspend_wakeup_init_user(void)`
 * Keymap: `void suspend_power_down_kb(void)` and `void suspend_wakeup_init_user(void)`
 
-# Layer Change Code :id=layer-change-code
-
-This runs code every time that the layers get changed.  This can be useful for layer indication, or custom layer handling.
-
-### Example `layer_state_set_*` Implementation
-
-This example shows how to set the [RGB Underglow](feature_rgblight.md) lights based on the layer, using the Planck as an example.
-
-```c
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _RAISE:
-        rgblight_setrgb (0x00,  0x00, 0xFF);
-        break;
-    case _LOWER:
-        rgblight_setrgb (0xFF,  0x00, 0x00);
-        break;
-    case _PLOVER:
-        rgblight_setrgb (0x00,  0xFF, 0x00);
-        break;
-    case _ADJUST:
-        rgblight_setrgb (0x7A,  0x00, 0xFF);
-        break;
-    default: //  for any other layers, or the default layer
-        rgblight_setrgb (0x00,  0xFF, 0xFF);
-        break;
-    }
-  return state;
-}
-```
-
-Use the `IS_LAYER_ON_STATE(state, layer)` and `IS_LAYER_OFF_STATE(state, layer)` macros to check the status of a particular layer.
-
-Outside of `layer_state_set_*` functions, you can use the `IS_LAYER_ON(layer)` and `IS_LAYER_OFF(layer)` macros to check global layer state.
-
-### `layer_state_set_*` Function Documentation
-
-* Keyboard/Revision: `layer_state_t layer_state_set_kb(layer_state_t state)`
-* Keymap: `layer_state_t layer_state_set_user(layer_state_t state)`
-
-
-The `state` is the bitmask of the active layers, as explained in the [Keymap Overview](keymap.md#keymap-layer-status)
-
-
-# Persistent Configuration (EEPROM)
-
-This allows you to configure persistent settings for your keyboard.  These settings are stored in the EEPROM of your controller, and are retained even after power loss. The settings can be read with `eeconfig_read_kb` and `eeconfig_read_user`, and can be written to using `eeconfig_update_kb` and `eeconfig_update_user`. This is useful for features that you want to be able to toggle (like toggling rgb layer indication).  Additionally, you can use `eeconfig_init_kb` and `eeconfig_init_user` to set the default values for the EEPROM. 
-
-The complicated part here, is that there are a bunch of ways that you can store and access data via EEPROM, and there is no "correct" way to do this.  However, you only have a DWORD (4 bytes) for each function.
-
-Keep in mind that EEPROM has a limited number of writes. While this is very high, it's not the only thing writing to the EEPROM, and if you write too often, you can potentially drastically shorten the life of your MCU.
-
-* If you don't understand the example, then you may want to avoid using this feature, as it is rather complicated. 
-
-### Example Implementation
-
-This is an example of how to add settings, and read and write it. We're using the user keymap for the example here.  This is a complex function, and has a lot going on.  In fact, it uses a lot of the above functions to work! 
-
-
-In your keymap.c file, add this to the top:
-```c
-typedef union {
-  uint32_t raw;
-  struct {
-    bool     rgb_layer_change :1;
-  };
-} user_config_t;
-
-user_config_t user_config;
-```
-
-This sets up a 32 bit structure that we can store settings with in memory, and write to the EEPROM. Using this removes the need to define variables, since they're defined in this structure. Remember that `bool` (boolean) values use 1 bit, `uint8_t` uses 8 bits, `uint16_t` uses up 16 bits.  You can mix and match, but changing the order can cause issues, as it will change the values that are read and written. 
-
-We're using `rgb_layer_change`, for the `layer_state_set_*` function, and use `keyboard_post_init_user` and `process_record_user` to configure everything. 
-
-Now, using the `keyboard_post_init_user` code above, you want to add `eeconfig_read_user()` to it, to populate the structure you've just created. And you can then immediately use this structure to control functionality in your keymap.  And It should look like: 
-```c
-void keyboard_post_init_user(void) {
-  // Call the keymap level matrix init.
-
-  // Read the user config from EEPROM
-  user_config.raw = eeconfig_read_user();
-
-  // Set default layer, if enabled
-  if (user_config.rgb_layer_change) {
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_cyan();
-    rgblight_mode_noeeprom(1);
-  }
-}
-```
-The above function will use the EEPROM config immediately after reading it, to set the default layer's RGB color. The "raw" value of it is converted in a usable structure based on the "union" that you created above. 
-
-```c
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _RAISE:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_magenta(); rgblight_mode_noeeprom(1); }
-        break;
-    case _LOWER:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_red(); rgblight_mode_noeeprom(1); }
-        break;
-    case _PLOVER:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_green(); rgblight_mode_noeeprom(1); }
-        break;
-    case _ADJUST:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_white(); rgblight_mode_noeeprom(1); }
-        break;
-    default: //  for any other layers, or the default layer
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_cyan(); rgblight_mode_noeeprom(1); }
-        break;
-    }
-  return state;
-}
-```
-This will cause the RGB underglow to be changed ONLY if the value was enabled.  Now to configure this value, create a new keycode for `process_record_user` called `RGB_LYR`. Additionally, we want to make sure that if you use the normal RGB codes, that it turns off  Using the example above, make it look this:
-```c
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case FOO:
-      if (record->event.pressed) {
-        // Do something when pressed
-      } else {
-        // Do something else when release
-      }
-      return false; // Skip all further processing of this key
-    case KC_ENTER:
-        // Play a tone when enter is pressed
-        if (record->event.pressed) {
-            PLAY_SONG(tone_qwerty);
-        }
-        return true; // Let QMK send the enter press/release events
-    case RGB_LYR:  // This allows me to use underglow as layer indication, or as normal
-        if (record->event.pressed) {
-            user_config.rgb_layer_change ^= 1; // Toggles the status
-            eeconfig_update_user(user_config.raw); // Writes the new status to EEPROM
-            if (user_config.rgb_layer_change) { // if layer state indication is enabled,
-                layer_state_set(layer_state);   // then immediately update the layer color
-            }
-        }
-        return false;
-    case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // For any of the RGB codes (see quantum_keycodes.h, L400 for reference)
-        if (record->event.pressed) { //This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
-            if (user_config.rgb_layer_change) {        // only if this is enabled
-                user_config.rgb_layer_change = false;  // disable it, and
-                eeconfig_update_user(user_config.raw); // write the setings to EEPROM
-            }
-        }
-        return true; break;
-    default:
-      return true; // Process all other keycodes normally
-  }
-}
-```
-And lastly, you want to add the `eeconfig_init_user` function, so that when the EEPROM is reset, you can specify default values, and even custom actions. To force an EEPROM reset, use the `EEP_RST` keycode or [Bootmagic Lite](feature_bootmagic.md) functionallity. For example, if you want to set rgb layer indication by default, and save the default valued.
-
-```c
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-  user_config.raw = 0;
-  user_config.rgb_layer_change = true; // We want this enabled by default
-  eeconfig_update_user(user_config.raw); // Write default value to EEPROM now
-
-  // use the non noeeprom versions, to write these values to EEPROM too
-  rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv_cyan();  // Set it to CYAN by default
-  rgblight_mode(1); // set to solid by default
-}
-```
-
-And you're done.  The RGB layer indication will only work if you want it to. And it will be saved, even after unplugging the board. And if you use any of the RGB codes, it will disable the layer indication, so that it stays on the mode and color that you set it to. 
-
-### 'EECONFIG' Function Documentation
-
-* Keyboard/Revision: `void eeconfig_init_kb(void)`, `uint32_t eeconfig_read_kb(void)` and `void eeconfig_update_kb(uint32_t val)`
-* Keymap: `void eeconfig_init_user(void)`, `uint32_t eeconfig_read_user(void)` and `void eeconfig_update_user(uint32_t val)`
-
-The `val` is the value of the data that you want to write to EEPROM.  And the `eeconfig_read_*` function return a 32 bit (DWORD) value from the EEPROM. 
-
 # Deferred Execution :id=deferred-execution
 
 QMK has the ability to execute a callback after a specified period of time, rather than having to manually manage timers. To enable this functionality, set `DEFERRED_EXEC_ENABLE = yes` in rules.mk.
@@ -471,3 +292,15 @@ If registrations fail, then you can increase this value in your keyboard or keym
 ```c
 #define MAX_DEFERRED_EXECUTORS 16
 ```
+
+# Advanced topics :id=advanced-topics
+
+This page used to encompass a large set of features. We have moved many sections that used to be part of this page to their own pages. Everything below this point is simply a redirect so that people following old links on the web find what they're looking for.
+
+## Layer Change Code :id=layer-change-code
+
+[Layer change code](feature_layers.md#layer-change-code)
+
+## Persistent Configuration (EEPROM) :id=persistent-configuration-eeprom
+
+[Persistent Configuration (EEPROM)](feature_eeprom.md)
diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index 83066187c7..b04721b23a 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -161,7 +161,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 ```
 
-# Legacy Content :id=legacy-content
+# Advanced topics :id=advanced-topics
 
 This page used to encompass a large set of features. We have moved many sections that used to be part of this page to their own pages. Everything below this point is simply a redirect so that people following old links on the web find what they're looking for.
 
diff --git a/docs/feature_eeprom.md b/docs/feature_eeprom.md
new file mode 100644
index 0000000000..e261c455cb
--- /dev/null
+++ b/docs/feature_eeprom.md
@@ -0,0 +1,134 @@
+# Persistent Configuration (EEPROM)
+
+This allows you to configure persistent settings for your keyboard.  These settings are stored in the EEPROM of your controller, and are retained even after power loss. The settings can be read with `eeconfig_read_kb` and `eeconfig_read_user`, and can be written to using `eeconfig_update_kb` and `eeconfig_update_user`. This is useful for features that you want to be able to toggle (like toggling rgb layer indication).  Additionally, you can use `eeconfig_init_kb` and `eeconfig_init_user` to set the default values for the EEPROM.
+
+The complicated part here, is that there are a bunch of ways that you can store and access data via EEPROM, and there is no "correct" way to do this.  However, you only have a DWORD (4 bytes) for each function.
+
+Keep in mind that EEPROM has a limited number of writes. While this is very high, it's not the only thing writing to the EEPROM, and if you write too often, you can potentially drastically shorten the life of your MCU.
+
+* If you don't understand the example, then you may want to avoid using this feature, as it is rather complicated.
+
+## Example Implementation
+
+This is an example of how to add settings, and read and write it. We're using the user keymap for the example here.  This is a complex function, and has a lot going on.  In fact, it uses a lot of the above functions to work!
+
+
+In your keymap.c file, add this to the top:
+```c
+typedef union {
+  uint32_t raw;
+  struct {
+    bool     rgb_layer_change :1;
+  };
+} user_config_t;
+
+user_config_t user_config;
+```
+
+This sets up a 32 bit structure that we can store settings with in memory, and write to the EEPROM. Using this removes the need to define variables, since they're defined in this structure. Remember that `bool` (boolean) values use 1 bit, `uint8_t` uses 8 bits, `uint16_t` uses up 16 bits.  You can mix and match, but changing the order can cause issues, as it will change the values that are read and written.
+
+We're using `rgb_layer_change`, for the `layer_state_set_*` function, and use `keyboard_post_init_user` and `process_record_user` to configure everything.
+
+Now, using the `keyboard_post_init_user` code above, you want to add `eeconfig_read_user()` to it, to populate the structure you've just created. And you can then immediately use this structure to control functionality in your keymap.  And It should look like:
+```c
+void keyboard_post_init_user(void) {
+  // Call the keymap level matrix init.
+
+  // Read the user config from EEPROM
+  user_config.raw = eeconfig_read_user();
+
+  // Set default layer, if enabled
+  if (user_config.rgb_layer_change) {
+    rgblight_enable_noeeprom();
+    rgblight_sethsv_noeeprom_cyan();
+    rgblight_mode_noeeprom(1);
+  }
+}
+```
+The above function will use the EEPROM config immediately after reading it, to set the default layer's RGB color. The "raw" value of it is converted in a usable structure based on the "union" that you created above.
+
+```c
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+    case _RAISE:
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_magenta(); rgblight_mode_noeeprom(1); }
+        break;
+    case _LOWER:
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_red(); rgblight_mode_noeeprom(1); }
+        break;
+    case _PLOVER:
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_green(); rgblight_mode_noeeprom(1); }
+        break;
+    case _ADJUST:
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_white(); rgblight_mode_noeeprom(1); }
+        break;
+    default: //  for any other layers, or the default layer
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_cyan(); rgblight_mode_noeeprom(1); }
+        break;
+    }
+  return state;
+}
+```
+This will cause the RGB underglow to be changed ONLY if the value was enabled.  Now to configure this value, create a new keycode for `process_record_user` called `RGB_LYR`. Additionally, we want to make sure that if you use the normal RGB codes, that it turns off  Using the example above, make it look this:
+```c
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case FOO:
+      if (record->event.pressed) {
+        // Do something when pressed
+      } else {
+        // Do something else when release
+      }
+      return false; // Skip all further processing of this key
+    case KC_ENTER:
+        // Play a tone when enter is pressed
+        if (record->event.pressed) {
+            PLAY_SONG(tone_qwerty);
+        }
+        return true; // Let QMK send the enter press/release events
+    case RGB_LYR:  // This allows me to use underglow as layer indication, or as normal
+        if (record->event.pressed) {
+            user_config.rgb_layer_change ^= 1; // Toggles the status
+            eeconfig_update_user(user_config.raw); // Writes the new status to EEPROM
+            if (user_config.rgb_layer_change) { // if layer state indication is enabled,
+                layer_state_set(layer_state);   // then immediately update the layer color
+            }
+        }
+        return false;
+    case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // For any of the RGB codes (see quantum_keycodes.h, L400 for reference)
+        if (record->event.pressed) { //This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
+            if (user_config.rgb_layer_change) {        // only if this is enabled
+                user_config.rgb_layer_change = false;  // disable it, and
+                eeconfig_update_user(user_config.raw); // write the setings to EEPROM
+            }
+        }
+        return true; break;
+    default:
+      return true; // Process all other keycodes normally
+  }
+}
+```
+And lastly, you want to add the `eeconfig_init_user` function, so that when the EEPROM is reset, you can specify default values, and even custom actions. To force an EEPROM reset, use the `EEP_RST` keycode or [Bootmagic Lite](feature_bootmagic.md) functionallity. For example, if you want to set rgb layer indication by default, and save the default valued.
+
+```c
+void eeconfig_init_user(void) {  // EEPROM is getting reset!
+  user_config.raw = 0;
+  user_config.rgb_layer_change = true; // We want this enabled by default
+  eeconfig_update_user(user_config.raw); // Write default value to EEPROM now
+
+  // use the non noeeprom versions, to write these values to EEPROM too
+  rgblight_enable(); // Enable RGB by default
+  rgblight_sethsv_cyan();  // Set it to CYAN by default
+  rgblight_mode(1); // set to solid by default
+}
+```
+
+And you're done.  The RGB layer indication will only work if you want it to. And it will be saved, even after unplugging the board. And if you use any of the RGB codes, it will disable the layer indication, so that it stays on the mode and color that you set it to.
+
+## 'EECONFIG' Function Documentation
+
+* Keyboard/Revision: `void eeconfig_init_kb(void)`, `uint32_t eeconfig_read_kb(void)` and `void eeconfig_update_kb(uint32_t val)`
+* Keymap: `void eeconfig_init_user(void)`, `uint32_t eeconfig_read_user(void)` and `void eeconfig_update_user(uint32_t val)`
+
+The `val` is the value of the data that you want to write to EEPROM.  And the `eeconfig_read_*` function return a 32 bit (DWORD) value from the EEPROM.
diff --git a/docs/feature_layers.md b/docs/feature_layers.md
index e30c540a79..5ad4005f5d 100644
--- a/docs/feature_layers.md
+++ b/docs/feature_layers.md
@@ -1,6 +1,6 @@
 # Layers :id=layers
 
-One of the most powerful and well used features of QMK Firmware is the ability to use layers.  For most people, this amounts to a function key that allows for different keys, much like what you would see on a laptop or tablet keyboard. 
+One of the most powerful and well used features of QMK Firmware is the ability to use layers.  For most people, this amounts to a function key that allows for different keys, much like what you would see on a laptop or tablet keyboard.
 
 For a detailed explanation of how the layer stack works, checkout [Keymap Overview](keymap.md#keymap-and-layers).
 
@@ -9,7 +9,7 @@ For a detailed explanation of how the layer stack works, checkout [Keymap Overvi
 These functions allow you to activate layers in various ways. Note that layers are not generally independent layouts -- multiple layers can be activated at once, and it's typical for layers to use `KC_TRNS` to allow keypresses to pass through to lower layers. When using momentary layer switching with MO(), LM(), TT(), or LT(), make sure to leave the key on the above layers transparent or it may not work as intended.
 
 * `DF(layer)` - switches the default layer. The default layer is the always-active base layer that other layers stack on top of. See below for more about the default layer. This might be used to switch from QWERTY to Dvorak layout. (Note that this is a temporary switch that only persists until the keyboard loses power. To modify the default layer in a persistent way requires deeper customization, such as calling the `set_single_persistent_default_layer` function inside of [process_record_user](custom_quantum_functions.md#programming-the-behavior-of-any-keycode).)
-* `MO(layer)` - momentarily activates *layer*. As soon as you let go of the key, the layer is deactivated. 
+* `MO(layer)` - momentarily activates *layer*. As soon as you let go of the key, the layer is deactivated.
 * `LM(layer, mod)` - Momentarily activates *layer* (like `MO`), but with modifier(s) *mod* active. Only supports layers 0-15 and the left modifiers: `MOD_LCTL`, `MOD_LSFT`, `MOD_LALT`, `MOD_LGUI` (note the use of `MOD_` constants instead of `KC_`). These modifiers can be combined using bitwise OR, e.g. `LM(_RAISE, MOD_LCTL | MOD_LALT)`.
 * `LT(layer, kc)` - momentarily activates *layer* when held, and sends *kc* when tapped. Only supports layers 0-15.
 * `OSL(layer)` - momentarily activates *layer* until the next key is pressed. See [One Shot Keys](one_shot_keys.md) for details and additional functionality.
@@ -31,7 +31,7 @@ Care must be taken when switching layers, it's possible to lock yourself into a
 
 If you are just getting started with QMK you will want to keep everything simple. Follow these guidelines when setting up your layers:
 
-* Setup layer 0 as your default, "base" layer. This is your normal typing layer, and could be whatever layout you want (qwerty, dvorak, colemak, etc.). It's important to set this as the lowest layer since it will typically have most or all of the keyboard's keys defined, so would block other layers from having any effect if it were above them (i.e., had a higher layer number). 
+* Setup layer 0 as your default, "base" layer. This is your normal typing layer, and could be whatever layout you want (qwerty, dvorak, colemak, etc.). It's important to set this as the lowest layer since it will typically have most or all of the keyboard's keys defined, so would block other layers from having any effect if it were above them (i.e., had a higher layer number).
 * Arrange your layers in a "tree" layout, with layer 0 as the root. Do not try to enter the same layer from more than one other layer.
 * In a layer's keymap, only reference higher-numbered layers. Because layers are processed from the highest-numbered (topmost) active layer down, modifying the state of lower layers can be tricky and error-prone.
 
@@ -89,3 +89,46 @@ It is also possible to check the state of a particular layer using the following
 |---------------------------------|-------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------|
 | `layer_state_is(layer)`         | Checks if the specified `layer` is enabled globally.                                            | `IS_LAYER_ON(layer)`, `IS_LAYER_OFF(layer)`                           |
 | `layer_state_cmp(state, layer)` | Checks `state` to see if the specified `layer` is enabled. Intended for use in layer callbacks. | `IS_LAYER_ON_STATE(state, layer)`, `IS_LAYER_OFF_STATE(state, layer)` |
+
+## Layer Change Code :id=layer-change-code
+
+This runs code every time that the layers get changed.  This can be useful for layer indication, or custom layer handling.
+
+### Example `layer_state_set_*` Implementation
+
+This example shows how to set the [RGB Underglow](feature_rgblight.md) lights based on the layer, using the Planck as an example.
+
+```c
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+    case _RAISE:
+        rgblight_setrgb (0x00,  0x00, 0xFF);
+        break;
+    case _LOWER:
+        rgblight_setrgb (0xFF,  0x00, 0x00);
+        break;
+    case _PLOVER:
+        rgblight_setrgb (0x00,  0xFF, 0x00);
+        break;
+    case _ADJUST:
+        rgblight_setrgb (0x7A,  0x00, 0xFF);
+        break;
+    default: //  for any other layers, or the default layer
+        rgblight_setrgb (0x00,  0xFF, 0xFF);
+        break;
+    }
+  return state;
+}
+```
+
+Use the `IS_LAYER_ON_STATE(state, layer)` and `IS_LAYER_OFF_STATE(state, layer)` macros to check the status of a particular layer.
+
+Outside of `layer_state_set_*` functions, you can use the `IS_LAYER_ON(layer)` and `IS_LAYER_OFF(layer)` macros to check global layer state.
+
+### `layer_state_set_*` Function Documentation
+
+* Keyboard/Revision: `layer_state_t layer_state_set_kb(layer_state_t state)`
+* Keymap: `layer_state_t layer_state_set_user(layer_state_t state)`
+
+
+The `state` is the bitmask of the active layers, as explained in the [Keymap Overview](keymap.md#keymap-layer-status)

From 2aa3a8e0598336b035ce4a16e41b03c6a79888e5 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 19 Sep 2022 18:05:31 +0200
Subject: [PATCH 386/959] [Core] remove busy waiting from rgblight functions
 (#18418)

---
 quantum/rgblight/rgblight.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index e5d3a98bea..73b352cea8 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -16,7 +16,6 @@
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
-#include "wait.h"
 #include "progmem.h"
 #include "sync_timer.h"
 #include "rgblight.h"
@@ -410,7 +409,6 @@ void rgblight_disable(void) {
     dprintf("rgblight disable [EEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
     rgblight_timer_disable();
     RGBLIGHT_SPLIT_SET_CHANGE_MODE;
-    wait_ms(50);
     rgblight_set();
 }
 
@@ -419,7 +417,6 @@ void rgblight_disable_noeeprom(void) {
     dprintf("rgblight disable [NOEEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
     rgblight_timer_disable();
     RGBLIGHT_SPLIT_SET_CHANGE_MODE;
-    wait_ms(50);
     rgblight_set();
 }
 
@@ -704,7 +701,6 @@ void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8
 #endif
     }
     rgblight_set();
-    wait_ms(1);
 }
 
 void rgblight_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start, uint8_t end) {

From ed6679b89cc2a60dd259b57c1b12f73ef16b7046 Mon Sep 17 00:00:00 2001
From: Derek <dschmell91@gmail.com>
Date: Mon, 19 Sep 2022 14:18:13 -0400
Subject: [PATCH 387/959] [Keyboard] Sodium50 - Fix configuration (#18422)

---
 keyboards/nacly/sodium50/config.h   | 4 ++--
 keyboards/nacly/sodium50/sodium50.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h
index 5f92ca1c8c..cdcab9290b 100644
--- a/keyboards/nacly/sodium50/config.h
+++ b/keyboards/nacly/sodium50/config.h
@@ -20,11 +20,11 @@
 
 /* key matrix size */
 // Rows are doubled-up
-#define MATRIX_ROWS 10
+#define MATRIX_ROWS 8
 #define MATRIX_COLS 7
 
 // wiring of each half
-#define MATRIX_ROW_PINS { F7, D4, D7, B4, B6 }
+#define MATRIX_ROW_PINS { F7, D4, D7, B4}
 #define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 }
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nacly/sodium50/sodium50.h b/keyboards/nacly/sodium50/sodium50.h
index c20ea9bc3b..384867f193 100644
--- a/keyboards/nacly/sodium50/sodium50.h
+++ b/keyboards/nacly/sodium50/sodium50.h
@@ -32,5 +32,5 @@
         { R00, R01, R02, R03, R04, R05, KC_NO }, \
         { R10, R11, R12, R13, R14, R15, KC_NO }, \
         { R20, R21, R22, R23, R24, R25, KC_NO }, \
-        { R30, R31, R32, R33, R34, R35, L36       } \
+        { R30, R31, R32, R33, R34, R35, R36       } \
 }

From 89df40d4f340311e64189de45770879257c867f3 Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Mon, 19 Sep 2022 14:19:13 -0400
Subject: [PATCH 388/959] Enable more BDN9 RGB effects (#18420)

---
 keyboards/keebio/bdn9/rev2/config.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index 56d6235ec9..e3d004fc27 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -48,6 +48,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
 #        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#        define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

From 613e3f68b50b39428176af7d790e12994ff4c5fd Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 19 Sep 2022 20:30:16 +0200
Subject: [PATCH 389/959] Update pico-sdk to version 1.4.0 (#18423)

...which contains fixes for GCC warnings.
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index 07edde8e49..8d56ea332b 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 07edde8e49890d2172bbc272aacc119f999df063
+Subproject commit 8d56ea332b3734cef0a8e61f7d61f2422bd539b1

From 652d1d8a6d0a98ab2cff285dc46b91b702adedc6 Mon Sep 17 00:00:00 2001
From: Marius Renner <ragingcactus@ragingcactus.net>
Date: Mon, 19 Sep 2022 20:34:29 +0200
Subject: [PATCH 390/959] Fix int8_t overflow in RGB heatmap effect (#18410)

---
 quantum/rgb_matrix/animations/typing_heatmap_anim.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/rgb_matrix/animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
index a05c07760e..00d137f1a6 100644
--- a/quantum/rgb_matrix/animations/typing_heatmap_anim.h
+++ b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
@@ -29,7 +29,7 @@ void process_rgb_matrix_typing_heatmap(uint8_t row, uint8_t col) {
             if (i_row == row && i_col == col) {
                 g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32);
             } else {
-#            define LED_DISTANCE(led_a, led_b) sqrt16(((int8_t)(led_a.x - led_b.x) * (int8_t)(led_a.x - led_b.x)) + ((int8_t)(led_a.y - led_b.y) * (int8_t)(led_a.y - led_b.y)))
+#            define LED_DISTANCE(led_a, led_b) sqrt16(((int16_t)(led_a.x - led_b.x) * (int16_t)(led_a.x - led_b.x)) + ((int16_t)(led_a.y - led_b.y) * (int16_t)(led_a.y - led_b.y)))
                 uint8_t distance = LED_DISTANCE(g_led_config.point[g_led_config.matrix_co[row][col]], g_led_config.point[g_led_config.matrix_co[i_row][i_col]]);
 #            undef LED_DISTANCE
                 if (distance <= RGB_MATRIX_TYPING_HEATMAP_SPREAD) {

From 8d0fb4ca9e7f791f164fedbd270b2da44f971155 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 20 Sep 2022 04:36:48 +1000
Subject: [PATCH 391/959] Add DD mapping for LED/RGB Matrix HSVS steps (#18414)

---
 data/mappings/info_config.json   | 8 ++++++++
 data/schemas/keyboard.jsonschema | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 34c46d6d89..e1dbb27a6c 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -40,6 +40,10 @@
     "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"},
     "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
     "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
+    "LED_MATRIX_HUE_STEP": {"info_key": "led_matrix.hue_steps", "value_type": "int"},
+    "LED_MATRIX_SAT_STEP": {"info_key": "led_matrix.sat_steps", "value_type": "int"},
+    "LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"},
+    "LED_MATRIX_SPD_STEP": {"info_key": "led_matrix.speed_steps", "value_type": "int"},
     "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str"},
     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
@@ -81,6 +85,10 @@
     "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},
     "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"},
     "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
+    "RGB_MATRIX_HUE_STEP": {"info_key": "rgb_matrix.hue_steps", "value_type": "int"},
+    "RGB_MATRIX_SAT_STEP": {"info_key": "rgb_matrix.sat_steps", "value_type": "int"},
+    "RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
+    "RGB_MATRIX_SPD_STEP": {"info_key": "rgb_matrix.speed_steps", "value_type": "int"},
     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index e82dacaac4..60381a21a0 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -266,6 +266,10 @@
             "properties": {
                 "driver": {"type": "string"},
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "split_count": {
                     "type": "array",
                     "minItems": 2,
@@ -300,6 +304,10 @@
             "properties": {
                 "driver": {"type": "string"},
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "split_count": {
                     "type": "array",
                     "minItems": 2,

From 51620c10424c1ca4be2e7cae922eb271e0c679ca Mon Sep 17 00:00:00 2001
From: Felix Springer <39434424+jumper149@users.noreply.github.com>
Date: Mon, 19 Sep 2022 20:42:38 +0200
Subject: [PATCH 392/959] Fix boardsource/lulu RGB matrix (#18407)

* Fix ordering of entries for RGB matrix.

* Fix typos in RGB matrix definition.

These matrix indices overlapped.

* Improve positions in RGB matrix.

The rotary encoder and the key below that are in a new column.
The rotary encoder's height is inbetween rows.
The key below is kind of off-axis and thus hard to pin down to a
specific location.

The modifer keys in the bottom row are staggered compared to the other
columns.
---
 keyboards/boardsource/lulu/info.json | 98 ++++++++++++++--------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
index 3418cd6e7a..8c3b03d1d2 100644
--- a/keyboards/boardsource/lulu/info.json
+++ b/keyboards/boardsource/lulu/info.json
@@ -36,70 +36,70 @@
       { "flags": 2, "x": 17, "y": 10 },
       { "flags": 2, "x": 51, "y": 10 },
       { "flags": 2, "x": 86, "y": 10 },
-      { "flags": 2, "x": 137, "y": 55 },
-      { "flags": 2, "x": 172, "y": 55 },
-      { "flags": 2, "x": 206, "y": 40 },
-      { "flags": 2, "x": 206, "y": 10 },
-      { "flags": 2, "x": 172, "y": 10 },
-      { "flags": 2, "x": 137, "y": 10 },
-      { "flags": 1, "matrix": [0, 0], "x": 0,  "y": 0 },
-      { "flags": 4, "matrix": [0, 1], "x": 17,  "y": 0 },
-      { "flags": 4, "matrix": [0, 2], "x": 34,  "y": 0 },
-      { "flags": 4, "matrix": [0, 3], "x": 51,  "y": 0 },
-      { "flags": 4, "matrix": [0, 4], "x": 68,  "y": 0 },
       { "flags": 4, "matrix": [0, 5], "x": 86,  "y": 0 },
-      { "flags": 4, "matrix": [5, 5], "x": 137,  "y": 0 },
-      { "flags": 4, "matrix": [5, 4], "x": 155,  "y": 0 },
-      { "flags": 4, "matrix": [5, 3], "x": 172,  "y": 0 },
-      { "flags": 4, "matrix": [5, 2], "x": 189,  "y": 0 },
-      { "flags": 4, "matrix": [5, 1], "x": 206,  "y": 0 },
-      { "flags": 1, "matrix": [5, 0], "x": 224,  "y": 0 },
+      { "flags": 4, "matrix": [0, 4], "x": 68,  "y": 0 },
+      { "flags": 4, "matrix": [0, 3], "x": 51,  "y": 0 },
+      { "flags": 4, "matrix": [0, 2], "x": 34,  "y": 0 },
+      { "flags": 4, "matrix": [0, 1], "x": 17,  "y": 0 },
+      { "flags": 1, "matrix": [0, 0], "x": 0,  "y": 0 },
       { "flags": 1, "matrix": [1, 0], "x": 0,  "y": 16 },
       { "flags": 4, "matrix": [1, 1], "x": 17,  "y": 16 },
       { "flags": 4, "matrix": [1, 2], "x": 34,  "y": 16 },
       { "flags": 4, "matrix": [1, 3], "x": 51,  "y": 16 },
       { "flags": 4, "matrix": [1, 4], "x": 68,  "y": 16 },
       { "flags": 4, "matrix": [1, 5], "x": 86,  "y": 16 },
-      { "flags": 4, "matrix": [6, 5], "x": 137,  "y": 16 },
-      { "flags": 4, "matrix": [6, 4], "x": 155,  "y": 16 },
-      { "flags": 4, "matrix": [6, 3], "x": 172,  "y": 16 },
-      { "flags": 4, "matrix": [6, 2], "x": 189,  "y": 16 },
-      { "flags": 4, "matrix": [6, 1], "x": 206,  "y": 16 },
-      { "flags": 1, "matrix": [6, 4], "x": 224,  "y": 16 },
-      { "flags": 1, "matrix": [2, 0], "x": 0,  "y": 32 },
-      { "flags": 4, "matrix": [2, 1], "x": 17,  "y": 32 },
-      { "flags": 4, "matrix": [2, 2], "x": 34,  "y": 32 },
-      { "flags": 4, "matrix": [2, 3], "x": 51,  "y": 32 },
-      { "flags": 4, "matrix": [2, 4], "x": 68,  "y": 32 },
       { "flags": 4, "matrix": [2, 5], "x": 86,  "y": 32 },
-      { "flags": 4, "matrix": [7, 5], "x": 137,  "y": 32 },
-      { "flags": 4, "matrix": [7, 4], "x": 155,  "y": 32 },
-      { "flags": 4, "matrix": [7, 3], "x": 172,  "y": 32 },
-      { "flags": 4, "matrix": [7, 2], "x": 189,  "y": 32 },
-      { "flags": 4, "matrix": [7, 1], "x": 206,  "y": 32 },
-      { "flags": 1, "matrix": [7, 4], "x": 224,  "y": 32 },
+      { "flags": 4, "matrix": [2, 4], "x": 68,  "y": 32 },
+      { "flags": 4, "matrix": [2, 3], "x": 51,  "y": 32 },
+      { "flags": 4, "matrix": [2, 2], "x": 34,  "y": 32 },
+      { "flags": 4, "matrix": [2, 1], "x": 17,  "y": 32 },
+      { "flags": 1, "matrix": [2, 0], "x": 0,  "y": 32 },
       { "flags": 1, "matrix": [3, 0], "x": 0,  "y": 48 },
       { "flags": 4, "matrix": [3, 1], "x": 17,  "y": 48 },
       { "flags": 4, "matrix": [3, 2], "x": 34,  "y": 48 },
       { "flags": 4, "matrix": [3, 3], "x": 51,  "y": 48 },
       { "flags": 4, "matrix": [3, 4], "x": 68,  "y": 48 },
       { "flags": 4, "matrix": [3, 5], "x": 86,  "y": 48 },
-      { "flags": 4, "matrix": [4, 5], "x": 103,  "y": 48 },
-      { "flags": 4, "matrix": [9, 5], "x": 120,  "y": 48 },
-      { "flags": 4, "matrix": [8, 5], "x": 137,  "y": 48 },
-      { "flags": 4, "matrix": [8, 4], "x": 155,  "y": 48 },
-      { "flags": 4, "matrix": [8, 3], "x": 172,  "y": 48 },
-      { "flags": 4, "matrix": [8, 2], "x": 189,  "y": 48 },
+      { "flags": 4, "matrix": [4, 5], "x": 103,  "y": 40 },
+      { "flags": 1, "matrix": [4, 4], "x": 96,  "y": 64 },
+      { "flags": 1, "matrix": [4, 3], "x": 77,  "y": 64 },
+      { "flags": 1, "matrix": [4, 2], "x": 60,  "y": 64 },
+      { "flags": 1, "matrix": [4, 1], "x": 43,  "y": 64 },
+      { "flags": 2, "x": 137, "y": 55 },
+      { "flags": 2, "x": 172, "y": 55 },
+      { "flags": 2, "x": 206, "y": 40 },
+      { "flags": 2, "x": 206, "y": 10 },
+      { "flags": 2, "x": 172, "y": 10 },
+      { "flags": 2, "x": 137, "y": 10 },
+      { "flags": 4, "matrix": [5, 5], "x": 137,  "y": 0 },
+      { "flags": 4, "matrix": [5, 4], "x": 155,  "y": 0 },
+      { "flags": 4, "matrix": [5, 3], "x": 172,  "y": 0 },
+      { "flags": 4, "matrix": [5, 2], "x": 189,  "y": 0 },
+      { "flags": 4, "matrix": [5, 1], "x": 206,  "y": 0 },
+      { "flags": 1, "matrix": [5, 0], "x": 224,  "y": 0 },
+      { "flags": 1, "matrix": [6, 0], "x": 224,  "y": 16 },
+      { "flags": 4, "matrix": [6, 1], "x": 206,  "y": 16 },
+      { "flags": 4, "matrix": [6, 2], "x": 189,  "y": 16 },
+      { "flags": 4, "matrix": [6, 3], "x": 172,  "y": 16 },
+      { "flags": 4, "matrix": [6, 4], "x": 155,  "y": 16 },
+      { "flags": 4, "matrix": [6, 5], "x": 137,  "y": 16 },
+      { "flags": 4, "matrix": [7, 5], "x": 137,  "y": 32 },
+      { "flags": 4, "matrix": [7, 4], "x": 155,  "y": 32 },
+      { "flags": 4, "matrix": [7, 3], "x": 172,  "y": 32 },
+      { "flags": 4, "matrix": [7, 2], "x": 189,  "y": 32 },
+      { "flags": 4, "matrix": [7, 1], "x": 206,  "y": 32 },
+      { "flags": 1, "matrix": [7, 0], "x": 224,  "y": 32 },
+      { "flags": 1, "matrix": [8, 0], "x": 224,  "y": 48 },
       { "flags": 4, "matrix": [8, 1], "x": 206,  "y": 48 },
-      { "flags": 1, "matrix": [8, 4], "x": 224,  "y": 48 },
-      { "flags": 1, "matrix": [4, 1], "x": 34,  "y": 64 },
-      { "flags": 1, "matrix": [4, 2], "x": 51,  "y": 64 },
-      { "flags": 1, "matrix": [4, 3], "x": 68,  "y": 64 },
-      { "flags": 1, "matrix": [4, 4], "x": 86,  "y": 64 },
-      { "flags": 1, "matrix": [9, 4], "x": 137,  "y": 64 },
-      { "flags": 1, "matrix": [9, 3], "x": 155,  "y": 64 },
-      { "flags": 1, "matrix": [9, 2], "x": 172,  "y": 64 },
-      { "flags": 1, "matrix": [9, 1], "x": 189,  "y": 64 }
+      { "flags": 4, "matrix": [8, 2], "x": 189,  "y": 48 },
+      { "flags": 4, "matrix": [8, 3], "x": 172,  "y": 48 },
+      { "flags": 4, "matrix": [8, 4], "x": 155,  "y": 48 },
+      { "flags": 4, "matrix": [8, 5], "x": 137,  "y": 48 },
+      { "flags": 4, "matrix": [9, 5], "x": 120,  "y": 40 },
+      { "flags": 1, "matrix": [9, 4], "x": 127,  "y": 64 },
+      { "flags": 1, "matrix": [9, 3], "x": 146,  "y": 64 },
+      { "flags": 1, "matrix": [9, 2], "x": 163,  "y": 64 },
+      { "flags": 1, "matrix": [9, 1], "x": 180,  "y": 64 }
     ]
   },
   "layouts": {

From 41fdf32afb34e09946822c2aebcf26915e9c6d2a Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Mon, 19 Sep 2022 15:26:29 -0400
Subject: [PATCH 393/959] Add encoder map to Quefrency VIA keymap (#18380)

* Add encoder map to Quefrency VIA keymap

* Explicitly define which RGB animations are enabled

* Set different PID to prep for different VIA .json usage

* Add ifdefs to handle if ENCODER_ENABLE is set to NO
---
 keyboards/keebio/quefrency/keymaps/via/keymap.c |  9 +++++++++
 keyboards/keebio/quefrency/keymaps/via/rules.mk |  1 +
 keyboards/keebio/quefrency/rev2/config.h        | 11 ++++++++++-
 keyboards/keebio/quefrency/rev2/rev2.c          |  2 ++
 keyboards/keebio/quefrency/rev3/config.h        | 11 ++++++++++-
 keyboards/keebio/quefrency/rev3/info.json       |  4 ++--
 keyboards/keebio/quefrency/rev3/rev3.c          |  2 ++
 keyboards/keebio/quefrency/rev4/config.h        | 11 ++++++++++-
 keyboards/keebio/quefrency/rev4/info.json       |  4 ++--
 keyboards/keebio/quefrency/rev4/rev4.c          |  2 ++
 keyboards/keebio/quefrency/rev5/info.json       |  4 ++--
 keyboards/keebio/quefrency/rev5/rev5.c          |  2 ++
 12 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/keyboards/keebio/quefrency/keymaps/via/keymap.c b/keyboards/keebio/quefrency/keymaps/via/keymap.c
index 5ac83ef57c..ad6cfd84eb 100644
--- a/keyboards/keebio/quefrency/keymaps/via/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/via/keymap.c
@@ -33,3 +33,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
 };
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+    [3] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif
diff --git a/keyboards/keebio/quefrency/keymaps/via/rules.mk b/keyboards/keebio/quefrency/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/keebio/quefrency/keymaps/via/rules.mk
+++ b/keyboards/keebio/quefrency/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h
index e92be73444..30044f174f 100644
--- a/keyboards/keebio/quefrency/rev2/config.h
+++ b/keyboards/keebio/quefrency/rev2/config.h
@@ -46,10 +46,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 // Set 65% column (option 3) and Macro (option 4) on by default
 #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c
index 590c9850c2..d2badbeb25 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.c
+++ b/keyboards/keebio/quefrency/rev2/rev2.c
@@ -31,6 +31,7 @@ void eeconfig_init_kb(void) {
     eeconfig_init_user();
 }
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -48,3 +49,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif
diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h
index e92be73444..30044f174f 100644
--- a/keyboards/keebio/quefrency/rev3/config.h
+++ b/keyboards/keebio/quefrency/rev3/config.h
@@ -46,10 +46,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 // Set 65% column (option 3) and Macro (option 4) on by default
 #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
index 8bea44183f..5baacbb4de 100644
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ b/keyboards/keebio/quefrency/rev3/info.json
@@ -5,8 +5,8 @@
     "maintainer": "nooges",
     "usb": {
         "vid": "0xCB10",
-        "pid": "0x3257",
-        "device_version": "3.0.0"
+        "pid": "0x3357",
+        "device_version": "3.1.0"
     },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60"
diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c
index 0f8f964d92..8911dbd018 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.c
+++ b/keyboards/keebio/quefrency/rev3/rev3.c
@@ -47,6 +47,7 @@ void eeconfig_init_kb(void) {
     eeconfig_init_user();
 }
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -64,3 +65,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif
diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h
index d92a81de93..f047ffbdf0 100644
--- a/keyboards/keebio/quefrency/rev4/config.h
+++ b/keyboards/keebio/quefrency/rev4/config.h
@@ -46,8 +46,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index 198e84a592..8cc78205ea 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -5,8 +5,8 @@
     "maintainer": "nooges",
     "usb": {
         "vid": "0xCB10",
-        "pid": "0x4257",
-        "device_version": "4.0.0"
+        "pid": "0x4357",
+        "device_version": "4.1.0"
     },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60"
diff --git a/keyboards/keebio/quefrency/rev4/rev4.c b/keyboards/keebio/quefrency/rev4/rev4.c
index 190135420f..66d73a934a 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.c
+++ b/keyboards/keebio/quefrency/rev4/rev4.c
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quefrency.h"
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -33,3 +34,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
index 053551e30f..c7cc7b4bd2 100644
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -5,8 +5,8 @@
     "maintainer": "nooges",
     "usb": {
         "vid": "0xCB10",
-        "pid": "0x5257",
-        "device_version": "5.0.0"
+        "pid": "0x5357",
+        "device_version": "5.1.0"
     },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60"
diff --git a/keyboards/keebio/quefrency/rev5/rev5.c b/keyboards/keebio/quefrency/rev5/rev5.c
index 190135420f..66d73a934a 100644
--- a/keyboards/keebio/quefrency/rev5/rev5.c
+++ b/keyboards/keebio/quefrency/rev5/rev5.c
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quefrency.h"
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -33,3 +34,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif

From 5a563444ac3c018620e020e507b34377169e1b63 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 20 Sep 2022 02:14:43 +0200
Subject: [PATCH 394/959] Update ChibiOS to latest 21.11.2 (#18428)

This includes a hotfix for RP2040 deadlocks due to XIP cache misses in
the ChibiOS virtual timer implementation.
---
 lib/chibios | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chibios b/lib/chibios
index f836d24b06..0e9d558b52 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit f836d24b06d7265696a33d1cea010bd6a931791d
+Subproject commit 0e9d558b525a8f28285f3bb509fd48a897c43151

From 100cf3db3a14b4d841bf55e53aba5b54036f67af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jimmy=20Sj=C3=B6lund?= <jimmy@sjolund.se>
Date: Tue, 20 Sep 2022 08:19:51 +0200
Subject: [PATCH 395/959] [Keymap] Added Kyria keyboard to jimmysjolund
 (#18335)

---
 .../planck/keymaps/jimmysjolund/keymap.c      |  40 +--
 .../kyria/keymaps/jimmysjolund/config.h       |  20 ++
 .../kyria/keymaps/jimmysjolund/keymap.c       | 257 ++++++++++++++++++
 .../kyria/keymaps/jimmysjolund/rules.mk       |   4 +
 4 files changed, 302 insertions(+), 19 deletions(-)
 create mode 100644 keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
 create mode 100644 keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
 create mode 100644 keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk

diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
index f3439096e3..91aaa0fa00 100644
--- a/keyboards/planck/keymaps/jimmysjolund/keymap.c
+++ b/keyboards/planck/keymaps/jimmysjolund/keymap.c
@@ -53,23 +53,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-/* Qwerty - jimmysjolund 2022-02-06
+/* Qwerty - jimmysjolund 2022-09-17
  * ,-----------------------------------------------------------------------------------.
- * | `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Raise |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |Lower |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Tab  | GUI  |Shift | Bksp | Ctrl |Enter |Space |AltGr | Alt  | Down |  Up  |
+ * |Raise |Ctrl+ | GUI  |Shift |Bksp/ |Lower |Enter |Space |AltGr | Alt  | Left |Right |
+ * |      | Alt  |      |      | Ctrl |      |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 
 [_QWERTY] = LAYOUT_planck_grid(
-    KC_GRV,  KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_DEL,
-    RAISE,   KC_A,    KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+    KC_ESC,  KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_BSPC,
+    KC_TAB,   KC_A,    KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
     LOWER,   KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
-    KC_ESC,  KC_TAB,  KC_LGUI,  KC_LSFT,  KC_BSPC,  KC_LCTL,  KC_ENT,  KC_SPC,  KC_ALGR,  KC_LALT,  KC_DOWN,  KC_UP
+    RAISE,  LCTL(KC_LALT),  KC_LGUI,  KC_LSFT, LCTL_T(KC_BSPC), LOWER,  KC_ENT,  KC_SPC,  KC_ALGR,  KC_LALT,  KC_LEFT,  KC_RGHT
 ),
 
 /* Colemak Original
@@ -85,20 +86,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 /* Colemak jimmysjolund
  * ,-----------------------------------------------------------------------------------.
- * |  `   |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
+ * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Raise |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * | Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |Lower |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Tab  | GUI  |Shift | Bksp | Ctrl |Enter |Space |AltGr | Alt  | Down |  Up  |
+ * |Raise |Ctrl+ | GUI  |Shift |Bksp/ |Lower |Enter |Space |AltGr | Alt  | Left |Right |
+ * |      | Alt  |      |      | Ctrl |      |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_COLEMAK] = LAYOUT_planck_grid(
-    KC_GRV, KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-    RAISE,  KC_A,   KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_ESC, KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    KC_TAB,  KC_A,   KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
     LOWER,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_ENT,  KC_SPC,  KC_ALGR, KC_LALT, KC_DOWN, KC_UP
+    RAISE, LCTL(KC_LALT), KC_LGUI, KC_LSFT, LCTL_T(KC_BSPC), LOWER, KC_ENT,  KC_SPC,  KC_ALGR, KC_LALT, KC_LEFT, KC_RGHT
 ),
 
 /* Dvorak
@@ -119,21 +121,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
-/* Lower
+/* Lower - Jimmy Sjölund 2022-09-19
  * ,-----------------------------------------------------------------------------------.
  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * | Del  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   +  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |   |  |   \  |  :   |   ;  |   -  |   [  |   ]  |   _  |   ,  |   .  |   /  |   ?  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_planck_grid(
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_DEL,  KC_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_DEL,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
+    KC_PIPE, KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT,  KC_SLSH, KC_QUES,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 ),
 
@@ -188,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
 )
 
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h b/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
new file mode 100644
index 0000000000..217e97f931
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// Lets you roll mod-tap keys
+#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c b/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
new file mode 100644
index 0000000000..9e5224b28d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
@@ -0,0 +1,257 @@
+/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY = 0,
+    _DVORAK,
+    _COLEMAK_DH,
+    _NAV,
+    _SYM,
+    _FUNCTION,
+    _ADJUST,
+};
+
+
+// Aliases for readability
+#define QWERTY   DF(_QWERTY)
+#define COLEMAK  DF(_COLEMAK_DH)
+#define DVORAK   DF(_DVORAK)
+
+#define SYM      MO(_SYM)
+#define NAV      MO(_NAV)
+#define FKEYS    MO(_FUNCTION)
+#define ADJUST   MO(_ADJUST)
+
+#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
+#define CTL_QUOT MT(MOD_RCTL, KC_QUOTE)
+#define CTL_MINS MT(MOD_RCTL, KC_MINUS)
+#define ALT_ENT  MT(MOD_LALT, KC_ENT)
+
+// Note: LAlt/Enter (ALT_ENT) is not the same thing as the keyboard shortcut Alt+Enter.
+// The notation `mod/tap` denotes a key that activates the modifier `mod` when held down, and
+// produces the key `tap` when tapped (i.e. pressed and released).
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * Base Layer: QWERTY
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |Ctrl/' "|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  | [ {  |CapsLk|  |F-keys|  ] } |   N  |   M  | ,  < | . >  | /  ? | RShift |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
+ *                        |      |      | Enter|      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+
+/*
+ * jimmysjolund 2022-09-13
+ *
+ * Base Layer: QWERTY
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |  Tab   |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |  Nav   |   Z  |   X  |   C  |   V  |   B  | [ {  | Alt  |  | Nav  |  ] } |   N  |   M  | ,  < | . >  | /  ? | Adjust |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Ctrl+ | LGUI | Shift|Bksp/ | Sym  |  |Enter | Space| AltGr|  ←   |  →   |
+ *                        |  Alt |      |      | Ctrl |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+
+
+
+
+    [_QWERTY] = LAYOUT(
+     KC_ESC , KC_Q ,  KC_W   ,  KC_E  ,   KC_R ,   KC_T ,                                        KC_Y,   KC_U ,  KC_I ,   KC_O ,  KC_P , KC_BSPC,
+     KC_TAB , KC_A ,  KC_S   ,  KC_D  ,   KC_F ,   KC_G ,                                        KC_H,   KC_J ,  KC_K ,   KC_L ,KC_SCLN, KC_QUOT,
+     NAV    , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , KC_LBRC, KC_LALT,               NAV , KC_RBRC, KC_N,   KC_M ,KC_COMM, KC_DOT ,KC_SLSH, ADJUST,
+                                LCTL(KC_LALT) , KC_LGUI, KC_LSFT, LCTL_T(KC_BSPC), SYM,     KC_ENT, KC_SPC ,KC_ALGR, KC_LEFT, KC_RGHT
+    ),
+
+/*
+ * Base Layer: Dvorak
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Tab   | ' "  | , <  | . >  |   P  |   Y  |                              |   F  |   G  |   C  |   R  |   L  |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Ctrl/Esc|   A  |   O  |   E  |   U  |   I  |                              |   D  |   H  |   T  |   N  |   S  |Ctrl/- _|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * | LShift | ; :  |   Q  |   J  |   K  |   X  | [ {  |CapsLk|  |F-keys|  ] } |   B  |   M  |   W  |   V  |   Z  | RShift |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
+ *                        |      |      | Enter|      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_DVORAK] = LAYOUT(
+     KC_TAB  ,KC_QUOTE,KC_COMM,  KC_DOT,   KC_P ,   KC_Y ,                                        KC_F,   KC_G ,  KC_C ,   KC_R ,  KC_L , KC_BSPC,
+     CTL_ESC , KC_A ,  KC_O   ,  KC_E  ,   KC_U ,   KC_I ,                                        KC_D,   KC_H ,  KC_T ,   KC_N ,  KC_S , CTL_MINS,
+     KC_LSFT ,KC_SCLN, KC_Q   ,  KC_J  ,   KC_K ,   KC_X , KC_LBRC,KC_CAPS,     FKEYS  , KC_RBRC, KC_B,   KC_M ,  KC_W ,   KC_V ,  KC_Z , KC_RSFT,
+                                 ADJUST, KC_LGUI, ALT_ENT, KC_SPC , NAV   ,     SYM    , KC_SPC ,KC_RALT, KC_RGUI, KC_APP
+    ),
+
+/*
+ * Base Layer: Colemak DH
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Tab   |   Q  |   W  |   F  |   P  |   B  |                              |   J  |   L  |   U  |   Y  | ;  : |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Ctrl/Esc|   A  |   R  |   S  |   T  |   G  |                              |   M  |   N  |   E  |   I  |   O  |Ctrl/' "|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   D  |   V  | [ {  |CapsLk|  |F-keys|  ] } |   K  |   H  | ,  < | . >  | /  ? | RShift |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
+ *                        |      |      | Enter|      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+
+/*
+ * jimmysjolund 2022-09-10
+ * Base Layer: Colemak DH
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Esc   |   Q  |   W  |   F  |   P  |   G  |                              |   J  |   L  |   U  |   Y  | ;  : |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |  Tab   |   A  |   R  |   S  |   T  |   D  |                              |   H  |   N  |   E  |   I  |   O  |Ctrl/' "|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |  Sym   |   Z  |   X  |   C  |   V  |   B  | [ {  | Alt  |  |  Nav |  ] } |   K  |   M  | ,  < | . >  | /  ? | RShift |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust| LGUI |LShift| Bksp | Ctrl |  | Enter| Space| AltGr|  ←   |  →   |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+
+
+    [_COLEMAK_DH] = LAYOUT(
+     KC_ESC  , KC_Q ,  KC_W   ,  KC_F  ,   KC_P ,   KC_G ,                                        KC_J,   KC_L ,  KC_U ,   KC_Y ,KC_SCLN, KC_BSPC,
+     KC_TAB  , KC_A ,  KC_R   ,  KC_S  ,   KC_T ,   KC_D ,                                        KC_H,   KC_N ,  KC_E ,   KC_I ,  KC_O , CTL_QUOT,
+     SYM     , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , KC_LBRC, KC_LALT,     NAV    , KC_RBRC, KC_K,   KC_M ,KC_COMM, KC_DOT ,KC_SLSH, KC_RSFT,
+                                 ADJUST, KC_LGUI, KC_LSFT, KC_BSPC ,KC_LCTL,    KC_ENT , KC_SPC ,KC_ALGR, KC_LEFT, KC_RGHT
+    ),
+
+/*
+ * Nav Layer: Media, navigation
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |      |      |      |      |      |                              | PgUp | Home |   ↑  | End  | VolUp| Delete |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        |  GUI |  Alt | Ctrl | Shift|      |                              | PgDn |  ←   |   ↓  |   →  | VolDn| Insert |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |ScLck |  |      |      | Pause|M Prev|M Play|M Next|VolMut| PrtSc  |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_NAV] = LAYOUT(
+      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
+      _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
+      _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Sym Layer: Numbers and symbols
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |    `   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   =    |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |    ~   |  !   |  @   |  #   |  $   |  %   |                              |   ^  |  &   |  *   |  (   |  )   |   +    |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |      |  |      |   }  |   ]  |  _   |  ,   |  .   |  /   |   ?    |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_SYM] = LAYOUT(
+      KC_GRV ,   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                       KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , KC_EQL ,
+     KC_TILD , KC_EXLM,  KC_AT , KC_HASH,  KC_DLR, KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
+     KC_PIPE , KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, _______, _______, KC_RCBR, KC_RBRC, KC_UNDS, KC_COMM,  KC_DOT, KC_SLSH, KC_QUES,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Function Layer: Function keys
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |  F9  | F10  | F11  | F12  |      |                              |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        |  F5  |  F6  |  F7  |  F8  |      |                              |      | Shift| Ctrl |  Alt |  GUI |        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |  F1  |  F2  |  F3  |  F4  |      |      |      |  |      |      |      |      |      |      |      |        |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_FUNCTION] = LAYOUT(
+      _______,  KC_F9 ,  KC_F10,  KC_F11,  KC_F12, _______,                                     _______, _______, _______, _______, _______, _______,
+      _______,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 , _______,                                     _______, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
+      _______,  KC_F1 ,  KC_F2 ,  KC_F3 ,  KC_F4 , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Adjust Layer: Default layer settings, RGB
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |      |      |QWERTY|      |      |                              |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  |        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD |        |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_ADJUST] = LAYOUT(
+      _______, _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, _______,
+      _______, _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, _______,
+      _______, _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, _______,
+                                 _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
+    ),
+
+// /*
+//  * Layer template
+//  *
+//  * ,-------------------------------------------.                              ,-------------------------------------------.
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
+//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        `----------------------------------'  `----------------------------------'
+//  */
+//     [_LAYERINDEX] = LAYOUT(
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+//     ),
+};
+
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk b/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
new file mode 100644
index 0000000000..35f8ec90c6
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
@@ -0,0 +1,4 @@
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306   # Enables the use of OLED displays
+ENCODER_ENABLE = yes       # Enables the use of one or more encoders
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow

From 456d6f33426946d632ed52a3278b5fcd0c398644 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 20 Sep 2022 07:52:43 +0100
Subject: [PATCH 396/959] Remove legacy keycodes from unit tests (#18430)

---
 .../default_mod_tap/test_tap_hold.cpp                |  2 +-
 .../permissive_hold/test_tap_hold.cpp                | 12 ++++++------
 .../retro_tapping/test_tap_hold.cpp                  |  2 +-
 .../tapping_force_hold/test_tap_hold.cpp             |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
index e798265623..b70efe4aed 100644
--- a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
@@ -213,7 +213,7 @@ TEST_F(DefaultTapHold, tap_and_hold_mod_tap_hold_key) {
     set_keymap({mod_tap_hold_key});
 
     /* Press mod-tap-hold key. */
-    EXPECT_REPORT(driver, (KC_LSHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
     mod_tap_hold_key.press();
     idle_for(TAPPING_TERM + 1);
     testing::Mock::VerifyAndClearExpectations(&driver);
diff --git a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
index ef8d9a9c7f..74e81f347f 100644
--- a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
@@ -46,9 +46,9 @@ TEST_F(PermissiveHold, tap_regular_key_while_mod_tap_key_is_held) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release regular key */
-    EXPECT_REPORT(driver, (KC_LSHIFT));
-    EXPECT_REPORT(driver, (KC_LSHIFT, regular_key.report_code));
-    EXPECT_REPORT(driver, (KC_LSHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT, regular_key.report_code));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
     regular_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
@@ -81,9 +81,9 @@ TEST_F(PermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release second mod-tap-hold key */
-    EXPECT_REPORT(driver, (KC_LSHIFT));
-    EXPECT_REPORT(driver, (KC_LSHIFT, second_mod_tap_hold_key.report_code));
-    EXPECT_REPORT(driver, (KC_LSHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT, second_mod_tap_hold_key.report_code));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
     second_mod_tap_hold_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
diff --git a/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp b/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp
index dc0de0e44d..e08c600dbd 100644
--- a/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp
@@ -42,7 +42,7 @@ TEST_F(RetroTapping, tap_and_hold_mod_tap_hold_key) {
 
     /* Release mod-tap-hold key. */
     /* TODO: Why is LSHIFT send at all? */
-    EXPECT_REPORT(driver, (KC_LSHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
     EXPECT_EMPTY_REPORT(driver);
     EXPECT_REPORT(driver, (KC_P));
     EXPECT_EMPTY_REPORT(driver);
diff --git a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
index 2671862f2d..604f9a4a54 100644
--- a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
@@ -205,7 +205,7 @@ TEST_F(TappingForceHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release mod-tap-hold key. */
-    EXPECT_REPORT(driver, (KC_LSHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
     EXPECT_EMPTY_REPORT(driver);
     mod_tap_hold_key.release();
     run_one_scan_loop();

From 881aab9e76d4cab5b1c58548cb47ff4a2c8868cb Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 20 Sep 2022 08:54:43 +0200
Subject: [PATCH 397/959] Stabilize Half-duplex PIO split comms take 2 (#18421)

...by moving the actually timing critical `enter_rx_state()` and
`leave_rx_state()` functions to RAM in order to not be affected by XIP
cache spikes. This commit also reverts the hacky USB interrupt disabling
that was done in 293c53d774
---
 .../drivers/vendor/RP/RP2040/serial_vendor.c    | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
index 764764b3f9..afd7e65ad8 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
@@ -140,9 +140,8 @@ void pio_serve_interrupt(void) {
 // strength is chosen because the transmitting side must still be able to drive
 // the signal low. With this configuration the rise times are fast enough and
 // the generated low level with 360mV will generate a logical zero.
-static inline void enter_rx_state(void) {
+static void __no_inline_not_in_flash_func(enter_rx_state)(void) {
     osalSysLock();
-    nvicEnableVector(RP_USBCTRL_IRQ_NUMBER, RP_IRQ_USB0_PRIORITY);
     // Wait for the transmitting state machines FIFO to run empty. At this point
     // the last byte has been pulled from the transmitting state machines FIFO
     // into the output shift register. We have to wait a tiny bit more until
@@ -162,11 +161,8 @@ static inline void enter_rx_state(void) {
     osalSysUnlock();
 }
 
-static inline void leave_rx_state(void) {
+static void __no_inline_not_in_flash_func(leave_rx_state)(void) {
     osalSysLock();
-    // We don't want to be interrupted by frequent (1KHz) USB interrupts while
-    // doing our timing critical sending operation.
-    nvicDisableVector(RP_USBCTRL_IRQ_NUMBER);
     // In Half-duplex operation the tx pin dual-functions as sender and
     // receiver. To not receive the data we will send, we disable the receiving
     // state machine.
@@ -198,11 +194,6 @@ static inline msg_t sync_tx(sysinterval_t timeout) {
     msg_t msg = MSG_OK;
     osalSysLock();
     while (pio_sm_is_tx_fifo_full(pio, tx_state_machine)) {
-#if !defined(SERIAL_USART_FULL_DUPLEX)
-        // Enable USB interrupts again, because we might sleep for a long time
-        // here and don't want to be disconnected from the host.
-        nvicEnableVector(RP_USBCTRL_IRQ_NUMBER, RP_IRQ_USB0_PRIORITY);
-#endif
         pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + tx_state_machine, true);
         msg = osalThreadSuspendTimeoutS(&tx_thread, timeout);
         if (msg < MSG_OK) {
@@ -210,10 +201,6 @@ static inline msg_t sync_tx(sysinterval_t timeout) {
             break;
         }
     }
-#if !defined(SERIAL_USART_FULL_DUPLEX)
-    // Entering timing critical territory again.
-    nvicDisableVector(RP_USBCTRL_IRQ_NUMBER);
-#endif
     osalSysUnlock();
     return msg;
 }

From b0f824755a1239a5ee6285a8930f6521f3924869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?=
 <alvaro.augusto.volpato@gmail.com>
Date: Tue, 20 Sep 2022 15:43:49 -0300
Subject: [PATCH 398/959] Update Apollo PCBs to use wear levelling code
 (#18411)

---
 keyboards/acheron/apollo/87h/delta/config.h  | 4 ----
 keyboards/acheron/apollo/87h/delta/halconf.h | 4 +---
 keyboards/acheron/apollo/87h/delta/mcuconf.h | 3 ---
 keyboards/acheron/apollo/87h/delta/rules.mk  | 3 ++-
 keyboards/acheron/apollo/87h/gamma/config.h  | 4 ----
 keyboards/acheron/apollo/87h/gamma/gamma.c   | 6 ------
 keyboards/acheron/apollo/87h/gamma/halconf.h | 3 ---
 keyboards/acheron/apollo/87h/gamma/mcuconf.h | 6 ------
 keyboards/acheron/apollo/87h/gamma/rules.mk  | 3 ++-
 keyboards/acheron/apollo/87htsc/halconf.h    | 2 --
 keyboards/acheron/apollo/87htsc/mcuconf.h    | 3 ---
 keyboards/acheron/apollo/87htsc/rules.mk     | 3 +++
 keyboards/acheron/apollo/88htsc/88htsc.c     | 5 -----
 keyboards/acheron/apollo/88htsc/halconf.h    | 2 --
 keyboards/acheron/apollo/88htsc/mcuconf.h    | 3 ---
 keyboards/acheron/apollo/88htsc/rules.mk     | 4 +++-
 16 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 85909af208..5df3628db2 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define EEPROM_I2C_24LC256
-//#define I2C1_CLOCK_SPEED 400000
-//#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define RGB_DI_PIN B15
diff --git a/keyboards/acheron/apollo/87h/delta/halconf.h b/keyboards/acheron/apollo/87h/delta/halconf.h
index 9379352e8e..691c0552a3 100644
--- a/keyboards/acheron/apollo/87h/delta/halconf.h
+++ b/keyboards/acheron/apollo/87h/delta/halconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2022 QMK
+/* Copyright 2022 Gondolindrim <gondolindrim@acheronproject.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define HAL_USE_I2C TRUE
-
 #define HAL_USE_PWM TRUE
 #define HAL_USE_PAL TRUE
 
diff --git a/keyboards/acheron/apollo/87h/delta/mcuconf.h b/keyboards/acheron/apollo/87h/delta/mcuconf.h
index 29a62a94c2..652fecfc8a 100644
--- a/keyboards/acheron/apollo/87h/delta/mcuconf.h
+++ b/keyboards/acheron/apollo/87h/delta/mcuconf.h
@@ -18,9 +18,6 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
-
 #undef STM32_PWM_USE_ADVANCED
 #define STM32_PWM_USE_ADVANCED TRUE
 
diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk
index c519425408..814a3f15f0 100644
--- a/keyboards/acheron/apollo/87h/delta/rules.mk
+++ b/keyboards/acheron/apollo/87h/delta/rules.mk
@@ -19,7 +19,8 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-EEPROM_DRIVER = i2c
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = legacy
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 89f9a85d24..21fe929409 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define EEPROM_I2C_24LC256
-//#define I2C1_CLOCK_SPEED 400000
-//#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 // RGB Matrix defines
diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c
index 72182d4f2a..babad3c11c 100644
--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "gamma.h"
 
-void board_init(void) {
-    setPinInput(B9);
-    setPinInput(B10);
-}
-
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 /* Refer to IS31 manual for these locations
@@ -126,7 +121,6 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 
 };
 
-
 led_config_t g_led_config = { {
     { 0        , 1          , 2          , 3          , 4          , 5          , 6          , 7          , 8          , 9          , 10         , 11         , 12         , 13         , 14         , 15        },
     { 16       , 17         , 18         , 19         , 20         , 21         , 22         , 23         , 24         , 25         , 26         , 27         , 28         , 29         , 30         , 31        },
diff --git a/keyboards/acheron/apollo/87h/gamma/halconf.h b/keyboards/acheron/apollo/87h/gamma/halconf.h
index 957fe10f42..2e098f5113 100644
--- a/keyboards/acheron/apollo/87h/gamma/halconf.h
+++ b/keyboards/acheron/apollo/87h/gamma/halconf.h
@@ -18,7 +18,4 @@
 
 #define HAL_USE_I2C TRUE
 
-// #define HAL_USE_PWM TRUE
-// #define HAL_USE_PAL TRUE
-
 #include_next <halconf.h>
diff --git a/keyboards/acheron/apollo/87h/gamma/mcuconf.h b/keyboards/acheron/apollo/87h/gamma/mcuconf.h
index 0113e71378..9cf24d5bcd 100644
--- a/keyboards/acheron/apollo/87h/gamma/mcuconf.h
+++ b/keyboards/acheron/apollo/87h/gamma/mcuconf.h
@@ -20,9 +20,3 @@
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
-
-// #undef STM32_PWM_USE_ADVANCED
-// #define STM32_PWM_USE_ADVANCED TRUE
-
-// #undef STM32_PWM_USE_TIM1
-// #define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
index 4ba14045bb..c05ab3c41a 100644
--- a/keyboards/acheron/apollo/87h/gamma/rules.mk
+++ b/keyboards/acheron/apollo/87h/gamma/rules.mk
@@ -20,7 +20,8 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = IS31FL3741
 KEYBOARD_SHARED_EP = yes
-EEPROM_DRIVER = i2c
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = legacy
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87htsc/halconf.h b/keyboards/acheron/apollo/87htsc/halconf.h
index 9379352e8e..09240969ab 100644
--- a/keyboards/acheron/apollo/87htsc/halconf.h
+++ b/keyboards/acheron/apollo/87htsc/halconf.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define HAL_USE_I2C TRUE
-
 #define HAL_USE_PWM TRUE
 #define HAL_USE_PAL TRUE
 
diff --git a/keyboards/acheron/apollo/87htsc/mcuconf.h b/keyboards/acheron/apollo/87htsc/mcuconf.h
index 29a62a94c2..652fecfc8a 100644
--- a/keyboards/acheron/apollo/87htsc/mcuconf.h
+++ b/keyboards/acheron/apollo/87htsc/mcuconf.h
@@ -18,9 +18,6 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
-
 #undef STM32_PWM_USE_ADVANCED
 #define STM32_PWM_USE_ADVANCED TRUE
 
diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk
index 696b529919..f2becf4db4 100644
--- a/keyboards/acheron/apollo/87htsc/rules.mk
+++ b/keyboards/acheron/apollo/87htsc/rules.mk
@@ -19,5 +19,8 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
+
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = legacy
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/88htsc/88htsc.c b/keyboards/acheron/apollo/88htsc/88htsc.c
index 88e0815b3f..574e1829de 100644
--- a/keyboards/acheron/apollo/88htsc/88htsc.c
+++ b/keyboards/acheron/apollo/88htsc/88htsc.c
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "88htsc.h"
 
-void board_init(void) {
-    setPinInput(B9);
-    setPinInput(B10);
-}
-
 led_config_t g_led_config = { {
 	{ 16       , 15         , 14         , 13         , 12         , 11         , 10         , 9          , 8          , 7          , 6          , 5          , 4          , 3          , 2          , 1          , 0         },
 	{ 17       , 18         , 19         , 20         , 21         , 22         , 23         , 24         , 25         , 26         , 27         , 28         , 29         , 30         , 31         , 32         , 33        },
diff --git a/keyboards/acheron/apollo/88htsc/halconf.h b/keyboards/acheron/apollo/88htsc/halconf.h
index 9379352e8e..09240969ab 100644
--- a/keyboards/acheron/apollo/88htsc/halconf.h
+++ b/keyboards/acheron/apollo/88htsc/halconf.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define HAL_USE_I2C TRUE
-
 #define HAL_USE_PWM TRUE
 #define HAL_USE_PAL TRUE
 
diff --git a/keyboards/acheron/apollo/88htsc/mcuconf.h b/keyboards/acheron/apollo/88htsc/mcuconf.h
index 29a62a94c2..652fecfc8a 100644
--- a/keyboards/acheron/apollo/88htsc/mcuconf.h
+++ b/keyboards/acheron/apollo/88htsc/mcuconf.h
@@ -18,9 +18,6 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
-
 #undef STM32_PWM_USE_ADVANCED
 #define STM32_PWM_USE_ADVANCED TRUE
 
diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk
index c519425408..18e8b33b07 100644
--- a/keyboards/acheron/apollo/88htsc/rules.mk
+++ b/keyboards/acheron/apollo/88htsc/rules.mk
@@ -19,7 +19,9 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-EEPROM_DRIVER = i2c
+
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = legacy
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

From 89a1374ef48869505d9185559f588a49b8b0b23b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 21 Sep 2022 09:45:07 +1000
Subject: [PATCH 399/959] Add DD mapping for LED/RGB Matrix center (#18432)

---
 data/mappings/info_config.json        |  2 ++
 data/schemas/keyboard.jsonschema      | 12 ++++++++++++
 keyboards/adm42/rev4/config.h         |  1 -
 keyboards/yandrstudio/nz67v2/config.h |  1 -
 keyboards/yandrstudio/tg67/config.h   |  1 -
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index e1dbb27a6c..b27081e037 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -38,6 +38,7 @@
     "LED_COMPOSE_PIN": {"info_key": "indicators.compose"},
     "LED_KANA_PIN": {"info_key": "indicators.kana"},
     "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"},
+    "LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"},
     "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
     "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
     "LED_MATRIX_HUE_STEP": {"info_key": "led_matrix.hue_steps", "value_type": "int"},
@@ -83,6 +84,7 @@
     "RGBLIGHT_VAL_STEP": {"info_key": "rgblight.brightness_steps", "value_type": "int"},
     "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"},
     "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},
+    "RGB_MATRIX_CENTER": {"info_key": "rgb_matrix.center_point", "value_type": "array.int"},
     "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"},
     "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
     "RGB_MATRIX_HUE_STEP": {"info_key": "rgb_matrix.hue_steps", "value_type": "int"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 60381a21a0..ff5163e737 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -265,6 +265,12 @@
             "type": "object",
             "properties": {
                 "driver": {"type": "string"},
+                "center_point": {
+                    "type": "array",
+                    "minItems": 2,
+                    "maxItems": 2,
+                    "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
+                },
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
@@ -303,6 +309,12 @@
             "type": "object",
             "properties": {
                 "driver": {"type": "string"},
+                "center_point": {
+                    "type": "array",
+                    "minItems": 2,
+                    "maxItems": 2,
+                    "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
+                },
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index ca42185f4e..b567c6450e 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -23,7 +23,6 @@
 
 #define DRIVER_LED_TOTAL 42
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-#define RGB_MATRIX_CENTER { 112, 32 }
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_LED_PROCESS_LIMIT 21
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index 5d0aa382de..77f050aa1f 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -51,7 +51,6 @@
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
 #    define RGBLIGHT_VAL_STEP 5
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_CENTER { 112, 32 }
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 729375f987..767e54687d 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -40,7 +40,6 @@
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250
 #    define RGBLIGHT_VAL_STEP 5
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_CENTER { 112, 32 }
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #    define RGBLIGHT_ANIMATIONS

From 591701cdf9ae3642daa8ba369327692396065438 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 21 Sep 2022 11:41:18 +1000
Subject: [PATCH 400/959] Fix incorrect g_led_config generation (#18431)

---
 lib/python/qmk/info.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 834f7d9170..5ca282b2d3 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -613,20 +613,24 @@ def _extract_led_config(info_data, keyboard):
     cols = info_data['matrix_size']['cols']
     rows = info_data['matrix_size']['rows']
 
-    # Assume what feature owns g_led_config
-    feature = "rgb_matrix"
-    if info_data.get("features", {}).get("led_matrix", False):
+    # Determine what feature owns g_led_config
+    features = info_data.get("features", {})
+    feature = None
+    if features.get("rgb_matrix", False):
+        feature = "rgb_matrix"
+    elif features.get("led_matrix", False):
         feature = "led_matrix"
 
-    # Process
-    for file in find_keyboard_c(keyboard):
-        try:
-            ret = find_led_config(file, cols, rows)
-            if ret:
-                info_data[feature] = info_data.get(feature, {})
-                info_data[feature]["layout"] = ret
-        except Exception as e:
-            _log_warning(info_data, f'led_config: {file.name}: {e}')
+    if feature:
+        # Process
+        for file in find_keyboard_c(keyboard):
+            try:
+                ret = find_led_config(file, cols, rows)
+                if ret:
+                    info_data[feature] = info_data.get(feature, {})
+                    info_data[feature]["layout"] = ret
+            except Exception as e:
+                _log_warning(info_data, f'led_config: {file.name}: {e}')
 
     return info_data
 

From b03a3d7047e85a798c9368c64dbdb3f75be6d761 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 21 Sep 2022 21:08:47 +1000
Subject: [PATCH 401/959] Checklist clarification. (#18440)

---
 docs/pr_checklist.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 1034631863..881f3f282c 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -52,6 +52,9 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
         - valid maintainer
         - valid USB VID/PID and device version
         - displays correctly in Configurator (press Ctrl+Shift+I to preview local file, turn on fast input to verify ordering)
+        - `layout` definitions should include matrix positions, so that `LAYOUT` macros can be generated at build time
+            - should use standard definitions if applicable
+            - use the Community Layout macro names where they apply (preferred above `LAYOUT`/`LAYOUT_all`)
 - `readme.md`
     - standard template should be present -- [link to template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md)
     - flash command is present, and has `:flash` at end
@@ -82,17 +85,15 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - Vial-related files or changes will not be accepted, as they are not used by QMK firmware (no Vial-specific core code has been submitted or merged)
 - `<keyboard>.c`
     - empty `xxxx_xxxx_kb()` or other weak-defined default implemented functions removed
+    - empty `xxxx_xxxx_user()` or other user-level functions are disallowed at the keyboard level and must be moved to keymaps
     - commented-out functions removed too
     - `matrix_init_board()` etc. migrated to `keyboard_pre_init_kb()`, see: [keyboard_pre_init*](custom_quantum_functions.md?id=keyboard_pre_init_-function-documentation)
     - prefer `CUSTOM_MATRIX = lite` if custom matrix used, allows for standard debounce, see [custom matrix 'lite'](custom_matrix.md?id=lite)
     - prefer LED indicator [Configuration Options](feature_led_indicators.md?id=configuration-options) to custom `led_update_*()` implementations where possible
-    - Encoder support should not be hacked into the keymap here -- no `tap_code(dynamic_keymap_get_keycode())` or `action_exec()` hacks.  The [Encoder Map](feature_encoders.md?id=encoder-map) feature already supports the dynamic keymap feature (what power's VIA's "live keymap updates" capability).
-      - If support is absolutely necessary, it should be implemented exclusively at the keymap level, with none of the implementation bleeding into the keyboard level (no empty rows/columns, no encoder specific layouts, etc.), as those configurations can be redefined at the keymap level. Keymaps can then choose to use the `action_exec` hack. <!-- because people will complain, give them a way to implement it, in the meanwhile.  To be removed. -->
-      - [Request for official proper VIA support](https://github.com/the-via/app/issues/26)
+    - Encoder support should not require any keyboard-level code, and associated keymaps should now leverage the [Encoder Map](feature_encoders.md?id=encoder-map) feature instead.
 - `<keyboard>.h`
     - `#include "quantum.h"` appears at the top
-    - `LAYOUT` macros should use standard definitions if applicable
-        - use the Community Layout macro names where they apply (preferred above `LAYOUT`/`LAYOUT_all`)
+    - `LAYOUT` macros should be moved to `info.json`
 - keymap `config.h`
     - no duplication of `rules.mk` or `config.h` from keyboard
 - `keymaps/default/keymap.c`
@@ -111,7 +112,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
 - submitters can have a personal (or bells-and-whistles) keymap showcasing capabilities in the same PR but it shouldn't be embedded in the 'default' keymap
 - submitters can also have a "manufacturer-matching" keymap that mirrors existing functionality of the commercial product, if porting an existing board
 - Do not include VIA json files in the PR. These do not belong in the QMK repository as they are not used by QMK firmware -- they belong in the [VIA Keyboard Repo](https://github.com/the-via/keyboards)
-- Do not include source files from another keyboard or vendors keyboard folder. Including core files is fine. 
+- Do not include source files from another keyboard or vendors keyboard folder. Including core files is fine.
   - For instance, only `wilba_tech` boards using be including `keyboards/wilba_tech/wt_main.c` and  `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine.
   - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out.
 

From 2f48d300f4fdce10d4183279f68cf4fe355cf605 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 22 Sep 2022 03:31:57 +1000
Subject: [PATCH 402/959] Normalise info_config.h define generation (#18439)

* Normalise info_config.h define generation

* format

* Fix tests

* Update lib/python/qmk/cli/generate/config_h.py

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 lib/python/qmk/cli/generate/config_h.py   | 114 ++++++----------------
 lib/python/qmk/tests/test_cli_commands.py |  20 ++--
 2 files changed, 41 insertions(+), 93 deletions(-)

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index a2178bf1e9..d6e87c8803 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -13,6 +13,14 @@ from qmk.path import normpath
 from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
+def generate_define(define, value=None):
+    value = f' {value}' if value is not None else ''
+    return f"""
+#ifndef {define}
+#    define {define}{value}
+#endif // {define}"""
+
+
 def direct_pins(direct_pins, postfix):
     """Return the config.h lines that set the direct pins.
     """
@@ -22,11 +30,7 @@ def direct_pins(direct_pins, postfix):
         cols = ','.join(map(str, [col or 'NO_PIN' for col in row]))
         rows.append('{' + cols + '}')
 
-    return f"""
-#ifndef DIRECT_PINS{postfix}
-#   define DIRECT_PINS{postfix} {{ {", ".join(rows)} }}
-#endif // DIRECT_PINS{postfix}
-"""
+    return generate_define(f'DIRECT_PINS{postfix}', f'{{ {", ".join(rows)} }}')
 
 
 def pin_array(define, pins, postfix):
@@ -34,11 +38,7 @@ def pin_array(define, pins, postfix):
     """
     pin_array = ', '.join(map(str, [pin or 'NO_PIN' for pin in pins]))
 
-    return f"""
-#ifndef {define}_PINS{postfix}
-#   define {define}_PINS{postfix} {{ {pin_array} }}
-#endif // {define}_PINS{postfix}
-"""
+    return generate_define(f'{define}_PINS{postfix}', f'{{ {pin_array} }}')
 
 
 def matrix_pins(matrix_pins, postfix=''):
@@ -62,18 +62,8 @@ def generate_matrix_size(kb_info_json, config_h_lines):
     """Add the matrix size to the config.h.
     """
     if 'matrix_pins' in kb_info_json:
-        col_count = kb_info_json['matrix_size']['cols']
-        row_count = kb_info_json['matrix_size']['rows']
-
-        config_h_lines.append(f"""
-#ifndef MATRIX_COLS
-#   define MATRIX_COLS {col_count}
-#endif // MATRIX_COLS
-
-#ifndef MATRIX_ROWS
-#   define MATRIX_ROWS {row_count}
-#endif // MATRIX_ROWS
-""")
+        config_h_lines.append(generate_define('MATRIX_COLS', kb_info_json['matrix_size']['cols']))
+        config_h_lines.append(generate_define('MATRIX_ROWS', kb_info_json['matrix_size']['rows']))
 
 
 def generate_config_items(kb_info_json, config_h_lines):
@@ -95,44 +85,23 @@ def generate_config_items(kb_info_json, config_h_lines):
             continue
 
         if key_type.startswith('array.array'):
-            config_h_lines.append('')
-            config_h_lines.append(f'#ifndef {config_key}')
-            config_h_lines.append(f'#   define {config_key} {{ {", ".join(["{" + ",".join(list(map(str, x))) + "}" for x in config_value])} }}')
-            config_h_lines.append(f'#endif // {config_key}')
+            config_h_lines.append(generate_define(config_key, f'{{ {", ".join(["{" + ",".join(list(map(str, x))) + "}" for x in config_value])} }}'))
         elif key_type.startswith('array'):
-            config_h_lines.append('')
-            config_h_lines.append(f'#ifndef {config_key}')
-            config_h_lines.append(f'#   define {config_key} {{ {", ".join(map(str, config_value))} }}')
-            config_h_lines.append(f'#endif // {config_key}')
+            config_h_lines.append(generate_define(config_key, f'{{ {", ".join(map(str, config_value))} }}'))
         elif key_type == 'bool':
             if config_value:
-                config_h_lines.append('')
-                config_h_lines.append(f'#ifndef {config_key}')
-                config_h_lines.append(f'#   define {config_key}')
-                config_h_lines.append(f'#endif // {config_key}')
+                config_h_lines.append(generate_define(config_key))
         elif key_type == 'mapping':
             for key, value in config_value.items():
-                config_h_lines.append('')
-                config_h_lines.append(f'#ifndef {key}')
-                config_h_lines.append(f'#   define {key} {value}')
-                config_h_lines.append(f'#endif // {key}')
+                config_h_lines.append(generate_define(key, value))
         elif key_type == 'str':
             escaped_str = config_value.replace('\\', '\\\\').replace('"', '\\"')
-            config_h_lines.append('')
-            config_h_lines.append(f'#ifndef {config_key}')
-            config_h_lines.append(f'#   define {config_key} "{escaped_str}"')
-            config_h_lines.append(f'#endif // {config_key}')
+            config_h_lines.append(generate_define(config_key, f'"{escaped_str}"'))
         elif key_type == 'bcd_version':
             (major, minor, revision) = config_value.split('.')
-            config_h_lines.append('')
-            config_h_lines.append(f'#ifndef {config_key}')
-            config_h_lines.append(f'#   define {config_key} 0x{major.zfill(2)}{minor}{revision}')
-            config_h_lines.append(f'#endif // {config_key}')
+            config_h_lines.append(generate_define(config_key, f'0x{major.zfill(2)}{minor}{revision}'))
         else:
-            config_h_lines.append('')
-            config_h_lines.append(f'#ifndef {config_key}')
-            config_h_lines.append(f'#   define {config_key} {config_value}')
-            config_h_lines.append(f'#endif // {config_key}')
+            config_h_lines.append(generate_define(config_key, config_value))
 
 
 def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
@@ -145,24 +114,15 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
         b_pads.append(encoder["pin_b"])
         resolutions.append(encoder.get("resolution", None))
 
-    config_h_lines.append(f'#ifndef ENCODERS_PAD_A{postfix}')
-    config_h_lines.append(f'#   define ENCODERS_PAD_A{postfix} {{ { ", ".join(a_pads) } }}')
-    config_h_lines.append(f'#endif // ENCODERS_PAD_A{postfix}')
-
-    config_h_lines.append(f'#ifndef ENCODERS_PAD_B{postfix}')
-    config_h_lines.append(f'#   define ENCODERS_PAD_B{postfix} {{ { ", ".join(b_pads) } }}')
-    config_h_lines.append(f'#endif // ENCODERS_PAD_B{postfix}')
+    config_h_lines.append(generate_define(f'ENCODERS_PAD_A{postfix}', f'{{ {", ".join(a_pads)} }}'))
+    config_h_lines.append(generate_define(f'ENCODERS_PAD_B{postfix}', f'{{ {", ".join(b_pads)} }}'))
 
     if None in resolutions:
         cli.log.debug("Unable to generate ENCODER_RESOLUTION configuration")
     elif len(set(resolutions)) == 1:
-        config_h_lines.append(f'#ifndef ENCODER_RESOLUTION{postfix}')
-        config_h_lines.append(f'#   define ENCODER_RESOLUTION{postfix} { resolutions[0] }')
-        config_h_lines.append(f'#endif // ENCODER_RESOLUTION{postfix}')
+        config_h_lines.append(generate_define(f'ENCODER_RESOLUTION{postfix}', resolutions[0]))
     else:
-        config_h_lines.append(f'#ifndef ENCODER_RESOLUTIONS{postfix}')
-        config_h_lines.append(f'#   define ENCODER_RESOLUTIONS{postfix} {{ { ", ".join(map(str,resolutions)) } }}')
-        config_h_lines.append(f'#endif // ENCODER_RESOLUTIONS{postfix}')
+        config_h_lines.append(generate_define(f'ENCODER_RESOLUTIONS{postfix}', f'{{ {", ".join(map(str,resolutions))} }}'))
 
 
 def generate_split_config(kb_info_json, config_h_lines):
@@ -171,35 +131,23 @@ def generate_split_config(kb_info_json, config_h_lines):
         if kb_info_json['split']['primary'] in ('left', 'right'):
             config_h_lines.append('')
             config_h_lines.append('#ifndef MASTER_LEFT')
-            config_h_lines.append('#   ifndef MASTER_RIGHT')
+            config_h_lines.append('#    ifndef MASTER_RIGHT')
             if kb_info_json['split']['primary'] == 'left':
-                config_h_lines.append('#       define MASTER_LEFT')
+                config_h_lines.append('#        define MASTER_LEFT')
             elif kb_info_json['split']['primary'] == 'right':
-                config_h_lines.append('#       define MASTER_RIGHT')
-            config_h_lines.append('#   endif // MASTER_RIGHT')
+                config_h_lines.append('#        define MASTER_RIGHT')
+            config_h_lines.append('#    endif // MASTER_RIGHT')
             config_h_lines.append('#endif // MASTER_LEFT')
         elif kb_info_json['split']['primary'] == 'pin':
-            config_h_lines.append('')
-            config_h_lines.append('#ifndef SPLIT_HAND_PIN')
-            config_h_lines.append('#   define SPLIT_HAND_PIN')
-            config_h_lines.append('#endif // SPLIT_HAND_PIN')
+            config_h_lines.append(generate_define('SPLIT_HAND_PIN'))
         elif kb_info_json['split']['primary'] == 'matrix_grid':
-            config_h_lines.append('')
-            config_h_lines.append('#ifndef SPLIT_HAND_MATRIX_GRID')
-            config_h_lines.append('#   define SPLIT_HAND_MATRIX_GRID {%s}' % (','.join(kb_info_json["split"]["matrix_grid"],)))
-            config_h_lines.append('#endif // SPLIT_HAND_MATRIX_GRID')
+            config_h_lines.append(generate_define('SPLIT_HAND_MATRIX_GRID', f'{{ {",".join(kb_info_json["split"]["matrix_grid"])} }}'))
         elif kb_info_json['split']['primary'] == 'eeprom':
-            config_h_lines.append('')
-            config_h_lines.append('#ifndef EE_HANDS')
-            config_h_lines.append('#   define EE_HANDS')
-            config_h_lines.append('#endif // EE_HANDS')
+            config_h_lines.append(generate_define('EE_HANDS'))
 
     if 'protocol' in kb_info_json['split'].get('transport', {}):
         if kb_info_json['split']['transport']['protocol'] == 'i2c':
-            config_h_lines.append('')
-            config_h_lines.append('#ifndef USE_I2C')
-            config_h_lines.append('#   define USE_I2C')
-            config_h_lines.append('#endif // USE_I2C')
+            config_h_lines.append(generate_define('USE_I2C'))
 
     if 'right' in kb_info_json['split'].get('matrix_pins', {}):
         config_h_lines.append(matrix_pins(kb_info_json['split']['matrix_pins']['right'], '_RIGHT'))
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index c8c4e2f80c..9bfc5a0a79 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -263,16 +263,16 @@ def test_generate_rgb_breathe_table():
 def test_generate_config_h():
     result = check_subcommand('generate-config-h', '-kb', 'handwired/pytest/basic')
     check_returncode(result)
-    assert '#   define DEVICE_VER 0x0001' in result.stdout
-    assert '#   define DIODE_DIRECTION COL2ROW' in result.stdout
-    assert '#   define MANUFACTURER "none"' in result.stdout
-    assert '#   define PRODUCT "pytest"' in result.stdout
-    assert '#   define PRODUCT_ID 0x6465' in result.stdout
-    assert '#   define VENDOR_ID 0xFEED' in result.stdout
-    assert '#   define MATRIX_COLS 1' in result.stdout
-    assert '#   define MATRIX_COL_PINS { F4 }' in result.stdout
-    assert '#   define MATRIX_ROWS 1' in result.stdout
-    assert '#   define MATRIX_ROW_PINS { F5 }' in result.stdout
+    assert '#    define DEVICE_VER 0x0001' in result.stdout
+    assert '#    define DIODE_DIRECTION COL2ROW' in result.stdout
+    assert '#    define MANUFACTURER "none"' in result.stdout
+    assert '#    define PRODUCT "pytest"' in result.stdout
+    assert '#    define PRODUCT_ID 0x6465' in result.stdout
+    assert '#    define VENDOR_ID 0xFEED' in result.stdout
+    assert '#    define MATRIX_COLS 1' in result.stdout
+    assert '#    define MATRIX_COL_PINS { F4 }' in result.stdout
+    assert '#    define MATRIX_ROWS 1' in result.stdout
+    assert '#    define MATRIX_ROW_PINS { F5 }' in result.stdout
 
 
 def test_generate_rules_mk():

From ee22f34e69abcd191b887d8dec7ae25655cc6cb4 Mon Sep 17 00:00:00 2001
From: bojiguard <107382014+bojiguard@users.noreply.github.com>
Date: Thu, 22 Sep 2022 02:32:31 +0900
Subject: [PATCH 403/959] Fungo rev1: fix QMK Configurator key sequence -
 info.json (#18434)

* * info.json: fix key position and order

* fix json format

* Update keyboards/fungo/rev1/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/fungo/rev1/info.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index 6941d70d81..cb5b7c6991 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -63,10 +63,10 @@
         {"x":4, "y":3.125},
         {"x":5, "y":3.25},
         {"x":6, "y":3.5},
-        {"x":7, "y":4},
-        {"x":8.25, "y":3.75},
-        {"x":9.75, "y":3.75},
-        {"x":11, "y":4},
+        {"x":7, "y":4.25},
+        {"x":8, "y":4.5},
+        {"x":10, "y":4.5},
+        {"x":11, "y":4.25},
         {"x":12, "y":3.5},
         {"x":13, "y":3.25},
         {"x":14, "y":3.125},
@@ -78,20 +78,20 @@
         {"x":0, "y":4.375},
         {"x":1, "y":4.375},
         {"x":2, "y":4.25},
-        {"x":3, "y":4.25},
-        {"x":4.333, "y":4.25},
-        {"x":5.667, "y":4.625},
-        {"x":7, "y":5},
-        {"x":8.25, "y":4.75},
-        {"x":9.75, "y":4.75},
-        {"x":11, "y":5},
-        {"x":12.333, "y":4.625},
-        {"x":13.667, "y":4.25},
-        {"x":15, "y":4.25},
+        {"x":3.25, "y":4.25},
+        {"x":4.5, "y":4.5},
+        {"x":5.75, "y":5},
+        {"x":7, "y":5.25},
+        {"x":8, "y":5.5},
+        {"x":10, "y":5.5},
+        {"x":11, "y":5.25},
+        {"x":12.25, "y":5},
+        {"x":13.5, "y":4.5},
+        {"x":14.75, "y":4.25},
         {"x":16, "y":4.25},
         {"x":17, "y":4.375},
         {"x":18, "y":4.375}
       ]
     }
   }
-}
+}
\ No newline at end of file

From ea80141f6920c115bcf7993eb3173737a580e6d6 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 21 Sep 2022 14:00:25 -0700
Subject: [PATCH 404/959] [Docs] Explicitly mention kb/user callbacks as
 boolean (#18448)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/pr_checklist.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 881f3f282c..6d74e246a8 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -135,6 +135,7 @@ Also, specific to ChibiOS:
     - for new MCUs, a new "child" keyboard should be added that targets your newly-added MCU, so that builds can be verified
     - for new hardware support such as display panels, core-side matrix implementations, or other peripherals, an associated keymap should be provided
     - if an existing keymap exists that can leverage this functionality this may not be required (e.g. a new RGB driver chip, supported by the `rgb` keymap) -- consult with the QMK Collaborators on Discord to determine if there is sufficient overlap already
+- any features adding `_kb`/`_user` callbacks must return a `bool`, to allow for user override of keyboard-level callbacks. 
 - other requirements are at the discretion of QMK collaborators
     - core is a lot more subjective given the breadth of posted changes
 

From 828a1db035d5aeebae8d3fb2bd1cacd4d61bd7bc Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 22 Sep 2022 21:57:50 +0200
Subject: [PATCH 405/959] Update chibios-contrib for RP2040 i2c fixes take 2
 (#18455)

...includes missing system locking inside a timeout waiting condition and
updates to the rp2040 linker file.
---
 lib/chibios-contrib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index d03aa9cc2f..b51787777b 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit d03aa9cc2f76468e431c71421015102956dd6ad7
+Subproject commit b51787777beda4be659212503d5f3901ca91db08

From b8ffaa63310ec7cc29de0aaa562457d87e50f837 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 22 Sep 2022 23:48:20 +0200
Subject: [PATCH 406/959] Copy RP2040 vector table to RAM on startup (#18424)

...this reduces possible latency when invoking interrupt handlers by
mitigating XIP cache misses which are not existent when running code from
RAM.
---
 platforms/chibios/vendors/RP/RP2040.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platforms/chibios/vendors/RP/RP2040.mk b/platforms/chibios/vendors/RP/RP2040.mk
index de426c9c40..efa3fef13f 100644
--- a/platforms/chibios/vendors/RP/RP2040.mk
+++ b/platforms/chibios/vendors/RP/RP2040.mk
@@ -11,7 +11,8 @@ endif
 # Raspberry Pi Pico SDK Support
 ##############################################################################
 ADEFS  += -DCRT0_VTOR_INIT=1 \
-		  -DCRT0_EXTRA_CORES_NUMBER=0
+		  -DCRT0_EXTRA_CORES_NUMBER=0 \
+          -DCRT0_INIT_VECTORS=1
 
 CFLAGS += -DPICO_NO_FPGA_CHECK \
           -DNDEBUG

From 3b7aeddc4dea42f9c7850b2a39661349d0b1352e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Sep 2022 09:52:21 +1000
Subject: [PATCH 407/959] Bump actions/stale from 5 to 6 (#18456)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index b15f301865..297af8e19c 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

From 36c410592dbd35da33ccc5fd6d2a5cbf4b25a708 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 23 Sep 2022 22:46:23 +1000
Subject: [PATCH 408/959] Change `DRIVER_LED_COUNT` to
 `{LED,RGB}_MATRIX_LED_COUNT` (#18399)

---
 docs/feature_led_matrix.md                    | 20 +++----
 docs/feature_rgb_matrix.md                    | 48 ++++++++---------
 drivers/led/aw20216.c                         |  2 +-
 drivers/led/aw20216.h                         |  2 +-
 drivers/led/ckled2001-simple.c                |  4 +-
 drivers/led/ckled2001-simple.h                |  2 +-
 drivers/led/ckled2001.c                       |  4 +-
 drivers/led/ckled2001.h                       |  2 +-
 drivers/led/issi/is31fl3731-simple.c          |  4 +-
 drivers/led/issi/is31fl3731-simple.h          |  2 +-
 drivers/led/issi/is31fl3731.c                 |  4 +-
 drivers/led/issi/is31fl3731.h                 |  2 +-
 drivers/led/issi/is31fl3733-simple.c          |  4 +-
 drivers/led/issi/is31fl3733-simple.h          |  2 +-
 drivers/led/issi/is31fl3733.c                 |  4 +-
 drivers/led/issi/is31fl3733.h                 |  2 +-
 drivers/led/issi/is31fl3736.c                 |  4 +-
 drivers/led/issi/is31fl3736.h                 |  6 +--
 drivers/led/issi/is31fl3737.c                 |  4 +-
 drivers/led/issi/is31fl3737.h                 |  2 +-
 drivers/led/issi/is31fl3741.c                 |  4 +-
 drivers/led/issi/is31fl3741.h                 |  2 +-
 drivers/led/issi/is31flcommon.c               | 15 +++---
 drivers/led/issi/is31flcommon.h               |  6 ++-
 keyboards/1upkeyboards/pi40/config.h          |  2 +-
 keyboards/1upkeyboards/super16/config.h       |  2 +-
 keyboards/1upkeyboards/super16v2/config.h     |  2 +-
 keyboards/3keyecosystem/2key2/config.h        |  2 +-
 keyboards/4pplet/perk60_iso/rev_a/config.h    |  2 +-
 keyboards/4pplet/perk60_iso/rev_a/rev_a.c     |  2 +-
 keyboards/abatskeyboardclub/nayeon/config.h   |  2 +-
 keyboards/acheron/apollo/87h/delta/config.h   |  2 +-
 keyboards/acheron/apollo/87h/gamma/config.h   |  4 +-
 keyboards/acheron/apollo/87h/gamma/gamma.c    |  2 +-
 keyboards/acheron/apollo/87htsc/config.h      |  2 +-
 keyboards/acheron/apollo/88htsc/config.h      |  2 +-
 keyboards/adafruit/macropad/config.h          |  2 +-
 keyboards/adm42/rev4/config.h                 |  2 +-
 keyboards/aleblazer/zodiark/config.h          |  2 +-
 keyboards/an_achronism/tetromino/config.h     |  2 +-
 keyboards/annepro2/config_led.h               |  2 +-
 keyboards/annepro2/rgb_driver.c               |  4 +-
 keyboards/atlantis/ak81_ve/config.h           |  2 +-
 keyboards/axolstudio/yeti/hotswap/config.h    |  2 +-
 keyboards/axolstudio/yeti/hotswap/hotswap.c   |  2 +-
 keyboards/bandominedoni/config.h              |  2 +-
 keyboards/basekeys/trifecta/config.h          |  4 +-
 keyboards/bastardkb/charybdis/3x5/config.h    |  2 +-
 keyboards/bastardkb/charybdis/3x6/config.h    |  2 +-
 keyboards/bastardkb/charybdis/4x6/config.h    |  2 +-
 keyboards/bastardkb/scylla/config.h           |  2 +-
 keyboards/bastardkb/skeletyl/config.h         |  2 +-
 keyboards/bastardkb/tbkmini/config.h          |  2 +-
 keyboards/blockboy/ac980mini/config.h         |  4 +-
 keyboards/boardsource/beiwagon/config.h       |  2 +-
 keyboards/boardsource/lulu/config.h           |  2 +-
 keyboards/boardsource/microdox/v2/config.h    |  2 +-
 keyboards/boardsource/technik_o/config.h      |  2 +-
 keyboards/boardsource/technik_s/config.h      |  2 +-
 keyboards/boardsource/the_mark/config.h       |  2 +-
 keyboards/boston_meetup/2019/config.h         |  2 +-
 keyboards/canary/canary60rgb/canary60rgb.c    |  2 +-
 keyboards/canary/canary60rgb/v1/config.h      |  2 +-
 keyboards/capsunlocked/cu80/v2_ansi/config.h  |  2 +-
 keyboards/capsunlocked/cu80/v2_iso/config.h   |  2 +-
 keyboards/checkerboards/quark_lp/config.h     |  2 +-
 keyboards/cherrybstudio/cb87rgb/config.h      |  2 +-
 keyboards/chromatonemini/config.h             |  2 +-
 keyboards/chromatonemini/rgb_matrix_kb.inc    |  4 +-
 keyboards/clueboard/66_hotswap/gen1/config.h  |  2 +-
 keyboards/clueboard/66_hotswap/gen1/gen1.c    |  2 +-
 keyboards/crkbd/keymaps/bermeo/config.h       |  2 +-
 keyboards/crkbd/keymaps/bermeo/keymap.c       |  8 +--
 keyboards/crkbd/keymaps/crkdves/config.h      |  2 +-
 keyboards/crkbd/keymaps/crkqwes/config.h      |  2 +-
 keyboards/crkbd/keymaps/davidrambo/config.h   |  2 +-
 keyboards/crkbd/keymaps/devdev/config.h       |  2 +-
 keyboards/crkbd/keymaps/kidbrazil/config.h    |  2 +-
 keyboards/crkbd/keymaps/ollyhayes/config.h    |  2 +-
 keyboards/crkbd/keymaps/rpbaptist/keymap.c    |  2 +-
 keyboards/crkbd/keymaps/soundmonster/config.h |  2 +-
 keyboards/crkbd/keymaps/toinux/config.h       |  2 +-
 keyboards/crkbd/keymaps/xyverz/config.h       |  2 +-
 keyboards/crkbd/r2g/config.h                  |  2 +-
 keyboards/crkbd/readme.md                     |  2 +-
 keyboards/crkbd/rev1/config.h                 |  2 +-
 keyboards/dekunukem/duckypad/config.h         |  2 +-
 keyboards/doio/kb16/config.h                  |  2 +-
 keyboards/doro67/rgb/config.h                 |  2 +-
 keyboards/dp60/config.h                       |  2 +-
 keyboards/dp60/dp60.c                         |  2 +-
 keyboards/dtisaac/dosa40rgb/config.h          |  2 +-
 keyboards/durgod/dgk6x/config.h               |  2 +-
 keyboards/durgod/dgk6x/galaxy/galaxy.c        |  2 +-
 keyboards/durgod/dgk6x/hades/hades.c          |  2 +-
 keyboards/durgod/dgk6x/venus/venus.c          |  2 +-
 keyboards/dztech/dz60rgb/dz60rgb.c            |  2 +-
 .../dztech/dz60rgb/keymaps/mekanist/keymap.c  |  2 +-
 .../dztech/dz60rgb/keymaps/perseid/keymap.c   |  2 +-
 keyboards/dztech/dz60rgb/v1/config.h          |  2 +-
 keyboards/dztech/dz60rgb/v2/config.h          |  2 +-
 keyboards/dztech/dz60rgb/v2_1/config.h        |  2 +-
 keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c  |  2 +-
 .../dz60rgb_ansi/keymaps/muralisc/keymap.c    |  2 +-
 keyboards/dztech/dz60rgb_ansi/v1/config.h     |  2 +-
 keyboards/dztech/dz60rgb_ansi/v2/config.h     |  2 +-
 keyboards/dztech/dz60rgb_ansi/v2_1/config.h   |  2 +-
 keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c    |  2 +-
 keyboards/dztech/dz60rgb_wkl/v1/config.h      |  2 +-
 keyboards/dztech/dz60rgb_wkl/v2/config.h      |  2 +-
 keyboards/dztech/dz60rgb_wkl/v2_1/config.h    |  2 +-
 keyboards/dztech/dz64rgb/config.h             |  2 +-
 keyboards/dztech/dz64rgb/dz64rgb.c            |  2 +-
 keyboards/dztech/dz65rgb/v1/config.h          |  2 +-
 keyboards/dztech/dz65rgb/v1/v1.c              |  2 +-
 keyboards/dztech/dz65rgb/v2/config.h          |  2 +-
 keyboards/dztech/dz65rgb/v2/v2.c              |  2 +-
 keyboards/dztech/dz65rgb/v3/config.h          |  2 +-
 keyboards/dztech/dz65rgb/v3/v3.c              |  2 +-
 keyboards/eek/config.h                        |  2 +-
 keyboards/ein_60/config.h                     |  2 +-
 keyboards/elephant42/config.h                 |  2 +-
 keyboards/ergodox_ez/config.h                 |  2 +-
 keyboards/ergodox_ez/ergodox_ez.c             |  2 +-
 keyboards/evyd13/atom47/rev5/config.h         |  2 +-
 keyboards/evyd13/atom47/rev5/rev5.c           |  2 +-
 keyboards/exclusive/e6_rgb/config.h           |  2 +-
 keyboards/exclusive/e6_rgb/e6_rgb.c           |  2 +-
 keyboards/fallacy/config.h                    |  2 +-
 keyboards/fallacy/indicators.c                |  4 +-
 keyboards/feker/ik75/config.h                 |  2 +-
 keyboards/feker/ik75/ik75.c                   |  2 +-
 keyboards/ferris/0_2/bling/bling.c            |  2 +-
 keyboards/ferris/0_2/bling/config.h           |  2 +-
 keyboards/frooastboard/walnut/config.h        |  2 +-
 keyboards/frooastboard/walnut/walnut.c        |  2 +-
 keyboards/geekboards/macropad_v2/config.h     |  2 +-
 keyboards/geekboards/tester/config.h          |  2 +-
 keyboards/geekboards/tester/tester.c          |  2 +-
 keyboards/giabalanai/config.h                 |  2 +-
 .../keymaps/party/rgb_matrix_user.inc         |  4 +-
 keyboards/gizmo_engineering/gk6/config.h      |  2 +-
 keyboards/gizmo_engineering/gk6/gk6.c         |  2 +-
 .../j73gl/keymaps/via_rgb_matrix/config.h     |  4 +-
 keyboards/gmmk/gmmk2/p65/ansi/ansi.c          |  2 +-
 keyboards/gmmk/gmmk2/p65/config.h             |  2 +-
 keyboards/gmmk/gmmk2/p65/iso/iso.c            |  2 +-
 keyboards/gmmk/gmmk2/p96/ansi/ansi.c          |  2 +-
 keyboards/gmmk/gmmk2/p96/config.h             |  2 +-
 keyboards/gmmk/gmmk2/p96/iso/iso.c            |  2 +-
 keyboards/gmmk/pro/rev1/ansi/ansi.c           |  2 +-
 keyboards/gmmk/pro/rev1/ansi/config.h         |  2 +-
 .../pro/rev1/ansi/keymaps/cedrikl/keymap.c    |  2 +-
 .../pro/rev1/ansi/keymaps/gigahawk/keymap.c   |  2 +-
 .../pro/rev1/ansi/keymaps/mattgauf/ansi.c     |  2 +-
 .../pro/rev1/ansi/keymaps/mattgauf/helpers.c  |  2 +-
 .../keymaps/mike1808/rgb_matrix_ledmaps.c     |  2 +-
 .../keymaps/mike1808/rgb_matrix_ledmaps.h     |  2 +-
 keyboards/gmmk/pro/rev1/iso/config.h          |  2 +-
 keyboards/gmmk/pro/rev1/iso/iso.c             |  2 +-
 keyboards/gmmk/pro/rev2/ansi/ansi.c           |  2 +-
 keyboards/gmmk/pro/rev2/ansi/config.h         |  2 +-
 keyboards/gmmk/pro/rev2/iso/config.h          |  2 +-
 keyboards/gmmk/pro/rev2/iso/iso.c             |  2 +-
 keyboards/gopolar/gg86/config.h               |  2 +-
 .../keymaps/horrortroll/led/custom_gradient.c |  2 +-
 .../rainbow_reactive_simple.h                 |  2 +-
 .../horrortroll/led/random_breath_rainbow.c   |  6 +--
 keyboards/hadron/ver3/config.h                |  2 +-
 keyboards/handwired/6macro/config.h           |  2 +-
 keyboards/handwired/co60/rev7/config.h        |  2 +-
 keyboards/handwired/colorlice/config.h        |  2 +-
 .../handwired/dactyl_manuform/3x5_3/config.h  |  2 +-
 .../3x5_3/keymaps/dlford/config.h             |  2 +-
 .../5x6/keymaps/thattolleyguy/config.h        |  4 +-
 keyboards/handwired/dygma/raise/ansi/ansi.c   |  2 +-
 keyboards/handwired/dygma/raise/config.h      |  2 +-
 keyboards/handwired/dygma/raise/iso/iso.c     |  2 +-
 keyboards/handwired/dygma/raise/leds.c        |  2 +-
 keyboards/handwired/dygma/raise/leds.h        |  2 +-
 keyboards/handwired/hnah108/config.h          |  2 +-
 keyboards/handwired/hnah40rgb/config.h        |  2 +-
 keyboards/handwired/p65rgb/config.h           |  2 +-
 keyboards/handwired/steamvan/rev1/config.h    |  2 +-
 .../tractyl_manuform/4x6_right/config.h       |  2 +-
 keyboards/helix/rev3_4rows/config.h           |  4 +-
 keyboards/helix/rev3_5rows/config.h           |  4 +-
 .../chinese_pcb/devil68_pro/config.h          |  2 +-
 keyboards/horrortroll/handwired_k552/config.h |  2 +-
 .../keymaps/default/led/custom_gradient.c     |  2 +-
 .../default/led/random_breath_rainbow.c       |  6 +--
 .../keymaps/via/led/custom_gradient.c         |  2 +-
 .../keymaps/via/led/random_breath_rainbow.c   |  6 +--
 keyboards/hs60/v1/config.h                    |  2 +-
 keyboards/hs60/v1/v1.c                        |  4 +-
 keyboards/hs60/v2/ansi/config.h               |  2 +-
 keyboards/hs60/v2/hhkb/config.h               |  2 +-
 keyboards/hs60/v2/iso/config.h                |  2 +-
 keyboards/hub20/config.h                      |  2 +-
 keyboards/idobao/id42/config.h                |  2 +-
 keyboards/idobao/id42/id42.c                  |  2 +-
 keyboards/idobao/id63/config.h                |  4 +-
 keyboards/idobao/id67/config.h                |  4 +-
 .../idobao/id67/keymaps/thewerther/keymap.c   |  2 +-
 .../id67/keymaps/vinorodrigues/keymap.c       |  4 +-
 keyboards/idobao/id75/v2/config.h             |  2 +-
 keyboards/idobao/id80/v3/ansi/config.h        |  2 +-
 keyboards/idobao/id87/v2/config.h             |  2 +-
 keyboards/idobao/montex/v1rgb/config.h        |  2 +-
 keyboards/idobao/montex/v2/config.h           |  4 +-
 keyboards/ilumkb/simpler61/config.h           |  2 +-
 keyboards/ilumkb/simpler61/simpler61.c        |  2 +-
 keyboards/ilumkb/simpler64/config.h           |  2 +-
 keyboards/ilumkb/simpler64/simpler64.c        |  2 +-
 keyboards/inett_studio/sqx/hotswap/config.h   |  2 +-
 keyboards/inett_studio/sqx/hotswap/hotswap.c  |  2 +-
 keyboards/inett_studio/sqx/universal/config.h |  2 +-
 .../inett_studio/sqx/universal/universal.c    |  2 +-
 .../input_club/ergodox_infinity/config.h      |  2 +-
 .../ergodox_infinity/ergodox_infinity.c       |  2 +-
 keyboards/input_club/k_type/config.h          |  2 +-
 keyboards/input_club/k_type/is31fl3733-dual.c |  4 +-
 keyboards/input_club/k_type/is31fl3733-dual.h |  2 +-
 .../input_club/k_type/k_type-rgbdriver.c      |  2 +-
 keyboards/input_club/k_type/k_type.c          |  2 +-
 .../k_type/keymaps/andrew-fahmy/config.h      |  2 +-
 keyboards/input_club/whitefox/config.h        |  2 +-
 keyboards/input_club/whitefox/whitefox.c      |  2 +-
 keyboards/jacky_studio/bear_65/config.h       |  2 +-
 keyboards/jadookb/jkb65/config.h              |  2 +-
 keyboards/jkeys_design/gentleman65/config.h   |  2 +-
 .../jkeys_design/gentleman65_se_s/config.h    |  2 +-
 keyboards/kapl/rev1/config.h                  |  2 +-
 keyboards/kbdfans/baguette66/rgb/config.h     |  2 +-
 keyboards/kbdfans/bella/rgb/config.h          |  2 +-
 keyboards/kbdfans/bella/rgb/rgb.c             |  2 +-
 keyboards/kbdfans/bella/rgb_iso/config.h      |  2 +-
 keyboards/kbdfans/bella/rgb_iso/rgb_iso.c     |  2 +-
 keyboards/kbdfans/boop65/rgb/config.h         |  2 +-
 keyboards/kbdfans/boop65/rgb/rgb.c            |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v1/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c       |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v2/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c       |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v3/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c       |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h  |  2 +-
 keyboards/kbdfans/kbd75rgb/config.h           |  2 +-
 keyboards/kbdfans/kbdmini/config.h            |  2 +-
 keyboards/kbdfans/kbdmini/kbdmini.c           |  2 +-
 keyboards/kbdfans/maja/config.h               |  2 +-
 keyboards/kbdfans/maja/maja.c                 |  2 +-
 keyboards/kbdfans/odin/rgb/config.h           |  2 +-
 keyboards/keebio/bamfk4/config.h              |  2 +-
 keyboards/keebio/bdn9/rev2/config.h           |  2 +-
 keyboards/keebio/iris/rev6/config.h           |  2 +-
 keyboards/keebio/iris/rev6a/config.h          |  2 +-
 keyboards/keebio/iris/rev6b/config.h          |  2 +-
 keyboards/keebio/iris/rev7/config.h           |  2 +-
 keyboards/keebio/stick/config.h               |  2 +-
 keyboards/keebwerk/mega/ansi/config.h         |  2 +-
 keyboards/keybee/keybee65/config.h            |  2 +-
 keyboards/keyboardio/model01/config.h         |  2 +-
 keyboards/keyboardio/model01/leds.c           |  2 +-
 .../keycapsss/kimiko/keymaps/oriaj3/config.h  |  4 +-
 keyboards/keychron/q1/rev_0100/config.h       |  2 +-
 .../keymaps/gtg465x/rgb_matrix_user.c         |  2 +-
 .../keymaps/mkillewald/rgb_matrix_user.c      |  2 +-
 .../rev_0100/keymaps/teimor/rgb_matrix_user.c |  2 +-
 keyboards/keychron/q1/rev_0100/rev_0100.c     |  2 +-
 keyboards/keychron/q1/rev_0101/config.h       |  2 +-
 keyboards/keychron/q1/rev_0101/rev_0101.c     |  2 +-
 keyboards/keychron/q1/rev_0102/config.h       |  2 +-
 .../keymaps/kubahorak/rgb_matrix_user.c       |  2 +-
 .../keymaps/mkillewald_iso/rgb_matrix_user.c  |  2 +-
 keyboards/keychron/q1/rev_0102/rev_0102.c     |  2 +-
 keyboards/keychron/q2/rev_0110/config.h       |  2 +-
 .../keymaps/ladduro/rgb_matrix_user.c         |  2 +-
 keyboards/keychron/q2/rev_0110/rev_0110.c     |  2 +-
 keyboards/keychron/q2/rev_0111/config.h       |  2 +-
 keyboards/keychron/q2/rev_0111/rev_0111.c     |  2 +-
 keyboards/keychron/q2/rev_0112/config.h       |  2 +-
 keyboards/keychron/q2/rev_0112/rev_0112.c     |  2 +-
 keyboards/keychron/q2/rev_0113/config.h       |  2 +-
 keyboards/keychron/q2/rev_0113/rev_0113.c     |  2 +-
 keyboards/kprepublic/bm40hsrgb/config.h       |  2 +-
 .../bm40hsrgb/keymaps/coffee/config.h         |  2 +-
 .../bm40hsrgb/keymaps/coffee/keymap.c         |  4 +-
 .../bm40hsrgb/keymaps/signynt_2_loud/keymap.c | 16 +++---
 .../keymaps/signynt_2_quiet/keymap.c          |  8 +--
 keyboards/kprepublic/bm60hsrgb/rev1/config.h  |  2 +-
 keyboards/kprepublic/bm60hsrgb/rev2/config.h  |  4 +-
 keyboards/kprepublic/bm60hsrgb/rev2/rev2.c    |  2 +-
 .../kprepublic/bm60hsrgb_ec/rev1/config.h     |  2 +-
 .../kprepublic/bm60hsrgb_ec/rev2/config.h     |  2 +-
 keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c |  2 +-
 .../kprepublic/bm60hsrgb_iso/rev1/config.h    |  2 +-
 .../kprepublic/bm60hsrgb_iso/rev2/config.h    |  2 +-
 .../kprepublic/bm60hsrgb_iso/rev2/rev2.c      |  2 +-
 .../kprepublic/bm60hsrgb_poker/rev1/config.h  |  2 +-
 .../rev1/keymaps/ipetepete/keymap.c           |  2 +-
 .../kprepublic/bm60hsrgb_poker/rev2/config.h  |  2 +-
 .../kprepublic/bm60hsrgb_poker/rev2/rev2.c    |  2 +-
 keyboards/kprepublic/bm65hsrgb/rev1/config.h  |  2 +-
 .../bm65hsrgb_iso/keymaps/p4yne/keymap.c      |  2 +-
 .../kprepublic/bm65hsrgb_iso/rev1/config.h    |  2 +-
 keyboards/kprepublic/bm68hsrgb/rev1/config.h  |  2 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/config.h |  2 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/keymap.c |  4 +-
 keyboards/kprepublic/bm68hsrgb/rev2/config.h  |  2 +-
 keyboards/kprepublic/bm68hsrgb/rev2/rev2.c    |  2 +-
 keyboards/kprepublic/bm80hsrgb/config.h       |  4 +-
 .../bm80hsrgb/keymaps/peepeetee/config.h      |  2 +-
 keyboards/kprepublic/bm80v2/bm80v2.c          |  2 +-
 keyboards/kprepublic/bm80v2/config.h          |  2 +-
 keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c  |  2 +-
 keyboards/kprepublic/bm80v2_iso/config.h      |  2 +-
 keyboards/kprepublic/bm980hsrgb/config.h      |  2 +-
 .../labbeminiv1/keymaps/rgbmatrix/config.h    |  2 +-
 keyboards/latincompass/latin17rgb/config.h    |  2 +-
 .../latincompass/latin17rgb/latin17rgb.c      |  2 +-
 keyboards/latincompass/latin60rgb/config.h    |  2 +-
 .../latincompass/latin60rgb/latin60rgb.c      |  2 +-
 keyboards/latincompass/latin64ble/config.h    |  2 +-
 keyboards/latincompass/latin6rgb/config.h     |  2 +-
 keyboards/latincompass/latin6rgb/latin6rgb.c  |  2 +-
 keyboards/latincompass/latinpad/config.h      |  2 +-
 keyboards/latincompass/latinpadble/config.h   |  2 +-
 keyboards/linworks/fave65h/config.h           |  2 +-
 keyboards/linworks/fave84h/config.h           |  2 +-
 keyboards/linworks/fave87h/config.h           |  2 +-
 .../launchpad/keymaps/drashna/config.h        |  2 +-
 keyboards/marksard/rhymestone/rev1/config.h   |  4 +-
 keyboards/massdrop/alt/config_led.h           |  2 +-
 .../massdrop/alt/keymaps/jdelkins/keymap.c    |  4 +-
 .../alt/keymaps/jdelkins/rgb_matrix.h         |  2 +-
 .../massdrop/alt/keymaps/jdelkins_ss/keymap.c |  4 +-
 .../alt/keymaps/jdelkins_ss/rgb_matrix.h      |  2 +-
 .../massdrop/alt/keymaps/pregame/config.h     |  2 +-
 .../massdrop/alt/keymaps/pregame/keymap.c     |  4 +-
 keyboards/massdrop/ctrl/config_led.h          |  2 +-
 .../massdrop/ctrl/keymaps/endgame/config.h    |  2 +-
 .../massdrop/ctrl/keymaps/endgame/keymap.c    |  4 +-
 .../massdrop/ctrl/keymaps/foxx1337/config.h   |  2 +-
 .../ctrl/keymaps/foxx1337/hid_protocol.h      |  2 +-
 .../massdrop/ctrl/keymaps/foxx1337/keymap.c   |  6 +--
 .../ctrl/keymaps/foxx1337/rgb_matrix_user.inc |  4 +-
 .../ctrl/keymaps/matthewrobo/config.h         |  2 +-
 .../ctrl/keymaps/matthewrobo/keymap.c         |  4 +-
 .../massdrop/ctrl/keymaps/xanimos/config.h    |  2 +-
 .../massdrop/ctrl/keymaps/xanimos/keymap.c    |  4 +-
 keyboards/matrix/m20add/config.h              |  2 +-
 keyboards/matrix/m20add/rgb_ring.c            |  4 +-
 keyboards/matrix/noah/config.h                |  2 +-
 keyboards/matrix/noah/noah.c                  |  2 +-
 .../mechlovin/adelais/rgb_led/rev1/config.h   |  2 +-
 .../mechlovin/adelais/rgb_led/rev2/config.h   |  2 +-
 .../mechlovin/adelais/rgb_led/rev2/rev2.c     |  2 +-
 .../mechlovin/adelais/rgb_led/rev3/config.h   |  2 +-
 .../mechlovin/adelais/rgb_led/rev3/rev3.c     |  2 +-
 keyboards/mechlovin/delphine/rgb_led/config.h |  2 +-
 .../mechlovin/delphine/rgb_led/rgb_led.c      |  2 +-
 keyboards/mechlovin/hannah60rgb/rev1/config.h |  2 +-
 keyboards/mechlovin/hannah60rgb/rev2/config.h |  2 +-
 keyboards/mechlovin/hannah60rgb/rev2/rev2.c   |  2 +-
 .../mechlovin/infinity87/rgb_rev1/config.h    |  2 +-
 .../mechlovin/infinity87/rgb_rev1/rgb_rev1.c  |  2 +-
 keyboards/mechlovin/infinity875/config.h      |  2 +-
 .../keymaps/default/rgb_matrix_user.inc       | 54 +++++++++----------
 .../keymaps/via/rgb_matrix_user.inc           | 54 +++++++++----------
 keyboards/melgeek/mach80/rev1/config.h        |  2 +-
 keyboards/melgeek/mach80/rev1/rev1.c          |  2 +-
 keyboards/melgeek/mach80/rev2/config.h        |  2 +-
 keyboards/melgeek/mach80/rev2/rev2.c          |  2 +-
 keyboards/melgeek/mj61/rev1/config.h          |  2 +-
 keyboards/melgeek/mj61/rev1/rev1.c            |  2 +-
 keyboards/melgeek/mj61/rev2/config.h          |  2 +-
 keyboards/melgeek/mj61/rev2/rev2.c            |  2 +-
 keyboards/melgeek/mj63/rev1/config.h          |  2 +-
 keyboards/melgeek/mj63/rev1/rev1.c            |  2 +-
 keyboards/melgeek/mj63/rev2/config.h          |  2 +-
 keyboards/melgeek/mj63/rev2/rev2.c            |  2 +-
 keyboards/melgeek/mj64/rev1/config.h          |  2 +-
 keyboards/melgeek/mj64/rev1/rev1.c            |  2 +-
 keyboards/melgeek/mj64/rev2/config.h          |  2 +-
 keyboards/melgeek/mj64/rev2/rev2.c            |  2 +-
 keyboards/melgeek/mj64/rev3/config.h          |  2 +-
 keyboards/melgeek/mj64/rev3/rev3.c            |  2 +-
 keyboards/melgeek/mj65/rev3/config.h          |  2 +-
 keyboards/melgeek/mj65/rev3/rev3.c            |  2 +-
 keyboards/melgeek/mojo68/rev1/config.h        |  2 +-
 keyboards/melgeek/mojo68/rev1/rev1.c          |  2 +-
 keyboards/melgeek/mojo75/rev1/config.h        |  2 +-
 keyboards/melgeek/mojo75/rev1/rev1.c          |  2 +-
 keyboards/melgeek/tegic/rev1/config.h         |  2 +-
 keyboards/melgeek/tegic/rev1/rev1.c           |  2 +-
 keyboards/melgeek/z70ultra/config.h           |  2 +-
 keyboards/melgeek/z70ultra/z70ultra.c         |  2 +-
 keyboards/merge/um70/config.h                 |  2 +-
 keyboards/merge/um80/config.h                 |  2 +-
 keyboards/miller/gm862/config.h               |  2 +-
 keyboards/miller/gm862/gm862.c                |  2 +-
 keyboards/ml/gas75/config.h                   |  2 +-
 keyboards/momokai/tap_trio/config.h           |  2 +-
 keyboards/monstargear/xo87/rgb/config.h       |  2 +-
 .../monstargear/xo87/solderable/config.h      |  2 +-
 keyboards/moonlander/config.h                 |  2 +-
 keyboards/moonlander/moonlander.c             |  2 +-
 keyboards/mss_studio/m63_rgb/config.h         |  2 +-
 keyboards/mss_studio/m64_rgb/config.h         |  2 +-
 keyboards/mt/mt64rgb/config.h                 |  2 +-
 keyboards/mt/mt64rgb/mt64rgb.c                |  2 +-
 keyboards/mt/mt84/config.h                    |  2 +-
 keyboards/mt/mt84/mt84.c                      |  2 +-
 keyboards/mwstudio/mw65_rgb/config.h          |  2 +-
 .../keymaps/horrortroll/led/custom_gradient.c |  2 +-
 .../rainbow_reactive_simple.h                 |  2 +-
 .../horrortroll/led/random_breath_rainbow.c   |  6 +--
 keyboards/mwstudio/mw75/config.h              |  2 +-
 keyboards/mwstudio/mw75r2/config.h            |  2 +-
 keyboards/nack/config.h                       |  2 +-
 keyboards/neson_design/700e/700e.c            | 20 +++----
 keyboards/neson_design/700e/config.h          |  2 +-
 keyboards/neson_design/n6/config.h            |  2 +-
 keyboards/neson_design/n6/n6.c                | 14 ++---
 keyboards/novelkeys/nk20/config.h             |  2 +-
 keyboards/novelkeys/nk65/config.h             |  2 +-
 keyboards/novelkeys/nk65b/config.h            |  2 +-
 keyboards/novelkeys/nk87/config.h             |  2 +-
 keyboards/novelkeys/nk87b/config.h            |  2 +-
 keyboards/omkbd/runner3680/5x6_5x8/config.h   |  2 +-
 keyboards/opendeck/32/rev1/config.h           |  2 +-
 keyboards/opendeck/32/rev1/rev1.c             |  2 +-
 keyboards/owlab/voice65/hotswap/config.h      |  2 +-
 keyboards/owlab/voice65/hotswap/hotswap.c     |  2 +-
 keyboards/owlab/voice65/soldered/config.h     |  2 +-
 keyboards/owlab/voice65/soldered/soldered.c   |  2 +-
 keyboards/paprikman/albacore/config.h         |  2 +-
 keyboards/percent/canoe_gen2/config.h         |  2 +-
 .../phase_studio/titan65/hotswap/config.h     |  2 +-
 keyboards/planck/ez/config.h                  |  2 +-
 keyboards/planck/ez/ez.c                      |  2 +-
 .../planck/keymaps/charlesrocket/keymap.c     |  4 +-
 keyboards/planck/keymaps/oryx/keymap.c        |  4 +-
 keyboards/planck/keymaps/tom/keymap.c         |  6 +--
 keyboards/planck/keymaps/tylerwince/keymap.c  |  4 +-
 keyboards/planck/light/config.h               |  2 +-
 keyboards/planck/light/light.c                |  2 +-
 keyboards/planck/rev6/config.h                |  2 +-
 keyboards/planck/rev6_drop/config.h           |  2 +-
 keyboards/playkbtw/pk64rgb/config.h           |  2 +-
 keyboards/playkbtw/pk64rgb/pk64rgb.c          |  2 +-
 keyboards/pom_keyboards/tnln95/config.h       |  2 +-
 keyboards/preonic/rev3/config.h               |  2 +-
 keyboards/preonic/rev3_drop/config.h          |  2 +-
 keyboards/qpockets/space_space/rev2/config.h  |  2 +-
 keyboards/rgbkb/mun/config.h                  |  2 +-
 keyboards/rgbkb/pan/config.h                  |  2 +-
 keyboards/rgbkb/pan/pan.c                     |  4 +-
 keyboards/rgbkb/sol/rev1/config.h             |  2 +-
 keyboards/rgbkb/sol/rev2/config.h             |  2 +-
 keyboards/rgbkb/sol3/config.h                 |  2 +-
 keyboards/rgbkb/zygomorph/rev1/config.h       |  2 +-
 keyboards/ryanskidmore/rskeys100/config.h     |  2 +-
 keyboards/s_ol/0xc_pad/config.h               |  2 +-
 .../naked48/keymaps/salicylic/config.h        |  4 +-
 .../naked48/keymaps/via_rgb_matrix/config.h   |  4 +-
 .../setta21/keymaps/salicylic/config.h        |  4 +-
 keyboards/sawnsprojects/satxri6key/config.h   |  2 +-
 keyboards/senselessclay/ck60/config.h         |  2 +-
 keyboards/sets3n/kk980/config.h               |  2 +-
 keyboards/silverbullet44/config.h             |  2 +-
 keyboards/skmt/15k/config.h                   |  2 +-
 keyboards/smallkeyboard/config.h              |  2 +-
 keyboards/smallkeyboard/smallkeyboard.c       |  2 +-
 keyboards/sofle/keymaps/devdev/config.h       |  4 +-
 keyboards/sofle/keymaps/killmaster/config.h   |  2 +-
 keyboards/sofle/keymaps/rgb_default/config.h  |  4 +-
 keyboards/sofle/keymaps/via/config.h          |  2 +-
 keyboards/sowbug/68keys/config.h              |  2 +-
 keyboards/sowbug/ansi_tkl/config.h            |  2 +-
 keyboards/spaceholdings/nebula12/config.h     |  2 +-
 keyboards/spaceholdings/nebula12b/config.h    |  2 +-
 keyboards/spaceholdings/nebula68/config.h     |  2 +-
 keyboards/spaceholdings/nebula68b/config.h    |  2 +-
 keyboards/spaceholdings/nebula68b/hs/config.h |  4 +-
 keyboards/splitkb/kyria/rev1/config.h         |  2 +-
 keyboards/splitkb/kyria/rev2/config.h         |  2 +-
 keyboards/synapse/config.h                    |  2 +-
 keyboards/system76/launch_1/config.h          |  2 +-
 keyboards/system76/launch_1/rgb_matrix_kb.inc | 12 ++---
 keyboards/system76/system76_ec.c              |  6 +--
 keyboards/terrazzo/config.h                   |  2 +-
 keyboards/terrazzo/terrazzo.c                 |  8 +--
 keyboards/tkc/portico/config.h                |  4 +-
 keyboards/tkc/portico/portico.c               |  2 +-
 keyboards/tkc/portico68v2/config.h            |  2 +-
 keyboards/tkc/portico68v2/portico68v2.c       |  2 +-
 keyboards/tkc/portico75/config.h              |  4 +-
 keyboards/tkc/portico75/portico75.c           |  2 +-
 keyboards/tominabox1/le_chiffre/config.h      |  2 +-
 keyboards/tzarc/djinn/rev1/config.h           |  2 +-
 keyboards/tzarc/djinn/rev2/config.h           |  2 +-
 keyboards/ungodly/launch_pad/config.h         |  4 +-
 keyboards/wekey/we27/config.h                 |  2 +-
 keyboards/wilba_tech/rama_works_kara/config.h |  2 +-
 keyboards/wilba_tech/rama_works_koyu/config.h |  2 +-
 .../wilba_tech/rama_works_m10_c/config.h      |  2 +-
 .../wilba_tech/rama_works_m50_a/config.h      |  2 +-
 .../wilba_tech/rama_works_m60_a/config.h      |  2 +-
 .../wilba_tech/rama_works_m65_b/config.h      |  2 +-
 .../wilba_tech/rama_works_m65_bx/config.h     |  2 +-
 .../wilba_tech/rama_works_u80_a/config.h      |  2 +-
 keyboards/wilba_tech/wt60_b/config.h          |  2 +-
 keyboards/wilba_tech/wt60_bx/config.h         |  2 +-
 keyboards/wilba_tech/wt60_c/config.h          |  2 +-
 keyboards/wilba_tech/wt_rgb_backlight.c       | 44 +++++++--------
 keyboards/wilba_tech/zeal60/config.h          |  2 +-
 keyboards/wilba_tech/zeal65/config.h          |  2 +-
 keyboards/winry/winry315/config.h             |  2 +-
 keyboards/winry/winry315/winry315.c           |  2 +-
 keyboards/work_louder/loop/config.h           |  2 +-
 keyboards/work_louder/micro/config.h          |  2 +-
 keyboards/work_louder/nano/config.h           |  2 +-
 keyboards/work_louder/work_board/config.h     |  2 +-
 keyboards/xbows/knight/config.h               |  2 +-
 keyboards/xbows/knight/knight.c               |  2 +-
 keyboards/xbows/knight_plus/config.h          |  2 +-
 keyboards/xbows/knight_plus/knight_plus.c     |  2 +-
 keyboards/xbows/nature/config.h               |  2 +-
 keyboards/xbows/nature/nature.c               |  2 +-
 keyboards/xbows/numpad/config.h               |  2 +-
 keyboards/xbows/numpad/numpad.c               |  2 +-
 keyboards/xbows/ranger/config.h               |  2 +-
 keyboards/xbows/ranger/ranger.c               |  2 +-
 keyboards/xbows/woody/config.h                |  2 +-
 keyboards/xbows/woody/woody.c                 |  2 +-
 keyboards/xelus/dawn60/rev1/config.h          |  2 +-
 keyboards/xelus/dawn60/rev1_qmk/config.h      |  2 +-
 keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c    |  2 +-
 keyboards/xelus/la_plus/config.h              |  2 +-
 keyboards/xelus/pachi/rgb/rev1/config.h       |  4 +-
 keyboards/xelus/pachi/rgb/rev1/rev1.c         |  2 +-
 keyboards/xelus/pachi/rgb/rev2/config.h       |  4 +-
 keyboards/xelus/pachi/rgb/rev2/rev2.c         |  2 +-
 keyboards/xelus/valor/rev2/config.h           |  2 +-
 keyboards/yandrstudio/nz64/config.h           |  4 +-
 keyboards/yandrstudio/nz67v2/config.h         |  2 +-
 keyboards/yandrstudio/tg67/config.h           |  2 +-
 keyboards/yanghu/unicorne/config.h            |  2 +-
 keyboards/yncognito/batpad/config.h           |  2 +-
 keyboards/yushakobo/quick17/config.h          |  4 +-
 keyboards/yushakobo/quick17/rgb_matrix_kb.inc |  2 +-
 .../community/ortho_3x10/bbaserdem/config.h   |  2 +-
 layouts/community/ortho_4x12/drashna/config.h |  2 +-
 .../community/split_3x5_3/bbaserdem/config.h  |  6 +--
 .../community/split_3x6_3/drashna/config.h    |  2 +-
 quantum/led_matrix/led_matrix.c               |  8 +--
 quantum/led_matrix/led_matrix.h               | 16 +++---
 quantum/led_matrix/led_matrix_drivers.c       |  2 +-
 quantum/led_matrix/led_matrix_types.h         |  4 +-
 .../animations/jellybean_raindrops_anim.h     |  2 +-
 .../rgb_matrix/animations/pixel_flow_anim.h   |  4 +-
 .../rgb_matrix/animations/pixel_rain_anim.h   |  2 +-
 .../rgb_matrix/animations/raindrops_anim.h    |  2 +-
 quantum/rgb_matrix/rgb_matrix.c               |  8 +--
 quantum/rgb_matrix/rgb_matrix.h               | 16 +++---
 quantum/rgb_matrix/rgb_matrix_drivers.c       |  6 +--
 quantum/rgb_matrix/rgb_matrix_types.h         |  4 +-
 users/brandonschlack/rgb_bs.c                 |  2 +-
 .../byungyoonc/saturated_solid_multisplash.h  |  2 +-
 users/curry/rgb_matrix_user.c                 |  4 +-
 users/drashna/rgb/rgb_matrix_stuff.c          |  4 +-
 users/tominabox1/config.h                     |  2 +-
 users/tominabox1/dimple_rgb.c                 | 10 ++--
 users/tominabox1/tominabox1.c                 |  4 +-
 577 files changed, 836 insertions(+), 831 deletions(-)

diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index 563fa149a2..cc036eb80f 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -22,7 +22,7 @@ You can use between 1 and 4 IS31FL3731 IC's. Do not specify `LED_DRIVER_ADDR_<N>
 | `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
 | `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
 | `LED_DRIVER_COUNT` | (Required) How many LED driver IC's are present | |
-| `DRIVER_LED_TOTAL` | (Required) How many LED lights are present across all drivers | |
+| `LED_MATRIX_LED_COUNT` | (Required) How many LED lights are present across all drivers | |
 | `LED_DRIVER_ADDR_1` | (Required) Address for the first LED driver | |
 | `LED_DRIVER_ADDR_2` | (Optional) Address for the second LED driver | |
 | `LED_DRIVER_ADDR_3` | (Optional) Address for the third LED driver | |
@@ -44,17 +44,17 @@ Here is an example using 2 drivers.
 #define LED_DRIVER_COUNT 2
 #define LED_DRIVER_1_LED_TOTAL 25
 #define LED_DRIVER_2_LED_TOTAL 24
-#define DRIVER_LED_TOTAL (LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL)
+#define LED_MATRIX_LED_COUNT (LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL)
 ```
 
-!> Note the parentheses, this is so when `LED_DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL)` will give very different results than `rand() % LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL`.
+!> Note the parentheses, this is so when `LED_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL)` will give very different results than `rand() % LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL`.
 
 For split keyboards using `LED_MATRIX_SPLIT` with an LED driver, you can either have the same driver address or different driver addresses. If using different addresses, use `DRIVER_ADDR_1` for one and `DRIVER_ADDR_2` for the other one. Then, in `g_is31_leds`, fill out the correct driver index (0 or 1). If using one address, use `DRIVER_ADDR_1` for both, and use index 0 for `g_is31_leds`.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
@@ -95,7 +95,7 @@ Configure the hardware via your `config.h`:
 | `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
 | `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
 | `DRIVER_COUNT` | (Required) How many LED driver IC's are present | |
-| `DRIVER_LED_TOTAL` | (Required) How many LED lights are present across all drivers | |
+| `LED_MATRIX_LED_COUNT` | (Required) How many LED lights are present across all drivers | |
 | `DRIVER_ADDR_1` | (Optional) Address for the first LED driver | |
 | `DRIVER_ADDR_<N>` | (Required) Address for the additional LED drivers | |
 | `ISSI_SSR_<N>` | (Optional) Configuration for the Spread Spectrum Register | |
@@ -130,16 +130,16 @@ Here is an example using 2 drivers.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 42
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define LED_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 ```
-!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+!> Note the parentheses, this is so when `LED_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
 
 Currently only 4 drivers are supported, but it would be trivial to support for more. Note that using a combination of different drivers is not supported. All drivers must be of the same model.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led __flash g_is31_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
@@ -367,7 +367,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 #define LED_DISABLE_TIMEOUT 0 // number of milliseconds to wait until led automatically turns off
 #define LED_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
 #define LED_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define LED_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define LED_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define LED_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs
 #define LED_MATRIX_STARTUP_MODE LED_MATRIX_SOLID // Sets the default mode, if none has been set
@@ -391,7 +391,7 @@ Where `28` is an unused index from `eeconfig.h`.
 |Function                                    |Description  |
 |--------------------------------------------|-------------|
 |`led_matrix_set_value_all(v)`         |Set all of the LEDs to the given value, where `v` is between 0 and 255 (not written to EEPROM) |
-|`led_matrix_set_value(index, v)`      |Set a single LED to the given value, where `v` is between 0 and 255, and `index` is between 0 and `DRIVER_LED_TOTAL` (not written to EEPROM) |
+|`led_matrix_set_value(index, v)`      |Set a single LED to the given value, where `v` is between 0 and 255, and `index` is between 0 and `LED_MATRIX_LED_COUNT` (not written to EEPROM) |
 
 ### Disable/Enable Effects :id=disable-enable-effects
 |Function                                    |Description  |
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 13c63ac94c..11b9b1c5bc 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -23,7 +23,7 @@ You can use between 1 and 4 IS31FL3731 IC's. Do not specify `DRIVER_ADDR_<N>` de
 | `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
 | `ISSI_3731_DEGHOST` | (Optional) Set this define to enable de-ghosting by halving Vcc during blanking time | |
 | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
-| `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
+| `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
 | `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
 | `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
 | `DRIVER_ADDR_3` | (Optional) Address for the third RGB driver | |
@@ -45,17 +45,17 @@ Here is an example using 2 drivers.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 25
 #define DRIVER_2_LED_TOTAL 24
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 ```
 
-!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+!> Note the parentheses, this is so when `RGB_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
 
 For split keyboards using `RGB_MATRIX_SPLIT` with an LED driver, you can either have the same driver address or different driver addresses. If using different addresses, use `DRIVER_ADDR_1` for one and `DRIVER_ADDR_2` for the other one. Then, in `g_is31_leds`, fill out the correct driver index (0 or 1). If using one address, use `DRIVER_ADDR_1` for both, and use index 0 for `g_is31_leds`.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -90,7 +90,7 @@ You can use between 1 and 4 IS31FL3733 IC's. Do not specify `DRIVER_ADDR_<N>` de
 | `ISSI_SWPULLUP` | (Optional) Set the value of the SWx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `ISSI_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
-| `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
+| `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
 | `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
 | `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
 | `DRIVER_ADDR_3` | (Optional) Address for the third RGB driver | |
@@ -131,17 +131,17 @@ Here is an example using 2 drivers.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 58
 #define DRIVER_2_LED_TOTAL 10
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 ```
 
-!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+!> Note the parentheses, this is so when `RGB_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
 
 Currently only 4 drivers are supported, but it would be trivial to support all 8 combinations.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -177,7 +177,7 @@ Configure the hardware via your `config.h`:
 | `ISSI_SWPULLUP` | (Optional) Set the value of the SWx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `ISSI_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
-| `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
+| `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
 | `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
 | `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
 
@@ -212,16 +212,16 @@ Here is an example using 2 drivers.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 30
 #define DRIVER_2_LED_TOTAL 36
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 ```
-!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+!> Note the parentheses, this is so when `RGB_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
 
 Currently only 2 drivers are supported, but it would be trivial to support all 4 combinations.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -263,7 +263,7 @@ Configure the hardware via your `config.h`:
 | `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
 | `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
 | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
-| `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
+| `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
 | `DRIVER_ADDR_1` | (Optional) Address for the first RGB driver | |
 | `DRIVER_ADDR_<N>` | (Required) Address for the additional RGB drivers | |
 | `ISSI_SSR_<N>` | (Optional) Configuration for the Spread Spectrum Register | |
@@ -300,17 +300,17 @@ Here is an example using 2 drivers.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 42
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 ```
 
-!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+!> Note the parentheses, this is so when `RGB_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
 
 Currently only 4 drivers are supported, but it would be trivial to support for more. Note that using a combination of different drivers is not supported. All drivers must be of the same model.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led __flash g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -361,7 +361,7 @@ Configure the hardware via your `config.h`:
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN D7
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_LED_COUNT 70
 ```
 
 ?> There are additional configuration options for ARM controllers that offer increased performance over the default bitbang driver. Please see [WS2812 Driver](ws2812_driver.md) for more information.
@@ -385,7 +385,7 @@ Configure the hardware via your `config.h`:
 // The pin connected to the clock pin of the LEDs
 #define RGB_CI_PIN D6
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_LED_COUNT 70
 ```
 
 ---
@@ -408,7 +408,7 @@ You can use up to 2 AW20216 IC's. Do not specify `DRIVER_<N>_xxx` defines for IC
 | `DRIVER_1_LED_TOTAL` | (Required) How many RGB lights are connected to first RGB driver  | |
 | `DRIVER_2_LED_TOTAL` | (Optional) How many RGB lights are connected to second RGB driver  | |
 | `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
-| `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
+| `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
 | `AW_SCALING_MAX` | (Optional) LED current scaling value (0-255, higher values mean LED is brighter at full PWM) | 150 |
 | `AW_GLOBAL_CURRENT_MAX` | (Optional) Driver global current limit (0-255, higher values means the driver may consume more power) | 150 |
 | `AW_SPI_MODE` | (Optional) Mode for SPI communication (0-3, defines polarity and phase of the clock) | 3 |
@@ -426,15 +426,15 @@ Here is an example using 2 drivers.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 32
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 ```
 
-!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+!> Note the parentheses, this is so when `RGB_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const aw_led PROGMEM g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led PROGMEM g_aw_leds[RGB_MATRIX_LED_COUNT] = {
 /* Each AW20216 channel is controlled by a register at some offset between 0x00
  * and 0xD7 inclusive.
  * See drivers/awinic/aw20216.h for the mapping between register offsets and
@@ -794,7 +794,7 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
 #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
@@ -824,7 +824,7 @@ Where `28` is an unused index from `eeconfig.h`.
 |Function                                    |Description  |
 |--------------------------------------------|-------------|
 |`rgb_matrix_set_color_all(r, g, b)`         |Set all of the LEDs to the given RGB value, where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) |
-|`rgb_matrix_set_color(index, r, g, b)`      |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255, and `index` is between 0 and `DRIVER_LED_TOTAL` (not written to EEPROM) |
+|`rgb_matrix_set_color(index, r, g, b)`      |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255, and `index` is between 0 and `RGB_MATRIX_LED_COUNT` (not written to EEPROM) |
 
 ### Disable/Enable Effects :id=disable-enable-effects
 |Function                                    |Description  |
diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
index 55083936ef..cbb0b60774 100644
--- a/drivers/led/aw20216.c
+++ b/drivers/led/aw20216.c
@@ -133,7 +133,7 @@ void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void AW20216_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         AW20216_set_color(i, red, green, blue);
     }
 }
diff --git a/drivers/led/aw20216.h b/drivers/led/aw20216.h
index 0a17050fed..c6e71b4b4e 100644
--- a/drivers/led/aw20216.h
+++ b/drivers/led/aw20216.h
@@ -28,7 +28,7 @@ typedef struct aw_led {
     uint8_t b;
 } aw_led;
 
-extern const aw_led PROGMEM g_aw_leds[DRIVER_LED_TOTAL];
+extern const aw_led PROGMEM g_aw_leds[RGB_MATRIX_LED_COUNT];
 
 void AW20216_init(pin_t cs_pin, pin_t en_pin);
 void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
diff --git a/drivers/led/ckled2001-simple.c b/drivers/led/ckled2001-simple.c
index da4bf20b99..6c4ffd398e 100644
--- a/drivers/led/ckled2001-simple.c
+++ b/drivers/led/ckled2001-simple.c
@@ -148,7 +148,7 @@ void CKLED2001_init(uint8_t addr) {
 
 void CKLED2001_set_value(int index, uint8_t value) {
     ckled2001_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
 
         g_pwm_buffer[led.driver][led.v]          = value;
@@ -157,7 +157,7 @@ void CKLED2001_set_value(int index, uint8_t value) {
 }
 
 void CKLED2001_set_value_all(uint8_t value) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
         CKLED2001_set_value(i, value);
     }
 }
diff --git a/drivers/led/ckled2001-simple.h b/drivers/led/ckled2001-simple.h
index 731da2e1cd..a56cad3461 100644
--- a/drivers/led/ckled2001-simple.h
+++ b/drivers/led/ckled2001-simple.h
@@ -25,7 +25,7 @@ typedef struct ckled2001_led {
     uint8_t v;
 } __attribute__((packed)) ckled2001_led;
 
-extern const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL];
+extern const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT];
 
 void CKLED2001_init(uint8_t addr);
 bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/ckled2001.c b/drivers/led/ckled2001.c
index b7e7db06cc..1651628175 100644
--- a/drivers/led/ckled2001.c
+++ b/drivers/led/ckled2001.c
@@ -148,7 +148,7 @@ void CKLED2001_init(uint8_t addr) {
 
 void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     ckled2001_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
 
         g_pwm_buffer[led.driver][led.r]          = red;
@@ -159,7 +159,7 @@ void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void CKLED2001_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         CKLED2001_set_color(i, red, green, blue);
     }
 }
diff --git a/drivers/led/ckled2001.h b/drivers/led/ckled2001.h
index 7d5ad34f95..aa70a0623f 100644
--- a/drivers/led/ckled2001.h
+++ b/drivers/led/ckled2001.h
@@ -27,7 +27,7 @@ typedef struct ckled2001_led {
     uint8_t b;
 } __attribute__((packed)) ckled2001_led;
 
-extern const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL];
+extern const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT];
 
 void CKLED2001_init(uint8_t addr);
 bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31fl3731-simple.c b/drivers/led/issi/is31fl3731-simple.c
index 3abe9ea337..84060f9426 100644
--- a/drivers/led/issi/is31fl3731-simple.c
+++ b/drivers/led/issi/is31fl3731-simple.c
@@ -194,7 +194,7 @@ void IS31FL3731_init(uint8_t addr) {
 
 void IS31FL3731_set_value(int index, uint8_t value) {
     is31_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         // Subtract 0x24 to get the second index of g_pwm_buffer
@@ -204,7 +204,7 @@ void IS31FL3731_set_value(int index, uint8_t value) {
 }
 
 void IS31FL3731_set_value_all(uint8_t value) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
         IS31FL3731_set_value(i, value);
     }
 }
diff --git a/drivers/led/issi/is31fl3731-simple.h b/drivers/led/issi/is31fl3731-simple.h
index ded94b0470..1ddadd5209 100644
--- a/drivers/led/issi/is31fl3731-simple.h
+++ b/drivers/led/issi/is31fl3731-simple.h
@@ -27,7 +27,7 @@ typedef struct is31_led {
     uint8_t v;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT];
 
 void IS31FL3731_init(uint8_t addr);
 void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c
index 9c6c29f081..fed5354145 100644
--- a/drivers/led/issi/is31fl3731.c
+++ b/drivers/led/issi/is31fl3731.c
@@ -182,7 +182,7 @@ void IS31FL3731_init(uint8_t addr) {
 
 void IS31FL3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         // Subtract 0x24 to get the second index of g_pwm_buffer
@@ -194,7 +194,7 @@ void IS31FL3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void IS31FL3731_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3731_set_color(i, red, green, blue);
     }
 }
diff --git a/drivers/led/issi/is31fl3731.h b/drivers/led/issi/is31fl3731.h
index 6647119eba..6791289c9e 100644
--- a/drivers/led/issi/is31fl3731.h
+++ b/drivers/led/issi/is31fl3731.h
@@ -28,7 +28,7 @@ typedef struct is31_led {
     uint8_t b;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
 void IS31FL3731_init(uint8_t addr);
 void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
index 2f41a7b1a9..1e0994d780 100644
--- a/drivers/led/issi/is31fl3733-simple.c
+++ b/drivers/led/issi/is31fl3733-simple.c
@@ -195,7 +195,7 @@ void IS31FL3733_init(uint8_t addr, uint8_t sync) {
 }
 
 void IS31FL3733_set_value(int index, uint8_t value) {
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         is31_led led = g_is31_leds[index];
 
         g_pwm_buffer[led.driver][led.v]          = value;
@@ -204,7 +204,7 @@ void IS31FL3733_set_value(int index, uint8_t value) {
 }
 
 void IS31FL3733_set_value_all(uint8_t value) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
         IS31FL3733_set_value(i, value);
     }
 }
diff --git a/drivers/led/issi/is31fl3733-simple.h b/drivers/led/issi/is31fl3733-simple.h
index f5253e3101..f0ea3adca0 100644
--- a/drivers/led/issi/is31fl3733-simple.h
+++ b/drivers/led/issi/is31fl3733-simple.h
@@ -29,7 +29,7 @@ typedef struct is31_led {
     uint8_t v;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led __flash g_is31_leds[LED_MATRIX_LED_COUNT];
 
 void IS31FL3733_init(uint8_t addr, uint8_t sync);
 bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
index add998f256..379eaa0ae3 100644
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -186,7 +186,7 @@ void IS31FL3733_init(uint8_t addr, uint8_t sync) {
 
 void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         g_pwm_buffer[led.driver][led.r]          = red;
@@ -197,7 +197,7 @@ void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void IS31FL3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3733_set_color(i, red, green, blue);
     }
 }
diff --git a/drivers/led/issi/is31fl3733.h b/drivers/led/issi/is31fl3733.h
index 7653dd17c0..29441846ac 100644
--- a/drivers/led/issi/is31fl3733.h
+++ b/drivers/led/issi/is31fl3733.h
@@ -30,7 +30,7 @@ typedef struct is31_led {
     uint8_t b;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
 void IS31FL3733_init(uint8_t addr, uint8_t sync);
 bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
index e9943614d2..82e7ee3d18 100644
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -168,7 +168,7 @@ void IS31FL3736_init(uint8_t addr) {
 
 void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         g_pwm_buffer[led.driver][led.r] = red;
@@ -179,7 +179,7 @@ void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void IS31FL3736_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3736_set_color(i, red, green, blue);
     }
 }
diff --git a/drivers/led/issi/is31fl3736.h b/drivers/led/issi/is31fl3736.h
index f126034615..ccb19afbcc 100644
--- a/drivers/led/issi/is31fl3736.h
+++ b/drivers/led/issi/is31fl3736.h
@@ -28,8 +28,8 @@
 #    define DRIVER_COUNT 2
 #endif
 
-#ifndef DRIVER_LED_TOTAL
-#    define DRIVER_LED_TOTAL 96
+#ifndef RGB_MATRIX_LED_COUNT
+#    define RGB_MATRIX_LED_COUNT 96
 #endif
 
 typedef struct is31_led {
@@ -39,7 +39,7 @@ typedef struct is31_led {
     uint8_t b;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
 void IS31FL3736_init(uint8_t addr);
 void IS31FL3736_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
index 932530ac0a..45a20018c5 100644
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -175,7 +175,7 @@ void IS31FL3737_init(uint8_t addr) {
 
 void IS31FL3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         g_pwm_buffer[led.driver][led.r]          = red;
@@ -186,7 +186,7 @@ void IS31FL3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void IS31FL3737_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3737_set_color(i, red, green, blue);
     }
 }
diff --git a/drivers/led/issi/is31fl3737.h b/drivers/led/issi/is31fl3737.h
index ddb70a9df5..fb0c33420c 100644
--- a/drivers/led/issi/is31fl3737.h
+++ b/drivers/led/issi/is31fl3737.h
@@ -30,7 +30,7 @@ typedef struct is31_led {
     uint8_t b;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
 void IS31FL3737_init(uint8_t addr);
 void IS31FL3737_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
index ba6b6761a3..c2cdd4c46f 100644
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -179,7 +179,7 @@ void IS31FL3741_init(uint8_t addr) {
 
 void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         g_pwm_buffer[led.driver][led.r]          = red;
@@ -190,7 +190,7 @@ void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void IS31FL3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3741_set_color(i, red, green, blue);
     }
 }
diff --git a/drivers/led/issi/is31fl3741.h b/drivers/led/issi/is31fl3741.h
index 3bdb23bd2d..b0089ea5ba 100644
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -30,7 +30,7 @@ typedef struct is31_led {
     uint32_t b : 10;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
 void IS31FL3741_init(uint8_t addr);
 void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/drivers/led/issi/is31flcommon.c b/drivers/led/issi/is31flcommon.c
index 9f4b2123ff..106890a8bf 100644
--- a/drivers/led/issi/is31flcommon.c
+++ b/drivers/led/issi/is31flcommon.c
@@ -135,14 +135,17 @@ void IS31FL_common_update_pwm_register(uint8_t addr, uint8_t index) {
 void IS31FL_set_manual_scaling_buffer(void) {
     for (int i = 0; i < ISSI_MANUAL_SCALING; i++) {
         is31_led scale = g_is31_scaling[i];
-        if (scale.driver >= 0 && scale.driver < DRIVER_LED_TOTAL) {
+#    ifdef RGB_MATRIX_ENABLE
+        if (scale.driver >= 0 && scale.driver < RGB_MATRIX_LED_COUNT) {
             is31_led led = g_is31_leds[scale.driver];
 
-#    ifdef RGB_MATRIX_ENABLE
             g_scaling_buffer[led.driver][led.r] = scale.r;
             g_scaling_buffer[led.driver][led.g] = scale.g;
             g_scaling_buffer[led.driver][led.b] = scale.b;
 #    elif defined(LED_MATRIX_ENABLE)
+        if (scale.driver >= 0 && scale.driver < LED_MATRIX_LED_COUNT) {
+            is31_led led = g_is31_leds[scale.driver];
+
             g_scaling_buffer[led.driver][led.v] = scale.v;
 #    endif
             g_scaling_buffer_update_required[led.driver] = true;
@@ -165,7 +168,7 @@ void IS31FL_common_update_scaling_register(uint8_t addr, uint8_t index) {
 #ifdef RGB_MATRIX_ENABLE
 // Colour is set by adjusting PWM register
 void IS31FL_RGB_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         is31_led led = g_is31_leds[index];
 
         g_pwm_buffer[led.driver][led.r]          = red;
@@ -176,7 +179,7 @@ void IS31FL_RGB_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void IS31FL_RGB_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL_RGB_set_color(i, red, green, blue);
     }
 }
@@ -215,7 +218,7 @@ void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value) {
 }
 
 void IS31FL_simple_set_brightness(int index, uint8_t value) {
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         is31_led led = g_is31_leds[index];
         g_pwm_buffer[led.driver][led.v] = value;
         g_pwm_buffer_update_required[led.driver] = true;
@@ -223,7 +226,7 @@ void IS31FL_simple_set_brightness(int index, uint8_t value) {
 }
 
 void IS31FL_simple_set_brigntness_all(uint8_t value) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
         IS31FL_simple_set_brightness(i, value);
     }
 }
diff --git a/drivers/led/issi/is31flcommon.h b/drivers/led/issi/is31flcommon.h
index 77e9665e32..18432ffc31 100644
--- a/drivers/led/issi/is31flcommon.h
+++ b/drivers/led/issi/is31flcommon.h
@@ -43,11 +43,15 @@ typedef struct is31_led {
     uint8_t b;
 } __attribute__((packed)) is31_led;
 
+extern const is31_led __flash g_is31_leds[RGB_MATRIX_LED_COUNT];
+
 #elif defined(LED_MATRIX_ENABLE)
 typedef struct is31_led {
     uint8_t driver;
     uint8_t v;
 } __attribute__((packed)) is31_led;
+
+extern const is31_led __flash g_is31_leds[LED_MATRIX_LED_COUNT];
 #endif
 
 #ifdef ISSI_MANUAL_SCALING
@@ -55,8 +59,6 @@ extern const is31_led __flash g_is31_scaling[];
 void                          IS31FL_set_manual_scaling_buffer(void);
 #endif
 
-extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL];
-
 void IS31FL_write_single_register(uint8_t addr, uint8_t reg, uint8_t data);
 bool IS31FL_write_multi_registers(uint8_t addr, uint8_t *source_buffer, uint8_t buffer_size, uint8_t transfer_size, uint8_t start_reg_addr);
 void IS31FL_unlock_register(uint8_t addr, uint8_t page);
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 5bda238430..5e0d0e12ae 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -29,7 +29,7 @@
 #define ENCODERS_PAD_B { GP13 }
 
 #define RGB_DI_PIN GP0
-#define DRIVER_LED_TOTAL 47
+#define RGB_MATRIX_LED_COUNT 47
 #define RGBLED_NUM 47
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS  
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 1a9344cbac..9220655ac2 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16  // Add 12 if attaching the RGB LED ring
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    ifdef RGBLIGHT_ENABLE
 #        define RGBLIGHT_HUE_STEP 8
 #        define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index cea3c4edb6..a37053a20f 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -62,7 +62,7 @@
 //#define BACKLIGHT_BREATHING
 
 #define RGB_DI_PIN B5
-#define DRIVER_LED_TOTAL 20
+#define RGB_MATRIX_LED_COUNT 20
 #ifdef RGB_DI_PIN
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGBLIGHT_LIMIT_VAL 255
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 5ccd3f1cd5..bb0a591610 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB matrix key backlighting */
 #define RGB_DI_PIN B2
-#define DRIVER_LED_TOTAL 2
+#define RGB_MATRIX_LED_COUNT 2
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE
 #define RGB_MATRIX_STARTUP_HUE 90
diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h
index bd24723df0..7403803f5d 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DRIVER_ADDR_1 0b1010000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 62
+#define RGB_MATRIX_LED_COUNT 62
 #define ISSI_PWM_FREQUENCY 0b010
 
 #define RGB_MATRIX_STARTUP_VAL 80
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
index 8f6ef05cec..72446d39be 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "rev_a.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, K_2,  J_2,  L_2 }, //D402
     { 0, K_3,  J_3,  L_3 }, //D403
     { 0, K_4,  J_4,  L_4 }, //D404
diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h
index 449f2da113..6be72c6495 100644
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ b/keyboards/abatskeyboardclub/nayeon/config.h
@@ -21,6 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Matrix setup */
 #define RGB_DI_PIN GP19
-#define DRIVER_LED_TOTAL 2
+#define RGB_MATRIX_LED_COUNT 2
 #define RGBLED_NUM 2
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 5df3628db2..8f6e3a87db 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define RGB_DI_PIN B15
-#define DRIVER_LED_TOTAL 87
+#define RGB_MATRIX_LED_COUNT 87
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 21fe929409..7adcf7a75b 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -45,8 +45,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 87
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
-#define ISSI_DRIVER_TOTAL DRIVER_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+#define ISSI_DRIVER_TOTAL RGB_MATRIX_LED_COUNT
 
 #define RGB_MATRIX_STARTUP_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c
index babad3c11c..89eed483c1 100644
--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "gamma.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 30021a51b9..7e2060ab2d 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define RGB_DI_PIN B15
-#define DRIVER_LED_TOTAL 86
+#define RGB_MATRIX_LED_COUNT 86
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 5df3628db2..8f6e3a87db 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define RGB_DI_PIN B15
-#define DRIVER_LED_TOTAL 87
+#define RGB_MATRIX_LED_COUNT 87
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index cc4cbc940c..568020eec8 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -78,7 +78,7 @@
 
      /* RGB Defines */
 #    define RGB_DI_PIN GP19
-#    define DRIVER_LED_TOTAL 12
+#    define RGB_MATRIX_LED_COUNT 12
 #    define RGBLED_NUM 12
 
      /* Enable Framebuffer and keypress effects */
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index b567c6450e..2a8f9927cd 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -21,7 +21,7 @@
 
 #define RGB_DI_PIN B7
 
-#define DRIVER_LED_TOTAL 42
+#define RGB_MATRIX_LED_COUNT 42
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_LED_PROCESS_LIMIT 21
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 2958e8daed..25d6912db2 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#define DRIVER_LED_TOTAL 68
+#define RGB_MATRIX_LED_COUNT 68
 #define RGB_MATRIX_SPLIT { 34, 34 }
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
index 6208224465..e543d7ae24 100644
--- a/keyboards/an_achronism/tetromino/config.h
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_LED_COUNT 70
 
 /* disable debug print */
 //#define NO_DEBUG
diff --git a/keyboards/annepro2/config_led.h b/keyboards/annepro2/config_led.h
index 19a1dd4baa..e6d4dc35fb 100644
--- a/keyboards/annepro2/config_led.h
+++ b/keyboards/annepro2/config_led.h
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-#define DRIVER_LED_TOTAL 61
+#define RGB_MATRIX_LED_COUNT 61
 
 /* Limit animations to 62.5 FPS to avoid tearing. (1/.016 = 62.5 FPS). */
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/annepro2/rgb_driver.c b/keyboards/annepro2/rgb_driver.c
index 1040e89f98..f1d2a3cd13 100644
--- a/keyboards/annepro2/rgb_driver.c
+++ b/keyboards/annepro2/rgb_driver.c
@@ -19,7 +19,7 @@
 #include "rgb_matrix.h"
 #include "ap2_led.h"
 
-uint8_t led_pos[DRIVER_LED_TOTAL];
+uint8_t led_pos[RGB_MATRIX_LED_COUNT];
 
 void init(void) {
     unsigned int i = 0;
@@ -52,7 +52,7 @@ void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
 }
 
 void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i=0; i<DRIVER_LED_TOTAL; i++)
+    for (int i=0; i<RGB_MATRIX_LED_COUNT; i++)
         set_color(i, r, g, b);
 }
 
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index e097c47cb0..baf1b14e7d 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -57,7 +57,7 @@
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true
-#define DRIVER_LED_TOTAL 96
+#define RGB_MATRIX_LED_COUNT 96
 #define RGB_MATRIX_STARTUP_HUE 170
 #define RGB_MATRIX_STARTUP_SAT 255
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index 1f0540c9e1..da4085588b 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -78,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 64
+#    define RGB_MATRIX_LED_COUNT 64
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index f6d0bc7019..a8ccf7fc43 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -17,7 +17,7 @@
 #include "hotswap.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_1,  A_1,  C_1 },
     { 0, B_2,  A_2,  C_2 },
     { 0, B_3,  A_3,  C_3 },
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 17f5675f60..ba3a157ced 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -91,7 +91,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 /* ws2812 RGB MATRIX */
-#   define DRIVER_LED_TOTAL 76
+#   define RGB_MATRIX_LED_COUNT 76
 
  // reacts to keypresses
 #   define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index 753e3d5a41..4d71a3ea53 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -36,7 +36,7 @@
 
 
 #define RGB_DI_PIN E6
-#define DRIVER_LED_TOTAL 80
+#define RGB_MATRIX_LED_COUNT 80
 
 /* RGB LED */
 #ifdef RGBLIGHT_ENABLE
@@ -75,7 +75,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 //#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index 6e3b8a7124..1368bce35b 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -38,7 +38,7 @@
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index 6b31a773fc..bf915b4faf 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -40,7 +40,7 @@
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index f557089073..4c0f508948 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -38,7 +38,7 @@
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 777f99197a..84b559a26b 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -37,7 +37,7 @@
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index 8494e2bfac..f887d8e0f0 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -37,7 +37,7 @@
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index 0624c4b4a6..867f69319b 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -37,7 +37,7 @@
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h
index 695daf901a..4275ffa19e 100644
--- a/keyboards/blockboy/ac980mini/config.h
+++ b/keyboards/blockboy/ac980mini/config.h
@@ -7,7 +7,7 @@
 // RGB configuration
 #define RGB_DI_PIN B7
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL  81
+#define RGB_MATRIX_LED_COUNT  81
 //#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 81
 
@@ -17,7 +17,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 //#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. 
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h
index 6ce8d2d420..587dda7381 100644
--- a/keyboards/boardsource/beiwagon/config.h
+++ b/keyboards/boardsource/beiwagon/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 #define RGB_DI_PIN C6
-#define DRIVER_LED_TOTAL 18
+#define RGB_MATRIX_LED_COUNT 18
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 #define ENABLE_RGB_MATRIX_BREATHING
diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h
index 8e635a24eb..382b1b6b3f 100644
--- a/keyboards/boardsource/lulu/config.h
+++ b/keyboards/boardsource/lulu/config.h
@@ -3,7 +3,7 @@
 
 #pragma once
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_LED_COUNT 70
 #define RGB_MATRIX_SPLIT { 35, 35 }
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
index e6a7ddc16b..4846bf5146 100644
--- a/keyboards/boardsource/microdox/v2/config.h
+++ b/keyboards/boardsource/microdox/v2/config.h
@@ -4,7 +4,7 @@
 
 #define RGB_DI_PIN B5
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#define DRIVER_LED_TOTAL 44
+#define RGB_MATRIX_LED_COUNT 44
 #define RGB_MATRIX_SPLIT { 22, 22 }
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h
index bbaacd33c4..c6edbf1c4e 100644
--- a/keyboards/boardsource/technik_o/config.h
+++ b/keyboards/boardsource/technik_o/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #define RGB_DI_PIN C6
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#define DRIVER_LED_TOTAL 58
+#define RGB_MATRIX_LED_COUNT 58
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 #define ENABLE_RGB_MATRIX_BREATHING
diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h
index 2141a2a0a9..ab4d79147c 100644
--- a/keyboards/boardsource/technik_s/config.h
+++ b/keyboards/boardsource/technik_s/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #define RGB_DI_PIN C6
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#define DRIVER_LED_TOTAL 55
+#define RGB_MATRIX_LED_COUNT 55
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 #define ENABLE_RGB_MATRIX_BREATHING
diff --git a/keyboards/boardsource/the_mark/config.h b/keyboards/boardsource/the_mark/config.h
index 61628e1821..6d9c9642de 100644
--- a/keyboards/boardsource/the_mark/config.h
+++ b/keyboards/boardsource/the_mark/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 #ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL 24
+#    define RGB_MATRIX_LED_COUNT 24
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 7429845958..f69e5f953f 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -155,7 +155,7 @@
 
 #define RGBLED_NUM 10
 #define RGB_DI_PIN B5
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c
index b37a88b32f..c6aca13032 100644
--- a/keyboards/canary/canary60rgb/canary60rgb.c
+++ b/keyboards/canary/canary60rgb/canary60rgb.c
@@ -16,7 +16,7 @@
  #include "canary60rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, J_14, K_14,  L_14 },
     { 0, J_13, K_13,  L_13 },
     { 0, J_12, K_12,  L_12 },
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index 8d3150a5d9..186cf189ae 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -78,5 +78,5 @@
 #    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 63
+#    define RGB_MATRIX_LED_COUNT 63
 #endif
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/config.h b/keyboards/capsunlocked/cu80/v2_ansi/config.h
index 4ff0af5c27..ae8d1cc741 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/config.h
+++ b/keyboards/capsunlocked/cu80/v2_ansi/config.h
@@ -24,5 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB */
-#define DRIVER_LED_TOTAL 87
+#define RGB_MATRIX_LED_COUNT 87
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/capsunlocked/cu80/v2_iso/config.h b/keyboards/capsunlocked/cu80/v2_iso/config.h
index 7980837acf..2411039d93 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/config.h
+++ b/keyboards/capsunlocked/cu80/v2_iso/config.h
@@ -25,5 +25,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB */
-#define DRIVER_LED_TOTAL 88
+#define RGB_MATRIX_LED_COUNT 88
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index b4664ec5c2..a1d7533f8a 100644
--- a/keyboards/checkerboards/quark_lp/config.h
+++ b/keyboards/checkerboards/quark_lp/config.h
@@ -41,7 +41,7 @@
 #define RGB_DI_PIN C2 // pin the DI on the ws2812 is hooked-up to
 
 #ifdef RGB_MATRIX_ENABLE
-#define DRIVER_LED_TOTAL 51
+#define RGB_MATRIX_LED_COUNT 51
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125 // limits maximum brightness of LEDs to 125 out of 255. Higher may cause the controller to crash.
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
index d915e59c7f..9a9c70167e 100644
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEBOUNCE 5
 
 #define RGB_DI_PIN E6
-#define DRIVER_LED_TOTAL 92
+#define RGB_MATRIX_LED_COUNT 92
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h
index 49b8eef7a8..e92f84ba87 100644
--- a/keyboards/chromatonemini/config.h
+++ b/keyboards/chromatonemini/config.h
@@ -88,7 +88,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 
 /* ws2812 RGB MATRIX */
-#   define DRIVER_LED_TOTAL 116
+#   define RGB_MATRIX_LED_COUNT 116
 
  // reacts to keypresses
 #   define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/chromatonemini/rgb_matrix_kb.inc b/keyboards/chromatonemini/rgb_matrix_kb.inc
index 4fe474e12c..09877e1a31 100644
--- a/keyboards/chromatonemini/rgb_matrix_kb.inc
+++ b/keyboards/chromatonemini/rgb_matrix_kb.inc
@@ -42,7 +42,7 @@ bool my_solid_reactive_col(effect_params_t* params) {
         RGB      rgb    = rgb_matrix_hsv_to_rgb(hsv);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool my_party_rocks(effect_params_t* params) {
@@ -51,7 +51,7 @@ bool my_party_rocks(effect_params_t* params) {
     RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
     // rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     rgb_matrix_set_color_all(rgb.r, rgb.g, rgb.b);
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 #    endif      // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index b1bf6b3543..8fce4af364 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -79,7 +79,7 @@
 #define I2C1_SDA_PIN B9
 
 #define LED_DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 71
+#define LED_MATRIX_LED_COUNT 71
 
 // LED Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index 66c40731ec..1d70f8b8b1 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -16,7 +16,7 @@
 #include "gen1.h"
 
 #ifdef LED_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h
index 567497afbe..cc83148d87 100644
--- a/keyboards/crkbd/keymaps/bermeo/config.h
+++ b/keyboards/crkbd/keymaps/bermeo/config.h
@@ -77,7 +77,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16                           // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150                       // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/bermeo/keymap.c b/keyboards/crkbd/keymaps/bermeo/keymap.c
index ad1dc92450..8c3d368ca0 100644
--- a/keyboards/crkbd/keymaps/bermeo/keymap.c
+++ b/keyboards/crkbd/keymaps/bermeo/keymap.c
@@ -87,7 +87,7 @@ void rgb_matrix_indicators_user(void) {
         case _QWERTY:
             isSneaking = false;
             mod_state  = get_mods();
-            for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 if (mod_state & MOD_MASK_SHIFT) {
                     isBarking = true;
                     rgb_matrix_set_color(52, 255, 255, 255);
@@ -135,7 +135,7 @@ void rgb_matrix_indicators_user(void) {
 
         case _RAISE:
             isSneaking = true;
-            for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 switch (i) {
                     case 7:                                     // B key off
                     case 8:                                     // G key off
@@ -169,7 +169,7 @@ void rgb_matrix_indicators_user(void) {
 
         case _LOWER:
             isSneaking = true;
-            for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 switch (i) {
                     case 7:                                     // Delete key
                     case 51:                                    // ESC key
@@ -210,7 +210,7 @@ void rgb_matrix_indicators_user(void) {
 
         case _NUMP:
             isSneaking = true;
-            for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 switch (i) {
                     case 12:                                    // RGB speed-
                     case 15:                                    // RGB brigthness-
diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h
index 4e5df394ac..31d23fdff7 100644
--- a/keyboards/crkbd/keymaps/crkdves/config.h
+++ b/keyboards/crkbd/keymaps/crkdves/config.h
@@ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #   define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index aacd9c04f4..7c97ea0831 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -65,7 +65,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #   define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/davidrambo/config.h b/keyboards/crkbd/keymaps/davidrambo/config.h
index df5e0611e1..969ce07c8d 100644
--- a/keyboards/crkbd/keymaps/davidrambo/config.h
+++ b/keyboards/crkbd/keymaps/davidrambo/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    // #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+    // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
     // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
     #define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/devdev/config.h b/keyboards/crkbd/keymaps/devdev/config.h
index 4848af2245..c3db01f145 100644
--- a/keyboards/crkbd/keymaps/devdev/config.h
+++ b/keyboards/crkbd/keymaps/devdev/config.h
@@ -73,7 +73,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
index ab67b42829..b82e4c9344 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ b/keyboards/crkbd/keymaps/kidbrazil/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
     #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    // #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+    // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
     // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
     #define RGB_MATRIX_HUE_STEP 4
diff --git a/keyboards/crkbd/keymaps/ollyhayes/config.h b/keyboards/crkbd/keymaps/ollyhayes/config.h
index b7653e1c9a..d302c0b4ef 100644
--- a/keyboards/crkbd/keymaps/ollyhayes/config.h
+++ b/keyboards/crkbd/keymaps/ollyhayes/config.h
@@ -33,7 +33,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index a0186bf28d..cdd0a5dacb 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -324,7 +324,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t led_
     }
 
     RGB rgb = hsv_to_rgb(hsv);
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
             rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         }
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index 12d62175ae..bafd346111 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #   define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/toinux/config.h b/keyboards/crkbd/keymaps/toinux/config.h
index e7a18800d8..2cd1363a4d 100644
--- a/keyboards/crkbd/keymaps/toinux/config.h
+++ b/keyboards/crkbd/keymaps/toinux/config.h
@@ -54,7 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h
index fc5b2bd74c..5ac13a6646 100644
--- a/keyboards/crkbd/keymaps/xyverz/config.h
+++ b/keyboards/crkbd/keymaps/xyverz/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
     #define RGBLED_NUM 54  // Number of LEDs
-    #define DRIVER_LED_TOTAL RGBLED_NUM
+    #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #endif
 
 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index 877a59fcc6..450b62cd8f 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGBLED_NUM       54 // Number of LEDs
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT \
         { 27, 27 }
 #    define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/crkbd/readme.md b/keyboards/crkbd/readme.md
index 6c0e859663..3e8d8f8ba4 100644
--- a/keyboards/crkbd/readme.md
+++ b/keyboards/crkbd/readme.md
@@ -46,7 +46,7 @@ And in your `config.h` file, add the following:
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. 
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index d2a5a6b2c8..c764f1a40e 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGBLED_NUM       54 // Number of LEDs
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT \
         { 27, 27 }
 #    define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
index ca339f6e1b..2a92a2b205 100644
--- a/keyboards/dekunukem/duckypad/config.h
+++ b/keyboards/dekunukem/duckypad/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN A10
 #define RGBLED_NUM 15
-#define DRIVER_LED_TOTAL 15
+#define RGB_MATRIX_LED_COUNT 15
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/doio/kb16/config.h b/keyboards/doio/kb16/config.h
index 911ba9d3d5..1c37ece514 100644
--- a/keyboards/doio/kb16/config.h
+++ b/keyboards/doio/kb16/config.h
@@ -49,7 +49,7 @@
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
     #define RGB_DI_PIN F6
-    #define DRIVER_LED_TOTAL 16
+    #define RGB_MATRIX_LED_COUNT 16
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index dfd0cde6d8..cc43b08fbf 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN B7
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 67
+#define RGB_MATRIX_LED_COUNT 67
 
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index ad7fee9009..d5198176b7 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -50,7 +50,7 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c
index 16aac75fa5..5612568779 100644
--- a/keyboards/dp60/dp60.c
+++ b/keyboards/dp60/dp60.c
@@ -17,7 +17,7 @@
 #include "dp60.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 2651a4d9b5..60e5b1fcf3 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DI_PIN D0
-#define DRIVER_LED_TOTAL 42
+#define RGB_MATRIX_LED_COUNT 42
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index bfb3f2ba9d..70247fd745 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -62,7 +62,7 @@
 #define DRIVER_ADDR_2 0b1010011
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* I2C Alternate function settings */
 #define I2C1_SCL_PAL_MODE 1
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
index 86aef1bced..dac96e04f3 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/durgod/dgk6x/hades/hades.c b/keyboards/durgod/dgk6x/hades/hades.c
index 2f2f9e650f..3d39f6d1ec 100644
--- a/keyboards/durgod/dgk6x/hades/hades.c
+++ b/keyboards/durgod/dgk6x/hades/hades.c
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
index 0b7fbd12f3..1f26191a91 100644
--- a/keyboards/durgod/dgk6x/venus/venus.c
+++ b/keyboards/durgod/dgk6x/venus/venus.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 81f4846c2c..0a7a2adfc6 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -1,7 +1,7 @@
 #include "dz60rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, K_14, J_14, L_14 },
     { 0, K_13, J_13, L_13 },
     { 0, K_12, J_12, L_12 },
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index 3fe99fd61b..d2905af49f 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+  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 );
     }
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
index eeffe66f40..191789199a 100644
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+  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 );
     }
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index b150e4a162..5933d23ea3 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -81,5 +81,5 @@
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 63
+#    define RGB_MATRIX_LED_COUNT 63
 #endif
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 3c6d07121b..296e68a8b4 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -79,5 +79,5 @@
 
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 63
+#    define RGB_MATRIX_LED_COUNT 63
 #endif
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 2079390a3b..ffbc547d38 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -95,5 +95,5 @@
 
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 63
+#    define RGB_MATRIX_LED_COUNT 63
 #endif
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index 0929ddbf47..ea4fa429ac 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -1,7 +1,7 @@
 #include "dz60rgb_ansi.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, K_14, J_14, L_14 },
     { 0, K_13, J_13, L_13 },
     { 0, K_12, J_12, L_12 },
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
index aae1173988..239e4ea8ba 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+  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 );
     }
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 9b31f27f2f..3148c745ef 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -81,5 +81,5 @@
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 61
+#    define RGB_MATRIX_LED_COUNT 61
 #endif
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 92fcd17c88..c7baf23c5a 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -79,5 +79,5 @@
 
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 61
+#    define RGB_MATRIX_LED_COUNT 61
 #endif
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 7ec226c30b..27bf2270c8 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -95,5 +95,5 @@
 
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 61
+#    define RGB_MATRIX_LED_COUNT 61
 #endif
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index 83feb58456..53d0e9fa14 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -1,7 +1,7 @@
 #include "dz60rgb_wkl.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, H_15, G_15, I_15 },
     { 0, K_14, J_14, L_14 },
     { 0, K_13, J_13, L_13 },
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index d7d8c3a0a1..ba747af060 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -81,5 +81,5 @@
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 62
+#    define RGB_MATRIX_LED_COUNT 62
 #endif
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index a4416e806c..67b6d61b0a 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -76,5 +76,5 @@
 
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 62
+#    define RGB_MATRIX_LED_COUNT 62
 #endif
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 3803b4834f..24ce267e1b 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -95,5 +95,5 @@
 
 #    define DRIVER_ADDR_1      0b1010000
 #    define DRIVER_COUNT       1
-#    define DRIVER_LED_TOTAL   62
+#    define RGB_MATRIX_LED_COUNT   62
 #endif
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index 11f623c1bd..c90b14a5f5 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -59,6 +59,6 @@
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b1010000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 #endif
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
index 3850dbe276..e6b218fea6 100644
--- a/keyboards/dztech/dz64rgb/dz64rgb.c
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -17,7 +17,7 @@
 #include "dz64rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, K_14, J_14, L_14 },
     { 0, K_13, J_13, L_13 },
     { 0, K_12, J_12, L_12 },
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index 0ae5173051..09ae7b81f5 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -97,5 +97,5 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 33
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c
index 8caced800b..e0f12bb6cd 100644
--- a/keyboards/dztech/dz65rgb/v1/v1.c
+++ b/keyboards/dztech/dz65rgb/v1/v1.c
@@ -16,7 +16,7 @@
 #include "v1.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, C8_8,  C7_8,  C6_8 },
     { 0, C9_8,  C7_7,  C6_7 },
     { 0, C9_7,  C8_7,  C6_6 },
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index d2dec023ef..043796456d 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -97,5 +97,5 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 33
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c
index db8e968cc4..f9833b2142 100644
--- a/keyboards/dztech/dz65rgb/v2/v2.c
+++ b/keyboards/dztech/dz65rgb/v2/v2.c
@@ -16,7 +16,7 @@
 #include "v2.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, C8_8,  C7_8,  C6_8 },
     { 0, C9_8,  C7_7,  C6_7 },
     { 0, C9_7,  C8_7,  C6_6 },
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index ed7775a74b..04c813cad5 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -89,6 +89,6 @@
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b0110000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 68
+#    define RGB_MATRIX_LED_COUNT 68
 #    define DRIVER_INDICATOR_LED_TOTAL 0
 #endif
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index 18f87dc00b..c3562c7c5d 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW1, CS20_SW1, CS19_SW1},
     {0, CS21_SW2, CS20_SW2, CS19_SW2},
     {0, CS21_SW3, CS20_SW3, CS19_SW3}, 
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index e183afa0be..a4c74fc794 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -59,7 +59,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #endif
 
  #ifdef RGB_MATRIX_ENABLE
-  #define DRIVER_LED_TOTAL 36
+  #define RGB_MATRIX_LED_COUNT 36
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16
   #define RGB_MATRIX_STARTUP_VAL 150
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index 91311dea37..ad62eb96df 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -73,7 +73,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL              38
+#    define RGB_MATRIX_LED_COUNT              38
 #    define RGB_MATRIX_LED_FLUSH_LIMIT    16
 #    define RGB_MATRIX_STARTUP_VAL        150
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index 26d9daba4e..a1c4d21c11 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -65,7 +65,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
 #    define RGB_MATRIX_HUE_STEP RGBLIGHT_HUE_STEP
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 8a3f4eb7dc..0890127074 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -119,7 +119,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 24
 #define DRIVER_2_LED_TOTAL 24
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define RGB_MATRIX_LED_PROCESS_LIMIT 5
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 8d3790088d..7b9d9d3bad 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -243,7 +243,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /*   driver
  *   |  R location
  *   |  |      G location
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index d16ac9404f..b9df73ce5e 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -146,7 +146,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The result is: 0b101(ADDR2)(ADDR1)
 #define DRIVER_ADDR_1 0b1010000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
index f972b78867..4506a69aa7 100644
--- a/keyboards/evyd13/atom47/rev5/rev5.c
+++ b/keyboards/evyd13/atom47/rev5/rev5.c
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "rev5.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index c4765ce93c..aea0dfc8f6 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -25,4 +25,4 @@
 #define DRIVER_ADDR_1 0b1010000
 
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 63
+#define RGB_MATRIX_LED_COUNT 63
diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c
index 11d313e9a3..ec17e414f3 100644
--- a/keyboards/exclusive/e6_rgb/e6_rgb.c
+++ b/keyboards/exclusive/e6_rgb/e6_rgb.c
@@ -11,7 +11,7 @@ void matrix_init_kb(void) {
   matrix_init_user();
 }
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 4aa7aaf348..80c2c986f3 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -36,7 +36,7 @@
  */
 #define LED_DRIVER_ADDR_1 0b1110100
 #define LED_DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 3
+#define LED_MATRIX_LED_COUNT 3
 
 /* Set 0 if debouncing isn't needed
  */
diff --git a/keyboards/fallacy/indicators.c b/keyboards/fallacy/indicators.c
index c577bc9a8a..8686f292fc 100755
--- a/keyboards/fallacy/indicators.c
+++ b/keyboards/fallacy/indicators.c
@@ -25,7 +25,7 @@ void init_fallacy_leds(void) {
     i2c_init();
     IS31FL3731_init(LED_DRIVER_ADDR_1);
 
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
         IS31FL3731_set_led_control_register(i, true);
     }
 
@@ -54,7 +54,7 @@ void set_fallacy_led(int index, bool state) {
 
 /* define LED matrix
  */
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
     {0, C1_1},
     {0, C2_1},
     {0, C3_1},
diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h
index 541fb86b73..1c086b3551 100644
--- a/keyboards/feker/ik75/config.h
+++ b/keyboards/feker/ik75/config.h
@@ -46,7 +46,7 @@
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+    #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/feker/ik75/ik75.c b/keyboards/feker/ik75/ik75.c
index 58464e1934..af7d12fedc 100644
--- a/keyboards/feker/ik75/ik75.c
+++ b/keyboards/feker/ik75/ik75.c
@@ -18,7 +18,7 @@
 #include "ik75.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  G location
diff --git a/keyboards/ferris/0_2/bling/bling.c b/keyboards/ferris/0_2/bling/bling.c
index e4d0bdbf7e..8af1d33e85 100644
--- a/keyboards/ferris/0_2/bling/bling.c
+++ b/keyboards/ferris/0_2/bling/bling.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 |    | 4  |   |    ||   |   | 4  |   |
 | 6  |    |   | 2  || 2 |   |    | 5 |
 */
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h
index ceb02e737b..cbb3b11c90 100644
--- a/keyboards/ferris/0_2/bling/config.h
+++ b/keyboards/ferris/0_2/bling/config.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 7
 #define DRIVER_2_LED_TOTAL 7
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/frooastboard/walnut/config.h b/keyboards/frooastboard/walnut/config.h
index 081a084d16..3015201d42 100644
--- a/keyboards/frooastboard/walnut/config.h
+++ b/keyboards/frooastboard/walnut/config.h
@@ -12,7 +12,7 @@
 #define ISSI_SWPULLUP PUR_0R
 #define ISSI_CSPULLUP PUR_0R
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 48
+#define RGB_MATRIX_LED_COUNT 48
 #define DRIVER_ADDR_1 0b1010000
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 191
diff --git a/keyboards/frooastboard/walnut/walnut.c b/keyboards/frooastboard/walnut/walnut.c
index 0b84d3c577..da398205a0 100644
--- a/keyboards/frooastboard/walnut/walnut.c
+++ b/keyboards/frooastboard/walnut/walnut.c
@@ -5,7 +5,7 @@
 
 #if defined(RGB_MATRIX_ENABLE)
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 7ddbefea2a..b9096da1d7 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -22,7 +22,7 @@
 #define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}}
 
 #define RGBLED_NUM 42
-#define DRIVER_LED_TOTAL 42
+#define RGB_MATRIX_LED_COUNT 42
 #define RGB_DI_PIN A7
 
 // PWM RGB Underglow Defines
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index bdf2d39c98..aee0b1294f 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -71,5 +71,5 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 8
 #    define DRIVER_2_LED_TOTAL 0
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 70865c461f..f2d2301ec9 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -1,5 +1,5 @@
 #include "tester.h"
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h
index efad053aae..7f7751897f 100644
--- a/keyboards/giabalanai/config.h
+++ b/keyboards/giabalanai/config.h
@@ -108,7 +108,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 /* ws2812 RGB MATRIX */
-#   define DRIVER_LED_TOTAL 123
+#   define RGB_MATRIX_LED_COUNT 123
 #   define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 
 //  for all fingers used at once.
diff --git a/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc b/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
index 40ce7148d3..6159968a69 100644
--- a/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
+++ b/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
@@ -40,7 +40,7 @@ bool my_solid_reactive_with_CnoteIndicator(effect_params_t* params) {
         RGB      rgb    = rgb_matrix_hsv_to_rgb(hsv);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool my_party_rocks(effect_params_t* params) {
@@ -49,7 +49,7 @@ bool my_party_rocks(effect_params_t* params) {
     RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
     // rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     rgb_matrix_set_color_all(rgb.r, rgb.g, rgb.b);
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 
diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
index 1a8bf51312..3fa2d120bc 100755
--- a/keyboards/gizmo_engineering/gk6/config.h
+++ b/keyboards/gizmo_engineering/gk6/config.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 32
 #define DRIVER_2_LED_TOTAL 32
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/gizmo_engineering/gk6/gk6.c b/keyboards/gizmo_engineering/gk6/gk6.c
index 9066fc85a5..390213ef26 100755
--- a/keyboards/gizmo_engineering/gk6/gk6.c
+++ b/keyboards/gizmo_engineering/gk6/gk6.c
@@ -17,7 +17,7 @@
 #include "gk6.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, C1_8, C2_8, C3_8},     //0 led1
     {0, C1_7, C2_7, C3_7},     //1 led2
     {0, C1_6, C2_6, C3_6},     //2 led3
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
index ef0643ce94..75e321507d 100644
--- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
@@ -25,7 +25,7 @@
   #undef RGBLED_NUM
 #endif
 
-#define DRIVER_LED_TOTAL 73
+#define RGB_MATRIX_LED_COUNT 73
 
 #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
@@ -34,7 +34,7 @@
 //  #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
 //  #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-  #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+  #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 //  #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
index 437b50648e..28033da538 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h
index 6a6c22c6f0..840a402dcf 100644
--- a/keyboards/gmmk/gmmk2/p65/config.h
+++ b/keyboards/gmmk/gmmk2/p65/config.h
@@ -57,7 +57,7 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 54
 #define DRIVER_2_LED_TOTAL 34
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c
index 651a612a58..1a70353829 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
index 455a598982..808b175555 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index 03a7f58538..aa7e59ef98 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -61,7 +61,7 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 54
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c
index e1fee18079..dc9f7be682 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c
index 1df3319fd2..3fc45d61d0 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.c
@@ -136,7 +136,7 @@ led_config_t g_led_config = {{
     4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
     {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
     {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
diff --git a/keyboards/gmmk/pro/rev1/ansi/config.h b/keyboards/gmmk/pro/rev1/ansi/config.h
index 7c68375b2f..8e5518e1b9 100644
--- a/keyboards/gmmk/pro/rev1/ansi/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/config.h
@@ -20,4 +20,4 @@
 
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 32
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index 3aa3fd828e..ec20922842 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //
 //    
 //
-//    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+//    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
 //        HSV hsv = {
 //            .h = (*l)[i][0],
 //            .s = (*l)[i][1],
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
index 8eedeb6e00..50a0a81769 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
@@ -65,7 +65,7 @@ void rgb_matrix_indicators_user(void) {
     }
 
     if (host_keyboard_led_state().caps_lock) {
-        for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+        for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
             if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
                 rgb_matrix_set_color(i, _CAPS_COLOR_RGB);
             }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c
index 52c9dfdf99..a7ab0c9cc3 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c
@@ -136,7 +136,7 @@ led_config_t PROGMEM g_led_config = {{
     4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
     {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
     {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c
index f3f443cedb..d30224636b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c
@@ -17,7 +17,7 @@
 #include "rgb_matrix.h"
 
 void rgb_matrix_set_color_flags(uint8_t red, uint8_t green, uint8_t blue, uint8_t flags) {
-    for (uint8_t ii = 0; ii < DRIVER_LED_TOTAL; ii++) {
+    for (uint8_t ii = 0; ii < RGB_MATRIX_LED_COUNT; ii++) {
         if (g_led_config.flags[ii] & flags) {
             rgb_matrix_set_color(ii, red, green, blue);
         }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
index 6f4d333ede..d59b5cffc8 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
@@ -44,7 +44,7 @@ void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer) {
 
     uint8_t val = rgb_matrix_get_val();
 
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         HSV hsv = {
             .h = (*l)[i][0],
             .s = (*l)[i][1],
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
index eace217d18..b9b06309b2 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
@@ -48,7 +48,7 @@
         ka4, k73 \
     }
 // clang-format on
-typedef uint8_t ledmap[DRIVER_LED_TOTAL][3];
+typedef uint8_t ledmap[RGB_MATRIX_LED_COUNT][3];
 extern const ledmap ledmaps[];
 
 void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer);
diff --git a/keyboards/gmmk/pro/rev1/iso/config.h b/keyboards/gmmk/pro/rev1/iso/config.h
index 26626ccfc1..d8074af06c 100644
--- a/keyboards/gmmk/pro/rev1/iso/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/config.h
@@ -20,4 +20,4 @@
 
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 33
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev1/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c
index fa57f1ca92..babb6bd6c7 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.c
+++ b/keyboards/gmmk/pro/rev1/iso/iso.c
@@ -137,7 +137,7 @@ led_config_t g_led_config = {{
     2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
     {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
     {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c
index 9cf28e4648..c22fbc796d 100644
--- a/keyboards/gmmk/pro/rev2/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.c
@@ -136,7 +136,7 @@ led_config_t g_led_config = {{
     4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
     {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
     {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
diff --git a/keyboards/gmmk/pro/rev2/ansi/config.h b/keyboards/gmmk/pro/rev2/ansi/config.h
index 996ee21afc..6803bd8ced 100644
--- a/keyboards/gmmk/pro/rev2/ansi/config.h
+++ b/keyboards/gmmk/pro/rev2/ansi/config.h
@@ -20,4 +20,4 @@
 
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 32
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev2/iso/config.h b/keyboards/gmmk/pro/rev2/iso/config.h
index 82390fc147..0b2e0a4cb2 100644
--- a/keyboards/gmmk/pro/rev2/iso/config.h
+++ b/keyboards/gmmk/pro/rev2/iso/config.h
@@ -20,4 +20,4 @@
 
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 33
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.c b/keyboards/gmmk/pro/rev2/iso/iso.c
index 3567a52d0d..20626ff9c5 100644
--- a/keyboards/gmmk/pro/rev2/iso/iso.c
+++ b/keyboards/gmmk/pro/rev2/iso/iso.c
@@ -137,7 +137,7 @@ led_config_t g_led_config = {{
     2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw_led g_aw_leds[DRIVER_LED_TOTAL] = {
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
     {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
     {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h
index 7964834623..d1c75d0c79 100644
--- a/keyboards/gopolar/gg86/config.h
+++ b/keyboards/gopolar/gg86/config.h
@@ -41,7 +41,7 @@
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
     #define RGB_DI_PIN E2
-    #define DRIVER_LED_TOTAL 100
+    #define RGB_MATRIX_LED_COUNT 100
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c b/keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c
index fcedf777eb..951884b456 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/led/custom_gradient.c
@@ -70,5 +70,5 @@ static bool CUSTOM_GRADIENT(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
\ No newline at end of file
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h b/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
index 5b610716e0..9fff344664 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
@@ -41,5 +41,5 @@ bool effect_rainbow_reactive(effect_params_t* params, rainbow_reactive_f effect_
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
\ No newline at end of file
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c b/keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c
index e5f399cdd3..b5ffef665f 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/led/random_breath_rainbow.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-static uint8_t offset[DRIVER_LED_TOTAL];
+static uint8_t offset[RGB_MATRIX_LED_COUNT];
 
 static void doRandom_breath_rainbow(int i, effect_params_t* params) {
     if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
@@ -41,7 +41,7 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
     
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
-        doRandom_breath_rainbow(rand() % DRIVER_LED_TOTAL, params);
+        doRandom_breath_rainbow(rand() % RGB_MATRIX_LED_COUNT, params);
         return false;
     }
 	
@@ -51,5 +51,5 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
         doRandom_breath_rainbow(i, params);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
\ No newline at end of file
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index f130189b58..0a06f3ec7c 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -166,7 +166,7 @@
 
 #define RGBLED_NUM 10
 #define RGB_DI_PIN B5
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 // #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index 1e8c296855..a117fc65aa 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D2
 #define RGBLED_NUM 10
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index 150da56dc6..deed36713b 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -53,6 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 16
 #define RGB_DI_PIN A7
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index a941ea493d..39ff7ffe17 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_LED_COUNT 70
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
index ccd9d0cdc4..9f73d8bcec 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // WS2812 RGB LED strip input and number of LEDs
 #define RGB_DI_PIN D3
-#define DRIVER_LED_TOTAL 36
+#define RGB_MATRIX_LED_COUNT 36
 #define RGB_MATRIX_SPLIT { 18, 18 }
 #define RGB_MATRIX_CENTER { 133, 54 }
 
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
index fac9353959..6aa4f4817f 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 // #  define RGB_DISABLE_TIMEOUT 300000 // number of milliseconds to wait until disabling effects
 // #  define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#  define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#  define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #  define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #  define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. 
 #  define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
index 8625389eba..c598952e94 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D0
-// #define DRIVER_LED_TOTAL 32
+// #define RGB_MATRIX_LED_COUNT 32
 
 #define RGB_MATRIX_KEYPRESSES
 
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80
 #undef RGBLED_NUM
 #define RGBLED_NUM       64 // Number of LEDs
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_SPLIT \
         { 32, 32  }
 #define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c
index 652b6551d2..466cdc523e 100644
--- a/keyboards/handwired/dygma/raise/ansi/ansi.c
+++ b/keyboards/handwired/dygma/raise/ansi/ansi.c
@@ -23,7 +23,7 @@
 #define LHK 33
 #define LPH 72
 
-const uint8_t led_map[DRIVER_LED_TOTAL] = {
+const uint8_t led_map[RGB_MATRIX_LED_COUNT] = {
   // left side - 32 keys includes LP: key 19 is missing for ANSI layout
   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 20, 0xff, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 68, 69,
 
diff --git a/keyboards/handwired/dygma/raise/config.h b/keyboards/handwired/dygma/raise/config.h
index 64c6bad8e8..032875b67b 100644
--- a/keyboards/handwired/dygma/raise/config.h
+++ b/keyboards/handwired/dygma/raise/config.h
@@ -24,4 +24,4 @@
 /* The scanners already debounce for us */
 #define DEBOUNCE 0
 
-#define DRIVER_LED_TOTAL 132
+#define RGB_MATRIX_LED_COUNT 132
diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c
index ec2607d06c..81c180b612 100644
--- a/keyboards/handwired/dygma/raise/iso/iso.c
+++ b/keyboards/handwired/dygma/raise/iso/iso.c
@@ -23,7 +23,7 @@
 #define LHK 33
 #define LPH 72
 
-const uint8_t led_map[DRIVER_LED_TOTAL] = {
+const uint8_t led_map[RGB_MATRIX_LED_COUNT] = {
   // left side - 33 keys
   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, 68, 69,
 
diff --git a/keyboards/handwired/dygma/raise/leds.c b/keyboards/handwired/dygma/raise/leds.c
index 3f6037cbfa..4ff87ca941 100644
--- a/keyboards/handwired/dygma/raise/leds.c
+++ b/keyboards/handwired/dygma/raise/leds.c
@@ -71,7 +71,7 @@ static void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
 }
 
 static void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) set_color(i, r, g, b);
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) set_color(i, r, g, b);
 }
 
 static void init(void) {}
diff --git a/keyboards/handwired/dygma/raise/leds.h b/keyboards/handwired/dygma/raise/leds.h
index 8d70ed70b2..c25a4326a9 100644
--- a/keyboards/handwired/dygma/raise/leds.h
+++ b/keyboards/handwired/dygma/raise/leds.h
@@ -19,7 +19,7 @@
 #include "quantum.h"
 #include "rgb_matrix.h"
 
-extern const uint8_t led_map[DRIVER_LED_TOTAL];
+extern const uint8_t led_map[RGB_MATRIX_LED_COUNT];
 
 void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
 void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);
diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index 825edd40ca..913b19af5a 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 4
 
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 31
+#define RGB_MATRIX_LED_COUNT 31
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h
index 916fe15a20..85b5e0673f 100644
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 50
+#define RGB_MATRIX_LED_COUNT 50
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index abb5efc284..384b0bc547 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define DRIVER_LED_TOTAL 83
+#define RGB_MATRIX_LED_COUNT 83
 #define RGBLIGHT_LIMIT_VAL 180
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index 2a33f1fc13..81c58c977e 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -52,6 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 16
 #define RGB_DI_PIN A7
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index 0e15056baf..ffc75d00cf 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // WS2812 RGB LED strip input and number of LEDs
 #define RGB_DI_PIN       E7
-#define DRIVER_LED_TOTAL 62
+#define RGB_MATRIX_LED_COUNT 62
 #define RGB_MATRIX_SPLIT { 32, 30 }
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 5050599075..e5f49d7788 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -56,13 +56,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 50 // Number of LEDs
 
 #ifdef RGB_MATRIX_ENABLE
-  #define DRIVER_LED_TOTAL RGBLED_NUM
+  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 489eeded06..8838bd6bde 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -56,13 +56,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 64 // Number of LEDs
 
 #ifdef RGB_MATRIX_ENABLE
-  #define DRIVER_LED_TOTAL RGBLED_NUM
+  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index 8a227f3c49..1acd13498f 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -39,7 +39,7 @@
 #define FORCE_NKRO
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 86
+    #define RGB_MATRIX_LED_COUNT 86
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index d3c385f64e..227fad06ec 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -62,7 +62,7 @@
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 24
+    #define RGB_MATRIX_LED_COUNT 24
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c
index 49e4a242fb..0d7acd7e8b 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c
+++ b/keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c
@@ -70,5 +70,5 @@ static bool CUSTOM_GRADIENT(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c
index 041417477b..29c447c61a 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c
+++ b/keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-static uint8_t offset[DRIVER_LED_TOTAL];
+static uint8_t offset[RGB_MATRIX_LED_COUNT];
 
 static void doRandom_breath_rainbow(int i, effect_params_t* params) {
     if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
@@ -41,7 +41,7 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
     
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
-        doRandom_breath_rainbow(rand() % DRIVER_LED_TOTAL, params);
+        doRandom_breath_rainbow(rand() % RGB_MATRIX_LED_COUNT, params);
         return false;
     }
 	
@@ -51,5 +51,5 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
         doRandom_breath_rainbow(i, params);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c
index 49e4a242fb..0d7acd7e8b 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c
@@ -70,5 +70,5 @@ static bool CUSTOM_GRADIENT(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c
index 041417477b..29c447c61a 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-static uint8_t offset[DRIVER_LED_TOTAL];
+static uint8_t offset[RGB_MATRIX_LED_COUNT];
 
 static void doRandom_breath_rainbow(int i, effect_params_t* params) {
     if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
@@ -41,7 +41,7 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
     
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
-        doRandom_breath_rainbow(rand() % DRIVER_LED_TOTAL, params);
+        doRandom_breath_rainbow(rand() % RGB_MATRIX_LED_COUNT, params);
         return false;
     }
 	
@@ -51,5 +51,5 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
         doRandom_breath_rainbow(i, params);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index adc6f94f1f..6c942680f5 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -125,7 +125,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRIVER_2_LED_TOTAL 32
 #endif
 
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index f96eb7c320..466cfeeaf5 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -91,7 +91,7 @@ void raw_hid_receive( uint8_t *data, uint8_t length )
 
 #ifdef HS60_ANSI
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -199,7 +199,7 @@ led_config_t g_led_config = { {
 
 #else
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/hs60/v2/ansi/config.h b/keyboards/hs60/v2/ansi/config.h
index 04c7d8c701..509661db8d 100644
--- a/keyboards/hs60/v2/ansi/config.h
+++ b/keyboards/hs60/v2/ansi/config.h
@@ -114,7 +114,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/hs60/v2/hhkb/config.h b/keyboards/hs60/v2/hhkb/config.h
index 4dac657b39..46090673db 100644
--- a/keyboards/hs60/v2/hhkb/config.h
+++ b/keyboards/hs60/v2/hhkb/config.h
@@ -114,7 +114,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/hs60/v2/iso/config.h b/keyboards/hs60/v2/iso/config.h
index da918955c3..cf43e3dd94 100644
--- a/keyboards/hs60/v2/iso/config.h
+++ b/keyboards/hs60/v2/iso/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h
index 24bcdb0061..8452eab0c9 100644
--- a/keyboards/hub20/config.h
+++ b/keyboards/hub20/config.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 27
 
-#define DRIVER_LED_TOTAL 27
+#define RGB_MATRIX_LED_COUNT 27
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 27
 #endif
diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h
index a95578a9b3..bef9120005 100755
--- a/keyboards/idobao/id42/config.h
+++ b/keyboards/idobao/id42/config.h
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
     #define RGB_DI_PIN B3
-    #define DRIVER_LED_TOTAL 42
+    #define RGB_MATRIX_LED_COUNT 42
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/idobao/id42/id42.c b/keyboards/idobao/id42/id42.c
index ea3dccdfed..15cc0b41b0 100755
--- a/keyboards/idobao/id42/id42.c
+++ b/keyboards/idobao/id42/id42.c
@@ -20,7 +20,7 @@
  */
 led_config_t g_led_config = { {
     // Key Matrix to LED Index
-    // WS2812 LED strings are addressed from 0 (1st) to DRIVER_LED_TOTAL-1 (last)
+    // WS2812 LED strings are addressed from 0 (1st) to RGB_MATRIX_LED_COUNT-1 (last)
     { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30 },
     { 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, __, 19 },
     { 18, 17, 16, 15, 14, 13, 12, 11, 10, __, 9,  8  },
diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h
index 10fb9d5f08..052f7f3bad 100644
--- a/keyboards/idobao/id63/config.h
+++ b/keyboards/idobao/id63/config.h
@@ -22,9 +22,9 @@
      *
      * */
     #ifndef ID63_DISABLE_UNDERGLOW
-        #define DRIVER_LED_TOTAL 75
+        #define RGB_MATRIX_LED_COUNT 75
     #else
-        #define DRIVER_LED_TOTAL (75 - 12)
+        #define RGB_MATRIX_LED_COUNT (75 - 12)
     #endif
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h
index 59e34654b5..dcb2de2a32 100644
--- a/keyboards/idobao/id67/config.h
+++ b/keyboards/idobao/id67/config.h
@@ -12,9 +12,9 @@
 // RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
     #ifndef ID67_DISABLE_UNDERGLOW
-        #define DRIVER_LED_TOTAL 77
+        #define RGB_MATRIX_LED_COUNT 77
     #else
-        #define DRIVER_LED_TOTAL (77 - 10)
+        #define RGB_MATRIX_LED_COUNT (77 - 10)
     #endif
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
diff --git a/keyboards/idobao/id67/keymaps/thewerther/keymap.c b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
index ef37b210f5..a47a54db37 100644
--- a/keyboards/idobao/id67/keymaps/thewerther/keymap.c
+++ b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
@@ -34,7 +34,7 @@ void matrix_scan_user(void) {
     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 = DRIVER_LED_TOTAL - DRIVER_LED_UNDERGLOW; i < DRIVER_LED_TOTAL; i++) {
+        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);
         }
     }
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index 1bf6971730..c0b79631d2 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #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[DRIVER_LED_TOTAL] = {
+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
@@ -147,7 +147,7 @@ static uint16_t recording_timer;
 
 void keyboard_pre_init_user(void) {
     // override `config.h` flags with new values
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) g_led_config.flags[i] = g_led_config_new_flags[i];
+    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) {
diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index 4029d80bf8..62c25486c5 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/v2/config.h
@@ -41,7 +41,7 @@
 #undef RGB_DI_PIN
 #define RGB_DI_PIN F0
 #ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL 85 /* 10 Bottom 75 top*/
+#    define RGB_MATRIX_LED_COUNT 85 /* 10 Bottom 75 top*/
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
index 1b99fd7908..50ca039a06 100644
--- a/keyboards/idobao/id80/v3/ansi/config.h
+++ b/keyboards/idobao/id80/v3/ansi/config.h
@@ -22,7 +22,7 @@
 // RGB Matrix config
 #if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
 
-    #define DRIVER_LED_TOTAL 94
+    #define RGB_MATRIX_LED_COUNT 94
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
index 8f1a9ddf03..08ce4f0af4 100644
--- a/keyboards/idobao/id87/v2/config.h
+++ b/keyboards/idobao/id87/v2/config.h
@@ -14,7 +14,7 @@
 // RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
 
-    #define DRIVER_LED_TOTAL 103
+    #define RGB_MATRIX_LED_COUNT 103
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
index 670b43462b..8a3b3029d4 100755
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ b/keyboards/idobao/montex/v1rgb/config.h
@@ -28,7 +28,7 @@
 #if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
 
     // The number of LEDs connected
-    #define DRIVER_LED_TOTAL 31
+    #define RGB_MATRIX_LED_COUNT 31
 
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h
index 98ba567203..eaed5dde7a 100755
--- a/keyboards/idobao/montex/v2/config.h
+++ b/keyboards/idobao/montex/v2/config.h
@@ -10,9 +10,9 @@
 
 #if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
     #ifndef ID27_DISABLE_UNDERGLOW
-        #define DRIVER_LED_TOTAL 31  // The number of LEDs connected
+        #define RGB_MATRIX_LED_COUNT 31  // The number of LEDs connected
     #else
-        #define DRIVER_LED_TOTAL 27  // -4 disabled underglow LEDs
+        #define RGB_MATRIX_LED_COUNT 27  // -4 disabled underglow LEDs
     #endif
 
     // #define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // don't use, too few key to make it look good
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index 0b952c25e5..ee26a0ff23 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -40,7 +40,7 @@
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 61
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #define DRIVER_INDICATOR_LED_TOTAL 0
 
 // For full list of effects, see:
diff --git a/keyboards/ilumkb/simpler61/simpler61.c b/keyboards/ilumkb/simpler61/simpler61.c
index 20a40e9169..4fcc5c9245 100644
--- a/keyboards/ilumkb/simpler61/simpler61.c
+++ b/keyboards/ilumkb/simpler61/simpler61.c
@@ -17,7 +17,7 @@
 #include "simpler61.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
     {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
     {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 324745efa8..463f94aeae 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -40,7 +40,7 @@
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 64
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #define DRIVER_INDICATOR_LED_TOTAL 0
 
 
diff --git a/keyboards/ilumkb/simpler64/simpler64.c b/keyboards/ilumkb/simpler64/simpler64.c
index 8ab72caaca..c42a444576 100644
--- a/keyboards/ilumkb/simpler64/simpler64.c
+++ b/keyboards/ilumkb/simpler64/simpler64.c
@@ -17,7 +17,7 @@
 #include "simpler64.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
     {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
     {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index af9c4ecbe2..f55cf34eb5 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -57,7 +57,7 @@
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
     #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/inett_studio/sqx/hotswap/hotswap.c b/keyboards/inett_studio/sqx/hotswap/hotswap.c
index c8e7d87846..055e918f6d 100644
--- a/keyboards/inett_studio/sqx/hotswap/hotswap.c
+++ b/keyboards/inett_studio/sqx/hotswap/hotswap.c
@@ -20,7 +20,7 @@
 #include "hotswap.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index 8c2405e644..d9bbb1c9fc 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -57,7 +57,7 @@
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
 #    define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/inett_studio/sqx/universal/universal.c b/keyboards/inett_studio/sqx/universal/universal.c
index 06cfbd3654..e03d7395e5 100644
--- a/keyboards/inett_studio/sqx/universal/universal.c
+++ b/keyboards/inett_studio/sqx/universal/universal.c
@@ -20,7 +20,7 @@
 #include "universal.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index 00dd0bd1f3..19a777e615 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LED matrix driver */
 #define LED_DRIVER_ADDR_1 0x74
 #define LED_DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 76
+#define LED_MATRIX_LED_COUNT 76
 #define LED_MATRIX_SPLIT { 38, 38 }
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
index e6ac2c4559..d699d76333 100644
--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
@@ -174,7 +174,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 #endif
 
 #ifdef LED_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 // The numbers in the comments are the led numbers DXX on the PCB
 /* Refer to IS31 manual for these locations
  *  driver
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index 12cda14a3a..b58f0f2973 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
@@ -170,5 +170,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 64
 #    define DRIVER_2_LED_TOTAL 55
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
index e76479b01a..3898016875 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.c
+++ b/keyboards/input_club/k_type/is31fl3733-dual.c
@@ -160,7 +160,7 @@ void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
 }
 
 void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
-    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+    if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         is31_led led = g_is31_leds[index];
 
         g_pwm_buffer[led.driver][led.r]          = red;
@@ -171,7 +171,7 @@ void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void IS31FL3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3733_set_color(i, red, green, blue);
     }
 }
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index d4af1848fb..16586714b8 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
@@ -29,7 +29,7 @@ typedef struct is31_led {
     uint8_t b;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
 void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync);
 bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data);
diff --git a/keyboards/input_club/k_type/k_type-rgbdriver.c b/keyboards/input_club/k_type/k_type-rgbdriver.c
index 5ae132d63a..e663c224c4 100644
--- a/keyboards/input_club/k_type/k_type-rgbdriver.c
+++ b/keyboards/input_club/k_type/k_type-rgbdriver.c
@@ -29,7 +29,7 @@ static void init(void) {
     i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN);
     IS31FL3733_init(1, DRIVER_ADDR_2, 0);
 #    endif
-    for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+    for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         bool enabled = true;
         // This only caches it for later
         IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index 0e10710cb1..3f67b4b10d 100644
--- a/keyboards/input_club/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "is31fl3733-dual.h"
 
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_1,  A_1,  C_1  },
     { 0, B_2,  A_2,  C_2  },
     { 0, B_3,  A_3,  C_3  },
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
index c035255de6..31e4bff4b6 100644
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
+++ b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
@@ -48,5 +48,5 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 64
 #    define DRIVER_2_LED_TOTAL 55
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index 2c2e8c6324..dd20f2fe06 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
@@ -57,7 +57,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LED matrix driver */
 #define LED_DRIVER_ADDR_1 0x74
 #define LED_DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 71
+#define LED_MATRIX_LED_COUNT 71
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
 /* i2c (for LED matrix) */
diff --git a/keyboards/input_club/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c
index 99c59f7732..8d92aa8d2f 100644
--- a/keyboards/input_club/whitefox/whitefox.c
+++ b/keyboards/input_club/whitefox/whitefox.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "whitefox.h"
 
 #ifdef LED_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 // The numbers in the comments are the led numbers DXX on the PCB
 /* Refer to IS31 manual for these locations
  *  driver
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 92a6a5b60a..dc7e9c6158 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -74,5 +74,5 @@
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define DRIVER_LED_TOTAL 12 // Number of LEDs
+#define RGB_MATRIX_LED_COUNT 12 // Number of LEDs
 #endif
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index a3fd5a0fa7..c82b44b482 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -25,7 +25,7 @@
 
 #define RGB_DI_PIN F0
 
-#define DRIVER_LED_TOTAL 67
+#define RGB_MATRIX_LED_COUNT 67
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h
index eed1d351a7..7b0a723cbc 100644
--- a/keyboards/jkeys_design/gentleman65/config.h
+++ b/keyboards/jkeys_design/gentleman65/config.h
@@ -48,4 +48,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { F5 }
 #define ENCODER_RESOLUTION 4
 
-#define DRIVER_LED_TOTAL 14
+#define RGB_MATRIX_LED_COUNT 14
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index effdb281e6..f5ecb8f5de 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -49,4 +49,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { B1 }
 #define ENCODER_RESOLUTION 4
 
-#define DRIVER_LED_TOTAL 14
+#define RGB_MATRIX_LED_COUNT 14
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index ae88c86572..37e49d3d60 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -31,7 +31,7 @@
 #define RGBLIGHT_SPLIT
 #define RGBLIGHT_LIMIT_VAL 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 
-#define DRIVER_LED_TOTAL 88
+#define RGB_MATRIX_LED_COUNT 88
 #define RGB_MATRIX_SPLIT { 44, 44 }
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index 4f23460964..2dd8182ddd 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -34,7 +34,7 @@
 
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 66
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index 837701c7c4..326f1fe19f 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -86,7 +86,7 @@
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 108
+#define RGB_MATRIX_LED_COUNT 108
 #define DRIVER_INDICATOR_LED_TOTAL 0
 #endif
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index 4353cae1be..90bbda0f7f 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -15,7 +15,7 @@
  */
 #include "rgb.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
     {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
     {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index b1024b4e21..78ae4f21e1 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -86,7 +86,7 @@
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 109
+#define RGB_MATRIX_LED_COUNT 109
 #define DRIVER_INDICATOR_LED_TOTAL 0
 #endif
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index 072501045a..417c76cca6 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -15,7 +15,7 @@
  */
 #include "rgb_iso.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
     {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
     {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index 2d4cbe4e85..fea42a4266 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -43,7 +43,7 @@
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b0110000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 83
+#    define RGB_MATRIX_LED_COUNT 83
 #    define DRIVER_INDICATOR_LED_TOTAL 0
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index 3e9c66f457..a0a1778fd8 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW1, CS20_SW1, CS19_SW1},
     {0, CS21_SW2, CS20_SW2, CS19_SW2},
     {0, CS21_SW3, CS20_SW3, CS19_SW3}, 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
index a6a56cdced..944ddbddc2 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@@ -69,4 +69,4 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 35
 #define DRIVER_2_LED_TOTAL 32
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
index f003673871..f034350b7c 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
@@ -16,7 +16,7 @@
 
 #include "v1.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     {0, C8_8, C7_8, C6_8},     // LA17
     {0, C9_8, C7_7, C6_7},     // LA16
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
index a5dfdae5ed..855f7210db 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@@ -68,5 +68,5 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 32
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
index 37972c2500..1da1c66747 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
@@ -16,7 +16,7 @@
 
 #include "v2.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     {0, C8_8,  C7_8, C6_8},   // LA17
     {0, C9_8,  C7_7, C6_7},   // LA16
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index cb847e9b45..c65819be8d 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -89,6 +89,6 @@
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 67
+#define RGB_MATRIX_LED_COUNT 67
 #define DRIVER_INDICATOR_LED_TOTAL 0
 #endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 306c22615f..8089ee1f8c 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW1, CS20_SW1, CS19_SW1},
     {0, CS21_SW2, CS20_SW2, CS19_SW2},
     {0, CS21_SW3, CS20_SW3, CS19_SW3},
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index f7e0e06278..4d3d08a513 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -33,7 +33,7 @@
 
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 68
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 415da00b48..afca6e996b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -32,7 +32,7 @@
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
 #define RGB_DI_PIN C7
-#define DRIVER_LED_TOTAL 68
+#define RGB_MATRIX_LED_COUNT 68
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index eff9c8eae1..ba2b1e96b8 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -34,7 +34,7 @@
 
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 84
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
index 1f7d095e9f..0eaf7a50ff 100644
--- a/keyboards/kbdfans/kbdmini/config.h
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -81,5 +81,5 @@
 
 #define DRIVER_ADDR_1 0b1010000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 52
+#define RGB_MATRIX_LED_COUNT 52
 #endif
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index 03c0096c70..80ba687b6d 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -1,6 +1,6 @@
 #include "kbdmini.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_9,  A_9,  C_9  }, //LA33
     { 0, B_10, A_10, C_10 }, //LA37
     { 0, B_11, A_11, C_11 }, //LA41
diff --git a/keyboards/kbdfans/maja/config.h b/keyboards/kbdfans/maja/config.h
index 0800de1ece..f98b7c3116 100755
--- a/keyboards/kbdfans/maja/config.h
+++ b/keyboards/kbdfans/maja/config.h
@@ -69,4 +69,4 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 31
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/kbdfans/maja/maja.c b/keyboards/kbdfans/maja/maja.c
index d257212750..6bb23f4739 100755
--- a/keyboards/kbdfans/maja/maja.c
+++ b/keyboards/kbdfans/maja/maja.c
@@ -1,6 +1,6 @@
 #include "maja.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 	{0, C2_1,  C3_1,  C4_1},  // LA0
     {0, C1_1,  C3_2, C4_2},   // LA1
     {0, C1_2,  C2_2, C4_3},   // LA2
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 571f6d0d1c..9f15473877 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -25,7 +25,7 @@
 
 #define DEBOUNCE 5
 #define RGBLED_NUM 110
-#define DRIVER_LED_TOTAL 110
+#define RGB_MATRIX_LED_COUNT 110
 #define RGB_DI_PIN B15
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index b18b94da10..afac3376a4 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -81,7 +81,7 @@
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index e3d004fc27..3af4f76725 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_ANIMATIONS
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #        define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 7bc8c4132b..2f6d18efcd 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -113,7 +113,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 08863797fb..632514e87e 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -113,7 +113,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 08863797fb..632514e87e 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -113,7 +113,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 005f78e8a9..ee55576d8c 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -113,7 +113,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index 8166510921..8539a6d49d 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_ANIMATIONS
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/keebwerk/mega/ansi/config.h b/keyboards/keebwerk/mega/ansi/config.h
index 15df557676..43bc368925 100755
--- a/keyboards/keebwerk/mega/ansi/config.h
+++ b/keyboards/keebwerk/mega/ansi/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 128
+#define RGB_MATRIX_LED_COUNT 128
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index 1e54bbfb15..e9d50a65cc 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/config.h
@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN B0
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 80
+#define RGB_MATRIX_LED_COUNT 80
 // Limit the Brithness of the LEDs
 #define RGBLIGHT_LIMIT_VAL 96
 #define RGB_VAL_STEP 12
diff --git a/keyboards/keyboardio/model01/config.h b/keyboards/keyboardio/model01/config.h
index 2bb5cb7386..c3874206d0 100644
--- a/keyboards/keyboardio/model01/config.h
+++ b/keyboards/keyboardio/model01/config.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEBOUNCE 0
 
 /* RGB matrix constants */
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c
index 0308887d3b..7e65134bd4 100644
--- a/keyboards/keyboardio/model01/leds.c
+++ b/keyboards/keyboardio/model01/leds.c
@@ -89,7 +89,7 @@ static void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
 }
 
 static void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
-  for (int i=0; i<DRIVER_LED_TOTAL; i++)
+  for (int i=0; i<RGB_MATRIX_LED_COUNT; i++)
     set_color(i, r, g, b);
 }
 
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
index 5e91a21c73..42478a2db6 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
@@ -33,7 +33,7 @@
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN D3
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 60
+#define RGB_MATRIX_LED_COUNT 60
 #define RGBLED_NUM 60
 #define RGB_MATRIX_SPLIT {30,30}
 #define SPLIT_LAYER_STATE_ENABLE
@@ -45,7 +45,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80 // limits maximum brightness of LEDs to 80 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/keychron/q1/rev_0100/config.h b/keyboards/keychron/q1/rev_0100/config.h
index 1b8c65165c..0a30f7d82d 100644
--- a/keyboards/keychron/q1/rev_0100/config.h
+++ b/keyboards/keychron/q1/rev_0100/config.h
@@ -23,4 +23,4 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 23
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
\ No newline at end of file
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c
index 9bc7231ece..f5e8d48cba 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c
@@ -18,7 +18,7 @@
 #include "rgb_matrix_user.h"
 #include "keymap_user.h"
 
-keypos_t led_index_key_position[DRIVER_LED_TOTAL];
+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++) {
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c
index f06039af06..90e16ded46 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c
@@ -18,7 +18,7 @@
 #include "rgb_matrix_user.h"
 #include "keymap_user.h"
 
-keypos_t led_index_key_position[DRIVER_LED_TOTAL];
+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++) {
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c
index 77f1c1011b..6750dc86c7 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c
@@ -18,7 +18,7 @@
 #include "rgb_matrix_user.h"
 #include "keymap_user.h"
 
-keypos_t led_index_key_position[DRIVER_LED_TOTAL];
+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++) {
diff --git a/keyboards/keychron/q1/rev_0100/rev_0100.c b/keyboards/keychron/q1/rev_0100/rev_0100.c
index f424669527..2c87a8241e 100644
--- a/keyboards/keychron/q1/rev_0100/rev_0100.c
+++ b/keyboards/keychron/q1/rev_0100/rev_0100.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q1/rev_0101/config.h b/keyboards/keychron/q1/rev_0101/config.h
index 58d77477ca..b38261abf6 100644
--- a/keyboards/keychron/q1/rev_0101/config.h
+++ b/keyboards/keychron/q1/rev_0101/config.h
@@ -23,7 +23,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 23
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder used pins */
 #define ENCODERS_PAD_A { E6 }
diff --git a/keyboards/keychron/q1/rev_0101/rev_0101.c b/keyboards/keychron/q1/rev_0101/rev_0101.c
index dd7f69529e..4edd2c761f 100644
--- a/keyboards/keychron/q1/rev_0101/rev_0101.c
+++ b/keyboards/keychron/q1/rev_0101/rev_0101.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q1/rev_0102/config.h b/keyboards/keychron/q1/rev_0102/config.h
index 7aa0ae8662..b9b33cf320 100644
--- a/keyboards/keychron/q1/rev_0102/config.h
+++ b/keyboards/keychron/q1/rev_0102/config.h
@@ -23,4 +23,4 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 24
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
\ No newline at end of file
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
index 8650f30df1..4903421cab 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
@@ -18,7 +18,7 @@
 #include "rgb_matrix_user.h"
 #include "keymap_user.h"
 
-keypos_t led_index_key_position[DRIVER_LED_TOTAL];
+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++) {
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c
index f06039af06..90e16ded46 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c
@@ -18,7 +18,7 @@
 #include "rgb_matrix_user.h"
 #include "keymap_user.h"
 
-keypos_t led_index_key_position[DRIVER_LED_TOTAL];
+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++) {
diff --git a/keyboards/keychron/q1/rev_0102/rev_0102.c b/keyboards/keychron/q1/rev_0102/rev_0102.c
index f1468d1094..5304a602c3 100644
--- a/keyboards/keychron/q1/rev_0102/rev_0102.c
+++ b/keyboards/keychron/q1/rev_0102/rev_0102.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q2/rev_0110/config.h b/keyboards/keychron/q2/rev_0110/config.h
index f30b81b3af..6c39432b74 100644
--- a/keyboards/keychron/q2/rev_0110/config.h
+++ b/keyboards/keychron/q2/rev_0110/config.h
@@ -19,4 +19,4 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 34
 #define DRIVER_2_LED_TOTAL 33
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c b/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c
index 19ddd54aa8..6df0e9530f 100644
--- a/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c
+++ b/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c
@@ -18,7 +18,7 @@
 #include "rgb_matrix_user.h"
 #include "keymap_user.h"
 
-keypos_t led_index_key_position[DRIVER_LED_TOTAL];
+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++) {
diff --git a/keyboards/keychron/q2/rev_0110/rev_0110.c b/keyboards/keychron/q2/rev_0110/rev_0110.c
index fe52490177..125872602e 100644
--- a/keyboards/keychron/q2/rev_0110/rev_0110.c
+++ b/keyboards/keychron/q2/rev_0110/rev_0110.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to CKLED manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q2/rev_0111/config.h b/keyboards/keychron/q2/rev_0111/config.h
index 249e589019..8ef6c542f0 100644
--- a/keyboards/keychron/q2/rev_0111/config.h
+++ b/keyboards/keychron/q2/rev_0111/config.h
@@ -19,7 +19,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 34
 #define DRIVER_2_LED_TOTAL 33
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder used pins */
 #define ENCODERS_PAD_A { A10 }
diff --git a/keyboards/keychron/q2/rev_0111/rev_0111.c b/keyboards/keychron/q2/rev_0111/rev_0111.c
index cbadafc458..1bada84daa 100644
--- a/keyboards/keychron/q2/rev_0111/rev_0111.c
+++ b/keyboards/keychron/q2/rev_0111/rev_0111.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to CKLED manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q2/rev_0112/config.h b/keyboards/keychron/q2/rev_0112/config.h
index 4bab401a01..35a86d5839 100644
--- a/keyboards/keychron/q2/rev_0112/config.h
+++ b/keyboards/keychron/q2/rev_0112/config.h
@@ -19,4 +19,4 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 34
 #define DRIVER_2_LED_TOTAL 34
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/keychron/q2/rev_0112/rev_0112.c b/keyboards/keychron/q2/rev_0112/rev_0112.c
index b994679725..cf2bb34857 100644
--- a/keyboards/keychron/q2/rev_0112/rev_0112.c
+++ b/keyboards/keychron/q2/rev_0112/rev_0112.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q2/rev_0113/config.h b/keyboards/keychron/q2/rev_0113/config.h
index 8f7fbef73a..8dd123e3bb 100644
--- a/keyboards/keychron/q2/rev_0113/config.h
+++ b/keyboards/keychron/q2/rev_0113/config.h
@@ -19,7 +19,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 34
 #define DRIVER_2_LED_TOTAL 34
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder used pins */
 #define ENCODERS_PAD_A { A10 }
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.c b/keyboards/keychron/q2/rev_0113/rev_0113.c
index e1d66976dd..2aa3ab2a6d 100644
--- a/keyboards/keychron/q2/rev_0113/rev_0113.c
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
index 8e4710abb3..f1535cc084 100755
--- a/keyboards/kprepublic/bm40hsrgb/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/config.h
@@ -38,7 +38,7 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 53
+#define RGB_MATRIX_LED_COUNT 53
 #ifdef RGB_DI_PIN
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h
index bfcec37892..c366c20a8c 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h
@@ -54,7 +54,7 @@
 
 // If RGBLight is enabled
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM DRIVER_LED_TOTAL
+#    define RGBLED_NUM RGB_MATRIX_LED_COUNT
 
 #    define RGBLIGHT_EFFECT_SNAKE
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
index 9130bd678e..ba83e47f5f 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
 #define LAYER (get_highest_layer(layer_state))
 #define LAYER_SIZE (MATRIX_ROWS * MATRIX_COLS)
 #define CHECK_LED() \
-    if ((i >= DRIVER_LED_TOTAL) \
+    if ((i >= RGB_MATRIX_LED_COUNT) \
     || ((g_led_config.flags[pos] == LED_FLAG_NONE) || (g_led_config.flags[pos] == LED_FLAG_UNDERGLOW))) \
         continue
 
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
     #ifdef UNDERGLOW_DISABLE
     void keyboard_pre_init_user(void) {
         
-        for (int key_id = 0; key_id < DRIVER_LED_TOTAL; key_id++ ) {
+        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;
             }
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
index e725e23214..6411a07d4f 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
@@ -69,7 +69,7 @@ void matrix_scan_user(void) {
 
 void rgb_matrix_indicators_user(void) {
 
-  for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+  for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
     if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
         rgb_matrix_set_color(i, 0, 0, 0);
     }
@@ -80,7 +80,7 @@ void rgb_matrix_indicators_user(void) {
 
   //capslock
   if (host_keyboard_led_state().caps_lock) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 255, 255, 255);
       }
@@ -89,7 +89,7 @@ void rgb_matrix_indicators_user(void) {
 
   //nav layer
   if (IS_LAYER_ON(NAVR)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 0, 204, 255);
       }
@@ -98,7 +98,7 @@ void rgb_matrix_indicators_user(void) {
 
   //funl layer
   if (IS_LAYER_ON(FUNL)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 255, 0, 0);
       }
@@ -107,7 +107,7 @@ void rgb_matrix_indicators_user(void) {
 
   //nsl layer
   if (IS_LAYER_ON(NSL)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 51, 0, 255);
       }
@@ -116,7 +116,7 @@ void rgb_matrix_indicators_user(void) {
 
   //nssl layer
   if (IS_LAYER_ON(NSSL)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 0, 255, 0);
       }
@@ -125,7 +125,7 @@ void rgb_matrix_indicators_user(void) {
 
   //game layer
   if (IS_LAYER_ON(GAME)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 0, 204, 255);
       }
@@ -134,7 +134,7 @@ void rgb_matrix_indicators_user(void) {
 
   //secgame layer
   if (IS_LAYER_ON(SECGAME)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 255, 0, 0);
       }
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
index 02ea122a03..8f1eb6d358 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
@@ -69,7 +69,7 @@ void matrix_scan_user(void) {
 
 void rgb_matrix_indicators_user(void) {
 
-  for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+  for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
     if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
         rgb_matrix_set_color(i, 0, 0, 0);
     }
@@ -80,7 +80,7 @@ void rgb_matrix_indicators_user(void) {
 
   //capslock
   if (host_keyboard_led_state().caps_lock) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 255, 255, 255);
       }
@@ -89,7 +89,7 @@ void rgb_matrix_indicators_user(void) {
 
   //game layer
   if (IS_LAYER_ON(GAME)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 0, 204, 255);
       }
@@ -98,7 +98,7 @@ void rgb_matrix_indicators_user(void) {
 
   //secgame layer
   if (IS_LAYER_ON(SECGAME)) {
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
       if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
             rgb_matrix_set_color(i, 255, 0, 0);
       }
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index f1a160730c..01253ab01a 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 69
+#define RGB_MATRIX_LED_COUNT 69
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 69
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index 09ba659d65..96ed5e65cb 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -100,7 +100,7 @@
 
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 63
-//#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+//#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
     #define RGB_MATRIX_DISABLE_KEYCODES
@@ -118,7 +118,7 @@
 #    define WS2812_LED_TOTAL 6
 #endif
 
-#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 4fe8480691..55e0667f45 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -22,7 +22,7 @@
 #    include "is31fl3733.h"
 #    include "ws2812.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_1, A_1, C_1 },
     { 0, B_2, A_2, C_2 },
     { 0, B_3, A_3, C_3 },
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index 868ce40d8c..8373569b47 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
@@ -43,7 +43,7 @@
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 69
+#define RGB_MATRIX_LED_COUNT 69
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 69
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index ac80357e9f..3a9f4af282 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -67,7 +67,7 @@
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 63
-#    define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#    define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index 730c7ea668..fd964a67cd 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -15,7 +15,7 @@
 #include "rev2.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_1, A_1, C_1 },
     { 0, B_2, A_2, C_2 },
     { 0, B_3, A_3, C_3 },
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index 4ef984b4be..0fc5946f63 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_LED_COUNT 70
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 70
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index 80dc26907c..c5f8d3267e 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -137,7 +137,7 @@
 #    define WS2812_LED_TOTAL RGBLED_NUM
 #endif
 
-#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index 4500ff37b9..7144db99ef 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -24,7 +24,7 @@
 #    include "ws2812.h"
 
 
-const PROGMEM is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const PROGMEM is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_1, A_1, C_1 },
     { 0, B_2, A_2, C_2 },
     { 0, B_3, A_3, C_3 },
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index 88c44d4440..66c2883029 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 67
+#define RGB_MATRIX_LED_COUNT 67
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 67
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
index 4a438b822b..93a90f12b0 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
@@ -109,7 +109,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+  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 );
     }
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 96d8a450c9..7b38edd95a 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -133,7 +133,7 @@
 #    define WS2812_LED_TOTAL RGBLED_NUM
 #endif
 
-#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index 32cfce362f..7da219eec2 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -21,7 +21,7 @@
 #    include "is31fl3733.h"
 #    include "ws2812.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_1, A_1, C_1 },
     { 0, B_2, A_2, C_2 },
     { 0, B_3, A_3, C_3 },
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index c5e8022d35..aa3ad0ce68 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN E2
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 73
+#define RGB_MATRIX_LED_COUNT 73
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 73
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
index 442111bb6e..18986c604c 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
@@ -423,7 +423,7 @@ void set_layer_color(int layer) {
     }
     // non key specific lighting instead led flag based
     if (layer == _LVL7_){
-        for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+        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);
             }
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index 0b5a3bf8e4..9f5a68ca94 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 74
+#define RGB_MATRIX_LED_COUNT 74
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 74
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index 9b9d534c42..bf67620c5b 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN E2
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 74
+#define RGB_MATRIX_LED_COUNT 74
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 74
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index 3ddb813486..a397c57099 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -64,7 +64,7 @@
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_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_ANIMATIONS             // Run RGB animations
 // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
index bf842b138b..0ac5d0c932 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
@@ -56,7 +56,7 @@ Templete
 #undef _______
 #define _______ {0, 0, 0}
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+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}, _______, _______, _______, _______,  _______, _______,
@@ -270,7 +270,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 void set_layer_color(int layer) {
     if (layer == 0) { return; }
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    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]),
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 86fbb7ae3b..add31bbdb4 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -55,7 +55,7 @@
 
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 68
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #define DRIVER_INDICATOR_LED_TOTAL 0
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
index be743cbae5..2fb7a6e9bf 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
@@ -17,7 +17,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS6_SW1, CS5_SW1, CS4_SW1},
     {0, CS6_SW2, CS5_SW2, CS4_SW2},
     {0, CS6_SW3, CS5_SW3, CS4_SW3},
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index 049aca9b8a..33b01b850f 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 87
+#define RGB_MATRIX_LED_COUNT 87
 
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 87
@@ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
-//#define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+//#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index 97cae26cbd..f2acf22a62 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
@@ -46,7 +46,7 @@
 // #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
 // #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 
 
diff --git a/keyboards/kprepublic/bm80v2/bm80v2.c b/keyboards/kprepublic/bm80v2/bm80v2.c
index 4b8e5af13f..dd89c1b0f0 100644
--- a/keyboards/kprepublic/bm80v2/bm80v2.c
+++ b/keyboards/kprepublic/bm80v2/bm80v2.c
@@ -16,7 +16,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS6_SW1, CS5_SW1, CS4_SW1},
     {0, CS6_SW3, CS5_SW3, CS4_SW3}, 
     {0, CS6_SW4, CS5_SW4, CS4_SW4},    
diff --git a/keyboards/kprepublic/bm80v2/config.h b/keyboards/kprepublic/bm80v2/config.h
index f04ec1d960..dfca28c93d 100644
--- a/keyboards/kprepublic/bm80v2/config.h
+++ b/keyboards/kprepublic/bm80v2/config.h
@@ -70,6 +70,6 @@
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 87
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
diff --git a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
index 90d476aa2c..8c6eaf5a5b 100644
--- a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
+++ b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
@@ -16,7 +16,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS6_SW1, CS5_SW1, CS4_SW1},
     {0, CS6_SW3, CS5_SW3, CS4_SW3}, 
     {0, CS6_SW4, CS5_SW4, CS4_SW4},    
diff --git a/keyboards/kprepublic/bm80v2_iso/config.h b/keyboards/kprepublic/bm80v2_iso/config.h
index aee11c42c9..8231627b36 100644
--- a/keyboards/kprepublic/bm80v2_iso/config.h
+++ b/keyboards/kprepublic/bm80v2_iso/config.h
@@ -71,6 +71,6 @@
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 88
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index af7e3f3be3..605fad9e55 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B0
 
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL  98
+#define RGB_MATRIX_LED_COUNT  98
 //#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 98
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
index 601744beb7..b34a8a7b17 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
@@ -18,7 +18,7 @@
 // ws2812 options
 #define RGB_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
 #define RGBLED_NUM 4 // number of LEDs
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 585f632c40..9e6b98ee3a 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -109,7 +109,7 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 25
 #    define DRIVER_2_LED_TOTAL 24
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #endif
 #define RGB_DI_PIN B7
diff --git a/keyboards/latincompass/latin17rgb/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c
index d4ab3ea675..e165c5b76d 100644
--- a/keyboards/latincompass/latin17rgb/latin17rgb.c
+++ b/keyboards/latincompass/latin17rgb/latin17rgb.c
@@ -17,7 +17,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index 0058297dda..8ac72f7bb3 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -96,5 +96,5 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 60
+#    define RGB_MATRIX_LED_COUNT 60
 #endif
diff --git a/keyboards/latincompass/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
index b849f7ef9d..131c184124 100644
--- a/keyboards/latincompass/latin60rgb/latin60rgb.c
+++ b/keyboards/latincompass/latin60rgb/latin60rgb.c
@@ -16,7 +16,7 @@
 #include "latin60rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, K_13, J_13, L_13 },
     { 0, K_12, J_12, L_12 },
     { 0, K_11, J_11, L_11 },
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index 5bb3ca4562..866bee31fa 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define RGB_DI_PIN B7
 
 #define RGBLED_NUM 2
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 17083580a6..ef4695bdb1 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -107,7 +107,7 @@
 #define DRIVER_ADDR_1 0b1110100
 
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 6
+#define RGB_MATRIX_LED_COUNT 6
 #endif
 //#define RGB_DI_PIN B7
 //#ifdef RGB_DI_PIN
diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c
index ddab9a1519..cc10a7b334 100644
--- a/keyboards/latincompass/latin6rgb/latin6rgb.c
+++ b/keyboards/latincompass/latin6rgb/latin6rgb.c
@@ -17,7 +17,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index 255ddc89db..47b79802af 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define RGB_DI_PIN D3
 
 #define RGBLED_NUM 18
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index 09198df612..cefcbd6469 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define RGB_DI_PIN B7
 
 #define RGBLED_NUM 4
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 5fac33e7d5..008a171724 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Define RGB */
 #define RGBLED_NUM 67
-#define DRIVER_LED_TOTAL 67
+#define RGB_MATRIX_LED_COUNT 67
 #define RGB_DI_PIN B0
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index e9e69f3b66..0980a742d1 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -46,7 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Define RGB */
 #define RGBLED_NUM 126
-#define DRIVER_LED_TOTAL 126
+#define RGB_MATRIX_LED_COUNT 126
 #define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 54850aec3f..17d19fb2e1 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Define RGB */
 #define RGBLED_NUM 127
-#define DRIVER_LED_TOTAL 127
+#define RGB_MATRIX_LED_COUNT 127
 #define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
index b14becc25b..d801910568 100644
--- a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
@@ -26,6 +26,6 @@
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
 
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define AUDIO_PIN B7
 #define AUDIO_CLICKY
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 6cee7a9a92..1fe692c383 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -81,12 +81,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
   #define RGBLED_NUM 40    // Number of LEDs
-  #define DRIVER_LED_TOTAL RGBLED_NUM
+  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
   #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
   // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
   // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-  // #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+  // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
   #define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/massdrop/alt/config_led.h b/keyboards/massdrop/alt/config_led.h
index b600dd23b9..770a430d3c 100644
--- a/keyboards/massdrop/alt/config_led.h
+++ b/keyboards/massdrop/alt/config_led.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //Define number of ISSI3733 drivers being used (1...16)
 #define ISSI3733_DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL ISSI3733_LED_COUNT
+#define RGB_MATRIX_LED_COUNT ISSI3733_LED_COUNT
 
 //Hardware address of each driver (Refer to ISSI3733 pdf "Table 1 Slave Address" and keyboard schematic)
 #define ISSI3773_DRIVER_ADDRESSES { 0xA0, 0xBE }
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
index 967c1570d2..6afd882dbe 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
@@ -230,7 +230,7 @@ static void set_rgb_layer(int layer) {
 
     switch (cur->type) {
         case type_hsv:
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL ; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT ; i++) {
                 if (!(g_led_config.flags[i] & cur->flags))
                     rgb_matrix_set_color(i, 0, 0, 0);
             }
@@ -247,7 +247,7 @@ static void set_rgb_layer(int layer) {
                 rgb_matrix_mode_noeeprom(rgbs[cur->mode - RGB_MATRIX_EFFECT_MAX].mode);
             else
                 rgb_matrix_mode_noeeprom(cur->mode);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 const RGB *m = &cur->rgb[i];
                 if (!RGB_IS_NULL(*m))
                     rgb_matrix_set_color(i, m->r, m->g, m->b);
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins/rgb_matrix.h b/keyboards/massdrop/alt/keymaps/jdelkins/rgb_matrix.h
index ff30cc0e42..146de00447 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins/rgb_matrix.h
+++ b/keyboards/massdrop/alt/keymaps/jdelkins/rgb_matrix.h
@@ -63,7 +63,7 @@ struct layer_rgb {
     uint8_t mode;
     union {
         HSV hsv;
-        RGB rgb[DRIVER_LED_TOTAL];
+        RGB rgb[RGB_MATRIX_LED_COUNT];
     };
 };
 
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
index f5a39338b8..8db9222783 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
@@ -113,7 +113,7 @@ static void set_rgb_layer(int layer) {
 
     switch (cur->type) {
         case type_hsv:
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL ; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT ; i++) {
                 if (!(g_led_config.flags[i] & cur->flags))
                     rgb_matrix_set_color(i, 0, 0, 0);
             }
@@ -130,7 +130,7 @@ static void set_rgb_layer(int layer) {
                 rgb_matrix_mode_noeeprom(rgbs[cur->mode - RGB_MATRIX_EFFECT_MAX].mode);
             else
                 rgb_matrix_mode_noeeprom(cur->mode);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 const RGB *m = &cur->rgb[i];
                 if (!RGB_IS_NULL(*m))
                     rgb_matrix_set_color(i, m->r, m->g, m->b);
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins_ss/rgb_matrix.h b/keyboards/massdrop/alt/keymaps/jdelkins_ss/rgb_matrix.h
index ff30cc0e42..146de00447 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins_ss/rgb_matrix.h
+++ b/keyboards/massdrop/alt/keymaps/jdelkins_ss/rgb_matrix.h
@@ -63,7 +63,7 @@ struct layer_rgb {
     uint8_t mode;
     union {
         HSV hsv;
-        RGB rgb[DRIVER_LED_TOTAL];
+        RGB rgb[RGB_MATRIX_LED_COUNT];
     };
 };
 
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 936951e34a..42ddb1f4f3 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -89,7 +89,7 @@
 // #define RGBLIGHT_VAL_STEP 12        						// Units to step when in/decreasing value (brightness)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0   					// number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED 			// turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_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_ANIMATIONS             					// Run RGB animations
 // #define RGBLIGHT_ANIMATIONS             					// Enable all additional animation modes.
diff --git a/keyboards/massdrop/alt/keymaps/pregame/keymap.c b/keyboards/massdrop/alt/keymaps/pregame/keymap.c
index 6c1d93b030..6a78f075fb 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/pregame/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #undef _______
 #define _______ {0, 0, 0}
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
     [0] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, CHART,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -182,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 void set_layer_color(int layer) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    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]),
diff --git a/keyboards/massdrop/ctrl/config_led.h b/keyboards/massdrop/ctrl/config_led.h
index de897ce1bd..f582035e9e 100644
--- a/keyboards/massdrop/ctrl/config_led.h
+++ b/keyboards/massdrop/ctrl/config_led.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //Define number of ISSI3733 drivers being used (1...16)
 #define ISSI3733_DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL ISSI3733_LED_COUNT
+#define RGB_MATRIX_LED_COUNT ISSI3733_LED_COUNT
 
 //Hardware address of each driver (Refer to ISSI3733 pdf "Table 1 Slave Address" and keyboard schematic)
 #define ISSI3773_DRIVER_ADDRESSES { 0xA0, 0xBE }
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index d0bbfd2103..8b28e72d5c 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -49,7 +49,7 @@
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_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_ANIMATIONS             // Run RGB animations
 // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
index 6451dd495b..4c9c73c3fd 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #undef _______
 #define _______ {0, 0, 0}
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
     [_FL] = {
         _______, CORAL,   CORAL,   _______, _______, CORAL,   CORAL,   _______, _______, CORAL,   _______, YELLOW,  YELLOW,           TEAL,    GOLD,   GOLD,
         _______, _______, PINK,    PINK,    PINK,    PINK,    _______, _______, _______, GREEN,   GREEN,   GREEN,   GREEN,   _______, TEAL,    TEAL,   TEAL,
@@ -354,7 +354,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 void set_layer_color(int layer) {
     if (layer == 0) { return; }
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    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]),
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
index 160ddf6d18..68ed5f7609 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
@@ -34,7 +34,7 @@
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_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_ANIMATIONS             // Run RGB animations
 // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h
index ff214aaad6..96f90f5e05 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h
@@ -75,6 +75,6 @@ extern uint8_t raw_hid_buffer[RAW_EPSIZE];
 
 // Defined in rgb_matrix_user.inc
 // It's 119 for Massdrop CTRL, 0 - 118.
-extern RGB rgb_matrix_led_state[DRIVER_LED_TOTAL];
+extern RGB rgb_matrix_led_state[RGB_MATRIX_LED_COUNT];
 
 void raw_hid_perform_send(void);
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c b/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
index 299251e456..ad265f0ead 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
@@ -199,9 +199,9 @@ void raw_hid_led(uint8_t *data) {
     //rgb_matrix_set_color(data[1], data[2], data[3], data[4]);
     const uint8_t led = data[1];
 
-    if (led >= DRIVER_LED_TOTAL) {
+    if (led >= RGB_MATRIX_LED_COUNT) {
         raw_hid_buffer[1] = CTRL_HID_NOK;
-        raw_hid_buffer[2] = DRIVER_LED_TOTAL;
+        raw_hid_buffer[2] = RGB_MATRIX_LED_COUNT;
         raw_hid_buffer[3] = CTRL_HID_EOM;
         return;
     }
@@ -219,7 +219,7 @@ void raw_hid_leds(uint8_t *data) {
     const uint8_t number_leds = data[2];
 
     uint8_t i = 0;
-    while (i < number_leds && first_led + i < DRIVER_LED_TOTAL && i * 3 + 5 < RAW_EPSIZE) {
+    while (i < number_leds && first_led + i < RGB_MATRIX_LED_COUNT && i * 3 + 5 < RAW_EPSIZE) {
         rgb_matrix_led_state[first_led + i].r = data[3 + i * 3 + 0];
         rgb_matrix_led_state[first_led + i].g = data[3 + i * 3 + 1];
         rgb_matrix_led_state[first_led + i].b = data[3 + i * 3 + 2];
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc b/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc
index cca598e3b2..36d09c42e2 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc
@@ -26,7 +26,7 @@ RGB_MATRIX_EFFECT(hid_effect)
 // Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
 #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
-RGB rgb_matrix_led_state[DRIVER_LED_TOTAL];
+RGB rgb_matrix_led_state[RGB_MATRIX_LED_COUNT];
 
 // e.g: A simple effect, self-contained within a single method
 static bool hid_effect(effect_params_t* params) {
@@ -38,7 +38,7 @@ static bool hid_effect(effect_params_t* params) {
             rgb_matrix_led_state[i].g,
             rgb_matrix_led_state[i].b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index 692faa35a2..78641763c2 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_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_ANIMATIONS             // Run RGB animations
 // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
index c89607b3f3..406263cee5 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #    undef _______
 #    define _______ {0,0,0}
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
     [_NL] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, GOLD,    GOLD,    GOLD,    GREEN,   GREEN,   GREEN,   _______,   _______, _______, _______,
@@ -217,7 +217,7 @@ void set_layer_color(int layer) {
     if (layer == 0) {
         return;
     }
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    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]),
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index f1cbd5f3b0..e5799e308e 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -65,7 +65,7 @@
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_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_ANIMATIONS             // Run RGB animations
 // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
index c7bc285eda..2b6515fc97 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #define __OFF__ {0, 0, 0}
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
     [_FL] = {
         //  These remain on base layer rgb to see adjustments ;)
         //       |----------------------------------|
@@ -323,7 +323,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 void set_layer_color(int layer) {
     if (layer == 0) { return; }
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    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]),
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index cf63bb1bda..95a83905a3 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -86,4 +86,4 @@
 
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index 7535cb5bd4..4466ec3bea 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -30,7 +30,7 @@
 #endif
 // rgb ring leds setting
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -373,7 +373,7 @@ void rgb_ring_init(void)
 {
     i2c_init();
     IS31FL3731_init(DRIVER_ADDR_1);
-    for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+    for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         bool enabled = true;
         IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
     }
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 83c1942a5f..081b5de373 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -30,7 +30,7 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 89c25707af..44450229a1 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -63,7 +63,7 @@ void matrix_scan_kb(void) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index 7f151ae09a..bc025120a6 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -4,7 +4,7 @@
 #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
 
 #define RGB_DI_PIN A7
-#define DRIVER_LED_TOTAL 91
+#define RGB_MATRIX_LED_COUNT 91
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index dbeb73cda2..2a434f1d5d 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -23,7 +23,7 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 32
 #define DRIVER_2_LED_TOTAL 36
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index dda36f3710..edbbe39c4b 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -17,7 +17,7 @@
 #include "adelais.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     {0, C2_1,   C3_1,   C4_1}, //D102-A0-0
     {0, C5_1,   C6_1,   C7_1}, //D108-A1-1
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index e16d5f2ce5..9149dfe97a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -51,7 +51,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // 0b1110110 AD <-> SDA
 #define DRIVER_ADDR_1 0b0110010
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 66
+#define RGB_MATRIX_LED_COUNT 66
 
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index d9ea7993cf..cf334a962e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -17,7 +17,7 @@
 #include "rev3.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */
     {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */
     {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 0d5bfb57f9..1782c4f497 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -31,7 +31,7 @@
 // 0b1110110 AD <-> SDA
 #define DRIVER_ADDR_1 0b1110110
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 25
+#define RGB_MATRIX_LED_COUNT 25
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
index 413a9a06ea..448f7156fd 100644
--- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
+++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
@@ -18,7 +18,7 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 // left CA
     {0, C5_2,   C6_2,   C7_2}, //D2-0
     {0, C1_1,   C3_2,   C4_2}, //D20-1
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h
index 9a84e78588..cea9a5bc06 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h
@@ -2,7 +2,7 @@
 
 #define RGB_DI_PIN A15
 #ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL 72
+#    define RGB_MATRIX_LED_COUNT 72
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index 3a25680a20..48caf0b40e 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -21,7 +21,7 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 44
 #define DRIVER_2_LED_TOTAL 34
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
index ac371e4185..bb88a316ea 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
@@ -17,7 +17,7 @@
 #include "rev2.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
index 3c2ffd4b9f..d173abe124 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -89,5 +89,5 @@
 //#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define DRIVER_ADDR_1 0b0110010
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 91
+#define RGB_MATRIX_LED_COUNT 91
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
index 0ad5d41430..c1463cf4ca 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -17,7 +17,7 @@
 #include "rgb_rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS34_SW1,   CS35_SW1,   CS36_SW1}, //D92-K00-0
     {0, CS37_SW1,   CS38_SW1,   CS39_SW1}, //D94-K01-1
     {0, CS31_SW1,   CS32_SW1,   CS33_SW1}, //D96-K02-2
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
index 4f02ed39c9..f86332fe08 100644
--- a/keyboards/mechlovin/infinity875/config.h
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 42
+#define RGB_MATRIX_LED_COUNT 42
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc b/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc
index cee6a3f038..627d12bd3c 100644
--- a/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc
+++ b/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc
@@ -62,7 +62,7 @@ bool effect_runner_all(effect_params_t* params, i_f effect_func) {
         RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_esc(effect_params_t* params, i_f effect_func) {
@@ -77,7 +77,7 @@ bool effect_runner_esc(effect_params_t* params, i_f effect_func) {
     for (uint8_t i = 1; i < 18; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_f13(effect_params_t* params, i_f effect_func) {
@@ -94,7 +94,7 @@ bool effect_runner_f13(effect_params_t* params, i_f effect_func) {
     for (uint8_t i = 0; i < 14; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_clus(effect_params_t* params, i_f effect_func) {
@@ -109,7 +109,7 @@ bool effect_runner_clus(effect_params_t* params, i_f effect_func) {
     for (uint8_t i = 0; i < 15; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) {
@@ -123,7 +123,7 @@ bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) {
         RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) {
@@ -140,7 +140,7 @@ bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) {
     for (uint8_t i = 1; i < 18; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) {
@@ -160,7 +160,7 @@ bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) {
     for (uint8_t i = 0; i < 14; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) {
@@ -177,7 +177,7 @@ bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) {
     for (uint8_t i = 0; i < 15; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -191,7 +191,7 @@ bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func)
         RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -208,7 +208,7 @@ bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func)
     for (uint8_t i = 1; i < 18; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -228,7 +228,7 @@ bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func)
     for (uint8_t i = 0; i < 14; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -245,7 +245,7 @@ bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func
     for (uint8_t i = 0; i < 15; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 static void raindrops_set_color_all(int i, effect_params_t* params) {
@@ -375,7 +375,7 @@ static bool solid_esc(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Solid F13
@@ -390,7 +390,7 @@ static bool solid_f13(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Solid cluster
@@ -404,7 +404,7 @@ static bool solid_clus(effect_params_t* params) {
     for (uint8_t i = 15 ; i < led_max; i++) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Breathing all
@@ -420,7 +420,7 @@ bool breathing_all(effect_params_t* params) {
         RGB_MATRIX_TEST_LED_FLAGS();
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Breathing ESC
@@ -439,7 +439,7 @@ static bool breathing_esc(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
         rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Breathing F13
@@ -458,7 +458,7 @@ static bool breathing_f13(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
         rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
-    return led_max < DRIVER_LED_TOTAL;  
+    return led_max < RGB_MATRIX_LED_COUNT;  
 }
 
 // Breathing cluster
@@ -476,7 +476,7 @@ static bool breathing_clus(effect_params_t* params) {
         RGB_MATRIX_TEST_LED_FLAGS();
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Band Val all
@@ -698,7 +698,7 @@ static bool raindrops_all(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_all(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_all(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -707,7 +707,7 @@ static bool raindrops_all(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_all(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Raindrops ESC
@@ -715,7 +715,7 @@ static bool raindrops_esc(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_esc(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_esc(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -724,7 +724,7 @@ static bool raindrops_esc(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_esc(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Raindrops F13
@@ -732,7 +732,7 @@ static bool raindrops_f13(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_f13(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_f13(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -741,7 +741,7 @@ static bool raindrops_f13(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_f13(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Raindrops Cluster
@@ -749,7 +749,7 @@ static bool raindrops_clus(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_clus(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_clus(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -758,7 +758,7 @@ static bool raindrops_clus(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_clus(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc b/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc
index cee6a3f038..627d12bd3c 100644
--- a/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc
+++ b/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc
@@ -62,7 +62,7 @@ bool effect_runner_all(effect_params_t* params, i_f effect_func) {
         RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_esc(effect_params_t* params, i_f effect_func) {
@@ -77,7 +77,7 @@ bool effect_runner_esc(effect_params_t* params, i_f effect_func) {
     for (uint8_t i = 1; i < 18; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_f13(effect_params_t* params, i_f effect_func) {
@@ -94,7 +94,7 @@ bool effect_runner_f13(effect_params_t* params, i_f effect_func) {
     for (uint8_t i = 0; i < 14; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_clus(effect_params_t* params, i_f effect_func) {
@@ -109,7 +109,7 @@ bool effect_runner_clus(effect_params_t* params, i_f effect_func) {
     for (uint8_t i = 0; i < 15; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) {
@@ -123,7 +123,7 @@ bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) {
         RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) {
@@ -140,7 +140,7 @@ bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) {
     for (uint8_t i = 1; i < 18; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) {
@@ -160,7 +160,7 @@ bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) {
     for (uint8_t i = 0; i < 14; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) {
@@ -177,7 +177,7 @@ bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) {
     for (uint8_t i = 0; i < 15; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -191,7 +191,7 @@ bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func)
         RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -208,7 +208,7 @@ bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func)
     for (uint8_t i = 1; i < 18; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -228,7 +228,7 @@ bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func)
     for (uint8_t i = 0; i < 14; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func) {
@@ -245,7 +245,7 @@ bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func
     for (uint8_t i = 0; i < 15; i++) {
         rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 static void raindrops_set_color_all(int i, effect_params_t* params) {
@@ -375,7 +375,7 @@ static bool solid_esc(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Solid F13
@@ -390,7 +390,7 @@ static bool solid_f13(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Solid cluster
@@ -404,7 +404,7 @@ static bool solid_clus(effect_params_t* params) {
     for (uint8_t i = 15 ; i < led_max; i++) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Breathing all
@@ -420,7 +420,7 @@ bool breathing_all(effect_params_t* params) {
         RGB_MATRIX_TEST_LED_FLAGS();
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Breathing ESC
@@ -439,7 +439,7 @@ static bool breathing_esc(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
         rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Breathing F13
@@ -458,7 +458,7 @@ static bool breathing_f13(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
         rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
-    return led_max < DRIVER_LED_TOTAL;  
+    return led_max < RGB_MATRIX_LED_COUNT;  
 }
 
 // Breathing cluster
@@ -476,7 +476,7 @@ static bool breathing_clus(effect_params_t* params) {
         RGB_MATRIX_TEST_LED_FLAGS();
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Band Val all
@@ -698,7 +698,7 @@ static bool raindrops_all(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_all(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_all(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -707,7 +707,7 @@ static bool raindrops_all(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_all(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Raindrops ESC
@@ -715,7 +715,7 @@ static bool raindrops_esc(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_esc(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_esc(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -724,7 +724,7 @@ static bool raindrops_esc(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_esc(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Raindrops F13
@@ -732,7 +732,7 @@ static bool raindrops_f13(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_f13(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_f13(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -741,7 +741,7 @@ static bool raindrops_f13(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_f13(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 // Raindrops Cluster
@@ -749,7 +749,7 @@ static bool raindrops_clus(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color_clus(rand() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color_clus(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
@@ -758,7 +758,7 @@ static bool raindrops_clus(effect_params_t* params) {
     for (int i = led_min; i < led_max; i++) {
         raindrops_set_color_clus(i, params);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h
index 7d941ba1e3..62af5154e6 100755
--- a/keyboards/melgeek/mach80/rev1/config.h
+++ b/keyboards/melgeek/mach80/rev1/config.h
@@ -33,7 +33,7 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define DRIVER_LED_TOTAL 97
+#define RGB_MATRIX_LED_COUNT 97
 #define DRIVER_INDICATOR_LED_TOTAL 3
 
 
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index 4d11d3f711..468fc1f698 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h
index b08ec05100..b42d96691a 100755
--- a/keyboards/melgeek/mach80/rev2/config.h
+++ b/keyboards/melgeek/mach80/rev2/config.h
@@ -33,7 +33,7 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define DRIVER_LED_TOTAL 94
+#define RGB_MATRIX_LED_COUNT 94
 #define DRIVER_INDICATOR_LED_TOTAL 3
 
 
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index 09250b1565..e817ef70a6 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h
index bba46db2dd..c3f72d006a 100644
--- a/keyboards/melgeek/mj61/rev1/config.h
+++ b/keyboards/melgeek/mj61/rev1/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 63
+#define RGB_MATRIX_LED_COUNT 63
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c
index 9d8de36d88..9c24335f82 100644
--- a/keyboards/melgeek/mj61/rev1/rev1.c
+++ b/keyboards/melgeek/mj61/rev1/rev1.c
@@ -17,7 +17,7 @@
 #include "mj61.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */
     {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */
     {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */
diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h
index e17f291934..422d4847e4 100644
--- a/keyboards/melgeek/mj61/rev2/config.h
+++ b/keyboards/melgeek/mj61/rev2/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 71
+#define RGB_MATRIX_LED_COUNT 71
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c
index b46cf08c4e..61588958dc 100644
--- a/keyboards/melgeek/mj61/rev2/rev2.c
+++ b/keyboards/melgeek/mj61/rev2/rev2.c
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB3 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB4 */
diff --git a/keyboards/melgeek/mj63/rev1/config.h b/keyboards/melgeek/mj63/rev1/config.h
index ef8c7872d6..31c4e0f148 100644
--- a/keyboards/melgeek/mj63/rev1/config.h
+++ b/keyboards/melgeek/mj63/rev1/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 65
+#define RGB_MATRIX_LED_COUNT 65
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj63/rev1/rev1.c b/keyboards/melgeek/mj63/rev1/rev1.c
index 45abafd84d..e69d4b2e06 100644
--- a/keyboards/melgeek/mj63/rev1/rev1.c
+++ b/keyboards/melgeek/mj63/rev1/rev1.c
@@ -19,7 +19,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0,  CS9_SW1, CS8_SW1, CS7_SW1},   /* RGB1 */
     {0,  CS9_SW2, CS8_SW2, CS7_SW2},   /* RGB2 */
     {0,  CS9_SW3, CS8_SW3, CS7_SW3},   /* RGB3 */
diff --git a/keyboards/melgeek/mj63/rev2/config.h b/keyboards/melgeek/mj63/rev2/config.h
index e17f291934..422d4847e4 100644
--- a/keyboards/melgeek/mj63/rev2/config.h
+++ b/keyboards/melgeek/mj63/rev2/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 71
+#define RGB_MATRIX_LED_COUNT 71
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj63/rev2/rev2.c b/keyboards/melgeek/mj63/rev2/rev2.c
index b21c4f960c..c2398865ce 100644
--- a/keyboards/melgeek/mj63/rev2/rev2.c
+++ b/keyboards/melgeek/mj63/rev2/rev2.c
@@ -19,7 +19,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0,  CS9_SW1, CS8_SW1, CS7_SW1},   /* RGB1 */
     {0,  CS9_SW2, CS8_SW2, CS7_SW2},   /* RGB3 */
     {0,  CS9_SW3, CS8_SW3, CS7_SW3},   /* RGB4 */
diff --git a/keyboards/melgeek/mj64/rev1/config.h b/keyboards/melgeek/mj64/rev1/config.h
index 713c051a09..a0048f6912 100644
--- a/keyboards/melgeek/mj64/rev1/config.h
+++ b/keyboards/melgeek/mj64/rev1/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 66
+#define RGB_MATRIX_LED_COUNT 66
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c
index 3279e7a1fe..5bfbe73e2f 100644
--- a/keyboards/melgeek/mj64/rev1/rev1.c
+++ b/keyboards/melgeek/mj64/rev1/rev1.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1}, /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB2 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3}, /* RGB3 */
diff --git a/keyboards/melgeek/mj64/rev2/config.h b/keyboards/melgeek/mj64/rev2/config.h
index 713c051a09..a0048f6912 100644
--- a/keyboards/melgeek/mj64/rev2/config.h
+++ b/keyboards/melgeek/mj64/rev2/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 66
+#define RGB_MATRIX_LED_COUNT 66
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c
index b0653f9e71..bf408489a0 100644
--- a/keyboards/melgeek/mj64/rev2/rev2.c
+++ b/keyboards/melgeek/mj64/rev2/rev2.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
diff --git a/keyboards/melgeek/mj64/rev3/config.h b/keyboards/melgeek/mj64/rev3/config.h
index ff467af7d6..bcb2110b60 100644
--- a/keyboards/melgeek/mj64/rev3/config.h
+++ b/keyboards/melgeek/mj64/rev3/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev3/rev3.c b/keyboards/melgeek/mj64/rev3/rev3.c
index b67dbee75b..5bf5725110 100644
--- a/keyboards/melgeek/mj64/rev3/rev3.c
+++ b/keyboards/melgeek/mj64/rev3/rev3.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB3 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB4 */
diff --git a/keyboards/melgeek/mj65/rev3/config.h b/keyboards/melgeek/mj65/rev3/config.h
index 5274508744..24ed74f4b6 100644
--- a/keyboards/melgeek/mj65/rev3/config.h
+++ b/keyboards/melgeek/mj65/rev3/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 76
+#define RGB_MATRIX_LED_COUNT 76
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj65/rev3/rev3.c b/keyboards/melgeek/mj65/rev3/rev3.c
index f02c29e747..6719a03b0f 100644
--- a/keyboards/melgeek/mj65/rev3/rev3.c
+++ b/keyboards/melgeek/mj65/rev3/rev3.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h
index de50fb8b1e..7cb916e4fb 100755
--- a/keyboards/melgeek/mojo68/rev1/config.h
+++ b/keyboards/melgeek/mojo68/rev1/config.h
@@ -33,5 +33,5 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 68
+#define RGB_MATRIX_LED_COUNT 68
 #define DRIVER_INDICATOR_LED_TOTAL 3
diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index 27c9212ac6..17c235820b 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB1 */
     {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB2 */
     {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB3 */
diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h
index f51798a308..6bbda5752a 100644
--- a/keyboards/melgeek/mojo75/rev1/config.h
+++ b/keyboards/melgeek/mojo75/rev1/config.h
@@ -33,6 +33,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 92
+#define RGB_MATRIX_LED_COUNT 92
 #define DRIVER_INDICATOR_LED_TOTAL 0
 
diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c
index ae103801e2..b73e101f1e 100644
--- a/keyboards/melgeek/mojo75/rev1/rev1.c
+++ b/keyboards/melgeek/mojo75/rev1/rev1.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0,  CS6_SW1,  CS5_SW1,  CS4_SW1}, /* RGB1 */
     {0,  CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB2 */
     {0,  CS6_SW3,  CS5_SW3,  CS4_SW3}, /* RGB3 */
diff --git a/keyboards/melgeek/tegic/rev1/config.h b/keyboards/melgeek/tegic/rev1/config.h
index 49d4550be9..e1d22a6384 100755
--- a/keyboards/melgeek/tegic/rev1/config.h
+++ b/keyboards/melgeek/tegic/rev1/config.h
@@ -33,7 +33,7 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define DRIVER_LED_TOTAL 91
+#define RGB_MATRIX_LED_COUNT 91
 //#define DRIVER_INDICATOR_LED_TOTAL 3
 
 
diff --git a/keyboards/melgeek/tegic/rev1/rev1.c b/keyboards/melgeek/tegic/rev1/rev1.c
index e3ede57b33..04e490794c 100755
--- a/keyboards/melgeek/tegic/rev1/rev1.c
+++ b/keyboards/melgeek/tegic/rev1/rev1.c
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
     {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
     {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h
index 2b5f6e5955..e90c780a72 100644
--- a/keyboards/melgeek/z70ultra/config.h
+++ b/keyboards/melgeek/z70ultra/config.h
@@ -81,5 +81,5 @@
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 69
+#define RGB_MATRIX_LED_COUNT 69
 #define DRIVER_INDICATOR_LED_TOTAL 6
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c
index 6be690c01e..9ade47d43e 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -18,7 +18,7 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */
     {0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */
     {0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index b22bd3fb10..19f3bba97f 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -35,7 +35,7 @@
 #define RGBLED_NUM 83
 #define RGBLED_SPLIT { 39, 44 }
 #ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #endif
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index d76eee087a..b501e372ad 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -35,7 +35,7 @@
 #define RGBLED_NUM 100
 #define RGBLED_SPLIT { 48, 52 }
 #ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #endif
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h
index 0e784fe527..16587a22d4 100644
--- a/keyboards/miller/gm862/config.h
+++ b/keyboards/miller/gm862/config.h
@@ -78,5 +78,5 @@
 
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 62
+#    define RGB_MATRIX_LED_COUNT 62
 #endif
diff --git a/keyboards/miller/gm862/gm862.c b/keyboards/miller/gm862/gm862.c
index 5262957767..08c9bfe73b 100644
--- a/keyboards/miller/gm862/gm862.c
+++ b/keyboards/miller/gm862/gm862.c
@@ -1,7 +1,7 @@
 #include "gm862.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, B_1,    A_1,    C_1},
     {0, B_2,    A_2,    C_2},
     {0, B_3,    A_3,    C_3},
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h
index 82d8c134a0..ee7a07fd20 100644
--- a/keyboards/ml/gas75/config.h
+++ b/keyboards/ml/gas75/config.h
@@ -43,7 +43,7 @@
 #define ENCODERS_PAD_B { F1 }
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 3
+    #define RGB_MATRIX_LED_COUNT 3
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h
index 431a570e15..7fde303ae9 100644
--- a/keyboards/momokai/tap_trio/config.h
+++ b/keyboards/momokai/tap_trio/config.h
@@ -58,7 +58,7 @@
 
 
 // #ifdef RGB_DI_PIN
-// #define DRIVER_LED_TOTAL 5
+// #define RGB_MATRIX_LED_COUNT 5
 
 // #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // // #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index 4117f243ac..cdd5574b23 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -27,7 +27,7 @@
 #define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 }
 #define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D7
-#define DRIVER_LED_TOTAL 110
+#define RGB_MATRIX_LED_COUNT 110
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100 // limits maximum brightness of LEDs to 100 out of 255.
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index 8b3af96024..bd8b4923c6 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -37,7 +37,7 @@
 
 #define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D7
-#define DRIVER_LED_TOTAL 21
+#define RGB_MATRIX_LED_COUNT 21
 #define DRIVER_COUNT 2
 #define RGBLED_NUM 21
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
index b0ff86ee81..7db3a184fa 100644
--- a/keyboards/moonlander/config.h
+++ b/keyboards/moonlander/config.h
@@ -75,7 +75,7 @@
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #define RGB_MATRIX_CENTER { 125, 26 }
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 927c88925e..0844f16661 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -174,7 +174,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
 
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
index a7220ab1c6..792cdcc6b3 100644
--- a/keyboards/mss_studio/m63_rgb/config.h
+++ b/keyboards/mss_studio/m63_rgb/config.h
@@ -37,7 +37,7 @@
 #define FORCE_NKRO
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 75
+    #define RGB_MATRIX_LED_COUNT 75
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h
index c9a1e3f3db..90b5ae5130 100644
--- a/keyboards/mss_studio/m64_rgb/config.h
+++ b/keyboards/mss_studio/m64_rgb/config.h
@@ -37,7 +37,7 @@
 #define FORCE_NKRO
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 76
+    #define RGB_MATRIX_LED_COUNT 76
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index 8124a6a4a1..86035dc6a3 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -47,7 +47,7 @@
 #define DRIVER_ADDR_1 0b1010000
 
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 
 
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/mt/mt64rgb/mt64rgb.c b/keyboards/mt/mt64rgb/mt64rgb.c
index f0c444e8fa..c87e0d3610 100644
--- a/keyboards/mt/mt64rgb/mt64rgb.c
+++ b/keyboards/mt/mt64rgb/mt64rgb.c
@@ -16,7 +16,7 @@
 #include "mt64rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
  /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index ac510f1967..04c14a27bb 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -52,7 +52,7 @@
     #define DRIVER_COUNT 2
 	#define DRIVER_1_LED_TOTAL 44
 	#define DRIVER_2_LED_TOTAL 40
-	#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+	#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
  // RGB Matrix Animation modes. Explicitly enabled
  // For full list of effects, see:
diff --git a/keyboards/mt/mt84/mt84.c b/keyboards/mt/mt84/mt84.c
index e15a1ff951..049878419f 100644
--- a/keyboards/mt/mt84/mt84.c
+++ b/keyboards/mt/mt84/mt84.c
@@ -16,7 +16,7 @@
 #include "mt84.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
  /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h
index 2fd67e9e79..1da7c25390 100644
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ b/keyboards/mwstudio/mw65_rgb/config.h
@@ -43,7 +43,7 @@
 #define RGB_DI_PIN B3
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 83
+    #define RGB_MATRIX_LED_COUNT 83
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c
index 49e4a242fb..0d7acd7e8b 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c
@@ -70,5 +70,5 @@ static bool CUSTOM_GRADIENT(effect_params_t* params) {
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
index 56b204e0a9..986cbfeb9d 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
@@ -41,5 +41,5 @@ bool effect_rainbow_reactive(effect_params_t* params, rainbow_reactive_f effect_
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c
index 041417477b..29c447c61a 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-static uint8_t offset[DRIVER_LED_TOTAL];
+static uint8_t offset[RGB_MATRIX_LED_COUNT];
 
 static void doRandom_breath_rainbow(int i, effect_params_t* params) {
     if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
@@ -41,7 +41,7 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
     
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
-        doRandom_breath_rainbow(rand() % DRIVER_LED_TOTAL, params);
+        doRandom_breath_rainbow(rand() % RGB_MATRIX_LED_COUNT, params);
         return false;
     }
 	
@@ -51,5 +51,5 @@ bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
         doRandom_breath_rainbow(i, params);
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index 2c9e3839b8..b5a8f15804 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -40,7 +40,7 @@
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define DRIVER_LED_TOTAL 97
+#define RGB_MATRIX_LED_COUNT 97
 #define RGBLED_NUM 97
 #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index 0886a9effb..1fd6a345d1 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -40,7 +40,7 @@
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define DRIVER_LED_TOTAL 21
+#define RGB_MATRIX_LED_COUNT 21
 #define RGBLED_NUM 21
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index 798d4ee12d..d5e2d8a58e 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define WS2812_SPI_MOSI_PAL_MODE 5
     #define RGB_DI_PIN B5
     #define RGBLED_NUM 52
-    #define DRIVER_LED_TOTAL RGBLED_NUM
+    #define RGB_MATRIX_LED_COUNT RGBLED_NUM
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
     #define RGB_MATRIX_STARTUP_VAL 64
     #define RGB_MATRIX_HUE_STEP 10
diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c
index 6b3be48044..89c5e84efd 100644
--- a/keyboards/neson_design/700e/700e.c
+++ b/keyboards/neson_design/700e/700e.c
@@ -111,7 +111,7 @@ static void self_testing(void)
             }
 
             if (rgb_state.index >= ST_LEFT_END) {
-                for (int i = rgb_state.index - 1; i < DRIVER_LED_TOTAL - rgb_state.index + 1; i++) {
+                for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
                     IS31FL3731_set_color(i, led.r, led.g, led.b);
                 }
                 if (rgb_state.index == ST_LEFT_END) {
@@ -173,13 +173,13 @@ static void self_testing(void)
         }
         break;
         case ST_STAGE_3:
-            if (rgb_state.index != DRIVER_LED_TOTAL/2) {
+            if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
                 IS31FL3731_set_color_all(0, 0, 0);
             }
 
             // light left and right
 
-            if (rgb_state.index == DRIVER_LED_TOTAL/2) {
+            if (rgb_state.index == RGB_MATRIX_LED_COUNT/2) {
                 if (rgb_state.duration) {
                     rgb_state.duration--;
                 } else {
@@ -207,7 +207,7 @@ static void self_testing(void)
     update_ticks();
 }
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
@@ -299,7 +299,7 @@ void matrix_init_kb(void)
 #ifdef DRIVER_ADDR_2
     IS31FL3731_init(DRIVER_ADDR_2);
 #endif
-    for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+    for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         IS31FL3731_set_led_control_register(index, true, true, true);
     }
     IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
@@ -353,16 +353,16 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
 {
     if (rgb_state.state != NORMAL) return;
 
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
     }
     LED_TYPE leds[4];
     for (int i = 0; i < 4; i++) {
-        leds[i].r = start_led[DRIVER_LED_TOTAL+i].g;
-        leds[i].g = start_led[DRIVER_LED_TOTAL+i].r;
-        leds[i].b = start_led[DRIVER_LED_TOTAL+i].b;
+        leds[i].r = start_led[RGB_MATRIX_LED_COUNT+i].g;
+        leds[i].g = start_led[RGB_MATRIX_LED_COUNT+i].r;
+        leds[i].b = start_led[RGB_MATRIX_LED_COUNT+i].b;
     }
-    //ws2812_setleds(start_led+DRIVER_LED_TOTAL, 4);
+    //ws2812_setleds(start_led+RGB_MATRIX_LED_COUNT, 4);
     ws2812_setleds(leds, 4);
 }
 
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 83cc780d80..d5a35e21ef 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -47,7 +47,7 @@
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
 
 #define LED_CAPS_LOCK_PIN   F5
 
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 7d27825eaf..e06f9c8086 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -47,7 +47,7 @@
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
 
 #define LED_CAPS_LOCK_PIN   F5
 
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index 4d5927cae1..a606e93c8f 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -115,7 +115,7 @@ static void self_testing(void)
             }
 
             if (rgb_state.index >= ST_LEFT_END) {
-                for (int i = rgb_state.index - 1; i < DRIVER_LED_TOTAL - rgb_state.index + 1; i++) {
+                for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
                     IS31FL3731_set_color(i, led.r, led.g, led.b);
                 }
                 if (rgb_state.index == ST_LEFT_END) {
@@ -177,13 +177,13 @@ static void self_testing(void)
         }
         break;
         case ST_STAGE_3:
-            if (rgb_state.index != DRIVER_LED_TOTAL/2) {
+            if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
                 IS31FL3731_set_color_all(0, 0, 0);
             }
 
             // light left and right
 
-            if (rgb_state.index == DRIVER_LED_TOTAL/2) {
+            if (rgb_state.index == RGB_MATRIX_LED_COUNT/2) {
                 if (rgb_state.duration) {
                     rgb_state.duration--;
                 } else {
@@ -211,7 +211,7 @@ static void self_testing(void)
     update_ticks();
 }
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
@@ -303,7 +303,7 @@ void matrix_init_kb(void)
 #ifdef DRIVER_ADDR_2
     IS31FL3731_init(DRIVER_ADDR_2);
 #endif
-    for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+    for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         IS31FL3731_set_led_control_register(index, true, true, true);
     }
     IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
@@ -355,10 +355,10 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
 {
     if (rgb_state.state != NORMAL) return;
 
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
     }
-    ws2812_setleds(start_led+DRIVER_LED_TOTAL, 1);
+    ws2812_setleds(start_led+RGB_MATRIX_LED_COUNT, 1);
 }
 
 bool led_update_kb(led_t led_state)
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index 7b56d50c6f..f5a75dd14f 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -75,7 +75,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 3
 
 #define RGBLED_NUM 20
-#define DRIVER_LED_TOTAL 20
+#define RGB_MATRIX_LED_COUNT 20
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 210
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/novelkeys/nk65/config.h b/keyboards/novelkeys/nk65/config.h
index df64bbe83e..9640704b48 100755
--- a/keyboards/novelkeys/nk65/config.h
+++ b/keyboards/novelkeys/nk65/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 128
+#define RGB_MATRIX_LED_COUNT 128
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index 45603267a1..0976b42543 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -79,7 +79,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 3
 
 #define RGBLED_NUM 68
-#define DRIVER_LED_TOTAL 68
+#define RGB_MATRIX_LED_COUNT 68
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/novelkeys/nk87/config.h b/keyboards/novelkeys/nk87/config.h
index e5b955c3f8..0320f35d84 100755
--- a/keyboards/novelkeys/nk87/config.h
+++ b/keyboards/novelkeys/nk87/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 128
+#define RGB_MATRIX_LED_COUNT 128
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index 32bbb5e69e..7830b398b1 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -79,7 +79,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 3
 
 #define RGBLED_NUM 87
-#define DRIVER_LED_TOTAL 87
+#define RGB_MATRIX_LED_COUNT 87
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 114
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index 6348f10eb1..29c4c32015 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
@@ -61,7 +61,7 @@
 #define RGBLIGHT_LIMIT_VAL 100
 #endif
 #ifdef RGB_MATRIX_ENABLE
-#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_LED_COUNT 70
 #define RGB_MATRIX_SPLIT { 30, 40 }    // Number of LEDs
 #endif
 
diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h
index 6a87ad86b4..87b153c736 100644
--- a/keyboards/opendeck/32/rev1/config.h
+++ b/keyboards/opendeck/32/rev1/config.h
@@ -29,7 +29,7 @@
 // RGB matrix
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL (4 * 8 * 3)
+#define RGB_MATRIX_LED_COUNT (4 * 8 * 3)
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_SPIRAL
 #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/opendeck/32/rev1/rev1.c b/keyboards/opendeck/32/rev1/rev1.c
index 332dc3cc40..be50d91944 100644
--- a/keyboards/opendeck/32/rev1/rev1.c
+++ b/keyboards/opendeck/32/rev1/rev1.c
@@ -17,7 +17,7 @@
 #include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 507b1f75e2..6b8bf0b3ac 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -71,7 +71,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_STARTUP_VAL        128
 #    define DRIVER_ADDR_1                 0b0110000
 #    define DRIVER_COUNT                  1
-#    define DRIVER_LED_TOTAL              67
+#    define RGB_MATRIX_LED_COUNT              67
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
index ca5ce7bb8b..ed40d33532 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.c
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -17,7 +17,7 @@
 #include "hotswap.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS3_SW1,  CS2_SW1,  CS1_SW1},  /* RGB0-ESC ROW0*/
     {0, CS6_SW1,  CS5_SW1,  CS4_SW1},  /* RGB1-1 */
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB2-2 */
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 74ab2db520..1bf9702a3e 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -70,7 +70,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_STARTUP_VAL        128
 #    define DRIVER_ADDR_1                 0b0110000
 #    define DRIVER_COUNT                  1
-#    define DRIVER_LED_TOTAL              71
+#    define RGB_MATRIX_LED_COUNT              71
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
index bbd2daf293..cea25b093e 100644
--- a/keyboards/owlab/voice65/soldered/soldered.c
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -17,7 +17,7 @@
 #include "soldered.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS3_SW1,  CS2_SW1,  CS1_SW1},  /* RGB0-ESC ROW0*/
     {0, CS6_SW1,  CS5_SW1,  CS4_SW1},  /* RGB1-1 */
     {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB2-2 */
diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h
index 862f82ea54..0835c606fa 100644
--- a/keyboards/paprikman/albacore/config.h
+++ b/keyboards/paprikman/albacore/config.h
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B3
 
 #ifdef RGB_MATRIX_ENABLE
-  #define DRIVER_LED_TOTAL 8
+  #define RGB_MATRIX_LED_COUNT 8
   #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index 1f05360aae..aec0cdfe5e 100644
--- a/keyboards/percent/canoe_gen2/config.h
+++ b/keyboards/percent/canoe_gen2/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Backlight configuration
  */
 #define RGB_DI_PIN B7
-#define DRIVER_LED_TOTAL 77
+#define RGB_MATRIX_LED_COUNT 77
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/keyboards/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/hotswap/config.h
index 9b942b20d3..06c3256501 100644
--- a/keyboards/phase_studio/titan65/hotswap/config.h
+++ b/keyboards/phase_studio/titan65/hotswap/config.h
@@ -38,7 +38,7 @@
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN E6
-#define DRIVER_LED_TOTAL 67
+#define RGB_MATRIX_LED_COUNT 67
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index c9ed9e59ba..1840e087cf 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -109,7 +109,7 @@
 #define DRIVER_ADDR_1 0b1010000
 
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 47
+#define RGB_MATRIX_LED_COUNT 47
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 25dfe9adfb..77ae20ba5a 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -21,7 +21,7 @@
 
 keyboard_config_t keyboard_config;
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index f6229d2d69..d3d2f82420 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -71,7 +71,7 @@ void keyboard_post_init_user(void) {
   rgb_matrix_enable();
 }
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
     [0] = { {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255}, {0,255,255} },
 
     [1] = { {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255}, {193,255,255} },
@@ -83,7 +83,7 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
 };
 
 void set_layer_color(int layer) {
-  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+  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]),
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 9e451a010a..436deadee4 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
     [0] = {{42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {32, 255, 234}, {32, 255, 234}, {32, 255, 234}, {32, 255, 234}},
 
     [1] = {{89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}},
@@ -74,7 +74,7 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
 };
 
 void set_layer_color(int layer) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    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]),
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
index 89175e0115..6d101f3a3f 100644
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ b/keyboards/planck/keymaps/tom/keymap.c
@@ -230,7 +230,7 @@ void rgb_matrix_indicators_user(void) {
   #ifdef RGB_MATRIX_ENABLE
   switch (get_highest_layer(layer_state)) {
     case _RAISE:
-      for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+      for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
           rgb_matrix_set_color(i, 0x6B, 0x00, 0x80);
         } else {
@@ -240,7 +240,7 @@ void rgb_matrix_indicators_user(void) {
       break;
 
     case _LOWER:
-      for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+      for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
           rgb_matrix_set_color(i, 0xFF, 0xA5, 0x00);
         } else {
@@ -250,7 +250,7 @@ void rgb_matrix_indicators_user(void) {
       break;
 
     case _ADJUST:
-      for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+      for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         rgb_matrix_set_color(i, 0xFF, 0x99, 0x00);
       }
       rgb_matrix_set_color(1, 0xFF, 0x00, 0x00);
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index e6d174fbce..e00fb2567d 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -130,7 +130,7 @@ void keyboard_post_init_user(void) {
   rgb_matrix_enable();
 }
 
-const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
     [0] = { {32,255,234}, {32,255,234}, {12,225,241}, {12,225,241}, {0,204,255}, {0,204,255}, {169,120,255}, {169,120,255}, {169,120,255}, {146,224,255}, {146,224,255}, {146,224,255},
             {32,255,234}, {32,255,234}, {12,225,241}, {12,225,241}, {0,204,255}, {0,204,255}, {169,120,255}, {169,120,255}, {169,120,255}, {146,224,255}, {146,224,255}, {146,224,255},
             {32,255,234}, {32,255,234}, {12,225,241}, {12,225,241}, {0,204,255}, {0,204,255}, {169,120,255}, {169,120,255}, {169,120,255}, {146,224,255}, {146,224,255}, {146,224,255},
@@ -151,7 +151,7 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
 };
 
 void set_layer_color(int layer) {
-  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+  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]),
diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h
index 67b42e8c08..d0e30bde02 100644
--- a/keyboards/planck/light/config.h
+++ b/keyboards/planck/light/config.h
@@ -34,7 +34,7 @@
 #define DRIVER_COUNT       2
 #define DRIVER_1_LED_TOTAL 25
 #define DRIVER_2_LED_TOTAL 24
-#define DRIVER_LED_TOTAL   (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT   (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
index 5a7c656f1a..c2c241fab4 100644
--- a/keyboards/planck/light/light.c
+++ b/keyboards/planck/light/light.c
@@ -16,7 +16,7 @@
 
 #include "light.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 3879cb7690..5925feb8d9 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -103,7 +103,7 @@
  */
 #define RGB_DI_PIN A1
 #define RGBLED_NUM 9
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index 3cbee54de5..35b3a55c1f 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -108,7 +108,7 @@
  */
 #define RGB_DI_PIN A1
 #define RGBLED_NUM 9
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 2ec5f15a39..c6f03af638 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -47,7 +47,7 @@
 	#define RGB_MATRIX_LED_FLUSH_LIMIT 26
 	#define DRIVER_ADDR_1 0b1010000
     #define DRIVER_COUNT 1
-	#define DRIVER_LED_TOTAL 64
+	#define RGB_MATRIX_LED_COUNT 64
 
 
 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
diff --git a/keyboards/playkbtw/pk64rgb/pk64rgb.c b/keyboards/playkbtw/pk64rgb/pk64rgb.c
index bc1f63a5ba..e2db8056ee 100644
--- a/keyboards/playkbtw/pk64rgb/pk64rgb.c
+++ b/keyboards/playkbtw/pk64rgb/pk64rgb.c
@@ -17,7 +17,7 @@
 #include "pk64rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
  /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index e958aebd30..f4dfa80a7e 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -66,7 +66,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
-//    #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+//    #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 //    #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 //    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 225 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 //    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 5590ba0252..1c5dfe2e68 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -92,7 +92,7 @@
 #define RGBLED_NUM 9
 #define RGBLIGHT_ANIMATIONS
 // RGB Matrix support
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 5590ba0252..1c5dfe2e68 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -92,7 +92,7 @@
 #define RGBLED_NUM 9
 #define RGBLIGHT_ANIMATIONS
 // RGB Matrix support
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index b762783d7e..a1ad4fc021 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -46,5 +46,5 @@
 #define RGB_DI_PIN F0
 #define RGBLED_NUM 4
 
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_DEFAULT_HUE 130
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 0c39127af5..cd92c3893d 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -71,7 +71,7 @@
 #define RGBLED_SPLIT { 49, 49 }
 #define RGBLIGHT_ANIMATIONS
 
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #define RGB_MATRIX_CENTER { 128, 34 }
 #define RGB_MATRIX_LED_FLUSH_LIMIT 33
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 5b6ca7e876..35699147db 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODER_RESOLUTION 4
 #define RGBLED_NUM 64
 #define RGBLIGHT_ANIMATIONS
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index 6a17456390..f0194ebdfd 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -22,13 +22,13 @@
 #        include "ws2812.h"
 
 // LED color buffer
-LED_TYPE rgb_matrix_ws2812_array[DRIVER_LED_TOTAL];
+LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
 
 static void init(void) {}
 
 static void flush(void) {
     // Assumes use of RGB_DI_PIN
-    ws2812_setleds(rgb_matrix_ws2812_array, DRIVER_LED_TOTAL);
+    ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
 }
 
 // Set an led in the buffer to a color
diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h
index 3e08848f6b..48f341583d 100644
--- a/keyboards/rgbkb/sol/rev1/config.h
+++ b/keyboards/rgbkb/sol/rev1/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #else
   #define RGBLED_NUM 70
 #endif
-#define DRIVER_LED_TOTAL  RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT  RGBLED_NUM
 
 #define RGB_MATRIX_CENTER { 112, 35 }
 
diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h
index cdaf9c0536..874ec536b1 100644
--- a/keyboards/rgbkb/sol/rev2/config.h
+++ b/keyboards/rgbkb/sol/rev2/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #endif
 #endif
 
-#define DRIVER_LED_TOTAL  RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT  RGBLED_NUM
 
 #define RGB_MATRIX_CENTER { 112, 37 }
 
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 20435a159a..9689f65356 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -96,7 +96,7 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #define RGB_MATRIX_CENTER { 81, 28 }
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 3835a3e705..4c5801f4cf 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLED_SPLIT { 30, 30 }
 #endif
 
-#define DRIVER_LED_TOTAL 60
+#define RGB_MATRIX_LED_COUNT 60
 #define RGB_MATRIX_SPLIT { 30, 30 }
 
 #ifdef IOS_DEVICE_ENABLE
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index 187834f7e3..e80efaef64 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -31,7 +31,7 @@
 /* RGB Data Pin */
 #define RGB_DI_PIN C7
 /* The number of RGB LEDs connected */
-#define DRIVER_LED_TOTAL 118
+#define RGB_MATRIX_LED_COUNT 118
 /* Set the maximum brightness to 110 to avoid going over 500 mA.
  * At full brightness with all three indicator LEDs on, the power draw is about 450 mA. */
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 110
diff --git a/keyboards/s_ol/0xc_pad/config.h b/keyboards/s_ol/0xc_pad/config.h
index 4260c7a07d..7a6d897e47 100644
--- a/keyboards/s_ol/0xc_pad/config.h
+++ b/keyboards/s_ol/0xc_pad/config.h
@@ -19,7 +19,7 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN C7
-#define DRIVER_LED_TOTAL 12
+#define RGB_MATRIX_LED_COUNT 12
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_CENTER \
     { 112, 63 }
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
index 71a43e208c..026e8d9097 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
@@ -25,14 +25,14 @@
   #undef RGBLED_NUM
 #endif
 
-#define DRIVER_LED_TOTAL 48
+#define RGB_MATRIX_LED_COUNT 48
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 // #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
index 7eabf9e831..129e9a5548 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
@@ -25,7 +25,7 @@
   #undef RGBLED_NUM
 #endif
 
-#define DRIVER_LED_TOTAL 48
+#define RGB_MATRIX_LED_COUNT 48
 
 #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
@@ -34,7 +34,7 @@
 //  #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
 //  #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-  #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+  #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 //  #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
index 06e23ba7a3..0fa44eb3ce 100644
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
+++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
@@ -21,14 +21,14 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
 
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 // #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index 077b18d0d8..f1b06ace22 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -59,7 +59,7 @@
 //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 
-#define DRIVER_LED_TOTAL 6
+#define RGB_MATRIX_LED_COUNT 6
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index ea48db4e15..d02cf04421 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/config.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB matrix lighting */ 
 #define RGB_DI_PIN B1
-#define DRIVER_LED_TOTAL 62
+#define RGB_MATRIX_LED_COUNT 62
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160   // limit brightness to not overamp the USB
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index e24468054e..a988171755 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -86,7 +86,7 @@
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_KEYPRESSES
 #endif
 
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 28339ff431..5e011267f1 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_SPLIT {26, 26}
   #define RGBLED_NUM 52
   #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 52
+    #define RGB_MATRIX_LED_COUNT 52
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
     #define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/skmt/15k/config.h b/keyboards/skmt/15k/config.h
index 6144e332ea..e1f021159e 100644
--- a/keyboards/skmt/15k/config.h
+++ b/keyboards/skmt/15k/config.h
@@ -23,7 +23,7 @@
 
 #define RGB_DI_PIN GP1 // RGB LED pin
 #define RGBLED_NUM 15 // Number of LEDs
-#define DRIVER_LED_TOTAL 15 // Number of LEDs
+#define RGB_MATRIX_LED_COUNT 15 // Number of LEDs
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 20a9f2d88a..7163947920 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -102,7 +102,7 @@
 #define DRIVER_ADDR_1 0b1110100
 
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 6
+#define RGB_MATRIX_LED_COUNT 6
 #endif
 //#define RGB_DI_PIN B7
 //#ifdef RGB_DI_PIN
diff --git a/keyboards/smallkeyboard/smallkeyboard.c b/keyboards/smallkeyboard/smallkeyboard.c
index af38cb6121..40cf3fc71a 100644
--- a/keyboards/smallkeyboard/smallkeyboard.c
+++ b/keyboards/smallkeyboard/smallkeyboard.c
@@ -17,7 +17,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h
index c34da8382b..cb5ff7210a 100644
--- a/keyboards/sofle/keymaps/devdev/config.h
+++ b/keyboards/sofle/keymaps/devdev/config.h
@@ -51,7 +51,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #define RGBLED_NUM 35    // Number of LEDs
 #define RGBLED_NUM 35    // Number of LEDs
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #endif
 
 #ifdef RGBLIGHT_ENABLE
@@ -86,7 +86,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 
diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h
index 9d1de12d5a..db44250c17 100644
--- a/keyboards/sofle/keymaps/killmaster/config.h
+++ b/keyboards/sofle/keymaps/killmaster/config.h
@@ -25,7 +25,7 @@ for more options.
 #ifdef RGB_MATRIX_ENABLE
 
 #define RGBLED_NUM 72
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #define RGB_MATRIX_HUE_STEP 8
 #define RGB_MATRIX_SAT_STEP 8
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index c34da8382b..cb5ff7210a 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -51,7 +51,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #define RGBLED_NUM 35    // Number of LEDs
 #define RGBLED_NUM 35    // Number of LEDs
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #endif
 
 #ifdef RGBLIGHT_ENABLE
@@ -86,7 +86,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 
diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h
index 77ce4f2590..0fb2cbf36d 100644
--- a/keyboards/sofle/keymaps/via/config.h
+++ b/keyboards/sofle/keymaps/via/config.h
@@ -29,7 +29,7 @@ for more options.
 #    define RGBLED_SPLIT \
         { 36, 36 }
 #    ifdef RGB_MATRIX_ENABLE
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #        define SPLIT_TRANSPORT_MIRROR
 #    else
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 44d75e670a..48b13e6a28 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -40,7 +40,7 @@
 // #define BACKLIGHT_PIN rgb_matrix
 #define RGB_MATRIX_KEYPRESSES
 #define RGBLED_NUM 68
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index e4752f9425..f34d4434ff 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -36,7 +36,7 @@
 #define RGB_DI_PIN B9
 #define RGB_MATRIX_KEYPRESSES
 #define RGBLED_NUM 87
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
 
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 97623f0ff0..07b2e9fc6c 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -144,7 +144,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT 16
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h
index ac3826b253..b4e319b603 100755
--- a/keyboards/spaceholdings/nebula12b/config.h
+++ b/keyboards/spaceholdings/nebula12b/config.h
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB options */
 
 #define RGB_DI_PIN D5
-#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT 16
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index a8a9803d15..0d2db2c824 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -128,7 +128,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
 
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 128
+#define RGB_MATRIX_LED_COUNT 128
 
 // These define which keys in the matrix are alphas/mods
 // Used for backlight effects so colors are different for
diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
index 4e22e69e10..b95adb0508 100755
--- a/keyboards/spaceholdings/nebula68b/config.h
+++ b/keyboards/spaceholdings/nebula68b/config.h
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB options */
 
 #define RGB_DI_PIN B7
-#define DRIVER_LED_TOTAL 79
+#define RGB_MATRIX_LED_COUNT 79
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/spaceholdings/nebula68b/hs/config.h b/keyboards/spaceholdings/nebula68b/hs/config.h
index ac25a8ef1d..b66344facc 100755
--- a/keyboards/spaceholdings/nebula68b/hs/config.h
+++ b/keyboards/spaceholdings/nebula68b/hs/config.h
@@ -15,5 +15,5 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#undef DRIVER_LED_TOTAL
-#define DRIVER_LED_TOTAL 78
+#undef RGB_MATRIX_LED_COUNT
+#define RGB_MATRIX_LED_COUNT 78
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index f6f9a98c3e..7bc756c042 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -82,7 +82,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB matrix support */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM // Number of LEDs
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
 #    define RGB_MATRIX_SPLIT { 10, 10 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 6af99e0a7c..1733eddf9a 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -92,7 +92,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB matrix support */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM // Number of LEDs
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
 #    define RGB_MATRIX_SPLIT { 10, 10 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/synapse/config.h b/keyboards/synapse/config.h
index b4311c1402..c52ae2edc8 100644
--- a/keyboards/synapse/config.h
+++ b/keyboards/synapse/config.h
@@ -46,5 +46,5 @@
 //#define RGB_DI_PIN D5
 //#define RGBLED_NUM 4
 
-//#define DRIVER_LED_TOTAL RGBLED_NUM
+//#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 //#define RGBLIGHT_DEFAULT_HUE 130
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 50a6e6f9d7..6f257e9118 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -43,7 +43,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DI_PIN E2
-#    define DRIVER_LED_TOTAL 84
+#    define RGB_MATRIX_LED_COUNT 84
 #    define RGB_MATRIX_KEYPRESSES                                      // Reacts to keypresses
 // #    define RGB_MATRIX_KEYRELEASES                                     // Reacts to keyreleases (instead of keypresses)
 // #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS                             // Enables framebuffer effects
diff --git a/keyboards/system76/launch_1/rgb_matrix_kb.inc b/keyboards/system76/launch_1/rgb_matrix_kb.inc
index 484483e0a1..02de10ed50 100644
--- a/keyboards/system76/launch_1/rgb_matrix_kb.inc
+++ b/keyboards/system76/launch_1/rgb_matrix_kb.inc
@@ -24,13 +24,13 @@ RGB_MATRIX_EFFECT(unlocked)
 #include "dynamic_keymap.h"
 
 static bool active_keys_initialized = false;
-static uint8_t active_keys_table[DRIVER_LED_TOTAL] = {0};
+static uint8_t active_keys_table[RGB_MATRIX_LED_COUNT] = {0};
 
 static void active_keys_initialize(void) {
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
         for (uint8_t col = 0; col < MATRIX_COLS; col++) {
             uint8_t led = g_led_config.matrix_co[row][col];
-            if (led < DRIVER_LED_TOTAL && row < 16 && col < 16) {
+            if (led < RGB_MATRIX_LED_COUNT && row < 16 && col < 16) {
                 active_keys_table[led] = (row << 4) | col;
             }
         }
@@ -65,10 +65,10 @@ static bool active_keys(effect_params_t* params) {
         }
     }
 
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
-RGB raw_rgb_data[DRIVER_LED_TOTAL] = {0};
+RGB raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0};
 
 static uint8_t normalize_component(uint8_t component) {
     uint16_t x = (uint16_t)component;
@@ -94,7 +94,7 @@ static bool raw_rgb(effect_params_t* params) {
         RGB rgb = normalize_index(i);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 static uint8_t unlocked_keys[8][2] = {
@@ -151,7 +151,7 @@ static bool unlocked(effect_params_t* params) {
         RGB rgb = hsv_to_rgb(hsv);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 #endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/system76/system76_ec.c b/keyboards/system76/system76_ec.c
index f6c8af82fe..5474181eca 100644
--- a/keyboards/system76/system76_ec.c
+++ b/keyboards/system76/system76_ec.c
@@ -129,7 +129,7 @@ static enum rgb_matrix_effects mode_map[] = {
 
 _Static_assert(sizeof(mode_map) == MODE_LAST, "mode_map_length");
 
-RGB raw_rgb_data[DRIVER_LED_TOTAL];
+RGB raw_rgb_data[RGB_MATRIX_LED_COUNT];
 
 // clang-format off
 rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {
@@ -294,7 +294,7 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
         case CMD_LED_GET_COLOR:
             if (!bootloader_unlocked) {
                 uint8_t index = data[2];
-                if (index < DRIVER_LED_TOTAL) {
+                if (index < RGB_MATRIX_LED_COUNT) {
                     data[3] = raw_rgb_data[index].r;
                     data[4] = raw_rgb_data[index].g;
                     data[5] = raw_rgb_data[index].b;
@@ -322,7 +322,7 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
                     .b = data[5],
                 };
 
-                if (index < DRIVER_LED_TOTAL) {
+                if (index < RGB_MATRIX_LED_COUNT) {
                     raw_rgb_data[index] = rgb;
                     data[1] = 0;
                 } else {
diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h
index ec4ded7eb9..1d7224a09b 100644
--- a/keyboards/terrazzo/config.h
+++ b/keyboards/terrazzo/config.h
@@ -76,7 +76,7 @@ so there is only one configuration. */
 
 #define LED_DRIVER_ADDR_1 0x74
 #define LED_DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 105
+#define LED_MATRIX_LED_COUNT 105
 #define LED_MATRIX_ROWS 15
 #define LED_MATRIX_COLS 7
 #define LED_MATRIX_MAXIMUM_BRIGHTNESS 20
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index 731efec20c..35452acf4a 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -21,7 +21,7 @@
     #include "print.h"
     #include "quantum.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  * https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf
  */
@@ -90,7 +90,7 @@ uint8_t terrazzo_effect = 1;
 
 void terrazzo_set_pixel(uint8_t x, uint8_t y, uint8_t value) {
     uint8_t target = y * LED_MATRIX_COLS + x;
-    if (target < DRIVER_LED_TOTAL && target >= 0) {
+    if (target < LED_MATRIX_LED_COUNT && target >= 0) {
       led_matrix_set_value(y * LED_MATRIX_COLS + x, value);
     }
 }
@@ -117,10 +117,10 @@ void terrazzo_scroll_pixel(bool clockwise) {
         terrazzo_led_index = terrazzo_led_index - 1;
     } 
     
-    if (terrazzo_led_index >= DRIVER_LED_TOTAL) {
+    if (terrazzo_led_index >= LED_MATRIX_LED_COUNT) {
         terrazzo_led_index = 0;
     } else if (terrazzo_led_index <= 0 ) {
-        terrazzo_led_index = DRIVER_LED_TOTAL - 1;
+        terrazzo_led_index = LED_MATRIX_LED_COUNT - 1;
     }
 }
 
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index 0a52f2e3af..38919aa55c 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -58,12 +58,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 31
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #else
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 67
+#define RGB_MATRIX_LED_COUNT 67
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/tkc/portico/portico.c b/keyboards/tkc/portico/portico.c
index 0e2b4b2499..47dfe88231 100644
--- a/keyboards/tkc/portico/portico.c
+++ b/keyboards/tkc/portico/portico.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, C2_1,  C3_1,  C4_1  },
     { 0, C1_1,  C3_2,  C4_2  },
     { 0, C1_2,  C2_2,  C4_3  },
diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
index 5cfdf43c3d..4b6d5a2ef6 100644
--- a/keyboards/tkc/portico68v2/config.h
+++ b/keyboards/tkc/portico68v2/config.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 82
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #define DRIVER_INDICATOR_LED_TOTAL 0
 #define RGB_MATRIX_CENTER { 116, 32 }
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
index 8e98034ca5..6022d5674f 100644
--- a/keyboards/tkc/portico68v2/portico68v2.c
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "portico68v2.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB1 */
     {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB2 */
     {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB3 */
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index 63a9ee4958..fe00c26b6a 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -100,12 +100,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define DRIVER_ADDR_1 0b0110000
 #    define DRIVER_COUNT 1
 #    define DRIVER_1_LED_TOTAL 98
-#    define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#    define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #    define DRIVER_INDICATOR_LED_TOTAL 0
 #else
 // WT_RGB IS31FL3741 driver code
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 98
+#    define RGB_MATRIX_LED_COUNT 98
 
 #    define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
index 812345b384..30fafa2dfc 100644
--- a/keyboards/tkc/portico75/portico75.c
+++ b/keyboards/tkc/portico75/portico75.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS18_SW1, CS17_SW1, CS16_SW1},
     {0, CS18_SW2, CS17_SW2, CS16_SW2},
     {0, CS18_SW3, CS17_SW3, CS16_SW3},
diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h
index e5715bdbce..f6fed063c5 100644
--- a/keyboards/tominabox1/le_chiffre/config.h
+++ b/keyboards/tominabox1/le_chiffre/config.h
@@ -39,7 +39,7 @@
 
 #define RGBLED_NUM 11
 
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGBLIGHT_ANIMATIONS
 
diff --git a/keyboards/tzarc/djinn/rev1/config.h b/keyboards/tzarc/djinn/rev1/config.h
index 14cdaf2fdb..6f001cbd0c 100644
--- a/keyboards/tzarc/djinn/rev1/config.h
+++ b/keyboards/tzarc/djinn/rev1/config.h
@@ -21,7 +21,7 @@
 
 // RGB configuration
 #define RGBLED_NUM 84
-#define DRIVER_LED_TOTAL 84
+#define RGB_MATRIX_LED_COUNT 84
 #define RGB_MATRIX_SPLIT \
     { 42, 42 }
 #define RGB_POWER_ENABLE_PIN B1
diff --git a/keyboards/tzarc/djinn/rev2/config.h b/keyboards/tzarc/djinn/rev2/config.h
index 52c909d442..b0deb6d991 100644
--- a/keyboards/tzarc/djinn/rev2/config.h
+++ b/keyboards/tzarc/djinn/rev2/config.h
@@ -23,7 +23,7 @@
 
 // RGB configuration
 #define RGBLED_NUM 86
-#define DRIVER_LED_TOTAL 86
+#define RGB_MATRIX_LED_COUNT 86
 #define RGB_MATRIX_SPLIT \
     { 43, 43 }
 #define RGB_POWER_ENABLE_PIN B0
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index d641bab9cd..54ef84a71e 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -45,13 +45,13 @@
 #define RGB_DI_PIN F7
 #ifdef RGB_MATRIX_ENABLE
 #    define RGBLED_NUM 22
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 // #    define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #    define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #    define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index a02bc1661a..67428d5dec 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN C6
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 27
+#define RGB_MATRIX_LED_COUNT 27
 
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h
index 3ce58330ed..7c9489e922 100644
--- a/keyboards/wilba_tech/rama_works_kara/config.h
+++ b/keyboards/wilba_tech/rama_works_kara/config.h
@@ -27,7 +27,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h
index 8a02f0bd98..9b5048d11a 100644
--- a/keyboards/wilba_tech/rama_works_koyu/config.h
+++ b/keyboards/wilba_tech/rama_works_koyu/config.h
@@ -27,7 +27,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h
index d42c329b96..456023d414 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/config.h
@@ -47,7 +47,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 12
+#define RGB_MATRIX_LED_COUNT 12
 
 // Enable WT RGB backlight
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h
index fb6ffd8aba..6284a4027a 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_a/config.h
@@ -47,7 +47,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // Enable WT RGB backlight
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h
index 55fa484716..22abe6ee60 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/config.h
@@ -27,7 +27,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h
index c753a93841..1982b2e8e1 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_b/config.h
@@ -47,7 +47,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // Enable WT RGB backlight
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h
index f0eb52940c..83c2be2001 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h
@@ -47,7 +47,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // Enable WT RGB backlight
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h
index 44582ada4f..4653556190 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/config.h
+++ b/keyboards/wilba_tech/rama_works_u80_a/config.h
@@ -99,7 +99,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 3
-#define DRIVER_LED_TOTAL 108
+#define RGB_MATRIX_LED_COUNT 108
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h
index a68cfa5ec2..43a10844da 100644
--- a/keyboards/wilba_tech/wt60_b/config.h
+++ b/keyboards/wilba_tech/wt60_b/config.h
@@ -50,7 +50,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h
index cab8276545..d26b3a02ba 100644
--- a/keyboards/wilba_tech/wt60_bx/config.h
+++ b/keyboards/wilba_tech/wt60_bx/config.h
@@ -50,7 +50,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h
index 47636eef4b..489207d56c 100644
--- a/keyboards/wilba_tech/wt60_c/config.h
+++ b/keyboards/wilba_tech/wt60_c/config.h
@@ -50,7 +50,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index a696fe7ed4..e0a04ce32c 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -162,7 +162,7 @@ uint32_t g_any_key_hit = 0;
 // ADDR_2 is not needed. it is here as a dummy
 #define ISSI_ADDR_1 0x50
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -243,7 +243,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 #define ISSI_ADDR_1 0x50
 #define ISSI_ADDR_2 0x52
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -386,7 +386,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 // set to 0 for write, 1 for read (as per I2C protocol)
 #define ISSI_ADDR_1 0x74
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -418,7 +418,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 #define ISSI_ADDR_2 0x76  // 11101[10] <- SDA
 #define ISSI_ADDR_3 0x75  // 11101[01] <- SCL
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -545,7 +545,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 #define ISSI_ADDR_1 0x74
 #define ISSI_ADDR_2 0x76
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -626,7 +626,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 #define ISSI_ADDR_1 0x74
 #define ISSI_ADDR_2 0x77
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |   R location
@@ -712,7 +712,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 #define ISSI_ADDR_1 0x30
 #define ISSI_ADDR_2
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |   R location
@@ -842,7 +842,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 #define ISSI_ADDR_1 0x74
 #define ISSI_ADDR_2
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, C1_9,  C3_10, C4_10}, // LB1
     {0, C1_10, C2_10, C4_11}, // LB2
     {0, C1_11, C2_11, C3_11}, // LB3
@@ -862,7 +862,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 #define ISSI_ADDR_1 0x74
 #define ISSI_ADDR_2 0x76
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -1832,12 +1832,12 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
         IS31FL3733_set_color( index, red, green, blue );
     }
 #elif defined(RGB_BACKLIGHT_DAWN60)
-    if( index < DRIVER_LED_TOTAL ) {
+    if( index < RGB_MATRIX_LED_COUNT ) {
         IS31FL3731_set_color( index, red, green, blue );
     } else {
-        g_ws2812_leds[index - DRIVER_LED_TOTAL].r = red;
-        g_ws2812_leds[index - DRIVER_LED_TOTAL].g = green;
-        g_ws2812_leds[index - DRIVER_LED_TOTAL].b = blue;
+        g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].r = red;
+        g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].g = green;
+        g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].b = blue;
         ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL);
     }
 #else
@@ -2131,9 +2131,9 @@ void backlight_effect_alphas_mods(void)
     for (int i = 0; i < WS2812_LED_TOTAL; i++) {
         if ((RGB_UNDERGLOW_ALPHA_TOP_START <= i && i <= RGB_UNDERGLOW_ALPHA_TOP_END) ||
             (RGB_UNDERGLOW_ALPHA_BOT_START <= i && i <= RGB_UNDERGLOW_ALPHA_BOT_END)) {
-            backlight_set_color(i + DRIVER_LED_TOTAL, rgb1.r, rgb1.g, rgb1.b);
+            backlight_set_color(i + RGB_MATRIX_LED_COUNT, rgb1.r, rgb1.g, rgb1.b);
         } else {
-            backlight_set_color(i + DRIVER_LED_TOTAL, rgb2.r, rgb2.g, rgb2.b);
+            backlight_set_color(i + RGB_MATRIX_LED_COUNT, rgb2.r, rgb2.g, rgb2.b);
         }
     }
 #endif
@@ -2927,7 +2927,7 @@ void backlight_init_drivers(void)
 #elif defined(RGB_BACKLIGHT_HS60)
     IS31FL3733_init( ISSI_ADDR_1, 0 );
 
-    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
 #if defined(HS60_ANSI)
         bool enabled = !( ( index == 48-1 ) || //LA48
@@ -2949,7 +2949,7 @@ void backlight_init_drivers(void)
     IS31FL3733_init( ISSI_ADDR_1, 0 );
     IS31FL3733_init( ISSI_ADDR_2, 0 );
 
-    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         bool enabled = !( ( index == 61-1 )   || //LA61
                           ( index > 6+64-1 ) ); //LB7-LB64
@@ -2964,7 +2964,7 @@ void backlight_init_drivers(void)
     IS31FL3733_init( ISSI_ADDR_1, 0 );
     IS31FL3733_init( ISSI_ADDR_2, 0 );
 
-    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         bool enabled = !( ( index == 61-1 )   || //LA61
                           ( (index >= 2+64-1) && (index <= 4+64-1) ) ||
@@ -2994,7 +2994,7 @@ void backlight_init_drivers(void)
     IS31FL3733_init( ISSI_ADDR_1, 0 );
     IS31FL3733_init( ISSI_ADDR_2, 0 );
 
-    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         bool enabled = !( ( index == 61-1 )   || //LA61
                           ( index > 5+64-1 ) ); //LB6-LB64
@@ -3007,7 +3007,7 @@ void backlight_init_drivers(void)
 #elif defined(RGB_BACKLIGHT_PORTICO75)
     IS31FL3741_init( ISSI_ADDR_1 );
 	bool enabled = true;
-    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         IS31FL3741_set_led_control_register( index, enabled, enabled, enabled );
     }
@@ -3017,7 +3017,7 @@ void backlight_init_drivers(void)
     IS31FL3733_init( ISSI_ADDR_1, 0 );
     IS31FL3733_init( ISSI_ADDR_2, 0 );
 
-    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         bool enabled = !( ( index == 61-1 )   || //LA61
                           ( index > 6+64-1 ) ); //LB7-LB64
@@ -3044,7 +3044,7 @@ void backlight_init_drivers(void)
     bool disable_spacebar_stab_leds = false;
 #endif
 
-    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         // OR the possible "disabled" cases together, then NOT the result to get the enabled state
         // LC6 LD13 not present on Zeal65
diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h
index b3c0477342..eaf7b76504 100644
--- a/keyboards/wilba_tech/zeal60/config.h
+++ b/keyboards/wilba_tech/zeal60/config.h
@@ -27,7 +27,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h
index 27f4fd4b44..d5e83a11e3 100644
--- a/keyboards/wilba_tech/zeal65/config.h
+++ b/keyboards/wilba_tech/zeal65/config.h
@@ -27,7 +27,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 72
+#define RGB_MATRIX_LED_COUNT 72
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
index 1a9617c1e3..3d0921590e 100644
--- a/keyboards/winry/winry315/config.h
+++ b/keyboards/winry/winry315/config.h
@@ -62,7 +62,7 @@
 
 // RGB Matrix configuration.
 #ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
 
 #    define RGB_MATRIX_CENTER \
diff --git a/keyboards/winry/winry315/winry315.c b/keyboards/winry/winry315/winry315.c
index c741ffeb74..d8042606c0 100644
--- a/keyboards/winry/winry315/winry315.c
+++ b/keyboards/winry/winry315/winry315.c
@@ -223,7 +223,7 @@ void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
 void winry315_set_orientation(uint8_t orientation) {
     (void)orientation;
 #if defined(RGB_MATRIX_ENABLE)
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
         led_point_t *      dst_point = &g_led_config.point[i];
         const led_point_t *src_point = &initial_led_config.point[i];
         uint8_t            x         = pgm_read_byte(&src_point->x);
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 32856ecebf..fc1ce6c902 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -79,7 +79,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#endif
 
 #define RGB_DI_PIN F1
-#define DRIVER_LED_TOTAL 9
+#define RGB_MATRIX_LED_COUNT 9
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h
index a4d5ca2c93..0f1c76ff41 100644
--- a/keyboards/work_louder/micro/config.h
+++ b/keyboards/work_louder/micro/config.h
@@ -11,7 +11,7 @@
  */
 
 #define RGB_DI_PIN D1
-#define DRIVER_LED_TOTAL 12
+#define RGB_MATRIX_LED_COUNT 12
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_DISABLE_KEYCODES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 7a7d03b8a3..8d3732e825 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -80,7 +80,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#endif
 
 #define RGB_DI_PIN                    F6
-#define DRIVER_LED_TOTAL              2
+#define RGB_MATRIX_LED_COUNT              2
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 512c282794..28cc82e412 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -69,7 +69,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#endif
 
 #define RGB_DI_PIN                    D1
-#define DRIVER_LED_TOTAL              49
+#define RGB_MATRIX_LED_COUNT              49
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index f0fc0f712a..1612f636bd 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -64,5 +64,5 @@
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 35
 #    define DRIVER_3_LED_TOTAL 15
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
 #endif
diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c
index 9d9d7cfd10..9b6628b63e 100644
--- a/keyboards/xbows/knight/knight.c
+++ b/keyboards/xbows/knight/knight.c
@@ -15,7 +15,7 @@
  */
  #include "knight.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
    {0, C1_3, C2_3, C3_3},   // L01
    {0, C1_4, C2_4, C3_4},   // L02
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 91c6dcebd4..bc496ee3da 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -64,5 +64,5 @@
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 35
 #    define DRIVER_3_LED_TOTAL 15
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
 #endif
diff --git a/keyboards/xbows/knight_plus/knight_plus.c b/keyboards/xbows/knight_plus/knight_plus.c
index bf008fd091..bdf862dbe4 100644
--- a/keyboards/xbows/knight_plus/knight_plus.c
+++ b/keyboards/xbows/knight_plus/knight_plus.c
@@ -15,7 +15,7 @@
  */
  #include "knight_plus.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
   {0, C1_3, C2_3, C3_3},   // L01
   {0, C1_4, C2_4, C3_4},   // L02
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index a248fa37bb..444133cd00 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -66,5 +66,5 @@
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 36
 #    define DRIVER_3_LED_TOTAL 15
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
 #endif
diff --git a/keyboards/xbows/nature/nature.c b/keyboards/xbows/nature/nature.c
index d4957003bd..48534d87c4 100644
--- a/keyboards/xbows/nature/nature.c
+++ b/keyboards/xbows/nature/nature.c
@@ -15,7 +15,7 @@
  */
  #include "nature.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 	{0, C1_3, C2_3, C3_3},   // L01
 	{0, C1_4, C2_4, C3_4},   // L02
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 7eb56caea7..5022f26339 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -59,5 +59,5 @@
 
 #    define DRIVER_ADDR_1 0b1110111
 #    define DRIVER_COUNT 1
-#    define DRIVER_LED_TOTAL 22
+#    define RGB_MATRIX_LED_COUNT 22
 #endif
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
index bbc2a1e98a..f998e8122e 100644
--- a/keyboards/xbows/numpad/numpad.c
+++ b/keyboards/xbows/numpad/numpad.c
@@ -15,7 +15,7 @@
  */
  #include "numpad.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
   {0, C3_3,  C2_3, C1_3},   // L01
   {0, C3_4,  C2_4, C1_4},   // L02
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 6c557bf341..15846a8dc9 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -63,6 +63,6 @@
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 36
 #    define DRIVER_3_LED_TOTAL 15
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
 
 #endif
diff --git a/keyboards/xbows/ranger/ranger.c b/keyboards/xbows/ranger/ranger.c
index 9a09918967..c4b0e54544 100644
--- a/keyboards/xbows/ranger/ranger.c
+++ b/keyboards/xbows/ranger/ranger.c
@@ -15,7 +15,7 @@
  */
  #include "ranger.h"
  #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     {0, C3_3, C2_3, C1_3},  // L01
     {0, C3_4, C2_4, C1_4},  // L02
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index d6b7f32c68..ad2a7101cf 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -69,5 +69,5 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 32
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index 41601d39a9..9dd57d2fd3 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -1,6 +1,6 @@
 #include "woody.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 	
 	{0, C8_8,  C7_8, C6_8},   // LA17
 	{0, C9_8,  C7_7, C6_7},   // LA16
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index 4b3a1641b9..af4c31e478 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -31,7 +31,7 @@
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
 
 // COL2ROW or ROW2COL
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index 11c59f8847..755e2c9000 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -48,7 +48,7 @@
 #define DRIVER_1_LED_TOTAL 32
 #define DRIVER_2_LED_TOTAL 32
 #define ISSI_DRIVER_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + WS2812_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + WS2812_LED_TOTAL)
 
 #define RGB_MATRIX_STARTUP_VAL 80
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index 8b044ee4f6..203ad4b5c6 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -25,7 +25,7 @@
 #ifdef RGB_MATRIX_ENABLE
 LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 40d53adb06..9561596fd0 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -42,7 +42,7 @@
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN F1
 // The number of LEDs connected
-#define DRIVER_LED_TOTAL 32
+#define RGB_MATRIX_LED_COUNT 32
 
 #define RGB_MATRIX_STARTUP_VAL 80
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 9eda99ed32..9b14fbcbf5 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -58,8 +58,8 @@
 
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 117
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
-#define ISSI_DRIVER_TOTAL DRIVER_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+#define ISSI_DRIVER_TOTAL RGB_MATRIX_LED_COUNT
 
 #define RGB_MATRIX_STARTUP_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index 7074265009..7dd446a41e 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -22,7 +22,7 @@ void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
 #ifdef RGB_MATRIX_ENABLE
 #include "i2c_master.h"
 #include "drivers/led/issi/is31fl3741.h"
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 6295228c31..52a8331867 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -55,8 +55,8 @@
 
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 117
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
-#define ISSI_DRIVER_TOTAL DRIVER_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+#define ISSI_DRIVER_TOTAL RGB_MATRIX_LED_COUNT
 
 #define RGB_MATRIX_STARTUP_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index f8ca9ec53e..53552d2909 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -22,7 +22,7 @@ void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
 #ifdef RGB_MATRIX_ENABLE
 #include "i2c_master.h"
 #include "drivers/led/issi/is31fl3741.h"
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 44a16e9b7e..875d8e988f 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -58,7 +58,7 @@
 /* RGB Matrix */
 #define RGB_DI_PIN A9
 #define RGBLED_NUM 28
-#define DRIVER_LED_TOTAL 28
+#define RGB_MATRIX_LED_COUNT 28
 #define NOP_FUDGE 0.4
 
 // RGB PWM
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 665cc96275..224eb16bb3 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -37,7 +37,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_DI_PIN A7
 #   define RGBLED_NUM 82
-#   define DRIVER_LED_TOTAL RGBLED_NUM
+#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #   define WS2812_PWM_CHANNEL 2  // default: 2
@@ -105,7 +105,7 @@
 #ifdef RGBLIGHT_ENABLE
 #   define RGB_DI_PIN A7
 #   define RGBLED_NUM 82
-#   define DRIVER_LED_TOTAL RGBLED_NUM
+#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #   define WS2812_PWM_CHANNEL 2  // default: 2
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index 77f050aa1f..faa7f82141 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -46,7 +46,7 @@
 
 #    define RGB_DI_PIN B5
 #    define RGBLED_NUM 86
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
 #    define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 767e54687d..d4ef221dee 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -35,7 +35,7 @@
 
 #    define RGB_DI_PIN A7
 #    define RGBLED_NUM 69
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250
 #    define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index 749f7f69e4..285f3209aa 100644
--- a/keyboards/yanghu/unicorne/config.h
+++ b/keyboards/yanghu/unicorne/config.h
@@ -51,7 +51,7 @@
 /* RGB LED */
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 8
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h
index a9cac6d816..4db1cdf568 100644
--- a/keyboards/yncognito/batpad/config.h
+++ b/keyboards/yncognito/batpad/config.h
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN B5
-#define DRIVER_LED_TOTAL 8
+#define RGB_MATRIX_LED_COUNT 8
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_KEYRELEASES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 3595bf20c6..36dc55747d 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -52,13 +52,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 18
 
 #ifdef RGB_MATRIX_ENABLE
-#   define DRIVER_LED_TOTAL RGBLED_NUM
+#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 //      HSV_TEAL
diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
index 0232b05ab9..d0071205af 100644
--- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
+++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
@@ -27,7 +27,7 @@ enum lighting_types {
     NUM_L
 };
 
-const uint8_t rgb_keymaps [][DRIVER_LED_TOTAL] = {
+const uint8_t rgb_keymaps [][RGB_MATRIX_LED_COUNT] = {
     [_CONTROL] = LED_LAYOUT(
         _____, INDC2, INDC1, INDC2, INDC3, INDC4,
         _____, INDC1, INDC1, INDC1, INDC3, INDC4,
diff --git a/layouts/community/ortho_3x10/bbaserdem/config.h b/layouts/community/ortho_3x10/bbaserdem/config.h
index d781d34478..b792b2e6fa 100644
--- a/layouts/community/ortho_3x10/bbaserdem/config.h
+++ b/layouts/community/ortho_3x10/bbaserdem/config.h
@@ -17,5 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef KEYBOARD_40percentclub_gherkin
     #define MUSIC_MAP
     #define RGB_DI_PIN F6
-    #define DRIVER_LED_TOTAL 10
+    #define RGB_MATRIX_LED_COUNT 10
 #endif
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 1c88d66f3b..3f47a3dcbc 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -41,7 +41,7 @@
 #    undef RGB_MATRIX_LED_PROCESS_LIMIT
 #    undef RGB_MATRIX_LED_FLUSH_LIMIT
 #    ifdef KEYBOARD_planck_rev6
-#        define DRIVER_LED_TOTAL RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    endif
 #endif
 
diff --git a/layouts/community/split_3x5_3/bbaserdem/config.h b/layouts/community/split_3x5_3/bbaserdem/config.h
index 6bb3515b9e..2f7c0f7068 100644
--- a/layouts/community/split_3x5_3/bbaserdem/config.h
+++ b/layouts/community/split_3x5_3/bbaserdem/config.h
@@ -27,9 +27,9 @@
 #   ifdef RGBLED_NUM
 #   undef RGBLED_NUM
 #   endif
-#   ifdef DRIVER_LED_TOTAL
-#   undef DRIVER_LED_TOTAL
+#   ifdef RGB_MATRIX_LED_COUNT
+#   undef RGB_MATRIX_LED_COUNT
 #   endif
 #   define RGBLED_NUM 48
-#   define DRIVER_LED_TOTAL RGBLED_NUM
+#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index a84d6eef2e..cfe2d4436f 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -48,7 +48,7 @@
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_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)
 #    ifndef RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 14dd0dd48a..5bff154480 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -170,7 +170,7 @@ void led_matrix_set_value(int index, uint8_t value) {
 
 void led_matrix_set_value_all(uint8_t value) {
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++)
+    for (uint8_t i = 0; i < LED_MATRIX_LED_COUNT; i++)
         led_matrix_set_value(i, value);
 #else
 #    ifdef USE_CIE1931_CURVE
@@ -399,13 +399,13 @@ void led_matrix_indicators_advanced(effect_params_t *params) {
      * and not sure which would be better. Otherwise, this should be called from
      * led_task_render, right before the iter++ line.
      */
-#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
+#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < LED_MATRIX_LED_COUNT
     uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * (params->iter - 1);
     uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT;
-    if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
+    if (max > LED_MATRIX_LED_COUNT) max = LED_MATRIX_LED_COUNT;
 #else
     uint8_t min = 0;
-    uint8_t max = DRIVER_LED_TOTAL;
+    uint8_t max = LED_MATRIX_LED_COUNT;
 #endif
     led_matrix_indicators_advanced_kb(min, max);
     led_matrix_indicators_advanced_user(min, max);
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index 446f293c78..db4f223d5b 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -42,15 +42,15 @@
 #endif
 
 #ifndef LED_MATRIX_LED_PROCESS_LIMIT
-#    define LED_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5
+#    define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5
 #endif
 
-#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
+#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < LED_MATRIX_LED_COUNT
 #    if defined(LED_MATRIX_SPLIT)
 #        define LED_MATRIX_USE_LIMITS(min, max)                                                   \
             uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * params->iter;                            \
             uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT;                                     \
-            if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;                                   \
+            if (max > LED_MATRIX_LED_COUNT) max = LED_MATRIX_LED_COUNT;                           \
             uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;                                     \
             if (is_keyboard_left() && (max > k_led_matrix_split[0])) max = k_led_matrix_split[0]; \
             if (!(is_keyboard_left()) && (min < k_led_matrix_split[0])) min = k_led_matrix_split[0];
@@ -58,20 +58,20 @@
 #        define LED_MATRIX_USE_LIMITS(min, max)                        \
             uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * params->iter; \
             uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT;          \
-            if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
+            if (max > LED_MATRIX_LED_COUNT) max = LED_MATRIX_LED_COUNT;
 #    endif
 #else
 #    if defined(LED_MATRIX_SPLIT)
 #        define LED_MATRIX_USE_LIMITS(min, max)                                                   \
             uint8_t       min                   = 0;                                              \
-            uint8_t       max                   = DRIVER_LED_TOTAL;                               \
+            uint8_t       max                   = LED_MATRIX_LED_COUNT;                           \
             const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;                               \
             if (is_keyboard_left() && (max > k_led_matrix_split[0])) max = k_led_matrix_split[0]; \
             if (!(is_keyboard_left()) && (min < k_led_matrix_split[0])) min = k_led_matrix_split[0];
 #    else
 #        define LED_MATRIX_USE_LIMITS(min, max) \
             uint8_t min = 0;                    \
-            uint8_t max = DRIVER_LED_TOTAL;
+            uint8_t max = LED_MATRIX_LED_COUNT;
 #    endif
 #endif
 
@@ -181,9 +181,9 @@ static inline bool led_matrix_check_finished_leds(uint8_t led_idx) {
         uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
         return led_idx < k_led_matrix_split[0];
     } else
-        return led_idx < DRIVER_LED_TOTAL;
+        return led_idx < LED_MATRIX_LED_COUNT;
 #else
-    return led_idx < DRIVER_LED_TOTAL;
+    return led_idx < LED_MATRIX_LED_COUNT;
 #endif
 }
 
diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c
index f01b395c15..2c09ba82b1 100644
--- a/quantum/led_matrix/led_matrix_drivers.c
+++ b/quantum/led_matrix/led_matrix_drivers.c
@@ -96,7 +96,7 @@ static void init(void) {
 #        endif
 #    endif
 
-    for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+    for (int index = 0; index < LED_MATRIX_LED_COUNT; index++) {
 #    if defined(IS31FL3731)
         IS31FL3731_set_led_control_register(index, true);
 #    elif defined(IS31FL3733)
diff --git a/quantum/led_matrix/led_matrix_types.h b/quantum/led_matrix/led_matrix_types.h
index 3dc533100f..6d79a3592d 100644
--- a/quantum/led_matrix/led_matrix_types.h
+++ b/quantum/led_matrix/led_matrix_types.h
@@ -76,8 +76,8 @@ typedef struct PACKED {
 
 typedef struct PACKED {
     uint8_t     matrix_co[MATRIX_ROWS][MATRIX_COLS];
-    led_point_t point[DRIVER_LED_TOTAL];
-    uint8_t     flags[DRIVER_LED_TOTAL];
+    led_point_t point[LED_MATRIX_LED_COUNT];
+    uint8_t     flags[LED_MATRIX_LED_COUNT];
 } led_config_t;
 
 typedef union {
diff --git a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
index 31dffcbc5a..69bf265d14 100644
--- a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
@@ -13,7 +13,7 @@ bool JELLYBEAN_RAINDROPS(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 5 == 0) {
-            jellybean_raindrops_set_color(rand() % DRIVER_LED_TOTAL, params);
+            jellybean_raindrops_set_color(rand() % RGB_MATRIX_LED_COUNT, params);
         }
         return false;
     }
diff --git a/quantum/rgb_matrix/animations/pixel_flow_anim.h b/quantum/rgb_matrix/animations/pixel_flow_anim.h
index 714f5d174e..8628c3c2ec 100644
--- a/quantum/rgb_matrix/animations/pixel_flow_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_flow_anim.h
@@ -7,7 +7,7 @@ RGB_MATRIX_EFFECT(PIXEL_FLOW)
 
 static bool PIXEL_FLOW(effect_params_t* params) {
     // LED state array
-    static RGB led[DRIVER_LED_TOTAL];
+    static RGB led[RGB_MATRIX_LED_COUNT];
 
     static uint32_t wait_timer = 0;
     if (wait_timer > g_rgb_timer) {
@@ -21,7 +21,7 @@ static bool PIXEL_FLOW(effect_params_t* params) {
     if (params->init) {
         // Clear LEDs and fill the state array
         rgb_matrix_set_color_all(0, 0, 0);
-        for (uint8_t j = 0; j < DRIVER_LED_TOTAL; ++j) {
+        for (uint8_t j = 0; j < RGB_MATRIX_LED_COUNT; ++j) {
             led[j] = (random8() & 2) ? (RGB){0, 0, 0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
         }
     }
diff --git a/quantum/rgb_matrix/animations/pixel_rain_anim.h b/quantum/rgb_matrix/animations/pixel_rain_anim.h
index ce2528a26d..fded60340f 100644
--- a/quantum/rgb_matrix/animations/pixel_rain_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_rain_anim.h
@@ -41,7 +41,7 @@ static bool PIXEL_RAIN(effect_params_t* params) {
 
     RGB_MATRIX_USE_LIMITS(led_min, led_max);
     if (g_rgb_timer > wait_timer) {
-        rain_pixel(mod8(random8(), DRIVER_LED_TOTAL), params, random8() & 2);
+        rain_pixel(mod8(random8(), RGB_MATRIX_LED_COUNT), params, random8() & 2);
     }
     return rgb_matrix_check_finished_leds(led_max);
 }
diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h
index a508e51183..6b92d649ad 100644
--- a/quantum/rgb_matrix/animations/raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/raindrops_anim.h
@@ -24,7 +24,7 @@ bool RAINDROPS(effect_params_t* params) {
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
-            raindrops_set_color(random8() % DRIVER_LED_TOTAL, params);
+            raindrops_set_color(random8() % RGB_MATRIX_LED_COUNT, params);
         }
     } else {
         for (int i = led_min; i < led_max; i++) {
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 2730686839..ae61e75535 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -202,7 +202,7 @@ void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 
 void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++)
+    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++)
         rgb_matrix_set_color(i, red, green, blue);
 #else
     rgb_matrix_driver.set_color_all(red, green, blue);
@@ -461,13 +461,13 @@ void rgb_matrix_indicators_advanced(effect_params_t *params) {
      * and not sure which would be better. Otherwise, this should be called from
      * rgb_task_render, right before the iter++ line.
      */
-#if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
+#if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < RGB_MATRIX_LED_COUNT
     uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * (params->iter - 1);
     uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;
-    if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
+    if (max > RGB_MATRIX_LED_COUNT) max = RGB_MATRIX_LED_COUNT;
 #else
     uint8_t min = 0;
-    uint8_t max = DRIVER_LED_TOTAL;
+    uint8_t max = RGB_MATRIX_LED_COUNT;
 #endif
     rgb_matrix_indicators_advanced_kb(min, max);
     rgb_matrix_indicators_advanced_user(min, max);
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index fc9fc3e020..0b35e98f45 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -47,15 +47,15 @@
 #endif
 
 #ifndef RGB_MATRIX_LED_PROCESS_LIMIT
-#    define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5
+#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5
 #endif
 
-#if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
+#if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < RGB_MATRIX_LED_COUNT
 #    if defined(RGB_MATRIX_SPLIT)
 #        define RGB_MATRIX_USE_LIMITS(min, max)                                                   \
             uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * params->iter;                            \
             uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;                                     \
-            if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;                                   \
+            if (max > RGB_MATRIX_LED_COUNT) max = RGB_MATRIX_LED_COUNT;                           \
             uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;                                     \
             if (is_keyboard_left() && (max > k_rgb_matrix_split[0])) max = k_rgb_matrix_split[0]; \
             if (!(is_keyboard_left()) && (min < k_rgb_matrix_split[0])) min = k_rgb_matrix_split[0];
@@ -63,20 +63,20 @@
 #        define RGB_MATRIX_USE_LIMITS(min, max)                        \
             uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * params->iter; \
             uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;          \
-            if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
+            if (max > RGB_MATRIX_LED_COUNT) max = RGB_MATRIX_LED_COUNT;
 #    endif
 #else
 #    if defined(RGB_MATRIX_SPLIT)
 #        define RGB_MATRIX_USE_LIMITS(min, max)                                                   \
             uint8_t       min                   = 0;                                              \
-            uint8_t       max                   = DRIVER_LED_TOTAL;                               \
+            uint8_t       max                   = RGB_MATRIX_LED_COUNT;                           \
             const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;                               \
             if (is_keyboard_left() && (max > k_rgb_matrix_split[0])) max = k_rgb_matrix_split[0]; \
             if (!(is_keyboard_left()) && (min < k_rgb_matrix_split[0])) min = k_rgb_matrix_split[0];
 #    else
 #        define RGB_MATRIX_USE_LIMITS(min, max) \
             uint8_t min = 0;                    \
-            uint8_t max = DRIVER_LED_TOTAL;
+            uint8_t max = RGB_MATRIX_LED_COUNT;
 #    endif
 #endif
 
@@ -246,9 +246,9 @@ static inline bool rgb_matrix_check_finished_leds(uint8_t led_idx) {
         uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
         return led_idx < k_rgb_matrix_split[0];
     } else
-        return led_idx < DRIVER_LED_TOTAL;
+        return led_idx < RGB_MATRIX_LED_COUNT;
 #else
-    return led_idx < DRIVER_LED_TOTAL;
+    return led_idx < RGB_MATRIX_LED_COUNT;
 #endif
 }
 
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 99151e5a92..e75b2c6c9d 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -106,7 +106,7 @@ static void init(void) {
 #        endif
 #    endif
 
-    for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+    for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         bool enabled = true;
 
         // This only caches it for later
@@ -336,13 +336,13 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
 #    endif
 
 // LED color buffer
-LED_TYPE rgb_matrix_ws2812_array[DRIVER_LED_TOTAL];
+LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
 
 static void init(void) {}
 
 static void flush(void) {
     // Assumes use of RGB_DI_PIN
-    ws2812_setleds(rgb_matrix_ws2812_array, DRIVER_LED_TOTAL);
+    ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
 }
 
 // Set an led in the buffer to a color
diff --git a/quantum/rgb_matrix/rgb_matrix_types.h b/quantum/rgb_matrix/rgb_matrix_types.h
index d0ac4e4466..eea603c41c 100644
--- a/quantum/rgb_matrix/rgb_matrix_types.h
+++ b/quantum/rgb_matrix/rgb_matrix_types.h
@@ -78,8 +78,8 @@ typedef struct PACKED {
 
 typedef struct PACKED {
     uint8_t     matrix_co[MATRIX_ROWS][MATRIX_COLS];
-    led_point_t point[DRIVER_LED_TOTAL];
-    uint8_t     flags[DRIVER_LED_TOTAL];
+    led_point_t point[RGB_MATRIX_LED_COUNT];
+    uint8_t     flags[RGB_MATRIX_LED_COUNT];
 } led_config_t;
 
 typedef union {
diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c
index 94842021cd..6b88503f41 100644
--- a/users/brandonschlack/rgb_bs.c
+++ b/users/brandonschlack/rgb_bs.c
@@ -98,7 +98,7 @@ void rgb_theme_layer(layer_state_t state) {
 
 #ifdef RGB_MATRIX_ENABLE
 void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type) {
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
         if (!HAS_ANY_FLAGS(g_led_config.flags[i], led_type)) {
             rgb_matrix_set_color( i, red, green, blue );
         }
diff --git a/users/byungyoonc/saturated_solid_multisplash.h b/users/byungyoonc/saturated_solid_multisplash.h
index f302348524..c6850a7873 100644
--- a/users/byungyoonc/saturated_solid_multisplash.h
+++ b/users/byungyoonc/saturated_solid_multisplash.h
@@ -43,7 +43,7 @@ static bool saturated_solid_multisplash(effect_params_t* params) {
         RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
-    return led_max < DRIVER_LED_TOTAL;
+    return led_max < RGB_MATRIX_LED_COUNT;
 }
 
 #   endif   // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/users/curry/rgb_matrix_user.c b/users/curry/rgb_matrix_user.c
index 96f1f1d4f3..053226ab60 100644
--- a/users/curry/rgb_matrix_user.c
+++ b/users/curry/rgb_matrix_user.c
@@ -131,7 +131,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
             uint16_t time = scale16by8(RGBLED_NUM, speed / 8);
             hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
             RGB rgb       = hsv_to_rgb(hsv);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
                     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
                 }
@@ -141,7 +141,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
         default:  // Solid Color
         {
             RGB rgb = hsv_to_rgb(hsv);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
                     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
                 }
diff --git a/users/drashna/rgb/rgb_matrix_stuff.c b/users/drashna/rgb/rgb_matrix_stuff.c
index 2c23c29784..64549d8fae 100644
--- a/users/drashna/rgb/rgb_matrix_stuff.c
+++ b/users/drashna/rgb/rgb_matrix_stuff.c
@@ -20,7 +20,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
             uint16_t time = scale16by8(g_rgb_timer, speed / 8);
             hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
             RGB rgb       = hsv_to_rgb(hsv);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
                     RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
                 }
@@ -30,7 +30,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
         default: // Solid Color
         {
             RGB rgb = hsv_to_rgb(hsv);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
                     RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
                 }
diff --git a/users/tominabox1/config.h b/users/tominabox1/config.h
index f853e18605..5fd8ba3a74 100644
--- a/users/tominabox1/config.h
+++ b/users/tominabox1/config.h
@@ -22,7 +22,7 @@
   #ifdef RGB_MATRIX_ENABLE
   #undef RGBLED_NUM
   #define RGBLED_NUM 50
-  #define DRIVER_LED_TOTAL RGBLED_NUM
+  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
   #endif // RGBL_MATRIX_ENABLE
 #endif // KEYBOARD_lazydesigners_dimple
 
diff --git a/users/tominabox1/dimple_rgb.c b/users/tominabox1/dimple_rgb.c
index 49d95eb43a..299dc830f1 100644
--- a/users/tominabox1/dimple_rgb.c
+++ b/users/tominabox1/dimple_rgb.c
@@ -1,7 +1,7 @@
 #include "dz60rgb.h"
 #include "config.h"
 #if defined (dzrgb60_iso)
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, K_14,   J_14,   L_14},
     {0, K_13,   J_13,   L_13},
     {0, K_12,   J_12,   L_12},
@@ -86,7 +86,7 @@ led_config_t g_led_config = { {
 } };
 
 #elif defined (dzrgb60_hhkb)
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 	{0, H_15,   G_15,   I_15},
     {0, K_14,   J_14,   L_14},
     {0, K_13,   J_13,   L_13},
@@ -172,7 +172,7 @@ led_config_t g_led_config = { {
 } };
 
 #elif defined (dzrgb60_hhkb_iso)
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 	{0, H_15,   G_15,   I_15},
     {0, K_14,   J_14,   L_14},
     {0, K_13,   J_13,   L_13},
@@ -258,7 +258,7 @@ led_config_t g_led_config = { {
 } };
 
 #elif defined (dzrgb60_ansi)
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, K_14,   J_14,   L_14},
     {0, K_13,   J_13,   L_13},
     {0, K_12,   J_12,   L_12},
@@ -343,7 +343,7 @@ led_config_t g_led_config = { {
 } };
 
 #else
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, K_14,   J_14,   L_14},
     {0, K_13,   J_13,   L_13},
     {0, K_12,   J_12,   L_12},
diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c
index b4ec224d07..999222fa67 100644
--- a/users/tominabox1/tominabox1.c
+++ b/users/tominabox1/tominabox1.c
@@ -58,7 +58,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
             uint16_t time = scale16by8(g_rgb_counters.tick, speed / 8);
             hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
             RGB rgb       = hsv_to_rgb(hsv);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
                     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
                 }
@@ -68,7 +68,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
         default:  // Solid Color
         {
             RGB rgb = hsv_to_rgb(hsv);
-            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
                     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
                 }

From 03a671e7953844d085deba313d9e7de3c5a84105 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 23 Sep 2022 15:26:52 -0700
Subject: [PATCH 409/959] JadooKB JKB65 Community Layout Support (#18461)

* rename LAYOUT_67_ansi to LAYOUT_65_ansi_blocker

* enable Community Layouts support
---
 keyboards/jadookb/jkb65/info.json                | 6 +++++-
 keyboards/jadookb/jkb65/jkb65.h                  | 2 +-
 keyboards/jadookb/jkb65/keymaps/default/keymap.c | 4 ++--
 keyboards/jadookb/jkb65/keymaps/via/keymap.c     | 8 ++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json
index 394b53027a..c6f5813fee 100644
--- a/keyboards/jadookb/jkb65/info.json
+++ b/keyboards/jadookb/jkb65/info.json
@@ -6,8 +6,12 @@
         "vid": "0x4A4B",
         "pid": "0xEF6A"
     },
+    "layout_aliases": {
+        "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": ["65_ansi_blocker"],
     "layouts": {
-        "LAYOUT_67_ansi": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Menu", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
         }
     }
diff --git a/keyboards/jadookb/jkb65/jkb65.h b/keyboards/jadookb/jkb65/jkb65.h
index fa88e64bf7..97f65bf4da 100644
--- a/keyboards/jadookb/jkb65/jkb65.h
+++ b/keyboards/jadookb/jkb65/jkb65.h
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_67_ansi( \
+#define LAYOUT_65_ansi_blocker( \
  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E,      K0F,   \
     K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1F,   \
     K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2F,   \
diff --git a/keyboards/jadookb/jkb65/keymaps/default/keymap.c b/keyboards/jadookb/jkb65/keymaps/default/keymap.c
index f03211d220..22016cea76 100644
--- a/keyboards/jadookb/jkb65/keymaps/default/keymap.c
+++ b/keyboards/jadookb/jkb65/keymaps/default/keymap.c
@@ -20,14 +20,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-     [0] = LAYOUT_67_ansi(
+     [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_TILD,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,              KC_PGUP,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
     ),
-    [1] = LAYOUT_67_ansi(
+    [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_PSCR,
         _______,     RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,             _______,
diff --git a/keyboards/jadookb/jkb65/keymaps/via/keymap.c b/keyboards/jadookb/jkb65/keymaps/via/keymap.c
index 5713fe3805..950410d1af 100644
--- a/keyboards/jadookb/jkb65/keymaps/via/keymap.c
+++ b/keyboards/jadookb/jkb65/keymaps/via/keymap.c
@@ -20,28 +20,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-     [0] = LAYOUT_67_ansi(
+     [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_TILD,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,              KC_PGUP,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
     ),
-    [1] = LAYOUT_67_ansi(
+    [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_PSCR,
         _______,     RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,             _______,
         _______,            _______,   _______,  _______, _______,  _______, _______, _______, _______, _______,  _______,  _______, RGB_VAI,        _______,
         MAGIC_UNNO_GUI,MAGIC_NO_GUI,   _______,                      RGB_TOG,                              _______,   MO(2),   RGB_SPD,   RGB_VAD,    RGB_SPI
     ),
-	[2] = LAYOUT_67_ansi(
+	[2] = LAYOUT_65_ansi_blocker(
         QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
         _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
     ),
-	[3] = LAYOUT_67_ansi(
+	[3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,

From 2791ceb6aa000bce07638ad117a73eba4df0e3f6 Mon Sep 17 00:00:00 2001
From: Wilba <wilba@wilba.tech>
Date: Sat, 24 Sep 2022 09:39:55 +1000
Subject: [PATCH 410/959] Add caps lock and scroll lock indicators (#17725)

---
 keyboards/wilba_tech/wt60_a/config.h     |  4 ++--
 keyboards/wilba_tech/wt65_a/config.h     |  3 +++
 keyboards/wilba_tech/wt65_b/config.h     |  3 +++
 keyboards/wilba_tech/wt75_b/config.h     |  3 +++
 keyboards/wilba_tech/wt75_c/config.h     |  3 +++
 keyboards/wilba_tech/wt80_a/config.h     |  3 +++
 keyboards/wilba_tech/wt_mono_backlight.c | 27 ++++++++++++++++++++++++
 7 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h
index 8bd0e08508..c2b85fee76 100644
--- a/keyboards/wilba_tech/wt60_a/config.h
+++ b/keyboards/wilba_tech/wt60_a/config.h
@@ -100,8 +100,8 @@
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
 
-// enable the RGB indicator for WT75-A
-#define MONO_BACKLIGHT_WT75_A
+// enable the specific indicators
+#define MONO_BACKLIGHT_WT60_A
 
 // disable backlight when USB suspended (PC sleep/hibernate/shutdown)
 #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h
index 5a03ec52c1..062e2d8564 100644
--- a/keyboards/wilba_tech/wt65_a/config.h
+++ b/keyboards/wilba_tech/wt65_a/config.h
@@ -100,6 +100,9 @@
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
 
+// enable the specific indicators
+#define MONO_BACKLIGHT_WT65_A
+
 // disable backlight when USB suspended (PC sleep/hibernate/shutdown)
 #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
 
diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h
index 426a0b824b..8320daef0a 100644
--- a/keyboards/wilba_tech/wt65_b/config.h
+++ b/keyboards/wilba_tech/wt65_b/config.h
@@ -100,6 +100,9 @@
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
 
+// enable the specific indicators
+#define MONO_BACKLIGHT_WT65_B
+
 // disable backlight when USB suspended (PC sleep/hibernate/shutdown)
 #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
 
diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h
index d7abac199e..98b3d937f9 100644
--- a/keyboards/wilba_tech/wt75_b/config.h
+++ b/keyboards/wilba_tech/wt75_b/config.h
@@ -100,6 +100,9 @@
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
 
+// enable the specific indicators
+#define MONO_BACKLIGHT_WT75_B
+
 // disable backlight when USB suspended (PC sleep/hibernate/shutdown)
 #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
 
diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h
index 8562e8e18a..d8cf5a1a95 100644
--- a/keyboards/wilba_tech/wt75_c/config.h
+++ b/keyboards/wilba_tech/wt75_c/config.h
@@ -100,6 +100,9 @@
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
 
+// enable the specific indicators
+#define MONO_BACKLIGHT_WT75_C
+
 // disable backlight when USB suspended (PC sleep/hibernate/shutdown)
 #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
 
diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h
index f9708ab33b..2bc81b2fa5 100644
--- a/keyboards/wilba_tech/wt80_a/config.h
+++ b/keyboards/wilba_tech/wt80_a/config.h
@@ -100,6 +100,9 @@
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
 
+// enable the specific indicators
+#define MONO_BACKLIGHT_WT80_A
+
 // disable backlight when USB suspended (PC sleep/hibernate/shutdown)
 #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
 
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 5e2fde810c..71bf8e0284 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -173,6 +173,33 @@ void backlight_effect_indicators(void)
     IS31FL3736_mono_set_brightness(63, rgb.g);
     IS31FL3736_mono_set_brightness(71, rgb.b);
 #endif // MONO_BACKLIGHT_WT75_A
+
+// This pairs with "All Off" already setting zero brightness,
+// and "All On" already setting non-zero brightness.
+#if defined(MONO_BACKLIGHT_WT60_A) || \
+defined(MONO_BACKLIGHT_WT65_A) || \
+defined(MONO_BACKLIGHT_WT65_B) || \
+defined(MONO_BACKLIGHT_WT75_A) || \
+defined(MONO_BACKLIGHT_WT75_B) || \
+defined(MONO_BACKLIGHT_WT75_C) || \
+defined(MONO_BACKLIGHT_WT80_A)
+    if ( g_indicator_state & (1<<USB_LED_CAPS_LOCK) ) {
+        // Caps Lock: D1 -> (4*8+0)
+        IS31FL3736_mono_set_brightness(32, 255);
+    }
+#endif
+#if defined(MONO_BACKLIGHT_WT80_A) 
+    if ( g_indicator_state & (1<<USB_LED_SCROLL_LOCK) ) {
+        // Scroll Lock: G7 -> (6*8+6)
+        IS31FL3736_mono_set_brightness(54, 255);
+    }
+#endif
+#if defined(MONO_BACKLIGHT_WT75_C) 
+    if ( g_indicator_state & (1<<USB_LED_SCROLL_LOCK) ) {
+        // Scroll Lock: G8 -> (6*8+7)
+        IS31FL3736_mono_set_brightness(55, 255);
+    }
+#endif
 }
 
 ISR(TIMER3_COMPA_vect)

From 7c1797f52f74c9614615c0632ea1a2f5f11d3af6 Mon Sep 17 00:00:00 2001
From: Alabastard-64 <96358682+Alabastard-64@users.noreply.github.com>
Date: Sat, 24 Sep 2022 00:43:55 -0600
Subject: [PATCH 411/959] [Core] Pointing Device Automatic Mouse Layer (#17962)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
---
 builddefs/common_features.mk                  |   1 +
 docs/feature_pointing_device.md               | 232 ++++++++++-
 quantum/pointing_device/pointing_device.c     |   4 +
 quantum/pointing_device/pointing_device.h     |   4 +
 .../pointing_device_auto_mouse.c              | 384 ++++++++++++++++++
 .../pointing_device_auto_mouse.h              |  87 ++++
 .../pointing_device/pointing_device_drivers.c |  13 +
 quantum/quantum.c                             |   3 +
 8 files changed, 727 insertions(+), 1 deletion(-)
 create mode 100644 quantum/pointing_device/pointing_device_auto_mouse.c
 create mode 100644 quantum/pointing_device/pointing_device_auto_mouse.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 3d34c673d3..0e9e45220f 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -136,6 +136,7 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         VPATH += $(QUANTUM_DIR)/pointing_device
         SRC += $(QUANTUM_DIR)/pointing_device/pointing_device.c
         SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_drivers.c
+        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_auto_mouse.c
         ifneq ($(strip $(POINTING_DEVICE_DRIVER)), custom)
             SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c
             OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]'))
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index f2a8994fd2..4a2919168c 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -345,7 +345,7 @@ The combined functions below are only available when using `SPLIT_POINTING_ENABL
 | Function                                                        | Description                                                                                                              |
 | --------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
 | `pointing_device_set_shared_report(mouse_report)`               | Sets the shared mouse report to the assigned `mouse_report_t` data structured passed to the function.                    |
-| `pointing_device_set_cpi_on_side(bool, uint16_t)`               | Sets the CPI/DPI of one side, if supported. Passing `true` will set the left and `false` the right`                      |
+| `pointing_device_set_cpi_on_side(bool, uint16_t)`               | Sets the CPI/DPI of one side, if supported. Passing `true` will set the left and `false` the right                       |
 | `pointing_device_combine_reports(left_report, right_report)`    | Returns a combined mouse_report of left_report and right_report (as a `mouse_report_t` data structure)                   |
 | `pointing_device_task_combined_kb(left_report, right_report)`   | Callback, so keyboard code can intercept and modify the data. Returns a combined mouse report.                           |
 | `pointing_device_task_combined_user(left_report, right_report)` | Callback, so user code can intercept and modify. Returns a combined mouse report using `pointing_device_combine_reports` |
@@ -497,3 +497,233 @@ If you are having issues with pointing device drivers debug messages can be enab
 ```
  
 ?> The messages will be printed out to the `CONSOLE` output. For additional information, refer to [Debugging/Troubleshooting QMK](faq_debug.md).
+
+
+---
+# Automatic Mouse Layer :id=pointing-device-auto-mouse
+
+When using a pointing device combined with a keyboard the mouse buttons are often kept on a separate layer from the default keyboard layer, which requires pressing or holding a key to change layers before using the mouse. To make this easier and more efficient an additional pointing device feature may be enabled that will automatically activate a target layer as soon as the pointing device is active _(in motion, mouse button pressed etc.)_ and deactivate the target layer after a set time.   
+
+Additionally if any key that is defined as a mouse key is pressed then the layer will be held as long as the key is pressed and the timer will be reset on key release. When a non-mouse key is pressed then the layer is deactivated early _(with some exceptions see below)_.  Mod, mod tap, and one shot mod keys are ignored _(i.e. don't hold or activate layer but do not deactivate the layer either)_ when sending a modifier keycode _(e.g. hold for mod tap)_ allowing for mod keys to be used with the mouse without activating the target layer when typing.
+
+All of the standard layer keys (tap toggling, toggle, toggle on, one_shot, layer tap, layer mod) that activate the current target layer are uniquely handled to ensure they behave as expected _(see layer key table below)_. The target layer that can be changed at any point during by calling the `set_auto_mouse_layer(<new_target_layer>);` function.
+
+### Behaviour of Layer keys that activate the target layer
+| Layer key as in `keymap.c` | Auto Mouse specific behaviour                                                                                         |
+| -------------------------- | --------------------------------------------------------------------------------------------------------------------- |
+| `MO(<target_layer>)`       | Treated as a mouse key holding the layer while pressed                                                                |
+| `LT(<target_layer>)`       | When tapped will be treated as non mouse key and mouse key when held                                                  |
+| `LM(<target_layer>)`       | Treated as a mouse key                                                                                                |
+| `TG(<target_layer>)`       | Will set flag preventing target layer deactivation or removal until pressed again                                     |
+| `TO(<target_layer>)`       | Same as `TG(<target_layer>)`                                                                                          |
+| `TT(<target_layer>)`       | Treated as a mouse key when `tap.count < TAPPING_TOGGLE` and as `TG` when `tap.count == TAPPING_TOGGLE`               |
+| `DF(<target_layer>)`       | Skips auto mouse key processing similar to mod keys                                                                   |
+| `OSL(<target_layer>)`      | Skips, but if current one shot layer is the target layer then it will prevent target layer deactivation or removal    |
+
+
+## How to enable:
+
+```c
+// in config.h:
+#define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+// only required if not setting mouse layer elsewhere
+#define AUTO_MOUSE_DEFAULT_LAYER <index of your mouse layer>
+
+// in keymap.c:
+void pointing_device_init_user(void) {
+    set_auto_mouse_layer(<mouse_layer>); // only required if AUTO_MOUSE_DEFAULT_LAYER is not set to index of <mouse_layer>
+    set_auto_mouse_enable(true);         // always required before the auto mouse feature will work
+}
+```
+
+Because the auto mouse feature can be disabled/enabled during runtime and starts as disabled by default it must be enabled by calling `set_auto_mouse_enable(true);` somewhere in firmware before the feature will work.   
+_Note: for setting the target layer during initialization either setting `AUTO_MOUSE_DEFAULT_LAYER` in `config.h` or calling `set_auto_mouse_layer(<mouse_layer>)` can be used._   
+
+
+## How to Customize:
+
+There are a few ways to control the auto mouse feature with both `config.h` options and functions for controlling it during runtime.
+
+### `config.h` Options:
+| Define                              | Description                                                           |         Range        |    Units    |                    Default |
+| ----------------------------------- | --------------------------------------------------------------------- | :------------------: | :---------: | -------------------------: |
+| `POINTING_DEVICE_AUTO_MOUSE_ENABLE` | (Required) Enables auto mouse layer feature                           |                      |   _None_    |              _Not defined_ |
+| `AUTO_MOUSE_DEFAULT_LAYER`          | (Optional) Index of layer to use as default target layer              |    0 - `LAYER_MAX`   | _`uint8_t`_ |                        `1` |
+| `AUTO_MOUSE_TIME`                   | (Optional) Time layer remains active after activation                 | _ideally_ (250-1000) |     _ms_    |                   `650 ms` |
+| `AUTO_MOUSE_DELAY`                  | (Optional) Lockout time after non-mouse key is pressed                | _ideally_ (100-1000) |     _ms_    | `TAPPING_TERM` or `200 ms` |
+| `AUTO_MOUSE_DEBOUNCE`               | (Optional) Time delay from last activation to next update             | _ideally_ (10 - 100) |     _ms_    |                    `25 ms` |
+
+### Adding mouse keys
+
+While all default mouse keys and layer keys(for current mouse layer) are treated as mouse keys, additional Keyrecords can be added to mouse keys by adding them to the is_mouse_record_* stack. 
+
+#### Callbacks for setting up additional key codes as mouse keys:
+| Callback                                                             | Description                                        |
+| -------------------------------------------------------------------- | -------------------------------------------------- |
+| `bool is_mouse_record_kb(uint16_t keycode, keyrecord_t* record)`     |  keyboard level callback for adding mouse keys     |
+| `bool is_mouse_record_user(uint16_t keycode, keyrecord_t* record)`   |  user/keymap level callback for adding mouse keys  |
+
+##### To use the callback function to add mouse keys:   
+
+The following code will cause the enter key and all of the arrow keys to be treated as mouse keys (hold target layer while they are pressed and reset active layer timer).
+```c
+
+// in <keyboard>.c:
+bool is_mouse_record_kb(uint16_t keycode, keyrecord_t* record) {
+    switch(keycode) {
+        case KC_ENT:
+            return true;
+        case KC_RIGHT ... KC_UP:
+            return true;
+        default:
+            return false;
+    }
+    return  is_mouse_record_user(keycode, record);
+}
+```
+
+
+## Advanced control
+
+There are several functions that allow for more advanced interaction with the auto mouse feature allowing for greater control.
+
+### Functions to control auto mouse enable and target layer:   
+| Function                                                   | Description                                                                          | Aliases                   |     Return type |
+| :--------------------------------------------------------- | ------------------------------------------------------------------------------------ | ------------------------- | --------------: |
+| `set_auto_mouse_enable(bool enable)`                       | Enable or disable auto mouse (true:enable, false:disable)                            |                           |    `void`(None) |
+| `get_auto_mouse_enable(void)`                              | Return auto mouse enable state (true:enabled, false:disabled)                        | `AUTO_MOUSE_ENABLED`      |          `bool` |
+| `set_auto_mouse_layer(uint8_t LAYER)`                      | Change/set the target layer for auto mouse                                           |                           |    `void`(None) |
+| `get_auto_mouse_layer(void)`                               | Return auto mouse target layer index                                                 | `AUTO_MOUSE_TARGET_LAYER` |       `uint8_t` |
+| `remove_auto_mouse_layer(layer_state_t state, bool force)` | Return `state` with target layer removed if appropriate (ignore criteria if `force`) |                           | `layer_state_t` |
+| `auto_mouse_layer_off(void)`                               | Disable target layer if appropriate will call (makes call to `layer_state_set`)      |                           |   `void`(None)  |
+| `auto_mouse_toggle(void)`                                  | Toggle on/off target toggle state (disables layer deactivation when true)            |                           |    `void`(None) |
+| `get_auto_mouse_toggle(void)`                              | Return value of toggling state variable                                              |                           |          `bool` |
+
+_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._   
+    - _It is recommended that `remove_auto_mouse_layer` is used in the `layer_state_set_*` stack of functions and `auto_mouse_layer_off` is used everywhere else_   
+    - _`remove_auto_mouse_layer(state, false)` or `auto_mouse_layer_off()` should be called before any instance of `set_auto_mouse_enabled(false)` or `set_auto_mouse_layer(layer)` to ensure that the target layer will be removed appropriately before disabling auto mouse or changing target to avoid a stuck layer_      
+    
+### Functions for handling custom key events:   
+| Function                                                   | Description                                                                      |     Return type |
+| :--------------------------------------------------------- | -------------------------------------------------------------------------------- | --------------: |
+| `auto_mouse_keyevent(bool pressed)`                        | Auto mouse mouse key event (true: key down, false: key up)                       |    `void`(None) |
+| `auto_mouse_trigger_reset(bool pressed)`                   | Reset auto mouse status on key down and start delay timer (non-mouse key event)  |    `void`(None) |
+| `auto_mouse_toggle(void)`                                  | Toggle on/off target toggle state (disables layer deactivation when true)        |    `void`(None) |
+| `get_auto_mouse_toggle(void)`                              | Return value of toggling state variable                                          |          `bool` |   
+_NOTE: Generally it would be preferable to use the `is_mouse_record_*` functions to add any additional keys that should act as mouse keys rather than adding `auto_mouse_keyevent(record.event->pressed)` to `process_records_*`_
+
+### Advanced control examples   
+
+#### Disable auto mouse on certain layers:   
+
+The auto mouse feature can be disabled any time and this can be helpful if you want to disable the auto mouse feature under certain circumstances such as when particular layers are active. One issue however is the handling of the target layer, it needs to be removed appropriately **before** disabling auto mouse _(see notes under control functions above)_. The following function would disable the auto_mouse feature whenever the layers `_LAYER5` through `_LAYER7` are active as the top most layer _(ignoring target layer)_.   
+
+```c
+// in keymap.c:
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // checks highest layer other than target layer
+    switch(get_highest_layer(remove_auto_mouse_layer(state, true))) {
+        case _LAYER5 ... _LAYER7:
+            // remove_auto_mouse_target must be called to adjust state *before* setting enable
+            state = remove_auto_mouse_layer(state, false);
+            set_auto_mouse_enable(false);
+            break;
+        default:
+            set_auto_mouse_enable(true);
+            break;
+    }
+    // recommend that any code that makes adjustment based on auto mouse layer state would go here
+    return state;
+}
+```
+
+#### Set different target layer when a particular layer is active:
+
+The below code will change the auto mouse layer target to `_MOUSE_LAYER_2` when `_DEFAULT_LAYER_2` is highest default layer state.   
+*NOTE: that `auto_mouse_layer_off` is used here instead of `remove_auto_mouse_layer` as `default_layer_state_set_*` stack is separate from the `layer_state_set_*` stack* if something similar was to be done in `layer_state_set_user `state = remove_auto_mouse_layer(state, false)` should be used instead    
+*ADDITIONAL NOTE: `AUTO_MOUSE_TARGET_LAYER` is checked if already set to avoid deactivating the target layer unless needed*   
+
+```c
+// in keymap.c
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    // switch on change in default layer need to check if target layer already set to avoid turning off layer needlessly
+    switch(get_highest_layer(state)) {
+        case _DEFAULT_LAYER_2:
+            if ((AUTO_MOUSE_TARGET_LAYER) == _MOUSE_LAYER_2) break;
+            auto_mouse_layer_off();
+            set_auto_mouse_layer(_MOUSE_LAYER_2);
+            break;
+        
+        default:
+            if((AUTO_MOUSE_TARGET_LAYER) == _MOUSE_LAYER_1) break;
+            auto_mouse_layer_off();
+            set_auto_mouse_layer(_MOUSE_LAYER_1);
+    }
+    return state;
+}
+```
+
+### Use custom keys to control auto mouse:  
+Custom key records could also be created that control the auto mouse feature.   
+The code example below would create a custom key that would toggle the auto mouse feature on and off when pressed while also setting a bool that could be used to disable other code that may turn it on such as the layer code above.   
+
+```c
+// in config.h:
+enum user_custom_keycodes {
+    AM_Toggle = SAFE_RANGE
+};
+
+// in keymap.c:
+// set up global bool to adjust other user code
+bool auto_mouse_tg_off = !AUTO_MOUSE_ENABLED;
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        // toggle auto mouse enable key
+        case AM_Toggle:
+            if(record->event.pressed) { // key down
+                auto_mouse_layer_off(); // disable target layer if needed
+                set_auto_mouse_enabled((AUTO_MOUSE_ENABLED) ^ 1);
+                auto_mouse_tg_off = !get_auto_mouse_enabled();
+            } // do nothing on key up
+            return false; // prevent further processing of keycode
+    }
+}
+```
+
+
+## Customize Target Layer Activation
+
+Layer activation can be customized by overwriting the `auto_mouse_activation` function. This function is checked every time `pointing_device_task` is called when inactive and every `AUTO_MOUSE_DEBOUNCE` ms when active, and will evaluate pointing device level conditions that trigger target layer activation. When it returns true, the target layer will be activated barring the usual exceptions _(e.g. delay time has not expired)_.   
+
+By default it will return true if any of the `mouse_report` axes `x`,`y`,`h`,`v` are non zero, or if there is any mouse buttons active in `mouse_report`.
+_Note: The Cirque pinnacle track pad already implements a custom activation function that will activate on touchdown as well as movement all of the default conditions, currently this only works for the master side of split keyboards._
+ 
+| Function                                                   | Description                                                                      |     Return type |
+| :--------------------------------------------------------- | -------------------------------------------------------------------------------- | --------------: |
+| `auto_mouse_activation(report_mouse_t mouse_report)`       | Overwritable function that controls target layer activation (when true)          |          `bool` |
+
+## Auto Mouse for Custom Pointing Device Task
+
+When using a custom pointing device (overwriting `pointing_device_task`) the following code should be somewhere in the `pointing_device_task_*` stack:
+
+```c
+void pointing_device_task(void) {
+    //...Custom pointing device task code
+    
+    // handle automatic mouse layer (needs report_mouse_t as input)
+    pointing_device_task_auto_mouse(local_mouse_report);
+    
+    //...More custom pointing device task code
+    
+    pointing_device_send();
+}
+```
+
+In general the following two functions must be implemented in appropriate locations for auto mouse to function:
+
+| Function                                                       | Description                                                  |           Suggested location |
+| -------------------------------------------------------------- | ------------------------------------------------------------ | ---------------------------: |
+| `pointing_device_task_auto_mouse(report_mouse_t mouse_report)` | handles target layer activation and is_active status updates | `pointing_device_task` stack |
+| `process_auto_mouse(uint16_t keycode, keyrecord_t* record)`    | Keycode processing for auto mouse                            |       `process_record` stack |
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index ae3f122e89..e91de018f1 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -267,6 +267,10 @@ __attribute__((weak)) void pointing_device_task(void) {
 #else
     local_mouse_report = pointing_device_adjust_by_defines(local_mouse_report);
     local_mouse_report = pointing_device_task_kb(local_mouse_report);
+#endif
+    // automatic mouse layer function
+#ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
+    pointing_device_task_auto_mouse(local_mouse_report);
 #endif
     // combine with mouse report to ensure that the combined is sent correctly
 #ifdef MOUSEKEY_ENABLE
diff --git a/quantum/pointing_device/pointing_device.h b/quantum/pointing_device/pointing_device.h
index 77db5471ea..a002bd4b25 100644
--- a/quantum/pointing_device/pointing_device.h
+++ b/quantum/pointing_device/pointing_device.h
@@ -21,6 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "report.h"
 
+#ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#    include "pointing_device_auto_mouse.h"
+#endif
+
 #if defined(POINTING_DEVICE_DRIVER_adns5050)
 #    include "drivers/sensors/adns5050.h"
 #elif defined(POINTING_DEVICE_DRIVER_adns9800)
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c
new file mode 100644
index 0000000000..edffd44787
--- /dev/null
+++ b/quantum/pointing_device/pointing_device_auto_mouse.c
@@ -0,0 +1,384 @@
+/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2022 Alabastard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
+
+#    include "pointing_device_auto_mouse.h"
+
+/* local data structure for tracking auto mouse */
+static auto_mouse_context_t auto_mouse_context = {.config.layer = (uint8_t)AUTO_MOUSE_DEFAULT_LAYER};
+
+/* local functions */
+static bool is_mouse_record(uint16_t keycode, keyrecord_t* record);
+static void auto_mouse_reset(void);
+
+/* check for target layer deactivation overrides */
+static inline bool layer_hold_check(void) {
+    return get_auto_mouse_toggle() ||
+#    ifndef NO_ACTION_ONESHOT
+           get_oneshot_layer() == (AUTO_MOUSE_TARGET_LAYER) ||
+#    endif
+           false;
+}
+
+/* check all layer activation criteria */
+static inline bool is_auto_mouse_active(void) {
+    return auto_mouse_context.status.is_activated || auto_mouse_context.status.mouse_key_tracker || layer_hold_check();
+}
+
+/**
+ * @brief Get auto mouse enable state
+ *
+ * Return is_enabled value
+ *
+ * @return bool true: auto mouse enabled false: auto mouse disabled
+ */
+bool get_auto_mouse_enable(void) {
+    return auto_mouse_context.config.is_enabled;
+}
+
+/**
+ * @brief get current target layer index
+ *
+ * NOTE: (AUTO_MOUSE_TARGET_LAYER) is an alias for this function
+ *
+ * @return uint8_t target layer index
+ */
+uint8_t get_auto_mouse_layer(void) {
+    return auto_mouse_context.config.layer;
+}
+
+/**
+ * @brief get layer_toggled value
+ *
+ * @return bool of current layer_toggled state
+ */
+bool get_auto_mouse_toggle(void) {
+    return auto_mouse_context.status.is_toggled;
+}
+
+/**
+ * @brief Reset auto mouse context
+ *
+ * Clear timers and status
+ *
+ * NOTE: this will set is_toggled to false so careful when using it
+ */
+static void auto_mouse_reset(void) {
+    memset(&auto_mouse_context.status, 0, sizeof(auto_mouse_context.status));
+    memset(&auto_mouse_context.timer, 0, sizeof(auto_mouse_context.timer));
+}
+
+/**
+ * @brief Set auto mouse enable state
+ *
+ * Set local auto mouse enabled state
+ *
+ * @param[in] state bool
+ */
+void set_auto_mouse_enable(bool enable) {
+    // skip if unchanged
+    if (auto_mouse_context.config.is_enabled == enable) return;
+    auto_mouse_context.config.is_enabled = enable;
+    auto_mouse_reset();
+}
+
+/**
+ * @brief Change target layer for auto mouse
+ *
+ * Sets input as the new target layer if different from current and resets auto mouse
+ *
+ * NOTE: remove_auto_mouse_layer(state, false) or auto_mouse_layer_off should be called
+ *       before this function to avoid issues with layers getting stuck
+ *
+ * @param[in] layer uint8_t
+ */
+void set_auto_mouse_layer(uint8_t layer) {
+    // skip if unchanged
+    if (auto_mouse_context.config.layer == layer) return;
+    auto_mouse_context.config.layer = layer;
+    auto_mouse_reset();
+}
+
+/**
+ * @brief toggle mouse layer setting
+ *
+ * Change state of local layer_toggled bool meant to track when the mouse layer is toggled on by other means
+ *
+ * NOTE: While is_toggled is true it will prevent deactiving target layer (but not activation)
+ */
+void auto_mouse_toggle(void) {
+    auto_mouse_context.status.is_toggled ^= 1;
+    auto_mouse_context.timer.delay = 0;
+}
+
+/**
+ * @brief Remove current auto mouse target layer from layer state
+ *
+ * Will remove auto mouse target layer from given layer state if appropriate.
+ *
+ * NOTE: Removal can be forced, ignoring appropriate critera
+ *
+ * @params state[in] layer_state_t original layer state
+ * @params force[in] bool force removal
+ *
+ * @return layer_state_t modified layer state
+ */
+layer_state_t remove_auto_mouse_layer(layer_state_t state, bool force) {
+    if (force || ((AUTO_MOUSE_ENABLED) && !layer_hold_check())) {
+        state &= ~((layer_state_t)1 << (AUTO_MOUSE_TARGET_LAYER));
+    }
+    return state;
+}
+
+/**
+ * @brief Disable target layer
+ *
+ * Will disable target layer if appropriate.
+ * NOTE: NOT TO BE USED in layer_state_set stack!!!
+ */
+void auto_mouse_layer_off(void) {
+    if (layer_state_is((AUTO_MOUSE_TARGET_LAYER)) && (AUTO_MOUSE_ENABLED) && !layer_hold_check()) {
+        layer_off((AUTO_MOUSE_TARGET_LAYER));
+    }
+}
+
+/**
+ * @brief Weak function to handel testing if pointing_device is active
+ *
+ * Will trigger target layer activation(if delay timer has expired) and prevent deactivation when true.
+ * May be replaced by bool in report_mouse_t in future
+ *
+ * NOTE: defined weakly to allow for changing and adding conditions for specific hardware/customization
+ *
+ * @param[in] mouse_report report_mouse_t
+ * @return bool of pointing_device activation
+ */
+__attribute__((weak)) bool auto_mouse_activation(report_mouse_t mouse_report) {
+    return mouse_report.x != 0 || mouse_report.y != 0 || mouse_report.h != 0 || mouse_report.v != 0 || mouse_report.buttons;
+}
+
+/**
+ * @brief Update the auto mouse based on mouse_report
+ *
+ * Handel activation/deactivation of target layer based on auto_mouse_activation and state timers and local key/layer tracking data
+ *
+ * @param[in] mouse_report report_mouse_t
+ */
+void pointing_device_task_auto_mouse(report_mouse_t mouse_report) {
+    // skip if disabled, delay timer running, or debounce
+    if (!(AUTO_MOUSE_ENABLED) || timer_elapsed(auto_mouse_context.timer.active) <= AUTO_MOUSE_DEBOUNCE || timer_elapsed(auto_mouse_context.timer.delay) <= AUTO_MOUSE_DELAY) {
+        return;
+    }
+    // update activation and reset debounce
+    auto_mouse_context.status.is_activated = auto_mouse_activation(mouse_report);
+    if (is_auto_mouse_active()) {
+        auto_mouse_context.timer.active = timer_read();
+        auto_mouse_context.timer.delay  = 0;
+        if (!layer_state_is((AUTO_MOUSE_TARGET_LAYER))) {
+            layer_on((AUTO_MOUSE_TARGET_LAYER));
+        }
+    } else if (layer_state_is((AUTO_MOUSE_TARGET_LAYER)) && timer_elapsed(auto_mouse_context.timer.active) > AUTO_MOUSE_TIME) {
+        layer_off((AUTO_MOUSE_TARGET_LAYER));
+        auto_mouse_context.timer.active = 0;
+    }
+}
+
+/**
+ * @brief Handle mouskey event
+ *
+ * Increments/decrements mouse_key_tracker and restart active timer
+ *
+ * @param[in] pressed bool
+ */
+void auto_mouse_keyevent(bool pressed) {
+    if (pressed) {
+        auto_mouse_context.status.mouse_key_tracker++;
+    } else {
+        auto_mouse_context.status.mouse_key_tracker--;
+    }
+    auto_mouse_context.timer.delay = 0;
+}
+
+/**
+ * @brief Handle auto mouse non mousekey reset
+ *
+ * Start/restart delay timer and reset auto mouse on keydown as well as turn the
+ * target layer off if on and reset toggle status
+ *
+ * NOTE: NOT TO BE USED in layer_state_set stack!!!
+ *
+ * @param[in] pressed bool
+ */
+void auto_mouse_reset_trigger(bool pressed) {
+    if (pressed) {
+        if (layer_state_is((AUTO_MOUSE_TARGET_LAYER))) {
+            layer_off((AUTO_MOUSE_TARGET_LAYER));
+        };
+        auto_mouse_reset();
+    }
+    auto_mouse_context.timer.delay = timer_read();
+}
+
+/**
+ * @brief handle key events processing for auto mouse
+ *
+ * Will process keys differently depending on if key is defined as mousekey or not.
+ * Some keys have built in behaviour(not overwritable):
+ * mouse buttons        : auto_mouse_keyevent()
+ * non-mouse keys       : auto_mouse_reset_trigger()
+ * mod keys             : skip auto mouse key processing
+ * mod tap              : skip on hold (mod keys)
+ * QK mods e.g. LCTL(kc): default to non-mouse key, add at kb/user level as needed
+ * non target layer keys: skip auto mouse key processing (same as mod keys)
+ * MO(target layer)     : auto_mouse_keyevent()
+ * target layer toggles : auto_mouse_toggle() (on both key up and keydown)
+ * target layer tap     : default processing on tap mouse key on hold
+ * all other keycodes   : default to non-mouse key, add at kb/user level as needed
+ *
+ * Will deactivate target layer once a non mouse key is pressed if nothing is holding the layer active
+ * such as held mousekey, toggled current target layer, or auto_mouse_activation is true
+ *
+ * @params keycode[in] uint16_t
+ * @params record[in] keyrecord_t pointer
+ */
+bool process_auto_mouse(uint16_t keycode, keyrecord_t* record) {
+    // skip if not enabled or mouse_layer not set
+    if (!(AUTO_MOUSE_ENABLED)) return true;
+
+    switch (keycode) {
+        // Skip Mod keys to avoid layer reset
+        case KC_LEFT_CTRL ... KC_RIGHT_GUI:
+        case QK_MODS ... QK_MODS_MAX:
+            break;
+        // TO((AUTO_MOUSE_TARGET_LAYER))-------------------------------------------------------------------------------
+        case QK_TO ... QK_TO_MAX: // same proccessing as next
+        // TG((AUTO_MOUSE_TARGET_LAYER))-------------------------------------------------------------------------------
+        case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
+            if ((keycode & 0xff) == (AUTO_MOUSE_TARGET_LAYER)) {
+                if (!(record->event.pressed)) auto_mouse_toggle();
+            }
+            break;
+        // MO((AUTO_MOUSE_TARGET_LAYER))-------------------------------------------------------------------------------
+        case QK_MOMENTARY ... QK_MOMENTARY_MAX:
+            if ((keycode & 0xff) == (AUTO_MOUSE_TARGET_LAYER)) {
+                auto_mouse_keyevent(record->event.pressed);
+            }
+        // DF ---------------------------------------------------------------------------------------------------------
+        case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:
+#    ifndef NO_ACTION_ONESHOT
+        // OSL((AUTO_MOUSE_TARGET_LAYER))------------------------------------------------------------------------------
+        case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
+        case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
+#    endif
+            break;
+        // LM((AUTO_MOUSE_TARGET_LAYER), mod)--------------------------------------------------------------------------
+        case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
+            if (((keycode >> 8) & 0x0f) == (AUTO_MOUSE_TARGET_LAYER)) {
+                auto_mouse_keyevent(record->event.pressed);
+            }
+            break;
+            // TT((AUTO_MOUSE_TARGET_LAYER))---------------------------------------------------------------------------
+#    ifndef NO_ACTION_TAPPING
+        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
+            if ((keycode & 0xff) == (AUTO_MOUSE_TARGET_LAYER)) {
+                auto_mouse_keyevent(record->event.pressed);
+#        if TAPPING_TOGGLE != 0
+                if (record->tap.count == TAPPING_TOGGLE) {
+                    if (record->event.pressed) {
+                        auto_mouse_context.status.mouse_key_tracker--;
+                    } else {
+                        auto_mouse_toggle();
+                        auto_mouse_context.status.mouse_key_tracker++;
+                    }
+                }
+#        endif
+            }
+            break;
+        // LT((AUTO_MOUSE_TARGET_LAYER), kc)---------------------------------------------------------------------------
+        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+            if (!record->tap.count) {
+                if (((keycode >> 8) & 0x0f) == (AUTO_MOUSE_TARGET_LAYER)) {
+                    auto_mouse_keyevent(record->event.pressed);
+                }
+                break;
+            }
+        // MT(kc) only skip on hold
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+            if (!record->tap.count) break;
+#    endif
+        // QK_MODS goes to default
+        default:
+            // skip on no event
+            if (IS_NOEVENT(record->event)) break;
+            // check if keyrecord is mousekey
+            if (is_mouse_record(keycode, record)) {
+                auto_mouse_keyevent(record->event.pressed);
+            } else if (!is_auto_mouse_active()) {
+                // all non-mousekey presses restart delay timer and reset status
+                auto_mouse_reset_trigger(record->event.pressed);
+            }
+    }
+    if (auto_mouse_context.status.mouse_key_tracker < 0) {
+        auto_mouse_context.status.mouse_key_tracker = 0;
+        dprintf("key tracker error (<0) \n");
+    }
+    return true;
+}
+
+/**
+ * @brief Local function to handle checking if a keycode is a mouse button
+ *
+ * Starts code stack for checking keyrecord if defined as mousekey
+ *
+ * @params keycode[in] uint16_t
+ * @params record[in]  keyrecord_t pointer
+ * @return bool true: keyrecord is mousekey false: keyrecord is not mousekey
+ */
+static bool is_mouse_record(uint16_t keycode, keyrecord_t* record) {
+    // allow for keyboard to hook in and override if need be
+    if (is_mouse_record_kb(keycode, record) || IS_MOUSEKEY(keycode)) return true;
+    return false;
+}
+
+/**
+ * @brief Weakly defined keyboard level callback for adding keyrecords as mouse keys
+ *
+ * Meant for redefinition at keyboard level and should return is_mouse_record_user by default at end of function
+ *
+ * @params keycode[in] uint16_t
+ * @params record[in] keyrecord_t pointer
+ * @return bool true: keyrecord is defined as mouse key false: keyrecord is not defined as mouse key
+ */
+__attribute__((weak)) bool is_mouse_record_kb(uint16_t keycode, keyrecord_t* record) {
+    return is_mouse_record_user(keycode, record);
+}
+
+/**
+ * @brief Weakly defined keymap/user level callback for adding keyrecords as mouse keys
+ *
+ * Meant for redefinition at keymap/user level and should return false by default at end of function
+ *
+ * @params keycode[in] uint16_t
+ * @params record[in] keyrecord_t pointer
+ * @return bool true: keyrecord is defined as mouse key false: keyrecord is not defined as mouse key
+ */
+__attribute__((weak)) bool is_mouse_record_user(uint16_t keycode, keyrecord_t* record) {
+    return false;
+}
+
+#endif // POINTING_DEVICE_AUTO_MOUSE_ENABLE
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.h b/quantum/pointing_device/pointing_device_auto_mouse.h
new file mode 100644
index 0000000000..eaa6aa2c09
--- /dev/null
+++ b/quantum/pointing_device/pointing_device_auto_mouse.h
@@ -0,0 +1,87 @@
+/* Copyright 2022 Alabastard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 <string.h>
+
+#include "quantum.h"
+#include "pointing_device.h"
+#include "print.h"
+
+/* check settings and set defaults */
+#ifndef POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#    error "POINTING_DEVICE_AUTO_MOUSE_ENABLE not defined! check config settings"
+#endif
+
+#ifndef AUTO_MOUSE_DEFAULT_LAYER
+#    define AUTO_MOUSE_DEFAULT_LAYER 1
+#endif
+#ifndef AUTO_MOUSE_TIME
+#    define AUTO_MOUSE_TIME 650
+#endif
+#ifndef AUTO_MOUSE_DELAY
+    #define AUTO_MOUSE_DELAY GET_TAPPING_TERM(KC_MS_BTN1, &(keyrecord_t){})
+#endif
+#ifndef AUTO_MOUSE_DEBOUNCE
+#    define AUTO_MOUSE_DEBOUNCE 25
+#endif
+
+/* data structure */
+typedef struct {
+    struct {
+        bool    is_enabled;
+        uint8_t layer;
+    } config;
+    struct {
+        uint16_t active;
+        uint16_t delay;
+    } timer;
+    struct {
+        bool   is_activated;
+        bool   is_toggled;
+        int8_t mouse_key_tracker;
+    } status;
+} auto_mouse_context_t;
+
+/* ----------Set up and control------------------------------------------------------------------------------ */
+void          set_auto_mouse_enable(bool enable);                       // enable/disable auto mouse feature
+bool          get_auto_mouse_enable(void);                              // get auto_mouse_enable
+void          set_auto_mouse_layer(uint8_t layer);                      // set target layer by index
+uint8_t       get_auto_mouse_layer(void);                               // get target layer index
+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)
+
+/* ----------For custom pointing device activation----------------------------------------------------------- */
+bool auto_mouse_activation(report_mouse_t mouse_report); // handles pointing device trigger conditions for target layer activation (overwritable)
+
+/* ----------Handling keyevents------------------------------------------------------------------------------ */
+void auto_mouse_keyevent(bool pressed);      // trigger auto mouse keyevent: mouse_keytracker increment/decrement on press/release
+void auto_mouse_reset_trigger(bool pressed); // trigger non mouse keyevent: reset and start delay timer (DO NOT USE in layer_state_set stack!!)
+void auto_mouse_toggle(void);                // toggle mouse layer flag disables mouse layer deactivation while on (meant for tap toggle or toggle of target)
+bool get_auto_mouse_toggle(void);            // get toggle mouse layer flag value
+
+/* ----------Callbacks for adding keycodes to mouse record checking------------------------------------------ */
+bool is_mouse_record_kb(uint16_t keycode, keyrecord_t* record);
+bool is_mouse_record_user(uint16_t keycode, keyrecord_t* record);
+
+/* ----------Core functions (only used in custom pointing devices or key processing)------------------------- */
+void pointing_device_task_auto_mouse(report_mouse_t mouse_report); // add to pointing_device_task_*
+bool process_auto_mouse(uint16_t keycode, keyrecord_t* record);    // add to process_record_*
+
+/* ----------Macros/Aliases---------------------------------------------------------------------------------- */
+#define AUTO_MOUSE_TARGET_LAYER get_auto_mouse_layer()
+#define AUTO_MOUSE_ENABLED get_auto_mouse_enable()
diff --git a/quantum/pointing_device/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
index d7e0b90917..172c9f36d7 100644
--- a/quantum/pointing_device/pointing_device_drivers.c
+++ b/quantum/pointing_device/pointing_device_drivers.c
@@ -113,6 +113,15 @@ void cirque_pinnacle_configure_cursor_glide(float trigger_px) {
 #    endif
 
 #    if CIRQUE_PINNACLE_POSITION_MODE
+
+#        ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
+static bool is_touch_down;
+
+bool auto_mouse_activation(report_mouse_t mouse_report) {
+    return is_touch_down || mouse_report.x != 0 || mouse_report.y != 0 || mouse_report.h != 0 || mouse_report.v != 0 || mouse_report.buttons;
+}
+#        endif
+
 report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     pinnacle_data_t   touchData = cirque_pinnacle_read_data();
     mouse_xy_report_t report_x = 0, report_y = 0;
@@ -143,6 +152,10 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
         pd_dprintf("cirque_pinnacle touchData x=%4d y=%4d z=%2d\n", touchData.xValue, touchData.yValue, touchData.zValue);
     }
 
+#        ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
+    is_touch_down = touchData.touchDown;
+#        endif
+
     // Scale coordinates to arbitrary X, Y resolution
     cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 9f1d3502fb..ff36e14775 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -271,6 +271,9 @@ bool process_record_quantum(keyrecord_t *record) {
 #endif
 #if defined(VIA_ENABLE)
             process_record_via(keycode, record) &&
+#endif
+#if defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
+            process_auto_mouse(keycode, record) &&
 #endif
             process_record_kb(keycode, record) &&
 #if defined(SECURE_ENABLE)

From e3e0a35b5843f5f681d7f3730f843454b24aa7ca Mon Sep 17 00:00:00 2001
From: Matt Chan <5021+mattchan@users.noreply.github.com>
Date: Sat, 24 Sep 2022 03:03:07 -0400
Subject: [PATCH 412/959] kegen/gboy: Fix typo in readme.md; add labels to
 info.json and reformat for readability (#18269)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/kegen/gboy/info.json | 146 +++++++++++++++++----------------
 keyboards/kegen/gboy/readme.md |   2 +-
 2 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index 059dafd89b..880fd9611c 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -1,7 +1,8 @@
 {
     "keyboard_name": "Kegen G-Boy", 
-    "url": "", 
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kegen/gboy", 
     "maintainer": "@mattchan", 
+    "maintainer": "mattchan", 
     "usb": {
         "vid": "0x4B65",
         "pid": "0x6762",
@@ -10,81 +11,82 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"label": "GESC",  "x":0,      "y":0},
+                {"label": "1",     "x":1,      "y":0},
+                {"label": "2",     "x":2,      "y":0},
+                {"label": "3",     "x":3,      "y":0},
+                {"label": "4",     "x":4,      "y":0},
+                {"label": "5",     "x":5,      "y":0},
+                {"label": "6",     "x":6,      "y":0},
+                {"label": "7",     "x":7,      "y":0},
+                {"label": "8",     "x":8,      "y":0},
+                {"label": "9",     "x":9,      "y":0},
+                {"label": "0",     "x":10,     "y":0},
+                {"label": "MINS",  "x":11,     "y":0},
+                {"label": "EQL",   "x":12,     "y":0},
+                {"label": "BSPC",  "x":13,     "y":0},
+                {"label": "BSPC",  "x":14,     "y":0},
+                {"label": "HOME",  "x":15,     "y":0},
                 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"label": "TAB",   "x":0,      "y":1, "w":1.5},
+                {"label": "Q",     "x":1.5,    "y":1},
+                {"label": "W",     "x":2.5,    "y":1},
+                {"label": "E",     "x":3.5,    "y":1},
+                {"label": "R",     "x":4.5,    "y":1},
+                {"label": "T",     "x":5.5,    "y":1},
+                {"label": "Y",     "x":6.5,    "y":1},
+                {"label": "U",     "x":7.5,    "y":1},
+                {"label": "I",     "x":8.5,    "y":1},
+                {"label": "O",     "x":9.5,    "y":1},
+                {"label": "P",     "x":10.5,   "y":1},
+                {"label": "LBRC",  "x":11.5,   "y":1},
+                {"label": "RBRC",  "x":12.5,   "y":1},
+                {"label": "BSLS",  "x":13.5,   "y":1, "w":1.5},
+                {"label": "PGUP",  "x":15,     "y":1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
+                {"label": "CAPS",  "x":0,      "y":2, "w":1.75},
+                {"label": "A",     "x":1.75,   "y":2},
+                {"label": "S",     "x":2.75,   "y":2},
+                {"label": "D",     "x":3.75,   "y":2},
+                {"label": "F",     "x":4.75,   "y":2},
+                {"label": "G",     "x":5.75,   "y":2},
+                {"label": "H",     "x":6.75,   "y":2},
+                {"label": "J",     "x":7.75,   "y":2},
+                {"label": "K",     "x":8.75,   "y":2},
+                {"label": "L",     "x":9.75,   "y":2},
+                {"label": "SCLN",  "x":10.75,  "y":2},
+                {"label": "QUOT",  "x":11.75,  "y":2},
+                {"label": "BSLS",  "x":12.75,  "y":2},
+                {"label": "ENT",   "x":13.75,  "y":2, "w":1.25},
+                {"label": "PGDN",  "x":15,     "y":2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"label": "LSFT",  "x":0,      "y":3, "w":1.25},
+                {"label": "SLSH",  "x":1.25,   "y":3},
+                {"label": "Z",     "x":2.25,   "y":3},
+                {"label": "X",     "x":3.25,   "y":3},
+                {"label": "C",     "x":4.25,   "y":3},
+                {"label": "V",     "x":5.25,   "y":3},
+                {"label": "B",     "x":6.25,   "y":3},
+                {"label": "N",     "x":7.25,   "y":3},
+                {"label": "M",     "x":8.25,   "y":3},
+                {"label": "COMM",  "x":9.25,   "y":3},
+                {"label": "DOT",   "x":10.25,  "y":3},
+                {"label": "SLSH",  "x":11.25,  "y":3},
+                {"label": "RSFT",  "x":12.25,  "y":3, "w":1.75},
+                {"label": "UP",    "x":14,     "y":3},
+                {"label": "END",   "x":15,     "y":3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}]
+                {"label": "LCTL",   "x":0,     "y":4, "w":1.25},
+                {"label": "LGUI",   "x":1.25,  "y":4, "w":1.25},
+                {"label": "LALT",   "x":2.5,   "y":4, "w":1.25},
+                {"label": "SPC",    "x":3.75,  "y":4, "w":6.25},
+                {"label": "RALT",   "x":10,    "y":4},
+                {"label": "MO(1)",  "x":11,    "y":4},
+                {"label": "RCTL",   "x":12,    "y":4},
+                {"label": "LEFT",   "x":13,    "y":4},
+                {"label": "DOWN",   "x":14,    "y":4},
+                {"label": "RGHT",   "x":15,    "y":4}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/kegen/gboy/readme.md b/keyboards/kegen/gboy/readme.md
index 25ca760ff4..b636d0462d 100644
--- a/keyboards/kegen/gboy/readme.md
+++ b/keyboards/kegen/gboy/readme.md
@@ -6,7 +6,7 @@
 
 * Keyboard Maintainer: [Matt Chan](https://github.com/mattchan)
 * Hardware Supported: Kegen G-Boy
-* Hardware Availability: Unfortunately, there is no site for this, and the Kegen Discord is ghost town.
+* Hardware Availability: Unfortunately, there is no site for this, and the Kegen Discord is no longer active. The group buy runners appear to have disappeared after round two units were delivered.
 
 Make example for this keyboard (after setting up your build environment):
 

From df30327c19d15552f88af5ff65c0fa6c7245d77a Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sat, 24 Sep 2022 00:34:44 -0700
Subject: [PATCH 413/959] Format code according to conventions (#18466)

---
 quantum/pointing_device/pointing_device_auto_mouse.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/pointing_device/pointing_device_auto_mouse.h b/quantum/pointing_device/pointing_device_auto_mouse.h
index eaa6aa2c09..0f26af79e6 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.h
+++ b/quantum/pointing_device/pointing_device_auto_mouse.h
@@ -34,7 +34,7 @@
 #    define AUTO_MOUSE_TIME 650
 #endif
 #ifndef AUTO_MOUSE_DELAY
-    #define AUTO_MOUSE_DELAY GET_TAPPING_TERM(KC_MS_BTN1, &(keyrecord_t){})
+#    define AUTO_MOUSE_DELAY GET_TAPPING_TERM(KC_MS_BTN1, &(keyrecord_t){})
 #endif
 #ifndef AUTO_MOUSE_DEBOUNCE
 #    define AUTO_MOUSE_DEBOUNCE 25

From 6cf4af987616fa5270f0d9ab7ec6e2ba8712dda3 Mon Sep 17 00:00:00 2001
From: jun10000 <39115187+jun10000@users.noreply.github.com>
Date: Sat, 24 Sep 2022 16:38:43 +0900
Subject: [PATCH 414/959] [Keyboard] Add om60 rev1 keyboard (#18126)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jun10000 <jun1kbd@outlook.jp>
---
 keyboards/om60/config.h                 | 104 +++++++++++++++
 keyboards/om60/info.json                |  16 +++
 keyboards/om60/keymaps/default/keymap.c |  70 ++++++++++
 keyboards/om60/keymaps/default/rules.mk |   2 +
 keyboards/om60/keymaps/via/keymap.c     |  84 ++++++++++++
 keyboards/om60/keymaps/via/rules.mk     |   3 +
 keyboards/om60/matrix.c                 | 166 ++++++++++++++++++++++++
 keyboards/om60/om60.c                   |  19 +++
 keyboards/om60/om60.h                   |  41 ++++++
 keyboards/om60/readme.md                |  27 ++++
 keyboards/om60/rules.mk                 |  24 ++++
 11 files changed, 556 insertions(+)
 create mode 100644 keyboards/om60/config.h
 create mode 100644 keyboards/om60/info.json
 create mode 100644 keyboards/om60/keymaps/default/keymap.c
 create mode 100644 keyboards/om60/keymaps/default/rules.mk
 create mode 100644 keyboards/om60/keymaps/via/keymap.c
 create mode 100644 keyboards/om60/keymaps/via/rules.mk
 create mode 100644 keyboards/om60/matrix.c
 create mode 100644 keyboards/om60/om60.c
 create mode 100644 keyboards/om60/om60.h
 create mode 100644 keyboards/om60/readme.md
 create mode 100644 keyboards/om60/rules.mk

diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h
new file mode 100644
index 0000000000..624579be7e
--- /dev/null
+++ b/keyboards/om60/config.h
@@ -0,0 +1,104 @@
+/*
+Copyright 2021 Salicylic_Acid
+Copyright 2021 3araht
+Copyright 2022 jun10000
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+
+#ifndef RGBLED_NUM
+  #define RGBLED_NUM 69
+  #define RGBLIGHT_LED_MAP { \
+       0,    1, 2, 3, \
+       8, 7, 6, 5, 4, \
+       9,10,11,12,13, \
+      18,17,16,15,14, \
+      19,20,21,22,23, \
+      28,27,26,25,24, \
+      29,30,31,32,33, \
+      38,37,36,35,34, \
+      39,40,41,42,43, \
+      48,47,46,45,44, \
+      49,50,51,52,53, \
+      58,57,56,55,54, \
+      59,60,61,62,63, \
+      68,67,66,65,64  \
+  }
+
+  #define RGBLIGHT_SLEEP
+#endif
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#ifndef IOS_DEVICE_ENABLE
+  #define RGBLIGHT_LIMIT_VAL 90
+  #define RGBLIGHT_VAL_STEP 17
+#else
+  #define RGBLIGHT_LIMIT_VAL 30
+  #define RGBLIGHT_VAL_STEP 4
+#endif
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+
+#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
+// USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
+//  120  RGBoff, OLEDoff
+//  120  OLED
+//  330  RGB 6
+//  300  RGB 32
+//  310  OLED & RGB 32
+  #define USB_MAX_POWER_CONSUMPTION 400
+#else
+  // fix iPhone and iPad power adapter issue
+  // iOS device need lessthan 100
+  #define USB_MAX_POWER_CONSUMPTION 100
+#endif
+
+#define TAP_CODE_DELAY 10
+
+#define ENCODERS_PAD_A { B4 }
+#define ENCODERS_PAD_B { B5 }
diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json
new file mode 100644
index 0000000000..319dca0071
--- /dev/null
+++ b/keyboards/om60/info.json
@@ -0,0 +1,16 @@
+{
+  "keyboard_name": "OM60", 
+  "manufacturer": "jun10000",
+  "url": "https://github.com/jun10000", 
+  "maintainer": "jun10000", 
+  "usb": {
+      "vid": "0x6A6E",
+      "pid": "0x0001",
+      "device_version": "1.0.0"
+  },
+  "layouts": {
+      "LAYOUT": {
+          "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"4,0", "x":1.5, "y":0}, {"label":"4,1", "x":2.5, "y":0}, {"label":"4,2", "x":3.5, "y":0}, {"label":"4,3", "x":4.5, "y":0}, {"label":"4,4", "x":5.5, "y":0}, {"label":"4,5", "x":6.5, "y":0}, {"label":"4,6", "x":7.5, "y":0}, {"label":"4,7", "x":8.5, "y":0}, {"label":"9,0", "x":9.5, "y":0}, {"label":"9,1", "x":10.5, "y":0}, {"label":"9,2", "x":11.5, "y":0}, {"label":"9,3", "x":12.5, "y":0}, {"label":"9,4", "x":13.5, "y":0}, {"label":"0,1", "x":1.5, "y":1}, {"label":"0,2", "x":2.5, "y":1}, {"label":"0,3", "x":3.5, "y":1}, {"label":"0,4", "x":4.5, "y":1}, {"label":"0,5", "x":5.5, "y":1}, {"label":"0,6", "x":6.5, "y":1}, {"label":"0,7", "x":7.5, "y":1}, {"label":"5,0", "x":8.5, "y":1}, {"label":"5,1", "x":9.5, "y":1}, {"label":"5,2", "x":10.5, "y":1}, {"label":"5,3", "x":11.5, "y":1}, {"label":"5,4", "x":12.5, "y":1}, {"label":"5,5", "x":13.5, "y":1}, {"label":"1,0", "x":0, "y":2}, {"label":"1,1", "x":1.5, "y":2}, {"label":"1,2", "x":2.5, "y":2}, {"label":"1,3", "x":3.5, "y":2}, {"label":"1,4", "x":4.5, "y":2}, {"label":"1,5", "x":5.5, "y":2}, {"label":"1,6", "x":6.5, "y":2}, {"label":"1,7", "x":7.5, "y":2}, {"label":"6,0", "x":8.5, "y":2}, {"label":"6,1", "x":9.5, "y":2}, {"label":"6,2", "x":10.5, "y":2}, {"label":"6,3", "x":11.5, "y":2}, {"label":"6,4", "x":12.5, "y":2}, {"label":"6,5", "x":13.5, "y":2}, {"label":"2,0", "x":0, "y":3}, {"label":"2,1", "x":1.5, "y":3}, {"label":"2,2", "x":2.5, "y":3}, {"label":"2,3", "x":3.5, "y":3}, {"label":"2,4", "x":4.5, "y":3}, {"label":"2,5", "x":5.5, "y":3}, {"label":"2,6", "x":6.5, "y":3}, {"label":"2,7", "x":7.5, "y":3}, {"label":"7,0", "x":8.5, "y":3}, {"label":"7,1", "x":9.5, "y":3}, {"label":"7,2", "x":10.5, "y":3}, {"label":"7,3", "x":11.5, "y":3}, {"label":"7,4", "x":12.5, "y":3}, {"label":"7,5", "x":13.5, "y":3}, {"label":"3,0", "x":0, "y":4}, {"label":"3,1", "x":1.5, "y":4}, {"label":"3,2", "x":2.5, "y":4}, {"label":"3,3", "x":3.5, "y":4}, {"label":"3,4", "x":4.5, "y":4}, {"label":"3,5", "x":5.5, "y":4}, {"label":"3,6", "x":6.5, "y":4}, {"label":"3,7", "x":7.5, "y":4}, {"label":"8,0", "x":8.5, "y":4}, {"label":"8,1", "x":9.5, "y":4}, {"label":"8,2", "x":10.5, "y":4}, {"label":"8,3", "x":11.5, "y":4}, {"label":"8,4", "x":12.5, "y":4}, {"label":"8,5", "x":13.5, "y":4}]
+      }
+  }
+}
\ No newline at end of file
diff --git a/keyboards/om60/keymaps/default/keymap.c b/keyboards/om60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..336b98d3bf
--- /dev/null
+++ b/keyboards/om60/keymaps/default/keymap.c
@@ -0,0 +1,70 @@
+/*
+Copyright 2021 Salicylic_Acid
+Copyright 2021 3araht
+Copyright 2022 jun10000
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------------------------------------------------------------------------------.
+      KC_MUTE,  KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+                KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(0),  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,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(1), KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(2),KC_LCTRL, KC_LGUI, KC_LALT,  KC_DEL, KC_LBRC,  KC_SPC,  KC_SPC, KC_RBRC, KC_RALT, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------------------------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------------------------------------------------------------------------------.
+      _______,  KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______, _______, _______, _______, _______, KC_SLSH, KC_ASTR, KC_MINS, KC_PLUS, KC_BSPC, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(0), _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_EQL, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DOT,  KC_ENT, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  //|-----------------------------------------------------------------------------------------------------------------------------'
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  EE_CLR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______,   KC_UP, _______, _______, _______,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(0), _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  //|-----------------------------------------------------------------------------------------------------------------------------'
+  )
+};
diff --git a/keyboards/om60/keymaps/default/rules.mk b/keyboards/om60/keymaps/default/rules.mk
new file mode 100644
index 0000000000..8acf3d642b
--- /dev/null
+++ b/keyboards/om60/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/om60/keymaps/via/keymap.c b/keyboards/om60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..beb4ab962b
--- /dev/null
+++ b/keyboards/om60/keymaps/via/keymap.c
@@ -0,0 +1,84 @@
+/*
+Copyright 2021 Salicylic_Acid
+Copyright 2021 3araht
+Copyright 2022 jun10000
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------------------------------------------------------------------------------.
+      KC_MUTE,  KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+                KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(0),  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,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(1), KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(2),KC_LCTRL, KC_LGUI, KC_LALT,  KC_DEL, KC_LBRC,  KC_SPC,  KC_SPC, KC_RBRC, KC_RALT, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------------------------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------------------------------------------------------------------------------.
+      _______,  KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______, _______, _______, _______, _______, KC_SLSH, KC_ASTR, KC_MINS, KC_PLUS, KC_BSPC, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(0), _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_EQL, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DOT,  KC_ENT, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  //|-----------------------------------------------------------------------------------------------------------------------------'
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  EE_CLR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______,   KC_UP, _______, _______, _______,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(0), _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  //|-----------------------------------------------------------------------------------------------------------------------------'
+  ),
+  [3] = LAYOUT(
+  //,-----------------------------------------------------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(0), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  //|-----------------------------------------------------------------------------------------------------------------------------'
+  )
+};
diff --git a/keyboards/om60/keymaps/via/rules.mk b/keyboards/om60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1189f4ad19
--- /dev/null
+++ b/keyboards/om60/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/om60/matrix.c b/keyboards/om60/matrix.c
new file mode 100644
index 0000000000..3686780468
--- /dev/null
+++ b/keyboards/om60/matrix.c
@@ -0,0 +1,166 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+Copyright 2022 jun10000
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You 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"
+
+#if (MATRIX_COLS <= 8)
+#    define ROW_SHIFTER ((uint8_t)1)
+#elif (MATRIX_COLS <= 16)
+#    define ROW_SHIFTER ((uint16_t)1)
+#elif (MATRIX_COLS <= 32)
+#    define ROW_SHIFTER  ((uint32_t)1)
+#endif
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static void select_row(uint8_t row)
+{
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row)
+{
+    setPinInputHigh(row_pins[row]);
+}
+
+static void unselect_rows(void)
+{
+    for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void select_col(uint8_t col)
+{
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col)
+{
+    setPinInputHigh(col_pins[col]);
+}
+
+static void unselect_cols(void)
+{
+    for(uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+  unselect_rows();
+  unselect_cols();
+  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    setPinInputHigh(col_pins[x]);
+  }
+  for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+    setPinInputHigh(row_pins[x]);
+  }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+{
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    wait_us(30);
+
+    // For each col...
+    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+{
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    wait_us(30);
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
+    {
+        uint8_t tmp = row_index + MATRIX_ROWS/2;
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[tmp];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0)
+        {
+            // Pin LO, set col bit
+            current_matrix[tmp] |= (ROW_SHIFTER << current_col);
+        }
+        else
+        {
+            // Pin HI, clear col bit
+            current_matrix[tmp] &= ~(ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[])
+{
+  bool changed = false;
+
+  // Set row, read cols
+  for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
+    changed |= read_cols_on_row(current_matrix, current_row);
+  }
+  //else
+  // Set col, read rows
+  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    changed |= read_rows_on_col(current_matrix, current_col);
+  }
+  
+  return (uint8_t)changed;
+}
diff --git a/keyboards/om60/om60.c b/keyboards/om60/om60.c
new file mode 100644
index 0000000000..9e66d6721c
--- /dev/null
+++ b/keyboards/om60/om60.c
@@ -0,0 +1,19 @@
+/*
+Copyright 2021 Salicylic_Acid
+Copyright 2022 jun10000
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "om60.h"
diff --git a/keyboards/om60/om60.h b/keyboards/om60/om60.h
new file mode 100644
index 0000000000..669a610031
--- /dev/null
+++ b/keyboards/om60/om60.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2021 Salicylic_Acid
+Copyright 2022 jun10000
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    L01, L05, L10, L15, L20, L25, L30, L35, L40, R45, R50, R55, R60, R65, \
+         L06, L11, L16, L21, L26, L31, L36, R41, R46, R51, R56, R61, R66, \
+    L02, L07, L12, L17, L22, L27, L32, L37, R42, R47, R52, R57, R62, R67, \
+    L03, L08, L13, L18, L23, L28, L33, L38, R43, R48, R53, R58, R63, R68, \
+    L04, L09, L14, L19, L24, L29, L34, L39, R44, R49, R54, R59, R64, R69  \
+  ) \
+  { \
+    {   L01,   L06,   L11,   L16,   L21,   L26,   L31,   L36 }, \
+    {   L02,   L07,   L12,   L17,   L22,   L27,   L32,   L37 }, \
+    {   L03,   L08,   L13,   L18,   L23,   L28,   L33,   L38 }, \
+    {   L04,   L09,   L14,   L19,   L24,   L29,   L34,   L39 }, \
+    {   L05,   L10,   L15,   L20,   L25,   L30,   L35,   L40 }, \
+    {   R41,   R46,   R51,   R56,   R61,   R66, KC_NO, KC_NO }, \
+    {   R42,   R47,   R52,   R57,   R62,   R67, KC_NO, KC_NO }, \
+    {   R43,   R48,   R53,   R58,   R63,   R68, KC_NO, KC_NO }, \
+    {   R44,   R49,   R54,   R59,   R64,   R69, KC_NO, KC_NO }, \
+    {   R45,   R50,   R55,   R60,   R65, KC_NO, KC_NO, KC_NO }  \
+  }
diff --git a/keyboards/om60/readme.md b/keyboards/om60/readme.md
new file mode 100644
index 0000000000..5d9d096d56
--- /dev/null
+++ b/keyboards/om60/readme.md
@@ -0,0 +1,27 @@
+# OM60
+
+![OM60](https://i.imgur.com/WoO8oezh.jpg)
+
+The 60% Poker compatible Ortholinear keyboard or jumbo Macropad.
+
+* Keyboard Maintainer: [jun10000](https://github.com/jun10000)
+* Hardware Supported: OM60 PCB, Pro Micro
+* Hardware Availability: [junsgamingstore.booth.pm](https://junsgamingstore.booth.pm/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make om60:default
+
+Flashing example for this keyboard:
+
+    make om60:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/om60/rules.mk b/keyboards/om60/rules.mk
new file mode 100644
index 0000000000..9dc673edbf
--- /dev/null
+++ b/keyboards/om60/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes
+
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c

From fe9c1d8e456c293166ff8664ff280710eb5aa416 Mon Sep 17 00:00:00 2001
From: lunatic <56441863+lunaticwhat@users.noreply.github.com>
Date: Sat, 24 Sep 2022 20:58:03 +0700
Subject: [PATCH 415/959] [Keyboard] add CherryB CB65 (#18356)

---
 keyboards/cherrybstudio/cb65/cb65.c           | 14 +++
 keyboards/cherrybstudio/cb65/cb65.h           | 35 ++++++++
 keyboards/cherrybstudio/cb65/config.h         | 68 +++++++++++++++
 keyboards/cherrybstudio/cb65/info.json        | 87 +++++++++++++++++++
 .../cb65/keymaps/default/keymap.c             | 32 +++++++
 .../cb65/keymaps/default/readme.md            |  1 +
 .../cherrybstudio/cb65/keymaps/via/keymap.c   | 49 +++++++++++
 .../cherrybstudio/cb65/keymaps/via/rules.mk   |  2 +
 keyboards/cherrybstudio/cb65/readme.md        | 26 ++++++
 keyboards/cherrybstudio/cb65/rules.mk         | 19 ++++
 10 files changed, 333 insertions(+)
 create mode 100644 keyboards/cherrybstudio/cb65/cb65.c
 create mode 100644 keyboards/cherrybstudio/cb65/cb65.h
 create mode 100644 keyboards/cherrybstudio/cb65/config.h
 create mode 100644 keyboards/cherrybstudio/cb65/info.json
 create mode 100644 keyboards/cherrybstudio/cb65/keymaps/default/keymap.c
 create mode 100644 keyboards/cherrybstudio/cb65/keymaps/default/readme.md
 create mode 100644 keyboards/cherrybstudio/cb65/keymaps/via/keymap.c
 create mode 100644 keyboards/cherrybstudio/cb65/keymaps/via/rules.mk
 create mode 100644 keyboards/cherrybstudio/cb65/readme.md
 create mode 100644 keyboards/cherrybstudio/cb65/rules.mk

diff --git a/keyboards/cherrybstudio/cb65/cb65.c b/keyboards/cherrybstudio/cb65/cb65.c
new file mode 100644
index 0000000000..4ff1006adf
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/cb65.c
@@ -0,0 +1,14 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "cb65.h"
diff --git a/keyboards/cherrybstudio/cb65/cb65.h b/keyboards/cherrybstudio/cb65/cb65.h
new file mode 100644
index 0000000000..c17df211da
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/cb65.h
@@ -0,0 +1,35 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K100, K101, K102, K103, K104, K105, K106, K107,  \
+    K200,   K201, K202, K203, K204, K205, K206, K207, K300, K301, K302, K303, K304,   K305,   K306,  \
+    K307,     K400, K401, K402, K403, K404, K405, K406, K407, K500, K501, K502, K503,  K504,  K505,  \
+    K506, K507, K600, K601, K602, K603, K604, K605, K606, K607, K700, K701, K702,    K703,    K704,  \
+    K705,  K706,  K707,                     K800,                    K801,  K802, K803, K804, K805   \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407 }, \
+	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507 }, \
+	{ K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607 }, \
+	{ K700,  K701,  K702,  K703,  K704,  K705,  K706,  K707 }, \
+	{ K800,  K801,  K802,  K803,  K804,  K805               }  \
+}
+
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
new file mode 100644
index 0000000000..d5a644ef8c
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -0,0 +1,68 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 8
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ *                        0   1   2   3   4   5   6   7   8
+*/
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, F7, B5, B6, C6 }
+
+/* Encoder configuration */
+//#define ENCODERS_PAD_A { F5 }
+//#define ENCODERS_PAD_B { F6 }
+//#define ENCODER_RESOLUTION 4
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN F1
+#define LED_SCROLL_LOCK_PIN F4
+#define LED_PIN_ON_STATE 0
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* RGB Lighting */
+#define RGB_DI_PIN F0
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 24
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
new file mode 100644
index 0000000000..976b0b2e33
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "CherryB CB65",
+    "manufacturer": "CherryB Works",
+    "url": "https://discord.gg/qVwv3gcq83",
+    "maintainer": "lunaticwhat",
+    "usb": {
+        "vid": "0x4342",
+        "pid": "0x6565",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2, "w":1.25},
+                {"x":15, "y":2},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cherrybstudio/cb65/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c506bf5f4e
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, QK_BOOT,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU, KC_PGDN,
+        KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+
+};
diff --git a/keyboards/cherrybstudio/cb65/keymaps/default/readme.md b/keyboards/cherrybstudio/cb65/keymaps/default/readme.md
new file mode 100644
index 0000000000..af21c876db
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for CB65
diff --git a/keyboards/cherrybstudio/cb65/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..55ea2d24f6
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Tybera
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, QK_BOOT,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU, KC_PGDN,
+        KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
+
+
diff --git a/keyboards/cherrybstudio/cb65/keymaps/via/rules.mk b/keyboards/cherrybstudio/cb65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/cherrybstudio/cb65/readme.md b/keyboards/cherrybstudio/cb65/readme.md
new file mode 100644
index 0000000000..7b8f4da201
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/readme.md
@@ -0,0 +1,26 @@
+# CherryB Works CB65
+
+![CB65](https://i.imgur.com/3qopFIWh.jpg)
+
+An universal 65 percents PCB for many keyboard with USB daughterboard 
+Board has a rotary encoder but disabled for VIA support.
+
+* Keyboard Maintainer: lunaticwhat
+* Hardware Supported: CB65, atmega32u4
+* Hardware Availability: [CherryB Studio](https://discord.gg/qVwv3gcq83)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cherrybstudio/cb65:default
+
+Flashing example for this keyboard:
+
+    make cherrybstudio/cb65:default:flash
+
+## Accessing Bootloader Mode
+
+To access Bootloader Mode, do one of the following:
+
+* Hold the top left key of the keyboard while connecting the USB cable
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/cherrybstudio/cb65/rules.mk b/keyboards/cherrybstudio/cb65/rules.mk
new file mode 100644
index 0000000000..e5386c142d
--- /dev/null
+++ b/keyboards/cherrybstudio/cb65/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no		# Encoder support

From 45cc7f1e94e2eeee2a25195fcb7719d08570272d Mon Sep 17 00:00:00 2001
From: takashicompany <t@kashi.company>
Date: Sat, 24 Sep 2022 23:05:53 +0900
Subject: [PATCH 416/959] [Keyboard] Add GOAT51 (#18220)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/takashicompany/goat51/info.json     | 498 ++++++++++++++++++
 .../goat51/keymaps/default/keymap.c           | 123 +++++
 .../goat51/keymaps/via/config.h               |   6 +
 .../goat51/keymaps/via/keymap.c               | 106 ++++
 .../goat51/keymaps/via/rules.mk               |   2 +
 keyboards/takashicompany/goat51/readme.md     |  40 ++
 keyboards/takashicompany/goat51/rules.mk      |   1 +
 7 files changed, 776 insertions(+)
 create mode 100644 keyboards/takashicompany/goat51/info.json
 create mode 100644 keyboards/takashicompany/goat51/keymaps/default/keymap.c
 create mode 100644 keyboards/takashicompany/goat51/keymaps/via/config.h
 create mode 100644 keyboards/takashicompany/goat51/keymaps/via/keymap.c
 create mode 100644 keyboards/takashicompany/goat51/keymaps/via/rules.mk
 create mode 100644 keyboards/takashicompany/goat51/readme.md
 create mode 100644 keyboards/takashicompany/goat51/rules.mk

diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json
new file mode 100644
index 0000000000..b87b08161e
--- /dev/null
+++ b/keyboards/takashicompany/goat51/info.json
@@ -0,0 +1,498 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "GOAT51",
+    "maintainer": "takashicompany",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": [
+            "D4",
+            "C6",
+            "D7",
+            "E6",
+            "B4",
+            "B5",
+            "D2"
+        ],
+        "rows": [
+            "F4",
+            "F5",
+            "F6",
+            "F7",
+            "B1",
+            "B3",
+            "B2",
+            "B6"
+        ]
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D1", "pin_b": "D0" }
+         ]
+    },
+    "url": "https://github.com/takashicompany/goat51",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0029",
+        "vid": "0x7463"
+    },
+    "rgblight": {
+        "led_count": 11,
+        "pin": "D3",
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "matrix": [
+                        0,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 0.5
+                },
+                {
+                    "matrix": [
+                        0,
+                        1
+                    ],
+                    "x": 1,
+                    "y": 0.5
+                },
+                {
+                    "matrix": [
+                        0,
+                        2
+                    ],
+                    "x": 2,
+                    "y": 0.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        3
+                    ],
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        4
+                    ],
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        5
+                    ],
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        4,
+                        1
+                    ],
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        4,
+                        2
+                    ],
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        4,
+                        3
+                    ],
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        4,
+                        4
+                    ],
+                    "x": 13,
+                    "y": 0.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        5
+                    ],
+                    "x": 14,
+                    "y": 0.5
+                },
+                {
+                    "matrix": [
+                        4,
+                        6
+                    ],
+                    "x": 15,
+                    "y": 0.5
+                },
+                {
+                    "matrix": [
+                        1,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 1.5
+                },
+                {
+                    "matrix": [
+                        1,
+                        1
+                    ],
+                    "x": 1,
+                    "y": 1.5
+                },
+                {
+                    "matrix": [
+                        1,
+                        2
+                    ],
+                    "x": 2,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        3
+                    ],
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "matrix": [
+                        1,
+                        4
+                    ],
+                    "x": 4,
+                    "y": 1
+                },
+                {
+                    "matrix": [
+                        1,
+                        5
+                    ],
+                    "x": 5,
+                    "y": 1
+                },
+                {
+                    "matrix": [
+                        1,
+                        6
+                    ],
+                    "x": 7.5,
+                    "y": 0.5
+                },
+                {
+                    "matrix": [
+                        5,
+                        1
+                    ],
+                    "x": 10,
+                    "y": 1
+                },
+                {
+                    "matrix": [
+                        5,
+                        2
+                    ],
+                    "x": 11,
+                    "y": 1
+                },
+                {
+                    "matrix": [
+                        5,
+                        3
+                    ],
+                    "x": 12,
+                    "y": 1
+                },
+                {
+                    "matrix": [
+                        5,
+                        4
+                    ],
+                    "x": 13,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        5
+                    ],
+                    "x": 14,
+                    "y": 1.5
+                },
+                {
+                    "matrix": [
+                        5,
+                        6
+                    ],
+                    "x": 15,
+                    "y": 1.5
+                },
+                {
+                    "matrix": [
+                        2,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 2.5
+                },
+                {
+                    "matrix": [
+                        2,
+                        1
+                    ],
+                    "x": 1,
+                    "y": 2.5
+                },
+                {
+                    "matrix": [
+                        2,
+                        2
+                    ],
+                    "x": 2,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        3
+                    ],
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "matrix": [
+                        2,
+                        4
+                    ],
+                    "x": 4,
+                    "y": 2
+                },
+                {
+                    "matrix": [
+                        2,
+                        5
+                    ],
+                    "x": 5,
+                    "y": 2
+                },
+                {
+                    "matrix": [
+                        6,
+                        1
+                    ],
+                    "x": 10,
+                    "y": 2
+                },
+                {
+                    "matrix": [
+                        6,
+                        2
+                    ],
+                    "x": 11,
+                    "y": 2
+                },
+                {
+                    "matrix": [
+                        6,
+                        3
+                    ],
+                    "x": 12,
+                    "y": 2
+                },
+                {
+                    "matrix": [
+                        6,
+                        4
+                    ],
+                    "x": 13,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        5
+                    ],
+                    "x": 14,
+                    "y": 2.5
+                },
+                {
+                    "matrix": [
+                        6,
+                        6
+                    ],
+                    "x": 15,
+                    "y": 2.5
+                },
+                {
+                    "matrix": [
+                        3,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 3.5
+                },
+                {
+                    "matrix": [
+                        3,
+                        1
+                    ],
+                    "x": 1,
+                    "y": 3.5
+                },
+                {
+                    "matrix": [
+                        3,
+                        2
+                    ],
+                    "x": 2,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        3
+                    ],
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        3,
+                        4
+                    ],
+                    "x": 4,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        3,
+                        5
+                    ],
+                    "x": 5,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        3,
+                        6
+                    ],
+                    "x": 6,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        7,
+                        0
+                    ],
+                    "x": 9,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        7,
+                        1
+                    ],
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        7,
+                        2
+                    ],
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        7,
+                        3
+                    ],
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "matrix": [
+                        7,
+                        4
+                    ],
+                    "x": 13,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        5
+                    ],
+                    "x": 14,
+                    "y": 3.5
+                },
+                {
+                    "matrix": [
+                        7,
+                        6
+                    ],
+                    "x": 15,
+                    "y": 3.5
+                },
+                {
+                    "matrix": [
+                        0,
+                        6
+                    ],
+                    "x": 7,
+                    "y": 1.5
+                },
+                {
+                    "matrix": [
+                        4,
+                        0
+                    ],
+                    "x": 8,
+                    "y": 1.5
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/takashicompany/goat51/keymaps/default/keymap.c b/keyboards/takashicompany/goat51/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4e2c0e2d57
--- /dev/null
+++ b/keyboards/takashicompany/goat51/keymaps/default/keymap.c
@@ -0,0 +1,123 @@
+// Copyright 2022 takashicompany (@takashicompany)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    GOAT51 = SAFE_RANGE,
+    WEB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // 0: JIS-Alphabet
+    LAYOUT(
+        KC_ESC, 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_LCTL, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, GOAT51, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_ENT,
+        KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_DEL,
+        TG(6), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+        KC_PGDN, KC_PGUP
+    ),
+
+    // 1: JIS-Num
+    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, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, GOAT51, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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: JIS-Shift-Num
+    LAYOUT(
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), KC_TRNS,
+        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), GOAT51, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS
+    ),
+    
+    // 3: US-Alphabet
+    LAYOUT(
+        KC_TRNS, 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_TRNS, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, GOAT51, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_TRNS,
+        TG(6), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+        KC_PGDN, KC_PGUP
+    ),
+    
+    // 4: US-Num
+    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_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, GOAT51, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, KC_TRNS,
+        KC_TRNS, LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS
+    ),
+    
+    // 5: US-Shift-Num
+    LAYOUT(
+        KC_TRNS, KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TRNS,
+        KC_TRNS, KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, GOAT51, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS
+    ),
+    
+    // 6: Cursor
+    LAYOUT(
+        KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PAST, KC_PCMM, GOAT51, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_P1), KC_P2, KC_P3, KC_PMNS, KC_KP_EQUAL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        TG(6), 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
+    ), 
+    
+    // 7: Function
+    LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, GOAT51, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
+        KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(8), MO(9), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS
+    ),
+    
+    // 8: LED
+    LAYOUT(
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, DF(0), DF(3), KC_TRNS,
+        KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, GOAT51, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, 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
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case GOAT51:
+            if (record->event.pressed) {
+                SEND_STRING("GOAT51");
+                rgblight_toggle();
+            }
+            return false;
+
+        case WEB:
+            if (record->event.pressed) {
+                SEND_STRING("github.com/takashicompany/goat51");
+            }
+            return false;
+    }
+    
+    return true;
+}
+
+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 true;
+}
\ No newline at end of file
diff --git a/keyboards/takashicompany/goat51/keymaps/via/config.h b/keyboards/takashicompany/goat51/keymaps/via/config.h
new file mode 100644
index 0000000000..dc91fa69c2
--- /dev/null
+++ b/keyboards/takashicompany/goat51/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 takashicompany (@takashicompany)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 7
\ No newline at end of file
diff --git a/keyboards/takashicompany/goat51/keymaps/via/keymap.c b/keyboards/takashicompany/goat51/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6adb87dc32
--- /dev/null
+++ b/keyboards/takashicompany/goat51/keymaps/via/keymap.c
@@ -0,0 +1,106 @@
+// Copyright 2022 takashicompany (@takashicompany)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    GOAT51 = SAFE_RANGE,
+    WEB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // 0: JIS-Alphabet
+    LAYOUT(
+        KC_ESC, LT(4, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        KC_LCTL, KC_A, KC_S, LT(3, KC_D), KC_F, KC_G, GOAT51, KC_H, KC_J, LT(3, KC_K), KC_L, KC_ENT, KC_ENT,
+        KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_DEL,
+        TG(3), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+        KC_PGDN, KC_PGUP
+    ),
+
+    // 1: JIS-Num
+    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, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, GOAT51, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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: JIS-Shift-Num
+    LAYOUT(
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), KC_TRNS,
+        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), GOAT51, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS
+    ),
+    
+    // 3: Cursor
+    LAYOUT(
+        KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PAST, KC_PCMM, GOAT51, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_P1), KC_P2, KC_P3, KC_PMNS, KC_KP_EQUAL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        TG(3), 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
+    ), 
+    
+    // 4: Function
+    LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, GOAT51, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
+        KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(5), MO(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_TRNS,
+        KC_TRNS, KC_TRNS
+    ),
+    
+    // 5: LED
+    LAYOUT(
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, GOAT51, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, 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
+    ),
+
+    LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS
+    ),
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case GOAT51:
+            if (record->event.pressed) {
+                SEND_STRING("GOAT51");
+                rgblight_toggle();
+            }
+            return false;
+
+        case WEB:
+            if (record->event.pressed) {
+                SEND_STRING("github.com/takashicompany/goat51");
+            }
+            return false;
+    }
+    
+    return true;
+}
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+    { 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) },
+    { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/takashicompany/goat51/keymaps/via/rules.mk b/keyboards/takashicompany/goat51/keymaps/via/rules.mk
new file mode 100644
index 0000000000..4253f570f0
--- /dev/null
+++ b/keyboards/takashicompany/goat51/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashicompany/goat51/readme.md b/keyboards/takashicompany/goat51/readme.md
new file mode 100644
index 0000000000..b2edaa157e
--- /dev/null
+++ b/keyboards/takashicompany/goat51/readme.md
@@ -0,0 +1,40 @@
+# 🐐 GOAT51
+
+![takashicompany/GOAT51](https://i.imgur.com/7xD9a4zh.jpg)
+
+GOAT51は51キーのキーボードです。
+特徴的な放射状のキーレイアウトは指を自然に置くことができ、効率的な入力が可能です。
+MX互換のキースイッチとChoc v1キースイッチの取り付けに対応しております。
+またPCBにキースイッチソケットを取り付けることが可能で、容易にキースイッチの交換ができます。
+キーボードの中央にはお気に入りのキーキャップを取り付ける専用スペースがあり、アルチザンキーキャップやお気に入りのキーキャップを飾ることができます。
+実はそこにはロータリーエンコーダを置くこともできちゃいます。
+
+---
+GOAT51 is a 51-key keyboard.
+The distinctive radial key layout allows the fingers to be placed naturally for efficient typing.
+It supports the installation of MX compatible key switches and Choc v1 key switches.
+A key switch socket can also be installed on the PCB for easy keyswitch replacement.
+There is a dedicated space in the center of the keyboard for mounting your favorite keycaps, allowing you to display Artisan keycaps or your favorite keycaps.
+In fact, you can even place a rotary encoder there.
+
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
+* Hardware Supported: GOAT51 PCB, Pro Micro
+* Hardware Availability: https://github.com/takashicompany/goat51
+
+Make example for this keyboard (after setting up your build environment):
+
+    make takashicompany/goat51:default
+
+Flashing example for this keyboard:
+
+    make takashicompany/goat51:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/goat51/rules.mk b/keyboards/takashicompany/goat51/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/takashicompany/goat51/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 3072feb8ed79c861a0066ec6721669dec6f6309f Mon Sep 17 00:00:00 2001
From: Steven Karrmann <skarrmann@gmail.com>
Date: Sat, 24 Sep 2022 11:35:37 -0400
Subject: [PATCH 417/959] [Keyboard] Add Janus keyboard (#18367)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/janus/config.h                  | 16 +++++
 keyboards/janus/halconf.h                 |  9 +++
 keyboards/janus/info.json                 | 75 +++++++++++++++++++++++
 keyboards/janus/keymaps/default/keymap.c  | 50 +++++++++++++++
 keyboards/janus/keymaps/default/readme.md | 13 ++++
 keyboards/janus/mcuconf.h                 |  9 +++
 keyboards/janus/readme.md                 | 27 ++++++++
 keyboards/janus/rules.mk                  |  1 +
 8 files changed, 200 insertions(+)
 create mode 100644 keyboards/janus/config.h
 create mode 100644 keyboards/janus/halconf.h
 create mode 100644 keyboards/janus/info.json
 create mode 100644 keyboards/janus/keymaps/default/keymap.c
 create mode 100644 keyboards/janus/keymaps/default/readme.md
 create mode 100644 keyboards/janus/mcuconf.h
 create mode 100644 keyboards/janus/readme.md
 create mode 100644 keyboards/janus/rules.mk

diff --git a/keyboards/janus/config.h b/keyboards/janus/config.h
new file mode 100644
index 0000000000..8124f0db57
--- /dev/null
+++ b/keyboards/janus/config.h
@@ -0,0 +1,16 @@
+// Copyright 2022 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* Serial communication */
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+
+/* Double tap reset button to enter bootloader */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
\ No newline at end of file
diff --git a/keyboards/janus/halconf.h b/keyboards/janus/halconf.h
new file mode 100644
index 0000000000..550a6e0abf
--- /dev/null
+++ b/keyboards/janus/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <halconf.h>
+
+#undef HAL_USE_SIO
+#define HAL_USE_SIO TRUE
\ No newline at end of file
diff --git a/keyboards/janus/info.json b/keyboards/janus/info.json
new file mode 100644
index 0000000000..6169dc6ed5
--- /dev/null
+++ b/keyboards/janus/info.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "Janus",
+    "manufacturer": "Steven Karrmann",
+    "url": "https://github.com/skarrmann/janus",
+    "maintainer": "skarrmann",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP2", "GP4", "GP3"],
+        "rows": ["GP26", "GP27", "GP28", "GP29"]
+    },
+    "indicators": {
+        "num_lock": "GP17",
+        "caps_lock": "GP16",
+        "scroll_lock": "GP25",
+        "on_state": 0
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "split": {
+        "enabled": true
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [4, 4], "x": 6, "y": 0 },
+                { "matrix": [4, 3], "x": 7, "y": 0 },
+                { "matrix": [4, 2], "x": 8, "y": 0 },
+                { "matrix": [4, 1], "x": 9, "y": 0 },
+                { "matrix": [4, 0], "x": 10, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [5, 4], "x": 6, "y": 1 },
+                { "matrix": [5, 3], "x": 7, "y": 1 },
+                { "matrix": [5, 2], "x": 8, "y": 1 },
+                { "matrix": [5, 1], "x": 9, "y": 1 },
+                { "matrix": [5, 0], "x": 10, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [6, 4], "x": 6, "y": 2 },
+                { "matrix": [6, 3], "x": 7, "y": 2 },
+                { "matrix": [6, 2], "x": 8, "y": 2 },
+                { "matrix": [6, 1], "x": 9, "y": 2 },
+                { "matrix": [6, 0], "x": 10, "y": 2 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [7, 4], "x": 6, "y": 3 },
+                { "matrix": [7, 3], "x": 7, "y": 3 }
+            ]
+        }
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x9A25",
+        "vid": "0xFEED"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/janus/keymaps/default/keymap.c b/keyboards/janus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..440645a15d
--- /dev/null
+++ b/keyboards/janus/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+// Copyright 2022 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _SYMBOL,
+    _NAVIGATION,
+    _FUNCTION
+};
+
+#define MO_SYM MO(_SYMBOL)
+#define MO_NAV MO(_NAVIGATION)
+#define MO_FUN MO(_FUNCTION)
+#define OS_LCTL OSM(MOD_LCTL)
+#define OS_LSFT OSM(MOD_LSFT)
+#define OS_LALT OSM(MOD_LALT)
+#define OS_LGUI OSM(MOD_LGUI)
+#define OS_RCTL OSM(MOD_RCTL)
+#define OS_RSFT OSM(MOD_RSFT)
+#define OS_RALT OSM(MOD_RALT)
+#define OS_RGUI OSM(MOD_RGUI)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_split_3x5_2(
+        KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   ,
+        KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_QUOT,
+        KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,
+                                   MO_NAV , KC_LSFT, KC_SPC , MO_SYM
+    ),
+    [_SYMBOL] = LAYOUT_split_3x5_2(
+        KC_SCLN, KC_LBRC, KC_RBRC, KC_5   , XXXXXXX, XXXXXXX, KC_6   , KC_MINS, KC_EQL , KC_GRV ,
+        KC_1   , KC_2   , KC_3   , KC_4   , KC_BSLS, XXXXXXX, KC_7   , KC_8   , KC_9   , KC_0   ,
+        OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, XXXXXXX, XXXXXXX, OS_RCTL, OS_RSFT, OS_RALT, OS_RGUI,
+                                   MO_FUN , _______, _______, _______
+    ),
+    [_NAVIGATION] = LAYOUT_split_3x5_2(
+        KC_PSCR, KC_INS , KC_APP , KC_DEL , XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END ,
+        KC_ESC , KC_TAB , KC_ENT , KC_BSPC, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT,
+        OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, XXXXXXX, XXXXXXX, OS_RCTL, OS_RSFT, OS_RALT, OS_RGUI,
+                                   _______, _______, _______, MO_FUN
+    ),
+    [_FUNCTION] = LAYOUT_split_3x5_2(
+        KC_F1  , KC_F2  , KC_F3  , KC_F4  , QK_BOOT, KC_SLCK, KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
+        KC_F5  , KC_F6  , KC_F7  , KC_F8  , XXXXXXX, KC_CLCK, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS,
+        OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, XXXXXXX, KC_NLCK, OS_RCTL, OS_RSFT, OS_RALT, OS_RGUI,
+                                   _______, _______, _______, _______
+    ),
+};
\ No newline at end of file
diff --git a/keyboards/janus/keymaps/default/readme.md b/keyboards/janus/keymaps/default/readme.md
new file mode 100644
index 0000000000..dc7534e317
--- /dev/null
+++ b/keyboards/janus/keymaps/default/readme.md
@@ -0,0 +1,13 @@
+# Janus Default Keymap
+
+![Janus default keymap image](https://i.imgur.com/7FevUIZh.png)
+
+The default Janus keymap is simple and organized. The only QMK special features used are layers and one shot keys for modifiers.
+
+It is inspired by [Callum's keymap](https://github.com/qmk/qmk_firmware/tree/master/users/callum), with a few differences:
+
+* Modifier keys are moved to the bottom row on every layer, and are mirrored on both sides.
+* Symbol layer only contains non-shifted symbol keys.
+* General differences in key positions.
+
+For simplicity's sake, the keymap uses QMK's native one shot key implementation. There are other excellent one shot implementations out there, including Callum's in the aforementioned keymap.
\ No newline at end of file
diff --git a/keyboards/janus/mcuconf.h b/keyboards/janus/mcuconf.h
new file mode 100644
index 0000000000..c41253d4fb
--- /dev/null
+++ b/keyboards/janus/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_SIO_USE_UART0
+#define RP_SIO_USE_UART0 TRUE
\ No newline at end of file
diff --git a/keyboards/janus/readme.md b/keyboards/janus/readme.md
new file mode 100644
index 0000000000..aa9e65cdc4
--- /dev/null
+++ b/keyboards/janus/readme.md
@@ -0,0 +1,27 @@
+# Janus
+
+![Janus](https://i.imgur.com/7Lzhafeh.jpg)
+
+A 34-key split ortholinear keyboard, powered by two Seeed XIAO RP2040.
+
+* Keyboard Maintainer: [Steven Karrmann](https://github.com/skarrmann)
+* Hardware Supported: Janus PCBs, Seeed XIAO RP2040
+* Hardware Availability: [Janus GitHub repository](https://github.com/skarrmann/janus)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make janus:default
+
+Flashing example for this keyboard:
+
+    make janus:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key on the left half, or top right key on the right half, and then plug in the USB cable on that keyboard half.
+* **Physical reset button**: Double tap the reset button on the XIAO RP2040.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/janus/rules.mk b/keyboards/janus/rules.mk
new file mode 100644
index 0000000000..59b74ac86b
--- /dev/null
+++ b/keyboards/janus/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = usart
\ No newline at end of file

From 5ff2d93582fb5ca2e15e0c21f32b760d4a4c9044 Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Sat, 24 Sep 2022 23:36:19 +0800
Subject: [PATCH 418/959] [Keyboard] Add Saevus Cor TKL (#18369)

---
 keyboards/saevus/cor_tkl/config.h             |  26 +
 keyboards/saevus/cor_tkl/cor_tkl.c            |  44 ++
 keyboards/saevus/cor_tkl/cor_tkl.h            | 121 ++++
 keyboards/saevus/cor_tkl/info.json            | 524 ++++++++++++++++++
 .../saevus/cor_tkl/keymaps/default/config.h   |  20 +
 .../saevus/cor_tkl/keymaps/default/keymap.c   |  27 +
 keyboards/saevus/cor_tkl/keymaps/iso/config.h |  19 +
 keyboards/saevus/cor_tkl/keymaps/iso/keymap.c |  27 +
 keyboards/saevus/cor_tkl/keymaps/via/config.h |  19 +
 keyboards/saevus/cor_tkl/keymaps/via/keymap.c |  51 ++
 keyboards/saevus/cor_tkl/keymaps/via/rules.mk |   1 +
 keyboards/saevus/cor_tkl/readme.md            |  18 +
 keyboards/saevus/cor_tkl/rules.mk             |  13 +
 13 files changed, 910 insertions(+)
 create mode 100644 keyboards/saevus/cor_tkl/config.h
 create mode 100644 keyboards/saevus/cor_tkl/cor_tkl.c
 create mode 100644 keyboards/saevus/cor_tkl/cor_tkl.h
 create mode 100644 keyboards/saevus/cor_tkl/info.json
 create mode 100644 keyboards/saevus/cor_tkl/keymaps/default/config.h
 create mode 100644 keyboards/saevus/cor_tkl/keymaps/default/keymap.c
 create mode 100644 keyboards/saevus/cor_tkl/keymaps/iso/config.h
 create mode 100644 keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
 create mode 100644 keyboards/saevus/cor_tkl/keymaps/via/config.h
 create mode 100644 keyboards/saevus/cor_tkl/keymaps/via/keymap.c
 create mode 100644 keyboards/saevus/cor_tkl/keymaps/via/rules.mk
 create mode 100644 keyboards/saevus/cor_tkl/readme.md
 create mode 100644 keyboards/saevus/cor_tkl/rules.mk

diff --git a/keyboards/saevus/cor_tkl/config.h b/keyboards/saevus/cor_tkl/config.h
new file mode 100644
index 0000000000..449f2da113
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/config.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2022 Ramon Imbao
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* RGB Matrix setup */
+#define RGB_DI_PIN GP19
+#define DRIVER_LED_TOTAL 2
+#define RGBLED_NUM 2
+#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/saevus/cor_tkl/cor_tkl.c b/keyboards/saevus/cor_tkl/cor_tkl.c
new file mode 100644
index 0000000000..45cc8c0868
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/cor_tkl.c
@@ -0,0 +1,44 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "cor_tkl.h"
+
+led_config_t g_led_config = {{
+    // Key Matrix to LED Index
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      1, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    {      0, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
+}, {
+    // LED Index to Physical Position
+    { 5, 40 }, { 211, 0 }
+}, {
+    // LED Index to Flag
+    LED_FLAG_INDICATOR, LED_FLAG_INDICATOR
+}};
+
+void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
+    }
+    if (!host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
+    }
+
+    rgb_matrix_indicators_advanced_user(led_min, led_max);
+}
diff --git a/keyboards/saevus/cor_tkl/cor_tkl.h b/keyboards/saevus/cor_tkl/cor_tkl.h
new file mode 100644
index 0000000000..e629f7e741
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/cor_tkl.h
@@ -0,0 +1,121 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+// ANSI layout
+// Full backspace
+// Full right shift
+// Full left shift
+#define LAYOUT_tkl_f13_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                \
+    k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
+    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
+    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
+    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
+}
+
+// ANSI layout
+// Split backspace
+// Split right shift
+// Full left shift
+#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
+    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
+    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
+    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
+}
+
+// ISO layout
+// Full backspace
+// Full right shift
+// Split left shift
+#define LAYOUT_tkl_f13_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
+    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
+    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
+}
+
+// ISO layout
+// Split backspace
+// Split right shift
+// Split left shift
+#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                     \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
+    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
+    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
+}
+
+// Layout for VIA
+// Split backspace
+// Split left shift
+// Split right shift
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
+    k50, k51, k52,                     k57,           k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
+    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
diff --git a/keyboards/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/info.json
new file mode 100644
index 0000000000..5a881ce5cd
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/info.json
@@ -0,0 +1,524 @@
+{
+    "keyboard_name": "Cor TKL",
+    "manufacturer": "saevus",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
+        "LAYOUT_iso": "LAYOUT_tkl_f13_iso"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": false
+    },
+    "usb": {
+        "vid": "0x5001",
+        "pid": "0x0003",
+        "device_version": "1.0.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12", "GP11", "GP5"],
+        "rows": ["GP0", "GP1", "GP2", "GP21", "GP3", "GP4"]
+    },
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25, "w":1.25},
+                {"x":11.25, "y":5.25, "w":1.25},
+                {"x":12.5, "y":5.25, "w":1.25},
+                {"x":13.75, "y":5.25, "w":1.25},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25, "w":1.25},
+                {"x":11.25, "y":5.25, "w":1.25},
+                {"x":12.5, "y":5.25, "w":1.25},
+                {"x":13.75, "y":5.25, "w":1.25},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25, "w":1.25},
+                {"x":11.25, "y":5.25, "w":1.25},
+                {"x":12.5, "y":5.25, "w":1.25},
+                {"x":13.75, "y":5.25, "w":1.25},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25, "w":1.25},
+                {"x":11.25, "y":5.25, "w":1.25},
+                {"x":12.5, "y":5.25, "w":1.25},
+                {"x":13.75, "y":5.25, "w":1.25},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25, "w":1.25},
+                {"x":11.25, "y":5.25, "w":1.25},
+                {"x":12.5, "y":5.25, "w":1.25},
+                {"x":13.75, "y":5.25, "w":1.25},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/saevus/cor_tkl/keymaps/default/config.h b/keyboards/saevus/cor_tkl/keymaps/default/config.h
new file mode 100644
index 0000000000..08636494e6
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/keymaps/default/keymap.c b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3c5139dbe7
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_tkl_f13_ansi_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/saevus/cor_tkl/keymaps/iso/config.h b/keyboards/saevus/cor_tkl/keymaps/iso/config.h
new file mode 100644
index 0000000000..52983591bf
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/keymaps/iso/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c b/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..4bc1c41809
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_tkl_f13_iso_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/saevus/cor_tkl/keymaps/via/config.h b/keyboards/saevus/cor_tkl/keymaps/via/config.h
new file mode 100644
index 0000000000..52983591bf
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/keymaps/via/keymap.c b/keyboards/saevus/cor_tkl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d7e1cabc67
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,                     KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/saevus/cor_tkl/keymaps/via/rules.mk b/keyboards/saevus/cor_tkl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/saevus/cor_tkl/readme.md b/keyboards/saevus/cor_tkl/readme.md
new file mode 100644
index 0000000000..c0c5ab0e91
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/readme.md
@@ -0,0 +1,18 @@
+# saevus cor TKL
+
+![Cor TKL](https://i.imgur.com/RGctsaVl.png)
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: RP2040
+
+Make example for this keyboard (after setting up your build environment):
+
+    make saevus/cor_tkl:via
+    
+To get to the bootloader, simply press the reset button located at the back of the PCB. You can then flash new firmware onto it.
+
+Flashing example for this keyboard:
+
+    make saevus/cor_tkl:via:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/saevus/cor_tkl/rules.mk b/keyboards/saevus/cor_tkl/rules.mk
new file mode 100644
index 0000000000..e53fbb2e92
--- /dev/null
+++ b/keyboards/saevus/cor_tkl/rules.mk
@@ -0,0 +1,13 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# RGB Matrix
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+WS2812_DRIVER = vendor
+
+LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift tkl_f13_iso tkl_f13_iso_split_bs_rshift
+

From fa1388a42ea1f830aff0412813683b00f1048a8e Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Sat, 24 Sep 2022 11:38:42 -0400
Subject: [PATCH 419/959] [Keyboard] Add Moment Hotswap PCB (#18384)

---
 keyboards/cannonkeys/moment_hs/info.json      | 98 +++++++++++++++++++
 .../moment_hs/keymaps/default/keymap.c        | 45 +++++++++
 .../cannonkeys/moment_hs/keymaps/via/keymap.c | 45 +++++++++
 .../cannonkeys/moment_hs/keymaps/via/rules.mk |  1 +
 keyboards/cannonkeys/moment_hs/readme.md      | 25 +++++
 keyboards/cannonkeys/moment_hs/rules.mk       |  2 +
 6 files changed, 216 insertions(+)
 create mode 100644 keyboards/cannonkeys/moment_hs/info.json
 create mode 100644 keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/moment_hs/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/moment_hs/readme.md
 create mode 100644 keyboards/cannonkeys/moment_hs/rules.mk

diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/info.json
new file mode 100644
index 0000000000..721eb80ad2
--- /dev/null
+++ b/keyboards/cannonkeys/moment_hs/info.json
@@ -0,0 +1,98 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Moment HS",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "indicators": {
+        "caps_lock": "A3",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com/",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xCA04",
+        "pid": "0x0013"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "label": "Bksp", "matrix": [0, 14], "x": 13.0, "y": 0.0 },
+                { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
new file mode 100644
index 0000000000..daab043507
--- /dev/null
+++ b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
new file mode 100644
index 0000000000..be5d800341
--- /dev/null
+++ b/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/via/rules.mk b/keyboards/cannonkeys/moment_hs/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/moment_hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/moment_hs/readme.md b/keyboards/cannonkeys/moment_hs/readme.md
new file mode 100644
index 0000000000..9373e1551a
--- /dev/null
+++ b/keyboards/cannonkeys/moment_hs/readme.md
@@ -0,0 +1,25 @@
+# Moment Hotswap
+
+*A 60% keyboard from jjw_kb*
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/moment_hs:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/moment_hs:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/moment_hs/rules.mk b/keyboards/cannonkeys/moment_hs/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/cannonkeys/moment_hs/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

From 94d5fe6f908077e22a2445b3accda8d130135156 Mon Sep 17 00:00:00 2001
From: Thomas <mail@tpreisner.de>
Date: Sat, 24 Sep 2022 17:44:14 +0200
Subject: [PATCH 420/959] Allow Active High for Pointing Device Motion Pin
 (#18404)

Needed by the Cirque Trackpad for motion detection
---
 docs/feature_pointing_device.md           | 1 +
 quantum/pointing_device/pointing_device.c | 8 ++++++++
 quantum/pointing_device/pointing_device.h | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 4a2919168c..0771203cdd 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -289,6 +289,7 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 | `POINTING_DEVICE_INVERT_X`                     | (Optional) Inverts the X axis report.                                                                                            | _not defined_ |
 | `POINTING_DEVICE_INVERT_Y`                     | (Optional) Inverts the Y axis report.                                                                                            | _not defined_ |
 | `POINTING_DEVICE_MOTION_PIN`                   | (Optional) If supported, will only read from sensor if pin is active.                                                            | _not defined_ |
+| `POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW`        | (Optional) If defined then the motion pin is active-low.                                                                         | _varies_      |
 | `POINTING_DEVICE_TASK_THROTTLE_MS`             | (Optional) Limits the frequency that the sensor is polled for motion.                                                            | _not defined_ |
 | `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` | (Optional) Enable inertial cursor. Cursor continues moving after a flick gesture and slows down by kinetic friction.             | _not defined_ |
 | `POINTING_DEVICE_GESTURES_SCROLL_ENABLE`       | (Optional) Enable scroll gesture. The gesture that activates the scroll is device dependent.                                     | _not defined_ |
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index e91de018f1..6981f850d0 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -144,7 +144,11 @@ __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);
+#    else
+        setPinInput(POINTING_DEVICE_MOTION_PIN);
+#    endif
 #endif
     }
 
@@ -236,7 +240,11 @@ __attribute__((weak)) void pointing_device_task(void) {
 #    if defined(SPLIT_POINTING_ENABLE)
 #        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))
+#    else
+    if (readPin(POINTING_DEVICE_MOTION_PIN))
+#    endif
 #endif
 
 #if defined(SPLIT_POINTING_ENABLE)
diff --git a/quantum/pointing_device/pointing_device.h b/quantum/pointing_device/pointing_device.h
index a002bd4b25..27a3f95e32 100644
--- a/quantum/pointing_device/pointing_device.h
+++ b/quantum/pointing_device/pointing_device.h
@@ -27,18 +27,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(POINTING_DEVICE_DRIVER_adns5050)
 #    include "drivers/sensors/adns5050.h"
+#    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
 #elif defined(POINTING_DEVICE_DRIVER_adns9800)
 #    include "spi_master.h"
 #    include "drivers/sensors/adns9800.h"
+#    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
 #elif defined(POINTING_DEVICE_DRIVER_analog_joystick)
 #    include "analog.h"
 #    include "drivers/sensors/analog_joystick.h"
+#    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
 #elif defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_i2c) || defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
 #    include "drivers/sensors/cirque_pinnacle.h"
 #    include "drivers/sensors/cirque_pinnacle_gestures.h"
 #    include "pointing_device_gestures.h"
 #elif defined(POINTING_DEVICE_DRIVER_paw3204)
 #    include "drivers/sensors/paw3204.h"
+#    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
 #elif defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
 #    include "i2c_master.h"
 #    include "drivers/sensors/pimoroni_trackball.h"
@@ -52,9 +56,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    ifdef PIMORONI_TRACKBALL_ROTATE
 #        define POINTING_DEVICE_ROTATION_90
 #    endif
+#    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
 #elif defined(POINTING_DEVICE_DRIVER_pmw3360) || defined(POINTING_DEVICE_DRIVER_pmw3389)
 #    include "spi_master.h"
 #    include "drivers/sensors/pmw33xx_common.h"
+#    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
 #else
 void           pointing_device_driver_init(void);
 report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report);

From 0dca9a1f62aaa85340b2605a9ae4ea7eb84a5c62 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sat, 24 Sep 2022 23:44:50 +0800
Subject: [PATCH 421/959] [Keyboard] Convert Cradio config to data driven model
 (#18412)

---
 keyboards/cradio/config.h  |  55 ++----------------
 keyboards/cradio/cradio.c  |  27 ++-------
 keyboards/cradio/cradio.h  |  52 -----------------
 keyboards/cradio/info.json | 116 ++++++++++++++++++++++++-------------
 keyboards/cradio/rules.mk  |  22 +------
 5 files changed, 87 insertions(+), 185 deletions(-)
 delete mode 100644 keyboards/cradio/cradio.h

diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h
index 90a5401590..e4ecd29539 100644
--- a/keyboards/cradio/config.h
+++ b/keyboards/cradio/config.h
@@ -1,54 +1,9 @@
-/* Copyright 2018-2021
- * ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
- * David Philip Barr <@davidphilipbarr>
- * Pierre Chevalier <pierrechevalier83@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2018-2021
+// ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
+// David Philip Barr <@davidphilipbarr>
+// Pierre Chevalier <pierrechevalier83@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
 
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
-#define DIRECT_PINS { \
-    { E6, F7, F6, F5, F4 }, \
-    { B1, B3, B2, B6, D3 }, \
-    { D1, D0, D4, C6, D7 }, \
-    { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-#define DIRECT_PINS_RIGHT { \
-    { F4, F5, F6, F7, E6 }, \
-    { D3, B6, B2, B3, B1 }, \
-    { D7, C6, D4, D0, D1 }, \
-    { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* Serial settings */
-#define USE_SERIAL
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D2
-
-/* Top left key on left half */
 #define BOOTMAGIC_LITE_ROW    0
 #define BOOTMAGIC_LITE_COLUMN 0
 /* Top right key on right half */
diff --git a/keyboards/cradio/cradio.c b/keyboards/cradio/cradio.c
index 76c64cbb8c..99a69ff755 100644
--- a/keyboards/cradio/cradio.c
+++ b/keyboards/cradio/cradio.c
@@ -1,24 +1,10 @@
-/* Copyright 2018-2021
- * ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
- * David Philip Barr <@davidphilipbarr>
- * Pierre Chevalier <pierrechevalier83@gmail.com>
- * @filterpaper
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 2018-2021
+// ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
+// David Philip Barr <@davidphilipbarr>
+// Pierre Chevalier <pierrechevalier83@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+ 
 
-#include "cradio.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
@@ -35,4 +21,3 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
     {{1, 3}, {0, 3}, {2, 3}, {3, 3}, {4, 3}}
 };
 #endif
-
diff --git a/keyboards/cradio/cradio.h b/keyboards/cradio/cradio.h
deleted file mode 100644
index f013386bf8..0000000000
--- a/keyboards/cradio/cradio.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2018-2021
- * ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
- * David Philip Barr <@davidphilipbarr>
- * Pierre Chevalier <pierrechevalier83@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_2( \
-        L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
-        L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
-        L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
-                       L16, L17, R16, R17                 \
-    ) \
-    { \
-        { L01, L02, L03, L04, L05 }, \
-        { L06, L07, L08, L09, L10 }, \
-        { L11, L12, L13, L14, L15 }, \
-        { L16, L17, ___, ___, ___ }, \
-        { R01, R02, R03, R04, R05 }, \
-        { R06, R07, R08, R09, R10 }, \
-        { R11, R12, R13, R14, R15 }, \
-        { R16, R17, ___, ___, ___ }  \
-    }
-
-#define LAYOUT LAYOUT_split_3x5_2
-
diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
index 9a99ee7c3e..0b9cbb1fed 100644
--- a/keyboards/cradio/info.json
+++ b/keyboards/cradio/info.json
@@ -8,50 +8,84 @@
       "pid": "0x3988",
       "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "protocol": "atmel-dfu",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["E6", "F7", "F6", "F5", "F4"],
+            ["B1", "B3", "B2", "B6", "D3"],
+            ["D1", "D0", "D4", "C6", "D7"],
+            ["B4", "B5", null, null, null]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["F4", "F5", "F6", "F7", "E6"],
+                    ["D3", "B6", "B2", "B3", "B1"],
+                    ["D7", "C6", "D4", "D0", "D1"],
+                    ["B5", "B4", null, null, null]
+                ]
+            }
+        },
+        "soft_serial_pin": "D2",
+        "transport": {
+            "protocol": "serial"
+        }
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"x": 0, "y": 1.27},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
-
-                {"x": 8, "y": 0.42},
-                {"x": 9, "y": 0.28},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0.31},
-                {"x": 12, "y": 1.27},
-
-                {"x": 0, "y": 2.27},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
-
-                {"x": 8, "y": 1.42},
-                {"x": 9, "y": 1.28},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1.31},
-                {"x": 12, "y": 2.27},
-
-                {"x": 0, "y": 3.27},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
-
-                {"x": 8, "y": 2.42},
-                {"x": 9, "y": 2.28},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2.31},
-                {"x": 12, "y": 3.27},
-
-                {"x": 4, "y": 3.9},
-                {"x": 5, "y": 3.7},
-
-                {"x": 7, "y": 3.7},
-                {"x": 8, "y": 3.9}
+                { "label": "L01", "matrix": [0, 0], "w": 1, "x": 0, "y": 1.27 },
+                { "label": "L02", "matrix": [0, 1], "w": 1, "x": 1, "y": 0.31 },
+                { "label": "L03", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "L04", "matrix": [0, 3], "w": 1, "x": 3, "y": 0.28 },
+                { "label": "L05", "matrix": [0, 4], "w": 1, "x": 4, "y": 0.42 },
+                { "label": "L06", "matrix": [1, 0], "w": 1, "x": 0, "y": 2.27 },
+                { "label": "L07", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.31 },
+                { "label": "L08", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
+                { "label": "L09", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.28 },
+                { "label": "L10", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.42 },
+                { "label": "L11", "matrix": [2, 0], "w": 1, "x": 0, "y": 3.27 },
+                { "label": "L12", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.31 },
+                { "label": "L13", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+                { "label": "L14", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.28 },
+                { "label": "L15", "matrix": [2, 4], "w": 1, "x": 4, "y": 2.42 },
+                { "label": "L16", "matrix": [3, 0], "w": 1, "x": 4, "y": 3.9 },
+                { "label": "L17", "matrix": [3, 1], "w": 1, "x": 5, "y": 3.7 },
+                { "label": "R01", "matrix": [4, 0], "w": 1, "x": 8, "y": 0.42 },
+                { "label": "R02", "matrix": [4, 1], "w": 1, "x": 9, "y": 0.28 },
+                { "label": "R03", "matrix": [4, 2], "w": 1, "x": 10, "y": 0 },
+                { "label": "R04", "matrix": [4, 3], "w": 1, "x": 11, "y": 0.31 },
+                { "label": "R05", "matrix": [4, 4], "w": 1, "x": 12, "y": 1.27 },
+                { "label": "R06", "matrix": [5, 0], "w": 1, "x": 8, "y": 1.42 },
+                { "label": "R07", "matrix": [5, 1], "w": 1, "x": 9, "y": 1.28 },
+                { "label": "R08", "matrix": [5, 2], "w": 1, "x": 10, "y": 1 },
+                { "label": "R09", "matrix": [5, 3], "w": 1, "x": 11, "y": 1.31 },
+                { "label": "R10", "matrix": [5, 4], "w": 1, "x": 12, "y": 2.27 },
+                { "label": "R11", "matrix": [6, 0], "w": 1, "x": 8, "y": 2.42 },
+                { "label": "R12", "matrix": [6, 1], "w": 1, "x": 9, "y": 2.28 },
+                { "label": "R13", "matrix": [6, 2], "w": 1, "x": 10, "y": 2 },
+                { "label": "R14", "matrix": [6, 3], "w": 1, "x": 11, "y": 2.31 },
+                { "label": "R15", "matrix": [6, 4], "w": 1, "x": 12, "y": 3.27 },
+                { "label": "R16", "matrix": [7, 0], "w": 1, "x": 7, "y": 3.7 },
+                { "label": "R17", "matrix": [7, 1], "w": 1, "x": 8, "y": 3.9 }
             ]
         }
     }
diff --git a/keyboards/cradio/rules.mk b/keyboards/cradio/rules.mk
index 1e4940ca7d..6e7633bfe0 100644
--- a/keyboards/cradio/rules.mk
+++ b/keyboards/cradio/rules.mk
@@ -1,21 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-UNICODE_ENABLE = yes        # Unicode
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes        # Use shared split_common code
-LAYOUTS = split_3x5_2
+# This file intentionally left blank

From 244f27ac277e14371157779bc1004b674b1fd39b Mon Sep 17 00:00:00 2001
From: Wes Lord <weslord@gmail.com>
Date: Sat, 24 Sep 2022 09:04:14 -0700
Subject: [PATCH 422/959] Remove orphan custom functions reference in keymap
 docs (#18444)

---
 docs/keymap.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/keymap.md b/docs/keymap.md
index ab8a255bc3..ddcf782140 100644
--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -92,11 +92,10 @@ These keycodes allow the processing to fall through to lower layers in search of
 
 For this example we will walk through an [older version of the default Clueboard 66% keymap](https://github.com/qmk/qmk_firmware/blob/ca01d94005f67ec4fa9528353481faa622d949ae/keyboards/clueboard/keymaps/default/keymap.c). You'll find it helpful to open that file in another browser window so you can look at everything in context.
 
-There are 3 main sections of a `keymap.c` file you'll want to concern yourself with:
+There are 2 main sections of a `keymap.c` file you'll want to concern yourself with:
 
 * [The Definitions](#definitions)
 * [The Layer/Keymap Datastructure](#layers-and-keymaps)
-* [Custom Functions](#custom-functions), if any
 
 ### Definitions
 

From 6d4d228beaa13ad2d904df9d92d30aa0a68396bb Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 24 Sep 2022 17:05:12 +0100
Subject: [PATCH 423/959] [Keyboard] Add SENSE75 firmware (#18442)

---
 keyboards/drop/sense75/board.h                |   8 +
 keyboards/drop/sense75/config.h               |  67 +++++
 keyboards/drop/sense75/halconf.h              |   7 +
 keyboards/drop/sense75/info.json              | 235 ++++++++++++++++++
 .../drop/sense75/keymaps/default/keymap.c     |  52 ++++
 .../drop/sense75/keymaps/default/rules.mk     |   1 +
 .../drop/sense75/keymaps/default_md/keymap.c  | 136 ++++++++++
 .../drop/sense75/keymaps/default_md/readme.md |   1 +
 .../drop/sense75/keymaps/default_md/rules.mk  |   1 +
 keyboards/drop/sense75/keymaps/via/config.h   |   5 +
 keyboards/drop/sense75/keymaps/via/keymap.c   |  79 ++++++
 keyboards/drop/sense75/keymaps/via/rules.mk   |   2 +
 keyboards/drop/sense75/mcuconf.h              |  14 ++
 keyboards/drop/sense75/readme.md              |  24 ++
 keyboards/drop/sense75/rules.mk               |   2 +
 keyboards/drop/sense75/sense75.c              | 148 +++++++++++
 16 files changed, 782 insertions(+)
 create mode 100644 keyboards/drop/sense75/board.h
 create mode 100644 keyboards/drop/sense75/config.h
 create mode 100644 keyboards/drop/sense75/halconf.h
 create mode 100644 keyboards/drop/sense75/info.json
 create mode 100644 keyboards/drop/sense75/keymaps/default/keymap.c
 create mode 100644 keyboards/drop/sense75/keymaps/default/rules.mk
 create mode 100644 keyboards/drop/sense75/keymaps/default_md/keymap.c
 create mode 100644 keyboards/drop/sense75/keymaps/default_md/readme.md
 create mode 100644 keyboards/drop/sense75/keymaps/default_md/rules.mk
 create mode 100644 keyboards/drop/sense75/keymaps/via/config.h
 create mode 100644 keyboards/drop/sense75/keymaps/via/keymap.c
 create mode 100644 keyboards/drop/sense75/keymaps/via/rules.mk
 create mode 100644 keyboards/drop/sense75/mcuconf.h
 create mode 100644 keyboards/drop/sense75/readme.md
 create mode 100644 keyboards/drop/sense75/rules.mk
 create mode 100644 keyboards/drop/sense75/sense75.c

diff --git a/keyboards/drop/sense75/board.h b/keyboards/drop/sense75/board.h
new file mode 100644
index 0000000000..fc227f69b1
--- /dev/null
+++ b/keyboards/drop/sense75/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/drop/sense75/config.h b/keyboards/drop/sense75/config.h
new file mode 100644
index 0000000000..b0196d0c44
--- /dev/null
+++ b/keyboards/drop/sense75/config.h
@@ -0,0 +1,67 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define I2C1_SCL_PIN B8
+#define I2C1_SDA_PIN B9
+
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10101000
+#define EXTERNAL_EEPROM_WP_PIN B7
+#define EEPROM_I2C_24LC256
+
+#ifdef RGB_MATRIX_ENABLE
+#    define DRIVER_ADDR_1 0b1010000
+#    define DRIVER_ADDR_2 0b1011111
+#    define DRIVER_COUNT 2
+#    define DRIVER_LED_TOTAL (58 + 53)
+#    define ISSI_PWM_FREQUENCY 0b010 // 26k
+
+#    define RGB_DISABLE_TIMEOUT 0
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/drop/sense75/halconf.h b/keyboards/drop/sense75/halconf.h
new file mode 100644
index 0000000000..b11f12ade7
--- /dev/null
+++ b/keyboards/drop/sense75/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/info.json
new file mode 100644
index 0000000000..8fd65c1bd7
--- /dev/null
+++ b/keyboards/drop/sense75/info.json
@@ -0,0 +1,235 @@
+{
+    "keyboard_name": "SENSE75", 
+    "manufacturer": "Drop Inc.",
+    "maintainer": "zvecr",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C15", "C14", "C13", "C12", "C11", "C10", "C9", "C8", "C7", "C6", "C5", "C4", "C3", "C2", "C1"],
+        "rows": ["B15", "B14", "B13", "B12", "B11", "B10"]
+    },
+    "usb": {
+        "vid": "0x359B",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "rgb_matrix": true,
+        "encoder": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0,  0], "label":"Esc", "x":0, "y":0},
+                { "matrix": [0,  1], "label":"F1", "x":1.25, "y":0},
+                { "matrix": [0,  2], "label":"F2", "x":2.25, "y":0},
+                { "matrix": [0,  3], "label":"F3", "x":3.25, "y":0},
+                { "matrix": [0,  4], "label":"F4", "x":4.25, "y":0},
+                { "matrix": [0,  5], "label":"F5", "x":5.5, "y":0},
+                { "matrix": [0,  6], "label":"F6", "x":6.5, "y":0}, 
+                { "matrix": [0,  7], "label":"F7", "x":7.5, "y":0},
+                { "matrix": [0,  8], "label":"F8", "x":8.5, "y":0},
+                { "matrix": [0,  9], "label":"F9", "x":9.75, "y":0},
+                { "matrix": [0, 10], "label":"F10", "x":10.75, "y":0},
+                { "matrix": [0, 11], "label":"F11", "x":11.75, "y":0},
+                { "matrix": [0, 12], "label":"F12", "x":12.75, "y":0},
+                { "matrix": [0, 13], "label":"PrtSc", "x":14, "y":0},
+                { "matrix": [0, 14], "label":"Mute", "x":15.25, "y":0},
+                { "matrix": [1,  0], "label":"~", "x":0, "y":1.25},
+                { "matrix": [1,  1], "label":"!", "x":1, "y":1.25},
+                { "matrix": [1,  2], "label":"@", "x":2, "y":1.25},
+                { "matrix": [1,  3], "label":"#", "x":3, "y":1.25},
+                { "matrix": [1,  4], "label":"$", "x":4, "y":1.25},
+                { "matrix": [1,  5], "label":"%", "x":5, "y":1.25},
+                { "matrix": [1,  6], "label":"^", "x":6, "y":1.25},
+                { "matrix": [1,  7], "label":"&", "x":7, "y":1.25},
+                { "matrix": [1,  8], "label":"*", "x":8, "y":1.25},
+                { "matrix": [1,  9], "label":"(", "x":9, "y":1.25},
+                { "matrix": [1, 10], "label":")", "x":10, "y":1.25},
+                { "matrix": [1, 11], "label":"_", "x":11, "y":1.25},
+                { "matrix": [1, 12], "label":"+", "x":12, "y":1.25},
+                { "matrix": [1, 13], "label":"Backspace", "x":13, "y":1.25, "w":2},
+                { "matrix": [1, 14], "label":"Del", "x":15.25, "y":1.25},
+                { "matrix": [2,  0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
+                { "matrix": [2,  1], "label":"Q", "x":1.5, "y":2.25},
+                { "matrix": [2,  2], "label":"W", "x":2.5, "y":2.25},
+                { "matrix": [2,  3], "label":"E", "x":3.5, "y":2.25},
+                { "matrix": [2,  4], "label":"R", "x":4.5, "y":2.25},
+                { "matrix": [2,  5], "label":"T", "x":5.5, "y":2.25},
+                { "matrix": [2,  6], "label":"Y", "x":6.5, "y":2.25},
+                { "matrix": [2,  7], "label":"U", "x":7.5, "y":2.25},
+                { "matrix": [2,  8], "label":"I", "x":8.5, "y":2.25},
+                { "matrix": [2,  9], "label":"O", "x":9.5, "y":2.25},
+                { "matrix": [2, 10], "label":"P", "x":10.5, "y":2.25},
+                { "matrix": [2, 11], "label":"{", "x":11.5, "y":2.25},
+                { "matrix": [2, 12], "label":"}", "x":12.5, "y":2.25},
+                { "matrix": [2, 13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
+                { "matrix": [2, 14], "label":"Page Up", "x":15.25, "y":2.25},
+                { "matrix": [3,  0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                { "matrix": [3,  1], "label":"A", "x":1.75, "y":3.25},
+                { "matrix": [3,  2], "label":"S", "x":2.75, "y":3.25},
+                { "matrix": [3,  3], "label":"D", "x":3.75, "y":3.25},
+                { "matrix": [3,  4], "label":"F", "x":4.75, "y":3.25},
+                { "matrix": [3,  5], "label":"G", "x":5.75, "y":3.25},
+                { "matrix": [3,  6], "label":"H", "x":6.75, "y":3.25},
+                { "matrix": [3,  7], "label":"J", "x":7.75, "y":3.25},
+                { "matrix": [3,  8], "label":"K", "x":8.75, "y":3.25},
+                { "matrix": [3,  9], "label":"L", "x":9.75, "y":3.25},
+                { "matrix": [3, 10], "label":":", "x":10.75, "y":3.25},
+                { "matrix": [3, 11], "label":"\"", "x":11.75, "y":3.25},
+                { "matrix": [3, 12], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                { "matrix": [3, 14], "label":"Page Down", "x":15.25, "y":3.25},
+                { "matrix": [4,  0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
+                { "matrix": [4,  1], "label":"Z", "x":2.25, "y":4.25},
+                { "matrix": [4,  2], "label":"X", "x":3.25, "y":4.25},
+                { "matrix": [4,  3], "label":"C", "x":4.25, "y":4.25},
+                { "matrix": [4,  4], "label":"V", "x":5.25, "y":4.25},
+                { "matrix": [4,  5], "label":"B", "x":6.25, "y":4.25},
+                { "matrix": [4,  6], "label":"N", "x":7.25, "y":4.25},
+                { "matrix": [4,  7], "label":"M", "x":8.25, "y":4.25},
+                { "matrix": [4,  8], "label":"<", "x":9.25, "y":4.25},
+                { "matrix": [4,  9], "label":">", "x":10.25, "y":4.25},
+                { "matrix": [4, 10], "label":"?", "x":11.25, "y":4.25},
+                { "matrix": [4, 11], "label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                { "matrix": [4, 13], "label":"\u2191", "x":14.25, "y":4.5},
+                { "matrix": [5,  0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                { "matrix": [5,  1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                { "matrix": [5,  2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                { "matrix": [5,  5], "label":" ", "x":3.75, "y":5.25, "w":6.25},
+                { "matrix": [5,  8], "label":"Alt", "x":10, "y":5.25},
+                { "matrix": [5,  9], "label":"Fn", "x":11, "y":5.25},
+                { "matrix": [5, 10], "label":"Ctrl", "x":12, "y":5.25},
+                { "matrix": [5, 12], "label":"\u2190", "x":13.25, "y":5.5},
+                { "matrix": [5, 13], "label":"\u2193", "x":14.25, "y":5.5},
+                { "matrix": [5, 14], "label":"\u2192", "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            { "flags": 2, "x": 2, "y": 0 },
+            { "flags": 2, "x": 22, "y": 0 },
+            { "flags": 2, "x": 42, "y": 0 },
+            { "flags": 2, "x": 62, "y": 0 },
+            { "flags": 2, "x": 82, "y": 0 },
+            { "flags": 2, "x": 102, "y": 0 },
+            { "flags": 2, "x": 122, "y": 0 },
+            { "flags": 2, "x": 142, "y": 0 },
+            { "flags": 2, "x": 162, "y": 0 },
+            { "flags": 2, "x": 182, "y": 0 },
+            { "flags": 2, "x": 202, "y": 0 },
+            { "flags": 2, "x": 222, "y": 0 },
+            { "flags": 2, "x": 0, "y": 7 },
+            { "flags": 4, "matrix": [0, 0], "x": 6, "y": 8 },
+            { "flags": 4, "matrix": [0, 1], "x": 24, "y": 8 },
+            { "flags": 4, "matrix": [0, 2], "x": 37, "y": 8 },
+            { "flags": 4, "matrix": [0, 3], "x": 51, "y": 8 },
+            { "flags": 4, "matrix": [0, 4], "x": 66, "y": 8 },
+            { "flags": 4, "matrix": [0, 5], "x": 82, "y": 8 },
+            { "flags": 4, "matrix": [0, 6], "x": 96, "y": 8 },
+            { "flags": 4, "matrix": [0, 7], "x": 110, "y": 8 },
+            { "flags": 4, "matrix": [0, 8], "x": 124, "y": 8 },
+            { "flags": 4, "matrix": [0, 9], "x": 141, "y": 8 },
+            { "flags": 4, "matrix": [0, 10], "x": 155, "y": 8 },
+            { "flags": 4, "matrix": [0, 11], "x": 169, "y": 8 },
+            { "flags": 4, "matrix": [0, 12], "x": 182, "y": 8 },
+            { "flags": 4, "matrix": [0, 13], "x": 199, "y": 8 },
+            { "flags": 2, "x": 224, "y": 4 },
+            { "flags": 2, "x": 0, "y": 12 },
+            { "flags": 4, "matrix": [1, 0], "x": 6, "y": 20 },
+            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 20 },
+            { "flags": 4, "matrix": [1, 2], "x": 34, "y": 20 },
+            { "flags": 4, "matrix": [1, 3], "x": 48, "y": 20 },
+            { "flags": 4, "matrix": [1, 4], "x": 62, "y": 20 },
+            { "flags": 4, "matrix": [1, 5], "x": 75, "y": 20 },
+            { "flags": 4, "matrix": [1, 6], "x": 90, "y": 20 },
+            { "flags": 4, "matrix": [1, 7], "x": 103, "y": 20 },
+            { "flags": 4, "matrix": [1, 8], "x": 117, "y": 20 },
+            { "flags": 4, "matrix": [1, 9], "x": 130, "y": 20 },
+            { "flags": 4, "matrix": [1, 10], "x": 144, "y": 20 },
+            { "flags": 4, "matrix": [1, 11], "x": 158, "y": 20 },
+            { "flags": 4, "matrix": [1, 12], "x": 170, "y": 20 },
+            { "flags": 4, "matrix": [1, 13], "x": 192, "y": 20 },
+            { "flags": 4, "matrix": [1, 14], "x": 217, "y": 20 },
+            { "flags": 2, "x": 224, "y": 12 },
+            { "flags": 2, "x": 0, "y": 22 },
+            { "flags": 4, "matrix": [2, 0], "x": 10, "y": 30 },
+            { "flags": 4, "matrix": [2, 1], "x": 27, "y": 30 },
+            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 30 },
+            { "flags": 4, "matrix": [2, 3], "x": 54, "y": 30 },
+            { "flags": 4, "matrix": [2, 4], "x": 69, "y": 30 },
+            { "flags": 4, "matrix": [2, 5], "x": 82, "y": 30 },
+            { "flags": 4, "matrix": [2, 6], "x": 96, "y": 30 },
+            { "flags": 4, "matrix": [2, 7], "x": 110, "y": 30 },
+            { "flags": 4, "matrix": [2, 8], "x": 123, "y": 30 },
+            { "flags": 4, "matrix": [2, 9], "x": 138, "y": 30 },
+            { "flags": 4, "matrix": [2, 10], "x": 151, "y": 30 },
+            { "flags": 4, "matrix": [2, 11], "x": 165, "y": 30 },
+            { "flags": 4, "matrix": [2, 12], "x": 179, "y": 30 },
+            { "flags": 4, "matrix": [2, 13], "x": 196, "y": 30 },
+            { "flags": 4, "matrix": [2, 14], "x": 217, "y": 30 },
+            { "flags": 2, "x": 224, "y": 22 },
+            { "flags": 4, "matrix": [3, 0], "x": 11, "y": 40 },
+            { "flags": 4, "matrix": [3, 1], "x": 30, "y": 40 },
+            { "flags": 4, "matrix": [3, 2], "x": 44, "y": 40 },
+            { "flags": 4, "matrix": [3, 3], "x": 57, "y": 40 },
+            { "flags": 4, "matrix": [3, 4], "x": 72, "y": 40 },
+            { "flags": 4, "matrix": [3, 5], "x": 85, "y": 40 },
+            { "flags": 4, "matrix": [3, 6], "x": 99, "y": 40 },
+            { "flags": 4, "matrix": [3, 7], "x": 113, "y": 40 },
+            { "flags": 4, "matrix": [3, 8], "x": 126, "y": 40 },
+            { "flags": 4, "matrix": [3, 9], "x": 140, "y": 40 },
+            { "flags": 4, "matrix": [3, 10], "x": 154, "y": 40 },
+            { "flags": 4, "matrix": [3, 11], "x": 169, "y": 40 },
+            { "flags": 4, "matrix": [3, 12], "x": 190, "y": 40 },
+            { "flags": 4, "matrix": [3, 14], "x": 217, "y": 40 },
+            { "flags": 2, "x": 0, "y": 42 },
+            { "flags": 4, "matrix": [4, 0], "x": 15, "y": 50 },
+            { "flags": 4, "matrix": [4, 1], "x": 37, "y": 50 },
+            { "flags": 4, "matrix": [4, 2], "x": 51, "y": 50 },
+            { "flags": 4, "matrix": [4, 3], "x": 66, "y": 50 },
+            { "flags": 4, "matrix": [4, 4], "x": 79, "y": 50 },
+            { "flags": 4, "matrix": [4, 5], "x": 93, "y": 50 },
+            { "flags": 4, "matrix": [4, 6], "x": 107, "y": 50 },
+            { "flags": 4, "matrix": [4, 7], "x": 120, "y": 50 },
+            { "flags": 4, "matrix": [4, 8], "x": 134, "y": 50 },
+            { "flags": 4, "matrix": [4, 9], "x": 148, "y": 50 },
+            { "flags": 4, "matrix": [4, 10], "x": 161, "y": 50 },
+            { "flags": 4, "matrix": [4, 11], "x": 180, "y": 50 },
+            { "flags": 4, "matrix": [4, 13], "x": 202, "y": 53 },
+            { "flags": 2, "x": 224, "y": 42 },
+            { "flags": 2, "x": 0, "y": 51 },
+            { "flags": 4, "matrix": [5, 0], "x": 8, "y": 60 },
+            { "flags": 4, "matrix": [5, 1], "x": 26, "y": 60 },
+            { "flags": 4, "matrix": [5, 2], "x": 42, "y": 60 },
+            { "flags": 4, "matrix": [5, 5], "x": 94, "y": 60 },
+            { "flags": 4, "matrix": [5, 8], "x": 144, "y": 60 },
+            { "flags": 4, "matrix": [5, 9], "x": 158, "y": 60 },
+            { "flags": 4, "matrix": [5, 10], "x": 172, "y": 60 },
+            { "flags": 4, "matrix": [5, 12], "x": 189, "y": 63 },
+            { "flags": 4, "matrix": [5, 13], "x": 202, "y": 63 },
+            { "flags": 4, "matrix": [5, 14], "x": 217, "y": 63 },
+            { "flags": 2, "x": 224, "y": 51 },
+            { "flags": 2, "x": 9,   "y": 64 },
+            { "flags": 2, "x": 38,  "y": 64 },
+            { "flags": 2, "x": 69,  "y": 64 },
+            { "flags": 2, "x": 96,  "y": 64 },
+            { "flags": 2, "x": 125, "y": 64 },
+            { "flags": 2, "x": 154, "y": 64 },
+            { "flags": 2, "x": 182, "y": 64 },
+            { "flags": 2, "x": 211, "y": 64 }
+        ]
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B5", "pin_b": "B4", "resolution": 2 }
+        ]
+    }
+}
diff --git a/keyboards/drop/sense75/keymaps/default/keymap.c b/keyboards/drop/sense75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..05b351f865
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││PSc││   │
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┴└───┴───┴───┴───┘└───┘└───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Del│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  ││PgU│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter ││PgD│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│ ↑ │
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│Ctl│┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┘│ ← │ ↓ │ → │
+     *                                                      └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
+        _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
+        _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            EE_CLR,                             _______, _______, _______, _______, _______, _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }
+};
+#endif
+
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(62, RGB_WHITE);
+    }
+}
diff --git a/keyboards/drop/sense75/keymaps/default/rules.mk b/keyboards/drop/sense75/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/drop/sense75/keymaps/default_md/keymap.c b/keyboards/drop/sense75/keymaps/default_md/keymap.c
new file mode 100644
index 0000000000..eb8b6b1f4b
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/default_md/keymap.c
@@ -0,0 +1,136 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    TEST_1 = SAFE_RANGE,
+    TEST_2,
+    TEST_3,
+    TEST_4,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││PSc││   │
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┴└───┴───┴───┴───┘└───┘└───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Del│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  ││PgU│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter ││PgD│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│ ↑ │
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│Ctl│┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┘│ ← │ ↓ │ → │
+     *                                                      └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
+        _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
+        _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______,
+        MO(2),   _______, _______,                            EE_CLR,                             _______, _______, _______, _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, TEST_1,  TEST_2,  TEST_3,  TEST_4,  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, AG_TOGG, _______, _______, _______, CL_TOGG,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(_______, _______) }
+};
+#endif
+
+static bool test_mode = false;
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!record->event.pressed) {
+        switch (keycode) {
+            case TEST_1:
+                rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
+                rgb_matrix_sethsv_noeeprom(HSV_RED);
+                test_mode = true;
+                break;
+            case TEST_2:
+                rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
+                rgb_matrix_sethsv_noeeprom(HSV_GREEN);
+                test_mode = true;
+                break;
+            case TEST_3:
+                rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
+                rgb_matrix_sethsv_noeeprom(HSV_BLUE);
+                test_mode = true;
+                break;
+            case TEST_4:
+                rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
+                rgb_matrix_sethsv_noeeprom(HSV_WHITE);
+                test_mode = true;
+                break;
+            case RGB_TOG:
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL:
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR):
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        break;
+                    case LED_FLAG_UNDERGLOW:
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        break;
+                    default:
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        break;
+                }
+                return false;
+        }
+    }
+    return true;
+};
+
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(62, RGB_WHITE);
+    } else if ((rgb_matrix_get_flags() & (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR)) == 0) {
+        rgb_matrix_set_color(62, RGB_OFF);
+    }
+
+    if (get_highest_layer(layer_state) == 2) {
+        if (!test_mode) {
+            rgb_matrix_set_color_all(RGB_OFF);
+        }
+
+        if (keymap_config.swap_lalt_lgui) {
+            rgb_matrix_set_color(55, RGB_GREEN);
+        } else {
+            rgb_matrix_set_color(55, RGB_RED);
+        }
+        if (keymap_config.swap_control_capslock) {
+            rgb_matrix_set_color(59, RGB_GREEN);
+        } else {
+            rgb_matrix_set_color(59, RGB_RED);
+        }
+    } else if ((rgb_matrix_get_flags() & (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR)) == 0) {
+        rgb_matrix_set_color(55, RGB_OFF);
+        rgb_matrix_set_color(59, RGB_OFF);
+    }
+}
diff --git a/keyboards/drop/sense75/keymaps/default_md/readme.md b/keyboards/drop/sense75/keymaps/default_md/readme.md
new file mode 100644
index 0000000000..d954886bcd
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/default_md/readme.md
@@ -0,0 +1 @@
+# The stock firmware the keyboard ships with
diff --git a/keyboards/drop/sense75/keymaps/default_md/rules.mk b/keyboards/drop/sense75/keymaps/default_md/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/default_md/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/drop/sense75/keymaps/via/config.h b/keyboards/drop/sense75/keymaps/via/config.h
new file mode 100644
index 0000000000..2b0c8330d0
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/via/config.h
@@ -0,0 +1,5 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/drop/sense75/keymaps/via/keymap.c b/keyboards/drop/sense75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c1e3c4edf3
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/via/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││PSc││   │
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┴└───┴───┴───┴───┘└───┘└───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Del│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  ││PgU│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter ││PgD│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│┌───┐
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│ ↑ │
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│Ctl│┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┘│ ← │ ↓ │ → │
+     *                                                      └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
+        _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
+        _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______,
+        MO(2),   _______, _______,                            EE_CLR,                             _______, _______, _______, _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, AG_TOGG, _______, _______, _______, CL_TOGG,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(_______, _______) }
+};
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!record->event.pressed) {
+        switch (keycode) {
+            case RGB_TOG:
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL:
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR):
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        break;
+                    case LED_FLAG_UNDERGLOW:
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        break;
+                    default:
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        break;
+                }
+                return false;
+        }
+    }
+    return true;
+};
diff --git a/keyboards/drop/sense75/keymaps/via/rules.mk b/keyboards/drop/sense75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/drop/sense75/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/drop/sense75/mcuconf.h b/keyboards/drop/sense75/mcuconf.h
new file mode 100644
index 0000000000..e8a0486ce0
--- /dev/null
+++ b/keyboards/drop/sense75/mcuconf.h
@@ -0,0 +1,14 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 16
+
+#undef STM32_PREDIV_VALUE
+#define STM32_PREDIV_VALUE 2
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/drop/sense75/readme.md b/keyboards/drop/sense75/readme.md
new file mode 100644
index 0000000000..bb0bb72a05
--- /dev/null
+++ b/keyboards/drop/sense75/readme.md
@@ -0,0 +1,24 @@
+# SENSE75
+
+![SENSE75](https://massdrop-s3.imgix.net/img_thread/1660887363422.771277068120058315243585-5419copycrop.jpg?auto=format&fm=jpg&fit=max&w=500&h=868&dpr=2)
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Availability: <https://drop.com/buy/drop-sense75-mechanical-keyboard>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make drop/sense75:default
+
+Flashing example for this keyboard:
+
+    make drop/sense75:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Press and hold the button under the space bar
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/drop/sense75/rules.mk b/keyboards/drop/sense75/rules.mk
new file mode 100644
index 0000000000..781ba9b35a
--- /dev/null
+++ b/keyboards/drop/sense75/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = i2c
+RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
new file mode 100644
index 0000000000..8087f5c72e
--- /dev/null
+++ b/keyboards/drop/sense75/sense75.c
@@ -0,0 +1,148 @@
+// Copyright 2022 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "rgb_matrix.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+// 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 },
+
+// 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 },
+    // <enc gap>
+    { 1, B_13, A_13, C_13 },
+
+// 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 },
+
+// 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 },
+
+// 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 },
+
+// 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 },
+
+// 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 },
+
+// 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 }
+};
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) return false;
+
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return false; 
+}
+#endif

From 32204f4a0340e649d99f75065a112e6fe6b689d1 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Sat, 24 Sep 2022 18:37:04 +0200
Subject: [PATCH 424/959] GMMK Pro: fix unintended volume encoder taps (#17129)

---
 .../pro/rev1/ansi/keymaps/alexmarmon/keymap.c |  3 +-
 .../pro/rev1/ansi/keymaps/andrebrait/config.h |  2 +-
 .../pro/rev1/ansi/keymaps/andrebrait/keymap.c | 11 ---
 .../rev1/ansi/keymaps/andrebrait/readme.md    |  2 -
 .../pro/rev1/ansi/keymaps/andrebrait/rules.mk |  2 -
 .../pro/rev1/ansi/keymaps/byungyoonc/keymap.c |  3 +-
 .../pro/rev1/ansi/keymaps/cedrikl/keymap.c    |  5 +-
 .../rev1/ansi/keymaps/coryginsberg/keymap.c   |  3 +-
 .../pro/rev1/ansi/keymaps/default/keymap.c    | 11 ---
 .../pro/rev1/ansi/keymaps/gigahawk/keymap.c   |  3 +-
 .../pro/rev1/ansi/keymaps/hachetman/keymap.c  |  3 +-
 .../pro/rev1/ansi/keymaps/jackkenney/keymap.c |  3 +-
 .../pro/rev1/ansi/keymaps/jonavin/keymap.c    |  3 +-
 .../gmmk/pro/rev1/ansi/keymaps/macos/keymap.c |  3 +-
 .../pro/rev1/ansi/keymaps/mattgauf/keymap.c   |  3 +-
 .../pro/rev1/ansi/keymaps/mike1808/encoder.c  |  3 +-
 .../pro/rev1/ansi/keymaps/paddlegame/keymap.c | 75 ++++++++++---------
 .../rev1/ansi/keymaps/stickandgum/keymap.c    | 25 ++++---
 .../gmmk/pro/rev1/ansi/keymaps/via/keymap.c   | 11 ---
 .../rev1/ansi/keymaps/wholesomeducky/keymap.c |  3 +-
 .../pro/rev1/ansi/keymaps/willwm/keymap.c     |  3 +-
 .../pro/rev1/iso/keymaps/default/keymap.c     | 11 ---
 .../pro/rev1/iso/keymaps/jonavin/keymap.c     |  3 +-
 .../gmmk/pro/rev1/iso/keymaps/via/keymap.c    | 11 ---
 .../gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c |  3 +-
 25 files changed, 83 insertions(+), 125 deletions(-)

diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
index d666454a3e..838aee8652 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
@@ -62,5 +62,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
       tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
index 1438d317fb..dc94302530 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 Andre Brait
+/* Copyright 2022 Andre Brait
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index e5599a787d..5679a1c0d7 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
@@ -102,17 +102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // 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 true;
-}
-#endif // ENCODER_ENABLE
-
 #ifdef RGB_MATRIX_ENABLE
 
 #define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md
index 99d0a36721..b080f02c6b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md
@@ -8,8 +8,6 @@ The differences are as follows:
 - Dedicated MacOS and Windows/Linux layers
   - Switching between them by pressing Fn + CAPS LOCK
 - Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
-- Short DEBOUNCE time (5 ms)
-- Per-key debounce algorithm (sym_defer_pk)
 - RGB turns off after 20 minutes of inactivity
 - RGB turns off when USB is suspended
 - Layer 0:
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
index 057e9a9541..8983ba87c3 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
@@ -1,6 +1,4 @@
 # Enable additional features.
 
-DEBOUNCE_TYPE = sym_defer_pk
-
 # Disabling MouseKey because it breaks my KVM switch
 MOUSEKEY_ENABLE = no
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
index fb60872ea8..b2cab6222f 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
@@ -74,7 +74,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code16(KC_VOLD);
         }
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 #endif  // ENCODER_ENABLE
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index ec20922842..024700174b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
@@ -68,7 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         } else {
             tap_code(KC_VOLD);
         }
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif // ENCODER_ENABLE
 
@@ -77,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer) {
 //    const ledmap *l = &(ledmaps[layer]);
 //
-//    
+//
 //
 //    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
 //        HSV hsv = {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
index 7d2c22506a..b71d18d481 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
@@ -107,5 +107,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   else {
     tap_code(KC_VOLD);
   }
-  return true;
+  //return true; //set to return false to counteract enabled encoder in pro.c
+  return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
index 91f29f8d62..6b48c6bcdf 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
@@ -59,14 +59,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // 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 // ENCODER_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
index 50a0a81769..f8fe872dab 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
@@ -52,7 +52,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
         tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 
 void rgb_matrix_indicators_user(void) {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
index 3be0e5e31b..6a7b2dd733 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
@@ -83,7 +83,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
       tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 #endif // ENCODER_ENABLE
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
index 98354b4654..1bedcab41f 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
@@ -62,5 +62,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   else {
     tap_code(KC_VOLD);
   }
-  return true;
+  //return true; //set to return false to counteract enabled encoder in pro.c
+  return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
index 47490a0617..6fd4f29e09 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
@@ -112,7 +112,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 break;
             }
         }
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif // ENCODER_ENABLE && !ENCODER_DEFAULTACTIONS_ENABLE
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
index 8175cf68c8..3f39229b16 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
@@ -144,7 +144,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     } else {
       tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
   }
 #endif //ENCODER_ENABLE
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
index 020322085b..6e673a4373 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
@@ -173,7 +173,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
         }
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
index 049f4df7e4..43ed195fbb 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
@@ -49,7 +49,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         (*encoder_mapping[state][1])();
     }
 
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 
 void handle_rgb_key(bool pressed) {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
index 164ff67e22..72b4e58df0 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
@@ -86,20 +86,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MO2] = LAYOUT(
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, 
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, 
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, 
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______, 
-        _______,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______, 
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
+        _______,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
         _______,   _______,  _______,                                _______,                                _______,  TG(_MO2), _______,  _______,  _______,  _______
     ),
 
    [_MO3] = LAYOUT(
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, 
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, 
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, 
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______, 
-        _______,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______, 
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
+        _______,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
         _______,   _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______
     ),
 
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				}
 			}
 			break;
-			
+
 			case _BASE:
 			default:
 			if ( clockwise ) {
@@ -136,9 +136,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			} else {
 				tap_code(KC_VOLD);
 			}
-			break;			
+			break;
 		}
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif
 
@@ -149,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		ball[i].up = false;
 		ball[i].y = 0;
 		ball[i].x = rand() % 16;
-		
+
 		// Set initial ball state
 		if (ball[i].x < 8) {
 			ball[i].left = false;
@@ -157,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			ball[i].x -= 4;
 			ball[i].left = true;
 		}
-		
+
 		// 1/4 chance of being an enemy ball after level 6
 		if (level_number > 3) {
 			ball[i].enemy = ((rand() % 4) == 0);
@@ -172,7 +173,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		}
 		damage_timer = timer_read();
 		damage_count = 10;
-		
+
 		// Reset board
 		init_ball(0);
 		ball[1].on = false;
@@ -189,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				rgb_value.g = 0x00;
 				rgb_value.b = 0x00;
 			}
-			
+
 			if (rgb_value.r == 0xff && rgb_value.g < 0xff) {
 				if (rgb_value.b > 0) { --rgb_value.b; }
 				else { ++rgb_value.g; }
@@ -212,17 +213,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             for (uint8_t i=0; i<ARRAY_SIZE(LED_GREEN); i++) {
                 rgb_matrix_set_color(LED_GREEN[i], RGB_GREEN);
             }
-			
+
 			rgb_matrix_set_color(LED_ESC,  RGB_RED);
-			
+
 			rgb_matrix_set_color(LED_LWIN, RGB_BLUE);
 			break;
-			
+
 			case _MO2:
 			// Paddle game
 			if (!game_start) {
 				srand((unsigned int)timer_read());
-				
+
 				// Store user light settings
 				last_hsv = rgb_matrix_get_hsv();
 				rgb_matrix_sethsv_noeeprom(0, 0, 0);
@@ -230,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				rgb_value.r = 0xff;
 				rgb_value.g = 0x00;
 				rgb_value.b = 0x00;
-				
+
 				paddle_pos_full = 8;
 				paddle_lives = 4;
 				bounce_count = 0;
@@ -243,17 +244,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 				game_start = true;
 			}
-			
+
 			// Set level indicator
 			if (level_number < 12) {
 				rgb_matrix_set_color(GAME_R0[level_number], RGB_BLUE);
 			}
-			
+
 			// Set life bar
 			for (uint8_t i=0; i < paddle_lives ; i++) {
 				rgb_matrix_set_color(GAME_LIVES[i], RGB_GREEN);
 			}
-			
+
 			uint8_t paddle_pos = paddle_pos_full >> 1;
 
 			if (damage_count > 0) {
@@ -270,14 +271,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				if (damage_count == 0) {
 					ball_timer = timer_read();
 				}
-				
+
 
 			} else if (paddle_lives == 0) {
 				// Game over
 				for (uint8_t i=0; i<ARRAY_SIZE(LED_GAME_OVER); i++) {
 					rgb_matrix_set_color(LED_GAME_OVER[i], RGB_RED);
 				}
-			
+
 			} else if (level_number >= 12) {
 				// You win
 				if (rgb_value.r == 0xff && rgb_value.g < 0xff) {
@@ -290,7 +291,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 					if (rgb_value.g > 0) { --rgb_value.g; }
 					else { ++rgb_value.r; }
 				}
-				
+
 				for (uint8_t i=0; i < 3 ; i++) {
 					rgb_matrix_set_color(GAME_PADDLE[paddle_pos + i], rgb_value.r, rgb_value.g, rgb_value.b);
 				}
@@ -298,15 +299,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				rgb_matrix_set_color(GAME_SMILE1[paddle_pos + 3], rgb_value.r, rgb_value.g, rgb_value.b);
 				rgb_matrix_set_color(GAME_SMILE2[paddle_pos], rgb_value.r, rgb_value.g, rgb_value.b);
 				rgb_matrix_set_color(GAME_SMILE2[paddle_pos + 3], rgb_value.r, rgb_value.g, rgb_value.b);
-			
+
 			} else {
 				// normal game loop
-				
+
 				// Set paddle position
 				for (uint8_t i=0; i < 3 ; i++) {
 					rgb_matrix_set_color(GAME_PADDLE[paddle_pos + i], RGB_GREEN);
 				}
-				
+
 				// Ball movement logic happens at intervals
 				if (timer_elapsed(ball_timer) > GAME_TIMER[level_number]) {
 					for (int i=0; i<2; ++i) {
@@ -331,7 +332,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 								if (ball[i].y > 4) {
 									// Remove a life if ball isn't returned and isn't enemy
 									if (!ball[i].enemy) {
-										hurt_paddle(); 
+										hurt_paddle();
 										i = 2;
 									} else {
 										ball[i].on = false;
@@ -351,7 +352,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 					}
 					ball_timer = timer_read();
 				}
-				
+
 				// Other ball stuff
 				for (int i=0; i<2; ++i) {
 					if (ball[i].on) {
@@ -410,12 +411,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 							break;
 						}
 					}
-				}				
+				}
 			}
 
-			
+
 			break;
-			
+
 			default:
 			fn_active = false;
 			if (game_start) {
@@ -423,7 +424,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				game_start = false;
 				rgb_matrix_sethsv_noeeprom(last_hsv.h, last_hsv.s, last_hsv.v);
 			}
-			break;			
+			break;
 		}
 
         if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
index e4569ac3ad..ec271a0a37 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
@@ -76,7 +76,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     set_mods(mod_state); // Add back in the CTRL key - so ctrl-key will work if ctrl was never released after paging.
   } else if (get_mods() & MOD_MASK_SHIFT) {
     uint8_t mod_state = get_mods();
-    unregister_mods(MOD_MASK_SHIFT);  
+    unregister_mods(MOD_MASK_SHIFT);
     if (clockwise) {
       #ifdef MOUSEKEY_ENABLE   // If using the mouse scroll - make sure MOUSEKEY is enabled
         tap_code(KC_MS_WH_DOWN);
@@ -96,7 +96,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   } else {
     tap_code(KC_VOLD);
   }
-  return true;
+  //return true; //set to return false to counteract enabled encoder in pro.c
+  return false;
 }
 #endif //ENCODER_ENABLE
 
@@ -108,17 +109,17 @@ static void set_rgb_scroll_leds_off(void);
 
 // Called on powerup and is the last _init that is run.
 void keyboard_post_init_user(void) {
-  
+
    int mods[35] = {0,2,3,4,5,11,17,33,49,55,65,95,97,79,94,85,93,96,90,69,92,67,76,80,91,75,86,68,77,81,92,28,34,39,44};
    int j;
-   
+
    /* output each array element's value */
    for (j = 0; j < 35; j++ ) {
       g_led_config.flags[mods[j]] = LED_FLAG_MODIFIER;
    }
 
-  if (!rgb_matrix_is_enabled()) { 
-      rgb_matrix_enable(); 
+  if (!rgb_matrix_is_enabled()) {
+      rgb_matrix_enable();
 #ifdef CONSOLE_ENABLE
       uprintf("ERROR! RGB Matrix Enabled and wrote to EEPROM! -How was the RGB Matrix Disabled?");
 #endif
@@ -205,15 +206,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case LED_EQL:
         rgb_matrix_mode(RGB_MATRIX_TYPING_HEATMAP);
         break;
-    #endif //RGB_MATRIX_FRAMEBUFFER_EFFECTS 
+    #endif //RGB_MATRIX_FRAMEBUFFER_EFFECTS
     case QMKBEST:
       if (record->event.pressed) { // when keycode QMKBEST is pressed
           SEND_STRING("QMK rocks");
-        } else { // when keycode QMKBEST key is released 
+        } else { // when keycode QMKBEST key is released
           SEND_STRING("!!");
         }
         break;
-  }   
+  }
  return true;
 }
 
@@ -245,7 +246,7 @@ void rgb_matrix_indicators_user(void) {
 //  87, led 07                                                                                                                                                                      88, led 18
 //  91, led 08                                                                                                                                                                      92, led 19
 
-static void set_rgb_caps_leds_on() { 
+static void set_rgb_caps_leds_on() {
         rgb_matrix_set_color(0, 255, 0, 0);       //Escape Key
         rgb_matrix_set_color(3, 255, 0, 0);       //capslock key
         rgb_matrix_set_color(5, 255, 0, 0);       //Left CTRL key
@@ -289,11 +290,11 @@ static void set_rgb_caps_leds_off() {
         rgb_matrix_set_color(92, 0, 0, 0); //Right LED 19
 }
 
-static void set_rgb_scroll_leds_on() { 
+static void set_rgb_scroll_leds_on() {
         rgb_matrix_set_color(72, 255, 255, 255); // Under Rotary (HOME)
 }
 
-static void set_rgb_scroll_leds_off() { 
+static void set_rgb_scroll_leds_off() {
         rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME)
 }
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
index 1f59b52999..be559b082c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
@@ -76,14 +76,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // 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 // ENCODER_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
index fd64902108..e558d84527 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
@@ -53,5 +53,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
       tap_code(KC_MS_WH_LEFT);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
index 2ee79eae79..5343f1b649 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
@@ -69,5 +69,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
         tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
index 0aedb78285..2575eaa7f0 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
@@ -59,14 +59,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // 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/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
index e4b5711e8b..4084d3d2eb 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
@@ -102,7 +102,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 break;
             }
         }
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif // ENCODER_ENABLE && !ENCODER_DEFAULTACTIONS_ENABLE
 
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
index 7d0693c18c..612eead871 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
@@ -78,14 +78,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // 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 // ENCODER_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
index 1e32e7e9c0..2c8a67ef9b 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
@@ -84,7 +84,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
             break;
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 #endif // ENCODER_ENABLE
 

From 29016495782df4bc15da2a4e7b203b4c49f6c276 Mon Sep 17 00:00:00 2001
From: Falke Carlsen <11318702+falkecarlsen@users.noreply.github.com>
Date: Sat, 24 Sep 2022 18:39:44 +0200
Subject: [PATCH 425/959] [Keymap] falkecarlsen gmmk keymap and readme (#17286)

---
 .../rev1/iso/keymaps/falkecarlsen/keymap.c    | 72 +++++++++++++++++++
 .../rev1/iso/keymaps/falkecarlsen/readme.md   |  8 +++
 2 files changed, 80 insertions(+)
 create mode 100644 keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c
 create mode 100644 keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md

diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c
new file mode 100644
index 0000000000..694fd80e19
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c
@@ -0,0 +1,72 @@
+/* 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
new file mode 100644
index 0000000000..4239e0dcb8
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md
@@ -0,0 +1,8 @@
+# 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.

From dfa6fd4b2a5087b4775288038b8956051fd034f8 Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Sun, 25 Sep 2022 02:49:13 +0800
Subject: [PATCH 426/959] [Keyboard] Add Plywrks Allaro (#18275)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/plywrks/allaro/info.json            | 124 ++++++++++++++++++
 .../plywrks/allaro/keymaps/default/keymap.c   |  33 +++++
 keyboards/plywrks/allaro/keymaps/via/keymap.c |  47 +++++++
 keyboards/plywrks/allaro/keymaps/via/rules.mk |   1 +
 keyboards/plywrks/allaro/readme.md            |  26 ++++
 keyboards/plywrks/allaro/rules.mk             |   1 +
 6 files changed, 232 insertions(+)
 create mode 100644 keyboards/plywrks/allaro/info.json
 create mode 100644 keyboards/plywrks/allaro/keymaps/default/keymap.c
 create mode 100644 keyboards/plywrks/allaro/keymaps/via/keymap.c
 create mode 100644 keyboards/plywrks/allaro/keymaps/via/rules.mk
 create mode 100644 keyboards/plywrks/allaro/readme.md
 create mode 100644 keyboards/plywrks/allaro/rules.mk

diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/info.json
new file mode 100644
index 0000000000..aa56aa1103
--- /dev/null
+++ b/keyboards/plywrks/allaro/info.json
@@ -0,0 +1,124 @@
+{
+    "manufacturer": "Plywrks",
+    "keyboard_name": "Allaro",
+    "maintainer": "ramonimbao",
+    "development_board": "promicro",
+
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F7", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["F1", "B7", "B0", "D0", "F5"]
+    },
+    "url": "",
+    "usb": {
+        "vid": "0x706C",
+        "pid": "0x7903",
+        "device_version": "1.0.0"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "pin": "E2",
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT_arisu": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0.4, "y": 0 },
+                { "matrix": [0, 1], "x": 1.55, "y": 0.1 },
+                { "matrix": [0, 2], "x": 2.55, "y": 0.1 },
+                { "matrix": [0, 3], "x": 3.55, "y": 0 },
+                { "matrix": [0, 4], "x": 4.55, "y": 0.1 },
+                { "matrix": [0, 5], "x": 5.55, "y": 0.1 },
+                { "matrix": [0, 6], "x": 6.55, "y": 0.1 },
+                { "matrix": [2, 7], "x": 7.55, "y": 0.1 },
+                { "matrix": [0, 7], "x": 9.75, "y": 0.1 },
+                { "matrix": [0, 8], "x": 10.75, "y": 0.1 },
+                { "matrix": [0, 9], "x": 11.75, "y": 0.1 },
+                { "matrix": [0, 10], "x": 12.75, "y": 0.1 },
+                { "matrix": [0, 11], "x": 13.75, "y": 0 },
+                { "matrix": [0, 12], "x": 14.75, "y": 0.1 },
+                { "matrix": [0, 13], "x": 15.75, "y": 0.1 },
+                { "matrix": [0, 14], "x": 16.75, "y": 0.1 },
+
+                { "matrix": [1, 0], "x": 0.2, "y": 1.0 },
+                { "matrix": [1, 1], "w": 1.5, "x": 1.35, "y": 1.1 },
+                { "matrix": [1, 2], "x": 2.85, "y": 1.1 },
+                { "matrix": [1, 3], "x": 3.85, "y": 1.1 },
+                { "matrix": [1, 4], "x": 4.85, "y": 1.1 },
+                { "matrix": [1, 5], "x": 5.85, "y": 1.1 },
+                { "matrix": [1, 6], "x": 6.85, "y": 1.1 },
+                { "matrix": [1, 7], "x": 9.45, "y": 1.1 },
+                { "matrix": [1, 8], "x": 10.45, "y": 1.1 },
+                { "matrix": [1, 9], "x": 11.45, "y": 1.1 },
+                { "matrix": [1, 10], "x": 12.45, "y": 1.1 },
+                { "matrix": [1, 11], "x": 13.45, "y": 1.1 },
+                { "matrix": [1, 12], "x": 14.45, "y": 1.1 },
+                { "matrix": [1, 13], "x": 15.45, "y": 1.1 },
+                { "matrix": [1, 14], "w": 1.5, "x": 16.45, "y": 1.1 },
+
+                { "matrix": [2, 0], "x": 0, "y": 2.0 },
+                { "matrix": [2, 1], "w": 1.75, "x": 1.15, "y": 2.1 },
+                { "matrix": [2, 2], "x": 2.9, "y": 2.1 },
+                { "matrix": [2, 3], "x": 3.9, "y": 2.1 },
+                { "matrix": [2, 4], "x": 4.9, "y": 2.1 },
+                { "matrix": [2, 5], "x": 5.9, "y": 2.1 },
+                { "matrix": [2, 6], "x": 6.9, "y": 2.1 },
+                { "matrix": [2, 8], "x": 9.9, "y": 2.1 },
+                { "matrix": [2, 9], "x": 10.9, "y": 2.1 },
+                { "matrix": [2, 10], "x": 11.9, "y": 2.1 },
+                { "matrix": [2, 11], "x": 12.9, "y": 2.1 },
+                { "matrix": [2, 12], "x": 13.9, "y": 2.1 },
+                { "matrix": [2, 13], "x": 14.9, "y": 2.1 },
+                { "matrix": [2, 14], "w": 2.25, "x": 15.9, "y": 2.1 },
+
+                { "matrix": [3, 1], "w": 2.25, "x": 0.95, "y": 3.1 },
+                { "matrix": [3, 2], "x": 3.2, "y": 3.1 },
+                { "matrix": [3, 3], "x": 4.2, "y": 3.1 },
+                { "matrix": [3, 4], "x": 5.2, "y": 3.1 },
+                { "matrix": [3, 5], "x": 6.2, "y": 3.1 },
+                { "matrix": [3, 6], "x": 7.2, "y": 3.1 },
+                { "matrix": [3, 7], "x": 9.6, "y": 3.1 },
+                { "matrix": [3, 8], "x": 10.6, "y": 3.1 },
+                { "matrix": [3, 9], "x": 11.6, "y": 3.1 },
+                { "matrix": [3, 10], "x": 12.6, "y": 3.1 },
+                { "matrix": [3, 11], "x": 13.6, "y": 3.1 },
+                { "matrix": [3, 12], "x": 14.6, "y": 3.1 },
+                { "matrix": [3, 13], "x": 15.6, "y": 3.1 },
+                { "matrix": [3, 14], "w": 1.75, "x": 16.6, "y": 3.1 },
+
+                { "matrix": [4, 1], "w": 1.5, "x": 0.95, "y": 4.1 },
+                { "matrix": [4, 3], "w": 1.5, "x": 3.85, "y": 4.1 },
+                { "matrix": [4, 5], "w": 2, "x": 5.35, "y": 4.1 },
+                { "matrix": [4, 6], "w": 1.25, "x": 7.35, "y": 4.1 },
+                { "matrix": [4, 8], "w": 2.75, "x": 9.6, "y": 4.1 },
+                { "matrix": [4, 10], "w": 1.5, "x": 12.35, "y": 4.1 },
+                { "matrix": [4, 12], "x": 14.6, "y": 4.1 },
+                { "matrix": [4, 13], "x": 15.6, "y": 4.1 },
+                { "matrix": [4, 14], "x": 16.6, "y": 4.1 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/plywrks/allaro/keymaps/default/keymap.c b/keyboards/plywrks/allaro/keymaps/default/keymap.c
new file mode 100644
index 0000000000..dbfa2e888e
--- /dev/null
+++ b/keyboards/plywrks/allaro/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2020 MudkipMao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_arisu(
+        KC_ESC,  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,
+                 KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),                     KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_arisu(
+        RGB_TOG, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        RGB_VAI, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,
+        RGB_VAD, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
+                 _______,          _______,          _______, _______,                   _______,          _______,                   KC_END,  KC_PGDN, KC_HOME
+    )
+};
diff --git a/keyboards/plywrks/allaro/keymaps/via/keymap.c b/keyboards/plywrks/allaro/keymaps/via/keymap.c
new file mode 100644
index 0000000000..667ac0f1a6
--- /dev/null
+++ b/keyboards/plywrks/allaro/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2020 MudkipMao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_arisu(
+        KC_ESC,  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,
+                 KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),                     KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_arisu(
+        RGB_TOG, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        RGB_VAI, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,
+        RGB_VAD, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
+                 _______,          _______,          _______, _______,                   _______,          _______,                   KC_END,  KC_PGDN, KC_HOME
+    ),
+    [2] = LAYOUT_arisu(
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______,          _______, _______,                   _______,          _______,                   _______, _______, _______
+    ),
+    [3] = LAYOUT_arisu(
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______,          _______, _______,                   _______,          _______,                   _______, _______, _______
+    )
+};
diff --git a/keyboards/plywrks/allaro/keymaps/via/rules.mk b/keyboards/plywrks/allaro/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/plywrks/allaro/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/plywrks/allaro/readme.md b/keyboards/plywrks/allaro/readme.md
new file mode 100644
index 0000000000..7fb1c1715c
--- /dev/null
+++ b/keyboards/plywrks/allaro/readme.md
@@ -0,0 +1,26 @@
+# Plywrks Allaro
+
+![Allaro](https://i.imgur.com/SwVyLLzl.png)
+
+An Arisu-like hotswap PCB.
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: ATmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make plywrks/allaro:via
+
+Flashing example for this keyboard:
+
+    make plywrks/allaro:via:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - 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/plywrks/allaro/rules.mk b/keyboards/plywrks/allaro/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/plywrks/allaro/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 7caf0b1ab89224c92671e4617f023b6ea1fa1531 Mon Sep 17 00:00:00 2001
From: adophoxia <100170946+adophoxia@users.noreply.github.com>
Date: Sat, 24 Sep 2022 11:53:22 -0700
Subject: [PATCH 427/959] [Keyboard] Add Keychron Q0 (#18348)

---
 keyboards/keychron/q0/config.h                | 101 ++++++++++++++++++
 keyboards/keychron/q0/halconf.h               |  21 ++++
 keyboards/keychron/q0/mcuconf.h               |  22 ++++
 keyboards/keychron/q0/q0.c                    |  57 ++++++++++
 keyboards/keychron/q0/q0.h                    |  23 ++++
 keyboards/keychron/q0/readme.md               |  19 ++++
 keyboards/keychron/q0/rev_0130/config.h       |  24 +++++
 keyboards/keychron/q0/rev_0130/info.json      |  43 ++++++++
 .../q0/rev_0130/keymaps/default/keymap.c      |  37 +++++++
 .../keychron/q0/rev_0130/keymaps/via/keymap.c |  53 +++++++++
 .../keychron/q0/rev_0130/keymaps/via/rules.mk |   1 +
 keyboards/keychron/q0/rev_0130/readme.md      |   1 +
 keyboards/keychron/q0/rev_0130/rev_0130.c     |  88 +++++++++++++++
 keyboards/keychron/q0/rev_0130/rev_0130.h     |  38 +++++++
 keyboards/keychron/q0/rev_0130/rules.mk       |  27 +++++
 15 files changed, 555 insertions(+)
 create mode 100644 keyboards/keychron/q0/config.h
 create mode 100644 keyboards/keychron/q0/halconf.h
 create mode 100644 keyboards/keychron/q0/mcuconf.h
 create mode 100644 keyboards/keychron/q0/q0.c
 create mode 100644 keyboards/keychron/q0/q0.h
 create mode 100644 keyboards/keychron/q0/readme.md
 create mode 100644 keyboards/keychron/q0/rev_0130/config.h
 create mode 100644 keyboards/keychron/q0/rev_0130/info.json
 create mode 100644 keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q0/rev_0130/readme.md
 create mode 100644 keyboards/keychron/q0/rev_0130/rev_0130.c
 create mode 100644 keyboards/keychron/q0/rev_0130/rev_0130.h
 create mode 100644 keyboards/keychron/q0/rev_0130/rules.mk

diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h
new file mode 100644
index 0000000000..40f506fe80
--- /dev/null
+++ b/keyboards/keychron/q0/config.h
@@ -0,0 +1,101 @@
+/* Copyright 2022 @ Keychron(https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS { A5, A6, A7, B0 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 1
+#define DRIVER_ADDR_1 0b1110100
+
+#define CONSTANT_CURRENT_STEP \
+    { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }
+
+/* NKRO */
+#define FORCE_NKRO
+
+/* turn off effects when suspended */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* We have 2KB EEPROM size on STM32L432 */
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
+/* EEPROM Driver Configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+// #define RGB_MATRIX_KEYPRESSES
\ No newline at end of file
diff --git a/keyboards/keychron/q0/halconf.h b/keyboards/keychron/q0/halconf.h
new file mode 100644
index 0000000000..41bddcb279
--- /dev/null
+++ b/keyboards/keychron/q0/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q0/mcuconf.h b/keyboards/keychron/q0/mcuconf.h
new file mode 100644
index 0000000000..0ca8c64850
--- /dev/null
+++ b/keyboards/keychron/q0/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q0/q0.c b/keyboards/keychron/q0/q0.c
new file mode 100644
index 0000000000..c43157ac68
--- /dev/null
+++ b/keyboards/keychron/q0/q0.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "q0.h"
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+#    ifdef RGB_MATRIX_ENABLE
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            return false;
+#    endif
+    }
+    return true;
+}
+
+__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+}
+
+#endif  // NUM_LOCK_LED_INDEX
diff --git a/keyboards/keychron/q0/q0.h b/keyboards/keychron/q0/q0.h
new file mode 100644
index 0000000000..6eaa41e87c
--- /dev/null
+++ b/keyboards/keychron/q0/q0.h
@@ -0,0 +1,23 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_keychron_q0_rev_0130)
+#    include "rev_0130.h"
+#endif
diff --git a/keyboards/keychron/q0/readme.md b/keyboards/keychron/q0/readme.md
new file mode 100644
index 0000000000..d0180d386e
--- /dev/null
+++ b/keyboards/keychron/q0/readme.md
@@ -0,0 +1,19 @@
+# Keychron Q0
+
+A customizable number keypad.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q0
+* Hardware Availability: [Keychron](https://www.keychron.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keychron/q0/rev_0130:default
+
+Flashing example for this keyboard:
+
+    make keychron/q0/rev_0130:default:flash
+
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h
new file mode 100644
index 0000000000..e7fabed664
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 21
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+
+/* Enable num-lock LED */
+#define NUM_LOCK_LED_INDEX 4
diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json
new file mode 100644
index 0000000000..d42a43ef66
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/info.json
@@ -0,0 +1,43 @@
+{
+    "keyboard_name": "Q0",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0130",
+        "device_version": "1.0.2"
+    },
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"label":"Fn", "x":0, "y":0},
+                {"label":"Esc", "x":1, "y":0},
+                {"label":"Backspace", "x":2, "y":0},
+                {"label":"Tab", "x":3, "y":0},
+
+                {"label":"Num Lock", "x":0, "y":1},
+                {"label":"/", "x":1, "y":1},
+                {"label":"*", "x":2, "y":1},
+                {"label":"-", "x":3, "y":1},
+
+                {"label":"7", "x":0, "y":2},
+                {"label":"8", "x":1, "y":2},
+                {"label":"9", "x":2, "y":2},
+
+                {"label":"4", "x":0, "y":3},
+                {"label":"5", "x":1, "y":3},
+                {"label":"6", "x":2, "y":3},
+                {"label":"+", "x":3, "y":2, "h":2},
+
+                {"label":"1", "x":0, "y":4},
+                {"label":"2", "x":1, "y":4},
+                {"label":"3", "x":2, "y":4},
+
+                {"label":"0", "x":0, "y":5, "w":2},
+                {"label":".", "x":2, "y":5},
+                {"label":"Enter", "x":3, "y":4, "h":2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6a05648074
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers { _BASE, _FN1};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_numpad_6x4(
+        MO(_FN1),   KC_ESC,  KC_BSPACE, KC_TAB,
+        KC_NUMLOCK, 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),
+
+    [_FN1] = LAYOUT_numpad_6x4(
+        _______,    KC_MUTE, KC_VOLD,   KC_VOLU,
+        RGB_MOD,    RGB_VAI, RGB_HUI,   KC_DEL,
+        RGB_RMOD,   RGB_VAD, RGB_HUD,
+        RGB_SAI,    RGB_SPI, KC_MPRV,   _______,
+        RGB_SAD,    RGB_SPD, KC_MPLY,
+        RGB_TOG,             KC_MNXT,   _______)
+};
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
new file mode 100644
index 0000000000..078ede4041
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_numpad_6x4(
+        MO(_FN1), KC_ESC,  KC_BSPACE, KC_TAB,
+        KC_NUMLOCK, 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),
+
+    [_FN1] = LAYOUT_numpad_6x4(
+        _______,    KC_MUTE, KC_VOLD,   KC_VOLU,
+        RGB_MOD,    RGB_VAI, RGB_HUI,   KC_DEL,
+        RGB_RMOD,   RGB_VAD, RGB_HUD,
+        RGB_SAI,    RGB_SPI, KC_MPRV,   _______,
+        RGB_SAD,    RGB_SPD, KC_MPLY,
+        RGB_TOG,             KC_MNXT,   _______),
+
+    [_RESERVED1] = LAYOUT_numpad_6x4(
+        _______,    _______, _______,   _______,
+        _______,    _______, _______,   _______,
+        _______,    _______, _______,
+        _______,    _______, _______,   _______,
+        _______,    _______, _______,
+        _______,             _______,   _______),
+
+    [_RESERVED2] = LAYOUT_numpad_6x4(
+        _______,    _______, _______,   _______,
+        _______,    _______, _______,   _______,
+        _______,    _______, _______,
+        _______,    _______, _______,   _______,
+        _______,    _______, _______,
+        _______,             _______,   _______)
+};
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk b/keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q0/rev_0130/readme.md b/keyboards/keychron/q0/rev_0130/readme.md
new file mode 100644
index 0000000000..a6db5bc015
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/readme.md
@@ -0,0 +1 @@
+# The base variant of the Keychron Q0
diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c
new file mode 100644
index 0000000000..468e3cf04f
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/rev_0130.c
@@ -0,0 +1,88 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to CKLED manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, F_5,    D_5,    E_5}, // 0
+    {0, I_5,    G_5,    H_5}, // 1
+    {0, L_5,    J_5,    K_5}, // 2
+    {0, C_5,    A_5,    B_5}, // 3
+
+    {0, F_4,    D_4,    E_4}, // 4
+    {0, I_4,    G_4,    H_4}, // 5
+    {0, L_4,    J_4,    K_4}, // 6
+    {0, C_4,    A_4,    B_4}, // 7
+
+    {0, F_6,    D_6,    E_6}, // 8
+    {0, I_6,    G_6,    H_6}, // 9
+    {0, L_6,    J_6,    K_6}, // 10
+
+    {0, F_3,    D_3,    E_3}, // 11
+    {0, I_3,    G_3,    H_3}, // 12
+    {0, L_3,    J_3,    K_3}, // 13
+    {0, C_6,    A_6,    B_6}, // 14
+
+    {0, F_2,    D_2,    E_2}, // 15
+    {0, I_2,    G_2,    H_2}, // 16
+    {0, L_2,    J_2,    K_2}, // 17
+
+    {0, F_1,    D_1,    E_1}, // 18
+    {0, L_1,    J_1,    K_1}, // 19
+    {0, C_2,    A_2,    B_2}, // 20
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3 },
+        {  4,  5,  6,  7 },
+        {  8,  9, 10, 14 },
+        { 11, 12, 13, __ },
+        { 15, 16, 17, 20 },
+        { 18, __, 19, __ }
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},  {74,0},  {150,0},  {224,0},
+        {0,13}, {74,13}, {150,13}, {224,13},
+        {0,26}, {74,26}, {150,26},
+        {0,38}, {74,38}, {150,38}, {224,32},
+        {0,51}, {74,51}, {150,51},
+        {36,64},         {150,64}, {224,58},
+    },
+    {
+        // LED Index to Flag
+        1, 1, 1, 1,
+        9, 4, 4, 4,
+        4, 4, 4,
+        4, 4, 4, 4,
+        4, 4, 4,
+        4,    4, 1
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.h b/keyboards/keychron/q0/rev_0130/rev_0130.h
new file mode 100644
index 0000000000..d66c880aa9
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/rev_0130.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_numpad_6x4( \
+       K00, K01, K02, K03, \
+       K10, K11, K12, K13, \
+       K20, K21, K22,      \
+       K30, K31, K32, K23, \
+       K40, K41, K42,      \
+       K50,      K52, K43  \
+) \
+{ \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, XXX }, \
+    { K40, K41, K42, K43 }, \
+    { K50, XXX, K52, XXX }, \
+}
diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk
new file mode 100644
index 0000000000..5a04c755cd
--- /dev/null
+++ b/keyboards/keychron/q0/rev_0130/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable.
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = no
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From e88f0adcaed6432a0b1f7f7ea59e9928f0ff871a Mon Sep 17 00:00:00 2001
From: Joe Scotto <me@joescotto.com>
Date: Sat, 24 Sep 2022 14:56:06 -0400
Subject: [PATCH 428/959] [Keyboard] Add Scotto36 Keyboard (#18446)

---
 .../handwired/jscotto/scotto36/info.json      |  77 +++++
 .../jscotto/scotto36/keymaps/default/config.h |  24 ++
 .../jscotto/scotto36/keymaps/default/keymap.c | 281 ++++++++++++++++++
 .../jscotto/scotto36/keymaps/default/rules.mk |   4 +
 .../handwired/jscotto/scotto36/readme.md      |  25 ++
 keyboards/handwired/jscotto/scotto36/rules.mk |   1 +
 6 files changed, 412 insertions(+)
 create mode 100644 keyboards/handwired/jscotto/scotto36/info.json
 create mode 100644 keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
 create mode 100644 keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/jscotto/scotto36/keymaps/default/rules.mk
 create mode 100644 keyboards/handwired/jscotto/scotto36/readme.md
 create mode 100644 keyboards/handwired/jscotto/scotto36/rules.mk

diff --git a/keyboards/handwired/jscotto/scotto36/info.json b/keyboards/handwired/jscotto/scotto36/info.json
new file mode 100644
index 0000000000..b6828edd21
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto36/info.json
@@ -0,0 +1,77 @@
+{
+    "manufacturer": "Joe Scotto",
+    "keyboard_name": "Scotto36",
+    "maintainer": "joe-scotto",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        // 4, 5, 6, 7, 8, 9, A3, A2, A1, A0
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"],
+
+        // 15, 14, 16, 10
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x10_6": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+
+                // Row 2
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+
+                // Row 3
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+
+                // Row 4
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "x": 5, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
new file mode 100644
index 0000000000..8723c294cb
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Define options
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cd9b1599a5
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
@@ -0,0 +1,281 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#include <stdio.h>
+char wpm_str[10];
+
+// Tap Dance declarations
+enum {
+    TD_ESC_SPOTLIGHT_EMOJI,
+    TD_ESC_WINDOWS_EMOJI
+};
+
+void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        tap_code(KC_ESC);
+    } else if (state->count == 2) {
+        tap_code16(G(KC_SPC));
+    } else if (state->count == 3) {
+        tap_code16(C(G(KC_SPC)));
+    }
+}
+
+void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        tap_code(KC_ESC);
+    } else if (state->count == 2) {
+        tap_code(KC_LGUI);
+    } else if (state->count == 3) {
+        tap_code16(G(KC_DOT));
+    }
+};
+
+ // Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
+    [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_ESC_SPOTLIGHT_EMOJI) :
+        case TD(TD_ESC_WINDOWS_EMOJI) :
+        case LGUI_T(KC_SPC) :
+        case LT(1, KC_TAB) :
+        case LT(2, KC_ENT) :
+      return 200;
+    default:
+      return TAPPING_TERM;
+  }
+};
+
+// Layer Names
+enum layer_names {
+    _MAC_DEFAULT,
+    _MAC_CODE,
+    _MAC_NUM,
+    _MAC_FUNC,
+    _WIN_DEFAULT,
+    _WIN_CODE,
+    _WIN_NUM,
+    _WIN_FUNC
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_3x10_6(
+        KC_Q,         KC_W, KC_F,    KC_P,    KC_G,           KC_J,          KC_L,          KC_U,                      KC_Y,   KC_BSPC,
+        KC_A,         KC_R, KC_S,    KC_T,    KC_D,           KC_H,          KC_N,          KC_E,                      KC_I,   KC_O,
+        LSFT_T(KC_Z), KC_X, KC_C,    KC_V,    KC_B,           KC_K,          KC_M,          KC_COMMA,                  KC_DOT, RSFT_T(KC_SLSH),
+                            KC_LCTL, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), TD(TD_ESC_SPOTLIGHT_EMOJI)
+    ),
+    [1] = LAYOUT_ortho_3x10_6(
+        KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN,        KC_GRV,   KC_MRWD, KC_MPLY,                   KC_MFFD, KC_DEL,
+        KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE,        KC_ESC,   KC_LEFT, KC_UP,                     KC_DOWN, KC_RGHT,
+        LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN,        KC_TILDE, KC_VOLD, KC_MUTE,                   KC_VOLU, RSFT_T(KC_BSLS),
+                                  KC_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS,  KC_TRNS, TD(TD_ESC_SPOTLIGHT_EMOJI)
+    ),
+    [2] = LAYOUT_ortho_3x10_6(
+        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,        KC_CIRC, KC_AMPR, KC_ASTR,                   KC_CAPS, KC_BSPC,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,                      KC_9,    KC_0,
+        KC_LSFT, KC_NO,   KC_NO,   KC_NO,   MO(3),          KC_NO,   KC_NO,   KC_COMM,                   KC_DOT,  RSFT_T(KC_SLSH),
+                          KC_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_ESC_SPOTLIGHT_EMOJI)
+    ),
+    [3] = LAYOUT_ortho_3x10_6(
+         KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,          KC_NO,   KC_NO,   KC_NO,                     KC_NO, TO(4),
+         KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,          KC_F6,   KC_F7,   KC_F8,                     KC_F9, KC_F10,
+         KC_F11,  KC_NO, KC_NO,   QK_BOOT, KC_TRNS,        KC_NO,   KC_NO,   KC_NO,                     KC_NO, KC_F12,
+                         KC_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_ESC_SPOTLIGHT_EMOJI)
+     ),
+     [4] = LAYOUT_ortho_3x10_6(
+        KC_Q,         KC_W, KC_F,    KC_P,    KC_G,   KC_J,          KC_L,          KC_U,                    KC_Y,   KC_BSPC,
+        KC_A,         KC_R, KC_S,    KC_T,    KC_D,   KC_H,          KC_N,          KC_E,                    KC_I,   KC_O,
+        LSFT_T(KC_Z), KC_X, KC_C,    KC_V,    KC_B,   KC_K,          KC_M,          KC_COMMA,                KC_DOT, RSFT_T(KC_SLSH),
+                            KC_LALT, KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), TD(TD_ESC_WINDOWS_EMOJI)
+    ),
+    [5] = LAYOUT_ortho_3x10_6(
+        KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN, KC_GRV,  KC_MRWD, KC_MPLY,                 KC_MFFD, KC_DEL,
+        KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC,  KC_LEFT, KC_UP,                   KC_DOWN, KC_RGHT,
+        LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE,KC_VOLD, KC_MUTE,                 KC_VOLU, RSFT_T(KC_BSLS),
+                                  KC_LALT, KC_LCTL, KC_SPC,  KC_TRNS, KC_TRNS, TD(TD_ESC_WINDOWS_EMOJI)
+    ),
+    [6] = LAYOUT_ortho_3x10_6(
+        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,                 KC_CAPS, KC_BSPC,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,                    KC_9,    KC_0,
+        KC_LSFT, KC_NO,   KC_NO,   KC_NO,   MO(7),   KC_NO,   KC_NO,   KC_COMM,                 KC_DOT,  RSFT_T(KC_SLSH),
+                          KC_LALT, KC_LCTL, KC_SPC,  KC_TRNS, KC_TRNS, TD(TD_ESC_WINDOWS_EMOJI)
+    ),
+    [7] = LAYOUT_ortho_3x10_6(
+         KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                   KC_NO, TO(0),
+         KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,                   KC_F9, KC_F10,
+         KC_F11,  KC_NO, KC_NO,   QK_BOOT, KC_TRNS, KC_NO,   KC_NO,   KC_NO,                   KC_NO, KC_F12,
+                         KC_LALT, KC_LCTL, KC_SPC,  KC_TRNS, KC_TRNS, TD(TD_ESC_WINDOWS_EMOJI)
+     )
+};
+
+// OLED
+#ifdef OLED_ENABLE
+// WPM responsiveness
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 20  // Speed at which animation goes into idle
+#define TAP_FRAMES 2
+#define TAP_SPEED 40  // WPM to trigger Bongo
+#define ANIM_FRAME_DURATION 200  // Frame MS
+#define ANIM_SIZE 636  // Number of bytes in array, max 1024
+
+uint32_t anim_timer         = 0;
+uint32_t anim_sleep         = 0;
+uint8_t  current_idle_frame = 0;
+uint8_t current_tap_frame = 0;
+
+static void render_animation(void) {
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+    static const char PROGMEM prep[][ANIM_SIZE]            = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE]   = {
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    };
+
+    void animation_phase(void) {
+        if (get_current_wpm() <= IDLE_SPEED) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+        }
+
+        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
+            oled_write_raw_P(prep[0], ANIM_SIZE);
+        }
+
+        if (get_current_wpm() >= TAP_SPEED) {
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+        }
+    }
+    if (get_current_wpm() != 000) {
+        oled_on();  // Enables OLED on any alpha keypress
+
+        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+
+        anim_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+// Draw to OLED
+bool oled_task_user() {
+    // Render Bongo Cat
+    render_animation();
+
+    // WPM text
+    oled_set_cursor(0, 0);
+    sprintf(wpm_str, "%03d", get_current_wpm()); // %03d defines digits to display
+    oled_write(wpm_str, false);
+
+    // Layer text
+    oled_set_cursor(0, 1);
+    switch (get_highest_layer(layer_state)) {
+        case _MAC_DEFAULT :
+            oled_write_P(PSTR("MAC"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("MAIN"), false);
+            break;
+        case _MAC_CODE :
+            oled_write_P(PSTR("MAC"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("CODE"), false);
+            break;
+        case _MAC_NUM :
+            oled_write_P(PSTR("MAC"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("NUM"), false);
+            break;
+        case _MAC_FUNC :
+            oled_write_P(PSTR("MAC"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("FUNC"), false);
+            break;
+        case _WIN_DEFAULT :
+            oled_write_P(PSTR("WIN"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("MAIN"), false);
+            break;
+        case _WIN_CODE :
+            oled_write_P(PSTR("WIN"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("CODE"), false);
+            break;
+        case _WIN_NUM :
+            oled_write_P(PSTR("WIN"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("NUM"), false);
+            break;
+        case _WIN_FUNC :
+            oled_write_P(PSTR("WIN"), false);
+            oled_set_cursor(0, 2);
+            oled_write_P(PSTR("FUNC"), false);
+            break;
+    }
+
+    // Caps lock text
+    led_t led_state = host_keyboard_led_state();
+    oled_set_cursor(0, 3);
+    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR(""), false);
+    
+    return false;
+}
+#endif
+
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/rules.mk b/keyboards/handwired/jscotto/scotto36/keymaps/default/rules.mk
new file mode 100644
index 0000000000..6e339da6c6
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/rules.mk
@@ -0,0 +1,4 @@
+OLED_ENABLE = yes
+WPM_ENABLE = yes
+LTO_ENABLE = yes
+TAP_DANCE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/jscotto/scotto36/readme.md b/keyboards/handwired/jscotto/scotto36/readme.md
new file mode 100644
index 0000000000..f38d0231c5
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto36/readme.md
@@ -0,0 +1,25 @@
+# Scotto36
+
+![Scotto36](https://i.imgur.com/MCGv0ZHh.jpeg)
+
+A 36 key handwired ortholinear ergo keyboard. Featuring an OLED display with Bongo Cat. Case files available [here](https://github.com/joe-scotto/keyboards.git).
+
+-   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+-   Hardware Supported: ATmega32U4
+-   Hardware Availability: [Amazon](https://amazon.com)
+
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/jscotto/scotto36:default
+
+Flashing example for this keyboard:
+
+    make handwired/jscotto/scotto36:default
+    
+# Bootloader
+Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (0, 0) when plugging the board in to enter bootloader mode.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/jscotto/scotto36/rules.mk b/keyboards/handwired/jscotto/scotto36/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto36/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 431c92893fff5d6678b9ac6d4acd0b6a70b3ebad Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 24 Sep 2022 12:58:10 -0700
Subject: [PATCH 429/959] [Keyboard] Update Work Louder VIA layouts (#18470)

* [Keyboard] Fix Encoder Maps for Work Louder Boards

* Fix via keymap for work board

* Cleanup
---
 .../work_louder/loop/keymaps/via/keymap.c     |  2 +-
 keyboards/work_louder/work_board/config.h     |  4 +++
 .../work_board/keymaps/via/keymap.c           | 29 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/keyboards/work_louder/loop/keymaps/via/keymap.c b/keyboards/work_louder/loop/keymaps/via/keymap.c
index f2f8f7d9a6..5b35be9cf3 100644
--- a/keyboards/work_louder/loop/keymaps/via/keymap.c
+++ b/keyboards/work_louder/loop/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(R_M_RMOD, R_M_MOD) },
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(R_M_RMOD, R_M_MOD) },
     [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 512c282794..b22fba4693 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -123,6 +123,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
+
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
+#define RGB_MATRIX_STARTUP_HUE 191 // Sets the default hue value, if none has been set
+
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index 999ffd9019..d39c5f405d 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -35,32 +35,29 @@ 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, USER09,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-        MO(3),   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+        MO(3),   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
-
     [_LOWER] = LAYOUT(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_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
+        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, _______,
+        _______, _______, _______, MACRO_1, _______, MACRO_0, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
     ),
-
     [_RAISE] = LAYOUT(
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, _______,
         KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
         _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
     ),
-
     [_ADJUST] = LAYOUT(
-        _______, QK_BOOT,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , R_M_TOG,
-        _______, _______, MU_MOD,  R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,  R_M_TOG,
+        _______, _______, MU_MOD,  R_M_TOG, R_M_MOD, _______, _______, _______, _______, R_M_SAI, R_M_HUI, R_M_MOD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, R_M_SAD, R_M_HUD, R_M_RMOD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
-// clang-format on
+
 
 void dance_enc_finished(qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
@@ -117,9 +114,9 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_QWERTY] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-    [_LOWER]  = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
-    [_RAISE]  = { ENCODER_CCW_CW(KC_UP,   KC_DOWN) },
+    [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LOWER]  = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
+    [_RAISE]  = { ENCODER_CCW_CW(R_M_RMOD, R_M_MOD) },
     [_ADJUST] = { ENCODER_CCW_CW(R_M_HUI, R_M_HUD) },
 };
 #endif

From 056d6aee27a452df76b7abcd15ef22172d619033 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 25 Sep 2022 17:54:41 +1000
Subject: [PATCH 430/959] Untangle layouts for Dimple rev3 and Infinity87
 (#18462)

---
 .../lazydesigners/dimple/staggered/info.json  |  49 ----
 .../dimple/staggered/rev1/info.json           |  54 ++++
 .../dimple/staggered/rev2/info.json           |  54 ++++
 .../dimple/staggered/rev3/info.json           | 268 +++++++++---------
 .../dimple/staggered/rev3/rev3.c              |  16 --
 .../dimple/staggered/rev3/rev3.h              |  90 ------
 .../dimple/staggered/staggered.h              |  24 --
 keyboards/mechlovin/infinity87/infinity87.h   |  16 --
 keyboards/mechlovin/infinity87/rev1/rev1.h    |   8 -
 .../infinity87/rev1/rogue87/info.json         | 185 ++++++------
 .../infinity87/rev1/rogue87/rogue87.h         |  34 ---
 .../infinity87/rev1/rouge87/info.json         | 189 ++++++------
 .../infinity87/rev1/rouge87/rouge87.h         |  35 ---
 .../infinity87/rev1/standard/info.json        | 195 +++++++------
 keyboards/mechlovin/infinity87/rev2/info.json | 195 +++++++------
 .../mechlovin/infinity87/rgb_rev1/info.json   | 195 +++++++------
 16 files changed, 757 insertions(+), 850 deletions(-)
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev1/info.json
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev2/info.json
 delete mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
 delete mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
 delete mode 100644 keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h
 delete mode 100644 keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h

diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
index 36be5aefeb..cdce3c767c 100644
--- a/keyboards/lazydesigners/dimple/staggered/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/info.json
@@ -7,54 +7,5 @@
         "vid": "0x4C44",
         "pid": "0x0040",
         "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"Back<br>Space", "x":11, "y":0, "w":1.5},
-              {"label":"Tab", "x":0, "y":1, "w":1.25},
-              {"label":"A", "x":1.25, "y":1},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1},
-              {"label":"F", "x":4.25, "y":1},
-              {"label":"G", "x":5.25, "y":1},
-              {"label":"H", "x":6.25, "y":1},
-              {"label":"J", "x":7.25, "y":1},
-              {"label":"K", "x":8.25, "y":1},
-              {"label":"L", "x":9.25, "y":1},
-              {"label":"'", "x":10.25, "y":1},
-              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-              {"label":"Shift", "x":0, "y":2, "w":1.75},
-              {"label":"Z", "x":1.75, "y":2},
-              {"label":"X", "x":2.75, "y":2},
-              {"label":"C", "x":3.75, "y":2},
-              {"label":"V", "x":4.75, "y":2},
-              {"label":"B", "x":5.75, "y":2},
-              {"label":"N", "x":6.75, "y":2},
-              {"label":"M", "x":7.75, "y":2},
-              {"label":",", "x":8.75, "y":2},
-              {"label":"Up", "x":9.75, "y":2},
-              {"label":".", "x":10.75, "y":2, "w":1.75},
-              {"label":"Ctrl", "x":0.75, "y":3},
-              {"label":"Gui", "x":1.75, "y":3},
-              {"label":"Alt", "x":2.75, "y":3},
-              {"label":"Space", "x":3.75, "y":3, "w":2.25},
-              {"label":"Space", "x":6, "y":3, "w":2.75},
-              {"label":"Left", "x":8.75, "y":3},
-              {"label":"Down", "x":9.75, "y":3},
-              {"label":"Right", "x":10.75, "y":3}
-           ]
-        }
     }
 }
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/info.json b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
new file mode 100644
index 0000000000..7fe8c59ccb
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
@@ -0,0 +1,54 @@
+{
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/info.json b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
new file mode 100644
index 0000000000..7fe8c59ccb
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
@@ -0,0 +1,54 @@
+{
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
index eb1d8b14dc..d1e1568035 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev3/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
@@ -1,144 +1,150 @@
 {
-    "keyboard_name": "Dimple", 
-    "url": "http://lazydesigners.cn", 
-    "maintainer": "Jacky@LAZYDESIGNERS", 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"Back<br>Space", "x":11, "y":0, "w":1.5},
-              {"label":"Tab", "x":0, "y":1, "w":1.25},
-              {"label":"A", "x":1.25, "y":1},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1},
-              {"label":"F", "x":4.25, "y":1},
-              {"label":"G", "x":5.25, "y":1},
-              {"label":"H", "x":6.25, "y":1},
-              {"label":"J", "x":7.25, "y":1},
-              {"label":"K", "x":8.25, "y":1},
-              {"label":"L", "x":9.25, "y":1},
-              {"label":"'", "x":10.25, "y":1},
-              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-              {"label":"Shift", "x":0, "y":2, "w":1.75},
-              {"label":"Z", "x":1.75, "y":2},
-              {"label":"X", "x":2.75, "y":2},
-              {"label":"C", "x":3.75, "y":2},
-              {"label":"V", "x":4.75, "y":2},
-              {"label":"B", "x":5.75, "y":2},
-              {"label":"N", "x":6.75, "y":2},
-              {"label":"M", "x":7.75, "y":2},
-              {"label":",", "x":8.75, "y":2},
-              {"label":"Up", "x":9.75, "y":2},
-              {"label":".", "x":10.75, "y":2, "w":1.75},
-              {"label":"Ctrl", "x":0.75, "y":3},
-              {"label":"Gui", "x":1.75, "y":3},
-              {"label":"Alt", "x":2.75, "y":3},
-              {"label":"Space", "x":3.75, "y":3, "w":2.25},
-              {"label":"Space", "x":6, "y":3, "w":2.75},
-              {"label":"Left", "x":8.75, "y":3},
-              {"label":"Down", "x":9.75, "y":3},
-              {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
         },
         "LAYOUT_iso": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"Tab", "x":0, "y":1, "w":1.25},
-              {"label":"A", "x":1.25, "y":1},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1},
-              {"label":"F", "x":4.25, "y":1},
-              {"label":"G", "x":5.25, "y":1},
-              {"label":"H", "x":6.25, "y":1},
-              {"label":"J", "x":7.25, "y":1},
-              {"label":"K", "x":8.25, "y":1},
-              {"label":"L", "x":9.25, "y":1},
-              {"label":"'", "x":10.25, "y":1},
-              {"label":"Enter", "x":11.25, "y":0, "w":1.25,"h":2},
-              {"label":"Shift", "x":0, "y":2, "w":1.75},
-              {"label":"Z", "x":1.75, "y":2},
-              {"label":"X", "x":2.75, "y":2},
-              {"label":"C", "x":3.75, "y":2},
-              {"label":"V", "x":4.75, "y":2},
-              {"label":"B", "x":5.75, "y":2},
-              {"label":"N", "x":6.75, "y":2},
-              {"label":"M", "x":7.75, "y":2},
-              {"label":",", "x":8.75, "y":2},
-              {"label":"Up", "x":9.75, "y":2},
-              {"label":".", "x":10.75, "y":2, "w":1.75},
-              {"label":"Ctrl", "x":0.75, "y":3},
-              {"label":"Gui", "x":1.75, "y":3},
-              {"label":"Alt", "x":2.75, "y":3},
-              {"label":"Space", "x":3.75, "y":3, "w":2.25},
-              {"label":"Space", "x":6, "y":3, "w":2.75},
-              {"label":"Left", "x":8.75, "y":3},
-              {"label":"Down", "x":9.75, "y":3},
-              {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":0, "w":1.25,"h":2, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
         },
         "LAYOUT_7u": {
             "layout": [
-                    {"label":"Esc", "x":0, "y":0},
-                    {"label":"Q", "x":1, "y":0},
-                    {"label":"W", "x":2, "y":0},
-                    {"label":"E", "x":3, "y":0},
-                    {"label":"R", "x":4, "y":0},
-                    {"label":"T", "x":5, "y":0},
-                    {"label":"Y", "x":6, "y":0},
-                    {"label":"U", "x":7, "y":0},
-                    {"label":"I", "x":8, "y":0},
-                    {"label":"O", "x":9, "y":0},
-                    {"label":"P", "x":10, "y":0},
-                    {"label":"Back<br>Space", "x":11, "y":0, "w":1.5},
-                    {"label":"Tab", "x":0, "y":1, "w":1.25},
-                    {"label":"A", "x":1.25, "y":1},
-                    {"label":"S", "x":2.25, "y":1},
-                    {"label":"D", "x":3.25, "y":1},
-                    {"label":"F", "x":4.25, "y":1},
-                    {"label":"G", "x":5.25, "y":1},
-                    {"label":"H", "x":6.25, "y":1},
-                    {"label":"J", "x":7.25, "y":1},
-                    {"label":"K", "x":8.25, "y":1},
-                    {"label":"L", "x":9.25, "y":1},
-                    {"label":"'", "x":10.25, "y":1},
-                    {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-                    {"label":"Shift", "x":0, "y":2, "w":1.75},
-                    {"label":"Z", "x":1.75, "y":2},
-                    {"label":"X", "x":2.75, "y":2},
-                    {"label":"C", "x":3.75, "y":2},
-                    {"label":"V", "x":4.75, "y":2},
-                    {"label":"B", "x":5.75, "y":2},
-                    {"label":"N", "x":6.75, "y":2},
-                    {"label":"M", "x":7.75, "y":2},
-                    {"label":",", "x":8.75, "y":2},
-                    {"label":"Up", "x":9.75, "y":2},
-                    {"label":".", "x":10.75, "y":2, "w":1.75},
-                    {"label":"Ctrl", "x":0.75, "y":3},
-                    {"label":"Gui", "x":1.75, "y":3},
-                    {"label":"Space", "x":2.75, "y":3, "w":7},
-                    {"label":"Down", "x":9.75, "y":3},
-                    {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Space", "x":2.75, "y":3, "w":7, "matrix": [3, 4]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
         }
     }
 }
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
deleted file mode 100644
index afa1d38b6d..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev3.h"
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
deleted file mode 100644
index 2aec210d9e..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |---------------------------------------------------------------|
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |    |         |             |    |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302, K303, K304,       K306, K307, K308, K309  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |--------------------------------------------------------       |
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |    |         |             |    |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT_iso( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,       \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302, K303, K304,       K306, K307, K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |---------------------------------------------------------------|
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |                                 |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT_7u( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302,       K304,                   K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  KC_NO, K304,  KC_NO, KC_NO, KC_NO, K308,  K309,  KC_NO, KC_NO }  \
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/staggered.h b/keyboards/lazydesigners/dimple/staggered/staggered.h
index 433de3b897..bdaddb7750 100644
--- a/keyboards/lazydesigners/dimple/staggered/staggered.h
+++ b/keyboards/lazydesigners/dimple/staggered/staggered.h
@@ -17,29 +17,5 @@
 
 #include "quantum.h"
 
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |---------------------------------------------------------------|
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |    |         |             |    |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302, K303, K304,       K306, K307, K308, K309  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
 void dimple_led_on(void);
 void dimple_led_off(void);
diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h
index f56d960e92..b7b00bef40 100644
--- a/keyboards/mechlovin/infinity87/infinity87.h
+++ b/keyboards/mechlovin/infinity87/infinity87.h
@@ -16,19 +16,3 @@
 #pragma once
 
 #include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,            K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D,  K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,            K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,       K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h
index de623a1cdd..167ed6940a 100644
--- a/keyboards/mechlovin/infinity87/rev1/rev1.h
+++ b/keyboards/mechlovin/infinity87/rev1/rev1.h
@@ -17,11 +17,3 @@
 #pragma once
 
 #include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_infinity87_rev1_rogue87
-    #include "rogue87.h"
-#elif KEYBOARD_mechlovin_infinity87_rev1_rouge87
-    #include "rouge87.h"
-#elif KEYBOARD_mechlovin_infinity87_rev1_standard
-    #include "infinity87.h"
-#endif
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
index b9906b410b..25fa20a9c7 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
@@ -11,92 +11,105 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":2, "y":0},
-                {"label":"K02", "x":3, "y":0},
-                {"label":"K03", "x":4, "y":0},
-                {"label":"K04", "x":5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":8.5, "y":0},
-                {"label":"K08", "x":9.5, "y":0},
-                {"label":"K09", "x":11, "y":0},
-                {"label":"K0A", "x":12, "y":0},
-                {"label":"K0B", "x":13, "y":0},
-                {"label":"K0C", "x":14, "y":0},
-                {"label":"K0E", "x":15.25, "y":0},
-                {"label":"K0F", "x":16.25, "y":0},
-                {"label":"K0G", "x":17.25, "y":0},
-                {"label":"K10", "x":0, "y":1.25},
-                {"label":"K11", "x":1, "y":1.25},
-                {"label":"K12", "x":2, "y":1.25},
-                {"label":"K13", "x":3, "y":1.25},
-                {"label":"K14", "x":4, "y":1.25},
-                {"label":"K15", "x":5, "y":1.25},
-                {"label":"K16", "x":6, "y":1.25},
-                {"label":"K17", "x":7, "y":1.25},
-                {"label":"K18", "x":8, "y":1.25},
-                {"label":"K19", "x":9, "y":1.25},
-                {"label":"K1A", "x":10, "y":1.25},
-                {"label":"K1B", "x":11, "y":1.25},
-                {"label":"K1C", "x":12, "y":1.25},
-                {"label":"K1D", "x":13, "y":1.25, "w":2},
-                {"label":"K1E", "x":15.25, "y":1.25},
-                {"label":"K1F", "x":16.25, "y":1.25},
-                {"label":"K1G", "x":17.25, "y":1.25},
-                {"label":"K20", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21", "x":1.5, "y":2.25},
-                {"label":"K22", "x":2.5, "y":2.25},
-                {"label":"K23", "x":3.5, "y":2.25},
-                {"label":"K24", "x":4.5, "y":2.25},
-                {"label":"K25", "x":5.5, "y":2.25},
-                {"label":"K26", "x":6.5, "y":2.25},
-                {"label":"K27", "x":7.5, "y":2.25},
-                {"label":"K28", "x":8.5, "y":2.25},
-                {"label":"K29", "x":9.5, "y":2.25},
-                {"label":"K2A", "x":10.5, "y":2.25},
-                {"label":"K2B", "x":11.5, "y":2.25},
-                {"label":"K2C", "x":12.5, "y":2.25},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E", "x":15.25, "y":2.25},
-                {"label":"K2F", "x":16.25, "y":2.25},
-                {"label":"K2G", "x":17.25, "y":2.25},
-                {"label":"K30", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31", "x":1.75, "y":3.25},
-                {"label":"K32", "x":2.75, "y":3.25},
-                {"label":"K33", "x":3.75, "y":3.25},
-                {"label":"K34", "x":4.75, "y":3.25},
-                {"label":"K35", "x":5.75, "y":3.25},
-                {"label":"K36", "x":6.75, "y":3.25},
-                {"label":"K37", "x":7.75, "y":3.25},
-                {"label":"K38", "x":8.75, "y":3.25},
-                {"label":"K39", "x":9.75, "y":3.25},
-                {"label":"K3A", "x":10.75, "y":3.25},
-                {"label":"K3B", "x":11.75, "y":3.25},
-                {"label":"K3C", "x":12.75, "y":3.25},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4.25},
-                {"label":"K42", "x":2.25, "y":4.25},
-                {"label":"K43", "x":3.25, "y":4.25},
-                {"label":"K44", "x":4.25, "y":4.25},
-                {"label":"K45", "x":5.25, "y":4.25},
-                {"label":"K46", "x":6.25, "y":4.25},
-                {"label":"K47", "x":7.25, "y":4.25},
-                {"label":"K48", "x":8.25, "y":4.25},
-                {"label":"K49", "x":9.25, "y":4.25},
-                {"label":"K4A", "x":10.25, "y":4.25},
-                {"label":"K4B", "x":11.25, "y":4.25},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F", "x":16.25, "y":4.25},
-                {"label":"K50", "x":0, "y":5.25, "w":1.5},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"K56", "x":4, "y":5.25, "w":7},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"K5E", "x":15.25, "y":5.25},
-                {"label":"K5F", "x":16.25, "y":5.25},
-                {"label":"K5G", "x":17.25, "y":5.25}
+                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+
+                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+
+                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
+                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
+                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
+                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
+                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
+
+                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h b/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h
deleted file mode 100644
index 70a50b9620..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,     K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                    \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D,               K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D,     K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F,   K0G  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO}, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,   KC_NO, K4F,   KC_NO}, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G  }, \
-}
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
index 2957247ad4..983d20fdbf 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
@@ -11,94 +11,107 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":2, "y":0},
-                {"label":"K02", "x":3, "y":0},
-                {"label":"K03", "x":4, "y":0},
-                {"label":"K04", "x":5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":8.5, "y":0},
-                {"label":"K08", "x":9.5, "y":0},
-                {"label":"K09", "x":11, "y":0},
-                {"label":"K0A", "x":12, "y":0},
-                {"label":"K0B", "x":13, "y":0},
-                {"label":"K0C", "x":14, "y":0},
-                {"label":"K0E", "x":15.25, "y":0},
-                {"label":"K0F", "x":16.25, "y":0},
-                {"label":"K0G", "x":17.25, "y":0},
-                {"label":"K10", "x":0, "y":1.25},
-                {"label":"K11", "x":1, "y":1.25},
-                {"label":"K12", "x":2, "y":1.25},
-                {"label":"K13", "x":3, "y":1.25},
-                {"label":"K14", "x":4, "y":1.25},
-                {"label":"K15", "x":5, "y":1.25},
-                {"label":"K16", "x":6, "y":1.25},
-                {"label":"K17", "x":7, "y":1.25},
-                {"label":"K18", "x":8, "y":1.25},
-                {"label":"K19", "x":9, "y":1.25},
-                {"label":"K1A", "x":10, "y":1.25},
-                {"label":"K1B", "x":11, "y":1.25},
-                {"label":"K1C", "x":12, "y":1.25},
-                {"label":"K1D", "x":13, "y":1.25, "w":2},
-                {"label":"K1E", "x":15.25, "y":1.25},
-                {"label":"K1F", "x":16.25, "y":1.25},
-                {"label":"K1G", "x":17.25, "y":1.25},
-                {"label":"K20", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21", "x":1.5, "y":2.25},
-                {"label":"K22", "x":2.5, "y":2.25},
-                {"label":"K23", "x":3.5, "y":2.25},
-                {"label":"K24", "x":4.5, "y":2.25},
-                {"label":"K25", "x":5.5, "y":2.25},
-                {"label":"K26", "x":6.5, "y":2.25},
-                {"label":"K27", "x":7.5, "y":2.25},
-                {"label":"K28", "x":8.5, "y":2.25},
-                {"label":"K29", "x":9.5, "y":2.25},
-                {"label":"K2A", "x":10.5, "y":2.25},
-                {"label":"K2B", "x":11.5, "y":2.25},
-                {"label":"K2C", "x":12.5, "y":2.25},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E", "x":15.25, "y":2.25},
-                {"label":"K2F", "x":16.25, "y":2.25},
-                {"label":"K2G", "x":17.25, "y":2.25},
-                {"label":"K30", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31", "x":1.75, "y":3.25},
-                {"label":"K32", "x":2.75, "y":3.25},
-                {"label":"K33", "x":3.75, "y":3.25},
-                {"label":"K34", "x":4.75, "y":3.25},
-                {"label":"K35", "x":5.75, "y":3.25},
-                {"label":"K36", "x":6.75, "y":3.25},
-                {"label":"K37", "x":7.75, "y":3.25},
-                {"label":"K38", "x":8.75, "y":3.25},
-                {"label":"K39", "x":9.75, "y":3.25},
-                {"label":"K3A", "x":10.75, "y":3.25},
-                {"label":"K3B", "x":11.75, "y":3.25},
-                {"label":"K3C", "x":12.75, "y":3.25},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4.25},
-                {"label":"K42", "x":2.25, "y":4.25},
-                {"label":"K43", "x":3.25, "y":4.25},
-                {"label":"K44", "x":4.25, "y":4.25},
-                {"label":"K45", "x":5.25, "y":4.25},
-                {"label":"K46", "x":6.25, "y":4.25},
-                {"label":"K47", "x":7.25, "y":4.25},
-                {"label":"K48", "x":8.25, "y":4.25},
-                {"label":"K49", "x":9.25, "y":4.25},
-                {"label":"K4A", "x":10.25, "y":4.25},
-                {"label":"K4B", "x":11.25, "y":4.25},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F", "x":16.25, "y":4.25},
-                {"label":"K50", "x":0, "y":5.25, "w":1.5},
-                {"label":"K51", "x":1.5, "y":5.25},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"K56", "x":4, "y":5.25, "w":7},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5},
-                {"label":"K5C", "x":12.5, "y":5.25},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"K5E", "x":15.25, "y":5.25},
-                {"label":"K5F", "x":16.25, "y":5.25},
-                {"label":"K5G", "x":17.25, "y":5.25}
+                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+
+                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+
+                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
+                {"label":"K51", "x":1.5, "y":5.25, "matrix": [5, 1]},
+                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
+                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
+                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
+                {"label":"K5C", "x":12.5, "y":5.25, "matrix": [5, 12]},
+                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
+
+                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h b/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h
deleted file mode 100644
index 67dcefde26..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,     K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                    \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D,               K4F,       \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,     K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F,   K0G  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO}, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,   KC_NO, K4F,   KC_NO}, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G  }, \
-}
-
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
index e19d4dbe7d..29597cce3f 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json
@@ -11,97 +11,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":2, "y":0},
-                {"label":"K02 (B0,C0)", "x":3, "y":0},
-                {"label":"K03 (B0,C1)", "x":4, "y":0},
-                {"label":"K04 (B0,C2)", "x":5, "y":0},
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":11, "y":0},
-                {"label":"K0A (B0,D0)", "x":12, "y":0},
-                {"label":"K0B (B0,D1)", "x":13, "y":0},
-                {"label":"K0C (B0,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
+                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+
+                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
+                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+
+                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
+                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
+                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
+                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+
+                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index 609f6b1700..62aa3cfeb0 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -11,97 +11,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":2, "y":0},
-                {"label":"K02 (B0,C0)", "x":3, "y":0},
-                {"label":"K03 (B0,C1)", "x":4, "y":0},
-                {"label":"K04 (B0,C2)", "x":5, "y":0},
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":11, "y":0},
-                {"label":"K0A (B0,D0)", "x":12, "y":0},
-                {"label":"K0B (B0,D1)", "x":13, "y":0},
-                {"label":"K0C (B0,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
+                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+
+                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
+                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+
+                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
+                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
+                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
+                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+
+                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index 0589e3f712..fc308175cf 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -11,97 +11,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":2, "y":0},
-                {"label":"K02 (B0,C0)", "x":3, "y":0},
-                {"label":"K03 (B0,C1)", "x":4, "y":0},
-                {"label":"K04 (B0,C2)", "x":5, "y":0},
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":11, "y":0},
-                {"label":"K0A (B0,D0)", "x":12, "y":0},
-                {"label":"K0B (B0,D1)", "x":13, "y":0},
-                {"label":"K0C (B0,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
+                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+
+                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
+                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+
+                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
+                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
+                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
+                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
+                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+
+                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }

From c7a65558ee70310b607393c4a69f1ef953f7b138 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 25 Sep 2022 03:32:51 -0600
Subject: [PATCH 431/959] Remove lingering `DRIVER_LED_TOTAL` references
 (#18475)

---
 keyboards/drop/sense75/config.h           | 2 +-
 keyboards/drop/sense75/sense75.c          | 2 +-
 keyboards/keychron/q0/rev_0130/config.h   | 2 +-
 keyboards/keychron/q0/rev_0130/rev_0130.c | 2 +-
 keyboards/saevus/cor_tkl/config.h         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/drop/sense75/config.h b/keyboards/drop/sense75/config.h
index b0196d0c44..53fea6b103 100644
--- a/keyboards/drop/sense75/config.h
+++ b/keyboards/drop/sense75/config.h
@@ -13,7 +13,7 @@
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_ADDR_2 0b1011111
 #    define DRIVER_COUNT 2
-#    define DRIVER_LED_TOTAL (58 + 53)
+#    define RGB_MATRIX_LED_COUNT (58 + 53)
 #    define ISSI_PWM_FREQUENCY 0b010 // 26k
 
 #    define RGB_DISABLE_TIMEOUT 0
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
index 8087f5c72e..a8cb28b054 100644
--- a/keyboards/drop/sense75/sense75.c
+++ b/keyboards/drop/sense75/sense75.c
@@ -3,7 +3,7 @@
 #include "rgb_matrix.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 // top underglow sd2-sd17
     { 0, B_2,  A_2,  C_2  },
     { 0, B_3,  A_3,  C_3  },
diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h
index e7fabed664..126d636589 100644
--- a/keyboards/keychron/q0/rev_0130/config.h
+++ b/keyboards/keychron/q0/rev_0130/config.h
@@ -18,7 +18,7 @@
 
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 21
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
 /* Enable num-lock LED */
 #define NUM_LOCK_LED_INDEX 4
diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c
index 468e3cf04f..2803239b53 100644
--- a/keyboards/keychron/q0/rev_0130/rev_0130.c
+++ b/keyboards/keychron/q0/rev_0130/rev_0130.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to CKLED manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/saevus/cor_tkl/config.h b/keyboards/saevus/cor_tkl/config.h
index 449f2da113..6be72c6495 100644
--- a/keyboards/saevus/cor_tkl/config.h
+++ b/keyboards/saevus/cor_tkl/config.h
@@ -21,6 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Matrix setup */
 #define RGB_DI_PIN GP19
-#define DRIVER_LED_TOTAL 2
+#define RGB_MATRIX_LED_COUNT 2
 #define RGBLED_NUM 2
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral

From 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 25 Sep 2022 22:04:52 +1000
Subject: [PATCH 432/959] Fix `tzarc/djinn` screen geometry. (#18478)

---
 keyboards/tzarc/djinn/djinn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c
index 5e5fe44c67..e6529e555d 100644
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@@ -70,7 +70,7 @@ void keyboard_post_init_kb(void) {
     wait_ms(150);
 
     // Initialise the LCD
-    lcd = qp_ili9341_make_spi_device(320, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 0);
+    lcd = qp_ili9341_make_spi_device(240, 320, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 0);
     qp_init(lcd, QP_ROTATION_0);
 
     // Turn on the LCD and clear the display
@@ -230,4 +230,4 @@ void housekeeping_task_kb(void) {
     if (last_input_activity_elapsed() > 250) {
         matrix_wait_for_interrupt();
     }
-}
\ No newline at end of file
+}

From d84b1d101381098293bbee028c88762d56aec863 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 25 Sep 2022 11:56:58 -0600
Subject: [PATCH 433/959] Fixup cradio bootloader/processor (#18477)

---
 keyboards/cradio/info.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
index 0b9cbb1fed..140a156306 100644
--- a/keyboards/cradio/info.json
+++ b/keyboards/cradio/info.json
@@ -9,7 +9,8 @@
       "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
-    "protocol": "atmel-dfu",
+    "bootloader": "atmel-dfu",
+    "pin_compatible": "promicro",
     "debounce": 5,
     "features": {
         "bootmagic": true,

From ab58ae582ed720caf0738361d876186712021394 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 26 Sep 2022 02:03:19 +0800
Subject: [PATCH 434/959] [Keyboard] Layout matrix correction (#18473)

---
 keyboards/cradio/info.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
index 0b9cbb1fed..44077d0d86 100644
--- a/keyboards/cradio/info.json
+++ b/keyboards/cradio/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Cradio",
     "manufacturer": "DPB",
-    "url": "https://github.com/davidphilipbarr/Sweep",
+    "url": "https://github.com/davidphilipbarr/hypergolic",
     "maintainer": "@davidphilipbarr",
     "usb": {
       "vid": "0xC88B",
@@ -57,33 +57,33 @@
                 { "label": "L03", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
                 { "label": "L04", "matrix": [0, 3], "w": 1, "x": 3, "y": 0.28 },
                 { "label": "L05", "matrix": [0, 4], "w": 1, "x": 4, "y": 0.42 },
-                { "label": "L06", "matrix": [1, 0], "w": 1, "x": 0, "y": 2.27 },
-                { "label": "L07", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.31 },
-                { "label": "L08", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-                { "label": "L09", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.28 },
-                { "label": "L10", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.42 },
-                { "label": "L11", "matrix": [2, 0], "w": 1, "x": 0, "y": 3.27 },
-                { "label": "L12", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.31 },
-                { "label": "L13", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-                { "label": "L14", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.28 },
-                { "label": "L15", "matrix": [2, 4], "w": 1, "x": 4, "y": 2.42 },
-                { "label": "L16", "matrix": [3, 0], "w": 1, "x": 4, "y": 3.9 },
-                { "label": "L17", "matrix": [3, 1], "w": 1, "x": 5, "y": 3.7 },
                 { "label": "R01", "matrix": [4, 0], "w": 1, "x": 8, "y": 0.42 },
                 { "label": "R02", "matrix": [4, 1], "w": 1, "x": 9, "y": 0.28 },
                 { "label": "R03", "matrix": [4, 2], "w": 1, "x": 10, "y": 0 },
                 { "label": "R04", "matrix": [4, 3], "w": 1, "x": 11, "y": 0.31 },
                 { "label": "R05", "matrix": [4, 4], "w": 1, "x": 12, "y": 1.27 },
+                { "label": "L06", "matrix": [1, 0], "w": 1, "x": 0, "y": 2.27 },
+                { "label": "L07", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.31 },
+                { "label": "L08", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
+                { "label": "L09", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.28 },
+                { "label": "L10", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.42 },
                 { "label": "R06", "matrix": [5, 0], "w": 1, "x": 8, "y": 1.42 },
                 { "label": "R07", "matrix": [5, 1], "w": 1, "x": 9, "y": 1.28 },
                 { "label": "R08", "matrix": [5, 2], "w": 1, "x": 10, "y": 1 },
                 { "label": "R09", "matrix": [5, 3], "w": 1, "x": 11, "y": 1.31 },
                 { "label": "R10", "matrix": [5, 4], "w": 1, "x": 12, "y": 2.27 },
+                { "label": "L11", "matrix": [2, 0], "w": 1, "x": 0, "y": 3.27 },
+                { "label": "L12", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.31 },
+                { "label": "L13", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+                { "label": "L14", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.28 },
+                { "label": "L15", "matrix": [2, 4], "w": 1, "x": 4, "y": 2.42 },
                 { "label": "R11", "matrix": [6, 0], "w": 1, "x": 8, "y": 2.42 },
                 { "label": "R12", "matrix": [6, 1], "w": 1, "x": 9, "y": 2.28 },
                 { "label": "R13", "matrix": [6, 2], "w": 1, "x": 10, "y": 2 },
                 { "label": "R14", "matrix": [6, 3], "w": 1, "x": 11, "y": 2.31 },
                 { "label": "R15", "matrix": [6, 4], "w": 1, "x": 12, "y": 3.27 },
+                { "label": "L16", "matrix": [3, 0], "w": 1, "x": 4, "y": 3.9 },
+                { "label": "L17", "matrix": [3, 1], "w": 1, "x": 5, "y": 3.7 },
                 { "label": "R16", "matrix": [7, 0], "w": 1, "x": 7, "y": 3.7 },
                 { "label": "R17", "matrix": [7, 1], "w": 1, "x": 8, "y": 3.9 }
             ]

From 5abb125b025750d7015d1a9cafc5a861cedfa9b3 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 25 Sep 2022 13:04:00 -0700
Subject: [PATCH 435/959] [Keymap] develop updates for Drashna Keymaps (#18472)

---
 .../charybdis/3x5/keymaps/drashna/rules.mk    |   2 +-
 .../charybdis/4x6/keymaps/drashna/rules.mk    |   2 +-
 .../dilemma/keymaps/drashna/rules.mk          |   2 +-
 .../5x6_right/keymaps/drashna/rules.mk        |   6 +-
 keyboards/moonlander/keymaps/drashna/rules.mk |   2 +-
 .../splitkb/kyria/keymaps/drashna/rules.mk    |   2 +-
 .../work_board/keymaps/drashna/rules.mk       |   2 +-
 users/drashna/callbacks.c                     |   2 +-
 users/drashna/drashna.c                       |  12 +
 .../autocorrection/autocorrection.c           | 304 ------------------
 .../autocorrection/autocorrection.h           |  17 -
 .../autocorrection/autocorrection_data.h      |   1 -
 .../make_autocorrection_data.py               | 298 -----------------
 .../keyrecords/autocorrection/readme.md       | 301 -----------------
 users/drashna/keyrecords/process_records.c    |   6 -
 users/drashna/keyrecords/process_records.h    |   3 -
 users/drashna/oled/oled_stuff.c               |  15 +-
 users/drashna/pointing/pointing.c             | 119 +++----
 users/drashna/pointing/pointing.h             |   2 +-
 users/drashna/post_config.h                   |   4 +
 users/drashna/rules.mk                        |  10 +-
 users/drashna/split/transport_sync.c          |  10 +-
 22 files changed, 84 insertions(+), 1038 deletions(-)
 delete mode 100644 users/drashna/keyrecords/autocorrection/autocorrection.c
 delete mode 100644 users/drashna/keyrecords/autocorrection/autocorrection.h
 delete mode 100644 users/drashna/keyrecords/autocorrection/autocorrection_data.h
 delete mode 100755 users/drashna/keyrecords/autocorrection/make_autocorrection_data.py
 delete mode 100644 users/drashna/keyrecords/autocorrection/readme.md

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
index 1369213cf2..dc0395c800 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
@@ -23,6 +23,6 @@ MOUSEKEY_ENABLE = yes
 NKRO_ENABLE = yes
 CONSOLE_ENABLE = yes
 
-AUTOCORRECTION_ENABLE = yes
+AUTOCORRECT_ENABLE = yes
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
index 336750bc90..d655fbd5dc 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
@@ -24,7 +24,7 @@ SERIAL_DRIVER         = usart
 AUDIO_DRIVER          = pwm_hardware
 BACKLIGHT_DRIVER      = pwm
 
-AUTOCORRECTION_ENABLE = yes
+AUTOCORRECT_ENABLE = yes
 CAPS_WORD_ENABLE      = yes
 SWAP_HANDS_ENABLE     = yes
 TAP_DANCE_ENABLE      = yes
diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
index 5f4afb7259..41d73bc49a 100644
--- a/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
@@ -1,5 +1,5 @@
 SWAP_HANDS_ENABLE     = no
-AUTOCORRECTION_ENABLE = yes
+AUTOCORRECT_ENABLE    = yes
 CAPS_WORD_ENABLE      = yes
 CONSOLE_ENABLE        = yes
 KEYLOGGER_ENABLE      = no
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 72824cf055..8b227d4cbd 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -8,7 +8,7 @@ OLED_ENABLE                      = yes
 WPM_ENABLE                       = yes
 ENCODER_ENABLE                   = yes
 ENCODER_MAP_ENABLE               = yes
-AUTOCORRECTION_ENABLE            = yes
+AUTOCORRECT_ENABLE               = yes
 CAPS_WORD_ENABLE                 = yes
 DEFERRED_EXEC_ENABLE             = yes
 
@@ -20,7 +20,7 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
     OLED_ENABLE                  = no
     WPM_ENABLE                   = no
     ENCODER_ENABLE               = no
-    AUTOCORRECTION_ENABLE        = no
+    AUTOCORRECT_ENABLE           = no
     LTO_SUPPORTED                = yes
     SWAP_HANDS_ENABLE            = no
     CUSTOM_UNICODE_ENABLE        = no
@@ -29,7 +29,7 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
     BOOTLOADER_SIZE              = 512
 endif
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
-    AUTOCORRECTION_ENABLE        = no
+    AUTOCORRECT_ENABLE           = no
     CAPS_WORD_ENABLE             = yes
 endif
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
diff --git a/keyboards/moonlander/keymaps/drashna/rules.mk b/keyboards/moonlander/keymaps/drashna/rules.mk
index feb91c774b..927d956e9d 100644
--- a/keyboards/moonlander/keymaps/drashna/rules.mk
+++ b/keyboards/moonlander/keymaps/drashna/rules.mk
@@ -2,5 +2,5 @@ TAP_DANCE_ENABLE      = yes
 BOOTMAGIC_ENABLE      = yes      # Enable Bootmagic Lite
 UNICODE_ENABLE        = yes
 UNICODEMAP_ENABLE     = no
-AUTOCORRECTION_ENABLE = yes
+AUTOCORRECT_ENABLE    = yes
 CAPS_WORD_ENABLE      = yes
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
index e57dd11f13..882a3fba09 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
@@ -18,7 +18,7 @@ ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c)
     SWAP_HANDS_ENABLE      = yes
     LTO_ENABLE             = no
     ENCODER_MAP_ENABLE     = yes
-    AUTOCORRECTION_ENABLE  = yes
+    AUTOCORRECT_ENABLE     = yes
     CAPS_WORD_ENABLE       = yes
     OLED_DRIVER            = custom
 else
diff --git a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk
index 6cccd5f8d2..6a98d14daf 100644
--- a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk
+++ b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk
@@ -6,5 +6,5 @@ NKRO_ENABLE                 = yes
 RGBLIGHT_STARTUP_ANIMATION  = yes
 ENCODER_MAP_ENABLE          = yes
 
-AUTOCORRECTION_ENABLE = no
+AUTOCORRECT_ENABLE    = no
 CUSTOM_UNICODE_ENABLE = no
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c
index 111b5f79d7..40383f124f 100644
--- a/users/drashna/callbacks.c
+++ b/users/drashna/callbacks.c
@@ -49,7 +49,7 @@ void                       keyboard_post_init_user(void) {
     keyboard_post_init_transport_sync();
 #endif
 #ifdef I2C_SCANNER_ENABLE
-    matrix_scan_i2c();
+    keyboard_post_init_i2c();
 #endif
 
     keyboard_post_init_keymap();
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 91f3a06b7c..d63f05b590 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -129,3 +129,15 @@ void keyboard_post_init_i2c(void) {
     scan_timer = timer_read();
 }
 #endif
+
+#if defined(AUTOCORRECT_ENABLE) && defined(AUDIO_ENABLE)
+#    ifdef USER_SONG_LIST
+float autocorrect_song[][2] = SONG(MARIO_GAMEOVER);
+#    else
+float autocorrect_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
+#    endif
+bool apply_autocorrect(uint8_t backspaces, const char *str) {
+    PLAY_SONG(autocorrect_song);
+    return true;
+}
+#endif
diff --git a/users/drashna/keyrecords/autocorrection/autocorrection.c b/users/drashna/keyrecords/autocorrection/autocorrection.c
deleted file mode 100644
index 90fdba8f5e..0000000000
--- a/users/drashna/keyrecords/autocorrection/autocorrection.c
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2021 Google LLC
-// Copyright 2021 @filterpaper
-// SPDX-License-Identifier: Apache-2.0
-// Original source: https://getreuer.info/posts/keyboards/autocorrection
-
-#include "autocorrection.h"
-#include <string.h>
-
-#if __has_include("autocorrection_data.h")
-#    pragma GCC push_options
-#    pragma GCC optimize("O0")
-#    include "autocorrection_data.h"
-#    ifndef AUTOCORRECTION_MIN_LENGTH
-#        define AUTOCORRECTION_MIN_LENGTH AUTOCORRECT_MIN_LENGTH
-#    endif
-#    ifndef AUTOCORRECTION_MAX_LENGTH
-#        define AUTOCORRECTION_MAX_LENGTH AUTOCORRECT_MAX_LENGTH
-#    endif
-#    define autocorrection_data autocorrect_data
-#    if AUTOCORRECTION_MIN_LENGTH < 4
-#        error Minimum Length is too short and may cause overflows
-#    endif
-#    if DICTIONARY_SIZE > SIZE_MAX
-#        error Dictionary size excees maximum size permitted
-#    endif
-
-static uint8_t typo_buffer[AUTOCORRECT_MAX_LENGTH] = {KC_SPC};
-static uint8_t typo_buffer_size                    = 1;
-
-/**
- * @brief function for querying the enabled state of autocorrect
- *
- * @return true if enabled
- * @return false if disabled
- */
-bool autocorrect_is_enabled(void) {
-    return userspace_config.autocorrection;
-}
-
-/**
- * @brief Enables autocorrect and saves state to eeprom
- *
- */
-void autocorrect_enable(void) {
-    userspace_config.autocorrection = true;
-    eeconfig_update_user(userspace_config.raw);
-}
-
-/**
- * @brief Disables autocorrect and saves state to eeprom
- *
- */
-void autocorrect_disable(void) {
-    userspace_config.autocorrection = false;
-    typo_buffer_size                = 0;
-    eeconfig_update_user(userspace_config.raw);
-}
-
-/**
- * @brief Toggles autocorrect's status and save state to eeprom
- *
- */
-void autocorrect_toggle(void) {
-    userspace_config.autocorrection = !userspace_config.autocorrection;
-    typo_buffer_size                = 0;
-    eeconfig_update_user(userspace_config.raw);
-}
-
-/**
- * @brief handler for determining if autocorrect should process keypress
- *
- * @param keycode Keycode registered by matrix press, per keymap
- * @param record keyrecord_t structure
- * @param typo_buffer_size passed along to allow resetting of autocorrect buffer
- * @param mods allow processing of mod status
- * @return true Allow autocorection
- * @return false Stop processing and escape from autocorrect.
- */
-__attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods) {
-    // See quantum_keycodes.h for reference on these matched ranges.
-    switch (*keycode) {
-        // Exclude these keycodes from processing.
-        case KC_LSFT:
-        case KC_RSFT:
-        case KC_CAPS:
-        case QK_TO ... QK_ONE_SHOT_LAYER_MAX:
-        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
-        case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
-            return false;
-
-        // Mask for base keycode from shifted keys.
-        case QK_LSFT ... QK_LSFT + 255:
-        case QK_RSFT ... QK_RSFT + 255:
-            if (*keycode >= QK_LSFT && *keycode <= (QK_LSFT + 255)) {
-                *mods |= MOD_LSFT;
-            } else {
-                *mods |= MOD_RSFT;
-            }
-            *keycode &= 0xFF; // Get the basic keycode.
-            return true;
-#    ifndef NO_ACTION_TAPPING
-        // Exclude tap-hold keys when they are held down
-        // and mask for base keycode when they are tapped.
-        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
-#        ifdef NO_ACTION_LAYER
-            // Exclude Layer Tap, if layers are disabled
-            // but action tapping is still enabled.
-            return false;
-#        endif
-        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-            // Exclude hold keycode
-            if (!record->tap.count) {
-                return false;
-            }
-            *keycode &= 0xFF;
-            break;
-#    else
-        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
-            // Exclude if disabled
-            return false;
-#    endif
-        // Exclude swap hands keys when they are held down
-        // and mask for base keycode when they are tapped.
-        case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
-#    ifdef SWAP_HANDS_ENABLE
-            if (*keycode >= 0x56F0 || !record->tap.count) {
-                return false;
-            }
-            *keycode &= 0xFF;
-            break;
-#    else
-            // Exclude if disabled
-            return false;
-#    endif
-    }
-
-    // Disable autocorrect while a mod other than shift is active.
-    if ((*mods & ~MOD_MASK_SHIFT) != 0) {
-        *typo_buffer_size = 0;
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * @brief handling for when autocorrection has been triggered
- *
- * @param backspaces number of characters to remove
- * @param str pointer to PROGMEM string to replace mistyped seletion with
- * @return true apply correction
- * @return false user handled replacement
- */
-__attribute__((weak)) bool apply_autocorrect(uint8_t backspaces, const char *str) {
-    return true;
-}
-
-/**
- * @brief Process handler for autocorrect feature
- *
- * @param keycode Keycode registered by matrix press, per keymap
- * @param record keyrecord_t structure
- * @return true Continue processing keycodes, and send to host
- * @return false Stop processing keycodes, and don't send to host
- */
-bool process_autocorrection(uint16_t keycode, keyrecord_t *record) {
-    uint8_t mods = get_mods();
-#    ifndef NO_ACTION_ONESHOT
-    mods |= get_oneshot_mods();
-#    endif
-
-    if ((keycode >= AUTOCORRECT_ON && keycode <= AUTOCORRECT_TOGGLE) && record->event.pressed) {
-        if (keycode == AUTOCORRECT_ON) {
-            autocorrect_enable();
-        } else if (keycode == AUTOCORRECT_OFF) {
-            autocorrect_disable();
-        } else if (keycode == AUTOCORRECT_TOGGLE) {
-            autocorrect_toggle();
-        } else {
-            return true;
-        }
-
-        return false;
-    }
-
-    if (!autocorrect_is_enabled()) {
-        typo_buffer_size = 0;
-        return true;
-    }
-
-    if (!record->event.pressed) {
-        return true;
-    }
-
-    // autocorrect keycode verification and extraction
-    if (!process_autocorrect_user(&keycode, record, &typo_buffer_size, &mods)) {
-        return true;
-    }
-
-    // keycode buffer check
-    switch (keycode) {
-        case KC_A ... KC_Z:
-            // process normally
-            break;
-        case KC_1 ... KC_0:
-        case KC_TAB ... KC_SEMICOLON:
-        case KC_GRAVE ... KC_SLASH:
-            // Set a word boundary if space, period, digit, etc. is pressed.
-            keycode = KC_SPC;
-            break;
-        case KC_ENTER:
-            // Behave more conservatively for the enter key. Reset, so that enter
-            // can't be used on a word ending.
-            typo_buffer_size = 0;
-            keycode          = KC_SPC;
-            break;
-        case KC_BSPC:
-            // Remove last character from the buffer.
-            if (typo_buffer_size > 0) {
-                --typo_buffer_size;
-            }
-            return true;
-        case KC_QUOTE:
-            // Treat " (shifted ') as a word boundary.
-            if ((mods & MOD_MASK_SHIFT) != 0) {
-                keycode = KC_SPC;
-            }
-            break;
-        default:
-            // Clear state if some other non-alpha key is pressed.
-            typo_buffer_size = 0;
-            return true;
-    }
-
-    // Rotate oldest character if buffer is full.
-    if (typo_buffer_size >= AUTOCORRECT_MAX_LENGTH) {
-        memmove(typo_buffer, typo_buffer + 1, AUTOCORRECT_MAX_LENGTH - 1);
-        typo_buffer_size = AUTOCORRECT_MAX_LENGTH - 1;
-    }
-
-    // Append `keycode` to buffer.
-    typo_buffer[typo_buffer_size++] = keycode;
-    // Return if buffer is smaller than the shortest word.
-    if (typo_buffer_size < AUTOCORRECT_MIN_LENGTH) {
-        return true;
-    }
-
-    // Check for typo in buffer using a trie stored in `autocorrect_data`.
-    uint16_t state = 0;
-    uint8_t  code  = pgm_read_byte(autocorrect_data + state);
-    for (int8_t i = typo_buffer_size - 1; i >= 0; --i) {
-        uint8_t const key_i = typo_buffer[i];
-
-        if (code & 64) { // Check for match in node with multiple children.
-            code &= 63;
-            for (; code != key_i; code = pgm_read_byte(autocorrect_data + (state += 3))) {
-                if (!code) return true;
-            }
-            // Follow link to child node.
-            state = (pgm_read_byte(autocorrect_data + state + 1) | pgm_read_byte(autocorrect_data + state + 2) << 8);
-            // Check for match in node with single child.
-        } else if (code != key_i) {
-            return true;
-        } else if (!(code = pgm_read_byte(autocorrect_data + (++state)))) {
-            ++state;
-        }
-
-        // Stop if `state` becomes an invalid index. This should not normally
-        // happen, it is a safeguard in case of a bug, data corruption, etc.
-        if (state >= DICTIONARY_SIZE) {
-            return true;
-        }
-
-        code = pgm_read_byte(autocorrect_data + state);
-
-        if (code & 128) { // A typo was found! Apply autocorrect.
-            const uint8_t backspaces = (code & 63) + !record->event.pressed;
-            if (apply_autocorrect(backspaces, (char const *)(autocorrect_data + state + 1))) {
-                for (uint8_t i = 0; i < backspaces; ++i) {
-                    tap_code(KC_BSPC);
-                }
-                send_string_P((char const *)(autocorrect_data + state + 1));
-            }
-
-            if (keycode == KC_SPC) {
-                typo_buffer[0]   = KC_SPC;
-                typo_buffer_size = 1;
-                return true;
-            } else {
-                typo_buffer_size = 0;
-                return false;
-            }
-        }
-    }
-    return true;
-}
-#    pragma GCC pop_options
-#else
-#    pragma message "Warning!!! Autocorrect is not corretly setup!"
-bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
-    return true;
-}
-#endif
diff --git a/users/drashna/keyrecords/autocorrection/autocorrection.h b/users/drashna/keyrecords/autocorrection/autocorrection.h
deleted file mode 100644
index 8946b91f1f..0000000000
--- a/users/drashna/keyrecords/autocorrection/autocorrection.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2021 Google LLC
-// Copyright 2021 @filterpaper
-// SPDX-License-Identifier: Apache-2.0
-// Original source: https://getreuer.info/posts/keyboards/autocorrection
-
-#pragma once
-
-#include "drashna.h"
-
-bool process_autocorrection(uint16_t keycode, keyrecord_t *record);
-bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods);
-bool apply_autocorrect(uint8_t backspaces, const char *str);
-
-bool autocorrect_is_enabled(void);
-void autocorrect_enable(void);
-void autocorrect_disable(void);
-void autocorrect_toggle(void);
diff --git a/users/drashna/keyrecords/autocorrection/autocorrection_data.h b/users/drashna/keyrecords/autocorrection/autocorrection_data.h
deleted file mode 100644
index 90484d3b12..0000000000
--- a/users/drashna/keyrecords/autocorrection/autocorrection_data.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "autocorrect_data.h"
diff --git a/users/drashna/keyrecords/autocorrection/make_autocorrection_data.py b/users/drashna/keyrecords/autocorrection/make_autocorrection_data.py
deleted file mode 100755
index 0dd9b78b9c..0000000000
--- a/users/drashna/keyrecords/autocorrection/make_autocorrection_data.py
+++ /dev/null
@@ -1,298 +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.
-
-"""Python program to make autocorrection_data.h.
-
-This program reads "autocorrection_dict.txt" and generates a C source file
-"autocorrection_data.h" with a serialized trie embedded as an array. Run this
-program without arguments like
-
-$ python3 make_autocorrection_data.py
-
-Or to read from a different typo dict file, pass it as the first argument like
-
-$ python3 make_autocorrection_data.py dict.txt
-
-Each line of the dict file defines one typo and its correction with the syntax
-"typo -> correction". Blank lines or lines starting with '#' are ignored.
-Example:
-
-  :thier        -> their
-  dosen't       -> doesn't
-  fitler        -> filter
-  lenght        -> length
-  ouput         -> output
-  widht         -> width
-
-See autocorrection_dict_extra.txt for a larger example.
-
-For full documentation, see
-https://getreuer.info/posts/keyboards/autocorrection
-"""
-
-import sys
-import textwrap
-from typing import Any, Dict, Iterator, List, Tuple
-
-try:
-  from english_words import english_words_lower_alpha_set as CORRECT_WORDS
-except ImportError:
-  print('Autocorrection will falsely trigger when a typo is a substring of a '
-        'correctly spelled word. To check for this, install the english_words '
-        'package and rerun this script:\n\n  pip install english_words\n')
-  # Use a minimal word list as a fallback.
-  CORRECT_WORDS = ('apparent', 'association', 'available', 'classification',
-                   'effect', 'entertainment', 'fantastic', 'information',
-                   'integrate', 'international', 'language', 'loosest',
-                   'manual', 'nothing', 'provides', 'reference', 'statehood',
-                   'technology', 'virtually', 'wealthier', 'wonderful')
-
-KC_A = 4
-KC_SPC = 0x2c
-KC_QUOT = 0x34
-
-TYPO_CHARS = dict(
-  [
-    ("'", KC_QUOT),
-    (':', KC_SPC),  # "Word break" character.
-  ] +
-  # Characters a-z.
-  [(chr(c), c + KC_A - ord('a')) for c in range(ord('a'), ord('z') + 1)]
-)
-
-
-def parse_file(file_name: str) -> List[Tuple[str, str]]:
-  """Parses autocorrections dictionary file.
-
-  Each line of the file defines one typo and its correction with the syntax
-  "typo -> correction". Blank lines or lines starting with '#' are ignored. The
-  function validates that typos only have characters in TYPO_CHARS, that
-  typos are not substrings of other typos, and checking that typos don't trigger
-  on CORRECT_WORDS.
-
-  Args:
-    file_name: String, path of the autocorrections dictionary.
-  Returns:
-    List of (typo, correction) tuples.
-  """
-  correct_words = ('information', 'available', 'international', 'language', 'loosest', 'reference', 'wealthier', 'entertainment', 'association', 'provides', 'technology', 'statehood')
-  autocorrections = []
-  typos = set()
-  for line_number, typo, correction in parse_file_lines(file_name):
-    if typo in typos:
-      print(f'Warning:{line_number}: Ignoring duplicate typo: "{typo}"')
-      continue
-
-    # Check that `typo` is valid.
-    if not(all([c in TYPO_CHARS for c in typo])):
-      print(f'Error:{line_number}: Typo "{typo}" has '
-            'characters other than ' + ''.join(TYPO_CHARS.keys()))
-      sys.exit(1)
-    for other_typo in typos:
-      if typo in other_typo or other_typo in typo:
-        print(f'Error:{line_number}: Typos may not be substrings of one '
-              f'another, otherwise the longer typo would never trigger: '
-              f'"{typo}" vs. "{other_typo}".')
-        sys.exit(1)
-    if len(typo) < 5:
-      print(f'Warning:{line_number}: It is suggested that typos are at '
-            f'least 5 characters long to avoid false triggers: "{typo}"')
-
-    check_typo_against_dictionary(typo, line_number, correct_words)
-
-    autocorrections.append((typo, correction))
-    typos.add(typo)
-
-  return autocorrections
-
-
-def make_trie(autocorrections: List[Tuple[str, str]]) -> Dict[str, Any]:
-  """Makes a trie from the the typos, writing in reverse.
-
-  Args:
-    autocorrections: List of (typo, correction) tuples.
-  Returns:
-    Dict of dict, representing the trie.
-  """
-  trie = {}
-  for typo, correction in autocorrections:
-    node = trie
-    for letter in typo[::-1]:
-      node = node.setdefault(letter, {})
-    node['LEAF'] = (typo, correction)
-
-  return trie
-
-
-def parse_file_lines(file_name: str) -> Iterator[Tuple[int, str, str]]:
-  """Parses lines read from `file_name` into typo-correction pairs."""
-
-  line_number = 0
-  for line in open(file_name, 'rt'):
-    line_number += 1
-    line = line.strip()
-    if line and line[0] != '#':
-      # Parse syntax "typo -> correction", using strip to ignore indenting.
-      tokens = [token.strip() for token in line.split('->', 1)]
-      if len(tokens) != 2 or not tokens[0]:
-        print(f'Error:{line_number}: Invalid syntax: "{line}"')
-        sys.exit(1)
-
-      typo, correction = tokens
-      typo = typo.lower()  # Force typos to lowercase.
-      typo = typo.replace(' ', ':')
-
-      yield line_number, typo, correction
-
-
-def check_typo_against_dictionary(typo: str, line_number: int, correct_words) -> None:
-  """Checks `typo` against English dictionary words."""
-
-  if typo.startswith(':') and typo.endswith(':'):
-    if typo[1:-1] in correct_words:
-      print(f'Warning:{line_number}: Typo "{typo}" is a correctly spelled dictionary word.')
-  elif typo.startswith(':') and not typo.endswith(':'):
-    for word in correct_words:
-      if word.startswith(typo[1:]):
-            print(f'Warning:{line_number}: Typo "{typo}" would falsely trigger on correctly spelled word "{word}".')
-  elif not typo.startswith(':') and typo.endswith(':'):
-    for word in correct_words:
-      if word.endswith(typo[:-1]):
-            print(f'Warning:{line_number}: Typo "{typo}" would falsely trigger on correctly spelled word "{word}".')
-  elif not typo.startswith(':') and not typo.endswith(':'):
-    for word in correct_words:
-      if typo in word:
-        print(f'Warning:{line_number}: Typo "{typo}" would falsely trigger on correctly spelled word "{word}".')
-
-
-def serialize_trie(autocorrections: List[Tuple[str, str]],
-                   trie: Dict[str, Any]) -> List[int]:
-  """Serializes trie and correction data in a form readable by the C code.
-
-  Args:
-    autocorrections: List of (typo, correction) tuples.
-    trie: Dict of dicts.
-  Returns:
-    List of ints in the range 0-255.
-  """
-  table = []
-
-  # Traverse trie in depth first order.
-  def traverse(trie_node: Dict[str, Any]) -> Dict[str, Any]:
-    if 'LEAF' in trie_node:  # Handle a leaf trie node.
-      typo, correction = trie_node['LEAF']
-      word_boundary_ending = typo[-1] == ':'
-      typo = typo.strip(':')
-      i = 0  # Make the autocorrection data for this entry and serialize it.
-      while i < min(len(typo), len(correction)) and typo[i] == correction[i]:
-        i += 1
-      backspaces = len(typo) - i - 1 + word_boundary_ending
-      assert 0 <= backspaces <= 63
-      correction = correction[i:]
-      data = [backspaces + 128] + list(bytes(correction, 'ascii')) + [0]
-
-      entry = {'data': data, 'links': [], 'byte_offset': 0}
-      table.append(entry)
-    elif len(trie_node) == 1:  # Handle trie node with a single child.
-      c, trie_node = next(iter(trie_node.items()))
-      entry = {'chars': c, 'byte_offset': 0}
-
-      # It's common for a trie to have long chains of single-child nodes. We
-      # find the whole chain so that we can serialize it more efficiently.
-      while len(trie_node) == 1 and 'LEAF' not in trie_node:
-        c, trie_node = next(iter(trie_node.items()))
-        entry['chars'] += c
-
-      table.append(entry)
-      entry['links'] = [traverse(trie_node)]
-    else:  # Handle trie node with multiple children.
-      entry = {'chars': ''.join(sorted(trie_node.keys())), 'byte_offset': 0}
-      table.append(entry)
-      entry['links'] = [traverse(trie_node[c]) for c in entry['chars']]
-    return entry
-
-  traverse(trie)
-
-  def serialize(e: Dict[str, Any]) -> List[int]:
-    if not e['links']:  # Handle a leaf table entry.
-      return e['data']
-    elif len(e['links']) == 1:  # Handle a chain table entry.
-      return [TYPO_CHARS[c] for c in e['chars']] + [0]
-    else:  # Handle a branch table entry.
-      data = []
-      for c, link in zip(e['chars'], e['links']):
-        data += [TYPO_CHARS[c] | (0 if data else 64)] + encode_link(link)
-      return data + [0]
-
-  byte_offset = 0
-  for e in table:  # To encode links, first compute byte offset of each entry.
-    e['byte_offset'] = byte_offset
-    byte_offset += len(serialize(e))
-
-  return [b for e in table for b in serialize(e)]  # Serialize final table.
-
-
-def encode_link(link: Dict[str, Any]) -> List[int]:
-  """Encodes a node link as two bytes."""
-  byte_offset = link['byte_offset']
-  if not (0 <= byte_offset <= 0xffff):
-    print('Error: The autocorrection table is too large, a node link exceeds '
-          '64KB limit. Try reducing the autocorrection dict to fewer entries.')
-    sys.exit(1)
-  return [byte_offset & 255, byte_offset >> 8]
-
-
-def write_generated_code(autocorrections: List[Tuple[str, str]],
-                         data: List[int],
-                         file_name: str) -> None:
-  """Writes autocorrection data as generated C code to `file_name`.
-
-  Args:
-    autocorrections: List of (typo, correction) tuples.
-    data: List of ints in 0-255, the serialized trie.
-    file_name: String, path of the output C file.
-  """
-  assert all(0 <= b <= 255 for b in data)
-
-  def typo_len(e: Tuple[str, str]) -> int:
-    return len(e[0])
-
-  min_typo = min(autocorrections, key=typo_len)[0]
-  max_typo = max(autocorrections, key=typo_len)[0]
-  generated_code = ''.join([
-    '// Generated code.\n\n',
-    f'// Autocorrection dictionary ({len(autocorrections)} entries):\n',
-    ''.join(sorted(f'//   {typo:<{len(max_typo)}} -> {correction}\n'
-                   for typo, correction in autocorrections)),
-    f'\n#define AUTOCORRECTION_MIN_LENGTH {len(min_typo)}  // "{min_typo}"\n',
-    f'#define AUTOCORRECTION_MAX_LENGTH {len(max_typo)}  // "{max_typo}"\n\n',
-    textwrap.fill('static const uint8_t autocorrection_data[%d] PROGMEM = {%s};' % (
-      len(data), ', '.join(map(str, data))), width=80, subsequent_indent='  '),
-    '\n\n'])
-
-  with open(file_name, 'wt') as f:
-    f.write(generated_code)
-
-
-def main(argv):
-  dict_file = argv[1] if len(argv) > 1 else 'autocorrection_dict.txt'
-  autocorrections = parse_file(dict_file)
-  trie = make_trie(autocorrections)
-  data = serialize_trie(autocorrections, trie)
-  print(f'Processed %d autocorrection entries to table with %d bytes.'
-        % (len(autocorrections), len(data)))
-  write_generated_code(autocorrections, data, 'autocorrection_data.h')
-
-if __name__ == '__main__':
-  main(sys.argv)
diff --git a/users/drashna/keyrecords/autocorrection/readme.md b/users/drashna/keyrecords/autocorrection/readme.md
deleted file mode 100644
index d920508793..0000000000
--- a/users/drashna/keyrecords/autocorrection/readme.md
+++ /dev/null
@@ -1,301 +0,0 @@
-# Autocorrection
-
-This is taken from [Pascal Getreuer's implemenation](https://getreuer.info/posts/keyboards/autocorrection/index.html), with a number of modifications. 
-
-To enabled Autocorrection, add `AUTOCORRECTION_ENABLE = yes` to your `rules.mk` file. 
-
-This is mostly a reproduction of Pascal's docs:
-
-## Overview
-Some words are more prone to typos than others. I have a habit of typo-ing *ouput* and *fitler*. This post describes a rudimentary autocorrection implementation that runs on your keyboard with QMK.
-
-The animation below shows the effect as I type *aparent*. As I press the final t, the autocorrection feature detects the typo and automatically sends keys to correct it:
-
-Example: Autocorrecting *aparent* → apparent.
-
-**Features**:
-* It runs on your keyboard, so it is always active no matter what software.
-* Low resource cost: for an autocorrection dictionary of 70 entries, firmware size cost is 1620 bytes and average CPU cost per key press is about 20 µs.
-* It is case insensitive. It corrects Fitler to Filter and FITLER to FILTER.
-* It works within words. It corrects fitlered, fitlering, and useful for programming, within longer identifiers like DesignButterworthFitle*r.
-
-**Limitations**: Running autocorrection on the keyboard comes with some constraints. It is rudimentary like I said:
-* It is limited to alphabet characters a–z. No accented or Unicode letters; I’m sorry this probably isn’t useful for languages besides English.
-* It does not follow mouse or hotkey driven cursor movement.
-
-## Taking autocorrection for a test drive
-With the above flashed to your keyboard, try for instance typing the misspelled word ouput. The instant you type the final t, the word should be speedily autocorrected to output. As further tests, try becuase and invliad.
-
-Here is the full list of typos corrected using the provided autocorrection_data.h file. : is a special character denoting a word break. See below for how to change the autocorrection dictionary.
-
-```
-:guage        -> gauge
-:the:the:     -> the
-:thier        -> their
-:ture         -> true
-accomodate    -> accommodate
-acommodate    -> accommodate
-aparent       -> apparent
-aparrent      -> apparent
-apparant      -> apparent
-apparrent     -> apparent
-aquire        -> acquire
-becuase       -> because
-cauhgt        -> caught
-cheif         -> chief
-choosen       -> chosen
-cieling       -> ceiling
-collegue      -> colleague
-concensus     -> consensus
-contians      -> contains
-cosnt         -> const
-dervied       -> derived
-fales         -> false
-fasle         -> false
-fitler        -> filter
-flase         -> false
-foward        -> forward
-frequecy      -> frequency
-gaurantee     -> guarantee
-guaratee      -> guarantee
-heigth        -> height
-heirarchy     -> hierarchy
-inclued       -> include
-interator     -> iterator
-intput        -> input
-invliad       -> invalid
-lenght        -> length
-liasion       -> liaison
-libary        -> library
-listner       -> listener
-looses:       -> loses
-looup         -> lookup
-manefist      -> manifest
-namesapce     -> namespace
-namespcae     -> namespace
-occassion     -> occasion
-occured       -> occurred
-ouptut        -> output
-ouput         -> output
-overide       -> override
-postion       -> position
-priviledge    -> privilege
-psuedo        -> pseudo
-recieve       -> receive
-refered       -> referred
-relevent      -> relevant
-repitition    -> repetition
-reuslt        -> result
-retrun        -> return
-retun         -> return
-reutrn        -> return
-saftey        -> safety
-seperate      -> separate
-singed        -> signed
-stirng        -> string
-strign        -> string
-swithc        -> switch
-swtich        -> switch
-thresold      -> threshold
-udpate        -> update
-widht         -> width
-```
-
-## Firmware size and CPU costs
-I am anxiously aware that a keyboard microcontroller has limited resources. So I was sure to measure how much memory and CPU time autocorrection consumes during development. These measurements are for the example autocorrection dictionary as used above, which has 70 entries:
-* **Firmware size**: Autocorrection increases my firmware size by a total of 1620 bytes. Breaking that down, 1104 bytes are for the autocorrection_data array and 516 bytes for the autocorrection code.
-* **CPU time**: On my Elite-C microcontrollers, the average CPU time for process_autocorrection to process an alpha key press is around 20 µs. Consider this a rough order-of-magnitude cost. Processing cost increases (more trie nodes are visited) when recent input is close to a known typo, with the max being when a long typo is matched.
-
-The costs are not free but reasonable. For reference, the firmware size cost for mouse keys is 2124 bytes and the CPU time to process a layer switch is about 70 µs, so autocorrection is cheaper than those things. Of course, the cost scales with the size of the autocorrection dictionary, so keep that in mind if you add a lot more entries.
-
-## How does it work?
-The function process_autocorrection maintains a small buffer of recent key presses. On each key press, it checks whether the buffer ends in a recognized typo, and if so, automatically sends keystrokes to correct it.
-
-The tricky part is how to efficiently check the buffer for typos. We don’t want to spend too much memory or time on storing or searching the typos. A good solution is to represent the typos with a trie data structure. A trie is a tree data structure where each node is a letter, and words are formed by following a path to one of the leaves.
-
-
-An example trie.
-Since we search whether the buffer ends in a typo, we store the trie writing in reverse. The trie is queried starting from the last letter, then second to last letter, and so on, until either a letter doesn’t match or we reach a leaf, meaning a typo was found.
-
-## Changing the autocorrection dictionary
-The file autocorrection_data.h encodes the typos to correct. While you could simply use the version of this file provided above for a practical configuration, you can make your own to personalize the autocorrection to your most troublesome typos:
-
-1. First, create an autocorrection dictionary autocorrection_dict.txt, like
-
-  ```
-:thier        -> their
-fitler        -> filter
-lenght        -> length
-ouput         -> output
-widht         -> width
-```
-  For a practical 70-entry example, see autocorrection_dict.txt. And for a yet larger 400-entry example, see autocorrection_dict_extra.txt.
-
-  The syntax is `typo -> correction`. Typos and corrections are case insensitive, and any whitespace before or after the typo and correction is ignored. The typo must be only the letters a–z, or the special character : representing a word break. The correction may have any characters.
-
-2. Use the make_autocorrection_data.py Python script to process the dictionary
-
-```
-$ python3 make_autocorrection_data.py
-Processed 70 autocorrection entries to table with 1104 bytes.
-```
-The script arranges the entries in autocorrection_dict.txt into a trie and generates autocorrection_data.h with the serialized trie embedded as an array.
-
-3. Finally, recompile and flash your keymap.
-
-The generated C header looks like this:
-
-autocorrection_data.h
-```c
-// Generated code.
-
-#define AUTOCORRECTION_MIN_LENGTH 5  // "cheif"
-#define AUTOCORRECTION_MAX_LENGTH 10  // "accomodate"
-
-static const uint8_t autocorrection_data[1104] PROGMEM = {108, 43, 0, 6,
-  71, 0, 7, 81, 0, 8, 199, 0, 9, 240, 1, 10, 250, 1, 11, 26, 2, 17, 53, 2,
-  18, 190, 2, 19, 202, 2, 21, 212, 2, 22, 20, 3, 23, 67, 3, 28, 16, 4, 0,
-  72, 50, 0, 22, 60, 0, 0, 11, 23, 44, 8, 11, 23, 44, 0, 132, 0, 8, 22, 18,
-  18, 15, 0, 132, 115, 101, 115, 0, 11, 23, 12, 26, 22, 0, 129, 99, 104, 0,
-  68, 94, 0, 8, 106, 0, 15, 174, 0, 21, 187, 0, 0, 12, 15, 25, 17, 12, 0,
-  131, 97, 108, 105, 100, 0, 74, 119, 0, 12, 129, 0, 21, 140, 0, 24, 165,
-  0, 0, 17, 12, 22, 0, 131, 103, 110, 101, 100, 0, 25, 21, 8, 7, 0, 131,
-  105, 118, 101, 100, 0, 72, 147, 0, 24, 156, 0, 0, 9, 8, 21, 0, 129, 114,
-  101, 100, 0, 6, 6, 18, 0, 129, 114, 101, 100, 0, 15, 6, 17, 12, 0, 129,
-  100, 101, 0, 18, 22, 8, 21, 11, 23, 0, 130, 104, 111, 108, 100, 0, 4, 26,
-  18, 9, 0, 131, 114, 119, 97, 114, 100, 0, 68, 233, 0, 6, 246, 0, 7, 4, 1,
-  8, 16, 1, 10, 52, 1, 15, 81, 1, 21, 90, 1, 22, 117, 1, 23, 144, 1, 24,
-  215, 1, 25, 228, 1, 0, 6, 19, 22, 8, 16, 4, 17, 0, 130, 97, 99, 101, 0,
-  19, 4, 22, 8, 16, 4, 17, 0, 131, 112, 97, 99, 101, 0, 12, 21, 8, 25, 18,
-  0, 130, 114, 105, 100, 101, 0, 23, 0, 68, 25, 1, 17, 36, 1, 0, 21, 4, 24,
-  10, 0, 130, 110, 116, 101, 101, 0, 4, 21, 24, 4, 10, 0, 135, 117, 97,
-  114, 97, 110, 116, 101, 101, 0, 68, 59, 1, 7, 69, 1, 0, 24, 10, 44, 0,
-  131, 97, 117, 103, 101, 0, 8, 15, 12, 25, 12, 21, 19, 0, 130, 103, 101,
-  0, 22, 4, 9, 0, 130, 108, 115, 101, 0, 76, 97, 1, 24, 109, 1, 0, 24, 20,
-  4, 0, 132, 99, 113, 117, 105, 114, 101, 0, 23, 44, 0, 130, 114, 117, 101,
-  0, 4, 0, 79, 126, 1, 24, 134, 1, 0, 9, 0, 131, 97, 108, 115, 101, 0, 6,
-  8, 5, 0, 131, 97, 117, 115, 101, 0, 4, 0, 71, 156, 1, 19, 193, 1, 21,
-  203, 1, 0, 18, 16, 0, 80, 166, 1, 18, 181, 1, 0, 18, 6, 4, 0, 135, 99,
-  111, 109, 109, 111, 100, 97, 116, 101, 0, 6, 6, 4, 0, 132, 109, 111, 100,
-  97, 116, 101, 0, 7, 24, 0, 132, 112, 100, 97, 116, 101, 0, 8, 19, 8, 22,
-  0, 132, 97, 114, 97, 116, 101, 0, 10, 8, 15, 15, 18, 6, 0, 130, 97, 103,
-  117, 101, 0, 8, 12, 6, 8, 21, 0, 131, 101, 105, 118, 101, 0, 12, 8, 11,
-  6, 0, 130, 105, 101, 102, 0, 17, 0, 76, 3, 2, 21, 16, 2, 0, 15, 8, 12, 6,
-  0, 133, 101, 105, 108, 105, 110, 103, 0, 12, 23, 22, 0, 131, 114, 105,
-  110, 103, 0, 70, 33, 2, 23, 44, 2, 0, 12, 23, 26, 22, 0, 131, 105, 116,
-  99, 104, 0, 10, 12, 8, 11, 0, 129, 104, 116, 0, 72, 69, 2, 10, 80, 2, 18,
-  89, 2, 21, 156, 2, 24, 167, 2, 0, 22, 18, 18, 11, 6, 0, 131, 115, 101,
-  110, 0, 12, 21, 23, 22, 0, 129, 110, 103, 0, 12, 0, 86, 98, 2, 23, 124,
-  2, 0, 68, 105, 2, 22, 114, 2, 0, 12, 15, 0, 131, 105, 115, 111, 110, 0,
-  4, 6, 6, 18, 0, 131, 105, 111, 110, 0, 76, 131, 2, 22, 146, 2, 0, 23, 12,
-  19, 8, 21, 0, 134, 101, 116, 105, 116, 105, 111, 110, 0, 18, 19, 0, 131,
-  105, 116, 105, 111, 110, 0, 23, 24, 8, 21, 0, 131, 116, 117, 114, 110, 0,
-  85, 174, 2, 23, 183, 2, 0, 23, 8, 21, 0, 130, 117, 114, 110, 0, 8, 21, 0,
-  128, 114, 110, 0, 7, 8, 24, 22, 19, 0, 131, 101, 117, 100, 111, 0, 24,
-  18, 18, 15, 0, 129, 107, 117, 112, 0, 72, 219, 2, 18, 3, 3, 0, 76, 229,
-  2, 15, 238, 2, 17, 248, 2, 0, 11, 23, 44, 0, 130, 101, 105, 114, 0, 23,
-  12, 9, 0, 131, 108, 116, 101, 114, 0, 23, 22, 12, 15, 0, 130, 101, 110,
-  101, 114, 0, 23, 4, 21, 8, 23, 17, 12, 0, 135, 116, 101, 114, 97, 116,
-  111, 114, 0, 72, 30, 3, 17, 38, 3, 24, 51, 3, 0, 15, 4, 9, 0, 129, 115,
-  101, 0, 4, 12, 23, 17, 18, 6, 0, 131, 97, 105, 110, 115, 0, 22, 17, 8, 6,
-  17, 18, 6, 0, 133, 115, 101, 110, 115, 117, 115, 0, 74, 86, 3, 11, 96, 3,
-  15, 118, 3, 17, 129, 3, 22, 218, 3, 24, 232, 3, 0, 11, 24, 4, 6, 0, 130,
-  103, 104, 116, 0, 71, 103, 3, 10, 110, 3, 0, 12, 26, 0, 129, 116, 104, 0,
-  17, 8, 15, 0, 129, 116, 104, 0, 22, 24, 8, 21, 0, 131, 115, 117, 108,
-  116, 0, 68, 139, 3, 8, 150, 3, 22, 210, 3, 0, 21, 4, 19, 19, 4, 0, 130,
-  101, 110, 116, 0, 85, 157, 3, 25, 200, 3, 0, 68, 164, 3, 21, 175, 3, 0,
-  19, 4, 0, 132, 112, 97, 114, 101, 110, 116, 0, 4, 19, 0, 68, 185, 3, 19,
-  193, 3, 0, 133, 112, 97, 114, 101, 110, 116, 0, 4, 0, 131, 101, 110, 116,
-  0, 8, 15, 8, 21, 0, 130, 97, 110, 116, 0, 18, 6, 0, 130, 110, 115, 116,
-  0, 12, 9, 8, 17, 4, 16, 0, 132, 105, 102, 101, 115, 116, 0, 83, 239, 3,
-  23, 6, 4, 0, 87, 246, 3, 24, 254, 3, 0, 17, 12, 0, 131, 112, 117, 116, 0,
-  18, 0, 130, 116, 112, 117, 116, 0, 19, 24, 18, 0, 131, 116, 112, 117,
-  116, 0, 70, 29, 4, 8, 41, 4, 11, 51, 4, 21, 69, 4, 0, 8, 24, 20, 8, 21,
-  9, 0, 129, 110, 99, 121, 0, 23, 9, 4, 22, 0, 130, 101, 116, 121, 0, 6,
-  21, 4, 21, 12, 8, 11, 0, 135, 105, 101, 114, 97, 114, 99, 104, 121, 0, 4,
-  5, 12, 15, 0, 130, 114, 97, 114, 121, 0};
-```
-
-## Troubleshooting
-### Avoiding false triggers
-By default, typos are searched within words, to find typos within longer identifiers like maxFitlerOuput. While this is useful, a consequence is that autocorrection will falsely trigger when a typo happens to be a substring of a correctly-spelled word. For instance, if we had thier -> their as an entry, it would falsely trigger on (correct, though relatively uncommon) words like “wealthier” and “filthier.”
-
-The solution is to set a word break : before and/or after the typo to constrain matching. : matches space, period, comma, underscore, digits, and most other non-alpha characters.
-
-| Text | thier | :thier | thier: | :thier: |
-|------|-------|--------|--------|---------|
-|see thier typo|matches|matches|matches|matches|
-it’s thiers    |matches|matches|no|no|
-wealthier words|matches|no|matches|no|
-
-:thier: is most restrictive, matching only when thier is a whole word.
-
-The make_autocorrection_data.py script makes an effort to check for entries that would false trigger as substrings of correct words. It searches each typo against a dictionary of 25K English words from the english_words Python package, provided it’s installed.
-
-### Overriding autocorrection
-Occasionally you might actually want to type a typo (for instance, while editing autocorrection_dict.txt) without being autocorrected. Here is a way to do that:
-
-1. Begin typing the typo.
-2. Before typing the last letter, press and release the Ctrl or Alt key.
-3. Type the remaining letters.
-
-This works because the autocorrection implementation doesn’t understand hotkeys, so it resets itself whenever a modifier other than shift is held.
-
-Alternatively, the `AUTO_CTN` keycode will toggle autocorrection on and off.
-
-## Closing thoughts
-Based on my own use, an autocorrection dictionary of a few dozen entries is enough to help in day-to-day writing. On the other hand, it is of course far from comprehensively checking that every word is spelled correctly. Keyboard microcontrollers might not have the resources check against a full English dictionary any time soon, but a lot of editors and other software have good integrated spell check features.
-
-I suggest to enable and use spell check in combination with autocorrection:
-* Sublime: Open the View menu and enable “Spell Check.”
-* Eclipse: Open the Window menu, click Preferences, and search for “Spelling.”
-* Vim: Type :set spell, and misspellings will be highlighted. Use ]s to jump to the next misspelled word and z= to get suggested corrections for the word under the cursor. See the :help spell documentation. Vim also has an abbreviations feature that can autocorrect misspellings (see :help abbreviations).
-* Emacs: Use M-x flyspell-mode to enable Flyspell mode in the current buffer. Or for programming, use M-x flyspell-prog-mode to check comments and strings only. See the spelling documentation. There is also an abbreviations feature that can do autocorrection.
-
-Some useful resources:
-
-* Wikipedia has a [large list of common typos](https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines).
-* EmacsWiki has another [list of typos](https://www.emacswiki.org/emacs/autocorrection_abbrev_defs).
-* You can find data on English word frequencies at https://www.wordfrequency.info/samples.asp.
-
-# Appendix: Trie binary data format
-This section details how the trie is serialized to byte data in autocorrection_data. You don’t need to care about this to use this autocorrection implementation. But I document it for the record in case anyone is interested in modifying the implementation, or just curious how it works.
-
-What I did here is fairly arbitrary, but it is simple to decode and gets the job done.
-
-## Encoding
-All autocorrection data is stored in a single flat array autocorrection_data. Each trie node is associated with a byte offset into this array, where data for that node is encoded, beginning with root at offset 0. There are three kinds of nodes. The highest two bits of the first byte of the node indicate what kind:
-
-* 00 ⇒ chain node: a trie node with a single child.
-* 01 ⇒ branching node: a trie node with multiple children.
-* 10 ⇒ leaf node: a leaf, corresponding to a typo and storing its correction.
-
-An example trie.
-Branching node. Each branch is encoded with one byte for the keycode (KC_A–KC_Z) followed by a link to the child node. Links between nodes are 16-bit byte offsets relative to the beginning of the array, serialized in little endian order.
-
-All branches are serialized this way, one after another, and terminated with a zero byte. As described above, the node is identified as a branch by setting the two high bits of the first byte to 01, done by bitwise ORing the first keycode with 64. keycode. The root node for the above figure would be serialized like:
-
-    +-------+-------+-------+-------+-------+-------+-------+
-    | R|64  |    node 2     |   T   |    node 3     |   0   |
-    +-------+-------+-------+-------+-------+-------+-------+
-
-Chain node. Tries tend to have long chains of single-child nodes, as seen in the example above with f-i-t-l in fitler. So to save space, we use a different format to encode chains than branching nodes. A chain is encoded as a string of keycodes, beginning with the node closest to the root, and terminated with a zero byte. The child of the last node in the chain is encoded immediately after. That child could be either a branching node or a leaf.
-
-In the figure above, the f-i-t-l chain is encoded as
-
-    +-------+-------+-------+-------+-------+
-    |   L   |   T   |   I   |   F   |   0   |
-    +-------+-------+-------+-------+-------+
-If we were to encode this chain using the same format used for branching nodes, we would encode a 16-bit node link with every node, costing 8 more bytes in this example. Across the whole trie, this adds up. Conveniently, we can point to intermediate points in the chain and interpret the bytes in the same way as before. E.g. starting at the i instead of the l, and the subchain has the same format.
-
-Leaf node. A leaf node corresponds to a particular typo and stores data to correct the typo. The leaf begins with a byte for the number of backspaces to type, and is followed by a null-terminated ASCII string of the replacement text. The idea is, after tapping backspace the indicated number of times, we can simply pass this string to QMK’s send_string_P function. For fitler, we need to tap backspace 3 times (not 4, because we catch the typo as the final ‘r’ is pressed) and replace it with lter. To identify the node as a leaf, the two high bits are set to 10 by ORing the backspace count with 128:
-
-    +-------+-------+-------+-------+-------+-------+
-    | 3|128 |  'l'  |  't'  |  'e'  |  'r'  |   0   |
-    +-------+-------+-------+-------+-------+-------+
-## Decoding
-This format is by design decodable with fairly simple logic. A 16-bit variable state represents our current position in the trie, initialized with 0 to start at the root node. Then, for each keycode, test the highest two bits in the byte at state to identify the kind of node.
-
-* 00 ⇒ chain node: If the node’s byte matches the keycode, increment state by one to go to the next byte. If the next byte is zero, increment again to go to the following node.
-* 01 ⇒ branching node: Search the branches for one that matches the keycode, and follow its node link.
-* 10 ⇒ leaf node: a typo has been found! We read its first byte for the number of backspaces to type, then pass its following bytes to send_string_P to type the correction.
diff --git a/users/drashna/keyrecords/process_records.c b/users/drashna/keyrecords/process_records.c
index 197fd94171..89d1c80b8f 100644
--- a/users/drashna/keyrecords/process_records.c
+++ b/users/drashna/keyrecords/process_records.c
@@ -3,9 +3,6 @@
 
 #include "drashna.h"
 #include "version.h"
-#ifdef AUTOCORRECTION_ENABLE
-#    include "autocorrection/autocorrection.h"
-#endif
 
 uint16_t copy_paste_timer;
 bool     host_driver_disabled = false;
@@ -64,9 +61,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #endif
 #if defined(CUSTOM_POINTING_DEVICE)
           && process_record_pointing(keycode, record)
-#endif
-#ifdef AUTOCORRECTION_ENABLE
-          && process_autocorrection(keycode, record)
 #endif
           && true)) {
         return false;
diff --git a/users/drashna/keyrecords/process_records.h b/users/drashna/keyrecords/process_records.h
index be31f992cb..cae3620fe4 100644
--- a/users/drashna/keyrecords/process_records.h
+++ b/users/drashna/keyrecords/process_records.h
@@ -46,9 +46,6 @@ enum userspace_custom_keycodes {
     KC_ZALGO,
     KC_SUPER,
     KC_ACCEL,
-    AUTOCORRECT_ON,
-    AUTOCORRECT_OFF,
-    AUTOCORRECT_TOGGLE,
     NEW_SAFE_RANGE // use "NEWPLACEHOLDER for keymap specific codes
 };
 
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 68801b80a4..7aee350baf 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -23,9 +23,6 @@
 #ifdef AUDIO_CLICKY
 #    include "process_clicky.h"
 #endif
-#if defined(AUTOCORRECTION_ENABLE)
-#    include "keyrecords/autocorrection/autocorrection.h"
-#endif
 #include <string.h>
 
 bool is_oled_enabled = true;
@@ -458,10 +455,6 @@ void render_bootmagic_status(uint8_t col, uint8_t line) {
 #endif
 }
 
-#if defined(CUSTOM_POINTING_DEVICE)
-extern bool tap_toggling;
-#endif
-
 void render_user_status(uint8_t col, uint8_t line) {
 #ifdef AUDIO_ENABLE
     bool is_audio_on = false, l_is_clicky_on = false;
@@ -490,9 +483,9 @@ void render_user_status(uint8_t col, uint8_t line) {
 #    if !defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
 #    endif
-#elif defined(CUSTOM_POINTING_DEVICE)
+#elif defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
     static const char PROGMEM mouse_lock[3] = {0xF2, 0xF3, 0};
-    oled_write_P(mouse_lock, tap_toggling);
+    oled_write_P(mouse_lock, get_auto_mouse_toggle());
 #endif
 #ifdef AUDIO_ENABLE
     static const char PROGMEM audio_status[2][3] = {{0xE0, 0xE1, 0}, {0xE2, 0xE3, 0}};
@@ -771,8 +764,8 @@ void render_unicode_mode(uint8_t col, uint8_t line) {
 
 uint32_t kitty_animation_phases(uint32_t triger_time, void *cb_arg) {
     static uint32_t anim_frame_duration = 500;
-#ifdef CUSTOM_POINTING_DEVICE
-    if (tap_toggling) {
+#if defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
+    if (get_auto_mouse_toggle()) {
         animation_frame     = (animation_frame + 1) % OLED_RTOGI_FRAMES;
         animation_type      = 3;
         anim_frame_duration = 300;
diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c
index c9a7945a84..1b64502ed3 100644
--- a/users/drashna/pointing/pointing.c
+++ b/users/drashna/pointing/pointing.c
@@ -3,10 +3,8 @@
 
 #include "pointing.h"
 
-static uint16_t mouse_timer           = 0;
-static uint16_t mouse_debounce_timer  = 0;
-static uint8_t  mouse_keycode_tracker = 0;
-bool            tap_toggling = false, enable_acceleration = false;
+static uint16_t mouse_debounce_timer = 0;
+bool            enable_acceleration  = false;
 
 #ifdef TAPPING_TERM_PER_KEY
 #    define TAP_CHECK get_tapping_term(KC_BTN1, NULL)
@@ -17,6 +15,15 @@ bool            tap_toggling = false, enable_acceleration = false;
 #    define TAP_CHECK TAPPING_TERM
 #endif
 
+__attribute__((weak)) void pointing_device_init_keymap(void) {}
+
+void pointing_device_init_user(void) {
+    set_auto_mouse_layer(_MOUSE);
+    set_auto_mouse_enable(true);
+
+    pointing_device_init_keymap();
+}
+
 __attribute__((weak)) report_mouse_t pointing_device_task_keymap(report_mouse_t mouse_report) {
     return mouse_report;
 }
@@ -26,28 +33,16 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
     mouse_report.x = 0;
     mouse_report.y = 0;
 
-    if (x != 0 && y != 0) {
-        mouse_timer = timer_read();
+    if (x != 0 && y != 0 && (timer_elapsed(mouse_debounce_timer) > TAP_CHECK)) {
 #ifdef OLED_ENABLE
         oled_timer_reset();
 #endif
-        if (timer_elapsed(mouse_debounce_timer) > TAP_CHECK) {
-            if (enable_acceleration) {
-                x = (mouse_xy_report_t)(x > 0 ? x * x / 16 + x : -x * x / 16 + x);
-                y = (mouse_xy_report_t)(y > 0 ? y * y / 16 + y : -y * y / 16 + y);
-            }
-            mouse_report.x = x;
-            mouse_report.y = y;
-            if (!layer_state_is(_MOUSE)) {
-                layer_on(_MOUSE);
-            }
-        }
-    } else if (timer_elapsed(mouse_timer) > 650 && layer_state_is(_MOUSE) && !mouse_keycode_tracker && !tap_toggling) {
-        layer_off(_MOUSE);
-    } else if (tap_toggling) {
-        if (!layer_state_is(_MOUSE)) {
-            layer_on(_MOUSE);
+        if (enable_acceleration) {
+            x = (mouse_xy_report_t)(x > 0 ? x * x / 16 + x : -x * x / 16 + x);
+            y = (mouse_xy_report_t)(y > 0 ? y * y / 16 + y : -y * y / 16 + y);
         }
+        mouse_report.x = x;
+        mouse_report.y = y;
     }
 
     return pointing_device_task_keymap(mouse_report);
@@ -55,64 +50,10 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
 
 bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
     switch (keycode) {
-        case TT(_MOUSE):
-            if (record->event.pressed) {
-                mouse_keycode_tracker++;
-            } else {
-#if TAPPING_TOGGLE != 0
-                if (record->tap.count == TAPPING_TOGGLE) {
-                    tap_toggling ^= 1;
-#    if TAPPING_TOGGLE == 1
-                    if (!tap_toggling) mouse_keycode_tracker -= record->tap.count + 1;
-#    else
-                    if (!tap_toggling) mouse_keycode_tracker -= record->tap.count;
-#    endif
-                } else {
-                    mouse_keycode_tracker--;
-                }
-#endif
-            }
-            mouse_timer = timer_read();
-            break;
-        case TG(_MOUSE):
-            if (record->event.pressed) {
-                tap_toggling ^= 1;
-            }
-            break;
-        case MO(_MOUSE):
-#if defined(KEYBOARD_ploopy)
-        case DPI_CONFIG:
-#elif (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && !defined(NO_CHARYBDIS_KEYCODES)
-        case SAFE_RANGE ... (CHARYBDIS_SAFE_RANGE-1):
-#endif
-        case KC_MS_UP ... KC_MS_WH_RIGHT:
-            record->event.pressed ? mouse_keycode_tracker++ : mouse_keycode_tracker--;
-            mouse_timer = timer_read();
-            break;
         case KC_ACCEL:
             enable_acceleration = record->event.pressed;
-            record->event.pressed ? mouse_keycode_tracker++ : mouse_keycode_tracker--;
-            mouse_timer = timer_read();
             break;
-#if 0
-        case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
-            break;
-#endif
-        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-            if (record->event.pressed || !record->tap.count) {
-                break;
-            }
         default:
-            if (IS_NOEVENT(record->event)) break;
-            if ((keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) && (((keycode >> 0x8) & 0xF) == _MOUSE)) {
-                record->event.pressed ? mouse_keycode_tracker++ : mouse_keycode_tracker--;
-                mouse_timer = timer_read();
-                break;
-            }
-            if (layer_state_is(_MOUSE) && !mouse_keycode_tracker && !tap_toggling) {
-                layer_off(_MOUSE);
-            }
-            mouse_keycode_tracker = 0;
             mouse_debounce_timer  = timer_read();
             break;
     }
@@ -122,6 +63,32 @@ bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
 layer_state_t layer_state_set_pointing(layer_state_t state) {
     if (layer_state_cmp(state, _GAMEPAD) || layer_state_cmp(state, _DIABLO) || layer_state_cmp(state, _DIABLOII)) {
         state |= ((layer_state_t)1 << _MOUSE);
+        set_auto_mouse_enable(false); // auto mouse can be disabled any time during run time
+    } else {
+        set_auto_mouse_enable(true);
     }
     return state;
 }
+
+
+#if defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
+__attribute__((weak)) bool is_mouse_record_keymap(uint16_t keycode, keyrecord_t *record) { return false; }
+
+bool is_mouse_record_user(uint16_t keycode, keyrecord_t* record) {
+    if (is_mouse_record_keymap(keycode, record)) {
+        return true;
+    }
+    switch (keycode) {
+#    if defined(KEYBOARD_ploopy)
+        case DPI_CONFIG:
+#    elif (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && !defined(NO_CHARYBDIS_KEYCODES)
+        case SAFE_RANGE ...(CHARYBDIS_SAFE_RANGE - 1):
+#    elif (defined(KEYBOARD_bastardkb_dilemma) && !defined(NO_DILEMMA_KEYCODES))
+        case SAFE_RANGE ...(DILEMMA_SAFE_RANGE - 1):
+#    endif
+        case KC_ACCEL:
+            return true;
+    }
+    return false;
+}
+#endif
diff --git a/users/drashna/pointing/pointing.h b/users/drashna/pointing/pointing.h
index 8b00ffc0ec..28d8610148 100644
--- a/users/drashna/pointing/pointing.h
+++ b/users/drashna/pointing/pointing.h
@@ -3,8 +3,8 @@
 
 #include "drashna.h"
 
+void           pointing_device_init_keymap(void);
 report_mouse_t pointing_device_task_keymap(report_mouse_t mouse_report);
 void           matrix_scan_pointing(void);
 bool           process_record_pointing(uint16_t keycode, keyrecord_t* record);
 layer_state_t  layer_state_set_pointing(layer_state_t state);
-extern bool    tap_toggling, enable_acceleration;
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index ec9aa49462..ed80174819 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -127,3 +127,7 @@
             }                         \
         }
 #endif
+
+#if defined(SPLIT_KEYBOARD) && defined(PROTOCOL_CHIBIOS) && !defined(USB_SUSPEND_WAKEUP_DELAY)
+#    define USB_SUSPEND_WAKEUP_DELAY 200
+#endif
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 5644aad2c4..76bb5debe1 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -9,9 +9,9 @@ ifneq ($(PLATFORM),CHIBIOS)
     ifneq ($(strip $(LTO_SUPPORTED)), no)
         LTO_ENABLE        = yes
     endif
+    SPACE_CADET_ENABLE    = no
+    GRAVE_ESC_ENABLE      = no
 endif
-SPACE_CADET_ENABLE    = no
-GRAVE_ESC_ENABLE      = no
 # DEBUG_MATRIX_SCAN_RATE_ENABLE = api
 
 ifneq ($(strip $(NO_SECRETS)), yes)
@@ -115,6 +115,7 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(strip $(CUSTOM_POINTING_DEVICE)), yes)
         SRC += $(USER_PATH)/pointing/pointing.c
         OPT_DEFS += -DCUSTOM_POINTING_DEVICE
+        OPT_DEFS += -DPOINTING_DEVICE_AUTO_MOUSE_ENABLE
     endif
 endif
 
@@ -127,11 +128,8 @@ ifeq ($(strip $(CUSTOM_SPLIT_TRANSPORT_SYNC)), yes)
 
 endif
 
-AUTOCORRECTION_ENABLE ?= no
 ifeq ($(strip $(AUTOCORRECTION_ENABLE)), yes)
-    SRC += $(USER_PATH)/keyrecords/autocorrection/autocorrection.c
-    $(shell touch $(USER_PATH)/keyrecords/autocorrection/autocorrection.c)
-    OPT_DEFS += -DAUTOCORRECTION_ENABLE
+   AUTOCORRECT_ENABLE = yes
 endif
 
 ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c
index 6b5c384480..11c56849eb 100644
--- a/users/drashna/split/transport_sync.c
+++ b/users/drashna/split/transport_sync.c
@@ -98,8 +98,8 @@ void user_transport_update(void) {
 #if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
         user_state.is_oled_enabled = is_oled_enabled;
 #endif
-#if defined(CUSTOM_POINTING_DEVICE)
-        user_state.tap_toggling = tap_toggling;
+#if defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
+        user_state.tap_toggling = get_auto_mouse_toggle();
 #endif
 #ifdef UNICODE_COMMON_ENABLE
         user_state.unicode_mode        = unicode_config.input_mode;
@@ -122,8 +122,10 @@ void user_transport_update(void) {
 #if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
         is_oled_enabled = user_state.is_oled_enabled;
 #endif
-#if defined(CUSTOM_POINTING_DEVICE)
-        tap_toggling = user_state.tap_toggling;
+#if defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
+        if (get_auto_mouse_toggle() != user_state.tap_toggling) {
+            auto_mouse_toggle();
+        }
 #endif
 #ifdef SWAP_HANDS_ENABLE
         swap_hands = user_state.swap_hands;

From 82eb98449de01456ed0d7568d0525ab6cc380155 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 25 Sep 2022 18:00:20 -0600
Subject: [PATCH 436/959] Fixup saevus/cor_tkl (#18476)

---
 keyboards/saevus/cor_tkl/info.json            | 14 ++++++++++++-
 .../saevus/cor_tkl/keymaps/default/config.h   | 20 -------------------
 .../saevus/cor_tkl/keymaps/default/keymap.c   |  2 +-
 keyboards/saevus/cor_tkl/keymaps/iso/config.h | 19 ------------------
 keyboards/saevus/cor_tkl/keymaps/via/config.h | 19 ------------------
 keyboards/saevus/cor_tkl/rules.mk             | 12 -----------
 6 files changed, 14 insertions(+), 72 deletions(-)
 delete mode 100644 keyboards/saevus/cor_tkl/keymaps/default/config.h
 delete mode 100644 keyboards/saevus/cor_tkl/keymaps/iso/config.h
 delete mode 100644 keyboards/saevus/cor_tkl/keymaps/via/config.h

diff --git a/keyboards/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/info.json
index 5a881ce5cd..6c00c7830e 100644
--- a/keyboards/saevus/cor_tkl/info.json
+++ b/keyboards/saevus/cor_tkl/info.json
@@ -3,6 +3,12 @@
     "manufacturer": "saevus",
     "url": "",
     "maintainer": "ramonimbao",
+    "community_layouts": [
+      "tkl_f13_ansi",
+      "tkl_f13_ansi_split_bs_rshift",
+      "tkl_f13_iso",
+      "tkl_f13_iso_split_bs_rshift"
+    ],
     "layout_aliases": {
         "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
         "LAYOUT_iso": "LAYOUT_tkl_f13_iso"
@@ -13,18 +19,24 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": false
+        "nkro": false,
+        "rgb_matrix": true
     },
     "usb": {
         "vid": "0x5001",
         "pid": "0x0003",
         "device_version": "1.0.0"
     },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12", "GP11", "GP5"],
         "rows": ["GP0", "GP1", "GP2", "GP21", "GP3", "GP4"]
     },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
diff --git a/keyboards/saevus/cor_tkl/keymaps/default/config.h b/keyboards/saevus/cor_tkl/keymaps/default/config.h
deleted file mode 100644
index 08636494e6..0000000000
--- a/keyboards/saevus/cor_tkl/keymaps/default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/keymaps/default/keymap.c b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
index 3c5139dbe7..5d351a1578 100644
--- a/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
+++ b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_tkl_f13_ansi_tsangan(
+    [0] = LAYOUT_tkl_f13_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/saevus/cor_tkl/keymaps/iso/config.h b/keyboards/saevus/cor_tkl/keymaps/iso/config.h
deleted file mode 100644
index 52983591bf..0000000000
--- a/keyboards/saevus/cor_tkl/keymaps/iso/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/keymaps/via/config.h b/keyboards/saevus/cor_tkl/keymaps/via/config.h
deleted file mode 100644
index 52983591bf..0000000000
--- a/keyboards/saevus/cor_tkl/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/rules.mk b/keyboards/saevus/cor_tkl/rules.mk
index e53fbb2e92..997fce7e65 100644
--- a/keyboards/saevus/cor_tkl/rules.mk
+++ b/keyboards/saevus/cor_tkl/rules.mk
@@ -1,13 +1 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
-# RGB Matrix
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 WS2812_DRIVER = vendor
-
-LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift tkl_f13_iso tkl_f13_iso_split_bs_rshift
-

From 675d91b813db6488ccc1ca55555ebbf0d4a45dc0 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 26 Sep 2022 10:04:21 +1000
Subject: [PATCH 437/959] Generate DD RGBLight/LED/RGB Matrix animation defines
 (#18459)

---
 data/mappings/info_config.json          | 10 ----------
 data/schemas/keyboard.jsonschema        | 12 ++++++++++++
 lib/python/qmk/cli/generate/config_h.py | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index b27081e037..49b0a1bfe0 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -64,16 +64,6 @@
     "RGB_DI_PIN": {"info_key": "rgblight.pin"},
     "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
     "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"},
-    "RGBLIGHT_EFFECT_ALTERNATING": {"info_key": "rgblight.animations.alternating", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_BREATHING": {"info_key": "rgblight.animations.breathing", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_CHRISTMAS": {"info_key": "rgblight.animations.christmas", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_KNIGHT": {"info_key": "rgblight.animations.knight", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_RAINBOW_MOOD": {"info_key": "rgblight.animations.rainbow_mood", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_RAINBOW_SWIRL": {"info_key": "rgblight.animations.rainbow_swirl", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_RGB_TEST": {"info_key": "rgblight.animations.rgb_test", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_SNAKE": {"info_key": "rgblight.animations.snake", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_STATIC_GRADIENT": {"info_key": "rgblight.animations.static_gradient", "value_type": "bool"},
-    "RGBLIGHT_EFFECT_TWINKLE": {"info_key": "rgblight.animations.twinkle"},
     "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"},
     "RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "bool"},
     "RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "bool"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index ff5163e737..1906ce5f75 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -264,6 +264,12 @@
         "led_matrix": {
             "type": "object",
             "properties": {
+                "animations": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "boolean"
+                    }
+                },
                 "driver": {"type": "string"},
                 "center_point": {
                     "type": "array",
@@ -308,6 +314,12 @@
         "rgb_matrix": {
             "type": "object",
             "properties": {
+                "animations": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "boolean"
+                    }
+                },
                 "driver": {"type": "string"},
                 "center_point": {
                     "type": "array",
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index d6e87c8803..3752174841 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -156,6 +156,12 @@ def generate_split_config(kb_info_json, config_h_lines):
         generate_encoder_config(kb_info_json['split']['encoder']['right'], config_h_lines, '_RIGHT')
 
 
+def generate_led_animations_config(led_feature_json, config_h_lines, prefix):
+    for animation in led_feature_json.get('animations', {}):
+        if led_feature_json['animations'][animation]:
+            config_h_lines.append(generate_define(f'{prefix}{animation.upper()}'))
+
+
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
 @cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, required=True, help='Keyboard to generate config.h for.')
@@ -186,5 +192,14 @@ def generate_config_h(cli):
     if 'split' in kb_info_json:
         generate_split_config(kb_info_json, config_h_lines)
 
+    if 'led_matrix' in kb_info_json:
+        generate_led_animations_config(kb_info_json['led_matrix'], config_h_lines, 'ENABLE_LED_MATRIX_')
+
+    if 'rgb_matrix' in kb_info_json:
+        generate_led_animations_config(kb_info_json['rgb_matrix'], config_h_lines, 'ENABLE_RGB_MATRIX_')
+
+    if 'rgblight' in kb_info_json:
+        generate_led_animations_config(kb_info_json['rgblight'], config_h_lines, 'RGBLIGHT_EFFECT_')
+
     # Show the results
     dump_lines(cli.args.output, config_h_lines, cli.args.quiet)

From a4dcf22fd7fd251b14688286d1e9abff2fcdf546 Mon Sep 17 00:00:00 2001
From: Daniel Shields <1530706+shieldsd@users.noreply.github.com>
Date: Mon, 26 Sep 2022 04:38:37 +0100
Subject: [PATCH 438/959] [Keymap] Tune mod tap configuration for dshields home
 row mods (#18458)

---
 users/dshields/config.h   |  5 ++++-
 users/dshields/dshields.c | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/users/dshields/config.h b/users/dshields/config.h
index 9a722b89e6..21a5c3500d 100644
--- a/users/dshields/config.h
+++ b/users/dshields/config.h
@@ -4,7 +4,10 @@
 #define USB_MAX_POWER_CONSUMPTION 100
 #define ONESHOT_TAP_TOGGLE        2
 #define ONESHOT_TIMEOUT           3000
-#define RETRO_TAPPING
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD_PER_KEY
+#define TAPPING_FORCE_HOLD_PER_KEY
+#define TAPPING_TERM              200
 #define BACKLIGHT_BREATHING
 #define DYNAMIC_MACRO_NO_NESTING
 
diff --git a/users/dshields/dshields.c b/users/dshields/dshields.c
index 13eab12d4a..46f0b33cd3 100644
--- a/users/dshields/dshields.c
+++ b/users/dshields/dshields.c
@@ -29,3 +29,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
+bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MT_A:
+        case MT_S:
+        case MT_D:
+        case MT_F:
+        case MT_J:
+        case MT_K:
+        case MT_L:
+        case MT_SCLN:
+            return true;
+        default:
+            return false;
+    }
+}
+
+bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MT_SPC:
+        case MT_BSPC:
+        case MT_ESC:
+            return true;
+        default:
+            return false;
+    }
+}
+

From fe7ee4961c85ce646165a5e5844576fe342849b2 Mon Sep 17 00:00:00 2001
From: Joe Scotto <me@joescotto.com>
Date: Sun, 25 Sep 2022 23:39:09 -0400
Subject: [PATCH 439/959] [Keyboard] Add Scotto9 Macropad (#18452)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/jscotto/scotto9/info.json | 48 +++++++++++++++++++
 .../jscotto/scotto9/keymaps/default/keymap.c  | 27 +++++++++++
 keyboards/handwired/jscotto/scotto9/readme.md | 25 ++++++++++
 keyboards/handwired/jscotto/scotto9/rules.mk  |  1 +
 4 files changed, 101 insertions(+)
 create mode 100644 keyboards/handwired/jscotto/scotto9/info.json
 create mode 100644 keyboards/handwired/jscotto/scotto9/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/jscotto/scotto9/readme.md
 create mode 100644 keyboards/handwired/jscotto/scotto9/rules.mk

diff --git a/keyboards/handwired/jscotto/scotto9/info.json b/keyboards/handwired/jscotto/scotto9/info.json
new file mode 100644
index 0000000000..09ae9eea77
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto9/info.json
@@ -0,0 +1,48 @@
+{
+    "manufacturer": "Joe Scotto",
+    "keyboard_name": "Scotto9",
+    "maintainer": "joe-scotto",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        // 4, 5, 6
+        "cols": ["D4", "C6", "D7"],
+
+        // 15, 14, 16
+        "rows": ["B1", "B3", "B2"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 }
+
+                // Row 2
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 }
+
+                // Row 3
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jscotto/scotto9/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto9/keymaps/default/keymap.c
new file mode 100644
index 0000000000..eec8d684ad
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto9/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Keymap
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_3x3(
+        KC_1, KC_2, KC_3,
+        KC_4, KC_5, KC_6,
+        KC_7, KC_8, KC_9
+    )
+};
diff --git a/keyboards/handwired/jscotto/scotto9/readme.md b/keyboards/handwired/jscotto/scotto9/readme.md
new file mode 100644
index 0000000000..2e5291cba7
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto9/readme.md
@@ -0,0 +1,25 @@
+# Scotto9
+
+![Scotto9](https://imgur.com/inbmNSEh.jpeg)
+
+A 9 key handwired macropad. Case files available [here](https://github.com/joe-scotto/keyboards.git).
+
+-   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+-   Hardware Supported: ATmega32U4
+-   Hardware Availability: [Amazon](https://amazon.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/jscotto/scotto9:default
+
+Flashing example for this keyboard:
+
+    make handwired/jscotto/scotto9:default
+    
+# Bootloader
+
+Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (0, 0) when plugging the board in to enter bootloader mode.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/jscotto/scotto9/rules.mk b/keyboards/handwired/jscotto/scotto9/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto9/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From ea2819b2c2f1fbb9bf85010602758166530939ce Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 26 Sep 2022 14:40:15 +1000
Subject: [PATCH 440/959] Change `{LED,RGB}_DISABLE_TIMEOUT` to
 `{LED,RGB}_MATRIX_TIMEOUT` (#18415)

---
 data/mappings/info_config.json                |  2 ++
 data/schemas/keyboard.jsonschema              |  2 ++
 docs/feature_led_matrix.md                    |  3 +-
 docs/feature_rgb_matrix.md                    |  3 +-
 keyboards/axolstudio/yeti/hotswap/config.h    |  1 -
 keyboards/basekeys/trifecta/config.h          |  1 -
 keyboards/blockboy/ac980mini/config.h         |  1 -
 keyboards/canary/canary60rgb/v1/config.h      |  1 -
 keyboards/crkbd/keymaps/bermeo/config.h       |  1 -
 keyboards/crkbd/keymaps/crkdves/config.h      |  1 -
 keyboards/crkbd/keymaps/crkqwes/config.h      |  1 -
 keyboards/crkbd/keymaps/davidrambo/config.h   |  1 -
 keyboards/crkbd/keymaps/devdev/config.h       |  1 -
 keyboards/crkbd/keymaps/kidbrazil/config.h    |  1 -
 keyboards/crkbd/keymaps/ollyhayes/config.h    |  1 -
 keyboards/crkbd/keymaps/soundmonster/config.h |  1 -
 keyboards/crkbd/keymaps/toinux/config.h       |  1 -
 keyboards/crkbd/readme.md                     |  1 -
 .../duckypad/keymaps/default/config.h         |  2 +-
 .../dekunukem/duckypad/keymaps/m4cs/config.h  |  2 +-
 keyboards/dtisaac/dosa40rgb/config.h          |  1 -
 keyboards/dztech/dz60rgb/v1/config.h          |  1 -
 keyboards/dztech/dz60rgb/v2/config.h          |  1 -
 keyboards/dztech/dz60rgb/v2_1/config.h        |  1 -
 keyboards/dztech/dz60rgb_ansi/v1/config.h     |  1 -
 keyboards/dztech/dz60rgb_ansi/v2/config.h     |  1 -
 keyboards/dztech/dz60rgb_ansi/v2_1/config.h   |  1 -
 keyboards/dztech/dz60rgb_wkl/v1/config.h      |  1 -
 keyboards/dztech/dz60rgb_wkl/v2/config.h      |  1 -
 keyboards/dztech/dz60rgb_wkl/v2_1/config.h    |  1 -
 keyboards/dztech/dz64rgb/config.h             |  1 -
 keyboards/dztech/dz65rgb/v1/config.h          |  1 -
 keyboards/dztech/dz65rgb/v2/config.h          |  1 -
 keyboards/dztech/dz65rgb/v3/config.h          |  1 -
 keyboards/geekboards/tester/config.h          |  1 -
 .../j73gl/keymaps/via_rgb_matrix/config.h     |  2 --
 .../pro/rev1/ansi/keymaps/andrebrait/config.h |  2 +-
 .../pro/rev1/ansi/keymaps/hachetman/config.h  |  2 +-
 .../gmmk/pro/rev1/ansi/keymaps/macos/config.h |  2 +-
 .../pro/rev1/ansi/keymaps/mike1808/config.h   |  2 +-
 .../gmmk/pro/rev1/iso/keymaps/vitoni/config.h |  4 +--
 .../pro/rev1/iso/keymaps/vitoni/readme.adoc   |  4 +--
 keyboards/handwired/colorlice/config.h        |  1 -
 .../3x5_3/keymaps/dlford/config.h             |  2 +-
 keyboards/handwired/hnah40rgb/config.h        |  1 -
 keyboards/handwired/p65rgb/config.h           |  1 -
 keyboards/helix/rev3_4rows/config.h           |  1 -
 keyboards/helix/rev3_5rows/config.h           |  1 -
 keyboards/hs60/v1/config.h                    |  1 -
 keyboards/ilumkb/simpler61/config.h           |  1 -
 keyboards/ilumkb/simpler64/config.h           |  1 -
 keyboards/jadookb/jkb65/config.h              |  2 +-
 keyboards/kbdfans/bella/rgb/config.h          |  1 -
 keyboards/kbdfans/bella/rgb_iso/config.h      |  1 -
 keyboards/kbdfans/boop65/rgb/config.h         |  1 -
 .../mkiirgb/keymaps/pascalpfeil/config.h      |  4 +--
 keyboards/kbdfans/kbd67/mkiirgb/v1/config.h   |  1 -
 keyboards/kbdfans/kbd67/mkiirgb/v2/config.h   |  1 -
 keyboards/kbdfans/kbd67/mkiirgb/v3/config.h   |  1 -
 keyboards/kbdfans/kbdmini/config.h            |  1 -
 keyboards/kbdfans/maja/config.h               |  1 -
 .../keycapsss/kimiko/keymaps/oriaj3/config.h  |  1 -
 keyboards/kprepublic/bm60hsrgb/rev2/config.h  |  1 -
 .../kprepublic/bm60hsrgb_ec/rev2/config.h     |  1 -
 .../kprepublic/bm60hsrgb_iso/rev2/config.h    |  1 -
 .../kprepublic/bm60hsrgb_poker/rev2/config.h  |  1 -
 .../bm68hsrgb/rev1/keymaps/peepeetee/config.h |  1 -
 keyboards/kprepublic/bm68hsrgb/rev2/config.h  |  1 -
 keyboards/kprepublic/bm80hsrgb/config.h       |  2 +-
 .../bm80hsrgb/keymaps/peepeetee/config.h      |  1 -
 keyboards/kprepublic/bm80v2_iso/config.h      |  1 -
 keyboards/latincompass/latin17rgb/config.h    |  1 -
 keyboards/latincompass/latin60rgb/config.h    |  1 -
 keyboards/latincompass/latin6rgb/config.h     |  1 -
 .../lfkpad/keymaps/pascalpfeil/config.h       |  2 +-
 keyboards/marksard/rhymestone/rev1/config.h   |  1 -
 .../massdrop/alt/keymaps/pregame/config.h     |  1 -
 .../massdrop/ctrl/keymaps/endgame/config.h    |  1 -
 .../massdrop/ctrl/keymaps/foxx1337/config.h   |  1 -
 .../ctrl/keymaps/matthewrobo/config.h         |  1 -
 .../massdrop/ctrl/keymaps/xanimos/config.h    |  1 -
 .../mechlovin/adelais/rgb_led/rev1/config.h   |  1 -
 .../mechlovin/adelais/rgb_led/rev2/config.h   |  1 -
 .../mechlovin/adelais/rgb_led/rev3/config.h   |  1 -
 keyboards/mechlovin/delphine/rgb_led/config.h |  1 -
 keyboards/mechlovin/hannah60rgb/rev1/config.h |  1 -
 keyboards/mechlovin/hannah60rgb/rev2/config.h |  1 -
 .../mechlovin/infinity87/rgb_rev1/config.h    |  1 -
 keyboards/mechlovin/infinity875/config.h      |  1 -
 keyboards/melgeek/mach80/config.h             |  1 -
 keyboards/melgeek/mj61/config.h               |  1 -
 keyboards/melgeek/mj63/config.h               |  1 -
 keyboards/melgeek/mj64/config.h               |  1 -
 keyboards/melgeek/mj65/config.h               |  1 -
 keyboards/melgeek/mojo68/config.h             |  1 -
 keyboards/melgeek/mojo75/config.h             |  1 -
 keyboards/melgeek/tegic/config.h              |  1 -
 keyboards/melgeek/z70ultra/config.h           |  1 -
 keyboards/miller/gm862/config.h               |  1 -
 keyboards/owlab/voice65/hotswap/config.h      |  1 -
 keyboards/owlab/voice65/soldered/config.h     |  1 -
 keyboards/paprikman/albacore/config.h         |  1 -
 keyboards/rgbkb/mun/keymaps/default/config.h  |  2 +-
 keyboards/rgbkb/mun/keymaps/peott-fr/config.h |  2 +-
 keyboards/rgbkb/mun/keymaps/via/config.h      |  2 +-
 keyboards/rgbkb/mun/keymaps/xulkal2/config.h  |  2 +-
 keyboards/rgbkb/sol3/keymaps/default/config.h |  2 +-
 .../rgbkb/sol3/keymaps/kageurufu/config.h     |  2 +-
 keyboards/rgbkb/sol3/keymaps/via/config.h     |  2 +-
 .../naked48/keymaps/salicylic/config.h        |  1 -
 .../naked48/keymaps/via_rgb_matrix/config.h   |  2 --
 .../setta21/keymaps/salicylic/config.h        |  1 -
 keyboards/sawnsprojects/satxri6key/config.h   |  1 -
 keyboards/senselessclay/ck60/config.h         |  1 -
 keyboards/smallkeyboard/config.h              |  1 -
 keyboards/sofle/keymaps/devdev/config.h       |  1 -
 keyboards/sofle/keymaps/rgb_default/config.h  |  1 -
 keyboards/system76/launch_1/config.h          |  2 --
 keyboards/tkc/portico/config.h                |  1 -
 keyboards/tkc/portico75/config.h              |  1 -
 keyboards/ungodly/launch_pad/config.h         |  1 -
 keyboards/xbows/knight/config.h               |  1 -
 keyboards/xbows/knight_plus/config.h          |  1 -
 keyboards/xbows/nature/config.h               |  1 -
 keyboards/xbows/numpad/config.h               |  1 -
 keyboards/xbows/ranger/config.h               |  1 -
 keyboards/xbows/woody/config.h                |  1 -
 keyboards/yncognito/batpad/config.h           |  1 -
 keyboards/yushakobo/quick17/config.h          |  1 -
 layouts/community/ortho_4x12/drashna/config.h |  1 -
 .../community/split_3x6_3/drashna/config.h    |  1 -
 quantum/led_matrix/led_matrix.c               | 30 ++++++++-----------
 quantum/rgb_matrix/rgb_matrix.c               | 30 ++++++++-----------
 users/bbaserdem/config.h                      |  2 +-
 users/drashna/rgb/rgb_matrix_config.h         |  1 -
 users/vitoni/rgb_matrix_effects.h             |  6 ++--
 users/vitoni/vitoni.c                         |  8 ++---
 users/xulkal/config.h                         |  2 +-
 138 files changed, 64 insertions(+), 181 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 49b0a1bfe0..2b8e3cbf90 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -41,6 +41,7 @@
     "LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"},
     "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
     "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
+    "LED_MATRIX_TIMEOUT": {"info_key": "led_matrix.timeout", "value_type": "int"},
     "LED_MATRIX_HUE_STEP": {"info_key": "led_matrix.hue_steps", "value_type": "int"},
     "LED_MATRIX_SAT_STEP": {"info_key": "led_matrix.sat_steps", "value_type": "int"},
     "LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"},
@@ -77,6 +78,7 @@
     "RGB_MATRIX_CENTER": {"info_key": "rgb_matrix.center_point", "value_type": "array.int"},
     "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"},
     "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
+    "RGB_MATRIX_TIMEOUT": {"info_key": "rgb_matrix.timeout", "value_type": "int"},
     "RGB_MATRIX_HUE_STEP": {"info_key": "rgb_matrix.hue_steps", "value_type": "int"},
     "RGB_MATRIX_SAT_STEP": {"info_key": "rgb_matrix.sat_steps", "value_type": "int"},
     "RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 1906ce5f75..b75465b667 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -278,6 +278,7 @@
                     "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                 },
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
@@ -328,6 +329,7 @@
                     "items": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                 },
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index cc036eb80f..fd87012e69 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -364,8 +364,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 #define LED_MATRIX_KEYPRESSES // reacts to keypresses
 #define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-#define LED_DISABLE_TIMEOUT 0 // number of milliseconds to wait until led automatically turns off
-#define LED_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
+#define LED_MATRIX_TIMEOUT 0 // number of milliseconds to wait until led automatically turns off
 #define LED_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define LED_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 11b9b1c5bc..361b981697 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -791,8 +791,7 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-#define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
+#define RGB_MATRIX_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index da4085588b..439ca0d512 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -74,7 +74,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
-#    define RGB_DISABLE_AFTER_TIMEOUT 0         // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index 4d71a3ea53..014f59a219 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -72,7 +72,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 //#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h
index 4275ffa19e..bb87f724eb 100644
--- a/keyboards/blockboy/ac980mini/config.h
+++ b/keyboards/blockboy/ac980mini/config.h
@@ -14,7 +14,6 @@
 #ifdef RGB_MATRIX_ENABLE
 //#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 //#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index 186cf189ae..45239fc697 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -58,7 +58,6 @@
 #define DEBOUNCE 5
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h
index cc83148d87..cadb397834 100644
--- a/keyboards/crkbd/keymaps/bermeo/config.h
+++ b/keyboards/crkbd/keymaps/bermeo/config.h
@@ -74,7 +74,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h
index 31d23fdff7..52d4fdd93a 100644
--- a/keyboards/crkbd/keymaps/crkdves/config.h
+++ b/keyboards/crkbd/keymaps/crkdves/config.h
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index 7c97ea0831..a095f08760 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -62,7 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/davidrambo/config.h b/keyboards/crkbd/keymaps/davidrambo/config.h
index 969ce07c8d..9fb4348802 100644
--- a/keyboards/crkbd/keymaps/davidrambo/config.h
+++ b/keyboards/crkbd/keymaps/davidrambo/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
     #define RGB_MATRIX_TYPING_MEATMAP_DECREASE_DELAY_MS 50
     // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-    // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/devdev/config.h b/keyboards/crkbd/keymaps/devdev/config.h
index c3db01f145..8261ef6268 100644
--- a/keyboards/crkbd/keymaps/devdev/config.h
+++ b/keyboards/crkbd/keymaps/devdev/config.h
@@ -70,7 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
index b82e4c9344..03bdbf51ba 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ b/keyboards/crkbd/keymaps/kidbrazil/config.h
@@ -50,7 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
     //#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
     // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-    // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
     #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/ollyhayes/config.h b/keyboards/crkbd/keymaps/ollyhayes/config.h
index d302c0b4ef..734d41d084 100644
--- a/keyboards/crkbd/keymaps/ollyhayes/config.h
+++ b/keyboards/crkbd/keymaps/ollyhayes/config.h
@@ -30,7 +30,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index bafd346111..07b3a9db12 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -58,7 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/keymaps/toinux/config.h b/keyboards/crkbd/keymaps/toinux/config.h
index 2cd1363a4d..2ee5a4e182 100644
--- a/keyboards/crkbd/keymaps/toinux/config.h
+++ b/keyboards/crkbd/keymaps/toinux/config.h
@@ -51,7 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/readme.md b/keyboards/crkbd/readme.md
index 3e8d8f8ba4..75267463b2 100644
--- a/keyboards/crkbd/readme.md
+++ b/keyboards/crkbd/readme.md
@@ -43,7 +43,6 @@ And in your `config.h` file, add the following:
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/dekunukem/duckypad/keymaps/default/config.h b/keyboards/dekunukem/duckypad/keymaps/default/config.h
index 9d26b71162..2fe4c6f15b 100644
--- a/keyboards/dekunukem/duckypad/keymaps/default/config.h
+++ b/keyboards/dekunukem/duckypad/keymaps/default/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_ONESHOT
 
 #define OLED_TIMEOUT 90000
-#define RGB_DISABLE_TIMEOUT 90000
+#define RGB_MATRIX_TIMEOUT 90000
 
 #define MT_0_0 "   1  "
 #define MT_0_1 "   2  "
diff --git a/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h b/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h
index 7d0bbb1341..bb66e1b754 100644
--- a/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h
+++ b/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_ONESHOT
 
 #define OLED_TIMEOUT 90000
-#define RGB_DISABLE_TIMEOUT 90000
+#define RGB_MATRIX_TIMEOUT 90000
 
 #define MT_0_0 " prev "
 #define MT_0_1 " pl/pa"
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 60e5b1fcf3..72ff80088f 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -45,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index 5933d23ea3..92ee0f31ae 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -24,7 +24,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 296e68a8b4..57749b4e55 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -24,7 +24,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index ffbc547d38..f7381175c8 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -40,7 +40,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 3148c745ef..08af978348 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -24,7 +24,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index c7baf23c5a..149b95b4b6 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -24,7 +24,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 27bf2270c8..84f398e18e 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -40,7 +40,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index ba747af060..c3a6cca1c0 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -24,7 +24,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index 67b6d61b0a..9094cd3ada 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -24,7 +24,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 24ce267e1b..60e570f809 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -40,7 +40,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index c90b14a5f5..f99bb835a9 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -28,7 +28,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index 09ae7b81f5..c28bcdecc2 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -39,7 +39,6 @@
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #    define DEBOUNCE 3
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index 043796456d..a470a7badd 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -39,7 +39,6 @@
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #    define DEBOUNCE 3
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 04c813cad5..9925c1bf6c 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -31,7 +31,6 @@
 #define DEBOUNCE 5
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define USB_SUSPEND_WAKEUP_DELAY 5000
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index aee0b1294f..c8f3aa4977 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -14,7 +14,6 @@
 
 #define DEBOUNCE 3
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
index 75e321507d..4a87c1b09c 100644
--- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
@@ -31,8 +31,6 @@
   #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //  #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 //  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-//  #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
-//  #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
   #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
index dc94302530..5dda6f15bc 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
@@ -17,6 +17,6 @@
 #pragma once
 
 #ifdef RGB_MATRIX_ENABLE
-    #define RGB_DISABLE_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
+    #define RGB_MATRIX_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
index 1438d317fb..845262b7e8 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
@@ -17,6 +17,6 @@
 #pragma once
 
 #ifdef RGB_MATRIX_ENABLE
-    #define RGB_DISABLE_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
+    #define RGB_MATRIX_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
index 799c5d9593..a462b569f9 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
@@ -18,7 +18,7 @@
 
 // At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best.
 #ifdef RGB_MATRIX_ENABLE
-    #define RGB_DISABLE_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
+    #define RGB_MATRIX_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
 
 // #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
index 46719e3a78..da70d56b7b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
@@ -19,7 +19,7 @@
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_DISABLE_TIMEOUT 90000
+#define RGB_MATRIX_TIMEOUT 90000
 
 #define MACRO_TIMER 5
 
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
index fd8f1d6859..105efad960 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
@@ -6,9 +6,9 @@
 #if defined(RGB_MATRIX_ENABLE)
     #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
      // number of milliseconds to wait until turning off RGB automatically
-    #define RGB_DISABLE_TIMEOUT 300000 // 300 seconds / 5 min
+    #define RGB_MATRIX_TIMEOUT 300000 // 300 seconds / 5 min
     // start fading out before getting disabled
-    // fading out is timed (depending on the rgb_matrix_config.speed) to have finished before reaching RGB_DISABLE_TIMEOUT
+    // fading out is timed (depending on the rgb_matrix_config.speed) to have finished before reaching RGB_MATRIX_TIMEOUT
     #define RGB_DISABLE_WITH_FADE_OUT
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
     // number of milliseconds to wait until activating RGB idle effects
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc
index 38a74a568b..c34887ebd2 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc
@@ -63,11 +63,11 @@ The code customizing RGB light usage is decribed here:
 
 * link:../../../../../../users/vitoni/readme.adoc[/users/vitoni/readme.adoc]
 
-When using  `RGB_DISABLE_TIMEOUT` addtional options are available:
+When using  `RGB_MATRIX_TIMEOUT` addtional options are available:
 
 * `RGB_FADE_IN` makes the RGB lights fade in instead of setting the value/brightness to 100% (implicitly due to HSV including the brightness) when resuming after RGB lights have been turned off.
 Fade in occurs when the keyboard is initialized and when the RGB brightness has been changed (e.g. suspending, fade out, etc.).
-* `RGB_DISABLE_WITH_FADE_OUT` activates fade out before the keyboard is disabled by `RGB_DISABLE_TIMEOUT`.
+* `RGB_DISABLE_WITH_FADE_OUT` activates fade out before the keyboard is disabled by `RGB_MATRIX_TIMEOUT`.
 
 Parameters used to define the behavior are:
 [%header]
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index 39ff7ffe17..2f4591b8ee 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB LEDs */
 #define RGB_DI_PIN B1
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
index 6aa4f4817f..1e6e6e58c6 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_ACCELERATED_SPEED  4800
 
 #ifdef RGB_MATRIX_ENABLE
-// #  define RGB_DISABLE_TIMEOUT 300000 // number of milliseconds to wait until disabling effects
+// #  define RGB_MATRIX_TIMEOUT 300000 // number of milliseconds to wait until disabling effects
 // #  define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #  define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #  define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h
index 85b5e0673f..40c3daf584 100644
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -52,7 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index 384b0bc547..8f94c7a702 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN B4
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index e5f49d7788..0dd1a50400 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -59,7 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 8838bd6bde..68578c3947 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -59,7 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index 6c942680f5..f92010cb31 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -109,7 +109,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //This is experimental do not enable yet
 //#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 215
 
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index ee26a0ff23..4e952e2775 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -31,7 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 463f94aeae..565e4126ca 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -31,7 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index c82b44b482..206b971aa3 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -30,7 +30,7 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_TIMEOUT 90000
+#define RGB_MATRIX_TIMEOUT 90000
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index 326f1fe19f..9cfc6702b4 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -28,7 +28,6 @@
 #define DEBOUNCE 5
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index 78ae4f21e1..3dc2f28b50 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -28,7 +28,6 @@
 #define DEBOUNCE 5
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index fea42a4266..63100696e9 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -33,7 +33,6 @@
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
index cda14c4bc0..dcc998f035 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
@@ -24,6 +24,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    undef RGB_DISABLE_TIMEOUT
-#    define RGB_DISABLE_TIMEOUT 900000
+#    undef RGB_MATRIX_TIMEOUT
+#    define RGB_MATRIX_TIMEOUT 900000
 #endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
index 944ddbddc2..929946a231 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@@ -10,7 +10,6 @@
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define DEBOUNCE 3
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
index 855f7210db..94f8500f98 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@@ -10,7 +10,6 @@
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define DEBOUNCE 3
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index c65819be8d..86ab159e3e 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -31,7 +31,6 @@
 #define DEBOUNCE 5
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
index 0eaf7a50ff..fcb15d7383 100644
--- a/keyboards/kbdfans/kbdmini/config.h
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -26,7 +26,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/kbdfans/maja/config.h b/keyboards/kbdfans/maja/config.h
index f98b7c3116..3ae0403cf3 100755
--- a/keyboards/kbdfans/maja/config.h
+++ b/keyboards/kbdfans/maja/config.h
@@ -11,7 +11,6 @@
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define DEBOUNCE 3
-#define RGB_DISABLE_AFTER_TIMEOUT 0
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
index 42478a2db6..f85a8eee55 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
@@ -42,7 +42,6 @@
 
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index 96ed5e65cb..7fdcb37ba9 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -50,7 +50,6 @@
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #define DRIVER_ADDR_1 0b1010000
 
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index 3a9f4af282..40196bee85 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -62,7 +62,6 @@
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
 
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 2
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index c5f8d3267e..d6cdad742d 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -61,7 +61,6 @@
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
 
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 7b38edd95a..c24bfddd39 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -58,7 +58,6 @@
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
 
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index a397c57099..37bd802541 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -62,7 +62,6 @@
 // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index add31bbdb4..3921aa17cc 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -60,7 +60,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index 33b01b850f..7b2fff263c 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
+#define RGB_MATRIX_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
 //#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index f2acf22a62..05e7a489dd 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
@@ -44,7 +44,6 @@
 // #define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
 // #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
 // #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
-// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/kprepublic/bm80v2_iso/config.h b/keyboards/kprepublic/bm80v2_iso/config.h
index 8231627b36..f20519553e 100644
--- a/keyboards/kprepublic/bm80v2_iso/config.h
+++ b/keyboards/kprepublic/bm80v2_iso/config.h
@@ -28,7 +28,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 /* disable these deprecated features by default */
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 9e6b98ee3a..68e9debf4e 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -43,7 +43,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index 8ac72f7bb3..cca0ca7ddf 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -42,7 +42,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index ef4695bdb1..1b7a9b9035 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -44,7 +44,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
index 0f9ddaef31..c70c7d8817 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
@@ -24,4 +24,4 @@
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
-#define RGB_DISABLE_TIMEOUT 900000
+#define RGB_MATRIX_TIMEOUT 900000
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 1fe692c383..de915827c4 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -84,7 +84,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGB_MATRIX_LED_COUNT RGBLED_NUM
   #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
   // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-  // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
   // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 42ddb1f4f3..2d13d2c5c9 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -87,7 +87,6 @@
 // #define RGBLIGHT_HUE_STEP 12        						// Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        						// Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        						// Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_AFTER_TIMEOUT 0   					// number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED 			// turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 					// limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 8b28e72d5c..4b702a1110 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -47,7 +47,6 @@
 // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
index 68ed5f7609..f8e0e9fc7d 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
@@ -32,7 +32,6 @@
 // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index 78641763c2..b8dddc9ec5 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -65,7 +65,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index e5799e308e..59feed09a9 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -63,7 +63,6 @@
 // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index bc025120a6..76ebe5fd3a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -8,7 +8,6 @@
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 2a434f1d5d..0928e89213 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -27,7 +27,6 @@
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 9149dfe97a..65a189b9de 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -56,7 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 1782c4f497..155d526f3f 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -34,7 +34,6 @@
 #define RGB_MATRIX_LED_COUNT 25
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h
index cea9a5bc06..bf8172b994 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h
@@ -6,7 +6,6 @@
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index 48caf0b40e..2dab887e4d 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -25,7 +25,6 @@
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
index d173abe124..868ea8a291 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -30,7 +30,6 @@
 // 0b0110011 AD <-> VCC
 // 0b0110001 AD <-> SCL
 // 0b0110010 AD <-> SDA
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #undef ENABLE_RGB_MATRIX_SPLASH
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
index f86332fe08..9a9b8b6236 100644
--- a/keyboards/mechlovin/infinity875/config.h
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 42
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
index aab6083eb0..878319836c 100755
--- a/keyboards/melgeek/mach80/config.h
+++ b/keyboards/melgeek/mach80/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h
index 407beba1e8..368538666b 100644
--- a/keyboards/melgeek/mj61/config.h
+++ b/keyboards/melgeek/mj61/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/mj63/config.h b/keyboards/melgeek/mj63/config.h
index 407beba1e8..368538666b 100644
--- a/keyboards/melgeek/mj63/config.h
+++ b/keyboards/melgeek/mj63/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/mj64/config.h b/keyboards/melgeek/mj64/config.h
index 407beba1e8..368538666b 100644
--- a/keyboards/melgeek/mj64/config.h
+++ b/keyboards/melgeek/mj64/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/config.h
index e009feed5b..85dd49a4ca 100644
--- a/keyboards/melgeek/mj65/config.h
+++ b/keyboards/melgeek/mj65/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/mojo68/config.h
index 3ef18c6785..058c8eeccb 100755
--- a/keyboards/melgeek/mojo68/config.h
+++ b/keyboards/melgeek/mojo68/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h
index 67c79df409..e354fcb40e 100644
--- a/keyboards/melgeek/mojo75/config.h
+++ b/keyboards/melgeek/mojo75/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h
index b16fb73b0d..9a5a5ed2ce 100755
--- a/keyboards/melgeek/tegic/config.h
+++ b/keyboards/melgeek/tegic/config.h
@@ -25,7 +25,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h
index e90c780a72..357f67e691 100644
--- a/keyboards/melgeek/z70ultra/config.h
+++ b/keyboards/melgeek/z70ultra/config.h
@@ -24,7 +24,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h
index 16587a22d4..c1e5bcfc38 100644
--- a/keyboards/miller/gm862/config.h
+++ b/keyboards/miller/gm862/config.h
@@ -23,7 +23,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 6b8bf0b3ac..a20294ce32 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -62,7 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #    define USE_I2CV2
 #    define RGB_MATRIX_DISABLE_KEYCODES
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_LED_PROCESS_LIMIT  4
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 1bf9702a3e..a4d828e889 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -61,7 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #    define USE_I2CV2
 #    define RGB_MATRIX_DISABLE_KEYCODES
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_LED_PROCESS_LIMIT  4
diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h
index 0835c606fa..e996752af1 100644
--- a/keyboards/paprikman/albacore/config.h
+++ b/keyboards/paprikman/albacore/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 8
-  #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220
   #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/rgbkb/mun/keymaps/default/config.h b/keyboards/rgbkb/mun/keymaps/default/config.h
index debd16163b..9fbbfc5901 100644
--- a/keyboards/rgbkb/mun/keymaps/default/config.h
+++ b/keyboards/rgbkb/mun/keymaps/default/config.h
@@ -17,7 +17,7 @@
 #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-// #define RGB_DISABLE_TIMEOUT 1200000
+// #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 #define STM32_ONBOARD_EEPROM_SIZE 2048
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/config.h b/keyboards/rgbkb/mun/keymaps/peott-fr/config.h
index 9719d17437..a0b6cced11 100644
--- a/keyboards/rgbkb/mun/keymaps/peott-fr/config.h
+++ b/keyboards/rgbkb/mun/keymaps/peott-fr/config.h
@@ -17,7 +17,7 @@
 #define DISABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-// #define RGB_DISABLE_TIMEOUT 1200000
+// #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 #define STM32_ONBOARD_EEPROM_SIZE 2048
diff --git a/keyboards/rgbkb/mun/keymaps/via/config.h b/keyboards/rgbkb/mun/keymaps/via/config.h
index cfcaa9a1ed..01dc6f1c7d 100644
--- a/keyboards/rgbkb/mun/keymaps/via/config.h
+++ b/keyboards/rgbkb/mun/keymaps/via/config.h
@@ -17,7 +17,7 @@
 #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-// #define RGB_DISABLE_TIMEOUT 1200000
+// #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h b/keyboards/rgbkb/mun/keymaps/xulkal2/config.h
index 42e60191fc..7e3fc2d908 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/config.h
@@ -29,7 +29,7 @@
 #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-// #define RGB_DISABLE_TIMEOUT 1200000
+// #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define OLED_SCROLL_TIMEOUT 20000
 #define ONESHOT_TAP_TOGGLE 2
diff --git a/keyboards/rgbkb/sol3/keymaps/default/config.h b/keyboards/rgbkb/sol3/keymaps/default/config.h
index b239f5bb80..7e46726115 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/default/config.h
@@ -17,7 +17,7 @@
 #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-// #define RGB_DISABLE_TIMEOUT 1200000
+// #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 #define STM32_ONBOARD_EEPROM_SIZE 2048
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
index 400848aa35..b1a8fce865 100644
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
@@ -17,7 +17,7 @@
 #define DISABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-// #define RGB_DISABLE_TIMEOUT 1200000
+// #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 
diff --git a/keyboards/rgbkb/sol3/keymaps/via/config.h b/keyboards/rgbkb/sol3/keymaps/via/config.h
index 3934e6c491..e6aa2bd87b 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/via/config.h
@@ -17,7 +17,7 @@
 #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-// #define RGB_DISABLE_TIMEOUT 1200000
+// #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
index 026e8d9097..e7016c4b78 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
@@ -30,7 +30,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
index 129e9a5548..d1cb2f50d5 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
@@ -31,8 +31,6 @@
   #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //  #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 //  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-//  #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
-//  #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
   #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
   #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
index 0fa44eb3ce..26607eca89 100644
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
+++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
@@ -26,7 +26,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index f1b06ace22..b13fd918b8 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -63,7 +63,6 @@
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index d02cf04421..6035973a03 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160   // limit brightness to not overamp the USB
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
-#define RGB_DISABLE_AFTER_TIMEOUT 0         // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 7163947920..41b43cf683 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -43,7 +43,6 @@
 #define DEBOUNCE 3
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h
index cb5ff7210a..a0341e5c6b 100644
--- a/keyboards/sofle/keymaps/devdev/config.h
+++ b/keyboards/sofle/keymaps/devdev/config.h
@@ -83,7 +83,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index cb5ff7210a..a0341e5c6b 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -83,7 +83,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 6f257e9118..739a3c78f8 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -47,8 +47,6 @@
 #    define RGB_MATRIX_KEYPRESSES                                      // Reacts to keypresses
 // #    define RGB_MATRIX_KEYRELEASES                                     // Reacts to keyreleases (instead of keypresses)
 // #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS                             // Enables framebuffer effects
-#    define RGB_DISABLE_TIMEOUT 0                                      // Number of milliseconds to wait until RGB automatically turns off
-#    define RGB_DISABLE_AFTER_TIMEOUT 0                                // OBSOLETE: Number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED                             // Turns off effects when suspended
 // Limit brightness to support USB-A at 0.5 A
 // TODO: Do this dynamically based on power source
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index 38919aa55c..a0ad0c1652 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #    define DEBOUNCE 3
-#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index fe00c26b6a..36bd7b3ed5 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #    define DEBOUNCE 3
-#    define RGB_DISABLE_AFTER_TIMEOUT 0     // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index 54ef84a71e..328aafc6e4 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -48,7 +48,6 @@
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 // #    define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index 1612f636bd..f47695ea91 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -27,7 +27,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index bc496ee3da..6f999e0e07 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -27,7 +27,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index 444133cd00..e38f0b61e1 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -27,7 +27,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 5022f26339..6c6a86c5d6 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -27,7 +27,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 15846a8dc9..c8627fd2da 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -27,7 +27,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index ad2a7101cf..c2945cadf6 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -10,7 +10,6 @@
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define DEBOUNCE 3
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h
index 4db1cdf568..d1a40a4dce 100644
--- a/keyboards/yncognito/batpad/config.h
+++ b/keyboards/yncognito/batpad/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_KEYRELEASES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 36dc55747d..2a74e9e9f5 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -55,7 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 3f47a3dcbc..e2154cbe2f 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -35,7 +35,6 @@
 #    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses (will slow down matrix scan by a lot)
 // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    undef RGB_MATRIX_LED_PROCESS_LIMIT
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index cfe2d4436f..0944e37077 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -46,7 +46,6 @@
 #    endif
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 5bff154480..c26b1ad19b 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -54,12 +54,8 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER;
 // -----End led effect includes macros-------
 // ------------------------------------------
 
-#if defined(LED_DISABLE_AFTER_TIMEOUT) && !defined(LED_DISABLE_TIMEOUT)
-#    define LED_DISABLE_TIMEOUT (LED_DISABLE_AFTER_TIMEOUT * 1200UL)
-#endif
-
-#ifndef LED_DISABLE_TIMEOUT
-#    define LED_DISABLE_TIMEOUT 0
+#ifndef LED_MATRIX_TIMEOUT
+#    define LED_MATRIX_TIMEOUT 0
 #endif
 
 #if !defined(LED_MATRIX_MAXIMUM_BRIGHTNESS) || LED_MATRIX_MAXIMUM_BRIGHTNESS > UINT8_MAX
@@ -103,9 +99,9 @@ static uint8_t         led_last_enable   = UINT8_MAX;
 static uint8_t         led_last_effect   = UINT8_MAX;
 static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false};
 static led_task_states led_task_state    = SYNCING;
-#if LED_DISABLE_TIMEOUT > 0
+#if LED_MATRIX_TIMEOUT > 0
 static uint32_t led_anykey_timer;
-#endif // LED_DISABLE_TIMEOUT > 0
+#endif // LED_MATRIX_TIMEOUT > 0
 
 // double buffers
 static uint32_t led_timer_buffer;
@@ -185,9 +181,9 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
 #ifndef LED_MATRIX_SPLIT
     if (!is_keyboard_master()) return;
 #endif
-#if LED_DISABLE_TIMEOUT > 0
+#if LED_MATRIX_TIMEOUT > 0
     led_anykey_timer = 0;
-#endif // LED_DISABLE_TIMEOUT > 0
+#endif // LED_MATRIX_TIMEOUT > 0
 
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -237,13 +233,13 @@ static bool led_matrix_none(effect_params_t *params) {
 }
 
 static void led_task_timers(void) {
-#if defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
+#if defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_MATRIX_TIMEOUT > 0
     uint32_t deltaTime = sync_timer_elapsed32(led_timer_buffer);
-#endif // defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
+#endif // defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_MATRIX_TIMEOUT > 0
     led_timer_buffer = sync_timer_read32();
 
     // Update double buffer timers
-#if LED_DISABLE_TIMEOUT > 0
+#if LED_MATRIX_TIMEOUT > 0
     if (led_anykey_timer < UINT32_MAX) {
         if (UINT32_MAX - deltaTime < led_anykey_timer) {
             led_anykey_timer = UINT32_MAX;
@@ -251,7 +247,7 @@ static void led_task_timers(void) {
             led_anykey_timer += deltaTime;
         }
     }
-#endif // LED_DISABLE_TIMEOUT > 0
+#endif // LED_MATRIX_TIMEOUT > 0
 
     // Update double buffer last hit timers
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
@@ -357,9 +353,9 @@ void led_matrix_task(void) {
     // Ideally we would also stop sending zeros to the LED driver PWM buffers
     // while suspended and just do a software shutdown. This is a cheap hack for now.
     bool suspend_backlight = suspend_state ||
-#if LED_DISABLE_TIMEOUT > 0
-                             (led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) ||
-#endif // LED_DISABLE_TIMEOUT > 0
+#if LED_MATRIX_TIMEOUT > 0
+                             (led_anykey_timer > (uint32_t)LED_MATRIX_TIMEOUT) ||
+#endif // LED_MATRIX_TIMEOUT > 0
                              false;
 
     uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode;
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index ae61e75535..8b335c017d 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -56,12 +56,8 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
 // -----End rgb effect includes macros-------
 // ------------------------------------------
 
-#if defined(RGB_DISABLE_AFTER_TIMEOUT) && !defined(RGB_DISABLE_TIMEOUT)
-#    define RGB_DISABLE_TIMEOUT (RGB_DISABLE_AFTER_TIMEOUT * 1200UL)
-#endif
-
-#ifndef RGB_DISABLE_TIMEOUT
-#    define RGB_DISABLE_TIMEOUT 0
+#ifndef RGB_MATRIX_TIMEOUT
+#    define RGB_MATRIX_TIMEOUT 0
 #endif
 
 #if !defined(RGB_MATRIX_MAXIMUM_BRIGHTNESS) || RGB_MATRIX_MAXIMUM_BRIGHTNESS > UINT8_MAX
@@ -126,9 +122,9 @@ static uint8_t         rgb_last_enable   = UINT8_MAX;
 static uint8_t         rgb_last_effect   = UINT8_MAX;
 static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false};
 static rgb_task_states rgb_task_state    = SYNCING;
-#if RGB_DISABLE_TIMEOUT > 0
+#if RGB_MATRIX_TIMEOUT > 0
 static uint32_t rgb_anykey_timer;
-#endif // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_MATRIX_TIMEOUT > 0
 
 // double buffers
 static uint32_t rgb_timer_buffer;
@@ -213,9 +209,9 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
 #ifndef RGB_MATRIX_SPLIT
     if (!is_keyboard_master()) return;
 #endif
-#if RGB_DISABLE_TIMEOUT > 0
+#if RGB_MATRIX_TIMEOUT > 0
     rgb_anykey_timer = 0;
-#endif // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_MATRIX_TIMEOUT > 0
 
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -296,17 +292,17 @@ static bool rgb_matrix_none(effect_params_t *params) {
 }
 
 static void rgb_task_timers(void) {
-#if defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
+#if defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_MATRIX_TIMEOUT > 0
     uint32_t deltaTime = sync_timer_elapsed32(rgb_timer_buffer);
-#endif // defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
+#endif // defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_MATRIX_TIMEOUT > 0
     rgb_timer_buffer = sync_timer_read32();
 
     // Update double buffer timers
-#if RGB_DISABLE_TIMEOUT > 0
+#if RGB_MATRIX_TIMEOUT > 0
     if (rgb_anykey_timer + deltaTime <= UINT32_MAX) {
         rgb_anykey_timer += deltaTime;
     }
-#endif // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_MATRIX_TIMEOUT > 0
 
     // Update double buffer last hit timers
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
@@ -419,9 +415,9 @@ void rgb_matrix_task(void) {
     // Ideally we would also stop sending zeros to the LED driver PWM buffers
     // while suspended and just do a software shutdown. This is a cheap hack for now.
     bool suspend_backlight = suspend_state ||
-#if RGB_DISABLE_TIMEOUT > 0
-                             (rgb_anykey_timer > (uint32_t)RGB_DISABLE_TIMEOUT) ||
-#endif // RGB_DISABLE_TIMEOUT > 0
+#if RGB_MATRIX_TIMEOUT > 0
+                             (rgb_anykey_timer > (uint32_t)RGB_MATRIX_TIMEOUT) ||
+#endif // RGB_MATRIX_TIMEOUT > 0
                              false;
 
     uint8_t effect = suspend_backlight || !rgb_matrix_config.enable ? 0 : rgb_matrix_config.mode;
diff --git a/users/bbaserdem/config.h b/users/bbaserdem/config.h
index 477378102b..3c467d5e7d 100644
--- a/users/bbaserdem/config.h
+++ b/users/bbaserdem/config.h
@@ -121,7 +121,7 @@
 // For perkey leds
 #ifdef RGB_MATRIX_ENABLE
 // This is not working
-//#   define RGB_DISABLE_TIMEOUT 1800000
+//#   define RGB_MATRIX_TIMEOUT 1800000
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED true
     // Start using this mode
 #   define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_BEACON
diff --git a/users/drashna/rgb/rgb_matrix_config.h b/users/drashna/rgb/rgb_matrix_config.h
index 33979a198e..86f238f392 100644
--- a/users/drashna/rgb/rgb_matrix_config.h
+++ b/users/drashna/rgb/rgb_matrix_config.h
@@ -6,7 +6,6 @@
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 // #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 
 #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/users/vitoni/rgb_matrix_effects.h b/users/vitoni/rgb_matrix_effects.h
index ed74500b18..c3234b159b 100644
--- a/users/vitoni/rgb_matrix_effects.h
+++ b/users/vitoni/rgb_matrix_effects.h
@@ -22,7 +22,7 @@ enum states {
 #if defined(RGB_DISABLE_WITH_FADE_OUT)
     ,FADE_OUT           //!< before supending
 #endif
-    ,SUSPENDED          //!< expecting to be suspended by RGB_DISABLE_TIMEOUT any time
+    ,SUSPENDED          //!< expecting to be suspended by RGB_MATRIX_TIMEOUT any time
 };
 
 /**
@@ -99,8 +99,8 @@ bool fade_in(const uint8_t time);
 #endif
 
 #if defined(RGB_DISABLE_WITH_FADE_OUT)
-#   if !defined(RGB_DISABLE_TIMEOUT)
-#       warning "RGB_DISABLE_WITH_FADE_OUT expects RGB_DISABLE_TIMEOUT to be defined"
+#   if !defined(RGB_MATRIX_TIMEOUT)
+#       warning "RGB_DISABLE_WITH_FADE_OUT expects RGB_MATRIX_TIMEOUT to be defined"
 #   endif
 #endif
 
diff --git a/users/vitoni/vitoni.c b/users/vitoni/vitoni.c
index 2a0ff5c46f..f8cb50ea78 100644
--- a/users/vitoni/vitoni.c
+++ b/users/vitoni/vitoni.c
@@ -31,17 +31,17 @@ void matrix_scan_user_rgb(void) {
 #endif
 #if defined(RGB_DISABLE_WITH_FADE_OUT)
     const uint32_t fade_out_duration = scale_2_rgb_time(128);
-    const uint32_t start_fade_out_after_millis = (RGB_DISABLE_TIMEOUT) > fade_out_duration
-        ? (RGB_DISABLE_TIMEOUT) - fade_out_duration
+    const uint32_t start_fade_out_after_millis = (RGB_MATRIX_TIMEOUT) > fade_out_duration
+        ? (RGB_MATRIX_TIMEOUT) - fade_out_duration
         : 0;
 
     if (start_fade_out_after_millis <= inactivity_millis) {
         update_value(&state, FADE_OUT, &calc_offset);
     }
-#elif defined(RGB_DISABLE_TIMEOUT)
+#elif defined(RGB_MATRIX_TIMEOUT)
     // having to set brightness "manually" to black as starting point for fade in
     // for the time when returning from suspended state
-    if (RGB_DISABLE_TIMEOUT <= inactivity_millis + 15) {
+    if (RGB_MATRIX_TIMEOUT <= inactivity_millis + 15) {
         rgb_matrix_config.hsv.v = 0;
         state = SUSPENDED;
     }
diff --git a/users/xulkal/config.h b/users/xulkal/config.h
index 88e3efbe72..7f7782807e 100644
--- a/users/xulkal/config.h
+++ b/users/xulkal/config.h
@@ -31,5 +31,5 @@
 #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 
 // 20m timeout (20m * 60s * 1000mil)
-#define RGB_DISABLE_TIMEOUT 1200000
+#define RGB_MATRIX_TIMEOUT 1200000
 #define OLED_SCROLL_TIMEOUT 20000

From 04b93bd2a9940bc194b512797a6a9a205c77e8c1 Mon Sep 17 00:00:00 2001
From: syntax-magic <dan.syntaxmagic@gmail.com>
Date: Sun, 25 Sep 2022 21:53:16 -0700
Subject: [PATCH 441/959] [Keymap] Switched keys around in RIGHFN layer and
 updated indicator lights to green (#18465)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: syntax-magic <dkim.8881@gmail.com>
---
 .../kprepublic/bm40hsrgb/keymaps/dan/keymap.c | 125 +++++++++---------
 1 file changed, 60 insertions(+), 65 deletions(-)

diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
index 5029d557dd..495e664e36 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
@@ -16,17 +16,17 @@
 #include QMK_KEYBOARD_H
 
 enum layers {
-  _ALPHA,
-  _LEFTFN,
-  _RIGHTFN,
-  _NUMPAD,
-  _LEAGUE,
-  _PUBG,
-  _OVERWATCH,
-  _STARCRAFT,
-  _TETRIS,
-  _CLEAN,
-  _RGB
+    _ALPHA,
+    _LEFTFN,
+    _RIGHTFN,
+    _NUMPAD,
+    _LEAGUE,
+    _PUBG,
+    _OVERWATCH,
+    _STARCRAFT,
+    _TETRIS,
+    _CLEAN,
+    _RGB
 };
 
 #define ALPHA TO(_ALPHA)
@@ -67,9 +67,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Ctrl | Left | Down | Up   |Right |CTRL+/|HANJA |   [  |   ]  |   )  |   :  |  "   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| PGUP | PGDN | Home | End  | CAPS |PRNTSR|   (  |   ,  |   .  |   /  | Enter|
+ * | Shift| PGUP | PGDN | Home | End  | CAPS |PRNTSR|   (  |   ,  |   .  |   /  |Return|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RGB  |  [   |  ]   | Alt  | Trns |    Space    |   _  |   +  | INS  |   |  | Ent. |
+ * | RGB  |   [  |   ]  | Alt  | Trns |    Space    |   _  |   +  | INS  |   |  | Enter|
  * `-----------------------------------------------------------------------------------'
  */
 [_LEFTFN] = LAYOUT_planck_mit(
@@ -79,50 +79,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB,     KC_LBRC, KC_RBRC, KC_LALT, KC_TRNS,           KC_SPC,         KC_UNDS, KC_PLUS, KC_INS,  KC_PIPE, KC_PENT
 ),
 
-
 /* RIGHTFN
  * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      | Pause|SCRLCK|      | F11  |  F12 |
+ * |      |      |      |      |      |      |      |  F12 |  F11 |  F10 |  F9  |Scllck|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F4  |  F5  |
+ * | Ctrl |      |      |      |      |      |      |  F8  |  F7  |  F6  |  F5  | Pause|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |  F6  |  F7  |  F8  |  F9  |  F10 |
+ * | 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_PAUS, KC_SCRL, KC_NO, KC_F11, KC_F12,
-    KC_LCTL, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F1,   KC_F2,   KC_F3, KC_F4,  KC_F5,
-    KC_LSFT, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F6,   KC_F7,   KC_F8, KC_F9,  KC_F10,
-    KC_NO,   KC_NO, KC_NO, KC_LALT, KC_NO,    KC_SPC,    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_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
 ),
 
 /* NUMPAD
  * ,-----------------------------------------------------------------------------------.
  * |   *  |   7  |   8  |   9  | NumLk|      |      |      |      |      |      | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Alt |   4  |   5  |   6  | Enter|      |      |      |      |      |      |      |
+ * |  Alt |   4  |   5  |   6  |Return|      |      |      |      |      | Shift|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   -  |   1  |   2  |   3  | Bksp |      |      |      |      | Ctrl | Shift|Return|
+ * |   -  |   1  |   2  |   3  | Bksp |      |      |      |      |      | Ctrl |Return|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Trns |   ,  |  +   |   .  |   0  |    Space    |LEAGUE| PUBG | OVWCh|  SC  |TETRIS|
+ * | Trns |   ,  |   +  |   .  |   0  |    Space    |LEAGUE| PUBG | OVWCh|  SC  |TETRIS|
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_planck_mit(
-    KC_PAST, KC_P7,   KC_P8,   KC_P9,   KC_NLCK, 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_NO,     KC_NO,
-    KC_PMNS, KC_P1,   KC_P2,   KC_P3,   KC_BSPC, KC_NO, KC_NO, KC_NO,  KC_NO, KC_LCTL,   KC_LSFT,   KC_ENT,
+    KC_ASTR, KC_P7,   KC_P8,   KC_P9,   KC_NLCK, 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_NO, KC_NO,     KC_LCTL,   KC_ENT,
     KC_TRNS, KC_COMM, KC_PPLS, KC_PDOT, KC_0,       KC_SPC,    LEAGUE, PUBG,  OVERWATCH, STARCRAFT, TETRIS
 ),
 
+
 /* LEAGUE
  * ,-----------------------------------------------------------------------------------.
  * | Tab  |   Q  |   W  |   E  |   R  |   5  |   Y  |      |      |   O  |   P  | ESC  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Ctrl |   A  |   S  |   D  |   F  |      |      |      |      |   L  |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   6  |   4  |   1  |   B  |      |      |      |      |      | Enter|
+ * | Shift|   Z  |   6  |   4  |   1  |   B  |      |      |      |      |      |Return|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |   3  |   X  |   C  |  Alt |   2  |    Space    |      |      |      |      | ALPHA|
  * `-----------------------------------------------------------------------------------'
@@ -140,16 +140,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |   1  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |      |  F7  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   3  |   X  |   C  |   V  |   B  |   M  |   .  |      |      |  F9  |
+ * | Shift|   Z  |   3  |   X  |   C  |   V  |   B  |   M  |   ,  |   .  |      |  F9  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Ctrl |   5  |   4  |  Alt |   2  |    Space    |   6  |   8  |  7   |  9   | ALPHA|
  * `-----------------------------------------------------------------------------------'
  */
 [_PUBG] = 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_DOT, KC_NO, 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
+    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
 ),
 
 /* OVERWATCH
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |   1  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Enter|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Ctrl |      |      | Alt  |   2  |    Space    | Bksp |      |      |      | ALPHA|
  * `-----------------------------------------------------------------------------------'
@@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Enter|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Esc  |      |      | Alt  |   F1 |    Space    |  F10 | Pause|Delete|      | ALPHA|
  * `-----------------------------------------------------------------------------------'
@@ -206,10 +206,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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
-
 ),
 
-/* TETRIS
+/* CLEAN
  * ,-----------------------------------------------------------------------------------.
  * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -257,7 +256,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 {36, 37, 38, 39, 40,   41,   42, 43, 44, 45, 46}
 
 */
+
 void rgb_matrix_indicators_user(void) {
+    uint8_t red[3] = {50, 5, 0};
+    uint8_t yellow[3] = {50, 50, 0};
+    uint8_t blue[3] = {0, 15, 50};
+    uint8_t green[3] = {15, 33, 1};
+    uint8_t white[3] = {255, 255, 255};
+
     switch (get_highest_layer(layer_state)) {
         case _ALPHA:
             break;
@@ -268,65 +274,54 @@ void rgb_matrix_indicators_user(void) {
         case _NUMPAD:
             break;
         case _LEAGUE:
-            rgb_matrix_set_color(1, 15, 15, 15);
-            rgb_matrix_set_color(2, 15, 15, 15);
-            rgb_matrix_set_color(3, 15, 15, 15);
-            rgb_matrix_set_color(4, 15, 15, 15);
-            rgb_matrix_set_color(15, 50, 40, 0);
-            rgb_matrix_set_color(16, 50, 5, 0);
-            rgb_matrix_set_color(29, 0, 15, 50);
-            rgb_matrix_set_color(10, 20, 2, 15);
+            rgb_matrix_set_color(15, yellow[0], yellow[1], yellow[2]);
+            rgb_matrix_set_color(16, red[0], red[1], red[2]);
+            rgb_matrix_set_color(29, blue[0], blue[1], blue[2]);
+            rgb_matrix_set_color(42, green[0], green[1], green[2]);
+
             break;
 
         case _PUBG:
-            rgb_matrix_set_color(12, 15, 15, 15);
-            rgb_matrix_set_color(40, 15, 15, 15);
-            rgb_matrix_set_color(42, 3, 3, 50);
-            rgb_matrix_set_color(43, 5, 50, 8);
-            rgb_matrix_set_color(44, 50, 35, 0);
-            rgb_matrix_set_color(45, 30, 30, 15);
+            rgb_matrix_set_color(43, green[0], green[1], green[2]);
+
             break;
 
         case _OVERWATCH:
-            rgb_matrix_set_color(11, 80, 20, 0);
-            rgb_matrix_set_color(46, 80, 20, 0);
+            rgb_matrix_set_color(44, green[0], green[1], green[2]);
             break;
 
         case _STARCRAFT:
-            rgb_matrix_set_color(11, 5, 80, 15);
-            rgb_matrix_set_color(46, 5, 80, 15);
+            rgb_matrix_set_color(45, green[0], green[1], green[2]);
             break;
 
         case _TETRIS:
-            rgb_matrix_set_color(2, 60, 10, 20);
-            rgb_matrix_set_color(13, 60, 10, 20);
-            rgb_matrix_set_color(14, 60, 10, 20);
-            rgb_matrix_set_color(15, 60, 10, 20);
+            rgb_matrix_set_color(46, green[0], green[1], green[2]);
             break;
 
         case _CLEAN:
-            rgb_matrix_set_color_all(255, 255, 255);
+            rgb_matrix_set_color_all(white[0], white[1], white[2]);
             break;
 
         case _RGB:
             break;
     }
 
-	led_t led_state = host_keyboard_led_state();
+    led_t led_state = host_keyboard_led_state();
 
     //Capslock led
     if (led_state.caps_lock) {
-        rgb_matrix_set_color(12, 145, 145, 145);
+        rgb_matrix_set_color(12, green[0], green[1], green[2]);
     }
 
     //Numlock led
-    if (!led_state.num_lock) {
-        rgb_matrix_set_color(0, 145, 145, 145);
+    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(24, 145, 145, 145);
+        rgb_matrix_set_color(23, green[0], green[1], green[2]);
     }
 
 }

From 6809f154c9b8a405444c1a32839e7e3687ddb8e2 Mon Sep 17 00:00:00 2001
From: Cao Thai Duong <57068549+KD-MM2@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:42:04 +0900
Subject: [PATCH 442/959] [Keyboard] Add Handwired 87 keys (#17682)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/hwpm87/config.h           |  29 +++++
 keyboards/handwired/hwpm87/hwpm87.c           |   4 +
 keyboards/handwired/hwpm87/hwpm87.h           |  24 ++++
 keyboards/handwired/hwpm87/info.json          | 105 ++++++++++++++++++
 .../handwired/hwpm87/keymaps/default/keymap.c |  26 +++++
 keyboards/handwired/hwpm87/readme.md          |  35 ++++++
 keyboards/handwired/hwpm87/rules.mk           |  20 ++++
 7 files changed, 243 insertions(+)
 create mode 100644 keyboards/handwired/hwpm87/config.h
 create mode 100644 keyboards/handwired/hwpm87/hwpm87.c
 create mode 100644 keyboards/handwired/hwpm87/hwpm87.h
 create mode 100644 keyboards/handwired/hwpm87/info.json
 create mode 100644 keyboards/handwired/hwpm87/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/hwpm87/readme.md
 create mode 100644 keyboards/handwired/hwpm87/rules.mk

diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h
new file mode 100644
index 0000000000..60ef15ab44
--- /dev/null
+++ b/keyboards/handwired/hwpm87/config.h
@@ -0,0 +1,29 @@
+// Copyright 2022 CAO THAI DUONG (@KD-MM2)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 18
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define DIODE_DIRECTION ROW2COL
+ 
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
+#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 }
+
+#define LED_CAPS_LOCK_PIN D5
+#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/hwpm87/hwpm87.c b/keyboards/handwired/hwpm87/hwpm87.c
new file mode 100644
index 0000000000..9edc09c971
--- /dev/null
+++ b/keyboards/handwired/hwpm87/hwpm87.c
@@ -0,0 +1,4 @@
+// Copyright 2022 CAO THAI DUONG (@KD-MM2)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "hwpm87.h"
diff --git a/keyboards/handwired/hwpm87/hwpm87.h b/keyboards/handwired/hwpm87/hwpm87.h
new file mode 100644
index 0000000000..7de32eaa8c
--- /dev/null
+++ b/keyboards/handwired/hwpm87/hwpm87.h
@@ -0,0 +1,24 @@
+// Copyright 2022 CAO THAI DUONG (@KD-MM2)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4G, \
+    K50, K51, K53, K56, K5A, K5B, K5D, K5E, K5F, K5G, K5H  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, XXX, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F, K1G, K1H }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX, XXX }, \
+    { XXX, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, XXX, K4G, XXX }, \
+    { K50, K51, XXX, K53, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F, K5G, K5H }, \
+}
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json
new file mode 100644
index 0000000000..90d8ad397c
--- /dev/null
+++ b/keyboards/handwired/hwpm87/info.json
@@ -0,0 +1,105 @@
+{
+    "manufacturer": "KD-MM2",
+    "keyboard_name": "hwpm87",
+    "maintainer": "KD-MM2",
+    "url": "",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (B0,D3)", "x": 0, "y": 0 },
+                { "label": "K02 (B0,D1)", "x": 2, "y": 0 },
+                { "label": "K03 (B0,D0)", "x": 3, "y": 0 },
+                { "label": "K04 (B0,D4)", "x": 4, "y": 0 },
+                { "label": "K05 (B0,C6)", "x": 5, "y": 0 },
+                { "label": "K07 (B0,E6)", "x": 6.5, "y": 0 },
+                { "label": "K08 (B0,B7)", "x": 7.5, "y": 0 },
+                { "label": "K09 (B0,F0)", "x": 8.5, "y": 0 },
+                { "label": "K0A (B0,F1)", "x": 9.5, "y": 0 },
+                { "label": "K0B (B0,D5)", "x": 11, "y": 0 },
+                { "label": "K0C (B0,D6)", "x": 12, "y": 0 },
+                { "label": "K0D (B0,C7)", "x": 13, "y": 0 },
+                { "label": "K0E (B0,E2)", "x": 14, "y": 0 },
+                { "label": "K0F (B0,B6)", "x": 15.25, "y": 0 },
+                { "label": "K0G (B0,F7)", "x": 16.25, "y": 0 },
+                { "label": "K0H (B0,F6)", "x": 17.25, "y": 0 },
+                { "label": "K10 (B1,D3)", "x": 0, "y": 1 },
+                { "label": "K11 (B1,D2)", "x": 1, "y": 1 },
+                { "label": "K12 (B1,D1)", "x": 2, "y": 1 },
+                { "label": "K13 (B1,D0)", "x": 3, "y": 1 },
+                { "label": "K14 (B1,D4)", "x": 4, "y": 1 },
+                { "label": "K15 (B1,C6)", "x": 5, "y": 1 },
+                { "label": "K16 (B1,D7)", "x": 6, "y": 1 },
+                { "label": "K17 (B1,E6)", "x": 7, "y": 1 },
+                { "label": "K18 (B1,B7)", "x": 8, "y": 1 },
+                { "label": "K19 (B1,F0)", "x": 9, "y": 1 },
+                { "label": "K1A (B1,F1)", "x": 10, "y": 1 },
+                { "label": "K1B (B1,D5)", "x": 11, "y": 1 },
+                { "label": "K1C (B1,D6)", "x": 12, "y": 1 },
+                { "label": "K1E (B1,E2)", "x": 13, "y": 1, "w": 2 },
+                { "label": "K1F (B1,B6)", "x": 15.25, "y": 1 },
+                { "label": "K1G (B1,F7)", "x": 16.25, "y": 1 },
+                { "label": "K1H (B1,F6)", "x": 17.25, "y": 1 },
+                { "label": "K20 (B2,D3)", "x": 0, "y": 2, "w": 1.5 },
+                { "label": "K22 (B2,D1)", "x": 1.5, "y": 2 },
+                { "label": "K23 (B2,D0)", "x": 2.5, "y": 2 },
+                { "label": "K24 (B2,D4)", "x": 3.5, "y": 2 },
+                { "label": "K25 (B2,C6)", "x": 4.5, "y": 2 },
+                { "label": "K26 (B2,D7)", "x": 5.5, "y": 2 },
+                { "label": "K27 (B2,E6)", "x": 6.5, "y": 2 },
+                { "label": "K28 (B2,B7)", "x": 7.5, "y": 2 },
+                { "label": "K29 (B2,F0)", "x": 8.5, "y": 2 },
+                { "label": "K2A (B2,F1)", "x": 9.5, "y": 2 },
+                { "label": "K2B (B2,D5)", "x": 10.5, "y": 2 },
+                { "label": "K2C (B2,D6)", "x": 11.5, "y": 2 },
+                { "label": "K2D (B2,C7)", "x": 12.5, "y": 2 },
+                { "label": "K2E (B2,E2)", "x": 13.5, "y": 2, "w": 1.5 },
+                { "label": "K2F (B2,B6)", "x": 15.25, "y": 2 },
+                { "label": "K2G (B2,F7)", "x": 16.25, "y": 2 },
+                { "label": "K2H (B2,F6)", "x": 17.25, "y": 2 },
+                { "label": "K30 (B3,D3)", "x": 0, "y": 3, "w": 1.75 },
+                { "label": "K32 (B3,D1)", "x": 1.75, "y": 3 },
+                { "label": "K33 (B3,D0)", "x": 2.75, "y": 3 },
+                { "label": "K34 (B3,D4)", "x": 3.75, "y": 3 },
+                { "label": "K35 (B3,C6)", "x": 4.75, "y": 3 },
+                { "label": "K36 (B3,D7)", "x": 5.75, "y": 3 },
+                { "label": "K37 (B3,E6)", "x": 6.75, "y": 3 },
+                { "label": "K38 (B3,B7)", "x": 7.75, "y": 3 },
+                { "label": "K39 (B3,F0)", "x": 8.75, "y": 3 },
+                { "label": "K3A (B3,F1)", "x": 9.75, "y": 3 },
+                { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 },
+                { "label": "K3C (B3,D6)", "x": 11.75, "y": 3 },
+                { "label": "K3D (B3,C7)", "x": 12.75, "y": 3, "w": 2.25 },
+                { "label": "K41 (B4,D2)", "x": 0, "y": 4, "w": 2.25 },
+                { "label": "K42 (B4,D1)", "x": 2.25, "y": 4 },
+                { "label": "K43 (B4,D0)", "x": 3.25, "y": 4 },
+                { "label": "K44 (B4,D4)", "x": 4.25, "y": 4 },
+                { "label": "K45 (B4,C6)", "x": 5.25, "y": 4 },
+                { "label": "K46 (B4,D7)", "x": 6.25, "y": 4 },
+                { "label": "K47 (B4,E6)", "x": 7.25, "y": 4 },
+                { "label": "K48 (B4,B7)", "x": 8.25, "y": 4 },
+                { "label": "K49 (B4,F0)", "x": 9.25, "y": 4 },
+                { "label": "K4A (B4,F1)", "x": 10.25, "y": 4 },
+                { "label": "K4B (B4,D5)", "x": 11.25, "y": 4 },
+                { "label": "K4D (B4,C7)", "x": 12.25, "y": 4, "w": 2.75 },
+                { "label": "K4G (B4,F7)", "x": 16.25, "y": 4 },
+                { "label": "K50 (B5,D3)", "x": 0, "y": 5, "w": 1.25 },
+                { "label": "K51 (B5,D2)", "x": 1.25, "y": 5, "w": 1.25 },
+                { "label": "K53 (B5,D0)", "x": 2.5, "y": 5, "w": 1.25 },
+                { "label": "K56 (B5,D7)", "x": 3.75, "y": 5, "w": 6.25 },
+                { "label": "K5A (B5,F1)", "x": 10, "y": 5, "w": 1.25 },
+                { "label": "K5B (B5,D5)", "x": 11.25, "y": 5, "w": 1.25 },
+                { "label": "K5D (B5,C7)", "x": 12.5, "y": 5, "w": 1.25 },
+                { "label": "K5E (B5,E2)", "x": 13.75, "y": 5, "w": 1.25 },
+                { "label": "K5F (B5,B6)", "x": 15.25, "y": 5 },
+                { "label": "K5G (B5,F7)", "x": 16.25, "y": 5 },
+                { "label": "K5H (B5,F6)", "x": 17.25, "y": 5 }
+            ]
+        }
+    }
+
+}
diff --git a/keyboards/handwired/hwpm87/keymaps/default/keymap.c b/keyboards/handwired/hwpm87/keymaps/default/keymap.c
new file mode 100644
index 0000000000..850acd2025
--- /dev/null
+++ b/keyboards/handwired/hwpm87/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+// Copyright 2022 CAO THAI DUONG (@KD-MM2)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_SLCK, KC_PAUS, 
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP, 
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN, 
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),  KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
+    ),
+
+    [1] = LAYOUT( /* MO(Fn) Layer */
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO, 
+        KC_NO,   KC_LNG2, KC_LNG1, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, 
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, 
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO  
+    )
+
+};
diff --git a/keyboards/handwired/hwpm87/readme.md b/keyboards/handwired/hwpm87/readme.md
new file mode 100644
index 0000000000..f0f4b3db2e
--- /dev/null
+++ b/keyboards/handwired/hwpm87/readme.md
@@ -0,0 +1,35 @@
+# Handwired 87 keys
+
+![hwpm87](https://i.imgur.com/DLqdtAWh.jpeg)
+
+Repaired from 87 keys keyboard using a Pro Micro
+
+* Keyboard Maintainer: [KD-MM2](https://github.com/KD-MM2)
+* Hardware Supported: Pro Micro(need to solder more pins) or any board with ATMega32u4
+* Hardware Availability: N/A (private board, might open source)
+
+First, if you have Pro Micro
+    Checkout these image for more: ![Pin map](https://i.imgur.com/SvZ9rGQ.jpeg)     ![Usabled Pins](https://i.imgur.com/Nr4cWP5.jpeg)
+    Keymaps/Handwiring: ![Handwiring](https://i.imgur.com/G1izHd6.png)
+If you have 25 GPIOs board, there is nothing to do.
+
+Second, if you are using a Capslock LED, define LED pin in: [config.h#34](https://github.com/KD-MM2/qmk_firmware/blob/hwpm87/keyboards/hwpm87/config.h#L34),
+and check the LED_PIN_ON_STATE if you get reversed led state: [config.h#35](https://github.com/KD-MM2/qmk_firmware/blob/hwpm87/keyboards/hwpm87/config.h#L35)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/hwpm87:default
+
+Flashing example for this keyboard:
+
+    make handwired/hwpm87:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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**: Plug cable, open QMK Toolbox and short RST pin and GND pin, then you will see it in flashmode
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk
new file mode 100644
index 0000000000..7f42dae592
--- /dev/null
+++ b/keyboards/handwired/hwpm87/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+

From 995a0077fcc9f6146f367dd2509a6f192c8795ca Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Mon, 26 Sep 2022 13:51:09 +0800
Subject: [PATCH 443/959] [Keyboard] add eau75 (#18173)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/yandrstudio/eau_r2/board.h          |  22 +
 keyboards/yandrstudio/eau_r2/config.h         |  58 +++
 keyboards/yandrstudio/eau_r2/eau_r2.c         |  20 +
 keyboards/yandrstudio/eau_r2/eau_r2.h         |  35 ++
 keyboards/yandrstudio/eau_r2/halconf.h        |  21 +
 keyboards/yandrstudio/eau_r2/info.json        | 443 ++++++++++++++++++
 .../eau_r2/keymaps/default/keymap.c           |  34 ++
 .../yandrstudio/eau_r2/keymaps/via/keymap.c   |  48 ++
 .../yandrstudio/eau_r2/keymaps/via/rules.mk   |   1 +
 keyboards/yandrstudio/eau_r2/mcuconf.h        |  27 ++
 keyboards/yandrstudio/eau_r2/readme.md        |  22 +
 keyboards/yandrstudio/eau_r2/rules.mk         |  15 +
 12 files changed, 746 insertions(+)
 create mode 100644 keyboards/yandrstudio/eau_r2/board.h
 create mode 100644 keyboards/yandrstudio/eau_r2/config.h
 create mode 100644 keyboards/yandrstudio/eau_r2/eau_r2.c
 create mode 100644 keyboards/yandrstudio/eau_r2/eau_r2.h
 create mode 100644 keyboards/yandrstudio/eau_r2/halconf.h
 create mode 100644 keyboards/yandrstudio/eau_r2/info.json
 create mode 100644 keyboards/yandrstudio/eau_r2/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/eau_r2/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/eau_r2/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/eau_r2/mcuconf.h
 create mode 100644 keyboards/yandrstudio/eau_r2/readme.md
 create mode 100644 keyboards/yandrstudio/eau_r2/rules.mk

diff --git a/keyboards/yandrstudio/eau_r2/board.h b/keyboards/yandrstudio/eau_r2/board.h
new file mode 100644
index 0000000000..a667bee461
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/board.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
new file mode 100644
index 0000000000..3fdb79256e
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_COL_PINS { B7,  A6,  B6, B5,  B4,  B3,  A5,  A10, B1,  B0,  A7,  A9,  B11, B10, B2,  A15, B15 }
+#define MATRIX_ROW_PINS { A3,  B9,  B8,  A4, C14, C13 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 8
+
+#ifdef RGBLIGHT_ENABLE
+
+#    define RGB_DI_PIN A8
+#    define RGBLED_NUM 12
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGBLIGHT_SLEEP
+#    define RGBLIGHT_VAL_STEP 5
+#    define RGBLIGHT_LIMIT_VAL 200
+
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+
+#    define WS2812_PWM_DRIVER PWMD1
+#    define WS2812_PWM_CHANNEL 1
+#    define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#    define WS2812_DMA_CHANNEL 5
+
+#endif
diff --git a/keyboards/yandrstudio/eau_r2/eau_r2.c b/keyboards/yandrstudio/eau_r2/eau_r2.c
new file mode 100644
index 0000000000..f9d5ec32db
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/eau_r2.c
@@ -0,0 +1,20 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "eau_r2.h"
+
+void board_init(void) {
+    AFIO->MAPR |= AFIO_MAPR_TIM1_REMAP_PARTIALREMAP;
+}
diff --git a/keyboards/yandrstudio/eau_r2/eau_r2.h b/keyboards/yandrstudio/eau_r2/eau_r2.h
new file mode 100644
index 0000000000..4dc9f59cbb
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/eau_r2.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+	K000,       K002, K003, K004, K005,       K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, K116, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K216, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,             K413,       K415,       \
+	K500, K501, K502,             K505,                   K509, K510,             K513, K514, K515, K516  \
+    )\
+    { \
+	{ K000,  KC_NO, K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115,  K116 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215,  K216 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO, KC_NO, KC_NO }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  KC_NO, KC_NO, K413,  KC_NO, K415,  KC_NO }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO,  K505, KC_NO, KC_NO, KC_NO, K509,  K510,  KC_NO, KC_NO, K513,  K514,  K515,  K516 }  \
+}
+
diff --git a/keyboards/yandrstudio/eau_r2/halconf.h b/keyboards/yandrstudio/eau_r2/halconf.h
new file mode 100644
index 0000000000..d5d6543fc6
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM    TRUE
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
new file mode 100644
index 0000000000..cf289b3b26
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -0,0 +1,443 @@
+{
+    "keyboard_name": "eau75",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAACD",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "Esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "F1",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "F2",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "F3",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "F4",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "F5",
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "label": "F6",
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "label": "F7",
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "label": "F8",
+                    "x": 9.5,
+                    "y": 0
+                },
+                {
+                    "label": "F9",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "F10",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "F11",
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "label": "F12",
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "label": "PrtSc",
+                    "x": 15.25,
+                    "y": 0
+                },
+                {
+                    "label": "Scroll Lock",
+                    "x": 16.25,
+                    "y": 0
+                },
+                {
+                    "label": "\u00ac",
+                    "x": 0,
+                    "y": 1.25
+                },
+                {
+                    "label": "!",
+                    "x": 1,
+                    "y": 1.25
+                },
+                {
+                    "label": "\"",
+                    "x": 2,
+                    "y": 1.25
+                },
+                {
+                    "label": "\u00a3",
+                    "x": 3,
+                    "y": 1.25
+                },
+                {
+                    "label": "$",
+                    "x": 4,
+                    "y": 1.25
+                },
+                {
+                    "label": "%",
+                    "x": 5,
+                    "y": 1.25
+                },
+                {
+                    "label": "^",
+                    "x": 6,
+                    "y": 1.25
+                },
+                {
+                    "label": "&",
+                    "x": 7,
+                    "y": 1.25
+                },
+                {
+                    "label": "*",
+                    "x": 8,
+                    "y": 1.25
+                },
+                {
+                    "label": "(",
+                    "x": 9,
+                    "y": 1.25
+                },
+                {
+                    "label": ")",
+                    "x": 10,
+                    "y": 1.25
+                },
+                {
+                    "label": "_",
+                    "x": 11,
+                    "y": 1.25
+                },
+                {
+                    "label": "+",
+                    "x": 12,
+                    "y": 1.25
+                },
+                {
+                    "label": "Backspace",
+                    "x": 13,
+                    "y": 1.25,
+                    "w": 2
+                },
+                {
+                    "label": "Insert",
+                    "x": 15.25,
+                    "y": 1.25
+                },
+                {
+                    "label": "Home",
+                    "x": 16.25,
+                    "y": 1.25
+                },
+                {
+                    "label": "Tab",
+                    "x": 0,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "Q",
+                    "x": 1.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "W",
+                    "x": 2.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "E",
+                    "x": 3.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "R",
+                    "x": 4.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "T",
+                    "x": 5.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "Y",
+                    "x": 6.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "U",
+                    "x": 7.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "I",
+                    "x": 8.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "O",
+                    "x": 9.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "P",
+                    "x": 10.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "{",
+                    "x": 11.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "}",
+                    "x": 12.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "|",
+                    "x": 13.5,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "Delete",
+                    "x": 15.25,
+                    "y": 2.25
+                },
+                {
+                    "label": "End",
+                    "x": 16.25,
+                    "y": 2.25
+                },
+                {
+                    "label": "Caps Lock",
+                    "x": 0,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "label": "A",
+                    "x": 1.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "S",
+                    "x": 2.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "D",
+                    "x": 3.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "F",
+                    "x": 4.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "G",
+                    "x": 5.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "H",
+                    "x": 6.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "J",
+                    "x": 7.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "K",
+                    "x": 8.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "L",
+                    "x": 9.75,
+                    "y": 3.25
+                },
+                {
+                    "label": ":",
+                    "x": 10.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "@",
+                    "x": 11.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "Enter",
+                    "x": 12.75,
+                    "y": 3.25,
+                    "w": 2.25
+                },
+                {
+                    "label": "Shift",
+                    "x": 0,
+                    "y": 4.25,
+                    "w": 2.25
+                },
+                {
+                    "label": "Z",
+                    "x": 2.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "X",
+                    "x": 3.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "C",
+                    "x": 4.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "V",
+                    "x": 5.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "B",
+                    "x": 6.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "N",
+                    "x": 7.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "M",
+                    "x": 8.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "<",
+                    "x": 9.25,
+                    "y": 4.25
+                },
+                {
+                    "label": ">",
+                    "x": 10.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "?",
+                    "x": 11.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "Shift",
+                    "x": 12.25,
+                    "y": 4.25,
+                    "w": 2.75
+                },
+                {
+                    "label": "\u2191",
+                    "x": 15.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 0,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 1.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "label": "AltGr",
+                    "x": 10,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 11.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Menu",
+                    "x": 12.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "\u2190",
+                    "x": 14.25,
+                    "y": 5.25
+                },
+                {
+                    "label": "\u2193",
+                    "x": 15.25,
+                    "y": 5.25
+                },
+                {
+                    "label": "\u2192",
+                    "x": 16.25,
+                    "y": 5.25
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/eau_r2/keymaps/default/keymap.c b/keyboards/yandrstudio/eau_r2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..64eccc6132
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#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_VOLU, KC_VOLD,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,           KC_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_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH,                   KC_RSFT,          KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                           KC_RALT, MO(1),                    KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+	[1] = LAYOUT(
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/yandrstudio/eau_r2/keymaps/via/keymap.c b/keyboards/yandrstudio/eau_r2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cdde2ad9d6
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#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_VOLU, KC_VOLD,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,           KC_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_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH,                   KC_RSFT,          KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                           KC_RALT, MO(1),                    KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+	[1] = LAYOUT(
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[2] = LAYOUT(
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[3] = LAYOUT(
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/eau_r2/keymaps/via/rules.mk b/keyboards/yandrstudio/eau_r2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/eau_r2/mcuconf.h b/keyboards/yandrstudio/eau_r2/mcuconf.h
new file mode 100644
index 0000000000..03e90c6a26
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
+
+
diff --git a/keyboards/yandrstudio/eau_r2/readme.md b/keyboards/yandrstudio/eau_r2/readme.md
new file mode 100644
index 0000000000..fa19d4c5ad
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/readme.md
@@ -0,0 +1,22 @@
+# eau_r2
+
+![eau_r2](https://i.imgur.com/JkRIt6Kh.png)
+A 75% keyboard with RGBs.
+This keyboard use 16mhz HSE and APM32F103 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: eau_r2
+- Hardware Availability: [CHAOSERA SELL](https://www.chaosera-sell.com/CHAOSERA-Eau75-p18824645.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/eau_r2:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/eau_r2/rules.mk b/keyboards/yandrstudio/eau_r2/rules.mk
new file mode 100644
index 0000000000..421ae9fce1
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/rules.mk
@@ -0,0 +1,15 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From e64ec530cd966c15653eb786da2afcd20eee2f30 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 25 Sep 2022 22:59:58 -0700
Subject: [PATCH 444/959] Durgod K310/K320 Refactor (#18224)

---
 keyboards/durgod/k310/base/config.h           |  56 +++++++++
 keyboards/durgod/k310/base/readme.md          |   6 -
 keyboards/durgod/k310/base/rules.mk           |  24 +++-
 keyboards/durgod/{k3x0 => k310}/halconf.h     |   0
 keyboards/durgod/{k3x0 => }/k310/info.json    |   0
 keyboards/durgod/{k3x0/k3x0.c => k310/k310.c} |   2 +-
 keyboards/durgod/{k3x0 => }/k310/k310.h       |  22 ++++
 .../{k3x0 => k310}/keymaps/chimera/keymap.c   |   0
 .../{k3x0 => k310}/keymaps/chimera/readme.md  |   0
 .../{k3x0 => k310}/keymaps/chimera/rules.mk   |   0
 .../keymaps/default/keymap.json               |   2 +-
 .../{k3x0 => k310}/keymaps/default/readme.md  |   0
 .../keymaps/default_mac/keymap.json           |   2 +-
 .../keymaps/default_mac/readme.md             |   0
 .../{k3x0 => k310}/keymaps/typhon/keymap.c    |   0
 .../{k3x0 => k310}/keymaps/typhon/readme.md   |   0
 .../{k3x0 => k310}/keymaps/typhon/rules.mk    |   0
 .../{k3x0 => k310}/keymaps/via/keymap.c       |   0
 .../{k3x0 => k310}/keymaps/via/readme.md      |   0
 .../{k3x0 => k310}/keymaps/via/rules.mk       |   0
 keyboards/durgod/k310/readme.md               |  29 ++++-
 keyboards/durgod/k310/rules.mk                |   1 -
 keyboards/durgod/{k3x0 => k320/base}/config.h |   4 +-
 keyboards/durgod/k320/base/readme.md          |   6 -
 keyboards/durgod/k320/base/rules.mk           |  24 +++-
 .../k310/base/config.h => k320/halconf.h}     |   9 +-
 keyboards/durgod/{k3x0 => }/k320/info.json    | 117 +-----------------
 keyboards/durgod/k320/k320.c                  |  96 ++++++++++++++
 keyboards/durgod/{k3x0 => }/k320/k320.h       |  41 +++---
 .../durgod/k320/keymaps/default/keymap.json   |  26 ++++
 .../durgod/k320/keymaps/default/readme.md     |  16 +++
 .../k320/keymaps/default_mac/keymap.json      |  26 ++++
 .../durgod/k320/keymaps/default_mac/readme.md |   8 ++
 .../{k3x0 => }/k320/keymaps/kuenhlee/keymap.c |   0
 .../k320/keymaps/kuenhlee/readme.md           |   0
 .../{k3x0 => }/k320/keymaps/kuenhlee/rules.mk |   0
 keyboards/durgod/k320/keymaps/via/keymap.c    |  92 ++++++++++++++
 keyboards/durgod/k320/keymaps/via/readme.md   |   6 +
 keyboards/durgod/k320/keymaps/via/rules.mk    |   1 +
 keyboards/durgod/k320/readme.md               |  29 ++++-
 keyboards/durgod/k320/rules.mk                |   1 -
 keyboards/durgod/k3x0/k310/base/readme.md     |  27 ----
 keyboards/durgod/k3x0/k310/base/rules.mk      |   1 -
 keyboards/durgod/k3x0/k310/config.h           |  28 -----
 keyboards/durgod/k3x0/k310/readme.md          |  10 --
 keyboards/durgod/k3x0/k310/rules.mk           |   4 -
 keyboards/durgod/k3x0/k320/base/config.h      |  19 ---
 keyboards/durgod/k3x0/k320/base/readme.md     |  27 ----
 keyboards/durgod/k3x0/k320/base/rules.mk      |   1 -
 keyboards/durgod/k3x0/k320/config.h           |  25 ----
 keyboards/durgod/k3x0/k320/readme.md          |  10 --
 keyboards/durgod/k3x0/k320/rules.mk           |   4 -
 keyboards/durgod/k3x0/k3x0.h                  |  47 -------
 keyboards/durgod/k3x0/readme.md               |   9 +-
 keyboards/durgod/k3x0/rules.mk                |  24 ----
 55 files changed, 492 insertions(+), 390 deletions(-)
 create mode 100644 keyboards/durgod/k310/base/config.h
 delete mode 100644 keyboards/durgod/k310/base/readme.md
 rename keyboards/durgod/{k3x0 => k310}/halconf.h (100%)
 rename keyboards/durgod/{k3x0 => }/k310/info.json (100%)
 rename keyboards/durgod/{k3x0/k3x0.c => k310/k310.c} (99%)
 rename keyboards/durgod/{k3x0 => }/k310/k310.h (92%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/chimera/keymap.c (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/chimera/readme.md (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/chimera/rules.mk (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/default/keymap.json (98%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/default/readme.md (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/default_mac/keymap.json (98%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/default_mac/readme.md (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/typhon/keymap.c (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/typhon/readme.md (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/typhon/rules.mk (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/via/keymap.c (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/via/readme.md (100%)
 rename keyboards/durgod/{k3x0 => k310}/keymaps/via/rules.mk (100%)
 delete mode 100644 keyboards/durgod/k310/rules.mk
 rename keyboards/durgod/{k3x0 => k320/base}/config.h (94%)
 delete mode 100644 keyboards/durgod/k320/base/readme.md
 rename keyboards/durgod/{k3x0/k310/base/config.h => k320/halconf.h} (78%)
 rename keyboards/durgod/{k3x0 => }/k320/info.json (71%)
 create mode 100644 keyboards/durgod/k320/k320.c
 rename keyboards/durgod/{k3x0 => }/k320/k320.h (76%)
 create mode 100644 keyboards/durgod/k320/keymaps/default/keymap.json
 create mode 100644 keyboards/durgod/k320/keymaps/default/readme.md
 create mode 100644 keyboards/durgod/k320/keymaps/default_mac/keymap.json
 create mode 100644 keyboards/durgod/k320/keymaps/default_mac/readme.md
 rename keyboards/durgod/{k3x0 => }/k320/keymaps/kuenhlee/keymap.c (100%)
 rename keyboards/durgod/{k3x0 => }/k320/keymaps/kuenhlee/readme.md (100%)
 rename keyboards/durgod/{k3x0 => }/k320/keymaps/kuenhlee/rules.mk (100%)
 create mode 100644 keyboards/durgod/k320/keymaps/via/keymap.c
 create mode 100644 keyboards/durgod/k320/keymaps/via/readme.md
 create mode 100644 keyboards/durgod/k320/keymaps/via/rules.mk
 delete mode 100644 keyboards/durgod/k320/rules.mk
 delete mode 100644 keyboards/durgod/k3x0/k310/base/readme.md
 delete mode 100644 keyboards/durgod/k3x0/k310/base/rules.mk
 delete mode 100644 keyboards/durgod/k3x0/k310/config.h
 delete mode 100644 keyboards/durgod/k3x0/k310/readme.md
 delete mode 100644 keyboards/durgod/k3x0/k310/rules.mk
 delete mode 100644 keyboards/durgod/k3x0/k320/base/config.h
 delete mode 100644 keyboards/durgod/k3x0/k320/base/readme.md
 delete mode 100644 keyboards/durgod/k3x0/k320/base/rules.mk
 delete mode 100644 keyboards/durgod/k3x0/k320/config.h
 delete mode 100644 keyboards/durgod/k3x0/k320/readme.md
 delete mode 100644 keyboards/durgod/k3x0/k320/rules.mk
 delete mode 100644 keyboards/durgod/k3x0/k3x0.h
 delete mode 100644 keyboards/durgod/k3x0/rules.mk

diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h
new file mode 100644
index 0000000000..018afb342d
--- /dev/null
+++ b/keyboards/durgod/k310/base/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2021 kuenhlee, Don Kjer, Tyler Tidman
+ * Copyright 2021 Simon Arlott
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define WAIT_US_TIMER           GPTD3
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 16
+
+#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6, A7 }
+#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+// Dynamic EEPROM
+// Something sensible or else VIA may crash
+// Users may enable more if they wish
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR  4095
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Bootmagic Lite key configuration */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#define BOOTMAGIC_LITE_ROW                 0
+#define BOOTMAGIC_LITE_COLUMN              0
+
+/* LED indicator pins */
+#define LED_NUM_LOCK_PIN    C8
+#define LED_CAPS_LOCK_PIN   C9
+#define LED_SCROLL_LOCK_PIN A8
+#define LED_WIN_LOCK_PIN    A9
+#define LED_MR_LOCK_PIN     A10
+#define LED_PIN_ON_STATE    0
+
+/* Original hardware "reset" button on pin D2 */
+#define HARDWARE_RESET_PIN  D2
diff --git a/keyboards/durgod/k310/base/readme.md b/keyboards/durgod/k310/base/readme.md
deleted file mode 100644
index 1f818dacc9..0000000000
--- a/keyboards/durgod/k310/base/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Taurus K310
-
-Base Model - no backlight leds
-
-See: [K310](../../k3x0/k310/base/readme.md)
-
diff --git a/keyboards/durgod/k310/base/rules.mk b/keyboards/durgod/k310/base/rules.mk
index ff432cc4aa..5c07a0fa71 100644
--- a/keyboards/durgod/k310/base/rules.mk
+++ b/keyboards/durgod/k310/base/rules.mk
@@ -1 +1,23 @@
-DEFAULT_FOLDER=durgod/k3x0/k310/base
+# MCU name
+# Actually F070, but close enough
+MCU = STM32F072
+BOARD = DURGOD_STM32_F070
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
+
+LAYOUTS = fullsize_ansi fullsize_iso
diff --git a/keyboards/durgod/k3x0/halconf.h b/keyboards/durgod/k310/halconf.h
similarity index 100%
rename from keyboards/durgod/k3x0/halconf.h
rename to keyboards/durgod/k310/halconf.h
diff --git a/keyboards/durgod/k3x0/k310/info.json b/keyboards/durgod/k310/info.json
similarity index 100%
rename from keyboards/durgod/k3x0/k310/info.json
rename to keyboards/durgod/k310/info.json
diff --git a/keyboards/durgod/k3x0/k3x0.c b/keyboards/durgod/k310/k310.c
similarity index 99%
rename from keyboards/durgod/k3x0/k3x0.c
rename to keyboards/durgod/k310/k310.c
index d12b46bc51..fc41ee5657 100644
--- a/keyboards/durgod/k3x0/k3x0.c
+++ b/keyboards/durgod/k310/k310.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "k3x0.h"
+#include "k310.h"
 #include <ch.h>
 #include <hal.h>
 
diff --git a/keyboards/durgod/k3x0/k310/k310.h b/keyboards/durgod/k310/k310.h
similarity index 92%
rename from keyboards/durgod/k3x0/k310/k310.h
rename to keyboards/durgod/k310/k310.h
index 2d82ee1550..e106c8dbe6 100644
--- a/keyboards/durgod/k3x0/k310/k310.h
+++ b/keyboards/durgod/k310/k310.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "quantum.h"
+
 #define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
@@ -76,3 +78,23 @@
     { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
 }
 
+
+#ifndef WINLOCK_DISABLED
+// Define the TGUI key here so it is available in QMK configurator
+enum K3x0_keycodes {
+#ifdef VIA_ENABLE
+    KC_TGUI = USER00,   // Toggle between GUI Lock or Unlock
+    NEW_SAFE_RANGE = SAFE_RANGE
+#else
+    KC_TGUI = SAFE_RANGE,   // Toggle between GUI Lock or Unlock
+    NEW_SAFE_RANGE
+#endif
+};
+
+#undef SAFE_RANGE
+#define SAFE_RANGE NEW_SAFE_RANGE
+#endif /* WINLOCK_DISABLED */
+
+/* Function Prototype */
+void off_all_leds(void);
+void on_all_leds(void);
diff --git a/keyboards/durgod/k3x0/keymaps/chimera/keymap.c b/keyboards/durgod/k310/keymaps/chimera/keymap.c
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/chimera/keymap.c
rename to keyboards/durgod/k310/keymaps/chimera/keymap.c
diff --git a/keyboards/durgod/k3x0/keymaps/chimera/readme.md b/keyboards/durgod/k310/keymaps/chimera/readme.md
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/chimera/readme.md
rename to keyboards/durgod/k310/keymaps/chimera/readme.md
diff --git a/keyboards/durgod/k3x0/keymaps/chimera/rules.mk b/keyboards/durgod/k310/keymaps/chimera/rules.mk
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/chimera/rules.mk
rename to keyboards/durgod/k310/keymaps/chimera/rules.mk
diff --git a/keyboards/durgod/k3x0/keymaps/default/keymap.json b/keyboards/durgod/k310/keymaps/default/keymap.json
similarity index 98%
rename from keyboards/durgod/k3x0/keymaps/default/keymap.json
rename to keyboards/durgod/k310/keymaps/default/keymap.json
index 507b5c909c..bd017f0e9d 100644
--- a/keyboards/durgod/k3x0/keymaps/default/keymap.json
+++ b/keyboards/durgod/k310/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-  "keyboard": "durgod/k3x0",
+  "keyboard": "durgod/k310/base",
   "keymap": "default",
   "layout": "LAYOUT_all",
   "layers": [
diff --git a/keyboards/durgod/k3x0/keymaps/default/readme.md b/keyboards/durgod/k310/keymaps/default/readme.md
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/default/readme.md
rename to keyboards/durgod/k310/keymaps/default/readme.md
diff --git a/keyboards/durgod/k3x0/keymaps/default_mac/keymap.json b/keyboards/durgod/k310/keymaps/default_mac/keymap.json
similarity index 98%
rename from keyboards/durgod/k3x0/keymaps/default_mac/keymap.json
rename to keyboards/durgod/k310/keymaps/default_mac/keymap.json
index acf221935e..26f8aea7f1 100644
--- a/keyboards/durgod/k3x0/keymaps/default_mac/keymap.json
+++ b/keyboards/durgod/k310/keymaps/default_mac/keymap.json
@@ -1,5 +1,5 @@
 {
-  "keyboard": "durgod/k3x0",
+  "keyboard": "durgod/k310/base",
   "keymap": "default_mac",
   "layout": "LAYOUT_all",
   "layers": [
diff --git a/keyboards/durgod/k3x0/keymaps/default_mac/readme.md b/keyboards/durgod/k310/keymaps/default_mac/readme.md
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/default_mac/readme.md
rename to keyboards/durgod/k310/keymaps/default_mac/readme.md
diff --git a/keyboards/durgod/k3x0/keymaps/typhon/keymap.c b/keyboards/durgod/k310/keymaps/typhon/keymap.c
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/typhon/keymap.c
rename to keyboards/durgod/k310/keymaps/typhon/keymap.c
diff --git a/keyboards/durgod/k3x0/keymaps/typhon/readme.md b/keyboards/durgod/k310/keymaps/typhon/readme.md
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/typhon/readme.md
rename to keyboards/durgod/k310/keymaps/typhon/readme.md
diff --git a/keyboards/durgod/k3x0/keymaps/typhon/rules.mk b/keyboards/durgod/k310/keymaps/typhon/rules.mk
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/typhon/rules.mk
rename to keyboards/durgod/k310/keymaps/typhon/rules.mk
diff --git a/keyboards/durgod/k3x0/keymaps/via/keymap.c b/keyboards/durgod/k310/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/via/keymap.c
rename to keyboards/durgod/k310/keymaps/via/keymap.c
diff --git a/keyboards/durgod/k3x0/keymaps/via/readme.md b/keyboards/durgod/k310/keymaps/via/readme.md
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/via/readme.md
rename to keyboards/durgod/k310/keymaps/via/readme.md
diff --git a/keyboards/durgod/k3x0/keymaps/via/rules.mk b/keyboards/durgod/k310/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/via/rules.mk
rename to keyboards/durgod/k310/keymaps/via/rules.mk
diff --git a/keyboards/durgod/k310/readme.md b/keyboards/durgod/k310/readme.md
index 234fcc875d..1f39f79513 100644
--- a/keyboards/durgod/k310/readme.md
+++ b/keyboards/durgod/k310/readme.md
@@ -1,4 +1,29 @@
-# K310
+# Taurus K310
 
-See: [K310](../k3x0/k310/readme.md)
+This code is shared between all K310 variants.  Currently only the base model with no backlight is supported.
 
+This is a standard off-the-shelf Durgod Taurus K310 full-sized 104/105-key
+keyboard without backlight.  This supports both the ANSI and ISO variants.
+
+* Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
+* Hardware Supported: [Durgod Taurus K310 board with STM32F070RBT6](https://www.durgod.com/page9?product_id=53&_l=en "Durgod.com Product Page")
+* Hardware Availability: [Amazon.com](https://www.amazon.com/Durgod-Taurus-K310-Mechanical-Keyboard/dp/B07TXB4XF3)
+
+## Instructions
+
+### Build
+
+Make command example for this keyboard (after setting up your build environment):
+
+    make durgod/k310/base:default
+
+Flashing example for this keyboard:
+
+    make durgod/k310/base:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Initial Flash
+
+Instructions for Flashing from initial Stock Firmware:
+* [Initial Flashing](../k3x0/readme.md#initial-flash)
diff --git a/keyboards/durgod/k310/rules.mk b/keyboards/durgod/k310/rules.mk
deleted file mode 100644
index e200539b26..0000000000
--- a/keyboards/durgod/k310/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER=durgod/k3x0/k310
diff --git a/keyboards/durgod/k3x0/config.h b/keyboards/durgod/k320/base/config.h
similarity index 94%
rename from keyboards/durgod/k3x0/config.h
rename to keyboards/durgod/k320/base/config.h
index 0f2e01cfc1..5f64a04f9a 100644
--- a/keyboards/durgod/k3x0/config.h
+++ b/keyboards/durgod/k320/base/config.h
@@ -21,9 +21,11 @@
 
 #define WAIT_US_TIMER           GPTD3
 
-/* key matrix size (rows in specific keyboard variant) */
+/* key matrix size */
+#define MATRIX_ROWS 7
 #define MATRIX_COLS 16
 
+#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6 }
 #define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/durgod/k320/base/readme.md b/keyboards/durgod/k320/base/readme.md
deleted file mode 100644
index 8b74e28e54..0000000000
--- a/keyboards/durgod/k320/base/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Taurus K320
-
-Base Model - no backlight leds
-
-See: [K320](../../k3x0/k320/base/readme.md)
-
diff --git a/keyboards/durgod/k320/base/rules.mk b/keyboards/durgod/k320/base/rules.mk
index de33470cc0..37896a20ce 100644
--- a/keyboards/durgod/k320/base/rules.mk
+++ b/keyboards/durgod/k320/base/rules.mk
@@ -1 +1,23 @@
-DEFAULT_FOLDER=durgod/k3x0/k320/base
+# MCU name
+# Actually F070, but close enough
+MCU = STM32F072
+BOARD = DURGOD_STM32_F070
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
+
+LAYOUTS = tkl_ansi tkl_iso
diff --git a/keyboards/durgod/k3x0/k310/base/config.h b/keyboards/durgod/k320/halconf.h
similarity index 78%
rename from keyboards/durgod/k3x0/k310/base/config.h
rename to keyboards/durgod/k320/halconf.h
index 2ccb2f2f0c..d2a9d8c7c0 100644
--- a/keyboards/durgod/k3x0/k310/base/config.h
+++ b/keyboards/durgod/k320/halconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 Don Kjer
+/* Copyright 2021 Simon Arlott
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,4 +16,9 @@
 
 #pragma once
 
-#include "config_common.h"
+#define HAL_USE_PAL                 TRUE
+#define PAL_USE_CALLBACKS           TRUE
+
+#define HAL_USE_GPT                 TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/durgod/k3x0/k320/info.json b/keyboards/durgod/k320/info.json
similarity index 71%
rename from keyboards/durgod/k3x0/k320/info.json
rename to keyboards/durgod/k320/info.json
index 0386ef7709..4d239e05ac 100644
--- a/keyboards/durgod/k3x0/k320/info.json
+++ b/keyboards/durgod/k320/info.json
@@ -202,7 +202,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.5 }
             ]
         },
-        "LAYOUT_tkl": {
+        "LAYOUT_all": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 2, "y": 0 },
@@ -299,121 +299,6 @@
                 { "label": "\u2193", "x": 16.25, "y": 5.5 },
                 { "label": "\u2192", "x": 17.25, "y": 5.5 }
             ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Num Lock", "x": 18.5, "y": 1.5 },
-                { "label": "/", "x": 19.5, "y": 1.5 },
-                { "label": "*", "x": 20.5, "y": 1.5 },
-                { "label": "-", "x": 21.5, "y": 1.5 },
-
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "7", "x": 18.5, "y": 2.5 },
-                { "label": "8", "x": 19.5, "y": 2.5 },
-                { "label": "9", "x": 20.5, "y": 2.5 },
-                { "label": "+", "x": 21.5, "y": 2.5, "h": 2 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "#", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 3.5, "w": 1.25 },
-                { "label": "4", "x": 18.5, "y": 3.5 },
-                { "label": "5", "x": 19.5, "y": 3.5 },
-                { "label": "6", "x": 20.5, "y": 3.5 },
-
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "\\", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                { "label": "1", "x": 18.5, "y": 4.5 },
-                { "label": "2", "x": 19.5, "y": 4.5 },
-                { "label": "3", "x": 20.5, "y": 4.5 },
-                { "label": "Enter", "x": 21.5, "y": 4.5, "h": 2 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 },
-                { "label": "0", "x": 18.5, "y": 5.5, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.5 }
-            ]
         }
     }
 }
diff --git a/keyboards/durgod/k320/k320.c b/keyboards/durgod/k320/k320.c
new file mode 100644
index 0000000000..3cb2fd7d67
--- /dev/null
+++ b/keyboards/durgod/k320/k320.c
@@ -0,0 +1,96 @@
+/* Copyright 2021 kuenhlee, Don Kjer, Tyler Tidman
+ * Copyright 2021 Simon Arlott
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "k320.h"
+#include <ch.h>
+#include <hal.h>
+
+/* Private Functions */
+void off_all_leds(void) {
+#ifdef LED_NUM_LOCK_PIN
+    writePinHigh(LED_NUM_LOCK_PIN);
+#endif
+    writePinHigh(LED_CAPS_LOCK_PIN);
+    writePinHigh(LED_SCROLL_LOCK_PIN);
+    writePinHigh(LED_WIN_LOCK_PIN);
+    writePinHigh(LED_MR_LOCK_PIN);
+}
+
+void on_all_leds(void) {
+#ifdef LED_NUM_LOCK_PIN
+    writePinLow(LED_NUM_LOCK_PIN);
+#endif
+    writePinLow(LED_CAPS_LOCK_PIN);
+    writePinLow(LED_SCROLL_LOCK_PIN);
+    writePinLow(LED_WIN_LOCK_PIN);
+    writePinLow(LED_MR_LOCK_PIN);
+}
+
+/* WinLock and MR LEDs are non-standard. Need to override led init */
+void led_init_ports(void) {
+#ifdef LED_NUM_LOCK_PIN
+    setPinOutput(LED_NUM_LOCK_PIN);
+#endif
+    setPinOutput(LED_CAPS_LOCK_PIN);
+    setPinOutput(LED_SCROLL_LOCK_PIN);
+    setPinOutput(LED_WIN_LOCK_PIN);
+    setPinOutput(LED_MR_LOCK_PIN);
+    off_all_leds();
+}
+
+#ifndef WINLOCK_DISABLED
+static bool win_key_locked = false;
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_TGUI:
+            if (record->event.pressed) {
+                // Toggle GUI lock on key press
+                win_key_locked = !win_key_locked;
+                writePin(LED_WIN_LOCK_PIN, !win_key_locked);
+            }
+            break;
+        case KC_LGUI:
+            if (win_key_locked) { return false; }
+            break;
+    }
+    return process_record_user(keycode, record);
+}
+#endif /* WINLOCK_DISABLED */
+
+#ifndef HW_RESET_PIN_DISABLED
+static void hardware_reset_cb(void *arg) {
+    chSysLockFromISR();
+    bootloader_jump();
+    chSysUnlockFromISR();
+}
+#endif
+
+void keyboard_pre_init_kb(void) {
+    setPinInputHigh(HARDWARE_RESET_PIN);
+
+#ifndef HW_RESET_PIN_DISABLED
+    /* Jump to bootloader when the hardware reset button is pressed */
+    palEnablePadEvent(PAL_PORT(HARDWARE_RESET_PIN), PAL_PAD(HARDWARE_RESET_PIN), PAL_EVENT_MODE_FALLING_EDGE);
+    palSetPadCallback(PAL_PORT(HARDWARE_RESET_PIN), PAL_PAD(HARDWARE_RESET_PIN), hardware_reset_cb, NULL);
+
+    /* The interrupt is edge-triggered so check that it's not already pressed */
+    if (!readPin(HARDWARE_RESET_PIN)) {
+        bootloader_jump();
+    }
+#endif
+}
diff --git a/keyboards/durgod/k3x0/k320/k320.h b/keyboards/durgod/k320/k320.h
similarity index 76%
rename from keyboards/durgod/k3x0/k320/k320.h
rename to keyboards/durgod/k320/k320.h
index 23b48d0f39..67f0f5f214 100644
--- a/keyboards/durgod/k3x0/k320/k320.h
+++ b/keyboards/durgod/k320/k320.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "quantum.h"
+
 #define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
@@ -56,7 +58,7 @@
 }
 
 // This a shortcut to help you visually see your layout.
-#define LAYOUT_tkl( \
+#define LAYOUT_all( \
       K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,  \
       K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
       K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,  \
@@ -73,20 +75,23 @@
     { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K6F }   \
 }
 
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_all( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,                          \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,      K6A, K69, K68, K67, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,      K7A, K79, K78, K6B, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                            K7E, K7D, K7C,      \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,            K6E, K6D, K6C, K7B, \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F,      K7F,      K77       \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K67,  K68,  K69,  K6A,  K6B,  K6C,  K6D,  K6E,  K6F }   \
-}
+
+#ifndef WINLOCK_DISABLED
+// Define the TGUI key here so it is available in QMK configurator
+enum K3x0_keycodes {
+#ifdef VIA_ENABLE
+    KC_TGUI = USER00,   // Toggle between GUI Lock or Unlock
+    NEW_SAFE_RANGE = SAFE_RANGE
+#else
+    KC_TGUI = SAFE_RANGE,   // Toggle between GUI Lock or Unlock
+    NEW_SAFE_RANGE
+#endif
+};
+
+#undef SAFE_RANGE
+#define SAFE_RANGE NEW_SAFE_RANGE
+#endif /* WINLOCK_DISABLED */
+
+/* Function Prototype */
+void off_all_leds(void);
+void on_all_leds(void);
diff --git a/keyboards/durgod/k320/keymaps/default/keymap.json b/keyboards/durgod/k320/keymaps/default/keymap.json
new file mode 100644
index 0000000000..3dab704bcd
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default/keymap.json
@@ -0,0 +1,26 @@
+{
+  "keyboard": "durgod/k320/base",
+  "keymap": "default",
+  "layout": "LAYOUT_all",
+  "layers": [
+    [
+      "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",     "KC_PSCR", "KC_SLCK", "KC_PAUS",
+      "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",
+      "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS",    "KC_DEL",  "KC_END",  "KC_PGDN",
+      "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",
+      "KC_LSFT", "KC_NUBS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",               "KC_UP",
+      "KC_LCTL", "KC_LGUI", "KC_LALT",                                  "KC_SPC",                                   "KC_RALT", "MO(1)",   "KC_APP",  "KC_RCTL",    "KC_LEFT", "KC_DOWN", "KC_RGHT"
+    ],
+    [
+      "_______",            "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "_______", "_______", "_______", "_______", "_______",    "_______", "_______", "_______",
+      "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",    "_______", "_______", "_______",
+      "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",    "_______", "_______", "_______",
+      "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+      "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",            "_______",               "_______",
+      "_______", "KC_TGUI", "_______",                                  "_______",                                  "_______", "_______", "_______", "_______",    "_______", "_______", "_______"
+    ]
+  ],
+  "author": "tylert",
+  "notes": "",
+  "version": 1
+}
diff --git a/keyboards/durgod/k320/keymaps/default/readme.md b/keyboards/durgod/k320/keymaps/default/readme.md
new file mode 100644
index 0000000000..952b1912ce
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default/readme.md
@@ -0,0 +1,16 @@
+# The default keymap for Durgod Taurus K3X0 (K310, K320, etc.) without backlight
+
+Supports both ANSI and ISO layouts.
+
+Layer 0 : Standard layout (Windows)
+
+Layer 1 : Media control and Windows lock key
+- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
+- Fn + Windows to toggle Windows lock key functionality
+
+## Windows key lock
+
+You can hold down Fn + Windows key to disable the Windows key while in locked mode.
+The 'Lock' LED indicates if the Windows key is locked.
+
+This is similar to the stock K310/K320 Windows key lock functionality.
diff --git a/keyboards/durgod/k320/keymaps/default_mac/keymap.json b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
new file mode 100644
index 0000000000..a0e83def36
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
@@ -0,0 +1,26 @@
+{
+  "keyboard": "durgod/k310/base",
+  "keymap": "default_mac",
+  "layout": "LAYOUT_all",
+  "layers": [
+    [
+      "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",     "KC_F13",  "KC_F14",  "KC_F15",
+      "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",
+      "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS",    "KC_DEL",  "KC_END",  "KC_PGDN",
+      "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",
+      "KC_LSFT", "KC_NUBS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",               "KC_UP",
+      "KC_LCTL", "KC_LALT", "KC_LGUI",                                  "KC_SPC",                                   "KC_RGUI", "KC_RALT", "MO(1)",   "KC_RCTL",    "KC_LEFT", "KC_DOWN", "KC_RGHT"
+    ],
+    [
+      "KC_TRNS",            "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",               "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_TRNS"
+    ]
+  ],
+  "author":"AlCutter",
+  "notes":"",
+  "version":1
+}
diff --git a/keyboards/durgod/k320/keymaps/default_mac/readme.md b/keyboards/durgod/k320/keymaps/default_mac/readme.md
new file mode 100644
index 0000000000..2765f14f90
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_mac/readme.md
@@ -0,0 +1,8 @@
+# The default (Mac) keymap for Durgod Taurus K320.
+
+Supports both ANSI and ISO layouts.
+
+Layer 0 : Standard 87/88 keys TKL layout (Mac)
+
+Layer 1 : Media control
+- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k3x0/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
similarity index 100%
rename from keyboards/durgod/k3x0/k320/keymaps/kuenhlee/keymap.c
rename to keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
diff --git a/keyboards/durgod/k3x0/k320/keymaps/kuenhlee/readme.md b/keyboards/durgod/k320/keymaps/kuenhlee/readme.md
similarity index 100%
rename from keyboards/durgod/k3x0/k320/keymaps/kuenhlee/readme.md
rename to keyboards/durgod/k320/keymaps/kuenhlee/readme.md
diff --git a/keyboards/durgod/k3x0/k320/keymaps/kuenhlee/rules.mk b/keyboards/durgod/k320/keymaps/kuenhlee/rules.mk
similarity index 100%
rename from keyboards/durgod/k3x0/k320/keymaps/kuenhlee/rules.mk
rename to keyboards/durgod/k320/keymaps/kuenhlee/rules.mk
diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c
new file mode 100644
index 0000000000..993cbd8c22
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/via/keymap.c
@@ -0,0 +1,92 @@
+/* Copyright 2021 Maxime Coirault, Don Kjer, Tyler Tidman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Layer shorthand
+enum _layer {
+    _BASE,
+    _FN,
+    _LAYER3,
+    _LAYER4
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BASE: Base Layer (Default Layer)
+   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+   * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
+   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+   * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ └───┴───┴───┘
+   * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Entr│
+   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐
+   * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+   * │Ctrl│GUI │Alt │                        │ Alt│Func│ App│Ctrl│ │ ← │ ↓ │ → │
+   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+   */
+  [_BASE] = LAYOUT_all( /* Base Layer */
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  /* Keymap _FN: Function Layer
+   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+   * │   │   │Ply│Stp│Prv│Nxt│ │Mut│Vo+│Vo-│   │ │   │   │   │   │ │   │   │   │
+   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ └───┴───┴───┘
+   * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐
+   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+   * │    │Lock│    │                        │    │Func│ Sys│    │ │   │   │   │
+   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+   */
+  [_FN] = LAYOUT_all( /* Function Layer */
+      _______,          KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+      _______, KC_TGUI, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+  ),
+  [_LAYER3] = LAYOUT_all( /* Layer 3 */
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+      _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+  ),
+  [_LAYER4] = LAYOUT_all( /* Layer 4 */
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+      _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+  )
+};
diff --git a/keyboards/durgod/k320/keymaps/via/readme.md b/keyboards/durgod/k320/keymaps/via/readme.md
new file mode 100644
index 0000000000..ffa1c4ce0a
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/via/readme.md
@@ -0,0 +1,6 @@
+# The via keymap for Durgod Taurus K310/K320.
+
+Layer 0 : Standard layout
+
+Layer 1 : Media control
+- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/via/rules.mk b/keyboards/durgod/k320/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/durgod/k320/readme.md b/keyboards/durgod/k320/readme.md
index b8ca5b6da1..ce5ae3211d 100644
--- a/keyboards/durgod/k320/readme.md
+++ b/keyboards/durgod/k320/readme.md
@@ -1,4 +1,29 @@
-# K320
+# Taurus K320
 
-See: [K320](../k3x0/k320/readme.md)
+This code is shared between all K320 variants.  Currently only the base model with no backlight is supported.
 
+This is a standard off-the-shelf Durgod Taurus K320 TKL (87/88-key)
+keyboard without backlight.  This supports both the ANSI and ISO variants.
+
+* Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
+* Hardware Supported: [Durgod Taurus K320 board with STM32F070RBT6](https://www.durgod.com/page9?product_id=47&_l=en "Durgod.com Product Page")
+* Hardware Availability: [Amazon.com](https://www.amazon.com/Durgod-Taurus-Corona-Mechanical-Keyboard/dp/B078H3WPHM)
+
+## Instructions
+
+### Build
+
+Make command example for this keyboard (after setting up your build environment):
+
+    make durgod/k3x0/k320/base:default
+
+Flashing example for this keyboard:
+
+    make durgod/k3x0/k320/base:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Initial Flash
+
+Instructions for Flashing from initial Stock Firmware:
+* [Initial Flashing](../k3x0/readme.md#initial-flash)
diff --git a/keyboards/durgod/k320/rules.mk b/keyboards/durgod/k320/rules.mk
deleted file mode 100644
index d3f7b11945..0000000000
--- a/keyboards/durgod/k320/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER=durgod/k3x0/k320
diff --git a/keyboards/durgod/k3x0/k310/base/readme.md b/keyboards/durgod/k3x0/k310/base/readme.md
deleted file mode 100644
index 9f46540436..0000000000
--- a/keyboards/durgod/k3x0/k310/base/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# K310
-
-This is a standard off-the-shelf Durgod Taurus K310 full-sized 104/105-key
-keyboard without backlight.  This supports both the ANSI and ISO variants.
-
-* Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
-* Hardware Supported: Durgod Taurus K310 board with STM32F070RBT6
-* Hardware Availability: K310 https://www.durgod.com/page9?product_id=53&_l=en
-
-## Instructions
-
-### Build
-
-Make command example for this keyboard (after setting up your build environment):
-
-    make durgod/k310:default
-
-Flashing example for this keyboard:
-
-    make durgod/k310:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-### Initial Flash
-
-Instructions for Flashing from initial Stock Firmware:
-* [Initial Flashing](../../readme.md#initial-flash)
diff --git a/keyboards/durgod/k3x0/k310/base/rules.mk b/keyboards/durgod/k3x0/k310/base/rules.mk
deleted file mode 100644
index 323c12fc6e..0000000000
--- a/keyboards/durgod/k3x0/k310/base/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# see common rules.mk
diff --git a/keyboards/durgod/k3x0/k310/config.h b/keyboards/durgod/k3x0/k310/config.h
deleted file mode 100644
index cb936a201f..0000000000
--- a/keyboards/durgod/k3x0/k310/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Don Kjer and Tyler Tidman
- * Copyright 2021 Simon Arlott
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size (cols in generic keyboard config) */
-#define MATRIX_ROWS 8
-
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6, A7 }
-
-/* LED indicator pins */
-#define LED_NUM_LOCK_PIN    C8
diff --git a/keyboards/durgod/k3x0/k310/readme.md b/keyboards/durgod/k3x0/k310/readme.md
deleted file mode 100644
index bee903b88f..0000000000
--- a/keyboards/durgod/k3x0/k310/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Taurus K310
-
-This code is shared between all K310 variants.  Currently only the base model with no backlight is supported.
-
-* Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
-* Hardware Supported: Durgod Taurus K310 board with STM32F070RBT6
-* Hardware Availability: Base https://www.durgod.com/page9?product_id=53&_l=en
-
-Instructions for building the K310 firmware can be found here:
-* [No Backlight](base/readme.md)
diff --git a/keyboards/durgod/k3x0/k310/rules.mk b/keyboards/durgod/k3x0/k310/rules.mk
deleted file mode 100644
index 2df1aff9c8..0000000000
--- a/keyboards/durgod/k3x0/k310/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default to the base model
-DEFAULT_FOLDER=durgod/k3x0/k310/base
-
-LAYOUTS = fullsize_ansi fullsize_iso
diff --git a/keyboards/durgod/k3x0/k320/base/config.h b/keyboards/durgod/k3x0/k320/base/config.h
deleted file mode 100644
index 2ccb2f2f0c..0000000000
--- a/keyboards/durgod/k3x0/k320/base/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Don Kjer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
diff --git a/keyboards/durgod/k3x0/k320/base/readme.md b/keyboards/durgod/k3x0/k320/base/readme.md
deleted file mode 100644
index 8f46cc122c..0000000000
--- a/keyboards/durgod/k3x0/k320/base/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# K320
-
-This is a standard off-the-shelf Durgod Taurus K320 TKL (87/88-key)
-keyboard without backlight.  This supports both the ANSI and ISO variants.
-
-* Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
-* Hardware Supported: Durgod Taurus K320 board with STM32F070RBT6
-* Hardware Availability: https://www.durgod.com/page9?product_id=47&_l=en
-
-## Instructions
-
-### Build
-
-Make command example for this keyboard (after setting up your build environment):
-
-    make durgod/k320:default
-
-Flashing example for this keyboard:
-
-    make durgod/k320:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-### Initial Flash
-
-Instructions for Flashing from initial Stock Firmware:
-* [Initial Flashing](../../readme.md#initial-flash)
diff --git a/keyboards/durgod/k3x0/k320/base/rules.mk b/keyboards/durgod/k3x0/k320/base/rules.mk
deleted file mode 100644
index 323c12fc6e..0000000000
--- a/keyboards/durgod/k3x0/k320/base/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# see common rules.mk
diff --git a/keyboards/durgod/k3x0/k320/config.h b/keyboards/durgod/k3x0/k320/config.h
deleted file mode 100644
index 2ea9b37fdf..0000000000
--- a/keyboards/durgod/k3x0/k320/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Don Kjer and Tyler Tidman
- * Copyright 2021 Simon Arlott
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size (cols in generic keyboard config) */
-#define MATRIX_ROWS 7
-
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6 }
diff --git a/keyboards/durgod/k3x0/k320/readme.md b/keyboards/durgod/k3x0/k320/readme.md
deleted file mode 100644
index e584bd1874..0000000000
--- a/keyboards/durgod/k3x0/k320/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Taurus K320
-
-This code is shared between all K320 variants.  Currently only the base model with no backlight is supported.
-
-* Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
-* Hardware Supported: Durgod Taurus K320 board with STM32F070RBT6
-* Hardware Availability: Base https://www.amazon.com/Durgod-Taurus-Corona-Mechanical-Keyboard/dp/B078H3WPHM
-
-Instructions for building the K320 firmware can be found here:
-* [No Backlight](base/readme.md)
diff --git a/keyboards/durgod/k3x0/k320/rules.mk b/keyboards/durgod/k3x0/k320/rules.mk
deleted file mode 100644
index fabc0854ff..0000000000
--- a/keyboards/durgod/k3x0/k320/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default to the base model
-DEFAULT_FOLDER=durgod/k3x0/k320/base
-
-LAYOUTS = tkl_ansi tkl_iso
diff --git a/keyboards/durgod/k3x0/k3x0.h b/keyboards/durgod/k3x0/k3x0.h
deleted file mode 100644
index 93740a5512..0000000000
--- a/keyboards/durgod/k3x0/k3x0.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 kuenhlee, Don Kjer, Tyler Tidman
- * Copyright 2021 Simon Arlott
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_durgod_k3x0_k310
-#   include "k310.h"
-#elif KEYBOARD_durgod_k3x0_k320
-#   include "k320.h"
-#endif
-
-#ifndef WINLOCK_DISABLED
-// Define the TGUI key here so it is available in QMK configurator
-enum K3x0_keycodes {
-#ifdef VIA_ENABLE
-    KC_TGUI = USER00,   // Toggle between GUI Lock or Unlock
-    NEW_SAFE_RANGE = SAFE_RANGE
-#else
-    KC_TGUI = SAFE_RANGE,   // Toggle between GUI Lock or Unlock
-    NEW_SAFE_RANGE
-#endif
-};
-
-#undef SAFE_RANGE
-#define SAFE_RANGE NEW_SAFE_RANGE
-#endif /* WINLOCK_DISABLED */
-
-/* Function Prototype */
-void off_all_leds(void);
-void on_all_leds(void);
-
diff --git a/keyboards/durgod/k3x0/readme.md b/keyboards/durgod/k3x0/readme.md
index 62bb97d7ec..90e9602e71 100644
--- a/keyboards/durgod/k3x0/readme.md
+++ b/keyboards/durgod/k3x0/readme.md
@@ -4,9 +4,12 @@ This K3X0 code is shared between both the ANSI and ISO variants of both the
 K310 full-sized 104/105-key and K320 TKL 87/88-key keyboards.
 
 * Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
-* Hardware Supported: Durgod Taurus K310 or K320 board with STM32F070RBT6
-* Hardware Availability: K310 https://www.durgod.com/page9?product_id=53&_l=en
-                         and K320 https://www.durgod.com/page9?product_id=47&_l=en
+* Hardware Supported:
+  * [Durgod Taurus K310 with STM32F070RBT6](https://www.durgod.com/page9?product_id=53&_l=en "Taurus K310 Product Page | Durgod.com")
+  * [Durgod Taurus K320 with STM32F070RBT6](https://www.durgod.com/page9?product_id=47&_l=en "Taurus K320 Product Page | Durgod.com")
+* Hardware Availability:
+  * [K310 on Amazon.com](https://www.amazon.com/Durgod-Taurus-K310-Mechanical-Keyboard/dp/B07TXB4XF3)
+  * [K320 on Amazon.com](https://www.amazon.com/Durgod-Taurus-Corona-Mechanical-Keyboard/dp/B078H3WPHM)
 
 ## Instructions
 
diff --git a/keyboards/durgod/k3x0/rules.mk b/keyboards/durgod/k3x0/rules.mk
deleted file mode 100644
index bccaec46b3..0000000000
--- a/keyboards/durgod/k3x0/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Default to K310 variant, since it will also work on a K320
-DEFAULT_FOLDER=durgod/k3x0/k310
-
-# MCU name
-# Actually F070, but close enough
-MCU = STM32F072
-BOARD = DURGOD_STM32_F070
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes

From 7a5a99b6a56e148b0bdcd146dfba1525214f0293 Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Mon, 26 Sep 2022 14:00:59 +0800
Subject: [PATCH 445/959] [Keyboard] Add GHS.JEM (#17340)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/ghs/jem/hotswap_ansi/info.json      |   5 +
 .../jem/hotswap_ansi/keymaps/default/keymap.c |  33 +++
 .../ghs/jem/hotswap_ansi/keymaps/via/keymap.c |  47 +++
 .../ghs/jem/hotswap_ansi/keymaps/via/rules.mk |   1 +
 keyboards/ghs/jem/hotswap_ansi/rules.mk       |   1 +
 keyboards/ghs/jem/info.json                   | 276 ++++++++++++++++++
 keyboards/ghs/jem/readme.md                   |  21 ++
 keyboards/ghs/jem/rules.mk                    |   1 +
 keyboards/ghs/jem/soldered/info.json          |   5 +
 .../ghs/jem/soldered/keymaps/default/keymap.c |  33 +++
 .../ghs/jem/soldered/keymaps/iso/keymap.c     |  33 +++
 .../ghs/jem/soldered/keymaps/via/keymap.c     |  47 +++
 .../ghs/jem/soldered/keymaps/via/rules.mk     |   1 +
 keyboards/ghs/jem/soldered/rules.mk           |   1 +
 14 files changed, 505 insertions(+)
 create mode 100644 keyboards/ghs/jem/hotswap_ansi/info.json
 create mode 100644 keyboards/ghs/jem/hotswap_ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/ghs/jem/hotswap_ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/ghs/jem/hotswap_ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/ghs/jem/hotswap_ansi/rules.mk
 create mode 100644 keyboards/ghs/jem/info.json
 create mode 100644 keyboards/ghs/jem/readme.md
 create mode 100644 keyboards/ghs/jem/rules.mk
 create mode 100644 keyboards/ghs/jem/soldered/info.json
 create mode 100644 keyboards/ghs/jem/soldered/keymaps/default/keymap.c
 create mode 100644 keyboards/ghs/jem/soldered/keymaps/iso/keymap.c
 create mode 100644 keyboards/ghs/jem/soldered/keymaps/via/keymap.c
 create mode 100644 keyboards/ghs/jem/soldered/keymaps/via/rules.mk
 create mode 100644 keyboards/ghs/jem/soldered/rules.mk

diff --git a/keyboards/ghs/jem/hotswap_ansi/info.json b/keyboards/ghs/jem/hotswap_ansi/info.json
new file mode 100644
index 0000000000..a52e7e1608
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x2003"
+    }
+}
diff --git a/keyboards/ghs/jem/hotswap_ansi/keymaps/default/keymap.c b/keyboards/ghs/jem/hotswap_ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4433d46a34
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/hotswap_ansi/keymaps/via/keymap.c b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b46a48cdb4
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/hotswap_ansi/keymaps/via/rules.mk b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ghs/jem/hotswap_ansi/rules.mk b/keyboards/ghs/jem/hotswap_ansi/rules.mk
new file mode 100644
index 0000000000..17f0d87b7f
--- /dev/null
+++ b/keyboards/ghs/jem/hotswap_ansi/rules.mk
@@ -0,0 +1 @@
+# This file left intentionally blank
diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json
new file mode 100644
index 0000000000..d35f86c4da
--- /dev/null
+++ b/keyboards/ghs/jem/info.json
@@ -0,0 +1,276 @@
+{
+    "keyboard_name": "GHS.JEM",
+    "manufacturer": "Gone Hacking Studio",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0x0645",
+        "device_version": "1.0.0"
+    },
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [ "E6", "B0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": [ "F1", "F0", "F7", "F6", "F5" ]
+    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "rgblight": {
+        "led_count": 22,
+        "pin": "F4",
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
+    },
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                { "matrix": [0,0], "x":0, "y":0 },
+                { "matrix": [0,1], "x":1, "y":0 },
+                { "matrix": [0,2], "x":2, "y":0 },
+                { "matrix": [0,3], "x":3, "y":0 },
+                { "matrix": [0,4], "x":4, "y":0 },
+                { "matrix": [0,5], "x":5, "y":0 },
+                { "matrix": [0,6], "x":6, "y":0 },
+                { "matrix": [0,7], "x":7, "y":0 },
+                { "matrix": [0,8], "x":8, "y":0 },
+                { "matrix": [0,9], "x":9, "y":0 },
+                { "matrix": [0,10], "x":10, "y":0 },
+                { "matrix": [0,11], "x":11, "y":0 },
+                { "matrix": [0,12], "x":12, "y":0 },
+                { "matrix": [0,13], "x":13, "y":0, "w":2 },
+                { "matrix": [1,14], "x":15, "y":0 },
+
+                { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+                { "matrix": [1,1], "x":1.5, "y":1 },
+                { "matrix": [1,2], "x":2.5, "y":1 },
+                { "matrix": [1,3], "x":3.5, "y":1 },
+                { "matrix": [1,4], "x":4.5, "y":1 },
+                { "matrix": [1,5], "x":5.5, "y":1 },
+                { "matrix": [1,6], "x":6.5, "y":1 },
+                { "matrix": [1,7], "x":7.5, "y":1 },
+                { "matrix": [1,8], "x":8.5, "y":1 },
+                { "matrix": [1,9], "x":9.5, "y":1 },
+                { "matrix": [1,10], "x":10.5, "y":1 },
+                { "matrix": [1,11], "x":11.5, "y":1 },
+                { "matrix": [1,12], "x":12.5, "y":1 },
+                { "matrix": [1,13], "x":13.5, "y":1, "w":1.5 },
+                { "matrix": [2,14], "x":15, "y":1},
+
+                { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+                { "matrix": [2,1], "x":1.75, "y":2 },
+                { "matrix": [2,2], "x":2.75, "y":2 },
+                { "matrix": [2,3], "x":3.75, "y":2 },
+                { "matrix": [2,4], "x":4.75, "y":2 },
+                { "matrix": [2,5], "x":5.75, "y":2 },
+                { "matrix": [2,6], "x":6.75, "y":2 },
+                { "matrix": [2,7], "x":7.75, "y":2 },
+                { "matrix": [2,8], "x":8.75, "y":2 },
+                { "matrix": [2,9], "x":9.75, "y":2 },
+                { "matrix": [2,10], "x":10.75, "y":2 },
+                { "matrix": [2,11], "x":11.75, "y":2 },
+                { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 },
+                { "matrix": [3,14], "x":15, "y":2 },
+
+                { "matrix": [3,0], "x":0, "y":3, "w":2.25 },
+                { "matrix": [3,2], "x":2.25, "y":3 },
+                { "matrix": [3,3], "x":3.25, "y":3 },
+                { "matrix": [3,4], "x":4.25, "y":3 },
+                { "matrix": [3,5], "x":5.25, "y":3 },
+                { "matrix": [3,6], "x":6.25, "y":3 },
+                { "matrix": [3,7], "x":7.25, "y":3 },
+                { "matrix": [3,8], "x":8.25, "y":3 },
+                { "matrix": [3,9], "x":9.25, "y":3 },
+                { "matrix": [3,10], "x":10.25, "y":3 },
+                { "matrix": [3,11], "x":11.25, "y":3 },
+                { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 },
+                { "matrix": [3,13], "x":14, "y":3 },
+                { "matrix": [4,14], "x":15, "y":3 },
+
+                { "matrix": [4,0], "x":0, "y":4, "w":1.25 },
+                { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+                { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+                { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 },
+                { "matrix": [4,9], "x":10, "y":4, "w":1.25 },
+                { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4,11], "x":13, "y":4 },
+                { "matrix": [4,12], "x":14, "y":4 },
+                { "matrix": [4,13], "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                { "matrix": [0,0], "x":0, "y":0 },
+                { "matrix": [0,1], "x":1, "y":0 },
+                { "matrix": [0,2], "x":2, "y":0 },
+                { "matrix": [0,3], "x":3, "y":0 },
+                { "matrix": [0,4], "x":4, "y":0 },
+                { "matrix": [0,5], "x":5, "y":0 },
+                { "matrix": [0,6], "x":6, "y":0 },
+                { "matrix": [0,7], "x":7, "y":0 },
+                { "matrix": [0,8], "x":8, "y":0 },
+                { "matrix": [0,9], "x":9, "y":0 },
+                { "matrix": [0,10], "x":10, "y":0 },
+                { "matrix": [0,11], "x":11, "y":0 },
+                { "matrix": [0,12], "x":12, "y":0 },
+                { "matrix": [0,13], "x":13, "y":0, "w":2 },
+                { "matrix": [1,14], "x":15, "y":0 },
+
+                { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+                { "matrix": [1,1], "x":1.5, "y":1 },
+                { "matrix": [1,2], "x":2.5, "y":1 },
+                { "matrix": [1,3], "x":3.5, "y":1 },
+                { "matrix": [1,4], "x":4.5, "y":1 },
+                { "matrix": [1,5], "x":5.5, "y":1 },
+                { "matrix": [1,6], "x":6.5, "y":1 },
+                { "matrix": [1,7], "x":7.5, "y":1 },
+                { "matrix": [1,8], "x":8.5, "y":1 },
+                { "matrix": [1,9], "x":9.5, "y":1 },
+                { "matrix": [1,10], "x":10.5, "y":1 },
+                { "matrix": [1,11], "x":11.5, "y":1 },
+                { "matrix": [1,12], "x":12.5, "y":1 },
+                { "matrix": [2,14], "x":15, "y":1},
+
+                { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+                { "matrix": [2,1], "x":1.75, "y":2 },
+                { "matrix": [2,2], "x":2.75, "y":2 },
+                { "matrix": [2,3], "x":3.75, "y":2 },
+                { "matrix": [2,4], "x":4.75, "y":2 },
+                { "matrix": [2,5], "x":5.75, "y":2 },
+                { "matrix": [2,6], "x":6.75, "y":2 },
+                { "matrix": [2,7], "x":7.75, "y":2 },
+                { "matrix": [2,8], "x":8.75, "y":2 },
+                { "matrix": [2,9], "x":9.75, "y":2 },
+                { "matrix": [2,10], "x":10.75, "y":2 },
+                { "matrix": [2,11], "x":11.75, "y":2 },
+                { "matrix": [2,13], "x":12.75, "y":2 },
+                { "matrix": [1,13], "x":13.75, "y":1, "w":1.25, "h":2 },
+                { "matrix": [3,14], "x":15, "y":2 },
+
+                { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
+                { "matrix": [3,1], "x":1.25, "y":3 },
+                { "matrix": [3,2], "x":2.25, "y":3 },
+                { "matrix": [3,3], "x":3.25, "y":3 },
+                { "matrix": [3,4], "x":4.25, "y":3 },
+                { "matrix": [3,5], "x":5.25, "y":3 },
+                { "matrix": [3,6], "x":6.25, "y":3 },
+                { "matrix": [3,7], "x":7.25, "y":3 },
+                { "matrix": [3,8], "x":8.25, "y":3 },
+                { "matrix": [3,9], "x":9.25, "y":3 },
+                { "matrix": [3,10], "x":10.25, "y":3 },
+                { "matrix": [3,11], "x":11.25, "y":3 },
+                { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 },
+                { "matrix": [3,13], "x":14, "y":3 },
+                { "matrix": [4,14], "x":15, "y":3 },
+
+                { "matrix": [4,0], "x":0, "y":4, "w":1.25 },
+                { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+                { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+                { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 },
+                { "matrix": [4,9], "x":10, "y":4, "w":1.25 },
+                { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4,11], "x":13, "y":4 },
+                { "matrix": [4,12], "x":14, "y":4 },
+                { "matrix": [4,13], "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0,0], "x":0, "y":0 },
+                { "matrix": [0,1], "x":1, "y":0 },
+                { "matrix": [0,2], "x":2, "y":0 },
+                { "matrix": [0,3], "x":3, "y":0 },
+                { "matrix": [0,4], "x":4, "y":0 },
+                { "matrix": [0,5], "x":5, "y":0 },
+                { "matrix": [0,6], "x":6, "y":0 },
+                { "matrix": [0,7], "x":7, "y":0 },
+                { "matrix": [0,8], "x":8, "y":0 },
+                { "matrix": [0,9], "x":9, "y":0 },
+                { "matrix": [0,10], "x":10, "y":0 },
+                { "matrix": [0,11], "x":11, "y":0 },
+                { "matrix": [0,12], "x":12, "y":0 },
+                { "matrix": [0,13], "x":13, "y":0 },
+                { "matrix": [0,14], "x":14, "y":0 },
+                { "matrix": [1,14], "x":15, "y":0 },
+
+                { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+                { "matrix": [1,1], "x":1.5, "y":1 },
+                { "matrix": [1,2], "x":2.5, "y":1 },
+                { "matrix": [1,3], "x":3.5, "y":1 },
+                { "matrix": [1,4], "x":4.5, "y":1 },
+                { "matrix": [1,5], "x":5.5, "y":1 },
+                { "matrix": [1,6], "x":6.5, "y":1 },
+                { "matrix": [1,7], "x":7.5, "y":1 },
+                { "matrix": [1,8], "x":8.5, "y":1 },
+                { "matrix": [1,9], "x":9.5, "y":1 },
+                { "matrix": [1,10], "x":10.5, "y":1 },
+                { "matrix": [1,11], "x":11.5, "y":1 },
+                { "matrix": [1,12], "x":12.5, "y":1 },
+                { "matrix": [1,13], "x":13.5, "y":1, "w":1.5 },
+                { "matrix": [2,14], "x":15, "y":1},
+
+                { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+                { "matrix": [2,1], "x":1.75, "y":2 },
+                { "matrix": [2,2], "x":2.75, "y":2 },
+                { "matrix": [2,3], "x":3.75, "y":2 },
+                { "matrix": [2,4], "x":4.75, "y":2 },
+                { "matrix": [2,5], "x":5.75, "y":2 },
+                { "matrix": [2,6], "x":6.75, "y":2 },
+                { "matrix": [2,7], "x":7.75, "y":2 },
+                { "matrix": [2,8], "x":8.75, "y":2 },
+                { "matrix": [2,9], "x":9.75, "y":2 },
+                { "matrix": [2,10], "x":10.75, "y":2 },
+                { "matrix": [2,11], "x":11.75, "y":2 },
+                { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 },
+                { "matrix": [3,14], "x":15, "y":2 },
+
+                { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
+                { "matrix": [3,1], "x":1.25, "y":3 },
+                { "matrix": [3,2], "x":2.25, "y":3 },
+                { "matrix": [3,3], "x":3.25, "y":3 },
+                { "matrix": [3,4], "x":4.25, "y":3 },
+                { "matrix": [3,5], "x":5.25, "y":3 },
+                { "matrix": [3,6], "x":6.25, "y":3 },
+                { "matrix": [3,7], "x":7.25, "y":3 },
+                { "matrix": [3,8], "x":8.25, "y":3 },
+                { "matrix": [3,9], "x":9.25, "y":3 },
+                { "matrix": [3,10], "x":10.25, "y":3 },
+                { "matrix": [3,11], "x":11.25, "y":3 },
+                { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 },
+                { "matrix": [3,13], "x":14, "y":3 },
+                { "matrix": [4,14], "x":15, "y":3 },
+
+                { "matrix": [4,0], "x":0, "y":4, "w":1.25 },
+                { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+                { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+                { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 },
+                { "matrix": [4,9], "x":10, "y":4, "w":1.25 },
+                { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4,11], "x":13, "y":4 },
+                { "matrix": [4,12], "x":14, "y":4 },
+                { "matrix": [4,13], "x":15, "y":4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/ghs/jem/readme.md b/keyboards/ghs/jem/readme.md
new file mode 100644
index 0000000000..1d76f959dd
--- /dev/null
+++ b/keyboards/ghs/jem/readme.md
@@ -0,0 +1,21 @@
+# GHS.JEM
+
+![GHS.JEM](https://i.imgur.com/whcvQ01l.jpg)
+
+A 65% screwless seamless keyboard.
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: ATmega32u4
+* Hardware Availability: [Gone Hacking Studio][https://gonehacking.studio/]
+
+To access the bootloader, press the reset button located under the spacebar. You can then flash new firmware:
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ghs/jem:default
+
+Flashing example for this keyboard:
+
+    make ghs/jem:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/ghs/jem/rules.mk b/keyboards/ghs/jem/rules.mk
new file mode 100644
index 0000000000..e96c00e5c0
--- /dev/null
+++ b/keyboards/ghs/jem/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = ghs/jem/soldered
diff --git a/keyboards/ghs/jem/soldered/info.json b/keyboards/ghs/jem/soldered/info.json
new file mode 100644
index 0000000000..e393236059
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0x1003"
+    }
+}
diff --git a/keyboards/ghs/jem/soldered/keymaps/default/keymap.c b/keyboards/ghs/jem/soldered/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4433d46a34
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/soldered/keymaps/iso/keymap.c b/keyboards/ghs/jem/soldered/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..de792b561f
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/iso/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/soldered/keymaps/via/keymap.c b/keyboards/ghs/jem/soldered/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b46a48cdb4
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______
+    )
+};
diff --git a/keyboards/ghs/jem/soldered/keymaps/via/rules.mk b/keyboards/ghs/jem/soldered/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ghs/jem/soldered/rules.mk b/keyboards/ghs/jem/soldered/rules.mk
new file mode 100644
index 0000000000..218d8921e5
--- /dev/null
+++ b/keyboards/ghs/jem/soldered/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.

From e2954cd43280b10c657dacc6362d322f22625041 Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Mon, 26 Sep 2022 14:11:22 +0800
Subject: [PATCH 446/959] [Keyboard] add yr6095 (#18278)

---
 keyboards/yandrstudio/yr6095/board.h          |  21 +
 keyboards/yandrstudio/yr6095/config.h         |  57 ++
 keyboards/yandrstudio/yr6095/halconf.h        |  21 +
 keyboards/yandrstudio/yr6095/info.json        | 693 ++++++++++++++++++
 .../yr6095/keymaps/default/keymap.c           |  31 +
 .../yandrstudio/yr6095/keymaps/via/keymap.c   |  43 ++
 .../yandrstudio/yr6095/keymaps/via/rules.mk   |   1 +
 keyboards/yandrstudio/yr6095/mcuconf.h        |  25 +
 keyboards/yandrstudio/yr6095/readme.md        |  22 +
 keyboards/yandrstudio/yr6095/rules.mk         |  16 +
 keyboards/yandrstudio/yr6095/yr6095.c         |  78 ++
 keyboards/yandrstudio/yr6095/yr6095.h         |  80 ++
 12 files changed, 1088 insertions(+)
 create mode 100644 keyboards/yandrstudio/yr6095/board.h
 create mode 100644 keyboards/yandrstudio/yr6095/config.h
 create mode 100644 keyboards/yandrstudio/yr6095/halconf.h
 create mode 100644 keyboards/yandrstudio/yr6095/info.json
 create mode 100644 keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/yr6095/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/yr6095/mcuconf.h
 create mode 100644 keyboards/yandrstudio/yr6095/readme.md
 create mode 100644 keyboards/yandrstudio/yr6095/rules.mk
 create mode 100644 keyboards/yandrstudio/yr6095/yr6095.c
 create mode 100644 keyboards/yandrstudio/yr6095/yr6095.h

diff --git a/keyboards/yandrstudio/yr6095/board.h b/keyboards/yandrstudio/yr6095/board.h
new file mode 100644
index 0000000000..d83804babd
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
new file mode 100644
index 0000000000..3905967b9e
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -0,0 +1,57 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_COL_PINS {  B6,  B15, B14, B13, B12, B11, B10, B2,  B1, B0,  A7,  A6,  A5,  A4 }
+#define MATRIX_ROW_PINS {  A1,  A3,  A8,  A9,  A10 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGBLIGHT_ENABLE
+
+#    define RGB_DI_PIN B5
+#    define RGBLED_NUM 1
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+
+#    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#    define RGBLIGHT_LAYERS_RETAIN_VAL
+
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+
+#    define WS2812_PWM_DRIVER PWMD3
+#    define WS2812_PWM_CHANNEL 2
+#    define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#    define WS2812_DMA_CHANNEL 3
+
+#endif
diff --git a/keyboards/yandrstudio/yr6095/halconf.h b/keyboards/yandrstudio/yr6095/halconf.h
new file mode 100644
index 0000000000..d5d6543fc6
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM    TRUE
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
new file mode 100644
index 0000000000..20a1e86cf4
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -0,0 +1,693 @@
+{
+    "keyboard_name": "YR6095",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA0C",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_60_tsangan_split_rshift": {
+            "layout": [
+                {
+                    "label": "0,0",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "0,1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "0,2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "0,3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "0,4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "0,5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "0,6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "0,7",
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "label": "0,8",
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "label": "0,9",
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "label": "0,10",
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "label": "0,11",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "0,12",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "4,7",
+                    "x": 13,
+                    "y": 0,
+                    "w": 2
+                },
+                {
+                    "label": "1,0",
+                    "x": 0,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "1,1",
+                    "x": 1.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,2",
+                    "x": 2.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,3",
+                    "x": 3.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,4",
+                    "x": 4.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,5",
+                    "x": 5.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,6",
+                    "x": 6.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,7",
+                    "x": 7.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,8",
+                    "x": 8.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,9",
+                    "x": 9.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,10",
+                    "x": 10.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,11",
+                    "x": 11.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,12",
+                    "x": 12.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,13",
+                    "x": 13.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "2,0",
+                    "x": 0,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "label": "2,1",
+                    "x": 1.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,2",
+                    "x": 2.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,3",
+                    "x": 3.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,4",
+                    "x": 4.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,5",
+                    "x": 5.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,6",
+                    "x": 6.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,7",
+                    "x": 7.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,8",
+                    "x": 8.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,9",
+                    "x": 9.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,10",
+                    "x": 10.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,11",
+                    "x": 11.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,13",
+                    "x": 12.75,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "label": "3,0",
+                    "x": 0,
+                    "y": 3,
+                    "w": 2.25
+                },
+                {
+                    "label": "3,1",
+                    "x": 2.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,2",
+                    "x": 3.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,3",
+                    "x": 4.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,4",
+                    "x": 5.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,5",
+                    "x": 6.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,6",
+                    "x": 7.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,7",
+                    "x": 8.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,8",
+                    "x": 9.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,9",
+                    "x": 10.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,10",
+                    "x": 11.25,
+                    "y": 3
+                },
+                {
+                    "label": "3,12",
+                    "x": 12.25,
+                    "y": 3,
+                    "w": 1.75
+                },
+                {
+                    "label": "3,13",
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "4,0",
+                    "x": 0,
+                    "y": 4,
+                    "w": 1.5
+                },
+                {
+                    "label": "4,1",
+                    "x": 1.5,
+                    "y": 4
+                },
+                {
+                    "label": "4,2",
+                    "x": 2.5,
+                    "y": 4,
+                    "w": 1.5
+                },
+                {
+                    "label": "4,5",
+                    "x": 4,
+                    "y": 4,
+                    "w": 7
+                },
+                {
+                    "label": "4,10",
+                    "x": 11,
+                    "y": 4,
+                    "w": 1.5
+                },
+                {
+                    "label": "4,12",
+                    "x": 12.5,
+                    "y": 4
+                },
+                {
+                    "label": "4,13",
+                    "x": 13.5,
+                    "y": 4,
+                    "w": 1.5
+                }
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {
+                    "label": "0,0",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "0,1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "0,2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "0,3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "0,4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "0,5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "0,6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "0,7",
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "label": "0,8",
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "label": "0,9",
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "label": "0,10",
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "label": "0,11",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "0,12",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "0,13",
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "label": "4,7",
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "label": "1,0",
+                    "x": 0,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "1,1",
+                    "x": 1.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,2",
+                    "x": 2.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,3",
+                    "x": 3.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,4",
+                    "x": 4.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,5",
+                    "x": 5.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,6",
+                    "x": 6.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,7",
+                    "x": 7.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,8",
+                    "x": 8.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,9",
+                    "x": 9.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,10",
+                    "x": 10.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,11",
+                    "x": 11.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,12",
+                    "x": 12.5,
+                    "y": 1
+                },
+                {
+                    "label": "1,13",
+                    "x": 13.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "2,0",
+                    "x": 0,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "label": "2,1",
+                    "x": 1.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,2",
+                    "x": 2.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,3",
+                    "x": 3.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,4",
+                    "x": 4.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,5",
+                    "x": 5.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,6",
+                    "x": 6.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,7",
+                    "x": 7.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,8",
+                    "x": 8.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,9",
+                    "x": 9.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,10",
+                    "x": 10.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,11",
+                    "x": 11.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,12",
+                    "x": 12.75,
+                    "y": 2
+                },
+                {
+                    "label": "2,13",
+                    "x": 13.75,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "label": "3,0",
+                    "x": 0,
+                    "y": 3,
+                    "w": 2
+                },
+                {
+                    "label": "3,1",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "3,2",
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "label": "3,3",
+                    "x": 4,
+                    "y": 3
+                },
+                {
+                    "label": "3,4",
+                    "x": 5,
+                    "y": 3
+                },
+                {
+                    "label": "3,5",
+                    "x": 6,
+                    "y": 3
+                },
+                {
+                    "label": "3,6",
+                    "x": 7,
+                    "y": 3
+                },
+                {
+                    "label": "3,7",
+                    "x": 8,
+                    "y": 3
+                },
+                {
+                    "label": "3,8",
+                    "x": 9,
+                    "y": 3
+                },
+                {
+                    "label": "3,9",
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "label": "3,10",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": "3,11",
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "label": "3,12",
+                    "x": 13,
+                    "y": 3
+                },
+                {
+                    "label": "3,13",
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "4,0",
+                    "x": 0,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "4,1",
+                    "x": 1.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "4,2",
+                    "x": 2.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "4,3",
+                    "x": 3.75,
+                    "y": 4,
+                    "w": 2.25
+                },
+                {
+                    "label": "4,4",
+                    "x": 6,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "4,8",
+                    "x": 7.25,
+                    "y": 4,
+                    "w": 2.75
+                },
+                {
+                    "label": "4,9",
+                    "x": 10,
+                    "y": 4
+                },
+                {
+                    "label": "4,10",
+                    "x": 11,
+                    "y": 4
+                },
+                {
+                    "label": "4,11",
+                    "x": 12,
+                    "y": 4
+                },
+                {
+                    "label": "4,12",
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "4,13",
+                    "x": 14,
+                    "y": 4
+                },
+                {
+                    "label": "4,5",
+                    "x": 4,
+                    "y": 5,
+                    "w": 7
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
new file mode 100644
index 0000000000..57d7c083df
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_60_tsangan_split_rshift(
+    KC_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_TAB,  KC_Q,    KC_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_RALT),
+  [1] = LAYOUT_60_tsangan_split_rshift(
+    KC_GRV , KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, 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_VAI, RGB_VAD, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_LG,   KC_TRNS,                    KC_TRNS,                                      KC_TRNS,          KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0411f3b924
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,     KC_SCLN,  KC_QUOT,  KC_BSLS, KC_ENT,
+    KC_LSFT, KC_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_SPC,  KC_SPC,                    KC_SPC,    KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN, KC_RIGHT),
+  [1] = LAYOUT_all(
+    KC_GRV , KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_LG,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+  [2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+  [3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/rules.mk b/keyboards/yandrstudio/yr6095/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/yr6095/mcuconf.h b/keyboards/yandrstudio/yr6095/mcuconf.h
new file mode 100644
index 0000000000..3ec9c20128
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef  STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/yr6095/readme.md b/keyboards/yandrstudio/yr6095/readme.md
new file mode 100644
index 0000000000..da034db8be
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/readme.md
@@ -0,0 +1,22 @@
+# yr6095
+
+![yr6095](https://i.imgur.com/k2SVb94h.png)
+A 60% multi-layout keyboard (there are 95 keys in total) with 1 RGB in capslock key.
+This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: yr6095
+- Hardware Availability: [TaoBao-5162](https://item.taobao.com/item.htm?id=678583896604)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/yr6095:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/yr6095/rules.mk b/keyboards/yandrstudio/yr6095/rules.mk
new file mode 100644
index 0000000000..43a4366a1f
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/rules.mk
@@ -0,0 +1,16 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+WS2812_DRIVER = pwm         # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/yr6095/yr6095.c b/keyboards/yandrstudio/yr6095/yr6095.c
new file mode 100644
index 0000000000..c0a2c94cc2
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/yr6095.c
@@ -0,0 +1,78 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "yr6095.h"
+
+void board_init(void) {
+    AFIO->MAPR |= AFIO_MAPR_TIM3_REMAP_PARTIALREMAP;
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        rgblight_set_layer_state(0, led_state.caps_lock);
+    }
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+    rgblight_reload_from_eeprom();
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    switch(keycode) {
+        case KC_LG:
+            if (record->event.pressed) {
+                process_magic(GUI_TOG, record);
+            }
+            return false;
+        case KC_MACOS:
+            if (record->event.pressed) {
+                process_magic(CG_TOGG, record);
+            }
+            return false;
+        case KC_MCTL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+        case KC_LPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+        default:
+            return true;
+    }
+    return true;
+}
diff --git a/keyboards/yandrstudio/yr6095/yr6095.h b/keyboards/yandrstudio/yr6095/yr6095.h
new file mode 100644
index 0000000000..37b4412aaa
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/yr6095.h
@@ -0,0 +1,80 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+/*
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│        │   │   │   │   │   │   │   │   │   │   │      │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│     │   │     │                           │     │   │     │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#define LAYOUT_60_tsangan_split_rshift( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K407, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, \
+    K400, K401, K402,             K405,                         K410,       K412, K413  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113  }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213  }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO, K312,  K313  }, \
+    { K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, K407,  KC_NO, KC_NO, K410,  KC_NO, K412,  K413  }  \
+}
+
+#define LAYOUT_all( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K407, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+    K400, K401, K402, K403, K404, K405,             K408, K409, K410, K411, K412, K413  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
+    { K400,  K401,  K402,  K403,  K404,  K405,  KC_NO, K407,  K408,  K409,  K410,  K411,  K412,  K413 }  \
+}
+
+enum keyboard_keycodes {
+#ifdef VIA_ENABLE
+    LOCK_GUI = USER00,
+    TOG_MACOS_KEYMAP,
+    KC_MISSION_CONTROL,
+    KC_LAUNCHPAD,
+    NEW_SAFE_RANGE = SAFE_RANGE  // Important!
+#else
+    LOCK_GUI = SAFE_RANGE,
+    TOG_MACOS_KEYMAP,
+    KC_MISSION_CONTROL,
+    KC_LAUNCHPAD,
+    NEW_SAFE_RANGE   // Important!
+#endif
+};
+
+#define KC_LG    LOCK_GUI
+#define KC_MACOS TOG_MACOS_KEYMAP
+#define KC_MCTL  KC_MISSION_CONTROL
+#define KC_LPAD  KC_LAUNCHPAD

From 1b9de35f3a436627b9b8c43dc162e4a3648bd194 Mon Sep 17 00:00:00 2001
From: Ben Allen <25768863+BenResTech@users.noreply.github.com>
Date: Mon, 26 Sep 2022 07:11:48 +0100
Subject: [PATCH 447/959] [Keymap] Adding Benrestech keymap for the Crkbd
 (#18163)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/crkbd/keymaps/benrestech/config.h |  48 +++++++
 keyboards/crkbd/keymaps/benrestech/keymap.c | 151 ++++++++++++++++++++
 keyboards/crkbd/keymaps/benrestech/rules.mk |   3 +
 3 files changed, 202 insertions(+)
 create mode 100644 keyboards/crkbd/keymaps/benrestech/config.h
 create mode 100644 keyboards/crkbd/keymaps/benrestech/keymap.c
 create mode 100644 keyboards/crkbd/keymaps/benrestech/rules.mk

diff --git a/keyboards/crkbd/keymaps/benrestech/config.h b/keyboards/crkbd/keymaps/benrestech/config.h
new file mode 100644
index 0000000000..b112aed743
--- /dev/null
+++ b/keyboards/crkbd/keymaps/benrestech/config.h
@@ -0,0 +1,48 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 175
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
+
+#ifdef RGBLIGHT_ENABLE
+    #undef RGBLED_NUM
+    #define RGBLED_NUM 27
+    #define RGBLIGHT_SLEEP
+    #define RGBLIGHT_SPLIT
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
+    #define RGBLIGHT_LAYERS
+#endif
+
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/benrestech/keymap.c b/keyboards/crkbd/keymaps/benrestech/keymap.c
new file mode 100644
index 0000000000..8cea92be06
--- /dev/null
+++ b/keyboards/crkbd/keymaps/benrestech/keymap.c
@@ -0,0 +1,151 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+Copyright 2022 Ben Allen <@benrestech>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#define KC_NP KC_NO // key is not present
+#define KC_NA KC_NO // present but not available for use
+#define KC_NU KC_NO // available but not used
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum crkbd_layers {
+    BASE,
+    MEDR,
+    NAVR,
+    MOUR,
+    NSSL,
+    NSL,
+    FUNL,
+    GAME
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [BASE] = LAYOUT_split_3x6_3(
+    TO(NSSL),  KC_Q,          KC_W,          KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,             KC_Y,            KC_QUOT,       TO(MOUR),
+    TO(NSL),   LGUI_T(KC_A),  LALT_T(KC_R),  LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),     LALT_T(KC_I),    LGUI_T(KC_O),  TO(NAVR),
+    TO(FUNL),  KC_Z,          ALGR_T(KC_X),  KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,          ALGR_T(KC_DOT),  KC_SLSH,       TO(MEDR),
+                                             LT(MEDR, KC_ESC),  LT(NAVR, KC_SPC),  LT(MOUR, KC_TAB),  LT(NSSL, KC_ENT),  LT(NSL, KC_BSPC),  LT(FUNL, KC_DEL)
+  ),
+  [NAVR] = LAYOUT_split_3x6_3(
+    TO(NSSL),  QK_BOOT,  KC_NA,    KC_NA,   KC_NA,   KC_NA,   KC_AGIN, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE,  TO(MOUR),
+    TO(NSL),   KC_LGUI, KC_LALT,  KC_LCTL, KC_LSFT, KC_NA,   KC_CAPS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,  TO(BASE),
+    TO(FUNL),  KC_NA,   KC_ALGR,  KC_NA,   KC_NA,   KC_NA,   KC_INS,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,   TO(MEDR),
+                                  KC_NA,   KC_NA,   KC_NA,   KC_ENT,  KC_BSPC, KC_DEL
+  ),
+  [MOUR] = LAYOUT_split_3x6_3(
+    TO(NSSL),  QK_BOOT,  KC_NA,    KC_NA,   KC_NA,   KC_NA,   KC_NU,   KC_NU,   KC_NU,   KC_NU,   KC_NU,    TO(BASE),
+    TO(NSL),   KC_LGUI, KC_LALT,  KC_LCTL, KC_LSFT, KC_NA,   KC_NU,   KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,  TO(NAVR),
+    TO(FUNL),  KC_NA,   KC_ALGR,  KC_NA,   KC_NA,   KC_NA,   KC_NU,   KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,  TO(MEDR),
+                                  KC_NA,   KC_NA,   KC_NA,   KC_BTN1, KC_BTN3, KC_BTN2
+  ),
+  [MEDR] = LAYOUT_split_3x6_3(
+    TO(NSSL),  QK_BOOT,  KC_NA,    KC_NA,   KC_NA,   KC_NA,   RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,   TO(MOUR),
+    TO(NSL),   KC_LGUI, KC_LALT,  KC_LCTL, KC_LSFT, KC_NA,   KC_NU,   KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT,  TO(NAVR),
+    TO(FUNL),  KC_NA,   KC_ALGR,  KC_NA,   KC_NA,   KC_NA,   KC_NU,   KC_NU,   KC_NU,   KC_NU,   KC_NU,    TO(BASE),
+                                  KC_NA,   KC_NA,   KC_NA,   KC_MSTP, KC_MPLY, KC_MUTE
+  ),
+  [FUNL] = LAYOUT_split_3x6_3(
+    TO(NSSL),  KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR, KC_NA,   KC_NA,   KC_NA,   KC_NA,    QK_BOOT,   TO(MOUR),
+    TO(NSL),   KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SLCK, KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI,  TO(NAVR),
+    TO(BASE),  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_PAUS, KC_NA,   KC_NA,   KC_NA,   KC_ALGR,  KC_NA,    TO(MEDR),
+                                KC_APP,  KC_SPC,  KC_TAB,  KC_NA,   KC_NA,   KC_NA
+  ),
+  [NSL] = LAYOUT_split_3x6_3(
+    TO(NSSL),  KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC, KC_NA,   KC_NA,   KC_NA,   KC_NA,    QK_BOOT,   TO(MOUR),
+    TO(BASE),  KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL,  KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI,  TO(NAVR),
+    TO(FUNL),  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_BSLS, KC_NA,   KC_NA,   KC_NA,   KC_ALGR,  KC_NA,    TO(MEDR),
+                                KC_DOT,  KC_0,    KC_MINS, TO(GAME),   KC_NA,   KC_NA
+  ),
+  [NSSL] = LAYOUT_split_3x6_3(
+    TO(BASE),  KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, KC_NA,   KC_NA,   KC_NA,   KC_NA,    QK_BOOT,  TO(MOUR),
+    TO(NSL),   KC_COLN, KC_DLR,  KC_PERC, KC_CIRC, KC_PLUS, KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI, TO(NAVR),
+    TO(FUNL),  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_PIPE, KC_NA,   KC_NA,   KC_NA,   KC_ALGR,  KC_NA,   TO(MEDR),
+                                KC_GT,   KC_RPRN, KC_UNDS, KC_NA,   KC_NA,   KC_NA
+  ),
+  [GAME] = LAYOUT_split_3x6_3(
+    KC_NA,  KC_Q,  KC_W,  KC_F,    KC_P,    KC_B,    KC_J,              KC_L,              KC_U,             KC_Y,            KC_QUOT,       TO(BASE),
+    KC_NA,  KC_A,  KC_R,  KC_S,    KC_T,    KC_G,    KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),     LALT_T(KC_I),    LGUI_T(KC_O),  TO(BASE),
+    KC_NA,  KC_Z,  KC_X,  KC_C,    KC_D,    KC_V,    KC_K,              KC_H,              KC_COMM,          ALGR_T(KC_DOT),  KC_SLSH,       TO(BASE),
+                          KC_ESC,  KC_SPC,  KC_TAB,  LT(NSSL, KC_ENT),  LT(NSL, KC_BSPC),  LT(FUNL, KC_DEL)
+  )
+};
+
+// Default (BASE) lighting layer is HSV_GREEN.
+// MEDR lighting layer.
+const rgblight_segment_t PROGMEM medr_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 53, HSV_PINK}       // Light all LEDs
+);
+// NAVR lighting layer.
+const rgblight_segment_t PROGMEM navr_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 53, HSV_CYAN}       // Light all LEDs
+);
+// MOUR lighting layer.
+const rgblight_segment_t PROGMEM mour_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 53, HSV_YELLOW}       // Light all LEDs
+);
+// NSSL lighting layer.
+const rgblight_segment_t PROGMEM nssl_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 53, HSV_SPRINGGREEN}       // Light all LEDs
+);
+// NSL lighting layer.
+const rgblight_segment_t PROGMEM nsl_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 53, HSV_BLUE}       // Light all LEDs
+);
+// FUNL lighting layer.
+const rgblight_segment_t PROGMEM funl_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 53, HSV_RED}       // Light all LEDs
+);
+// GAME lighting layer.
+const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 53, HSV_PURPLE}       // Light all LEDs
+);
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    medr_layer,
+    navr_layer,
+    mour_layer,
+    nssl_layer,
+    nsl_layer, 
+    funl_layer,
+    game_layer 
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    rgblight_sethsv(HSV_GREEN);
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, MEDR));
+    rgblight_set_layer_state(1, layer_state_cmp(state, NAVR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, MOUR));
+    rgblight_set_layer_state(3, layer_state_cmp(state, NSSL));
+    rgblight_set_layer_state(4, layer_state_cmp(state, NSL));
+    rgblight_set_layer_state(5, layer_state_cmp(state, FUNL));
+    rgblight_set_layer_state(6, layer_state_cmp(state, GAME));
+    return state;
+}
+
+
diff --git a/keyboards/crkbd/keymaps/benrestech/rules.mk b/keyboards/crkbd/keymaps/benrestech/rules.mk
new file mode 100644
index 0000000000..c177a33cf5
--- /dev/null
+++ b/keyboards/crkbd/keymaps/benrestech/rules.mk
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306

From 667831daba99ffeb95cf71ee965d280af1fa659b Mon Sep 17 00:00:00 2001
From: Alejandro J <ajarov@users.noreply.github.com>
Date: Mon, 26 Sep 2022 03:12:24 -0300
Subject: [PATCH 448/959] [Keymap] Add ajarov's crkbd layout (#17479)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/crkbd/keymaps/ajarov/config.h  |  50 ++++++++
 keyboards/crkbd/keymaps/ajarov/keymap.c  | 150 +++++++++++++++++++++++
 keyboards/crkbd/keymaps/ajarov/readme.md |  13 ++
 keyboards/crkbd/keymaps/ajarov/rules.mk  |   5 +
 4 files changed, 218 insertions(+)
 create mode 100644 keyboards/crkbd/keymaps/ajarov/config.h
 create mode 100644 keyboards/crkbd/keymaps/ajarov/keymap.c
 create mode 100644 keyboards/crkbd/keymaps/ajarov/readme.md
 create mode 100644 keyboards/crkbd/keymaps/ajarov/rules.mk

diff --git a/keyboards/crkbd/keymaps/ajarov/config.h b/keyboards/crkbd/keymaps/ajarov/config.h
new file mode 100644
index 0000000000..4c408112bd
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ajarov/config.h
@@ -0,0 +1,50 @@
+/*
+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 TAPPING_FORCE_HOLD
+//#define TAPPING_TERM 100
+
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_LIMIT_VAL 120
+#    define RGBLIGHT_HUE_STEP 10
+#    define RGBLIGHT_SAT_STEP 17
+#    define RGBLIGHT_VAL_STEP 17
+#endif
+
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/ajarov/keymap.c b/keyboards/crkbd/keymaps/ajarov/keymap.c
new file mode 100644
index 0000000000..5931dc5635
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ajarov/keymap.c
@@ -0,0 +1,150 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+Copyright 2022 Alejandro Jarovisky <@ajarov>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_spanish.h"
+
+enum layers {
+    L_BASE,
+    L_UPPER,
+    L_RIGHT,
+    L_UPPER_RIGHT,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [L_BASE] = LAYOUT_split_3x6_3(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+         KC_TAB,    ES_Q,    ES_W,    ES_E,    ES_R,    ES_T,                         ES_Y,    ES_U,    ES_I,    ES_O,   ES_P,  KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL,    ES_A,    ES_S,    ES_D,    ES_F,    ES_G,                         ES_H,    ES_J,    ES_K,    ES_L, ES_NTIL, ES_ACUT,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT,    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B,                         ES_N,    ES_M, ES_COMM,  ES_DOT, ES_MINS, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                            KC_LGUI,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_LALT
+                                        //`--------------------------'  `--------------------------'
+    ),
+
+    [L_UPPER] = LAYOUT_split_3x6_3(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+         KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_APP,                       KC_INS, KC_HOME,   KC_UP,  KC_END, KC_PGUP, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL,   KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_PSCR,                       KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ES_DIAE,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PAUS,                      XXXXXXX, XXXXXXX, ES_SCLN, ES_COLN, ES_UNDS, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                            KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT
+                                        //`--------------------------'  `--------------------------'
+    ),
+
+    [L_RIGHT] = LAYOUT_split_3x6_3(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        KC_CAPS, ES_EXLM, ES_DQUO, ES_HASH, ES_CIRC, XXXXXXX,                      ES_ASTR,    ES_7,    ES_8,    ES_9, ES_MINS, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, ES_LCBR, ES_RCBR, ES_LPRN, ES_RPRN, ES_QUES,                      ES_SLSH,    ES_4,    ES_5,    ES_6, ES_PLUS, ES_QUOT,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, ES_LBRC, ES_RBRC, ES_LABK, ES_RABK,  ES_EQL,                         ES_0,    ES_1,    ES_2,    ES_3,  ES_DOT, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                            KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT
+                                        //`--------------------------'  `--------------------------'
+    ),
+
+    [L_UPPER_RIGHT] = LAYOUT_split_3x6_3(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        XXXXXXX, ES_IEXL,   ES_AT, ES_EURO,  ES_DLR, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, ES_MORD, XXXXXXX, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, ES_FORD, ES_AMPR, ES_PIPE, ES_BSLS, ES_IQUE,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ES_TILD,  ES_GRV,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, XXXXXXX,  ES_NOT, ES_CCED, ES_PERC, XXXXXXX,                      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                            KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT
+                                        //`--------------------------'  `--------------------------'
+    )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, L_UPPER, L_RIGHT, L_UPPER_RIGHT);
+}
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (!is_keyboard_master()) {
+        return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+    }
+    return rotation;
+}
+
+void oled_render_layer_state(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+    switch (get_highest_layer(layer_state)) {
+        case L_BASE:
+            oled_write_ln_P(PSTR("Default"), false);
+            break;
+        case L_UPPER:
+            oled_write_ln_P(PSTR("Upper"), false);
+            break;
+        case L_RIGHT:
+            oled_write_ln_P(PSTR("Right"), false);
+            break;
+        case L_UPPER_RIGHT:
+            oled_write_ln_P(PSTR("Upper Right"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_ln_P(PSTR(""), false);
+    oled_write_ln_P(led_state.caps_lock ? PSTR("CAPS LOCK") : PSTR("         "), false);
+}
+
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+void oled_render_logo(void) {
+    static const char PROGMEM crkbd_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0};
+    oled_write_P(crkbd_logo, false);
+}
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_layer_state();
+    } else {
+        oled_render_logo();
+    }
+    return false;
+}
+#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/ajarov/readme.md b/keyboards/crkbd/keymaps/ajarov/readme.md
new file mode 100644
index 0000000000..7a51a35e6e
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ajarov/readme.md
@@ -0,0 +1,13 @@
+# Corne Spanish layout by ajarov
+
+![Layout](https://user-images.githubusercontent.com/1832140/178291869-ea3c070b-2c0d-45f9-aeb8-00ac6942e847.png)
+
+The OS keyboard layout should be set to Spanish so the above image matches the actual keys.
+
+Some ideas that shaped this layout:
+* There are 4 layers: Base, Upper (`△`), Right (`▷`), and Upper Right (`△` + `▷`).
+* The base layer is almost the same as the one on the default Corne layout when the keyboard is set to Spanish on the OS (the only differences being `RShift` instead of `Esc`, and `LAlt` instead of `Alt Gr`).
+* When the Upper layer (`△`) is selected, the right hand resting position matches the one on the arrow keys on a traditional keyboard.
+* The right half of the keyboard can be used as a numpad with only the right hand by selecting the Right layer (`▷`).
+* The only keys missing from a full-size (105 keys) Spanish keyboard are the interpunct (`·` or `Shift` + `3`), `Scroll Lock`, and `Num Lock`. I never use them (does anybody?) and I'd rather not include them and risk toggling Scroll/Num Lock by accident.
+* Media keys are not present because I find it better to use keyboard + mouse shortcuts with [AutoHotkey](https://www.autohotkey.com/) (e.g: `Ctrl` + `Shift` + `Wheel Up`/`Wheel Down` increases/decreases the volume).
diff --git a/keyboards/crkbd/keymaps/ajarov/rules.mk b/keyboards/crkbd/keymaps/ajarov/rules.mk
new file mode 100644
index 0000000000..3e637d11da
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ajarov/rules.mk
@@ -0,0 +1,5 @@
+MOUSEKEY_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
+LTO_ENABLE      = yes

From 65d0fef47a3ca748b2f20a3fb4d472e7b82862b3 Mon Sep 17 00:00:00 2001
From: zhiquankhor <53843869+zhiquankhor@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:13:48 +0800
Subject: [PATCH 449/959] [Keymap] Add zq keymap for w1_at (#18479)

---
 keyboards/w1_at/keymaps/zq/keymap.c  | 119 +++++++++++++++++++++++++++
 keyboards/w1_at/keymaps/zq/readme.md |  21 +++++
 keyboards/w1_at/keymaps/zq/rules.mk  |   1 +
 3 files changed, 141 insertions(+)
 create mode 100644 keyboards/w1_at/keymaps/zq/keymap.c
 create mode 100644 keyboards/w1_at/keymaps/zq/readme.md
 create mode 100644 keyboards/w1_at/keymaps/zq/rules.mk

diff --git a/keyboards/w1_at/keymaps/zq/keymap.c b/keyboards/w1_at/keymaps/zq/keymap.c
new file mode 100644
index 0000000000..eba9aedb8f
--- /dev/null
+++ b/keyboards/w1_at/keymaps/zq/keymap.c
@@ -0,0 +1,119 @@
+/* Copyright 2021 Zhi Quan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_F1,   KC_F2,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     TG(2),   KC_PSLS, KC_PAST, KC_PMNS,
+    KC_F3,   KC_F4,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_F5,   KC_F6,      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_F7,   KC_F8,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_F9,   KC_F10,     KC_LCTL,          KC_LCMD,                            KC_SPC,                                      KC_ROPT,          MO(1),               KC_P0,   KC_P00,  KC_PDOT, KC_PENT),
+
+[1] = LAYOUT_all( /* FN */
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,    KC_TRNS, KC_MPRV, KC_MNXT, KC_VOLD,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, QK_BOOT,             KC_HOME, KC_UP,   KC_PGUP, KC_VOLU,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_LEFT, KC_MUTE, KC_RGHT, KC_VOLU,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_END,  KC_DOWN, KC_PGDN, KC_MPLY,
+    KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY),
+
+[2] = LAYOUT_all( /* Numpad */
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_HOME, KC_UP,   KC_PGUP, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_LEFT, XXXXXXX, KC_RGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_END,  KC_DOWN, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch(keycode) {
+        case KC_P00:
+            if (record->event.pressed) {
+                tap_code(KC_P0);
+                tap_code(KC_P0);
+            }
+            return false;
+            break;
+        case KC_ESC:
+            if (record->event.pressed) {
+                // Turn on capslock indicator.
+                writePin(LED_CAPS_LOCK_PIN, LED_PIN_ON_STATE);
+            } else {
+                // Turn off capslock indicator.
+                writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
+            }
+    }
+    return true;
+}
+
+// Customized function so that numlock and capslock indicator are no longer controlled by the host.
+bool led_update_user(led_t led_state) {
+#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
+#    if LED_PIN_ON_STATE == 0
+        // invert the whole thing to avoid having to conditionally !led_state.x later
+        led_state.raw = ~led_state.raw;
+#    endif
+
+// #    ifdef LED_NUM_LOCK_PIN
+//         writePin(LED_NUM_LOCK_PIN, led_state.num_lock);
+// #    endif
+// #    ifdef LED_CAPS_LOCK_PIN
+//         writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+// #    endif
+#    ifdef LED_SCROLL_LOCK_PIN
+        writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
+#    endif
+#    ifdef LED_COMPOSE_PIN
+        writePin(LED_COMPOSE_PIN, led_state.compose);
+#    endif
+#    ifdef LED_KANA_PIN
+        writePin(LED_KANA_PIN, led_state.kana);
+#    endif
+#endif
+
+    // Return false to let led_update_kb fall through.
+    return false;
+}
+
+// Customized function to manage numlock indicator based on layer.
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        // Base layer
+        case 0:
+            // Turn on numlock indicator.
+            writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
+            break;
+
+        // Numpad navigation layer
+        case 2:
+            // Turn off numlock indicator.
+            writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
+            break;
+    }
+
+    return state;
+}
\ No newline at end of file
diff --git a/keyboards/w1_at/keymaps/zq/readme.md b/keyboards/w1_at/keymaps/zq/readme.md
new file mode 100644
index 0000000000..103130b161
--- /dev/null
+++ b/keyboards/w1_at/keymaps/zq/readme.md
@@ -0,0 +1,21 @@
+# Personal W1-AT keymap
+The main highlights are as follows:
+* VIA support enabled
+* Enter bootloader mode using Fn + \
+* Grave key (` and ~) in place of Esc key
+* Esc in place of CapsLock key
+* Use NumLock LED indicator on layers: ON in layer 0, OFF in layer 2 (workaround for macOS since there is no NumLock key)
+* Use CapsLock LED indicator on Esc key
+
+
+## Layer 0 (Base)
+---
+![Layer 0](https://i.imgur.com/l1OKSBB.png)
+
+## Layer 1 (Function)
+---
+![Layer 1](https://i.imgur.com/RdzVyvb.png)
+
+## Layer 2 (Numpad Navigation)
+---
+![Layer 2](https://i.imgur.com/xKVnQaK.png)
\ No newline at end of file
diff --git a/keyboards/w1_at/keymaps/zq/rules.mk b/keyboards/w1_at/keymaps/zq/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/w1_at/keymaps/zq/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file

From d98ec93eb8bcbb63d9f8c4778ebf5bafbd2e98f9 Mon Sep 17 00:00:00 2001
From: Nick Lopez <github@glowingmonkey.org>
Date: Sun, 25 Sep 2022 23:14:36 -0700
Subject: [PATCH 450/959] [Keyboard] Add Osborne 1 handwired keyboard (#18397)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/handwired/osborne1/config.h         | 24 +++++
 keyboards/handwired/osborne1/info.json        | 88 +++++++++++++++++++
 .../osborne1/keymaps/default/keymap.c         | 36 ++++++++
 keyboards/handwired/osborne1/readme.md        | 25 ++++++
 keyboards/handwired/osborne1/rules.mk         |  2 +
 5 files changed, 175 insertions(+)
 create mode 100644 keyboards/handwired/osborne1/config.h
 create mode 100644 keyboards/handwired/osborne1/info.json
 create mode 100644 keyboards/handwired/osborne1/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/osborne1/readme.md
 create mode 100644 keyboards/handwired/osborne1/rules.mk

diff --git a/keyboards/handwired/osborne1/config.h b/keyboards/handwired/osborne1/config.h
new file mode 100644
index 0000000000..1e21a30db0
--- /dev/null
+++ b/keyboards/handwired/osborne1/config.h
@@ -0,0 +1,24 @@
+// Copyright 2022 Nick Lopez <github@glowingmonkey.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define BLUEFRUIT_LE_RST_PIN D4
+#define BLUEFRUIT_LE_CS_PIN B4
+#define BLUEFRUIT_LE_IRQ_PIN E6
diff --git a/keyboards/handwired/osborne1/info.json b/keyboards/handwired/osborne1/info.json
new file mode 100644
index 0000000000..e9a2de9552
--- /dev/null
+++ b/keyboards/handwired/osborne1/info.json
@@ -0,0 +1,88 @@
+{
+    "manufacturer": "crackmonkey",
+    "keyboard_name": "osborne1",
+    "maintainer": "crackmonkey",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D0", "B7", "B5", "C6", "D1", "B6", "D7", "D6"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x239A",
+        "vid": "0x800C"
+    },
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                { "matrix": [0, 0], "label": "ESC", "x": 0, "y": 0 },
+                { "matrix": [1, 0], "label": "1", "x": 1, "y": 0 },
+                { "matrix": [1, 1], "label": "2", "x": 2, "y": 0 },
+                { "matrix": [1, 2], "label": "3", "x": 3, "y": 0 },
+                { "matrix": [1, 3], "label": "4", "x": 4, "y": 0 },
+                { "matrix": [1, 4], "label": "5", "x": 5, "y": 0 },
+                { "matrix": [1, 5], "label": "6", "x": 6, "y": 0 },
+                { "matrix": [1, 6], "label": "7", "x": 7, "y": 0 },
+                { "matrix": [1, 7], "label": "8", "x": 8, "y": 0 },
+                { "matrix": [5, 7], "label": "9", "x": 9, "y": 0 },
+                { "matrix": [5, 2], "label": "0", "x": 10, "y": 0 },
+                { "matrix": [6, 2], "label": "-", "x": 11, "y": 0 },
+                { "matrix": [6, 7], "label": "=", "x": 12, "y": 0 },
+                { "matrix": [0, 7], "label": "[", "x": 13, "y": 0 },
+                { "matrix": [5, 0], "label": "Up", "x": 14, "y": 0 },
+                { "matrix": [0, 1], "label": "TAB", "x": 0, "y": 1 },
+                { "matrix": [2, 0], "label": "Q", "x": 1, "y": 1 },
+                { "matrix": [2, 1], "label": "W", "x": 2, "y": 1 },
+                { "matrix": [2, 2], "label": "E", "x": 3, "y": 1 },
+                { "matrix": [2, 3], "label": "R", "x": 4, "y": 1 },
+                { "matrix": [2, 4], "label": "T", "x": 5, "y": 1 },
+                { "matrix": [2, 5], "label": "Y", "x": 6, "y": 1 },
+                { "matrix": [2, 6], "label": "U", "x": 7, "y": 1 },
+                { "matrix": [2, 7], "label": "I", "x": 8, "y": 1 },
+                { "matrix": [5, 6], "label": "O", "x": 9, "y": 1 },
+                { "matrix": [5, 5], "label": "P", "x": 10, "y": 1 },
+                { "matrix": [6, 5], "label": "Backslash", "x": 11, "y": 1 },
+                { "matrix": [0, 6], "label": "Quote", "x": 12, "y": 1 },
+                { "matrix": [5, 1], "label": "Left", "x": 13, "y": 1 },
+                { "matrix": [6, 0], "label": "Right", "x": 14, "y": 1 },
+                { "matrix": [0, 2], "label": "Control", "x": 0, "y": 2 },
+                { "matrix": [7, 3], "label": "Capslock", "x": 1, "y": 2 },
+                { "matrix": [3, 0], "label": "A", "x": 2, "y": 2 },
+                { "matrix": [3, 1], "label": "S", "x": 3, "y": 2 },
+                { "matrix": [3, 2], "label": "D", "x": 4, "y": 2 },
+                { "matrix": [3, 3], "label": "F", "x": 5, "y": 2 },
+                { "matrix": [3, 4], "label": "G", "x": 6, "y": 2 },
+                { "matrix": [3, 5], "label": "H", "x": 7, "y": 2 },
+                { "matrix": [3, 6], "label": "J", "x": 8, "y": 2 },
+                { "matrix": [3, 7], "label": "K", "x": 9, "y": 2 },
+                { "matrix": [6, 6], "label": "L", "x": 10, "y": 2 },
+                { "matrix": [6, 4], "label": "Semicolon", "x": 11, "y": 2 },
+                { "matrix": [0, 5], "label": "Return", "x": 12, "y": 2 },
+                { "matrix": [6, 1], "label": "Down", "x": 13, "y": 2 },
+                { "matrix": [0, 4], "label": "LShift", "x": 0, "y": 3 },
+                { "matrix": [4, 0], "label": "Z", "x": 1, "y": 3 },
+                { "matrix": [4, 1], "label": "X", "x": 2, "y": 3 },
+                { "matrix": [4, 2], "label": "C", "x": 3, "y": 3 },
+                { "matrix": [4, 3], "label": "V", "x": 4, "y": 3 },
+                { "matrix": [4, 4], "label": "B", "x": 5, "y": 3 },
+                { "matrix": [4, 5], "label": "N", "x": 6, "y": 3 },
+                { "matrix": [4, 6], "label": "M", "x": 7, "y": 3 },
+                { "matrix": [4, 7], "label": "Comma", "x": 8, "y": 3 },
+                { "matrix": [5, 4], "label": "Period", "x": 9, "y": 3 },
+                { "matrix": [6, 3], "label": "Slash", "x": 10, "y": 3 },
+                { "matrix": [5, 3], "label": "Space", "x": 0, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/osborne1/keymaps/default/keymap.c b/keyboards/handwired/osborne1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..53b71cfc0b
--- /dev/null
+++ b/keyboards/handwired/osborne1/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 Nick Lopez <github@glowingmonkey.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_64_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_LBRC, KC_UP,
+        KC_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I, KC_O, KC_P, KC_BSLS, KC_QUOT, KC_LEFT, KC_RGHT,
+        KC_LCTL, MO(1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K, KC_L, KC_SCLN, KC_ENT, KC_DOWN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+        KC_SPC
+    ),
+    [1] = LAYOUT_64_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______
+    )
+};
+
+
diff --git a/keyboards/handwired/osborne1/readme.md b/keyboards/handwired/osborne1/readme.md
new file mode 100644
index 0000000000..db8c161549
--- /dev/null
+++ b/keyboards/handwired/osborne1/readme.md
@@ -0,0 +1,25 @@
+# osborne1
+
+![osborne1](https://i.imgur.com/221nQ5Eh.jpeg)
+
+The Osborne keyboard doesn't contain any electronics, so the pins of the 8x8 keyboard matrix are easily available right on the normal connector. 17 jumper wires and a Feather BlueFruit is all the additional hardware needed.
+
+* Keyboard Maintainer: [crackmonkey](https://github.com/crackmonkey)
+* Hardware Supported: Adafruit Feather BlueFruit 32u4
+* Hardware Availability: E-waste
+
+Make example for this keyboard (after setting up your build environment):
+
+    make osborne1:default
+
+Flashing example for this keyboard:
+
+    make osborne1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader:
+
+* **Physical reset button**: Briefly press the button on the Feather
diff --git a/keyboards/handwired/osborne1/rules.mk b/keyboards/handwired/osborne1/rules.mk
new file mode 100644
index 0000000000..2bf3fe5811
--- /dev/null
+++ b/keyboards/handwired/osborne1/rules.mk
@@ -0,0 +1,2 @@
+BLUETOOTH_ENABLE = yes
+BLUETOOTH_DRIVER = BluefruitLE

From b521641c507cf043a327e7073483bef5cf4f580a Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 25 Sep 2022 23:15:50 -0700
Subject: [PATCH 451/959] [Keyboard] Ploopy Thumb Trackball (#18214)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: ploopyco <git@ploopy.co>
---
 keyboards/ploopyco/trackball_thumb/config.h   |  38 +++
 keyboards/ploopyco/trackball_thumb/info.json  |  36 +++
 .../trackball_thumb/keymaps/default/keymap.c  |  27 +++
 .../trackball_thumb/keymaps/default/readme.md |   1 +
 .../keymaps/drag_scroll/keymap.c              |  30 +++
 .../keymaps/drag_scroll/readme.md             |   3 +
 .../trackball_thumb/keymaps/via/config.h      |  21 ++
 .../trackball_thumb/keymaps/via/keymap.c      |  30 +++
 .../trackball_thumb/keymaps/via/rules.mk      |   1 +
 .../ploopyco/trackball_thumb/post_rules.mk    |   4 +
 keyboards/ploopyco/trackball_thumb/readme.md  |  58 +++++
 .../trackball_thumb/rev1_001/config.h         |  24 ++
 .../trackball_thumb/rev1_001/info.json        |  20 ++
 .../trackball_thumb/rev1_001/readme.md        |   3 +
 .../trackball_thumb/rev1_001/rev1_001.h       |  21 ++
 .../trackball_thumb/rev1_001/rules.mk         |   0
 keyboards/ploopyco/trackball_thumb/rules.mk   |   9 +
 .../trackball_thumb/trackball_thumb.c         | 229 ++++++++++++++++++
 .../trackball_thumb/trackball_thumb.h         |  60 +++++
 19 files changed, 615 insertions(+)
 create mode 100644 keyboards/ploopyco/trackball_thumb/config.h
 create mode 100644 keyboards/ploopyco/trackball_thumb/info.json
 create mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
 create mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md
 create mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c
 create mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md
 create mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/via/config.h
 create mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/via/keymap.c
 create mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk
 create mode 100644 keyboards/ploopyco/trackball_thumb/post_rules.mk
 create mode 100644 keyboards/ploopyco/trackball_thumb/readme.md
 create mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/config.h
 create mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/info.json
 create mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/readme.md
 create mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
 create mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk
 create mode 100644 keyboards/ploopyco/trackball_thumb/rules.mk
 create mode 100644 keyboards/ploopyco/trackball_thumb/trackball_thumb.c
 create mode 100644 keyboards/ploopyco/trackball_thumb/trackball_thumb.h

diff --git a/keyboards/ploopyco/trackball_thumb/config.h b/keyboards/ploopyco/trackball_thumb/config.h
new file mode 100644
index 0000000000..97553a7959
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+// #define ROTATIONAL_TRANSFORM_ANGLE 0
+#define POINTING_DEVICE_INVERT_Y
+
+// If board has a debug LED, you can enable it by defining this
+// #define DEBUG_LED_PIN F7
+
+/* PMW3360 Settings */
+#define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json
new file mode 100644
index 0000000000..b76e2bd7fe
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/info.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "PloopyCo Thumb Trackball",
+    "url": "www.ploopy.co",
+    "maintainer": "ploopyco",
+    "manufacturer": "Ploopy Corporation",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "usb": {
+        "vid": "0x5043",
+        "pid": "0x5C46",
+        "max_power": 100
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "pointing_device": true,
+        "encoder": false
+    },
+    "debounce": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0, "h": 1},
+                {"matrix":[0,2], "x":1, "y":0, "h":2},
+                {"matrix":[0,3],"x":2.5, "y":0.25, "h":1.5},
+                {"matrix":[0,4],"x":4, "y":0, "h":2},
+                {"matrix":[0,5],"x":5, "y":0.5, "h":1},
+                {"matrix":[0,1],"x":0, "y":1, "h":1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..897a5761c7
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// safe range starts at `PLOOPY_SAFE_RANGE` instead.
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( /* Base */
+        KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5,
+        DPI_CONFIG
+    ),
+};
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md b/keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md
new file mode 100644
index 0000000000..0f21a21ba6
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Ploopyco Thumb Trackball
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c
new file mode 100644
index 0000000000..03202cc8f7
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c
@@ -0,0 +1,30 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( /* Base */
+        KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5,
+        MO(1)
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______,
+        DRAG_SCROLL
+    )
+};
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md b/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md
new file mode 100644
index 0000000000..22119b7ef9
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md
@@ -0,0 +1,3 @@
+# The Drag Scroll keymap for Ploopyco Thumb Trackball
+
+This is a sample keymap showing off what you can do with the custom callback drivers. 
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/via/config.h b/keyboards/ploopyco/trackball_thumb/keymaps/via/config.h
new file mode 100644
index 0000000000..7670e63176
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/via/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/via/keymap.c b/keyboards/ploopyco/trackball_thumb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1951535b69
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/via/keymap.c
@@ -0,0 +1,30 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5, DPI_CONFIG ),
+    [1] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
+    [2] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
+    [3] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
+    [4] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
+    [5] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
+    [6] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
+    [7] = LAYOUT( _______, _______, _______, _______, _______, _______ )
+};
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk b/keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ploopyco/trackball_thumb/post_rules.mk b/keyboards/ploopyco/trackball_thumb/post_rules.mk
new file mode 100644
index 0000000000..d922afd9cd
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/post_rules.mk
@@ -0,0 +1,4 @@
+# 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/readme.md b/keyboards/ploopyco/trackball_thumb/readme.md
new file mode 100644
index 0000000000..83ac740f85
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/readme.md
@@ -0,0 +1,58 @@
+# Ploopyco Thumb Trackball
+
+It's a DIY, QMK Powered Trackball...for thumb ballers!
+
+* Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
+* Hardware Supported: ATMega32u4 8MHz(3.3v)
+* Hardware Availability: [Store](https://ploopy.co), [GitHub](https://github.com/ploopyco)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ploopyco/trackball_thumb/rev1_001:default:flash
+    
+To jump to the bootloader, hold down "Button 4" (button closest to the USB port).
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+# Customizing your PloopyCo Thumb
+
+While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change.  Such as adding DPI control, or to use the ball to scroll while holding a button.   To allow for this sort of control, there is a callback for both the scroll wheel and the mouse sensor.
+
+The default behavior for this is:
+
+```c
+report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+
+    return mouse_report;
+}
+```
+
+This should allow you to more heavily customize the behavior. 
+
+Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality.
+
+Additionally, you can change the DPI/CPI or speed of the trackball by calling `pmw_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` keycode that will cycle through an array of options for the DPI.  This is set to 1200, 1600, and 2400, but can be changed.  1600 is also set to the default.
+
+To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`, which is the `0`-based index into the `PLOOPY_DPI_OPTIONS` array. 
+
+```c
+#define PLOOPY_DPI_OPTIONS { 1200, 1600, 2400 }
+#define PLOOPY_DPI_DEFAULT 1
+```
+The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in.  The "default" define lets the firmware know which of these options is the default and should be loaded by default. 
+
+When inserted into your keymap, the `DPI_CONFIG` keycode will cycle through the values in the array each time you hit it.  It stores this value in persistent memory, so it will remember your selection the next time the device powers up. 
+
+## Drag Scroll
+
+Drag Scroll is a custom keycode for the Ploopy devices that allow you to hold or tap a button and have the mouse movement translate into scrolling instead. 
+
+Nothing needs to be enabled to use this functionality.  Just add the `DRAG_SCROLL` to your keymap. 
+
+### Drag Scroll Configuration
+
+* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle.
+* `#define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75` - Sets the DPI multiplier to use when drag scroll is enabled. 
+* `#define PLOOPY_DRAGSCROLL_FIXED` - Normally, when activating Drag Scroll, it uses a fraction of the current DPI. You can define this to use a specific, set DPI rather than a fraction of the current DPI. 
+  * `#define PLOOPY_DRAGSCROLL_DPI 100` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll.
+* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. 
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/config.h b/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
new file mode 100644
index 0000000000..dc80d9401e
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// These pins are not broken out, and cannot be used normally.
+// They are set as output and pulled high, by default
+#define UNUSED_PINS \
+    { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
new file mode 100644
index 0000000000..80951b5b2d
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
@@ -0,0 +1,20 @@
+{
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "direct": [ [ "D5", "B6", "D4", "D2", "E6", "D7" ] ]
+    },
+    "rgblight": {
+        "led_count": 3,
+        "pin": "B5",
+        "max_brightness": 40,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    }
+
+}
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/readme.md b/keyboards/ploopyco/trackball_thumb/rev1_001/readme.md
new file mode 100644
index 0000000000..5a5f0563e7
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/readme.md
@@ -0,0 +1,3 @@
+This is the R1.001+ version of the Thumb. Future versions may have other features.
+
+See the [main readme](../readme.md) for more details. 
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
new file mode 100644
index 0000000000..f43818665c
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
@@ -0,0 +1,21 @@
+/* Copyright Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "trackball_thumb.h"
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk b/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/ploopyco/trackball_thumb/rules.mk b/keyboards/ploopyco/trackball_thumb/rules.mk
new file mode 100644
index 0000000000..4a16c0abfb
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/rules.mk
@@ -0,0 +1,9 @@
+# Processor frequency
+F_CPU = 8000000
+
+POINTING_DEVICE_DRIVER = pmw3360
+
+QUANTUM_LIB_SRC += analog.c
+SRC += opt_encoder.c
+
+DEFAULT_FOLDER = ploopyco/trackball_thumb/rev1_001
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
new file mode 100644
index 0000000000..f76d243f18
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
@@ -0,0 +1,229 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "trackball_thumb.h"
+
+#ifndef OPT_DEBOUNCE
+#    define OPT_DEBOUNCE 5  // (ms) 			Time between scroll events
+#endif
+#ifndef SCROLL_BUTT_DEBOUNCE
+#    define SCROLL_BUTT_DEBOUNCE 100  // (ms) 			Time between scroll events
+#endif
+#ifndef PLOOPY_DPI_OPTIONS
+#    define PLOOPY_DPI_OPTIONS \
+        { 600, 900, 1200, 1600 }
+#    ifndef PLOOPY_DPI_DEFAULT
+#        define PLOOPY_DPI_DEFAULT 1
+#    endif
+#endif
+#ifndef PLOOPY_DPI_DEFAULT
+#    define PLOOPY_DPI_DEFAULT 0
+#endif
+#ifndef PLOOPY_DRAGSCROLL_DPI
+#    define PLOOPY_DRAGSCROLL_DPI 100  // Fixed-DPI Drag Scroll
+#endif
+#ifndef PLOOPY_DRAGSCROLL_MULTIPLIER
+#    define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75  // Variable-DPI Drag Scroll
+#endif
+
+keyboard_config_t keyboard_config;
+uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
+#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+
+// TODO: Implement libinput profiles
+// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html
+// Compile time accel selection
+// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC
+
+// Trackball State
+bool     is_scroll_clicked = false;
+uint16_t last_scroll       = 0;  // Previous confirmed wheel event
+uint16_t last_mid_click    = 0;  // Stops scrollwheel from being read if it was pressed;
+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;
+    }
+#ifdef MOUSEKEY_ENABLE
+    tap_code(clockwise ? KC_WH_U : KC_WH_D);
+#else
+    mouse_report_t mouse_report = pointing_device_get_report();
+    mouse_report.v              = clockwise ? 1 : -1;
+    pointing_device_set_report(mouse_report);
+    pointing_device_send();
+#endif
+    return true;
+}
+
+void encoder_init(void) { opt_encoder_init(); }
+
+bool encoder_read(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;
+    }
+
+    // Limit the number of scrolls per unit time.
+    if (timer_elapsed(last_scroll) < OPT_DEBOUNCE) {
+        return false;
+    }
+
+    // Don't scroll if the middle button is depressed.
+    if (is_scroll_clicked) {
+#ifndef IGNORE_SCROLL_CLICK
+        return false;
+#endif
+    }
+
+    last_scroll = timer_read();
+    uint16_t p1 = adc_read(OPT_ENC1_MUX);
+    uint16_t p2 = adc_read(OPT_ENC2_MUX);
+    if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2);
+
+    int dir = opt_encoder_handler(p1, p2);
+
+    if (dir == 0) return false;
+    ;
+    encoder_update_kb(0, dir == 1);
+    return true;
+}
+
+report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+    if (is_drag_scroll) {
+        mouse_report.h = mouse_report.x;
+#ifdef PLOOPY_DRAGSCROLL_INVERT
+        // Invert vertical scroll direction
+        mouse_report.v = -mouse_report.y;
+#else
+        mouse_report.v = mouse_report.y;
+#endif
+        mouse_report.x = 0;
+        mouse_report.y = 0;
+    }
+
+    return pointing_device_task_user(mouse_report);
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    // Update Timer to prevent accidental scrolls
+    if ((record->event.key.col == 1) && (record->event.key.row == 0)) {
+        last_mid_click    = timer_read();
+        is_scroll_clicked = record->event.pressed;
+    }
+
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+
+    if (keycode == DPI_CONFIG && record->event.pressed) {
+        keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
+        eeconfig_update_kb(keyboard_config.raw);
+        pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
+    }
+
+    if (keycode == DRAG_SCROLL) {
+#ifndef PLOOPY_DRAGSCROLL_MOMENTARY
+        if (record->event.pressed)
+#endif
+        {
+            is_drag_scroll ^= 1;
+        }
+#ifdef PLOOPY_DRAGSCROLL_FIXED
+        pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]);
+#else
+        pointing_device_set_cpi(is_drag_scroll ? (dpi_array[keyboard_config.dpi_config] * PLOOPY_DRAGSCROLL_MULTIPLIER) : dpi_array[keyboard_config.dpi_config]);
+#endif
+    }
+
+/* If Mousekeys is disabled, then use handle the mouse button
+ * keycodes.  This makes things simpler, and allows usage of
+ * the keycodes in a consistent manner.  But only do this if
+ * Mousekeys is not enable, so it's not handled twice.
+ */
+#ifndef MOUSEKEY_ENABLE
+    if (IS_MOUSEKEY_BUTTON(keycode)) {
+        report_mouse_t currentReport = pointing_device_get_report();
+        if (record->event.pressed) {
+            currentReport.buttons |= 1 << (keycode - KC_MS_BTN1);
+        } else {
+            currentReport.buttons &= ~(1 << (keycode - KC_MS_BTN1));
+        }
+        pointing_device_set_report(currentReport);
+        pointing_device_send();
+    }
+#endif
+
+    return true;
+}
+
+// Hardware Setup
+void keyboard_pre_init_kb(void) {
+    // debug_enable  = true;
+    // debug_matrix  = true;
+    // 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.
+     */
+#ifdef UNUSED_PINS
+    const pin_t unused_pins[] = UNUSED_PINS;
+
+    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
+        setPinOutput(unused_pins[i]);
+        writePinLow(unused_pins[i]);
+    }
+#endif
+
+    // This is the debug LED.
+#if defined(DEBUG_LED_PIN)
+    setPinOutput(DEBUG_LED_PIN);
+    writePin(DEBUG_LED_PIN, debug_enable);
+#endif
+
+    keyboard_pre_init_user();
+}
+
+void pointing_device_init_kb(void) { pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); }
+
+void eeconfig_init_kb(void) {
+    keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT;
+    eeconfig_update_kb(keyboard_config.raw);
+    eeconfig_init_user();
+}
+
+void matrix_init_kb(void) {
+    // is safe to just read DPI setting since matrix init
+    // comes before pointing device init.
+    keyboard_config.raw = eeconfig_read_kb();
+    if (keyboard_config.dpi_config > DPI_OPTION_SIZE) {
+        eeconfig_init_kb();
+    }
+    matrix_init_user();
+}
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
new file mode 100644
index 0000000000..168e894064
--- /dev/null
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -0,0 +1,60 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+#include "analog.h"
+#include "opt_encoder.h"
+#if defined(KEYBOARD_ploopyco_trackball_thumb_rev1_001)
+#    include "rev1_001.h"
+#endif
+
+// Sensor defs
+#define OPT_ENC1 F4
+#define OPT_ENC2 F0
+#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 {
+        uint8_t dpi_config;
+    };
+} keyboard_config_t;
+_Static_assert(sizeof(keyboard_config_t) == sizeof(uint32_t), "keyboard_config_t size mismatch compared to EEPROM area");
+
+extern keyboard_config_t keyboard_config;
+extern uint16_t          dpi_array[];
+
+enum ploopy_keycodes {
+#ifdef VIA_ENABLE
+    DPI_CONFIG = USER00,
+#else
+    DPI_CONFIG = SAFE_RANGE,
+#endif
+    DRAG_SCROLL,
+#ifdef VIA_ENABLE
+    PLOOPY_SAFE_RANGE = SAFE_RANGE,
+#else
+    PLOOPY_SAFE_RANGE,
+#endif
+};

From 357eeafd394c737917309e779890e59dd3a77ac5 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 26 Sep 2022 16:43:33 -0700
Subject: [PATCH 452/959] Keyquest Enclave-1: rename LAYOUT to LAYOUT_ortho_3x3
 (#18494)

* rename LAYOUT to LAYOUT_ortho_3x3

* info.json: correct maintainer value

Field is intended to reference the maintainer's GitHub username.
---
 keyboards/keyquest/enclave/info.json                | 9 ++++++---
 keyboards/keyquest/enclave/keymaps/default/keymap.c | 8 ++++----
 keyboards/keyquest/enclave/keymaps/via/keymap.c     | 8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/info.json
index da42594e70..5d062931c5 100644
--- a/keyboards/keyquest/enclave/info.json
+++ b/keyboards/keyquest/enclave/info.json
@@ -1,14 +1,17 @@
 {
     "manufacturer": "keyquest",
     "keyboard_name": "Enclave-1",
-    "maintainer": "the keyquest team",
+    "maintainer": "keyquesttech",
     "usb": {
         "vid": "0x1117",
         "pid": "0x0E0E",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_3x3"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_3x3": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0 },
                 { "matrix": [0, 1], "x": 1, "y": 0 },
@@ -24,4 +27,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/keyquest/enclave/keymaps/default/keymap.c b/keyboards/keyquest/enclave/keymaps/default/keymap.c
index d1008fac11..fb77341e8e 100644
--- a/keyboards/keyquest/enclave/keymaps/default/keymap.c
+++ b/keyboards/keyquest/enclave/keymaps/default/keymap.c
@@ -25,25 +25,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │ M7 │ M8 │ M9 │
      * └────┴────┴────┘
      */
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_3x3(
         KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,
         C(KC_C), C(KC_V), G(KC_V),
         KC_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN, MO(1)
     ),
 
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_3x3(
         _______, _______, _______,
         _______, _______, _______,
         _______, MO(2), _______
     ),
 
-    [2] = LAYOUT(
+    [2] = LAYOUT_ortho_3x3(
         _______, _______, _______,
         _______, _______, _______,
         MO(3), _______, _______
     ),
 
-    [3] = LAYOUT(
+    [3] = LAYOUT_ortho_3x3(
         RGB_TOG, RGB_MODE_PLAIN, RGB_MODE_BREATHE,
         RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_GRADIENT,
         _______, _______, _______
diff --git a/keyboards/keyquest/enclave/keymaps/via/keymap.c b/keyboards/keyquest/enclave/keymaps/via/keymap.c
index 766fbdc341..8419e8bd73 100644
--- a/keyboards/keyquest/enclave/keymaps/via/keymap.c
+++ b/keyboards/keyquest/enclave/keymaps/via/keymap.c
@@ -24,25 +24,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │ M7 │ M8 │ M9 │
      * └────┴────┴────┘
      */
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_3x3(
         KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,
         KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,
         _______, _______, _______
     ),
 
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_3x3(
         _______, _______, _______,
         _______, _______, _______,
         _______, _______, _______
     ),
 
-    [2] = LAYOUT(
+    [2] = LAYOUT_ortho_3x3(
         _______, _______, _______,
         _______, _______, _______,
         _______, _______, _______
     ),
 
-    [3] = LAYOUT(
+    [3] = LAYOUT_ortho_3x3(
         _______, _______, _______,
         _______, _______, _______,
         _______, _______, _______

From 045170a958820ca8294d6aec2db4ccb1129038dc Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 26 Sep 2022 18:53:31 -0700
Subject: [PATCH 453/959] Keyten Aperture Community Layout support (#18495)

* rename LAYOUT_all to LAYOUT_65_ansi_blocker_tsangan_split_bs

* enable Community Layouts support

* info.json: format whitespace

- apply four-space indent
- remove trailing whitespace

* info.json: correct maintainer value

Field is intended to reference the maintainer's GitHub username.
---
 keyboards/keyten/aperture/aperture.h          |   4 +-
 keyboards/keyten/aperture/info.json           | 153 +++++++++---------
 .../keyten/aperture/keymaps/default/keymap.c  |   4 +-
 .../keyten/aperture/keymaps/via/keymap.c      |   8 +-
 4 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/keyboards/keyten/aperture/aperture.h b/keyboards/keyten/aperture/aperture.h
index e547c91794..09851fb4b2 100644
--- a/keyboards/keyten/aperture/aperture.h
+++ b/keyboards/keyten/aperture/aperture.h
@@ -20,7 +20,7 @@
 
 #define XXX KC_NO
 
-/* LAYOUT_all
+/* LAYOUT_65_ansi_blocker_tsangan_split_bs
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
@@ -33,7 +33,7 @@
  * │40   │41 │42   │46                         │4A   │ │4C │4D │4E │
  * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
  */
-#define LAYOUT_all( \
+#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
 	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
 	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
 	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
diff --git a/keyboards/keyten/aperture/info.json b/keyboards/keyten/aperture/info.json
index e242337659..99b31751c9 100644
--- a/keyboards/keyten/aperture/info.json
+++ b/keyboards/keyten/aperture/info.json
@@ -1,89 +1,92 @@
 {
     "keyboard_name": "Aperture",
-	"manufacturer": "Bizunow",
+    "manufacturer": "Bizunow",
     "url": "",
-    "maintainer": "keyten",
-	"usb": {
+    "maintainer": "key10iq",
+    "usb": {
         "vid": "0xEB69",
         "pid": "0x6501",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+    },
+    "community_layouts": ["65_ansi_blocker_tsangan_split_bs"],
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
                 {"x":0, "y":0},
-				{"x":1, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				{"x":4, "y":0}, 
-				{"x":5, "y":0}, 
-				{"x":6, "y":0}, 
-				{"x":7, "y":0}, 
-				{"x":8, "y":0}, 
-				{"x":9, "y":0}, 
-				{"x":10, "y":0}, 
-				{"x":11, "y":0}, 
-				{"x":12, "y":0}, 
-				{"x":13, "y":0}, 
-				{"x":14, "y":0}, 
-				{"x":15, "y":0}, 
-				
-				{"x":0, "y":1, "w":1.5}, 
-				{"x":1.5, "y":1}, 
-				{"x":2.5, "y":1}, 
-				{"x":3.5, "y":1}, 
-				{"x":4.5, "y":1}, 
-				{"x":5.5, "y":1}, 
-				{"x":6.5, "y":1}, 
-				{"x":7.5, "y":1}, 
-				{"x":8.5, "y":1},
-				{"x":9.5, "y":1}, 
-				{"x":10.5, "y":1}, 
-				{"x":11.5, "y":1}, 
-				{"x":12.5, "y":1}, 
-				{"x":13.5, "y":1, "w":1.5}, 
-				{"x":15, "y":1}, 
-				
-				{"x":0, "y":2, "w":1.75}, 
-				{"x":1.75, "y":2}, 
-				{"x":2.75, "y":2}, 
-				{"x":3.75, "y":2}, 
-				{"x":4.75, "y":2}, 
-				{"x":5.75, "y":2}, 
-				{"x":6.75, "y":2}, 
-				{"x":7.75, "y":2}, 
-				{"x":8.75, "y":2}, 
-				{"x":9.75, "y":2}, 
-				{"x":10.75, "y":2}, 
-				{"x":11.75, "y":2}, 
-				{"x":12.75, "y":2, "w":2.25}, 
-				{"x":15, "y":2}, 
-				
-				{"x":0, "y":3, "w":2.25}, 
-				{"x":2.25, "y":3}, 
-				{"x":3.25, "y":3}, 
-				{"x":4.25, "y":3}, 
-				{"x":5.25, "y":3}, 
-				{"x":6.25, "y":3}, 
-				{"x":7.25, "y":3}, 
-				{"x":8.25, "y":3}, 
-				{"x":9.25, "y":3}, 
-				{"x":10.25, "y":3}, 
-				{"x":11.25, "y":3}, 
-				{"x":12.25, "y":3, "w":1.75}, 
-				{"x":14, "y":3},
-				{"x":15, "y":3}, 
-				
-				{"x":0, "y":4, "w":1.5}, 
-				{"x":1.5, "y":4}, 
-				{"x":2.5, "y":4, "w":1.5}, 
-				{"x":4, "y":4, "w":7}, 
-				{"x":11, "y":4, "w":1.5}, 
-				{"x":13, "y":4}, 
-				{"x":14, "y":4}, 
-				{"x":15, "y":4}
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
             ]
         }
-		
     }
 }
diff --git a/keyboards/keyten/aperture/keymaps/default/keymap.c b/keyboards/keyten/aperture/keymaps/default/keymap.c
index 732a9bbddc..f2cc99316d 100644
--- a/keyboards/keyten/aperture/keymaps/default/keymap.c
+++ b/keyboards/keyten/aperture/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_all(
+	[0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
 		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_HOME,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_DEL,  KC_PGDN,
 		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(1),
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
 
-	[1] = LAYOUT_all(
+	[1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keyten/aperture/keymaps/via/keymap.c b/keyboards/keyten/aperture/keymaps/via/keymap.c
index f72f5dbb42..187b664fc1 100644
--- a/keyboards/keyten/aperture/keymaps/via/keymap.c
+++ b/keyboards/keyten/aperture/keymaps/via/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_all(
+	[0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
 		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_HOME,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_DEL,  KC_PGDN,
 		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(1),
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
 
-	[1] = LAYOUT_all(
+	[1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 		_______, _______, _______,                            _______,                            _______,          _______, _______, _______),
 
-	[2] = LAYOUT_all(
+	[2] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 		_______, _______, _______,                            _______,                            _______,          _______, _______, _______),
 		
-	[3] = LAYOUT_all(
+	[3] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

From d909038b28c553f5eb0ecec74f58792155c4d49d Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 26 Sep 2022 20:49:15 -0700
Subject: [PATCH 454/959] Move Oneshot mod callbacks to after mods are set
 (#18101)

---
 quantum/action.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quantum/action.c b/quantum/action.c
index 6b2e9104e0..a1476131b9 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -403,9 +403,9 @@ void process_action(keyrecord_t *record, action_t action) {
 #        if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
                             } else if (tap_count == ONESHOT_TAP_TOGGLE) {
                                 dprint("MODS_TAP: Toggling oneshot");
+                                register_mods(mods);
                                 clear_oneshot_mods();
                                 set_oneshot_locked_mods(mods | get_oneshot_locked_mods());
-                                register_mods(mods);
 #        endif
                             } else {
                                 register_mods(mods | get_oneshot_mods());
@@ -418,16 +418,16 @@ void process_action(keyrecord_t *record, action_t action) {
                                 // Retain Oneshot mods
 #        if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
                                 if (mods & get_mods()) {
+                                    unregister_mods(mods);
                                     clear_oneshot_mods();
                                     set_oneshot_locked_mods(~mods & get_oneshot_locked_mods());
-                                    unregister_mods(mods);
                                 }
                             } else if (tap_count == ONESHOT_TAP_TOGGLE) {
                                 // Toggle Oneshot Layer
 #        endif
                             } else {
-                                clear_oneshot_mods();
                                 unregister_mods(mods);
+                                clear_oneshot_mods();
                             }
                         }
                     }

From fb400f2ac2c57fa0fc82ca803f6450b818bb32f9 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 26 Sep 2022 20:49:32 -0700
Subject: [PATCH 455/959] Enabling Pointing Device support in register code
 functions (#18363)

---
 keyboards/bastardkb/charybdis/charybdis.c         | 10 ----------
 .../handwired/tractyl_manuform/tractyl_manuform.c | 10 ----------
 keyboards/ploopyco/mouse/mouse.c                  | 15 ---------------
 keyboards/ploopyco/trackball/trackball.c          |  8 --------
 .../ploopyco/trackball_mini/trackball_mini.c      | 14 --------------
 quantum/action.c                                  |  8 ++++++++
 quantum/pointing_device/pointing_device.c         |  8 ++++++++
 quantum/pointing_device/pointing_device.h         |  1 +
 8 files changed, 17 insertions(+), 57 deletions(-)

diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c
index 60bca936e7..2000641f9a 100644
--- a/keyboards/bastardkb/charybdis/charybdis.c
+++ b/keyboards/bastardkb/charybdis/charybdis.c
@@ -303,16 +303,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
             break;
     }
 #        endif // !NO_CHARYBDIS_KEYCODES
-#        ifndef MOUSEKEY_ENABLE
-    // Simulate mouse keys if full support is not enabled (reduces firmware size
-    // while maintaining support for mouse keys).
-    if (IS_MOUSEKEY_BUTTON(keycode)) {
-        report_mouse_t mouse_report = pointing_device_get_report();
-        mouse_report.buttons        = pointing_device_handle_buttons(mouse_report.buttons, record->event.pressed, keycode - KC_MS_BTN1);
-        pointing_device_set_report(mouse_report);
-        pointing_device_send();
-    }
-#        endif // !MOUSEKEY_ENABLE
 #    endif     // POINTING_DEVICE_ENABLE
     if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < CHARYBDIS_SAFE_RANGE) || IS_MOUSEKEY(keycode)) {
         debug_charybdis_config_to_console(&g_charybdis_config);
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index d3e2e02975..7ded835a6e 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -308,16 +308,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
             break;
     }
 #    endif  // !NO_CHARYBDIS_KEYCODES
-#    ifndef MOUSEKEY_ENABLE
-    // Simulate mouse keys if full support is not enabled (reduces firmware size
-    // while maintaining support for mouse keys).
-    if (IS_MOUSEKEY_BUTTON(keycode)) {
-        report_mouse_t mouse_report = pointing_device_get_report();
-        mouse_report.buttons        = pointing_device_handle_buttons(mouse_report.buttons, record->event.pressed, keycode - KC_MS_BTN1);
-        pointing_device_set_report(mouse_report);
-        pointing_device_send();
-    }
-#    endif  // !MOUSEKEY_ENABLE
     return true;
 }
 
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index abcaa276d9..72535bf546 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -167,21 +167,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
 #endif
     }
 
-/* If Mousekeys is disabled, then use handle the mouse button
- * keycodes.  This makes things simpler, and allows usage of
- * the keycodes in a consistent manner.  But only do this if
- * Mousekeys is not enable, so it's not handled twice.
- */
-#ifndef MOUSEKEY_ENABLE
-    if (IS_MOUSEKEY_BUTTON(keycode)) {
-        report_mouse_t currentReport = pointing_device_get_report();
-        currentReport.buttons        = pointing_device_handle_buttons(currentReport.buttons, record->event.pressed, keycode - KC_MS_BTN1);
-        pointing_device_set_report(currentReport);
-        pointing_device_send();
-    }
-
-#endif
-
     return true;
 }
 
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c
index c96bf15cba..6dbb73e8f8 100644
--- a/keyboards/ploopyco/trackball/trackball.c
+++ b/keyboards/ploopyco/trackball/trackball.c
@@ -178,14 +178,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
  * the keycodes in a consistent manner.  But only do this if
  * Mousekeys is not enable, so it's not handled twice.
  */
-#ifndef MOUSEKEY_ENABLE
-    if (IS_MOUSEKEY_BUTTON(keycode)) {
-        report_mouse_t currentReport = pointing_device_get_report();
-        currentReport.buttons        = pointing_device_handle_buttons(currentReport.buttons, record->event.pressed, keycode - KC_MS_BTN1);
-        pointing_device_set_report(currentReport);
-        pointing_device_send();
-    }
-#endif
 
     return true;
 }
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.c b/keyboards/ploopyco/trackball_mini/trackball_mini.c
index dc3708fd51..1e8212814c 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.c
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.c
@@ -169,20 +169,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
         pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]);
     }
 
-/* If Mousekeys is disabled, then use handle the mouse button
- * keycodes.  This makes things simpler, and allows usage of
- * the keycodes in a consistent manner.  But only do this if
- * Mousekeys is not enable, so it's not handled twice.
- */
-#ifndef MOUSEKEY_ENABLE
-    if (IS_MOUSEKEY_BUTTON(keycode)) {
-        report_mouse_t currentReport = pointing_device_get_report();
-        currentReport.buttons        = pointing_device_handle_buttons(currentReport.buttons, record->event.pressed, keycode - KC_MS_BTN1);
-        pointing_device_set_report(currentReport);
-        pointing_device_send();
-    }
-#endif
-
     return true;
 }
 
diff --git a/quantum/action.c b/quantum/action.c
index a1476131b9..4f01acb96e 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -918,6 +918,10 @@ __attribute__((weak)) void register_code(uint8_t code) {
         mousekey_on(code);
         mousekey_send();
     }
+#elif defined(POINTING_DEVICE_ENABLE)
+    else if IS_MOUSEKEY (code) {
+        pointing_device_keycode_handler(code, true);
+    }
 #endif
 }
 
@@ -978,6 +982,10 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
         mousekey_off(code);
         mousekey_send();
     }
+#elif defined(POINTING_DEVICE_ENABLE)
+    else if IS_MOUSEKEY (code) {
+        pointing_device_keycode_handler(code, false);
+    }
 #endif
 }
 
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 6981f850d0..75bb5f81fc 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -22,6 +22,7 @@
 #ifdef MOUSEKEY_ENABLE
 #    include "mousekey.h"
 #endif
+
 #if (defined(POINTING_DEVICE_ROTATION_90) + defined(POINTING_DEVICE_ROTATION_180) + defined(POINTING_DEVICE_ROTATION_270)) > 1
 #    error More than one rotation selected.  This is not supported.
 #endif
@@ -479,3 +480,10 @@ __attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_m
     return pointing_device_combine_reports(left_report, right_report);
 }
 #endif
+
+__attribute__((weak)) void pointing_device_keycode_handler(uint16_t keycode, bool pressed) {
+    if IS_MOUSEKEY_BUTTON (keycode) {
+        local_mouse_report.buttons = pointing_device_handle_buttons(local_mouse_report.buttons, pressed, keycode - KC_MS_BTN1);
+        pointing_device_send();
+    }
+}
diff --git a/quantum/pointing_device/pointing_device.h b/quantum/pointing_device/pointing_device.h
index 27a3f95e32..d430e6cfa4 100644
--- a/quantum/pointing_device/pointing_device.h
+++ b/quantum/pointing_device/pointing_device.h
@@ -110,6 +110,7 @@ report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report);
 report_mouse_t pointing_device_task_user(report_mouse_t mouse_report);
 uint8_t        pointing_device_handle_buttons(uint8_t buttons, bool pressed, pointing_device_buttons_t button);
 report_mouse_t pointing_device_adjust_by_defines(report_mouse_t mouse_report);
+void           pointing_device_keycode_handler(uint16_t keycode, bool pressed);
 
 #if defined(SPLIT_POINTING_ENABLE)
 void     pointing_device_set_shared_report(report_mouse_t report);

From be8907d634ac8967de1ae2ac8346b845f738c9e6 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 27 Sep 2022 18:37:13 +1000
Subject: [PATCH 456/959] Further refactoring of joystick feature (#18437)

---
 docs/feature_joystick.md                      |  81 ++++------
 .../onekey/keymaps/joystick/keymap.c          |   6 +-
 .../synthlabs/solo/keymaps/gamepad/keymap.c   |   7 +-
 quantum/joystick.c                            |  98 ++++++++++-
 quantum/joystick.h                            |  28 +++-
 quantum/process_keycode/process_joystick.c    | 152 ++----------------
 quantum/process_keycode/process_joystick.h    |  21 ++-
 tmk_core/protocol/chibios/usb_main.c          |  54 +------
 tmk_core/protocol/host.c                      |  56 +++++++
 tmk_core/protocol/host_driver.h               |   1 +
 tmk_core/protocol/lufa/lufa.c                 |  51 +-----
 tmk_core/protocol/report.h                    |   2 +-
 12 files changed, 248 insertions(+), 309 deletions(-)

diff --git a/docs/feature_joystick.md b/docs/feature_joystick.md
index 2635298587..a82192bfe1 100644
--- a/docs/feature_joystick.md
+++ b/docs/feature_joystick.md
@@ -70,71 +70,44 @@ When the ADC reads 900 or higher, the returned axis value will be -127, whereas
 
 In this example, the first axis will be read from the `A4` pin while `B0` is set high and `A7` is set low, using `analogReadPin()`, whereas the second axis will not be read.
 
-In order to give a value to the second axis, you can do so in any customizable entry point: as an action, in `process_record_user()` or in `matrix_scan_user()`, or even in `joystick_task()` which is called even when no key has been pressed.
-You assign a value by writing to `joystick_status.axes[axis_index]` a signed 8-bit value (ranging from -127 to 127). Then it is necessary to assign the flag `JS_UPDATED` to `joystick_status.status` in order for an updated HID report to be sent.
+#### Virtual Axes
 
-The following example writes two axes based on keypad presses, with `KC_P5` as a precision modifier:
+To give a value to virtual axes, call `joystick_set_axis(axis, value)`.
+
+The following example adjusts two virtual axes (X and Y) based on keypad presses, with `KC_P5` as a precision modifier:
 
 ```c
-#ifdef ANALOG_JOYSTICK_ENABLE
-static uint8_t precision_val = 70;
-static uint8_t axesFlags = 0;
-enum axes {
-    Precision = 1,
-    Axis1High = 2,
-    Axis1Low = 4,
-    Axis2High = 8,
-    Axis2Low = 16
+joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+    [0] = JOYSTICK_AXIS_VIRTUAL, // x
+    [1] = JOYSTICK_AXIS_VIRTUAL  // y
 };
-#endif
+
+static bool precision = false;
+static uint16_t precision_mod = 64;
+static uint16_t axis_val = 127;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-#ifdef ANALOG_JOYSTICK_ENABLE
-        // virtual joystick
-#    if JOYSTICK_AXES_COUNT > 1
+    int16_t precision_val = axis_val;
+    if (precision) {
+        precision_val -= precision_mod;
+    }
+
+    switch (keycode) {
         case KC_P8:
-            if (record->event.pressed) {
-                axesFlags |= Axis2Low;
-            } else {
-                axesFlags &= ~Axis2Low;
-            }
-            joystick_status.status |= JS_UPDATED;
-            break;
+            joystick_set_axis(1, record->event.pressed ? -precision_val : 0);
+            return false;
         case KC_P2:
-            if (record->event.pressed) {
-                axesFlags |= Axis2High;
-            } else {
-                axesFlags &= ~Axis2High;
-            }
-            joystick_status.status |= JS_UPDATED;
-            break;
-#    endif
+            joystick_set_axis(1, record->event.pressed ? precision_val : 0);
+            return false;
         case KC_P4:
-            if (record->event.pressed) {
-                axesFlags |= Axis1Low;
-            } else {
-                axesFlags &= ~Axis1Low;
-            }
-            joystick_status.status |= JS_UPDATED;
-            break;
+            joystick_set_axis(0, record->event.pressed ? -precision_val : 0);
+            return false;
         case KC_P6:
-            if (record->event.pressed) {
-                axesFlags |= Axis1High;
-            } else {
-                axesFlags &= ~Axis1High;
-            }
-            joystick_status.status |= JS_UPDATED;
-            break;
+            joystick_set_axis(0, record->event.pressed ? precision_val : 0);
+            return false;
         case KC_P5:
-            if (record->event.pressed) {
-                axesFlags |= Precision;
-            } else {
-                axesFlags &= ~Precision;
-            }
-            joystick_status.status |= JS_UPDATED;
-            break;
-#endif
+            precision = record->event.pressed;
+            return false;
     }
     return true;
 }
diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index 7a2f138b28..c74707e931 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -10,11 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_scan_user() {
     int16_t val = (((uint32_t)timer_read() % 5000 - 2500) * 255) / 5000;
-
-    if (val != joystick_status.axes[1]) {
-        joystick_status.axes[1] = val;
-        joystick_status.status |= JS_UPDATED;
-    }
+    joystick_set_axis(1, val);
 }
 
 // Joystick config
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
index 3e55f346f1..8da2afc97a 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -3,8 +3,6 @@
 
 #include QMK_KEYBOARD_H
 
-#include "joystick.h"
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
                                     JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
@@ -24,11 +22,8 @@ joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     joystick_position += (clockwise ? 2 : -2) * (full_joystick_value / pulses_per_revolution);  // +2 and -2 are used, since +1.0 and -1.0 axis output refers to positions at half of a full rotation
+    joystick_set_axis(0, joystick_position);
 
-    if (joystick_position != joystick_status.axes[0]) {
-        joystick_status.axes[0] = joystick_position;
-        joystick_status.status |= JS_UPDATED;
-    }
     return true;
 }
 
diff --git a/quantum/joystick.c b/quantum/joystick.c
index 86b2c64036..d285dcdb5e 100644
--- a/quantum/joystick.c
+++ b/quantum/joystick.c
@@ -1,5 +1,24 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "joystick.h"
 
+#include "analog.h"
+#include "wait.h"
+
 // clang-format off
 joystick_t joystick_status = {
     .buttons = {0},
@@ -15,12 +34,13 @@ joystick_t joystick_status = {
 // array defining the reading of analog values for each axis
 __attribute__((weak)) joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {};
 
-// to be implemented in the hid protocol library
-void send_joystick_packet(joystick_t *joystick);
+__attribute__((weak)) void joystick_task(void) {
+    joystick_read_axes();
+}
 
 void joystick_flush(void) {
     if ((joystick_status.status & JS_UPDATED) > 0) {
-        send_joystick_packet(&joystick_status);
+        host_joystick_send(&joystick_status);
         joystick_status.status &= ~JS_UPDATED;
     }
 }
@@ -36,3 +56,75 @@ void unregister_joystick_button(uint8_t button) {
     joystick_status.status |= JS_UPDATED;
     joystick_flush();
 }
+
+int16_t joystick_read_axis(uint8_t axis) {
+    // disable pull-up resistor
+    writePinLow(joystick_axes[axis].input_pin);
+
+    // if pin was a pull-up input, we need to uncharge it by turning it low
+    // before making it a low input
+    setPinOutput(joystick_axes[axis].input_pin);
+
+    wait_us(10);
+
+    if (joystick_axes[axis].output_pin != JS_VIRTUAL_AXIS) {
+        setPinOutput(joystick_axes[axis].output_pin);
+        writePinHigh(joystick_axes[axis].output_pin);
+    }
+
+    if (joystick_axes[axis].ground_pin != JS_VIRTUAL_AXIS) {
+        setPinOutput(joystick_axes[axis].ground_pin);
+        writePinLow(joystick_axes[axis].ground_pin);
+    }
+
+    wait_us(10);
+
+    setPinInput(joystick_axes[axis].input_pin);
+
+    wait_us(10);
+
+#if defined(ANALOG_JOYSTICK_ENABLE) && (defined(__AVR__) || defined(PROTOCOL_CHIBIOS))
+    int16_t axis_val = analogReadPin(joystick_axes[axis].input_pin);
+#else
+    // default to resting position
+    int16_t axis_val = joystick_axes[axis].mid_digit;
+#endif
+
+    // test the converted value against the lower range
+    int32_t ref        = joystick_axes[axis].mid_digit;
+    int32_t range      = joystick_axes[axis].min_digit;
+    int32_t ranged_val = ((axis_val - ref) * -JOYSTICK_RESOLUTION) / (range - ref);
+
+    if (ranged_val > 0) {
+        // the value is in the higher range
+        range      = joystick_axes[axis].max_digit;
+        ranged_val = ((axis_val - ref) * JOYSTICK_RESOLUTION) / (range - ref);
+    }
+
+    // clamp the result in the valid range
+    ranged_val = ranged_val < -JOYSTICK_RESOLUTION ? -JOYSTICK_RESOLUTION : ranged_val;
+    ranged_val = ranged_val > JOYSTICK_RESOLUTION ? JOYSTICK_RESOLUTION : ranged_val;
+
+    return ranged_val;
+}
+
+void joystick_read_axes() {
+#if JOYSTICK_AXES_COUNT > 0
+    for (int i = 0; i < JOYSTICK_AXES_COUNT; ++i) {
+        if (joystick_axes[i].input_pin == JS_VIRTUAL_AXIS) {
+            continue;
+        }
+
+        joystick_set_axis(i, joystick_read_axis(i));
+    }
+
+    joystick_flush();
+#endif
+}
+
+void joystick_set_axis(uint8_t axis, int16_t value) {
+    if (value != joystick_status.axes[axis]) {
+        joystick_status.axes[axis] = value;
+        joystick_status.status |= JS_UPDATED;
+    }
+}
diff --git a/quantum/joystick.h b/quantum/joystick.h
index 5d81b14ef2..ee966fdb1a 100644
--- a/quantum/joystick.h
+++ b/quantum/joystick.h
@@ -1,3 +1,19 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <stdint.h>
@@ -54,7 +70,10 @@ typedef struct {
 
 extern joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT];
 
-enum joystick_status { JS_INITIALIZED = 1, JS_UPDATED = 2 };
+enum joystick_status {
+    JS_INITIALIZED = 1,
+    JS_UPDATED,
+};
 
 typedef struct {
     uint8_t buttons[(JOYSTICK_BUTTON_COUNT - 1) / 8 + 1];
@@ -65,7 +84,14 @@ typedef struct {
 
 extern joystick_t joystick_status;
 
+void joystick_task(void);
 void joystick_flush(void);
 
 void register_joystick_button(uint8_t button);
 void unregister_joystick_button(uint8_t button);
+
+int16_t joystick_read_axis(uint8_t axis);
+void    joystick_read_axes(void);
+void    joystick_set_axis(uint8_t axis, int16_t value);
+
+void host_joystick_send(joystick_t *joystick);
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index e867606074..af69d3aa05 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -1,10 +1,21 @@
-#include "joystick.h"
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "process_joystick.h"
-
-#include "analog.h"
-
-#include <string.h>
-#include <math.h>
+#include "joystick.h"
 
 bool process_joystick(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
@@ -18,132 +29,3 @@ bool process_joystick(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 }
-
-__attribute__((weak)) void joystick_task(void) {
-    if (process_joystick_analogread()) {
-        joystick_flush();
-    }
-}
-
-uint16_t savePinState(pin_t pin) {
-#ifdef __AVR__
-    uint8_t pinNumber = pin & 0xF;
-    return ((PORTx_ADDRESS(pin) >> pinNumber) & 0x1) << 1 | ((DDRx_ADDRESS(pin) >> pinNumber) & 0x1);
-#elif defined(PROTOCOL_CHIBIOS)
-    /*
-    The pin configuration is backed up in the following format :
- bit  15    9  8   7   6  5  4   3     2    1 0
-      |unused|ODR|IDR|PUPDR|OSPEEDR|OTYPER|MODER|
-    */
-    return ((PAL_PORT(pin)->MODER >> (2 * PAL_PAD(pin))) & 0x3) | (((PAL_PORT(pin)->OTYPER >> (1 * PAL_PAD(pin))) & 0x1) << 2) | (((PAL_PORT(pin)->OSPEEDR >> (2 * PAL_PAD(pin))) & 0x3) << 3) | (((PAL_PORT(pin)->PUPDR >> (2 * PAL_PAD(pin))) & 0x3) << 5) | (((PAL_PORT(pin)->IDR >> (1 * PAL_PAD(pin))) & 0x1) << 7) | (((PAL_PORT(pin)->ODR >> (1 * PAL_PAD(pin))) & 0x1) << 8);
-#else
-    return 0;
-#endif
-}
-
-void restorePinState(pin_t pin, uint16_t restoreState) {
-#if defined(PROTOCOL_LUFA)
-    uint8_t pinNumber  = pin & 0xF;
-    PORTx_ADDRESS(pin) = (PORTx_ADDRESS(pin) & ~_BV(pinNumber)) | (((restoreState >> 1) & 0x1) << pinNumber);
-    DDRx_ADDRESS(pin)  = (DDRx_ADDRESS(pin) & ~_BV(pinNumber)) | ((restoreState & 0x1) << pinNumber);
-#elif defined(PROTOCOL_CHIBIOS)
-    PAL_PORT(pin)->MODER   = (PAL_PORT(pin)->MODER & ~(0x3 << (2 * PAL_PAD(pin)))) | (restoreState & 0x3) << (2 * PAL_PAD(pin));
-    PAL_PORT(pin)->OTYPER  = (PAL_PORT(pin)->OTYPER & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 2) & 0x1) << (1 * PAL_PAD(pin));
-    PAL_PORT(pin)->OSPEEDR = (PAL_PORT(pin)->OSPEEDR & ~(0x3 << (2 * PAL_PAD(pin)))) | ((restoreState >> 3) & 0x3) << (2 * PAL_PAD(pin));
-    PAL_PORT(pin)->PUPDR   = (PAL_PORT(pin)->PUPDR & ~(0x3 << (2 * PAL_PAD(pin)))) | ((restoreState >> 5) & 0x3) << (2 * PAL_PAD(pin));
-    PAL_PORT(pin)->IDR     = (PAL_PORT(pin)->IDR & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 7) & 0x1) << (1 * PAL_PAD(pin));
-    PAL_PORT(pin)->ODR     = (PAL_PORT(pin)->ODR & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 8) & 0x1) << (1 * PAL_PAD(pin));
-#else
-    return;
-#endif
-}
-
-__attribute__((weak)) bool process_joystick_analogread() {
-    return process_joystick_analogread_quantum();
-}
-
-bool process_joystick_analogread_quantum() {
-#if JOYSTICK_AXES_COUNT > 0
-    for (int axis_index = 0; axis_index < JOYSTICK_AXES_COUNT; ++axis_index) {
-        if (joystick_axes[axis_index].input_pin == JS_VIRTUAL_AXIS) {
-            continue;
-        }
-
-        // save previous input pin status as well
-        uint16_t inputSavedState = savePinState(joystick_axes[axis_index].input_pin);
-
-        // disable pull-up resistor
-        writePinLow(joystick_axes[axis_index].input_pin);
-
-        // if pin was a pull-up input, we need to uncharge it by turning it low
-        // before making it a low input
-        setPinOutput(joystick_axes[axis_index].input_pin);
-
-        wait_us(10);
-
-        // save and apply output pin status
-        uint16_t outputSavedState = 0;
-        if (joystick_axes[axis_index].output_pin != JS_VIRTUAL_AXIS) {
-            // save previous output pin status
-            outputSavedState = savePinState(joystick_axes[axis_index].output_pin);
-
-            setPinOutput(joystick_axes[axis_index].output_pin);
-            writePinHigh(joystick_axes[axis_index].output_pin);
-        }
-
-        uint16_t groundSavedState = 0;
-        if (joystick_axes[axis_index].ground_pin != JS_VIRTUAL_AXIS) {
-            // save previous output pin status
-            groundSavedState = savePinState(joystick_axes[axis_index].ground_pin);
-
-            setPinOutput(joystick_axes[axis_index].ground_pin);
-            writePinLow(joystick_axes[axis_index].ground_pin);
-        }
-
-        wait_us(10);
-
-        setPinInput(joystick_axes[axis_index].input_pin);
-
-        wait_us(10);
-
-#    if defined(ANALOG_JOYSTICK_ENABLE) && (defined(__AVR__) || defined(PROTOCOL_CHIBIOS))
-        int16_t axis_val = analogReadPin(joystick_axes[axis_index].input_pin);
-#    else
-        // default to resting position
-        int16_t axis_val = joystick_axes[axis_index].mid_digit;
-#    endif
-
-        // test the converted value against the lower range
-        int32_t ref        = joystick_axes[axis_index].mid_digit;
-        int32_t range      = joystick_axes[axis_index].min_digit;
-        int32_t ranged_val = ((axis_val - ref) * -JOYSTICK_RESOLUTION) / (range - ref);
-
-        if (ranged_val > 0) {
-            // the value is in the higher range
-            range      = joystick_axes[axis_index].max_digit;
-            ranged_val = ((axis_val - ref) * JOYSTICK_RESOLUTION) / (range - ref);
-        }
-
-        // clamp the result in the valid range
-        ranged_val = ranged_val < -JOYSTICK_RESOLUTION ? -JOYSTICK_RESOLUTION : ranged_val;
-        ranged_val = ranged_val > JOYSTICK_RESOLUTION ? JOYSTICK_RESOLUTION : ranged_val;
-
-        if (ranged_val != joystick_status.axes[axis_index]) {
-            joystick_status.axes[axis_index] = ranged_val;
-            joystick_status.status |= JS_UPDATED;
-        }
-
-        // restore output, ground and input status
-        if (joystick_axes[axis_index].output_pin != JS_VIRTUAL_AXIS) {
-            restorePinState(joystick_axes[axis_index].output_pin, outputSavedState);
-        }
-        if (joystick_axes[axis_index].ground_pin != JS_VIRTUAL_AXIS) {
-            restorePinState(joystick_axes[axis_index].ground_pin, groundSavedState);
-        }
-
-        restorePinState(joystick_axes[axis_index].input_pin, inputSavedState);
-    }
-
-#endif
-    return true;
-}
diff --git a/quantum/process_keycode/process_joystick.h b/quantum/process_keycode/process_joystick.h
index 7a8b82913a..1fb8757708 100644
--- a/quantum/process_keycode/process_joystick.h
+++ b/quantum/process_keycode/process_joystick.h
@@ -1,11 +1,22 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <stdint.h>
 #include "quantum.h"
 
 bool process_joystick(uint16_t keycode, keyrecord_t *record);
-
-void joystick_task(void);
-
-bool process_joystick_analogread(void);
-bool process_joystick_analogread_quantum(void);
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 222a867e3c..7c44b87bc4 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -50,10 +50,6 @@
 extern keymap_config_t keymap_config;
 #endif
 
-#ifdef JOYSTICK_ENABLE
-#    include "joystick.h"
-#endif
-
 /* ---------------------------------------------------------
  *       Global interface variables and declarations
  * ---------------------------------------------------------
@@ -1151,59 +1147,15 @@ void virtser_task(void) {
 
 #endif
 
+void send_joystick(report_joystick_t *report) {
 #ifdef JOYSTICK_ENABLE
-
-void send_joystick_packet(joystick_t *joystick) {
-    static joystick_report_t rep;
-    rep = (joystick_report_t) {
-#    if JOYSTICK_AXES_COUNT > 0
-        .axes =
-        { joystick->axes[0],
-
-#        if JOYSTICK_AXES_COUNT >= 2
-          joystick->axes[1],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 3
-          joystick->axes[2],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 4
-          joystick->axes[3],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 5
-          joystick->axes[4],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 6
-          joystick->axes[5],
-#        endif
-        },
-#    endif // JOYSTICK_AXES_COUNT>0
-
-#    if JOYSTICK_BUTTON_COUNT > 0
-        .buttons = {
-            joystick->buttons[0],
-
-#        if JOYSTICK_BUTTON_COUNT > 8
-            joystick->buttons[1],
-#        endif
-#        if JOYSTICK_BUTTON_COUNT > 16
-            joystick->buttons[2],
-#        endif
-#        if JOYSTICK_BUTTON_COUNT > 24
-            joystick->buttons[3],
-#        endif
-        }
-#    endif // JOYSTICK_BUTTON_COUNT>0
-    };
-
-    // chnWrite(&drivers.joystick_driver.driver, (uint8_t *)&rep, sizeof(rep));
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
         osalSysUnlock();
         return;
     }
 
-    usbStartTransmitI(&USB_DRIVER, JOYSTICK_IN_EPNUM, (uint8_t *)&rep, sizeof(joystick_report_t));
+    usbStartTransmitI(&USB_DRIVER, JOYSTICK_IN_EPNUM, (uint8_t *)report, sizeof(report_joystick_t));
     osalSysUnlock();
-}
-
 #endif
+}
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 53854b94fb..99298ad6d6 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -24,6 +24,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "digitizer.h"
 
+#ifdef JOYSTICK_ENABLE
+#    include "joystick.h"
+#endif
+
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
 #    ifdef BLUETOOTH_BLUEFRUIT_LE
@@ -161,6 +165,58 @@ void host_consumer_send(uint16_t report) {
     (*driver->send_extra)(REPORT_ID_CONSUMER, report);
 }
 
+#ifdef JOYSTICK_ENABLE
+void host_joystick_send(joystick_t *joystick) {
+    if (!driver) return;
+
+    report_joystick_t report = {
+#    if JOYSTICK_AXES_COUNT > 0
+        .axes =
+            {
+                joystick->axes[0],
+
+#        if JOYSTICK_AXES_COUNT >= 2
+                joystick->axes[1],
+#        endif
+#        if JOYSTICK_AXES_COUNT >= 3
+                joystick->axes[2],
+#        endif
+#        if JOYSTICK_AXES_COUNT >= 4
+                joystick->axes[3],
+#        endif
+#        if JOYSTICK_AXES_COUNT >= 5
+                joystick->axes[4],
+#        endif
+#        if JOYSTICK_AXES_COUNT >= 6
+                joystick->axes[5],
+#        endif
+            },
+#    endif
+
+#    if JOYSTICK_BUTTON_COUNT > 0
+        .buttons =
+            {
+                joystick->buttons[0],
+
+#        if JOYSTICK_BUTTON_COUNT > 8
+                joystick->buttons[1],
+#        endif
+#        if JOYSTICK_BUTTON_COUNT > 16
+                joystick->buttons[2],
+#        endif
+#        if JOYSTICK_BUTTON_COUNT > 24
+                joystick->buttons[3],
+#        endif
+            },
+#    endif
+    };
+
+    send_joystick(&report);
+}
+#endif
+
+__attribute__((weak)) void send_joystick(report_joystick_t *report) {}
+
 void host_digitizer_send(digitizer_t *digitizer) {
     if (!driver) return;
 
diff --git a/tmk_core/protocol/host_driver.h b/tmk_core/protocol/host_driver.h
index 680d9727d3..ae6e40ddc3 100644
--- a/tmk_core/protocol/host_driver.h
+++ b/tmk_core/protocol/host_driver.h
@@ -31,4 +31,5 @@ typedef struct {
     void (*send_programmable_button)(uint32_t);
 } host_driver_t;
 
+void send_joystick(report_joystick_t *report);
 void send_digitizer(report_digitizer_t *report);
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 2a3f5fd883..6012d96fd5 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -77,10 +77,6 @@ extern keymap_config_t keymap_config;
 #    include "raw_hid.h"
 #endif
 
-#ifdef JOYSTICK_ENABLE
-#    include "joystick.h"
-#endif
-
 uint8_t keyboard_idle = 0;
 /* 0: Boot Protocol, 1: Report Protocol(default) */
 uint8_t        keyboard_protocol  = 1;
@@ -261,51 +257,10 @@ static void Console_Task(void) {
 /*******************************************************************************
  * Joystick
  ******************************************************************************/
+void send_joystick(report_joystick_t *report) {
 #ifdef JOYSTICK_ENABLE
-void send_joystick_packet(joystick_t *joystick) {
     uint8_t timeout = 255;
 
-    static joystick_report_t r;
-    r = (joystick_report_t) {
-#    if JOYSTICK_AXES_COUNT > 0
-        .axes =
-        { joystick->axes[0],
-
-#        if JOYSTICK_AXES_COUNT >= 2
-          joystick->axes[1],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 3
-          joystick->axes[2],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 4
-          joystick->axes[3],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 5
-          joystick->axes[4],
-#        endif
-#        if JOYSTICK_AXES_COUNT >= 6
-          joystick->axes[5],
-#        endif
-        },
-#    endif // JOYSTICK_AXES_COUNT>0
-
-#    if JOYSTICK_BUTTON_COUNT > 0
-        .buttons = {
-            joystick->buttons[0],
-
-#        if JOYSTICK_BUTTON_COUNT > 8
-            joystick->buttons[1],
-#        endif
-#        if JOYSTICK_BUTTON_COUNT > 16
-            joystick->buttons[2],
-#        endif
-#        if JOYSTICK_BUTTON_COUNT > 24
-            joystick->buttons[3],
-#        endif
-        }
-#    endif // JOYSTICK_BUTTON_COUNT>0
-    };
-
     /* Select the Joystick Report Endpoint */
     Endpoint_SelectEndpoint(JOYSTICK_IN_EPNUM);
 
@@ -315,12 +270,12 @@ void send_joystick_packet(joystick_t *joystick) {
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* Write Joystick Report Data */
-    Endpoint_Write_Stream_LE(&r, sizeof(joystick_report_t), NULL);
+    Endpoint_Write_Stream_LE(report, sizeof(report_joystick_t), NULL);
 
     /* Finalize the stream transfer to send the last packet */
     Endpoint_ClearIN();
-}
 #endif
+}
 
 /*******************************************************************************
  * USB Events
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index b4dbf92a8f..8bc4a57c0c 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -245,7 +245,7 @@ typedef struct {
 #if JOYSTICK_BUTTON_COUNT > 0
     uint8_t buttons[(JOYSTICK_BUTTON_COUNT - 1) / 8 + 1];
 #endif
-} __attribute__((packed)) joystick_report_t;
+} __attribute__((packed)) report_joystick_t;
 
 /* keycode to system usage */
 static inline uint16_t KEYCODE2SYSTEM(uint8_t key) {

From e021fe90b1226eabc618cd5d42acfd2ba7a674fa Mon Sep 17 00:00:00 2001
From: Zicodia <82699172+Z1codia@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:16:03 -0500
Subject: [PATCH 457/959] [Keyboard] Add TKLFRLNRLMLAO (#18487)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/zicodia/tklfrlnrlmlao/config.h      | 20 +++++
 keyboards/zicodia/tklfrlnrlmlao/info.json     | 36 +++++++++
 .../tklfrlnrlmlao/keymaps/default/keymap.c    | 79 ++++++++++++++++++
 .../tklfrlnrlmlao/keymaps/via/keymap.c        | 80 +++++++++++++++++++
 .../tklfrlnrlmlao/keymaps/via/rules.mk        |  1 +
 keyboards/zicodia/tklfrlnrlmlao/readme.md     | 38 +++++++++
 keyboards/zicodia/tklfrlnrlmlao/rules.mk      |  1 +
 7 files changed, 255 insertions(+)
 create mode 100644 keyboards/zicodia/tklfrlnrlmlao/config.h
 create mode 100644 keyboards/zicodia/tklfrlnrlmlao/info.json
 create mode 100644 keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
 create mode 100644 keyboards/zicodia/tklfrlnrlmlao/keymaps/via/keymap.c
 create mode 100644 keyboards/zicodia/tklfrlnrlmlao/keymaps/via/rules.mk
 create mode 100644 keyboards/zicodia/tklfrlnrlmlao/readme.md
 create mode 100644 keyboards/zicodia/tklfrlnrlmlao/rules.mk

diff --git a/keyboards/zicodia/tklfrlnrlmlao/config.h b/keyboards/zicodia/tklfrlnrlmlao/config.h
new file mode 100644
index 0000000000..58f2df252b
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/config.h
@@ -0,0 +1,20 @@
+// Copyright 2022 Zicodia (@Zicodia)
+// 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/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/info.json
new file mode 100644
index 0000000000..fcecd42620
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/info.json
@@ -0,0 +1,36 @@
+{
+    "manufacturer": "Zicodia",
+    "keyboard_name": "TKLFRLNRLMLAO",
+    "maintainer": "Zicodia",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F0", "F5", "C7", "F6", "F7", "B6", "D6", "D4"],
+        "rows": ["D5", "B5", "B4", "D7"]
+    },
+    "usb": {
+        "vid": "0x4A4C",
+        "pid": "0x0000",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/Zicodia",
+    "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.5, "y": 0  }, { "matrix": [0, 5], "x": 5.5, "y": 0  }, { "matrix": [0, 6], "x": 6.5, "y": 0            }, { "matrix": [0, 7], "x": 7.75, "y": 0    }, { "matrix": [0, 8], "x": 8.75, "y": 0    }, { "matrix": [0, 9], "x": 9.75, "y": 0 }, 
+                { "matrix": [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": 0, "y": 1.25 }, { "matrix": [1, 5], "x": 0, "y": 1.25 }, { "matrix": [1, 6], "x": 0, "y": 1.25, "w": 1.5 }, { "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": [2, 0], "x": 0, "y": 2.25, "w": 1.5  }, { "matrix": [2, 1], "x": 1, "y": 2.25 }, { "matrix": [2, 2], "x": 2, "y": 2.25 }, { "matrix": [2, 3], "x": 3, "y": 2.25         }, { "matrix": [2, 4], "x": 0, "y": 2.25 }, { "matrix": [2, 5], "x": 0, "y": 2.25 }, { "matrix": [2, 6], "x": 0, "y": 2.25           },                                             { "matrix": [2, 8], "x": 8.75, "y": 2.25 },
+                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1, "y": 3.25 },                                          { "matrix": [3, 3], "x": 3, "y": 3.25, "w": 3 },                                          { "matrix": [3, 5], "x": 0, "y": 3.25 }, { "matrix": [3, 6], "x": 0, "y": 3.25, "w":1.25 }, { "matrix": [3, 7], "x": 0, "y": 3.25    }, { "matrix": [3, 8], "x": 7.75, "y": 3.25 }, { "matrix": [3, 9], "x": 8.75, "y": 3.25 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c b/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
new file mode 100644
index 0000000000..12edec5bdb
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Zicodia (@Zicodia)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ Q │| W │ E │ R │| T │ Y │ U │ | I │ O │ P │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | K │ L │ENT│
+     * │ A │ S │ D │ F | G │ H │ J   │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │Z(SF)│ X │ C │ V │ B │ N │ M │     │UP │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │CTRL│ALT│ SPACE     │WIN│MO1 │ |LFT│DWN│RT │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+		KC_Q,        KC_W,      KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P, 
+		KC_A,        KC_S,      KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_ENT, 
+		SFT_T(KC_Z), KC_X,      KC_C,       KC_V,       KC_B,       KC_N,       KC_M,                   KC_UP, 
+		KC_LCTL,     KC_LALT,               KC_SPC,                 KC_RGUI,    MO(1),      KC_LEFT,    KC_DOWN,    KC_RGHT
+    )
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ 1 │| 2 │ 3 │ 4 │| 5 │ 6 │ 7 │ | 8 │ 9 │ 0 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | [ │ ] │ \ │
+     * │TAB│   │   │   | - │ = │BSPC │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │ ; │ ' │     │SFT│
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │MO2│    │ | , │ . │ / │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT_all(
+		KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0, 
+		KC_TAB,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MINS,    KC_EQL,     KC_BSPC,    KC_LBRC,    KC_RBRC,    KC_BSLS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_SCLN,    KC_QUOT,                KC_RSFT, 
+		KC_TRNS,    KC_TRNS,                KC_TRNS,                MO(2),      KC_TRNS,    KC_COMM,    KC_DOT,     KC_SLSH
+    )
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ESC│|F1 │F2 │F3 │|F4 │F5 │F6 │ |F7 │F8 │F9 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |F10│F11│F12│
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT_all(
+		KC_ESC,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    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
+    )
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │   │|   │   │   │|   │   │   │ |   │   │   │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |   │   │   │
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [4] = LAYOUT_all(
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                KC_TRNS, 
+		KC_TRNS,    KC_TRNS,                KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
+    )
+};
diff --git a/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/keymap.c b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a0e27e9208
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/keymap.c
@@ -0,0 +1,80 @@
+// Copyright 2022 Zicodia (@Zicodia)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  
+    /* ANSI style
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ Q │| W │ E │ R │| T │ Y │ U │ | I │ O │ P │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | K │ L │ENT│
+     * │ A │ S │ D │ F | G │ H │ J   │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │Z(SF)│ X │ C │ V │ B │ N │ M │     │UP │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │CTRL│ALT│ SPACE     │WIN│MO1 │ |LFT│DWN│RT │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+		KC_Q,        KC_W,      KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P, 
+		KC_A,        KC_S,      KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_ENT, 
+		SFT_T(KC_Z), KC_X,      KC_C,       KC_V,       KC_B,       KC_N,       KC_M,                   KC_UP, 
+		KC_LCTL,     KC_LALT,               KC_SPC,                 KC_RGUI,    MO(1),      KC_LEFT,    KC_DOWN,    KC_RGHT
+    ),
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ 1 │| 2 │ 3 │ 4 │| 5 │ 6 │ 7 │ | 8 │ 9 │ 0 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | [ │ ] │ \ │
+     * │TAB│   │   │   | - │ = │BSPC │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │ ; │ ' │     │SFT│
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │MO2│    │ | , │ . │ / │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT_all(
+		KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0, 
+		KC_TAB,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MINS,    KC_EQL,     KC_BSPC,    KC_LBRC,    KC_RBRC,    KC_BSLS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_SCLN,    KC_QUOT,                KC_RSFT, 
+		KC_TRNS,    KC_TRNS,                KC_TRNS,                MO(2),      KC_TRNS,    KC_COMM,    KC_DOT,     KC_SLSH
+    ),
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ESC│|F1 │F2 │F3 │|F4 │F5 │F6 │ |F7 │F8 │F9 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |F10│F11│F12│
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT_all(
+		KC_ESC,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    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
+    ),
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │   │|   │   │   │|   │   │   │ |   │   │   │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |   │   │   │
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [3] = LAYOUT_all(
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                KC_TRNS, 
+		KC_TRNS,    KC_TRNS,                KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
+    )
+};
diff --git a/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/rules.mk b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/zicodia/tklfrlnrlmlao/readme.md b/keyboards/zicodia/tklfrlnrlmlao/readme.md
new file mode 100644
index 0000000000..393503c550
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/readme.md
@@ -0,0 +1,38 @@
+# TKLFRLNRLMLAO "LMAO"
+
+![TKLFRLNRLMLAO "LMAO"](https://i.imgur.com/rmHpYEyh.jpeg)
+
+A "totally normal" TKL.
+
+This keyboard is a unique 40% keyboard, designed with form in mind over function. Purely designed to immitate the TKL layout in a small form factor.
+
+What the name means:
+- TKL = Ten-Key-Less
+- FRL = Function-Row-Less
+- NRL = Number-Row-Less
+- ML = Modifier-less
+- AO = Alpha-Only
+
+Additionally, a WKL (Windows-Key-Less) option is available, which results in the variation WKLTKLFRLNRLMLAO "WLMAO"
+
+* Keyboard Maintainer: [Zicodia](https://github.com/Zicodia)
+* Hardware Supported: TKLFRLNRLMLAO PCB
+* Hardware Availability: TBA
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zicodia/tklfrlnrlmlao:default
+
+Flashing example for this keyboard:
+
+    make zicodia/tklfrlnrlmlao:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/zicodia/tklfrlnrlmlao/rules.mk b/keyboards/zicodia/tklfrlnrlmlao/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From cad1547ee63165b8c140c44cc0f4a2106ce21001 Mon Sep 17 00:00:00 2001
From: Arturo Avila <69410272+ADPenrose@users.noreply.github.com>
Date: Tue, 27 Sep 2022 04:16:23 -0500
Subject: [PATCH 458/959] [Keyboard] Add Obi keyboard (#18489)

---
 keyboards/adpenrose/obi/config.h              | 68 ++++++++++++++++++
 keyboards/adpenrose/obi/info.json             | 70 +++++++++++++++++++
 .../adpenrose/obi/keymaps/default/keymap.c    | 41 +++++++++++
 .../adpenrose/obi/keymaps/default/rules.mk    |  1 +
 keyboards/adpenrose/obi/keymaps/via/keymap.c  | 41 +++++++++++
 keyboards/adpenrose/obi/keymaps/via/rules.mk  |  3 +
 keyboards/adpenrose/obi/obi.c                 |  5 ++
 keyboards/adpenrose/obi/obi.h                 | 26 +++++++
 keyboards/adpenrose/obi/readme.md             | 29 ++++++++
 keyboards/adpenrose/obi/rules.mk              | 19 +++++
 10 files changed, 303 insertions(+)
 create mode 100644 keyboards/adpenrose/obi/config.h
 create mode 100644 keyboards/adpenrose/obi/info.json
 create mode 100644 keyboards/adpenrose/obi/keymaps/default/keymap.c
 create mode 100644 keyboards/adpenrose/obi/keymaps/default/rules.mk
 create mode 100644 keyboards/adpenrose/obi/keymaps/via/keymap.c
 create mode 100644 keyboards/adpenrose/obi/keymaps/via/rules.mk
 create mode 100644 keyboards/adpenrose/obi/obi.c
 create mode 100644 keyboards/adpenrose/obi/obi.h
 create mode 100644 keyboards/adpenrose/obi/readme.md
 create mode 100644 keyboards/adpenrose/obi/rules.mk

diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h
new file mode 100644
index 0000000000..c1c5ea9f30
--- /dev/null
+++ b/keyboards/adpenrose/obi/config.h
@@ -0,0 +1,68 @@
+// Copyright 2022 Arturo Avila (@ADPenrose)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F4, F5, C7, C6 }
+#define MATRIX_COL_PINS { F6, B7, B6, B4, B5, D6, D5, D3, D7, D4, D2, D1, D0, B0 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*Rotary encoder - set the resolution fitting your encoder.
+Most will need a value of 4. If 1 encoder click results in 2 keycodes sent
+increase the value. If you need 2 clicks for 1 keycode, decrease*/
+#define ENCODER_RESOLUTION 4
+#define ENCODERS_PAD_A { F1 }
+#define ENCODERS_PAD_B { F0 }
+#define TAP_CODE_DELAY 10
+
+/* Underglow options: */
+#define RGB_DI_PIN F7
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 16
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== 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 5
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
new file mode 100644
index 0000000000..b1afa0bc0d
--- /dev/null
+++ b/keyboards/adpenrose/obi/info.json
@@ -0,0 +1,70 @@
+{
+    "manufacturer": "ADPenrose",
+    "keyboard_name": "Obi",
+    "maintainer": "Arturo Avila",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0x4450"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"Tab", "x":1.25, "y":0, "w":1.5},
+                {"label":"Q", "x":2.75, "y":0},
+                {"label":"W", "x":3.75, "y":0},
+                {"label":"E", "x":4.75, "y":0},
+                {"label":"R", "x":5.75, "y":0},
+                {"label":"T", "x":6.75, "y":0},
+                {"label":"Y", "x":7.75, "y":0},
+                {"label":"U", "x":8.75, "y":0},
+                {"label":"I", "x":9.75, "y":0},
+                {"label":"O", "x":10.75, "y":0},
+                {"label":"P", "x":11.75, "y":0},
+                {"label":"{", "x":12.75, "y":0},
+                {"label":"Backspace", "x":13.75, "y":0, "w":1.5},
+
+                {"label":"F2", "x":0, "y":1},
+                {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75},
+                {"label":"A", "x":3, "y":1}, 
+                {"label":"S", "x":4, "y":1},
+                {"label":"D", "x":5, "y":1},
+                {"label":"F", "x":6, "y":1},
+                {"label":"G", "x":7, "y":1},
+                {"label":"H", "x":8, "y":1},
+                {"label":"J", "x":9, "y":1},
+                {"label":"K", "x":10, "y":1},
+                {"label":"L", "x":11, "y":1},
+                {"label":":", "x":12, "y":1},
+                {"label":"Enter", "x":13, "y":1, "w":2.25},
+                
+                {"label":"F3", "x":0, "y":2},
+                {"label":"Shift", "x":1.25, "y":2, "w":2.25},
+                {"label":"Z", "x":3.5, "y":2},
+                {"label":"X", "x":4.5, "y":2},
+                {"label":"C", "x":5.5, "y":2},
+                {"label":"V", "x":6.5, "y":2},
+                {"label":"B", "x":7.5, "y":2},
+                {"label":"N", "x":8.5, "y":2},
+                {"label":"M", "x":9.5, "y":2},
+                {"label":"<", "x":10.5, "y":2},
+                {"label":"Shift", "x":11.5, "y":2, "w":1.75},
+                {"label":"Up", "x":13.25, "y":2},
+                {"label":"?", "x":14.25, "y":2},
+                
+                {"label":"F4", "x":0, "y":3},
+                {"label":"Ctrl", "x":1.25, "y":3, "w":1.25},
+                {"label":"Win", "x":2.5, "y":3},
+                {"label":"Alt", "x":3.5, "y":3, "w":1.25},
+                {"label":"Spacebar", "x":4.75, "y":3, "w":2.25},
+                {"label":"Spacebar", "x":7, "y":3, "w":1.25},
+                {"label":"Spacebar", "x":8.25, "y":3, "w":2.75},
+                {"label":"Alt", "x":11, "y":3, "w":1.25},
+                {"label":"Left", "x":12.25, "y":3},
+                {"label":"Down", "x":13.25, "y":3},
+                {"label":"Right", "x":14.25, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/adpenrose/obi/keymaps/default/keymap.c b/keyboards/adpenrose/obi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6d55dc73fb
--- /dev/null
+++ b/keyboards/adpenrose/obi/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2022 Arturo Avila (@ADPenrose)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_all(
+        KC_ESC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC,
+        KC_MUTE, 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_VOLU, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT, KC_UP, KC_SLSH,
+        KC_VOLD, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN,  KC_RIGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_DEL, 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_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_RBRC,
+        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
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/adpenrose/obi/keymaps/default/rules.mk b/keyboards/adpenrose/obi/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/adpenrose/obi/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/obi/keymaps/via/keymap.c b/keyboards/adpenrose/obi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..efede949b8
--- /dev/null
+++ b/keyboards/adpenrose/obi/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2022 Arturo Avila (@ADPenrose)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_all(
+        KC_ESC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC,
+        KC_MUTE, 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_VOLU, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT, KC_UP, KC_SLSH,
+        KC_VOLD, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN,  KC_RIGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_DEL, 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_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_RBRC,
+        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
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/adpenrose/obi/keymaps/via/rules.mk b/keyboards/adpenrose/obi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1189f4ad19
--- /dev/null
+++ b/keyboards/adpenrose/obi/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/obi/obi.c b/keyboards/adpenrose/obi/obi.c
new file mode 100644
index 0000000000..2efd4eba47
--- /dev/null
+++ b/keyboards/adpenrose/obi/obi.c
@@ -0,0 +1,5 @@
+// Copyright 2022 Arturo Avila (@ADPenrose)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "obi.h"
+
diff --git a/keyboards/adpenrose/obi/obi.h b/keyboards/adpenrose/obi/obi.h
new file mode 100644
index 0000000000..09bf9b29fc
--- /dev/null
+++ b/keyboards/adpenrose/obi/obi.h
@@ -0,0 +1,26 @@
+// Copyright 2022 Arturo Avila (@ADPenrose)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,      K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,      K2C, K2D, \
+    K30, K31, K32, K33,      K35, K36, K37,           K3A, K3B, K3C, K3D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_NO, K2C, K2D }, \
+    { K30, K31, K32, K33, KC_NO, K35, K36, K37, KC_NO, KC_NO, K3A, K3B, K3C, K3D } \
+}
diff --git a/keyboards/adpenrose/obi/readme.md b/keyboards/adpenrose/obi/readme.md
new file mode 100644
index 0000000000..59c0b796ae
--- /dev/null
+++ b/keyboards/adpenrose/obi/readme.md
@@ -0,0 +1,29 @@
+# Obi
+
+![obi](https://i.imgur.com/btQPol1h.png)
+
+A 40% keyboard inspired by the TMOv2 and Nightmare boards.
+
+# General info
+
+* Keyboard Maintainer: [Arturo Avila](https://github.com/ADPenrose)
+* Hardware Supported: Obi v1 PCB
+* Hardware Availability: [Arturo Avila](https://github.com/ADPenrose)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make adpenrose/obi:default
+
+Flashing example for this keyboard:
+
+    make adpenrose/obi:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/adpenrose/obi/rules.mk b/keyboards/adpenrose/obi/rules.mk
new file mode 100644
index 0000000000..94ce0d7a66
--- /dev/null
+++ b/keyboards/adpenrose/obi/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes		    # Encoder functionality

From e1980726badbbe77fa1ff8be74334b7a993a955d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 27 Sep 2022 02:16:35 -0700
Subject: [PATCH 459/959] Linworks FAve 84H Layout Refactor (#18496)

---
 keyboards/linworks/fave84h/fave84h.h          |  55 ++++-
 keyboards/linworks/fave84h/info.json          | 195 +++++++++++++++++-
 .../linworks/fave84h/keymaps/default/keymap.c |  28 +--
 .../linworks/fave84h/keymaps/via/keymap.c     |  56 ++---
 4 files changed, 280 insertions(+), 54 deletions(-)

diff --git a/keyboards/linworks/fave84h/fave84h.h b/keyboards/linworks/fave84h/fave84h.h
index 39f85c159c..1d97f97236 100644
--- a/keyboards/linworks/fave84h/fave84h.h
+++ b/keyboards/linworks/fave84h/fave84h.h
@@ -16,19 +16,54 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
+#define ___ KC_NO
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐   ┌───────┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │ │1E │1F │1G │   │1D     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤   └───────┘
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+ * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4C        │     │4F │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+ * │50   │51 │52   │55                         │5A   │5C │5D   │ │5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+ */
+
 /* FAve 84H Keymap Definitions */
-#define LAYOUT( \
+#define LAYOUT_tkl_ansi_tsangan_split_bs( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C,  K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                      \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,            K4F,      \
+    K50, K51, K52,                K55,                     K5A, K5C, K5D,       K5E, K5F, K5G  \
+) { \
+    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, ___, K4C, ___, ___, K4F, ___ }, \
+    { K50, K51, K52, ___, ___, K55, ___, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+#define LAYOUT_tkl_ansi_tsangan( \
     K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,  K1E, K1F, K1G, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                 \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,            K4F,      \
-    K50, K51, K52,           K55,                     K5A,      K5C, K5D,  K5E, K5F, K5G  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                 \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,       K4F,      \
+    K50, K51, K52,                K55,                     K5A, K5C, K5D,  K5E, K5F, K5G  \
 ) { \
-    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09,   K0A, K0B,   K0C, K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19,   K1A, K1B,   K1C, K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29,   K2A, K2B,   K2C, K2D,   K2E,   K2F,   K2G   }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39,   K3A, K3B,   K3C, K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49,   K4A, KC_NO, K4C, KC_NO, KC_NO, K4F,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, KC_NO, K5A, KC_NO, K5C, K5D,   K5E,   K5F,   K5G   }  \
+    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___, ___, ___ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, ___, K4C, ___, ___, K4F, ___ }, \
+    { K50, K51, K52, ___, ___, K55, ___, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
 }
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
index 04b5cabd31..4447c404f8 100644
--- a/keyboards/linworks/fave84h/info.json
+++ b/keyboards/linworks/fave84h/info.json
@@ -8,9 +8,200 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "community_layouts": [
+        "tkl_ansi_tsangan"
+    ],
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Fn", "x":12.5, "y":5.25}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_ansi_tsangan_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Delete", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/linworks/fave84h/keymaps/default/keymap.c b/keyboards/linworks/fave84h/keymaps/default/keymap.c
index 9f7b1b40ef..72234a44f8 100644
--- a/keyboards/linworks/fave84h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/default/keymap.c
@@ -21,22 +21,22 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = 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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,        
-        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                                 KC_RALT,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
-        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_AUDIO_VOL_UP,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    [_LAYER1] = LAYOUT_tkl_ansi_tsangan_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
+        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_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/linworks/fave84h/keymaps/via/keymap.c b/keyboards/linworks/fave84h/keymaps/via/keymap.c
index c319a5c858..85238100d1 100644
--- a/keyboards/linworks/fave84h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/via/keymap.c
@@ -23,40 +23,40 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = 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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,        
-        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                                 KC_RALT,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
-        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_AUDIO_VOL_UP,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    [_LAYER1] = LAYOUT_tkl_ansi_tsangan_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
+        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_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
-    [_LAYER2] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    [_LAYER2] = LAYOUT_tkl_ansi_tsangan_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
     ),
 
-    [_LAYER3] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    [_LAYER3] = LAYOUT_tkl_ansi_tsangan_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
     )
 };
 

From 492c34f8d06517348f1df865c220bb002a775149 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 27 Sep 2022 02:16:51 -0700
Subject: [PATCH 460/959] Linworks FAve 87H Layout Refactor (#18497)

---
 keyboards/linworks/fave87h/fave87h.h          |  55 ++++-
 keyboards/linworks/fave87h/info.json          | 200 +++++++++++++++++-
 .../linworks/fave87h/keymaps/default/keymap.c |  28 +--
 .../linworks/fave87h/keymaps/via/keymap.c     |  56 ++---
 4 files changed, 285 insertions(+), 54 deletions(-)

diff --git a/keyboards/linworks/fave87h/fave87h.h b/keyboards/linworks/fave87h/fave87h.h
index 748dae3ebc..30e9fc7ac5 100644
--- a/keyboards/linworks/fave87h/fave87h.h
+++ b/keyboards/linworks/fave87h/fave87h.h
@@ -16,19 +16,54 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
+#define ___ KC_NO
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐   ┌───────┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │ │1E │1F │1G │   │1D     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤   └───────┘
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+ * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4C        │     │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+ * │50  │51  │52  │55                      │59  │5A  │5C  │5D  │ │5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ */
+
 /* FAve 87H Keymap Definitions */
-#define LAYOUT( \
+#define LAYOUT_tkl_ansi( \
     K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,  K1E, K1F, K1G, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                 \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,            K4F,      \
-    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D,  K5E, K5F, K5G  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                 \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,       K4F,      \
+    K50, K51, K52,                K55,                K59, K5A, K5C, K5D,  K5E, K5F, K5G  \
 ) { \
-    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C, K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C, K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C, K2D,   K2E,   K2F,   K2G   }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   K3C, K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49, K4A, KC_NO, K4C, KC_NO, KC_NO, K4F,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59, K5A, KC_NO, K5C, K5D,   K5E,   K5F,   K5G   }  \
+    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___, ___, ___ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, ___, K4C, ___, ___, K4F, ___ }, \
+    { K50, K51, K52, ___, ___, K55, ___, ___, ___, K59, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+#define LAYOUT_tkl_ansi_split_bs( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C,  K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                      \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,            K4F,      \
+    K50, K51, K52,                K55,                K59, K5A, K5C, K5D,       K5E, K5F, K5G  \
+) { \
+    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, ___, K4C, ___, ___, K4F, ___ }, \
+    { K50, K51, K52, ___, ___, K55, ___, ___, ___, K59, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
 }
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index 4035dde5ee..b6a836e0ec 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -8,9 +8,205 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_ansi_split_bs"
+    },
+    "community_layouts": [
+        "tkl_ansi"
+    ],
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Fn", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+
+                { "label": "~", "x": 0, "y": 1.25 },
+                { "label": "!", "x": 1, "y": 1.25 },
+                { "label": "@", "x": 2, "y": 1.25 },
+                { "label": "#", "x": 3, "y": 1.25 },
+                { "label": "$", "x": 4, "y": 1.25 },
+                { "label": "%", "x": 5, "y": 1.25 },
+                { "label": "^", "x": 6, "y": 1.25 },
+                { "label": "&", "x": 7, "y": 1.25 },
+                { "label": "*", "x": 8, "y": 1.25 },
+                { "label": "(", "x": 9, "y": 1.25 },
+                { "label": ")", "x": 10, "y": 1.25 },
+                { "label": "_", "x": 11, "y": 1.25 },
+                { "label": "+", "x": 12, "y": 1.25 },
+                { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+                { "label": "Insert", "x": 15.25, "y": 1.25 },
+                { "label": "Home", "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "x": 17.25, "y": 1.25 },
+
+                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "{", "x": 11.5, "y": 2.25 },
+                { "label": "}", "x": 12.5, "y": 2.25 },
+                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.25 },
+                { "label": "End", "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "x": 17.25, "y": 2.25 },
+
+                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": ":", "x": 10.75, "y": 3.25 },
+                { "label": "\"", "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": "<", "x": 9.25, "y": 4.25 },
+                { "label": ">", "x": 10.25, "y": 4.25 },
+                { "label": "?", "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "\u2190", "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+
+                { "label": "~", "x": 0, "y": 1.25 },
+                { "label": "!", "x": 1, "y": 1.25 },
+                { "label": "@", "x": 2, "y": 1.25 },
+                { "label": "#", "x": 3, "y": 1.25 },
+                { "label": "$", "x": 4, "y": 1.25 },
+                { "label": "%", "x": 5, "y": 1.25 },
+                { "label": "^", "x": 6, "y": 1.25 },
+                { "label": "&", "x": 7, "y": 1.25 },
+                { "label": "*", "x": 8, "y": 1.25 },
+                { "label": "(", "x": 9, "y": 1.25 },
+                { "label": ")", "x": 10, "y": 1.25 },
+                { "label": "_", "x": 11, "y": 1.25 },
+                { "label": "+", "x": 12, "y": 1.25 },
+                { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Delete", "x": 14, "y": 1.25 },
+                { "label": "Insert", "x": 15.25, "y": 1.25 },
+                { "label": "Home", "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "x": 17.25, "y": 1.25 },
+
+                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "{", "x": 11.5, "y": 2.25 },
+                { "label": "}", "x": 12.5, "y": 2.25 },
+                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.25 },
+                { "label": "End", "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "x": 17.25, "y": 2.25 },
+
+                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": ":", "x": 10.75, "y": 3.25 },
+                { "label": "\"", "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": "<", "x": 9.25, "y": 4.25 },
+                { "label": ">", "x": 10.25, "y": 4.25 },
+                { "label": "?", "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "\u2190", "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+            ]
         }
     }
 }
diff --git a/keyboards/linworks/fave87h/keymaps/default/keymap.c b/keyboards/linworks/fave87h/keymaps/default/keymap.c
index d5d64a1230..e53b840d76 100644
--- a/keyboards/linworks/fave87h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/default/keymap.c
@@ -21,22 +21,22 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = 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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,        
-        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                        KC_RALT, KC_RGUI,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = LAYOUT_tkl_ansi_split_bs(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_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
     ),
 
-    [_LAYER1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
-        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_AUDIO_VOL_UP,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    [_LAYER1] = LAYOUT_tkl_ansi_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
+        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_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_VOLD, KC_MNXT
     )
 };
 
diff --git a/keyboards/linworks/fave87h/keymaps/via/keymap.c b/keyboards/linworks/fave87h/keymaps/via/keymap.c
index b62268e9a4..2b3210c1e0 100644
--- a/keyboards/linworks/fave87h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/via/keymap.c
@@ -23,40 +23,40 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = 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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,        
-        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                        KC_RALT, KC_RGUI,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = LAYOUT_tkl_ansi_split_bs(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_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
     ),
 
-    [_LAYER1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
-        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_AUDIO_VOL_UP,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    [_LAYER1] = LAYOUT_tkl_ansi_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
+        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_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
-    [_LAYER2] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    [_LAYER2] = LAYOUT_tkl_ansi_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_TRNS
     ),
 
-    [_LAYER3] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    [_LAYER3] = LAYOUT_tkl_ansi_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_TRNS
     )
 };
 

From 7d0c1332cc794c49423ffae04967678d5b2ce48c Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 27 Sep 2022 02:17:08 -0700
Subject: [PATCH 461/959] Mechlovin Foundation Configurator Cleanup (#18500)

---
 keyboards/mechlovin/foundation/foundation.h   |   4 +-
 keyboards/mechlovin/foundation/info.json      | 267 +++++++++++++++++-
 .../foundation/keymaps/default/keymap.c       |   4 +-
 .../foundation/keymaps/default_iso/keymap.c   |  40 +++
 .../foundation/keymaps/default_iso/rules.mk   |   1 +
 5 files changed, 304 insertions(+), 12 deletions(-)
 create mode 100644 keyboards/mechlovin/foundation/keymaps/default_iso/keymap.c
 create mode 100644 keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk

diff --git a/keyboards/mechlovin/foundation/foundation.h b/keyboards/mechlovin/foundation/foundation.h
index d9d317deb7..0444817bbf 100644
--- a/keyboards/mechlovin/foundation/foundation.h
+++ b/keyboards/mechlovin/foundation/foundation.h
@@ -31,7 +31,7 @@
     { K40,   K41,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO, KC_NO,   K4B,   K4C,   K4D,   K4E,   K4F,     K4G,   K4H }, \
 }
 
-#define LAYOUT_tkl_nofrow_ansi( \
+#define LAYOUT_ansi( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      K0F, K0G, K0H, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      K1F, K1G, K1H, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,                     \
@@ -45,7 +45,7 @@
     { K40,   K41,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO, KC_NO,   K4B,   K4C,   K4D,   K4E,   K4F,     K4G,   K4H }, \
 }
 
-#define LAYOUT_tkl_nofrow_iso( \
+#define LAYOUT_iso( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      K0F, K0G, K0H, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           K1F, K1G, K1H, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,                     \
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index aa4148a40a..584a774367 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -8,16 +8,267 @@
         "pid": "0x0180",
         "device_version": "0.0.2"
     },
+    "layout_aliases": {
+        "LAYOUT_tkl_nofrow_ansi": "LAYOUT_ansi",
+        "LAYOUT_tkl_nofrow_iso": "LAYOUT_iso"
+    },
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0.5, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"0,2", "x":3.25, "y":0}, {"label":"0,3", "x":4.25, "y":0}, {"label":"0,4", "x":5.25, "y":0}, {"label":"0,5", "x":6.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,7", "x":8.25, "y":0}, {"label":"0,8", "x":9.25, "y":0}, {"label":"0,9", "x":10.25, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"2,15", "x":16.25, "y":0}, {"label":"0,15", "x":17.5, "y":0}, {"label":"0,16", "x":18.5, "y":0}, {"label":"0,17", "x":19.5, "y":0}, {"label":"1,0", "x":0.5, "y":1}, {"label":"1,1", "x":2.25, "y":1, "w":1.5}, {"label":"1,2", "x":3.75, "y":1}, {"label":"1,3", "x":4.75, "y":1}, {"label":"1,4", "x":5.75, "y":1}, {"label":"1,5", "x":6.75, "y":1}, {"label":"1,6", "x":7.75, "y":1}, {"label":"1,7", "x":8.75, "y":1}, {"label":"1,8", "x":9.75, "y":1}, {"label":"1,9", "x":10.75, "y":1}, {"label":"1,10", "x":11.75, "y":1}, {"label":"1,11", "x":12.75, "y":1}, {"label":"1,12", "x":13.75, "y":1}, {"label":"1,13", "x":14.75, "y":1}, {"label":"1,14", "x":15.75, "y":1, "w":1.5}, {"label":"1,15", "x":17.5, "y":1}, {"label":"1,16", "x":18.5, "y":1}, {"label":"1,17", "x":19.5, "y":1}, {"label":"2,0", "x":0.5, "y":2}, {"label":"2,1", "x":2.25, "y":2, "w":1.75}, {"label":"2,2", "x":4, "y":2}, {"label":"2,3", "x":5, "y":2}, {"label":"2,4", "x":6, "y":2}, {"label":"2,5", "x":7, "y":2}, {"label":"2,6", "x":8, "y":2}, {"label":"2,7", "x":9, "y":2}, {"label":"2,8", "x":10, "y":2}, {"label":"2,9", "x":11, "y":2}, {"label":"2,10", "x":12, "y":2}, {"label":"2,11", "x":13, "y":2}, {"label":"2,12", "x":14, "y":2}, {"label":"2,13", "x":15, "y":2}, {"label":"2,14", "x":16, "y":2, "w":1.25}, {"label":"3,0", "x":0.5, "y":3}, {"label":"3,1", "x":2.25, "y":3, "w":1.25}, {"label":"3,2", "x":3.5, "y":3}, {"label":"3,3", "x":4.5, "y":3}, {"label":"3,4", "x":5.5, "y":3}, {"label":"3,5", "x":6.5, "y":3}, {"label":"3,6", "x":7.5, "y":3}, {"label":"3,7", "x":8.5, "y":3}, {"label":"3,8", "x":9.5, "y":3}, {"label":"3,9", "x":10.5, "y":3}, {"label":"3,10", "x":11.5, "y":3}, {"label":"3,11", "x":12.5, "y":3}, {"label":"3,12", "x":13.5, "y":3}, {"label":"3,13", "x":14.5, "y":3, "w":1.75}, {"label":"3,14", "x":16.25, "y":3}, {"label":"3,16", "x":18.5, "y":3}, {"label":"4,0", "x":0.5, "y":4}, {"label":"4,1", "x":2.25, "y":4, "w":1.25}, {"label":"4,2", "x":3.5, "y":4, "w":1.25}, {"label":"4,3", "x":4.75, "y":4, "w":1.25}, {"label":"4,7", "x":6, "y":4, "w":6.25}, {"label":"4,11", "x":12.25, "y":4, "w":1.25}, {"label":"4,12", "x":13.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.75, "y":4, "w":1.25}, {"label":"4,14", "x":16, "y":4, "w":1.25}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,16", "x":18.5, "y":4}, {"label":"4,17", "x":19.5, "y":4}]
+            "layout": [
+                { "label": "0,0", "x": 0, "y": 0 },
+                { "label": "0,1", "x": 1.5, "y": 0 },
+                { "label": "0,2", "x": 2.5, "y": 0 },
+                { "label": "0,3", "x": 3.5, "y": 0 },
+                { "label": "0,4", "x": 4.5, "y": 0 },
+                { "label": "0,5", "x": 5.5, "y": 0 },
+                { "label": "0,6", "x": 6.5, "y": 0 },
+                { "label": "0,7", "x": 7.5, "y": 0 },
+                { "label": "0,8", "x": 8.5, "y": 0 },
+                { "label": "0,9", "x": 9.5, "y": 0 },
+                { "label": "0,10", "x": 10.5, "y": 0 },
+                { "label": "0,11", "x": 11.5, "y": 0 },
+                { "label": "0,12", "x": 12.5, "y": 0 },
+                { "label": "0,13", "x": 13.5, "y": 0 },
+                { "label": "0,14", "x": 14.5, "y": 0 },
+                { "label": "2,15", "x": 15.5, "y": 0 },
+                { "label": "0,15", "x": 17, "y": 0 },
+                { "label": "0,16", "x": 18, "y": 0 },
+                { "label": "0,17", "x": 19, "y": 0 },
+
+                { "label": "1,0", "x": 0, "y": 1 },
+                { "label": "1,1", "x": 1.5, "y": 1, "w": 1.5 },
+                { "label": "1,2", "x": 3, "y": 1 },
+                { "label": "1,3", "x": 4, "y": 1 },
+                { "label": "1,4", "x": 5, "y": 1 },
+                { "label": "1,5", "x": 6, "y": 1 },
+                { "label": "1,6", "x": 7, "y": 1 },
+                { "label": "1,7", "x": 8, "y": 1 },
+                { "label": "1,8", "x": 9, "y": 1 },
+                { "label": "1,9", "x": 10, "y": 1 },
+                { "label": "1,10", "x": 11, "y": 1 },
+                { "label": "1,11", "x": 12, "y": 1 },
+                { "label": "1,12", "x": 13, "y": 1 },
+                { "label": "1,13", "x": 14, "y": 1 },
+                { "label": "1,14", "x": 15, "y": 1, "w": 1.5 },
+                { "label": "1,15", "x": 17, "y": 1 },
+                { "label": "1,16", "x": 18, "y": 1 },
+                { "label": "1,17", "x": 19, "y": 1 },
+
+                { "label": "2,0", "x": 0, "y": 2 },
+                { "label": "2,1", "x": 1.5, "y": 2, "w": 1.75 },
+                { "label": "2,2", "x": 3.25, "y": 2 },
+                { "label": "2,3", "x": 4.25, "y": 2 },
+                { "label": "2,4", "x": 5.25, "y": 2 },
+                { "label": "2,5", "x": 6.25, "y": 2 },
+                { "label": "2,6", "x": 7.25, "y": 2 },
+                { "label": "2,7", "x": 8.25, "y": 2 },
+                { "label": "2,8", "x": 9.25, "y": 2 },
+                { "label": "2,9", "x": 10.25, "y": 2 },
+                { "label": "2,10", "x": 11.25, "y": 2 },
+                { "label": "2,11", "x": 12.25, "y": 2 },
+                { "label": "2,12", "x": 13.25, "y": 2 },
+                { "label": "2,13", "x": 14.25, "y": 2 },
+                { "label": "2,14", "x": 15.25, "y": 2, "w": 1.25 },
+
+                { "label": "3,0", "x": 0, "y": 3 },
+                { "label": "3,1", "x": 1.5, "y": 3, "w": 1.25 },
+                { "label": "3,2", "x": 2.75, "y": 3 },
+                { "label": "3,3", "x": 3.75, "y": 3 },
+                { "label": "3,4", "x": 4.75, "y": 3 },
+                { "label": "3,5", "x": 5.75, "y": 3 },
+                { "label": "3,6", "x": 6.75, "y": 3 },
+                { "label": "3,7", "x": 7.75, "y": 3 },
+                { "label": "3,8", "x": 8.75, "y": 3 },
+                { "label": "3,9", "x": 9.75, "y": 3 },
+                { "label": "3,10", "x": 10.75, "y": 3 },
+                { "label": "3,11", "x": 11.75, "y": 3 },
+                { "label": "3,12", "x": 12.75, "y": 3 },
+                { "label": "3,13", "x": 13.75, "y": 3, "w": 1.75 },
+                { "label": "3,14", "x": 15.5, "y": 3 },
+                { "label": "3,16", "x": 18, "y": 3 },
+
+                { "label": "4,0", "x": 0, "y": 4 },
+                { "label": "4,1", "x": 1.5, "y": 4, "w": 1.25 },
+                { "label": "4,2", "x": 2.75, "y": 4, "w": 1.25 },
+                { "label": "4,3", "x": 4, "y": 4, "w": 1.25 },
+                { "label": "4,7", "x": 5.25, "y": 4, "w": 6.25 },
+                { "label": "4,11", "x": 11.5, "y": 4, "w": 1.25 },
+                { "label": "4,12", "x": 12.75, "y": 4, "w": 1.25 },
+                { "label": "4,13", "x": 14, "y": 4, "w": 1.25 },
+                { "label": "4,14", "x": 15.25, "y": 4, "w": 1.25 },
+                { "label": "4,15", "x": 17, "y": 4 },
+                { "label": "4,16", "x": 18, "y": 4 },
+                { "label": "4,17", "x": 19, "y": 4 }
+            ]
         },
-        "LAYOUT_tkl_nofrow_ansi": {
-            "layout": [{"label":"0,0", "x":0.5, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"0,2", "x":3.25, "y":0}, {"label":"0,3", "x":4.25, "y":0}, {"label":"0,4", "x":5.25, "y":0}, {"label":"0,5", "x":6.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,7", "x":8.25, "y":0}, {"label":"0,8", "x":9.25, "y":0}, {"label":"0,9", "x":10.25, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.25, "y":0, "w":2}, {"label":"0,15", "x":17.5, "y":0}, {"label":"0,16", "x":18.5, "y":0}, {"label":"0,17", "x":19.5, "y":0}, {"label":"1,0", "x":0.5, "y":1}, {"label":"1,1", "x":2.25, "y":1, "w":1.5}, {"label":"1,2", "x":3.75, "y":1}, {"label":"1,3", "x":4.75, "y":1}, {"label":"1,4", "x":5.75, "y":1}, {"label":"1,5", "x":6.75, "y":1}, {"label":"1,6", "x":7.75, "y":1}, {"label":"1,7", "x":8.75, "y":1}, {"label":"1,8", "x":9.75, "y":1}, {"label":"1,9", "x":10.75, "y":1}, {"label":"1,10", "x":11.75, "y":1}, {"label":"1,11", "x":12.75, "y":1}, {"label":"1,12", "x":13.75, "y":1}, {"label":"1,13", "x":14.75, "y":1}, {"label":"1,14", "x":15.75, "y":1, "w":1.5}, {"label":"1,15", "x":17.5, "y":1}, {"label":"1,16", "x":18.5, "y":1}, {"label":"1,17", "x":19.5, "y":1}, {"label":"2,0", "x":0.5, "y":2}, {"label":"2,1", "x":2.25, "y":2, "w":1.75}, {"label":"2,2", "x":4, "y":2}, {"label":"2,3", "x":5, "y":2}, {"label":"2,4", "x":6, "y":2}, {"label":"2,5", "x":7, "y":2}, {"label":"2,6", "x":8, "y":2}, {"label":"2,7", "x":9, "y":2}, {"label":"2,8", "x":10, "y":2}, {"label":"2,9", "x":11, "y":2}, {"label":"2,10", "x":12, "y":2}, {"label":"2,11", "x":13, "y":2}, {"label":"2,12", "x":14, "y":2}, {"label":"2,14", "x":15, "y":2, "w":2.25}, {"label":"3,0", "x":0.5, "y":3}, {"label":"3,1", "x":2.25, "y":3, "w":2.25}, {"label":"3,3", "x":4.5, "y":3}, {"label":"3,4", "x":5.5, "y":3}, {"label":"3,5", "x":6.5, "y":3}, {"label":"3,6", "x":7.5, "y":3}, {"label":"3,7", "x":8.5, "y":3}, {"label":"3,8", "x":9.5, "y":3}, {"label":"3,9", "x":10.5, "y":3}, {"label":"3,10", "x":11.5, "y":3}, {"label":"3,11", "x":12.5, "y":3}, {"label":"3,12", "x":13.5, "y":3}, {"label":"3,13", "x":14.5, "y":3, "w":2.75}, {"label":"3,16", "x":18.5, "y":3}, {"label":"4,0", "x":0.5, "y":4}, {"label":"4,1", "x":2.25, "y":4, "w":1.25}, {"label":"4,2", "x":3.5, "y":4, "w":1.25}, {"label":"4,3", "x":4.75, "y":4, "w":1.25}, {"label":"4,7", "x":6, "y":4, "w":6.25}, {"label":"4,11", "x":12.25, "y":4, "w":1.25}, {"label":"4,12", "x":13.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.75, "y":4, "w":1.25}, {"label":"4,14", "x":16, "y":4, "w":1.25}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,16", "x":18.5, "y":4}, {"label":"4,17", "x":19.5, "y":4}]
+        "LAYOUT_ansi": {
+            "layout": [
+                { "label": "0,0", "x": 0, "y": 0 },
+                { "label": "0,1", "x": 1.5, "y": 0 },
+                { "label": "0,2", "x": 2.5, "y": 0 },
+                { "label": "0,3", "x": 3.5, "y": 0 },
+                { "label": "0,4", "x": 4.5, "y": 0 },
+                { "label": "0,5", "x": 5.5, "y": 0 },
+                { "label": "0,6", "x": 6.5, "y": 0 },
+                { "label": "0,7", "x": 7.5, "y": 0 },
+                { "label": "0,8", "x": 8.5, "y": 0 },
+                { "label": "0,9", "x": 9.5, "y": 0 },
+                { "label": "0,10", "x": 10.5, "y": 0 },
+                { "label": "0,11", "x": 11.5, "y": 0 },
+                { "label": "0,12", "x": 12.5, "y": 0 },
+                { "label": "0,13", "x": 13.5, "y": 0 },
+                { "label": "0,14", "x": 14.5, "y": 0, "w": 2 },
+                { "label": "0,15", "x": 17, "y": 0 },
+                { "label": "0,16", "x": 18, "y": 0 },
+                { "label": "0,17", "x": 19, "y": 0 },
+
+                { "label": "1,0", "x": 0, "y": 1 },
+                { "label": "1,1", "x": 1.5, "y": 1, "w": 1.5 },
+                { "label": "1,2", "x": 3, "y": 1 },
+                { "label": "1,3", "x": 4, "y": 1 },
+                { "label": "1,4", "x": 5, "y": 1 },
+                { "label": "1,5", "x": 6, "y": 1 },
+                { "label": "1,6", "x": 7, "y": 1 },
+                { "label": "1,7", "x": 8, "y": 1 },
+                { "label": "1,8", "x": 9, "y": 1 },
+                { "label": "1,9", "x": 10, "y": 1 },
+                { "label": "1,10", "x": 11, "y": 1 },
+                { "label": "1,11", "x": 12, "y": 1 },
+                { "label": "1,12", "x": 13, "y": 1 },
+                { "label": "1,13", "x": 14, "y": 1 },
+                { "label": "1,14", "x": 15, "y": 1, "w": 1.5 },
+                { "label": "1,15", "x": 17, "y": 1 },
+                { "label": "1,16", "x": 18, "y": 1 },
+                { "label": "1,17", "x": 19, "y": 1 },
+
+                { "label": "2,0", "x": 0, "y": 2 },
+                { "label": "2,1", "x": 1.5, "y": 2, "w": 1.75 },
+                { "label": "2,2", "x": 3.25, "y": 2 },
+                { "label": "2,3", "x": 4.25, "y": 2 },
+                { "label": "2,4", "x": 5.25, "y": 2 },
+                { "label": "2,5", "x": 6.25, "y": 2 },
+                { "label": "2,6", "x": 7.25, "y": 2 },
+                { "label": "2,7", "x": 8.25, "y": 2 },
+                { "label": "2,8", "x": 9.25, "y": 2 },
+                { "label": "2,9", "x": 10.25, "y": 2 },
+                { "label": "2,10", "x": 11.25, "y": 2 },
+                { "label": "2,11", "x": 12.25, "y": 2 },
+                { "label": "2,12", "x": 13.25, "y": 2 },
+                { "label": "2,14", "x": 14.25, "y": 2, "w": 2.25 },
+
+                { "label": "3,0", "x": 0, "y": 3 },
+                { "label": "3,1", "x": 1.5, "y": 3, "w": 2.25 },
+                { "label": "3,3", "x": 3.75, "y": 3 },
+                { "label": "3,4", "x": 4.75, "y": 3 },
+                { "label": "3,5", "x": 5.75, "y": 3 },
+                { "label": "3,6", "x": 6.75, "y": 3 },
+                { "label": "3,7", "x": 7.75, "y": 3 },
+                { "label": "3,8", "x": 8.75, "y": 3 },
+                { "label": "3,9", "x": 9.75, "y": 3 },
+                { "label": "3,10", "x": 10.75, "y": 3 },
+                { "label": "3,11", "x": 11.75, "y": 3 },
+                { "label": "3,12", "x": 12.75, "y": 3 },
+                { "label": "3,13", "x": 13.75, "y": 3, "w": 2.75 },
+                { "label": "3,16", "x": 18, "y": 3 },
+
+                { "label": "4,0", "x": 0, "y": 4 },
+                { "label": "4,1", "x": 1.5, "y": 4, "w": 1.25 },
+                { "label": "4,2", "x": 2.75, "y": 4, "w": 1.25 },
+                { "label": "4,3", "x": 4, "y": 4, "w": 1.25 },
+                { "label": "4,7", "x": 5.25, "y": 4, "w": 6.25 },
+                { "label": "4,11", "x": 11.5, "y": 4, "w": 1.25 },
+                { "label": "4,12", "x": 12.75, "y": 4, "w": 1.25 },
+                { "label": "4,13", "x": 14, "y": 4, "w": 1.25 },
+                { "label": "4,14", "x": 15.25, "y": 4, "w": 1.25 },
+                { "label": "4,15", "x": 17, "y": 4 },
+                { "label": "4,16", "x": 18, "y": 4 },
+                { "label": "4,17", "x": 19, "y": 4 }
+            ]
         },
-        "LAYOUT_tkl_nofrow_iso": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.75, "y":0}, {"label":"0,2", "x":2.75, "y":0}, {"label":"0,3", "x":3.75, "y":0}, {"label":"0,4", "x":4.75, "y":0}, {"label":"0,5", "x":5.75, "y":0}, {"label":"0,6", "x":6.75, "y":0}, {"label":"0,7", "x":7.75, "y":0}, {"label":"0,8", "x":8.75, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":13.75, "y":0}, {"label":"0,14", "x":14.75, "y":0, "w":2}, {"label":"0,15", "x":17, "y":0}, {"label":"0,16", "x":18, "y":0}, {"label":"0,17", "x":19, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.75, "y":1, "w":1.5}, {"label":"1,2", "x":3.25, "y":1}, {"label":"1,3", "x":4.25, "y":1}, {"label":"1,4", "x":5.25, "y":1}, {"label":"1,5", "x":6.25, "y":1}, {"label":"1,6", "x":7.25, "y":1}, {"label":"1,7", "x":8.25, "y":1}, {"label":"1,8", "x":9.25, "y":1}, {"label":"1,9", "x":10.25, "y":1}, {"label":"1,10", "x":11.25, "y":1}, {"label":"1,11", "x":12.25, "y":1}, {"label":"1,12", "x":13.25, "y":1}, {"label":"1,13", "x":14.25, "y":1}, {"label":"2,14", "x":15.5, "y":1, "w":1.25, "h":2}, {"label":"1,15", "x":17, "y":1}, {"label":"1,16", "x":18, "y":1}, {"label":"1,17", "x":19, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.75, "y":2, "w":1.75}, {"label":"2,2", "x":3.5, "y":2}, {"label":"2,3", "x":4.5, "y":2}, {"label":"2,4", "x":5.5, "y":2}, {"label":"2,5", "x":6.5, "y":2}, {"label":"2,6", "x":7.5, "y":2}, {"label":"2,7", "x":8.5, "y":2}, {"label":"2,8", "x":9.5, "y":2}, {"label":"2,9", "x":10.5, "y":2}, {"label":"2,10", "x":11.5, "y":2}, {"label":"2,11", "x":12.5, "y":2}, {"label":"2,12", "x":13.5, "y":2}, {"label":"2,13", "x":14.5, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.75, "y":3, "w":1.25}, {"label":"3,2", "x":3, "y":3}, {"label":"3,3", "x":4, "y":3}, {"label":"3,4", "x":5, "y":3}, {"label":"3,5", "x":6, "y":3}, {"label":"3,6", "x":7, "y":3}, {"label":"3,7", "x":8, "y":3}, {"label":"3,8", "x":9, "y":3}, {"label":"3,9", "x":10, "y":3}, {"label":"3,10", "x":11, "y":3}, {"label":"3,11", "x":12, "y":3}, {"label":"3,12", "x":13, "y":3}, {"label":"3,13", "x":14, "y":3, "w":2.75}, {"label":"3,16", "x":18, "y":3}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.75, "y":4, "w":1.25}, {"label":"4,2", "x":3, "y":4, "w":1.25}, {"label":"4,3", "x":4.25, "y":4, "w":1.25}, {"label":"4,7", "x":5.5, "y":4, "w":6.25}, {"label":"4,11", "x":11.75, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4, "w":1.25}, {"label":"4,13", "x":14.25, "y":4, "w":1.25}, {"label":"4,14", "x":15.5, "y":4, "w":1.25}, {"label":"4,15", "x":17, "y":4}, {"label":"4,16", "x":18, "y":4}, {"label":"4,17", "x":19, "y":4}]
-        },
-          
+        "LAYOUT_iso": {
+            "layout": [
+                { "label": "0,0", "x": 0, "y": 0 },
+                { "label": "0,1", "x": 1.5, "y": 0 },
+                { "label": "0,2", "x": 2.5, "y": 0 },
+                { "label": "0,3", "x": 3.5, "y": 0 },
+                { "label": "0,4", "x": 4.5, "y": 0 },
+                { "label": "0,5", "x": 5.5, "y": 0 },
+                { "label": "0,6", "x": 6.5, "y": 0 },
+                { "label": "0,7", "x": 7.5, "y": 0 },
+                { "label": "0,8", "x": 8.5, "y": 0 },
+                { "label": "0,9", "x": 9.5, "y": 0 },
+                { "label": "0,10", "x": 10.5, "y": 0 },
+                { "label": "0,11", "x": 11.5, "y": 0 },
+                { "label": "0,12", "x": 12.5, "y": 0 },
+                { "label": "0,13", "x": 13.5, "y": 0 },
+                { "label": "0,14", "x": 14.5, "y": 0, "w": 2 },
+                { "label": "0,15", "x": 17, "y": 0 },
+                { "label": "0,16", "x": 18, "y": 0 },
+                { "label": "0,17", "x": 19, "y": 0 },
+
+                { "label": "1,0", "x": 0, "y": 1 },
+                { "label": "1,1", "x": 1.5, "y": 1, "w": 1.5 },
+                { "label": "1,2", "x": 3, "y": 1 },
+                { "label": "1,3", "x": 4, "y": 1 },
+                { "label": "1,4", "x": 5, "y": 1 },
+                { "label": "1,5", "x": 6, "y": 1 },
+                { "label": "1,6", "x": 7, "y": 1 },
+                { "label": "1,7", "x": 8, "y": 1 },
+                { "label": "1,8", "x": 9, "y": 1 },
+                { "label": "1,9", "x": 10, "y": 1 },
+                { "label": "1,10", "x": 11, "y": 1 },
+                { "label": "1,11", "x": 12, "y": 1 },
+                { "label": "1,12", "x": 13, "y": 1 },
+                { "label": "1,13", "x": 14, "y": 1 },
+                { "label": "1,15", "x": 17, "y": 1 },
+                { "label": "1,16", "x": 18, "y": 1 },
+                { "label": "1,17", "x": 19, "y": 1 },
+
+                { "label": "2,0", "x": 0, "y": 2 },
+                { "label": "2,1", "x": 1.5, "y": 2, "w": 1.75 },
+                { "label": "2,2", "x": 3.25, "y": 2 },
+                { "label": "2,3", "x": 4.25, "y": 2 },
+                { "label": "2,4", "x": 5.25, "y": 2 },
+                { "label": "2,5", "x": 6.25, "y": 2 },
+                { "label": "2,6", "x": 7.25, "y": 2 },
+                { "label": "2,7", "x": 8.25, "y": 2 },
+                { "label": "2,8", "x": 9.25, "y": 2 },
+                { "label": "2,9", "x": 10.25, "y": 2 },
+                { "label": "2,10", "x": 11.25, "y": 2 },
+                { "label": "2,11", "x": 12.25, "y": 2 },
+                { "label": "2,12", "x": 13.25, "y": 2 },
+                { "label": "2,13", "x": 14.25, "y": 2 },
+                { "label": "2,14", "x": 15.25, "y": 1, "w": 1.25, "h": 2 },
+
+                { "label": "3,0", "x": 0, "y": 3 },
+                { "label": "3,1", "x": 1.5, "y": 3, "w": 1.25 },
+                { "label": "3,2", "x": 2.75, "y": 3 },
+                { "label": "3,3", "x": 3.75, "y": 3 },
+                { "label": "3,4", "x": 4.75, "y": 3 },
+                { "label": "3,5", "x": 5.75, "y": 3 },
+                { "label": "3,6", "x": 6.75, "y": 3 },
+                { "label": "3,7", "x": 7.75, "y": 3 },
+                { "label": "3,8", "x": 8.75, "y": 3 },
+                { "label": "3,9", "x": 9.75, "y": 3 },
+                { "label": "3,10", "x": 10.75, "y": 3 },
+                { "label": "3,11", "x": 11.75, "y": 3 },
+                { "label": "3,12", "x": 12.75, "y": 3 },
+                { "label": "3,13", "x": 13.75, "y": 3, "w": 2.75 },
+                { "label": "3,16", "x": 18, "y": 3 },
+
+                { "label": "4,0", "x": 0, "y": 4 },
+                { "label": "4,1", "x": 1.5, "y": 4, "w": 1.25 },
+                { "label": "4,2", "x": 2.75, "y": 4, "w": 1.25 },
+                { "label": "4,3", "x": 4, "y": 4, "w": 1.25 },
+                { "label": "4,7", "x": 5.25, "y": 4, "w": 6.25 },
+                { "label": "4,11", "x": 11.5, "y": 4, "w": 1.25 },
+                { "label": "4,12", "x": 12.75, "y": 4, "w": 1.25 },
+                { "label": "4,13", "x": 14, "y": 4, "w": 1.25 },
+                { "label": "4,14", "x": 15.25, "y": 4, "w": 1.25 },
+                { "label": "4,15", "x": 17, "y": 4 },
+                { "label": "4,16", "x": 18, "y": 4 },
+                { "label": "4,17", "x": 19, "y": 4 }
+            ]
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechlovin/foundation/keymaps/default/keymap.c b/keyboards/mechlovin/foundation/keymaps/default/keymap.c
index 4cabf521d2..11ae3282b5 100644
--- a/keyboards/mechlovin/foundation/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/foundation/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_tkl_nofrow_ansi(
+    [0] = LAYOUT_ansi(
         KC_F1,   KC_GRV,    KC_1,    KC_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_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_DEL,  KC_END,  KC_PGDN,
         KC_F3,   KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                       
         KC_F4,   KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                     KC_UP,
         KC_F5,   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_nofrow_ansi(
+    [1] = LAYOUT_ansi(
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                      
diff --git a/keyboards/mechlovin/foundation/keymaps/default_iso/keymap.c b/keyboards/mechlovin/foundation/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..5b8918c9e5
--- /dev/null
+++ b/keyboards/mechlovin/foundation/keymaps/default_iso/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 Mechlovin' Studio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso(
+        KC_F1,      KC_GRV,  KC_1,    KC_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_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_DEL,  KC_END,  KC_PGDN,
+        KC_F3,      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        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,             KC_UP,
+        KC_F5,      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso(
+        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [1] =   {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}
+};
+#endif
diff --git a/keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk b/keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/mechlovin/foundation/keymaps/default_iso/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

From f8c8005ce1bc9292951f65e26c47a7e934b5a773 Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Tue, 27 Sep 2022 20:36:49 +0800
Subject: [PATCH 462/959] [Keyboard] Add wave75 (#18490)

---
 keyboards/yandrstudio/wave75/board.h          |  21 +
 keyboards/yandrstudio/wave75/info.json        | 433 ++++++++++++++++++
 .../wave75/keymaps/default/keymap.c           |  34 ++
 .../yandrstudio/wave75/keymaps/via/keymap.c   |  48 ++
 .../yandrstudio/wave75/keymaps/via/rules.mk   |   1 +
 keyboards/yandrstudio/wave75/mcuconf.h        |  24 +
 keyboards/yandrstudio/wave75/readme.md        |  22 +
 keyboards/yandrstudio/wave75/rules.mk         |  15 +
 keyboards/yandrstudio/wave75/wave75.c         |  49 ++
 keyboards/yandrstudio/wave75/wave75.h         |  55 +++
 10 files changed, 702 insertions(+)
 create mode 100644 keyboards/yandrstudio/wave75/board.h
 create mode 100644 keyboards/yandrstudio/wave75/info.json
 create mode 100644 keyboards/yandrstudio/wave75/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/wave75/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/wave75/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/wave75/mcuconf.h
 create mode 100644 keyboards/yandrstudio/wave75/readme.md
 create mode 100644 keyboards/yandrstudio/wave75/rules.mk
 create mode 100644 keyboards/yandrstudio/wave75/wave75.c
 create mode 100644 keyboards/yandrstudio/wave75/wave75.h

diff --git a/keyboards/yandrstudio/wave75/board.h b/keyboards/yandrstudio/wave75/board.h
new file mode 100644
index 0000000000..d83804babd
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/wave75/info.json b/keyboards/yandrstudio/wave75/info.json
new file mode 100644
index 0000000000..61bd8ab7f3
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/info.json
@@ -0,0 +1,433 @@
+{
+    "keyboard_name": "wave75",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA8E",
+        "device_version": "1.0.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A6", "B15", "B14", "B13", "A5", "B7", "B6", "B5", "A4", "B12", "A3", "B2", "A2"],
+        "rows": ["A9", "A10", "C15", "A8", "B1", "A1"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "0,0",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "0,1",
+                    "x": 1.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,2",
+                    "x": 2.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,3",
+                    "x": 3.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,4",
+                    "x": 4.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,5",
+                    "x": 5.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,6",
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,7",
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,8",
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,9",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "0,10",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0,11",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "0,12",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "0,13",
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "label": "0,14",
+                    "x": 15.25,
+                    "y": 0
+                },
+                {
+                    "label": "1,0",
+                    "x": 0,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,1",
+                    "x": 1,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,2",
+                    "x": 2,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,3",
+                    "x": 3,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,4",
+                    "x": 4,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,5",
+                    "x": 5,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,6",
+                    "x": 6,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,7",
+                    "x": 7,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,8",
+                    "x": 8,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,9",
+                    "x": 9,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,10",
+                    "x": 10,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,11",
+                    "x": 11,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,12",
+                    "x": 12,
+                    "y": 1.25
+                },
+                {
+                    "label": "1,13",
+                    "x": 13,
+                    "y": 1.25,
+                    "w": 2
+                },
+                {
+                    "label": "1,14",
+                    "x": 15.25,
+                    "y": 1.25
+                },
+                {
+                    "label": "2,0",
+                    "x": 0,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "2,1",
+                    "x": 1.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,2",
+                    "x": 2.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,3",
+                    "x": 3.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,4",
+                    "x": 4.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,5",
+                    "x": 5.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,6",
+                    "x": 6.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,7",
+                    "x": 7.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,8",
+                    "x": 8.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,9",
+                    "x": 9.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,10",
+                    "x": 10.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,11",
+                    "x": 11.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,12",
+                    "x": 12.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "2,13",
+                    "x": 13.5,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "2,14",
+                    "x": 15.25,
+                    "y": 2.25
+                },
+                {
+                    "label": "3,0",
+                    "x": 0,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "label": "3,1",
+                    "x": 1.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,2",
+                    "x": 2.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,3",
+                    "x": 3.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,4",
+                    "x": 4.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,5",
+                    "x": 5.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,6",
+                    "x": 6.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,7",
+                    "x": 7.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,8",
+                    "x": 8.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,9",
+                    "x": 9.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,10",
+                    "x": 10.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,11",
+                    "x": 11.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "3,12",
+                    "x": 12.75,
+                    "y": 3.25,
+                    "w": 2.25
+                },
+                {
+                    "label": "4,0",
+                    "x": 0,
+                    "y": 4.25,
+                    "w": 2.25
+                },
+                {
+                    "label": "4,1",
+                    "x": 2.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,2",
+                    "x": 3.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,3",
+                    "x": 4.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,4",
+                    "x": 5.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,5",
+                    "x": 6.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,6",
+                    "x": 7.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,7",
+                    "x": 8.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,8",
+                    "x": 9.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,9",
+                    "x": 10.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,10",
+                    "x": 11.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "4,11",
+                    "x": 12.25,
+                    "y": 4.25,
+                    "w": 1.75
+                },
+                {
+                    "label": "4,13",
+                    "x": 14.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "5,0",
+                    "x": 0,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,1",
+                    "x": 1.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,2",
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,6",
+                    "x": 3.75,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "label": "5,9",
+                    "x": 10,
+                    "y": 5.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "5,10",
+                    "x": 11.5,
+                    "y": 5.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "5,12",
+                    "x": 13.25,
+                    "y": 5.5
+                },
+                {
+                    "label": "5,13",
+                    "x": 14.25,
+                    "y": 5.5
+                },
+                {
+                    "label": "5,14",
+                    "x": 15.25,
+                    "y": 5.5
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a4e4bc286d
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,   KC_F5, KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_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_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                    KC_RALT,MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT),
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LG,   KC_TRNS,                            KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..38eb0515e0
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,   KC_F5, KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_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_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                    KC_RALT,MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT),
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LG,   KC_TRNS,                            KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/wave75/keymaps/via/rules.mk b/keyboards/yandrstudio/wave75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/wave75/mcuconf.h b/keyboards/yandrstudio/wave75/mcuconf.h
new file mode 100644
index 0000000000..ae03a6e12f
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
+
+
diff --git a/keyboards/yandrstudio/wave75/readme.md b/keyboards/yandrstudio/wave75/readme.md
new file mode 100644
index 0000000000..f88b900c3f
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/readme.md
@@ -0,0 +1,22 @@
+# wave75
+
+![wave75](https://i.imgur.com/Kh6VfN8h.png)
+A 75% keyboard.
+This keyboard use 16mhz HSE and APM32F103 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: wave75
+- Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/wave75:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/wave75/rules.mk b/keyboards/yandrstudio/wave75/rules.mk
new file mode 100644
index 0000000000..4a92d0f891
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/rules.mk
@@ -0,0 +1,15 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c
new file mode 100644
index 0000000000..cc58a1d43e
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/wave75.c
@@ -0,0 +1,49 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "wave75.h"
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    switch(keycode) {
+        case KC_LG:
+            if (record->event.pressed) {
+                process_magic(GUI_TOG, record);
+            }
+            return false;
+        case KC_MACOS:
+            if (record->event.pressed) {
+                process_magic(CG_TOGG, record);
+            }
+            return false;
+        case KC_MCTL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+        case KC_LPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+        default:
+            return true;
+    }
+    return true;
+}
diff --git a/keyboards/yandrstudio/wave75/wave75.h b/keyboards/yandrstudio/wave75/wave75.h
new file mode 100644
index 0000000000..f0d041241a
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/wave75.h
@@ -0,0 +1,55 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,             \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       \
+    K500, K501, K502,                   K506,             K509, K510,       K512, K513, K514 \
+    )\
+    { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014   }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114   }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214   }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO  }, \
+    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO  }, \
+    { K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, K509,  K510,  KC_NO, K512,  K513,  K514  }  \
+}
+
+enum keyboard_keycodes {
+#ifdef VIA_ENABLE
+    LOCK_GUI = USER00,
+    TOG_MACOS_KEYMAP,
+    KC_MISSION_CONTROL,
+    KC_LAUNCHPAD,
+    NEW_SAFE_RANGE = SAFE_RANGE  // Important!
+#else
+    LOCK_GUI = SAFE_RANGE,
+    TOG_MACOS_KEYMAP,
+    KC_MISSION_CONTROL,
+    KC_LAUNCHPAD,
+    NEW_SAFE_RANGE   // Important!
+#endif
+};
+
+#define KC_LG    LOCK_GUI
+#define KC_MACOS TOG_MACOS_KEYMAP
+#define KC_MCTL  KC_MISSION_CONTROL
+#define KC_LPAD  KC_LAUNCHPAD

From 848e1ec318889b727403228c1ca2f3e206a4fec0 Mon Sep 17 00:00:00 2001
From: Arturo Avila <69410272+ADPenrose@users.noreply.github.com>
Date: Tue, 27 Sep 2022 07:44:41 -0500
Subject: [PATCH 463/959] [Keyboard] Updated Kintsugi to support encoder
 mapping (#18492)

---
 keyboards/adpenrose/kintsugi/config.h         |  55 +--
 keyboards/adpenrose/kintsugi/info.json        |   8 +-
 .../kintsugi/keymaps/default/keymap.c         |  25 +-
 .../kintsugi/keymaps/default/rules.mk         |   1 +
 .../keymaps/oled_bongocat/animation_frames.h  | 405 ++++++++++++++++++
 .../kintsugi/keymaps/oled_bongocat/keymap.c   | 181 ++++++++
 .../kintsugi/keymaps/oled_bongocat/rules.mk   |   6 +
 .../kintsugi/keymaps/snailmap_port/keymap.c   |  99 +----
 .../kintsugi/keymaps/snailmap_port/rules.mk   |   1 +
 .../adpenrose/kintsugi/keymaps/via/keymap.c   |  29 +-
 .../adpenrose/kintsugi/keymaps/via/rules.mk   |   1 +
 keyboards/adpenrose/kintsugi/kintsugi.c       |  30 +-
 keyboards/adpenrose/kintsugi/kintsugi.h       |   4 +-
 keyboards/adpenrose/kintsugi/readme.md        |   2 +-
 keyboards/adpenrose/kintsugi/rules.mk         |   2 +-
 15 files changed, 663 insertions(+), 186 deletions(-)
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/default/rules.mk
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/animation_frames.h
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/rules.mk

diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index d4e3dcc729..1985c25751 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 adpenrose
+Copyright 2022 adpenrose
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -56,9 +56,6 @@ increase the value. If you need 2 clicks for 1 keycode, decrease*/
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -79,56 +76,6 @@ increase the value. If you need 2 clicks for 1 keycode, decrease*/
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * 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
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
index db9952af29..c305d871ea 100644
--- a/keyboards/adpenrose/kintsugi/info.json
+++ b/keyboards/adpenrose/kintsugi/info.json
@@ -1,15 +1,15 @@
 {
     "keyboard_name": "Kintsugi",
-    "manufacturer": "adpenrose",
+    "manufacturer": "ADPenrose",
     "url": "https://github.com/ADPenrose/kintsugi_keeb",
-    "maintainer": "adpenrose",
+    "maintainer": "Arturo Avila",
     "usb": {
         "vid": "0x4450",
         "pid": "0x0001",
-        "device_version": "0.0.1"
+        "device_version": "1.0.0"
     },
     "layouts": {
-        "LAYOUT_65_ansi_blocker": {
+        "LAYOUT": {
             "layout": [
               {"label":"Esc", "x":0, "y":0},
               {"label":"1", "x":1, "y":0},
diff --git a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
index 19d3880b77..f7f960e4b0 100644
--- a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
+++ b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 adpenrose
+/* Copyright 2022 adpenrose
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,26 +23,33 @@
  * |---------------------------------------------------------------------|
  * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
  * |---------------------------------------------------------------------|
- * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift       |Up| M1 |
+ * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift    |Up| M0(3) |
  * |---------------------------------------------------------------------|
- * |Ctrl|GUI |Alt |     Space                 |Alt |MO(1)|   |Lt |Dn |Rt |
+ * |Ctrl|GUI |Alt |     Space               |MO(1) |MO(2)|   |Lt |Dn |Rt |
  * `---------------------------------------------------------------------|'
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_65_ansi_blocker(
+    [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_A,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
           KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,   KC_ENT,           KC_MUTE,
-          KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,   KC_UP,    KC_DEL,
-          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   KC_RALT, MO(1),           KC_LEFT, KC_DOWN,  KC_RIGHT
+          KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,   KC_UP,    MO(3),
+          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(1), MO(2),           KC_LEFT, KC_DOWN,  KC_RIGHT
     ),
-    [1] = LAYOUT_65_ansi_blocker(
+    [1] = LAYOUT(
       _______,    KC_F1,      KC_F2,      KC_F3,      KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,     KC_F11,   KC_F12,  KC_DEL,
-      _______,  RGB_TOG,    RGB_VAI,    RGB_VAD,    RGB_MODE_FORWARD,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
       QK_BOOT,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
       _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                                        KC_SPC,                        _______,    _______,              _______,  _______,  _______
+      _______,  _______,    _______,                                        _______,                        _______,    _______,              _______,  _______,  _______
     ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/adpenrose/kintsugi/keymaps/default/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/animation_frames.h b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/animation_frames.h
new file mode 100644
index 0000000000..4a97accdde
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/animation_frames.h
@@ -0,0 +1,405 @@
+/* Copyright 2022 adpenrose
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#ifdef OLED_ENABLE
+
+// Enable OLED bitmpa compression selectively.
+#define USE_OLED_BITMAP_COMPRESSION
+
+#define NUM_IDLE_FRAMES 5
+#define NUM_TAP_FRAMES 2
+#define NUM_OLED_BYTES 512
+
+#ifdef USE_OLED_BITMAP_COMPRESSION
+
+static const char PROGMEM idle_1_block_map[] = { //IDLE_1 and IDLE_2 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x7f, 0x00, 0xf0, 0xb0, 0xc1, 0x07,
+    0xf0, 0xcf, 0x00, 0x1c, 0x00, 0xb8, 0x8f, 0x3f, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
+    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
+};
+
+static const char PROGMEM idle_2_block_map[] = { //IDLE_3 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0xf0, 0xd8, 0xe0, 0x03,
+    0xf0, 0x6f, 0x00, 0x3e, 0x00, 0xf8, 0xc7, 0x7f, 0x00, 0x98, 0x7f, 0x00, 0x00, 0xf0, 0x03, 0x00,
+    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
+};
+
+static const char PROGMEM idle_3_block_map[] = { //IDLE_4 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x01, 0xf0, 0xb0, 0xc1, 0x07,
+    0xf0, 0xcf, 0x00, 0x7c, 0x00, 0xb8, 0x8f, 0xff, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
+    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
+};
+
+static const char PROGMEM idle_4_block_map[] = { //IDLE_5 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0xf0, 0xb0, 0xc1, 0x07,
+    0xf0, 0xcf, 0x00, 0x3c, 0x00, 0xb8, 0x8f, 0x7f, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
+    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01   
+};
+
+static const char PROGMEM tap_1_block_map[] = { //TAP_1 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x01, 0x80, 0xff, 0xc1, 0x07,
+    0x00, 0xce, 0x00, 0x7c, 0x00, 0xb8, 0x8d, 0xff, 0x00, 0x98, 0xff, 0x1f, 0xc0, 0xff, 0xff, 0x1f,
+    0x00, 0x3f, 0xfe, 0x01, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
+};
+
+static const char PROGMEM tap_2_block_map[] = { //TAP_2 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xde, 0xff, 0xff, 0x01, 0xfc, 0x80, 0xc1, 0x07,
+    0xf1, 0xcf, 0x00, 0x7c, 0x00, 0xb8, 0x8d, 0xff, 0x00, 0xe0, 0xff, 0x00, 0x00, 0x80, 0x3f, 0x00,
+    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01   
+};
+
+static const char PROGMEM idle_1_block_list[] = { //IDLE_1 and IDLE_2 flipped
+    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02,
+    0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0xe0, 0x18, 0x06, 0x01, 0x78, 0x78,
+    0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x30,
+    0xc8, 0x01, 0x3e, 0xc0, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10,
+    0x10, 0x08, 0x07, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x01, 0x01,
+    0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0
+};
+
+static const char PROGMEM idle_2_block_list[] = { //IDLE_3 flipped
+    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x06, 0x04,
+    0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0xe0, 0x18, 0x06, 0x01, 0x78,
+    0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0,
+    0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80,
+    0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01,
+    0x1e, 0xe0
+};
+
+static const char PROGMEM idle_3_block_list[] = { //IDLE_4 flipped
+    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04,
+    0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0xe0, 0x18, 0x06, 0x01,
+    0x78, 0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c,
+    0xe0, 0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18,
+    0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10,
+    0x08, 0x04, 0x02, 0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f,
+    0xe0, 0x01, 0x1e, 0xe0    
+};
+
+static const char PROGMEM idle_4_block_list[] = { //IDLE_5 flipped
+    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04,
+    0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0xe4, 0x18, 0xe0, 0x18, 0x06, 0x01, 0x78,
+    0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0,
+    0x30, 0xc8, 0x01, 0x1e, 0x60, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80, 0x40,
+    0x20, 0x10, 0x10, 0x10, 0x08, 0x07, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02,
+    0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e,
+    0xe0    
+};
+
+static const char PROGMEM tap_1_block_list[] = { //TAP_1 flipped
+    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x42, 0x44,
+    0x84, 0x88, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x01, 0x0e, 0xf0, 0x20,
+    0x26, 0x26, 0x29, 0x10, 0xd5, 0xce, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x1c, 0xe0, 0x30, 0xc8,
+    0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0x02, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10,
+    0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x80, 0x80, 0x40, 0x20, 0x10, 0x08, 0x84, 0xc2, 0xc1,
+    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfd, 0xfd, 0x01, 0x07, 0x78,
+    0x80, 0x38, 0xf8, 0xf8, 0xf1, 0xe1, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x03, 0x03,
+    0x07, 0x07, 0x07, 0x78, 0x81, 0x07, 0x07, 0x03, 0x03, 0x01, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e,
+    0xe0    
+};
+
+static const char PROGMEM tap_2_block_list[] = { //TAP_2 flipped
+    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x7e, 0xfe, 0xfe, 0xfe, 0x07, 0xf9, 0x01,
+    0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18,
+    0x01, 0x01, 0xe0, 0x18, 0x06, 0x01, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x0f, 0x03, 0x04,
+    0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0,
+    0x03, 0x02, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0x0f, 0x70, 0x80,
+    0x81, 0x01, 0x31, 0x32, 0x8a, 0x24, 0x86, 0x79, 0x07, 0x78, 0x81, 0x01, 0x01, 0x01, 0x01, 0x07,
+    0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0
+};
+
+// idle_1 and idle_2 are identical, so share them and save some space
+const char* idle_frames[NUM_IDLE_FRAMES] = {
+    idle_1_block_list,
+    idle_1_block_list,
+    idle_2_block_list,
+    idle_3_block_list,
+    idle_4_block_list
+};
+
+const char* tap_frames[NUM_TAP_FRAMES] = {
+    tap_1_block_list,
+    tap_2_block_list
+};
+
+// idle_1 and idle_2 are identical, so save some space
+const char* idle_block_map[NUM_IDLE_FRAMES] = {
+    idle_1_block_map,
+    idle_1_block_map,
+    idle_2_block_map,
+    idle_3_block_map,
+    idle_4_block_map
+};
+
+const char* tap_block_map[NUM_TAP_FRAMES] = {
+    tap_1_block_map,
+    tap_2_block_map
+};
+
+#else
+
+static const char PROGMEM idle_frames[NUM_IDLE_FRAMES][NUM_OLED_BYTES] = {
+  { // IDLE 1 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x08, 0x08, 
+    0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
+    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
+    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
+    0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    { //IDLE 2 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x08, 0x08, 
+    0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
+    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
+    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
+    0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    { //IDLE 3 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x06, 0x04, 0x08, 0x08, 0x04, 
+    0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 0xc0, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x30, 0xc8, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 
+    0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x83, 
+    0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
+    0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    { //IDLE 4 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
+    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
+    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
+    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
+    0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    { //IDLE 5 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
+    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0xe4, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60, 0x80, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
+    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
+    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
+    0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
+  };
+static const char PROGMEM tap_frames[NUM_TAP_FRAMES][NUM_OLED_BYTES] = {
+  { //Tap 1 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x42, 0x44, 0x84, 0x88, 0x08, 
+    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0xf0, 0x20, 0x26, 0x26, 0x29, 0x10, 0xd5, 
+    0xce, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
+    0x02, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
+    0x80, 0x40, 0x20, 0x10, 0x08, 0x84, 0xc2, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfd, 0xfd, 0x01, 0x07, 
+    0x78, 0x80, 0x38, 0xf8, 0xf8, 0xf1, 0xe1, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x00, 0x00, 
+    0x00, 0x07, 0x78, 0x81, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  
+    },
+    { //Tap 2 flipped
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x3e, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x7e, 0xfe, 0xfe, 0xfe, 0x00, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
+    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x01, 0x01, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x0f, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
+    0x02, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x70, 0x80, 
+    0x81, 0x01, 0x31, 0x32, 0x8a, 0x24, 0x86, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+    0x78, 0x81, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x07, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
+    },
+  };
+#endif //USE_BITMAP_COMPRESSION
+#endif //OLED_ENABLE
diff --git a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c
new file mode 100644
index 0000000000..2db96a11c2
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c
@@ -0,0 +1,181 @@
+/* Copyright 2022 adpenrose
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "animation_frames.h"
+
+/* Base layout:
+ * ,---------------------------------------------------------------------|
+ * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=  |Backspace| OLED|
+ * |---------------------------------------------------------------      |
+ * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |   \      OLED|
+ * |---------------------------------------------------------------------|
+ * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
+ * |---------------------------------------------------------------------|
+ * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift    |Up| M0(3) |
+ * |---------------------------------------------------------------------|
+ * |Ctrl|GUI |Alt |     Space               |MO(1) |MO(2)|   |Lt |Dn |Rt |
+ * `---------------------------------------------------------------------|'
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT(
+          KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
+          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,   KC_ENT,           KC_MUTE,
+          KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,   KC_UP,    MO(3),
+          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(1), MO(2),           KC_LEFT, KC_DOWN,  KC_RIGHT
+    ),
+    [1] = LAYOUT(
+      _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,    KC_F11,  KC_F12, KC_DEL,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      QK_BOOT,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
+    ),
+    [2] = LAYOUT(
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MNXT,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
+    ),
+    [3] = LAYOUT(
+      _______,    _______,      _______,      _______,      _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,  _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,   
+      _______,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
+    ),
+};
+
+/* Encoder */
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+#ifdef OLED_ENABLE
+#define IDLE_FRAME_DURATION 200 // Idle animation iteration rate in ms
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
+
+uint32_t anim_timer         = 0;
+uint32_t anim_sleep         = 0;
+uint8_t  current_idle_frame = 0;
+
+bool tap_anim        = false;
+bool tap_anim_toggle = false;
+
+
+// Decompress and write a precompressed bitmap frame to the OLED.
+// Documentation and python compression script available at:
+// https://github.com/nullbitsco/squeez-o
+#ifdef USE_OLED_BITMAP_COMPRESSION
+static void oled_write_compressed_P(const char* input_block_map, const char* input_block_list) {
+    uint16_t block_index = 0;
+    for (uint16_t i=0; i<NUM_OLED_BYTES; i++) {
+        uint8_t bit = i%8;
+        uint8_t map_index = i/8;
+        uint8_t _block_map = (uint8_t)pgm_read_byte_near(input_block_map + map_index);
+        uint8_t nonzero_byte = (_block_map & (1 << bit));
+        if (nonzero_byte) {
+            const char data = (const char)pgm_read_byte_near(input_block_list + block_index++);
+            oled_write_raw_byte(data, i);
+        } else {
+            const char data = (const char)0x00;
+            oled_write_raw_byte(data, i);
+        }
+    }
+}
+#endif
+
+static void render_anim(void) {
+    // Idle animation
+    void animation_phase(void) {
+        if (!tap_anim) {
+            current_idle_frame = (current_idle_frame + 1) % NUM_IDLE_FRAMES;
+            uint8_t idx = abs((NUM_IDLE_FRAMES - 1) - current_idle_frame);
+            #ifdef USE_OLED_BITMAP_COMPRESSION
+            oled_write_compressed_P(idle_block_map[idx], idle_frames[idx]);
+            #else
+            oled_write_raw_P(idle_frames[idx], NUM_OLED_BYTES);
+            #endif
+        }
+    }
+
+    // Idle behaviour
+    if (get_current_wpm() != 000) {  // prevent sleep
+        oled_on();
+        if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+        anim_sleep = timer_read32();
+    } else {  // Turn off screen when timer threshold elapsed or reset time since last input
+        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+bool oled_task_user(void) {
+    render_anim();
+    oled_set_cursor(0, 0);
+
+    uint8_t n = get_current_wpm();
+    char wpm_counter[6];
+    wpm_counter[5] = '\0';
+    wpm_counter[4] = '0' + n % 10;
+    wpm_counter[3] = '0' + (n /= 10) % 10;
+    wpm_counter[2] = '0' + n / 10 ;
+    wpm_counter[1] = '0';
+    wpm_counter[0] = '>';
+    oled_write_ln(wpm_counter, false);
+
+    return false;
+}
+#endif
+
+// Animate tap
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    #ifdef OLED_ENABLE
+    // Check if non-mod
+    if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
+        if (record->event.pressed) {
+            // Display tap frames
+            tap_anim_toggle = !tap_anim_toggle;
+            #ifdef USE_OLED_BITMAP_COMPRESSION
+            oled_write_compressed_P(tap_block_map[tap_anim_toggle], tap_frames[tap_anim_toggle]);
+            #else
+            oled_write_raw_P(tap_frames[tap_anim_toggle], NUM_OLED_BYTES);
+            #endif
+        }
+    }
+    #endif
+
+    return true;
+
+}
diff --git a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/rules.mk
new file mode 100644
index 0000000000..24719cefb2
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/rules.mk
@@ -0,0 +1,6 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+WPM_ENABLE = yes
+SPACE_CADET_ENABLE = no
+MAGIC_ENABLE = no
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c
index 4930d5bc68..59955d33bd 100644
--- a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c
+++ b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 adpenrose
+/* Copyright 2022 adpenrose
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,105 +23,52 @@
  * |---------------------------------------------------------------------|
  * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
  * |---------------------------------------------------------------------|
- * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift       |Up| M1 |
+ * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift    |Up| M0(3) |
  * |---------------------------------------------------------------------|
- * |Ctrl|GUI |Alt |     Space               |MO(2) |MO(3)|   |Lt |Dn |Rt |
+ * |Ctrl|GUI |Alt |     Space               |MO(1) |MO(2)|   |Lt |Dn |Rt |
  * `---------------------------------------------------------------------|'
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_65_ansi_blocker(
+    [0] = LAYOUT(
           KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
           KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
           KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,   KC_ENT,           KC_MUTE,
-          KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,   KC_UP,    KC_DEL,
-          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(2), MO(3),           KC_LEFT, KC_DOWN,  KC_RIGHT
+          KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,   KC_UP,    MO(3),
+          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(1), MO(2),           KC_LEFT, KC_DOWN,  KC_RIGHT
     ),
-    [1] = LAYOUT_65_ansi_blocker(
+    [1] = LAYOUT(
+      _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,    KC_F11,  KC_F12, KC_DEL,
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
+      QK_BOOT,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
       _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
       _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
     ),
-    [2] = LAYOUT_65_ansi_blocker(
+    [2] = LAYOUT(
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MNXT,
       _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
       _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
     ),
-    [3] = 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,  _______,
+    [3] = LAYOUT(
+      _______,    _______,      _______,      _______,      _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,  _______,
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,   
-      QK_BOOT,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
+      _______,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
       _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
       _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
     ),
 };
 
 /* Encoder */
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    /* Used to change the layer using the encoder. */
-    static int8_t selected_layer = 0; 
-
-    if (clockwise){
-        /* Check if left shift is pressed: */
-        if (selected_layer < 4 && get_mods() & MOD_BIT(KC_LSFT)){
-            selected_layer ++;
-            /* If already on the last layer, jumps back to the first layer: */
-            if (selected_layer == 4) {
-                selected_layer = 0;
-            }
-            /* Move to the selected layer. */
-            layer_move(selected_layer); 
-        } else if (get_mods() & MOD_BIT(KC_RSFT)){ /* Check if right shift is pressed: */
-            switch (get_highest_layer(layer_state)){
-                default:
-                    /* Go to the next track. */
-                    tap_code(KC_MNXT);
-                    break;
-            }
-        } else {
-            /* If shift isn't pressed, encoder will do this stuff: */
-            switch (get_highest_layer(layer_state)){
-                default:
-                    /* Turn up the volume of the system. */
-                    tap_code(KC_VOLU);
-                    break;
-            }
-        }
-    } else {
-        /* Check if left shift is pressed: */
-        if (selected_layer > -1 && get_mods() & MOD_BIT(KC_LSFT)){
-            selected_layer --;
-            /* If already on the first layer, jumps up to the last layer: */
-            if (selected_layer == -1) {
-                selected_layer = 3;
-            }
-        /* Move to the selected layer. */
-            layer_move(selected_layer);
-        } else if (get_mods() & MOD_BIT(KC_RSFT)){ /* Check if right shift is pressed: */
-            switch (get_highest_layer(layer_state)){
-                default:
-                    /* Go to the previous track. */
-                    tap_code(KC_MPRV);
-                    break;
-            }
-        } else {
-            /* If shift isn't pressed, encoder will do this stuff: */
-            switch (get_highest_layer(layer_state)){
-                default:
-                    /* Turn down the volume of the system. */
-                    tap_code(KC_VOLD);
-                    break;
-            }
-        }
-    }
-    return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
 #endif
 
 #ifdef OLED_ENABLE
@@ -134,9 +81,9 @@ int   icon_med_wpm      = 50;           // WPM required to display the medium sn
 int   icon_fast_wpm     = 72;           // WPM required to display the fast snail
 // Layer names:  Should be exactly 5 characters in length if vertical display, or 6 characters if horizontal
 #define MA_LAYER_NAME     "QWRTY"      // Layer 0 name
-#define L1_LAYER_NAME     "KICAD"      // Layer 1 name
+#define L1_LAYER_NAME     "FUNCT"      // Layer 1 name
 #define L2_LAYER_NAME     "NMPAD"      // Layer 2 name
-#define L3_LAYER_NAME     "FUNCT"      // Layer 3 name
+#define L3_LAYER_NAME     "RANDM"      // Layer 3 name
 // Constants required for the background render, the graph render and the WPM counter. THESE VALUES SHOULD NOT BE CHANGED.
 bool  first_loop  = true;
 int   timer       = 0;
diff --git a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/rules.mk
index 8058dc57fc..24719cefb2 100644
--- a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/rules.mk
+++ b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/rules.mk
@@ -3,3 +3,4 @@ LTO_ENABLE = yes
 WPM_ENABLE = yes
 SPACE_CADET_ENABLE = no
 MAGIC_ENABLE = no
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c
index ea0b06070d..5a42fa9b2f 100644
--- a/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c
+++ b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 adpenrose
+/* Copyright 2022 adpenrose
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,36 +23,36 @@
  * |---------------------------------------------------------------------|
  * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
  * |---------------------------------------------------------------------|
- * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift       |Up| M1 |
+ * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift    |Up| M0(3) |
  * |---------------------------------------------------------------------|
- * |Ctrl|GUI |Alt |     Space               |MO(2) |MO(3)|   |Lt |Dn |Rt |
+ * |Ctrl|GUI |Alt |     Space               |MO(1) |MO(2)|   |Lt |Dn |Rt |
  * `---------------------------------------------------------------------|'
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_65_ansi_blocker(
+    [0] = LAYOUT(
           KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
           KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
           KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,   KC_ENT,           KC_MUTE,
-          KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,   KC_UP,    KC_DEL,
+          KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,   KC_UP,    MO(3),
           KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(1),   MO(2),             KC_LEFT, KC_DOWN,  KC_RIGHT
     ),
-    [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,  _______,
+    [1] = LAYOUT(
+      _______,    KC_F1,      KC_F2,      KC_F3,      KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,     KC_F11,   KC_F12,  KC_DEL,
       _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, 
       QK_BOOT,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
       _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                            KC_SPC,                                    _______,    _______,              _______,  _______,  _______
+      _______,  _______,    _______,                            _______,                                    _______,    _______,              _______,  _______,  _______
     ),
-    [2] = LAYOUT_65_ansi_blocker(
+    [2] = LAYOUT(
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MNXT,
       _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
       _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
     ),
-    [3] = LAYOUT_65_ansi_blocker(
+    [3] = LAYOUT(
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
       _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
@@ -60,3 +60,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
     ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/adpenrose/kintsugi/keymaps/via/rules.mk
+++ b/keyboards/adpenrose/kintsugi/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/kintsugi.c b/keyboards/adpenrose/kintsugi/kintsugi.c
index ff62858377..59e7d79b55 100644
--- a/keyboards/adpenrose/kintsugi/kintsugi.c
+++ b/keyboards/adpenrose/kintsugi/kintsugi.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 adpenrose
+/* Copyright 2022 adpenrose
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,34 +16,6 @@
 
 #include "kintsugi.h"
 
-/* Encoder */
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { 
-        return false; 
-    } else {
-/* The switch case allows for different encoder mappings on different layers, "default" map gets applied for all unspecified layers */
-        switch(get_highest_layer(layer_state)){
-            case 1:
-                if (clockwise) {
-                    tap_code(KC_MNXT);
-                } else {
-                    tap_code(KC_MPRV);
-                }
-                break;
-            default:
-                if (clockwise){
-                    tap_code(KC_VOLU);
-                } else{
-                    tap_code(KC_VOLD);
-                }
-                break;
-        }
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
     return OLED_ROTATION_270;
diff --git a/keyboards/adpenrose/kintsugi/kintsugi.h b/keyboards/adpenrose/kintsugi/kintsugi.h
index 37ce6cc6e5..728ef72d0a 100644
--- a/keyboards/adpenrose/kintsugi/kintsugi.h
+++ b/keyboards/adpenrose/kintsugi/kintsugi.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 adpenrose
+/* Copyright 2022 adpenrose
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_65_ansi_blocker( \
+#define LAYOUT( \
   K00, K01, K02, K03, K04, K05, K06, K50, K51, K52, K53, K54, K55, K56, \
   K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, \
   K20, K21, K22, K23, K24, K25, K26, K70, K71, K72, K73, K74, K75, K76, \
diff --git a/keyboards/adpenrose/kintsugi/readme.md b/keyboards/adpenrose/kintsugi/readme.md
index 708dc16699..9c0ccd1a1a 100644
--- a/keyboards/adpenrose/kintsugi/readme.md
+++ b/keyboards/adpenrose/kintsugi/readme.md
@@ -15,7 +15,7 @@ A 65%-ish keyboard with some extra features.
 ## General info
 
 * Keyboard Maintainer: [Arturo Avila](https://github.com/ADPenrose)
-* Hardware Supported: Kintsugi V1 PCB
+* Hardware Supported: Kintsugi v1 PCB
 * Hardware Availability: [Arturo Avila](https://github.com/ADPenrose)
 
 Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/adpenrose/kintsugi/rules.mk b/keyboards/adpenrose/kintsugi/rules.mk
index fe95a9b72b..6a0aca4700 100644
--- a/keyboards/adpenrose/kintsugi/rules.mk
+++ b/keyboards/adpenrose/kintsugi/rules.mk
@@ -16,6 +16,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes		# Encoder functionality
+ENCODER_ENABLE = yes		    # Encoder functionality
 OLED_ENABLE = yes           # OLED functionality
 OLED_DRIVER = SSD1306

From 63c87f591e96c1038acbc0665f6aea8628fd2089 Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Tue, 27 Sep 2022 21:51:40 +0800
Subject: [PATCH 464/959] Update VID and PID of Abats Keyboard Club Nayeon
 (#18503)

---
 keyboards/abatskeyboardclub/nayeon/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json
index 8cafe5aebf..ace6b22f08 100644
--- a/keyboards/abatskeyboardclub/nayeon/info.json
+++ b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -16,7 +16,7 @@
         "nkro": false
     },
     "usb": {
-        "vid": "0x4B47",
+        "vid": "0xABA7",
         "pid": "0x0001",
         "device_version": "2.0.0"
     },

From 703d8cd417115d6e37090e26e358cf73f6346113 Mon Sep 17 00:00:00 2001
From: izmishi <31067139+izmishi@users.noreply.github.com>
Date: Wed, 28 Sep 2022 18:16:24 +0100
Subject: [PATCH 465/959] Fix retain brightness when val is changed while a
 layer is active (#18426)

* Fix retain brightness when val is changed while a layer is active

* Fix retain brightness for RGBLIGHT_MODE_STATIC_GRADIENT

* Fix formatting
---
 quantum/rgblight/rgblight.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 73b352cea8..37cd7a66ab 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -523,10 +523,19 @@ void rgblight_sethsv_noeeprom_old(uint8_t hue, uint8_t sat, uint8_t val) {
 
 void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom) {
     if (rgblight_config.enable) {
+#ifdef RGBLIGHT_SPLIT
+        if (rgblight_config.hue != hue || rgblight_config.sat != sat || rgblight_config.val != val) {
+            RGBLIGHT_SPLIT_SET_CHANGE_HSVS;
+        }
+#endif
         rgblight_status.base_mode = mode_base_table[rgblight_config.mode];
         if (rgblight_config.mode == RGBLIGHT_MODE_STATIC_LIGHT) {
             // same static color
             LED_TYPE tmp_led;
+#ifdef RGBLIGHT_LAYERS_RETAIN_VAL
+            // needed for rgblight_layers_write() to get the new val, since it reads rgblight_config.val
+            rgblight_config.val = val;
+#endif
             sethsv(hue, sat, val, &tmp_led);
             rgblight_setrgb(tmp_led.r, tmp_led.g, tmp_led.b);
         } else {
@@ -568,15 +577,14 @@ void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool w
                     dprintf("rgblight rainbow set hsv: %d,%d,%d,%u\n", i, _hue, direction, range);
                     sethsv(_hue, sat, val, (LED_TYPE *)&led[i + rgblight_ranges.effect_start_pos]);
                 }
+#    ifdef RGBLIGHT_LAYERS_RETAIN_VAL
+                // needed for rgblight_layers_write() to get the new val, since it reads rgblight_config.val
+                rgblight_config.val = val;
+#    endif
                 rgblight_set();
             }
 #endif
         }
-#ifdef RGBLIGHT_SPLIT
-        if (rgblight_config.hue != hue || rgblight_config.sat != sat || rgblight_config.val != val) {
-            RGBLIGHT_SPLIT_SET_CHANGE_HSVS;
-        }
-#endif
         rgblight_config.hue = hue;
         rgblight_config.sat = sat;
         rgblight_config.val = val;

From 6f108642eb814e56d191db91cf0d0288914f53d7 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 28 Sep 2022 14:20:26 -0500
Subject: [PATCH 466/959] [Keyboard] Add KG60 and KG65 (#17565)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/keygem/kg60ansi/config.h            | 112 ++++++++++++++++++
 keyboards/keygem/kg60ansi/info.json           |  82 +++++++++++++
 .../keygem/kg60ansi/keymaps/default/keymap.c  |  40 +++++++
 .../keygem/kg60ansi/keymaps/via/keymap.c      |  58 +++++++++
 .../keygem/kg60ansi/keymaps/via/rules.mk      |   1 +
 keyboards/keygem/kg60ansi/kg60ansi.c          |  14 +++
 keyboards/keygem/kg60ansi/kg60ansi.h          |  32 +++++
 keyboards/keygem/kg60ansi/readme.md           |  26 ++++
 keyboards/keygem/kg60ansi/rules.mk            |  23 ++++
 keyboards/keygem/kg65rgbv2/config.h           | 112 ++++++++++++++++++
 keyboards/keygem/kg65rgbv2/info.json          |  89 ++++++++++++++
 .../keygem/kg65rgbv2/keymaps/default/keymap.c |  40 +++++++
 .../keygem/kg65rgbv2/keymaps/via/keymap.c     |  58 +++++++++
 .../keygem/kg65rgbv2/keymaps/via/rules.mk     |   1 +
 keyboards/keygem/kg65rgbv2/kg65rgbv2.c        |  14 +++
 keyboards/keygem/kg65rgbv2/kg65rgbv2.h        |  32 +++++
 keyboards/keygem/kg65rgbv2/readme.md          |  26 ++++
 keyboards/keygem/kg65rgbv2/rules.mk           |  24 ++++
 18 files changed, 784 insertions(+)
 create mode 100644 keyboards/keygem/kg60ansi/config.h
 create mode 100644 keyboards/keygem/kg60ansi/info.json
 create mode 100644 keyboards/keygem/kg60ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/keygem/kg60ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/keygem/kg60ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/keygem/kg60ansi/kg60ansi.c
 create mode 100644 keyboards/keygem/kg60ansi/kg60ansi.h
 create mode 100644 keyboards/keygem/kg60ansi/readme.md
 create mode 100644 keyboards/keygem/kg60ansi/rules.mk
 create mode 100644 keyboards/keygem/kg65rgbv2/config.h
 create mode 100644 keyboards/keygem/kg65rgbv2/info.json
 create mode 100644 keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
 create mode 100644 keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
 create mode 100644 keyboards/keygem/kg65rgbv2/keymaps/via/rules.mk
 create mode 100644 keyboards/keygem/kg65rgbv2/kg65rgbv2.c
 create mode 100644 keyboards/keygem/kg65rgbv2/kg65rgbv2.h
 create mode 100644 keyboards/keygem/kg65rgbv2/readme.md
 create mode 100644 keyboards/keygem/kg65rgbv2/rules.mk

diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
new file mode 100644
index 0000000000..6c79d5571c
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/config.h
@@ -0,0 +1,112 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
+#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Define RGB Underglow */
+#define RGB_DI_PIN F7
+#define RGBLED_NUM 64
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LIMIT_VAL 108
+#define RGB_VAL_STEP 12
+#define RGBLIGHT_DEFAULT_SPD 144
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
+/* #define RGBLIGHT_LAYER_BLINK*/
+
+/* Define less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * 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/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
new file mode 100644
index 0000000000..33f60df504
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "KG60 ANSI",
+    "manufacturer": "FJLabs",
+    "url": "https://www.keygem.store/",
+    "maintainer": "Keygem",
+    "usb": {
+        "vid": "0x4B47",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+                
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keygem/kg60ansi/keymaps/default/keymap.c b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..86c7512943
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_60_ansi(
+        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        KC_TAB, KC_Q, KC_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_RCTRL
+    ),
+
+    [_LAYER1] = LAYOUT_60_ansi(
+        KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
\ No newline at end of file
diff --git a/keyboards/keygem/kg60ansi/keymaps/via/keymap.c b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cc1cac96e9
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_60_ansi(
+        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        KC_TAB, KC_Q, KC_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_RCTRL
+    ),
+
+    [_LAYER1] = LAYOUT_60_ansi(
+        KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER2] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/keygem/kg60ansi/keymaps/via/rules.mk b/keyboards/keygem/kg60ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keygem/kg60ansi/kg60ansi.c b/keyboards/keygem/kg60ansi/kg60ansi.c
new file mode 100644
index 0000000000..15a1f4ee31
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/kg60ansi.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "kg60ansi.h"
diff --git a/keyboards/keygem/kg60ansi/kg60ansi.h b/keyboards/keygem/kg60ansi/kg60ansi.h
new file mode 100644
index 0000000000..96e78e8d6f
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/kg60ansi.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should 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"
+
+/* KG60 ANSI Keymap Definitions */
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C,      \
+    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D  \
+) { \
+    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D   }, \
+    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D   }, \
+    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D   }, \
+    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   KC_NO }, \
+    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D   }  \
+}
diff --git a/keyboards/keygem/kg60ansi/readme.md b/keyboards/keygem/kg60ansi/readme.md
new file mode 100644
index 0000000000..f24439855b
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/readme.md
@@ -0,0 +1,26 @@
+# Keygem KG60 ANSI 
+
+The following is the QMK Firmware for the Keygem KG60 ANSI PCB, a universal tray mount 60% hotswap PCB with per key RGB LED's. 
+
+The PCB will feature:
+* Kailh Hotswap sockets
+* QMK & VIA compatibility
+* Per-Key RGB LED's
+
+
+* Keyboard Maintainer: Keygem
+* Hardware Supported: KG60 ANSI
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keygem/kg60ansi:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). 
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
\ No newline at end of file
diff --git a/keyboards/keygem/kg60ansi/rules.mk b/keyboards/keygem/kg60ansi/rules.mk
new file mode 100644
index 0000000000..e64258fe9b
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 60_ansi
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
new file mode 100644
index 0000000000..e62df985c4
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/config.h
@@ -0,0 +1,112 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
+#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Define RGB Underglow */
+#define RGB_DI_PIN F7
+#define RGBLED_NUM 68
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LIMIT_VAL 96
+#define RGB_VAL_STEP 12
+#define RGBLIGHT_DEFAULT_SPD 144
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
+/* #define RGBLIGHT_LAYER_BLINK*/
+
+/* Define less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * 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/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json
new file mode 100644
index 0000000000..1693c683d3
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/info.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "KG65 RGB V2",
+    "manufacturer": "FJLabs",
+    "url": "https://www.keygem.store/",
+    "maintainer": "Keygem",
+    "usb": {
+        "vid": "0x4B47",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+                {"x": 15, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x": 15, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x": 15, "y": 2},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c b/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9d7c31fea2
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi(
+        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi(
+        KC_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_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
\ No newline at end of file
diff --git a/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c b/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..21824528c1
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi(
+        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi(
+        KC_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_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER2] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/keygem/kg65rgbv2/keymaps/via/rules.mk b/keyboards/keygem/kg65rgbv2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keygem/kg65rgbv2/kg65rgbv2.c b/keyboards/keygem/kg65rgbv2/kg65rgbv2.c
new file mode 100644
index 0000000000..f714accbf4
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/kg65rgbv2.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "kg65rgbv2.h"
diff --git a/keyboards/keygem/kg65rgbv2/kg65rgbv2.h b/keyboards/keygem/kg65rgbv2/kg65rgbv2.h
new file mode 100644
index 0000000000..44415a1894
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/kg65rgbv2.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should 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"
+
+/* TF60 ANSI Keymap Definitions */
+#define LAYOUT_65_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \
+    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
+) { \
+    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, K0E }, \
+    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D, K1E }, \
+    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D, K2E }, \
+    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   K3D, K3E }, \
+    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   K4C,   K4D, K4E }  \
+}
diff --git a/keyboards/keygem/kg65rgbv2/readme.md b/keyboards/keygem/kg65rgbv2/readme.md
new file mode 100644
index 0000000000..20900cb861
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/readme.md
@@ -0,0 +1,26 @@
+# Keygem KG65 RGB V2 
+
+The following is the QMK Firmware for the FJLabs TF65 RGB V2 PCB, a universal tray mount 65% hotswap PCB with per key RGB LED's. 
+
+The PCB will feature:
+* Kailh Hotswap sockets
+* QMK & VIA compatibility
+* Per-Key RGB LED's
+
+
+* Keyboard Maintainer: Keygem
+* Hardware Supported: KG65 RGB V2
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keygem/kg65rgbv2:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
\ No newline at end of file
diff --git a/keyboards/keygem/kg65rgbv2/rules.mk b/keyboards/keygem/kg65rgbv2/rules.mk
new file mode 100644
index 0000000000..14620e11af
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+
+LAYOUTS = 65_ansi

From 7b7255553ceb33fc77ac7bd691ce355097262207 Mon Sep 17 00:00:00 2001
From: Max Renner <rennerom@gmail.com>
Date: Wed, 28 Sep 2022 14:21:16 -0500
Subject: [PATCH 467/959] [Keymap] Add rennerom planck layout (#17283)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/planck/keymaps/rennerom/config.h  |  38 +++++
 keyboards/planck/keymaps/rennerom/keymap.c  | 174 ++++++++++++++++++++
 keyboards/planck/keymaps/rennerom/readme.md |   2 +
 keyboards/planck/keymaps/rennerom/rules.mk  |   1 +
 4 files changed, 215 insertions(+)
 create mode 100644 keyboards/planck/keymaps/rennerom/config.h
 create mode 100644 keyboards/planck/keymaps/rennerom/keymap.c
 create mode 100644 keyboards/planck/keymaps/rennerom/readme.md
 create mode 100644 keyboards/planck/keymaps/rennerom/rules.mk

diff --git a/keyboards/planck/keymaps/rennerom/config.h b/keyboards/planck/keymaps/rennerom/config.h
new file mode 100644
index 0000000000..af93b5e2ce
--- /dev/null
+++ b/keyboards/planck/keymaps/rennerom/config.h
@@ -0,0 +1,38 @@
+// Copyright 2022 Max Renner (@rennerom)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+/*
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+*/
+#endif
+
+#define TAPPING_TERM 200
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+// Most tactile encoders have detents every 4 stages
+//#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/rennerom/keymap.c b/keyboards/planck/keymaps/rennerom/keymap.c
new file mode 100644
index 0000000000..0d98aac9c1
--- /dev/null
+++ b/keyboards/planck/keymaps/rennerom/keymap.c
@@ -0,0 +1,174 @@
+// Copyright 2022 Max Renner (@rennerom)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "muse.h"
+
+
+enum planck_layers {
+  _QWERTY,
+  _LOWER, 
+  _RAISE, 
+  _ADJUST,
+  _FN,
+  _NAV
+};
+
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define ESCNAV LT(_NAV, KC_ESC)
+#define WORDL LALT(KC_LEFT)
+#define WORDR LALT(KC_RGHT)
+#define EOL LGUI(KC_RIGHT)
+#define BOL LGUI(KC_LEFT)
+#define SPOTLT LGUI(KC_SPC)
+#define VBA LSFT(LALT(KC_F11))
+#define UNDO LGUI(KC_Z)
+#define CUT LGUI(KC_X)
+#define COPY LGUI(KC_C)
+#define PSTE LGUI(KC_V)
+#define ALL LGUI(KC_A)
+#define FIND LGUI(KC_F)
+#define SAVE LGUI(KC_S)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |ESCNAV|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |shfent|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  fn  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    ESCNAV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT ,
+    FN,      KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* fn
+ * ,------------------------------------------------------------------------------------.
+ * |      |  f1  |  f2  |  f3  |  f4  |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |  f5  |  f6  |  f7  |  f8  |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |  f9  |  f10 |  f11 |  f12 |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ */
+
+[_FN] = LAYOUT_planck_grid(
+	_______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+),
+
+/* NAV
+ * ,------------------------------------------------------------------------------------.
+ * |      |      | WORDL| WORDR|      |      |      |      |Insert|      |      |  Del |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      | Left | Down |  Up  | Right|      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |OpenSpotlight|      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ */
+
+[_NAV] = LAYOUT_planck_grid(
+	_______,  _______,  WORDL,    WORDR,    _______,  _______,  _______,  KC_INS ,  _______,  _______,  _______,  KC_DEL,
+    _______,  ALL,      SAVE,     _______,  FIND,     _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
+    _______,  UNDO,     CUT,      COPY,     PSTE,     _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  SPOTLT,   SPOTLT,   _______,  _______,  _______,  _______,  _______
+), 
+    
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * | ` ~  | 1 !  | 2 @  | 3 #  | 4 $  | 5 %  | 6 ^  | 7 &  | 8 *  | 9 (  | 0 )  | Bksp |
+ * ,------------------------------------------------------------------------------------.
+ * | Del  |  { [ |  } ] |   (  |   )  |  - _ |   +  |   =  |   *  |   %  |   _  |  \ | |
+ * ,------------------------------------------------------------------------------------.
+ * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ */
+
+[_LOWER] = LAYOUT_planck_grid(
+		KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
+    KC_DEL,   KC_LBRC,  KC_RBRC,  KC_LPRN,  KC_RPRN,  KC_MINS,  KC_PLUS,  KC_EQL,   KC_ASTR,  KC_PERC,  KC_UNDS,  KC_BSLS,
+    _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+),
+
+/* Raise
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * | Del  |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |Brite-|Brite+| Vol- | Vol+ |
+ * ,------------------------------------------------------------------------------------.
+ */
+
+[_RAISE] = LAYOUT_planck_grid(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    KC_DEL,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, VBA,     _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU
+),
+
+/* Adjust (Lower + Raise)
+ * ,------------------------------------------------------------------------------------.
+ * |      |  f1  |  f2  |  f3  |  f4  |RGBTOG|      |HUE - |HUE + |      |Debug |Reset |
+ * ,------------------------------------------------------------------------------------.
+ * |      |  f5  |  f6  |  f7  |  f8  |RGBM -|RGBM +|SAT - |SAT + |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |  f9  |  f10 |  f11 |  f12 |RGBsp-|RGBsp+|VIB - |VIB + |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ */
+
+[_ADJUST] = LAYOUT_planck_grid(
+    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DEBUG,    RESET,
+    _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    RGB_RMOD, RGB_MOD,  RGB_SAD,  RGB_SAI,  _______,  _______,  _______,
+    _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   RGB_SPD,  RGB_SPI,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+)
+
+
+};
+
+/* fn
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * ,------------------------------------------------------------------------------------.
+ */
+
+//#ifdef AUDIO_ENABLE
+//  float plover_song[][2]     = SONG(PLOVER_SOUND);
+//  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+//#endif
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/planck/keymaps/rennerom/readme.md b/keyboards/planck/keymaps/rennerom/readme.md
new file mode 100644
index 0000000000..81d580bba3
--- /dev/null
+++ b/keyboards/planck/keymaps/rennerom/readme.md
@@ -0,0 +1,2 @@
+# A Modified Default Planck Layout
+
diff --git a/keyboards/planck/keymaps/rennerom/rules.mk b/keyboards/planck/keymaps/rennerom/rules.mk
new file mode 100644
index 0000000000..acf0896a32
--- /dev/null
+++ b/keyboards/planck/keymaps/rennerom/rules.mk
@@ -0,0 +1 @@
+SRC += muse.c
\ No newline at end of file

From 269600f64072e79e7c248f7c2dd97bf310be2fcc Mon Sep 17 00:00:00 2001
From: Luis Carlos <luisca2992@gmail.com>
Date: Wed, 28 Sep 2022 13:22:59 -0600
Subject: [PATCH 468/959] Update feature_tap_dance.md (#18509)

Fixed typo
---
 docs/feature_tap_dance.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
index f3c203232b..cbee4d0c34 100644
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -42,7 +42,7 @@ For more complicated cases, like blink the LEDs, fiddle with the backlighting, a
 
 Well, that's the bulk of it! You should now be able to work through the examples below, and to develop your own Tap Dance functionality. But if you want a deeper understanding of what's going on behind the scenes, then read on for the explanation of how it all works!
 
-Let's go over the three functions mentioned in `ACTION_TAP_DANCE_FN_ADVANCED` in a little more detail. They all receive the same too arguments: a pointer to a structure that holds all dance related state information, and a pointer to a use case specific state variable. The three functions differ in when they are called. The first, `on_each_tap_fn()`, is called every time the tap dance key is *pressed*. Before it is called, the counter is incremented and the timer is reset. The second function, `on_dance_finished_fn()`, is called when the tap dance is interrupted or ends because `TAPPING_TERM` milliseconds have passed since the last tap. When the `finished` field of the dance state structure is set to `true`, the `on_dance_finished_fn()` is skipped. After `on_dance_finished_fn()` was called or would have been called, but no sooner than when the tap dance key is *released*, `on_dance_reset_fn()` is called. It is possible to end a tap dance immediately, skipping `on_dance_finished_fn()`, but not `on_dance_reset_fn`, by calling `reset_tap_dance(state)`.
+Let's go over the three functions mentioned in `ACTION_TAP_DANCE_FN_ADVANCED` in a little more detail. They all receive the same two arguments: a pointer to a structure that holds all dance related state information, and a pointer to a use case specific state variable. The three functions differ in when they are called. The first, `on_each_tap_fn()`, is called every time the tap dance key is *pressed*. Before it is called, the counter is incremented and the timer is reset. The second function, `on_dance_finished_fn()`, is called when the tap dance is interrupted or ends because `TAPPING_TERM` milliseconds have passed since the last tap. When the `finished` field of the dance state structure is set to `true`, the `on_dance_finished_fn()` is skipped. After `on_dance_finished_fn()` was called or would have been called, but no sooner than when the tap dance key is *released*, `on_dance_reset_fn()` is called. It is possible to end a tap dance immediately, skipping `on_dance_finished_fn()`, but not `on_dance_reset_fn`, by calling `reset_tap_dance(state)`.
 
 To accomplish this logic, the tap dance mechanics use three entry points. The main entry point is `process_tap_dance()`, called from `process_record_quantum()` *after* `process_record_kb()` and `process_record_user()`. This function is responsible for calling `on_each_tap_fn()` and `on_dance_reset_fn()`. In order to handle interruptions of a tap dance, another entry point, `preprocess_tap_dance()` is run right at the beginning of `process_record_quantum()`. This function checks whether the key pressed is a tap-dance key. If it is not, and a tap-dance was in action, we handle that first, and enqueue the newly pressed key. If it is a tap-dance key, then we check if it is the same as the already active one (if there's one active, that is). If it is not, we fire off the old one first, then register the new one. Finally, `tap_dance_task()` periodically checks whether `TAPPING_TERM` has passed since the last key press and finishes a tap dance if that is the case.
 

From d050e689f511ad3af4dfd2b9705a49f0f8d71d92 Mon Sep 17 00:00:00 2001
From: Alabahuy <rezzaadio@gmail.com>
Date: Thu, 29 Sep 2022 02:23:17 +0700
Subject: [PATCH 469/959] [Keyboard] add rart80 (#18287)

---
 keyboards/rart/rart80/config.h                |  63 ++++++++++
 keyboards/rart/rart80/info.json               | 113 ++++++++++++++++++
 .../rart/rart80/keymaps/default/keymap.c      |  55 +++++++++
 keyboards/rart/rart80/keymaps/via/keymap.c    |  55 +++++++++
 keyboards/rart/rart80/keymaps/via/rules.mk    |   2 +
 keyboards/rart/rart80/rart80.c                |  15 +++
 keyboards/rart/rart80/rart80.h                |  36 ++++++
 keyboards/rart/rart80/readme.md               |  30 +++++
 keyboards/rart/rart80/rules.mk                |  22 ++++
 9 files changed, 391 insertions(+)
 create mode 100644 keyboards/rart/rart80/config.h
 create mode 100644 keyboards/rart/rart80/info.json
 create mode 100644 keyboards/rart/rart80/keymaps/default/keymap.c
 create mode 100644 keyboards/rart/rart80/keymaps/via/keymap.c
 create mode 100644 keyboards/rart/rart80/keymaps/via/rules.mk
 create mode 100644 keyboards/rart/rart80/rart80.c
 create mode 100644 keyboards/rart/rart80/rart80.h
 create mode 100644 keyboards/rart/rart80/readme.md
 create mode 100644 keyboards/rart/rart80/rules.mk

diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
new file mode 100644
index 0000000000..21c88a18cf
--- /dev/null
+++ b/keyboards/rart/rart80/config.h
@@ -0,0 +1,63 @@
+/*
+Copyright 2022 Alabahuy
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B3, A1, B0, C3, D0, D1 }
+#define MATRIX_COL_PINS { A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7, B4, B2, B1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define LED_CAPS_LOCK_PIN D5
+#define LED_PIN_ON_STATE 0
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
+
+#define RGB_DI_PIN C0
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+/* You can change the number of RGB strip */
+#define RGBLED_NUM 6
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 240
+#define RGBLIGHT_SLEEP
+#endif
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
new file mode 100644
index 0000000000..9c6c52f33c
--- /dev/null
+++ b/keyboards/rart/rart80/info.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "RART80 Hotswap",
+    "manufacturer": "Alabahuy",
+    "url": "",
+    "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x0080",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+            "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+               
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+              
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+              
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+             
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+                {"x":15.25, "y":4.25},
+                {"x":16.25, "y":4.25},
+                {"x":17.25, "y":4.25},
+               
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5 },
+                {"x":12.5, "y":5.25},
+                {"x":13.5, "y":5.25, "w":1.5},
+                {"x":15.25, "y":5.25 },
+                {"x":16.25, "y":5.25 },
+                {"x":17.25, "y":5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/rart/rart80/keymaps/default/keymap.c b/keyboards/rart/rart80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d3b42c56e5
--- /dev/null
+++ b/keyboards/rart/rart80/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2022 Alabahuy
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_F13,             KC_PSCR,  KC_SCRL,  KC_PAUS,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,   KC_END,   KC_PGDN,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              _______,  KC_UP,    _______,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_RALT,  KC_RGUI,  KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______, _______, _______, _______, _______,
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,           _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+    _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
+  ),
+
+  [2] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
+  ),
+ 
+  [3] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
+  )
+
+};
diff --git a/keyboards/rart/rart80/keymaps/via/keymap.c b/keyboards/rart/rart80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8b49a8856c
--- /dev/null
+++ b/keyboards/rart/rart80/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2022 Alabahuy
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_F13,             KC_PSCR,  KC_SCRL,  KC_PAUS,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,   KC_END,   KC_PGDN,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),                        _______,  KC_UP,    _______,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_RALT,  KC_RGUI,  KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______, _______, _______, _______, _______,
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,           _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+    _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
+  ),
+
+  [2] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
+  ),
+ 
+  [3] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
+  )
+
+};
diff --git a/keyboards/rart/rart80/keymaps/via/rules.mk b/keyboards/rart/rart80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/rart/rart80/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/rart/rart80/rart80.c b/keyboards/rart/rart80/rart80.c
new file mode 100644
index 0000000000..8eeb608a42
--- /dev/null
+++ b/keyboards/rart/rart80/rart80.c
@@ -0,0 +1,15 @@
+/* Copyright 2022 Alabahuy
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "rart80.h"
\ No newline at end of file
diff --git a/keyboards/rart/rart80/rart80.h b/keyboards/rart/rart80/rart80.h
new file mode 100644
index 0000000000..e50ef380cf
--- /dev/null
+++ b/keyboards/rart/rart80/rart80.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 Alabahuy
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3D,      K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E, K4F, K4G, \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }, \
+}
diff --git a/keyboards/rart/rart80/readme.md b/keyboards/rart/rart80/readme.md
new file mode 100644
index 0000000000..f57c9131ad
--- /dev/null
+++ b/keyboards/rart/rart80/readme.md
@@ -0,0 +1,30 @@
+# [RART 80 Hotswap]
+
+![RART 80](https://i.imgur.com/QCeTuBeh.png)
+
+PCB layout TKL, based on IMKG (Indonesia Mechanical Keyboard Group)
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: RART80 PCB, Atmega32a, Type C
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rart/rart80:default
+
+Flashing example for this keyboard:
+
+    make rart/rart80:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* To Enter the bootloader you can short and hold boot pin, short reset pin, release reset and boot pin. 
+
+* Bootmagic reset, hold down the key at (0,0) in the matrix (ESC) and plug in the keyboard. 
+
+* Bootloader reset on the matrix, hold down key at (0,1) and plug in the keyboard
+
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/rart/rart80/rules.mk b/keyboards/rart/rart80/rules.mk
new file mode 100644
index 0000000000..3f9d76149a
--- /dev/null
+++ b/keyboards/rart/rart80/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32a
+
+# Bootloader selection
+BOOTLOADER = usbasploader
+
+# Processor frequency
+F_CPU = 16000000
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no

From d6f77637c5fe89cb70be4b33cc445a6c55a46d26 Mon Sep 17 00:00:00 2001
From: Mike Ryan <justfalter@users.noreply.github.com>
Date: Wed, 28 Sep 2022 14:23:42 -0500
Subject: [PATCH 470/959] [Keyboard] dygma/raise: multiple fixes and
 improvements (#18361[)

---
 keyboards/handwired/dygma/raise/ansi/ansi.c   | 14 ++---
 keyboards/handwired/dygma/raise/config.h      | 30 +++++++++++
 keyboards/handwired/dygma/raise/iso/iso.c     | 16 +++---
 keyboards/handwired/dygma/raise/leds.c        | 53 +++++++++----------
 keyboards/handwired/dygma/raise/leds.h        |  6 ---
 keyboards/handwired/dygma/raise/post_rules.mk |  3 ++
 keyboards/handwired/dygma/raise/raise.c       |  1 -
 keyboards/handwired/dygma/raise/rules.mk      |  4 +-
 8 files changed, 76 insertions(+), 51 deletions(-)
 create mode 100644 keyboards/handwired/dygma/raise/post_rules.mk

diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c
index 652b6551d2..8c88ced12f 100644
--- a/keyboards/handwired/dygma/raise/ansi/ansi.c
+++ b/keyboards/handwired/dygma/raise/ansi/ansi.c
@@ -28,7 +28,7 @@ const uint8_t led_map[DRIVER_LED_TOTAL] = {
   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 20, 0xff, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 68, 69,
 
   // right side - 36 keys includes LP
-  0 + LPH, 1 + LPH, 2 + LPH, 3 + LPH, 4 + LPH, 5 + LPH, 6 + LPH, 15 + LPH, 8 + LPH, 9 + LPH, 10 + LPH, 11 + LPH, 12 + LPH, 13 + LPH, 14 + LPH, 7 + LPH, 16 + LPH, 17 + LPH, 18 + LPH, 19 + LPH,
+  0 + LPH, 1 + LPH, 2 + LPH, 3 + LPH, 4 + LPH, 5 + LPH, 6 + LPH, 7 + LPH, 8 + LPH, 9 + LPH, 10 + LPH, 11 + LPH, 12 + LPH, 13 + LPH, 14 + LPH, 15 + LPH, 16 + LPH, 17 + LPH, 18 + LPH, 19 + LPH,
   20 + LPH, 21 + LPH, 22 + LPH, 23 + LPH, 24 + LPH, 25 + LPH, 26 + LPH, 27 + LPH, 28 + LPH, 29 + LPH, 30 + LPH, 31 + LPH, 32 + LPH, 33 + LPH, 68 + LPH, 69 + LPH,
 
   // left under glow - 30
@@ -50,11 +50,11 @@ led_config_t g_led_config = { {
     { 26 , 27 , 28 , 29 , 30 , NO_LED , 31     , 32     } ,
 
     // right hand
-    { NO_LED   , 6 + LHK  , 5 + LHK  , 4 + LHK  , 3 + LHK  , 2 + LHK  , 1 + LHK  , 0 + LHK  } ,
-    { 14 + LHK , 13 + LHK , 12 + LHK , 11 + LHK , 10 + LHK , 9 + LHK  , 8 + LHK  , 7 + LHK  } ,
-    { NO_LED   , 21 + LHK , 20 + LHK , 19 + LHK , 18 + LHK , 17 + LHK , 16 + LHK , 15 + LHK } ,
-    { NO_LED   , NO_LED   , 27 + LHK , 26 + LHK , 25 + LHK , 24 + LHK , 23 + LHK , 22 + LHK } ,
-    { 35 + LHK , 34 + LHK , 33 + LHK , 32 + LHK , 31 + LHK , 30 + LHK , 29 + LHK , 28 + LHK }
+    { 33  , 34  , 35  , 36  , 37 , 38  , 39     , NO_LED } ,
+    { 40 ,  41 ,  42 ,  43 ,  44 , 45  , 46     , 47     } ,
+    { 48 ,  49 ,  50 ,  51 ,  52 , 53  , 54     , NO_LED } ,
+    { 55 ,  56 ,  57 ,  58 ,  59 , 60 ,  NO_LED ,  NO_LED    } ,
+    { 61 ,  62 ,  63 ,  64 ,  65 , 66 ,  67 ,  68 }
   }, {
     // generated from the svg image of the keyboard, see create-led-config.js
     {82, 3}, {88, 3}, {94, 3}, {100, 3}, {106, 3}, {112, 3}, {118, 3}, {84, 10}, {91, 10}, {97, 10}, {103, 10}, {109, 10},
@@ -72,7 +72,7 @@ led_config_t g_led_config = { {
     {173, 63}, {177, 59}, {178, 49}, {179, 40}, {179, 31}, {177, 25}, {175, 20}, {175, 15}, {123, 54}
   }, {
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    0, 
+    0,
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
diff --git a/keyboards/handwired/dygma/raise/config.h b/keyboards/handwired/dygma/raise/config.h
index 64c6bad8e8..1596807ae3 100644
--- a/keyboards/handwired/dygma/raise/config.h
+++ b/keyboards/handwired/dygma/raise/config.h
@@ -25,3 +25,33 @@
 #define DEBOUNCE 0
 
 #define DRIVER_LED_TOTAL 132
+
+#ifdef RGB_MATRIX_ENABLE
+// At the default flush limit of 16ms (~62.5 fps), the matrix scan rate is approximately
+// ~140 scans per second under full load (when changes are being made to the LED state).
+// Such a low scan rate will have impact the keyboard's accuracy for faster typists.
+//
+// With RGB completely disabled, the matrix scan rate is ~660 scans per second, and typing
+// accuracy feels on par with the Dygma Raise Neuron.
+//
+// At 100ms (10 fps), the matrix scan rate is ~355 scans per second under full load, and typing
+// accuracy is reasonably good.
+#define RGB_MATRIX_LED_FLUSH_LIMIT 100
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+//#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#endif
diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c
index ec2607d06c..596b678638 100644
--- a/keyboards/handwired/dygma/raise/iso/iso.c
+++ b/keyboards/handwired/dygma/raise/iso/iso.c
@@ -50,21 +50,21 @@ led_config_t g_led_config = { {
     { 26 , 27 , 28 , 29 , 30 , NO_LED , 31     , 32     } ,
 
     // right hand
-    { NO_LED   , 6 + LHK  , 5 + LHK  , 4 + LHK  , 3 + LHK  , 2 + LHK  , 1 + LHK  , 0 + LHK  } ,
-    { 14 + LHK , 13 + LHK , 12 + LHK , 11 + LHK , 10 + LHK , 9 + LHK  , 8 + LHK  , 7 + LHK  } ,
-    { NO_LED   , 21 + LHK , 20 + LHK , 19 + LHK , 18 + LHK , 17 + LHK , 16 + LHK , 15 + LHK } ,
-    { NO_LED   , NO_LED   , 27 + LHK , 26 + LHK , 25 + LHK , 24 + LHK , 23 + LHK , 22 + LHK } ,
-    { 35 + LHK , 34 + LHK , 33 + LHK , 32 + LHK , 31 + LHK , 30 + LHK , 29 + LHK , 28 + LHK }
+    { 33  , 34  , 35  , 36  , 37 , 38  , 39     , NO_LED } ,
+    { 40 ,  41 ,  42 ,  43 ,  44 , 45  , 46     , 47     } ,
+    { 48 ,  49 ,  50 ,  51 ,  52 , 53  , 54     , NO_LED } ,
+    { 55 ,  56 ,  57 ,  58 ,  59 , 60 ,  NO_LED ,  NO_LED    } ,
+    { 61 ,  62 ,  63 ,  64 ,  65 , 66 ,  67 ,  68 }
   }, {
     // generated from the svg image of the keyboard, see create-led-config.js
-    {82, 3}, {88, 3}, {94, 3}, {100, 3}, {106, 3}, {112, 3}, {118, 3}, {84, 10}, {91, 10}, {97, 10}, {103, 10}, {109, 10}, 
+    {82, 3}, {88, 3}, {94, 3}, {100, 3}, {106, 3}, {112, 3}, {118, 3}, {84, 10}, {91, 10}, {97, 10}, {103, 10}, {109, 10},
     {115, 10}, {84, 16}, {92, 16}, {98, 16}, {104, 16}, {110, 16}, {116, 16}, {82, 22}, {88, 22}, {94, 22}, {100, 22},
     {106, 22}, {112, 22}, {118, 22}, {83, 28}, {90, 28}, {98, 28}, {106, 28}, {116, 28}, {111, 34}, {118, 34}, {168, 3},
     {159, 3}, {153, 3}, {147, 3}, {141, 3}, {135, 3}, {129, 3}, {170, 13}, {162, 10}, {156, 10}, {150, 10}, {144, 10},
-    {139, 10}, {133, 10}, {127, 10}, {164, 16}, {158, 16}, {152, 16}, {146, 16}, {140, 16}, {134, 16}, {128, 16}, {166, 22}, 
+    {139, 10}, {133, 10}, {127, 10}, {164, 16}, {158, 16}, {152, 16}, {146, 16}, {140, 16}, {134, 16}, {128, 16}, {166, 22},
     {154, 22}, {148, 22}, {142, 22}, {136, 22}, {130, 22}, {170, 28}, {163, 28}, {156, 28}, {149, 28}, {140, 28}, {131, 28},
     {136, 34}, {128, 34}, {78, 13}, {78, 6}, {80, 0}, {87, 0}, {95, 0}, {103, 0}, {111, 0}, {119, 0}, {122, 3}, {121, 9},
-    {120, 15}, {122, 21}, {123, 27}, {123, 33}, {120, 38}, {116, 42}, {114, 48}, {112, 55}, {109, 61}, {103, 64}, {96, 64}, 
+    {120, 15}, {122, 21}, {123, 27}, {123, 33}, {120, 38}, {116, 42}, {114, 48}, {112, 55}, {109, 61}, {103, 64}, {96, 64},
     {88, 64}, {81, 63}, {76, 60}, {75, 52}, {75, 46}, {74, 38}, {74, 32}, {75, 27}, {77, 21}, {175, 10}, {175, 4}, {172, 0},
     {164, 0}, {157, 0}, {149, 0}, {142, 0}, {134, 0}, {127, 0}, {123, 3}, {122, 8}, {122, 15}, {124, 21}, {124, 27}, {124, 33},
     {126, 38}, {131, 42}, {134, 48}, {135, 55}, {137, 61}, {143, 63}, {150, 63}, {158, 63}, {166, 63}, {173, 63}, {177, 59},
diff --git a/keyboards/handwired/dygma/raise/leds.c b/keyboards/handwired/dygma/raise/leds.c
index 3f6037cbfa..64f03d722a 100644
--- a/keyboards/handwired/dygma/raise/leds.c
+++ b/keyboards/handwired/dygma/raise/leds.c
@@ -24,16 +24,17 @@
 #include "print.h"
 #include "leds.h"
 
-struct __attribute__((packed)) cRGB {
+// Color order of LEDs is Green, Red, Blue.
+typedef struct PACKED {
     uint8_t r;
     uint8_t g;
     uint8_t b;
-};
+} raiseRGB;
 
 #define LEDS_PER_HAND 72
 #define LED_BANKS 9
 #define LEDS_PER_BANK 8
-#define LED_BYTES_PER_BANK (sizeof(cRGB) * LEDS_PER_BANK)
+#define LED_BYTES_PER_BANK (sizeof(raiseRGB) * LEDS_PER_BANK)
 
 // shifting << 1 is because drivers/chibios/i2c_master.h expects the address
 // shifted.
@@ -44,37 +45,28 @@ struct __attribute__((packed)) cRGB {
 #define LEFT 0
 #define RIGHT 1
 
-static cRGB led_state[2 * LEDS_PER_HAND];
-
-void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b) {
-    uint8_t buf[] = {TWI_CMD_LED_SET_ALL_TO, b, g, r};
-    i2c_transmit(I2C_ADDR(LEFT), buf, sizeof(buf), I2C_TIMEOUT);
-    wait_us(10);
-    i2c_transmit(I2C_ADDR(RIGHT), buf, sizeof(buf), I2C_TIMEOUT);
-    wait_us(10);
-}
-
-void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b) {
-    int     sled  = led_map[led];
-    uint8_t buf[] = {TWI_CMD_LED_SET_ONE_TO, sled & 0x1f, b, g, r};
-    int     hand  = (sled >= LEDS_PER_HAND) ? RIGHT : LEFT;
-    i2c_transmit(I2C_ADDR(hand), buf, sizeof(buf), I2C_TIMEOUT);
-    wait_us(10);
-}
+static raiseRGB led_pending[2 * LEDS_PER_HAND];
+static raiseRGB led_state[2 * LEDS_PER_HAND];
 
 static void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
     int sled = led_map[index];
-
-    led_state[sled].r = r;
-    led_state[sled].g = g;
-    led_state[sled].b = b;
+    // The red component of the LED is apparently stronger than the others.
+    // From: https://github.com/keyboardio/Kaleidoscope/blob/aba8c9ee66bbb5ded15135618d2b2964ee82b2cc/plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/raise/RaiseSide.cpp#L235-L242
+    if (r >= 26) {
+        r -= 26;
+    }
+    led_pending[sled].r = r;
+    led_pending[sled].g = g;
+    led_pending[sled].b = b;
 }
 
 static void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
     for (int i = 0; i < DRIVER_LED_TOTAL; i++) set_color(i, r, g, b);
 }
 
-static void init(void) {}
+static void init(void) {
+    set_color_all(0,0,0);
+}
 
 static void flush(void) {
     uint8_t  command[1 + LED_BYTES_PER_BANK];
@@ -86,10 +78,17 @@ static void flush(void) {
         for (int hand = 0; hand < 2; hand++) {
             int addr = I2C_ADDR(hand);
             int i = (hand * LEDS_PER_HAND) + (bank * LEDS_PER_BANK);
-            uint8_t *bank_data = (uint8_t *)&led_state[i];
+
+            if (memcmp(&led_state[i], &led_pending[i], LED_BYTES_PER_BANK) == 0) {
+                // No change.
+                continue;
+            }
+
+            // Update LED state
+            memcpy(&led_state[i], &led_pending[i], LED_BYTES_PER_BANK);
 
             command[0] = TWI_CMD_LED_BASE + bank;
-            memcpy(&command[1], bank_data, LED_BYTES_PER_BANK);
+            memcpy(&command[1], &led_pending[i], LED_BYTES_PER_BANK);
             i2c_transmit(addr, command, sizeof(command), I2C_TIMEOUT);
 
             // delay to prevent issues with the i2c bus
diff --git a/keyboards/handwired/dygma/raise/leds.h b/keyboards/handwired/dygma/raise/leds.h
index 8d70ed70b2..8964838aad 100644
--- a/keyboards/handwired/dygma/raise/leds.h
+++ b/keyboards/handwired/dygma/raise/leds.h
@@ -16,10 +16,4 @@
 
 #pragma once
 
-#include "quantum.h"
-#include "rgb_matrix.h"
-
 extern const uint8_t led_map[DRIVER_LED_TOTAL];
-
-void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
-void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);
diff --git a/keyboards/handwired/dygma/raise/post_rules.mk b/keyboards/handwired/dygma/raise/post_rules.mk
new file mode 100644
index 0000000000..c6b77f75b3
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
+	SRC += leds.c
+endif
diff --git a/keyboards/handwired/dygma/raise/raise.c b/keyboards/handwired/dygma/raise/raise.c
index d9023093b5..39e94e2e76 100644
--- a/keyboards/handwired/dygma/raise/raise.c
+++ b/keyboards/handwired/dygma/raise/raise.c
@@ -17,6 +17,5 @@
 #include "raise.h"
 
 void keyboard_post_init_kb(void) {
-    set_all_leds_to(0, 0, 0);
     keyboard_post_init_user();
 }
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index b7ff577361..ce7a89af8e 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -10,7 +10,7 @@ BOOTLOADER = stm32-dfu
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
+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
@@ -28,6 +28,6 @@ CUSTOM_MATRIX = lite
 RAW_ENABLE = yes
 
 QUANTUM_LIB_SRC += i2c_master.c
-SRC += leds.c matrix.c
+SRC += matrix.c
 
 DEFAULT_FOLDER = handwired/dygma/raise/ansi

From c71bc77da16885e94c9ea26b411d44d2cb5a4c95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 11:02:36 +1000
Subject: [PATCH 471/959] Bump anothrNick/github-tag-action from 1.46.0 to
 1.49.0 (#18515)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto_tag.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index 6205dbe11c..904db4dcc9 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.46.0
+      uses: anothrNick/github-tag-action@1.49.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

From c705f0f85f0ef4ca3bdb110c810e7d4e8f395b46 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 28 Sep 2022 23:32:03 -0700
Subject: [PATCH 472/959] Mechlovin Zed65 Wearhaus66 Configurator Fixes
 (#18507)

---
 .../mechlovin/zed65/wearhaus66/info.json      | 297 +++++++++++++-----
 .../mechlovin/zed65/wearhaus66/wearhaus66.h   |  21 +-
 2 files changed, 243 insertions(+), 75 deletions(-)

diff --git a/keyboards/mechlovin/zed65/wearhaus66/info.json b/keyboards/mechlovin/zed65/wearhaus66/info.json
index ac672ff1f6..4d71686d33 100644
--- a/keyboards/mechlovin/zed65/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/wearhaus66/info.json
@@ -2,90 +2,241 @@
     "keyboard_name": "Wearhaus66", 
     "manufacturer": "Mechlovin Studio",
     "url": "", 
-    "maintainer": "Mechlovin' Studio", 
+    "maintainer": "mechlovin",
     "usb": {
         "vid": "0x4D4C",
         "pid": "0x6602",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
+        "LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0}, 
-                {"label":"0,1", "x":1, "y":0}, 
-                {"label":"0,2", "x":2, "y":0}, 
-                {"label":"0,3", "x":3, "y":0}, 
-                {"label":"0,4", "x":4, "y":0}, 
-                {"label":"0,5", "x":5, "y":0}, 
-                {"label":"0,6", "x":6, "y":0}, 
-                {"label":"0,7", "x":7, "y":0}, 
-                {"label":"0,8", "x":8, "y":0}, 
-                {"label":"0,9", "x":9, "y":0}, 
-                {"label":"0,10", "x":10, "y":0}, 
-                {"label":"0,11", "x":11, "y":0}, 
-                {"label":"0,12", "x":12, "y":0}, 
-                {"label":"0,13", "x":13, "y":0}, 
-                {"label":"1,13", "x":14, "y":0}, 
-                {"label":"1,14", "x":15.25, "y":0.75}, 
-                {"label":"1,0", "x":0, "y":1, "w":1.5}, 
-                {"label":"1,1", "x":1.5, "y":1}, 
-                {"label":"1,2", "x":2.5, "y":1}, 
-                {"label":"1,3", "x":3.5, "y":1}, 
-                {"label":"1,4", "x":4.5, "y":1}, 
-                {"label":"1,5", "x":5.5, "y":1}, 
-                {"label":"1,6", "x":6.5, "y":1}, 
-                {"label":"1,7", "x":7.5, "y":1}, 
-                {"label":"1,8", "x":8.5, "y":1}, 
-                {"label":"1,9", "x":9.5, "y":1}, 
-                {"label":"1,10", "x":10.5, "y":1}, 
-                {"label":"1,11", "x":11.5, "y":1}, 
-                {"label":"1,12", "x":12.5, "y":1}, 
-                {"label":"2,12", "x":13.5, "y":1, "w":1.5}, 
-                {"label":"2,14", "x":15.25, "y":1.75}, 
-                {"label":"2,0", "x":0, "y":2, "w":1.75}, 
-                {"label":"2,1", "x":1.75, "y":2}, 
-                {"label":"2,2", "x":2.75, "y":2}, 
-                {"label":"2,3", "x":3.75, "y":2}, 
-                {"label":"2,4", "x":4.75, "y":2}, 
-                {"label":"2,5", "x":5.75, "y":2}, 
-                {"label":"2,6", "x":6.75, "y":2}, 
-                {"label":"2,7", "x":7.75, "y":2}, 
-                {"label":"2,8", "x":8.75, "y":2}, 
-                {"label":"2,9", "x":9.75, "y":2}, 
-                {"label":"2,10", "x":10.75, "y":2}, 
-                {"label":"2,11", "x":11.75, "y":2}, 
-                {"label":"2,13", "x":12.75, "y":2, "w":2.25}, 
-                {"label":"3,14", "x":15.25, "y":2.75}, 
-                {"label":"3,0", "x":0, "y":3, "w":1.25}, 
-                {"label":"3,1", "x":1.25, "y":3}, 
-                {"label":"3,2", "x":2.25, "y":3}, 
-                {"label":"3,3", "x":3.25, "y":3}, 
-                {"label":"3,4", "x":4.25, "y":3}, 
-                {"label":"3,5", "x":5.25, "y":3}, 
-                {"label":"3,6", "x":6.25, "y":3}, 
-                {"label":"3,7", "x":7.25, "y":3}, 
-                {"label":"3,8", "x":8.25, "y":3}, 
-                {"label":"3,9", "x":9.25, "y":3}, 
-                {"label":"3,10", "x":10.25, "y":3}, 
-                {"label":"3,11", "x":11.25, "y":3}, 
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75}, 
-                {"label":"3,13", "x":14, "y":3}, 
-                {"label":"4,0", "x":0, "y":4, "w":1.25}, 
-                {"label":"4,1", "x":1.25, "y":4, "w":1.25}, 
-                {"label":"4,2", "x":2.5, "y":4, "w":1.25}, 
-                {"label":"4,6", "x":3.75, "y":4, "w":6.25}, 
-                {"label":"4,9", "x":10, "y":4, "w":1.25}, 
-                {"label":"4,10", "x":11.25, "y":4, "w":1.25}, 
-                {"label":"4,12", "x":13, "y":4}, 
-                {"label":"4,13", "x":14, "y":4}, 
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"1,13", "x":14, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"2,12", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15.25, "y":0.75},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15.25, "y":1.75},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15.25, "y":2.75},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
                 {"label":"4,14", "x":15, "y":4}
-                ]
+            ]
         },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"1,14", "x":15.25, "y":0.75}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"2,12", "x":13.5, "y":1, "w":1.5}, {"label":"2,14", "x":15.25, "y":1.75}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"3,14", "x":15.25, "y":2.75}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,9", "x":10, "y":4, "w":1.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"2,12", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15.25, "y":0.75},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15.25, "y":1.75},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15.25, "y":2.75},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
         },
-        "LAYOUT_65_iso_blocker": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"1,14", "x":15.25, "y":0.75}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"2,12", "x":13.5, "y":1, "w":1.5}, {"label":"2,14", "x":15.25, "y":1.75}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"3,14", "x":15.25, "y":2.75}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,9", "x":10, "y":4, "w":1.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15.25, "y":0.75},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15.25, "y":1.75},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15.25, "y":2.75},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h b/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h
index 8c4a0ee79a..561ceedb9a 100644
--- a/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h
+++ b/keyboards/mechlovin/zed65/wearhaus66/wearhaus66.h
@@ -19,6 +19,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐           ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │┌───┐      │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤│1E │      └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │├───┤        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤│2E │     ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │├───┤     │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤│3E │     └───┴────┘
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │└───┘
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┐
+ *              │40  │41  │42  │46                      │49  │4A  │ │4C │4D │4E │
+ *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *              │40   │41 │42   │46                         │4A   │ Tsangan
+ *              └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
 #define LAYOUT_all( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,   \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E,   \
@@ -33,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { K40,   K41,   K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO,   K49,   K4A, KC_NO,   K4C,   K4D,   K4E   }, \
 }
 
-#define LAYOUT_65_ansi_blocker( \
+#define LAYOUT_ansi_blocker( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E,   \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E,   \
@@ -47,7 +64,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { K40,   K41,   K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO,   K49,   K4A, KC_NO,   K4C,   K4D,   K4E   }, \
 }
 
-#define LAYOUT_65_iso_blocker( \
+#define LAYOUT_iso_blocker( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E,   \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,   \

From 6b8dfdfca5bf14a7877d165ff2e9de746f2da79a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 28 Sep 2022 23:41:33 -0700
Subject: [PATCH 473/959] Mokey Ibis80 Refactor (#18514)

---
 keyboards/mokey/ibis80/ibis80.h               | 59 +++++++++--------
 keyboards/mokey/ibis80/info.json              | 19 +++---
 .../mokey/ibis80/keymaps/default/keymap.c     | 14 ++--
 keyboards/mokey/ibis80/keymaps/via/keymap.c   | 64 +++++++++----------
 4 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/keyboards/mokey/ibis80/ibis80.h b/keyboards/mokey/ibis80/ibis80.h
index ed2dbf7195..0f2c60a533 100644
--- a/keyboards/mokey/ibis80/ibis80.h
+++ b/keyboards/mokey/ibis80/ibis80.h
@@ -31,46 +31,45 @@
  *  ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐    │ ISO Enter
  *  │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │               │2D │    │
  *  ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     └───┴────┘
- *  │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D        │     │4F │     
- *  ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ 
+ *  │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D        │     │4F │
+ *  ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
  *  │50   │51 │52   │56                         │5A   │5B │5D   │ │5E │5F │5G │
- *  └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘           
+ *  └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
  *  ┌─────┐   ┌─────┬───────────────────────────┬─────┐   ┌─────┐
  *  │50   │   │52   │56                         │5A   │   │5D   │
  *  └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
  */
 
-#define LAYOUT(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,           k4d,      k4f, \
-    k50, k51, k52,                k56,                k5a, k5b,      k5d, k5e, k5f, k5g \
+#define LAYOUT_tkl_f13_ansi_tsangan(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,   k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,   k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,   \
+    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,      k4d,        k4f, \
+    k50, k51, k52,                k56,                     k5a, k5b, k5d,   k5e, k5f, k5g \
 ) \
 { \
-    { k00, k01, k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0a, k0b,   k0c,   k0d, k0e,   k0f,   k0g }, \
-    { k10, k11, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1a, k1b,   k1c,   k1d, k1e,   k1f,   k1g }, \
-    { k20, k21, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2a, k2b,   k2c,   k2d, k2e,   k2f,   k2g }, \
-    { k30, k31, k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3a, k3b,   KC_NO, k3d, KC_NO, KC_NO, KC_NO }, \
-    { k40, k41, k42, k43,   k44,   k45,   k46, k47,   k48,   k49,   k4a, KC_NO, KC_NO, k4d, KC_NO, k4f,   KC_NO },  \
-    { k50, k51, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, k5a, k5b,   KC_NO,   k5d, k5e,   k5f,   k5g }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, XXX, XXX, k4d, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g }  \
 }
 
-#define LAYOUT_all(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k3d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k2d, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,           k4d,      k4f, \
-    k50,      k52,                k56,                k5a,           k5d, k5e, k5f, k5g \
+#define LAYOUT_tkl_f13_ansi_wkl(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,   k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,   k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,   \
+    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,      k4d,        k4f, \
+    k50,      k52,                k56,                     k5a,      k5d,   k5e, k5f, k5g \
 ) \
 { \
-    { k00, k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0a, k0b,   k0c,   k0d,   k0e,   k0f,   k0g }, \
-    { k10, k11,   k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1a, k1b,   k1c,   k1d,   k1e,   k1f,   k1g }, \
-    { k20, k21,   k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2a, k2b,   k2c,   k3d,   k2e,   k2f,   k2g }, \
-    { k30, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3a, k3b,   KC_NO, k2d,   KC_NO, KC_NO, KC_NO }, \
-    { k40, k41,   k42, k43,   k44,   k45,   k46, k47,   k48,   k49,   k4a, KC_NO, KC_NO, k4d,   KC_NO, k4f,   KC_NO },  \
-    { k50, KC_NO, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, k5a, KC_NO, KC_NO, k5d,   k5e,   k5f,   k5g }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, XXX, XXX, k4d, XXX, k4f, XXX }, \
+    { k50, XXX, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, k5e, k5f, k5g }  \
 }
-
diff --git a/keyboards/mokey/ibis80/info.json b/keyboards/mokey/ibis80/info.json
index d236eabc71..8f906681fa 100644
--- a/keyboards/mokey/ibis80/info.json
+++ b/keyboards/mokey/ibis80/info.json
@@ -2,14 +2,17 @@
     "keyboard_name": "ibis 80",
     "manufacturer": "Mokey",
     "url": "",
-    "maintainer": "Mokey",
+    "maintainer": "Runheme",
     "usb": {
         "vid": "0x6653",
         "pid": "0x3380",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
                 {"label": "k00", "x": 0, "y": 0},
                 {"label": "k01", "x": 1.25, "y": 0},
@@ -48,7 +51,7 @@
                 {"label": "k1E", "x": 15.25, "y": 1.5},
                 {"label": "k1F", "x": 16.25, "y": 1.5},
                 {"label": "k1G", "x": 17.25, "y": 1.5},
-                
+
                 {"label": "k20", "x": 0, "y": 2.5, "w": 1.5},
                 {"label": "k21", "x": 1.5, "y": 2.5},
                 {"label": "k22", "x": 2.5, "y": 2.5},
@@ -110,7 +113,7 @@
                 {"label": "k5G", "x": 17.25, "y": 5.5}
             ]
         },
-        "LAYOUT_all": {
+        "LAYOUT_tkl_f13_ansi_wkl": {
             "layout": [
                 {"label": "k00", "x": 0, "y": 0},
                 {"label": "k01", "x": 1.25, "y": 0},
@@ -149,7 +152,7 @@
                 {"label": "k1E", "x": 15.25, "y": 1.5},
                 {"label": "k1F", "x": 16.25, "y": 1.5},
                 {"label": "k1G", "x": 17.25, "y": 1.5},
-                
+
                 {"label": "k20", "x": 0, "y": 2.5, "w": 1.5},
                 {"label": "k21", "x": 1.5, "y": 2.5},
                 {"label": "k22", "x": 2.5, "y": 2.5},
@@ -163,7 +166,7 @@
                 {"label": "k2A", "x": 10.5, "y": 2.5},
                 {"label": "k2B", "x": 11.5, "y": 2.5},
                 {"label": "k2C", "x": 12.5, "y": 2.5},
-                {"label": "k3D", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "k2D", "x": 13.5, "y": 2.5},
 
                 {"label": "k2E", "x": 15.25, "y": 2.5},
                 {"label": "k2F", "x": 16.25, "y": 2.5},
@@ -181,7 +184,7 @@
                 {"label": "k39", "x": 9.75, "y": 3.5},
                 {"label": "k3A", "x": 10.75, "y": 3.5},
                 {"label": "k3B", "x": 11.75, "y": 3.5},
-                {"label": "k2C", "x": 12.75, "y": 3.5},
+                {"label": "k3D", "x": 12.75, "y": 3.5, "w": 2.25},
 
                 {"label": "k40", "x": 0, "y": 4.5, "w": 2.25},
                 {"label": "k41", "x": 2.25, "y": 4.5},
@@ -208,6 +211,6 @@
                 {"label": "k5F", "x": 16.25, "y": 5.5},
                 {"label": "k5G", "x": 17.25, "y": 5.5}
             ]
-        }        
+        }
     }
 }
diff --git a/keyboards/mokey/ibis80/keymaps/default/keymap.c b/keyboards/mokey/ibis80/keymaps/default/keymap.c
index fefeede966..3a96b96b16 100644
--- a/keyboards/mokey/ibis80/keymaps/default/keymap.c
+++ b/keyboards/mokey/ibis80/keymaps/default/keymap.c
@@ -16,12 +16,12 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_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_F13,   KC_PSCR,   KC_BRMD, 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_INSERT, KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,  KC_DELETE, KC_END,  KC_PGDOWN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                                KC_UP,
-        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_LWIN, KC_RCTL,                     KC_LEFT,   KC_DOWN, KC_RGHT
+    [0] = LAYOUT_tkl_f13_ansi_tsangan(
+        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_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_LWIN, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/mokey/ibis80/keymaps/via/keymap.c b/keyboards/mokey/ibis80/keymaps/via/keymap.c
index 94678a8201..b8660178f3 100644
--- a/keyboards/mokey/ibis80/keymaps/via/keymap.c
+++ b/keyboards/mokey/ibis80/keymaps/via/keymap.c
@@ -16,36 +16,36 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
-      KC_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_F13,   KC_PSCR,   KC_BRMD, 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_INSERT, KC_HOME, KC_PGUP,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,  KC_DELETE, KC_END,  KC_PGDOWN,
-      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                                KC_UP,
-      KC_LCTL,          KC_LALT,                   KC_SPC,                             KC_RALT,          KC_RCTL,                     KC_LEFT,   KC_DOWN, KC_RGHT
-   ),
-   [1] = LAYOUT_all(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-      _______,          _______,                   _______,                            _______,          _______,                     _______, _______, _______
-   ),
-   [2] = LAYOUT_all(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-      _______,          _______,                   _______,                            _______,          _______,                     _______, _______, _______
-   ),
-   [3] = LAYOUT_all(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-      _______,          _______,                   _______,                            _______,          _______,                     _______, _______, _______
-   )
+    [0] = LAYOUT_tkl_f13_ansi_tsangan(
+        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_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_LWIN, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______,    _______, _______, _______
+    ),
+    [2] = LAYOUT_tkl_f13_ansi_tsangan(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______,    _______, _______, _______
+    ),
+    [3] = LAYOUT_tkl_f13_ansi_tsangan(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______,    _______, _______, _______
+    )
 };

From eb55551e2d764ac48c48e02165589ab11f4c8005 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 29 Sep 2022 01:32:25 -0700
Subject: [PATCH 474/959] Monoflex 60 Layout Refactor and Touch-Up (#18517)

---
 keyboards/monoflex60/info.json                |  8 ++++++--
 .../keymaps/60_iso_tsangan/keymap.c           | 18 ++++++++---------
 .../keymaps/60_tsangan_hhkb/keymap.c          | 12 +++++------
 keyboards/monoflex60/keymaps/default/keymap.c | 12 +++++------
 keyboards/monoflex60/keymaps/via/keymap.c     | 20 +++++++++----------
 keyboards/monoflex60/monoflex60.h             | 12 +++++------
 6 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/keyboards/monoflex60/info.json b/keyboards/monoflex60/info.json
index 64fc9f789a..a724e5de75 100644
--- a/keyboards/monoflex60/info.json
+++ b/keyboards/monoflex60/info.json
@@ -1,13 +1,17 @@
 {
     "keyboard_name": "Monoflex 60",
-    "manufacturer": "SanitGo Customs",
+    "manufacturer": "SantiGo Customs",
     "url": "",
-    "maintainer": "keyten",
+    "maintainer": "key10iq",
     "usb": {
         "vid": "0xDEB4",
         "pid": "0x60EB",
         "device_version": "0.0.1"
     },
+    "community_layouts": [
+        "60_tsangan_hhkb",
+        "60_iso_tsangan"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c b/keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c
index deb9f95b22..f547250474 100644
--- a/keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c
+++ b/keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c
@@ -19,16 +19,16 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_60_iso_tsangan(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, MO(1),   
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  
-		KC_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,   KC_RCTL),
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		KC_TAB,  KC_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, MO(1),   KC_ENT,
+		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+		KC_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
 
 	[1] = LAYOUT_60_iso_tsangan(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                            _______,                            _______, _______, _______)
 };
diff --git a/keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c b/keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c
index 8a5630554e..cd308a9d0c 100644
--- a/keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c
+++ b/keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c
@@ -19,16 +19,16 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_60_tsangan_hhkb(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), 
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
 		KC_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
 
 	[1] = LAYOUT_60_tsangan_hhkb(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                            _______,                            _______, _______, _______)
 };
diff --git a/keyboards/monoflex60/keymaps/default/keymap.c b/keyboards/monoflex60/keymaps/default/keymap.c
index 2572aad355..ce97bc3b81 100644
--- a/keyboards/monoflex60/keymaps/default/keymap.c
+++ b/keyboards/monoflex60/keymaps/default/keymap.c
@@ -19,16 +19,16 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
-		KC_LSFT, KC_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_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT, KC_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_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
 
 	[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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                            _______,                            _______, _______, _______)
 };
diff --git a/keyboards/monoflex60/keymaps/via/keymap.c b/keyboards/monoflex60/keymaps/via/keymap.c
index 92fee8dd1e..540ce671ef 100644
--- a/keyboards/monoflex60/keymaps/via/keymap.c
+++ b/keyboards/monoflex60/keymaps/via/keymap.c
@@ -19,30 +19,30 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
-		KC_LSFT, KC_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_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT, KC_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_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
 
 	[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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                            _______,                            _______, _______, _______),
 		
 	[2] = LAYOUT_all(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                            _______,                            _______, _______, _______),
 		
 	[3] = LAYOUT_all(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                            _______,                            _______, _______, _______)	
 };
diff --git a/keyboards/monoflex60/monoflex60.h b/keyboards/monoflex60/monoflex60.h
index cac9300863..49fd36d88f 100644
--- a/keyboards/monoflex60/monoflex60.h
+++ b/keyboards/monoflex60/monoflex60.h
@@ -34,9 +34,9 @@
  * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
 #define LAYOUT_all( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2c, \
 	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
 	k40, k41,      k43,                k47,                k4b, k4c, k4d  \
 ) { \
@@ -61,9 +61,9 @@
  * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
 #define LAYOUT_60_tsangan_hhkb( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2c, \
 	k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
 	k40, k41,      k43,                k47,                k4b, k4c, k4d  \
 ) { \
@@ -89,8 +89,8 @@
  */
 #define LAYOUT_60_iso_tsangan( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1d, \
 	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      \
 	k40, k41,      k43,                k47,                k4b, k4c, k4d  \
 ) { \

From 51f2d27321eb791f97e1e32b277b370321019fac Mon Sep 17 00:00:00 2001
From: DeflateAwning <11021263+DeflateAwning@users.noreply.github.com>
Date: Thu, 29 Sep 2022 04:50:32 -0600
Subject: [PATCH 475/959] Fix typo (#18526)

---
 docs/newbs_building_firmware.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/newbs_building_firmware.md b/docs/newbs_building_firmware.md
index c4ce9fd9f3..6163c6b02e 100644
--- a/docs/newbs_building_firmware.md
+++ b/docs/newbs_building_firmware.md
@@ -40,7 +40,7 @@ Open your `keymap.c` file in your text editor. Inside this file you'll find the
 
 This line indicates where the list of Layers begins. Below that you'll find lines containing `LAYOUT`, and these lines indicate the start of a layer. Below that line is the list of keys that comprise a particular layer.
 
-!> When editing your keymap file be careful not to add or remove any commas. If you do you will prevent your firmware from compiling and it may not be easy to figure out where the extra, or missing, comma is.
+!> When editing your keymap file be careful not to add or remove any commas. If you do, you will prevent your firmware from compiling and it may not be easy to figure out where the extra, or missing, comma is.
 
 ## Customize The Layout To Your Liking
 

From 961de3c20524ded55aa3778b15bedfa3f192905a Mon Sep 17 00:00:00 2001
From: Markus Knutsson <markus.knutsson@tweety.se>
Date: Thu, 29 Sep 2022 17:01:34 +0200
Subject: [PATCH 476/959] Update reference_info_json.md (#18518)

* Update reference_info_json.md

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/reference_info_json.md | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index 52f16b4401..34c536b329 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -91,6 +91,8 @@ Direct pins are when you connect one side of the switch to GND and the other sid
 
 When specifying direct pins you need to arrange them in nested arrays. The outer array consists of rows, while the inner array uses text strings to identify the pins used in each row. You can use `null` to indicate an empty spot in the matrix.
 
+Notice that when using direct pins, `diode_direction` is left undefined.
+
 Example:
 
 ```json
@@ -113,6 +115,14 @@ Example:
 This section controls basic 2-pin LEDs, which typically pass through keyswitches and are soldered into the PCB, or are placed in PCB sockets.
 ### Backlight
 
+Enable by setting 
+
+```json
+    "features": {
+        "backlight": true
+    }
+```
+
 * `breathing`
     * Enable backlight breathing, if supported
 * `breathing_period`
@@ -177,8 +187,9 @@ The following items can be set. Not every value is required.
     * Set to `true` to enable synchronization functionality between split halves
 * `split_count`
     * For split keyboards, the number of LEDs on each side
+    * Example `[ 10 , 10 ]`
 * `max_brightness`
-    * (0-255) What the maxmimum brightness (value) level is
+    * What the maximum brightness (value) level is (0-255)
 * `hue_steps`
     * How many steps of adjustment to have for hue
 * `saturation_steps`
@@ -243,6 +254,14 @@ The device version is a BCD (binary coded decimal) value, in the format `MMmr`,
 
 This section controls the basic [rotary encoder](feature_encoders.md) support.
 
+Enable by setting 
+
+```json
+    "features": {
+        "encoder": true
+    }
+```
+
 The following items can be set. Not every value is required.
 
 * `pin_a`

From 84ef82423686d8e213083cc81040353435dfc680 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 29 Sep 2022 10:28:39 -0600
Subject: [PATCH 477/959] =?UTF-8?q?Gentoo=20install=20script=20=E2=80=94?=
 =?UTF-8?q?=20build=20newlib=20with=20nano=20USE=20flag=20(#18527)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 util/install/gentoo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh
index b031fc7629..49e80490be 100755
--- a/util/install/gentoo.sh
+++ b/util/install/gentoo.sh
@@ -19,7 +19,7 @@ _qmk_install() {
 
     sudo touch /etc/portage/package.use/qmkfirmware
     # tee is used here since sudo doesn't apply to >>
-    echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
+    echo "sys-devel/gcc multilib\ncross-arm-none-eabi/newlib nano" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
     sudo emerge -auN sys-devel/gcc
     sudo emerge -au --noreplace \
         app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang \

From 14e18864056f836f359258521d63ddf7597d0dd7 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 29 Sep 2022 09:48:44 -0700
Subject: [PATCH 478/959] novelkeys/nk20: rename LAYOUT_all to LAYOUT (#18525)

This board only supports one layout.
---
 keyboards/novelkeys/nk20/info.json                | 5 ++++-
 keyboards/novelkeys/nk20/keymaps/default/keymap.c | 4 ++--
 keyboards/novelkeys/nk20/keymaps/via/keymap.c     | 8 ++++----
 keyboards/novelkeys/nk20/nk20.h                   | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index d6a714ea0b..f6da7d52da 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -8,8 +8,11 @@
         "pid": "0x4E4E",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "h":2}, {"x":0, "y":5, "w":2}, {"x":2, "y":5}]
         }
     }
diff --git a/keyboards/novelkeys/nk20/keymaps/default/keymap.c b/keyboards/novelkeys/nk20/keymaps/default/keymap.c
index 4bd3c48da1..63b6e6ac26 100644
--- a/keyboards/novelkeys/nk20/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk20/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT( /* Base */
     KC_VOLD, KC_VOLU, KC_MUTE,
     MO(1),   KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_P0,            KC_PDOT),
 
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT( /* FN */
     KC_NLCK, KC_TRNS, KC_TRNS,
     KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS,
diff --git a/keyboards/novelkeys/nk20/keymaps/via/keymap.c b/keyboards/novelkeys/nk20/keymaps/via/keymap.c
index e647dad016..71158863c4 100644
--- a/keyboards/novelkeys/nk20/keymaps/via/keymap.c
+++ b/keyboards/novelkeys/nk20/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT( /* Base */
     KC_VOLD, KC_VOLU, KC_MUTE,
     MO(1),   KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_P0,            KC_PDOT),
 
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT( /* FN */
     KC_NLCK, KC_TRNS, KC_TRNS,
     KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS,
     KC_TRNS,          KC_TRNS),
 
-[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+[2] = LAYOUT( /* 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,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,          KC_TRNS),
 
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+[3] = LAYOUT( /* 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,
diff --git a/keyboards/novelkeys/nk20/nk20.h b/keyboards/novelkeys/nk20/nk20.h
index 62aa0e69d3..a553a1af3e 100644
--- a/keyboards/novelkeys/nk20/nk20.h
+++ b/keyboards/novelkeys/nk20/nk20.h
@@ -21,7 +21,7 @@
 
 // This a shortcut to help you visually see your layout.
 
-#define LAYOUT_all( \
+#define LAYOUT( \
     K00, K01, K02,      \
     K10, K11, K12, K13, \
     K20, K21, K22, K23, \

From bfcbcfe3c7efad948a026ad8c365007bb82d9b6a Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Fri, 30 Sep 2022 00:50:47 +0800
Subject: [PATCH 479/959] Update q0 for keychron (#18522)

---
 keyboards/keychron/q0/config.h            | 10 +++++-----
 keyboards/keychron/q0/q0.c                |  8 ++++----
 keyboards/keychron/q0/rev_0130/rev_0130.c | 14 ++++++++------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h
index 40f506fe80..a04d31d3a2 100644
--- a/keyboards/keychron/q0/config.h
+++ b/keyboards/keychron/q0/config.h
@@ -34,18 +34,18 @@
 #define DRIVER_COUNT 1
 #define DRIVER_ADDR_1 0b1110100
 
-#define CONSTANT_CURRENT_STEP \
+#define CKLED2001_CURRENT_TUNE \
     { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }
 
+#define RGB_MATRIX_CENTER \
+    { 56, 16 }
+
 /* NKRO */
 #define FORCE_NKRO
 
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
-/* We have 2KB EEPROM size on STM32L432 */
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
-
 /* EEPROM Driver Configuration */
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
@@ -98,4 +98,4 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-// #define RGB_MATRIX_KEYPRESSES
\ No newline at end of file
+// #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q0/q0.c b/keyboards/keychron/q0/q0.c
index c43157ac68..d17ab77f47 100644
--- a/keyboards/keychron/q0/q0.c
+++ b/keyboards/keychron/q0/q0.c
@@ -16,7 +16,7 @@
 
 #include "q0.h"
 
-#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+#if defined(RGB_MATRIX_ENABLE) && defined(NUM_LOCK_LED_INDEX)
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) {
@@ -45,11 +45,11 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 __attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
 
-    if (host_keyboard_led_state().caps_lock) {
-        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    if (host_keyboard_led_state().num_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 255, 255, 255);
     } else {
         if (!rgb_matrix_get_flags()) {
-            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+            RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 0, 0, 0);
         }
     }
 }
diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c
index 468e3cf04f..64c4842086 100644
--- a/keyboards/keychron/q0/rev_0130/rev_0130.c
+++ b/keyboards/keychron/q0/rev_0130/rev_0130.c
@@ -18,6 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
+// clang-format off
+
 const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
 /* Refer to CKLED manual for these locations
  *   driver
@@ -67,12 +69,12 @@ led_config_t g_led_config = {
     },
     {
         // LED Index to Physical Position
-        {0,0},  {74,0},  {150,0},  {224,0},
-        {0,13}, {74,13}, {150,13}, {224,13},
-        {0,26}, {74,26}, {150,26},
-        {0,38}, {74,38}, {150,38}, {224,32},
-        {0,51}, {74,51}, {150,51},
-        {36,64},         {150,64}, {224,58},
+        {0,0},  {37,0},  {75,0},  {112,0},
+        {0,6},  {37,6},  {75,6},  {112,6},
+        {0,13}, {37,13}, {75,13},
+        {0,19}, {37,19}, {75,19}, {112,16},
+        {0,25}, {37,25}, {75,25},
+        {18,32},         {75,32}, {112,29},
     },
     {
         // LED Index to Flag

From 00dc764f7268bd2780645eb07ce59892faba0341 Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Thu, 29 Sep 2022 13:08:45 -0400
Subject: [PATCH 480/959] [docs] Improve documentation regarding info.json
 (#18508)

* docs: raise info.json awareness

* docs: note that DD migration is WIP
---
 docs/config_options.md      | 12 +++++++++++-
 docs/reference_info_json.md | 29 ++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/docs/config_options.md b/docs/config_options.md
index 3e011a5cc9..02cfe83c69 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -2,7 +2,17 @@
 
 QMK is nearly infinitely configurable. Wherever possible we err on the side of allowing users to customize their keyboard, even at the expense of code size. That level of flexibility makes for a daunting configuration experience, however.
 
-There are two main types of configuration files in QMK- `config.h` and `rules.mk`. These files exist at various levels in QMK and all files of the same type are combined to build the final configuration. The levels, from lowest priority to highest priority, are:
+There are three main types of configuration files in QMK:
+
+* `config.h`, which contains various preprocessor directives (`#define`, `#ifdef`)
+* `rules.mk`, which contains additional variables
+* `info.json`, which is utilized for [data-driven configuration](https://docs.qmk.fm/#/data_driven_config)
+
+This page will only discuss the first two types, `config.h` and `rules.mk`.
+
+?> While not all settings have data-driven equivalents yet, keyboard makers are encouraged to utilize the `info.json` file to set the metadata for their boards when possible. See the [`info.json` Format](https://docs.qmk.fm/#/reference_info_json) page for more details.
+
+These files exist at various levels in QMK and all files of the same type are combined to build the final configuration. The levels, from lowest priority to highest priority, are:
 
 * QMK Default
 * Keyboard
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index 34c536b329..05d4ef1113 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -1,12 +1,12 @@
 # `info.json`
 
-This file is used by the [QMK API](https://github.com/qmk/qmk_api). It contains the information [QMK Configurator](https://config.qmk.fm/) needs to display a representation of your keyboard. You can also set metadata here.
+The information contained in `info.json` is combined with the `config.h` and `rules.mk` files, dynamically generating the necessary configuration for your keyboard at compile time. It is also used by the [QMK API](https://github.com/qmk/qmk_api), and contains the information [QMK Configurator](https://config.qmk.fm/) needs to display a representation of your keyboard.
 
-You can create `info.json` files at every level under `qmk_firmware/keyboards/<name>` to specify this metadata. These files are combined, with more specific files overriding keys in less specific files. This means you do not need to duplicate your metadata information. For example, `qmk_firmware/keyboards/clueboard/info.json` specifies `manufacturer` and `maintainer`, while `qmk_firmware/keyboards/clueboard/66/info.json` specifies more specific information about Clueboard 66%.
+You can create `info.json` files at every level under `qmk_firmware/keyboards/<name>`. These files are combined, with more specific files overriding keys in less specific files. This means you do not need to duplicate your metadata information. For example, `qmk_firmware/keyboards/clueboard/info.json` specifies `manufacturer` and `maintainer`, while `qmk_firmware/keyboards/clueboard/66/info.json` specifies more specific information about Clueboard 66%.
 
 ## `info.json` Format
 
-The `info.json` file is a JSON formatted dictionary with the following keys available to be set. You do not have to set all of them, merely the keys that apply to your keyboard.
+The `info.json` file is a JSON formatted dictionary. The first six keys noted here must be defined in `info.json`, or your keyboard will not be accepted into the QMK repository.
 
 * `keyboard_name`
     * A free-form text string describing the keyboard.
@@ -20,6 +20,11 @@ The `info.json` file is a JSON formatted dictionary with the following keys avai
 * `maintainer`
     * GitHub username of the maintainer, or `qmk` for community maintained boards.
     * Example: `skullydazed`
+* `usb`
+    * Configure USB VID, PID, and device version. See the [USB](#USB) section for more detail.
+
+There are many more optional keys, some of which are described below. Others may be found by examining `data/schemas`.
+
 * `debounce`
     * The amount of time in milliseconds to wait for debounce to happen.
     * Default: `5`
@@ -33,8 +38,6 @@ The `info.json` file is a JSON formatted dictionary with the following keys avai
     * Configure the pins corresponding to columns and rows, or direct pins. See the [Matrix Pins](#matrix-pins) section for more detail.
 * `rgblight`
     * Configure the [RGB Lighting feature](feature_rgblight.md). See the [RGB Lighting](#rgb-lighting) section for more detail.
-* `usb`
-    * Configure USB VID, PID, and other parameters. See the [USB](#USB) section for more detail.
 
 ### Layout Format
 
@@ -45,7 +48,7 @@ Within our `info.json` file the `layouts` portion of the dictionary contains sev
 
 ### Key Dictionary Format
 
-Each Key Dictionary in a layout describes the physical properties of a key. If you are familiar with the Raw Code for <https://keyboard-layout-editor.com> you will find many of the concepts the same. We re-use the same key names and layout choices wherever possible, but unlike keyboard-layout-editor each key is stateless, inheriting no properties from the keys that came before it.
+Each Key Dictionary in a layout describes the physical properties of a key. If you are familiar with the Raw Data for <https://keyboard-layout-editor.com> you will find many of the concepts the same. We re-use the same key names and layout choices wherever possible, but unlike keyboard-layout-editor each key is stateless, inheriting no properties from the keys that came before it.
 
 All key positions and rotations are specified in relation to the top-left corner of the keyboard, and the top-left corner of each key.
 
@@ -115,7 +118,7 @@ Example:
 This section controls basic 2-pin LEDs, which typically pass through keyswitches and are soldered into the PCB, or are placed in PCB sockets.
 ### Backlight
 
-Enable by setting 
+Enable by setting
 
 ```json
     "features": {
@@ -155,6 +158,13 @@ Used for indicating Num Lock, Caps Lock, and Scroll Lock. May be soldered in-swi
     * The pin that controls the `Caps Lock` LED
 * `scroll_lock`
     * The pin that controls the `Scroll Lock` LED
+* `compose`
+    * The pin that controls the `Compose` LED
+* `kana`
+    * The pin that controls the `Kana` LED
+* `on_state`
+    * The state of the indicator pins when the LED is "on" - `1` for high, `0` for low
+    * Default: `1`
 
 Example:
 
@@ -208,7 +218,8 @@ Example:
         "saturation_steps": 17,
         "brightness_steps": 17,
         "animations": {
-            "all": true
+            "knight": true,
+            "rainbow_swirl": true
         }
     }
 }
@@ -254,7 +265,7 @@ The device version is a BCD (binary coded decimal) value, in the format `MMmr`,
 
 This section controls the basic [rotary encoder](feature_encoders.md) support.
 
-Enable by setting 
+Enable by setting
 
 ```json
     "features": {

From b51b3681b7d38f86d8c5b2df152c44ad5d7a1bff Mon Sep 17 00:00:00 2001
From: Daniel Bast <2790401+dbast@users.noreply.github.com>
Date: Thu, 29 Sep 2022 19:15:00 +0200
Subject: [PATCH 481/959] Fix keychron q2 iso default keymaps (#18501)

---
 keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c | 2 +-
 keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c     | 2 +-
 keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c | 2 +-
 keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c
index 75667b44c8..21a837c1a0 100644
--- a/keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c
+++ b/keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_iso_68(
-        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
         KC_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,
diff --git a/keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c
index 0a91857f1e..9eb7288dc1 100644
--- a/keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_iso_68(
-        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
         KC_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,
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
index e3e6cf7376..a44e7e4cc9 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_iso_68(
-        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_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_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
index 4e3b431bdf..268173b060 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
         KC_LSFT, KC_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,

From cbbb45c13f3de5ec28f62b6cd4a8b77143026500 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Fri, 30 Sep 2022 03:25:55 +1000
Subject: [PATCH 482/959] Start moving towards introspection-based data
 retrieval (#18441)

---
 builddefs/build_full_test.mk   |  4 ++--
 quantum/dynamic_keymap.c       | 29 +++++++++++++++--------------
 quantum/keyboard.c             |  5 ++---
 quantum/keymap.h               |  2 --
 quantum/keymap_common.c        |  6 +++---
 quantum/keymap_introspection.c | 22 ++++++++++++++++++++++
 quantum/keymap_introspection.h | 10 ++++++++++
 7 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/builddefs/build_full_test.mk b/builddefs/build_full_test.mk
index 4e4b4e4bfd..35f0a05b99 100644
--- a/builddefs/build_full_test.mk
+++ b/builddefs/build_full_test.mk
@@ -20,7 +20,7 @@ $(TEST)_SRC := \
 	$(TMK_COMMON_SRC) \
 	$(QUANTUM_SRC) \
 	$(SRC) \
-	tests/test_common/keymap.c \
+	$(QUANTUM_PATH)/keymap_introspection.c \
 	tests/test_common/matrix.c \
 	tests/test_common/test_driver.cpp \
 	tests/test_common/keyboard_report_util.cpp \
@@ -29,7 +29,7 @@ $(TEST)_SRC := \
 	tests/test_common/test_logger.cpp \
 	$(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
 
-$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS)
+$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""
 
 $(TEST)_CONFIG := $(TEST_PATH)/config.h
 
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index 01be9806e4..e9529ed14e 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -153,7 +153,7 @@ void dynamic_keymap_reset(void) {
         for (int row = 0; row < MATRIX_ROWS; row++) {
             for (int column = 0; column < MATRIX_COLS; column++) {
                 if (layer < keymap_layer_count()) {
-                    dynamic_keymap_set_keycode(layer, row, column, pgm_read_word(&keymaps[layer][row][column]));
+                    dynamic_keymap_set_keycode(layer, row, column, keycode_at_keymap_location_raw(layer, row, column));
                 } else {
                     dynamic_keymap_set_keycode(layer, row, column, KC_TRANSPARENT);
                 }
@@ -162,8 +162,8 @@ void dynamic_keymap_reset(void) {
 #ifdef ENCODER_MAP_ENABLE
         for (int encoder = 0; encoder < NUM_ENCODERS; encoder++) {
             if (layer < encodermap_layer_count()) {
-                dynamic_keymap_set_encoder(layer, encoder, true, pgm_read_word(&encoder_map[layer][encoder][0]));
-                dynamic_keymap_set_encoder(layer, encoder, false, pgm_read_word(&encoder_map[layer][encoder][1]));
+                dynamic_keymap_set_encoder(layer, encoder, true, keycode_at_encodermap_location_raw(layer, encoder, true));
+                dynamic_keymap_set_encoder(layer, encoder, false, keycode_at_encodermap_location_raw(layer, encoder, false));
             } else {
                 dynamic_keymap_set_encoder(layer, encoder, true, KC_TRANSPARENT);
                 dynamic_keymap_set_encoder(layer, encoder, false, KC_TRANSPARENT);
@@ -201,21 +201,22 @@ void dynamic_keymap_set_buffer(uint16_t offset, uint16_t size, uint8_t *data) {
     }
 }
 
-// This overrides the one in quantum/keymap_common.c
-uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {
-    if (layer < DYNAMIC_KEYMAP_LAYER_COUNT && key.row < MATRIX_ROWS && key.col < MATRIX_COLS) {
-        return dynamic_keymap_get_keycode(layer, key.row, key.col);
+uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column) {
+    if (layer_num < DYNAMIC_KEYMAP_LAYER_COUNT && row < MATRIX_ROWS && column < MATRIX_COLS) {
+        return dynamic_keymap_get_keycode(layer_num, row, column);
     }
-#ifdef ENCODER_MAP_ENABLE
-    else if (layer < DYNAMIC_KEYMAP_LAYER_COUNT && key.row == KEYLOC_ENCODER_CW && key.col < NUM_ENCODERS) {
-        return dynamic_keymap_get_encoder(layer, key.col, true);
-    } else if (layer < DYNAMIC_KEYMAP_LAYER_COUNT && key.row == KEYLOC_ENCODER_CCW && key.col < NUM_ENCODERS) {
-        return dynamic_keymap_get_encoder(layer, key.col, false);
-    }
-#endif // ENCODER_MAP_ENABLE
     return KC_NO;
 }
 
+#ifdef ENCODER_MAP_ENABLE
+uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx, bool clockwise) {
+    if (layer_num < DYNAMIC_KEYMAP_LAYER_COUNT && encoder_idx < NUM_ENCODERS) {
+        return dynamic_keymap_get_encoder(layer_num, encoder_idx, clockwise);
+    }
+    return KC_NO;
+}
+#endif // ENCODER_MAP_ENABLE
+
 uint8_t dynamic_keymap_macro_get_count(void) {
     return DYNAMIC_KEYMAP_MACRO_COUNT;
 }
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 3b5e9b0200..c8025d059b 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -175,12 +175,11 @@ uint32_t get_matrix_scan_rate(void) {
 #endif
 
 #ifdef MATRIX_HAS_GHOST
-extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-static matrix_row_t   get_real_keys(uint8_t row, matrix_row_t rowdata) {
+static matrix_row_t get_real_keys(uint8_t row, matrix_row_t rowdata) {
     matrix_row_t out = 0;
     for (uint8_t col = 0; col < MATRIX_COLS; col++) {
         // read each key in the row data and check if the keymap defines it as a real key
-        if (pgm_read_byte(&keymaps[0][row][col]) && (rowdata & (1 << col))) {
+        if (keycode_at_keymap_location(0, row, col) && (rowdata & (1 << col))) {
             // this creates new row data, if a key is defined in the keymap, it will be set here
             out |= 1 << col;
         }
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 67e35c4e2f..0225f53362 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -33,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // translates key to keycode
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
 
-extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-
 #ifdef ENCODER_MAP_ENABLE
 // Ensure we have a forward declaration for the encoder map
 #    include "encoder.h"
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 1d5ef9b403..5e8a043470 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -147,13 +147,13 @@ action_t action_for_keycode(uint16_t keycode) {
 // translates key to keycode
 __attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {
     if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) {
-        return pgm_read_word(&keymaps[layer][key.row][key.col]);
+        return keycode_at_keymap_location(layer, key.row, key.col);
     }
 #ifdef ENCODER_MAP_ENABLE
     else if (key.row == KEYLOC_ENCODER_CW && key.col < NUM_ENCODERS) {
-        return pgm_read_word(&encoder_map[layer][key.col][0]);
+        return keycode_at_encodermap_location(layer, key.col, true);
     } else if (key.row == KEYLOC_ENCODER_CCW && key.col < NUM_ENCODERS) {
-        return pgm_read_word(&encoder_map[layer][key.col][1]);
+        return keycode_at_encodermap_location(layer, key.col, false);
     }
 #endif // ENCODER_MAP_ENABLE
     return KC_NO;
diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c
index 179b5eb037..93aab82fcc 100644
--- a/quantum/keymap_introspection.c
+++ b/quantum/keymap_introspection.c
@@ -19,6 +19,17 @@ uint8_t keymap_layer_count(void) {
 
 _Static_assert(NUM_KEYMAP_LAYERS <= MAX_LAYER, "Number of keymap layers exceeds maximum set by LAYER_STATE_(8|16|32)BIT");
 
+uint16_t keycode_at_keymap_location_raw(uint8_t layer_num, uint8_t row, uint8_t column) {
+    if (layer_num < NUM_KEYMAP_LAYERS && row < MATRIX_ROWS && column < MATRIX_COLS) {
+        return pgm_read_word(&keymaps[layer_num][row][column]);
+    }
+    return KC_NO;
+}
+
+__attribute__((weak)) uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column) {
+    return keycode_at_keymap_location_raw(layer_num, row, column);
+}
+
 #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
 
 #    define NUM_ENCODERMAP_LAYERS ((uint8_t)(sizeof(encoder_map) / ((NUM_ENCODERS) * (2) * sizeof(uint16_t))))
@@ -29,4 +40,15 @@ uint8_t encodermap_layer_count(void) {
 
 _Static_assert(NUM_KEYMAP_LAYERS == NUM_ENCODERMAP_LAYERS, "Number of encoder_map layers doesn't match the number of keymap layers");
 
+uint16_t keycode_at_encodermap_location_raw(uint8_t layer_num, uint8_t encoder_idx, bool clockwise) {
+    if (layer_num < NUM_ENCODERMAP_LAYERS && encoder_idx < NUM_ENCODERS) {
+        return pgm_read_word(&encoder_map[layer_num][encoder_idx][clockwise ? 0 : 1]);
+    }
+    return KC_NO;
+}
+
+__attribute__((weak)) uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx, bool clockwise) {
+    return keycode_at_encodermap_location_raw(layer_num, encoder_idx, clockwise);
+}
+
 #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h
index 23f6f2016f..9de706a021 100644
--- a/quantum/keymap_introspection.h
+++ b/quantum/keymap_introspection.h
@@ -7,9 +7,19 @@
 // Get the number of layers defined in the keymap
 uint8_t keymap_layer_count(void);
 
+// Get the keycode for the keymap location, stored in firmware rather than any other persistent storage
+uint16_t keycode_at_keymap_location_raw(uint8_t layer_num, uint8_t row, uint8_t column);
+// Get the keycode for the keymap location, potentially stored dynamically
+uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column);
+
 #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
 
 // Get the number of layers defined in the encoder map
 uint8_t encodermap_layer_count(void);
 
+// Get the keycode for the encoder mapping location, stored in firmware rather than any other persistent storage
+uint16_t keycode_at_encodermap_location_raw(uint8_t layer_num, uint8_t encoder_idx, bool clockwise);
+// Get the keycode for the encoder mapping location, potentially stored dynamically
+uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx, bool clockwise);
+
 #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)

From 49128d6b8534a8b1b234e75ade8a1f8a2b8390f8 Mon Sep 17 00:00:00 2001
From: syntax-magic <dan.syntaxmagic@gmail.com>
Date: Thu, 29 Sep 2022 10:33:23 -0700
Subject: [PATCH 483/959] Updated documentations. No changes to keymap.c
 functions. (#18530)

---
 .../kprepublic/bm40hsrgb/keymaps/dan/keymap.c |  4 +-
 .../bm40hsrgb/keymaps/dan/readme.md           | 83 ++++++++++++++++++-
 2 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
index 495e664e36..29e359b94a 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
@@ -81,9 +81,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* RIGHTFN
  * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |  F12 |  F11 |  F10 |  F9  |Scllck|
+ * |      |      |      |      |      |      |      |  F12 |  F11 |  F10 |  F9  | Pause|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |      |      |  F8  |  F7  |  F6  |  F5  | Pause|
+ * | Ctrl |      |      |      |      |      |      |  F8  |  F7  |  F6  |  F5  |Scllck|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Shift|      |      |      |      |      |      |  F4  |  F3  |  F2  |  F1  |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
index 4a706c7315..cc59c816f0 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
@@ -1,3 +1,82 @@
-# Dan's kprepublic bm40 layout
+# Dan's KPrepublic BM40 Keymap
 
-Dan's personal keymap with LED indicator support.
+>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)
+
+### BM40 LED INDEX
+**_Numlock (11) Capslock (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 |
+
+## 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 V3 (62g 2 stage long spring)
+
+
+<br /><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+/ | HAN |  [  |  ]  |  )  |  :  |  "  |
+| **_3_** | SFT | PGU | PGD | HOM | END | CAP | PRN |  (  |  ,  |  .  |  /  | RET |
+| **_4_** | RGB |  [  |  ]  | &nbsp;ALT | TRN | &nbsp;SPC || &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_ | &nbsp;&nbsp;&nbsp;&nbsp;+ | &nbsp;INS | &nbsp;&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_** |  *  |  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!  

From f80058d96e2f1606f648166d320cda15986ced4c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 30 Sep 2022 03:38:09 +1000
Subject: [PATCH 484/959] Start Bluetooth API (#18366)

---
 builddefs/common_features.mk       |  2 +-
 drivers/bluetooth/bluefruit_le.cpp | 58 ++++++++++------------------
 drivers/bluetooth/bluefruit_le.h   | 12 +++---
 drivers/bluetooth/bluetooth.c      | 62 ++++++++++++++++++++++++++++++
 drivers/bluetooth/bluetooth.h      | 52 +++++++++++++++++++++++++
 quantum/keyboard.c                 | 15 +++-----
 tmk_core/protocol/host.c           | 25 ++----------
 7 files changed, 150 insertions(+), 76 deletions(-)
 create mode 100644 drivers/bluetooth/bluetooth.c
 create mode 100644 drivers/bluetooth/bluetooth.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 0e9e45220f..951932ade9 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -882,7 +882,7 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     OPT_DEFS += -DBLUETOOTH_ENABLE
     NO_USB_STARTUP_CHECK := yes
     COMMON_VPATH += $(DRIVER_PATH)/bluetooth
-    SRC += outputselect.c
+    SRC += outputselect.c bluetooth.c
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
         OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE
diff --git a/drivers/bluetooth/bluefruit_le.cpp b/drivers/bluetooth/bluefruit_le.cpp
index 50170b83fe..39c14ddd13 100644
--- a/drivers/bluetooth/bluefruit_le.cpp
+++ b/drivers/bluetooth/bluefruit_le.cpp
@@ -5,7 +5,7 @@
 #include <alloca.h>
 #include "debug.h"
 #include "timer.h"
-#include "action_util.h"
+#include "gpio.h"
 #include "ringbuffer.hpp"
 #include <string.h>
 #include "spi_master.h"
@@ -288,7 +288,7 @@ static void resp_buf_wait(const char *cmd) {
     }
 }
 
-static bool ble_init(void) {
+void bluefruit_le_init(void) {
     state.initialized  = false;
     state.configured   = false;
     state.is_connected = false;
@@ -307,7 +307,6 @@ static bool ble_init(void) {
     wait_ms(1000); // Give it a second to initialize
 
     state.initialized = true;
-    return state.initialized;
 }
 
 static inline uint8_t min(uint8_t a, uint8_t b) {
@@ -431,7 +430,7 @@ bool bluefruit_le_is_connected(void) {
 bool bluefruit_le_enable_keyboard(void) {
     char resbuf[128];
 
-    if (!state.initialized && !ble_init()) {
+    if (!state.initialized) {
         return false;
     }
 
@@ -613,41 +612,24 @@ static bool process_queue_item(struct queue_item *item, uint16_t timeout) {
     }
 }
 
-void bluefruit_le_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys) {
+void bluefruit_le_send_keyboard(report_keyboard_t *report) {
     struct queue_item item;
-    bool              didWait = false;
 
     item.queue_type   = QTKeyReport;
-    item.key.modifier = hid_modifier_mask;
-    item.added        = timer_read();
+    item.key.modifier = report->mods;
+    item.key.keys[0]  = report->keys[0];
+    item.key.keys[1]  = report->keys[1];
+    item.key.keys[2]  = report->keys[2];
+    item.key.keys[3]  = report->keys[3];
+    item.key.keys[4]  = report->keys[4];
+    item.key.keys[5]  = report->keys[5];
 
-    while (nkeys >= 0) {
-        item.key.keys[0] = keys[0];
-        item.key.keys[1] = nkeys >= 1 ? keys[1] : 0;
-        item.key.keys[2] = nkeys >= 2 ? keys[2] : 0;
-        item.key.keys[3] = nkeys >= 3 ? keys[3] : 0;
-        item.key.keys[4] = nkeys >= 4 ? keys[4] : 0;
-        item.key.keys[5] = nkeys >= 5 ? keys[5] : 0;
-
-        if (!send_buf.enqueue(item)) {
-            if (!didWait) {
-                dprint("wait for buf space\n");
-                didWait = true;
-            }
-            send_buf_send_one();
-            continue;
-        }
-
-        if (nkeys <= 6) {
-            return;
-        }
-
-        nkeys -= 6;
-        keys += 6;
+    while (!send_buf.enqueue(item)) {
+        send_buf_send_one();
     }
 }
 
-void bluefruit_le_send_consumer_key(uint16_t usage) {
+void bluefruit_le_send_consumer(uint16_t usage) {
     struct queue_item item;
 
     item.queue_type = QTConsumer;
@@ -658,15 +640,15 @@ void bluefruit_le_send_consumer_key(uint16_t usage) {
     }
 }
 
-void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons) {
+void bluefruit_le_send_mouse(report_mouse_t *report) {
     struct queue_item item;
 
     item.queue_type        = QTMouseMove;
-    item.mousemove.x       = x;
-    item.mousemove.y       = y;
-    item.mousemove.scroll  = scroll;
-    item.mousemove.pan     = pan;
-    item.mousemove.buttons = buttons;
+    item.mousemove.x       = report->x;
+    item.mousemove.y       = report->y;
+    item.mousemove.scroll  = report->v;
+    item.mousemove.pan     = report->h;
+    item.mousemove.buttons = report->buttons;
 
     while (!send_buf.enqueue(item)) {
         send_buf_send_one();
diff --git a/drivers/bluetooth/bluefruit_le.h b/drivers/bluetooth/bluefruit_le.h
index 731ba2e370..a3de03c35c 100644
--- a/drivers/bluetooth/bluefruit_le.h
+++ b/drivers/bluetooth/bluefruit_le.h
@@ -7,9 +7,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
-
-#include "config_common.h"
+#include "report.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,6 +24,8 @@ extern bool bluefruit_le_query_is_connected(void);
  * calling ble_task() periodically. */
 extern bool bluefruit_le_is_connected(void);
 
+extern void bluefruit_le_init(void);
+
 /* Call this periodically to process BLE-originated things */
 extern void bluefruit_le_task(void);
 
@@ -34,16 +34,16 @@ extern void bluefruit_le_task(void);
  * this set of keys.
  * Also sends a key release indicator, so that the keys do not remain
  * held down. */
-extern void bluefruit_le_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys);
+extern void bluefruit_le_send_keyboard(report_keyboard_t *report);
 
 /* Send a consumer usage.
  * (milliseconds) */
-extern void bluefruit_le_send_consumer_key(uint16_t usage);
+extern void bluefruit_le_send_consumer(uint16_t usage);
 
 /* Send a mouse/wheel movement report.
  * The parameters are signed and indicate positive or negative direction
  * change. */
-extern void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons);
+extern void bluefruit_le_send_mouse(report_mouse_t *report);
 
 /* Compute battery voltage by reading an analog pin.
  * Returns the integer number of millivolts */
diff --git a/drivers/bluetooth/bluetooth.c b/drivers/bluetooth/bluetooth.c
new file mode 100644
index 0000000000..d5382401e7
--- /dev/null
+++ b/drivers/bluetooth/bluetooth.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bluetooth.h"
+
+#if defined(BLUETOOTH_BLUEFRUIT_LE)
+#    include "bluefruit_le.h"
+#elif defined(BLUETOOTH_RN42)
+#    include "rn42.h"
+#endif
+
+void bluetooth_init(void) {
+#if defined(BLUETOOTH_BLUEFRUIT_LE)
+    bluefruit_le_init();
+#elif defined(BLUETOOTH_RN42)
+    rn42_init();
+#endif
+}
+
+void bluetooth_task(void) {
+#if defined(BLUETOOTH_BLUEFRUIT_LE)
+    bluefruit_le_task();
+#endif
+}
+
+void bluetooth_send_keyboard(report_keyboard_t *report) {
+#if defined(BLUETOOTH_BLUEFRUIT_LE)
+    bluefruit_le_send_keyboard(report);
+#elif defined(BLUETOOTH_RN42)
+    rn42_send_keyboard(report);
+#endif
+}
+
+void bluetooth_send_mouse(report_mouse_t *report) {
+#if defined(BLUETOOTH_BLUEFRUIT_LE)
+    bluefruit_le_send_mouse(report);
+#elif defined(BLUETOOTH_RN42)
+    rn42_send_mouse(report);
+#endif
+}
+
+void bluetooth_send_consumer(uint16_t usage) {
+#if defined(BLUETOOTH_BLUEFRUIT_LE)
+    bluefruit_le_send_consumer(usage);
+#elif defined(BLUETOOTH_RN42)
+    rn42_send_consumer(usage);
+#endif
+}
diff --git a/drivers/bluetooth/bluetooth.h b/drivers/bluetooth/bluetooth.h
new file mode 100644
index 0000000000..a923dfe60c
--- /dev/null
+++ b/drivers/bluetooth/bluetooth.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include "report.h"
+
+/**
+ * \brief Initialize the Bluetooth system.
+ */
+void bluetooth_init(void);
+
+/**
+ * \brief Perform housekeeping tasks.
+ */
+void bluetooth_task(void);
+
+/**
+ * \brief Send a keyboard report.
+ * 
+ * \param report The keyboard report to send.
+ */
+void bluetooth_send_keyboard(report_keyboard_t *report);
+
+/**
+ * \brief Send a mouse report.
+ * 
+ * \param report The mouse report to send.
+ */
+void bluetooth_send_mouse(report_mouse_t *report);
+
+/**
+ * \brief Send a consumer usage.
+ * 
+ * \param usage The consumer usage to send.
+ */
+void bluetooth_send_consumer(uint16_t usage);
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index c8025d059b..626e0a7ee1 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -106,12 +106,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "split_util.h"
 #endif
 #ifdef BLUETOOTH_ENABLE
-#    include "outputselect.h"
-#    ifdef BLUETOOTH_BLUEFRUIT_LE
-#        include "bluefruit_le.h"
-#    elif BLUETOOTH_RN42
-#        include "rn42.h"
-#    endif
+#    include "bluetooth.h"
 #endif
 #ifdef CAPS_WORD_ENABLE
 #    include "caps_word.h"
@@ -411,8 +406,8 @@ void keyboard_init(void) {
     // init after split init
     pointing_device_init();
 #endif
-#if defined(BLUETOOTH_RN42)
-    rn42_init();
+#ifdef BLUETOOTH_ENABLE
+    bluetooth_init();
 #endif
 
 #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
@@ -674,8 +669,8 @@ void keyboard_task(void) {
     programmable_button_send();
 #endif
 
-#ifdef BLUETOOTH_BLUEFRUIT_LE
-    bluefruit_le_task();
+#ifdef BLUETOOTH_ENABLE
+    bluetooth_task();
 #endif
 
     led_task();
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 99298ad6d6..7b051a881b 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -29,12 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef BLUETOOTH_ENABLE
+#    include "bluetooth.h"
 #    include "outputselect.h"
-#    ifdef BLUETOOTH_BLUEFRUIT_LE
-#        include "bluefruit_le.h"
-#    elif BLUETOOTH_RN42
-#        include "rn42.h"
-#    endif
 #endif
 
 #ifdef NKRO_ENABLE
@@ -78,11 +74,7 @@ led_t host_keyboard_led_state(void) {
 void host_keyboard_send(report_keyboard_t *report) {
 #ifdef BLUETOOTH_ENABLE
     if (where_to_send() == OUTPUT_BLUETOOTH) {
-#    ifdef BLUETOOTH_BLUEFRUIT_LE
-        bluefruit_le_send_keys(report->mods, report->keys, sizeof(report->keys));
-#    elif BLUETOOTH_RN42
-        rn42_send_keyboard(report);
-#    endif
+        bluetooth_send_keyboard(report);
         return;
     }
 #endif
@@ -116,12 +108,7 @@ void host_keyboard_send(report_keyboard_t *report) {
 void host_mouse_send(report_mouse_t *report) {
 #ifdef BLUETOOTH_ENABLE
     if (where_to_send() == OUTPUT_BLUETOOTH) {
-#    ifdef BLUETOOTH_BLUEFRUIT_LE
-        // FIXME: mouse buttons
-        bluefruit_le_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
-#    elif BLUETOOTH_RN42
-        rn42_send_mouse(report);
-#    endif
+        bluetooth_send_mouse(report);
         return;
     }
 #endif
@@ -152,11 +139,7 @@ void host_consumer_send(uint16_t report) {
 
 #ifdef BLUETOOTH_ENABLE
     if (where_to_send() == OUTPUT_BLUETOOTH) {
-#    ifdef BLUETOOTH_BLUEFRUIT_LE
-        bluefruit_le_send_consumer_key(report);
-#    elif BLUETOOTH_RN42
-        rn42_send_consumer(report);
-#    endif
+        bluetooth_send_consumer(report);
         return;
     }
 #endif

From bad8c6718901603b8a64d371b003ae4ab6a24044 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 29 Sep 2022 10:45:36 -0700
Subject: [PATCH 485/959] Neson Design 700E Refactor (#18524)

---
 keyboards/neson_design/700e/700e.h            |  58 ++++-
 keyboards/neson_design/700e/config.h          |  10 +-
 keyboards/neson_design/700e/info.json         | 241 +++++++++++++++++-
 .../700e/keymaps/default/keymap.c             |  25 +-
 .../keymaps/default_ansi_tsangan/keymap.c     |  35 +++
 .../700e/keymaps/default_iso_tsangan/keymap.c |  35 +++
 .../neson_design/700e/keymaps/via/keymap.c    |  37 +--
 7 files changed, 402 insertions(+), 39 deletions(-)
 create mode 100644 keyboards/neson_design/700e/keymaps/default_ansi_tsangan/keymap.c
 create mode 100644 keyboards/neson_design/700e/keymaps/default_iso_tsangan/keymap.c

diff --git a/keyboards/neson_design/700e/700e.h b/keyboards/neson_design/700e/700e.h
index f096868d32..c9667eefe2 100644
--- a/keyboards/neson_design/700e/700e.h
+++ b/keyboards/neson_design/700e/700e.h
@@ -22,12 +22,30 @@
 
 #define ___ KC_NO
 
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │4D │ │0E │0F │1F │      │4D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │ │1E │2E │2F │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │                   │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌─┴───┴────┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │     │3E │       │3C        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ *              │40  │41  │42  │┌───────────────────────────┐│49  │4B  │4C  │ │3F │4E │4F │
+ *              └────┴────┴────┘│4A                         │└────┴────┴────┘ └───┴───┴───┘
+ *                              └───────────────────────────┘
+ *                   ┌───┬─────┐                             ┌─────┬───┐
+ *                   │41 │42   │                             │49   │4B │
+ *                   └───┴─────┘                             └─────┴───┘
+ */
+
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4D, K0E, K0F, K1F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K2E, K2F,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, \
-    K40, K41, K42,                     K4A,                K49, K4B, K4C, K3F, K4E, K4F\
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4D,   K0E, K0F, K1F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1E, K2E, K2F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                       \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,             K3E,      \
+    K40, K41, K42,                K4A,                     K49, K4B, K4C,        K3F, K4E, K4F  \
 ) \
 { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
@@ -36,3 +54,33 @@
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
     { K40, K41, K42, ___, ___, ___, ___, ___, ___, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
 }
+
+#define LAYOUT_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4D,   K0E, K0F, K1F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K2E, K2F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,                  \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,        K3E,      \
+    K40, K41, K42,                K4A,                     K49, K4B, K4C,   K3F, K4E, K4F  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+}
+
+#define LAYOUT_iso_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4D,   K0E, K0F, K1F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,        K1E, K2E, K2F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,        K3E,      \
+    K40, K41, K42,                K4A,                     K49, K4B, K4C,   K3F, K4E, K4F  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
+    { K40, K41, K42, ___, ___, ___, ___, ___, ___, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+}
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 83cc780d80..c084a64310 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -54,7 +54,15 @@
 //rgb light setting
 #define RGBLED_NUM          68
 #define RGB_DI_PIN          D5
-#define RGBLIGHT_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_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 4d4d427097..43b5382d7e 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "700E",
     "manufacturer": "Neson Design",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "yulei",
     "usb": {
         "vid": "0x4E65",
         "pid": "0x700E",
@@ -10,8 +10,243 @@
     },
     "layouts": {
         "LAYOUT_all": {
-            "layout": 
-             [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"4,13", "x":14, "y":0}, {"label":"0,14", "x":15.5, "y":0}, {"label":"0,15", "x":16.5, "y":0}, {"label":"1,15", "x":17.5, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15.5, "y":1}, {"label":"2,14", "x":16.5, "y":1}, {"label":"2,15", "x":17.5, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":16.5, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,9", "x":11.25, "y":4, "w":1.25}, {"label":"4,11", "x":12.5, "y":4, "w":1.25}, {"label":"4,12", "x":13.75, "y":4, "w":1.25}, {"label":"3,15", "x":15.5, "y":4}, {"label":"4,14", "x":16.5, "y":4}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,10", "x":4, "y":4.25, "w":7}]
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"4,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.5, "y":0},
+                {"label":"0,15", "x":16.5, "y":0},
+                {"label":"1,15", "x":17.5, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15.5, "y":1},
+                {"label":"2,14", "x":16.5, "y":1},
+                {"label":"2,15", "x":17.5, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":2, "w":1.25},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":16.5, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":4, "y":4.25, "w":7},
+                {"label":"4,9", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":12.5, "y":4, "w":1.25},
+                {"label":"4,12", "x":13.75, "y":4, "w":1.25},
+                {"label":"3,15", "x":15.5, "y":4},
+                {"label":"4,14", "x":16.5, "y":4},
+                {"label":"4,15", "x":17.5, "y":4}
+            ]
+        },
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"4,13", "x":13, "y":0, "w":2},
+                {"label":"0,14", "x":15.5, "y":0},
+                {"label":"0,15", "x":16.5, "y":0},
+                {"label":"1,15", "x":17.5, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15.5, "y":1},
+                {"label":"2,14", "x":16.5, "y":1},
+                {"label":"2,15", "x":17.5, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":2.75},
+                {"label":"3,14", "x":16.5, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":4, "y":4.25, "w":7},
+                {"label":"4,9", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":12.5, "y":4, "w":1.25},
+                {"label":"4,12", "x":13.75, "y":4, "w":1.25},
+                {"label":"3,15", "x":15.5, "y":4},
+                {"label":"4,14", "x":16.5, "y":4},
+                {"label":"4,15", "x":17.5, "y":4}
+            ]
+        },
+        "LAYOUT_iso_tsangan": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"4,13", "x":13, "y":0, "w":2},
+                {"label":"0,14", "x":15.5, "y":0},
+                {"label":"0,15", "x":16.5, "y":0},
+                {"label":"1,15", "x":17.5, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15.5, "y":1},
+                {"label":"2,14", "x":16.5, "y":1},
+                {"label":"2,15", "x":17.5, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":2.75},
+                {"label":"3,14", "x":16.5, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":4, "y":4.25, "w":7},
+                {"label":"4,9", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":12.5, "y":4, "w":1.25},
+                {"label":"4,12", "x":13.75, "y":4, "w":1.25},
+                {"label":"3,15", "x":15.5, "y":4},
+                {"label":"4,14", "x":16.5, "y":4},
+                {"label":"4,15", "x":17.5, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/neson_design/700e/keymaps/default/keymap.c b/keyboards/neson_design/700e/keymaps/default/keymap.c
index cf80983ff3..65f6f2f756 100644
--- a/keyboards/neson_design/700e/keymaps/default/keymap.c
+++ b/keyboards/neson_design/700e/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /**
-    Copyright 2022 astro 
+    Copyright 2022 astro
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,16 +19,17 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-      KC_ESC,      KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,  KC_DEL,KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
-      KC_TAB,      KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,         KC_DEL,  KC_END, KC_PGDN,
-      KC_CAPS,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_BSLS, KC_ENT,
-      KC_LSFT,  KC_LGUI,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,   MO(1),                   KC_UP, 
-      KC_LCTL,  KC_LGUI,  KC_LALT,                               KC_SPC,                           KC_RALT,KC_RGUI,KC_RCTL,         KC_LEFT,KC_DOWN, KC_RIGHT),
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_LGUI, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
     [1] = LAYOUT_all(
-      _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,_______,_______,_______,
-      QK_BOOT,          RGB_TOG,RGB_MOD,RGB_RMOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_MUTE,KC_VOLU,KC_VOLD,_______,_______,_______,_______,
-      _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
-      _______,_______,_______,                        _______,                                        _______,_______,_______,_______,_______,_______),
+        _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR,    _______, _______, _______,
+        QK_BOOT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MUTE, KC_VOLU, KC_VOLD, _______,             _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,  _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                             _______,                                     _______, _______, _______,             _______, _______, _______
+    )
 };
diff --git a/keyboards/neson_design/700e/keymaps/default_ansi_tsangan/keymap.c b/keyboards/neson_design/700e/keymaps/default_ansi_tsangan/keymap.c
new file mode 100644
index 0000000000..1ea530e088
--- /dev/null
+++ b/keyboards/neson_design/700e/keymaps/default_ansi_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/**
+    Copyright 2022 astro
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi_tsangan(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi_tsangan(
+        _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,    _______, _______, _______,
+        QK_BOOT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MUTE, KC_VOLU, KC_VOLD, _______,    _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,           _______,
+        _______,          _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                             _______,                                     _______, _______, _______,    _______, _______, _______
+    )
+};
diff --git a/keyboards/neson_design/700e/keymaps/default_iso_tsangan/keymap.c b/keyboards/neson_design/700e/keymaps/default_iso_tsangan/keymap.c
new file mode 100644
index 0000000000..b42a7fe704
--- /dev/null
+++ b/keyboards/neson_design/700e/keymaps/default_iso_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/**
+    Copyright 2022 astro
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso_tsangan(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso_tsangan(
+        _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,    _______, _______, _______,
+        QK_BOOT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MUTE, KC_VOLU, KC_VOLD,             _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,  _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                             _______,                                     _______, _______, _______,    _______, _______, _______
+    )
+};
diff --git a/keyboards/neson_design/700e/keymaps/via/keymap.c b/keyboards/neson_design/700e/keymaps/via/keymap.c
index f3d553e9df..b97e77fbd5 100644
--- a/keyboards/neson_design/700e/keymaps/via/keymap.c
+++ b/keyboards/neson_design/700e/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
 /**
-    Copyright 2022 astro 
+    Copyright 2022 astro
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,23 +19,24 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-      KC_ESC,      KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,  KC_DEL,KC_BSPC, KC_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_BSLS, KC_ENT,
-      KC_LSFT,  KC_LGUI,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,   MO(1),                   KC_UP, 
-      KC_LCTL,  KC_LGUI,  KC_LALT,                               KC_SPC,                           KC_RALT,KC_RGUI,KC_RCTL,         KC_LEFT,KC_DOWN, KC_RIGHT),
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_LGUI, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
     [1] = LAYOUT_all(
-      _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,_______,_______,_______,
-      QK_BOOT,          RGB_TOG,RGB_MOD,RGB_RMOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_MUTE,KC_VOLU,KC_VOLD,_______,_______,_______,_______,
-      _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
-      _______,_______,_______,                        _______,                                        _______,_______,_______,_______,_______,_______),
-
+        _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR,    _______, _______, _______,
+        QK_BOOT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MUTE, KC_VOLU, KC_VOLD, _______,             _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,  _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                             _______,                                     _______, _______, _______,             _______, _______, _______
+    ),
     [2] = LAYOUT_all(
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
-      _______,_______,_______,                        _______,                                        _______,_______,_______,_______,_______,_______),
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______,             _______, _______, _______
+    ),
 };

From b53918fbe9122ef7995dce194951717ac65f7817 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Thu, 29 Sep 2022 10:47:17 -0700
Subject: [PATCH 486/959] Format code according to conventions (#18533)

---
 drivers/bluetooth/bluetooth.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/bluetooth/bluetooth.h b/drivers/bluetooth/bluetooth.h
index a923dfe60c..2e4d0df538 100644
--- a/drivers/bluetooth/bluetooth.h
+++ b/drivers/bluetooth/bluetooth.h
@@ -32,21 +32,21 @@ void bluetooth_task(void);
 
 /**
  * \brief Send a keyboard report.
- * 
+ *
  * \param report The keyboard report to send.
  */
 void bluetooth_send_keyboard(report_keyboard_t *report);
 
 /**
  * \brief Send a mouse report.
- * 
+ *
  * \param report The mouse report to send.
  */
 void bluetooth_send_mouse(report_mouse_t *report);
 
 /**
  * \brief Send a consumer usage.
- * 
+ *
  * \param usage The consumer usage to send.
  */
 void bluetooth_send_consumer(uint16_t usage);

From dbe214c3268d9a316a137471a7679f7e45046e49 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 29 Sep 2022 10:50:47 -0700
Subject: [PATCH 487/959] Handle mouse keys more consistently (#18513)

---
 quantum/action.c        | 100 ++++++++++++++++++++--------------------
 quantum/keymap_common.c |   2 -
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/quantum/action.c b/quantum/action.c
index 4f01acb96e..259c4349c3 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -293,19 +293,56 @@ void process_record_handler(keyrecord_t *record) {
     process_action(record, action);
 }
 
-#if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
-void register_button(bool pressed, enum mouse_buttons button) {
-#    ifdef PS2_MOUSE_ENABLE
-    tp_buttons = pressed ? tp_buttons | button : tp_buttons & ~button;
+/**
+ * @brief handles all the messy mouse stuff
+ *
+ * Handles all the edgecases and special stuff that is needed for coexistense
+ * of the multiple mouse subsystems.
+ *
+ * @param mouse_keycode[in] uint8_t mouse keycode
+ * @param pressed[in] bool
+ */
+
+void register_mouse(uint8_t mouse_keycode, bool pressed) {
+#ifdef MOUSEKEY_ENABLE
+    // if mousekeys is enabled, let it do the brunt of the work
+    if (pressed) {
+        mousekey_on(mouse_keycode);
+    } else {
+        mousekey_off(mouse_keycode);
+    }
+    // should mousekeys send report, or does something else handle this?
+    switch (mouse_keycode) {
+#    if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
+        case KC_MS_BTN1 ... KC_MS_BTN8:
+            // let pointing device handle the buttons
+            // expand if/when it handles more of the code
+#        if defined(POINTING_DEVICE_ENABLE)
+            pointing_device_keycode_handler(mouse_keycode, pressed);
+#        endif
+            break;
 #    endif
-#    ifdef POINTING_DEVICE_ENABLE
-    report_mouse_t currentReport = pointing_device_get_report();
-    currentReport.buttons        = pressed ? currentReport.buttons | button : currentReport.buttons & ~button;
-    pointing_device_set_report(currentReport);
-#    endif
-}
+        default:
+            mousekey_send();
+            break;
+    }
+#elif defined(POINTING_DEVICE_ENABLE)
+    // if mousekeys isn't enabled, and pointing device is enabled, then
+    // let pointing device do all the heavy lifting, then
+    if IS_MOUSEKEY (mouse_keycode) {
+        pointing_device_keycode_handler(mouse_keycode, pressed);
+    }
 #endif
 
+#ifdef PS2_MOUSE_ENABLE
+    // make sure that ps2 mouse has button report synced
+    if (KC_MS_BTN1 <= mouse_keycode && mouse_keycode <= KC_MS_BTN3) {
+        uint8_t tmp_button_msk = MOUSE_BTN_MASK(mouse_keycode - KC_MS_BTN1);
+        tp_buttons             = pressed ? tp_buttons | tmp_button_msk : tp_buttons & ~tmp_button_msk;
+    }
+#endif
+}
+
 /** \brief Take an action and processes it.
  *
  * FIXME: Needs documentation.
@@ -506,30 +543,10 @@ void process_action(keyrecord_t *record, action_t action) {
             }
             break;
 #endif
-#ifdef MOUSEKEY_ENABLE
         /* Mouse key */
         case ACT_MOUSEKEY:
-            if (event.pressed) {
-                mousekey_on(action.key.code);
-            } else {
-                mousekey_off(action.key.code);
-            }
-            switch (action.key.code) {
-#    if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
-#        ifdef POINTING_DEVICE_ENABLE
-                case KC_MS_BTN1 ... KC_MS_BTN8:
-#        else
-                case KC_MS_BTN1 ... KC_MS_BTN3:
-#        endif
-                    register_button(event.pressed, MOUSE_BTN_MASK(action.key.code - KC_MS_BTN1));
-                    break;
-#    endif
-                default:
-                    mousekey_send();
-                    break;
-            }
+            register_mouse(action.key.code, event.pressed);
             break;
-#endif
 #ifndef NO_ACTION_LAYER
         case ACT_LAYER:
             if (action.layer_bitop.on == 0) {
@@ -913,16 +930,9 @@ __attribute__((weak)) void register_code(uint8_t code) {
         host_consumer_send(KEYCODE2CONSUMER(code));
     }
 #endif
-#ifdef MOUSEKEY_ENABLE
     else if IS_MOUSEKEY (code) {
-        mousekey_on(code);
-        mousekey_send();
+        register_mouse(code, true);
     }
-#elif defined(POINTING_DEVICE_ENABLE)
-    else if IS_MOUSEKEY (code) {
-        pointing_device_keycode_handler(code, true);
-    }
-#endif
 }
 
 /** \brief Utilities for actions. (FIXME: Needs better description)
@@ -976,17 +986,9 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
         host_system_send(0);
     } else if IS_CONSUMER (code) {
         host_consumer_send(0);
+    } else if IS_MOUSEKEY (code) {
+        register_mouse(code, false);
     }
-#ifdef MOUSEKEY_ENABLE
-    else if IS_MOUSEKEY (code) {
-        mousekey_off(code);
-        mousekey_send();
-    }
-#elif defined(POINTING_DEVICE_ENABLE)
-    else if IS_MOUSEKEY (code) {
-        pointing_device_keycode_handler(code, false);
-    }
-#endif
 }
 
 /** \brief Tap a keycode with a delay.
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 5e8a043470..50e581cd87 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -65,11 +65,9 @@ action_t action_for_keycode(uint16_t keycode) {
             action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode));
             break;
 #endif
-#ifdef MOUSEKEY_ENABLE
         case KC_MS_UP ... KC_MS_ACCEL2:
             action.code = ACTION_MOUSEKEY(keycode);
             break;
-#endif
         case KC_TRANSPARENT:
             action.code = ACTION_TRANSPARENT;
             break;

From 45b5ed5c6e1ecdf95e9ce0523a8ff49d45b8822f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 30 Sep 2022 04:23:11 +1000
Subject: [PATCH 488/959] Onekey: migrate some stuff to data driven (#18502)

---
 .../handwired/onekey/blackpill_f401/config.h  |  8 ++----
 .../handwired/onekey/blackpill_f401/info.json | 13 +++++++++-
 .../handwired/onekey/blackpill_f401/rules.mk  |  7 ------
 .../handwired/onekey/blackpill_f411/config.h  |  8 ++----
 .../handwired/onekey/blackpill_f411/info.json | 13 +++++++++-
 .../handwired/onekey/blackpill_f411/rules.mk  |  7 ------
 .../onekey/blackpill_f411_tinyuf2/config.h    |  8 ++----
 .../onekey/blackpill_f411_tinyuf2/info.json   | 15 ++++++++++-
 .../onekey/blackpill_f411_tinyuf2/rules.mk    |  7 ------
 keyboards/handwired/onekey/bluepill/config.h  |  8 ++----
 keyboards/handwired/onekey/bluepill/info.json | 13 +++++++++-
 keyboards/handwired/onekey/bluepill/rules.mk  |  6 -----
 .../handwired/onekey/bluepill_f103c6/config.h |  9 ++-----
 .../onekey/bluepill_f103c6/info.json          | 14 ++++++++++-
 .../handwired/onekey/bluepill_f103c6/rules.mk |  4 ---
 keyboards/handwired/onekey/config.h           | 10 --------
 keyboards/handwired/onekey/elite_c/config.h   |  6 -----
 keyboards/handwired/onekey/elite_c/info.json  | 13 +++++++++-
 keyboards/handwired/onekey/elite_c/rules.mk   |  5 ----
 .../handwired/onekey/evb_wb32f3g71/config.h   |  8 ------
 .../handwired/onekey/evb_wb32f3g71/info.json  |  8 +++++-
 .../handwired/onekey/evb_wb32f3g71/rules.mk   |  6 -----
 .../handwired/onekey/evb_wb32fq95/config.h    |  8 ------
 .../handwired/onekey/evb_wb32fq95/info.json   |  8 +++++-
 .../handwired/onekey/evb_wb32fq95/rules.mk    |  6 -----
 keyboards/handwired/onekey/info.json          | 15 ++++++++++-
 keyboards/handwired/onekey/kb2040/config.h    |  6 -----
 keyboards/handwired/onekey/kb2040/info.json   | 10 +++++++-
 keyboards/handwired/onekey/kb2040/rules.mk    |  5 ----
 .../handwired/onekey/keymaps/quine/keymap.c   |  4 +--
 .../handwired/onekey/nucleo_l432kc/config.h   |  5 ----
 .../handwired/onekey/nucleo_l432kc/info.json  | 14 ++++++++++-
 .../handwired/onekey/nucleo_l432kc/rules.mk   |  5 ----
 keyboards/handwired/onekey/onekey.c           |  2 +-
 keyboards/handwired/onekey/onekey.h           | 25 -------------------
 keyboards/handwired/onekey/promicro/config.h  |  6 -----
 keyboards/handwired/onekey/promicro/info.json | 13 +++++++++-
 keyboards/handwired/onekey/promicro/rules.mk  |  5 ----
 keyboards/handwired/onekey/proton_c/config.h  |  5 ----
 keyboards/handwired/onekey/proton_c/info.json | 13 +++++++++-
 keyboards/handwired/onekey/proton_c/rules.mk  |  6 -----
 keyboards/handwired/onekey/rp2040/config.h    |  6 -----
 keyboards/handwired/onekey/rp2040/info.json   | 11 +++++++-
 keyboards/handwired/onekey/rp2040/rules.mk    |  3 ---
 keyboards/handwired/onekey/rules.mk           | 15 -----------
 .../onekey/sipeed_longan_nano/config.h        |  7 ------
 .../onekey/sipeed_longan_nano/info.json       | 15 ++++++++++-
 .../onekey/sipeed_longan_nano/rules.mk        | 10 --------
 .../handwired/onekey/stm32f0_disco/config.h   |  8 ++----
 .../handwired/onekey/stm32f0_disco/info.json  | 14 ++++++++++-
 .../handwired/onekey/stm32f0_disco/rules.mk   |  6 -----
 .../onekey/stm32f405_feather/config.h         | 22 ----------------
 .../onekey/stm32f405_feather/info.json        |  8 +++++-
 .../onekey/stm32f405_feather/rules.mk         |  6 -----
 keyboards/handwired/onekey/teensy_2/config.h  |  9 ++-----
 keyboards/handwired/onekey/teensy_2/info.json | 14 ++++++++++-
 keyboards/handwired/onekey/teensy_2/rules.mk  |  5 ----
 .../handwired/onekey/teensy_2pp/config.h      |  9 ++-----
 .../handwired/onekey/teensy_2pp/info.json     | 14 ++++++++++-
 .../handwired/onekey/teensy_2pp/rules.mk      |  5 ----
 keyboards/handwired/onekey/teensy_32/config.h |  3 ---
 .../handwired/onekey/teensy_32/info.json      |  8 +++++-
 keyboards/handwired/onekey/teensy_32/rules.mk |  6 -----
 keyboards/handwired/onekey/teensy_35/config.h |  3 ---
 .../handwired/onekey/teensy_35/info.json      |  8 +++++-
 keyboards/handwired/onekey/teensy_35/rules.mk |  6 -----
 keyboards/handwired/onekey/teensy_lc/config.h |  3 ---
 .../handwired/onekey/teensy_lc/info.json      |  8 +++++-
 keyboards/handwired/onekey/teensy_lc/rules.mk |  5 ----
 69 files changed, 259 insertions(+), 335 deletions(-)
 delete mode 100644 keyboards/handwired/onekey/evb_wb32f3g71/config.h
 delete mode 100644 keyboards/handwired/onekey/evb_wb32fq95/config.h
 delete mode 100644 keyboards/handwired/onekey/onekey.h
 delete mode 100644 keyboards/handwired/onekey/stm32f405_feather/config.h

diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h
index 2554e2207c..4e9552480f 100644
--- a/keyboards/handwired/onekey/blackpill_f401/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401/config.h
@@ -18,13 +18,9 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { B0 }
-#define MATRIX_ROW_PINS { A7 }
-
-#define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
 
-#define RGB_DI_PIN A1
-
 #define ADC_PIN A0
+
+#define RGB_CI_PIN A2
diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json
index 50afb4b9b0..b79b17b000 100644
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401/info.json
@@ -1,3 +1,14 @@
 {
-    "keyboard_name": "Onekey Blackpill STM32F401"
+    "keyboard_name": "Onekey Blackpill STM32F401",
+    "development_board": "blackpill_f401",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "rgblight": {
+        "pin": "A1"
+    }
 }
diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk
index 1fec226e9b..1071cf62ee 100644
--- a/keyboards/handwired/onekey/blackpill_f401/rules.mk
+++ b/keyboards/handwired/onekey/blackpill_f401/rules.mk
@@ -1,8 +1 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h
index 9e9737fbf5..b97df0c666 100644
--- a/keyboards/handwired/onekey/blackpill_f411/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411/config.h
@@ -18,17 +18,13 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { B0 }
-#define MATRIX_ROW_PINS { A7 }
-
-#define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
 
-#define RGB_DI_PIN A1
-
 #define ADC_PIN A0
 
+#define RGB_CI_PIN A2
+
 #define SOLENOID_PIN B12
 #define SOLENOID_PINS { B12, B13, B14, B15 }
 #define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json
index 0b2c14d5b9..19c6cbfed9 100644
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411/info.json
@@ -1,3 +1,14 @@
 {
-    "keyboard_name": "Onekey Blackpill STM32F411"
+    "keyboard_name": "Onekey Blackpill STM32F411",
+    "development_board": "blackpill_f411",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "rgblight": {
+        "pin": "A1"
+    }
 }
diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk
index cd1657335d..1071cf62ee 100644
--- a/keyboards/handwired/onekey/blackpill_f411/rules.mk
+++ b/keyboards/handwired/onekey/blackpill_f411/rules.mk
@@ -1,8 +1 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
index f4b589c6d2..c8800fa163 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -18,13 +18,9 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { B0 }
-#define MATRIX_ROW_PINS { A7 }
-
-#define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
 
-#define RGB_DI_PIN A1
-
 #define ADC_PIN A0
+
+#define RGB_CI_PIN A2
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
index 59cdec59f7..3acccb7148 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
@@ -1,3 +1,16 @@
 {
-    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2"
+    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
+    "processor": "STM32F411",
+    "bootloader": "tinyuf2",
+    "board": "BLACKPILL_STM32_F411",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "rgblight": {
+        "pin": "A1"
+    }
 }
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
index 2c38e9b580..1071cf62ee 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
@@ -1,8 +1 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = tinyuf2
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/bluepill/config.h b/keyboards/handwired/onekey/bluepill/config.h
index 0f85ad91c7..79fa79595a 100644
--- a/keyboards/handwired/onekey/bluepill/config.h
+++ b/keyboards/handwired/onekey/bluepill/config.h
@@ -18,13 +18,9 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { B0 }
-#define MATRIX_ROW_PINS { A7 }
-
-#define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD2
 #define BACKLIGHT_PWM_CHANNEL 1
 
-#define RGB_DI_PIN A1
-
 #define ADC_PIN A0
+
+#define RGB_CI_PIN A2
diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/info.json
index 2126c62b05..7bef2db170 100644
--- a/keyboards/handwired/onekey/bluepill/info.json
+++ b/keyboards/handwired/onekey/bluepill/info.json
@@ -1,3 +1,14 @@
 {
-    "keyboard_name": "Onekey Bluepill STM32F103"
+    "keyboard_name": "Onekey Bluepill STM32F103",
+    "development_board": "bluepill",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "rgblight": {
+        "pin": "A1"
+    }
 }
diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk
index 019b1130d9..a92b099328 100644
--- a/keyboards/handwired/onekey/bluepill/rules.mk
+++ b/keyboards/handwired/onekey/bluepill/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h
index 903277bd3b..8b62ed86f2 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/config.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h
@@ -18,18 +18,13 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { B0 }
-#define MATRIX_ROW_PINS { A7 }
-#define UNUSED_PINS
-
-#define BACKLIGHT_PIN         A0
 #define BACKLIGHT_PWM_DRIVER  PWMD2
 #define BACKLIGHT_PWM_CHANNEL 1
 
-#define RGB_DI_PIN A1
-
 #define ADC_PIN A0
 
+#define RGB_CI_PIN A2
+
 // This code does not fit into the really small flash of STM32F103x6 together
 // with CONSOLE_ENABLE=yes, and the debugging console is probably more
 // important for the "okeney" testing firmware.  In a real firmware you may be
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json
index 0ef180f6ec..353f074d92 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json
@@ -1,3 +1,15 @@
 {
-    "keyboard_name": "Onekey Bluepill STM32F103C6"
+    "keyboard_name": "Onekey Bluepill STM32F103C6",
+    "processor": "STM32F103",
+    "board": "STM32_F103_STM32DUINO",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "rgblight": {
+        "pin": "A1"
+    }
 }
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index f2280a1a59..c76a8ebe6e 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -1,12 +1,8 @@
-# MCU name
-MCU = STM32F103
-
 # Bootloader selection
 # Cannot use `BOOTLOADER = stm32duino` due to the need to override
 # `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually.
 OPT_DEFS += -DBOOTLOADER_STM32DUINO
 MCU_LDSCRIPT = STM32F103x6_stm32duino_bootloader
-BOARD = STM32_F103_STM32DUINO
 BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
diff --git a/keyboards/handwired/onekey/config.h b/keyboards/handwired/onekey/config.h
index f1ce6d9491..9fcd881321 100644
--- a/keyboards/handwired/onekey/config.h
+++ b/keyboards/handwired/onekey/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h
index 83eded68de..473cfdfbda 100644
--- a/keyboards/handwired/onekey/elite_c/config.h
+++ b/keyboards/handwired/onekey/elite_c/config.h
@@ -18,12 +18,6 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { F4 }
-#define MATRIX_ROW_PINS { F5 }
-
-#define BACKLIGHT_PIN B6
-
-#define RGB_DI_PIN F6
 #define RGB_CI_PIN B1
 
 #define ADC_PIN F6
diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/info.json
index d86f8b4395..1548561041 100644
--- a/keyboards/handwired/onekey/elite_c/info.json
+++ b/keyboards/handwired/onekey/elite_c/info.json
@@ -1,3 +1,14 @@
 {
-    "keyboard_name": "Onekey Elite-C"
+    "keyboard_name": "Onekey Elite-C",
+    "development_board": "elite_c",
+    "matrix_pins": {
+        "cols": ["F4"],
+        "rows": ["F5"]
+    },
+    "backlight": {
+        "pin": "B6"
+    },
+    "rgblight": {
+        "pin": "F6"
+    }
 }
diff --git a/keyboards/handwired/onekey/elite_c/rules.mk b/keyboards/handwired/onekey/elite_c/rules.mk
index e8326bcf09..e69de29bb2 100644
--- a/keyboards/handwired/onekey/elite_c/rules.mk
+++ b/keyboards/handwired/onekey/elite_c/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
deleted file mode 100644
index 722aa59821..0000000000
--- a/keyboards/handwired/onekey/evb_wb32f3g71/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 Nick Brassel (@tzarc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "config_common.h"
-
-#define MATRIX_COL_PINS { B12 }
-#define MATRIX_ROW_PINS { B13 }
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
index c4d9d317e5..6287cdc34a 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
@@ -1,3 +1,9 @@
 {
-    "keyboard_name": "Onekey WB32F3G71 Eval"
+    "keyboard_name": "Onekey WB32F3G71 Eval",
+    "processor": "WB32F3G71",
+    "bootloader": "wb32-dfu",
+    "matrix_pins": {
+        "cols": ["B12"],
+        "rows": ["B13"]
+    }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk b/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
index 9f64c6683f..033dd66aa4 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = WB32F3G71
-
-# Bootloader selection
-BOOTLOADER = wb32-dfu
-
 MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = no       # Audio control and System control
 NKRO_ENABLE = no           # Enable N-Key Rollover
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h
deleted file mode 100644
index 722aa59821..0000000000
--- a/keyboards/handwired/onekey/evb_wb32fq95/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 Nick Brassel (@tzarc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "config_common.h"
-
-#define MATRIX_COL_PINS { B12 }
-#define MATRIX_ROW_PINS { B13 }
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json
index ccc65b2e70..3fc1c88657 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json
@@ -1,3 +1,9 @@
 {
-    "keyboard_name": "Onekey WB32FQ95 Eval"
+    "keyboard_name": "Onekey WB32FQ95 Eval",
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "matrix_pins": {
+        "cols": ["B12"],
+        "rows": ["B13"]
+    }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/rules.mk b/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
index d0dcd16292..033dd66aa4 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
+++ b/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = WB32FQ95
-
-# Bootloader selection
-BOOTLOADER = wb32-dfu
-
 MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = no       # Audio control and System control
 NKRO_ENABLE = no           # Enable N-Key Rollover
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 46cdc82827..605e73e726 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -7,10 +7,23 @@
         "pid": "0x6465",
         "device_version": "0.0.1"
     },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false,
+        "audio": false
+    },
+    "community_layouts": ["ortho_1x1"],
     "layouts": {
         "LAYOUT_ortho_1x1": {
             "layout": [
-                {"x": 0, "y": 0}
+                {"x": 0, "y": 0, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/handwired/onekey/kb2040/config.h b/keyboards/handwired/onekey/kb2040/config.h
index 0bf7adf37f..c6c6dbe2cf 100644
--- a/keyboards/handwired/onekey/kb2040/config.h
+++ b/keyboards/handwired/onekey/kb2040/config.h
@@ -5,10 +5,6 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS \
-    { GP4 }
-#define MATRIX_ROW_PINS \
-    { GP5 }
 #define DEBUG_MATRIX_SCAN_RATE
 
 #define QMK_WAITING_TEST_BUSY_PIN GP8
@@ -18,8 +14,6 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
-#define RGB_DI_PIN A1
-
 // settings for the oled keyboard demo with Adafruit 0.91" OLED display on the Stemma QT port
 #define OLED_DISPLAY_128X32
 #define I2C_DRIVER I2CD1
diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json
index 696b772142..7982db4678 100644
--- a/keyboards/handwired/onekey/kb2040/info.json
+++ b/keyboards/handwired/onekey/kb2040/info.json
@@ -1,3 +1,11 @@
 {
-    "keyboard_name": "Onekey KB2040"
+    "keyboard_name": "Onekey KB2040",
+    "development_board": "kb2040",
+    "matrix_pins": {
+        "cols": ["GP4"],
+        "rows": ["GP5"]
+    },
+    "rgblight": {
+        "pin": "A1"
+    }
 }
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
index 624b331bf8..a5429ba993 100644
--- a/keyboards/handwired/onekey/kb2040/rules.mk
+++ b/keyboards/handwired/onekey/kb2040/rules.mk
@@ -1,9 +1,4 @@
-# MCU name
-MCU = RP2040
-BOOTLOADER = rp2040
-
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
 OPT_DEFS += -DHAL_USE_I2C=TRUE
-
diff --git a/keyboards/handwired/onekey/keymaps/quine/keymap.c b/keyboards/handwired/onekey/keymaps/quine/keymap.c
index e7c1e6d064..f440bba83a 100644
--- a/keyboards/handwired/onekey/keymaps/quine/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/quine/keymap.c
@@ -1,7 +1,7 @@
-#include <handwired/onekey/onekey.h>
+#include <quantum.h>
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_ortho_1x1(KC_A) };
 const char *buf[30] = {
-"#include <handwired/onekey/onekey.h>",
+"#include <quantum.h>",
 "const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_ortho_1x1(KC_A) };",
 "const char *buf[30] = {",
 "",
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h
index b6b36c4cee..24b136fe2a 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/config.h
+++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h
@@ -4,15 +4,10 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { A2 }
-#define MATRIX_ROW_PINS { A1 }
-
-#define BACKLIGHT_PIN         B8
 #define BACKLIGHT_PWM_DRIVER  PWMD4
 #define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE    2
 
-#define RGB_DI_PIN A0
 #define RGB_CI_PIN B13
 
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/info.json
index 3f497fc80a..a6e6511040 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/info.json
+++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json
@@ -1,3 +1,15 @@
 {
-    "keyboard_name": "Onekey Nucleo L432KC"
+    "keyboard_name": "Onekey Nucleo L432KC",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["A2"],
+        "rows": ["A1"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "pin": "A0"
+    }
 }
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/rules.mk b/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
index 64dae7746e..e69de29bb2 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
+++ b/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
diff --git a/keyboards/handwired/onekey/onekey.c b/keyboards/handwired/onekey/onekey.c
index a29f9ea6d0..14c7697328 100644
--- a/keyboards/handwired/onekey/onekey.c
+++ b/keyboards/handwired/onekey/onekey.c
@@ -1,7 +1,7 @@
 // Copyright 2022 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "onekey.h"
+#include "quantum.h"
 
 void keyboard_post_init_kb(void) {
     debug_enable   = true;
diff --git a/keyboards/handwired/onekey/onekey.h b/keyboards/handwired/onekey/onekey.h
deleted file mode 100644
index 72cab45be5..0000000000
--- a/keyboards/handwired/onekey/onekey.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_1x1( \
-    k00 \
-) { \
-    { k00 } \
-}
diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h
index 83eded68de..473cfdfbda 100644
--- a/keyboards/handwired/onekey/promicro/config.h
+++ b/keyboards/handwired/onekey/promicro/config.h
@@ -18,12 +18,6 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { F4 }
-#define MATRIX_ROW_PINS { F5 }
-
-#define BACKLIGHT_PIN B6
-
-#define RGB_DI_PIN F6
 #define RGB_CI_PIN B1
 
 #define ADC_PIN F6
diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/info.json
index 6b35da4d75..efefd8d45c 100644
--- a/keyboards/handwired/onekey/promicro/info.json
+++ b/keyboards/handwired/onekey/promicro/info.json
@@ -1,3 +1,14 @@
 {
-    "keyboard_name": "Onekey Pro Micro"
+    "keyboard_name": "Onekey Pro Micro",
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["F4"],
+        "rows": ["F5"]
+    },
+    "backlight": {
+        "pin": "B6"
+    },
+    "rgblight": {
+        "pin": "F6"
+    }
 }
diff --git a/keyboards/handwired/onekey/promicro/rules.mk b/keyboards/handwired/onekey/promicro/rules.mk
index cf663a7ed6..e69de29bb2 100644
--- a/keyboards/handwired/onekey/promicro/rules.mk
+++ b/keyboards/handwired/onekey/promicro/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h
index 6e8e28edb4..776c422398 100644
--- a/keyboards/handwired/onekey/proton_c/config.h
+++ b/keyboards/handwired/onekey/proton_c/config.h
@@ -18,15 +18,10 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { A2 }
-#define MATRIX_ROW_PINS { A1 }
-
-#define BACKLIGHT_PIN         B8
 #define BACKLIGHT_PWM_DRIVER  PWMD4
 #define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE    2
 
-#define RGB_DI_PIN A0
 #define RGB_CI_PIN B13
 
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/info.json
index 47ac089f7a..5292d02567 100644
--- a/keyboards/handwired/onekey/proton_c/info.json
+++ b/keyboards/handwired/onekey/proton_c/info.json
@@ -1,3 +1,14 @@
 {
-    "keyboard_name": "Onekey Proton-C"
+    "keyboard_name": "Onekey Proton-C",
+    "development_board": "proton_c",
+    "matrix_pins": {
+        "cols": ["A2"],
+        "rows": ["A1"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "pin": "A0"
+    }
 }
diff --git a/keyboards/handwired/onekey/proton_c/rules.mk b/keyboards/handwired/onekey/proton_c/rules.mk
index 7a846816d1..e69de29bb2 100644
--- a/keyboards/handwired/onekey/proton_c/rules.mk
+++ b/keyboards/handwired/onekey/proton_c/rules.mk
@@ -1,6 +0,0 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index c0ef468aa9..bcf4047a4f 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -5,10 +5,6 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS \
-    { GP4 }
-#define MATRIX_ROW_PINS \
-    { GP5 }
 #define DEBUG_MATRIX_SCAN_RATE
 
 #define QMK_WAITING_TEST_BUSY_PIN GP8
@@ -17,5 +13,3 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-
-#define RGB_DI_PIN A1
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json
index 696b021dc1..b34a1cc206 100644
--- a/keyboards/handwired/onekey/rp2040/info.json
+++ b/keyboards/handwired/onekey/rp2040/info.json
@@ -1,3 +1,12 @@
 {
-    "keyboard_name": "Onekey RP2040"
+    "keyboard_name": "Onekey RP2040",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "cols": ["GP4"],
+        "rows": ["GP5"]
+    },
+    "rgblight": {
+        "pin": "A1"
+    }
 }
diff --git a/keyboards/handwired/onekey/rp2040/rules.mk b/keyboards/handwired/onekey/rp2040/rules.mk
index 646402d0bb..e69de29bb2 100644
--- a/keyboards/handwired/onekey/rp2040/rules.mk
+++ b/keyboards/handwired/onekey/rp2040/rules.mk
@@ -1,3 +0,0 @@
-# MCU name
-MCU = RP2040
-BOOTLOADER = rp2040
diff --git a/keyboards/handwired/onekey/rules.mk b/keyboards/handwired/onekey/rules.mk
index 98a145f714..2094801ed9 100644
--- a/keyboards/handwired/onekey/rules.mk
+++ b/keyboards/handwired/onekey/rules.mk
@@ -1,16 +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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = handwired/onekey/promicro
-
-LAYOUTS = ortho_1x1
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/config.h b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
index 6f97baf57f..74ae76f594 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/config.h
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
@@ -18,16 +18,9 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS \
-    { B0 }
-#define MATRIX_ROW_PINS \
-    { A7 }
-
-#define BACKLIGHT_PIN A1           /* Green LED. */
 #define BACKLIGHT_PWM_DRIVER PWMD5 /* GD32 numbering scheme starts from 0, TIMER4 on GD32 boards is TIMER5 on STM32 boards. */
 #define BACKLIGHT_PWM_CHANNEL 2    /* GD32 numbering scheme starts from 0, Channel 1 on GD32 boards is Channel 2 on STM32 boards. */
 
-#define RGB_DI_PIN A2
 #define RGB_CI_PIN B13
 
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
index 10f661c3d9..d14928139b 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
@@ -1,3 +1,16 @@
 {
-    "keyboard_name": "Onekey Sipeed Longan Nano"
+    "keyboard_name": "Onekey Sipeed Longan Nano",
+    "processor": "GD32VF103",
+    "bootloader": "gd32v-dfu",
+    "board": "SIPEED_LONGAN_NANO",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A1"
+    },
+    "rgblight": {
+        "pin": "A2"
+    }
 }
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/rules.mk b/keyboards/handwired/onekey/sipeed_longan_nano/rules.mk
index aef4fee6b2..1071cf62ee 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/rules.mk
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/rules.mk
@@ -1,11 +1 @@
-# MCU name
-MCU   = GD32VF103
-BOARD = SIPEED_LONGAN_NANO
-
-# Bootloader selection
-BOOTLOADER = gd32v-dfu
-
-# Build Options
-#   change yes to no to disable
-#
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h
index 373f1c943a..7d23fb9307 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/config.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/config.h
@@ -18,14 +18,10 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { B4 }
-#define MATRIX_ROW_PINS { B5 }
-
-#define BACKLIGHT_PIN         C8
 #define BACKLIGHT_PWM_DRIVER  PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE    0
 
-#define RGB_DI_PIN B15
-
 #define ADC_PIN A0
+
+#define RGB_CI_PIN B13
diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/info.json
index ef4312059b..c76bd73173 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/info.json
+++ b/keyboards/handwired/onekey/stm32f0_disco/info.json
@@ -1,3 +1,15 @@
 {
-    "keyboard_name": "Onekey STM32F072 Discovery"
+    "keyboard_name": "Onekey STM32F072 Discovery",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["B4"],
+        "rows": ["B5"]
+    },
+    "backlight": {
+        "pin": "C8"
+    },
+    "rgblight": {
+        "pin": "B15"
+    }
 }
diff --git a/keyboards/handwired/onekey/stm32f0_disco/rules.mk b/keyboards/handwired/onekey/stm32f0_disco/rules.mk
index 6b37928327..a92b099328 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk
+++ b/keyboards/handwired/onekey/stm32f0_disco/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/onekey/stm32f405_feather/config.h b/keyboards/handwired/onekey/stm32f405_feather/config.h
deleted file mode 100644
index ea9f409640..0000000000
--- a/keyboards/handwired/onekey/stm32f405_feather/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-#define MATRIX_COL_PINS { C2 }
-#define MATRIX_ROW_PINS { C3 }
diff --git a/keyboards/handwired/onekey/stm32f405_feather/info.json b/keyboards/handwired/onekey/stm32f405_feather/info.json
index 410ddbdd32..5135873576 100644
--- a/keyboards/handwired/onekey/stm32f405_feather/info.json
+++ b/keyboards/handwired/onekey/stm32f405_feather/info.json
@@ -1,3 +1,9 @@
 {
-    "keyboard_name": "Onekey Adafruit Feather STM32F405"
+    "keyboard_name": "Onekey Adafruit Feather STM32F405",
+    "processor": "STM32F405",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["C2"],
+        "rows": ["C3"],
+    }
 }
diff --git a/keyboards/handwired/onekey/stm32f405_feather/rules.mk b/keyboards/handwired/onekey/stm32f405_feather/rules.mk
index bff7a7e297..a92b099328 100644
--- a/keyboards/handwired/onekey/stm32f405_feather/rules.mk
+++ b/keyboards/handwired/onekey/stm32f405_feather/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = STM32F405
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h
index fb775a06b0..a2a2a64835 100644
--- a/keyboards/handwired/onekey/teensy_2/config.h
+++ b/keyboards/handwired/onekey/teensy_2/config.h
@@ -18,14 +18,9 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { F4 }
-#define MATRIX_ROW_PINS { F5 }
-
-#define BACKLIGHT_PIN B6
-
-#define RGB_DI_PIN F6
-
 #define ADC_PIN F6
 
+#define RGB_CI_PIN F7
+
 #define QMK_WAITING_TEST_BUSY_PIN F6
 #define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json
index f081d3a25c..2425168462 100644
--- a/keyboards/handwired/onekey/teensy_2/info.json
+++ b/keyboards/handwired/onekey/teensy_2/info.json
@@ -1,3 +1,15 @@
 {
-    "keyboard_name": "Onekey Teensy 2.0"
+    "keyboard_name": "Onekey Teensy 2.0",
+    "processor": "atmega32u4",
+    "bootloader": "halfkay",
+    "matrix_pins": {
+        "cols": ["F4"],
+        "rows": ["F5"]
+    },
+    "backlight": {
+        "pin": "B6"
+    },
+    "rgblight": {
+        "pin": "F6"
+    }
 }
diff --git a/keyboards/handwired/onekey/teensy_2/rules.mk b/keyboards/handwired/onekey/teensy_2/rules.mk
index 320633f80f..e69de29bb2 100644
--- a/keyboards/handwired/onekey/teensy_2/rules.mk
+++ b/keyboards/handwired/onekey/teensy_2/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = halfkay
diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h
index fb775a06b0..a2a2a64835 100644
--- a/keyboards/handwired/onekey/teensy_2pp/config.h
+++ b/keyboards/handwired/onekey/teensy_2pp/config.h
@@ -18,14 +18,9 @@
 
 #include "config_common.h"
 
-#define MATRIX_COL_PINS { F4 }
-#define MATRIX_ROW_PINS { F5 }
-
-#define BACKLIGHT_PIN B6
-
-#define RGB_DI_PIN F6
-
 #define ADC_PIN F6
 
+#define RGB_CI_PIN F7
+
 #define QMK_WAITING_TEST_BUSY_PIN F6
 #define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/info.json
index bec94fa3dc..ba7281ce1b 100644
--- a/keyboards/handwired/onekey/teensy_2pp/info.json
+++ b/keyboards/handwired/onekey/teensy_2pp/info.json
@@ -1,3 +1,15 @@
 {
-    "keyboard_name": "Onekey Teensy 2.0++"
+    "keyboard_name": "Onekey Teensy 2.0++",
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
+    "matrix_pins": {
+        "cols": ["F4"],
+        "rows": ["F5"]
+    },
+    "backlight": {
+        "pin": "B6"
+    },
+    "rgblight": {
+        "pin": "F6"
+    }
 }
diff --git a/keyboards/handwired/onekey/teensy_2pp/rules.mk b/keyboards/handwired/onekey/teensy_2pp/rules.mk
index 149471682d..e69de29bb2 100644
--- a/keyboards/handwired/onekey/teensy_2pp/rules.mk
+++ b/keyboards/handwired/onekey/teensy_2pp/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = at90usb1286
-
-# Bootloader selection
-BOOTLOADER = halfkay
diff --git a/keyboards/handwired/onekey/teensy_32/config.h b/keyboards/handwired/onekey/teensy_32/config.h
index 3444cca67f..e01cfa3c8c 100644
--- a/keyboards/handwired/onekey/teensy_32/config.h
+++ b/keyboards/handwired/onekey/teensy_32/config.h
@@ -19,9 +19,6 @@
 // TODO: including this causes "error: expected identifier before '(' token" errors
 //#include "config_common.h"
 
-#define MATRIX_COL_PINS { D5 }
-#define MATRIX_ROW_PINS { B2 }
-
 // i2c_master defines
 #define I2C1_SCL_PIN B0 // A2 on pinout = B0
 #define I2C1_SDA_PIN B1 // A3 on pinout = B1
diff --git a/keyboards/handwired/onekey/teensy_32/info.json b/keyboards/handwired/onekey/teensy_32/info.json
index 213b4ea153..6d82d300ba 100644
--- a/keyboards/handwired/onekey/teensy_32/info.json
+++ b/keyboards/handwired/onekey/teensy_32/info.json
@@ -1,3 +1,9 @@
 {
-    "keyboard_name": "Onekey Teensy 3.2"
+    "keyboard_name": "Onekey Teensy 3.2",
+    "processor": "MK20DX256",
+    "bootloader": "halfkay",
+    "matrix_pins": {
+        "cols": ["D5"],
+        "rows": ["B2"]
+    }
 }
diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk
index 937c9d5103..a92b099328 100644
--- a/keyboards/handwired/onekey/teensy_32/rules.mk
+++ b/keyboards/handwired/onekey/teensy_32/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = MK20DX256
-
-# Bootloader selection
-BOOTLOADER = halfkay
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/onekey/teensy_35/config.h b/keyboards/handwired/onekey/teensy_35/config.h
index 13eaf1a4f6..0f15fc87d8 100644
--- a/keyboards/handwired/onekey/teensy_35/config.h
+++ b/keyboards/handwired/onekey/teensy_35/config.h
@@ -19,9 +19,6 @@
 // TODO: including this causes "error: expected identifier before '(' token" errors
 //#include "config_common.h"
 
-#define MATRIX_COL_PINS { D5 } // 20/A6
-#define MATRIX_ROW_PINS { B2 } // 19/A5
-
 // i2c_master defines
 #define I2C1_SCL_PIN B0 // 16/A2 on pinout
 #define I2C1_SDA_PIN B1 // 17/A3 on pinout
diff --git a/keyboards/handwired/onekey/teensy_35/info.json b/keyboards/handwired/onekey/teensy_35/info.json
index 99b6a236c5..59cc1decdc 100644
--- a/keyboards/handwired/onekey/teensy_35/info.json
+++ b/keyboards/handwired/onekey/teensy_35/info.json
@@ -1,3 +1,9 @@
 {
-    "keyboard_name": "Onekey Teensy 3.5"
+    "keyboard_name": "Onekey Teensy 3.5",
+    "processor": "MK64FX512",
+    "bootloader": "halfkay",
+    "matrix_pins": {
+        "cols": ["D5"], // 20/A6
+        "rows": ["B2"]  // 19/A5
+    }
 }
diff --git a/keyboards/handwired/onekey/teensy_35/rules.mk b/keyboards/handwired/onekey/teensy_35/rules.mk
index 8ebefd03f5..a92b099328 100644
--- a/keyboards/handwired/onekey/teensy_35/rules.mk
+++ b/keyboards/handwired/onekey/teensy_35/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = MK64FX512
-
-# Bootloader selection
-BOOTLOADER = halfkay
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/onekey/teensy_lc/config.h b/keyboards/handwired/onekey/teensy_lc/config.h
index 3444cca67f..e01cfa3c8c 100644
--- a/keyboards/handwired/onekey/teensy_lc/config.h
+++ b/keyboards/handwired/onekey/teensy_lc/config.h
@@ -19,9 +19,6 @@
 // TODO: including this causes "error: expected identifier before '(' token" errors
 //#include "config_common.h"
 
-#define MATRIX_COL_PINS { D5 }
-#define MATRIX_ROW_PINS { B2 }
-
 // i2c_master defines
 #define I2C1_SCL_PIN B0 // A2 on pinout = B0
 #define I2C1_SDA_PIN B1 // A3 on pinout = B1
diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/info.json
index 68eea92235..a81b90fa8a 100644
--- a/keyboards/handwired/onekey/teensy_lc/info.json
+++ b/keyboards/handwired/onekey/teensy_lc/info.json
@@ -1,3 +1,9 @@
 {
-    "keyboard_name": "Onekey Teensy LC"
+    "keyboard_name": "Onekey Teensy LC",
+    "processor": "MKL26Z64",
+    "bootloader": "halfkay",
+    "matrix_pins": {
+        "cols": ["D5"],
+        "rows": ["B2"]
+    }
 }
diff --git a/keyboards/handwired/onekey/teensy_lc/rules.mk b/keyboards/handwired/onekey/teensy_lc/rules.mk
index 0e3c7edf7a..9803d8cc70 100644
--- a/keyboards/handwired/onekey/teensy_lc/rules.mk
+++ b/keyboards/handwired/onekey/teensy_lc/rules.mk
@@ -1,9 +1,4 @@
-# MCU name
-MCU = MKL26Z64
 USE_CHIBIOS_CONTRIB = yes
 
-# Bootloader selection
-BOOTLOADER = halfkay
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From 94ec64f91b9914d6b1a45485607cd1d494decc1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 05:34:02 +1000
Subject: [PATCH 489/959] Bump anothrNick/github-tag-action from 1.49.0 to
 1.50.0 (#18536)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto_tag.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index 904db4dcc9..b85cd23146 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.49.0
+      uses: anothrNick/github-tag-action@1.50.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

From 43e57ab777c4ea1fed0f649c7b6bed88505d0c43 Mon Sep 17 00:00:00 2001
From: Joe Scotto <contact@joescotto.com>
Date: Thu, 29 Sep 2022 16:32:27 -0400
Subject: [PATCH 490/959] [Keyboard] Add ScottoCMD Keyboard (#18520)

---
 .../handwired/jscotto/scottocmd/config.h      |  25 +
 .../handwired/jscotto/scottocmd/info.json     |  96 ++++
 .../scottocmd/keymaps/default/config.h        |  24 +
 .../scottocmd/keymaps/default/keymap.c        | 515 ++++++++++++++++++
 .../scottocmd/keymaps/default/rules.mk        |   2 +
 .../handwired/jscotto/scottocmd/readme.md     |  25 +
 .../handwired/jscotto/scottocmd/rules.mk      |   2 +
 7 files changed, 689 insertions(+)
 create mode 100644 keyboards/handwired/jscotto/scottocmd/config.h
 create mode 100644 keyboards/handwired/jscotto/scottocmd/info.json
 create mode 100644 keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
 create mode 100644 keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/jscotto/scottocmd/keymaps/default/rules.mk
 create mode 100644 keyboards/handwired/jscotto/scottocmd/readme.md
 create mode 100644 keyboards/handwired/jscotto/scottocmd/rules.mk

diff --git a/keyboards/handwired/jscotto/scottocmd/config.h b/keyboards/handwired/jscotto/scottocmd/config.h
new file mode 100644
index 0000000000..db72806f86
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottocmd/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Define tab key for boot magic
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 0
+
+// OLED 
+#define OLED_DISPLAY_128X64
\ No newline at end of file
diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json
new file mode 100644
index 0000000000..b2040fb7ab
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottocmd/info.json
@@ -0,0 +1,96 @@
+{
+    "manufacturer": "Joe Scotto",
+    "keyboard_name": "ScottoCMD",
+    "maintainer": "joe-scotto",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        // TX0, RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1
+        "cols": [
+            "D3",
+            "D2",
+            "D4",
+            "C6",
+            "D7",
+            "E6",
+            "B4",
+            "B5",
+            "F4",
+            "F5",
+            "F6"
+        ],
+
+        // A0, 15, 14, 16, 10
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4_3x10_4": {
+            "layout": [
+                // Row 1 (Macros)
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+
+                // Row 2
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+
+                // Row 3
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+
+                // Row 4
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "x": 5, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 },
+                { "matrix": [3, 9], "x": 9, "y": 3 },
+                { "matrix": [3, 10], "x": 10, "y": 3 },
+
+                // Row 5
+                { "matrix": [4, 1], "x": 1, "y": 4 },
+                { "matrix": [4, 5], "x": 5, "y": 4 },
+                { "matrix": [4, 9], "x": 9, "y": 4 },
+                { "matrix": [4, 10], "x": 10, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
new file mode 100644
index 0000000000..8723c294cb
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Define options
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
new file mode 100644
index 0000000000..398178bf5b
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
@@ -0,0 +1,515 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#include <stdio.h>
+char wpm_str[10];
+
+// Tap Dance declarations
+enum {
+    TD_ESC_SPOTLIGHT_EMOJI,
+    TD_ESC_WINDOWS_EMOJI
+};
+
+void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        tap_code(KC_ESC);
+    } else if (state->count == 2) {
+        tap_code16(G(KC_SPC));
+    } else if (state->count == 3) {
+        tap_code16(C(G(KC_SPC)));
+    }
+}
+
+void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        tap_code(KC_ESC);
+    } else if (state->count == 2) {
+        tap_code(KC_LGUI);
+    } else if (state->count == 3) {
+        tap_code16(G(KC_DOT));
+    }
+};
+
+ // Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
+    [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_ESC_SPOTLIGHT_EMOJI) :
+        case TD(TD_ESC_WINDOWS_EMOJI) :
+        case LGUI_T(KC_SPC) :
+        case LT(1, KC_TAB) :
+        case LT(2, KC_ENT) :
+      return 200;
+    default:
+      return TAPPING_TERM;
+  }
+};
+
+// Layer Names
+enum layer_names {
+    _MAC_DEFAULT,
+    _MAC_CODE,
+    _MAC_NUM,
+    _MAC_FUNC,
+    _WIN_DEFAULT,
+    _WIN_CODE,
+    _WIN_NUM,
+    _WIN_FUNC
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4_3x10_4(
+                                                                      KC_LCTL, KC_2,     KC_3,          TD(TD_ESC_SPOTLIGHT_EMOJI),
+        KC_TAB, KC_Q,         KC_W, KC_F, KC_P, KC_G,           KC_J, KC_L,    KC_U,     KC_Y,          KC_BSPC,
+        KC_ENT, KC_A,         KC_R, KC_S, KC_T, KC_D,           KC_H, KC_N,    KC_E,     KC_I,          KC_O,
+                LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B,           KC_K, KC_M,    KC_COMMA, KC_DOT,        RSFT_T(KC_SLSH),
+                KC_LALT,                        LGUI_T(KC_SPC),                          LT(1, KC_TAB), LT(2, KC_ENT)
+    ),
+    [1] = LAYOUT_ortho_4_3x10_4(
+                                                                                      KC_LCTL, KC_2,    KC_3,    TD(TD_ESC_SPOTLIGHT_EMOJI),
+        KC_TAB, KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN,        KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+        KC_ENT, KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE,        KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,
+                LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN,        KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+                KC_LALT,                                    LGUI_T(KC_SPC),                             KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_ortho_4_3x10_4(
+                                                                          KC_LCTL, KC_2,    KC_3,    TD(TD_ESC_SPOTLIGHT_EMOJI),
+        KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,        KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+        KC_ENT, KC_1,    KC_2,  KC_3,    KC_4,   KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+                KC_LSFT, KC_NO, KC_NO,   KC_NO,  MO(3),          KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
+                KC_LALT,                         LGUI_T(KC_SPC),                            KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_ortho_4_3x10_4(
+                                                                         KC_LCTL, KC_2,  KC_3,    TD(TD_ESC_SPOTLIGHT_EMOJI),
+        KC_TAB, KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,            KC_NO, KC_NO,   KC_NO, KC_NO,   TO(4),
+        KC_ENT, KC_F1,   KC_F2, KC_F3, KC_F4,   KC_F5,            KC_F6, KC_F7,   KC_F8, KC_F9,   KC_F10,
+                KC_F11,  KC_NO, KC_NO, QK_BOOT, KC_TRNS,          KC_NO, KC_NO,   KC_NO, KC_NO,   KC_F12,
+                KC_LALT,                          LGUI_T(KC_SPC),                        KC_TRNS, KC_TRNS
+     ),
+     [4] = LAYOUT_ortho_4_3x10_4(
+                                                              KC_1, KC_2,     KC_3,          TD(TD_ESC_WINDOWS_EMOJI),
+        KC_TAB, KC_Q,         KC_W, KC_F, KC_P, KC_G,   KC_J, KC_L, KC_U,     KC_Y,          KC_BSPC,
+        KC_ENT, KC_A,         KC_R, KC_S, KC_T, KC_D,   KC_H, KC_N, KC_E,     KC_I,          KC_O,
+                LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B,   KC_K, KC_M, KC_COMMA, KC_DOT,        RSFT_T(KC_SLSH),
+                KC_LCTL,                        KC_SPC,                       LT(5, KC_TAB), LT(6, KC_ENT)
+    ),
+    [5] = LAYOUT_ortho_4_3x10_4(
+                                                                               KC_1,    KC_2,    KC_3,    TD(TD_ESC_WINDOWS_EMOJI),
+        KC_TAB, KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN, KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+        KC_ENT, KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,
+                LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+                KC_LCTL,                                    KC_SPC,                              KC_TRNS, KC_TRNS
+    ),
+    [6] = LAYOUT_ortho_4_3x10_4(
+                                                                   KC_1,    KC_2,    KC_3,    TD(TD_ESC_WINDOWS_EMOJI),
+        KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+        KC_ENT, KC_1,    KC_2,  KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+                KC_LSFT, KC_NO, KC_NO,   KC_NO,  MO(7),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
+                KC_LCTL,                         KC_SPC,                             KC_TRNS, KC_TRNS
+    ),
+    [7] = LAYOUT_ortho_4_3x10_4(
+                                                                KC_1,  KC_2,  KC_3,    TD(TD_ESC_WINDOWS_EMOJI),
+        KC_TAB, KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,   TO(0),
+        KC_ENT, KC_F1,   KC_F2, KC_F3, KC_F4,   KC_F5,   KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,
+                KC_F11,  KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO,   KC_F12,
+                KC_LCTL,                        KC_SPC,                       KC_TRNS, KC_TRNS
+     )
+};
+
+// OLED
+#ifdef OLED_ENABLE
+// WPM responsiveness
+#define IDLE_FRAMES              5   // How many idle frames in animation
+#define IDLE_SPEED               20  // Speed at which animation idles
+#define TAP_FRAMES               2   // How many tapping frames
+#define TAP_SPEED                40  // WPM to trigger Bongo
+#define ANIMATION_FRAME_DURATION 200 // MS duration of each frame
+#define ANIMATION_SIZE           256 // Number of bytes per animation frame
+
+uint32_t anim_timer         = 0;
+uint32_t anim_sleep         = 0;
+uint8_t  current_idle_frame = 0;
+uint8_t current_tap_frame   = 0;
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_90;  // flips the display 180 degrees if offhand
+}
+
+static void render_animation(void) {
+    static const char PROGMEM idle[IDLE_FRAMES][ANIMATION_SIZE] = {
+        { 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 
+            0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 
+            0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
+            0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 
+            0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 
+            0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 
+            0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        { 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 
+            0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 
+            0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
+            0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 
+            0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 
+            0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 
+            0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        { 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 
+            0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 
+            0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 
+            0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 
+            0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        { 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 
+            0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 
+            0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 
+            0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 
+            0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        { 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 
+            0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 
+            0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
+            0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 
+            0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 
+            0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 
+            0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
+    };
+    static const char PROGMEM prep[][ANIMATION_SIZE] = {
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 
+            0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 
+            0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
+            0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 
+            0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 
+            0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 
+            0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 
+            0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 
+            0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
+    };
+    static const char PROGMEM tap[TAP_FRAMES][ANIMATION_SIZE] = {
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 
+            0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 
+            0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
+            0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 
+            0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 
+            0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 
+            0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 
+            0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 
+            0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 
+            0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 
+            0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
+            0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 
+            0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 
+            0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 
+            0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 
+            0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 
+            0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 
+            0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00
+        }
+    };
+
+    void animation_phase(void) {
+        // Set cursor to draw from the bottom up
+        oled_set_cursor(128, 0);
+
+        if (get_current_wpm() <= IDLE_SPEED) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIMATION_SIZE);
+        }
+
+        // Start prep image
+        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
+            oled_write_raw_P(prep[0], ANIMATION_SIZE);
+        }
+
+        // Start tap animation
+        if (get_current_wpm() >= TAP_SPEED) {
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIMATION_SIZE);
+        }
+    }
+    if (get_current_wpm() != 000) {
+        oled_on();  // Enables OLED on any alpha keypress
+
+        if (timer_elapsed32(anim_timer) > ANIMATION_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+
+        anim_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIMATION_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+// Draw to OLED
+bool oled_task_user() {
+    // Caps lock text
+    led_t led_state = host_keyboard_led_state();
+    oled_set_cursor(0,1);
+    oled_write_P(led_state.caps_lock ? PSTR(" Caps Lock "): PSTR(" ScottoCMD "), false);
+
+    //WPM text
+    oled_set_cursor(0, 9);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false);
+    oled_write_P(PSTR(" WPM"), false);
+    
+    static const char PROGMEM logos[][256] = {
+            // Apple
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x70, 0x78, 0x7c, 0x3e, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 
+                0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3e, 0x0e, 0x04, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 
+                0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  
+
+            },
+
+            // Windows
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+                0xf8, 0xf8, 0x00, 0x80, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x40, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0xb8, 0x9f, 0x9f, 0x9f, 0x9f, 0x8f, 0x9f, 0x9f, 0x9f, 0x1f, 0x3f, 0x3f, 
+                0x07, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0xe0, 
+                0xfc, 0xfc, 0xf9, 0xf9, 0xf9, 0xf3, 0xf3, 0xf3, 0xfb, 0xfb, 0xf9, 0x19, 0x01, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x02, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x07, 0x01, 0x00, 0x1e, 0x1f, 
+                0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+            },
+
+            // Code
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x80, 0xc0, 0xe0, 0xf0, 0x78, 0x3c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 
+                0xf8, 0xfc, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x3c, 0x78, 0xf0, 0xe0, 0xc0, 0x80, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x01, 0x03, 0x07, 0x0f, 0x3e, 0x3c, 0x38, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0x7e, 0x1f, 0x07, 
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x3c, 0x3e, 0x0f, 0x07, 0x03, 0x01, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            },
+
+            // Number
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x1f, 
+                0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x1e, 0x1e, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1e, 
+                0x1e, 0x1e, 0xbe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1e, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x78, 0x78, 
+                0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x78, 0x78, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 
+                0xc0, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+            },
+
+            // Function
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 
+                0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0x9f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x8f, 0x3f, 
+                0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xfc, 0xfe, 0x7f, 0x3f, 0x0f, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3e, 
+                0x1e, 0x0c, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x78, 0xfc, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
+            },
+
+            // Caps Lock
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+                0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+                0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        };
+
+    // Layer images 
+    oled_set_cursor(32, 0);
+    switch (get_highest_layer(layer_state)) {
+        case _MAC_DEFAULT :
+            oled_write_raw_P(logos[0], sizeof(logos[0]));
+            break;
+        case _WIN_DEFAULT :
+            oled_write_raw_P(logos[1], sizeof(logos[1]));
+            break;
+        case _MAC_CODE :
+        case _WIN_CODE :
+            oled_write_raw_P(logos[2], sizeof(logos[2]));
+            break;
+        case _MAC_NUM :
+        case _WIN_NUM :
+            oled_write_raw_P(logos[3], sizeof(logos[3]));
+            break;
+        case _MAC_FUNC :
+        case _WIN_FUNC :
+            oled_write_raw_P(logos[4], sizeof(logos[4]));
+            break;
+    }
+
+    // Render Bongo Cat
+    render_animation(); 
+
+    return false;
+}
+#endif
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/rules.mk b/keyboards/handwired/jscotto/scottocmd/keymaps/default/rules.mk
new file mode 100644
index 0000000000..bcee933e75
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+WPM_ENABLE = yes
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/jscotto/scottocmd/readme.md b/keyboards/handwired/jscotto/scottocmd/readme.md
new file mode 100644
index 0000000000..b08d02d678
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottocmd/readme.md
@@ -0,0 +1,25 @@
+# ScottoCMD
+
+![ScottoCMD](https://i.imgur.com/rxiMZNnh.jpg)
+
+A 40 key handwired ortholinear keyboard with non-ortho bottom row. Featuring a 128x64 OLED display along with a 6.25u spacebar. Case files available [here](https://github.com/joe-scotto/keyboards.git).
+
+-   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+-   Hardware Supported: ATmega32U4
+-   Hardware Availability: [Amazon](https://amazon.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/jscotto/scottocmd:default
+
+Flashing example for this keyboard:
+
+    make handwired/jscotto/scottocmd:default
+
+# Bootloader
+
+Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (1, 0) when plugging the board in to enter bootloader mode.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/jscotto/scottocmd/rules.mk b/keyboards/handwired/jscotto/scottocmd/rules.mk
new file mode 100644
index 0000000000..9f00574d5d
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottocmd/rules.mk
@@ -0,0 +1,2 @@
+OLED_ENABLE = yes
+LTO_ENABLE = yes

From 413284a2e80c926c155bbdbee4dbc7c05687b63e Mon Sep 17 00:00:00 2001
From: Zicodia <82699172+Z1codia@users.noreply.github.com>
Date: Thu, 29 Sep 2022 17:55:19 -0500
Subject: [PATCH 491/959] Fixed layout matrix for TKLFRLNRLMLAO (#18537)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/zicodia/tklfrlnrlmlao/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/info.json
index fcecd42620..8b2cdc58e4 100644
--- a/keyboards/zicodia/tklfrlnrlmlao/info.json
+++ b/keyboards/zicodia/tklfrlnrlmlao/info.json
@@ -26,10 +26,10 @@
     "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.5, "y": 0  }, { "matrix": [0, 5], "x": 5.5, "y": 0  }, { "matrix": [0, 6], "x": 6.5, "y": 0            }, { "matrix": [0, 7], "x": 7.75, "y": 0    }, { "matrix": [0, 8], "x": 8.75, "y": 0    }, { "matrix": [0, 9], "x": 9.75, "y": 0 }, 
-                { "matrix": [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": 0, "y": 1.25 }, { "matrix": [1, 5], "x": 0, "y": 1.25 }, { "matrix": [1, 6], "x": 0, "y": 1.25, "w": 1.5 }, { "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": [2, 0], "x": 0, "y": 2.25, "w": 1.5  }, { "matrix": [2, 1], "x": 1, "y": 2.25 }, { "matrix": [2, 2], "x": 2, "y": 2.25 }, { "matrix": [2, 3], "x": 3, "y": 2.25         }, { "matrix": [2, 4], "x": 0, "y": 2.25 }, { "matrix": [2, 5], "x": 0, "y": 2.25 }, { "matrix": [2, 6], "x": 0, "y": 2.25           },                                             { "matrix": [2, 8], "x": 8.75, "y": 2.25 },
-                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1, "y": 3.25 },                                          { "matrix": [3, 3], "x": 3, "y": 3.25, "w": 3 },                                          { "matrix": [3, 5], "x": 0, "y": 3.25 }, { "matrix": [3, 6], "x": 0, "y": 3.25, "w":1.25 }, { "matrix": [3, 7], "x": 0, "y": 3.25    }, { "matrix": [3, 8], "x": 7.75, "y": 3.25 }, { "matrix": [3, 9], "x": 8.75, "y": 3.25 }
+                { "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.5, "y": 0    }, { "matrix": [0, 5], "x": 5.5, "y": 0     }, { "matrix": [0, 6], "x": 6.5, "y": 0                }, { "matrix": [0, 7], "x": 7.75, "y": 0    }, { "matrix": [0, 8], "x": 8.75, "y": 0    }, { "matrix": [0, 9], "x": 9.75, "y": 0 }, 
+                { "matrix": [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, "w": 1.5     }, { "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": [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, 8], "x": 8.75, "y": 2.25 },
+                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1.25, "y": 3.25 }, { "matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3 },                                                                                       { "matrix": [3, 5], "x": 5.25, "y": 3.25 }, { "matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.25 }, { "matrix": [3, 7], "x": 7.75, "y": 3.25 }, { "matrix": [3, 8], "x": 7.75, "y": 3.25 }, { "matrix": [3, 9], "x": 8.75, "y": 3.25 }
             ]
         }
     }

From 96c1ac24eea52fa0b69829ff04a64d2c38febea7 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 29 Sep 2022 16:02:21 -0700
Subject: [PATCH 492/959] TKL-FF Community Layout Support (#18538)

---
 keyboards/ramonimbao/tkl_ff/info.json                | 12 ++++++++++--
 keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c |  2 +-
 keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c     |  2 +-
 keyboards/ramonimbao/tkl_ff/tkl_ff.h                 |  4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/ramonimbao/tkl_ff/info.json
index a3a22e34d8..1ff3133deb 100644
--- a/keyboards/ramonimbao/tkl_ff/info.json
+++ b/keyboards/ramonimbao/tkl_ff/info.json
@@ -7,8 +7,16 @@
         "vid": "0xB16B",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
+        "LAYOUT_iso": "LAYOUT_tkl_f13_iso"
+    },
+    "community_layouts": [
+        "tkl_f13_ansi",
+        "tkl_f13_iso"
+    ],
     "layouts": {
-        "LAYOUT_ansi": {
+        "LAYOUT_tkl_f13_ansi": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1.25, "y":0},
@@ -105,7 +113,7 @@
                 {"x":17.25, "y":5.25}
             ]
         },
-        "LAYOUT_iso": {
+        "LAYOUT_tkl_f13_iso": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1.25, "y":0},
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
index e44b56e55f..1f7c9c6388 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ansi(
+    [0] = LAYOUT_tkl_f13_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
index 17997828df..dcd383794d 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_iso(
+    [0] = LAYOUT_tkl_f13_iso(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/ramonimbao/tkl_ff/tkl_ff.h b/keyboards/ramonimbao/tkl_ff/tkl_ff.h
index 2fc2a98948..cdc4ab60cb 100644
--- a/keyboards/ramonimbao/tkl_ff/tkl_ff.h
+++ b/keyboards/ramonimbao/tkl_ff/tkl_ff.h
@@ -34,7 +34,7 @@
 // Full right shift
 // Full left shift
 // 6.25u bottom row
-#define LAYOUT_ansi( \
+#define LAYOUT_tkl_f13_ansi( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
@@ -55,7 +55,7 @@
 // Full right shift
 // Split left shift
 // 6.25u bottom row
-#define LAYOUT_iso( \
+#define LAYOUT_tkl_f13_iso( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \

From 1dd15a8f22d3f497cf0e6226f8bb8e228d806628 Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Thu, 29 Sep 2022 20:10:33 -0400
Subject: [PATCH 493/959] [Keyboard] tau4 fixup/refactor (#18523)

---
 keyboards/tau4/common/glcdfont.c        |   0
 keyboards/tau4/config.h                 |  34 +-------
 keyboards/tau4/info.json                | 111 +++++++++++++++++++++++-
 keyboards/tau4/keymaps/default/keymap.c |  57 +++---------
 keyboards/tau4/keymaps/default/rules.mk |   1 +
 keyboards/tau4/readme.md                |  14 ++-
 keyboards/tau4/rules.mk                 |  20 +----
 keyboards/tau4/tau4.c                   |  45 +++++++++-
 keyboards/tau4/tau4.h                   |  32 -------
 9 files changed, 182 insertions(+), 132 deletions(-)
 mode change 100755 => 100644 keyboards/tau4/common/glcdfont.c
 mode change 100755 => 100644 keyboards/tau4/config.h
 create mode 100644 keyboards/tau4/keymaps/default/rules.mk
 mode change 100755 => 100644 keyboards/tau4/rules.mk
 mode change 100755 => 100644 keyboards/tau4/tau4.c
 delete mode 100755 keyboards/tau4/tau4.h

diff --git a/keyboards/tau4/common/glcdfont.c b/keyboards/tau4/common/glcdfont.c
old mode 100755
new mode 100644
diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h
old mode 100755
new mode 100644
index a829fda5be..ccc0217bd5
--- a/keyboards/tau4/config.h
+++ b/keyboards/tau4/config.h
@@ -19,35 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F1, F0, B0, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_LAYERS
-#define RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 128
-#endif
-
-#define ENCODERS_PAD_A { B3 }
-#define ENCODERS_PAD_B { B7 }
-#define ENCODER_RESOLUTION 1
-
 // Buggy, currently disabled
 /* #define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100000
 #define EXTERNAL_EEPROM_I2C_ADDRESS(loc) (EXTERNAL_EEPROM_I2C_BASE_ADDRESS | ((((loc) >> 8) & 0x07) << 1))
@@ -56,9 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EXTERNAL_EEPROM_ADDRESS_SIZE 1
 #define EXTERNAL_EEPROM_WRITE_TIME 5 */
 
-#define OLED_DISPLAY_ADDRESS 0x3C
-#define OLED_BRIGHTNESS 255
-#define OLED_IC OLED_IC_SSD1306
+#define RGBLIGHT_LAYERS_RETAIN_VAL
+
 #define OLED_DISPLAY_WIDTH 128
 #define OLED_DISPLAY_HEIGHT 32
 #define OLED_FONT_H "keyboards/tau4/common/glcdfont.c"
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json
index 9ec48383c7..dca1387203 100644
--- a/keyboards/tau4/info.json
+++ b/keyboards/tau4/info.json
@@ -1,11 +1,120 @@
 {
     "keyboard_name": "tau4",
     "manufacturer": "taukeyboards",
-    "url": "",
+    "url": "https://gaskell.tech/tau/four.html",
     "maintainer": "qmk",
     "usb": {
         "vid": "0xFEED",
         "pid": "0x6060",
         "device_version": "0.0.1"
+    },
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "rows": [ "F4", "F5", "F6", "F7" ],
+        "cols": [ "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1" ]
+    },
+    "processor": "atmega32u4",
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "community_layouts": [ "ortho_4x12" ],
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B3", "pin_b": "B7", "resolution": 1 }
+        ]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 8,
+        "hue_steps": 8,
+        "layers": {
+            "blink": false,
+            "enabled": true,
+            "max": 5,
+            "override_rgb": false
+        },
+        "led_count": 10,
+        "max_brightness": 128,
+        "pin": "B2",
+        "saturation_steps": 16,
+        "sleep": true
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"label": "Mute", "matrix": [0, 0], "x":0, "y":0},
+                {"label": "Q", "matrix": [0, 1], "x":1, "y":0},
+                {"label": "W", "matrix": [0, 2], "x":2, "y":0},
+                {"label": "E", "matrix": [0, 3], "x":3, "y":0},
+                {"label": "R", "matrix": [0, 4], "x":4, "y":0},
+                {"label": "T", "matrix": [0, 5], "x":5, "y":0},
+                {"label": "Y", "matrix": [0, 6], "x":6, "y":0},
+                {"label": "U", "matrix": [0, 7], "x":7, "y":0},
+                {"label": "I", "matrix": [0, 8], "x":8, "y":0},
+                {"label": "O", "matrix": [0, 9], "x":9, "y":0},
+                {"label": "P", "matrix": [0, 10], "x":10, "y":0},
+                {"label": "Backspace", "matrix": [0, 11], "x":11, "y":0},
+
+                {"label": "Esc", "matrix": [1, 0], "x":0, "y":1},
+                {"label": "A", "matrix": [1, 1], "x":1, "y":1},
+                {"label": "S", "matrix": [1, 2], "x":2, "y":1},
+                {"label": "D", "matrix": [1, 3], "x":3, "y":1},
+                {"label": "F", "matrix": [1, 4], "x":4, "y":1},
+                {"label": "G", "matrix": [1, 5], "x":5, "y":1},
+                {"label": "H", "matrix": [1, 6], "x":6, "y":1},
+                {"label": "J", "matrix": [1, 7], "x":7, "y":1},
+                {"label": "K", "matrix": [1, 8], "x":8, "y":1},
+                {"label": "L", "matrix": [1, 9], "x":9, "y":1},
+                {"label": ";:", "matrix": [1, 10], "x":10, "y":1},
+                {"label": "'\"", "matrix": [1, 11], "x":11, "y":1},
+
+                {"label": "Shift", "matrix": [2, 0], "x":0, "y":2},
+                {"label": "Z", "matrix": [2, 1], "x":1, "y":2},
+                {"label": "X", "matrix": [2, 2], "x":2, "y":2},
+                {"label": "C", "matrix": [2, 3], "x":3, "y":2},
+                {"label": "V", "matrix": [2, 4], "x":4, "y":2},
+                {"label": "B", "matrix": [2, 5], "x":5, "y":2},
+                {"label": "N", "matrix": [2, 6], "x":6, "y":2},
+                {"label": "M", "matrix": [2, 7], "x":7, "y":2},
+                {"label": ",<", "matrix": [2, 8], "x":8, "y":2},
+                {"label": ".>", "matrix": [2, 9], "x":9, "y":2},
+                {"label": "/?", "matrix": [2, 10], "x":10, "y":2},
+                {"label": "Enter", "matrix": [2, 11], "x":11, "y":2},
+
+                {"label": "Backspace", "matrix": [3, 0], "x":0, "y":3},
+                {"label": "Ctrl", "matrix": [3, 1], "x":1, "y":3},
+                {"label": "GUI", "matrix": [3, 2], "x":2, "y":3},
+                {"label": "Alt", "matrix": [3, 3], "x":3, "y":3},
+                {"label": "Lower", "matrix": [3, 4], "x":4, "y":3},
+                {"label": "Space", "matrix": [3, 5], "x":5, "y":3},
+                {"label": "Space", "matrix": [3, 6], "x":6, "y":3},
+                {"label": "Raise", "matrix": [3, 7], "x":7, "y":3},
+                {"label": "Left", "matrix": [3, 8], "x":8, "y":3},
+                {"label": "Down", "matrix": [3, 9], "x":9, "y":3},
+                {"label": "Up", "matrix": [3, 10], "x":10, "y":3},
+                {"label": "Right", "matrix": [3, 11], "x":11, "y":3}
+            ]
+        }
     }
 }
diff --git a/keyboards/tau4/keymaps/default/keymap.c b/keyboards/tau4/keymaps/default/keymap.c
index 37fb6b666b..9421a6cce5 100755
--- a/keyboards/tau4/keymaps/default/keymap.c
+++ b/keyboards/tau4/keymaps/default/keymap.c
@@ -85,8 +85,10 @@ void keyboard_post_init_user(void) {
     rgblight_layers = my_rgb_layers;
 
     // Uncomment for debug mode
-    /* debug_enable=true;
-    debug_matrix=true; */
+    //debug_enable=true;
+    //debug_matrix=true;
+    //debug_keyboard=true;
+    //debug_mouse=true;
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
@@ -101,47 +103,12 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     return state;
 }
 
-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;
-}
-
-
-#ifdef OLED_ENABLE
-
-static void render_status(void) {
-    oled_write_P(PSTR("Tau.4 v1.0\n\n"), false);
-    oled_write_P(PSTR("Layer:\n"), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("Default  "), false);
-            break;
-        case _NUMPAD:
-            oled_write_P(PSTR("Numpad   "), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower    "), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise    "), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adjust   "), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined"), false);
-    }
-}
-
-bool oled_task_user(void) {
-    render_status();
-    return false;
-}
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+        [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [_NUMPAD] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_RAISE] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_ADJUST] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    };
 #endif
diff --git a/keyboards/tau4/keymaps/default/rules.mk b/keyboards/tau4/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/tau4/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/tau4/readme.md b/keyboards/tau4/readme.md
index beea3f07a9..6c8b5c7bce 100644
--- a/keyboards/tau4/readme.md
+++ b/keyboards/tau4/readme.md
@@ -6,11 +6,21 @@ A 40% ortholinear keyboard, developed by Oliver Gaskell. More info on [gaskell.t
 
 * Keyboard Maintainer: [Oliver Gaskell](https://github.com/ogaskell)
 * Hardware Supported: Tau4 PCB rev1.0, Tau4 PCB rev1.1
-* Hardware Availability: Group Buy - Opens 05 Feb 2021 [More Details](https://gaskell.tech/tau/four.html)
-
+* Hardware Availability: Group Buy took place between 05 Feb 2021 to 05 Mar 2021. [More Details](https://gaskell.tech/tau/four.html)
 
 Make example for this keyboard (after setting up your build environment):
 
     make tau4:default
 
+Flashing example for this keyboard:
+
+    make tau4:default:flash
+
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. (If you built with an encoder in the top left, the "key" will be that encoder.) This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Keycode in layout**: By default, `QK_BOOT` is assigned to the top right key on the `ADJUST` (fifth) layer.
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
old mode 100755
new mode 100644
index 0ddf255b13..f27ee2a28e
--- a/keyboards/tau4/rules.mk
+++ b/keyboards/tau4/rules.mk
@@ -1,25 +1,7 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Rotary Encoder support
-OLED_ENABLE = yes
+
 OLED_DRIVER = SSD1306    # OLED display support
 # EEPROM_DRIVER ?= i2c        # Driver for external EEPROM chip
 # This is currently not working due to QMK not officially supporting the chip used on the Tau4, I am working on a fix.
-
-LAYOUTS = ortho_4x12
diff --git a/keyboards/tau4/tau4.c b/keyboards/tau4/tau4.c
old mode 100755
new mode 100644
index 3002566cea..aa508aae2c
--- a/keyboards/tau4/tau4.c
+++ b/keyboards/tau4/tau4.c
@@ -15,4 +15,47 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "tau4.h"
+#include "quantum.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return true;
+}
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+        oled_write_P(PSTR("Tau.4 v1.0\n\n"), false);
+        oled_write_P(PSTR("Layer:\n"), false);
+
+        switch (get_highest_layer(layer_state)) {
+            case 0:
+                oled_write_P(PSTR("Default  "), false);
+                break;
+            case 1:
+                oled_write_P(PSTR("Numpad   "), false);
+                break;
+            case 2:
+                oled_write_P(PSTR("Lower    "), false);
+                break;
+            case 3:
+                oled_write_P(PSTR("Raise    "), false);
+                break;
+            case 4:
+                oled_write_P(PSTR("Adjust   "), false);
+                break;
+            default:
+                oled_write_P(PSTR("Undefined"), false);
+        }
+    return true;
+}
+#endif
diff --git a/keyboards/tau4/tau4.h b/keyboards/tau4/tau4.h
deleted file mode 100755
index d9ff502116..0000000000
--- a/keyboards/tau4/tau4.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 Oliver Gaskell <me@gaskell.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/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \
-}

From 26c3e877c7e836d45cb84ec5265fab62e4c90028 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Thu, 29 Sep 2022 19:23:02 -0500
Subject: [PATCH 494/959] [Keyboard] Convert most of sinc to data driven
 info.json (#18481)

---
 keyboards/keebio/sinc/info.json      | 18 ++++++++++
 keyboards/keebio/sinc/rev1/config.h  | 27 ---------------
 keyboards/keebio/sinc/rev1/info.json | 50 ++++++++++++++++++++++++++++
 keyboards/keebio/sinc/rev1/rev1.c    |  4 +--
 keyboards/keebio/sinc/rev1/rules.mk  |  4 +--
 keyboards/keebio/sinc/rev2/config.h  | 27 ---------------
 keyboards/keebio/sinc/rev2/info.json | 50 ++++++++++++++++++++++++++++
 keyboards/keebio/sinc/rev2/rev2.c    |  4 +--
 keyboards/keebio/sinc/rev2/rules.mk  |  4 +--
 keyboards/keebio/sinc/rules.mk       | 21 ------------
 10 files changed, 124 insertions(+), 85 deletions(-)

diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index a8d346ebe5..c01273093e 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -5,6 +5,24 @@
     "usb": {
         "vid": "0xCB10"
     },
+    "processor": "atmega32u4",
+    "protocol": "atmel-dfu",
+    "features": {
+        "audio": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "unicode": false,
+    },
+    "split": {
+        "enabled": true,
+    },
+    "build": {
+        "lto": true,
+    },
     "layouts": {
         "LAYOUT_75": {
             "layout": [
diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
index 0d31d1ad80..ea6c2d36a2 100644
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@@ -18,31 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
-#define DIODE_DIRECTION COL2ROW
 // wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7, B0 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7, B0 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
 #define SPLIT_HAND_PIN F7
-#define ENCODERS_PAD_A { F5 }
-#define ENCODERS_PAD_B { F6 }
-#define ENCODERS_PAD_A_RIGHT { D6 }
-#define ENCODERS_PAD_B_RIGHT { D4 }
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-#define BACKLIGHT_PIN B5
-#define CAPS_LOCK_LED_PIN B6
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -50,10 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 16    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index d7a119807f..3c8a90c206 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -3,5 +3,55 @@
     "usb": {
         "pid": "0x1267",
         "device_version": "1.0.0"
+    },
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "rgblight": true,
+        "backlight": true,
+    },
+    "indicators": {
+        "caps_lock": "B6"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "transport": {
+            "protocol": "serial"
+        },
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D6", "pin_b": "D4" },
+                ],
+            },
+        },
+        "matrix_pins": {
+            "right":{
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"],
+            },
+        },
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"],
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6" },
+        ],
+    },
+    "backlight":{
+        "pin": "B5",
+    },
+    "rgblight": {
+        "pin": "E6",
+        "led_count" : 16,
+        "split_count": [8, 8],
+        "animations": {
+            "all": true,
+        }
     }
 }
diff --git a/keyboards/keebio/sinc/rev1/rev1.c b/keyboards/keebio/sinc/rev1/rev1.c
index 906b9b7d58..ec3eb1c0c9 100644
--- a/keyboards/keebio/sinc/rev1/rev1.c
+++ b/keyboards/keebio/sinc/rev1/rev1.c
@@ -2,14 +2,14 @@
 #include "split_util.h"
 
 void matrix_init_kb(void) {
-    setPinOutput(CAPS_LOCK_LED_PIN);
+    setPinOutput(LED_CAPS_LOCK_PIN);
     matrix_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
     // Only update if left half
     if (isLeftHand && led_update_user(led_state)) {
-        writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
+        writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/keebio/sinc/rev1/rules.mk b/keyboards/keebio/sinc/rev1/rules.mk
index 32e7881599..6e7633bfe0 100644
--- a/keyboards/keebio/sinc/rev1/rules.mk
+++ b/keyboards/keebio/sinc/rev1/rules.mk
@@ -1,3 +1 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
index 800400e905..92d2fda644 100644
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/config.h
@@ -16,31 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
-#define DIODE_DIRECTION COL2ROW
 // wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7, B0 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7, B0 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
 #define SPLIT_HAND_PIN F7
-#define ENCODERS_PAD_A { F5 }
-#define ENCODERS_PAD_B { F6 }
-#define ENCODERS_PAD_A_RIGHT { D6 }
-#define ENCODERS_PAD_B_RIGHT { D4 }
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-#define BACKLIGHT_PIN B5
-#define CAPS_LOCK_LED_PIN B6
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -48,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 16    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 378b02d2e7..c3dd1d80ed 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -3,5 +3,55 @@
     "usb": {
         "pid": "0x2267",
         "device_version": "2.0.0"
+    },
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "rgblight": true,
+        "backlight": true,
+    },
+    "indicators": {
+        "caps_lock": "B6"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "transport": {
+            "protocol": "serial"
+        },
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D6", "pin_b": "D4" },
+                ],
+            },
+        },
+        "matrix_pins": {
+            "right":{
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"],
+            },
+        },
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"],
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6" },
+        ],
+    },
+    "backlight":{
+        "pin": "B5",
+    },
+    "rgblight": {
+        "pin": "E6",
+        "led_count" : 16,
+        "split_count": [8, 8],
+        "animations": {
+            "all": true,
+        }
     }
 }
diff --git a/keyboards/keebio/sinc/rev2/rev2.c b/keyboards/keebio/sinc/rev2/rev2.c
index 47bb1e9e68..a774b76ca0 100644
--- a/keyboards/keebio/sinc/rev2/rev2.c
+++ b/keyboards/keebio/sinc/rev2/rev2.c
@@ -18,14 +18,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "split_util.h"
 
 void matrix_init_kb(void) {
-    setPinOutput(CAPS_LOCK_LED_PIN);
+    setPinOutput(LED_CAPS_LOCK_PIN);
     matrix_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
     // Only update if left half
     if (isLeftHand && led_update_user(led_state)) {
-        writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
+        writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/keebio/sinc/rev2/rules.mk b/keyboards/keebio/sinc/rev2/rules.mk
index 32e7881599..6e7633bfe0 100644
--- a/keyboards/keebio/sinc/rev2/rules.mk
+++ b/keyboards/keebio/sinc/rev2/rules.mk
@@ -1,3 +1 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keebio/sinc/rules.mk b/keyboards/keebio/sinc/rules.mk
index fc8ab56049..1419957479 100644
--- a/keyboards/keebio/sinc/rules.mk
+++ b/keyboards/keebio/sinc/rules.mk
@@ -1,22 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-LTO_ENABLE = yes
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = keebio/sinc/rev1

From 5b2eb4ec85062125ed44c1a790d087a1d604a1ed Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 29 Sep 2022 17:56:34 -0700
Subject: [PATCH 495/959] Plywrks Ahgase Community Layout Support (#18535)

---
 keyboards/plywrks/ahgase/ahgase.h                 |  4 ++--
 keyboards/plywrks/ahgase/info.json                | 12 ++++++++++--
 keyboards/plywrks/ahgase/keymaps/default/keymap.c |  2 +-
 keyboards/plywrks/ahgase/keymaps/iso/keymap.c     |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/keyboards/plywrks/ahgase/ahgase.h b/keyboards/plywrks/ahgase/ahgase.h
index 78e53dd6f2..1b31bad48a 100644
--- a/keyboards/plywrks/ahgase/ahgase.h
+++ b/keyboards/plywrks/ahgase/ahgase.h
@@ -25,7 +25,7 @@
 // Full right shift
 // Full left shift
 // 6.25u bottom row
-#define LAYOUT_ansi( \
+#define LAYOUT_tkl_f13_ansi( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
@@ -46,7 +46,7 @@
 // Full right shift
 // Split left shift
 // 6.25u bottom row
-#define LAYOUT_iso( \
+#define LAYOUT_tkl_f13_iso( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
diff --git a/keyboards/plywrks/ahgase/info.json b/keyboards/plywrks/ahgase/info.json
index 297d0b9834..37204070a3 100644
--- a/keyboards/plywrks/ahgase/info.json
+++ b/keyboards/plywrks/ahgase/info.json
@@ -8,8 +8,16 @@
         "pid": "0x7902",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
+        "LAYOUT_iso": "LAYOUT_tkl_f13_iso"
+    },
+    "community_layouts": [
+        "tkl_f13_ansi",
+        "tkl_f13_iso"
+    ],
     "layouts": {
-        "LAYOUT_ansi": {
+        "LAYOUT_tkl_f13_ansi": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1.25, "y":0},
@@ -106,7 +114,7 @@
                 {"x":17.25, "y":5.25}
             ]
         },
-        "LAYOUT_iso": {
+        "LAYOUT_tkl_f13_iso": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1.25, "y":0},
diff --git a/keyboards/plywrks/ahgase/keymaps/default/keymap.c b/keyboards/plywrks/ahgase/keymaps/default/keymap.c
index e7b5e07262..7cc1e671e7 100644
--- a/keyboards/plywrks/ahgase/keymaps/default/keymap.c
+++ b/keyboards/plywrks/ahgase/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ansi(
+    [0] = LAYOUT_tkl_f13_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/plywrks/ahgase/keymaps/iso/keymap.c b/keyboards/plywrks/ahgase/keymaps/iso/keymap.c
index c10e93a30d..dde342a7e2 100644
--- a/keyboards/plywrks/ahgase/keymaps/iso/keymap.c
+++ b/keyboards/plywrks/ahgase/keymaps/iso/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_iso(
+    [0] = LAYOUT_tkl_f13_iso(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,

From adcdacf93c7d83306e794fad8f6c3c1ba19bd414 Mon Sep 17 00:00:00 2001
From: ZyberSE <reine@tuba.nu>
Date: Fri, 30 Sep 2022 04:01:33 +0200
Subject: [PATCH 496/959] [Keymap] Personal user space code and keymaps by
 ZyBeR (#18512)

Co-authored-by: ZyBeR <n/a>
---
 keyboards/ai03/lunar/keymaps/zyber/keymap.c   |  23 +++
 keyboards/alps64/keymaps/zyber/keymap.c       |  33 +++++
 .../converter/adb_usb/keymaps/zyber/keymap.c  |  15 ++
 .../m0110_usb/keymaps/zyber/keymap.c          |  76 ++++++++++
 .../m0110_usb/keymaps/zyber/rules.mk          |   3 +
 .../borsdorf/keymaps/zyber/keymap.c           |  35 +++++
 keyboards/doro67/multi/keymaps/zyber/keymap.c |  36 +++++
 keyboards/fc660c/keymaps/zyber/keymap.c       |  47 ++++++
 .../knife66/keymaps/zyber/keymap.c            |  40 +++++
 .../playkbtw/ca66/keymaps/zyber/keymap.c      |  21 +++
 .../playkbtw/ca66/keymaps/zyber/rules.mk      |   1 +
 .../prototypist/j01/keymaps/zyber/keymap.c    |  40 +++++
 .../rama_works_m60_a/keymaps/zyber/config.h   |   8 +
 .../rama_works_m60_a/keymaps/zyber/keymap.c   |  42 ++++++
 .../rama_works_m60_a/keymaps/zyber/rules.mk   |   1 +
 .../wilba_tech/zeal65/keymaps/zyber/config.h  |  31 ++++
 .../wilba_tech/zeal65/keymaps/zyber/keymap.c  |  39 +++++
 users/zyber/config.h                          |   9 ++
 users/zyber/rules.mk                          |   8 +
 users/zyber/zyber.c                           | 137 ++++++++++++++++++
 users/zyber/zyber.h                           |  33 +++++
 21 files changed, 678 insertions(+)
 create mode 100644 keyboards/ai03/lunar/keymaps/zyber/keymap.c
 create mode 100644 keyboards/alps64/keymaps/zyber/keymap.c
 create mode 100644 keyboards/converter/adb_usb/keymaps/zyber/keymap.c
 create mode 100644 keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
 create mode 100644 keyboards/converter/m0110_usb/keymaps/zyber/rules.mk
 create mode 100644 keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c
 create mode 100644 keyboards/doro67/multi/keymaps/zyber/keymap.c
 create mode 100644 keyboards/fc660c/keymaps/zyber/keymap.c
 create mode 100644 keyboards/misterknife/knife66/keymaps/zyber/keymap.c
 create mode 100644 keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
 create mode 100644 keyboards/playkbtw/ca66/keymaps/zyber/rules.mk
 create mode 100644 keyboards/prototypist/j01/keymaps/zyber/keymap.c
 create mode 100644 keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h
 create mode 100644 keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
 create mode 100644 keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk
 create mode 100644 keyboards/wilba_tech/zeal65/keymaps/zyber/config.h
 create mode 100644 keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
 create mode 100644 users/zyber/config.h
 create mode 100644 users/zyber/rules.mk
 create mode 100644 users/zyber/zyber.c
 create mode 100644 users/zyber/zyber.h

diff --git a/keyboards/ai03/lunar/keymaps/zyber/keymap.c b/keyboards/ai03/lunar/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..d4d3f9c89d
--- /dev/null
+++ b/keyboards/ai03/lunar/keymaps/zyber/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT( /* Base */
+		KC_ESC,  KC_1,    KC_2,    KC_3,    TD(SSHT), KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC, KC_BSPC, KC_PGUP,
+		KC_TAB,           KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     TD(LBRC), KC_RBRC, KC_BSLS, KC_PGDN,
+		L1_EXPL,          KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(QUOT),          KC_ENT,  KC_DEL,
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_LSFT,           KC_UP,   MO(1),
+		KC_LCTL, ROPT_SRH,KC_LCMD,          _______,           LCMD_T(KC_SPC),           _______,          ROPT_SRH,  KC_GRV,   KC_LEFT, KC_DOWN, KC_RGHT
+	),
+	[1] = LAYOUT( /* FN */
+		RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_DEL,  KC_DEL,  KC_PAUS,
+		C_BLK,            _______, KC_UP,   _______,  _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_MPRV,  KC_MPLY,  KC_MNXT, _______, KC_SLCK,
+		_______,          KC_LEFT, KC_DOWN, KC_RGHT,  _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______,  _______,           _______, _______,
+		_______,          KC_RCTL, KC_RGUI, KC_RALT,  _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______,  _______,           KC_PGUP, _______,
+		_______, _______, _______,          _______,           _______,          _______,                   _______,  _______,  KC_HOME, KC_PGDN, KC_END
+	)
+};
+
diff --git a/keyboards/alps64/keymaps/zyber/keymap.c b/keyboards/alps64/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..0cc0cc8cf5
--- /dev/null
+++ b/keyboards/alps64/keymaps/zyber/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+enum keyboard_layers {
+  _BL = 0,
+  _FL
+};
+
+// Custom #defined keycodes (shorter macros for readability)
+#define KC_CTES CTL_T(KC_ESC)
+#define KC_RSUP RSFT_T(KC_UP)
+#define KC_FNDN LT(_FL, KC_DOWN)
+#define KC_RGLT RCMD_T(KC_LEFT)
+#define KC_RCRT RCTL_T(KC_RIGHT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BL] = LAYOUT_aek_103(
+    KC_GRV,    KC_1,    KC_2,    KC_3,   KC_4,     KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_TAB,    KC_Q,    KC_W,    KC_E,   KC_R,     KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,     TD(LBRC), KC_RBRC, KC_BSLS,
+    CTRL_C_UP, KC_A,    KC_S,    KC_D,   KC_F,     KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     TD(SCLN), TD(QUOT), KC_ENT,
+    KC_LSFT,   KC_Z,    KC_X,    KC_C,   KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSUP,
+    MO(_FL),   KC_LALT, KC_LGUI,                            KC_SPC,                              KC_RGLT,  KC_FNDN,  KC_RCRT
+  ),
+  [_FL] = LAYOUT_aek_103(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            RESET,                              _______, _______, _______
+  )
+};
diff --git a/keyboards/converter/adb_usb/keymaps/zyber/keymap.c b/keyboards/converter/adb_usb/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..c725a4853b
--- /dev/null
+++ b/keyboards/converter/adb_usb/keymaps/zyber/keymap.c
@@ -0,0 +1,15 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ext_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_SLCK,KC_PAUS,                                KC_EJCT,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   TD(SSHT), 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_NLCK, KC_EQL, KC_PSLS, KC_PAST,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,     KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,     TD(LBRC), KC_RBRC, KC_BSLS,       KC_DEL, KC_END,  KC_PGDN,     KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
+    KC_LCAP, KC_A,    KC_S,   KC_D,   KC_F,     KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   TD(SCLN), TD(QUOT),          KC_ENT,                                      KC_P4,   KC_P5,  KC_P6,   KC_PPLS,
+    KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,     KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,                     KC_RSFT,                KC_UP,               KC_P1,   KC_P2,  KC_P3,
+    KC_LCTL, KC_LALT, KC_LGUI,                  KC_SPC,                                  KC_RALT,  KC_RCTL,                          KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,           KC_PDOT, KC_PENT
+    ),
+};
diff --git a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..f8f69a69a5
--- /dev/null
+++ b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
@@ -0,0 +1,76 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	/* Default:
+	 * M0110                                                       M0120
+	 * ,---------------------------------------------------------. ,---------------.
+	 * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backs| |Nlk|  =|  /|  *|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  Å|  ¨|Ent| |  7|  8|  9|  -|
+	 * |------------------------------------------------------| e| |---------------|
+	 * |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  Ö|  Ä|  '| r| |  4|  5|  6|  +|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Shft|  §|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  -|Shft| |  1|  2|  3|   |
+	 * `---------------------------------------------------------' |-----------|Ent|
+	 *      |Opt|Mac |            Space            |Fn  |Opt|      |      0|  .|   |
+	 *      `-----------------------------------------------'      `---------------'
+	 * M0110A
+	 * ,---------------------------------------------------------. ,---------------.
+	 * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backs| |Nlk|  =|  /|  *|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|   | |  7|  8|  9|  -|
+	 * |-----------------------------------------------------'   | |---------------|
+	 * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return| |  4|  5|  6|  +|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shft|Up | |  1|  2|  3|   |
+	 * |---------------------------------------------------------| |-----------|Ent|
+	 * |Opt  |Mac    |         Space             |  \|Lft|Rgt|Dn | |      0|  .|   |
+	 * `---------------------------------------------------------' `---------------'
+	 */
+
+	[0] = LAYOUT_iso(
+	       KC_GESC,   KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,             KC_MINS, KC_EQL,  KC_BSPC,     KC_NLCK, KC_EQL, KC_PSLS, KC_PAST, \
+	       KC_TAB,    KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,             KC_LBRC, KC_RBRC, KC_ENT,      KC_P7,   KC_P8,  KC_P9,   KC_PMNS, \
+	       CTRL_C_UP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN,          KC_QUOT, KC_NUHS,              KC_P4,   KC_P5,  KC_P6,   KC_PPLS, \
+	       KC_LSFT,   KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,                                KC_P1,   KC_P2,  KC_P3,   KC_PENT, \
+	               KC_LALT,   KC_LGUI,                        KC_SPC,                        MO(1),                                LT(1, KC_BSLASH), KC_DOWN),
+
+
+	/* Cursor Layer:
+	 * M0110                                                       M0120
+	 * ,---------------------------------------------------------. ,---------------.
+	 * |RES| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk|  =|  /|  *|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Tab  |Hom| Up|PgU|Rst|   |   |   |Psc|Slk|Pau|Up |INS|   | |  7|  8|  9|  -|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Ctrl  |Lef|Dow|Rig|   |   |   |   |Hom|PgU|Lef|Rig|Return| |  4|  5|  6|  +|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Shift   |End|   |PgD|   |   |   |   |End|PgD|Dow|Shift   | |  1|  2|  3|   |
+	 * `---------------------------------------------------------' |-----------|Ent|
+	 *      |Opt|Mac |         Space               |Fn  |Opt|      |      0|  .|   |
+	 *      `-----------------------------------------------'      `---------------'
+	 * M0110A
+	 * ,---------------------------------------------------------. ,---------------.
+	 * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk|  =|  /|  *|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Tab  |Hom| Up|PgU|   |   |   |   |Psc|Slk|Pau|Up |INS|   | |  7|  8|  9|  -|
+	 * |-----------------------------------------------------'   | |---------------|
+	 * |Caps  |Lef|Dow|Rig|   |   |   |   |Hom|PgU|Lef|Rig|Return| |  4|  5|  6|  +|
+	 * |---------------------------------------------------------| |---------------|
+	 * |Ctrl    |End|   |PgD|   |   |   |   |End|PgD|Dow|Shft|PgU| |  1|  2|  3|   |
+	 * |---------------------------------------------------------| |-----------|Ent|
+	 * |Opt  |Mac    |         Space             |  \|Hom|End|PgD| |      0|  .|   |
+	 * `---------------------------------------------------------' `---------------'
+	 */
+
+	[1] = LAYOUT_iso(
+		RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,      _______, _______, _______, _______, \
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, \
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,              _______, _______, _______, _______, \
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,                       _______, _______, _______, _______, \
+		_______, _______,                   _______,                      _______,                                                        _______, _______),
+};
diff --git a/keyboards/converter/m0110_usb/keymaps/zyber/rules.mk b/keyboards/converter/m0110_usb/keymaps/zyber/rules.mk
new file mode 100644
index 0000000000..adaa1b5696
--- /dev/null
+++ b/keyboards/converter/m0110_usb/keymaps/zyber/rules.mk
@@ -0,0 +1,3 @@
+F_CPU = 16000000
+BOOTLOADER = atmel-dfu
+CONSOLE_ENABLE = no
diff --git a/keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c b/keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..4bf316c578
--- /dev/null
+++ b/keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 Cutie Club
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 "zyber.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_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,                LGUI(KC_LEFT),
+        KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,                            LGUI(KC_RIGHT),
+        L1_EXPL,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,      KC_NUHS,    KC_ENT,
+        KC_LSFT,    KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,           KC_RSFT,           KC_UP,
+        KC_LCTL,    KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RALT,  MO(1),                  KC_LEFT,    KC_DOWN,    KC_RIGHT
+    ),
+    [1] = LAYOUT_rshift(
+        RESET,      KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,       KC_F12,     KC_DEL,                 KC_VOLU,
+        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_VOLD,
+        KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,
+        KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,           KC_TRNS,
+        KC_TRNS,    KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,                  KC_TRNS,    KC_TRNS,    KC_TRNS
+    )
+};
diff --git a/keyboards/doro67/multi/keymaps/zyber/keymap.c b/keyboards/doro67/multi/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..c0edcc3c8b
--- /dev/null
+++ b/keyboards/doro67/multi/keymaps/zyber/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2019 ShadeDream
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 "zyber.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_multi(
+    KC_ESC,      KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_F2, KC_DEL,
+    KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     TD(LBRC), KC_RBRC, KC_BSLS,        KC_PGUP,
+    LCTL(KC_UP), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(QUOT), 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_HOME,
+    KC_LCTL, KC_LALT, KC_LGUI,                      KC_SPC,  KC_SPC,  KC_SPC,                      KC_RALT, MO(1),    KC_NO, KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_multi(
+    RESET,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, ,
+    BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+};
\ No newline at end of file
diff --git a/keyboards/fc660c/keymaps/zyber/keymap.c b/keyboards/fc660c/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..3e5cffe01c
--- /dev/null
+++ b/keyboards/fc660c/keymaps/zyber/keymap.c
@@ -0,0 +1,47 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* BASE layer: Default Layer
+   * ,--------------------------------------------------------------------------------------------------.
+   * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |  | `   |
+   * |-----------------------------------------------------------------------------------------+  +-----+
+   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |  | Del |
+   * |-----------------------------------------------------------------------------------------+  +-----+
+   * | Explode |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
+   * |--------------------------------------------------------------------------------------------+
+   * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Shift       | Up  |
+   * +--------------------------------------------------------------------------------------------+-----+
+   * | Ctrl  | Alt   | Cmd  |               Space                | Alt  | Ctrl  | Fn   | Left| Down|Right|
+   * `--------------------------------------------------------------------------------------------------´
+   */
+  [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,   TD(SSHT), 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,     TD(LBRC), KC_RBRC, KC_BSLS,     KC_DEL,
+        L1_EXPL, KC_A,    KC_S,    KC_D,   KC_F,     KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   TD(SCLN), TD(QUOT),   KC_ENT,
+        KC_LSFT, KC_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, ROPT_SRH, KC_LGUI,                 KC_SPC,                  KC_RALT, KC_RCTL, MO(1),         KC_LEFT,KC_DOWN,KC_RGHT
+    ),
+  /* FN layer
+   * ,--------------------------------------------------------------------------------------------------.
+   * | Esc| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |            |  |C_BLK|
+   * |-----------------------------------------------------------------------------------------+  +-----+
+   * |        |     |     |     |     |     |     |     |PrtSc| Slck| Paus|     |     |        |  |     |
+   * |-----------------------------------------------------------------------------------------+  +-----+
+   * |         | Vol-| Vol+| Mute|Eject|     |     |     | Home| PgUp|     |     |             |
+   * |--------------------------------------------------------------------------------------------+
+   * |            | Prev| Play| Next|     |     |     |     | End | PgDn|     |             |     |
+   * +--------------------------------------------------------------------------------------------+-----+
+   * |       |       |      |                                    |      |      |      |     |     |     |
+   * `--------------------------------------------------------------------------------------------------´
+   */
+  [1] = LAYOUT(
+        RESET, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     C_BLK,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
+        _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     _______,
+        _______,_______,_______,                _______,                _______,_______,MO(1),       _______,_______,_______
+    )
+};
diff --git a/keyboards/misterknife/knife66/keymaps/zyber/keymap.c b/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..ae5e4f7455
--- /dev/null
+++ b/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+#include "zyber.h"
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    KC_GESC,   KC_1,    KC_2,    KC_3,    TD(SSHT), KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_NO,  TD(END_HOME),
+    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     TD(LBRC), KC_RBRC,  KC_BSLS,         KC_DEL,
+    CTRL_C_UP, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(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_NO,     KC_LALT, KC_LGUI, KC_LGUI, LT(1, KC_SPC),             KC_LGUI,          KC_LALT,   MO(1),           KC_LEFT,  KC_DOWN, KC_RGHT ),
+
+  [_FN] = LAYOUT_all(
+    RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_DEL, RGB_TOG,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,  KC_MPRV,  KC_MNXT,  KC_TRNS,         RGB_MOD,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_TRNS,  KC_TRNS,            KC_INS,          RGB_SPI,
+    KC_CAPS,   KC_TRNS, KC_TRNS, C(KC_C), KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,            C(KC_UP),        RGB_SPD,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,       C(KC_LEFT),   C(KC_DOWN), C(KC_RGHT) ),
+};
\ No newline at end of file
diff --git a/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..ccf248e203
--- /dev/null
+++ b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  LAYOUT(
+    KC_GESC,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+    KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     TD(LBRC), KC_RBRC, KC_BSLS,          KC_PGUP,
+    CTRL_C_UP,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(QUOT),          KC_ENT,           KC_PGDN,
+    KC_LSFT,   KC_NO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,                     KC_HOME,
+    KC_NO,            KC_LALT, KC_LGUI,          KC_NO,            KC_SPC,           KC_NO,   KC_RALT, MO(1),    KC_LEFT,  KC_DOWN, KC_RGHT),
+
+  LAYOUT(
+    KC_GRV,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_DEL,  KC_DEL, RGB_TOG,
+    KC_CAPS,          KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_PSCR,  KC_SLCK,  KC_PAUS, KC_TRNS,         RGB_MOD,
+    KC_TRNS,          KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD,  RGB_VAI,           KC_INS,          KC_HOME,
+    KC_LSFT, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,  KC_TRNS,  RGB_HUI,                  KC_END,
+    KC_NO,            KC_TRNS, KC_TRNS,          KC_NO,            KC_TRNS,          KC_NO,   KC_TRNS, KC_TRNS,  RGB_SAD,  RGB_HUD, RGB_SAI),
+};
diff --git a/keyboards/playkbtw/ca66/keymaps/zyber/rules.mk b/keyboards/playkbtw/ca66/keymaps/zyber/rules.mk
new file mode 100644
index 0000000000..0a5b666e85
--- /dev/null
+++ b/keyboards/playkbtw/ca66/keymaps/zyber/rules.mk
@@ -0,0 +1 @@
+MOUSEKEY_ENABLE = no
diff --git a/keyboards/prototypist/j01/keymaps/zyber/keymap.c b/keyboards/prototypist/j01/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..53a090b262
--- /dev/null
+++ b/keyboards/prototypist/j01/keymaps/zyber/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2020 Shaun Mitchell (Flexerm)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 "zyber.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // Default layer
+    [0] = LAYOUT_all(
+        C_BLK,   KC_F2,       KC_ESC,  KC_1,    KC_2,    KC_3,    TD(SSHT),KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_DEL,
+        KC_F3,   KC_F4,       KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    TD(LBRC),KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_F5,   KC_F6,       L1_EXPL,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,   TD(SCLN), TD(QUOT),KC_NUHS, KC_ENT,         KC_PGDN,
+        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,          KC_UP,      KC_END,
+        KC_F9,   KC_F10,      KC_LCTL,      KC_LALT, KC_LGUI,     KC_SPC,             KC_SPC,                  KC_RALT,      KC_RGUI, MO(1),         KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+
+    // Fn1 layer
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS,     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,      RESET,
+        KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,
+        KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_HOME,
+        KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS,     KC_TRNS,            KC_TRNS,                 KC_TRNS,      KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+
+};
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h
new file mode 100644
index 0000000000..9ad052aab4
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h
@@ -0,0 +1,8 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#pragma once
+#undef PRODUCT
+#define PRODUCT         RAMA WORKS M60-A Seq2
+#undef  DESCRIPTION
+#define DESCRIPTION     RAMA WORKS M60-A Seq2
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..ea1f771b2c
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// Default layer
+[0] = LAYOUT_60_hhkb(
+	KC_ESC,    KC_1,    KC_2,    KC_3,TD(SSHT),    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSLS, KC_DEL,
+	KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     TD(LBRC), KC_RBRC, KC_BSPC,
+	CTRL_C_UP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(QUOT), KC_ENT,
+	KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  FN_MO13,
+	           KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RALT,  FN_MO23),
+
+// Fn1 Layer
+[1] = LAYOUT_60_hhkb(
+	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
+	         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
+
+// Fn2 Layer
+[2] = LAYOUT_60_hhkb(
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 Layer (zeal60 Configuration)
+[3] = LAYOUT_60_hhkb(
+	RESET,   EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  KC_TRNS, EEP_RST,
+	KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ES_DEC,  ES_INC,  KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
+
+};
+
+
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk
new file mode 100644
index 0000000000..961bb9bab8
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk
@@ -0,0 +1 @@
+DYNAMIC_KEYMAP_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/config.h b/keyboards/wilba_tech/zeal65/keymaps/zyber/config.h
new file mode 100644
index 0000000000..2d35bacc56
--- /dev/null
+++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/config.h
@@ -0,0 +1,31 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#pragma once
+
+/**
+ * Enable/disable LEDs based on layout
+ */
+#undef RGB_BACKLIGHT_USE_SPLIT_BACKSPACE
+#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
+
+
+/**
+ * Switch off Backlight when computer is suspended
+ */
+#undef RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 1
+
+
+/**
+ * Use http://colorizer.org/ to get a 0-360 hue value
+ * then convert it into a 0-255 value with n = (hue / 360 * 255).
+ */
+#undef RGB_BACKLIGHT_CAPS_LOCK_INDICATOR
+#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 255, .s = 255 }, .index = 254 }
+#undef RGB_BACKLIGHT_LAYER_1_INDICATOR
+#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 87, .s = 255 }, .index = 254 }
+#undef RGB_BACKLIGHT_LAYER_2_INDICATOR
+#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 167, .s = 255 }, .index = 254 }
+#undef RGB_BACKLIGHT_LAYER_3_INDICATOR
+#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
new file mode 100644
index 0000000000..747f2dd00c
--- /dev/null
+++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	// Default layer
+	[0] = LAYOUT_65_normie(
+		QK_GESC,     KC_1,    KC_2,    KC_3,    TD(SSHT),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,     TD(LBRC),  KC_RBRC, KC_BSLS, TD(END_HOME),
+		CTRL_C_UP,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(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_LALT, KC_LCMD,                                   KC_SPC,                                   FN_MO23,  FN_MO13,   KC_LEFT, KC_DOWN, KC_RGHT),
+
+	// Fn1 Layer
+	[1] = LAYOUT_65_normie(
+		KC_GRV,  KC_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_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_LALT,                                              KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn2 Layer
+	[2] = LAYOUT_65_normie(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 Layer (zeal60 Configuration)
+	[3] = LAYOUT_65_normie(
+		RESET,   EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  EEP_RST, KC_TRNS,
+		C_BLK,   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, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/users/zyber/config.h b/users/zyber/config.h
new file mode 100644
index 0000000000..be005d8008
--- /dev/null
+++ b/users/zyber/config.h
@@ -0,0 +1,9 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#pragma once
+
+#undef TAPPING_TERM
+#define TAPPING_TERM 152
+#define GRAVE_ESC_GUI_OVERRIDE
+#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
diff --git a/users/zyber/rules.mk b/users/zyber/rules.mk
new file mode 100644
index 0000000000..83559df609
--- /dev/null
+++ b/users/zyber/rules.mk
@@ -0,0 +1,8 @@
+SRC += zyber.c
+
+CAPS_WORD_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+COMMAND_ENABLE = no
+
+# DISABLE VIA CONFIGURATOR (otherwise QMK won't work properly)
+DYNAMIC_KEYMAP_ENABLE = no
diff --git a/users/zyber/zyber.c b/users/zyber/zyber.c
new file mode 100644
index 0000000000..63915ddbd4
--- /dev/null
+++ b/users/zyber/zyber.c
@@ -0,0 +1,137 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#include "zyber.h"
+
+
+__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
+
+uint16_t key_timer;
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	if (record->event.pressed) {
+		key_timer = timer_read();
+	}
+
+	if (!process_caps_word(keycode, record)) {
+		return false;
+	}
+
+	switch(keycode) {
+		case C_BLK:
+			if (record->event.pressed) {
+				send_string("```" SS_DELAY(80) SS_LCMD("v") SS_DELAY(80) "```");
+			}
+			break;
+
+		case CTRL_C_UP:
+			if (record->event.pressed) {
+				register_mods(MOD_BIT(KC_LEFT_CTRL));
+			} else {
+				unregister_mods(MOD_BIT(KC_LEFT_CTRL));
+				if (timer_elapsed(key_timer) < TAPPING_TERM) {
+					tap_code16(C(KC_UP));
+				}
+			}
+			return false;
+			break;
+
+		case L1_EXPL:
+			if (record->event.pressed) {
+				layer_on(1);
+			} else {
+				layer_off(1);
+				if (timer_elapsed(key_timer) < TAPPING_TERM) {
+					tap_code16(C(KC_UP));
+				}
+			}
+			return false;
+			break;
+
+		case ROPT_SRH:
+			if (record->event.pressed) {
+				register_mods(MOD_BIT(KC_ROPT));
+			} else {
+				unregister_mods(MOD_BIT(KC_ROPT));
+				if (timer_elapsed(key_timer) < TAPPING_TERM) {
+					tap_code16(G(KC_SPC));
+				}
+			}
+			return false;
+			break;
+	}
+
+	return process_record_keymap(keycode, record);
+}
+
+/* Screenshoot */
+void dance_SSHT_finished(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		tap_code16(C(S(G(KC_4))));
+	} else {
+		tap_code(KC_4);
+	}
+}
+void dance_SSHT_reset(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		unregister_code16(C(S(G(KC_4))));
+	} else {
+		unregister_code(KC_4);
+	}
+}
+
+/* Å */
+void dance_LBRC_finished(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		tap_code16(A(KC_LBRC));
+	} else {
+		tap_code(KC_LBRC);
+	}
+}
+void dance_LBRC_reset(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		unregister_code16(A(KC_LBRC));
+	} else {
+		unregister_code(KC_LBRC);
+	}
+}
+
+/* Ö */
+void dance_SCLN_finished(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		tap_code16(A(KC_SCLN));
+	} else {
+		tap_code(KC_SCLN);
+	}
+}
+void dance_SCLN_reset(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		unregister_code16(A(KC_SCLN));
+	} else {
+		unregister_code(KC_SCLN);
+	}
+}
+
+/* Ä */
+void dance_QUOT_finished(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		tap_code16(A(KC_QUOT));
+	} else {
+		tap_code(KC_QUOT);
+	}
+}
+void dance_QUOT_reset(qk_tap_dance_state_t *state, void *user_data) {
+	if (state->count == 2) {
+		unregister_code16(A(KC_QUOT));
+	} else {
+		unregister_code(KC_QUOT);
+	}
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+	[SSHT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_SSHT_finished, dance_SSHT_reset),
+	[LBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LBRC_finished, dance_LBRC_reset),
+	[SCLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_SCLN_finished, dance_SCLN_reset),
+	[QUOT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_QUOT_finished, dance_QUOT_reset),
+	[END_HOME] = ACTION_TAP_DANCE_DOUBLE(LGUI(KC_LEFT), LGUI(KC_RIGHT))
+};
diff --git a/users/zyber/zyber.h b/users/zyber/zyber.h
new file mode 100644
index 0000000000..d5f114e852
--- /dev/null
+++ b/users/zyber/zyber.h
@@ -0,0 +1,33 @@
+// Copyright 2022 ZyBeR (@ZyberSE)
+// SPDX-License-Identifier: GPL-2.0
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+#include "quantum.h"
+
+enum custom_keycodes {
+	CTRL_C_UP = SAFE_RANGE,
+	L1_EXPL,
+	ROPT_SRH,
+	C_BLK
+};
+
+enum tap_dances {
+	SSHT = 0,
+	LBRC,
+	SCLN,
+	QUOT,
+	END_HOME
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record);
+
+void dance_SSHT_finished(qk_tap_dance_state_t *state, void *user_data);
+void dance_SSHT_reset(qk_tap_dance_state_t *state, void *user_data);
+void dance_LBRC_finished(qk_tap_dance_state_t *state, void *user_data);
+void dance_LBRC_reset(qk_tap_dance_state_t *state, void *user_data);
+void dance_SCLN_finished(qk_tap_dance_state_t *state, void *user_data);
+void dance_SCLN_reset(qk_tap_dance_state_t *state, void *user_data);
+void dance_QUOT_finished(qk_tap_dance_state_t *state, void *user_data);
+void dance_QUOT_reset(qk_tap_dance_state_t *state, void *user_data);

From 8f7b382902c46b8335d4138bcd949e82fa14406d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 29 Sep 2022 19:49:05 -0700
Subject: [PATCH 497/959] P3D Glitch Configurator Fix and Keymap Touch-Up
 (#18534)

---
 keyboards/p3d/glitch/info.json                | 368 ++++--------------
 keyboards/p3d/glitch/keymaps/default/keymap.c |  10 +-
 2 files changed, 82 insertions(+), 296 deletions(-)

diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json
index 5015a2e28f..63d5cfc0ca 100644
--- a/keyboards/p3d/glitch/info.json
+++ b/keyboards/p3d/glitch/info.json
@@ -10,297 +10,83 @@
     },
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{
-                "x": 19.1,
-                "y": 0.1
-            }, {
-                "label": "ESC",
-                "x": 0.5,
-                "y": 0.5
-            }, {
-                "label": "1",
-                "x": 1.5,
-                "y": 0.5
-            }, {
-                "label": "_",
-                "x": 14.5,
-                "y": 0.6
-            }, {
-                "label": "+",
-                "x": 15.5,
-                "y": 0.6
-            }, {
-                "label": "Back",
-                "x": 16.5,
-                "y": 0.6
-            }, {
-                "label": "Del",
-                "x": 17.5,
-                "y": 0.6
-            }, {
-                "label": "2",
-                "x": 3.25,
-                "y": 1.0
-            }, {
-                "label": "3",
-                "x": 4.25,
-                "y": 1.0
-            }, {
-                "label": "4",
-                "x": 5.25,
-                "y": 1.0
-            }, {
-                "label": "5",
-                "x": 6.25,
-                "y": 1.0
-            }, {
-                "label": "6",
-                "x": 7.25,
-                "y": 1.0
-            }, {
-                "label": "7",
-                "x": 10,
-                "y": 1.0
-            }, {
-                "label": "8",
-                "x": 11,
-                "y": 1.0
-            }, {
-                "label": "9",
-                "x": 12,
-                "y": 1.0
-            }, {
-                "label": "0",
-                "x": 13,
-                "y": 1.0
-            }, {
-                "label": "TAB",
-                "x": 0.15,
-                "y": 1.5,
-                "w": 1.5
-            }, {
-                "label": "Q",
-                "x": 1.65,
-                "y": 1.5
-            }, {
-                "label": "P",
-                "x": 14.35,
-                "y": 1.6
-            }, {
-                "label": "[",
-                "x": 15.35,
-                "y": 1.6
-            }, {
-                "label": "]",
-                "x": 16.35,
-                "y": 1.6
-            }, {
-                "label": "\\",
-                "x": 17.35,
-                "y": 1.6,
-                "w": 1.5
-            }, {
-                "x": 19.1,
-                "y": 1.6
-            }, {
-                "label": "W",
-                "x": 3.75,
-                "y": 2.0
-            }, {
-                "label": "E",
-                "x": 4.75,
-                "y": 2.0
-            }, {
-                "label": "R",
-                "x": 5.75,
-                "y": 2.0
-            }, {
-                "label": "T",
-                "x": 6.75,
-                "y": 2.0
-            }, {
-                "label": "Y",
-                "x": 9.5,
-                "y": 2.0
-            }, {
-                "label": "U",
-                "x": 10.5,
-                "y": 2.0
-            }, {
-                "label": "I",
-                "x": 11.5,
-                "y": 2.0
-            }, {
-                "label": "O",
-                "x": 12.5,
-                "y": 2.0
-            }, {
-                "label": "CAPS",
-                "x": 0.15,
-                "y": 2.5,
-                "w": 1.75
-            }, {
-                "label": "A",
-                "x": 1.9,
-                "y": 2.5
-            }, {
-                "label": ";",
-                "x": 14.6,
-                "y": 2.6
-            }, {
-                "label": "'",
-                "x": 15.6,
-                "y": 2.6
-            }, {
-                "label": "ENTER",
-                "x": 16.6,
-                "y": 2.6,
-                "w": 2.25
-            }, {
-                "x": 19.1,
-                "y": 2.6
-            }, {
-                "label": "S",
-                "x": 4,
-                "y": 3.0
-            }, {
-                "label": "D",
-                "x": 5,
-                "y": 3.0
-            }, {
-                "label": "F",
-                "x": 6,
-                "y": 3.0
-            }, {
-                "label": "G",
-                "x": 7,
-                "y": 3.0
-            }, {
-                "label": "H",
-                "x": 9.75,
-                "y": 3.0
-            }, {
-                "label": "J",
-                "x": 10.75,
-                "y": 3.0
-            }, {
-                "label": "K",
-                "x": 11.75,
-                "y": 3.0
-            }, {
-                "label": "L",
-                "x": 12.75,
-                "y": 3.0
-            }, {
-                "label": "SHIFT",
-                "x": 0,
-                "y": 3.5,
-                "w": 2.25
-            }, {
-                "label": "Z",
-                "x": 2.25,
-                "y": 3.5
-            }, {
-                "label": ".",
-                "x": 14.25,
-                "y": 3.6
-            }, {
-                "label": "?",
-                "x": 15.25,
-                "y": 3.6
-            }, {
-                "label": "SHIFT",
-                "x": 16.25,
-                "y": 3.6,
-                "w": 1.75
-            }, {
-                "x": 19.5,
-                "y": 3.6
-            }, {
-                "label": "UP",
-                "x": 18.25,
-                "y": 3.85
-            }, {
-                "label": "X",
-                "x": 4.5,
-                "y": 4.0
-            }, {
-                "label": "C",
-                "x": 5.5,
-                "y": 4.0
-            }, {
-                "label": "V",
-                "x": 6.5,
-                "y": 4.0
-            }, {
-                "label": "B",
-                "x": 7.5,
-                "y": 4.0
-            }, {
-                "label": "BEE",
-                "x": 9.25,
-                "y": 4.0
-            }, {
-                "label": "N",
-                "x": 10.25,
-                "y": 4.0
-            }, {
-                "label": "M",
-                "x": 11.25,
-                "y": 4.0
-            }, {
-                "label": ",",
-                "x": 12.25,
-                "y": 4.0
-            }, {
-                "label": "CTRL",
-                "x": 0,
-                "y": 4.5,
-                "w": 1.25
-            }, {
-                "label": "WIN",
-                "x": 1.25,
-                "y": 4.5,
-                "w": 1.25
-            }, {
-                "label": "WIN",
-                "x": 15,
-                "y": 4.6
-            }, {
-                "label": "CTRL",
-                "x": 16,
-                "y": 4.6
-            }, {
-                "label": "LEFT",
-                "x": 17.25,
-                "y": 4.85
-            }, {
-                "label": "DOWN",
-                "x": 18.25,
-                "y": 4.85
-            }, {
-                "label": "RIGHT",
-                "x": 19.25,
-                "y": 4.85
-            }, {
-                "x": 4.75,
-                "y": 5.0,
-                "w": 2.75
-            }, {
-                "label": "ALT",
-                "x": 7.5,
-                "y": 5.0,
-                "w": 1.25
-            }, {
-                "label": "ALT",
-                "x": 9.5,
-                "y": 5.0,
-                "w": 1.25
-            }, {
-                "x": 10.75,
-                "y": 5.0,
-                "w": 2.25
-            }]
+            "layout": [
+                { "label": "ESC", "x": 0.5, "y": 0.5 },
+                { "label": "1", "x": 1.5, "y": 0.5 },
+                { "label": "2", "x": 3.25, "y": 1.0 },
+                { "label": "3", "x": 4.25, "y": 1.0 },
+                { "label": "4", "x": 5.25, "y": 1.0 },
+                { "label": "5", "x": 6.25, "y": 1.0 },
+                { "label": "6", "x": 7.25, "y": 1.0 },
+                { "label": "7", "x": 10, "y": 1.0 },
+                { "label": "8", "x": 11, "y": 1.0 },
+                { "label": "9", "x": 12, "y": 1.0 },
+                { "label": "0", "x": 13, "y": 1.0 },
+                { "label": "_", "x": 14.5, "y": 0.6 },
+                { "label": "+", "x": 15.5, "y": 0.6 },
+                { "label": "Back", "x": 16.5, "y": 0.6 },
+                { "label": "Del", "x": 17.5, "y": 0.6 },
+                { "x": 19.1, "y": 0.1 },
+
+                { "label": "TAB", "x": 0.15, "y": 1.5, "w": 1.5 },
+                { "label": "Q", "x": 1.65, "y": 1.5 },
+                { "label": "W", "x": 3.75, "y": 2.0 },
+                { "label": "E", "x": 4.75, "y": 2.0 },
+                { "label": "R", "x": 5.75, "y": 2.0 },
+                { "label": "T", "x": 6.75, "y": 2.0 },
+                { "label": "Y", "x": 9.5, "y": 2.0 },
+                { "label": "U", "x": 10.5, "y": 2.0 },
+                { "label": "I", "x": 11.5, "y": 2.0 },
+                { "label": "O", "x": 12.5, "y": 2.0 },
+                { "label": "P", "x": 14.35, "y": 1.6 },
+                { "label": "[", "x": 15.35, "y": 1.6 },
+                { "label": "]", "x": 16.35, "y": 1.6 },
+                { "label": "\\", "x": 17.35, "y": 1.6, "w": 1.5 },
+                { "x": 19.1, "y": 1.6 },
+
+                { "label": "CAPS", "x": 0.15, "y": 2.5, "w": 1.75 },
+                { "label": "A", "x": 1.9, "y": 2.5 },
+                { "label": "S", "x": 4, "y": 3.0 },
+                { "label": "D", "x": 5, "y": 3.0 },
+                { "label": "F", "x": 6, "y": 3.0 },
+                { "label": "G", "x": 7, "y": 3.0 },
+                { "label": "H", "x": 9.75, "y": 3.0 },
+                { "label": "J", "x": 10.75, "y": 3.0 },
+                { "label": "K", "x": 11.75, "y": 3.0 },
+                { "label": "L", "x": 12.75, "y": 3.0 },
+                { "label": ";", "x": 14.6, "y": 2.6 },
+                { "label": "'", "x": 15.6, "y": 2.6 },
+                { "label": "ENTER", "x": 16.6, "y": 2.6, "w": 2.25 },
+                { "x": 19.1, "y": 2.6 },
+
+                { "label": "SHIFT", "x": 0, "y": 3.5, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 3.5 },
+                { "label": "X", "x": 4.5, "y": 4.0 },
+                { "label": "C", "x": 5.5, "y": 4.0 },
+                { "label": "V", "x": 6.5, "y": 4.0 },
+                { "label": "B", "x": 7.5, "y": 4.0 },
+                { "label": "BEE", "x": 9.25, "y": 4.0 },
+                { "label": "N", "x": 10.25, "y": 4.0 },
+                { "label": "M", "x": 11.25, "y": 4.0 },
+                { "label": ",", "x": 12.25, "y": 4.0 },
+                { "label": ".", "x": 14.25, "y": 3.6 },
+                { "label": "?", "x": 15.25, "y": 3.6 },
+                { "label": "SHIFT", "x": 16.25, "y": 3.6, "w": 1.75 },
+                { "label": "UP", "x": 18.25, "y": 3.85 },
+                { "x": 19.5, "y": 3.6 },
+
+                { "label": "CTRL", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "WIN", "x": 1.25, "y": 4.5, "w": 1.25 },
+                { "x": 4.75, "y": 5.0, "w": 2.75 },
+                { "label": "ALT", "x": 7.5, "y": 5.0, "w": 1.25 },
+                { "label": "ALT", "x": 9.5, "y": 5.0, "w": 1.25 },
+                { "x": 10.75, "y": 5.0, "w": 2.25 },
+                { "label": "WIN", "x": 15, "y": 4.6 },
+                { "label": "CTRL", "x": 16, "y": 4.6 },
+                { "label": "LEFT", "x": 17.25, "y": 4.85 },
+                { "label": "DOWN", "x": 18.25, "y": 4.85 },
+                { "label": "RIGHT", "x": 19.25, "y": 4.85 }
+            ]
         }
     }
 }
diff --git a/keyboards/p3d/glitch/keymaps/default/keymap.c b/keyboards/p3d/glitch/keymaps/default/keymap.c
index 43aa53c9f1..da32a84506 100644
--- a/keyboards/p3d/glitch/keymaps/default/keymap.c
+++ b/keyboards/p3d/glitch/keymaps/default/keymap.c
@@ -19,11 +19,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MUTE,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,      KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,      KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,      KC_ENT, KC_PGDN,
-    KC_LSFT,      KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
-    KC_LCTL, KC_LGUI,      KC_LALT,      KC_SPC,      KC_SPC,      KC_RALT,      KC_RGUI, KC_RCTL, 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,  KC_BSPC, KC_DEL,        KC_MUTE,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                 KC_PGDN,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,    KC_UP,      KC_END,
+    KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,  KC_SPC,           KC_RALT,                   KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
 )
 };
 

From 917c12d973f73b79dfc7337b3a0a2331dface569 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 29 Sep 2022 20:56:34 -0600
Subject: [PATCH 498/959] [Keyboard] fixup tklfrlnrlmlao (#18539)

---
 keyboards/zicodia/tklfrlnrlmlao/config.h      | 20 -------------------
 .../tklfrlnrlmlao/keymaps/default/keymap.c    |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 keyboards/zicodia/tklfrlnrlmlao/config.h

diff --git a/keyboards/zicodia/tklfrlnrlmlao/config.h b/keyboards/zicodia/tklfrlnrlmlao/config.h
deleted file mode 100644
index 58f2df252b..0000000000
--- a/keyboards/zicodia/tklfrlnrlmlao/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 Zicodia (@Zicodia)
-// 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/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c b/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
index 12edec5bdb..0addb5711f 100644
--- a/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
+++ b/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_A,        KC_S,      KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_ENT, 
 		SFT_T(KC_Z), KC_X,      KC_C,       KC_V,       KC_B,       KC_N,       KC_M,                   KC_UP, 
 		KC_LCTL,     KC_LALT,               KC_SPC,                 KC_RGUI,    MO(1),      KC_LEFT,    KC_DOWN,    KC_RGHT
-    )
+    ),
     /*
      * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
      * │ 1 │| 2 │ 3 │ 4 │| 5 │ 6 │ 7 │ | 8 │ 9 │ 0 │
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TAB,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MINS,    KC_EQL,     KC_BSPC,    KC_LBRC,    KC_RBRC,    KC_BSLS, 
 		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_SCLN,    KC_QUOT,                KC_RSFT, 
 		KC_TRNS,    KC_TRNS,                KC_TRNS,                MO(2),      KC_TRNS,    KC_COMM,    KC_DOT,     KC_SLSH
-    )
+    ),
     /*
      * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
      * │ESC│|F1 │F2 │F3 │|F4 │F5 │F6 │ |F7 │F8 │F9 │
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_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
-    )
+    ),
     /*
      * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
      * │   │|   │   │   │|   │   │   │ |   │   │   │

From 168b69654fe9101e4278a0620032e88b8049eb45 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Fri, 30 Sep 2022 12:57:20 +1000
Subject: [PATCH 499/959] Explicitly specify path to RP2040 wear_leveling
 config file. (#18541)

---
 builddefs/common_features.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index a23b5e82b9..cb2ab3d778 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -271,7 +271,7 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
       POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_flash_spi_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), rp2040_flash)
       SRC += wear_leveling_rp2040_flash.c
-      POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_rp2040_flash_config.h
+      POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_PATH)/wear_leveling/wear_leveling_rp2040_flash_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), legacy)
       COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
       SRC += flash_stm32.c wear_leveling_legacy.c

From 2c4fd924c02b081b0e0d87f972c0e55b08741eec Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Fri, 30 Sep 2022 10:57:39 +0800
Subject: [PATCH 500/959] [Keyboard] Add EAU87 (#18532)

---
 keyboards/yandrstudio/eau87/board.h           |  21 +
 keyboards/yandrstudio/eau87/config.h          |  27 +
 keyboards/yandrstudio/eau87/eau87.c           |  16 +
 keyboards/yandrstudio/eau87/eau87.h           |  34 ++
 keyboards/yandrstudio/eau87/info.json         | 464 ++++++++++++++++++
 .../eau87/keymaps/default/keymap.c            |  27 +
 .../yandrstudio/eau87/keymaps/via/keymap.c    |  48 ++
 .../yandrstudio/eau87/keymaps/via/rules.mk    |   1 +
 keyboards/yandrstudio/eau87/mcuconf.h         |  21 +
 keyboards/yandrstudio/eau87/readme.md         |  22 +
 keyboards/yandrstudio/eau87/rules.mk          |  15 +
 11 files changed, 696 insertions(+)
 create mode 100644 keyboards/yandrstudio/eau87/board.h
 create mode 100644 keyboards/yandrstudio/eau87/config.h
 create mode 100644 keyboards/yandrstudio/eau87/eau87.c
 create mode 100644 keyboards/yandrstudio/eau87/eau87.h
 create mode 100644 keyboards/yandrstudio/eau87/info.json
 create mode 100644 keyboards/yandrstudio/eau87/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/eau87/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/eau87/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/eau87/mcuconf.h
 create mode 100644 keyboards/yandrstudio/eau87/readme.md
 create mode 100644 keyboards/yandrstudio/eau87/rules.mk

diff --git a/keyboards/yandrstudio/eau87/board.h b/keyboards/yandrstudio/eau87/board.h
new file mode 100644
index 0000000000..d83804babd
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h
new file mode 100644
index 0000000000..698b5ca141
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/config.h
@@ -0,0 +1,27 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_COL_PINS { A10, A9,  A8,  B15, B14, B13, B11, B10, B2,  B1,  B0,  A7,  A6,  A5,  A3,  A15, B3 }
+#define MATRIX_ROW_PINS { B12, B5,  B4,  A4,  B7,  B6 }
diff --git a/keyboards/yandrstudio/eau87/eau87.c b/keyboards/yandrstudio/eau87/eau87.c
new file mode 100644
index 0000000000..6ab9edb788
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/eau87.c
@@ -0,0 +1,16 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "eau87.h"
diff --git a/keyboards/yandrstudio/eau87/eau87.h b/keyboards/yandrstudio/eau87/eau87.h
new file mode 100644
index 0000000000..6810797837
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/eau87.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
+	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,       \
+	K500, K501, K502,                   K506,                   K510, K511, K512, K513, K514, K515, K516  \
+    )\
+    { \
+	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006, K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO, KC_NO, KC_NO }, \
+	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO, K415,  KC_NO }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514,  K515,  K516 }  \
+}
diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json
new file mode 100644
index 0000000000..f09f55c76b
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/info.json
@@ -0,0 +1,464 @@
+{
+    "keyboard_name": "eau87",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAAEB",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "Esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "F1",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "F2",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "F3",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "F4",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "F5",
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "label": "F6",
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "label": "F7",
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "label": "F8",
+                    "x": 9.5,
+                    "y": 0
+                },
+                {
+                    "label": "F9",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "F10",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "F11",
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "label": "F12",
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "label": "PrtSc",
+                    "x": 15.25,
+                    "y": 0
+                },
+                {
+                    "label": "Scroll Lock",
+                    "x": 16.25,
+                    "y": 0
+                },
+                {
+                    "label": "Pause",
+                    "x": 17.25,
+                    "y": 0
+                },
+                {
+                    "label": "~",
+                    "x": 0,
+                    "y": 1.5
+                },
+                {
+                    "label": "!",
+                    "x": 1,
+                    "y": 1.5
+                },
+                {
+                    "label": "@",
+                    "x": 2,
+                    "y": 1.5
+                },
+                {
+                    "label": "#",
+                    "x": 3,
+                    "y": 1.5
+                },
+                {
+                    "label": "$",
+                    "x": 4,
+                    "y": 1.5
+                },
+                {
+                    "label": "%",
+                    "x": 5,
+                    "y": 1.5
+                },
+                {
+                    "label": "^",
+                    "x": 6,
+                    "y": 1.5
+                },
+                {
+                    "label": "&",
+                    "x": 7,
+                    "y": 1.5
+                },
+                {
+                    "label": "*",
+                    "x": 8,
+                    "y": 1.5
+                },
+                {
+                    "label": "(",
+                    "x": 9,
+                    "y": 1.5
+                },
+                {
+                    "label": ")",
+                    "x": 10,
+                    "y": 1.5
+                },
+                {
+                    "label": "_",
+                    "x": 11,
+                    "y": 1.5
+                },
+                {
+                    "label": "+",
+                    "x": 12,
+                    "y": 1.5
+                },
+                {
+                    "label": "Backspace",
+                    "x": 13,
+                    "y": 1.5,
+                    "w": 2
+                },
+                {
+                    "label": "Insert",
+                    "x": 15.25,
+                    "y": 1.5
+                },
+                {
+                    "label": "Home",
+                    "x": 16.25,
+                    "y": 1.5
+                },
+                {
+                    "label": "PgUp",
+                    "x": 17.25,
+                    "y": 1.5
+                },
+                {
+                    "label": "Tab",
+                    "x": 0,
+                    "y": 2.5,
+                    "w": 1.5
+                },
+                {
+                    "label": "Q",
+                    "x": 1.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "W",
+                    "x": 2.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "E",
+                    "x": 3.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "R",
+                    "x": 4.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "T",
+                    "x": 5.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "Y",
+                    "x": 6.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "U",
+                    "x": 7.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "I",
+                    "x": 8.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "O",
+                    "x": 9.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "P",
+                    "x": 10.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "{",
+                    "x": 11.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "}",
+                    "x": 12.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "|",
+                    "x": 13.5,
+                    "y": 2.5,
+                    "w": 1.5
+                },
+                {
+                    "label": "Delete",
+                    "x": 15.25,
+                    "y": 2.5
+                },
+                {
+                    "label": "End",
+                    "x": 16.25,
+                    "y": 2.5
+                },
+                {
+                    "label": "PgDn",
+                    "x": 17.25,
+                    "y": 2.5
+                },
+                {
+                    "label": "Caps Lock",
+                    "x": 0,
+                    "y": 3.5,
+                    "w": 1.75
+                },
+                {
+                    "label": "A",
+                    "x": 1.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "S",
+                    "x": 2.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "D",
+                    "x": 3.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "F",
+                    "x": 4.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "G",
+                    "x": 5.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "H",
+                    "x": 6.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "J",
+                    "x": 7.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "K",
+                    "x": 8.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "L",
+                    "x": 9.75,
+                    "y": 3.5
+                },
+                {
+                    "label": ":",
+                    "x": 10.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "\"",
+                    "x": 11.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "Enter",
+                    "x": 12.75,
+                    "y": 3.5,
+                    "w": 2.25
+                },
+                {
+                    "label": "Shift",
+                    "x": 0,
+                    "y": 4.5,
+                    "w": 2.25
+                },
+                {
+                    "label": "Z",
+                    "x": 2.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "X",
+                    "x": 3.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "C",
+                    "x": 4.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "V",
+                    "x": 5.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "B",
+                    "x": 6.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "N",
+                    "x": 7.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "M",
+                    "x": 8.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "<",
+                    "x": 9.25,
+                    "y": 4.5
+                },
+                {
+                    "label": ">",
+                    "x": 10.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "?",
+                    "x": 11.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "Shift",
+                    "x": 12.25,
+                    "y": 4.5,
+                    "w": 2.75
+                },
+                {
+                    "label": "\u2191",
+                    "x": 16.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 0,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 1.25,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 2.5,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 5.5,
+                    "w": 6.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 10,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 11.25,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "Menu",
+                    "x": 12.5,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 13.75,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "\u2190",
+                    "x": 15.25,
+                    "y": 5.5
+                },
+                {
+                    "label": "\u2193",
+                    "x": 16.25,
+                    "y": 5.5
+                },
+                {
+                    "label": "\u2192",
+                    "x": 17.25,
+                    "y": 5.5
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/eau87/keymaps/default/keymap.c b/keyboards/yandrstudio/eau87/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ce5c77baa4
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_ESC,           KC_F1,   KC_F2,  KC_F3,   KC_F4, KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_VOLU, KC_VOLD,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_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_RIGHT)
+};
diff --git a/keyboards/yandrstudio/eau87/keymaps/via/keymap.c b/keyboards/yandrstudio/eau87/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4f592bd664
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_ESC,           KC_F1,   KC_F2,  KC_F3,   KC_F4, KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_VOLU, KC_VOLD,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_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_RIGHT),
+	[1] = LAYOUT(
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[2] = LAYOUT(
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[3] = LAYOUT(
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/eau87/keymaps/via/rules.mk b/keyboards/yandrstudio/eau87/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/eau87/mcuconf.h b/keyboards/yandrstudio/eau87/mcuconf.h
new file mode 100644
index 0000000000..bdfb4641ea
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/eau87/readme.md b/keyboards/yandrstudio/eau87/readme.md
new file mode 100644
index 0000000000..da25363835
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/readme.md
@@ -0,0 +1,22 @@
+# eau87
+
+![eau87](https://i.imgur.com/1V2JmGlh.png)
+A 80% keyboard.
+This keyboard use 16mhz HSE and APM32F103 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: eau87
+- Hardware Availability: [CHAOSERA SELL](https://www.chaosera-sell.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/eau87:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/eau87/rules.mk b/keyboards/yandrstudio/eau87/rules.mk
new file mode 100644
index 0000000000..4a92d0f891
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/rules.mk
@@ -0,0 +1,15 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From dab9edeabb1ccbaa0d71d10b5b349c6862dea771 Mon Sep 17 00:00:00 2001
From: Markus Knutsson <markus.knutsson@tweety.se>
Date: Fri, 30 Sep 2022 05:01:33 +0200
Subject: [PATCH 501/959] [Keyboard] Add Little Big Scroll 6 macropad (#18510)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/tweetydabird/lbs6/config.h          | 10 +++
 keyboards/tweetydabird/lbs6/info.json         | 76 +++++++++++++++++++
 .../lbs6/keymaps/default/keymap.c             | 30 ++++++++
 .../lbs6/keymaps/default/readme.md            |  3 +
 keyboards/tweetydabird/lbs6/readme.md         | 28 +++++++
 keyboards/tweetydabird/lbs6/rules.mk          |  1 +
 6 files changed, 148 insertions(+)
 create mode 100644 keyboards/tweetydabird/lbs6/config.h
 create mode 100644 keyboards/tweetydabird/lbs6/info.json
 create mode 100644 keyboards/tweetydabird/lbs6/keymaps/default/keymap.c
 create mode 100644 keyboards/tweetydabird/lbs6/keymaps/default/readme.md
 create mode 100644 keyboards/tweetydabird/lbs6/readme.md
 create mode 100644 keyboards/tweetydabird/lbs6/rules.mk

diff --git a/keyboards/tweetydabird/lbs6/config.h b/keyboards/tweetydabird/lbs6/config.h
new file mode 100644
index 0000000000..ed8d2caa5b
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/config.h
@@ -0,0 +1,10 @@
+// Copyright 2022 Markus Knutsson (@TweetyDaBird)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include "config_common.h"
+
+// Bootmagic Lite key configuration
+// Not yet supported in info.json ?
+#define BOOTMAGIC_LITE_ROW 2
+#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json
new file mode 100644
index 0000000000..ac1b574220
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/info.json
@@ -0,0 +1,76 @@
+{
+	"keyboard_name": "Little Big Scroll 6",
+	"manufacturer": "Tweetys Wild Thinking",
+	"url": "https://lectronz.com/stores/tweetys-wild-thinking",
+	"maintainer": "TweetyDaBird",	
+	
+	"development_board": "promicro",
+	
+	"features": {
+		"bootmagic": true,
+		"command": false,
+		"console": false,
+		"extrakey": true,
+		"mousekey": true,
+		"nkro": false,
+		"rgblight": true,
+		"encoder": true
+	},
+
+  "build": {
+    "lto": true
+  },
+
+	"usb": {
+		"vid": "0xFEED",
+        "pid": "0x23B0",
+		"device_version": "1.1.0"
+	},
+	
+	"debounce": 5,
+	
+	"matrix_pins": {
+        "direct": [
+			[null, "F5", null],
+            ["D4", "D7", "B4"],
+			["C6", "E6", "B5"]
+        ]
+    },
+
+	"encoder": {
+        "rotary": [
+            { "pin_a": "F7", "pin_b": "F6", "resolution": 2 }
+        ]
+    },
+
+	"rgblight": {
+        "led_count": 8,
+        "pin": "D2",
+        "hue_steps": 8,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+		"max_brightness": 200,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "rainbow_mood": true,
+            "static_gradient": true,
+        }
+    },
+	
+	"layouts": {
+        "LAYOUT": {
+            "layout": [	
+			{ "label": "Play", 	"matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
+			
+			{ "label": "F1", 	"matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 }, 
+			{ "label": "F2", 	"matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }, 
+			{ "label": "F3", 	"matrix": [1, 2], "x": 2, "y": 1, "w": 1, "h": 1 },
+			
+			{ "label": "F4", 	"matrix": [2, 0], "x": 0, "y": 2, "w": 1, "h": 1 },
+			{ "label": "F5", 	"matrix": [2, 1], "x": 1, "y": 2, "w": 1, "h": 1 },
+			{ "label": "F6", 	"matrix": [2, 2], "x": 2, "y": 2, "w": 1, "h": 1 },
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs6/keymaps/default/keymap.c b/keyboards/tweetydabird/lbs6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..590cb8ea0b
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2022 Markus Knutsson (@TweetyDaBird)
+// 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
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT(
+        KC_MPLY,	
+		RGB_MOD,	RGB_VAI,	RGB_TOG,
+		KC_MPRV,	KC_MPLY,	KC_MNXT
+		
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } 
+    return false;
+}
diff --git a/keyboards/tweetydabird/lbs6/keymaps/default/readme.md b/keyboards/tweetydabird/lbs6/keymaps/default/readme.md
new file mode 100644
index 0000000000..22c4296f55
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# The default keymap for LBS6
+
+This is a very basic layout using LBS6 as media playback buttons. 
diff --git a/keyboards/tweetydabird/lbs6/readme.md b/keyboards/tweetydabird/lbs6/readme.md
new file mode 100644
index 0000000000..2301cc3c56
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/readme.md
@@ -0,0 +1,28 @@
+# lsb6
+
+
+*A simple 6-key macro pad with a clickable scrollwheel, for media controls and whatever else you can imagine.*
+
+* Keyboard Maintainer: [Markus Knutsson](https://github.com/TweetyDaBird/)
+* Hardware Supported: LBS6 PCB plus Pro Micro or pin compatible
+* Hardware Availability: https://lectronz.com/stores/tweetys-wild-thinking
+* Hardware Design: https://github.com/TweetyDaBird/Little-Big-Scroll
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tweetydabird/lbs6:default
+
+Flashing example for this keyboard:
+
+    make tweetydabird/lbs6:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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 bottom right key and plug in the keyboard
+* **Physical reset**: Briefly short the marked pads on PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if mapped (not in default keymap)
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs6/rules.mk b/keyboards/tweetydabird/lbs6/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From be61df0827cbd07468a6acdd9b7ce8d2e7c8094e Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Thu, 29 Sep 2022 23:29:11 -0400
Subject: [PATCH 502/959] [Keyboard] Add Moment Solderable (#18385)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/cannonkeys/moment/config.h          |  20 ++++
 keyboards/cannonkeys/moment/halconf.h         |  27 +++++
 keyboards/cannonkeys/moment/info.json         | 107 ++++++++++++++++++
 .../moment/keymaps/default/keymap.c           |  45 ++++++++
 .../cannonkeys/moment/keymaps/via/keymap.c    |  45 ++++++++
 .../cannonkeys/moment/keymaps/via/rules.mk    |   1 +
 keyboards/cannonkeys/moment/mcuconf.h         |  28 +++++
 keyboards/cannonkeys/moment/readme.md         |  25 ++++
 keyboards/cannonkeys/moment/rules.mk          |   2 +
 9 files changed, 300 insertions(+)
 create mode 100644 keyboards/cannonkeys/moment/config.h
 create mode 100644 keyboards/cannonkeys/moment/halconf.h
 create mode 100644 keyboards/cannonkeys/moment/info.json
 create mode 100644 keyboards/cannonkeys/moment/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/moment/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/moment/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/moment/mcuconf.h
 create mode 100644 keyboards/cannonkeys/moment/readme.md
 create mode 100644 keyboards/cannonkeys/moment/rules.mk

diff --git a/keyboards/cannonkeys/moment/config.h b/keyboards/cannonkeys/moment/config.h
new file mode 100644
index 0000000000..8236eb17d9
--- /dev/null
+++ b/keyboards/cannonkeys/moment/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2022 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/moment/halconf.h b/keyboards/cannonkeys/moment/halconf.h
new file mode 100644
index 0000000000..4bec05bd69
--- /dev/null
+++ b/keyboards/cannonkeys/moment/halconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/an_c/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/info.json
new file mode 100644
index 0000000000..1ef45f4d8a
--- /dev/null
+++ b/keyboards/cannonkeys/moment/info.json
@@ -0,0 +1,107 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Moment",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "backlight": true,
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "backlight": {
+        "breathing": true,
+        "breathing_period": 5,
+        "levels": 15,
+        "pin": "A6"
+    },
+    "indicators": {
+        "caps_lock": "A3",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com/",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xCA04",
+        "pid": "0x0014"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
+                { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.0 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
+                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/moment/keymaps/default/keymap.c b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3936ef3357
--- /dev/null
+++ b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_BSLS, KC_ENT,
+    KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/moment/keymaps/via/keymap.c b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3936ef3357
--- /dev/null
+++ b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_BSLS, KC_ENT,
+    KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/moment/keymaps/via/rules.mk b/keyboards/cannonkeys/moment/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/moment/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/moment/mcuconf.h b/keyboards/cannonkeys/moment/mcuconf.h
new file mode 100644
index 0000000000..45f6a54cd1
--- /dev/null
+++ b/keyboards/cannonkeys/moment/mcuconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/an_c/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
diff --git a/keyboards/cannonkeys/moment/readme.md b/keyboards/cannonkeys/moment/readme.md
new file mode 100644
index 0000000000..8418fb37a8
--- /dev/null
+++ b/keyboards/cannonkeys/moment/readme.md
@@ -0,0 +1,25 @@
+# Moment
+
+*A 60% keyboard from jjw_kb*
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/moment:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/moment:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/moment/rules.mk b/keyboards/cannonkeys/moment/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/cannonkeys/moment/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

From d412dc61ee5ba8177298d8930df4503fd4d44f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
Date: Fri, 30 Sep 2022 05:42:42 +0200
Subject: [PATCH 503/959] Remove remaining use of terminal keys and related
 comment labels (#18402)

---
 .../40percentclub/mf68/keymaps/delivrance/keymap.c   |  3 +--
 .../checkerboards/quark/keymaps/pezhore/keymap.c     |  4 ++--
 keyboards/contra/keymaps/alper/keymap.c              |  2 +-
 .../dm9records/plaid/keymaps/brickbots/keymap.c      |  2 +-
 .../dm9records/plaid/keymaps/gipsy-king/keymap.c     |  2 +-
 .../handwired/ortho_brass/keymaps/default/keymap.c   |  2 +-
 .../handwired/terminus_mini/keymaps/default/keymap.c |  2 +-
 .../terminus_mini/keymaps/default/readme.md          |  2 +-
 .../ergodox_infinity/keymaps/dudeofawesome/keymap.c  |  2 +-
 keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c  |  2 +-
 keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c |  2 +-
 keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c   |  2 +-
 keyboards/keebio/nyquist/keymaps/DivergeJM/README.md |  2 +-
 keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c  |  4 ++--
 keyboards/keebio/nyquist/keymaps/pjanx/keymap.c      |  4 ++--
 .../kingly_keys/ropro/keymaps/jdayton3/keymap.c      |  4 ++--
 keyboards/massdrop/ctrl/keymaps/endgame/keymap.c     |  2 +-
 keyboards/mlego/m48/keymaps/default/keymap.c         |  2 +-
 keyboards/mlego/m48/keymaps/via/keymap.c             |  2 +-
 keyboards/planck/keymaps/abhixec/keymap.c            |  4 ++--
 keyboards/planck/keymaps/abishalom/keymap.c          |  4 ++--
 keyboards/planck/keymaps/corvec/keymap.c             |  4 ++--
 keyboards/planck/keymaps/dear_vehicle_owner/keymap.c | 10 +++++-----
 keyboards/planck/keymaps/default/keymap.c            |  2 +-
 keyboards/planck/keymaps/dodger/keymap.c             |  6 +++---
 keyboards/planck/keymaps/dudeofawesome/keymap.c      |  2 +-
 keyboards/planck/keymaps/dvz/keymap.c                | 10 +++++-----
 keyboards/planck/keymaps/emiller/keymap.c            |  2 +-
 keyboards/planck/keymaps/eshesh2/keymap.c            | 10 +++++-----
 keyboards/planck/keymaps/eshesh2/readme.md           |  2 +-
 keyboards/planck/keymaps/fabian/keymap.c             |  8 ++++----
 keyboards/planck/keymaps/foreveranapple/keymap.c     |  4 ++--
 keyboards/planck/keymaps/fsck/keymap.c               |  2 +-
 keyboards/planck/keymaps/grahampheath/keymap.c       |  2 +-
 keyboards/planck/keymaps/hvp/keymap.c                |  2 +-
 keyboards/planck/keymaps/jasperla/keymap.c           |  2 +-
 keyboards/planck/keymaps/jdelkins/keymap.c           |  2 +-
 keyboards/planck/keymaps/jirgn/keymap.c              |  2 +-
 keyboards/planck/keymaps/kelorean/keymap.c           |  2 +-
 keyboards/planck/keymaps/khord/keymap.c              |  8 ++++----
 keyboards/planck/keymaps/kifinnsson/keymap.c         | 10 +++++-----
 keyboards/planck/keymaps/kloki/keymap.c              |  2 +-
 keyboards/planck/keymaps/kmontag42/keymap.c          |  2 +-
 keyboards/planck/keymaps/lja83/keymap.c              | 10 +++++-----
 keyboards/planck/keymaps/mgalisa/keymap.c            |  8 ++++----
 keyboards/planck/keymaps/mikethetiger/keymap.c       |  8 ++++----
 keyboards/planck/keymaps/msiu/keymap.c               |  2 +-
 keyboards/planck/keymaps/muzfuz/keymap.c             |  2 +-
 keyboards/planck/keymaps/myoung34/keymap.c           |  2 +-
 keyboards/planck/keymaps/pevecyan/keymap.c           |  2 +-
 keyboards/planck/keymaps/pickle_jr/keymap.c          |  8 ++++----
 keyboards/planck/keymaps/pjanx/keymap.c              |  8 ++++----
 keyboards/planck/keymaps/prog_qgmlwb/src/special.h   |  4 ++--
 keyboards/planck/keymaps/ptillemans/keymap.c         |  8 ++++----
 keyboards/planck/keymaps/raffle/keymap.c             |  2 +-
 keyboards/planck/keymaps/rodhaene/keymap.c           |  2 +-
 keyboards/planck/keymaps/rootiest/keymap.c           |  4 ++--
 keyboards/planck/keymaps/smittey/keymap.c            |  2 +-
 keyboards/planck/keymaps/stuartfong1/keymap.c        | 10 +++++-----
 keyboards/planck/keymaps/tom/keymap.c                |  6 +++---
 keyboards/planck/keymaps/tomkonidas/keymap.c         | 10 +++++-----
 keyboards/planck/keymaps/tomkonidas/readme.md        |  2 +-
 keyboards/planck/keymaps/unagi/keymap.c              |  2 +-
 keyboards/planck/thk/keymaps/thk/keymap.c            |  4 ++--
 keyboards/preonic/keymaps/AlexDaigre/keymap.c        |  2 +-
 keyboards/preonic/keymaps/blake-newman/keymap.c      |  2 +-
 keyboards/preonic/keymaps/boy314/keymap.c            |  2 +-
 keyboards/preonic/keymaps/cranium/keymap.c           |  2 +-
 keyboards/preonic/keymaps/default/keymap.c           |  2 +-
 keyboards/preonic/keymaps/drasbeck/keymap.c          |  2 +-
 keyboards/preonic/keymaps/dudeofawesome/keymap.c     |  2 +-
 keyboards/preonic/keymaps/ekis_isa/keymap.c          |  2 +-
 keyboards/preonic/keymaps/elisiano/keymap.c          | 10 +++++-----
 keyboards/preonic/keymaps/fsck/keymap.c              |  2 +-
 keyboards/preonic/keymaps/keelhauler/keymap.c        |  2 +-
 keyboards/preonic/keymaps/laurentlaurent/keymap.c    |  2 +-
 keyboards/preonic/keymaps/mechmaster48/keymap.c      |  4 ++--
 keyboards/preonic/keymaps/mguterl/keymap.c           |  2 +-
 keyboards/preonic/keymaps/mikethetiger/keymap.c      |  2 +-
 keyboards/preonic/keymaps/muzfuz/keymap.c            |  2 +-
 keyboards/preonic/keymaps/mverteuil/keymap.c         |  4 ++--
 keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c    |  4 ++--
 keyboards/preonic/keymaps/pezhore/keymap.c           |  2 +-
 keyboards/preonic/keymaps/pitty/keymap.c             |  4 ++--
 keyboards/preonic/keymaps/senseored/keymap.c         |  2 +-
 keyboards/xiudi/xd75/keymaps/raoeus/keymap.c         | 12 ++++++------
 keyboards/xiudi/xd75/keymaps/raoeus/readme.md        |  2 +-
 layouts/community/ortho_4x12/jackhumbert/keymap.c    | 10 +++++-----
 layouts/community/ortho_4x12/jjerrell/keymap.c       |  2 +-
 layouts/community/ortho_4x12/juno/keymap.c           |  2 +-
 layouts/community/ortho_4x12/junonum/keymap.c        |  8 ++++----
 layouts/community/ortho_4x12/mguterl/keymap.c        | 10 +++++-----
 users/jjerrell/wrappers.h                            |  6 +++---
 users/muppetjones/wrappers.h                         |  2 +-
 users/xulkal/layouts.h                               |  4 ++--
 95 files changed, 186 insertions(+), 187 deletions(-)

diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index 011d03deba..18343067f8 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -26,7 +26,6 @@
 #define KC_BLUP BL_INC   // Backlight increase
 #define KC_BLDN BL_DEC   // Backlight decrease
 #define KC_BLTOG BL_TOGG // Backlight toggle
-#define KC_TERM TERM_ON  // Terminal mode on
 #define KC_REC1 DM_REC1  // Record macro 1
 #define KC_PLY1 DM_PLY1  // Play macro 1
 #define KC_REC2 DM_REC2  // Record macro 2
@@ -71,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ┣Esc ┻ 1! ┻ 2@ ┻ 3# ┻ 4$ ┻ 5% ┻ 6^ ┻ 7& ┻ 8* ┻ 9( ┻ 0) ┻ -_ ┻ =+ ┻━┳━ ←─ ━┫ ┣Ins ╋PgUp┫ */
   _______ ,KC_PLY1,KC_PLY2,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_7  , KC_8  , KC_9  ,KC_BLDN,KC_BLUP,KC_BLTOG ,KC_TRNS  ,KC_END , /*
    ┣ Tab ━┻ Q ━┻ W ━┻ E ━┻ R ━┻ T ━┻ Y ━┻ U ━┻ I ━┻ O ━┻ P ━┻ [{ ┻ ]} ┻━ \| ━┫ ┗Del ┻PgDn┛ */
-    _______ ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_4  , KC_5  , KC_6  ,KC_TRNS,   KC_TERM  ,         /*
+    _______ ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_4  , KC_5  , KC_6  ,KC_TRNS,   KC_TRNS  ,         /*
    ┣━ Caps ━┻ A ━┻ S ━┻ D ━┻ F ━┻ G ━┻ H ━┻ J ━┻ K ━┻ L ━┻ ;: ┻ '" ┻━ Enter ━┫ ┏━━━━┓      */
     _______   ,KC_REC1,KC_REC2,KC_TRNS,KC_TRNS,KC_MSTP,KC_TRNS,KC_MUTE, KC_1  , KC_2  , KC_3  ,KC_TRNS        ,  KC_VOLU,  /*
    ┣━━ Shift ━┻ Z ━┻ X ━┻ C ━┻ V ━┻ B ━┻ N ━┻ M ━┻ ,< ┻ .> ╋ /? ┻┳━━ Shift ━━┻━╋ ↑ ━╋━━━━┓ */
diff --git a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
index 528bc2cc00..67ec80f304 100644
--- a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  TERM_ON,  TERM_OFF, _______,  _______,  KC_DEL,
+  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
@@ -192,4 +192,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           break;
       }
     return true;
-};
\ No newline at end of file
+};
diff --git a/keyboards/contra/keymaps/alper/keymap.c b/keyboards/contra/keymaps/alper/keymap.c
index af81040b58..7f00697d66 100644
--- a/keyboards/contra/keymaps/alper/keymap.c
+++ b/keyboards/contra/keymaps/alper/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_planck_mit(
     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
   )
 
diff --git a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
index 0442c930fe..e1ed2c0749 100644
--- a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_plaid_grid(
     QK_BOOT,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
index f31b79c2c7..8327fe685d 100644
--- a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_plaid_grid( // F, media keys, reset
     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, QK_BOOT,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,_______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, AUTOCLICK
 )
 };
diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
index f32529b6a7..93d4082305 100644
--- a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index 8d0631072f..413314e836 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -182,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |QK_BOOT |      |TermOn|TermOf|      |      |  Del |
+ * |      |      |      |      |      |QK_BOOT |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |Qwerty|Colemk|Dvorak|      |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/readme.md b/keyboards/handwired/terminus_mini/keymaps/default/readme.md
index 4c04aa0170..e5718fc1a2 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/readme.md
+++ b/keyboards/handwired/terminus_mini/keymaps/default/readme.md
@@ -149,7 +149,7 @@ keys.
 ### ADJUST - Keyboard Settings: Primarily used to change the base layer at this stage
 ```
 ,----------------------------------------------------------------------------------.
-|      |      |      |      |      |QK_BOOT |     |TermOn|TermOf|      |      |  Del |
+|      |      |      |      |      |QK_BOOT |     |      |      |      |      |  Del |
 |------+------+------+------+------+------+-----+------+------+------+------+------|
 |      |      |      |      |      |      |     |Qwerty|Colemk|Dvorak|      |      |
 |------+------+------+------+------+------+-----+------+------+------+------+------|
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
index 266194de35..f261115055 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
@@ -322,7 +322,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   _______, _______, _______, _______,  _______, _______, _______,
-  _______, _______, TERM_ON, TERM_OFF, _______, _______, KC_DEL,
+  _______, _______, _______, _______,  _______, _______, KC_DEL,
            AG_SWAP, QWERTY,  WORKMAN,  DVORAK,  COLEMAK, _______,
   _______, _______, _______, _______,  _______, _______, _______,
                     _______, _______,  _______, _______, _______,
diff --git a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
index a373b463ab..143329bc2d 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______,  _______, _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______,  _______,
   _______, _______, _______,  _______, _______, _______,   _______,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
index ec06d54d0c..b3edc0859f 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
index bfd95e137f..c889b6316c 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md b/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
index 198e3ef887..86d764818b 100644
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
@@ -173,7 +173,7 @@ The *MOUSE* layer contains keys replicating functions found on the mouse.
 ,-----------------------------------------.     ,----------------------------------------.
 |      |      |      |      |      |RESET |     |     |      |      |      |      |      |
 |------+------+------+------+------+------|     |-----+------+------+------+------+------|
-|      |      |      |      |      |      |     |     |TermOn|TermOf|      |      |  Del |
+|      |      |      |      |      |      |     |     |      |      |      |      |  Del |
 |------+------+------+------+------+------|     |-----+------+------+------+------+------|
 |      |      |      |      |      |      |     |     |Qwerty|Colemk|Dvorak|      |      |
 |------+------+------+------+------+------|     |-----+------+------+------+------+------|
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
index 8e8743766b..5cf639775e 100644
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.     ,----------------------------------------.
  * |      |      |      |      |      |QK_BOOT |     |     |      |      |      |      |      |
  * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |     |TermOn|TermOf|      |      |  Del |
+ * |      |      |      |      |      |      |     |     |      |      |      |      |  Del |
  * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
  * |      |      |      |      |      |      |     |     |Qwerty|Colemk|Dvorak|      |      |
  * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT(
   _______, _______, _______, _______, _______, QK_BOOT,      _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______,      _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \
+  _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, _______, _______, _______,      _______, QWERTY,  COLEMAK, DVORAK, _______,  _______, \
   _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
index 96cf700bb8..176e53988c 100644
--- a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |  M1  |  M2  |  M3  |      |      |             |      |  <-  |  vv  |  ^^  |  ->  |
  * `-----------------------------------------------------------------------------------'
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12(
     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
 )
 
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
index 9cba0ccefb..51403378d1 100644
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
    * | PgUp |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
    * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+   * | Home |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
    * |------|------+------+------+------+------+------+------+------+------+------+------+------|
    * | PgDn |      |      |      |      |      |             |      |      |      |      |      |
    * `------------------------------------------------------------------------------------------'
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
     KC_NO,    _______,   QK_BOOT,  DEBUG,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_DEL ,
     KC_PGUP,  _______,   _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,    PLOVER,   _______,
-    KC_HOME,  _______,   MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   TERM_ON,  TERM_OFF, _______,   _______,  _______,
+    KC_HOME,  _______,   MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,   _______,  _______,
     KC_PGDN,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______
   )
 };
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
index 4c9c73c3fd..9439d105ba 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         TD(TD_CTRL_TERM),  TD(TD_LGUI_ML), KC_LALT,                   KC_SPC,                             KC_RALT, TT(_FL), TD(TD_APP_YL), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FL] = LAYOUT(
-        _______, DM_PLY1, DM_PLY2, _______,  _______, DM_REC1, DM_REC2, _______,  _______,  DM_RSTP, _______, KC_WAKE, KC_SLEP,          KC_MUTE, TERM_ON, TERM_OFF,
+        _______, DM_PLY1, DM_PLY2, _______,  _______, DM_REC1, DM_REC2, _______,  _______,  DM_RSTP, _______, KC_WAKE, KC_SLEP,          KC_MUTE, _______, _______,
         _______, _______, TG(_ML), TG(_GL),  TG(_VL), TG(_YL), _______, _______,  _______,  ROUT_FM, ROUT_TG, ROUT_VD, ROUT_VI, _______, KC_MSTP, KC_MPLY, KC_VOLU,
         RGB_M_P, RGB_SPD, RGB_VAI, RGB_SPI,  RGB_HUI, RGB_SAI, _______, U_T_AUTO, U_T_AGCR, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD,  RGB_HUD, RGB_SAD, _______, _______,  _______,  _______, _______, _______, _______,
diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c
index 175f42b9b9..ca872bbe34 100644
--- a/keyboards/mlego/m48/keymaps/default/keymap.c
+++ b/keyboards/mlego/m48/keymaps/default/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
diff --git a/keyboards/mlego/m48/keymaps/via/keymap.c b/keyboards/mlego/m48/keymaps/via/keymap.c
index 34caea2cf4..c6916a7fb6 100644
--- a/keyboards/mlego/m48/keymaps/via/keymap.c
+++ b/keyboards/mlego/m48/keymaps/via/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
diff --git a/keyboards/planck/keymaps/abhixec/keymap.c b/keyboards/planck/keymaps/abhixec/keymap.c
index e95aa344d6..ae310120a2 100644
--- a/keyboards/planck/keymaps/abhixec/keymap.c
+++ b/keyboards/planck/keymaps/abhixec/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/abishalom/keymap.c b/keyboards/planck/keymaps/abishalom/keymap.c
index 91dadb2c3a..5844922775 100644
--- a/keyboards/planck/keymaps/abishalom/keymap.c
+++ b/keyboards/planck/keymaps/abishalom/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______,  _______,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/corvec/keymap.c b/keyboards/planck/keymaps/corvec/keymap.c
index fc9f2e4985..c3029adc7b 100644
--- a/keyboards/planck/keymaps/corvec/keymap.c
+++ b/keyboards/planck/keymaps/corvec/keymap.c
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|      |AS On | AS + |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|AS Rep|AS Off| AS - |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |AS Rep|AS Off| AS - |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      | Reset|
  * `-----------------------------------------------------------------------------------'
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   COLEMAK, _______,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QWERTY ,
   _______, _______, MU_MOD,   AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, KC_ASON, KC_ASUP,
-  _______, MUV_DE,  MUV_IN,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,KC_ASRP, KC_ASOFF,KC_ASDN,
+  _______, MUV_DE,  MUV_IN,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, KC_ASRP, KC_ASOFF,KC_ASDN,
   _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
 )
 
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
index c34130f36f..31a273be51 100644
--- a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
@@ -158,16 +158,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 8041e0bada..63817e3d48 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
diff --git a/keyboards/planck/keymaps/dodger/keymap.c b/keyboards/planck/keymaps/dodger/keymap.c
index 2a7486f2de..a0fede5fa0 100644
--- a/keyboards/planck/keymaps/dodger/keymap.c
+++ b/keyboards/planck/keymaps/dodger/keymap.c
@@ -118,8 +118,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   EEP_RST, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______,  _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______,  TERM_ON, TERM_OFF, _______, _______, _______,
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______,  _______,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
@@ -235,4 +235,4 @@ void matrix_init_user(void) {
 void keyboard_post_init_user(void) {
   rgblight_sethsv_noeeprom(0, 0, 0);
   rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-}
\ No newline at end of file
+}
diff --git a/keyboards/planck/keymaps/dudeofawesome/keymap.c b/keyboards/planck/keymaps/dudeofawesome/keymap.c
index ad515032b6..951cb45692 100644
--- a/keyboards/planck/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/planck/keymaps/dudeofawesome/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
     KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index 1d5ea41c74..bedfd0e446 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -141,16 +141,16 @@ LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |PowOff|      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    KC_POWER,_______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    KC_POWER,_______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/emiller/keymap.c b/keyboards/planck/keymaps/emiller/keymap.c
index cab0193ceb..e1c065d76c 100644
--- a/keyboards/planck/keymaps/emiller/keymap.c
+++ b/keyboards/planck/keymaps/emiller/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/eshesh2/keymap.c b/keyboards/planck/keymaps/eshesh2/keymap.c
index 672d28ea3c..1e958ca4e7 100644
--- a/keyboards/planck/keymaps/eshesh2/keymap.c
+++ b/keyboards/planck/keymaps/eshesh2/keymap.c
@@ -117,16 +117,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Numpad|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX,  XXXXXXX, NUMPAD,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, NUMPAD,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/eshesh2/readme.md b/keyboards/planck/keymaps/eshesh2/readme.md
index 73510c2028..f5ee73f1e6 100644
--- a/keyboards/planck/keymaps/eshesh2/readme.md
+++ b/keyboards/planck/keymaps/eshesh2/readme.md
@@ -58,7 +58,7 @@ eshesh2's Planck layout with a rotary encoder on the top left of the Planck. It
     |------+------+------+------+------+------+------+------+------+------+------+------|
     |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Numpad|      |
     |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+    |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
     |------+------+------+------+------+------+------+------+------+------+------+------|
     |      |      |      |      |      |             |      |      |      |      |      |
     `-----------------------------------------------------------------------------------'
diff --git a/keyboards/planck/keymaps/fabian/keymap.c b/keyboards/planck/keymaps/fabian/keymap.c
index 54d17cd51e..2244703410 100644
--- a/keyboards/planck/keymaps/fabian/keymap.c
+++ b/keyboards/planck/keymaps/fabian/keymap.c
@@ -172,10 +172,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/foreveranapple/keymap.c b/keyboards/planck/keymaps/foreveranapple/keymap.c
index ade51d5a3c..1b8ad9e3ea 100644
--- a/keyboards/planck/keymaps/foreveranapple/keymap.c
+++ b/keyboards/planck/keymaps/foreveranapple/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|NixQty| OSX  |Plover|Colemk|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
@@ -205,7 +205,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NIXQWERTY, OSX,     PLOVER,  COLEMAK,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,  DVORAK,  _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,   DVORAK,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/fsck/keymap.c b/keyboards/planck/keymaps/fsck/keymap.c
index f1043d53d2..1aee2b7daa 100644
--- a/keyboards/planck/keymaps/fsck/keymap.c
+++ b/keyboards/planck/keymaps/fsck/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/grahampheath/keymap.c b/keyboards/planck/keymaps/grahampheath/keymap.c
index cfb15ab9a5..d4c7c76deb 100644
--- a/keyboards/planck/keymaps/grahampheath/keymap.c
+++ b/keyboards/planck/keymaps/grahampheath/keymap.c
@@ -213,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/hvp/keymap.c b/keyboards/planck/keymaps/hvp/keymap.c
index 1aad239301..fe17924f2b 100644
--- a/keyboards/planck/keymaps/hvp/keymap.c
+++ b/keyboards/planck/keymaps/hvp/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  AG_NORM, AG_SWAP, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______,
   _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, KC_4, KC_5, KC_6, _______, _______,
   KC_PSCR, MUV_DE, MUV_IN, MU_ON, MU_OFF, _______, _______,  KC_0, KC_1, KC_2, KC_3, _______,
-  QK_BOOT, _______, TERM_ON, TERM_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, DEBUG
+  QK_BOOT, _______, _______, _______, MI_ON, MI_OFF, _______, _______, _______, _______, _______, DEBUG
 )};
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/jasperla/keymap.c b/keyboards/planck/keymaps/jasperla/keymap.c
index 8153aa33b7..151b32cf18 100644
--- a/keyboards/planck/keymaps/jasperla/keymap.c
+++ b/keyboards/planck/keymaps/jasperla/keymap.c
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, _______, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/jdelkins/keymap.c b/keyboards/planck/keymaps/jdelkins/keymap.c
index 8a039bc00e..0931342c2f 100644
--- a/keyboards/planck/keymaps/jdelkins/keymap.c
+++ b/keyboards/planck/keymaps/jdelkins/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* [_ADJUST] = LAYOUT( */
 /*     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL , */
 /*     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______, */
-/*     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______, */
+/*     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, */
 /*     _______, _______, _______, _______,      _______,          _______,     _______, _______, _______,  _______ */
 /* ) */
 
diff --git a/keyboards/planck/keymaps/jirgn/keymap.c b/keyboards/planck/keymaps/jirgn/keymap.c
index edbb3fbed7..6a180a7239 100644
--- a/keyboards/planck/keymaps/jirgn/keymap.c
+++ b/keyboards/planck/keymaps/jirgn/keymap.c
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *              `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  PLOVER,  _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kelorean/keymap.c b/keyboards/planck/keymaps/kelorean/keymap.c
index 8128f62302..fe31f1f1fa 100644
--- a/keyboards/planck/keymaps/kelorean/keymap.c
+++ b/keyboards/planck/keymaps/kelorean/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/khord/keymap.c b/keyboards/planck/keymaps/khord/keymap.c
index 19166dbf4e..93e405feca 100644
--- a/keyboards/planck/keymaps/khord/keymap.c
+++ b/keyboards/planck/keymaps/khord/keymap.c
@@ -106,10 +106,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, ADMIN,   SMSPC1,  KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  M_BRDFT, M_BRINC, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  M_BRTOG, M_BRDEC, C_A_INS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, C_A_DEL
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, ADMIN,   SMSPC1,  KC_DEL ,
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, M_BRDFT, M_BRINC, _______,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, M_BRTOG, M_BRDEC, C_A_INS,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_A_DEL
 )
 
 };
diff --git a/keyboards/planck/keymaps/kifinnsson/keymap.c b/keyboards/planck/keymaps/kifinnsson/keymap.c
index daee15842c..450d860022 100644
--- a/keyboards/planck/keymaps/kifinnsson/keymap.c
+++ b/keyboards/planck/keymaps/kifinnsson/keymap.c
@@ -169,16 +169,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * |      |      |      |      |      |AGnorm|AGswap|      |Colemk|      |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |TermOn|TrmOff|      |      |      |
+     * |      |      |      |      |      |      |      |      |      |      |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * |      |      |      |      |      |      |      |      |      |      |      |      |
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-        _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, TERM_ON, TERM_OFF, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+        _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
         )
     };
 
diff --git a/keyboards/planck/keymaps/kloki/keymap.c b/keyboards/planck/keymaps/kloki/keymap.c
index 4320e12a72..9df9edbde7 100644
--- a/keyboards/planck/keymaps/kloki/keymap.c
+++ b/keyboards/planck/keymaps/kloki/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, _______, QWERTY,  WORKMAN, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kmontag42/keymap.c b/keyboards/planck/keymaps/kmontag42/keymap.c
index f3d3a6dcfb..548c30b803 100644
--- a/keyboards/planck/keymaps/kmontag42/keymap.c
+++ b/keyboards/planck/keymaps/kmontag42/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/lja83/keymap.c b/keyboards/planck/keymaps/lja83/keymap.c
index 8aaeef3a0f..6169196817 100644
--- a/keyboards/planck/keymaps/lja83/keymap.c
+++ b/keyboards/planck/keymaps/lja83/keymap.c
@@ -160,16 +160,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
 [_NAV] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/mgalisa/keymap.c b/keyboards/planck/keymaps/mgalisa/keymap.c
index 11fb309851..64a1759ba9 100644
--- a/keyboards/planck/keymaps/mgalisa/keymap.c
+++ b/keyboards/planck/keymaps/mgalisa/keymap.c
@@ -194,10 +194,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/mikethetiger/keymap.c b/keyboards/planck/keymaps/mikethetiger/keymap.c
index 35c6917bbf..5fa664bea2 100644
--- a/keyboards/planck/keymaps/mikethetiger/keymap.c
+++ b/keyboards/planck/keymaps/mikethetiger/keymap.c
@@ -163,10 +163,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/msiu/keymap.c b/keyboards/planck/keymaps/msiu/keymap.c
index afcc799c44..b2576f3bdd 100644
--- a/keyboards/planck/keymaps/msiu/keymap.c
+++ b/keyboards/planck/keymaps/msiu/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, _______, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF,_______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
diff --git a/keyboards/planck/keymaps/muzfuz/keymap.c b/keyboards/planck/keymaps/muzfuz/keymap.c
index 985f4b9dee..10120dece4 100644
--- a/keyboards/planck/keymaps/muzfuz/keymap.c
+++ b/keyboards/planck/keymaps/muzfuz/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_planck_grid(
         _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
         _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
-        _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
+        _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
 
 };
diff --git a/keyboards/planck/keymaps/myoung34/keymap.c b/keyboards/planck/keymaps/myoung34/keymap.c
index 714b7b3a89..b58688c393 100644
--- a/keyboards/planck/keymaps/myoung34/keymap.c
+++ b/keyboards/planck/keymaps/myoung34/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL ,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/pevecyan/keymap.c b/keyboards/planck/keymaps/pevecyan/keymap.c
index 2b7518f22c..eb5ed928bd 100644
--- a/keyboards/planck/keymaps/pevecyan/keymap.c
+++ b/keyboards/planck/keymaps/pevecyan/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/pickle_jr/keymap.c b/keyboards/planck/keymaps/pickle_jr/keymap.c
index 48ce0e645a..0d2e772955 100644
--- a/keyboards/planck/keymaps/pickle_jr/keymap.c
+++ b/keyboards/planck/keymaps/pickle_jr/keymap.c
@@ -167,10 +167,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-  _______, _______, _______, _______, _______, KC_TRNS, KC_TRNS, _______, _______,  _______, _______, _______
+  _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, KC_TRNS, KC_TRNS, _______, _______, _______, _______, _______
 )
 
 
diff --git a/keyboards/planck/keymaps/pjanx/keymap.c b/keyboards/planck/keymaps/pjanx/keymap.c
index 9e191324c3..9444cf13d4 100644
--- a/keyboards/planck/keymaps/pjanx/keymap.c
+++ b/keyboards/planck/keymaps/pjanx/keymap.c
@@ -158,15 +158,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |  M1  |  M2  |  M3  |      |      |             |      |  <-  |  vv  |  ^^  |  ->  |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
 )
 
diff --git a/keyboards/planck/keymaps/prog_qgmlwb/src/special.h b/keyboards/planck/keymaps/prog_qgmlwb/src/special.h
index de05db2070..3645b3603b 100644
--- a/keyboards/planck/keymaps/prog_qgmlwb/src/special.h
+++ b/keyboards/planck/keymaps/prog_qgmlwb/src/special.h
@@ -12,7 +12,7 @@
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      | XXXX |MusMod|AudOff| AudOn|AgNorm|AgSwap|Dvorak|Colmak|Qwerty|QgmlEN|QgmlNO|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|MusOff| MusOn|MIDIOf|MIDIOn|TermOf|TermOn|  T0  |  T1  |  T2  |
+ * |      |Voice-|Voice+|MusOff| MusOn|MIDIOf|MIDIOn|      |      |  T0  |  T1  |  T2  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      | XXXX | XXXX | XXXX | XXXX |
  * `-----------------------------------------------------------------------------------'
@@ -20,7 +20,7 @@
 #define adjust_map LAYOUT_ortho_4x12(\
     QK_RBT,  QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD,    RGB_SAI,     RGB_VAD,    RGB_VAI,       KC_DEL,\
     QK_MAKE, XXXXXXX, MU_MOD,  AU_OFF,  AU_ON,   AG_NORM, AG_SWAP, DF(DVORAK), DF(COLEMAK), DF(QWERTY), DF(QGMLWB_EN), DF(QGMLWB_NO),\
-    _______, MUV_IN,  MUV_DE,  MU_OFF,  MU_ON,   MI_OFF,  MI_ON,   TERM_OFF,   TERM_ON,     KC_T0,      KC_T1,         KC_T2,\
+    _______, MUV_IN,  MUV_DE,  MU_OFF,  MU_ON,   MI_OFF,  MI_ON,   _______,    _______,     KC_T0,      KC_T1,         KC_T2,\
     _______, _______, _______, _______, _______, _______, _______, _______,    XXXXXXX,     XXXXXXX,    XXXXXXX,       XXXXXXX\
 )
 
diff --git a/keyboards/planck/keymaps/ptillemans/keymap.c b/keyboards/planck/keymaps/ptillemans/keymap.c
index cb240e80aa..025dbc5e55 100644
--- a/keyboards/planck/keymaps/ptillemans/keymap.c
+++ b/keyboards/planck/keymaps/ptillemans/keymap.c
@@ -146,10 +146,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  QWERTY,  DVORAK,  PLOVER,  _______,
-    BACKLIT, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  QWERTY, DVORAK,  PLOVER,  _______,
+    BACKLIT, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
 
diff --git a/keyboards/planck/keymaps/raffle/keymap.c b/keyboards/planck/keymaps/raffle/keymap.c
index 436db90e2c..6ebce40f72 100644
--- a/keyboards/planck/keymaps/raffle/keymap.c
+++ b/keyboards/planck/keymaps/raffle/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/rodhaene/keymap.c b/keyboards/planck/keymaps/rodhaene/keymap.c
index 1732e19a3d..8441ee5a64 100644
--- a/keyboards/planck/keymaps/rodhaene/keymap.c
+++ b/keyboards/planck/keymaps/rodhaene/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NUMPAD, _______, _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index c289c50e5b..ea9a85dba1 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -380,7 +380,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FEATURS] = LAYOUT_planck_mit(                                                                                                         //
         LCTL(LALT(KC_DEL)), DO_RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, TD(TD_DEG_DEGF), TD(TD_SMILEY), KC_DEL,  //
         RGB_VAI, RGB_VAD, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DF(_BASE), DF(_COLEMAK), DF(_DVORAK), TO(_PLOVER), MY_RGBCON,            //
-        KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, CK_ON, CK_OFF, KC_ENTER,                                  //
+        KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_TRNS, KC_TRNS, CK_ON, CK_OFF, KC_ENTER,                                  //
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(_MOUSY), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     /*
     Special Features Layer [6]
@@ -389,7 +389,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |RGBVAI|RGBVAD|MU_MOD| AU_ON|AU_OFF|RALTGU|SALTGU| Base |Colemk|Dvorak|Plover|RGBCON|
     * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |------|MUV_DE|MUV_IN| MU_ON|MU_OFF| MI_ON|MI_OFF|TERMON|TRMOFF|CLK-ON|CLKOFF|Enter |
+    * |------|MUV_DE|MUV_IN| MU_ON|MU_OFF| MI_ON|MI_OFF|------|------|CLK-ON|CLKOFF|Enter |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |------|------|------|------|------|    TG(8)    |------|------|------|------|------|
     * `-----------------------------------------------------------------------------------'
diff --git a/keyboards/planck/keymaps/smittey/keymap.c b/keyboards/planck/keymaps/smittey/keymap.c
index f8d3f4b1bb..02ad2bf36f 100644
--- a/keyboards/planck/keymaps/smittey/keymap.c
+++ b/keyboards/planck/keymaps/smittey/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_planck_grid(
       QK_BOOT, QWERTY,  XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MI_OFF,   MI_ON,   KC_DEL,
       XXXXXXX, XXXXXXX, XXXXXXX,   DVORAK,    XXXXXXX,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX,   AU_OFF,   AU_ON,   XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX,   COLEMAK,   XXXXXXX,  XXXXXXX, XXXXXXX, TERM_ON, TERM_OFF,  MU_OFF,   MU_ON,   XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX,   COLEMAK,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MU_OFF,   MU_ON,   XXXXXXX,
       PLOVER,  XXXXXXX, XXXXXXX,   XXXXXXX,   _______,  XXXXXXX, XXXXXXX, _______, XXXXXXX,   MUV_DE,   MUV_IN,  XXXXXXX
   ),
 
diff --git a/keyboards/planck/keymaps/stuartfong1/keymap.c b/keyboards/planck/keymaps/stuartfong1/keymap.c
index c394a9db81..721ffcdc05 100644
--- a/keyboards/planck/keymaps/stuartfong1/keymap.c
+++ b/keyboards/planck/keymaps/stuartfong1/keymap.c
@@ -168,16 +168,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |Plover|      |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+     * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * |      |      |      |      |      |      |      |      |      |      |      |      |
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        XXXXXXX, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, XXXXXXX, 
-        XXXXXXX, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,   XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX
+        XXXXXXX, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, 
+        XXXXXXX, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,  XXXXXXX, XXXXXXX, XXXXXXX, 
+        XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
     )
 };
 
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
index 6d101f3a3f..983ab20c7d 100644
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ b/keyboards/planck/keymaps/tom/keymap.c
@@ -104,9 +104,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     C(G(S(KC_4))), QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______,  _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/tomkonidas/keymap.c b/keyboards/planck/keymaps/tomkonidas/keymap.c
index e0232f69ec..c0d4860e12 100644
--- a/keyboards/planck/keymaps/tomkonidas/keymap.c
+++ b/keyboards/planck/keymaps/tomkonidas/keymap.c
@@ -157,16 +157,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/tomkonidas/readme.md b/keyboards/planck/keymaps/tomkonidas/readme.md
index 34c2147604..fa62bf8be7 100644
--- a/keyboards/planck/keymaps/tomkonidas/readme.md
+++ b/keyboards/planck/keymaps/tomkonidas/readme.md
@@ -79,7 +79,7 @@
  |------+------+------+------+------+------+------+------+------+------+------+------|
  |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  |------+------+------+------+------+------+------+------+------+------+------+------|
  |      |      |      |      |      |      |      |      |      |      |      |      |
  `-----------------------------------------------------------------------------------'
diff --git a/keyboards/planck/keymaps/unagi/keymap.c b/keyboards/planck/keymaps/unagi/keymap.c
index e75e7386bc..1ab53ba02e 100644
--- a/keyboards/planck/keymaps/unagi/keymap.c
+++ b/keyboards/planck/keymaps/unagi/keymap.c
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/thk/keymaps/thk/keymap.c b/keyboards/planck/thk/keymaps/thk/keymap.c
index e7d58d2d0b..effac4d90d 100644
--- a/keyboards/planck/thk/keymaps/thk/keymap.c
+++ b/keyboards/planck/thk/keymaps/thk/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |TermOn|TermOf|      |      |      |
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
   _______, _______, _______,  _______,   _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
-  _______, _______,  _______,  _______,   _______,  _______,   _______,  TERM_ON, TERM_OFF, _______, _______, _______,
+  _______, _______,  _______,  _______,   _______,  _______,   _______,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
 )
 
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
index c4e0f132d8..6a40a58226 100644
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, _______,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
diff --git a/keyboards/preonic/keymaps/blake-newman/keymap.c b/keyboards/preonic/keymaps/blake-newman/keymap.c
index 53a4cf78f0..311a96f15e 100644
--- a/keyboards/preonic/keymaps/blake-newman/keymap.c
+++ b/keyboards/preonic/keymaps/blake-newman/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [_ADJUST] = LAYOUT_preonic_1x2uC( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,  \
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,  \
     KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  NUMPAD,  KC_INS,  \
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
diff --git a/keyboards/preonic/keymaps/boy314/keymap.c b/keyboards/preonic/keymaps/boy314/keymap.c
index 67d1fe4cf8..b5089be5dd 100644
--- a/keyboards/preonic/keymaps/boy314/keymap.c
+++ b/keyboards/preonic/keymaps/boy314/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  DVORAK,  _______, _______, _______, _______, \
   _______, ARROWS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/cranium/keymap.c b/keyboards/preonic/keymaps/cranium/keymap.c
index 8267a0a4be..c423d8dac4 100644
--- a/keyboards/preonic/keymaps/cranium/keymap.c
+++ b/keyboards/preonic/keymaps/cranium/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, _______,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, KC_PSCR
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c
index c1faf464d6..0d886ba451 100644
--- a/keyboards/preonic/keymaps/default/keymap.c
+++ b/keyboards/preonic/keymaps/default/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset| Debug|      |      |      |      |TermOf|TermOn|      |      |  Del |
+ * |      | Reset| Debug|      |      |      |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |Aud cy|Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
diff --git a/keyboards/preonic/keymaps/drasbeck/keymap.c b/keyboards/preonic/keymaps/drasbeck/keymap.c
index a3bfbb4760..da2ab145ca 100644
--- a/keyboards/preonic/keymaps/drasbeck/keymap.c
+++ b/keyboards/preonic/keymaps/drasbeck/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/dudeofawesome/keymap.c b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
index 932b76df3e..b5c308d2fd 100644
--- a/keyboards/preonic/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/ekis_isa/keymap.c b/keyboards/preonic/keymaps/ekis_isa/keymap.c
index ff2bfdb0f1..04051a865e 100644
--- a/keyboards/preonic/keymaps/ekis_isa/keymap.c
+++ b/keyboards/preonic/keymaps/ekis_isa/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/elisiano/keymap.c b/keyboards/preonic/keymaps/elisiano/keymap.c
index c7ec076ca7..3f0a528247 100644
--- a/keyboards/preonic/keymaps/elisiano/keymap.c
+++ b/keyboards/preonic/keymaps/elisiano/keymap.c
@@ -158,11 +158,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON,    TERM_OFF, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,     COLEMAK,  DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TG(_MOUSE), _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______
+  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, DEBUG,   _______, _______, _______, _______, _______,    _______, _______, _______, KC_DEL,
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,     COLEMAK, DVORAK,  _______, _______,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TG(_MOUSE), _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______
 ),
 
 
diff --git a/keyboards/preonic/keymaps/fsck/keymap.c b/keyboards/preonic/keymaps/fsck/keymap.c
index cdb5bf1acc..cb73083249 100644
--- a/keyboards/preonic/keymaps/fsck/keymap.c
+++ b/keyboards/preonic/keymaps/fsck/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/keelhauler/keymap.c b/keyboards/preonic/keymaps/keelhauler/keymap.c
index d6adc08adb..8a1c01617c 100644
--- a/keyboards/preonic/keymaps/keelhauler/keymap.c
+++ b/keyboards/preonic/keymaps/keelhauler/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index d9df9f16ef..9c26e715fd 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -277,7 +277,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_preonic_grid( \
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,
-        KC_TAB,  QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, XXXXXXX,
+        KC_TAB,  QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
     /*_______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,	 QWERTY,  COLEMAK, DVORAK,  _______, _______, \ Remove this if adding Colemak and Dvorak*/
         _______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,   QWERTY,  QWWIN,   _______, _______, KC_F12,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
diff --git a/keyboards/preonic/keymaps/mechmaster48/keymap.c b/keyboards/preonic/keymaps/mechmaster48/keymap.c
index 9fcb737490..3d89d25d35 100644
--- a/keyboards/preonic/keymaps/mechmaster48/keymap.c
+++ b/keyboards/preonic/keymaps/mechmaster48/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset| Debug|      |      |      |      |TermOf|TermOn|      |      |  Del |
+ * |      | Reset| Debug|      |      |      |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |Aud cy|Aud on|AudOff|AGnorm|AGswap|Qwerty|      |      |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/mguterl/keymap.c b/keyboards/preonic/keymaps/mguterl/keymap.c
index 184c111aef..dcbb16d612 100644
--- a/keyboards/preonic/keymaps/mguterl/keymap.c
+++ b/keyboards/preonic/keymaps/mguterl/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  TG_GAME, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,
+  TG_GAME, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/mikethetiger/keymap.c b/keyboards/preonic/keymaps/mikethetiger/keymap.c
index 1fb41129cd..a927793a4f 100644
--- a/keyboards/preonic/keymaps/mikethetiger/keymap.c
+++ b/keyboards/preonic/keymaps/mikethetiger/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/muzfuz/keymap.c b/keyboards/preonic/keymaps/muzfuz/keymap.c
index 6baf32a51e..1b32c2143e 100644
--- a/keyboards/preonic/keymaps/muzfuz/keymap.c
+++ b/keyboards/preonic/keymaps/muzfuz/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
         _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
         _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
-        _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
+        _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
 
 };
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index 03388d785b..0a5637b980 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |AudTog|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX| Debug| Reset|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |ClkTog|ClkFq-|ClkFq+|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|TermOn|TermOf|
+ * |ClkTog|ClkFq-|ClkFq+|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |MusTog|Voice- Voice+|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|XXXXXX|AGnorm|AGswap|
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -229,7 +229,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC (
   AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
-  CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TERM_ON, TERM_OFF,
+  CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSHIFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_TOG,     _______, XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index a54b547d8c..07c5aa7b8f 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------.
  * |AudTog |███████|███████|███████|███████|███████|███████|███████|███████|███████| Debug | Reset |
  * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
- * |Clicky |ClkFrq-|ClkFrq+|███████|███████|███████|███████|███████|███████|███████|TermOn |TermOff|
+ * |Clicky |ClkFrq-|ClkFrq+|███████|███████|███████|███████|███████|███████|███████|███████|███████|
  * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
  * | Music |Voice- |Voice+ |███████|███████|███████|███████|███████|███████|███████|AGnorm |AGswap |
  * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
@@ -205,7 +205,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_2x2u (
   AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
-  CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TERM_ON, TERM_OFF,
+  CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSHIFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     _______,          _______,      XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
diff --git a/keyboards/preonic/keymaps/pezhore/keymap.c b/keyboards/preonic/keymaps/pezhore/keymap.c
index 46addbca48..4754ad760c 100644
--- a/keyboards/preonic/keymaps/pezhore/keymap.c
+++ b/keyboards/preonic/keymaps/pezhore/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  TERM_ON,  TERM_OFF, _______,  _______,  KC_DEL,
+  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
   _______,  _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  _______,  _______,  _______,  _______,  _______,
   _______,  MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/preonic/keymaps/pitty/keymap.c b/keyboards/preonic/keymaps/pitty/keymap.c
index 249ff16a76..03b1fdd806 100644
--- a/keyboards/preonic/keymaps/pitty/keymap.c
+++ b/keyboards/preonic/keymaps/pitty/keymap.c
@@ -137,8 +137,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______, _______, _______, \
+  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
 )
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
index 531b08285f..73c8391185 100644
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ b/keyboards/preonic/keymaps/senseored/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  TO(_GAMEMODE), QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  TO(_GAMEMODE), QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
index 6d1c9d812e..194eac9d89 100644
--- a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * .--------------------------------------------------------------------------------------------------------------------------------------.
      * | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | Reset  | Debug  |        |        |        |        | TermOf | TermOn |        |        | Del    |        |        |        |
+     * |        | Reset  | Debug  |        |        |        |        |        |        |        |        | Del    |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
      * |        |        |        |        |        | AGNorm | AGSwap | QWERTY | STENO  |        |        | PLAIN  |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -121,11 +121,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------------------------------------------------------------------------------------------------------------------------------------'
      */
     [_BOTH] = LAYOUT_ortho_5x15(
-	KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, 
-	_______,  QK_BOOT, DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, _______, _______, KC_DEL,  _______, _______, _______, 
-	_______,  _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  STENO,    _______, _______, RGB_M_P, _______, _______, _______, 
-	RGB_MOD,  _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI,  RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, 
-	RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______)
+	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, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  _______, _______, _______, 
+	_______,  _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  STENO,   _______, _______, RGB_M_P, _______, _______, _______, 
+	RGB_MOD,  _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, 
+	RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______)
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/readme.md b/keyboards/xiudi/xd75/keymaps/raoeus/readme.md
index 40da8596e5..fdb1095881 100644
--- a/keyboards/xiudi/xd75/keymaps/raoeus/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/raoeus/readme.md
@@ -66,7 +66,7 @@ To compile _and_ flash, please run `make xiudi/xd75:raoeus:flash`
      * .--------------------------------------------------------------------------------------------------------------------------------------.
      * | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | Reset  | Debug  |        |        |        |        | TermOf | TermOn |        |        | Del    |        |        |        |
+     * |        | Reset  | Debug  |        |        |        |        |        |        |        |        | Del    |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
      * |        |        |        |        |        | AGNorm | AGSwap | QWERTY | STENO  |        |        | PLAIN  |        |        |        |
      * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/layouts/community/ortho_4x12/jackhumbert/keymap.c b/layouts/community/ortho_4x12/jackhumbert/keymap.c
index ed637b7c30..c297a63b37 100644
--- a/layouts/community/ortho_4x12/jackhumbert/keymap.c
+++ b/layouts/community/ortho_4x12/jackhumbert/keymap.c
@@ -112,16 +112,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, _______,
-    _______, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, XXXXXXX, XXXXXXX, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+    _______, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/layouts/community/ortho_4x12/jjerrell/keymap.c b/layouts/community/ortho_4x12/jjerrell/keymap.c
index d873907e91..90b7714ec4 100644
--- a/layouts/community/ortho_4x12/jjerrell/keymap.c
+++ b/layouts/community/ortho_4x12/jjerrell/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust (Lower + Raise)
     * ,-----------------------------------------------------------------------------------.
-    * | Make | Debug|Reset |TermOn|TrmOff|      |      |MusMod|Mus On|MusOff|MidiOn|MidOff|
+    * | Make | Debug|Reset |      |      |      |      |MusMod|Mus On|MusOff|MidiOn|MidOff|
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * | Mute | Vol- | Vol+ | Play | Skip |      |      |Voice-| HUE+ | HUE- | SAT+ | SAT- |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/layouts/community/ortho_4x12/juno/keymap.c b/layouts/community/ortho_4x12/juno/keymap.c
index 1c9b4af891..5961b62d28 100644
--- a/layouts/community/ortho_4x12/juno/keymap.c
+++ b/layouts/community/ortho_4x12/juno/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_ADJUST] = LAYOUT_ortho_4x12(
 		_______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
 		_______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-		_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+		_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 	),
 
diff --git a/layouts/community/ortho_4x12/junonum/keymap.c b/layouts/community/ortho_4x12/junonum/keymap.c
index b5ed159f6a..45de5a9b74 100644
--- a/layouts/community/ortho_4x12/junonum/keymap.c
+++ b/layouts/community/ortho_4x12/junonum/keymap.c
@@ -89,10 +89,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_ortho_4x12(
-        _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-        _______, AG_NORM, MU_MOD,  AU_ON,   AU_OFF,  CG_NORM, CG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-        _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+        _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+        _______, AG_NORM, MU_MOD,  AU_ON,   AU_OFF,  CG_NORM, CG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+        _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
     [_FN1] = LAYOUT_ortho_4x12(
diff --git a/layouts/community/ortho_4x12/mguterl/keymap.c b/layouts/community/ortho_4x12/mguterl/keymap.c
index e57fb0c47f..ed089d6e6d 100644
--- a/layouts/community/ortho_4x12/mguterl/keymap.c
+++ b/layouts/community/ortho_4x12/mguterl/keymap.c
@@ -158,16 +158,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    TG_GAME, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    TG_GAME, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/users/jjerrell/wrappers.h b/users/jjerrell/wrappers.h
index cc0f963e8d..322dbd12f6 100644
--- a/users/jjerrell/wrappers.h
+++ b/users/jjerrell/wrappers.h
@@ -319,9 +319,9 @@
 #define __________________RAISE_R3___________________   KC_AT,   KC_QUOT, KC_DQUO, KC_PLUS, KC_CIRC
 
 // Adjust
-#define __________________ADJUST_L1__________________   KC_MAKE,        DEBUG,     RESET, TERM_ON, TERM_OFF
-#define __________________ADJUST_L2__________________   KC__MUTE, KC__VOLDOWN, KC__VOLUP, KC_MPLY,  KC_MNXT
-#define __________________ADJUST_L3__________________   KC_VRSN,        AU_ON,    AU_OFF, CG_SWAP,  CG_NORM
+#define __________________ADJUST_L1__________________   KC_MAKE,        DEBUG,     RESET, XXXXXXX, XXXXXXX
+#define __________________ADJUST_L2__________________   KC__MUTE, KC__VOLDOWN, KC__VOLUP, KC_MPLY, KC_MNXT
+#define __________________ADJUST_L3__________________   KC_VRSN,        AU_ON,    AU_OFF, CG_SWAP, CG_NORM
 
 #define __________________ADJUST_R1__________________   MU_MOD, MU_ON,   MU_OFF,  MI_ON,   MI_OFF
 #define __________________ADJUST_R2__________________   MUV_IN, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD
diff --git a/users/muppetjones/wrappers.h b/users/muppetjones/wrappers.h
index 301554f5d5..ba94d0eda4 100644
--- a/users/muppetjones/wrappers.h
+++ b/users/muppetjones/wrappers.h
@@ -65,7 +65,7 @@
  * `----------------------------------' `----------------------------------'
  */
  // NOTE: The "BACKLIT" keycode is planck specific
-#define __ADJUST_L1________________________________ RESET,   DEBUG,   XXXXXXX, TERM_ON, TERM_OFF
+#define __ADJUST_L1________________________________ RESET,   DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX
 #define __ADJUST_L2________________________________ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD
 #define __ADJUST_L3________________________________ XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX
 
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index 63e73c32e6..e30427b3cd 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -96,7 +96,7 @@
   * ,-----------------------------------------.  ,-----------------------------------------.
   * |      |      |      |      |      |      |  |      |      |      |      |      |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |      | RESET| DEBUG|      |      |      |  |      |TERM_ON|TERM_OFF|   |      |      |
+  * |      | RESET| DEBUG|      |      |      |  |      |      |      |   |      |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
   * |      |      |MusMod|Aud on|AudOff|AGnorm|  |AGswap|ClkUp |ClkDwn|      |      |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
@@ -113,7 +113,7 @@
 #define _________________ADJUST_L5_________________ _______,  _______,  _______,  _______,  _______,  _______
 
 #define _________________ADJUST_R1_________________           _______,  _______,  _______,  _______,  _______,  _______
-#define _________________ADJUST_R2_________________           _______,  TERM_ON,  TERM_OFF, _______,  _______,  _______
+#define _________________ADJUST_R2_________________           _______,  _______,  _______,  _______,  _______,  _______
 #define _________________ADJUST_R3_________________           AG_SWAP,  CK_UP,    CK_DOWN,  _______,  _______,  _______
 #define _________________ADJUST_R4_________________           MI_OFF,   CK_ON,    CK_OFF,   _______,  _______,  _______
 #define _________________ADJUST_R5_________________           _______,  _______,  _______,  _______,  _______,  _______

From 83776b44b3ee7ff95cef9481dee023d98528e5e6 Mon Sep 17 00:00:00 2001
From: Joseph Fass <joseph.fass@gmail.com>
Date: Thu, 29 Sep 2022 20:44:25 -0700
Subject: [PATCH 504/959] [Keyboard] Add handwired tkk diodeless keyboard
 (#18379)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/handwired/tkk/info.json             | 42 +++++++++++++++
 .../handwired/tkk/keymaps/default/keymap.c    | 53 +++++++++++++++++++
 keyboards/handwired/tkk/readme.md             | 34 ++++++++++++
 keyboards/handwired/tkk/rules.mk              |  1 +
 4 files changed, 130 insertions(+)
 create mode 100644 keyboards/handwired/tkk/info.json
 create mode 100644 keyboards/handwired/tkk/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/tkk/readme.md
 create mode 100644 keyboards/handwired/tkk/rules.mk

diff --git a/keyboards/handwired/tkk/info.json b/keyboards/handwired/tkk/info.json
new file mode 100644
index 0000000000..032b2c10f7
--- /dev/null
+++ b/keyboards/handwired/tkk/info.json
@@ -0,0 +1,42 @@
+{
+    "manufacturer": "Joe Fass",
+    "keyboard_name": "tkk",
+    "maintainer": "jfass",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+		["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6"]
+	]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/tkk/keymaps/default/keymap.c b/keyboards/handwired/tkk/keymaps/default/keymap.c
new file mode 100644
index 0000000000..14367413da
--- /dev/null
+++ b/keyboards/handwired/tkk/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+// Copyright 2022 Joe Fass (@jfass)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * L = left, R = right
+     * T = thumb, I = index, M = middle, R = ring, P = pinky
+     * 
+     *             LP,            LR,              LM,            LI,             LT,            RT,            RI,             RM,             RR,             RP
+     *
+     */
+    [0] = LAYOUT_all(
+          LT(8, KC_A),   LT(7, KC_O),     LT(6, KC_E),   LT(5, KC_U), LT(10,KC_BSPC), LT(9, KC_SPC),   LT(1, KC_H),    LT(2, KC_T),    LT(3, KC_N),    LT(4, KC_S)
+    ),
+    [1] = LAYOUT_all(
+                KC_Q,          KC_K,            KC_J,          KC_I,         KC_ESC,        KC_TAB,         KC_NO,        KC_RGUI,        KC_RGUI,        KC_RGUI
+    ),
+    [2] = LAYOUT_all(
+                 KC_Z,          KC_Y,            KC_X,          KC_P,          KC_NO,         KC_NO,       KC_RCTL,          KC_NO,        KC_RCTL,        KC_RCTL
+    ),
+    [3] = LAYOUT_all(
+              KC_QUOT,       KC_COMM,          KC_DOT,          KC_F,          KC_NO,         KC_NO,       KC_RALT,        KC_RALT,          KC_NO,        KC_RALT
+    ),
+    [4] = LAYOUT_all(
+              KC_SCLN,       KC_LPRN,         KC_RPRN,        KC_GRV,          KC_NO,        MO(11),       KC_RSFT,        KC_RSFT,        KC_RSFT,          KC_NO
+    ),
+    [5] = LAYOUT_all(
+              KC_LGUI,       KC_LGUI,         KC_LGUI,         KC_NO,   LGUI(KC_GRV),  LGUI(KC_TAB),          KC_D,           KC_G,           KC_C,         KC_ENT
+    ),
+    [6] = LAYOUT_all(
+              KC_LCTL,       KC_LCTL,           KC_NO,       KC_LCTL,          KC_NO,         KC_NO,          KC_M,           KC_B,           KC_V,           KC_W
+    ),
+    [7] = LAYOUT_all(
+              KC_LALT,         KC_NO,         KC_LALT,       KC_LALT,          KC_NO,         KC_NO,       KC_SLSH,           KC_L,           KC_R,        KC_BSLS
+    ),
+    [8] = LAYOUT_all(
+                KC_NO,       KC_LSFT,         KC_LSFT,       KC_LSFT,         MO(11),         KC_NO,       KC_MINS,        KC_LBRC,        KC_RBRC,         KC_EQL
+    ),
+    [9] = LAYOUT_all(
+                 KC_1,          KC_2,            KC_3,          KC_4,           KC_5,         KC_NO,       KC_LEFT,        KC_RGHT,          KC_UP,        KC_DOWN
+    ),
+    [10] = LAYOUT_all(
+              KC_PGDN,       KC_PGUP,         KC_HOME,        KC_END,          KC_NO,          KC_6,          KC_7,           KC_8,           KC_9,           KC_0
+    ),
+    [11] = LAYOUT_all(
+              KC_WH_D,       KC_WH_U,         KC_WH_L,       KC_WH_R,        KC_BTN2,       KC_BTN1,       KC_MS_L,        KC_MS_R,        KC_MS_U,        KC_MS_D
+    )
+};
+
+
+
diff --git a/keyboards/handwired/tkk/readme.md b/keyboards/handwired/tkk/readme.md
new file mode 100644
index 0000000000..2693565f84
--- /dev/null
+++ b/keyboards/handwired/tkk/readme.md
@@ -0,0 +1,34 @@
+# tkk
+
+![tkk](https://i.imgur.com/gXAjt3Oh.jpeg)
+
+This is 'tkk', a ten key split keyboard wired as a single "row," ten "column" diode-less numpad. I've been dreaming of my own ten key layout since before discovering [ASETIOP](https://asetniop.com/), and [gboard's Ginny](https://www.gboards.ca/) ... but I'm too new to QMK and too rusty with C to figure out how to modify the Ginny's layout / chording engine. So here we are. The tkk [layout](https://imgur.com/a/eQzhSgw) is built around a vaguely DVORAK-ish letter layout (with some adjustments meant to aid memorization), with "modules" for numbers, movement, modifiers, and even mouse keys.
+
+* Keyboard Maintainer: [Joe Fass](https://github.com/jfass)
+* Hardware Supported: hand-wired, ten switch diode-less keyboard, using a Teensy 2.0
+* Hardware Availability: (forget where I bought the parts, but easy to find)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/tkk:default
+
+Or:
+
+    qmk compile -kb handwired/tkk -km default
+
+In my build environment (Ubuntu), I needed to unset quite a few environment variables like CONDA\_BACKUP\_LDFLAGS that contained hardware options qmk didn't like, before this succeeded.
+
+Flashing example for this keyboard:
+
+    make handwired/tkk:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
diff --git a/keyboards/handwired/tkk/rules.mk b/keyboards/handwired/tkk/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/tkk/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From dc7d2692c6de6e8d5ae11f9cab5f76bbbdbb9c49 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 29 Sep 2022 21:28:12 -0700
Subject: [PATCH 505/959] Grammar Fix for PR Checklist (#18540)

* Grammar Fix for PR Checklist

* Update docs/pr_checklist.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update docs/pr_checklist.md, take 2

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/pr_checklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 6d74e246a8..ed2b466de3 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -113,7 +113,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
 - submitters can also have a "manufacturer-matching" keymap that mirrors existing functionality of the commercial product, if porting an existing board
 - Do not include VIA json files in the PR. These do not belong in the QMK repository as they are not used by QMK firmware -- they belong in the [VIA Keyboard Repo](https://github.com/the-via/keyboards)
 - Do not include source files from another keyboard or vendors keyboard folder. Including core files is fine.
-  - For instance, only `wilba_tech` boards using be including `keyboards/wilba_tech/wt_main.c` and  `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine.
+  - For instance, only `wilba_tech` boards shall include `keyboards/wilba_tech/wt_main.c` and  `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine for any and all boards.
   - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out.
 
 Also, specific to ChibiOS:

From cc8f2c584a08cf5fde497c7d0ed8ad209b7a4646 Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Fri, 30 Sep 2022 13:13:49 +0800
Subject: [PATCH 506/959] [Keyboard] Add yandrstudio/buff67v3 keyboard (#17592)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/yandrstudio/buff67v3/board.h        |  21 +
 keyboards/yandrstudio/buff67v3/buff67v3.c     |  58 +++
 keyboards/yandrstudio/buff67v3/buff67v3.h     |  42 ++
 keyboards/yandrstudio/buff67v3/config.h       |  60 +++
 keyboards/yandrstudio/buff67v3/halconf.h      |  24 ++
 keyboards/yandrstudio/buff67v3/info.json      | 362 ++++++++++++++++++
 .../buff67v3/keymaps/default/keymap.c         |  31 ++
 .../yandrstudio/buff67v3/keymaps/via/keymap.c |  43 +++
 .../yandrstudio/buff67v3/keymaps/via/rules.mk |   1 +
 keyboards/yandrstudio/buff67v3/mcuconf.h      |  25 ++
 keyboards/yandrstudio/buff67v3/readme.md      |  23 ++
 keyboards/yandrstudio/buff67v3/rules.mk       |  17 +
 12 files changed, 707 insertions(+)
 create mode 100644 keyboards/yandrstudio/buff67v3/board.h
 create mode 100644 keyboards/yandrstudio/buff67v3/buff67v3.c
 create mode 100644 keyboards/yandrstudio/buff67v3/buff67v3.h
 create mode 100644 keyboards/yandrstudio/buff67v3/config.h
 create mode 100644 keyboards/yandrstudio/buff67v3/halconf.h
 create mode 100644 keyboards/yandrstudio/buff67v3/info.json
 create mode 100644 keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/buff67v3/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/buff67v3/mcuconf.h
 create mode 100644 keyboards/yandrstudio/buff67v3/readme.md
 create mode 100644 keyboards/yandrstudio/buff67v3/rules.mk

diff --git a/keyboards/yandrstudio/buff67v3/board.h b/keyboards/yandrstudio/buff67v3/board.h
new file mode 100644
index 0000000000..d83804babd
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/buff67v3/buff67v3.c b/keyboards/yandrstudio/buff67v3/buff67v3.c
new file mode 100644
index 0000000000..62a74c82bb
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/buff67v3.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "buff67v3.h"
+
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        rgblight_set_layer_state(0, led_state.caps_lock);
+    }
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+    rgblight_reload_from_eeprom();
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    switch(keycode) {
+        case LOCK_GUI:
+            process_magic(GUI_TOG, record);
+            return false;
+        default:
+            break;
+    }
+    return true;
+}
+
+void board_init(void) {
+    AFIO->MAPR |= AFIO_MAPR_TIM3_REMAP_PARTIALREMAP;
+}
diff --git a/keyboards/yandrstudio/buff67v3/buff67v3.h b/keyboards/yandrstudio/buff67v3/buff67v3.h
new file mode 100644
index 0000000000..dc6f334a58
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/buff67v3.h
@@ -0,0 +1,42 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, K314, \
+	K400, K401, K402,             K405,                   K409, K410,       K412, K413, K414  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO, K312,  K313,  K314 }, \
+	{ K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  K413,  K414 }  \
+}
+
+enum keyboard_keycodes {
+#ifdef VIA_ENABLE
+    LOCK_GUI = USER00,
+    NEW_SAFE_RANGE = SAFE_RANGE  // Important!
+#else
+    LOCK_GUI = SAFE_RANGE,
+    NEW_SAFE_RANGE   // Important!
+#endif
+};
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
new file mode 100644
index 0000000000..81d5654e57
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -0,0 +1,60 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_COL_PINS {  B5,  B6,  B7,  B8,  B9,  C13, C14, B0,  B1,  B2,  B10, B11, B12, A15, B3 }
+#define MATRIX_ROW_PINS {  A3,  A4,  A5,  A7,  C15 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#ifdef RGBLIGHT_ENABLE
+
+#    define RGB_DI_PIN B4
+#    define RGBLED_NUM 1
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_LAYERS_RETAIN_VAL
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+
+#    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.
+
+#endif
+
+
diff --git a/keyboards/yandrstudio/buff67v3/halconf.h b/keyboards/yandrstudio/buff67v3/halconf.h
new file mode 100644
index 0000000000..fca9a1f5f2
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/halconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM TRUE
+
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
new file mode 100644
index 0000000000..07f7dbbe30
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -0,0 +1,362 @@
+{
+    "keyboard_name": "buff67v3",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA88",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "~",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "!",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "@",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "#",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "$",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "%",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "^",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "&",
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "label": "*",
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "label": "(",
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "label": ")",
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "label": "_",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "Backspace",
+                    "x": 13,
+                    "y": 0,
+                    "w": 2
+                },
+                {
+                    "label": "Insert",
+                    "x": 15,
+                    "y": 0
+                },
+                {
+                    "label": "Tab",
+                    "x": 0,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "Q",
+                    "x": 1.5,
+                    "y": 1
+                },
+                {
+                    "label": "W",
+                    "x": 2.5,
+                    "y": 1
+                },
+                {
+                    "label": "E",
+                    "x": 3.5,
+                    "y": 1
+                },
+                {
+                    "label": "R",
+                    "x": 4.5,
+                    "y": 1
+                },
+                {
+                    "label": "T",
+                    "x": 5.5,
+                    "y": 1
+                },
+                {
+                    "label": "Y",
+                    "x": 6.5,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 7.5,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 8.5,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 9.5,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 10.5,
+                    "y": 1
+                },
+                {
+                    "label": "{",
+                    "x": 11.5,
+                    "y": 1
+                },
+                {
+                    "label": "}",
+                    "x": 12.5,
+                    "y": 1
+                },
+                {
+                    "label": "|",
+                    "x": 13.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "PgUp",
+                    "x": 15,
+                    "y": 1
+                },
+                {
+                    "label": "Caps Lock",
+                    "x": 0,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "label": "A",
+                    "x": 1.75,
+                    "y": 2
+                },
+                {
+                    "label": "S",
+                    "x": 2.75,
+                    "y": 2
+                },
+                {
+                    "label": "D",
+                    "x": 3.75,
+                    "y": 2
+                },
+                {
+                    "label": "F",
+                    "x": 4.75,
+                    "y": 2
+                },
+                {
+                    "label": "G",
+                    "x": 5.75,
+                    "y": 2
+                },
+                {
+                    "label": "H",
+                    "x": 6.75,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 7.75,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 8.75,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 9.75,
+                    "y": 2
+                },
+                {
+                    "label": ":",
+                    "x": 10.75,
+                    "y": 2
+                },
+                {
+                    "label": "\"",
+                    "x": 11.75,
+                    "y": 2
+                },
+                {
+                    "label": "Enter",
+                    "x": 12.75,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "label": "PgDn",
+                    "x": 15,
+                    "y": 2
+                },
+                {
+                    "label": "Shift",
+                    "x": 0,
+                    "y": 3,
+                    "w": 2.25
+                },
+                {
+                    "label": "Z",
+                    "x": 2.25,
+                    "y": 3
+                },
+                {
+                    "label": "X",
+                    "x": 3.25,
+                    "y": 3
+                },
+                {
+                    "label": "C",
+                    "x": 4.25,
+                    "y": 3
+                },
+                {
+                    "label": "V",
+                    "x": 5.25,
+                    "y": 3
+                },
+                {
+                    "label": "B",
+                    "x": 6.25,
+                    "y": 3
+                },
+                {
+                    "label": "N",
+                    "x": 7.25,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 8.25,
+                    "y": 3
+                },
+                {
+                    "label": "<",
+                    "x": 9.25,
+                    "y": 3
+                },
+                {
+                    "label": ">",
+                    "x": 10.25,
+                    "y": 3
+                },
+                {
+                    "label": "?",
+                    "x": 11.25,
+                    "y": 3
+                },
+                {
+                    "label": "Shift",
+                    "x": 12.25,
+                    "y": 3,
+                    "w": 1.75
+                },
+                {
+                    "label": "\u2191",
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "Delete",
+                    "x": 15,
+                    "y": 3
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 0,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 1.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 2.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 4,
+                    "w": 6.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 10,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Fn",
+                    "x": 11.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "\u2190",
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "\u2193",
+                    "x": 14,
+                    "y": 4
+                },
+                {
+                    "label": "\u2192",
+                    "x": 15,
+                    "y": 4
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3ca660e9e0
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#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_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+    [1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d88884740e
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#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_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+    [1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, LOCK_GUI,KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/buff67v3/keymaps/via/rules.mk b/keyboards/yandrstudio/buff67v3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/buff67v3/mcuconf.h b/keyboards/yandrstudio/buff67v3/mcuconf.h
new file mode 100644
index 0000000000..3ec9c20128
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef  STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/buff67v3/readme.md b/keyboards/yandrstudio/buff67v3/readme.md
new file mode 100644
index 0000000000..5e4935c48c
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/readme.md
@@ -0,0 +1,23 @@
+# buff67v3
+
+![buff67v3](https://i.imgur.com/idPbNDLh.jpg)
+
+A 67 keys keyboard with rgb.
+This keyboard use 16mhz HSE and APM32F103 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: buff67v3
+- Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/buff67v3:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/buff67v3/rules.mk b/keyboards/yandrstudio/buff67v3/rules.mk
new file mode 100644
index 0000000000..35a243a65d
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/rules.mk
@@ -0,0 +1,17 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+RGBLIGHT_DRIVER = WS2812    # RGB driver support
+WS2812_DRIVER = pwm         # WS2812 RGB Driver
+AUDIO_ENABLE = no           # Audio output

From 454c8c31001398dd5b8a6adbc166033b7eac446a Mon Sep 17 00:00:00 2001
From: Tom Barnes <tom@mechboards.co.uk>
Date: Fri, 30 Sep 2022 06:24:41 +0100
Subject: [PATCH 507/959] [Keyboard] add Ask55 (#18256)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/ask55/config.h                      |  40 ++++++
 keyboards/ask55/info.json                     | 123 ++++++++++++++++++
 keyboards/ask55/keymaps/default/keymap.c      |  34 +++++
 keyboards/ask55/keymaps/default/readme.md     |   1 +
 keyboards/ask55/keymaps/iic/keymap.c          |  33 +++++
 keyboards/ask55/keymaps/iic/readme.md         |   1 +
 keyboards/ask55/keymaps/m0118/keymap.c        |  33 +++++
 keyboards/ask55/keymaps/m0118/readme.md       |   1 +
 keyboards/ask55/keymaps/mac-portable/keymap.c |  33 +++++
 .../ask55/keymaps/mac-portable/readme.md      |   1 +
 keyboards/ask55/keymaps/next/keymap.c         |  33 +++++
 keyboards/ask55/keymaps/next/readme.md        |   1 +
 keyboards/ask55/readme.md                     |  15 +++
 keyboards/ask55/rules.mk                      |   1 +
 14 files changed, 350 insertions(+)
 create mode 100644 keyboards/ask55/config.h
 create mode 100644 keyboards/ask55/info.json
 create mode 100644 keyboards/ask55/keymaps/default/keymap.c
 create mode 100644 keyboards/ask55/keymaps/default/readme.md
 create mode 100644 keyboards/ask55/keymaps/iic/keymap.c
 create mode 100644 keyboards/ask55/keymaps/iic/readme.md
 create mode 100644 keyboards/ask55/keymaps/m0118/keymap.c
 create mode 100644 keyboards/ask55/keymaps/m0118/readme.md
 create mode 100644 keyboards/ask55/keymaps/mac-portable/keymap.c
 create mode 100644 keyboards/ask55/keymaps/mac-portable/readme.md
 create mode 100644 keyboards/ask55/keymaps/next/keymap.c
 create mode 100644 keyboards/ask55/keymaps/next/readme.md
 create mode 100644 keyboards/ask55/readme.md
 create mode 100644 keyboards/ask55/rules.mk

diff --git a/keyboards/ask55/config.h b/keyboards/ask55/config.h
new file mode 100644
index 0000000000..0dc8301c65
--- /dev/null
+++ b/keyboards/ask55/config.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 Yiancar / Keyboard-Magpie
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/*== 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
+
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ask55/info.json b/keyboards/ask55/info.json
new file mode 100644
index 0000000000..50804f2262
--- /dev/null
+++ b/keyboards/ask55/info.json
@@ -0,0 +1,123 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "ASK55",
+    "maintainer": "qmk",
+    "development_board": "promicro",
+    "debounce": 5,
+    "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
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "D1", "F6", "F5"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true
+        },
+        "brightness_steps": 8,
+        "hue_steps": 8,
+        "led_count": 8,
+        "max_brightness": 255,
+        "pin": "F4",
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x3535",
+        "vid": "0x8968"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1, "x": 14, "y": 0 },
+                { "label": "k11", "matrix": [1, 1], "w": 1, "x": 15, "y": 0 },
+                { "label": "k12", "matrix": [1, 2], "w": 1, "x": 16, "y": 0 },
+                { "label": "k13", "matrix": [1, 3], "w": 1, "x": 17, "y": 0 },
+                { "label": "k14", "matrix": [1, 4], "w": 1, "x": 18, "y": 0 },
+                { "label": "k15", "matrix": [1, 5], "w": 1, "x": 19, "y": 0 },
+                { "label": "k16", "matrix": [1, 6], "w": 1, "x": 20, "y": 0 },
+                { "label": "k17", "matrix": [1, 7], "w": 1, "x": 21, "y": 0 },
+                { "label": "k18", "matrix": [1, 8], "w": 1, "x": 22, "y": 0 },
+                { "label": "k19", "matrix": [1, 9], "w": 1, "x": 23, "y": 0 },
+                { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 24, "y": 0 },
+                { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 25, "y": 0 },
+                { "label": "k1c", "matrix": [1, 12], "w": 1, "x": 26, "y": 0 },
+                { "label": "k1d", "matrix": [1, 13], "w": 1, "x": 27, "y": 0 },
+                { "label": "k20", "matrix": [2, 0], "w": 1, "x": 28, "y": 0 },
+                { "label": "k21", "matrix": [2, 1], "w": 1, "x": 29, "y": 0 },
+                { "label": "k22", "matrix": [2, 2], "w": 1, "x": 30, "y": 0 },
+                { "label": "k23", "matrix": [2, 3], "w": 1, "x": 31, "y": 0 },
+                { "label": "k24", "matrix": [2, 4], "w": 1, "x": 32, "y": 0 },
+                { "label": "k25", "matrix": [2, 5], "w": 1, "x": 33, "y": 0 },
+                { "label": "k26", "matrix": [2, 6], "w": 1, "x": 34, "y": 0 },
+                { "label": "k27", "matrix": [2, 7], "w": 1, "x": 35, "y": 0 },
+                { "label": "k28", "matrix": [2, 8], "w": 1, "x": 36, "y": 0 },
+                { "label": "k29", "matrix": [2, 9], "w": 1, "x": 37, "y": 0 },
+                { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 38, "y": 0 },
+                { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 39, "y": 0 },
+                { "label": "k2c", "matrix": [2, 12], "w": 1, "x": 40, "y": 0 },
+                { "label": "k2d", "matrix": [2, 13], "w": 1, "x": 41, "y": 0 },
+                { "label": "k30", "matrix": [3, 0], "w": 1, "x": 42, "y": 0 },
+                { "label": "k31", "matrix": [3, 1], "w": 1, "x": 43, "y": 0 },
+                { "label": "k32", "matrix": [3, 2], "w": 1, "x": 44, "y": 0 },
+                { "label": "k33", "matrix": [3, 3], "w": 1, "x": 45, "y": 0 },
+                { "label": "k34", "matrix": [3, 4], "w": 1, "x": 46, "y": 0 },
+                { "label": "k35", "matrix": [3, 5], "w": 1, "x": 47, "y": 0 },
+                { "label": "k36", "matrix": [3, 6], "w": 1, "x": 48, "y": 0 },
+                { "label": "k37", "matrix": [3, 7], "w": 1, "x": 49, "y": 0 },
+                { "label": "k38", "matrix": [3, 8], "w": 1, "x": 50, "y": 0 },
+                { "label": "k39", "matrix": [3, 9], "w": 1, "x": 51, "y": 0 },
+                { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 52, "y": 0 },
+                { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 53, "y": 0 },
+                { "label": "k3c", "matrix": [3, 12], "w": 1, "x": 54, "y": 0 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1, "x": 55, "y": 0 },
+                { "label": "k40", "matrix": [4, 0], "w": 1, "x": 56, "y": 0 },
+                { "label": "k41", "matrix": [4, 1], "w": 1, "x": 57, "y": 0 },
+                { "label": "k42", "matrix": [4, 2], "w": 1, "x": 58, "y": 0 },
+                { "label": "k43", "matrix": [4, 3], "w": 1, "x": 59, "y": 0 },
+                { "label": "k46", "matrix": [4, 6], "w": 1, "x": 60, "y": 0 },
+                { "label": "k49", "matrix": [4, 9], "w": 1, "x": 61, "y": 0 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1, "x": 62, "y": 0 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1, "x": 63, "y": 0 },
+                { "label": "k4c", "matrix": [4, 12], "w": 1, "x": 64, "y": 0 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1, "x": 65, "y": 0 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/ask55/keymaps/default/keymap.c b/keyboards/ask55/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e767e25b63
--- /dev/null
+++ b/keyboards/ask55/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 Yiancar / Keyboard-Magpie
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    LT(1,KC_ESC),KC_1,  KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_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_NUHS, KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_RSFT,
+    KC_LCAP,  KC_LALT,  KC_LGUI,  KC_GRV,              KC_SPC,                KC_NUBS,  KC_LEFT,  KC_RGHT,  KC_DOWN, KC_UP
+),
+  [1] = LAYOUT( /* Momentary Layer 1 */
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,              KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+),
+};
+
diff --git a/keyboards/ask55/keymaps/default/readme.md b/keyboards/ask55/keymaps/default/readme.md
new file mode 100644
index 0000000000..7e0a6bd73a
--- /dev/null
+++ b/keyboards/ask55/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The M0116, M0330 and IIc Plus (default) keymap for the ASK55
\ No newline at end of file
diff --git a/keyboards/ask55/keymaps/iic/keymap.c b/keyboards/ask55/keymaps/iic/keymap.c
new file mode 100644
index 0000000000..5784307af9
--- /dev/null
+++ b/keyboards/ask55/keymaps/iic/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Yiancar / Keyboard-Magpie
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    LT(1,KC_ESC),KC_1,  KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_NUBS,
+    KC_LCTL,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_RSFT,
+    KC_LCAP,  KC_GRV,   KC_LGUI,  KC_LALT,              KC_SPC,               KC_LGUI,  KC_LEFT,  KC_RGHT,  KC_DOWN, KC_UP
+),
+  [1] = LAYOUT( /* Momentary Layer 1 */
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,              KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+),
+};
diff --git a/keyboards/ask55/keymaps/iic/readme.md b/keyboards/ask55/keymaps/iic/readme.md
new file mode 100644
index 0000000000..e9300cc04d
--- /dev/null
+++ b/keyboards/ask55/keymaps/iic/readme.md
@@ -0,0 +1 @@
+# The IIc keymap for the ASK55
\ No newline at end of file
diff --git a/keyboards/ask55/keymaps/m0118/keymap.c b/keyboards/ask55/keymaps/m0118/keymap.c
new file mode 100644
index 0000000000..541944f5d6
--- /dev/null
+++ b/keyboards/ask55/keymaps/m0118/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Yiancar / Keyboard-Magpie
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    LT(1,KC_ESC),KC_1,  KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_ENT,
+    KC_LCAP,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUBS, KC_TRNS,
+    KC_LSFT,  KC_GRV,   KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
+    KC_LCTL,  KC_LALT,  KC_LGUI,  KC_LGUI,              KC_SPC,               KC_RGUI,  KC_RGUI,  KC_LEFT,  KC_RGHT, KC_DOWN
+),
+  [1] = LAYOUT( /* Momentary Layer 1 */
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,              KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+),
+};
diff --git a/keyboards/ask55/keymaps/m0118/readme.md b/keyboards/ask55/keymaps/m0118/readme.md
new file mode 100644
index 0000000000..1bf1a90266
--- /dev/null
+++ b/keyboards/ask55/keymaps/m0118/readme.md
@@ -0,0 +1 @@
+# The M0118 keymap for the ASK55
\ No newline at end of file
diff --git a/keyboards/ask55/keymaps/mac-portable/keymap.c b/keyboards/ask55/keymaps/mac-portable/keymap.c
new file mode 100644
index 0000000000..056d0aee5a
--- /dev/null
+++ b/keyboards/ask55/keymaps/mac-portable/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Yiancar / Keyboard-Magpie
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    LT(1,KC_ESC),KC_1,  KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_NUBS,
+    KC_LCTL,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_RSFT,
+    KC_LCAP,  KC_LALT,  KC_LGUI,  KC_GRV,               KC_SPC,               KC_ENT,   KC_LEFT,  KC_RGHT,  KC_DOWN, KC_UP
+),
+  [1] = LAYOUT( /* Momentary Layer 1 */
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,              KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+),
+};
diff --git a/keyboards/ask55/keymaps/mac-portable/readme.md b/keyboards/ask55/keymaps/mac-portable/readme.md
new file mode 100644
index 0000000000..9c24da4736
--- /dev/null
+++ b/keyboards/ask55/keymaps/mac-portable/readme.md
@@ -0,0 +1 @@
+# The Mac Portable keymap for the ASK55
diff --git a/keyboards/ask55/keymaps/next/keymap.c b/keyboards/ask55/keymaps/next/keymap.c
new file mode 100644
index 0000000000..ea095ed795
--- /dev/null
+++ b/keyboards/ask55/keymaps/next/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Yiancar / Keyboard-Magpie
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    LT(1,KC_ESC),KC_1,  KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_NUBS,
+    KC_LCTL,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_RSFT,
+    KC_LALT,  KC_LGUI,  KC_TRNS,  KC_TRNS,              KC_SPC,               KC_TRNS,  KC_TRNS,  KC_RGUI,  KC_RGUI, KC_RALT
+),
+  [1] = LAYOUT( /* Momentary Layer 1 */
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,              KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+),
+};
diff --git a/keyboards/ask55/keymaps/next/readme.md b/keyboards/ask55/keymaps/next/readme.md
new file mode 100644
index 0000000000..5cb6d33d1b
--- /dev/null
+++ b/keyboards/ask55/keymaps/next/readme.md
@@ -0,0 +1 @@
+# The NeXT (both) keymaps for the ASK55
\ No newline at end of file
diff --git a/keyboards/ask55/readme.md b/keyboards/ask55/readme.md
new file mode 100644
index 0000000000..50128fef7d
--- /dev/null
+++ b/keyboards/ask55/readme.md
@@ -0,0 +1,15 @@
+# ASK55
+
+The ASK55 is a 14.5u, Alps-compatible PCB available from Paradigm.  
+
+* Keyboard Maintainer: [yiancar](https://github.com/yiancar) / [keyboard-magpie](https://github.com/keyboard-magpie)
+* Hardware Supported: Paradigm ASK55 PCB
+* Hardware Availability: Paradigm GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ask55: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).
+
+To enter bootloader mode, double-press the reset button on the back of the PCB (yes, it's caterina for now, sorry!), or press and hold escape (top left key) when plugging in the board.
diff --git a/keyboards/ask55/rules.mk b/keyboards/ask55/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/ask55/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From cb2a99a415e8bce8ba814b9684c3979ff934ee91 Mon Sep 17 00:00:00 2001
From: Zicodia <82699172+Z1codia@users.noreply.github.com>
Date: Fri, 30 Sep 2022 00:42:11 -0500
Subject: [PATCH 508/959] [Keyboard] Fix tklfrlnrlmlao layout (#18543)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/zicodia/tklfrlnrlmlao/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/info.json
index 8b2cdc58e4..dd01bef783 100644
--- a/keyboards/zicodia/tklfrlnrlmlao/info.json
+++ b/keyboards/zicodia/tklfrlnrlmlao/info.json
@@ -29,7 +29,7 @@
                 { "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.5, "y": 0    }, { "matrix": [0, 5], "x": 5.5, "y": 0     }, { "matrix": [0, 6], "x": 6.5, "y": 0                }, { "matrix": [0, 7], "x": 7.75, "y": 0    }, { "matrix": [0, 8], "x": 8.75, "y": 0    }, { "matrix": [0, 9], "x": 9.75, "y": 0 }, 
                 { "matrix": [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, "w": 1.5     }, { "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": [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, 8], "x": 8.75, "y": 2.25 },
-                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1.25, "y": 3.25 }, { "matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3 },                                                                                       { "matrix": [3, 5], "x": 5.25, "y": 3.25 }, { "matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.25 }, { "matrix": [3, 7], "x": 7.75, "y": 3.25 }, { "matrix": [3, 8], "x": 7.75, "y": 3.25 }, { "matrix": [3, 9], "x": 8.75, "y": 3.25 }
+                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1.25, "y": 3.25 }, { "matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3 },                                                                                       { "matrix": [3, 5], "x": 5.25, "y": 3.25 }, { "matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.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 }
             ]
         }
     }

From f3351c6bfb4833505f3b2b4484d14d6f6446125a Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Fri, 30 Sep 2022 13:42:29 +0800
Subject: [PATCH 509/959] [Keyboard] Add saevus cor (#18368)

---
 keyboards/saevus/cor/info.json                | 109 ++++++++++++++++++
 keyboards/saevus/cor/keymaps/default/keymap.c |  34 ++++++
 keyboards/saevus/cor/keymaps/via/keymap.c     |  48 ++++++++
 keyboards/saevus/cor/keymaps/via/rules.mk     |   1 +
 keyboards/saevus/cor/readme.md                |  26 +++++
 keyboards/saevus/cor/rules.mk                 |   1 +
 6 files changed, 219 insertions(+)
 create mode 100644 keyboards/saevus/cor/info.json
 create mode 100644 keyboards/saevus/cor/keymaps/default/keymap.c
 create mode 100644 keyboards/saevus/cor/keymaps/via/keymap.c
 create mode 100644 keyboards/saevus/cor/keymaps/via/rules.mk
 create mode 100644 keyboards/saevus/cor/readme.md
 create mode 100644 keyboards/saevus/cor/rules.mk

diff --git a/keyboards/saevus/cor/info.json b/keyboards/saevus/cor/info.json
new file mode 100644
index 0000000000..3f129518d9
--- /dev/null
+++ b/keyboards/saevus/cor/info.json
@@ -0,0 +1,109 @@
+{
+    "manufacturer": "saevus",
+    "keyboard_name": "cor",
+    "maintainer": "ramonimbao",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "rows": ["F0", "F1", "F4", "B3", "B6"],
+        "cols": ["F5", "F6", "F7", "C6", "C7", "B1", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "D2", "D1", "D0"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0x5001",
+        "pid": "0x0002"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0,0], "x":0, "y":0 },
+                { "matrix": [0,1], "x":1.25, "y":0 },
+                { "matrix": [0,2], "x":2.25, "y":0 },
+                { "matrix": [0,3], "x":3.25, "y":0 },
+                { "matrix": [0,4], "x":4.25, "y":0 },
+                { "matrix": [0,5], "x":5.25, "y":0 },
+                { "matrix": [0,6], "x":6.25, "y":0 },
+                { "matrix": [0,7], "x":7.25, "y":0 },
+                { "matrix": [0,8], "x":8.25, "y":0 },
+                { "matrix": [0,9], "x":9.25, "y":0 },
+                { "matrix": [0,10], "x":10.25, "y":0 },
+                { "matrix": [0,11], "x":11.25, "y":0 },
+                { "matrix": [0,12], "x":12.25, "y":0 },
+                { "matrix": [0,13], "x":13.25, "y":0 },
+                { "matrix": [0,14], "x":14.25, "y":0 },
+                { "matrix": [0,15], "x":15.25, "y":0 },
+                { "matrix": [0,16], "x":16.75, "y":0 },
+
+                { "matrix": [1,0], "x":0, "y":1 },
+                { "matrix": [1,1], "x":1.25, "y":1, "w":1.5 },
+                { "matrix": [1,2], "x":2.75, "y":1 },
+                { "matrix": [1,3], "x":3.75, "y":1 },
+                { "matrix": [1,4], "x":4.75, "y":1 },
+                { "matrix": [1,5], "x":5.75, "y":1 },
+                { "matrix": [1,6], "x":6.75, "y":1 },
+                { "matrix": [1,7], "x":7.75, "y":1 },
+                { "matrix": [1,8], "x":8.75, "y":1 },
+                { "matrix": [1,9], "x":9.75, "y":1 },
+                { "matrix": [1,10], "x":10.75, "y":1 },
+                { "matrix": [1,11], "x":11.75, "y":1 },
+                { "matrix": [1,12], "x":12.75, "y":1 },
+                { "matrix": [1,13], "x":13.75, "y":1 },
+                { "matrix": [1,15], "x":14.75, "y":1, "w":1.5 },
+                { "matrix": [1,16], "x":16.75, "y":1 },
+
+                { "matrix": [2,0], "x":0, "y":2 },
+                { "matrix": [2,1], "x":1.25, "y":2, "w":1.75 },
+                { "matrix": [2,2], "x":3, "y":2 },
+                { "matrix": [2,3], "x":4, "y":2 },
+                { "matrix": [2,4], "x":5, "y":2 },
+                { "matrix": [2,5], "x":6, "y":2 },
+                { "matrix": [2,6], "x":7, "y":2 },
+                { "matrix": [2,7], "x":8, "y":2 },
+                { "matrix": [2,8], "x":9, "y":2 },
+                { "matrix": [2,9], "x":10, "y":2 },
+                { "matrix": [2,10], "x":11, "y":2 },
+                { "matrix": [2,11], "x":12, "y":2 },
+                { "matrix": [2,12], "x":13, "y":2 },
+                { "matrix": [2,14], "x":14, "y":2, "w":2.25 },
+                { "matrix": [2,16], "x":16.75, "y":2 },
+
+                { "matrix": [3,0], "x":0, "y":3 },
+                { "matrix": [3,1], "x":1.25, "y":3, "w":2.25 },
+                { "matrix": [3,3], "x":3.5, "y":3 },
+                { "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,15], "x":15.5, "y":3.25 },
+                { "matrix": [3,16], "x":16.75, "y":3 },
+
+                { "matrix": [4,0], "x":0, "y":4 },
+                { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+                { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+                { "matrix": [4,3], "x":3.75, "y":4, "w":1.25 },
+                { "matrix": [4,7], "x":5, "y":4, "w":6.25 },
+                { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 },
+                { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 },
+                { "matrix": [4,14], "x":14.5, "y":4.25 },
+                { "matrix": [4,15], "x":15.5, "y":4.25 },
+                { "matrix": [4,16], "x":16.5, "y":4.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/saevus/cor/keymaps/default/keymap.c b/keyboards/saevus/cor/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ca7c340333
--- /dev/null
+++ b/keyboards/saevus/cor/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        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_DEL,
+        KC_F2,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP,
+        KC_F3,   KC_CAPS, KC_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_F4,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,   MO(1),
+        KC_F5,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_F6,   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        KC_F7,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
+        KC_F8,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
+        KC_F9,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______,
+        KC_F10,  _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/saevus/cor/keymaps/via/keymap.c b/keyboards/saevus/cor/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5cb1d224b9
--- /dev/null
+++ b/keyboards/saevus/cor/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        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_DEL,
+        KC_F2,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP,
+        KC_F3,   KC_CAPS, KC_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_F4,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,   MO(1),
+        KC_F5,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_F6,   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        KC_F7,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
+        KC_F8,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
+        KC_F9,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______,
+        KC_F10,  _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______,
+        _______, _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______,
+        _______, _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/saevus/cor/keymaps/via/rules.mk b/keyboards/saevus/cor/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/saevus/cor/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/saevus/cor/readme.md b/keyboards/saevus/cor/readme.md
new file mode 100644
index 0000000000..2c158e1a63
--- /dev/null
+++ b/keyboards/saevus/cor/readme.md
@@ -0,0 +1,26 @@
+# saevus cor
+
+![saevus cor](https://i.imgur.com/AOT6mmMl.jpg)
+
+An exploded 65% with a macro column.
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: ATmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make saevus/cor:via
+    
+Flashing example for this keyboard:
+
+    make saevus/cor:via:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the upper left key and plug in the keyboard
+* **Physical reset button**: Briefly press the reset button on the back of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/saevus/cor/rules.mk b/keyboards/saevus/cor/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/saevus/cor/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 043e6e72c0a4ec14c7eefa216aa3451796f1ecc2 Mon Sep 17 00:00:00 2001
From: Controller Works <103382872+controller-works@users.noreply.github.com>
Date: Fri, 30 Sep 2022 01:48:41 -0400
Subject: [PATCH 510/959] [Keyboard] Add mini42 (#18491)

Co-authored-by: kevinmgee <kevingee@kevingee.biz>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/controllerworks/mini42/config.h     |  69 ++++++++
 keyboards/controllerworks/mini42/halconf.h    |  22 +++
 keyboards/controllerworks/mini42/info.json    | 165 ++++++++++++++++++
 .../mini42/keymaps/default/config.h           |  79 +++++++++
 .../mini42/keymaps/default/keymap.c           |  68 ++++++++
 .../mini42/keymaps/via/config.h               |  82 +++++++++
 .../mini42/keymaps/via/keymap.c               |  68 ++++++++
 .../mini42/keymaps/via/rules.mk               |   1 +
 keyboards/controllerworks/mini42/mcuconf.h    |  23 +++
 keyboards/controllerworks/mini42/mini42.c     |  82 +++++++++
 keyboards/controllerworks/mini42/mini42.h     |  20 +++
 keyboards/controllerworks/mini42/readme.md    |  77 ++++++++
 keyboards/controllerworks/mini42/rules.mk     |   3 +
 13 files changed, 759 insertions(+)
 create mode 100644 keyboards/controllerworks/mini42/config.h
 create mode 100644 keyboards/controllerworks/mini42/halconf.h
 create mode 100644 keyboards/controllerworks/mini42/info.json
 create mode 100644 keyboards/controllerworks/mini42/keymaps/default/config.h
 create mode 100644 keyboards/controllerworks/mini42/keymaps/default/keymap.c
 create mode 100644 keyboards/controllerworks/mini42/keymaps/via/config.h
 create mode 100644 keyboards/controllerworks/mini42/keymaps/via/keymap.c
 create mode 100644 keyboards/controllerworks/mini42/keymaps/via/rules.mk
 create mode 100644 keyboards/controllerworks/mini42/mcuconf.h
 create mode 100644 keyboards/controllerworks/mini42/mini42.c
 create mode 100644 keyboards/controllerworks/mini42/mini42.h
 create mode 100644 keyboards/controllerworks/mini42/readme.md
 create mode 100644 keyboards/controllerworks/mini42/rules.mk

diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
new file mode 100644
index 0000000000..a56fa70402
--- /dev/null
+++ b/keyboards/controllerworks/mini42/config.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+/* #define DEBOUNCE 5 */
+
+#define WS2812_PIO_USE_PIO1
+#define RGBLED_NUM 54
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_SPLIT \
+        { 27, 27 }
+
+#define SPLIT_TRANSPORT_MIRROR
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_MODS_ENABLE
+
+#undef I2C_DRIVER
+#define I2C_DRIVER I2CD1
+#undef I2C1_SCL_PIN
+#define I2C1_SCL_PIN GP25
+#undef I2C1_SDA_PIN
+#define I2C1_SDA_PIN GP24
+
+/* #define EE_HANDS  */
+/* #define MASTER_LEFT */
+/* #define MASTER_RIGHT */
+
+/* Top left key on left half */
+#define BOOTMAGIC_LITE_ROW    0
+#define BOOTMAGIC_LITE_COLUMN 0
+/* Top right key on right half */
+#define BOOTMAGIC_LITE_ROW_RIGHT    0
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+/*
+ * 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/controllerworks/mini42/halconf.h b/keyboards/controllerworks/mini42/halconf.h
new file mode 100644
index 0000000000..1664802d6c
--- /dev/null
+++ b/keyboards/controllerworks/mini42/halconf.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json
new file mode 100644
index 0000000000..1e0527be02
--- /dev/null
+++ b/keyboards/controllerworks/mini42/info.json
@@ -0,0 +1,165 @@
+{
+    "manufacturer": "Controller Works",
+    "keyboard_name": "mini42",
+    "maintainer": "controller-works",
+    "processor": "RP2040",
+    "url": "https://controller.works/products/mini42-low-profile-ergonomic-keyboard",
+    "tags": ["split", "RP2040", "choc v1", "choc spaced" ],
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0003",
+        "vid": "0x4357"
+    },
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "build": {
+        "lto":true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP2", "GP3", "GP4","GP5", "GP6", "GP7"],
+            ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13"],
+            ["GP14", "GP15", "GP16", "GP17", "GP18", "GP19"],
+            ["GP20", "GP21", "GP22", null, null, null]
+        ]
+    },
+    "rgblight": {
+        "pin": "GP0"
+     },
+    "split": {
+        "enabled": true,
+        "main": "left",
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["GP7", "GP6", "GP5","GP4", "GP3", "GP2"],
+                    ["GP13", "GP12", "GP11", "GP10", "GP9", "GP8"],
+                    ["GP19", "GP18", "GP17", "GP16", "GP15", "GP14"],
+                    ["GP22", "GP21", "GP20", null, null, null]                    
+                ]
+            }
+        },
+        "soft_serial_pin": "GP1",
+        "transport": {
+            "protocol": "serial"
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 2, "x": 75, "y": 4 },
+            { "flags": 2, "x": 40, "y": 2 },
+            { "flags": 2, "x": 8, "y": 8 },
+            { "flags": 2, "x": 8, "y": 43 },
+            { "flags": 2, "x": 49, "y": 51 },
+            { "flags": 2, "x": 95, "y": 55 },
+            { "flags": 1, "matrix": [3, 2], "x": 92,  "y": 64 },
+            { "flags": 4, "matrix": [2, 5], "x": 82,  "y": 39 },
+            { "flags": 4, "matrix": [1, 5], "x": 82,  "y": 22 },
+            { "flags": 4, "matrix": [0, 5], "x": 82,  "y": 5 },
+            { "flags": 4, "matrix": [0, 4], "x": 65,  "y": 2 },
+            { "flags": 4, "matrix": [1, 4], "x": 65,  "y": 14 },
+            { "flags": 4, "matrix": [2, 4], "x": 65,  "y": 37 },
+            { "flags": 1, "matrix": [3, 1], "x": 78,  "y": 58 },
+            { "flags": 1, "matrix": [3, 0], "x": 58,  "y": 55 },
+            { "flags": 4, "matrix": [2, 3], "x": 49,  "y": 34 },
+            { "flags": 4, "matrix": [1, 3], "x": 49,  "y": 17 },
+            { "flags": 4, "matrix": [0, 3], "x": 49,  "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 33,  "y": 2 },
+            { "flags": 4, "matrix": [1, 2], "x": 33,  "y": 19 },
+            { "flags": 4, "matrix": [2, 2], "x": 33,  "y": 37 },
+            { "flags": 4, "matrix": [2, 1], "x": 16,  "y": 41 },
+            { "flags": 4, "matrix": [1, 1], "x": 16,  "y": 24 },
+            { "flags": 4, "matrix": [0, 1], "x": 16,  "y": 7 },
+            { "flags": 1, "matrix": [0, 0], "x": 0,  "y": 7 },
+            { "flags": 1, "matrix": [1, 0], "x": 17,  "y": 24 },
+            { "flags": 1, "matrix": [2, 0], "x": 34,  "y": 41 },
+            { "flags": 2, "x": 149, "y": 4 },
+            { "flags": 2, "x": 184, "y": 2 },
+            { "flags": 2, "x": 216, "y": 8 },
+            { "flags": 2, "x": 216, "y": 43 },
+            { "flags": 2, "x": 175, "y": 51 },
+            { "flags": 2, "x": 129, "y": 55 },
+            { "flags": 1, "matrix": [7, 0], "x": 132,  "y": 64 },
+            { "flags": 4, "matrix": [6, 0], "x": 142,  "y": 39 },
+            { "flags": 4, "matrix": [5, 0], "x": 142,  "y": 22 },
+            { "flags": 4, "matrix": [4, 0], "x": 142,  "y": 5 },
+            { "flags": 4, "matrix": [4, 1], "x": 159,  "y": 2 },
+            { "flags": 4, "matrix": [5, 1], "x": 159,  "y": 19 },
+            { "flags": 4, "matrix": [6, 1], "x": 159,  "y": 37 },
+            { "flags": 1, "matrix": [7, 1], "x": 146,  "y": 58 },
+            { "flags": 1, "matrix": [7, 2], "x": 166,  "y": 55 },
+            { "flags": 4, "matrix": [6, 2], "x": 175,  "y": 34 },
+            { "flags": 4, "matrix": [5, 2], "x": 175,  "y": 17 },
+            { "flags": 4, "matrix": [4, 2], "x": 175,  "y": 0 },
+            { "flags": 4, "matrix": [4, 3], "x": 191,  "y": 2 },
+            { "flags": 4, "matrix": [5, 3], "x": 191,  "y": 19 },
+            { "flags": 4, "matrix": [6, 3], "x": 191,  "y": 37 },
+            { "flags": 4, "matrix": [6, 4], "x": 208,  "y": 41 },
+            { "flags": 4, "matrix": [5, 4], "x": 208,  "y": 24 },
+            { "flags": 4, "matrix": [4, 4], "x": 208,  "y": 7 },
+            { "flags": 1, "matrix": [4, 5], "x": 224,  "y": 7 },
+            { "flags": 1, "matrix": [5, 5], "x": 224,  "y": 24 },
+            { "flags": 1, "matrix": [6, 5], "x": 224,  "y": 41 }
+          ]
+    },
+    "community_layouts": ["split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.25 },
+                { "matrix": [0, 1], "x": 1, "y": 0.25 },
+                { "matrix": [0, 2], "x": 2, "y": 0.125 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0.125 },
+                { "matrix": [0, 5], "x": 5, "y": 0.25 },
+                { "matrix": [4, 0], "x": 8, "y": 0.25 },
+                { "matrix": [4, 1], "x": 9, "y": 0.125 },
+                { "matrix": [4, 2], "x": 10, "y": 0 },
+                { "matrix": [4, 3], "x": 11, "y": 0.125 },
+                { "matrix": [4, 4], "x": 12, "y": 0.25 },
+                { "matrix": [4, 5], "x": 13, "y": 0.25 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.125 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1.125 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [5, 0], "x": 8, "y": 1.25 },
+                { "matrix": [5, 1], "x": 9, "y": 1.125 },
+                { "matrix": [5, 2], "x": 10, "y": 1 },
+                { "matrix": [5, 3], "x": 11, "y": 1.125 },
+                { "matrix": [5, 4], "x": 12, "y": 1.25 },
+                { "matrix": [5, 5], "x": 13, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.125 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2.125 },
+                { "matrix": [2, 5], "x": 5, "y": 2.25 },
+                { "matrix": [6, 0], "x": 8, "y": 2.25 },
+                { "matrix": [6, 1], "x": 9, "y": 2.125 },
+                { "matrix": [6, 2], "x": 10, "y": 2 },
+                { "matrix": [6, 3], "x": 11, "y": 2.125 },
+                { "matrix": [6, 4], "x": 12, "y": 2.25 },
+                { "matrix": [6, 5], "x": 13, "y": 2.25 },
+                { "matrix": [3, 0], "x": 3.5, "y": 3.25 },
+                { "matrix": [3, 1], "x": 4.5, "y": 3.5 },
+                { "matrix": [3, 2], "x": 5.5, "y": 3.75, "h":1.5 },
+                { "matrix": [7, 0], "x": 7.5, "y": 3.75, "h":1.5 },
+                { "matrix": [7, 1], "x": 8.5, "y": 3.5 },
+                { "matrix": [7, 2], "x": 9.5, "y": 3.25 }
+            ]
+          }
+    }
+}
diff --git a/keyboards/controllerworks/mini42/keymaps/default/config.h b/keyboards/controllerworks/mini42/keymaps/default/config.h
new file mode 100644
index 0000000000..e1d162ef3e
--- /dev/null
+++ b/keyboards/controllerworks/mini42/keymaps/default/config.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#ifdef RGB_MATRIX_ENABLE
+//#    define SPLIT_TRANSPORT_MIRROR
+#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 8
+#    define RGB_MATRIX_SPD_STEP 10
+
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/keymaps/default/keymap.c b/keyboards/controllerworks/mini42/keymaps/default/keymap.c
new file mode 100644
index 0000000000..af9a62b400
--- /dev/null
+++ b/keyboards/controllerworks/mini42/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(KC_ENT),
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(1),  KC_SPC,     KC_SPC,   MO(2), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP,                      XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN,                      KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_ESC,     KC_ENT,   MO(3), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3),  KC_ESC,     KC_DEL, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_NUM,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
diff --git a/keyboards/controllerworks/mini42/keymaps/via/config.h b/keyboards/controllerworks/mini42/keymaps/via/config.h
new file mode 100644
index 0000000000..94eb482c86
--- /dev/null
+++ b/keyboards/controllerworks/mini42/keymaps/via/config.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#ifdef RGB_MATRIX_ENABLE
+#    define RGBLED_NUM       54 // Number of LEDs
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT \
+        { 27, 27 }
+//#    define SPLIT_TRANSPORT_MIRROR
+#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 8
+#    define RGB_MATRIX_SPD_STEP 10
+
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/keymaps/via/keymap.c b/keyboards/controllerworks/mini42/keymaps/via/keymap.c
new file mode 100644
index 0000000000..af9a62b400
--- /dev/null
+++ b/keyboards/controllerworks/mini42/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(KC_ENT),
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(1),  KC_SPC,     KC_SPC,   MO(2), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP,                      XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN,                      KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_ESC,     KC_ENT,   MO(3), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3),  KC_ESC,     KC_DEL, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_NUM,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
diff --git a/keyboards/controllerworks/mini42/keymaps/via/rules.mk b/keyboards/controllerworks/mini42/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/controllerworks/mini42/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/mcuconf.h b/keyboards/controllerworks/mini42/mcuconf.h
new file mode 100644
index 0000000000..7f0840c7a7
--- /dev/null
+++ b/keyboards/controllerworks/mini42/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/mini42.c b/keyboards/controllerworks/mini42/mini42.c
new file mode 100644
index 0000000000..cc6397fa11
--- /dev/null
+++ b/keyboards/controllerworks/mini42/mini42.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "mini42.h"
+
+#ifdef OLED_ENABLE
+
+static void render_logo(void) {
+    static const char PROGMEM raw_logo[] = {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12, 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, 12, 12,  0,  0,  0,  0,  0,  0,  0,  0,128,192, 96, 48, 24, 12,254,254,  0,  0,  0,  0,  0,  0, 48, 24, 12,  6,  6,  6,  6,  6,  6, 12, 24,240,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,252,  6,  3,  3,  3,  3,  7,254,252,  6,  3,  3,  3,  3,  6,252,248,  0,  0,  0,  0,  0,  0,255,255,  0,  0,  0,  0,  0,  0,248,252,  6,  3,  3,  3,  3,  3,  3,  6,252,248,  0,  0,  0,  0,  0,  0,255,255,  0,  0,  0,  0, 24, 28, 30, 27, 25, 24, 24, 24, 24, 24,255,255, 24, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192, 96, 48, 24, 15,  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,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0, 96,112,120,108,102, 99, 97, 96, 96, 96, 96, 96, 96,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    if (!is_keyboard_master()) {
+        return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+    }
+
+    return rotation;
+}
+
+bool render_status(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("BASE\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("LOWER\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("RAISE\n"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("ADJUST\n"), false);
+            break;            
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+    
+    return false;
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        render_status();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+    } else {
+        render_logo();  // Renders a static logo
+        oled_scroll_left();  // Turns on scrolling
+    }
+    return false;
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/mini42.h b/keyboards/controllerworks/mini42/mini42.h
new file mode 100644
index 0000000000..8155798246
--- /dev/null
+++ b/keyboards/controllerworks/mini42/mini42.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/controllerworks/mini42/readme.md b/keyboards/controllerworks/mini42/readme.md
new file mode 100644
index 0000000000..67b04b09fe
--- /dev/null
+++ b/keyboards/controllerworks/mini42/readme.md
@@ -0,0 +1,77 @@
+# mini42
+
+![mini42](https://i.imgur.com/xrSKhqRh.png)
+![mini42PCB](https://i.imgur.com/R7u1KB8h.png)
+
+*A pre-built, low profile, split mechanical keyboard based on the RP2040 processor*
+
+* Keyboard Maintainer: [Kevin Gee](https://github.com/controller-works)
+* Hardware Supported: *mini42 split ergonomic keyboard*
+* Hardware Availability: *https://controller.works/products/mini42-low-profile-ergonomic-keyboard* Hardware is available as pre-built units only.
+
+Make example for this keyboard (after setting up your build environment):
+
+```sh
+    make controllerworks/mini42:default
+```
+
+Flashing example for this keyboard:
+
+```sh
+    make controllerworks/mini42:default:flash
+```
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Features
+- Highly integrated design with microcontroller, USB and TRRS connectors, and OLED all integrated on the main board with no secondary modules
+- RP2040 processor by Raspberry Pi Foundation running at 130 MHz with 16MB flash memory
+- CNC milled aluminum case with only 8mm thickness
+- "PCB art" shine through back plate with gold surface finish
+- 128x32 OLED on each keyboard half
+- 42 per-key RGB LEDs and 12 backlight RGB LEDS are individually addressable
+- ESD and over-current protection on USB and TRRS connectors
+- Reset and boot tactile switches
+- USB C host connection
+- Hot swap connectors for Kailh Chocolate PG1350 switches
+- Chocolate key spacing (18mm horizontal x 17mm vertical) 
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the upper left key on the left hand keyboard half or the upper right key on the right hand keyboard half while plugging in USB
+* **Physical reset button**: Press the RST button twice, rapidly
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+## Pin Assignment
+| Name   | Pin  |  Left Row | Left Column | Right Row | **Right Column |
+|--------|------|-----------|-------------|-----------|--------------|
+| LED    | GP0  |           |             |           |              |
+| DATA   | GP1  |           |             |           |              |
+| DATA2* | GP28 |           |             |           |              |
+| KEY0   | GP2  | 0         | 0           | 4         | 0            |
+| KEY1   | GP3  | 0         | 1           | 4         | 1            |
+| KEY2   | GP4  | 0         | 2           | 4         | 2            |
+| KEY3   | GP5  | 0         | 3           | 4         | 3            |
+| KEY4   | GP6  | 0         | 4           | 4         | 4            |
+| KEY5   | GP7  | 0         | 5           | 4         | 5            |
+| KEY6   | GP8  | 1         | 0           | 5         | 0            |
+| KEY7   | GP9  | 1         | 1           | 5         | 1            |
+| KEY8   | GP10 | 1         | 2           | 5         | 2            |
+| KEY9   | GP11 | 1         | 3           | 5         | 3            |
+| KEY10  | GP12 | 1         | 4           | 5         | 4            |
+| KEY11  | GP13 | 1         | 5           | 5         | 5            |
+| KEY12  | GP14 | 2         | 0           | 6         | 0            |
+| KEY13  | GP15 | 2         | 1           | 6         | 1            |
+| KEY14  | GP16 | 2         | 2           | 6         | 2            |
+| KEY15  | GP17 | 2         | 3           | 6         | 3            |
+| KEY16  | GP18 | 2         | 4           | 6         | 4            |
+| KEY17  | GP19 | 2         | 5           | 6         | 5            |
+| KEY18  | GP20 | 3         | 0           | 7         | 0            |
+| KEY19  | GP21 | 3         | 1           | 7         | 1            |
+| KEY20  | GP22 | 3         | 2           | 7         | 2            |
+| SDA    | GP24 |           |             |           |              |
+| SCL    | GP25 |           |             |           |              |
+
+\*DATA2 on production units, not connected on prototype units
+
+\** Right Column numbers run right (pinky position) to left (thumb position)
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/rules.mk b/keyboards/controllerworks/mini42/rules.mk
new file mode 100644
index 0000000000..6e32bfc897
--- /dev/null
+++ b/keyboards/controllerworks/mini42/rules.mk
@@ -0,0 +1,3 @@
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
+OLED_DRIVER   = SSD1306

From b77ff4edf40fbdc4b49d9b3835a54c7884ea20ac Mon Sep 17 00:00:00 2001
From: Luis Moreno <lmoreno.serrano@gmail.com>
Date: Fri, 30 Sep 2022 07:55:46 +0200
Subject: [PATCH 511/959] AceVice One's keymap for Kyria keyboard (#18393)

---
 .../splitkb/kyria/keymaps/lms_ace01/config.h  |  55 ++
 .../splitkb/kyria/keymaps/lms_ace01/keymap.c  | 852 ++++++++++++++++++
 .../splitkb/kyria/keymaps/lms_ace01/readme.md |  92 ++
 .../splitkb/kyria/keymaps/lms_ace01/rules.mk  |   9 +
 4 files changed, 1008 insertions(+)
 create mode 100644 keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
 create mode 100644 keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
 create mode 100644 keyboards/splitkb/kyria/keymaps/lms_ace01/readme.md
 create mode 100644 keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk

diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h b/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
new file mode 100644
index 0000000000..a64a49b87d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2021 Luis Moreno <acevice69@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+// Set handedness by EEPROM
+#define EE_HANDS
+
+// Tapping / One Shot settings
+#define TAPPING_TOGGLE               2
+#define TAPPING_TERM               175
+
+#define ONESHOT_TAP_TOGGLE           2
+#define ONESHOT_TIMEOUT           2250
+
+// OLED settings -if applicable-
+#ifdef OLED_DRIVER_ENABLE
+    #define OLED_DISPLAY_128X64
+#endif
+
+// Encoder settings -if applicable-
+#ifdef ENCODER_ENABLE
+    #define ENCODER_RESOLUTION       4
+#endif
+
+// RGB settings -if applicable-
+#ifdef RGBLIGHT_ENABLE
+    #undef  RGBLIGHT_ANIMATIONS
+
+    #define RGBLIGHT_EFFECT_BREATHING
+
+    #define RGBLIGHT_HUE_STEP        2
+    #define RGBLIGHT_SAT_STEP        2
+    #define RGBLIGHT_VAL_STEP        2
+    #define RGBLIGHT_LIMIT_VAL     230
+
+    #define RGBLIGHT_SLEEP
+    #define RGBLIGHT_SPLIT
+
+    #define RGBLIGHT_DEFAULT_MODE  RGBLIGHT_MODE_BREATHING + 2
+    #define RGBLIGHT_DEFAULT_HUE   201
+    #define RGBLIGHT_DEFAULT_SAT   255
+#endif
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c b/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
new file mode 100644
index 0000000000..20d4c809b6
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
@@ -0,0 +1,852 @@
+/* Copyright 2021 Luis Moreno <acevice69@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap_spanish.h"
+
+// Insert key state definition (Insert/Overwrite Mode)
+static bool ins_state = true;
+
+// Git Commands
+static const char *sendstring_commands[] = {
+    // Config
+    "config //global",
+
+    // Create
+    "init",
+    "clone",
+
+    // Local changes
+    "status",
+    "diff",
+    "add",
+    "rm",
+    "mv",
+    "commit",
+    "stash",
+    "reset",
+    "revert",
+
+    // Branches and Tags
+    "branch /b @",
+    "switch",
+    "checkout",
+    "tag",
+
+    // Update & Publish
+    "remote",
+    "fetch",
+    "pull",
+    "push",
+
+    // Merge & Rebase
+    "merge",
+    "rebase",
+
+    // Commit history
+    "logg"
+};
+
+// Layers definition
+enum layers {
+    _QWERTY_ES,
+    _COLEMAK_ES,
+    _SYMBOL,
+    _FN_NUMPAD,
+    _NAVIGATION,
+    _GIT_CMDS,
+    _SETTINGS
+};
+
+// Encoder Modes definition
+#ifdef ENCODER_ENABLE
+#define ENC_ALT_MAX_TIME 1250
+
+typedef enum {
+    ENC_MODE_CHAR_LINE,
+    ENC_MODE_WORD_PAGE,
+    ENC_MODE_TABBING,
+    ENC_MODE_VOLUME,
+    ENC_MODE_LAST
+} encoder_mode_t;
+
+static encoder_mode_t enc_mode;
+
+void encoder_cycle_mode(bool up);
+#endif
+
+// Tap Dance declarations/definitions
+#ifdef TAP_DANCE_ENABLE
+#define ACTION_TAP_DANCE_FN_ADVANCED_USER(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, user_user_data) \
+    { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = (void *)user_user_data, }
+
+#define MAX_MOD 3  // Max number of modifiers: 0-Base, 1-Shift, 2-Ctrl
+
+typedef enum {
+    TD_NONE,
+    TD_UNKNOWN,
+    TD_SINGLE_TAP,
+    TD_SINGLE_HOLD,
+    TD_DOUBLE_TAP
+} td_state_t;
+
+typedef struct {
+    bool       is_press_action;
+    td_state_t state;
+} td_tap_t;
+
+typedef struct {
+    uint16_t keycode;         // Keycode:
+                              //  - Tap if keycode != KC_NO
+    uint8_t  layer[MAX_MOD];  // Layer with modifiers (0-Base, 1-Shift, 2-Ctrl):
+                              //  - Tap if keycode == KC_NO
+                              //  - Single Hold: Activate while holding
+                              //  - Double Tap: (Un)lock Layer
+} td_user_data_t;
+
+enum td_actions {
+    TAB,
+    ESC,
+    SPC,
+    ENT,
+    LWR,
+    RAI
+};
+
+static td_tap_t td_tap_state = {
+    .is_press_action = true,
+    .state           = TD_NONE
+};
+
+td_state_t td_current       (qk_tap_dance_state_t *state);
+void       td_kc_ly_finished(qk_tap_dance_state_t *state, void *user_data);
+void       td_kc_ly_reset   (qk_tap_dance_state_t *state, void *user_data);
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_CAPS),
+    [ESC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \
+                                              &((td_user_data_t) { KC_ESC, { _NAVIGATION, _QWERTY_ES, _QWERTY_ES }})),
+    [SPC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \
+                                              &((td_user_data_t) { KC_SPC, { _SYMBOL    , _QWERTY_ES, _QWERTY_ES }})),
+    [ENT] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \
+                                              &((td_user_data_t) { KC_ENT, { _SYMBOL    , _QWERTY_ES, _QWERTY_ES }})),
+    [LWR] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \
+                                              &((td_user_data_t) {  KC_NO, { _NAVIGATION, _GIT_CMDS , _QWERTY_ES }})),
+    [RAI] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \
+                                              &((td_user_data_t) {  KC_NO, { _FN_NUMPAD , _GIT_CMDS , _QWERTY_ES }}))
+};
+#endif
+
+// Keycode definitions
+enum custom_keycodes {
+    CK_QUOT = SAFE_RANGE,  // Single/Double quote
+    CK_BSDI,               // Backspace/Delete/Insert
+    CK_ENCM,               // Encoder Mode (-)
+    CK_ENCP,               // Encoder Mode (+)
+    CK_LYDF,               // Activate Default Layer
+    G_CONF,                // Git Commands
+    G_INIT,
+    G_CLONE,
+    G_STAT,
+    G_DIFF,
+    G_ADD,
+    G_RM,
+    G_MV,
+    G_COMM,
+    G_STASH,
+    G_RESET,
+    G_REVER,
+    G_BRANC,
+    G_SWTCH,
+    G_CHECK,
+    G_TAG,
+    G_REMOT,
+    G_FETCH,
+    G_PULL,
+    G_PUSH,
+    G_MERGE,
+    G_REBAS,
+    G_LOG
+};
+
+#define LY_QWES  DF(_QWERTY_ES)
+#define LY_CLES  DF(_COLEMAK_ES)
+
+#ifdef TAP_DANCE_ENABLE
+    #define TD_TBCP  TD(TAB)
+    #define TD_ESSY  TD(ESC)
+    #define TD_SPSY  TD(SPC)
+    #define TD_ENSY  TD(ENT)
+    #define TD_LOWR  TD(LWR)
+    #define TD_RAIS  TD(RAI)
+#else
+    #define TD_TBCP  MT(MOD_LSFT, KC_TAB)
+    #define TD_ESSY  LT(_SYMBOL , KC_ESC)
+    #define TD_SPSY  KC_SPC
+    #define TD_ENSY  KC_ENT
+    #define TD_LOWR  TT(_NAVIGATION)
+    #define TD_RAIS  TT(_SYMBOL)
+#endif
+
+#define MO_LSFT OSM(MOD_LSFT)
+#define MO_LCTL OSM(MOD_LCTL)
+#define MO_LALT OSM(MOD_LALT)
+
+#define MT_RGUI  MT(MOD_RGUI, KC_LEFT)
+#define MT_RALT  MT(MOD_RALT, KC_DOWN)
+#define MT_RCTL  MT(MOD_RCTL, KC_UP)
+#define MT_RSFT  MT(MOD_RSFT, KC_RGHT)
+
+// Keymap definitions
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// clang-format off
+/*
+ * Basic characters (QWERTY ES)
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |Esc/LNav|   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |BS/Dl/In|
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Tab/Caps|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  |   Ñ  |   ´ ¨  |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |EncMode-|   Z  |   X  |   C  |   V  |   B  | LGit |      |  |      | LGit |   N  |   M  |  , ; |  . : |  - _ |EncMode+|
+ * `-------------------------------------------| LNav | Space|  | Enter|LFnNum|-------------------------------------------'
+ *                        +--------------------+------+   /  |  |   /  +------+--------------------+
+ *                        | Shift| Ctrl | Alt  | GUI  | LSym |  | LSym | GUI  | AltGr| Ctrl | Shift|
+ *                        |      |      |      |      |      |  |      |  <-  |   v  |   ^  |  ->  |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_QWERTY_ES] = LAYOUT(
+      TD_ESSY,    ES_Q,    ES_W,    ES_E,    ES_R,    ES_T,                                        ES_Y,    ES_U,    ES_I,    ES_O,    ES_P, CK_BSDI,
+      TD_TBCP,    ES_A,    ES_S,    ES_D,    ES_F,    ES_G,                                        ES_H,    ES_J,    ES_K,    ES_L, ES_NTIL, ES_ACUT,
+      CK_ENCM,    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B, TD_LOWR, XXXXXXX, XXXXXXX, TD_RAIS,    ES_N,    ES_M, ES_COMM,  ES_DOT, ES_MINS, CK_ENCP,
+                                 MO_LSFT, MO_LCTL, MO_LALT, KC_LGUI, TD_SPSY, TD_ENSY, MT_RGUI, MT_RALT, MT_RCTL, MT_RSFT
+    ),
+/*
+ * Basic characters (COLEMAK ES)
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |Esc/LNav|   Q  |   W  |   F  |   P  |   G  |                              |   J  |   L  |   U  |   Y  |   Ñ  |BS/Dl/In|
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Tab/Caps|   A  |   R  |   S  |   T  |   D  |                              |   H  |   N  |   E  |   I  |   O  |   ´ ¨  |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |EncMode-|   Z  |   X  |   C  |   V  |   B  | LGit |      |  |      | LGit |   K  |   M  |  , ; |  . : |  - _ |EncMode+|
+ * `-------------------------------------------| LNav | Space|  | Enter|LFnNum|-------------------------------------------'
+ *                        +--------------------+------+   /  |  |   /  +------+--------------------+
+ *                        | Shift| Ctrl | Alt  | GUI  | LSym |  | LSym | GUI  | AltGr| Ctrl | Shift|
+ *                        |      |      |      |      |      |  |      |  <-  |   v  |   ^  |  ->  |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_COLEMAK_ES] = LAYOUT(
+      TD_ESSY,    ES_Q,    ES_W,    ES_F,    ES_P,    ES_G,                                        ES_J,    ES_L,    ES_U,    ES_Y, ES_NTIL, CK_BSDI,
+      TD_TBCP,    ES_A,    ES_R,    ES_S,    ES_T,    ES_D,                                        ES_H,    ES_N,    ES_E,    ES_I,    ES_O, ES_ACUT,
+      CK_ENCM,    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B, TD_LOWR, XXXXXXX, XXXXXXX, TD_RAIS,    ES_K,    ES_M, ES_COMM,  ES_DOT, ES_MINS, CK_ENCP,
+                                 MO_LSFT, MO_LCTL, MO_LALT, KC_LGUI, TD_SPSY, TD_ENSY, MT_RGUI, MT_RALT, MT_RCTL, MT_RSFT
+    ),
+/*
+ * Symbols
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |  1 ! |  2 " |  3 · |  4 $ |  5 % |                              |  6 & |  7 / |  8 ( |  9 ) |  0 = |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        |  ¡ ¿ |  ' " |  º ª |   \  |  | ¡ |                              |  ~ $ |  + * |  - _ |   /  |  ' ? |  ` ^   |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |  @ ⅛ |   {  |   (  |  [ ° |  < > |      |      |  |      |      |   >  |  ] ¯ |   )  |  } ˘ |  # £ |        |
+ * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_SYMBOL] = LAYOUT(
+      _______,    ES_1,    ES_2,    ES_3,    ES_4,    ES_5,                                        ES_6,    ES_7,    ES_8,    ES_9,    ES_0, _______,
+      _______, ES_IEXL, CK_QUOT, ES_MORD, ES_BSLS, ES_PIPE,                                     ES_TILD, ES_PLUS, ES_MINS, ES_SLSH, ES_QUOT,  ES_GRV,
+      _______,   ES_AT, ES_LCBR, ES_LPRN, ES_LBRC, ES_LABK, _______, XXXXXXX, XXXXXXX, _______, ES_RABK, ES_RBRC, ES_RPRN, ES_RCBR, ES_HASH, _______,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+/*
+ * Function keys, NumPad keys
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |  F1  |  F2  |  F3  |  F4  |      |                              |  , ; |  7 / |  8 ( |  9 ) |   *  |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        |  F5  |  F6  |  F7  |  F8  |      |                              |  . : |  4 $ |  5 % |  6 & |  - _ |  + *   |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |  F9  |  F10 |  F11 |  F12 |      |      |      |  |      |      |  0 = |  1 ! |  2 " |  3 · |   /  |        |
+ * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_FN_NUMPAD] = LAYOUT(
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX,                                     ES_COMM,    ES_7,    ES_8,    ES_9, ES_ASTR, _______,
+      _______,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX,                                      ES_DOT,    ES_4,    ES_5,    ES_6, ES_MINS, ES_PLUS,
+      _______,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______,    ES_0,    ES_1,    ES_2,    ES_3, ES_SLSH, _______,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+/*
+ * Navigation (Mouse deactivated for space saving)
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |      | MBt1 | MUp  | MBt2 |      |                              | PgUp | Home |  Up  |  End | PgUp |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        | Menu | MLeft| MDown|MRight|      |                              | PgDn | Left | Down | Right| PgDn |        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |      |  |      |      |      |PrtScr|ScrLck| Pause|      |        |
+ * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_NAVIGATION] = LAYOUT(
+      _______, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,                                     KC_PGUP, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______,
+      _______,  KC_APP, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, _______,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+/*
+ * Git Commands
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |Config|      |      | Init |      |                              |      | Clone|      |      |      |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        | Diff | Add  |  Rm  |  Mv  |      |                              |Remote| Fetch| Pull | Push | Merge| Rebase |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |Commit| Stash| Reset|Revert|Status|      |      |  |      |      |  Log |Branch|Switch|ChkOut|  Tag |        |
+ * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_GIT_CMDS] = LAYOUT(
+      _______,  G_CONF, XXXXXXX, XXXXXXX,  G_INIT, XXXXXXX,                                     XXXXXXX, G_CLONE, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+      _______,  G_DIFF,   G_ADD,    G_RM,    G_MV, XXXXXXX,                                     G_REMOT, G_FETCH,  G_PULL,  G_PUSH, G_MERGE, G_REBAS,
+      _______,  G_COMM, G_STASH, G_RESET, G_REVER,  G_STAT, _______, XXXXXXX, XXXXXXX, _______,   G_LOG, G_BRANC, G_SWTCH, G_CHECK,   G_TAG, _______,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+/*
+ * Settings (Default Layer, RGB, Media)
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |QWE_ES|CLM_ES|      |      |      |                              |      |      | Vol+ |      |      |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        | TOG  | HUE+ | SAT+ | VAL+ | MOD  |                              | Mute | Prev | Play | Next |      |        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |  LDef  |      | HUE- | SAT- | VAL- | RMOD |      |      |  |      |      |      |      | Vol- |      |      |  LDef  |
+ * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_SETTINGS] = LAYOUT(
+      _______, LY_QWES, LY_CLES, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, XXXXXXX, _______,
+      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,                                     KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
+      CK_LYDF, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,_______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_VOLD, XXXXXXX, XXXXXXX, CK_LYDF,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+// /*
+//  * Layer template
+//  *
+//  * ,-------------------------------------------.                              ,-------------------------------------------.
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
+//  * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        `----------------------------------'  `----------------------------------'
+//  */
+//     [_LAYERINDEX] = LAYOUT(
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______,
+//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+//     ),
+};
+// clang-format on
+
+/*
+ * INITIALIZING FUNCTIONS
+ */
+void matrix_init_user(void) {
+#ifdef ENCODER_ENABLE
+    enc_mode = ENC_MODE_CHAR_LINE;
+#endif
+}
+
+/*
+ * LAYER FUNCTIONS
+ */
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // Activate Settings layer when both Symbol and Navigation layers are on
+    return update_tri_layer_state(state, _SYMBOL, _NAVIGATION, _SETTINGS);
+}
+
+/*
+ * MACRO FUNCTIONS
+ */
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // Get current modifier status (Normal and One Shot)
+    uint8_t mod_state = get_mods();
+    uint8_t osm_state = get_oneshot_mods();
+
+    // Process keycode
+    switch (keycode) {
+        case CK_QUOT:  // Single/Double Quote
+            if (record->event.pressed) {
+                if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
+                    register_code(ES_2);       // Shift(2)     -> "
+                } else {
+                    register_code(ES_QUOT);    // Single Quote -> '
+                }
+            } else {
+                if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
+                    unregister_code(ES_2);     // Shift(2)     -> "
+                } else {
+                    unregister_code(ES_QUOT);  // Single Quote -> '
+                }
+            }
+
+            return false;
+            break;
+        case CK_BSDI: {  // Backspace/Delete/Insert
+            static bool delkey_registered = false;
+
+            if (record->event.pressed) {
+                // Ctrl   -> Insert/Overwrite Mode
+                // Shift  -> Delete
+                // Normal -> Backspace
+                if ((mod_state | osm_state) & MOD_MASK_CTRL) {
+                    del_mods(MOD_MASK_CTRL);
+                    del_oneshot_mods(MOD_MASK_CTRL);
+
+                    tap_code(KC_INS);
+
+                    set_mods(mod_state);
+                    set_oneshot_mods(osm_state);
+
+                    ins_state = !ins_state;
+                } else if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
+                    delkey_registered = true;
+
+                    del_mods(MOD_MASK_SHIFT);
+                    del_oneshot_mods(MOD_MASK_SHIFT);
+
+                    register_code(KC_DEL);
+
+                    set_mods(mod_state);
+                    set_oneshot_mods(osm_state);
+                } else {
+                    register_code(KC_BSPC);
+                }
+            } else {
+                // Unregister keycode sent after the release of CK_BSDI
+                if (delkey_registered) {
+                    unregister_code(KC_DEL);
+                    delkey_registered = false;
+                } else {
+                    unregister_code(KC_BSPC);
+                }
+            }
+
+            return false;
+        }
+            break;
+        case CK_LYDF:  // De-activate all layers and activate Default layer
+            layer_move(get_highest_layer(default_layer_state));
+
+            return false;
+            break;
+        case G_CONF ... G_LOG:
+            if (record->event.pressed) {
+                del_mods(MOD_MASK_SHIFT);
+                del_oneshot_mods(MOD_MASK_SHIFT);
+
+                SEND_STRING("git ");
+                send_string(sendstring_commands[keycode - G_CONF]);
+
+                set_mods(mod_state);
+                set_oneshot_mods(osm_state);
+            }
+
+            break;
+#ifdef ENCODER_ENABLE
+        case CK_ENCM:  // Encoder Mode (-)
+            if (record->event.pressed) {
+                encoder_cycle_mode(false);
+            }
+
+            break;
+        case CK_ENCP:  // Encoder Mode (+)
+            if (record->event.pressed) {
+                encoder_cycle_mode(true);
+            }
+
+            break;
+#endif
+    }
+
+    return true;
+};
+
+/*
+ * TAP DANCE FUNCTIONS
+ */
+#ifdef TAP_DANCE_ENABLE
+td_state_t td_current(qk_tap_dance_state_t *state) {
+    switch (state->count) {
+        case 1:
+            return ((!state->pressed) ? TD_SINGLE_TAP : TD_SINGLE_HOLD);
+        case 2:
+            return TD_DOUBLE_TAP;
+        default:
+            return TD_UNKNOWN;
+    }
+}
+
+void td_kc_ly_finished(qk_tap_dance_state_t *state, void *user_data) {
+    td_tap_state.state  = td_current(state);
+    uint16_t  keycode   = ((td_user_data_t *)user_data)->keycode;
+    uint8_t  *layer_arr = ((td_user_data_t *)user_data)->layer;
+    uint8_t   layer_sel = *(layer_arr + 0);
+
+    // Get current modifier status (Normal and One Shot) and select layer
+    uint8_t mod_state = get_mods();
+    uint8_t osm_state = get_oneshot_mods();
+
+    if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
+        if (*(layer_arr + 1) > _QWERTY_ES) {
+            layer_sel = *(layer_arr + 1);
+        }
+    }
+
+    if ((mod_state | osm_state) & MOD_MASK_CTRL) {
+        if (*(layer_arr + 2) > _QWERTY_ES) {
+            layer_sel = *(layer_arr + 2);
+        }
+    }
+
+    switch (td_tap_state.state) {
+        case TD_NONE:
+        case TD_UNKNOWN:
+            break;
+        case TD_SINGLE_TAP:
+            // Send keycode if available
+            // Otherwise, Lock Layer (Base/Shift/Ctrl) and Unlock rest of selectable layers
+            if (keycode != KC_NO) {
+                tap_code(keycode);
+            } else {
+                uint8_t layer_aux;
+
+                for (layer_aux = _GIT_CMDS; layer_aux >= _SYMBOL; layer_aux--) {
+                    if ((layer_aux == layer_sel) && (!layer_state_is(layer_aux))) {
+                        layer_on(layer_aux);
+                    } else {
+                        layer_off(layer_aux);
+                    }
+                }
+            }
+
+            break;
+        case TD_SINGLE_HOLD:
+            // Lock Layer (Base/Shift/Ctrl) while Single Hold on the way
+            layer_on(layer_sel);
+            break;
+        case TD_DOUBLE_TAP:
+            // (Un)lock Layer (Base/Shift/Ctrl)
+            if (layer_state_is(layer_sel)) {
+                layer_off(layer_sel);
+            } else {
+                layer_on(layer_sel);
+            }
+
+            break;
+    }
+}
+
+void td_kc_ly_reset(qk_tap_dance_state_t *state, void *user_data) {
+    uint8_t *layer_arr = ((td_user_data_t *)user_data)->layer;
+
+    if (td_tap_state.state == TD_SINGLE_HOLD) {
+        // Unlock any Layer (Base/Shift/Ctrl) when Single Hold finalizes
+        uint8_t i;
+        uint8_t layer_aux;
+
+        for (i = 0; i < MAX_MOD; i++) {
+            layer_aux = *(layer_arr + i);
+
+            if ((layer_aux > _QWERTY_ES)) {
+                layer_off(layer_aux);
+            }
+        }
+    }
+
+    td_tap_state.state = TD_NONE;
+}
+#endif
+
+/*
+ * OLED FUNCTIONS
+ */
+#ifdef OLED_DRIVER_ENABLE
+static void render_kyria_logo(void) {
+    static const char PROGMEM kyria_logo[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0x78, 0x38, 0x1c, 0x1e, 0x0e,
+        0x8e, 0x86, 0x86, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x86,
+        0x86, 0x8e, 0x0e, 0x1e, 0x1c, 0x38, 0x78, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0xe0, 0xf0, 0xfc, 0x3e, 0x0f, 0x07, 0x83, 0xe1, 0xf0, 0xf8, 0xbc, 0x9e, 0x8f, 0x87,
+        0x87, 0x83, 0x81, 0x81, 0xe0, 0x78, 0x1f, 0x07, 0xff, 0xff, 0x07, 0x1f, 0x78, 0xe0, 0x81, 0x81,
+        0x83, 0x87, 0x87, 0x8f, 0x9e, 0xbc, 0xf8, 0xf0, 0xe1, 0x83, 0x07, 0x0f, 0x3e, 0xfc, 0xf0, 0xe0,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0xfc, 0xff, 0x03, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x07, 0x07, 0x3f, 0x73, 0xc7, 0x8f, 0x8d,
+        0x89, 0x99, 0x99, 0xb1, 0xf7, 0xee, 0xf8, 0xf0, 0xff, 0xff, 0xf0, 0xf8, 0xee, 0xf7, 0xb1, 0x99,
+        0x99, 0x89, 0x8d, 0x8f, 0xc7, 0x73, 0x3f, 0x07, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff,
+        0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 0xe0, 0xfc, 0xce, 0xe3, 0xf1, 0xb1,
+        0x91, 0x99, 0x99, 0x8d, 0xef, 0x77, 0x1f, 0x0f, 0xff, 0xff, 0x0f, 0x1f, 0x77, 0xef, 0x8d, 0x99,
+        0x99, 0x91, 0xb1, 0xf1, 0xe3, 0xce, 0xfc, 0xe0, 0xe0, 0xff, 0x3f, 0x00, 0x00, 0x00, 0xc0, 0xff,
+        0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x07, 0x0f, 0x3f, 0x7c, 0xf0, 0xe0, 0xc1, 0x87, 0x0f, 0x1f, 0x3d, 0x79, 0xf1, 0xe1,
+        0xe1, 0xc1, 0x81, 0x81, 0x07, 0x1e, 0xf8, 0xe0, 0xff, 0xff, 0xe0, 0xf8, 0x1e, 0x07, 0x81, 0x81,
+        0xc1, 0xe1, 0xe1, 0xf1, 0x79, 0x3d, 0x1f, 0x0f, 0x87, 0xc1, 0xe0, 0xf0, 0x7c, 0x3f, 0x0f, 0x07,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x1e, 0x1c, 0x38, 0x78, 0x70,
+        0x71, 0x61, 0x61, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x61,
+        0x61, 0x71, 0x70, 0x78, 0x38, 0x1c, 0x1e, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xc0, 0xfe, 0xfe, 0xfe, 0xc6, 0xe0, 0xf0, 0x70, 0x30, 0x10, 0x00, 0x70,
+        0xf0, 0xf0, 0x80, 0x00, 0xc0, 0xf0, 0xf0, 0x70, 0x10, 0xc0, 0xf0, 0xf0, 0xf0, 0x70, 0x30, 0x30,
+        0x30, 0xc0, 0xf6, 0xf6, 0xf6, 0x06, 0x00, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xf0, 0xf0, 0xe0, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x10, 0x1f, 0x1f, 0x1f, 0x03, 0x0f, 0x1f, 0x1e, 0x18, 0x10, 0x00, 0xc0, 0xc0,
+        0xe7, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x01, 0x00, 0x18, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00,
+        0x18, 0x1f, 0x1f, 0x1f, 0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x19, 0x0d, 0x1f, 0x1f, 0x1f, 0x03, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
+}
+
+static void render_qmk_logo(void) {
+    static const char PROGMEM qmk_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0
+    };
+
+    oled_write_P(qmk_logo, false);
+}
+
+static void render_status(void) {
+    // Get current modifier status (Normal and One Shot)
+    uint8_t mod_state = get_mods();
+    uint8_t osm_state = get_oneshot_mods();
+    uint8_t osl_state = get_oneshot_locked_mods();
+    bool    caps_lock = host_keyboard_led_state().caps_lock;
+
+    // QMK Logo
+    render_qmk_logo();
+
+#ifdef ENCODER_ENABLE
+    // Host Keyboard Encoder Mode
+    switch (enc_mode) {
+        case ENC_MODE_CHAR_LINE:
+            oled_write_P(PSTR("ENC \020 CHAR/LINE\n"), false);
+            break;
+        case ENC_MODE_WORD_PAGE:
+            oled_write_P(PSTR("ENC \020 WORD/PAGE\n"), false);
+            break;
+        case ENC_MODE_TABBING:
+            oled_write_P(PSTR("ENC \020 TABBING\n"),   false);
+            break;
+        case ENC_MODE_VOLUME:
+        case ENC_MODE_LAST:
+            oled_write_P(PSTR("ENC \020 VOLUME\n"),    false);
+            break;
+    }
+#else
+    oled_write_P(PSTR("\n"), false);
+#endif
+
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("\n"), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY_ES:
+            oled_write_P(PSTR("L00 \020 QWERTY (ES)\n"),  false);
+            break;
+        case _COLEMAK_ES:
+            oled_write_P(PSTR("L00 \020 COLEMAK (ES)\n"), false);
+            break;
+        case _SYMBOL:
+            oled_write_P(PSTR("L01 \020 SYMBOLS\n"),      false);
+            break;
+        case _FN_NUMPAD:
+            oled_write_P(PSTR("L02 \020 FN / NUMPAD\n"),  false);
+            break;
+        case _NAVIGATION:
+            oled_write_P(PSTR("L03 \020 NAVIGATION\n"),   false);
+            break;
+        case _GIT_CMDS:
+            oled_write_P(PSTR("L04 \020 GIT COMMANDS\n"), false);
+            break;
+        case _SETTINGS:
+            oled_write_P(PSTR("L05 \020 SETTINGS\n"),     false);
+            break;
+    }
+
+    // Host Keyboard Locked Modifiers Status
+    oled_write_P((osl_state & MOD_MASK_SHIFT) ? PSTR("LCK ")  : PSTR("    ") , false);
+    oled_write_P((osl_state & MOD_MASK_CTRL)  ? PSTR("LCK ")  : PSTR("    ") , false);
+    oled_write_P((osl_state & MOD_MASK_ALT)   ? PSTR("LCK ")  : PSTR("    ") , false);
+    oled_write_P(                                               PSTR("    ") , false);
+    oled_write_P((caps_lock)                  ? PSTR(" CAPS") : PSTR("     "), false);
+
+    // Host Keyboard Modifiers Status
+    oled_write_P(((mod_state | osm_state) & MOD_MASK_SHIFT) ? PSTR("SHF ")  : PSTR("    ") , false);
+    oled_write_P(((mod_state | osm_state) & MOD_MASK_CTRL)  ? PSTR("CTR ")  : PSTR("    ") , false);
+    oled_write_P(((mod_state | osm_state) & MOD_MASK_ALT)   ? PSTR("ALT ")  : PSTR("    ") , false);
+    oled_write_P(((mod_state | osm_state) & MOD_MASK_GUI)   ? PSTR("GUI ")  : PSTR("    ") , false);
+    oled_write_P((ins_state)                                ? PSTR("  INS") : PSTR("  OWR"), false);
+}
+
+static void render_settings(void) {
+#ifdef RGBLIGHT_ENABLE
+    char rgb_str[4];
+
+    oled_write_P(PSTR("\n\n"), false);
+
+    oled_write_P(PSTR("\020H: "), false);
+    itoa(rgblight_get_hue(), rgb_str, 10);
+    oled_write_ln(rgb_str, false);
+
+    oled_write_P(PSTR("\020S: "), false);
+    itoa(rgblight_get_sat(), rgb_str, 10);
+    oled_write_ln(rgb_str, false);
+
+    oled_write_P(PSTR("\020V: "), false);
+    itoa(rgblight_get_val(), rgb_str, 10);
+    oled_write_ln(rgb_str, false);
+#else
+    oled_write_P(PSTR("\n\n\n\n\n"), false);
+#endif
+
+    switch (get_highest_layer(default_layer_state)) {
+        case _QWERTY_ES:
+            oled_write_ln_P(PSTR("        \020QWERTY (ES)") , false);
+            break;
+        case _COLEMAK_ES:
+            oled_write_P   (PSTR("        \020COLEMAK (ES)"), false);
+            break;
+    }
+
+#ifdef RGBLIGHT_ENABLE
+    oled_write_ln_P(PSTR("  RGB      DEFAULT"), false);
+    oled_write_ln_P(PSTR("SETTINGS    LAYER "), false);
+#else
+    oled_write_ln_P(PSTR("           DEFAULT"), false);
+    oled_write_ln_P(PSTR("            LAYER "), false);
+#endif
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+void oled_task_user(void) {
+    if (is_keyboard_master()) {  // Main screen: Renders keyboard state (layer, modifiers) / RGB settings
+        if (get_highest_layer(layer_state) != _SETTINGS) {
+            render_status();
+        } else {
+            render_settings();
+        }
+    } else {                     // Auxiliar screen: Renders Kyria logo with scroll
+        render_kyria_logo();
+        oled_scroll_right();
+    }
+}
+#endif
+
+/*
+ * ENCODER FUNCTIONS
+ */
+#ifdef ENCODER_ENABLE
+void encoder_cycle_mode(bool up) {
+    if (enc_mode == 0 && !up) {
+        enc_mode = ENC_MODE_LAST - 1;
+    } else {
+        enc_mode = (enc_mode + (up ? +1 : -1)) % ENC_MODE_LAST;
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    // Select encoder mode
+    switch (enc_mode) {
+        case ENC_MODE_CHAR_LINE:
+            // Left Encoder: Character Left/Right. Right Encoder: Line Up/Down.
+            tap_code(!clockwise ? (index == 0 ? KC_LEFT : KC_UP): (index == 0 ? KC_RGHT : KC_DOWN));
+            break;
+        case ENC_MODE_WORD_PAGE:
+            // Left Encoder: Word Left/Right. Right Encoder: Page Up/Down.
+            tap_code16(!clockwise ? (index == 0 ? C(KC_LEFT) : KC_PGUP): (index == 0 ? C(KC_RGHT) : KC_PGDN));
+            break;
+        case ENC_MODE_TABBING:
+            // Left Encoder: Navigation Tabbing. Right Encoder: Editor Tabbing.
+            tap_code16(!clockwise ? (index == 0 ? S(C(KC_TAB)) : C(KC_PGUP)): (index == 0 ? C(KC_TAB) : C(KC_PGDN)));
+            break;
+        case ENC_MODE_VOLUME:
+        case ENC_MODE_LAST:
+            // Volume control
+            tap_code(clockwise ? KC_VOLU : KC_VOLD);
+            break;
+    }
+
+    return true;
+}
+#endif
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/readme.md b/keyboards/splitkb/kyria/keymaps/lms_ace01/readme.md
new file mode 100644
index 0000000000..aae1260ffb
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/readme.md
@@ -0,0 +1,92 @@
+# AceVice One's Keymap for [Kyria](https://github.com/splitkb/kyria)
+
+## Introduction
+
+This is my first personal keymap for Kyria with a little bunch of *steroids*.
+
+The hardware build implements 2 rotatory encoders and 2 OLED displays.
+
+## Features
+
+These are some of the generic features built in:
+
+- Two alternative default character distributions (**QWERTY**, **COLEMAK**) with *Spanish* layout.
+- Layer selection on some keys (**Esc**, **Lower**, **Space**, **Enter**, **Raise**).
+- Multiple selectable layers:
+  - **Symbols**: Numbers on top row, common programming symbols (curly, square and angle brackets, parentheses, at and hash) on bottom row with symmetric distribution (open on left, close on right).
+  - **Function**/**Numpad**: Function keys on left side, Number Pad on right side.
+  - **Navigation**: Mouse keys on left side, Navigation keys on right side.
+  - **Git commands**: The most common and useful Git commands at your fingertips.
+  - **Settings**: Select default distribution, Media keys, RGB settings.
+- Symmetric design -left/right side- for modifiers (**Shift**, **Ctrl**, **Alt** and **GUI**).
+- **Arrows**/**Modifiers** on same keys (right side).
+- **Tab**/**Caps Lock** key.
+- **Backspace**/**Delete** with **Insert**/**Overwrite** selectable mode on same key.
+- **Single/Double Quote** (`' "`) on same key as English layouts.
+- Handedness set by EEPROM.
+- Mouse Keys has been disabled by default for space saving (Pro Micro controller limit).
+
+Some of the more specific features are described below:
+
+### Tap Dance
+
+- Use of `ACTION_TAP_DANCE_DOUBLE()` for **Tab**/**Caps Lock** key.
+- Implementation of new `ACTION_TAP_DANCE_FN_ADVANCED_USER()` function:
+  - Any user data can be sent to personalized functions.
+  - Generalized design makes action reuse easy.
+  - User can tap a keycode and/or layer selection (single tap, single hold, double tap) depending on modifiers (**None**, **Shift**, **Ctrl**).
+
+### OLEDs
+
+Master-side OLED displays dynamic data:
+
+- Current layer.
+- Modifiers state (lock mode included).
+- Caps Lock state.
+- Insert/Overwrite state.
+
+Slave-side OLED displays horizontal scrolling Kyria logo.
+
+### Rotary Encoders
+
+Encoders click buttons for mode changing. Supported modes are:
+
+- Character Left / Right, Line Up / Down.
+- Word Left / Right, Page Up / Down.
+- Tabbing Left / Right (Navigator, Editor).
+- Volume Up / Down.
+
+## TODO list
+
+- [x] Show modifiers in OLED when triggered as One Shot keys
+- [x] Manage Backspace key with dual funcion (Delete when shifted)
+- [x] OLED modifier status bar one line down
+- [x] Show INS/OWR Mode in right OLED
+- [x] Show RGB Led Settings on OLED when Settings layer on
+- [x] Show Locked Modifiers (Shift, Control, Alt, GUI)
+- [x] Arrow keys on right modifier keys
+- [x] Improve Esc/Layer Symbol: Tap -> Keycode, Hold -> Momentary Layer, Double Tap -> Toggler Layer
+- [x] Check transparent keys on all layers (avoid collateral effects)
+- [x] Add "Print Screen" / "Scroll Lock" / "Pause Break" keys on Navigation layer
+- [x] Add Basic characters layers: COLEMAK (ES)
+- [x] Create custom keycode with quotes (single/double) for ES layout
+- [x] Add Tap-Dance actions for keycodes (Tab, Space, Enter) and layer selection
+- [x] Add Git commands to some layer
+- [x] Disable Mouse Keys (saving space)
+- [x] Settings Layer not accesible
+- [x] Layer buttons with double/triple function (Normal/Shift/Control mode)
+- [x] Tab/Caps Lock on same key (single/double tap)
+- [x] Backspace/Delete/Insert on same key (Normal/Shift/Ctrl)
+- [x] Separate default layer from RGB settings rendering for conditional compiling
+- [x] Encoders: Improve with more functionality (modes)
+- [ ] Encoders: Add mode for navigation through windows (applications)
+- [ ] Show more info about RGB Led Settings (On/Off, Animation, ...)
+- [ ] Activate "Nums Lock" when Fn/NumPad layer locked
+- [ ] Show status indicator when locked layer
+- [ ] Set RGB Led Color by selected Layer (activable)
+- [ ] Add more uses for left OLED
+- [ ] Something strange returning from One Shot hold
+
+## Acknowledgements
+
+Thanks to the entire QMK community for your invaluable help.
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk b/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
new file mode 100644
index 0000000000..329b41e4e5
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
@@ -0,0 +1,9 @@
+BOOTLOADER         = caterina  # Pro Micro bootloader
+
+TAP_DANCE_ENABLE   = yes       # Enable Tap Dance
+
+OLED_DRIVER_ENABLE = yes       # Enables the use of OLED displays
+ENCODER_ENABLE     = yes       # Enables the use of one or more encoders
+RGBLIGHT_ENABLE    = yes       # Enable keyboard RGB underglow
+
+MOUSEKEY_ENABLE    = no        # Disable mouse (saving space)

From e1e86cb1fb97afe3c2d8331dde4e0f1d61d67e37 Mon Sep 17 00:00:00 2001
From: Purdea Andrei <andrei@purdea.ro>
Date: Fri, 30 Sep 2022 09:02:24 +0300
Subject: [PATCH 512/959] Add Unicomp PC122 keyboard (#18326)

---
 keyboards/unicomp/pc122/info.json             | 16 +++++
 .../unicomp/pc122/keymaps/default/keymap.c    | 34 ++++++++++
 .../unicomp/pc122/keymaps/default/readme.md   |  3 +
 .../unicomp/pc122/keymaps/pc3270/keymap.c     | 34 ++++++++++
 .../unicomp/pc122/keymaps/pc3270/readme.md    |  6 ++
 .../unicomp/pc122/keymaps/ps2_5250/keymap.c   | 34 ++++++++++
 .../unicomp/pc122/keymaps/ps2_5250/readme.md  |  6 ++
 .../unicomp/pc122/keymaps/usb_5250/keymap.c   | 34 ++++++++++
 .../unicomp/pc122/keymaps/usb_5250/readme.md  |  6 ++
 .../unicomp/pc122/overnumpad_1xb/config.h     | 68 +++++++++++++++++++
 .../pc122/overnumpad_1xb/overnumpad_1xb.c     | 24 +++++++
 .../pc122/overnumpad_1xb/overnumpad_1xb.h     | 49 +++++++++++++
 .../unicomp/pc122/overnumpad_1xb/readme.md    | 40 +++++++++++
 .../unicomp/pc122/overnumpad_1xb/rules.mk     | 23 +++++++
 14 files changed, 377 insertions(+)
 create mode 100644 keyboards/unicomp/pc122/info.json
 create mode 100644 keyboards/unicomp/pc122/keymaps/default/keymap.c
 create mode 100644 keyboards/unicomp/pc122/keymaps/default/readme.md
 create mode 100644 keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
 create mode 100644 keyboards/unicomp/pc122/keymaps/pc3270/readme.md
 create mode 100644 keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
 create mode 100644 keyboards/unicomp/pc122/keymaps/ps2_5250/readme.md
 create mode 100644 keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
 create mode 100644 keyboards/unicomp/pc122/keymaps/usb_5250/readme.md
 create mode 100644 keyboards/unicomp/pc122/overnumpad_1xb/config.h
 create mode 100644 keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c
 create mode 100644 keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.h
 create mode 100644 keyboards/unicomp/pc122/overnumpad_1xb/readme.md
 create mode 100644 keyboards/unicomp/pc122/overnumpad_1xb/rules.mk

diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json
new file mode 100644
index 0000000000..d991b81f4a
--- /dev/null
+++ b/keyboards/unicomp/pc122/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Unicomp PC122", 
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", 
+    "maintainer": "purdeaandrei", 
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":0, "y":2.5}, {"x":1, "y":2.5}, {"x":2.25, "y":2.5}, {"x":3.25, "y":2.5}, {"x":4.25, "y":2.5}, {"x":5.25, "y":2.5}, {"x":6.25, "y":2.5}, {"x":7.25, "y":2.5}, {"x":8.25, "y":2.5}, {"x":9.25, "y":2.5}, {"x":10.25, "y":2.5}, {"x":11.25, "y":2.5}, {"x":12.25, "y":2.5}, {"x":13.25, "y":2.5}, {"x":14.25, "y":2.5}, {"x":15.25, "y":2.5, "w":2}, {"x":17.75, "y":2.5}, {"x":18.75, "y":2.5}, {"x":19.75, "y":2.5}, {"x":21.25, "y":2.5}, {"x":22.25, "y":2.5}, {"x":23.25, "y":2.5}, {"x":24.25, "y":2.5}, {"x":0, "y":3.5}, {"x":1, "y":3.5}, {"x":2.25, "y":3.5, "w":1.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5}, {"x":14.75, "y":3.5}, {"x":15.75, "y":3.5, "w":1.5}, {"x":17.75, "y":3.5}, {"x":18.75, "y":3.5}, {"x":19.75, "y":3.5}, {"x":21.25, "y":3.5}, {"x":22.25, "y":3.5}, {"x":23.25, "y":3.5}, {"x":24.25, "y":3.5}, {"x":0, "y":4.5}, {"x":1, "y":4.5}, {"x":2.25, "y":4.5, "w":1.75}, {"x":4, "y":4.5}, {"x":5, "y":4.5}, {"x":6, "y":4.5}, {"x":7, "y":4.5}, {"x":8, "y":4.5}, {"x":9, "y":4.5}, {"x":10, "y":4.5}, {"x":11, "y":4.5}, {"x":12, "y":4.5}, {"x":13, "y":4.5}, {"x":14, "y":4.5}, {"x":15, "y":4.5}, {"x":16, "y":4.5, "w":1.25}, {"x":18.75, "y":4.5}, {"x":21.25, "y":4.5}, {"x":22.25, "y":4.5}, {"x":23.25, "y":4.5}, {"x":24.25, "y":4.5}, {"x":0, "y":5.5}, {"x":1, "y":5.5}, {"x":2.25, "y":5.5, "w":1.25}, {"x":3.5, "y":5.5}, {"x":4.5, "y":5.5}, {"x":5.5, "y":5.5}, {"x":6.5, "y":5.5}, {"x":7.5, "y":5.5}, {"x":8.5, "y":5.5}, {"x":9.5, "y":5.5}, {"x":10.5, "y":5.5}, {"x":11.5, "y":5.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5}, {"x":14.5, "y":5.5, "w":2.75}, {"x":17.75, "y":5.5}, {"x":18.75, "y":5.5}, {"x":19.75, "y":5.5}, {"x":21.25, "y":5.5}, {"x":22.25, "y":5.5}, {"x":23.25, "y":5.5}, {"x":24.25, "y":5.5, "h":2}, {"x":0, "y":6.5}, {"x":1, "y":6.5}, {"x":2.25, "y":6.5, "w":1.5}, {"x":4.75, "y":6.5, "w":1.5}, {"x":6.25, "y":6.5, "w":7}, {"x":13.25, "y":6.5, "w":1.5}, {"x":15.75, "y":6.5, "w":1.5}, {"x":18.75, "y":6.5}, {"x":21.25, "y":6.5, "w":2}, {"x":23.25, "y":6.5}]
+        }
+    }
+}
diff --git a/keyboards/unicomp/pc122/keymaps/default/keymap.c b/keyboards/unicomp/pc122/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8df8de9529
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 Purdea Andrei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+                                       KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
+                                       KC_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_SLCK,    KC_GRV, KC_1,  KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_PSCR,  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_PSCR,  KC_F1,      KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_RGUI,  KC_MPLY,    KC_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_LEFT, KC_ENT,  KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LGUI,  KC_APP,     KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,           KC_DOWN,           KC_P0,            KC_PDOT
+    )
+};
diff --git a/keyboards/unicomp/pc122/keymaps/default/readme.md b/keyboards/unicomp/pc122/keymaps/default/readme.md
new file mode 100644
index 0000000000..36841bb572
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# The default keymap for unicomp/pc122/$(CONTROLLER)
+
+This keymap is designed for those who prefer modern 10X-key layouts, and want to start out from there customizing their keyboard.
diff --git a/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c b/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
new file mode 100644
index 0000000000..706249ca1d
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 Purdea Andrei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+                                       S(KC_F1), S(KC_F2), S(KC_F3), S(KC_F4), S(KC_F5), S(KC_F6), S(KC_F7), S(KC_F8), S(KC_F9), S(KC_F10), S(KC_F11), S(KC_F12),
+                                       KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
+        S(KC_ESC), C(KC_F9),   KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  C(KC_F8),  KC_PGUP, KC_PGDN,  KC_ESC,  KC_NLCK, KC_PAST, KC_PSLS,
+        C(KC_F1),  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_END,    KC_INS,  KC_DEL,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        C(KC_F2),  C(KC_F5),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
+        KC_PSCR,   C(KC_F6),   KC_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_LEFT,   KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_SLCK,   C(KC_F7),   KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,             KC_DOWN,           KC_P0,            KC_PDOT
+    )
+};
diff --git a/keyboards/unicomp/pc122/keymaps/pc3270/readme.md b/keyboards/unicomp/pc122/keymaps/pc3270/readme.md
new file mode 100644
index 0000000000..7bd5ce90f2
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/pc3270/readme.md
@@ -0,0 +1,6 @@
+# The "PC122/3270 Keyboard (USB and PS/2)" keymap for unicomp/pc122/$(CONTROLLER)
+
+This keymap is designed to match the following official keymap from Unicomp:
+https://support.pckeyboard.com/knowledgebase.php?article=58
+https://support.pckeyboard.com/download_attachment.php?kb_att=56
+
diff --git a/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c b/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
new file mode 100644
index 0000000000..f1ff9ea18a
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 Purdea Andrei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+                                        S(KC_F1), S(KC_F2), S(KC_F3), S(KC_F4), S(KC_F5), S(KC_F6), S(KC_F7), S(KC_F8), S(KC_F9), S(KC_F10), S(KC_F11), S(KC_F12),
+                                        KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
+        KC_ESC,     KC_SLCK,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  S(KC_TAB),   KC_INS,  KC_PGUP,  KC_END,  KC_NLCK, KC_PSLS, KC_PAST,
+        KC_PSCR,    KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  S(KC_RCTRL), KC_DEL,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        C(KC_PAUS), A(KC_F1),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        S(C(KC_4)), S(C(KC_3)), KC_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_LEFT,     KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LGUI,    KC_APP,     KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,               KC_DOWN,           KC_P0,            KC_PDOT
+    )
+};
diff --git a/keyboards/unicomp/pc122/keymaps/ps2_5250/readme.md b/keyboards/unicomp/pc122/keymaps/ps2_5250/readme.md
new file mode 100644
index 0000000000..7ab1b84810
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/ps2_5250/readme.md
@@ -0,0 +1,6 @@
+# The "PS2 PC5250" keymap for unicomp/pc122/$(CONTROLLER)
+
+This keymap is designed to match the following official keymap from Unicomp:
+https://support.pckeyboard.com/knowledgebase.php?article=70
+https://support.pckeyboard.com/download_attachment.php?kb_att=83
+
diff --git a/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c b/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
new file mode 100644
index 0000000000..34ac826f6c
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 Purdea Andrei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+                                       S(KC_F1), S(KC_F2), S(KC_F3), S(KC_F4), S(KC_F5), S(KC_F6), S(KC_F7), S(KC_F8), S(KC_F9), S(KC_F10), S(KC_F11), S(KC_F12),
+                                       KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
+        KC_ESC,   KC_SLCK,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  S(KC_TAB), KC_INS,  KC_PGUP,  KC_END,  KC_NLCK, KC_PSLS, KC_PAST,
+        KC_PSCR,  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  C(KC_F6),  KC_DEL,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        C(KC_F3), C(KC_F1),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        C(KC_F5), C(KC_F2),   KC_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_LEFT,   KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LGUI,  KC_APP,     KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,             KC_DOWN,           KC_P0,            KC_PDOT
+    )
+};
diff --git a/keyboards/unicomp/pc122/keymaps/usb_5250/readme.md b/keyboards/unicomp/pc122/keymaps/usb_5250/readme.md
new file mode 100644
index 0000000000..30c3808f74
--- /dev/null
+++ b/keyboards/unicomp/pc122/keymaps/usb_5250/readme.md
@@ -0,0 +1,6 @@
+# The "USB/5250" keymap for unicomp/pc122/$(CONTROLLER)
+
+This keymap is designed to match the following official keymap from Unicomp:
+https://support.pckeyboard.com/knowledgebase.php?article=69
+https://support.pckeyboard.com/download_attachment.php?kb_att=82
+
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/config.h b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
new file mode 100644
index 0000000000..ad7668bdea
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
@@ -0,0 +1,68 @@
+/* Copyright 2020 Purdea Andrei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+#define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+
+// All pins in order from left-to-right, as seen on the keyboard:
+// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, 
+// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible.
+
+// On this keyboard the right-most pin is not used, so that is A10.
+// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom.
+
+#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
+#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+#define MATRIX_HAS_GHOST
+
+#define STM32_HSECLK 16000000
+
+#define SOLENOID_PIN B5
+#define HAPTIC_ENABLE_PIN C13
+#define SOLENOID_DEFAULT_DWELL 4
+#define SOLENOID_MIN_DWELL 4
+#define HAPTIC_OFF_IN_LOW_POWER 1
+#define NO_HAPTIC_MOD
+
+#define LED_NUM_LOCK_PIN C12
+#define LED_CAPS_LOCK_PIN C11
+#define LED_SCROLL_LOCK_PIN C10
+#define LED_ON_STATE 1
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c
new file mode 100644
index 0000000000..cb5ec3dc12
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c
@@ -0,0 +1,24 @@
+/* Copyright 2020 Purdea Andrei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "overnumpad_1xb.h"
+
+void keyboard_post_init_kb(void)
+{
+    //debug_enable=true;
+    //debug_matrix=true;
+}
+
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.h b/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.h
new file mode 100644
index 0000000000..e0dc0d8f33
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.h
@@ -0,0 +1,49 @@
+/* Copyright 2020 Purdea Andrei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+                         k_f13, k_f14, k_f15, k_f16, k_f17, k_f18, k_f19, k_f20, k_f21, k_f22, k_f23, k_f24, \
+                         k_f1,  k_f2,  k_f3,  k_f4,  k_f5,  k_f6,  k_f7,  k_f8,  k_f9,  k_f10, k_f11, k_f12, \
+k_lb1, k_lb2,    k_tild, k_1, k_2, k_3, k_4, k_5, k_6, k_7, k_8, k_9, k_0, k_minus, k_equals,               k_backspace,   k_ins,   k_home,   k_pgup,   kp_nl,       kp_div, kp_mult, kp_minus,        \
+k_lb3, k_lb4,    k_tab,     k_q, k_w, k_e, k_r, k_t, k_y, k_u, k_i, k_o, k_p, k_squarebrop, k_squarebrcl,      k_backsl,   k_del,   k_end,    k_pgdn,   kp_7,        kp_8,   kp_9,    kp_plus,         \
+k_lb5, k_lb6,    k_caps,       k_a, k_s, k_d, k_f, k_g, k_h, k_j, k_k, k_l, k_semicolon, k_singlequote, k_nuhs,k_return,            k_up,               kp_4,        kp_5,   kp_6,    kp_plus_hidden,  \
+k_lb7, k_lb8,    k_lshift,k_nubs,k_z, k_x, k_c, k_v, k_b, k_n, k_m, k_cm,k_period, k_fwslash,                  k_rshift,   k_left,  k_navmid, k_right,  kp_1,        kp_2,   kp_3,    kp_enter,        \
+k_lb9, k_lb10,   k_lctrl,       k_lalt,                     k_space,                              k_ralt,       k_rctrl,            k_down,             kp_0,                kp_dot                    \
+) \
+{ \
+    /*        0       1             2         3       4        5      6      7      8             9             A              B        C        D                E                F   */ \
+    /* 0 */ { k_lb1,  k_lb4,        k_f3,     k_f1,   k_ins,   k_3,   k_4,   k_6,   k_f5,         k_f7,         k_f9,          k_f11,   k_lb3,   k_right,         k_lb2,           k_lb6   }, \
+    /* 1 */ { k_tab,  k_f21,        k_del,    k_pgdn, k_f22,   k_e,   k_t,   k_u,   k_backspace,  k_minus,      k_down,        k_end,   k_home,  k_f23,           k_f14,           k_caps  }, \
+    /* 2 */ { k_1,    k_f19,        kp_nl,    k_pgup, k_f17,   k_i,   k_r,   k_y,   k_equals,     k_9,          k_0,           kp_mult, kp_div,  k_up,            k_lb9,           k_f16   }, \
+    /* 3 */ { k_q,    k_rshift,     kp_9,     k_2,    KC_NO,   k_k,   k_f,   k_h,   k_squarebrcl, k_o,          k_semicolon,   kp_8,    kp_7,    k_f24,           k_f13,           k_lctrl }, \
+    /* 4 */ { k_a,    KC_NO,        kp_6,     k_w,    k_lalt,  k_d,   k_g,   k_j,   k_backsl,     k_squarebrop, k_singlequote, kp_5,    kp_4,    k_f20,           k_f15,           k_lb10  }, \
+    /* 5 */ { k_z,    k_lshift,     kp_dot,   k_x,    KC_NO,   k_cm,  k_b,   k_m,   k_return,     k_period,     k_p,           kp_0,    kp_1,    k_navmid,        kp_plus_hidden,  k_rctrl }, \
+    /* 6 */ { k_nubs, KC_NO,        kp_3,     k_s,    k_ralt,  k_c,   k_v,   k_n,   k_left,       k_l,          k_fwslash,     kp_2,    kp_plus, k_nuhs,          k_lb7,           KC_NO   }, \
+    /* 7 */ { k_tild, k_f18,        kp_minus, k_f2,   k_f4,    k_8,   k_5,   k_7,   k_f6,         k_f8,         k_f10,         k_f12,   k_lb8,   k_space,         kp_enter,        k_lb5   }  \
+}
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/readme.md b/keyboards/unicomp/pc122/overnumpad_1xb/readme.md
new file mode 100644
index 0000000000..3253a54531
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/readme.md
@@ -0,0 +1,40 @@
+# unicomp/pc122/overnumpad_1xb
+
+![unicomp/pc122/overnumpad_1xb](https://sharktastica.co.uk/resources/images/model_ms/shark_UB40T56_unicomp.jpg)
+
+Will support the Unicomp PC122 keyboard
+
+* Keyboard Maintainer: [Purdea Andrei](https://github.com/purdeaandrei)
+* Hardware Supported: OverNumpad controller v1.Xb
+* Hardware Availability:
+  * [controller](https://github.com/purdeaandrei/overnumpad_controller_1xb)
+  * [keyboard](https://www.pckeyboard.com/)
+
+To place the keyboard into bootloader mode in order to flash it, hold the top-left key of the
+left-side block of the keyboard, while plugging the board in. It's possible to accidentally
+brick this feature, if the wrong firmware is flashed onto the keyboard. If that happens,
+open up the keyboard, and press the RST&PROG button to enter bootloader mode.
+
+Note: LAYOUT_all is incomplete, because certain pairs of possible key positions are mapped to the same matrix position:
+* The hidden key position under the numeric keypad 2-unit vertical enter key overlaps with the key in the 1st column, 4th row of the left-side block (the one that usually comes with "Record" or "Print/Ident" printed on it by default)
+* The hidden key position under the numeric keypad 2-unit horizontal 0 key overlaps with the key position that is normally hidden by a 2u vertical keypad plus key. (This key position is usually exposed as a Field + key, or as a keypad - key)
+* The hidden key position under the 2-unit backspace key overlaps with F19.
+* The hidden key position under the right-shift key overlaps with F20.
+As such it's not possible to make a LAYOUT_all macro that shows all key position.
+The user may still make use of these normally hidden key positions, by hiding the other key they overlap to (or by leaving them accessible but the other key must have the same keycode):
+* To make use of the hidden key under the 2-unit vertical enter key, a 2-unit horizontal key could be used on the 4th row of the left-side block.
+* To make use of the hidden key under the 2-unit horizontal keypad 0 key, a 2-unit vertical + key could be used.
+* To make use of the hidden key under the backspace key, a 2-unit horizontal key could be used over what is normally F19 and F20.
+* To make use of the hidden key under the right-shift key, a 2-unit horizontal key could be used over what is normally F20 and F21.
+As such, mathematically there are 2 * 2 * 3 = 12 possible LAYOUT_all combinations, and we have chosen to only provide the default LAYOUT_all layout. If the user chooses to implement one or more of the above mods,
+they can still make this firmware work with the single default LAYOUT_all, using the above information, by assigning keycodes to their conventional key position.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make unicomp/pc122/overnumpad_1xb:default
+
+Flashing example for this keyboard:
+
+    make unicomp/pc122/overnumpad_1xb:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
new file mode 100644
index 0000000000..8acd50a10f
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F446 # STM32F446RET6
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+ENCODER_ENABLE = no         # Enable rotary encoder support
+AUDIO_ENABLE = no           # Audio output
+KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
+
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER = SOLENOID

From 10005e9f39409986493dc3865cc64734c9db786e Mon Sep 17 00:00:00 2001
From: 3araht <69518343+3araht@users.noreply.github.com>
Date: Fri, 30 Sep 2022 15:13:21 +0900
Subject: [PATCH 513/959] Rotary encoder setting is revised to solve a
 malfunction. (#18227)

* Rotary encoder setting is revised to solve a mulfunction. UNUSED_PINS deleted.

* Encoder map applied.

* ENCODER_MAP_ENABLE moved to keymap level.

* Settings in rules.mk moved to info.json.

* picture sent to imgur. config.h streamlined.
---
 keyboards/chromatonemini/chromatonemini.c     | 52 ----------
 keyboards/chromatonemini/chromatonemini.h     |  9 +-
 keyboards/chromatonemini/config.h             | 94 +------------------
 keyboards/chromatonemini/info.json            | 27 +++++-
 .../chromatonemini/keymaps/default/keymap.c   | 14 ++-
 .../chromatonemini/keymaps/default/rules.mk   |  1 +
 keyboards/chromatonemini/keymaps/led/keymap.c | 29 ++++--
 keyboards/chromatonemini/keymaps/led/rules.mk |  2 +
 .../chromatonemini/keymaps/party/keymap.c     | 30 ++++--
 .../chromatonemini/keymaps/party/rules.mk     |  2 +
 keyboards/chromatonemini/keymaps/via/config.h |  4 -
 keyboards/chromatonemini/keymaps/via/keymap.c | 17 +++-
 keyboards/chromatonemini/keymaps/via/rules.mk |  2 +
 keyboards/chromatonemini/readme.md            |  2 +-
 keyboards/chromatonemini/rules.mk             | 20 ----
 15 files changed, 106 insertions(+), 199 deletions(-)
 create mode 100644 keyboards/chromatonemini/keymaps/default/rules.mk
 delete mode 100644 keyboards/chromatonemini/keymaps/via/config.h

diff --git a/keyboards/chromatonemini/chromatonemini.c b/keyboards/chromatonemini/chromatonemini.c
index 91caab7980..d7dc33a0e0 100644
--- a/keyboards/chromatonemini/chromatonemini.c
+++ b/keyboards/chromatonemini/chromatonemini.c
@@ -154,55 +154,3 @@ uint8_t shift_led_indicator_right(uint8_t scale_indicator_col){
     }
     return scale_indicator_col;
 }
-
-#ifdef ENCODER_ENABLE
-#   ifdef ENCODERS
-static uint8_t  encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
-#   endif
-
-void encoder_action_unregister(void) {
-#   ifdef ENCODERS
-    for (int index = 0; index < ENCODERS; ++index) {
-        if (encoder_state[index]) {
-            keyevent_t encoder_event = (keyevent_t) {
-                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
-                .pressed = false,
-                .time = (timer_read() | 1)
-            };
-            encoder_state[index] = 0;
-            action_exec(encoder_event);
-        }
-    }
-#   endif
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-#   ifdef ENCODERS
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = true,
-        .time = (timer_read() | 1)
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-#       ifdef CONSOLE_ENABLE
-    uprintf("encoder_action_register index = %u, clockwise = %u, row = %u, col = %u\n", index, clockwise, encoder_event.key.row, encoder_event.key.col);
-#       endif
-    action_exec(encoder_event);
-#   endif
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    // don't return user actions, because they are in the keymap
-    // encoder_update_user(index, clockwise);
-    return true;
-};
-
-#endif
diff --git a/keyboards/chromatonemini/chromatonemini.h b/keyboards/chromatonemini/chromatonemini.h
index 83838be73e..d42ee500ce 100644
--- a/keyboards/chromatonemini/chromatonemini.h
+++ b/keyboards/chromatonemini/chromatonemini.h
@@ -27,14 +27,14 @@
  * represents the switch matrix.
  */
 #define LAYOUT( \
-        enc,       sustain,                  ccw, cw,                                                             \
+        enc,       sustain,                                                                                       \
         up,                                                                                                       \
     left, right,   k01, k03, k05, k07, k09, k11, k13, k15, k17, k19, k21, k23, k25, k27, k29, k31, k33, k35, k37, \
         down,        k02, k04, k06, k08, k10, k12, k14, k16, k18, k20, k22, k24, k26, k28, k30, k32, k34, k36     \
 ) { \
     { enc, down, left, right, up,  k01, k02, sustain }, \
-    { k03, k04,  k05,  k06,   k07, k08, k09, ccw     }, \
-    { k10, k11,  k12,  k13,   k14, k15, k16, cw      }, \
+    { k03, k04,  k05,  k06,   k07, k08, k09, KC_NO   }, \
+    { k10, k11,  k12,  k13,   k14, k15, k16, KC_NO   }, \
     { k17, k18,  k19,  k20,   k21, k22, k23, KC_NO   }, \
     { k24, k25,  k26,  k27,   k28, k29, k30, KC_NO   }, \
     { k31, k32,  k33,  k34,   k35, k36, k37, KC_NO   }  \
@@ -117,6 +117,3 @@ extern MidiDevice midi_device;
 uint8_t shift_led_indicator_left(uint8_t scale_indicator_col);
 uint8_t shift_led_indicator_right(uint8_t scale_indicator_col);
 
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h
index 49b8eef7a8..aa7eeac148 100644
--- a/keyboards/chromatonemini/config.h
+++ b/keyboards/chromatonemini/config.h
@@ -19,27 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 8
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D7, C6, D4, D0, D1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
@@ -171,63 +150,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   endif  // CONSOLE_ENABLE
 #endif  // RGB_MATRIX_ENABLE
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-// /* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * 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
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
-
 /* Audio */
 #ifdef AUDIO_ENABLE
 #   define AUDIO_PIN B6  // use PB6 = PIN10 as Audio output
@@ -262,19 +184,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define MIDI_INITIAL_VELOCITY 117
 #endif  //  MIDI_ENABLE
 
-/*
- * Encoder options
- */
-#ifdef ENCODER_ENABLE
-#   define ENCODERS_PAD_A { B5 }
-#   define ENCODERS_PAD_B { B4 }
-#   define ENCODER_RESOLUTION 4
-#   define TAP_CODE_DELAY 10
-
-#define ENCODERS 1
-#define ENCODERS_CW_KEY  { {7, 2} }
-#define ENCODERS_CCW_KEY { {7, 1} }
-#endif  // ENCODER_ENABLE
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
 
 /* 2021/01/22 added to shrink firmware size */
 // NO_ACTION_TAPPING -1964 bytes, however, this disables Layer mods...
diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json
index 5f77db05ee..7d33f4ed20 100644
--- a/keyboards/chromatonemini/info.json
+++ b/keyboards/chromatonemini/info.json
@@ -3,6 +3,26 @@
     "manufacturer": "3araht",
     "url": "https://github.com/3araht/chromatonemini",
     "maintainer": "3araht",
+    "bootloader": "caterina",
+    "processor": "atmega32u4",
+    "features": {
+        "midi": true,
+        "extrakey": true,
+        "encoder": true,
+        "via": true,
+        "bootmagic": false,
+        "console": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": false,
+        "audio": false
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [ "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6" ],
+        "rows": [ "E6", "D7", "C6", "D4", "D0", "D1" ]
+    },
+    "debounce": 5,
     "usb": {
         "vid": "0xFEED",
         "pid": "0xF4B4",
@@ -13,8 +33,6 @@
             "layout": [
                 {"label":"enc", "x":0.5, "y":0},
                 {"label":"sustain", "x":1.5, "y":0},
-                {"label":"ccw", "x":2.5, "y":0},
-                {"label":"cw", "x":3.5, "y":0},
                 {"label":"up", "x":0.5, "y":1.5},
                 {"label":"left", "x":0, "y":2.5},
                 {"label":"right", "x":1, "y":2.5},
@@ -57,5 +75,10 @@
                 {"label":"k34", "x":19, "y":3.5},
                 {"label":"k36", "x":20, "y":3.5}]
         }
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B5", "pin_b": "B4", "resolution": 4 }
+        ]
     }
 }
diff --git a/keyboards/chromatonemini/keymaps/default/keymap.c b/keyboards/chromatonemini/keymaps/default/keymap.c
index 102aba930a..4527065c3b 100644
--- a/keyboards/chromatonemini/keymaps/default/keymap.c
+++ b/keyboards/chromatonemini/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ extern midi_config_t midi_config;
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,          MI_SUS,                            KC_VOLD, KC_VOLU,
+            FN_MUTE,          MI_SUS,
             MI_BENDU,
         MI_TRNSD, MI_TRNSU,  MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -47,20 +47,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* RESERVE */
     [_RESERVE] = LAYOUT(
-            _______,          _______,                             _______, _______,
+            _______,          _______,
             _______,
         _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
     [_FN] =  LAYOUT(
-            _______,          XXXXXXX,                             XXXXXXX, XXXXXXX,
+            _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     L_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, XXXXXXX,
             MI_VELD,               L_RESERVE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, XXXXXXX, XXXXXXX
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_RESERVE] = { ENCODER_CCW_CW(_______, _______)  },
+    [_FN]      = { ENCODER_CCW_CW(_______, _______)  },
+};
+#endif
+
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
     //  Set octave to MI_OCT_1
diff --git a/keyboards/chromatonemini/keymaps/default/rules.mk b/keyboards/chromatonemini/keymaps/default/rules.mk
new file mode 100644
index 0000000000..8006608ea9
--- /dev/null
+++ b/keyboards/chromatonemini/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/chromatonemini/keymaps/led/keymap.c b/keyboards/chromatonemini/keymaps/led/keymap.c
index 99da8ed0c9..a68ec2ad38 100644
--- a/keyboards/chromatonemini/keymaps/led/keymap.c
+++ b/keyboards/chromatonemini/keymaps/led/keymap.c
@@ -215,7 +215,7 @@ static uint8_t key_separator_col = _KEY01;  //  (_KEY01 .. _KEY37).     By defau
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUS,                             KC_VOLD, KC_VOLU,
+            FN_MUTE,         MI_SUS,
             MI_BENDU,
         SHIFT_L, SHIFT_R,    MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -223,7 +223,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 1 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPALEFTOCT] = LAYOUT(
-            _______,          _______,                             _______, _______,
+            _______,          _______,
             _______,
         SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Half ch2, half ch1 (normal) */
     [_SEPAHALF] = LAYOUT(
-            _______,           _______,                             _______, _______,
+            _______,           _______,
             _______,
         SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -239,7 +239,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 2 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPARIGHTOCT] = LAYOUT(
-            _______,           _______,                             _______, _______,
+            _______,           _______,
             _______,
         SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -247,7 +247,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* TRANS   This layer must locate 1 layer below _FN layer. */
     [_TRANS] = LAYOUT(
-            _______,           _______,                             _______, _______,
+            _______,           _______,
             _______,
         MI_TRNSD, MI_TRNSU,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
@@ -255,7 +255,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Flip Base    SFIFTUP and SHIFT_L are swapped. */
     [_FLIPBASE] = LAYOUT(
-            FN_MUTE,          MI_SUS,                             KC_VOLD, KC_VOLU,
+            FN_MUTE,          MI_SUS,
             MI_BENDU,
         SHIFT_L, SHIFT_R,     MI_C_5, MI_Bb_4, MI_Ab_4,  MI_Fs_4, MI_E_4, MI_D_4, MI_C_4, MI_Bb_3, MI_Ab_3, MI_Fs_3, MI_E_3, MI_D_3, MI_C_3,  MI_Bb_2,  MI_Ab_2, MI_Fs_2, MI_E_2, MI_D_2, MI_C_2,
             MI_BENDD,           MI_B_4, MI_A_4, MI_G_4,  MI_F_4,  MI_Eb_4,  MI_Db_4, MI_B_3, MI_A_3, MI_G_3,  MI_F_3, MI_Eb_3,  MI_Db_3, MI_B_2, MI_A_2, MI_G_2,  MI_F_2,  MI_Eb_2,  MI_Db_2
@@ -263,20 +263,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRNSU and MI_TRNSD are swapped. */
     [_FLIPTRANS] = LAYOUT(
-            _______,          _______,                             _______, _______,
+            _______,          _______,
             _______,
         MI_TRNSU, MI_TRNSD,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
     [_FN] =  LAYOUT(
-            _______,          XXXXXXX,                             RGB_RMOD, RGB_MOD,
+            _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     B_BASE,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, B_LEFT, XXXXXXX, XXXXXXX, B_CENTER, XXXXXXX, XXXXXXX, B_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, B_FLIP,
             MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EEP_RST, TGLINDI, RGB_TOG
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE]         = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_SEPALEFTOCT]  = { ENCODER_CCW_CW(_______, _______)  },
+    [_SEPAHALF]     = { ENCODER_CCW_CW(_______, _______)  },
+    [_SEPARIGHTOCT] = { ENCODER_CCW_CW(_______, _______)  },
+    [_TRANS]        = { ENCODER_CCW_CW(_______, _______)  },
+    [_FLIPBASE]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_FLIPTRANS]    = { ENCODER_CCW_CW(_______, _______)  },
+    [_FN]           = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
+
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
     //  Set octave to MI_OCT_1
diff --git a/keyboards/chromatonemini/keymaps/led/rules.mk b/keyboards/chromatonemini/keymaps/led/rules.mk
index 2e67e80675..eb13370b82 100644
--- a/keyboards/chromatonemini/keymaps/led/rules.mk
+++ b/keyboards/chromatonemini/keymaps/led/rules.mk
@@ -1,3 +1,5 @@
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
 RGB_MATRIX_CUSTOM_KB = yes  #
 VIA_ENABLE = no             # too many layers to use VIA...
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/chromatonemini/keymaps/party/keymap.c b/keyboards/chromatonemini/keymaps/party/keymap.c
index 258bfe55c1..7383b81d8b 100644
--- a/keyboards/chromatonemini/keymaps/party/keymap.c
+++ b/keyboards/chromatonemini/keymaps/party/keymap.c
@@ -215,7 +215,7 @@ static uint8_t key_separator_col = _KEY01;  //  (_KEY01 .. _KEY37).     By defau
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUS,                             KC_VOLD, KC_VOLU,
+            FN_MUTE,         MI_SUS,
             MI_BENDU,
         SHIFT_L, SHIFT_R,    MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -223,7 +223,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 1 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPALEFTOCT] = LAYOUT(
-            _______,          _______,                             _______, _______,
+            _______,          _______,
             _______,
         SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Half ch2, half ch1 (normal) */
     [_SEPAHALF] = LAYOUT(
-            _______,           _______,                             _______, _______,
+            _______,           _______,
             _______,
         SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -239,7 +239,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 2 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPARIGHTOCT] = LAYOUT(
-            _______,           _______,                             _______, _______,
+            _______,           _______,
             _______,
         SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -247,7 +247,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* TRANS   This layer must locate 1 layer below _FN layer. */
     [_TRANS] = LAYOUT(
-            _______,           _______,                             _______, _______,
+            _______,           _______,
             _______,
         MI_TRNSD, MI_TRNSU,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
@@ -255,7 +255,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Flip Base    SFIFTUP and SHIFT_L are swapped. */
     [_FLIPBASE] = LAYOUT(
-            FN_MUTE,          MI_SUS,                             KC_VOLD, KC_VOLU,
+            FN_MUTE,          MI_SUS,
             MI_BENDU,
         SHIFT_L, SHIFT_R,     MI_C_5, MI_Bb_4, MI_Ab_4,  MI_Fs_4, MI_E_4, MI_D_4, MI_C_4, MI_Bb_3, MI_Ab_3, MI_Fs_3, MI_E_3, MI_D_3, MI_C_3,  MI_Bb_2,  MI_Ab_2, MI_Fs_2, MI_E_2, MI_D_2, MI_C_2,
             MI_BENDD,           MI_B_4, MI_A_4, MI_G_4,  MI_F_4,  MI_Eb_4,  MI_Db_4, MI_B_3, MI_A_3, MI_G_3,  MI_F_3, MI_Eb_3,  MI_Db_3, MI_B_2, MI_A_2, MI_G_2,  MI_F_2,  MI_Eb_2,  MI_Db_2
@@ -263,20 +263,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRNSU and MI_TRNSD are swapped. */
     [_FLIPTRANS] = LAYOUT(
-            _______,          _______,                             _______, _______,
+            _______,          _______,
             _______,
         MI_TRNSU, MI_TRNSD,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
     [_FN] =  LAYOUT(
-            _______,          XXXXXXX,                             RGB_RMOD, RGB_MOD,
+            _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     B_BASE,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, B_LEFT, XXXXXXX, XXXXXXX, B_CENTER, XXXXXXX, XXXXXXX, B_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, B_FLIP,
             MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EEP_RST, TGLINDI, RGB_TOG
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE]         = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_SEPALEFTOCT]  = { ENCODER_CCW_CW(_______, _______)  },
+    [_SEPAHALF]     = { ENCODER_CCW_CW(_______, _______)  },
+    [_SEPARIGHTOCT] = { ENCODER_CCW_CW(_______, _______)  },
+    [_TRANS]        = { ENCODER_CCW_CW(_______, _______)  },
+    [_FLIPBASE]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_FLIPTRANS]    = { ENCODER_CCW_CW(_______, _______)  },
+    [_FN]           = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
+
+
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
     //  Set octave to MI_OCT_1
diff --git a/keyboards/chromatonemini/keymaps/party/rules.mk b/keyboards/chromatonemini/keymaps/party/rules.mk
index 2e67e80675..eb13370b82 100644
--- a/keyboards/chromatonemini/keymaps/party/rules.mk
+++ b/keyboards/chromatonemini/keymaps/party/rules.mk
@@ -1,3 +1,5 @@
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
 RGB_MATRIX_CUSTOM_KB = yes  #
 VIA_ENABLE = no             # too many layers to use VIA...
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/chromatonemini/keymaps/via/config.h b/keyboards/chromatonemini/keymaps/via/config.h
deleted file mode 100644
index b5ee0ac04b..0000000000
--- a/keyboards/chromatonemini/keymaps/via/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-// How many layers to use with VIA / Remap.
-#define DYNAMIC_KEYMAP_LAYER_COUNT 4 // default:4
diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c
index 08613515db..b4ea6e30fe 100644
--- a/keyboards/chromatonemini/keymaps/via/keymap.c
+++ b/keyboards/chromatonemini/keymaps/via/keymap.c
@@ -61,7 +61,7 @@ static bool is_trans_mode = false;     //  By default, shift mode is chosen.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUS,                             KC_VOLD, KC_VOLU,
+            FN_MUTE,         MI_SUS,
             MI_BENDU,
         SHIFT_L, SHIFT_R,    MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
             MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* TRANS   This layer must locate 1 layer below _FN layer. */
     [_TRANS] = LAYOUT(
-            _______,           _______,                             _______, _______,
+            _______,           _______,
             _______,
         MI_TRNSD, MI_TRNSU,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
@@ -77,20 +77,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* RESERVE */
     [_RESERVE] = LAYOUT(
-            _______,          _______,                             _______, _______,
+            _______,          _______,
             _______,
         _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
     [_FN] =  LAYOUT(
-            _______,          XXXXXXX,                             RGB_RMOD, RGB_MOD,
+            _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     B_BASE, DF(_RESERVE), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, XXXXXXX,
             MI_VELD,              TGLINTR,    TGLTRNS, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EEP_RST, TGLINDI, RGB_TOG
     )
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE]         = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_TRANS]        = { ENCODER_CCW_CW(_______, _______)  },
+    [_RESERVE]      = { ENCODER_CCW_CW(_______, _______)  },
+    [_FN]           = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
+
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
     //  Set octave to MI_OCT_1
diff --git a/keyboards/chromatonemini/keymaps/via/rules.mk b/keyboards/chromatonemini/keymaps/via/rules.mk
index 3de88c90c8..b4d2b42885 100644
--- a/keyboards/chromatonemini/keymaps/via/rules.mk
+++ b/keyboards/chromatonemini/keymaps/via/rules.mk
@@ -1,3 +1,5 @@
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
 RGB_MATRIX_CUSTOM_KB = yes  #
 VIA_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/chromatonemini/readme.md b/keyboards/chromatonemini/readme.md
index 4c018d01a9..34ba7e6f14 100644
--- a/keyboards/chromatonemini/readme.md
+++ b/keyboards/chromatonemini/readme.md
@@ -1,6 +1,6 @@
 # chromatonemini
 
-![chromatonemini](https://github.com/3araht/chromatonemini/blob/main/pictures/chromatonemini_toppage.jpg)
+![chromatonemini](https://i.imgur.com/SuXzf9Dh.jpg)
 
 chromatonemini keyboard is a simple-design Chromatone mini MIDI keyboard that covers 3 octaves (37 notes).
 
diff --git a/keyboards/chromatonemini/rules.mk b/keyboards/chromatonemini/rules.mk
index 29cfc35daf..0e94fdb0d7 100644
--- a/keyboards/chromatonemini/rules.mk
+++ b/keyboards/chromatonemini/rules.mk
@@ -1,22 +1,2 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-MIDI_ENABLE = yes           # MIDI support
-ENCODER_ENABLE = yes        # encoder on mute button
 RGB_MATRIX_DRIVER = WS2812  #
 LTO_ENABLE = yes

From e0115caab92167b23ff9dd9d1f68cd03c830bfec Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 1 Oct 2022 02:14:41 +1000
Subject: [PATCH 514/959] onekey: enable ADC for Bluepill and Blackpill
 (#18545)

---
 keyboards/handwired/onekey/blackpill_f401/halconf.h         | 2 ++
 keyboards/handwired/onekey/blackpill_f401/mcuconf.h         | 3 +++
 keyboards/handwired/onekey/blackpill_f411/halconf.h         | 2 ++
 keyboards/handwired/onekey/blackpill_f411/mcuconf.h         | 3 +++
 keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h | 3 +++
 keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h | 3 +++
 keyboards/handwired/onekey/bluepill/halconf.h               | 2 ++
 keyboards/handwired/onekey/bluepill/mcuconf.h               | 3 +++
 keyboards/handwired/onekey/bluepill_f103c6/halconf.h        | 2 ++
 keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h        | 3 +++
 10 files changed, 26 insertions(+)

diff --git a/keyboards/handwired/onekey/blackpill_f401/halconf.h b/keyboards/handwired/onekey/blackpill_f401/halconf.h
index 020a7722f0..4982bb5b49 100644
--- a/keyboards/handwired/onekey/blackpill_f401/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_I2C TRUE
 
 #define HAL_USE_PWM TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
index e614a9dfa9..1aa0fe4ce7 100644
--- a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
@@ -18,6 +18,9 @@
 
 #include_next "mcuconf.h"
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
diff --git a/keyboards/handwired/onekey/blackpill_f411/halconf.h b/keyboards/handwired/onekey/blackpill_f411/halconf.h
index 4a0da20890..8225cc7208 100644
--- a/keyboards/handwired/onekey/blackpill_f411/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_I2C TRUE
 
 #define HAL_USE_PWM TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
index e614a9dfa9..1aa0fe4ce7 100644
--- a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
@@ -18,6 +18,9 @@
 
 #include_next "mcuconf.h"
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
index e15870984f..00aca25c36 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
@@ -16,7 +16,10 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_I2C TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
index d003af03e5..fcb7d84f96 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
@@ -18,6 +18,9 @@
 
 #include_next "mcuconf.h"
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
diff --git a/keyboards/handwired/onekey/bluepill/halconf.h b/keyboards/handwired/onekey/bluepill/halconf.h
index 923b4e52d2..dbc3e82a79 100644
--- a/keyboards/handwired/onekey/bluepill/halconf.h
+++ b/keyboards/handwired/onekey/bluepill/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/bluepill/mcuconf.h b/keyboards/handwired/onekey/bluepill/mcuconf.h
index 5e94a97e21..39834c135b 100644
--- a/keyboards/handwired/onekey/bluepill/mcuconf.h
+++ b/keyboards/handwired/onekey/bluepill/mcuconf.h
@@ -23,6 +23,9 @@
 
 #include_next <mcuconf.h>
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/halconf.h b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
index 923b4e52d2..dbc3e82a79 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
index 5e94a97e21..39834c135b 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
@@ -23,6 +23,9 @@
 
 #include_next <mcuconf.h>
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 

From 4dfd744e4e6b609bc31bfede61fb98b906f275cb Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Sat, 1 Oct 2022 03:42:28 +0800
Subject: [PATCH 515/959] [Keyboard] Add nightstar75 (#18546)

---
 keyboards/yandrstudio/nightstar75/board.h     |  21 +
 keyboards/yandrstudio/nightstar75/config.h    |  58 +++
 keyboards/yandrstudio/nightstar75/halconf.h   |  20 +
 keyboards/yandrstudio/nightstar75/info.json   | 423 ++++++++++++++++++
 .../nightstar75/keymaps/default/keymap.c      |  36 ++
 .../nightstar75/keymaps/via/keymap.c          |  54 +++
 .../nightstar75/keymaps/via/rules.mk          |   1 +
 keyboards/yandrstudio/nightstar75/mcuconf.h   |  24 +
 .../yandrstudio/nightstar75/nightstar75.c     |  39 ++
 .../yandrstudio/nightstar75/nightstar75.h     |  33 ++
 keyboards/yandrstudio/nightstar75/readme.md   |  22 +
 keyboards/yandrstudio/nightstar75/rules.mk    |  16 +
 12 files changed, 747 insertions(+)
 create mode 100644 keyboards/yandrstudio/nightstar75/board.h
 create mode 100644 keyboards/yandrstudio/nightstar75/config.h
 create mode 100644 keyboards/yandrstudio/nightstar75/halconf.h
 create mode 100644 keyboards/yandrstudio/nightstar75/info.json
 create mode 100644 keyboards/yandrstudio/nightstar75/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/nightstar75/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/nightstar75/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/nightstar75/mcuconf.h
 create mode 100644 keyboards/yandrstudio/nightstar75/nightstar75.c
 create mode 100644 keyboards/yandrstudio/nightstar75/nightstar75.h
 create mode 100644 keyboards/yandrstudio/nightstar75/readme.md
 create mode 100644 keyboards/yandrstudio/nightstar75/rules.mk

diff --git a/keyboards/yandrstudio/nightstar75/board.h b/keyboards/yandrstudio/nightstar75/board.h
new file mode 100644
index 0000000000..d83804babd
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
new file mode 100644
index 0000000000..767628fc3f
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_COL_PINS { C13, C14, C15, A3,   A4,  A5,  A6,  B12, B13, B14, B15,  A8,  A9, A10, B8 }
+#define MATRIX_ROW_PINS { B0,  B1,  B2,  B10,  B11, B9 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+#ifdef RGBLIGHT_ENABLE
+
+#    define RGB_DI_PIN A7
+#    define RGBLED_NUM 4
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGBLIGHT_LIMIT_VAL 180
+
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+
+#    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#    define RGBLIGHT_LAYERS_RETAIN_VAL
+
+#   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
+#   define WS2812_PWM_CHANNEL 2     // default: 2
+#   define WS2812_PWM_PAL_MODE 2
+#   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#   define WS2812_DMA_CHANNEL 3
+
+#endif
diff --git a/keyboards/yandrstudio/nightstar75/halconf.h b/keyboards/yandrstudio/nightstar75/halconf.h
new file mode 100644
index 0000000000..ba0354cfb3
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM    TRUE
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
new file mode 100644
index 0000000000..4f8105fae8
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -0,0 +1,423 @@
+{
+    "keyboard_name": "nightstar75",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA87",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "0,0",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "0,1",
+                    "x": 1.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,2",
+                    "x": 2.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,3",
+                    "x": 3.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,4",
+                    "x": 4.25,
+                    "y": 0
+                },
+                {
+                    "label": "0,5",
+                    "x": 5.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,6",
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,7",
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,8",
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "label": "0,9",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "0,10",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0,11",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "0,12",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "1,0",
+                    "x": 0,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,1",
+                    "x": 1,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,2",
+                    "x": 2,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,3",
+                    "x": 3,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,4",
+                    "x": 4,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,5",
+                    "x": 5,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,6",
+                    "x": 6,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,7",
+                    "x": 7,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,8",
+                    "x": 8,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,9",
+                    "x": 9,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,10",
+                    "x": 10,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,11",
+                    "x": 11,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,12",
+                    "x": 12,
+                    "y": 1.5
+                },
+                {
+                    "label": "1,13",
+                    "x": 13,
+                    "y": 1.5,
+                    "w": 2
+                },
+                {
+                    "label": "1,14",
+                    "x": 15,
+                    "y": 1.5
+                },
+                {
+                    "label": "2,0",
+                    "x": 0,
+                    "y": 2.5,
+                    "w": 1.5
+                },
+                {
+                    "label": "2,1",
+                    "x": 1.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,2",
+                    "x": 2.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,3",
+                    "x": 3.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,4",
+                    "x": 4.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,5",
+                    "x": 5.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,6",
+                    "x": 6.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,7",
+                    "x": 7.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,8",
+                    "x": 8.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,9",
+                    "x": 9.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,10",
+                    "x": 10.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,11",
+                    "x": 11.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,12",
+                    "x": 12.5,
+                    "y": 2.5
+                },
+                {
+                    "label": "2,13",
+                    "x": 13.5,
+                    "y": 2.5,
+                    "w": 1.5
+                },
+                {
+                    "label": "2,14",
+                    "x": 15,
+                    "y": 2.5
+                },
+                {
+                    "label": "3,0",
+                    "x": 0,
+                    "y": 3.5,
+                    "w": 1.75
+                },
+                {
+                    "label": "3,1",
+                    "x": 1.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,2",
+                    "x": 2.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,3",
+                    "x": 3.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,4",
+                    "x": 4.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,5",
+                    "x": 5.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,6",
+                    "x": 6.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,7",
+                    "x": 7.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,8",
+                    "x": 8.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,9",
+                    "x": 9.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,10",
+                    "x": 10.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,11",
+                    "x": 11.75,
+                    "y": 3.5
+                },
+                {
+                    "label": "3,13",
+                    "x": 12.75,
+                    "y": 3.5,
+                    "w": 2.25
+                },
+                {
+                    "label": "3,14",
+                    "x": 15,
+                    "y": 3.5
+                },
+                {
+                    "label": "4,0",
+                    "x": 0,
+                    "y": 4.5,
+                    "w": 2.25
+                },
+                {
+                    "label": "4,2",
+                    "x": 2.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,3",
+                    "x": 3.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,4",
+                    "x": 4.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,5",
+                    "x": 5.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,6",
+                    "x": 6.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,7",
+                    "x": 7.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,8",
+                    "x": 8.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,9",
+                    "x": 9.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,10",
+                    "x": 10.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,11",
+                    "x": 11.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "4,12",
+                    "x": 12.25,
+                    "y": 4.5,
+                    "w": 1.75
+                },
+                {
+                    "label": "4,13",
+                    "x": 14,
+                    "y": 4.5
+                },
+                {
+                    "label": "5,0",
+                    "x": 0,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,1",
+                    "x": 1.25,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,3",
+                    "x": 2.5,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,6",
+                    "x": 3.75,
+                    "y": 5.5,
+                    "w": 6.25
+                },
+                {
+                    "label": "5,10",
+                    "x": 10,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,11",
+                    "x": 11.25,
+                    "y": 5.5,
+                    "w": 1.25
+                },
+                {
+                    "label": "5,12",
+                    "x": 13,
+                    "y": 5.5
+                },
+                {
+                    "label": "5,13",
+                    "x": 14,
+                    "y": 5.5
+                },
+                {
+                    "label": "5,14",
+                    "x": 15,
+                    "y": 5.5
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/nightstar75/keymaps/default/keymap.c b/keyboards/yandrstudio/nightstar75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..54d6b298ae
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,KC_F6,  KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,
+
+		KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5, KC_6,   KC_7,    KC_8,      KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_INS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G, KC_H,   KC_J,    KC_K,      KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_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(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/nightstar75/keymaps/via/keymap.c b/keyboards/yandrstudio/nightstar75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a3bc2f6e2e
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,KC_F6,  KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,
+
+		KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5, KC_6,   KC_7,    KC_8,      KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_INS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G, KC_H,   KC_J,    KC_K,      KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_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(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[3] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/nightstar75/keymaps/via/rules.mk b/keyboards/yandrstudio/nightstar75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/nightstar75/mcuconf.h b/keyboards/yandrstudio/nightstar75/mcuconf.h
new file mode 100644
index 0000000000..bb8892722e
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/nightstar75/nightstar75.c b/keyboards/yandrstudio/nightstar75/nightstar75.c
new file mode 100644
index 0000000000..55fc6b9bcd
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/nightstar75.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "nightstar75.h"
+
+#ifdef RGBLIGHT_ENABLE
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 4, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+void keyboard_post_init_kb(void) {
+    rgblight_layers = my_rgb_layers;
+    rgblight_reload_from_eeprom();
+    keyboard_post_init_user();
+}
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        rgblight_set_layer_state(0, led_state.caps_lock);
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/yandrstudio/nightstar75/nightstar75.h b/keyboards/yandrstudio/nightstar75/nightstar75.h
new file mode 100644
index 0000000000..8b91460297
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/nightstar75.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
+	K500,       K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, \
+	K600, K601,       K603,             K606,                   K610, K611, K612, K613, K614  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, KC_NO }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
+	{ K500,  KC_NO, K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  K512,  K513,  KC_NO }, \
+	{ K600,  K601,  KC_NO, K603,  KC_NO, KC_NO, K606,  KC_NO, KC_NO, KC_NO, K610,  K611,  K612,  K613,  K614 }  \
+}
diff --git a/keyboards/yandrstudio/nightstar75/readme.md b/keyboards/yandrstudio/nightstar75/readme.md
new file mode 100644
index 0000000000..cfa49ff9e4
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/readme.md
@@ -0,0 +1,22 @@
+# nightstar75
+
+![nightstar75](https://i.imgur.com/XupTUBXh.png)
+A 75% keyboard with RGBs.
+This keyboard use 16mhz HSE and APM32F103 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: nightstar75
+- Hardware Availability: [ZFrontier](https://www.zfrontier.com/app/flow/D6pZpAylmoqm)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/nightstar75:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/nightstar75/rules.mk b/keyboards/yandrstudio/nightstar75/rules.mk
new file mode 100644
index 0000000000..54e3f61af5
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/rules.mk
@@ -0,0 +1,16 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+WS2812_DRIVER = pwm         # WS2812 RGB Driver
+AUDIO_ENABLE = no           # Audio output

From 3b95f97a19847786550c7813d6a6a5731d525620 Mon Sep 17 00:00:00 2001
From: Pascal J <3cwrucjat@relay.firefox.com>
Date: Fri, 30 Sep 2022 22:08:10 +0200
Subject: [PATCH 516/959] [Keyboard] handwired/tractyl_manuform: Arduino Micro
 (#17199)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../tractyl_manuform/5x6_right/5x6_right.h    |  2 +
 .../5x6_right/arduinomicro/arduinomicro.h     | 19 ++++++++
 .../5x6_right/arduinomicro/config.h           | 44 +++++++++++++++++++
 .../5x6_right/arduinomicro/rules.mk           |  5 +++
 4 files changed, 70 insertions(+)
 create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h
 create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
 create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
index f171d41181..10b8767056 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
@@ -26,6 +26,8 @@
 #    include "teensy2pp.h"
 #elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_elite_c)
 #    include "elite_c.h"
+#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_arduinomicro)
+#    include "arduinomicro.h"
 #endif
 
 #include "quantum.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h
new file mode 100644
index 0000000000..525b0378b4
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
new file mode 100644
index 0000000000..e43361cf64
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
@@ -0,0 +1,44 @@
+/*
+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 PRODUCT "Tractyl Manuform(5x6) Aruino Micro (r)/ Pro Micro (l)"
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 6
+
+// wiring of each half
+// left
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
+// right
+#define MATRIX_COL_PINS_RIGHT { D6, D7, B4, D3, C6, C7 }
+#define MATRIX_ROW_PINS_RIGHT { D4, B7, F7, B6, B5, F6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* serial.c configuration for split keyboard */
+//#undef USE_I2C
+#define SOFT_SERIAL_PIN D0
+#define MASTER_RIGHT
+
+/* PMW3360 Settings */
+#define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
new file mode 100644
index 0000000000..cf663a7ed6
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
@@ -0,0 +1,5 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina

From 5329f2558cf2ed45e9876bd557e03d54b244519b Mon Sep 17 00:00:00 2001
From: Forrest Cahoon <forrest.cahoon@gmail.com>
Date: Fri, 30 Sep 2022 15:23:24 -0500
Subject: [PATCH 517/959] Forrcaho foldkb caps lock blink (#17424)

* Add mapping for Keebio FoldKB

* Add (test) macro key; draw box chars around layout

* More programming macro keys added

* Fix stupid bug: return false when key has been handled

* Add mouse layer

* Encoder functions as mouse scroll wheel

* add readme.md for my foldkb layout

* Custom Keebio FoldKB keymap: blink backlight when caps lock is on
---
 .../keebio/foldkb/keymaps/forrcaho/keymap.c   | 84 ++++++++++++++++---
 1 file changed, 72 insertions(+), 12 deletions(-)

diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c b/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
index 228cbd6079..024a9aad2e 100644
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
+++ b/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
@@ -14,6 +14,11 @@ 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 {
@@ -23,7 +28,8 @@ enum layer {
 };
 
 enum custom_keycodes {
-    PG_BANG = SAFE_RANGE,
+    PG_ARRO = SAFE_RANGE,
+    PG_BANG,
     PG_ENDC,
     PG_EQEQ,
     PG_EQL,
@@ -48,9 +54,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
     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,      MO(_PG),
+    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(_MS),   KC_RALT,   KC_RCTL,  KC_RGUI
+    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(
@@ -61,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
     _______,     _______,      PG_ENDC, PG_VBAR, PG_LBRK, PG_RBRK, PG_EQEQ,          _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_BSPC,
 // ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
-    _______, _______,          _______, PG_MINS, PG_EQL,  PG_BANG, _______,          _______, KC_END,  KC_DOWN, KC_PGDN, KC_DEL,  _______,      _______,
+    _______, _______,          _______, PG_MINS, PG_EQL,  PG_BANG, PG_ARRO,          _______, KC_END,  KC_DOWN, KC_PGDN, KC_DEL,  _______,      _______,
 // ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
     _______,     _______,   _______,  _______,   _______, _______, _______,          _______,   _______,      _______,   _______,   _______,  _______
 // └────────┴───┴──────────┴─────────┴──────────┴────────┴────────┴────────┘        └──────────┴─────────────┴──────────┴──────────┴─────────┴──────────┘
@@ -72,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├────────┼───┬────┴────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     _______,     _______,      _______, _______, _______, _______, _______,          _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______,
 // ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-    _______,     _______,      _______, _______, _______, _______, _______,          _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______,
+    _______,     _______,      _______, _______, _______, _______, _______,          _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN3, _______, _______,
 // ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
     _______, _______,          _______, _______, _______, _______, _______,          _______, _______, KC_MS_D, _______, _______, _______,      _______,
 // ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
@@ -97,9 +103,6 @@ const key_override_t pg_rpar_shift = ko_make_with_layers_and_negmods(MOD_MASK_SH
 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 pg_vbar_none  = ko_make_with_layers_and_negmods(0, PG_VBAR, KC_PIPE, ~0, ~0);
-const key_override_t pg_vbar_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_VBAR, KC_AMPERSAND, ~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);
 
@@ -110,7 +113,6 @@ const key_override_t **key_overrides = (const key_override_t *[]){
     &pg_rbrk_none, &pg_rbrk_shift,
     &pg_rpar_none, &pg_rpar_shift,
     &pg_slas_none, &pg_slas_shift,
-    &pg_vbar_none, &pg_vbar_shift,
     &ms_btn_none, &ms_btn_shift,
     NULL};
 // clang-format on
@@ -128,6 +130,35 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     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();
@@ -212,6 +243,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 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;
 }
@@ -226,21 +269,38 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     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(2);
+            backlight_level(1);
             break;
         case _PG:
             backlight_level(3);
             break;
         default:
-            backlight_level(1);
+            backlight_level(2);
             break;
     }
     return state;
 }
 
 void keyboard_post_init(void) {
-    backlight_level(1);
+    backlight_level(2);
 }

From 8bd73d44555ecb50d0da9bb0e1e48c07b9764e35 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Fri, 30 Sep 2022 22:24:43 +0200
Subject: [PATCH 518/959] Fix keyboard pet OLED timeout logic (#17189)

The animation itself turns the screen on, preventing the normal timeout
from ever triggering.
---
 keyboards/crkbd/keymaps/bermeo/keymap.c       | 11 +++---
 .../ellora65/keymaps/default/keymap.c         | 29 +++++++--------
 .../kikoslab/ellora65/keymaps/via/keymap.c    | 30 ++++++++--------
 keyboards/sofle/keymaps/flare576/graphics.c   |  8 ++---
 keyboards/sofle/keymaps/helltm/keymap.c       | 29 +++++++--------
 keyboards/sofle/keymaps/noqmk/keymap.c        | 36 +++++++++----------
 6 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/keyboards/crkbd/keymaps/bermeo/keymap.c b/keyboards/crkbd/keymaps/bermeo/keymap.c
index 8c3d368ca0..d204fd9f3f 100644
--- a/keyboards/crkbd/keymaps/bermeo/keymap.c
+++ b/keyboards/crkbd/keymaps/bermeo/keymap.c
@@ -273,7 +273,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 #    define ANIM_SIZE 96            // number of bytes in array. If you change sprites, minimize for adequate firmware size. max is 1024
 /* timers */
 uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
 /* current frame */
 uint8_t current_frame = 0;
 /* status variables */
@@ -351,19 +350,19 @@ static void render_luna(int LUNA_X, int LUNA_Y) {
         current_frame = (current_frame + 1) % 2;
         /* draw */
         if (isBarking) {
-            oled_write_raw_P(bark[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
 
         } else if (isSneaking) {
-            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
 
         } else {
-            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(run[current_frame], ANIM_SIZE);
         }
     }
     /* animation timer */
diff --git a/keyboards/kikoslab/ellora65/keymaps/default/keymap.c b/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
index 625305c557..df0b5b046c 100644
--- a/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
+++ b/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
@@ -68,7 +68,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 
 /* timers */
 uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
 
 /* current frame */
 uint8_t current_frame = 0;
@@ -160,35 +159,37 @@ static void render_luna(int LUNA_X, int LUNA_Y) {
 
         /* current status */
         if (led_usb_state.caps_lock) {
-            oled_write_raw_P(bark[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
 
         } else if (isSneaking) {
-            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
 
         } else {
-            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(run[current_frame], ANIM_SIZE);
         }
     }
 
+#    if OLED_TIMEOUT > 0
+    /* the animation prevents the normal timeout from occuring */
+    if (last_input_activity_elapsed() > OLED_TIMEOUT && last_led_activity_elapsed() > OLED_TIMEOUT) {
+        oled_off();
+        return;
+    } else {
+        oled_on();
+    }
+#    endif
+
     /* animation timer */
     if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
         anim_timer = timer_read32();
         animate_luna();
     }
-
-    /* this fixes the screen on and off bug */
-    if (current_wpm > 0) {
-        oled_on();
-        anim_sleep = timer_read32();
-    } else if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-        oled_off();
-    }
 }
 
 
diff --git a/keyboards/kikoslab/ellora65/keymaps/via/keymap.c b/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
index 8275718bcb..aff4a92089 100644
--- a/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
+++ b/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
@@ -78,7 +78,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 
 /* timers */
 uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
 
 /* current frame */
 uint8_t current_frame = 0;
@@ -170,38 +169,39 @@ static void render_luna(int LUNA_X, int LUNA_Y) {
 
         /* current status */
         if (led_usb_state.caps_lock) {
-            oled_write_raw_P(bark[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
 
         } else if (isSneaking) {
-            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
 
         } else {
-            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(run[current_frame], ANIM_SIZE);
         }
     }
 
+#    if OLED_TIMEOUT > 0
+    /* the animation prevents the normal timeout from occuring */
+    if (last_input_activity_elapsed() > OLED_TIMEOUT && last_led_activity_elapsed() > OLED_TIMEOUT) {
+        oled_off();
+        return;
+    } else {
+        oled_on();
+    }
+#    endif
+
     /* animation timer */
     if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
         anim_timer = timer_read32();
         animate_luna();
     }
-
-    /* this fixes the screen on and off bug */
-    if (current_wpm > 0) {
-        oled_on();
-        anim_sleep = timer_read32();
-    } else if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-        oled_off();
-    }
 }
 
-
 /* KEYBOARD PET END */
 
 static void print_status_narrow(void) {
diff --git a/keyboards/sofle/keymaps/flare576/graphics.c b/keyboards/sofle/keymaps/flare576/graphics.c
index 918334a508..8cade61668 100644
--- a/keyboards/sofle/keymaps/flare576/graphics.c
+++ b/keyboards/sofle/keymaps/flare576/graphics.c
@@ -156,16 +156,16 @@ static void render_luna(int LUNA_X, int LUNA_Y) {
         current_frame = (current_frame + 1) % 2;
 
         if(isSneaking) {
-            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
 
         } else if(current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
 
         } else if(current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
 
         } else {
-            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(run[current_frame], ANIM_SIZE);
         }
     }
 
diff --git a/keyboards/sofle/keymaps/helltm/keymap.c b/keyboards/sofle/keymaps/helltm/keymap.c
index c0fd5edb5e..4624bc4700 100644
--- a/keyboards/sofle/keymaps/helltm/keymap.c
+++ b/keyboards/sofle/keymaps/helltm/keymap.c
@@ -188,7 +188,6 @@ static uint16_t held_shift = 0;
 
 /* timers */
 uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
 
 /* current frame */
 uint8_t current_frame = 0;
@@ -280,35 +279,37 @@ static void render_luna(int LUNA_X, int LUNA_Y) {
 
         /* current status */
         if (led_usb_state.caps_lock) {
-            oled_write_raw_P(bark[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
 
         } else if (isSneaking) {
-            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
 
         } else {
-            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(run[current_frame], ANIM_SIZE);
         }
     }
 
+#    if OLED_TIMEOUT > 0
+    /* the animation prevents the normal timeout from occuring */
+    if (last_input_activity_elapsed() > OLED_TIMEOUT && last_led_activity_elapsed() > OLED_TIMEOUT) {
+        oled_off();
+        return;
+    } else {
+        oled_on();
+    }
+#    endif
+
     /* animation timer */
     if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
         anim_timer = timer_read32();
         animate_luna();
     }
-
-    /* this fixes the screen on and off bug */
-    if (current_wpm > 0) {
-        oled_on();
-        anim_sleep = timer_read32();
-    } else if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-        oled_off();
-    }
 }
 
 /* KEYBOARD PET END */
diff --git a/keyboards/sofle/keymaps/noqmk/keymap.c b/keyboards/sofle/keymaps/noqmk/keymap.c
index ae92a7ec7f..29afbcb842 100644
--- a/keyboards/sofle/keymaps/noqmk/keymap.c
+++ b/keyboards/sofle/keymaps/noqmk/keymap.c
@@ -167,7 +167,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef OLED_ENABLE
 
 bool show_lock = true; // this is used to display the lock icon and disable keypresses when the keyboard is locked
-bool animate = true; // this variable is used to fix the flickering bug
 
 static void render_logo(void) {
     static const char PROGMEM no_qmk[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -230,7 +229,6 @@ static const char PROGMEM mac_logo[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 /* timers */
 uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
 
 /* current frame */
 uint8_t current_frame = 0;
@@ -322,37 +320,37 @@ static void render_luna(int LUNA_X, int LUNA_Y) {
 
         /* current status */
         if (led_usb_state.caps_lock) {
-            oled_write_raw_P(bark[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
 
         } else if (isSneaking) {
-            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
 
         } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
 
         } else {
-            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+            oled_write_raw_P(run[current_frame], ANIM_SIZE);
         }
     }
 
-    /* animation timer, stops the animation logic when the oled is turned off  */
-    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION && animate == true) {
+#    if OLED_TIMEOUT > 0
+    /* the animation prevents the normal timeout from occuring */
+    if (last_input_activity_elapsed() > OLED_TIMEOUT && last_led_activity_elapsed() > OLED_TIMEOUT) {
+        oled_off();
+        return;
+    } else {
+        oled_on();
+    }
+#    endif
+
+    /* animation timer  */
+    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
         anim_timer = timer_read32();
         animate_luna();
     }
-
-    /* this fixes the screen on and off bug by disabling the animation logic when the oled is off */
-    if (current_wpm > 0) {
-        oled_on();
-        anim_sleep = timer_read32();
-        animate = true;
-    } else if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-        oled_off();
-        animate = false;
-    }
 }
 
 /* KEYBOARD PET END */

From 2c96c7526356ba76400c6fa61bd0805e81c5aa31 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 1 Oct 2022 06:29:24 +1000
Subject: [PATCH 519/959] Small un/register_code() cleanups (#18544)

---
 quantum/action.c      | 50 +++++++++++++++++--------------------------
 quantum/action_code.h |  6 +++++-
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/quantum/action.c b/quantum/action.c
index 259c4349c3..78322e4a83 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -527,18 +527,10 @@ void process_action(keyrecord_t *record, action_t action) {
         case ACT_USAGE:
             switch (action.usage.page) {
                 case PAGE_SYSTEM:
-                    if (event.pressed) {
-                        host_system_send(action.usage.code);
-                    } else {
-                        host_system_send(0);
-                    }
+                    host_system_send(event.pressed ? action.usage.code : 0);
                     break;
                 case PAGE_CONSUMER:
-                    if (event.pressed) {
-                        host_consumer_send(action.usage.code);
-                    } else {
-                        host_consumer_send(0);
-                    }
+                    host_consumer_send(event.pressed ? action.usage.code : 0);
                     break;
             }
             break;
@@ -852,9 +844,9 @@ void process_action(keyrecord_t *record, action_t action) {
 __attribute__((weak)) void register_code(uint8_t code) {
     if (code == KC_NO) {
         return;
-    }
+
 #ifdef LOCKING_SUPPORT_ENABLE
-    else if (KC_LOCKING_CAPS_LOCK == code) {
+    } else if (KC_LOCKING_CAPS_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         // Resync: ignore if caps lock already is on
         if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) return;
@@ -864,9 +856,8 @@ __attribute__((weak)) void register_code(uint8_t code) {
         wait_ms(TAP_HOLD_CAPS_DELAY);
         del_key(KC_CAPS_LOCK);
         send_keyboard_report();
-    }
 
-    else if (KC_LOCKING_NUM_LOCK == code) {
+    } else if (KC_LOCKING_NUM_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         if (host_keyboard_leds() & (1 << USB_LED_NUM_LOCK)) return;
 #    endif
@@ -875,9 +866,8 @@ __attribute__((weak)) void register_code(uint8_t code) {
         wait_ms(100);
         del_key(KC_NUM_LOCK);
         send_keyboard_report();
-    }
 
-    else if (KC_LOCKING_SCROLL_LOCK == code) {
+    } else if (KC_LOCKING_SCROLL_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         if (host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK)) return;
 #    endif
@@ -886,10 +876,9 @@ __attribute__((weak)) void register_code(uint8_t code) {
         wait_ms(100);
         del_key(KC_SCROLL_LOCK);
         send_keyboard_report();
-    }
 #endif
 
-    else if IS_KEY (code) {
+    } else if IS_KEY (code) {
         // TODO: should push command_proc out of this block?
         if (command_proc(code)) return;
 
@@ -922,15 +911,15 @@ __attribute__((weak)) void register_code(uint8_t code) {
     } else if IS_MOD (code) {
         add_mods(MOD_BIT(code));
         send_keyboard_report();
-    }
+
 #ifdef EXTRAKEY_ENABLE
-    else if IS_SYSTEM (code) {
+    } else if IS_SYSTEM (code) {
         host_system_send(KEYCODE2SYSTEM(code));
     } else if IS_CONSUMER (code) {
         host_consumer_send(KEYCODE2CONSUMER(code));
-    }
 #endif
-    else if IS_MOUSEKEY (code) {
+
+    } else if IS_MOUSEKEY (code) {
         register_mouse(code, true);
     }
 }
@@ -942,9 +931,9 @@ __attribute__((weak)) void register_code(uint8_t code) {
 __attribute__((weak)) void unregister_code(uint8_t code) {
     if (code == KC_NO) {
         return;
-    }
+
 #ifdef LOCKING_SUPPORT_ENABLE
-    else if (KC_LOCKING_CAPS_LOCK == code) {
+    } else if (KC_LOCKING_CAPS_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         // Resync: ignore if caps lock already is off
         if (!(host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK))) return;
@@ -953,9 +942,8 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
         send_keyboard_report();
         del_key(KC_CAPS_LOCK);
         send_keyboard_report();
-    }
 
-    else if (KC_LOCKING_NUM_LOCK == code) {
+    } else if (KC_LOCKING_NUM_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         if (!(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK))) return;
 #    endif
@@ -963,9 +951,8 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
         send_keyboard_report();
         del_key(KC_NUM_LOCK);
         send_keyboard_report();
-    }
 
-    else if (KC_LOCKING_SCROLL_LOCK == code) {
+    } else if (KC_LOCKING_SCROLL_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         if (!(host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK))) return;
 #    endif
@@ -973,19 +960,22 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
         send_keyboard_report();
         del_key(KC_SCROLL_LOCK);
         send_keyboard_report();
-    }
 #endif
 
-    else if IS_KEY (code) {
+    } else if IS_KEY (code) {
         del_key(code);
         send_keyboard_report();
     } else if IS_MOD (code) {
         del_mods(MOD_BIT(code));
         send_keyboard_report();
+
+#ifdef EXTRAKEY_ENABLE
     } else if IS_SYSTEM (code) {
         host_system_send(0);
     } else if IS_CONSUMER (code) {
         host_consumer_send(0);
+#endif
+
     } else if IS_MOUSEKEY (code) {
         register_mouse(code, false);
     }
diff --git a/quantum/action_code.h b/quantum/action_code.h
index e107f0a740..14cfd025f1 100644
--- a/quantum/action_code.h
+++ b/quantum/action_code.h
@@ -192,7 +192,11 @@ enum mods_codes {
 
 /** \brief Other Keys
  */
-enum usage_pages { PAGE_SYSTEM, PAGE_CONSUMER };
+enum usage_pages {
+    PAGE_SYSTEM,
+    PAGE_CONSUMER,
+};
+
 #define ACTION_USAGE_SYSTEM(id) ACTION(ACT_USAGE, PAGE_SYSTEM << 10 | (id))
 #define ACTION_USAGE_CONSUMER(id) ACTION(ACT_USAGE, PAGE_CONSUMER << 10 | (id))
 #define ACTION_MOUSEKEY(key) ACTION(ACT_MOUSEKEY, key)

From dfa58801447ae1411af062624777a28b0ba872d7 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 30 Sep 2022 13:45:21 -0700
Subject: [PATCH 520/959] Smith and Rune Iron 165R2 Refactor (#18552)

by noroadsleft
---
 keyboards/smithrune/iron165r2/info.json       | 382 +++++++++++++++++-
 keyboards/smithrune/iron165r2/iron165r2.h     |  90 ++++-
 .../iron165r2/keymaps/default/keymap.c        |  30 +-
 .../smithrune/iron165r2/keymaps/via/keymap.c  |  30 +-
 4 files changed, 489 insertions(+), 43 deletions(-)

diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json
index 0d42363728..4d093a3350 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -2,10 +2,390 @@
     "keyboard_name": "Iron165R2",
     "manufacturer": "SmithRune",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "Gondolindrim",
     "usb": {
         "vid": "0x8384",
         "pid": "0x1652",
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"0,14", "x":14, "y":0},
+                {"label":"4,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":2, "w":1.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_cb_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"4,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_cb_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,10", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,12", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"4,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
+                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
+                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
+                {"label":"4,9", "x":10, "y":4, "w":1.25},
+                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
+                {"label":"4,11", "x":13, "y":4},
+                {"label":"4,12", "x":14, "y":4},
+                {"label":"4,13", "x":15, "y":4}
+            ]
+        }
     }
 }
diff --git a/keyboards/smithrune/iron165r2/iron165r2.h b/keyboards/smithrune/iron165r2/iron165r2.h
index 3bc816d454..8bb349d874 100644
--- a/keyboards/smithrune/iron165r2/iron165r2.h
+++ b/keyboards/smithrune/iron165r2/iron165r2.h
@@ -19,21 +19,31 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │    │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ *              │40  │41  │42  │46                      │49  │4A  │ │4B │4C │4D │
+ *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *              │40   │41 │42   │46                         │4A   │ Tsangan
+ *              └─────┴───┴─────┴───────────────────────────┴─────┘
  *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the Keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+ * Position K4E exists on the PCB, but is physically unavailable with the Iron165R2 case.
  */
 
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E , \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E , \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E , \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E , \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E )\
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,           K4B, K4C, K4D )\
 {\
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
@@ -41,3 +51,59 @@
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
     { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
 }
+
+#define LAYOUT_65_ansi_cb_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ }  \
+}
+
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT_65_iso_cb_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ }  \
+}
+
+#define LAYOUT_65_iso_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
+) {\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/smithrune/iron165r2/keymaps/default/keymap.c b/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
index ff29126638..901a0486e9 100644
--- a/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
+++ b/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
@@ -16,32 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
-    KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_BSPC,
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, KC_PGUP,
-    KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENTER,KC_PGDN,
-    KC_LSFT,  KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,  KC_UP,   KC_END,
-    KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN,  KC_RGHT, KC_DEL
+[0] = LAYOUT_all( /* Base */
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
 ),
-[1] = LAYOUT(
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[1] = LAYOUT_all(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[2] = LAYOUT(
+[2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[3] = LAYOUT(
+[3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, 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/smithrune/iron165r2/keymaps/via/keymap.c b/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
index ff29126638..901a0486e9 100644
--- a/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
+++ b/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
@@ -16,32 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
-    KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_BSPC,
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, KC_PGUP,
-    KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENTER,KC_PGDN,
-    KC_LSFT,  KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,  KC_UP,   KC_END,
-    KC_LCTRL, KC_LGUI, KC_LALT,                           KC_SPC,                    KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN,  KC_RGHT, KC_DEL
+[0] = LAYOUT_all( /* Base */
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
 ),
-[1] = LAYOUT(
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+[1] = LAYOUT_all(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[2] = LAYOUT(
+[2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[3] = LAYOUT(
+[3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
 ),
 };

From d1903f4dd47c13ab7b3d338a43ee10233385c6d6 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Fri, 30 Sep 2022 15:26:40 -0600
Subject: [PATCH 521/959] Fixup controllerworks/mini42 (#18553)

fix up stuff by waffle
---
 keyboards/controllerworks/mini42/config.h  | 26 +---------------------
 keyboards/controllerworks/mini42/info.json |  1 +
 keyboards/controllerworks/mini42/mini42.c  |  5 +++--
 keyboards/controllerworks/mini42/mini42.h  | 20 -----------------
 4 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 keyboards/controllerworks/mini42/mini42.h

diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index a56fa70402..420e616ad2 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/keyboards/controllerworks/mini42/config.h
@@ -17,16 +17,9 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-/* #define DEBOUNCE 5 */
-
 #define WS2812_PIO_USE_PIO1
 #define RGBLED_NUM 54
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGB_MATRIX_SPLIT \
-        { 27, 27 }
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define SPLIT_TRANSPORT_MIRROR
 #define SPLIT_LAYER_STATE_ENABLE
@@ -50,20 +43,3 @@
 /* Top right key on right half */
 #define BOOTMAGIC_LITE_ROW_RIGHT    0
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-/*
- * 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/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json
index 1e0527be02..b18747c62c 100644
--- a/keyboards/controllerworks/mini42/info.json
+++ b/keyboards/controllerworks/mini42/info.json
@@ -56,6 +56,7 @@
     },
     "rgb_matrix": {
         "driver": "WS2812",
+        "split_count": [27, 27],
         "layout": [
             { "flags": 2, "x": 75, "y": 4 },
             { "flags": 2, "x": 40, "y": 2 },
diff --git a/keyboards/controllerworks/mini42/mini42.c b/keyboards/controllerworks/mini42/mini42.c
index cc6397fa11..be16d1400a 100644
--- a/keyboards/controllerworks/mini42/mini42.c
+++ b/keyboards/controllerworks/mini42/mini42.c
@@ -14,7 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "mini42.h"
+
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 
@@ -79,4 +80,4 @@ bool oled_task_kb(void) {
     return false;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/controllerworks/mini42/mini42.h b/keyboards/controllerworks/mini42/mini42.h
deleted file mode 100644
index 8155798246..0000000000
--- a/keyboards/controllerworks/mini42/mini42.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2022 Kevin Gee <info@controller.works>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"

From 245f00b4d93c65d5540d2096c9f3536ead93ef26 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Fri, 30 Sep 2022 16:08:40 -0600
Subject: [PATCH 522/959] Fixup keebio/sinc (#18551)

---
 keyboards/keebio/sinc/.noci         |  0
 keyboards/keebio/sinc/config.h      | 20 ++++++++--
 keyboards/keebio/sinc/info.json     |  2 +-
 keyboards/keebio/sinc/rev1/config.h | 35 -----------------
 keyboards/keebio/sinc/rev1/rev1.c   | 42 ---------------------
 keyboards/keebio/sinc/rev2/config.h | 33 ----------------
 keyboards/keebio/sinc/rev2/rev2.c   | 58 -----------------------------
 keyboards/keebio/sinc/sinc.c        | 53 ++++++++++++++++++++++++++
 keyboards/keebio/sinc/sinc.h        | 15 ++++++++
 9 files changed, 85 insertions(+), 173 deletions(-)
 delete mode 100644 keyboards/keebio/sinc/.noci
 delete mode 100644 keyboards/keebio/sinc/rev1/config.h
 delete mode 100644 keyboards/keebio/sinc/rev1/rev1.c
 delete mode 100644 keyboards/keebio/sinc/rev2/config.h
 delete mode 100644 keyboards/keebio/sinc/rev2/rev2.c

diff --git a/keyboards/keebio/sinc/.noci b/keyboards/keebio/sinc/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/sinc/config.h b/keyboards/keebio/sinc/config.h
index cfb6bf4ffc..92d2fda644 100644
--- a/keyboards/keebio/sinc/config.h
+++ b/keyboards/keebio/sinc/config.h
@@ -1,6 +1,4 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
+/* 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
@@ -18,4 +16,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
+// wiring of each half
+#define SPLIT_HAND_PIN F7
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* ws2812 RGB LED */
+#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
+
+// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default
+#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index c01273093e..ad28aaea6b 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -6,7 +6,7 @@
         "vid": "0xCB10"
     },
     "processor": "atmega32u4",
-    "protocol": "atmel-dfu",
+    "bootloader": "atmel-dfu",
     "features": {
         "audio": false,
         "bootmagic": true,
diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
deleted file mode 100644
index ea6c2d36a2..0000000000
--- a/keyboards/keebio/sinc/rev1/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// wiring of each half
-#define SPLIT_HAND_PIN F7
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
-
-// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default
-#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/sinc/rev1/rev1.c b/keyboards/keebio/sinc/rev1/rev1.c
deleted file mode 100644
index ec3eb1c0c9..0000000000
--- a/keyboards/keebio/sinc/rev1/rev1.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "sinc.h"
-#include "split_util.h"
-
-void matrix_init_kb(void) {
-    setPinOutput(LED_CAPS_LOCK_PIN);
-    matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    // Only update if left half
-    if (isLeftHand && led_update_user(led_state)) {
-        writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
-    }
-    return true;
-}
-
-void eeconfig_init_kb(void) {
-#ifdef BACKLIGHT_ENABLE
-    backlight_enable();
-    backlight_level(3);
-#endif
-    eeconfig_update_kb(0);
-    eeconfig_init_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
deleted file mode 100644
index 92d2fda644..0000000000
--- a/keyboards/keebio/sinc/rev2/config.h
+++ /dev/null
@@ -1,33 +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
-
-// wiring of each half
-#define SPLIT_HAND_PIN F7
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
-
-// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default
-#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/sinc/rev2/rev2.c b/keyboards/keebio/sinc/rev2/rev2.c
deleted file mode 100644
index a774b76ca0..0000000000
--- a/keyboards/keebio/sinc/rev2/rev2.c
+++ /dev/null
@@ -1,58 +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 "sinc.h"
-#include "split_util.h"
-
-void matrix_init_kb(void) {
-    setPinOutput(LED_CAPS_LOCK_PIN);
-    matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    // Only update if left half
-    if (isLeftHand && led_update_user(led_state)) {
-        writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
-    }
-    return true;
-}
-
-void eeconfig_init_kb(void) {
-#ifdef BACKLIGHT_ENABLE
-    backlight_enable();
-    backlight_level(3);
-#endif
-    eeconfig_update_kb(0);
-    eeconfig_init_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c
index c4dbfcd3d1..f6dff42ebb 100644
--- a/keyboards/keebio/sinc/sinc.c
+++ b/keyboards/keebio/sinc/sinc.c
@@ -1 +1,54 @@
+/* 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 "sinc.h"
+#include "split_util.h"
+
+bool led_update_kb(led_t led_state) {
+    if (!led_update_user(led_state)) { return false; }
+    // Only update if left half
+    if (isLeftHand && led_update_user(led_state)) {
+        writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
+    }
+    return true;
+}
+
+void eeconfig_init_kb(void) {
+#ifdef BACKLIGHT_ENABLE
+    backlight_enable();
+    backlight_level(3);
+#endif
+    eeconfig_update_kb(0);
+    eeconfig_init_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return true;
+}
diff --git a/keyboards/keebio/sinc/sinc.h b/keyboards/keebio/sinc/sinc.h
index 9e012ce157..75f14595bf 100644
--- a/keyboards/keebio/sinc/sinc.h
+++ b/keyboards/keebio/sinc/sinc.h
@@ -1,3 +1,18 @@
+/* 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
 
 #include "quantum.h"

From 3db33fba28f3322fdd1da59a7eff81ecfb9b4358 Mon Sep 17 00:00:00 2001
From: nimishgautam <nimishg@gmail.com>
Date: Sat, 1 Oct 2022 01:07:20 +0200
Subject: [PATCH 523/959] [Keymap] corne layout with mac/linux text editing
 shortcuts (#18374)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/crkbd/keymaps/nimishgautam/config.h |  92 +++
 keyboards/crkbd/keymaps/nimishgautam/keymap.c | 585 ++++++++++++++++++
 .../crkbd/keymaps/nimishgautam/readme.md      |  47 ++
 keyboards/crkbd/keymaps/nimishgautam/rules.mk |  12 +
 4 files changed, 736 insertions(+)
 create mode 100644 keyboards/crkbd/keymaps/nimishgautam/config.h
 create mode 100644 keyboards/crkbd/keymaps/nimishgautam/keymap.c
 create mode 100644 keyboards/crkbd/keymaps/nimishgautam/readme.md
 create mode 100644 keyboards/crkbd/keymaps/nimishgautam/rules.mk

diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h
new file mode 100644
index 0000000000..d237727091
--- /dev/null
+++ b/keyboards/crkbd/keymaps/nimishgautam/config.h
@@ -0,0 +1,92 @@
+// Copyright 2022 Nimish Gåtam (@nimishgautam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// OS-specific stuff
+//#define UNICODE_SELECTED_MODES UC_MAC
+
+/* Select hand configuration */
+//#define MASTER_LEFT
+#define MASTER_RIGHT
+// #define EE_HANDS
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_MODS_ENABLE
+
+
+// combo
+#define COMBO_COUNT 7
+#define EXTRA_SHORT_COMBOS
+
+//Tapping values
+//#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 200
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD_PER_KEY
+
+
+// Try to save some memory
+#define NO_ACTION_ONESHOT
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
+#define LAYER_STATE_8BIT  //8 layers max
+
+
+// which lighting effects to include (less saves memory)
+#ifdef RGBLIGHT_ENABLE
+    #define RGBLIGHT_EFFECT_BREATHING
+    //#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    //#define RGBLIGHT_EFFECT_SNAKE
+    //#define RGBLIGHT_EFFECT_KNIGHT
+    //#define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    //#define RGBLIGHT_EFFECT_RGB_TEST
+    //#define RGBLIGHT_EFFECT_ALTERNATING
+    //#define RGBLIGHT_EFFECT_TWINKLE
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
+
+#endif
+
+// rgb matrix, cooler effects than lighting above
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_MATRIX_KEYPRESSES
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+    #define RGB_MATRIX_HUE_STEP 8
+    #define RGB_MATRIX_SAT_STEP 8
+    #define RGB_MATRIX_VAL_STEP 8
+    #define RGB_MATRIX_SPD_STEP 10
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+    #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+    #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+
+    // NOTE: the below effects are super cool but they go absolutely nuts if you manually set hsv colors (eg with layers)
+
+    //#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    //#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 
+    //#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#endif
+
+//autoshift
+/*
+#define NO_AUTO_SHIFT_NUMERIC
+#define NO_AUTO_SHIFT_SPECIAL
+#define RETRO_SHIFT 400
+#define AUTO_SHIFT_TIMEOUT 175
+#define AUTO_SHIFT_ENABLED
+#define AUTO_SHIFT_TIMEOUT_PER_KEY
+*/
+
+
+// oled font (for logo etc)
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
+
+// mouse keys go at a constant speed instead of accelerating
+#define MK_3_SPEED
+#define MK_MOMENTARY_ACCEL
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
new file mode 100644
index 0000000000..42891d60d8
--- /dev/null
+++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
@@ -0,0 +1,585 @@
+// Copyright 2022 Nimish Gåtam (@nimishgautam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_key_codes {
+    SHOW_WIN_LEFT = SAFE_RANGE, // show windows on tap, move active window left on hold
+    NUMERIC_WIN_RIGHT, // lock to numeric layer on press, move active window right on hold
+    DEL_WORD, //delete a word
+    SELECT_LEFT_WD, // select word left of cursor
+    SELECT_RIGHT_WD, // select word right of cursor
+    SELECT_LEFT_LINE, // select all from left of cursor to beginning of line
+    SELECT_RIGHT_LINE, // select all from right of cursor to end of line
+    MOVE_LEFT_WD, // move one word to the left
+    MOVE_RIGHT_WD, // move one word to the right
+    MOVE_LEFT_LINE, // move to beginning of line
+    MOVE_RIGHT_LINE, // move to end of line
+    PASTE_NOSTYLE, // paste without formatting
+    MOVE_BEGIN_LINE_TERMINAL, // move to the beginning of the line in the terminal
+    MOVE_END_LINE_TERMINAL, // move to the end of the line in the terminal
+    /* macros */
+    PASTE_VIM, // paste in vim from system register
+    ACIRCLE, // å 
+    ADOT, // ä
+    ODOT, // ö
+    COMPOSE_MACRO, // compose key for mac or linux
+    SCREENSHOT, // This is theoretically reprogrammable on Linux, but Gui(Shift(4)) or Gui(4) is reserved for '4th item on favorite menu' and doesn't remap so well
+};
+
+//Tap Dance Declarations
+enum {
+  TD_MOVE_BEGIN_LINE = 0, // tap-dance, on single press move to beginning of the line, on double, output ^(vim character for beginning of line nonwhitespace char)
+  TD_MOVE_END_LINE, // tap-dance, on single press move to end of the line, on double, output $ (vim character for last nonblank char on a line)
+  TD_PERIOD_COMMA, // period on single press, comma on second press
+};
+
+// Mac-specific definitions of these functions
+// I've changed Linux to accept these defaults
+
+#define FINDER          LGUI(LALT(KC_SPACE)) //open the search bar for finding apps, docs in-computer, etc
+#define COMPOSE_KEY    KC_SCRL //manually set on linux, to create chars via .Xcompose ()
+#define COMPOSE_MAC     KC_F13 //manually set on mac using some tricks
+#define X_COMPOSE_KEY    X_SCROLLLOCK //for use with macros
+#define SHOW_WINDOWS    LCTL(KC_UP) //'Expose' on Mac, overview on linux. Just all the windows
+#define WINDOW_LEFT LCTL(LGUI(LSFT(KC_LEFT))) //custom shortcut for this feature -- make window take up 50% left screen (using gui and ctl to make it os agnostic)
+#define WINDOW_RIGHT LCTL(LGUI(LSFT(KC_RIGHT))) //custom shortcut for this feature -- make window take up 50% right screen (using gui and ctl to make it os agnostic)/fully custom shortcut, using ctl and gui keys so will need them both irrespective of os
+#define SHOW_APP_WINDOWS LCTL(KC_DOWN) 
+#define LOCK_SCREEN     LCTL(LGUI(KC_Q)) //manually set this on linux to match osx default
+#define EURO            LALT(LSFT(KC_2))
+#define EMOJI_KBD       LCTL(LGUI(KC_SPACE)) //manually set this on linux to match osx default, with 'emote' on linux and a custom shortcut (probably better to use compose feature)
+#define APP_LEFT		LGUI(KC_TAB)
+#define APP_RIGHT		RSFT(LGUI(KC_TAB))
+#define CALCULATOR      RSFT(LGUI(LCTL(KC_SLASH))) // arbitrary shortcut
+
+#define MOVE_LEFT_TERMINAL LALT(KC_LEFT) //move cursor one word left on the terminal... does not work if .inputrc is set to use vim bindings!
+#define MOVE_RIGHT_TERMINAL LALT(KC_RIGHT) //move cursor one word left on the terminal... does not work if .inputrc is set to use vim bindings!
+#define DEL_WORD_TERMINAL LALT(KC_BSPACE) // delete one word back on terminal ... does not work if .inputrc is set to use vim bindings!
+
+enum custom_layers {
+    _BASE,
+    _NUMS,
+    _NUM_MASK,
+    _TEXT_NAV,
+    _ADJUST,
+    _FN_KEYS,
+};
+
+// combo - press space and backspace together to get 'scroll lock', used as the compose key on my custom linux
+const uint16_t PROGMEM compose_combo[] = {KC_BSPACE, KC_SPACE, COMBO_END};
+
+// combo - press the 2 larger keys on the inner part of the corne to get the search window ('finder' as I'm calling it)
+const uint16_t PROGMEM search_combo[] = {LT(_FN_KEYS, KC_ENTER),LT(_TEXT_NAV, KC_PAST), COMBO_END};
+
+// combo - press ,. to paste in vim
+const uint16_t PROGMEM vim_paste_combo[] = {KC_COMM, KC_DOT, COMBO_END};
+
+// combo - press () to launch calculator
+const uint16_t PROGMEM calculator_combo[] = {LT(_NUMS,KC_LPRN),  LT(_NUMS,KC_RPRN), COMBO_END};
+
+// combo - press combo+ a to get å
+const uint16_t PROGMEM acircle_combo[] = { KC_BSPACE, KC_SPACE, MT(MOD_LCTL, KC_A),COMBO_END};
+
+// combo - press combo+ l to get ä
+const uint16_t PROGMEM adot_combo[] = {KC_BSPACE, KC_SPACE, MT(MOD_RALT,KC_L), COMBO_END};
+
+// combo - press combo+ ; to get ö
+const uint16_t PROGMEM odot_combo[] = {KC_BSPACE, KC_SPACE, MT(MOD_LCTL,KC_SCLN),COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+    COMBO(compose_combo, COMPOSE_MACRO),
+    COMBO(search_combo, FINDER),
+    COMBO(calculator_combo, CALCULATOR),
+    /* macros */
+    COMBO(vim_paste_combo, PASTE_VIM),
+    COMBO(acircle_combo, ACIRCLE),
+    COMBO(adot_combo, ADOT),
+    COMBO(odot_combo, ODOT)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_split_3x6_3(  //basic
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                    KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,     KC_MINUS,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_ESCAPE, MT(MOD_LCTL, KC_A),    MT(MOD_LALT,KC_S),    MT(MOD_RSFT,KC_D),    MT(MOD_LGUI, KC_F),    KC_G,                    KC_H,    MT(MOD_RGUI,KC_J),    MT(MOD_RSFT,KC_K),    MT(MOD_RALT,KC_L), MT(MOD_LCTL,KC_SCLN), KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      LT(0, SHOW_WIN_LEFT), KC_Z, KC_X,  KC_C, KC_V,  KC_B,   KC_N,                  KC_M,  KC_COMM, KC_DOT,  KC_SLASH,  LT(0, NUMERIC_WIN_RIGHT),
+  //|--------+--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------+--------|
+                                         LT(_NUMS,KC_LPRN),   KC_BSPACE,  LT(_FN_KEYS, KC_ENTER),     LT(_TEXT_NAV, KC_PAST),   KC_SPACE, LT(_NUMS,KC_RPRN)
+                                      //`--------------------------'                    `--------------------------'
+
+  ),
+
+  [_NUMS] = LAYOUT_split_3x6_3( //numbers
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+     SCREENSHOT,   KC_EXCLAIM,KC_AT, KC_HASH, KC_DOLLAR,KC_PERCENT,            KC_CIRCUMFLEX,    KC_7,    KC_8,    KC_9,    KC_TRANSPARENT, KC_PIPE, 
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI,KC_PLUS,                    KC_EQL, KC_4,  KC_5,  KC_6,  KC_BSLASH, KC_TRANSPARENT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCBR, KC_LBRACKET, KC_GRAVE, KC_TILD, PASTE_NOSTYLE, KC_AMPERSAND,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3, KC_RBRACKET, KC_RCBR,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+-C```-------+--------+--------|
+                                          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_UNDS, KC_0
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+     [_NUM_MASK] = LAYOUT_split_3x6_3( //NUM MASK, so I can still have backspace/enter/tab etc but with the nums, arrows and formatters too
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+     KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_UP, KC_TRANSPARENT,KC_TRANSPARENT,      KC_TRANSPARENT, KC_7,    KC_8,    KC_9, KC_TRANSPARENT, KC_TRANSPARENT, 
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      TO(_BASE), KC_TRANSPARENT, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRANSPARENT,         KC_TRANSPARENT, KC_4,  KC_5,  KC_6, KC_TRANSPARENT, KC_TRANSPARENT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+     KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3,KC_TRANSPARENT, KC_NLCK,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_TRANSPARENT, KC_0
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [_TEXT_NAV] = LAYOUT_split_3x6_3( //text nav and special navigation (lock screen, adjust layer, etc)
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      LOCK_SCREEN, KC_PSCR, SELECT_LEFT_LINE, KC_UP, SELECT_RIGHT_LINE, TD(TD_MOVE_BEGIN_LINE),                    TD(TD_MOVE_END_LINE), KC_MS_WH_UP, EMOJI_KBD, KC_TRANSPARENT, KC_TRANSPARENT, RESET,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      TO(_BASE), SELECT_LEFT_WD, KC_LEFT, KC_DOWN, KC_RIGHT,SELECT_RIGHT_WD,              KC_MS_WH_LEFT, KC_RGUI, KC_RSFT, KC_RALT,KC_RCTRL, KC_CAPS,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_INSERT, KC_TRANSPARENT, MOVE_LEFT_WD,KC_PAGE_DOWN,MOVE_RIGHT_WD, KC_PAGE_UP,                    KC_MS_WH_RIGHT, KC_MS_WH_DOWN, KC_HOME, KC_END,KC_TRANSPARENT, TO(_ADJUST),
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_DELETE,  DEL_WORD, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_TRANSPARENT, KC_TRANSPARENT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+    [_ADJUST] = LAYOUT_split_3x6_3( // adjust things
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      TO(_BASE), RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX,                       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          CG_TOGG, XXXXXXX, XXXXXXX ,     XXXXXXX, XXXXXXX, XXXXXXX
+                                      //`--------------------------'  `--------------------------'
+  ), // CG_TOGG toggles gui and Ctrl (switching from mac to windows/linux)
+    // the RGB buttons go backwards if shift is held when they're pressed, so shift is included
+    // RGB MOD changes the mode, it's the most important one
+    // right side mostly no-op so I can play with the visualization
+
+   [_FN_KEYS] = LAYOUT_split_3x6_3( //fn keys, terminal text navigation keys
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+     KC_TRANSPARENT, KC_LCBR,KC_LBRACKET, KC_RBRACKET, KC_RCBR, MOVE_BEGIN_LINE_TERMINAL,                           MOVE_END_LINE_TERMINAL, KC_F7,    KC_F8,    KC_F9,    KC_F11, KC_TRANSPARENT, 
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI, KC_TRANSPARENT,                                               KC_TRANSPARENT, KC_F4,  KC_F5,  KC_F6,  KC_F12, KC_TRANSPARENT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_TRANSPARENT, KC_TRANSPARENT, MOVE_LEFT_TERMINAL, DEL_WORD_TERMINAL, MOVE_RIGHT_TERMINAL, KC_TRANSPARENT,                           KC_TRANSPARENT, KC_F1,  KC_F2,  KC_F3, KC_TRANSPARENT, KC_TRANSPARENT,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_HASH  ,  KC_TRANSPARENT, KC_F10
+                                      //`--------------------------'  `--------------------------'
+  )
+  
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+
+  switch (keycode) {
+
+    // as of this writing, you can't do a layer tap (LT)
+    // and also send a shifted code, like left parens
+    // If you call such a function, it'll do the layer shift but 
+    // it'll ignore the key code on tap... this is the workaround
+ 
+    case LT(_NUMS,KC_LPRN): // Shift to _NUMS layer on hold, but send left paren on press
+        if (record->tap.count && record->event.pressed) {
+            tap_code16(KC_LPRN); 
+            return false; 
+        }
+    break;
+    case LT(_NUMS,KC_RPRN): // Shift to _NUMS on hold, send right parens on press
+        if (record->tap.count && record->event.pressed) {
+            tap_code16(KC_RPRN); 
+            return false; 
+        }
+    break;
+
+    case LT(0,SHOW_WIN_LEFT):
+            if (record->tap.count && record->event.pressed) {
+                tap_code16(SHOW_WINDOWS); // Intercept tap function
+            } else if (record->event.pressed) {
+                tap_code16(WINDOW_LEFT); // Intercept hold function 
+            }
+        return false;
+        break;
+    
+    case LT(0, NUMERIC_WIN_RIGHT):
+            if (record->tap.count && record->event.pressed) {
+                layer_on(_NUM_MASK);// Intercept tap function
+            } else if (record->event.pressed) {
+                tap_code16(WINDOW_RIGHT); // Intercept hold function 
+            }
+        return false;
+        break;
+    
+    case PASTE_VIM:
+        if (record->event.pressed){
+            SEND_STRING(SS_TAP(X_ESCAPE)"\"+pi");
+        }
+        return false;
+        break;
+
+    //only read the keymap config if it's one of the below cases (instead of every time)
+    case DEL_WORD: 
+    case SELECT_LEFT_WD:
+    case SELECT_RIGHT_WD:
+    case SELECT_LEFT_LINE:
+    case SELECT_RIGHT_LINE:
+    case MOVE_LEFT_WD:
+    case MOVE_RIGHT_WD:
+    case MOVE_LEFT_LINE:
+    case MOVE_RIGHT_LINE:
+    case PASTE_NOSTYLE:
+    case MOVE_BEGIN_LINE_TERMINAL:     
+    case MOVE_END_LINE_TERMINAL:
+    case ACIRCLE:
+    case ADOT:
+    case ODOT:
+    case COMPOSE_MACRO:
+    case SCREENSHOT:
+
+        if(record->event.pressed) {
+            keymap_config.raw = eeconfig_read_keymap();
+            switch (keycode){
+                case DEL_WORD:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(LCTL(KC_BSPACE));
+                    } else { //osx
+                        tap_code16(LALT(KC_BSPACE));
+                    }
+                break;
+                case SELECT_LEFT_WD:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(RSFT(LCTL(KC_LEFT)));
+                    } else { //osx
+                        tap_code16(RSFT(LALT(KC_LEFT)));
+                    }
+                break;
+                case SELECT_RIGHT_WD:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(RSFT(LCTL(KC_RIGHT)));
+                    } else { //osx
+                        tap_code16(RSFT(LALT(KC_RIGHT)));
+                    }
+                break;
+                case SELECT_LEFT_LINE:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(RSFT(KC_HOME));
+                    } else { //osx
+                        tap_code16(RSFT(LCTL(KC_LEFT)));
+                    }
+                break;
+                case SELECT_RIGHT_LINE:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(RSFT(KC_END));
+                    } else { //osx
+                        tap_code16(RSFT(LCTL(KC_RIGHT)));
+                    }
+                break;
+                case MOVE_LEFT_WD:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(LCTL(KC_LEFT));
+                    } else { //osx
+                        tap_code16(LALT(KC_LEFT));
+                    }
+                break;
+                case MOVE_RIGHT_WD:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(LCTL(KC_RIGHT));
+                    } else { //osx
+                        tap_code16(LALT(KC_RIGHT));
+                    }
+                break;
+                case MOVE_LEFT_LINE:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(KC_HOME);
+                    } else { //osx
+                        tap_code16(LGUI(KC_LEFT)); //GUI for move, shift-ctl for highlight... thanks mac!
+                    }
+                break;
+                case MOVE_RIGHT_LINE:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(KC_END);
+                    } else { //osx
+                        tap_code16(LGUI(KC_RIGHT)); //GUI for move, shift-ctl for highlight... thanks mac!
+                    }
+                break;
+                case PASTE_NOSTYLE:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(LCTL(RSFT(KC_V)));
+                    } else { //osx
+                        tap_code16(LGUI(LALT(LSFT(KC_V)))); 
+                    }
+                break;
+                case MOVE_BEGIN_LINE_TERMINAL:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(KC_HOME);
+                    } else { //osx
+                        tap_code16(LSFT(KC_HOME)); 
+                    }
+                break;
+                case MOVE_END_LINE_TERMINAL:
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(KC_END);
+                    } else { //osx
+                        tap_code16(LSFT(KC_END)); 
+                    }
+                break;
+                case ACIRCLE: // å
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        SEND_STRING(SS_TAP(X_COMPOSE_KEY)"aa");
+                    } else { //osx
+                        tap_code16(LALT(KC_A)); 
+                    }
+                break;
+                case ADOT: // ä
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        SEND_STRING(SS_TAP(X_COMPOSE_KEY)"a\"");
+                    } else { //osx
+                        SEND_STRING(SS_LALT("u")"a");
+                    }
+                break;
+                case ODOT: // ö
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        SEND_STRING(SS_TAP(X_COMPOSE_KEY)"o\"");
+                    } else { //osx
+                        SEND_STRING(SS_LALT("u")"o");
+                    }
+                break;
+                case COMPOSE_MACRO: 
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(COMPOSE_KEY);
+                    } else { //osx
+                        tap_code16(COMPOSE_MAC);
+                    }
+                break;
+                case SCREENSHOT: 
+                    if(keymap_config.swap_lctl_lgui){ //Linux
+                        tap_code16(KC_PSCR);
+                    } else { //osx
+                        tap_code16(LGUI(LSFT(KC_4)));
+                    }
+                break;
+            }
+        }
+
+    return false;
+    break;
+
+  }
+  return true;
+}
+
+void dance_left_finished (qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 1) { //1 tap, move to line left
+    keymap_config.raw = eeconfig_read_keymap();
+    if(keymap_config.swap_lctl_lgui){ //Linux
+        tap_code16(KC_HOME);
+    } else { //osx
+    tap_code16(LGUI(KC_LEFT));              
+    }
+  } else { //2 taps, make a circumflex
+    tap_code16(KC_CIRC);
+  }
+}
+
+void dance_right_finished (qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 1) { // 1 tap, move line right
+       keymap_config.raw = eeconfig_read_keymap();
+    if(keymap_config.swap_lctl_lgui){ //Linux
+        tap_code16(KC_END);
+    } else { //osx
+    tap_code16(LGUI(KC_RIGHT));              
+    }
+  } else { //2 taps, dollar
+    tap_code16(KC_DOLLAR);
+  }
+}
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_MOVE_BEGIN_LINE]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_left_finished, NULL),
+  [TD_MOVE_END_LINE]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_right_finished, NULL),
+  [TD_PERIOD_COMMA] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COMMA),
+};
+
+bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MT(MOD_RSFT,KC_D): // for modtap shift, otherwise lots of mis-firings
+        case MT(MOD_RSFT,KC_K):
+            // Immediately select the hold action when another key is tapped.
+            return true;
+        default:
+            // Do not select the hold action when another key is tapped.
+            return false;
+    }
+}
+
+// yeah, should be layer_state_set_user but that one doesn't update the mods
+void set_lighting_user(void) {
+    uint8_t layer = get_highest_layer(layer_state);
+    switch(layer){
+        case _BASE:
+            rgblight_sethsv_noeeprom(HSV_WHITE);
+            led_t led_state = host_keyboard_led_state();
+            if(led_state.caps_lock){
+                rgblight_sethsv_noeeprom(HSV_RED);
+            } 
+            //rgblight_sethsv(HSV_OFF);
+        break;
+        case _NUMS:
+            rgblight_sethsv_noeeprom(HSV_GREEN);
+        break;
+        case _NUM_MASK:
+            rgblight_sethsv_noeeprom(HSV_PINK);
+        break;
+        case _TEXT_NAV:
+            rgblight_sethsv_noeeprom(HSV_BLUE);
+        break;
+        case _ADJUST:
+            rgblight_sethsv_noeeprom(HSV_ORANGE);
+        break;
+        case _FN_KEYS:
+            rgblight_sethsv_noeeprom(HSV_PURPLE);
+        break;
+        default:
+        break;
+    }
+    // override color with mods
+
+    if(get_mods() & MOD_MASK_SHIFT){
+        rgblight_sethsv_noeeprom(HSV_RED);
+    }
+    if(get_mods() & MOD_MASK_CTRL){
+        rgblight_sethsv_noeeprom(HSV_MAGENTA);
+    }
+    if(get_mods() & MOD_MASK_ALT){
+        rgblight_sethsv_noeeprom(HSV_YELLOW);
+    }
+    if(get_mods() & MOD_MASK_GUI){
+        rgblight_sethsv_noeeprom(HSV_TEAL);
+    }
+    // return state;
+}
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  return OLED_ROTATION_270;
+}
+
+void oled_render_general_state(void){
+    set_lighting_user();
+
+    keymap_config.raw = eeconfig_read_keymap();
+    if(keymap_config.swap_lctl_lgui){
+        oled_write_ln_P(PSTR("Linux"), false);
+    }
+    else {
+        oled_write_ln_P(PSTR("OSX"), false);
+    }
+    
+    //oled_write_ln(get_u8_str(get_current_wpm(), '0'), false);
+    /*
+    led_t led_state = host_keyboard_led_state();
+    if(led_state.caps_lock){
+        rgblight_sethsv(HSV_RED);
+    }*/
+    //Layer color has to be handled by master
+
+
+    // led state doesn't have to be handled by master, but 
+    // the keyboard will freeze if you type too fast
+    // and have this handled on the slave side
+
+    led_t led_state = host_keyboard_led_state();
+    if(led_state.caps_lock){
+        oled_write_ln_P(PSTR("CAPS"), false);
+    } else {
+        oled_write_ln_P(PSTR(" "), false);
+    }
+    if(led_state.num_lock){
+        oled_write_ln_P(PSTR("NumLk"), false);
+    } else {
+        oled_write_ln_P(PSTR(" "), false);
+    }
+    if(led_state.scroll_lock){
+        oled_write_ln_P(PSTR("Scrol"), false);
+    } else {
+        oled_write_ln_P(PSTR(" "), false);
+    }
+    if(led_state.compose){
+        oled_write_ln_P(PSTR("comp"), false);
+    } else {
+        oled_write_ln_P(PSTR(" "), false);
+    }
+}
+
+void oled_render_layer_mod_state(void) {
+    //Layer
+    uint8_t layer = get_highest_layer(layer_state);
+    switch (layer) {
+        case _BASE:
+            oled_write_ln_P(PSTR("Base"), false);
+            //rgblight_sethsv(HSV_OFF);
+            break;
+        case _NUMS:
+            oled_write_ln_P(PSTR("Symb"), false);
+            break;
+        case _NUM_MASK:
+            oled_write_ln_P(PSTR("NumX"), false);
+            break;
+        case _TEXT_NAV:
+            oled_write_ln_P(PSTR("Text"), false);
+            break;
+        case _ADJUST:
+            oled_write_ln_P(PSTR("Adj"), false);
+            break;
+        case _FN_KEYS:
+            oled_write_ln_P(PSTR("Fn"), false);
+            break;   
+        default:
+            break;
+    }
+    oled_write_ln_P(PSTR(" "), false);
+    // mods
+    if(get_mods() & MOD_MASK_SHIFT){
+        oled_write_ln_P(PSTR("SHIFT"), false);
+    }
+    if(get_mods() & MOD_MASK_CTRL){
+        oled_write_ln_P(PSTR("ctrl"), false);
+    }
+    if(get_mods() & MOD_MASK_ALT){
+        oled_write_ln_P(PSTR("alt"), false);
+    }
+    if(get_mods() & MOD_MASK_GUI){
+        oled_write_ln_P(PSTR("GUI"), false);
+    }
+    if(!get_mods()){
+        oled_write_ln_P(PSTR(" "), false);
+        oled_write_ln_P(PSTR(" "), false);
+        oled_write_ln_P(PSTR(" "), false);
+        oled_write_ln_P(PSTR(" "), false);
+    }
+}
+
+
+/* https://joric.github.io/qle/  - font */
+
+
+// render general state on master, a little bit of info on slave side
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_general_state();
+    }  
+    else {
+        oled_render_layer_mod_state();
+    }
+    return false;
+}
+
+#endif
diff --git a/keyboards/crkbd/keymaps/nimishgautam/readme.md b/keyboards/crkbd/keymaps/nimishgautam/readme.md
new file mode 100644
index 0000000000..98906afa10
--- /dev/null
+++ b/keyboards/crkbd/keymaps/nimishgautam/readme.md
@@ -0,0 +1,47 @@
+# Full-featured Corne layout for Linux and MacOS
+
+This is a generic layout for Corne, especially for someone who:
+
+* has to type in English
+* occasionally has to type in Swedish
+* Switches regularly between Linux and MacOS
+* Prioritizes text navigation
+  * This includes selecting whole lines and deleting words
+* uses VIM or VIM bindings for text navigation
+* uses the 'compose' feature in Linux and uses the 'mac user dictionary' trick for getting compose features
+* Home row modifiers for optimal ergo (hopefully optimal)
+
+This also features:
+* OLED displays:
+ * indicating OS and LED status (scroll lock, numlock, caps, compose) on the master side
+ * layer and modifiers on the slave side
+* LED lights:
+ * color changes to indicate layer and modifier status
+ * LED matrix effects around keypresses
+ 
+## Major notes
+
+### OS 'detection'
+* I assume MacOS as the default. Using the ctrl/gui swap magic keycode switches everything to Linux
+ * Most of the Linux codes should work in Windows
+ * Yes, there are lots of if-statements around which key code to send here... this isn't the most sustainable way to do it, but is the most memory-efficient way I could come up with
+ 
+### RGB matrix effects
+* Not all RGB matrix effects are compatible with changing the color on layer/mod change. Some of them get caught in a loop and freeze half of the keyboard, so beware of which ones you activate
+* Some RGB settings are stored in eeprom (despite me using the `noeeprom()` version of functions) If something is weird, try clearing eeprom
+* The color-changing function probably _should_ be in the `layer_state_set_user` function, except that function doesn't give the state of the modifiers. So instead I have it done in a call that updates the OLEDs
+
+### LED state explicitly not shared
+* For some reason, sharing the LED state (as a split keyboard function) will cause the slave side of the keyboard to freeze up if you type too fast. Don't do it!
+
+### Windowing shortcuts
+* Again, MacOS is assumed to be the default so I changed as many Linux shortcuts as I could to make them compatible with MacOS. Some of them don't have default shortcuts defined (such as 'move window left' or 'launch calculator') so I just made those as needed
+
+### Right-shift preferred
+* At the time of this writing, left-shift wasn't always being registered as a modifier key when checking modmasks, so I stuck with everything using right-shift as it had the expected effects
+
+### Compose key
+* I used [macos compose](https://github.com/Granitosaurus/macos-compose) 
+  
+
+   
diff --git a/keyboards/crkbd/keymaps/nimishgautam/rules.mk b/keyboards/crkbd/keymaps/nimishgautam/rules.mk
new file mode 100644
index 0000000000..84ae6248cb
--- /dev/null
+++ b/keyboards/crkbd/keymaps/nimishgautam/rules.mk
@@ -0,0 +1,12 @@
+RGB_MATRIX_ENABLE = yes
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = yes  # enable tap dance features
+EXTRAKEY_ENABLE = no
+GRAVE_ESC_ENABLE = no
+SPACE_CADET_ENABLE = no
+#WPM_ENABLE = yes
+#CAPS_WORD_ENABLE = yes # if you hold down both shifts, you get lshift enabled for 1 word, but only works with KC shift, not MOD shift :(
+#AUTO_SHIFT_ENABLE = yes
+#UNICODE_ENABLE = yes     # enable unicode

From 2b33d2c098e3bda50fde67fb49f856e2bb3ab1b5 Mon Sep 17 00:00:00 2001
From: Markus Knutsson <markus.knutsson@tweety.se>
Date: Sat, 1 Oct 2022 01:33:09 +0200
Subject: [PATCH 524/959] [Keyboard] Add Little Big Scroll 4  macropad 
 (#18516)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/tweetydabird/lbs4/config.h          | 10 +++
 keyboards/tweetydabird/lbs4/info.json         | 78 +++++++++++++++++++
 .../lbs4/keymaps/default/keymap.c             | 35 +++++++++
 .../lbs4/keymaps/default/readme.md            |  5 ++
 keyboards/tweetydabird/lbs4/readme.md         | 26 +++++++
 keyboards/tweetydabird/lbs4/rules.mk          |  1 +
 6 files changed, 155 insertions(+)
 create mode 100644 keyboards/tweetydabird/lbs4/config.h
 create mode 100644 keyboards/tweetydabird/lbs4/info.json
 create mode 100644 keyboards/tweetydabird/lbs4/keymaps/default/keymap.c
 create mode 100644 keyboards/tweetydabird/lbs4/keymaps/default/readme.md
 create mode 100644 keyboards/tweetydabird/lbs4/readme.md
 create mode 100644 keyboards/tweetydabird/lbs4/rules.mk

diff --git a/keyboards/tweetydabird/lbs4/config.h b/keyboards/tweetydabird/lbs4/config.h
new file mode 100644
index 0000000000..91df795bae
--- /dev/null
+++ b/keyboards/tweetydabird/lbs4/config.h
@@ -0,0 +1,10 @@
+// Copyright 2022 Markus Knutsson (@TweetyDaBird)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include "config_common.h"
+
+// Bootmagic Lite key configuration
+// Not yet supported in info.json ?
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json
new file mode 100644
index 0000000000..4d495e8b22
--- /dev/null
+++ b/keyboards/tweetydabird/lbs4/info.json
@@ -0,0 +1,78 @@
+{
+	"keyboard_name": "Little Big Scroll 4",
+	"manufacturer": "Tweetys Wild Thinking",
+	"url": "https://lectronz.com/stores/tweetys-wild-thinking",
+	"maintainer": "TweetyDaBird",	
+	
+	"development_board": "promicro",
+	"bootloader_instructions": "Short marked pads on PCB, or hold top left key when plugging in.",
+	
+	"features": {
+		"bootmagic": true,
+		"command": false,
+		"console": false,
+		"extrakey": true,
+		"mousekey": false,
+		"nkro": false,
+		"rgblight": true,
+		"encoder": true
+	},
+
+	"build": {
+		"lto": true
+	},
+	
+	"debounce": 5,
+	
+	"usb": {
+		"vid": "0xFEED",
+        "pid": "0x23B0",
+		"device_version": "1.1.0"
+	},
+
+	"matrix_pins": {
+        "direct": [
+			["E6", "D7", "F4"],
+			["B5", "B4", null]
+        ]
+    },
+
+	"encoder": {
+        "rotary": [
+            { 
+				"pin_a": "B1", 
+				"pin_b": "F7",
+				"resolution": 2
+			}
+        ]
+    },
+	
+	"rgblight": {
+        "led_count": 6,
+        "pin": "D2",
+        "hue_steps": 8,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+		"max_brightness": 175,
+        "animations": {
+            "alternating": true
+            "breathing": true,
+            "rainbow_mood": true,
+            "static_gradient": true,
+        }
+    },
+
+	"layouts": {
+        "LAYOUT": {
+            "layout": [	
+			{ "label": "Play", 	"matrix": [0, 2], "x": 2, "y": 0, "w": 2, "h": 2 }, 
+			
+			{ "label": "F1", 	"matrix": [0, 0], "x": 0, "y": 0, "w": 1, "h": 1 }, 
+			{ "label": "F2", 	"matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
+			
+			{ "label": "F3", 	"matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 },
+			{ "label": "F4", 	"matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 },
+			]
+		}
+	}	
+}
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs4/keymaps/default/keymap.c b/keyboards/tweetydabird/lbs4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3817b0f884
--- /dev/null
+++ b/keyboards/tweetydabird/lbs4/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2022 Markus Knutsson (@TweetyDaBird)
+// 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,
+    _RGB
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_MPLY,
+		TO(_RGB),	KC_MSEL,	
+		KC_MPRV,	KC_MNXT
+    ),
+    [_RGB] = LAYOUT(
+        KC_MPLY,
+		TO(_BASE),	RGB_VAI,	
+		RGB_TOG,	RGB_VAD
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+		if (clockwise) {
+			tap_code(KC_VOLU);
+		} else {
+			tap_code(KC_VOLD);
+		}        
+	} 
+	return true;
+};
diff --git a/keyboards/tweetydabird/lbs4/keymaps/default/readme.md b/keyboards/tweetydabird/lbs4/keymaps/default/readme.md
new file mode 100644
index 0000000000..09501d9231
--- /dev/null
+++ b/keyboards/tweetydabird/lbs4/keymaps/default/readme.md
@@ -0,0 +1,5 @@
+# The default keymap for lbs4
+
+This is a very basic layout using LSB4 as media playback buttons. 
+
+![lsb4](https://imgur.com/hCDdQIc)
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs4/readme.md b/keyboards/tweetydabird/lbs4/readme.md
new file mode 100644
index 0000000000..e17a850c5e
--- /dev/null
+++ b/keyboards/tweetydabird/lbs4/readme.md
@@ -0,0 +1,26 @@
+# Little Big Scroll 4
+
+![lsb4](https://i.imgur.com/MMGSDz2h.jpeg)
+
+* A simple 4-key or 2-key plus OLED macropad with a clickable scrollwheel, for media controls and whatever else you can imagine.*
+
+* Keyboard Maintainer: [Markus Knutsson](https://github.com/TweetyDaBird/)
+* Hardware Supported: LBS4 PCB plus Pro Micro or pin compatible
+* Hardware Availability: https://lectronz.com/stores/tweetys-wild-thinking
+* Hardware Design: https://github.com/TweetyDaBird/Little-Big-Scroll
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tweetydabird/lbs4:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 
+Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset**: Briefly short the marked pads on PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if mapped (not in default keymap)
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs4/rules.mk b/keyboards/tweetydabird/lbs4/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/tweetydabird/lbs4/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 9f0d9b4fbea2da81c82d7dc091aa56d52a7db675 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 1 Oct 2022 12:54:42 +1000
Subject: [PATCH 525/959] onekey: fix quine keymap (#18555)

---
 keyboards/handwired/onekey/keymaps/quine/keymap.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keyboards/handwired/onekey/keymaps/quine/keymap.c b/keyboards/handwired/onekey/keymaps/quine/keymap.c
index f440bba83a..5f1416c77e 100644
--- a/keyboards/handwired/onekey/keymaps/quine/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/quine/keymap.c
@@ -1,7 +1,7 @@
-#include <quantum.h>
+#include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_ortho_1x1(KC_A) };
 const char *buf[30] = {
-"#include <quantum.h>",
+"#include QMK_KEYBOARD_H",
 "const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_ortho_1x1(KC_A) };",
 "const char *buf[30] = {",
 "",
@@ -57,4 +57,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 };
-

From e78fa1fbf00fed10399b70c212f00668d7745b17 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 1 Oct 2022 10:52:46 +0200
Subject: [PATCH 526/959] Fix comment of CM_QUES (Colemak question mark)
 (#18557)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`#define CM_QUES S(CM_SLSH) // /` → `#define CM_QUES S(CM_SLSH) // ?`
---
 quantum/keymap_extras/keymap_colemak.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/keymap_colemak.h b/quantum/keymap_extras/keymap_colemak.h
index 6658cc1301..e7b5c97ccb 100644
--- a/quantum/keymap_extras/keymap_colemak.h
+++ b/quantum/keymap_extras/keymap_colemak.h
@@ -122,4 +122,4 @@
 // Row 4
 #define CM_LABK S(CM_COMM) // <
 #define CM_RABK S(CM_DOT)  // >
-#define CM_QUES S(CM_SLSH) // /
+#define CM_QUES S(CM_SLSH) // ?

From 059a7fb9b033fe1adb8a797e0f3dbc074499020c Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 2 Oct 2022 00:21:22 +1000
Subject: [PATCH 527/959] Djinn theme, allow force redraws (#18558)

---
 keyboards/tzarc/djinn/djinn.c                        | 4 ++--
 keyboards/tzarc/djinn/graphics/theme_djinn_default.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c
index e6529e555d..93b1ee775e 100644
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@@ -129,7 +129,7 @@ RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
 //----------------------------------------------------------
 // UI Placeholder, implemented in themes
 
-__attribute__((weak)) void draw_ui_user(void) {}
+__attribute__((weak)) void draw_ui_user(bool force_redraw) {}
 
 //----------------------------------------------------------
 // Housekeeping
@@ -223,7 +223,7 @@ void housekeeping_task_kb(void) {
 
     // Draw the UI
     if (kb_state.lcd_power) {
-        draw_ui_user();
+        draw_ui_user(false);
     }
 
     // Go into low-scan interrupt-based mode if we haven't had any matrix activity in the last 250 milliseconds
diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
index a4e87bd341..c9863f2285 100644
--- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
+++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
@@ -89,8 +89,8 @@ void keyboard_post_init_display(void) {
 
 //----------------------------------------------------------
 // UI Drawing
-void draw_ui_user(void) {
-    bool            hue_redraw = false;
+void draw_ui_user(bool force_redraw) {
+    bool            hue_redraw = force_redraw;
     static uint16_t last_hue   = 0xFFFF;
 #if defined(RGB_MATRIX_ENABLE)
     uint16_t curr_hue = rgb_matrix_get_hue();

From 2d25b89d115d9957456172d76fb6942ccf92a7b9 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 1 Oct 2022 17:20:42 +0100
Subject: [PATCH 528/959] Remove more RESET keycode references (#18559)

---
 keyboards/cannonkeys/moment/keymaps/default/keymap.c    | 2 +-
 keyboards/cannonkeys/moment/keymaps/via/keymap.c        | 2 +-
 keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c | 2 +-
 keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c     | 2 +-
 keyboards/cannonkeys/vector/keymaps/default/keymap.c    | 2 +-
 keyboards/cannonkeys/vector/keymaps/via/keymap.c        | 2 +-
 keyboards/novelkeys/nk65b/keymaps/default/keymap.c      | 2 +-
 keyboards/novelkeys/nk65b/keymaps/via/keymap.c          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/keyboards/cannonkeys/moment/keymaps/default/keymap.c b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
index 3936ef3357..307776a9d1 100644
--- a/keyboards/cannonkeys/moment/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
   [_FN2] = LAYOUT_all(
diff --git a/keyboards/cannonkeys/moment/keymaps/via/keymap.c b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
index 3936ef3357..307776a9d1 100644
--- a/keyboards/cannonkeys/moment/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
   [_FN2] = LAYOUT_all(
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
index daab043507..d9878144f4 100644
--- a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_INC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
   [_FN2] = LAYOUT_all(
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
index be5d800341..ccb2fcf418 100644
--- a/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-    _______,  _______, _______,                           _______,                                     _______, _______, RESET
+    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
   [_FN2] = LAYOUT_all(
diff --git a/keyboards/cannonkeys/vector/keymaps/default/keymap.c b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
index 7def0bb31d..b5afbd2e4b 100644
--- a/keyboards/cannonkeys/vector/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, RESET
+    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, QK_BOOT
   ),
 
   [_FN2] = LAYOUT_all(
diff --git a/keyboards/cannonkeys/vector/keymaps/via/keymap.c b/keyboards/cannonkeys/vector/keymaps/via/keymap.c
index 28b3492f0e..877e364f3a 100644
--- a/keyboards/cannonkeys/vector/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/vector/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, RESET
+    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, QK_BOOT
   ),
 
   [_FN2] = LAYOUT_all(
diff --git a/keyboards/novelkeys/nk65b/keymaps/default/keymap.c b/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
index 420db9503c..feac00f10c 100755
--- a/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
     KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/novelkeys/nk65b/keymaps/via/keymap.c b/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
index 39776b421f..4849af39d1 100755
--- a/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
+++ b/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
     KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),

From e068f7a8d1ff3a849011cf090ce63ad1fe063e7b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 1 Oct 2022 17:47:12 +0100
Subject: [PATCH 529/959] RESET -> QK_BOOT user keymaps (#18560)

---
 keyboards/ai03/lunar/keymaps/zyber/keymap.c                  | 2 +-
 keyboards/alps64/keymaps/zyber/keymap.c                      | 2 +-
 keyboards/bastardkb/tbk/keymaps/xyverz/readme.md             | 2 +-
 keyboards/converter/m0110_usb/keymaps/zyber/keymap.c         | 2 +-
 keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c         | 2 +-
 keyboards/doro67/multi/keymaps/zyber/keymap.c                | 2 +-
 keyboards/fc660c/keymaps/zyber/keymap.c                      | 2 +-
 keyboards/hidtech/bastyl/keymaps/xyverz/readme.md            | 2 +-
 keyboards/mechwild/mercutio/keymaps/jonavin/readme.md        | 2 +-
 keyboards/mechwild/murphpad/keymaps/jonavin/readme.md        | 2 +-
 keyboards/misterknife/knife66/keymaps/zyber/keymap.c         | 2 +-
 keyboards/playkbtw/ca66/keymaps/zyber/keymap.c               | 2 +-
 keyboards/prototypist/j01/keymaps/zyber/keymap.c             | 2 +-
 keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c | 2 +-
 keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c           | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/keyboards/ai03/lunar/keymaps/zyber/keymap.c b/keyboards/ai03/lunar/keymaps/zyber/keymap.c
index d4d3f9c89d..5ab7bde3e3 100644
--- a/keyboards/ai03/lunar/keymaps/zyber/keymap.c
+++ b/keyboards/ai03/lunar/keymaps/zyber/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, ROPT_SRH,KC_LCMD,          _______,           LCMD_T(KC_SPC),           _______,          ROPT_SRH,  KC_GRV,   KC_LEFT, KC_DOWN, KC_RGHT
 	),
 	[1] = LAYOUT( /* FN */
-		RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_DEL,  KC_DEL,  KC_PAUS,
+		QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_DEL,  KC_DEL,  KC_PAUS,
 		C_BLK,            _______, KC_UP,   _______,  _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_MPRV,  KC_MPLY,  KC_MNXT, _______, KC_SLCK,
 		_______,          KC_LEFT, KC_DOWN, KC_RGHT,  _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______,  _______,           _______, _______,
 		_______,          KC_RCTL, KC_RGUI, KC_RALT,  _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______,  _______,           KC_PGUP, _______,
diff --git a/keyboards/alps64/keymaps/zyber/keymap.c b/keyboards/alps64/keymaps/zyber/keymap.c
index 0cc0cc8cf5..1110b64165 100644
--- a/keyboards/alps64/keymaps/zyber/keymap.c
+++ b/keyboards/alps64/keymaps/zyber/keymap.c
@@ -28,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                            RESET,                              _______, _______, _______
+    _______, _______, _______,                            QK_BOOT,                            _______, _______, _______
   )
 };
diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/readme.md b/keyboards/bastardkb/tbk/keymaps/xyverz/readme.md
index 9359e6ad9c..b806bd265a 100644
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/readme.md
+++ b/keyboards/bastardkb/tbk/keymaps/xyverz/readme.md
@@ -17,6 +17,6 @@ See the [keyboard build instructions](https://docs.bastardkb.com)
 
 ## Important information regarding the reset
 
-If you modify this firmware, make sure to always have a RESET key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
+If you modify this firmware, make sure to always have a `QK_BOOT` key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
 
 Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
index f8f69a69a5..f3a16b9955 100644
--- a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
+++ b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 */
 
 	[1] = LAYOUT_iso(
-		RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,      _______, _______, _______, _______, \
+		QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,      _______, _______, _______, _______, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,              _______, _______, _______, _______, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,                       _______, _______, _______, _______, \
diff --git a/keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c b/keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c
index 4bf316c578..468a16f92d 100644
--- a/keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c
+++ b/keyboards/cutie_club/borsdorf/keymaps/zyber/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,    KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RALT,  MO(1),                  KC_LEFT,    KC_DOWN,    KC_RIGHT
     ),
     [1] = LAYOUT_rshift(
-        RESET,      KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,       KC_F12,     KC_DEL,                 KC_VOLU,
+        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_VOLU,
         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_VOLD,
         KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,
         KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,           KC_TRNS,
diff --git a/keyboards/doro67/multi/keymaps/zyber/keymap.c b/keyboards/doro67/multi/keymaps/zyber/keymap.c
index c0edcc3c8b..367a648436 100644
--- a/keyboards/doro67/multi/keymaps/zyber/keymap.c
+++ b/keyboards/doro67/multi/keymaps/zyber/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LALT, KC_LGUI,                      KC_SPC,  KC_SPC,  KC_SPC,                      KC_RALT, MO(1),    KC_NO, KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_multi(
-    RESET,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, ,
+    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, ,
     BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_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,
diff --git a/keyboards/fc660c/keymaps/zyber/keymap.c b/keyboards/fc660c/keymaps/zyber/keymap.c
index 3e5cffe01c..257a714d8c 100644
--- a/keyboards/fc660c/keymaps/zyber/keymap.c
+++ b/keyboards/fc660c/keymaps/zyber/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `--------------------------------------------------------------------------------------------------´
    */
   [1] = LAYOUT(
-        RESET, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     C_BLK,
+        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, _______,     C_BLK,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
         _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     _______,
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/readme.md b/keyboards/hidtech/bastyl/keymaps/xyverz/readme.md
index f21f030a89..89d11347d2 100644
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/readme.md
+++ b/keyboards/hidtech/bastyl/keymaps/xyverz/readme.md
@@ -17,6 +17,6 @@ See the [keyboard build instructions](https://hid-technologies.github.io/Bastyl-
 
 ## Important information regarding the reset
 
-If you modify this firmware, make sure to always have a RESET key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
+If you modify this firmware, make sure to always have a `QK_BOOT` key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
 
 Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md b/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md
index 6255dadd05..ed1395ede6 100644
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md
@@ -30,7 +30,7 @@ Features
                 {"C-A-D",   KC_CAD},  // Ctrl-Alt-Del
                 {"AltF4",   KC_AF4},
                 {"PLAY",    KC_MEDIA_PLAY_PAUSE},
-                {"RESET",   RESET},  // firmware flash mode
+                {"RESET",   QK_BOOT},  // firmware flash mode
        };
 
   - Additional encoder functionality 
diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md b/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md
index 0e389a5c37..ec76f0a415 100644
--- a/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md
+++ b/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md
@@ -34,7 +34,7 @@ Special Features
             {"Break",   KC_PAUS},
             {"C-A-D",   KC_CAD},  // Ctrl-Alt-Del
             {"AltF4",   KC_AF4},
-            {"RESET",   RESET},   // firmware flash mode
+            {"RESET",   QK_BOOT},   // firmware flash mode
           };
 
   - Additional encoder functionality
diff --git a/keyboards/misterknife/knife66/keymaps/zyber/keymap.c b/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
index ae5e4f7455..cec762fb64 100644
--- a/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
+++ b/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,     KC_LALT, KC_LGUI, KC_LGUI, LT(1, KC_SPC),             KC_LGUI,          KC_LALT,   MO(1),           KC_LEFT,  KC_DOWN, KC_RGHT ),
 
   [_FN] = LAYOUT_all(
-    RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_DEL, RGB_TOG,
+    QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_DEL, RGB_TOG,
     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,  KC_MPRV,  KC_MNXT,  KC_TRNS,         RGB_MOD,
     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_TRNS,  KC_TRNS,            KC_INS,          RGB_SPI,
     KC_CAPS,   KC_TRNS, KC_TRNS, C(KC_C), KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,            C(KC_UP),        RGB_SPD,
diff --git a/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
index ccf248e203..f4db24f90f 100644
--- a/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
     KC_GRV,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_DEL,  KC_DEL, RGB_TOG,
-    KC_CAPS,          KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_PSCR,  KC_SLCK,  KC_PAUS, KC_TRNS,         RGB_MOD,
+    KC_CAPS,          KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PSCR,  KC_SLCK,  KC_PAUS, KC_TRNS,         RGB_MOD,
     KC_TRNS,          KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD,  RGB_VAI,           KC_INS,          KC_HOME,
     KC_LSFT, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,  KC_TRNS,  RGB_HUI,                  KC_END,
     KC_NO,            KC_TRNS, KC_TRNS,          KC_NO,            KC_TRNS,          KC_NO,   KC_TRNS, KC_TRNS,  RGB_SAD,  RGB_HUD, RGB_SAI),
diff --git a/keyboards/prototypist/j01/keymaps/zyber/keymap.c b/keyboards/prototypist/j01/keymaps/zyber/keymap.c
index 53a090b262..53b98ad023 100644
--- a/keyboards/prototypist/j01/keymaps/zyber/keymap.c
+++ b/keyboards/prototypist/j01/keymaps/zyber/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Fn1 layer
     [1] = LAYOUT_all(
-        KC_TRNS, KC_TRNS,     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,      RESET,
+        KC_TRNS, KC_TRNS,     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,       QK_BOOT,
         KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,
         KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_HOME,
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
index ea1f771b2c..36d2d6efcd 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Fn3 Layer (zeal60 Configuration)
 [3] = LAYOUT_60_hhkb(
-	RESET,   EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  KC_TRNS, EEP_RST,
+	QK_BOOT, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  KC_TRNS, EEP_RST,
 	KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ES_DEC,  ES_INC,  KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
index 747f2dd00c..4129317289 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Fn3 Layer (zeal60 Configuration)
 	[3] = LAYOUT_65_normie(
-		RESET,   EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  EEP_RST, KC_TRNS,
+		QK_BOOT, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  EEP_RST, KC_TRNS,
 		C_BLK,   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, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

From 0bae3b09a1ca1cd68f2979101cc9385596c7b498 Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Sat, 1 Oct 2022 19:44:52 +0200
Subject: [PATCH 530/959] [Keyboard] Add waffling60 Rev D ISO Hotswap (#18372)

Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
---
 keyboards/4pplet/waffling60/info.json         | 80 -------------------
 keyboards/4pplet/waffling60/readme.md         |  4 +
 keyboards/4pplet/waffling60/rev_a/config.h    | 16 ++++
 keyboards/4pplet/waffling60/rev_a/info.json   |  9 +++
 .../{ => rev_a}/keymaps/default/keymap.c      |  4 +-
 .../{ => rev_a}/keymaps/via/keymap.c          |  8 +-
 .../{ => rev_a}/keymaps/via/rules.mk          |  0
 keyboards/4pplet/waffling60/rev_a/rev_a.c     | 16 ++++
 keyboards/4pplet/waffling60/rev_a/rev_a.h     | 18 ++++-
 keyboards/4pplet/waffling60/rev_b/config.h    | 11 ++-
 keyboards/4pplet/waffling60/rev_b/info.json   |  9 +++
 .../waffling60/rev_b/keymaps/default/keymap.c | 34 ++++++++
 .../waffling60/rev_b/keymaps/via/keymap.c     | 48 +++++++++++
 .../waffling60/rev_b/keymaps/via/rules.mk     |  1 +
 keyboards/4pplet/waffling60/rev_b/rev_b.h     |  2 +-
 keyboards/4pplet/waffling60/rev_c/info.json   |  9 +++
 .../waffling60/rev_c/keymaps/default/keymap.c | 34 ++++++++
 .../waffling60/rev_c/keymaps/via/keymap.c     | 48 +++++++++++
 .../waffling60/rev_c/keymaps/via/rules.mk     |  1 +
 keyboards/4pplet/waffling60/rev_c/rev_c.h     |  2 +-
 .../4pplet/waffling60/rev_d_iso/config.h      | 36 +++++++++
 .../4pplet/waffling60/rev_d_iso/halconf.h     | 19 +++++
 .../4pplet/waffling60/rev_d_iso/info.json     | 16 ++++
 .../rev_d_iso/keymaps/default/keymap.c        | 34 ++++++++
 .../waffling60/rev_d_iso/keymaps/via/keymap.c | 48 +++++++++++
 .../waffling60/rev_d_iso/keymaps/via/rules.mk |  1 +
 .../4pplet/waffling60/rev_d_iso/mcuconf.h     | 25 ++++++
 .../4pplet/waffling60/rev_d_iso/readme.md     | 21 +++++
 .../4pplet/waffling60/rev_d_iso/rev_d_iso.c   | 17 ++++
 .../4pplet/waffling60/rev_d_iso/rev_d_iso.h   | 35 ++++++++
 .../4pplet/waffling60/rev_d_iso/rules.mk      | 24 ++++++
 31 files changed, 540 insertions(+), 90 deletions(-)
 delete mode 100644 keyboards/4pplet/waffling60/info.json
 rename keyboards/4pplet/waffling60/{ => rev_a}/keymaps/default/keymap.c (98%)
 rename keyboards/4pplet/waffling60/{ => rev_a}/keymaps/via/keymap.c (98%)
 rename keyboards/4pplet/waffling60/{ => rev_a}/keymaps/via/rules.mk (100%)
 create mode 100644 keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_b/keymaps/via/rules.mk
 create mode 100644 keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_c/keymaps/via/rules.mk
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/config.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/halconf.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/info.json
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/rules.mk
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/mcuconf.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/readme.md
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d_iso/rules.mk

diff --git a/keyboards/4pplet/waffling60/info.json b/keyboards/4pplet/waffling60/info.json
deleted file mode 100644
index 9e4f081ddc..0000000000
--- a/keyboards/4pplet/waffling60/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/waffling60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "!", "x": 1, "y": 0 },
-                { "label": "@", "x": 2, "y": 0 },
-                { "label": "#", "x": 3, "y": 0 },
-                { "label": "$", "x": 4, "y": 0 },
-                { "label": "%", "x": 5, "y": 0 },
-                { "label": "^", "x": 6, "y": 0 },
-                { "label": "&", "x": 7, "y": 0 },
-                { "label": "*", "x": 8, "y": 0 },
-                { "label": "(", "x": 9, "y": 0 },
-                { "label": ")", "x": 10, "y": 0 },
-                { "label": "_", "x": 11, "y": 0 },
-                { "label": "+", "x": 12, "y": 0 },
-                { "label": "|", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Fn", "x": 14, "y": 3, "w": 1 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 },
-                { "label": "Space2", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/waffling60/readme.md b/keyboards/4pplet/waffling60/readme.md
index 374b56ffba..acfa174eab 100644
--- a/keyboards/4pplet/waffling60/readme.md
+++ b/keyboards/4pplet/waffling60/readme.md
@@ -12,6 +12,10 @@ Make example for this keyboard (after setting up your build environment):
     make 4pplet/waffling60/rev_a:default
     make 4pplet/waffling60/rev_b:default
     make 4pplet/waffling60/rev_c:default
+    
+    make 4pplet/waffling60/rev_d:default
+    make 4pplet/waffling60/rev_d_ansi:default
+    make 4pplet/waffling60/rev_d_iso:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h
index 5b5066859c..628acb2a9c 100644
--- a/keyboards/4pplet/waffling60/rev_a/config.h
+++ b/keyboards/4pplet/waffling60/rev_a/config.h
@@ -1,3 +1,19 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #pragma once
 
 #include "config_common.h"
diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json
index 6d4bf31f32..ecbffb1e17 100644
--- a/keyboards/4pplet/waffling60/rev_a/info.json
+++ b/keyboards/4pplet/waffling60/rev_a/info.json
@@ -1,7 +1,16 @@
 {
     "keyboard_name": "Waffling60 Rev A",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
     "usb": {
+        "vid": "0x4444",
         "pid": "0x0003",
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        }
     }
 }
diff --git a/keyboards/4pplet/waffling60/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/4pplet/waffling60/keymaps/default/keymap.c
rename to keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c
index ae3a840610..6310f09749 100644
--- a/keyboards/4pplet/waffling60/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c
@@ -18,14 +18,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // main layer
-[0] = LAYOUT_all(
+[0] = LAYOUT(
   KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,          KC_ENT,
   KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
   KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
 // basic function layer
-[1] = LAYOUT_all(
+[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_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
diff --git a/keyboards/4pplet/waffling60/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c
similarity index 98%
rename from keyboards/4pplet/waffling60/keymaps/via/keymap.c
rename to keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c
index a1d4c9c940..0560eb8c0c 100644
--- a/keyboards/4pplet/waffling60/keymaps/via/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c
@@ -18,28 +18,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // main layer
-[0] = LAYOUT_all(
+[0] = LAYOUT(
   KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_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, KC_RGUI, KC_APP,  MO(1)),
 // basic function layer
-[1] = LAYOUT_all(
+[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_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS),
 // extra layer for VIA
-[2] = LAYOUT_all(
+[2] = LAYOUT(
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 // extra layer for VIA
-[3] = LAYOUT_all(
+[3] = LAYOUT(
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
diff --git a/keyboards/4pplet/waffling60/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_a/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/4pplet/waffling60/keymaps/via/rules.mk
rename to keyboards/4pplet/waffling60/rev_a/keymaps/via/rules.mk
diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c
index d3db08ad19..dc6c727fb7 100644
--- a/keyboards/4pplet/waffling60/rev_a/rev_a.c
+++ b/keyboards/4pplet/waffling60/rev_a/rev_a.c
@@ -1 +1,17 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "rev_a.h"
diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h
index 3ac2968779..92384b4840 100644
--- a/keyboards/4pplet/waffling60/rev_a/rev_a.h
+++ b/keyboards/4pplet/waffling60/rev_a/rev_a.h
@@ -1,9 +1,25 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #pragma once
 
 #include "quantum.h"
 
 // k<row><col>
-#define LAYOUT_all( \
+#define LAYOUT( \
     k00, k01, k11, k02, k03, k04, k05, k15, k06, k07, k08, k18, k09, k0a, k1a, \
     k10, k21, k12, k22, k13, k14, k25, k35, k16, k17, k28, k19, k29, k2a, \
     k20, k31, k32, k23, k33, k24, k45, k26, k36, k27, k38, k39, k3a, \
diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h
index 69d9a485c5..abf6a286f5 100644
--- a/keyboards/4pplet/waffling60/rev_b/config.h
+++ b/keyboards/4pplet/waffling60/rev_b/config.h
@@ -45,4 +45,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
index 1e0075d47b..1c2af5598f 100644
--- a/keyboards/4pplet/waffling60/rev_b/info.json
+++ b/keyboards/4pplet/waffling60/rev_b/info.json
@@ -1,7 +1,16 @@
 {
     "keyboard_name": "Waffling60 Rev B",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
     "usb": {
+        "vid": "0x4444",
         "pid": "0x0005",
         "device_version": "0.0.2"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        }
     }
 }
diff --git a/keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6310f09749
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0560eb8c0c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_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, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS),
+// extra layer for VIA
+[2] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[3] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_b/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_b/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_b/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_b/rev_b.h b/keyboards/4pplet/waffling60/rev_b/rev_b.h
index e54e020354..b3949012e9 100644
--- a/keyboards/4pplet/waffling60/rev_b/rev_b.h
+++ b/keyboards/4pplet/waffling60/rev_b/rev_b.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#define LAYOUT_all( \
+#define LAYOUT( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
index 5af681f27a..1e464574a1 100644
--- a/keyboards/4pplet/waffling60/rev_c/info.json
+++ b/keyboards/4pplet/waffling60/rev_c/info.json
@@ -1,7 +1,16 @@
 {
     "keyboard_name": "Waffling60 Rev C",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
     "usb": {
+        "vid": "0x4444",
         "pid": "0x0008",
         "device_version": "0.0.3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        }
     }
 }
diff --git a/keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6310f09749
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0560eb8c0c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_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, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,           KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS),
+// extra layer for VIA
+[2] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[3] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,            KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_c/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_c/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.h b/keyboards/4pplet/waffling60/rev_c/rev_c.h
index 701098df1f..c57c0f29c2 100644
--- a/keyboards/4pplet/waffling60/rev_c/rev_c.h
+++ b/keyboards/4pplet/waffling60/rev_c/rev_c.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#define LAYOUT_all( \
+#define LAYOUT( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h
new file mode 100644
index 0000000000..dafc628703
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/config.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
+#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT B2 // usually COL
+#define QMK_ESC_INPUT B14 // usually ROW
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/halconf.h b/keyboards/4pplet/waffling60/rev_d_iso/halconf.h
new file mode 100644
index 0000000000..c656a7d6c3
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/halconf.h
@@ -0,0 +1,19 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <halconf.h>
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json
new file mode 100644
index 0000000000..3712a5c055
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Waffling60 Rev D ISO",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000C",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..563c3838d1
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_NUHS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..18c2912269
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC,  KC_RBRC,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH,  KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[2] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[3] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/mcuconf.h b/keyboards/4pplet/waffling60/rev_d_iso/mcuconf.h
new file mode 100644
index 0000000000..1357c51f59
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/mcuconf.h
@@ -0,0 +1,25 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/readme.md b/keyboards/4pplet/waffling60/rev_d_iso/readme.md
new file mode 100644
index 0000000000..e8a87862a6
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/readme.md
@@ -0,0 +1,21 @@
+# waffling60
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support.
+
+More info: https://geekhack.org/index.php?topic=103531.0
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_d_iso:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+How to enter bootloader (DFU):
+* Press and hold the button on the keyboard (the small one on the same side as the MCU) for more than 1 second. The keyboard will then enter bootloader (DFU) mode and it's ready to flash the firmware.
+* Note: If holding the button a shorter time, the keyboard will just reset. If you want to exit bootloader mode without flashing a firmware, dissconnect the keyboard from your PC and reconnect it or tap the reset button.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Esc key, plug in your keyboard and wait a second before releasing the keys. Bootmagic lite is enabled by default.
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c
new file mode 100644
index 0000000000..8efa86152e
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "rev_d_iso.h"
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h
new file mode 100644
index 0000000000..46f0ec65ff
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "quantum.h"
+
+// k<row><col>
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42, k44, k46, k48, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
+    {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \
+}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
new file mode 100644
index 0000000000..d9584ba09d
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From 2b3f6d0ec6bf504b0b5794bd4f1f3ed7e792a221 Mon Sep 17 00:00:00 2001
From: Peter Park <peterchpark@gmail.com>
Date: Sat, 1 Oct 2022 10:56:41 -0700
Subject: [PATCH 531/959] [Keyboard] Add Uni v4 keyboard (#18280)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
---
 keyboards/the_uni/pro_micro/readme.md | 10 +++--
 keyboards/the_uni/readme.md           |  9 +++-
 keyboards/the_uni/rp_2040/config.h    | 61 +++++++++++++++++++++++++++
 keyboards/the_uni/rp_2040/info.json   |  5 +++
 keyboards/the_uni/rp_2040/readme.md   | 25 +++++++++++
 keyboards/the_uni/rp_2040/rp_2040.c   | 17 ++++++++
 keyboards/the_uni/rp_2040/rp_2040.h   | 30 +++++++++++++
 keyboards/the_uni/rp_2040/rules.mk    | 19 +++++++++
 keyboards/the_uni/usb_c/info.json     |  2 +-
 9 files changed, 171 insertions(+), 7 deletions(-)
 create mode 100644 keyboards/the_uni/rp_2040/config.h
 create mode 100644 keyboards/the_uni/rp_2040/info.json
 create mode 100644 keyboards/the_uni/rp_2040/readme.md
 create mode 100644 keyboards/the_uni/rp_2040/rp_2040.c
 create mode 100644 keyboards/the_uni/rp_2040/rp_2040.h
 create mode 100644 keyboards/the_uni/rp_2040/rules.mk

diff --git a/keyboards/the_uni/pro_micro/readme.md b/keyboards/the_uni/pro_micro/readme.md
index d6b6231561..397cf7a198 100644
--- a/keyboards/the_uni/pro_micro/readme.md
+++ b/keyboards/the_uni/pro_micro/readme.md
@@ -1,7 +1,9 @@
-# The Uni
+# The Uni v1 and v2
+
+![Uni v2](https://i.imgur.com/hIIK8xN.jpg)
 
 -   Keyboard Maintainer: [Peter](https://github.com/petercpark)
--   Link to Keyboard Files: [The_Uni](https://github.com/petercpark/The_Uni)
+-   Link to Keyboard Files: [The_Uni](https://github.com/petercpark/The_Uni) (For personal use only)
 -   Hardware Supported:
     -   The Uni v1 and v2 (pro_micro)
 -   Hardware Availability: [https://www.stenokeyboards.com](https://www.stenokeyboards.com)
@@ -10,8 +12,8 @@
 
 Enter the bootloader by:
 
-* **Physical reset button**: On the Uni v3, briefly press the button on the back of the PCB.
-* **Reset Pads**: Uni v1 and v2 have pins/pads you must short instead (RST to GND).
+-   **Physical reset button**: On the Uni v3, briefly press the button on the back of the PCB.
+-   **Reset Pads**: Uni v1 and v2 have pins/pads you must short instead (RST to GND).
 
 Make examples for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/the_uni/readme.md b/keyboards/the_uni/readme.md
index cd1c99e435..88cb81b111 100644
--- a/keyboards/the_uni/readme.md
+++ b/keyboards/the_uni/readme.md
@@ -19,13 +19,18 @@ A compact unibody split ortholinear keyboard made specifically for stenography.
 
 Enter the bootloader by:
 
-* **Physical reset button**: On the Uni v3, briefly press the button on the back of the PCB.
-* **Reset Pads**: Uni v1 and v2 have pins/pads you must short instead (RST to GND).
+-   **Physical reset button**: On the Uni v3, briefly press the button on the back of the PCB.
+-   **Reset Pads**: Uni v1 and v2 have pins/pads you must short instead (RST to GND).
 
 Make examples for this keyboard (after setting up your build environment):
 
+    # version 1 and 2
     make the_uni/pro_micro:default
 
+    # version 3
     make the_uni/usb_c:default
 
+    # version 4
+    qmk compile -kb the_uni/rp_2040 -km default
+
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/the_uni/rp_2040/config.h b/keyboards/the_uni/rp_2040/config.h
new file mode 100644
index 0000000000..a083ee20b7
--- /dev/null
+++ b/keyboards/the_uni/rp_2040/config.h
@@ -0,0 +1,61 @@
+/* Copyright 2019
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 11
+
+#define MATRIX_COL_PINS { GP24, GP23, GP21, GP20, GP19, GP6, GP5, GP4, GP3, GP2, GP1 }
+#define MATRIX_ROW_PINS { GP25, GP18, GP17 }
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+//#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+// #ifdef BACKLIGHT_PIN
+// #define BACKLIGHT_LEVELS 3
+// #endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+// #define LOCKING_SUPPORT_ENABLE
+
+// /* Locking resynchronize hack */
+// #define LOCKING_RESYNC_ENABLE
+
+
+// #ifdef RGB_DI_PIN
+// #define RGBLIGHT_ANIMATIONS
+// #define RGBLED_NUM 0
+// #define RGBLIGHT_HUE_STEP 8
+// #define RGBLIGHT_SAT_STEP 8
+// #define RGBLIGHT_VAL_STEP 8
+// #endif
+
+// #endif
+
+#define FORCE_NKRO
diff --git a/keyboards/the_uni/rp_2040/info.json b/keyboards/the_uni/rp_2040/info.json
new file mode 100644
index 0000000000..cebd90c01e
--- /dev/null
+++ b/keyboards/the_uni/rp_2040/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.4"
+    }
+}
diff --git a/keyboards/the_uni/rp_2040/readme.md b/keyboards/the_uni/rp_2040/readme.md
new file mode 100644
index 0000000000..5867a213d9
--- /dev/null
+++ b/keyboards/the_uni/rp_2040/readme.md
@@ -0,0 +1,25 @@
+# Uni v4
+
+![Uni v4](https://i.imgur.com/HyvMu26h.png)
+
+-   Hardware Supported:
+    -   The Uni v4
+-   Hardware Availability: [https://www.stenokeyboards.com](https://www.stenokeyboards.com)
+-   Uses the rp2040 chip
+
+Make the .uf2 file by doing:
+
+# Bootloader
+
+Enter the bootloader by:
+
+-   **Physical boot button**:
+    -   First, unplug the Uni v4.
+    -   Then press and hold the button on the back of the PCB marked "B" while you plug in the keyboard. This will create register the keyboard as a storage device on the computer.
+    -   Copy and paste the .uf2 file in the top directory of the device. Once done, it will automatically reboot the keyboard.
+
+Make examples for this keyboard (after setting up your build environment):
+
+    qmk compile -kb the_uni/rp_2040 -km default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/the_uni/rp_2040/rp_2040.c b/keyboards/the_uni/rp_2040/rp_2040.c
new file mode 100644
index 0000000000..b032a22f42
--- /dev/null
+++ b/keyboards/the_uni/rp_2040/rp_2040.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Stefan Kerkmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "rp_2040.h"
+
diff --git a/keyboards/the_uni/rp_2040/rp_2040.h b/keyboards/the_uni/rp_2040/rp_2040.h
new file mode 100644
index 0000000000..9371c3a241
--- /dev/null
+++ b/keyboards/the_uni/rp_2040/rp_2040.h
@@ -0,0 +1,30 @@
+/*
+Copyright 2021 Peter C. Park <peter@stenokeyboards.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
+	            K202, K203, K204, K205, K206, K207  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
+	{ KC_NO, KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  KC_NO, KC_NO, KC_NO }  \
+}
diff --git a/keyboards/the_uni/rp_2040/rules.mk b/keyboards/the_uni/rp_2040/rules.mk
new file mode 100644
index 0000000000..da6a3dc6a8
--- /dev/null
+++ b/keyboards/the_uni/rp_2040/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+STENO_ENABLE = yes
diff --git a/keyboards/the_uni/usb_c/info.json b/keyboards/the_uni/usb_c/info.json
index e557e4d307..b377cdff00 100644
--- a/keyboards/the_uni/usb_c/info.json
+++ b/keyboards/the_uni/usb_c/info.json
@@ -1,5 +1,5 @@
 {
     "usb": {
-        "device_version": "0.0.2"
+        "device_version": "0.0.3"
     }
 }

From c4ff8192c2a43592e577e54b0019741c16fb1644 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 2 Oct 2022 09:36:07 +1100
Subject: [PATCH 532/959] Reverse keymap search order (#18449)

---
 builddefs/build_keyboard.mk                   | 32 +++++++++----------
 .../staggered/rev3/keymaps/via/keymap.c       | 23 +++++++++++++
 .../staggered/rev3/keymaps/via/rules.mk       |  2 ++
 3 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/rules.mk

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 91cd851ef6..066b416b4b 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -124,26 +124,26 @@ include $(BUILDDEFS_PATH)/build_json.mk
 # Pull in keymap level rules.mk
 ifeq ("$(wildcard $(KEYMAP_PATH))", "")
     # Look through the possible keymap folders until we find a matching keymap.c
-    ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_5)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
-    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_4)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
-    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_3)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
+    ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_1)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
     else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.c)","")
         -include $(MAIN_KEYMAP_PATH_2)/rules.mk
         KEYMAP_C := $(MAIN_KEYMAP_PATH_2)/keymap.c
         KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
-    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_1)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_3)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_4)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_5)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
     else ifneq ($(LAYOUTS),)
         # If we haven't found a keymap yet fall back to community layouts
         include $(BUILDDEFS_PATH)/build_layout.mk
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..eb8bc1406b
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+#include QMK_KEYBOARD_H
+
+/* THIS FILE WAS GENERATED!
+ *
+ * This file was generated by QMK CLI. You may or may not want to
+ * edit it directly.
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
+	[1] = LAYOUT_all(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
+	[2] = LAYOUT_all(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
+	[3] = LAYOUT_all(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
+};
+
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
+        dimple_led_on();
+    } else {
+        dimple_led_off();
+    }
+    return false;
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From 6f13a76530165bb1ad723ab0270c9eb908ca3a8c Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Sun, 2 Oct 2022 15:35:33 +0200
Subject: [PATCH 533/959] [Core] ChibiOS: Fix USB bus disconnect handling
 (#18566)

---
 tmk_core/protocol/chibios/usb_main.c | 3 ++-
 tmk_core/protocol/chibios/usb_util.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 7c44b87bc4..3e64ceab19 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -734,6 +734,7 @@ void init_usb_driver(USBDriver *usbp) {
      * after a reset.
      */
     usbDisconnectBus(usbp);
+    usbStop(usbp);
     wait_ms(50);
     usbStart(usbp, &usbcfg);
     usbConnectBus(usbp);
@@ -742,8 +743,8 @@ void init_usb_driver(USBDriver *usbp) {
 }
 
 __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
-    usbStop(usbp);
     usbDisconnectBus(usbp);
+    usbStop(usbp);
 
 #if USB_SUSPEND_WAKEUP_DELAY > 0
     // Some hubs, kvm switches, and monitors do
diff --git a/tmk_core/protocol/chibios/usb_util.c b/tmk_core/protocol/chibios/usb_util.c
index c8b435db0c..a8c7d9a228 100644
--- a/tmk_core/protocol/chibios/usb_util.c
+++ b/tmk_core/protocol/chibios/usb_util.c
@@ -17,6 +17,7 @@
 #include "usb_util.h"
 
 void usb_disconnect(void) {
+    usbDisconnectBus(&USBD1);
     usbStop(&USBD1);
 }
 

From 9ecd6eb9b9ddf487ced76bf0b5114674cf61432b Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 3 Oct 2022 07:24:22 +1100
Subject: [PATCH 534/959] Add `tzarc/ghoul`. (#18562)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/tzarc/ghoul/config.h                |  19 +++
 keyboards/tzarc/ghoul/ghoul.c                 |  44 ++++++
 .../tzarc/ghoul/graphics/ghoul-logo.qgf.c     | 134 +++++++++++++++++
 .../tzarc/ghoul/graphics/ghoul-name.qgf.c     |  37 +++++
 .../tzarc/ghoul/graphics/lock-caps.qgf.c      |  20 +++
 keyboards/tzarc/ghoul/graphics/lock-num.qgf.c |  20 +++
 .../tzarc/ghoul/graphics/lock-scrl.qgf.c      |  20 +++
 .../tzarc/ghoul/graphics/thintel15.qff.c      |  74 ++++++++++
 keyboards/tzarc/ghoul/info.json               |  73 +++++++++
 .../tzarc/ghoul/keymaps/default/config.h      |  54 +++++++
 .../tzarc/ghoul/keymaps/default/keymap.c      |  75 ++++++++++
 .../tzarc/ghoul/keymaps/default/rules.mk      |   5 +
 keyboards/tzarc/ghoul/keymaps/default/ui.c    | 139 ++++++++++++++++++
 keyboards/tzarc/ghoul/readme.md               |  29 ++++
 keyboards/tzarc/ghoul/rev1/info.json          |  49 ++++++
 keyboards/tzarc/ghoul/rev1/rp2040/config.h    |  39 +++++
 keyboards/tzarc/ghoul/rev1/rp2040/halconf.h   |   8 +
 keyboards/tzarc/ghoul/rev1/rp2040/info.json   |  15 ++
 keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h   |  13 ++
 keyboards/tzarc/ghoul/rev1/rp2040/rules.mk    |   1 +
 keyboards/tzarc/ghoul/rev1/stm32/board.h      |   9 ++
 keyboards/tzarc/ghoul/rev1/stm32/config.h     |  47 ++++++
 keyboards/tzarc/ghoul/rev1/stm32/halconf.h    |   9 ++
 keyboards/tzarc/ghoul/rev1/stm32/info.json    |  15 ++
 keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h    |  17 +++
 keyboards/tzarc/ghoul/rev1/stm32/rules.mk     |   2 +
 keyboards/tzarc/ghoul/rules.mk                |   7 +
 27 files changed, 974 insertions(+)
 create mode 100644 keyboards/tzarc/ghoul/config.h
 create mode 100644 keyboards/tzarc/ghoul/ghoul.c
 create mode 100644 keyboards/tzarc/ghoul/graphics/ghoul-logo.qgf.c
 create mode 100644 keyboards/tzarc/ghoul/graphics/ghoul-name.qgf.c
 create mode 100644 keyboards/tzarc/ghoul/graphics/lock-caps.qgf.c
 create mode 100644 keyboards/tzarc/ghoul/graphics/lock-num.qgf.c
 create mode 100644 keyboards/tzarc/ghoul/graphics/lock-scrl.qgf.c
 create mode 100644 keyboards/tzarc/ghoul/graphics/thintel15.qff.c
 create mode 100644 keyboards/tzarc/ghoul/info.json
 create mode 100644 keyboards/tzarc/ghoul/keymaps/default/config.h
 create mode 100644 keyboards/tzarc/ghoul/keymaps/default/keymap.c
 create mode 100644 keyboards/tzarc/ghoul/keymaps/default/rules.mk
 create mode 100644 keyboards/tzarc/ghoul/keymaps/default/ui.c
 create mode 100644 keyboards/tzarc/ghoul/readme.md
 create mode 100644 keyboards/tzarc/ghoul/rev1/info.json
 create mode 100644 keyboards/tzarc/ghoul/rev1/rp2040/config.h
 create mode 100644 keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
 create mode 100644 keyboards/tzarc/ghoul/rev1/rp2040/info.json
 create mode 100644 keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
 create mode 100644 keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
 create mode 100644 keyboards/tzarc/ghoul/rev1/stm32/board.h
 create mode 100644 keyboards/tzarc/ghoul/rev1/stm32/config.h
 create mode 100644 keyboards/tzarc/ghoul/rev1/stm32/halconf.h
 create mode 100644 keyboards/tzarc/ghoul/rev1/stm32/info.json
 create mode 100644 keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h
 create mode 100644 keyboards/tzarc/ghoul/rev1/stm32/rules.mk
 create mode 100644 keyboards/tzarc/ghoul/rules.mk

diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
new file mode 100644
index 0000000000..c3897e7ada
--- /dev/null
+++ b/keyboards/tzarc/ghoul/config.h
@@ -0,0 +1,19 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "config_common.h"
+
+// Matrix
+#define MATRIX_SHIFT_REGISTER_COUNT 5
+//#define MATRIX_ROWS 6 // actually defined in info.json: 5 shift registers, plus one row for extras (i.e. encoder pushbutton read)
+//#define MATRIX_COLS 8 // actually defined in info.json: 8 bits per register
+
+// EEPROM configuration
+#define EXTERNAL_EEPROM_BYTE_COUNT 8192
+#define EXTERNAL_EEPROM_PAGE_SIZE 64 // it's FRAM, so it doesn't actually matter, this just sets the RAM buffer
+
+// RGB configuration
+#define RGB_MATRIX_LED_COUNT 40
+#define RGBLED_NUM 40       // TBD: Once convergence with these defines occurs, remove.
+#define DRIVER_LED_TOTAL 40 // TBD: Once convergence with these defines occurs, remove.
diff --git a/keyboards/tzarc/ghoul/ghoul.c b/keyboards/tzarc/ghoul/ghoul.c
new file mode 100644
index 0000000000..aceb24764b
--- /dev/null
+++ b/keyboards/tzarc/ghoul/ghoul.c
@@ -0,0 +1,44 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#include QMK_KEYBOARD_H
+#include "analog.h"
+#include "spi_master.h"
+
+void keyboard_post_init_kb(void) {
+    // Enable RGB current limiter and wait for a bit before allowing RGB to continue
+    setPinOutput(RGB_ENABLE_PIN);
+    writePinHigh(RGB_ENABLE_PIN);
+    wait_ms(20);
+
+    // Offload to the user func
+    keyboard_post_init_user();
+}
+
+void matrix_init_custom(void) {
+    // SPI Matrix
+    setPinOutput(SPI_MATRIX_CHIP_SELECT_PIN);
+    writePinHigh(SPI_MATRIX_CHIP_SELECT_PIN);
+    spi_init();
+
+    // Encoder pushbutton
+    setPinInputLow(ENCODER_PUSHBUTTON_PIN);
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    static matrix_row_t temp_matrix[MATRIX_ROWS] = {0};
+
+    // Read from SPI the matrix
+    spi_start(SPI_MATRIX_CHIP_SELECT_PIN, false, 0, SPI_MATRIX_DIVISOR);
+    spi_receive((uint8_t*)temp_matrix, MATRIX_SHIFT_REGISTER_COUNT * sizeof(matrix_row_t));
+    spi_stop();
+
+    // Read from the encoder pushbutton
+    temp_matrix[5] = readPin(ENCODER_PUSHBUTTON_PIN) ? 1 : 0;
+
+    // Check if we've changed, return the last-read data
+    bool changed = memcmp(current_matrix, temp_matrix, sizeof(temp_matrix)) != 0;
+    if (changed) {
+        memcpy(current_matrix, temp_matrix, sizeof(temp_matrix));
+    }
+    return changed;
+}
diff --git a/keyboards/tzarc/ghoul/graphics/ghoul-logo.qgf.c b/keyboards/tzarc/ghoul/graphics/ghoul-logo.qgf.c
new file mode 100644
index 0000000000..0dc7da9d1c
--- /dev/null
+++ b/keyboards/tzarc/ghoul/graphics/ghoul-logo.qgf.c
@@ -0,0 +1,134 @@
+// Copyright 2022 QMK -- generated source code only, image retains original copyright
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This file was auto-generated by `qmk painter-convert-graphics -i ghoul-logo.png -f mono4`
+
+#include <qp.h>
+
+const uint32_t gfx_ghoul_logo_length = 1936;
+
+// clang-format off
+const uint8_t gfx_ghoul_logo[1936] = {
+    0x00, 0xFF, 0x12, 0x00, 0x00, 0x51, 0x47, 0x46, 0x01, 0x90, 0x07, 0x00, 0x00, 0x6F, 0xF8, 0xFF,
+    0xFF, 0x46, 0x00, 0x80, 0x00, 0x01, 0x00, 0x01, 0xFE, 0x04, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+    0x02, 0xFD, 0x06, 0x00, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xE8, 0x03, 0x05, 0xFA, 0x60, 0x07, 0x00,
+    0x08, 0x00, 0x81, 0xF9, 0x6F, 0x0E, 0x00, 0x83, 0x40, 0xFE, 0xFF, 0xBF, 0x0D, 0x00, 0x80, 0x80,
+    0x03, 0xFF, 0x80, 0x7F, 0x0C, 0x00, 0x80, 0x40, 0x04, 0xFF, 0x80, 0x2F, 0x0B, 0x00, 0x81, 0x40,
+    0xFE, 0x04, 0xFF, 0x80, 0x1F, 0x0B, 0x00, 0x80, 0xFD, 0x05, 0xFF, 0x80, 0x0B, 0x03, 0x00, 0x80,
+    0x01, 0x02, 0x00, 0x80, 0x80, 0x03, 0x00, 0x80, 0xF8, 0x06, 0xFF, 0x80, 0x03, 0x02, 0x00, 0x80,
+    0x20, 0x03, 0x00, 0x80, 0x0E, 0x02, 0x00, 0x80, 0xE0, 0x07, 0xFF, 0x03, 0x00, 0x80, 0x02, 0x02,
+    0x00, 0x83, 0xF4, 0x01, 0x00, 0x80, 0x07, 0xFF, 0x80, 0x3F, 0x02, 0x00, 0x80, 0xA0, 0x02, 0x00,
+    0x81, 0xC0, 0x1F, 0x02, 0x00, 0x80, 0xFE, 0x07, 0xFF, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0A, 0x02,
+    0x00, 0x83, 0xFD, 0x01, 0x00, 0xF4, 0x08, 0xFF, 0x88, 0x02, 0x00, 0xA4, 0x01, 0x00, 0xE0, 0x0F,
+    0x00, 0xD0, 0x08, 0xFF, 0x83, 0xBF, 0x00, 0x40, 0x2A, 0x02, 0x00, 0x80, 0xFF, 0x02, 0x00, 0x09,
+    0xFF, 0x88, 0x1F, 0x00, 0xA4, 0x06, 0x00, 0xF4, 0x0F, 0x00, 0xF8, 0x09, 0xFF, 0x87, 0x02, 0x40,
+    0xAA, 0x00, 0x80, 0xBF, 0x00, 0xD0, 0x09, 0xFF, 0x88, 0x7F, 0x00, 0xA4, 0x0A, 0x00, 0xFC, 0x0B,
+    0x00, 0xFE, 0x09, 0xFF, 0x87, 0x0B, 0x40, 0xAA, 0x01, 0xC0, 0xBF, 0x00, 0xF4, 0x09, 0xFF, 0x87,
+    0xBF, 0x01, 0xA4, 0x2A, 0x00, 0xFD, 0x0B, 0x80, 0x0A, 0xFF, 0x87, 0x2B, 0x40, 0xAA, 0x02, 0xD0,
+    0xBF, 0x00, 0xFD, 0x09, 0xFF, 0x87, 0xBF, 0x06, 0xA4, 0x6A, 0x00, 0xFE, 0x0B, 0xE0, 0x0A, 0xFF,
+    0x86, 0xAB, 0x40, 0xAA, 0x0A, 0xE0, 0xFF, 0x00, 0x0A, 0xFF, 0x87, 0xBF, 0x0A, 0xA4, 0xAA, 0x00,
+    0xFE, 0x0F, 0xF4, 0x0A, 0xFF, 0x86, 0xAA, 0x02, 0xAA, 0x0A, 0xE0, 0xFF, 0x80, 0x0A, 0xFF, 0x87,
+    0xAF, 0x2A, 0xA0, 0xAA, 0x00, 0xFE, 0x1F, 0xFC, 0x0A, 0xFF, 0x86, 0xAA, 0x06, 0xA9, 0x0A, 0xE0,
+    0xFF, 0xD1, 0x0A, 0xFF, 0x87, 0xAF, 0x6A, 0x90, 0xAA, 0x00, 0xFE, 0x2F, 0xFE, 0x0A, 0xFF, 0x86,
+    0xAA, 0x0A, 0xA9, 0x0A, 0xF0, 0xFF, 0xF3, 0x0A, 0xFF, 0x86, 0xAF, 0xAA, 0xA0, 0x6A, 0x00, 0xFF,
+    0x7F, 0x0B, 0xFF, 0x86, 0xAA, 0x1A, 0xAA, 0x02, 0xF0, 0xFF, 0xFB, 0x0A, 0xFF, 0x84, 0xAF, 0xAA,
+    0xA6, 0x1A, 0x00, 0x03, 0xFF, 0x80, 0xF7, 0x09, 0xFF, 0x80, 0xA9, 0x02, 0xAA, 0x81, 0x00, 0xF0,
+    0x02, 0xFF, 0x80, 0x1F, 0x09, 0xFF, 0x80, 0x0F, 0x02, 0xAA, 0x81, 0x1A, 0x40, 0x02, 0xFF, 0x81,
+    0xBF, 0xF0, 0x09, 0xFF, 0x80, 0x90, 0x02, 0xAA, 0x81, 0x06, 0xF4, 0x02, 0xFF, 0x81, 0x07, 0xFE,
+    0x08, 0xFF, 0x81, 0x0F, 0xA8, 0x02, 0xAA, 0x80, 0x41, 0x02, 0xFF, 0x81, 0x7F, 0xE0, 0x09, 0xFF,
+    0x80, 0x80, 0x02, 0xAA, 0x81, 0x2A, 0xF8, 0x02, 0xFF, 0x81, 0x03, 0xFD, 0x08, 0xFF, 0x81, 0x0B,
+    0xA8, 0x02, 0xAA, 0x80, 0x86, 0x02, 0xFF, 0x81, 0x3F, 0xD0, 0x08, 0xFF, 0x81, 0x7F, 0x80, 0x02,
+    0xAA, 0x81, 0x6A, 0xFC, 0x02, 0xFF, 0x81, 0x07, 0xFC, 0x08, 0xFF, 0x81, 0x03, 0xA8, 0x02, 0xAA,
+    0x80, 0xCA, 0x02, 0xFF, 0x83, 0xBF, 0x80, 0xFF, 0xD7, 0x04, 0xFF, 0x83, 0xBF, 0xFD, 0x3F, 0x80,
+    0x03, 0xAA, 0x80, 0xFD, 0x02, 0xFF, 0x83, 0x0F, 0xF4, 0x0F, 0xF8, 0x04, 0xFF, 0x83, 0x02, 0xFE,
+    0x02, 0xA9, 0x02, 0xAA, 0x80, 0xEA, 0x03, 0xFF, 0x82, 0x01, 0x2E, 0x00, 0x04, 0xFF, 0x83, 0x1F,
+    0x80, 0x0F, 0xA0, 0x03, 0xAA, 0x03, 0xFF, 0x80, 0x3F, 0x02, 0x00, 0x80, 0xE0, 0x04, 0xFF, 0x02,
+    0x00, 0x80, 0x80, 0x03, 0xAA, 0x80, 0xEA, 0x03, 0xFF, 0x80, 0x0F, 0x02, 0x00, 0x80, 0xFD, 0x03,
+    0xFF, 0x80, 0x0B, 0x02, 0x00, 0x80, 0xA9, 0x02, 0xAA, 0x81, 0x6A, 0xFD, 0x03, 0xFF, 0x82, 0x07,
+    0x00, 0x80, 0x03, 0xFF, 0x80, 0x3F, 0x02, 0x00, 0x80, 0xA9, 0x03, 0xAA, 0x80, 0xC2, 0x03, 0xFF,
+    0x80, 0xBF, 0x02, 0x00, 0x80, 0xF4, 0x03, 0xFF, 0x82, 0x02, 0x00, 0xA0, 0x03, 0xAA, 0x81, 0x2A,
+    0xFC, 0x03, 0xFF, 0x80, 0x07, 0x02, 0x00, 0x80, 0xFE, 0x02, 0xFF, 0x80, 0x0F, 0x02, 0x00, 0x80,
+    0xA9, 0x03, 0xAA, 0x80, 0xC2, 0x03, 0xFF, 0x80, 0x2F, 0x02, 0x00, 0x80, 0xC0, 0x02, 0xFF, 0x80,
+    0x7F, 0x03, 0x00, 0x03, 0xAA, 0x81, 0x1A, 0xF8, 0x02, 0xFF, 0x80, 0xBF, 0x03, 0x00, 0x80, 0xF4,
+    0x02, 0xFF, 0x80, 0x02, 0x02, 0x00, 0x80, 0x90, 0x03, 0xAA, 0x80, 0x81, 0x03, 0xFF, 0x80, 0x07,
+    0x03, 0x00, 0x82, 0xFD, 0xFF, 0x07, 0x03, 0x00, 0x80, 0xA8, 0x02, 0xAA, 0x81, 0x1A, 0xF8, 0x02,
+    0xFF, 0x80, 0x2F, 0x03, 0x00, 0x83, 0x94, 0xFF, 0x6F, 0x01, 0x02, 0x00, 0x80, 0x40, 0x03, 0xAA,
+    0x80, 0x82, 0x03, 0xFF, 0x80, 0x01, 0x02, 0x00, 0x80, 0x80, 0x02, 0xFF, 0x80, 0x7F, 0x03, 0x00,
+    0x80, 0xA0, 0x02, 0xAA, 0x81, 0x2A, 0xF8, 0x02, 0xFF, 0x80, 0x0F, 0x03, 0x00, 0x80, 0xFC, 0x02,
+    0xFF, 0x80, 0x03, 0x03, 0x00, 0x80, 0xA9, 0x02, 0xAA, 0x80, 0x82, 0x02, 0xFF, 0x80, 0x7F, 0x03,
+    0x00, 0x80, 0xC0, 0x02, 0xFF, 0x80, 0x7F, 0x03, 0x00, 0x80, 0x80, 0x02, 0xAA, 0x81, 0x6A, 0xF8,
+    0x02, 0xFF, 0x80, 0x07, 0x03, 0x00, 0x80, 0xFC, 0x02, 0xFF, 0x80, 0x07, 0x03, 0x00, 0x80, 0xA8,
+    0x02, 0xAA, 0x80, 0xC6, 0x02, 0xFF, 0x80, 0x3F, 0x03, 0x00, 0x80, 0xD0, 0x02, 0xFF, 0x80, 0x7F,
+    0x03, 0x00, 0x80, 0x40, 0x02, 0xAA, 0x81, 0x6A, 0xFC, 0x02, 0xFF, 0x80, 0x02, 0x03, 0x00, 0x80,
+    0xFD, 0x02, 0xFF, 0x80, 0x0B, 0x03, 0x00, 0x80, 0xA4, 0x02, 0xAA, 0x80, 0xC6, 0x02, 0xFF, 0x80,
+    0x2F, 0x03, 0x00, 0x83, 0xE0, 0xBF, 0xD0, 0xBF, 0x04, 0x00, 0x02, 0xAA, 0x81, 0x6A, 0xFC, 0x02,
+    0xFF, 0x80, 0x01, 0x03, 0x00, 0x83, 0xFE, 0x03, 0xF8, 0x0F, 0x03, 0x00, 0x80, 0xA0, 0x02, 0xAA,
+    0x80, 0xC6, 0x02, 0xFF, 0x80, 0x1F, 0x03, 0x00, 0x83, 0xF0, 0x1F, 0x00, 0xFF, 0x04, 0x00, 0x02,
+    0xAA, 0x81, 0x6A, 0xFC, 0x02, 0xFF, 0x80, 0x01, 0x02, 0x00, 0x84, 0x40, 0xBF, 0x00, 0xE0, 0x1F,
+    0x03, 0x00, 0x80, 0xA0, 0x02, 0xAA, 0x80, 0xC6, 0x02, 0xFF, 0x80, 0x1F, 0x03, 0x00, 0x84, 0xF4,
+    0x07, 0x00, 0xFC, 0x02, 0x03, 0x00, 0x02, 0xAA, 0x81, 0x2A, 0xFC, 0x02, 0xFF, 0x80, 0x02, 0x02,
+    0x00, 0x84, 0x80, 0x3F, 0x00, 0x80, 0x3F, 0x03, 0x00, 0x80, 0xA0, 0x02, 0xAA, 0x80, 0x82, 0x02,
+    0xFF, 0x80, 0x2F, 0x03, 0x00, 0x84, 0xFD, 0x02, 0x00, 0xF8, 0x0B, 0x02, 0x00, 0x80, 0x40, 0x02,
+    0xAA, 0x81, 0x2A, 0xF8, 0x02, 0xFF, 0x80, 0x03, 0x02, 0x00, 0x84, 0xF0, 0x1F, 0x00, 0x40, 0xFF,
+    0x03, 0x00, 0x80, 0xA8, 0x02, 0xAA, 0x80, 0x41, 0x02, 0xFF, 0x80, 0x7F, 0x02, 0x00, 0x85, 0x80,
+    0xFF, 0x01, 0x00, 0xF0, 0x2F, 0x02, 0x00, 0x80, 0x80, 0x02, 0xAA, 0x81, 0x1A, 0xF0, 0x02, 0xFF,
+    0x80, 0x0F, 0x02, 0x00, 0x81, 0xFE, 0x0F, 0x02, 0x00, 0x81, 0xFF, 0x0B, 0x02, 0x00, 0x80, 0xA9,
+    0x02, 0xAA, 0x81, 0x00, 0xFE, 0x02, 0xFF, 0x83, 0x02, 0x00, 0xF8, 0xFF, 0x02, 0x00, 0x84, 0xE0,
+    0xFF, 0x07, 0x00, 0xA0, 0x02, 0xAA, 0x81, 0x0A, 0xD0, 0x02, 0xFF, 0x84, 0xBF, 0x00, 0xF4, 0xFF,
+    0x0F, 0x02, 0x00, 0x83, 0xFE, 0xFF, 0x02, 0x90, 0x02, 0xAA, 0x82, 0x6A, 0x00, 0xBC, 0x02, 0xFF,
+    0x81, 0xBF, 0xFA, 0x02, 0xFF, 0x02, 0x00, 0x83, 0xE0, 0xFF, 0xBF, 0x96, 0x03, 0xAA, 0x82, 0x02,
+    0x40, 0xF3, 0x05, 0xFF, 0x80, 0x0B, 0x02, 0x00, 0x82, 0xFE, 0xFF, 0xAB, 0x03, 0xAA, 0x80, 0x1A,
+    0x02, 0x00, 0x05, 0xFF, 0x80, 0xBF, 0x02, 0x00, 0x82, 0xE0, 0xFF, 0xBF, 0x03, 0xAA, 0x80, 0x9A,
+    0x02, 0x00, 0x80, 0xE0, 0x05, 0xFF, 0x80, 0x0B, 0x02, 0x00, 0x82, 0xFE, 0xFF, 0xAB, 0x03, 0xAA,
+    0x80, 0x01, 0x02, 0x00, 0x80, 0xFD, 0x04, 0xFF, 0x80, 0xBF, 0x02, 0x00, 0x82, 0xD0, 0xFF, 0xAF,
+    0x03, 0xAA, 0x80, 0x0A, 0x02, 0x00, 0x80, 0xC0, 0x05, 0xFF, 0x80, 0x0B, 0x02, 0x00, 0x81, 0xFD,
+    0xFF, 0x04, 0xAA, 0x03, 0x00, 0x80, 0xF8, 0x04, 0xFF, 0x80, 0xBF, 0x02, 0x00, 0x82, 0xD0, 0xFF,
+    0xAF, 0x03, 0xAA, 0x80, 0x06, 0x02, 0x00, 0x80, 0x40, 0x05, 0xFF, 0x80, 0x0B, 0x02, 0x00, 0x81,
+    0xFD, 0xFF, 0x03, 0xAA, 0x80, 0x2A, 0x03, 0x00, 0x80, 0xE0, 0x04, 0xFF, 0x80, 0xBF, 0x02, 0x00,
+    0x82, 0xD0, 0xFF, 0xAF, 0x03, 0xAA, 0x80, 0x01, 0x03, 0x00, 0x80, 0xFD, 0x04, 0xFF, 0x84, 0x1B,
+    0x00, 0x40, 0xFE, 0xBF, 0x03, 0xAA, 0x80, 0x0A, 0x03, 0x00, 0x80, 0xD0, 0x05, 0xFF, 0x84, 0x0F,
+    0x00, 0xFE, 0xFF, 0xAB, 0x02, 0xAA, 0x80, 0x6A, 0x04, 0x00, 0x80, 0xFD, 0x05, 0xFF, 0x83, 0x90,
+    0xE0, 0xFF, 0xBF, 0x03, 0xAA, 0x80, 0x02, 0x03, 0x00, 0x80, 0xE0, 0x05, 0xFF, 0x84, 0x4F, 0x2F,
+    0xFE, 0xFF, 0xAB, 0x02, 0xAA, 0x80, 0x6A, 0x04, 0x00, 0x06, 0xFF, 0x83, 0xFD, 0xFB, 0xFF, 0xBF,
+    0x03, 0xAA, 0x80, 0x0A, 0x03, 0x00, 0x80, 0xF4, 0x09, 0xFF, 0x04, 0xAA, 0x03, 0x00, 0x80, 0x80,
+    0x09, 0xFF, 0x80, 0xAF, 0x03, 0xAA, 0x80, 0x1A, 0x03, 0x00, 0x80, 0xF8, 0x09, 0xFF, 0x04, 0xAA,
+    0x80, 0x02, 0x02, 0x00, 0x80, 0xC0, 0x02, 0xFF, 0x80, 0xEB, 0x06, 0xFF, 0x80, 0xAF, 0x03, 0xAA,
+    0x80, 0x2A, 0x03, 0x00, 0x83, 0xFC, 0xFF, 0x2F, 0xFE, 0x05, 0xFF, 0x80, 0xBF, 0x04, 0xAA, 0x80,
+    0x02, 0x02, 0x00, 0x83, 0xD0, 0xFF, 0xBF, 0xF0, 0x06, 0xFF, 0x80, 0xAB, 0x03, 0xAA, 0x80, 0x2A,
+    0x03, 0x00, 0x82, 0xFD, 0xFF, 0x07, 0x06, 0xFF, 0x85, 0xBF, 0xAA, 0x6A, 0xA9, 0xAA, 0x06, 0x02,
+    0x00, 0x8E, 0xD0, 0xFF, 0x7F, 0xF0, 0xFF, 0xFE, 0xBF, 0xFF, 0xEF, 0xFF, 0x9B, 0xAA, 0x81, 0xAA,
+    0x6A, 0x03, 0x00, 0x8E, 0xFD, 0xFF, 0x07, 0xFF, 0xDF, 0xFF, 0xF7, 0xFF, 0xFD, 0x2F, 0xAA, 0x0A,
+    0xA8, 0xAA, 0x06, 0x02, 0x00, 0x8E, 0xD0, 0xFF, 0x7F, 0xE0, 0xFF, 0xFD, 0x7F, 0xFE, 0xCF, 0xFF,
+    0xA2, 0xAA, 0x80, 0xAA, 0x6A, 0x03, 0x00, 0x8E, 0xFD, 0xFF, 0x07, 0xFD, 0x9F, 0xFF, 0xE7, 0xFF,
+    0xFC, 0x2F, 0xAA, 0x0A, 0xA8, 0xAA, 0x06, 0x02, 0x00, 0x8E, 0xD0, 0xFF, 0x7F, 0xD0, 0xFF, 0xF9,
+    0x3F, 0xFE, 0xCF, 0xFF, 0xA2, 0x6A, 0x80, 0xAA, 0x6A, 0x03, 0x00, 0x8E, 0xFC, 0xFF, 0x07, 0xFC,
+    0x9F, 0xFF, 0xE3, 0xFF, 0xFC, 0x1B, 0xAA, 0x02, 0xA8, 0xAA, 0x02, 0x02, 0x00, 0x8E, 0xC0, 0xFF,
+    0x3F, 0x80, 0xFF, 0xF5, 0x3F, 0xFF, 0xCF, 0xBF, 0xA1, 0x2A, 0x80, 0xAA, 0x2A, 0x03, 0x00, 0x8E,
+    0xF8, 0xBF, 0x00, 0xF4, 0x5F, 0xFF, 0xF3, 0xFF, 0xF9, 0x1B, 0xAA, 0x01, 0x90, 0xAA, 0x02, 0x02,
+    0x00, 0x81, 0x40, 0x6F, 0x02, 0x00, 0x8A, 0xFF, 0xF5, 0x3F, 0xFF, 0x9F, 0xAF, 0xA1, 0x0A, 0x00,
+    0xA0, 0x2A, 0x03, 0x00, 0x80, 0x70, 0x02, 0x00, 0x87, 0xF0, 0x5F, 0xFF, 0xF3, 0xFF, 0xF9, 0x1A,
+    0xAA, 0x02, 0x00, 0x81, 0x90, 0x01, 0x06, 0x00, 0x87, 0xFE, 0xF1, 0x2F, 0xFF, 0x5F, 0xAF, 0xA1,
+    0x0A, 0x09, 0x00, 0x87, 0xD0, 0x1F, 0xFF, 0xF2, 0xFF, 0xF5, 0x0A, 0x6A, 0x0A, 0x00, 0x87, 0xFC,
+    0xF2, 0x1F, 0xFF, 0x5F, 0xAB, 0xA0, 0x02, 0x09, 0x00, 0x87, 0xC0, 0x1F, 0xFF, 0xF0, 0xFF, 0xB0,
+    0x0A, 0x2A, 0x0A, 0x00, 0x87, 0xF8, 0xE1, 0x0F, 0xFE, 0x0F, 0xAA, 0xA0, 0x02, 0x09, 0x00, 0x87,
+    0x80, 0x0F, 0x7D, 0xD0, 0x7F, 0x90, 0x06, 0x1A, 0x0A, 0x00, 0x87, 0xB4, 0x80, 0x03, 0xF8, 0x03,
+    0x28, 0x90, 0x01, 0x0A, 0x00, 0x83, 0x02, 0x00, 0x40, 0x1F, 0x02, 0x00, 0x80, 0x08, 0x09, 0x00,
+    0x81, 0x02, 0x0E, 0x02, 0x00, 0x80, 0x50, 0x02, 0x00, 0x82, 0x40, 0x0A, 0x04, 0x07, 0x00, 0x83,
+    0x70, 0xF0, 0x02, 0xA0, 0x02, 0x00, 0x83, 0x40, 0x00, 0xA4, 0x80, 0x07, 0x00, 0x8A, 0x40, 0x0B,
+    0x7F, 0x00, 0x1F, 0xE0, 0x00, 0x0A, 0x80, 0x0A, 0x18, 0x07, 0x00, 0x8A, 0xF8, 0xF0, 0x0F, 0xF4,
+    0x02, 0x1F, 0xA4, 0x01, 0xA9, 0x90, 0x01, 0x06, 0x00, 0x8A, 0x80, 0x1F, 0xFF, 0x82, 0x7F, 0xF4,
+    0x82, 0x1A, 0xA0, 0x0A, 0x2A, 0x07, 0x00, 0x8A, 0xF8, 0xF2, 0x3F, 0xFC, 0xDF, 0xBF, 0xAA, 0x82,
+    0xAA, 0xA4, 0x02, 0x06, 0x00, 0x83, 0x80, 0x7F, 0xFE, 0xDB, 0x02, 0xFF, 0x84, 0xAB, 0x6A, 0xA9,
+    0x8A, 0x2A, 0x07, 0x00, 0x81, 0xF8, 0xEF, 0x03, 0xFF, 0x80, 0xBF, 0x02, 0xAA, 0x82, 0x6A, 0xAA,
+    0x02, 0x06, 0x00, 0x80, 0x80, 0x05, 0xFF, 0x80, 0xAB, 0x03, 0xAA, 0x80, 0x2A, 0x07, 0x00, 0x80,
+    0xF4, 0x04, 0xFF, 0x80, 0xAF, 0x04, 0xAA, 0x80, 0x01, 0x06, 0x00, 0x80, 0x40, 0x05, 0xFF, 0x04,
+    0xAA, 0x80, 0x1A, 0x07, 0x00, 0x80, 0xF0, 0x04, 0xFF, 0x80, 0xAF, 0x04, 0xAA, 0x08, 0x00, 0x80,
+    0xFE, 0x03, 0xFF, 0x80, 0xBF, 0x04, 0xAA, 0x80, 0x0A, 0x07, 0x00, 0x80, 0xE0, 0x04, 0xFF, 0x80,
+    0xAB, 0x03, 0xAA, 0x80, 0x6A, 0x08, 0x00, 0x80, 0xFD, 0x03, 0xFF, 0x80, 0xBF, 0x04, 0xAA, 0x80,
+    0x02, 0x07, 0x00, 0x80, 0xC0, 0x04, 0xFF, 0x04, 0xAA, 0x80, 0x2A, 0x08, 0x00, 0x80, 0xF4, 0x03,
+    0xFF, 0x80, 0xAF, 0x04, 0xAA, 0x80, 0x01, 0x08, 0x00, 0x03, 0xFF, 0x80, 0xBF, 0x04, 0xAA, 0x80,
+    0x0A, 0x08, 0x00, 0x84, 0xE0, 0x6F, 0xFE, 0xFF, 0xAB, 0x02, 0xAA, 0x81, 0x5A, 0x6A, 0x09, 0x00,
+    0x83, 0xFD, 0x40, 0xFF, 0xBF, 0x02, 0xAA, 0x82, 0x0A, 0x90, 0x02, 0x08, 0x00, 0x83, 0x80, 0x07,
+    0x40, 0xFE, 0x02, 0xAA, 0x82, 0x1A, 0x00, 0x28, 0x0C, 0x00, 0x82, 0xA9, 0xAA, 0x05, 0x07, 0x00,
+};
+// clang-format on
diff --git a/keyboards/tzarc/ghoul/graphics/ghoul-name.qgf.c b/keyboards/tzarc/ghoul/graphics/ghoul-name.qgf.c
new file mode 100644
index 0000000000..4f67bb484d
--- /dev/null
+++ b/keyboards/tzarc/ghoul/graphics/ghoul-name.qgf.c
@@ -0,0 +1,37 @@
+// Copyright 2022 QMK -- generated source code only, image retains original copyright
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This file was auto-generated by `qmk painter-convert-graphics -i ghoul-name.png -f mono4`
+
+#include <qp.h>
+
+const uint32_t gfx_ghoul_name_length = 371;
+
+// clang-format off
+const uint8_t gfx_ghoul_name[371] = {
+    0x00, 0xFF, 0x12, 0x00, 0x00, 0x51, 0x47, 0x46, 0x01, 0x73, 0x01, 0x00, 0x00, 0x8C, 0xFE, 0xFF,
+    0xFF, 0x16, 0x00, 0x44, 0x00, 0x01, 0x00, 0x01, 0xFE, 0x04, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+    0x02, 0xFD, 0x06, 0x00, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xE8, 0x03, 0x05, 0xFA, 0x43, 0x01, 0x00,
+    0x0F, 0x00, 0x81, 0xA0, 0x02, 0x04, 0x00, 0x81, 0x3F, 0x54, 0x03, 0x55, 0x81, 0xF5, 0x83, 0x04,
+    0xFF, 0x81, 0x3F, 0xF8, 0x04, 0xFF, 0x80, 0x83, 0x04, 0xFF, 0x81, 0x3F, 0xF8, 0x03, 0xAA, 0x82,
+    0xFA, 0x83, 0x1F, 0x03, 0x00, 0x82, 0x3F, 0xF8, 0x01, 0x02, 0x00, 0x82, 0xF0, 0x43, 0x05, 0x03,
+    0x00, 0x80, 0x2A, 0x12, 0x00, 0x80, 0xA9, 0x02, 0xAA, 0x82, 0x2A, 0x00, 0xD0, 0x03, 0xFF, 0x82,
+    0x03, 0x00, 0xFD, 0x02, 0xFF, 0x82, 0x3F, 0x00, 0x90, 0x02, 0xAA, 0x81, 0xFE, 0x02, 0x03, 0x00,
+    0x81, 0x40, 0x1F, 0x04, 0x00, 0x81, 0xE0, 0x03, 0x03, 0x00, 0x83, 0x90, 0x7F, 0x00, 0xD0, 0x03,
+    0xFF, 0x82, 0x07, 0x00, 0xFD, 0x02, 0xFF, 0x82, 0x2F, 0x00, 0xD0, 0x02, 0xFF, 0x86, 0xBF, 0x01,
+    0x00, 0xA9, 0xAA, 0x6A, 0x01, 0x0D, 0x00, 0x82, 0x90, 0xAA, 0x06, 0x02, 0x00, 0x80, 0xD0, 0x02,
+    0xFF, 0x82, 0x07, 0x00, 0x40, 0x03, 0xFF, 0x82, 0x01, 0x00, 0xFC, 0x02, 0xFF, 0x88, 0x2F, 0x00,
+    0xD0, 0x6F, 0x55, 0xF9, 0x07, 0x00, 0xBD, 0x02, 0x00, 0x8D, 0x7E, 0x00, 0xD0, 0x0F, 0x00, 0xF0,
+    0x07, 0x00, 0xFD, 0x56, 0x95, 0x3F, 0x00, 0x80, 0x03, 0xFF, 0x82, 0x02, 0x00, 0xF4, 0x02, 0xFF,
+    0x80, 0x1F, 0x02, 0x00, 0x82, 0xF9, 0xFF, 0x6F, 0x03, 0x00, 0x81, 0x54, 0x15, 0x0E, 0x00, 0x80,
+    0xA5, 0x02, 0xAA, 0x82, 0x02, 0x00, 0xF4, 0x02, 0xFF, 0x82, 0x3F, 0x00, 0xC0, 0x03, 0xFF, 0x88,
+    0x03, 0x00, 0xFD, 0xAB, 0xAA, 0x2A, 0x00, 0xD0, 0x1F, 0x04, 0x00, 0x80, 0xB8, 0x03, 0x00, 0x82,
+    0x40, 0x55, 0x5E, 0x02, 0x00, 0x80, 0x80, 0x04, 0xFF, 0x81, 0x3F, 0xF8, 0x04, 0xFF, 0x80, 0x83,
+    0x04, 0xFF, 0x81, 0x3F, 0xA4, 0x04, 0xAA, 0x80, 0x02, 0x0B, 0x00, 0x81, 0x40, 0x01, 0x02, 0x55,
+    0x83, 0x15, 0x80, 0x2F, 0xF0, 0x02, 0xFF, 0x82, 0x03, 0xFE, 0x02, 0x02, 0xFF, 0x83, 0x3F, 0xF4,
+    0x2F, 0xF0, 0x02, 0xFF, 0x8C, 0x83, 0x7F, 0x00, 0xBF, 0x95, 0x1B, 0xF8, 0x01, 0xE0, 0x07, 0xE0,
+    0x82, 0x1F, 0x03, 0x00, 0x82, 0x3E, 0xF8, 0x5B, 0x02, 0x55, 0x81, 0xFD, 0x47, 0x04, 0xFF, 0x81,
+    0x3F, 0xE0, 0x04, 0xFF, 0x81, 0x02, 0xF8, 0x03, 0xFF, 0x82, 0x07, 0x00, 0x54, 0x02, 0x55, 0x80,
+    0x05, 0x06, 0x00,
+};
+// clang-format on
diff --git a/keyboards/tzarc/ghoul/graphics/lock-caps.qgf.c b/keyboards/tzarc/ghoul/graphics/lock-caps.qgf.c
new file mode 100644
index 0000000000..6026edff8f
--- /dev/null
+++ b/keyboards/tzarc/ghoul/graphics/lock-caps.qgf.c
@@ -0,0 +1,20 @@
+// Copyright 2022 QMK -- generated source code only, image retains original copyright
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This file was auto-generated by `qmk painter-convert-graphics -i lock-caps.png -f mono4`
+
+#include <qp.h>
+
+const uint32_t gfx_lock_caps_length = 108;
+
+// clang-format off
+const uint8_t gfx_lock_caps[108] = {
+    0x00, 0xFF, 0x12, 0x00, 0x00, 0x51, 0x47, 0x46, 0x01, 0x6C, 0x00, 0x00, 0x00, 0x93, 0xFF, 0xFF,
+    0xFF, 0x0F, 0x00, 0x10, 0x00, 0x01, 0x00, 0x01, 0xFE, 0x04, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+    0x02, 0xFD, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0xE8, 0x03, 0x05, 0xFA, 0x3C, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0xD0, 0x2F, 0x00, 0x00,
+    0xF4, 0x0B, 0x00, 0x00, 0xEE, 0x03, 0x00, 0xC0, 0xF7, 0x00, 0x00, 0xF0, 0x7D, 0x00, 0x00, 0x3D,
+    0x2F, 0x00, 0x40, 0x8F, 0x0B, 0x00, 0xE0, 0xFF, 0x03, 0x00, 0xFC, 0xFF, 0x00, 0x00, 0x6F, 0x7D,
+    0x00, 0xC0, 0x07, 0x2F, 0x00, 0xF4, 0xC1, 0x0B, 0x00, 0x00, 0x00, 0x00,
+};
+// clang-format on
diff --git a/keyboards/tzarc/ghoul/graphics/lock-num.qgf.c b/keyboards/tzarc/ghoul/graphics/lock-num.qgf.c
new file mode 100644
index 0000000000..688b9b3308
--- /dev/null
+++ b/keyboards/tzarc/ghoul/graphics/lock-num.qgf.c
@@ -0,0 +1,20 @@
+// Copyright 2022 QMK -- generated source code only, image retains original copyright
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This file was auto-generated by `qmk painter-convert-graphics -i lock-num.png -f mono4`
+
+#include <qp.h>
+
+const uint32_t gfx_lock_num_length = 108;
+
+// clang-format off
+const uint8_t gfx_lock_num[108] = {
+    0x00, 0xFF, 0x12, 0x00, 0x00, 0x51, 0x47, 0x46, 0x01, 0x6C, 0x00, 0x00, 0x00, 0x93, 0xFF, 0xFF,
+    0xFF, 0x0F, 0x00, 0x10, 0x00, 0x01, 0x00, 0x01, 0xFE, 0x04, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+    0x02, 0xFD, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0xE8, 0x03, 0x05, 0xFA, 0x3C, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x02, 0x00, 0x40, 0xBF, 0x00, 0x00, 0xF8, 0x2F, 0x00, 0x00,
+    0xCA, 0x0B, 0x00, 0x00, 0xF0, 0x02, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0xC0,
+    0x0B, 0x00, 0x00, 0xF0, 0x02, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0xC0, 0x0B,
+    0x00, 0x00, 0xF0, 0x02, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+// clang-format on
diff --git a/keyboards/tzarc/ghoul/graphics/lock-scrl.qgf.c b/keyboards/tzarc/ghoul/graphics/lock-scrl.qgf.c
new file mode 100644
index 0000000000..86843bdbb6
--- /dev/null
+++ b/keyboards/tzarc/ghoul/graphics/lock-scrl.qgf.c
@@ -0,0 +1,20 @@
+// Copyright 2022 QMK -- generated source code only, image retains original copyright
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This file was auto-generated by `qmk painter-convert-graphics -i lock-scrl.png -f mono4`
+
+#include <qp.h>
+
+const uint32_t gfx_lock_scrl_length = 108;
+
+// clang-format off
+const uint8_t gfx_lock_scrl[108] = {
+    0x00, 0xFF, 0x12, 0x00, 0x00, 0x51, 0x47, 0x46, 0x01, 0x6C, 0x00, 0x00, 0x00, 0x93, 0xFF, 0xFF,
+    0xFF, 0x0F, 0x00, 0x10, 0x00, 0x01, 0x00, 0x01, 0xFE, 0x04, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+    0x02, 0xFD, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0xE8, 0x03, 0x05, 0xFA, 0x3C, 0x00, 0x00,
+    0x00, 0x40, 0x00, 0x00, 0x00, 0xFD, 0x01, 0x00, 0xD0, 0xFF, 0x01, 0x00, 0xBE, 0xF8, 0x02, 0xE0,
+    0x2F, 0xFE, 0x02, 0xBD, 0x8B, 0xFB, 0x01, 0xE1, 0xE2, 0x12, 0x00, 0xB8, 0xB8, 0x00, 0x00, 0x2E,
+    0x2E, 0x00, 0x84, 0x8B, 0x4B, 0x40, 0xEF, 0xE2, 0x7E, 0x80, 0xBF, 0xF8, 0x0B, 0x80, 0x2F, 0xBE,
+    0x00, 0x40, 0xFF, 0x07, 0x00, 0x40, 0x7F, 0x00, 0x00, 0x00, 0x01, 0x00,
+};
+// clang-format on
diff --git a/keyboards/tzarc/ghoul/graphics/thintel15.qff.c b/keyboards/tzarc/ghoul/graphics/thintel15.qff.c
new file mode 100644
index 0000000000..237f2e9e5f
--- /dev/null
+++ b/keyboards/tzarc/ghoul/graphics/thintel15.qff.c
@@ -0,0 +1,74 @@
+// Copyright 2022 QMK -- generated source code only, font retains original copyright
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This file was auto-generated by `qmk painter-convert-font-image -i thintel15.png -f mono2`
+
+#include <qp.h>
+
+const uint32_t font_thintel15_length = 966;
+
+// clang-format off
+const uint8_t font_thintel15[966] = {
+    0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0xC6, 0x03, 0x00, 0x00, 0x39, 0xFC, 0xFF,
+    0xFF, 0x0B, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0xFE, 0x1D, 0x01, 0x00, 0x02, 0x00,
+    0x00, 0xC2, 0x00, 0x00, 0x84, 0x01, 0x00, 0x06, 0x03, 0x00, 0x46, 0x05, 0x00, 0x88, 0x07, 0x00,
+    0x46, 0x0A, 0x00, 0x82, 0x0C, 0x00, 0x43, 0x0D, 0x00, 0x83, 0x0E, 0x00, 0xC4, 0x0F, 0x00, 0x46,
+    0x11, 0x00, 0x83, 0x13, 0x00, 0xC5, 0x14, 0x00, 0x82, 0x16, 0x00, 0x44, 0x17, 0x00, 0xC5, 0x18,
+    0x00, 0x84, 0x1A, 0x00, 0x05, 0x1C, 0x00, 0xC5, 0x1D, 0x00, 0x85, 0x1F, 0x00, 0x45, 0x21, 0x00,
+    0x05, 0x23, 0x00, 0xC5, 0x24, 0x00, 0x85, 0x26, 0x00, 0x45, 0x28, 0x00, 0x02, 0x2A, 0x00, 0xC3,
+    0x2A, 0x00, 0x05, 0x2C, 0x00, 0xC5, 0x2D, 0x00, 0x85, 0x2F, 0x00, 0x45, 0x31, 0x00, 0x08, 0x33,
+    0x00, 0xC5, 0x35, 0x00, 0x85, 0x37, 0x00, 0x45, 0x39, 0x00, 0x05, 0x3B, 0x00, 0xC4, 0x3C, 0x00,
+    0x44, 0x3E, 0x00, 0xC5, 0x3F, 0x00, 0x85, 0x41, 0x00, 0x44, 0x43, 0x00, 0xC5, 0x44, 0x00, 0x85,
+    0x46, 0x00, 0x44, 0x48, 0x00, 0xC6, 0x49, 0x00, 0x06, 0x4C, 0x00, 0x45, 0x4E, 0x00, 0x05, 0x50,
+    0x00, 0xC5, 0x51, 0x00, 0x85, 0x53, 0x00, 0x45, 0x55, 0x00, 0x06, 0x57, 0x00, 0x45, 0x59, 0x00,
+    0x06, 0x5B, 0x00, 0x46, 0x5D, 0x00, 0x86, 0x5F, 0x00, 0xC6, 0x61, 0x00, 0x06, 0x64, 0x00, 0x44,
+    0x66, 0x00, 0xC4, 0x67, 0x00, 0x44, 0x69, 0x00, 0xC6, 0x6A, 0x00, 0x05, 0x6D, 0x00, 0xC3, 0x6E,
+    0x00, 0x05, 0x70, 0x00, 0xC5, 0x71, 0x00, 0x84, 0x73, 0x00, 0x05, 0x75, 0x00, 0xC5, 0x76, 0x00,
+    0x84, 0x78, 0x00, 0x05, 0x7A, 0x00, 0xC5, 0x7B, 0x00, 0x82, 0x7D, 0x00, 0x43, 0x7E, 0x00, 0x85,
+    0x7F, 0x00, 0x42, 0x81, 0x00, 0x06, 0x82, 0x00, 0x45, 0x84, 0x00, 0x05, 0x86, 0x00, 0xC5, 0x87,
+    0x00, 0x85, 0x89, 0x00, 0x44, 0x8B, 0x00, 0xC5, 0x8C, 0x00, 0x83, 0x8E, 0x00, 0xC5, 0x8F, 0x00,
+    0x86, 0x91, 0x00, 0xC6, 0x93, 0x00, 0x06, 0x96, 0x00, 0x45, 0x98, 0x00, 0x04, 0x9A, 0x00, 0x85,
+    0x9B, 0x00, 0x42, 0x9D, 0x00, 0x05, 0x9E, 0x00, 0xC5, 0x9F, 0x00, 0x04, 0xFB, 0x86, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x54, 0x45, 0x00, 0x50, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xFD, 0xD2,
+    0xAF, 0x28, 0x00, 0x00, 0x00, 0x84, 0x53, 0x15, 0x0E, 0x55, 0x39, 0x04, 0x00, 0x00, 0x00, 0x00,
+    0x12, 0x15, 0x0A, 0x28, 0x54, 0x24, 0x00, 0x00, 0x00, 0x80, 0x50, 0x14, 0x52, 0x95, 0x58, 0x00,
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x4A, 0x92, 0x24, 0x02, 0x00, 0x91, 0x24, 0x49, 0x01, 0x00, 0x20,
+    0x27, 0x05, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x1F, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x60, 0x0A, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x24, 0x22,
+    0x11, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x32, 0x00, 0x00, 0x20, 0x23, 0x22, 0x72, 0x00, 0x00,
+    0xC0, 0x24, 0x44, 0x44, 0x78, 0x00, 0x00, 0xC0, 0x24, 0x44, 0x50, 0x32, 0x00, 0x00, 0x80, 0x29,
+    0x95, 0x1E, 0x42, 0x00, 0x00, 0xE0, 0x85, 0x83, 0x50, 0x32, 0x00, 0x00, 0xC0, 0xA4, 0x70, 0x52,
+    0x32, 0x00, 0x00, 0xE0, 0x21, 0x42, 0x84, 0x10, 0x00, 0x00, 0xC0, 0xA4, 0x64, 0x52, 0x32, 0x00,
+    0x00, 0xC0, 0xA4, 0xE4, 0x50, 0x32, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x30, 0x60, 0x0A, 0x00,
+    0x00, 0x11, 0x11, 0x04, 0x41, 0x00, 0x00, 0x00, 0x80, 0x07, 0x1E, 0x00, 0x00, 0x00, 0x20, 0x08,
+    0x82, 0x88, 0x08, 0x00, 0x00, 0xC0, 0x24, 0x64, 0x04, 0x10, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x59,
+    0x55, 0x2D, 0x02, 0x1C, 0x00, 0x00, 0x00, 0xC0, 0xA4, 0xF4, 0x52, 0x4A, 0x00, 0x00, 0xE0, 0xA4,
+    0x74, 0x52, 0x3A, 0x00, 0x00, 0xC0, 0xA4, 0x10, 0x42, 0x32, 0x00, 0x00, 0xE0, 0xA4, 0x94, 0x52,
+    0x3A, 0x00, 0x00, 0x70, 0x11, 0x17, 0x71, 0x00, 0x00, 0x70, 0x11, 0x17, 0x11, 0x00, 0x00, 0xC0,
+    0xA4, 0xD0, 0x52, 0x32, 0x00, 0x00, 0x20, 0xA5, 0xF4, 0x52, 0x4A, 0x00, 0x00, 0x70, 0x22, 0x22,
+    0x72, 0x00, 0x00, 0xC0, 0x21, 0x84, 0x50, 0x32, 0x00, 0x00, 0x20, 0xA5, 0x32, 0x4A, 0x4A, 0x00,
+    0x00, 0x10, 0x11, 0x11, 0x71, 0x00, 0x00, 0x40, 0xB4, 0x55, 0x51, 0x14, 0x45, 0x00, 0x00, 0x00,
+    0x40, 0x34, 0x55, 0x59, 0x14, 0x45, 0x00, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x32, 0x00, 0x00,
+    0xE0, 0xA4, 0x74, 0x42, 0x08, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x51, 0x00, 0x00, 0xE0, 0xA4,
+    0x74, 0x52, 0x4A, 0x00, 0x00, 0xC0, 0xA4, 0x60, 0x50, 0x32, 0x00, 0x00, 0xC0, 0x47, 0x10, 0x04,
+    0x41, 0x10, 0x00, 0x00, 0x00, 0x20, 0xA5, 0x94, 0x52, 0x32, 0x00, 0x00, 0x40, 0x14, 0x45, 0x51,
+    0xA4, 0x10, 0x00, 0x00, 0x00, 0x40, 0x14, 0x45, 0x51, 0xB5, 0x45, 0x00, 0x00, 0x00, 0x40, 0x14,
+    0x29, 0x84, 0x12, 0x45, 0x00, 0x00, 0x00, 0x40, 0x14, 0x45, 0x0E, 0x41, 0x10, 0x00, 0x00, 0x00,
+    0xC0, 0x07, 0x21, 0x84, 0x10, 0x7C, 0x00, 0x00, 0x00, 0x17, 0x11, 0x11, 0x11, 0x07, 0x00, 0x10,
+    0x21, 0x22, 0x44, 0x00, 0x00, 0x47, 0x44, 0x44, 0x44, 0x07, 0x00, 0x84, 0x12, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x93, 0x5C, 0x72, 0x00, 0x00, 0x20, 0x84, 0x93, 0x52, 0x3A, 0x00, 0x00, 0x00, 0x60,
+    0x11, 0x61, 0x00, 0x00, 0x00, 0x21, 0x97, 0x52, 0x72, 0x00, 0x00, 0x00, 0x00, 0x93, 0x5E, 0x70,
+    0x00, 0x00, 0x60, 0x11, 0x13, 0x11, 0x00, 0x00, 0x00, 0x00, 0x97, 0x52, 0x72, 0x28, 0x19, 0x20,
+    0x84, 0x93, 0x52, 0x4A, 0x00, 0x00, 0x10, 0x55, 0x00, 0x80, 0x20, 0x49, 0x0A, 0x00, 0x20, 0x84,
+    0x94, 0x4E, 0x4A, 0x00, 0x00, 0x54, 0x55, 0x00, 0x00, 0x00, 0x2C, 0x55, 0x55, 0x55, 0x00, 0x00,
+    0x00, 0x00, 0x80, 0x93, 0x52, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x93, 0x52, 0x32, 0x00, 0x00, 0x00,
+    0x80, 0x93, 0x52, 0x3A, 0x21, 0x00, 0x00, 0x00, 0x97, 0x52, 0x72, 0x08, 0x01, 0x00, 0x50, 0x13,
+    0x11, 0x00, 0x00, 0x00, 0x00, 0x17, 0x0C, 0x3A, 0x00, 0x00, 0x48, 0x96, 0x44, 0x00, 0x00, 0x00,
+    0x80, 0x94, 0x52, 0x72, 0x00, 0x00, 0x00, 0x00, 0x44, 0x51, 0xA4, 0x10, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x44, 0x51, 0x54, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x0A, 0xA1, 0x44, 0x00, 0x00,
+    0x00, 0x00, 0x80, 0x94, 0x52, 0x72, 0x28, 0x19, 0x00, 0x70, 0x24, 0x71, 0x00, 0x00, 0x4C, 0x08,
+    0x11, 0x84, 0x10, 0x0C, 0x00, 0x55, 0x55, 0x01, 0x83, 0x10, 0x82, 0x08, 0x21, 0x03, 0x00, 0x00,
+    0x00, 0xB0, 0x1A, 0x00, 0x00, 0x00,
+};
+// clang-format on
diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json
new file mode 100644
index 0000000000..14e833c5b2
--- /dev/null
+++ b/keyboards/tzarc/ghoul/info.json
@@ -0,0 +1,73 @@
+{
+  "manufacturer": "Tzarc",
+  "maintainer": "tzarc",
+  "url": "https://github.com/tzarc/ghoul",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": true,
+    "console": true,
+    "encoder": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true,
+    "quantum_painter": true,
+    "rgb_matrix": true
+  },
+  "matrix_pins": {
+    "rows": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"],
+    "cols": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"]
+  },
+  "usb": {
+    "vid": "0x1209",
+    "pid": "0x4920"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+        { "label": "W", "matrix": [0, 4], "w": 1, "x": 1, "y": 0 },
+        { "label": "E", "matrix": [1, 0], "w": 1, "x": 2, "y": 0 },
+        { "label": "R", "matrix": [1, 4], "w": 1, "x": 3, "y": 0 },
+        { "label": "T", "matrix": [2, 0], "w": 1, "x": 4, "y": 0 },
+        { "label": "kEC", "matrix": [5, 0], "w": 1, "x": 5.5, "y": 0 },
+        { "label": "Y", "matrix": [2, 4], "w": 1, "x": 7, "y": 0 },
+        { "label": "U", "matrix": [3, 0], "w": 1, "x": 8, "y": 0 },
+        { "label": "I", "matrix": [3, 4], "w": 1, "x": 9, "y": 0 },
+        { "label": "O", "matrix": [4, 0], "w": 1, "x": 10, "y": 0 },
+        { "label": "P", "matrix": [4, 4], "w": 1, "x": 11, "y": 0 },
+        { "label": "A", "matrix": [0, 1], "w": 1, "x": 0, "y": 1 },
+        { "label": "S", "matrix": [0, 5], "w": 1, "x": 1, "y": 1 },
+        { "label": "D", "matrix": [1, 1], "w": 1, "x": 2, "y": 1 },
+        { "label": "F", "matrix": [1, 5], "w": 1, "x": 3, "y": 1 },
+        { "label": "G", "matrix": [2, 1], "w": 1, "x": 4, "y": 1 },
+        { "label": "H", "matrix": [2, 5], "w": 1, "x": 7, "y": 1 },
+        { "label": "J", "matrix": [3, 1], "w": 1, "x": 8, "y": 1 },
+        { "label": "K", "matrix": [3, 5], "w": 1, "x": 9, "y": 1 },
+        { "label": "L", "matrix": [4, 1], "w": 1, "x": 10, "y": 1 },
+        { "label": ";", "matrix": [4, 5], "w": 1, "x": 11, "y": 1 },
+        { "label": "Z", "matrix": [0, 2], "w": 1, "x": 0, "y": 2 },
+        { "label": "X", "matrix": [0, 6], "w": 1, "x": 1, "y": 2 },
+        { "label": "C", "matrix": [1, 2], "w": 1, "x": 2, "y": 2 },
+        { "label": "V", "matrix": [1, 6], "w": 1, "x": 3, "y": 2 },
+        { "label": "B", "matrix": [2, 2], "w": 1, "x": 4, "y": 2 },
+        { "label": "N", "matrix": [2, 6], "w": 1, "x": 7, "y": 2 },
+        { "label": "M", "matrix": [3, 2], "w": 1, "x": 8, "y": 2 },
+        { "label": ",", "matrix": [3, 6], "w": 1, "x": 9, "y": 2 },
+        { "label": ".", "matrix": [4, 2], "w": 1, "x": 10, "y": 2 },
+        { "label": "/", "matrix": [4, 6], "w": 1, "x": 11, "y": 2 },
+        { "label": "Ctrl", "matrix": [0, 3], "w": 1, "x": 0, "y": 3 },
+        { "label": "Alt", "matrix": [0, 7], "w": 1, "x": 1, "y": 3 },
+        { "label": "Super", "matrix": [1, 3], "w": 1, "x": 2, "y": 3 },
+        { "label": "Lower", "matrix": [1, 7], "w": 1, "x": 3, "y": 3 },
+        { "label": "Space", "matrix": [2, 3], "w": 1, "x": 4, "y": 3 },
+        { "label": "Space", "matrix": [2, 7], "w": 1, "x": 7, "y": 3 },
+        { "label": "Raise", "matrix": [3, 3], "w": 1, "x": 8, "y": 3 },
+        { "label": "&larr;", "matrix": [3, 7], "w": 1, "x": 9, "y": 3 },
+        { "label": "&darr;", "matrix": [4, 3], "w": 1, "x": 10, "y": 3 },
+        { "label": "&uarr;", "matrix": [4, 7], "w": 1, "x": 11, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/tzarc/ghoul/keymaps/default/config.h b/keyboards/tzarc/ghoul/keymaps/default/config.h
new file mode 100644
index 0000000000..af069d28cb
--- /dev/null
+++ b/keyboards/tzarc/ghoul/keymaps/default/config.h
@@ -0,0 +1,54 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+// Configurables
+#define TAPPING_TERM 200
+
+// RGB settings
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// RGB Effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/tzarc/ghoul/keymaps/default/keymap.c b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e64270fe4f
--- /dev/null
+++ b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
@@ -0,0 +1,75 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#include QMK_KEYBOARD_H
+
+enum { _QWERTY, _LOWER, _RAISE, _ADJUST };
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+// Left-hand home row mods
+#define HOME_A LGUI_T(KC_A)
+#define HOME_S LALT_T(KC_S)
+#define HOME_D LSFT_T(KC_D)
+#define HOME_F LCTL_T(KC_F)
+
+// Right-hand home row mods
+#define HOME_J RCTL_T(KC_J)
+#define HOME_K RSFT_T(KC_K)
+#define HOME_L LALT_T(KC_L)
+#define HOME_SCLN RGUI_T(KC_SCLN)
+
+#define SFT_ESC LSFT_T(KC_ESC)
+
+extern void ui_init(void);
+extern void ui_task(void);
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            RGB_MOD,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        HOME_A,  HOME_S,  HOME_D,  HOME_F,  KC_G,                                KC_H,    HOME_J,  HOME_K,  HOME_L,  HOME_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+        SFT_ESC, KC_LCTL, KC_LGUI, KC_SPC,  LOWER,                               RAISE,   KC_SPC,  KC_LALT, KC_BSPC, KC_SFTENT
+    ),
+    [_LOWER] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, DEBUG,   EEP_RST, 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
+    )
+};
+// clang-format on
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_QWERTY] = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
+    [_LOWER]  = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
+    [_RAISE]  = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
+    [_ADJUST] = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+void keyboard_post_init_user(void) {
+    // Init the display
+    ui_init();
+}
+
+void housekeeping_task_user(void) {
+    // Draw the display
+    ui_task();
+}
diff --git a/keyboards/tzarc/ghoul/keymaps/default/rules.mk b/keyboards/tzarc/ghoul/keymaps/default/rules.mk
new file mode 100644
index 0000000000..8da104df85
--- /dev/null
+++ b/keyboards/tzarc/ghoul/keymaps/default/rules.mk
@@ -0,0 +1,5 @@
+NKRO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
+WPM_ENABLE = yes
+SRC += ui.c
diff --git a/keyboards/tzarc/ghoul/keymaps/default/ui.c b/keyboards/tzarc/ghoul/keymaps/default/ui.c
new file mode 100644
index 0000000000..ac56e52d19
--- /dev/null
+++ b/keyboards/tzarc/ghoul/keymaps/default/ui.c
@@ -0,0 +1,139 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#include <stdio.h>
+#include QMK_KEYBOARD_H
+#include "analog.h"
+#include "qp.h"
+#include "qp_ssd1351.h"
+
+#define NUM_ADC_READS 32
+
+#include "graphics/ghoul-logo.qgf.c"
+#include "graphics/ghoul-name.qgf.c"
+#include "graphics/lock-caps.qgf.c"
+#include "graphics/lock-num.qgf.c"
+#include "graphics/lock-scrl.qgf.c"
+#include "graphics/thintel15.qff.c"
+
+static painter_device_t       oled;
+static painter_image_handle_t logo;
+static painter_image_handle_t name;
+static painter_font_handle_t  font;
+static painter_image_handle_t lock_caps;
+static painter_image_handle_t lock_num;
+static painter_image_handle_t lock_scrl;
+
+void ui_init(void) {
+    oled      = qp_ssd1351_make_spi_device(128, 128, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0);
+    logo      = qp_load_image_mem(gfx_ghoul_logo);
+    name      = qp_load_image_mem(gfx_ghoul_name);
+    font      = qp_load_font_mem(font_thintel15);
+    lock_caps = qp_load_image_mem(gfx_lock_caps);
+    lock_num  = qp_load_image_mem(gfx_lock_num);
+    lock_scrl = qp_load_image_mem(gfx_lock_scrl);
+
+    qp_init(oled, QP_ROTATION_90);
+    qp_rect(oled, 0, 0, 127, 127, 0, 0, 0, true);
+    qp_flush(oled);
+}
+
+void ui_task(void) {
+    bool            hue_redraw = false;
+    static uint16_t last_hue   = 0xFFFF;
+    uint8_t         curr_hue   = rgblight_get_hue();
+    if (last_hue != curr_hue) {
+        last_hue   = curr_hue;
+        hue_redraw = true;
+    }
+
+    if (hue_redraw) {
+        qp_drawimage_recolor(oled, 0, 64 - (name->height / 2), name, curr_hue, 255, 255, curr_hue, 255, 0);
+        qp_drawimage_recolor(oled, 127 - logo->width, 0, logo, curr_hue, 255, 255, curr_hue, 255, 0);
+    }
+
+    static led_t last_led_state = {0};
+    if (hue_redraw || last_led_state.raw != host_keyboard_led_state().raw) {
+        last_led_state.raw = host_keyboard_led_state().raw;
+        qp_drawimage_recolor(oled, lock_caps->width * 0, 0, lock_caps, curr_hue, 255, last_led_state.caps_lock ? 255 : 32, curr_hue, 255, 0);
+        qp_drawimage_recolor(oled, lock_caps->width * 1, 0, lock_num, curr_hue, 255, last_led_state.num_lock ? 255 : 32, curr_hue, 255, 0);
+        qp_drawimage_recolor(oled, lock_caps->width * 2, 0, lock_scrl, curr_hue, 255, last_led_state.scroll_lock ? 255 : 32, curr_hue, 255, 0);
+
+        qp_rect(oled, lock_caps->width * 0 + 1, lock_caps->height + 2, lock_caps->width * 1 - 1, lock_caps->height + 3, curr_hue, 255, last_led_state.caps_lock ? 255 : 0, true);
+        qp_rect(oled, lock_caps->width * 1 + 1, lock_caps->height + 2, lock_caps->width * 2 - 1, lock_caps->height + 3, curr_hue, 255, last_led_state.num_lock ? 255 : 0, true);
+        qp_rect(oled, lock_caps->width * 2 + 1, lock_caps->height + 2, lock_caps->width * 3 - 1, lock_caps->height + 3, curr_hue, 255, last_led_state.scroll_lock ? 255 : 0, true);
+    }
+
+#if HAL_USE_ADC
+    static int16_t current_reads[NUM_ADC_READS] = {0};
+    static int16_t voltage_reads[NUM_ADC_READS] = {0};
+    static int     write_offset                 = 0;
+
+    static uint32_t last_read = 0;
+    if (timer_elapsed32(last_read) >= 1) {
+        // Perform the reads
+        int16_t current    = analogReadPin(ADC_CURRENT_PIN);
+        int16_t voltage    = analogReadPin(ADC_VOLTAGE_PIN);
+        int16_t current_ma = (int16_t)(((3300 * (int32_t)current) / ADC_SATURATION));
+        int16_t voltage_mv = (int16_t)((2 * (3300 * (int32_t)voltage)) / ADC_SATURATION);
+
+        // Duplicate the first read so that averages work
+        if (last_read == 0) {
+            for (int i = 0; i < NUM_ADC_READS; ++i) {
+                current_reads[i] = current_ma;
+                voltage_reads[i] = voltage_mv;
+            }
+        }
+
+        // Dump in the current value
+        current_reads[write_offset] = current_ma;
+        voltage_reads[write_offset] = voltage_mv;
+        write_offset                = (write_offset + 1) % NUM_ADC_READS;
+
+        static int counter = 0;
+        counter            = (counter + 1) % 2500;
+        if (counter == 0) {
+            dprintf("Current: %dmA (%d) -- Voltage: %dmV (%d)\n", (int)current_ma, (int)current, (int)voltage_mv, (int)voltage);
+        }
+
+        last_read = timer_read32();
+    }
+
+    static uint32_t last_draw = 0;
+    if (hue_redraw || timer_elapsed32(last_draw) >= 250) {
+        // Accumulate
+        int32_t total_current_ma = 0;
+        int32_t total_voltage_mv = 0;
+        for (int i = 0; i < NUM_ADC_READS; ++i) {
+            total_current_ma += current_reads[i];
+            total_voltage_mv += voltage_reads[i];
+        }
+
+        // Get the averages
+        int16_t avg_current_ma = (int16_t)(total_current_ma / NUM_ADC_READS);
+        int16_t avg_voltage_mv = (int16_t)(total_voltage_mv / NUM_ADC_READS);
+
+        char buf[32] = {0};
+        sprintf(buf, "Current: %dmA", avg_current_ma);
+        static int16_t maxlen_curr = 0;
+        int16_t        len         = qp_drawtext_recolor(oled, 0, 127 - (font->line_height * 2), font, buf, 0, 0, 32, 0, 0, 0);
+        if (len < maxlen_curr) {
+            qp_rect(oled, len, 127 - (font->line_height * 2), maxlen_curr, 127 - (font->line_height * 1), 0, 0, 0, true);
+        } else if (len > maxlen_curr) {
+            maxlen_curr = len;
+        }
+
+        static int16_t maxlen_volt = 0;
+        sprintf(buf, "Voltage: %dmV", avg_voltage_mv);
+        len = qp_drawtext_recolor(oled, 0, 127 - (font->line_height * 1), font, buf, 0, 0, 32, 0, 0, 0);
+        if (len < maxlen_volt) {
+            qp_rect(oled, len, 127 - (font->line_height * 1), maxlen_volt, 127 - (font->line_height * 0), 0, 0, 0, true);
+        } else if (len > maxlen_volt) {
+            maxlen_volt = len;
+        }
+
+        qp_flush(oled);
+
+        last_draw = timer_read32();
+    }
+#endif // HAL_USE_ADC
+}
diff --git a/keyboards/tzarc/ghoul/readme.md b/keyboards/tzarc/ghoul/readme.md
new file mode 100644
index 0000000000..39c51377bc
--- /dev/null
+++ b/keyboards/tzarc/ghoul/readme.md
@@ -0,0 +1,29 @@
+# Ghoul
+
+![Ghoul](https://i.imgur.com/T8wp7cEh.jpg)
+
+Planck-like development board for QMK, using SparkFun MicroMod for hot-swap MCU capability.
+
+* Keyboard Maintainer: [tzarc](https://github.com/tzarc)
+* Hardware Supported: Ghoul rev1 PCB + MicroMod STM32, MicroMod RP2040
+* Hardware Availability: [Open-source](https://github.com/tzarc/ghoul)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tzarc/ghoul/rev1/stm32:default
+    make tzarc/ghoul/rev1/rp2040:default
+
+Flashing example for this keyboard:
+
+    make tzarc/ghoul/rev1/stm32:default:flash
+    make tzarc/ghoul/rev1/rp2040:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top-left key (usually Escape) and plug in the keyboard
+* **Physical reset button**: Either press all 5 left-most keys on the bottom row, or hold `BOOT` and press `RESET`
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/tzarc/ghoul/rev1/info.json b/keyboards/tzarc/ghoul/rev1/info.json
new file mode 100644
index 0000000000..7612fc1147
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/info.json
@@ -0,0 +1,49 @@
+{
+  "usb": {
+    "device_version": "1.0.0"
+  },
+  "rgb_matrix": {
+    "layout": [
+      { "flags": 4, "matrix": [2, 3], "x": 81, "y": 64 },
+      { "flags": 4, "matrix": [1, 7], "x": 61, "y": 64 },
+      { "flags": 4, "matrix": [1, 3], "x": 40, "y": 64 },
+      { "flags": 4, "matrix": [0, 7], "x": 20, "y": 64 },
+      { "flags": 4, "matrix": [0, 3], "x": 0, "y": 64 },
+      { "flags": 4, "matrix": [0, 2], "x": 0, "y": 42 },
+      { "flags": 4, "matrix": [0, 6], "x": 20, "y": 42 },
+      { "flags": 4, "matrix": [1, 2], "x": 40, "y": 42 },
+      { "flags": 4, "matrix": [1, 6], "x": 61, "y": 42 },
+      { "flags": 4, "matrix": [2, 2], "x": 81, "y": 42 },
+      { "flags": 4, "matrix": [2, 1], "x": 81, "y": 21 },
+      { "flags": 4, "matrix": [1, 5], "x": 61, "y": 21 },
+      { "flags": 4, "matrix": [1, 1], "x": 40, "y": 21 },
+      { "flags": 4, "matrix": [0, 5], "x": 20, "y": 21 },
+      { "flags": 4, "matrix": [0, 1], "x": 0, "y": 21 },
+      { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
+      { "flags": 4, "matrix": [0, 4], "x": 20, "y": 0 },
+      { "flags": 4, "matrix": [1, 0], "x": 40, "y": 0 },
+      { "flags": 4, "matrix": [1, 4], "x": 61, "y": 0 },
+      { "flags": 4, "matrix": [2, 0], "x": 81, "y": 0 },
+      { "flags": 4, "matrix": [2, 4], "x": 142, "y": 0 },
+      { "flags": 4, "matrix": [3, 0], "x": 162, "y": 0 },
+      { "flags": 4, "matrix": [3, 4], "x": 183, "y": 0 },
+      { "flags": 4, "matrix": [4, 0], "x": 203, "y": 0 },
+      { "flags": 4, "matrix": [4, 4], "x": 224, "y": 0 },
+      { "flags": 4, "matrix": [4, 5], "x": 224, "y": 21 },
+      { "flags": 4, "matrix": [4, 1], "x": 203, "y": 21 },
+      { "flags": 4, "matrix": [3, 5], "x": 183, "y": 21 },
+      { "flags": 4, "matrix": [3, 1], "x": 162, "y": 21 },
+      { "flags": 4, "matrix": [2, 5], "x": 142, "y": 21 },
+      { "flags": 4, "matrix": [2, 6], "x": 142, "y": 42 },
+      { "flags": 4, "matrix": [3, 2], "x": 162, "y": 42 },
+      { "flags": 4, "matrix": [3, 6], "x": 183, "y": 42 },
+      { "flags": 4, "matrix": [4, 2], "x": 203, "y": 42 },
+      { "flags": 4, "matrix": [4, 6], "x": 224, "y": 42 },
+      { "flags": 4, "matrix": [4, 7], "x": 224, "y": 64 },
+      { "flags": 4, "matrix": [4, 3], "x": 203, "y": 64 },
+      { "flags": 4, "matrix": [3, 7], "x": 183, "y": 64 },
+      { "flags": 4, "matrix": [3, 3], "x": 162, "y": 64 },
+      { "flags": 4, "matrix": [2, 7], "x": 142, "y": 64 }
+    ]
+  }
+}
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/config.h b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
new file mode 100644
index 0000000000..c428b26606
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
@@ -0,0 +1,39 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "config_common.h"
+
+// Matrix configuration
+#define SPI_MATRIX_CHIP_SELECT_PIN GP21
+#define SPI_MATRIX_DIVISOR 16
+
+// Encoder
+#define ENCODER_PUSHBUTTON_PIN GP7
+
+// SPI Configuration
+#define SPI_DRIVER SPID0
+#define SPI_SCK_PIN GP22
+#define SPI_MOSI_PIN GP23
+#define SPI_MISO_PIN GP20
+
+// EEPROM configuration
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 8
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN GP3
+#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 8
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN GP2
+
+// RGB configuration
+#define RGB_DI_PIN GP13
+#define RGB_ENABLE_PIN GP6
+
+// ADC Configuration
+#define ADC_RESOLUTION ? ? ? // ADC_CFGR1_RES_12BIT // TBD when RP2040 has analog support
+#define ADC_SATURATION ? ? ? // ((1 << 12) - 1) // TBD when RP2040 has analog support
+#define ADC_CURRENT_PIN GP26
+#define ADC_VOLTAGE_PIN GP27
+
+// Display Configuration
+#define OLED_CS_PIN GP16
+#define OLED_DC_PIN GP17
+#define OLED_RST_PIN GP18
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
new file mode 100644
index 0000000000..a22be02412
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+//#define HAL_USE_ADC TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/info.json b/keyboards/tzarc/ghoul/rev1/rp2040/info.json
new file mode 100644
index 0000000000..57b4cb772f
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/info.json
@@ -0,0 +1,15 @@
+{
+  "keyboard_name": "Ghoul_RP2040",
+  "processor": "RP2040",
+  "bootloader": "rp2040",
+  "bootloader_instructions": "Hold the boot switch and tap the reset switch, or hold the top-left key when plugging in the board.",
+  "encoder": {
+    "rotary": [
+      {
+        "pin_a": "GP8",
+        "pin_b": "GP5",
+        "resolution": 2
+      }
+    ]
+  }
+}
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
new file mode 100644
index 0000000000..abd4e19f7c
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
@@ -0,0 +1,13 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+// Used for RGB
+//#undef RP_ADC_USE_ADC1
+//#define RP_ADC_USE_ADC1 TRUE
+
+// Used for EEPROM
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
new file mode 100644
index 0000000000..997fce7e65
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER = vendor
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/board.h b/keyboards/tzarc/ghoul/rev1/stm32/board.h
new file mode 100644
index 0000000000..5379bd4a17
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/stm32/board.h
@@ -0,0 +1,9 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include_next "board.h"
+
+#ifdef BOARD_OTG_NOVBUSSENS
+#    undef BOARD_OTG_NOVBUSSENS
+#endif
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h
new file mode 100644
index 0000000000..b9059f1837
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h
@@ -0,0 +1,47 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "config_common.h"
+
+// Matrix configuration
+#define SPI_MATRIX_CHIP_SELECT_PIN C4
+#define SPI_MATRIX_DIVISOR 32
+
+// Encoder
+#define ENCODER_PUSHBUTTON_PIN C1
+
+// SPI Configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN A5
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN A6
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN A7
+#define SPI_MISO_PAL_MODE 5
+
+// EEPROM/Flash configuration
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 16
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B3
+#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 16
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN A4
+
+// RGB configuration
+#define RGB_DI_PIN C6
+#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 RGB_ENABLE_PIN C0
+
+// ADC Configuration
+#define ADC_RESOLUTION ADC_CFGR1_RES_12BIT
+#define ADC_SATURATION ((1 << 12) - 1)
+#define ADC_CURRENT_PIN C5 // ADC12_IN15
+#define ADC_VOLTAGE_PIN B0 // ADC12_IN8
+
+// Display Configuration
+#define OLED_CS_PIN D2
+#define OLED_DC_PIN A8
+#define OLED_RST_PIN A0
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/halconf.h b/keyboards/tzarc/ghoul/rev1/stm32/halconf.h
new file mode 100644
index 0000000000..66d4d70a9d
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/stm32/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_SPI TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/info.json
new file mode 100644
index 0000000000..11dcde90c9
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/stm32/info.json
@@ -0,0 +1,15 @@
+{
+  "keyboard_name": "Ghoul_STM32",
+  "processor": "STM32F405",
+  "bootloader": "stm32-dfu",
+  "bootloader_instructions": "Press the 5 keys on the bottom row of the left side, or hold the boot switch and tap the reset switch, or hold the top-left key when plugging in the board.",
+  "encoder": {
+    "rotary": [
+      {
+        "pin_a": "B10",
+        "pin_b": "B1",
+        "resolution": 2
+      }
+    ]
+  }
+}
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h b/keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h
new file mode 100644
index 0000000000..fe307993c7
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/stm32/mcuconf.h
@@ -0,0 +1,17 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+// Used for RGB
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+// Used for EEPROM
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+// Used for RGB
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
new file mode 100644
index 0000000000..69d4b426e1
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
@@ -0,0 +1,2 @@
+WS2812_DRIVER = pwm
+SRC += analog.c
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
new file mode 100644
index 0000000000..a56726860d
--- /dev/null
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -0,0 +1,7 @@
+CUSTOM_MATRIX = lite
+EEPROM_DRIVER = spi
+RGB_MATRIX_DRIVER = WS2812
+QUANTUM_PAINTER_DRIVERS = ssd1351_spi
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32

From cc1565f2a3e46f6f364f872962ced35aef5ddae8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 3 Oct 2022 12:26:04 +1100
Subject: [PATCH 535/959] `:flash`: print bootloader (#18569)

---
 platforms/arm_atsam/flash.mk | 1 +
 platforms/avr/flash.mk       | 3 ++-
 platforms/chibios/flash.mk   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/arm_atsam/flash.mk b/platforms/arm_atsam/flash.mk
index 8152610ceb..8068c08d57 100644
--- a/platforms/arm_atsam/flash.mk
+++ b/platforms/arm_atsam/flash.mk
@@ -13,6 +13,7 @@ mdloader: bin
 	$(call EXEC_MDLOADER)
 
 flash: bin
+	$(SILENT) || printf "Flashing for bootloader: $(BLUE)$(BOOTLOADER)$(NO_COLOR)\n"
 ifneq ($(strip $(PROGRAM_CMD)),)
 	$(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD)
 else ifeq ($(strip $(ARM_ATSAM)),SAMD51J18A)
diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk
index 6d50e72534..c104f730b3 100644
--- a/platforms/avr/flash.mk
+++ b/platforms/avr/flash.mk
@@ -168,7 +168,8 @@ endef
 hid_bootloader: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
 	$(call EXEC_HID_LUFA)
 
-flash:  $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+flash: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+	$(SILENT) || printf "Flashing for bootloader: $(BLUE)$(BOOTLOADER)$(NO_COLOR)\n"
 ifneq ($(strip $(PROGRAM_CMD)),)
 	$(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD)
 else ifeq ($(strip $(BOOTLOADER)), caterina)
diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk
index 790c4f3316..023da34bb5 100644
--- a/platforms/chibios/flash.mk
+++ b/platforms/chibios/flash.mk
@@ -100,8 +100,8 @@ endef
 teensy: $(BUILD_DIR)/$(TARGET).hex cpfirmware sizeafter
 	$(call EXEC_TEENSY)
 
-
 flash: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
+	$(SILENT) || printf "Flashing for bootloader: $(BLUE)$(BOOTLOADER)$(NO_COLOR)\n"
 ifneq ($(strip $(PROGRAM_CMD)),)
 	$(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD)
 else ifeq ($(strip $(BOOTLOADER)),kiibohd)

From f5e81681cd07750a7ec1c76a0326d5f87ef8ac5a Mon Sep 17 00:00:00 2001
From: Alabahuy <rezzaadio@gmail.com>
Date: Mon, 3 Oct 2022 13:35:43 +0700
Subject: [PATCH 536/959] add rart60 (#18570)

* add rart60
---
 keyboards/rart/rart60/config.h                |  41 +++++++
 keyboards/rart/rart60/info.json               | 109 ++++++++++++++++++
 .../rart/rart60/keymaps/default/keymap.c      |  38 ++++++
 keyboards/rart/rart60/keymaps/via/keymap.c    |  38 ++++++
 keyboards/rart/rart60/keymaps/via/rules.mk    |   1 +
 keyboards/rart/rart60/readme.md               |  27 +++++
 keyboards/rart/rart60/rules.mk                |   1 +
 7 files changed, 255 insertions(+)
 create mode 100644 keyboards/rart/rart60/config.h
 create mode 100644 keyboards/rart/rart60/info.json
 create mode 100644 keyboards/rart/rart60/keymaps/default/keymap.c
 create mode 100644 keyboards/rart/rart60/keymaps/via/keymap.c
 create mode 100644 keyboards/rart/rart60/keymaps/via/rules.mk
 create mode 100644 keyboards/rart/rart60/readme.md
 create mode 100644 keyboards/rart/rart60/rules.mk

diff --git a/keyboards/rart/rart60/config.h b/keyboards/rart/rart60/config.h
new file mode 100644
index 0000000000..a4d25fc51f
--- /dev/null
+++ b/keyboards/rart/rart60/config.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2022 Alabahuy
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define LED_CAPS_LOCK_PIN GP19
+#define LED_PIN_ON_STATE 0
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/rart/rart60/info.json b/keyboards/rart/rart60/info.json
new file mode 100644
index 0000000000..7ce36e5042
--- /dev/null
+++ b/keyboards/rart/rart60/info.json
@@ -0,0 +1,109 @@
+{
+    "manufacturer": "RART",
+    "keyboard_name": "rart60",
+    "maintainer": "Alabahuy",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP24", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP1", "GP0", "GP18", "GP22" ],
+        "rows": ["GP23", "GP25", "GP15", "GP16", "GP17" ]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0060",
+        "vid": "0x414C"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [1, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.5, "y": 0 },
+                { "matrix": [0, 15], "x": 16.5, "y": 0 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [1, 14], "x": 15.5, "y": 1 },
+                { "matrix": [1, 15], "x": 16.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [2, 14], "x": 15.5, "y": 2 },
+                { "matrix": [2, 15], "x": 16.5, "y": 2 },
+
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+                { "matrix": [3, 14], "x": 15.5, "y": 3 },
+                { "matrix": [3, 15], "x": 16.5, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
+                { "matrix": [4, 14], "x": 15.5, "y": 4 },
+                { "matrix": [4, 15], "x": 16.5, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rart/rart60/keymaps/default/keymap.c b/keyboards/rart/rart60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e7964a95cd
--- /dev/null
+++ b/keyboards/rart/rart60/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2022 Alabahuy
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_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_ENT, _______, _______,
+        KC_LSFT, _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), _______, _______,
+        KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, KC_RCTL, _______, _______
+    ),
+
+   
+    [1] = LAYOUT_all(
+        KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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, _______, _______, _______, _______,
+        _______, _______, _______,                   QK_BOOT,                            _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/rart/rart60/keymaps/via/keymap.c b/keyboards/rart/rart60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e7964a95cd
--- /dev/null
+++ b/keyboards/rart/rart60/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2022 Alabahuy
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_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_ENT, _______, _______,
+        KC_LSFT, _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), _______, _______,
+        KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, KC_RCTL, _______, _______
+    ),
+
+   
+    [1] = LAYOUT_all(
+        KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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, _______, _______, _______, _______,
+        _______, _______, _______,                   QK_BOOT,                            _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/rart/rart60/keymaps/via/rules.mk b/keyboards/rart/rart60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/rart/rart60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rart/rart60/readme.md b/keyboards/rart/rart60/readme.md
new file mode 100644
index 0000000000..b598c7bba6
--- /dev/null
+++ b/keyboards/rart/rart60/readme.md
@@ -0,0 +1,27 @@
+# RART60
+
+![rart60](https://i.imgur.com/8RkCYQEh.jpg)
+
+PCB 60% support optional macro with RP2040
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: Rart60, RP2040
+* Hardware Availability: Limited GB in IMKG
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rart/rart60:default
+
+Flashing example for this keyboard:
+
+    make rart/rart60:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/rart/rart60/rules.mk b/keyboards/rart/rart60/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/rart/rart60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From c0e6a28bc62f659b0564a203df670d81a89a3bb4 Mon Sep 17 00:00:00 2001
From: Jason Ken Adhinarta <35003073+jasonkena@users.noreply.github.com>
Date: Mon, 3 Oct 2022 03:26:47 -0400
Subject: [PATCH 537/959] Prevent tap dance from wiping dynamic macros (#17880)

---
 .../process_keycode/process_dynamic_macro.c   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index a7555fdd40..41207092a9 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -45,6 +45,10 @@ __attribute__((weak)) void dynamic_macro_record_end_user(int8_t direction) {
     dynamic_macro_led_blink();
 }
 
+__attribute__((weak)) bool dynamic_macro_valid_key_user(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+
 /* Convenience macros used for retrieving the debug info. All of them
  * need a `direction` variable accessible at the call site.
  */
@@ -252,14 +256,16 @@ bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
                 return false;
 #endif
             default:
-                /* Store the key in the macro buffer and process it normally. */
-                switch (macro_id) {
-                    case 1:
-                        dynamic_macro_record_key(macro_buffer, &macro_pointer, r_macro_end, +1, record);
-                        break;
-                    case 2:
-                        dynamic_macro_record_key(r_macro_buffer, &macro_pointer, macro_end, -1, record);
-                        break;
+                if (dynamic_macro_valid_key_user(keycode, record)) {
+                    /* Store the key in the macro buffer and process it normally. */
+                    switch (macro_id) {
+                        case 1:
+                            dynamic_macro_record_key(macro_buffer, &macro_pointer, r_macro_end, +1, record);
+                            break;
+                        case 2:
+                            dynamic_macro_record_key(r_macro_buffer, &macro_pointer, macro_end, -1, record);
+                            break;
+                    }
                 }
                 return true;
                 break;

From 1d194ac60f3cfecbd972795e9706cfc8922b7420 Mon Sep 17 00:00:00 2001
From: Johns <Johns-Q@users.noreply.github.com>
Date: Mon, 3 Oct 2022 09:41:24 +0200
Subject: [PATCH 538/959] Adds Anne Pro 2 c18 ISO variant support (#18154)

---
 keyboards/annepro2/annepro2.h                 |  14 +++
 keyboards/annepro2/c18/rules.mk               |   2 +-
 keyboards/annepro2/info.json                  |  70 ++++++++++++
 .../annepro2/keymaps/iso_default/config.h     |  20 ++++
 .../annepro2/keymaps/iso_default/keymap.c     | 106 ++++++++++++++++++
 5 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/annepro2/keymaps/iso_default/config.h
 create mode 100644 keyboards/annepro2/keymaps/iso_default/keymap.c

diff --git a/keyboards/annepro2/annepro2.h b/keyboards/annepro2/annepro2.h
index 393d9b4731..617c6414d2 100644
--- a/keyboards/annepro2/annepro2.h
+++ b/keyboards/annepro2/annepro2.h
@@ -42,6 +42,20 @@ extern ble_capslock_t ble_capslock;
     /* ROW4  */ { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO}, \
     /* ROW5  */ { K40,   KC_NO, K42,   K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   KC_NO}, \
 }
+#define LAYOUT_60_iso( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
+    K40, K42, K43,                K46,           K49, K4A, K4B, K4C       \
+) { \
+    /*            COL1   COL2   COL3   COL4   COL5   COL6   COL7   COL8   COL9   COL10  COL11  COL12  COL13  COL14*/ \
+    /* ROW1  */ { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D  }, \
+    /* ROW2  */ { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K2D  }, \
+    /* ROW3  */ { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO}, \
+    /* ROW4  */ { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO}, \
+    /* ROW5  */ { K40,   KC_NO, K42,   K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   KC_NO}, \
+}
 // clang-format on
 
 enum AP2KeyCodes {
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index b1c7208f8b..752324fc2c 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -44,7 +44,7 @@ MIDI_ENABLE = no
 VIRTSER_ENABLE = no
 COMBO_ENABLE = no
 
-LAYOUTS = 60_ansi
+LAYOUTS = 60_ansi 60_iso
 
 # Anne Pro 2
 SRC = \
diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json
index d2ddae4053..52282c0ad8 100644
--- a/keyboards/annepro2/info.json
+++ b/keyboards/annepro2/info.json
@@ -66,6 +66,76 @@
                 {"label":"?", "x":11.25, "y":3},
                 {"label":"Shift", "x":12.25, "y":3, "w":2.75},
 
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"Enter", "x":13.5, "y":1, "h":2},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"#", "x":12.75, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"<", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
                 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
                 {"label":"Win", "x":1.25, "y":4, "w":1.25},
                 {"label":"Alt", "x":2.5, "y":4, "w":1.25},
diff --git a/keyboards/annepro2/keymaps/iso_default/config.h b/keyboards/annepro2/keymaps/iso_default/config.h
new file mode 100644
index 0000000000..5b9f0ebdda
--- /dev/null
+++ b/keyboards/annepro2/keymaps/iso_default/config.h
@@ -0,0 +1,20 @@
+ /* Copyright 2022 OpenAnnePro community
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#pragma once
+
+#undef PRODUCT
+// C18 is a macro
+#define PRODUCT Anne Pro 2 c18-iso (QMK)
diff --git a/keyboards/annepro2/keymaps/iso_default/keymap.c b/keyboards/annepro2/keymaps/iso_default/keymap.c
new file mode 100644
index 0000000000..4c1b259504
--- /dev/null
+++ b/keyboards/annepro2/keymaps/iso_default/keymap.c
@@ -0,0 +1,106 @@
+ /* Copyright 2021 OpenAnnePro community
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+#include QMK_KEYBOARD_H
+
+enum anne_pro_layers {
+    BASE,
+    FN1,
+    FN2,
+};
+
+// clang-format off
+// Key symbols are based on QMK. Use them to remap your keyboard
+/*
+* Layer BASE
+* ,-----------------------------------------------------------------------------------------.
+* | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
+* |-----------------------------------------------------------------------------------------+
+* | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |        |
+* |---------------------------------------------------------------------------------- Enter |
+* | FN1     |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |  #  |       |
+* |-----------------------------------------------------------------------------------------+
+* | Shift|  \  |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
+* |-----------------------------------------------------------------------------------------+
+* | Ctrl  |  Win  |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+* \-----------------------------------------------------------------------------------------/
+* Layer TAP in BASE
+* ,-----------------------------------------------------------------------------------------.
+* |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
+* |-----------------------------------------------------------------------------------------+
+* |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+* |----------------------------------------------------------------------------------       |
+* | Caps    |     |     |     |     |     |     |     |     |     |     |     |     |       |
+* |-----------------------------------------------------------------------------------------+
+* |      |     |     |     |     |     |     |     |     |     |     |     |       UP       |
+* |-----------------------------------------------------------------------------------------+
+* |       |       |       |                                 |       |  LEFT | DOWN  | RIGHT |
+* \-----------------------------------------------------------------------------------------/
+*/
+ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [BASE] = LAYOUT_60_iso( /* Base */
+    KC_ESC,           KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,             KC_MINS,          KC_EQL,        KC_BSPC,
+    KC_TAB,           KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,             KC_LBRC,          KC_RBRC,
+    LT(FN1, KC_CAPS), KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L,    KC_SCLN,          KC_QUOT,          KC_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,          RSFT_T(KC_UP),
+    KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,             KC_RALT, LT(FN1, KC_LEFT), LT(FN2, KC_DOWN), RCTL_T(KC_RGHT)
+),
+  /*
+  * Layer FN1
+  * ,-----------------------------------------------------------------------------------------.
+  * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |        |
+  * |----------------------------------------------------------------------------------       |
+  * | FN1     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |  #  |       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift|  \  |V-UP |V-DWN|MUTE |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  Win  |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [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_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
+    _______, _______, _______,                            _______,                   KC_APP,  MO(FN1), MO(FN2), _______
+),
+  /*
+  * Layer FN2
+  * ,-----------------------------------------------------------------------------------------.
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 | F7 | F8 | MOD | TOG | BRI- | BRI+ |    Bksp   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |        |
+  * |---------------------------------------------------------------------------------- Enter +
+  * | FN1     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |  #  |       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift|  \  |  y  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  L1   |  Alt  |               space             |  APP  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [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_INS,        KC_DEL,        _______,
+    _______, _______,    _______,                                     _______,                   KC_APP,        MO(FN1),       MO(FN2),       _______
+ ),
+};
+// clang-format on

From ca0c12847a97a62f887fd4625673395104a7257b Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Mon, 3 Oct 2022 12:48:16 +0300
Subject: [PATCH 539/959] Fix layer switching from tap dances by redoing the
 keymap lookup (#17935)

---
 quantum/process_keycode/process_tap_dance.c   |  12 +-
 quantum/process_keycode/process_tap_dance.h   |   2 +-
 quantum/quantum.c                             |   6 +-
 tests/tap_dance/tap_dance_layers/config.h     |   6 +
 .../tap_dance_layers/tap_dance_defs.c         |  97 +++
 .../tap_dance_layers/tap_dance_defs.h         |  29 +
 tests/tap_dance/tap_dance_layers/test.mk      |  10 +
 .../test_tap_dance_layers.cpp                 | 717 ++++++++++++++++++
 8 files changed, 874 insertions(+), 5 deletions(-)
 create mode 100644 tests/tap_dance/tap_dance_layers/config.h
 create mode 100644 tests/tap_dance/tap_dance_layers/tap_dance_defs.c
 create mode 100644 tests/tap_dance/tap_dance_layers/tap_dance_defs.h
 create mode 100644 tests/tap_dance/tap_dance_layers/test.mk
 create mode 100644 tests/tap_dance/tap_dance_layers/test_tap_dance_layers.cpp

diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 3270a1b000..6e8e596673 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -115,12 +115,12 @@ static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_actio
     }
 }
 
-void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
+bool preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
     qk_tap_dance_action_t *action;
 
-    if (!record->event.pressed) return;
+    if (!record->event.pressed) return false;
 
-    if (!active_td || keycode == active_td) return;
+    if (!active_td || keycode == active_td) return false;
 
     action                             = &tap_dance_actions[TD_INDEX(active_td)];
     action->state.interrupted          = true;
@@ -130,6 +130,12 @@ void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
     // Tap dance actions can leave some weak mods active (e.g., if the tap dance is mapped to a keycode with
     // modifiers), but these weak mods should not affect the keypress which interrupted the tap dance.
     clear_weak_mods();
+
+    // Signal that a tap dance has been finished due to being interrupted,
+    // therefore the keymap lookup for the currently processed event needs to
+    // be repeated with the current layer state that might have been updated by
+    // the finished tap dance.
+    return true;
 }
 
 bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index d97900d96b..d6d6c136dc 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -81,7 +81,7 @@ void reset_tap_dance(qk_tap_dance_state_t *state);
 
 /* To be used internally */
 
-void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record);
+bool preprocess_tap_dance(uint16_t keycode, keyrecord_t *record);
 bool process_tap_dance(uint16_t keycode, keyrecord_t *record);
 void tap_dance_task(void);
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index ff36e14775..5b5364c8f1 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -251,7 +251,11 @@ bool process_record_quantum(keyrecord_t *record) {
 #endif
 
 #ifdef TAP_DANCE_ENABLE
-    preprocess_tap_dance(keycode, record);
+    if (preprocess_tap_dance(keycode, record)) {
+        // The tap dance might have updated the layer state, therefore the
+        // result of the keycode lookup might change.
+        keycode = get_record_keycode(record, true);
+    }
 #endif
 
     if (!(
diff --git a/tests/tap_dance/tap_dance_layers/config.h b/tests/tap_dance/tap_dance_layers/config.h
new file mode 100644
index 0000000000..32a19a8c68
--- /dev/null
+++ b/tests/tap_dance/tap_dance_layers/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "test_common.h"
diff --git a/tests/tap_dance/tap_dance_layers/tap_dance_defs.c b/tests/tap_dance/tap_dance_layers/tap_dance_defs.c
new file mode 100644
index 0000000000..5ec900c041
--- /dev/null
+++ b/tests/tap_dance/tap_dance_layers/tap_dance_defs.c
@@ -0,0 +1,97 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+#include "tap_dance_defs.h"
+
+// Implement custom keycodes which are used to check that the layer switching
+// behaves properly.
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case FAST_AB:
+        case SLOW_AB:
+            if (record->event.pressed) {
+                tap_code(KC_A);
+            } else {
+                tap_code(KC_B);
+            }
+            return keycode == SLOW_AB;
+        case FAST_CD:
+        case SLOW_CD:
+            if (record->event.pressed) {
+                tap_code(KC_C);
+            } else {
+                tap_code(KC_D);
+            }
+            return keycode == SLOW_CD;
+    }
+    return true;
+}
+
+// Implement a custom tap dance with the following behavior:
+// - single tap: KC_APP
+// - single hold: MO(1)
+// - double tap/hold: KC_RCTL
+// (The single tap and hold actions are mostly equivalent to LT(1, KC_APP).)
+
+enum lt_app_state {
+    LTA_NONE,
+    LTA_SINGLE_TAP,
+    LTA_SINGLE_HOLD,
+    LTA_DOUBLE_HOLD,
+};
+
+static enum lt_app_state saved_lt_app_state;
+
+static enum lt_app_state get_lt_app_state(qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (!state->pressed) {
+            return LTA_SINGLE_TAP;
+        } else {
+            return LTA_SINGLE_HOLD;
+        }
+    } else if (state->count == 2) {
+        return LTA_DOUBLE_HOLD;
+    } else {
+        return LTA_NONE;
+    }
+}
+
+static void lt_app_finished(qk_tap_dance_state_t *state, void *user_data) {
+    saved_lt_app_state = get_lt_app_state(state);
+    switch (saved_lt_app_state) {
+        case LTA_NONE:
+            break;
+        case LTA_SINGLE_TAP:
+            register_code(KC_APP);
+            break;
+        case LTA_SINGLE_HOLD:
+            layer_on(1);
+            break;
+        case LTA_DOUBLE_HOLD:
+            register_code(KC_RCTL);
+            break;
+    }
+}
+
+static void lt_app_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch (saved_lt_app_state) {
+        case LTA_NONE:
+            break;
+        case LTA_SINGLE_TAP:
+            unregister_code(KC_APP);
+            break;
+        case LTA_SINGLE_HOLD:
+            layer_off(1);
+            break;
+        case LTA_DOUBLE_HOLD:
+            unregister_code(KC_RCTL);
+            break;
+    }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_L_MOVE] = ACTION_TAP_DANCE_LAYER_MOVE(KC_APP, 1),
+    [TD_L_TOGG] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_APP, 1),
+    [TD_LT_APP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lt_app_finished, lt_app_reset),
+};
diff --git a/tests/tap_dance/tap_dance_layers/tap_dance_defs.h b/tests/tap_dance/tap_dance_layers/tap_dance_defs.h
new file mode 100644
index 0000000000..37cab0c2cb
--- /dev/null
+++ b/tests/tap_dance/tap_dance_layers/tap_dance_defs.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum custom_keycodes {
+    // (FAST|SLOW)_xy = tap KC_x on press, tap KC_y on release.  For FAST_xy
+    // process_record_user() returns false to stop processing early; for
+    // SLOW_xy process_record_user() returns true, therefore all other key
+    // handlers are invoked.
+    FAST_AB = SAFE_RANGE,
+    FAST_CD,
+    SLOW_AB,
+    SLOW_CD,
+};
+
+enum tap_dance_ids {
+    TD_L_MOVE, // ACTION_TAP_DANCE_LAYER_MOVE(KC_APP, 1)
+    TD_L_TOGG, // ACTION_TAP_DANCE_LAYER_TOGGLE(KC_APP, 1)
+    TD_LT_APP, // similar to LT(1, KC_APP) with KC_RCTL on tap+hold or double tap
+};
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/tap_dance/tap_dance_layers/test.mk b/tests/tap_dance/tap_dance_layers/test.mk
new file mode 100644
index 0000000000..b4cdc9b088
--- /dev/null
+++ b/tests/tap_dance/tap_dance_layers/test.mk
@@ -0,0 +1,10 @@
+# Copyright 2022 Sergey Vlasov (@sigprof)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
+
+TAP_DANCE_ENABLE = yes
+
+SRC += tap_dance_defs.c
diff --git a/tests/tap_dance/tap_dance_layers/test_tap_dance_layers.cpp b/tests/tap_dance/tap_dance_layers/test_tap_dance_layers.cpp
new file mode 100644
index 0000000000..8b736b19c6
--- /dev/null
+++ b/tests/tap_dance/tap_dance_layers/test_tap_dance_layers.cpp
@@ -0,0 +1,717 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "action_tapping.h"
+#include "test_keymap_key.hpp"
+#include "tap_dance_defs.h"
+
+using testing::_;
+using testing::InSequence;
+
+struct TapDanceKeyParams {
+    std::string name;                  // Tap dance name (part of test name)
+    uint16_t    keycode;               // Tap dance keycode (TD(n))
+    uint16_t    expect_on_tap;         // Keycode for single tap
+    uint16_t    expect_on_hold;        // Keycode for single hold (may be MO(1))
+    uint16_t    expect_on_double_tap;  // Keycode for double tap (may be MO(1))
+    uint16_t    expect_on_double_hold; // Keycode for double hold (may be MO(1))
+};
+
+struct OtherKeyLayerParams {
+    uint16_t keycode;           // Keycode in the keymap
+    uint16_t expect_on_press;   // Keycode to expect on press
+    uint16_t expect_on_release; // Keycode to expect on release (may be KC_NO if none)
+};
+
+struct OtherKeyParams {
+    std::string         name; // Other key name (part of test name)
+    OtherKeyLayerParams l0;   // Keycodes for layer 0
+    OtherKeyLayerParams l1;   // Keycodes for layer 1
+};
+
+typedef std::tuple<TapDanceKeyParams, OtherKeyParams> TapDanceLayersParams;
+
+class TapDanceLayers : public ::testing::WithParamInterface<TapDanceLayersParams>, public TestFixture {
+   protected:
+    TapDanceKeyParams tap_dance;
+    OtherKeyParams    other_key;
+
+    std::unique_ptr<KeymapKey> key_td, key_td_l1, key_other, key_other_l1;
+
+    void SetUp() override {
+        std::tie(tap_dance, other_key) = GetParam();
+
+        key_td       = std::make_unique<KeymapKey>(0, 1, 0, tap_dance.keycode);
+        key_td_l1    = std::make_unique<KeymapKey>(1, 1, 0, KC_TRNS);
+        key_other    = std::make_unique<KeymapKey>(0, 2, 0, other_key.l0.keycode);
+        key_other_l1 = std::make_unique<KeymapKey>(1, 2, 0, other_key.l1.keycode);
+
+        set_keymap({*key_td, *key_td_l1, *key_other, *key_other_l1});
+    }
+};
+
+static const TapDanceKeyParams tap_dance_keys[] = {
+    TapDanceKeyParams{
+        "LayerMove",
+        TD(TD_L_MOVE),
+        KC_APP,
+        KC_APP,
+        MO(1),
+        MO(1),
+    },
+    TapDanceKeyParams{
+        "LayerToggle",
+        TD(TD_L_TOGG),
+        KC_APP,
+        KC_APP,
+        MO(1),
+        MO(1),
+    },
+    TapDanceKeyParams{
+        "CustomLT",
+        TD(TD_LT_APP),
+        KC_APP,
+        MO(1),
+        KC_RCTL,
+        KC_RCTL,
+    },
+};
+
+static const OtherKeyParams other_keys[] = {
+    OtherKeyParams{
+        "Builtin",
+        OtherKeyLayerParams{KC_A, KC_A, KC_NO},
+        OtherKeyLayerParams{KC_B, KC_B, KC_NO},
+    },
+    OtherKeyParams{
+        "CustomFast",
+        OtherKeyLayerParams{FAST_AB, KC_A, KC_B},
+        OtherKeyLayerParams{FAST_CD, KC_C, KC_D},
+    },
+    OtherKeyParams{
+        "CustomSlow",
+        OtherKeyLayerParams{SLOW_AB, KC_A, KC_B},
+        OtherKeyLayerParams{SLOW_CD, KC_C, KC_D},
+    },
+};
+
+// clang-format off
+INSTANTIATE_TEST_CASE_P(
+    Layers,
+    TapDanceLayers,
+    ::testing::Combine(
+        ::testing::ValuesIn(tap_dance_keys),
+        ::testing::ValuesIn(other_keys)
+    ),
+    [](const ::testing::TestParamInfo<TapDanceLayersParams>& info) {
+        return std::get<0>(info.param).name + std::get<1>(info.param).name;
+    }
+);
+// clang-format on
+
+// Test single tap of the tap dance key with tapping term delay after the tap.
+TEST_P(TapDanceLayers, SingleTap) {
+    TestDriver driver;
+    InSequence s;
+
+    // The tap of the tap dance key does not result in sending a report
+    // immediately.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+
+    // After the tapping term expires, a tap event for the single tap keycode
+    // is generated.
+    idle_for(TAPPING_TERM - 1);
+    EXPECT_REPORT(driver, (tap_dance.expect_on_tap));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test single tap of the tap dance key without a delay between the tap dance
+// key and the other key.
+TEST_P(TapDanceLayers, SingleTapFast) {
+    TestDriver driver;
+    InSequence s;
+
+    // The tap of the tap dance key does not result in sending a report
+    // immediately.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+
+    // A quick press of the other key causes the tap event for the tap dance to
+    // be sent before the press event for the other key, and the layer 0
+    // mapping is used for the other key.
+    EXPECT_REPORT(driver, (tap_dance.expect_on_tap));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test single hold of the tap dance key with tapping term delay after the hold
+// (test variant for tap dances which switch the layer on hold).
+TEST_P(TapDanceLayers, SingleHoldLayer) {
+    if (tap_dance.expect_on_hold != MO(1)) {
+        // Do nothing - the SingleHoldKeycode test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the hold of the tap dance key.
+    EXPECT_NO_REPORT(driver);
+    key_td->press();
+    run_one_scan_loop();
+
+    // After the tapping term expires, the tap dance finishes and switches the
+    // layer, but does not send a report.
+    EXPECT_NO_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l1.expect_on_press));
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key does not produce a report.
+    EXPECT_NO_REPORT(driver);
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 1 mapping of
+    // that key.
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l1.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test single hold of the tap dance key with tapping term delay after the hold
+// (test variant for tap dances which send a keycode on single hold).
+TEST_P(TapDanceLayers, SingleHoldKeycode) {
+    if (tap_dance.expect_on_hold == MO(1)) {
+        // Do nothing - the SingleHoldLayer test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the hold of the tap dance key.
+    EXPECT_NO_REPORT(driver);
+    key_td->press();
+    run_one_scan_loop();
+
+    // After the tapping term expires, the tap dance sends the report with the
+    // hold keycode.
+    EXPECT_NO_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (tap_dance.expect_on_hold));
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (tap_dance.expect_on_hold, other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (tap_dance.expect_on_hold));
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key sends the release report for the
+    // corresponding hold keycode.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    } else {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    }
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test single hold of the tap dance key without tapping term delay after the
+// hold (test variant for tap dances which switch the layer on hold).
+TEST_P(TapDanceLayers, SingleHoldFastLayer) {
+    if (tap_dance.expect_on_hold != MO(1)) {
+        // Do nothing - the SingleHoldFastKeycode test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the hold of the tap dance key.
+    EXPECT_NO_REPORT(driver);
+    key_td->press();
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l1.expect_on_press));
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key does not produce a report.
+    EXPECT_NO_REPORT(driver);
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l1.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test single hold of the tap dance key without tapping term delay after the hold
+// (test variant for tap dances which send a keycode on single hold).
+TEST_P(TapDanceLayers, SingleHoldFastKeycode) {
+    if (tap_dance.expect_on_hold == MO(1)) {
+        // Do nothing - the SingleHoldFastLayer test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the hold of the tap dance key.
+    EXPECT_NO_REPORT(driver);
+    key_td->press();
+    run_one_scan_loop();
+
+    // Pressing the other key produces first the report for the tap dance hold
+    // keycode, and then the reports for the layer 0 mapping of the other key.
+    EXPECT_REPORT(driver, (tap_dance.expect_on_hold));
+    EXPECT_REPORT(driver, (tap_dance.expect_on_hold, other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (tap_dance.expect_on_hold));
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key sends a release report for the corresponding
+    // hold keycode.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    } else {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    }
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double tap of the tap dance key with tapping term delay after the hold
+// (test variant for tap dances which switch the layer on double tap).
+TEST_P(TapDanceLayers, DoubleTapLayer) {
+    if (tap_dance.expect_on_double_tap != MO(1)) {
+        // Do nothing - the DoubleTapKeycode test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double tap of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    tap_key(*key_td);
+
+    // After the tapping term this tap dance does not send a report too.
+    EXPECT_NO_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l1.expect_on_press));
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 1 mapping of
+    // that key.
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l1.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double tap of the tap dance key with tapping term delay after the hold
+// (test variant for tap dances which send a keycode on double tap).
+TEST_P(TapDanceLayers, DoubleTapKeycode) {
+    if (tap_dance.expect_on_double_tap == MO(1)) {
+        // Do nothing - the DoubleTapLayer test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double tap of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    tap_key(*key_td);
+
+    // After the tapping term this tap dance sends the double tap keycode.
+    idle_for(TAPPING_TERM - 1);
+    EXPECT_REPORT(driver, (tap_dance.expect_on_double_tap));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double tap of the tap dance key without tapping term delay after the
+// hold (test variant for tap dances which switch the layer on double tap).
+TEST_P(TapDanceLayers, DoubleTapFastLayer) {
+    if (tap_dance.expect_on_double_tap != MO(1)) {
+        // Do nothing - the DoubleTapFastKeycode test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double tap of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    tap_key(*key_td);
+
+    // Pressing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l1.expect_on_press));
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 1 mapping of
+    // that key.
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l1.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double tap of the tap dance key without tapping term delay after the
+// hold (test variant for tap dances which send a keycode on double tap).
+TEST_P(TapDanceLayers, DoubleTapFastKeycode) {
+    if (tap_dance.expect_on_double_tap == MO(1)) {
+        // Do nothing - the DoubleTapFastLayer test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double tap of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    tap_key(*key_td);
+
+    // Pressing the other key produces first the report for the tap dance
+    // double tap keycode, and then the reports for the layer 0 mapping of the
+    // other key.
+    EXPECT_REPORT(driver, (tap_dance.expect_on_double_tap));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double hold of the tap dance key with tapping term delay after the hold
+// (test variant for tap dances which switch the layer on double hold).
+TEST_P(TapDanceLayers, DoubleHoldLayer) {
+    if (tap_dance.expect_on_double_hold != MO(1)) {
+        // Do nothing - the DoubleHoldKeycode test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double hold of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    key_td->press();
+    run_one_scan_loop();
+
+    // After the tapping term expires, the tap dance finishes and switches the
+    // layer, but does not send a report.
+    EXPECT_NO_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l1.expect_on_press));
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key does not produce a report.
+    EXPECT_NO_REPORT(driver);
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 1 mapping of
+    // that key.
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l1.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double hold of the tap dance key with tapping term delay after the hold
+// (test variant for tap dances which send a keycode on double hold).
+TEST_P(TapDanceLayers, DoubleHoldKeycode) {
+    if (tap_dance.expect_on_double_hold == MO(1)) {
+        // Do nothing - the DoubleHoldLayer test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double hold of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    key_td->press();
+    run_one_scan_loop();
+
+    // After the tapping term expires, the tap dance sends the report with the
+    // double hold keycode.
+    EXPECT_NO_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    EXPECT_REPORT(driver, (tap_dance.expect_on_double_hold));
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (tap_dance.expect_on_double_hold, other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (tap_dance.expect_on_double_hold));
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key sends the release report for the
+    // corresponding double hold keycode.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    } else {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    }
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the reports for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double hold of the tap dance key without tapping term delay after the
+// hold (test variant for tap dances which switch the layer on double hold).
+TEST_P(TapDanceLayers, DoubleHoldFastLayer) {
+    if (tap_dance.expect_on_double_hold != MO(1)) {
+        // Do nothing - the DoubleHoldFastKeycode test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double hold of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    key_td->press();
+    run_one_scan_loop();
+
+    // Pressing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    EXPECT_REPORT(driver, (other_key.l1.expect_on_press));
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key does not produce a report.
+    EXPECT_NO_REPORT(driver);
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the reports for the layer 1 mapping of
+    // that key.
+    if (other_key.l1.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l1.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}
+
+// Test double hold of the tap dance key without tapping term delay after the hold
+// (test variant for tap dances which send a keycode on double hold).
+TEST_P(TapDanceLayers, DoubleHoldFastKeycode) {
+    if (tap_dance.expect_on_double_hold == MO(1)) {
+        // Do nothing - the DoubleHoldFastLayer test would run instead.
+        return;
+    }
+
+    TestDriver driver;
+    InSequence s;
+
+    // No report gets sent immediately after the double hold of the tap dance
+    // key.
+    EXPECT_NO_REPORT(driver);
+    tap_key(*key_td);
+    key_td->press();
+    run_one_scan_loop();
+
+    // Pressing the other key produces first the report for the tap dance
+    // double hold keycode, and then the reports for the layer 0 mapping of the
+    // other key.
+    EXPECT_REPORT(driver, (tap_dance.expect_on_double_hold));
+    EXPECT_REPORT(driver, (tap_dance.expect_on_double_hold, other_key.l0.expect_on_press));
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (tap_dance.expect_on_double_hold));
+    }
+    key_other->press();
+    run_one_scan_loop();
+
+    // Releasing the tap dance key sends a release report for the corresponding
+    // double hold keycode.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_EMPTY_REPORT(driver);
+    } else {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_press));
+    }
+    key_td->release();
+    run_one_scan_loop();
+
+    // Releasing the other key produces the report for the layer 0 mapping of
+    // that key.
+    if (other_key.l0.expect_on_release != KC_NO) {
+        EXPECT_REPORT(driver, (other_key.l0.expect_on_release));
+    }
+    EXPECT_EMPTY_REPORT(driver);
+    key_other->release();
+    run_one_scan_loop();
+}

From 6bbcabe0ccf7087c9754ebc17e4bded4d322eaa3 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 3 Oct 2022 18:23:45 +0200
Subject: [PATCH 540/959] [Core] Serial-protocol: always clear receive queue on
 main half of split keyboard (#18419)

---
 platforms/chibios/drivers/serial_protocol.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/platforms/chibios/drivers/serial_protocol.c b/platforms/chibios/drivers/serial_protocol.c
index c95aed9885..ccaf73282d 100644
--- a/platforms/chibios/drivers/serial_protocol.c
+++ b/platforms/chibios/drivers/serial_protocol.c
@@ -102,15 +102,11 @@ static inline bool react_to_transaction(void) {
  * @return bool Indicates success of transaction.
  */
 bool soft_serial_transaction(int index) {
-    bool result = initiate_transaction((uint8_t)index);
+    /* Clear the receive queue, to start with a clean slate.
+     * Parts of failed transactions or spurious bytes could still be in it. */
+    serial_transport_driver_clear();
 
-    if (unlikely(!result)) {
-        /* Clear the receive queue, to start with a clean slate.
-         * Parts of failed transactions or spurious bytes could still be in it. */
-        serial_transport_driver_clear();
-    }
-
-    return result;
+    return initiate_transaction((uint8_t)index);
 }
 
 /**

From 976f454df0ae44efa1d9f891bddcda42d0e1ee83 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 3 Oct 2022 19:57:13 +0200
Subject: [PATCH 541/959] [Bug] Update ChibiOS-Contrib for USB IRQ and bus
 handling fixes (#18574)

---
 lib/chibios-contrib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index b51787777b..bb8356fb5a 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit b51787777beda4be659212503d5f3901ca91db08
+Subproject commit bb8356fb5a3a9bbc1561826f174a9a631c614546

From 88046b3ebf2c628abbad501e21ebd99cae8687e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 08:51:57 +1100
Subject: [PATCH 542/959] Bump anothrNick/github-tag-action from 1.50.0 to
 1.51.0 (#18575)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto_tag.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index b85cd23146..1ec3c39236 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.50.0
+      uses: anothrNick/github-tag-action@1.51.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

From dc5234746148adf06ef399a50a8ecd1b3f5e999d Mon Sep 17 00:00:00 2001
From: Brian Choromanski <BrianChoromanski@gmail.com>
Date: Mon, 3 Oct 2022 21:42:56 -0400
Subject: [PATCH 543/959] Added new issue templates for feature requests and
 bug reports (#18576)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md       | 36 -------------------
 .github/ISSUE_TEMPLATE/bug_report.yml      | 41 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md  | 24 -------------
 .github/ISSUE_TEMPLATE/feature_request.yml | 21 +++++++++++
 4 files changed, 62 insertions(+), 60 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 81561eaba6..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve QMK Firmware.
-title: "[Bug] "
-labels: bug, help wanted
-assignees: ''
-
----
-
-<!-- Provide a general summary of the bug in the title above. -->
-
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-## Describe the Bug
-
-<!-- A clear and concise description of what the bug is. -->
-
-## System Information
-
-**Keyboard:** 
-**Revision (if applicable):** 
-**Operating system:** 
-**`qmk doctor` output:** 
-```
-(Paste output here)
-```
-
-**Any keyboard related software installed?** 
- - [ ] AutoHotKey (Windows)
- - [ ] Karabiner (macOS)
- - [ ] Other:
-
-## Additional Context
-
-<!-- Add any other relevant information about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..a5d185e1dd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,41 @@
+name: Bug report
+description: Create a report to help us improve QMK Firmware.
+title: "[Bug] "
+labels: ["bug", "help wanted"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Provide a general summary of the bug in the title above.
+  - type: textarea
+    attributes:
+      label: Describe the Bug
+      description: A clear and concise description of what the bug is.
+  - type: input
+    attributes:
+      label: Keyboard Used
+      description: The name of the keyboard from the `make` or `qmk compile`/`qmk flash` commands, eg. `planck/rev6`.
+  - type: input
+    attributes:
+      label: Link to product page (if applicable)
+  - type: input
+    attributes:
+      label: Operating System
+  - type: textarea
+    attributes:
+      label: qmk doctor Output
+      description: Output from running the `qmk doctor` command.
+      render: text
+  - type: checkboxes
+    attributes:
+      label: Is AutoHotKey / Karabiner installed
+      options:
+        - label: AutoHotKey (Windows)
+        - label: Karabiner (macOS)
+  - type: input
+    attributes:
+      label: Other keyboard-related software installed
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other relevant information about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 1876834247..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature or changes to existing features.
-title: "[Feature Request] "
-labels: enhancement, help wanted
-assignees: ''
-
----
-
-<!--- Provide a general summary of the changes you want in the title above. -->
-
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-## Feature Request Type
-
-- [ ] Core functionality
-- [ ] Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
-- [ ] Alteration (enhancement/optimization) of existing feature(s)
-- [ ] New behavior
-
-## Description
-
-<!-- A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000..585bcf2e6f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,21 @@
+name: Feature request
+description: Suggest a new feature or changes to existing features.
+title: "[Feature Request] "
+labels: ["enhancement", "help wanted"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Provide a general summary of the changes you want in the title above.
+  - type: checkboxes
+    attributes:
+      label: Feature Request Type
+      options:
+        - label: Core functionality
+        - label: Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
+        - label: Alteration (enhancement/optimization) of existing feature(s)
+        - label: New behavior
+  - type: textarea
+    attributes:
+      label: Description
+      description: A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful.
\ No newline at end of file

From 78c4907f34cc7936299ae5cc78460cb45f286e56 Mon Sep 17 00:00:00 2001
From: mmccoyd <mmccoyd@users.noreply.github.com>
Date: Mon, 3 Oct 2022 19:17:08 -0700
Subject: [PATCH 544/959] [Docs] Clarify CAPS_WORD behaviors (#18137)

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 docs/feature_caps_word.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/feature_caps_word.md b/docs/feature_caps_word.md
index 283f0f5288..507ea637b2 100644
--- a/docs/feature_caps_word.md
+++ b/docs/feature_caps_word.md
@@ -4,7 +4,10 @@ It is often useful to type a single word in all capitals, for instance
 abbreviations like "QMK", or in code, identifiers like `KC_SPC`. "Caps Word" is
 a modern alternative to Caps Lock:
 
-* Letters are capitalized while active, and Caps Word automatically disables
+* While active, letters are capitalized and `-` becomes `_`. The `_` makes it easier
+  to type constant names (eg 'PROGRAM\_CONSTANTS').
+
+* Caps Word automatically disables
   itself at the end of the word. That is, it stops by default once a space or
   any key other than `KC_A`--`KC_Z`, `KC_0`--`KC_9`, `KC_MINS`, `KC_UNDS`,
   `KC_DELETE`, or `KC_BACKSPACE` is pressed. Caps Word also disables itself if

From 56f7b34289e7f80ac540a7c9c01a5c3a3838cd7c Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 4 Oct 2022 20:49:29 +0200
Subject: [PATCH 545/959] [Core] rewrite locking in split transaction handlers
 (#18417)

---
 quantum/split_common/transactions.c | 121 ++++++++++++++++++++--------
 1 file changed, 88 insertions(+), 33 deletions(-)

diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 719068908f..13fd8a761e 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -76,7 +76,26 @@ static bool transaction_handler_master(matrix_row_t master_matrix[], matrix_row_
         if (!transaction_handler_master(master_matrix, slave_matrix, #prefix, &prefix##_handlers_master)) return false; \
     } while (0)
 
+/**
+ * @brief Constructs a transaction handler that doesn't acquire a lock to the
+ * split shared memory. Therefore the locking and unlocking has to be done
+ * manually inside the handler. Use this macro only if the handler is
+ * non-deterministic in runtime and thus needs a manual lock unlock
+ * implementation to hold the lock for the shortest possible time.
+ */
 #define TRANSACTION_HANDLER_SLAVE(prefix)                     \
+    do {                                                      \
+        prefix##_handlers_slave(master_matrix, slave_matrix); \
+    } while (0)
+
+/**
+ * @brief Constructs a transaction handler that automatically acquires a lock to
+ * safely access the split shared memory and releases the lock again after
+ * processing the handler. Use this macro if the handler is fast and
+ * deterministic in runtime and thus holds the lock only for a very short time.
+ * If not fallback to manually locking and unlocking inside the handler.
+ */
+#define TRANSACTION_HANDLER_SLAVE_AUTOLOCK(prefix)            \
     do {                                                      \
         split_shared_memory_lock();                           \
         prefix##_handlers_slave(master_matrix, slave_matrix); \
@@ -139,7 +158,7 @@ static void slave_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_row
 
 // clang-format off
 #define TRANSACTIONS_SLAVE_MATRIX_MASTER() TRANSACTION_HANDLER_MASTER(slave_matrix)
-#define TRANSACTIONS_SLAVE_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(slave_matrix)
+#define TRANSACTIONS_SLAVE_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(slave_matrix)
 #define TRANSACTIONS_SLAVE_MATRIX_REGISTRATIONS \
     [GET_SLAVE_MATRIX_CHECKSUM] = trans_target2initiator_initializer(smatrix.checksum), \
     [GET_SLAVE_MATRIX_DATA]     = trans_target2initiator_initializer(smatrix.matrix),
@@ -161,7 +180,7 @@ static void master_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_ro
 }
 
 #    define TRANSACTIONS_MASTER_MATRIX_MASTER() TRANSACTION_HANDLER_MASTER(master_matrix)
-#    define TRANSACTIONS_MASTER_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(master_matrix)
+#    define TRANSACTIONS_MASTER_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(master_matrix)
 #    define TRANSACTIONS_MASTER_MATRIX_REGISTRATIONS [PUT_MASTER_MATRIX] = trans_initiator2target_initializer(mmatrix.matrix),
 
 #else // SPLIT_TRANSPORT_MIRROR
@@ -197,7 +216,7 @@ static void encoder_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sl
 
 // clang-format off
 #    define TRANSACTIONS_ENCODERS_MASTER() TRANSACTION_HANDLER_MASTER(encoder)
-#    define TRANSACTIONS_ENCODERS_SLAVE() TRANSACTION_HANDLER_SLAVE(encoder)
+#    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),
@@ -239,7 +258,7 @@ static void sync_timer_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 }
 
 #    define TRANSACTIONS_SYNC_TIMER_MASTER() TRANSACTION_HANDLER_MASTER(sync_timer)
-#    define TRANSACTIONS_SYNC_TIMER_SLAVE() TRANSACTION_HANDLER_SLAVE(sync_timer)
+#    define TRANSACTIONS_SYNC_TIMER_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(sync_timer)
 #    define TRANSACTIONS_SYNC_TIMER_REGISTRATIONS [PUT_SYNC_TIMER] = trans_initiator2target_initializer(sync_timer),
 
 #else // DISABLE_SYNC_TIMER
@@ -273,7 +292,7 @@ static void layer_state_handlers_slave(matrix_row_t master_matrix[], matrix_row_
 
 // clang-format off
 #    define TRANSACTIONS_LAYER_STATE_MASTER() TRANSACTION_HANDLER_MASTER(layer_state)
-#    define TRANSACTIONS_LAYER_STATE_SLAVE() TRANSACTION_HANDLER_SLAVE(layer_state)
+#    define TRANSACTIONS_LAYER_STATE_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(layer_state)
 #    define TRANSACTIONS_LAYER_STATE_REGISTRATIONS \
     [PUT_LAYER_STATE]         = trans_initiator2target_initializer(layers.layer_state), \
     [PUT_DEFAULT_LAYER_STATE] = trans_initiator2target_initializer(layers.default_layer_state),
@@ -304,7 +323,7 @@ static void led_state_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 }
 
 #    define TRANSACTIONS_LED_STATE_MASTER() TRANSACTION_HANDLER_MASTER(led_state)
-#    define TRANSACTIONS_LED_STATE_SLAVE() TRANSACTION_HANDLER_SLAVE(led_state)
+#    define TRANSACTIONS_LED_STATE_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(led_state)
 #    define TRANSACTIONS_LED_STATE_REGISTRATIONS [PUT_LED_STATE] = trans_initiator2target_initializer(led_state),
 
 #else // SPLIT_LED_STATE_ENABLE
@@ -353,10 +372,15 @@ static bool mods_handlers_master(matrix_row_t master_matrix[], matrix_row_t slav
 }
 
 static void mods_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    set_mods(split_shmem->mods.real_mods);
-    set_weak_mods(split_shmem->mods.weak_mods);
+    split_shared_memory_lock();
+    split_mods_sync_t mods;
+    memcpy(&mods, &split_shmem->mods, sizeof(split_mods_sync_t));
+    split_shared_memory_unlock();
+
+    set_mods(mods.real_mods);
+    set_weak_mods(mods.weak_mods);
 #    ifndef NO_ACTION_ONESHOT
-    set_oneshot_mods(split_shmem->mods.oneshot_mods);
+    set_oneshot_mods(mods.oneshot_mods);
 #    endif
 }
 
@@ -384,7 +408,11 @@ static bool backlight_handlers_master(matrix_row_t master_matrix[], matrix_row_t
 }
 
 static void backlight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    backlight_set(split_shmem->backlight_level);
+    split_shared_memory_lock();
+    uint8_t backlight_level = split_shmem->backlight_level;
+    split_shared_memory_unlock();
+
+    backlight_set(backlight_level);
 }
 
 #    define TRANSACTIONS_BACKLIGHT_MASTER() TRANSACTION_HANDLER_MASTER(backlight)
@@ -417,10 +445,15 @@ static bool rgblight_handlers_master(matrix_row_t master_matrix[], matrix_row_t
 }
 
 static void rgblight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    split_shared_memory_lock();
     // Update the RGB with the new data
-    if (split_shmem->rgblight_sync.status.change_flags != 0) {
-        rgblight_update_sync(&split_shmem->rgblight_sync, false);
-        split_shmem->rgblight_sync.status.change_flags = 0;
+    rgblight_syncinfo_t rgblight_sync;
+    memcpy(&rgblight_sync, &split_shmem->rgblight_sync, sizeof(rgblight_syncinfo_t));
+    split_shmem->rgblight_sync.status.change_flags = 0;
+    split_shared_memory_unlock();
+
+    if (rgblight_sync.status.change_flags != 0) {
+        rgblight_update_sync(&rgblight_sync, false);
     }
 }
 
@@ -450,8 +483,12 @@ static bool led_matrix_handlers_master(matrix_row_t master_matrix[], matrix_row_
 }
 
 static void led_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    split_shared_memory_lock();
     memcpy(&led_matrix_eeconfig, &split_shmem->led_matrix_sync.led_matrix, sizeof(led_eeconfig_t));
-    led_matrix_set_suspend_state(split_shmem->led_matrix_sync.led_suspend_state);
+    bool led_suspend_state = split_shmem->led_matrix_sync.led_suspend_state;
+    split_shared_memory_unlock();
+
+    led_matrix_set_suspend_state(led_suspend_state);
 }
 
 #    define TRANSACTIONS_LED_MATRIX_MASTER() TRANSACTION_HANDLER_MASTER(led_matrix)
@@ -480,8 +517,12 @@ static bool rgb_matrix_handlers_master(matrix_row_t master_matrix[], matrix_row_
 }
 
 static void rgb_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    split_shared_memory_lock();
     memcpy(&rgb_matrix_config, &split_shmem->rgb_matrix_sync.rgb_matrix, sizeof(rgb_config_t));
-    rgb_matrix_set_suspend_state(split_shmem->rgb_matrix_sync.rgb_suspend_state);
+    bool rgb_suspend_state = split_shmem->rgb_matrix_sync.rgb_suspend_state;
+    split_shared_memory_unlock();
+
+    rgb_matrix_set_suspend_state(rgb_suspend_state);
 }
 
 #    define TRANSACTIONS_RGB_MATRIX_MASTER() TRANSACTION_HANDLER_MASTER(rgb_matrix)
@@ -512,7 +553,7 @@ static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_
 }
 
 #    define TRANSACTIONS_WPM_MASTER() TRANSACTION_HANDLER_MASTER(wpm)
-#    define TRANSACTIONS_WPM_SLAVE() TRANSACTION_HANDLER_SLAVE(wpm)
+#    define TRANSACTIONS_WPM_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(wpm)
 #    define TRANSACTIONS_WPM_REGISTRATIONS [PUT_WPM] = trans_initiator2target_initializer(current_wpm),
 
 #else // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
@@ -535,7 +576,11 @@ static bool oled_handlers_master(matrix_row_t master_matrix[], matrix_row_t slav
 }
 
 static void oled_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    if (split_shmem->current_oled_state) {
+    split_shared_memory_lock();
+    uint8_t current_oled_state = split_shmem->current_oled_state;
+    split_shared_memory_unlock();
+
+    if (current_oled_state) {
         oled_on();
     } else {
         oled_off();
@@ -566,7 +611,11 @@ static bool st7565_handlers_master(matrix_row_t master_matrix[], matrix_row_t sl
 }
 
 static void st7565_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    if (split_shmem->current_st7565_state) {
+    split_shared_memory_lock();
+    uint8_t current_st7565_state = split_shmem->current_st7565_state;
+    split_shared_memory_unlock();
+
+    if (current_st7565_state) {
         st7565_on();
     } else {
         st7565_off();
@@ -574,7 +623,7 @@ static void st7565_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sla
 }
 
 #    define TRANSACTIONS_ST7565_MASTER() TRANSACTION_HANDLER_MASTER(st7565)
-#    define TRANSACTIONS_ST7565_SLAVE() TRANSACTION_HANDLER_SLAVE(st7565)
+#    define TRANSACTIONS_ST7565_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(st7565)
 #    define TRANSACTIONS_ST7565_REGISTRATIONS [PUT_ST7565] = trans_initiator2target_initializer(current_st7565_state),
 
 #else // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
@@ -607,9 +656,9 @@ static bool pointing_handlers_master(matrix_row_t master_matrix[], matrix_row_t
     bool            okay = read_if_checksum_mismatch(GET_POINTING_CHECKSUM, GET_POINTING_DATA, &last_update, &temp_state, &split_shmem->pointing.report, sizeof(temp_state));
     if (okay) pointing_device_set_shared_report(temp_state);
     temp_cpi = pointing_device_get_shared_cpi();
-    if (temp_cpi && memcmp(&last_cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
-        memcpy(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi));
-        okay = transport_write(PUT_POINTING_CPI, &split_shmem->pointing.cpi, sizeof(split_shmem->pointing.cpi));
+    if (temp_cpi && last_cpi != temp_cpi) {
+        split_shmem->pointing.cpi = temp_cpi;
+        okay                      = transport_write(PUT_POINTING_CPI, &split_shmem->pointing.cpi, sizeof(split_shmem->pointing.cpi));
         if (okay) {
             last_cpi = temp_cpi;
         }
@@ -629,8 +678,6 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
         return;
     }
 #    endif
-    report_mouse_t temp_report;
-    uint16_t       temp_cpi;
 #    if (POINTING_DEVICE_TASK_THROTTLE_MS > 0)
     static uint32_t last_exec = 0;
     if (timer_elapsed32(last_exec) < POINTING_DEVICE_TASK_THROTTLE_MS) {
@@ -638,17 +685,25 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
     }
     last_exec = timer_read32();
 #    endif
-    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi(); // check for NULL
-    if (split_shmem->pointing.cpi && memcmp(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
-        if (pointing_device_driver.set_cpi) {
-            pointing_device_driver.set_cpi(split_shmem->pointing.cpi);
-        }
+
+    uint16_t temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi(); // check for NULL
+
+    split_shared_memory_lock();
+    split_slave_pointing_sync_t pointing;
+    memcpy(&pointing, &split_shmem->pointing, sizeof(split_slave_pointing_sync_t));
+    split_shared_memory_unlock();
+
+    if (pointing.cpi && pointing.cpi != temp_cpi && pointing_device_driver.set_cpi) {
+        pointing_device_driver.set_cpi(pointing.cpi);
     }
-    memset(&temp_report, 0, sizeof(temp_report));
-    temp_report = pointing_device_driver.get_report(temp_report);
-    memcpy(&split_shmem->pointing.report, &temp_report, sizeof(temp_report));
+
+    pointing.report = pointing_device_driver.get_report((report_mouse_t){0});
     // Now update the checksum given that the pointing has been written to
-    split_shmem->pointing.checksum = crc8(&temp_report, sizeof(temp_report));
+    pointing.checksum = crc8(&pointing.report, sizeof(report_mouse_t));
+
+    split_shared_memory_lock();
+    memcpy(&split_shmem->pointing, &pointing, sizeof(split_slave_pointing_sync_t));
+    split_shared_memory_unlock();
 }
 
 #    define TRANSACTIONS_POINTING_MASTER() TRANSACTION_HANDLER_MASTER(pointing)

From b6ea8837e4c81f364d30bdc74bf2cdccb2a1a185 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 4 Oct 2022 20:56:40 +0200
Subject: [PATCH 546/959] [Bug] RP2040: only clear RX FIFO for serial pio
 driver clear (#18581)

---
 platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
index afd7e65ad8..dd4723a086 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
@@ -181,12 +181,13 @@ static inline void leave_rx_state(void) {}
 #endif
 
 /**
- * @brief Clear the RX and TX hardware FIFOs of the state machines.
+ * @brief Clear the FIFO of the RX state machine.
  */
 inline void serial_transport_driver_clear(void) {
     osalSysLock();
-    pio_sm_clear_fifos(pio, rx_state_machine);
-    pio_sm_clear_fifos(pio, tx_state_machine);
+    while (!pio_sm_is_rx_fifo_empty(pio, rx_state_machine)) {
+        pio_sm_clear_fifos(pio, rx_state_machine);
+    }
     osalSysUnlock();
 }
 

From 996a9006d3f101dc5c48b58339e2e7323040fd59 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 4 Oct 2022 23:10:24 +0200
Subject: [PATCH 547/959] [Core] PWM Backlight for RP2040 (#17706)

---
 docs/platformdev_rp2040.md                    |  1 +
 .../handwired/onekey/blackpill_f401/config.h  |  1 +
 .../handwired/onekey/blackpill_f411/config.h  |  1 +
 .../onekey/blackpill_f411_tinyuf2/config.h    |  1 +
 keyboards/handwired/onekey/rp2040/config.h    |  3 ++
 keyboards/handwired/onekey/rp2040/halconf.h   |  9 ++++
 keyboards/handwired/onekey/rp2040/info.json   |  5 +-
 keyboards/handwired/onekey/rp2040/mcuconf.h   |  9 ++++
 .../GENERIC_PROMICRO_RP2040/configs/mcuconf.h | 13 +++++
 .../GENERIC_RP_RP2040/configs/mcuconf.h       | 13 +++++
 .../boards/QMK_PM2040/configs/mcuconf.h       | 13 +++++
 platforms/chibios/chibios_config.h            |  4 ++
 platforms/chibios/vendors/RP/_pin_defs.h      |  5 ++
 quantum/backlight/backlight_chibios.c         | 51 +++++++++++--------
 14 files changed, 107 insertions(+), 22 deletions(-)
 create mode 100644 keyboards/handwired/onekey/rp2040/halconf.h
 create mode 100644 keyboards/handwired/onekey/rp2040/mcuconf.h

diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md
index d690ebebf8..5aaaab1c81 100644
--- a/docs/platformdev_rp2040.md
+++ b/docs/platformdev_rp2040.md
@@ -6,6 +6,7 @@ The following table shows the current driver status for peripherals on RP2040 MC
 | ---------------------------------------------------------------- | ---------------------------------------------- |
 | [ADC driver](adc_driver.md)                                      | Support planned (no ETA)                       |
 | [Audio](audio_driver.md)                                         | Support planned (no ETA)                       |
+| [Backlight](feature_backlight.md)                                | :heavy_check_mark:                             |
 | [I2C driver](i2c_driver.md)                                      | :heavy_check_mark:                             |
 | [SPI driver](spi_driver.md)                                      | :heavy_check_mark:                             |
 | [WS2812 driver](ws2812_driver.md)                                | :heavy_check_mark: using `PIO` driver          |
diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h
index 4e9552480f..05f3f07763 100644
--- a/keyboards/handwired/onekey/blackpill_f401/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401/config.h
@@ -20,6 +20,7 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h
index b97df0c666..c890043b09 100644
--- a/keyboards/handwired/onekey/blackpill_f411/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411/config.h
@@ -20,6 +20,7 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
index c8800fa163..2b60320fc1 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -20,6 +20,7 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index bcf4047a4f..82c5592dc9 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -13,3 +13,6 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define BACKLIGHT_PWM_DRIVER PWMD4
+#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
diff --git a/keyboards/handwired/onekey/rp2040/halconf.h b/keyboards/handwired/onekey/rp2040/halconf.h
new file mode 100644
index 0000000000..5890122e5e
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json
index b34a1cc206..32bde911bb 100644
--- a/keyboards/handwired/onekey/rp2040/info.json
+++ b/keyboards/handwired/onekey/rp2040/info.json
@@ -6,7 +6,10 @@
         "cols": ["GP4"],
         "rows": ["GP5"]
     },
+    "backlight": {
+        "pin": "GP25"
+    },
     "rgblight": {
-        "pin": "A1"
+        "pin": "GP25"
     }
 }
diff --git a/keyboards/handwired/onekey/rp2040/mcuconf.h b/keyboards/handwired/onekey/rp2040/mcuconf.h
new file mode 100644
index 0000000000..86f821640f
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_PWM_USE_PWM4
+#define RP_PWM_USE_PWM4 TRUE
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
index 8348e5312f..5c0859901e 100644
--- a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
@@ -78,6 +78,19 @@
 #define RP_SPI_SPI1_DMA_PRIORITY            1
 #define RP_SPI_DMA_ERROR_HOOK(spip)
 
+/*
+ * PWM driver system settings.
+ */
+#define RP_PWM_USE_PWM0                     FALSE
+#define RP_PWM_USE_PWM1                     FALSE
+#define RP_PWM_USE_PWM2                     FALSE
+#define RP_PWM_USE_PWM3                     FALSE
+#define RP_PWM_USE_PWM4                     FALSE
+#define RP_PWM_USE_PWM5                     FALSE
+#define RP_PWM_USE_PWM6                     FALSE
+#define RP_PWM_USE_PWM7                     FALSE
+#define RP_PWM_IRQ_WRAP_NUMBER_PRIORITY     3
+
 /*
  * I2C driver system settings.
  */
diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
index 9d8dc61aac..f7a66c6ab9 100644
--- a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
+++ b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
@@ -78,6 +78,19 @@
 #define RP_SPI_SPI1_DMA_PRIORITY            1
 #define RP_SPI_DMA_ERROR_HOOK(spip)
 
+/*
+ * PWM driver system settings.
+ */
+#define RP_PWM_USE_PWM0                     FALSE
+#define RP_PWM_USE_PWM1                     FALSE
+#define RP_PWM_USE_PWM2                     FALSE
+#define RP_PWM_USE_PWM3                     FALSE
+#define RP_PWM_USE_PWM4                     FALSE
+#define RP_PWM_USE_PWM5                     FALSE
+#define RP_PWM_USE_PWM6                     FALSE
+#define RP_PWM_USE_PWM7                     FALSE
+#define RP_PWM_IRQ_WRAP_NUMBER_PRIORITY     3
+
 /*
  * I2C driver system settings.
  */
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h b/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
index a737b36c1c..e33d6d785f 100644
--- a/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
+++ b/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
@@ -78,6 +78,19 @@
 #define RP_SPI_SPI1_DMA_PRIORITY            1
 #define RP_SPI_DMA_ERROR_HOOK(spip)
 
+/*
+ * PWM driver system settings.
+ */
+#define RP_PWM_USE_PWM0                     FALSE
+#define RP_PWM_USE_PWM1                     FALSE
+#define RP_PWM_USE_PWM2                     FALSE
+#define RP_PWM_USE_PWM3                     FALSE
+#define RP_PWM_USE_PWM4                     FALSE
+#define RP_PWM_USE_PWM5                     FALSE
+#define RP_PWM_USE_PWM6                     FALSE
+#define RP_PWM_USE_PWM7                     FALSE
+#define RP_PWM_IRQ_WRAP_NUMBER_PRIORITY     3
+
 /*
  * I2C driver system settings.
  */
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index 8dcc23727f..38d3a40f6b 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -28,6 +28,10 @@
 #    define USE_GPIOV1
 #    define PAL_OUTPUT_TYPE_OPENDRAIN _Static_assert(0, "RP2040 has no Open Drain GPIO configuration, setting this is not possible");
 
+#    define BACKLIGHT_PAL_MODE (PAL_MODE_ALTERNATE_PWM | PAL_RP_PAD_DRIVE12 | PAL_RP_GPIO_OE)
+#    define BACKLIGHT_PWM_COUNTER_FREQUENCY 1000000
+#    define BACKLIGHT_PWM_PERIOD BACKLIGHT_PWM_COUNTER_FREQUENCY / 2048
+
 #    define usb_lld_endpoint_fields
 
 #    define I2C1_SCL_PAL_MODE (PAL_MODE_ALTERNATE_I2C | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_PUE | PAL_RP_PAD_DRIVE4)
diff --git a/platforms/chibios/vendors/RP/_pin_defs.h b/platforms/chibios/vendors/RP/_pin_defs.h
index 4241845369..b56ab31406 100644
--- a/platforms/chibios/vendors/RP/_pin_defs.h
+++ b/platforms/chibios/vendors/RP/_pin_defs.h
@@ -35,3 +35,8 @@
 #define GP28 28U
 #define GP29 29U
 #define GP30 30U
+
+/* Aliases for GPIO PWM channels - every pin has at least one PWM channel
+ * assigned */
+#define RP2040_PWM_CHANNEL_A 1U
+#define RP2040_PWM_CHANNEL_B 2U
diff --git a/quantum/backlight/backlight_chibios.c b/quantum/backlight/backlight_chibios.c
index e8f9e70f78..30e95bd5c8 100644
--- a/quantum/backlight/backlight_chibios.c
+++ b/quantum/backlight/backlight_chibios.c
@@ -40,16 +40,22 @@
 #    endif
 #endif
 
-static PWMConfig pwmCFG = {0xFFFF, /* PWM clock frequency  */
-                           256,    /* PWM period (in ticks) 1S (1/10kHz=0.1mS 0.1ms*10000 ticks=1S) */
-                           NULL,   /* Breathing Callback */
-                           {       /* Default all channels to disabled - Channels will be configured durring init */
-                            {PWM_OUTPUT_DISABLED, NULL},
-                            {PWM_OUTPUT_DISABLED, NULL},
-                            {PWM_OUTPUT_DISABLED, NULL},
-                            {PWM_OUTPUT_DISABLED, NULL}},
-                           0, /* HW dependent part.*/
-                           0};
+#ifndef BACKLIGHT_PWM_COUNTER_FREQUENCY
+#    define BACKLIGHT_PWM_COUNTER_FREQUENCY 0xFFFF
+#endif
+
+#ifndef BACKLIGHT_PWM_PERIOD
+#    define BACKLIGHT_PWM_PERIOD 256
+#endif
+
+static PWMConfig pwmCFG = {
+    .frequency = BACKLIGHT_PWM_COUNTER_FREQUENCY, /* PWM clock frequency  */
+    .period    = BACKLIGHT_PWM_PERIOD,            /* PWM period in counter ticks. e.g. clock frequency is 10KHz, period is 256 ticks then t_period is 25.6ms */
+};
+
+#ifdef BACKLIGHT_BREATHING
+static virtual_timer_t breathing_vt;
+#endif
 
 // See http://jared.geek.nz/2013/feb/linear-led-pwm
 static uint16_t cie_lightness(uint16_t v) {
@@ -60,10 +66,11 @@ static uint16_t cie_lightness(uint16_t v) {
         // to get a useful result with integer division, we shift left in the expression above
         // and revert what we've done again after squaring.
         y = y * y * y >> 8;
-        if (y > 0xFFFFUL) // prevent overflow
+        if (y > 0xFFFFUL) { // prevent overflow
             return 0xFFFFU;
-        else
+        } else {
             return (uint16_t)y;
+        }
     }
 }
 
@@ -85,6 +92,7 @@ void backlight_init_ports(void) {
     backlight_set(get_backlight_level());
 
 #ifdef BACKLIGHT_BREATHING
+    chVTObjectInit(&breathing_vt);
     if (is_backlight_breathing()) {
         breathing_enable();
     }
@@ -92,7 +100,9 @@ void backlight_init_ports(void) {
 }
 
 void backlight_set(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
+    if (level > BACKLIGHT_LEVELS) {
+        level = BACKLIGHT_LEVELS;
+    }
 
     if (level == 0) {
         // Turn backlight off
@@ -115,20 +125,19 @@ void backlight_task(void) {}
  */
 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};
 
-void breathing_callback(PWMDriver *pwmp);
+static void breathing_callback(virtual_timer_t *vtp, void *p);
 
 bool is_breathing(void) {
-    return pwmCFG.callback != NULL;
+    return chVTIsArmed(&breathing_vt);
 }
 
 void breathing_enable(void) {
-    pwmCFG.callback = breathing_callback;
-    pwmEnablePeriodicNotification(&BACKLIGHT_PWM_DRIVER);
+    /* Update frequency is 256Hz -> 3906us intervals */
+    chVTSetContinuous(&breathing_vt, TIME_US2I(3906), breathing_callback, NULL);
 }
 
 void breathing_disable(void) {
-    pwmCFG.callback = NULL;
-    pwmDisablePeriodicNotification(&BACKLIGHT_PWM_DRIVER);
+    chVTReset(&breathing_vt);
 
     // Restore backlight level
     backlight_set(get_backlight_level());
@@ -139,7 +148,7 @@ static inline uint16_t scale_backlight(uint16_t v) {
     return v / BACKLIGHT_LEVELS * get_backlight_level();
 }
 
-void breathing_callback(PWMDriver *pwmp) {
+static void breathing_callback(virtual_timer_t *vtp, void *p) {
     uint8_t  breathing_period = get_breathing_period();
     uint16_t interval         = (uint16_t)breathing_period * 256 / BREATHING_STEPS;
 
@@ -150,7 +159,7 @@ void breathing_callback(PWMDriver *pwmp) {
     uint32_t duty                     = cie_lightness(rescale_limit_val(scale_backlight(breathing_table[index] * 256)));
 
     chSysLockFromISR();
-    pwmEnableChannelI(pwmp, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
+    pwmEnableChannelI(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
     chSysUnlockFromISR();
 }
 

From 7e844a4d55ee2e7e0b14a1c3a2aca3eebe259e8b Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 4 Oct 2022 23:43:38 +0200
Subject: [PATCH 548/959] [Core] RP2040: use built-in integer hardware divider
 and optimized i64 multiplication (#18464)

---
 platforms/chibios/vendors/RP/RP2040.mk | 239 +++----------------------
 1 file changed, 25 insertions(+), 214 deletions(-)

diff --git a/platforms/chibios/vendors/RP/RP2040.mk b/platforms/chibios/vendors/RP/RP2040.mk
index efa3fef13f..4360512c05 100644
--- a/platforms/chibios/vendors/RP/RP2040.mk
+++ b/platforms/chibios/vendors/RP/RP2040.mk
@@ -66,223 +66,34 @@ EXTRAINCDIRS += $(PLATFORM_RP2040_PATH)
 # RP2040 optimized compiler intrinsics
 ##############################################################################
 
-# Enables optimized Compiler intrinsics which are located in the RP2040
-# bootrom. This needs startup code and linker script support from ChibiOS,
-# which is WIP. Therefore disabled by default for now.
-RP2040_INTRINSICS_ENABLED ?= no
-ifeq ($(strip $(RP2040_INTRINSICS_ENABLED)), yes)
-    PICOSDKINTRINSICSSRC =  $(PICOSDKROOT)/src/rp2_common/pico_float/float_aeabi.S \
-                            $(PICOSDKROOT)/src/rp2_common/pico_float/float_math.c \
-                            $(PICOSDKROOT)/src/rp2_common/pico_float/float_init_rom.c \
-                            $(PICOSDKROOT)/src/rp2_common/pico_float/float_v1_rom_shim.S \
-                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_aeabi.S \
-                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_math.c \
-                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_init_rom.c \
-                            $(PICOSDKROOT)/src/rp2_common/pico_double/double_v1_rom_shim.S \
-                            $(PICOSDKROOT)/src/rp2_common/pico_divider/divider.S \
-                            $(PICOSDKROOT)/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S \
-                            $(PICOSDKROOT)/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S \
-                            $(PICOSDKROOT)/src/rp2_common/pico_malloc/pico_malloc.c \
-                            $(PICOSDKROOT)/src/rp2_common/pico_bit_ops/bit_ops_aeabi.S
+# The RP2040 sdk provides optimized compiler intrinsics which override the GCC
+# built-ins. Some of these functions are located in the bootrom of the RP2040.
+# Execution of these functions is realized via a vtable that is populated on
+# bootup. This mechanism needs startup code and linker script support from
+# ChibiOS, which is currently not implemented thus these functions are disabled
+# ATM.
+PICOSDKINTRINSICSSRC =  $(PICOSDKROOT)/src/rp2_common/pico_divider/divider.S \
+                        $(PICOSDKROOT)/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S
 
-    PICOSDKINTRINSICSINC =  $(PICOSDKROOT)/src/common/pico_base/include \
-                            $(PICOSDKROOT)/src/rp2_common/pico_platfrom/include \
-                            $(PICOSDKROOT)/src/rp2_common/pico_bootrom/include \
-                            $(PICOSDKROOT)/src/rp2_common/hardware_divider/include \
-                            $(PICOSDKROOT)/src/rp2_common/pico_float/include \
-                            $(PICOSDKROOT)/src/rp2_common/pico_double/include \
-                            $(PICOSDKROOT)/src/rp2_common/pico_malloc/include
+PICOSDKINTRINSICSINC =  $(PICOSDKROOT)/src/common/pico_base/include \
+                        $(PICOSDKROOT)/src/rp2_common/pico_platfrom/include \
+                        $(PICOSDKROOT)/src/rp2_common/hardware_divider/include
 
-    OPT_DEFS += -DPICO_FLOAT_SUPPORT_ROM_V1=0 -DPICO_DOUBLE_SUPPORT_ROM_V1=0
+# integer division intrinsics utilizing the RP2040 hardware divider
+OPT_DEFS += -DPICO_DIVIDER_IN_RAM=1
+OPT_DEFS += -DPICO_DIVIDER_DISABLE_INTERRUPTS=1
 
-    CFLAGS += -Wl,--defsym=__StackLimit=__heap_end__
-    CFLAGS += -Wl,--defsym=__unhandled_user_irq=_unhandled_exception
-    CFLAGS += -Wl,--build-id=none
+CFLAGS += -Wl,--wrap=__aeabi_idiv
+CFLAGS += -Wl,--wrap=__aeabi_idivmod
+CFLAGS += -Wl,--wrap=__aeabi_ldivmod
+CFLAGS += -Wl,--wrap=__aeabi_uidiv
+CFLAGS += -Wl,--wrap=__aeabi_uidivmod
+CFLAGS += -Wl,--wrap=__aeabi_uldivmod
 
-    # single precision floating point intrinsics
-    OPT_DEFS += -DPICO_FLOAT_IN_RAM=1
-    OPT_DEFS += -DPICO_FLOAT_PROPAGATE_NANS=0
+# 64bit integer intrinsics
+OPT_DEFS += -DPICO_INT64_OPS_IN_RAM=1
 
-    CFLAGS += -Wl,--wrap=__aeabi_fdiv
-    CFLAGS += -Wl,--wrap=__aeabi_fmul
-    CFLAGS += -Wl,--wrap=__aeabi_frsub
-    CFLAGS += -Wl,--wrap=__aeabi_fsub
-    CFLAGS += -Wl,--wrap=__aeabi_cfcmpeq
-    CFLAGS += -Wl,--wrap=__aeabi_cfrcmple
-    CFLAGS += -Wl,--wrap=__aeabi_cfcmple
-    CFLAGS += -Wl,--wrap=__aeabi_fcmpeq
-    CFLAGS += -Wl,--wrap=__aeabi_fcmplt
-    CFLAGS += -Wl,--wrap=__aeabi_fcmple
-    CFLAGS += -Wl,--wrap=__aeabi_fcmpge
-    CFLAGS += -Wl,--wrap=__aeabi_fcmpgt
-    CFLAGS += -Wl,--wrap=__aeabi_fcmpun
-    CFLAGS += -Wl,--wrap=__aeabi_i2f
-    CFLAGS += -Wl,--wrap=__aeabi_l2f
-    CFLAGS += -Wl,--wrap=__aeabi_ui2f
-    CFLAGS += -Wl,--wrap=__aeabi_ul2f
-    CFLAGS += -Wl,--wrap=__aeabi_i2f
-    CFLAGS += -Wl,--wrap=__aeabi_f2iz
-    CFLAGS += -Wl,--wrap=__aeabi_f2lz
-    CFLAGS += -Wl,--wrap=__aeabi_f2uiz
-    CFLAGS += -Wl,--wrap=__aeabi_f2ulz
-    CFLAGS += -Wl,--wrap=__aeabi_f2d
-    CFLAGS += -Wl,--wrap=sqrtf
-    CFLAGS += -Wl,--wrap=cosf
-    CFLAGS += -Wl,--wrap=sinf
-    CFLAGS += -Wl,--wrap=tanf
-    CFLAGS += -Wl,--wrap=atan2f
-    CFLAGS += -Wl,--wrap=expf
-    CFLAGS += -Wl,--wrap=logf
-    CFLAGS += -Wl,--wrap=ldexpf
-    CFLAGS += -Wl,--wrap=copysignf
-    CFLAGS += -Wl,--wrap=truncf
-    CFLAGS += -Wl,--wrap=floorf
-    CFLAGS += -Wl,--wrap=ceilf
-    CFLAGS += -Wl,--wrap=roundf
-    CFLAGS += -Wl,--wrap=sincosf
-    CFLAGS += -Wl,--wrap=asinf
-    CFLAGS += -Wl,--wrap=acosf
-    CFLAGS += -Wl,--wrap=atanf
-    CFLAGS += -Wl,--wrap=sinhf
-    CFLAGS += -Wl,--wrap=coshf
-    CFLAGS += -Wl,--wrap=tanhf
-    CFLAGS += -Wl,--wrap=asinhf
-    CFLAGS += -Wl,--wrap=acoshf
-    CFLAGS += -Wl,--wrap=atanhf
-    CFLAGS += -Wl,--wrap=exp2f
-    CFLAGS += -Wl,--wrap=log2f
-    CFLAGS += -Wl,--wrap=exp10f
-    CFLAGS += -Wl,--wrap=log10f
-    CFLAGS += -Wl,--wrap=powf
-    CFLAGS += -Wl,--wrap=powintf
-    CFLAGS += -Wl,--wrap=hypotf
-    CFLAGS += -Wl,--wrap=cbrtf
-    CFLAGS += -Wl,--wrap=fmodf
-    CFLAGS += -Wl,--wrap=dremf
-    CFLAGS += -Wl,--wrap=remainderf
-    CFLAGS += -Wl,--wrap=remquof
-    CFLAGS += -Wl,--wrap=expm1f
-    CFLAGS += -Wl,--wrap=log1pf
-    CFLAGS += -Wl,--wrap=fmaf
+CFLAGS += -Wl,--wrap=__aeabi_lmul
 
-    # double precision floating point intrinsics
-    OPT_DEFS += -DPICO_DOUBLE_IN_RAM=1
-    OPT_DEFS += -DPICO_DOUBLE_PROPAGATE_NANS=0
-
-    CFLAGS += -Wl,--wrap=__aeabi_dadd
-    CFLAGS += -Wl,--wrap=__aeabi_ddiv
-    CFLAGS += -Wl,--wrap=__aeabi_dmul
-    CFLAGS += -Wl,--wrap=__aeabi_drsub
-    CFLAGS += -Wl,--wrap=__aeabi_dsub
-    CFLAGS += -Wl,--wrap=__aeabi_cdcmpeq
-    CFLAGS += -Wl,--wrap=__aeabi_cdrcmple
-    CFLAGS += -Wl,--wrap=__aeabi_cdcmple
-    CFLAGS += -Wl,--wrap=__aeabi_dcmpeq
-    CFLAGS += -Wl,--wrap=__aeabi_dcmplt
-    CFLAGS += -Wl,--wrap=__aeabi_dcmple
-    CFLAGS += -Wl,--wrap=__aeabi_dcmpge
-    CFLAGS += -Wl,--wrap=__aeabi_dcmpgt
-    CFLAGS += -Wl,--wrap=__aeabi_dcmpun
-    CFLAGS += -Wl,--wrap=__aeabi_i2d
-    CFLAGS += -Wl,--wrap=__aeabi_l2d
-    CFLAGS += -Wl,--wrap=__aeabi_ui2d
-    CFLAGS += -Wl,--wrap=__aeabi_ul2d
-    CFLAGS += -Wl,--wrap=__aeabi_d2iz
-    CFLAGS += -Wl,--wrap=__aeabi_d2lz
-    CFLAGS += -Wl,--wrap=__aeabi_d2uiz
-    CFLAGS += -Wl,--wrap=__aeabi_d2ulz
-    CFLAGS += -Wl,--wrap=__aeabi_d2f
-    CFLAGS += -Wl,--wrap=sqrt
-    CFLAGS += -Wl,--wrap=cos
-    CFLAGS += -Wl,--wrap=sin
-    CFLAGS += -Wl,--wrap=tan
-    CFLAGS += -Wl,--wrap=atan2
-    CFLAGS += -Wl,--wrap=exp
-    CFLAGS += -Wl,--wrap=log
-    CFLAGS += -Wl,--wrap=ldexp
-    CFLAGS += -Wl,--wrap=copysign
-    CFLAGS += -Wl,--wrap=trunc
-    CFLAGS += -Wl,--wrap=floor
-    CFLAGS += -Wl,--wrap=ceil
-    CFLAGS += -Wl,--wrap=round
-    CFLAGS += -Wl,--wrap=sincos
-    CFLAGS += -Wl,--wrap=asin
-    CFLAGS += -Wl,--wrap=acos
-    CFLAGS += -Wl,--wrap=atan
-    CFLAGS += -Wl,--wrap=sinh
-    CFLAGS += -Wl,--wrap=cosh
-    CFLAGS += -Wl,--wrap=tanh
-    CFLAGS += -Wl,--wrap=asinh
-    CFLAGS += -Wl,--wrap=acosh
-    CFLAGS += -Wl,--wrap=atanh
-    CFLAGS += -Wl,--wrap=exp2
-    CFLAGS += -Wl,--wrap=log2
-    CFLAGS += -Wl,--wrap=exp10
-    CFLAGS += -Wl,--wrap=log10
-    CFLAGS += -Wl,--wrap=pow
-    CFLAGS += -Wl,--wrap=powint
-    CFLAGS += -Wl,--wrap=hypot
-    CFLAGS += -Wl,--wrap=cbrt
-    CFLAGS += -Wl,--wrap=fmod
-    CFLAGS += -Wl,--wrap=drem
-    CFLAGS += -Wl,--wrap=remainder
-    CFLAGS += -Wl,--wrap=remquo
-    CFLAGS += -Wl,--wrap=expm1
-    CFLAGS += -Wl,--wrap=log1p
-    CFLAGS += -Wl,--wrap=fma
-
-    # bit operation intrinsics
-    OPT_DEFS += -DPICO_BITS_IN_RAM=1
-
-    CFLAGS += -Wl,--wrap=__clzsi2
-    CFLAGS += -Wl,--wrap=__clzsi2
-    CFLAGS += -Wl,--wrap=__clzdi2
-    CFLAGS += -Wl,--wrap=__ctzsi2
-    CFLAGS += -Wl,--wrap=__ctzdi2
-    CFLAGS += -Wl,--wrap=__popcountsi2
-    CFLAGS += -Wl,--wrap=__popcountdi2
-    CFLAGS += -Wl,--wrap=__clz
-    CFLAGS += -Wl,--wrap=__clzl
-    CFLAGS += -Wl,--wrap=__clzsi2
-    CFLAGS += -Wl,--wrap=__clzll
-
-    # integer division intrinsics
-    OPT_DEFS += -DPICO_DIVIDER_IN_RAM=1
-    OPT_DEFS += -DPICO_DIVIDER_DISABLE_INTERRUPTS=1
-
-    CFLAGS += -Wl,--wrap=__aeabi_idiv
-    CFLAGS += -Wl,--wrap=__aeabi_idivmod
-    CFLAGS += -Wl,--wrap=__aeabi_ldivmod
-    CFLAGS += -Wl,--wrap=__aeabi_uidiv
-    CFLAGS += -Wl,--wrap=__aeabi_uidivmod
-    CFLAGS += -Wl,--wrap=__aeabi_uldivmod
-
-    # 64bit integer intrinsics
-    OPT_DEFS += -DPICO_INT64_OPS_IN_RAM=1
-
-    CFLAGS += -Wl,--wrap=__aeabi_lmul
-
-    # malloc and friends functions
-    OPT_DEFS += -DPICO_USE_MALLOC_MUTEX=0
-    OPT_DEFS += -DPICO_DEBUG_MALLOC=0
-    OPT_DEFS ?= -DPICO_MALLOC_PANIC=0
-
-    CFLAGS += -Wl,--wrap=malloc
-    CFLAGS += -Wl,--wrap=calloc
-    CFLAGS += -Wl,--wrap=free
-
-    # memory operation intrinsics
-    OPT_DEFS += -DPICO_MEM_IN_RAM=1
-
-    CFLAGS += -Wl,--wrap=memcpy
-    CFLAGS += -Wl,--wrap=memset
-    CFLAGS += -Wl,--wrap=__aeabi_memcpy
-    CFLAGS += -Wl,--wrap=__aeabi_memset
-    CFLAGS += -Wl,--wrap=__aeabi_memcpy4
-    CFLAGS += -Wl,--wrap=__aeabi_memset4
-    CFLAGS += -Wl,--wrap=__aeabi_memcpy8
-    CFLAGS += -Wl,--wrap=__aeabi_memset8
-
-    PLATFORM_SRC += $(PICOSDKINTRINSICSSRC)
-    EXTRAINCDIRS += $(PICOSDKINTRINSICSINC)
-endif
+PLATFORM_SRC += $(PICOSDKINTRINSICSSRC)
+EXTRAINCDIRS += $(PICOSDKINTRINSICSINC)

From d43045e845ba3e3179c3c358f96103752b56648b Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Tue, 4 Oct 2022 18:00:01 -0400
Subject: [PATCH 549/959] define `oled_write_ln_P` as `oled_write_ln` for
 non-AVR MCUs (#18589)

---
 drivers/oled/oled_driver.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
index 918b837f07..e9b8c5b4e8 100644
--- a/drivers/oled/oled_driver.h
+++ b/drivers/oled/oled_driver.h
@@ -260,7 +260,7 @@ void oled_write_ln_P(const char *data, bool invert);
 void oled_write_raw_P(const char *data, uint16_t size);
 #else
 #    define oled_write_P(data, invert) oled_write(data, invert)
-#    define oled_write_ln_P(data, invert) oled_write(data, invert)
+#    define oled_write_ln_P(data, invert) oled_write_ln(data, invert)
 #    define oled_write_raw_P(data, size) oled_write_raw(data, size)
 #endif // defined(__AVR__)
 

From 8b824a802929b40de075c24d21fae3d447506c56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Oct 2022 09:08:59 +1100
Subject: [PATCH 550/959] Bump anothrNick/github-tag-action from 1.51.0 to
 1.52.0 (#18590)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto_tag.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index 1ec3c39236..b858d492a6 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.51.0
+      uses: anothrNick/github-tag-action@1.52.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

From 09d3e2771099ff1ca7e7bd8882644eb2b2807763 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 5 Oct 2022 09:19:12 +1100
Subject: [PATCH 551/959] Refactor more host code (programmable button &
 digitizer) (#18565)

---
 tmk_core/protocol/chibios/chibios.c  |  4 +--
 tmk_core/protocol/chibios/usb_main.c |  9 ++-----
 tmk_core/protocol/host.c             | 38 +++++++++++++++-------------
 tmk_core/protocol/host.h             |  1 -
 tmk_core/protocol/host_driver.h      |  2 +-
 tmk_core/protocol/lufa/lufa.c        | 13 +++-------
 tmk_core/protocol/vusb/vusb.c        | 13 +++-------
 7 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 024160a925..82ade4259b 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -59,11 +59,9 @@ uint8_t keyboard_leds(void);
 void    send_keyboard(report_keyboard_t *report);
 void    send_mouse(report_mouse_t *report);
 void    send_extra(uint8_t report_id, uint16_t data);
-void    send_programmable_button(uint32_t data);
-void    send_digitizer(report_digitizer_t *report);
 
 /* host struct */
-host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra, send_programmable_button};
+host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
 
 #ifdef VIRTSER_ENABLE
 void virtser_task(void);
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 3e64ceab19..3fd34a604e 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -970,7 +970,7 @@ void send_extra(uint8_t report_id, uint16_t data) {
 #endif
 }
 
-void send_programmable_button(uint32_t data) {
+void send_programmable_button(report_programmable_button_t *report) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
@@ -988,13 +988,8 @@ void send_programmable_button(uint32_t data) {
             return;
         }
     }
-    static report_programmable_button_t report = {
-        .report_id = REPORT_ID_PROGRAMMABLE_BUTTON,
-    };
 
-    report.usage = data;
-
-    usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report));
+    usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)report, sizeof(report_programmable_button_t));
     osalSysUnlock();
 #endif
 }
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 7b051a881b..e6c12d8a36 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -16,13 +16,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <stdint.h>
-//#include <avr/interrupt.h>
 #include "keyboard.h"
 #include "keycode.h"
 #include "host.h"
 #include "util.h"
 #include "debug.h"
-#include "digitizer.h"
+
+#ifdef DIGITIZER_ENABLE
+#    include "digitizer.h"
+#endif
 
 #ifdef JOYSTICK_ENABLE
 #    include "joystick.h"
@@ -39,9 +41,8 @@ extern keymap_config_t keymap_config;
 #endif
 
 static host_driver_t *driver;
-static uint16_t       last_system_report              = 0;
-static uint16_t       last_consumer_report            = 0;
-static uint32_t       last_programmable_button_report = 0;
+static uint16_t       last_system_report   = 0;
+static uint16_t       last_consumer_report = 0;
 
 void host_set_driver(host_driver_t *d) {
     driver = d;
@@ -200,13 +201,12 @@ void host_joystick_send(joystick_t *joystick) {
 
 __attribute__((weak)) void send_joystick(report_joystick_t *report) {}
 
+#ifdef DIGITIZER_ENABLE
 void host_digitizer_send(digitizer_t *digitizer) {
-    if (!driver) return;
-
     report_digitizer_t report = {
-#ifdef DIGITIZER_SHARED_EP
+#    ifdef DIGITIZER_SHARED_EP
         .report_id = REPORT_ID_DIGITIZER,
-#endif
+#    endif
         .tip     = digitizer->tipswitch & 0x1,
         .inrange = digitizer->inrange & 0x1,
         .x       = (uint16_t)(digitizer->x * 0x7FFF),
@@ -215,16 +215,22 @@ void host_digitizer_send(digitizer_t *digitizer) {
 
     send_digitizer(&report);
 }
+#endif
 
 __attribute__((weak)) void send_digitizer(report_digitizer_t *report) {}
 
-void host_programmable_button_send(uint32_t report) {
-    if (report == last_programmable_button_report) return;
-    last_programmable_button_report = report;
+#ifdef PROGRAMMABLE_BUTTON_ENABLE
+void host_programmable_button_send(uint32_t data) {
+    report_programmable_button_t report = {
+        .report_id = REPORT_ID_PROGRAMMABLE_BUTTON,
+        .usage     = data,
+    };
 
-    if (!driver) return;
-    (*driver->send_programmable_button)(report);
+    send_programmable_button(&report);
 }
+#endif
+
+__attribute__((weak)) void send_programmable_button(report_programmable_button_t *report) {}
 
 uint16_t host_last_system_report(void) {
     return last_system_report;
@@ -233,7 +239,3 @@ uint16_t host_last_system_report(void) {
 uint16_t host_last_consumer_report(void) {
     return last_consumer_report;
 }
-
-uint32_t host_last_programmable_button_report(void) {
-    return last_programmable_button_report;
-}
diff --git a/tmk_core/protocol/host.h b/tmk_core/protocol/host.h
index 6b15f0d0c1..08bd498d38 100644
--- a/tmk_core/protocol/host.h
+++ b/tmk_core/protocol/host.h
@@ -51,7 +51,6 @@ void    host_programmable_button_send(uint32_t data);
 
 uint16_t host_last_system_report(void);
 uint16_t host_last_consumer_report(void);
-uint32_t host_last_programmable_button_report(void);
 
 #ifdef __cplusplus
 }
diff --git a/tmk_core/protocol/host_driver.h b/tmk_core/protocol/host_driver.h
index ae6e40ddc3..bb4dcdd877 100644
--- a/tmk_core/protocol/host_driver.h
+++ b/tmk_core/protocol/host_driver.h
@@ -28,8 +28,8 @@ typedef struct {
     void (*send_keyboard)(report_keyboard_t *);
     void (*send_mouse)(report_mouse_t *);
     void (*send_extra)(uint8_t, uint16_t);
-    void (*send_programmable_button)(uint32_t);
 } host_driver_t;
 
 void send_joystick(report_joystick_t *report);
 void send_digitizer(report_digitizer_t *report);
+void send_programmable_button(report_programmable_button_t *report);
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 6012d96fd5..869ed71d76 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -61,10 +61,6 @@
 extern keymap_config_t keymap_config;
 #endif
 
-#ifdef AUDIO_ENABLE
-#    include "audio.h"
-#endif
-
 #ifdef VIRTSER_ENABLE
 #    include "virtser.h"
 #endif
@@ -89,8 +85,7 @@ static uint8_t keyboard_leds(void);
 static void    send_keyboard(report_keyboard_t *report);
 static void    send_mouse(report_mouse_t *report);
 static void    send_extra(uint8_t report_id, uint16_t data);
-static void    send_programmable_button(uint32_t data);
-host_driver_t  lufa_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra, send_programmable_button};
+host_driver_t  lufa_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
 
 #ifdef VIRTSER_ENABLE
 // clang-format off
@@ -676,11 +671,9 @@ static void send_extra(uint8_t report_id, uint16_t data) {
 #endif
 }
 
-static void send_programmable_button(uint32_t data) {
+void send_programmable_button(report_programmable_button_t *report) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-    static report_programmable_button_t r;
-    r = (report_programmable_button_t){.report_id = REPORT_ID_PROGRAMMABLE_BUTTON, .usage = data};
-    send_report(&r, sizeof(r));
+    send_report(report, sizeof(report_programmable_button_t));
 #endif
 }
 
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 013d637b6f..8456d2c5ab 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -225,9 +225,8 @@ static uint8_t keyboard_leds(void);
 static void    send_keyboard(report_keyboard_t *report);
 static void    send_mouse(report_mouse_t *report);
 static void    send_extra(uint8_t report_id, uint16_t data);
-static void    send_programmable_button(uint32_t data);
 
-static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_extra, send_programmable_button};
+static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
 
 host_driver_t *vusb_driver(void) {
     return &driver;
@@ -292,16 +291,10 @@ void send_digitizer(report_digitizer_t *report) {
 #endif
 }
 
-static void send_programmable_button(uint32_t data) {
+void send_programmable_button(report_programmable_button_t *report) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-    static report_programmable_button_t report = {
-        .report_id = REPORT_ID_PROGRAMMABLE_BUTTON,
-    };
-
-    report.usage = data;
-
     if (usbInterruptIsReadyShared()) {
-        usbSetInterruptShared((void *)&report, sizeof(report));
+        usbSetInterruptShared((void *)report, sizeof(report_programmable_button_t));
     }
 #endif
 }

From 64b1ed45507a15d5594b1f90b936c2096918f5a4 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 4 Oct 2022 15:24:22 -0700
Subject: [PATCH 552/959] Fix Per Key LED Indicator Callbacks  (#18450)

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/feature_led_matrix.md                    |   7 +-
 docs/feature_rgb_matrix.md                    |  24 +++-
 keyboards/4pplet/perk60_iso/rev_a/rev_a.c     |   8 +-
 keyboards/abatskeyboardclub/nayeon/nayeon.c   |   7 +-
 .../tetromino/keymaps/indicators/keymap.c     |   5 +-
 keyboards/axolstudio/yeti/hotswap/hotswap.c   |  65 +++++-----
 keyboards/bandominedoni/keymaps/led/keymap.c  |   3 +-
 .../bandominedoni/keymaps/lednotg/keymap.c    |   3 +-
 keyboards/bandominedoni/keymaps/via/keymap.c  |   3 +-
 .../the_mark/keymaps/stanrc85/keymap.c        |  27 ++--
 keyboards/canary/canary60rgb/canary60rgb.c    |   7 +-
 keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c |   6 +-
 keyboards/capsunlocked/cu80/v2_iso/v2_iso.c   |   6 +-
 keyboards/cherrybstudio/cb87rgb/cb87rgb.c     |   7 +-
 keyboards/chromatonemini/keymaps/led/keymap.c |   3 +-
 .../chromatonemini/keymaps/party/keymap.c     |   3 +-
 keyboards/chromatonemini/keymaps/via/keymap.c |   3 +-
 keyboards/crkbd/keymaps/bermeo/keymap.c       |  13 +-
 keyboards/crkbd/keymaps/rmeli/keymap.c        |   5 +-
 keyboards/crkbd/keymaps/rpbaptist/keymap.c    |   3 +-
 keyboards/crkbd/keymaps/toinux/rgb.c          |   3 +-
 .../drop/sense75/keymaps/default/keymap.c     |   3 +-
 .../drop/sense75/keymaps/default_md/keymap.c  |   3 +-
 .../dosa40rgb/keymaps/default/keymap.c        |  27 ++--
 keyboards/durgod/dgk6x/dgk6x.c                |  16 +--
 keyboards/dztech/dz60rgb/dz60rgb.c            |  17 +--
 .../dz60rgb/keymaps/matthewrobo/keymap.c      |   4 +-
 .../dztech/dz60rgb/keymaps/mekanist/keymap.c  |   4 +-
 .../dztech/dz60rgb/keymaps/perseid/keymap.c   |   4 +-
 .../dztech/dz60rgb/keymaps/piv3rt/keymap.c    |   3 +-
 .../dztech/dz60rgb/keymaps/xunz/keymap.c      |  35 ++---
 keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c  |  17 +--
 .../dztech/dz60rgb_ansi/keymaps/kuru/keymap.c |   3 +-
 .../dz60rgb_ansi/keymaps/muralisc/keymap.c    |   4 +-
 keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c    |  17 +--
 keyboards/dztech/dz64rgb/dz64rgb.c            |  12 +-
 .../dz65rgb/keymaps/catrielmuller/keymap.c    |   3 +-
 .../dztech/dz65rgb/keymaps/drootz/keymap.c    |   3 +-
 .../dz65rgb/keymaps/matthewrobo/keymap.c      |  14 +-
 .../dztech/dz65rgb/keymaps/yuannan/keymap.c   |  36 +++---
 keyboards/dztech/dz65rgb/v1/v1.c              |   7 +-
 keyboards/dztech/dz65rgb/v2/v2.c              |   7 +-
 keyboards/dztech/dz65rgb/v3/v3.c              |  94 +++++++-------
 keyboards/evyd13/atom47/rev5/rev5.c           |   6 +-
 keyboards/feker/ik75/keymaps/bkzshen/keymap.c |   3 +-
 keyboards/feker/ik75/keymaps/default/keymap.c |   3 +-
 keyboards/feker/ik75/keymaps/via/keymap.c     |   3 +-
 keyboards/giabalanai/keymaps/party/keymap.c   |   3 +-
 .../gk6/keymaps/12x5/keymap.c                 |   4 +-
 .../gk6/keymaps/1x2u/keymap.c                 |   3 +-
 .../gk6/keymaps/default/keymap.c              |   4 +-
 .../pro/rev1/ansi/keymaps/andrebrait/keymap.c |   3 +-
 .../rev1/ansi/keymaps/andrewcharnley/keymap.c |   3 +-
 .../pro/rev1/ansi/keymaps/benschaeff/keymap.c |   3 +-
 .../pro/rev1/ansi/keymaps/byungyoonc/keymap.c |   3 +-
 .../pro/rev1/ansi/keymaps/cedrikl/keymap.c    |   3 +-
 .../pro/rev1/ansi/keymaps/gigahawk/keymap.c   |   3 +-
 .../pro/rev1/ansi/keymaps/gourdo1/keymap.c    |   9 +-
 .../pro/rev1/ansi/keymaps/hachetman/keymap.c  |   3 +-
 .../pro/rev1/ansi/keymaps/jonavin/keymap.c    |  11 +-
 .../rev1/ansi/keymaps/lalitmaganti/keymap.c   |   5 +-
 .../gmmk/pro/rev1/ansi/keymaps/macos/keymap.c |   3 +-
 .../pro/rev1/ansi/keymaps/mattgauf/keymap.c   |   3 +-
 .../gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c |   3 +-
 .../pro/rev1/ansi/keymaps/mike1808/mike1808.c |   3 +-
 .../keymaps/mike1808/rgb_matrix_ledmaps.c     |  12 +-
 .../keymaps/mike1808/rgb_matrix_ledmaps.h     |   4 +-
 .../pro/rev1/ansi/keymaps/paddlegame/keymap.c |  17 +--
 .../rev1/ansi/keymaps/stickandgum/keymap.c    |   3 +-
 .../gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c |  11 +-
 .../pro/rev1/iso/keymaps/chofstede/keymap.c   |   3 +-
 .../pro/rev1/iso/keymaps/gourdo1/keymap.c     |  11 +-
 .../pro/rev1/iso/keymaps/jonavin/keymap.c     |   3 +-
 .../gopolar/gg86/keymaps/bongocat/keymap.c    |   3 +-
 .../gopolar/gg86/keymaps/default/keymap.c     |   3 +-
 .../gg86/keymaps/horrortroll/keymap_stuff.h   |   5 +-
 keyboards/gopolar/gg86/keymaps/via/keymap.c   |   3 +-
 .../3x5_3/keymaps/dlford/keymap.c             |   3 +-
 .../hnah108/keymaps/default/keymap.c          |   3 +-
 .../handwired/hnah40rgb/keymaps/ansi/keymap.c |   6 +-
 .../hnah40rgb/keymaps/default/keymap.c        |  27 ++--
 .../devil68_pro/keymaps/default/keymap.c      |   3 +-
 .../devil68_pro/keymaps/via/keymap.c          |   3 +-
 .../keymaps/default/keymap_stuff.h            |   5 +-
 .../handwired_k552/keymaps/via/keymap_stuff.h |   5 +-
 keyboards/idobao/id63/keymaps/idobao/keymap.c |   3 +-
 keyboards/idobao/id67/keymaps/idobao/keymap.c |   3 +-
 .../id67/keymaps/vinorodrigues/keymap.c       |  19 +--
 .../id80/v3/ansi/keymaps/idobao/keymap.c      |   3 +-
 .../idobao/id87/v2/keymaps/idobao/keymap.c    |   3 +-
 keyboards/inett_studio/sqx/hotswap/hotswap.c  |   7 +-
 .../inett_studio/sqx/universal/universal.c    |   7 +-
 keyboards/jadookb/jkb65/jkb65.c               |   7 +-
 keyboards/kbdfans/baguette66/rgb/rgb.c        |  10 +-
 keyboards/kbdfans/bella/rgb/rgb.c             |  30 ++---
 keyboards/kbdfans/bella/rgb_iso/rgb_iso.c     |  33 ++---
 keyboards/kbdfans/boop65/rgb/rgb.c            | 121 +++++++++---------
 .../kbd67/mkiirgb/keymaps/dnsnrk/keymap.c     |   3 +-
 .../kbd67/mkiirgb/keymaps/jonavin/keymap.c    |  10 +-
 keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c       |   6 +-
 keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c       |   7 +-
 keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c       |   7 +-
 keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c       |  15 ++-
 .../kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c   |  12 +-
 keyboards/kbdfans/kbd75rgb/kbd75rgb.c         |  16 ++-
 keyboards/kbdfans/maja/maja.c                 |  44 +++----
 keyboards/kbdfans/odin/rgb/rgb.c              |  25 ++--
 .../keebio/iris/keymaps/two_knob/keymap.c     |  11 +-
 .../keybee/keybee65/keymaps/default/keymap.c  |  11 +-
 .../keybee/keybee65/keymaps/via/keymap.c      |  11 +-
 .../model01/keymaps/default/keymap.c          |   9 +-
 keyboards/keychron/q0/q0.c                    |   6 +-
 .../keymaps/gtg465x/rgb_matrix_user.c         |   3 +-
 .../keymaps/mkillewald/rgb_matrix_user.c      |   9 +-
 .../rev_0100/keymaps/teimor/rgb_matrix_user.c |   3 +-
 .../keymaps/kubahorak/rgb_matrix_user.c       |   3 +-
 .../keymaps/mkillewald_iso/rgb_matrix_user.c  |   9 +-
 .../keymaps/ladduro/rgb_matrix_user.c         |   5 +-
 .../q2/rev_0113/keymaps/dhertz/keymap.c       |   5 +-
 .../bm40hsrgb/keymaps/coffee/keymap.c         |  13 +-
 .../kprepublic/bm40hsrgb/keymaps/dan/keymap.c |   4 +-
 .../bm40hsrgb/keymaps/gabustoledo/keymap.c    |  32 ++---
 .../bm40hsrgb/keymaps/signynt/keymap.c        |   3 +-
 .../bm40hsrgb/keymaps/signynt_2_loud/keymap.c |   3 +-
 .../keymaps/signynt_2_quiet/keymap.c          |   3 +-
 keyboards/kprepublic/bm60hsrgb/rev2/rev2.c    |   7 +-
 keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c |   7 +-
 keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c |   7 +-
 .../kprepublic/bm60hsrgb_iso/rev2/rev2.c      |   7 +-
 .../rev1/keymaps/david/keymap.c               |  35 ++---
 .../rev1/keymaps/ipetepete/keymap.c           |  31 ++---
 .../kprepublic/bm60hsrgb_poker/rev2/rev2.c    |   7 +-
 .../bm65hsrgb_iso/keymaps/p4yne/keymap.c      |  21 +--
 .../rev1/keymaps/deadolus/keymap.c            |   3 +-
 .../kprepublic/bm65hsrgb_iso/rev1/rev1.c      |   7 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/keymap.c |   3 +-
 keyboards/kprepublic/bm68hsrgb/rev1/rev1.c    |   7 +-
 keyboards/kprepublic/bm68hsrgb/rev2/rev2.c    |  11 +-
 keyboards/kprepublic/bm80v2/bm80v2.c          |  82 ++++++------
 keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c  |  82 ++++++------
 .../bm980hsrgb/keymaps/peepeetee/keymap.c     |   3 +-
 .../latincompass/latin60rgb/latin60rgb.c      |  41 +++---
 .../linworks/fave65h/keymaps/default/keymap.c |   3 +-
 .../default_65_ansi_blocker_wkl/keymap.c      |   3 +-
 .../keymap.c                                  |   3 +-
 .../linworks/fave65h/keymaps/via/keymap.c     |   3 +-
 .../linworks/fave84h/keymaps/default/keymap.c |  31 ++---
 .../linworks/fave84h/keymaps/via/keymap.c     |  59 ++++-----
 .../linworks/fave87h/keymaps/default/keymap.c |  31 ++---
 .../linworks/fave87h/keymaps/via/keymap.c     |  59 ++++-----
 keyboards/massdrop/alt/config_led.c           |   6 +-
 .../massdrop/alt/keymaps/pregame/keymap.c     |   3 +-
 keyboards/massdrop/ctrl/config_led.c          |   6 +-
 .../ctrl/keymaps/endgame/config_led.c         |   3 +-
 .../massdrop/ctrl/keymaps/endgame/keymap.c    |   3 +-
 .../ctrl/keymaps/matthewrobo/config_led.c     |   7 +-
 .../ctrl/keymaps/matthewrobo/keymap.c         |   7 +-
 .../ctrl/keymaps/xanimos/config_led.c         |  31 ++---
 .../massdrop/ctrl/keymaps/xanimos/keymap.c    |  33 ++---
 .../mechlovin/adelais/rgb_led/rev2/rev2.c     |  30 +++--
 .../mechlovin/adelais/rgb_led/rev3/rev3.c     |  28 ++--
 .../mechlovin/delphine/rgb_led/rgb_led.c      |  26 ++--
 keyboards/mechlovin/hannah60rgb/rev1/rev1.c   |  31 +++--
 keyboards/mechlovin/hannah60rgb/rev2/rev2.c   |  54 ++++----
 .../mechlovin/infinity87/rgb_rev1/rgb_rev1.c  |  36 ++----
 keyboards/miller/gm862/gm862.c                |  27 ++--
 keyboards/ml/gas75/keymaps/default/keymap.c   |   3 +-
 keyboards/ml/gas75/keymaps/via/keymap.c       |   3 +-
 keyboards/monstargear/xo87/rgb/rgb.c          |  15 +--
 .../m63_rgb/keymaps/default/keymap.c          |   3 +-
 .../mss_studio/m63_rgb/keymaps/via/keymap.c   |   3 +-
 .../m64_rgb/keymaps/default/keymap.c          |   3 +-
 .../mss_studio/m64_rgb/keymaps/via/keymap.c   |   3 +-
 keyboards/mt/mt64rgb/keymaps/default/keymap.c |   3 +-
 keyboards/mt/mt64rgb/keymaps/via/keymap.c     |   3 +-
 keyboards/mt/mt84/keymaps/default/keymap.c    |   3 +-
 .../keymaps/horrortroll/keymap_stuff.h        |   5 +-
 .../mw65_rgb/keymaps/thearesia/keymap.c       |   3 +-
 .../mwstudio/mw65_rgb/keymaps/via/keymap.c    |   3 +-
 .../mwstudio/mw75r2/keymaps/via/keymap.c      |   3 +-
 keyboards/opendeck/32/rev1/rev1.c             |  10 --
 keyboards/owlab/voice65/hotswap/hotswap.c     |  71 +++++-----
 keyboards/owlab/voice65/soldered/soldered.c   |  71 +++++-----
 .../planck/keymaps/charlesrocket/keymap.c     |   3 +-
 keyboards/planck/keymaps/gunp/keymap.c        |   3 +-
 keyboards/planck/keymaps/oryx/keymap.c        |   3 +-
 keyboards/planck/keymaps/tom/keymap.c         |   3 +-
 keyboards/planck/keymaps/tylerwince/keymap.c  |   3 +-
 .../playkbtw/pk64rgb/keymaps/default/keymap.c |   5 +-
 .../playkbtw/pk64rgb/keymaps/via/keymap.c     |   5 +-
 .../rskeys100/keymaps/default/keymap.c        |   3 +-
 keyboards/saevus/cor_tkl/cor_tkl.c            |   8 +-
 keyboards/terrazzo/terrazzo.c                 |  14 +-
 keyboards/tkc/portico/portico.c               |  21 ++-
 keyboards/tkc/portico68v2/portico68v2.c       |   6 +-
 keyboards/tkc/portico75/portico75.c           |  11 +-
 keyboards/work_louder/work_board/work_board.c |   6 +-
 keyboards/xbows/knight/knight.c               |   7 +-
 keyboards/xbows/knight_plus/knight_plus.c     |   6 +-
 keyboards/xbows/nature/nature.c               |  16 +--
 keyboards/xbows/numpad/numpad.c               |   6 +-
 keyboards/xbows/ranger/ranger.c               |   6 +-
 keyboards/xbows/woody/woody.c                 |  69 +++++-----
 .../xelus/valor/rev2/keymaps/default/keymap.c |   3 +-
 .../xelus/valor/rev2/keymaps/via/keymap.c     |   3 +-
 keyboards/yandrstudio/nz64/nz64.c             |   6 +-
 keyboards/yandrstudio/nz67v2/nz67v2.c         |   6 +-
 .../65_ansi_blocker/brandonschlack/keymap.c   |   4 +-
 .../brandonschlack-split/keymap.c             |   3 +-
 layouts/community/ortho_4x12/jarred/keymap.c  |   3 +-
 quantum/led_matrix/led_matrix.c               |  16 ++-
 quantum/led_matrix/led_matrix.h               |   8 +-
 quantum/rgb_matrix/rgb_matrix.c               |  18 ++-
 quantum/rgb_matrix/rgb_matrix.h               |   8 +-
 users/bbaserdem/bb-rgb.c                      |  15 +--
 users/bbaserdem/bb-rgb.h                      |   2 +-
 users/curry/rgb_matrix_user.c                 |   3 +-
 users/drashna/rgb/rgb_matrix_stuff.c          |   9 +-
 218 files changed, 1430 insertions(+), 1271 deletions(-)

diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index fd87012e69..280db2a383 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -441,8 +441,12 @@ Where `28` is an unused index from `eeconfig.h`.
 
 If you want to set custom indicators, such as an LED for Caps Lock, or layer indication, you can use the `led_matrix_indicators_kb` or `led_matrix_indicators_user` function for that: 
 ```c
-void led_matrix_indicators_kb(void) {
+bool led_matrix_indicators_kb(void) {
+    if (!led_matrix_indicators_user()) {
+        return false;
+    }
     led_matrix_set_value(index, value);
+    return true;
 }
 ```
 
@@ -451,5 +455,6 @@ In addition, there are the advanced indicator functions.  These are aimed at tho
 ```c
 void led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     LED_MATRIX_INDICATOR_SET_VALUE(index, value);
+    return false;
 }
 ```
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 361b981697..796f22c861 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -888,16 +888,21 @@ Where `28` is an unused index from `eeconfig.h`.
 
 If you want to set custom indicators, such as an LED for Caps Lock, or layer indication, you can use the `rgb_matrix_indicators_kb` or `rgb_matrix_indicators_user` function for that:
 ```c
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     rgb_matrix_set_color(index, red, green, blue);
+    return true;
 }
 ```
 
 In addition, there are the advanced indicator functions.  These are aimed at those with heavily customized displays, where rendering every LED per cycle is expensive.  Such as some of the "drashna" layouts.  This includes a special macro to help make this easier to use: `RGB_MATRIX_INDICATOR_SET_COLOR(i, r, g, b)`.
 
 ```c
-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) {
     RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+    return false;
 }
 ```
 
@@ -905,7 +910,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
 Caps Lock indicator on alphanumeric flagged keys:
 ```c
-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) {
     if (host_keyboard_led_state().caps_lock) {
         for (uint8_t i = led_min; i <= led_max; i++) {
             if (g_led_config.flags[i] & LED_FLAG_KEYLIGHT) {
@@ -913,12 +918,13 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
         }
     }
+    return false;
 }
 ```
 
 Layer indicator on all keys:
 ```c
-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) {
     for (uint8_t i = led_min; i <= led_max; i++) {
         switch(get_highest_layer(layer_state|default_layer_state)) {
             case 2:
@@ -931,12 +937,13 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
                 break;
         }
     }
+    return false;
 }
 ```
 
 Layer indicator only on keys with configured keycodes:
 ```c
-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) {
     if (get_highest_layer(layer_state) > 0) {
         uint8_t layer = get_highest_layer(layer_state);
 
@@ -951,6 +958,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
         }
     }
+    return false;
 }
 ```
 
@@ -961,7 +969,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 This example sets the modifiers to be a specific color based on the layer state.  You can use a switch case here, instead, if you would like.  This uses HSV and then converts to RGB, because this allows the brightness to be limited (important when using the WS2812 driver).
 
 ```c
-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) {
     HSV hsv = {0, 255, 255};
 
     if (layer_state_is(layer_state, 2)) {
@@ -980,18 +988,20 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         }
     }
+    return false;
 }
 ```
 
 If you want to indicate a Host LED status (caps lock, num lock, etc), you can use something like this to light up the caps lock key:
 
 ```c
-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) {
     if (host_keyboard_led_state().caps_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(5, 255, 255, 255); // assuming caps lock is at led #5
     } else {
         RGB_MATRIX_INDICATOR_SET_COLOR(5, 0, 0, 0);
     }
+    return false;
 }
 ```
 
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
index 72446d39be..814a8f95d4 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
@@ -114,7 +114,11 @@ led_config_t g_led_config = {
     }
 };
 
-__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
+
     if (host_keyboard_led_state().caps_lock && CAPS_LOCK_ENABLE) {
         for (uint8_t i = led_min; i <= led_max; i++) {
             if (g_led_config.flags[i] & CAPS_LED_GROUP) {
@@ -122,5 +126,7 @@ __attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min,
             }
         }
     }
+
+    return true;
 }
 #endif
diff --git a/keyboards/abatskeyboardclub/nayeon/nayeon.c b/keyboards/abatskeyboardclub/nayeon/nayeon.c
index 6f367d3ed6..f4c17966c9 100644
--- a/keyboards/abatskeyboardclub/nayeon/nayeon.c
+++ b/keyboards/abatskeyboardclub/nayeon/nayeon.c
@@ -32,7 +32,10 @@ led_config_t g_led_config = {{
     LED_FLAG_INDICATOR, LED_FLAG_INDICATOR
 }};
 
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
     if (!host_keyboard_led_state().caps_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
     }
@@ -40,5 +43,5 @@ void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
         RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
     }
 
-    rgb_matrix_indicators_advanced_user(led_min, led_max);
+    return true;
 }
diff --git a/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
index 8f56c41be6..17d8386089 100644
--- a/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
+++ b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
@@ -68,7 +68,7 @@ void keyboard_post_init_user(void) {
 };
 
 // Custom RGB indicator behaviour:
-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) {
     uint8_t led_processed_count = 0;
     for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
         for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
@@ -115,10 +115,11 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
                                 break;
                             default:
                                 break;
-                        }   
+                        }
                     }
                 }
             }
         }
     }
+    return false;
 }
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index a8ccf7fc43..9d5efc208d 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -21,20 +21,20 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, B_1,  A_1,  C_1 },
     { 0, B_2,  A_2,  C_2 },
     { 0, B_3,  A_3,  C_3 },
-    { 0, B_4,  A_4,  C_4 },  
-    { 0, B_5,  A_5,  C_5 },  
-    { 0, B_6,  A_6,  C_6 },   
-    { 0, B_7,  A_7,  C_7 }, 
-    { 0, B_8,  A_8,  C_8 },  
-    { 0, B_9,  A_9,  C_9 },  
-    { 0, B_10, A_10, C_10 },  
-    { 0, B_11, A_11, C_11 }, 
-    { 0, B_12, A_12, C_12 },     
-    { 0, B_13, A_13, C_13 },                          
+    { 0, B_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, E_1,  D_1,  F_1 },        
+
+    { 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 },
@@ -46,13 +46,13 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 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_13, D_13, F_13 },
+    { 0, E_14, D_14, F_14 },
     { 0, E_15, D_15, F_15 },
-    
-    { 0, H_1,  G_1,  I_1 }, 
-    { 0, H_2,  G_2,  I_2 }, 
-    { 0, H_3,  G_3,  I_3 }, 
+
+    { 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 },
@@ -67,25 +67,25 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     { 0, K_2,  J_2,  L_2 },
     { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },    
+    { 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_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_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_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, 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, K_15, J_15, L_15 },
 };
 
 led_config_t g_led_config = {
@@ -102,7 +102,7 @@ led_config_t g_led_config = {
         {16,48},{32,48},{48,48},{64,48},{80,48},{96,48},{112,48},{128,48},{144,48},{160,48},{176,48},{192,48},{224,48},
         {16,64},{48,64},{80,64},{96,64},{128,64},{160,64},{224,64}
     }, {
-        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, 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,    1,
            1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
@@ -110,9 +110,12 @@ led_config_t g_led_config = {
     }
 };
 #endif
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 8659697a91..7f43d65d22 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
         uint8_t layer = get_highest_layer(layer_state);
         switch (layer) {
@@ -250,5 +250,6 @@ void rgb_matrix_indicators_user(void) {
                 break;
         }
     }
+    return false;
 }
 #endif
diff --git a/keyboards/bandominedoni/keymaps/lednotg/keymap.c b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
index ba25c1d55f..43ad28040f 100644
--- a/keyboards/bandominedoni/keymaps/lednotg/keymap.c
+++ b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
@@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
         uint8_t layer = biton32(layer_state);
         switch (layer) {
@@ -250,5 +250,6 @@ void rgb_matrix_indicators_user(void) {
                 break;
         }
     }
+    return false;
 }
 #endif
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index aa668af154..2fd2f9092c 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -141,7 +141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
         uint8_t layer = get_highest_layer(layer_state);
         switch (layer) {
@@ -177,5 +177,6 @@ void rgb_matrix_indicators_user(void) {
                 break;
         }
     }
+    return false;
 }
 #endif
diff --git a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
index 0d958b883a..5b37bb6667 100644
--- a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
@@ -19,17 +19,17 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Base */
 [_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_BSPC, KC_BSPC, KC_MPLY, 
-  KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, 
-  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT, 
-  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   
+  KC_ESC,  KC_1,    KC_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_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, CA_SCLN,
+  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT,
+  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
   KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,           LT_SPCF,         LT_SPCF,        TD_TWIN, MO(_FN2_60), KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
 ),
 [_DEFAULT] = LAYOUT_all(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_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, CA_SCLN, 
-  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT, 
-  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   
+  KC_ESC,  KC_1,    KC_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_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, CA_SCLN,
+  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT,
+  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
   KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,           LT_SPCF,         LT_SPCF,        TD_TWIN, MO(_FN2_60), KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
 ),
 [_FN1_60] = LAYOUT_all(
@@ -43,24 +43,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   RGB_TOG,   RGB_MOD,     RGB_VAD,    RGB_VAI,    RGB_SAI,    RGB_HUD,    RGB_HUI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
   _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    QK_BOOT,    _______,
   _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                KC_MAKE,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,
   _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    TG(_DEFAULT)
 )
 
 };
 
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
   uint8_t layer = get_highest_layer(layer_state);
   switch (layer) {
     case _FN1_60:
-      rgb_matrix_set_color(10, 0, 0, 255); 
+      rgb_matrix_set_color(10, 0, 0, 255);
       break;
     case _FN2_60:
-      rgb_matrix_set_color(10, 255, 255, 255); 
+      rgb_matrix_set_color(10, 255, 255, 255);
       break;
     case _DEFAULT:
-      rgb_matrix_set_color(10, 0, 255, 0); 
+      rgb_matrix_set_color(10, 0, 255, 0);
       break;
     default:
       break;
@@ -68,6 +68,7 @@ void rgb_matrix_indicators_user(void) {
   if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(10, 255, 0, 0);
   }
+    return false;
 }
 
 void matrix_init_kb(void){
diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c
index c6aca13032..00e929e952 100644
--- a/keyboards/canary/canary60rgb/canary60rgb.c
+++ b/keyboards/canary/canary60rgb/canary60rgb.c
@@ -108,10 +108,13 @@ led_config_t g_led_config = {
     }
 };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c b/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
index ef920474bb..3c26c5d580 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
+++ b/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
@@ -25,13 +25,17 @@ void matrix_init_kb(void) {
 }
 
 /* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(62, 255, 255, 255);
     }
     if (host_keyboard_led_state().scroll_lock) {
         rgb_matrix_set_color(14, 255, 255, 255);
     }
+    return true;
 }
 
 /* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
diff --git a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
index 2caef36bc7..caa13cfa81 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
+++ b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
@@ -24,13 +24,17 @@ void matrix_init_kb(void) {
 }
 
 /* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(62, 255, 255, 255);
     }
     if (host_keyboard_led_state().scroll_lock) {
         rgb_matrix_set_color(14, 255, 255, 255);
     }
+    return true;
 }
 
 /* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
diff --git a/keyboards/cherrybstudio/cb87rgb/cb87rgb.c b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c
index 362a991652..6c9d30c6ef 100644
--- a/keyboards/cherrybstudio/cb87rgb/cb87rgb.c
+++ b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c
@@ -48,13 +48,16 @@ led_config_t g_led_config = { {
 
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(51, 255, 255, 255);
     }
     if (host_keyboard_led_state().scroll_lock) {
         rgb_matrix_set_color(14, 255, 255, 255);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/chromatonemini/keymaps/led/keymap.c b/keyboards/chromatonemini/keymaps/led/keymap.c
index a68ec2ad38..6d7d07cdaf 100644
--- a/keyboards/chromatonemini/keymaps/led/keymap.c
+++ b/keyboards/chromatonemini/keymaps/led/keymap.c
@@ -591,7 +591,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     // uint32_t mode = rgblight_get_mode();
 
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
@@ -691,5 +691,6 @@ void rgb_matrix_indicators_user(void) {
                 break;
         }
     }
+    return false;
 }
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/chromatonemini/keymaps/party/keymap.c b/keyboards/chromatonemini/keymaps/party/keymap.c
index 7383b81d8b..c92ed2494c 100644
--- a/keyboards/chromatonemini/keymaps/party/keymap.c
+++ b/keyboards/chromatonemini/keymaps/party/keymap.c
@@ -594,7 +594,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     // uint32_t mode = rgblight_get_mode();
 
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
@@ -694,5 +694,6 @@ void rgb_matrix_indicators_user(void) {
                 break;
         }
     }
+    return false;
 }
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c
index b4ea6e30fe..e477e1b8a5 100644
--- a/keyboards/chromatonemini/keymaps/via/keymap.c
+++ b/keyboards/chromatonemini/keymaps/via/keymap.c
@@ -245,7 +245,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     // uint32_t mode = rgblight_get_mode();
 
     if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
@@ -280,5 +280,6 @@ void rgb_matrix_indicators_user(void) {
                 break;
         }
     }
+    return false;
 }
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/crkbd/keymaps/bermeo/keymap.c b/keyboards/crkbd/keymaps/bermeo/keymap.c
index d204fd9f3f..3b3e6d0abe 100644
--- a/keyboards/crkbd/keymaps/bermeo/keymap.c
+++ b/keyboards/crkbd/keymaps/bermeo/keymap.c
@@ -8,10 +8,10 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-enum layers { 
-    _QWERTY, 
-    _LOWER, 
-    _RAISE, 
+enum layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
     _NUMP,
 };
 
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[_QWERTY] = LAYOUT
     )};
 
 //Per key lights
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 #ifdef RGB_MATRIX_ENABLE
     switch (get_highest_layer(layer_state)) {
         case _QWERTY:
@@ -179,7 +179,7 @@ void rgb_matrix_indicators_user(void) {
                     case 15:                                    // C key off
                     case 20:                                    // X key off
                     case 21:                                    // Z key off
-                    
+
                     case 26:                                    // shift key off
                     case 52 ... 53:                             // right column off
                         rgb_matrix_set_color(i, 0, 0, 0);       // off
@@ -256,6 +256,7 @@ void rgb_matrix_indicators_user(void) {
                 rgb_matrix_set_color(14, 0, 255, 0);            // Green layer active
             }
     }
+    return false;
 };
 #endif
 
diff --git a/keyboards/crkbd/keymaps/rmeli/keymap.c b/keyboards/crkbd/keymaps/rmeli/keymap.c
index f8d298bbdd..3dcd0b3ed9 100644
--- a/keyboards/crkbd/keymaps/rmeli/keymap.c
+++ b/keyboards/crkbd/keymaps/rmeli/keymap.c
@@ -29,12 +29,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //      https://github.com/foostan/crkbd/blob/main/corne-classic/doc/buildguide_en.md
 
 // Change LED color to red when CAPS LOCK is active
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(26, 255, 0, 0);
         // Only works with SPLIT_LED_STATE_ENABLE
         rgb_matrix_set_color(53, 255, 0, 0);
     }
+    return false;
 }
 
 // + ---- +
@@ -128,4 +129,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                           _______, _______, _______,   _______, _______, _______
                                       //|--------------------------|  |--------------------------|
   )
-};
\ No newline at end of file
+};
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index cdd0a5dacb..c96adfcc0b 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -342,7 +342,7 @@ void check_default_layer(uint8_t type) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
   if (
     user_config.rgb_layer_change && rgb_matrix_config.enable &&
       (!user_config.rgb_matrix_idle_anim || rgb_matrix_get_mode() != user_config.rgb_matrix_idle_mode)
@@ -370,6 +370,7 @@ void rgb_matrix_indicators_user(void) {
             }
         }
     }
+    return false;
 }
 
 void rgb_matrix_update_current_mode(uint8_t mode, uint8_t speed) {
diff --git a/keyboards/crkbd/keymaps/toinux/rgb.c b/keyboards/crkbd/keymaps/toinux/rgb.c
index 2c5de3b0a7..9a7feabad9 100644
--- a/keyboards/crkbd/keymaps/toinux/rgb.c
+++ b/keyboards/crkbd/keymaps/toinux/rgb.c
@@ -24,7 +24,7 @@ static const char nav_leds[] = {38, 43, 44, 46};
 static const char fun_leds[] = {45, 44, 37, 46, 43, 38, 47, 42, 39, 40};
 static const char mouse_leds[] = {11, 16, 17, 19};
 
-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) {
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(26, RGB_RED);
     }
@@ -65,4 +65,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             break;
 
     }
+    return false;
 }
diff --git a/keyboards/drop/sense75/keymaps/default/keymap.c b/keyboards/drop/sense75/keymaps/default/keymap.c
index 05b351f865..a9711953de 100644
--- a/keyboards/drop/sense75/keymaps/default/keymap.c
+++ b/keyboards/drop/sense75/keymaps/default/keymap.c
@@ -45,8 +45,9 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 };
 #endif
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(62, RGB_WHITE);
     }
+    return false;
 }
diff --git a/keyboards/drop/sense75/keymaps/default_md/keymap.c b/keyboards/drop/sense75/keymaps/default_md/keymap.c
index eb8b6b1f4b..cb25f5cc2d 100644
--- a/keyboards/drop/sense75/keymaps/default_md/keymap.c
+++ b/keyboards/drop/sense75/keymaps/default_md/keymap.c
@@ -107,7 +107,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(62, RGB_WHITE);
     } else if ((rgb_matrix_get_flags() & (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR)) == 0) {
@@ -133,4 +133,5 @@ void rgb_matrix_indicators_user(void) {
         rgb_matrix_set_color(55, RGB_OFF);
         rgb_matrix_set_color(59, RGB_OFF);
     }
+    return false;
 }
diff --git a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
index c01d4ac7c8..9c27225bc2 100644
--- a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
+++ b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
@@ -52,23 +52,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-void rgb_matrix_indicators_user(void)
-{
- 	if (host_keyboard_led_state().caps_lock)
-	{
-		rgb_matrix_set_color(22, 200, 200, 200);
-	}
-	if (IS_LAYER_ON(_L1))
-	{
-		rgb_matrix_set_color(35, 0, 200, 200);
-	}
-	if (IS_LAYER_ON(_L2))
-	{
-		rgb_matrix_set_color(22, 200, 0, 200);
-	}
+bool rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(22, 200, 200, 200);
+    }
+    if (IS_LAYER_ON(_L1)) {
+        rgb_matrix_set_color(35, 0, 200, 200);
+    }
+    if (IS_LAYER_ON(_L2)) {
+        rgb_matrix_set_color(22, 200, 0, 200);
+    }
+    return false;
 }
 
 void keyboard_pre_init_user(void) {
     setPinOutput(B5);
     writePinLow(B5);
-}
\ No newline at end of file
+}
diff --git a/keyboards/durgod/dgk6x/dgk6x.c b/keyboards/durgod/dgk6x/dgk6x.c
index d7e871327a..49496689f2 100644
--- a/keyboards/durgod/dgk6x/dgk6x.c
+++ b/keyboards/durgod/dgk6x/dgk6x.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 Jessica Sullivan and Don Kjer 
+/* Copyright 2021 Jessica Sullivan and Don Kjer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,14 +60,14 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
 #ifdef RGB_MATRIX_ENABLE
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(CAPS_LED, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif /* RGB_MATRIX_ENABLE */
-
-
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 0a7a2adfc6..cfefd2833d 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -93,20 +93,13 @@ led_config_t g_led_config = {
     }
 };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
index 287496e17f..3552864e8c 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
@@ -91,8 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/
 };
 
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
 	uint8_t this_led = host_keyboard_leds();
 
 	if (!g_suspend_state && rgb_matrix_config.enable) {
@@ -218,6 +217,7 @@ void rgb_matrix_indicators_user(void)
 	if (this_led & (1 << USB_LED_CAPS_LOCK)) {
 		rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	}
+    return false;
 }
 
 void matrix_init_user(void)
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index d2905af49f..efed4494ef 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -57,8 +57,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
   }
 }
 
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
 	uint8_t this_led = host_keyboard_leds();
 
 	if (!g_suspend_state && rgb_matrix_config.enable) {
@@ -151,6 +150,7 @@ void rgb_matrix_indicators_user(void)
 		rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
 		break;
 	}
+    return false;
 }
 
 
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
index 191789199a..841617e2c9 100644
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
@@ -34,8 +34,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
   }
 }
 
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
 	if (!g_suspend_state) {
 		switch (get_highest_layer(layer_state)) {
 		case _QWERTY:
@@ -113,6 +112,7 @@ void rgb_matrix_indicators_user(void)
 		rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
 		break;
 	}
+    return false;
 }
 
 
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
index b6644ed14b..4b4a4e2877 100644
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
@@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 };
 
-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) {
     led_t led_state = host_keyboard_led_state();
 
     if (led_state.caps_lock) {
@@ -227,4 +227,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x33, 0x66, 0x99);
         RGB_MATRIX_INDICATOR_SET_COLOR(26, 0x33, 0x66, 0x99);
     }
+    return false;
 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
index 1de0d2632d..25b6e4f472 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
@@ -4,34 +4,19 @@
 #define _LAYER2 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_LAYER0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 
-							KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
-							KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
-							KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2,KC_DEL), 
+	[_LAYER0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+							KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+							KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+							KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2,KC_DEL),
 							KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 	[_LAYER1] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, 
-							 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST, 
+							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+							 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST,
 							 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
-	[_LAYER2] = LAYOUT(KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_DEL, 
-								KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_PSLS, KC_PAST, QK_BOOT, 
-								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, EEP_RST, 
-								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, 
+	[_LAYER2] = LAYOUT(KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_DEL,
+								KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_PSLS, KC_PAST, QK_BOOT,
+								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, EEP_RST,
+								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS,
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
-
-void rgb_matrix_indicators_user(void) {
-}
-
-void matrix_init_user(void) {
-  //user initialization
-}
-
-void matrix_scan_user(void) {
-  //user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	  return true;
-	}
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index ea4fa429ac..475c9cc4b5 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -91,20 +91,13 @@ led_config_t g_led_config = {
     }
 };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
index 20eaed8247..7c6dd50447 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
@@ -84,7 +84,7 @@ void highlight_layer3(void){
     rgb_matrix_set_color(46, 0x00, 0x99, 0x00);
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 	  uint8_t this_led = host_keyboard_leds();
       if (!g_suspend_state) {
         switch (get_highest_layer(layer_state)) {
@@ -97,4 +97,5 @@ void rgb_matrix_indicators_user(void) {
 	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
 	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	  }
+    return false;
 }
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
index 239e4ea8ba..2c0300fe52 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
@@ -145,7 +145,7 @@ void highlight_layer3(void) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 	  uint8_t this_led = host_keyboard_leds();
       if (!g_suspend_state) {
         switch (get_highest_layer(layer_state)) {
@@ -164,5 +164,5 @@ void rgb_matrix_indicators_user(void) {
 	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
 	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	  }
-
+    return false;
 }
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index 53d0e9fa14..5ee8d1b531 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -92,20 +92,13 @@ led_config_t g_led_config = {
     }
 };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF);
     }
+    return false;
 }
 #endif
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
index e6b218fea6..4173abf542 100644
--- a/keyboards/dztech/dz64rgb/dz64rgb.c
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include "dz64rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
@@ -64,7 +64,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     { 0, B_14, A_14, C_14 },
     { 0, B_13, A_13, C_13 },
-    { 0, B_12, A_12, C_12 },    
+    { 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 },
@@ -111,11 +111,13 @@ led_config_t g_led_config = {
 };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
-
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index b85b582b39..2b45528208 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
     // CapsLock Light
     if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
@@ -239,4 +239,5 @@ void rgb_matrix_indicators_user(void) {
 
     // Show Selected Layer
     rgb_matrix_set_color(layers_leds_map[get_highest_layer(layer_state)], MAIN_COLOR[0], MAIN_COLOR[1], MAIN_COLOR[2]);
+    return false;
 }
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index 2ebbddcef7..8b9002f521 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 //**************** MATRIX SCANS *********************//
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
     #ifdef RGB_MATRIX_ENABLE
 
@@ -192,6 +192,7 @@ void rgb_matrix_indicators_user(void) {
     }
 
     #endif /* RGB_MATRIX */
+    return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index 0c7bfbbb48..c6d42c777e 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -82,8 +82,7 @@ CPS, A,   S,   D,   F,   G,   H,   J,   K,   L,   COL, QOT,  RETURN,   +
 SFT, Z,   X,   C,   V,   B,   N,   M,   COM, DOT, SLS, SHIFT,    UP,   0
 CTL, GUI, ALT,        SPACEBAR,              ALT, FN, CTL, LFT, DWN, RIT
 */
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
 	if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
 		rgb_matrix_set_color(8, 0xFF, 0xFF, 0xFF);
 	}
@@ -208,16 +207,7 @@ void rgb_matrix_indicators_user(void)
 		break;
 		}
 	}
-}
-
-void matrix_init_user(void)
-{
-	//user initialization
-}
-
-void matrix_scan_user(void)
-{
-	//user matrix
+    return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t* record)
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
index 5baf32a7e4..61cb875b8a 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
@@ -1,17 +1,17 @@
 /* Copyright 2021 Yuannan (https://github.com/yuannan)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
@@ -169,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record){
 				}
 			}
 			break;
-    } 
+    }
 
     return true;
 };
@@ -179,20 +179,21 @@ RGB get_inverted_RGB(void){
 	current_HSV.h = 255 - current_HSV.h;
 	current_HSV.s = 255;
 	current_HSV.v = 255;
-	
+
 	return hsv_to_rgb(current_HSV);
 }
 
 // Move Caps indicator to the ctrl key where it belongs
-void rgb_matrix_indicators_user(void){
+bool rgb_matrix_indicators_user(void){
 	RGB inverted_RGB = get_inverted_RGB();
     if (host_keyboard_led_state().caps_lock){
         rgb_matrix_set_color(58, inverted_RGB.r, inverted_RGB.g, inverted_RGB.b);
     }
+    return false;
 }
 
 // show coloured indicator for layers with a keybind
-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){
     uint8_t layer = get_highest_layer(layer_state);
     if (layer > 0) {
 		RGB inverted_RGB = get_inverted_RGB();
@@ -207,4 +208,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max){
             }
         }
     }
+    return false;
 }
diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c
index e0f12bb6cd..0e52a3f911 100644
--- a/keyboards/dztech/dz65rgb/v1/v1.c
+++ b/keyboards/dztech/dz65rgb/v1/v1.c
@@ -114,10 +114,13 @@ led_config_t g_led_config = {
 };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c
index f9833b2142..43629e74da 100644
--- a/keyboards/dztech/dz65rgb/v2/v2.c
+++ b/keyboards/dztech/dz65rgb/v2/v2.c
@@ -114,10 +114,13 @@ led_config_t g_led_config = {
 };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index c3562c7c5d..45cc5cb3bd 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -21,77 +21,77 @@
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW1, CS20_SW1, CS19_SW1},
     {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, 
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    
+    {0, CS21_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, 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_SW4, CS23_SW4, CS22_SW4},
     {0, CS24_SW5, CS23_SW5, CS22_SW5},
     {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, 
-    
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},     
+    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
     {0, CS15_SW2, CS14_SW2, CS13_SW2},
     {0, CS15_SW3, CS14_SW3, CS13_SW3},
     {0, CS15_SW4, CS14_SW4, CS13_SW4},
     {0, CS15_SW5, CS14_SW5, CS13_SW5},
     {0, CS15_SW6, CS14_SW6, CS13_SW6},
     {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},     
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, 
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS30_SW1, CS29_SW1, CS28_SW1},
     {0, CS30_SW2, CS29_SW2, CS28_SW2},
     {0, CS30_SW3, CS29_SW3, CS28_SW3},
     {0, CS30_SW4, CS29_SW4, CS28_SW4},
     {0, CS30_SW5, CS29_SW5, CS28_SW5},
     {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, 
-    
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},     
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},  
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},      
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},      
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},      
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},      
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},  
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},     
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},      
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},     
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},     
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, 
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, 
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, 
-    
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},     
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},     
-    {0, CS9_SW3, CS8_SW3, CS7_SW3}, 
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},     
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},     
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},     
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},     
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    
+    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS33_SW1, CS32_SW1, CS31_SW1},
+    {0, CS33_SW2, CS32_SW2, CS31_SW2},
+    {0, CS33_SW3, CS32_SW3, CS31_SW3},
+    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+    {0, CS33_SW5, CS32_SW5, CS31_SW5},
+    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
     {0, CS36_SW1, CS35_SW1, CS34_SW1},
     {0, CS36_SW2, CS35_SW2, CS34_SW2},
     {0, CS36_SW3, CS35_SW3, CS34_SW3},
     {0, CS36_SW4, CS35_SW4, CS34_SW4},
     {0, CS36_SW5, CS35_SW5, CS34_SW5},
     {0, CS36_SW7, CS35_SW7, CS34_SW7},
-    
+
     {0, CS3_SW1, CS2_SW1, CS1_SW1},
     {0, CS3_SW2, CS2_SW2, CS1_SW2},
     {0, CS3_SW3, CS2_SW3, CS1_SW3},
     {0, CS3_SW6, CS2_SW6, CS1_SW6},
-    {0, CS39_SW1, CS38_SW1, CS37_SW1},    
+    {0, CS39_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, CS39_SW7, CS38_SW7, CS37_SW7}
+
 };
 led_config_t g_led_config = { {
     {  0,  1,  2,  3,  4,  5,  6,  7,   8,  9,  10,  11, 12,    13,  14 },
@@ -108,18 +108,20 @@ led_config_t g_led_config = { {
 }, {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 1, 4, 1, 1, 1, 1, 1, 1	
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1, 1
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock)
     {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
index 4506a69aa7..3336d8cf8b 100644
--- a/keyboards/evyd13/atom47/rev5/rev5.c
+++ b/keyboards/evyd13/atom47/rev5/rev5.c
@@ -144,10 +144,14 @@ led_config_t g_led_config = { {
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 } };
 
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(26, 255, 255, 255);
     } else {
         rgb_matrix_set_color(26, 0, 0, 0);
     }
+    return true;
 }
diff --git a/keyboards/feker/ik75/keymaps/bkzshen/keymap.c b/keyboards/feker/ik75/keymaps/bkzshen/keymap.c
index 95d41853f9..5d5ebdc771 100644
--- a/keyboards/feker/ik75/keymaps/bkzshen/keymap.c
+++ b/keyboards/feker/ik75/keymaps/bkzshen/keymap.c
@@ -190,7 +190,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(46, 0, 0, 0);
     rgb_matrix_set_color(104, 0, 0, 0);
 
@@ -212,6 +212,7 @@ void rgb_matrix_indicators_user(void) {
         }
         rgb_matrix_set_color(104, red, green, blue);
     }
+    return false;
 }
 
 #ifdef ENCODER_MAP_ENABLE
diff --git a/keyboards/feker/ik75/keymaps/default/keymap.c b/keyboards/feker/ik75/keymaps/default/keymap.c
index 582340650c..944348a5b9 100644
--- a/keyboards/feker/ik75/keymaps/default/keymap.c
+++ b/keyboards/feker/ik75/keymaps/default/keymap.c
@@ -134,7 +134,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(46, 0, 0, 0);
     rgb_matrix_set_color(104, 0, 0, 0);
 
@@ -156,6 +156,7 @@ void rgb_matrix_indicators_user(void) {
         }
         rgb_matrix_set_color(104, red, green, blue);
     }
+    return false;
 }
 
 #ifdef ENCODER_MAP_ENABLE
diff --git a/keyboards/feker/ik75/keymaps/via/keymap.c b/keyboards/feker/ik75/keymaps/via/keymap.c
index 6f0c6890ed..3be5a60680 100644
--- a/keyboards/feker/ik75/keymaps/via/keymap.c
+++ b/keyboards/feker/ik75/keymaps/via/keymap.c
@@ -190,7 +190,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(46, 0, 0, 0);
     rgb_matrix_set_color(104, 0, 0, 0);
 
@@ -212,6 +212,7 @@ void rgb_matrix_indicators_user(void) {
         }
         rgb_matrix_set_color(104, red, green, blue);
     }
+    return false;
 }
 
 #ifdef ENCODER_MAP_ENABLE
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
index 5a4361e5ae..f7c47d9597 100644
--- a/keyboards/giabalanai/keymaps/party/keymap.c
+++ b/keyboards/giabalanai/keymaps/party/keymap.c
@@ -475,7 +475,7 @@ void eeconfig_init_user(void) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     uint8_t i;
     // uint32_t mode = rgblight_get_mode();
 
@@ -525,6 +525,7 @@ void rgb_matrix_indicators_user(void) {
                 break;
         }
     }
+    return false;
 }
 #endif
 
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
index bb7b627ce4..1239a6a049 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
@@ -93,11 +93,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(25, 0, 0, 0);
     rgb_matrix_set_color(36, 0, 0, 0);
     rgb_matrix_set_color(42, 0, 0, 0);
+    return false;
 }
 
 void keyboard_pre_init_user(void) {
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
index 41e3062dc2..09b69b907a 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
@@ -93,12 +93,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void)
+bool rgb_matrix_indicators_user(void)
 {
     rgb_matrix_set_color(25, 0, 0, 0);
     rgb_matrix_set_color(30, 0, 0, 0);
     rgb_matrix_set_color(35, 0, 0, 0);
     rgb_matrix_set_color(42, 0, 0, 0);
+    return false;
 }
 
 void keyboard_pre_init_user(void) {
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
index ad357648ac..8b7832ba9f 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
@@ -93,12 +93,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(24, 0, 0, 0);
     rgb_matrix_set_color(30, 0, 0, 0);
     rgb_matrix_set_color(35, 0, 0, 0);
     rgb_matrix_set_color(36, 0, 0, 0);
     rgb_matrix_set_color(41, 0, 0, 0);
+    return false;
 }
 #endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index 5679a1c0d7..ca39c39203 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
@@ -253,7 +253,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user() {
+bool rgb_matrix_indicators_user(void) {
     if (effect_started_time > 0) {
         /* Render blinking EFFECTS */
         const uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
@@ -289,6 +289,7 @@ void rgb_matrix_indicators_user() {
     if (host_keyboard_led_state().caps_lock) {
         set_rgb_caps_leds();
     }
+    return false;
 }
 
 static void start_effects() {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
index 16f1acd68b..52fd7a5a34 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
@@ -76,7 +76,7 @@ void keyboard_post_init_user(void) {
   val = rgb_matrix_get_val();
 }
 
-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) {
 
   if (host_keyboard_led_state().caps_lock) {
     rgb_matrix_set_color_all(val,0,0);
@@ -84,4 +84,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     rgb_matrix_set_color_all(val, val, val);
     val = rgb_matrix_get_val();
   }
+    return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
index 86743acf73..b536a8535a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
@@ -99,7 +99,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return false;
 }
 
-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) {
     switch(get_highest_layer(layer_state)) {
     // special handling per layer
         case 0:  //layer one
@@ -124,4 +124,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         default:
             break;
     }
+    return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
index b2cab6222f..52f2011712 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
@@ -111,7 +111,7 @@ static void set_rgb_wlck_leds() {
     rgb_matrix_set_color(92, 0x77, 0xFF, 0x77);  // Right side LED 8
 }
 
-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) {
     if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
         set_rgb_caps_leds();
     }
@@ -121,6 +121,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     if (keymap_config.no_gui) {
         set_rgb_wlck_leds();
     }
+    return false;
 }
 
 void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index 024700174b..1ff0a28e4d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     }
 
     // Capslock, Scroll lock and Numlock  indicator on Left side lights.
-    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) {
         loop_colorset(LED_REGION_A,      ARRAY_SIZE(LED_REGION_A),
                                  hsv_cl_blue);
         loop_colorset(LED_REGION_B,      ARRAY_SIZE(LED_REGION_B),
@@ -158,5 +158,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             loop_colorset(LED_REGION_CAPS, ARRAY_SIZE(LED_REGION_CAPS),
                           hsv_cl_bad);
         }
+    return false;
     }
 #endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
index f8fe872dab..c693bd90d8 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
@@ -56,7 +56,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return false;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (IS_LAYER_ON(_TRAN)) {
         rgb_matrix_set_color_all(_TRAN_COLOR_RGB);
     } else if (IS_LAYER_ON(_GAME)) {
@@ -72,4 +72,5 @@ void rgb_matrix_indicators_user(void) {
             }
         }
     }
+    return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
index 9b20399e00..5a45e4e353 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
@@ -242,7 +242,7 @@ void hurt_paddle(void) {
 #endif //GAME_ENABLE
 
 // Capslock, Scroll lock and Numlock indicator on Left side lights.
-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) {
     if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
 
     // Scroll Lock RGB setup
@@ -359,7 +359,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         #endif // GAME_ENABLE
 
         // System NumLock warning indicator RGB setup
-        #ifdef INVERT_NUMLOCK_INDICATOR 
+        #ifdef INVERT_NUMLOCK_INDICATOR
         if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled
             rgb_matrix_set_color(LED_N, RGB_ORANGE2);
         }
@@ -431,7 +431,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
         // Numpad & Mouse Keys overlay RGB
     case _NUMPADMOUSE:
-        #ifdef INVERT_NUMLOCK_INDICATOR 
+        #ifdef INVERT_NUMLOCK_INDICATOR
         if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled
             rgb_matrix_set_color(LED_N, RGB_ORANGE2);
         }
@@ -699,6 +699,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         #endif //GAME_ENABLE
         break;
     }
+    return false;
 }
 #endif
 
@@ -707,4 +708,4 @@ void keyboard_post_init_keymap(void) {
     #ifdef RGB_MATRIX_ENABLE
     activate_rgb_nightmode(false); // Set to true if you want to startup in nightmode, otherwise use Fn + Z to toggle
     #endif
-}
\ No newline at end of file
+}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
index 6a7b2dd733..aa1558fd07 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
@@ -220,7 +220,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 
-void rgb_matrix_indicators_user() {
+bool rgb_matrix_indicators_user() {
     #if RGB_CONFIRMATION_BLINKING_TIME > 0
     if (effect_started_time > 0) {
         /* Render blinking EFFECTS */
@@ -258,6 +258,7 @@ void rgb_matrix_indicators_user() {
     if (host_keyboard_led_state().caps_lock) {
         set_rgb_caps_leds();
     }
+    return false;
 }
 
 #if RGB_CONFIRMATION_BLINKING_TIME > 0
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
index 6fd4f29e09..c7947a66f6 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGB_MATRIX_ENABLE
     // Capslock, Scroll lock and Numlock  indicator on Left side lights.
-    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) {
         if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
         if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
             rgb_matrix_set_color(LED_L1, RGB_GREEN);
@@ -188,14 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         default:
             break;
         }
-    }
-
-    void suspend_power_down_user(void) {
-        rgb_matrix_set_suspend_state(true);
-    }
-
-    void suspend_wakeup_init_user(void) {
-        rgb_matrix_set_suspend_state(false);
+    return false;
     }
 #endif
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
index c87532990f..bc20d46d3a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
@@ -80,12 +80,13 @@ static void set_rgb_side_leds() {
     rgb_matrix_set_color(92, RGB_WHITE); // Right side LED 8
 }
 
-void rgb_matrix_indicators_user() {
+bool rgb_matrix_indicators_user() {
     rgb_matrix_set_color_all(0x0, 0x0, 0x0);
     if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
         rgb_matrix_set_color(3, RGB_WHITE); // CAPS
     }
     set_rgb_side_leds();
+    return false;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
index 3f39229b16..8740bfe89c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
@@ -372,7 +372,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   }
 
 
-  void rgb_matrix_indicators_user() {
+  bool rgb_matrix_indicators_user(void) {
     #if RGB_CONFIRMATION_BLINKING_TIME > 0
     if (effect_started_time > 0) {
       /* Render blinking EFFECTS */
@@ -410,6 +410,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     if (host_keyboard_led_state().caps_lock) {
       set_rgb_caps_leds();
     }
+    return false;
   }
 
   #if RGB_CONFIRMATION_BLINKING_TIME > 0
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
index 6e673a4373..b94c380e60 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       _______, _______, _______,                   _______,                   _______, _______, _______,          _______, _______, _______),
 };
 // Runs constantly in the background, in a loop.
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (rgb_matrix_get_flags() & (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER)) {
 
         if (IS_LAYER_ON(_UTILITY)) {
@@ -108,6 +108,7 @@ void rgb_matrix_indicators_user(void) {
         }
 
     }
+    return false;
 }
 
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
index f553874eb0..cb47824c80 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
@@ -19,7 +19,7 @@
 static bool wpm_rgb_enabled = false;
 static uint8_t rgb_mode;
 
-void rgb_matrix_indicators_keymap(void) {
+bool rgb_matrix_indicators_keymap(void) {
     if (wpm_rgb_enabled && rgb_matrix_is_enabled()) {
         uint8_t wpm = get_current_wpm();
         dprintf("WPM = %d\n", wpm);
@@ -28,6 +28,7 @@ void rgb_matrix_indicators_keymap(void) {
         RGB rgb = hsv_to_rgb(hsv);
         rgb_matrix_set_color_all(rgb.r, rgb.g, rgb.b);
     }
+    return false;
 }
 
 bool process_record_fun(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
index dda68fda2f..607606b3e7 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
@@ -51,7 +51,7 @@ void suspend_wakeup_init_user(void) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     // Turn on sideglow when CAPS LOCK is activated
     if (host_keyboard_led_state().caps_lock) {
         HSV hsv = {CAPS_LOCK_COLOR};
@@ -64,5 +64,6 @@ void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
             }
         }
     }
+    return false;
 }
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
index d59b5cffc8..0106d80c14 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
@@ -15,9 +15,9 @@
  */
 #include "rgb_matrix_ledmaps.h"
 
-__attribute__((weak)) void rgb_matrix_indicators_keymap(void) { return; }
-__attribute__((weak)) void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
-    return;
+__attribute__((weak)) bool rgb_matrix_indicators_keymap(void) { return true; }
+__attribute__((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
+    return true;
 }
 
 #ifdef RGB_MATRIX_LEDMAPS_ENABLED
@@ -26,15 +26,15 @@ static bool enabled = true;
 
 #endif  // RGB_MATRIX_LEDMAPS_ENABLED
 
-void rgb_matrix_indicators_user(void) { rgb_matrix_indicators_keymap(); }
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_user(void) { return rgb_matrix_indicators_keymap(); }
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 #ifdef RGB_MATRIX_LEDMAPS_ENABLED
     if (rgb_matrix_is_enabled() && enabled) {
         set_layer_rgb(led_min, led_max, get_highest_layer(layer_state | default_layer_state));
     }
 
 #endif  // RGB_MATRIX_LEDMAPS_ENABLED
-    rgb_matrix_indicators_advanced_keymap(led_min, led_max);
+    return rgb_matrix_indicators_advanced_keymap(led_min, led_max);
 }
 
 #ifdef RGB_MATRIX_LEDMAPS_ENABLED
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
index b9b06309b2..931dfa0704 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
@@ -96,5 +96,5 @@ void rgb_matrix_layers_disable(void);
 
 #endif  // RGB_MATRIX_LEDMAPS_ENABLED
 
-void rgb_matrix_indicators_keymap(void);
-void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max);
+bool rgb_matrix_indicators_keymap(void);
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max);
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
index 72b4e58df0..61f99e491b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
@@ -77,11 +77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT(
-        KC_SLEP,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MNXT,  KC_MPLY,  KC_MSTP,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  KC_INS,             _______, 
-        RGB_TOG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUD,  RGB_HUI,  _______,            RGB_M_P, 
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  TO(_MO2), RGB_SAD,  RGB_SAI,  QK_BOOT,            RGB_M_B, 
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_RMOD, RGB_MOD,            _______,            RGB_M_R, 
-        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_VAI,  RGB_M_SW, 
+        KC_SLEP,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MNXT,  KC_MPLY,  KC_MSTP,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  KC_INS,             _______,
+        RGB_TOG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUD,  RGB_HUI,  _______,            RGB_M_P,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  TO(_MO2), RGB_SAD,  RGB_SAI,  QK_BOOT,            RGB_M_B,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_RMOD, RGB_MOD,            _______,            RGB_M_R,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_VAI,  RGB_M_SW,
         _______,  KC_WINLK, _______,                                _______,                                _______,  _______,  _______,  RGB_SPD,  RGB_VAD,  RGB_SPI
     ),
 
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	}
 
     // Capslock, Scroll lock and Numlock  indicator on Left side lights.
-    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) {
 		switch(get_highest_layer(layer_state)) {
 			case _FN1:
 			// Light up FN layer keys
@@ -201,11 +201,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				if (rgb_value.g > 0) { --rgb_value.g; }
 				else { ++rgb_value.r; }
 			}
-			
+
             for (uint8_t i=0; i<ARRAY_SIZE(LED_RGB); i++) {
                 rgb_matrix_set_color(LED_RGB[i], rgb_value.r, rgb_value.g, rgb_value.b);
             }
-			
+
             for (uint8_t i=0; i<ARRAY_SIZE(LED_WHITE); i++) {
                 rgb_matrix_set_color(LED_WHITE[i], RGB_WHITE);
             }
@@ -459,6 +459,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         if (keymap_config.no_gui) {
             rgb_matrix_set_color(LED_LWIN, RGB_RED);  //light up Win key when disabled
         }
+    return false;
     }
 
 #endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
index ec271a0a37..d4ed360246 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
@@ -218,7 +218,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (host_keyboard_led_state().caps_lock) {
         set_rgb_caps_leds_on();
     } else {
@@ -233,6 +233,7 @@ void rgb_matrix_indicators_user(void) {
         set_rgb_scroll_leds_off();
       }
     }
+    return false;
 }
 
 // RGB led number layout, function of the key
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
index 22288f2d2c..8d425cdf1e 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 //  80, led 05   4, Sh_L   10, Z      16, X       22, C    27, V    32, B       38, N    43, M    48, ,<      54, .<   60, /?               90, Sh_R   94, Up        82, End        81, led 16
 //  83, led 06   5, Ct_L   11,Win_L   17, Alt_L                     33, SPACE                     49, Alt_R   55, FN             65, Ct_R   95, Left   97, Down      79, Right      84, led 17
 //  87, led 07                                                                                                                                                                      88, led 18
-//  91, led 08   
+//  91, led 08
 
 #ifdef RGB_MATRIX_ENABLE
 	static void set_rgb_caps_leds_on(void);
@@ -132,15 +132,15 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 		rgb_matrix_set_color(43, 0, 0, 0);	// M
 	}
 
-	static void set_rgb_scroll_leds_on() { 
+	static void set_rgb_scroll_leds_on() {
 		rgb_matrix_set_color(72, 255, 255, 255); // Under Rotary (HOME)
 	}
 
-	static void set_rgb_scroll_leds_off() { 
+	static void set_rgb_scroll_leds_off() {
 		rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME)
 	}
 
-	void rgb_matrix_indicators_user(void) {
+	bool rgb_matrix_indicators_user(void) {
 		// Left side rainbow
 		rgb_matrix_set_color(67, 255,   0,   0);	// Left LED 01
 		rgb_matrix_set_color(70, 255, 127,   0);	// Left LED 02
@@ -175,6 +175,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 			set_rgb_scroll_leds_off();
 			}
 		}
+    return false;
 	}
 
-#endif // RGB_MATRIX_ENABLE
\ No newline at end of file
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
index fd941883c5..971e0821a3 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
@@ -71,7 +71,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 #endif
 
-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) {
     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};
@@ -103,4 +103,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
          break;
        break;
     }
+    return false;
 }
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
index 004a8c2014..ef4dcc6a05 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
@@ -2,7 +2,7 @@
    Copyright 2021 Jonavin Eng @Jonavin
    Copyright 2022 RustyBrakes (ISO conversion)
    Copyright 2022 gourdo1 <gourdo1@outlook.com>
-   
+
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -243,7 +243,7 @@ void hurt_paddle(void) {
 #endif //GAME_ENABLE
 
 // Capslock, Scroll lock and Numlock indicator on Left side lights.
-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) {
     if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
 
     // Scroll Lock RGB setup
@@ -367,7 +367,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         #endif // GAME_ENABLE
 
         // System NumLock warning indicator RGB setup
-        #ifdef INVERT_NUMLOCK_INDICATOR 
+        #ifdef INVERT_NUMLOCK_INDICATOR
         if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled
             rgb_matrix_set_color(LED_N, RGB_ORANGE2);
         }
@@ -444,7 +444,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
         // Numpad & Mouse Keys overlay RGB
     case _NUMPADMOUSE:
-        #ifdef INVERT_NUMLOCK_INDICATOR 
+        #ifdef INVERT_NUMLOCK_INDICATOR
         if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled
             rgb_matrix_set_color(LED_N, RGB_ORANGE2);
         }
@@ -712,6 +712,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         #endif //GAME_ENABLE
         break;
     }
+    return false;
 }
 #endif
 
@@ -720,4 +721,4 @@ void keyboard_post_init_keymap(void) {
     #ifdef RGB_MATRIX_ENABLE
     activate_rgb_nightmode(false); // Set to true if you want to startup in nightmode, otherwise use Fn + Z to toggle
     #endif
-}
\ No newline at end of file
+}
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
index 4084d3d2eb..27ce76970a 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGB_MATRIX_ENABLE
     // Capslock, Scroll lock and Numlock  indicator on Left side lights.
-    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) {
         if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
         if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
             rgb_matrix_set_color(LED_L1, RGB_GREEN);
@@ -178,6 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         default:
             break;
         }
+    return false;
     }
 #endif
 
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
index de1046c5d3..9f23371831 100644
--- a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
@@ -181,7 +181,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -206,6 +206,7 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(73, 0, 0, 0);
         }
     }
+    return false;
 }
 
 #ifdef OLED_ENABLE
diff --git a/keyboards/gopolar/gg86/keymaps/default/keymap.c b/keyboards/gopolar/gg86/keymaps/default/keymap.c
index 070858c958..3b0a6aa66c 100644
--- a/keyboards/gopolar/gg86/keymaps/default/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/default/keymap.c
@@ -230,7 +230,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -255,6 +255,7 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(73, 0, 0, 0);
         }
     }
+    return false;
 }
 
 #ifdef OLED_ENABLE
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
index e5f5c91151..9003cd5e6b 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap_stuff.h
@@ -75,7 +75,7 @@ enum layer_keycodes {
     G_PRE,               //Gradient presets
     REF_G,               //Toggle between linear and reflected gradient
     G_FLIP,              //Flip the gradient colors
-  
+
     //Custom led effect keycode
     RGB_C_E,             //Cycle user effect
 };
@@ -276,7 +276,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -301,4 +301,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(73, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/gopolar/gg86/keymaps/via/keymap.c b/keyboards/gopolar/gg86/keymaps/via/keymap.c
index 070858c958..3b0a6aa66c 100644
--- a/keyboards/gopolar/gg86/keymaps/via/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/via/keymap.c
@@ -230,7 +230,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -255,6 +255,7 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(73, 0, 0, 0);
         }
     }
+    return false;
 }
 
 #ifdef OLED_ENABLE
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
index cbb1b42fca..98dba608c5 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
@@ -243,7 +243,7 @@ void dynamic_macro_record_end_user(int8_t direction) {
 }
 
 // Indicators
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (host_keyboard_led_state().caps_lock || caps_word_enabled) {
         // Left master
         rgb_matrix_set_color(3, RGB_RED);
@@ -262,6 +262,7 @@ void rgb_matrix_indicators_user(void) {
         // Right master
         rgb_matrix_set_color(23, RGB_GREEN);
     }
+    return false;
 }
 
 // Quantum keys / Abbreviations
diff --git a/keyboards/handwired/hnah108/keymaps/default/keymap.c b/keyboards/handwired/hnah108/keymaps/default/keymap.c
index fd3aedc29d..44d1e1bceb 100644
--- a/keyboards/handwired/hnah108/keymaps/default/keymap.c
+++ b/keyboards/handwired/hnah108/keymaps/default/keymap.c
@@ -65,7 +65,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t led_state = host_keyboard_led_state();
 
     if (led_state.caps_lock) {
@@ -77,4 +77,5 @@ void rgb_matrix_indicators_user(void) {
     } else {
         rgb_matrix_set_color(30, 0x00, 0x00, 0x00);
     }
+    return false;
 }
diff --git a/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c b/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c
index 01676f93f8..d23ef8b00f 100644
--- a/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c
+++ b/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c
@@ -50,8 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS,         KC_TRNS,  KC_TRNS,                        KC_TAB,                                 KC_TRNS, KC_TRNS ),
 };
 
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
         if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
         {
             rgb_matrix_set_color(22, 255, 255, 255);
@@ -64,4 +63,5 @@ void rgb_matrix_indicators_user(void)
         {
             rgb_matrix_set_color(45, 255, 255, 255);
         }
-}
\ No newline at end of file
+    return false;
+}
diff --git a/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c b/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c
index 76101f704b..7a0fcfd8df 100644
--- a/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c
+++ b/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c
@@ -50,18 +50,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS,         KC_TRNS,  KC_TRNS,   KC_TAB,              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS ),
 };
 
-void rgb_matrix_indicators_user(void)
-{
-        if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
-        {
-            rgb_matrix_set_color(22, 255, 255, 255);
-        }
-        if (IS_LAYER_ON(_L1))
-        {
-            rgb_matrix_set_color(46, 255, 255, 255);
-        }
-        if (IS_LAYER_ON(_L2))
-        {
-            rgb_matrix_set_color(45, 255, 255, 255);
-        }
-}
\ No newline at end of file
+bool rgb_matrix_indicators_user(void) {
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        rgb_matrix_set_color(22, 255, 255, 255);
+    }
+    if (IS_LAYER_ON(_L1)) {
+        rgb_matrix_set_color(46, 255, 255, 255);
+    }
+    if (IS_LAYER_ON(_L2)) {
+        rgb_matrix_set_color(45, 255, 255, 255);
+    }
+    return false;
+}
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
index 3a91494536..f1f3aa3cea 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
@@ -167,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -184,4 +184,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(30, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
index 3a91494536..f1f3aa3cea 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
@@ -167,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -184,4 +184,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(30, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
index 8c4f9d0d4b..5d854b9396 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
@@ -75,7 +75,7 @@ enum layer_keycodes {
     G_PRE,               //Gradient presets
     REF_G,               //Toggle between linear and reflected gradient
     G_FLIP,              //Flip the gradient colors
-  
+
     //Custom led effect keycode
     RGB_C_E,             //Cycle user effect
 };
@@ -252,7 +252,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     uint8_t  side_leds_left[3]  = {17, 18, 19};
     uint8_t  side_leds_right[3] = { 4,  5,  6};
     HSV      hsv = rgb_matrix_config.hsv;
@@ -297,4 +297,5 @@ void rgb_matrix_indicators_user(void) {
             }
         }
     }
+    return false;
 }
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
index 8c4f9d0d4b..5d854b9396 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
@@ -75,7 +75,7 @@ enum layer_keycodes {
     G_PRE,               //Gradient presets
     REF_G,               //Toggle between linear and reflected gradient
     G_FLIP,              //Flip the gradient colors
-  
+
     //Custom led effect keycode
     RGB_C_E,             //Cycle user effect
 };
@@ -252,7 +252,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     uint8_t  side_leds_left[3]  = {17, 18, 19};
     uint8_t  side_leds_right[3] = { 4,  5,  6};
     HSV      hsv = rgb_matrix_config.hsv;
@@ -297,4 +297,5 @@ void rgb_matrix_indicators_user(void) {
             }
         }
     }
+    return false;
 }
diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index f49304fb24..df40dfa5a3 100644
--- a/keyboards/idobao/id63/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c
@@ -196,7 +196,7 @@ void eeconfig_init_user(void) {
     id63_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) {
@@ -214,6 +214,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(ID63_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/keymaps/idobao/keymap.c b/keyboards/idobao/id67/keymaps/idobao/keymap.c
index 55ff6e5730..aadad80fb2 100644
--- a/keyboards/idobao/id67/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id67/keymaps/idobao/keymap.c
@@ -198,7 +198,7 @@ void eeconfig_init_user(void) {
     id67_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) {
@@ -216,6 +216,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(ID67_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index c0b79631d2..c90f1bf471 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -154,11 +154,7 @@ void keyboard_post_init_user(void) {
     isRGBOff = false;
 }
 
-void rgb_matrix_indicators_user(void) {
-    // do nothing, override base <<weak>> function to disable it
-}
-
-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) {
 
     uint8_t v = MIN( rgblight_get_val() + RGB_BRIGHTER_BY, 0xFF );
     uint8_t current_layer = get_highest_layer(layer_state);
@@ -239,18 +235,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
             break;
     }
-}
-
-/*
- * Sleep mode stuff (untested)
- */
-
-void suspend_power_down_user(void) {
-    rgb_matrix_set_suspend_state(true);
-}
-
-void suspend_wakeup_init_user(void) {
-    rgb_matrix_set_suspend_state(false);
+    return false;
 }
 
 #endif
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
index e0d786e5e2..947863653c 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
@@ -196,7 +196,7 @@ void eeconfig_init_user(void) {
     id80_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) {
@@ -214,6 +214,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(ID80_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
index 59b60b7e1d..31787a2e42 100644
--- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
@@ -180,7 +180,7 @@ void eeconfig_init_user(void) {
     id87_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) {
@@ -198,6 +198,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(ID87_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/inett_studio/sqx/hotswap/hotswap.c b/keyboards/inett_studio/sqx/hotswap/hotswap.c
index 055e918f6d..7f5e298c4c 100644
--- a/keyboards/inett_studio/sqx/hotswap/hotswap.c
+++ b/keyboards/inett_studio/sqx/hotswap/hotswap.c
@@ -152,11 +152,14 @@ led_config_t g_led_config = {
     }
 };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(8, 0xFF, 0x0, 0x0);
     }
+    return true;
 }
 
 #endif  //RGB_MATRIX_ENABLE
diff --git a/keyboards/inett_studio/sqx/universal/universal.c b/keyboards/inett_studio/sqx/universal/universal.c
index e03d7395e5..9715f28b78 100644
--- a/keyboards/inett_studio/sqx/universal/universal.c
+++ b/keyboards/inett_studio/sqx/universal/universal.c
@@ -156,11 +156,14 @@ led_config_t g_led_config = {
     }
 };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(8, 0xFF, 0x0, 0x0);
     }
+    return true;
 }
 
 #endif  //RGB_MATRIX_ENABLE
diff --git a/keyboards/jadookb/jkb65/jkb65.c b/keyboards/jadookb/jkb65/jkb65.c
index aabdce7d20..1ce62e241a 100644
--- a/keyboards/jadookb/jkb65/jkb65.c
+++ b/keyboards/jadookb/jkb65/jkb65.c
@@ -44,10 +44,13 @@ led_config_t g_led_config = { {
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock)     {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kbdfans/baguette66/rgb/rgb.c b/keyboards/kbdfans/baguette66/rgb/rgb.c
index def3e10c97..5f4f3a634d 100644
--- a/keyboards/kbdfans/baguette66/rgb/rgb.c
+++ b/keyboards/kbdfans/baguette66/rgb/rgb.c
@@ -32,17 +32,19 @@ led_config_t g_led_config = { {
 }, {
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,  
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
     4, 4, 4, 4, 4, 1, 1, 1
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock)
     {
         rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index 90bbda0f7f..e8c2cc0282 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -128,15 +128,15 @@ led_config_t g_led_config = {
 		{ 58,     NO_LED, 59,     60,     61,     62,     63,     64,     65,      66,     67,      68,     69,      NO_LED, 70,     NO_LED, }, /* R4 */
 		{ 71,     72,     73,     NO_LED, NO_LED, NO_LED, 74,     NO_LED, NO_LED, NO_LED,  75,      76,     77,      NO_LED, 78,     79,     }, /* R5 */
     }, {
-        {0,  0},  {29,  0},  {44,  0}, {59,  0}, {73,  0}, {95,  0}, {110,  0}, {125,  0}, {140,  0}, {161,  0}, {176,  0}, {191,  0}, {206,  0}, {224,  0}, 
-	{0, 17},  {15, 17},  {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17}, 
+        {0,  0},  {29,  0},  {44,  0}, {59,  0}, {73,  0}, {95,  0}, {110,  0}, {125,  0}, {140,  0}, {161,  0}, {176,  0}, {191,  0}, {206,  0}, {224,  0},
+	{0, 17},  {15, 17},  {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17},
 	{4, 29},  {22, 29},  {37, 29}, {51, 29}, {66, 29}, {81, 29}, {95, 29}, {110, 29}, {125, 29}, {140, 29}, {154, 29}, {169, 29}, {184, 29}, {202, 29}, {224, 29},
 	{5, 41},  {26, 41},  {40, 41}, {55, 41}, {70, 41}, {84, 41}, {99, 41}, {114, 41}, {129, 41}, {143, 41}, {158, 41}, {172, 41}, {196, 41}, {224, 41},
 	{9, 52},  {33, 52},  {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {185, 52}, {209, 52},
-	{2, 64},  {20, 64},  {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64}, 
-	{0, 0},  {45, 0},  {90, 0}, {134, 0}, {179, 0}, {224, 0}, 
-	{0, 32}, {224,32}, 	
-	{0, 64},  {45, 64},  {90, 64}, {134, 64}, {179, 64}, {224, 64}, 
+	{2, 64},  {20, 64},  {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64},
+	{0, 0},  {45, 0},  {90, 0}, {134, 0}, {179, 0}, {224, 0},
+	{0, 32}, {224,32},
+	{0, 64},  {45, 64},  {90, 64}, {134, 64}, {179, 64}, {224, 64},
 	}, {
     4,1,1,1,1,1,1,1,1,1,1,1,1,4,
 	4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
@@ -148,22 +148,14 @@ led_config_t g_led_config = {
 	}
 };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock)
     {
         rgb_matrix_set_color(44, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index 417c76cca6..3e356faa91 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -129,15 +129,15 @@ led_config_t g_led_config = {
 		{ 58,     59,     60,     61,     62,     63,     64,     65,     66,      67,     68,      69,     70,      NO_LED, 71,     NO_LED, }, /* R4 */
 		{ 72,     73,     74,     NO_LED, NO_LED, NO_LED, 75,     NO_LED, NO_LED, NO_LED,  76,      77,     78,      NO_LED, 79,     80,     }, /* R5 */
     }, {
-    {0,  0},  {29,  0},  {44,  0}, {59,  0}, {73,  0}, {95,  0}, {110,  0}, {125,  0}, {140,  0}, {161,  0}, {176,  0}, {191,  0}, {206,  0}, {224,  0}, 
-	{0, 17},  {15, 17},  {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17}, 
+    {0,  0},  {29,  0},  {44,  0}, {59,  0}, {73,  0}, {95,  0}, {110,  0}, {125,  0}, {140,  0}, {161,  0}, {176,  0}, {191,  0}, {206,  0}, {224,  0},
+	{0, 17},  {15, 17},  {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17},
 	{4, 29},  {22, 29},  {37, 29}, {51, 29}, {66, 29}, {81, 29}, {95, 29}, {110, 29}, {125, 29}, {140, 29}, {154, 29}, {169, 29}, {184, 29}, {200, 35}, {224, 29},
 	{5, 41},  {26, 41},  {40, 41}, {55, 41}, {70, 41}, {84, 41}, {99, 41}, {114, 41}, {129, 41}, {143, 41}, {158, 41}, {172, 41}, {187, 41}, {224, 41},
 	{2, 52},  {18, 52},  {33, 52},  {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {185, 52}, {209, 52},
-	{2, 64},  {20, 64},  {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64}, 
-	{0, 0},  {45, 0},  {90, 0}, {134, 0}, {179, 0}, {224, 0}, 
-	{0, 32}, {224,32}, 	
-	{0, 64},  {45, 64},  {90, 64}, {134, 64}, {179, 64}, {224, 64}, 
+	{2, 64},  {20, 64},  {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64},
+	{0, 0},  {45, 0},  {90, 0}, {134, 0}, {179, 0}, {224, 0},
+	{0, 32}, {224,32},
+	{0, 64},  {45, 64},  {90, 64}, {134, 64}, {179, 64}, {224, 64},
 	}, {
     4,1,1,1,1,1,1,1,1,1,1,1,1,4,
 	4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
@@ -148,23 +148,14 @@ led_config_t g_led_config = {
 	2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 	}
 };
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
 
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(44, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index a0a1778fd8..19645b6b83 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -21,66 +21,66 @@
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW1, CS20_SW1, CS19_SW1},
     {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, 
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    
+    {0, CS21_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, 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_SW4, CS23_SW4, CS22_SW4},
     {0, CS24_SW5, CS23_SW5, CS22_SW5},
     {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, 
-    
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},     
+    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
     {0, CS15_SW2, CS14_SW2, CS13_SW2},
     {0, CS15_SW3, CS14_SW3, CS13_SW3},
     {0, CS15_SW4, CS14_SW4, CS13_SW4},
     {0, CS15_SW5, CS14_SW5, CS13_SW5},
     {0, CS15_SW6, CS14_SW6, CS13_SW6},
     {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},     
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, 
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS30_SW1, CS29_SW1, CS28_SW1},
     {0, CS30_SW2, CS29_SW2, CS28_SW2},
     {0, CS30_SW3, CS29_SW3, CS28_SW3},
     {0, CS30_SW4, CS29_SW4, CS28_SW4},
     {0, CS30_SW5, CS29_SW5, CS28_SW5},
     {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, 
-    
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},     
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},  
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},      
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},      
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},      
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},      
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},  
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},     
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},      
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},     
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},     
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, 
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, 
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, 
-    
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},     
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},     
-    {0, CS9_SW3, CS8_SW3, CS7_SW3}, 
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},     
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},     
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},     
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},     
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    
+    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS33_SW1, CS32_SW1, CS31_SW1},
+    {0, CS33_SW2, CS32_SW2, CS31_SW2},
+    {0, CS33_SW3, CS32_SW3, CS31_SW3},
+    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+    {0, CS33_SW5, CS32_SW5, CS31_SW5},
+    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
     {0, CS36_SW1, CS35_SW1, CS34_SW1},
     {0, CS36_SW2, CS35_SW2, CS34_SW2},
     {0, CS36_SW3, CS35_SW3, CS34_SW3},
     {0, CS36_SW4, CS35_SW4, CS34_SW4},
     {0, CS36_SW5, CS35_SW5, CS34_SW5},
     {0, CS36_SW7, CS35_SW7, CS34_SW7},
-    
+
     {0, CS3_SW1, CS2_SW1, CS1_SW1},
     {0, CS3_SW2, CS2_SW2, CS1_SW2},
     {0, CS3_SW3, CS2_SW3, CS1_SW3},
@@ -90,27 +90,27 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS39_SW4, CS38_SW4, CS37_SW4},
     {0, CS39_SW5, CS38_SW5, CS37_SW5},
     {0, CS39_SW7, CS38_SW7, CS37_SW7},
-    
+
 /* 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, 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, 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, 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, CS33_SW6, CS32_SW6, CS31_SW6},
+    {0, CS36_SW6, CS35_SW6, CS34_SW6},
+    {0, CS39_SW6, CS38_SW6, CS37_SW6}
+
 };
 led_config_t g_led_config = { {
     {  0,  1,  2,  3,  4,  5,  6,  7,   8,  9,  10,  11, 12,    13,  14 },
@@ -129,20 +129,21 @@ led_config_t g_led_config = { {
 }, {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 1, 1, 4, 1, 1, 1, 1, 1,
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2	
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock)
     {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
-
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
index be5f251dac..d34ed320dd 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
@@ -51,7 +51,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (rgb_matrix_config.enable) {
         HSV hsv = rgb_matrix_config.hsv;
         if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
@@ -87,6 +87,7 @@ void rgb_matrix_indicators_user(void) {
         set_hsv_at(hsv1, 63);
         set_hsv_at(hsv2, 57);
     }
+    return false;
 }
 
 void set_hsv_at(HSV hsv, uint8_t index) {
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
index c2e409ed35..4adebffccf 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGB_MATRIX_ENABLE
     // Capslock, Scroll lock and Numlock indicator
-    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) {
         if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
         if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
             rgb_matrix_set_color(LED_I, RGB_GREEN);
@@ -109,15 +109,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         default:
             break;
         }
+    return false;
     }
 
-    void suspend_power_down_user(void) {
-        rgb_matrix_set_suspend_state(true);
-    }
-
-    void suspend_wakeup_init_user(void) {
-        rgb_matrix_set_suspend_state(false);
-    }
 #endif
 
 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
index f034350b7c..594d1fee23 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
@@ -96,9 +96,13 @@ led_config_t g_led_config = {{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}
                              {{0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {203, 0}, {224, 0}, {4, 16}, {23, 16}, {38, 16}, {53, 16}, {68, 16}, {83, 16}, {98, 16}, {113, 16}, {128, 16}, {143, 16}, {158, 16}, {173, 16}, {188, 16}, {206, 16}, {224, 16}, {6, 32}, {26, 32}, {41, 32}, {56, 32}, {71, 32}, {86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {176, 32}, {201, 32}, {224, 32}, {9, 48}, {34, 48}, {49, 48}, {64, 48}, {79, 48}, {94, 48}, {109, 48}, {124, 48}, {139, 48}, {154, 48}, {169, 48}, {189, 48}, {210, 48}, {224, 48}, {2, 64}, {21, 64}, {39, 64}, {96, 64}, {152, 64}, {171, 64}, {195, 64}, {210, 64}, {224, 64}},
                              {1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1}};
 
-__attribute__((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
index 1da1c66747..9bfcb47d96 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
@@ -113,10 +113,13 @@ led_config_t g_led_config = { {
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock)     {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 8089ee1f8c..542551b3a3 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -137,8 +137,10 @@ led_config_t g_led_config = { {
     #define CAPS_LOCK_VAL_STEP 8
 #endif
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         uint8_t b = rgb_matrix_get_val();
         if (b < CAPS_LOCK_VAL_STEP) {
@@ -150,6 +152,7 @@ void rgb_matrix_indicators_user(void) {
         }
         rgb_matrix_set_color(CAPS_LOCK_LED_INDEX, b, b, b);  // white, with the adjusted brightness
     }
+    return true;
 }
 
 #endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
index 3c4b81132f..c39d01f3b9 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include "v4.h"
 
 #ifdef RGB_MATRIX_ENABLE
@@ -29,21 +29,24 @@ led_config_t g_led_config = {
     {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
     {224,16},{206,16},{188,16},{173,16},{158,16},{143,16},{128,16},{113,16},{98,16},{83,16}, {68,16},{53,16},{38,16},{23,16},{4,16},
     {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
-    {224,48},{210,48},{189,48},{169,48},{154,48},{139,48},{124,48},{109,48},{94,48},{79,48},{64,48},{49,48},{34,48},{9,48},	
+    {224,48},{210,48},{189,48},{169,48},{154,48},{139,48},{124,48},{109,48},{94,48},{79,48},{64,48},{49,48},{34,48},{9,48},
     {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
 }, {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 1, 4, 1, 1, 1, 1, 1	
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
index 267fa57598..37c2bcae45 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
@@ -33,17 +33,19 @@ led_config_t g_led_config = {
 }, {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 1, 4, 1, 1, 1, 1, 1	
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(29, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
-
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
index 1f160ed4a5..8cc522c75b 100644
--- a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
+++ b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
@@ -26,11 +26,11 @@ led_config_t g_led_config = { {
     {  83, 82, 81, NO_LED, NO_LED, 80, NO_LED, NO_LED, 79, 78, 77, 76, NO_LED,75 ,74}
 }, {
     {0, 0},   {15, 0},  {30, 0},{45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0},  {195, 0}, {210, 0}, {224, 0},
-    {224, 12.8}, {218, 12.8},{192, 12.8},{176, 12.8},{160, 12.8},{144, 12.8},{128, 12.8},{112, 12.8},{96, 12.8},{80, 12.8},{64, 12.8},{48, 12.8},{32, 12.8},{16, 12.8},{0, 12.8},         
+    {224, 12.8}, {218, 12.8},{192, 12.8},{176, 12.8},{160, 12.8},{144, 12.8},{128, 12.8},{112, 12.8},{96, 12.8},{80, 12.8},{64, 12.8},{48, 12.8},{32, 12.8},{16, 12.8},{0, 12.8},
     {0, 25.6},{16, 25.6}, {32, 25.6}, {48, 25.6},  {64, 25.6},  {80, 25.6},  {96, 25.6},  {112, 25.6}, {128, 25.6}, {144, 25.6}, {160, 25.6},{176, 25.6}, {192, 25.6},   {218, 25.6}, {224, 25.6},
-{224, 38.4},{200, 38.4},{176, 38.4},{160, 38.4},{144, 38.4},{128, 38.4},{112, 38.4},{96, 38.4},{80, 38.4},{64, 38.4},{48, 38.4},{32, 38.4},{16, 38.4},{0, 38.4},                       
-    {0, 51.2},{16, 51.2}, {32, 51.2}, {48, 51.2},  {64, 51.2},  {80, 51.2},  {96, 51.2},  {112, 51.2}, {128, 51.2}, {144, 51.2}, {160, 51.2},   {189, 51.2}, {218, 51.2},   {224, 51.2}, 
-{224, 64},{218, 64},{192, 64},{176, 64},{160, 64},{144, 64}, {80, 64}, {32, 64},{16, 64},{0, 64}                                                                              
+{224, 38.4},{200, 38.4},{176, 38.4},{160, 38.4},{144, 38.4},{128, 38.4},{112, 38.4},{96, 38.4},{80, 38.4},{64, 38.4},{48, 38.4},{32, 38.4},{16, 38.4},{0, 38.4},
+    {0, 51.2},{16, 51.2}, {32, 51.2}, {48, 51.2},  {64, 51.2},  {80, 51.2},  {96, 51.2},  {112, 51.2}, {128, 51.2}, {144, 51.2}, {160, 51.2},   {189, 51.2}, {218, 51.2},   {224, 51.2},
+{224, 64},{218, 64},{192, 64},{176, 64},{160, 64},{144, 64}, {80, 64}, {32, 64},{16, 64},{0, 64}
 }, {
 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
@@ -40,12 +40,14 @@ led_config_t g_led_config = { {
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
     {
         rgb_matrix_set_color(59, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kbdfans/maja/maja.c b/keyboards/kbdfans/maja/maja.c
index 6bb23f4739..0185a7ce2b 100755
--- a/keyboards/kbdfans/maja/maja.c
+++ b/keyboards/kbdfans/maja/maja.c
@@ -14,7 +14,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, C1_12, C2_12, C3_12}, // LB4
     {0, C1_11, C2_11, C3_11}, // LB3
     {0, C1_10, C2_10, C4_11}, // LB2
-    {0, C1_9,  C3_10, C4_10}, // LB1	
+    {0, C1_9,  C3_10, C4_10}, // LB1
 	{0, C2_9,  C3_9,  C4_9},  // LB0
 
     {0, C9_4,  C8_4, C7_4},   // LA12
@@ -39,20 +39,20 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, C9_8,  C7_7, C6_7},   // LA16
     {0, C8_8,  C7_8, C6_8},   // LA17
     {1, C2_1,  C3_1,  C4_1},  // LC0
-    {1, C1_15, C2_15, C3_15}, // LD7	
-    {1, C1_14, C2_14, C3_14}, // LD6	
-    {1, C1_13, C2_13, C3_13}, // LD5	
-    {1, C1_12, C2_12, C3_12}, // LD4	
+    {1, C1_15, C2_15, C3_15}, // LD7
+    {1, C1_14, C2_14, C3_14}, // LD6
+    {1, C1_13, C2_13, C3_13}, // LD5
+    {1, C1_12, C2_12, C3_12}, // LD4
     {1, C1_11, C2_11, C3_11}, // LD3
     {1, C1_10, C2_10, C4_11}, // LD2
     {1, C1_9,  C3_10, C4_10}, // LD1
     {0, C8_16, C7_16, C6_16}, // LB17
 
     {1, C1_6,  C2_6, C3_6},   // LC6
-    {1, C1_5,  C2_5, C3_5},   // LC5	
-    {1, C1_4,  C2_4, C3_4},   // LC4	
+    {1, C1_5,  C2_5, C3_5},   // LC5
+    {1, C1_4,  C2_4, C3_4},   // LC4
     {1, C1_3,  C2_3, C3_3},   // LC3
-    {1, C1_2,  C2_2, C4_3},   // LC2	
+    {1, C1_2,  C2_2, C4_3},   // LC2
     {1, C1_1,  C3_2, C4_2},   // LC1
     {1, C1_16, C2_16, C3_16}, // LD8
     {1, C9_9,  C8_9,  C7_9},  // LD9
@@ -80,7 +80,7 @@ led_config_t g_led_config = { {
     {  30,  31,     32,  33,  34,     35,  36,     37,  38,     39,  40,     41,     NO_LED, 42,  43},
     {  44,  45,     46,  47,  48,     49,  50,     51,  52,     53,  54,     55,     56,     57,  NO_LED},
 	{  58,  NO_LED, 59,  60,  NO_LED, 61,  NO_LED, 62,  NO_LED, 63,  NO_LED, NO_LED, 64,     65,  66}
-}, { 
+}, {
     {4,1},{18,1},{31,0},{46,3},{59,5},{73,7},{86,10},{107,9},{121,7},{134,4},{148,2},{162,0},{176,2},{196,2},{224,0},
 	{5,15},{22,15},{37,15},{50,17},{64,20},{77,22},{103,23},{117,21},{130,19},{143,16},{158,15},{171,16},{186,16},{202,16},{224,16},
 	{4,28},{23,28},{38,29},{51,31},{65,34},{78,36},{109,36},{122,34},{136,32},{150,29},{164,29},{177,29},{200,29},{224,29},
@@ -88,26 +88,18 @@ led_config_t g_led_config = { {
 	{0,55},{40,58},{62,61},{86,64},{119,62},{147,58},{201,60},{214,60},{224,60}
 }, {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
 	4, 4, 4, 1, 4, 4, 1, 1, 1
 } };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
diff --git a/keyboards/kbdfans/odin/rgb/rgb.c b/keyboards/kbdfans/odin/rgb/rgb.c
index 425597a7f6..5c7d3caf0d 100644
--- a/keyboards/kbdfans/odin/rgb/rgb.c
+++ b/keyboards/kbdfans/odin/rgb/rgb.c
@@ -24,21 +24,21 @@ led_config_t g_led_config = {
     { 75, 74,     73,  72,     71,     70,     69,      68,     67,     66,     65,  64, NO_LED, 63, NO_LED, NO_LED, 58, 57, 56, NO_LED },
     { 76, NO_LED, 77,  78,     79,     80,     81,      82,     83,     84,     85,  86, NO_LED, 87, NO_LED, 88,     89, 90, 91, 92 },
     { 103,102,    101, NO_LED, NO_LED, NO_LED, 100,     NO_LED, NO_LED, NO_LED, NO_LED, 99, NO_LED,     98, 97,     96,     95, 94, 93, NO_LED }
-}, 
+},
 {
     {   12*0,  0 }, {  12*2,  0 }, {  12*3,  0 }, {  12*4,  0 }, {  12*5,  0 }, { 12*7,  0 }, { 12*8,  0 }, { 12*9,  0 }, { 12*10,  0 }, { 12*11,  0 },    { 12*12,  0 }, { 12*13,  0 }, { 12*14,  0 }, { 12*15,  0 }, { 12*16,  0 }, { 12*17,  0 }, { 12*18,  0 }, { 224,  0 },
-    
-    { 224,  14 }, { 12*18,  14 },  { 12*17,  14 }, { 12*16,  14 },{ 12*15,  14 },{ 12*13,  14 },  { 12*12,  14 },  { 12*11,  14 },  { 12*10,  14 }, { 12*9,  14 },{ 12*8, 14},{ 12*7,  14},  {  12*6, 14 },  {  12*5,  14 }, {  12*4,  14 },{  12*3,  14 },{  12*2,  14 }, {12,  14},  {   12*0,  14 }, 
-      
+
+    { 224,  14 }, { 12*18,  14 },  { 12*17,  14 }, { 12*16,  14 },{ 12*15,  14 },{ 12*13,  14 },  { 12*12,  14 },  { 12*11,  14 },  { 12*10,  14 }, { 12*9,  14 },{ 12*8, 14},{ 12*7,  14},  {  12*6, 14 },  {  12*5,  14 }, {  12*4,  14 },{  12*3,  14 },{  12*2,  14 }, {12,  14},  {   12*0,  14 },
+
     {   12*0,  26.8 }, {12,  26.8}, {  12*2,  26.8 }, {  12*3,  26.8 }, {  12*4,  26.8 }, {  12*5,  26.8 }, {  12*6, 26.8 }, { 12*7,  26.8}, { 12*8, 26.8}, { 12*9,  26.8 }, { 12*10,  26.8 }, { 12*11,  26.8 },    { 12*12,  26.8 }, { 12*13,  26.8 },  { 12*15,  26.8 }, { 12*16,  26.8 }, { 12*17,  26.8 }, { 12*18,  26.8 }, { 224,  33.2 },
 
- { 12*18,  39.6 }, { 12*17,  39.6 },{ 12*16,  39.6 }, {224,0},{0,0},{0,64},{224,64 },   { 12*13,  39.6 }, { 12*11,  39.6 }, { 12*10,  39.6 }, { 12*9,  39.6 },{ 12*8, 39.6},  { 12*7,  39.6},  {  12*6, 39.6 },  {  12*5,  39.6 },{  12*4,  39.6 },{  12*3,  39.6 },  {  12*2,  39.6 }, {12,  39.6},  {   12*0,  39.6 }, 
-    
+ { 12*18,  39.6 }, { 12*17,  39.6 },{ 12*16,  39.6 }, {224,0},{0,0},{0,64},{224,64 },   { 12*13,  39.6 }, { 12*11,  39.6 }, { 12*10,  39.6 }, { 12*9,  39.6 },{ 12*8, 39.6},  { 12*7,  39.6},  {  12*6, 39.6 },  {  12*5,  39.6 },{  12*4,  39.6 },{  12*3,  39.6 },  {  12*2,  39.6 }, {12,  39.6},  {   12*0,  39.6 },
+
     {   12*0,  52 },{  12*2,  52 }, {  12*3,  52 }, {  12*4,  52 }, {  12*5,  52 }, {  12*6, 52 }, { 12*7,  52}, { 12*8, 52}, { 12*9,  52 }, { 12*10,  52 }, { 12*11,  52 },   { 12*13,  52 },  { 12*15,  52 }, { 12*16,  52 }, { 12*17,  52 }, { 12*18,  52 }, { 224,  58 },
-    
+
  { 12*18,  64 },  { 12*17,  64 },  { 12*16,  64 },  { 12*15,  64 },{ 12*14,  64 }, { 12*13,  64 },  { 12*11,  64 },   {  12*6, 64 }, {  12*2,  64 }, {12,  64},    {   12*0,  64 }
 },
-{           
+{
 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
@@ -47,13 +47,16 @@ led_config_t g_led_config = {
 4,4,4,4,4,4,4,4,4,4,4,4
 }};
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(75, 0xFF, 0xFF, 0xFF);
     }
     if (host_keyboard_led_state().num_lock) {
         rgb_matrix_set_color(21, 0xFF, 0xFF, 0xFF);
-    }    
+    }
+    return true;
 }
 #endif
diff --git a/keyboards/keebio/iris/keymaps/two_knob/keymap.c b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
index aeeb2df905..173d8a6700 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/keymap.c
+++ b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
@@ -22,7 +22,7 @@ enum custom_layers {
 
 /* Rotary encoder variables used to hold down Command (GUI) key while cycling through open programs. */
 bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;  
+uint16_t cmd_tab_timer = 0;
 
 enum custom_keycodes {
     QWERTY = SAFE_RANGE,
@@ -64,7 +64,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
  * You can download/upload the two_know.json to the configurator:
  * https://config.qmk.fm/#/keebio/iris/rev6a/LAYOUT
  *
- * If you make changes and download the json, you can run qmk json2c two_knob.json to get converted text. 
+ * If you make changes and download the json, you can run qmk json2c two_knob.json to get converted text.
  * You can copy and paste it here.
  * You will have to reneame the array keys from ints to the custom keycode names.
  *
@@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  * |64|--|--|63|--|--|--|    |--|--|--|29|--|--|30|
  *             |--|62|--|    |--|28|--|
  */
-// void rgb_matrix_indicators_user(void) {
+// bool rgb_matrix_indicators_user(void) {
 //   if (IS_LAYER_ON(1)) {
 //     /* Upperleft most key red: */
 //     rgb_matrix_set_color(0,255,0,0);
@@ -217,6 +217,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 //     rgb_matrix_set_color(02, 255, 200, 0);
 //     rgb_matrix_set_color(03, 255, 235, 0);
 //   }
+//    return false;
 // }
 
 /**
@@ -225,8 +226,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  * This can't be programmed through configurator. You must do it here.
  *
  * This uses the amazing "Encoder map" feature which replicates the normal keyswitch layer handling functionality, but with encoders.
- * https://docs.qmk.fm/#/feature_encoders?id=encoder-map 
- * 
+ * https://docs.qmk.fm/#/feature_encoders?id=encoder-map
+ *
  * Uses a variant of the Super-alt-tab macro to switch between open applications on a mac. (Command-tab)
  * https://docs.qmk.fm/#/feature_macros?id=super-alt%e2%86%aftab
  */
diff --git a/keyboards/keybee/keybee65/keymaps/default/keymap.c b/keyboards/keybee/keybee65/keymaps/default/keymap.c
index 8d58a54852..030b38884c 100644
--- a/keyboards/keybee/keybee65/keymaps/default/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/default/keymap.c
@@ -23,9 +23,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
         KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_TAB, KC_Q, KC_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
     ),
 
@@ -76,9 +76,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
 }
 
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(30, 254, 189, 41); // set caps lock led color first nunber is index, R G B
     }
-}
\ No newline at end of file
+    return false;
+}
diff --git a/keyboards/keybee/keybee65/keymaps/via/keymap.c b/keyboards/keybee/keybee65/keymaps/via/keymap.c
index 1eb0a6480c..3ffeaf28ba 100644
--- a/keyboards/keybee/keybee65/keymaps/via/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/via/keymap.c
@@ -25,9 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
         KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_TAB, KC_Q, KC_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
     ),
 
@@ -95,11 +95,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
 }
 
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(30, 254, 189, 41); // set caps lock led color first nunber is index, R G B
     } else if (!(rgb_matrix_get_flags() & LED_FLAG_MODIFIER)) {
         rgb_matrix_set_color(30, 0, 0, 0);
     }
-}
\ No newline at end of file
+    return false;
+}
diff --git a/keyboards/keyboardio/model01/keymaps/default/keymap.c b/keyboards/keyboardio/model01/keymaps/default/keymap.c
index 1ff1eb8370..3ed72adb73 100644
--- a/keyboards/keyboardio/model01/keymaps/default/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/default/keymap.c
@@ -103,10 +103,11 @@ static void set_numpad_colours(int on, void (*write)(int, uint8_t, uint8_t, uint
 /* the RGB matrix effects will overwrite the numpad indicator.
  * this handy mechanism allows to override the matrix effects.
  */
-void rgb_matrix_indicators_user(void) {
-  if (layer_state & (1<<NUM)) {
-    set_numpad_colours(1, &rgb_matrix_set_color);
-  }
+bool rgb_matrix_indicators_user(void) {
+    if (layer_state & (1 << NUM)) {
+        set_numpad_colours(1, &rgb_matrix_set_color);
+    }
+    return false;
 }
 #else   /* no RGB matrix support */
 
diff --git a/keyboards/keychron/q0/q0.c b/keyboards/keychron/q0/q0.c
index d17ab77f47..554476ad8c 100644
--- a/keyboards/keychron/q0/q0.c
+++ b/keyboards/keychron/q0/q0.c
@@ -42,7 +42,10 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
     // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
 
     if (host_keyboard_led_state().num_lock) {
@@ -52,6 +55,7 @@ __attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min,
             RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 0, 0, 0);
         }
     }
+    return true;
 }
 
 #endif  // NUM_LOCK_LED_INDEX
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c
index f5e8d48cba..b7d12f9466 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
     }
 }
 
-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) {
     uint8_t current_layer = get_highest_layer(layer_state);
     switch (current_layer) {
         case MAC_BASE:
@@ -49,6 +49,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 #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) {
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c
index 90e16ded46..c6fa5f1f15 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
     }
 }
 
-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) {
     uint8_t current_layer = get_highest_layer(layer_state);
     switch (current_layer) {
         case MAC_BASE:
@@ -54,6 +54,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
             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) {
@@ -67,11 +68,11 @@ void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t l
 
 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 {
@@ -80,4 +81,4 @@ bool is_caps_lock_indicator(uint16_t keycode) {
 }
 
 bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
\ No newline at end of file
+bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c
index 6750dc86c7..fbc37fb5bf 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
     }
 }
 
-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) {
     uint8_t current_layer = get_highest_layer(layer_state | default_layer_state);
     switch (current_layer) {
         case MAC_BASE:
@@ -59,6 +59,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 #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) {
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
index 4903421cab..638aa77eb0 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
     }
 }
 
-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) {
     uint8_t current_layer = get_highest_layer(layer_state);
     switch (current_layer) {
         case MAC_BASE:
@@ -49,6 +49,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 #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) {
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c
index 90e16ded46..c6fa5f1f15 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c
+++ b/keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
     }
 }
 
-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) {
     uint8_t current_layer = get_highest_layer(layer_state);
     switch (current_layer) {
         case MAC_BASE:
@@ -54,6 +54,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
             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) {
@@ -67,11 +68,11 @@ void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t l
 
 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 {
@@ -80,4 +81,4 @@ bool is_caps_lock_indicator(uint16_t keycode) {
 }
 
 bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
\ No newline at end of file
+bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c b/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c
index 6df0e9530f..604f54a705 100644
--- a/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c
+++ b/keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c
@@ -31,7 +31,7 @@ void rgb_matrix_init_user(void) {
     }
 }
 
-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) {
     uint8_t current_layer = get_highest_layer(layer_state);
     switch (current_layer) {
         case MAC_BASE:
@@ -50,6 +50,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 #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) {
@@ -69,4 +70,4 @@ bool is_caps_lock_indicator(uint16_t keycode) {
 #endif
 }
 
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
\ No newline at end of file
+bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
index 16c2a6d784..4a80b8ac36 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
@@ -67,7 +67,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         } else {
             tap_code_delay(KC_VOLD, 10);
         }
-    } else {  
+    } else {
         if ((get_mods() & MOD_BIT(KC_LCMD)) != MOD_BIT(KC_LCMD)) {
             register_code(KC_LCMD);
             defer_exec(20, cancel_cmd, NULL);
@@ -81,7 +81,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return false;
 }
 
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_user(void) {
     switch(get_highest_layer(layer_state|default_layer_state)) {
         case 1:
             rgb_matrix_set_color_all(RGB_BLACK);
@@ -91,4 +91,5 @@ void rgb_matrix_indicators_kb(void) {
             rgb_matrix_set_color_all(RGB_BLACK);
             break;
     }
+    return false;
 }
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
index ba83e47f5f..f988956451 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
         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, XXXXXXX, XXXXXXX,      XXXXXXX,     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
     )
 };
 
@@ -72,8 +72,8 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
 
     #ifdef UNDERGLOW_DISABLE
     void keyboard_pre_init_user(void) {
-        
-        for (int key_id = 0; key_id < RGB_MATRIX_LED_COUNT; key_id++ ) {
+
+        for (int key_id = 0; key_id < DRIVER_LED_TOTAL; key_id++ ) {
             if (g_led_config.flags[key_id] == LED_FLAG_UNDERGLOW) {
                 g_led_config.flags[key_id] = LED_FLAG_NONE;
             }
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
     }
     #endif
 
-    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) {
         if (LAYER != _MAIN) {
 
             int DimmedMax = UINT8_MAX - (UINT8_MAX - rgb_matrix_config.hsv.v);
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
             for (uint8_t i = led_min; i <= led_max; i++) {
 
                 uint8_t pos = ((uint8_t*)g_led_config.matrix_co)[i];
-                
+
                 CHECK_LED(); // Check LED before moving on
                 uint16_t KC = pgm_read_word(&((uint16_t*)keymaps)[(LAYER_SIZE * LAYER) + i]);
 
@@ -111,6 +111,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
 
             }
         }
+    return false;
     }
 #endif
 
@@ -162,4 +163,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         default:
             return true; //Process all other keycodes normally
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
index 29e359b94a..2ec9a5f9b3 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
@@ -257,7 +257,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 */
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     uint8_t red[3] = {50, 5, 0};
     uint8_t yellow[3] = {50, 50, 0};
     uint8_t blue[3] = {0, 15, 50};
@@ -323,5 +323,5 @@ void rgb_matrix_indicators_user(void) {
     if (led_state.scroll_lock) {
         rgb_matrix_set_color(23, green[0], green[1], green[2]);
     }
-
+    return false;
 }
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
index 12db3f2eec..71cd9f074e 100755
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
@@ -1,17 +1,17 @@
 /* Copyright 2021 Gabriel Bustamante Toledo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
 
@@ -36,7 +36,7 @@ void set_color(int r, int g, int b){
 	rgb_matrix_set_color(41, r, g, b);
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
 	switch (get_highest_layer(layer_state)) {
 		case BASE2:
@@ -53,7 +53,7 @@ void rgb_matrix_indicators_user(void) {
 			break;
 		case SYM:
 			set_color(0, 50, 1.9);
-			break;		
+			break;
 		case NUM:
 			set_color(10, 0, 50);
 			break;
@@ -61,6 +61,7 @@ void rgb_matrix_indicators_user(void) {
 			set_color(50, 0, 0);
 			break;
 	}
+    return false;
 }
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -122,4 +123,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	)
 
 };
-
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
index 1e97aba495..5e0d4afa32 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
@@ -67,7 +67,7 @@ void matrix_scan_user(void) {
 
 //layer led colors
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
 //game indicators
 
@@ -160,6 +160,7 @@ if(IS_LAYER_ON(NSSL)) {
   rgb_matrix_set_color(28, 0, 50, 1.9);
   rgb_matrix_set_color(29, 0, 50, 1.9);
 
+    return false;
 }
 
 //capslock leds
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
index 6411a07d4f..1d274880c2 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
@@ -67,7 +67,7 @@ void matrix_scan_user(void) {
 
 //layer led colors
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
   for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
     if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
@@ -141,6 +141,7 @@ void rgb_matrix_indicators_user(void) {
     }
   }
 
+    return false;
 }
 
 //tap dance declarations
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
index 8f1eb6d358..d1c33599a2 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
@@ -67,7 +67,7 @@ void matrix_scan_user(void) {
 
 //layer led colors
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
   for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
     if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
@@ -105,6 +105,7 @@ void rgb_matrix_indicators_user(void) {
     }
   }
 
+    return false;
 }
 
 //tap dance declarations
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 55e0667f45..bcf69323a7 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -130,11 +130,14 @@ led_config_t g_led_config = {
     }
 };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
index 5dc0e8dc1d..9f7333b721 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
@@ -48,11 +48,14 @@ led_config_t g_led_config = { {
     2, 2, 2, 2, 2, 2
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index fd964a67cd..6cb40e0622 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -117,11 +117,14 @@ led_config_t g_led_config = {
     }
 };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
 
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index 7144db99ef..9ea82691e2 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -131,11 +131,14 @@ led_config_t g_led_config = { {
 #    endif
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 // clang-format on
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
index fb7e9c33c3..8da5f08572 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
@@ -1,23 +1,23 @@
 /* Copyright 2021 David Martinz
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_ansi(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
-	                     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
+	                     KC_TAB, KC_Q, KC_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),
@@ -29,11 +29,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-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 white
     if (host_keyboard_led_state().caps_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(28, 200, 200, 200);
-    } 
+    }
 
     // layer state
     switch (get_highest_layer(layer_state)) {
@@ -54,5 +54,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             RGB_MATRIX_INDICATOR_SET_COLOR(59, 128, 128, 128);
             break;
     }
+    return false;
 }
 #endif
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
index 93a90f12b0..9979b7baa3 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
@@ -1,18 +1,18 @@
 /* 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/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a 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 {
@@ -117,7 +117,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 
-void rgb_matrix_indicators_kb(void)
+bool rgb_matrix_indicators_user(void)
 {
 	if (!g_suspend_state && rgb_matrix_config.enable) {
         switch (get_highest_layer(layer_state)) {
@@ -141,4 +141,5 @@ void rgb_matrix_indicators_kb(void)
                 break;
         }
     }
+    return false;
 }
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index 7da219eec2..a9c5508236 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -127,11 +127,14 @@ led_config_t g_led_config = {
     }
 };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 // clang-format on
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
index 18986c604c..557be513ad 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
@@ -266,19 +266,19 @@ void set_led_color_by_hsv(int ledkey, uint8_t h_in, uint8_t s_in, uint8_t v_in){
 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]));    
+                              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 
+                // 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);      
-            } 
+                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 
+                // 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);
             }
@@ -300,7 +300,7 @@ void set_caps_lock(int layer) {
         // 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 
+            // 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);
@@ -316,14 +316,14 @@ void set_layer_color(int layer) {
         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_) {
@@ -439,10 +439,11 @@ void set_layer_color(int layer) {
     return;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     int layer = get_highest_layer(layer_state);
     set_layer_color(layer);
     set_caps_lock(layer);
+    return false;
 }
 
 #ifdef LEADER_ENABLE
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
index 680f79a668..5563816ff3 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
@@ -249,9 +249,10 @@ void set_layer_color(int layer) {
   return;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
   set_layer_color(get_highest_layer(layer_state));
 
+    return false;
 }
 
 #ifdef LEADER_ENABLE
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
index 6e0fd57117..0b2a8f7042 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
@@ -54,10 +54,13 @@ led_config_t g_led_config = { {
   2, 2, 2, 2, 2, 2
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
index 0ac5d0c932..a9bf663c19 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
@@ -288,7 +288,7 @@ void set_layer_color(int layer) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
@@ -300,4 +300,5 @@ void rgb_matrix_indicators_user(void) {
     }
         set_layer_color(get_highest_layer(layer_state));
 
+    return false;
 }
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
index 4634a662b6..78f4a15818 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
@@ -43,10 +43,13 @@ led_config_t g_led_config = { {
 } };
 
 //CAPS backlight
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
index 2fb7a6e9bf..4a13d037d6 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
@@ -113,12 +113,13 @@ led_config_t g_led_config = { {
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/kprepublic/bm80v2/bm80v2.c b/keyboards/kprepublic/bm80v2/bm80v2.c
index dd89c1b0f0..7de8c558c7 100644
--- a/keyboards/kprepublic/bm80v2/bm80v2.c
+++ b/keyboards/kprepublic/bm80v2/bm80v2.c
@@ -18,11 +18,11 @@
 
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, 
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    
+    {0, CS6_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_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},
@@ -34,8 +34,8 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW7, CS20_SW7, CS19_SW7},
     {0, CS21_SW8, CS20_SW8, CS19_SW8},
 
-    
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},     
+
+    {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},
@@ -44,7 +44,7 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {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_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},
@@ -52,45 +52,45 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0,CS24_SW6, CS23_SW6, CS22_SW6},
     {0,CS24_SW7, CS23_SW7, CS22_SW7},
     {0,CS24_SW8, CS23_SW8, CS22_SW8},
-    
-    {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_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_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_SW6, CS26_SW6, CS25_SW6},
     {0, CS27_SW7, CS26_SW7, CS25_SW7},
     {0, CS27_SW8, CS26_SW8, CS25_SW8},
-    
+
     {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_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, 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_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},
@@ -101,16 +101,16 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     {0, CS3_SW1, CS2_SW1, CS1_SW1},
     {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3}, 
-    {0, CS3_SW6, CS2_SW6, CS1_SW6}, 
+    {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, CS36_SW8, CS35_SW8, CS34_SW8}
+
 };
 led_config_t g_led_config = { {
     {  0,  NO_LED,      1,     2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13,     14,     15 },
@@ -133,17 +133,17 @@ led_config_t g_led_config = { {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,       1,
-    1, 1, 1,       4,     1, 1, 1, 1,         1, 1, 1 
+    1, 1, 1,       4,     1, 1, 1, 1,         1, 1, 1
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(50, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
-
diff --git a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
index 8c6eaf5a5b..e73cffd108 100644
--- a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
+++ b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
@@ -18,11 +18,11 @@
 
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, 
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    
+    {0, CS6_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_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},
@@ -34,8 +34,8 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW7, CS20_SW7, CS19_SW7},
     {0, CS21_SW8, CS20_SW8, CS19_SW8},
 
-    
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},     
+
+    {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},
@@ -44,7 +44,7 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {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_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},
@@ -52,46 +52,46 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0,CS24_SW6, CS23_SW6, CS22_SW6},
     {0,CS24_SW7, CS23_SW7, CS22_SW7},
     {0,CS24_SW8, CS23_SW8, CS22_SW8},
-    
-    {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_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_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_SW6, CS26_SW6, CS25_SW6},
     {0, CS27_SW7, CS26_SW7, CS25_SW7},
     {0, CS27_SW8, CS26_SW8, CS25_SW8},
-    
+
     {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_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, 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_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},
@@ -102,16 +102,16 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
     {0, CS3_SW1, CS2_SW1, CS1_SW1},
     {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3}, 
-    {0, CS3_SW6, CS2_SW6, CS1_SW6}, 
+    {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, CS36_SW8, CS35_SW8, CS34_SW8}
+
 };
 led_config_t g_led_config = { {
     {  0,  NO_LED,      1,     2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13,     14,     15 },
@@ -134,17 +134,17 @@ led_config_t g_led_config = { {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,       1,
-    1, 1, 1,       4,     1, 1, 1, 1,         1, 1, 1 
+    1, 1, 1,       4,     1, 1, 1, 1,         1, 1, 1
 } };
 
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(50, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
-
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
index 80deedc7b5..5d9de5173c 100644
--- a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.num_lock) {
@@ -58,4 +58,5 @@ void rgb_matrix_indicators_user(void) {
     }
         //set_layer_color(get_highest_layer(layer_state));
 
+    return false;
 }
diff --git a/keyboards/latincompass/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
index 131c184124..5a457246c4 100644
--- a/keyboards/latincompass/latin60rgb/latin60rgb.c
+++ b/keyboards/latincompass/latin60rgb/latin60rgb.c
@@ -1,18 +1,18 @@
  /* Copyright 2021 latincompass
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 #include "latin60rgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
@@ -49,9 +49,9 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 0, H_1,  G_1,  I_1 },
 
     { 0, E_16, D_16, F_16 },
-    { 0, E_15, D_15, F_15 },	
+    { 0, E_15, D_15, F_15 },
     { 0, E_14, D_14, F_14 },
-    { 0, E_13, D_13, F_13 },	
+    { 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 },
@@ -91,7 +91,7 @@ led_config_t g_led_config = {
         {  18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5      },
         {           4,   3,       2,               1 ,0           }
     }, {
-        { 224,   0 }, { 208,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, 
+        { 224,   0 }, { 208,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 },
         { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
         { 204,  32 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 },               {   6,  32 },
         { 224,  48 }, { 198,  64 }, { 202,  48 }, { 180,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  20,  48 }, {  10,  48 },
@@ -115,10 +115,13 @@ void suspend_wakeup_init_kb(void) {
     suspend_wakeup_init_user();
 }
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
diff --git a/keyboards/linworks/fave65h/keymaps/default/keymap.c b/keyboards/linworks/fave65h/keymaps/default/keymap.c
index 1aa0b7cd73..308c2a9acc 100644
--- a/keyboards/linworks/fave65h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default/keymap.c
@@ -67,9 +67,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(0, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
index 5c7efc6d83..15d9bcb765 100644
--- a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
@@ -67,9 +67,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(0, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
index b3a91f7a22..a4264c8412 100644
--- a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
@@ -67,9 +67,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(0, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/linworks/fave65h/keymaps/via/keymap.c b/keyboards/linworks/fave65h/keymaps/via/keymap.c
index 8388a60c87..7febf885ce 100644
--- a/keyboards/linworks/fave65h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/via/keymap.c
@@ -57,9 +57,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(0, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/linworks/fave84h/keymaps/default/keymap.c b/keyboards/linworks/fave84h/keymaps/default/keymap.c
index 72234a44f8..93e7b2f1be 100644
--- a/keyboards/linworks/fave84h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/default/keymap.c
@@ -21,28 +21,29 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                                 KC_RALT,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_tkl_ansi_tsangan_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-        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_VOLU,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_VOLD, KC_MNXT
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        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_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     )
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/linworks/fave84h/keymaps/via/keymap.c b/keyboards/linworks/fave84h/keymaps/via/keymap.c
index 85238100d1..8c41df0618 100644
--- a/keyboards/linworks/fave84h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/via/keymap.c
@@ -23,46 +23,47 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                                 KC_RALT,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_tkl_ansi_tsangan_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-        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_VOLU,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_VOLD, KC_MNXT
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        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_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 
-    [_LAYER2] = LAYOUT_tkl_ansi_tsangan_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
+    [_LAYER2] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [_LAYER3] = LAYOUT_tkl_ansi_tsangan_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
+    [_LAYER3] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/linworks/fave87h/keymaps/default/keymap.c b/keyboards/linworks/fave87h/keymaps/default/keymap.c
index e53b840d76..e8f4da2c1e 100644
--- a/keyboards/linworks/fave87h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/default/keymap.c
@@ -21,28 +21,29 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_tkl_ansi_split_bs(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_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
+    [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                        KC_RALT, KC_RGUI,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_tkl_ansi_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-        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_VOLU,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_VOLD, KC_MNXT
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        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_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     )
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/linworks/fave87h/keymaps/via/keymap.c b/keyboards/linworks/fave87h/keymaps/via/keymap.c
index 2b3210c1e0..fc00ec1725 100644
--- a/keyboards/linworks/fave87h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/via/keymap.c
@@ -23,46 +23,47 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_tkl_ansi_split_bs(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_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
+    [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                        KC_RALT, KC_RGUI,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_tkl_ansi_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-        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_VOLU,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_VOLD, KC_MNXT
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        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_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 
-    [_LAYER2] = LAYOUT_tkl_ansi_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_TRNS
+    [_LAYER2] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [_LAYER3] = LAYOUT_tkl_ansi_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_TRNS
+    [_LAYER3] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
+    return false;
 }
diff --git a/keyboards/massdrop/alt/config_led.c b/keyboards/massdrop/alt/config_led.c
index 85ae67878b..963282db1e 100644
--- a/keyboards/massdrop/alt/config_led.c
+++ b/keyboards/massdrop/alt/config_led.c
@@ -50,8 +50,12 @@ led_config_t g_led_config = { {
 
 
 #ifdef USB_LED_INDICATOR_ENABLE
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
     md_rgb_matrix_indicators_advanced(led_min, led_max);
+    return true;
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
diff --git a/keyboards/massdrop/alt/keymaps/pregame/keymap.c b/keyboards/massdrop/alt/keymaps/pregame/keymap.c
index 6a78f075fb..c91e557b50 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/pregame/keymap.c
@@ -199,11 +199,12 @@ void set_layer_color(int layer) {
         }
     }
 }
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (g_suspend_state || disable_layer_color ||
         rgb_matrix_get_flags() == LED_FLAG_NONE ||
         rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
             return;
         }
     set_layer_color(get_highest_layer(layer_state));
+    return false;
 }
diff --git a/keyboards/massdrop/ctrl/config_led.c b/keyboards/massdrop/ctrl/config_led.c
index bd708c2cb8..50daa68e75 100644
--- a/keyboards/massdrop/ctrl/config_led.c
+++ b/keyboards/massdrop/ctrl/config_led.c
@@ -73,8 +73,12 @@ led_config_t g_led_config = { {
 
 
 #ifdef USB_LED_INDICATOR_ENABLE
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
     md_rgb_matrix_indicators_advanced(led_min, led_max);
+    return true;
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c b/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
index ec32b652da..72446506d9 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
@@ -73,9 +73,10 @@ led_config_t g_led_config = { {
 
 
 #ifdef USB_LED_INDICATOR_ENABLE
-void rgb_matrix_indicators_kb(void)
+bool rgb_matrix_indicators_kb(void)
 {
   md_rgb_matrix_indicators();
+    return rgb_matrix_indicators_user();
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
index 9439d105ba..846fc7070c 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
@@ -372,13 +372,14 @@ void set_layer_color(int layer) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (disable_layer_color ||
         rgb_matrix_get_flags() == LED_FLAG_NONE ||
         rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
             return;
         }
     set_layer_color(get_highest_layer(layer_state));
+    return false;
 }
 
 /* This is a test function for Raw HID, which is currently not implemented for this keyboard */
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
index a1c1dec543..732a60a6c5 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
@@ -91,7 +91,10 @@ led_config_t g_led_config = { {
 // clang-format on
 
 #    ifdef USB_LED_INDICATOR_ENABLE
-void rgb_matrix_indicators_kb(void) { md_rgb_matrix_indicators(); }
+bool rgb_matrix_indicators_kb(void) {
+    md_rgb_matrix_indicators();
+    return rgb_matrix_indicators_user();
+}
 #    endif  // USB_LED_INDICATOR_ENABLE
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
index 406263cee5..0ea23ccb4c 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_KL] = LAYOUT(  
+    [_KL] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
@@ -99,7 +99,7 @@ const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
         _______, GOLD,    CORAL,   _______, _______, _______, _______, RED,     {1,0,0}, CYAN,    M9B59B5, _______, _______,
         _______, RED,     _______, _______, _______, RED,     PINK,    YELLOW,  GREEN,   CREAM,   _______, _______,                              _______,
         _______, _______, _______,                   _______,                            _______, WHITE,   _______, _______,            CORAL,   _______, CORAL
-    },  
+    },
 };
 #    undef _______
 #    define _______ KC_TRNS
@@ -278,9 +278,10 @@ void set_layer_color(int layer) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (g_suspend_state || disable_layer_color || rgb_matrix_get_flags() == LED_FLAG_NONE || rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
         return;
     }
     set_layer_color(get_highest_layer(layer_state));
+    return false;
 }
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c b/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
index 650b31477c..d83318de83 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
@@ -1,18 +1,18 @@
 /* Copyright 2022 Daniel Weeks (@xanimos)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 
 #ifdef RGB_MATRIX_ENABLE
 #include "ctrl.h"
@@ -89,8 +89,9 @@ led_config_t g_led_config = { {
 
 
 #ifdef USB_LED_INDICATOR_ENABLE
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
     md_rgb_matrix_indicators_advanced(led_min, led_max);
+    return rgb_matrix_indicators_advanced_user(led_min, led_max);
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
index 2b6515fc97..561171a04a 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
@@ -1,18 +1,18 @@
 /* Copyright 2022 Daniel Weeks (@xanimos)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You 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.h"
 
@@ -334,7 +334,7 @@ void set_layer_color(int layer) {
             float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
             rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
             continue;
-        } 
+        }
         if(layer == _FL && i <= 4 && i >= 1) {
             continue; // Leave RGB for F1-F4 of function layer to adjust RGB settings
         }
@@ -343,13 +343,14 @@ void set_layer_color(int layer) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (disable_layer_color ||
         rgb_matrix_get_flags() == LED_FLAG_NONE ||
         rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
             return;
         }
     set_layer_color(get_highest_layer(layer_state));
+    return false;
 }
 
 
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index edbbe39c4b..20b4b69114 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -68,7 +68,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {1, C1_5,   C2_5,   C3_5}, //D160-C10-42
     {1, C4_5,   C5_5,   C7_6}, //D166-C11-43
     {1, C1_6,   C2_6,   C3_6}, //D173-C12-44
-    {1, C4_6,   C5_6,   C6_6}, //D178-C13-45    
+    {1, C4_6,   C5_6,   C6_6}, //D178-C13-45
 
     {1, C2_9,   C3_9,   C4_9},  //D80-D0-46
     {1, C1_9,   C3_10,  C4_10}, //D89-D2-47
@@ -78,7 +78,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {1, C1_12,  C2_12,  C3_12}, //D82-D8-51
     {1, C1_13,  C2_13,  C3_13}, //D91-D10-52
     {1, C4_13,  C5_13,  C7_14}, //D96-D11-53
-    {1, C1_15,  C2_15,  C3_15}, //D87-D14-54                          
+    {1, C1_15,  C2_15,  C3_15}, //D87-D14-54
     {1, C4_15,  C5_15,  C6_15}, //D87-D14-55
     {1, C1_16,  C2_16,  C3_16}, //D87-D14-56
     {1, C4_16,  C5_16,  C6_16}, //D87-D14-57
@@ -107,20 +107,24 @@ led_config_t g_led_config = { {
   {0,0},      { 17,  0},  { 34, 0 },  { 51, 0 },  { 69, 0},   { 86, 0},   {100, 0},   {103, 0},   { 120, 0},  { 138, 0},  { 155, 0},  { 172, 0},  { 189, 0},    {207,  0},   {215,  0},   {223, 0},   {224, 0},
   {0,16},     { 17, 16},  { 34,16 },  { 51,16 },  { 69,16},   { 86,16},   {103,16},               { 120,16},  { 138,16},  { 155,16},  { 172,16},  { 189,16},    {207, 16},   {215, 16},   {224,16},
   {0,32},     { 17, 32},  { 34,32 },  { 51,32 },  { 69,32},   { 86,32},   {103,32},   { 120,32},  { 138,32},  { 155,32},  { 172,32},  { 189,32},  {207, 32},    {224,32},
-              { 17, 48},  { 34,48 },  { 51,48 },  { 69,48},   { 86,48},   {103,48},   { 120,48},  { 138,48},  { 155,48},  { 172,48},  { 189,48},  {207, 48},    {215, 48},   {224,48},    {224,48},    
-              { 17, 64},              { 51,64 },              { 86,64},   { 103,64},              { 138,64},              { 172,64},              {224, 64},      
+              { 17, 48},  { 34,48 },  { 51,48 },  { 69,48},   { 86,48},   {103,48},   { 120,48},  { 138,48},  { 155,48},  { 172,48},  { 189,48},  {207, 48},    {215, 48},   {224,48},    {224,48},
+              { 17, 64},              { 51,64 },              { 86,64},   { 103,64},              { 138,64},              { 172,64},              {224, 64},
 }, {
   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,          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,            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,           1,
 } };
 
-void rgb_matrix_indicators_user(void) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(33, 255, 255, 255);
-        }
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(33, 255, 255, 255);
+    }
+    return true;
 }
 
 
@@ -168,4 +172,4 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     }
   }
   return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index cf334a962e..ad9c7c4db0 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -78,7 +78,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {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, 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 */
@@ -101,21 +101,25 @@ led_config_t g_led_config = {
         {0,0},      { 17,  0},  { 34, 0 },  { 51, 0 },  { 69, 0},   { 86, 0},   {100, 0},   {103, 0},   { 120, 0},  { 138, 0},  { 155, 0},  { 172, 0},  { 189, 0},    {207,  0},   {215,  0},   {224, 0},
         {0,16},     { 17, 16},  { 34,16 },  { 51,16 },  { 69,16},   { 86,16},   {103,16},               { 120,16},  { 138,16},  { 155,16},  { 172,16},  { 189,16},    {207, 16},   {215, 16},   {224,16},
         {0,32},     { 17, 32},  { 34,32 },  { 51,32 },  { 69,32},   { 86,32},   {103,32},   { 120,32},  { 138,32},  { 155,32},  { 172,32},  { 189,32},  {207, 32},    {224,32},
-                    { 17, 48},  { 34,48 },  { 51,48 },  { 69,48},   { 86,48},   {103,48},   { 120,48},  { 138,48},  { 155,48},  { 172,48},  { 189,48},  {207, 48},    {215, 48},   {224,48},   
-                    { 17, 64},              { 51,64 },              { 86,64},   { 103,64},              { 138,64},              { 172,64},              {224, 64},      
+                    { 17, 48},  { 34,48 },  { 51,48 },  { 69,48},   { 86,48},   {103,48},   { 120,48},  { 138,48},  { 155,48},  { 172,48},  { 189,48},  {207, 48},    {215, 48},   {224,48},
+                    { 17, 64},              { 51,64 },              { 86,64},   { 103,64},              { 138,64},              { 172,64},              {224, 64},
     }, {
         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,          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,           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,
+    }
 };
 
-__attribute__((weak)) void rgb_matrix_indicators_user(void) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(32, 255, 255, 255);
-        }
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(32, 255, 255, 255);
+    }
+    return true;
 }
 
 
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
index 448f7156fd..3e02735cdf 100644
--- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
+++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
@@ -60,12 +60,12 @@ led_config_t g_led_config = { {
     },
     {
   //LED Index to Physical Positon
-  {  0,  0},  { 75,  0},  {149,  0},  {224,  0},     
-  {  0, 13},  { 75, 13},  {149, 13},  {224, 13},     
-  {  0, 25},  { 75, 25},  {149, 25},  {224, 25},     
-  {  0, 38},  { 75, 38},  {149, 38},  {224, 38},     
-  {  0, 51},  { 75, 51},  {149, 51},  {224, 51},     
-  {  0, 64},  { 37, 64},  { 75, 64},  {149, 64},  {224, 64},               
+  {  0,  0},  { 75,  0},  {149,  0},  {224,  0},
+  {  0, 13},  { 75, 13},  {149, 13},  {224, 13},
+  {  0, 25},  { 75, 25},  {149, 25},  {224, 25},
+  {  0, 38},  { 75, 38},  {149, 38},  {224, 38},
+  {  0, 51},  { 75, 51},  {149, 51},  {224, 51},
+  {  0, 64},  { 37, 64},  { 75, 64},  {149, 64},  {224, 64},
 }, {
   4,          4,          4,          4,
   4,          1,          1,          4,
@@ -75,10 +75,14 @@ led_config_t g_led_config = { {
   4,          0,          1,          1,          4,
 } };
 
-void rgb_matrix_indicators_kb(void) {
-        if (host_keyboard_led_state().num_lock) {
-            rgb_matrix_set_color(4, 255, 255, 255);
-        }
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().num_lock) {
+        rgb_matrix_set_color(4, 255, 255, 255);
+    }
+    return true;
 }
 
 __attribute__((weak))
@@ -117,7 +121,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) { return false; }
-    
+
   if (record->event.pressed) {
     switch(keycode) {
         #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
index 6b1b8604a2..b61ac10b14 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
@@ -27,21 +27,26 @@ led_config_t g_led_config = { {
 }, {
   //LED Index to Physical Positon
   {  0,  0},  { 16,  0},  { 32, 0 },  { 48, 0 },  { 64, 0},   { 80, 0},   { 96, 0},   { 112, 0},  { 128, 0},  { 144, 0},  { 160, 0},  { 176, 0},    {192,  0},   {208,  0},   {216, 0},
-  {220, 0},   {211, 16},  {200,16 },  {176,16 },  {160,16},   {144,16},   {128,16},   { 112,16},  { 96,16},   { 80,16},   { 64,16},   { 48,16},     {32, 16},    {16, 16},    {0,16}, 
-  {  0, 32},  { 16, 32},  { 32,32 },  { 48,32 },  { 64,32},   { 80,32},   { 96,32},   { 112,32},  { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {208, 32},   {224,48}, 
-  {208, 48},  {192, 48},  {160,48 },  {144,48 },  {128,48},   {112,48},   {96,48},    { 80,48},   { 64,48},   { 48,48},   { 32,48},   { 16,48},     {8, 48},     {0, 48},     {0,48}, 
-  {  0, 64},  { 16, 64},  { 32,64 },  { 48,64 },  { 64,64},   { 80,64},   { 96,64},   { 112,64},  { 144,64},  { 160,64},  { 192,64},  { 224,64},                         
+  {220, 0},   {211, 16},  {200,16 },  {176,16 },  {160,16},   {144,16},   {128,16},   { 112,16},  { 96,16},   { 80,16},   { 64,16},   { 48,16},     {32, 16},    {16, 16},    {0,16},
+  {  0, 32},  { 16, 32},  { 32,32 },  { 48,32 },  { 64,32},   { 80,32},   { 96,32},   { 112,32},  { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {208, 32},   {224,48},
+  {208, 48},  {192, 48},  {160,48 },  {144,48 },  {128,48},   {112,48},   {96,48},    { 80,48},   { 64,48},   { 48,48},   { 32,48},   { 16,48},     {8, 48},     {0, 48},     {0,48},
+  {  0, 64},  { 16, 64},  { 32,64 },  { 48,64 },  { 64,64},   { 80,64},   { 96,64},   { 112,64},  { 144,64},  { 160,64},  { 192,64},  { 224,64},
 }, {
   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,          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,          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,          1,          1,          1,          1,          1,          1,          1,          1,          1,
 } };
 
-void rgb_matrix_indicators_user(void) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(30, 255, 255, 255);
-        }
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(30, 255, 255, 255);
+    }
+    return true;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
index bb88a316ea..a2812aa41d 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
@@ -123,8 +123,8 @@ led_config_t g_led_config = { {
   {  0,  0},  { 16,  0},  { 32, 0 },  { 48,  0}, //9-59-68-76
   {  0, 16},  { 16, 16},  { 32, 16},  { 48, 16}, //10-60-72-77
   {  0, 32},  { 16, 32},  { 32, 32},  { 48, 32}, //46-61-73-78
-  {  0, 48},  {  0, 48},  { 12, 48},  { 16, 48}, //126-51-63-74  
-  {  0, 64},  { 16, 64}, //56-67  
+  {  0, 48},  {  0, 48},  { 12, 48},  { 16, 48}, //126-51-63-74
+  {  0, 64},  { 16, 64}, //56-67
   { 64,  0},  { 80,  0},   { 96, 0},  { 112, 0}, //80-84-89-94
   { 64, 16},  { 80, 16},   { 96,16},  { 112,16}, //81-85-90-95
   { 64, 32},  { 80, 32},   { 96,32},  { 112,32}, //82-86-91-96
@@ -133,34 +133,38 @@ led_config_t g_led_config = { {
   { 128, 0},  { 144, 0},  { 160, 0},  { 176, 0},    {192,  0},   {220,  0},   {210, 0}, //98-102-106-111-116-121-130
   { 128,16},   {144,16},   {160,16},  {176, 16},    {192, 16},   {220, 16},   {220,16}, //99-103-107-112-117-129-122
   { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {220, 32}, //100-104-108-113-118-123
-  {  96,48},   {112,48},  {128, 48},  {144, 48},    {160, 48},   {200, 48},   {220,48},   {220,48}, //97-101-105-109-114-119-128-124 
+  {  96,48},   {112,48},  {128, 48},  {144, 48},    {160, 48},   {200, 48},   {220,48},   {220,48}, //97-101-105-109-114-119-128-124
   {  96,64},   {144,64},   {160,64},   {176,64},    {220, 64}, //127-110-115-120-125
-  { 220, 0},   //140                  
+  { 220, 0},   //140
 }, {
   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,          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,          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,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,
 } };
 
-__attribute__((weak)) void rgb_matrix_indicators_user(void) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(8, 255, 255, 255);
-            rgb_matrix_set_color(70, 255, 0, 0);
-        } else {
-            rgb_matrix_set_color(70, 0, 0, 0);
-        }
-        if (host_keyboard_led_state().num_lock) {
-            rgb_matrix_set_color(71, 255, 0, 0);
-        } else {
-            rgb_matrix_set_color(71, 0, 0, 0);
-        }
-        if (host_keyboard_led_state().scroll_lock) {
-            rgb_matrix_set_color(72, 255, 0, 0);
-        } else {
-            rgb_matrix_set_color(72, 0, 0, 0);
-        }
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(8, 255, 255, 255);
+        rgb_matrix_set_color(70, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(70, 0, 0, 0);
+    }
+    if (host_keyboard_led_state().num_lock) {
+        rgb_matrix_set_color(71, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(71, 0, 0, 0);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(72, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(72, 0, 0, 0);
+    }
+    return true;
 }
 
 __attribute__((weak))
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
index c1463cf4ca..210fb843b3 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -120,9 +120,9 @@ led_config_t g_led_config = { {
         {65,         66,          67,          68,          69,          70,          71,          72,          73,          74,           75,           76,           77,           78,       NO_LED,           79,       NO_LED},
         {80,         81,          82,      NO_LED,      NO_LED,      NO_LED,          83,      NO_LED,      NO_LED,      NO_LED,           84,           85,           86,           87,           88,           89,           90}
     }, {
-        {0, 0},  {14, 0},    {28, 0},    {42,  0},    {56,  0},    {70,  0},    {84,  0},    {98,  0},    {112,  0},    {126,  0},     {140,  0},     {154,  0},     {168,  0},     {182,  0},     {196,  0},     {210,  0},      {224,  0},        
-        {0,16},  {14,16},    {28,16},    {42, 16},    {56, 16},    {70, 16},    {84, 16},    {98, 16},    {112, 16},    {126, 16},     {140, 16},     {154, 16},     {168, 16},     {182, 16},     {196, 16},     {210, 16},      {224, 16},        
-        {0,32},  {14,32},    {28,32},    {42, 32},    {56, 32},    {70, 32},    {84, 32},    {98, 32},    {112, 32},    {126, 32},     {140, 32},     {154, 32},     {168, 32},     {182, 32},     {196, 32},     {210, 32},      {224, 32},        
+        {0, 0},  {14, 0},    {28, 0},    {42,  0},    {56,  0},    {70,  0},    {84,  0},    {98,  0},    {112,  0},    {126,  0},     {140,  0},     {154,  0},     {168,  0},     {182,  0},     {196,  0},     {210,  0},      {224,  0},
+        {0,16},  {14,16},    {28,16},    {42, 16},    {56, 16},    {70, 16},    {84, 16},    {98, 16},    {112, 16},    {126, 16},     {140, 16},     {154, 16},     {168, 16},     {182, 16},     {196, 16},     {210, 16},      {224, 16},
+        {0,32},  {14,32},    {28,32},    {42, 32},    {56, 32},    {70, 32},    {84, 32},    {98, 32},    {112, 32},    {126, 32},     {140, 32},     {154, 32},     {168, 32},     {182, 32},     {196, 32},     {210, 32},      {224, 32},
         {0,48},  {14,48},    {28,48},    {42, 48},    {56, 48},    {70, 48},    {84, 48},    {98, 48},    {112, 48},    {126, 48},     {140, 48},     {154, 48},     {168, 48},     {182, 48},
         {0,64},  {14,64},    {28,64},    {42, 64},    {56, 64},    {70, 64},    {84, 64},    {98, 64},    {112, 64},    {126, 64},     {140, 64},     {154, 64},     {168, 64},     {182, 64},     {210, 64},
         {0,80},  {14,80},    {28,80},                                           {84, 80},                                              {140, 80},     {154, 80},     {168, 80},     {182, 80},     {196, 80},     {210, 80},      {224, 80}
@@ -136,24 +136,16 @@ led_config_t g_led_config = { {
     } };
 
 
-__attribute__((weak))
-void rgb_matrix_indicators_user(void) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(51, 255, 255, 255);
-        }
-        if (host_keyboard_led_state().scroll_lock) {
-            rgb_matrix_set_color(15, 255, 255, 255);
-        }
-}
-
-
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(51, 255, 255, 255);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(15, 255, 255, 255);
+    }
+    return true;
 }
 #endif
diff --git a/keyboards/miller/gm862/gm862.c b/keyboards/miller/gm862/gm862.c
index 08c9bfe73b..2a783dd0a0 100644
--- a/keyboards/miller/gm862/gm862.c
+++ b/keyboards/miller/gm862/gm862.c
@@ -72,11 +72,11 @@ led_config_t g_led_config = { {
     {  41,  42,  43,  44,     45,      46,  47,     48,     49,     50,  51,  NO_LED,NO_LED, 52 },
     {  53,  54,  55,  NO_LED, NO_LED,  56,  NO_LED, NO_LED, NO_LED, 57,  58,  NO_LED,59,     60 }
 }, {
-    {   0,   0 }, {  16,   0 }, {  32,   0 }, {  48,   0 }, {  64,   0 }, {  80,   0 }, {  96,   0 }, { 112,   0 },  { 128,   0 },  { 144,   0 }, { 160,   0 }, { 176,   0 }, { 192,   0 }, { 216,   0 }, 
+    {   0,   0 }, {  16,   0 }, {  32,   0 }, {  48,   0 }, {  64,   0 }, {  80,   0 }, {  96,   0 }, { 112,   0 },  { 128,   0 },  { 144,   0 }, { 160,   0 }, { 176,   0 }, { 192,   0 }, { 216,   0 },
     {   4,  16 }, {  24,  16 }, {  40,  16 }, {  56,  16 }, {  72,  16 }, {  88,  16 }, { 104,  16 }, { 120,  16 },  { 136,  16 },  { 152,  16 }, { 168,  16 }, { 184,  16 }, { 200,  16 }, { 220,  16 },
-    {   6,  32 }, {  28,  32 }, {  44,  32 }, {  60,  32 }, {  76,  32 }, {  92,  32 }, { 108,  32 }, { 124,  32 },  { 140,  32 },  { 156,  32 }, { 172,  32 }, { 188,  32 }, { 204,  32 }, 
+    {   6,  32 }, {  28,  32 }, {  44,  32 }, {  60,  32 }, {  76,  32 }, {  92,  32 }, { 108,  32 }, { 124,  32 },  { 140,  32 },  { 156,  32 }, { 172,  32 }, { 188,  32 }, { 204,  32 },
     {  10,  48 }, {  20,  48 }, {  52,  48 }, {  68,  48 }, {  84,  48 }, { 100,  48 }, { 116,  48 }, { 132,  48 },  { 148,  48 },  { 164,  48 }, { 180,  48 }, { 210,  48 },
-    {   2,  64 }, {  22,  64 }, {  42,  64 }, { 102,  64 }, { 162,  64 }, { 182,  64 }, { 202,  64 }, { 222,  64 },    
+    {   2,  64 }, {  22,  64 }, {  42,  64 }, { 102,  64 }, { 162,  64 }, { 182,  64 }, { 202,  64 }, { 222,  64 },
 }, {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
@@ -86,21 +86,12 @@ led_config_t g_led_config = { {
 } };
 #endif
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
diff --git a/keyboards/ml/gas75/keymaps/default/keymap.c b/keyboards/ml/gas75/keymaps/default/keymap.c
index 65ece63bad..aa72a3c853 100644
--- a/keyboards/ml/gas75/keymaps/default/keymap.c
+++ b/keyboards/ml/gas75/keymaps/default/keymap.c
@@ -179,7 +179,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 #endif
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(2, 0, 0, 0);
 
     HSV      hsv = rgb_matrix_config.hsv;
@@ -198,4 +198,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(2, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/ml/gas75/keymaps/via/keymap.c b/keyboards/ml/gas75/keymaps/via/keymap.c
index 46408fba68..b609f9d142 100644
--- a/keyboards/ml/gas75/keymaps/via/keymap.c
+++ b/keyboards/ml/gas75/keymaps/via/keymap.c
@@ -199,7 +199,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 #endif
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(2, 0, 0, 0);
 
     HSV      hsv = rgb_matrix_config.hsv;
@@ -218,4 +218,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(2, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/monstargear/xo87/rgb/rgb.c b/keyboards/monstargear/xo87/rgb/rgb.c
index 6c08b66da2..c064953444 100644
--- a/keyboards/monstargear/xo87/rgb/rgb.c
+++ b/keyboards/monstargear/xo87/rgb/rgb.c
@@ -64,17 +64,11 @@ led_config_t g_led_config = { {
     1, 8, 8, 8, 4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1
 } };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
 
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     led_t host_leds = host_keyboard_led_state();
     if (host_leds.scroll_lock) {
         rgb_matrix_set_color(92, 0xFF, 0x0, 0x0);
@@ -91,4 +85,5 @@ void rgb_matrix_indicators_user(void) {
     } else {
         rgb_matrix_set_color(94, 0x0, 0x0, 0x0);
     }
+    return true;
 }
diff --git a/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c
index cdff70d69c..7ae43b355d 100644
--- a/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c
+++ b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c
@@ -168,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -185,4 +185,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c
index cdff70d69c..7ae43b355d 100644
--- a/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c
+++ b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c
@@ -168,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -185,4 +185,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
index da5c7c40c3..7e66cc4f32 100644
--- a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
+++ b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
@@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -181,4 +181,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
index da5c7c40c3..7e66cc4f32 100644
--- a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
+++ b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
@@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -181,4 +181,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mt/mt64rgb/keymaps/default/keymap.c b/keyboards/mt/mt64rgb/keymaps/default/keymap.c
index 84f3b1d35e..7cff3be34c 100644
--- a/keyboards/mt/mt64rgb/keymaps/default/keymap.c
+++ b/keyboards/mt/mt64rgb/keymaps/default/keymap.c
@@ -36,11 +36,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       )
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (layer_state_is(1)) {
         rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
     }
     if (host_keyboard_led_state().caps_lock) {
           rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return false;
 }
diff --git a/keyboards/mt/mt64rgb/keymaps/via/keymap.c b/keyboards/mt/mt64rgb/keymaps/via/keymap.c
index 37c3c18259..0fa1c1b85f 100644
--- a/keyboards/mt/mt64rgb/keymaps/via/keymap.c
+++ b/keyboards/mt/mt64rgb/keymaps/via/keymap.c
@@ -45,11 +45,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (layer_state_is(1)) {
         rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
     }
     if (host_keyboard_led_state().caps_lock) {
           rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
+    return false;
 }
diff --git a/keyboards/mt/mt84/keymaps/default/keymap.c b/keyboards/mt/mt84/keymaps/default/keymap.c
index bb7d5b447f..40e1aa0b90 100644
--- a/keyboards/mt/mt84/keymaps/default/keymap.c
+++ b/keyboards/mt/mt84/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       )
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
 	led_t led_state = host_keyboard_led_state();
 	    switch (get_highest_layer(layer_state)) {
 	      case _FN:
@@ -52,4 +52,5 @@ void rgb_matrix_indicators_user(void) {
     if (led_state.caps_lock) {
           rgb_matrix_set_color(46, 0xFF, 0xFF, 0xFF);
     }
+    return false;
 }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
index eea031698a..7fadbdc39c 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
@@ -75,7 +75,7 @@ enum layer_keycodes {
     G_PRE,               //Gradient presets
     REF_G,               //Toggle between linear and reflected gradient
     G_FLIP,              //Flip the gradient colors
-  
+
     //Custom led effect keycode
     RGB_C_E,             //Cycle user effect
 };
@@ -286,7 +286,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 #endif
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     switch (biton32(layer_state)) {
         case _FN:
             rgb_matrix_set_color(16, 0, 0, 0); rgb_matrix_set_color(17, 0, 0, 0); rgb_matrix_set_color(18, 0, 0, 0); rgb_matrix_set_color(21, 0, 0, 0);
@@ -332,4 +332,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(52, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
index 216ae1e09f..f4625bf7a7 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
@@ -181,7 +181,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 #endif
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -198,4 +198,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(52, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
index ddcd3f6642..4204b7acd8 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
@@ -104,7 +104,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 #endif
 
-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) {
 
     if (user_config.top_rgb_change)
     {
@@ -125,4 +125,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             RGB_MATRIX_INDICATOR_SET_COLOR(i, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
index 082aa03876..bdcd738708 100644
--- a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
@@ -143,7 +143,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #endif
 
 
-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) {
 
     if (user_config.top_rgb_change)
     {
@@ -168,4 +168,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             RGB_MATRIX_INDICATOR_SET_COLOR(i, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/opendeck/32/rev1/rev1.c b/keyboards/opendeck/32/rev1/rev1.c
index be50d91944..34862873d0 100644
--- a/keyboards/opendeck/32/rev1/rev1.c
+++ b/keyboards/opendeck/32/rev1/rev1.c
@@ -87,16 +87,6 @@ led_config_t g_led_config = {
 
 // clang-format on
 
-// Set custom key colors here, in order to change the RGB effect, either reserve some keys
-// in the keymap to adjust the pattern (see QMK docs, incompatible with wrapper keys) or
-// change the default pattern in config.h.
-/*
-void rgb_matrix_indicators_kb(void) {
-    //rgb_matrix_set_color(0, 255, 255, 255);
-    //rgb_matrix_set_color_all(0x86,0xff,0xff);
-}
-*/
-
 void keyboard_pre_init_kb(void) {
     // Light power LED
     setPinOutput(POWER_LED_PIN);
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
index ed40d33532..57a216f30a 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.c
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -111,15 +111,16 @@ led_config_t g_led_config = { {
 
 #endif
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(31, 255, 255, 255);
     } else {
         rgb_matrix_set_color(31, 0, 0, 0);
     }
+    return true;
 }
 
 enum encoder_modes{
@@ -131,15 +132,15 @@ enum encoder_modes{
 keyboard_config_t keyboard_config;
 rgblight_config_t rgblight_config;
 
-uint8_t pre_hue, pre_sat, pre_val; 
-uint8_t previous_rgb_mode = 0;  
+uint8_t pre_hue, pre_sat, pre_val;
+uint8_t previous_rgb_mode = 0;
 uint8_t dir_hue, dir_sat;
 
-bool encoder_in = false; 
-uint32_t encoder_timer; 
+bool encoder_in = false;
+uint32_t encoder_timer;
 
-bool encoder_ani_start= false;  
-uint32_t encoder_ani_timer = 0;  
+bool encoder_ani_start= false;
+uint32_t encoder_ani_timer = 0;
 
 bool encoder_direction_start = false;
 uint32_t encoder_direction_timer = 0;
@@ -179,7 +180,7 @@ void switch_encoder_mode(uint8_t mode){
             dir_sat = 255;
             break;
         }
-        rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val); 
+        rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val);
 }
 
 
@@ -190,7 +191,7 @@ void init_encoder_mode(uint8_t mode){
     pre_val = rgblight_get_val();
     encoder_in = true;
 
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);  
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
 
     switch_encoder_mode(mode);
 }
@@ -218,21 +219,21 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         case RGB_VAI:
         case RGB_VAD:
 
-        if(encoder_in){  
+        if(encoder_in){
                 return false;
-            }  
+            }
         break;
 
         case KC_F13:
-        rgb_matrix_toggle(); 
+        rgb_matrix_toggle();
         break;
 
         case KC_F14:
-        rgb_matrix_step();  
+        rgb_matrix_step();
         break;
 
-        case KC_F15:  
-        rgb_matrix_step_reverse();  
+        case KC_F15:
+        rgb_matrix_step_reverse();
         break;
 
         case KC_F16:
@@ -261,7 +262,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
         case KC_F22:  //change encoder mode upward
         if(!encoder_direction_start){
-            if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){                
+            if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){
                 keyboard_config.encoder_mode_index++;
             }
             else{
@@ -277,7 +278,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             }
             else{
                 keyboard_config.encoder_mode_index = ENCODER_MODE_THREE;
-            }      
+            }
             set_encoder_mode(keyboard_config.encoder_mode_index);
         }
         return false;
@@ -294,7 +295,7 @@ void matrix_scan_kb(void) {
     if(encoder_in){
         if(timer_elapsed32(encoder_timer) > 5000){
             rgblight_mode(previous_rgb_mode);
-            rgblight_sethsv(pre_hue, pre_sat, pre_val);     
+            rgblight_sethsv(pre_hue, pre_sat, pre_val);
             encoder_in = false;
         }
     }
@@ -309,7 +310,7 @@ void matrix_scan_kb(void) {
     if(encoder_direction_start){
         if(timer_elapsed32(encoder_direction_timer) > (VOLUME_ANIMATION_TIMER+1500)){
             rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val); 
+            rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val);
             encoder_direction_start = false;
         }
     }
@@ -319,19 +320,19 @@ void matrix_scan_kb(void) {
 
 void set_volume_animation(bool increase){
     if(!encoder_ani_start){
-        rgblight_snake_restart(dir_hue, dir_sat, pre_val);  
+        rgblight_snake_restart(dir_hue, dir_sat, pre_val);
     }
 
     if(increase){
-        rgblight_mode_noeeprom(17);  
-    } else {         
+        rgblight_mode_noeeprom(17);
+    } else {
         rgblight_mode_noeeprom(18);
     }
 
     encoder_ani_timer = timer_read32();
     encoder_direction_timer = encoder_ani_timer;
     encoder_ani_start = true;
-    encoder_direction_start = true; 
+    encoder_direction_start = true;
 }
 
 
@@ -348,15 +349,15 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
              switch(encoder_cw_keycode) {
 
                 case KC_F13:
-                rgb_matrix_toggle(); 
+                rgb_matrix_toggle();
                 break;
 
                 case KC_F14:
-                rgb_matrix_step(); 
+                rgb_matrix_step();
                 break;
 
-                case KC_F15:  
-                rgb_matrix_step_reverse();  
+                case KC_F15:
+                rgb_matrix_step_reverse();
                 break;
 
                 case KC_F16:
@@ -387,7 +388,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
                 case KC_VOLD:
                 tap_code(encoder_cw_keycode);
                 break;
-        
+
                 default:
                 tap_code(encoder_cw_keycode);
                 break;
@@ -401,11 +402,11 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
                 break;
 
                 case KC_F14:
-                rgb_matrix_step(); 
+                rgb_matrix_step();
                 break;
 
-                case KC_F15:  
-                rgb_matrix_step_reverse();  
+                case KC_F15:
+                rgb_matrix_step_reverse();
                 break;
 
                 case KC_F16:
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
index cea25b093e..cfdaaad4ae 100644
--- a/keyboards/owlab/voice65/soldered/soldered.c
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -115,15 +115,16 @@ led_config_t g_led_config = { {
 
 #endif
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(31, 255, 255, 255);
     } else {
         rgb_matrix_set_color(31, 0, 0, 0);
     }
+    return true;
 }
 
 enum encoder_modes{
@@ -135,15 +136,15 @@ enum encoder_modes{
 keyboard_config_t keyboard_config;
 rgblight_config_t rgblight_config;
 
-uint8_t pre_hue, pre_sat, pre_val; 
-uint8_t previous_rgb_mode = 0;  
+uint8_t pre_hue, pre_sat, pre_val;
+uint8_t previous_rgb_mode = 0;
 uint8_t dir_hue, dir_sat;
 
-bool encoder_in = false; 
-uint32_t encoder_timer; 
+bool encoder_in = false;
+uint32_t encoder_timer;
 
-bool encoder_ani_start= false;  
-uint32_t encoder_ani_timer = 0;  
+bool encoder_ani_start= false;
+uint32_t encoder_ani_timer = 0;
 
 bool encoder_direction_start = false;
 uint32_t encoder_direction_timer = 0;
@@ -183,7 +184,7 @@ void switch_encoder_mode(uint8_t mode){
             dir_sat = 255;
             break;
         }
-        rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val); 
+        rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val);
 }
 
 
@@ -194,7 +195,7 @@ void init_encoder_mode(uint8_t mode){
     pre_val = rgblight_get_val();
     encoder_in = true;
 
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);  
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
 
     switch_encoder_mode(mode);
 }
@@ -222,21 +223,21 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         case RGB_VAI:
         case RGB_VAD:
 
-        if(encoder_in){  
+        if(encoder_in){
                 return false;
-            }  
+            }
         break;
 
         case KC_F13:
-        rgb_matrix_toggle(); 
+        rgb_matrix_toggle();
         break;
 
         case KC_F14:
-        rgb_matrix_step();  
+        rgb_matrix_step();
         break;
 
-        case KC_F15:  
-        rgb_matrix_step_reverse();  
+        case KC_F15:
+        rgb_matrix_step_reverse();
         break;
 
         case KC_F16:
@@ -265,7 +266,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
         case KC_F22:  //change encoder mode upward
         if(!encoder_direction_start){
-            if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){                
+            if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){
                 keyboard_config.encoder_mode_index++;
             }
             else{
@@ -282,7 +283,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             }
             else{
                 keyboard_config.encoder_mode_index = ENCODER_MODE_THREE;
-            }      
+            }
             set_encoder_mode(keyboard_config.encoder_mode_index);
         }
         return false;
@@ -299,7 +300,7 @@ void matrix_scan_kb(void) {
     if(encoder_in){
         if(timer_elapsed32(encoder_timer) > 5000){
             rgblight_mode(previous_rgb_mode);
-            rgblight_sethsv(pre_hue, pre_sat, pre_val);     
+            rgblight_sethsv(pre_hue, pre_sat, pre_val);
             encoder_in = false;
         }
     }
@@ -314,7 +315,7 @@ void matrix_scan_kb(void) {
     if(encoder_direction_start){
         if(timer_elapsed32(encoder_direction_timer) > (VOLUME_ANIMATION_TIMER+1500)){
             rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val); 
+            rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val);
             encoder_direction_start = false;
         }
     }
@@ -324,19 +325,19 @@ void matrix_scan_kb(void) {
 
 void set_volume_animation(bool increase){
     if(!encoder_ani_start){
-        rgblight_snake_restart(dir_hue, dir_sat, pre_val);  
+        rgblight_snake_restart(dir_hue, dir_sat, pre_val);
     }
 
     if(increase){
-        rgblight_mode_noeeprom(17);  
-    } else {         
+        rgblight_mode_noeeprom(17);
+    } else {
         rgblight_mode_noeeprom(18);
     }
 
     encoder_ani_timer = timer_read32();
     encoder_direction_timer = encoder_ani_timer;
     encoder_ani_start = true;
-    encoder_direction_start = true; 
+    encoder_direction_start = true;
 }
 
 
@@ -353,15 +354,15 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
              switch(encoder_cw_keycode) {
 
                 case KC_F13:
-                rgb_matrix_toggle(); 
+                rgb_matrix_toggle();
                 break;
 
                 case KC_F14:
-                rgb_matrix_step(); 
+                rgb_matrix_step();
                 break;
 
-                case KC_F15:  
-                rgb_matrix_step_reverse();  
+                case KC_F15:
+                rgb_matrix_step_reverse();
                 break;
 
                 case KC_F16:
@@ -392,7 +393,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
                 case KC_VOLD:
                 tap_code(encoder_cw_keycode);
                 break;
-        
+
                 default:
                 tap_code(encoder_cw_keycode);
                 break;
@@ -406,11 +407,11 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
                 break;
 
                 case KC_F14:
-                rgb_matrix_step(); 
+                rgb_matrix_step();
                 break;
 
-                case KC_F15:  
-                rgb_matrix_step_reverse();  
+                case KC_F15:
+                rgb_matrix_step_reverse();
                 break;
 
                 case KC_F16:
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index d3d2f82420..9c37567926 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -99,7 +99,7 @@ void set_layer_color(int layer) {
   }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
   if (g_suspend_state || keyboard_config.disable_layer_led) { return; }
   switch (get_highest_layer(layer_state)) {
     case 0:
@@ -119,6 +119,7 @@ void rgb_matrix_indicators_user(void) {
       rgb_matrix_set_color_all(0, 0, 0);
     break;
   }
+    return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index 3e5abb947f..d469dbeccd 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -275,10 +275,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-  void rgb_matrix_indicators_kb(void) {
+  bool rgb_matrix_indicators_user(void) {
     // `42` is the index of the middle light at the bottom row (in planck light)
     // it is disabled because it does not have a cover, hence irritates my eyes
     rgb_matrix_set_color(42, 0, 0, 0);
+    return false;
   }
 #endif
 
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 436deadee4..276a1ff253 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -90,7 +90,7 @@ void set_layer_color(int layer) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (keyboard_config.disable_layer_led) {
         return;
     }
@@ -108,6 +108,7 @@ void rgb_matrix_indicators_user(void) {
             if (rgb_matrix_get_flags() == LED_FLAG_NONE) rgb_matrix_set_color_all(0, 0, 0);
             break;
     }
+    return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
index 983ab20c7d..d2608ff41f 100644
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ b/keyboards/planck/keymaps/tom/keymap.c
@@ -226,7 +226,7 @@ bool music_mask_user(uint16_t keycode) {
   }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
   #ifdef RGB_MATRIX_ENABLE
   switch (get_highest_layer(layer_state)) {
     case _RAISE:
@@ -260,4 +260,5 @@ void rgb_matrix_indicators_user(void) {
       break;
   }
   #endif
+    return false;
 }
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index e00fb2567d..79e2580833 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -166,7 +166,7 @@ void set_layer_color(int layer) {
   }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
   if (g_suspend_state || disable_layer_color) { return; }
   switch (get_highest_layer(layer_state)) {
     case 0:
@@ -182,6 +182,7 @@ void rgb_matrix_indicators_user(void) {
       set_layer_color(4);
       break;
   }
+    return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/playkbtw/pk64rgb/keymaps/default/keymap.c b/keyboards/playkbtw/pk64rgb/keymaps/default/keymap.c
index 9cfbc3c287..1b3b6fe102 100644
--- a/keyboards/playkbtw/pk64rgb/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/pk64rgb/keymaps/default/keymap.c
@@ -34,11 +34,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       )
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (layer_state_is(1)) {
         rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
     }
     if (host_keyboard_led_state().caps_lock) {
           rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
-}
\ No newline at end of file
+    return false;
+}
diff --git a/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c b/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c
index 015ba3a6b1..d3ce3114fe 100644
--- a/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c
+++ b/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c
@@ -45,11 +45,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (layer_state_is(1)) {
         rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
     }
     if (host_keyboard_led_state().caps_lock) {
           rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
     }
-}
\ No newline at end of file
+    return false;
+}
diff --git a/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c b/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
index 38a88a3cd4..1459d66ed9 100644
--- a/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
+++ b/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ void keyboard_post_init_user(void) {
     rgb_matrix_enable_noeeprom();
 }
 
-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) {
     /* We use RGB for the indicator RGB colours since we don't need to adjust the brightness.
      * If any of the indicators are enabled, set the key to white. This overrides the active RGB
      * matrix animation. */
@@ -62,4 +62,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     if (host_keyboard_led_state().scroll_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(14, 255, 255, 255);
     }
+    return false;
 }
diff --git a/keyboards/saevus/cor_tkl/cor_tkl.c b/keyboards/saevus/cor_tkl/cor_tkl.c
index 45cc8c0868..f7b39471db 100644
--- a/keyboards/saevus/cor_tkl/cor_tkl.c
+++ b/keyboards/saevus/cor_tkl/cor_tkl.c
@@ -32,13 +32,15 @@ led_config_t g_led_config = {{
     LED_FLAG_INDICATOR, LED_FLAG_INDICATOR
 }};
 
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
     if (!host_keyboard_led_state().caps_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
     }
     if (!host_keyboard_led_state().scroll_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
     }
-
-    rgb_matrix_indicators_advanced_user(led_min, led_max);
+    return true;
 }
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index 35452acf4a..8e3678035c 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -115,9 +115,9 @@ void terrazzo_scroll_pixel(bool clockwise) {
         terrazzo_led_index = terrazzo_led_index + 1;
     } else {
         terrazzo_led_index = terrazzo_led_index - 1;
-    } 
-    
-    if (terrazzo_led_index >= LED_MATRIX_LED_COUNT) {
+    }
+
+    if (terrazzo_led_index >= DRIVER_LED_TOTAL) {
         terrazzo_led_index = 0;
     } else if (terrazzo_led_index <= 0 ) {
         terrazzo_led_index = LED_MATRIX_LED_COUNT - 1;
@@ -156,8 +156,12 @@ void terrazzo_render(void) {
     }
 }
 
-void led_matrix_indicators_kb(void) {
+bool led_matrix_indicators_kb(void) {
+    if (!led_matrix_indicators_user()) {
+        return false;
+    }
     terrazzo_render();
+    return true;
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
@@ -194,4 +198,4 @@ void suspend_wakeup_init_kb(void) {
 }
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/tkc/portico/portico.c b/keyboards/tkc/portico/portico.c
index 47dfe88231..e41de1c232 100644
--- a/keyboards/tkc/portico/portico.c
+++ b/keyboards/tkc/portico/portico.c
@@ -115,25 +115,20 @@ led_config_t g_led_config = {
     }
 };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
 	if (host_keyboard_led_state().caps_lock) {
 		rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
 	}
-	else { 
+	else {
 		rgb_matrix_set_color(30, 0x00, 0x00, 0x00);
 	}
 	if (!rgb_matrix_is_enabled()) {
 		rgb_matrix_driver.flush();
     }
+    return true;
 }
-#endif
\ No newline at end of file
+#endif
+
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
index 6022d5674f..32c8f50894 100644
--- a/keyboards/tkc/portico68v2/portico68v2.c
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -128,7 +128,10 @@ led_config_t g_led_config = {
     }
 };
 
-void rgb_matrix_indicators_kb(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
             rgb_matrix_set_color(i, 0xFF, 0xFF, 0xFF);
@@ -141,5 +144,6 @@ void rgb_matrix_indicators_kb(void) {
             }
         }
     }
+    return true;
 }
 #endif
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
index 30fafa2dfc..299af2f305 100644
--- a/keyboards/tkc/portico75/portico75.c
+++ b/keyboards/tkc/portico75/portico75.c
@@ -161,13 +161,14 @@ led_config_t g_led_config = { {
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 } };
 
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(45, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 #endif
 
diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c
index bd969f3009..928a8abd89 100644
--- a/keyboards/work_louder/work_board/work_board.c
+++ b/keyboards/work_louder/work_board/work_board.c
@@ -106,7 +106,10 @@ bool via_layout_2u = false;
 void via_set_layout_options_kb(uint32_t value) { via_layout_2u = (bool)value; }
 #    endif  // VIA_ENABLE
 
-__attribute__((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
 #    ifdef VIA_ENABLE
     if (via_layout_2u) {
         rgb_matrix_set_color(5, 0, 0, 0);
@@ -118,6 +121,7 @@ __attribute__((weak)) void rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(5, 0, 0, 0);
     rgb_matrix_set_color(7, 0, 0, 0);
 #    endif
+    return true;
 }
 
 void keyboard_pre_init_kb(void) {
diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c
index 9b6628b63e..377c79555d 100644
--- a/keyboards/xbows/knight/knight.c
+++ b/keyboards/xbows/knight/knight.c
@@ -135,10 +135,15 @@
  } };
 
 
- __attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(44, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #endif
diff --git a/keyboards/xbows/knight_plus/knight_plus.c b/keyboards/xbows/knight_plus/knight_plus.c
index bdf862dbe4..2c377aaf51 100644
--- a/keyboards/xbows/knight_plus/knight_plus.c
+++ b/keyboards/xbows/knight_plus/knight_plus.c
@@ -135,10 +135,14 @@
  } };
 
 
- __attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(44, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #endif
diff --git a/keyboards/xbows/nature/nature.c b/keyboards/xbows/nature/nature.c
index 48534d87c4..faa8492123 100644
--- a/keyboards/xbows/nature/nature.c
+++ b/keyboards/xbows/nature/nature.c
@@ -136,20 +136,14 @@
  } };
 
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
- __attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(45, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #endif
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
index f998e8122e..4d6c256981 100644
--- a/keyboards/xbows/numpad/numpad.c
+++ b/keyboards/xbows/numpad/numpad.c
@@ -71,10 +71,14 @@
  } };
 
 
- __attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().num_lock) {
         rgb_matrix_set_color(4, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #endif
diff --git a/keyboards/xbows/ranger/ranger.c b/keyboards/xbows/ranger/ranger.c
index c4b0e54544..4c141cc5d3 100644
--- a/keyboards/xbows/ranger/ranger.c
+++ b/keyboards/xbows/ranger/ranger.c
@@ -137,10 +137,14 @@ led_config_t g_led_config = { {
 };
 // clang-format on
 
-__attribute__((weak)) void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(48, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }
 
 #endif
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index 9dd57d2fd3..ebfd55ae85 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -1,30 +1,30 @@
 #include "woody.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
-	
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+
 	{0, C8_8,  C7_8, C6_8},   // LA17
 	{0, C9_8,  C7_7, C6_7},   // LA16
-	{0, C9_7,  C8_7, C6_6},   // LA15	
+	{0, C9_7,  C8_7, C6_6},   // LA15
 	{0, C9_6,  C8_6, C7_6},   // LA14
-	{0, C9_5,  C8_5, C7_5},   // LA13	
-	{0, C9_4,  C8_4, C7_4},   // LA12	
-	{0, C9_3,  C8_3, C7_3},   // LA11	
-	{0, C9_2,  C8_2, C7_2},   // LA10	
-	{0, C9_1,  C8_1,  C7_1},  // LA9	
+	{0, C9_5,  C8_5, C7_5},   // LA13
+	{0, C9_4,  C8_4, C7_4},   // LA12
+	{0, C9_3,  C8_3, C7_3},   // LA11
+	{0, C9_2,  C8_2, C7_2},   // LA10
+	{0, C9_1,  C8_1,  C7_1},  // LA9
 	{0, C2_9,  C3_9,  C4_9},  // LB0
 	{0, C1_9,  C3_10, C4_10}, // LB1
 	{0, C1_10, C2_10, C4_11}, // LB2
 	{0, C1_11, C2_11, C3_11}, // LB3
 	{0, C1_13, C2_13, C3_13}, // LB5
 	{0, C1_14, C2_14, C3_14}, // LB6
-	
+
 	{0, C1_7,  C2_7, C3_7},   // LA7
-	{0, C1_6,  C2_6, C3_6},   // LA6	
-	{0, C1_5,  C2_5, C3_5},   // LA5	
-	{0, C1_4,  C2_4, C3_4},   // LA4	
-	{0, C1_3,  C2_3, C3_3},   // LA3	
-	{0, C1_2,  C2_2, C4_3},   // LA2	
-	{0, C1_1,  C3_2, C4_2},   // LA1	
+	{0, C1_6,  C2_6, C3_6},   // LA6
+	{0, C1_5,  C2_5, C3_5},   // LA5
+	{0, C1_4,  C2_4, C3_4},   // LA4
+	{0, C1_3,  C2_3, C3_3},   // LA3
+	{0, C1_2,  C2_2, C4_3},   // LA2
+	{0, C1_1,  C3_2, C4_2},   // LA1
 	{0, C2_1,  C3_1,  C4_1},  // LA0
 	{0, C9_9,  C8_9,  C7_9},  // LB9
 	{0, C9_10, C8_10, C7_10}, // LB10
@@ -36,10 +36,10 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
         {0, C1_8,  C2_8, C3_8},   // LA8
 	{1, C9_6,  C8_6, C7_6},   // LC14
-	{1, C9_5,  C8_5, C7_5},   // LC13	
-	{1, C9_4,  C8_4, C7_4},   // LC12	
-	{1, C9_3,  C8_3, C7_3},   // LC11	
-	{1, C9_2,  C8_2, C7_2},   // LC10	
+	{1, C9_5,  C8_5, C7_5},   // LC13
+	{1, C9_4,  C8_4, C7_4},   // LC12
+	{1, C9_3,  C8_3, C7_3},   // LC11
+	{1, C9_2,  C8_2, C7_2},   // LC10
 	{1, C9_1,  C8_1,  C7_1},  // LC9
 	{1, C2_9,  C3_9,  C4_9},  // LD0
 	{1, C1_9,  C3_10, C4_10}, // LD1
@@ -52,8 +52,8 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 	{1, C9_8,  C7_7, C6_7},   // LC16
 	{1, C1_5,  C2_5, C3_5},   // LC5
 	{1, C1_4,  C2_4, C3_4},   // LC4
-	{1, C1_3,  C2_3, C3_3},   // LC3	
-	{1, C1_2,  C2_2, C4_3},   // LC2	
+	{1, C1_3,  C2_3, C3_3},   // LC3
+	{1, C1_2,  C2_2, C4_3},   // LC2
 	{1, C1_1,  C3_2, C4_2},   // LC1
 	{1, C9_9,  C8_9,  C7_9},  // LD9
 	{1, C9_10, C8_10, C7_10}, // LD10
@@ -65,7 +65,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 	{0, C9_15, C8_15, C6_14}, // LB15
 
 	{1, C8_8,  C7_8, C6_8},   // LC17
-	{1, C1_8,  C2_8, C3_8},   // LC8	
+	{1, C1_8,  C2_8, C3_8},   // LC8
 	{1, C1_7,  C2_7, C3_7},   // LC7
 	{1, C2_1,  C3_1,  C4_1},  // LC0
 	{1, C9_14, C8_14, C7_14}, // LD14
@@ -91,29 +91,18 @@ led_config_t g_led_config = { {
 }, {
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4,
     4, 4, 4, 4, 4, 4, 1, 1, 1
 } };
 #endif
 
-void suspend_power_down_kb(void)
-{
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void)
-{
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-__attribute__ ((weak))
-
-void rgb_matrix_indicators_user(void)
-{
-    if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK))
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)) {
         rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
     }
+    return true;
 }
diff --git a/keyboards/xelus/valor/rev2/keymaps/default/keymap.c b/keyboards/xelus/valor/rev2/keymaps/default/keymap.c
index d98ffe8e95..20ac204777 100644
--- a/keyboards/xelus/valor/rev2/keymaps/default/keymap.c
+++ b/keyboards/xelus/valor/rev2/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-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 cyan
     if (host_keyboard_led_state().caps_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(27, 0, 128, 128);
@@ -75,5 +75,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             RGB_MATRIX_INDICATOR_SET_COLOR(24, 128, 128, 128);
             break;
     }
+    return false;
 }
 #endif
diff --git a/keyboards/xelus/valor/rev2/keymaps/via/keymap.c b/keyboards/xelus/valor/rev2/keymaps/via/keymap.c
index f8bed2dd49..c1ed227eff 100644
--- a/keyboards/xelus/valor/rev2/keymaps/via/keymap.c
+++ b/keyboards/xelus/valor/rev2/keymaps/via/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-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 cyan
     if (host_keyboard_led_state().caps_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(27, 0, 128, 128);
@@ -123,5 +123,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             RGB_MATRIX_INDICATOR_SET_COLOR(24, 128, 128, 128);
             break;
     }
+    return false;
 }
 #endif
diff --git a/keyboards/yandrstudio/nz64/nz64.c b/keyboards/yandrstudio/nz64/nz64.c
index 9945dec04e..8b64d36fd1 100644
--- a/keyboards/yandrstudio/nz64/nz64.c
+++ b/keyboards/yandrstudio/nz64/nz64.c
@@ -57,7 +57,10 @@ led_config_t g_led_config = {
     }
 };
 
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_kb(led_min, led_max)) {
+        return false;
+    }
     if (rgb_matrix_is_enabled()) {
         if (kb_cums.underground_rgb_sw == 1) {
             for (uint8_t i = led_min; i < led_max; ++i) {
@@ -75,6 +78,7 @@ void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
     } else {
         rgb_matrix_set_color_all(0,0,0);
     }
+    return true;
 }
 
 void eeconfig_init_kb(void) {
diff --git a/keyboards/yandrstudio/nz67v2/nz67v2.c b/keyboards/yandrstudio/nz67v2/nz67v2.c
index b8caa96bc0..64e287b868 100644
--- a/keyboards/yandrstudio/nz67v2/nz67v2.c
+++ b/keyboards/yandrstudio/nz67v2/nz67v2.c
@@ -54,7 +54,10 @@ led_config_t g_led_config = {
     }
 };
 
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
     if (rgb_matrix_is_enabled()) {
         if (kb_cums.underground_rgb_sw == 1) {
             for (uint8_t i = led_min; i < led_max; ++i) {
@@ -75,6 +78,7 @@ void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
     if (host_keyboard_led_state().caps_lock) {
         RGB_MATRIX_INDICATOR_SET_COLOR(25, rgblight_get_val(), rgblight_get_val(), rgblight_get_val());
     }
+    return true;
 }
 
 
diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
index ea39959d7e..bd5431a5b8 100644
--- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
+++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
@@ -106,12 +106,12 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
         rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN);
     } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){
         rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0);
     }
+    return false;
 }
 #endif
-
diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
index 2d76ce1d15..5a32962baa 100644
--- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
@@ -94,11 +94,12 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
         rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN);
     } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){
         rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0);
     }
+    return false;
 }
 #endif
diff --git a/layouts/community/ortho_4x12/jarred/keymap.c b/layouts/community/ortho_4x12/jarred/keymap.c
index 4be5f9ed69..e419b3942c 100644
--- a/layouts/community/ortho_4x12/jarred/keymap.c
+++ b/layouts/community/ortho_4x12/jarred/keymap.c
@@ -13,10 +13,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     #ifdef KEYBOARD_planck_light
     // Disable light in middle of 2U position of Planck Light
     rgb_matrix_set_color(42, 0, 0, 0);
     #endif
+    return false;
 }
 #endif
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index c26b1ad19b..e215c2c2c3 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -385,9 +385,13 @@ void led_matrix_indicators(void) {
     led_matrix_indicators_user();
 }
 
-__attribute__((weak)) void led_matrix_indicators_kb(void) {}
+__attribute__((weak)) bool led_matrix_indicators_kb(void) {
+    return led_matrix_indicators_user();
+}
 
-__attribute__((weak)) void led_matrix_indicators_user(void) {}
+__attribute__((weak)) bool led_matrix_indicators_user(void) {
+    return true;
+}
 
 void led_matrix_indicators_advanced(effect_params_t *params) {
     /* special handling is needed for "params->iter", since it's already been incremented.
@@ -407,9 +411,13 @@ void led_matrix_indicators_advanced(effect_params_t *params) {
     led_matrix_indicators_advanced_user(min, max);
 }
 
-__attribute__((weak)) void led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {}
+__attribute__((weak)) bool led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    return led_matrix_indicators_advanced_user(led_min, led_max);
+}
 
-__attribute__((weak)) void led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {}
+__attribute__((weak)) bool led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    return true;
+}
 
 void led_matrix_init(void) {
     led_matrix_driver.init();
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index db4f223d5b..c7d360f366 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -120,12 +120,12 @@ void led_matrix_task(void);
 // This runs after another backlight effect and replaces
 // values already set
 void led_matrix_indicators(void);
-void led_matrix_indicators_kb(void);
-void led_matrix_indicators_user(void);
+bool led_matrix_indicators_kb(void);
+bool led_matrix_indicators_user(void);
 
 void led_matrix_indicators_advanced(effect_params_t *params);
-void led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max);
-void led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
+bool led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max);
+bool led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
 
 void led_matrix_init(void);
 
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 8b335c017d..539ca0e100 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -444,12 +444,15 @@ void rgb_matrix_task(void) {
 
 void rgb_matrix_indicators(void) {
     rgb_matrix_indicators_kb();
-    rgb_matrix_indicators_user();
 }
 
-__attribute__((weak)) void rgb_matrix_indicators_kb(void) {}
+__attribute__((weak)) bool rgb_matrix_indicators_kb(void) {
+    return rgb_matrix_indicators_user();
+}
 
-__attribute__((weak)) void rgb_matrix_indicators_user(void) {}
+__attribute__((weak)) bool rgb_matrix_indicators_user(void) {
+    return true;
+}
 
 void rgb_matrix_indicators_advanced(effect_params_t *params) {
     /* special handling is needed for "params->iter", since it's already been incremented.
@@ -466,12 +469,15 @@ void rgb_matrix_indicators_advanced(effect_params_t *params) {
     uint8_t max = RGB_MATRIX_LED_COUNT;
 #endif
     rgb_matrix_indicators_advanced_kb(min, max);
-    rgb_matrix_indicators_advanced_user(min, max);
 }
 
-__attribute__((weak)) void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {}
+__attribute__((weak)) bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    return rgb_matrix_indicators_advanced_user(led_min, led_max);
+}
 
-__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {}
+__attribute__((weak)) bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    return true;
+}
 
 void rgb_matrix_init(void) {
     rgb_matrix_driver.init();
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index 0b35e98f45..1cd054abc4 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -129,12 +129,12 @@ void rgb_matrix_task(void);
 // This runs after another backlight effect and replaces
 // colors already set
 void rgb_matrix_indicators(void);
-void rgb_matrix_indicators_kb(void);
-void rgb_matrix_indicators_user(void);
+bool rgb_matrix_indicators_kb(void);
+bool rgb_matrix_indicators_user(void);
 
 void rgb_matrix_indicators_advanced(effect_params_t *params);
-void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max);
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max);
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
 
 void rgb_matrix_init(void);
 
diff --git a/users/bbaserdem/bb-rgb.c b/users/bbaserdem/bb-rgb.c
index bdb7f12bbd..49b91129ba 100644
--- a/users/bbaserdem/bb-rgb.c
+++ b/users/bbaserdem/bb-rgb.c
@@ -23,7 +23,7 @@
 
 // Allow hooking into the RGB matrix indications using keymap code
 
-// Modulates the brightness of indicator 
+// Modulates the brightness of indicator
 RGB helper_dimmer(uint8_t r, uint8_t g, uint8_t b) {
     RGB output;
     output.r = r / 2;
@@ -63,12 +63,12 @@ __attribute__ ((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_mi
     return false;
 }
 // Set RGB state depending on layer
-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) {
     uint8_t thisInd = 3;
     RGB thisCol;
     // Load keymap hooks
     if(rgb_matrix_indicators_advanced_keymap(led_min, led_max)) {
-        return;
+        return false;
     }
     // Grab color info
     switch (get_highest_layer(layer_state)) {
@@ -110,6 +110,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             break;
     }
     helper_painter(led_min, led_max, thisCol, thisInd);
+    return false;
 }
 
 // Hook into shutdown code to make all perkey LED's red on hitting reset
@@ -120,11 +121,3 @@ void shutdown_rgb(void) {
     // Delay until this registers
     while(timer_elapsed(timer_start) < 250) {wait_ms(1);}
 }
-
-// Hook into suspend code
-void suspend_power_down_rgb(void) {
-    rgb_matrix_set_suspend_state(true);
-}
-void suspend_wakeup_init_rgb(void) {
-    rgb_matrix_set_suspend_state(false);
-}
diff --git a/users/bbaserdem/bb-rgb.h b/users/bbaserdem/bb-rgb.h
index 62b6da9f2f..3e96b997fe 100644
--- a/users/bbaserdem/bb-rgb.h
+++ b/users/bbaserdem/bb-rgb.h
@@ -21,7 +21,7 @@
  */
 
 // For custom indicators
-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);
 // Hook into shutdown code
 void shutdown_rgb(void);
 void suspend_wakeup_init_rgb(void);
diff --git a/users/curry/rgb_matrix_user.c b/users/curry/rgb_matrix_user.c
index 053226ab60..3c2008aa01 100644
--- a/users/curry/rgb_matrix_user.c
+++ b/users/curry/rgb_matrix_user.c
@@ -36,7 +36,7 @@ void check_default_layer(uint8_t mode, uint8_t type) {
     }
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     if (userspace_config.rgb_layer_change && rgb_matrix_config.enable) {
         switch (get_highest_layer(layer_state)) {
             case _RAISE:
@@ -55,6 +55,7 @@ void rgb_matrix_indicators_user(void) {
         }
         check_default_layer(0, LED_FLAG_MODIFIER);
     }
+    return false;
 }
 
 bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
diff --git a/users/drashna/rgb/rgb_matrix_stuff.c b/users/drashna/rgb/rgb_matrix_stuff.c
index 64549d8fae..2867641a3e 100644
--- a/users/drashna/rgb/rgb_matrix_stuff.c
+++ b/users/drashna/rgb/rgb_matrix_stuff.c
@@ -91,9 +91,9 @@ bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record) {
 __attribute__((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     return true;
 }
-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) {
     if (!rgb_matrix_indicators_advanced_keymap(led_min, led_max)) {
-        return;
+        return false;
     }
 
 #if defined(RGBLIGHT_ENABLE)
@@ -140,11 +140,12 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
                 break;
         }
     }
+    return false;
 }
 
 __attribute__((weak)) bool rgb_matrix_indicators_keymap(void) {
     return true;
 }
-void rgb_matrix_indicators_user(void) {
-    rgb_matrix_indicators_keymap();
+bool rgb_matrix_indicators_user(void) {
+    return rgb_matrix_indicators_keymap();
 }

From 4d6fab1cfa4c16831cbd9727efddec654ca0460e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 5 Oct 2022 11:36:20 +1100
Subject: [PATCH 553/959] onekey: Enable ADC for STM32F072 Discovery (#18592)

---
 keyboards/handwired/onekey/stm32f0_disco/halconf.h             | 2 ++
 keyboards/handwired/onekey/stm32f0_disco/mcuconf.h             | 3 +++
 .../chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h      | 1 +
 3 files changed, 6 insertions(+)

diff --git a/keyboards/handwired/onekey/stm32f0_disco/halconf.h b/keyboards/handwired/onekey/stm32f0_disco/halconf.h
index 78ed6586c8..432c43c6cc 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/halconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h b/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
index ea4f9373a0..0bb4f4d643 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
@@ -23,5 +23,8 @@
 
 #include_next <mcuconf.h>
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_PWM_USE_TIM3
 #define STM32_PWM_USE_TIM3 TRUE
diff --git a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h
index 32b2777a81..9d26849dff 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/mcuconf.h
@@ -80,6 +80,7 @@
 #define STM32_ADC_ADC1_DMA_PRIORITY 2
 #define STM32_ADC_IRQ_PRIORITY 2
 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 2
+#define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
 
 /*
  * GPT driver system settings.

From b3211c106cbab18fdf96c1f5ee8db76f2135d1db Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 4 Oct 2022 18:37:50 -0600
Subject: [PATCH 554/959] Fixup linworks/fave84h (#18593)

---
 keyboards/linworks/fave84h/keymaps/default/keymap.c | 4 ++--
 keyboards/linworks/fave84h/keymaps/via/keymap.c     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/keyboards/linworks/fave84h/keymaps/default/keymap.c b/keyboards/linworks/fave84h/keymaps/default/keymap.c
index 93e7b2f1be..539da9a9de 100644
--- a/keyboards/linworks/fave84h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT(
+    [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
@@ -30,7 +30,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_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
+    [_LAYER1] = LAYOUT_tkl_ansi_tsangan_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/linworks/fave84h/keymaps/via/keymap.c b/keyboards/linworks/fave84h/keymaps/via/keymap.c
index 8c41df0618..f741ad4b77 100644
--- a/keyboards/linworks/fave84h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT(
+    [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
@@ -32,7 +32,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_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
+    [_LAYER1] = LAYOUT_tkl_ansi_tsangan_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 
-    [_LAYER2] = LAYOUT(
+    [_LAYER2] = LAYOUT_tkl_ansi_tsangan_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,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [_LAYER3] = LAYOUT(
+    [_LAYER3] = LAYOUT_tkl_ansi_tsangan_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,

From bb4740d95bdbcc27c8156003d915dc14710faf7f Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 4 Oct 2022 18:38:19 -0600
Subject: [PATCH 555/959] Remove lingering DRIVER_LED_TOTAL references (#18594)

---
 keyboards/terrazzo/terrazzo.c | 2 +-
 keyboards/xbows/woody/woody.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index 8e3678035c..cc62225de7 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -117,7 +117,7 @@ void terrazzo_scroll_pixel(bool clockwise) {
         terrazzo_led_index = terrazzo_led_index - 1;
     }
 
-    if (terrazzo_led_index >= DRIVER_LED_TOTAL) {
+    if (terrazzo_led_index >= LED_MATRIX_LED_COUNT) {
         terrazzo_led_index = 0;
     } else if (terrazzo_led_index <= 0 ) {
         terrazzo_led_index = LED_MATRIX_LED_COUNT - 1;
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index ebfd55ae85..1f85907f95 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -1,6 +1,6 @@
 #include "woody.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 	{0, C8_8,  C7_8, C6_8},   // LA17
 	{0, C9_8,  C7_7, C6_7},   // LA16

From fe7ac87f1801faf7ae5127c480ca292d05fdc542 Mon Sep 17 00:00:00 2001
From: Conor Burns <mail@conor-burns.com>
Date: Wed, 5 Oct 2022 03:37:28 +0200
Subject: [PATCH 556/959] [Docs] Clarify how to use the bootloader LED for
 rp2040 (#18585)

---
 docs/platformdev_rp2040.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md
index d690ebebf8..f6db70701c 100644
--- a/docs/platformdev_rp2040.md
+++ b/docs/platformdev_rp2040.md
@@ -58,7 +58,7 @@ The double-tap reset mechanism is an alternate way in QMK to enter the embedded
 ```c
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // Timeout window in ms in which the double tap can occur.
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U // Specify a optional status led which blinks when entering the bootloader
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 // Specify a optional status led by GPIO number which blinks when entering the bootloader
 ```
 
 ## Pre-defined RP2040 boards

From 3f63bbc7d829d7269e9caa89f128adf86ae5b196 Mon Sep 17 00:00:00 2001
From: nodatk <nodatk@gmail.com>
Date: Wed, 5 Oct 2022 10:40:18 +0900
Subject: [PATCH 557/959] [Keyboard] Twig50 (#18085)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/twig/twig50/config.h      | 28 +++++++
 keyboards/handwired/twig/twig50/info.json     | 20 +++++
 .../twig/twig50/keymaps/default/keymap.c      | 79 +++++++++++++++++++
 keyboards/handwired/twig/twig50/readme.md     | 29 +++++++
 keyboards/handwired/twig/twig50/rules.mk      | 19 +++++
 keyboards/handwired/twig/twig50/twig50.c      |  4 +
 keyboards/handwired/twig/twig50/twig50.h      | 20 +++++
 7 files changed, 199 insertions(+)
 create mode 100644 keyboards/handwired/twig/twig50/config.h
 create mode 100644 keyboards/handwired/twig/twig50/info.json
 create mode 100644 keyboards/handwired/twig/twig50/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/twig/twig50/readme.md
 create mode 100644 keyboards/handwired/twig/twig50/rules.mk
 create mode 100644 keyboards/handwired/twig/twig50/twig50.c
 create mode 100644 keyboards/handwired/twig/twig50/twig50.h

diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h
new file mode 100644
index 0000000000..ecdf7bf9fb
--- /dev/null
+++ b/keyboards/handwired/twig/twig50/config.h
@@ -0,0 +1,28 @@
+// Copyright 2022 Takeshi Noda (nodatk@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS { B7, B6, B5, B4 }
+#define MATRIX_COL_PINS { A2, A1, A0, B8 , B13, B14, B15, B9, B10, B11, B3, B2, B1, B0}
+
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 8
+#define TAPPING_TERM 150
+
+#define FORCE_NKRO
+
+#ifdef AUDIO_ENABLE
+  #define AUDIO_PIN A5
+  #define AUDIO_PIN_ALT A4
+  #define AUDIO_PIN_ALT_AS_NEGATIVE
+  #define STARTUP_SONG SONG(STARTUP_SOUND)
+  #define AUDIO_INIT_DELAY
+#endif
diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json
new file mode 100644
index 0000000000..12b2e397b1
--- /dev/null
+++ b/keyboards/handwired/twig/twig50/info.json
@@ -0,0 +1,20 @@
+{
+    "keyboard_name": "twig50",
+    "manufacturer": "Twig",
+    "url": "",
+    "maintainer": "nodatk",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x6060",
+      "device_version": "0.2.1"
+    },
+    "layouts": {
+      "LAYOUT_diag_4x14": {
+        "layout": [
+{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0},
+{"x":0, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1},
+{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":13, "y":2},
+{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":13, "y":3}]
+      }
+    }
+  }
diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7270773a93
--- /dev/null
+++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Takeshi Noda (nodatk@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "twig50.h"
+
+#define LAL_NCV  LALT_T(KC_LANG2)
+#define RAL_CNV  RALT_T(KC_LANG1)
+#define LGU_NCV  LGUI_T(KC_LANG2)
+#define RGU_ENT  RGUI_T(KC_ENT)
+#define RGU_IN8  RGUI_T(KC_INT8)
+
+#define RSF_SCL  RSFT_T(KC_SCLN)
+#define RCT_ESC  RCTL_T(KC_ESC)
+#define RCT_IN7  RCTL_T(KC_INT7)
+
+#define LT1_SPC  LT(1, KC_SPC)
+#define LT2_F    LT(2, KC_F)
+#define LT2_N    LT(2, KC_N)
+#define LT3_BS   LT(3, KC_BSPC)
+#define LT3_V    LT(3, KC_V)
+#define LT3_QOT  LT(3, KC_QUOT)
+#define TG4      TG(4)
+
+#define SFT_1    RSFT(KC_1)
+#define SFT_2    RSFT(KC_2)
+#define SFT_3    RSFT(KC_3)
+#define SFT_4    RSFT(KC_4)
+#define SFT_5    RSFT(KC_5)
+#define SFT_6    LSFT(KC_6)
+#define SFT_7    LSFT(KC_7)
+#define SFT_8    LSFT(KC_8)
+#define SFT_9    LSFT(KC_9)
+#define SFT_0    LSFT(KC_0)
+#define SFT_LBR  LSFT(KC_LBRC)
+
+#define OSM_LSF  OSM(MOD_LSFT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  // Layer 0, Base layer
+  LAYOUT_diag_4x14(
+    KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,
+    KC_LCTL,          KC_A,    KC_S,    KC_D,    LT2_F,   KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    RSF_SCL, LT3_QOT, KC_ENT,
+    KC_LSFT, TG4,     KC_Z,    KC_X,    KC_C,    LT3_V,   KC_B,         LT2_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+    KC_BTN1, KC_BTN2, KC_LALT,          LGU_NCV, LT1_SPC,               RCT_ESC, RGU_ENT, RAL_CNV, KC_INT1, KC_DEL,           MU_TOG
+  ),
+
+  // Layer 1, Space-modifiers: Basic keys
+  LAYOUT_diag_4x14(
+    RESET,            KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP,      KC_BTN2, KC_INT1, KC_MINS, KC_EQL,  KC_INT3, SFT_LBR, KC_TRNS,
+    KC_TRNS,          KC_AGIN, KC_FIND, KC_PGUP, KC_PGDN, KC_F19,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_ENT,  SFT_7,   SFT_2,
+    KC_TRNS, KC_TRNS, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, KC_APP,       KC_BSPC, KC_DEL,  KC_RBRC, KC_BSLS, KC_HOME,          KC_END,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,               RCT_IN7, RGU_IN8, KC_TRNS, KC_INT2, KC_INT4,          MU_MOD
+  ),
+
+  // Layer 2, F,N-modifiers: Number keys and symbols
+  LAYOUT_diag_4x14(
+    KC_TRNS,          SFT_1,   SFT_2,   SFT_3,   SFT_4,   SFT_5,        SFT_6,   SFT_7,   SFT_8,   SFT_9,   KC_COMM, KC_DOT,  KC_QUOT,
+    KC_TRNS,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SFT_1,   SFT_2,
+    KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,         KC_BSPC, KC_MINS, SFT_4,   SFT_5,   KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_4,                  KC_5,    KC_TRNS, KC_TRNS, KC_INT5, KC_INT6,          KC_TRNS
+  ),
+
+  // Layer 3, V,:-modifiers: Functions and mouse keys
+  LAYOUT_diag_4x14(
+    KC_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_MPLY,          KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU,      KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN3, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,       KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,           KC_F18,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_BTN2, KC_BTN1,               KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+  ),
+
+  // Layer 4, Toggles: One handed mode
+  LAYOUT_diag_4x14(
+    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_LSFT, KC_TRNS,      KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RSFT, KC_TRNS, KC_TRNS,
+    KC_TRNS, TG4,     KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,      KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_UP,            KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_LALT,          KC_LGUI, KC_LCTL,               KC_RCTL, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN,          KC_RGHT
+  )
+};
diff --git a/keyboards/handwired/twig/twig50/readme.md b/keyboards/handwired/twig/twig50/readme.md
new file mode 100644
index 0000000000..ae3692c1a0
--- /dev/null
+++ b/keyboards/handwired/twig/twig50/readme.md
@@ -0,0 +1,29 @@
+# Twig50
+
+![Twig50](https://user-images.githubusercontent.com/12627081/185365257-03a4904b-8432-445b-9eca-67f2aff57cd9.jpg "Sample build")
+
+Handwired 50 key with Proton C.
+
+* Keyboard Maintainer: [Takeshi Noda](https://github.com/nodatk)
+* Hardware Supported: Proton C
+* Hardware Availability: Sorry, not available for now
+
+Layout data is available [here](http://www.keyboard-layout-editor.com/#/gists/8df4caf51c8d57e4069e2ae19965f02c).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/twig/twig50:default
+
+Flashing example for this keyboard:
+
+    make handwired/twig/twig50:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/twig/twig50/rules.mk b/keyboards/handwired/twig/twig50/rules.mk
new file mode 100644
index 0000000000..137022d672
--- /dev/null
+++ b/keyboards/handwired/twig/twig50/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
diff --git a/keyboards/handwired/twig/twig50/twig50.c b/keyboards/handwired/twig/twig50/twig50.c
new file mode 100644
index 0000000000..7c4c8572f8
--- /dev/null
+++ b/keyboards/handwired/twig/twig50/twig50.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Takeshi Noda (nodatk@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "twig50.h"
diff --git a/keyboards/handwired/twig/twig50/twig50.h b/keyboards/handwired/twig/twig50/twig50.h
new file mode 100644
index 0000000000..771f13e051
--- /dev/null
+++ b/keyboards/handwired/twig/twig50/twig50.h
@@ -0,0 +1,20 @@
+// Copyright 2022 Takeshi Noda (nodatk@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_diag_4x14( \
+	K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+	K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+	K30, K31, K32,      K34, K35,      K37, K38, K39, K3A, K3B,      K3D  \
+) { \
+	{ K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+	{ K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
+	{ K30, K31, K32, ___, K34, K35, ___, K37, K38, K39, K3A, K3B, ___, K3D }  \
+}

From b100db1e5668c9a10437e89d41af76910c58d51d Mon Sep 17 00:00:00 2001
From: Kim Minjong <make.dirty.code@gmail.com>
Date: Wed, 5 Oct 2022 11:16:11 +0900
Subject: [PATCH 558/959] [Docs] Add a note about the print function. (#17737)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/faq_debug.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/faq_debug.md b/docs/faq_debug.md
index 4a35997222..b639b7ea04 100644
--- a/docs/faq_debug.md
+++ b/docs/faq_debug.md
@@ -133,3 +133,4 @@ Check:
 - Set `debug_enable=true`. See [Debugging](#debugging)
 - Try using `print` function instead of debug print. See **common/print.h**.
 - Disconnect other devices with console function. See [Issue #97](https://github.com/tmk/tmk_keyboard/issues/97).
+- Ensure all strings end with a newline character (`\n`). QMK Toolbox prints console output on a per-line basis.

From 0e819542896587aca648964efc91ae235630466f Mon Sep 17 00:00:00 2001
From: Jesper Severinsen <30658160+jesperseverinsen@users.noreply.github.com>
Date: Wed, 5 Oct 2022 04:34:48 +0200
Subject: [PATCH 559/959] [Keyboard] Add Nyhxis NFR-70 keyboard (#17562)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/nyhxis/nfr_70/info.json             | 182 ++++++++++++++++++
 .../nyhxis/nfr_70/keymaps/default/keymap.c    |  44 +++++
 .../nyhxis/nfr_70/keymaps/default/readme.md   |   1 +
 .../nyhxis/nfr_70/keymaps/tsangan/keymap.c    |  44 +++++
 keyboards/nyhxis/nfr_70/keymaps/via/keymap.c  |  52 +++++
 keyboards/nyhxis/nfr_70/keymaps/via/rules.mk  |   1 +
 keyboards/nyhxis/nfr_70/nfr_70.c              |  17 ++
 keyboards/nyhxis/nfr_70/nfr_70.h              |  63 ++++++
 keyboards/nyhxis/nfr_70/readme.md             |  17 ++
 keyboards/nyhxis/nfr_70/rules.mk              |  19 ++
 10 files changed, 440 insertions(+)
 create mode 100644 keyboards/nyhxis/nfr_70/info.json
 create mode 100644 keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
 create mode 100644 keyboards/nyhxis/nfr_70/keymaps/default/readme.md
 create mode 100644 keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
 create mode 100644 keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
 create mode 100644 keyboards/nyhxis/nfr_70/keymaps/via/rules.mk
 create mode 100644 keyboards/nyhxis/nfr_70/nfr_70.c
 create mode 100644 keyboards/nyhxis/nfr_70/nfr_70.h
 create mode 100644 keyboards/nyhxis/nfr_70/readme.md
 create mode 100644 keyboards/nyhxis/nfr_70/rules.mk

diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json
new file mode 100644
index 0000000000..32109b7012
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/info.json
@@ -0,0 +1,182 @@
+{
+    "keyboard_name": "NFR-70",
+    "manufacturer": "Nyhxis",
+    "url": "https://github.com/Nyhxis/keyboard-resources/tree/master/NFR-70",
+    "maintainer": "Nyhxis",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [ "B2", "B3", "B1", "F7", "F6", "F5", "F4" ],
+        "rows": [ "D3", "D2", "D1", "D0", "C6", "D4", "E6", "D7", "B5", "B4", "B6" ]
+    },
+    "usb": {
+        "vid": "0xABCD",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi":{
+            "layout":
+            [
+                { "label": "ESC", "x": 0, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F13", "x": 14, "y": 0 }
+                { "label": "1", "x": 1, "y": 1.25 },
+                { "label": "3", "x": 3, "y": 1.25 },
+                { "label": "5", "x": 5, "y": 1.25 },
+                { "label": "7", "x": 7, "y": 1.25 },
+                { "label": "9", "x": 9, "y": 1.25 },
+                { "label": "-", "x": 11, "y": 1.25 },
+                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 }
+                { "label": "`", "x": 0, "y": 1.25 },
+                { "label": "2", "x": 2, "y": 1.25 },
+                { "label": "4", "x": 4, "y": 1.25 },
+                { "label": "6", "x": 6, "y": 1.25 },
+                { "label": "8", "x": 8, "y": 1.25 },
+                { "label": "0", "x": 10, "y": 1.25 },
+                { "label": "=", "x": 12, "y": 1.25 },
+                { "label": "TAB", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "]", "x": 12.5, "y": 2.25 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "[", "x": 11.5, "y": 2.25 },
+                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 }
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": "'", "x": 10.75, "y": 3.25 },
+                { "x": 12.75, "y": 3.25 },
+                { "label": "CAPS", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": ";", "x": 11.75, "y": 3.25 },
+                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 }
+                { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": ".", "x": 10.25, "y": 4.25 },
+                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 }
+                { "label": "NUBS", "x": 1.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": ",", "x": 9.25, "y": 4.25 },
+                { "label": "/", "x": 11.25, "y": 4.25 },
+                { "label": "RALT", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "LWIN", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "label": "SPACE", "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "RWIN", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "MENU", "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "RCTRL", "x": 13.75, "y": 5.25, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_tsangan":{
+            "layout":
+            [
+                { "label": "ESC", "x": 0, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F13", "x": 14, "y": 0 }
+                { "label": "1", "x": 1, "y": 1.25 },
+                { "label": "3", "x": 3, "y": 1.25 },
+                { "label": "5", "x": 5, "y": 1.25 },
+                { "label": "7", "x": 7, "y": 1.25 },
+                { "label": "9", "x": 9, "y": 1.25 },
+                { "label": "-", "x": 11, "y": 1.25 },
+                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 }
+                { "label": "`", "x": 0, "y": 1.25 },
+                { "label": "2", "x": 2, "y": 1.25 },
+                { "label": "4", "x": 4, "y": 1.25 },
+                { "label": "6", "x": 6, "y": 1.25 },
+                { "label": "8", "x": 8, "y": 1.25 },
+                { "label": "0", "x": 10, "y": 1.25 },
+                { "label": "=", "x": 12, "y": 1.25 },
+                { "label": "TAB", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "]", "x": 12.5, "y": 2.25 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "[", "x": 11.5, "y": 2.25 },
+                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 }
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": "'", "x": 10.75, "y": 3.25 },
+                { "x": 12.75, "y": 3.25 },
+                { "label": "CAPS", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": ";", "x": 11.75, "y": 3.25 },
+                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 }
+                { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": ".", "x": 10.25, "y": 4.25 },
+                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 }
+                { "label": "NUBS", "x": 1.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": ",", "x": 9.25, "y": 4.25 },
+                { "label": "/", "x": 11.25, "y": 4.25 },
+                { "x": 10, "y": 5.25 },
+                { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.5 },
+                { "label": "LWIN", "x": 1.5, "y": 5.25, "w": 1 },
+                { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.5 },
+                { "label": "SPACE", "x": 4, "y": 5.25, "w": 7 },
+                { "label": "RALT", "x": 11, "y": 5.25, "w": 1.5 },
+                { "label": "RWIN", "x": 12.5, "y": 5.25, "w": 1 },
+                { "label": "RCTRL", "x": 13.5, "y": 5.25, "w": 1.5 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ff3e0802dd
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2022 Nyhxis (@nyhxis)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ansi(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,   KC_F12,  KC_F13, 
+    KC_GRV,  KC_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,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,   MO(1),    KC_RGUI, KC_RCTL
+  ),
+  [1] = LAYOUT_ansi(
+    MO(2),   KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,    KC_F24,   KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_BSPC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDOWN, KC_DOWN,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
+  ),
+  [2] = LAYOUT_ansi(
+    KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/nyhxis/nfr_70/keymaps/default/readme.md b/keyboards/nyhxis/nfr_70/keymaps/default/readme.md
new file mode 100644
index 0000000000..9b3c534eb7
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for NFR-70
\ No newline at end of file
diff --git a/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
new file mode 100644
index 0000000000..b8b2ec1e03
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2022 Nyhxis (@nyhxis)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_tsangan(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,   KC_F12,  KC_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_BSLS, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC,  KC_RBRC, KC_BSLS, 
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT,           KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH,           KC_RSFT,  MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                        KC_RALT,  KC_RGUI, KC_RCTL
+  ),
+  [1] = LAYOUT_tsangan(
+    MO(2),   KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,    KC_F24,   KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_BSPC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDOWN, KC_DOWN,           KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                       KC_TRNS,  KC_TRNS, KC_TRNS
+  ),
+  [2] = LAYOUT_tsangan(
+    KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/nyhxis/nfr_70/keymaps/via/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ec62944db5
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2022 Nyhxis (@nyhxis)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ #include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ansi(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,   KC_F12,  KC_F13, 
+    KC_GRV,  KC_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,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,   MO(1),    KC_RGUI, KC_RCTL
+  ),
+  [1] = LAYOUT_ansi(
+    MO(2),   KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,    KC_F24,   KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_BSPC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDOWN, KC_DOWN,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
+  ),
+  [2] = LAYOUT_ansi(
+    KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_ansi(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
+  )
+};
diff --git a/keyboards/nyhxis/nfr_70/keymaps/via/rules.mk b/keyboards/nyhxis/nfr_70/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/nyhxis/nfr_70/nfr_70.c b/keyboards/nyhxis/nfr_70/nfr_70.c
new file mode 100644
index 0000000000..43d4a0e2c6
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/nfr_70.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Nyhxis (@nyhxis)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nfr_70.h"
diff --git a/keyboards/nyhxis/nfr_70/nfr_70.h b/keyboards/nyhxis/nfr_70/nfr_70.h
new file mode 100644
index 0000000000..e40e5f0800
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/nfr_70.h
@@ -0,0 +1,63 @@
+/* Copyright 2022 Nyhxis (@nyhxis)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ansi( \
+    K000,   K010, K001, K011, K002,  K012, K003, K013, K004,  K014, K005, K015, K006,   K016, \
+    K030, K020, K031, K021, K032, K022, K033, K023, K034, K024, K035, K025, K036, K026, K066, \
+    K040,    K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,    K056, \
+    K070,     K060, K071, K061, K072, K062, K073, K063, K074, K064, K075, K065,         K076, \
+    K080, K090,  K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,            K086, \
+    K100, K101, K102,                         K103,                   K096, K104, K105, K106  \
+) \
+{ \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006 }, \
+    { K010,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+    { K020,  K021,  K022,  K023,  K024,  K025,  K026 }, \
+    { K030,  K031,  K032,  K033,  K034,  K035,  K036 }, \
+    { K040,  K041,  K042,  K043,  K044,  K045,  K046 }, \
+    { K050,  K051,  K052,  K053,  K054,  K055,  K056 }, \
+    { K060,  K061,  K062,  K063,  K064,  K065,  K066 }, \
+    { K070,  K071,  K072,  K073,  K074,  K075,  K076 }, \
+    { K080,  K081,  K082,  K083,  K084,  K085,  K086 }, \
+    { K090,  K091,  K092,  K093,  K094,  K095,  K096 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106 }  \
+}
+
+#define LAYOUT_tsangan( \
+    K000,   K010, K001, K011, K002,  K012, K003, K013, K004,  K014, K005, K015, K006,   K016, \
+    K030, K020, K031, K021, K032, K022, K033, K023, K034, K024, K035, K025, K036, K026, K066, \
+    K040,    K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,    K056, \
+    K070,     K060, K071, K061, K072, K062, K073, K063, K074, K064, K075, K065,         K076, \
+    K080, K090,  K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,     K096,  K086, \
+    K100, K101, K102,                         K103,                         K104, K105, K106  \
+) \
+{ \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006 }, \
+    { K010,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+    { K020,  K021,  K022,  K023,  K024,  K025,  K026 }, \
+    { K030,  K031,  K032,  K033,  K034,  K035,  K036 }, \
+    { K040,  K041,  K042,  K043,  K044,  K045,  K046 }, \
+    { K050,  K051,  K052,  K053,  K054,  K055,  K056 }, \
+    { K060,  K061,  K062,  K063,  K064,  K065,  K066 }, \
+    { K070,  K071,  K072,  K073,  K074,  K075,  K076 }, \
+    { K080,  K081,  K082,  K083,  K084,  K085,  K086 }, \
+    { K090,  K091,  K092,  K093,  K094,  K095,  K096 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106 }  \
+}
diff --git a/keyboards/nyhxis/nfr_70/readme.md b/keyboards/nyhxis/nfr_70/readme.md
new file mode 100644
index 0000000000..2411ca65b7
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/readme.md
@@ -0,0 +1,17 @@
+# NFR-70
+
+![NFR-70](https://i.imgur.com/7jeesq6h.jpg)
+
+A 70% barebones keyboard using Pro-Micro and alternatives.
+
+Firmware was made and tested for Elite-C. Set bootloader in `rules.mk` to match your preferred MCU.
+
+* Keyboard Maintainer: [Nyhxis](https://github.com/Nyhxis)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nyhxis/nfr_70:default
+
+**Reset Key**: The board can be reset by pressing the RESET button on the Elite-C or the button to the right of it labeled SW1. 
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/nyhxis/nfr_70/rules.mk b/keyboards/nyhxis/nfr_70/rules.mk
new file mode 100644
index 0000000000..66c1ee26f4
--- /dev/null
+++ b/keyboards/nyhxis/nfr_70/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#BOOTLOADER = caterina   # Pro-Micro
+BOOTLOADER = atmel-dfu  # Elite-C
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From df7f33582febedc3665e57eba1d22b1651d24d0a Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 5 Oct 2022 20:52:10 +1100
Subject: [PATCH 560/959] Add C++ prerequisite for Fedora. (#18602)

---
 util/install/fedora.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index 4227906ad9..6380f6d33f 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -6,9 +6,9 @@ _qmk_install() {
     # TODO: Check whether devel/headers packages are really needed
     sudo dnf $SKIP_PROMPT install \
         clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
-        make unzip wget zip python3 avr-binutils avr-gcc avr-libc \
-        arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
-        avrdude dfu-programmer dfu-util hidapi libusb-devel
+        make unzip wget zip python3 avr-binutils avr-gcc avr-gcc-c++ avr-libc \
+        arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++ \
+        arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi libusb-devel
 
     python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
 }

From 164d2f36d1ef07554f754cf6290a9a69e1f2f21a Mon Sep 17 00:00:00 2001
From: Klesh Wong <klesh@qq.com>
Date: Wed, 5 Oct 2022 17:59:28 +0800
Subject: [PATCH 561/959] fix: ps2_interrupt.c failed to compile (#18597)

---
 drivers/ps2/ps2_interrupt.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/ps2/ps2_interrupt.c b/drivers/ps2/ps2_interrupt.c
index c9a9f1e1ec..2810a0f126 100644
--- a/drivers/ps2/ps2_interrupt.c
+++ b/drivers/ps2/ps2_interrupt.c
@@ -76,17 +76,18 @@ void palCallback(void *arg) {
 }
 
 #    define PS2_INT_INIT()                                 \
-        { palSetLineMode(PS2_CLOCK_PIN, PAL_MODE_INPUT); } \
-        while (0)
+        do {                                               \
+            palSetLineMode(PS2_CLOCK_PIN, PAL_MODE_INPUT); \
+        } while (0)
 #    define PS2_INT_ON()                                                    \
-        {                                                                   \
+        do {                                                                \
             palEnableLineEvent(PS2_CLOCK_PIN, PAL_EVENT_MODE_FALLING_EDGE); \
             palSetLineCallback(PS2_CLOCK_PIN, palCallback, NULL);           \
-        }                                                                   \
-        while (0)
+        } while (0)
 #    define PS2_INT_OFF()                       \
-        { palDisableLineEvent(PS2_CLOCK_PIN); } \
-        while (0)
+        do {                                    \
+            palDisableLineEvent(PS2_CLOCK_PIN); \
+        } while (0)
 #endif // PROTOCOL_CHIBIOS
 
 void ps2_host_init(void) {

From c1d21de1a230ef34ba0cc96fc4de08021ac1bff0 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 5 Oct 2022 21:35:56 +1100
Subject: [PATCH 562/959] Fixup builds for mechlovin/infinity87. (#18604)

---
 .../{ => rev2}/keymaps/default/keymap.c       |  0
 .../{ => rev2}/keymaps/default/readme.md      |  0
 .../{ => rev2}/keymaps/via/keymap.c           |  0
 .../{ => rev2}/keymaps/via/readme.md          |  0
 .../{ => rev2}/keymaps/via/rules.mk           |  0
 .../rgb_rev1/keymaps/default/keymap.c         | 27 ++++++++++
 .../rgb_rev1/keymaps/default/readme.md        |  1 +
 .../infinity87/rgb_rev1/keymaps/via/keymap.c  | 52 +++++++++++++++++++
 .../infinity87/rgb_rev1/keymaps/via/readme.md |  1 +
 .../infinity87/rgb_rev1/keymaps/via/rules.mk  |  2 +
 10 files changed, 83 insertions(+)
 rename keyboards/mechlovin/infinity87/{ => rev2}/keymaps/default/keymap.c (100%)
 rename keyboards/mechlovin/infinity87/{ => rev2}/keymaps/default/readme.md (100%)
 rename keyboards/mechlovin/infinity87/{ => rev2}/keymaps/via/keymap.c (100%)
 rename keyboards/mechlovin/infinity87/{ => rev2}/keymaps/via/readme.md (100%)
 rename keyboards/mechlovin/infinity87/{ => rev2}/keymaps/via/rules.mk (100%)
 create mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c
 create mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md
 create mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c
 create mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md
 create mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/rules.mk

diff --git a/keyboards/mechlovin/infinity87/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechlovin/infinity87/keymaps/default/keymap.c
rename to keyboards/mechlovin/infinity87/rev2/keymaps/default/keymap.c
diff --git a/keyboards/mechlovin/infinity87/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rev2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mechlovin/infinity87/keymaps/default/readme.md
rename to keyboards/mechlovin/infinity87/rev2/keymaps/default/readme.md
diff --git a/keyboards/mechlovin/infinity87/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mechlovin/infinity87/keymaps/via/keymap.c
rename to keyboards/mechlovin/infinity87/rev2/keymaps/via/keymap.c
diff --git a/keyboards/mechlovin/infinity87/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rev2/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mechlovin/infinity87/keymaps/via/readme.md
rename to keyboards/mechlovin/infinity87/rev2/keymaps/via/readme.md
diff --git a/keyboards/mechlovin/infinity87/keymaps/via/rules.mk b/keyboards/mechlovin/infinity87/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechlovin/infinity87/keymaps/via/rules.mk
rename to keyboards/mechlovin/infinity87/rev2/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a98abef90c
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+        KC_LSFT,   KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_LSFT,                     KC_UP,
+        KC_LCTL,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT,  KC_LGUI,MO(1), KC_LCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+};
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md
new file mode 100644
index 0000000000..01ef555056
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for infinity87
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..22250ad0e6
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+        KC_LSFT,   KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_LSFT,                     KC_UP,
+        KC_LCTL,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT,  KC_LGUI, MO(1),  KC_LCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md
new file mode 100644
index 0000000000..8867d290cd
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for infinity87
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From 5f671de13a01c88ceb86874dba91e4e66c4a3d51 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Wed, 5 Oct 2022 17:04:17 +0200
Subject: [PATCH 563/959] =?UTF-8?q?RESET=20=E2=86=92=20QK=5FBOOT=20in=20ny?=
 =?UTF-8?q?hxis/nfr=5F70=20(#18607)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboards/nyhxis/nfr_70/keymaps/default/keymap.c | 2 +-
 keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c | 2 +-
 keyboards/nyhxis/nfr_70/keymaps/via/keymap.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
index ff3e0802dd..80b5292292 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
   ),
   [2] = LAYOUT_ansi(
-    KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,
diff --git a/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
index b8b2ec1e03..e0f621ae4c 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                       KC_TRNS,  KC_TRNS, KC_TRNS
   ),
   [2] = LAYOUT_tsangan(
-    KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,
diff --git a/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
index ec62944db5..fa0a8ad324 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
   ),
   [2] = LAYOUT_ansi(
-    KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
+    KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,           KC_TRNS,

From d1b6b062024dddf047f760efbad21edb2acca394 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 6 Oct 2022 02:21:40 +1100
Subject: [PATCH 564/959] Remove legacy locking caps/num/scroll keycodes
 (#18601)

---
 layouts/community/ergodox/osx_neo2/keymap.c            |  4 ++--
 .../ergodox/twentylives_dvorak_with_hebrew/keymap.c    | 10 +++++-----
 layouts/community/planck_mit/guidoism/keys.json        |  6 +++---
 quantum/keycode_legacy.h                               |  3 ---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index 125cc43a8f..22d6f35e08 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -687,9 +687,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if ((capslock_state & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
     // CAPSLOCK is currently active, disable it
     if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
-      unregister_code(KC_LOCKING_CAPS);
+      unregister_code(KC_LOCKING_CAPS_LOCK);
     } else {
-      register_code(KC_LOCKING_CAPS);
+      register_code(KC_LOCKING_CAPS_LOCK);
     }
     return false;
   }
diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
index 12548ae0ea..25ce96e068 100644
--- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
@@ -161,11 +161,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TRNS,
 	KC_TRNS,KC_TRNS,KC_TRNS,
 	// Right Hand
-	KC_TRNS, KC_TRNS,  KC_LOCKING_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
-	KC_TRNS, KC_TRNS,  KC_KP_7,        KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
-	         KC_TRNS,  KC_KP_4,        KC_KP_5,     KC_KP_6,        KC_KP_PLUS,  KC_TRNS,
-	KC_TRNS, KC_TRNS,  KC_KP_1,        KC_KP_2,     KC_KP_3,        KC_ENTER,    KC_TRNS,
-	                   KC_KP_0,        KC_KP_0,     KC_KP_DOT,      KC_ENTER,    KC_TRNS,
+	KC_TRNS, KC_TRNS,  KC_LNUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
+	KC_TRNS, KC_TRNS,  KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
+	         KC_TRNS,  KC_KP_4, KC_KP_5,     KC_KP_6,        KC_KP_PLUS,  KC_TRNS,
+	KC_TRNS, KC_TRNS,  KC_KP_1, KC_KP_2,     KC_KP_3,        KC_ENTER,    KC_TRNS,
+	                   KC_KP_0, KC_KP_0,     KC_KP_DOT,      KC_ENTER,    KC_TRNS,
 	KC_TRNS,  KC_TRNS,
 	KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index 791119b4f2..bcc9e0da62 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -118,11 +118,11 @@
   "KC_RALT": "\u2325",
   "KC_RGUI": "\u2318",
   "KC_RCMD": "\u2318",
-  "KC_LOCKING_CAPS": "Locking Caps Lock",
+  "KC_LOCKING_CAPS_LOCK": "Locking Caps Lock",
   "KC_LCAP": "Locking Caps Lock",
-  "KC_LOCKING_NUM": "Locking Num Lock",
+  "KC_LOCKING_NUM_LOCK": "Locking Num Lock",
   "KC_LNUM": "Locking Num Lock",
-  "KC_LOCKING_SCROLL": "Locking Scroll Lock",
+  "KC_LOCKING_SCROLL_LOCK": "Locking Scroll Lock",
   "KC_LSCR": "Locking Scroll Lock",
   "KC_INT4": "JIS Henkan",
   "KC_HENK": "JIS Henkan",
diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h
index 0317a05534..9169f3cb89 100644
--- a/quantum/keycode_legacy.h
+++ b/quantum/keycode_legacy.h
@@ -19,9 +19,6 @@
 #define KC__MUTE          KC_KB_MUTE
 #define KC__VOLUP         KC_KB_VOLUME_UP
 #define KC__VOLDOWN       KC_KB_VOLUME_DOWN
-#define KC_LOCKING_CAPS   KC_LOCKING_CAPS_LOCK
-#define KC_LOCKING_NUM    KC_LOCKING_NUM_LOCK
-#define KC_LOCKING_SCROLL KC_LOCKING_SCROLL_LOCK
 #define KC_LANG1          KC_LANGUAGE_1
 #define KC_LANG2          KC_LANGUAGE_2
 #define KC_LANG3          KC_LANGUAGE_3

From 959f4cbb621868a4f0c1701f54ad2a1f45d889af Mon Sep 17 00:00:00 2001
From: George Rodrigues <georgerodrigues@live.com.au>
Date: Wed, 5 Oct 2022 13:32:07 -0300
Subject: [PATCH 565/959] docs: some typos (#18582)

probably hacktoberism
---
 Makefile                          |  2 +-
 builddefs/build_keyboard.mk       |  2 +-
 builddefs/common_rules.mk         |  4 ++--
 docs/api_docs.md                  |  2 +-
 docs/cli_commands.md              |  2 +-
 docs/cli_development.md           |  2 +-
 docs/coding_conventions_c.md      |  2 +-
 docs/coding_conventions_python.md |  4 ++--
 docs/config_options.md            |  2 +-
 docs/feature_macros.md            |  2 +-
 docs/feature_oled_driver.md       |  4 ++--
 docs/feature_rgb_matrix.md        |  2 +-
 quantum/action_layer.c            | 14 +++++++-------
 util/docker_build.sh              |  4 ++--
 util/docker_cmd.sh                |  2 +-
 15 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index a418576c07..4a9bba603f 100644
--- a/Makefile
+++ b/Makefile
@@ -264,7 +264,7 @@ define PARSE_KEYMAP
     # The rest of the rule is the target
     # Remove the leading ":" from the target, as it acts as a separator
     MAKE_TARGET := $$(patsubst :%,%,$$(RULE))
-    # We need to generate an unique indentifer to append to the COMMANDS list
+    # We need to generate an unique identifier to append to the COMMANDS list
     CURRENT_KB_UNDER := $$(subst /,_,$$(CURRENT_KB))
     COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB_UNDER)_KEYMAP_$$(CURRENT_KM)
     # If we are compiling a keyboard without a subproject, we want to display just the name
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index fe95dcaf15..6841c27c0f 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -236,7 +236,7 @@ endif
 # that the same keymap may be used on multiple keyboards.
 #
 # We grab the most top-level include file that we can. That file should
-# use #ifdef statements to include all the neccesary subfolder includes,
+# use #ifdef statements to include all the necessary subfolder includes,
 # as described here:
 #
 #    https://docs.qmk.fm/#/feature_layouts?id=tips-for-making-layouts-keyboard-agnostic
diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index c8816639f8..22746b92a3 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -1,7 +1,7 @@
 # Hey Emacs, this is a -*- makefile -*-
 #----------------------------------------------------------------------------
 
-# Enable vpath seraching for source files only
+# Enable vpath searching for source files only
 # Without this, output files, could be read from the wrong .build directories
 VPATH_SRC := $(VPATH)
 vpath %.c $(VPATH_SRC)
@@ -85,7 +85,7 @@ ifeq ($(strip $(DEBUG_ENABLE)),yes)
 endif
 CXXFLAGS += $(CXXDEFS)
 CXXFLAGS += -O$(OPT)
-# to supress "warning: only initialized variables can be placed into program memory area"
+# to suppress "warning: only initialized variables can be placed into program memory area"
 CXXFLAGS += -w
 CXXFLAGS += -Wall
 CXXFLAGS += -Wundef
diff --git a/docs/api_docs.md b/docs/api_docs.md
index e2f970f3ab..237b02fed2 100644
--- a/docs/api_docs.md
+++ b/docs/api_docs.md
@@ -21,7 +21,7 @@ This service is an asynchronous API for compiling custom keymaps. You POST some
 }
 ```
 
-As you can see the payload describes all aspects of a keyboard necessary to create and generate a firmware. Each layer is a single list of QMK keycodes the same length as the keyboard's `LAYOUT` macro. If a keyboard supports mulitple `LAYOUT` macros you can specify which macro to use.
+As you can see the payload describes all aspects of a keyboard necessary to create and generate a firmware. Each layer is a single list of QMK keycodes the same length as the keyboard's `LAYOUT` macro. If a keyboard supports multiple `LAYOUT` macros you can specify which macro to use.
 
 ## Submitting a Compile Job
 
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 4608ed85b6..019447075b 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -223,7 +223,7 @@ Check your environment and report problems only:
 
 ## `qmk format-json`
 
-Formats a JSON file in a (mostly) human-friendly way. Will usually correctly detect the format of the JSON (info.json or keymap.json) but you can override this with `--format` if neccesary.
+Formats a JSON file in a (mostly) human-friendly way. Will usually correctly detect the format of the JSON (info.json or keymap.json) but you can override this with `--format` if necessary.
 
 **Usage**:
 
diff --git a/docs/cli_development.md b/docs/cli_development.md
index 17370a732a..d878deff17 100644
--- a/docs/cli_development.md
+++ b/docs/cli_development.md
@@ -162,7 +162,7 @@ del(cli.config.<section>.<key>)
 
 ## Writing The Configuration File
 
-The configuration is not written out when it is changed. Most commands do not need to do this. We prefer to have the user change their configuration deliberitely using `qmk config`.
+The configuration is not written out when it is changed. Most commands do not need to do this. We prefer to have the user change their configuration deliberately using `qmk config`.
 
 You can use `cli.save_config()` to write out the configuration.
 
diff --git a/docs/coding_conventions_c.md b/docs/coding_conventions_c.md
index c4bace66cc..3f44da713d 100644
--- a/docs/coding_conventions_c.md
+++ b/docs/coding_conventions_c.md
@@ -24,7 +24,7 @@ Most of our style is pretty easy to pick up on, but right now it's not entirely
   * Readability is more important than consistency.
   * Follow the file's existing style. If the file is mixed, follow the style that makes sense for the section you are modifying.
   * When indenting, keep the hash at the start of the line and add whitespace between `#` and `if`, starting with 4 spaces after the `#`.
-  * You can follow the indention level of the surrounding C code, or preprocessor directives can have their own indentation levels. Choose the style that best communicates the intent of your code.
+  * You can follow the indentation level of the surrounding C code, or preprocessor directives can have their own indentation levels. Choose the style that best communicates the intent of your code.
 
 Here is an example for easy reference:
 
diff --git a/docs/coding_conventions_python.md b/docs/coding_conventions_python.md
index 960b9cb49e..2b68703448 100644
--- a/docs/coding_conventions_python.md
+++ b/docs/coding_conventions_python.md
@@ -2,7 +2,7 @@
 
 Most of our style follows PEP8 with some local modifications to make things less nit-picky. 
 
-* We target Python 3.7 for compatability with all supported platforms.
+* We target Python 3.7 for compatibility with all supported platforms.
 * We indent using four (4) spaces (soft tabs)
 * We encourage liberal use of comments
   * Think of them as a story describing the feature
@@ -21,7 +21,7 @@ You can use [yapf](https://github.com/google/yapf) to style your code. We provid
 
 We don't have a hard and fast rule for when to use `import ...` vs `from ... import ...`. Understandability and maintainability is our ultimate goal.
 
-Generally we prefer to import specific function and class names from a module to keep code shorter and easier to understand. Sometimes this results in a name that is ambiguous, and in such cases we prefer to import the module instead. You should avoid using the "as" keyword when importing, unless you are importing a compatability module.
+Generally we prefer to import specific function and class names from a module to keep code shorter and easier to understand. Sometimes this results in a name that is ambiguous, and in such cases we prefer to import the module instead. You should avoid using the "as" keyword when importing, unless you are importing a compatibility module.
 
 Imports should be one line per module. We group import statements together using the standard python rules- system, 3rd party, local.
 
diff --git a/docs/config_options.md b/docs/config_options.md
index 02cfe83c69..cc732de7d2 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -195,7 +195,7 @@ If you define these options you will enable the associated feature, which may in
 * `#define COMBO_TERM 200`
   * how long for the Combo keys to be detected. Defaults to `TAPPING_TERM` if not defined.
 * `#define COMBO_MUST_HOLD_MODS`
-  * Flag for enabling extending timeout on Combos containing modifers
+  * Flag for enabling extending timeout on Combos containing modifiers
 * `#define COMBO_MOD_TERM 200`
   * Allows for extending COMBO_TERM for mod keys while mid-combo.
 * `#define COMBO_MUST_HOLD_PER_COMBO`
diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index f5bd5be41b..63b7223db9 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -374,7 +374,7 @@ This will clear all keys besides the mods currently pressed.
 This macro will register `KC_LALT` and tap `KC_TAB`, then wait for 1000ms. If the key is tapped again, it will send another `KC_TAB`; if there is no tap, `KC_LALT` will be unregistered, thus allowing you to cycle through windows.
 
 ```c
-bool is_alt_tab_active = false; // ADD this near the begining of keymap.c
+bool is_alt_tab_active = false; // ADD this near the beginning 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
diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index f73909f486..b7451f17df 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -259,12 +259,12 @@ void oled_render(void);
 void oled_set_cursor(uint8_t col, uint8_t line);
 
 // Advances the cursor to the next page, writing ' ' if true
-// Wraps to the begining when out of bounds
+// Wraps to the beginning when out of bounds
 void oled_advance_page(bool clearPageRemainder);
 
 // Moves the cursor forward 1 character length
 // Advance page if there is not enough room for the next character
-// Wraps to the begining when out of bounds
+// Wraps to the beginning when out of bounds
 void oled_advance_char(void);
 
 // Writes a single character to the buffer at current cursor position
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 13c63ac94c..31f0a2cbc5 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -270,7 +270,7 @@ Configure the hardware via your `config.h`:
 | `ISSI_CONFIGURATION` | (Optional) Configuration for the Configuration Register | |
 | `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF |
 | `ISSI_PULLDOWNUP` | (Optional) Configuration for the Pull Up & Pull Down Register | |
-| `ISSI_TEMP` | (Optional) Configuration for the Tempature Register | |
+| `ISSI_TEMP` | (Optional) Configuration for the Temperature Register | |
 | `ISSI_PWM_ENABLE` | (Optional) Configuration for the PWM Enable Register | |
 | `ISSI_PWM_SET` | (Optional) Configuration for the PWM Setting Register | |
 | `ISSI_SCAL_RED` | (Optional) Configuration for the RED LEDs in Scaling Registers | 0xFF |
diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index 473e0e948d..8ef337a690 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -71,21 +71,21 @@ void default_layer_set(layer_state_t state) {
 #ifndef NO_ACTION_LAYER
 /** \brief Default Layer Or
  *
- * Turns on the default layer based on matching bits between specifed layer and existing layer state
+ * Turns on the default layer based on matching bits between specified layer and existing layer state
  */
 void default_layer_or(layer_state_t state) {
     default_layer_state_set(default_layer_state | state);
 }
 /** \brief Default Layer And
  *
- * Turns on default layer based on matching enabled bits between specifed layer and existing layer state
+ * Turns on default layer based on matching enabled bits between specified layer and existing layer state
  */
 void default_layer_and(layer_state_t state) {
     default_layer_state_set(default_layer_state & state);
 }
 /** \brief Default Layer Xor
  *
- * Turns on default layer based on non-matching bits between specifed layer and existing layer state
+ * Turns on default layer based on non-matching bits between specified layer and existing layer state
  */
 void default_layer_xor(layer_state_t state) {
     default_layer_state_set(default_layer_state ^ state);
@@ -115,7 +115,7 @@ __attribute__((weak)) layer_state_t layer_state_set_kb(layer_state_t state) {
 
 /** \brief Layer state set
  *
- * Sets the layer to match the specifed state (a bitmask)
+ * Sets the layer to match the specified state (a bitmask)
  */
 void layer_state_set(layer_state_t state) {
     state = layer_state_set_kb(state);
@@ -193,21 +193,21 @@ void layer_invert(uint8_t layer) {
 
 /** \brief Layer or
  *
- * Turns on layers based on matching bits between specifed layer and existing layer state
+ * Turns on layers based on matching bits between specified layer and existing layer state
  */
 void layer_or(layer_state_t state) {
     layer_state_set(layer_state | state);
 }
 /** \brief Layer and
  *
- * Turns on layers based on matching enabled bits between specifed layer and existing layer state
+ * Turns on layers based on matching enabled bits between specified layer and existing layer state
  */
 void layer_and(layer_state_t state) {
     layer_state_set(layer_state & state);
 }
 /** \brief Layer xor
  *
- * Turns on layers based on non-matching bits between specifed layer and existing layer state
+ * Turns on layers based on non-matching bits between specified layer and existing layer state
  */
 void layer_xor(layer_state_t state) {
     layer_state_set(layer_state ^ state);
diff --git a/util/docker_build.sh b/util/docker_build.sh
index 8a6b2d0565..7e10a4f76b 100755
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -19,7 +19,7 @@ if [ $# -gt 1 ]; then
 	exit 1
 fi
 
-# Allow $RUNTIME to be overriden by the user as an environment variable
+# Allow $RUNTIME to be overridden by the user as an environment variable
 # Else check if either docker or podman exit and set them as runtime
 # if none are found error out
 if [ -z "$RUNTIME" ]; then
@@ -36,7 +36,7 @@ if [ -z "$RUNTIME" ]; then
 		exit 2
 	fi
 fi
-	
+
 
 # Determine arguments
 if [ $# -eq 0 ]; then
diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh
index 2ea113d24a..f3c4c7804f 100755
--- a/util/docker_cmd.sh
+++ b/util/docker_cmd.sh
@@ -15,7 +15,7 @@ for arg; do
 	fi
 done
 
-# Allow $RUNTIME to be overriden by the user as an environment variable
+# Allow $RUNTIME to be overridden by the user as an environment variable
 # Else check if either docker or podman exit and set them as runtime
 # if none are found error out
 if [ -z "$RUNTIME" ]; then

From c76d2074b68b1fdaa48e7af7ce93275fe418f538 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Wed, 5 Oct 2022 19:22:57 +0200
Subject: [PATCH 566/959] [Bug] Fix ST7565 handler deadlock (#18609)

---
 quantum/split_common/transactions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 13fd8a761e..67986e4340 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -623,7 +623,7 @@ static void st7565_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sla
 }
 
 #    define TRANSACTIONS_ST7565_MASTER() TRANSACTION_HANDLER_MASTER(st7565)
-#    define TRANSACTIONS_ST7565_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(st7565)
+#    define TRANSACTIONS_ST7565_SLAVE() TRANSACTION_HANDLER_SLAVE(st7565)
 #    define TRANSACTIONS_ST7565_REGISTRATIONS [PUT_ST7565] = trans_initiator2target_initializer(current_st7565_state),
 
 #else // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)

From f7785223e5e8aa2a7dbb665e8359de36aa4e7227 Mon Sep 17 00:00:00 2001
From: Brian Choromanski <BrianChoromanski@gmail.com>
Date: Wed, 5 Oct 2022 13:29:43 -0400
Subject: [PATCH 567/959] Added new issue template for "Other issues" (#18578)

---
 .github/ISSUE_TEMPLATE/other_issues.md  | 14 --------------
 .github/ISSUE_TEMPLATE/other_issues.yml | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/other_issues.md
 create mode 100644 .github/ISSUE_TEMPLATE/other_issues.yml

diff --git a/.github/ISSUE_TEMPLATE/other_issues.md b/.github/ISSUE_TEMPLATE/other_issues.md
deleted file mode 100644
index befeeb165a..0000000000
--- a/.github/ISSUE_TEMPLATE/other_issues.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Other issues
-about: Anything else that doesn't fall into the above categories.
-title: ''
-labels: help wanted, question
-assignees: ''
-
----
-
-<!--- Provide a general summary of the changes you want in the title above. -->
-
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-<!-- Please check https://docs.qmk.fm/#/support for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate. -->
diff --git a/.github/ISSUE_TEMPLATE/other_issues.yml b/.github/ISSUE_TEMPLATE/other_issues.yml
new file mode 100644
index 0000000000..7c4fbeb23c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other_issues.yml
@@ -0,0 +1,16 @@
+name: Other issues
+description: Anything else that doesn't fall into the above categories.
+labels: ["help wanted", "question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Provide a general summary of the changes you want in the title above.
+  - type: markdown
+    attributes:
+      value: |
+        Please check [https://docs.qmk.fm/#/support](https://docs.qmk.fm/#/support) for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate.
+  - type: textarea
+    attributes:
+      label: Issue Description
+      description: Describe your issue in as much detail as possible.
\ No newline at end of file

From e7d5a6e490c54c65189fd600c2fcc942191a4ed3 Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Wed, 5 Oct 2022 19:30:03 +0200
Subject: [PATCH 568/959] [Keyboard] Add waffling60 Rev D Solder (#18580)

Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
---
 keyboards/4pplet/waffling60/rev_d/config.h    | 46 ++++++++++++++++++
 keyboards/4pplet/waffling60/rev_d/info.json   | 16 +++++++
 .../waffling60/rev_d/keymaps/default/keymap.c | 34 +++++++++++++
 .../waffling60/rev_d/keymaps/via/keymap.c     | 48 +++++++++++++++++++
 .../waffling60/rev_d/keymaps/via/rules.mk     |  1 +
 keyboards/4pplet/waffling60/rev_d/readme.md   | 20 ++++++++
 keyboards/4pplet/waffling60/rev_d/rev_d.c     | 34 +++++++++++++
 keyboards/4pplet/waffling60/rev_d/rev_d.h     | 37 ++++++++++++++
 keyboards/4pplet/waffling60/rev_d/rules.mk    | 24 ++++++++++
 9 files changed, 260 insertions(+)
 create mode 100644 keyboards/4pplet/waffling60/rev_d/config.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d/info.json
 create mode 100644 keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d/keymaps/via/rules.mk
 create mode 100644 keyboards/4pplet/waffling60/rev_d/readme.md
 create mode 100644 keyboards/4pplet/waffling60/rev_d/rev_d.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d/rev_d.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d/rules.mk

diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h
new file mode 100644
index 0000000000..cfb2ed37e8
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/config.h
@@ -0,0 +1,46 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
+#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT B2 // usually COL
+#define QMK_ESC_INPUT B14 // usually ROW
+
+#define RGBLED_NUM 1
+#define WS2812_EXTERNAL_PULLUP
+#define RGB_DI_PIN A8
+
+#define BACKLIGHT_LEVELS 5
+
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
new file mode 100644
index 0000000000..ea5b142c25
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "waffling60 Rev D",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000E",
+        "device_version": "0.0.4"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"ISO", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9c567a0e3e
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c24c5f27d1
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS),
+// extra layer for VIA
+[2] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[3] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_d/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_d/readme.md b/keyboards/4pplet/waffling60/rev_d/readme.md
new file mode 100644
index 0000000000..3b6b9c94f2
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/readme.md
@@ -0,0 +1,20 @@
+# waffling60
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support.
+
+More info: https://geekhack.org/index.php?topic=103531.0
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_c:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+How to enter bootloader (DFU):
+* Tap the physical reset button or short the reset-header (labled RESET) on tha back of the PCB for keyboard to enter DFU. When in DFU, it's ready to flash the firmware.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.
diff --git a/keyboards/4pplet/waffling60/rev_d/rev_d.c b/keyboards/4pplet/waffling60/rev_d/rev_d.c
new file mode 100644
index 0000000000..2e0511459d
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/rev_d.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "rev_d.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (CAPS_LOCK_ENABLE && res) {
+        if(led_state.caps_lock) {
+            #ifdef CAPS_LOCK_COLOR
+                rgblight_sethsv_at(CAPS_LOCK_COLOR, 0);
+            #else
+                rgblight_sethsv_at(rgblight_get_hue(),rgblight_get_sat(),rgblight_get_val(), 0);
+            #endif
+        }
+        else{
+            rgblight_sethsv_at(HSV_OFF, 0);
+        }
+    }
+    return res;
+}
diff --git a/keyboards/4pplet/waffling60/rev_d/rev_d.h b/keyboards/4pplet/waffling60/rev_d/rev_d.h
new file mode 100644
index 0000000000..88b7fab4ab
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/rev_d.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#define CAPS_LOCK_ENABLE true
+//#define CAPS_LOCK_COLOR HSV_ORANGE
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k3d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4d, \
+    k40, k41, k42, k44, k46, k48, k49, k4a, k4b, k4c  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
+    {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d}, \
+}
diff --git a/keyboards/4pplet/waffling60/rev_d/rules.mk b/keyboards/4pplet/waffling60/rev_d/rules.mk
new file mode 100644
index 0000000000..8dc60fa527
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From 44aad7b92bb38c4fbd0ebc143a3f88c564c7373a Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Wed, 5 Oct 2022 19:30:41 +0200
Subject: [PATCH 569/959] [Keyboard] Add waffling60 Rev D ANSI Hotswap (#18579)

Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
---
 .../4pplet/waffling60/rev_d_ansi/config.h     | 36 ++++++++++++++
 .../4pplet/waffling60/rev_d_ansi/info.json    | 16 +++++++
 .../rev_d_ansi/keymaps/default/keymap.c       | 34 +++++++++++++
 .../rev_d_ansi/keymaps/via/keymap.c           | 48 +++++++++++++++++++
 .../rev_d_ansi/keymaps/via/rules.mk           |  1 +
 .../4pplet/waffling60/rev_d_ansi/readme.md    | 22 +++++++++
 .../4pplet/waffling60/rev_d_ansi/rev_d_ansi.c | 17 +++++++
 .../4pplet/waffling60/rev_d_ansi/rev_d_ansi.h | 35 ++++++++++++++
 .../4pplet/waffling60/rev_d_ansi/rules.mk     | 24 ++++++++++
 9 files changed, 233 insertions(+)
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/config.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/info.json
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/readme.md
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h
 create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/rules.mk

diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h
new file mode 100644
index 0000000000..9c4ac8885e
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/config.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
+#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT B2 // usually COL
+#define QMK_ESC_INPUT B14 // usually ROW
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
new file mode 100644
index 0000000000..ba198ef935
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Waffling60 Rev D ANSI",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000D",
+        "device_version": "0.0.4"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"3U", "x":4, "y":4, "w":3}, {"label":"1U", "x":7, "y":4}, {"label":"3U", "x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6b4b4a7566
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..29299cac6a
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH,  KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[2] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS),
+// extra layer for VIA
+[3] = LAYOUT(
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/readme.md b/keyboards/4pplet/waffling60/rev_d_ansi/readme.md
new file mode 100644
index 0000000000..f134a40521
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/readme.md
@@ -0,0 +1,22 @@
+# waffling60
+
+A 60% PCB for MX and alps switches, available in different configurations and layout supports.
+
+More info: https://geekhack.org/index.php?topic=103531.0
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_d_ansi:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+How to enter bootloader (DFU):
+* Press and hold the button on the keyboard (the small one on the same side as the MCU) for more than 1 second. The keyboard will then enter bootloader (DFU) mode and it's ready to flash the firmware.
+
+* Note: If holding the button a shorter time, the keyboard will just reset. If you want to exit bootloader mode without flashing a firmware, dissconnect the keyboard from your PC and reconnect it or tap the reset button.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Esc key, plug in your keyboard and wait a second before releasing the keys. Bootmagic lite is enabled by default.
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c
new file mode 100644
index 0000000000..2568bd5650
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "rev_d_ansi.h"
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h
new file mode 100644
index 0000000000..aaa60a1f33
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "quantum.h"
+
+// k<row><col>
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
+    k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42, k44, k46, k48, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
+    {k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
+    {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \
+}
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
new file mode 100644
index 0000000000..df10992a48
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From 49030e3e5bdd412f44a886be6349ebfd2c05bbf2 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Wed, 5 Oct 2022 19:42:05 +0200
Subject: [PATCH 570/959] Use get_u16_str instead of snprintf in
 autoshift_timer_report (#18606)

---
 quantum/process_keycode/process_auto_shift.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index 3ff188ba7e..644ad2cbaf 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -17,7 +17,6 @@
 #ifdef AUTO_SHIFT_ENABLE
 
 #    include <stdbool.h>
-#    include <stdio.h>
 #    include "process_auto_shift.h"
 
 #    ifndef AUTO_SHIFT_DISABLED_AT_STARTUP
@@ -331,11 +330,12 @@ void autoshift_disable(void) {
 #    ifndef AUTO_SHIFT_NO_SETUP
 void autoshift_timer_report(void) {
 #        ifdef SEND_STRING_ENABLE
-    char display[8];
-
-    snprintf(display, 8, "\n%d\n", autoshift_timeout);
-
-    send_string((const char *)display);
+    const char *autoshift_timeout_str = get_u16_str(autoshift_timeout, ' ');
+    // Skip padding spaces
+    while (*autoshift_timeout_str == ' ') {
+        autoshift_timeout_str++;
+    }
+    send_string(autoshift_timeout_str);
 #        endif
 }
 #    endif

From fe6f707a856044c754911b6b742f5518b3caaa22 Mon Sep 17 00:00:00 2001
From: adophoxia <100170946+adophoxia@users.noreply.github.com>
Date: Wed, 5 Oct 2022 10:42:21 -0700
Subject: [PATCH 571/959] [Keyboard] Add encoder map support for GMMK Pro
 (#18600)

---
 .../pro/rev1/ansi/keymaps/default/keymap.c     | 16 ++++++----------
 .../pro/rev1/ansi/keymaps/default/rules.mk     |  1 +
 .../gmmk/pro/rev1/ansi/keymaps/via/keymap.c    | 18 ++++++++----------
 .../gmmk/pro/rev1/ansi/keymaps/via/rules.mk    |  1 +
 .../gmmk/pro/rev1/iso/keymaps/default/keymap.c | 14 +++++---------
 .../gmmk/pro/rev1/iso/keymaps/default/rules.mk |  1 +
 .../gmmk/pro/rev1/iso/keymaps/via/keymap.c     | 18 ++++++++----------
 .../gmmk/pro/rev1/iso/keymaps/via/rules.mk     |  1 +
 .../pro/rev2/ansi/keymaps/default/keymap.c     | 16 ++++++----------
 .../pro/rev2/ansi/keymaps/default/rules.mk     |  1 +
 .../gmmk/pro/rev2/iso/keymaps/default/keymap.c | 14 +++++---------
 .../gmmk/pro/rev2/iso/keymaps/default/rules.mk |  1 +
 12 files changed, 44 insertions(+), 58 deletions(-)
 create mode 100644 keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk
 create mode 100644 keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk
 create mode 100644 keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk
 create mode 100644 keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk

diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
index 91f29f8d62..6557734f59 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
@@ -60,13 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // 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 // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
index 1f59b52999..71e3ecd5e6 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
@@ -77,13 +77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // 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 // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk
index 1e5b99807c..4253f570f0 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
index 0aedb78285..af0366d20d 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
@@ -60,13 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // 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;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
 #endif
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk b/keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
index 7d0693c18c..9a37242a4e 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
@@ -79,13 +79,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // 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 // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk
index 1e5b99807c..4253f570f0 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
index dc56a9ff8f..30fd283d7d 100644
--- a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
@@ -60,13 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // 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 // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
index c44e4905d0..9da9bb2490 100644
--- a/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
@@ -60,13 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // 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;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
 #endif
diff --git a/keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk b/keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file

From 248f98bdad5c10d96649ceb5acad53cba1f513ad Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Wed, 5 Oct 2022 21:19:45 +0200
Subject: [PATCH 572/959] =?UTF-8?q?width:2=20=E2=86=92=20height:2=20for=20?=
 =?UTF-8?q?spacetime=20thumb=20keys=20(#18605)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboards/spacetime/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json
index 682342cede..b34bfe8a6c 100644
--- a/keyboards/spacetime/info.json
+++ b/keyboards/spacetime/info.json
@@ -58,10 +58,10 @@
  
           {"label":"L30", "x":0, "y":3, "w":1},
           {"label":"L34", "x":4, "y":3, "w":1},
-          {"label":"L35", "x":5, "y":3, "w":2},
-          {"label":"L36", "x":6, "y":3, "w":2},
-          {"label":"R30", "x":7, "y":3, "w":2},
-          {"label":"R31", "x":8, "y":3, "w":2},
+          {"label":"L35", "x":5, "y":3, "h":2},
+          {"label":"L36", "x":6, "y":3, "h":2},
+          {"label":"R30", "x":7, "y":3, "h":2},
+          {"label":"R31", "x":8, "y":3, "h":2},
           {"label":"R32", "x":9, "y":3, "w":1},
           {"label":"R36", "x":13, "y":3, "w":1}
       ]

From f120b39fb0b0f46122cdfeed2cb61fbae34debe2 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 5 Oct 2022 21:20:09 +0100
Subject: [PATCH 573/959] Update ChibiOS hardware ID (#18613)

---
 platforms/chibios/hardware_id.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/hardware_id.c b/platforms/chibios/hardware_id.c
index 888a275465..7705bc7fd6 100644
--- a/platforms/chibios/hardware_id.c
+++ b/platforms/chibios/hardware_id.c
@@ -6,10 +6,12 @@
 
 hardware_id_t get_hardware_id(void) {
     hardware_id_t id = {0};
-#ifdef UID_BASE
+#if defined(RP2040)
+    flash_get_unique_id((uint8_t *)&id);
+#elif defined(UID_BASE)
     id.data[0] = (uint32_t)(*((uint32_t *)UID_BASE));
     id.data[1] = (uint32_t)(*((uint32_t *)(UID_BASE + 4)));
-    id.data[1] = (uint32_t)(*((uint32_t *)(UID_BASE + 8)));
+    id.data[2] = (uint32_t)(*((uint32_t *)(UID_BASE + 8)));
 #endif
     return id;
 }

From 6313258f23ae22943396dad7ae56a1904d5697ea Mon Sep 17 00:00:00 2001
From: ziptyze <mwcordier@gmail.com>
Date: Wed, 5 Oct 2022 17:52:18 -0400
Subject: [PATCH 574/959] Product changes to 1up lineup (#18382)

---
 keyboards/1upkeyboards/pi60_hse/config.h      |  72 ++++++++++
 keyboards/1upkeyboards/pi60_hse/info.json     | 124 ++++++++++++++++++
 .../pi60_hse/keymaps/default/keymap.c         |  44 +++++++
 .../pi60_hse/keymaps/via/keymap.c             | 100 ++++++++++++++
 .../pi60_hse/keymaps/via/rules.mk             |   2 +
 keyboards/1upkeyboards/pi60_hse/readme.md     |  23 ++++
 keyboards/1upkeyboards/pi60_hse/rules.mk      |   1 +
 .../1upkeyboards/sweet16/v2/promicro/config.h |  26 ----
 .../sweet16/v2/promicro/info.json             |   6 -
 .../sweet16/v2/promicro/promicro.c            |   8 --
 .../sweet16/v2/promicro/promicro.h            |  30 -----
 .../sweet16/v2/promicro/readme.md             |  13 --
 .../1upkeyboards/sweet16/v2/promicro/rules.mk |  14 --
 .../1upkeyboards/sweet16/v2/proton_c/config.h |  19 ---
 .../sweet16/v2/proton_c/info.json             |   6 -
 .../sweet16/v2/proton_c/proton_c.c            |   1 -
 .../sweet16/v2/proton_c/proton_c.h            |  30 -----
 .../sweet16/v2/proton_c/readme.md             |  13 --
 .../1upkeyboards/sweet16/v2/proton_c/rules.mk |  11 --
 .../1upkeyboards/sweet16v2/kb2040/config.h    |  84 ++++++++++++
 .../1upkeyboards/sweet16v2/kb2040/info.json   |  95 ++++++++++++++
 .../1upkeyboards/sweet16v2/kb2040/rules.mk    |   1 +
 .../sweet16v2/keymaps/default/keymap.c        |  41 ++++++
 .../sweet16v2/keymaps/default/readme.md       |   1 +
 .../sweet16v2/keymaps/via/keymap.c            | 105 +++++++++++++++
 .../sweet16v2/keymaps/via/readme.md           |   1 +
 .../sweet16v2/keymaps/via/rules.mk            |   3 +
 .../1upkeyboards/sweet16v2/pro_micro/config.h |  84 ++++++++++++
 .../sweet16v2/pro_micro/info.json             |  94 +++++++++++++
 .../1upkeyboards/sweet16v2/pro_micro/rules.mk |   0
 keyboards/1upkeyboards/sweet16v2/readme.md    |  39 ++++++
 31 files changed, 914 insertions(+), 177 deletions(-)
 create mode 100644 keyboards/1upkeyboards/pi60_hse/config.h
 create mode 100644 keyboards/1upkeyboards/pi60_hse/info.json
 create mode 100644 keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
 create mode 100644 keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c
 create mode 100644 keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk
 create mode 100644 keyboards/1upkeyboards/pi60_hse/readme.md
 create mode 100644 keyboards/1upkeyboards/pi60_hse/rules.mk
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/config.h
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/info.json
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/readme.md
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/info.json
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md
 delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk
 create mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/config.h
 create mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/info.json
 create mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
 create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
 create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md
 create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c
 create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md
 create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk
 create mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
 create mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
 create mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk
 create mode 100644 keyboards/1upkeyboards/sweet16v2/readme.md

diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
new file mode 100644
index 0000000000..9cae4cbf42
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@@ -0,0 +1,72 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 10
+#define RGB_DI_PIN GP15
+#define DRIVER_LED_TOTAL 16
+#define RGBLED_NUM 16
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
new file mode 100644
index 0000000000..012d6698a6
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -0,0 +1,124 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "pi60_hse",
+    "maintainer": "ziptyze",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5603",
+        "vid": "0x6F75"
+    },
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["GP9", "GP8", "GP6", "GP5", "GP14", "GP20", "GP13", "GP12", "GP11", "GP16", "GP17", "GP10", "GP19", "GP18"],
+        "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"]
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 2, "x": 98, "y": 51 },
+            { "flags": 2, "x": 68, "y": 51 },
+            { "flags": 2, "x": 41, "y": 51 },
+            { "flags": 2, "x": 12, "y": 51 },
+            { "flags": 2, "x": 12, "y": 13 },
+            { "flags": 2, "x": 41, "y": 13 },
+            { "flags": 2, "x": 69, "y": 13 },
+            { "flags": 2, "x": 98, "y": 13 },
+            { "flags": 2, "x": 126, "y": 13 },
+            { "flags": 2, "x": 155, "y": 13 },
+            { "flags": 2, "x": 183, "y": 13 },
+            { "flags": 2, "x": 212, "y": 13 },
+            { "flags": 2, "x": 208, "y": 51 },
+            { "flags": 2, "x": 183, "y": 51 },
+            { "flags": 2, "x": 157, "y": 51 },
+            { "flags": 2, "x": 126, "y": 51 }
+        ]
+    },
+    "community_layouts": [
+        "60_ansi_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                { "label": "Esc",    "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "1",      "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "2",      "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "3",      "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "4",      "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "5",      "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "6",      "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "7",      "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "8",      "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "9",      "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "0",      "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "-",      "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "=",      "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "BS",     "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "~",      "matrix": [1, 13], "w": 1, "x": 14, "y": 0 },
+                { "label": "Tab",    "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q",      "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W",      "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E",      "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R",      "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T",      "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y",      "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U",      "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I",      "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O",      "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P",      "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "[",      "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "]",      "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|",      "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps",   "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A",      "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S",      "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D",      "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F",      "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G",      "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H",      "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J",      "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K",      "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L",      "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ";",      "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "'",      "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter",  "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z",      "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X",      "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C",      "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V",      "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B",      "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N",      "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M",      "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
+                { "label": ",",      "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ".",      "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "/",      "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "FN",     "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "LCtrl",  "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "LGui",   "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "LAlt",   "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space",  "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "RAlt",   "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "RGui",   "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Menu",   "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "RCtrl",  "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5548adb7ba
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_60_ansi_split_bs_rshift(
+         KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
+        KC_LSFT,             KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                               KC_RALT, KC_RGUI,   MO(1), KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi_split_bs_rshift(
+         KC_GRV, KC_F1,   KC_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_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1f38a7c4c1
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c
@@ -0,0 +1,100 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_60_ansi_split_bs_rshift(
+         KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
+        KC_LSFT,             KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                               KC_RALT, KC_RGUI,   MO(1), KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi_split_bs_rshift(
+         KC_GRV, KC_F1,   KC_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_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [3] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [4] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [5] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [6] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [7] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [8] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [9] = LAYOUT_60_ansi_split_bs_rshift(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/pi60_hse/readme.md b/keyboards/1upkeyboards/pi60_hse/readme.md
new file mode 100644
index 0000000000..cc6ee8812f
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/readme.md
@@ -0,0 +1,23 @@
+# pi60_hse
+
+The pi60 HSE is the update to the original 1up Keyboards 60% HSE. This keyboard features a multi layout hot swap PCB with options for split backspace, split right shift, and 6.25u and 7u space bottom rows. The controller is a Raspberry Pi rp2040 microcontroller.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+* Hardware Availability: (https://1upkeyboards.com/shop/controllers/1upkeyboards-pi60hse-60-pcb/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/pi60_hse:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/pi60_hse:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Bootloader button**: Hold the button on the back of the PCB and plug in the keyboard
diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk
new file mode 100644
index 0000000000..997fce7e65
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER = vendor
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
deleted file mode 100644
index 8bacff2f6e..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D1, E6, B5 }
-#define MATRIX_COL_PINS { F7, F6, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Encoder pins */
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
-#define ENCODER_RESOLUTION 4
-
-/* Underglow options */
-#define RGB_DI_PIN F4
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json
deleted file mode 100644
index bed6579e82..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "usb": {
-        "pid": "0x0162",
-        "device_version": "0.0.1"
-    }
-}
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
deleted file mode 100644
index d850a3b5c6..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "promicro.h"
-#include "encoder.h"
-
-#ifdef ENCODER_ENABLED
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    return encoder_update_user(index, clockwise);
-}
-#endif
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h
deleted file mode 100644
index 7320ccd9e0..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-       K31,   K32      \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { KC_NO, K31,   K32,   KC_NO }  \
-}
-
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md b/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md
deleted file mode 100644
index 584b446511..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Sweet16 V2 (Pro Micro)
-
-A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard
-
-* Keyboard Maintainer: skullydazed
-* Hardware Supported: Sweet16 V2 PCB, Pro Micro
-* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make 1upkeyboards/sweet16/v2/promicro: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/1upkeyboards/sweet16/v2/promicro/rules.mk b/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk
deleted file mode 100644
index a8249511bc..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-## Features
-CONSOLE_ENABLE = yes
-
-## On a Pro Micro you have to choose between underglow and the rotary encoder.
-RGBLIGHT_ENABLE = no
-ENCODER_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
deleted file mode 100644
index e1d66894b3..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B7, B2, B0 }
-#define MATRIX_COL_PINS { B8, A0, A10, A9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Encoder pins */
-#define ENCODERS_PAD_A { A2 }
-#define ENCODERS_PAD_B { A1 }
-#define ENCODER_RESOLUTION 4
-
-#define AUDIO_PIN A5
-#define AUDIO_PIN_ALT A4
-#define AUDIO_PIN_ALT_AS_NEGATIVE
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json
deleted file mode 100644
index bed6579e82..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "usb": {
-        "pid": "0x0162",
-        "device_version": "0.0.1"
-    }
-}
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c
deleted file mode 100644
index b08e33e81b..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "proton_c.h"
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h
deleted file mode 100644
index 7320ccd9e0..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-       K31,   K32      \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { KC_NO, K31,   K32,   KC_NO }  \
-}
-
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md b/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md
deleted file mode 100644
index 6806cc5739..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Sweet16 V2 (Proton C)
-
-A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard
-
-* Keyboard Maintainer: skullydazed
-* Hardware Supported: Sweet16 V2 PCB, Proton C
-* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make 1upkeyboards/sweet16/v2/proton_c:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk b/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk
deleted file mode 100644
index fcfa05c3a1..0000000000
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-## Features
-CONSOLE_ENABLE = yes
-ENCODER_ENABLE = yes
-AUDIO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
new file mode 100644
index 0000000000..e22c63b988
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@@ -0,0 +1,84 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 10
+#define RGB_DI_PIN GP6
+#define DRIVER_LED_TOTAL 20
+#define RGBLED_NUM 20
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
new file mode 100644
index 0000000000..91fa580354
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
@@ -0,0 +1,95 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "sweet16v2",
+    "url": "1upkeyboards.com/shop/keyboard-kits/macro-pads/sweet-16-v2-macropad-kit/",
+    "maintainer": "ziptyze",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5518",
+        "vid": "0x6F75"
+    },
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["GP2",  "GP9", "GP8",  "GP7"],
+        "rows": ["GP26", "GP1", "GP18", "GP5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {
+                "pin_a": "GP27",
+                "pin_b": "GP28"
+            },
+            {
+                "pin_a": "GP4",
+                "pin_b": "GP3"
+            }
+        ]
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 },
+            { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 },
+            { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 },
+            { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 },
+            { "flags": 2, "x": 196, "y": 17 },
+            { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 },
+            { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 },
+            { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 },
+            { "flags": 2, "x": 28, "y": 17 },
+            { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 },
+            { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 },
+            { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 },
+            { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 },
+            { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 },
+            { "flags": 2, "x": 196, "y": 47 },
+            { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 },
+            { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 },
+            { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 },
+            { "flags": 2, "x": 28, "y": 47 },
+            { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 }
+        ]
+    },
+    "community_layouts": [
+        "ortho_4x4"
+    ],
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
new file mode 100644
index 0000000000..997fce7e65
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER = vendor
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1994a5bde1
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x4(
+    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
+    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
+  ),
+
+  [1] = LAYOUT_ortho_4x4(
+    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
+    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
+    RGB_SPD,   RGB_SPI,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    QK_BOOT
+  )
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),      ENCODER_CCW_CW(RGB_VAD, RGB_VAI)  },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..fcf8c87234
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Sweet 16 V2
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8bb0368d09
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c
@@ -0,0 +1,105 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x4(
+    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
+    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
+  ),
+
+  [1] = LAYOUT_ortho_4x4(
+    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
+    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
+    RGB_SPD,   RGB_SPI,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    QK_BOOT
+  ),
+
+  [2] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [3] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [4] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [5] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [6] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [7] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [8] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+
+  [9] = LAYOUT_ortho_4x4( 
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS
+  ),
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),      ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [3] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [4] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [5] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [6] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [7] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [8] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+    [9] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md
new file mode 100644
index 0000000000..b0fba0bdd9
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for via on the Sweet 16 V2
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk b/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1189f4ad19
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
new file mode 100644
index 0000000000..0e2ec9cca7
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
@@ -0,0 +1,84 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 10
+
+#define RGB_DI_PIN D7
+#define DRIVER_LED_TOTAL 20
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
new file mode 100644
index 0000000000..efdb94cd74
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
@@ -0,0 +1,94 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "sweet16v2",
+    "url": "1upkeyboards.com/shop/keyboard-kits/macro-pads/sweet-16-v2-macropad-kit/",
+    "maintainer": "ziptyze",
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5518",
+        "vid": "0x6F75"
+    },
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["F7", "D2", "B1", "C6"],
+        "rows": ["D1", "B5", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {
+                "pin_a": "F6",
+                "pin_b": "F5"
+            },
+            {
+                "pin_a": "D4",
+                "pin_b": "D0"
+            }
+        ]
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 },
+            { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 },
+            { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 },
+            { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 },
+            { "flags": 2, "x": 196, "y": 17 },
+            { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 },
+            { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 },
+            { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 },
+            { "flags": 2, "x": 28, "y": 17 },
+            { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 },
+            { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 },
+            { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 },
+            { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 },
+            { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 },
+            { "flags": 2, "x": 196, "y": 47 },
+            { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 },
+            { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 },
+            { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 },
+            { "flags": 2, "x": 28, "y": 47 },
+            { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 }
+        ]
+    },
+    "community_layouts": [
+        "ortho_4x4"
+    ],
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk b/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/1upkeyboards/sweet16v2/readme.md b/keyboards/1upkeyboards/sweet16v2/readme.md
new file mode 100644
index 0000000000..e3f5859f96
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/readme.md
@@ -0,0 +1,39 @@
+# sweet16v2
+
+A 4x4 macropad with RGB inswitch lighting and underglow. 
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+* Hardware Supported: 1upkeyboards Sweet 16 v2
+* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/)
+
+Make example for this keyboard using an atmel-based controller (after setting up your build environment):
+
+    make 1upkeyboards/sweet16v2/promicro:default
+
+Flashing example for this keyboard using an atmel-based controller:
+
+    make 1upkeyboards/sweet16v2/promicro:default:flash
+
+Make example for this keyboard using an rp2040-based controller (after setting up your build environment):
+
+    make 1upkeyboards/sweet16v2/kb2040:default
+
+Flashing example for this keyboard using an rp2040-based controller:
+
+    make 1upkeyboards/sweet16v2/kb2040:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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 for atmel-based controllers:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+
+Enter the bootloader in 2 ways for rp2040-based controllers:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Bootsel button**: Hold the bootsel button on controller and plug in the keyboard
\ No newline at end of file

From 2f559c03136764ac29c0586896c3f06e82bcc683 Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Thu, 6 Oct 2022 01:37:22 +0300
Subject: [PATCH 575/959] [Keyboard] adafruit/macropad: Fix typo (#18616)

---
 keyboards/adafruit/macropad/config.h  | 2 +-
 keyboards/adafruit/macropad/readme.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index cc4cbc940c..e9f9c65b9c 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -61,7 +61,7 @@
 #define DEBOUNCE 5
 
 /* Bootmagic lite */
-/* (Press the key bellow the encoder button while plugging the keyboard to enter the bootloader and clear flash) */
+/* (Press the key below the encoder button while plugging the keyboard to enter the bootloader and clear flash) */
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 2
 
diff --git a/keyboards/adafruit/macropad/readme.md b/keyboards/adafruit/macropad/readme.md
index 09c8657902..019883f953 100644
--- a/keyboards/adafruit/macropad/readme.md
+++ b/keyboards/adafruit/macropad/readme.md
@@ -32,7 +32,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 Enter the bootloader in 4 ways:
 
-* **Bootmagic reset**: Hold down the key just bellow the rotary encoder push-button on power-up.
+* **Bootmagic reset**: Hold down the key just below the rotary encoder push-button on power-up.
 * **Physical reset button**: Press twice the button on the side while the board is connected.
 * **BOOT button** Hold down the rotary encoder push-button on power-up or reset.
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.

From 316edfd297b8a40ce66833c3a373c32155b83bcf Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Wed, 5 Oct 2022 18:00:08 -0500
Subject: [PATCH 576/959] Enable mouse keys for momokai tap_trio (#18614)

---
 keyboards/momokai/tap_trio/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/momokai/tap_trio/rules.mk b/keyboards/momokai/tap_trio/rules.mk
index 07e6f2d07f..59e0e1381f 100644
--- a/keyboards/momokai/tap_trio/rules.mk
+++ b/keyboards/momokai/tap_trio/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
+MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration

From ab4cf9a7c128c9e871c440cc64536f578165b31f Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Thu, 6 Oct 2022 00:36:06 +0100
Subject: [PATCH 577/959] Fix compilation of 1upkeyboards on develop (#18618)

---
 keyboards/1upkeyboards/pi60_hse/config.h      | 89 +++++++++----------
 .../1upkeyboards/sweet16v2/kb2040/config.h    | 88 +++++++++---------
 .../1upkeyboards/sweet16v2/pro_micro/config.h | 88 +++++++++---------
 3 files changed, 132 insertions(+), 133 deletions(-)

diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
index 9cae4cbf42..0a6d6274a8 100644
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@@ -7,7 +7,7 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 #define RGB_DI_PIN GP15
-#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT 16
 #define RGBLED_NUM 16
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
@@ -15,52 +15,51 @@
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
 // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
index e22c63b988..3b0a332c42 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@@ -20,7 +20,7 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 #define RGB_DI_PIN GP6
-#define DRIVER_LED_TOTAL 20
+#define RGB_MATRIX_LED_COUNT 20
 #define RGBLED_NUM 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -28,51 +28,51 @@
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
 // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
index 0e2ec9cca7..2e7f7b36ff 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
@@ -21,58 +21,58 @@
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 
 #define RGB_DI_PIN D7
-#define DRIVER_LED_TOTAL 20
+#define RGB_MATRIX_LED_COUNT 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
 // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE

From c59df9a54cb7ea680cbae9a57f3a665802c9c739 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 6 Oct 2022 00:36:48 +0100
Subject: [PATCH 578/959] Fix some rp2040 hardware ID errors (#18617)

---
 platforms/chibios/hardware_id.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platforms/chibios/hardware_id.c b/platforms/chibios/hardware_id.c
index 7705bc7fd6..1097db5966 100644
--- a/platforms/chibios/hardware_id.c
+++ b/platforms/chibios/hardware_id.c
@@ -7,6 +7,9 @@
 hardware_id_t get_hardware_id(void) {
     hardware_id_t id = {0};
 #if defined(RP2040)
+    // Forward declare as including "hardware/flash.h" here causes more issues...
+    void flash_get_unique_id(uint8_t *);
+
     flash_get_unique_id((uint8_t *)&id);
 #elif defined(UID_BASE)
     id.data[0] = (uint32_t)(*((uint32_t *)UID_BASE));

From b820c6db2dd9e6547f4652637bb431937bb850c9 Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Thu, 6 Oct 2022 03:01:09 +0200
Subject: [PATCH 579/959] [Keyboard] Add waffling80 Rev B (#18603)

Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
---
 keyboards/4pplet/waffling80/rev_b/config.h  | 47 +++++++++++++++++++
 keyboards/4pplet/waffling80/rev_b/info.json | 16 +++++++
 keyboards/4pplet/waffling80/rev_b/readme.md | 18 ++++++++
 keyboards/4pplet/waffling80/rev_b/rev_b.c   | 47 +++++++++++++++++++
 keyboards/4pplet/waffling80/rev_b/rev_b.h   | 50 +++++++++++++++++++++
 keyboards/4pplet/waffling80/rev_b/rules.mk  | 24 ++++++++++
 6 files changed, 202 insertions(+)
 create mode 100644 keyboards/4pplet/waffling80/rev_b/config.h
 create mode 100644 keyboards/4pplet/waffling80/rev_b/info.json
 create mode 100644 keyboards/4pplet/waffling80/rev_b/readme.md
 create mode 100644 keyboards/4pplet/waffling80/rev_b/rev_b.c
 create mode 100644 keyboards/4pplet/waffling80/rev_b/rev_b.h
 create mode 100644 keyboards/4pplet/waffling80/rev_b/rules.mk

diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h
new file mode 100644
index 0000000000..843c9918e2
--- /dev/null
+++ b/keyboards/4pplet/waffling80/rev_b/config.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 8
+
+// ROWS: Top to bottom, COLS: Left to right
+#define MATRIX_ROW_PINS {B13,B12,A5,A4,A2,A1,F0,C15,C13,C14,F1,A0}
+#define MATRIX_COL_PINS {B2,B1,B0,A7,A6,A3,B9,B8}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT B2 // usually COL
+#define QMK_ESC_INPUT B13 // usually ROW
+
+#define RGBLED_NUM 2
+#define WS2812_EXTERNAL_PULLUP
+#define RGB_DI_PIN A8
+
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json
new file mode 100644
index 0000000000..88a5cdf0a9
--- /dev/null
+++ b/keyboards/4pplet/waffling80/rev_b/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "waffling80 Rev B",
+    "manufacturer": "4pplet",
+    "url": "",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000F",
+        "device_version": "0.0.2"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"~", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"x":15.25, "y":3.5}, {"x":17.25, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.25}, {"x":6, "y":5.5, "w":1.25}, {"x":7.25, "y":5.5, "w":2.75}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Win", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling80/rev_b/readme.md b/keyboards/4pplet/waffling80/rev_b/readme.md
new file mode 100644
index 0000000000..ddfece5b53
--- /dev/null
+++ b/keyboards/4pplet/waffling80/rev_b/readme.md
@@ -0,0 +1,18 @@
+# waffling80
+
+A TKL PCB attempting a87 and a88 compatibility with different switch and layout-options. 
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling80](https://github.com/4pplet/waffling80)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling80/rev_b:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+How to enter bootloader (DFU):
+* Hold the reset-header for a few seconds on the back of the PCB for keyboard to enter DFU. When in DFU, it's ready to flash the firmware.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Esc key, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.
diff --git a/keyboards/4pplet/waffling80/rev_b/rev_b.c b/keyboards/4pplet/waffling80/rev_b/rev_b.c
new file mode 100644
index 0000000000..15e44b93a1
--- /dev/null
+++ b/keyboards/4pplet/waffling80/rev_b/rev_b.c
@@ -0,0 +1,47 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "rev_b.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (SCROLL_LOCK_ENABLE && res) {
+        if(led_state.scroll_lock) {
+            #ifdef SCROLL_LOCK_COLOR
+                rgblight_sethsv_at(SCROLL_LOCK_COLOR, 0);
+            #else
+                rgblight_sethsv_at(rgblight_get_hue(),rgblight_get_sat(),rgblight_get_val(), 0);
+            #endif
+        }
+        else {
+            rgblight_sethsv_at(HSV_OFF, 0);
+        }
+    }
+    if (CAPS_LOCK_ENABLE && res) {
+        if(led_state.caps_lock) {
+            #ifdef CAPS_LOCK_COLOR
+                rgblight_sethsv_at(CAPS_LOCK_COLOR, 1);
+            #else
+                rgblight_sethsv_at(rgblight_get_hue(),rgblight_get_sat(),rgblight_get_val(), 1);
+            #endif
+        }
+        else{
+            rgblight_sethsv_at(HSV_OFF, 1);
+        }
+    }
+    return res;
+}
+
diff --git a/keyboards/4pplet/waffling80/rev_b/rev_b.h b/keyboards/4pplet/waffling80/rev_b/rev_b.h
new file mode 100644
index 0000000000..42a550f192
--- /dev/null
+++ b/keyboards/4pplet/waffling80/rev_b/rev_b.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#define CAPS_LOCK_ENABLE 1
+#define SCROLL_LOCK_ENABLE 1
+
+// If colors are defined, they will be static. If not defined, color for incicators can be set in VIA.
+//#define CAPS_LOCK_COLOR HSV_GREEN
+//#define SCROLL_LOCK_COLOR HSV_GREEN
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k37, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k67, k27, k57, k97, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k77, kb7, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,  \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, \
+    ka0, kb1, ka1, kb2, ka3, kb3, ka4, kb4, ka5, kb5, ka6, kb6, ka7, \
+    kb0, ka2 \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37}, \
+    {k40, k41, k42, k43, k44, k45, k46, k47}, \
+    {k50, k51, k52, k53, k54, k55, k56, k57}, \
+    {k60, k61, k62, k63, k64, k65, k66, k67}, \
+    {k70, k71, k72, k73, k74, k75, k76, k77}, \
+    {k80, k81, k82, k83, k84, k85, k86, k87}, \
+    {k90, k91, k92, k93, k94, k95, k96, k97}, \
+    {ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7}, \
+    {kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7} \
+}
diff --git a/keyboards/4pplet/waffling80/rev_b/rules.mk b/keyboards/4pplet/waffling80/rev_b/rules.mk
new file mode 100644
index 0000000000..8dc60fa527
--- /dev/null
+++ b/keyboards/4pplet/waffling80/rev_b/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From c255174cf3e55483f14351a69689e24e849445a0 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Thu, 6 Oct 2022 10:52:42 +0100
Subject: [PATCH 580/959] Implement split comms watchdog (#18599)

---
 data/mappings/info_config.json               |  2 +
 data/schemas/keyboard.jsonschema             |  4 +-
 docs/config_options.md                       |  7 ++++
 docs/feature_split_keyboard.md               | 11 +++++
 quantum/keyboard.c                           |  4 ++
 quantum/split_common/split_util.c            | 43 ++++++++++++++++++++
 quantum/split_common/split_util.h            |  4 ++
 quantum/split_common/transaction_id_define.h |  4 ++
 quantum/split_common/transactions.c          | 33 +++++++++++++++
 quantum/split_common/transport.h             |  4 ++
 10 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 2b8e3cbf90..28567c0d01 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -100,6 +100,8 @@
     "SPLIT_USB_DETECT": {"info_key": "split.usb_detect.enabled", "value_type": "bool"},
     "SPLIT_USB_TIMEOUT": {"info_key": "split.usb_detect.timeout", "value_type": "int"},
     "SPLIT_USB_TIMEOUT_POLL": {"info_key": "split.usb_detect.polling_interval", "value_type": "int"},
+    "SPLIT_WATCHDOG_ENABLE": {"info_key": "split.transport.watchdog", "value_type": "bool"},
+    "SPLIT_WATCHDOG_TIMEOUT": {"info_key": "split.transport.watchdog_timeout", "value_type": "int"},
     "SOFT_SERIAL_PIN": {"info_key": "split.soft_serial_pin"},
     "SOFT_SERIAL_SPEED": {"info_key": "split.soft_serial_speed"},
     "TAP_CODE_DELAY": {"info_key": "qmk.tap_keycode_delay", "value_type": "int"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index b75465b667..de23005c1e 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -508,7 +508,9 @@
                             "enum": ["custom", "i2c", "serial", "serial_usart"]
                         },
                         "sync_matrix_state": {"type": "boolean"},
-                        "sync_modifiers": {"type": "boolean"}
+                        "sync_modifiers": {"type": "boolean"},
+                        "watchdog": {"type": "boolean"},
+                        "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
                     }
                 },
                 "usb_detect": {
diff --git a/docs/config_options.md b/docs/config_options.md
index 3e322e590a..a6ceb199de 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -325,6 +325,13 @@ There are a few different ways to set handedness for split keyboards (listed in
 
 * `#define SPLIT_USB_TIMEOUT_POLL 10`
   * Poll frequency when detecting master/slave when using `SPLIT_USB_DETECT`
+  
+* `#define SPLIT_WATCHDOG_ENABLE`
+  * Reboot slave if no communication from master within timeout.
+  * Helps resolve issue where both sides detect as slave using `SPLIT_USB_DETECT`
+
+* `#define SPLIT_WATCHDOG_TIMEOUT 3000`
+  * Maximum slave timeout when waiting for communication from master when using `SPLIT_WATCHDOG_ENABLE`
 
 * `#define FORCED_SYNC_THROTTLE_MS 100`
   * Deadline for synchronizing data from master to slave when using the QMK-provided split transport.
diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index e53b3525cb..7d194284d6 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -422,6 +422,17 @@ This sets the maximum timeout when detecting master/slave when using `SPLIT_USB_
 ```
 This sets the poll frequency when detecting master/slave when using `SPLIT_USB_DETECT`
 
+```c
+#define SPLIT_WATCHDOG_ENABLE
+```
+
+This will enable a software watchdog on any side delegated as slave and will reboot the keyboard if no successful communication occurs within `SPLIT_WATCHDOG_TIMEOUT`. This can be particularly helpful when `SPLIT_USB_DETECT` delegates both sides as slave in some circumstances.
+
+```c
+#define SPLIT_WATCHDOG_TIMEOUT 3000
+```
+This set the maximum slave timeout when waiting for communication from master when using `SPLIT_WATCHDOG_ENABLE`
+
 ## Hardware Considerations and Mods
 
 Master/slave delegation is made either by detecting voltage on VBUS connection or waiting for USB communication (`SPLIT_USB_DETECT`). Pro Micro boards can use VBUS detection out of the box and be used with or without `SPLIT_USB_DETECT`.
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 626e0a7ee1..280532a5fd 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -586,6 +586,10 @@ void keyboard_task(void) {
 
     quantum_task();
 
+#if defined(SPLIT_WATCHDOG_ENABLE)
+    split_watchdog_task();
+#endif
+
 #if defined(RGBLIGHT_ENABLE)
     rgblight_task();
 #endif
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 0b3338ed6f..9f57c7b9fc 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -74,6 +74,46 @@ static inline bool usbIsActive(void) {
 }
 #endif
 
+#if defined(SPLIT_WATCHDOG_ENABLE)
+#    if !defined(SPLIT_WATCHDOG_TIMEOUT)
+#        if defined(SPLIT_USB_TIMEOUT)
+#            define SPLIT_WATCHDOG_TIMEOUT (SPLIT_USB_TIMEOUT + 100)
+#        else
+#            define SPLIT_WATCHDOG_TIMEOUT 3000
+#        endif
+#    endif
+#    if defined(SPLIT_USB_DETECT)
+_Static_assert(SPLIT_USB_TIMEOUT < SPLIT_WATCHDOG_TIMEOUT, "SPLIT_WATCHDOG_TIMEOUT should not be below SPLIT_USB_TIMEOUT.");
+#    endif
+_Static_assert(SPLIT_MAX_CONNECTION_ERRORS > 0, "SPLIT_WATCHDOG_ENABLE requires SPLIT_MAX_CONNECTION_ERRORS be above 0 for a functioning disconnection check.");
+
+static uint32_t split_watchdog_started = 0;
+static bool     split_watchdog_done    = false;
+
+void split_watchdog_init(void) {
+    split_watchdog_started = timer_read32();
+}
+
+void split_watchdog_update(bool done) {
+    split_watchdog_done = done;
+}
+
+bool split_watchdog_check(void) {
+    if (!is_transport_connected()) {
+        split_watchdog_done = false;
+    }
+    return split_watchdog_done;
+}
+
+void split_watchdog_task(void) {
+    if (!split_watchdog_done && !is_keyboard_master()) {
+        if (timer_elapsed32(split_watchdog_started) > SPLIT_WATCHDOG_TIMEOUT) {
+            mcu_reset();
+        }
+    }
+}
+#endif // defined(SPLIT_WATCHDOG_ENABLE)
+
 #ifdef SPLIT_HAND_MATRIX_GRID
 void matrix_io_delay(void);
 
@@ -179,6 +219,9 @@ void split_pre_init(void) {
 void split_post_init(void) {
     if (!is_keyboard_master()) {
         transport_slave_init();
+#if defined(SPLIT_WATCHDOG_ENABLE)
+        split_watchdog_init();
+#endif
     }
 }
 
diff --git a/quantum/split_common/split_util.h b/quantum/split_common/split_util.h
index c7eabea233..5c9a260a14 100644
--- a/quantum/split_common/split_util.h
+++ b/quantum/split_common/split_util.h
@@ -14,3 +14,7 @@ void split_post_init(void);
 
 bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]);
 bool is_transport_connected(void);
+
+void split_watchdog_update(bool done);
+void split_watchdog_task(void);
+bool split_watchdog_check(void);
\ No newline at end of file
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index 761a8884f4..8c19948107 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -84,6 +84,10 @@ enum serial_transaction_id {
     PUT_POINTING_CPI,
 #endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
+#if defined(SPLIT_WATCHDOG_ENABLE)
+    PUT_WATCHDOG,
+#endif // defined(SPLIT_WATCHDOG_ENABLE)
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     PUT_RPC_INFO,
     PUT_RPC_REQ_DATA,
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 67986e4340..527b2f4caf 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -718,6 +718,36 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
 
 #endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
+////////////////////////////////////////////////////
+// WATCHDOG
+
+#if defined(SPLIT_WATCHDOG_ENABLE)
+
+static bool watchdog_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    bool okay = true;
+    if (!split_watchdog_check()) {
+        okay = transport_write(PUT_WATCHDOG, &okay, sizeof(okay));
+        split_watchdog_update(okay);
+    }
+    return okay;
+}
+
+static void watchdog_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    split_watchdog_update(split_shmem->watchdog_pinged);
+}
+
+#    define TRANSACTIONS_WATCHDOG_MASTER() TRANSACTION_HANDLER_MASTER(watchdog)
+#    define TRANSACTIONS_WATCHDOG_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(watchdog)
+#    define TRANSACTIONS_WATCHDOG_REGISTRATIONS [PUT_WATCHDOG] = trans_initiator2target_initializer(watchdog_pinged),
+
+#else // defined(SPLIT_WATCHDOG_ENABLE)
+
+#    define TRANSACTIONS_WATCHDOG_MASTER()
+#    define TRANSACTIONS_WATCHDOG_SLAVE()
+#    define TRANSACTIONS_WATCHDOG_REGISTRATIONS
+
+#endif // defined(SPLIT_WATCHDOG_ENABLE)
+
 ////////////////////////////////////////////////////
 
 split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
@@ -744,6 +774,7 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
     TRANSACTIONS_OLED_REGISTRATIONS
     TRANSACTIONS_ST7565_REGISTRATIONS
     TRANSACTIONS_POINTING_REGISTRATIONS
+    TRANSACTIONS_WATCHDOG_REGISTRATIONS
 // clang-format on
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
@@ -770,6 +801,7 @@ bool transactions_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix
     TRANSACTIONS_OLED_MASTER();
     TRANSACTIONS_ST7565_MASTER();
     TRANSACTIONS_POINTING_MASTER();
+    TRANSACTIONS_WATCHDOG_MASTER();
     return true;
 }
 
@@ -789,6 +821,7 @@ void transactions_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[
     TRANSACTIONS_OLED_SLAVE();
     TRANSACTIONS_ST7565_SLAVE();
     TRANSACTIONS_POINTING_SLAVE();
+    TRANSACTIONS_WATCHDOG_SLAVE();
 }
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 06778ad14a..833633edc2 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -188,6 +188,10 @@ typedef struct _split_shared_memory_t {
     split_slave_pointing_sync_t pointing;
 #endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
+#if defined(SPLIT_WATCHDOG_ENABLE)
+    bool watchdog_pinged;
+#endif // defined(SPLIT_WATCHDOG_ENABLE)
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     rpc_sync_info_t rpc_info;
     uint8_t         rpc_m2s_buffer[RPC_M2S_BUFFER_SIZE];

From cbe1c22d468d64d7a3274061ce9c2073ecb208a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Thu, 6 Oct 2022 12:24:41 +0200
Subject: [PATCH 581/959] quantum: led: split out led_update_ports() for
 customization of led behaviour (#14452)

---
 docs/feature_led_indicators.md |  7 +++++
 quantum/led.c                  | 48 ++++++++++++++++++----------------
 quantum/led.h                  |  1 +
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/docs/feature_led_indicators.md b/docs/feature_led_indicators.md
index a2a2e17c6f..d89562a377 100644
--- a/docs/feature_led_indicators.md
+++ b/docs/feature_led_indicators.md
@@ -101,6 +101,13 @@ The `host_keyboard_led_state()` function will report the LED state returned from
 bool caps = host_keyboard_led_state().caps_lock;
 ```
 
+## `led_update_ports()`
+
+This function writes the LED state to the actual hardware. Call it manually
+from your `led_update_*()` callbacks to modify the handling of the standard
+keyboard LEDs.
+For example when repurposing a standard LED indicator as layer indicator.
+
 ## Setting Physical LED State
 
 Some keyboard implementations provide convenient methods for setting the state of the physical LEDs.
diff --git a/quantum/led.c b/quantum/led.c
index 444d38f751..7db38bb88c 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -92,32 +92,36 @@ __attribute__((weak)) bool led_update_user(led_t led_state) {
 __attribute__((weak)) bool led_update_kb(led_t led_state) {
     bool res = led_update_user(led_state);
     if (res) {
-#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
+        led_update_ports(led_state);
     }
     return res;
 }
 
+/** \brief Write LED state to hardware
+ */
+__attribute__((weak)) void led_update_ports(led_t led_state) {
+#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
+}
+
 /** \brief Initialise any LED related hardware and/or state
  */
 __attribute__((weak)) void led_init_ports(void) {
diff --git a/quantum/led.h b/quantum/led.h
index b8262cbd8e..d12e519ea2 100644
--- a/quantum/led.h
+++ b/quantum/led.h
@@ -60,6 +60,7 @@ void led_set_user(uint8_t usb_led);
 void led_set_kb(uint8_t usb_led);
 bool led_update_user(led_t led_state);
 bool led_update_kb(led_t led_state);
+void led_update_ports(led_t led_state);
 
 uint32_t last_led_activity_time(void);    // Timestamp of the LED activity
 uint32_t last_led_activity_elapsed(void); // Number of milliseconds since the last LED activity

From 6dbbeea46a0ac7527235982cb6406802df846805 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 7 Oct 2022 13:35:01 +1100
Subject: [PATCH 582/959] Refactor `send_extra` (#18615)

---
 keyboards/annepro2/annepro2_ble.c             |  8 ++--
 keyboards/bioi/ble.c                          | 13 ++----
 keyboards/hhkb/rn42/rn42.c                    | 12 +++---
 tests/test_common/test_driver.cpp             |  4 +-
 tests/test_common/test_driver.hpp             |  4 +-
 tmk_core/protocol/arm_atsam/main_arm_atsam.c  |  9 ++---
 .../protocol/arm_atsam/usb/udi_device_conf.h  | 14 +------
 tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c | 29 +++-----------
 tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h |  1 -
 tmk_core/protocol/chibios/chibios.c           |  2 +-
 tmk_core/protocol/chibios/usb_main.c          |  7 +---
 tmk_core/protocol/host.c                      | 40 ++++++++++++-------
 tmk_core/protocol/host.h                      |  8 ++--
 tmk_core/protocol/host_driver.h               |  2 +-
 tmk_core/protocol/lufa/lufa.c                 |  8 ++--
 tmk_core/protocol/vusb/vusb.c                 | 14 ++-----
 16 files changed, 68 insertions(+), 107 deletions(-)

diff --git a/keyboards/annepro2/annepro2_ble.c b/keyboards/annepro2/annepro2_ble.c
index c75de6720c..64364a6c8e 100644
--- a/keyboards/annepro2/annepro2_ble.c
+++ b/keyboards/annepro2/annepro2_ble.c
@@ -24,7 +24,7 @@
 /* -------------------- Static Function Prototypes -------------------------- */
 static uint8_t ap2_ble_leds(void);
 static void    ap2_ble_mouse(report_mouse_t *report);
-static void    ap2_ble_extra(uint8_t report_id, uint16_t data);
+static void    ap2_ble_extra(report_extra_t *report);
 static void    ap2_ble_keyboard(report_keyboard_t *report);
 
 static void ap2_ble_swtich_ble_driver(void);
@@ -149,11 +149,11 @@ static inline uint16_t CONSUMER2AP2(uint16_t usage) {
     }
 }
 
-static void ap2_ble_extra(uint8_t report_id, uint16_t data) {
-    if (report_id == REPORT_ID_CONSUMER) {
+static void ap2_ble_extra(report_extra_t *report) {
+    if (report->report_id == REPORT_ID_CONSUMER) {
         sdPut(&SD1, 0x0);
         sdWrite(&SD1, ble_mcu_send_consumer_report, sizeof(ble_mcu_send_consumer_report));
-        sdPut(&SD1, CONSUMER2AP2(data));
+        sdPut(&SD1, CONSUMER2AP2(report->usage));
         static const uint8_t dummy[3] = {0};
         sdWrite(&SD1, dummy, sizeof(dummy));
     }
diff --git a/keyboards/bioi/ble.c b/keyboards/bioi/ble.c
index b050b2f6cb..7118cef8c6 100644
--- a/keyboards/bioi/ble.c
+++ b/keyboards/bioi/ble.c
@@ -96,7 +96,7 @@ static void bluefruit_serial_send(uint8_t data)
 static uint8_t keyboard_leds(void);
 static void send_keyboard(report_keyboard_t *report);
 static void send_mouse(report_mouse_t *report);
-static void send_extra(uint8_t report_id, uint16_t data);
+static void send_extra(report_extra_t *report);
 
 host_driver_t bluefruit_driver = {
     keyboard_leds,
@@ -177,15 +177,10 @@ static void send_mouse(report_mouse_t *report)
 #define CONSUMER2BLUEFRUIT(usage) \
     (usage == AUDIO_MUTE ? 0x00e2 : (usage == AUDIO_VOL_UP ? 0x00e9 : (usage == AUDIO_VOL_DOWN ? 0x00ea : (usage == TRANSPORT_NEXT_TRACK ? 0x00b5 : (usage == TRANSPORT_PREV_TRACK ? 0x00b6 : (usage == TRANSPORT_STOP ? 0x00b7 : (usage == TRANSPORT_STOP_EJECT ? 0x00b8 : (usage == TRANSPORT_PLAY_PAUSE ? 0x00b1 : (usage == AL_CC_CONFIG ? 0x0183 : (usage == AL_EMAIL ? 0x018c : (usage == AL_CALCULATOR ? 0x0192 : (usage == AL_LOCAL_BROWSER ? 0x0196 : (usage == AC_SEARCH ? 0x021f : (usage == AC_HOME ? 0x0223 : (usage == AC_BACK ? 0x0224 : (usage == AC_FORWARD ? 0x0225 : (usage == AC_STOP ? 0x0226 : (usage == AC_REFRESH ? 0x0227 : (usage == AC_BOOKMARKS ? 0x022a : 0)))))))))))))))))))
 
-static void send_extra(uint8_t report_id, uint16_t data)
+static void send_extra(report_extra_t *report)
 {
-    if (report_id == REPORT_ID_CONSUMER) {
-        static uint16_t last_data = 0;
-        if (data == last_data)
-            return;
-        last_data = data;
-
-        uint16_t bitmap = CONSUMER2BLUEFRUIT(data);
+    if (report->report_id == REPORT_ID_CONSUMER) {
+        uint16_t bitmap = CONSUMER2BLUEFRUIT(report->usage);
 
 #ifdef BLUEFRUIT_TRACE_SERIAL
         dprintf("\nData: ");
diff --git a/keyboards/hhkb/rn42/rn42.c b/keyboards/hhkb/rn42/rn42.c
index b35b319352..1cd24af5e9 100644
--- a/keyboards/hhkb/rn42/rn42.c
+++ b/keyboards/hhkb/rn42/rn42.c
@@ -12,7 +12,7 @@
 static uint8_t keyboard_leds(void);
 static void send_keyboard(report_keyboard_t *report);
 static void send_mouse(report_mouse_t *report);
-static void send_extra(uint8_t report_id, uint16_t data);
+static void send_extra(report_extra_t *report);
 
 host_driver_t rn42_driver = {
     keyboard_leds,
@@ -221,10 +221,10 @@ static uint16_t usage2bits(uint16_t usage)
 }
 
 
-static void send_extra(uint8_t report_id, uint16_t data)
+static void send_extra(report_extra_t *report)
 {
-    if (report_id == REPORT_ID_CONSUMER) {
-        uint16_t bits = usage2bits(data);
+    if (report->report_id == REPORT_ID_CONSUMER) {
+        uint16_t bits = usage2bits(report->usage);
         serial_send(0xFD);  // Raw report mode
         serial_send(3);     // length
         serial_send(3);     // descriptor type
@@ -238,7 +238,7 @@ static void send_extra(uint8_t report_id, uint16_t data)
 static uint8_t config_keyboard_leds(void);
 static void config_send_keyboard(report_keyboard_t *report);
 static void config_send_mouse(report_mouse_t *report);
-static void config_send_extra(uint8_t report_id, uint16_t data);
+static void config_send_extra(report_extra_t *report);
 
 host_driver_t rn42_config_driver = {
     config_keyboard_leds,
@@ -250,4 +250,4 @@ host_driver_t rn42_config_driver = {
 static uint8_t config_keyboard_leds(void) { return leds; }
 static void config_send_keyboard(report_keyboard_t *report) {}
 static void config_send_mouse(report_mouse_t *report) {}
-static void config_send_extra(uint8_t report_id, uint16_t data) {}
+static void config_send_extra(report_extra_t *report) {}
diff --git a/tests/test_common/test_driver.cpp b/tests/test_common/test_driver.cpp
index 7ecd4931ed..f1c52cb7b6 100644
--- a/tests/test_common/test_driver.cpp
+++ b/tests/test_common/test_driver.cpp
@@ -53,8 +53,8 @@ void TestDriver::send_mouse(report_mouse_t* report) {
     m_this->send_mouse_mock(*report);
 }
 
-void TestDriver::send_extra(uint8_t report_id, uint16_t data) {
-    m_this->send_extra_mock(report_id, data);
+void TestDriver::send_extra(report_extra_t* report) {
+    m_this->send_extra_mock(*report);
 }
 
 namespace internal {
diff --git a/tests/test_common/test_driver.hpp b/tests/test_common/test_driver.hpp
index 666bfb1fba..c97bda8bc5 100644
--- a/tests/test_common/test_driver.hpp
+++ b/tests/test_common/test_driver.hpp
@@ -32,13 +32,13 @@ class TestDriver {
 
     MOCK_METHOD1(send_keyboard_mock, void(report_keyboard_t&));
     MOCK_METHOD1(send_mouse_mock, void(report_mouse_t&));
-    MOCK_METHOD2(send_extra_mock, void(uint8_t, uint16_t));
+    MOCK_METHOD1(send_extra_mock, void(report_extra_t&));
 
    private:
     static uint8_t     keyboard_leds(void);
     static void        send_keyboard(report_keyboard_t* report);
     static void        send_mouse(report_mouse_t* report);
-    static void        send_extra(uint8_t report_id, uint16_t data);
+    static void        send_extra(report_extra_t* report);
     host_driver_t      m_driver;
     uint8_t            m_leds = 0;
     static TestDriver* m_this;
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index 0537e3937d..1ccfbfb54a 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -37,7 +37,7 @@ void    main_subtasks(void);
 uint8_t keyboard_leds(void);
 void    send_keyboard(report_keyboard_t *report);
 void    send_mouse(report_mouse_t *report);
-void    send_extra(uint8_t report_id, uint16_t data);
+void    send_extra(report_extra_t *report);
 
 #ifdef DEFERRED_EXEC_ENABLE
 void deferred_exec_task(void);
@@ -113,7 +113,7 @@ void send_mouse(report_mouse_t *report) {
 #endif // MOUSEKEY_ENABLE
 }
 
-void send_extra(uint8_t report_id, uint16_t data) {
+void send_extra(report_extra_t *report) {
 #ifdef EXTRAKEY_ENABLE
     uint32_t irqflags;
 
@@ -121,9 +121,8 @@ void send_extra(uint8_t report_id, uint16_t data) {
     __disable_irq();
     __DMB();
 
-    udi_hid_exk_report.desc.report_id   = report_id;
-    udi_hid_exk_report.desc.report_data = data;
-    udi_hid_exk_b_report_valid          = 1;
+    memcpy(udi_hid_exk_report, report, UDI_HID_EXK_REPORT_SIZE);
+    udi_hid_exk_b_report_valid = 1;
     udi_hid_exk_send_report();
 
     __DMB();
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
index eeed196275..a3c6f1c397 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
@@ -352,21 +352,9 @@ typedef struct {
 
 // clang-format on
 
-// set report buffer (from host)
-extern uint8_t udi_hid_exk_report_set;
-
 // report buffer
 #    define UDI_HID_EXK_REPORT_SIZE 3
-
-typedef union {
-    struct {
-        uint8_t  report_id;
-        uint16_t report_data;
-    } desc;
-    uint8_t raw[UDI_HID_EXK_REPORT_SIZE];
-} udi_hid_exk_report_t;
-
-extern udi_hid_exk_report_t udi_hid_exk_report;
+extern uint8_t udi_hid_exk_report[UDI_HID_EXK_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
index be4f2bb0c9..5d681a8b71 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
@@ -371,13 +371,13 @@ static uint8_t udi_hid_exk_rate;
 COMPILER_WORD_ALIGNED
 static uint8_t udi_hid_exk_protocol;
 
-COMPILER_WORD_ALIGNED
-uint8_t udi_hid_exk_report_set;
+// COMPILER_WORD_ALIGNED
+// uint8_t udi_hid_exk_report_set;
 
 bool udi_hid_exk_b_report_valid;
 
 COMPILER_WORD_ALIGNED
-udi_hid_exk_report_t udi_hid_exk_report;
+uint8_t udi_hid_exk_report[UDI_HID_EXK_REPORT_SIZE];
 
 static bool udi_hid_exk_b_report_trans_ongoing;
 
@@ -415,39 +415,24 @@ UDC_DESC_STORAGE udi_hid_exk_report_desc_t udi_hid_exk_report_desc = {{
     //clang-format on
 }};
 
-static bool udi_hid_exk_setreport(void);
-
 static void udi_hid_exk_report_sent(udd_ep_status_t status, iram_size_t nb_sent, udd_ep_id_t ep);
 
-static void udi_hid_exk_setreport_valid(void);
-
 bool udi_hid_exk_enable(void) {
     // Initialize internal values
     udi_hid_exk_rate                   = 0;
     udi_hid_exk_protocol               = 0;
     udi_hid_exk_b_report_trans_ongoing = false;
-    memset(udi_hid_exk_report.raw, 0, UDI_HID_EXK_REPORT_SIZE);
+    memset(udi_hid_exk_report, 0, UDI_HID_EXK_REPORT_SIZE);
     udi_hid_exk_b_report_valid = false;
     return UDI_HID_EXK_ENABLE_EXT();
 }
 
 void udi_hid_exk_disable(void) { UDI_HID_EXK_DISABLE_EXT(); }
 
-bool udi_hid_exk_setup(void) { return udi_hid_setup(&udi_hid_exk_rate, &udi_hid_exk_protocol, (uint8_t *)&udi_hid_exk_report_desc, udi_hid_exk_setreport); }
+bool udi_hid_exk_setup(void) { return udi_hid_setup(&udi_hid_exk_rate, &udi_hid_exk_protocol, (uint8_t *)&udi_hid_exk_report_desc, NULL); }
 
 uint8_t udi_hid_exk_getsetting(void) { return 0; }
 
-static bool udi_hid_exk_setreport(void) {
-    if ((USB_HID_REPORT_TYPE_OUTPUT == (udd_g_ctrlreq.req.wValue >> 8)) && (0 == (0xFF & udd_g_ctrlreq.req.wValue)) && (1 == udd_g_ctrlreq.req.wLength)) {
-        // Report OUT type on report ID 0 from USB Host
-        udd_g_ctrlreq.payload      = &udi_hid_exk_report_set;
-        udd_g_ctrlreq.callback     = udi_hid_exk_setreport_valid;
-        udd_g_ctrlreq.payload_size = 1;
-        return true;
-    }
-    return false;
-}
-
 bool udi_hid_exk_send_report(void) {
     if (!main_b_exk_enable) {
         return false;
@@ -457,7 +442,7 @@ bool udi_hid_exk_send_report(void) {
         return false;
     }
 
-    memcpy(udi_hid_exk_report_trans, udi_hid_exk_report.raw, UDI_HID_EXK_REPORT_SIZE);
+    memcpy(udi_hid_exk_report_trans, udi_hid_exk_report, UDI_HID_EXK_REPORT_SIZE);
     udi_hid_exk_b_report_valid         = false;
     udi_hid_exk_b_report_trans_ongoing = udd_ep_run(UDI_HID_EXK_EP_IN | USB_EP_DIR_IN, false, udi_hid_exk_report_trans, UDI_HID_EXK_REPORT_SIZE, udi_hid_exk_report_sent);
 
@@ -474,8 +459,6 @@ static void udi_hid_exk_report_sent(udd_ep_status_t status, iram_size_t nb_sent,
     }
 }
 
-static void udi_hid_exk_setreport_valid(void) {}
-
 #endif  // EXTRAKEY_ENABLE
 
 //********************************************************************************************
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
index a330014498..e17538fa70 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
@@ -79,7 +79,6 @@ bool                              udi_hid_nkro_send_report(void);
 #ifdef EXTRAKEY_ENABLE
 extern UDC_DESC_STORAGE udi_api_t udi_api_hid_exk;
 extern bool                       udi_hid_exk_b_report_valid;
-extern uint8_t                    udi_hid_exk_report_set;
 bool                              udi_hid_exk_send_report(void);
 #endif // EXTRAKEY_ENABLE
 
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 82ade4259b..10a976608a 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -58,7 +58,7 @@
 uint8_t keyboard_leds(void);
 void    send_keyboard(report_keyboard_t *report);
 void    send_mouse(report_mouse_t *report);
-void    send_extra(uint8_t report_id, uint16_t data);
+void    send_extra(report_extra_t *report);
 
 /* host struct */
 host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 3fd34a604e..5eda5dd09f 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -943,7 +943,7 @@ void shared_in_cb(USBDriver *usbp, usbep_t ep) {
  * ---------------------------------------------------------
  */
 
-void send_extra(uint8_t report_id, uint16_t data) {
+void send_extra(report_extra_t *report) {
 #ifdef EXTRAKEY_ENABLE
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
@@ -962,10 +962,7 @@ void send_extra(uint8_t report_id, uint16_t data) {
         }
     }
 
-    static report_extra_t report;
-    report = (report_extra_t){.report_id = report_id, .usage = data};
-
-    usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report_extra_t));
+    usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)report, sizeof(report_extra_t));
     osalSysUnlock();
 #endif
 }
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index e6c12d8a36..b441d2d5d9 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -41,8 +41,8 @@ extern keymap_config_t keymap_config;
 #endif
 
 static host_driver_t *driver;
-static uint16_t       last_system_report   = 0;
-static uint16_t       last_consumer_report = 0;
+static uint16_t       last_system_usage   = 0;
+static uint16_t       last_consumer_usage = 0;
 
 void host_set_driver(host_driver_t *d) {
     driver = d;
@@ -126,27 +126,37 @@ void host_mouse_send(report_mouse_t *report) {
     (*driver->send_mouse)(report);
 }
 
-void host_system_send(uint16_t report) {
-    if (report == last_system_report) return;
-    last_system_report = report;
+void host_system_send(uint16_t usage) {
+    if (usage == last_system_usage) return;
+    last_system_usage = usage;
 
     if (!driver) return;
-    (*driver->send_extra)(REPORT_ID_SYSTEM, report);
+
+    report_extra_t report = {
+        .report_id = REPORT_ID_SYSTEM,
+        .usage     = usage,
+    };
+    (*driver->send_extra)(&report);
 }
 
-void host_consumer_send(uint16_t report) {
-    if (report == last_consumer_report) return;
-    last_consumer_report = report;
+void host_consumer_send(uint16_t usage) {
+    if (usage == last_consumer_usage) return;
+    last_consumer_usage = usage;
 
 #ifdef BLUETOOTH_ENABLE
     if (where_to_send() == OUTPUT_BLUETOOTH) {
-        bluetooth_send_consumer(report);
+        bluetooth_send_consumer(usage);
         return;
     }
 #endif
 
     if (!driver) return;
-    (*driver->send_extra)(REPORT_ID_CONSUMER, report);
+
+    report_extra_t report = {
+        .report_id = REPORT_ID_CONSUMER,
+        .usage     = usage,
+    };
+    (*driver->send_extra)(&report);
 }
 
 #ifdef JOYSTICK_ENABLE
@@ -232,10 +242,10 @@ void host_programmable_button_send(uint32_t data) {
 
 __attribute__((weak)) void send_programmable_button(report_programmable_button_t *report) {}
 
-uint16_t host_last_system_report(void) {
-    return last_system_report;
+uint16_t host_last_system_usage(void) {
+    return last_system_usage;
 }
 
-uint16_t host_last_consumer_report(void) {
-    return last_consumer_report;
+uint16_t host_last_consumer_usage(void) {
+    return last_consumer_usage;
 }
diff --git a/tmk_core/protocol/host.h b/tmk_core/protocol/host.h
index 08bd498d38..dfa86cd7b5 100644
--- a/tmk_core/protocol/host.h
+++ b/tmk_core/protocol/host.h
@@ -45,12 +45,12 @@ uint8_t host_keyboard_leds(void);
 led_t   host_keyboard_led_state(void);
 void    host_keyboard_send(report_keyboard_t *report);
 void    host_mouse_send(report_mouse_t *report);
-void    host_system_send(uint16_t data);
-void    host_consumer_send(uint16_t data);
+void    host_system_send(uint16_t usage);
+void    host_consumer_send(uint16_t usage);
 void    host_programmable_button_send(uint32_t data);
 
-uint16_t host_last_system_report(void);
-uint16_t host_last_consumer_report(void);
+uint16_t host_last_system_usage(void);
+uint16_t host_last_consumer_usage(void);
 
 #ifdef __cplusplus
 }
diff --git a/tmk_core/protocol/host_driver.h b/tmk_core/protocol/host_driver.h
index bb4dcdd877..7dc6c3d810 100644
--- a/tmk_core/protocol/host_driver.h
+++ b/tmk_core/protocol/host_driver.h
@@ -27,7 +27,7 @@ typedef struct {
     uint8_t (*keyboard_leds)(void);
     void (*send_keyboard)(report_keyboard_t *);
     void (*send_mouse)(report_mouse_t *);
-    void (*send_extra)(uint8_t, uint16_t);
+    void (*send_extra)(report_extra_t *);
 } host_driver_t;
 
 void send_joystick(report_joystick_t *report);
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 869ed71d76..fa3ced8fd6 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -84,7 +84,7 @@ static report_keyboard_t keyboard_report_sent;
 static uint8_t keyboard_leds(void);
 static void    send_keyboard(report_keyboard_t *report);
 static void    send_mouse(report_mouse_t *report);
-static void    send_extra(uint8_t report_id, uint16_t data);
+static void    send_extra(report_extra_t *report);
 host_driver_t  lufa_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
 
 #ifdef VIRTSER_ENABLE
@@ -663,11 +663,9 @@ static void send_report(void *report, size_t size) {
  *
  * FIXME: Needs doc
  */
-static void send_extra(uint8_t report_id, uint16_t data) {
+static void send_extra(report_extra_t *report) {
 #ifdef EXTRAKEY_ENABLE
-    static report_extra_t r;
-    r = (report_extra_t){.report_id = report_id, .usage = data};
-    send_report(&r, sizeof(r));
+    send_report(report, sizeof(report_extra_t));
 #endif
 }
 
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 8456d2c5ab..84b01b203e 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -224,7 +224,7 @@ void console_task(void) {
 static uint8_t keyboard_leds(void);
 static void    send_keyboard(report_keyboard_t *report);
 static void    send_mouse(report_mouse_t *report);
-static void    send_extra(uint8_t report_id, uint16_t data);
+static void    send_extra(report_extra_t *report);
 
 static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
 
@@ -267,18 +267,10 @@ static void send_mouse(report_mouse_t *report) {
 #endif
 }
 
-static void send_extra(uint8_t report_id, uint16_t data) {
+static void send_extra(report_extra_t *report) {
 #ifdef EXTRAKEY_ENABLE
-    static uint8_t  last_id   = 0;
-    static uint16_t last_data = 0;
-    if ((report_id == last_id) && (data == last_data)) return;
-    last_id   = report_id;
-    last_data = data;
-
-    static report_extra_t report;
-    report = (report_extra_t){.report_id = report_id, .usage = data};
     if (usbInterruptIsReadyShared()) {
-        usbSetInterruptShared((void *)&report, sizeof(report_extra_t));
+        usbSetInterruptShared((void *)report, sizeof(report_extra_t));
     }
 #endif
 }

From a000ea11f7100e646524acf5316f3119eaf8988b Mon Sep 17 00:00:00 2001
From: tarneo <contact.tarneo@gmail.com>
Date: Fri, 7 Oct 2022 04:54:50 +0200
Subject: [PATCH 583/959] [Keyboard] Add supersplit (#18611)

Co-authored-by: tarneo <tarneo@tarneo.fr>
---
 keyboards/supersplit/config.h                 |  38 ++++++
 keyboards/supersplit/info.json                | 112 ++++++++++++++++++
 keyboards/supersplit/keymaps/default/keymap.c |  34 ++++++
 keyboards/supersplit/readme.md                |  25 ++++
 keyboards/supersplit/rules.mk                 |   4 +
 5 files changed, 213 insertions(+)
 create mode 100644 keyboards/supersplit/config.h
 create mode 100644 keyboards/supersplit/info.json
 create mode 100644 keyboards/supersplit/keymaps/default/keymap.c
 create mode 100644 keyboards/supersplit/readme.md
 create mode 100644 keyboards/supersplit/rules.mk

diff --git a/keyboards/supersplit/config.h b/keyboards/supersplit/config.h
new file mode 100644
index 0000000000..e3f300355b
--- /dev/null
+++ b/keyboards/supersplit/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 tarneo (tarneo@tarneo.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
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//
+
+#define SOFT_SERIAL_PIN D2
+#define MASTER_LEFT
+
diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/info.json
new file mode 100644
index 0000000000..d72d083649
--- /dev/null
+++ b/keyboards/supersplit/info.json
@@ -0,0 +1,112 @@
+{
+    "manufacturer": "tarneaux",
+    "keyboard_name": "supersplit",
+    "maintainer": "tarneaux",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6",
+                 "B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/tarneaux/supersplit",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_split_6x4_9": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 1.5 },
+                { "matrix": [1, 0], "x": 1, "y": 1.5 },
+                { "matrix": [2, 0], "x": 2, "y": 0.5 },
+                { "matrix": [3, 0], "x": 3, "y": 0 },
+                { "matrix": [4, 0], "x": 4, "y": 0.7 },
+                { "matrix": [5, 0], "x": 5, "y": 1 },
+
+                { "matrix": [0, 1], "x": 0, "y": 2.5 },
+                { "matrix": [1, 1], "x": 1, "y": 2.5 },
+                { "matrix": [2, 1], "x": 2, "y": 1.5 },
+                { "matrix": [3, 1], "x": 3, "y": 1 },
+                { "matrix": [4, 1], "x": 4, "y": 1.7 },
+                { "matrix": [5, 1], "x": 5, "y": 2 },
+
+                { "matrix": [0, 2], "x": 0, "y": 3.5 },
+                { "matrix": [1, 2], "x": 1, "y": 3.5 },
+                { "matrix": [2, 2], "x": 2, "y": 2.5 },
+                { "matrix": [3, 2], "x": 3, "y": 2 },
+                { "matrix": [4, 2], "x": 4, "y": 2.7 },
+                { "matrix": [5, 2], "x": 5, "y": 3 },
+
+                { "matrix": [0, 3], "x": 0, "y": 4.5 },
+                { "matrix": [1, 3], "x": 1, "y": 4.5 },
+                { "matrix": [2, 3], "x": 2, "y": 3.5 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [4, 3], "x": 4, "y": 3.7 },
+                { "matrix": [5, 3], "x": 5, "y": 4 },
+
+                { "matrix": [3, 4], "x": 6, "y": 5 },
+                { "matrix": [4, 4], "x": 7, "y": 5 },
+                { "matrix": [5, 4], "x": 8, "y": 5 },
+
+                { "matrix": [0, 5], "x": 3, "y": 6 },
+                { "matrix": [1, 5], "x": 4, "y": 6 },
+                { "matrix": [2, 5], "x": 5, "y": 6 },
+                { "matrix": [3, 5], "x": 6, "y": 6 },
+                { "matrix": [4, 5], "x": 7, "y": 6 },
+                { "matrix": [5, 5], "x": 8, "y": 6 },
+
+
+
+                { "matrix": [5, 6], "x": 13, "y": 1 },
+                { "matrix": [4, 6], "x": 14, "y": 0.7 },
+                { "matrix": [3, 6], "x": 15, "y": 0 },
+                { "matrix": [2, 6], "x": 16, "y": 0.5 },
+                { "matrix": [1, 6], "x": 17, "y": 1.5 },
+                { "matrix": [0, 6], "x": 18, "y": 1.5 },
+
+                { "matrix": [5, 7], "x": 13, "y": 2 },
+                { "matrix": [4, 7], "x": 14, "y": 1.7 },
+                { "matrix": [3, 7], "x": 15, "y": 1 },
+                { "matrix": [2, 7], "x": 16, "y": 1.5 },
+                { "matrix": [1, 7], "x": 17, "y": 2.5 },
+                { "matrix": [0, 7], "x": 18, "y": 2.5 },
+
+                { "matrix": [5, 8], "x": 13, "y": 3 },
+                { "matrix": [4, 8], "x": 14, "y": 2.7 },
+                { "matrix": [3, 8], "x": 15, "y": 2 },
+                { "matrix": [2, 8], "x": 16, "y": 2.5 },
+                { "matrix": [1, 8], "x": 17, "y": 3.5 },
+                { "matrix": [0, 8], "x": 18, "y": 3.5 },
+
+                { "matrix": [5, 9], "x": 13, "y": 4 },
+                { "matrix": [4, 9], "x": 14, "y": 3.7 },
+                { "matrix": [3, 9], "x": 15, "y": 3 },
+                { "matrix": [2, 9], "x": 16, "y": 3.5 },
+                { "matrix": [1, 9], "x": 17, "y": 4.5 },
+                { "matrix": [0, 9], "x": 18, "y": 4.5 },
+
+                { "matrix": [0, 10], "x": 10, "y": 5 },
+                { "matrix": [1, 10], "x": 11, "y": 5 },
+                { "matrix": [2, 10], "x": 12, "y": 5 },
+
+                { "matrix": [0, 11], "x": 10, "y": 6 },
+                { "matrix": [1, 11], "x": 11, "y": 6 },
+                { "matrix": [2, 11], "x": 12, "y": 6 },
+                { "matrix": [3, 11], "x": 13, "y": 6 },
+                { "matrix": [4, 11], "x": 14, "y": 6 },
+                { "matrix": [5, 11], "x": 15, "y": 6 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/supersplit/keymaps/default/keymap.c b/keyboards/supersplit/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8a23ca5ca3
--- /dev/null
+++ b/keyboards/supersplit/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 tarneo (tarneo@tarneo.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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_split_6x4_9(
+            // 6*4 + 9-key thumb cluster = 33 keys
+            // Left side
+            KC_ESC, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC,
+            // Right side
+            KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+            KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+            KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+            KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+            KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
+            )
+};
diff --git a/keyboards/supersplit/readme.md b/keyboards/supersplit/readme.md
new file mode 100644
index 0000000000..5afb0f0afa
--- /dev/null
+++ b/keyboards/supersplit/readme.md
@@ -0,0 +1,25 @@
+# supersplit
+
+*A custom-made keyboard with a 4x6 matrix and a 9-key thumb cluster*
+
+* Keyboard Maintainer: [tarneaux](https://github.com/tarneaux)
+* Hardware Supported: elite-c
+* Hardware Availability: https://github.com/tarneaux/supersplit
+
+Make example for this keyboard (after setting up your build environment):
+
+    make supersplit:default
+
+Flashing example for this keyboard:
+
+    make supersplit:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/supersplit/rules.mk b/keyboards/supersplit/rules.mk
new file mode 100644
index 0000000000..65e2c2165e
--- /dev/null
+++ b/keyboards/supersplit/rules.mk
@@ -0,0 +1,4 @@
+# This file intentionally left blank
+SPLIT_KEYBOARD = yes
+
+SERIAL_DRIVER = bitbang

From 1a9058b2d1f4516a746f61a8b61b7e4399742ad8 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 6 Oct 2022 22:30:09 -0700
Subject: [PATCH 584/959] Studio Kestra Nascent Refactor (#18625)

---
 keyboards/studiokestra/nascent/info.json      | 450 +++++++++++++++---
 .../nascent/keymaps/default/keymap.c          |  26 +-
 .../studiokestra/nascent/keymaps/via/keymap.c |  48 +-
 keyboards/studiokestra/nascent/nascent.h      | 134 +++++-
 4 files changed, 534 insertions(+), 124 deletions(-)

diff --git a/keyboards/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/info.json
index 0d3f12eba5..55d8d0049c 100644
--- a/keyboards/studiokestra/nascent/info.json
+++ b/keyboards/studiokestra/nascent/info.json
@@ -2,85 +2,395 @@
     "keyboard_name": "Nascent",
     "manufacturer": "Studio Kestra",
     "url": "https://studiokestra.ca/",
-    "maintainer": "Studio Kestra",
+    "maintainer": "studiokestra",
     "usb": {
         "vid": "0x7C10",
         "pid": "0x0165",
         "device_version": "0.0.1"
     },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"~", "x":0, "y":0}, 
-                {"label":"!", "x":1, "y":0}, 
-                {"label":"@", "x":2, "y":0}, 
-                {"label":"#", "x":3, "y":0}, 
-                {"label":"$", "x":4, "y":0}, 
-                {"label":"%", "x":5, "y":0}, 
-                {"label":"^", "x":6, "y":0}, 
-                {"label":"&", "x":7, "y":0}, 
-                {"label":"*", "x":8, "y":0}, 
-                {"label":"(", "x":9, "y":0}, 
-                {"label":")", "x":10, "y":0}, 
-                {"label":"_", "x":11, "y":0}, 
-                {"label":"+", "x":12, "y":0}, 
-                {"label":"Bksp", "x":13, "y":0}, 
-                {"label":"Bksp", "x":14, "y":0}, 
-                {"label":"Delete", "x":15, "y":0}, 
-                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":1}, 
-                {"label":"W", "x":2.5, "y":1}, 
-                {"label":"E", "x":3.5, "y":1}, 
-                {"label":"R", "x":4.5, "y":1}, 
-                {"label":"T", "x":5.5, "y":1}, 
-                {"label":"Y", "x":6.5, "y":1}, 
-                {"label":"U", "x":7.5, "y":1}, 
-                {"label":"I", "x":8.5, "y":1}, 
-                {"label":"O", "x":9.5, "y":1}, 
-                {"label":"P", "x":10.5, "y":1}, 
-                {"label":"{", "x":11.5, "y":1}, 
-                {"label":"}", "x":12.5, "y":1}, 
-                {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-                {"label":"Home", "x":15, "y":1}, 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":2}, 
-                {"label":"S", "x":2.75, "y":2}, 
-                {"label":"D", "x":3.75, "y":2}, 
-                {"label":"F", "x":4.75, "y":2}, 
-                {"label":"G", "x":5.75, "y":2}, 
-                {"label":"H", "x":6.75, "y":2}, 
-                {"label":"J", "x":7.75, "y":2}, 
-                {"label":"K", "x":8.75, "y":2}, 
-                {"label":"L", "x":9.75, "y":2}, 
-                {"label":":", "x":10.75, "y":2}, 
-                {"label":"\"", "x":11.75, "y":2}, 
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-                {"label":"PgUp", "x":15, "y":2}, 
-                {"label":"Shift", "x":0, "y":3, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":3}, 
-                {"label":"X", "x":3.25, "y":3}, 
-                {"label":"C", "x":4.25, "y":3}, 
-                {"label":"V", "x":5.25, "y":3}, 
-                {"label":"B", "x":6.25, "y":3}, 
-                {"label":"N", "x":7.25, "y":3}, 
-                {"label":"M", "x":8.25, "y":3}, 
-                {"label":"<", "x":9.25, "y":3}, 
-                {"label":">", "x":10.25, "y":3}, 
-                {"label":"?", "x":11.25, "y":3}, 
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-                {"label":"\u2191", "x":14, "y":3}, 
-                {"label":"PgDn", "x":15, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5}, 
-                {"label":"Win", "x":1.5, "y":4}, 
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5}, 
-                {"x":4, "y":4, "w":3}, 
-                {"x":7, "y":4}, 
-                {"x":8, "y":4, "w":3}, 
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5}, 
-                {"label":"\u2190", "x":13, "y":4}, 
-                {"label":"\u2193", "x":14, "y":4}, 
+                {"label":"`~", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Home", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":3},
+                {"label":"Space", "x":7, "y":4},
+                {"label":"Alt", "x":8, "y":4, "w":3},
+                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"`~", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Home", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label":"`~", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Home", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label":"`~", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0, "w":2},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Home", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label":"`~", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Bksp", "x":13, "y":0},
+                {"label":"Bksp", "x":14, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[{", "x":11.5, "y":1},
+                {"label":"]}", "x":12.5, "y":1},
+                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Home", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";:", "x":10.75, "y":2},
+                {"label":"'\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",<", "x":9.25, "y":3},
+                {"label":".>", "x":10.25, "y":3},
+                {"label":"/?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
                 {"label":"\u2192", "x":15, "y":4}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/studiokestra/nascent/keymaps/default/keymap.c b/keyboards/studiokestra/nascent/keymaps/default/keymap.c
index c3c71e7494..dc93516205 100644
--- a/keyboards/studiokestra/nascent/keymaps/default/keymap.c
+++ b/keyboards/studiokestra/nascent/keymaps/default/keymap.c
@@ -24,18 +24,20 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-
     [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,    KC_BSPC,    KC_DEL,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,    KC_HOME,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,     KC_PGUP,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    KC_UP,      KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,           KC_RALT, KC_RCTL, 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,  KC_BSPC, KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_HOME,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
+        KC_LSFT,          KC_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_RALT,                   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
     [_FN] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
\ No newline at end of file
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/studiokestra/nascent/keymaps/via/keymap.c b/keyboards/studiokestra/nascent/keymaps/via/keymap.c
index 3339561d9a..ed123455e4 100644
--- a/keyboards/studiokestra/nascent/keymaps/via/keymap.c
+++ b/keyboards/studiokestra/nascent/keymaps/via/keymap.c
@@ -27,27 +27,35 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,    KC_BSPC,    KC_DEL,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,    KC_HOME,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,     KC_PGUP,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    KC_UP,      KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,           KC_RALT, KC_RCTL, 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,  KC_BSPC, KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_HOME,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
+        KC_LSFT,          KC_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_RALT,                   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
     [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    ),
+
     [_FN2] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
     [_FN3] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
 };
diff --git a/keyboards/studiokestra/nascent/nascent.h b/keyboards/studiokestra/nascent/nascent.h
index 5013ff9c0f..e8e4c18561 100644
--- a/keyboards/studiokestra/nascent/nascent.h
+++ b/keyboards/studiokestra/nascent/nascent.h
@@ -18,29 +18,119 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+ * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │07 │17 │   │07     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   └───────┘
+ * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │27   │37 │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │57 │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │60      │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │67 │77 │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+ * │80   │90 │81   │82         │83 │84         │85   │ │86 │87 │97 │
+ * └─────┴───┴─────┴───────────┴───┴───────────┴─────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │80   │90 │81   │83                         │85   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ * ┌────┬────┬────┬────────────────────────┬────┬────┐
+ * │80  │90  │81  │83                      │84  │85  │ Standard
+ * └────┴────┴────┴────────────────────────┴────┴────┘
  */
+
 #define LAYOUT_all(\
-    k000, k100, k001, k101, k002, k102, k003, k103, k004, k104, k005, k105, k006, k106, k007, k107, \
-    k200, k300, k201, k301, k202, k302, k203, k303, k204, k304, k205, k305, k206,       k207, k307, \
-    k400, k500, k401, k501, k402, k502, k403, k503, k404, k504, k405, k505,             k407, k507, \
-    k600,       k601, k701, k602, k702, k603, k703, k604, k704, k605, k705, k606,       k607, k707,  \
-    k800, k900, k801,       k802,       k803,       k804,       k805,       k806,       k807, k907  \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
+    K80, K90, K81,           K82, K83, K84,           K85,      K86, K87, K97  \
 ) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207 }, \
-    { k300,  k301,  k302,  k303,  k304,  k305,  KC_NO, k307 }, \
-    { k400,  k401,  k402,  k403,  k404,  k405,  KC_NO, k407 }, \
-    { k500,  k501,  k502,  k503,  k504,  k505,  KC_NO, k507 }, \
-    { k600,  k601,  k602,  k603,  k604,  k605,  k606,  k607 }, \
-    { KC_NO, k701,  k702,  k703,  k704,  k705,  KC_NO, k707 }, \
-    { k800,  k801,  k802,  k803,  k804,  k805,  k806,  k807 }, \
-    { k900,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k907 } \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
+    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
+    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
+    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
+    { K90, ___, ___, ___, ___, ___, ___, K97 } \
+}
+
+#define LAYOUT_65_ansi_blocker(\
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K07, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
+    K80, K90, K81,                K83,           K84, K85,      K86, K87, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, ___, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
+    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
+    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
+    { K80, K81, ___, K83, K84, K85, K86, K87 }, \
+    { K90, ___, ___, ___, ___, ___, ___, K97 } \
+}
+
+#define LAYOUT_65_ansi_blocker_split_bs(\
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
+    K80, K90, K81,                K83,           K84, K85,      K86, K87, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
+    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
+    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
+    { K80, K81, ___, K83, K84, K85, K86, K87 }, \
+    { K90, ___, ___, ___, ___, ___, ___, K97 } \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan(\
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K07, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
+    K80, K90, K81,                K83,                K85,      K86, K87, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, ___, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
+    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
+    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
+    { K80, K81, ___, K83, ___, K85, K86, K87 }, \
+    { K90, ___, ___, ___, ___, ___, ___, K97 } \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan_split_bs(\
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
+    K80, K90, K81,                K83,                K85,      K86, K87, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
+    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
+    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
+    { K80, K81, ___, K83, ___, K85, K86, K87 }, \
+    { K90, ___, ___, ___, ___, ___, ___, K97 } \
 }

From ca2f9e4c8f483da93d7c082b4640832912bec76a Mon Sep 17 00:00:00 2001
From: adophoxia <100170946+adophoxia@users.noreply.github.com>
Date: Thu, 6 Oct 2022 22:32:19 -0700
Subject: [PATCH 585/959] Add encoder map support for Keychron Q1v1 and Q2
 (#18598)

---
 .../q1/rev_0101/keymaps/default/keymap.c      |  8 ++++
 .../q1/rev_0101/keymaps/default/rules.mk      |  1 +
 .../keychron/q1/rev_0101/keymaps/via/keymap.c | 45 +++---------------
 .../keychron/q1/rev_0101/keymaps/via/rules.mk |  2 +-
 .../q2/rev_0111/keymaps/default/keymap.c      | 10 ++++
 .../q2/rev_0111/keymaps/default/rules.mk      |  1 +
 .../keychron/q2/rev_0111/keymaps/via/keymap.c | 46 +++----------------
 .../keychron/q2/rev_0111/keymaps/via/rules.mk |  2 +-
 .../q2/rev_0113/keymaps/default/keymap.c      | 10 ++++
 .../q2/rev_0113/keymaps/default/rules.mk      |  1 +
 10 files changed, 46 insertions(+), 80 deletions(-)
 create mode 100644 keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/default/rules.mk

diff --git a/keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c b/keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c
index 92806bf9fe..1038c1680d 100644
--- a/keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c
@@ -67,6 +67,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk b/keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
index ad053648e5..2579b52fa4 100644
--- a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
@@ -67,46 +67,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
 };
 
-#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
-
-#define ENCODERS 1
-static uint8_t  encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS]    = {{ 8, 5 }};
-static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 5 }};
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < ENCODERS; ++index) {
-        if (encoder_state[index]) {
-            keyevent_t encoder_event = (keyevent_t) {
-                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
-                .pressed = false,
-                .time = (timer_read() | 1)
-            };
-            encoder_state[index] = 0;
-            action_exec(encoder_event);
-        }
-    }
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = true,
-        .time = (timer_read() | 1)
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_user(void) {
-    encoder_action_unregister();
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    return false;
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
 };
-
 #endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk b/keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk
index bee21da528..4253f570f0 100644
--- a/keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk
+++ b/keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c
index f5a0667601..3079050204 100644
--- a/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c
+++ b/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c
@@ -72,6 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN1]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN3]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case KC_MISSION_CONTROL:
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk b/keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
index a22143eb02..b6a5b5ff31 100644
--- a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
@@ -72,46 +72,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
-#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
-
-#define ENCODERS 1
-static uint8_t  encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS]    = {{ 8, 4 }};
-static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 4 }};
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = true,
-        .time = (timer_read() | 1)
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < ENCODERS; ++index) {
-        if (encoder_state[index]) {
-            keyevent_t encoder_event = (keyevent_t) {
-                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
-                .pressed = false,
-                .time = (timer_read() | 1)
-            };
-            encoder_state[index] = 0;
-            action_exec(encoder_event);
-        }
-    }
-}
-
-void matrix_scan_user(void) {
-    encoder_action_unregister();
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    return false;
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN1]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN3]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 };
-
 #endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk b/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk
index bee21da528..4253f570f0 100644
--- a/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk
+++ b/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
index a44e7e4cc9..7fb7303601 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
@@ -72,6 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN1]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN3]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case KC_MISSION_CONTROL:
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/rules.mk b/keyboards/keychron/q2/rev_0113/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file

From a8d6b37fac324910f83f524f008c8def40445c86 Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Fri, 7 Oct 2022 01:58:13 -0400
Subject: [PATCH 586/959] DD mappings for build.debounce_type and
 backlight.levels (#18628)

---
 data/mappings/info_config.json   | 1 +
 data/mappings/info_rules.json    | 1 +
 data/schemas/keyboard.jsonschema | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 608fe4e9ad..92004dd546 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -13,6 +13,7 @@
     "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
     "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
     "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
+    "BACKLIGHT_LEVELS": {"info_key": "backlight.levels", "value_type": "int"},
     "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"},
     "BACKLIGHT_PIN": {"info_key": "backlight.pin"},
     "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index a4da10fd31..7208d6ab94 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -14,6 +14,7 @@
     "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
     "BLUETOOTH": {"info_key": "bluetooth.driver"},
     "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"},
+    "DEBOUNCE_TYPE": {"info_key": "build.debounce_type"},
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 0308f45116..4c785a968a 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -120,7 +120,7 @@
             "properties": {
                 "debounce_type": {
                     "type": "string",
-                    "enum": ["custom", "eager_pk", "eager_pr", "sym_defer_pk", "sym_defer_pr", "sym_eager_pk"]
+                    "enum": ["asym_eager_defer_pk", "custom", "sym_defer_g", "sym_defer_pk", "sym_defer_pr", "sym_eager_pk", "sym_eager_pr"]
                 },
                 "firmware_format": {
                     "type": "string",

From de2c81d5b29fc3b3b86f977b72ab3357a1d13a63 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Fri, 7 Oct 2022 02:07:56 -0600
Subject: [PATCH 587/959] Remove all `BACKLIGHT_LEVELS 0` (#18630)

---
 keyboards/bpiphany/four_banger/config.h   | 6 ------
 keyboards/contra/config.h                 | 6 ------
 keyboards/creatkeebs/glacier/config.h     | 6 ------
 keyboards/creatkeebs/thera/config.h       | 7 -------
 keyboards/fractal/config.h                | 6 ------
 keyboards/gh80_3000/config.h              | 6 ------
 keyboards/handwired/2x5keypad/config.h    | 6 ------
 keyboards/handwired/cans12er/config.h     | 6 ------
 keyboards/handwired/hexon38/config.h      | 6 ------
 keyboards/handwired/jopr/config.h         | 5 -----
 keyboards/handwired/retro_refit/config.h  | 3 ---
 keyboards/handwired/space_oddity/config.h | 6 ------
 keyboards/idb/idb_60/config.h             | 3 ---
 keyboards/illusion/rosa/config.h          | 1 -
 keyboards/keebzdotnet/fme/config.h        | 6 ------
 keyboards/keyhive/southpole/config.h      | 8 +-------
 keyboards/kingly_keys/romac/config.h      | 4 ----
 keyboards/kingly_keys/romac_plus/config.h | 3 ---
 keyboards/makrosu/config.h                | 6 ------
 keyboards/omnikeyish/config.h             | 5 -----
 keyboards/pkb65/config.h                  | 6 ------
 keyboards/rart/rart67/config.h            | 3 ---
 keyboards/sixkeyboard/config.h            | 3 ---
 keyboards/skergo/config.h                 | 6 ------
 keyboards/toad/config.h                   | 6 ------
 keyboards/viktus/omnikey_bh/config.h      | 5 -----
 keyboards/wsk/houndstooth/config.h        | 6 ------
 keyboards/wsk/jerkin/config.h             | 6 ------
 keyboards/wsk/sl40/config.h               | 6 ------
 keyboards/xmmx/config.h                   | 6 ------
 keyboards/zlant/config.h                  | 6 ------
 31 files changed, 1 insertion(+), 163 deletions(-)

diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index 5408ee3350..9fe72d0788 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/contra/config.h b/keyboards/contra/config.h
index a6be554875..3f45e641f5 100755
--- a/keyboards/contra/config.h
+++ b/keyboards/contra/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
index 0af5d6f6b7..e48ac999db 100644
--- a/keyboards/creatkeebs/glacier/config.h
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -29,12 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
index 68494a1cd6..4761d61a34 100644
--- a/keyboards/creatkeebs/thera/config.h
+++ b/keyboards/creatkeebs/thera/config.h
@@ -29,13 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
-
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h
index 9db3d0abe5..8b40a62f42 100755
--- a/keyboards/fractal/config.h
+++ b/keyboards/fractal/config.h
@@ -14,12 +14,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h
index b3df0ae2f6..1717a7806d 100644
--- a/keyboards/gh80_3000/config.h
+++ b/keyboards/gh80_3000/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index 00c4ac1ab4..d038b0534a 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/handwired/cans12er/config.h b/keyboards/handwired/cans12er/config.h
index 240a2a5da9..8e7ce92439 100644
--- a/keyboards/handwired/cans12er/config.h
+++ b/keyboards/handwired/cans12er/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h
index b6529b3ddf..292e0c8410 100644
--- a/keyboards/handwired/hexon38/config.h
+++ b/keyboards/handwired/hexon38/config.h
@@ -15,12 +15,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index 5625f99521..bf7d94d5f6 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -13,11 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h
index 89e6fc9595..34a16b6c37 100644
--- a/keyboards/handwired/retro_refit/config.h
+++ b/keyboards/handwired/retro_refit/config.h
@@ -33,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 0
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h
index 0c8e86704e..ab0847e87a 100644
--- a/keyboards/handwired/space_oddity/config.h
+++ b/keyboards/handwired/space_oddity/config.h
@@ -19,12 +19,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h
index 24960dcbd5..9ea311578d 100644
--- a/keyboards/idb/idb_60/config.h
+++ b/keyboards/idb/idb_60/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h
index 1bfc08c8c8..f4c80da14c 100644
--- a/keyboards/illusion/rosa/config.h
+++ b/keyboards/illusion/rosa/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LED_CAPS_LOCK_PIN B3
 #define LED_PIN_ON_STATE 0
-#define BACKLIGHT_LEVELS 0
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/keebzdotnet/fme/config.h b/keyboards/keebzdotnet/fme/config.h
index 1723e314ef..ccedbb4fd7 100644
--- a/keyboards/keebzdotnet/fme/config.h
+++ b/keyboards/keebzdotnet/fme/config.h
@@ -30,12 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index d74682cea2..1fe3134cab 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
@@ -34,4 +28,4 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
index a5478582b1..246ef019a4 100644
--- a/keyboards/kingly_keys/romac/config.h
+++ b/keyboards/kingly_keys/romac/config.h
@@ -13,10 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#define BACKLIGHT_LEVELS 0
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 441584a84e..0618521306 100644
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ b/keyboards/kingly_keys/romac_plus/config.h
@@ -16,9 +16,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 0
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index f441a16f7a..96fe08b87e 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -34,12 +34,6 @@
 
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 5
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h
index 6d02623b21..4a969eb43f 100644
--- a/keyboards/omnikeyish/config.h
+++ b/keyboards/omnikeyish/config.h
@@ -23,11 +23,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
-/* number of backlight levels */
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
index ab71d1633e..6805d14be1 100644
--- a/keyboards/pkb65/config.h
+++ b/keyboards/pkb65/config.h
@@ -34,12 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index a303b42cd2..19011f347d 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 0
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h
index f9379f5720..ee70eadf1b 100644
--- a/keyboards/sixkeyboard/config.h
+++ b/keyboards/sixkeyboard/config.h
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 0
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
index 54c83eb469..906246f5fa 100644
--- a/keyboards/skergo/config.h
+++ b/keyboards/skergo/config.h
@@ -29,12 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-// #ifdef BACKLIGHT_PIN
-// #define BACKLIGHT_LEVELS 0
-// #endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
index 98669c3d99..92c2f06e59 100644
--- a/keyboards/toad/config.h
+++ b/keyboards/toad/config.h
@@ -17,12 +17,6 @@
 #define LED_SCROLL_LOCK_PIN B5
 #define LED_PIN_ON_STATE 0
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
index ab2e130da8..fd0872f69e 100644
--- a/keyboards/viktus/omnikey_bh/config.h
+++ b/keyboards/viktus/omnikey_bh/config.h
@@ -13,11 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h
index 5935d38845..bb66f98017 100644
--- a/keyboards/wsk/houndstooth/config.h
+++ b/keyboards/wsk/houndstooth/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-//#ifdef BACKLIGHT_PIN
-//#define BACKLIGHT_LEVELS 0
-//#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h
index 52f5f57dd2..03f1517d6e 100644
--- a/keyboards/wsk/jerkin/config.h
+++ b/keyboards/wsk/jerkin/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index 6377ebb3f7..85edfa3455 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -29,12 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index 1e9f2c9398..9a94680889 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -17,12 +17,6 @@
 #define LED_SCROLL_LOCK_PIN B5
 #define LED_PIN_ON_STATE 0
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index 3d581266b9..31502e0ef6 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -13,12 +13,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 0
-#endif
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 

From 150572da447ea4ec54df0621c2cb47c26818b621 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Fri, 7 Oct 2022 20:14:29 +0200
Subject: [PATCH 588/959] [Keymap] update andrebrait GMMK Pro keymap (#18608)

---
 .../pro/rev1/ansi/keymaps/andrebrait/keymap.c | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index ca39c39203..8d34d82f64 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
@@ -104,8 +104,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGB_MATRIX_ENABLE
 
-#define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
-
 /* Renaming those to make the purpose on this keymap clearer */
 #define LED_FLAG_CAPS LED_FLAG_NONE
 #define LED_FLAG_EFFECTS LED_FLAG_INDICATOR
@@ -116,12 +114,18 @@ static uint16_t effect_started_time = 0;
 static uint8_t r_effect = 0x0, g_effect = 0x0, b_effect = 0x0;
 static void start_effects(void);
 
-/* The higher this is, the slower the blinking will be */
-#ifndef TIME_SELECTED_BIT
-    #define TIME_SELECTED_BIT 8
+/* The interval time in ms */
+#ifndef EFFECTS_TIME
+    #define EFFECTS_TIME 2000
 #endif
-#if TIME_SELECTED_BIT < 0 || TIME_SELECTED_BIT >= 16
-    #error "TIME_SELECTED_BIT must be a positive integer smaller than 16"
+#ifndef EFFECTS_INTERVAL
+    #define EFFECTS_INTERVAL 250
+#endif
+#if EFFECTS_TIME <= 0 || EFFECTS_TIME >= 32767
+    #error "EFFECTS_TIME must be a positive integer smaller than 32767"
+#endif
+#if EFFECTS_INTERVAL <= 0 || EFFECTS_INTERVAL >= 32767
+    #error "EFFECTS_INTERVAL must be a positive integer smaller than 32767"
 #endif
 #define effect_red() r_effect = 0xFF, g_effect = 0x0, b_effect = 0x0
 #define effect_green() r_effect = 0x0, g_effect = 0xFF, b_effect = 0x0
@@ -257,8 +261,8 @@ bool rgb_matrix_indicators_user(void) {
     if (effect_started_time > 0) {
         /* Render blinking EFFECTS */
         const uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
-        if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) {
-            const uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
+        if (deltaTime <= EFFECTS_TIME) {
+            const uint8_t led_state = ((deltaTime / EFFECTS_INTERVAL) + 1) & 0x01;
             const uint8_t val_r = led_state * r_effect;
             const uint8_t val_g = led_state * g_effect;
             const uint8_t val_b = led_state * b_effect;
@@ -266,7 +270,7 @@ bool rgb_matrix_indicators_user(void) {
             if (host_keyboard_led_state().caps_lock) {
                 set_rgb_caps_leds();
             }
-            return;
+            return false;
         } else {
             /* EFFECTS duration is finished */
             effect_started_time = 0;
@@ -316,6 +320,20 @@ static void start_effects() {
 //  91, led 08                                                                                                                                                                      92, led 19
 
 static void set_rgb_caps_leds() {
+    rgb_matrix_set_color(0, 0xFF, 0x0, 0x0); // ESC
+    rgb_matrix_set_color(6, 0xFF, 0x0, 0x0); // F1
+    rgb_matrix_set_color(12, 0xFF, 0x0, 0x0); // F2
+    rgb_matrix_set_color(18, 0xFF, 0x0, 0x0); // F3
+    rgb_matrix_set_color(23, 0xFF, 0x0, 0x0); // F4
+    rgb_matrix_set_color(28, 0xFF, 0x0, 0x0); // F5
+    rgb_matrix_set_color(34, 0xFF, 0x0, 0x0); // F6
+    rgb_matrix_set_color(39, 0xFF, 0x0, 0x0); // F7
+    rgb_matrix_set_color(44, 0xFF, 0x0, 0x0); // F8
+    rgb_matrix_set_color(50, 0xFF, 0x0, 0x0); // F9
+    rgb_matrix_set_color(56, 0xFF, 0x0, 0x0); // F10
+    rgb_matrix_set_color(61, 0xFF, 0x0, 0x0); // F11
+    rgb_matrix_set_color(66, 0xFF, 0x0, 0x0); // F12
+    rgb_matrix_set_color(69, 0xFF, 0x0, 0x0); // Prt
     rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
     rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
     rgb_matrix_set_color(70, 0xFF, 0x0, 0x0); // Left side LED 2

From 5d7e19209eac263f24d90e079749f646a86e50cc Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Fri, 7 Oct 2022 14:30:19 -0500
Subject: [PATCH 589/959] Update CRKBD keymap (#18619)

---
 keyboards/crkbd/keymaps/jpe230/config.h       |  77 +--
 keyboards/crkbd/keymaps/jpe230/config_avr.h   |  15 +
 .../crkbd/keymaps/jpe230/config_rp2040.h      |  73 +++
 keyboards/crkbd/keymaps/jpe230/jpe230.h       |  15 +
 keyboards/crkbd/keymaps/jpe230/keymap.c       | 389 +------------
 .../oled/avr/master/oled_master_handler.c     |  75 +++
 .../oled/avr/slave/oled_slave_handler.c       |  14 +
 .../crkbd/keymaps/jpe230/oled/oled_handler.c  |  41 ++
 .../jpe230/oled/rp2040/master/indicators.h    |  13 +
 .../oled/rp2040/master/indicators_down.c      | 463 +++++++++++++++
 .../jpe230/oled/rp2040/master/indicators_up.c | 461 +++++++++++++++
 .../oled/rp2040/master/oled_master_handler.c  |  79 +++
 .../jpe230/oled/rp2040/slave/ocean_dream.c    | 533 ++++++++++++++++++
 .../jpe230/oled/rp2040/slave/ocean_dream.h    |  89 +++
 .../oled/rp2040/slave/oled_slave_handler.c    |  11 +
 .../crkbd/keymaps/jpe230/process_record.c     |  20 +
 keyboards/crkbd/keymaps/jpe230/readme.md      |  16 +-
 keyboards/crkbd/keymaps/jpe230/rules.mk       |  27 +-
 18 files changed, 1983 insertions(+), 428 deletions(-)
 create mode 100644 keyboards/crkbd/keymaps/jpe230/config_avr.h
 create mode 100644 keyboards/crkbd/keymaps/jpe230/config_rp2040.h
 create mode 100644 keyboards/crkbd/keymaps/jpe230/jpe230.h
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators.h
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_down.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_up.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.h
 create mode 100644 keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/process_record.c

diff --git a/keyboards/crkbd/keymaps/jpe230/config.h b/keyboards/crkbd/keymaps/jpe230/config.h
index d8185d4253..57a0271e27 100644
--- a/keyboards/crkbd/keymaps/jpe230/config.h
+++ b/keyboards/crkbd/keymaps/jpe230/config.h
@@ -1,40 +1,47 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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/>.
-*/
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
-#ifndef RGB_MATRIX_ENABLE
-#   define SPLIT_WPM_ENABLE
-#endif
+/* ---------------------------
+ * Common Spit Configuration
+ * ---------------------------
+ */
+#define SPLIT_OLED_ENABLE
 
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED
-#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-#   define RGB_MATRIX_STARTUP_HUE 215
-#   define RGB_MATRIX_STARTUP_SAT 255
-#   define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#   define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#   define ENABLE_RGB_MATRIX_BAND_VAL
-#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#   define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#   define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+/* ---------------------------
+ * Common OLED Configuration
+ * ---------------------------
+ */
+#define OLED_TIMEOUT 0
+#define CUSTOM_OLED_TIMEOUT 10000
+
+/* ---------------------------
+ * Common Bootmagic Lite
+ * ---------------------------
+ */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* ---------------------------
+ * Common RGB Configuration
+ * ---------------------------
+ */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_DISABLE_TIMEOUT CUSTOM_OLED_TIMEOUT
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
+#define RGB_MATRIX_STARTUP_HUE 215
+#define RGB_MATRIX_STARTUP_SAT 255
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+
+/* ---------------------------
+ * Common other Configuration
+ * ---------------------------
+ */
+#define ENABLE_COMPILE_KEYCODE
+
+#if defined CONVERT_TO_KB2040 || defined CONVERT_TO_PROMICRO_RP2040
+#    include "config_rp2040.h"
+#else
+#    include "config_avr.h"
 #endif
diff --git a/keyboards/crkbd/keymaps/jpe230/config_avr.h b/keyboards/crkbd/keymaps/jpe230/config_avr.h
new file mode 100644
index 0000000000..67226d88f7
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/config_avr.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* ---------------------------
+ * AVR RGB Configuration
+ * ---------------------------
+ */
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
diff --git a/keyboards/crkbd/keymaps/jpe230/config_rp2040.h b/keyboards/crkbd/keymaps/jpe230/config_rp2040.h
new file mode 100644
index 0000000000..b26c14986a
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/config_rp2040.h
@@ -0,0 +1,73 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* ---------------------------
+ * RP2040 OLED Configuration
+ * ---------------------------
+ */
+#define I2C1_CLOCK_SPEED 400000
+#define OLED_UPDATE_INTERVAL 1
+#define OLED_I2C_TIMEOUT 1
+
+/* ---------------------------
+ * RP2040 Split Configuration
+ * ---------------------------
+ */
+#define SPLIT_WPM_ENABLE
+
+/* ---------------------------
+ * RP2040 Debounce
+ * ---------------------------
+ */
+#undef DEBOUNCE
+#define DEBOUNCE 1
+
+/* ---------------------------
+ * RP2040 RGB Configuration
+ * ---------------------------
+ */
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/crkbd/keymaps/jpe230/jpe230.h b/keyboards/crkbd/keymaps/jpe230/jpe230.h
new file mode 100644
index 0000000000..f5f098f5c5
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/jpe230.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+/* ---------------------------
+ * Custom OLED Fncs Prototypes
+ * ---------------------------
+ */
+void render_slave_oled(void);
+void render_master_oled(void);
+void oled_timer_reset(void);
+void set_keylog(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/crkbd/keymaps/jpe230/keymap.c b/keyboards/crkbd/keymaps/jpe230/keymap.c
index 28bb6c1fe1..530c418be5 100644
--- a/keyboards/crkbd/keymaps/jpe230/keymap.c
+++ b/keyboards/crkbd/keymaps/jpe230/keymap.c
@@ -1,35 +1,9 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-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/>.
-*/
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
-#ifdef VIA_ENABLE
-    #define USER_START USER00
-#else
-    #define USER_START SAFE_RANGE
-#endif
-
-// Keycode to toggle Sarcasm Mode
-enum custom_keycodes {
-    KC_SCASM = USER_START
-};
-
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
@@ -72,361 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
       KC_MUTE, KC_WBAK, KC_WFWD,   KC_F7,   KC_F8,   KC_F9,                      _______,    KC_7,    KC_8,    KC_9, _______, QK_BOOT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_VOLU, _______, KC_MNXT,   KC_F6,   KC_F5,   KC_F6,                      _______,    KC_6,    KC_5,    KC_4, _______, _______,
+      KC_VOLU, _______, KC_MNXT,   KC_F6,   KC_F5,   KC_F6,                      _______,    KC_6,    KC_5,    KC_4, _______, QK_MAKE,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_VOLD, KC_MPRV, KC_MNXT,   KC_F1,   KC_F2,   KC_F3,                      _______,    KC_1,    KC_2,    KC_3, _______, _______,
+      KC_VOLD, KC_MPRV, KC_MNXT,   KC_F1,   KC_F2,   KC_F3,                      _______,    KC_1,    KC_2,    KC_3, _______, DB_TOGG,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,KC_SCASM,      TG(3), _______, KC_RALT
+                                          KC_LGUI, _______, _______,      TG(3), _______, KC_RALT
                                       //`--------------------------'  `--------------------------'
   )
 };
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-#ifdef RGB_MATRIX_ENABLE
-    if (!is_keyboard_master()) {
-        return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-    }
-#endif
-    return rotation;
-}
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-    }
-}
-
-
-static char logged_char = ' ';
-static uint8_t logged_row = 0, logged_col = 0;
-static uint16_t logged_keycode = 0;
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-    if (keycode < 60) {
-        logged_char = code_to_name[keycode];
-    }
-
-    // update keylog
-    logged_row = record->event.key.row;
-    logged_col = record->event.key.col;
-    logged_keycode = keycode;
-}
-
-void oled_render_keylog(void) {
-    oled_write(get_u8_str(logged_row, '0'), false);
-    oled_write_P(PSTR(":"), false);
-    oled_write(get_u8_str(logged_col, '0'), false);
-    oled_write_P(PSTR(", "), false);
-    oled_write(get_u16_str(logged_keycode, ' '), false);
-    oled_write_P(PSTR(" : "), false);
-    oled_write((const char *)&logged_char, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-#ifndef RGB_MATRIX_ENABLE
-// frame 0, 128x32px
-const char PROGMEM cat_frame_0 [] PROGMEM = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0,
-	0x60, 0x60, 0x60, 0x60, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x70, 0x38, 0x18, 0xec, 0x3c, 0x02, 0x02,
-	0x7a, 0x7a, 0xf2, 0xf2, 0x06, 0x04, 0x04, 0x0c, 0x0e, 0x0a, 0x1f, 0xfd, 0xf9, 0x39, 0x0f, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0xff, 0xff, 0x03, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc, 0xff, 0x01, 0x08, 0x3c, 0x00,
-	0x00, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x7e, 0x00, 0x00,
-	0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf0, 0xff, 0xff, 0x80, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x87, 0x83, 0xc0, 0x80, 0x88,
-	0x1e, 0x1e, 0x0f, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0xc0, 0xe0, 0xfe, 0x87, 0xbe, 0xf0, 0x00,
-	0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f,
-	0x12, 0x34, 0x34, 0x34, 0x34, 0x1e, 0x0e, 0x06, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-// frame 1, 128x32px
-const char PROGMEM cat_frame_1 [] PROGMEM = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x60,
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x60, 0x60, 0xe0, 0xf0, 0x90,
-	0x18, 0x08, 0x08, 0x88, 0x88, 0x98, 0x10, 0x10, 0x30, 0x30, 0x70, 0xf8, 0x08, 0x88, 0xf8, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0xff, 0xff, 0x01, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x04, 0x06, 0x07, 0x03, 0x01,
-	0xc0, 0x00, 0x00, 0x87, 0x87, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0xf0, 0x00,
-	0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf8, 0xff, 0xff, 0xc0, 0x80,
-	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x10, 0x30, 0xf0, 0xe0, 0x00,
-	0x01, 0x00, 0x60, 0xf0, 0xf0, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xc7, 0x00,
-	0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x02, 0x06,
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x02, 0x02, 0x07, 0x07, 0x07, 0x04, 0x07, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-// frame 2, 128x32px
-const char PROGMEM cat_frame_2 [] PROGMEM = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x60, 0x30,
-	0x38, 0x18, 0x18, 0x18, 0x18, 0x30, 0x30, 0x30, 0x78, 0x48, 0x78, 0xc0, 0x80, 0xc0, 0x40, 0x40,
-	0x40, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0x03, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x20, 0xf0, 0x80, 0x80, 0x60, 0x18, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1c, 0x3c,
-	0x7c, 0x38, 0x00, 0x00, 0x00, 0x01, 0x01, 0x07, 0x06, 0x3c, 0xff, 0xc3, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xff, 0xff, 0xf0, 0x80, 0x00,
-	0x00, 0x80, 0x80, 0x80, 0x00, 0x01, 0x00, 0x1e, 0x7f, 0xc0, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x0c,
-	0x8c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x0f, 0x18, 0x10, 0x18, 0x0f, 0x0e, 0x18, 0x10, 0x30, 0x27, 0x2f,
-	0x2f, 0x27, 0x20, 0x30, 0x10, 0x10, 0x10, 0x30, 0x3c, 0x2d, 0x27, 0x3c, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-const char* cat_frames[3] = {
-	cat_frame_0,
-	cat_frame_1,
-	cat_frame_2
-};
-
-#define FRAME_SIZE 528
-
-static int      current_frame = 0;
-static uint32_t frame_timer = 0;
-static uint32_t anim_sleep = 0;
-static uint8_t  anim_speed = 120;
-
-#endif
-
-void oled_render_logo(void) {
-#ifdef RGB_MATRIX_ENABLE
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-#endif
-#ifndef RGB_MATRIX_ENABLE
-    if(get_current_wpm() != 000) {
-        oled_on();
-        int8_t wpm_speed = (int8_t)(get_current_wpm() / 2);
-        if(wpm_speed < 100)
-        {
-            anim_speed = 120 - wpm_speed;
-        }
-        if(timer_elapsed32(frame_timer) > anim_speed) {
-            frame_timer = timer_read32();  // resets timer
-            current_frame = (current_frame + 1) % 3;
-        }
-        oled_write_raw_P(cat_frames[current_frame], FRAME_SIZE);
-        anim_sleep = timer_read32();
-    } else {
-        anim_speed = 150;
-        if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-             if(timer_elapsed32(frame_timer) > anim_speed) {
-                frame_timer = timer_read32();  // resets timer
-                current_frame = (current_frame + 1) % 3;
-            }
-            oled_write_raw_P(cat_frames[current_frame], FRAME_SIZE);
-        }
-    }
-#endif
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-#endif // OLED_ENABLE
-
-// saRcASm MOde
-bool tog_sarcasm = false;
-bool uppercase = false;
-uint8_t prev_upper = 0;
-uint8_t prev_lower = 0;
-uint8_t prev_mode = 0;
-HSV prev_hsv;
-
-
-bool process_record_sarcasm(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == KC_ENTER && record->event.pressed) {
-        uppercase = false;
-        return true;
-    }
-
-    if (uppercase == false && record->event.pressed)  { // Dont start with an uppercase letter on new line
-        uppercase = true;
-        return true;
-    }
-
-    if((KC_A <= keycode) && (keycode <= KC_Z)) {
-        if ( record->event.pressed ) {
-            bool press = rand() % 2;
-
-            if (prev_upper > 2) {           // if more than 3 lower's in a row print upper
-                prev_upper = 0;
-                press = false;
-            } else if (prev_lower > 2) {    // if more than 3 upper's in a row print lower
-                prev_lower = 0;
-                press = true;
-            }
-            if (press) {
-                prev_upper++;
-                tap_code16(S(keycode));
-                clear_mods();
-            } else {
-                prev_lower++;
-                tap_code16(keycode);
-            }
-        }
-        return false;
-    }
-
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-#ifdef OLED_ENABLE
-    if (record->event.pressed) {
-        set_keylog(keycode, record);
-    }
-#endif
-
-    switch (keycode) {
-        case KC_SCASM:
-            if (record->event.pressed) {
-                tog_sarcasm = !tog_sarcasm;
-
-                if (tog_sarcasm) {
-                    dprint("Enabling saRCaSm ModE\n");
-
-                    #ifdef RGB_MATRIX_ENABLE
-                    prev_hsv = rgb_matrix_get_hsv();
-                    prev_mode = rgb_matrix_get_mode();
-                    rgb_matrix_mode_noeeprom(RGB_MATRIX_ALPHAS_MODS);
-                    rgb_matrix_sethsv_noeeprom(HSV_YELLOW);
-                    #endif
-                }
-                else {
-                    dprint("Disabling saRCaSm ModE\n");
-                    #ifdef RGB_MATRIX_ENABLE
-                    rgb_matrix_mode_noeeprom(prev_mode);
-                    rgb_matrix_sethsv_noeeprom(prev_hsv.h, prev_hsv.s, prev_hsv.v);
-                    #endif
-                }
-
-                uppercase = false;
-                prev_upper = 0;
-                prev_lower = 0;
-            }
-            return false;
-    }
-
-    if (tog_sarcasm) {
-        return process_record_sarcasm(keycode, record);
-    }
-
-    return true;
-}
+// clang-format off
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c
new file mode 100644
index 0000000000..9a75e9fa9a
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c
@@ -0,0 +1,75 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jpe230.h"
+
+extern uint8_t logged_row;
+extern uint8_t logged_col;
+extern uint32_t oled_timer;
+static char logged_char = ' ';
+static uint16_t logged_keycode = 0;
+
+#define L_BASE 0
+#define L_LOWER 2
+#define L_RAISE 4
+#define L_ADJUST 8
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("Layer: "), false);
+    switch (layer_state) {
+        case L_BASE:
+            oled_write_ln_P(PSTR("Default"), false);
+            break;
+        case L_LOWER:
+            oled_write_ln_P(PSTR("Lower"), false);
+            break;
+        case L_RAISE:
+            oled_write_ln_P(PSTR("Raise"), false);
+            break;
+        case L_ADJUST:
+        case L_ADJUST|L_LOWER:
+        case L_ADJUST|L_RAISE:
+        case L_ADJUST|L_LOWER|L_RAISE:
+            oled_write_ln_P(PSTR("Adjust"), false);
+            break;
+    }
+}
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void handle_oled_keypress(uint16_t keycode, keyrecord_t *record) {
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+    if (keycode < 60) {
+        logged_char = code_to_name[keycode];
+    }
+
+    logged_keycode = keycode;
+}
+
+void oled_render_keylog(void) {
+    oled_write(get_u8_str(logged_row, '0'), false);
+    oled_write_P(PSTR(":"), false);
+    oled_write(get_u8_str(logged_col, '0'), false);
+    oled_write_P(PSTR(", "), false);
+    oled_write(get_u16_str(logged_keycode, ' '), false);
+    oled_write_P(PSTR(" : "), false);
+    oled_write((const char *)&logged_char, false);
+}
+
+void render_master_oled() {
+    if (timer_elapsed32(oled_timer) > CUSTOM_OLED_TIMEOUT) {
+        oled_off();
+        return;
+    }
+
+    oled_on();
+    oled_render_layer_state();
+    oled_render_keylog();
+}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c
new file mode 100644
index 0000000000..159413d083
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c
@@ -0,0 +1,14 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jpe230.h"
+
+void render_slave_oled() {
+    static const char PROGMEM crkbd_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0};
+    oled_write_P(crkbd_logo, false);
+}
+
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c
new file mode 100644
index 0000000000..67861e5b27
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c
@@ -0,0 +1,41 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jpe230.h"
+
+uint8_t logged_row;
+uint8_t logged_col;
+uint32_t oled_timer = 0;
+
+__attribute__ ((weak)) void handle_oled_keypress(uint16_t keycode, keyrecord_t *record) {}
+
+__attribute__ ((weak)) oled_rotation_t rotate_master(oled_rotation_t rotation) {return rotation;}
+__attribute__ ((weak)) oled_rotation_t rotate_slave(oled_rotation_t rotation) {return rotation;}
+
+void oled_timer_reset() { oled_timer = timer_read32(); }
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+
+    if (!is_keyboard_master()) {
+        return rotate_slave(rotation);
+    }
+
+    return rotate_master(rotation);
+}
+
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+    logged_row = record->event.key.row;
+    logged_col = record->event.key.col;
+
+    handle_oled_keypress(keycode, record);
+}
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        render_master_oled();
+    } else {
+        render_slave_oled();
+    }
+    return false;
+}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators.h b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators.h
new file mode 100644
index 0000000000..038d9eff2c
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators.h
@@ -0,0 +1,13 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jpe230.h"
+#include <stdio.h>
+
+#define ANIM_SIZE 352 // number of bytes in array, max is 1024 (minimize where possible)
+#define IDLE_FRAMES 67 //number of total frames
+
+void change_frame_up(uint8_t frame_number);
+void change_frame_down(uint8_t frame_number);
+const char first_frame[ANIM_SIZE];
+const uint8_t key_frame[4];
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_down.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_down.c
new file mode 100644
index 0000000000..c5d70f2063
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_down.c
@@ -0,0 +1,463 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "indicators.h"
+
+const uint8_t key_frame[4] = {10, 30, 46, 61};
+
+static const uint16_t cumsum_inds[IDLE_FRAMES+1] = {
+        0, 8, 50, 82, 113, 141, 199, 261, 283, 294, 294, 294, 294, 294, 294,
+        294, 330, 332, 377, 478, 588, 741, 844, 970, 1085, 1172, 1219, 1235, 1242, 1242,
+        1243, 1243, 1244, 1318, 1368, 1466, 1491, 1627, 1797, 1900, 2019, 2094, 2215, 2311, 2375,
+        2404, 2404, 2404, 2404, 2477, 2479, 2515, 2560, 2614, 2728, 2884, 2961, 3072, 3143, 3164,
+        3167, 3167, 3167, 3167, 3169, 3171, 3221, 3221,
+};
+
+static const uint16_t change_inds[3221] = {
+        173, 174, 175, 176, 177, 207, 208, 209, 135, 136, 137, 138, 139, 140, 141,
+        142, 143, 144, 145, 146, 147, 148, 167, 168, 169, 170, 171, 172, 173, 174,
+        175, 176, 177, 178, 179, 180, 206, 207, 208, 209, 210, 211, 212, 238, 239,
+        240, 241, 242, 243, 244, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+        144, 145, 146, 147, 148, 149, 166, 167, 168, 169, 171, 172, 181, 213, 238,
+        239, 240, 241, 242, 243, 244, 245, 134, 135, 136, 137, 138, 139, 140, 141,
+        142, 143, 144, 145, 146, 147, 148, 149, 166, 167, 168, 171, 172, 181, 213,
+        238, 239, 240, 241, 242, 243, 244, 245, 39, 102, 135, 136, 137, 138, 139,
+        140, 141, 142, 143, 144, 145, 146, 147, 148, 167, 169, 170, 171, 173, 238,
+        239, 240, 241, 242, 243, 244, 0, 2, 3, 4, 5, 7, 8, 10, 11,
+        12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+        27, 28, 29, 30, 39, 62, 94, 96, 97, 98, 100, 102, 126, 134, 136,
+        137, 140, 148, 158, 166, 180, 190, 198, 212, 222, 230, 244, 254, 262, 286,
+        294, 318, 326, 350, 0, 2, 3, 4, 5, 7, 8, 10, 11, 12, 13,
+        14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+        29, 30, 62, 64, 65, 66, 67, 94, 96, 97, 98, 99, 100, 102, 126,
+        131, 134, 158, 163, 166, 190, 195, 198, 222, 227, 230, 254, 259, 262, 286,
+        291, 294, 318, 323, 326, 350, 32, 33, 64, 65, 66, 67, 97, 99, 129,
+        131, 161, 163, 193, 195, 225, 227, 257, 259, 289, 291, 321, 323, 32, 33,
+        65, 97, 129, 161, 193, 225, 257, 289, 321, 136, 137, 138, 139, 140, 141,
+        142, 143, 144, 145, 146, 147, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+        177, 178, 179, 206, 207, 208, 209, 210, 211, 238, 239, 240, 241, 242, 243,
+        175, 176, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+        150, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+        182, 183, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+        213, 214, 108, 109, 110, 111, 112, 113, 114, 132, 133, 134, 135, 136, 137,
+        138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+        153, 154, 155, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+        176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 196, 197, 198,
+        199, 200, 201, 202, 203, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+        215, 216, 217, 218, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,
+        239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 38, 39,
+        40, 42, 43, 44, 45, 46, 47, 48, 50, 51, 54, 55, 56, 65, 66,
+        67, 90, 91, 92, 97, 108, 109, 110, 111, 112, 113, 114, 120, 121, 122,
+        123, 124, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+        146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 164, 165, 168, 169, 171,
+        172, 174, 182, 186, 187, 193, 194, 196, 197, 198, 199, 203, 207, 208, 210,
+        211, 213, 217, 218, 220, 221, 223, 228, 229, 230, 231, 232, 233, 234, 235,
+        236, 237, 238, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 261,
+        262, 264, 265, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48, 50, 51,
+        54, 55, 56, 65, 66, 67, 89, 90, 91, 92, 93, 94, 95, 97, 111,
+        112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 132, 133,
+        134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+        149, 150, 151, 152, 153, 154, 160, 161, 162, 163, 165, 166, 167, 168, 169,
+        170, 172, 179, 183, 184, 185, 186, 193, 194, 197, 198, 202, 205, 206, 207,
+        208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 220, 221, 223, 229,
+        230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+        245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 261, 262, 264, 265,
+        266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 290, 291, 292, 293,
+        294, 295, 296, 297, 320, 321, 62, 63, 84, 85, 86, 87, 88, 89, 90,
+        91, 92, 93, 94, 95, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+        115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+        137, 139, 140, 141, 142, 147, 150, 151, 152, 153, 160, 161, 162, 163, 181,
+        184, 185, 230, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 266,
+        267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+        282, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 320,
+        321, 322, 323, 324, 30, 31, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+        61, 62, 63, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+        85, 86, 87, 88, 89, 90, 91, 92, 93, 96, 97, 98, 99, 100, 101,
+        102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+        128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 250, 251, 252, 253, 254,
+        255, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+        284, 285, 286, 287, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
+        303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 320, 321, 322, 323,
+        324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 20, 21, 22, 23, 24,
+        25, 26, 27, 28, 29, 30, 31, 41, 42, 43, 44, 45, 46, 47, 48,
+        49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 64,
+        65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+        80, 81, 82, 83, 84, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+        106, 146, 280, 281, 282, 283, 284, 285, 286, 287, 301, 302, 303, 304, 305,
+        306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 323,
+        324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
+        339, 340, 341, 342, 343, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+        35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+        50, 51, 52, 53, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+        146, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 331, 332, 333, 334,
+        335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
+        350, 351, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+        13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 32, 33, 34, 35, 36,
+        37, 38, 39, 40, 41, 42, 43, 64, 341, 342, 343, 344, 345, 346, 347,
+        348, 349, 350, 351, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 32, 33, 351, 0, 1, 2, 3, 4, 5, 6, 146, 146, 135,
+        136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+        151, 152, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 177, 178, 179,
+        180, 181, 182, 183, 184, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+        208, 209, 210, 211, 212, 213, 214, 215, 216, 230, 231, 232, 233, 234, 235,
+        236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 137, 138,
+        139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 168, 169, 170,
+        171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 200, 201, 202,
+        203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 237, 238, 239,
+        240, 241, 242, 108, 109, 110, 111, 112, 113, 114, 132, 133, 134, 135, 136,
+        137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+        152, 153, 154, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+        176, 177, 178, 181, 182, 183, 184, 185, 186, 195, 196, 197, 198, 199, 200,
+        201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 213, 214, 215, 216,
+        217, 218, 219, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+        240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 108, 109, 110, 111,
+        112, 113, 114, 133, 134, 136, 144, 150, 154, 185, 195, 204, 211, 219, 231,
+        234, 235, 243, 244, 247, 250, 34, 35, 36, 37, 38, 41, 42, 43, 44,
+        45, 46, 47, 48, 49, 52, 53, 55, 64, 65, 89, 90, 91, 92, 122,
+        123, 124, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+        142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 161, 164,
+        166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 178, 182, 183, 184,
+        185, 186, 193, 196, 203, 204, 205, 206, 207, 208, 209, 210, 211, 217, 218,
+        225, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
+        241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 252, 285, 288, 289, 313,
+        314, 315, 316, 317, 323, 324, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+        336, 337, 338, 339, 340, 342, 343, 26, 27, 28, 29, 30, 31, 34, 35,
+        36, 37, 38, 41, 42, 43, 44, 45, 46, 47, 48, 49, 52, 53, 55,
+        64, 65, 89, 90, 91, 92, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+        104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 119,
+        120, 121, 122, 123, 124, 125, 126, 129, 130, 131, 132, 133, 134, 135, 136,
+        137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+        152, 153, 161, 165, 171, 172, 177, 183, 184, 185, 193, 197, 198, 199, 200,
+        201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 216, 217, 224, 225, 226,
+        227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+        242, 243, 244, 245, 246, 247, 248, 249, 250, 252, 281, 282, 283, 284, 285,
+        286, 287, 288, 289, 313, 314, 315, 316, 317, 323, 324, 327, 328, 329, 330,
+        331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 342, 343, 26, 27, 28,
+        29, 30, 31, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+        97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+        112, 113, 114, 115, 116, 117, 119, 120, 121, 122, 123, 124, 125, 126, 224,
+        225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+        240, 241, 242, 244, 245, 246, 247, 248, 256, 257, 258, 259, 260, 261, 262,
+        263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
+        278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 63, 64, 65, 66, 67,
+        68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+        83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+        98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+        113, 114, 115, 116, 117, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
+        266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280,
+        281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+        296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
+        311, 312, 313, 314, 315, 316, 317, 318, 319, 53, 54, 55, 56, 57, 58,
+        59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+        74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+        89, 90, 91, 92, 93, 94, 95, 288, 289, 290, 291, 292, 293, 294, 295,
+        296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
+        311, 312, 313, 314, 315, 316, 317, 318, 319, 32, 33, 34, 35, 36, 37,
+        38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+        53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+        68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+        83, 84, 85, 86, 87, 88, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+        297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+        312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326,
+        327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
+        342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+        35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+        50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 320,
+        321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+        336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
+        351, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+        14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+        29, 30, 31, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+        332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+        347, 348, 349, 350, 351, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+        10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+        25, 26, 27, 28, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+        145, 146, 147, 148, 149, 150, 151, 152, 166, 167, 168, 169, 170, 171, 173,
+        174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 198, 199, 200, 201,
+        202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+        231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
+        246, 247, 175, 176, 140, 141, 142, 143, 144, 145, 169, 170, 171, 172, 173,
+        174, 175, 176, 177, 178, 179, 180, 181, 199, 200, 201, 202, 203, 204, 205,
+        206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 137, 138, 139, 140, 141,
+        142, 143, 144, 145, 166, 167, 168, 169, 170, 173, 174, 175, 176, 182, 183,
+        196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 214, 215,
+        216, 217, 218, 241, 242, 243, 244, 245, 246, 247, 136, 137, 138, 139, 140,
+        141, 142, 143, 144, 145, 165, 166, 167, 168, 174, 175, 178, 179, 180, 181,
+        182, 183, 184, 195, 196, 197, 204, 216, 219, 227, 228, 229, 230, 231, 232,
+        233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
+        248, 249, 250, 251, 20, 21, 22, 23, 49, 50, 51, 52, 78, 79, 80,
+        107, 108, 109, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 165, 166,
+        167, 168, 174, 175, 178, 179, 180, 181, 182, 183, 184, 193, 194, 195, 196,
+        197, 204, 216, 219, 224, 225, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+        236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
+        251, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+        270, 271, 272, 273, 274, 275, 276, 320, 321, 322, 323, 324, 325, 326, 327,
+        328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 15, 16,
+        17, 18, 20, 21, 22, 23, 44, 45, 46, 47, 49, 50, 51, 52, 73,
+        74, 75, 76, 78, 79, 80, 102, 103, 104, 107, 108, 109, 131, 132, 133,
+        136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 160, 161, 162, 165, 166,
+        167, 168, 169, 173, 175, 181, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+        193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+        208, 216, 217, 218, 224, 225, 242, 243, 244, 245, 246, 247, 256, 257, 258,
+        259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+        274, 275, 276, 279, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
+        299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 320, 321,
+        322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
+        337, 338, 339, 340, 13, 14, 15, 16, 17, 18, 42, 43, 44, 45, 46,
+        47, 70, 71, 72, 73, 74, 75, 76, 99, 100, 101, 102, 103, 104, 128,
+        129, 130, 131, 132, 133, 160, 161, 162, 183, 184, 185, 186, 187, 188, 189,
+        190, 191, 208, 215, 216, 217, 247, 249, 279, 281, 288, 289, 290, 291, 292,
+        293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+        308, 309, 310, 311, 312, 313, 8, 9, 10, 11, 13, 14, 15, 16, 37,
+        38, 39, 40, 42, 43, 44, 45, 66, 67, 68, 69, 70, 71, 72, 73,
+        96, 97, 98, 99, 100, 101, 102, 128, 129, 130, 131, 156, 157, 158, 159,
+        160, 185, 186, 187, 188, 189, 190, 191, 208, 216, 217, 220, 249, 252, 281,
+        284, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+        302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 316, 320, 321,
+        322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
+        337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 3, 4, 5,
+        6, 8, 9, 10, 11, 32, 33, 34, 35, 37, 38, 39, 40, 64, 66,
+        67, 68, 69, 96, 97, 98, 156, 157, 158, 159, 188, 189, 191, 206, 208,
+        220, 223, 252, 255, 284, 287, 316, 319, 320, 321, 322, 323, 324, 325, 326,
+        327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
+        342, 343, 344, 345, 346, 347, 348, 351, 0, 1, 2, 3, 4, 5, 6,
+        32, 33, 34, 35, 64, 159, 191, 205, 206, 223, 255, 287, 319, 351, 0,
+        1, 2, 205, 207, 207, 216, 138, 139, 140, 141, 142, 143, 144, 145, 167,
+        168, 169, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180, 181, 182, 197,
+        198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+        213, 214, 215, 216, 217, 241, 242, 243, 244, 245, 246,
+};
+
+static const char change_vals[3221] = {
+        0x18, 0x1C, 0xFC, 0xFC, 0xFC, 0x0F, 0x0F, 0x0F, 0xE0, 0xE0, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8,
+        0xFC, 0xFC, 0xFE, 0xFE, 0xFE, 0xFC, 0xFC, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x1F,
+        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC,
+        0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0x00, 0x00, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x80, 0x80, 0x00, 0xE0, 0xE0, 0xE0, 0xE0,
+        0xF0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x00, 0x03, 0x03, 0x03, 0x01, 0x03,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x80, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0xFC, 0x00, 0xFF, 0xFF, 0x08, 0x04, 0x04, 0x02, 0xFE, 0xFF, 0xFF, 0xC0,
+        0xC0, 0xE0, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x08, 0x08, 0x04, 0xFC, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
+        0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00,
+        0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x80, 0x80, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF,
+        0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xA0, 0x60, 0x80, 0xC0, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0,
+        0x80, 0x06, 0x0F, 0x0F, 0x0F, 0x0F, 0x03, 0x81, 0xC1, 0xC1, 0xE1, 0xFB, 0xFF, 0x7F, 0x3F,
+        0x1F, 0x06, 0xF0, 0xF8, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xF7, 0xF3, 0xF1, 0xF1, 0xF0, 0xF0,
+        0xF0, 0xF0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xE0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFF,
+        0xFF, 0xFF, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0x7F, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE,
+        0xFC, 0xF8, 0xC0, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x80, 0xC0, 0xC0,
+        0xE0, 0xF0, 0xF8, 0xFC, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x1F, 0x0F, 0x03, 0x80, 0xE0, 0xF0,
+        0xF8, 0xF8, 0xFC, 0xFE, 0xFF, 0xBF, 0x9F, 0x9F, 0x8F, 0x87, 0x87, 0x83, 0x81, 0x81, 0x80,
+        0x80, 0x80, 0x80, 0x80, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F,
+        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x80, 0x40,
+        0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x80, 0xC0, 0x18,
+        0x04, 0x01, 0x04, 0xB0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20,
+        0x08, 0x03, 0x00, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFE, 0x7E, 0x3E, 0x3F, 0xBF, 0x7F,
+        0x7E, 0xFE, 0xFE, 0xFE, 0xFE, 0xFD, 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x43, 0x13, 0x0B, 0x07,
+        0x02, 0x80, 0x7F, 0x07, 0x00, 0x02, 0x01, 0x00, 0xC0, 0xE0, 0xF0, 0xFE, 0x8F, 0x87, 0x83,
+        0x81, 0x80, 0xC0, 0xA0, 0x10, 0x08, 0x04, 0x00, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+        0x8F, 0x4F, 0x2F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x40,
+        0x60, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x60, 0x30, 0x18, 0x0C, 0x02, 0x00, 0x80,
+        0x40, 0x40, 0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,
+        0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xFC, 0xFE, 0xFE, 0x7D, 0x7C, 0x7C, 0x7C, 0xFC, 0xFC, 0xF8,
+        0xF8, 0xF8, 0xF0, 0xE0, 0x80, 0x00, 0x04, 0x02, 0x01, 0x01, 0x00, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x01, 0xFF, 0x3F, 0x1F, 0x07, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFC, 0xFF, 0xCF, 0xCF,
+        0xC7, 0xC3, 0xC3, 0xC1, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x87, 0x87, 0x47, 0x27, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
+        0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x02, 0x01, 0xC0, 0x60, 0x30, 0x18,
+        0x0C, 0x04, 0x02, 0x01, 0x06, 0x01, 0x80, 0x40, 0x80, 0x80, 0x40, 0x20, 0x30, 0x18, 0x0C,
+        0x04, 0x02, 0x01, 0x00, 0x00, 0x80, 0x80, 0x40, 0x60, 0x20, 0x10, 0x08, 0x0C, 0x04, 0x02,
+        0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x30, 0x10, 0x08, 0x0C, 0x04, 0xC2, 0xF1,
+        0xF1, 0xF8, 0xF8, 0xFC, 0x7C, 0xF8, 0xF0, 0xE0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F,
+        0x0F, 0x00, 0x03, 0x07, 0x07, 0x07, 0x07, 0x00, 0x80, 0x80, 0x40, 0x60, 0x20, 0x30, 0x00,
+        0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x60, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02, 0x01,
+        0x01, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x18, 0x0C, 0x04, 0x02, 0x03, 0x01, 0x18,
+        0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0, 0x80, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06,
+        0x03, 0x01, 0x00, 0x80, 0x80, 0xC0, 0x60, 0x20, 0x30, 0x18, 0x0C, 0x04, 0x06, 0x03, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x60, 0x30, 0x30, 0x18, 0x0C,
+        0x04, 0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0x60,
+        0x60, 0x30, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0,
+        0x60, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06, 0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x80,
+        0xC0, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x01, 0x80, 0x80, 0xC0, 0x60, 0x70,
+        0x30, 0x18, 0x0C, 0x0E, 0x07, 0x03, 0x01, 0x80, 0x80, 0xC0, 0xE0, 0x60, 0x30, 0x18, 0x1C,
+        0x0C, 0x06, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
+        0x60, 0x70, 0x30, 0x18, 0x1C, 0x0C, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0xE0, 0x60, 0x30, 0x38, 0x18, 0x0C, 0x0C, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x0C,
+        0x0E, 0x06, 0x03, 0x03, 0x01, 0x80, 0xC0, 0xE0, 0x60, 0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07,
+        0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0x60,
+        0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0xE0, 0x70, 0x30, 0x38, 0x1C, 0x0C,
+        0x0E, 0x07, 0xC0, 0xE0, 0xE0, 0x70, 0x38, 0x3C, 0x1C, 0x0E, 0x0F, 0x07, 0x03, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x80, 0x3C, 0x1E, 0x0E, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFC, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0,
+        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0xE1, 0xE1, 0xE1, 0xE1, 0xF1, 0xFF, 0xFF, 0xFF, 0xBF, 0x1F, 0x38, 0x78, 0xFC,
+        0xFC, 0xF8, 0xF0, 0xE1, 0xE0, 0xE1, 0xF1, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xF0, 0xFC, 0xFE, 0xFE, 0xFF,
+        0xFF, 0xFF, 0x7F, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
+        0xFC, 0xF8, 0xF0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0xF8, 0xF8, 0xF8, 0xF8,
+        0xF8, 0xF8, 0xFC, 0xFF, 0xFF, 0xBF, 0x9F, 0x1F, 0x07, 0x60, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+        0xF0, 0xF0, 0x80, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x83, 0xC7, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFE, 0x30, 0x03, 0x07, 0x0F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
+        0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0xF8, 0xFC, 0xFE, 0x3F, 0xFE, 0xE0, 0x0F, 0x00, 0x81, 0xD7, 0x00, 0x0F,
+        0x1F, 0x1F, 0x1F, 0x1F, 0x0F, 0x01, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x80, 0x02, 0x01, 0x01, 0x02, 0x08, 0xE0, 0x40,
+        0x20, 0x0F, 0xF8, 0x08, 0x08, 0x08, 0xC8, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0x7E, 0x7E,
+        0x7E, 0x3E, 0x7E, 0x7E, 0xFE, 0xFC, 0xFC, 0xFC, 0xFC, 0xFA, 0xF1, 0x80, 0x00, 0xFF, 0x00,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x60, 0xF0, 0xF0, 0xF0, 0xF0, 0xF8, 0xBF, 0x9F, 0x1F,
+        0x07, 0x00, 0xFF, 0x00, 0xE0, 0xC1, 0x81, 0x81, 0x81, 0x81, 0x81, 0xC3, 0xFF, 0xFE, 0x00,
+        0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x07, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x01, 0x08, 0x10, 0x40, 0xFF, 0x40, 0x80, 0x80,
+        0x40, 0x20, 0x18, 0x07, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x0C, 0x18, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10,
+        0x10, 0x08, 0x08, 0x0C, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xF0,
+        0xF8, 0xF8, 0xF8, 0xF8, 0x7C, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0,
+        0xC0, 0x00, 0x00, 0x00, 0x03, 0x00, 0xF0, 0x1F, 0x0F, 0x00, 0x00, 0x00, 0x78, 0xF8, 0xF8,
+        0xF8, 0xF8, 0xF0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xE3, 0x7E, 0x00, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x41, 0x43, 0x43, 0x43, 0x47, 0x47, 0x47, 0x47, 0x47, 0x47, 0x47,
+        0x47, 0x07, 0x87, 0x83, 0x83, 0x81, 0x80, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02,
+        0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xC0, 0x40, 0x40, 0x60, 0x20, 0x30, 0x10, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+        0x18, 0x08, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+        0x10, 0x30, 0x30, 0x20, 0x20, 0x20, 0x60, 0x40, 0x40, 0xC0, 0x80, 0x18, 0x18, 0x18, 0x18,
+        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08,
+        0x0C, 0x0C, 0x0C, 0x0C, 0x04, 0x04, 0x06, 0x06, 0x02, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x06, 0x06, 0x06, 0x06,
+        0x06, 0x04, 0x04, 0x04, 0x0C, 0x0C, 0x0C, 0x08, 0x18, 0x80, 0x80, 0x80, 0x80, 0x80, 0xC0,
+        0xC0, 0xC0, 0x40, 0x60, 0x60, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10, 0x10, 0x30,
+        0x30, 0x30, 0x30, 0x30, 0x20, 0x20, 0x60, 0x60, 0x60, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0C, 0x0C, 0x0C,
+        0x0C, 0x0C, 0x0C, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+        0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
+        0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x60, 0x60, 0x60,
+        0x60, 0x60, 0x70, 0x70, 0x70, 0x30, 0x30, 0x30, 0x38, 0x38, 0x18, 0x18, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,
+        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0xC0, 0xC0,
+        0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+        0x80, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0xC0, 0x80, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x20, 0xE0, 0xF8, 0xFF, 0xFF, 0xFF,
+        0x3F, 0x07, 0x01, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x18, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3C,
+        0x3C, 0x3C, 0x3C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3C, 0x3C, 0xC0, 0xF0, 0xFC, 0xFE, 0xFC,
+        0xFE, 0xFE, 0x7E, 0x0C, 0xC0, 0xF0, 0xFE, 0xFF, 0xFF, 0x3F, 0x0F, 0x01, 0x00, 0xC0, 0xC0,
+        0xF8, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xF8, 0xF8, 0xF8, 0xF8, 0xFF, 0xFF,
+        0xF8, 0xF8, 0xF8, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x80, 0xF0, 0xFE, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0x3F, 0x07, 0xC0, 0xF0, 0xFE, 0xFF, 0x07, 0x00, 0xE0, 0xE0, 0xE0, 0xE0,
+        0xE0, 0xE0, 0xE0, 0xF8, 0xFE, 0xFF, 0xF8, 0xFF, 0xF8, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F,
+        0x1F, 0x01, 0x01, 0x01, 0x80, 0x30, 0x0C, 0x01, 0x80, 0x30, 0x04, 0x01, 0xC0, 0x10, 0x06,
+        0xC0, 0x18, 0x06, 0x60, 0x98, 0xF3, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x7C, 0x0C, 0x60, 0x88,
+        0xF3, 0xFC, 0x0F, 0x01, 0xC0, 0xC0, 0xC0, 0xF0, 0xC0, 0xC0, 0x00, 0x80, 0x20, 0x0C, 0xF1,
+        0xFE, 0xF9, 0xF8, 0x00, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x00, 0x00, 0x00,
+        0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x70,
+        0x0C, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x0E, 0x01, 0x00, 0x00, 0x00, 0x00, 0xC0,
+        0x38, 0x06, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x07, 0x00, 0x00, 0x00, 0xE0, 0x18, 0x07,
+        0x00, 0x00, 0xC0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0x78, 0x18, 0x60, 0x1C, 0x03, 0x00, 0x00,
+        0xC0, 0xF8, 0xFE, 0x7F, 0x03, 0xC0, 0xFC, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+        0x00, 0x00, 0x00, 0x00, 0x78, 0x7E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7D, 0x7C, 0x7C, 0x7C,
+        0x7C, 0xFC, 0x78, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0xFF, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x07, 0x01, 0x00, 0x00, 0xE0, 0x38, 0x07, 0x01, 0x00,
+        0x00, 0x80, 0xE0, 0x1C, 0x07, 0x00, 0x00, 0x00, 0x80, 0x70, 0x1C, 0x03, 0x00, 0x00, 0x80,
+        0x70, 0x0E, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x78, 0x7C, 0x7C, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x3F, 0xC0, 0x78, 0x1E, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC0,
+        0x78, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x38, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00,
+        0x3C, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x7C, 0x78, 0x78, 0xFF, 0x00, 0xFF, 0x00,
+        0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x30, 0x30,
+        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3F, 0xC0, 0xF8, 0x1E,
+        0x07, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x78, 0x1F, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0xFF, 0x78, 0x78,
+        0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x3F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x7C, 0x78, 0x7C, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+uint16_t index_start2 = 0;
+uint16_t index_end2 = 0;
+void change_frame_up(uint8_t frame_number){
+// for n changes this frame, change those bytes by change_inds and change_vals
+        index_start2 = cumsum_inds[frame_number-1];
+        index_end2 = cumsum_inds[frame_number];
+        if (index_start2 != index_end2){  // if a change in buffer
+                for (uint16_t i=index_start2; i < index_end2; i++){
+                        oled_write_raw_byte(change_vals[i], change_inds[i]);
+                }
+        }
+}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_up.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_up.c
new file mode 100644
index 0000000000..2912838012
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_up.c
@@ -0,0 +1,461 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "indicators.h"
+
+static const uint16_t cumsum_inds[IDLE_FRAMES+1] = {
+        0, 50, 52, 54, 54, 54, 54, 57, 78, 149, 260, 337, 493, 607, 661,
+        706, 742, 744, 817, 817, 817, 817, 846, 910, 1006, 1127, 1202, 1321, 1424, 1594,
+        1730, 1755, 1853, 1903, 1977, 1978, 1978, 1979, 1979, 1986, 2002, 2049, 2136, 2251, 2377,
+        2480, 2633, 2743, 2844, 2889, 2891, 2927, 2927, 2927, 2927, 2927, 2927, 2927, 2938, 2960,
+        3022, 3080, 3108, 3139, 3171, 3213, 3221, 3221,
+};
+
+static const uint16_t change_inds[3221] = {
+        138, 139, 140, 141, 142, 143, 144, 145, 167, 168, 169, 170, 171, 172, 173,
+        174, 175, 177, 178, 179, 180, 181, 182, 197, 198, 199, 200, 201, 202, 203,
+        204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 241,
+        242, 243, 244, 245, 246, 207, 216, 205, 207, 0, 1, 2, 0, 1, 2,
+        3, 4, 5, 6, 32, 33, 34, 35, 64, 159, 191, 205, 206, 223, 255,
+        287, 319, 351, 3, 4, 5, 6, 8, 9, 10, 11, 32, 33, 34, 35,
+        37, 38, 39, 40, 64, 66, 67, 68, 69, 96, 97, 98, 156, 157, 158,
+        159, 188, 189, 191, 206, 208, 220, 223, 252, 255, 284, 287, 316, 319, 320,
+        321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+        336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 351, 8,
+        9, 10, 11, 13, 14, 15, 16, 37, 38, 39, 40, 42, 43, 44, 45,
+        66, 67, 68, 69, 70, 71, 72, 73, 96, 97, 98, 99, 100, 101, 102,
+        128, 129, 130, 131, 156, 157, 158, 159, 160, 185, 186, 187, 188, 189, 190,
+        191, 208, 216, 217, 220, 249, 252, 281, 284, 288, 289, 290, 291, 292, 293,
+        294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308,
+        309, 310, 311, 312, 313, 316, 320, 321, 322, 323, 324, 325, 326, 327, 328,
+        329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+        344, 345, 346, 347, 348, 13, 14, 15, 16, 17, 18, 42, 43, 44, 45,
+        46, 47, 70, 71, 72, 73, 74, 75, 76, 99, 100, 101, 102, 103, 104,
+        128, 129, 130, 131, 132, 133, 160, 161, 162, 183, 184, 185, 186, 187, 188,
+        189, 190, 191, 208, 215, 216, 217, 247, 249, 279, 281, 288, 289, 290, 291,
+        292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
+        307, 308, 309, 310, 311, 312, 313, 15, 16, 17, 18, 20, 21, 22, 23,
+        44, 45, 46, 47, 49, 50, 51, 52, 73, 74, 75, 76, 78, 79, 80,
+        102, 103, 104, 107, 108, 109, 131, 132, 133, 136, 137, 138, 139, 140, 141,
+        142, 143, 144, 145, 160, 161, 162, 165, 166, 167, 168, 169, 173, 175, 181,
+        183, 184, 185, 186, 187, 188, 189, 190, 191, 193, 194, 195, 196, 197, 198,
+        199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 216, 217, 218, 224, 225,
+        242, 243, 244, 245, 246, 247, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+        265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 279, 288, 289,
+        290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+        305, 306, 307, 308, 309, 310, 311, 320, 321, 322, 323, 324, 325, 326, 327,
+        328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 20, 21,
+        22, 23, 49, 50, 51, 52, 78, 79, 80, 107, 108, 109, 136, 137, 138,
+        139, 140, 141, 142, 143, 144, 145, 165, 166, 167, 168, 174, 175, 178, 179,
+        180, 181, 182, 183, 184, 193, 194, 195, 196, 197, 204, 216, 219, 224, 225,
+        227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+        242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 256, 257, 258, 259, 260,
+        261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
+        276, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333,
+        334, 335, 336, 337, 338, 339, 340, 136, 137, 138, 139, 140, 141, 142, 143,
+        144, 145, 165, 166, 167, 168, 174, 175, 178, 179, 180, 181, 182, 183, 184,
+        195, 196, 197, 204, 216, 219, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+        236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
+        251, 137, 138, 139, 140, 141, 142, 143, 144, 145, 166, 167, 168, 169, 170,
+        173, 174, 175, 176, 182, 183, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+        205, 206, 207, 208, 214, 215, 216, 217, 218, 241, 242, 243, 244, 245, 246,
+        247, 140, 141, 142, 143, 144, 145, 169, 170, 171, 172, 173, 174, 175, 176,
+        177, 178, 179, 180, 181, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+        209, 210, 211, 212, 213, 214, 215, 175, 176, 134, 135, 136, 137, 138, 139,
+        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 166, 167,
+        168, 169, 170, 171, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+        184, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+        212, 213, 214, 215, 216, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
+        241, 242, 243, 244, 245, 246, 247, 0, 1, 2, 3, 4, 5, 6, 7,
+        8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+        23, 24, 25, 26, 27, 28, 0, 1, 2, 3, 4, 5, 6, 7, 8,
+        9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+        24, 25, 26, 27, 28, 29, 30, 31, 320, 321, 322, 323, 324, 325, 326,
+        327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
+        342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+        35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+        50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 320,
+        321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+        336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
+        351, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+        46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+        61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+        76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 288, 289,
+        290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+        305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+        320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+        335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
+        350, 351, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+        66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+        81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+        288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
+        303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
+        318, 319, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+        76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+        91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+        106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 256, 257, 258,
+        259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+        274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288,
+        289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+        304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
+        319, 26, 27, 28, 29, 30, 31, 85, 86, 87, 88, 89, 90, 91, 92,
+        93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+        108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 119, 120, 121, 122, 123,
+        124, 125, 126, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+        236, 237, 238, 239, 240, 241, 242, 244, 245, 246, 247, 248, 256, 257, 258,
+        259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+        274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 26,
+        27, 28, 29, 30, 31, 34, 35, 36, 37, 38, 41, 42, 43, 44, 45,
+        46, 47, 48, 49, 52, 53, 55, 64, 65, 89, 90, 91, 92, 95, 96,
+        97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+        112, 113, 114, 115, 116, 117, 119, 120, 121, 122, 123, 124, 125, 126, 129,
+        130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+        145, 146, 147, 148, 149, 150, 151, 152, 153, 161, 165, 171, 172, 177, 183,
+        184, 185, 193, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+        209, 210, 216, 217, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
+        235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+        250, 252, 281, 282, 283, 284, 285, 286, 287, 288, 289, 313, 314, 315, 316,
+        317, 323, 324, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
+        339, 340, 342, 343, 34, 35, 36, 37, 38, 41, 42, 43, 44, 45, 46,
+        47, 48, 49, 52, 53, 55, 64, 65, 89, 90, 91, 92, 122, 123, 124,
+        129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+        144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 161, 164, 166, 167,
+        168, 169, 170, 171, 172, 173, 174, 175, 176, 178, 182, 183, 184, 185, 186,
+        193, 196, 203, 204, 205, 206, 207, 208, 209, 210, 211, 217, 218, 225, 227,
+        228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+        243, 244, 245, 246, 247, 248, 249, 250, 252, 285, 288, 289, 313, 314, 315,
+        316, 317, 323, 324, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
+        338, 339, 340, 342, 343, 108, 109, 110, 111, 112, 113, 114, 133, 134, 136,
+        144, 150, 154, 185, 195, 204, 211, 219, 231, 234, 235, 243, 244, 247, 250,
+        108, 109, 110, 111, 112, 113, 114, 132, 133, 134, 135, 136, 137, 138, 139,
+        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
+        164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
+        181, 182, 183, 184, 185, 186, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+        204, 205, 206, 207, 208, 209, 210, 211, 213, 214, 215, 216, 217, 218, 219,
+        228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+        243, 244, 245, 246, 247, 248, 249, 250, 137, 138, 139, 140, 141, 142, 143,
+        144, 145, 146, 147, 148, 149, 150, 168, 169, 170, 171, 172, 173, 174, 175,
+        176, 177, 178, 179, 180, 181, 182, 200, 201, 202, 203, 204, 205, 206, 207,
+        208, 209, 210, 211, 212, 213, 214, 237, 238, 239, 240, 241, 242, 135, 136,
+        137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+        152, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180,
+        181, 182, 183, 184, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+        209, 210, 211, 212, 213, 214, 215, 216, 230, 231, 232, 233, 234, 235, 236,
+        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 146, 146, 0,
+        1, 2, 3, 4, 5, 6, 0, 1, 2, 3, 4, 5, 6, 7, 8,
+        9, 10, 11, 12, 32, 33, 351, 0, 1, 2, 3, 4, 5, 6, 7,
+        8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+        32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 341, 342,
+        343, 344, 345, 346, 347, 348, 349, 350, 351, 10, 11, 12, 13, 14, 15,
+        16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+        31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+        46, 47, 48, 49, 50, 51, 52, 53, 64, 65, 66, 67, 68, 69, 70,
+        71, 72, 73, 74, 146, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+        331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+        346, 347, 348, 349, 350, 351, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+        29, 30, 31, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+        53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 64, 65, 66, 67, 68,
+        69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+        84, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 146, 280, 281,
+        282, 283, 284, 285, 286, 287, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+        310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 323, 324, 325, 326, 327,
+        328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342,
+        343, 30, 31, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+        73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+        88, 89, 90, 91, 92, 93, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+        105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 128, 129, 130,
+        131, 132, 133, 134, 135, 136, 137, 250, 251, 252, 253, 254, 255, 270, 271,
+        272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
+        287, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+        306, 307, 308, 309, 310, 311, 312, 313, 320, 321, 322, 323, 324, 325, 326,
+        327, 328, 329, 330, 331, 332, 333, 62, 63, 84, 85, 86, 87, 88, 89,
+        90, 91, 92, 93, 94, 95, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+        114, 115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133, 134, 135,
+        136, 137, 139, 140, 141, 142, 147, 150, 151, 152, 153, 160, 161, 162, 163,
+        181, 184, 185, 230, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+        266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280,
+        281, 282, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
+        320, 321, 322, 323, 324, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48,
+        50, 51, 54, 55, 56, 65, 66, 67, 89, 90, 91, 92, 93, 94, 95,
+        97, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+        132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+        147, 148, 149, 150, 151, 152, 153, 154, 160, 161, 162, 163, 165, 166, 167,
+        168, 169, 170, 172, 179, 183, 184, 185, 186, 193, 194, 197, 198, 202, 205,
+        206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 220, 221,
+        223, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+        243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 261, 262,
+        264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 290, 291,
+        292, 293, 294, 295, 296, 297, 320, 321, 38, 39, 40, 42, 43, 44, 45,
+        46, 47, 48, 50, 51, 54, 55, 56, 65, 66, 67, 90, 91, 92, 97,
+        108, 109, 110, 111, 112, 113, 114, 120, 121, 122, 123, 124, 132, 133, 134,
+        135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 146, 147, 148, 149, 150,
+        151, 152, 153, 154, 155, 164, 165, 168, 169, 171, 172, 174, 182, 186, 187,
+        193, 194, 196, 197, 198, 199, 203, 207, 208, 210, 211, 213, 217, 218, 220,
+        221, 223, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 241, 242,
+        243, 244, 245, 246, 247, 248, 249, 250, 251, 261, 262, 264, 265, 108, 109,
+        110, 111, 112, 113, 114, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+        142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 164,
+        165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+        180, 181, 182, 183, 184, 185, 186, 187, 196, 197, 198, 199, 200, 201, 202,
+        203, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
+        228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+        243, 244, 245, 246, 247, 248, 249, 250, 251, 137, 138, 139, 140, 141, 142,
+        143, 144, 145, 146, 147, 148, 149, 150, 168, 169, 170, 171, 172, 173, 174,
+        175, 176, 177, 178, 179, 180, 181, 182, 183, 200, 201, 202, 203, 204, 205,
+        206, 207, 208, 209, 210, 211, 212, 213, 214, 175, 176, 136, 137, 138, 139,
+        140, 141, 142, 143, 144, 145, 146, 147, 168, 169, 170, 171, 172, 173, 174,
+        175, 176, 177, 178, 179, 206, 207, 208, 209, 210, 211, 238, 239, 240, 241,
+        242, 243, 32, 33, 65, 97, 129, 161, 193, 225, 257, 289, 321, 32, 33,
+        64, 65, 66, 67, 97, 99, 129, 131, 161, 163, 193, 195, 225, 227, 257,
+        259, 289, 291, 321, 323, 0, 2, 3, 4, 5, 7, 8, 10, 11, 12,
+        13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+        28, 29, 30, 62, 64, 65, 66, 67, 94, 96, 97, 98, 99, 100, 102,
+        126, 131, 134, 158, 163, 166, 190, 195, 198, 222, 227, 230, 254, 259, 262,
+        286, 291, 294, 318, 323, 326, 350, 0, 2, 3, 4, 5, 7, 8, 10,
+        11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+        26, 27, 28, 29, 30, 39, 62, 94, 96, 97, 98, 100, 102, 126, 134,
+        136, 137, 140, 148, 158, 166, 180, 190, 198, 212, 222, 230, 244, 254, 262,
+        286, 294, 318, 326, 350, 39, 102, 135, 136, 137, 138, 139, 140, 141, 142,
+        143, 144, 145, 146, 147, 148, 167, 169, 170, 171, 173, 238, 239, 240, 241,
+        242, 243, 244, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+        146, 147, 148, 149, 166, 167, 168, 171, 172, 181, 213, 238, 239, 240, 241,
+        242, 243, 244, 245, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+        145, 146, 147, 148, 149, 166, 167, 168, 169, 171, 172, 181, 213, 238, 239,
+        240, 241, 242, 243, 244, 245, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+        144, 145, 146, 147, 148, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+        177, 178, 179, 180, 206, 207, 208, 209, 210, 211, 212, 238, 239, 240, 241,
+        242, 243, 244, 173, 174, 175, 176, 177, 207, 208, 209,
+};
+
+static const char change_vals[3221] = {
+        0xC0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0x78, 0x18, 0xC0, 0xF8, 0xFE, 0xFF, 0xFF, 0xFF, 0x7F,
+        0x0F, 0x03, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x78, 0x7E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
+        0x7D, 0x7C, 0x7C, 0x7C, 0x78, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7C, 0x7C, 0x78, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x78, 0x78, 0x78, 0x7C, 0x3F, 0x07, 0x01, 0x00, 0x00, 0x00,
+        0xC0, 0xF8, 0x1E, 0x07, 0xE0, 0x78, 0x1F, 0x03, 0x03, 0xF0, 0xFF, 0x7C, 0x78, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x78, 0x1E, 0x03, 0x00, 0x00, 0x00, 0x00,
+        0xC0, 0x78, 0x0F, 0x03, 0x00, 0xE0, 0x38, 0x0F, 0x01, 0x3C, 0x0F, 0x01, 0x80, 0x80, 0x80,
+        0x80, 0xFF, 0x01, 0x00, 0x7C, 0x7C, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x30,
+        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3F, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0xC0, 0x38, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x38, 0x07, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xE0, 0x1C, 0x07, 0x00, 0x00, 0x00, 0x80, 0x70, 0x1C, 0x03,
+        0x80, 0x70, 0x0E, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFE, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x78, 0x7C, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x70, 0x0C, 0x03, 0x00, 0x00, 0xC0, 0x30,
+        0x0E, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x06, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x07,
+        0x00, 0x00, 0x00, 0xE0, 0x18, 0x07, 0x60, 0x1C, 0x03, 0xFC, 0x04, 0x04, 0x04, 0x04, 0x04,
+        0x04, 0x04, 0x04, 0x7C, 0xFF, 0xFC, 0x78, 0xFF, 0x00, 0xFF, 0x00, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x30, 0x0C, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x30, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x10, 0x06,
+        0x00, 0x00, 0x00, 0xC0, 0x18, 0x06, 0x00, 0x00, 0x00, 0x60, 0x98, 0xF3, 0xFC, 0xFC, 0xFC,
+        0xFC, 0xFC, 0x7C, 0x0C, 0x00, 0x00, 0x00, 0x60, 0x88, 0xF3, 0xFC, 0xFF, 0x3F, 0x01, 0xF0,
+        0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x0C, 0xF1, 0xFE, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x0C, 0x01,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xF0, 0xFE,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x07, 0xC0, 0xF0, 0xFE, 0xFF, 0x07, 0x00, 0xE0, 0xE0,
+        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0x00, 0x00, 0xF8, 0xFE, 0xFF, 0xF8, 0xFF, 0xF8, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x1F,
+        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xF0, 0xFC, 0xFE, 0xFC, 0xFE, 0xFE,
+        0x7E, 0x0C, 0x00, 0xC0, 0xF0, 0xFE, 0x0F, 0x01, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x00,
+        0x00, 0xF8, 0xFE, 0xF9, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x20, 0x00, 0x00, 0x00, 0xE0, 0xF8,
+        0xFF, 0x3F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
+        0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xF8,
+        0xF8, 0x7C, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0, 0xC0, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF8, 0xFF, 0xFF, 0xFF, 0xBF, 0x1F,
+        0x0F, 0x78, 0xF8, 0xF8, 0xF8, 0xF8, 0xF0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xE3, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
+        0xC0, 0xC0, 0xC0, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x70,
+        0x70, 0x30, 0x30, 0x30, 0x38, 0x38, 0x18, 0x18, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
+        0xC0, 0xC0, 0xC0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18,
+        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+        0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x03, 0x03, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+        0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xC0, 0xC0, 0xC0,
+        0x40, 0x60, 0x60, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18, 0x18,
+        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+        0x18, 0x18, 0x10, 0x10, 0x10, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x20, 0x60, 0x60, 0x60,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x18, 0x18,
+        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x08, 0x08, 0x08,
+        0x08, 0x08, 0x0C, 0x0C, 0x0C, 0x0C, 0x04, 0x04, 0x06, 0x06, 0x02, 0x03, 0x03, 0x01, 0x01,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x0C, 0x0C, 0x0C,
+        0x08, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xC0, 0x40,
+        0x40, 0x60, 0x20, 0x30, 0x10, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0x08,
+        0x08, 0x08, 0x08, 0x08, 0x18, 0x08, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10,
+        0x10, 0x10, 0x10, 0x10, 0x10, 0x30, 0x30, 0x20, 0x20, 0x20, 0x60, 0x40, 0x40, 0xC0, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x01, 0x01, 0x02, 0x04, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x0C,
+        0x04, 0x02, 0x01, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 0x43, 0x43, 0x43, 0x47,
+        0x47, 0x47, 0x47, 0x47, 0x47, 0x47, 0x47, 0x87, 0x83, 0x83, 0x81, 0x80, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x80, 0x02, 0x01, 0x01, 0x02, 0x08, 0xE0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x0F, 0x00, 0x00, 0xF8,
+        0x08, 0x08, 0x08, 0xC8, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0x7E, 0x7E, 0x7E, 0x3E, 0x7E,
+        0x7E, 0xFE, 0xFC, 0xFC, 0xFC, 0xFC, 0xFA, 0xF1, 0x80, 0xFF, 0x01, 0x01, 0x60, 0xF8, 0x9F,
+        0x1F, 0x07, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xE0, 0xC1, 0x81, 0x81, 0x81, 0x81,
+        0x81, 0xC3, 0xFF, 0xFE, 0x00, 0x01, 0x00, 0x02, 0x02, 0x02, 0x03, 0x03, 0x07, 0x07, 0x0F,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x01, 0x08,
+        0x10, 0x40, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x20, 0x18,
+        0x07, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFF, 0xFF, 0x7F, 0x3F, 0x3F, 0x1F, 0x1F,
+        0x3F, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE, 0xFC, 0xF8, 0xE0, 0x00, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x00, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xFC, 0xFF, 0xBF, 0x9F, 0x0F, 0x07,
+        0x00, 0xF0, 0x80, 0x81, 0x01, 0x01, 0x01, 0x01, 0x03, 0x83, 0xD7, 0xFF, 0xFE, 0x00, 0x00,
+        0x03, 0x07, 0x0F, 0x0F, 0x1F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
+        0x1F, 0x1F, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xFC, 0xFE, 0xFF,
+        0x1F, 0xFF, 0xF0, 0x1F, 0x60, 0x01, 0xC7, 0x30, 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x1F, 0x03,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, 0xE0,
+        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0xE1, 0xE1, 0xE1, 0xE1, 0xF1, 0xFF,
+        0xBF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x78, 0xFC, 0xFC,
+        0xF8, 0xF0, 0xE1, 0xE0, 0xE1, 0xF1, 0xFF, 0xFF, 0x7F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
+        0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xF0,
+        0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0x7C, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0,
+        0xC0, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x01, 0x80, 0x80, 0xC0, 0xF0, 0xF8, 0xFF, 0xFF,
+        0x7F, 0x7F, 0x3F, 0x0F, 0xC0, 0xF0, 0xF8, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF, 0xCF, 0xCF, 0xC7,
+        0xC3, 0xC3, 0xC1, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xF8, 0xFC, 0x3C,
+        0x1E, 0x0E, 0x07, 0x07, 0x03, 0x01, 0xC0, 0xE0, 0xE0, 0x70, 0x38, 0x3C, 0x1C, 0x0E, 0x0F,
+        0x07, 0x03, 0x01, 0x01, 0x01, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x80, 0xC0, 0xE0, 0x60, 0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x03, 0x01, 0x01,
+        0xC0, 0xE0, 0x60, 0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x03, 0x03, 0x01, 0x01, 0x80, 0xC0,
+        0xC0, 0xE0, 0x70, 0x30, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x0C, 0x0E, 0x07, 0x03,
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0xE0, 0x60,
+        0x30, 0x18, 0x1C, 0x0C, 0x06, 0x03, 0x03, 0x01, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x1C, 0x0C,
+        0x06, 0x07, 0x03, 0x01, 0xF8, 0x80, 0x80, 0xC0, 0xE0, 0x60, 0x30, 0x38, 0x18, 0x0C, 0x0C,
+        0x80, 0xC0, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x0C, 0x0E, 0x06, 0x03, 0x03, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+        0x80, 0xC0, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0x60, 0x20, 0x30, 0x18, 0x0C, 0x04, 0x06, 0x03,
+        0x01, 0xC0, 0x60, 0x30, 0x30, 0x18, 0x0C, 0x04, 0x06, 0x03, 0x01, 0x01, 0xFC, 0x80, 0x80,
+        0xC0, 0x60, 0x60, 0x30, 0x10, 0x18, 0x80, 0xC0, 0x60, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06,
+        0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x60, 0x30, 0x18,
+        0x18, 0x0C, 0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20,
+        0x30, 0x18, 0x0C, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x80, 0x80, 0x40, 0x60, 0x20, 0x10, 0x08, 0x0C, 0x04, 0x02, 0x01, 0x01, 0x40, 0x20, 0x30,
+        0x10, 0x08, 0x0C, 0x04, 0xC2, 0xF1, 0xF1, 0x80, 0x80, 0x40, 0x60, 0x20, 0x30, 0x80, 0x80,
+        0x40, 0x60, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x18, 0x0C, 0x04, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+        0x40, 0x60, 0x30, 0x18, 0x0C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40,
+        0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xC0, 0xE0,
+        0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0x7D, 0xFC, 0xF8, 0xF0, 0xE0, 0x80, 0x04, 0x02, 0x01, 0x01,
+        0xFF, 0x1F, 0x07, 0x07, 0x87, 0x87, 0x47, 0x27, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02,
+        0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x06, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x40, 0x40, 0x80, 0xC0, 0x18, 0x04, 0x00, 0x01, 0x04, 0xB0, 0x00, 0x00, 0x00,
+        0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x08, 0x03,
+        0x00, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFE, 0x7E, 0x3E, 0x3F, 0xBF, 0x7F, 0x3F, 0x7E,
+        0xFE, 0xFE, 0xFE, 0xFE, 0xFD, 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x03, 0x03,
+        0x13, 0x0B, 0x03, 0x02, 0xFC, 0x7F, 0x3F, 0x1F, 0x07, 0x02, 0x01, 0xC0, 0xE0, 0xFE, 0xBF,
+        0x9F, 0x8F, 0x87, 0x87, 0x83, 0x81, 0x81, 0x80, 0x80, 0x80, 0x80, 0xC0, 0xA0, 0x10, 0x08,
+        0x04, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x8F, 0x4F, 0x2F, 0x1F, 0x1F, 0x0F, 0x0F,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60,
+        0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF8, 0xFC,
+        0xFE, 0xFE, 0xFF, 0xFF, 0xFF, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x3F, 0x7F, 0xFF, 0xFF, 0xFF,
+        0xFE, 0xFE, 0xFC, 0xF8, 0xC0, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0xC0, 0xFF, 0x0F, 0x03,
+        0x00, 0x00, 0x80, 0xE0, 0xF0, 0xF8, 0xFF, 0x9F, 0x8F, 0x87, 0x83, 0x81, 0x80, 0x80, 0x00,
+        0x00, 0x00, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F,
+        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
+        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x06, 0x0F, 0x0F, 0x0F, 0x0F, 0x03, 0x81, 0xC1, 0xC1, 0xE1, 0xFB, 0xFF,
+        0x7F, 0x3F, 0x1F, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF8, 0xFC,
+        0xFE, 0xFF, 0xFF, 0xF7, 0xF3, 0xF1, 0xF1, 0xF0, 0xF0, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xA0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, 0xE0, 0xE0,
+        0xE0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x80, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+        0x08, 0x08, 0x04, 0xFC, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00,
+        0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x80, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x08, 0x04, 0x04, 0x00, 0x02, 0xFE,
+        0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF,
+        0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
+        0xE0, 0xE0, 0xF0, 0xF8, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x03, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0xFE,
+        0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0x03, 0x01, 0x01, 0x01, 0x00, 0x0F, 0x0F, 0x0F, 0x0F,
+        0x0F, 0x0F, 0x0F, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x01, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x1F, 0x1F, 0x1F, 0x1F,
+        0x1F, 0x1F, 0x1F, 0x1F, 0x00, 0xE0, 0xE0, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8, 0xFC, 0xFC, 0xFE,
+        0xFE, 0xFE, 0xFC, 0xFC, 0x00, 0x00, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x0F, 0x0F,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1C, 0xFC, 0xFC,
+        0xFC, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+uint16_t index_start = 0;
+uint16_t index_end = 0;
+void change_frame_down(uint8_t frame_number){
+// for n changes this frame, change those bytes by change_inds and change_vals
+        index_start = cumsum_inds[frame_number-1];
+        index_end = cumsum_inds[frame_number];
+        if (index_start != index_end){  // if a change in buffer
+                for (uint16_t i=index_start; i < index_end; i++){
+                        oled_write_raw_byte(change_vals[i], change_inds[i]);
+                }
+        }
+}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c
new file mode 100644
index 0000000000..a2230e5ee1
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jpe230.h"
+#include "indicators.h"
+
+extern uint8_t logged_row, logged_col;
+extern uint32_t oled_timer;
+extern const uint8_t key_frame[4];
+
+static uint32_t frame_limiter;
+
+void oled_render_layer_state(void) {
+    int current_layer_idx = get_highest_layer(layer_state | default_layer_state);
+    static int current_frame = 0;
+    static bool first_run = 1;
+
+    if(first_run){
+        first_run = 0;
+        char clear[ANIM_SIZE] = {0};
+        memset(clear, 0, ANIM_SIZE);
+        oled_write_raw_P(clear, ANIM_SIZE);
+        frame_limiter = timer_read();
+        return;
+    }
+
+    if (timer_elapsed(frame_limiter) < 12) {
+        return;
+    }
+
+    frame_limiter = timer_read();
+
+    if(current_frame < key_frame[current_layer_idx]){
+        current_frame = (current_frame + 1) % IDLE_FRAMES;
+        change_frame_up(current_frame);
+    }else  if(current_frame > key_frame[current_layer_idx]) {
+        current_frame = (current_frame - 1) % IDLE_FRAMES;
+        change_frame_down(IDLE_FRAMES - current_frame - 1);
+    }
+
+}
+
+void render_master_oled() {
+    if (timer_elapsed32(oled_timer) > CUSTOM_OLED_TIMEOUT) {
+        oled_off();
+        return;
+    }
+
+    oled_on();
+
+    /* Render the layar state */
+    oled_render_layer_state();
+
+    /* Move cursor bellow the graphic */
+    oled_set_cursor(0, 12);
+
+    /* Print logged col and row
+     * Format: 00x00
+     */
+    char logged_matrix[9] = {0};
+    sprintf(logged_matrix, "%02dx%02d", logged_col, logged_row);
+
+    /* Write a separator char: ◆,
+     * make sure to add a NULL terminator otherwise strlen could fail
+     */
+    static const char PROGMEM separator[] = {4, 4, 4, 4, 4, 0};
+    oled_write(separator, false);
+
+    /* Write logged matrix position */
+    oled_write(logged_matrix, false);
+
+    /* Write another separator */
+    oled_write(separator, false);
+
+    /* Write scanrate */
+    oled_write(get_u16_str(get_matrix_scan_rate(), ' '), false);
+}
+
+oled_rotation_t rotate_master(oled_rotation_t rotation) {return OLED_ROTATION_270;}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.c
new file mode 100644
index 0000000000..d2d452d03d
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.c
@@ -0,0 +1,533 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "ocean_dream.h"
+#include "quantum.h"
+#include "print.h"
+
+// Calculated Parameters
+#define TWINKLE_PROBABILITY_MODULATOR 100 / TWINKLE_PROBABILITY                             // CALCULATED: Don't Touch
+#define TOTAL_STARS STARS_PER_LINE *NUMBER_OF_STAR_LINES                                    // CALCULATED: Don't Touch
+#define OCEAN_ANIMATION_MODULATOR NUMBER_OF_FRAMES / OCEAN_ANIMATION_SPEED                  // CALCULATED: Don't Touch
+#define SHOOTING_STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / SHOOTING_STAR_ANIMATION_SPEED  // CALCULATED: Don't Touch
+#define STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / STAR_ANIMATION_SPEED                    // CALCULATED: Don't Touch
+
+uint8_t    animation_counter       = 0;  // global animation counter.
+bool       is_calm                 = false;
+uint32_t   starry_night_anim_timer = 0;
+uint32_t   starry_night_anim_sleep = 0;
+static int current_wpm             = 0;
+
+static uint8_t increment_counter(uint8_t counter, uint8_t max) {
+    counter++;
+    if (counter >= max) {
+        return 0;
+    } else {
+        return counter;
+    }
+}
+
+#ifdef ENABLE_WAVE
+static uint8_t decrement_counter(uint8_t counter, uint8_t max) {
+    counter--;
+    if (counter < 0 || counter > max) {
+        return max;
+    } else {
+        return counter;
+    }
+}
+#endif
+
+#ifdef ENABLE_MOON  // region
+#    ifndef STATIC_MOON
+uint8_t  moon_animation_frame   = 0;  // keeps track of current moon frame
+uint16_t moon_animation_counter = 0;  // counts how many frames to wait before animating moon to next frame
+#    endif
+
+#    ifdef STATIC_MOON
+static const char PROGMEM moon[6] = {
+    0x18, 0x7E, 0xFF, 0xC3, 0x81, 0x81,
+};
+#    endif
+
+#    ifndef STATIC_MOON
+static const char PROGMEM moon_animation[14][8] = {
+    // clang-format off
+    { 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C, },
+    { 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x42, 0x00, },
+    { 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xC3, 0x00, 0x00, },
+    { 0x3C, 0x7E, 0xFF, 0xFF, 0xC3, 0x81, 0x00, 0x00, },
+    { 0x3C, 0x7E, 0xFF, 0xC3, 0x81, 0x00, 0x00, 0x00, },
+    { 0x3C, 0x7E, 0xC3, 0x81, 0x81, 0x00, 0x00, 0x00, },
+    { 0x3C, 0x42, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, },
+    { 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x42, 0x3C, },
+    { 0x00, 0x00, 0x00, 0x81, 0x81, 0xC3, 0x7E, 0x3C, },
+    { 0x00, 0x00, 0x00, 0x81, 0xC3, 0xFF, 0x7E, 0x3C, },
+    { 0x00, 0x00, 0x81, 0xC3, 0xFF, 0xFF, 0x7E, 0x3C, },
+    { 0x00, 0x00, 0xC3, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C, },
+    { 0x00, 0x42, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C, },
+    // clang-format on
+};
+#    endif
+
+static void draw_moon(void) {
+#    ifdef STATIC_MOON
+    oled_set_cursor(MOON_COLUMN, MOON_LINE);
+    oled_write_raw_P(moon, 6);
+#    endif
+#    ifndef STATIC_MOON
+    moon_animation_counter = increment_counter(moon_animation_counter, ANIMATE_MOON_EVERY_N_FRAMES);
+    if (moon_animation_counter == 0) {
+        moon_animation_frame = increment_counter(moon_animation_frame, 14);
+        oled_set_cursor(MOON_COLUMN, MOON_LINE);
+        oled_write_raw_P(moon_animation[moon_animation_frame], 8);
+    }
+#    endif
+}
+#endif  // endregion
+
+#ifdef ENABLE_WAVE  // region
+uint8_t starry_night_wave_frame_width_counter = 31;
+uint8_t rough_waves_frame_counter             = 0;
+
+// clang-format off
+static const char PROGMEM ocean_top[8][32] = {
+    // still ocean
+    {
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+    },
+    // small ripples
+    {
+        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+    },
+    // level 2 ripples
+    {
+        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
+        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
+        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
+        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
+    },
+    // level 3 waves
+    {
+        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
+        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
+    },
+    {
+        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
+        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
+        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
+        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
+    },
+    {
+        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
+        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
+        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
+        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
+    },
+};
+static const char PROGMEM ocean_bottom[8][32] = {
+    // still ocean
+    {
+        0x00, 0x40, 0x40, 0x41, 0x01, 0x01, 0x01, 0x21,
+        0x20, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x44,
+        0x44, 0x40, 0x40, 0x00, 0x00, 0x08, 0x08, 0x00,
+        0x01, 0x01, 0x01, 0x00, 0x40, 0x40, 0x00, 0x00,
+    },
+    // small ripples
+    {
+        0x00, 0x00, 0x40, 0x40, 0x01, 0x01, 0x01, 0x20,
+        0x20, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04,
+        0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
+        0x00, 0x01, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00,
+    },
+    // level 2 ripples
+    {
+        0x00, 0x00, 0x40, 0x40, 0x01, 0x01, 0x01, 0x20,
+        0x20, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04,
+        0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
+        0x00, 0x01, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00,
+    },
+    // level 3 waves
+    {
+        0x00, 0x40, 0x40, 0x42, 0x42, 0x03, 0x11, 0x11,
+        0x20, 0x20, 0x00, 0x00, 0x08, 0x0C, 0x0C, 0x04,
+        0x05, 0x41, 0x41, 0x21, 0x20, 0x00, 0x00, 0x08,
+        0x0A, 0x0A, 0x0B, 0x41, 0x41, 0x41, 0x41, 0x00,
+    },
+    {
+        0x10, 0x10, 0x00, 0x80, 0x84, 0xC4, 0x02, 0x06,
+        0x84, 0x44, 0xC0, 0x80, 0x80, 0x20, 0x20, 0x10,
+        0x08, 0x12, 0x91, 0x81, 0x42, 0x40, 0x00, 0x00,
+        0x10, 0x12, 0x22, 0x22, 0x24, 0x04, 0x84, 0x80,
+    },
+    {
+        0x08, 0x80, 0x80, 0x82, 0x82, 0x03, 0x21, 0x21,
+        0x10, 0x10, 0x00, 0x00, 0x04, 0x04, 0x0C, 0x08,
+        0x09, 0x41, 0x42, 0x22, 0x20, 0x00, 0x00, 0x08,
+        0x0A, 0x0A, 0x0B, 0x41, 0x43, 0x42, 0x42, 0x00,
+    },
+};
+// clang-format on
+
+static void animate_waves(void) {
+    starry_night_wave_frame_width_counter = decrement_counter(starry_night_wave_frame_width_counter, WIDTH - 1);  // only 3 frames for last wave type
+    rough_waves_frame_counter             = increment_counter(rough_waves_frame_counter, 3);                      // only 3 frames for last wave type
+
+    void draw_ocean(uint8_t frame, uint16_t offset, uint8_t byte_index) {
+        oled_write_raw_byte(pgm_read_byte(ocean_top[frame] + byte_index), offset);
+        oled_write_raw_byte(pgm_read_byte(ocean_bottom[frame] + byte_index), offset + WIDTH);
+    }
+
+    for (int i = 0; i < WIDTH; ++i) {
+        uint16_t offset     = OCEAN_LINE * WIDTH + i;
+        uint8_t  byte_index = starry_night_wave_frame_width_counter + i;
+        if (byte_index >= WIDTH) {
+            byte_index = byte_index - WIDTH;
+        }
+        if (is_calm || current_wpm <= WAVE_CALM) {
+            draw_ocean(0, offset, byte_index);
+        } else if (current_wpm <= WAVE_HEAVY_STORM) {
+            draw_ocean(1, offset, byte_index);
+        } else if (current_wpm <= WAVE_HURRICANE) {
+            draw_ocean(2, offset, byte_index);
+        } else {
+            draw_ocean(3 + rough_waves_frame_counter, offset, byte_index);
+        }
+    }
+}
+#endif  // endregion
+
+#ifdef ENABLE_ISLAND  // region
+uint8_t island_frame_1 = 0;
+
+// clang-format off
+// only use 46 bytes (first 18 are blank, so we don't write them, makes it smaller and we can see the shooting stars properly!)
+
+// To save space and allow the shooting stars to be seen, only draw the tree on every frame.
+// Tree is only 14bytes wide so we save 108 bytes on just the first row. Second row, the
+// first 18 bytes is always the same piece of land, so only store that once, which saves 90 bytes
+static const char PROGMEM islandRightTop[6][14] = {
+    {0x84, 0xEC, 0x6C, 0x3C, 0xF8, 0xFE, 0x3F, 0x6B, 0xDB, 0xB9, 0x30, 0x40, 0x00, 0x00,},
+    {0x80, 0xC3, 0xEE, 0x7C, 0xB8, 0xFC, 0xFE, 0x6F, 0xDB, 0x9B, 0xB2, 0x30, 0x00, 0x00,},
+    {0x00, 0xC0, 0xEE, 0x7F, 0x3D, 0xF8, 0xFC, 0x7E, 0x57, 0xDB, 0xDB, 0x8A, 0x00, 0x00,},
+    {0x00, 0xC0, 0xE6, 0x7F, 0x3B, 0xF9, 0xFC, 0xFC, 0xB6, 0xB3, 0x33, 0x61, 0x00, 0x00,},
+    {0x00, 0x00, 0x00, 0x00, 0x80, 0xEE, 0xFF, 0xFB, 0xF9, 0xFC, 0xDE, 0xB6, 0xB6, 0x24,},
+    {0x00, 0x00, 0x00, 0x00, 0xC0, 0xEE, 0xFE, 0xFF, 0xFB, 0xFD, 0xEE, 0xB6, 0xB6, 0x92,},
+};
+static const char PROGMEM islandRightBottom[6][14] = {
+    {0x41, 0x40, 0x60, 0x3E, 0x3F, 0x23, 0x20, 0x60, 0x41, 0x43, 0x40, 0x40, 0x40, 0x80,},
+    {0x40, 0x41, 0x60, 0x3E, 0x3F, 0x23, 0x20, 0x60, 0x40, 0x40, 0x41, 0x41, 0x40, 0x80,},
+    {0x40, 0x40, 0x61, 0x3D, 0x3F, 0x27, 0x21, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80,},
+    {0x40, 0x43, 0x61, 0x3C, 0x3F, 0x27, 0x21, 0x60, 0x41, 0x43, 0x43, 0x42, 0x40, 0x80,},
+    {0x40, 0x40, 0x60, 0x3C, 0x3F, 0x27, 0x23, 0x63, 0x44, 0x40, 0x41, 0x41, 0x41, 0x81,},
+    {0x40, 0x40, 0x60, 0x3C, 0x3F, 0x27, 0x23, 0x63, 0x42, 0x42, 0x41, 0x41, 0x41, 0x80,},
+};
+static const char PROGMEM islandLeft[18] = {
+    0x80, 0x40, 0x40, 0x40, 0x40, 0x60,
+    0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+    0x20, 0x20, 0x20, 0x60, 0x40, 0x40,
+};
+// clang-format on
+
+static void animate_island(void) {
+    if (animation_counter == 0) {
+        island_frame_1 = increment_counter(island_frame_1, 2);
+    }
+
+    void draw_island_parts(uint8_t frame) {
+        oled_set_cursor(ISLAND_COLUMN + 3, ISLAND_LINE);
+        oled_write_raw_P(islandRightTop[frame], 14);
+        oled_set_cursor(ISLAND_COLUMN + 0, ISLAND_LINE + 1);
+        oled_write_raw_P(islandLeft, 18);
+        oled_set_cursor(ISLAND_COLUMN + 3, ISLAND_LINE + 1);
+        oled_write_raw_P(islandRightBottom[frame], 14);
+    }
+
+    if (is_calm || current_wpm < ISLAND_CALM) {
+        draw_island_parts(0);
+    } else if (current_wpm >= ISLAND_CALM && current_wpm < ISLAND_HEAVY_STORM) {
+        draw_island_parts(island_frame_1 + 1);
+    } else if (current_wpm >= ISLAND_HEAVY_STORM && current_wpm < ISLAND_HURRICANE) {
+        draw_island_parts(island_frame_1 + 2);
+    } else {
+        draw_island_parts(island_frame_1 + 4);
+    }
+}
+#endif  // endregion
+
+#ifdef ENABLE_STARS  // region
+bool stars_setup = false;  // only setup stars once, then we just twinkle them
+struct Coordinate {
+    int  x;
+    int  y;
+    bool exists;
+};
+
+struct Coordinate stars[TOTAL_STARS];  // tracks all stars/coordinates
+
+/**
+ * Setup all the initial stars on the screen
+ * This function divides the screen into regions based on STARS_PER_LINE and NUMBER_OF_STAR_LINES
+ * where each line is made up of 8x8 pixel groups, that are populated by a single star.
+ *
+ * Not sure how this function will work with larger or smaller screens.
+ * It should be fine, as long as the screen width is a multiple of 8
+ */
+static void setup_stars(void) {
+    // For every line, split the line into STARS_PER_LINE, find a random point in that region, and turn the pixel on
+    // 36% probability it will not be added
+    // (said another way, 80% chance it will start out lit in the x direction, then 80% chance it will start out lit in the y direction = 64% probability it will start out lit at all)
+    for (int line = 0; line < NUMBER_OF_STAR_LINES; ++line) {
+        for (int column_group = 0; column_group < STARS_PER_LINE; ++column_group) {
+            uint8_t rand_column = rand() % 10;
+            uint8_t rand_row    = rand() % 10;
+            if (rand_column < 8 && rand_row < 8) {
+                int column_adder = column_group * 8;
+                int line_adder   = line * 8;
+                int x            = rand_column + column_adder;
+                int y            = rand_row + line_adder;
+                oled_write_pixel(x, y, true);
+                stars[column_group + (line * STARS_PER_LINE)].x      = x;
+                stars[column_group + (line * STARS_PER_LINE)].y      = y;
+                stars[column_group + (line * STARS_PER_LINE)].exists = true;
+            } else {
+                stars[column_group + (line * STARS_PER_LINE)].exists = false;
+            }
+        }
+    }
+    stars_setup = true;
+}
+
+/**
+ * Twinkle the stars (move them one pixel in any direction) with a probability of 50% to twinkle any given star
+ */
+static void twinkle_stars(void) {
+    for (int line = 0; line < NUMBER_OF_STAR_LINES; ++line) {
+        for (int column_group = 0; column_group < STARS_PER_LINE; ++column_group) {
+            struct Coordinate star = stars[column_group + (line * STARS_PER_LINE)];
+
+            // skip stars that were never added
+            if (!star.exists) {
+                continue;
+            }
+            if (rand() % TWINKLE_PROBABILITY_MODULATOR == 0) {
+                oled_write_pixel(star.x, star.y, false);  // black out pixel
+
+                // don't allow stars to leave their own region
+                if (star.x == (column_group * 8)) {                     // star is the farthest left it can go in its region
+                    star.x++;                                           // move it right immediately
+                } else if (star.x == (((column_group + 1) * 8) - 1)) {  // star is farthest right it can go in its region
+                    star.x--;                                           // move it left immediately
+                }
+                if (star.y == (line * 8)) {                     // star is the farthest up it can go in its region
+                    star.y++;                                   // move it down immediately
+                } else if (star.y == (((line + 1) * 8) - 1)) {  // star is farthest down it can go in its region
+                    star.y--;                                   // move it up immediately
+                }
+
+                // now decide direction
+                int new_x;
+                int x_choice = rand() % 3;
+                if (x_choice == 0) {
+                    new_x = star.x - 1;
+                } else if (x_choice == 1) {
+                    new_x = star.x + 1;
+                } else {
+                    new_x = star.x;
+                }
+
+                int new_y;
+                int y_choice = rand() % 3;
+                if (y_choice == 0) {
+                    new_y = star.y - 1;
+                } else if (y_choice == 1) {
+                    new_y = star.y + 1;
+                } else {
+                    new_y = star.y;
+                }
+
+                star.x = new_x;
+                star.y = new_y;
+                oled_write_pixel(new_x, new_y, true);
+            }
+
+            stars[column_group + (line * STARS_PER_LINE)] = star;
+        }
+    }
+}
+
+/**
+ * Setup the stars and then animate them on subsequent frames
+ */
+static void animate_stars(void) {
+    if (!stars_setup) {
+        setup_stars();
+    } else {
+        twinkle_stars();
+    }
+}
+#endif  // endregion
+
+#ifdef ENABLE_SHOOTING_STARS  // region
+bool shooting_stars_setup = false;  // only setup shooting stars array once with defaults
+
+struct ShootingStar {
+    int  x_1;
+    int  y_1;
+    int  x_2;
+    int  y_2;
+    bool running;
+    int  frame;
+    int  delay;
+};
+
+struct ShootingStar shooting_stars[MAX_NUMBER_OF_SHOOTING_STARS];  // tracks all the shooting stars
+
+static void setup_shooting_star(struct ShootingStar *shooting_star) {
+    int column_to_start = rand() % (WIDTH / 2);
+    int row_to_start    = rand() % (HEIGHT - 48);  // shooting_stars travel diagonally 1 down, 1 across. So the lowest a shooting_star can start and not 'hit' the ocean is 32 above the ocean.
+
+    shooting_star->x_1     = column_to_start;
+    shooting_star->y_1     = row_to_start;
+    shooting_star->x_2     = column_to_start + 1;
+    shooting_star->y_2     = row_to_start + 1;
+    shooting_star->running = true;
+    shooting_star->frame++;
+    shooting_star->delay = rand() % SHOOTING_STAR_DELAY;
+}
+
+static void move_shooting_star(struct ShootingStar *shooting_star) {
+    oled_write_pixel(shooting_star->x_1, shooting_star->y_1, false);
+    oled_write_pixel(shooting_star->x_2, shooting_star->y_2, false);
+
+    shooting_star->x_1++;
+    shooting_star->y_1++;
+    shooting_star->x_2++;
+    shooting_star->y_2++;
+    shooting_star->frame++;
+
+    oled_write_pixel(shooting_star->x_1, shooting_star->y_1, true);
+    oled_write_pixel(shooting_star->x_2, shooting_star->y_2, true);
+}
+
+static void finish_shooting_star(struct ShootingStar *shooting_star) {
+    oled_write_pixel(shooting_star->x_1, shooting_star->y_1, false);
+    oled_write_pixel(shooting_star->x_2, shooting_star->y_2, false);
+    shooting_star->running = false;
+    shooting_star->frame   = 0;
+}
+
+static void animate_shooting_star(struct ShootingStar *shooting_star) {
+    if (shooting_star->frame > SHOOTING_STAR_FRAMES) {
+        finish_shooting_star(shooting_star);
+        return;
+    } else if (!shooting_star->running) {
+        setup_shooting_star(shooting_star);
+    } else {
+        if (shooting_star->delay == 0) {
+            move_shooting_star(shooting_star);
+        } else {
+            shooting_star->delay--;
+        }
+    }
+}
+
+static void animate_shooting_stars(void) {
+    if (is_calm) {
+        return;
+    }
+    if (!shooting_stars_setup) {
+        for (int i = 0; i < MAX_NUMBER_OF_SHOOTING_STARS; ++i) {
+            shooting_stars[i].running = false;
+        }
+        shooting_stars_setup = true;
+    }
+    /**
+     * Fixes issue with stars that were falling _while_ the
+     * wpm dropped below the condition for them to keep falling
+     */
+    void end_extra_stars(uint8_t starting_index) {
+        for (int shooting_star_index = starting_index; shooting_star_index < MAX_NUMBER_OF_SHOOTING_STARS; ++shooting_star_index) {
+            struct ShootingStar shooting_star = shooting_stars[shooting_star_index];
+            if (shooting_star.running) {
+                finish_shooting_star(&shooting_star);
+                shooting_stars[shooting_star_index] = shooting_star;
+            }
+        }
+    }
+
+    int number_of_shooting_stars = current_wpm / SHOOTING_STAR_WPM_INCREMENT;
+    number_of_shooting_stars     = (number_of_shooting_stars > MAX_NUMBER_OF_SHOOTING_STARS) ? MAX_NUMBER_OF_SHOOTING_STARS : number_of_shooting_stars;
+
+    if (number_of_shooting_stars == 0) {
+        // make sure all shooting_stars are ended
+        end_extra_stars(0);
+    } else {
+        for (int shooting_star_index = 0; shooting_star_index < number_of_shooting_stars; ++shooting_star_index) {
+            struct ShootingStar shooting_star = shooting_stars[shooting_star_index];
+            animate_shooting_star(&shooting_star);
+            shooting_stars[shooting_star_index] = shooting_star;
+        }
+        end_extra_stars(number_of_shooting_stars);
+    }
+}
+#endif  // endregion
+
+/**
+ * Main rendering function
+ *
+ * Calls all different animations at different rates
+ */
+void render_stars(void) {
+    //    // animation timer
+    if (timer_elapsed32(starry_night_anim_timer) > STARRY_NIGHT_ANIM_FRAME_DURATION) {
+        starry_night_anim_timer = timer_read32();
+        current_wpm             = get_current_wpm();
+
+#ifdef ENABLE_ISLAND
+        animate_island();
+#endif
+
+#ifdef ENABLE_SHOOTING_STARS
+        if (animation_counter % SHOOTING_STAR_ANIMATION_MODULATOR == 0) {
+            animate_shooting_stars();
+        }
+#endif
+
+#ifdef ENABLE_STARS
+        // TODO offsetting the star animation from the wave animation would look better,
+        // but if I do that, then the stars appear in the water because
+        // the ocean animation has to wait a bunch of frames to overwrite it.
+        // Possible solutions:
+        // 1. Only draw stars to the top of the island/ocean.
+        // 2. Draw ocean every frame, only move ocean on frames matching modulus
+        // Problems:
+        // 1. What if someone wants to move the island up a bit, or they want to have the stars reflect in the water?
+        // 2. More cpu intensive. And I'm already running out of cpu as it is...
+        if (animation_counter % STAR_ANIMATION_MODULATOR == 0) {
+            animate_stars();
+        }
+#endif
+
+#ifdef ENABLE_WAVE
+        if (animation_counter % OCEAN_ANIMATION_MODULATOR == 0) {
+            animate_waves();
+        }
+#endif
+
+#ifdef ENABLE_MOON
+        draw_moon();
+#endif
+
+        animation_counter = increment_counter(animation_counter, NUMBER_OF_FRAMES);
+    }
+}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.h b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.h
new file mode 100644
index 0000000000..8d3c505c33
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.h
@@ -0,0 +1,89 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include "quantum.h"
+
+/**
+ * Features:
+ * You can turn on and off features in this section
+ */
+#define ENABLE_MOON            // Uses 182 bytes
+#define ENABLE_WAVE            // Uses 844 bytes
+#define ENABLE_SHOOTING_STARS  // Uses 872 bytes
+#define ENABLE_ISLAND
+#define ENABLE_STARS  // Uses 606 bytes
+
+/**
+ * Global Settings
+ */
+#define STARRY_NIGHT_ANIM_FRAME_DURATION 30  // how long each frame lasts in ms
+#define NUMBER_OF_FRAMES 20                  // Self explanatory. Probably shouldn't touch this, not sure how stuff will work if it's changed. If changed should be multiple of 1, 2, 3, 4, and 5
+#define WIDTH OLED_DISPLAY_HEIGHT            // for vertical displays
+#define HEIGHT OLED_DISPLAY_WIDTH            // for vertical displays
+
+/**
+ * Moon Parameters
+ */
+#define MOON_LINE 4    // the line you want the moon to appear at
+#define MOON_COLUMN 4  // the column you want the moon to appear at
+//#define STATIC_MOON  // uncomment this to make the moon a static image, no animation
+#ifndef STATIC_MOON
+#    define ANIMATE_MOON_EVERY_N_FRAMES 100  // animate the moon every n frames
+#endif
+
+/**
+ * Wave Parameters
+ */
+#define OCEAN_LINE 14        // Line you want to render the ocean starting at (best at oled_max_lines() - 2)
+#define WAVE_CALM 20         // render calm ocean under this WPM and ripple ocean at this WPM
+#define WAVE_HEAVY_STORM 40  // render medium ocean at this WPM
+#define WAVE_HURRICANE 60    // render heavy waves above this WPM
+// What number of frames you want to animate the ocean at.
+// Should be equal to or smaller than NUMBER_OF_FRAMES, e.g. 30, would animate on every other frame, 20, every third frame, etc
+// Don't set equal to 0.
+#define OCEAN_ANIMATION_SPEED 1
+
+/**
+ * Shooting Star Parameters
+ */
+#define SHOOTING_STAR_DELAY 12           // delay modulus for time between shooting stars. Decides number of frames to delay, e.g. 12 means 0-11 frames of delay between each shooting star
+#define SHOOTING_STAR_FRAMES 16          // how many 2 pixel frames per shooting star. Increment this for longer shooting stars
+#define MAX_NUMBER_OF_SHOOTING_STARS 12  // maximum number of shooting stars that can be on screen at the same time
+#define SHOOTING_STAR_WPM_INCREMENT 10   // every n WPM increase, add an extra star, up to MAX_NUMBER_OF_SHOOTING_STARS, e.g. an increment of 5 would result in 1 shooting star at 5-9wpm, 2 at 10-14, etc.
+// What number of frames you want to animate the shooting stars at.
+// Should be equal to or smaller than NUMBER_OF_FRAMES, e.g. 30, would animate on every other frame, 20, every third frame, etc
+// Don't set equal to 0.
+#define SHOOTING_STAR_ANIMATION_SPEED 30
+
+/**
+ * Star Parameters
+ */
+#define STARS_PER_LINE 4         // number of stars per line (for a display that is 128x32, this would be 4 stars spread out evenly over the 32byte width, one every 8 bytes)
+#define NUMBER_OF_STAR_LINES 16  // number of lines to fill up with stars (for a display that is 128x32, 16 bytes are filled with the ocean animation, so that leaves 112 pixels left over. The number of lines depends on your OLED_FONT_HEIGHT)
+#define TWINKLE_PROBABILITY 25   // probability that any star twinkles on a given frame
+// What number of frames you want to animate the stars at.
+// Should be equal to or smaller than NUMBER_OF_FRAMES, e.g. 20, would animate on every frame, 10, every other frame, etc
+// Don't set equal to 0.
+#define STAR_ANIMATION_SPEED 1
+
+/**
+ * Island Parameters
+ */
+#define ISLAND_LINE 12         // line that the island starts at. Island is 2 lines tall
+#define ISLAND_COLUMN 0        // column that the island starts at
+#define ISLAND_CALM 20         // WPM at which the palm tree calmly moves
+#define ISLAND_HEAVY_STORM 40  // WPM at which the heavy storm occurs
+#define ISLAND_HURRICANE 60    // WPM at which THE HURRICANE STARTS
+
+/*
+ * DON'T TOUCH
+ */
+
+extern bool is_calm;
+
+// timers
+extern uint32_t starry_night_anim_timer;
+extern uint32_t starry_night_anim_sleep;
+
+void render_stars(void);
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c
new file mode 100644
index 0000000000..ef38fd8c44
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c
@@ -0,0 +1,11 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jpe230.h"
+#include "ocean_dream.h"
+
+void render_slave_oled() {
+    render_stars();
+}
+
+oled_rotation_t rotate_slave(oled_rotation_t rotation) {return OLED_ROTATION_270;}
diff --git a/keyboards/crkbd/keymaps/jpe230/process_record.c b/keyboards/crkbd/keymaps/jpe230/process_record.c
new file mode 100644
index 0000000000..db10438d8f
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/process_record.c
@@ -0,0 +1,20 @@
+// Copyright 2022 Jose Pablo Ramirez (@jpe230)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jpe230.h"
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        oled_timer_reset();
+        set_keylog(keycode, record);
+
+        switch (keycode) {
+            case QK_BOOT:
+                rgb_matrix_set_color_all(30, 0, 0);
+                rgb_matrix_driver.flush();
+                oled_off();
+                return true;
+        }
+    }
+    return true;
+}
diff --git a/keyboards/crkbd/keymaps/jpe230/readme.md b/keyboards/crkbd/keymaps/jpe230/readme.md
index 31bbc4ebd1..de5696116f 100644
--- a/keyboards/crkbd/keymaps/jpe230/readme.md
+++ b/keyboards/crkbd/keymaps/jpe230/readme.md
@@ -6,10 +6,18 @@ The four layers:
 - LOWER Layer: Numbers + Arrows
 - RAISE Layer: Symbols
 - ADJUST Layer: Numpad + Media Keys + Fn keys
-
 ## OLED
--Master: Renders layer state + keylog
--Slave : Renders an animation of a cat that varies its animation speed based on the current WPM
+The graphics for the OLED varies depending on the target platform:
+
+| Half   | RP2040                               | Pro Micro                            |
+|--------|--------------------------------------|--------------------------------------|
+| Master | ![](https://i.imgur.com/FF0EuWoh.png) | ![](https://i.imgur.com/stxRevvh.png) |
+| Slave  | ![](https://i.imgur.com/hyjdDITh.png) | ![](https://i.imgur.com/UrTCd2sh.png) |
+
 
 ## Flashing
-Flash using `qmk compile -kb crkbd -km jpe230` for Pro Micro
+For Arduino Pro Micro:
+- `qmk compile -kb crkbd -km jpe230`
+
+For Pro Micro Compatible board (See [Converters](https://docs.qmk.fm/#/feature_converters?id=converters)):
+- `qmk compile -kb crkbd -km jpe230 -e CONVERT_TO<target>`
diff --git a/keyboards/crkbd/keymaps/jpe230/rules.mk b/keyboards/crkbd/keymaps/jpe230/rules.mk
index 82d5eb321d..b78c1d45f3 100644
--- a/keyboards/crkbd/keymaps/jpe230/rules.mk
+++ b/keyboards/crkbd/keymaps/jpe230/rules.mk
@@ -1,12 +1,25 @@
 # Shared rules for both of my Corne
 OLED_ENABLE       = yes
 OLED_DRIVER       = SSD1306
-LTO_ENABLE        = yes
 VIA_ENABLE        = yes
-
-# Rules for my Corne without RGB
-# WPM_ENABLE        = yes
-# MOUSEKEY_ENABLE   = yes
-
-# Rules for my Corne with RGB
 RGB_MATRIX_ENABLE = yes
+
+SRC += oled/oled_handler.c process_record.c
+
+ifneq ($(CONVERT_TO),)
+    # Asume ARM
+    DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
+    WPM_ENABLE = yes
+    CONSOLE_ENABLE = yes
+    SRC +=  oled/rp2040/master/oled_master_handler.c \
+            oled/rp2040/master/indicators_down.c \
+            oled/rp2040/master/indicators_up.c \
+            oled/rp2040/slave/oled_slave_handler.c \
+            oled/rp2040/slave/ocean_dream.c
+else
+    # Asume AVR
+    LTO_ENABLE = yes
+    SRC +=  oled/avr/master/oled_master_handler.c \
+            oled/avr/slave/oled_slave_handler.c
+endif
+

From 9e1ff0e6b95820d6cbe21f9bf3cc2a4f8633114a Mon Sep 17 00:00:00 2001
From: Giuseppe Rota <403432+grota@users.noreply.github.com>
Date: Fri, 7 Oct 2022 23:16:31 +0200
Subject: [PATCH 590/959] fix typo in solenoid.h (#18635)

---
 drivers/haptic/solenoid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/haptic/solenoid.h b/drivers/haptic/solenoid.h
index 952f86e922..17f5345bc6 100644
--- a/drivers/haptic/solenoid.h
+++ b/drivers/haptic/solenoid.h
@@ -54,7 +54,7 @@
 #    endif
 #endif
 
-void solenoidbuzz_on(void);
+void solenoid_buzz_on(void);
 void solenoid_buzz_off(void);
 void solenoid_set_buzz(uint8_t buzz);
 

From f090cfe75ca3978c08d22b77bb478fb22638b3d9 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 7 Oct 2022 23:36:38 +0100
Subject: [PATCH 591/959] Relocate US ANSI shifted keycode aliases (#18634)

---
 quantum/keymap_extras/keymap_us.h | 72 +++++++++++++++++++++++++++++++
 quantum/quantum_keycodes.h        | 62 +-------------------------
 quantum/sequencer/tests/rules.mk  |  2 +-
 3 files changed, 74 insertions(+), 62 deletions(-)
 create mode 100644 quantum/keymap_extras/keymap_us.h

diff --git a/quantum/keymap_extras/keymap_us.h b/quantum/keymap_extras/keymap_us.h
new file mode 100644
index 0000000000..b18c701679
--- /dev/null
+++ b/quantum/keymap_extras/keymap_us.h
@@ -0,0 +1,72 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "keymap.h"
+
+// clang-format off
+
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │  |  │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │ : │ " │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │        │   │   │   │   │   │   │   │ < │ > │ ? │          │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define KC_TILD S(KC_GRAVE) // ~
+#define KC_EXLM S(KC_1)     // !
+#define KC_AT   S(KC_2)     // @
+#define KC_HASH S(KC_3)     // #
+#define KC_DLR  S(KC_4)     // $
+#define KC_PERC S(KC_5)     // %
+#define KC_CIRC S(KC_6)     // ^
+#define KC_AMPR S(KC_7)     // &
+#define KC_ASTR S(KC_8)     // *
+#define KC_LPRN S(KC_9)     // (
+#define KC_RPRN S(KC_0)     // )
+#define KC_UNDS S(KC_MINUS) // _
+#define KC_PLUS S(KC_EQUAL) // +
+// Row 2
+#define KC_LCBR S(KC_LEFT_BRACKET)  // {
+#define KC_RCBR S(KC_RIGHT_BRACKET) // }
+#define KC_PIPE S(KC_BACKSLASH)     // |
+// Row 3
+#define KC_COLN S(KC_SEMICOLON) // :
+#define KC_DQUO S(KC_QUOTE)     // "
+// Row 4
+#define KC_LABK S(KC_COMMA) // <
+#define KC_RABK S(KC_DOT)   // >
+#define KC_QUES S(KC_SLASH) // ?
+
+// alias stuff
+#define KC_TILDE KC_TILD
+#define KC_EXCLAIM KC_EXLM
+#define KC_DOLLAR KC_DLR
+#define KC_PERCENT KC_PERC
+#define KC_CIRCUMFLEX KC_CIRC
+#define KC_AMPERSAND KC_AMPR
+#define KC_ASTERISK KC_ASTR
+#define KC_LEFT_PAREN KC_LPRN
+#define KC_RIGHT_PAREN KC_RPRN
+#define KC_UNDERSCORE KC_UNDS
+
+#define KC_LEFT_CURLY_BRACE KC_LCBR
+#define KC_RIGHT_CURLY_BRACE KC_RCBR
+
+#define KC_COLON KC_COLN
+#define KC_DOUBLE_QUOTE KC_DQUO
+#define KC_DQT KC_DQUO
+
+#define KC_LEFT_ANGLE_BRACKET KC_LABK
+#define KC_LT KC_LABK
+#define KC_RIGHT_ANGLE_BRACKET KC_RABK
+#define KC_GT KC_RABK
+#define KC_QUESTION KC_QUES
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index abf3f1a384..939fab9298 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -656,67 +656,7 @@ enum quantum_keycodes {
 #define MOD_MEH 0x7
 
 // US ANSI shifted keycode aliases
-#define KC_TILDE LSFT(KC_GRAVE) // ~
-#define KC_TILD KC_TILDE
-
-#define KC_EXCLAIM LSFT(KC_1) // !
-#define KC_EXLM KC_EXCLAIM
-
-#define KC_AT LSFT(KC_2) // @
-
-#define KC_HASH LSFT(KC_3) // #
-
-#define KC_DOLLAR LSFT(KC_4) // $
-#define KC_DLR KC_DOLLAR
-
-#define KC_PERCENT LSFT(KC_5) // %
-#define KC_PERC KC_PERCENT
-
-#define KC_CIRCUMFLEX LSFT(KC_6) // ^
-#define KC_CIRC KC_CIRCUMFLEX
-
-#define KC_AMPERSAND LSFT(KC_7) // &
-#define KC_AMPR KC_AMPERSAND
-
-#define KC_ASTERISK LSFT(KC_8) // *
-#define KC_ASTR KC_ASTERISK
-
-#define KC_LEFT_PAREN LSFT(KC_9) // (
-#define KC_LPRN KC_LEFT_PAREN
-
-#define KC_RIGHT_PAREN LSFT(KC_0) // )
-#define KC_RPRN KC_RIGHT_PAREN
-
-#define KC_UNDERSCORE LSFT(KC_MINUS) // _
-#define KC_UNDS KC_UNDERSCORE
-
-#define KC_PLUS LSFT(KC_EQUAL) // +
-
-#define KC_LEFT_CURLY_BRACE LSFT(KC_LEFT_BRACKET) // {
-#define KC_LCBR KC_LEFT_CURLY_BRACE
-
-#define KC_RIGHT_CURLY_BRACE LSFT(KC_RIGHT_BRACKET) // }
-#define KC_RCBR KC_RIGHT_CURLY_BRACE
-
-#define KC_LEFT_ANGLE_BRACKET LSFT(KC_COMMA) // <
-#define KC_LABK KC_LEFT_ANGLE_BRACKET
-#define KC_LT KC_LEFT_ANGLE_BRACKET
-
-#define KC_RIGHT_ANGLE_BRACKET LSFT(KC_DOT) // >
-#define KC_RABK KC_RIGHT_ANGLE_BRACKET
-#define KC_GT KC_RIGHT_ANGLE_BRACKET
-
-#define KC_COLON LSFT(KC_SEMICOLON) // :
-#define KC_COLN KC_COLON
-
-#define KC_PIPE LSFT(KC_BACKSLASH) // |
-
-#define KC_QUESTION LSFT(KC_SLASH) // ?
-#define KC_QUES KC_QUESTION
-
-#define KC_DOUBLE_QUOTE LSFT(KC_QUOTE) // "
-#define KC_DQUO KC_DOUBLE_QUOTE
-#define KC_DQT KC_DOUBLE_QUOTE
+#include "keymap_us.h"
 
 #define KC_DELT KC_DELETE // Del key (four letter code)
 
diff --git a/quantum/sequencer/tests/rules.mk b/quantum/sequencer/tests/rules.mk
index a3bbd80513..611459e060 100644
--- a/quantum/sequencer/tests/rules.mk
+++ b/quantum/sequencer/tests/rules.mk
@@ -2,7 +2,7 @@
 # - it is consistent with the example that is used as a reference in the Unit Testing article (https://docs.qmk.fm/#/unit_testing?id=adding-tests-for-new-or-existing-features)
 # - Neither `make test:sequencer` or `make test:SEQUENCER` work when using SCREAMING_SNAKE_CASE
 
-sequencer_DEFS := -DNO_DEBUG -DMIDI_MOCKED
+sequencer_DEFS := -DMATRIX_ROWS=1 -DMATRIX_COLS=1 -DNO_DEBUG -DMIDI_MOCKED
 
 sequencer_SRC := \
 	$(QUANTUM_PATH)/sequencer/tests/midi_mock.c \

From 52a5949917ba9608fff3ac950310af2affdd2b6c Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 7 Oct 2022 19:04:07 -0700
Subject: [PATCH 592/959] Synth Labs Solo Configurator Fixes (#18642)

* info.json: apply friendly formatting

- four-space indent
- line breaks between physical rows

* info.json: fix key sequence

* info.json: fix layout macro reference

The macro `LAYOUT` doesn't exist - this data should reference `LAYOUT_all`.

* info.json: add LAYOUT_left data

* info.json: add LAYOUT_right data

* info.json: correct LAYOUT_right key sequence and positioning
---
 keyboards/synthlabs/solo/info.json | 114 +++++++++++++++++++----------
 1 file changed, 74 insertions(+), 40 deletions(-)

diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json
index 3fd7b1b8f3..9fc26e0ab4 100644
--- a/keyboards/synthlabs/solo/info.json
+++ b/keyboards/synthlabs/solo/info.json
@@ -1,44 +1,78 @@
 {
-  "keyboard_name": "Solo",
-  "manufacturer": "Synth Labs",
-  "url": "http://solo.synthlabs.io",
-  "maintainer": "hongaaronc",
-  "bootloader": "atmel-dfu",
-  "processor": "atmega32u4",
-  "debounce": 5,
-  "matrix_pins": {
-    "direct": [
-      ["C6", "D6", "B5", "B4", "D7", "B6", "D4"],
-      [null, "B7", null, null, null, null, null],
-      ["F0", "F7", "F4", "F5", "F6", "F1", "C7"]
-    ]
-  },
-  "usb": {
-    "vid": "0x534E",
-    "pid": "0x3031",
-    "device_version": "0.0.1"
-  },
-  "layouts": {
-    "LAYOUT": {
-        "layout": [
-          {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]},
-          {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]},
-          {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0,2]},
-          {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]},
-          {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]},
-          {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]},
-          {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]},
-          {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
-          {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]},
-          {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]},
-          {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]},
-          {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]},
-          {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]},
-          {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,3]},
-          {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]},
-          {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]},
-          {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]}
+    "keyboard_name": "Solo",
+    "manufacturer": "Synth Labs",
+    "url": "http://solo.synthlabs.io",
+    "maintainer": "hongaaronc",
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "debounce": 5,
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D6", "B5", "B4", "D7", "B6", "D4"],
+            [null, "B7", null, null, null, null, null],
+            ["F0", "F7", "F4", "F5", "F6", "F1", "C7"]
         ]
+    },
+    "usb": {
+        "vid": "0x534E",
+        "pid": "0x3031",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]},
+                {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]},
+                {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0,2]},
+                {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]},
+                {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]},
+                {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]},
+                {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]},
+
+                {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]},
+                {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]},
+
+                {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]},
+                {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]},
+                {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]},
+                {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,3]},
+                {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]},
+                {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]},
+                {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]}
+            ]
+        },
+        "LAYOUT_left": {
+            "layout": [
+                {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]},
+                {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]},
+                {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]},
+
+                {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]},
+                {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]},
+
+                {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]},
+                {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]},
+                {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]},
+                {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]}
+            ]
+        },
+        "LAYOUT_right": {
+            "layout": [
+                {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,5]},
+                {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,3]},
+                {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,1]},
+
+                {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1,0] },
+                {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1,2]},
+
+                {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0,6]},
+                {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0,4]},
+                {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0,2]},
+                {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0,0]}
+            ]
+        }
     }
-  }
 }

From 7b3ad56f13f83e1b688f6330898b5234cda7168e Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 8 Oct 2022 15:52:38 +1100
Subject: [PATCH 593/959] Fix future naming collisions. (#18645)

---
 keyboards/elephant42/keymaps/via/keymap.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/elephant42/keymaps/via/keymap.c b/keyboards/elephant42/keymaps/via/keymap.c
index 4ecf5d86ab..32b9dc1fcb 100644
--- a/keyboards/elephant42/keymaps/via/keymap.c
+++ b/keyboards/elephant42/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 #define KC_VU KC_AUDIO_VOL_UP
 #define KC_VD KC_AUDIO_VOL_DOWN
 #define KC_MU KC_AUDIO_MUTE
-#define KC_LSPC LT(_LOWER, KC_SPC)
-#define KC_RSPC LT(_RAISE, KC_SPC)
+#define KC_LWSP LT(_LOWER, KC_SPC)
+#define KC_RSSP LT(_RAISE, KC_SPC)
 
 enum layer_names {
     _QWERTY,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
               KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                                      KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT,     KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------|
              XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN,                                     KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL ,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT,     KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
              KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD,                                     KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT,     KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 

From 86938fd958836e86cced081f46e8901bad245df8 Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Sat, 8 Oct 2022 11:13:58 -0500
Subject: [PATCH 594/959] Allow QK_MAKE to work with converters (#18637)

---
 builddefs/converters.mk | 1 +
 quantum/quantum.c       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/builddefs/converters.mk b/builddefs/converters.mk
index b3e7bec007..c7e499226c 100644
--- a/builddefs/converters.mk
+++ b/builddefs/converters.mk
@@ -29,6 +29,7 @@ ifneq ($(CONVERT_TO),)
 
     # Configure any defaults
     OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
+    OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\"
     OPT_DEFS += -DCONVERTER_ENABLED
     VPATH += $(CONVERTER)
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 5b5364c8f1..0f94e3855d 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -422,7 +422,11 @@ bool process_record_quantum(keyrecord_t *record) {
                 } else {
                     SEND_STRING_DELAY(" compile ", TAP_CODE_DELAY);
                 }
+#    if defined(CONVERTER_ENABLED)
+                SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP " -e CONVERT_TO=" CONVERTER_TARGET SS_TAP(X_ENTER), TAP_CODE_DELAY);
+#    else
                 SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP SS_TAP(X_ENTER), TAP_CODE_DELAY);
+#    endif
                 if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) {
                     reset_keyboard();
                 }

From 85dc473faafbb9370abbd69bb0c08da3dea87386 Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Sat, 8 Oct 2022 16:04:16 -0500
Subject: [PATCH 595/959] AnnePro2: Adjust RGB flushing (#18640)

---
 keyboards/annepro2/annepro2.c   | 10 ----------
 keyboards/annepro2/ap2_led.c    |  1 -
 keyboards/annepro2/ap2_led.h    |  1 -
 keyboards/annepro2/rgb_driver.c | 30 +++++++++++++-----------------
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
index 4edafe0702..9e17cbcf77 100644
--- a/keyboards/annepro2/annepro2.c
+++ b/keyboards/annepro2/annepro2.c
@@ -46,7 +46,6 @@ ble_capslock_t ble_capslock = {._dummy = {0}, .caps_lock = false};
 
 #ifdef RGB_MATRIX_ENABLE
 static uint8_t led_enabled = 1;
-static uint8_t current_rgb_row = 0;
 #endif
 
 void bootloader_jump(void) {
@@ -125,15 +124,6 @@ void matrix_scan_kb() {
         proto_consume(&proto, byte);
     }
 
-    #ifdef RGB_MATRIX_ENABLE
-    /* If there's data ready to be sent to LED MCU - send it. */
-    if(rgb_row_changed[current_rgb_row])
-    {
-        rgb_row_changed[current_rgb_row] = 0;
-        ap2_led_colors_set_row(current_rgb_row);
-    }
-    current_rgb_row = (current_rgb_row + 1) % NUM_ROW;
-    #endif
 
     matrix_scan_user();
 }
diff --git a/keyboards/annepro2/ap2_led.c b/keyboards/annepro2/ap2_led.c
index 8b42e470c2..339df103bf 100644
--- a/keyboards/annepro2/ap2_led.c
+++ b/keyboards/annepro2/ap2_led.c
@@ -24,7 +24,6 @@
 ap2_led_t       led_mask[KEY_COUNT];
 ap2_led_t       led_colors[KEY_COUNT];
 ap2_led_status_t ap2_led_status;
-uint8_t rgb_row_changed[NUM_ROW];
 
 void led_command_callback(const message_t *msg) {
     switch (msg->command) {
diff --git a/keyboards/annepro2/ap2_led.h b/keyboards/annepro2/ap2_led.h
index 9d9a3aca7e..ff2a05aff5 100644
--- a/keyboards/annepro2/ap2_led.h
+++ b/keyboards/annepro2/ap2_led.h
@@ -41,7 +41,6 @@ typedef union {
 /* Local copy of led_mask, used to override colors on the board */
 extern ap2_led_t led_mask[KEY_COUNT];
 extern ap2_led_t led_colors[KEY_COUNT];
-extern uint8_t rgb_row_changed[NUM_ROW];
 
 /* Handle incoming messages */
 extern void led_command_callback(const message_t *msg);
diff --git a/keyboards/annepro2/rgb_driver.c b/keyboards/annepro2/rgb_driver.c
index f1d2a3cd13..d12fcea90a 100644
--- a/keyboards/annepro2/rgb_driver.c
+++ b/keyboards/annepro2/rgb_driver.c
@@ -16,8 +16,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-#include "rgb_matrix.h"
-#include "ap2_led.h"
+#    include "rgb_matrix.h"
+#    include "ap2_led.h"
 
 uint8_t led_pos[RGB_MATRIX_LED_COUNT];
 
@@ -33,26 +33,22 @@ void init(void) {
     }
 }
 
-void flush(void) {}
+void flush(void) {
+    for (uint8_t row = 0; row < NUM_ROW; row++)
+        ap2_led_colors_set_row(row);
+}
 
 void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
-    if (r != led_colors[led_pos[index]].p.red   ||
-        g != led_colors[led_pos[index]].p.green ||
-        b != led_colors[led_pos[index]].p.blue)
-        {
-            led_colors[led_pos[index]] = (ap2_led_t){
-                .p.blue  = b,
-                .p.red   = r,
-                .p.green = g,
-                .p.alpha = 0xff,
-            };
-            int row = led_pos[index] / NUM_COLUMN;
-            rgb_row_changed[row] = 1;
-        }
+    led_colors[led_pos[index]] = (ap2_led_t){
+        .p.blue  = b,
+        .p.red   = r,
+        .p.green = g,
+        .p.alpha = 0xff,
+    };
 }
 
 void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i=0; i<RGB_MATRIX_LED_COUNT; i++)
+    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++)
         set_color(i, r, g, b);
 }
 

From 48093000e1a8fbe7fc25a43aea3f75913a634d53 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 8 Oct 2022 23:30:51 +0100
Subject: [PATCH 596/959] Various keyboard fixes (#18649)

---
 keyboards/dailycraft/sandbox/sandbox.c     |  2 +-
 keyboards/duck/jetfire/indicator_leds.h    |  2 +-
 keyboards/duck/jetfire/jetfire.c           | 61 +++-------------------
 keyboards/duck/octagon/v2/indicator_leds.c |  2 +-
 keyboards/duck/octagon/v2/indicator_leds.h |  2 +-
 keyboards/dyz/synthesis60/synthesis60.c    |  2 +-
 keyboards/yandrstudio/nz64/nz64.c          |  2 +-
 7 files changed, 14 insertions(+), 59 deletions(-)

diff --git a/keyboards/dailycraft/sandbox/sandbox.c b/keyboards/dailycraft/sandbox/sandbox.c
index 9f9aa48190..0b576a8291 100644
--- a/keyboards/dailycraft/sandbox/sandbox.c
+++ b/keyboards/dailycraft/sandbox/sandbox.c
@@ -17,7 +17,7 @@
 #include "sandbox.h"
 
 #ifdef OLED_ENABLE
-bool oled_task_user(void) {
+bool oled_task_kb(void) {
     if (!oled_task_user()) { return false; }
     switch (get_highest_layer(layer_state)) {
         case 0:
diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h
index 695e1db6d4..d94709d1cb 100644
--- a/keyboards/duck/jetfire/indicator_leds.h
+++ b/keyboards/duck/jetfire/indicator_leds.h
@@ -6,6 +6,6 @@ void backlight_init_ports(void);
 void backlight_set_state(bool cfg[7]);
 void backlight_update_state(void);
 void backlight_toggle_rgb(bool enabled);
-void backlight_set_rgb(uint8_t cfg[17][3]);
+void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3]);
 void backlight_set(uint8_t level);
 void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device);
diff --git a/keyboards/duck/jetfire/jetfire.c b/keyboards/duck/jetfire/jetfire.c
index 9bb02ca22c..d648287156 100644
--- a/keyboards/duck/jetfire/jetfire.c
+++ b/keyboards/duck/jetfire/jetfire.c
@@ -44,61 +44,16 @@ uint8_t backlight_state_led = 1<<STATE_LED_LAYER_0;
 
 void backlight_toggle_rgb(bool enabled)
 {
+  uint8_t rgb[RGBLED_NUM][3] = { 0 };
+
   if(enabled) {
-    uint8_t rgb[RGBLED_NUM][3] = {
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b}
-    };
-    backlight_set_rgb(rgb);
-  } else {
-    uint8_t rgb[RGBLED_NUM][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}
-    };
-    backlight_set_rgb(rgb);
+    for(uint8_t i = 0; i < RGBLED_NUM; ++i) {
+      rgb[i][0] = backlight_rgb_r;
+      rgb[i][1] = backlight_rgb_g;
+      rgb[i][2] = backlight_rgb_b;
+    }
   }
+  backlight_set_rgb(rgb);
 }
 
 void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3])
diff --git a/keyboards/duck/octagon/v2/indicator_leds.c b/keyboards/duck/octagon/v2/indicator_leds.c
index 116306fb71..fad5c8d4dc 100644
--- a/keyboards/duck/octagon/v2/indicator_leds.c
+++ b/keyboards/duck/octagon/v2/indicator_leds.c
@@ -113,7 +113,7 @@ void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device) {
 }
 
 // Port from backlight_set_state
-void indicator_leds_set(bool leds[8]) {
+void indicator_leds_set(bool leds[7]) {
   cli();
   send_color(leds[1] ? 255 : 0, leds[2] ? 255 : 0, leds[0] ? 255 : 0, Device_STATUSLED);
   send_color(leds[4] ? 255 : 0, leds[3] ? 255 : 0, leds[5] ? 255 : 0, Device_STATUSLED);
diff --git a/keyboards/duck/octagon/v2/indicator_leds.h b/keyboards/duck/octagon/v2/indicator_leds.h
index ad3ec54f52..2c1bfe5624 100644
--- a/keyboards/duck/octagon/v2/indicator_leds.h
+++ b/keyboards/duck/octagon/v2/indicator_leds.h
@@ -1,6 +1,6 @@
 #include "duck_led/duck_led.h"
 
-void indicator_leds_set(bool leds[8]);
+void indicator_leds_set(bool leds[7]);
 void backlight_toggle_rgb(bool enabled);
 void backlight_set_rgb(uint8_t cfg[17][3]);
 void backlight_init_ports(void);
diff --git a/keyboards/dyz/synthesis60/synthesis60.c b/keyboards/dyz/synthesis60/synthesis60.c
index c56a61b1ec..e65bbe4697 100644
--- a/keyboards/dyz/synthesis60/synthesis60.c
+++ b/keyboards/dyz/synthesis60/synthesis60.c
@@ -17,7 +17,7 @@
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
-    if (!oled_task_kb()) { return false; }
+    if (!oled_task_user()) { return false; }
     // Host Keyboard Layer Status
     oled_write_P(PSTR("Synthesis60\nLayer: "), false);
     // Host Keyboard LED Status
diff --git a/keyboards/yandrstudio/nz64/nz64.c b/keyboards/yandrstudio/nz64/nz64.c
index 8b64d36fd1..f1777ccae3 100644
--- a/keyboards/yandrstudio/nz64/nz64.c
+++ b/keyboards/yandrstudio/nz64/nz64.c
@@ -58,7 +58,7 @@ led_config_t g_led_config = {
 };
 
 bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
-    if (!rgb_matrix_indicators_advanced_kb(led_min, led_max)) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
         return false;
     }
     if (rgb_matrix_is_enabled()) {

From 4b2d71de52b561c77da4bdb2275b1c6bb2415f54 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 9 Oct 2022 14:51:09 +1100
Subject: [PATCH 597/959] Remove legacy international keycodes (#18588)

---
 docs/api_docs.md                              |  2 +-
 docs/keymap.md                                |  4 +--
 .../25keys/aleth42/keymaps/default/keymap.c   |  4 +--
 keyboards/25keys/aleth42/keymaps/via/keymap.c |  4 +--
 .../25keys/zinc/keymaps/default/keymap.c      |  8 ++---
 .../25keys/zinc/keymaps/ginjake/keymap.c      |  8 ++---
 keyboards/25keys/zinc/keymaps/monks/keymap.c  |  8 ++---
 .../25keys/zinc/keymaps/toshi0383/keymap.c    |  4 +--
 keyboards/25keys/zinc/keymaps/via/keymap.c    |  8 ++---
 keyboards/adkb96/keymaps/default/keymap.c     |  6 ++--
 keyboards/ai03/jp60/keymaps/via/keymap.c      |  6 ++--
 keyboards/arabica37/keymaps/default/keymap.c  |  2 +-
 keyboards/baguette/info.json                  |  2 +-
 keyboards/bajjak/keymaps/5x6/keymap.c         |  2 +-
 keyboards/bandominedoni/bandominedoni.h       |  4 +--
 .../ergo42/keymaps/biacco-biacco/keymap.c     | 22 ++++++-------
 .../ergo42/keymaps/biacco-macOS/keymap.c      | 14 ++++-----
 .../ergo42/keymaps/biacco-underglow/keymap.c  | 14 ++++-----
 .../ergo42/keymaps/biacco-winjp/keymap.c      | 14 ++++-----
 .../biacco42/ergo42/keymaps/biacco/keymap.c   | 14 ++++-----
 .../keymaps/default-illustrator/keymap.c      | 14 ++++-----
 .../ergo42/keymaps/default-underglow/keymap.c |  2 +-
 .../biacco42/ergo42/keymaps/default/keymap.c  |  2 +-
 .../biacco42/ergo42/keymaps/hdbx/keymap.c     |  6 ++--
 .../biacco42/ergo42/keymaps/ichi-t/keymap.c   |  2 +-
 .../biacco42/ergo42/keymaps/koba/keymap.c     | 10 +++---
 .../biacco42/ergo42/keymaps/yshrsmz/keymap.c  | 12 +++----
 .../pegasushoof/keymaps/default_jis/keymap.c  |  6 ++--
 .../clueboard/66/keymaps/bloodlvst/keymap.c   |  2 +-
 .../clueboard/66/keymaps/caps_fn/keymap.c     |  4 +--
 .../clueboard/66/keymaps/colemak/keymap.c     |  4 +--
 .../clueboard/66/keymaps/default/keymap.c     |  4 +--
 .../clueboard/66/keymaps/jokrik/keymap.c      |  2 +-
 .../66/keymaps/mac_optimized/keymap.c         |  4 +--
 .../66/keymaps/manofinterests/keymap.c        |  4 +--
 .../clueboard/66/keymaps/maximised/keymap.c   |  2 +-
 .../clueboard/66/keymaps/mouse_keys/keymap.c  |  4 +--
 .../clueboard/66/keymaps/mrscooty/keymap.c    |  4 +--
 .../clueboard/66/keymaps/serubin/keymap.c     |  4 +--
 .../clueboard/66/keymaps/shift_fn/keymap.c    |  8 ++---
 .../clueboard/66/keymaps/tetris/keymap.c      |  6 ++--
 .../66/keymaps/unix_optimized/keymap.c        |  4 +--
 .../66/keymaps/win_optimized/keymap.c         |  4 +--
 keyboards/clueboard/66/rev4/keymaps/keymap.c  | 13 --------
 .../clueboard/66/rev4/keymaps/mine/keymap.c   |  2 +-
 .../periboard_512/keymaps/default/keymap.c    |  2 +-
 .../sun_usb/type5/keymaps/default/keymap.c    |  2 +-
 .../converter/usb_usb/keymaps/ble/keymap.c    |  6 ++--
 .../usb_usb/keymaps/coloneljesus/keymap.c     |  6 ++--
 .../usb_usb/keymaps/default/keymap.c          |  6 ++--
 .../converter/usb_usb/keymaps/narze/keymap.c  | 18 +++++------
 .../converter/xt_usb/keymaps/default/keymap.c |  6 ++--
 keyboards/crkbd/info.json                     |  8 ++---
 keyboards/crkbd/keymaps/mcrown/mcrown.h       |  4 +--
 keyboards/crkbd/keymaps/mcrown/oled.c         |  2 +-
 keyboards/crkbd/keymaps/oled_sample/keymap.c  |  4 +--
 keyboards/crkbd/keymaps/thumb_ctrl/keymap.c   | 10 +++---
 keyboards/crkbd/keymaps/vayashiko/keymap.c    |  2 +-
 .../dailycraft/bat43/keymaps/default/keymap.c |  2 +-
 .../dailycraft/bat43/keymaps/via/keymap.c     |  2 +-
 .../claw44/keymaps/default/keymap.c           |  4 +--
 .../dailycraft/claw44/keymaps/oled/keymap.c   |  4 +--
 .../dailycraft/claw44/keymaps/via/keymap.c    |  4 +--
 .../wings42/rev1/keymaps/default/keymap.c     |  4 +--
 .../wings42/rev1/keymaps/via/keymap.c         |  4 +--
 .../rev1_extkeys/keymaps/default/keymap.c     |  4 +--
 .../wings42/rev1_extkeys/keymaps/via/keymap.c |  4 +--
 .../wings42/rev2/keymaps/default/keymap.c     |  4 +--
 .../wings42/rev2/keymaps/via/keymap.c         |  4 +--
 .../ergoinu/keymaps/default_jis/keymap.c      | 12 +++----
 .../ergodox_ez/keymaps/toshi0383/keymap.c     |  2 +-
 keyboards/fluorite/keymaps/default/keymap.c   | 10 +++---
 .../giabalanai/keymaps/2firmware/keymap.c     |  8 ++---
 keyboards/giabalanai/keymaps/3araht/keymap.c  |  8 ++---
 keyboards/giabalanai/keymaps/default/keymap.c |  2 +-
 .../keymaps/default_giabarinaix2/keymap.c     |  4 +--
 .../keymaps/giabarinaix2led/keymap.c          |  4 +--
 keyboards/giabalanai/keymaps/party/keymap.c   |  8 ++---
 keyboards/giabalanai/keymaps/via/keymap.c     |  2 +-
 .../keymaps/via_giabarinaix2/keymap.c         |  4 +--
 keyboards/halfcliff/keymaps/default/keymap.c  |  4 +--
 keyboards/halfcliff/keymaps/via/keymap.c      |  4 +--
 .../concertina/64key/keymaps/default/keymap.c |  2 +-
 .../hacked_motospeed/keymaps/german/keymap.c  |  4 +--
 .../keymaps/german/layers.json                |  2 +-
 .../handwired/jopr/keymaps/default/keymap.c   |  2 +-
 .../jopr/keymaps/modded_white/keymap.c        |  2 +-
 .../handwired/k8split/keymaps/left/keymap.c   |  2 +-
 .../keymaps/default_mac/keymap.c              |  2 +-
 keyboards/helix/pico/keymaps/biacco/keymap.c  | 14 ++++-----
 keyboards/helix/pico/keymaps/default/keymap.c |  8 ++---
 keyboards/helix/pico/keymaps/mtei/keymap.c    |  8 ++---
 keyboards/helix/rev2/keymaps/default/keymap.c |  8 ++---
 .../helix/rev2/keymaps/five_rows/keymap.c     |  8 ++---
 .../helix/rev2/keymaps/five_rows_jis/keymap.c |  8 ++---
 keyboards/helix/rev2/keymaps/froggy/keymap.c  |  8 ++---
 .../helix/rev2/keymaps/froggy_106/keymap.c    |  8 ++---
 keyboards/helix/rev2/keymaps/yshrsmz/keymap.c |  8 ++---
 .../helix/rev3_4rows/keymaps/default/keymap.c |  8 ++---
 .../helix/rev3_4rows/keymaps/via/keymap.c     |  8 ++---
 .../helix/rev3_5rows/keymaps/default/keymap.c |  8 ++---
 .../rev3_5rows/keymaps/five_rows/keymap.c     |  8 ++---
 .../helix/rev3_5rows/keymaps/via/keymap.c     |  8 ++---
 keyboards/hhkb/ansi/keymaps/shela/keymap.c    | 16 +++++-----
 keyboards/hhkb/ansi/keymaps/shela/readme.md   | 16 +++++-----
 keyboards/hhkb/jp/keymaps/default/keymap.c    |  6 ++--
 .../hhkb/jp/keymaps/default_mac/keymap.c      |  6 ++--
 keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c   |  2 +-
 .../hhkb/jp/keymaps/halfqwerty_jp/keymap.c    |  6 ++--
 keyboards/hhkb/jp/keymaps/sh_jp/keymap.c      | 12 +++----
 keyboards/hhkb/jp/keymaps/via/keymap.c        |  6 ++--
 keyboards/jones/v03/keymaps/default/keymap.c  |  2 +-
 .../jones/v03/keymaps/default_jp/keymap.c     |  2 +-
 .../jones/v03_1/keymaps/default/keymap.c      |  2 +-
 .../jones/v03_1/keymaps/default_ansi/keymap.c |  2 +-
 .../jones/v03_1/keymaps/default_jp/keymap.c   |  2 +-
 keyboards/jones/v1/keymaps/default/keymap.c   |  2 +-
 keyboards/k34/info.json                       |  4 +--
 .../kbdfans/kbd67/rev1/keymaps/koba/keymap.c  |  6 ++--
 .../kbdfans/kbd67/rev2/keymaps/koba/keymap.c  |  6 ++--
 .../bm40hsrgb/keymaps/34keys/keymap.c         |  6 ++--
 .../kudox/columner/keymaps/default/keymap.c   |  8 ++---
 keyboards/kudox/columner/keymaps/via/keymap.c |  2 +-
 keyboards/kudox/rev1/keymaps/default/keymap.c |  6 ++--
 keyboards/kudox/rev1/keymaps/jis/keymap.c     |  6 ++--
 keyboards/kudox/rev1/keymaps/x1/keymap.c      | 12 +++----
 keyboards/kudox/rev2/keymaps/default/keymap.c |  6 ++--
 keyboards/kudox/rev2/keymaps/jis/keymap.c     |  8 ++---
 keyboards/kudox/rev3/keymaps/default/keymap.c |  4 +--
 keyboards/kudox/rev3/keymaps/jis/keymap.c     |  4 +--
 keyboards/kudox/rev3/keymaps/via/keymap.c     |  2 +-
 keyboards/kudox_full/keymaps/default/keymap.c |  6 ++--
 keyboards/kudox_full/keymaps/via/keymap.c     |  4 +--
 keyboards/lily58/keymaps/drasbeck/keymap.c    |  4 +--
 keyboards/majistic/keymaps/default/keymap.c   |  2 +-
 keyboards/manta60/keymaps/default/keymap.c    |  2 +-
 .../leftover30/keymaps/default/keymap.c       | 10 +++---
 .../rhymestone/keymaps/default/keymap.c       |  8 ++---
 .../treadstone32/keymaps/default/keymap.c     | 10 +++---
 .../treadstone32/keymaps/like_jis/keymap.c    | 12 +++----
 .../treadstone48/keymaps/default/keymap.c     |  6 ++--
 .../treadstone48/keymaps/like_jis/keymap.c    | 12 +++----
 .../rev1/keymaps/like_jis_rs/keymap.c         | 16 +++++-----
 keyboards/mitosis/keymaps/datagrok/keymap.c   |  2 +-
 keyboards/newgame40/keymaps/default/keymap.c  | 10 +++---
 .../jabberwocky/keymaps/nopunin10did/keymap.c |  4 +--
 keyboards/numatreus/keymaps/hdbx/keymap.c     |  6 ++--
 keyboards/numatreus/keymaps/like_jis/keymap.c | 10 +++---
 .../mini/keymaps/toyoshimahidenori/keymap.c   |  4 +--
 .../ergodash/rev1/keymaps/m47ch4n/keymap.c    |  2 +-
 .../runner3680/5x6_5x8/keymaps/jis/keymap.c   |  2 +-
 .../omkbd/runner3680/5x8/keymaps/JIS/keymap.c |  2 +-
 .../pico/65keys/keymaps/default/keymap.c      |  6 ++--
 keyboards/pico/65keys/keymaps/jis/keymap.c    |  4 +--
 .../pico/70keys/keymaps/default/keymap.c      |  6 ++--
 keyboards/pico/70keys/keymaps/jis/keymap.c    |  4 +--
 keyboards/planck/keymaps/rai-suta/keymap.c    | 12 +++----
 keyboards/preonic/keymaps/drasbeck/keymap.c   |  4 +--
 .../rate/pistachio/keymaps/default/keymap.c   |  4 +--
 .../rate/pistachio/keymaps/rate/keymap.c      |  2 +-
 keyboards/rate/pistachio/keymaps/via/keymap.c |  2 +-
 .../pistachio_pro/keymaps/default/keymap.c    |  2 +-
 .../rate/pistachio_pro/keymaps/rate/keymap.c  |  2 +-
 .../rate/pistachio_pro/keymaps/via/keymap.c   |  2 +-
 .../nomu30/keymaps/center_sprit/keymap.c      |  8 ++---
 .../nomu30/keymaps/center_sprit/readme.md     |  4 +--
 .../nomu30/keymaps/like_jis/keymap.c          | 10 +++---
 .../nomu30/keymaps/like_jis/readme.md         |  4 +--
 .../reviung33/keymaps/default_jp/keymap.c     |  2 +-
 .../reviung34/keymaps/default_jp/keymap.c     |  2 +-
 .../reviung41/keymaps/ciutadellla/keymap.c    |  2 +-
 keyboards/rocketboard_16/keycode_lookup.c     | 31 +++++++++----------
 keyboards/rocketboard_16/keycode_lookup.h     |  2 +-
 .../7skb/keymaps/salicylic/keymap.c           |  4 +--
 .../7splus/keymaps/salicylic/keymap.c         |  4 +--
 .../ajisai74/keymaps/jis/keymap.c             |  2 +-
 .../ajisai74/keymaps/salicylic/keymap.c       |  2 +-
 .../ergoarrows/keymaps/salicylic/keymap.c     |  2 +-
 .../jisplit89/keymaps/default/keymap.c        |  4 +--
 .../jisplit89/keymaps/salicylic/keymap.c      |  4 +--
 .../jisplit89/keymaps/via/keymap.c            |  4 +--
 .../naked48/keymaps/salicylic/keymap.c        |  6 ++--
 .../keymaps/salicylic_with_nafuda/keymap.c    | 10 +++---
 .../keymaps/salicylic_with_setta21/keymap.c   |  6 ++--
 .../naked60/keymaps/salicylic/keymap.c        |  4 +--
 .../keymaps/salicylic_with_nafuda/keymap.c    |  4 +--
 .../keymaps/salicylic_with_setta21/keymap.c   |  4 +--
 .../naked64/keymaps/salicylic/keymap.c        |  4 +--
 .../keymaps/salicylic_with_setta21/keymap.c   |  4 +--
 .../nknl7en/keymaps/salicylic/keymap.c        |  2 +-
 .../nknl7jp/keymaps/default/keymap.c          |  4 +--
 .../nknl7jp/keymaps/salicylic/keymap.c        |  2 +-
 .../nknl7jp/keymaps/via/keymap.c              |  4 +--
 keyboards/satt/comet46/keymaps/satt/keymap.c  |  2 +-
 .../satt/comet46/keymaps/satt/keymap_jis2us.h |  4 +--
 .../amber80/solder/keymaps/default/keymap.c   |  2 +-
 .../amber80/solder/keymaps/via/keymap.c       |  2 +-
 .../vcl65/solder/keymaps/default/keymap.c     |  2 +-
 .../vcl65/solder/keymaps/via/keymap.c         |  2 +-
 keyboards/sparrow62/keymaps/74th/keymap.c     |  2 +-
 .../kyria/keymaps/cjuniet/default.json        |  2 +-
 .../splitkb/kyria/keymaps/cjuniet/keymap.c    |  2 +-
 .../center_enter/keymaps/default/keymap.c     | 14 ++++-----
 .../center_enter/keymaps/via/keymap.c         | 14 ++++-----
 .../compacx/keymaps/default/keymap.c          |  6 ++--
 .../compacx/keymaps/via/keymap.c              |  6 ++--
 .../endzone34/keymaps/default/keymap.c        |  8 ++---
 .../endzone34/keymaps/via/keymap.c            |  8 ++---
 .../goat51/keymaps/default/keymap.c           | 18 +++++------
 .../goat51/keymaps/via/keymap.c               | 12 +++----
 .../heavy_left/keymaps/default/keymap.c       |  4 +--
 .../keymaps/takashicompany/keymap.c           |  6 ++--
 .../heavy_left/keymaps/via/keymap.c           |  4 +--
 .../minizone/keymaps/default/keymap.c         | 20 ++++++------
 .../keymaps/pimoroni_trackball/keymap.c       | 20 ++++++------
 .../minizone/keymaps/via/keymap.c             | 20 ++++++------
 .../qoolee/keymaps/default/keymap.c           |  6 ++--
 .../qoolee/keymaps/via/keymap.c               |  6 ++--
 .../radialex/keymaps/default/keymap.c         | 20 ++++++------
 .../radialex/keymaps/via/keymap.c             | 20 ++++++------
 .../spreadwriter/keymaps/default/keymap.c     | 16 +++++-----
 .../spreadwriter/keymaps/via/keymap.c         | 16 +++++-----
 .../hecomi/keymaps/default/keymap.c           |  4 +--
 .../hecomi/keymaps/kakunpc/keymap.c           |  2 +-
 .../otaku_split/rev0/keymaps/default/keymap.c |  6 ++--
 .../otaku_split/rev0/keymaps/sample/keymap.c  |  6 ++--
 .../otaku_split/rev1/keymaps/default/keymap.c | 10 +++---
 .../otaku_split/rev1/keymaps/sample/keymap.c  |  6 ++--
 .../minivan/keymaps/like_jis/keymap.c         |  8 ++---
 .../le_chiffre/keymaps/default/keymap.c       |  2 +-
 .../rev1/keymaps/default/keymap.c             |  2 +-
 .../rev1/keymaps/default_big_space/keymap.c   |  2 +-
 .../rev2/keymaps/default/keymap.c             |  2 +-
 .../rev2/keymaps/default_big_space/keymap.c   |  2 +-
 keyboards/uranuma/keymaps/default/keymap.c    |  2 +-
 keyboards/whale/sk/keymaps/default/keymap.c   |  2 +-
 .../xd75/keymaps/atomic_style_jp/keymap.c     | 20 ++++++------
 .../quick17/keymaps/default/keymap.c          |  8 ++---
 .../yushakobo/quick17/keymaps/via/keymap.c    |  8 ++---
 .../community/ergodox/ishigoya-jp/keymap.c    |  2 +-
 layouts/community/ergodox/siroken3/keymap.c   |  4 +--
 .../community/planck_mit/guidoism/keys.json   |  2 --
 quantum/keycode_legacy.h                      | 18 -----------
 243 files changed, 720 insertions(+), 754 deletions(-)
 delete mode 100644 keyboards/clueboard/66/rev4/keymaps/keymap.c

diff --git a/docs/api_docs.md b/docs/api_docs.md
index 237b02fed2..3ed87db2b2 100644
--- a/docs/api_docs.md
+++ b/docs/api_docs.md
@@ -14,7 +14,7 @@ This service is an asynchronous API for compiling custom keymaps. You POST some
   "keymap": "my_awesome_keymap",
   "layout": "LAYOUT_all",
   "layers": [
-    ["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_GRV","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_LSFT","KC_NUBS","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RO","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_MHEN","KC_SPC","KC_SPC","KC_HENK","KC_RALT","KC_RCTL","MO(1)","KC_LEFT","KC_DOWN","KC_RIGHT"],
+    ["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_GRV","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_LSFT","KC_NUBS","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_INT1","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_INT5","KC_SPC","KC_SPC","KC_INT4","KC_RALT","KC_RCTL","MO(1)","KC_LEFT","KC_DOWN","KC_RIGHT"],
     ["KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_TRNS","KC_DEL","BL_STEP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","_______","KC_TRNS","KC_PSCR","KC_SLCK","KC_PAUS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_LEFT","KC_PGDN","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","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","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
   ]
diff --git a/docs/keymap.md b/docs/keymap.md
index ddcf782140..ea702ff0f2 100644
--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -147,8 +147,8 @@ Here is an example of the Clueboard's base layer:
       F(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,   KC_GRV,  KC_BSPC,          KC_PGUP, \
       KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN, \
       KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,                             \
-      KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,            \
-      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,          KC_SPC,KC_SPC,                        KC_HENK,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
+      KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,            \
+      KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
 
 Some interesting things to note about this:
 
diff --git a/keyboards/25keys/aleth42/keymaps/default/keymap.c b/keyboards/25keys/aleth42/keymaps/default/keymap.c
index 4868bbce1d..a95fa7acf4 100644
--- a/keyboards/25keys/aleth42/keymaps/default/keymap.c
+++ b/keyboards/25keys/aleth42/keymaps/default/keymap.c
@@ -119,13 +119,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 if (clockwise) {
                 //    tap_code(KC_VOLU);
                     if(keymap_config.swap_lalt_lgui==false){
-                        tap_code(KC_LANG2);
+                        tap_code(KC_LNG2);
                     }else {
                         tap_code16(A(KC_GRV));
                     }
                 } else {
                     if(keymap_config.swap_lalt_lgui==false){
-                    tap_code(KC_LANG1);
+                    tap_code(KC_LNG1);
                     } else {
                         tap_code16(A(KC_GRV));
                     }
diff --git a/keyboards/25keys/aleth42/keymaps/via/keymap.c b/keyboards/25keys/aleth42/keymaps/via/keymap.c
index fc0c2c46c9..82fe4456f3 100644
--- a/keyboards/25keys/aleth42/keymaps/via/keymap.c
+++ b/keyboards/25keys/aleth42/keymaps/via/keymap.c
@@ -119,13 +119,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 if (clockwise) {
                 //    tap_code(KC_VOLU);
                     if(keymap_config.swap_lalt_lgui==false){
-                        tap_code(KC_LANG2);
+                        tap_code(KC_LNG2);
                     }else {
                         tap_code16(A(KC_GRV));
                     }
                 } else {
                     if(keymap_config.swap_lalt_lgui==false){
-                    tap_code(KC_LANG1);
+                    tap_code(KC_LNG1);
                     } else {
                         tap_code16(A(KC_GRV));
                     }
diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c
index 925d252247..5c3fcd53de 100644
--- a/keyboards/25keys/zinc/keymaps/default/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/default/keymap.c
@@ -271,24 +271,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
          SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
index 26190a2a91..7bf5974974 100644
--- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
@@ -283,24 +283,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
          SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/25keys/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c
index 8670a58efb..d0fae14177 100644
--- a/keyboards/25keys/zinc/keymaps/monks/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/monks/keymap.c
@@ -212,24 +212,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
          SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
index 122ecd3611..1f7bd727c1 100644
--- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] =  LAYOUT_ortho_4x12(
     RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  XXXXXXX,   RGB_TOG,    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  XXXXXXX,
     RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, XXXXXXX,   XXXXXXX,    KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  XXXXXXX,
-    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LANG1,  KC_LANG2,
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, KC_KANA
+    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LNG1,  KC_LNG2,
+    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, KC_INT2
     ),
 };
diff --git a/keyboards/25keys/zinc/keymaps/via/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c
index 22c08b0abb..29a4bdc5bd 100644
--- a/keyboards/25keys/zinc/keymaps/via/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/via/keymap.c
@@ -154,23 +154,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case EISU:
             if (record->event.pressed) {
                 if(keymap_config.swap_lalt_lgui==false){
-                    register_code(KC_LANG2);
+                    register_code(KC_LNG2);
                 } else {
                     SEND_STRING(SS_LALT("`"));
                 }
             } else {
-                unregister_code(KC_LANG2);
+                unregister_code(KC_LNG2);
             }
             return false;
         case KANA:
             if (record->event.pressed) {
                 if(keymap_config.swap_lalt_lgui==false){
-                    register_code(KC_LANG1);
+                    register_code(KC_LNG1);
                 } else {
                     SEND_STRING(SS_LALT("`"));
                 }
             } else {
-                unregister_code(KC_LANG1);
+                unregister_code(KC_LNG1);
             }
             return false;
         case RGBRST:
diff --git a/keyboards/adkb96/keymaps/default/keymap.c b/keyboards/adkb96/keymaps/default/keymap.c
index dc1e9d7b53..bf6f4140e9 100644
--- a/keyboards/adkb96/keymaps/default/keymap.c
+++ b/keyboards/adkb96/keymaps/default/keymap.c
@@ -5,10 +5,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
 	KC_ESC,	XXXXXXX,KC_F1,	KC_F2,	KC_F3,	KC_F4,	KC_F5,	KC_F6,	KC_F7,	KC_F8,	KC_F9,	KC_F10,	KC_F11,	KC_F12,	KC_INS,	KC_DEL,
-	KC_ZKHK,KC_1,	KC_2,	KC_3,	KC_4,	KC_5,	KC_6,	KC_7,	KC_8,	KC_9,	KC_0,	KC_MINS,KC_EQL,	KC_JYEN,KC_BSPC,KC_BSPC,
+	KC_GRV,KC_1,	KC_2,	KC_3,	KC_4,	KC_5,	KC_6,	KC_7,	KC_8,	KC_9,	KC_0,	KC_MINS,KC_EQL,	KC_INT3,KC_BSPC,KC_BSPC,
 	KC_TAB,	KC_TAB,	KC_Q,	KC_W,	KC_E,	KC_R,	KC_T,	KC_Y,	KC_U,	KC_I,	KC_O,	KC_P,	KC_LBRC,KC_RBRC,KC_ENT,	KC_ENT,
 	KC_CAPS,KC_CAPS,KC_A,	KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,	KC_L,	KC_SCLN,KC_QUOT,KC_BSLS,KC_ENT,	KC_ENT,
-	KC_LSFT,KC_LSFT,KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMM,KC_DOT,	KC_SLSH,KC_RO,	KC_UP,	KC_RSFT,KC_RSFT,
-	KC_LCTL,KC_LALT,KC_LGUI,KC_MHEN,KC_SPC,	KC_SPC,	KC_SPC,	KC_SPC,	KC_HENK,KC_KANA,KC_RALT,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT,XXXXXXX
+	KC_LSFT,KC_LSFT,KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMM,KC_DOT,	KC_SLSH,KC_INT1,	KC_UP,	KC_RSFT,KC_RSFT,
+	KC_LCTL,KC_LALT,KC_LGUI,KC_INT5,KC_SPC,	KC_SPC,	KC_SPC,	KC_SPC,	KC_INT4,KC_INT2,KC_RALT,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT,XXXXXXX
   )
 };
diff --git a/keyboards/ai03/jp60/keymaps/via/keymap.c b/keyboards/ai03/jp60/keymaps/via/keymap.c
index 7ee7327a96..9930e8e753 100644
--- a/keyboards/ai03/jp60/keymaps/via/keymap.c
+++ b/keyboards/ai03/jp60/keymaps/via/keymap.c
@@ -26,11 +26,11 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT( /* Base */
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, 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,  JP_YEN,  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,                  
         MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,            KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,                            KC_SPC,                             KC_HENK, KC_KANA, KC_GRV,  KC_CAPS
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_BSLS,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                            KC_SPC,                             JP_HENK, JP_KANA, KC_GRV,  KC_CAPS
     ),
     [_FN1] = LAYOUT( /* 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,  _______, _______,
diff --git a/keyboards/arabica37/keymaps/default/keymap.c b/keyboards/arabica37/keymaps/default/keymap.c
index 92e8a46598..e15e872d02 100644
--- a/keyboards/arabica37/keymaps/default/keymap.c
+++ b/keyboards/arabica37/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
     KC_TRNS,KC_RBRC,KC_LABK,KC_ASTR,KC_SCLN,KC_LBRC,              KC_1,   KC_2,   KC_3,   KC_4,   KC_5, KC_EQL,
  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-    KC_TRNS,KC_BSLS,KC_RABK,KC_LPRN,KC_JYEN,KC_UNDS,              KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_PENT,
+    KC_TRNS,KC_BSLS,KC_RABK,KC_LPRN,KC_INT3,KC_UNDS,              KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_PENT,
  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+--- ---+-------+-------|
     KC_TRNS,                        KC_TRNS,KC_TRNS,           KC_TRNS,KC_TRNS,                        KC_TRNS,
  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+--- ---+-------+-------|
diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json
index 2c6b09fc09..3fc5221f71 100644
--- a/keyboards/baguette/info.json
+++ b/keyboards/baguette/info.json
@@ -140,7 +140,7 @@
         {"label":",", "x":9.25, "y":3},
         {"label":".", "x":10.25, "y":3},
         {"label":"/", "x":11.25, "y":3},
-        {"label":"JP_RO", "x":12.25, "y":3},
+        {"label":"\\", "x":12.25, "y":3},
         {"label":"Shift", "x":13.25, "y":3, "w":1.25},
         {"label":"Up", "x":14.5, "y":3},
         {"label":"GUI", "x":1.25, "y":4},
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c
index 01b3383780..9076066f9f 100644
--- a/keyboards/bajjak/keymaps/5x6/keymap.c
+++ b/keyboards/bajjak/keymaps/5x6/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CAPS,    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_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_RSFT,
     KC_LCTRL,   GUI_T(KC_GRV),  ALT_T(KC_BSLS),     KC_LEFT,    KC_RGHT,                                                      KC_UP,      KC_DOWN,    KC_LBRC,    KC_RBRC,    DF(SYMB),
-                                                                         CTL_T(KC_ESC), KC_LALT,        KC_RGUI, CTL_T(KC_HAEN),
+                                                                         CTL_T(KC_ESC), KC_LALT,        KC_RGUI, CTL_T(KC_LNG1),
                                                                                         KC_HOME,        KC_PGUP,
                                                                         KC_BSPC, KC_DEL, KC_END,        KC_PGDN, KC_ENT, KC_SPC
 ),
diff --git a/keyboards/bandominedoni/bandominedoni.h b/keyboards/bandominedoni/bandominedoni.h
index 6011a2cc71..c83958ce8a 100644
--- a/keyboards/bandominedoni/bandominedoni.h
+++ b/keyboards/bandominedoni/bandominedoni.h
@@ -74,8 +74,8 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE  LT(_FN, KC_MUTE)
 #define DF_QWER  DF(_QWERTY)
-#define MIS_EIS  LT(_MISC,KC_LANG2)
-#define MIS_KAN  LT(_MISC,KC_LANG1)
+#define MIS_EIS  LT(_MISC,KC_LNG2)
+#define MIS_KAN  LT(_MISC,KC_LNG1)
 
 
 //  Overriding is_keyboard_left() in qmk_firmware/quantum/split_common/split_util.c to limit the handedness check only once.
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
index 6a58e24bd4..be24bce099 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT( \
   KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
   KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
-  KC_LCTRL, KC_LGUI, KC_APP, TG(BIAC),LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_JYEN \
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
+  KC_LCTRL, KC_LGUI, KC_APP, TG(BIAC),LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
 ),
 
 /* META
@@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [META] = LAYOUT( \
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-  _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
-  _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+  _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+  _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1), \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
 ),
 
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = LAYOUT( \
   S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
 ),
 
@@ -89,8 +89,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [GAME] = LAYOUT( \
   KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
   KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_JYEN \
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
+  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
 ),
 
 /* BIAC
@@ -109,8 +109,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BIAC] = LAYOUT( \
   KC_TAB,   KC_SCLN,KC_COMM, KC_DOT,  KC_P,             KC_Q,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_G,    KC_D,     KC_M,     KC_F,     KC_LBRC, \
   KC_LALT,  KC_A,    KC_O,   KC_E,    KC_I,             KC_U,          S(KC_8),       S(KC_9),    KC_B,             KC_N,    KC_T,     KC_R,     KC_S,     KC_QUOT, \
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_W,          S(KC_RBRC),    S(KC_BSLS), KC_H,             KC_J,    KC_K,     KC_L,     KC_SLSH,  SFT_T(KC_RO), \
-  KC_LCTRL, KC_LGUI, KC_APP, _______, LT(BSYMB, KC_ESC),RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(BMETA, KC_ENT),KC_DEL,  KC_PSCR,  XXXXXXX,  XXXXXXX,  KC_JYEN \
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_W,          S(KC_RBRC),    S(KC_BSLS), KC_H,             KC_J,    KC_K,     KC_L,     KC_SLSH,  SFT_T(KC_INT1), \
+  KC_LCTRL, KC_LGUI, KC_APP, _______, LT(BSYMB, KC_ESC),RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(BMETA, KC_ENT),KC_DEL,  KC_PSCR,  XXXXXXX,  XXXXXXX,  KC_INT3 \
 ),
 
 /* META
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BMETA] = LAYOUT( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  KC_F12, \
   _______, KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-  _______, KC_1,    XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, SFT_T(KC_RO), \
+  _______, KC_1,    XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, SFT_T(KC_INT1), \
   _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
 ),
 
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BSYMB] = LAYOUT( \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX,    KC_RBRC,    KC_BSLS,   S(KC_SCLN), S(KC_QUOT), \
   _______, S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
-  _______, S(KC_1), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, S(KC_RBRC), S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+  _______, S(KC_1), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, S(KC_RBRC), S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), \
   _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______,    _______,    _______,    _______,   _______,    _______ \
 )
 
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
index d0c7acc672..8210fd8ed9 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), GUI_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), GUI_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
   ),
 
   /* META
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT( \
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+    _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [SYMB] = LAYOUT( \
     S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
   ),
 
@@ -81,8 +81,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [GAME] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   )
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
index a2b276a847..40a85fa0f2 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
@@ -35,8 +35,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(RGB),  KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(RGB),  KC_INT3 \
   ),
 
   /* META
@@ -53,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT( \
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+    _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [SYMB] = LAYOUT( \
     S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
   ),
 
@@ -92,8 +92,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [GAME] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   ),
 
   /* RGB
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
index 8a91b625eb..8672f0d2d0 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(JP_BSLS), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), JP_YEN \
   ),
 
   /* META
@@ -48,8 +48,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT( \
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+    _______, KC_F1,   XXXXXXX, JP_MHEN, JP_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(JP_BSLS), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [SYMB] = LAYOUT( \
     S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(JP_BSLS), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
   ),
 
@@ -87,8 +87,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [GAME] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(JP_BSLS), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, JP_YEN \
   )
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
index 5672ddd864..b0ad50e77c 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
   ),
 
   /* META
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT( \
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+    _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [SYMB] = LAYOUT( \
     S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
   ),
 
@@ -81,8 +81,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [GAME] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   )
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
index 5718cceeec..b04c88f804 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,       KC_R,             KC_T,           KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,       KC_F,             KC_G,           S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,       KC_V,             KC_B,           S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, TG(ILLUST), LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(ILLUST), KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,       KC_V,             KC_B,           S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, TG(ILLUST), LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(ILLUST), KC_INT3 \
   ),
 
   /* META
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT( \
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+    _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1), \
     _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, XXXXXXX, _______ \
   ),
 
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [SYMB] = LAYOUT( \
     S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), \
     _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______,    XXXXXXX,   XXXXXXX,    _______ \
   ),
 
@@ -82,8 +82,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [GAME] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, XXXXXXX, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, XXXXXXX, KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, XXXXXXX, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, XXXXXXX, KC_INT3 \
   ),
 
   /* ILLUST
diff --git a/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c
index 28d3fa0783..f73e6cd01c 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT( \
     QK_BOOT,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LBRC,    KC_RBRC,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, XXXXXXX,    KC_LEFT,    KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, \
+    _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, XXXXXXX,    KC_LEFT,    KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, \
     _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   S(KC_LBRC), S(KC_RBRC), KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
     _______, _______, _______, _______, _______, _______, _______,    _______,    _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \
   ),
diff --git a/keyboards/biacco42/ergo42/keymaps/default/keymap.c b/keyboards/biacco42/ergo42/keymaps/default/keymap.c
index d14e068e86..815ea92bf4 100644
--- a/keyboards/biacco42/ergo42/keymaps/default/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT(
     QK_BOOT,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LBRC,    KC_RBRC,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, XXXXXXX,    KC_LEFT,    KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______,
+    _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, XXXXXXX,    KC_LEFT,    KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______,
     _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   S(KC_LBRC), S(KC_RBRC), KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
     _______, _______, _______, _______, _______, _______, _______,    _______,    _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX
   ),
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
index 22f28fa25d..b7a8d64c27 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
@@ -26,12 +26,12 @@ enum custom_keycodes {
 // Use Dynamic macro
 #include "dynamic_macro.h"
 
-#define KC_LOWR LT(_LOWER, KC_MHEN)    // タップで無変換     ホールドでLower
-#define KC_RASE LT(_RAISE, KC_HENK)    // タップで変換       ホールドでRaise
+#define KC_LOWR LT(_LOWER, JP_MHEN)    // タップで無変換     ホールドでLower
+#define KC_RASE LT(_RAISE, JP_HENK)    // タップで変換       ホールドでRaise
 #define KC_LSLB MT(MOD_LSFT, JP_LBRC)  // タップで[          ホールドで左Shift
 #define KC_RSRB MT(MOD_RSFT, JP_RBRC)  // タップで]          ホールドで右Shift
 #define KC_ALTB MT(MOD_LALT, KC_TAB)   // タップでTAB        ホールドで左Alt
-#define CTL_ZH  CTL_T(KC_ZKHK)         // タップで半角/全角  ホールドで左Control     (Windows)
+#define CTL_ZH  CTL_T(JP_ZKHK)         // タップで半角/全角  ホールドで左Control     (Windows)
 #define WN_CAPS S(KC_CAPS)             // Caps Lock                                  (Windows)
 #define KC_ALPS LALT(KC_PSCR)          // Alt + PrintScreen
 #define LOWER MO(_LOWER)
diff --git a/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c b/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
index 94d57936ed..d1ae693221 100644
--- a/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, KC_LGUI, ALT_T(KC_MHEN), _______, _______, _______, _______, ALT_T(KC_HENK), _______, _______, _______, _______ \
+  _______, _______, _______, KC_LGUI, ALT_T(KC_INT5), _______, _______, _______, _______, ALT_T(KC_INT4), _______, _______, _______, _______ \
 ),
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
index fcc00c411d..d8a1a4a07c 100644
--- a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
@@ -25,8 +25,8 @@ enum {
   _FUNC
 };
 
-#define KC_KNA  KC_LANG1
-#define KC_EISU KC_LANG2
+#define KC_KNA  KC_LNG1
+#define KC_EISU KC_LNG2
 #define LOWER   MO(_LOWER)
 #define RAISE   MO(_RAISE)
 #define FN      MO(_FUNC)
@@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_WIN] = LAYOUT( \
     KC_ESC,  KC_DEL,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   KC_BSPC, \
     KC_TAB,  KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, KC_ENT,  \
-    KC_ZKHK, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT, \
-    FN,      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, LOWER,   KC_SPC,   KC_SPC,  RAISE,   KC_HENK, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT  \
+    JP_ZKHK, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT, \
+    FN,      KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, LOWER,   KC_SPC,   KC_SPC,  RAISE,   JP_HENK, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT  \
   ),
 
   /* MACOS
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_RAISE] = LAYOUT( \
     _______, _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, _______, \
-    _______, _______, KC_F11,  KC_F12,  XXXXXXX, JP_LBRC, JP_LPRN,  JP_RPRN, JP_RBRC, XXXXXXX, JP_CIRC, KC_JYEN, KC_RO,   _______, \
+    _______, _______, KC_F11,  KC_F12,  XXXXXXX, JP_LBRC, JP_LPRN,  JP_RPRN, JP_RBRC, XXXXXXX, JP_CIRC, JP_YEN,  JP_BSLS, _______, \
     _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, \
     _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______  \
   ),
diff --git a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
index 84fa64c7b1..470f4a1c95 100644
--- a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
@@ -94,8 +94,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_GAME] = LAYOUT( \
   KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
   KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_JYEN \
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
+  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
 )
 
 };
@@ -143,17 +143,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case EISU:
       if (record->event.pressed) {
-        register_code(KC_LANG2);
+        register_code(KC_LNG2);
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
-        register_code(KC_LANG1);
+        register_code(KC_LNG1);
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c
index 2b87493f11..ffdb52de04 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c
@@ -25,11 +25,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
   {
    /* Layer 0: Standard JIS layer */
    [KM_JIS] = LAYOUT_tkl_jis(KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,            KC_PSCR,KC_SLCK,KC_PAUS,
-                             KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_JYEN, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,
+                             KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_INT3, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,
                              KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,                   KC_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_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_RO,  KC_RSFT,                           KC_UP,
-                             KC_LCTL, KC_LGUI,KC_LALT,KC_MHEN,        KC_SPC,                 KC_HENK,KC_KANA,KC_RALT,MO(1),  KC_RCTL,                   KC_LEFT,KC_DOWN,KC_RGHT),
+                             KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,                           KC_UP,
+                             KC_LCTL, KC_LGUI,KC_LALT,KC_INT5,        KC_SPC,                 KC_INT4,KC_INT2,KC_RALT,MO(1),  KC_RCTL,                   KC_LEFT,KC_DOWN,KC_RGHT),
    /* Layer 1: Function layer */
    [KM_MEDIA] = LAYOUT_tkl_jis(_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,           KC_WAKE,KC_PWR, KC_SLEP,
                                _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,KC_VOLU,
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
index a64c5dec03..e8ef282a67 100644
--- a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_INS,  KC_DEL,           KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSPO, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSPC,          KC_UP,
+  KC_LSPO, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSPC,          KC_UP,
   KC_LCTL, KC_LGUI, MO(_FL), KC_LALT,          KC_BSPC,KC_SPC,                       KC_RALT,  KC_APP,   MO(_FL),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
index 4767f0f7ea..2e85c8bb8c 100644
--- a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
@@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,          KC_SPC,KC_SPC,                        KC_HENK,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c
index daacbe9664..b2a755ca41 100644
--- a/keyboards/clueboard/66/keymaps/colemak/keymap.c
+++ b/keyboards/clueboard/66/keymaps/colemak/keymap.c
@@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          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_PGDN,
   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_NUHS,  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_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,KC_MHEN,          KC_SPC,KC_SPC,                         KC_HENK,  KC_RALT,  MO(_FL),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+  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_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT,KC_INT5,          KC_SPC,KC_SPC,                         KC_INT4,  KC_RALT,  MO(_FL),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/default/keymap.c b/keyboards/clueboard/66/keymaps/default/keymap.c
index adb60c9035..92ea0c8627 100644
--- a/keyboards/clueboard/66/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66/keymaps/default/keymap.c
@@ -13,8 +13,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
-  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RO,  KC_RSFT,        KC_UP,
-  KC_LCTL,KC_LGUI,KC_LALT,KC_MHEN,        KC_SPC, KC_SPC,                         KC_HENK,KC_RALT,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
+  KC_LCTL,KC_LGUI,KC_LALT,KC_INT5,        KC_SPC, KC_SPC,                         KC_INT4,KC_RALT,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
index 0558dffd28..f2050a0235 100644
--- a/keyboards/clueboard/66/keymaps/jokrik/keymap.c
+++ b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,          KC_PSCR,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,                   KC_PAUS,
   KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
+  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
   KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,KC_SPC,                        KC_SPC,   KC_RALT,  MO(_FL),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
index 5c184e69e9..56b0fdba4b 100644
--- a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
@@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
-  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RO,  KC_RSFT,        KC_UP,
-  KC_LCTL,KC_LALT,KC_LGUI,KC_MHEN,        KC_SPC, KC_SPC,                         KC_HENK,KC_RGUI,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
+  KC_LCTL,KC_LALT,KC_LGUI,KC_INT5,        KC_SPC, KC_SPC,                         KC_INT4,KC_RGUI,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c b/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
index dbe73e55b9..e380286b5a 100644
--- a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
+++ b/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
@@ -13,8 +13,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        RGB_VAI,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                RGB_VAD,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
-  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RO,  KC_RSFT,        KC_UP,
-  KC_LCTL,KC_LGUI,KC_LALT,KC_MHEN,        KC_SPC, KC_SPC,                         KC_HENK,KC_RALT,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
+  KC_LCTL,KC_LGUI,KC_LALT,KC_INT5,        KC_SPC, KC_SPC,                         KC_INT4,KC_RALT,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
index 3a70478a5b..7bedd16d82 100644
--- a/keyboards/clueboard/66/keymaps/maximised/keymap.c
+++ b/keyboards/clueboard/66/keymaps/maximised/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
   MO(_FL), KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  MO(_FL),          KC_UP,
-  KC_LCTL, KC_LALT, KC_LGUI,KC_MHEN,        KC_SPC, KC_SPC,                          KC_HENK,  KC_RGUI,  KC_RALT,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LALT, KC_LGUI,KC_INT5,        KC_SPC, KC_SPC,                          KC_INT4,  KC_RGUI,  KC_RALT,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
index 3d64356e7b..2b8b15a500 100644
--- a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
@@ -16,8 +16,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,          KC_SPC,KC_SPC,                        KC_HENK,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c b/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
index 449f2ed1e7..138ba6f48a 100644
--- a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
@@ -14,8 +14,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC,	KC_1,	KC_2,	KC_3,   KC_4,   KC_5,   KC_6,   KC_7,	KC_8,	KC_9,		KC_0,		KC_MINS,	KC_EQL,		KC_GRV,		KC_BSPC,	KC_HOME,
   KC_TAB,	KC_Q,	KC_W,	KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,		KC_P,		KC_LBRC,	KC_RBRC,	KC_BSLS,				KC_END,
   MO(_FL), 	KC_A,	KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   	KC_SCLN,	KC_QUOT,  	KC_NUHS,  	KC_ENT,
-  KC_LSFT, 	KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,	KC_DOT, 	KC_SLSH,  	KC_RO,   	KC_RSFT,          		KC_UP,
-  KC_LCTL, 	KC_LGUI,KC_LALT,KC_MHEN,        KC_SPC, KC_SPC,                 			KC_HENK,	KC_RALT, 	MO(_FL),  	KC_RCTL, 	KC_LEFT, 	KC_DOWN, 	KC_RGHT),
+  KC_LSFT, 	KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,	KC_DOT, 	KC_SLSH,  	KC_INT1,   	KC_RSFT,          		KC_UP,
+  KC_LCTL, 	KC_LGUI,KC_LALT,KC_INT5,        KC_SPC, KC_SPC,                 			KC_INT4,	KC_RALT, 	MO(_FL),  	KC_RCTL, 	KC_LEFT, 	KC_DOWN, 	KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
index 56b67763dd..8c95e17d49 100644
--- a/keyboards/clueboard/66/keymaps/serubin/keymap.c
+++ b/keyboards/clueboard/66/keymaps/serubin/keymap.c
@@ -16,8 +16,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,    KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   F(1), KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,          KC_SPC,KC_SPC,                        KC_HENK,  KC_RGUI,  MO(_FL),  MO(_ME), KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RGUI,  MO(_FL),  MO(_ME), KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
index 196e6b620a..4e6f9b65e4 100644
--- a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
@@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  MO(_FL), KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,KC_MHEN,          KC_SPC, KC_SPC,                        KC_HENK,  KC_RALT,  KC_RGUI,  KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
+  MO(_FL), KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT,KC_INT5,          KC_SPC, KC_SPC,                        KC_INT4,  KC_RALT,  KC_RGUI,  KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV, KC_F1,     KC_F2,  KC_F3,  KC_F4,  KC_F5,    KC_F6,    KC_F7,  KC_F8,  KC_F9,     KC_F10,    KC_F11,    KC_F12,    S(KC_GRV), KC_DEL,           BL_STEP,
   S(KC_TAB), S(KC_Q),   S(KC_W),S(KC_E),S(KC_R),S(KC_T),  S(KC_Y),  S(KC_U),S(KC_I),S(KC_O),   S(KC_P),   S(KC_LBRC),S(KC_RBRC),S(KC_BSLS),                  S(KC_PGDN),
   S(KC_LCTL),S(KC_A),   MO(_CL),S(KC_D),S(KC_F),S(KC_G),  S(KC_H),  S(KC_J),S(KC_K),S(KC_L),   S(KC_SCLN),S(KC_QUOT),S(KC_NUHS),S(KC_ENT),
-  MO(_FL),   S(KC_NUBS),S(KC_Z),S(KC_X),S(KC_C),S(KC_V),  S(KC_B),  S(KC_N),S(KC_M),S(KC_COMM),S(KC_DOT), S(KC_SLSH),S(KC_RO),  KC_RSFT,           KC_PGUP,
-  KC_LCTL,   KC_LALT,   KC_LGUI,KC_MHEN,        S(KC_SPC),S(KC_SPC),                           KC_HENK,   KC_RGUI,   KC_RALT,   KC_RCTL,   KC_HOME, KC_PGDN, KC_END),
+  MO(_FL),   S(KC_NUBS),S(KC_Z),S(KC_X),S(KC_C),S(KC_V),  S(KC_B),  S(KC_N),S(KC_M),S(KC_COMM),S(KC_DOT), S(KC_SLSH),S(KC_INT1),KC_RSFT,           KC_PGUP,
+  KC_LCTL,   KC_LALT,   KC_LGUI,KC_INT5,        S(KC_SPC),S(KC_SPC),                           KC_INT4,   KC_RGUI,   KC_RALT,   KC_RCTL,   KC_HOME, KC_PGDN, KC_END),
 
   /* Keymap _CL: Control layer
    */
diff --git a/keyboards/clueboard/66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
index 1d223a6add..a702cc9a24 100644
--- a/keyboards/clueboard/66/keymaps/tetris/keymap.c
+++ b/keyboards/clueboard/66/keymaps/tetris/keymap.c
@@ -20,14 +20,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,          KC_SPC,KC_SPC,                        KC_HENK,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,F(1)    ,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
index 472f24b2ef..d706ae2895 100644
--- a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
@@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,       KC_SPC, KC_SPC,                          KC_HENK,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,       KC_SPC, KC_SPC,                          KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
index 9d21fa2617..b184bdd88f 100644
--- a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
@@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_INS,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_DEL,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,          KC_SPC,KC_SPC,                        KC_HENK,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    */
diff --git a/keyboards/clueboard/66/rev4/keymaps/keymap.c b/keyboards/clueboard/66/rev4/keymaps/keymap.c
deleted file mode 100644
index 27280406fe..0000000000
--- a/keyboards/clueboard/66/rev4/keymaps/keymap.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* THIS FILE WAS GENERATED!
- *
- * This file was generated by qmk json2c. You may or may not want to
- * edit it directly.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_SPC, KC_HENK, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-	[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
-	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
-};
diff --git a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c b/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
index 27280406fe..8e5cf923e3 100644
--- a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
+++ b/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
@@ -7,7 +7,7 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_SPC, KC_HENK, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_SPC, KC_INT4, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 	[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
 	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
 };
diff --git a/keyboards/converter/periboard_512/keymaps/default/keymap.c b/keyboards/converter/periboard_512/keymaps/default/keymap.c
index 5d528416f3..1c975a24e4 100644
--- a/keyboards/converter/periboard_512/keymaps/default/keymap.c
+++ b/keyboards/converter/periboard_512/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LALT_T(KC_TAB), KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,   KC_U,  KC_I,  KC_O,  KC_P,    KC_LBRC, KC_RBRC, RALT_T(KC_BSLS),  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     LCTL_T(KC_ESC), KC_A,    KC_S,    KC_D,  KC_F,  KC_G,          KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT, RCTL_T(KC_BSPC),                              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,
-    MO(1),          KC_LALT, LGUI_T(KC_F13),               KC_SPC,        RGUI_T(KC_F13), RALT_T(KC_ENT), KC_HENK, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,            KC_PDOT
+    MO(1),          KC_LALT, LGUI_T(KC_F13),               KC_SPC,        RGUI_T(KC_F13), RALT_T(KC_ENT), KC_INT4, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,            KC_PDOT
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c b/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c
index 5e04ff4b3b..73af9ce02e 100644
--- a/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c
+++ b/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c
@@ -25,6 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_MENU,   KC_UNDO,   KC_TAB,  KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,  KC_BSPC,    KC_DEL, KC_END, KC_PGDN,  KC_P7,  KC_P8, KC_P9,  KC_PPLS,
       KC_SELECT, KC_COPY,   KC_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_EXECUTE,KC_PASTE,  KC_LSFT,     KC_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_FIND,   KC_CUT,    KC_CAPS,KC_LALT,KC_LGUI,KC_HENK,    KC_SPC,     KC_MHEN,KC_KANA,KC_RGUI,KC_APP,KC_RALT,  KC_LEFT,KC_DOWN,KC_RGHT,      KC_P0,     KC_PDOT
+      KC_FIND,   KC_CUT,    KC_CAPS,KC_LALT,KC_LGUI,KC_INT4,    KC_SPC,     KC_INT5,KC_INT2,KC_RGUI,KC_APP,KC_RALT,  KC_LEFT,KC_DOWN,KC_RGHT,      KC_P0,     KC_PDOT
                  ),
 };
diff --git a/keyboards/converter/usb_usb/keymaps/ble/keymap.c b/keyboards/converter/usb_usb/keymaps/ble/keymap.c
index 75c49f0067..710cb90b99 100644
--- a/keyboards/converter/usb_usb/keymaps/ble/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/ble/keymap.c
@@ -39,10 +39,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
 };
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
index 81d916edb9..a623d4cdfa 100644
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -48,11 +48,11 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     LAYOUT_all(
                       ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
diff --git a/keyboards/converter/usb_usb/keymaps/default/keymap.c b/keyboards/converter/usb_usb/keymaps/default/keymap.c
index c7d91fa5b2..ccb6ee8462 100644
--- a/keyboards/converter/usb_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/default/keymap.c
@@ -39,11 +39,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [1] = LAYOUT_all(
                       ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
diff --git a/keyboards/converter/usb_usb/keymaps/narze/keymap.c b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
index 13bc7a3eba..117b6fc00a 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
@@ -51,29 +51,29 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     [_QWERTY] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     HPR_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_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
-    LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LALT, GUI_UNDS,KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
+    LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
+    KC_LCTL, KC_LALT, GUI_UNDS,KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [_COLEMAK] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     HPR_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_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
-    LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LALT, GUI_UNDS,KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
+    LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
+    KC_LCTL, KC_LALT, GUI_UNDS,KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [_QWOC] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     HPR_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_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
-    LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LALT, GUI_UNDS,KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
+    LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
+    KC_LCTL, KC_LALT, GUI_UNDS,KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [_SUPERDUPER] = LAYOUT_all(
                       ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
diff --git a/keyboards/converter/xt_usb/keymaps/default/keymap.c b/keyboards/converter/xt_usb/keymaps/default/keymap.c
index a8cd66ccea..f1410ee450 100644
--- a/keyboards/converter/xt_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/xt_usb/keymaps/default/keymap.c
@@ -44,11 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,            KC_VOLD, KC_VOLU, 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_JYEN, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,   KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,                   KC_SPC,           KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT, KC_PENT
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,                   KC_SPC,           KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT, KC_PENT
     ),
     */
 };
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index 354d33618c..e96ac633a0 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -53,13 +53,13 @@
         {"label":"/", "x":13, "y":2.3},
         {"label":"Shift", "x":14, "y":2.3},
 
-        {"label":"GUI / KC_HANJ", "x":4, "y":3.7},
+        {"label":"GUI", "x":4, "y":3.7},
         {"label":"Lower", "x":5, "y":3.7},
         {"label":"Space", "x":6, "y":3.2, "h":1.5},
 
         {"label":"Enter", "x":8, "y":3.2, "h":1.5},
         {"label":"Raise", "x":9, "y":3.7},
-        {"label":"Alt / KC_HAEN", "x":10, "y":3.7}
+        {"label":"Alt", "x":10, "y":3.7}
       ]
     },
     "LAYOUT_split_3x5_3": {
@@ -100,13 +100,13 @@
         {"label":".", "x":11, "y":2.1},
         {"label":"/", "x":12, "y":2.3},
 
-        {"label":"GUI / KC_HANJ", "x":3, "y":3.7},
+        {"label":"GUI", "x":3, "y":3.7},
         {"label":"Lower", "x":4, "y":3.7},
         {"label":"Space", "x":5, "y":3.2, "h":1.5},
 
         {"label":"Enter", "x":7, "y":3.2, "h":1.5},
         {"label":"Raise", "x":8, "y":3.7},
-        {"label":"Alt / KC_HAEN", "x":9, "y":3.7}
+        {"label":"Alt", "x":9, "y":3.7}
       ]
     }
   }
diff --git a/keyboards/crkbd/keymaps/mcrown/mcrown.h b/keyboards/crkbd/keymaps/mcrown/mcrown.h
index c3ed36eece..22a58dd0ea 100644
--- a/keyboards/crkbd/keymaps/mcrown/mcrown.h
+++ b/keyboards/crkbd/keymaps/mcrown/mcrown.h
@@ -27,8 +27,8 @@
 #define KC_LOWER LOWER
 #define KC_RAISE RAISE
 #define KC_CTLTB CTL_T(KC_TAB)
-#define KC_GUIEI GUI_T(KC_LANG2)
-#define KC_ALTKN ALT_T(KC_LANG1)
+#define KC_GUIEI GUI_T(KC_LNG2)
+#define KC_ALTKN ALT_T(KC_LNG1)
 
 #define LAYOUT_wrapper(...)   LAYOUT(__VA_ARGS__)
 
diff --git a/keyboards/crkbd/keymaps/mcrown/oled.c b/keyboards/crkbd/keymaps/mcrown/oled.c
index 9623b921a7..f88fc0c8d8 100644
--- a/keyboards/crkbd/keymaps/mcrown/oled.c
+++ b/keyboards/crkbd/keymaps/mcrown/oled.c
@@ -94,7 +94,7 @@ inline static char get_ascii(int16_t keycode){
         ascii_idx=code_to_ascii[(uint8_t)keycode];
     }else if(keycode<KC_KP_ENTER){
         ascii_idx=code_to_ascii[SPECIAL_KEYS_SHIFT(keycode)];
-    }else if(KC_LANG1==keycode){
+    }else if(KC_LNG1==keycode){
         ascii_idx=code_to_ascii[ALT_CODE];
     }else if( QK_LSFT==(QK_LSFT&keycode) ){
         ascii_idx=code_to_ascii[RM_LSFT(keycode)];
diff --git a/keyboards/crkbd/keymaps/oled_sample/keymap.c b/keyboards/crkbd/keymaps/oled_sample/keymap.c
index 2545f087f2..1a48165e3f 100644
--- a/keyboards/crkbd/keymaps/oled_sample/keymap.c
+++ b/keyboards/crkbd/keymaps/oled_sample/keymap.c
@@ -34,8 +34,8 @@ enum crkbd_layers {
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)
 #define CTLTB CTL_T(KC_TAB)
-#define GUIEI GUI_T(KC_LANG2)
-#define ALTKN ALT_T(KC_LANG1)
+#define GUIEI GUI_T(KC_LNG2)
+#define ALTKN ALT_T(KC_LNG1)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_split_3x6_3(
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
index 387839c16e..e2557b53fb 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
@@ -48,11 +48,11 @@ enum custom_keycodes {
 #define KC_LVAD  RGB_VAD
 #define KC_LMOD  RGB_MOD
 #define KC_CTLTB CTL_T(KC_TAB)
-#define KC_GUIEI GUI_T(KC_LANG2)
-#define KC_ALTKN ALT_T(KC_LANG1)
-#define KC_CTLEN CTL_T(KC_LANG2)    // for Linux and Windows
-#define KC_GUIEN GUI_T(KC_LANG2)    // for Mac
-#define KC_SFTJP SFT_T(KC_LANG1)
+#define KC_GUIEI GUI_T(KC_LNG2)
+#define KC_ALTKN ALT_T(KC_LNG1)
+#define KC_CTLEN CTL_T(KC_LNG2)    // for Linux and Windows
+#define KC_GUIEN GUI_T(KC_LNG2)    // for Mac
+#define KC_SFTJP SFT_T(KC_LNG1)
 #define KC_ALTSP ALT_T(KC_SPACE)
 #define KC_ALTDL ALT_T(KC_DEL)
 
diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c
index 77229a3603..f8b01f32ba 100644
--- a/keyboards/crkbd/keymaps/vayashiko/keymap.c
+++ b/keyboards/crkbd/keymaps/vayashiko/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_ESC, JP_EXLM,  JP_DQT, JP_HASH,  KC_DLR, JP_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_MINS, JP_CIRC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL,  KC_GRV, XXXXXXX, XXXXXXX, KC_MHEN,    KC_G,                      XXXXXXX, KC_HENK, JP_LBRC, JP_RBRC, XXXXXXX,  JP_YEN,
+      KC_LCTL,  KC_GRV, XXXXXXX, XXXXXXX, JP_MHEN,    KC_G,                      XXXXXXX, JP_HENK, JP_LBRC, JP_RBRC, XXXXXXX,  JP_YEN,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     JP_EQL,JP_AT,LSFT(JP_LBRC),LSFT(JP_RBRC),XXXXXXX,JP_UNDS,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/dailycraft/bat43/keymaps/default/keymap.c b/keyboards/dailycraft/bat43/keymaps/default/keymap.c
index 5e4faccf98..9d2af38852 100644
--- a/keyboards/dailycraft/bat43/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/bat43/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT,
         KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
-                                   KC_LGUI, KC_LANG2,L_SPC,            R_ENT,   KC_LANG1,KC_RALT,
+                                   KC_LGUI, KC_LNG2, L_SPC,            R_ENT,   KC_LNG1, KC_RALT,
                                             KC_A,    KC_B,             KC_C,    KC_D,    KC_E
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/dailycraft/bat43/keymaps/via/keymap.c b/keyboards/dailycraft/bat43/keymaps/via/keymap.c
index 0bd07b6017..bed5c9256d 100644
--- a/keyboards/dailycraft/bat43/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/bat43/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT,
         KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
-                                   KC_LGUI, KC_LANG2,L_SPC,            R_ENT,   KC_LANG1,KC_RALT,
+                                   KC_LGUI, KC_LNG2, L_SPC,            R_ENT,   KC_LNG1, KC_RALT,
                                             KC_A,    KC_B,             KC_C,    KC_D,    KC_E
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/dailycraft/claw44/keymaps/default/keymap.c b/keyboards/dailycraft/claw44/keymaps/default/keymap.c
index 5150db1ab1..e7e5cc99e1 100644
--- a/keyboards/dailycraft/claw44/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/claw44/keymaps/default/keymap.c
@@ -28,8 +28,8 @@ enum layer_number {
 
 #define KC_L_SPC LT(_LOWER, KC_SPC)  // lower
 #define KC_R_ENT LT(_RAISE, KC_ENT)  // raise
-#define KC_G_JA LGUI_T(KC_LANG1)     // cmd or win
-#define KC_G_EN LGUI_T(KC_LANG2)     // cmd or win
+#define KC_G_JA LGUI_T(KC_LNG1)      // cmd or win
+#define KC_G_EN LGUI_T(KC_LNG2)      // cmd or win
 #define KC_C_BS LCTL_T(KC_BSPC)      // ctrl
 #define KC_A_DEL ALT_T(KC_DEL)       // alt
 
diff --git a/keyboards/dailycraft/claw44/keymaps/oled/keymap.c b/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
index fd2d47b60c..9b98d05279 100644
--- a/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
+++ b/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
@@ -30,8 +30,8 @@ enum layer_number {
 
 #define KC_L_SPC LT(_LOWER, KC_SPC)  // lower
 #define KC_R_ENT LT(_RAISE, KC_ENT)  // raise
-#define KC_G_JA LGUI_T(KC_LANG1)     // cmd or win
-#define KC_G_EN LGUI_T(KC_LANG2)     // cmd or win
+#define KC_G_JA LGUI_T(KC_LNG1)      // cmd or win
+#define KC_G_EN LGUI_T(KC_LNG2)      // cmd or win
 #define KC_C_BS LCTL_T(KC_BSPC)      // ctrl
 #define KC_A_DEL ALT_T(KC_DEL)       // alt
 
diff --git a/keyboards/dailycraft/claw44/keymaps/via/keymap.c b/keyboards/dailycraft/claw44/keymaps/via/keymap.c
index 77544dca62..957c6b5b6a 100644
--- a/keyboards/dailycraft/claw44/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/claw44/keymaps/via/keymap.c
@@ -29,8 +29,8 @@ enum layer_number {
 
 #define KC_L_SPC LT(_LOWER, KC_SPC)  // lower
 #define KC_R_ENT LT(_RAISE, KC_ENT)  // raise
-#define KC_G_JA LGUI_T(KC_LANG1)     // cmd or win
-#define KC_G_EN LGUI_T(KC_LANG2)     // cmd or win
+#define KC_G_JA LGUI_T(KC_LNG1)      // cmd or win
+#define KC_G_EN LGUI_T(KC_LNG2)      // cmd or win
 #define KC_C_BS LCTL_T(KC_BSPC)      // ctrl
 #define KC_A_DEL ALT_T(KC_DEL)       // alt
 
diff --git a/keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
index b21e400482..7b5748054e 100644
--- a/keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ enum layer_number {
 #define KC_G_BS LGUI_T(KC_BSPC)
 #define KC_L_SPC LT(_LOWER, KC_SPC)
 #define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_S_JA LSFT_T(KC_LNG1)
+#define KC_S_EN LSFT_T(KC_LNG2)
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
index b21e400482..7b5748054e 100644
--- a/keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ enum layer_number {
 #define KC_G_BS LGUI_T(KC_BSPC)
 #define KC_L_SPC LT(_LOWER, KC_SPC)
 #define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_S_JA LSFT_T(KC_LNG1)
+#define KC_S_EN LSFT_T(KC_LNG2)
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c
index 5e4035a0af..9eb8aafe09 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ enum layer_number {
 #define KC_G_BS LGUI_T(KC_BSPC)
 #define KC_L_SPC LT(_LOWER, KC_SPC)
 #define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_S_JA LSFT_T(KC_LNG1)
+#define KC_S_EN LSFT_T(KC_LNG2)
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c
index 826b4b4055..a82d9ac6ea 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ enum layer_number {
 #define KC_G_BS LGUI_T(KC_BSPC)
 #define KC_L_SPC LT(_LOWER, KC_SPC)
 #define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_S_JA LSFT_T(KC_LNG1)
+#define KC_S_EN LSFT_T(KC_LNG2)
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
index a31712405e..501b5d2e12 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ enum layer_number {
 #define KC_G_BS LGUI_T(KC_BSPC)
 #define KC_L_SPC LT(_LOWER, KC_SPC)
 #define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_S_JA LSFT_T(KC_LNG1)
+#define KC_S_EN LSFT_T(KC_LNG2)
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
index 6a8482b8ae..97f94366a8 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ enum layer_number {
 #define KC_G_BS LGUI_T(KC_BSPC)
 #define KC_L_SPC LT(_LOWER, KC_SPC)
 #define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_S_JA LSFT_T(KC_LNG1)
+#define KC_S_EN LSFT_T(KC_LNG2)
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
index 32289c44db..b33c0e9648 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
+++ b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
@@ -8,8 +8,8 @@ extern rgblight_config_t rgblight_config;
 #define JA_CLON KC_QUOT  // : and +
 #define JA_AT   KC_LBRC  // @ and `
 #define JA_HAT  KC_EQL   // ^ and ~
-#define JA_ENUN KC_RO    // \ and _ (EN mark and UNder score)
-#define JA_ENVL KC_JYEN  // \ and | (EN mark and Vertical Line)
+#define JA_ENUN KC_INT1  // \ and _ (EN mark and UNder score)
+#define JA_ENVL KC_INT3  // \ and | (EN mark and Vertical Line)
 #define JA_LBRC KC_RBRC  // [ and {
 #define JA_RBRC KC_BSLS  // ] and }
 
@@ -27,11 +27,11 @@ enum CUSTOM_KEYCODES {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [BASE] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, JA_HAT,   KC_JYEN,
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, JA_HAT,   KC_INT3,
     KC_DEL,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    JA_AT,    JA_LBRC,
     KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, JA_CLON,  JA_RBRC,
-    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,    KC_RSFT,
-                      MO(META),KC_LALT, KC_ZKHK, KC_BSPC, KC_SPC,  KC_ENT, KC_BSPC, KC_MHEN, KC_KANA, MO(META)
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1,  KC_RSFT,
+                      MO(META),KC_LALT, KC_GRV,  KC_BSPC, KC_SPC,  KC_ENT, KC_BSPC, KC_INT5, KC_INT2, MO(META)
   ),
 
   [META] = LAYOUT(
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PSCR, KC_HOME, KC_END,
     _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_PAUS, KC_PGUP, KC_UP,   KC_PGDN,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,
-                      _______, _______, KC_RGUI, KC_DEL,  KC_ENT,  _______, KC_DEL,  KC_HENK, KC_LGUI, _______
+                      _______, _______, KC_RGUI, KC_DEL,  KC_ENT,  _______, KC_DEL,  KC_INT4, KC_LGUI, _______
   ),
 
   [CONF] = LAYOUT(
diff --git a/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c b/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
index c419f8893f..261f55baa0 100644
--- a/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______,  _______,
         KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    _______,
                  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   _______,
-        _______, _______, _______, _______, _______, KC_LANG1, KC_LANG2,
+        _______, _______, _______, _______, _______, KC_LNG1,  KC_LNG2,
                           _______, _______, _______, _______,  _______,
              _______, KC_NO,
              _______,
diff --git a/keyboards/fluorite/keymaps/default/keymap.c b/keyboards/fluorite/keymaps/default/keymap.c
index 3dfd8e2efc..567b191f3c 100644
--- a/keyboards/fluorite/keymaps/default/keymap.c
+++ b/keyboards/fluorite/keymaps/default/keymap.c
@@ -34,12 +34,12 @@ enum custom_keycodes {
 #define KC_TTCM1 TT(_CUSTOM1)
 #define KC_TTCM2 TT(_CUSTOM2)
 #define KC_CTLTB CTL_T(KC_TAB)
-#define KC_GUIEI GUI_T(KC_LANG2)
-#define KC_ALTKN ALT_T(KC_LANG1)
+#define KC_GUIEI GUI_T(KC_LNG2)
+#define KC_ALTKN ALT_T(KC_LNG1)
 #define KC_RSHM RSFT(KC_HOME)
 #define KC_RSEN RSFT(KC_END)
-#define KC_RSJY RSFT(KC_JYEN)
-#define KC_RSRO RSFT(KC_RO)
+#define KC_RSJY RSFT(KC_INT3)
+#define KC_RSRO RSFT(KC_INT1)
 #define KC_LSTAB LSFT(KC_TAB)
 #define KC_LSFCO LSFT(KC_COMM)
 #define KC_LSFDO LSFT(KC_DOT)
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
        XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   KC_DEL,     KC_N,    KC_UP,  KC_PENT,     KC_PENT,    KC_UP,  KC_PGDN,   KC_END,  KC_BSPC,  KC_LEFT,  KC_DOWN, KC_RIGHT,  KC_LBRC,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LSFT,  KC_LEFT,  KC_DOWN, KC_RIGHT,     KC_LEFT,  KC_DOWN, KC_RIGHT,  KC_RSFT,   KC_DEL,  KC_RSRO,  KC_SCLN,  KC_QUOT,    KC_RO,
+       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LSFT,  KC_LEFT,  KC_DOWN, KC_RIGHT,     KC_LEFT,  KC_DOWN, KC_RIGHT,  KC_RSFT,   KC_DEL,  KC_RSRO,  KC_SCLN,  KC_QUOT,    KC_INT1,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
         KC_GRV,   KC_TAB,  KC_LSFT,  KC_LCTL,   KC_ESC,   KC_SPC,    LOWER,  KC_LCTL,  KC_LALT,     KC_RALT,  KC_RCTL,    RAISE,   KC_ENT,   KC_ESC,   KC_APP,   KC_ENT,  KC_BSLS,   KC_DEL
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/giabalanai/keymaps/2firmware/keymap.c b/keyboards/giabalanai/keymaps/2firmware/keymap.c
index 2877f8ecd8..3f0012ace4 100644
--- a/keyboards/giabalanai/keymaps/2firmware/keymap.c
+++ b/keyboards/giabalanai/keymaps/2firmware/keymap.c
@@ -27,8 +27,8 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE  LT(_FN, KC_MUTE)
 #define SHIF_UP  RSFT_T(KC_UP)
-#define ADJ_EIS  LT(_ADJUST,KC_LANG2)
-#define MIS_KAN  LT(_MISC,KC_LANG1)
+#define ADJ_EIS  LT(_ADJUST,KC_LNG2)
+#define MIS_KAN  LT(_MISC,KC_LNG1)
 
 // Used to set octave to MI_OCT_0
 extern midi_config_t midi_config;
@@ -286,7 +286,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
@@ -300,7 +300,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
         KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
           KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
-            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
diff --git a/keyboards/giabalanai/keymaps/3araht/keymap.c b/keyboards/giabalanai/keymaps/3araht/keymap.c
index 418b6e0ceb..3a2ed8c0be 100644
--- a/keyboards/giabalanai/keymaps/3araht/keymap.c
+++ b/keyboards/giabalanai/keymaps/3araht/keymap.c
@@ -26,8 +26,8 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE  LT(_FN, KC_MUTE)
 #define SHIF_UP  RSFT_T(KC_UP)
-#define ADJ_EIS  LT(_ADJUST,KC_LANG2)
-#define MIS_KAN  LT(_MISC,KC_LANG1)
+#define ADJ_EIS  LT(_ADJUST,KC_LNG2)
+#define MIS_KAN  LT(_MISC,KC_LNG1)
 
 // Used to set octave to MI_OCT_0
 extern midi_config_t midi_config;
@@ -301,7 +301,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
@@ -315,7 +315,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
         KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
           KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
-            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
diff --git a/keyboards/giabalanai/keymaps/default/keymap.c b/keyboards/giabalanai/keymaps/default/keymap.c
index 7b5f524a4f..bc90e6c386 100644
--- a/keyboards/giabalanai/keymaps/default/keymap.c
+++ b/keyboards/giabalanai/keymaps/default/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
index 82d86594df..674b6a62d5 100644
--- a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
@@ -169,13 +169,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
 
     KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, _______
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, _______
   ),
 
   /* Fn */
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
index 1e773bd233..8317e94cf1 100644
--- a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
@@ -227,13 +227,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
 
     KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, _______
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, _______
   ),
 
   /* Fn */
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
index f7c47d9597..47ca0894ee 100644
--- a/keyboards/giabalanai/keymaps/party/keymap.c
+++ b/keyboards/giabalanai/keymaps/party/keymap.c
@@ -26,8 +26,8 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE  LT(_FN, KC_MUTE)
 #define SHIF_UP  RSFT_T(KC_UP)
-#define ADJ_EIS  LT(_ADJUST,KC_LANG2)
-#define MIS_KAN  LT(_MISC,KC_LANG1)
+#define ADJ_EIS  LT(_ADJUST,KC_LNG2)
+#define MIS_KAN  LT(_MISC,KC_LNG1)
 
 // Used to set octave to MI_OCT_0
 extern midi_config_t midi_config;
@@ -301,7 +301,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
@@ -315,7 +315,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
         KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
           KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
-            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LANG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
+            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c
index 774260d052..7e87a0e71c 100644
--- a/keyboards/giabalanai/keymaps/via/keymap.c
+++ b/keyboards/giabalanai/keymaps/via/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
 
     KC_GESC,
       _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_MINS, KC_BSPC,   _______,
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
index afe1faff1b..444d9fa6c2 100644
--- a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
@@ -169,13 +169,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
 
     KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LANG1, KC_RALT,  KC_RGUI, _______
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, _______
   ),
 
   /* Fn */
diff --git a/keyboards/halfcliff/keymaps/default/keymap.c b/keyboards/halfcliff/keymaps/default/keymap.c
index aff1ffb1de..3708aabcb7 100644
--- a/keyboards/halfcliff/keymaps/default/keymap.c
+++ b/keyboards/halfcliff/keymaps/default/keymap.c
@@ -40,11 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `--------------------------------------------------------------------------------------------------------------------------------------'
     */
     [_DEFAULT] = LAYOUT(
-      KC_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   _______,    KC_6,       KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,
+      JP_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   _______,    KC_6,       KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   _______,    KC_Y,       KC_U,   KC_I,    KC_O,    KC_P,    JP_AT  , JP_LBRC, KC_BSPC,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   _______,    KC_H,       KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN, JP_RBRC, 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_BSLS, KC_UP,   KC_RSFT,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC,  KC_SPC, MO(_LOWER), MO(_RAISE), KC_SPC, KC_HENK, KC_KANA, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC,  KC_SPC, MO(_LOWER), MO(_RAISE), KC_SPC, JP_HENK, JP_KANA, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT
     ),
    /* RAISE
     * ,--------------------------------------------------------------------------------------------------------------------------------------.
diff --git a/keyboards/halfcliff/keymaps/via/keymap.c b/keyboards/halfcliff/keymaps/via/keymap.c
index 424c56abe0..3c0090ffec 100644
--- a/keyboards/halfcliff/keymaps/via/keymap.c
+++ b/keyboards/halfcliff/keymaps/via/keymap.c
@@ -43,11 +43,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `--------------------------------------------------------------------------------------------------------------------------------------'
     */
     [_DEFAULT] = LAYOUT(
-      KC_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   _______,    KC_6,       KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,
+      JP_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   _______,    KC_6,       KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   _______,    KC_Y,       KC_U,   KC_I,    KC_O,    KC_P,    JP_AT  , JP_LBRC, KC_BSPC,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   _______,    KC_H,       KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN, JP_RBRC, 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_BSLS, KC_UP,   KC_RSFT,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC,  KC_SPC, FN_MO23,    FN_MO13,    KC_SPC, KC_HENK, KC_KANA, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC,  KC_SPC, FN_MO23,    FN_MO13,    KC_SPC, JP_HENK, JP_KANA, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT
     ),
    /* RAISE
     * ,--------------------------------------------------------------------------------------------------------------------------------------.
diff --git a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
index ae6c910cdd..181e7a3569 100644
--- a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
+++ b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_QWERTY] = LAYOUT_64key(
                       KC_LSPO, KC_MINS, KC_EQL,                           KC_VOLD, KC_VOLU, KC_RSPC,
-                      KC_LCPO, KC_LGUI, KC_HAEN, KC_ENT,         KC_MUTE, TD(PNX), LAYER_N, KC_RCPC,
+                      KC_LCPO, KC_LGUI, KC_LNG1, KC_ENT,         KC_MUTE, TD(PNX), LAYER_N, KC_RCPC,
                                KC_LAPO, KC_SPC,  SLQ,            SRQ,     KC_ESC,  KC_RAPC,
 
                       CM_W,    CM_F,    CM_P,    CM_G,           CM_J,    CM_L,    CM_U,    CM_Y,
diff --git a/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c b/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c
index 23c076680f..d0e5c4260e 100644
--- a/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c
+++ b/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LSFT(KC_8), LSFT(KC_9), KC_PEQL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LSFT(KC_MINS), MO(2), MO(6), KC_TAB, KC_BSPC, KC_SPC, MO(1), KC_LCTL, KC_LALT, MO(4), KC_LGUI, MO(2)),
 [1] = LAYOUT(LALT(KC_F4), LSFT(KC_Q), LSFT(KC_W), LSFT(KC_E), LSFT(KC_R), LSFT(KC_T), LSFT(KC_Y), LSFT(KC_U), LSFT(KC_I), LSFT(KC_O), LSFT(KC_P), LSFT(KC_A), LSFT(KC_S), LSFT(KC_D), LSFT(KC_F), LSFT(KC_G), LSFT(KC_H), LSFT(KC_J), LSFT(KC_K), LSFT(KC_L), RALT(KC_7), RALT(KC_0), KC_NUHS, LSFT(KC_Z), LSFT(KC_X), LSFT(KC_C), LSFT(KC_V), LSFT(KC_B), LSFT(KC_N), LSFT(KC_M), LSFT(KC_COMM), LSFT(KC_DOT), LSFT(KC_1), MO(3), TG(6), LSFT(KC_TAB), KC_DEL, KC_ENT, KC_TRNS, LSFT(KC_LCTL), LSFT(KC_LALT), LSFT(KC_RALT), LSFT(KC_LGUI), MO(3)),
-[2] = LAYOUT(LSFT(KC_GRV), RALT(KC_Q), KC_JYEN, RALT(KC_E), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), KC_LBRC, KC_UP, KC_SCLN, KC_PSCR, KC_QUOT, KC_MINS, LSFT(KC_7), LSFT(KC_2), LSFT(KC_NUHS), LSFT(KC_3), KC_LEFT, KC_DOWN, KC_RGHT, KC_NUBS, LSFT(KC_NUBS), RALT(KC_RBRC), KC_GRV, LSFT(KC_RBRC), KC_SLSH, KC_RBRC, RALT(KC_NUBS), KC_HOME, KC_PGDN, KC_PGUP, KC_END, RALT(KC_6), KC_TRNS, KC_CAPS, KC_TAB, KC_DEL, KC_ENT, MO(3), OUT_BT, OUT_USB, OUT_AUTO, BL_STEP, KC_TRNS),
-[3] = LAYOUT(LSFT(KC_GRV), RALT(KC_Q), KC_JYEN, RALT(KC_E), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_LBRC), KC_UP, LSFT(KC_SCLN), KC_PSCR, LSFT(KC_QUOT), KC_MINS, RALT(KC_MINS), LSFT(KC_EQL), KC_EQL, LSFT(KC_3), KC_LEFT, KC_DOWN, KC_RGHT, RALT(KC_8), RALT(KC_9), RALT(KC_RBRC), KC_GRV, LSFT(KC_RBRC), LSFT(KC_SLSH), KC_RBRC, RALT(KC_NUBS), KC_HOME, KC_PGDN, KC_PGUP, KC_END, RALT(KC_6), KC_TRNS, KC_CAPS, LSFT(KC_TAB), LSFT(KC_DEL), LSFT(KC_ENT), KC_TRNS, RSFT(KC_RCTL), RSFT(KC_LALT), RSFT(KC_RALT), RSFT(KC_RGUI), KC_TRNS),
+[2] = LAYOUT(LSFT(KC_GRV), RALT(KC_Q), KC_INT3, RALT(KC_E), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), KC_LBRC, KC_UP, KC_SCLN, KC_PSCR, KC_QUOT, KC_MINS, LSFT(KC_7), LSFT(KC_2), LSFT(KC_NUHS), LSFT(KC_3), KC_LEFT, KC_DOWN, KC_RGHT, KC_NUBS, LSFT(KC_NUBS), RALT(KC_RBRC), KC_GRV, LSFT(KC_RBRC), KC_SLSH, KC_RBRC, RALT(KC_NUBS), KC_HOME, KC_PGDN, KC_PGUP, KC_END, RALT(KC_6), KC_TRNS, KC_CAPS, KC_TAB, KC_DEL, KC_ENT, MO(3), OUT_BT, OUT_USB, OUT_AUTO, BL_STEP, KC_TRNS),
+[3] = LAYOUT(LSFT(KC_GRV), RALT(KC_Q), KC_INT3, RALT(KC_E), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_LBRC), KC_UP, LSFT(KC_SCLN), KC_PSCR, LSFT(KC_QUOT), KC_MINS, RALT(KC_MINS), LSFT(KC_EQL), KC_EQL, LSFT(KC_3), KC_LEFT, KC_DOWN, KC_RGHT, RALT(KC_8), RALT(KC_9), RALT(KC_RBRC), KC_GRV, LSFT(KC_RBRC), LSFT(KC_SLSH), KC_RBRC, RALT(KC_NUBS), KC_HOME, KC_PGDN, KC_PGUP, KC_END, RALT(KC_6), KC_TRNS, KC_CAPS, LSFT(KC_TAB), LSFT(KC_DEL), LSFT(KC_ENT), KC_TRNS, RSFT(KC_RCTL), RSFT(KC_LALT), RSFT(KC_RALT), RSFT(KC_RGUI), KC_TRNS),
 [4] = LAYOUT(RALT(KC_ESC), RALT(KC_Q), RALT(KC_W), RALT(KC_E), RALT(KC_R), RALT(KC_T), RALT(KC_Y), RALT(KC_U), RALT(KC_I), RALT(KC_O), RALT(KC_P), RALT(KC_A), RALT(KC_S), RALT(KC_D), RALT(KC_F), RALT(KC_G), RALT(KC_H), RALT(KC_J), RALT(KC_K), RALT(KC_L), RALT(KC_8), RALT(KC_9), LSFT(KC_0), RALT(KC_Z), RALT(KC_X), RALT(KC_C), RALT(KC_V), RALT(KC_B), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), RALT(KC_6), KC_NO, RALT(KC_ENT), RALT(KC_TAB), RALT(KC_DEL), RALT(KC_SPC), RALT(KC_LSFT), RALT(KC_LCTL), RALT(KC_LALT), KC_TRNS, RALT(KC_LGUI), KC_NO),
 [5] = LAYOUT(KC_0, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_NO, KC_TRNS, KC_TAB, KC_BSPC, KC_SPC, KC_LSFT, KC_LCTL, KC_LALT, KC_RALT, KC_LGUI, KC_NO)
 };
diff --git a/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json b/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json
index d2ff7c5b46..56f3750ece 100644
--- a/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json
+++ b/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json
@@ -1 +1 @@
-[["KC_ESC", "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", "LSFT(KC_8)", "LSFT(KC_9)", "KC_PEQL", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "LSFT(KC_MINS)", "MO(2)", "MO(6)", "KC_TAB", "KC_BSPC", "KC_SPC", "MO(1)", "KC_LCTL", "KC_LALT", "MO(4)", "KC_LGUI", "MO(2)"], ["LALT(KC_F4)", "LSFT(KC_Q)", "LSFT(KC_W)", "LSFT(KC_E)", "LSFT(KC_R)", "LSFT(KC_T)", "LSFT(KC_Y)", "LSFT(KC_U)", "LSFT(KC_I)", "LSFT(KC_O)", "LSFT(KC_P)", "LSFT(KC_A)", "LSFT(KC_S)", "LSFT(KC_D)", "LSFT(KC_F)", "LSFT(KC_G)", "LSFT(KC_H)", "LSFT(KC_J)", "LSFT(KC_K)", "LSFT(KC_L)", "RALT(KC_7)", "RALT(KC_0)", "KC_NUHS", "LSFT(KC_Z)", "LSFT(KC_X)", "LSFT(KC_C)", "LSFT(KC_V)", "LSFT(KC_B)", "LSFT(KC_N)", "LSFT(KC_M)", "LSFT(KC_COMM)", "LSFT(KC_DOT)", "LSFT(KC_1)", "MO(3)", "TG(6)", "LSFT(KC_TAB)", "KC_DEL", "KC_ENT", "KC_TRNS", "LSFT(KC_LCTL)", "LSFT(KC_LALT)", "LSFT(KC_RALT)", "LSFT(KC_LGUI)", "MO(3)"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_JYEN", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "KC_LBRC", "KC_UP", "KC_SCLN", "KC_PSCR", "KC_QUOT", "KC_MINS", "LSFT(KC_7)", "LSFT(KC_2)", "LSFT(KC_NUHS)", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NUBS", "LSFT(KC_NUBS)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "KC_SLSH", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "KC_TAB", "KC_DEL", "KC_ENT", "MO(3)", "OUT_BT", "OUT_USB", "OUT_AUTO", "BL_STEP", "KC_TRNS"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_JYEN", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "LSFT(KC_LBRC)", "KC_UP", "LSFT(KC_SCLN)", "KC_PSCR", "LSFT(KC_QUOT)", "KC_MINS", "RALT(KC_MINS)", "LSFT(KC_EQL)", "KC_EQL", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "RALT(KC_8)", "RALT(KC_9)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "LSFT(KC_SLSH)", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "LSFT(KC_TAB)", "LSFT(KC_DEL)", "LSFT(KC_ENT)", "KC_TRNS", "RSFT(KC_RCTL)", "RSFT(KC_LALT)", "RSFT(KC_RALT)", "RSFT(KC_RGUI)", "KC_TRNS"], ["RALT(KC_ESC)", "RALT(KC_Q)", "RALT(KC_W)", "RALT(KC_E)", "RALT(KC_R)", "RALT(KC_T)", "RALT(KC_Y)", "RALT(KC_U)", "RALT(KC_I)", "RALT(KC_O)", "RALT(KC_P)", "RALT(KC_A)", "RALT(KC_S)", "RALT(KC_D)", "RALT(KC_F)", "RALT(KC_G)", "RALT(KC_H)", "RALT(KC_J)", "RALT(KC_K)", "RALT(KC_L)", "RALT(KC_8)", "RALT(KC_9)", "LSFT(KC_0)", "RALT(KC_Z)", "RALT(KC_X)", "RALT(KC_C)", "RALT(KC_V)", "RALT(KC_B)", "RALT(KC_N)", "RALT(KC_M)", "RALT(KC_COMM)", "RALT(KC_DOT)", "RALT(KC_6)", "KC_NO", "RALT(KC_ENT)", "RALT(KC_TAB)", "RALT(KC_DEL)", "RALT(KC_SPC)", "RALT(KC_LSFT)", "RALT(KC_LCTL)", "RALT(KC_LALT)", "KC_TRNS", "RALT(KC_LGUI)", "KC_NO"], ["KC_0", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_F11", "KC_F12", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_NO", "KC_TRNS", "KC_TAB", "KC_BSPC", "KC_SPC", "KC_LSFT", "KC_LCTL", "KC_LALT", "KC_RALT", "KC_LGUI", "KC_NO"]]
\ No newline at end of file
+[["KC_ESC", "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", "LSFT(KC_8)", "LSFT(KC_9)", "KC_PEQL", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "LSFT(KC_MINS)", "MO(2)", "MO(6)", "KC_TAB", "KC_BSPC", "KC_SPC", "MO(1)", "KC_LCTL", "KC_LALT", "MO(4)", "KC_LGUI", "MO(2)"], ["LALT(KC_F4)", "LSFT(KC_Q)", "LSFT(KC_W)", "LSFT(KC_E)", "LSFT(KC_R)", "LSFT(KC_T)", "LSFT(KC_Y)", "LSFT(KC_U)", "LSFT(KC_I)", "LSFT(KC_O)", "LSFT(KC_P)", "LSFT(KC_A)", "LSFT(KC_S)", "LSFT(KC_D)", "LSFT(KC_F)", "LSFT(KC_G)", "LSFT(KC_H)", "LSFT(KC_J)", "LSFT(KC_K)", "LSFT(KC_L)", "RALT(KC_7)", "RALT(KC_0)", "KC_NUHS", "LSFT(KC_Z)", "LSFT(KC_X)", "LSFT(KC_C)", "LSFT(KC_V)", "LSFT(KC_B)", "LSFT(KC_N)", "LSFT(KC_M)", "LSFT(KC_COMM)", "LSFT(KC_DOT)", "LSFT(KC_1)", "MO(3)", "TG(6)", "LSFT(KC_TAB)", "KC_DEL", "KC_ENT", "KC_TRNS", "LSFT(KC_LCTL)", "LSFT(KC_LALT)", "LSFT(KC_RALT)", "LSFT(KC_LGUI)", "MO(3)"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_INT3", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "KC_LBRC", "KC_UP", "KC_SCLN", "KC_PSCR", "KC_QUOT", "KC_MINS", "LSFT(KC_7)", "LSFT(KC_2)", "LSFT(KC_NUHS)", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NUBS", "LSFT(KC_NUBS)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "KC_SLSH", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "KC_TAB", "KC_DEL", "KC_ENT", "MO(3)", "OUT_BT", "OUT_USB", "OUT_AUTO", "BL_STEP", "KC_TRNS"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_INT3", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "LSFT(KC_LBRC)", "KC_UP", "LSFT(KC_SCLN)", "KC_PSCR", "LSFT(KC_QUOT)", "KC_MINS", "RALT(KC_MINS)", "LSFT(KC_EQL)", "KC_EQL", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "RALT(KC_8)", "RALT(KC_9)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "LSFT(KC_SLSH)", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "LSFT(KC_TAB)", "LSFT(KC_DEL)", "LSFT(KC_ENT)", "KC_TRNS", "RSFT(KC_RCTL)", "RSFT(KC_LALT)", "RSFT(KC_RALT)", "RSFT(KC_RGUI)", "KC_TRNS"], ["RALT(KC_ESC)", "RALT(KC_Q)", "RALT(KC_W)", "RALT(KC_E)", "RALT(KC_R)", "RALT(KC_T)", "RALT(KC_Y)", "RALT(KC_U)", "RALT(KC_I)", "RALT(KC_O)", "RALT(KC_P)", "RALT(KC_A)", "RALT(KC_S)", "RALT(KC_D)", "RALT(KC_F)", "RALT(KC_G)", "RALT(KC_H)", "RALT(KC_J)", "RALT(KC_K)", "RALT(KC_L)", "RALT(KC_8)", "RALT(KC_9)", "LSFT(KC_0)", "RALT(KC_Z)", "RALT(KC_X)", "RALT(KC_C)", "RALT(KC_V)", "RALT(KC_B)", "RALT(KC_N)", "RALT(KC_M)", "RALT(KC_COMM)", "RALT(KC_DOT)", "RALT(KC_6)", "KC_NO", "RALT(KC_ENT)", "RALT(KC_TAB)", "RALT(KC_DEL)", "RALT(KC_SPC)", "RALT(KC_LSFT)", "RALT(KC_LCTL)", "RALT(KC_LALT)", "KC_TRNS", "RALT(KC_LGUI)", "KC_NO"], ["KC_0", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_F11", "KC_F12", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_NO", "KC_TRNS", "KC_TAB", "KC_BSPC", "KC_SPC", "KC_LSFT", "KC_LCTL", "KC_LALT", "KC_RALT", "KC_LGUI", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/handwired/jopr/keymaps/default/keymap.c b/keyboards/handwired/jopr/keymaps/default/keymap.c
index d6b998f49b..befdece551 100644
--- a/keyboards/handwired/jopr/keymaps/default/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,    KC_F1,   KC_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_CAPS, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,           KC_PSCR, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-        KC_MHEN,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,              KC_P4,   KC_P5,   KC_P6,              KC_PGUP, KC_INS,  KC_PGDN,
+        KC_INT5,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,              KC_P4,   KC_P5,   KC_P6,              KC_PGUP, KC_INS,  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_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_HOME, KC_UP,   KC_END,
         KC_LCTL,   KC_LWIN,   KC_LALT,   KC_SPC,                                                KC_RALT, KC_RWIN, LT(_FN,KC_APP),  KC_RCTL,     KC_P0,            KC_PDOT,            KC_LEFT, KC_DOWN, KC_RGHT
     ),
diff --git a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
index da1f9e1838..5fb7c7c8b9 100644
--- a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,    KC_F1,   KC_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_CAPS, KC_SLCK, KC_PAUS,
         KC_NUHS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NUBS, KC_SLSH, KC_BSPC,           KC_PSCR, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_V,    KC_Y,    KC_D,    KC_COMM, KC_QUOT, KC_INT1, KC_J,    KC_M,    KC_L,    KC_U,    KC_LBRC, KC_RBRC, KC_ENT,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-        KC_MHEN,       KC_A,    KC_T,    KC_H,    KC_E,    KC_B,    KC_MINS, KC_C,    KC_S,    KC_N,    KC_O,    KC_I,    KC_EQL,               KC_P4,   KC_P5,   KC_P6,              KC_PGUP, KC_INS,  KC_PGDN,
+        KC_INT5,       KC_A,    KC_T,    KC_H,    KC_E,    KC_B,    KC_MINS, KC_C,    KC_S,    KC_N,    KC_O,    KC_I,    KC_EQL,               KC_P4,   KC_P5,   KC_P6,              KC_PGUP, KC_INS,  KC_PGDN,
         KC_LSFT,   KC_GRV,  KC_P,    KC_K,    KC_G,    KC_W,    KC_Q,    KC_X,    KC_R,    KC_F,    KC_DOT,  KC_Z,    KC_RSFT,                  KC_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_HOME, KC_UP,   KC_END,
         KC_LCTL,   KC_LWIN,   KC_LALT,   KC_SPC,                                                KC_RALT, KC_RWIN, LT(_FN,KC_APP), KC_RCTL,      KC_P0,            KC_PDOT,            KC_LEFT, KC_DOWN, KC_RGHT
     ),
diff --git a/keyboards/handwired/k8split/keymaps/left/keymap.c b/keyboards/handwired/k8split/keymaps/left/keymap.c
index 473a3b9f76..a1f565d565 100644
--- a/keyboards/handwired/k8split/keymaps/left/keymap.c
+++ b/keyboards/handwired/k8split/keymaps/left/keymap.c
@@ -39,7 +39,7 @@ 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_AUDIO_MUTE,
         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_AUDIO_MMUTE,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MHEN, KC_MS_WH_UP,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_INT5, KC_MS_WH_UP,
         KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_COMP, KC_MS_WH_DOWN,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F13, KC_F14,
         KC_LCTRL, KC_CAPS, KC_LWIN, KC_LALT, KC_SPC, KC_F15, KC_F16, KC_F17
diff --git a/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c b/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
index 30f42e70ab..9701e7e928 100644
--- a/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
+++ b/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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_BSPC,
        KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS,                KC_EQL,  KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSLS,
       KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC,                  KC_RBRC, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_RCTL,
-     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_LANG2, KC_LANG1, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_LNG2, KC_LNG1, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
      KC_FUNC,    KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, KC_BSPC,   KC_ENT,   KC_SPC,  KC_RGUI, KC_RALT,  KC_APP,          KC_FUNC
     ),
     [_FN] = LAYOUT(
diff --git a/keyboards/helix/pico/keymaps/biacco/keymap.c b/keyboards/helix/pico/keymaps/biacco/keymap.c
index 8bec3647d2..3063a85bfc 100644
--- a/keyboards/helix/pico/keymaps/biacco/keymap.c
+++ b/keyboards/helix/pico/keymaps/biacco/keymap.c
@@ -46,8 +46,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT( \
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,             KC_T,                                     KC_Y,             KC_U,    KC_I,    KC_O,     KC_P,       KC_LBRC, \
       KC_LALT, KC_A,    KC_S,    KC_D,    KC_F,             KC_G,                                     KC_H,             KC_J,    KC_K,    KC_L,     KC_SCLN,    KC_QUOT, \
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,             KC_B,                                     KC_N,             KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    SFT_T(KC_RO) , \
-      KC_LCTL, KC_LGUI, KC_APP,  KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB),  KC_BSPC,  LT(META, KC_ENT), KC_DEL,  KC_PSCR, TG(GAME), TG(SYMB),   KC_JYEN \
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,             KC_B,                                     KC_N,             KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    SFT_T(KC_INT1) , \
+      KC_LCTL, KC_LGUI, KC_APP,  KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB),  KC_BSPC,  LT(META, KC_ENT), KC_DEL,  KC_PSCR, TG(GAME), TG(SYMB),   KC_INT3 \
       ),
 
   /* META
@@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [META] = LAYOUT( \
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                      KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
-    _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+    _______, KC_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ \
   ),
 
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [SYMB] = LAYOUT( \
     S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6),                   S(KC_7), S(KC_8), S(KC_9),    S(KC_0),    S(KC_MINS), S(KC_EQL), \
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   S(KC_8), S(KC_9), S(KC_RBRC), S(KC_BSLS), S(KC_SCLN), S(KC_QUOT), \
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_RBRC, KC_BSLS, S(KC_COMM), S(KC_DOT),  S(KC_SLSH), S(KC_RO), \
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_RBRC, KC_BSLS, S(KC_COMM), S(KC_DOT),  S(KC_SLSH), S(KC_INT1), \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
   ),
 
@@ -103,8 +103,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [GAME] = LAYOUT( \
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,                           KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,                           KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,                           KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_JYEN \
+    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,                           KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
+    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   )
 
 };
diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c
index ab68bc5243..bc56dffb85 100644
--- a/keyboards/helix/pico/keymaps/default/keymap.c
+++ b/keyboards/helix/pico/keymaps/default/keymap.c
@@ -294,24 +294,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/pico/keymaps/mtei/keymap.c b/keyboards/helix/pico/keymaps/mtei/keymap.c
index b3d988530e..905f29a294 100644
--- a/keyboards/helix/pico/keymaps/mtei/keymap.c
+++ b/keyboards/helix/pico/keymaps/mtei/keymap.c
@@ -302,24 +302,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case xEISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case xKANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c
index c7c65acaea..cc61ec4caa 100644
--- a/keyboards/helix/rev2/keymaps/default/keymap.c
+++ b/keyboards/helix/rev2/keymaps/default/keymap.c
@@ -425,24 +425,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index 77d7f1607e..6877fe7fa4 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -446,24 +446,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case xEISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case xKANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
index e8b3087701..6798a18e25 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
@@ -275,23 +275,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       case EISU:
         if (record->event.pressed) {
           if (keymap_config.swap_lalt_lgui==false) {
-            register_code(KC_LANG2);
+            register_code(KC_LNG2);
           } else {
             SEND_STRING(SS_LALT("`"));
           }
         } else {
-          unregister_code(KC_LANG2);
+          unregister_code(KC_LNG2);
         }
         break;
       case KANA:
         if (record->event.pressed) {
           if(keymap_config.swap_lalt_lgui==false){
-            register_code(KC_LANG1);
+            register_code(KC_LNG1);
           }else{
             SEND_STRING(SS_LALT("`"));
           }
         } else {
-          unregister_code(KC_LANG1);
+          unregister_code(KC_LNG1);
         }
         break;
     #endif
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
index eb574f9778..f9ca3a4b4a 100644
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy/keymap.c
@@ -347,24 +347,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    case EISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
index a5a82eca98..63d00cd486 100644
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
@@ -466,24 +466,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    case EISU:
       if (record->event.pressed) {
         if(IS_MODE_MAC()){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if(IS_MODE_MAC()){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
index 5fecc2f766..65a2150a30 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
@@ -409,24 +409,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev3_4rows/keymaps/default/keymap.c b/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
index d98362f194..30cf377ac9 100644
--- a/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
+++ b/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
@@ -137,24 +137,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
index 5633594bf5..18d0ed9993 100644
--- a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
+++ b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
@@ -133,24 +133,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
index 7799708073..31e323f4a1 100644
--- a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
@@ -147,24 +147,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
index 77d7f1607e..6877fe7fa4 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
@@ -446,24 +446,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case xEISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case xKANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
index 3dd9f2c630..2f37426ee5 100644
--- a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
@@ -143,24 +143,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case EISU:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       return false;
       break;
     case KANA:
       if (record->event.pressed) {
         if (is_mac_mode()) {
-          register_code(KC_LANG1);
+          register_code(KC_LNG1);
         }else{
           tap_code16(LALT(KC_GRAVE));
         }
       } else {
-        unregister_code(KC_LANG1);
+        unregister_code(KC_LNG1);
       }
       return false;
       break;
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap.c b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
index 68f9aa6726..613e096a7f 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
@@ -340,11 +340,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     } else {
                         if (TIMER_DIFF_16(record->event.time, l_time) < TAPPING_TERM) {
                             if (mac_mode) {
-                                register_code(KC_LANG2);
-                                unregister_code(KC_LANG2);
+                                register_code(KC_LNG2);
+                                unregister_code(KC_LNG2);
                             } else {
-                                register_code(KC_MHEN);
-                                unregister_code(KC_MHEN);
+                                register_code(KC_INT5);
+                                unregister_code(KC_INT5);
                             }
                         } else {
                             register_code(l_inner);
@@ -367,11 +367,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     } else {
                         if (TIMER_DIFF_16(record->event.time, r_time) < TAPPING_TERM) {
                             if (mac_mode) {
-                                register_code(KC_LANG1);
-                                unregister_code(KC_LANG1);
+                                register_code(KC_LNG1);
+                                unregister_code(KC_LNG1);
                             } else {
-                                register_code(KC_KANA);
-                                unregister_code(KC_KANA);
+                                register_code(KC_INT2);
+                                unregister_code(KC_INT2);
                             }
                         } else {
                             register_code(r_inner);
diff --git a/keyboards/hhkb/ansi/keymaps/shela/readme.md b/keyboards/hhkb/ansi/keymaps/shela/readme.md
index ad0b627cb5..36e15c2c48 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/readme.md
+++ b/keyboards/hhkb/ansi/keymaps/shela/readme.md
@@ -53,16 +53,16 @@ Mac mode: Disabled
 
 | Key         | Keycode | Tap     | Hold    |
 | ----------- | ------- | ------- | ------- |
-| Left Inner  | L_INNER | KC_MHEN | KC_LALT |
+| Left Inner  | L_INNER | KC_INT5 | KC_LALT |
 | Left Outer  | L_OUTER | KC_LGUI | KC_LGUI |
-| Right Inner | R_INNER | KC_KANA | KC_RALT |
+| Right Inner | R_INNER | KC_INT2 | KC_RALT |
 | Right Outer | R_OUTER | KC_RGUI | KC_RGUI |
 
 Mac mode: Enabled
 
-| Key         | Keycode | Tap      | Hold    |
-| ----------- | ------- | -------- | ------- |
-| Left Inner  | L_INNER | KC_LANG2 | KC_LCMD |
-| Left Outer  | L_OUTER | KC_LOPT  | KC_LOPT |
-| Right Inner | R_INNER | KC_LANG1 | KC_RCMD |
-| Right Outer | R_OUTER | KC_ROPT  | KC_ROPT |
+| Key         | Keycode | Tap     | Hold    |
+| ----------- | ------- | ------- | ------- |
+| Left Inner  | L_INNER | KC_LNG2 | KC_LCMD |
+| Left Outer  | L_OUTER | KC_LOPT | KC_LOPT |
+| Right Inner | R_INNER | KC_LNG1 | KC_RCMD |
+| Right Outer | R_OUTER | KC_ROPT | KC_ROPT |
diff --git a/keyboards/hhkb/jp/keymaps/default/keymap.c b/keyboards/hhkb/jp/keymaps/default/keymap.c
index a704ee5647..5eef20c5e6 100644
--- a/keyboards/hhkb/jp/keymaps/default/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/default/keymap.c
@@ -30,11 +30,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
-        MO(1), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_UP, KC_RSFT,
+        MO(1), KC_GRV, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_INT2, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
diff --git a/keyboards/hhkb/jp/keymaps/default_mac/keymap.c b/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
index df08341fa4..366c05a617 100644
--- a/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
@@ -30,11 +30,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
-        MO(1), KC_GRV, KC_LALT, KC_LGUI, KC_MHEN, KC_SPC, KC_HENK, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_UP, KC_RSFT,
+        MO(1), KC_GRV, KC_LALT, KC_LGUI, KC_INT5, KC_SPC, KC_INT4, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
diff --git a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
index 2bec6bb4c6..b2135b9f0e 100644
--- a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
@@ -34,7 +34,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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_BSLS,
-        KC_BSPC, KC_ZKHK, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_BSPC, KC_RSFT, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_BSPC, KC_RSFT, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
diff --git a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
index ebbe13393b..0e050c25df 100644
--- a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
@@ -27,11 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        `-----------------------------------------------------------'
     */
     [BASE] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
-        MO(HHKB), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, LT(MIRROR, KC_SPC), KC_HENK, KC_KANA, KC_RALT, MO(HHKB), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_UP, KC_RSFT,
+        MO(HHKB), KC_GRV, KC_LGUI, KC_LALT, KC_INT5, LT(MIRROR, KC_SPC), KC_INT4, KC_INT2, KC_RALT, MO(HHKB), KC_LEFT, KC_DOWN, KC_RGHT),
 
     /* Layer HHKB: HHKB mode (HHKB Fn)
        ,-----------------------------------------------------------.
diff --git a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c b/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
index e13838007b..268c43f2a0 100644
--- a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
@@ -11,17 +11,17 @@ enum
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [DVOR] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_INT3, KC_BSPC,
         KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL,
         KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RO, KC_UP, KC_RSFT,
-        MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, TG(QWER), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_INT1, KC_UP, KC_RSFT,
+        MO(FUNC), KC_GRV, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, TG(QWER), KC_LEFT, KC_DOWN, KC_RGHT),
     [QWER] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
-        MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_UP, KC_RSFT,
+        MO(FUNC), KC_GRV, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [NEW_CMD] = LAYOUT_jp(
         _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), _______, _______, _______, LGUI(KC_BSPC),
diff --git a/keyboards/hhkb/jp/keymaps/via/keymap.c b/keyboards/hhkb/jp/keymaps/via/keymap.c
index 8f23cfcd2d..171dad81af 100644
--- a/keyboards/hhkb/jp/keymaps/via/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/via/keymap.c
@@ -30,11 +30,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
-        MO(1), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_UP, KC_RSFT,
+        MO(1), KC_GRV, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_INT2, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
diff --git a/keyboards/jones/v03/keymaps/default/keymap.c b/keyboards/jones/v03/keymaps/default/keymap.c
index 4d408b5e19..d051bd781e 100644
--- a/keyboards/jones/v03/keymaps/default/keymap.c
+++ b/keyboards/jones/v03/keymaps/default/keymap.c
@@ -22,6 +22,6 @@ 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,    XXXXXXX,   JP_AT,  JP_LBRC,
         KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   JP_SCLN, KC_ENT,    JP_COLN,JP_RBRC,
         KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   JP_COMM,JP_DOT, JP_SLSH,JP_BSLS,KC_UP,  XXXXXXX,
-        KC_MUTE,KC_LALT,KC_LGUI,KC_LANG2,       KC_SPC,         KC_SPC,        KC_LANG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
+        KC_MUTE,KC_LALT,KC_LGUI,KC_LNG2,       KC_SPC,         KC_SPC,        KC_LNG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
     )
 };
\ No newline at end of file
diff --git a/keyboards/jones/v03/keymaps/default_jp/keymap.c b/keyboards/jones/v03/keymaps/default_jp/keymap.c
index bdcb9e88b1..ae618ee0bc 100644
--- a/keyboards/jones/v03/keymaps/default_jp/keymap.c
+++ b/keyboards/jones/v03/keymaps/default_jp/keymap.c
@@ -90,7 +90,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,               JP_AT,  JP_LBRC,
         KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   JP_SCLN, KC_ENT,    JP_COLN,JP_RBRC,
         S_CAP,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   JP_COMM,JP_DOT, C_SLSH, S_BSLS, KC_UP,  LOWER,
-        KC_MUTE,KC_LALT,KC_LGUI,KC_LANG2,       SP_SFT,         SP_RAI,        KC_LANG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
+        KC_MUTE,KC_LALT,KC_LGUI,KC_LNG2,       SP_SFT,         SP_RAI,        KC_LNG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
     ),
     [_WIN] = LAYOUT_jp(
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
diff --git a/keyboards/jones/v03_1/keymaps/default/keymap.c b/keyboards/jones/v03_1/keymaps/default/keymap.c
index d471665598..b374a6488b 100644
--- a/keyboards/jones/v03_1/keymaps/default/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default/keymap.c
@@ -21,6 +21,6 @@ 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_BSPC,    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_ENT,     XXXXXXX,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_UP,  XXXXXXX,
-        KC_MUTE,KC_LANG2,KC_LALT,KC_LGUI,       KC_SPC,         KC_SPC,         KC_RGUI,KC_RALT,KC_LANG1,KC_LEFT,KC_DOWN,KC_RGHT
+        KC_MUTE,KC_LNG2,KC_LALT,KC_LGUI,       KC_SPC,         KC_SPC,         KC_RGUI,KC_RALT,KC_LNG1,KC_LEFT,KC_DOWN,KC_RGHT
     )
 };
\ No newline at end of file
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
index a592418c4d..cca79fd7ed 100644
--- a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
@@ -88,7 +88,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_BSPC,    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_ENT,             KC_QUOT,
         S_CAP,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, C_SLSH, KC_RSFT,KC_UP,  LOWER,
-        KC_MUTE,KC_LANG2,KC_LALT,KC_LGUI,       SP_SFT,         SP_RAI,         KC_RGUI,KC_RALT,KC_LANG1,KC_LEFT,KC_DOWN,KC_RGHT
+        KC_MUTE,KC_LNG2,KC_LALT,KC_LGUI,       SP_SFT,         SP_RAI,         KC_RGUI,KC_RALT,KC_LNG1,KC_LEFT,KC_DOWN,KC_RGHT
     ),
     [_WIN] = LAYOUT_ansi(
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
index 56f51d56ce..c4b92353de 100644
--- a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
@@ -90,7 +90,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,               JP_AT,  JP_LBRC,
         KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   JP_SCLN, KC_ENT,    JP_COLN,JP_RBRC,
         S_CAP,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   JP_COMM,JP_DOT, C_SLSH, S_BSLS, KC_UP,  LOWER,
-        KC_MUTE,KC_LALT,KC_LGUI,KC_LANG2,       SP_SFT,         SP_RAI,        KC_LANG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
+        KC_MUTE,KC_LALT,KC_LGUI,KC_LNG2,       SP_SFT,         SP_RAI,        KC_LNG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
     ),
     [_WIN] = LAYOUT_jp(
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
diff --git a/keyboards/jones/v1/keymaps/default/keymap.c b/keyboards/jones/v1/keymaps/default/keymap.c
index d1f952de66..d9c6846f86 100644
--- a/keyboards/jones/v1/keymaps/default/keymap.c
+++ b/keyboards/jones/v1/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,  KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,       KC_BSPC,
            KC_LCTL,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_SCLN,  KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_LEFT,  KC_RGHT,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_UP,    KC_SLSH,
-        KC_MUTE,  KC_LANG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
+        KC_MUTE,  KC_LNG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
         KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json
index fe80b8b999..b6491c7c95 100644
--- a/keyboards/k34/info.json
+++ b/keyboards/k34/info.json
@@ -47,11 +47,11 @@
                 { "label": ".", "x": 11, "y": 2.1 },
                 { "label": "/", "x": 12, "y": 2.3 },
 
-                { "label": "GUI / KC_HANJ", "x": 3, "y": 3.7 },
+                { "label": "GUI", "x": 3, "y": 3.7 },
                 { "label": "Lower", "x": 4, "y": 3.7 },
 
                 { "label": "Raise", "x": 8, "y": 3.7 },
-                { "label": "Alt / KC_HAEN", "x": 9, "y": 3.7 }
+                { "label": "Alt", "x": 9, "y": 3.7 }
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
index e44da80cf8..925ae51b38 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
@@ -33,9 +33,9 @@ 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, JP_CIRC, KC_JYEN, KC_BSPC, 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, JP_CIRC, JP_YEN, KC_BSPC, KC_DEL,  \
   KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    JP_AT,   JP_LBRC, JP_RBRC,       KC_PGUP, \
-  KC_ZKHK,       KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN,       KC_ENT,        KC_PGDN, \
+  JP_ZKHK,       KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN,       KC_ENT,        KC_PGDN, \
   KC_LSFT, XXXXXXX, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PSCR, \
   KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,         MO(1),          KC_SPC,          KC_RALT, KC_RCTL, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT),
 
@@ -57,5 +57,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
    _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
-   _______,_______,_______,        KC_MHEN,        _______,        KC_HENK,        KC_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
+   _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
 };
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
index e44da80cf8..925ae51b38 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
@@ -33,9 +33,9 @@ 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, JP_CIRC, KC_JYEN, KC_BSPC, 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, JP_CIRC, JP_YEN, KC_BSPC, KC_DEL,  \
   KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    JP_AT,   JP_LBRC, JP_RBRC,       KC_PGUP, \
-  KC_ZKHK,       KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN,       KC_ENT,        KC_PGDN, \
+  JP_ZKHK,       KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN,       KC_ENT,        KC_PGDN, \
   KC_LSFT, XXXXXXX, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PSCR, \
   KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,         MO(1),          KC_SPC,          KC_RALT, KC_RCTL, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT),
 
@@ -57,5 +57,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
    _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
-   _______,_______,_______,        KC_MHEN,        _______,        KC_HENK,        KC_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
+   _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
 };
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
index 4c06536945..423dd14325 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
@@ -43,13 +43,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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,   KC_HAEN,       KC_NO,
+       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,   KC_HAEN,     KC_NO,
+      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
       ), 
 };
@@ -87,5 +87,5 @@ enum combos {
 const uint16_t PROGMEM sft_han_combo[] = {LSFT_T(KC_F), LT(_Func,KC_SPC), COMBO_END};
 
 combo_t key_combos[COMBO_COUNT] = {
-  [SFT_HAN] = COMBO(sft_han_combo, KC_HAEN),
+  [SFT_HAN] = COMBO(sft_han_combo, KC_LNG1),
 };
\ No newline at end of file
diff --git a/keyboards/kudox/columner/keymaps/default/keymap.c b/keyboards/kudox/columner/keymaps/default/keymap.c
index 84ebcc906b..7bbdd02c76 100644
--- a/keyboards/kudox/columner/keymaps/default/keymap.c
+++ b/keyboards/kudox/columner/keymaps/default/keymap.c
@@ -14,8 +14,8 @@
 #define KC_LGENT MT(KC_LGUI, KC_ENT)
 #define KC_RGENT MT(KC_RGUI, KC_ENT)
 
-#define KC_L1NUM LT(_NUMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1NUM LT(_NUMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
      _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F11  ,                 KC_F12  ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_TILD ,KC_ASTR ,KC_PLUS ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_TILD ,KC_GRV  ,KC_JYEN ,
+     _______ ,KC_DQUO ,KC_QUOT ,KC_TILD ,KC_ASTR ,KC_PLUS ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_TILD ,KC_GRV  ,KC_INT3 ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   _______ ,_______ ,_______ ,KC_DQUO ,KC_QUOT ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,KC_JYEN ,KC_0    ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
+     _______ ,_______ ,KC_INT3 ,KC_0    ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   )
 };
diff --git a/keyboards/kudox/columner/keymaps/via/keymap.c b/keyboards/kudox/columner/keymaps/via/keymap.c
index 5a9527abeb..1906df1084 100644
--- a/keyboards/kudox/columner/keymaps/via/keymap.c
+++ b/keyboards/kudox/columner/keymaps/via/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_TRNS ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_JYEN ,KC_0    ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+     KC_TRNS ,KC_TRNS ,KC_INT3 ,KC_0    ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   )
 };
diff --git a/keyboards/kudox/rev1/keymaps/default/keymap.c b/keyboards/kudox/rev1/keymaps/default/keymap.c
index 4c24576824..1a3bfa4fff 100644
--- a/keyboards/kudox/rev1/keymaps/default/keymap.c
+++ b/keyboards/kudox/rev1/keymaps/default/keymap.c
@@ -14,8 +14,8 @@
 
 #define KC_RGENT MT(KC_RGUI, KC_ENT)
 
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
      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_JYEN ,
+     _______ ,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 ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/kudox/rev1/keymaps/jis/keymap.c b/keyboards/kudox/rev1/keymaps/jis/keymap.c
index d6f06828cc..a58c5cbd65 100644
--- a/keyboards/kudox/rev1/keymaps/jis/keymap.c
+++ b/keyboards/kudox/rev1/keymaps/jis/keymap.c
@@ -13,8 +13,8 @@
 
 #define KC_ALES LALT_T(KC_ESC)
 
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_SLSH ,KC_N    ,KC_M    ,KC_MINS ,KC_UP   ,SYM_L   ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_LGUI ,KC_LALT ,KC_ENT  ,KC_LANG2,KC_SPC  ,KC_SPC  ,                 KC_COMM ,KC_DOT  ,KC_L1SYM,KC_LEFT ,KC_DOWN ,KC_RGHT ,JP_BSLS
+     KC_ALES ,KC_LGUI ,KC_LALT ,KC_ENT  ,KC_LNG2 ,KC_SPC  ,KC_SPC  ,                 KC_COMM ,KC_DOT  ,KC_L1SYM,KC_LEFT ,KC_DOWN ,KC_RGHT ,JP_BSLS
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   ),
 
diff --git a/keyboards/kudox/rev1/keymaps/x1/keymap.c b/keyboards/kudox/rev1/keymaps/x1/keymap.c
index 1c08349b01..982f98b295 100644
--- a/keyboards/kudox/rev1/keymaps/x1/keymap.c
+++ b/keyboards/kudox/rev1/keymaps/x1/keymap.c
@@ -15,12 +15,12 @@
 #define KC_ALES LALT_T(KC_ESC)
 
 #define KC_RGENT MT(KC_RGUI, KC_ENT)
-#define KC_LGUI2 RALT_T(KC_LANG2)
+#define KC_LGUI2 RALT_T(KC_LNG2)
 
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
-#define KC_L1NUM LT(_NUMB, KC_LANG1)
+#define KC_L1NUM LT(_NUMB, KC_LNG1)
 #define KC_ENNUM LT(_NUMB, KC_ENT)
 
 #define KC_FSYM LT(_SYMB, KC_F)
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
      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_JYEN ,
+     _______ ,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 ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,KC_JYEN ,KC_0    ,_______ ,_______ ,_______ ,_______ ,                 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+     _______ ,KC_INT3 ,KC_0    ,_______ ,_______ ,_______ ,_______ ,                 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   )
 
diff --git a/keyboards/kudox/rev2/keymaps/default/keymap.c b/keyboards/kudox/rev2/keymaps/default/keymap.c
index 138a725a8c..d078683d9c 100644
--- a/keyboards/kudox/rev2/keymaps/default/keymap.c
+++ b/keyboards/kudox/rev2/keymaps/default/keymap.c
@@ -14,8 +14,8 @@
 
 #define KC_RGENT MT(KC_RGUI, KC_ENT)
 
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
      KC_ESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,_______ ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_JYEN ,
+     _______ ,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 ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/kudox/rev2/keymaps/jis/keymap.c b/keyboards/kudox/rev2/keymaps/jis/keymap.c
index 40173a8cd3..b588fea6ad 100644
--- a/keyboards/kudox/rev2/keymaps/jis/keymap.c
+++ b/keyboards/kudox/rev2/keymaps/jis/keymap.c
@@ -13,8 +13,8 @@
 
 #define KC_ALES LALT_T(KC_ESC)
 
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
      KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_ESC  ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,KC_BSPC ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_LANG2,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_COLN ,
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_LNG2,                  KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_COLN ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,JP_LCBR ,JP_RCBR ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   KC_VOLU ,XXXXXXX ,XXXXXXX ,KC_LT   ,KC_GT   ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,KC_LT   ,KC_GT   ,KC_LANG2,_______ ,_______ ,                 KC_MUTE ,KC_VOLD ,KC_LANG1,_______ ,_______ ,_______ ,KC_DEL
+     _______ ,_______ ,KC_LT   ,KC_GT   ,KC_LNG2 ,_______ ,_______ ,                 KC_MUTE ,KC_VOLD ,KC_LNG1 ,_______ ,_______ ,_______ ,KC_DEL
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   )
 };
diff --git a/keyboards/kudox/rev3/keymaps/default/keymap.c b/keyboards/kudox/rev3/keymaps/default/keymap.c
index e17f5a6bab..45e40630c6 100644
--- a/keyboards/kudox/rev3/keymaps/default/keymap.c
+++ b/keyboards/kudox/rev3/keymaps/default/keymap.c
@@ -9,7 +9,7 @@
 #define _LIGHT 2
 
 // Shortcut to make keymap more readable
-#define SYM_L2  LT(_SYMB, KC_LANG2)
+#define SYM_L2  LT(_SYMB, KC_LNG2)
 #define TO_LIGH TO(_LIGHT)
 #define TO_QWER TO(_QWERTY)
 
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_UP   ,KC_RSFT ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_LBRC ,KC_RBRC ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LANG1,KC_LEFT, KC_DOWN ,KC_RIGHT
+     KC_ALES ,KC_LBRC ,KC_RBRC ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   ),
 
diff --git a/keyboards/kudox/rev3/keymaps/jis/keymap.c b/keyboards/kudox/rev3/keymaps/jis/keymap.c
index 41b6fca1f2..72f4c04c30 100644
--- a/keyboards/kudox/rev3/keymaps/jis/keymap.c
+++ b/keyboards/kudox/rev3/keymaps/jis/keymap.c
@@ -10,7 +10,7 @@
 #define _LIGHT 2
 
 // Shortcut to make keymap more readable
-#define SYM_L2  LT(_SYMB, KC_LANG2)
+#define SYM_L2  LT(_SYMB, KC_LNG2)
 #define TO_LIGH TO(_LIGHT)
 #define TO_QWER TO(_QWERTY)
 
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,JP_COMM ,JP_DOT  ,KC_UP   ,KC_RSFT ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,JP_YEN  ,JP_COLN ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LANG1,KC_LEFT, KC_DOWN ,KC_RIGHT
+     KC_ALES ,JP_YEN  ,JP_COLN ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   ),
 
diff --git a/keyboards/kudox/rev3/keymaps/via/keymap.c b/keyboards/kudox/rev3/keymaps/via/keymap.c
index bf8148bb1b..9dfbe81701 100644
--- a/keyboards/kudox/rev3/keymaps/via/keymap.c
+++ b/keyboards/kudox/rev3/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_UP   ,KC_RSFT ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_LALT ,KC_LBRC ,KC_RBRC ,MO(_FN1),KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO(_FN2),KC_LANG1,KC_LEFT, KC_DOWN ,KC_RIGHT
+     KC_LALT ,KC_LBRC ,KC_RBRC ,MO(_FN1),KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO(_FN2),KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   ),
 
diff --git a/keyboards/kudox_full/keymaps/default/keymap.c b/keyboards/kudox_full/keymaps/default/keymap.c
index 8d16262b59..c4fe5ff988 100644
--- a/keyboards/kudox_full/keymaps/default/keymap.c
+++ b/keyboards/kudox_full/keymaps/default/keymap.c
@@ -16,8 +16,8 @@ enum layer_number {
 
 // Shortcut to make keymap more readable
 #define LT_AESC LALT_T(KC_ESC)
-#define LT_ALN1 LALT_T(KC_LANG1)
-#define LT_ALN2 LALT_T(KC_LANG2)
+#define LT_ALN1 LALT_T(KC_LNG1)
+#define LT_ALN2 LALT_T(KC_LNG2)
 #define LT_GENT LGUI_T(KC_ENT)
 #define LT_GSPC LGUI_T(KC_SPC)
 #define LT_F1F  LT(_FN1, KC_F)
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
      KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,_______ ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_SLSH ,KC_JYEN ,
+     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_SLSH ,KC_INT3 ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,_______ ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,_______ ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
diff --git a/keyboards/kudox_full/keymaps/via/keymap.c b/keyboards/kudox_full/keymaps/via/keymap.c
index 707152affa..cab5519d5b 100644
--- a/keyboards/kudox_full/keymaps/via/keymap.c
+++ b/keyboards/kudox_full/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
      KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                          KC_UP   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,KC_RSFT ,KC_UP   ,
   //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
-     LALT_T(KC_ESC),MO(_FN3),LT(_FN2,KC_DEL),LALT_T(KC_LANG2),LGUI_T(KC_ENT),KC_SPC, KC_DOWN,LGUI_T(KC_SPC),LALT_T(KC_LANG1),              KC_LEFT ,KC_DOWN ,KC_RIGHT
+     LALT_T(KC_ESC),MO(_FN3),LT(_FN2,KC_DEL),LALT_T(KC_LNG2),LGUI_T(KC_ENT),KC_SPC, KC_DOWN,LGUI_T(KC_SPC),LALT_T(KC_LNG1),              KC_LEFT ,KC_DOWN ,KC_RIGHT
   //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
   ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
      KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,_______ ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_SLSH ,KC_JYEN ,
+     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_SLSH ,KC_INT3 ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,_______ ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,_______ ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
diff --git a/keyboards/lily58/keymaps/drasbeck/keymap.c b/keyboards/lily58/keymaps/drasbeck/keymap.c
index 56bed4d7ab..13db2a9dd9 100644
--- a/keyboards/lily58/keymaps/drasbeck/keymap.c
+++ b/keyboards/lily58/keymaps/drasbeck/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_PGUP, KC_MINS, KC_EQL,  KC_RBRC,
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_NO,   KC_HOME, KC_PGDN, KC_END,  KC_NO,   KC_NUHS,
-  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RO,   KC_ENT,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INT1, KC_ENT,
                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5),                RALT(KC_6), RALT(KC_7),    RALT(KC_8), RALT(KC_9), RALT(KC_0), KC_DEL,
   KC_TRNS, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                     KC_NO,      KC_NO,         KC_UP,      KC_MINS,    KC_EQL,     KC_RBRC,
   KC_ESC,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                     KC_NO,      KC_LEFT,       KC_DOWN,    KC_RGHT,    KC_NO,      KC_NUHS,
-  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,      KC_VOLD,       KC_VOLU,    KC_MUTE,    KC_RO,      KC_SFTENT,
+  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,      KC_VOLD,       KC_VOLU,    KC_MUTE,    KC_INT1,    KC_SFTENT,
                                    KC_RALT,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RALT(KC_NUBS), KC_TRNS
   ),
 
diff --git a/keyboards/majistic/keymaps/default/keymap.c b/keyboards/majistic/keymaps/default/keymap.c
index 925657d2fe..36e64e168e 100644
--- a/keyboards/majistic/keymaps/default/keymap.c
+++ b/keyboards/majistic/keymaps/default/keymap.c
@@ -33,7 +33,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,    JP_AT,   JP_LBRC,
                      KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,               KC_G,     KC_H,               KC_J,    KC_K,     KC_L,    JP_SCLN, JP_COLN, JP_RBRC, KC_ENT ,
                      KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,               KC_B,     KC_N,               KC_M,    JP_COMM,  JP_DOT,  JP_SLSH, KC_UP,   KC_RSFT,
-                     KC_LCTL, KC_LALT, KC_LGUI, KC_LANG2, LT(_LOWER, KC_SPC),           LT(_LOWER, KC_SPC), KC_LANG1, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT
+                     KC_LCTL, KC_LALT, KC_LGUI, KC_LNG2,  LT(_LOWER, KC_SPC),           LT(_LOWER, KC_SPC), KC_LNG1, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_LOWER] = LAYOUT(
                      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
diff --git a/keyboards/manta60/keymaps/default/keymap.c b/keyboards/manta60/keymaps/default/keymap.c
index 78e260e47f..4195efbfcb 100644
--- a/keyboards/manta60/keymaps/default/keymap.c
+++ b/keyboards/manta60/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LOWER] = LAYOUT(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX,    XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_JYEN, KC_LBRC, KC_RBRC,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX,    XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_INT3, KC_LBRC, KC_RBRC,
         _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS,
         _______, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX,
         _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/marksard/leftover30/keymaps/default/keymap.c b/keyboards/marksard/leftover30/keymaps/default/keymap.c
index 81ff937c02..fe3a671982 100644
--- a/keyboards/marksard/leftover30/keymaps/default/keymap.c
+++ b/keyboards/marksard/leftover30/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ enum custom_keycodes {
 #define KC_11SF  LSFT_T(KC_F11)
 #define KC_12AL  LALT_T(KC_F12)
 #define KC_QUSF  RCTL_T(KC_QUOT)
-#define KC_ROSF  RSFT_T(KC_RO)
+#define KC_ROSF  RSFT_T(KC_INT1)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
@@ -64,11 +64,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_all(
   //,-----------------------------------------------------------------------------------------------------------.
-               KC_F1AL,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_JYEN, KC_LBRC, KC_RBRC, KC_BSLS,
+               KC_F1AL,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_INT3, KC_LBRC, KC_RBRC, KC_BSLS,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
                KC_F6CT,   KC_F7,   KC_F8,   KC_F9,  KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN,     KC_QUSF,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-               KC_11SF, KC_12AL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_GRV,   KC_RO, KC_SLSH,     KC_ROSF,
+               KC_11SF, KC_12AL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_GRV, KC_INT1, KC_SLSH,     KC_ROSF,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
       _______, _______,                                KC_AJST,                                 _______, _______
   //`-----------------------------------------------------------------------------------------------------------'
@@ -114,9 +114,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case KANJI:
       if (record->event.pressed) {
-          register_code16(keymap_config.swap_lalt_lgui ? A(KC_GRV) : KC_LANG2);
+          register_code16(keymap_config.swap_lalt_lgui ? A(KC_GRV) : KC_LNG2);
       } else {
-          unregister_code16(keymap_config.swap_lalt_lgui ? A(KC_GRV) : KC_LANG2);
+          unregister_code16(keymap_config.swap_lalt_lgui ? A(KC_GRV) : KC_LNG2);
       }
     break;
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/marksard/rhymestone/keymaps/default/keymap.c b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
index 2a646bfec4..1cab0d1d2a 100644
--- a/keyboards/marksard/rhymestone/keymaps/default/keymap.c
+++ b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
          KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SCLN,  KC_QUOT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       KC_11SF,   KC_F12,   KC_ESC,   KC_TAB,    KANJI,   KC_DEL,  XXXXXXX,  XXXXXXX,    KC_RO,  KC_GRSF,
+       KC_11SF,   KC_F12,   KC_ESC,   KC_TAB,    KANJI,   KC_DEL,  XXXXXXX,  XXXXXXX,  KC_INT1,  KC_GRSF,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
        _______,  _______,  _______,  _______,   KC_DEL,  _______,  _______,  _______,  _______,  _______
   //,---------------------------------------------------------------------------------------------------.
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        KC_LSFT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,  KC_RSFT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_SLSF,
+       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_MINS,  KC_INT1,  KC_COMM,   KC_DOT,  KC_SLSF,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
   //,---------------------------------------------------------------------------------------------------.
@@ -201,12 +201,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           register_code16(A(KC_GRV));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/marksard/treadstone32/keymaps/default/keymap.c b/keyboards/marksard/treadstone32/keymaps/default/keymap.c
index 0d00c33c4a..202aa67d4c 100644
--- a/keyboards/marksard/treadstone32/keymaps/default/keymap.c
+++ b/keyboards/marksard/treadstone32/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ enum custom_keycodes {
 
 // qk_tap_dance_action_t tap_dance_actions[] = {
 //   [TD_CODO] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
-//   [TD_SLRO] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_RO),
+//   [TD_SLRO] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, JP_BSLS),
 // };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        KC_F6SF,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SCLN,  KC_QUSF,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       KC_11CT,  KC_12AL,   KC_ESC,   KC_TAB,    KANJI,   KC_DEL,  XXXXXXX,  XXXXXXX,    KC_RO,   KC_GRV,
+       KC_11CT,  KC_12AL,   KC_ESC,   KC_TAB,    KANJI,   KC_DEL,  XXXXXXX,  XXXXXXX,  JP_BSLS,   KC_GRV,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
                                                _______,  KC_MLAD
   //                                        `---------|---------'
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        KC_LSFT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,  KC_LSFT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_SSCT,
+       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  KC_MINS,  JP_BSLS,  KC_COMM,   KC_DOT,  KC_SSCT,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
                                                _______,  _______
   //                                        `---------|---------'
@@ -129,12 +129,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
index 4f7465986b..9efa9f8a58 100644
--- a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
+++ b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
@@ -58,7 +58,7 @@ enum custom_keycodes {
 
 // qk_tap_dance_action_t tap_dance_actions[] = {
 //   [TD_CODO] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
-//   [TD_SLRO] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_RO),
+//   [TD_SLRO] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, JP_BSLS),
 // };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -76,11 +76,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT(
   //,---------------------------------------------------------------------------------------------------.
-         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  KC_MINS,   KC_EQL,  KC_JYEN,  KC_LBRC,  KC_RBRC,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  KC_MINS,   KC_EQL,   JP_YEN,  KC_LBRC,  KC_RBRC,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        KC_F6SF,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  XXXXXXX,  XXXXXXX,  KC_SCLN,  KC_QUOT,  KC_BSSF,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       KC_11CT,  KC_12AL,   KC_ESC,   KC_TAB,    KANJI,   KC_DEL,  XXXXXXX,  XXXXXXX,   KC_GRV,    KC_RO,
+       KC_11CT,  KC_12AL,   KC_ESC,   KC_TAB,    KANJI,   KC_DEL,  XXXXXXX,  XXXXXXX,   KC_GRV,  JP_BSLS,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
                                                _______,  KC_MLAD
   //                                        `---------|---------'
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        KC_LSFT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,  KC_LSFT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_SSCT,
+       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  KC_MINS,  JP_BSLS,  KC_COMM,   KC_DOT,  KC_SSCT,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
                                                _______,  _______
   //                                        `---------|---------'
@@ -130,12 +130,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/marksard/treadstone48/keymaps/default/keymap.c b/keyboards/marksard/treadstone48/keymaps/default/keymap.c
index c095c7ea24..b7b0b0f46a 100644
--- a/keyboards/marksard/treadstone48/keymaps/default/keymap.c
+++ b/keyboards/marksard/treadstone48/keymaps/default/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_4,    KC_5,    KC_6, KC_QUOT,          _______,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_1,    KC_2,    KC_3,   KC_RO, XXXXXXX,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_1,    KC_2,    KC_3, KC_INT1, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______,          _______,          _______, _______,    KC_0,  KC_DOT, KC_COMM, KC_SLSH,
   //`-------------------------------------------------------------------------------------------------------------------'
@@ -205,12 +205,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
index c8dd24ef5d..8a0ccaca31 100644
--- a/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
@@ -37,7 +37,7 @@ enum custom_keycodes {
 
 #define KC_TBSF  LSFT_T(KC_TAB)
 #define KC_ALAP  LALT_T(KC_APP)
-#define KC_ROSF  RSFT_T(KC_RO)
+#define KC_ROSF  RSFT_T(KC_INT1)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_base( \
@@ -56,11 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_base( \
   //,--------------------------------------------------------------------------------------------------------------------.
-      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_JYEN, KC_LBRC, KC_RBRC,           KC_DEL,\
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_INT3, KC_LBRC, KC_RBRC,           KC_DEL,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|
       _______,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS,          _______,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
-      _______,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,   KANJI, XXXXXXX, KC_COMM,  KC_DOT, KC_SLSH,   KC_RO, KC_PGUP,         \
+      _______,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,   KANJI, XXXXXXX, KC_COMM,  KC_DOT, KC_SLSH, KC_INT1, KC_PGUP,         \
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______,           KC_DEL,          _______, _______, XXXXXXX, KC_HOME, KC_PGDN,  KC_END,\
   //`-------------------------------------------------------------------------------------------------------------------'
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_4,    KC_5,    KC_6, KC_QUOT,          _______,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_1,    KC_2,    KC_3,   KC_RO, XXXXXXX,         \
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_1,    KC_2,    KC_3, KC_INT1, XXXXXXX,         \
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______,          _______,          _______, _______,    KC_0,  KC_DOT, KC_COMM, KC_SLSH,\
   //`-------------------------------------------------------------------------------------------------------------------'
@@ -205,12 +205,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
index 0fa0d9a8a9..705944f246 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
@@ -44,7 +44,7 @@ enum custom_keycodes {
 #define KC_ALAP  LALT_T(KC_APP)
 
 #define KC_JEQL  LSFT(KC_MINS)
-#define KC_SFUC  LSFT(KC_RO)
+#define KC_SFUC  LSFT(KC_INT1)
 #define KC_RSBR  LSFT(KC_8)
 #define KC_REBR  LSFT(KC_9)
 
@@ -72,11 +72,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT_rs( \
   // Treadstone48                                                                                                           Rhymestone
   //,--------------------------------------------------------------------------------------------------------------------.  --------------------------------------------.
-      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_JYEN, KC_LBRC, KC_RBRC,           KC_DEL,      KC_A,    KC_B,    KC_C, KC_JYEN, KC_HASH,\
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_INT3, KC_LBRC, KC_RBRC,           KC_DEL,      KC_A,    KC_B,    KC_C, KC_INT3, KC_HASH,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|  --------+--------+--------+--------+--------|
       _______,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS,          _______,      KC_D,    KC_E,    KC_F, KC_PERC, KC_SFUC,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
-      _______,  KC_F11,  KC_F12,   BASES,   KANJI,  KC_ENT, XXXXXXX, KC_COMM,  KC_DOT, KC_SLSH,   KC_RO, KC_PGUP,            KC_RSBR, KC_REBR, KC_RBRC, KC_QUOT, _______,\
+      _______,  KC_F11,  KC_F12,   BASES,   KANJI,  KC_ENT, XXXXXXX, KC_COMM,  KC_DOT, KC_SLSH, KC_INT1, KC_PGUP,            KC_RSBR, KC_REBR, KC_RBRC, KC_QUOT, _______,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
       _______, _______, _______, _______,           KC_DEL,          _______, _______, XXXXXXX, KC_HOME, KC_PGDN,  KC_END,   _______, XXXXXXX, KC_COMM, KC_JEQL,  KC_DEL,\
   //`--------------------------------------------------------------------------------------------------------------------'  --------------------------------------------'
@@ -102,11 +102,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWRS] = LAYOUT_rs( \
   // Treadstone48                                                                                                           Rhymestone
   //,--------------------------------------------------------------------------------------------------------------------.  --------------------------------------------.
-      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_JYEN, KC_LBRC, KC_RBRC,           KC_DEL,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,\
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_INT3, KC_LBRC, KC_RBRC,           KC_DEL,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|  --------+--------+--------+--------+--------|
       _______,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS,          _______,     KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
-      _______,  KC_F11,  KC_F12,    BASE,   KANJI,  KC_ENT, XXXXXXX, KC_COMM,  KC_DOT, KC_SLSH,   KC_RO, KC_PGUP,            KC_11SF,  KC_F12,    BASE,   KANJI,  KC_ENT,\
+      _______,  KC_F11,  KC_F12,    BASE,   KANJI,  KC_ENT, XXXXXXX, KC_COMM,  KC_DOT, KC_SLSH, KC_INT1, KC_PGUP,            KC_11SF,  KC_F12,    BASE,   KANJI,  KC_ENT,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
       _______, _______, _______, _______,           KC_DEL,          _______, _______, XXXXXXX, KC_HOME, KC_PGDN,  KC_END,   _______, _______, _______, _______,  KC_DEL,\
   //`--------------------------------------------------------------------------------------------------------------------'  --------------------------------------------'
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|  --------+--------+--------+--------+--------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_4,    KC_5,    KC_6, KC_QUOT,          _______,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_1,    KC_2,    KC_3,   KC_RO, XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_1,    KC_2,    KC_3, KC_INT1, XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
       _______, _______, _______, _______,          _______,          _______, _______,    KC_0,  KC_DOT, KC_COMM, KC_SLSH,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
   //`--------------------------------------------------------------------------------------------------------------------'  --------------------------------------------'
@@ -270,12 +270,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index 848af3de00..0e2111ba8b 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_A,    KC_S,       KC_D,    KC_F,    KC_G,           KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,
       KC_Z,    KC_X,       KC_C,    KC_V,    KC_B,           KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_QUOT,
       /*,      */ KC_LGUI, KC_LCTL, MO(_xS), KC_BSPC,        KC_SPC,  MO(_xS), KC_RCTL, KC_RGUI,
-      /*,      */ KC_HENK, KC_LALT, MO(_xN), LSFT_T(KC_TAB), KC_RSPC, MO(_xN), KC_RALT, KC_MHEN),
+      /*,      */ KC_INT4, KC_LALT, MO(_xN), LSFT_T(KC_TAB), KC_RSPC, MO(_xN), KC_RALT, KC_INT5),
   [_xC] = 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,
diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c
index 1388b81363..98b38727e3 100644
--- a/keyboards/newgame40/keymaps/default/keymap.c
+++ b/keyboards/newgame40/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ enum layers {
    KC_Q,     KC_W,     KC_E,      KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,
    KC_A,     KC_S,     KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_MINS,
    KC_Z,     KC_X,     KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,
-   KC_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1),  KC_LEFT, KC_RGHT
+   KC_LSFT, KC_LGUI, LT(_LOWER,KC_LNG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LNG1),  KC_LEFT, KC_RGHT
  ),
 
  /* Colemak
@@ -75,7 +75,7 @@ enum layers {
    KC_Q,     KC_W,     KC_F,      KC_P,      KC_G,      KC_J,      KC_L,      KC_U,      KC_Y,      KC_MINS,
    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_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1),  KC_LEFT, KC_RGHT
+   KC_LSFT, KC_LGUI, LT(_LOWER,KC_LNG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LNG1),  KC_LEFT, KC_RGHT
  ),
 
  /* Dvorak
@@ -93,7 +93,7 @@ enum layers {
    KC_QUOT,   KC_COMM,  KC_DOT,    KC_P,      KC_Y,       KC_F,     KC_G,      KC_C,     KC_R,      KC_L,
    KC_A,      KC_O,     KC_E,      KC_U,      KC_I,       KC_D,     KC_H,      KC_T,     KC_N,      KC_S,
    KC_SCLN,   KC_Q,     KC_J,      KC_K,      KC_X,       KC_B,     KC_M,      KC_W,     KC_V,      KC_Z,
-   KC_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1),  KC_LEFT, KC_RGHT
+   KC_LSFT, KC_LGUI, LT(_LOWER,KC_LNG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LNG1),  KC_LEFT, KC_RGHT
  ),
 
  /* Lower
@@ -128,7 +128,7 @@ enum layers {
  [_RAISE] = LAYOUT_ortho_4x10(
    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
    KC_EXLM, KC_DQT,  KC_HASH, KC_DLR,  KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_UNDS,
-   KC_EQL,  KC_JYEN, KC_LCBR, KC_RCBR, KC_ASTR, KC_TILD, KC_PIPE, KC_LABK, KC_RABK, KC_QUES,
+   KC_EQL,  KC_INT3, KC_LCBR, KC_RCBR, KC_ASTR, KC_TILD, KC_PIPE, KC_LABK, KC_RABK, KC_QUES,
    KC_F1,   KC_LALT, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, _______, KC_BSLS, KC_SLSH
  ),
 
@@ -147,7 +147,7 @@ enum layers {
    KC_Q,     KC_W,      KC_COMM,   KC_DOT,    KC_SCLN,     KC_M,     KC_R,     KC_D,     KC_Y,      KC_P,
    KC_A,     KC_O,      KC_E,      KC_I,      KC_U,        KC_G,     KC_T,     KC_K,     KC_S,      KC_N,
    KC_Z,     KC_X,      KC_C,      KC_V,      KC_F,        KC_B,     KC_H,     KC_J,     KC_L,      KC_SLSH,
-   KC_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1),  KC_LEFT, KC_RGHT
+   KC_LSFT, KC_LGUI, LT(_LOWER,KC_LNG2),  KC_LCTL, KC_SPC,  KC_BSPC, KC_ENT, LT(_RAISE,KC_LNG1),  KC_LEFT, KC_RGHT
  ),
 
  /* Adjust (Lower + Raise)
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
index 0ce0ba6156..91876ab1a1 100644
--- a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
+++ b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
@@ -21,7 +21,7 @@
 #define RWINEND RGUI_T(KC_END)
 #define RCTLEND RCTL_T(KC_END)
 #define LSHNUBS LSFT_T(KC_NUBS)
-#define RSHF_RO RSFT_T(KC_RO)
+#define RSHF_RO RSFT_T(KC_INT1)
 #define FN_CALC LT(1,KC_CALC)
 #define FN_MENU LT(1,KC_MENU)
 #define FN_PENT LT(1,KC_PENT)
@@ -42,7 +42,7 @@ KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,LSA_DEL,FN_CALC,KC_N   ,
 [1] = LAYOUT_rh_any(
 QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
         XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NLCK,XXXXXXX,XXXXXXX,XXXXXXX,    
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_JYEN,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
+        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_INT3,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
         KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SLCK,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
 LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,_______,     
         _______,_______,        _______,_______,XXXXXXX,                _______,        _______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,KC_PCMM,_______)
diff --git a/keyboards/numatreus/keymaps/hdbx/keymap.c b/keyboards/numatreus/keymaps/hdbx/keymap.c
index a221f9fe19..628567ad0c 100644
--- a/keyboards/numatreus/keymaps/hdbx/keymap.c
+++ b/keyboards/numatreus/keymaps/hdbx/keymap.c
@@ -39,8 +39,8 @@ enum custom_keycodes {
 // Use Dynamic macro
 
 // Fillers to make layering more clear
-#define LOWER   LT(_LOWER, KC_MHEN)    // タップで無変換     ホールドでLower
-#define RAISE   LT(_RAISE, KC_HENK)    // タップで変換       ホールドでRaise
+#define LOWER   LT(_LOWER, JP_MHEN)    // タップで無変換     ホールドでLower
+#define RAISE   LT(_RAISE, JP_HENK)    // タップで変換       ホールドでRaise
 #define GUI_ESC GUI_T(KC_ESC)          // タップでESC        ホールドでGUI
 #define SFT_BS  SFT_T(KC_BSPC)         // タップでBackSpace  ホールドでSHIFT
 #define CTL_ENT CTL_T(KC_ENT)          // タップでEnter      ホールドでCTRL
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT( 
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_7,    KC_8,    KC_9,    KC_DOT,  KC_BSPC,
       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                      KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PAST,
-      KC_ZKHK, KC_SLCK, KC_PAUS, KC_F11,  KC_F12,                      KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
+      JP_ZKHK, KC_SLCK, KC_PAUS, KC_F11,  KC_F12,                      KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
       KC_LALT, KC_LGUI, JP_GRV,  SFT_DEL, _______, KC_LCTL,  SFT_SPC,  _______, KC_0,    KC_COMM, JP_EQL,  KC_ENT
       ),
 
diff --git a/keyboards/numatreus/keymaps/like_jis/keymap.c b/keyboards/numatreus/keymaps/like_jis/keymap.c
index 24c554d20c..dfddcd0d9f 100644
--- a/keyboards/numatreus/keymaps/like_jis/keymap.c
+++ b/keyboards/numatreus/keymaps/like_jis/keymap.c
@@ -58,7 +58,7 @@ enum tapdances{
 
 qk_tap_dance_action_t tap_dance_actions[] = {
   [TD_CODO] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
-  // [TD_MNUB] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, LSFT(KC_RO)),
+  // [TD_MNUB] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, LSFT(JP_BSLS)),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT(
   //,----------------------------------.             ,----------------------------------.
-    KC_F1,  KC_F2,  KC_F3,  KC_F4, KC_F5,            KC_MINS, KC_EQL, KC_JYEN, KC_LBRC, KC_RBRC,
+    KC_F1,  KC_F2,  KC_F3,  KC_F4, KC_F5,            KC_MINS, KC_EQL, JP_YEN, KC_LBRC, KC_RBRC,
   //|------+------+------+------+------|             |------+------+------+------+------|
     KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10,           XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS,
   //|------+------+------+------+------|             |------+------+------+------+------|
-    KC_11SF, KC_F12, KC_DLNP, KANJI, KC_ENT,         XXXXXXX, KC_COMM, KC_DOT, KC_SLSH, KC_RO,
+    KC_11SF, KC_F12, KC_DLNP, KANJI, KC_ENT,         XXXXXXX, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS,
   //|------+------+------+------+------|------+------+------+------+------+------+------|
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   //|------+------+------+------+-------------+------+------+------+------+------+------|
@@ -156,12 +156,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           tap_code16(A(KC_GRV));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
index 5be2825861..7dfaf61200 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
+++ b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LANG2,         KC_LANG1,RAISE,   KC_SPC,       KC_ENT, LOWER,   KC_DEL,           KC_HOME,KC_PGDN, KC_PGUP, KC_END
+    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
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LANG2,         KC_LANG1,RAISE,   KC_SPC,       KC_ENT, LOWER,   KC_DEL,           KC_HOME, KC_PGDN, KC_PGUP, KC_END
+    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
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
index 8cfc5a8385..c5f4172f3a 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_LANG2,                       JP_LANG1,KC_H,    KC_J,    KC_K,    KC_L,    SCLN,    QUOT   , \
+      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    \
     ),
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c
index ac6b4f49c5..cbabeee7af 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c
+++ b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c
@@ -46,7 +46,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,    JP_AT,   JP_LBRC, KC_BSPC,
       KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, JP_RBRC, 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_BSLS, KC_UP,   KC_RSFT,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, KC_HENK, ADJUST,  KC_F10,  KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, JP_HENK, ADJUST,  KC_F10,  KC_LEFT, KC_DOWN, KC_RGHT
       ),
 
     /* Adjust
diff --git a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
index 14302bee5a..580c9b2894 100644
--- a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
+++ b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       RGB_MOD, RGB_SAI, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   JP_LBRC, KC_BSPC,
       RGB_SAI, RGB_SAD, KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, JP_RBRC, KC_ENT,
       RGB_VAI, RGB_VAD, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_BSLS, KC_UP,   KC_RSFT,
-      _______, _______, KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, KC_HENK, ADJUST,  KC_F10,  KC_LEFT, KC_DOWN, KC_RGHT
+      _______, _______, KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, JP_HENK, ADJUST,  KC_F10,  KC_LEFT, KC_DOWN, KC_RGHT
       ),
 
     /* Adjust
diff --git a/keyboards/pico/65keys/keymaps/default/keymap.c b/keyboards/pico/65keys/keymaps/default/keymap.c
index 17076f20cd..eb0ea05fc2 100644
--- a/keyboards/pico/65keys/keymaps/default/keymap.c
+++ b/keyboards/pico/65keys/keymaps/default/keymap.c
@@ -10,8 +10,8 @@
 // Shortcut to make keymap more readable
 #define SYM_L    MO(_SYMB)
 #define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
      _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_JYEN ,KC_BSLS ,
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_INT3 ,KC_BSLS ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_GRV ,KC_MINS  ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
diff --git a/keyboards/pico/65keys/keymaps/jis/keymap.c b/keyboards/pico/65keys/keymaps/jis/keymap.c
index 35b01bbba4..9f3f640f01 100644
--- a/keyboards/pico/65keys/keymaps/jis/keymap.c
+++ b/keyboards/pico/65keys/keymaps/jis/keymap.c
@@ -11,8 +11,8 @@
 // Shortcut to make keymap more readable
 #define SYM_L    MO(_SYMB)
 #define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/keyboards/pico/70keys/keymaps/default/keymap.c b/keyboards/pico/70keys/keymaps/default/keymap.c
index 9b9ae30dab..3c3ab50c17 100644
--- a/keyboards/pico/70keys/keymaps/default/keymap.c
+++ b/keyboards/pico/70keys/keymaps/default/keymap.c
@@ -10,8 +10,8 @@
 // Shortcut to make keymap more readable
 #define SYM_L    MO(_SYMB)
 #define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
      _______ ,_______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_JYEN ,KC_BSLS ,
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_INT3 ,KC_BSLS ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_GRV ,KC_MINS  ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
diff --git a/keyboards/pico/70keys/keymaps/jis/keymap.c b/keyboards/pico/70keys/keymaps/jis/keymap.c
index 67d082d189..5727cb7841 100644
--- a/keyboards/pico/70keys/keymaps/jis/keymap.c
+++ b/keyboards/pico/70keys/keymaps/jis/keymap.c
@@ -11,8 +11,8 @@
 // Shortcut to make keymap more readable
 #define SYM_L    MO(_SYMB)
 #define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LANG1)
-#define KC_L2SYM LT(_SYMB, KC_LANG2)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/keyboards/planck/keymaps/rai-suta/keymap.c b/keyboards/planck/keymaps/rai-suta/keymap.c
index bfaf28d8d9..3765f0307b 100644
--- a/keyboards/planck/keymaps/rai-suta/keymap.c
+++ b/keyboards/planck/keymaps/rai-suta/keymap.c
@@ -11,7 +11,7 @@
 #define JK_LBRC KC_RBRC     // [
 #define JK_CLN  KC_QUOT     // :
 #define JK_RBRC KC_BSLS     // ]
-#define JK_BSLS KC_RO       // Backslash(\)
+#define JK_BSLS JP_BSLS     // Backslash(\)
 #define JK_DQT  S(KC_2)     // "
 #define JK_AMPR S(KC_6)     // &
 #define JK_SQT  S(KC_7)     // '
@@ -20,7 +20,7 @@
 #define JK_S0   S(KC_0)     // Tilde(~) at IBM 5576-A01 spec
 #define JK_EQ   S(KC_MINS)  // =
 #define JK_TLD  S(JK_CIRC)  // ~
-#define JK_PIPE S(KC_JYEN)  // |
+#define JK_PIPE S(JP_YEN)  // |
 #define JK_GRV  S(JK_AT)    // `
 #define JK_LCBR S(JK_LBRC)  // {
 #define JK_PLUS S(KC_SCLN)  // +
@@ -49,7 +49,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_BSPC,
     KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  JK_CLN,
     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-    KC_ZKHK, KC_KANA, KC_LGUI, KC_LALT,  M_MHEN,  KC_SPC,  KC_SPC,  M_HENK, KC_RALT, KC_RGUI,  KC_APP,  KC_ENT
+    JP_ZKHK, JP_KANA, KC_LGUI, KC_LALT,  M_MHEN,  KC_SPC,  KC_SPC,  M_HENK, KC_RALT, KC_RGUI,  KC_APP,  KC_ENT
   ),
 
   [KL_LOWER] = LAYOUT_planck_grid(
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [KL_RAISE] = LAYOUT_planck_grid(
     KC_CAPS,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,
-    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_MINS, JK_CIRC,   JK_AT, JK_LBRC, KC_JYEN,
+    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_MINS, JK_CIRC,   JK_AT, JK_LBRC, JP_YEN,
     _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10, KC_F11,  KC_F12, XXXXXXX, KC_COMM,  KC_DOT, JK_RBRC, JK_BSLS,
     M_DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
@@ -83,11 +83,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
   switch(id) {
 
     case UM_MHEN: {
-      return MACRO_TAP_HOLD_LAYER( record, MACRO(TYPE(KC_MHEN), END), KL_LOWER );
+      return MACRO_TAP_HOLD_LAYER( record, MACRO(TYPE(JP_MHEN), END), KL_LOWER );
     } break;
 
     case UM_HENK: {
-      return MACRO_TAP_HOLD_LAYER( record, MACRO(TYPE(KC_HENK), END), KL_RAISE );
+      return MACRO_TAP_HOLD_LAYER( record, MACRO(TYPE(JP_HENK), END), KL_RAISE );
     } break;
 
     case UM_DEBUG: {
diff --git a/keyboards/preonic/keymaps/drasbeck/keymap.c b/keyboards/preonic/keymaps/drasbeck/keymap.c
index da2ab145ca..b1ea59905e 100644
--- a/keyboards/preonic/keymaps/drasbeck/keymap.c
+++ b/keyboards/preonic/keymaps/drasbeck/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO  , KC_PGUP, KC_MINS, KC_EQL,  KC_RBRC,
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NO,   KC_HOME, KC_PGDN, KC_END,  KC_NO,   KC_NUHS,
-  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RO,   KC_ENT,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INT1, KC_ENT,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5), RALT(KC_6), RALT(KC_7), RALT(KC_8), RALT(KC_9), RALT(KC_0), KC_DEL,
   KC_TRNS, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_UP,      KC_MINS,    KC_EQL,     KC_RBRC,
   KC_ESC,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_LEFT,    KC_DOWN,    KC_RGHT,    KC_NO,      KC_NUHS,
-  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_RO,      KC_SFTENT,
+  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_INT1,    KC_SFTENT,
   KC_TRNS, KC_TRNS,    KC_TRNS,    KC_RALT,    KC_TRNS,    KC_TRNS,    KC_TRNS, RALT(KC_NUBS), KC_TRNS,   KC_VOLD,    KC_VOLU,     KC_MPLY
 ),
 
diff --git a/keyboards/rate/pistachio/keymaps/default/keymap.c b/keyboards/rate/pistachio/keymaps/default/keymap.c
index e58042de9c..f00f5fc6e5 100644
--- a/keyboards/rate/pistachio/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/default/keymap.c
@@ -30,11 +30,11 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_DEL,                 KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-     KC_MNXT,  KC_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,  KC_BSPC,  KC_DEL,
+     KC_MNXT,  JP_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,  KC_BSPC,  KC_DEL,
      KC_MPLY,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   JP_LBRC,           KC_HOME,
      KC_MUTE,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                   KC_H,    KC_J,    KC_K,    KC_L,    JP_SCLN, JP_COLN, JP_RBRC, KC_ENT,   KC_END,
      KC_VOLU,  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                   KC_N,    KC_M,    JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,          KC_RSFT,  KC_PGUP,
-     KC_VOLD,  KC_LCTL, KC_LGUI, KC_LALT, KC_ENT,  KC_MHEN, LT(_FN,KC_SPC),         LT(_FN,KC_SPC),   KC_HENK, KC_BTN1, KC_INS,  KC_RALT, KC_APP,  KC_RCTL,  KC_PGDN
+     KC_VOLD,  KC_LCTL, KC_LGUI, KC_LALT, KC_ENT,  JP_MHEN, LT(_FN,KC_SPC),         LT(_FN,KC_SPC),   JP_HENK, KC_BTN1, KC_INS,  KC_RALT, KC_APP,  KC_RCTL,  KC_PGDN
     ),
     [_FN] = LAYOUT(
                _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/rate/pistachio/keymaps/rate/keymap.c b/keyboards/rate/pistachio/keymaps/rate/keymap.c
index b4d8d03982..e6f3003054 100644
--- a/keyboards/rate/pistachio/keymaps/rate/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/rate/keymap.c
@@ -30,7 +30,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
                KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_DEL,            KC_F5,  KC_F6,   KC_F7,   KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,
-      KC_0,    KC_ZKHK,  KC_1,    KC_2,    KC_3,    KC_4,  KC_5,   KC_6,      KC_7,   KC_8,    KC_9,    KC_0,   JP_MINS, JP_CIRC,  JP_YEN,  KC_BSPC,  KC_DEL,
+      KC_0,    JP_ZKHK,  KC_1,    KC_2,    KC_3,    KC_4,  KC_5,   KC_6,      KC_7,   KC_8,    KC_9,    KC_0,   JP_MINS, JP_CIRC,  JP_YEN,  KC_BSPC,  KC_DEL,
       KC_H,    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,              KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    JP_AT,    JP_LBRC,           KC_HOME,
       KC_U,    KC_ENT,   KC_A,    KC_S,    KC_D,    KC_F,  KC_G,              KC_H,   KC_J,    KC_K,    KC_L,   JP_SCLN, JP_COLN,  JP_RBRC, KC_ENT,   KC_END,
       KC_VOLU, KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,              KC_N,   KC_M,    JP_COMM, JP_DOT, JP_SLSH, JP_BSLS,           KC_RSFT,  KC_PGUP,
diff --git a/keyboards/rate/pistachio/keymaps/via/keymap.c b/keyboards/rate/pistachio/keymaps/via/keymap.c
index 376a9b37c7..6e36fe118d 100644
--- a/keyboards/rate/pistachio/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
                KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_DEL,                 KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-      KC_0,    KC_ZKHK,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,          KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC,  JP_YEN,  KC_BSPC,  KC_DEL,
+      KC_0,    JP_ZKHK,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,          KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC,  JP_YEN,  KC_BSPC,  KC_DEL,
       KC_H,    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,                   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,    JP_LBRC,           KC_HOME,
       KC_U,    KC_ENT,   KC_A,    KC_S,    KC_D,    KC_F,     KC_G,                   KC_H,   KC_J,    KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC, KC_ENT,   KC_END,
       KC_VOLU, KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,                   KC_N,   KC_M,    JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,           KC_RSFT,  KC_PGUP,
diff --git a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
index 7140d92361..c8018a8a2c 100644
--- a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
       KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,    KC_F7,    KC_F8,     KC_F9,     KC_F10,     KC_F11,  KC_F12,                        KC_MPLY,
-      KC_ZKHK,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS,  JP_CIRC,  JP_YEN,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+      JP_ZKHK,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS,  JP_CIRC,  JP_YEN,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,      KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       JP_EISU,       KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       KC_LSFT,         KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,               KC_RSFT,              KC_UP,
diff --git a/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
index 47851f0d6a..f78f9c00c2 100644
--- a/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
       KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,    KC_F7,    KC_F8,     KC_F9,     KC_F10,     KC_F11,  KC_F12,                        KC_MPLY,
-      KC_ZKHK,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS,  JP_CIRC,  JP_YEN,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+      JP_ZKHK,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS,  JP_CIRC,  JP_YEN,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,      KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       KC_ENT,        KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       KC_LSFT,         KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,               KC_RSFT,                KC_UP,
diff --git a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
index 62e6dc96dc..5f9c3e6036 100644
--- a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_via(
       KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,    KC_F7,    KC_F8,     KC_F9,     KC_F10,     KC_F11,  KC_F12,        KC_VOLU,KC_VOLD,KC_MPLY,
-      KC_ZKHK,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS,  JP_CIRC,  JP_YEN,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+      JP_ZKHK,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS,  JP_CIRC,  JP_YEN,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,      KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       JP_EISU,       KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       KC_LSFT,         KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,               KC_RSFT,              KC_UP,
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
index 4f789fdc50..4d90914332 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT(
   //,-------------------------------------------------------------------------------------------------------------.
-         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  _______,  KC_MINS,   KC_EQL,  KC_JYEN,  KC_LBRC,  KC_RBRC,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  _______,  KC_MINS,   KC_EQL,   JP_YEN,  KC_LBRC,  KC_RBRC,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  XXXXXXX,  XXXXXXX,  KC_SCLN,  KC_QUOT,  KC_BSSF,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,  KC_LSFT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  KC_SLSH,    KC_RO
+       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  KC_SLSH,  JP_BSLS
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------'
   ),
 
@@ -119,12 +119,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
index ef35e0a405..34a3ec1fbe 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
@@ -37,7 +37,7 @@ At first, Move to Lower layer with long push. After that Adjust key with long pu
 
   [_LOWER] = LAYOUT(
   //,-------------------------------------------------------------------------------------------------------------.
-         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  _______,  KC_MINS,   KC_EQL,  KC_JYEN,  KC_LBRC,  KC_RBRC,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  _______,  KC_MINS,   KC_EQL,  KC_INT3,  KC_LBRC,  KC_RBRC,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  XXXXXXX,  XXXXXXX,  KC_SCLN,  KC_QUOT,  KC_BSSF,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -51,7 +51,7 @@ At first, Move to Lower layer with long push. After that Adjust key with long pu
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,  KC_LSFT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  KC_SLSH,    KC_RO
+       KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  KC_SLSH,  KC_INT1
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------'
   ),
 
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
index 9d9e9fe42f..c7c3c57723 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
@@ -55,7 +55,7 @@ enum custom_keycodes {
 
 // qk_tap_dance_action_t tap_dance_actions[] = {
 //   [TD_CODO] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
-//   [TD_SLRO] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_RO),
+//   [TD_SLRO] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, JP_BSLS),
 // };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT(
   //,-----------------------------------------------------------------------------------------------------------------------.
-                   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  KC_MINS,   KC_EQL,  KC_JYEN,  KC_LBRC,  KC_RBRC,  _______,
+                   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  KC_MINS,   KC_EQL,   JP_YEN,  KC_LBRC,  KC_RBRC,  _______,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  XXXXXXX,  XXXXXXX,  KC_SCLN,  KC_QUOT,  KC_BSSF,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,  KC_LSFT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       _______,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SLSH,    KC_RO,  _______
+       _______,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SLSH,  JP_BSLS,  _______
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------'
   ),
 
@@ -119,12 +119,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md b/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
index 1e3e63a460..c8d38d65ac 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
@@ -33,7 +33,7 @@ At first, Move to Lower layer with long push. After that Adjust key with long pu
 
   [_LOWER] = LAYOUT(
   //,-----------------------------------------------------------------------------------------------------------------------.
-                   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  KC_MINS,   KC_EQL,  KC_JYEN,  KC_LBRC,  KC_RBRC,  _______,
+                   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  KC_MINS,   KC_EQL,  KC_INT3,  KC_LBRC,  KC_RBRC,  _______,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  XXXXXXX,  XXXXXXX,  KC_SCLN,  KC_QUOT,  KC_BSSF,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -47,7 +47,7 @@ At first, Move to Lower layer with long push. After that Adjust key with long pu
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,  KC_LSFT,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       _______,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SLSH,    KC_RO,  _______
+       _______,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_SLSH,  KC_INT1,  _______
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------'
   ),
 
diff --git a/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c
index 05e2111b3d..e50139f682 100644
--- a/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c
+++ b/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   
   [_RAISE] = LAYOUT_reviung33(
     JP_1,    JP_2,    JP_3,    JP_4,    JP_5,    JP_6,    JP_7,    JP_8,    JP_9,    JP_0,
-    JP_MINS, JP_EQL,  JP_LBRC, JP_RBRC, JP_YEN,  KC_RO,   XXXXXXX, JP_GRV,  JP_TILD, JP_COLN,
+    JP_MINS, JP_EQL,  JP_LBRC, JP_RBRC, JP_YEN,  JP_BSLS, XXXXXXX, JP_GRV,  JP_TILD, JP_COLN,
     KC_LSFT, KC_ESC,  KC_RGUI, KC_LALT, JP_DQUO, KC_TAB,  XXXXXXX, KC_RCTL, KC_RALT, KC_RSFT,
     _______,                                KC_DEL,                                  _______
   ),
diff --git a/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c
index e1e9c83d2d..cc1fa5de9b 100755
--- a/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c
+++ b/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   
   [_RAISE] = LAYOUT_reviung34(
     JP_1,    JP_2,    JP_3,    JP_4,    JP_5,          JP_6,    JP_7,    JP_8,    JP_9,    JP_0,
-    JP_MINS, JP_EQL,  JP_LBRC, JP_RBRC, JP_YEN,        KC_RO,   XXXXXXX, JP_GRV,  JP_TILD, JP_COLN,
+    JP_MINS, JP_EQL,  JP_LBRC, JP_RBRC, JP_YEN,        JP_BSLS, XXXXXXX, JP_GRV,  JP_TILD, JP_COLN,
     KC_LSFT, KC_ESC,  KC_RGUI, KC_LALT, JP_DQUO,       KC_TAB,  XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,
                       _______, _______, _______,            _______
   ),
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
index 751a1c51b1..6a2fb4de2f 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
@@ -229,7 +229,7 @@
             // [_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_RO, KC_PIPE,         KC_PSLS, KC_PAST, KC_PCMM, KC_PDOT, KC_HASH, KC_PENT,
+     //     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
      // ),
 
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index ab2e69b346..6e6b6c9b87 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -55,7 +55,7 @@ char* translate_keycode_to_string(uint16_t code)
     return (return_p);
 }
 
-lookup_table_t lookup_table[334] =
+lookup_table_t lookup_table[333] =
 {
  {"KC_NO", KC_NO},
  {"KC_TRNS", KC_TRNS},
@@ -109,7 +109,6 @@ lookup_table_t lookup_table[334] =
  {"KC_SCLN", KC_SCLN},
  {"KC_QUOT", KC_QUOT},
  {"KC_GRV", KC_GRV},
- {"KC_ZKHK", KC_ZKHK},
  {"KC_COMM", KC_COMM},
  {"KC_DOT", KC_DOT},
  {"KC_SLSH", KC_SLSH},
@@ -188,24 +187,24 @@ lookup_table_t lookup_table[334] =
  {"KC_LSCR", KC_LSCR},
  {"KC_PCMM", KC_PCMM},
  {"KC_KP_EQUAL_AS400", KC_KP_EQUAL_AS400},
- {"KC_RO", KC_RO},
- {"KC_KANA", KC_KANA},
- {"KC_JYEN", KC_JYEN},
- {"KC_HENK", KC_HENK},
- {"KC_MHEN", KC_MHEN},
+ {"KC_INT1", KC_INT1},
+ {"KC_INT2", KC_INT2},
+ {"KC_INT3", KC_INT3},
+ {"KC_INT4", KC_INT4},
+ {"KC_INT5", KC_INT5},
  {"KC_INT6", KC_INT6},
  {"KC_INT7", KC_INT7},
  {"KC_INT8", KC_INT8},
  {"KC_INT9", KC_INT9},
- {"KC_HAEN", KC_HAEN},
- {"KC_HANJ", KC_HANJ},
- {"KC_LANG3", KC_LANG3},
- {"KC_LANG4", KC_LANG4},
- {"KC_LANG5", KC_LANG5},
- {"KC_LANG6", KC_LANG6},
- {"KC_LANG7", KC_LANG7},
- {"KC_LANG8", KC_LANG8},
- {"KC_LANG9", KC_LANG9},
+ {"KC_LNG1", KC_LNG1},
+ {"KC_LNG2", KC_LNG2},
+ {"KC_LNG3", KC_LNG3},
+ {"KC_LNG4", KC_LNG4},
+ {"KC_LNG5", KC_LNG5},
+ {"KC_LNG6", KC_LNG6},
+ {"KC_LNG7", KC_LNG7},
+ {"KC_LNG8", KC_LNG8},
+ {"KC_LNG9", KC_LNG9},
  {"KC_ERAS", KC_ERAS},
  {"KC_SYSREQ", KC_SYSREQ},
  {"KC_CANCEL", KC_CANCEL},
diff --git a/keyboards/rocketboard_16/keycode_lookup.h b/keyboards/rocketboard_16/keycode_lookup.h
index 218b709b47..35f0b66f25 100644
--- a/keyboards/rocketboard_16/keycode_lookup.h
+++ b/keyboards/rocketboard_16/keycode_lookup.h
@@ -26,4 +26,4 @@ typedef struct
 
 char* translate_keycode_to_string(uint16_t code);
 
-extern lookup_table_t lookup_table[334];
+extern lookup_table_t lookup_table[333];
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
index b63cdff3cc..ad1e1ab67c 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
@@ -39,7 +39,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL, JP_BSLS, KC_ZKHK,
+  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL, JP_BSLS, JP_ZKHK,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC,KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT, MO(_FN),
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-         KC_ZKHK,LGUI_T(KC_MHEN),LT(_LOWER,KC_ENT), KC_BSPC,     KC_DEL, LT(_RAISE,KC_SPC),ALT_T(KC_HENK), KC_APP 
+         JP_ZKHK,LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT), KC_BSPC,     KC_DEL, LT(_RAISE,KC_SPC),ALT_T(JP_HENK), KC_APP 
           //`---------------------------------------------|   |--------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
index bea5978c50..d81005324a 100644
--- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
   TD(TD_ESMS),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL, KC_BSPC, KC_HOME,
+      JP_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL, KC_BSPC, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC, JP_BSLS, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,   KC_UP,  KC_END,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK, KC_LGUI,ALT_T(KC_MHEN),LT(_LOWER,KC_ENT),KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),   ALT_T(KC_HENK),  KC_APP, KC_LEFT, KC_DOWN,KC_RIGHT
+      JP_ZKHK, KC_LGUI,ALT_T(JP_MHEN),LT(_LOWER,KC_ENT),KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),   ALT_T(JP_HENK),  KC_APP, KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
index 95ba7fc9eb..8ba34de6fa 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
   KC_LSFT,JP_BSLS,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, KC_MHEN,  KC_SPC,               KC_SPC, KC_HENK, KC_KANA,  KC_APP, MO(_FN),          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,               KC_SPC, JP_HENK, JP_KANA,  KC_APP, MO(_FN),          KC_LEFT, KC_DOWN,KC_RIGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
index 978a63ab35..2bc17e668e 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
   KC_LSFT,KC_LSFT,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK, KC_LGUI, KC_MHEN,LT(_LOWER,KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),KC_HENK,KC_LALT,KC_APP,           KC_LEFT, KC_DOWN,KC_RIGHT
+      JP_ZKHK, KC_LGUI, JP_MHEN,LT(_LOWER,KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),JP_HENK,KC_LALT,KC_APP,           KC_LEFT, KC_DOWN,KC_RIGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
index dd2cad91d9..aa82b3c628 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,          KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
-LALT_T(KC_ZKHK),KC_LGUI,  KC_UP, KC_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC),KC_HENK,KC_UP,KC_RSFT, KC_APP,
+LALT_T(JP_ZKHK),KC_LGUI,  KC_UP, JP_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC),JP_HENK,KC_UP,KC_RSFT, KC_APP,
   //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
                KC_LEFT, KC_DOWN, KC_RGHT,                                                             KC_LEFT, KC_DOWN, KC_RGHT    
   //|--------------------------------------------------------------|     |--------------------------------------------------------------'
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
index cedad726dd..bd70552265 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
        KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LT(_ADJUST,KC_ZKHK),KC_1,  KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
+LT(_ADJUST,JP_ZKHK),KC_1,  KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -43,7 +43,7 @@ LT(_ADJUST,KC_ZKHK),KC_1,  KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, KC_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, KC_HENK, KC_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
   [_ADJUST] = LAYOUT( /* Base */
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
index eba01d4d65..b57b3da543 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
   TD(TD_ESMS),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
+      JP_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK, KC_LGUI, KC_LALT,KC_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC),KC_HENK, KC_KANA,  KC_APP, KC_LEFT, KC_DOWN,KC_RIGHT
+      JP_ZKHK, KC_LGUI, KC_LALT,JP_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC),JP_HENK, JP_KANA,  KC_APP, KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
index 41f90afe44..bbead12487 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
        KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LT(1,KC_ZKHK),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
+LT(1,JP_ZKHK),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -35,7 +35,7 @@ LT(1,KC_ZKHK),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, KC_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, KC_HENK, KC_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
   [1] = LAYOUT( /* Base */
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
index 249a5659f5..1cdeb5a008 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, KC_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
+               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -61,7 +61,7 @@ LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
 SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
+               _______, _______, _______, JP_MHEN, _______, _______, _______, _______, JP_HENK, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
index 86eca6b9f6..c5707ff503 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_MS_L, KC_MS_D, KC_MS_R,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, KC_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
+               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -84,7 +84,7 @@ LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
 SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
+               _______, _______, _______, JP_MHEN, _______, _______, _______, _______, JP_HENK, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
index 1f58511c89..01248b4d14 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
+     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
           //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
   ),
 
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,    MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, JP_EQL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, KC_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
+               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
           //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
   ),
 
@@ -63,7 +63,7 @@ LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
 SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,       _______,  KC_F3,  KC_F6,  KC_F9,SEND_CIF, JP_EQL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______,                        JP_RPRN,       SEND_SUM,SEND_AVE, KC_DEL
+               _______, _______, _______, JP_MHEN, _______, _______, _______, _______, JP_HENK, _______, _______, _______,                        JP_RPRN,       SEND_SUM,SEND_AVE, KC_DEL
           //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
   ),
 
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
index 2466833b2a..eef869f641 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, LT(_LOWER,KC_ENT),KC_BSPC,  KC_DEL,LT(_RAISE,KC_SPC), KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+      KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN, LT(_LOWER,KC_ENT),KC_BSPC,  KC_DEL,LT(_RAISE,KC_SPC), JP_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, KC_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
+               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
index 1ab1e9a150..a5221cb8f2 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC), KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC), JP_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
       JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, KC_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE), JP_DOT,_______, _______, _______
+               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE), JP_DOT,_______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
index a1f3379364..8f4dd91f12 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-      KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, LT(_LOWER,KC_ENT),KC_BSPC,  KC_DEL,LT(_RAISE,KC_SPC), KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+      KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN, LT(_LOWER,KC_ENT),KC_BSPC,  KC_DEL,LT(_RAISE,KC_SPC), JP_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
       JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______, _______, _______, KC_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE), JP_DOT,_______, _______, _______
+               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE), JP_DOT,_______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
index abc4350201..80e916f14d 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
                KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT, \
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               KC_ZKHK,  LGUI_T(KC_MHEN),LT(_LOWER,KC_ENT), KC_BSPC,                KC_DEL,LT(_RAISE,KC_SPC),ALT_T(KC_HENK),KC_LEFT,KC_DOWN,KC_RIGHT  \
+               JP_ZKHK,  LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT), KC_BSPC,                KC_DEL,LT(_RAISE,KC_SPC),ALT_T(JP_HENK),KC_LEFT,KC_DOWN,KC_RIGHT  \
           //`-----------------------------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
                JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                 KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS,   KC_UP, KC_RSFT, \
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               KC_ZKHK,          _______,       MO(_LOWER), _______,               _______,       MO(_RAISE),  JP_DOT, KC_LEFT, KC_DOWN, KC_RIGHT  \
+               JP_ZKHK,          _______,       MO(_LOWER), _______,               _______,       MO(_RAISE),  JP_DOT, KC_LEFT, KC_DOWN, KC_RIGHT  \
           //`-----------------------------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
index 8514ae5a22..44be3c1c32 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
                  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT,              KC_P4,    KC_P5,   KC_P6,   KC_PPLS,
     //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 KC_ZKHK,  LGUI_T(KC_MHEN), LWR_ENT, KC_BSPC,                         KC_DEL ,RSE_SPC,   ALT_T(KC_HENK), KC_LEFT, KC_DOWN, KC_RGHT,              KC_P1,    KC_P2,   KC_P3,
+                 JP_ZKHK,  LGUI_T(JP_MHEN), LWR_ENT, KC_BSPC,                         KC_DEL ,RSE_SPC,   ALT_T(JP_HENK), KC_LEFT, KC_DOWN, KC_RGHT,              KC_P1,    KC_P2,   KC_P3,
               //`---------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
                                                                                                                                                                  LWR_P0,            RSE_DOT, KC_PENT
               //                                                                                                                                                `-----------------------------------'
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
                  JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                 KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS,   KC_UP, KC_RSFT,               KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS,
     //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 KC_ZKHK,          _______,            LOWER, _______,               _______,   RAISE,           JP_DOT, KC_LEFT, KC_DOWN, KC_RGHT,               XXXXXXX, KC_DOWN, XXXXXXX,
+                 JP_ZKHK,          _______,            LOWER, _______,               _______,   RAISE,           JP_DOT, KC_LEFT, KC_DOWN, KC_RGHT,               XXXXXXX, KC_DOWN, XXXXXXX,
             //`-----------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
                                                                                                                                                                     LOWER,            RAISE, KC_PENT
             //                                                                                                                                                  `-----------------------------------'
diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
index c1d042a5f2..4ccd67bf04 100644
--- a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK, KC_LGUI, KC_MHEN,LT(_LOWER,KC_ENT), KC_BSPC,    LT(_RAISE,KC_SPC), KC_HENK, KC_LALT,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
+      JP_ZKHK, KC_LGUI, JP_MHEN,LT(_LOWER,KC_ENT), KC_BSPC,    LT(_RAISE,KC_SPC), JP_HENK, KC_LALT,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
index 38552c8dbd..fe73a67ff0 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layer_number {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      KC_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_DEL,
+      JP_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -38,7 +38,7 @@ LT(_FN,KC_CAPS),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT,   KC_UP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, KC_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, KC_HENK, KC_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
+     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
index 9252d2e58e..530bbe2683 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT,   KC_UP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC), KC_HENK,KC_RALT, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
+      JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC), JP_HENK,KC_RALT, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
index 35c78c71fd..fba5941c72 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ extern uint8_t is_master;
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      KC_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_DEL,
+      JP_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -36,7 +36,7 @@ LT(1,KC_CAPS),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT,   KC_UP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, KC_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, KC_HENK, KC_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
+     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
index 0f5c6876e7..f57e97724c 100644
--- a/keyboards/satt/comet46/keymaps/satt/keymap.c
+++ b/keyboards/satt/comet46/keymaps/satt/keymap.c
@@ -38,7 +38,7 @@ enum custom_keycodes {
 #define KC_JHEN JP_HENK  // henkan
 #define KC_JKAN JP_KANA  // katakana/hiragana|ro-mazi
 #define KC_JMKA JP_LANG1 //kana on MacOSX
-#define KC_JMEI KC_LANG2 //eisu on MacOSX
+#define KC_JMEI KC_LNG2  //eisu on MacOSX
 #define KC_JAMP JP_AMPR  // &
 #define KC_JQUO JP_QUOT  // '
 #define KC_JLPR JP_LPRN  // (
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
index e32a0579aa..a99af7770e 100644
--- a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
+++ b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
@@ -15,11 +15,11 @@ const uint16_t PROGMEM keymap_jis2us[][2] = {
   [KC_8]    = { KC_8,    KC_DQT     }, /* 8 and ( -> 8 and * */
   [KC_9]    = { KC_9,    KC_ASTR    }, /* 9 and ) -> 9 and ( */
   [KC_0]    = { KC_0,    KC_LPRN    }, /* 0 and (no assign) -> 0 and ) */
-  [KC_MINS] = { KC_MINS, S(KC_RO)   }, /* - and = -> - and _ */
+  [KC_MINS] = { KC_MINS, S(KC_INT1) }, /* - and = -> - and _ */
   [KC_EQL]  = { KC_UNDS, KC_COLN    }, /* ^ and ~ -> = and + */
   [KC_LBRC] = { KC_RBRC, KC_RCBR    }, /* @ and ` -> [ and { */
   [KC_RBRC] = { KC_BSLS, KC_PIPE    }, /* [ and { -> ] and } */
-  [KC_BSLS] = { KC_JYEN, S(KC_JYEN) }, /* ] and } -> / and | */
+  [KC_BSLS] = { KC_INT3, S(KC_INT3) }, /* ] and } -> / and | */
   [KC_NUHS] = { KC_NUHS, S(KC_NUHS) }, /* (no assign) */
   [KC_SCLN] = { KC_SCLN, KC_QUOT    }, /* ; and + -> ; and : */
   [KC_QUOT] = { KC_AMPR, KC_AT      }, /* : and * -> ' and " */
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
index ffc9beb772..2282e13efc 100644
--- a/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT, KC_KANA, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                          KC_UP,
+        KC_LSFT, KC_INT2, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                          KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
index b8e8084374..65df189e3a 100644
--- a/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT, KC_KANA, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                          KC_UP,
+        KC_LSFT, KC_INT2, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                          KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c
index b65e36d9e5..652ff4eb9b 100644
--- a/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PSCR, 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,  
         KC_CAPS, KC_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_KANA, KC_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_LSFT, KC_INT2, KC_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(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
     ),
 
diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c
index 497a4964ea..528b3f89b5 100644
--- a/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PSCR, 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,  
         KC_CAPS, KC_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_KANA, KC_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_LSFT, KC_INT2, KC_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(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
     ),
 
diff --git a/keyboards/sparrow62/keymaps/74th/keymap.c b/keyboards/sparrow62/keymaps/74th/keymap.c
index baf44fdeef..1aa33cb55e 100644
--- a/keyboards/sparrow62/keymaps/74th/keymap.c
+++ b/keyboards/sparrow62/keymaps/74th/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     SFT_T(KC_ESC),KC_Z,  KC_X,   KC_C,   KC_V,   KC_B,  KC_LBRC,  KC_RBRC, KC_N,   KC_M,  KC_COMM,KC_DOT, KC_SLSH,KC_BSLS,
     // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
     //                       |  ESC  |Alt(TAB|Sf(Eisu|Ctl(SPC|     |Ctl(ENT|  FN   |GU(Kana|  BS   |
-    ESC_MHEN, ALT_T(KC_TAB), SFT_T(KC_MHEN), CTL_T(KC_SPC), CTL_T(KC_ENT), MO(_FN), GUI_T(KC_HENK), KC_BSPC
+    ESC_MHEN, ALT_T(KC_TAB), SFT_T(KC_INT5), CTL_T(KC_SPC), CTL_T(KC_ENT), MO(_FN), GUI_T(KC_INT4), KC_BSPC
     //                       \-------+-------+-------+-------/     \-------+-------+-------+-------/
     ),
 
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
index d08cabece0..8cc7adfe70 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
@@ -22,7 +22,7 @@
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_P0", "KC_PDOT"
     ],
     [
-      "KC_TRNS", "KC_NLCK", "KC_CAPS", "KC_SLCK", "KC_LANG1", "KC_LANG2", "KC_TRNS", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_NLCK", "KC_CAPS", "KC_SLCK", "KC_LNG1", "KC_LNG2", "KC_TRNS", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "RGB_TOG", "RGB_SAI", "RGB_HUI", "RGB_VAI", "RGB_MOD", "KC_TRNS", "KC_INS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_NO", "RGB_SAD", "RGB_HUD", "RGB_VAD", "RGB_RMOD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_DEL", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
index 7e485a7be8..359e50df71 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_MPRV, KC_F1, KC_F2, KC_F3, KC_F12, KC_LPRN, KC_LT, KC_GT, KC_RPRN, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_EQL, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT),
     [_SPECIALS] = LAYOUT(
-        KC_TRNS, KC_NLCK, KC_CAPS, KC_SLCK, KC_LANG1, KC_LANG2, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_NLCK, KC_CAPS, KC_SLCK, KC_LNG1, KC_LNG2, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_NO, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/takashicompany/center_enter/keymaps/default/keymap.c b/keyboards/takashicompany/center_enter/keymaps/default/keymap.c
index 1003d0558c..d88e748638 100644
--- a/keyboards/takashicompany/center_enter/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/center_enter/keymaps/default/keymap.c
@@ -30,14 +30,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     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_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_RO,     KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_TRNS, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL
+        KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_INT1,   KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_TRNS, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL
     ),
 
     LAYOUT(
         KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO,                   KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
         KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO,    KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_TRNS, KC_TRNS, KC_LANG1, KC_NO, MO(3), KC_DEL
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_TRNS, KC_TRNS, KC_LNG1, KC_NO, MO(3), KC_DEL
     ),
 
     LAYOUT(
@@ -61,22 +61,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
 
                 if (is_lang1) {
-                    register_code(KC_LANG1);
+                    register_code(KC_LNG1);
                     is_lang1 = false;
                 }
                 else {
-                    register_code(KC_LANG2);
+                    register_code(KC_LNG2);
                     is_lang1 = true;
                 }
             }
             break;
-        case KC_LANG1:
+        case KC_LNG1:
             if (record->event.pressed) {
                 is_lang1 = false;
             }
             break;
 
-        case KC_LANG2:
+        case KC_LNG2:
             if (record->event.pressed) {
                 is_lang1 = true;
             }
diff --git a/keyboards/takashicompany/center_enter/keymaps/via/keymap.c b/keyboards/takashicompany/center_enter/keymaps/via/keymap.c
index cc11ca18a8..0785fc53ee 100644
--- a/keyboards/takashicompany/center_enter/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/center_enter/keymaps/via/keymap.c
@@ -30,14 +30,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     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_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_RO,     KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_TRNS, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL
+        KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_INT1,   KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_TRNS, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL
     ),
 
     LAYOUT(
         KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO,                   KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
         KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO,    KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_TRNS, KC_TRNS, KC_LANG1, KC_NO, MO(3), KC_DEL
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_TRNS, KC_TRNS, KC_LNG1, KC_NO, MO(3), KC_DEL
     ),
 
     LAYOUT(
@@ -55,22 +55,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
 
                 if (is_lang1) {
-                    register_code(KC_LANG1);
+                    register_code(KC_LNG1);
                     is_lang1 = false;
                 }
                 else {
-                    register_code(KC_LANG2);
+                    register_code(KC_LNG2);
                     is_lang1 = true;
                 }
             }
             break;
-        case KC_LANG1:
+        case KC_LNG1:
             if (record->event.pressed) {
                 is_lang1 = false;
             }
             break;
 
-        case KC_LANG2:
+        case KC_LNG2:
             if (record->event.pressed) {
                 is_lang1 = true;
             }
diff --git a/keyboards/takashicompany/compacx/keymaps/default/keymap.c b/keyboards/takashicompany/compacx/keymaps/default/keymap.c
index 068f621ff8..8e8f20f54e 100644
--- a/keyboards/takashicompany/compacx/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/compacx/keymaps/default/keymap.c
@@ -18,11 +18,11 @@
 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_BSPC,                                KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_BSPC,                                KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_INT3, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ENT,                                       KC_TAB, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENT,
         KC_CAPS, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G,                                       KC_RCTL, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL,                                      KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO,
-        TG(2), LT(3 ,KC_PSCR), KC_LCTL, KC_LGUI, LSFT_T(KC_TAB), LALT_T(KC_LANG2), KC_SPC,  KC_SPC, LT(1, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL, MO(3), KC_DEL
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL,                                      KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1,
+        TG(2), LT(3 ,KC_PSCR), KC_LCTL, KC_LGUI, LSFT_T(KC_TAB), LALT_T(KC_LNG2), KC_SPC,  KC_SPC, LT(1, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL, MO(3), KC_DEL
     ),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/compacx/keymaps/via/keymap.c b/keyboards/takashicompany/compacx/keymaps/via/keymap.c
index 068f621ff8..8e8f20f54e 100644
--- a/keyboards/takashicompany/compacx/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/compacx/keymaps/via/keymap.c
@@ -18,11 +18,11 @@
 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_BSPC,                                KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_JYEN, KC_BSPC,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_BSPC,                                KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_INT3, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ENT,                                       KC_TAB, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENT,
         KC_CAPS, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G,                                       KC_RCTL, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL,                                      KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO,
-        TG(2), LT(3 ,KC_PSCR), KC_LCTL, KC_LGUI, LSFT_T(KC_TAB), LALT_T(KC_LANG2), KC_SPC,  KC_SPC, LT(1, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL, MO(3), KC_DEL
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL,                                      KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1,
+        TG(2), LT(3 ,KC_PSCR), KC_LCTL, KC_LGUI, LSFT_T(KC_TAB), LALT_T(KC_LNG2), KC_SPC,  KC_SPC, LT(1, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL, MO(3), KC_DEL
     ),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/endzone34/keymaps/default/keymap.c b/keyboards/takashicompany/endzone34/keymaps/default/keymap.c
index 7c30fb231e..7067b1d51e 100644
--- a/keyboards/takashicompany/endzone34/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/endzone34/keymaps/default/keymap.c
@@ -21,18 +21,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(2, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
         KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, KC_H, KC_J, LT(2, KC_K), KC_L, KC_ENT,
         SFT_T(KC_Z), GUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, CTL_T(KC_DOT), KC_BSPC,
-        ALT_T(KC_LANG2), SFT_T(KC_TAB), KC_SPC, LT(1, KC_LANG1)),
+        ALT_T(KC_LNG2), SFT_T(KC_TAB), KC_SPC, LT(1, KC_LNG1)),
 
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
-        CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN,
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL,
+        CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     LAYOUT(
         KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
         KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_TRNS, KC_LANG1, KC_NO, MO(3), KC_DEL,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_TRNS, KC_LNG1, KC_NO, MO(3), KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/endzone34/keymaps/via/keymap.c b/keyboards/takashicompany/endzone34/keymaps/via/keymap.c
index 336dce2f54..06414c288a 100644
--- a/keyboards/takashicompany/endzone34/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/endzone34/keymaps/via/keymap.c
@@ -21,18 +21,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(2, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
         KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, KC_H, KC_J, LT(2, KC_K), KC_L, KC_ENT,
         SFT_T(KC_Z), GUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, CTL_T(KC_DOT), KC_BSPC,
-        ALT_T(KC_LANG2), SFT_T(KC_TAB), KC_SPC, LT(1, KC_LANG1)),
+        ALT_T(KC_LNG2), SFT_T(KC_TAB), KC_SPC, LT(1, KC_LNG1)),
 
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
-        CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN,
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL,
+        CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     LAYOUT(
         KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
         KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_TRNS, KC_LANG1, KC_NO, MO(3), KC_DEL,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_TRNS, KC_LNG1, KC_NO, MO(3), KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/goat51/keymaps/default/keymap.c b/keyboards/takashicompany/goat51/keymaps/default/keymap.c
index 4e2c0e2d57..891ac31241 100644
--- a/keyboards/takashicompany/goat51/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/goat51/keymaps/default/keymap.c
@@ -15,24 +15,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, 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_LCTL, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, GOAT51, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        TG(6), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+        TG(6), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
         KC_PGDN, KC_PGUP
     ),
 
     // 1: JIS-Num
     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, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, GOAT51, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
-        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, GOAT51, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
     
     // 2: JIS-Shift-Num
     LAYOUT(
-        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), KC_TRNS,
-        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), GOAT51, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), GOAT51, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
@@ -42,14 +42,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, 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_TRNS, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, GOAT51, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_TRNS,
         KC_TRNS, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_TRNS,
-        TG(6), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+        TG(6), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
         KC_PGDN, KC_PGUP
     ),
     
     // 4: US-Num
     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_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, GOAT51, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, KC_TRNS,
+        KC_TRNS, KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, GOAT51, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, KC_TRNS,
         KC_TRNS, LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
         KC_TRNS, KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TRNS,
         KC_TRNS, KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, GOAT51, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
diff --git a/keyboards/takashicompany/goat51/keymaps/via/keymap.c b/keyboards/takashicompany/goat51/keymaps/via/keymap.c
index 6adb87dc32..b4858a17b5 100644
--- a/keyboards/takashicompany/goat51/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/goat51/keymaps/via/keymap.c
@@ -15,24 +15,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, LT(4, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_LCTL, KC_A, KC_S, LT(3, KC_D), KC_F, KC_G, GOAT51, KC_H, KC_J, LT(3, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        TG(3), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+        TG(3), KC_PGUP, KC_PGDN, KC_LCTL, KC_LGUI, ALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
         KC_PGDN, KC_PGUP
     ),
 
     // 1: JIS-Num
     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, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, GOAT51, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
-        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, GOAT51, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
     
     // 2: JIS-Shift-Num
     LAYOUT(
-        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), KC_TRNS,
-        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), GOAT51, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), GOAT51, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
diff --git a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
index 768c5f7875..58e7a168bc 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
@@ -24,11 +24,11 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     LAYOUT(
-        KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_DEL,
+        KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_DEL,
         KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
         KC_P4, KC_P5, KC_P6, KC_PCMM, KC_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_END,
         KC_P1, KC_P2, KC_P3, KC_PEQL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, KC_PGUP,
-        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_TILD, KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC, KC_SPC, KC_LANG1, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(1)
+        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_TILD, KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC, KC_SPC, KC_LNG1, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(1)
     ),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
index 1833206af3..4088a593dc 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
@@ -24,17 +24,17 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     LAYOUT(
-        KC_NLCK, 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_JYEN, KC_BSPC, KC_DEL,
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_DEL,
         KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
         KC_P4, KC_P5, KC_P6, KC_PCMM,KC_LCTL, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END,
         KC_P1, KC_P2, KC_P3, KC_PEQL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, KC_PGUP,
-        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, LALT_T(KC_LANG2), LALT_T(KC_LANG2), LSFT_T(KC_TAB), KC_SPC, LT(1, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(3)
+        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, LALT_T(KC_LNG2), LALT_T(KC_LNG2), LSFT_T(KC_TAB), KC_SPC, LT(1, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(3)
     ),
 
     LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, JP_BSLS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, JP_YEN, KC_TRNS, KC_TRNS, KC_TRNS, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
diff --git a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
index b351d57c82..77e18659ff 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
@@ -24,11 +24,11 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     LAYOUT(
-        KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_DEL,
+        KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_DEL,
         KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
         KC_P4, KC_P5, KC_P6, KC_PCMM, KC_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_END,
         KC_P1, KC_P2, KC_P3, KC_PEQL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, KC_PGUP,
-        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_TILD, KC_LCTL, KC_LGUI, KC_LALT, KC_LANG2, KC_SPC, KC_SPC, KC_LANG1, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(1)
+        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_TILD, KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC, KC_SPC, KC_LNG1, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(1)
     ),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/minizone/keymaps/default/keymap.c b/keyboards/takashicompany/minizone/keymaps/default/keymap.c
index 51c9cc1678..a1ae5d866c 100644
--- a/keyboards/takashicompany/minizone/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/minizone/keymaps/default/keymap.c
@@ -9,20 +9,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
         LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
-        KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_PGUP, KC_PGDN
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_PGUP, KC_PGDN
     ),
     
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, 
-        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), 
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, 
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), 
-        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, 
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), 
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
@@ -30,12 +30,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
         LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
-        KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_PGUP, KC_PGDN
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_PGUP, KC_PGDN
     ),
         
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, 
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, 
         LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -43,14 +43,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
         KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS,
         KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
         KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, 
         KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_NO, KC_LANG1, KC_NO, KC_NO, KC_DEL, 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ), 
     
diff --git a/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c b/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c
index f1652d344a..ceca01cb85 100644
--- a/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c
+++ b/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c
@@ -71,20 +71,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
         LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
-        KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_PGUP, KC_PGDN
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_PGUP, KC_PGDN
     ),
     
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, 
-        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), 
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, 
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), 
-        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, 
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), 
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
@@ -92,12 +92,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
         LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
-        KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_PGUP, KC_PGDN
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_PGUP, KC_PGDN
     ),
         
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, 
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, 
         LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -105,14 +105,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
         KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, 
         KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
         KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, 
         KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_NO, KC_LANG1, KC_NO, KC_NO, KC_DEL, 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ), 
     
diff --git a/keyboards/takashicompany/minizone/keymaps/via/keymap.c b/keyboards/takashicompany/minizone/keymaps/via/keymap.c
index d78a5bbf17..f64501f2f5 100644
--- a/keyboards/takashicompany/minizone/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/minizone/keymaps/via/keymap.c
@@ -9,20 +9,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
         LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
-        KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_PGUP, KC_PGDN
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_PGUP, KC_PGDN
     ),
     
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, 
-        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), 
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, 
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), 
-        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, 
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), 
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
@@ -30,12 +30,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
         LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
-        KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_PGUP, KC_PGDN
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_PGUP, KC_PGDN
     ),
         
     LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, 
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, 
         LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -43,14 +43,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
         KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, 
         KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
         KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, 
         KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_NO, KC_LANG1, KC_NO, KC_NO, KC_DEL, 
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ), 
     
diff --git a/keyboards/takashicompany/qoolee/keymaps/default/keymap.c b/keyboards/takashicompany/qoolee/keymaps/default/keymap.c
index 64d6ff7aea..03f1bed1a4 100644
--- a/keyboards/takashicompany/qoolee/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/qoolee/keymaps/default/keymap.c
@@ -25,14 +25,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     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_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS
+        KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
         KC_TRNS, KC_LCTL, LALT(KC_C), KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_TRNS, KC_LANG1, KC_NO, MO(3), KC_DEL, KC_TRNS
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_TRNS, KC_LNG1, KC_NO, MO(3), KC_DEL, KC_TRNS
     ),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/qoolee/keymaps/via/keymap.c b/keyboards/takashicompany/qoolee/keymaps/via/keymap.c
index 64d6ff7aea..03f1bed1a4 100644
--- a/keyboards/takashicompany/qoolee/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/qoolee/keymaps/via/keymap.c
@@ -25,14 +25,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     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_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS
+        KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
         KC_TRNS, KC_LCTL, LALT(KC_C), KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_TRNS, KC_LANG1, KC_NO, MO(3), KC_DEL, KC_TRNS
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_TRNS, KC_LNG1, KC_NO, MO(3), KC_DEL, KC_TRNS
     ),
 
     LAYOUT(
diff --git a/keyboards/takashicompany/radialex/keymaps/default/keymap.c b/keyboards/takashicompany/radialex/keymaps/default/keymap.c
index 7bb266e00b..6581ab82b7 100644
--- a/keyboards/takashicompany/radialex/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/radialex/keymaps/default/keymap.c
@@ -26,20 +26,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_ESC, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, RADIALEX, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL 
+        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL 
     ),
     
     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_RO, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
-        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN),
-        KC_TRNS, KC_TRNS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_TRNS, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3),
+        KC_TRNS, KC_TRNS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_TRNS, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
@@ -47,12 +47,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, RADIALEX, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_TRNS,
         KC_TRNS, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_TRNS,
-        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL 
+        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL 
     ),
         
     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_TRNS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, KC_TRNS,
+        KC_TRNS, KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_TRNS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, KC_TRNS,
         KC_TRNS, LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -60,14 +60,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_TRNS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
         KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, 
         KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS, 
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_NO, KC_LANG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, 
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ), 
     
diff --git a/keyboards/takashicompany/radialex/keymaps/via/keymap.c b/keyboards/takashicompany/radialex/keymaps/via/keymap.c
index b84ccc86b2..de23d306eb 100644
--- a/keyboards/takashicompany/radialex/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/radialex/keymaps/via/keymap.c
@@ -23,20 +23,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
         KC_ESC, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, RADIALEX, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL 
+        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL 
     ),
     
     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_RO, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
-        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
+        KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN),
-        KC_TRNS, KC_TRNS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_TRNS, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3),
+        KC_TRNS, KC_TRNS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_TRNS, KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
@@ -44,12 +44,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, RADIALEX, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_TRNS,
         KC_TRNS, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_TRNS,
-        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL 
+        KC_PSCR, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL 
     ),
         
     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_TRNS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, KC_TRNS,
+        KC_TRNS, KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_TRNS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, KC_TRNS,
         KC_TRNS, LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
@@ -57,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_TRNS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     
     LAYOUT(
         KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, 
         KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS, 
-        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_NO, KC_LANG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, 
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ), 
     
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c b/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
index 0c765b9f40..f0ac6aa00b 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
@@ -13,13 +13,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, LT(2, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_LCTL, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, SPREADWRITER, KC_H, KC_J, LT(2, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, SFT_T(KC_Z), GUI_T(KC_X), KC_C, KC_V, KC_B, MEH(KC_4), LSA(KC_5),  KC_N, KC_M, KC_COMM, CTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LANG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LNG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
         KC_WH_U, KC_WH_D
     ),
 
     LAYOUT(
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_LCTL, CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
+        KC_LCTL, CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
@@ -42,24 +42,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     LAYOUT(
-        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_JYEN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_INT3, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_NUHS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
-        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL), S(KC_JYEN), KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL), S(KC_INT3), KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_LBRC), S(KC_RBRC), KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_NUHS), KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
-        KC_TRNS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), G(KC_JYEN), KC_TRNS,
-        KC_LCTL, S(KC_EQL), S(KC_LBRC), S(KC_SLSH), S(KC_MINS), S(KC_RO), KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_RBRC), S(KC_NUHS), S(KC_JYEN), KC_TRNS,
+        KC_TRNS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), G(KC_INT3), KC_TRNS,
+        KC_LCTL, S(KC_EQL), S(KC_LBRC), S(KC_SLSH), S(KC_MINS), S(KC_INT1), KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_RBRC), S(KC_NUHS), S(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
index 7d601c21a6..7d9a5cebf9 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
@@ -13,13 +13,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, LT(2, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_LCTL, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, SPREADWRITER, KC_H, KC_J, LT(2, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, SFT_T(KC_Z), GUI_T(KC_X), KC_C, KC_V, KC_B, MEH(KC_4), LSA(KC_5),  KC_N, KC_M, KC_COMM, CTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LANG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LANG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LNG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
         KC_WH_U, KC_WH_D
     ),
 
     LAYOUT(
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_LCTL, CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS,
+        KC_LCTL, CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
@@ -42,24 +42,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     LAYOUT(
-        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_JYEN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_INT3, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_NUHS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
-        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL), S(KC_JYEN), KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL), S(KC_INT3), KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_LBRC), S(KC_RBRC), KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_NUHS), KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), KC_TRNS,
         KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
-        KC_TRNS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), G(KC_JYEN), KC_TRNS,
-        KC_LCTL, S(KC_EQL), S(KC_LBRC), S(KC_SLSH), S(KC_MINS), S(KC_RO), KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_RBRC), S(KC_NUHS), S(KC_JYEN), KC_TRNS,
+        KC_TRNS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), G(KC_INT3), KC_TRNS,
+        KC_LCTL, S(KC_EQL), S(KC_LBRC), S(KC_SLSH), S(KC_MINS), S(KC_INT1), KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_RBRC), S(KC_NUHS), S(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS
diff --git a/keyboards/takashiski/hecomi/keymaps/default/keymap.c b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
index 4ed135c25e..b59577a0d5 100644
--- a/keyboards/takashiski/hecomi/keymaps/default/keymap.c
+++ b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
@@ -42,14 +42,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_TAB  ,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,                 KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSPC,
 			KC_LCTRL ,KC_A,KC_S,KC_D,KC_F,KC_G,                     KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_ENT,
 			KC_LSFT   ,KC_Z,KC_X,KC_C,KC_V,KC_B,               KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_FN,
-			KC_LCTRL,KC_LGUI,KC_LALT,KC_MHEN,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_HENK,KC_RALT,KC_RGUI,KC_RCTRL
+			KC_LCTRL,KC_LGUI,KC_LALT,KC_INT5,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_INT4,KC_RALT,KC_RGUI,KC_RCTRL
 			),
 	[FN]=LAYOUT(
 			KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,                  KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_INS,KC_DEL,
 			KC_TAB  ,KC_9,KC_7,KC_5,KC_3,KC_1,KC_Y,                 KC_Y,KC_U,KC_PSCR,KC_SLCK,KC_PAUSE,KC_UP,KC_RBRC,KC_BSPC,
 			KC_CAPS ,KC_8,KC_6,KC_4,KC_2,KC_0,                     KC_SFT(KC_8),KC_SLSH,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,KC_ENT,
 			KC_LSFT   ,KC_Z,KC_X,KC_C,KC_V,KC_B,               KC_B,KC_SFT(KC_EQL),KC_MINS,KC_END,KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS,
-			KC_LCTRL,KC_LGUI,KC_LALT,KC_MHEN,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_HENK,KC_RALT,KC_RGUI,KC_RCTRL
+			KC_LCTRL,KC_LGUI,KC_LALT,KC_INT5,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_INT4,KC_RALT,KC_RGUI,KC_RCTRL
 			),
 };
 
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
index 614035de23..629518bf6b 100644
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
+++ b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_TAB  ,KC_NO,KC_UP,KC_NO,KC_NO,KC_NO,KC_NO,           KC_7,KC_8,KC_0,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
             KC_LCTRL ,KC_LEFT,KC_DOWN,KC_RIGHT,KC_NO,KC_NO,         KC_4,KC_5,KC_6,KC_NO,KC_NO,KC_NO,KC_NO,
             KC_LSFT   ,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,               KC_1,KC_2,KC_3,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
-            KC_LGUI,KC_NO,KC_LALT,KC_MHEN,KC_NO,KC_SPC,             KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDOWN,KC_END
+            KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC,             KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDOWN,KC_END
             ),
 };
 
diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
index 4c74afb363..ebdd31f304 100644
--- a/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
@@ -22,10 +22,10 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_JYEN,KC_BSPC,
+			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,      KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,KC_RBRC,KC_ENT,
 			KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,                    KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  KC_QUOT,KC_NUHS,
-			KC_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_RO,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_MHEN,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_HENK,KC_KANA,KC_RALT,KC_RGUI,KC_APP,KC_RCTRL
+			KC_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_INT1,KC_RSHIFT,
+			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_RGUI,KC_APP,KC_RCTRL
   ),
 };
diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
index 6126d780fa..a0ac14e102 100644
--- a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
@@ -36,11 +36,11 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_wrapper(
-			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_JYEN,KC_BSPC,
+			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   _________________QWERTY_L1_________________,KC_Y,    _________________QWERTY_R1_________________,KC_LBRC,KC_RBRC,KC_ENT,
 			KC_CAPS,  _________________QWERTY_L2_________________,         _________________QWERTY_R2_________________,KC_QUOT,KC_NUHS,
-			KC_LSHIFT,_________________QWERTY_L3_________________,    KC_B,_________________QWERTY_R3_________________,KC_RO,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_MHEN,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_HENK,KC_KANA,KC_RALT,KC_RGUI,KC_APP,KC_RCTRL
+			KC_LSHIFT,_________________QWERTY_L3_________________,    KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSHIFT,
+			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_RGUI,KC_APP,KC_RCTRL
   ),
 };
 
diff --git a/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
index a7f88b2a87..32e8d91057 100644
--- a/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
@@ -23,17 +23,17 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT(
-			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_6, KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_JYEN,KC_BSPC,
+			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_6, KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,      KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,KC_RBRC,KC_ENT,
 			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_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_RO,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_MHEN,LT(CURSOR,KC_TAB),KC_SPC,KC_SPC,        LT(CURSOR,KC_SPC),KC_ENT,KC_BSPC,KC_HENK,LT(CURSOR,KC_KANA),KC_RALT,KC_APP,KC_RCTRL
+			KC_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_INT1,KC_RSHIFT,
+			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,LT(CURSOR,KC_TAB),KC_SPC,KC_SPC,        LT(CURSOR,KC_SPC),KC_ENT,KC_BSPC,KC_INT4,LT(CURSOR,KC_INT2),KC_RALT,KC_APP,KC_RCTRL
   ),
   [CURSOR] = LAYOUT(
-			KC_GRAVE, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,             KC_F6, KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_JYEN,KC_DEL,
+			KC_GRAVE, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,             KC_F6, KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INT3,KC_DEL,
 			KC_TAB,   KC_Q,  KC_UP,  KC_E,  KC_R,  KC_T,  KC_Y,      KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,KC_RBRC,KC_PSCR,
 			KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_F,  KC_G,                    KC_LEFT,  KC_DOWN,  KC_UP,  KC_RIGHT,  KC_SCLN,  KC_QUOT,KC_NUHS,
 			KC_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_END,KC_UP,KC_HOME,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_MHEN,KC_TRNS,KC_SPC,KC_SPC,        KC_TRNS,KC_ENT,KC_BSPC,KC_HENK,KC_TRNS,KC_LEFT,KC_DOWN,KC_RIGHT
+			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TRNS,KC_SPC,KC_SPC,        KC_TRNS,KC_ENT,KC_BSPC,KC_INT4,KC_TRNS,KC_LEFT,KC_DOWN,KC_RIGHT
   )
 };
diff --git a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
index 148c80f274..570453dc4a 100644
--- a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
@@ -42,11 +42,11 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_wrapper(
-			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_6, KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_JYEN,KC_BSPC,
+			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_6, KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   _________________QWERTY_L1_________________,KC_Y,    _________________QWERTY_R1_________________,KC_LBRC,KC_RBRC,KC_ENT,
 			KC_CAPS,  _________________QWERTY_L2_________________,         _________________QWERTY_R2_________________,KC_QUOT,KC_NUHS,
-			KC_LSHIFT,_________________QWERTY_L3_________________,         KC_B,_________________QWERTY_R3_________________,KC_RO,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_MHEN,KC_TAB,KC_SPC,KC_SPC,        KC_SPC,KC_ENT,KC_BSPC,KC_HENK,KC_KANA,KC_RALT,KC_APP,KC_RCTRL
+			KC_LSHIFT,_________________QWERTY_L3_________________,         KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSHIFT,
+			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,KC_SPC,        KC_SPC,KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_APP,KC_RCTRL
   )
 };
 
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c
index 4403dd662a..3b146b8e37 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c
@@ -35,7 +35,7 @@ enum tapdances{
 
 // Layer Mode aliases
 #define KC_TBSF  LSFT_T(KC_TAB)
-#define KC_ROSF  RSFT_T(KC_RO)
+#define KC_ROSF  RSFT_T(JP_BSLS)
 #define KC_ALAP  LALT_T(KC_APP)
 
 // Layer tap
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT(
   //,-----------------------------------------------------------------------------------------------------------.
   //                F1       F2       F3       F4       F5        -        ^        \        @        [   Delete
-      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL, KC_JYEN, KC_LBRC, KC_RBRC,  KC_DEL,
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_MINS,  KC_EQL,  JP_YEN, KC_LBRC, KC_RBRC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
   //                F6       F7       F8       F9      F10                          ;        :        ]
       _______,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS, _______,
@@ -133,12 +133,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KANJI:
       if (record->event.pressed) {
         if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
+          register_code(KC_LNG2);
         } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
-        unregister_code(KC_LANG2);
+        unregister_code(KC_LNG2);
       }
       break;
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
index 1e0548c303..606648cf16 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
+++ b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAV] = LAYOUT(
       QK_BOOT,  _______,  AG_NORM,  AG_SWAP,  DEBUG, KC_TRNS,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,           KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
-    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,           KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,           KC_MINS,    KC_INT1,  KC_COMM,   KC_DOT,  KC_BSLS,
                                   KC_TRNS,KC_TRNS,           KC_TRNS,  KC_TRNS
   ),
 };
diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c
index 01e684e8ec..517f0aafda 100644
--- a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c
+++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAV] = LAYOUT_33_split_space(
       QK_BOOT,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
-    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_INT1,  KC_COMM,   KC_DOT,  KC_BSLS,
                    KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
   ),
 };
diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c
index 89efbd77e6..6b5eda2b45 100644
--- a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c
+++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAV] = LAYOUT_33_big_space(
       QK_BOOT,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
-    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_INT1,  KC_COMM,   KC_DOT,  KC_BSLS,
                         KC_TRNS,   KC_TRNS,   KC_TRNS
   ),
 };
diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c
index 00ae38ce75..2a415b8e94 100644
--- a/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c
+++ b/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAV] = LAYOUT_33_split_space(
     QK_BOOT,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
-    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_INT1,  KC_COMM,   KC_DOT,  KC_BSLS,
                    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
   ),
 };
diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c
index 89efbd77e6..6b5eda2b45 100644
--- a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c
+++ b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAV] = LAYOUT_33_big_space(
       QK_BOOT,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
-    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_INT1,  KC_COMM,   KC_DOT,  KC_BSLS,
                         KC_TRNS,   KC_TRNS,   KC_TRNS
   ),
 };
diff --git a/keyboards/uranuma/keymaps/default/keymap.c b/keyboards/uranuma/keymaps/default/keymap.c
index c2ac4d8bf9..f912a50280 100644
--- a/keyboards/uranuma/keymaps/default/keymap.c
+++ b/keyboards/uranuma/keymaps/default/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      //|--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------|
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
      //|--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------|
-        KC_F11,  KC_F12,  XXXXXXX, KANJI,   XXXXXXX,                       XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   KC_RO,
+        KC_F11,  KC_F12,  XXXXXXX, KANJI,   XXXXXXX,                       XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   KC_INT1,
      //|--------+--------+--------+--------+--------+--------.   .--------+--------+--------+--------+--------+--------|
         KC_ESCT, KC_TBAL, KC_LGUI, LOWER,   KC_BSPC, KC_SPC,      KC_ENT,  KC_ENT,  KANJI,   KC_LEFT, KC_DOWN, KC_RGHT,
      //|--------+--------+--------+--------+--------+--------'   '--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/whale/sk/keymaps/default/keymap.c b/keyboards/whale/sk/keymaps/default/keymap.c
index 249b1955e7..ff93d3c2bb 100644
--- a/keyboards/whale/sk/keymaps/default/keymap.c
+++ b/keyboards/whale/sk/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_PGUP,               KC_PGDOWN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
         KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL,               KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LEFT,              KC_RIGHT, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSHIFT,
-        KC_LBRACKET, KC_LALT, KC_LWIN, KC_APP, KC_HENK, KC_MENU,              KC_MENU, KC_MHEN, KC_APP, KC_RWIN, KC_RALT, KC_RBRACKET,
+        KC_LBRACKET, KC_LALT, KC_LWIN, KC_APP, KC_INT4, KC_MENU,              KC_MENU, KC_INT5, KC_APP, KC_RWIN, KC_RALT, KC_RBRACKET,
                                             KC_F1, KC_F2,       KC_F7, KC_F8,
                                     KC_SPC, KC_F3, KC_F4,       KC_F9, KC_F10, KC_SPC,
                                             KC_F5, KC_F6,       KC_F11, KC_F12
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
index b7d2272b02..3ea87056ef 100644
--- a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
@@ -19,7 +19,7 @@
  // 2019/03/04 takashiski
  // NORTICE
  // This layout is for Japanese Keyboard User.
- // So there are logicalparing symbols and special keycode like a KC_RO, KC_HENK, KC_MHEN, KC_JYEN.
+ // So there are logicalparing symbols and special keycode like a JP_BSLS, JP_HENK, JP_MHEN, JP_YEN.
  // 日本語キーボードとして認識させて使うことが前提なので、記号位置が英語キーボードとは異なります。
  // また、日本語キーボードでないと認識されない特殊なキーコードが含まれています。
 
@@ -39,19 +39,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  //qwerty layer(almost use default)
  [_QW] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_JYEN,  KC_BSPC,
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_INT3,  KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT, KC_DEL,
   KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,  KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,   KC_RSFT, KC_UP,   KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, LT(_LW,KC_TAB), KC_SPC,  LT(_CURSOR,KC_ENT),  LT(_RS,KC_BSPC), KC_HENK, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT, KC_UP,   KC_RSFT,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, LT(_LW,KC_TAB), KC_SPC,  LT(_CURSOR,KC_ENT),  LT(_RS,KC_BSPC), KC_INT4, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
  ),
  //4th row shifted 1u from regular ortholinear.
  [_EASY_QW] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_JYEN,  KC_BSPC,
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_INT3,  KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT, KC_DEL,
   KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,  KC_ENT,
-  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,   KC_UP,   KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, LT(_LW,KC_TAB), KC_SPC,  LT(_CURSOR,KC_ENT),  LT(_RS,KC_BSPC), KC_HENK, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_UP,   KC_RSFT,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, LT(_LW,KC_TAB), KC_SPC,  LT(_CURSOR,KC_ENT),  LT(_RS,KC_BSPC), KC_INT4, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
  ),
 //LOWER
  [_LW] = LAYOUT(
@@ -71,11 +71,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    QK_BOOT, DF(_QW), DF(_EASY_QW), _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 	 ),
  [_CURSOR] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_JYEN,  KC_BSPC,
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_INT3,  KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT, KC_DEL,
   KC_CAPS,  KC_LEFT,    KC_DOWN,    KC_UP,    KC_RIGHT,    KC_G,    KC_LEFT,    KC_DOWN,    KC_UP,    KC_RIGHT,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,  KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,   KC_RSFT, KC_UP,   KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, LT(_LW,KC_TAB), KC_SPC,  KC_ENT,  LT(_RS,KC_BSPC), KC_HENK, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT, KC_UP,   KC_RSFT,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, LT(_LW,KC_TAB), KC_SPC,  KC_ENT,  LT(_RS,KC_BSPC), KC_INT4, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
 )
 
 };
diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
index 37e59ad4a9..07a28ce7c6 100644
--- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
@@ -52,16 +52,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     tap_code16(LALT(KC_GRV));
                 } else {
                     if(input_mode()){
-                        register_code(KC_LANG2);
+                        register_code(KC_LNG2);
                         set_input_mode(false);
                     } else {
-                        register_code(KC_LANG1);
+                        register_code(KC_LNG1);
                         set_input_mode(true);
                     }
                 }
             } else {
-                unregister_code(KC_LANG1);
-                unregister_code(KC_LANG2);
+                unregister_code(KC_LNG1);
+                unregister_code(KC_LNG2);
             }
             break;
         default:
diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
index 37e59ad4a9..07a28ce7c6 100644
--- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
@@ -52,16 +52,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     tap_code16(LALT(KC_GRV));
                 } else {
                     if(input_mode()){
-                        register_code(KC_LANG2);
+                        register_code(KC_LNG2);
                         set_input_mode(false);
                     } else {
-                        register_code(KC_LANG1);
+                        register_code(KC_LNG1);
                         set_input_mode(true);
                     }
                 }
             } else {
-                unregister_code(KC_LANG1);
-                unregister_code(KC_LANG2);
+                unregister_code(KC_LNG1);
+                unregister_code(KC_LNG2);
             }
             break;
         default:
diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c
index 8fe2b7e415..b68ffec865 100644
--- a/layouts/community/ergodox/ishigoya-jp/keymap.c
+++ b/layouts/community/ergodox/ishigoya-jp/keymap.c
@@ -405,7 +405,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                   KC_NO, KC_NO, KC_TRNS,
        // right hand
        KC_NO, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       LSFT(KC_JYEN), KC_PERC,   KC_7,   KC_8,    KC_9,    KC_NO, KC_F12,
+       LSFT(JP_YEN), KC_PERC,   KC_7,   KC_8,    KC_9,    KC_NO, KC_F12,
                 KC_EXLM, KC_4,   KC_5,    KC_6,    KC_0, KC_COMM,
        LSFT(KC_6), KC_DOT, KC_1,   KC_2,    KC_3,    KC_QUES, KC_NO,
                          KC_LT,JP_EQL,  KC_GT,    KC_NO,  KC_NO,
diff --git a/layouts/community/ergodox/siroken3/keymap.c b/layouts/community/ergodox/siroken3/keymap.c
index dd5125d20e..5016ec4159 100644
--- a/layouts/community/ergodox/siroken3/keymap.c
+++ b/layouts/community/ergodox/siroken3/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
                                                     KC_BSPC,  KC_LGUI,
                                                               KC_HOME,
-                                 MT(MOD_LGUI, KC_SPC),KC_LANG1,KC_END,
+                                 MT(MOD_LGUI, KC_SPC),KC_LNG1,KC_END,
         // right hand
              KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
              TG(SYMB),       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                   KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
              KC_LALT,        CTL_T(KC_ESC),
              KC_PGUP,
-             KC_PGDN,KC_LANG2, KC_ENT
+             KC_PGDN,KC_LNG2, KC_ENT
     ),
 /* Keymap 1: Symbol Layer
  *
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index bcc9e0da62..87834ee1fe 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -125,9 +125,7 @@
   "KC_LOCKING_SCROLL_LOCK": "Locking Scroll Lock",
   "KC_LSCR": "Locking Scroll Lock",
   "KC_INT4": "JIS Henkan",
-  "KC_HENK": "JIS Henkan",
   "KC_INT5": "JIS Muhenkan",
-  "KC_MHEN": "JIS Muhenkan",
   "KC_PSCREEN": "Print Screen",
   "KC_PSCR": "Print Screen",
   "KC_SCROLLLOCK": "Scroll Lock",
diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h
index 9169f3cb89..9c66f8fa51 100644
--- a/quantum/keycode_legacy.h
+++ b/quantum/keycode_legacy.h
@@ -19,15 +19,6 @@
 #define KC__MUTE          KC_KB_MUTE
 #define KC__VOLUP         KC_KB_VOLUME_UP
 #define KC__VOLDOWN       KC_KB_VOLUME_DOWN
-#define KC_LANG1          KC_LANGUAGE_1
-#define KC_LANG2          KC_LANGUAGE_2
-#define KC_LANG3          KC_LANGUAGE_3
-#define KC_LANG4          KC_LANGUAGE_4
-#define KC_LANG5          KC_LANGUAGE_5
-#define KC_LANG6          KC_LANGUAGE_6
-#define KC_LANG7          KC_LANGUAGE_7
-#define KC_LANG8          KC_LANGUAGE_8
-#define KC_LANG9          KC_LANGUAGE_9
 #define KC_ALT_ERASE      KC_ALTERNATE_ERASE
 #define KC_SYSREQ         KC_SYSTEM_REQUEST
 
@@ -36,15 +27,6 @@
 #define KC_RCTRL          KC_RIGHT_CTRL
 #define KC_RSHIFT         KC_RIGHT_SHIFT
 
-#define KC_ZKHK KC_GRAVE
-#define KC_RO   KC_INTERNATIONAL_1
-#define KC_KANA KC_INTERNATIONAL_2
-#define KC_JYEN KC_INTERNATIONAL_3
-#define KC_HENK KC_INTERNATIONAL_4
-#define KC_MHEN KC_INTERNATIONAL_5
-#define KC_HAEN KC_LANGUAGE_1
-#define KC_HANJ KC_LANGUAGE_2
-
 #define KC_CLCK KC_CAPS_LOCK
 #define KC_SLCK KC_SCROLL_LOCK
 #define KC_NLCK KC_NUM_LOCK

From 219c18703eb62bd9c4053770d5440e1a0dd3bec2 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 9 Oct 2022 13:53:27 -0600
Subject: [PATCH 598/959] twig50 - Remove deprecated keycodes (#18651)

---
 keyboards/handwired/twig/twig50/keymaps/default/keymap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
index 7270773a93..3d4b29e621 100644
--- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
+++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
@@ -3,9 +3,9 @@
 
 #include "twig50.h"
 
-#define LAL_NCV  LALT_T(KC_LANG2)
-#define RAL_CNV  RALT_T(KC_LANG1)
-#define LGU_NCV  LGUI_T(KC_LANG2)
+#define LAL_NCV  LALT_T(KC_LNG2)
+#define RAL_CNV  RALT_T(KC_LNG1)
+#define LGU_NCV  LGUI_T(KC_LNG2)
 #define RGU_ENT  RGUI_T(KC_ENT)
 #define RGU_IN8  RGUI_T(KC_INT8)
 

From d6d6cdcb4faf5a17ab35f562be6e750fb1c2dc89 Mon Sep 17 00:00:00 2001
From: nezumee <75586849+nezumee@users.noreply.github.com>
Date: Sun, 9 Oct 2022 13:08:27 -0700
Subject: [PATCH 599/959] Make MIDI output endpoint use the out direction
 (#18654)

---
 tmk_core/protocol/lufa/lufa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index fa3ced8fd6..f27256a0e8 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -422,7 +422,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) {
 #ifdef MIDI_ENABLE
     /* Setup MIDI stream endpoints */
     ConfigSuccess &= Endpoint_ConfigureEndpoint((MIDI_STREAM_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, MIDI_STREAM_EPSIZE, 1);
-    ConfigSuccess &= Endpoint_ConfigureEndpoint((MIDI_STREAM_OUT_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, MIDI_STREAM_EPSIZE, 1);
+    ConfigSuccess &= Endpoint_ConfigureEndpoint((MIDI_STREAM_OUT_EPNUM | ENDPOINT_DIR_OUT), EP_TYPE_BULK, MIDI_STREAM_EPSIZE, 1);
 #endif
 
 #ifdef VIRTSER_ENABLE

From 9d43cc319c5928a595d38f92e8d80c5af29f54c3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 10 Oct 2022 02:00:26 +0100
Subject: [PATCH 600/959] Fix mouse use within send_string (#18659)

---
 quantum/send_string/send_string_keycodes.h | 36 +++++++++++++---------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/quantum/send_string/send_string_keycodes.h b/quantum/send_string/send_string_keycodes.h
index 802d9a8240..12e4cf83d2 100644
--- a/quantum/send_string/send_string_keycodes.h
+++ b/quantum/send_string/send_string_keycodes.h
@@ -375,20 +375,6 @@
 #define X_MS_BTN6            f8
 #define X_MS_BTN7            f8
 #define X_MS_BTN8            f8
-#else
-#define X_MS_UP              ed
-#define X_MS_DOWN            ee
-#define X_MS_LEFT            ef
-#define X_MS_RIGHT           f0
-#define X_MS_BTN1            f1
-#define X_MS_BTN2            f2
-#define X_MS_BTN3            f3
-#define X_MS_BTN4            f4
-#define X_MS_BTN5            f5
-#define X_MS_BTN6            f6
-#define X_MS_BTN7            f7
-#define X_MS_BTN8            f8
-#endif
 #define X_MS_WH_UP           f9
 #define X_MS_WH_DOWN         fa
 #define X_MS_WH_LEFT         fb
@@ -396,6 +382,28 @@
 #define X_MS_ACCEL0          fd
 #define X_MS_ACCEL1          fe
 #define X_MS_ACCEL2          ff
+#else
+#define X_MS_UP              cd
+#define X_MS_DOWN            ce
+#define X_MS_LEFT            cf
+#define X_MS_RIGHT           d0
+#define X_MS_BTN1            d1
+#define X_MS_BTN2            d2
+#define X_MS_BTN3            d3
+#define X_MS_BTN4            d4
+#define X_MS_BTN5            d5
+#define X_MS_BTN6            d6
+#define X_MS_BTN7            d7
+#define X_MS_BTN8            d8
+#define X_MS_WH_UP           d9
+#define X_MS_WH_DOWN         da
+#define X_MS_WH_LEFT         db
+#define X_MS_WH_RIGHT        dc
+#define X_MS_ACCEL0          dd
+#define X_MS_ACCEL1          de
+#define X_MS_ACCEL2          df
+#endif
+
 
 // Send string macros
 #define STRINGIZE(z) #z

From a3d2c89c4cff53f2a72dc349227ad2075e61c363 Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Mon, 10 Oct 2022 05:28:19 +0300
Subject: [PATCH 601/959] [Keyboard] Add ANAVI Macro Pad 10 (#18620)

---
 keyboards/anavi/macropad10/config.h           | 11 +++
 keyboards/anavi/macropad10/info.json          | 72 +++++++++++++++++++
 .../anavi/macropad10/keymaps/default/keymap.c | 16 +++++
 keyboards/anavi/macropad10/macropad10.c       | 16 +++++
 keyboards/anavi/macropad10/readme.md          | 21 ++++++
 keyboards/anavi/macropad10/rules.mk           |  1 +
 6 files changed, 137 insertions(+)
 create mode 100644 keyboards/anavi/macropad10/config.h
 create mode 100644 keyboards/anavi/macropad10/info.json
 create mode 100644 keyboards/anavi/macropad10/keymaps/default/keymap.c
 create mode 100644 keyboards/anavi/macropad10/macropad10.c
 create mode 100644 keyboards/anavi/macropad10/readme.md
 create mode 100644 keyboards/anavi/macropad10/rules.mk

diff --git a/keyboards/anavi/macropad10/config.h b/keyboards/anavi/macropad10/config.h
new file mode 100644
index 0000000000..8d81cf3675
--- /dev/null
+++ b/keyboards/anavi/macropad10/config.h
@@ -0,0 +1,11 @@
+// Copyright 2022 Leon Anavi <leon@anavi.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* Double tap reset button to enter bootloader */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json
new file mode 100644
index 0000000000..5b1a9d8546
--- /dev/null
+++ b/keyboards/anavi/macropad10/info.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Macro Pad 10",
+    "manufacturer": "ANAVI",
+    "url": "https://github.com/AnaviTechnology/anavi-macro-pad-10",
+    "maintainer": "leon-anavi",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP0"],
+        "rows": ["GP29", "GP28", "GP27"]
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+	"rgblight": true
+    },
+    "rgblight": {
+        "pin": "GP3",
+        "led_count": 4,
+	"hue_steps": 10,
+	"saturation_steps": 17,
+        "brightness_steps": 17,
+	"max_brightness": 255,
+	"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
+        }
+    },
+    "encoder": {
+	"enabled": true,
+        "rotary": [
+            {
+		    "pin_a": "GP1",
+		    "pin_b": "GP2",
+		    "resolution": 2
+	    }
+        ]
+    },
+    "layouts": {
+        "LAYOUT_mp10": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
+            ]
+        }
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x9A25",
+        "vid": "0xFEED"
+    }
+}
diff --git a/keyboards/anavi/macropad10/keymaps/default/keymap.c b/keyboards/anavi/macropad10/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8a02b392c0
--- /dev/null
+++ b/keyboards/anavi/macropad10/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2022 Leon Anavi <leon@anavi.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_mp10(
+        KC_A   , KC_B   , KC_C   ,
+	KC_D   , KC_E   , KC_F   ,
+	RGB_M_R , RGB_MOD , RGB_TOG
+    )
+};
diff --git a/keyboards/anavi/macropad10/macropad10.c b/keyboards/anavi/macropad10/macropad10.c
new file mode 100644
index 0000000000..bebefd0da9
--- /dev/null
+++ b/keyboards/anavi/macropad10/macropad10.c
@@ -0,0 +1,16 @@
+// Copyright 2022 Leon Anavi <leon@anavi.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "encoder.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return true;
+}
+#endif
+
diff --git a/keyboards/anavi/macropad10/readme.md b/keyboards/anavi/macropad10/readme.md
new file mode 100644
index 0000000000..0a740db1a3
--- /dev/null
+++ b/keyboards/anavi/macropad10/readme.md
@@ -0,0 +1,21 @@
+# ANAVI Macro Pad 10
+
+Mini hot-swappable mechanical keyboard with a clickable rotary encoder, 9 Cherry MX compatible switches, translucent key caps, USB-C, RP2040 microcontroller, backlighting and under lighting.
+
+* Keyboard Maintainer: [Leon Anavi](https://github.com/leon-anavi)
+* Hardware Supported: ANAVI Macro Pad 10
+* Hardware Availability: [Crowd Supply](https://www.crowdsupply.com/anavi-technology/anavi-macro-pad-10), [GitHub repository](https://github.com/AnaviTechnology/anavi-macro-pad-10)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb anavi/macropad10 -km default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key on the left half, or top right key on the right half, and then plug in the USB cable on that keyboard half.
+* **Physical reset button**: Double tap the reset button on the XIAO RP2040.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/anavi/macropad10/rules.mk b/keyboards/anavi/macropad10/rules.mk
new file mode 100644
index 0000000000..997fce7e65
--- /dev/null
+++ b/keyboards/anavi/macropad10/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER = vendor

From 7aab5e4d896606a7731c8adfce41115611df75c2 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Mon, 10 Oct 2022 14:17:21 +1100
Subject: [PATCH 602/959] [Keyboard] New IDOBAO ID61 (a.k.a. Denwir D60)
 (#17362)

* initial upload

* adjust keymap

* Delete config.h

* Update post.rules.mk

* remapped to correct pins

* add idobao keymap

* disable underglow

* minor fix

* right menu on windows

* imgur

* ID61_process_special_k() function

* KC_APP fix

* Update keymap.c

* pre-pr touchups

* enum layouts

* review changes recommended by tzarc

* refactor special keys to common lib

* rename layout and add info.json labels

* account for 15 possible USER keys

* post drashna review

* Fn Arrow keys added

* post review edits

* use bitmask instead of bool array in specialk.c

* move to community layout
---
 keyboards/idobao/id61/config.h                |  93 +++++
 keyboards/idobao/id61/id61.c                  |  68 ++++
 keyboards/idobao/id61/id61.h                  |   6 +
 keyboards/idobao/id61/info.json               | 101 ++++++
 .../idobao/id61/keymaps/default/keymap.c      |  48 +++
 keyboards/idobao/id61/keymaps/idobao/config.h |   7 +
 keyboards/idobao/id61/keymaps/idobao/keymap.c | 332 ++++++++++++++++++
 keyboards/idobao/id61/keymaps/idobao/rules.mk |   7 +
 .../idobao/id61/keymaps/idobao/specialk.c     |  88 +++++
 .../idobao/id61/keymaps/idobao/specialk.h     |  12 +
 keyboards/idobao/id61/keymaps/via/keymap.c    |  77 ++++
 keyboards/idobao/id61/keymaps/via/rules.mk    |   3 +
 keyboards/idobao/id61/post_rules.mk           |   8 +
 keyboards/idobao/id61/readme.md               |  40 +++
 keyboards/idobao/id61/rules.mk                |   6 +
 15 files changed, 896 insertions(+)
 create mode 100644 keyboards/idobao/id61/config.h
 create mode 100644 keyboards/idobao/id61/id61.c
 create mode 100644 keyboards/idobao/id61/id61.h
 create mode 100644 keyboards/idobao/id61/info.json
 create mode 100644 keyboards/idobao/id61/keymaps/default/keymap.c
 create mode 100644 keyboards/idobao/id61/keymaps/idobao/config.h
 create mode 100644 keyboards/idobao/id61/keymaps/idobao/keymap.c
 create mode 100644 keyboards/idobao/id61/keymaps/idobao/rules.mk
 create mode 100644 keyboards/idobao/id61/keymaps/idobao/specialk.c
 create mode 100644 keyboards/idobao/id61/keymaps/idobao/specialk.h
 create mode 100644 keyboards/idobao/id61/keymaps/via/keymap.c
 create mode 100644 keyboards/idobao/id61/keymaps/via/rules.mk
 create mode 100644 keyboards/idobao/id61/post_rules.mk
 create mode 100644 keyboards/idobao/id61/readme.md
 create mode 100644 keyboards/idobao/id61/rules.mk

diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h
new file mode 100644
index 0000000000..fb375de69c
--- /dev/null
+++ b/keyboards/idobao/id61/config.h
@@ -0,0 +1,93 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+// #define MATRIX_ROWS 5
+// #define MATRIX_COLS 15
+
+/* ----------------
+ * RGB Matrix stuff
+ * ---------------- */
+
+#define RGB_DI_PIN F0
+
+// RGB Matrix config
+#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+
+    #ifndef ID61_DISABLE_UNDERGLOW
+        #define DRIVER_LED_TOTAL 71
+    #else
+        #define DRIVER_LED_TOTAL 61  // = 71 - 10
+    #endif
+
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200  // limits maximum brightness of LEDs to {x} out of 255. If not defined maximum brightness is set to 255
+
+    #define RGB_MATRIX_KEYPRESSES
+
+    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
+    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
+    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
+    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
+
+    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS) */
+    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+    /* RGB_MATRIX_KEYPRESSES) | defined(RGB_MATRIX_KEYRELEASES) */
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+#endif  // RGB_MATRIX_ENABLE
+
+/* -----------------------
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ * ----------------------- */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+// #define NO_ACTION_LAYER
+// #define NO_ACTION_TAPPING
+// #define NO_ACTION_ONESHOT
diff --git a/keyboards/idobao/id61/id61.c b/keyboards/idobao/id61/id61.c
new file mode 100644
index 0000000000..f6338c7133
--- /dev/null
+++ b/keyboards/idobao/id61/id61.c
@@ -0,0 +1,68 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "id61.h"
+
+#define __ NO_LED
+
+#if defined(RGB_MATRIX_ENABLE)
+
+/* Pre-key
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │60 │59 │58 │57 │56 │55 │54 │53 │52 │51 │50 │49 │48 │  47   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │ 46  │45 │44 │43 │42 │41 │40 │39 │38 │37 │36 │35 │34 │ 33  │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │  32  │31 │30 │29 │28 │27 │26 │25 │24 │23 │22 │21 │   20   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │   19   │18 │17 │16 │15 │14 │13 │12 │11 │10 │ 9 │    8     │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │ 7  │ 6  │ 5  │            4           │ 3  │ 2  │ 1  │ 0  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ *
+ * Underglow (from top / [Esc] = top left)
+ * ┌────┬────┬────┬────┬────┐
+ * │ 61 │ 62 │ 63 │ 64 │ 65 │
+ * ├────┴────┴────┴────┴────┤
+ * ├────┬────┬────┬────┬────┤
+ * │ 70 │ 69 │ 68 │ 67 │ 66 │
+ * └────┴────┴────┴────┴────┘
+ */
+
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    { 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47 },
+    { 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33 },
+    { 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, __ },
+    { 19, __, 18, 17, 16, 15, 14, 13, 12, 11, 10,  9,  8, __ },
+    {  7,  6,  5, __, __, __,  4, __, __, __,  3,  2,  1,  0 },
+}, {
+    // LED Index to Physical Position
+    // generated from: https://xelus.netlify.app/guides/KLE_to_RGB_parser
+    /* NB: Reverse order! */
+    {224,64 }, {204,64 }, {184,64 }, {163,64 },                                  {103,64 },                                  { 42,64 }, { 22,64 }, {  2,64 },
+    {212,48 },            {182,48 }, {165,48 }, {149,48 }, {133,48 }, {117,48 }, {101,48 }, { 85,48 }, { 69,48 }, { 52,48 }, { 36,48 }, { 10,48 },
+    {216,32 }, {190,32 }, {174,32 }, {157,32 }, {141,32 }, {125,32 }, {109,32 }, { 93,32 }, { 77,32 }, { 61,32 }, { 44,32 }, { 28,32 }, {  6,32 },
+    {222,16 }, {202,16 }, {186,16 }, {170,16 }, {153,16 }, {137,16 }, {121,16 }, {105,16 }, { 89,16 }, { 73,16 }, { 57,16 }, { 40,16 }, { 24,16 }, {  4,16 },
+    {218,0  }, {194,0  }, {178,0  }, {161,0  }, {145,0  }, {129,0  }, {113,0  }, { 97,0  }, { 81,0  }, { 65,0  }, { 48,0  }, { 32,0  }, { 16,0  }, {  0,0  }
+    // underglow LEDs (positions pushed to nearest edge to match edge key colors)
+    #ifndef ID61_DISABLE_UNDERGLOW
+    , {  0,0  }, { 56,0  }, { 112,0  }, {168,0  }, {224,0  },
+    {224,64 }, {168,64 }, {112,64 }, { 56,64 }, { 0,64 }
+    #endif
+}, {
+    // LED Index to Flag
+    /* NB: Reverse order! */
+    1, 1, 1, 1,          4,          1, 1, 1,
+    1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9,
+    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
+    // underglow LEDs
+    #ifndef ID61_DISABLE_UNDERGLOW
+    , 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2
+    #endif
+} };
+
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id61/id61.h b/keyboards/idobao/id61/id61.h
new file mode 100644
index 0000000000..d9bef6d021
--- /dev/null
+++ b/keyboards/idobao/id61/id61.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
new file mode 100644
index 0000000000..2980d0bfdc
--- /dev/null
+++ b/keyboards/idobao/id61/info.json
@@ -0,0 +1,101 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID61",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id61*",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0061",
+        "vid": "0x6964"
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x":0, "y":0 },
+                { "label": "1!", "matrix": [0, 1], "x":1, "y":0 },
+                { "label": "2@", "matrix": [0, 2], "x":2, "y":0 },
+                { "label": "3#", "matrix": [0, 3], "x":3, "y":0 },
+                { "label": "4$", "matrix": [0, 4], "x":4, "y":0 },
+                { "label": "5%", "matrix": [0, 5], "x":5, "y":0 },
+                { "label": "6^", "matrix": [0, 6], "x":6, "y":0 },
+                { "label": "7&", "matrix": [0, 7], "x":7, "y":0 },
+                { "label": "8*", "matrix": [0, 8], "x":8, "y":0 },
+                { "label": "9(", "matrix": [0, 9], "x":9, "y":0 },
+                { "label": "0)", "matrix": [0, 10], "x":10, "y":0 },
+                { "label": "-_", "matrix": [0, 11], "x":11, "y":0 },
+                { "label": "=+", "matrix": [0, 12], "x":12, "y":0 },
+                { "label": "Backspace", "matrix": [0, 13], "x":13, "y":0, "w":2 },
+
+                { "label": "Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
+                { "label": "Q", "matrix": [1, 1], "x":1.5, "y":1 },
+                { "label": "W", "matrix": [1, 2], "x":2.5, "y":1 },
+                { "label": "E", "matrix": [1, 3], "x":3.5, "y":1 },
+                { "label": "R", "matrix": [1, 4], "x":4.5, "y":1 },
+                { "label": "T", "matrix": [1, 5], "x":5.5, "y":1 },
+                { "label": "Y", "matrix": [1, 6], "x":6.5, "y":1 },
+                { "label": "U", "matrix": [1, 7], "x":7.5, "y":1 },
+                { "label": "I", "matrix": [1, 8], "x":8.5, "y":1 },
+                { "label": "O", "matrix": [1, 9], "x":9.5, "y":1 },
+                { "label": "P", "matrix": [1, 10], "x":10.5, "y":1 },
+                { "label": "[{", "matrix": [1, 11], "x":11.5, "y":1 },
+                { "label": "]}", "matrix": [1, 12], "x":12.5, "y":1 },
+                { "label": "\\|", "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
+
+                { "label": "Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
+                { "label": "A", "matrix": [2, 1], "x":1.75, "y":2 },
+                { "label": "S", "matrix": [2, 2], "x":2.75, "y":2 },
+                { "label": "D", "matrix": [2, 3], "x":3.75, "y":2 },
+                { "label": "F", "matrix": [2, 4], "x":4.75, "y":2 },
+                { "label": "G", "matrix": [2, 5], "x":5.75, "y":2 },
+                { "label": "H", "matrix": [2, 6], "x":6.75, "y":2 },
+                { "label": "J", "matrix": [2, 7], "x":7.75, "y":2 },
+                { "label": "K", "matrix": [2, 8], "x":8.75, "y":2 },
+                { "label": "L", "matrix": [2, 9], "x":9.75, "y":2 },
+                { "label": ";:", "matrix": [2, 10], "x":10.75, "y":2 },
+                { "label": "'\"", "matrix": [2, 11], "x":11.75, "y":2 },
+                { "label": "Enter", "matrix": [2, 12], "x":12.75, "y":2, "w":2.25 },
+
+                { "label": "Shift", "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
+                { "label": "Z", "matrix": [3, 2], "x":2.25, "y":3 },
+                { "label": "X", "matrix": [3, 3], "x":3.25, "y":3 },
+                { "label": "C", "matrix": [3, 4], "x":4.25, "y":3 },
+                { "label": "V", "matrix": [3, 5], "x":5.25, "y":3 },
+                { "label": "B", "matrix": [3, 6], "x":6.25, "y":3 },
+                { "label": "N", "matrix": [3, 7], "x":7.25, "y":3 },
+                { "label": "M", "matrix": [3, 8], "x":8.25, "y":3 },
+                { "label": ",<", "matrix": [3, 9], "x":9.25, "y":3 },
+                { "label": ".>", "matrix": [3, 10], "x":10.25, "y":3 },
+                { "label": "/?", "matrix": [3, 11], "x":11.25, "y":3 },
+                { "label": "Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
+
+                { "label": "Ctrl", "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
+                { "label": "GUI", "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
+                { "label": "Alt", "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
+                { "label": "Space", "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 },
+                { "label": "Fn", "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
+                { "label": "Alt", "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
+                { "label": "Menu", "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
+                { "label": "Ctrl", "matrix": [4, 13], "x":13.75, "y":4, "w":1.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id61/keymaps/default/keymap.c b/keyboards/idobao/id61/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3d6fe4232f
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │Ctrl│Win │Alt │                        │ Fn │Alt │Menu│Ctrl│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [0] = LAYOUT_60_ansi(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_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,                             MO(1),   KC_RALT, KC_APP,  KC_RCTL
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ~ │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │     │   │ ↑ │   │   │Tog│Hu+│Sa+│Br+│Sp+│PSc│Hom│End│     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │      │ ← │ ↓ │ → │   │Mod│Hu-│Sa-│Br-│Sp-│PUp│PDn│        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │        │   │   │   │   │Rst│NKR│   │   │Ins│Del│    ↑     │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │    │    │    │                        │    │ ←  │ ↓  │ →  │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [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_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR, KC_HOME, KC_END,  _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_PGUP, KC_PGDN, _______,
+        _______,          _______, _______, _______, _______, QK_BOOT, NK_TOGG, _______, _______, KC_INS,  KC_DEL,  KC_UP,
+        _______, _______, _______,                            _______,                            _______, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/idobao/id61/keymaps/idobao/config.h b/keyboards/idobao/id61/keymaps/idobao/config.h
new file mode 100644
index 0000000000..81568ec7ae
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/idobao/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Denwir D60 has solid back case - no underglow LED's are visible. */
+#define ID61_DISABLE_UNDERGLOW
diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c
new file mode 100644
index 0000000000..8315d1498d
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/idobao/keymap.c
@@ -0,0 +1,332 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "specialk.h"
+#include "version.h"
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool in_arrow_mode:1;
+        #ifdef RGB_MATRIX_ENABLE
+        bool rgb_disable_perkey:1;
+        #ifndef ID61_DISABLE_UNDERGLOW
+        bool rgb_disable_underglow:1;
+        #endif  // ID61_DISABLE_UNDERGLOW
+        #endif  // RGB_MATRIX_ENABLE
+    };
+} user_config_t;
+
+enum {
+    _BASE = 0,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum {
+    KC_MCON = USER00,  // macOS Open Mission Control
+    KC_LPAD,           // macOS Open Launchpad
+    KB_ARRW,           // toggle right modifiers are arrows feature
+    KB_RSFT,           // right shift or up arrow
+    KB_RALT,           // right alt or left arrow
+    KB_RAPP,           // menu or down arrow (Windows Menu)
+    KB_RCOM,           // right gui or left arrow (macOS Command)
+    KB_ROPT,           // right alt or down arrow (macOS Option)
+    KB_RCTL,           // right ctrl ot right arrow
+    KB_VRSN            // debug, type version
+};
+
+enum macos_consumer_usages {
+    _AC_SHOW_ALL_WINDOWS = 0x29F,  // mapped to KC_MCON
+    _AC_SHOW_ALL_APPS    = 0x2A0   // mapped to KC_LPAD
+};
+
+/* Special Keys */
+#define SK_LT1C LT(_FN1, KC_CAPS)  // Layer Tap 1, i.e., Tap = Caps Lock, Hold = Layer 1
+#define SK_LT2A LT(_FN2, KC_APP)   // Layer Tap 2, i.e., Tap = Menu, Hold = Layer 2
+
+/* key matrix */
+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 │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │*Caps*│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │  *Caps* => Tap = Caps Lock, Hold = Layer 1 (Fn1)
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  ↑Shift  │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │Ctrl│Win │Alt │                        │Fn1 │←Alt│↓Mnu│→Ctl│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [_BASE] = LAYOUT_60_ansi(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,
+        SK_LT1C, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KB_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(_FN1), KB_RALT, KB_RAPP, KB_RCTL
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ' │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  Del  │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │ArwMd│   │ ↑ │   │   │Tog│Hu+│Sa+│Br+│Sp+│PSc│Hom│End│ Ins │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │      │ ← │ ↓ │ → │   │Mod│Hu-│Sa-│Br-│Sp-│   │PUp│        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │        │   │   │   │Ver│Rst│NKR│   │   │   │PDn│          │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │    │    │    │                        │    │    │    │    │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [_FN1] = 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,
+        KB_ARRW, _______, KC_UP,   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR, KC_HOME, KC_END,  KC_INS,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_PGUP, _______,
+        _______,          _______, _______, _______, KB_VRSN, QK_BOOT, NK_TOGG, _______, _______, _______, KC_PGDN, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │        │   │   │   │   │   │   │   │   │   │   │          │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │    │    │    │                        │    │    │    │    │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [_FN2] = LAYOUT_60_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+    [_FN3] = LAYOUT_60_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
+
+user_config_t user_config;
+
+#ifdef RGB_MATRIX_ENABLE
+
+/*
+ * RGB Stuff
+ */
+
+#define ID61_CAPS_LOCK_KEY_INDEX 32  // position of Caps Lock key
+
+#define ID61_CAPS_LOCK_MAX_BRIGHTNESS 0xFF
+#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #undef ID61_CAPS_LOCK_MAX_BRIGHTNESS
+    #define ID61_CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#define ID61_CAPS_LOCK_VAL_STEP 8
+#ifdef RGB_MATRIX_VAL_STEP
+    #undef ID61_CAPS_LOCK_VAL_STEP
+    #define ID61_CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+void ID61_update_rgb_mode(void) {
+    uint8_t flags = LED_FLAG_ALL;
+
+    if (user_config.rgb_disable_perkey
+        #ifndef ID61_DISABLE_UNDERGLOW
+        && user_config.rgb_disable_underglow
+        #endif  // ID61_DISABLE_UNDERGLOW
+        ) {
+        flags = 0;  // All OFF Condition
+    } else {
+        if (user_config.rgb_disable_perkey) {
+            #ifndef ID61_DISABLE_UNDERGLOW
+            flags = LED_FLAG_UNDERGLOW | 0xF0;
+            #else
+            flags = 0xF0;
+            #endif  // ID61_DISABLE_UNDERGLOW
+        }
+        #ifndef ID61_DISABLE_UNDERGLOW
+        if (user_config.rgb_disable_underglow) {
+            flags = LED_FLAG_MODIFIER | LED_FLAG_KEYLIGHT | LED_FLAG_INDICATOR | 0xF0;
+        }
+        #endif  // ID61_DISABLE_UNDERGLOW
+    }
+
+    if (flags == 0) {
+        rgb_matrix_set_flags(0);
+        rgb_matrix_set_color_all(HSV_OFF);
+    } else {
+        rgb_matrix_set_flags(flags);
+        rgb_matrix_enable_noeeprom();
+    }
+
+    eeconfig_update_kb(user_config.raw);  // write back to EEPROM
+}
+
+void ID61_get_rgb_mode(void) {
+    user_config.raw = eeconfig_read_kb();  // read config from EEPROM
+    ID61_update_rgb_mode();
+}
+
+void keyboard_post_init_user(void) {
+    ID61_get_rgb_mode();
+}
+
+void eeconfig_init_user(void) {
+    // EEPROM is getting reset!
+    user_config.raw = 0;
+    ID61_update_rgb_mode();
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // Caps Lock key stuff
+
+    if (host_keyboard_led_state().caps_lock) {
+        uint8_t v = rgb_matrix_get_val();
+        if (v < ID61_CAPS_LOCK_VAL_STEP) {
+            v = ID61_CAPS_LOCK_VAL_STEP;
+        } else if (v < (ID61_CAPS_LOCK_MAX_BRIGHTNESS - ID61_CAPS_LOCK_VAL_STEP)) {
+            if (!user_config.rgb_disable_perkey) {
+                v += ID61_CAPS_LOCK_VAL_STEP;  // inc. by one more step than current brightness
+            }  // else leave as current brightness
+        } else {
+            v = ID61_CAPS_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(ID61_CAPS_LOCK_KEY_INDEX, v, v, v);  // white, brightness adjusted
+    } else if (user_config.rgb_disable_perkey) {
+        rgb_matrix_set_color(ID61_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
+    }
+}
+
+#endif  // RGB_MATRIX_ENABLE
+
+/*
+ * Extra keys and RGB Toggle handler
+ */
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+
+        // handle RGB toggle key - this ensures caps lock always works
+        #ifdef RGB_MATRIX_ENABLE
+
+        case QK_BOOT:
+            if (record->event.pressed) {
+                rgb_matrix_set_color_all(RGB_MATRIX_MAXIMUM_BRIGHTNESS, 0, 0);  // All red
+                rgb_matrix_driver.flush();
+            }
+            return true;
+
+        case RGB_TOG:
+            /* roll through the LED modes
+             * |    Level    | Per-key | Underglow |
+             * |-------------|---------|-----------|
+             * | 0 (default) |   on    |    on     |
+             * |     1       |   OFF   |    on     |
+             * |     2       |   on    |    OFF    |
+             * |     3       |   OFF   |    OFF    |
+             *
+             * for ID61_DISABLE_UNDERGLOW
+             * |    Level    | Per-key |
+             * |-------------|---------|
+             * | 0 (default) |   on    |
+             * |     1       |   OFF   |
+             */
+            if (record->event.pressed) {
+                if ( (!user_config.rgb_disable_perkey)
+                    #ifndef ID61_DISABLE_UNDERGLOW
+                    && (!user_config.rgb_disable_underglow)
+                    #endif  // ID61_DISABLE_UNDERGLOW
+                    ) {
+                    user_config.rgb_disable_perkey = 1;
+
+                #ifndef ID61_DISABLE_UNDERGLOW
+
+                } else if ( user_config.rgb_disable_perkey && (!user_config.rgb_disable_underglow) ) {
+                    user_config.rgb_disable_perkey = 0;
+                    user_config.rgb_disable_underglow = 1;
+
+                } else if ( (!user_config.rgb_disable_perkey) && user_config.rgb_disable_underglow ) {
+                    user_config.rgb_disable_perkey = 1;
+
+                #endif  // ID61_DISABLE_UNDERGLOW
+
+                } else {
+                    user_config.rgb_disable_perkey = 0;
+                    #ifndef ID61_DISABLE_UNDERGLOW
+                    user_config.rgb_disable_underglow = 0;
+                    #endif  // ID61_DISABLE_UNDERGLOW
+                }
+                ID61_update_rgb_mode();
+            }
+            return false;
+
+        case EE_CLR:
+            if (!record->event.pressed) {  // on release
+                ID61_get_rgb_mode();
+            }
+            return true;  // let this one pass on
+
+        #endif  // RGB_MATRIX_ENABLE
+
+        case KB_ARRW:
+            if (record->event.pressed) {
+                user_config.in_arrow_mode ^= 1;
+            }
+            return false;
+
+        case KB_RSFT: return ID61_process_special_k(keycode, record, user_config.in_arrow_mode, KC_RSFT, KC_UP, KC_PGUP);
+        case KB_RALT: return ID61_process_special_k(keycode, record, user_config.in_arrow_mode, KC_RALT, KC_LEFT, KC_HOME);
+        case KB_RAPP: return ID61_process_special_k(keycode, record, user_config.in_arrow_mode, KC_APP, KC_DOWN, KC_PGDN);
+        case KB_RCOM: return ID61_process_special_k(keycode, record, user_config.in_arrow_mode, KC_RGUI, KC_LEFT, KC_HOME);
+        case KB_ROPT: return ID61_process_special_k(keycode, record, user_config.in_arrow_mode, KC_RALT, KC_DOWN, KC_PGDN);
+        case KB_RCTL: return ID61_process_special_k(keycode, record, user_config.in_arrow_mode, KC_RCTL, KC_RIGHT, KC_END);
+
+        // print firmware version
+        case KB_VRSN:
+            if (!get_mods()) {
+                if (!record->event.pressed) {
+                    SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " (v" QMK_VERSION ")");
+                }
+            }
+            return false;
+
+        // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353
+        case KC_MCON:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_WINDOWS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        case KC_LPAD:
+            if (record->event.pressed) {
+                host_consumer_send(_AC_SHOW_ALL_APPS);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+
+        // Shift + Backspace = Delete, see: https://docs.qmk.fm/#/feature_advanced_keycodes?id=shift-backspace-for-delete
+        case KC_BSPC: return ID61_backspace_special(keycode, record);
+
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+}
diff --git a/keyboards/idobao/id61/keymaps/idobao/rules.mk b/keyboards/idobao/id61/keymaps/idobao/rules.mk
new file mode 100644
index 0000000000..e18baf7261
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/idobao/rules.mk
@@ -0,0 +1,7 @@
+# Copyright 2022 Vino Rodrigues (@vinorodrigues)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+LTO_ENABLE = yes
+VIA_ENABLE = yes
+
+SRC += specialk.c
diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.c b/keyboards/idobao/id61/keymaps/idobao/specialk.c
new file mode 100644
index 0000000000..358d0cb764
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/idobao/specialk.c
@@ -0,0 +1,88 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "specialk.h"
+
+bool delkey_registered = false;
+uint32_t __keycode_raised = 0;
+
+bool get_keycode_raised(uint8_t n) {
+    return __keycode_raised & (1 << n);
+}
+
+void set_keycode_raised(uint8_t n, bool b) {
+    if (b) {
+        __keycode_raised |= 1 << n;
+    } else {
+        __keycode_raised &= ~(1 << n);
+    }
+}
+
+bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mode, uint8_t k_norm, uint8_t k_spcl, uint8_t k_altr) {
+    bool is_raised = get_highest_layer(layer_state|default_layer_state) != 0;
+
+    if (record->event.pressed) {
+        set_keycode_raised(keycode - USER00, is_raised);  // save for key release event
+        if (is_raised) {
+            // *** Fn keyed ***
+            if (arrow_mode) {
+                // alternate key
+                register_code(k_altr);
+            } else {
+                // special key
+                register_code(k_spcl);
+            }
+        } else {
+            // *** normal, un-Fn'ed ***
+            if (arrow_mode) {
+                // special key
+                register_code(k_spcl);
+            } else {
+                // normal key
+                register_code(k_norm);
+            }
+        }
+    } else {
+        if (get_keycode_raised(keycode - USER00)) {
+            // *** Fn keyed ***
+            if (arrow_mode) {
+                // alternate key
+                unregister_code(k_altr);
+            } else {
+                // special key
+                unregister_code(k_spcl);
+            }
+        } else {
+            // *** normal, un-Fn'ed ***
+            if (arrow_mode) {
+                // special key
+                unregister_code(k_spcl);
+            } else {
+                // normal key
+                unregister_code(k_norm);
+            }
+        }
+    }
+    return false;
+}
+
+bool ID61_backspace_special(uint16_t keycode, keyrecord_t *record) {
+    uint8_t mod_state = get_mods();
+
+    if (record->event.pressed) {
+        if (mod_state & MOD_MASK_SHIFT) {
+            del_mods(MOD_MASK_SHIFT);
+            register_code(KC_DEL);
+            delkey_registered = true;
+            set_mods(mod_state);
+            return false;
+        }
+    } else {
+        if (delkey_registered) {
+            unregister_code(KC_DEL);
+            delkey_registered = false;
+            return false;
+        }
+    }
+    return true;  // normal backspace, pass on
+}
diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.h b/keyboards/idobao/id61/keymaps/idobao/specialk.h
new file mode 100644
index 0000000000..a2ec124de8
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/idobao/specialk.h
@@ -0,0 +1,12 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "util.h"
+#include "quantum.h"
+
+bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mode, uint8_t k_norm, uint8_t k_spcl, uint8_t k_altr);
+bool ID61_backspace_special(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/idobao/id61/keymaps/via/keymap.c b/keyboards/idobao/id61/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6935194df8
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/via/keymap.c
@@ -0,0 +1,77 @@
+// Copyright 2022 Vino Rodrigues (@vinorodrigues)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │Ctrl│Win │Alt │                        │ Fn │Alt │Menu│Ctrl│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [0] = LAYOUT_60_ansi(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_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,                             MO(1),   KC_RALT, KC_APP, KC_RCTL
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ~ │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │     │   │ ↑ │   │   │Tog│Hu+│Sa+│Br+│Sp+│PSc│Hom│End│     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │      │ ← │ ↓ │ → │   │Mod│Hu-│Sa-│Br-│Sp-│PUp│PDn│        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │        │   │   │   │   │Rst│NKR│   │   │Ins│Del│    ↑     │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │    │    │    │                        │    │ ←  │ ↓  │ →  │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [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_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR, KC_HOME, KC_END,  _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_PGUP, KC_PGDN, _______,
+        _______,          _______, _______, _______, _______, QK_BOOT, NK_TOGG, _______, _______, KC_INS,  KC_DEL,  KC_UP,
+        _______, _______, _______,                            _______,                            _______, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │        │   │   │   │   │   │   │   │   │   │   │          │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │    │    │    │                        │    │    │    │    │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [2] = LAYOUT_60_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_60_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/idobao/id61/keymaps/via/rules.mk b/keyboards/idobao/id61/keymaps/via/rules.mk
new file mode 100644
index 0000000000..974ef99660
--- /dev/null
+++ b/keyboards/idobao/id61/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id61/post_rules.mk b/keyboards/idobao/id61/post_rules.mk
new file mode 100644
index 0000000000..673b260396
--- /dev/null
+++ b/keyboards/idobao/id61/post_rules.mk
@@ -0,0 +1,8 @@
+# The Denwir D60 case has a sealed/solid undercase,
+#  this enables switching off thoes LEDs
+# Usage:  `make idobao/id61:default UNDERGLOW=off`
+
+UNDERGLOW ?= yes
+ifneq ($(strip $(UNDERGLOW)), yes)
+  OPT_DEFS += -DID61_DISABLE_UNDERGLOW
+endif
diff --git a/keyboards/idobao/id61/readme.md b/keyboards/idobao/id61/readme.md
new file mode 100644
index 0000000000..aa3821f6da
--- /dev/null
+++ b/keyboards/idobao/id61/readme.md
@@ -0,0 +1,40 @@
+# IDOBAO ID61
+
+![IDOBAO ID61](https://i.imgur.com/Lu6SOyOh.png)
+
+The ID61 Keyboard Kit brings a tailored gasket-mounted build to an ultra-compact 60% layout with a unique ribbed side texture.
+
+## ANSI Support
+
+* Keyboard Maintainer: [Vino Rodrigues](https://github.com/vinorodrigues)
+* Hardware Supported: **IDOBAO ID61**
+* Hardware Availability: [IDOBAO.net](https://idobao.net/search?type=product&q=id61*)
+
+## Layout
+
+![IDOBAO ID61](https://idobao.github.io/kle/idobao-id61.png)
+
+## Compiling and Flashing
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb idobao/id61 -km default
+
+*{..or..}*
+
+    make idobao/id61:default
+
+Flashing example for this keyboard:
+
+    make idobao/id61:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. <br>
+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 [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 `RESET`, default is [Fn]+[B]
diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk
new file mode 100644
index 0000000000..d034fbb12f
--- /dev/null
+++ b/keyboards/idobao/id61/rules.mk
@@ -0,0 +1,6 @@
+# Copyright 2022 Vino Rodrigues (@vinorodrigues)
+# SPDX-License-Identifier: GPL-2.0-or-later
+# ** settings are data driven & stored in `info.json` **
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812

From 9f5806781ce60c17ddb82278dbc3b325dbb76f75 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 10 Oct 2022 02:03:19 -0600
Subject: [PATCH 603/959] Remove lingering `DRIVER_LED_TOTAL` references
 (#18662)

---
 keyboards/idobao/id61/config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h
index fb375de69c..2d65035a8a 100644
--- a/keyboards/idobao/id61/config.h
+++ b/keyboards/idobao/id61/config.h
@@ -19,9 +19,9 @@
 #if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
 
     #ifndef ID61_DISABLE_UNDERGLOW
-        #define DRIVER_LED_TOTAL 71
+        #define RGB_MATRIX_LED_COUNT 71
     #else
-        #define DRIVER_LED_TOTAL 61  // = 71 - 10
+        #define RGB_MATRIX_LED_COUNT 61  // = 71 - 10
     #endif
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended

From cd4a265560b45d117ac8296887188015c907e3c8 Mon Sep 17 00:00:00 2001
From: Artjoms Rizihs <artjomsR@users.noreply.github.com>
Date: Mon, 10 Oct 2022 01:04:30 -0700
Subject: [PATCH 604/959] [Keyboard][Keymap] Fix random keys being sent on Mac
 + userspace changes (#15648)

* qmk art 2020+

* fix compilation

* remove functions. translation matrix

* fix edgecases

* whitespace

* fix memory oddity changing the keymap with every string print

* return edge cases

* support workman layout for git strings

* subm

* secrets

* fix git ignore

* rename var

* workman HW feature toggle

* remember lenght for inserting secrets

* blink leds on secret finish

* 75:fix LEDs not reflecting state on boot

* move common led functions to user file

* move common led funcs to separate file

* move funcs file to separate folder

* capsword

* move string functions to a separate file

* consolidate led funcs

* tidy up variables

* email

* fix printing random keys on Mac + temp disable dynamic macro

* make switch lang shortcut configurable

* revert ergodone behaviour

* move git ignore to userspace folder

* ergodone clean up + saving space

* navigation combos

* shift caps always turns on caps lock. more combos

* convert led funcs into header file

* convert string funcs into header file

* fix compilation for split75

* remove git cherry pick

* update legal headers

* more legal headers

* home row macros

* refactor combo names

* redo combos for homerow + f10 11 12

* custom strings implementation (like secrets)

* ergodone: more consistent f keys

* tweak left right combos to minimise typing interference

* ctr z shortcut

* ergodone: move del to a more convenient key

* rename secrets file to a shorter length

* ergodone tweaks

* fix after merge

* removed included .c files

* Update keyboards/ktec/ergodone/keymaps/art/user_config.c.example

* Update keyboards/mt/split75/keymaps/art/user_config.c.example

* Update users/art/secr.h.example

* Update users/art/custom_definitions.h.example

* Update users/art/art_user_config.h.example

* Update users/art/art.h
---
 .../ktec/ergodone/keymaps/art/.gitignore      |   1 +
 keyboards/ktec/ergodone/keymaps/art/keymap.c  | 251 +++---
 keyboards/ktec/ergodone/keymaps/art/rules.mk  |   1 +
 .../keymaps/art/user_config.c.example         |   6 +
 keyboards/mt/split75/config.h                 |   5 +
 keyboards/mt/split75/keymaps/art/.gitignore   |   1 +
 keyboards/mt/split75/keymaps/art/config.h     |  10 +
 keyboards/mt/split75/keymaps/art/keymap.c     | 182 ++--
 keyboards/mt/split75/keymaps/art/rules.mk     |   4 +-
 .../split75/keymaps/art/user_config.c.example |   6 +
 keyboards/mt/split75/keymaps/default/keymap.c |   3 +
 keyboards/mt/split75/split75.c                |   3 +
 keyboards/mt/split75/split75.h                |   3 +
 users/art/.gitignore                          |   3 +
 users/art/art.c                               | 780 ++++++++++++------
 users/art/art.h                               |  58 +-
 users/art/art_user_config.h.example           |   7 +
 users/art/config.h                            |  10 +
 users/art/custom_definitions.h.example        |   8 +
 users/art/funcs/led_funcs.c                   |  55 ++
 users/art/funcs/led_funcs.h                   |  17 +
 users/art/funcs/string_funcs.c                | 309 +++++++
 users/art/funcs/string_funcs.h                |  14 +
 users/art/rules.mk                            |  16 +-
 users/art/secr.h.example                      |   9 +
 25 files changed, 1274 insertions(+), 488 deletions(-)
 create mode 100644 keyboards/ktec/ergodone/keymaps/art/.gitignore
 create mode 100644 keyboards/ktec/ergodone/keymaps/art/rules.mk
 create mode 100644 keyboards/ktec/ergodone/keymaps/art/user_config.c.example
 create mode 100644 keyboards/mt/split75/keymaps/art/.gitignore
 create mode 100644 keyboards/mt/split75/keymaps/art/config.h
 create mode 100644 keyboards/mt/split75/keymaps/art/user_config.c.example
 create mode 100644 users/art/.gitignore
 create mode 100644 users/art/art_user_config.h.example
 create mode 100644 users/art/custom_definitions.h.example
 create mode 100644 users/art/funcs/led_funcs.c
 create mode 100644 users/art/funcs/led_funcs.h
 create mode 100644 users/art/funcs/string_funcs.c
 create mode 100644 users/art/funcs/string_funcs.h
 create mode 100644 users/art/secr.h.example

diff --git a/keyboards/ktec/ergodone/keymaps/art/.gitignore b/keyboards/ktec/ergodone/keymaps/art/.gitignore
new file mode 100644
index 0000000000..46bb98e431
--- /dev/null
+++ b/keyboards/ktec/ergodone/keymaps/art/.gitignore
@@ -0,0 +1 @@
+*user_config.c
\ No newline at end of file
diff --git a/keyboards/ktec/ergodone/keymaps/art/keymap.c b/keyboards/ktec/ergodone/keymaps/art/keymap.c
index 7fcbd5b615..d43a340769 100644
--- a/keyboards/ktec/ergodone/keymaps/art/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/art/keymap.c
@@ -1,68 +1,51 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "art.h"
 #include "sendstring_workman_zxcvm.h"
 
-bool is_win = true;
-
 enum custom_keycodes {
   keyboardSpecificKeyCode = NEW_SAFE_RANGE //not used
 };
 
-void led_show_current_os(void) {
-  if (is_win) {
-    ergodox_right_led_1_on();
-    wait_ms(50);
-    ergodox_right_led_1_off();
-    wait_ms(50);
-    ergodox_right_led_1_on();
-    wait_ms(50);
-    ergodox_right_led_1_off();
-    wait_ms(50);
-    ergodox_right_led_1_on();
-    wait_ms(50);
-    ergodox_right_led_1_off();
-    wait_ms(50);
-  } else {
-    ergodox_right_led_3_on();
-    wait_ms(50);
-    ergodox_right_led_3_off();
-    wait_ms(50);
-    ergodox_right_led_3_on();
-    wait_ms(50);
-    ergodox_right_led_3_off();
-    wait_ms(50);
-    ergodox_right_led_3_on();
-    wait_ms(50);
-    ergodox_right_led_3_off();
-    wait_ms(50);
-  }
+void num_led_on(void) {
+  ergodox_right_led_1_on();
 }
 
-void matrix_init_user(void) {
-  led_show_current_os();
+void num_led_off(void) {
+  ergodox_right_led_1_off();
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-    ergodox_right_led_2_on();
-  } else {
-    ergodox_right_led_2_off();
-  }
+void caps_led_on(void) {
+  ergodox_right_led_2_on();
 }
 
+void caps_led_off(void) {
+  ergodox_right_led_2_off();
+}
 
+void scroll_led_on(void) {
+  ergodox_right_led_3_on();
+}
+
+void scroll_led_off(void) {
+  ergodox_right_led_3_off();
+}
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  ergodox_board_led_off();
-  ergodox_right_led_1_off();
-  ergodox_right_led_3_off();
+  num_led_off();
+  scroll_led_off();
   switch (get_highest_layer(state)) {
+    case MEDIA:
+    case WORKMAN:
+      scroll_led_on();
     case NAV:
     case CTRL_NAV:
     case SHIFT_NAV:
-      ergodox_right_led_1_on();
+      num_led_on();
       break;
     case FKEYS:
-      ergodox_right_led_3_on();
+      scroll_led_on();
       break;
   }
   return state;
@@ -74,13 +57,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |  ` ~   |   1  |   2  |   3  |   4  |   5  |  ESC |           | - _  |   6  |   7  |   8  |   9  |   0  |   ]    |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  | ???  |           |  =   |   Y  |   U  |   I  |   O  |   P  |   [    |
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |  \   |           |  =   |   Y  |   U  |   I  |   O  |   P  |   [    |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * | Caps   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |   '    |
  * |--------+------+------+------+------+------| FKEYS|           | FKEYS|------+------+------+------+------+--------|
  * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  | / git| RShift |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl |Media\| Win  |Alt   | NAV  |                                       | Home | End  |Workmn|      | RCtrl|
+ *   |  <-  |  ->  | Win  |Alt   | ctrl |                                       | Home | End  |Workmn|      | RCtrl|
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,---------------.
  *                                        | Del  |  Ins |       | Left |  Right |
@@ -93,27 +76,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [QWERTY] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
   KC_GRAVE,         KC_1,         KC_2,       KC_3,       KC_4,              KC_5,      KC_ESCAPE,
-  KC_TAB,           KC_Q,         KC_W,       KC_E,       KC_R,              KC_T,      XXXXXXX,
+  KC_TAB,           KC_Q,         KC_W,       KC_E,       KC_R,              KC_T,      KC_BSLASH,
   KC_CAPS,          KC_A,         KC_S,       KC_D,       KC_F,              KC_G,
   KC_LSFT,          KC_Z,         KC_X,       KC_C,       KC_V,              KC_B,      TT(FKEYS),
-  KC_LCTRL,  LT(MEDIA, KC_BSLASH), KC_LWIN,   KC_LALT,    LT(NAV, KC_RIGHT),
+  KC_LEFT,         KC_RIGHT,      KC_LWIN,    KC_LALT,    KC_LCTRL,
 
-                                           KC_DEL,    KC_INS,
-                                                      KC_PGUP,
-                                  KC_SPC, LT(COMBOS,KC_BSPC), KC_PGDOWN,
+                                           KC_INS,    KC_PGUP,
+                                                      LT(MEDIA,KC_PGDOWN),
+                          LT(NAV,KC_SPC),  KC_BSPC,   LT(COMBOS,KC_DEL),
 
   // -----------------------------------------------------right hand-----------------------------------------------------
   KC_MINS,          KC_6,         KC_7,       KC_8,       KC_9,              KC_0,      KC_RBRC,
   KC_EQL,           KC_Y,         KC_U,       KC_I,       KC_O,              KC_P,      KC_LBRC,
                     KC_H,         KC_J,       KC_K,       KC_L,              KC_SCLN,   KC_QUOT,
   TT(FKEYS),        KC_N,         KC_M,       KC_COMM,    KC_DOT,        LT(GIT,KC_SLSH), KC_RSFT,
-                                  KC_HOME,    KC_END,     DF(WORKMAN),       KC_RALT,   KC_RCTRL,
+                                  KC_HOME,    KC_END,     TO(WORKMAN),       KC_RALT,   KC_RCTRL,
 
     KC_LEFT,                KC_RIGHT,
     LT(SHIFT_NAV, KC_UP),
-    LT(CTRL_NAV, KC_DOWN),  MO(NAV),   KC_ENT
+    LT(CTRL_NAV, KC_DOWN),  TT(NAV),   KC_ENT
 ),
- /* Workman
+/* Workman
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
@@ -134,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[WORKMAN] = LAYOUT_ergodox(  
+[WORKMAN] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
   _______,          _______,      _______,    _______,    _______,           _______,   _______,
   _______,          KC_Q,         KC_D,       KC_R,       KC_W,              KC_B,      _______,
@@ -150,8 +133,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,          _______,      _______,    _______,    _______,           _______,   _______,
   _______,          KC_J,         KC_F,       KC_U,       KC_P,              KC_SCLN,   _______,
                     KC_Y,         KC_N,       KC_E,       KC_O,              KC_I,      _______,
-  _______,          KC_K,         KC_L,       KC_COMM,    KC_DOT,            KC_SLSH,   _______,
-                                  _______,    _______,    DF(QWERTY),        _______,   _______,
+  _______,          KC_K,         KC_L,       _______,    _______,           _______,   _______,
+                                  _______,    _______,    TO(QWERTY),        _______,   _______,
 
     _______,  _______,
     _______,
@@ -160,8 +143,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [FKEYS] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
-  _______,          KC_F1,            KC_F2,            KC_F3,            KC_F4,            KC_F5,          _______,
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
+  _______,          KC_F1,            KC_F2,            KC_F3,            KC_F4,            KC_F5,            _______,
+  _______,          _______,          _______,          _______,          _______,          _______,          KC_LALT,
   _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          _______,          _______,          _______,
@@ -170,11 +153,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                        _______,
                                   _______,  _______,   _______,
   // -----------------------------------------------------right hand-----------------------------------------------------
-  _______,          KC_F6,            KC_F7,            KC_F8,            KC_F9,            KC_F10,           KC_F11,
-  _______,          _______,          _______,          _______,          _______,          _______,          KC_F12,
-                    _______,          _______,          _______,          _______,          _______,          KC_PSCREEN,
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
-                    _______,          _______,          _______,          _______,          _______,
+  _______,          KC_F6,            KC_F7,            KC_F8,            KC_F9,            KC_F10,           _______,
+  KC_LALT,          _______,          _______,          _______,          _______,          _______,          _______,
+                    _______,          _______,          _______,          _______,          _______,          _______,
+  _______,          _______,          _______,          _______,          _______,          _______,          KC_F11,
+                    _______,          _______,          _______,          KC_PSCREEN,       KC_F12,
 
     _______,     _______,
     _______,
@@ -183,20 +166,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [NAV] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
-  _______,          LALT(KC_F1),      LALT(KC_F2),      LALT(KC_F3),      LALT(KC_F4),      LALT(KC_F5),      _______,
-  _______,          _______,          KC_HOME,          KC_UP,            KC_END,           KC_PGUP,          _______,
-  _______,          _______,          KC_LEFT,          KC_DOWN,          KC_RIGHT,         KC_PGDOWN,
-  _______,          _______,          _______,          _______,          KC_LALT,          _______,          _______,
-  _______,          _______,          _______,          _______,          _______,        
+  _______,          _______,          _______,          _______,          _______,          _______,      _______,
+  _______,          KC_ESC,           KC_HOME,          KC_UP,            KC_END,           KC_PGUP,          _______,
+  _______,          XXXXXXX,          KC_LEFT,          KC_DOWN,          KC_RIGHT,         KC_PGDOWN,
+  _______,          LCTL(KC_Z),       LCTL(KC_X),       LCTL(KC_C),       LCTL(KC_V),       XXXXXXX,          _______,
+  _______,          _______,          _______,          _______,          _______,
 
                                             _______,   _______,
                                                        _______,
-                                  _______,  KC_DEL,    _______,                               
+                                  KC_DEL,   _______,   _______,
   // -----------------------------------------------------right hand-----------------------------------------------------
-  _______,          LALT(KC_F6),      LALT(KC_F7),      LALT(KC_F8),      LALT(KC_F9),      LALT(KC_F10),     LALT(KC_F11),
-  _______,          _______,          _______,          _______,          _______,          _______,          LALT(KC_F12),
-                    _______,          CTR_ALT,          KC_RSFT,          _______,          _______,          _______,
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
+  _______,          XXXXXXX,          KC_MS_BTN1,       KC_MS_BTN3,       KC_MS_BTN2,       _______,          _______,
+                    KC_APP,           CTR_ALT,          KC_RSFT,          CTR_ALT_SHIFT,    _______,          _______,
+  _______,          XXXXXXX,          XXXXXXX,          _______,          _______,          _______,          _______,
                     _______,          _______,          _______,          _______,          _______,
 
     _______,     _______,
@@ -209,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          CTL_ALT(KC_HOME), CTL_ALT(KC_UP),   CTL_ALT(KC_END),  CTL_ALT(KC_PGUP), _______,
   _______,          _______,          CTL_ALT(KC_LEFT), CTL_ALT(KC_DOWN), CTL_ALT(KC_RIGHT),CTL_ALT(KC_PGDOWN),
-  _______,          _______,          CTL_ALT(KC_X),    CTL_ALT(KC_C),    CTL_ALT(KC_V),    _______,          _______,
+  _______,          _______,          LCTL(KC_X),       LCTL(KC_C),       LCTL(KC_V),    _______,          _______,
   _______,          _______,          _______,          _______,          _______,
 
                                             CTL_ALT(KC_DEL),  _______,
@@ -232,7 +215,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          LSFT(KC_HOME),    LSFT(KC_UP),      LSFT(KC_END),     LSFT(KC_PGUP),    _______,
   _______,          _______,          LSFT(KC_LEFT),    LSFT(KC_DOWN),    LSFT(KC_RIGHT),   LSFT(KC_PGDOWN),
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
+  _______,          _______,          LCTL(KC_X),       LCTL(KC_C),       LCTL(KC_V),       _______,          _______,
   _______,          _______,          _______,          _______,          _______,
 
                                             _______,   _______,
@@ -252,12 +235,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     CTR_ALT,       _______,    _______
 ),
 
-[COMBOS] = LAYOUT_ergodox(  
+[COMBOS] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
-  TILD_BLOCK,       PRESCRIPTION,          _______,          _______,          FOURS,          _______,          _______,
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
-  _______,          ADMINS,          SARCASM,          _______,          CTRL_CTV,         _______,
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
+  TILD_BLOCK,       _______,          QUOTES_RU,        K_CUST1,          K_CUST2,          K_CUST3,          _______,
+  _______,          _______,          _______,          NEUTRAL_COPY,     _______,          BEAT_BROWSER,     _______,
+  _______,          ADMINS,           SARCASM,          ALL_BEST,         CTRL_CTV,         _______,
+  _______,          _______,          _______,          CTRL_CAV,         _______,          LMB_SPAM,         _______,
   _______,          _______,          _______,          _______,          _______,
 
                                             _______,   _______,
@@ -265,9 +248,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                   _______,  _______,   _______,
 
   // -----------------------------------------------------right hand-----------------------------------------------------
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
-                    _______,          _______,          _______,          _______,          _______,          _______,
+  DASHES,           _______,          _______,          STARS,            PARENTHS,         _______,          TOG_OS,
+  _______,          K_SECR1,          K_SECR2,          K_SECR3,          K_SECR4,          _______,          BRACES,
+                    AT_EMAIL,         _______,          _______,          _______,          _______,          QUOTES,
   _______,          _______,          CTRL_LCTV,        _______,          _______,          _______,          _______,
                     _______,          _______,          _______,          _______,          _______,
 
@@ -276,7 +259,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,     _______,    _______
 ),
 
-// [STRINGS] = LAYOUT_ergodox(  
+// [STRINGS] = LAYOUT_ergodox(
 //   // -----------------------------------------------------left hand-----------------------------------------------------
 //   _______,          _______,          _______,          _______,          _______,          _______,          _______,
 //   _______,          _______,          _______,          _______,          _______,          _______,          _______,
@@ -300,12 +283,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //     _______,     _______,    _______
 // ),
 
-[MEDIA] = LAYOUT_ergodox(  
+[MEDIA] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
-  _______,          _______,          KC_MPRV,          KC_VOLU,          KC_MNXT,          _______,          _______,
-  _______,          _______,          _______,          KC_VOLD,          _______,          _______,
-  _______,          _______,          _______,          KC_MUTE,          KC_MPLY,          _______,          _______,
+  XXXXXXX,          KC_MPRV,          KC_VOLU,          KC_MNXT,          _______,          _______,          _______,
+  _______,          _______,          KC_VOLD,          _______,          _______,          _______,
+  _______,          _______,          KC_MUTE,          KC_MPLY,          _______,          _______,          _______,
   _______,          _______,          _______,          _______,          _______,
 
                                             _______,   _______,
@@ -315,32 +298,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // -----------------------------------------------------right hand-----------------------------------------------------
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
-                    _______,          _______,          _______,          TOG_OS,           _______,          _______,
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
-                    _______,          _______,          _______,          _______,          _______,
-
-    _______,     _______,
-    _______,
-    _______,     _______,    _______
-),
-
-[GIT] = LAYOUT_ergodox(  
-  // -----------------------------------------------------left hand-----------------------------------------------------
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
-  _______,          _______,          G_DIFF,           G_RST,            _______,          G_BRCH,          _______,
-  _______,          G_ADD,            G_S,              _______,          _______,          _______,
-  _______,          _______,          _______,          G_C,              _______,          G_MERG,          _______,
-  _______,          _______,          _______,          _______,          _______,
-
-                                            _______,   _______,
-                                                       _______,
-                                  _______,  _______,   _______,
-
-  // -----------------------------------------------------right hand-----------------------------------------------------
-  _______,          _______,          _______,          _______,          _______,          _______,          _______,
-  _______,          _______,          G_FTCH,           _______,          G_P,              _______,          _______,
                     _______,          _______,          _______,          _______,          _______,          _______,
-  _______,          _______,          G_LOG,            _______,          G_DEV,            _______,          _______,
+  _______,          _______,          _______,          _______,          _______,          _______,          _______,
                     _______,          _______,          _______,          _______,          _______,
 
     _______,     _______,
@@ -348,13 +307,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,     _______,    _______
 ),
 
-[GIT_C] = LAYOUT_ergodox(  
+[GIT] = LAYOUT_ergodox(
+  // -----------------------------------------------------left hand-----------------------------------------------------
+  _______,          _______,          _______,          _______,          _______,          _______,          _______,
+  _______,          _______,          G_DIFF,           G_R,              _______,          G_BRCH,          _______,
+  _______,          G_ADD,            G_S,              _______,          _______,          _______,
+  _______,          G_DEV,            _______,          G_C,              _______,          G_MERG,          _______,
+  _______,          _______,          _______,          _______,          _______,
+
+                                            _______,   _______,
+                                                       _______,
+                                  _______,  _______,   _______,
+
+  // -----------------------------------------------------right hand-----------------------------------------------------
+  _______,          _______,          _______,          _______,          _______,          _______,          _______,
+  _______,          _______,          G_FTCH,           G_PULL,           G_PUSH,           _______,          _______,
+                    _______,          _______,          _______,          _______,          _______,          _______,
+  _______,          _______,          G_LOG,            _______,          XXXXXXX,          _______,          _______,
+                    _______,          _______,          _______,          _______,          _______,
+
+    _______,     _______,
+    _______,
+    _______,     _______,    _______
+),
+
+[GIT_C] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
   XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
   XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
   XXXXXXX,          XXXXXXX,          XXXXXXX,          G_CHEC,           XXXXXXX,          XXXXXXX,
   _______,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
-  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
 
                                             XXXXXXX,   XXXXXXX,
                                                        XXXXXXX,
@@ -365,20 +348,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
                     XXXXXXX,          XXXXXXX,          XXXXXXX,          G_COMM,           XXXXXXX,          XXXXXXX,
   XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
-                    XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+                    XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
 
     XXXXXXX,     XXXXXXX,
     XXXXXXX,
     XXXXXXX,     XXXXXXX,    XXXXXXX
 ),
 
-[GIT_S] = LAYOUT_ergodox(  
+[GIT_R] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
   XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
-  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
-  XXXXXXX,          XXXXXXX,          G_STSH,           G_SHOW,           G_STAT,           XXXXXXX,
-  _______,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
-  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          G_RBASE,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          G_RST,            XXXXXXX,          XXXXXXX,          XXXXXXX,
+  _______,          XXXXXXX,          XXXXXXX,          XXXXXXX,          G_RVERT,          XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
 
                                             XXXXXXX,   XXXXXXX,
                                                        XXXXXXX,
@@ -389,7 +372,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
                     XXXXXXX,          XXXXXXX,          XXXXXXX,          G_COMM,           XXXXXXX,          XXXXXXX,
   XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
-                    XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+                    XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
+
+    XXXXXXX,     XXXXXXX,
+    XXXXXXX,
+    XXXXXXX,     XXXXXXX,    XXXXXXX
+),
+
+[GIT_S] = LAYOUT_ergodox(
+  // -----------------------------------------------------left hand-----------------------------------------------------
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          G_STSH,           G_SHOW,           G_STAT,           XXXXXXX,
+  _______,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
+
+                                            XXXXXXX,   XXXXXXX,
+                                                       XXXXXXX,
+                                  XXXXXXX,  KC_BSPC,   XXXXXXX,
+
+  // -----------------------------------------------------right hand-----------------------------------------------------
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,
+                    XXXXXXX,          XXXXXXX,          XXXXXXX,          G_COMM,           XXXXXXX,          XXXXXXX,
+  XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
+                    XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX,          _______,
 
     XXXXXXX,     XXXXXXX,
     XXXXXXX,
@@ -412,7 +419,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                         `----------------------------------'
  */
 
-// [] = LAYOUT_ergodox(  
+// [] = LAYOUT_ergodox(
 //   // -----------------------------------------------------left hand-----------------------------------------------------
 //   _______,          _______,          _______,          _______,          _______,          _______,          _______,
 //   _______,          _______,          _______,          _______,          _______,          _______,          _______,
diff --git a/keyboards/ktec/ergodone/keymaps/art/rules.mk b/keyboards/ktec/ergodone/keymaps/art/rules.mk
new file mode 100644
index 0000000000..e1e10174a2
--- /dev/null
+++ b/keyboards/ktec/ergodone/keymaps/art/rules.mk
@@ -0,0 +1 @@
+SRC += user_config.c
diff --git a/keyboards/ktec/ergodone/keymaps/art/user_config.c.example b/keyboards/ktec/ergodone/keymaps/art/user_config.c.example
new file mode 100644
index 0000000000..baa169f9a3
--- /dev/null
+++ b/keyboards/ktec/ergodone/keymaps/art/user_config.c.example
@@ -0,0 +1,6 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+bool is_win = true;
diff --git a/keyboards/mt/split75/config.h b/keyboards/mt/split75/config.h
index dce3f6eea8..b146d03314 100644
--- a/keyboards/mt/split75/config.h
+++ b/keyboards/mt/split75/config.h
@@ -1,3 +1,6 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 /* matrix size */
@@ -13,3 +16,5 @@
 #define RGBLIGHT_SLEEP
 
 #define BACKLIGHT_PIN D4
+
+#define I2C_START_RETRY_COUNT 1
\ No newline at end of file
diff --git a/keyboards/mt/split75/keymaps/art/.gitignore b/keyboards/mt/split75/keymaps/art/.gitignore
new file mode 100644
index 0000000000..46bb98e431
--- /dev/null
+++ b/keyboards/mt/split75/keymaps/art/.gitignore
@@ -0,0 +1 @@
+*user_config.c
\ No newline at end of file
diff --git a/keyboards/mt/split75/keymaps/art/config.h b/keyboards/mt/split75/keymaps/art/config.h
new file mode 100644
index 0000000000..30d493075a
--- /dev/null
+++ b/keyboards/mt/split75/keymaps/art/config.h
@@ -0,0 +1,10 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#undef RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+
+// #define DYNAMIC_MACRO_SIZE 48
\ No newline at end of file
diff --git a/keyboards/mt/split75/keymaps/art/keymap.c b/keyboards/mt/split75/keymaps/art/keymap.c
index c10059bb7d..25a58ee591 100644
--- a/keyboards/mt/split75/keymaps/art/keymap.c
+++ b/keyboards/mt/split75/keymaps/art/keymap.c
@@ -1,64 +1,50 @@
-#include <art.h>
-#include <sendstring_workman_zxcvm.h>
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-bool is_win = false;
+#include "art.h"
+#include "sendstring_workman_zxcvm.h"
 
 enum custom_keycodes {
   keyboardSpecificKeyCode = NEW_SAFE_RANGE //not used atm
 };
 
-bool led_update_user(led_t led_state) {
-  writePin(CAPSLOCK_LED_PIN, led_state.caps_lock);
-  return false;
+void num_led_on(void) {
+  writePinHigh(LED_NUM_LOCK_PIN);
 }
 
-void led_show_current_os(void) {
-  if (is_win) {
-    writePinHigh(NUMLOCK_LED_PIN);
-    wait_ms(50);
-    writePinLow(NUMLOCK_LED_PIN);
-    wait_ms(50);
-    writePinHigh(NUMLOCK_LED_PIN);
-    wait_ms(50);
-    writePinLow(NUMLOCK_LED_PIN);
-    wait_ms(50);
-    writePinHigh(NUMLOCK_LED_PIN);
-    wait_ms(50);
-    writePinLow(NUMLOCK_LED_PIN);
-    wait_ms(50);
-  } else {
-    writePinHigh(SCROLLLOCK_LED_PIN);
-    wait_ms(50);
-    writePinLow(SCROLLLOCK_LED_PIN);
-    wait_ms(50);
-    writePinHigh(SCROLLLOCK_LED_PIN);
-    wait_ms(50);
-    writePinLow(SCROLLLOCK_LED_PIN);
-    wait_ms(50);
-    writePinHigh(SCROLLLOCK_LED_PIN);
-    wait_ms(50);
-    writePinLow(SCROLLLOCK_LED_PIN);
-    wait_ms(50);
-  }
+void num_led_off(void) {
+  writePinLow(LED_NUM_LOCK_PIN);
 }
 
-void keyboard_pre_init_user(void) {
-  led_show_current_os();
-  
-  layer_state_set_user(layer_state);
+void caps_led_on(void) {
+  writePinHigh(LED_CAPS_LOCK_PIN);
+}
+
+void caps_led_off(void) {
+  writePinLow(LED_CAPS_LOCK_PIN);
+}
+
+void scroll_led_on(void) {
+  writePinHigh(LED_SCROLL_LOCK_PIN);
+}
+
+void scroll_led_off(void) {
+  writePinLow(LED_SCROLL_LOCK_PIN);
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  writePinLow(NUMLOCK_LED_PIN);
-  writePinLow(SCROLLLOCK_LED_PIN);
+  num_led_off();
+  scroll_led_off();
   switch (get_highest_layer(state)) {
     case MEDIA:
-      writePinHigh(SCROLLLOCK_LED_PIN);
+    case WORKMAN:
+      scroll_led_on();
     case BASE:
-      writePinHigh(NUMLOCK_LED_PIN);
+    case NAV:
+      num_led_on();
       break;
     case NUMPAD:
-      writePinHigh(SCROLLLOCK_LED_PIN);
+      scroll_led_on();
       break;
   }
   return state;
@@ -82,12 +68,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [QWERTY] = LAYOUT(
 //--------------------------------Left Hand------------------------------------| |--------------------------------Right Hand------------------------------------------------
-                 KC_ESC,   KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,                KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12,   LT(CONFIG, KC_PSCR),  KC_INS,  KC_HOME,
+                 KC_ESC,   KC_MPLY, KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,                KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12,   LT(CONFIG, KC_PSCR),  KC_INS,  KC_HOME,
 KC_VOLD,KC_VOLU, KC_GRAVE, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,                 KC_7,   KC_8,    KC_9,   KC_0,    KC_MINUS, KC_EQUAL, KC_BSPC,          KC_DEL,
 KC_MPRV,KC_MNXT, KC_TAB,   KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,                 KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,           KC_END,
 KC_HOME,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_ENTER,         KC_PGUP,
-DYN_MACRO_PLAY1,MO(STRINGS),KC_LSFT,KC_Z,KC_X,KC_C,  KC_V,   KC_B,                 KC_N,   KC_M,   KC_COMM, KC_DOT, LT(GIT,KC_SLSH),                     KC_RSFT,  KC_UP,   KC_PGDN,
-DYN_REC_STOP,DYN_REC_START1,KC_LCTL, KC_LGUI, KC_LALT, LT(MEDIA,KC_SPC), LT(COMBOS,KC_BSPC),            LT(NAV, KC_ENTER),        KC_RALT, MO(LAYOUT_CHG),KC_RCTL,                     KC_LEFT,  KC_DOWN, KC_RIGHT
+DYN_MACRO_PLAY1,KC_MUTE,KC_LSFT,KC_Z,KC_X,KC_C,  KC_V,   KC_B,                 KC_N,   KC_M,   KC_COMM, KC_DOT, LT(GIT,KC_SLSH),                     KC_RSFT,  KC_UP,   KC_PGDN,
+DYN_REC_STOP,DYN_REC_START1,KC_LCTL, KC_LGUI, KC_LALT, LT(MEDIA,KC_SPC), LT(COMBOS,KC_BSPC),       LT(NAV,KC_APP), LT(LAYOUT_CHG, KC_ENTER),KC_RALT,KC_RCTL,   KC_LEFT,  KC_DOWN, KC_RIGHT
   ),
 
   /* Base          ,-----------------------------------------.     ,-----------------------------------------------------.
@@ -111,7 +97,7 @@ KC_8,  KC_9,    KC_GRAVE, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,
 KC_6,  KC_7,    KC_TAB,   KC_Q,    KC_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_4,  KC_5,    KC_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_2,  KC_3,    KC_LSFT,  KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,                 KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,                     KC_RSFT,  KC_UP,   KC_PGDN,
-KC_0,  KC_1,    OS_CTRL,  OS_WIN,  KC_LALT, KC_SPC, KC_SPC,                       KC_SPC,         KC_RALT, MO(QWERTY_MOD),  KC_RCTL,            KC_LEFT,  KC_DOWN, KC_RIGHT
+KC_0,  KC_1,    OS_CTRL,  OS_WIN,  KC_LALT, KC_SPC, KC_SPC,                       KC_SPC,      MO(QWERTY_MOD), KC_RALT, KC_RCTL,           KC_LEFT,  KC_DOWN, KC_RIGHT
   ),
 
   [WORKMAN] = LAYOUT(
@@ -121,19 +107,19 @@ _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,
 _______,  _______,    _______,  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_C,     KC_V,     KC_M,                 KC_K,     KC_L,      KC_COMM,  KC_DOT,   _______,                      _______, _______,  _______,
-_______,  _______,    _______, _______,   _______,  _______,  _______,                        _______,             _______,  TO(QWERTY), _______,           _______, _______,  _______
+_______,  _______,    _______, _______,   _______,  _______,  LT(COMBOS,KC_BSPC),       LT(NAV,KC_APP), LT(LAYOUT_CHG, KC_ENTER), TO(QWERTY), _______,               _______,  _______, _______
   ),
-  
+
   [NAV] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
                 _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
 KC_8,  KC_9,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
-KC_6,  KC_7,    _______,  _______,  KC_HOME,  KC_UP,    KC_END,   KC_PGUP,              _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
-KC_4,  KC_5,    _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDOWN,            _______,  CTR_ALT,   KC_RSFT,  _______,  _______,  _______,  _______,            _______,
-KC_2,  KC_3,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______,  _______, _______,
+KC_6,  KC_7,    _______,  KC_ESC,   KC_HOME,  KC_UP,    KC_END,   KC_PGUP,              XXXXXXX, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, XXXXXXX,  _______,  _______,  _______,           _______,
+KC_4,  KC_5,    _______,  XXXXXXX,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDOWN,            KC_APP,  CTR_ALT, KC_RSFT, CTR_ALT_SHIFT, _______, _______, _______,          _______,
+KC_2,  KC_3,    _______,  XXXXXXX, LCTL(KC_X),LCTL(KC_C),LCTL(KC_V), XXXXXXX,           XXXXXXX,  XXXXXXX,   _______,  _______,  _______,                      _______,  _______, _______,
 KC_0,  KC_1,    _______,  _______,  _______,  KC_DEL,   _______,                        _______,             _______,  _______,  _______,            _______,  _______,  _______
   ),
-  
+
   [MEDIA] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
                       _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
@@ -141,57 +127,57 @@ _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,
 _______,  _______,    _______,  KC_MPRV,  KC_VOLU,  KC_MNXT,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
 _______,  _______,    _______,  _______,  KC_VOLD,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
 _______,  _______,    _______,  _______,  KC_MUTE,  KC_MPLY,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
-_______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______, _______,   _______,                      _______, _______,  _______
+_______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______,  _______,  _______,                      _______, _______,  _______
   ),
-  
+
   [COMBOS] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
                       _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
-_______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
-_______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
-_______,  _______,    _______,  _______,  SARCASM,  _______,  CTRL_CTV, _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
-_______,  _______,    _______,  _______,  _______,  CTRL_CAV, _______,  _______,              _______,  CTRL_LCTV, _______,  _______,  _______,                      _______, _______,  _______,
-_______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______, _______,   _______,                      _______, _______,  _______
+_______, _______,  TILD_BLOCK,  _______, QUOTES_RU, K_CUST1, K_CUST2, K_CUST3, _______,                 _______,   STARS,    PARENTHS, _______,  DASHES,   _______,  _______,           _______,
+_______,  _______,    _______,  _______,  _______, NEUTRAL_COPY, _______, BEAT_BROWSER,      K_SECR1,  K_SECR2,   K_SECR3,  K_SECR4,  _______,  BRACES,   TOG_OS,   _______,           _______,
+_______,  _______,    _______,  ADMINS,   SARCASM,  ALL_BEST,CTRL_CTV, _______,              AT_EMAIL, _______,   _______,  _______,  _______,  QUOTES,   _______,                     _______,
+_______,  _______,    _______,  _______,  _______,  CTRL_CAV, _______,  XXXXXXX,              _______,  CTRL_LCTV, _______,  _______,  _______,                      _______, _______,  _______,
+_______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______,  _______,  _______,                      _______, _______,  _______
   ),
-  
-  [STRINGS] = LAYOUT(
-//--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
-                      _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
-_______,  _______,    TILD_BLOCK, PRESCRIPTION,  _______,  _______,  FOURS,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
-_______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
-_______,  _______,    _______,  ADMINS,   _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
-_______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
-_______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______, _______,   _______,                      _______, _______,  _______
-  ),  
+
+//   [STRINGS] = LAYOUT(
+// //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
+//                       _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+// _______,  _______,    TILD_BLOCK, _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
+// _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
+// _______,  _______,    _______,  ADMINS,   _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
+// _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
+// _______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______, _______,   _______,                      _______, _______,  _______
+//   ),
 
   [QWERTY_MOD] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
-                      _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+                      _______,  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
 _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
 _______,  _______,    _______,  KC_MPRV,  KC_VOLU,  KC_MNXT,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
 _______,  _______,    _______,  _______,  KC_VOLD,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
 _______,  _______,    _______,  _______,  KC_MUTE,  KC_MPLY,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
-_______,  _______,    TO(QWERTY),_______, _______,  _______,  _______,                        _______,             _______, _______,   _______,                      _______, _______,  _______
+_______,  _______,   TO(QWERTY),_______,  _______,  _______,  _______,                        _______,             _______,  _______,  _______,                      _______, _______,  _______
   ),
-  
+
   [LAYOUT_CHG] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
-                      _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
+                      _______,  KC_F1,    _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
 _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
 _______,  _______,    _______,  _______,  CTL_ALT(KC_HOME),  CTL_ALT(KC_UP),    CTL_ALT(KC_END),   CTL_ALT(KC_PGUP),              _______,  _______,_______, _______,_______,_______,_______,  _______,           _______,
 _______,  _______,    _______,  _______,  CTL_ALT(KC_LEFT),  CTL_ALT(KC_DOWN),  CTL_ALT(KC_RIGHT), CTL_ALT(KC_PGDOWN),              _______,_______,_______,_______,_______,  _______,  _______,           _______,
-_______,  _______,    TO(WORKMAN),  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
+_______, _______, TO(WORKMAN),  LCTL(KC_Z), LCTL(KC_X),      LCTL(KC_C),        LCTL(KC_V),        _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
 TO(NUMPAD), TO(NUMPAD), TO(BASE),  _______,  _______,  _______,  CTL_ALT(KC_BSPC),                KC_LSFT,             _______, _______, _______,                      _______, _______,  _______
-  ),  
-  
+  ),
+
   [CONFIG] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
                       _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
-RGB_VAI,  RGB_VAD,    RGB_MODE_PLAIN,  RGB_MODE_BREATHE,  RGB_MODE_RAINBOW,  RGB_MODE_SWIRL,  RGB_MODE_SNAKE,  RGB_MODE_KNIGHT,  RGB_MODE_XMAS,              RGB_MODE_GRADIENT,   RGB_MODE_RGBTEST,  XXXXXXX,  XXXXXXX,  _______,  _______,  _______,           _______,
-RGB_SAI,  RGB_SAD,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  TOG_OS,  _______,  _______,  _______,  _______,           _______,
-RGB_HUI,  RGB_HUD,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
-RGB_MOD,  RGB_RMOD,   _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
-RGB_TOG,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______, _______,   _______,                      _______, _______,  _______
+RGB_VAD,  RGB_VAI,    RGB_MODE_PLAIN,  RGB_MODE_BREATHE,  RGB_MODE_RAINBOW,  RGB_MODE_SWIRL,  RGB_MODE_SNAKE,  RGB_MODE_KNIGHT,  RGB_MODE_XMAS,  RGB_MODE_GRADIENT,   RGB_MODE_RGBTEST,  XXXXXXX,  XXXXXXX,  _______,  _______,  _______,           _______,
+RGB_SAD,  RGB_SAI,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  XXXXXXX,  _______,  _______,  _______,  _______,           _______,
+RGB_HUD,  RGB_HUI,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
+RGB_RMOD, RGB_MOD,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
+RGB_TOG,  XXXXXXX,    _______,  _______,  _______,  _______,  _______,                        _______,             _______,  _______,  _______,                      _______, _______,  _______
   ),
 
   [NUMPAD] = LAYOUT(
@@ -203,17 +189,17 @@ KC_4,  KC_5,    _______,  _______,  _______,  _______,  _______,  _______,
 KC_2,  KC_3,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
 KC_0,  KC_1,    _______,  _______,  _______,  _______,  _______,                        _______,             _______, TO(QWERTY),_______,                      _______, _______,  _______
   ),
-  
+
   [GIT] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
                       _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
 _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
-_______,  _______,    _______,  _______,  G_DIFF,   G_RST,    _______,  G_BRCH,               _______,   G_FTCH,   _______,  G_P,      _______,  _______,  _______,  _______,           _______,
+_______,  _______,    _______,  _______,  G_DIFF,   G_R,      _______,  G_BRCH,               _______,   G_FTCH,   G_PULL,   G_PUSH,   _______,  _______,  _______,  _______,           _______,
 _______,  _______,    _______,  G_ADD,    G_S,      _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
-_______,  _______,    _______,  _______,  _______,  G_C,      _______,  G_MERG,               _______,   G_LOG,    _______,  G_DEV,    _______,                      _______, _______,  _______,
+_______,  _______,    _______,  G_DEV,    _______,  G_C,      _______,  G_MERG,               _______,   G_LOG,    _______,  XXXXXXX,  _______,                      _______, _______,  _______,
 _______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______,  _______,  _______,                      _______, _______,  _______
   ),
-  
+
   [GIT_C] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
                       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,              XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,
@@ -221,9 +207,19 @@ XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
 XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,              XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,           XXXXXXX,
 XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  G_CHEC,   XXXXXXX,  XXXXXXX,              XXXXXXX,  XXXXXXX,   XXXXXXX,  G_COMM,   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_BSPC,                        XXXXXXX,             XXXXXXX,  XXXXXXX,  XXXXXXX,                      XXXXXXX, XXXXXXX,  XXXXXXX
+XXXXXXX,  XXXXXXX,    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_BSPC,                        XXXXXXX,             XXXXXXX,  XXXXXXX,  _______,                      XXXXXXX, XXXXXXX,  XXXXXXX
   ),
-  
+
+  [GIT_R] = LAYOUT(
+//--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
+                      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,              XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,
+XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,              XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,           XXXXXXX,
+XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  G_RBASE,              XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,           XXXXXXX,
+XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  G_RST,    XXXXXXX,  XXXXXXX,  XXXXXXX,              XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,                     XXXXXXX,
+XXXXXXX,  XXXXXXX,    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  G_RVERT,  XXXXXXX,              XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,                      _______, XXXXXXX,  XXXXXXX,
+XXXXXXX,  XXXXXXX,    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_BSPC,                        XXXXXXX,             XXXXXXX,  XXXXXXX,  _______,                      XXXXXXX, XXXXXXX,  XXXXXXX
+  ),
+
   [GIT_S] = LAYOUT(
 //--------------------------------Left Hand-----------------------------------------------| |--------------------------------Right Hand------------------------------------------------
                       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,              XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,
@@ -231,9 +227,9 @@ XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
 XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,              XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,           XXXXXXX,
 XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  G_STSH,   G_SHOW,   G_STAT,   XXXXXXX,              XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  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_BSPC,                        XXXXXXX,             XXXXXXX, XXXXXXX,   XXXXXXX,                      XXXXXXX, XXXXXXX,  XXXXXXX
-  ),   
-  
+XXXXXXX,  XXXXXXX,    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_BSPC,                        XXXXXXX,             XXXXXXX,  XXXXXXX,  _______,                      XXXXXXX, XXXXXXX,  XXXXXXX
+  ),
+
  /*                ,-----------------------------------------.     ,-----------------------------------------------------.
   *                |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
   * ,-----------.  |-----+-----+-----+-----+-----+-----+-----|     |-----+-----+-----+-----+-----+-----+-----------+-----|
@@ -255,7 +251,7 @@ XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_BSPC,
 // _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
 // _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,  _______,  _______,                     _______,
 // _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
-// _______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______, _______,   _______,                      _______, _______,  _______
+// _______,  _______,    _______,  _______,  _______,  _______,  _______,                        _______,             _______,  _______,  _______,                      _______, _______,  _______
   // ),
 };
 
@@ -264,4 +260,4 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 
   }
   return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/mt/split75/keymaps/art/rules.mk b/keyboards/mt/split75/keymaps/art/rules.mk
index 5f8cb68ad0..cca8f0a79e 100644
--- a/keyboards/mt/split75/keymaps/art/rules.mk
+++ b/keyboards/mt/split75/keymaps/art/rules.mk
@@ -1 +1,3 @@
-DYNAMIC_MACRO_ENABLE = yes
\ No newline at end of file
+SRC += user_config.c
+
+# DYNAMIC_MACRO_ENABLE = yes # doesn't work atm
diff --git a/keyboards/mt/split75/keymaps/art/user_config.c.example b/keyboards/mt/split75/keymaps/art/user_config.c.example
new file mode 100644
index 0000000000..baa169f9a3
--- /dev/null
+++ b/keyboards/mt/split75/keymaps/art/user_config.c.example
@@ -0,0 +1,6 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+bool is_win = true;
diff --git a/keyboards/mt/split75/keymaps/default/keymap.c b/keyboards/mt/split75/keymaps/default/keymap.c
index 320aaeb5da..5d060f11ca 100644
--- a/keyboards/mt/split75/keymaps/default/keymap.c
+++ b/keyboards/mt/split75/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 enum layer_names {
diff --git a/keyboards/mt/split75/split75.c b/keyboards/mt/split75/split75.c
index b8a3fe6c28..890c9d1de3 100644
--- a/keyboards/mt/split75/split75.c
+++ b/keyboards/mt/split75/split75.c
@@ -1 +1,4 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "split75.h"
diff --git a/keyboards/mt/split75/split75.h b/keyboards/mt/split75/split75.h
index 93da3e7b83..a01db5188e 100644
--- a/keyboards/mt/split75/split75.h
+++ b/keyboards/mt/split75/split75.h
@@ -1,3 +1,6 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include "quantum.h"
diff --git a/users/art/.gitignore b/users/art/.gitignore
new file mode 100644
index 0000000000..c05ba7978b
--- /dev/null
+++ b/users/art/.gitignore
@@ -0,0 +1,3 @@
+*user_config.*
+custom_definitions.h
+secr.h
diff --git a/users/art/art.c b/users/art/art.c
index 5596e237f8..151249ec3f 100644
--- a/users/art/art.c
+++ b/users/art/art.c
@@ -1,103 +1,116 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "art.h"
-#include "string.h"
+#include "custom_definitions.h"
+#include "secr.h"
+#include "funcs/led_funcs.h"
+#include "funcs/string_funcs.h"
+
+static const int COPY_DELAY = 50;
+static const int INCOGNITO_DELAY = 500;
+static const int LMB_SPAM_INTERVAL = 30;
+static const uint8_t OS_MOD_KEYS[2] = {MOD_LALT, MOD_LCTL};
+
+bool mac_ctrl_on = false; //for switching tabs
+bool mac_gui_on = false; //for switching languages
+bool mac_alt_window_switching_on = false; //for switching windows
+
+int char_to_bspace = 1;
+int char_to_del = 0;
+
+static bool sarcasm_on = false;
+static bool sarcasm_key = false;
+static bool full_caps_mode = false;
+bool hw_caps_on;
+
+static bool is_lmb_timer_active = false;
+static uint16_t lmb_timer = 0;
 
 __attribute__ ((weak))
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-__attribute__ ((weak))
-void led_show_current_os(void) {
+void keyboard_post_init_user(void) {
+  led_show_variable_status(is_win);
+  layer_state_set_user(layer_state);
 }
 
-static bool mac_ctrl_on = false; //for switching tabs
-static bool mac_gui_on = false; //for switching languages
-static bool mac_alt_tab_on = false; //for switching windows
-
-static const char *key_up[2] = {SS_UP(X_LALT), SS_UP(X_LCTL)};
-static const char *key_down[2] = {SS_DOWN(X_LALT), SS_DOWN(X_LCTL)};
-
-int char_to_del = 1;
-static bool sarcasm_on = false;
-static bool sarcasm_key = false;
-
-void backspace_n_times(int times) {
-  for (int i=0; i<times; i++) {
-    SEND_STRING(SS_TAP(X_BSPC));  
+void matrix_scan_user(void) {
+  if (is_lmb_timer_active) {
+    if (timer_elapsed(lmb_timer) > LMB_SPAM_INTERVAL) {
+      SEND_STRING(SS_TAP(X_BTN1)); //do stuff that needs spamming
+      lmb_timer = timer_read();
+    }
   }
 }
 
-void send_string_remembering_length(char *string) {
-  send_string(string);
-  char_to_del = strlen(string);
+bool caps_word_on(void) {
+  return hw_caps_on && !full_caps_mode;
 }
 
-void send_shifted_strings(char *string1, char *string2) {
-  if ( get_mods() & MOD_MASK_SHIFT ) {
-    clear_mods();
-    send_string_remembering_length(string2);
-  } else {
-    send_string_remembering_length(string1);
-  }
-}
-
-void send_shifted_strings_add(char *string1, char *string2) {
-  bool shifted = get_mods() & MOD_MASK_SHIFT;
-  clear_mods();
-
-  send_string_remembering_length(string1);
-
-  if (shifted) {
-    send_string(string2);
-    char_to_del = strlen(string1) + strlen(string2);
-  }
-}
-
-bool is_mac_with_base_layer_off(void) {
-  return !is_win && !layer_state_is(BASE);
-}
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (sarcasm_on) {
-    sarcasm_key = ! sarcasm_key;  
-    if (sarcasm_key) {
-      SEND_STRING(SS_TAP(X_CAPS));
+  if (record->event.pressed) {
+    if (sarcasm_on) {
+      sarcasm_key = ! sarcasm_key;
+      del_mods(MOD_LSFT);
+      if (sarcasm_key) {
+        add_mods(MOD_LSFT);
+      }
+    }
+
+    //Checking all other non-backspace keys to clear the backspace buffer. This is to prevent the bug of deleting N chars sometime after using a macro
+    switch (keycode) {
+      case LT(COMBOS,KC_BSPC):
+      case KC_BSPACE:
+      case KC_DEL:
+      case KC_LSFT:
+      case KC_RSFT:
+      case XXXXXXX:
+        break;
+      default:
+        char_to_bspace = 1;
+        char_to_del = 0;
+        break;
     }
   }
 
-  //Checking all other non-backspace keys to clear the backspace buffer. This is to prevent the bug of deleting N chars sometime after using a macro
-  if (record->event.pressed && (keycode != KC_BSPACE && keycode != XXXXXXX)) {
-    char_to_del = 1;
-  }
-
   switch (keycode) {
+    case XXXXXXX:
+      if (record->event.pressed && !layer_state_is(BASE)) {
+        blink_leds(NUM_SCROLL_LED_ON);
+        return true;
+      }
+      break;
     case KC_TAB:
       if (record->event.pressed && is_mac_with_base_layer_off()) {
-        uint8_t mods = get_mods();
-        uint8_t mod_state = mods & MOD_MASK_ALT;
-        if (get_mods() & mod_state) {
-          del_mods(mod_state);
-          add_mods(MOD_LCTL);
-          mac_alt_tab_on = true;
-        }
-
-        mod_state = mods & MOD_MASK_CTRL;
-        if (get_mods() & mod_state && !mac_alt_tab_on) {
+        uint8_t mod_state = get_mods() & MOD_MASK_CTRL;
+        if (get_mods() & mod_state && !mac_alt_window_switching_on) {
           del_mods(mod_state);
           add_mods(MOD_LGUI);
           mac_ctrl_on = true;
         }
       }
+    case KC_GRAVE:
+      if (record->event.pressed && is_mac_with_base_layer_off()) {
+        uint8_t mod_state = get_mods() & MOD_MASK_ALT;
+        if (get_mods() & mod_state) {
+          del_mods(mod_state);
+          add_mods(MOD_LCTL);
+          mac_alt_window_switching_on = true;
+        }
+      }
       break;
     case KC_LSFT:
-      if (record->event.pressed && is_mac_with_base_layer_off()) {
-        uint8_t mods = get_mods();
-        uint8_t mod_state = mods & MOD_MASK_AG;
+      if (record->event.pressed && is_mac_with_base_layer_off() && !mac_ctrl_on) {
+        uint8_t mod_state = get_mods() & MOD_MASK_AG;
         if (get_mods() & mod_state) {
           del_mods(mod_state);
           add_mods(MOD_LGUI);
           mac_gui_on = true;
-          SEND_STRING(SS_TAP(X_SPACE));
+          send_string(lang_switch_combo);
           return false;
         } else {
           return true;
@@ -110,27 +123,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         /* && !mac_ctrl_on/!mac_alt_tab_on are required since setting the state while holding the key changes
         the modifier from OS's perspective. As a result, just the pressed key cannot be the single source
         of truth to determine which state we're in, and a separate bool is required */
-        uint8_t mods = get_mods();
-        uint8_t mod_state = mods & MOD_MASK_ALT;
+        uint8_t alt_state = get_mods() & MOD_MASK_ALT;
+        uint8_t ctrl_state = get_mods() & MOD_MASK_CTRL;
+
         //Allows Ctrl <-/-> on Mac if Ctrl Tab is already pressed
-        if (get_mods() & mod_state && mac_alt_tab_on && !mac_ctrl_on) {
-          del_mods(mod_state);
+        if (get_mods() & alt_state && mac_alt_window_switching_on && !mac_ctrl_on) {
+          del_mods(alt_state);
           add_mods(MOD_LCTL);
         }
 
-        mod_state = mods & MOD_MASK_CTRL;
-        if (get_mods() & mod_state && !mac_alt_tab_on) {
-          del_mods(mod_state);
-          add_mods(MOD_LALT);
-          mac_ctrl_on = true;
-        }
-      }
-      break;
-    case KC_DEL:
-      if (record->event.pressed && is_mac_with_base_layer_off()) {
-        uint8_t mod_state = get_mods() & MOD_MASK_CTRL;
-        if (get_mods() & mod_state) {
-          del_mods(mod_state);
+        if (get_mods() & ctrl_state && !mac_alt_window_switching_on && !mac_gui_on) {
+          del_mods(ctrl_state);
           add_mods(MOD_LALT);
           mac_ctrl_on = true;
         }
@@ -138,28 +141,31 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case KC_LALT:
       if (!record->event.pressed && is_mac_with_base_layer_off()) {
-        if (mac_alt_tab_on) {
+        if (mac_alt_window_switching_on) {
           unregister_mods(MOD_LCTL);
-          mac_alt_tab_on = false;
+          mac_alt_window_switching_on = false;
           return false;
         } else if (mac_gui_on) {
-          SEND_STRING(SS_UP(X_LGUI));
+          unregister_mods(MOD_LGUI);
           mac_gui_on = false;
           return false;
         }
+        return true;
       }
       break;
     case KC_RALT:
-      if (!record->event.pressed && mac_alt_tab_on && is_mac_with_base_layer_off()) {
+      if (!record->event.pressed && mac_alt_window_switching_on && is_mac_with_base_layer_off()) {
         unregister_mods(MOD_LCTL);
-        mac_alt_tab_on = false;
+        mac_alt_window_switching_on = false;
         return false;
       }
       break;
     case KC_LCTL:
     case KC_RCTL:
       if (!record->event.pressed && mac_ctrl_on && is_mac_with_base_layer_off()) {
-        SEND_STRING(SS_UP(X_LGUI) SS_UP(X_LALT));
+        // Need to remove only previously set mods (e.g. WIN & ALT) to preserve Shift, etc
+        unregister_mods(MOD_LGUI);
+        unregister_mods(MOD_LALT);
         mac_ctrl_on = false;
         return false;
       }
@@ -177,67 +183,134 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return false;
       }
       break;
+    case KC_DEL:
     case KC_BSPC:
       if (record->event.pressed) {
-        if (char_to_del > 1) {
-          layer_off(GIT_C);
-          layer_off(GIT_S);
-          backspace_n_times(char_to_del);
-          char_to_del = 1;
-          return false;
-        }
-
-        if (is_mac_with_base_layer_off()) {
-          uint8_t mod_state = get_mods() & MOD_MASK_CTRL;
-          if (get_mods() & mod_state) {
-            del_mods(mod_state);
-            add_mods(MOD_LALT);
-            mac_ctrl_on = true;
+        return handle_del_bspace();
+      }
+      break;
+    case LT(COMBOS, KC_BSPC):
+      if (record->event.pressed && record->tap.count == 1) {
+        return handle_del_bspace();
+      }
+      break;
+    case LT(NAV,KC_APP):
+      if (!record->event.pressed && !is_win) {
+        mac_ctrl_on = false;
+        mac_gui_on = false;
+        mac_alt_window_switching_on = false;
+        clear_mods();
+        SEND_STRING(SS_TAP(X_LCTL) SS_TAP(X_LGUI) SS_TAP(X_LALT) SS_TAP(X_LSFT));
+        return true;
+      }
+      break;
+    /* -------------------------------------------------------------------------
+     *                            CAPS WORD
+     * ------------------------------------------------------------------------ */
+    case KC_CAPS:
+      if (record->event.pressed && !layer_state_is(BASE))  {
+        if (get_mods() & MOD_MASK_SHIFT) {
+          full_caps_mode = true;
+          led_show_variable_status(full_caps_mode);
+          if (hw_caps_on) {
+            SEND_STRING(SS_TAP(X_CAPS));
           }
+        } else if (hw_caps_on) {
+          full_caps_mode = false;
         }
       }
       break;
-
+    // case KC_SPACE:
+    case LT(MEDIA,KC_SPC):
+    case LT(NAV,KC_SPC):
+      if (record->event.pressed && caps_word_on() && !layer_state_is(BASE) && record->tap.count == 1) {
+        SEND_STRING(SS_TAP(X_CAPS));
+      }
+      break;
+    case KC_MINS:
+      if (record->event.pressed && caps_word_on() && !layer_state_is(BASE)) {
+        SEND_STRING("_");
+        return false;
+      }
+      break;
     /* -------------------------------------------------------------------------
      *                            CUSTOM MACROS
      * ------------------------------------------------------------------------ */
+    
     case CTRL_CTV:
       if (record->event.pressed) {
-        if ( get_mods() & MOD_MASK_SHIFT ) {
-          clear_mods();
-          SEND_STRING(SS_LCTL("ctv"));
-        } else {
-          SEND_STRING(SS_LCTL("ctv") SS_TAP(X_ENTER));
+        bool shifted = get_mods() & MOD_MASK_SHIFT;
+        clear_mods();
+
+        SEND_STRING(SS_LCTL("c"));
+        wait_ms(COPY_DELAY);
+        SEND_STRING(SS_LCTL("tv"));
+
+        if (!shifted) {
+          SEND_STRING(SS_TAP(X_ENTER));
         }
       }
       break;
+    case BEAT_BROWSER:
+      if (record->event.pressed) {
+        SEND_STRING(SS_LCTL("c"));
+        wait_ms(COPY_DELAY);
+        SEND_STRING(SS_LGUI("1") SS_LCTL("tv") SS_TAP(X_ENTER));
+      }
+      break;
     case CTRL_LCTV:
       if (record->event.pressed) {
-        if ( get_mods() & MOD_MASK_SHIFT ) {
+        if (get_mods() & MOD_MASK_SHIFT) {
           //Firefox
           clear_mods();
-          SEND_STRING(SS_LCTL("lcP"));
-          wait_ms(200);
+          SEND_STRING(SS_LCTL("lc"));
+          wait_ms(COPY_DELAY);
+          SEND_STRING(SS_LCTL("P"));
+          wait_ms(INCOGNITO_DELAY);
           SEND_STRING(SS_LCTL("v") SS_TAP(X_ENTER));
-        } else if ( get_mods() & MOD_MASK_CTRL ) {
+        } else if (get_mods() & MOD_MASK_CTRL) {
           //Chrome
           clear_mods();
-          SEND_STRING(SS_LCTL("lcNv") SS_TAP(X_ENTER));
+          SEND_STRING(SS_LCTL("lc"));
+          wait_ms(COPY_DELAY);
+          SEND_STRING(SS_LCTL("Nv") SS_TAP(X_ENTER));
         } else {
-          SEND_STRING(SS_LCTL("lctv"));
+          SEND_STRING(SS_LCTL("lc"));
+          wait_ms(COPY_DELAY);
+          SEND_STRING(SS_LCTL("tv"));
         }
       }
       break;
     case CTRL_CAV:
       if (record->event.pressed) {
         SEND_STRING(SS_LCTL("c" SS_TAP(X_TAB)));
-        wait_ms(50);
+        wait_ms(COPY_DELAY);
         SEND_STRING(SS_LCTL("av"));
       }
       break;
+    case NEUTRAL_COPY:
+      if (record->event.pressed && is_win) {
+        uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+        if (shifted) {
+          del_mods(shifted);
+          SEND_STRING(SS_LCTL("z"));
+        }
+        SEND_STRING(SS_LCTL("c"));
+        wait_ms(COPY_DELAY);
+        SEND_STRING(SS_LGUI("r") SS_LCTL("vac") SS_TAP(X_ESC));
+      }
+      break;
     case SARCASM:
       if (record->event.pressed) {
+        del_mods(MOD_LSFT);
         sarcasm_on = !sarcasm_on;
+        led_show_variable_status(sarcasm_on);
+      }
+      break;
+    case LMB_SPAM:
+      if (record->event.pressed) {
+        is_lmb_timer_active = ! is_lmb_timer_active;
+        lmb_timer = timer_read();
       }
       break;
 
@@ -247,14 +320,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case TOG_OS:
       if (record->event.pressed) {
         is_win = ! is_win;
-        led_show_current_os();
+        led_show_variable_status(is_win);
       }
       break;
     case CTR_ALT:
       if (record->event.pressed) {
-        send_string(key_down[is_win]);
+        add_mods(OS_MOD_KEYS[is_win]);
       } else {
-        send_string(key_up[is_win]);
+        unregister_mods(OS_MOD_KEYS[is_win]);
+      }
+      break;
+    case CTR_ALT_SHIFT:
+      if (record->event.pressed) {
+        add_mods(OS_MOD_KEYS[is_win]);
+        add_mods(MOD_RSFT);
+      } else {
+        unregister_mods(OS_MOD_KEYS[is_win]);
+        unregister_mods(MOD_RSFT);
       }
       break;
     case OS_CTRL:
@@ -298,166 +380,342 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     //   break;
     // case :
     //   if (record->event.pressed) {
-    //     send_string_remembering_length("", "");
+    //     send_shifted_strings("", "");
     //   }
     //   break;
     case TILD_BLOCK:
       if (record->event.pressed) {
-        SEND_STRING("```" SS_LSFT(SS_TAP(X_ENTER) SS_TAP(X_ENTER)) "```" SS_TAP(X_UP));
-        char_to_del = 4;
+        uint8_t alted = get_mods() & MOD_MASK_ALT;
+        uint8_t switch_lang_state = get_mods() & MOD_MASK_CTRL;
+
+        if (switch_lang_state) {
+          del_mods(switch_lang_state);
+          switch_lang();
+        }
+
+        if (alted) {
+          del_mods(alted);
+          SEND_STRING(SS_TAP(X_ESC) "```" SS_LSFT(SS_TAP(X_ENTER) SS_TAP(X_ENTER)) "```" SS_TAP(X_UP));
+          char_to_bspace = 4;
+          char_to_del = 4;
+        } else {
+          SEND_STRING("`` ");
+
+          uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+          del_mods(shifted);
+          SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+          add_mods(shifted);
+          char_to_bspace = 1;
+          char_to_del = 2;
+        } 
+
+        if (switch_lang_state) {
+          switch_lang();
+        }
       }
       break;
+    case ALL_BEST:
+      if (record->event.pressed) {
+        send_shifted_strings_add("All the best,\nArt", "joms");
+      }
+      break;
+    case AT_EMAIL:
+      if (record->event.pressed) {
+        send_string_remembering_length("@gmail.com");
+      }
+      break;      
+    case BRACES:
+      if (record->event.pressed) {
+        uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+        uint8_t switch_lang_state = get_mods() & MOD_MASK_CTRL;
+        if (switch_lang_state) {
+          del_mods(switch_lang_state);
+          switch_lang();
+        }
+
+        add_mods(shifted);
+        SEND_STRING("[]");
+
+        del_mods(shifted);
+        SEND_STRING(SS_TAP(X_LEFT));
+        add_mods(shifted);
+
+        if (switch_lang_state) {
+          switch_lang();
+        }
+        char_to_bspace = 1;
+        char_to_del = 1;
+      }
+      break;
+    case DASHES:
+      if (record->event.pressed) {
+        SEND_STRING("--");
+
+        uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+        del_mods(shifted);
+        SEND_STRING(" " SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+        add_mods(shifted);
+        char_to_bspace = 1;
+        char_to_del = 2;
+      }
+      break;
+    case PARENTHS:
+      if (record->event.pressed) {
+        clear_mods();
+        SEND_STRING("() " SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+        char_to_bspace = 1;
+        char_to_del = 2;
+      }
+      break;
+    case QUOTES:
+      if (record->event.pressed) {
+        uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+        uint8_t switch_lang_state = get_mods() & MOD_MASK_CTRL;
+        if (switch_lang_state) {
+          del_mods(switch_lang_state);
+          switch_lang();
+        }
+
+        add_mods(shifted);
+        SEND_STRING("''");
+
+        del_mods(shifted);
+        wait_ms(LONG_TYPING_INTERVAL);
+        SEND_STRING(" " SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+        add_mods(shifted);
+
+        if (switch_lang_state) {
+          switch_lang();
+        }
+        char_to_bspace = 1;
+        char_to_del = 2;
+      }
+      break;
+    case QUOTES_RU:
+      if (record->event.pressed) {
+        clear_mods();
+        SEND_STRING("@@ ");
+        wait_ms(LONG_TYPING_INTERVAL);
+        SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+        char_to_bspace = 1;
+        char_to_del = 2;
+      }
+      break;
+    case STARS:
+      if (record->event.pressed) {
+        clear_mods();
+        SEND_STRING("** " SS_TAP(X_LEFT) SS_TAP(X_LEFT));
+        char_to_bspace = 1;
+        char_to_del = 2;
+      }
+      break;
+
     case ADMINS:
       if (record->event.pressed) {
-        send_shifted_strings_add("admin", "/aurora/status");
-      }
-      break;
-    case PRESCRIPTION:
-      if (record->event.pressed) {
-        SEND_STRING("55\t12122019\t");
-        char_to_del = 8;
-      }
-      break;
-    case FOURS:
-      if (record->event.pressed) {
-        SEND_STRING("4444333322221111\t1\t12\t21\t123\n");
-        char_to_del = 16;
+        send_string_remembering_length("admin");
       }
       break;
       
-  case G_ADD:
-    if (record->event.pressed) {
-      send_string_remembering_length("git add ");
-    }
-    break;
-  case G_BRCH:
-    if (record->event.pressed) {
-      send_shifted_strings_add("git branch ", "-d ");
-    }
-    break;
-  case G_C:
-    if (record->event.pressed) {
-      send_string_remembering_length("git c[Heckout/Ommit]");
-      layer_on(GIT_C);
-    }
-    break;
-  case G_CHEC:
-    if (!record->event.pressed) {
-      bool shifted = get_mods() & MOD_MASK_SHIFT;
-      clear_mods();
-            
-      backspace_n_times(15);
-      SEND_STRING("heckout ");
-      char_to_del = 13;
-      if (shifted) {
-        SEND_STRING("-b ");
-        char_to_del = 16;
+    case G_ADD:
+      if (record->event.pressed) {
+        send_string_remembering_length("git add ");
       }
-      layer_off(GIT_C);
-    }
-    break;
-  case G_COMM:
-    if (!record->event.pressed) {
-      bool shifted = get_mods() & MOD_MASK_SHIFT;
-      clear_mods();
-      
-      backspace_n_times(15);
-      SEND_STRING("ommit -");
-      char_to_del = 15;
-      if (shifted) {
-        SEND_STRING("a");
-        char_to_del = 16;
+      break;
+    case G_BRCH:
+      if (record->event.pressed) {
+        send_shifted_strings_add("git branch ", "-d ");
       }
-      SEND_STRING("m \"\"" SS_TAP(X_LEFT));
-      layer_off(GIT_C);
-    }
-    break;
-  case G_DEV:
-    if (record->event.pressed) {
-      send_shifted_strings("develop", "master");
-    }
-    break;
-  case G_DIFF:
-    if (record->event.pressed) {
-      send_string_remembering_length("git diff ");
-    }
-    break;	
-  case G_FTCH:
-    if (record->event.pressed) {
-      send_string_remembering_length("git fetch ");
-    }
-    break;
-  case G_LOG:
-    if (record->event.pressed) {
-      send_string_remembering_length("git log ");
-    }
-    break;
-  case G_MERG:
-    if (record->event.pressed) {
-      send_string_remembering_length("git merge ");
-    }
-    break;
-  case G_P:
-    if (record->event.pressed) {
-      send_shifted_strings_add("git pu", "sh -u ");
-    }
-    break;
-  case G_RST:
-    if (record->event.pressed) {
-      send_string_remembering_length("git reset ");
-    }
-    break;
-  case G_S:
-    if (!record->event.pressed) {
-      send_string_remembering_length("git s[taSh/How/taTus]");
-      layer_on(GIT_S);			
-    }
-    break;
-  case G_SHOW:
-    if (!record->event.pressed) {
-      backspace_n_times(16);
-      SEND_STRING("how ");
-      char_to_del = 9;
-      layer_off(GIT_S);
-    }
-    break;			
-  case G_STSH:
-    if (!record->event.pressed) {
-      bool shifted = get_mods() & MOD_MASK_SHIFT;
-      clear_mods();
-
-      backspace_n_times(16);
-      SEND_STRING("tash ");
-      char_to_del = 10;
-
-      if (shifted) {
+      break;
+    case G_C:
+      if (record->event.pressed) {
+        send_string_remembering_length("git c[Heckout/Ommit]");
+        layer_on(GIT_C);
+      }
+      break;
+    case G_CHEC:
+      if (!record->event.pressed) {
+        bool shifted = get_mods() & MOD_MASK_SHIFT;
         clear_mods();
-        SEND_STRING("apply ");
-
-        char_to_del = 16;
+              
+        press_n_times(15, KC_BSPACE);
+        send_string_with_translation("heckout ");
+        char_to_bspace = 13;
+        if (shifted) {
+          send_string_with_translation("-b ");
+          char_to_bspace = 16;
+        }
+        layer_off(GIT_C);
       }
+      break;
+    case G_COMM:
+      if (!record->event.pressed) {
+        bool ctrled = get_mods() & MOD_MASK_CTRL;
+        bool shifted = get_mods() & MOD_MASK_SHIFT;
+        clear_mods();
 
-      layer_off(GIT_S);
-    }
-    break;		
-  case G_STAT:
-    if (!record->event.pressed) {
-      backspace_n_times(16);
-      SEND_STRING("tatus ");
-      char_to_del = 11;
-      layer_off(GIT_S);
-    }
-    break;
+        press_n_times(15, KC_BSPACE);
+        send_string_with_translation("ommit ");
+        char_to_bspace = 11;
+        layer_off(GIT_C);
 
-  case CTL_ALT_START ... CTL_ALT_END:
-    if (record->event.pressed) {
-      if (is_win) {
-        tap_code16(LCTL(keycode - CTL_ALT_START));
+        if (ctrled) {
+          return false;
+        }
+
+        SEND_STRING("-");
+        char_to_bspace = 15;
+        if (shifted) {
+          send_string_with_translation("a");
+          char_to_bspace = 16;
+        }
+        send_string_with_translation("m");
+        SEND_STRING(" \"\"" SS_TAP(X_LEFT));
+        char_to_del = 1;
+      }
+      break;
+    case G_DEV:
+      if (record->event.pressed) {
+        send_shifted_strings("develop", "master");
+      }
+      break;
+    case G_DIFF:
+      if (record->event.pressed) {
+        send_string_remembering_length("git diff ");
+      }
+      break;	
+    case G_FTCH:
+      if (record->event.pressed) {
+        send_string_remembering_length("git fetch ");
+      }
+      break;
+    case G_LOG:
+      if (record->event.pressed) {
+        send_string_remembering_length("git log ");
+      }
+      break;
+    case G_MERG:
+      if (record->event.pressed) {
+        send_string_remembering_length("git merge ");
+      }
+      break;
+    case G_PULL:
+      if (record->event.pressed) {
+        send_string_remembering_length("git pull ");
+      }
+      break;
+    case G_PUSH:
+      if (record->event.pressed) {
+        send_string_remembering_length("git push -u ");
+      }
+      break;
+    case G_R:
+      if (!record->event.pressed) {
+        send_string_remembering_length("git re[Set/Vert/Base -i]");
+        layer_on(GIT_R);
+      }
+      break;
+    case G_RBASE:
+      if (!record->event.pressed) {
+        press_n_times(18, KC_BSPACE);
+        send_string_with_translation("base -i ");
+        char_to_bspace = 14;
+        layer_off(GIT_R);
+      }
+      break;
+    case G_RVERT:
+      if (!record->event.pressed) {
+        press_n_times(18, KC_BSPACE);
+        send_string_with_translation("vert ");
+        char_to_bspace = 11;
+        layer_off(GIT_R);
+      }
+      break;
+    case G_RST:
+      if (!record->event.pressed) {
+        bool shifted = get_mods() & MOD_MASK_SHIFT;
+        clear_mods();
+
+        press_n_times(18, KC_BSPACE);
+        send_string_with_translation("set ");
+        char_to_bspace = 10;
+
+        if (shifted) {
+          send_string_with_translation("--hard ");
+          char_to_bspace = 17;
+        }
+        layer_off(GIT_R);
+      }
+      break;
+    case G_S:
+      if (!record->event.pressed) {
+        send_string_remembering_length("git s[taSh/How/taTus]");
+        layer_on(GIT_S);			
+      }
+      break;
+    case G_SHOW:
+      if (!record->event.pressed) {
+        press_n_times(16, KC_BSPACE);
+        send_string_with_translation("how ");
+        char_to_bspace = 9;
+        layer_off(GIT_S);
+      }
+      break;			
+    case G_STSH:
+      if (!record->event.pressed) {
+        bool shifted = get_mods() & MOD_MASK_SHIFT;
+        clear_mods();
+
+        press_n_times(16, KC_BSPACE);
+        send_string_with_translation("tash ");
+        char_to_bspace = 10;
+
+        if (shifted) {
+          clear_mods();
+          send_string_with_translation("apply ");
+
+          char_to_bspace = 16;
+        }
+
+        layer_off(GIT_S);
+      }
+      break;		
+    case G_STAT:
+      if (!record->event.pressed) {
+        press_n_times(16, KC_BSPACE);
+        send_string_with_translation("tatus ");
+        char_to_bspace = 11;
+        layer_off(GIT_S);
+      }
+      break;
+
+    case K_CUST1 ... K_CUST3: // custom strings not stored in source control
+      if (!record->event.pressed) {
+          send_string_remembering_length(custom[keycode - K_CUST1]);
+          blink_leds(NUM_SCROLL_LED_ON);
+      }
+      break;
+    case K_SECR1 ... K_SECR4: // Secrets!  Externally defined strings, not stored in repo
+      if (!record->event.pressed) {
+          send_string_remembering_length(secrets[keycode - K_SECR1]);
+          blink_leds(NUM_SCROLL_LED_ON);
+      }
+      break;
+
+    case CTL_ALT_START ... CTL_ALT_END:
+      if (record->event.pressed) {
+        if (is_win) {
+          register_code16(LCTL(keycode - CTL_ALT_START));
+        } else {
+          register_code16(LALT(keycode - CTL_ALT_START));
+        }
       } else {
-        tap_code16(LALT(keycode - CTL_ALT_START));
+        if (is_win) {
+          unregister_code16(LCTL(keycode - CTL_ALT_START));
+        } else {
+          unregister_code16(LALT(keycode - CTL_ALT_START));
+        }
       }
-    }
-    break;
+      break;
   }
 
   return process_record_keymap(keycode, record);
diff --git a/users/art/art.h b/users/art/art.h
index 58b005b933..71af966bef 100644
--- a/users/art/art.h
+++ b/users/art/art.h
@@ -1,18 +1,30 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 #include QMK_KEYBOARD_H
 
 #define CTL_ALT(kc) (CTL_ALT_START + ((kc) & 0xff))
 
 extern bool is_win;
+#define TYPING_INTERVAL 20
+#define LONG_TYPING_INTERVAL 50
 
 enum layer_names {
+#if SPLIT75_SETUP_FOR_PUBLIC_USE_BY_DEFAULT && defined(KEYBOARD_wheatfield_split75) // defined by "KEYBOARD" followed by folder structure
+  BASE,
   QWERTY,
-  WORKMAN,  
-  BASE, //only specific for split75
-#if defined(KEYBOARD_wheatfield_split75)
-  QWERTY_MOD,
+#else
+  QWERTY,
+  BASE,
+#endif
+
+  WORKMAN,
+#if defined(KEYBOARD_mt_split75)
+  CONFIG,
   LAYOUT_CHG,
-#elif defined(KEYBOARD_ergodone)
+  QWERTY_MOD,
+#elif defined(KEYBOARD_ktec_ergodone)
   FKEYS,
   CTRL_NAV,
   SHIFT_NAV,
@@ -20,12 +32,12 @@ enum layer_names {
 
   MEDIA,
   COMBOS,
-  STRINGS,
-  CONFIG,
+  //STRINGS,
   NAV,
   NUMPAD,
   GIT,
   GIT_C,
+  GIT_R,
   GIT_S
 };
 
@@ -33,35 +45,61 @@ enum custom_keycodes_art {
   CTRL_CTV = SAFE_RANGE,
   CTRL_LCTV,
   CTRL_CAV,
+  BEAT_BROWSER,
+  NEUTRAL_COPY,
   SARCASM,
+  LMB_SPAM,
 
   TOG_OS,
   CTR_ALT,
+  CTR_ALT_SHIFT,
   OS_CTRL,
   OS_WIN,
 
   TILD_BLOCK,
+  ALL_BEST,
+  AT_EMAIL,
+  BRACES,
+  DASHES,
+  PARENTHS,
+  STARS,
+  QUOTES,
+  QUOTES_RU,
+
   ADMINS,
   PRESCRIPTION,
   FOURS,
-  
+
   G_ADD,
   G_BRCH,
   G_C,
-  G_CHEC,	
+  G_CHEC,
   G_COMM,
   G_DEV,
   G_DIFF,
   G_FTCH,
   G_LOG,
   G_MERG,
-  G_P,
+  G_PULL,
+  G_PUSH,
+  G_R,
+  G_RBASE,
+  G_RVERT,
   G_RST,
   G_S,
   G_STAT,
   G_STSH,
   G_SHOW,
 
+  K_CUST1,
+  K_CUST2,
+  K_CUST3,
+
+  K_SECR1,
+  K_SECR2,
+  K_SECR3,
+  K_SECR4,
+
   CTL_ALT_START,
   CTL_ALT_END = CTL_ALT_START + 0xff,
 
diff --git a/users/art/art_user_config.h.example b/users/art/art_user_config.h.example
new file mode 100644
index 0000000000..b523867259
--- /dev/null
+++ b/users/art/art_user_config.h.example
@@ -0,0 +1,7 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define SPLIT75_SETUP_FOR_PUBLIC_USE_BY_DEFAULT true
+#define WORKMAN_TO_QWERTY_HW_MAPPING false
+
+#define lang_switch_combo SS_LGUI(SS_TAP(X_Z))
\ No newline at end of file
diff --git a/users/art/config.h b/users/art/config.h
index 72419ff376..78c7851c65 100644
--- a/users/art/config.h
+++ b/users/art/config.h
@@ -1,4 +1,14 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #undef TAPPING_TOGGLE
 #define TAPPING_TOGGLE 2
+
+#define COMBO_SHOULD_TRIGGER
+
+// saving space
+#define LAYER_STATE_16BIT // remove if using more than 16 layers
+#define NO_ACTION_ONESHOT
+#define NO_MUSIC_MODE
\ No newline at end of file
diff --git a/users/art/custom_definitions.h.example b/users/art/custom_definitions.h.example
new file mode 100644
index 0000000000..b15d3d5e6d
--- /dev/null
+++ b/users/art/custom_definitions.h.example
@@ -0,0 +1,8 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+static char * custom[] = {
+  "",
+  "",
+  ""
+};
\ No newline at end of file
diff --git a/users/art/funcs/led_funcs.c b/users/art/funcs/led_funcs.c
new file mode 100644
index 0000000000..873836d368
--- /dev/null
+++ b/users/art/funcs/led_funcs.c
@@ -0,0 +1,55 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "led_funcs.h"
+
+bool hw_caps_on;
+
+__attribute__ ((weak)) void num_led_on(void) {}
+__attribute__ ((weak)) void num_led_off(void) {}
+__attribute__ ((weak)) void caps_led_on(void) {}
+__attribute__ ((weak)) void caps_led_off(void) {}
+__attribute__ ((weak)) void scroll_led_on(void) {}
+__attribute__ ((weak)) void scroll_led_off(void) {}
+
+void toggle_leds(int leds) {
+  if (NUM_LED_ON & leds) {
+    num_led_on();
+  } else {
+    num_led_off();
+  }
+  if (SCROLL_LED_ON & leds) {
+    scroll_led_on();
+  } else {
+    scroll_led_off();
+  }
+}
+
+bool led_update_user(led_t led_state) {
+  // only use caps LED - ignore Num & Scroll
+  if (led_state.caps_lock) {
+    caps_led_on();
+  } else {
+    caps_led_off();
+  }
+
+  hw_caps_on = led_state.caps_lock;
+  return false; // 'false' prevents led_update_kb from firing
+}
+
+void blink_leds(int leds) {
+  for (int i = 0; i < 3; i++) {
+    toggle_leds(leds);
+    wait_ms(BLINKING_INTERVAL);
+    toggle_leds(ALL_OFF);
+    wait_ms(BLINKING_INTERVAL);
+  }
+}
+
+void led_show_variable_status(bool value) {
+  if (value) {
+    blink_leds(NUM_LED_ON);
+  } else {
+    blink_leds(SCROLL_LED_ON);
+  }
+}
\ No newline at end of file
diff --git a/users/art/funcs/led_funcs.h b/users/art/funcs/led_funcs.h
new file mode 100644
index 0000000000..65d2b7c155
--- /dev/null
+++ b/users/art/funcs/led_funcs.h
@@ -0,0 +1,17 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include QMK_KEYBOARD_H
+
+#define NUM_LED_ON 4
+#define SCROLL_LED_ON 1
+#define NUM_SCROLL_LED_ON 5
+#define ALL_OFF 0
+
+#define BLINKING_INTERVAL 25
+
+void toggle_leds(int leds);
+bool led_update_user(led_t led_state);
+void blink_leds(int leds);
+void led_show_variable_status(bool value);
\ No newline at end of file
diff --git a/users/art/funcs/string_funcs.c b/users/art/funcs/string_funcs.c
new file mode 100644
index 0000000000..d3a177a1b1
--- /dev/null
+++ b/users/art/funcs/string_funcs.c
@@ -0,0 +1,309 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "art.h"
+#include "string_funcs.h"
+#include "string.h"
+
+bool mac_ctrl_on;
+
+int char_to_bspace;
+int char_to_del;
+
+enum combo_events {
+  HOMEROW_UP,
+  HOMEROW_LEFT,
+  HOMEROW_RIGHT,
+  HOMEROW_DOWN,
+  HOMEROW_PREV_WORD,
+  HOMEROW_NEXT_WORD,
+  HOMEROW_HOME,
+  HOMEROW_END,
+
+  ED_F1,
+  ED_F2,
+  ED_F3,
+  ED_F4,
+  ED_F5,
+  ED_F6,
+  ED_F7,
+  ED_F8,
+  ED_F9,
+  ED_F10,
+  ED_F11,
+  ED_F12,
+  ED_PSCREEN,
+
+  ED_ENTER,
+
+  ED_CS_ENTER,
+  BSPC_LSFT_CLEAR,
+  COMBO_LENGTH
+};
+uint16_t COMBO_LEN = COMBO_LENGTH; // do not remove - needed for combos to work
+
+const uint16_t PROGMEM combo_up[] = {KC_W, KC_R, COMBO_END};
+const uint16_t PROGMEM combo_left[] = {KC_S, KC_E, COMBO_END};
+const uint16_t PROGMEM combo_right[] = {KC_F, KC_E, COMBO_END};
+const uint16_t PROGMEM combo_down[] = {KC_S, KC_F, COMBO_END};
+const uint16_t PROGMEM combo_prev_word[] = {KC_S, KC_LCTRL, COMBO_END};
+const uint16_t PROGMEM combo_next_word[] = {KC_F, KC_LCTRL, COMBO_END};
+const uint16_t PROGMEM combo_end[] = {KC_W, KC_E, COMBO_END};
+const uint16_t PROGMEM combo_home[] = {KC_E, KC_R, COMBO_END};
+
+const uint16_t PROGMEM combo_enter[] = {KC_BSPC, KC_INS, COMBO_END};
+
+const uint16_t PROGMEM combo_f1[] = {KC_1, KC_Q, COMBO_END};
+const uint16_t PROGMEM combo_f2[] = {KC_2, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_f3[] = {KC_3, KC_E, COMBO_END};
+const uint16_t PROGMEM combo_f4[] = {KC_4, KC_R, COMBO_END};
+const uint16_t PROGMEM combo_f5[] = {KC_5, KC_T, COMBO_END};
+const uint16_t PROGMEM combo_f6[] = {KC_6, KC_Y, COMBO_END};
+const uint16_t PROGMEM combo_f7[] = {KC_7, KC_U, COMBO_END};
+const uint16_t PROGMEM combo_f8[] = {KC_8, KC_I, COMBO_END};
+const uint16_t PROGMEM combo_f9[] = {KC_9, KC_O, COMBO_END};
+const uint16_t PROGMEM combo_f10[] = {KC_0, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_f11[] = {LT(GIT,KC_SLSH), KC_RSFT, COMBO_END};
+const uint16_t PROGMEM combo_f12[] = {KC_RALT, KC_RCTRL, COMBO_END};
+const uint16_t PROGMEM combo_pscreen[] = {TO(WORKMAN), KC_RALT, COMBO_END};
+
+const uint16_t PROGMEM done_sm[] = {KC_LEFT, KC_RIGHT, COMBO_END};
+const uint16_t PROGMEM clear_line_combo[] = {KC_BSPC, KC_LSFT, COMBO_END};
+
+combo_t key_combos[] = {
+  [HOMEROW_UP] = COMBO(combo_up, KC_UP),
+  [HOMEROW_LEFT] = COMBO(combo_left, KC_LEFT),
+  [HOMEROW_RIGHT] = COMBO(combo_right, KC_RIGHT),
+  [HOMEROW_DOWN] = COMBO(combo_down, KC_DOWN),
+  [HOMEROW_PREV_WORD] = COMBO_ACTION(combo_prev_word),
+  [HOMEROW_NEXT_WORD] = COMBO_ACTION(combo_next_word),
+  [HOMEROW_HOME] = COMBO(combo_end, KC_HOME),
+  [HOMEROW_END] = COMBO(combo_home, KC_END),
+
+  #if defined(KEYBOARD_ktec_ergodone)
+  [ED_ENTER] = COMBO(combo_enter, KC_ENTER),
+
+  [ED_F1] = COMBO(combo_f1, KC_F1),
+  [ED_F2] = COMBO(combo_f2, KC_F2),
+  [ED_F3] = COMBO(combo_f3, KC_F3),
+  [ED_F4] = COMBO(combo_f4, KC_F4),
+  [ED_F5] = COMBO(combo_f5, KC_F5),
+  [ED_F6] = COMBO(combo_f6, KC_F6),
+  [ED_F7] = COMBO(combo_f7, KC_F7),
+  [ED_F8] = COMBO(combo_f8, KC_F8),
+  [ED_F9] = COMBO(combo_f9, KC_F9),
+  [ED_F10] = COMBO(combo_f10, KC_F10),
+  [ED_F11] = COMBO(combo_f11, KC_F11),
+  [ED_F12] = COMBO(combo_f12, KC_F12),
+  [ED_PSCREEN] = COMBO(combo_pscreen, KC_PSCREEN),
+
+  [ED_CS_ENTER] = COMBO_ACTION(done_sm),
+  #endif
+
+  [BSPC_LSFT_CLEAR] = COMBO_ACTION(clear_line_combo),
+};
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    switch(combo_index) {
+      case HOMEROW_PREV_WORD:
+        if (pressed) {
+          if (is_win) {
+            tap_code16(C(KC_LEFT));
+          } else {
+            tap_code16(A(KC_LEFT));
+          }
+        }
+        break;
+      case HOMEROW_NEXT_WORD:
+        if (pressed) {
+          if (is_win) {
+            tap_code16(C(KC_RIGHT));
+          } else {
+            tap_code16(A(KC_RIGHT));
+          }
+        }
+        break; 
+      case BSPC_LSFT_CLEAR:
+        if (pressed) {
+          tap_code16(KC_END);
+          tap_code16(S(KC_HOME));
+          tap_code16(KC_BSPC);
+        }
+        break;
+      case ED_CS_ENTER:
+        if (pressed) {
+          tap_code16(C(S(KC_ENTER)));
+        }
+        break;        
+    }
+}
+
+bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
+  return !layer_state_is(BASE);
+}
+
+bool is_mac_with_base_layer_off(void) {
+  return !is_win && !layer_state_is(BASE);
+}
+
+void switch_lang(void) {
+  if (is_win) {
+    SEND_STRING(SS_LALT(SS_TAP(X_LSFT)));
+  } else {
+    send_string(lang_switch_combo);
+    wait_ms(10);
+  }
+}
+
+void press_n_times(int times, uint16_t key) {
+  for (int i=0; i<times; i++) {
+    // wait_ms(TYPING_INTERVAL);
+    tap_code16(key);
+  }
+}
+
+
+bool handle_del_bspace(void) {
+  if (char_to_bspace > 1 || char_to_del > 0) {
+    layer_off(GIT_C);
+    layer_off(GIT_R);
+    layer_off(GIT_S);
+
+    press_n_times(char_to_bspace, KC_BSPACE);
+    char_to_bspace = 1;
+    press_n_times(char_to_del, KC_DEL);
+    char_to_del = 0;
+
+    return false;
+  }
+
+  if (is_mac_with_base_layer_off()) {
+    uint8_t mod_state = get_mods() & MOD_MASK_CTRL;
+    if (get_mods() & mod_state) {
+      del_mods(mod_state);
+      add_mods(MOD_LALT);
+      mac_ctrl_on = true;
+    }
+  }
+  return true;
+}
+
+void send_string_with_translation(char *string) {
+  #if WORKMAN_TO_QWERTY_HW_MAPPING
+  if (layer_state_is(WORKMAN)) {
+    int isUpperCase = 0;
+    for (int i = 0; i < strlen(string); i++) {
+      char toPrint = string[i];
+      if (isupper(toPrint)) {
+        if (toPrint == 'P') {
+          SEND_STRING(":");
+          continue;
+        }
+
+        isUpperCase = 1;
+        toPrint = tolower(toPrint);
+      }
+      switch (toPrint) {
+        case ':':
+          toPrint = 'I';
+          break;
+
+        case 'w':
+          toPrint = 'd';
+          break; 
+        case 'e':
+          toPrint = 'r';
+          break; 
+        case 'r':
+          toPrint = 'w';
+          break; 
+        case 't':
+          toPrint = 'b';
+          break; 
+        case 'y':
+          toPrint = 'j';
+          break; 
+        case 'u':
+          toPrint = 'f';
+          break; 
+        case 'i':
+          toPrint = 'u';
+          break; 
+        case 'o':
+          toPrint = 'p';
+          break; 
+        case 'p':
+          toPrint = ';';
+          break; 
+
+        case 'd':
+          toPrint = 'h';
+          break; 
+        case 'f':
+          toPrint = 't';
+          break; 
+        case 'h':
+          toPrint = 'y';
+          break; 
+        case 'j':
+          toPrint = 'n';
+          break; 
+        case 'k':
+          toPrint = 'e';
+          break; 
+        case 'l':
+          toPrint = 'o';
+          break; 
+        case ';':
+          toPrint = 'i';
+          break; 
+
+        case 'b':
+          toPrint = 'm';
+          break; 
+        case 'n':
+          toPrint = 'k';
+          break; 
+        case 'm':
+          toPrint = 'l';
+          break; 
+      }
+      if (isUpperCase) {
+        isUpperCase = 0;
+        toPrint = toupper(toPrint);
+      }
+      send_char(toPrint);
+    }
+  } else {
+    send_string(string);
+  }
+  #else
+  send_string(string);
+  #endif
+}
+
+void send_string_remembering_length(char *string) {
+  send_string_with_translation(string);
+  char_to_bspace = strlen(string);
+}
+
+void send_shifted_strings(char *string1, char *string2) {
+  if (get_mods() & MOD_MASK_SHIFT) {
+    clear_mods();
+    send_string_remembering_length(string2);
+  } else {
+    send_string_remembering_length(string1);
+  }
+}
+
+void send_shifted_strings_add(char *string1, char *string2) {
+  bool shifted = get_mods() & MOD_MASK_SHIFT;
+  clear_mods();
+
+  send_string_remembering_length(string1);
+
+  if (shifted) {
+    send_string(string2);
+    char_to_bspace = strlen(string1) + strlen(string2);
+  }
+}
\ No newline at end of file
diff --git a/users/art/funcs/string_funcs.h b/users/art/funcs/string_funcs.h
new file mode 100644
index 0000000000..6d0c424245
--- /dev/null
+++ b/users/art/funcs/string_funcs.h
@@ -0,0 +1,14 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include QMK_KEYBOARD_H
+
+bool is_mac_with_base_layer_off(void);
+void switch_lang(void);
+void press_n_times(int times, uint16_t key);
+bool handle_del_bspace(void);
+void send_string_with_translation(char *string);
+void send_string_remembering_length(char *string);
+void send_shifted_strings(char *string1, char *string2);
+void send_shifted_strings_add(char *string1, char *string2);
\ No newline at end of file
diff --git a/users/art/rules.mk b/users/art/rules.mk
index 2b701eb949..9bf4d167fc 100644
--- a/users/art/rules.mk
+++ b/users/art/rules.mk
@@ -1 +1,15 @@
-SRC += art.c
\ No newline at end of file
+SRC += art.c
+SRC += funcs/led_funcs.c
+SRC += funcs/string_funcs.c
+
+COMBO_ENABLE = yes
+
+# saving space
+COMMAND_ENABLE = no
+CONSOLE_ENABLE = no
+GRAVE_ESC_ENABLE = no 
+LTO_ENABLE = yes
+MAGIC_ENABLE = no
+# MOUSEKEY_ENABLE = no
+MUSIC_ENABLE = no
+SPACE_CADET_ENABLE = no
\ No newline at end of file
diff --git a/users/art/secr.h.example b/users/art/secr.h.example
new file mode 100644
index 0000000000..468943fad2
--- /dev/null
+++ b/users/art/secr.h.example
@@ -0,0 +1,9 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+static char * secrets[] = {
+  "",
+  "",
+  "",
+  ""
+};
\ No newline at end of file

From 2dadbbf04deac73309f740c06b9fae0c01d07f3c Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 10 Oct 2022 01:09:15 -0700
Subject: [PATCH 605/959] Vertex AngleR2 Layout Refactor (#18661)

---
 keyboards/vertex/angler2/angler2.h            | 176 +++-
 keyboards/vertex/angler2/info.json            | 821 +++++++++++++++++-
 .../vertex/angler2/keymaps/default/keymap.c   |  33 +-
 keyboards/vertex/angler2/keymaps/via/keymap.c |  66 +-
 keyboards/vertex/angler2/readme.md            |   4 +-
 5 files changed, 1018 insertions(+), 82 deletions(-)

diff --git a/keyboards/vertex/angler2/angler2.h b/keyboards/vertex/angler2/angler2.h
index 68f9d9f5ab..04293a2fe6 100644
--- a/keyboards/vertex/angler2/angler2.h
+++ b/keyboards/vertex/angler2/angler2.h
@@ -19,18 +19,170 @@
 #include "quantum.h"
 
 #define XXX KC_NO
+
+/*
+ *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │3E │ Standard
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │3E │ F13 Row
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+ *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │3F │
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤      ┌─────┐
+ *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │4D │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘   ┌──┴┐3D  │ ISO Enter
+ *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                 │3C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐       └───┴────┘
+ * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C        │     │4F │
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+ *              │50  │51  │52  │56                      │5A  │5B  │5C  │5D  │ │5E │5F │4E │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_all( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C, K4D, K4F, \
-  K50, K51, K52,                K56,           K5A, K5B, K5C, K5D, K5E, K5F, K4E  \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
+  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
 ) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F}, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F}, \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_ansi( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_ansi_tsangan( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_iso( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
+  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_iso_tsangan( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
+  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_ansi( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_ansi_tsangan( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_iso( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
+  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_iso_tsangan( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
+  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
 }
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 70feae3b64..0580cef82e 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -2,12 +2,22 @@
     "keyboard_name": "Angler2",
     "manufacturer": "Vertex_eason",
     "url": "https://github.com/Vertex-kb",
-    "maintainer": "vertex",
+    "maintainer": "Vertex-kb",
     "usb": {
         "vid": "0x480E",
         "pid": "0x408F",
         "device_version": "0.0.1"
     },
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_tsangan",
+        "tkl_iso",
+        "tkl_iso_tsangan",
+        "tkl_f13_ansi",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_iso",
+        "tkl_f13_iso_tsangan"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -28,6 +38,7 @@
                 { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
                 { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
                 { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
                 { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
                 { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
                 { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
@@ -41,11 +52,12 @@
                 { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
                 { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
                 { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5,"w":2},
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
                 { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
                 { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
                 { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-                { "label": "K20 (F0,F5)", "x": 0,"y":2.5,"w":1.5},
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
                 { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
                 { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
                 { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
@@ -58,14 +70,15 @@
                 { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
                 { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
                 { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5,"w":1.5},
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
                 { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
                 { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
                 { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5,"w":1.75},
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
                 { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
                 { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5  },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
                 { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
                 { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
                 { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
@@ -75,8 +88,9 @@
                 { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
                 { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
                 { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 13.75, "y": 3.5,"w":1.25 },
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5,"w":1.25},
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 3.5, "w": 1.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
                 { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
                 { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
                 { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
@@ -88,16 +102,789 @@
                 { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
                 { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
                 { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5,"w":2.75 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
                 { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5,"w":1.25 },
-                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5,"w":1.25 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5,"w":1.25 },
-                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5,"w":6.25 },
-                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5,"w":1.25 },
-                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5,"w":1.25 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5,"w":1.25 },
-                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5,"w":1.25 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
                 { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
                 { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
                 { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
diff --git a/keyboards/vertex/angler2/keymaps/default/keymap.c b/keyboards/vertex/angler2/keymaps/default/keymap.c
index ae6d76e326..b5127472ef 100644
--- a/keyboards/vertex/angler2/keymaps/default/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/default/keymap.c
@@ -18,23 +18,22 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_all(
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_NO,   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_BSLS, KC_ENT,
+        KC_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-    KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7 , KC_F8, KC_F9,  KC_F10,  KC_F11, KC_F12, KC_DEL,  KC_PSCR, KC_SLCK,KC_PAUS,
-		KC_GRV,   KC_1,   KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,  KC_NO,  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_BSLS, KC_ENT,
-		KC_LSFT, KC_SLSH, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,          KC_LSFT,             KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                     KC_LALT, MO(1),   KC_APP, KC_RCTL,    KC_LEFT, KC_DOWN,KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_TOG, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
 
 };
diff --git a/keyboards/vertex/angler2/keymaps/via/keymap.c b/keyboards/vertex/angler2/keymaps/via/keymap.c
index 03c46eee3a..ec171be29b 100644
--- a/keyboards/vertex/angler2/keymaps/via/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/via/keymap.c
@@ -18,42 +18,40 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_all(
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_NO,   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_BSLS, KC_ENT,
+        KC_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-    KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7 , KC_F8, KC_F9,  KC_F10,  KC_F11, KC_F12,   KC_DEL,  KC_PSCR, KC_SLCK,KC_PAUS,
-    KC_GRV,   KC_1,   KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,  KC_NO,  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_BSLS, KC_ENT,
-    KC_LSFT, KC_SLSH, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,          KC_LSFT,             KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                     KC_LALT, MO(1),   KC_APP, KC_RCTL,    KC_LEFT, KC_DOWN,KC_RGHT
-  ),
-  [1] = LAYOUT_all(
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_TOG, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
 
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
-  [2] = LAYOUT_all(
-
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
-  [3] = LAYOUT_all(
-
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
+    [2] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
 
+    [3] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
 
 };
diff --git a/keyboards/vertex/angler2/readme.md b/keyboards/vertex/angler2/readme.md
index e3de551e37..27147bfe06 100644
--- a/keyboards/vertex/angler2/readme.md
+++ b/keyboards/vertex/angler2/readme.md
@@ -1,4 +1,4 @@
-# angler2
+# AngleR2
 A customizable soldering 80% keyboard.
 
 * Keyboard Maintainer: [Vertex](https://github.com/Vertex-kb)
@@ -7,7 +7,7 @@ A customizable soldering 80% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make Vertex/AngleR2:default
+    make vertex/angler2: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).
 

From 46fe3b0cf562ff4b62b9a2f50598976ca02e2e2b Mon Sep 17 00:00:00 2001
From: Andy Tsai <cgmandy@gmail.com>
Date: Mon, 10 Oct 2022 01:37:25 -0700
Subject: [PATCH 606/959] [Keyboard] Add hardwareabstraction/handwire Board 
 (#18504)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Tom Barnes <barnestom@me.com>
---
 .../hardwareabstraction/handwire/config.h     |  11 +
 .../hardwareabstraction/handwire/handwire.c   | 298 ++++++++++++++++++
 .../hardwareabstraction/handwire/info.json    | 102 ++++++
 .../handwire/keymaps/default/keymap.c         |  63 ++++
 .../handwire/keymaps/via/keymap.c             |  63 ++++
 .../handwire/keymaps/via/rules.mk             |   2 +
 .../hardwareabstraction/handwire/readme.md    |  27 ++
 .../hardwareabstraction/handwire/rules.mk     |   8 +
 8 files changed, 574 insertions(+)
 create mode 100644 keyboards/hardwareabstraction/handwire/config.h
 create mode 100644 keyboards/hardwareabstraction/handwire/handwire.c
 create mode 100644 keyboards/hardwareabstraction/handwire/info.json
 create mode 100644 keyboards/hardwareabstraction/handwire/keymaps/default/keymap.c
 create mode 100644 keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c
 create mode 100644 keyboards/hardwareabstraction/handwire/keymaps/via/rules.mk
 create mode 100644 keyboards/hardwareabstraction/handwire/readme.md
 create mode 100644 keyboards/hardwareabstraction/handwire/rules.mk

diff --git a/keyboards/hardwareabstraction/handwire/config.h b/keyboards/hardwareabstraction/handwire/config.h
new file mode 100644
index 0000000000..b8b96eb5ac
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/config.h
@@ -0,0 +1,11 @@
+// Copyright 2022 Andy Tsai (@atsai)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef HAPTIC_ENABLE
+#define SOLENOID_PIN E6
+#endif
+
+#define BUZZER_ENABLE
+#define BUZZER_PIN B2
diff --git a/keyboards/hardwareabstraction/handwire/handwire.c b/keyboards/hardwareabstraction/handwire/handwire.c
new file mode 100644
index 0000000000..61a233d120
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/handwire.c
@@ -0,0 +1,298 @@
+// Copyright 2022 Andy Tsai (@atsai)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+static uint16_t buzzer_timer = 0;
+static uint8_t buzzer_dwell = 15;
+static uint8_t buzzer_dwell_change = 1;
+static bool buzzer_on = false;
+static bool buzzer_active = false;
+
+static bool initial_keypress = false;
+
+enum custom_keycodes{
+    #ifdef VIA_ENABLE
+    KC_HPTON = USER00,
+    #else
+    KC_HPTON = SAFE_RANGE,
+    #endif
+    KC_HPTOFF,
+    KC_HPTTOG,
+    KC_HPTRST,
+    KC_HPTFBK,
+    KC_HPTCONT,
+    KC_HPTDWLI,
+    KC_HPTDWLD,
+    KC_BZTOG,
+    KC_BZRST,
+    KC_BZDWLI,
+    KC_BZDWLD
+};
+
+// Documentation: custom_quantum_functions.md
+void keyboard_post_init_kb(void){
+    setPinOutput(BUZZER_PIN);
+    keyboard_post_init_user();
+}
+
+void housekeeping_task_kb(void){
+    if(buzzer_on){
+        if(buzzer_active && timer_elapsed(buzzer_timer) > buzzer_dwell){
+        buzzer_active = false;
+        writePinLow(BUZZER_PIN);
+        }
+    }
+    housekeeping_task_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed){                         // true when pressed, false when released
+        initial_keypress = true;
+
+        if(buzzer_on){
+            if(!buzzer_active){
+                buzzer_active = true;
+                buzzer_timer = timer_read();
+                writePinHigh(BUZZER_PIN);
+            }
+        }
+
+        switch (keycode) {
+            #ifdef HAPTIC_ENABLE
+            case KC_HPTON:
+                haptic_enable();
+                break;
+
+            case KC_HPTOFF:
+                haptic_disable();
+                break;
+
+            case KC_HPTTOG:
+                haptic_toggle();
+                break;
+
+            case KC_HPTRST:
+                haptic_reset();
+                break;
+
+            case KC_HPTFBK:
+                haptic_feedback_toggle();
+                break;
+
+            case KC_HPTCONT:
+                haptic_toggle_continuous();
+                break;
+
+            case KC_HPTDWLI:
+                haptic_dwell_increase();
+                break;
+
+            case KC_HPTDWLD:
+                haptic_dwell_decrease();
+                break;
+            #endif
+
+            case KC_BZTOG:
+                buzzer_on = !buzzer_on;
+                if(buzzer_on == true){
+                    buzzer_active = true;
+                    buzzer_timer = timer_read();
+                    writePinHigh(BUZZER_PIN);
+                }
+                else{
+                    writePinLow(BUZZER_PIN);
+                }
+                break;
+
+            case KC_BZRST:
+                buzzer_dwell = 12;
+                break;
+
+            case KC_BZDWLI:
+                buzzer_dwell += buzzer_dwell_change;
+                break;
+
+            case KC_BZDWLD:
+                if(buzzer_dwell - buzzer_dwell_change > 1){
+                    buzzer_dwell -= buzzer_dwell_change;
+                }
+                break;
+        }
+    }
+    return process_record_user(keycode, record);
+}
+
+#ifdef OLED_ENABLE
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 20   // Idle WPM
+
+// #define PREP_FRAMES 1
+
+#define TAP_FRAMES 2
+#define TAP_SPEED 40    // Move Bongo Cat WPM
+
+#define ANIM_FRAME_DURATION 200  // How long each frame lasts in ms
+#define ANIM_SIZE 550  // Number of bytes in array, minimize for adequate firmware size, max is 1024
+
+// Variables for display layer and haptic status on OLED
+static uint8_t layer = 0;
+haptic_config_t haptic_config;
+
+// Variables for frames, timer, and sleep
+uint32_t anim_timer         = 0;
+uint32_t anim_sleep         = 0;
+uint8_t  current_idle_frame = 0;
+// uint8_t  current_prep_frame = 0;
+uint8_t current_tap_frame   = 0;
+
+// 5 idle frames, 1 prep frame, and 2 tap frames
+
+static const char PROGMEM startup_screen[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x0e,
+	0x1e, 0x78, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0x9e, 0x8f, 0x83, 0xc0, 0xf0,
+	0x78, 0x10, 0x01, 0x07, 0x1f, 0x3c, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x60, 0x78, 0x3c, 0x0f, 0x07, 0x01, 0x61, 0x79, 0x3f, 0x0f, 0x03, 0x01,
+	0x00, 0x0c, 0x0c, 0x0c, 0x3c, 0x78, 0x60, 0x63, 0x6f, 0x7e, 0x78, 0x60, 0x40, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+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},
+    };
+
+    void animation_phase(void) {
+        if (get_current_wpm() <= IDLE_SPEED) {          // Idle edge case
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+        }
+        else if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {     // Prep frame
+            // 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
+        }
+        else 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){       // Check for typing
+        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){         // Check timer for OLED timeout
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+// Used to display current layer number on OLED
+layer_state_t layer_state_set_kb(layer_state_t state){
+    layer = get_highest_layer(state);
+    return layer_state_set_user(state);
+}
+
+// Initialize code to rotate the OLED 180 degrees
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {    // _user handled by default
+    return OLED_ROTATION_180;  // Flip for headers on right side
+}
+
+// OLED Task
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }              // Process _user OLED instead of _kb
+    // Host Keyboard Layer Status
+    if(initial_keypress){
+        render_anim();                                    // Render the animation phases
+
+        // Display WPM
+        oled_set_cursor(0, 0);                            // Sets cursor to (column, row) using charactar spacing (5 rows on 128x32 screen, anything more will overflow back to the top)
+        oled_write_P(PSTR("WPM:"), false);
+        oled_write(get_u8_str(get_current_wpm(), '0'), false);
+
+        // Display Current Layer
+        oled_set_cursor(16, 0);
+        oled_write_P(PSTR("L:"), false);
+        oled_write(get_u8_str(layer, ' '), false);
+
+        // Display Buzzer State
+        oled_set_cursor(0, 1);
+        if(buzzer_on == true){
+            oled_write("BZ:ON", false);
+        } else{
+            oled_write("BZ:OFF", false);
+        }
+
+        // Display Haptic State
+        oled_set_cursor(0, 2);
+        if(haptic_config.enable == true){
+            oled_write("HP:ON", false);
+        } else{
+            oled_write("HP:OFF", false);
+        }
+    }
+    else{
+        oled_write_raw_P(startup_screen, sizeof(startup_screen));
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/info.json
new file mode 100644
index 0000000000..8d11f6cd76
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/info.json
@@ -0,0 +1,102 @@
+{
+    "manufacturer": "Hardware Abstraction",
+    "keyboard_name": "handwire",
+    "maintainer": "cgmandy",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B7", "D5", "D3", "D2"]
+    },
+
+    "processor": "atmega32u4",
+    "url": "https://github.com/cgmandy",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xAF01",
+        "pid": "0x0001"
+    },
+
+    "layouts": {
+        "LAYOUT_60_arrows": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "matrix": [3, 10], "w": 1.75, "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "x": 13, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 8], "x": 10, "y": 4 },
+                { "matrix": [4, 9], "x": 11, "y": 4 },
+                { "matrix": [4, 10], "x": 12, "y": 4 },
+                { "matrix": [4, 12], "x": 13, "y": 4 },
+                { "matrix": [4, 13], "x": 14, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/hardwareabstraction/handwire/keymaps/default/keymap.c b/keyboards/hardwareabstraction/handwire/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e812b882d5
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+// Copyright 2022 Andy Tsai (@atsai)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes{
+    KC_HPTON = SAFE_RANGE,
+    KC_HPTOFF,
+    KC_HPTTOG,
+    KC_HPTRST,
+    KC_HPTFBK,
+    KC_HPTCONT,
+    KC_HPTDWLI,
+    KC_HPTDWLD,
+    KC_BZTOG,
+    KC_BZRST,
+    KC_BZDWLI,
+    KC_BZDWLD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────────┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backspa│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+     * │ 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 │ , │ . │ / │ UP  │ TOG │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬─────┤
+     * │Ctrl│GUI │Alt │                        │Alt │Left│Down│Right│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴─────┘
+     */
+    [0] = LAYOUT_60_arrows(
+        KC_ESC,  KC_1,    KC_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,  MT(MOD_LSFT, KC_SLSH), KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_APP, KC_LEFT,  KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_60_arrows(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_BZDWLD, KC_BZDWLI,  KC_BZTOG,
+        KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_HPTDWLD, KC_HPTDWLI,          KC_HPTTOG,
+        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     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_60_arrows(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     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_arrows(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     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/hardwareabstraction/handwire/keymaps/via/keymap.c b/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b5fcd913a9
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+// Copyright 2022 Andy Tsai (@atsai)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes{
+    KC_HPTON = USER00,
+    KC_HPTOFF,
+    KC_HPTTOG,
+    KC_HPTRST,
+    KC_HPTFBK,
+    KC_HPTCONT,
+    KC_HPTDWLI,
+    KC_HPTDWLD,
+    KC_BZTOG,
+    KC_BZRST,
+    KC_BZDWLI,
+    KC_BZDWLD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────────┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backspa│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+     * │ 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 │ , │ . │ / │ UP  │ TOG │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬─────┤
+     * │Ctrl│GUI │Alt │                        │Alt │Left│Down│Right│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴─────┘
+     */
+    [0] = LAYOUT_60_arrows(
+        KC_ESC,  KC_1,    KC_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,  MT(MOD_LSFT, KC_SLSH), KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_APP, KC_LEFT,  KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_60_arrows(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_BZDWLD, KC_BZDWLI,  KC_BZTOG,
+        KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_HPTDWLD, KC_HPTDWLI,          KC_HPTTOG,
+        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     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_60_arrows(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     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_arrows(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     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/hardwareabstraction/handwire/keymaps/via/rules.mk b/keyboards/hardwareabstraction/handwire/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/hardwareabstraction/handwire/readme.md b/keyboards/hardwareabstraction/handwire/readme.md
new file mode 100644
index 0000000000..0ba8940e50
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/readme.md
@@ -0,0 +1,27 @@
+# Hardware Abstraction Handwire
+
+![handwire](https://i.imgur.com/PK5HfM3h.jpg)
+
+A hotswap 60% keyboard with an arrow key cluster. Board features support for an OLED screen, push pull solenoid, and an active buzzer. 
+
+* Keyboard Maintainer: [Andy Tsai](https://github.com/cgmandy)
+* Hardware Supported: ATMEGA32U4, Push-Pull Solenoid, Active Buzzer, SSD1306 128x32 OLED
+* Hardware Availability: https://hardwareabstraction.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hardwareabstraction/handwire:default
+
+Flashing example for this keyboard:
+
+    make hardwareabstraction/handwire:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the top left side of the PCB. You can alternatively short the two pads vertically with a pair of tweezers. 
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. This can be configured in VIA or on the QMK configurator. 
diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk
new file mode 100644
index 0000000000..d782fba2a8
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/rules.mk
@@ -0,0 +1,8 @@
+LTO_ENABLE = yes
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER += SOLENOID
+
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+
+WPM_ENABLE = yes

From c6f1b594a2085e67219bd5f0f7ba7898429d331c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 11 Oct 2022 06:06:26 +1100
Subject: [PATCH 607/959] Remove legacy keycodes, part 2 (#18660)

* `KC_SYSREQ` -> `KC_SYRQ`

And one `KC_ALT_ERASE` -> `KC_ERAS`

* `KC_NONUS_BSLASH` -> `KC_NUBS`

* `KC_NUMLOCK` -> `KC_NUM`

* `KC_CLCK` -> `KC_CAPS`

* `KC_SCROLLLOCK` -> `KC_SCRL`

* `KC_LBRACKET` -> `KC_LBRC`

* `KC_RBRACKET` -> `KC_RBRC`

* `KC_CAPSLOCK` -> `KC_CAPS`
---
 .../10bleoledhub/keymaps/default/keymap.c     |  2 +-
 keyboards/10bleoledhub/keymaps/via/keymap.c   |  2 +-
 .../gherkin/keymaps/stevexyz/config.h         |  2 +-
 .../gherkin/keymaps/stevexyz/keymap.c         |  2 +-
 .../mf68/keymaps/68keys/keymap.c              |  2 +-
 keyboards/abacus/keymaps/default/keymap.json  |  2 +-
 keyboards/abacus/keymaps/unicodemap/keymap.c  |  2 +-
 .../atreus/keymaps/dvorak_42_key/keymap.c     |  4 ++--
 .../charybdis/3x5/keymaps/via/keymap.c        |  2 +-
 keyboards/bioi/g60/keymaps/default/keymap.c   |  4 ++--
 keyboards/bioi/g60/keymaps/via/keymap.c       |  4 ++--
 .../bioi/morgan65/keymaps/default/keymap.c    |  4 ++--
 keyboards/bioi/morgan65/keymaps/via/keymap.c  |  4 ++--
 .../manibus/keymaps/default/keymap.c          |  2 +-
 keyboards/bobpad/keymaps/default/keymap.c     |  4 ++--
 .../ghost_squid/keymaps/default/keymap.c      |  2 +-
 .../hid_liber/keymaps/bakageta/keymap.c       |  2 +-
 .../kitten_paw/keymaps/ickerwx/keymap.c       |  2 +-
 .../pegasushoof/keymaps/default/keymap.c      |  2 +-
 .../chavdai40/keymaps/42keys-dvorak/keymap.c  |  2 +-
 .../chavdai40/keymaps/42keys-eucalyn/keymap.c |  2 +-
 .../chavdai40/keymaps/42keys-qwerty/keymap.c  |  2 +-
 .../chavdai40/keymaps/44keys-dvorak/keymap.c  |  2 +-
 .../chavdai40/keymaps/44keys-eucalyn/keymap.c |  2 +-
 .../chavdai40/keymaps/44keys-qwerty/keymap.c  |  2 +-
 keyboards/chavdai40/keymaps/default/keymap.c  |  2 +-
 .../quark/keymaps/ajp10304/keymap.c           | 16 ++++++-------
 keyboards/contra/keymaps/alper/keymap.c       |  2 +-
 .../contra/keymaps/basic_qwerty/keymap.c      |  2 +-
 keyboards/contra/keymaps/maxr1998/keymap.c    |  4 ++--
 keyboards/contra/keymaps/ryanm101/keymap.c    | 16 ++++++-------
 .../modelm_ssk/keymaps/default/keymap.c       |  4 ++--
 .../modelm_ssk/keymaps/tiltowait/keymap.c     |  4 ++--
 keyboards/crkbd/keymaps/ardakilic/keymap.c    |  4 ++--
 keyboards/crkbd/keymaps/nimishgautam/keymap.c |  4 ++--
 keyboards/crkbd/keymaps/rpbaptist/keymap.c    |  4 ++--
 keyboards/crkbd/keymaps/soundmonster/keymap.c |  2 +-
 keyboards/crkbd/keymaps/toinux/keymap.c       |  2 +-
 .../deltasplit75/keymaps/mbsurfer/keymap.c    |  2 +-
 .../budget96/keymaps/donut/keymap.c           |  2 +-
 keyboards/dz60/keymaps/crd_2u_lshift/keymap.c |  8 +++----
 keyboards/dz60/keymaps/jdelkins/keymap.c      | 10 ++++----
 keyboards/dz60/keymaps/macos_64/keymap.c      |  2 +-
 .../dz60/keymaps/marianas/keyDefinitions.h    |  4 ++--
 keyboards/dz60/keymaps/marianas/keymap.c      |  2 +-
 keyboards/dz60/keymaps/pinpox/keymap.c        | 10 ++++----
 keyboards/dz60/keymaps/zepol_layout/keymap.c  |  2 +-
 .../dztech/dz65rgb/keymaps/yuannan/keymap.c   |  6 ++---
 .../e80_1800/keymaps/ansi_6u/keymap.c         |  2 +-
 .../e80_1800/keymaps/ansi_7u/keymap.c         |  2 +-
 .../e80_1800/keymaps/default/keymap.c         |  2 +-
 .../ebastler/e80_1800/keymaps/iso_6u/keymap.c |  2 +-
 .../ebastler/e80_1800/keymaps/iso_7u/keymap.c |  2 +-
 .../ebastler/e80_1800/keymaps/via/keymap.c    |  2 +-
 .../keymaps/bpruitt-goddard/keymap.c          |  6 ++---
 .../ergodox_ez/keymaps/danielo515/keymap.c    |  6 ++---
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c |  4 ++--
 .../keymaps/hacker_dvorak/hacker_dvorak.c     |  6 ++---
 .../hacker_dvorak/user/process_record_user.c  |  2 +-
 keyboards/ergodox_ez/keymaps/lukaus/keymap.c  | 10 ++++----
 .../keymaps/nathanvercaemert/keymap.c         |  4 ++--
 keyboards/ergodox_ez/keymaps/nfriend/keymap.c |  2 +-
 keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c |  2 +-
 keyboards/ergodox_ez/keymaps/rmw/keymap-win.c |  2 +-
 keyboards/ergodox_ez/keymaps/stamm/keymap.c   |  8 +++----
 keyboards/ergodox_ez/keymaps/testing/keymap.c |  4 ++--
 .../util/keymap_beautifier/README.md          | 12 +++++-----
 .../ergodox_stm32/keymaps/default/keymap.c    |  6 ++---
 .../flygone60/rev3/keymaps/default/keymap.c   |  4 ++--
 keyboards/flygone60/rev3/keymaps/via/keymap.c |  4 ++--
 .../butterstick/keymaps/dennytom/keymap.c     | 12 +++++-----
 .../gboards/georgi/keymaps/dennytom/keymap.c  |  4 ++--
 keyboards/gh60/revc/keymaps/emiilsd/keymap.c  |  2 +-
 .../gh60/satan/keymaps/dende_iso/keymap.c     |  2 +-
 .../chimera_ls/keymaps/default/keymap.c       |  8 +++----
 .../chimera_ortho/keymaps/default/keymap.c    |  8 +++----
 .../gorthage_truck/keymaps/default/keymap.c   |  2 +-
 .../aranck/keymaps/turkishish/keymap.c        |  6 ++---
 .../atreus50/keymaps/ajp10304/keymap.c        | 16 ++++++-------
 .../concertina/64key/keymaps/default/config.h |  8 +++----
 .../4x5/keymaps/ibnuda/keymap.c               |  2 +-
 .../dactyl_manuform/5x6/keymaps/uqs/keymap.c  |  2 +-
 .../6x6/keymaps/happysalada/keymap.c          |  2 +-
 .../dmote/62key/keymaps/default/keymap.c      |  4 ++--
 .../heisenberg/keymaps/turkishish/keymap.c    |  6 ++---
 .../handwired/jopr/keymaps/default/keymap.c   |  4 ++--
 .../jopr/keymaps/modded_white/keymap.c        |  6 ++---
 .../ortho5x14/keymaps/default/keymap.c        |  2 +-
 .../handwired/t111/keymaps/oleg/keymap.c      | 12 +++++-----
 .../unicomp_mini_m/keymaps/default/keymap.c   |  2 +-
 .../hhkb/ansi/keymaps/shela/action_pseudo.c   |  2 +-
 keyboards/hhkb/rn42/rn42_task.c               |  6 ++---
 .../hidtech/bastyl/keymaps/nstickney/keymap.c |  2 +-
 keyboards/horizon/keymaps/default/keymap.c    |  2 +-
 .../ibnuda/squiggle/keymaps/default/keymap.c  |  2 +-
 .../squiggle/keymaps/default38/keymap.c       |  2 +-
 .../squiggle/keymaps/defaultfull/keymap.c     |  2 +-
 .../squiggle/keymaps/defaultminidox/keymap.c  |  2 +-
 .../keymaps/rick-complicated/keymap.c         |  2 +-
 .../ibnuda/squiggle/keymaps/rick/keymap.c     |  2 +-
 .../keymaps/dudeofawesome/keymap.c            | 16 ++++++-------
 .../keymaps/input_club/keymap.c               |  2 +-
 .../keymaps/nordic_ergo/keymap.c              |  2 +-
 keyboards/janus/keymaps/default/keymap.c      |  2 +-
 keyboards/jd40/keymaps/myoung34/keymap.c      |  2 +-
 .../thedogkeyboard/keymaps/default/keymap.c   |  2 +-
 .../thedogkeyboard/keymaps/kakunpc/keymap.c   |  4 ++--
 .../kbd75/keymaps/kingwangwong/keymap.c       |  2 +-
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |  2 +-
 .../keymaps/andylikescandy6x18/keymap.c       |  4 ++--
 .../iris/keymaps/jasonkrasavage/keymap.c      |  4 ++--
 .../keebio/iris/keymaps/nstickney/keymap.c    |  2 +-
 .../keebio/levinson/keymaps/numpad/keymap.c   |  8 +++----
 .../q0/rev_0130/keymaps/default/keymap.c      | 12 +++++-----
 .../keychron/q0/rev_0130/keymaps/via/keymap.c | 10 ++++----
 .../bm40hsrgb/keymaps/signynt/keymap.c        |  2 +-
 .../bm40hsrgb/keymaps/signynt_2_loud/keymap.c |  2 +-
 .../keymaps/signynt_2_quiet/keymap.c          |  2 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/config.h |  2 +-
 .../bm80hsrgb/keymaps/peepeetee/config.h      |  2 +-
 .../kprepublic/jj40/keymaps/stevexyz/config.h |  2 +-
 .../kprepublic/jj40/keymaps/stevexyz/keymap.c |  4 ++--
 .../latin64ble/keymaps/default/keymap.c       |  2 +-
 .../latin64ble/keymaps/via/keymap.c           |  2 +-
 .../latinpad/keymaps/default/keymap.c         |  2 +-
 .../latinpad/keymaps/via/keymap.c             |  2 +-
 .../latinpadble/keymaps/default/keymap.c      |  2 +-
 .../latinpadble/keymaps/via/keymap.c          |  2 +-
 .../the50/keymaps/mikethetiger/keymap.c       |  8 +++----
 keyboards/lets_split/keymaps/piemod/keymap.c  |  2 +-
 .../malevolti/lyra/keymaps/default/keymap.c   |  2 +-
 keyboards/malevolti/lyra/keymaps/via/keymap.c |  2 +-
 .../superlyra/keymaps/default/keymap.c        |  2 +-
 .../malevolti/superlyra/keymaps/via/keymap.c  |  2 +-
 .../keymaps/doxish_dvorak/keymap.c            |  2 +-
 keyboards/massdrop/alt/keymaps/b_/config.h    |  2 +-
 .../massdrop/alt/keymaps/jdelkins/keymap.c    | 12 +++++-----
 .../massdrop/alt/keymaps/jdelkins_ss/keymap.c |  2 +-
 .../massdrop/alt/keymaps/pregame/config.h     |  2 +-
 .../massdrop/ctrl/keymaps/endgame/config.h    |  2 +-
 .../ctrl/keymaps/matthewrobo/config.h         |  2 +-
 .../massdrop/ctrl/keymaps/xanimos/config.h    |  2 +-
 keyboards/mechwild/bbs/bbs.c                  |  2 +-
 .../bde/rev2/keymaps/default/keymap.c         |  2 +-
 .../mechwild/bde/rev2/keymaps/via/keymap.c    |  2 +-
 .../mercutio/keymaps/fearless_spiff/keymap.c  |  2 +-
 .../keymaps/fearless_spiff_en/keymap.c        |  4 ++--
 keyboards/mechwild/puckbuddy/puckbuddy.c      |  2 +-
 keyboards/mitosis/keymaps/nzen/keymap.c       |  6 ++---
 keyboards/mntre/keymaps/default/keymap.c      |  2 +-
 keyboards/morizon/keymaps/default/keymap.c    |  4 ++--
 keyboards/mxss/keymaps/default/keymap.c       |  2 +-
 keyboards/mxss/keymaps/via/keymap.c           |  2 +-
 keyboards/nek_type_a/keymaps/default/keymap.c |  2 +-
 .../nibble/keymaps/snailmap/keymap.c          | 10 ++++----
 keyboards/omnikeyish/omnikeyish.c             |  4 ++--
 .../planck/keymaps/andylikescandy/keymap.c    |  2 +-
 keyboards/planck/keymaps/brandon/keymap.c     |  8 +++----
 .../planck/keymaps/charlesrocket/keymap.c     |  6 ++---
 .../planck/keymaps/dr_notsokind/keymap.c      |  2 +-
 keyboards/planck/keymaps/gunp/keymap.c        |  2 +-
 keyboards/planck/keymaps/impossible/keymap.c  | 10 ++++----
 keyboards/planck/keymaps/inkwell/keymap.c     |  2 +-
 keyboards/planck/keymaps/jdelkins/keymap.c    |  8 +++----
 keyboards/planck/keymaps/navi/keymap.c        |  2 +-
 keyboards/planck/keymaps/oryx/keymap.c        |  6 ++---
 keyboards/planck/keymaps/piemod/keymap.c      |  2 +-
 keyboards/planck/keymaps/samuel/keymap.c      |  8 +++----
 keyboards/planck/keymaps/sean/keymap.c        |  8 +++----
 keyboards/planck/keymaps/tylerwince/keymap.c  |  8 +++----
 .../tnln95/keymaps/default/keymap.c           |  2 +-
 .../tnln95/keymaps/default_ansi/keymap.c      |  2 +-
 keyboards/preonic/keymaps/AlexDaigre/keymap.c |  8 +++----
 keyboards/preonic/keymaps/boy314/keymap.c     |  2 +-
 .../preonic/keymaps/laurentlaurent/keymap.c   |  4 ++--
 keyboards/preonic/keymaps/mverteuil/keymap.c  |  8 +++----
 .../preonic/keymaps/mverteuil_2x2u/keymap.c   |  8 +++----
 .../vault35/keymaps/default/keymap.c          |  2 +-
 .../vault45/keymaps/default/keymap.c          |  2 +-
 keyboards/puck/keymaps/default/keymap.c       |  2 +-
 .../wete/v1/keymaps/default/keymap.c          |  2 +-
 .../ramonimbao/wete/v1/keymaps/iso/keymap.c   |  2 +-
 .../ramonimbao/wete/v1/keymaps/jis/keymap.c   |  2 +-
 .../ramonimbao/wete/v1/keymaps/via/keymap.c   |  2 +-
 .../cocoa40/keymaps/default/keymap.c          |  2 +-
 keyboards/redox_w/keymaps/danielo515/keymap.c |  4 ++--
 .../verd/keymaps/alittlepeace/keymap.c        |  4 ++--
 keyboards/rocketboard_16/keycode_lookup.c     |  2 +-
 .../comet46/keymaps/satt/action_pseudo_lut.c  |  2 +-
 .../satt/vision/keymaps/satt/action_pseudo.c  |  2 +-
 keyboards/sck/osa/keymaps/all/keymap.c        |  2 +-
 .../silverbullet44/keymaps/FKML/keymap.c      |  2 +-
 keyboards/snampad/keymaps/default/keymap.c    |  2 +-
 keyboards/spacey/keymaps/default/keymap.c     |  2 +-
 keyboards/spacey/keymaps/via/keymap.c         |  2 +-
 keyboards/splitkb/kyria/keymaps/rmw/keymap.c  |  2 +-
 .../switchplate910/keymaps/default/keymap.c   |  2 +-
 .../switchplate910/keymaps/via/keymap.c       |  2 +-
 keyboards/tada68/keymaps/ardakilic/keymap.c   |  4 ++--
 keyboards/tada68/keymaps/ardakilic/readme.md  |  2 +-
 keyboards/tada68/keymaps/fezzant/keymap.c     |  2 +-
 .../bradpad/keymaps/default/keymap.c          |  2 +-
 .../tempo_turtle/bradpad/keymaps/via/keymap.c |  2 +-
 .../minivan/keymaps/josjoha/base_numpad.c     |  4 ++--
 .../minivan/keymaps/josjoha/keymap.c          |  4 ++--
 .../roadkit/keymaps/flipphone/keymap.c        |  2 +-
 .../roadkit/keymaps/mjt/keymap.c              |  2 +-
 .../roadkit/keymaps/singles/keymap.c          |  8 +++----
 .../tzarc/djinn/keymaps/default/keymap.c      |  2 +-
 .../launch_pad/keymaps/default/keymap.c       |  4 ++--
 .../ungodly/launch_pad/keymaps/via/keymap.c   |  4 ++--
 .../launch_pad/keymaps/warzone/keymap.c       |  4 ++--
 .../vitamins_included/keymaps/numpad/keymap.c |  2 +-
 keyboards/whale/sk/keymaps/default/keymap.c   |  2 +-
 .../wolf/ryujin/keymaps/default/keymap.c      |  2 +-
 keyboards/wolf/ryujin/keymaps/via/keymap.c    |  2 +-
 keyboards/xiudi/xd75/keymaps/boy_314/keymap.c |  4 ++--
 keyboards/xiudi/xd75/keymaps/xo/keymap.c      |  2 +-
 keyboards/ymdk/sp64/keymaps/daed/keymap.c     |  4 ++--
 keyboards/ymdk/sp64/keymaps/default/keymap.c  |  2 +-
 .../ymdk/sp64/keymaps/minkezhang/keymap.c     |  2 +-
 keyboards/ymdk/sp64/keymaps/via/keymap.c      |  2 +-
 keyboards/ymdk/sp64/keymaps/walston/keymap.c  |  2 +-
 .../ymd96/keymaps/AnthonyWharton/README.md    |  2 +-
 keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c | 12 +++++-----
 keyboards/yosino58/keymaps/default/keymap.c   |  2 +-
 keyboards/yosino58/keymaps/sakura/keymap.c    |  2 +-
 .../65_ansi_blocker/spidey3/keymap.c          |  4 ++--
 layouts/community/75_ansi/spidey3/keymap.c    |  4 ++--
 layouts/community/ergodox/albert/keymap.c     |  2 +-
 layouts/community/ergodox/bepo/keymap.c       | 22 ++++++++---------
 layouts/community/ergodox/bepo_alt/keymap.c   |  2 +-
 .../ergodox/colemak_programmer/keymap.c       |  2 +-
 layouts/community/ergodox/csharp_dev/keymap.c |  4 ++--
 .../community/ergodox/dvorak_emacs/keymap.c   |  4 ++--
 .../ergodox/dvorak_programmer/keymap.c        |  2 +-
 .../community/ergodox/dvorak_spanish/keymap.c | 24 +++++++++----------
 .../community/ergodox/ishigoya-jp/keymap.c    |  4 ++--
 layouts/community/ergodox/italian/keymap.c    |  2 +-
 layouts/community/ergodox/kristian/keymap.c   |  2 +-
 layouts/community/ergodox/maz/keymap.c        |  2 +-
 .../ergodox/osx_kinesis_pnut/keymap.c         |  2 +-
 layouts/community/ergodox/osx_neo2/keymap.c   | 18 +++++++-------
 .../community/ergodox/swissgerman/keymap.c    | 14 +++++------
 .../twentylives_dvorak_with_hebrew/keymap.c   |  2 +-
 .../community/ortho_4x12/ajp10304/keymap.c    | 16 ++++++-------
 layouts/community/ortho_4x12/jotix/keymap.c   |  2 +-
 layouts/community/ortho_4x4/jotix/keymap.c    |  2 +-
 .../community/planck_mit/guidoism/keys.json   | 14 +++++------
 quantum/keycode_legacy.h                      |  9 -------
 users/bbaserdem/bb-macro.c                    |  2 +-
 users/cedrikl/cedrikl.c                       |  2 +-
 users/cwebster2/my_miryoku.h                  |  2 +-
 users/dennytom/chording_engine/engine.part.1  |  4 ++--
 .../dennytom/chording_engine/tests/minunit.h  |  4 ++--
 users/edvorakjp/edvorakjp.h                   |  4 ++--
 users/gordon/gordon.h                         |  8 +++----
 users/gourdo1/gourdo1.c                       |  2 +-
 users/issmirnov/rows.h                        |  2 +-
 users/jonavin/jonavin.c                       |  2 +-
 .../nqn-keys-on-quertz-de-latin1.h            |  8 +++----
 users/pcoves/tapDance.c                       |  8 +++----
 users/romus/romus.h                           |  2 +-
 users/scheiklp/koy_keys_on_quertz_de_latin1.h |  8 +++----
 users/twschum/xtonhasvim.c                    |  4 ++--
 users/xtonhasvim/xtonhasvim.c                 |  4 ++--
 users/zigotica/combos.c                       |  2 +-
 267 files changed, 529 insertions(+), 538 deletions(-)

diff --git a/keyboards/10bleoledhub/keymaps/default/keymap.c b/keyboards/10bleoledhub/keymaps/default/keymap.c
index 806d913128..baeba01026 100644
--- a/keyboards/10bleoledhub/keymaps/default/keymap.c
+++ b/keyboards/10bleoledhub/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P4,   KC_P5,    KC_P6,
         KC_P1,   KC_P2,    KC_P3),
     [1] = LAYOUT(
-        KC_NUMLOCK,
+        KC_NUM,
 		RGB_TOG, RGB_MOD, RGB_M_K,
         RGB_SAI, RGB_SAD, RGB_HUI,
         RGB_VAI, RGB_VAD, RGB_SPI),
diff --git a/keyboards/10bleoledhub/keymaps/via/keymap.c b/keyboards/10bleoledhub/keymaps/via/keymap.c
index 316819acf5..09c53df5bd 100644
--- a/keyboards/10bleoledhub/keymaps/via/keymap.c
+++ b/keyboards/10bleoledhub/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P4,   KC_P5,    KC_P6,
         KC_P1,   KC_P2,    KC_P3),
     [1] = LAYOUT(
-        KC_NUMLOCK,
+        KC_NUM,
 		RGB_TOG, RGB_MOD, RGB_M_K,
         RGB_SAI, RGB_SAD, RGB_HUI,
         RGB_VAI, RGB_VAD, RGB_SPI),
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
index d837be8ba1..bd6fd9d1d0 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
@@ -46,5 +46,5 @@
     #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_CAPSLOCK 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.
+        // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
 */
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c b/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
index 72df0675be..861a1b568d 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
@@ -207,7 +207,7 @@ void matrix_init_user(void) {
   // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values
   // set num lock on at start (for numonly layer to work)
   if (!host_keyboard_led_state().num_lock) {
-      tap_code(KC_NUMLOCK);
+      tap_code(KC_NUM_LOCK);
   }
 }
 
diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c b/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
index 3778ea21e7..0227f26937 100644
--- a/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_68_ansi(
     KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_ESC, KC_PGUP,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN,
-    KC_CAPSLOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
     KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   )
diff --git a/keyboards/abacus/keymaps/default/keymap.json b/keyboards/abacus/keymaps/default/keymap.json
index 506fd7ea67..562caf01c7 100644
--- a/keyboards/abacus/keymaps/default/keymap.json
+++ b/keyboards/abacus/keymaps/default/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT",
   "layers": [
     ["KC_ESCAPE", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPACE", "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCOLON", "KC_BSLASH", "KC_LSHIFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_UP", "KC_DELETE", "KC_LCTRL", "KC_LGUI", "MO(1)", "KC_SPACE", "KC_ENTER", "MO(2)", "KC_LEFT", "KC_DOWN", "KC_RIGHT"],
-    ["KC_GRAVE", "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_LBRACKET", "KC_RBRACKET", "KC_QUOTE", "KC_SLASH", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MINUS", "KC_EQUAL", "KC_TRNS", "KC_TRNS", "KC_LALT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_END"],
+    ["KC_GRAVE", "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_LBRC", "KC_RBRC", "KC_QUOTE", "KC_SLASH", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MINUS", "KC_EQUAL", "KC_TRNS", "KC_TRNS", "KC_LALT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_END"],
     ["KC_GRV", "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", "RGB_MODE_PLAIN", "RGB_MODE_BREATHE", "RGB_MODE_RAINBOW", "RGB_MODE_SWIRL", "RGB_MODE_SNAKE", "RGB_MODE_KNIGHT", "RGB_MODE_GRADIENT", "KC_NO", "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUI", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]
   ]
 }
diff --git a/keyboards/abacus/keymaps/unicodemap/keymap.c b/keyboards/abacus/keymaps/unicodemap/keymap.c
index c31b268ca2..4392bd3c51 100644
--- a/keyboards/abacus/keymaps/unicodemap/keymap.c
+++ b/keyboards/abacus/keymaps/unicodemap/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_UPPER] = LAYOUT(
         KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
-        ALTTAB, _______, _______, _______, _______, _______, _______, _______, KC_LBRACKET, KC_RBRACKET, KC_QUOTE, KC_SLASH,
+        ALTTAB, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_QUOTE, KC_SLASH,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, _______, _______,
         KC_LALT, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
     ),
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index 50ff84388f..20ff5c2af6 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_QUOTE,      KC_COMMA,      KC_DOT,     KC_P,                KC_Y,                                 KC_F,       KC_G,      KC_C,    KC_R,          KC_L,
     KC_A,          KC_O,          KC_E,       KC_U,                KC_I,                                 KC_D,       KC_H,      KC_T,    KC_N,          KC_S,
     KC_SCOLON,     KC_Q,          KC_J,       KC_K,                KC_X,                                 KC_B,       KC_M,      KC_W,    KC_V,          KC_Z,
-    OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER,   KC_SPACE,  KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT)
+    OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER,   KC_SPACE,  KC_BSPC, RCTL(KC_BSPC), KC_CAPS, OSM(MOD_LSFT)
   ),
 
 #ifdef USE_VSCODE_MACROS
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [COMBINED] = LAYOUT(
     KC_EXLM, KC_AT,   KC_HASH,     KC_DLR,      KC_PERC,                   KC_PLUS,  KC_7, KC_8,   KC_9,    KC_ASTR,
-    KC_LPRN, KC_RPRN, KC_LBRACKET, KC_RBRACKET, KC_UNDS,                   KC_MINS,  KC_4, KC_5,   KC_6,    KC_SLSH,
+    KC_LPRN, KC_RPRN, KC_LBRC,     KC_RBRC,     KC_UNDS,                   KC_MINS,  KC_4, KC_5,   KC_6,    KC_SLSH,
     KC_COLN, KC_DQUO, KC_LCBR,     KC_RCBR,     KC_AMPR,                   KC_EQUAL, KC_1, KC_2,   KC_3,    KC_QUES,
     KC_TRNS, KC_TILD, KC_GRAVE,    KC_CIRC,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_0, KC_DOT, KC_PIPE, KC_BSLS
   ),
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
index b54c58cf0c..13d39ccaeb 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -125,7 +125,7 @@ static uint16_t auto_pointer_layer_timer = 0;
  */
 #define LAYOUT_LAYER_NAVIGATION                                                               \
     _______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \
-    ______________HOME_ROW_GACS_L______________, KC_CLCK, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
+    ______________HOME_ROW_GACS_L______________, KC_CAPS, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
     _______________DEAD_HALF_ROW_______________,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
                       XXXXXXX, _______, XXXXXXX,  KC_ENT, KC_BSPC
 
diff --git a/keyboards/bioi/g60/keymaps/default/keymap.c b/keyboards/bioi/g60/keymaps/default/keymap.c
index aaeb35b414..3c4024aef2 100644
--- a/keyboards/bioi/g60/keymaps/default/keymap.c
+++ b/keyboards/bioi/g60/keymaps/default/keymap.c
@@ -22,8 +22,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_BSPACE, 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_CAPSLOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
-        KC_LSFT, KC_NONUS_BSLASH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_APP, KC_RCTRL),
 
     // 1: Function Layer
diff --git a/keyboards/bioi/g60/keymaps/via/keymap.c b/keyboards/bioi/g60/keymaps/via/keymap.c
index 8b01dc8997..f7c25cba3a 100644
--- a/keyboards/bioi/g60/keymaps/via/keymap.c
+++ b/keyboards/bioi/g60/keymaps/via/keymap.c
@@ -22,8 +22,8 @@ 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_BSPACE, 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_CAPSLOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
-        KC_LSFT, KC_NONUS_BSLASH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_APP, KC_RCTRL),
 
     // 1: Function Layer
diff --git a/keyboards/bioi/morgan65/keymaps/default/keymap.c b/keyboards/bioi/morgan65/keymaps/default/keymap.c
index 67d8d57e5f..991e240362 100644
--- a/keyboards/bioi/morgan65/keymaps/default/keymap.c
+++ b/keyboards/bioi/morgan65/keymaps/default/keymap.c
@@ -22,8 +22,8 @@ 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_BSPACE, KC_GRV, KC_F1,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_F2,
-        KC_CAPSLOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT, KC_F3,
-        KC_LSFT, KC_NONUS_BSLASH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_F4,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT, KC_F3,
+        KC_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_F4,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
 
     // 1: Function Layer
diff --git a/keyboards/bioi/morgan65/keymaps/via/keymap.c b/keyboards/bioi/morgan65/keymaps/via/keymap.c
index 67d8d57e5f..991e240362 100644
--- a/keyboards/bioi/morgan65/keymaps/via/keymap.c
+++ b/keyboards/bioi/morgan65/keymaps/via/keymap.c
@@ -22,8 +22,8 @@ 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_BSPACE, KC_GRV, KC_F1,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_F2,
-        KC_CAPSLOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT, KC_F3,
-        KC_LSFT, KC_NONUS_BSLASH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_F4,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT, KC_F3,
+        KC_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_F4,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
 
     // 1: Function Layer
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c b/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c
index df029c6800..a70d1527d8 100644
--- a/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c
+++ b/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c
@@ -53,7 +53,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_EQL,
 //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_CLCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
 //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
 //   ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐     ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/bobpad/keymaps/default/keymap.c b/keyboards/bobpad/keymaps/default/keymap.c
index a6e7e190da..5c7dcd591e 100644
--- a/keyboards/bobpad/keymaps/default/keymap.c
+++ b/keyboards/bobpad/keymaps/default/keymap.c
@@ -18,11 +18,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_2x3(
-        KC_CAPSLOCK,  MO(1), KC_PGUP,
+        KC_CAPS,  MO(1), KC_PGUP,
         KC_DEL,  KC_END,  KC_PGDN
     ),
     [1] = LAYOUT_ortho_2x3(
-        KC_CAPSLOCK,  MO(1), KC_PGUP,
+        KC_CAPS,  MO(1), KC_PGUP,
         KC_DEL,  KC_END,  KC_PGDN
     ),
 
diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
index 5f0b1c599a..4923272381 100644
--- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_SLCK,KC_PAUS,
 KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,    KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
 KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,  KC_DEL, KC_END, KC_PGDN,    KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
-KC_CLCK, KC_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_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,                               KC_P4,  KC_P5,  KC_P6,
 KC_LSFT, KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,          KC_UP,              KC_P1,  KC_P2,  KC_P3,  KC_PENT,
 KC_LCTL, KC_LGUI,KC_LALT,                       KC_SPC,                          KC_RALT,KC_RGUI,MO(KM_MEDIA),KC_RCTL,   KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,          KC_PDOT),
 	/* Layer 1: Function layer */
diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
index 5fa3cf6c0a..d7bab2b657 100755
--- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
+++ b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
@@ -17,7 +17,7 @@
 #include "hid_liber.h"
 
 // Helpful defines
-#define FN_CAPS LT(_FL, KC_CAPSLOCK)
+#define FN_CAPS LT(_FL, KC_CAPS)
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
index 4553d4e0e3..4d5cc922c6 100644
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
@@ -136,7 +136,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (layer == PROG2) {
          if (keycode >= KC_A && keycode <= KC_EXSEL && \
              !(  // do not send LSFT + these keycodes, they are needed for emulating the US layout
-                 keycode == KC_NONUS_BSLASH ||
+                 keycode == KC_NUBS ||
                  keycode == KC_RBRC ||
                  keycode == KC_BSLS ||
                  keycode == KC_GRV
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
index 5583a79198..35afe96e17 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-    KC_CLCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, MO(1),      KC_LEFT, KC_DOWN, KC_RGHT
   ),
diff --git a/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c b/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
index 3ea66f5f3f..0f147a61b0 100644
--- a/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRACKET, KC_RBRACKET,
+        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
         KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
index a464a586e7..4baddcfec7 100644
--- a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRACKET, KC_RBRACKET,
+        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
         KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
index fb5a7bd69e..4097a3724d 100644
--- a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRACKET, KC_RBRACKET,
+        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
         KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c b/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
index 09dd15e71b..3b698dfedf 100644
--- a/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRACKET, KC_RBRACKET,
+        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
         KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
index a8a48899eb..5338c31c6f 100644
--- a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRACKET, KC_RBRACKET,
+        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
         KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
index b709b34fbd..224e9091ba 100644
--- a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRACKET, KC_RBRACKET,
+        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
         KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/chavdai40/keymaps/default/keymap.c b/keyboards/chavdai40/keymaps/default/keymap.c
index b709b34fbd..224e9091ba 100644
--- a/keyboards/chavdai40/keymaps/default/keymap.c
+++ b/keyboards/chavdai40/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRACKET, KC_RBRACKET,
+        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
         KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
         KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
index 2e3d9742b1..f05b85a548 100644
--- a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
@@ -67,10 +67,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_FUNC] = LAYOUT_ortho_4x12(
-  KC_F1,     KC_F2,           KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
-  KC_1,      KC_2,            KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
-  KC_LSHIFT, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
-  _______,   _______,         _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
+  KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
+  KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
+  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
+  _______,   _______, _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
 /* Lower
@@ -85,10 +85,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_ortho_4x12(
-  KC_1,        KC_2,            KC_3,           KC_4,           KC_5,          KC_6,          KC_7,           KC_8,            KC_9,           KC_0,          KC_DEL,          KC_BSPC                ,
-  LSFT(KC_1),  LSFT(KC_2),      LSFT(KC_3),     LSFT(KC_4),     LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),     LSFT(KC_8),      LSFT(KC_9),     LSFT(KC_0),    LCTL(KC_DEL),    LCTL(KC_BSPC)          ,
-  KC_LSPO,     KC_NONUS_BSLASH, KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
-  _______,     _______,         _______,        _______,        _______,       KC_DEL,        _______,        _______,         KC_MNXT,        KC_VOLD,       KC_VOLU,         KC_MPLY
+  KC_1,        KC_2,       KC_3,           KC_4,           KC_5,          KC_6,          KC_7,           KC_8,            KC_9,           KC_0,          KC_DEL,          KC_BSPC                ,
+  LSFT(KC_1),  LSFT(KC_2), LSFT(KC_3),     LSFT(KC_4),     LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),     LSFT(KC_8),      LSFT(KC_9),     LSFT(KC_0),    LCTL(KC_DEL),    LCTL(KC_BSPC)          ,
+  KC_LSPO,     KC_NUBS,    KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
+  _______,     _______,    _______,        _______,        _______,       KC_DEL,        _______,        _______,         KC_MNXT,        KC_VOLD,       KC_VOLU,         KC_MPLY
 ),
 
 /* Raise
diff --git a/keyboards/contra/keymaps/alper/keymap.c b/keyboards/contra/keymaps/alper/keymap.c
index 7f00697d66..7b61fd468a 100644
--- a/keyboards/contra/keymaps/alper/keymap.c
+++ b/keyboards/contra/keymaps/alper/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,         KC_1,                     KC_2,                     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_DEL,         KC_F1,                    KC_F2,                    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     _______,        KC_F7,                    KC_F8,                    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-    LGUI(KC_GRAVE), LGUI(LSFT(KC_LBRACKET)),  LGUI(LSFT(KC_RBRACKET)),  _______, _______, _______,          _______, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
+    LGUI(KC_GRAVE), LGUI(LSFT(KC_LBRC)),      LGUI(LSFT(KC_RBRC)),      _______, _______, _______,          _______, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
   ),
 
   /* Adjust (Lower + Raise)
diff --git a/keyboards/contra/keymaps/basic_qwerty/keymap.c b/keyboards/contra/keymaps/basic_qwerty/keymap.c
index 7cb947b5f6..db41d1d5b1 100644
--- a/keyboards/contra/keymaps/basic_qwerty/keymap.c
+++ b/keyboards/contra/keymaps/basic_qwerty/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
     KC_LSFT, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-    KC_CAPSLOCK,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_RGHT, KC_UP,   KC_DOWN
+    KC_CAPS,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_RGHT, KC_UP,   KC_DOWN
   ),
 
   /* Lower
diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c
index 044ed0c0cb..df3f7ea591 100644
--- a/keyboards/contra/keymaps/maxr1998/keymap.c
+++ b/keyboards/contra/keymaps/maxr1998/keymap.c
@@ -179,7 +179,7 @@ void update_tri_layer_user(void) {
 void led_set_user(uint8_t usb_led) {
   // Force-enable Numlock
   if (!(usb_led & (1<<USB_LED_NUM_LOCK))) {
-    register_code(KC_NUMLOCK);
-    unregister_code(KC_NUMLOCK);
+    register_code(KC_NUM_LOCK);
+    unregister_code(KC_NUM_LOCK);
   }
 }
diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c
index 721a9a06ea..854ba78e66 100644
--- a/keyboards/contra/keymaps/ryanm101/keymap.c
+++ b/keyboards/contra/keymaps/ryanm101/keymap.c
@@ -114,10 +114,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_L2] = LAYOUT_ortho_4x12(
-    KC_SYSREQ, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_NLCK, KC_P7,   KC_P8,    KC_P9,   KC_PAST, KC_BSPC,
-    XXXXXXX,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_P4,   KC_P5,    KC_P6,   KC_PSLS, _______,
-    XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX, KC_P1,   KC_P2,    KC_P3,   KC_PPLS, KC_PENT,
-    _______,   _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, KC_P0,    KC_PDOT, KC_PMNS, _______
+    KC_SYRQ, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_NLCK, KC_P7,   KC_P8,    KC_P9,   KC_PAST, KC_BSPC,
+    XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_P4,   KC_P5,    KC_P6,   KC_PSLS, _______,
+    XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX, KC_P1,   KC_P2,    KC_P3,   KC_PPLS, KC_PENT,
+    _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, KC_P0,    KC_PDOT, KC_PMNS, _______
   ),
 
   /* L3
@@ -222,13 +222,13 @@ void cmd_dance (qk_tap_dance_state_t *state, void *user_data) {
 void cmd_sft_slash_pipe_down (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     if (state->interrupted || state->pressed==0) {
-      register_code (KC_NONUS_BSLASH);
+      register_code (KC_NONUS_BACKSLASH);
     } else {
       register_code (KC_LSFT);
     }
   } else if (state->count == 2) {
     register_mods(MOD_BIT(KC_LSFT));
-    register_code(KC_NONUS_BSLASH);
+    register_code(KC_NONUS_BACKSLASH);
   }
 }
 
@@ -237,11 +237,11 @@ void cmd_sft_slash_pipe_up (qk_tap_dance_state_t *state, void *user_data) {
     if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
       unregister_code (KC_LSFT);
     } else {
-      unregister_code (KC_NONUS_BSLASH);
+      unregister_code (KC_NONUS_BACKSLASH);
     }
   } else if (state->count == 2) {
     unregister_mods(MOD_BIT(KC_LSFT));
-    unregister_code(KC_NONUS_BSLASH);
+    unregister_code(KC_NONUS_BACKSLASH);
   }
 }
 
diff --git a/keyboards/converter/modelm_ssk/keymaps/default/keymap.c b/keyboards/converter/modelm_ssk/keymaps/default/keymap.c
index adf557b268..928d745f0d 100644
--- a/keyboards/converter/modelm_ssk/keymaps/default/keymap.c
+++ b/keyboards/converter/modelm_ssk/keymaps/default/keymap.c
@@ -57,14 +57,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         uint8_t shift_mods = get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
         del_mods(MOD_MASK_SHIFT);
 
-        last_num_scroll = KC_NUMLOCK;
+        last_num_scroll = KC_NUM_LOCK;
         register_code(last_num_scroll);
         toggle_numpad_layer(-1);
 
         /* Reset the shift modifiers */
         set_mods(shift_mods);
       } else {
-        last_num_scroll = KC_SCROLLLOCK;
+        last_num_scroll = KC_SCROLL_LOCK;
         register_code(last_num_scroll);
       }
     } else {
diff --git a/keyboards/converter/modelm_ssk/keymaps/tiltowait/keymap.c b/keyboards/converter/modelm_ssk/keymaps/tiltowait/keymap.c
index 58726fec86..4836ad329e 100644
--- a/keyboards/converter/modelm_ssk/keymaps/tiltowait/keymap.c
+++ b/keyboards/converter/modelm_ssk/keymaps/tiltowait/keymap.c
@@ -68,14 +68,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         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_NUMLOCK;
+        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_SCROLLLOCK;
+        last_num_scroll = KC_SCROLL_LOCK;
         register_code(last_num_scroll);
       }
     } else {
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
index f5cd85eb12..bea46b5bd5 100644
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@@ -30,7 +30,7 @@ enum {
   _ADJUST
 };
 
-//KC_NONUS_BSLASH (\|) is equivalent to ["é] key in Turkish keyboards.
+//KC_NUBS (\|) is equivalent to ["é] key in Turkish keyboards.
 //KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
 // KC_SCLN is Turkish s [şŞ] key
 // KC_QUOT is Turkish i [iİ] key
@@ -106,7 +106,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_BSPC,
     LT(_NUMPAD, KC_ESC), KC_A,  KC_S, KC_D,  KC_F,  KC_G,           KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
     LSFT_T(KC_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B,                  KC_N,   KC_M,  KC_COMM, KC_DOT, KC_SLSH, LCTL_T(KC_ENT), /*KC_ENT*/
-      LGUI_T(KC_SLSH), LT(_LOWER, KC_BSLS),LT(_SPACE, KC_SPC),   LT(_SODA, KC_ENT), LT(_RAISE, KC_NONUS_BSLASH), LALT_T(KC_SLSH)
+      LGUI_T(KC_SLSH), LT(_LOWER, KC_BSLS),LT(_SPACE, KC_SPC),   LT(_SODA, KC_ENT), LT(_RAISE, KC_NUBS), LALT_T(KC_SLSH)
 
   ),
 
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
index 42891d60d8..7e29f265af 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c
+++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI,KC_PLUS,                    KC_EQL, KC_4,  KC_5,  KC_6,  KC_BSLASH, KC_TRANSPARENT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCBR, KC_LBRACKET, KC_GRAVE, KC_TILD, PASTE_NOSTYLE, KC_AMPERSAND,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3, KC_RBRACKET, KC_RCBR,
+      KC_LCBR, KC_LBRC, KC_GRAVE, KC_TILD, PASTE_NOSTYLE, KC_AMPERSAND,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3, KC_RBRC, KC_RCBR,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+-C```-------+--------+--------|
                                           KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_UNDS, KC_0
                                       //`--------------------------'  `--------------------------'
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
    [_FN_KEYS] = LAYOUT_split_3x6_3( //fn keys, terminal text navigation keys
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_TRANSPARENT, KC_LCBR,KC_LBRACKET, KC_RBRACKET, KC_RCBR, MOVE_BEGIN_LINE_TERMINAL,                           MOVE_END_LINE_TERMINAL, KC_F7,    KC_F8,    KC_F9,    KC_F11, KC_TRANSPARENT, 
+     KC_TRANSPARENT, KC_LCBR,KC_LBRC, KC_RBRC, KC_RCBR, MOVE_BEGIN_LINE_TERMINAL,                           MOVE_END_LINE_TERMINAL, KC_F7,    KC_F8,    KC_F9,    KC_F11, KC_TRANSPARENT, 
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI, KC_TRANSPARENT,                                               KC_TRANSPARENT, KC_F4,  KC_F5,  KC_F6,  KC_F12, KC_TRANSPARENT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index c96adfcc0b..b54a778373 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -62,8 +62,8 @@ user_config_t user_config;
 #define EXT_SF LT(_GAMING_EXT, KC_LSHIFT)
 
 // Tap/mod keys
-#define RCTL_BR RCTL_T(KC_RBRACKET)
-#define LCTL_BR LCTL_T(KC_LBRACKET)
+#define RCTL_BR RCTL_T(KC_RBRC)
+#define LCTL_BR LCTL_T(KC_LBRC)
 
 #define SFT_SPC LSFT_T(KC_SPACE)
 #define SFT_ENT RSFT_T(KC_ENTER)
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 66839e8249..0cb6021c56 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
     RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,KC_NO,               KC_PAUSE,KC__VOLUP, KC_NO, KC_NO, KC_NO, KC_NO,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD,KC_NO,               KC_SCROLLLOCK,KC__VOLDOWN, KC_NO, KC_NO, KC_NO, RGB_RMOD,
+    RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD,KC_NO,               KC_SCRL,KC__VOLDOWN, KC_NO, KC_NO, KC_NO, RGB_RMOD,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
                                 KC_LGUI, LOWER,KC_SPC,   KC_ENT, RAISE,KC_RALT
                               //`--------------------'  `--------------------'
diff --git a/keyboards/crkbd/keymaps/toinux/keymap.c b/keyboards/crkbd/keymaps/toinux/keymap.c
index 9f5474ee2e..5095ae6ebd 100644
--- a/keyboards/crkbd/keymaps/toinux/keymap.c
+++ b/keyboards/crkbd/keymaps/toinux/keymap.c
@@ -234,7 +234,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case FUN:
             if  (!host_keyboard_led_state().num_lock) {
-                tap_code(KC_NUMLOCK);
+                tap_code(KC_NUM_LOCK);
             }
         return true;
         break;
diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
index 0db3f6bb23..345e4168cf 100644
--- a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
+++ b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_v2(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		KC_CAPSLOCK, KC_VOLU, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______,
+		KC_CAPS, KC_VOLU, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______,
 		M(1), KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, _______, _______,
 		_______, _______, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
index 3da74bb153..cc31110f56 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	ALT0, KC_TRNS, KC_TRNS, ALT1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ALT2, KC_TRNS, KC_TRNS, KC_NLCK, KC_TRNS, KC_TRNS, 
 	KC_TRNS, CD, KC_TRNS, KC_TRNS, KC_TRNS, ALT3, KC_TRNS, KC_TRNS, KC_TRNS, ALT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 	KC_TRNS, AES, xkcd, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_CLCK, KC_TRNS, X, KC_TRNS, img, B, KC_TRNS, ALT7, ALT5, ALT6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+	KC_CAPS, KC_TRNS, X, KC_TRNS, img, B, KC_TRNS, ALT7, ALT5, ALT6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 	KC_TRNS, KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     /* (3) Fn 2 */
diff --git a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
index 55cba1098b..b72d348d6a 100644
--- a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
+++ b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
@@ -61,10 +61,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   LAYOUT_directional(
-      KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,  _______, _______, QK_BOOT,
-      _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_MUTE,       KC_VOLD,  KC_VOLU, _______,
-      _______, _______, _______, DEBUG,   _______, _______, _______, _______, _______, _______, KC_SCROLLLOCK, KC_PAUSE, _______, 
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       KC_MPLY,  KC_VOLU, KC_MUTE,
+      KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, QK_BOOT,
+      _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_MUTE, KC_VOLD,  KC_VOLU, _______,
+      _______, _______, _______, DEBUG,   _______, _______, _______, _______, _______, _______, KC_SCRL, KC_PAUSE, _______, 
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,  KC_VOLU, KC_MUTE,
       _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
       ),
 };
diff --git a/keyboards/dz60/keymaps/jdelkins/keymap.c b/keyboards/dz60/keymaps/jdelkins/keymap.c
index cf9dd584f6..d934804d98 100644
--- a/keyboards/dz60/keymaps/jdelkins/keymap.c
+++ b/keyboards/dz60/keymaps/jdelkins/keymap.c
@@ -135,11 +135,11 @@ const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
             KC_RCTL, MY_RGUI, MY_RALT,     _______,      _______,     _______,                         _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
     ),
     [_KP] = LAYOUT(
-            _______,    _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______,   _______,     _______, _______, _______, _______,
-            KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8,        KC_KP_9,   KC_KP_MINUS, _______, _______,          _______,
-            _______,    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5,        KC_KP_6,   KC_KP_PLUS,  _______,                   _______,
-            _______,    _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2,        KC_KP_3,   KC_KP_SLASH, _______,                   TG(_KP),
-            _______,    _______, _______,  _______,     _______,     KC_KP_0,                                     KC_KP_DOT,   _______, _______, _______, _______
+            _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______,   _______,     _______, _______, _______, _______,
+            KC_NUM,  _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8,        KC_KP_9,   KC_KP_MINUS, _______, _______,          _______,
+            _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5,        KC_KP_6,   KC_KP_PLUS,  _______,                   _______,
+            _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2,        KC_KP_3,   KC_KP_SLASH, _______,                   TG(_KP),
+            _______, _______, _______,  _______,     _______,     KC_KP_0,                                     KC_KP_DOT,   _______, _______, _______, _______
     ),
     [_ADJUST] = 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_SLCK, KC_F13,
diff --git a/keyboards/dz60/keymaps/macos_64/keymap.c b/keyboards/dz60/keymaps/macos_64/keymap.c
index 32626b0ce3..56f8e5abe2 100644
--- a/keyboards/dz60/keymaps/macos_64/keymap.c
+++ b/keyboards/dz60/keymaps/macos_64/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------------'
    */
   LAYOUT_all(
-    KC_GRV , KC_SCROLLLOCK, KC_PAUSE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, KC_DEL,
+    KC_GRV , KC_SCRL, KC_PAUSE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, KC_DEL,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_TRNS, QK_BOOT,
     KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS,
     KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS, KC_TRNS,
diff --git a/keyboards/dz60/keymaps/marianas/keyDefinitions.h b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
index 7248c1f535..dfdea36695 100644
--- a/keyboards/dz60/keymaps/marianas/keyDefinitions.h
+++ b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
@@ -5,7 +5,7 @@
 #define ENTER_OR_SQL LT(SQLMACROS,KC_ENT)
 #define ESCAP KC_ESC
 #define PSCR KC_PSCREEN
-#define SCRL KC_SCROLLLOCK
+#define SCRL KC_SCRL
 #define PAUS KC_PAUSE
 #define NSRT KC_INSERT
 #define HOME KC_HOME
@@ -29,7 +29,7 @@
 #define KP_8 KC_KP_8
 #define KP_9 KC_KP_9
 #define KP_0 KC_KP_0
-#define NMLK KC_NUMLOCK
+#define NMLK KC_NUM_LOCK
 #define STAR KC_KP_ASTERISK
 #define KSSH KC_KP_SLASH
 #define KMIN KC_KP_MINUS
diff --git a/keyboards/dz60/keymaps/marianas/keymap.c b/keyboards/dz60/keymaps/marianas/keymap.c
index 01addc4fe9..e1dc4c9901 100644
--- a/keyboards/dz60/keymaps/marianas/keymap.c
+++ b/keyboards/dz60/keymaps/marianas/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [FN_LAYER]=
     LAYOUT_60_ansi(
       KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-      KC_CAPSLOCK, KC_MPRV, KC_MPLY, KC_MNXT, LWIN(KC_R), ____, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_BRK, ____,
+      KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, LWIN(KC_R), ____, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_BRK, ____,
       ____, KC_VOLD, KC_MUTE, KC_VOLU, ____, ____, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, KC_DEL, ____,
       ____, RGB_HUI, RGB_SAI, RGB_SAD, ____,  ____, KC_END, QWRTY, GAME, NAVS, ____, ____,
       ____, ____, ____, _________________, ____, KC_HYPR, KC_MEH, QK_BOOT)
diff --git a/keyboards/dz60/keymaps/pinpox/keymap.c b/keyboards/dz60/keymaps/pinpox/keymap.c
index 0a6497581a..dd2aefe68f 100644
--- a/keyboards/dz60/keymaps/pinpox/keymap.c
+++ b/keyboards/dz60/keymaps/pinpox/keymap.c
@@ -13,10 +13,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Special keys
 	[1] = LAYOUT_60_ansi(
-			KC_SLEP,     KC_F1,   KC_F2,    KC_F3,   KC_F3,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,   KC_DEL,
-			KC_NO,       RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_DOWN, KC_RGHT, KC_NO,   KC_NO,  KC_NO,   KC_PGUP,   KC_PGDOWN,KC_NO,
-			KC_CAPSLOCK, BL_TOGG, RGB_TOG,  KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,     KC_MFFD,
-			KC_NO,       BL_INC,  BL_DEC,   BL_BRTG, KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_HOME, KC_END, KC_NO,   KC_PSCR,
-			KC_NO,       KC_NO,   KC_TRNS,  KC_MPLY, KC_NO,   KC_NO,   KC_TRNS, KC_NO
+			KC_SLEP, KC_F1,   KC_F2,    KC_F3,   KC_F3,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,   KC_DEL,
+			KC_NO,   RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_DOWN, KC_RGHT, KC_NO,   KC_NO,  KC_NO,   KC_PGUP,   KC_PGDOWN,KC_NO,
+			KC_CAPS, BL_TOGG, RGB_TOG,  KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,     KC_MFFD,
+			KC_NO,   BL_INC,  BL_DEC,   BL_BRTG, KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_HOME, KC_END, KC_NO,   KC_PSCR,
+			KC_NO,   KC_NO,   KC_TRNS,  KC_MPLY, KC_NO,   KC_NO,   KC_TRNS, KC_NO
 			)
 };
diff --git a/keyboards/dz60/keymaps/zepol_layout/keymap.c b/keyboards/dz60/keymaps/zepol_layout/keymap.c
index cd4ff8cc81..6389da4953 100644
--- a/keyboards/dz60/keymaps/zepol_layout/keymap.c
+++ b/keyboards/dz60/keymaps/zepol_layout/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
 		KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_SCROLLLOCK, KC_PAUSE, KC_HOME, KC_END, KC_INSERT, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUSE, KC_HOME, KC_END, KC_INSERT, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	LAYOUT(
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
index 61cb875b8a..c1996417ef 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
@@ -37,14 +37,14 @@ enum my_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_ALPHA_LAYER] = LAYOUT_65_ansi(
 		KC_GESC,	KC_1,	KC_2,	KC_3,   KC_4,	KC_5,	KC_6,	KC_7,	KC_8,		KC_9,	KC_0,		KC_MINUS,	KC_EQUAL,		KC_BSPACE,	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_LBRACKET,KC_RBRACKET,	KC_BSLASH,	KC_PGUP,
+		KC_TAB,		KC_Q,	KC_W,	KC_E,	KC_R,	KC_T,	KC_Y,	KC_U,	KC_I,		KC_O,	KC_P,		KC_LBRC,KC_RBRC,	KC_BSLASH,	KC_PGUP,
 		KC_LCTRL,	KC_A,   KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,		KC_L,	KC_SCOLON,	KC_QUOTE,	        KC_ENTER,	        KC_PGDOWN,
 		KC_LSHIFT,	KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMMA,	KC_DOT,	KC_SLASH,           KC_RSHIFT,          KC_UP,		KC_END,
-		KC_CAPSLOCK,KC_LGUI,FN_MO13,				KC_SPACE,                       FN_MO23,	KC_LALT,    KC_RCTRL,       KC_LEFT,	KC_DOWN,	KC_RIGHT
+		KC_CAPS,KC_LGUI,FN_MO13,				KC_SPACE,                       FN_MO23,	KC_LALT,    KC_RCTRL,       KC_LEFT,	KC_DOWN,	KC_RIGHT
     ),
     [_VIM_EDITING_LAYER] = LAYOUT_65_ansi(
 		KC_GRAVE,	    KC_F1,		        KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_F11,		KC_F12,		KC_DELETE,	KC_INSERT,
-		KC_TRNS,	    KC_TRNS,	        KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	DEL_HOME,	KC_HOME,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_SCROLLLOCK,
+		KC_TRNS,	    KC_TRNS,	        KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	DEL_HOME,	KC_HOME,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_SCRL,
 		KC_TRNS,	    KC_TRNS,	        KC_TRNS,	KC_TRNS,	KC_TRNS,	DEL_LINE,	KC_LEFT,	KC_DOWN,	KC_UP,		KC_RIGHT,	KC_TRNS,	KC_TRNS,		    KC_MPLY,        KC_PAUSE,
 		KC_TRNS,        AUTOCLICK_TOGGLE,   KC_TRNS,	AUTO_BURST,RAPID_BURST,	KC_TRNS,	DEL_END,	KC_END,	    KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_VOLU,	KC_PSCREEN,
 		DEC_CLICK_SPEED,INC_CLICK_SPEED,	KC_TRNS,                                KC_TRNS,						            KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MPRV,    KC_VOLD,	KC_MNXT
diff --git a/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
index cb2ded2650..04296c7489 100644
--- a/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                                                KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
-        KC_CLCK, KC_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_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_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
diff --git a/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
index 7e46c4589b..8ef51f7ff7 100644
--- a/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                                                KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
-        KC_CLCK, KC_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_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_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
         KC_LCTL,          KC_LALT,                            KC_SPC,                    KC_RALT,          LT(1, KC_RCTL),            KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
diff --git a/keyboards/ebastler/e80_1800/keymaps/default/keymap.c b/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
index e1b6133aa6..dc048713b8 100644
--- a/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                                                KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
-        KC_CLCK, 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_KP_4, KC_KP_5, KC_KP_6, KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
diff --git a/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
index 723e76a9ec..89a55648b7 100644
--- a/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                                                KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                                   KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
-        KC_CLCK, 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_KP_4, KC_KP_5, KC_KP_6, KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
diff --git a/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
index 49e993a90d..c08cb590f4 100644
--- a/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                                                KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                                   KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
-        KC_CLCK, 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_KP_4, KC_KP_5, KC_KP_6, KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
         KC_LCTL,          KC_LALT,                            KC_SPC,                    KC_RALT,          LT(1, KC_RCTL),            KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
diff --git a/keyboards/ebastler/e80_1800/keymaps/via/keymap.c b/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
index f747ffe4b2..8e52573b66 100644
--- a/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                                                                KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
-        KC_CLCK, 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_KP_4, KC_KP_5, KC_KP_6, KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
index eff7f111b4..1c7308cb3a 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
@@ -47,7 +47,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Layer 0: basic keys.
   [BASE] = LAYOUT_ergodox_pretty(
-    KC_DLR,           KC_AMPR,  KC_LBRC,  KC_LCBR, KC_RCBR, KC_LPRN, KC_CIRC,           KC_F4,        KC_EQUAL,KC_ASTR, KC_BSLASH, KC_PLUS, KC_RBRACKET, KC_EXLM,
+    KC_DLR,           KC_AMPR,  KC_LBRC,  KC_LCBR, KC_RCBR, KC_LPRN, KC_CIRC,           KC_F4,        KC_EQUAL,KC_ASTR, KC_BSLASH, KC_PLUS, KC_RBRC,     KC_EXLM,
     GUI_T(KC_BSLASH), KC_SCOLON,KC_COMMA, KC_DOT,  KC_P,    KC_Y,    KC_PERC,           KC_DELETE,    KC_F,    KC_G,    KC_C,      KC_R,    KC_L,        KC_SLASH,
     MO(NUM),          KC_A,     KC_O,     KC_E,    KC_U,    KC_I,                                     KC_D,    KC_H,    KC_T,      KC_N,    KC_S,        KC_MINUS,
     KC_LSPO,          KC_QUOTE, KC_Q,     KC_J,    KC_K,    KC_X,    KC_LALT,           TD(TAP_MACRO),KC_B,    KC_M,    KC_W,      KC_V,    KC_Z,        KC_RSPC,
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ___,  KC_F1,   KC_F2,    KC_F3,       KC_F4,       KC_F5,      ___,         ___, KC_F6,   KC_F7,  KC_F8,  KC_F9,      KC_F10,       KC_F11,
     ___,  KC_EXLM, KC_COMMA, KC_DOT,      KC_MS_BTN1,  KC_MS_BTN2, ___,         ___, KC_UP,   KC_7,   KC_8,   KC_9,       KC_ASTR,      KC_F12,
     XXX,  ___,     KC_LCBR,  KC_RCBR,     MC_ARROW,    KC_GRAVE,                     KC_DOWN, KC_4,   KC_5,   KC_6,       KC_PLUS,      KC_UNDS,
-    ___,  ___,     KC_CIRC,  KC_LBRACKET, KC_RBRACKET, KC_TILD,    ___,         ___, KC_0,    KC_1,   KC_2,   KC_3,       KC_KP_SLASH,  KC_BSLASH,
+    ___,  ___,     KC_CIRC,  KC_LBRC,     KC_RBRC,     KC_TILD,    ___,         ___, KC_0,    KC_1,   KC_2,   KC_3,       KC_KP_SLASH,  KC_BSLASH,
     ___,  ___,     ___,      ___,         ___,                                                ___,    KC_0,   KC_KP_DOT,  KC_EQUAL,     ___,
                                                            ___,    ___,         KC_KP_ASTERISK, KC_KP_SLASH,
                                                                KC_LCTL,         ___,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_DELETE,  KC_Q,     KC_W,         KC_E,     KC_R,     KC_T,    KC_Y,              TO(BASE),     KC_Y,   KC_U,   KC_I,     KC_O,         KC_P,         KC_BSLASH,
     MO(NUM),    KC_A,     KC_S,         KC_D,     KC_F,     KC_G,                                     KC_H,   KC_J,   KC_K,     KC_L,         KC_SCLN,      GUI_T(KC_QUOT),
     KC_LSFT,    KC_Z,     KC_X,         KC_C,     KC_V,     KC_B, ALT_T(KC_NO),         MEH_T(KC_NO), KC_N,   KC_M,   KC_COMMA, KC_DOT,       KC_SLASH,     KC_RSPC,
-    KC_GRAVE,   KC_QUOTE, LALT(KC_TAB), KC_LEFT,  KC_RIGHT,                                                   KC_UP,  KC_DOWN,  KC_LBRACKET,  KC_RBRACKET,  TO(BASE),
+    KC_GRAVE,   KC_QUOTE, LALT(KC_TAB), KC_LEFT,  KC_RIGHT,                                                   KC_UP,  KC_DOWN,  KC_LBRC,      KC_RBRC,      TO(BASE),
                                                   ___, KC_LGUI,                         ___, KC_ESCAPE,
                                                        KC_HOME,                         KC_PGUP,
                                       KC_ENTER, KC_TAB, KC_END,                         KC_PGDOWN, KC_BSPACE, KC_SPACE),
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
index 68ddeedc22..d2158ae370 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_UNDS             ,KC_Y                ,KC_U                ,KC_I                ,KC_O                ,KC_P                ,RSFT_T(KC_MINUS)            ,
     HYPR_H              ,ALT_J               ,CTL_K               ,LT(6,KC_L)          ,TD_CLN              ,CMD_QUOT            ,
     ALT_TAB             ,KC_N                ,MEH_T(KC_M)         ,KC_COMMA            ,KC_DOT              ,KC_SLASH            ,LT(4,KC_KP_ASTERISK),
-    LT(4,KC_ENTER)      ,KC_DOWN             ,KC_LBRACKET         ,KC_RBRACKET         ,OSL(2)              ,
+    LT(4,KC_ENTER)      ,KC_DOWN             ,KC_LBRC             ,KC_RBRC             ,OSL(2)              ,
     KC_AUDIO_MUTE       ,KC_ESCAPE           ,
     KC_END              ,
     KC_COLN             ,KC_LEAD             ,LT(4,KC_SPACE)
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT,KC_F1         ,KC_F2         ,KC_F3         ,KC_F4         ,KC_F5         ,KC_TRANSPARENT,
     KC_TRANSPARENT,KC_EXLM       ,KC_AT         ,KC_LCBR       ,KC_RCBR       ,KC_PIPE       ,KC_CALCULATOR ,
     KC_TRANSPARENT,KC_HASH       ,KC_DLR        ,KC_TRANSPARENT,KC_RPRN       ,KC_GRAVE      ,
-    KC_TRANSPARENT,KC_PERC       ,KC_CIRC       ,KC_LBRACKET   ,KC_RBRACKET   ,KC_TILD       ,KC_TRANSPARENT,
+    KC_TRANSPARENT,KC_PERC       ,KC_CIRC       ,KC_LBRC       ,KC_RBRC       ,KC_TILD       ,KC_TRANSPARENT,
     KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
     KC_TRANSPARENT,KC_TRANSPARENT,
                                   RGB_HUI       ,
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_LABK            ,KC_RABK            ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,KC_AT              ,KC_TRANSPARENT     ,KC_EQL             ,F_ARROW            ,KC_GRAVE           ,
-    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_LBRACKET        ,KC_RBRACKET        ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_LBRC            ,KC_RBRC            ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,IARROW             ,ARROW               ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index 48b2dec636..b92895efe5 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       MEH(KC_1), KC_F,  KC_G,  KC_C,   KC_R,   KC_L,   KC_TAB,
                  KC_D,  KC_H,  KC_T,   KC_N,   KC_S,   RCTL(KC_BSPC),
       MEH(KC_2), KC_B,  KC_M,  KC_W,   KC_V,   KC_Z,   MEH(KC_8),
-      KC_BSPC,   RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT),MEH(KC_9),
+      KC_BSPC,   RCTL(KC_BSPC), KC_CAPS, OSM(MOD_LSFT),MEH(KC_9),
 
       // right thumb cluster
       MEH(KC_3), MEH(KC_4), MEH(KC_5), MEH(KC_6),KC_ENTER,KC_SPACE
@@ -449,7 +449,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // left hand
     KC_NO,  KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS,
     KC_TRNS,KC_EXLM, KC_AT,      KC_HASH,     KC_DLR,      KC_PERC, KC_TRNS,
-    KC_TRNS,KC_LPRN, KC_RPRN,    KC_LBRACKET, KC_RBRACKET, KC_UNDS,
+    KC_TRNS,KC_LPRN, KC_RPRN,    KC_LBRC,     KC_RBRC,     KC_UNDS,
     KC_TRNS,KC_COLN, KC_DQUO,    KC_LCBR,     KC_RCBR,     KC_AMPR, KC_TRNS,
     // bottom row
     KC_TRNS,KC_TRNS, KC_TILD,    KC_GRAVE,    KC_CIRC,
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
index 7b2076e05b..89ef3512ad 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
                                                              //                        |                         |                         |                         |                         //
                                                             //                         |                         |                         |                         |                         //
-                                                                      KC_LEFT,                   KC_UP,                    KC_DOWN,                 KC_RGHT,                  KC_SYSREQ,       //
+                                                                      KC_LEFT,                   KC_UP,                    KC_DOWN,                 KC_RGHT,                  KC_SYRQ,         //
                                                             //                         |                         |                         |                         |                         //
                                                             //                         |                         |                         |                         |                         //
                                                              //------------------------+-------------------------+-------------------------+-------------------------+------------------------//
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX,    XXXXXXX,       KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_BTN3, GUI_T(KC_NO),
         KC_ESC,     KC_MS_BTN4,    KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN5, PV_NUM,
         KC_TAB,     PV_LS,         PV_LT,      PV_LP,      PV_LH,       PV_STAR,
-        KC_CLCK,    PV_LS,         PV_LK,      PV_LW,      PV_LR,       PV_STAR,    PV_STAR,
+        KC_CAPS,    PV_LS,         PV_LK,      PV_LW,      PV_LR,       PV_STAR,    PV_STAR,
         XXXXXXX, TG(LAYERS), PV_NUM,     PV_NUM,     PV_NUM,
 
         // left thumb
@@ -278,7 +278,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MPRV, KC_F9,         KC_F7,      KC_F5,   KC_F3,        KC_F1,   KC_WWW_HOME,
         KC_PAUS,            KC_F19,        KC_F17,     KC_F15,  KC_F13,       KC_F11,
         RGB_HUD,             XXXXXXX,       XXXXXXX,    _______, KC_F23,       KC_F21,  KC_WWW_BACK,
-        RGB_VAD,             KC_CLCK,       KC_PSCREEN, XXXXXXX, MO(FIRMWARE),
+        RGB_VAD,             KC_CAPS,       KC_PSCREEN, XXXXXXX, MO(FIRMWARE),
 
         // left thumb
                  _______, XXXXXXX,
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
index 7644635824..adff967ba6 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
@@ -9,7 +9,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
 
     switch (keycode) {
-        case KC_CLCK:
+        case KC_CAPS_LOCK:
             if (record->event.pressed) {
                 if (!(CAPS_LOCK)) {
                     ergodox_right_led_1_on();
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
index 542e123db3..dcae1712d7 100644
--- a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSHIFT,  KC_END,
 
-    KC_NO,     KC_NUMLOCK,     KC_KP_SLASH,    KC_KP_ASTERISK, KC_KP_MINUS,     KC_NO,   KC_NO,
+    KC_NO,     KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_KP_MINUS,     KC_NO,   KC_NO,
     TO(0),     KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_PLUS,      KC_NO,   KC_NO,
                KC_KP_4,        KC_KP_5,        KC_KP_6,        KC_EQUAL,        KC_NO,  KC_NO,
     KC_NO,     KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_KP_ENTER,     KC_NO,  KC_NO,
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT, KC_TRANSPARENT,   KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_NO,          TT(4),
     KC_TRANSPARENT, KC_TRANSPARENT,   KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,    KC_AUDIO_MUTE,      KC_TRANSPARENT,
     KC_LSHIFT,      LALT(KC_Z),       KC_TRANSPARENT,     KC_TRANSPARENT,     KC_F12,             KC_TRANSPARENT, ALL_T(KC_NO),
-    KC_LCTL,        KC_LALT,          KC_LGUI,            KC_CAPSLOCK,        LSFT(KC_F12),
+    KC_LCTL,        KC_LALT,          KC_LGUI,            KC_CAPS,            LSFT(KC_F12),
 
      KC_PSCREEN, KC_PGUP,  KC_PGDOWN,  KC_SPACE, KC_LSHIFT,  KC_INSERT,
 
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSHIFT,  KC_END,
 
-    KC_NO,          KC_NUMLOCK,     KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,    KC_NO,      RGB_VAI,
+    KC_NO,          KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,    KC_NO,      RGB_VAI,
     TO(0),          KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_MINUS,      KC_NO,      RGB_VAD,
                     KC_KP_4,        KC_KP_5,        KC_KP_6,        KC_KP_PLUS,       KC_NO,    RGB_HUI,
     KC_NO,          KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_EQUAL,         RGB_SLD,    RGB_HUD,
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSHIFT,  KC_END,
 
-    KC_NO,    KC_I,       KC_NUMLOCK,     KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,  RGB_VAI,
+    KC_NO,    KC_I,       KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,  RGB_VAI,
     TO(0),    KC_G,       KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_MINUS,    RGB_VAD,
               SHFT_COMMA,       KC_KP_4,        KC_KP_5,        KC_KP_6,        KC_KP_PLUS,     RGB_HUI,
     KC_NO,    SHFT_DOT,       KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_EQUAL,       RGB_HUD,
@@ -203,7 +203,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return true;
       }
     break;
-    case KC_NUMLOCK:
+    case KC_NUM_LOCK:
 
       if (record->event.pressed)
       {
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
index a3c2176951..8471471abf 100644
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ergodox_pretty(
     KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,                                          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,
     KC_INSERT,      KC_Q,           LGUI_T(KC_W),   MT(MOD_HYPR, KC_E),LT(5,KC_R),  KC_T,           KC_NO,                                          KC_NO,          KC_Y,           LT(6,KC_U),     MT(MOD_HYPR, KC_I),RGUI_T(KC_O), KC_P,          KC_PSCREEN,
-    KC_ESCAPE,      LSFT_T(KC_A),   LCTL_T(KC_S),   LALT_T(KC_D),   LT(1,KC_F),     KC_G,                                                                           KC_H,           LT(2,KC_J),     RALT_T(KC_K),   RCTL_T(KC_L),   RSFT_T(KC_SCOLON),KC_CAPSLOCK,
+    KC_ESCAPE,      LSFT_T(KC_A),   LCTL_T(KC_S),   LALT_T(KC_D),   LT(1,KC_F),     KC_G,                                                                           KC_H,           LT(2,KC_J),     RALT_T(KC_K),   RCTL_T(KC_L),   RSFT_T(KC_SCOLON),KC_CAPS,
     KC_HOME,        LT(9,KC_Z),     MT(MOD_LGUI | MOD_LCTL,KC_X), LT(7,KC_C), LT(3,KC_V), KC_B,     KC_NO,                                          KC_NO,          KC_N,           LT(4,KC_M),     LT(8,KC_COMMA), MT(MOD_RGUI | MOD_RCTL, KC_DOT), KC_QUOTE, KC_END,
     KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_DELETE,                                                                                                      KC_TAB,         KC_NO,          KC_NO,          KC_NO,          KC_NO,
                                                                                                     KC_NO,          KC_NO,          KC_NO,          KC_NO,
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [4] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_HYPR,        KC_RGUI,        KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LBRACKET,    KC_RBRACKET,    KC_QUES,        KC_EXLM,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTRL,       KC_RSHIFT,      KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LBRC,        KC_RBRC,        KC_QUES,        KC_EXLM,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTRL,       KC_RSHIFT,      KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT, KC_NO,          MT(MOD_RGUI | MOD_RCTL, KC_NO), KC_NO, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
index 39f2d5fe5b..f7615a4d0d 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
@@ -626,7 +626,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_BSLASH,/**/ KC_SLASH, /**/KC_LBRACKET,  KC_RBRACKET,/**/ KC_TILD,  /**/ _______,  /**/
+        /**/ _______,  /**/ KC_BSLASH,/**/ KC_SLASH, /**/KC_LBRC,        KC_RBRC,  /**/ KC_TILD,  /**/ _______,  /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
diff --git a/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c b/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c
index 7a78ce98e7..f7bce47c13 100644
--- a/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c
+++ b/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [JSYM] = LAYOUT_ergodox(_______, _______, _______, _______, _______, _______, _______, 
     _______, KC_GRV,  KC_AT  , KC_LCBR, KC_RCBR, _______, _______, 
     _______, KC_HASH, KC_DLR , KC_LPRN,    KC_RPRN,    KC_LEFT, 
-    _______, KC_PERC, KC_CIRC, KC_LBRACKET, KC_RBRACKET, _______, _______, 
+    _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, 
     _______, _______, _______, _______, _______, 
     _______, _______, _______, _______, _______, _______, 
     _______, _______, _______, _______, _______, _______, _______, 
diff --git a/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c b/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c
index 9f7435c0d7..33b5b396a2 100644
--- a/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c
+++ b/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [JSYM] = LAYOUT_ergodox(_______, _______, _______, _______, _______, _______, _______, 
     _______, KC_GRV,  KC_AT  , KC_LCBR, KC_RCBR, _______, _______, 
     _______, KC_HASH, KC_DLR , KC_LPRN,    KC_RPRN,    KC_LEFT, 
-    _______, KC_PERC, KC_CIRC, KC_LBRACKET, KC_RBRACKET, _______, _______, 
+    _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, 
     _______, _______, _______, _______, _______, 
     _______, _______, _______, _______, _______, _______, 
     _______, _______, _______, _______, _______, _______, _______, 
diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
index c03c6525af..a110d68401 100644
--- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
@@ -54,7 +54,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_0_BASE] = LAYOUT_ergodox(
-  KC_NONUS_BSLASH,      KC_EXLM,              KC_AT,         KC_HASH,        KC_DLR,       KC_PERC,   KC_AUDIO_MUTE,
+  KC_NUBS,              KC_EXLM,              KC_AT,         KC_HASH,        KC_DLR,       KC_PERC,   KC_AUDIO_MUTE,
   KC_LEAD,              KC_Q,                 KC_W,          E_NUMBERS,      R_MOUSE,      KC_T,      XXXXXXX,
   LCTL(KC_B),           LSFT_T(KC_A),         LCTL_T(KC_S),  LALT_T(KC_D),   LGUI_T(KC_F), KC_G,
   KC_BSLASH,            KC_Z,                 KC_X,          KC_C,           KC_V,         KC_B,      XXXXXXX,
@@ -62,10 +62,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,
   XXXXXXX,
   KC_ENTER,             KC_TAB,               KC_ESCAPE,
-  KC_CAPSLOCK,          KC_CIRC,              KC_AMPR,       KC_ASTR,       KC_LPRN,            KC_RPRN,   KC_MINUS,
-  XXXXXXX,              KC_Y,                 KC_U,          KC_I,          KC_O,               KC_P,      KC_LBRACKET,
+  KC_CAPS,              KC_CIRC,              KC_AMPR,       KC_ASTR,       KC_LPRN,            KC_RPRN,   KC_MINUS,
+  XXXXXXX,              KC_Y,                 KC_U,          KC_I,          KC_O,               KC_P,      KC_LBRC,
   KC_H,                 RGUI_T(KC_J),         RALT_T(KC_K),  RCTL_T(KC_L),  RSFT_T(KC_SCOLON),  KC_QUOTE,
-  KC_RBRACKET,          KC_N,                 KC_M,          KC_COMMA,      KC_DOT,             KC_SLASH,  KC_EQUAL,
+  KC_RBRC,              KC_N,                 KC_M,          KC_COMMA,      KC_DOT,             KC_SLASH,  KC_EQUAL,
   XXXXXXX,              XXXXXXX,              XXXXXXX,       XXXXXXX,       XXXXXXX,
   KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,
   XXXXXXX,
diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c
index 3aee63ddf1..f29b806db5 100644
--- a/keyboards/ergodox_ez/keymaps/testing/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c
@@ -20,9 +20,9 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRACKET,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRACKET,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRACKET,KC_RBRACKET,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER),
+  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER),
 
-  [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRACKET,KC_RBRACKET,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDOWN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCOLON,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI),
+  [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDOWN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCOLON,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI),
 
   [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK),
 
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/README.md b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
index bd3d125a6d..0fe7692556 100644
--- a/keyboards/ergodox_ez/util/keymap_beautifier/README.md
+++ b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
@@ -7,7 +7,7 @@ This Python 3 script, by [Tsan-Kuang Lee](https://github.com/tsankuanglee) takes
 For example, the original `keymap.c` looks like
 
 ```
-[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRACKET,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRACKET,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRACKET,KC_RBRACKET,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER),
+[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER),
 ```
 
 The beautifier parses it and outputs:
@@ -17,7 +17,7 @@ The beautifier parses it and outputs:
 // left hand
 
 KC_EQUAL      , KC_1       , KC_2           , KC_3   , KC_4    , KC_5, LCTL(KC_MINUS),
-KC_DELETE     , KC_Q       , KC_W           , KC_E   , KC_R    , KC_T, KC_LBRACKET   ,
+KC_DELETE     , KC_Q       , KC_W           , KC_E   , KC_R    , KC_T, KC_LBRC   ,
 KC_BSPACE     , KC_A       , KC_S           , KC_D   , KC_F    , KC_G,
 KC_LSPO       , CTL_T(KC_Z), KC_X           , KC_C   , KC_V    , KC_B, ALL_T(KC_NO)  ,
 LT(1,KC_GRAVE), KC_QUOTE   , LALT(KC_LSHIFT), KC_LEFT, KC_RIGHT,
@@ -31,10 +31,10 @@ KC_SPACE, KC_UNDS              , KC_END ,
 // right hand
 
 LCTL(KC_EQUAL), KC_6, KC_7       , KC_8    , KC_9       , KC_0           , KC_MINUS       ,
-KC_RBRACKET   , KC_Y, KC_U       , KC_I    , KC_O       , KC_P           , KC_BSLASH      ,
+KC_RBRC       , KC_Y, KC_U       , KC_I    , KC_O       , KC_P           , KC_BSLASH      ,
                 KC_H, ALT_T(KC_J), KC_K    , KC_L       , LT(2,KC_SCOLON), GUI_T(KC_QUOTE),
 MEH_T(KC_NO)  , KC_N, KC_M       , KC_COMMA, KC_DOT     , CTL_T(KC_SLASH), KC_RSPC        ,
-                      KC_UP      , KC_DOWN , KC_LBRACKET, KC_RBRACKET    , TT(1)          ,
+                      KC_UP      , KC_DOWN , KC_LBRC,     KC_RBRC        , TT(1)          ,
 
 // right thumb
 
@@ -51,7 +51,7 @@ Optionally, it can also render [LAYOUT_ergodox_pretty](https://github.com/qmk/qm
      KC_TAB,        KC_Q,     KC_W,    KC_E,     KC_R,           KC_T,          KC_HYPR,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLASH           ,
    KC_LCTRL,        KC_A,     KC_S,    KC_D,     KC_F,           KC_G,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCOLON         , KC_QUOTE            ,
   KC_LSHIFT,        KC_Z,     KC_X,    KC_C,     KC_V,           KC_B,           SH_MON,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSHIFT           ,
-LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI,  KC_LALT,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRACKET), LT(10,KC_RBRACKET), LT(6,KC_APPLICATION),
+LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI,  KC_LALT,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
 
                                                        LT(6,KC_GRAVE),     MEH_T(KC_NO),      KC_LEFT, KC_RIGHT      ,
                                                                        LT(10,KC_DELETE),      KC_UP  ,
@@ -66,7 +66,7 @@ KC_ESCAPE  , KC_1       , KC_2    , KC_3   , KC_4    , KC_5          , KC_LEAD
 KC_TAB     , KC_Q       , KC_W    , KC_E   , KC_R    , KC_T          , KC_HYPR         ,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLASH           ,
 KC_LCTRL   , KC_A       , KC_S    , KC_D   , KC_F    , KC_G          ,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCOLON         , KC_QUOTE            ,
 KC_LSHIFT  , KC_Z       , KC_X    , KC_C   , KC_V    , KC_B          , SH_MON          ,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSHIFT           ,
-LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI, KC_LALT ,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRACKET), LT(10,KC_RBRACKET), LT(6,KC_APPLICATION),
+LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI, KC_LALT ,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
 
                                                        LT(6,KC_GRAVE), MEH_T(KC_NO)    ,      KC_LEFT, KC_RIGHT      ,
                                                                        LT(10,KC_DELETE),      KC_UP  ,
diff --git a/keyboards/ergodox_stm32/keymaps/default/keymap.c b/keyboards/ergodox_stm32/keymaps/default/keymap.c
index 04a12962e3..460f01afe7 100644
--- a/keyboards/ergodox_stm32/keymaps/default/keymap.c
+++ b/keyboards/ergodox_stm32/keymaps/default/keymap.c
@@ -1,11 +1,11 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ergodox(KC_GRAVE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LPRN,KC_ESCAPE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSHIFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_RPRN,KC_LCTRL,KC_LGUI,KC_LALT,KC_LGUI,KC_LALT,KC_INSERT,MO(1),KC_HOME,KC_SPACE,KC_DELETE,KC_END,KC_EQUAL,KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPACE,KC_LBRACKET,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_QUOTE,KC_RBRACKET,KC_N,KC_M,KC_COMMA,KC_DOT,KC_SLASH,KC_RSHIFT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_RCTRL,MO(1),TG(2),KC_PGUP,KC_PGDOWN,KC_BSPACE,KC_ENTER),
+  [0] = LAYOUT_ergodox(KC_GRAVE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LPRN,KC_ESCAPE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSHIFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_RPRN,KC_LCTRL,KC_LGUI,KC_LALT,KC_LGUI,KC_LALT,KC_INSERT,MO(1),KC_HOME,KC_SPACE,KC_DELETE,KC_END,KC_EQUAL,KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPACE,KC_LBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_QUOTE,KC_RBRC,KC_N,KC_M,KC_COMMA,KC_DOT,KC_SLASH,KC_RSHIFT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_RCTRL,MO(1),TG(2),KC_PGUP,KC_PGDOWN,KC_BSPACE,KC_ENTER),
 
-  [1] = LAYOUT_ergodox(KC_TILD,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_GRAVE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_CAPSLOCK,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(LGUI(KC_Q)),KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP),
+  [1] = LAYOUT_ergodox(KC_TILD,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_GRAVE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_CAPS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(LGUI(KC_Q)),KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP),
 
-  [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_NUMLOCK,KC_KP_SLASH,KC_KP_ASTERISK,KC_KP_MINUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_7,KC_KP_8,KC_KP_9,KC_KP_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_4,KC_KP_5,KC_KP_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_1,KC_KP_2,KC_KP_3,KC_ENTER,KC_TRANSPARENT,KC_KP_DOT,KC_KP_0,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT),
+  [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_NUM,KC_KP_SLASH,KC_KP_ASTERISK,KC_KP_MINUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_7,KC_KP_8,KC_KP_9,KC_KP_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_4,KC_KP_5,KC_KP_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_1,KC_KP_2,KC_KP_3,KC_ENTER,KC_TRANSPARENT,KC_KP_DOT,KC_KP_0,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT),
 
 };
 
diff --git a/keyboards/flygone60/rev3/keymaps/default/keymap.c b/keyboards/flygone60/rev3/keymaps/default/keymap.c
index af47e68c53..6470527bfe 100644
--- a/keyboards/flygone60/rev3/keymaps/default/keymap.c
+++ b/keyboards/flygone60/rev3/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_60_ansi_arrow(
         KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRACKET, KC_RBRACKET, KC_BSLASH,
-        KC_CAPSLOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSHIFT, KC_UP, KC_SLASH,
         KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
diff --git a/keyboards/flygone60/rev3/keymaps/via/keymap.c b/keyboards/flygone60/rev3/keymaps/via/keymap.c
index fa631016fa..e1f1fcedd4 100644
--- a/keyboards/flygone60/rev3/keymaps/via/keymap.c
+++ b/keyboards/flygone60/rev3/keymaps/via/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_0] = LAYOUT_60_ansi_arrow(
         KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRACKET, KC_RBRACKET, KC_BSLASH,
-        KC_CAPSLOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSHIFT, KC_UP, KC_SLASH,
         KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_1), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
diff --git a/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
index bfe0aa2153..cc0e1f563b 100644
--- a/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
@@ -152,10 +152,10 @@ bool handle_US_ANSI_shifted_keys(int16_t keycode, bool in) {
             regular_keycode = KC_EQUAL;
             break;
         case KC_LEFT_CURLY_BRACE:
-            regular_keycode = KC_LBRACKET;
+            regular_keycode = KC_LEFT_BRACKET;
             break;
         case KC_RIGHT_CURLY_BRACE:
-            regular_keycode = KC_RBRACKET;
+            regular_keycode = KC_RIGHT_BRACKET;
             break;
         case KC_PIPE:
             regular_keycode = KC_BSLASH;
@@ -726,10 +726,10 @@ uint8_t counter_76 = 0;
 const struct Chord chord_76 PROGMEM = {H_BOT3, NUM, &state_76, &counter_76, KC_EQUAL, 0, autoshift_dance};
 uint8_t state_77 = IDLE;
 uint8_t counter_77 = 0;
-const struct Chord chord_77 PROGMEM = {H_BOT4, NUM, &state_77, &counter_77, KC_LBRACKET, 0, autoshift_dance};
+const struct Chord chord_77 PROGMEM = {H_BOT4, NUM, &state_77, &counter_77, KC_LEFT_BRACKET, 0, autoshift_dance};
 uint8_t state_78 = IDLE;
 uint8_t counter_78 = 0;
-const struct Chord chord_78 PROGMEM = {H_BOT5, NUM, &state_78, &counter_78, KC_RBRACKET, 0, autoshift_dance};
+const struct Chord chord_78 PROGMEM = {H_BOT5, NUM, &state_78, &counter_78, KC_RIGHT_BRACKET, 0, autoshift_dance};
 uint8_t state_79 = IDLE;
 uint8_t counter_79 = 0;
 const struct Chord chord_79 PROGMEM = {H_BOT6, NUM, &state_79, &counter_79, KC_BSLASH, 0, autoshift_dance};
@@ -883,9 +883,9 @@ const struct Chord chord_152 PROGMEM = {H_TOP2 + H_TOP9, ASETNIOP, &state_152, N
 uint8_t state_153 = IDLE;
 const struct Chord chord_153 PROGMEM = {H_TOP3 + H_TOP0, ASETNIOP, &state_153, NULL, KC_QUOTE, 0, single_dance};
 uint8_t state_154 = IDLE;
-const struct Chord chord_154 PROGMEM = {H_TOP1 + H_TOP9, ASETNIOP, &state_154, NULL, KC_LBRACKET, 0, single_dance};
+const struct Chord chord_154 PROGMEM = {H_TOP1 + H_TOP9, ASETNIOP, &state_154, NULL, KC_LEFT_BRACKET, 0, single_dance};
 uint8_t state_155 = IDLE;
-const struct Chord chord_155 PROGMEM = {H_TOP2 + H_TOP0, ASETNIOP, &state_155, NULL, KC_RBRACKET, 0, single_dance};
+const struct Chord chord_155 PROGMEM = {H_TOP2 + H_TOP0, ASETNIOP, &state_155, NULL, KC_RIGHT_BRACKET, 0, single_dance};
 uint8_t state_156 = IDLE;
 const struct Chord chord_156 PROGMEM = {H_TOP1 + H_TOP0, ASETNIOP, &state_156, NULL, KC_SLASH, 0, single_dance};
 uint8_t state_157 = IDLE;
diff --git a/keyboards/gboards/georgi/keymaps/dennytom/keymap.c b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
index 2e01917745..53275f7eb0 100644
--- a/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
@@ -163,10 +163,10 @@ bool handle_US_ANSI_shifted_keys(int16_t keycode, bool in) {
             regular_keycode = KC_EQUAL;
             break;
         case KC_LEFT_CURLY_BRACE:
-            regular_keycode = KC_LBRACKET;
+            regular_keycode = KC_LEFT_BRACKET;
             break;
         case KC_RIGHT_CURLY_BRACE:
-            regular_keycode = KC_RBRACKET;
+            regular_keycode = KC_RIGHT_BRACKET;
             break;
         case KC_PIPE:
             regular_keycode = KC_BSLASH;
diff --git a/keyboards/gh60/revc/keymaps/emiilsd/keymap.c b/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
index a863511d60..75e7691c43 100644
--- a/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
+++ b/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
@@ -33,7 +33,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_NO,
     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
     KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(1),    KC_RSFT,
-    KC_NO,   KC_LALT, KC_LGUI,                   KC_SPC,                             KC_NO,   KC_NO,   KC_RALT, KC_CAPSLOCK, KC_NO
+    KC_NO,   KC_LALT, KC_LGUI,                   KC_SPC,                             KC_NO,   KC_NO,   KC_RALT, KC_CAPS, KC_NO
   ),
 
   /* 1: Fn layer */
diff --git a/keyboards/gh60/satan/keymaps/dende_iso/keymap.c b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
index 48cd66d415..66aa2f9695 100644
--- a/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
@@ -11,7 +11,7 @@
 #define _MEDIA 2
 
 // dual-role shortcuts
-#define FN_CAPS   LT(_MEDIA, KC_CAPSLOCK)
+#define FN_CAPS   LT(_MEDIA, KC_CAPS)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _DEF: Default Layer
diff --git a/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
index 1ae70e6245..cc0fbb2628 100644
--- a/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
@@ -139,16 +139,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KC_SCAP:
       if (record->event.pressed){
         layer_on(_CAPS);
-        register_code(KC_CAPSLOCK);
-        unregister_code(KC_CAPSLOCK);
+        register_code(KC_CAPS_LOCK);
+        unregister_code(KC_CAPS_LOCK);
         return false;
       }
       break;
     case KC_SCOF:
       if (record->event.pressed){
         layer_off(_CAPS);
-        register_code(KC_CAPSLOCK);
-        unregister_code(KC_CAPSLOCK);
+        register_code(KC_CAPS_LOCK);
+        unregister_code(KC_CAPS_LOCK);
         return false;
       }
       break;
diff --git a/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
index bc783f540c..f4c9ad81ca 100644
--- a/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
@@ -134,15 +134,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KC_SCAP:
       if (record->event.pressed){
         layer_on(_CAPS);
-        register_code(KC_CAPSLOCK);
-        unregister_code(KC_CAPSLOCK);
+        register_code(KC_CAPS_LOCK);
+        unregister_code(KC_CAPS_LOCK);
       }
       return false;
     case KC_SCOF:
       if (record->event.pressed){
         layer_off(_CAPS);
-        register_code(KC_CAPSLOCK);
-        unregister_code(KC_CAPSLOCK);
+        register_code(KC_CAPS_LOCK);
+        unregister_code(KC_CAPS_LOCK);
       }
       return false;
   }
diff --git a/keyboards/gorthage_truck/keymaps/default/keymap.c b/keyboards/gorthage_truck/keymaps/default/keymap.c
index e875883250..380a46d589 100644
--- a/keyboards/gorthage_truck/keymaps/default/keymap.c
+++ b/keyboards/gorthage_truck/keymaps/default/keymap.c
@@ -26,7 +26,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_BSPC, KC_MINS, KC_MPLY, KC_1,    KC_2,    KC_3,
         KC_SLCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_EQL,           KC_4,    KC_5,    KC_6,
         KC_NLCK, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENT,  KC_SLSH, KC_GRV,  KC_UP,   KC_7,    KC_8,    KC_9,
-        KC_CLCK, KC_LCTL, KC_LSFT,          KC_SPC,           KC_RSFT,                   KC_RCTL, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT, KC_DOT,  KC_0
+        KC_CAPS, KC_LCTL, KC_LSFT,          KC_SPC,           KC_RSFT,                   KC_RCTL, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT, KC_DOT,  KC_0
     )
 };
 
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
index d69c705a42..3a74063700 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
@@ -26,7 +26,7 @@ enum aranck_layers {
   _NUMPAD
 };
 
-//KC_NONUS_BSLASH (\|) is equivalent to ["é] key in Turkish keyboards.
+//KC_NUBS (\|) is equivalent to ["é] key in Turkish keyboards.
 //KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
 // KC_SCLN is Turkish s [şŞ] key
 // KC_QUOT is Turkish i [iİ] key
@@ -98,7 +98,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_BSPC,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     LSFT_T(KC_CAPS), KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
-    LT(_SODA, KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_BSLS), LT(_SPACE, KC_SPC),  LT(_RAISE, KC_NONUS_BSLASH), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    LT(_SODA, KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_BSLS), LT(_SPACE, KC_SPC),  LT(_RAISE, KC_NUBS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 ),
 
 /* Lower
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LBRC, KC_RBRC, KC_EQL,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DOLLAR_SIGN, CURLY_OPEN, CURLY_CLOSE, KC_GRV, LSFT(KC_GRV),
-    _______, _______, _______, _______, _______,      _______,      _______,   SQUARE_OPEN, SQUARE_CLOSE, LSFT(KC_2), KC_NONUS_BSLASH
+    _______, _______, _______, _______, _______,      _______,      _______,   SQUARE_OPEN, SQUARE_CLOSE, LSFT(KC_2), KC_NUBS
 ),
 
 
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 5ac74e6f8a..6388c8d9cc 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -68,10 +68,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------'
  */
 [_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               ,
-  KC_1,      KC_2,            KC_3,     KC_4,          KC_5,    KC_6,                      KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT            ,
-  KC_LSHIFT, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
-  _______,   _______,         _______,  _______,       _______, _______, _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
+  KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,                     KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12               ,
+  KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,                      KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT            ,
+  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
+  _______,   _______, _______,  _______,       _______, _______, _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
 /* Lower
@@ -86,10 +86,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT(
-  KC_1,        KC_2,            KC_3,        KC_4,           KC_5,        KC_6,                         KC_7,       KC_8,          KC_9,       KC_0,       KC_DEL,       KC_BSPC              ,
-  LSFT(KC_1),  LSFT(KC_2),      LSFT(KC_3),  LSFT(KC_4),     LSFT(KC_5),  LSFT(KC_6),                   LSFT(KC_7), LSFT(KC_8),    LSFT(KC_9), LSFT(KC_0), LCTL(KC_DEL), LCTL(KC_BSPC)        ,
-  KC_LSPO,     KC_NONUS_BSLASH, KC_GRAVE,    KC_NONUS_HASH,  KC_QUOT,     KC_MINS,                      KC_EQL,     KC_NONUS_HASH, KC_LBRC,    KC_RBRC,    KC_QUOT,      MT(MOD_RSFT, KC_ENT) ,
-  _______,     _______,         _______,     _______,        _______,     KC_DEL,     _______, _______, _______,    _______,       KC_MNXT,    KC_VOLD,    KC_VOLU,      KC_MPLY
+  KC_1,        KC_2,       KC_3,        KC_4,           KC_5,        KC_6,                         KC_7,       KC_8,          KC_9,       KC_0,       KC_DEL,       KC_BSPC              ,
+  LSFT(KC_1),  LSFT(KC_2), LSFT(KC_3),  LSFT(KC_4),     LSFT(KC_5),  LSFT(KC_6),                   LSFT(KC_7), LSFT(KC_8),    LSFT(KC_9), LSFT(KC_0), LCTL(KC_DEL), LCTL(KC_BSPC)        ,
+  KC_LSPO,     KC_NUBS,    KC_GRAVE,    KC_NONUS_HASH,  KC_QUOT,     KC_MINS,                      KC_EQL,     KC_NONUS_HASH, KC_LBRC,    KC_RBRC,    KC_QUOT,      MT(MOD_RSFT, KC_ENT) ,
+  _______,     _______,    _______,     _______,        _______,     KC_DEL,     _______, _______, _______,    _______,       KC_MNXT,    KC_VOLD,    KC_VOLU,      KC_MPLY
 ),
 
 /* Raise
diff --git a/keyboards/handwired/concertina/64key/keymaps/default/config.h b/keyboards/handwired/concertina/64key/keymaps/default/config.h
index 4af423c3a7..264140969d 100644
--- a/keyboards/handwired/concertina/64key/keymaps/default/config.h
+++ b/keyboards/handwired/concertina/64key/keymaps/default/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 /* Custom space-cadet modifier and tap combinations: Brackets on Ctrl and braces on Alt. */
-#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_LBRACKET
-#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_RBRACKET
-#define LAPO_KEYS KC_LALT, KC_LSFT, KC_LBRACKET
-#define RAPC_KEYS KC_RALT, KC_RSFT, KC_RBRACKET
+#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_LBRC
+#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_RBRC
+#define LAPO_KEYS KC_LALT, KC_LSFT, KC_LBRC
+#define RAPC_KEYS KC_RALT, KC_RSFT, KC_RBRC
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
index 092bd3e430..1d20045489 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_dm_base_wrapper(
     KC_ESC, KC_QUES,KC_UNDS,KC_F1,  KC_F2,      KC_F3,  KC_F4,  KC_MINS,KC_SLSH,KC_BSPC ,
     KC_LSFT,KC_PSCR,KC_PGUP,KC_F5,  KC_F6,      KC_F7,  KC_F8,  KC_HOME,KC_LALT,KC_ENT  ,
-    KC_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                     _______,_______,_______,    _______,ADDDD,  _______
 ),
 [_ADJUST] = LAYOUT_dm_base_wrapper(
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
index 211cd91e12..5d9fd3e66e 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
       /*aux*/  _______,  _______,  _______,
                /* ^^^^ use these */
-     KC_NUMLOCK,KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_NUM,   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,
      KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
      KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
      KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c
index d30666f3a4..d96ae996a5 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______,_______,_______,_______,_______,_______,                         _______,_______      ,_______    ,_______      ,_______,_______,
      _______,_______,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_CAPSLOCK,_______      ,_______,_______,
+     _______,_______,INF_MIN,INF_EQ ,_______,_______,                         _______,_______      ,KC_CAPS    ,_______      ,_______,_______,
                      _______,_______,                                                               _______    ,_______      ,
                                      _______,_______,                         _______,_______,
                                              _______,_______,         _______,_______,
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
index b9716947f1..442455bfcf 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
@@ -17,8 +17,8 @@ enum layer_names {
 #define SLQ     RALT(KC_9)  // Single left-side quotation mark (in Colemak).
 #define SRQ     RALT(KC_0)
 #define EMDASH  RALT(LSFT(KC_MINUS))  // Em dash character (in Colemak).
-#define BK_LCTL CTL_T(KC_LBRACKET)
-#define BK_RCTL RCTL_T(KC_RBRACKET)
+#define BK_LCTL CTL_T(KC_LEFT_BRACKET)
+#define BK_RCTL RCTL_T(KC_RIGHT_BRACKET)
 // TODO: Mod-tap ALT with a curvilinear brace.
 // https://github.com/qmk/qmk_firmware/pull/2055
 
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
index bfce6420af..f4b75adbf3 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
@@ -26,7 +26,7 @@ enum heisenberg_layers {
   _NUMPAD
 };
 
-//KC_NONUS_BSLASH (\|) is equivalent to ["é] key in Turkish keyboards.
+//KC_NUBS (\|) is equivalent to ["é] key in Turkish keyboards.
 //KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
 // KC_SCLN is Turkish s [şŞ] key
 // KC_QUOT is Turkish i [iİ] key
@@ -98,7 +98,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_BSPC,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     LSFT_T(KC_CAPS), KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT /*KC_ENT*/,
-    LT(_SODA, KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_BSLS), LT(_SPACE, KC_SPC),  LT(_RAISE, KC_NONUS_BSLASH), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    LT(_SODA, KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_BSLS), LT(_SPACE, KC_SPC),  LT(_RAISE, KC_NUBS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 ),
 
 /* Lower
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LBRC, KC_RBRC, KC_EQL,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DOLLAR_SIGN, CURLY_OPEN, CURLY_CLOSE, KC_GRV, LSFT(KC_GRV),
-    _______, _______, _______, _______, _______,      _______,      _______,   SQUARE_OPEN, SQUARE_CLOSE, LSFT(KC_2), KC_NONUS_BSLASH
+    _______, _______, _______, _______, _______,      _______,      _______,   SQUARE_OPEN, SQUARE_CLOSE, LSFT(KC_2), KC_NUBS
 ),
 
 
diff --git a/keyboards/handwired/jopr/keymaps/default/keymap.c b/keyboards/handwired/jopr/keymaps/default/keymap.c
index befdece551..7827b5f171 100644
--- a/keyboards/handwired/jopr/keymaps/default/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ void led_set_user(uint8_t usb_led) {
     }
     
     if (!(IS_LED_ON(usb_led, USB_LED_NUM_LOCK))) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -49,7 +49,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         }
         else {
             switch(keycode) {
-                case KC_SYSREQ:
+                case KC_SYSTEM_REQUEST:
                     sysreq_led = true;
                     writePinHigh(F4);
             }
diff --git a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
index 5fb7c7c8b9..98c3da616a 100644
--- a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   KC_LWIN,   KC_LALT,   KC_SPC,                                                KC_RALT, KC_RWIN, LT(_FN,KC_APP), KC_RCTL,      KC_P0,            KC_PDOT,            KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT(
-		_______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______,   KC_SYSREQ, _______, _______, _______,
+		_______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______,   KC_SYRQ, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______,
 		_______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       KC_MSTP, KC_VOLU, _______, _______,
 		_______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              KC_MPRV, KC_MPLY, KC_MNXT,            _______, KC_MUTE, _______,
@@ -37,7 +37,7 @@ void led_set_user(uint8_t usb_led) {
     }
     
     if (!(IS_LED_ON(usb_led, USB_LED_NUM_LOCK))) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -49,7 +49,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         }
         else {
             switch(keycode) {
-                case KC_SYSREQ:
+                case KC_SYSTEM_REQUEST:
                     sysreq_led = true;
                     writePinHigh(F4);
             }
diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
index 6a00111b57..2fdafbe052 100644
--- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
      KC_HOME        , TD(TD_TAB_TILDE),KC_Q   ,KC_W   ,KC_E      ,KC_R  ,KC_T,KC_Y,KC_U  , KC_I           , KC_O          , KC_P           ,TD(TD_LBRC_LCBR),TD(TD_RBRC_RCBR),
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
-     KC_PGUP        , KC_CAPSLOCK     ,KC_A   ,KC_S   ,KC_D      ,KC_F  ,KC_G,KC_H,KC_J  ,KC_K            , KC_L          ,TD(TD_SCLN_COLN),TD(TD_QUOT_DQT) ,KC_ENT          ,
+     KC_PGUP        , KC_CAPS         ,KC_A   ,KC_S   ,KC_D      ,KC_F  ,KC_G,KC_H,KC_J  ,KC_K            , KC_L          ,TD(TD_SCLN_COLN),TD(TD_QUOT_DQT) ,KC_ENT          ,
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
      KC_PGDN        ,TD(TD_SHIFT_CAPS),KC_Z   ,KC_X   ,KC_C      ,KC_V  ,KC_B,KC_N,KC_M  ,TD(TD_COMM_LABK),TD(TD_DOT_RABK),TD(TD_SLSH_QUES),TD(TD_BSLS_PIPE),KC_RSFT         ,
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
diff --git a/keyboards/handwired/t111/keymaps/oleg/keymap.c b/keyboards/handwired/t111/keymaps/oleg/keymap.c
index 63342af79f..c3cafe5368 100644
--- a/keyboards/handwired/t111/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/t111/keymaps/oleg/keymap.c
@@ -116,12 +116,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------------------------------------------'
 */    
     [1] = LAYOUT(
-    VRSN,             KC_SLEP, _______, UC_MOD,  _______, _______, _______, _______,   _______, _______,        _______,        _______, _______, _______, _______, _______, _______,
-    _______, _______, X(UAT),  X(UHSH), X(UDLR), X(USCT), X(UCFX), X(UAMP), X(UAST),   _______, _______,        _______,               _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
-    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYSREQ, KC_SLCK, KC_PAUS,        XP(ULSB, ULCB), XP(URSB, URCB),        _______,   _______, _______, _______, _______, _______, _______,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______,   _______, XP(USCO, UCLN), XP(UAPO, UQOT),        _______,                          _______, _______, _______, _______, _______, _______,
-    _______,          _______, _______, KC_BTN4, _______, _______, _______, _______,   XP(UCOM, ULTH), XP(UDOT, UGTH), XP(USLS, UQUE),        KC_APP,               _______,    _______, _______, _______, _______, _______, _______,
-                   _______, _______,                               _______,                                     _______,                                   _______, _______,    _______,   _______
+    VRSN,             KC_SLEP, _______, UC_MOD,  _______, _______, _______, _______, _______, _______,        _______,        _______, _______, _______, _______, _______, _______,
+    _______, _______, X(UAT),  X(UHSH), X(UDLR), X(USCT), X(UCFX), X(UAMP), X(UAST), _______, _______,        _______,               _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
+    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SLCK, KC_PAUS,        XP(ULSB, ULCB), XP(URSB, URCB),        _______,   _______, _______, _______, _______, _______, _______,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______, _______, XP(USCO, UCLN), XP(UAPO, UQOT),        _______,                          _______, _______, _______, _______, _______, _______,
+    _______,          _______, _______, KC_BTN4, _______, _______, _______, _______, XP(UCOM, ULTH), XP(UDOT, UGTH), XP(USLS, UQUE),        KC_APP,               _______,    _______, _______, _______, _______, _______, _______,
+                   _______, _______,                               _______,                                   _______,                                   _______, _______,    _______,   _______
     )
 };
 
diff --git a/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c b/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
index 068c6c4b60..f01f9788f3 100644
--- a/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
+++ b/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
@@ -79,7 +79,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case PSCSYSR: {
             if (record->event.pressed) {
                 if (keyboard_report->mods & MODS_ALT_MASK) {
-                    tap_code(KC_SYSREQ);
+                    tap_code(KC_SYSTEM_REQUEST);
                 } else {
                     register_code(KC_PAUS);
                 }
diff --git a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c
index 2ba8b3e503..9c2b6e8ca5 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c
+++ b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c
@@ -94,7 +94,7 @@ uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shi
     uint16_t pseudo_keycode = 0x00; /* default value */
 
     switch (keycode) {
-        case KC_A ... KC_CAPSLOCK:
+        case KC_A ... KC_CAPS_LOCK:
 #if defined(__AVR__)
             if (shift_modded) {
                 pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
diff --git a/keyboards/hhkb/rn42/rn42_task.c b/keyboards/hhkb/rn42/rn42_task.c
index 88ae88c150..3a95ee0ac1 100644
--- a/keyboards/hhkb/rn42/rn42_task.c
+++ b/keyboards/hhkb/rn42/rn42_task.c
@@ -372,7 +372,7 @@ bool command_extra(uint8_t code)
                 config_mode = false;
             }
             return true;
-        case KC_SCROLLLOCK:
+        case KC_SCROLL_LOCK:
             init_rn42();
             return true;
 #ifdef NKRO_ENABLE
@@ -451,8 +451,8 @@ static uint8_t code2asc(uint8_t code)
         case KC_SPACE: return ' ';
         case KC_MINUS: return (shifted ? '_' : '-');
         case KC_EQUAL: return (shifted ? '+' : '=');
-        case KC_LBRACKET: return (shifted ? '{' : '[');
-        case KC_RBRACKET: return (shifted ? '}' : ']');
+        case KC_LEFT_BRACKET: return (shifted ? '{' : '[');
+        case KC_RIGHT_BRACKET: return (shifted ? '}' : ']');
         case KC_BSLASH: return (shifted ? '|' : '\\');
         case KC_NONUS_HASH: return (shifted ? '|' : '\\');
         case KC_SCOLON: return (shifted ? ':' : ';');
diff --git a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
index 96d94d253c..20f836cd12 100644
--- a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     //-------------------------------//
                     _______, _______, _______, _______),
 
-    [FCTN] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYSREQ,
+    [FCTN] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ,
                     //-------------------------------//
                     KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
                     //-------------------------------//
diff --git a/keyboards/horizon/keymaps/default/keymap.c b/keyboards/horizon/keymaps/default/keymap.c
index 29a9bec0d8..18a876c403 100644
--- a/keyboards/horizon/keymaps/default/keymap.c
+++ b/keyboards/horizon/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FUNCTION] = LAYOUT(
         _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SLCK, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
-        _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS ,                   KC_CLCK, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
+        _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS ,                   KC_CAPS, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
         _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
diff --git a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
index 661bee8d03..b99b213e37 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                             ADDDD,  _______,    KC_DELT,ADDDD
 ),
 [_ADJUST] = LAYOUT(
diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
index db09761bc2..6a3098df90 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_thumbrow(
     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_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,                 KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,                 KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                     LOWER,  ADDDD,  _______,KC_ESC, KC_ENT, ALT_ENT,ADDDD, RAISE
 ),
 [_ADJUST] = LAYOUT_thumbrow(
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
index 04ed6f97bf..ea6a1840d8 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_full(
     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_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
     _______,_______,_______,ADDDD,  _______,    KC_DELT,ADDDD,  _______,_______,_______
 ),
 [_ADJUST] = LAYOUT_full(
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
index 70d9cfabce..19da390a58 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_split_3x5_3(
     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_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                     LOWER,  _______,_______,    _______,ADDDD,  RAISE
 ),
 [_ADJUST] = LAYOUT_split_3x5_3(
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
index 66973a32ed..fbe4c323aa 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, _______ ,
+    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, _______ ,
                             _______,_______,    _______,ADDDD,
                             _______,_______,    _______,ADDDD
 ),
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
index 3e61839b14..88120dfbc1 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                             _______,_______,    _______,ADDDD
 ),
 [_ADJUST] = LAYOUT(
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
index f261115055..35f72292ea 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ergodox(
   // left hand
   KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,  KC_5, KC_ESC,
-  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T, KC_LBRACKET,
+  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T, KC_LBRC,
   KC_ESC,   KC_A,    KC_S,    KC_D,    KC_F,  KC_G,
   KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,  KC_B, _______,
   TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRACKET, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,                KC_BSPACE,
+  KC_RBRC,     KC_Y, KC_U,  KC_I,    KC_O,    KC_P,                KC_BSPACE,
                KC_H, KC_J,  KC_K,    KC_L,    KC_SCOLON,           KC_QUOTE,
   _______,     KC_N, KC_M,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_WORKMAN] = LAYOUT_ergodox(
   // left hand
   KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_ESC,
-  KC_TAB,   KC_Q,    KC_D,    KC_R,    KC_W,    KC_B, KC_LBRACKET,
+  KC_TAB,   KC_Q,    KC_D,    KC_R,    KC_W,    KC_B, KC_LBRC,
   KC_ESC,   KC_A,    KC_S,    KC_H,    KC_T,    KC_G,
   KC_LSFT,  KC_Z,    KC_X,    KC_M,    KC_C,    KC_V, _______,
   TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRACKET, KC_J, KC_F,  KC_U,    KC_P,    KC_SCOLON,           KC_BSPACE,
+  KC_RBRC,     KC_J, KC_F,  KC_U,    KC_P,    KC_SCOLON,           KC_BSPACE,
                KC_Y, KC_N,  KC_E,    KC_O,    KC_I,                KC_QUOTE,
   _______,     KC_K, KC_L,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT_ergodox(
   // left hand
   KC_GRV,   KC_1,      KC_2,    KC_3,    KC_4,  KC_5, KC_ESC,
-  KC_TAB,   KC_QUOT,   KC_COMM, KC_DOT,  KC_P,  KC_Y, KC_LBRACKET,
+  KC_TAB,   KC_QUOT,   KC_COMM, KC_DOT,  KC_P,  KC_Y, KC_LBRC,
   KC_ESC,   KC_A,      KC_O,    KC_E,    KC_U,  KC_I,
   KC_LSFT,  KC_SCOLON, KC_Q,    KC_J,    KC_K,  KC_X, _______,
   TT(_NUM), KC_LCTL,   KC_LALT, KC_LGUI, LOWER,
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,  KC_DEL,
-  KC_RBRACKET, KC_F, KC_G,  KC_C,    KC_R,    KC_L,  KC_BSPACE,
+  KC_RBRC,     KC_F, KC_G,  KC_C,    KC_R,    KC_L,  KC_BSPACE,
                KC_D, KC_H,  KC_T,    KC_N,    KC_S,  LT(MOUSE, KC_SLSH),
   _______,     KC_B, KC_M,  KC_W,    KC_V,    KC_Z,  RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
@@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT_ergodox(
   // left hand
   KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_ESC,
-  KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_LBRACKET,
+  KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_LBRC,
   KC_ESC,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
   KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, _______,
   TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRACKET, KC_J, KC_L,  KC_U,    KC_Y,    KC_SCOLON,           KC_BSPACE,
+  KC_RBRC,     KC_J, KC_L,  KC_U,    KC_Y,    KC_SCOLON,           KC_BSPACE,
                KC_H, KC_N,  KC_E,    KC_I,    KC_O,                KC_QUOTE,
   _______,     KC_K, KC_M,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
index 13cf68e758..17ff9d615d 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
@@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *    |     |     |     |
  *    +-----+-----+-----+
  */
-       KC_TRNS,  KC_TRNS, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_NUM,     KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
        KC_TRNS,  KC_TRNS, KC_KP_7,    KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
                  KC_TRNS, KC_KP_4,    KC_KP_5,     KC_KP_6,        KC_KP_PLUS,  KC_TRNS,
        KC_TRNS,  KC_TRNS, KC_KP_1,    KC_KP_2,     KC_KP_3,        KC_KP_ENTER, KC_TRNS,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index a122b83af8..05142f2212 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_NONUS_BSLASH,
+    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,
diff --git a/keyboards/janus/keymaps/default/keymap.c b/keyboards/janus/keymaps/default/keymap.c
index 440645a15d..0386396cc7 100644
--- a/keyboards/janus/keymaps/default/keymap.c
+++ b/keyboards/janus/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FUNCTION] = LAYOUT_split_3x5_2(
         KC_F1  , KC_F2  , KC_F3  , KC_F4  , QK_BOOT, KC_SLCK, KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
-        KC_F5  , KC_F6  , KC_F7  , KC_F8  , XXXXXXX, KC_CLCK, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS,
+        KC_F5  , KC_F6  , KC_F7  , KC_F8  , XXXXXXX, KC_CAPS, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS,
         OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, XXXXXXX, KC_NLCK, OS_RCTL, OS_RSFT, OS_RALT, OS_RGUI,
                                    _______, _______, _______, _______
     ),
diff --git a/keyboards/jd40/keymaps/myoung34/keymap.c b/keyboards/jd40/keymaps/myoung34/keymap.c
index eb4146d158..d1baa22202 100644
--- a/keyboards/jd40/keymaps/myoung34/keymap.c
+++ b/keyboards/jd40/keymaps/myoung34/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_AL] = LAYOUT(
          KC_GRV,      KC_1,      KC_2,      KC_3,         KC_4,        KC_5,       KC_6,      KC_7,     KC_8,      KC_9,      KC_0, KC_DEL,
          KC_TAB,     KC_F1,     KC_F2,     KC_F3,        KC_F4,       KC_F5,      KC_F6,     KC_F7,    KC_F8,     KC_F9,    KC_ENT,
-        _______,   _______, KC_SCOLON,  KC_QUOTE,  KC_LBRACKET, KC_RBRACKET,  KC_BSLASH,  KC_MINUS,  KC_EQUAL,   KC_PGUP,  KC_SLASH,
+        _______,   _______, KC_SCOLON,  KC_QUOTE,  KC_LBRC, KC_RBRC,  KC_BSLASH,  KC_MINUS,  KC_EQUAL,   KC_PGUP,  KC_SLASH,
         _______,   _______,   _______,   _______,      MO(_UL),     TG(_UL),    _______,   KC_HOME,  KC_PGDN,    KC_END
     ),
 
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
index 7632f81b93..9ec9e70617 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all( /* Base */
-        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,KC_SCROLLLOCK,KC_PAUSE,
+        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
index cc3ba84d87..b7b29b534b 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
@@ -25,7 +25,7 @@ enum layers
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_all( /* BASE */
-        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,KC_SCROLLLOCK,KC_PAUSE,
+        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
         KC_LCTL,KC_LGUI,KC_LALT,KC_COMMAND,KC_SPC,KC_SPC,KC_SPC,KC_F14,KC_RALT,KC_NO,KC_NO,KC_COMMAND,   KC_LEFT,KC_DOWN,KC_RIGHT,           KC_P0,   KC_NO, KC_PDOT,   KC_NO ),
     [COMMAND] = LAYOUT_all( /* COMMAND */
-        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,KC_SCROLLLOCK,KC_PAUSE,
+        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
diff --git a/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c b/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
index 486294c980..b171d25577 100644
--- a/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_INS,   KC_HOME, 
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_DEL,   KC_END,  
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,            KC_PGUP, 
-    KC_CLCK,  KC_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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_PGDN, 
     KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,    MO(_CL), 
     KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,   MO(_FL),  KC_BSPC,                      KC_RALT,  KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index 476b50b8e4..d06d1f8e0a 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, LCA(KC_DEL), KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_NUMPAD] = LAYOUT_ansi_1u(
-        KC_NUMLOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_KP_SLASH, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_MINUS, KC_TRNS, KC_KP_ENTER, KC_TRNS,
diff --git a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
index 0aa1e780a7..455964ac39 100644
--- a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_BASE] = LAYOUT( \
     CTLALTSFT,  KC_F1,    KC_F2,    KC_F3,   KC_F4,    KC_F5,         KC_F6,          KC_F7,            KC_F8,        KC_F9,          KC_F10,     KC_F11,             KC_F12,  KC_PSCREEN,  KC_PAUSE,   KC_CAPS,    KC_INSERT,      KC_EQL,     \
-    KC_GRV,     KC_1,     KC_2,     KC_3,    KC_4,     KC_5,          KC_HOME,        KC_NUMLOCK,       KC_KP_SLASH,  KC_KP_ASTERISK, KC_LBRC,    KC_RBRC,              KC_6,    KC_7,        KC_8,       KC_9,       KC_0,           KC_MINS,   \
+    KC_GRV,     KC_1,     KC_2,     KC_3,    KC_4,     KC_5,          KC_HOME,        KC_NUM,           KC_KP_SLASH,  KC_KP_ASTERISK, KC_LBRC,    KC_RBRC,              KC_6,    KC_7,        KC_8,       KC_9,       KC_0,           KC_MINS,   \
     KC_TAB,     KC_Q,     KC_W,     KC_F,    KC_P,     KC_G,          KC_END,         KC_P7,            KC_P8,        KC_P9,          KC_PMNS,    KC_PGUP,              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_DEL,         KC_P4,            KC_P5,        KC_P6,          KC_PPLS,    KC_PGDN,              KC_H,    KC_N,        KC_E,       KC_I,       KC_O,           KC_QUOT,          \
     KC_LSFT,    KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,          SFT_T(KC_ENT),  KC_P1,            KC_P2,        KC_P3,          KC_UP,      KC_BSLASH,            KC_K,    KC_M,        KC_COMM,    KC_DOT,     KC_SLSH,        SFT_T(KC_ENT),      \
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [_QWERTY] = LAYOUT( \
     CTLALTSFT,  KC_F1,    KC_F2,    KC_F3,   KC_F4,    KC_F5,         KC_F6,          KC_F7,            KC_F8,        KC_F9,          KC_F10,     KC_F11,               KC_F12,  KC_PSCREEN,  KC_PAUSE,   KC_CAPS,    KC_INSERT,      KC_EQL,     \
-    KC_GRV,     KC_1,     KC_2,     KC_3,    KC_4,     KC_5,          KC_HOME,        KC_NUMLOCK,       KC_KP_SLASH,  KC_KP_ASTERISK, KC_LBRC,    KC_RBRC,              KC_6,    KC_7,        KC_8,       KC_9,       KC_0,           KC_MINS,   \
+    KC_GRV,     KC_1,     KC_2,     KC_3,    KC_4,     KC_5,          KC_HOME,        KC_NUM,           KC_KP_SLASH,  KC_KP_ASTERISK, KC_LBRC,    KC_RBRC,              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_END,         KC_P7,            KC_P8,        KC_P9,          KC_PMNS,    KC_PGUP,              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_DEL,         KC_P4,            KC_P5,        KC_P6,          KC_PPLS,    KC_PGDN,              KC_H,    KC_J,        KC_K,       KC_L,       KC_SCLN,           KC_QUOT,          \
     KC_LSFT,    KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,          SFT_T(KC_ENT),  KC_P1,            KC_P2,        KC_P3,          KC_UP,      KC_BSLASH,            KC_N,    KC_M,        KC_COMM,    KC_DOT,     KC_SLSH,        SFT_T(KC_ENT),      \
diff --git a/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c b/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
index 6901d6db8d..956cec115d 100644
--- a/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
@@ -19,9 +19,9 @@ 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_BSLS,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
- KC_CAPSLOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRACKET,  KC_RBRACKET,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,         KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     KC_LALT, KC_LGUI,   KC_ENT,              MO(_LOWER),  KC_SPC,   KC_RALT
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/nstickney/keymap.c b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
index 07c4fd28ef..2738ed2827 100644
--- a/keyboards/keebio/iris/keymaps/nstickney/keymap.c
+++ b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
 
     [FCTN] = LAYOUT(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYSREQ,
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ,
         KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
         KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
         _______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_F11, KC_F12, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
diff --git a/keyboards/keebio/levinson/keymaps/numpad/keymap.c b/keyboards/keebio/levinson/keymaps/numpad/keymap.c
index ad7442a7c8..e93d391f1f 100644
--- a/keyboards/keebio/levinson/keymaps/numpad/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/numpad/keymap.c
@@ -59,10 +59,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------'
  */
 [1] = LAYOUT_ortho_4x12(
-    M0,         M1, M4, M7, KC_NO, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LEFT,    M2, M5, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_RIGHT,   M3, M6, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NUMLOCK, QK_BOOT, KC_NO, KC_NO, KC_CALC, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    M0,       M1, M4, M7, KC_NO, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_LEFT,  M2, M5, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_RIGHT, M3, M6, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_NUM,   QK_BOOT, KC_NO, KC_NO, KC_CALC, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
 )
 };
 
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
index 6a05648074..c9250e6094 100644
--- a/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
+++ b/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
@@ -20,12 +20,12 @@ enum layers { _BASE, _FN1};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_numpad_6x4(
-        MO(_FN1),   KC_ESC,  KC_BSPACE, KC_TAB,
-        KC_NUMLOCK, 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),
+        MO(_FN1), KC_ESC,  KC_BSPACE, KC_TAB,
+        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),
 
     [_FN1] = LAYOUT_numpad_6x4(
         _______,    KC_MUTE, KC_VOLD,   KC_VOLU,
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
index 078ede4041..93bacad361 100644
--- a/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
+++ b/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
@@ -21,11 +21,11 @@ enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_numpad_6x4(
         MO(_FN1), KC_ESC,  KC_BSPACE, KC_TAB,
-        KC_NUMLOCK, 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),
+        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),
 
     [_FN1] = LAYOUT_numpad_6x4(
         _______,    KC_MUTE, KC_VOLD,   KC_VOLU,
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
index 5e0d4afa32..0140fbe82f 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //layers
   [NAVR] = LAYOUT_planck_mit(
     KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             C(S(KC_Z)),        C(A(KC_LEFT)),     C(KC_X),           C(KC_C),           C(A(KC_RGHT)),     KC_LALT,
-    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CLCK,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
+    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
     KC_LCTL,              KC_NO,             KC_ALGR,           KC_NO,              G(S(C(KC_F5))),   KC_NO,             KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_LCTL,
     TG(GAME),             KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_ENT,                      KC_BSPC,           KC_DEL,            KC_NO,             C(G(KC_LEFT)),     C(G(KC_RIGHT))
   ),
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
index 1d274880c2..01490bd2dc 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //layers
   [NAVR] = LAYOUT_planck_mit(
     KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             C(S(KC_Z)),        C(A(KC_LEFT)),     C(KC_X),           C(KC_C),           C(A(KC_RGHT)),     KC_LALT,
-    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CLCK,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
+    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
     KC_LCTL,              KC_NO,             KC_ALGR,           KC_NO,              G(S(C(KC_F5))),   KC_NO,             KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_LCTL,
     TG(GAME),             KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_ENT,                      KC_BSPC,           KC_DEL,            KC_NO,             C(G(KC_LEFT)),     C(G(KC_RIGHT))
   ),
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
index d1c33599a2..1f2dc0e141 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //layers
   [NAVR] = LAYOUT_planck_mit(
     KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             C(S(KC_Z)),        C(A(KC_LEFT)),     C(KC_X),           C(KC_C),           C(A(KC_RGHT)),     KC_LALT,
-    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CLCK,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
+    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
     KC_LCTL,              KC_NO,             KC_ALGR,           KC_NO,              G(S(C(KC_F5))),   KC_NO,             KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_LCTL,
     TG(GAME),             KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_ENT,                      KC_BSPC,           KC_DEL,            KC_NO,             C(G(KC_LEFT)),     C(G(KC_RIGHT))
   ),
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index 37bd802541..eee7d2f9bf 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -53,7 +53,7 @@
 // #define COMBO_COUNT 2               // Set this to the number of combos that you're using in the Combo feature.
 // #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_CAPSLOCK 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 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
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index 05e7a489dd..7a5269c3da 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
@@ -38,7 +38,7 @@
 // #define COMBO_COUNT 2               // Set this to the number of combos that you're using in the Combo feature.
 // #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_CAPSLOCK 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 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
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
index a4d3d37561..c525cff819 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
@@ -41,5 +41,5 @@
     #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_CAPSLOCK 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.
+        // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
 */
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
index 02601a30d9..2d8a9a55bf 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
@@ -177,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [LAYER_SYST] = LAYOUT_ortho_4x12(
          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_POWER, KC_SYSREQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX,
+         XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_POWER, KC_SYRQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX,
          XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_APP, MT(MOD_RSFT, KC_INS), XXXXXXX,
          XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
 
@@ -263,7 +263,7 @@ void matrix_init_user(void) {
   // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values
   // set num lock on at start (for numonly layer to work)
   if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) {
-      SEND_STRING(SS_TAP(X_NUMLOCK)); //register_code(KC_NUMLOCK); unregister_code(KC_NUMLOCK);
+      SEND_STRING(SS_TAP(X_NUMLOCK)); //register_code(KC_NUM_LOCK); unregister_code(KC_NUM_LOCK);
   }
 }
 
diff --git a/keyboards/latincompass/latin64ble/keymaps/default/keymap.c b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
index 4c05beb7d7..8a1e9f6366 100644
--- a/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	RGB_SPI, RGB_SPD,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
 	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),	
     [2] = LAYOUT( 
-    KC_NUMLOCK,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10,    KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_NUM,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10,    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_DEL,
 	KC_CAPS, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
diff --git a/keyboards/latincompass/latin64ble/keymaps/via/keymap.c b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
index 08ce5fbf3f..f25f7db173 100644
--- a/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	RGB_SPI, RGB_SPD,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
 	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),	
     [2] = LAYOUT( 
-    KC_NUMLOCK,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10,    KC_MINS,  KC_EQL,  KC_BSPC,
+    KC_NUM,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10,    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_DEL,
 	KC_CAPS, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
diff --git a/keyboards/latincompass/latinpad/keymaps/default/keymap.c b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
index b6606e6be7..e2f263005f 100644
--- a/keyboards/latincompass/latinpad/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
         KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
     [1] = LAYOUT(
-        KC_NUMLOCK, KC_CALCULATOR,
+        KC_NUM, KC_CALCULATOR,
         RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
         RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
         RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
diff --git a/keyboards/latincompass/latinpad/keymaps/via/keymap.c b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
index 12d7e910e6..e2c99f38d2 100644
--- a/keyboards/latincompass/latinpad/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
         KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
     [1] = LAYOUT(
-        KC_NUMLOCK, KC_CALCULATOR,
+        KC_NUM, KC_CALCULATOR,
         RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
         RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
         RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
diff --git a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
index 3fed6c0cb4..3b7189ffa0 100644
--- a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
         KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
     [1] = LAYOUT_pad(
-        KC_NUMLOCK,
+        KC_NUM,
 		RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
         RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
         RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
diff --git a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
index 2c4cc5f409..193c024cf6 100644
--- a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
         KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
     [1] = LAYOUT_pad(
-        KC_NUMLOCK,
+        KC_NUM,
 		RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
         RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
         RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
index ab1c35c51a..70b32d4f44 100644
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
@@ -43,10 +43,10 @@ KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,            KC_SPC,
  */
 
 [_L1] = LAYOUT(
-KC_GRAVE,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,  KC_NUMLOCK, _______, KC_PSLS,
-_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, _______, KC_LBRC, KC_RBRC,        KC_BSLASH,     KC_MINS,  KC_EQL, KC_PAST,
-_______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_COMM,          KC_DOT , KC_SLSH, _______,     _______, _______, KC_PMNS,
-_______, _______, _______,          _______,            _______,                 KC_SCLN, KC_QUOT, _______,     _______, _______, KC_PPLS
+KC_GRAVE,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL, KC_NUM,  _______, KC_PSLS,
+_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, _______, KC_LBRC, KC_RBRC,        KC_BSLASH, KC_MINS,  KC_EQL, KC_PAST,
+_______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_COMM,          KC_DOT , KC_SLSH, _______, _______, _______, KC_PMNS,
+_______, _______, _______,          _______,            _______,                 KC_SCLN, KC_QUOT, _______, _______, _______, KC_PPLS
 ),
 
 /* L2
diff --git a/keyboards/lets_split/keymaps/piemod/keymap.c b/keyboards/lets_split/keymaps/piemod/keymap.c
index 0711303d9c..cfb7fbdc0c 100644
--- a/keyboards/lets_split/keymaps/piemod/keymap.c
+++ b/keyboards/lets_split/keymaps/piemod/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_SYMBOL] = LAYOUT( \
-  KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRACKET,  KC_RBRACKET,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN, \
+  KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRC,  KC_RBRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN, \
   KC_NO,  KC_NO,  KC_TRNS,  KC_SCOLON,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH), \
   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLASH,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE, \
   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,   KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL \
diff --git a/keyboards/malevolti/lyra/keymaps/default/keymap.c b/keyboards/malevolti/lyra/keymaps/default/keymap.c
index 1d4bef03f2..76c718affd 100644
--- a/keyboards/malevolti/lyra/keymaps/default/keymap.c
+++ b/keyboards/malevolti/lyra/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
     KC_ESC,		KC_1,		KC_2,		KC_3,				KC_4,		KC_5,		KC_6,				KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
     KC_TAB,		KC_LBRC,	KC_Q,		KC_W,				KC_E,		KC_R,		KC_T,				KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
-    KC_CLCK,	KC_RBRC,	KC_A,		KC_S,				KC_D,		KC_F,		KC_G,				KC_H,		KC_J,       KC_K,		KC_L,		KC_SCLN,		KC_QUOT,		KC_ENT,
+    KC_CAPS,	KC_RBRC,	KC_A,		KC_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_UP,			KC_RSFT,
     KC_LCTL,	KC_LGUI,	KC_LALT,	TT(1),				KC_APP,		KC_PGDN,	KC_SPC,				KC_SPC,		KC_PGUP,	KC_RALT,	KC_RCTL,	KC_LEFT,		KC_DOWN,		KC_RGHT					
     ),
diff --git a/keyboards/malevolti/lyra/keymaps/via/keymap.c b/keyboards/malevolti/lyra/keymaps/via/keymap.c
index efc40d2267..a5829aea96 100644
--- a/keyboards/malevolti/lyra/keymaps/via/keymap.c
+++ b/keyboards/malevolti/lyra/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
     KC_ESC,   KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS,    KC_EQL,     KC_BSPC,
     KC_TAB,   KC_LBRC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,     KC_I,     KC_O,    KC_P,       KC_NUHS,    KC_DEL,
-    KC_CLCK,  KC_RBRC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,     KC_K,     KC_L,    KC_SCLN,    KC_QUOT,    KC_ENT,
+    KC_CAPS,  KC_RBRC,  KC_A,    KC_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_UP,      KC_RSFT,
     KC_LCTL,  KC_LGUI,  KC_LALT,  TT(1),  KC_APP,  KC_PGDN, KC_SPC,      KC_SPC,  KC_PGUP,  KC_RALT,  KC_RCTL, KC_LEFT,    KC_DOWN,    KC_RGHT
     ),
diff --git a/keyboards/malevolti/superlyra/keymaps/default/keymap.c b/keyboards/malevolti/superlyra/keymaps/default/keymap.c
index c266867f6f..d4536d897d 100644
--- a/keyboards/malevolti/superlyra/keymaps/default/keymap.c
+++ b/keyboards/malevolti/superlyra/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
     KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NLCK,	KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
     KC_TAB,		KC_LBRC,	KC_Q,		KC_W,	KC_E,		KC_R,		KC_T,			KC_P7,		KC_P8,		KC_P9,		KC_PAST,			KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
-    KC_CLCK,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			KC_H,		KC_J,       KC_K,		KC_L,		KC_SCLN,		KC_QUOT,		KC_ENT,
+    KC_CAPS,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			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_P1,		KC_P2,		KC_P3,		KC_PPLS,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
     KC_LCTL,	KC_LGUI,	KC_LALT,	TT(1),	KC_APP,		KC_PGDN,	KC_SPC,			KC_DEL,		KC_P0,		KC_PDOT,	KC_ENT,				KC_SPC,		KC_PGUP,	KC_RALT,	KC_RCTL,	KC_LEFT,		KC_DOWN,		KC_RGHT					
     ),
diff --git a/keyboards/malevolti/superlyra/keymaps/via/keymap.c b/keyboards/malevolti/superlyra/keymaps/via/keymap.c
index 8c29bed56a..39b35280f6 100644
--- a/keyboards/malevolti/superlyra/keymaps/via/keymap.c
+++ b/keyboards/malevolti/superlyra/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
     KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NLCK,	KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
     KC_TAB,		KC_LBRC,	KC_Q,		KC_W,	KC_E,		KC_R,		KC_T,			KC_P7,		KC_P8,		KC_P9,		KC_PAST,			KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
-    KC_CLCK,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			KC_H,		KC_J,       KC_K,		KC_L,		KC_SCLN,		KC_QUOT,		KC_ENT,
+    KC_CAPS,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			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_P1,		KC_P2,		KC_P3,		KC_PPLS,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
     KC_LCTL,	KC_LGUI,	KC_LALT,	TT(1),	KC_APP,		KC_PGDN,	KC_SPC,			KC_DEL,		KC_P0,		KC_PDOT,	KC_ENT,				KC_SPC,		KC_PGUP,	KC_RALT,	KC_RCTL,	KC_LEFT,		KC_DOWN,		KC_RGHT		
     ),
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
index 552ed7b183..f92700ca16 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *   KC_QUOTE,      KC_COMMA,      KC_DOT,     KC_P,                KC_Y,                                 KC_F,       KC_G,      KC_C,    KC_R,          KC_L,
  *   KC_A,          KC_O,          KC_E,       KC_U,                KC_I,                                 KC_D,       KC_H,      KC_T,    KC_N,          KC_S,
  *   KC_SCOLON,     KC_Q,          KC_J,       KC_K,                KC_X,                                 KC_B,       KC_M,      KC_W,    KC_V,          KC_Z,
- *   OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER,   KC_SPACE,  KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT)
+ *   OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER,   KC_SPACE,  KC_BSPC, RCTL(KC_BSPC), KC_CAPS, OSM(MOD_LSFT)
  * ),
  *KC_GRV,
  */
diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
index b7112c9ea7..2d786af9b7 100644
--- a/keyboards/massdrop/alt/keymaps/b_/config.h
+++ b/keyboards/massdrop/alt/keymaps/b_/config.h
@@ -42,7 +42,7 @@
 // #define COMBO_TERM 200              			// How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
 // #define TAP_CODE_DELAY 100          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
 #define TAP_CODE_DELAY 25          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      			// Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPSLOCK 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 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)
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
index 6afd882dbe..ccf0bbc72d 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
@@ -118,11 +118,11 @@ const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO, KC_NO,      KC_NO,                            KC_NO,                    KC_NO, _______, KC_NO, KC_NO, KC_NO
     ),
     [_KP] = LAYOUT(
-        _______,    _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______, _______,       _______, _______, _______, _______,
-        KC_NUMLOCK, KC_KP_7, KC_KP_8, KC_KP_9, _______, _______, _______, KC_KP_7, KC_KP_8,        KC_KP_9, KC_KP_MINUS,   _______, _______, _______, _______,
-        _______,    KC_KP_4, KC_KP_5, KC_KP_6, _______, _______, _______, KC_KP_4, KC_KP_5,        KC_KP_6, KC_KP_PLUS,    _______, _______,          _______,
-        _______,    KC_KP_1, KC_KP_2, KC_KP_3, _______, _______, _______, KC_KP_1, KC_KP_2,        KC_KP_3, KC_KP_SLASH,   _______,          _______, _______,
-        _______,    _______, _______,                            KC_KP_0,                                       KC_KP_DOT, TG(_KP), _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______, _______,       _______, _______, _______, _______,
+        KC_NUM,  KC_KP_7, KC_KP_8, KC_KP_9, _______, _______, _______, KC_KP_7, KC_KP_8,        KC_KP_9, KC_KP_MINUS,   _______, _______, _______, _______,
+        _______, KC_KP_4, KC_KP_5, KC_KP_6, _______, _______, _______, KC_KP_4, KC_KP_5,        KC_KP_6, KC_KP_PLUS,    _______, _______,          _______,
+        _______, KC_KP_1, KC_KP_2, KC_KP_3, _______, _______, _______, KC_KP_1, KC_KP_2,        KC_KP_3, KC_KP_SLASH,   _______,          _______, _______,
+        _______, _______, _______,                            KC_KP_0,                                       KC_KP_DOT, TG(_KP), _______, _______, _______
     ),
     [_SECRETS] = LAYOUT(
         KC_NO, KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5, KC_SEC6, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO,
@@ -260,7 +260,7 @@ static void set_rgb_layer(int layer) {
 void matrix_init_keymap(void) {
     // force numlock on upon startup
     if (!NUMLOCK_ON) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 };
 
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
index 8db9222783..c98d3fd77f 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
@@ -144,7 +144,7 @@ void matrix_init_keymap(void) {
     set_rgb_layer(_QWERTY);
     // force numlock on upon startup
     if (!NUMLOCK_ON) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 };
 
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 2d13d2c5c9..1dd36d7013 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -54,7 +54,7 @@
 // #define COMBO_COUNT 2               			// Set this to the number of combos that you're using in the Combo feature.
 // #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_CAPSLOCK 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 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)
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 4b702a1110..0b24562fce 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -38,7 +38,7 @@
 // #define COMBO_COUNT 2               // Set this to the number of combos that you're using in the Combo feature.
 // #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_CAPSLOCK 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 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
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index b8dddc9ec5..412c12e300 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define COMBO_COUNT 2               // Set this to the number of combos that you're using in the Combo feature.
 // #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_CAPSLOCK 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 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
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index 59feed09a9..cd836ccc36 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -54,7 +54,7 @@
 // #define COMBO_COUNT 2               // Set this to the number of combos that you're using in the Combo feature.
 // #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_CAPSLOCK 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 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
diff --git a/keyboards/mechwild/bbs/bbs.c b/keyboards/mechwild/bbs/bbs.c
index cbfaa5ce59..02c5f43dd9 100644
--- a/keyboards/mechwild/bbs/bbs.c
+++ b/keyboards/mechwild/bbs/bbs.c
@@ -8,7 +8,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) { return false; }
     switch (index) {
         case 0:
-            if(active) { tap_code(KC_CLCK); }
+            if(active) { tap_code(KC_CAPS_LOCK); }
             break;
         break;
     }
diff --git a/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
index 375dc25ae2..beda5f649d 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
+++ b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
   ),
   [_FN2] = LAYOUT(
-    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,
+    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CAPS,
     _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN,
     _______, _______, _______, _______, KC_DEL,   _______,  _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS
   ),
diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
index 8ce001cff8..9d275dcca3 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
+++ b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
   ),
   [_FN2] = LAYOUT(
-    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,
+    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CAPS,
     _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN,
     _______, _______, _______, _______, KC_DEL,   _______,  _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS
   ),
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
index 9dbd4d3f19..4ebd8c45ac 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
@@ -76,7 +76,7 @@ static const encoder_key PROGMEM encoder_keys[] = {
     {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE},
     {"Teams", "Toggle", "Cam", KC_TEAMS_CAM},
     {"Ctrl", "Alt", "Del", KC_CAD},
-    {"Caps", "Lock", "", KC_CAPSLOCK},
+    {"Caps", "Lock", "", KC_CAPS_LOCK},
     {"Pause", "", "", KC_PAUSE},
     {"PrtScr", "", "", KC_PSCR},
     {"Insert", "", "", KC_INS},
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
index 9b28c68672..eb9aa104b8 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
@@ -75,7 +75,7 @@ static const encoder_key PROGMEM encoder_keys[] = {
     {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE},
     {"Teams", "Toggle", "Cam", KC_TEAMS_CAM},
     {"Ctrl", "Alt", "Del", KC_CAD},
-    {"Caps", "Lock", "", KC_CAPSLOCK},
+    {"Caps", "Lock", "", KC_CAPS_LOCK},
     {"Pause", "", "", KC_PAUSE},
     {"PrtScr", "", "", KC_PSCR},
     {"Insert", "", "", KC_INS},
@@ -108,7 +108,7 @@ 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_CAPSLOCK),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_PLUS,          KC_ENT,
+          LT(1,KC_CAPS),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_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 ),
 
diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.c b/keyboards/mechwild/puckbuddy/puckbuddy.c
index 495cb7e825..e6dc469111 100644
--- a/keyboards/mechwild/puckbuddy/puckbuddy.c
+++ b/keyboards/mechwild/puckbuddy/puckbuddy.c
@@ -57,7 +57,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) { return false; }
     switch (index) {
         case 0:
-            if(active) { tap_code(KC_CLCK); }
+            if(active) { tap_code(KC_CAPS_LOCK); }
             break;
         break;
     }
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
index c981441bc9..bdaa0fc910 100644
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ b/keyboards/mitosis/keymaps/nzen/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_A,      KC_S,      KC_D,      KC_F,      KC_G,     KC_H,      KC_J,        KC_K,        KC_L,   KC_SCOLON,
     KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,     KC_N,      KC_M,        KC_COMM,     KC_DOT, KC_QUOTE,
                KC_BSPACE, KC_DELETE, KC_LCTRL,  TG( 2 ),  TG( 3 ),   KC_RCTRL,    KC_ENTER,    KC_BSPACE,
-               KC_LALT,   KC_0,      KC_LSHIFT, KC_SPACE, KC_SPACE,  KC_RSHIFT,   KC_CAPSLOCK, KC_RALT
+               KC_LALT,   KC_0,      KC_LSHIFT, KC_SPACE, KC_SPACE,  KC_RSHIFT,   KC_CAPS,     KC_RALT
   ),
   /*
   ['Q', 'D', 'R', 'W', 'B',/ ** / 'J', 'F', 'U', 'P', '; :' ],
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_PUNCT] = LAYOUT(
     KC_HASH,     KC_AT,       KC_AMPERSAND, KC_DOT,      KC_SCOLON, 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_BSLASH,   KC_QUESTION, KC_LT,        KC_LBRACKET, KC_DOLLAR, KC_TILDE,      KC_RBRACKET, KC_GT,   KC_EXCLAIM,    KC_SLASH,
+    KC_BSLASH,   KC_QUESTION, KC_LT,        KC_LBRC,     KC_DOLLAR, KC_TILDE,      KC_RBRC,     KC_GT,   KC_EXCLAIM,    KC_SLASH,
                  _______,     _______,      _______,     TG( 4 ),   TG( 3 ),       _______,     _______, _______,
                  _______,     KC_3,         _______,     _______,   _______,       _______,     _______, _______
   ),
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_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__VOLUP,           KC__VOLDOWN,
-    KC_KP_0,        KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS,  KC_NUMLOCK,  KC_WWW_BACK,         KC_AUDIO_MUTE,       KC_RGUI,             KC_PAUSE,
+    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,    _______, _______,     _______,     _______,             _______,             _______
diff --git a/keyboards/mntre/keymaps/default/keymap.c b/keyboards/mntre/keymaps/default/keymap.c
index 58c48d988f..edf334a60f 100644
--- a/keyboards/mntre/keymaps/default/keymap.c
+++ b/keyboards/mntre/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
         KC_ESC,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,     KC_F9,    KC_F10,  KC_F11,      KC_F12,      MO(_FN),
         KC_GRAVE,  KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,    KC_8,      KC_9,     KC_0,    KC_MINUS,    KC_EQUAL,    KC_BSPACE,
-        KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,      KC_O,     KC_P,    KC_LBRACKET, KC_RBRACKET, KC_BSLASH,
+        KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,      KC_O,     KC_P,    KC_LBRC,     KC_RBRC,     KC_BSLASH,
         KC_LCTRL,  KC_APP,  KC_A,     KC_S,     KC_D,    KC_F,    KC_G,     KC_H,    KC_J,      KC_K,     KC_L,    KC_SCOLON,   KC_QUOTE,    KC_ENTER,
         KC_LSHIFT, KC_DEL,  KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,     KC_N,    KC_M,      KC_COMMA, KC_DOT,  KC_SLASH,    KC_UP,       KC_RSHIFT,
         KC_RGUI,   KC_LGUI, KC_RCTRL, KC_SPACE, KC_LALT, KC_RALT, KC_SPACE, KC_PGUP, KC_PGDOWN, KC_LEFT,  KC_DOWN, KC_RIGHT
diff --git a/keyboards/morizon/keymaps/default/keymap.c b/keyboards/morizon/keymaps/default/keymap.c
index 9b7ce4b291..dbf9d04412 100644
--- a/keyboards/morizon/keymaps/default/keymap.c
+++ b/keyboards/morizon/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_CLCK, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
+        KC_CAPS, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
         KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                   KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_MINS,
         KC_EQL , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_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_ESC , KC_ENT , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FUNCTION] = LAYOUT(
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
         _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SLCK, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
-        _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS , _______, _______, KC_CLCK, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
+        _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS , _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
         _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
diff --git a/keyboards/mxss/keymaps/default/keymap.c b/keyboards/mxss/keymaps/default/keymap.c
index 3b7150f7fa..bb34ccd996 100644
--- a/keyboards/mxss/keymaps/default/keymap.c
+++ b/keyboards/mxss/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT( /* Base */
 	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-    KC_CAPSLOCK, KC_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_CAPS, KC_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_SPACE,           KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
 ),
diff --git a/keyboards/mxss/keymaps/via/keymap.c b/keyboards/mxss/keymaps/via/keymap.c
index 823be9fabb..29d91460f0 100644
--- a/keyboards/mxss/keymaps/via/keymap.c
+++ b/keyboards/mxss/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all( /* L0 */
         KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPSLOCK, 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_PGUP,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_PGUP,
         KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_SPACE, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
diff --git a/keyboards/nek_type_a/keymaps/default/keymap.c b/keyboards/nek_type_a/keymaps/default/keymap.c
index 470afa6198..95945a4510 100644
--- a/keyboards/nek_type_a/keymaps/default/keymap.c
+++ b/keyboards/nek_type_a/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
     KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC__MUTE, KC__VOLDOWN, KC__VOLUP,
     KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRACKET, KC_RBRACKET, KC_BSLASH, KC_DELETE, KC_END, KC_PGDOWN,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, KC_DELETE, KC_END, KC_PGDOWN,
     KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
     KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT, KC_UP,
     KC_LCTRL, KC_LALT, KC_LCMD, KC_SPC, KC_SPC, KC_RCMD, KC_RALT, KC_RCTRL, KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c b/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c
index e549f22a83..a53335003f 100644
--- a/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c
@@ -51,11 +51,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,   _______,    _______, _______,                   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_SYSREQ, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______,          _______, _______,
-        _______,   _______,    _______, _______,                   _______,                   _______, _______,    _______,       _______,          _______, _______
+                 _______,    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, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______,          _______, _______,
+        _______, _______,    _______, _______,                   _______,                   _______, _______,    _______,       _______,          _______, _______
     )
 };
 
diff --git a/keyboards/omnikeyish/omnikeyish.c b/keyboards/omnikeyish/omnikeyish.c
index 9b8ce7b972..4a8a7fa4d6 100644
--- a/keyboards/omnikeyish/omnikeyish.c
+++ b/keyboards/omnikeyish/omnikeyish.c
@@ -17,8 +17,8 @@ void keyboard_post_init_user(void) {
 #endif
 
   /* Send numlock keycode to attempt to force numlock back on. */
-  register_code(KC_NUMLOCK);
-  unregister_code(KC_NUMLOCK);
+  register_code(KC_NUM_LOCK);
+  unregister_code(KC_NUM_LOCK);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/planck/keymaps/andylikescandy/keymap.c b/keyboards/planck/keymaps/andylikescandy/keymap.c
index f0bf4fa2c3..2430ee4ac6 100644
--- a/keyboards/planck/keymaps/andylikescandy/keymap.c
+++ b/keyboards/planck/keymaps/andylikescandy/keymap.c
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   QK_BOOT,             XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
   LALT(LCTL(KC_DEL)),  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,
-  KC_CAPSLOCK,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX,
+  KC_CAPS,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX,
   _______,             _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK, XXXXXXX  //PLOVER
 ),
 /* Navigation
diff --git a/keyboards/planck/keymaps/brandon/keymap.c b/keyboards/planck/keymaps/brandon/keymap.c
index cd228c3579..97cf9c15ae 100644
--- a/keyboards/planck/keymaps/brandon/keymap.c
+++ b/keyboards/planck/keymaps/brandon/keymap.c
@@ -236,8 +236,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 
         if (record->tap.count && !record->tap.interrupted) {
           add_weak_mods(MOD_LSFT);
-          register_code(KC_LBRACKET);
-          unregister_code(KC_LBRACKET);
+          register_code(KC_LEFT_BRACKET);
+          unregister_code(KC_LEFT_BRACKET);
           del_weak_mods(MOD_LSFT);
         }
 
@@ -253,8 +253,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 
         if (record->tap.count && !record->tap.interrupted) {
           add_weak_mods(MOD_LSFT);
-          register_code(KC_RBRACKET);
-          unregister_code(KC_RBRACKET);
+          register_code(KC_RIGHT_BRACKET);
+          unregister_code(KC_RIGHT_BRACKET);
           del_weak_mods(MOD_LSFT);
         }
 
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index 9c37567926..57f4ec2629 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -44,14 +44,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT_planck_grid(
     KC_TILD,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,       KC_ASTR,             KC_LPRN,           KC_RPRN,         _______,
     KC_DELETE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,       KC_PLUS,             KC_LCBR,           KC_RCBR,         KC_PIPE,
-    _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NONUS_HASH, KC_NONUS_BSLASH,     KC_HOME,           KC_END,          _______,
+    _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NONUS_HASH, KC_NUBS,             KC_HOME,           KC_END,          _______,
     KC_COMMA,  _______, _______, _______, _______, _______, KC_NO,   _______,       KC_MEDIA_NEXT_TRACK, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_MEDIA_PLAY_PAUSE
   ),
 
   [_RAISE] = LAYOUT_planck_grid(
     KC_GRAVE,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,          KC_8,                KC_9,               KC_0,            _______,
-    KC_DELETE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,  KC_MINUS,      KC_EQUAL,            KC_LBRACKET,        KC_RBRACKET,     KC_BSLASH,
-    _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_NONUS_HASH, KC_NONUS_BSLASH,     KC_PGUP,            KC_PGDOWN,       _______,
+    KC_DELETE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,  KC_MINUS,      KC_EQUAL,            KC_LBRC,            KC_RBRC,         KC_BSLASH,
+    _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_NONUS_HASH, KC_NUBS,             KC_PGUP,            KC_PGDOWN,       _______,
     _______,   _______, _______, _______, _______, _______, KC_NO,  _______,       KC_MEDIA_NEXT_TRACK, KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP, KC_MEDIA_PLAY_PAUSE
   ),
 
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
index 410015708c..70da39e82c 100644
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNCTN] = LAYOUT_planck_grid(
 	KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,
 	KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-	XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, MUV_IN,  KC_SYSREQ,
+	XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, MUV_IN,  KC_SYRQ,
 	QK_BOOT, XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE,  AG_SWAP
 )
 
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index d469dbeccd..3eb8881e18 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [LY_1101] = LAYOUT_gunp(
   SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT,
-  KC_WAKE,   KC_CLCK,    USER_NAME,    USER_EMAIL, RGB_MOD,       DEBUG,
+  KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DEBUG,
   KC_SLEP,   KC_NLCK,    DM_REC1,      DM_PLY1,    XXXXXXX,       EEP_RST,
   KC_PWR,    KC_SLCK,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
 ),
diff --git a/keyboards/planck/keymaps/impossible/keymap.c b/keyboards/planck/keymaps/impossible/keymap.c
index 70ae70dd5d..914a61cb28 100644
--- a/keyboards/planck/keymaps/impossible/keymap.c
+++ b/keyboards/planck/keymaps/impossible/keymap.c
@@ -55,10 +55,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_FN] = LAYOUT_planck_grid(
-  KC_EXLM, KC_AT,       KC_HASH,     KC_DLR,   KC_PERC,   KC_CIRC, KC_AMPR,   KC_ASTR, KC_F12,  KC_F7,  KC_F8,  KC_F9,
-  KC_TAB,  KC_LBRACKET, KC_RBRACKET, KC_MINUS, KC_DELETE, KC_QUOT, KC_LPRN,   KC_RPRN, KC_F11,  KC_F4,  KC_F5,  KC_F6,
-  KC_MENU, _______,     _______,     KC_EQUAL, KC_BSLS,   KC_SLSH, XXXXXXX,   XXXXXXX, KC_PGUP, KC_F1,  KC_F2,  KC_F3,
-  _______, KC_LGUI,     KC_GRAVE,    _______,  _______,   _______, KC_SCOLON, KC_HOME, KC_PGDN, KC_END, KC_F10, _______
+  KC_EXLM, KC_AT,   KC_HASH,  KC_DLR,   KC_PERC,   KC_CIRC, KC_AMPR,   KC_ASTR, KC_F12,  KC_F7,  KC_F8,  KC_F9,
+  KC_TAB,  KC_LBRC, KC_RBRC,  KC_MINUS, KC_DELETE, KC_QUOT, KC_LPRN,   KC_RPRN, KC_F11,  KC_F4,  KC_F5,  KC_F6,
+  KC_MENU, _______, _______,  KC_EQUAL, KC_BSLS,   KC_SLSH, XXXXXXX,   XXXXXXX, KC_PGUP, KC_F1,  KC_F2,  KC_F3,
+  _______, KC_LGUI, KC_GRAVE, _______,  _______,   _______, KC_SCOLON, KC_HOME, KC_PGDN, KC_END, KC_F10, _______
 ),
 
 /* Qwerty
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJ] = LAYOUT_planck_grid(
   _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_PSCR, KC_PAUSE, QK_BOOT,
-  _______, _______, _______, _______, _______, _______, _______, KC_CLCK, MUV_IN,  AU_TOG,  MI_OFF,   _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_CAPS, MUV_IN,  AU_TOG,  MI_OFF,   _______,
   _______, _______, _______, _______, _______, _______, _______, KC_SLCK, MUV_DE,  MU_TOG,  MI_ON,    _______,
   _______, _______, _______, _______, _______, _______, _______, KC_NLCK, WORKMAN, QWERTY,  PLOVER,   _______
 )
diff --git a/keyboards/planck/keymaps/inkwell/keymap.c b/keyboards/planck/keymaps/inkwell/keymap.c
index 2c11ac61b0..ab7e0189ec 100644
--- a/keyboards/planck/keymaps/inkwell/keymap.c
+++ b/keyboards/planck/keymaps/inkwell/keymap.c
@@ -166,7 +166,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
           if (clockwise) {
             tap_code16(KC_PAUSE);
           } else {
-            tap_code16(KC_SCROLLLOCK);
+            tap_code16(KC_SCROLL_LOCK);
           }
           set_mods(mod_state);
       } else {
diff --git a/keyboards/planck/keymaps/jdelkins/keymap.c b/keyboards/planck/keymaps/jdelkins/keymap.c
index 0931342c2f..bf0d60c5f9 100644
--- a/keyboards/planck/keymaps/jdelkins/keymap.c
+++ b/keyboards/planck/keymaps/jdelkins/keymap.c
@@ -145,10 +145,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_KP] = LAYOUT(
-    KC_ESC,     KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_F14,   KC_7,    KC_8,    KC_9,    KC_MINS, KC_EQL,
-    _______,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_ASTR, _______,
-    KC_NUMLOCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_SLSH, _______,
-    _______,    _______, _______, _______,     _______,          _______,       KC_0,    KC_DOT,  KC_PLUS, KC_END
+    KC_ESC,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_F14,   KC_7,    KC_8,    KC_9,    KC_MINS, KC_EQL,
+    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_ASTR, _______,
+    KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_SLSH, _______,
+    _______, _______, _______, _______,     _______,          _______,       KC_0,    KC_DOT,  KC_PLUS, KC_END
 ),
 
 [_LOWER] = LAYOUT(
diff --git a/keyboards/planck/keymaps/navi/keymap.c b/keyboards/planck/keymaps/navi/keymap.c
index 8141607f64..18568958a4 100644
--- a/keyboards/planck/keymaps/navi/keymap.c
+++ b/keyboards/planck/keymaps/navi/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_VOLD, KC_MUTE, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_HASH, KC_KP_7, KC_KP_8, KC_KP_9, KC_BSPC,
   KC_MPRV, KC_MPLY, KC_MNXT, AU_ON, AU_OFF, MU_ON, MU_OFF, KC_PPLS, KC_KP_4, KC_KP_5, KC_KP_6, KC_PMNS,
   KC_CALC, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_DLR, KC_KP_1, KC_KP_2, KC_KP_3, KC_ENTER,
-  KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_PAST, KC_KP_0, KC_KP_DOT,KC_NUMLOCK, KC_PSLS
+  KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_PAST, KC_KP_0, KC_KP_DOT,KC_NUM, KC_PSLS
 )
 
 };
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 276a1ff253..9d9fa421d8 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -43,14 +43,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT_planck_grid(
     KC_TILD,        KC_EXLM,        KC_AT,          KC_HASH,        KC_DLR,         KC_PERC,        KC_CIRC,        KC_AMPR,        KC_ASTR,        KC_LPRN,        KC_RPRN,        _______,
     KC_DELETE,      KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_UNDS,        KC_PLUS,        KC_LCBR,        KC_RCBR,        KC_PIPE,
-    _______, KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_NONUS_HASH,  KC_NONUS_BSLASH,KC_HOME,        KC_END,         _______,
+    _______,        KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_NONUS_HASH,  KC_NUBS,KC_HOME,        KC_END,         _______,
     KC_COMMA,       _______, _______, _______, _______, _______, KC_NO,          _______, KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_MEDIA_PLAY_PAUSE
   ),
 
   [_RAISE] = LAYOUT_planck_grid(
     KC_GRAVE,KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,           KC_8,           KC_9,           KC_0,           _______,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINUS,       KC_EQUAL,       KC_LBRACKET,    KC_RBRACKET,    KC_BSLASH,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NONUS_HASH,  KC_NONUS_BSLASH,KC_PGUP,        KC_PGDOWN,      _______,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINUS,       KC_EQUAL,       KC_LBRC,        KC_RBRC,        KC_BSLASH,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NONUS_HASH,  KC_NUBS,        KC_PGUP,        KC_PGDOWN,      _______,
     _______, _______, _______, _______, _______, _______, KC_NO,   _______, KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_MEDIA_PLAY_PAUSE
   ),
 
diff --git a/keyboards/planck/keymaps/piemod/keymap.c b/keyboards/planck/keymaps/piemod/keymap.c
index 974b3d3646..f331f911cf 100644
--- a/keyboards/planck/keymaps/piemod/keymap.c
+++ b/keyboards/planck/keymaps/piemod/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [SYMBOL] = LAYOUT_planck_grid(
-    KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRACKET,  KC_RBRACKET,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,
+    KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRC,  KC_RBRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,
     KC_NO,  KC_NO,  KC_TRNS,  KC_SCOLON,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH),
     KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLASH,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE,
     KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,   KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL
diff --git a/keyboards/planck/keymaps/samuel/keymap.c b/keyboards/planck/keymaps/samuel/keymap.c
index 20e64a022b..91748f5079 100644
--- a/keyboards/planck/keymaps/samuel/keymap.c
+++ b/keyboards/planck/keymaps/samuel/keymap.c
@@ -154,17 +154,17 @@ case KC_T_RGUI:
 	break;
 case KC_T_LCTL:
 	if (record->event.pressed) {
-	   mod_press(KC_LBRACKET, KC_LCTL, 4);
+	   mod_press(KC_LEFT_BRACKET, KC_LCTL, 4);
 	} else {
-	   mod_lift(KC_LBRACKET, KC_LCTL, 4);
+	   mod_lift(KC_LEFT_BRACKET, KC_LCTL, 4);
 	}
 	return false;
 	break;
 case KC_T_RCTL:
 	if (record->event.pressed) {
-	   mod_press(KC_RBRACKET, KC_RCTL, 5);
+	   mod_press(KC_RIGHT_BRACKET, KC_RCTL, 5);
 	} else {
-	   mod_lift(KC_RBRACKET, KC_RCTL, 5);
+	   mod_lift(KC_RIGHT_BRACKET, KC_RCTL, 5);
 	}
 	return false;
 	break;
diff --git a/keyboards/planck/keymaps/sean/keymap.c b/keyboards/planck/keymaps/sean/keymap.c
index e01dcc6ccf..4225ebb528 100644
--- a/keyboards/planck/keymaps/sean/keymap.c
+++ b/keyboards/planck/keymaps/sean/keymap.c
@@ -164,10 +164,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______,     QK_BOOT, _______, _______, _______, AG_NORM,   AG_SWAP, _______, _______,    HRVL,  HRESET,  HMENU,
-   KC_PWR,   KC_EJCT,       CUT,    COPY,   PASTE, KC_PSCR, KC_SYSREQ, KC_CAPS, KC_MRWD, KC_MFFD, KC_MUTE, KC_MSTP,
-     DVRK, TO(_NMPD), TO(_MVMT),    SDRK, _______, _______,   _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
-  BACKLIT,   BACKTOG,   _______, _______, _______, _______,   _______, _______, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
+  _______,     QK_BOOT, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,    HRVL,  HRESET,  HMENU,
+   KC_PWR,   KC_EJCT,       CUT,    COPY,   PASTE, KC_PSCR, KC_SYRQ, KC_CAPS, KC_MRWD, KC_MFFD, KC_MUTE, KC_MSTP,
+     DVRK, TO(_NMPD), TO(_MVMT),    SDRK, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+  BACKLIT,   BACKTOG,   _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
 ),
 
 
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index 79e2580833..8beefa16aa 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -57,10 +57,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              * |      | Ctrl | Alt  | GUI  |LOWER | Shift/Space | RAISE|      |   [  |   ]  |      |
              * `-----------------------------------------------------------------------------------'
              */
-          KC_GRAVE, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,        KC_0,        KC_BSLASH,
-          KC_TILD,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,     KC_RPRN,     KC_PIPE,
-          _______,  _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR,     KC_RCBR,     KC_DELETE,
-          _______,  KC_LCTRL, KC_LALT, KC_LGUI, _______, _______, KC_NO,   _______, _______, KC_LBRACKET, KC_RBRACKET, _______
+          KC_GRAVE, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,        KC_0,    KC_BSLASH,
+          KC_TILD,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,     KC_RPRN, KC_PIPE,
+          _______,  _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR,     KC_RCBR, KC_DELETE,
+          _______,  KC_LCTRL, KC_LALT, KC_LGUI, _______, _______, KC_NO,   _______, _______, KC_LBRC,     KC_RBRC, _______
           ),
 
   [_RAISE] = LAYOUT_planck_grid(
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
index 22418d1a7d..30c9f088ff 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_DEF] = LAYOUT_all(
     KC_CALC, KC_PAST, KC_PSLS, KC_BSPACE, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSLASH , KC_PSCR, KC_HOME,
-    KC_PMNS, KC_P7,   KC_P8,   KC_P9, KC_NUMLOCK,      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,       KC_BSPACE,       KC_PGUP,
+    KC_PMNS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,       KC_BSPACE,       KC_PGUP,
     KC_PPLS,  KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE,        KC_ENTER,     KC_PGDN,
     KC_EQL, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,     KC_RSHIFT,       KC_UP, KC_END,
     KC_PENT, KC_PDOT, KC_P0,  KC_P0, KC_COMMA ,       KC_LCTRL, KC_LGUI, KC_LALT,      KC_SPACE,    KC_SPACE,    KC_SPACE,    KC_RALT, MO(_FNC), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
index 2c175ca957..f4a7056da2 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_DEF] = LAYOUT_ansi(
     KC_PMNS, KC_PAST, KC_PSLS, KC_BSPACE, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,     KC_BSPACE,    KC_HOME,
-    KC_PPLS, KC_P7,   KC_P8,   KC_P9, KC_NUMLOCK,      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,    KC_BSLASH,       KC_PGUP,
+    KC_PPLS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,    KC_BSLASH,       KC_PGUP,
              KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE,       KC_ENTER,     KC_PGDN,
     KC_PENT, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,   KC_RSHIFT,   KC_UP, KC_END,
              KC_PDOT,    KC_P0,      KC_COMMA ,       KC_LCTRL, KC_LGUI, KC_LALT,                KC_SPACE,              KC_RALT,   MO(_FNC),   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
index 6a40a58226..9f1ce0559c 100644
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
@@ -116,9 +116,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_preonic_grid( \
-  KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCROLLLOCK, KC_NUMLOCK, KC_PAUSE, KC_LBRACKET, KC_RBRACKET, KC_MINUS, \
+  KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LBRC, KC_RBRC, KC_MINUS, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \
-  KC_CAPSLOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLASH, KC_MENU, \
   KC_RCTRL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 ),
@@ -137,9 +137,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_preonic_grid( \
-  KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCROLLLOCK, KC_NUMLOCK, KC_PAUSE, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_UNDERSCORE, \
+  KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_UNDERSCORE, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \
-  KC_CAPSLOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_MENU, \
   KC_RCTRL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 ),
diff --git a/keyboards/preonic/keymaps/boy314/keymap.c b/keyboards/preonic/keymaps/boy314/keymap.c
index b5089be5dd..85d3ecb9fe 100644
--- a/keyboards/preonic/keymaps/boy314/keymap.c
+++ b/keyboards/preonic/keymaps/boy314/keymap.c
@@ -16,7 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-#define FN_CAPS LT(_FL, KC_CAPSLOCK)
+#define FN_CAPS LT(_FL, KC_CAPS)
 
 // define layers
 #define _QWERTY 0
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index 9c26e715fd..7377e04a08 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -257,7 +257,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_RAISE] = LAYOUT_preonic_grid( \
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_SLCK,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
         KC_TAB,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, XXXXXXX,  KC_AMPR, KC_ASTR, KC_LCBR, KC_RCBR, KC_DEL,
-        KC_CLCK, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15, XXXXXXX,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, XXXXXXX,
+        KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15, XXXXXXX,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, XXXXXXX,
         _______, KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, XXXXXXX,  KC_NUHS, KC_NUBS, DYN_REC_START1,   DYN_REC_START2, DYN_REC_STOP,
         KC_LCTL, KC_LALT, KC_LGUI, _______, KC_BSPC, KC_SPC,  KC_SPC,  KC_ENT,  __LYB__, DYN_MACRO_PLAY1,  DYN_MACRO_PLAY2, LLSWIT
     ),
@@ -321,7 +321,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_EXTRA] = LAYOUT_preonic_grid( \
         KC_ESC,   _______,  _______,  _______,  _______,  KC_SLCK,  _______,  _______,  _______,  _______,  _______,  _______,
         KC_TAB,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
-        KC_CLCK,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  DYN_REC_START1, DYN_REC_START2, DYN_REC_STOP,
         KC_LCTL,  KC_LALT,  KC_LGUI,  KC_DEL,  KC_BSPC,  KC_SPC,   KC_SPC,   __LYB__,  _______,  DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,  LLSWIT
     ),
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index 0a5637b980..223cc56058 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -367,7 +367,7 @@ void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data) {
             register_code16(KC_LEFT_PAREN);
             break;
         case DOUBLE_TAP:
-            register_code(KC_LBRACKET);
+            register_code(KC_LEFT_BRACKET);
             break;
         case TRIPLE_TAP:
             register_code16(KC_LEFT_CURLY_BRACE);
@@ -383,7 +383,7 @@ void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data) {
             unregister_code16(KC_LEFT_PAREN);
             break;
         case DOUBLE_TAP:
-            unregister_code(KC_LBRACKET);
+            unregister_code(KC_LEFT_BRACKET);
             break;
         case TRIPLE_TAP:
             unregister_code16(KC_LEFT_CURLY_BRACE);
@@ -401,7 +401,7 @@ void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data) {
             register_code16(KC_RIGHT_PAREN);
             break;
         case DOUBLE_TAP:
-            register_code(KC_RBRACKET);
+            register_code(KC_RIGHT_BRACKET);
             break;
         case TRIPLE_TAP:
             register_code16(KC_RIGHT_CURLY_BRACE);
@@ -417,7 +417,7 @@ void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data) {
             unregister_code16(KC_RIGHT_PAREN);
             break;
         case DOUBLE_TAP:
-            unregister_code(KC_RBRACKET);
+            unregister_code(KC_RIGHT_BRACKET);
             break;
         case TRIPLE_TAP:
             unregister_code16(KC_RIGHT_CURLY_BRACE);
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index 07c5aa7b8f..9ffb47776f 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -303,7 +303,7 @@ void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data) {
             register_code16(KC_LEFT_PAREN);
             break;
         case DOUBLE_TAP:
-            register_code(KC_LBRACKET);
+            register_code(KC_LEFT_BRACKET);
             break;
         case TRIPLE_TAP:
             register_code16(KC_LEFT_CURLY_BRACE);
@@ -319,7 +319,7 @@ void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data) {
             unregister_code16(KC_LEFT_PAREN);
             break;
         case DOUBLE_TAP:
-            unregister_code(KC_LBRACKET);
+            unregister_code(KC_LEFT_BRACKET);
             break;
         case TRIPLE_TAP:
             unregister_code16(KC_LEFT_CURLY_BRACE);
@@ -337,7 +337,7 @@ void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data) {
             register_code16(KC_RIGHT_PAREN);
             break;
         case DOUBLE_TAP:
-            register_code(KC_RBRACKET);
+            register_code(KC_RIGHT_BRACKET);
             break;
         case TRIPLE_TAP:
             register_code16(KC_RIGHT_CURLY_BRACE);
@@ -353,7 +353,7 @@ void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data) {
             unregister_code16(KC_RIGHT_PAREN);
             break;
         case DOUBLE_TAP:
-            unregister_code(KC_RBRACKET);
+            unregister_code(KC_RIGHT_BRACKET);
             break;
         case TRIPLE_TAP:
             unregister_code16(KC_RIGHT_CURLY_BRACE);
diff --git a/keyboards/projectcain/vault35/keymaps/default/keymap.c b/keyboards/projectcain/vault35/keymaps/default/keymap.c
index 64ff62c3ef..4244edd999 100644
--- a/keyboards/projectcain/vault35/keymaps/default/keymap.c
+++ b/keyboards/projectcain/vault35/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          S(KC_GRV),    KC_GRV,    KC_BSLS,    S(KC_BSLS),    KC_TRNS,    KC_TRNS,    S(KC_MINS),    KC_EQL,    KC_TRNS,    C(KC_W),    C(KC_T),   
      S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    KC_SCLN,    S(KC_SCLN),         
         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_NUMLOCK,    KC_TRNS
+            KC_TRNS,           KC_TRNS,   KC_TRNS,      KC_TRNS,        KC_NUM,    KC_TRNS
   ),
 
 };
diff --git a/keyboards/projectcain/vault45/keymaps/default/keymap.c b/keyboards/projectcain/vault45/keymaps/default/keymap.c
index aa1179fbcd..d143c3b2c1 100644
--- a/keyboards/projectcain/vault45/keymaps/default/keymap.c
+++ b/keyboards/projectcain/vault45/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,      S(KC_GRV),    KC_GRV,    KC_BSLS,    S(KC_BSLS),    KC_TRNS,    KC_TRNS,    S(KC_MINS),    KC_EQL,    KC_TRNS,    C(KC_W),    C(KC_T),   KC_TRNS,
     KC_TRNS,    S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    KC_SCLN,    S(KC_SCLN),          KC_TRNS,
     S(KC_LBRC),    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,             S(KC_RBRC),
-          KC_TRNS,    KC_TRNS,           KC_TRNS,   KC_TRNS,        KC_TRNS, KC_CAPSLOCK,        KC_NUMLOCK,    KC_TRNS
+          KC_TRNS,    KC_TRNS,           KC_TRNS,   KC_TRNS,        KC_TRNS, KC_CAPS,        KC_NUM,    KC_TRNS
   ),
 
 };
diff --git a/keyboards/puck/keymaps/default/keymap.c b/keyboards/puck/keymaps/default/keymap.c
index 6ba70a88bb..ab8929e928 100644
--- a/keyboards/puck/keymaps/default/keymap.c
+++ b/keyboards/puck/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * High Layer (Work)
   */
   [_HL] = LAYOUT(
-    KC_NUMLOCK,      KC_PAST,    KC_NO,
+    KC_NUM,          KC_PAST,    KC_NO,
     KC_PMNS,         KC_PENT,    KC_PPLS,
     KC_NO,           KC_PSLS,    KC_NO,
     KC_NO,           KC_PDOT,    KC_NO
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
index 3b68758a67..517b00003a 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_rhnp(
     KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
-    KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,       KC_BSPC,         KC_HOME,
+    KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_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_KP_4, KC_KP_5, KC_KP_6,                              KC_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_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,                 KC_LSFT,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,     KC_RSFT,   KC_UP,    KC_PGDN,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
index 203a336c78..44179cd5c9 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_iso_rhnp(
     KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
-    KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,       KC_BSPC,         KC_HOME,
+    KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,      KC_ENTER,     KC_END,
     KC_KP_4, KC_KP_5, KC_KP_6,                              KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,                KC_PGUP,
     KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,                 KC_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,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
index e83f88dc1d..7b0171e675 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_jis_rhnp(
     KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
-    KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC,     KC_HOME,
+    KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC,     KC_HOME,
     KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC,      KC_ENTER,       KC_END,
     KC_KP_4, KC_KP_5, KC_KP_6,                              KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC,                KC_PGUP,
     KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,                 KC_LSFT,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS,     KC_RSFT,    KC_PGDN,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
index 8753e0a48f..b73035e957 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_rhnp(
     KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
-    KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,       KC_BSPC,         KC_HOME,
+    KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_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_KP_4, KC_KP_5, KC_KP_6,                              KC_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_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,                 KC_LSFT,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,     KC_RSFT,   KC_UP,    KC_PGDN,
diff --git a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
index 0b6f8cb576..adad7466d6 100644
--- a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
+++ b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
-    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRACKET, KC_RBRACKET, KC_BSPACE,
+    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPACE,
     KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
     KC_LSHIFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT, KC_FN,
     KC_LALT,  KC_LGUI, KC_NUMS, KC_SYMS, KC_RGUI, KC_RALT
diff --git a/keyboards/redox_w/keymaps/danielo515/keymap.c b/keyboards/redox_w/keymaps/danielo515/keymap.c
index 5a9fa4e5ee..1ff59d36b7 100644
--- a/keyboards/redox_w/keymaps/danielo515/keymap.c
+++ b/keyboards/redox_w/keymaps/danielo515/keymap.c
@@ -113,9 +113,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
      XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_A   ,KC_B   ,KC_C   ,KC_D   ,KC_E  ,KC_F  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          _______ ,KC_LBRACKET ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_PERC ,KC_KP_MINUS ,
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          _______ ,KC_LBRC ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_PERC ,KC_KP_MINUS ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,KC_F5 ,KC_F2 ,XXXXXXX ,                          _______ ,KC_RBRACKET ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PPLS ,KC_PAST ,
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,KC_F5 ,KC_F2 ,XXXXXXX ,                          _______ ,KC_RBRC ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PPLS ,KC_PAST ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        _______ ,_______ ,KC_COLN ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PSLS ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c b/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
index df26eec6cc..4dd8115c3d 100644
--- a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
+++ b/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
@@ -56,7 +56,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
          case TG(1):
            if (record->event.pressed) {
-                tap_code(KC_NUMLOCK);
+                tap_code(KC_NUM_LOCK);
 		return true;
 		}
 	   break;
@@ -67,7 +67,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 void matrix_init_user (void) {
   if (!host_keyboard_led_state ().num_lock) {
-      tap_code(KC_NUMLOCK);
+      tap_code(KC_NUM_LOCK);
   }
 }
 
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 6e6b6c9b87..8b1362371b 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -206,7 +206,7 @@ lookup_table_t lookup_table[333] =
  {"KC_LNG8", KC_LNG8},
  {"KC_LNG9", KC_LNG9},
  {"KC_ERAS", KC_ERAS},
- {"KC_SYSREQ", KC_SYSREQ},
+ {"KC_SYRQ", KC_SYRQ},
  {"KC_CANCEL", KC_CANCEL},
  {"KC_CLR", KC_CLR},
  {"KC_CLEAR", KC_CLEAR},
diff --git a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
index 4a7cb3a3a2..392baa0961 100644
--- a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
+++ b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
@@ -83,7 +83,7 @@ uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shi
   uint16_t pseudo_keycode;
 
   switch (keycode) {
-    case KC_A ... KC_CAPSLOCK:
+    case KC_A ... KC_CAPS_LOCK:
       #if defined(__AVR__) 
         if (shift_modded) {
           pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
diff --git a/keyboards/satt/vision/keymaps/satt/action_pseudo.c b/keyboards/satt/vision/keymaps/satt/action_pseudo.c
index 2ba8b3e503..9c2b6e8ca5 100644
--- a/keyboards/satt/vision/keymaps/satt/action_pseudo.c
+++ b/keyboards/satt/vision/keymaps/satt/action_pseudo.c
@@ -94,7 +94,7 @@ uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shi
     uint16_t pseudo_keycode = 0x00; /* default value */
 
     switch (keycode) {
-        case KC_A ... KC_CAPSLOCK:
+        case KC_A ... KC_CAPS_LOCK:
 #if defined(__AVR__)
             if (shift_modded) {
                 pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
diff --git a/keyboards/sck/osa/keymaps/all/keymap.c b/keyboards/sck/osa/keymaps/all/keymap.c
index 5f6dfbbc86..193d34906f 100644
--- a/keyboards/sck/osa/keymaps/all/keymap.c
+++ b/keyboards/sck/osa/keymaps/all/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [1] = LAYOUT_alice_split_bs( /* OSA Layer 1 */
 	KC_SLCK,   KC_ESC,  KC_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_NLCK,  KC_TAB,  KC_Q,    KC_UP,   KC_E,    KC_R,   KC_T,    					 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-	KC_CLCK,  KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F,   KC_G,    					 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,          KC_ENT,
+	KC_CAPS,  KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F,   KC_G,    					 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,          KC_ENT,
 	          KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,	                     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_HOME,
 	          KC_LCTL,          KC_LALT,          KC_SPC, _______,                   KC_SPC,                    KC_RALT,                            KC_RCTL
   ),
diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c
index 5b6be1813d..ca455e8853 100644
--- a/keyboards/silverbullet44/keymaps/FKML/keymap.c
+++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c
@@ -45,7 +45,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_EQL,
     KC_LSFT,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                      KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
     KC_LCMD,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,                      KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
-                            KC_CLCK,  LOWER, KC_SPC, KC_BSPC,    KC_DOT,  KC_ENT,  RAISE, RGB_TOG
+                            KC_CAPS,  LOWER, KC_SPC, KC_BSPC,    KC_DOT,  KC_ENT,  RAISE, RGB_TOG
   ),
 
 /* LOWER
diff --git a/keyboards/snampad/keymaps/default/keymap.c b/keyboards/snampad/keymaps/default/keymap.c
index cdd3dff597..db3cbfbaaf 100644
--- a/keyboards/snampad/keymaps/default/keymap.c
+++ b/keyboards/snampad/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_6x4( /* Base */
                KC_F1   , KC_F2  ,  KC_F3, KC_F4,
-               KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK , KC_KP_MINUS,
+               KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK , KC_KP_MINUS,
                KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,
                KC_KP_4, KC_KP_5, KC_KP_6,
                KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,
diff --git a/keyboards/spacey/keymaps/default/keymap.c b/keyboards/spacey/keymaps/default/keymap.c
index 4d08a279e0..8d0b138390 100644
--- a/keyboards/spacey/keymaps/default/keymap.c
+++ b/keyboards/spacey/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_CLCK,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP,
+        KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP,
         KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_LEFT, KC_DOWN,
         KC_LCTL, KC_LGUI, FN, KC_MUTE, KC_LALT, KC_SPC,  KC_NO, KC_BSPC, KC_DEL, KC_NO,  KC_RALT, KC_RGUI, KC_RCTL, KC_RGHT
     ),
diff --git a/keyboards/spacey/keymaps/via/keymap.c b/keyboards/spacey/keymaps/via/keymap.c
index 660f427da7..17dec84fc7 100644
--- a/keyboards/spacey/keymaps/via/keymap.c
+++ b/keyboards/spacey/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_CLCK,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP,
+        KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP,
         KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_LEFT, KC_DOWN,
         KC_LCTL, KC_LGUI, MO(1), KC_MUTE, KC_LALT, KC_SPC,  KC_NO, KC_BSPC, KC_DEL, KC_NO,  KC_RALT, KC_RGUI, KC_RCTL, KC_RGHT
     ),
diff --git a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
index 61d66588c6..ac343a867d 100644
--- a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [JSYM] = LAYOUT_stack(
         _______, KC_GRV,  KC_AT  , KC_LCBR,     KC_RCBR,     _______,
         _______, KC_HASH, KC_DLR , KC_LPRN,     KC_RPRN,     KC_LEFT,
-        _______, KC_PERC, KC_CIRC, KC_LBRACKET, KC_RBRACKET, _______, _______, _______,
+        _______, KC_PERC, KC_CIRC, KC_LBRC,     KC_RBRC, _______, _______, _______,
                                                 _______, _______, _______, _______, _______,
 
                                 _______, _______, _______, _______,  _______, _______,
diff --git a/keyboards/switchplate/switchplate910/keymaps/default/keymap.c b/keyboards/switchplate/switchplate910/keymaps/default/keymap.c
index 6cc14d5901..021f545d2b 100644
--- a/keyboards/switchplate/switchplate910/keymaps/default/keymap.c
+++ b/keyboards/switchplate/switchplate910/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all( /* Base */
 	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_TRNS,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-    KC_CAPSLOCK, KC_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_CAPS, KC_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_SPACE,           KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
 ),
diff --git a/keyboards/switchplate/switchplate910/keymaps/via/keymap.c b/keyboards/switchplate/switchplate910/keymaps/via/keymap.c
index dd56159af8..21c4ec3156 100644
--- a/keyboards/switchplate/switchplate910/keymaps/via/keymap.c
+++ b/keyboards/switchplate/switchplate910/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all( /* Base */
 	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_TRNS,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-    KC_CAPSLOCK, KC_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_CAPS, KC_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_SPACE,           KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
 ),
diff --git a/keyboards/tada68/keymaps/ardakilic/keymap.c b/keyboards/tada68/keymaps/ardakilic/keymap.c
index 6c3475cb20..efd1b88b89 100755
--- a/keyboards/tada68/keymaps/ardakilic/keymap.c
+++ b/keyboards/tada68/keymaps/ardakilic/keymap.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
 
-//KC_NONUS_BSLASH (\|) is equivalent to ["é] key in Turkish keyboards.
+//KC_NUBS (\|) is equivalent to ["é] key in Turkish keyboards.
 //KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
 //I've put grave to bottom, and nonUS backslash to top to make it more similar to Turkish layout.  ["é] key is more above than [<>|] key.
 //Default top right button was KC_GRV (~ `) (Grave key) even if it looks like Tilde key.
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_ansi(
   KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_POWER, \
   KC_TAB,  KC_Q,   KC_W,   KC_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_NONUS_BSLASH,  \
+  KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_NUBS,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_GRV, \
   KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        KC_RGUI,MO(_FL),KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
 
diff --git a/keyboards/tada68/keymaps/ardakilic/readme.md b/keyboards/tada68/keymaps/ardakilic/readme.md
index f81c400ce2..6f04c454f0 100755
--- a/keyboards/tada68/keymaps/ardakilic/readme.md
+++ b/keyboards/tada68/keymaps/ardakilic/readme.md
@@ -8,7 +8,7 @@ The changes that were applied over default layout:
 
 * Make Win/cmd keys right next to space bar just like Apple keyboards.
 * Adding a power (`KC_POWER`) key, so the lock screen shortcut works.
-* Re-use the page up and page down keys to make ["é] (`KC_NONUS_BSLASH`) and [<>|] (`KC_GRAVE`) keys more accessible.
+* Re-use the page up and page down keys to make ["é] (`KC_NUBS`) and [<>|] (`KC_GRAVE`) keys more accessible.
 * Optimize the function layer, by removing the mouse movement combinations and adding additional media keys.
 * Swap the positions of volume up and volume down and mute buttons on function layer, so these keys are actually with the same order as Apple keyboard layout.
 
diff --git a/keyboards/tada68/keymaps/fezzant/keymap.c b/keyboards/tada68/keymaps/fezzant/keymap.c
index fdc2b6ac8c..a096002433 100644
--- a/keyboards/tada68/keymaps/fezzant/keymap.c
+++ b/keyboards/tada68/keymaps/fezzant/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_NUM] = LAYOUT_ansi(
   KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_P7,   KC_P8,   KC_P9,XXXXXXX,   KC_KP_MINUS, KC_KP_PLUS, KC_BSPC,KC_CALC, \
-  KC_TAB,KC_NUMLOCK, KC_UP,XXXXXXX,XXXXXXX, XXXXXXX,KC_P4,KC_P5,KC_P6,XXXXXXX,XXXXXXX,KC_PSLS,KC_PAST, XXXXXXX,_______, \
+  KC_TAB,KC_NUM, KC_UP,XXXXXXX,XXXXXXX, XXXXXXX,KC_P4,KC_P5,KC_P6,XXXXXXX,XXXXXXX,KC_PSLS,KC_PAST, XXXXXXX,_______, \
   TG(_NUM), KC_LEFT, KC_DOWN, KC_RIGHT,XXXXXXX,XXXXXXX,KC_P1,KC_P2,KC_P3,XXXXXXX,XXXXXXX,XXXXXXX, KC_KP_ENTER,KC_PSCREEN, \
   KC_LSFT, KC_Z, KC_X, KC_C, KC_V,XXXXXXX, KC_PDOT, KC_PDOT, KC_PDOT,XXXXXXX,XXXXXXX,XXXXXXX, KC_MS_U, KC_BTN2, \
   KC_LCTL, KC_LGUI, KC_LALT,KC_P0,EMAIL_ADD,_______,KC_BTN1,KC_MS_L,KC_MS_D, KC_MS_R),
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/default/keymap.c b/keyboards/tempo_turtle/bradpad/keymaps/default/keymap.c
index 331466438a..f77cd08f7c 100644
--- a/keyboards/tempo_turtle/bradpad/keymaps/default/keymap.c
+++ b/keyboards/tempo_turtle/bradpad/keymaps/default/keymap.c
@@ -19,6 +19,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_KP_7,    KC_KP_8,     KC_KP_9,   KC_KP_MINUS,
         KC_KP_4,    KC_KP_5,     KC_KP_6,   KC_KP_PLUS,
         KC_KP_1,    KC_KP_2,     KC_KP_3,   KC_KP_SLASH,
-        KC_NUMLOCK, KC_KP_0,     KC_KP_DOT, KC_KP_ASTERISK,
+        KC_NUM,     KC_KP_0,     KC_KP_DOT, KC_KP_ASTERISK,
                     KC_KP_ENTER, KC_EQUAL)
 };
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/via/keymap.c b/keyboards/tempo_turtle/bradpad/keymaps/via/keymap.c
index 09d7764362..964791682c 100644
--- a/keyboards/tempo_turtle/bradpad/keymaps/via/keymap.c
+++ b/keyboards/tempo_turtle/bradpad/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_KP_7,    KC_KP_8,     KC_KP_9,   KC_KP_MINUS,
         KC_KP_4,    KC_KP_5,     KC_KP_6,   KC_KP_PLUS,
         KC_KP_1,    KC_KP_2,     KC_KP_3,   KC_KP_SLASH,
-        KC_NUMLOCK, KC_KP_0,     KC_KP_DOT, KC_KP_ASTERISK,
+        KC_NUM,     KC_KP_0,     KC_KP_DOT, KC_KP_ASTERISK,
                     KC_KP_ENTER, KC_EQUAL),
     [_LAYER1] = LAYOUT(
         KC_TRNS,    KC_TRNS,     KC_TRNS,   KC_TRNS,
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c
index b4dd5f3ee3..b54af62011 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c
@@ -121,7 +121,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                                                , TRANS_MIDLEFT 
 #     endif
 
-                                                               , KC_NUMLOCK , KC_KP_0
+                                                               , KC_NUM , KC_KP_0
 // ---⬇
 // Note anomaly: the additional 'arrow' hardware key is shifted one to the
 // left, compared to other Base layouts, and so is TRANS_RIGHT This is to
@@ -306,7 +306,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                                                     , TRANS_MIDLEFT
 #     endif
 
-                                                    , KC_NUMLOCK , KC_KP_0 
+                                                    , KC_NUM , KC_KP_0 
 
 // See comment on the first layout in this file (double handed Base layer), about the next few keys:
 // ---⬇
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
index 057561a473..b0c8981a5f 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
@@ -1289,7 +1289,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                 , TRANS_MIDLEFT
 #             endif
 
-                                                , KC_NUMLOCK , XXXXXXX , KC__YGUI
+                                                , KC_NUM , XXXXXXX , KC__YGUI
 
 #             ifdef TRANSMINIVAN_RIGHTSIDE
                                                                                   , TRANS_RIGHT
@@ -1381,7 +1381,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     , TRANS_MIDLEFT
 #             endif
 
-                                                    , KC_NUMLOCK , KC_KP_0 
+                                                    , KC_NUM , KC_KP_0 
 
 // See comment in ./base_numpad.c on the first layout (double handed Base layer), about the next few keys:
 // This layer follows that layout Base Numpad.
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
index a6fa5ed722..b652261fed 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LT(_ADJUST, KC_SPACE),  KC_KP_DOT                       \
     ),
   [_ADJUST] = LAYOUT_numpad_4x4( /* Adjustments */
-    KC_NUMLOCK, TG(_FPHNOISY), TG(_FPH), TG(_NUMPAD), \
+    KC_NUM,     TG(_FPHNOISY), TG(_FPH), TG(_NUMPAD), \
     KC_BSPC,    BACKLIT,       KC_DEL,                \
     MACSLEEP,   _______,       _______,  _______,     \
     _______,                   MO(_DYN)               \
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
index db5f6c37c8..f958dcd912 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,          MO(_DYN)
   ),
   [_ADJUST] = LAYOUT_numpad_4x4( /* Adjustments */
-    KC_NUMLOCK, MACSLEEP,    BACKLIT,         _______, \
+    KC_NUM,     MACSLEEP,    BACKLIT,         _______, \
     KC_BSPC,     _______,    KC_DEL,          \
     EXCEL_LOCK, NUMPAD_LOCK, NAVIGATION_LOCK, _______, \
     _______,                 _______
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
index 9263ddbf1e..7920b4283d 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
@@ -22,10 +22,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_KP_0, KC_KP_DOT, TG(_L1), KC_BSPC
   ),
   [_L1] = LAYOUT_ortho_4x4( /* LAYER 1 */
-    KC_NUMLOCK, _______, _______,  KC_VOLU, \
-    _______,    KC_UP,   _______,  KC_VOLD, \
-    KC_LEFT,    KC_DOWN, KC_RIGHT, _______, \
-    _______,    _______, _______,  _______
+    KC_NUM,  _______, _______,  KC_VOLU, \
+    _______, KC_UP,   _______,  KC_VOLD, \
+    KC_LEFT, KC_DOWN, KC_RIGHT, _______, \
+    _______, _______, _______,  _______
   )
 };
 
diff --git a/keyboards/tzarc/djinn/keymaps/default/keymap.c b/keyboards/tzarc/djinn/keymaps/default/keymap.c
index 32a53e27b8..a5aa07e127 100644
--- a/keyboards/tzarc/djinn/keymaps/default/keymap.c
+++ b/keyboards/tzarc/djinn/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______,                                               _______
     ),
     [_ADJUST] = LAYOUT_all(
-        _______, KC_CLCK, KC_NLCK, KC_SLCK, _______,   _______, _______,                             _______, _______, _______, _______, DEBUG,   EEP_RST, QK_BOOT,
+        _______, KC_CAPS, KC_NLCK, KC_SLCK, _______,   _______, _______,                             _______, _______, _______, _______, DEBUG,   EEP_RST, QK_BOOT,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ungodly/launch_pad/keymaps/default/keymap.c b/keyboards/ungodly/launch_pad/keymaps/default/keymap.c
index 6ac19d5b59..b1534760ca 100644
--- a/keyboards/ungodly/launch_pad/keymaps/default/keymap.c
+++ b/keyboards/ungodly/launch_pad/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
 /* Force Numlock on */
 void matrix_init_user (void) {
   if (!host_keyboard_led_state().num_lock) {
-      tap_code(KC_NUMLOCK);
+      tap_code(KC_NUM_LOCK);
   }
 }
 
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-------------------'
 */
 [1] = LAYOUT_ortho_5x4(
-  KC_LUP, KC_NUMLOCK, XXXXXXX,    XXXXXXX,
+  KC_LUP,   KC_NUM,   XXXXXXX,    XXXXXXX,
   KC_HOME,   KC_UP,   KC_PGUP,    XXXXXXX,
   KC_LEFT, XXXXXXX,   KC_RGHT,    XXXXXXX,
   KC_END,  KC_DOWN,   KC_PGDN,    KC_PENT,
diff --git a/keyboards/ungodly/launch_pad/keymaps/via/keymap.c b/keyboards/ungodly/launch_pad/keymaps/via/keymap.c
index 198d99d29d..b2b6640e6a 100644
--- a/keyboards/ungodly/launch_pad/keymaps/via/keymap.c
+++ b/keyboards/ungodly/launch_pad/keymaps/via/keymap.c
@@ -20,7 +20,7 @@
 /* Force Numlock on */
 void matrix_init_user (void) {
   if (!host_keyboard_led_state().num_lock) {
-      tap_code(KC_NUMLOCK);
+      tap_code(KC_NUM_LOCK);
   }
 }
 
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-------------------'
 */
 [1] = LAYOUT_ortho_5x4(
-  KC_LUP, KC_NUMLOCK, XXXXXXX,    XXXXXXX,
+  KC_LUP,    KC_NUM,  XXXXXXX,    XXXXXXX,
   KC_HOME,   KC_UP,   KC_PGUP,    XXXXXXX,
   KC_LEFT, XXXXXXX,   KC_RGHT,    XXXXXXX,
   KC_END,  KC_DOWN,   KC_PGDN,    KC_PENT,
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
index 23d3c5edc7..e5239a0438 100644
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
+++ b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
@@ -20,7 +20,7 @@
 /* Force Numlock on */
 void matrix_init_user (void) {
   if (!host_keyboard_led_state().num_lock) {
-      tap_code(KC_NUMLOCK);
+      tap_code(KC_NUM_LOCK);
   }
 }
 
@@ -36,7 +36,7 @@ qk_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_NUMLOCK, 1),
+    [TD_NUMLOCK_L1] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_NUM_LOCK, 1),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/vitamins_included/keymaps/numpad/keymap.c b/keyboards/vitamins_included/keymaps/numpad/keymap.c
index 03cfafda11..a3f3b8a35b 100644
--- a/keyboards/vitamins_included/keymaps/numpad/keymap.c
+++ b/keyboards/vitamins_included/keymaps/numpad/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_ortho_4x12(
-  KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUMLOCK,     KC_LEFT,   KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUMLOCK,     KC_LEFT,
+  KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUM_LOCK,    KC_LEFT,   KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUM_LOCK,    KC_LEFT,
   ADJUST,      KC_KP_2,    KC_KP_5,     KC_KP_8,    KC_KP_SLASH,    KC_DOWN,   ADJUST,      KC_KP_2,    KC_KP_5,     KC_KP_8,    KC_KP_SLASH,    KC_DOWN,
   KC_KP_DOT,   KC_KP_3,    KC_KP_6,     KC_KP_9,    KC_KP_ASTERISK, KC_UP,     KC_KP_DOT,   KC_KP_3,    KC_KP_6,     KC_KP_9,    KC_KP_ASTERISK, KC_UP,
   KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPACE,      KC_RIGHT,  KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPACE,      KC_RIGHT
diff --git a/keyboards/whale/sk/keymaps/default/keymap.c b/keyboards/whale/sk/keymaps/default/keymap.c
index ff93d3c2bb..988cab313d 100644
--- a/keyboards/whale/sk/keymaps/default/keymap.c
+++ b/keyboards/whale/sk/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_PGUP,               KC_PGDOWN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
         KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL,               KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LEFT,              KC_RIGHT, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSHIFT,
-        KC_LBRACKET, KC_LALT, KC_LWIN, KC_APP, KC_INT4, KC_MENU,              KC_MENU, KC_INT5, KC_APP, KC_RWIN, KC_RALT, KC_RBRACKET,
+        KC_LBRC, KC_LALT, KC_LWIN, KC_APP, KC_INT4, KC_MENU,              KC_MENU, KC_INT5, KC_APP, KC_RWIN, KC_RALT, KC_RBRC,
                                             KC_F1, KC_F2,       KC_F7, KC_F8,
                                     KC_SPC, KC_F3, KC_F4,       KC_F9, KC_F10, KC_SPC,
                                             KC_F5, KC_F6,       KC_F11, KC_F12
diff --git a/keyboards/wolf/ryujin/keymaps/default/keymap.c b/keyboards/wolf/ryujin/keymaps/default/keymap.c
index 6e8d4a970c..9bd1f05e5a 100644
--- a/keyboards/wolf/ryujin/keymaps/default/keymap.c
+++ b/keyboards/wolf/ryujin/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER0] = LAYOUT(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_CLCK, 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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
diff --git a/keyboards/wolf/ryujin/keymaps/via/keymap.c b/keyboards/wolf/ryujin/keymaps/via/keymap.c
index 79b16f8f71..be61f2d194 100644
--- a/keyboards/wolf/ryujin/keymaps/via/keymap.c
+++ b/keyboards/wolf/ryujin/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER0] = LAYOUT(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_CLCK, 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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
index 595d7cb936..0e9c639c9f 100644
--- a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
@@ -127,8 +127,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_init_user(void) {
   if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) {
-    register_code(KC_NUMLOCK);
-    unregister_code(KC_NUMLOCK);
+    register_code(KC_NUM_LOCK);
+    unregister_code(KC_NUM_LOCK);
   }
 }
 
diff --git a/keyboards/xiudi/xd75/keymaps/xo/keymap.c b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
index 58dd1a616a..2954204529 100644
--- a/keyboards/xiudi/xd75/keymaps/xo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_ortho_5x15(
     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_P7, KC_P8, KC_P9, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
     LCTL(KC_GRV), KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P4, KC_P5, KC_P6, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
-    KC_CAPSLOCK, KC_TRNS, KC_TRNS, KC_MSTP, RGB_SAD, RGB_SAI, KC_P1, KC_P2, KC_P3, KC_PLUS, KC_TRNS, QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU,
+    KC_CAPS, KC_TRNS, KC_TRNS, KC_MSTP, RGB_SAD, RGB_SAI, KC_P1, KC_P2, KC_P3, KC_PLUS, KC_TRNS, QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU,
     MO(2), KC_PSCR, KC_PAUS, KC_APP, RGB_VAD, RGB_VAI, KC_P0, KC_SLSH, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,
     TG(1), KC_TRNS, RGB_TOG, KC_SLCK, RGB_RMOD, RGB_MOD, KC_NLCK, KC_TRNS, KC_ASTR, KC_PENT, KC_PENT, MO(1), KC_TRNS, KC_TRNS, TG(1)),
   [2] = LAYOUT_ortho_5x15(
diff --git a/keyboards/ymdk/sp64/keymaps/daed/keymap.c b/keyboards/ymdk/sp64/keymaps/daed/keymap.c
index 8512ef799f..990920e00f 100644
--- a/keyboards/ymdk/sp64/keymaps/daed/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/daed/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_BASE] = LAYOUT(
   KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRACKET, KC_RBRACKET, KC_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_BSLS,
   KC_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       MO(_MODE),
   MO(_FN), KC_LGUI, KC_LALT, KC_SPACE,      MO(_RAISE),             KC_SPACE,           KC_RALT,      KC_RCTL,   KC_LEFT,     KC_DOWN,     KC_RIGHT
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_GAMER] = LAYOUT(
   KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRACKET, KC_RBRACKET, KC_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_BSLS,
   KC_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       MO(_MODE),
   MO(_FN), KC_F13,  KC_LALT, KC_SPACE,      MO(_GACROS),             KC_SPACE,           KC_RALT,      KC_RCTL,   KC_LEFT,     KC_DOWN,     KC_RIGHT
diff --git a/keyboards/ymdk/sp64/keymaps/default/keymap.c b/keyboards/ymdk/sp64/keymaps/default/keymap.c
index e988d6e91b..3453da40cd 100644
--- a/keyboards/ymdk/sp64/keymaps/default/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = LAYOUT(
   KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRACKET, KC_RBRACKET, KC_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_BSLS,
   KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       KC_F3,
   KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE,      MO(_FN),     KC_SPACE,                  KC_RALT, KC_RGUI,            KC_LEFT,     KC_DOWN,     KC_RIGHT
diff --git a/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c b/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
index 7481696fd6..2c93d12b30 100644
--- a/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = LAYOUT(
   KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4, KC_5,     KC_6,           KC_7, KC_8,    KC_9,     KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R, KC_T,           KC_Y,     KC_U, KC_I,    KC_O,     KC_P,      KC_LBRACKET, KC_RBRACKET, 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_BSLS,
   KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F, KC_G,           KC_H,     KC_J, KC_K,    KC_L,     KC_SCOLON, KC_QUOTE,                 KC_ENT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V, KC_B,           KC_N,     KC_M, KC_COMM, KC_DOT,   KC_SLSH,   KC_RSFT,     KC_UP,       KC_DEL,
   KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),        KC_SPACE,       KC_SPACE,       KC_RALT, TG(_NUM),            KC_LEFT,     KC_DOWN,     KC_RIGHT
diff --git a/keyboards/ymdk/sp64/keymaps/via/keymap.c b/keyboards/ymdk/sp64/keymaps/via/keymap.c
index 14a0e5f1f8..c9fe16c47b 100644
--- a/keyboards/ymdk/sp64/keymaps/via/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [0] = LAYOUT(
   KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRACKET, KC_RBRACKET, KC_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_BSLS,
   KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       KC_DEL,
   KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE,          MO(1),            KC_SPACE,         KC_RALT, KC_RGUI,            KC_LEFT,     KC_DOWN,     KC_RIGHT
diff --git a/keyboards/ymdk/sp64/keymaps/walston/keymap.c b/keyboards/ymdk/sp64/keymaps/walston/keymap.c
index 248cf5f445..ef0cf18943 100644
--- a/keyboards/ymdk/sp64/keymaps/walston/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/walston/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = LAYOUT(
   MT(QK_BOOT, KC_GRAVE),   KC_1,      KC_2,    KC_3,    KC_4,    KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
-  KC_TAB,                KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRACKET, KC_RBRACKET,   KC_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_BSLS,
   KC_LCTL,               KC_A,      KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,    KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                  KC_ENTER,
   KC_LSFT,               KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,     KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,     OSL(_MEDIA),
   LT(_NUMPAD, KC_CAPS), TT(_MEDIA), KC_LALT, KC_LGUI, LT(_FUN, KC_SPACE),    KC_SPACE,          KC_RGUI, KC_RALT,        KC_LEFT,   KC_DOWN,        KC_RIGHT
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
index 973e336cb6..249fff7ccb 100644
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
+++ b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
@@ -8,7 +8,7 @@ keyboard:
 **Note:** This setup has locking Caps Lock and Num Lock keys, so if you wish
 to use this layout and do not have such keys, you should :
 
- - Change the keys `KC_LCAP` and `KC_LNUM` to `KC_CAPS`  and `KC_NUMLOCK` 
+ - Change the keys `KC_LCAP` and `KC_LNUM` to `KC_CAPS`  and `KC_NUM` 
    respectively.
  - Remove the `LOCKING_SUPPORT_ENABLE` and `LOCKING_RESYNC_ENABLE` lines
    from `config.h`.
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
index fdd7ad253a..4e53b2cbe3 100644
--- a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
@@ -41,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/
 	
     [_DEFLT] = LAYOUT(
-			KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,       KC_F12,      KC_PSCR, KC_HOME,    KC_END,     KC_INSERT,   KC_DELETE,      KC_PGUP, \
-			KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,      KC_EQL,          KC_BSPC,         KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_PMNS, \
-			KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,      KC_RBRC,         KC_BSLS,         KC_P7,      KC_P8,       KC_P9,          KC_NO, \
-			KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,                       KC_ENT,          KC_P4,      KC_P5,       KC_P6,          KC_PPLS, \
-			KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,                        KC_RSFT,MO(_RAISE),     KC_P1,      KC_P2,       KC_P3,          KC_PENT, \
-			KC_LCTL, KC_LGUI,KC_LALT,                              KC_SPC,                   KC_RGUI     ,          KC_LEFT, KC_DOWN,    KC_UP,      KC_RGHT,      KC_P0,          KC_PDOT  \
+			KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,       KC_F12,      KC_PSCR, KC_HOME,    KC_END, KC_INSERT,   KC_DELETE,      KC_PGUP, \
+			KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,      KC_EQL,          KC_BSPC,         KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_PMNS, \
+			KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,      KC_RBRC,         KC_BSLS,         KC_P7,  KC_P8,       KC_P9,          KC_NO, \
+			KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,                       KC_ENT,          KC_P4,  KC_P5,       KC_P6,          KC_PPLS, \
+			KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,                        KC_RSFT,MO(_RAISE),     KC_P1,  KC_P2,       KC_P3,          KC_PENT, \
+			KC_LCTL, KC_LGUI,KC_LALT,                              KC_SPC,                   KC_RGUI     ,          KC_LEFT, KC_DOWN,    KC_UP,      KC_RGHT,  KC_P0,          KC_PDOT  \
 	),
 	/* Layer 1, raise layer
 	*  |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
diff --git a/keyboards/yosino58/keymaps/default/keymap.c b/keyboards/yosino58/keymaps/default/keymap.c
index 00a6c8e83f..0ea1ce0ddc 100644
--- a/keyboards/yosino58/keymaps/default/keymap.c
+++ b/keyboards/yosino58/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_PSLS, KC_PMNS, KC_P7, KC_P8,   KC_P9,                                        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_F12,
   _______, KC_PAST, KC_PPLS, KC_P4, KC_P5,   KC_P6,                                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
   _______, KC_PDOT, KC_P0,   KC_P1, KC_P2,   KC_P3,   _______,  _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-                                    _______, KC_LGUI, _______,                    XXXXXXX, KC_CLCK, KC_NLCK
+                                    _______, KC_LGUI, _______,                    XXXXXXX, KC_CAPS, KC_NLCK
 
   ),
 
diff --git a/keyboards/yosino58/keymaps/sakura/keymap.c b/keyboards/yosino58/keymaps/sakura/keymap.c
index 6979539d33..f0b0666a8a 100644
--- a/keyboards/yosino58/keymaps/sakura/keymap.c
+++ b/keyboards/yosino58/keymaps/sakura/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, \
   _______, KC_PSLS, KC_PMNS, KC_P7, KC_P8,   KC_P9,                                       KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, KC_UP,   XXXXXXX, \
   _______, KC_PAST, KC_PPLS, KC_P4, KC_P5,   KC_P6,                                       KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, KC_DOWN, KC_RGHT, \
-  _______, KC_PDOT, KC_P0,   KC_P1, KC_P2,   KC_P3,   KC_F11,  _______, _______, KC_F12,  KC_DEL,  KC_END,  KC_PGDN, KC_LEFT, KC_NLCK, KC_CLCK, \
+  _______, KC_PDOT, KC_P0,   KC_P1, KC_P2,   KC_P3,   KC_F11,  _______, _______, KC_F12,  KC_DEL,  KC_END,  KC_PGDN, KC_LEFT, KC_NLCK, KC_CAPS, \
                                     _______, _______, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX\
   ),
 
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index 09e612ae6c..20dd00564d 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -16,9 +16,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // Numpad
     [_NUMPAD] = LAYOUT_65_ansi_blocker(
-        XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NUMLOCK, XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_0,    KC_PMNS,    KC_PEQL,                _______,    _______,
+        XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NUM,     XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_0,    KC_PMNS,    KC_PEQL,                _______,    _______,
         _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_PCMM,    _______,    _______,                _______,    _______,
-        KC_NUMLOCK, XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_PPLS,    KC_PAST,                            KC_PENT,    _______,
+        KC_NUM,     XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_PPLS,    KC_PAST,                            KC_PENT,    _______,
         _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_0,    SPI_KP_00,  KC_PDOT,    KC_PSLS,                            _______,    _______,    _______,
         _______,    _______,    _______,                                    _______,                                            _______,    _______,                _______,    _______,    _______
     ),
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index abd941ff32..e728d13bc8 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -15,9 +15,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Numpad
     [_NUMPAD] = LAYOUT_75_ansi(
         _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-        XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NUMLOCK, XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_0,    KC_PMNS,    KC_PEQL,                _______,    _______,
+        XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NUM,     XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_0,    KC_PMNS,    KC_PEQL,                _______,    _______,
         _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_PCMM,    _______,    _______,                _______,    _______,
-        KC_NUMLOCK, XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_PPLS,    KC_PAST,                            KC_PENT,    _______,
+        KC_NUM,     XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_PPLS,    KC_PAST,                            KC_PENT,    _______,
         _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_KP_0,    SPI_KP_00,  KC_PDOT,    KC_PSLS,                            _______,    _______,    _______,
         _______,    _______,    _______,                                    _______,                                            _______,    _______,    _______,    _______,    _______,    _______
     ),
diff --git a/layouts/community/ergodox/albert/keymap.c b/layouts/community/ergodox/albert/keymap.c
index 8b73424d45..0b2efd3311 100644
--- a/layouts/community/ergodox/albert/keymap.c
+++ b/layouts/community/ergodox/albert/keymap.c
@@ -8,7 +8,7 @@
 /* use UK keymap */
 
 #define UK_HASH KC_NONUS_HASH
-#define UK_BSLS KC_NONUS_BSLASH
+#define UK_BSLS KC_NONUS_BACKSLASH
 #define UK_PIPE LSFT(UK_BSLS)
 
 #define BASE 0 // default layer
diff --git a/layouts/community/ergodox/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c
index 4090721d09..ec46066391 100644
--- a/layouts/community/ergodox/bepo/keymap.c
+++ b/layouts/community/ergodox/bepo/keymap.c
@@ -47,9 +47,9 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
 												KC_SPC,		KC_LSHIFT,	MO(FNAV),
 // Right hand
 				KC_SLCK,	BP_AT,		BP_PLUS,	BP_MINS,	BP_SLSH,	BP_ASTR,	BP_EQL,
-				KC_CAPSLOCK,	BP_DCIR,	BP_V,		BP_D,		BP_L,		BP_J,		BP_Z,
+				KC_CAPS,	BP_DCIR,	BP_V,		BP_D,		BP_L,		BP_J,		BP_Z,
 						BP_C,		BP_T,		BP_S,		BP_R,		BP_N,		BP_M,
-				KC_NUMLOCK,	BP_QUOT,	BP_Q,		BP_G,		BP_H,		BP_F,		BP_CCED,
+				KC_NUM,	BP_QUOT,	BP_Q,		BP_G,		BP_H,		BP_F,		BP_CCED,
 								KC_ALGR,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
 DF(AZ_B),	DF(BEPO),
 MO(NUMK),
@@ -84,9 +84,9 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
 												KC_SPC,		MO(QW_S),	KC_TRNS,
 // Right hand
 				KC_SLCK,	KC_AT,		KC_PLUS,	KC_MINUS,	KC_SLASH,	KC_ASTR,	KC_EQUAL,
-				KC_CAPSLOCK,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,
+				KC_CAPS,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,
 						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		KC_M,
-				KC_NUMLOCK,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,
+				KC_NUM,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,
 								MO(QW_A),	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
 KC_TRNS,	KC_TRNS,
 KC_TRNS,
@@ -121,9 +121,9 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
 												KC_UNDS,	MO(QW_S),	KC_TRNS,
 // Right hand
 				KC_SLCK,	KC_AT,		KC_PLUS,	KC_MINUS,	KC_SLASH,	KC_ASTR,	KC_EQUAL,
-				KC_CAPSLOCK,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,
+				KC_CAPS,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,
 						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		KC_M,
-				KC_NUMLOCK,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,
+				KC_NUM,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,
 								KC_TRNS,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
 KC_TRNS,	KC_TRNS,
 KC_TRNS,
@@ -195,9 +195,9 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
 												KC_SPC,		MO(AZ_S),	KC_TRNS,
 // Right hand
 				KC_SLCK,	FR_AT,		FR_PLUS,	FR_MINS,	FR_SLSH,	FR_ASTR,	FR_EQL,
-				KC_CAPSLOCK,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,
+				KC_CAPS,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,
 						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		FR_M,
-				KC_NUMLOCK,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,
+				KC_NUM,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,
 								MO(AZ_A),	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
 KC_TRNS,	KC_TRNS,
 KC_TRNS,
@@ -232,9 +232,9 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
 												FR_UNDS,	MO(AZ_S),	KC_TRNS,
 // Right hand
 				KC_SLCK,	FR_AT,		FR_PLUS,	FR_MINS,	FR_SLSH,	FR_ASTR,	FR_EQL,
-				KC_CAPSLOCK,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,
+				KC_CAPS,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,
 						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		FR_M,
-				KC_NUMLOCK,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,
+				KC_NUM,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,
 								KC_TRNS,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
 KC_TRNS,	KC_TRNS,
 KC_TRNS,
@@ -342,7 +342,7 @@ KC_NO,		KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,
 																KC_TRNS,
 												KC_NO,		KC_TRNS,	KC_TRNS,
 // Right hand
-				KC_NO,		KC_NO,		KC_NUMLOCK,	KC_KP_SLASH,	KC_KP_ASTERISK,	KC_KP_MINUS,	KC_NO,
+				KC_NO,		KC_NO,		KC_NUM,	KC_KP_SLASH,	KC_KP_ASTERISK,	KC_KP_MINUS,	KC_NO,
 				KC_NO,		KC_NO,		KC_KP_7,	KC_KP_8,	KC_KP_9,	KC_KP_PLUS,	KC_NO,
 						KC_NO,		KC_KP_4,	KC_KP_5,	KC_KP_6,	KC_KP_PLUS,	KC_NO,
 				KC_NO,		KC_NO,		KC_KP_1,	KC_KP_2,	KC_KP_3,	KC_KP_ENTER,	KC_NO,
diff --git a/layouts/community/ergodox/bepo_alt/keymap.c b/layouts/community/ergodox/bepo_alt/keymap.c
index a3bb955abf..edf9ba23d5 100644
--- a/layouts/community/ergodox/bepo_alt/keymap.c
+++ b/layouts/community/ergodox/bepo_alt/keymap.c
@@ -41,7 +41,7 @@ KC_LCTL,    KC_LGUI,    KC_LGUI,  KC_LGUI,  KC_LALT,
 
 /* Right hand */
                 BP_PLUS, BP_MINS,    BP_MINS, BP_SLSH, BP_ASTR,  BP_EQL, BP_PERC,
-        KC_CAPSLOCK,  BP_DCIR,  BP_V,   BP_D,   BP_L,   BP_J,   BP_Z,
+        KC_CAPS,  BP_DCIR,  BP_V,   BP_D,   BP_L,   BP_J,   BP_Z,
             BP_C,   BP_T,   BP_S,   BP_R,   BP_N,   BP_M,
         KC_ESC, BP_QUOT,  BP_Q,   BP_G,   BP_H,   BP_F,   BP_CCED,
                 KC_ALGR,  KC_RGUI,  KC_RGUI,  KC_RCTL,  KC_ENTER,
diff --git a/layouts/community/ergodox/colemak_programmer/keymap.c b/layouts/community/ergodox/colemak_programmer/keymap.c
index aa60d8d11b..70a3521782 100644
--- a/layouts/community/ergodox/colemak_programmer/keymap.c
+++ b/layouts/community/ergodox/colemak_programmer/keymap.c
@@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 [4] = LAYOUT_ergodox(
-       QK_BOOT,        KC_LSFT,    KC_LSFT,    KC_SYSREQ,  KC_PSCR,    KC_SLCK,    KC_PAUSE,
+       QK_BOOT,        KC_LSFT,    KC_LSFT,    KC_SYRQ,    KC_PSCR,    KC_SLCK,    KC_PAUSE,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_HYPR,
diff --git a/layouts/community/ergodox/csharp_dev/keymap.c b/layouts/community/ergodox/csharp_dev/keymap.c
index f22938429d..852bef5a7d 100644
--- a/layouts/community/ergodox/csharp_dev/keymap.c
+++ b/layouts/community/ergodox/csharp_dev/keymap.c
@@ -62,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                               LCTL(KC_C),
                                                GUI_T(KC_ENTER),SFT_T(KC_SPACE),LCTL(KC_V),
         // right hand
-             LCTL(KC_S)  ,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,     KC_LBRACKET,
-             KC_DELETE,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_RBRACKET,
+             LCTL(KC_S)  ,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,     KC_LBRC,
+             KC_DELETE,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_RBRC,
                           KC_H,   KC_J,   KC_K,   KC_L,   KC_UNDS,LCTL(KC_Y),
              KC_SCOLON,KC_N,   KC_M, KC_QUOTE  ,KC_EXLM , LSFT(KC_SLASH),   LCTL(KC_Z),
                                   KC_EQUAL,KC_PLUS  ,  KC_MINUS,KC_ASTR  ,     TG(1),
diff --git a/layouts/community/ergodox/dvorak_emacs/keymap.c b/layouts/community/ergodox/dvorak_emacs/keymap.c
index 14c592f27f..4494e4b976 100644
--- a/layouts/community/ergodox/dvorak_emacs/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT_ergodox(
         // left hand
         KC_NO,          KC_1,     KC_2,   KC_3,   KC_4,          KC_5,           KC_ESC,
-        KC_TILD,        KC_QUOTE, KC_COMM,KC_DOT, KC_P,          KC_Y,           KC_LBRACKET,
+        KC_TILD,        KC_QUOTE, KC_COMM,KC_DOT, KC_P,          KC_Y,           KC_LBRC,
         KC_TAB,         KC_A,     KC_O,   KC_E,   SFT_T(KC_U),   LT(AUX, KC_I),
         SFT_T(KC_LBRC), KC_SCLN,  KC_Q,   KC_J,   KC_K,          KC_X,           KC_LGUI,
         KC_NO,          KC_NO,    KC_NO,  KC_NO,  MO(AUX),
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       CTL_T(KC_BSPC), ALT_T(KC_DEL), KC_PGDN,
         // right hand
                     KC_ESC,          KC_6,           KC_7,         KC_8,   KC_9,   KC_0,   KC_EQL,
-                    KC_RBRACKET,     KC_F,           KC_G,         KC_C,   KC_R,   KC_L,   KC_SLASH,
+                    KC_RBRC,         KC_F,           KC_G,         KC_C,   KC_R,   KC_L,   KC_SLASH,
                                      LT(AUX, KC_D),  SFT_T(KC_H),  KC_T,   KC_N,   KC_S,   KC_MINUS,
                     KC_LGUI,         KC_B,           KC_M,         KC_W,   KC_V,   KC_Z,   SFT_T(KC_RBRC),
                                                                  MO(AUX), KC_NO,   KC_NO,  KC_BSLASH, KC_NO,
diff --git a/layouts/community/ergodox/dvorak_programmer/keymap.c b/layouts/community/ergodox/dvorak_programmer/keymap.c
index a8acee119a..43a6d8e89e 100644
--- a/layouts/community/ergodox/dvorak_programmer/keymap.c
+++ b/layouts/community/ergodox/dvorak_programmer/keymap.c
@@ -228,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        MEH(KC_F7), MEH(KC_F8), MEH(KC_F9), MEH(KC_F10),  MEH(KC_F11), MEH(KC_F12),  M(SWITCH_NDS),
        KC_TRNS, MEH(KC_A), MEH(KC_B),    MEH(KC_C),    MEH(KC_D),    MEH(KC_E), MEH(KC_F),
                 MEH(KC_G), MEH(KC_H),    MEH(KC_I),    MEH(KC_J),    MEH(KC_K), MEH(KC_L),
-       KC_TRNS, MEH(KC_M), MEH(KC_N),    MEH(KC_O),    MEH(KC_P),    MEH(KC_Q), KC_CAPSLOCK,
+       KC_TRNS, MEH(KC_M), MEH(KC_N),    MEH(KC_O),    MEH(KC_P),    MEH(KC_Q), KC_CAPS,
                            MEH(KC_S),    MEH(KC_T),    MEH(KC_U),    MEH(KC_V), MEH(KC_X),
        MEH(KC_6), MEH(KC_7),
        MEH(KC_8),
diff --git a/layouts/community/ergodox/dvorak_spanish/keymap.c b/layouts/community/ergodox/dvorak_spanish/keymap.c
index 805abb0b77..7bac2dd167 100644
--- a/layouts/community/ergodox/dvorak_spanish/keymap.c
+++ b/layouts/community/ergodox/dvorak_spanish/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = LAYOUT_ergodox(
         // left hand
-        KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NONUS_BSLASH,
+        KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NUBS,
         LT(AUX, KC_F1), KC_DOT, KC_COMM,KC_SCLN,KC_P,   KC_Y,   MEH_T(KC_DEL),
         CTL_T(KC_ESC),  KC_A,   KC_O,   KC_E,   KC_U,   KC_I,
         M(OBRACE),      KC_SLSH,KC_Q,   KC_J,   KC_K,   KC_X,   KC_LGUI,
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                            KC_ENT,KC_TAB,MT((MOD_LALT | MOD_LSFT), KC_F3),
         // right hand
                     KC_EQL,    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINUS,
-                    TT(AUX),   KC_F,   KC_G,   KC_C,   KC_H,   KC_L,   ALL_T(KC_RBRACKET),
+                    TT(AUX),   KC_F,   KC_G,   KC_C,   KC_H,   KC_L,   ALL_T(KC_RBRC),
                                KC_D,   KC_R,   KC_T,   KC_N,   KC_S,   CTL_T(KC_QUOTE),
                     KC_RALT,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,   M(CBRACE),
                                        KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,M(CBRACK),
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [AUX] = LAYOUT_ergodox(
        // left hand
        KC_NO  , KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_SLEP,
-       KC_TRNS, KC_NONUS_BSLASH, LSFT(KC_NONUS_BSLASH), KC_MS_U, KC_NO, KC_NO, KC_NO,
+       KC_TRNS, KC_NUBS, LSFT(KC_NUBS), KC_MS_U, KC_NO, KC_NO, KC_NO,
        KC_NO  , KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO  ,
        M(CAPS), KC_NO, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO,
        LCTL(KC_S), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V),
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                 KC_BTN1, KC_BTN2, TG(QWERTY),
        // right hand
             KC_PWR,  KC_F6,   KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,
-            KC_TRNS, KC_NO,   KC_7,   KC_8,   KC_9,    KC_PAST, KC_LBRACKET,
+            KC_TRNS, KC_NO,   KC_7,   KC_8,   KC_9,    KC_PAST, KC_LBRC,
                      KC_NO,   KC_4,   KC_5,   KC_6,    KC_PPLS, KC_BSLASH,
             KC_PSCR, KC_NO,   KC_1,   KC_2,   KC_3,    KC_PSLS, KC_NO,
                               KC_NO  ,KC_DOT, KC_0,    KC_PEQL, KC_NO,
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [QWERTY] = LAYOUT_ergodox(
         // left hand
-        KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NONUS_BSLASH,
+        KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NUBS,
         KC_TRNS,        KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   MEH_T(KC_DEL),
         CTL_T(KC_ESC),  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,
         M(OBRACE),      KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LGUI,
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                     KC_ENT,KC_TAB,KC_TRNS,
         // right hand
                     KC_EQL,    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINUS,
-                    KC_TRNS,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   ALL_T(KC_RBRACKET),
+                    KC_TRNS,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   ALL_T(KC_RBRC),
                                KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,CTL_T(KC_QUOTE),
                     KC_RALT,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,M(CBRACE),
                                        KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,M(CBRACK),
@@ -211,8 +211,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                 unregister_code(KC_LALT);
                 if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
                     register_code(KC_RALT);
-                    register_code(KC_LBRACKET);
-                    unregister_code(KC_LBRACKET);
+                    register_code(KC_LEFT_BRACKET);
+                    unregister_code(KC_LEFT_BRACKET);
                     unregister_code(KC_RALT);
                 }
             }
@@ -226,8 +226,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                 unregister_code(KC_LALT);
                 if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
                     register_code(KC_RALT);
-                    register_code(KC_RBRACKET);
-                    unregister_code(KC_RBRACKET);
+                    register_code(KC_RIGHT_BRACKET);
+                    unregister_code(KC_RIGHT_BRACKET);
                     unregister_code(KC_RALT);
                 }
             }
@@ -235,9 +235,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         }
         case CAPS: {
             if (record->event.pressed) {
-                register_code(KC_CAPSLOCK);
+                register_code(KC_CAPS_LOCK);
             } else {
-                unregister_code(KC_CAPSLOCK);
+                unregister_code(KC_CAPS_LOCK);
             }
             break;
         }
diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c
index b68ffec865..2a5b89ad8b 100644
--- a/layouts/community/ergodox/ishigoya-jp/keymap.c
+++ b/layouts/community/ergodox/ishigoya-jp/keymap.c
@@ -396,8 +396,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [NUM] = LAYOUT_ergodox(
        // left hand
 	   KC_NO, KC_F1,      KC_F2,          KC_F3,      KC_F4,   KC_F5,   KC_NO,
-	   KC_NO, KC_NO,    KC_NO,        JP_DQUO,   KC_RBRACKET,   KC_BSPC, KC_SCLN,
-       KC_NO, KC_NO,    KC_SLSH,        JP_PLUS,    LSFT(KC_RBRACKET),   JP_RCBR,
+	   KC_NO, KC_NO,    KC_NO,        JP_DQUO,   KC_RBRC,   KC_BSPC, KC_SCLN,
+       KC_NO, KC_NO,    KC_SLSH,        JP_PLUS,    LSFT(KC_RBRC),   JP_RCBR,
        KC_NO, KC_NO,    JP_ASTR,        KC_MINS,    LSFT(KC_8), LSFT(KC_9), JP_COLN,
        KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_HASH,
                                            KC_NO, KC_NO,
diff --git a/layouts/community/ergodox/italian/keymap.c b/layouts/community/ergodox/italian/keymap.c
index 3a81cc213b..feac635092 100644
--- a/layouts/community/ergodox/italian/keymap.c
+++ b/layouts/community/ergodox/italian/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,                      KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TT(SYMB),
         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_LALT,
-        MT(MOD_LGUI,KC_NONUS_BSLASH),KC_PPLS,      KC_PMNS,KC_PAST,MT(MOD_LCTL,KC_PSLS),
+        MT(MOD_LGUI,KC_NUBS),        KC_PPLS,      KC_PMNS,KC_PAST,MT(MOD_LCTL,KC_PSLS),
                                                            KC_INS,  KC_LGUI,
                                                                     KC_HOME,
                                                    KC_BSPC,KC_DEL,  KC_END,
diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c
index 3f84823b99..d5e571b06a 100644
--- a/layouts/community/ergodox/kristian/keymap.c
+++ b/layouts/community/ergodox/kristian/keymap.c
@@ -13,7 +13,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
-[0] = LAYOUT_ergodox(NO_LABK,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_QUOT),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPSLOCK,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_ARNG,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSTR),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_QUOT),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_QUOT,KC_LALT,KC_LGUI,KC_ENTER),
+[0] = LAYOUT_ergodox(NO_LABK,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_QUOT),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPS,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_ARNG,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSTR),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_QUOT),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_QUOT,KC_LALT,KC_LGUI,KC_ENTER),
 
 [1] = LAYOUT_ergodox(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_TRANSPARENT,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_7,KC_8,KC_9,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_4,KC_5,KC_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_0,KC_1,KC_2,KC_3,NO_LBRC,NO_RBRC,KC_LSHIFT,KC_COMMA,KC_DOT,LSFT(NO_LBRC),LSFT(NO_RBRC),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LALT,KC_LGUI,KC_ENTER),
 
diff --git a/layouts/community/ergodox/maz/keymap.c b/layouts/community/ergodox/maz/keymap.c
index 4d313dee43..4073d79f54 100644
--- a/layouts/community/ergodox/maz/keymap.c
+++ b/layouts/community/ergodox/maz/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                CTL_T(KC_SPC),GUI_T(KC_BSPC),KC_LALT,
         // right hand
         KC_TRNS,      KC_6,   KC_7,             KC_8,    KC_9,   KC_0,             KC_MINS,
-        KC_CAPSLOCK,     KC_Y,   KC_U,             KC_I,    KC_O,   KC_P,             KC_BSLS,
+        KC_CAPS,      KC_Y,   KC_U,             KC_I,    KC_O,   KC_P,             KC_BSLS,
                       KC_H,   KC_J,             KC_K,    KC_L,   KC_SCLN,          KC_QUOT,
         MEH_T(KC_NO), KC_N,   KC_M,             KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT,
         MO(MDIA),                  MO(SYMB), KC_LBRC,KC_RBRC, KC_TRNS,
diff --git a/layouts/community/ergodox/osx_kinesis_pnut/keymap.c b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
index fb50a3407e..f0be6d9a7f 100644
--- a/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
+++ b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Otherwise, it needs KC_*
 [BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
-        KC_CAPSLOCK,    KC_1,           KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
+        KC_CAPS,    KC_1,           KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_TAB,         KC_Q,           KC_W,   KC_E,   KC_R,   KC_T,   TG(1),
         KC_ESC,         KC_A,           KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        CTL_T(KC_Z),    KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index 22d6f35e08..f13c4eb960 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -57,12 +57,12 @@ enum custom_keycodes {
 #define US_OSX_CENT                 LALT(KC_4)                  // ¢
 #define US_OSX_YEN                  LALT(KC_Y)                  // ¥
 #define US_OSX_SBQUO                LALT(LSFT(KC_0))            // ‚
-#define US_OSX_LEFT_SINGLE_QUOTE    LALT(KC_RBRACKET)           // ‘
-#define US_OSX_RIGHT_SINGLE_QUOTE   LALT(LSFT(KC_RBRACKET))     // ’
+#define US_OSX_LEFT_SINGLE_QUOTE    LALT(KC_RBRC)               // ‘
+#define US_OSX_RIGHT_SINGLE_QUOTE   LALT(LSFT(KC_RBRC))         // ’
 #define US_OSX_ELLIPSIS             LALT(KC_SCOLON)             // …
 #define US_OSX_UNDERSCORE           LSFT(KC_MINUS)              // _
-#define US_OSX_LBRACKET             KC_LBRACKET                 // [
-#define US_OSX_RBRACKET             KC_RBRACKET                 // ]
+#define US_OSX_LBRACKET             KC_LBRC                     // [
+#define US_OSX_RBRACKET             KC_RBRC                     // ]
 #define US_OSX_CIRCUMFLEX           LSFT(KC_6)                  // ^
 #define US_OSX_EXCLAMATION          LSFT(KC_1)                  // !
 #define US_OSX_LESSTHAN             LSFT(KC_COMMA)              // <
@@ -72,8 +72,8 @@ enum custom_keycodes {
 #define US_OSX_SMALL_LONG_S         KC_NO                       // ſ
 #define US_OSX_BSLASH               KC_BSLASH
 #define US_OSX_SLASH                KC_SLASH                    // /
-#define US_OSX_CLBRACKET            LSFT(KC_LBRACKET)           // {
-#define US_OSX_CRBRACKET            LSFT(KC_RBRACKET)           // }
+#define US_OSX_CLBRACKET            LSFT(KC_LBRC)               // {
+#define US_OSX_CRBRACKET            LSFT(KC_RBRC)               // }
 #define US_OSX_ASTERISK             LSFT(KC_8)                  // *
 #define US_OSX_QUESTIONMARK         LSFT(KC_SLASH)              // ?
 #define US_OSX_LPARENTHESES         LSFT(KC_9)                  // (
@@ -375,7 +375,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // right hand side - main
     TO(NEO_1),        KC_6,         KC_7,       KC_8,       KC_9,       KC_0,       KC_MINUS,
-    KC_LBRACKET,      KC_Y,         KC_U,       KC_I,       KC_O,       KC_P,       KC_RBRACKET,
+    KC_LBRC,          KC_Y,         KC_U,       KC_I,       KC_O,       KC_P,       KC_RBRC,
     /* --- */         KC_H,         KC_J,       KC_K,       KC_L,       KC_SCOLON,  KC_QUOTE,
     KC_NO /* NOOP */, KC_N,         KC_M,       KC_COMMA,   KC_DOT,     KC_SLASH,   KC_RSHIFT,
     /* --- */         /* --- */     KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   KC_RGUI,
@@ -511,11 +511,11 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
         break;
       case NEO2_9:
         // left double quote
-        tap_code16(A(KC_LBRACKET));
+        tap_code16(A(KC_LEFT_BRACKET));
         break;
       case NEO2_0:
         // right double quote
-        tap_code16(S(A(KC_LBRACKET)));
+        tap_code16(S(A(KC_LEFT_BRACKET)));
         break;
       case NEO2_MINUS:
         // em dash
diff --git a/layouts/community/ergodox/swissgerman/keymap.c b/layouts/community/ergodox/swissgerman/keymap.c
index 9677be43b9..7c9dd32c07 100644
--- a/layouts/community/ergodox/swissgerman/keymap.c
+++ b/layouts/community/ergodox/swissgerman/keymap.c
@@ -21,10 +21,10 @@
 #define HTML_BR M(14)
 
 #define SEND_TAG(TAG) do {\
-    send_key(KC_NONUS_BSLASH); \
+    send_key(KC_NONUS_BACKSLASH); \
     SEND_STRING(TAG); \
     send_larger_than(); \
-    send_key(KC_NONUS_BSLASH); \
+    send_key(KC_NONUS_BACKSLASH); \
     SEND_STRING("&"); \
     SEND_STRING(TAG); \
     send_larger_than(); \
@@ -32,7 +32,7 @@
   } while (0)
 
 #define SEND_SHORT_TAG(TAG) do {\
-    send_key(KC_NONUS_BSLASH); \
+    send_key(KC_NONUS_BACKSLASH); \
     SEND_STRING(TAG); \
     SEND_STRING("&"); \
     send_larger_than();	       \
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
         KC_BSPC,        LT(MDIA, KC_A),KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        CTL_T(KC_Z),  ALT_T(KC_X),   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_NONUS_BSLASH), KC_EQL, KC_BSLS,  KC_LEFT,KC_RGHT,
+        LT(SYMB,KC_NUBS), KC_EQL, KC_BSLS,  KC_LEFT,KC_RGHT,
                                               ALT_T(KC_APP),  KC_LGUI,
                                                               KC_HOME,
                                                KC_SPC,KC_BSPC,KC_END,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), ACTION_MODS_KEY(MOD_RALT, KC_2),  ACTION_MODS_KEY(MOD_RALT, KC_QUOT), ACTION_MODS_KEY(MOD_RALT, KC_BSLS),ACTION_MODS_KEY(MOD_RALT,KC_7),KC_TRNS,
        KC_TRNS,ACTION_MODS_KEY(MOD_RALT,KC_3),KC_BSLS, ACTION_MODS_KEY(MOD_LSFT, KC_8), ACTION_MODS_KEY(MOD_RSFT, KC_9),ACTION_MODS_KEY(MOD_LSFT,KC_EQL),
        KC_TRNS,ACTION_MODS_KEY(MOD_LSFT,KC_5),KC_EQL, ACTION_MODS_KEY(MOD_RALT, KC_LBRC), ACTION_MODS_KEY(MOD_RALT, KC_RBRC),ACTION_MODS_KEY(MOD_RALT,KC_EQL),KC_TRNS,
-          KC_TRNS,EPRM,KC_TRNS,KC_NONUS_BSLASH, ACTION_MODS_KEY(MOD_LSFT, KC_NONUS_BSLASH)/*KC_TRNS,KC_TRNS*/,
+          KC_TRNS,EPRM,KC_TRNS,KC_NUBS, ACTION_MODS_KEY(MOD_LSFT, KC_NUBS)/*KC_TRNS,KC_TRNS*/,
                                        KC_TRNS,KC_TRNS,
                                                KC_TRNS,
                                KC_TRNS,KC_TRNS,KC_TRNS,
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
        KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    ACTION_MODS_KEY(MOD_RSFT,KC_3), KC_F12,
        KC_DOWN, KC_4,   KC_5,    KC_6,    ACTION_MODS_KEY(MOD_RSFT,KC_1), KC_TRNS,
-       KC_TRNS, ACTION_MODS_KEY(MOD_RSFT,KC_6), KC_1,   KC_2,    KC_3,  ACTION_MODS_KEY(MOD_RALT,KC_NONUS_BSLASH), KC_TRNS,
+       KC_TRNS, ACTION_MODS_KEY(MOD_RSFT,KC_6), KC_1,   KC_2,    KC_3,  ACTION_MODS_KEY(MOD_RALT,KC_NUBS), KC_TRNS,
        ACTION_MODS_KEY(MOD_RSFT,KC_MINS),KC_DOT,  KC_0,   KC_EQL, KC_TRNS,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
@@ -278,6 +278,6 @@ void go_back_based_on_tag(char* tag) {
 
 void send_larger_than() {
   register_code(KC_LSFT);
-  send_key(KC_NONUS_BSLASH);
+  send_key(KC_NONUS_BACKSLASH);
   unregister_code(KC_LSFT);
 }
diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
index 25ce96e068..552b97ff11 100644
--- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TRNS,   KC_F,    KC_G,        KC_C,        KC_R,      KC_L,     KC_SLASH,
 	KC_D,      KC_H,    KC_T,        KC_N,        KC_S,      KC_MINUS,
 	KC_TRNS,   KC_B,    KC_M,        KC_W,        KC_V,      KC_Z,     KC_LSHIFT,
-	                    KC_LBRACKET, KC_RBRACKET, KC_BSLASH, KC_UNDO,  LCTL(KC_A),
+	                    KC_LBRC,     KC_RBRC,     KC_BSLASH, KC_UNDO,  LCTL(KC_A),
 	KC_END,    KC_HOME,
 	KC_PGUP,
 	KC_PGDOWN, KC_ENTER, KC_SPACE
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 6652d003c2..500dea992c 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -67,10 +67,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_FUNC] = LAYOUT_ortho_4x12(
-  KC_F1,     KC_F2,           KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
-  KC_1,      KC_2,            KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
-  KC_LSHIFT, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
-  _______,   _______,         _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
+  KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
+  KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
+  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
+  _______,   _______, _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
 /* Lower
@@ -85,10 +85,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_ortho_4x12(
-  KC_1,        KC_2,            KC_3,           KC_4,           KC_5,          KC_6,          KC_7,           KC_8,            KC_9,           KC_0,          KC_DEL,          KC_BSPC                ,
-  LSFT(KC_1),  LSFT(KC_2),      LSFT(KC_3),     LSFT(KC_4),     LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),     LSFT(KC_8),      LSFT(KC_9),     LSFT(KC_0),    LCTL(KC_DEL),    LCTL(KC_BSPC)          ,
-  KC_LSPO,     KC_NONUS_BSLASH, KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
-  _______,     _______,         _______,        _______,        _______,       KC_DEL,        _______,        _______,         KC_MNXT,        KC_VOLD,       KC_VOLU,         KC_MPLY
+  KC_1,        KC_2,       KC_3,           KC_4,           KC_5,          KC_6,          KC_7,           KC_8,            KC_9,           KC_0,          KC_DEL,          KC_BSPC                ,
+  LSFT(KC_1),  LSFT(KC_2), LSFT(KC_3),     LSFT(KC_4),     LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),     LSFT(KC_8),      LSFT(KC_9),     LSFT(KC_0),    LCTL(KC_DEL),    LCTL(KC_BSPC)          ,
+  KC_LSPO,     KC_NUBS,    KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
+  _______,     _______,    _______,        _______,        _______,       KC_DEL,        _______,        _______,         KC_MNXT,        KC_VOLD,       KC_VOLU,         KC_MPLY
 ),
 
 /* Raise
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index ffffbe75d2..17f5c9f614 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -100,7 +100,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 bool led_update_user(led_t led_state) {
   // NumLock allways on
   if (!led_state.num_lock) {
-    tap_code(KC_NUMLOCK);
+    tap_code(KC_NUM_LOCK);
   }
   #ifdef JOTANCK_LEDS
   writePin(JOTANCK_LED1, led_state.caps_lock);
diff --git a/layouts/community/ortho_4x4/jotix/keymap.c b/layouts/community/ortho_4x4/jotix/keymap.c
index 9035860da7..7ee3aa9cc9 100644
--- a/layouts/community/ortho_4x4/jotix/keymap.c
+++ b/layouts/community/ortho_4x4/jotix/keymap.c
@@ -47,7 +47,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 bool led_update_user(led_t led_state) {
   // NumLock allways on
   if (!led_state.num_lock) {
-    tap_code(KC_NUMLOCK);
+    tap_code(KC_NUM_LOCK);
   }
   return true;
 }
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index 87834ee1fe..15792c0d41 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -84,9 +84,9 @@
   "KC_MINS": "-",
   "KC_EQUAL": "+",
   "KC_EQL": "=",
-  "KC_LBRACKET": "{",
+  "KC_LEFT_BRACKET": "{",
   "KC_LBRC": "[",
-  "KC_RBRACKET": "}",
+  "KC_RIGHT_BRACKET": "}",
   "KC_RBRC": "]",
   "KC_BSLS": "\\",
   "KC_BSLASH": "\\",
@@ -102,7 +102,7 @@
   "KC_SLASH": "/",
   "KC_NUBS": "/",
   "KC_NUHS": "#",
-  "KC_CAPSLOCK": "Caps",
+  "KC_CAPS_LOCK": "Caps",
   "KC_CAPS": "Caps",
   "KC_LCTRL": "Ctrl",
   "KC_LCTL": "Ctrl",
@@ -128,7 +128,7 @@
   "KC_INT5": "JIS Muhenkan",
   "KC_PSCREEN": "Print Screen",
   "KC_PSCR": "Print Screen",
-  "KC_SCROLLLOCK": "Scroll Lock",
+  "KC_SCROLL_LOCK": "Scroll Lock",
   "KC_SLCK": "Scroll Lock",
   "KC_PAUSE": "Pause",
   "KC_PAUS": "Pause",
@@ -159,8 +159,8 @@
   "KC_COPY": "Copy",
   "KC_PASTE": "Paste",
   "KC_FIND": "Find",
-  "KC_ALT_ERASE": "Alternate Erase",
-  "KC_SYSREQ": "SysReq/Attention",
+  "KC_ERAS": "Alternate Erase",
+  "KC_SYRQ": "SysReq/Attention",
   "KC_CANCEL": "Cancel",
   "KC_CLEAR": "Clear",
   "KC_PRIOR": "Prior",
@@ -199,7 +199,7 @@
   "KC_MSTP": "Stop Track",
   "KC_MEDIA_PLAY_PAUSE": "play",
   "KC_MPLY": "play",
-  "KC_NUMLOCK": "Keypad Num Lock and Clear",
+  "KC_NUM_LOCK": "Keypad Num Lock and Clear",
   "KC_NLCK": "Keypad Num Lock and Clear",
   "KC_SLSH": "/",
   "KC_KP_SLASH": "/",
diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h
index 9c66f8fa51..16318423a8 100644
--- a/quantum/keycode_legacy.h
+++ b/quantum/keycode_legacy.h
@@ -5,28 +5,19 @@
 // These keycode names have been deprecated
 
 #define KC_BSPACE         KC_BACKSPACE
-#define KC_LBRACKET       KC_LEFT_BRACKET
-#define KC_RBRACKET       KC_RIGHT_BRACKET
 #define KC_BSLASH         KC_BACKSLASH
 #define KC_SCOLON         KC_SEMICOLON
-#define KC_CAPSLOCK       KC_CAPS_LOCK
 #define KC_PSCREEN        KC_PRINT_SCREEN
-#define KC_SCROLLLOCK     KC_SCROLL_LOCK
 #define KC_PGDOWN         KC_PAGE_DOWN
-#define KC_NUMLOCK        KC_NUM_LOCK
-#define KC_NONUS_BSLASH   KC_NONUS_BACKSLASH
 #define KC_POWER          KC_KB_POWER
 #define KC__MUTE          KC_KB_MUTE
 #define KC__VOLUP         KC_KB_VOLUME_UP
 #define KC__VOLDOWN       KC_KB_VOLUME_DOWN
-#define KC_ALT_ERASE      KC_ALTERNATE_ERASE
-#define KC_SYSREQ         KC_SYSTEM_REQUEST
 
 #define KC_LCTRL          KC_LEFT_CTRL
 #define KC_LSHIFT         KC_LEFT_SHIFT
 #define KC_RCTRL          KC_RIGHT_CTRL
 #define KC_RSHIFT         KC_RIGHT_SHIFT
 
-#define KC_CLCK KC_CAPS_LOCK
 #define KC_SLCK KC_SCROLL_LOCK
 #define KC_NLCK KC_NUM_LOCK
diff --git a/users/bbaserdem/bb-macro.c b/users/bbaserdem/bb-macro.c
index a84a7bbc21..6a722e6db1 100644
--- a/users/bbaserdem/bb-macro.c
+++ b/users/bbaserdem/bb-macro.c
@@ -80,7 +80,7 @@ const uint32_t PROGMEM unicode_map[] = {
 bool process_record_macro(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         // AltGr + Caps should change the oled layout variable
-        case KC_CAPSLOCK:
+        case KC_CAPS_LOCK:
             if (record->event.pressed) {
                 if (get_mods() & MOD_BIT(KC_RALT)) {
                     userspace_config.layout = (userspace_config.layout + 1) % 3;
diff --git a/users/cedrikl/cedrikl.c b/users/cedrikl/cedrikl.c
index 0479e22b5d..f9f4f1fbc0 100644
--- a/users/cedrikl/cedrikl.c
+++ b/users/cedrikl/cedrikl.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Turn on/off NUM LOCK if current state is different
 void activate_numlock(bool turn_on) {
     if (host_keyboard_led_state().num_lock != turn_on) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/users/cwebster2/my_miryoku.h b/users/cwebster2/my_miryoku.h
index 2c8ab6fe2b..8b167cd619 100644
--- a/users/cwebster2/my_miryoku.h
+++ b/users/cwebster2/my_miryoku.h
@@ -56,7 +56,7 @@
 #define _______NUM______L3____ KC_GRV,   KC_1,  KC_2,  KC_3,  KC_BSLS
 #define _______NUM_______T____ KC_DOT,   KC_0,  KC_MINS
 
-#define _______FN_______L1____ KC_F12,   KC_F7,   KC_F8,  KC_F9,  KC_SYSREQ
+#define _______FN_______L1____ KC_F12,   KC_F7,   KC_F8,  KC_F9,  KC_SYRQ
 #define _______FN_______L2____ KC_F11,   KC_F4,   KC_F5,  KC_F6,  KC_TRNS
 #define _______FN_______L3____ KC_F10,   KC_F1,   KC_F2,  KC_F3,  KC_PAUSE
 #define _______FN________T____ KC_MENU,  KC_SPC,  KC_TAB
diff --git a/users/dennytom/chording_engine/engine.part.1 b/users/dennytom/chording_engine/engine.part.1
index 73df4cdeaa..a2b39284f5 100644
--- a/users/dennytom/chording_engine/engine.part.1
+++ b/users/dennytom/chording_engine/engine.part.1
@@ -85,10 +85,10 @@ bool handle_US_ANSI_shifted_keys(int16_t keycode, bool in) {
             regular_keycode = KC_EQUAL;
             break;
         case KC_LEFT_CURLY_BRACE:
-            regular_keycode = KC_LBRACKET;
+            regular_keycode = KC_LEFT_BRACKET;
             break;
         case KC_RIGHT_CURLY_BRACE:
-            regular_keycode = KC_RBRACKET;
+            regular_keycode = KC_RIGHT_BRACKET;
             break;
         case KC_PIPE:
             regular_keycode = KC_BSLASH;
diff --git a/users/dennytom/chording_engine/tests/minunit.h b/users/dennytom/chording_engine/tests/minunit.h
index ed71b62533..c7ddc9e444 100644
--- a/users/dennytom/chording_engine/tests/minunit.h
+++ b/users/dennytom/chording_engine/tests/minunit.h
@@ -113,9 +113,9 @@ enum keycodes {
     KC_PLUS,
     KC_EQUAL,
     KC_LEFT_CURLY_BRACE,
-    KC_LBRACKET,
+    KC_LEFT_BRACKET,
     KC_RIGHT_CURLY_BRACE,
-    KC_RBRACKET,
+    KC_RIGHT_BRACKET,
     KC_PIPE,
     KC_BSLASH,
     KC_COLON,
diff --git a/users/edvorakjp/edvorakjp.h b/users/edvorakjp/edvorakjp.h
index a878f71ca8..9d04eb744e 100644
--- a/users/edvorakjp/edvorakjp.h
+++ b/users/edvorakjp/edvorakjp.h
@@ -23,8 +23,8 @@
 #define __EDVORAKJP_SYMBOL_L__            KC_EXCLAIM,         KC_AT,              KC_HASH,      KC_DOLLAR
 #define __EDVORAKJP_SYMBOL_R__            KC_PERCENT, KC_CIRCUMFLEX,         KC_AMPERSAND,    KC_ASTERISK
 
-#define __EDVORAKJP_BRACKET_L__  KC_LEFT_CURLY_BRACE,   KC_LBRACKET,        KC_LEFT_PAREN
-#define __EDVORAKJP_BRACKET_R__       KC_RIGHT_PAREN,   KC_RBRACKET, KC_RIGHT_CURLY_BRACE
+#define __EDVORAKJP_BRACKET_L__  KC_LEFT_CURLY_BRACE,   KC_LBRC,            KC_LEFT_PAREN
+#define __EDVORAKJP_BRACKET_R__       KC_RIGHT_PAREN,   KC_RBRC, KC_RIGHT_CURLY_BRACE
 
 #define __EDVORAKJP_PAGE__                   KC_HOME,     KC_PGDOWN,              KC_PGUP,         KC_END
 #define __EDVORAKJP_CURSOR__                 KC_LEFT,       KC_DOWN,                KC_UP,       KC_RIGHT
diff --git a/users/gordon/gordon.h b/users/gordon/gordon.h
index 49b4f0569f..567e7343ec 100644
--- a/users/gordon/gordon.h
+++ b/users/gordon/gordon.h
@@ -12,10 +12,10 @@
 
 // KC codes that are too long
 #define DOLLAR    KC_DOLLAR
-#define LSQUIGLY  KC_LBRACKET
-#define RSQUIGLY  KC_RBRACKET
-#define NUMLOCK   KC_NUMLOCK
-#define CAPLOCK   KC_CAPSLOCK
+#define LSQUIGLY  KC_LBRC
+#define RSQUIGLY  KC_RBRC
+#define NUMLOCK   KC_NUM_LOCK
+#define CAPLOCK   KC_CAPS_LOCK
 #define BK_SLASH  KC_BSLASH
 #define ASTERSK   KC_KP_ASTERISK
 
diff --git a/users/gourdo1/gourdo1.c b/users/gourdo1/gourdo1.c
index 26ecd8c1c0..b724a2f48d 100644
--- a/users/gourdo1/gourdo1.c
+++ b/users/gourdo1/gourdo1.c
@@ -593,7 +593,7 @@ bool caps_word_press_user(uint16_t keycode) {
 // Turn on/off NUM LOCK if current state is different
 void activate_numlock(bool turn_on) {
     if (IS_HOST_LED_ON(USB_LED_NUM_LOCK) != turn_on) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/users/issmirnov/rows.h b/users/issmirnov/rows.h
index d35af2175c..d15693f2b2 100644
--- a/users/issmirnov/rows.h
+++ b/users/issmirnov/rows.h
@@ -22,7 +22,7 @@
 
 #define _________________SYMB_L1___________________        KC_MINS , KC_AT   , KC_LCBR     , KC_RCBR     , KC_GRV
 #define _________________SYMB_L2___________________        KC_CIRC , KC_UNDS , KC_LPRN     , KC_RPRN     , KC_DLR
-#define _________________SYMB_L3___________________        KC_LABK , KC_RABK , KC_LBRACKET , KC_RBRACKET , KC_TILD
+#define _________________SYMB_L3___________________        KC_LABK , KC_RABK , KC_LBRC     , KC_RBRC     , KC_TILD
 
 #define _________________SYMB_R1___________________        KC_ASTR , KC_EXLM , KC_PIPE     , KC_PERC     , KC_PLUS
 #define _________________SYMB_R2___________________        KC_HASH , KC_EQL  , KC_COLN     , KC_SCLN     , TAP_TOG_LAYER
diff --git a/users/jonavin/jonavin.c b/users/jonavin/jonavin.c
index b66b444f36..f203bd77df 100644
--- a/users/jonavin/jonavin.c
+++ b/users/jonavin/jonavin.c
@@ -213,7 +213,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 // Turn on/off NUM LOCK if current state is different
 void activate_numlock(bool turn_on) {
     if (IS_HOST_LED_ON(USB_LED_NUM_LOCK) != turn_on) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h b/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
index 8276cf207f..81bddca4cb 100644
--- a/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
+++ b/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
@@ -23,7 +23,7 @@ Additionally, there are some common chars that we dit not yet define:
 
 
 // NQN key definitions in no particular order
-#define N_LT KC_NONUS_BSLASH
+#define N_LT KC_NONUS_BACKSLASH
 #define N_HS KC_NONUS_HASH
 #define N_DOTS RALT(KC_DOT) // …
 #define N_USC LSFT(KC_SLASH) // _
@@ -31,7 +31,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_RSQBR RALT(KC_9) // ]
 #define N_CIRC KC_GRAVE // ^
 #define N_EXKL LSFT(KC_1) // !
-#define N_GT LSFT(KC_NONUS_BSLASH) // >
+#define N_GT LSFT(KC_NONUS_BACKSLASH) // >
 #define N_EQ LSFT(KC_0) // =
 #define N_AMP LSFT(KC_6) // &
 #define N_BSLS RALT(KC_MINS) // \ backslash
@@ -46,7 +46,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_COLN LSFT(KC_DOT) // :
 #define N_HASH KC_BSLASH // #
 #define N_DLR LSFT(KC_4) // $
-#define N_PIPE RALT(KC_NONUS_BSLASH) // |
+#define N_PIPE RALT(KC_NONUS_BACKSLASH) // |
 #define N_TILD RALT(KC_RBRC) // ~
 #define N_GRAVE LSFT(KC_EQUAL) // `
 #define N_PLUS KC_RBRC // +
@@ -60,7 +60,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_Y KC_Z
 #define N_AE KC_QUOTE // ä
 #define N_OE KC_SCOLON // ö
-#define N_UE KC_LBRACKET // ü
+#define N_UE KC_LBRC // ü
 #define N_MU RALT(KC_M) // µ
 #define N_SS KC_MINS // ß
 #define N_DEGRE LSFT(KC_GRAVE) // °
diff --git a/users/pcoves/tapDance.c b/users/pcoves/tapDance.c
index f8c9aaf466..548ed35274 100644
--- a/users/pcoves/tapDance.c
+++ b/users/pcoves/tapDance.c
@@ -6,7 +6,7 @@ void left(qk_tap_dance_state_t* state, void* user_data) {
     switch (state->count) {
         case 1:
             if (state->pressed)
-                tap_code16(S(KC_LBRACKET));
+                tap_code16(S(KC_LEFT_BRACKET));
             else
                 tap_code16(S(KC_9));
             break;
@@ -14,7 +14,7 @@ void left(qk_tap_dance_state_t* state, void* user_data) {
             if (state->pressed)
                 tap_code16(S(KC_COMM));
             else
-                tap_code(KC_LBRACKET);
+                tap_code(KC_LEFT_BRACKET);
             break;
         default:
             reset_tap_dance(state);
@@ -25,7 +25,7 @@ void right(qk_tap_dance_state_t* state, void* user_data) {
     switch (state->count) {
         case 1:
             if (state->pressed)
-                tap_code16(S(KC_RBRACKET));
+                tap_code16(S(KC_RIGHT_BRACKET));
             else
                 tap_code16(S(KC_0));
             break;
@@ -33,7 +33,7 @@ void right(qk_tap_dance_state_t* state, void* user_data) {
             if (state->pressed)
                 tap_code16(S(KC_DOT));
             else
-                tap_code(KC_RBRACKET);
+                tap_code(KC_RIGHT_BRACKET);
             break;
         default:
             reset_tap_dance(state);
diff --git a/users/romus/romus.h b/users/romus/romus.h
index b65e32eb5b..a72b78c138 100644
--- a/users/romus/romus.h
+++ b/users/romus/romus.h
@@ -184,7 +184,7 @@ enum {
  * `------------------------------------------------------------------------' */
 #define ALTCHAR \
     KC_GRV,	DBL_QUO,DBL_DQT,CUR_EUR,CUR_BPN,_______,_______,KC_HOME,KC_PGUP,KC_PSCREEN,		KC_BSLASH,	KC_SLSH, \
-    REDO,	DBL_ANG,DBL_PAR,DBL_SQR,DBL_BRC,KC_LALT,KC_INS,	KC_END, KC_PGDN,KC_SCROLLLOCK,	CUR_BIT,	KC_MINUS, \
+    REDO,	DBL_ANG,DBL_PAR,DBL_SQR,DBL_BRC,KC_LALT,KC_INS,	KC_END, KC_PGDN,KC_SCRL,	CUR_BIT,	KC_MINUS, \
     UNDO,	CUT,    COPY,   PASTE,	EXIT,	KC_LSFT,_______,_______,_______,_______,		CUR_YEN,	KC_EQUAL,   \
     _______,_______,_______,_______,_______,_______,_______,DBL_SPC,_______,_______,		_______,	_______
 
diff --git a/users/scheiklp/koy_keys_on_quertz_de_latin1.h b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
index e098e75dfc..0062803bd4 100644
--- a/users/scheiklp/koy_keys_on_quertz_de_latin1.h
+++ b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
@@ -16,7 +16,7 @@ Additionally, there are some common chars that we dit not yet define:
 
 
 // NQN key definitions in no particular order
-#define N_LT KC_NONUS_BSLASH
+#define N_LT KC_NONUS_BACKSLASH
 #define N_HS KC_NONUS_HASH
 #define N_DOTS RALT(KC_DOT) // …
 #define N_USC LSFT(KC_SLASH) // _
@@ -24,7 +24,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_RSQBR RALT(KC_9) // ]
 #define N_CIRC KC_GRAVE // ^
 #define N_EXKL LSFT(KC_1) // !
-#define N_GT LSFT(KC_NONUS_BSLASH) // >
+#define N_GT LSFT(KC_NONUS_BACKSLASH) // >
 #define N_EQ LSFT(KC_0) // =
 #define N_AMP LSFT(KC_6) // &
 #define N_BSLS RALT(KC_MINS) // \ backslash
@@ -39,7 +39,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_COLN LSFT(KC_DOT) // :
 #define N_HASH KC_BSLASH // #
 #define N_DLR LSFT(KC_4) // $
-#define N_PIPE RALT(KC_NONUS_BSLASH) // |
+#define N_PIPE RALT(KC_NONUS_BACKSLASH) // |
 #define N_TILD RALT(KC_RBRC) // ~
 #define N_GRAVE LSFT(KC_EQUAL) // `
 #define N_PLUS KC_RBRC // +
@@ -53,7 +53,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_Y KC_Z
 #define N_AE KC_QUOTE // ä
 #define N_OE KC_SCOLON // ö
-#define N_UE KC_LBRACKET // ü
+#define N_UE KC_LBRC // ü
 #define N_MU RALT(KC_M) // µ
 #define N_SS KC_MINS // ß
 #define N_DEGRE LSFT(KC_GRAVE) // °
diff --git a/users/twschum/xtonhasvim.c b/users/twschum/xtonhasvim.c
index a1adf39f04..15d1b0d940 100644
--- a/users/twschum/xtonhasvim.c
+++ b/users/twschum/xtonhasvim.c
@@ -70,7 +70,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_COMMA:
     if (SHIFTED) {
       // indent
-      tap_code16(LGUI(KC_LBRACKET));
+      tap_code16(LGUI(KC_LEFT_BRACKET));
     } else {
       // toggle comment
       tap_code16(LGUI(KC_SLASH));
@@ -79,7 +79,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_PERIOD:
     if (SHIFTED) {
       // outdent
-      tap_code16(LGUI(KC_RBRACKET));
+      tap_code16(LGUI(KC_RIGHT_BRACKET));
     }
     break;
   }
diff --git a/users/xtonhasvim/xtonhasvim.c b/users/xtonhasvim/xtonhasvim.c
index 5f6701830f..1bb5781c47 100644
--- a/users/xtonhasvim/xtonhasvim.c
+++ b/users/xtonhasvim/xtonhasvim.c
@@ -108,7 +108,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_COMMA:
     if (SHIFTED) {
       // indent
-      CMD(KC_LBRACKET);
+      CMD(KC_LEFT_BRACKET);
     } else {
       // toggle comment
       CMD(KC_SLASH);
@@ -117,7 +117,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_PERIOD:
     if (SHIFTED) {
       // outdent
-      CMD(KC_RBRACKET);
+      CMD(KC_RIGHT_BRACKET);
     }
     break;
   }
diff --git a/users/zigotica/combos.c b/users/zigotica/combos.c
index 8fb5b3c9fc..a4d4f15618 100644
--- a/users/zigotica/combos.c
+++ b/users/zigotica/combos.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM caps_combo[] = {KC_C, KC_L, COMBO_END};
 
 combo_t key_combos[] = {
   [EM_EMAIL] = COMBO_ACTION(email_combo),
-  [CL_CAPSL] = COMBO(caps_combo, KC_CAPSLOCK),
+  [CL_CAPSL] = COMBO(caps_combo, KC_CAPS),
 };
 
 void process_combo_event(uint16_t combo_index, bool pressed) {

From 17ada0324355b3b60867bfb494ae469f8cef6e73 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Tue, 11 Oct 2022 01:27:21 +0200
Subject: [PATCH 608/959] Update snowe's KC_RESET to use QK_BOOT (#18667)

---
 keyboards/crkbd/keymaps/snowe/keycode_aliases.h | 2 +-
 users/snowe/wrappers.h                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/crkbd/keymaps/snowe/keycode_aliases.h b/keyboards/crkbd/keymaps/snowe/keycode_aliases.h
index bd70a79aa5..c19fb11d4b 100644
--- a/keyboards/crkbd/keymaps/snowe/keycode_aliases.h
+++ b/keyboards/crkbd/keymaps/snowe/keycode_aliases.h
@@ -42,7 +42,7 @@
 #define COLEMAK KC_COLEMAK
 #define WORKMAN KC_WORKMAN
 
-#define KC_RESET RESET
+#define KC_RESET QK_BOOT
 #define KC_RST KC_RESET
 
 #ifdef SWAP_HANDS_ENABLE
diff --git a/users/snowe/wrappers.h b/users/snowe/wrappers.h
index 9ef7dce607..47fe4a5ace 100644
--- a/users/snowe/wrappers.h
+++ b/users/snowe/wrappers.h
@@ -88,5 +88,5 @@ NOTE: These are all the same length.  If you do a search/replace
 #define _________________ADJUST_L2_________________        MU_TOG , TG(_GAMING), AU_ON,   AU_OFF,  AG_NORM
 #define _________________ADJUST_L3_________________        RGB_RMOD,RGB_HUD,RGB_SAD, RGB_VAD, _______
 #define _________________ADJUST_R1_________________        _______, _______, _______, _______, _______
-#define _________________ADJUST_R2_________________        RESET,   CG_TOGG, _______, _______, _______
+#define _________________ADJUST_R2_________________        KC_RESET,CG_TOGG, _______, _______, _______
 #define _________________ADJUST_R3_________________        _______, KC_MNXT, KC_VOLU, KC_VOLD, KC_MPLY

From e96d8297246f6858adf257a8892e719695f83c45 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 12 Oct 2022 00:21:47 +1100
Subject: [PATCH 609/959] Remove legacy keycodes, part 3 (#18669)

* `KC__VOLDOWN` -> `KC_VOLD`

* `KC__VOLUP` -> `KC_VOLU`

* `KC__MUTE` -> `KC_MUTE`

* `KC_POWER` -> `KC_PWR`
---
 keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c |  6 +++---
 .../breeze/keymaps/eithanshavit/keymap.c             |  4 ++--
 keyboards/alpha/keymaps/vderm/keymap.c               |  2 +-
 keyboards/atreus/keymaps/xk/keymap.c                 |  2 +-
 keyboards/avalanche/v2/keymaps/default/keymap.c      |  2 +-
 keyboards/avalanche/v3/keymaps/default/keymap.c      |  2 +-
 keyboards/avalanche/v4/keymaps/default/keymap.c      |  2 +-
 keyboards/boardwalk/keymaps/mcallaster/keymap.c      |  2 +-
 keyboards/bobpad/keymaps/via/keymap.c                |  2 +-
 keyboards/cannonkeys/adelie/keymaps/default/keymap.c |  2 +-
 keyboards/cannonkeys/adelie/keymaps/via/keymap.c     |  2 +-
 keyboards/chocofly/v1/keymaps/default/keymap.c       |  2 +-
 keyboards/chocofly/v1/keymaps/winder/keymap.c        |  7 -------
 .../numeric_keypad_iie/keymaps/newbold/keymap.c      |  6 +++---
 keyboards/crkbd/keymaps/ardakilic/keymap.c           |  2 +-
 keyboards/crkbd/keymaps/blipson/keymap.c             |  2 +-
 keyboards/crkbd/keymaps/soundmonster/keymap.c        |  6 +++---
 .../dm9records/plaid/keymaps/stephen-huan/keymap.c   |  4 ++--
 keyboards/dz60/keymaps/billiams/keymap.c             |  2 +-
 keyboards/dz60/keymaps/billiams_layout2/keymap.c     |  2 +-
 keyboards/dz60/keymaps/billiams_layout4/keymap.c     |  2 +-
 keyboards/dz60/keymaps/bingocaller/keymap.c          |  6 +++---
 keyboards/dz60/keymaps/drewsky/keymap.c              |  2 +-
 keyboards/dztech/dz60rgb/keymaps/didel/keymap.c      |  2 +-
 keyboards/fleuron/keymaps/dollartacos/keymap.c       |  2 +-
 keyboards/gboards/gergo/keymaps/colemak/keymap.c     |  6 +++---
 keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c    |  2 +-
 keyboards/gh60/satan/keymaps/mark1/keymap.c          |  4 ++--
 .../gh60/satan/keymaps/olligranlund_iso/keymap.c     |  2 +-
 keyboards/hadron/ver2/keymaps/side_numpad/keymap.c   |  2 +-
 keyboards/hadron/ver3/keymaps/ishtob/keymap.c        |  2 +-
 keyboards/handwired/aranck/keymaps/default/keymap.c  |  4 ++--
 .../handwired/aranck/keymaps/turkishish/keymap.c     |  2 +-
 .../handwired/heisenberg/keymaps/default/keymap.c    |  4 ++--
 .../handwired/heisenberg/keymaps/turkishish/keymap.c |  2 +-
 keyboards/hhkb/ansi/keymaps/mjt/keymap.c             |  2 +-
 keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c      |  2 +-
 keyboards/hp69/keymaps/via/keymap.c                  |  4 ++--
 keyboards/idobao/id63/keymaps/idobao/keymap.c        |  2 +-
 keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c |  2 +-
 keyboards/idobao/id75/keymaps/drewdobo/keymap.c      |  4 ++--
 keyboards/jd45/keymaps/mjt6u/keymap.c                |  6 +++---
 .../kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c    |  4 ++--
 .../kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c    |  4 ++--
 keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c      |  2 +-
 keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c    |  2 +-
 keyboards/keebio/iris/keymaps/gsigler/keymap.c       |  4 ++--
 .../keebio/quefrency/keymaps/joestrong/keymap.c      | 10 +++++-----
 .../keebio/tragicforce68/keymaps/rossman360/keymap.c |  2 +-
 keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c  |  2 +-
 keyboards/kinesis/keymaps/dvorak/keymap.c            |  2 +-
 .../kinesis/keymaps/dvorak_nguyenvietyen/keymap.c    |  2 +-
 keyboards/kinesis/kint36/keymaps/kzar/keymap.c       |  4 ++--
 keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c  |  2 +-
 keyboards/lets_split/keymaps/xk/keymap.c             |  2 +-
 keyboards/lily58/keymaps/datadavd/keymap.c           |  2 +-
 keyboards/lily58/keymaps/jhelvy/keymap.c             |  2 +-
 .../ll3macorn/bongopad/keymaps/default/keymap.c      |  2 +-
 .../minidox/keymaps/dustypomerleau/keymap.c          | 12 ++++++------
 .../minidox/keymaps/rsthd_combos/keymap.c            |  2 +-
 keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c  |  2 +-
 keyboards/mechkeys/espectro/keymaps/mac/keymap.c     |  2 +-
 keyboards/mitosis/keymaps/mjt/keymap.c               |  6 +++---
 keyboards/mitosis/keymaps/nzen/keymap.c              |  4 ++--
 keyboards/nek_type_a/keymaps/default/keymap.c        |  2 +-
 keyboards/orthocode/keymaps/default/keymap.c         |  2 +-
 keyboards/orthocode/keymaps/via/keymap.c             |  2 +-
 keyboards/planck/keymaps/dvz/keymap.c                |  2 +-
 keyboards/planck/keymaps/dzobert/keymap.c            |  2 +-
 keyboards/planck/keymaps/inkwell/keymap.c            | 12 ++++++------
 keyboards/planck/keymaps/ishtob/keymap.c             |  2 +-
 keyboards/planck/keymaps/joe/keymap.c                |  2 +-
 keyboards/planck/keymaps/mason/keymap.c              |  2 +-
 keyboards/planck/keymaps/mjt/keymap.c                |  6 +++---
 keyboards/planck/keymaps/mjtnumsym/keymap.c          |  6 +++---
 keyboards/planck/keymaps/pete/keymap.c               |  2 +-
 keyboards/planck/keymaps/smittey/keymap.c            |  8 ++++----
 keyboards/planck/keymaps/ttys0/keymap.c              |  2 +-
 keyboards/preonic/keymaps/pcurt854/keymap.c          |  4 ++--
 keyboards/preonic/keymaps/ttys0/keymap.c             |  2 +-
 .../prime_o/keymaps/reasonsandreasons/keymap.c       |  2 +-
 keyboards/pteron36/pteron36.c                        |  4 ++--
 keyboards/rocketboard_16/keycode_lookup.c            |  2 +-
 keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c    |  2 +-
 keyboards/splitkb/kyria/keymaps/mattir2/keymap.c     |  4 ++--
 keyboards/tada68/keymaps/ardakilic/keymap.c          |  2 +-
 keyboards/tada68/keymaps/ardakilic/readme.md         |  2 +-
 keyboards/tada68/keymaps/mekberg/keymap.c            |  4 ++--
 keyboards/tada68/keymaps/peippo/keymap.c             |  2 +-
 .../thevankeyboards/minivan/keymaps/mjt/keymap.c     |  4 ++--
 .../roadkit/keymaps/flipphone/keymap.c               |  4 ++--
 .../thevankeyboards/roadkit/keymaps/mjt/keymap.c     |  4 ++--
 keyboards/torn/keymaps/kinesish/keymap.c             |  2 +-
 keyboards/torn/keymaps/via/keymap.c                  |  2 +-
 keyboards/torn/torn_encoder.c                        |  2 +-
 keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c    |  4 ++--
 .../westfoxtrot/cyclops/keymaps/peippo/keymap.c      |  6 +++---
 keyboards/westm/westmergo/keymaps/default/keymap.c   |  2 +-
 keyboards/westm/westmergo/keymaps/via/keymap.c       |  6 +++---
 keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c      |  4 ++--
 keyboards/xiudi/xd60/keymaps/petesmom/keymap.c       | 10 +++++-----
 keyboards/xiudi/xd60/keymaps/styr/keymap.c           |  2 +-
 layouts/community/60_iso/bifbofii/keymap.c           | 10 +++++-----
 layouts/community/ergodox/ordinary/keymap.c          |  2 +-
 layouts/community/ergodox/ordinary_osx/keymap.c      |  2 +-
 layouts/community/ergodox/townk_osx/keymap.c         |  2 +-
 layouts/community/ergodox/zweihander-macos/keymap.c  |  2 +-
 layouts/community/ortho_4x12/bifbofii/keymap.c       |  8 ++++----
 layouts/community/planck_mit/guidoism/keys.json      |  8 ++++----
 quantum/keycode_legacy.h                             |  4 ----
 users/brandonschlack/process_records.h               |  6 +++---
 users/jjerrell/wrappers.h                            |  6 +++---
 users/ninjonas/ninjonas.h                            |  4 ++--
 113 files changed, 190 insertions(+), 201 deletions(-)

diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
index 3a9e4d51fa..b43a13d976 100644
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
@@ -141,11 +141,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case MACSLEEP:
       if (record->event.pressed) {
-          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_POWER);
+          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
           register_code(KC_RSFT);
           register_code(KC_RCTL);
-          register_code(KC_POWER);
-          unregister_code(KC_POWER);
+          register_code(KC_PWR);
+          unregister_code(KC_PWR);
           unregister_code(KC_RCTL);
           unregister_code(KC_RSFT);
       }
diff --git a/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c b/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
index 521691d74f..9732230b05 100644
--- a/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
+++ b/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
      _______, _______, _______, _______, _______, _______,                            _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,           _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,  KC__MUTE,KC__VOLDOWN,KC__VOLUP,
+     _______, _______, _______, _______, _______, _______,                            _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,  KC_MUTE, KC_VOLD, KC_VOLU,
   //└────────┴────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
                                 _______, _______, _______, _______,          _______, _______, KC_P0,   KC_PDOT
   //                           └────────┴────────┴────────┴────────┘        └────────┴────────┴────────┴────────┘
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
      _______, _______, _______, _______, _______, _______,                            _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______,_______,           _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  KC__MUTE,KC__VOLDOWN,KC__VOLUP,
+     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  KC_MUTE, KC_VOLD, KC_VOLU,
   //└────────┴────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
                                 _______, _______, _______, _______,          _______, _______, _______, _______
   //                           └────────┴────────┴────────┴────────┘        └────────┴────────┴────────┴────────┘
diff --git a/keyboards/alpha/keymaps/vderm/keymap.c b/keyboards/alpha/keymaps/vderm/keymap.c
index 5fc642319b..e3ac94807d 100644
--- a/keyboards/alpha/keymaps/vderm/keymap.c
+++ b/keyboards/alpha/keymaps/vderm/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(1, KC_C), LT(2, KC_V), MT(MOD_LSFT, KC_SPC), MT(MOD_RGUI,KC_B), MT(MOD_RALT, KC_N), MT(MOD_RCTL, KC_M)),
 
 	[FN] = LAYOUT(
-		KC_ESC, KC__MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_NO,
+		KC_ESC, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_NO,
 		KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BSPC,
 		KC_LCTL, KC_LALT, KC_TRNS, MO(3), MT(MOD_LSFT, KC_SPC), KC_RGUI, KC_RALT, KC_RCTL),
 
diff --git a/keyboards/atreus/keymaps/xk/keymap.c b/keyboards/atreus/keymaps/xk/keymap.c
index e981d20ac2..c3f6b1e9f8 100644
--- a/keyboards/atreus/keymaps/xk/keymap.c
+++ b/keyboards/atreus/keymaps/xk/keymap.c
@@ -240,7 +240,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   //one_ring=2__rule__them-all
   [_GRVTABL] = LAYOUT( \
-    LALT(KC_PSCR), M(4),            KC_PWR,      KC_POWER,     QK_BOOT,                        QK_BOOT,      KC_R,         KC_E,        KC_I,            LALT(KC_PSCR), \
+    LALT(KC_PSCR), M(4),            KC_PWR,      KC_PWR,       QK_BOOT,                        QK_BOOT,      KC_R,         KC_E,        KC_I,            LALT(KC_PSCR), \
     TG(_NINEKEY),  TG(_FNCTION),    TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA),                   TG(_IKAPILA), KC_S,         KC_U,        KC_B,            TG(_NINEKEY),  \
     M(3),          TG(_GAMEQWERTY), XXXXXXX,     XXXXXXX,      XXXXXXX,                        KC_MYCM,      KC_CALC,      XXXXXXX,     TG(_GAMEQWERTY), M(3),          \
     TT(_GRVTABL),  TG(_FNCTION),    TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), _______, _______, TG(_IKAPILA), TG(_IKASHFT), TG(_MLAYER), TG(_MLAYER),     TG(_NINEKEY)   \
diff --git a/keyboards/avalanche/v2/keymaps/default/keymap.c b/keyboards/avalanche/v2/keymaps/default/keymap.c
index fc27401c25..fc8842a865 100644
--- a/keyboards/avalanche/v2/keymaps/default/keymap.c
+++ b/keyboards/avalanche/v2/keymaps/default/keymap.c
@@ -29,7 +29,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_LGUI, KC_LSFT, 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_RBRC,
                  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DEL,  KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
-                                   KC__MUTE,KC_GRV,  LFN_3,   FN_2,    EN_LALT, EN_RALT, FN_1,    RFN_3,   FN_3,    KC_LSCR
+                                   KC_MUTE, KC_GRV,  LFN_3,   FN_2,    EN_LALT, EN_RALT, FN_1,    RFN_3,   FN_3,    KC_LSCR
     ),
     [LAYER_1] = LAYOUT(
                  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
diff --git a/keyboards/avalanche/v3/keymaps/default/keymap.c b/keyboards/avalanche/v3/keymaps/default/keymap.c
index be82b74c09..094e1bc343 100644
--- a/keyboards/avalanche/v3/keymaps/default/keymap.c
+++ b/keyboards/avalanche/v3/keymaps/default/keymap.c
@@ -28,7 +28,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_CAPS, KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_RBRC,
                  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DEL,  KC_LGUI, KC_INS,  KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
-                                            KC__MUTE,LFN_2,   LFN_3,   KC_SPC,  EN_LALT, EN_RALT, FN_1,    RFN_3,   RFN_2,   KC_PSCR
+                                            KC_MUTE, LFN_2,   LFN_3,   KC_SPC,  EN_LALT, EN_RALT, FN_1,    RFN_3,   RFN_2,   KC_PSCR
     ),
     [LAYER_1] = LAYOUT(
                  _______, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,
diff --git a/keyboards/avalanche/v4/keymaps/default/keymap.c b/keyboards/avalanche/v4/keymaps/default/keymap.c
index 7239091ca2..457aff4cc0 100644
--- a/keyboards/avalanche/v4/keymaps/default/keymap.c
+++ b/keyboards/avalanche/v4/keymaps/default/keymap.c
@@ -28,7 +28,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_CAPS, KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_RBRC,
                  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DEL,  KC_LGUI, KC_INS,  KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
-                                            KC__MUTE,LFN_2,   LFN_3,   KC_SPC,  EN_LALT, EN_RALT, FN_1,    RFN_3,   RFN_2,   KC_PSCR
+                                            KC_MUTE, LFN_2,   LFN_3,   KC_SPC,  EN_LALT, EN_RALT, FN_1,    RFN_3,   RFN_2,   KC_PSCR
     ),
     [LAYER_1] = LAYOUT(
                  _______, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,
diff --git a/keyboards/boardwalk/keymaps/mcallaster/keymap.c b/keyboards/boardwalk/keymaps/mcallaster/keymap.c
index efddd8aa0a..e6cc7fbffc 100644
--- a/keyboards/boardwalk/keymaps/mcallaster/keymap.c
+++ b/keyboards/boardwalk/keymaps/mcallaster/keymap.c
@@ -13,7 +13,7 @@ enum layer {
 #define FN    MO(3)
 
 // Mac sleep
-#define __SLEEP S(LCTL(KC_POWER))
+#define __SLEEP S(LCTL(KC_PWR))
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_ortho_hhkb(
diff --git a/keyboards/bobpad/keymaps/via/keymap.c b/keyboards/bobpad/keymaps/via/keymap.c
index e4fb137c41..c244c6037e 100644
--- a/keyboards/bobpad/keymaps/via/keymap.c
+++ b/keyboards/bobpad/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ uint16_t alt_tab_timer = 0;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_2x3(
-        KC_MEDIA_STOP,  KC_MEDIA_PLAY_PAUSE, KC__MUTE,
+        KC_MEDIA_STOP,  KC_MEDIA_PLAY_PAUSE, KC_MUTE,
         KC_MEDIA_REWIND,  KC_MEDIA_FAST_FORWARD,  KC_PGDN
     ),
     [1] = LAYOUT_ortho_2x3(
diff --git a/keyboards/cannonkeys/adelie/keymaps/default/keymap.c b/keyboards/cannonkeys/adelie/keymaps/default/keymap.c
index 757c6b56ac..aa83d2901e 100644
--- a/keyboards/cannonkeys/adelie/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/adelie/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN2] = LAYOUT_all(
-    KC_POWER, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL, KC_VOLU,
+    KC_PWR,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL, KC_VOLU,
     KC_SLEP, 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_VOLD,
     KC_WAKE, 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_MUTE,
     QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/cannonkeys/adelie/keymaps/via/keymap.c b/keyboards/cannonkeys/adelie/keymaps/via/keymap.c
index 757c6b56ac..aa83d2901e 100644
--- a/keyboards/cannonkeys/adelie/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/adelie/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN2] = LAYOUT_all(
-    KC_POWER, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL, KC_VOLU,
+    KC_PWR,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL, KC_VOLU,
     KC_SLEP, 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_VOLD,
     KC_WAKE, 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_MUTE,
     QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/chocofly/v1/keymaps/default/keymap.c b/keyboards/chocofly/v1/keymaps/default/keymap.c
index b128e5e17b..6d2b3de0af 100644
--- a/keyboards/chocofly/v1/keymaps/default/keymap.c
+++ b/keyboards/chocofly/v1/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-                 KC_BSLS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC__MUTE,                              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+                 KC_BSLS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MUTE,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
                  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_GRV,  KC_INS,  KC_PSCR,  KC_RBRC,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
                                                      LW_LGUI, MT_LSFT, RS_SPC,  MT_LALT, MT_RALT,  MO(_LOWER),MT_RSFT, RS_LGUI
     ),
diff --git a/keyboards/chocofly/v1/keymaps/winder/keymap.c b/keyboards/chocofly/v1/keymaps/winder/keymap.c
index 7d1889b225..f0a8b68a05 100644
--- a/keyboards/chocofly/v1/keymaps/winder/keymap.c
+++ b/keyboards/chocofly/v1/keymaps/winder/keymap.c
@@ -15,13 +15,6 @@ enum layers {
 #define RESIZE  LGUI(KC_R)
 #define BROWSER LSG(KC_ENT) // Left Shift + GUI, ENT.
 
-// required for my PC
-#undef KC_VOLU
-#undef KC_VOLD
-#define KC_VOLU KC__VOLUP
-#define KC_VOLD KC__VOLDOWN
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
                  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL ,
diff --git a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
index 0255798860..2c89fb78e2 100644
--- a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
+++ b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  +-------+  +----------+-------+-------+  +-------+-------+
 */
   [0] = LAYOUT(
-    KC__MUTE,     KC_KP_7,  KC_KP_8,      KC_KP_9,    KC_LEFT_PAREN,  KC_RIGHT_PAREN, \
-    KC__VOLDOWN,  KC_KP_4,  KC_KP_5,      KC_KP_6,    KC_KP_MINUS,    KC_KP_SLASH, \
-    KC__VOLUP,    KC_KP_1,  KC_KP_2,      KC_KP_3,    KC_KP_PLUS,     KC_KP_ASTERISK, \
+    KC_MUTE,      KC_KP_7,  KC_KP_8,      KC_KP_9,    KC_LEFT_PAREN,  KC_RIGHT_PAREN, \
+    KC_VOLD,      KC_KP_4,  KC_KP_5,      KC_KP_6,    KC_KP_MINUS,    KC_KP_SLASH, \
+    KC_VOLU,      KC_KP_1,  KC_KP_2,      KC_KP_3,    KC_KP_PLUS,     KC_KP_ASTERISK, \
     MO(1),        KC_KP_0,  KC_KP_COMMA,  KC_KP_DOT,  KC_RETURN,      KC_QUESTION  \
   ),
   [1] = LAYOUT(
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
index bea46b5bd5..75c7bc9b5e 100644
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@@ -48,7 +48,7 @@ enum {
 #define BACKTICK RALT(KC_BSLS)
 #define TILDE RALT(KC_RBRC)
 #define NUMBER_SIGN RALT(KC_3) //hashtag sign
-#define LOCKSCREEN LCTL(LSFT(KC_POWER)) // Screen Lock shortcut for OSX
+#define LOCKSCREEN LCTL(LSFT(KC_PWR)) // Screen Lock shortcut for OSX
 
 /* 
 // Unicode Turkish characters, in case it's needed
diff --git a/keyboards/crkbd/keymaps/blipson/keymap.c b/keyboards/crkbd/keymaps/blipson/keymap.c
index 218933940c..53f45eaeb6 100644
--- a/keyboards/crkbd/keymaps/blipson/keymap.c
+++ b/keyboards/crkbd/keymaps/blipson/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    //|----------+------------+--------------+---------------+-----------+------------|                    |------------+------------+------------+--------+--------+---------|
        KC_LCTL,   A(KC_F12),   A(G(KC_LEFT)), A(G(KC_RIGHT)), S(KC_F6),  C(S(KC_D)),                       C(S(KC_R)),  G(KC_LBRC),  G(KC_RBRC),  KC_F11,  KC_F12, KC_MPLY,
    //|----------+------------+--------------+---------------+-----------+------------|                    |------------+------------+------------+--------+--------+---------|
-       G(KC_F2), A(G(KC_F)),  KC_MUTE,       KC__VOLDOWN,     KC__VOLUP, G(KC_GRV),                        C(G(KC_G)),  KC_TAB,      S(KC_TAB),   KC_BRID, KC_BRIU, KC_CAPS,
+       G(KC_F2), A(G(KC_F)),  KC_MUTE,       KC_VOLD,         KC_VOLU,   G(KC_GRV),                        C(G(KC_G)),  KC_TAB,      S(KC_TAB),   KC_BRID, KC_BRIU, KC_CAPS,
    //|----------+------------+--------------+---------------+-----------+------------+--------|  |--------+------------+------------+------------+--------+--------+---------|
                                                              _______,    KC_LGUI,     KC_SPC,     KC_SPC,   KC_RALT,     _______
                                                          //`----------------------------------'  `-------------------------------'
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 0cb6021c56..1082ab4e60 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -73,11 +73,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_split_3x6_3(
   //,-----------------------------------------.                ,-----------------------------------------.
-      QK_BOOT,RGBRST, KC_NO, KC_NO, KC_NO, KC_NO,                  KC_NO,KC__MUTE, KC_NO, KC_NO, KC_NO, KC_NO,
+      QK_BOOT,RGBRST, KC_NO, KC_NO, KC_NO, KC_NO,                  KC_NO,KC_MUTE,  KC_NO, KC_NO, KC_NO, KC_NO,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,KC_NO,               KC_PAUSE,KC__VOLUP, KC_NO, KC_NO, KC_NO, KC_NO,
+    RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,KC_NO,               KC_PAUSE,KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD,KC_NO,               KC_SCRL,KC__VOLDOWN, KC_NO, KC_NO, KC_NO, RGB_RMOD,
+    RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD,KC_NO,               KC_SCRL,KC_VOLD, KC_NO, KC_NO, KC_NO, RGB_RMOD,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
                                 KC_LGUI, LOWER,KC_SPC,   KC_ENT, RAISE,KC_RALT
                               //`--------------------'  `--------------------'
diff --git a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c b/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
index 9a0e89bd89..de9d6cc45b 100644
--- a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0       , KC_BSPC,
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC    , KC_BSLS,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______    , _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC__VOLDOWN, KC_MPLY
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MPLY
 ),
 
 /* Raise
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TILD, _______, _______, KC_END, _______, _______, _______,  KC_PGUP, _______, _______, _______  , KC_DEL , 
     _______, KC_HOME, _______, KC_PGDN, _______, _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______  , _______, 
     _______, _______, _______, KC_COPY, KC_PSTE, KC_PGDN, _______, _______, _______, _______, _______  , _______,  
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC__VOLUP, KC_MUTE
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLU, KC_MUTE
 ),
 
 /* Adjust (Lower + Raise)
diff --git a/keyboards/dz60/keymaps/billiams/keymap.c b/keyboards/dz60/keymaps/billiams/keymap.c
index b41e2d7508..746c671c43 100644
--- a/keyboards/dz60/keymaps/billiams/keymap.c
+++ b/keyboards/dz60/keymaps/billiams/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_directional(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-      _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC__VOLDOWN, KC__VOLUP, KC_MRWD, KC_MFFD,
+      _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
       KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
       _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
diff --git a/keyboards/dz60/keymaps/billiams_layout2/keymap.c b/keyboards/dz60/keymaps/billiams_layout2/keymap.c
index 0ca8916541..0f9d5e9c0b 100644
--- a/keyboards/dz60/keymaps/billiams_layout2/keymap.c
+++ b/keyboards/dz60/keymaps/billiams_layout2/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   LAYOUT_60_2_function(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, KC__VOLDOWN, KC__VOLUP,
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, KC_VOLD, KC_VOLU,
       _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, KC_MUTE, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, KC_MPLY,
       _______,  _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, QK_BOOT,
diff --git a/keyboards/dz60/keymaps/billiams_layout4/keymap.c b/keyboards/dz60/keymaps/billiams_layout4/keymap.c
index cc62b0d62a..02fddee32d 100644
--- a/keyboards/dz60/keymaps/billiams_layout4/keymap.c
+++ b/keyboards/dz60/keymaps/billiams_layout4/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_directional(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-      _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC__VOLDOWN, KC__VOLUP, KC_MRWD, KC_MFFD,
+      _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
       KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
       _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
diff --git a/keyboards/dz60/keymaps/bingocaller/keymap.c b/keyboards/dz60/keymaps/bingocaller/keymap.c
index 787665af78..cc0c0dc1f8 100644
--- a/keyboards/dz60/keymaps/bingocaller/keymap.c
+++ b/keyboards/dz60/keymaps/bingocaller/keymap.c
@@ -4,8 +4,8 @@
 #define WORD_FORWARD A(KC_RIGHT)
 #define DELETE_WORD_BACK A(KC_BSPACE)
 #define DELETE_WORD_FORWARD A(KC_DELETE)
-#define FINE_VOLUP S(A(KC__VOLUP))
-#define FINE_VOLDOWN S(A(KC__VOLDOWN))
+#define FINE_VOLUP S(A(KC_VOLU))
+#define FINE_VOLDOWN S(A(KC_VOLD))
 
 enum layers {
   _BASE,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_ARROWS] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, WORD_FORWARD, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC__MUTE, FINE_VOLDOWN, FINE_VOLUP, _______,
+        _______, _______, WORD_FORWARD, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, FINE_VOLDOWN, FINE_VOLUP, _______,
         _______, _______, _______, _______, LT(_HDUE, _______), _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, WORD_BACK, KC_BSPC, KC_DEL, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/dz60/keymaps/drewsky/keymap.c b/keyboards/dz60/keymaps/drewsky/keymap.c
index aba0d238f0..da636b190d 100755
--- a/keyboards/dz60/keymaps/drewsky/keymap.c
+++ b/keyboards/dz60/keymaps/drewsky/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_NO,     KC_NO,    KC_UP,    KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_PGUP, 
 			KC_NO,      KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_PGDN, 
 			KC_NO,       KC_MRWD,  KC_MFFD,  KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_NO,    KC_NO,    KC_NO,     KC_NO, 
-			KC_MSTP,   KC_VOLD,    KC_VOLU,                            KC_MPLY,                             KC__VOLDOWN, KC__VOLUP, KC_TRNS, KC_NO),
+			KC_MSTP,   KC_VOLD,    KC_VOLU,                            KC_MPLY,                             KC_VOLD, KC_VOLU, KC_TRNS, KC_NO),
 	
   [_L2] = LAYOUT_60_ansi(    
 			KC_ESC, RGB_M_P,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
index 59f2df42c0..233e031282 100644
--- a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MEDIA] = LAYOUT(
-        TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_POWER,
+        TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PWR,
         _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
diff --git a/keyboards/fleuron/keymaps/dollartacos/keymap.c b/keyboards/fleuron/keymaps/dollartacos/keymap.c
index 445204f8b9..a1b6a264e4 100644
--- a/keyboards/fleuron/keymaps/dollartacos/keymap.c
+++ b/keyboards/fleuron/keymaps/dollartacos/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * | RGB  | Ctrl | Alt  |Lower | Cmd  |Enter | Bksp |Space | Raise| Left | Down | Up   |Right |  0   |  .   |Enter |
    * `---------------------------------------------------------------------------------------------------------------'
    */
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC__MUTE, KC_MPLY, KC_MFFD, \
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,  KC_MPLY, KC_MFFD, \
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,  KC_PSLS,  KC_PAST, KC_PSLS, \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_BSLS, KC_P7,   KC_P8,    KC_P9,   KC_PAST, \
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_P4,   KC_P5,    KC_P6,   KC_PMNS, \
diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
index 35b1e0b653..b72e81f6d7 100644
--- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
@@ -71,9 +71,9 @@ KC_LSFT,              KC_Z,  KC_X,   KC_C,   KC_V, KC_B, OSM(MOD_LALT),       KC
  *                                 `--------------'                     `--------------'
  */
 [SYMB] = LAYOUT_gergo(
-KC_TRNS, KC_EXLM, KC_AT,  KC_HASH,KC_DLR, KC_PERC,                         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC__VOLUP,
-KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR,KC_RCBR, KC_PLUS, M1_STRING,             KC_TRNS,  KC_TRNS, KC_MINS, KC_UNDERSCORE, KC_PLUS, KC_EQL, KC__VOLDOWN,
-KC_TRNS, KC_GRV, KC_TILD,KC_TRNS,KC_TRNS, KC_EQL, M2_URL,                 KC_TRNS,  KC_TRNS, KC_TRNS,  KC_MEDIA_REWIND, KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_FAST_FORWARD, KC__MUTE,
+KC_TRNS, KC_EXLM, KC_AT,  KC_HASH,KC_DLR, KC_PERC,                         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_VOLU,
+KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR,KC_RCBR, KC_PLUS, M1_STRING,             KC_TRNS,  KC_TRNS, KC_MINS, KC_UNDERSCORE, KC_PLUS, KC_EQL, KC_VOLD,
+KC_TRNS, KC_GRV, KC_TILD,KC_TRNS,KC_TRNS, KC_EQL, M2_URL,                 KC_TRNS,  KC_TRNS, KC_TRNS,  KC_MEDIA_REWIND, KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_FAST_FORWARD, KC_MUTE,
 
                                                   KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,
 
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
index 77bf54de63..2b4e179c53 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT(
         KC_GRAVE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_DELETE, \
         KC_TRNS,TG(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS, \
-        KC_TRNS,KC_MUTE,KC__VOLDOWN,KC__VOLUP,KC_TRNS,KC_TRNS,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,KC_TRNS,KC_TRNS,KC_TRNS, \
+        KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU,KC_TRNS,KC_TRNS,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,TG(3),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_END,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
 
diff --git a/keyboards/gh60/satan/keymaps/mark1/keymap.c b/keyboards/gh60/satan/keymaps/mark1/keymap.c
index 565a83fa92..de9b80da18 100644
--- a/keyboards/gh60/satan/keymaps/mark1/keymap.c
+++ b/keyboards/gh60/satan/keymaps/mark1/keymap.c
@@ -6,8 +6,8 @@
 #define KC_FNLK TG(1) // Fn lock
 #define KC_HOME LGUI(KC_LEFT) // Home, or cmd-left
 #define KC_END LGUI(KC_RGHT) // End, or cmd-right
-#define KC_SLP LGUI(LALT(KC_POWER)) // sleep, or cmd-option-power
-#define KC_SCLK LCTL(LSFT(KC_POWER)) // lock screen, or ctrl-shift-power
+#define KC_SLP LGUI(LALT(KC_PWR)) // sleep, or cmd-option-power
+#define KC_SCLK LCTL(LSFT(KC_PWR)) // lock screen, or ctrl-shift-power
 
 // Mark I keyboard layout for GH60 Satan
 // http://www.keyboard-layout-editor.com/#/gists/e1cde292bd2094cc3b763206d4d2cfb5
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
index 789543b56d..8a43b7c6c6 100644
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [ CAPS ] = KEYMAP( // Main "function" key, arrows, media control
         KC_GRAVE, KC_F1,  KC_F2,    KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, XXXXX,\
         _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, PGDN, KC_UP, PGUP, PSCR, SLCK, PAUS, _______,\
-        _______, KC__VOLDOWN, KC__MUTE, KC__VOLUP, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______,\
+        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______,\
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
         _______, _______, _______,           _______,           _______, _______, _______, _______)
 
diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
index 64e7841d8e..752ac2cf2e 100644
--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6, KC_F7,   KC_F8,      KC_F9,  KC_F10,   KC_F11,  KC_F12, \
   KC_1,    KC_2,    KC_3,    KC_4,     KC_5,        KC_6,  KC_7,    KC_8,       KC_9,    KC_0,  KC_PLUS, KC_BSLS, _______, _______, _______, \
   _______, KC_A,    KC_UP,   KC_D,     KC_PSCR,  _______,  KC_4,    KC_5,       KC_6, KC_PAST,  KC_COLN, KC_QUOT, _______, _______, _______, \
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC__MUTE, _______,  KC_1,    KC_2,       KC_3,   KC_UP,  KC_SLSH, _______, _______, _______, _______, \
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE,  _______,  KC_1,    KC_2,       KC_3,   KC_UP,  KC_SLSH, _______, _______, _______, _______, \
   _______, _______, _______, _______,   _______,  KC_SPC,  KC_0,   _______,  KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______  \
 ),
 
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index 569921c773..de93500aa3 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   ________________NUMBER_LEFT________________, KC_6,    _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_0,  KC_PLUS,  KC_BSLS, \
   KC_DEL,  KC_A,    KC_UP,   KC_D,    KC_PSCR,  KC_VOLU, _______, _______, _______, KC_4,  KC_5,  KC_6,  KC_PAST, KC_COLN, KC_QUOT, \
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC__MUTE, KC_VOLD, _______, _______, _______, KC_1,    KC_2,  KC_3,  KC_UP, KC_SLSH,   _______, \
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_MUTE,  KC_VOLD, _______, _______, _______, KC_1,    KC_2,  KC_3,  KC_UP, KC_SLSH,   _______, \
   _______, _______, _______, _______,  _______, KC_SPC, _______, _______, KC_SPC,  KC_0,   _______,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_NLCK   \
 ),
 
diff --git a/keyboards/handwired/aranck/keymaps/default/keymap.c b/keyboards/handwired/aranck/keymaps/default/keymap.c
index 13c778bf9c..016c246fc5 100644
--- a/keyboards/handwired/aranck/keymaps/default/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum aranck_layers {
 };
 
 
-#define LOCKSCREEN LCTL(LSFT(KC_POWER)) // Screen Lock shortcut for OSX
+#define LOCKSCREEN LCTL(LSFT(KC_PWR)) // Screen Lock shortcut for OSX
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -46,7 +46,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_BSPC,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     LSFT_T(KC_CAPS), KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
-    LT(_SODA, KC_POWER), KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), LT(_SPACE, KC_SPC), MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    LT(_SODA, KC_PWR), KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), LT(_SPACE, KC_SPC), MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
index 3a74063700..9b8ddce806 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
@@ -44,7 +44,7 @@ enum aranck_layers {
 #define BACKTICK RALT(KC_BSLS)
 #define TILDE RALT(KC_RBRC)
 #define NUMBER_SIGN RALT(KC_3)
-#define LOCKSCREEN LCTL(LSFT(KC_POWER)) // Screen Lock shortcut for OSX
+#define LOCKSCREEN LCTL(LSFT(KC_PWR)) // Screen Lock shortcut for OSX
 
 /* 
 // Unicode Turkish characters, in case it's needed
diff --git a/keyboards/handwired/heisenberg/keymaps/default/keymap.c b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
index 81a9cf11c3..494239fe3c 100644
--- a/keyboards/handwired/heisenberg/keymaps/default/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum heisenberg_layers {
 };
 
 
-#define LOCKSCREEN LCTL(LSFT(KC_POWER)) // Screen Lock shortcut for OSX
+#define LOCKSCREEN LCTL(LSFT(KC_PWR)) // Screen Lock shortcut for OSX
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -46,7 +46,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_BSPC,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     LSFT_T(KC_CAPS), KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT /*KC_ENT*/,
-    LT(_SODA, KC_POWER), KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), LT(_SPACE, KC_SPC), MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    LT(_SODA, KC_PWR), KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), LT(_SPACE, KC_SPC), MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
index f4b75adbf3..18e4b55685 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
@@ -44,7 +44,7 @@ enum heisenberg_layers {
 #define BACKTICK RALT(KC_BSLS)
 #define TILDE RALT(KC_RBRC)
 #define NUMBER_SIGN RALT(KC_3)
-#define LOCKSCREEN LCTL(LSFT(KC_POWER)) // Screen Lock shortcut for OSX
+#define LOCKSCREEN LCTL(LSFT(KC_PWR)) // Screen Lock shortcut for OSX
 
 /* 
 // Unicode Turkish characters, in case it's needed
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
index 1ed2cb1555..60945b9414 100644
--- a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
@@ -8,7 +8,7 @@
 #define FUNK 2
 #define DYN 3
 #define CTL_ESC CTL_T(KC_ESC)
-#define MACSLEEP LCTL(LSFT(KC_POWER))
+#define MACSLEEP LCTL(LSFT(KC_PWR))
 
 enum hhkb_keycodes
 {
diff --git a/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c b/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
index 1adb6ce5be..5a1cf967b2 100644
--- a/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, TD(TD_SFT_CPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2)),
 
-	[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_CAPS, KC_MFFD, 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__MUTE, KC__VOLDOWN, KC__VOLUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[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_CAPS, KC_MFFD, 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_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[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, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS),
 
diff --git a/keyboards/hp69/keymaps/via/keymap.c b/keyboards/hp69/keymaps/via/keymap.c
index 20d24538b3..81901dfe5e 100644
--- a/keyboards/hp69/keymaps/via/keymap.c
+++ b/keyboards/hp69/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,    KC_MEDIA_PLAY_PAUSE,  KC__VOLUP,
-        KC_TAB,      KC_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__MUTE,  KC__VOLDOWN,
+        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,    KC_MEDIA_PLAY_PAUSE,  KC_VOLU,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,        KC_MUTE,  KC_VOLD,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        MO(1),     KC_UP,
         KC_LCTL,     KC_LALT,   KC_LGUI,                             KC_SPC,                                 KC_RGUI,     KC_RALT,      KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index df40dfa5a3..5d18efeba1 100644
--- a/keyboards/idobao/id63/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c
@@ -105,7 +105,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_POWER,
+        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,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index c90f1bf471..d759a5f7c9 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [_FN3] = LAYOUT_65_ansi_blocker(
-        QK_BOOT,  MACRO01,  MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11,   MACRO12, KC_POWER,  KC_F15, \
+        QK_BOOT,  MACRO01,  MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11,   MACRO12, 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,            DEBUG,     XXXXXXX, \
         XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, MACRO00,   XXXXXXX, \
diff --git a/keyboards/idobao/id75/keymaps/drewdobo/keymap.c b/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
index 1fc047edcc..d6d88a72b4 100644
--- a/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
+++ b/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
@@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
  
  [_QW_MAC] = LAYOUT_ortho_5x15( /* QWERTY MAC */
-    KC_ESC,  KC_1,     KC_2,    KC_3,       KC_4,    KC_5,    KC_BRMU, KC_MUTE, KC__VOLUP,   KC_6,   KC_7,     KC_8,     KC_9,    KC_0,    KC_BSLS, \
-    KC_TAB,  KC_Q,     KC_W,    KC_E,       KC_R,    KC_T,    KC_BRMD, XXXXXXX, KC__VOLDOWN, KC_Y,   KC_U,     KC_I,     KC_O,    KC_P,    KC_QUOT, \
+    KC_ESC,  KC_1,     KC_2,    KC_3,       KC_4,    KC_5,    KC_BRMU, KC_MUTE, KC_VOLU,     KC_6,   KC_7,     KC_8,     KC_9,    KC_0,    KC_BSLS, \
+    KC_TAB,  KC_Q,     KC_W,    KC_E,       KC_R,    KC_T,    KC_BRMD, XXXXXXX, KC_VOLD,     KC_Y,   KC_U,     KC_I,     KC_O,    KC_P,    KC_QUOT, \
     Z_LALT,  KC_A,     KC_S,    KC_D,       KC_F,    KC_G,    XXXXXXX, XXXXXXX, XXXXXXX,     KC_H,   KC_J,     KC_K,     KC_L,    KC_SCLN, KC_RALT,  \
     KC_LSFT, KC_Z,     KC_X,    KC_C,       KC_V,    KC_B,    KC_LCMD, XXXXXXX, KC_RCMD,     KC_N,   KC_M,     KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT, \
     TT(_FN), KC_LCTL,  XXXXXXX, TT(_MOUSE), KC_EQL,  KC_BSPC, KC_DEL,  XXXXXXX, KC_ENT,      KC_SPC, KC_MINUS, KC_GRAVE, KC_LBRC, KC_RBRC, KC_RCTL  \
diff --git a/keyboards/jd45/keymaps/mjt6u/keymap.c b/keyboards/jd45/keymaps/mjt6u/keymap.c
index 64b6139a50..1afb4f0191 100644
--- a/keyboards/jd45/keymaps/mjt6u/keymap.c
+++ b/keyboards/jd45/keymaps/mjt6u/keymap.c
@@ -104,11 +104,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
     case MACSLEEP:
         if (record->event.pressed)
         {
-            // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_POWER);
+            // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
             register_code(KC_RSFT);
             register_code(KC_RCTL);
-            register_code(KC_POWER);
-            unregister_code(KC_POWER);
+            register_code(KC_PWR);
+            unregister_code(KC_PWR);
             unregister_code(KC_RCTL);
             unregister_code(KC_RSFT);
         }
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index d18b9928cb..a72e306990 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNCTION] = LAYOUT(
    QK_BOOT, KC_F1,   KC_F2,       KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR,  KC_MPLY, \
    DEBUG,   KC_NO,   KC_NO,       KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,            _______,   \
-   _______, KC_NO,   KC__VOLUP,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,          KC_NO,            KC_NO,   \
-   _______, KC_MRWD, KC__VOLDOWN, KC_MFFD, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,                  KC_BTN1, KC_MS_U, KC_BTN2, \
+   _______, KC_NO,   KC_VOLU,     KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,          KC_NO,            KC_NO,   \
+   _______, KC_MRWD, KC_VOLD,     KC_MFFD, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,                  KC_BTN1, KC_MS_U, KC_BTN2, \
    _______, _______, _______,                      KC_NO,                          _______, _______,                KC_MS_L, KC_MS_D, KC_MS_R),
 
   /* Mathematical lower layer. Blank keys are TRNS.
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
index d34ed320dd..5515db60ac 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
@@ -32,13 +32,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                        KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     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_POWER,
+                                       KC_GRV,   KC_F1,    KC_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, _______,
+                                       _______,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE,  KC_VOLD, KC_VOLU, KC_EJCT, _______,
                                        _______,  _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
                                        _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, _______,
                                        _______,  _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,  _______,          _______, _______, _______,
diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
index 9a3c61f7d4..320d38ea71 100644
--- a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [MAC_FN_LAYER] = LAYOUT(
-    QK_BOOT,  KC_BRID,  KC_BRIU,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MRWD,  KC_MPLY,  KC_MFFD,  KC__MUTE,   KC__VOLDOWN,  KC__VOLUP,  KC_TRNS,  KC_TRNS,  KC_INS,
+    QK_BOOT,  KC_BRID,  KC_BRIU,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,    KC_VOLD,      KC_VOLU,    KC_TRNS,  KC_TRNS,  KC_INS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS,            KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,                            KC_TRNS,  KC_TRNS,
diff --git a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
index d8b5b37c54..2deadbf80f 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_POWER,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/iris/keymaps/gsigler/keymap.c b/keyboards/keebio/iris/keymaps/gsigler/keymap.c
index f8753cbdcc..9344d8ec52 100644
--- a/keyboards/keebio/iris/keymaps/gsigler/keymap.c
+++ b/keyboards/keebio/iris/keymaps/gsigler/keymap.c
@@ -42,10 +42,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TRNS, KC_EXLM,   KC_AT,  KC_LCBR, KC_RCBR, KC_PIPE,                           XXXXXXX, XXXXXXX,  KC_UP,  XXXXXXX, XXXXXXX, KC_F12,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
   //|  RAISE |    #   |    $   |   (    |   )    |    `   |                          |   ?    |    ←   |   ↓    |    →   |        |  VOLUP |
-      KC_TRNS,  KC_HASH, KC_DLR, KC_LPRN, KC_RPRN,  KC_GRV,                            KC_QUES, KC_LEFT,KC_DOWN, KC_RGHT, XXXXXXX,  KC__VOLUP,
+      KC_TRNS,  KC_HASH, KC_DLR, KC_LPRN, KC_RPRN,  KC_GRV,                            KC_QUES, KC_LEFT,KC_DOWN, KC_RGHT, XXXXXXX,  KC_VOLU,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
   //|        |    %   |    ^   |   [    |   ]    |    ~   |  ESC            | ALT  |    &   |        |        |        |  MUTE  |  VOLDN |
-     XXXXXXX, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,  KC_TRNS,          KC_TRNS, KC_AMPR, XXXXXXX, XXXXXXX,XXXXXXX, KC__MUTE,KC__VOLDOWN,
+     XXXXXXX, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,  KC_TRNS,          KC_TRNS, KC_AMPR, XXXXXXX, XXXXXXX,XXXXXXX, KC_MUTE,KC_VOLD,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
   //                               |  CTRL  | COMMAND| BKSPACE|                 | SPACE  |  ENTER | SHIFT|
                                     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,  KC_TRNS, KC_TRNS
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c b/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
index ead47592cc..530e62eaa4 100644
--- a/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
@@ -32,10 +32,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_60_iso(
-        KC_GRV,  KC_F1,   KC_F2,       KC_F3,     KC_F4,    KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-        RGB_TOG, RGB_MOD, _______,     _______,   _______,  _______,              _______, KC_PGDN, KC_PGUP, _______, _______, _______, _______,
-        _______, _______, KC__VOLDOWN, KC__VOLUP, KC__MUTE, _______,              KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  _______, _______, _______,
-        _______, _______, _______,     _______,   _______,  _______, _______,     _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,     _______,             _______,              _______, _______, _______, _______, _______,          _______, _______
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,     KC_F4,    KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        RGB_TOG, RGB_MOD, _______, _______,   _______,  _______,              _______, KC_PGDN, KC_PGUP, _______, _______, _______, _______,
+        _______, _______, KC_VOLD, KC_VOLU,   KC_MUTE,  _______,              KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  _______, _______, _______,
+        _______, _______, _______, _______,   _______,  _______, _______,     _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______,             _______,              _______, _______, _______, _______, _______,          _______, _______
     )
 };
diff --git a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
index b0bc70b179..0b7b76101e 100755
--- a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
@@ -3,7 +3,7 @@
 
 #define PGMOD LT(_MOD, KC_PGDN)
 #define SPCMOD LT(_MOD, KC_SPACE)
-#define VOLMOD LT(_MOD, KC__MUTE)
+#define VOLMOD LT(_MOD, KC_MUTE)
 
 enum layer_names {
   _BASE,
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
index 6c8b278264..6671cb43f8 100644
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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_POWER)),
+      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)
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index a81ac0cec5..79257e9961 100644
--- a/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                   KC_NO,   KC_NO,   KC_TRNS,
        // right hand
        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_POWER,
+       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PWR,
        KC_NO,   KC_VOLU, KC_MS_U, KC_VOLD, KC_NO,   KC_NO,
        KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,   KC_NO,
        KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,
diff --git a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
index a072176f43..4343b5fe52 100644
--- a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      KC_HOME,
                    KC_BSPC, KC_DEL,  KC_END,
         // right hand
-        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NLCK, KC_POWER,
+        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NLCK, KC_PWR,
         KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH,
         KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS,
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
index 57e703fd6f..9e51cb274f 100644
--- a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
+++ b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
@@ -252,7 +252,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______, _______, _______,
 
            // Right Hand
-           _______, _______, _______, _______, _______, KC_POWER, _______, _______, _______,
+           _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
            _______, _______, _______, _______, _______, _______,
@@ -304,7 +304,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______, _______, _______,
 
            // Right Hand
-           _______,    _______, _______, _______, KC__MUTE, KC__VOLDOWN, KC__VOLUP, _______, _______,
+           _______,    _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
            _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,  _______,
            _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,  _______,
            _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,  _______,
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
index 2d8a9a55bf..06fc50f482 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
@@ -177,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [LAYER_SYST] = LAYOUT_ortho_4x12(
          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_POWER, KC_SYRQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX,
+         XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_PWR, KC_SYRQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX,
          XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_APP, MT(MOD_RSFT, KC_INS), XXXXXXX,
          XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
 
diff --git a/keyboards/lets_split/keymaps/xk/keymap.c b/keyboards/lets_split/keymaps/xk/keymap.c
index 2b5bf5bfef..8a3109b7ad 100755
--- a/keyboards/lets_split/keymaps/xk/keymap.c
+++ b/keyboards/lets_split/keymaps/xk/keymap.c
@@ -301,7 +301,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_GRVTABL] =  LAYOUT( \
-    TG(5),LALT(KC_PSCR),    M(4),  KC_PWR,KC_POWER,   QK_BOOT,         QK_BOOT,  KC_R,    KC_E,    KC_I,LALT(KC_PSCR),TG(3), \
+    TG(5),LALT(KC_PSCR),    M(4),  KC_PWR,KC_PWR,     QK_BOOT,         QK_BOOT,  KC_R,    KC_E,    KC_I,LALT(KC_PSCR),TG(3), \
     TG(1),        TG(6),   TG(7),   TG(9),   TG(3),   TG(2),           TG(2),    KC_S,    KC_U,    KC_B,   TG(6),   TG(1), \
      M(3),        TG(8), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,         KC_MYCM, KC_CALC, XXXXXXX, XXXXXXX,   TG(8),    M(3), \
    TT(15),        TG(6),   TG(7),   TG(9),   TG(3),   TG(2),           TG(2),   TG(3),   TG(9),   TG(7),   TG(6), _______ \
diff --git a/keyboards/lily58/keymaps/datadavd/keymap.c b/keyboards/lily58/keymaps/datadavd/keymap.c
index 0485cd19ad..0f0c63c8e9 100644
--- a/keyboards/lily58/keymaps/datadavd/keymap.c
+++ b/keyboards/lily58/keymaps/datadavd/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   `----------------------------'           '------''--------------------'
  */
 [_SUPER] = LAYOUT(
-  KC_POWER,  KC_PWR,   KC_SLEP,  KC_WAKE,  KC_NO,     KC_NO,                         KC_BSLS,  KC_GRV,   KC_RCBR,  KC_MINS,  KC_EQL,  KC_BSPC,
+  KC_PWR,    KC_PWR,   KC_SLEP,  KC_WAKE,  KC_NO,     KC_NO,                         KC_BSLS,  KC_GRV,   KC_RCBR,  KC_MINS,  KC_EQL,  KC_BSPC,
   KC_TAB,    KC_TAB,   KC_ESC,   KC_ENT,   KC_LCTRL,  KC_LCBR,                       KC_RPRN,  KC_TAB,   KC_UP,    KC_LBRC,  KC_RBRC, KC_TRNS,
   KC_LSFT,   KC_LSFT,  KC_LGUI,  KC_LALT,  KC_UNDS,   KC_LPRN,                       KC_BSPC,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_EQL,  KC_ENT,
   KC_LCTL,   KC_LCTL,  KC_HOME,  KC_PGUP,  KC_PGDN,   KC_END,   KC_CAPS,  KC_GRV,    KC_B,     KC_V,     KC_C,     KC_X,     KC_Z,    KC_RSFT,
diff --git a/keyboards/lily58/keymaps/jhelvy/keymap.c b/keyboards/lily58/keymaps/jhelvy/keymap.c
index a8dc5d8595..9517e22708 100644
--- a/keyboards/lily58/keymaps/jhelvy/keymap.c
+++ b/keyboards/lily58/keymaps/jhelvy/keymap.c
@@ -38,7 +38,7 @@ LGUI(KC_BSPC),MO(2),LGUI(KC_S),LGUI(KC_C),LGUI(KC_V),LGUI(KC_X),
                                   KC_NO,   KC_NO,KC_NO,KC_TRNS,    KC_NO, KC_RGUI,   KC_PGUP,     KC_NO),
 
 [_UPPER] = LAYOUT( \
-            KC__VOLUP,LGUI(LALT(KC_1)),LGUI(LALT(KC_2)),   KC_F3,   KC_F4,   KC_F5,                    KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,LSFT(KC_EQL), \
+            KC_VOLU,LGUI(LALT(KC_1)),LGUI(LALT(KC_2)),   KC_F3,   KC_F4,   KC_F5,                    KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,LSFT(KC_EQL), \
     KC_VOLD,  KC_NO,  KC_NO,   KC_NO,SGUI(KC_R),  KC_F14,               SGUI(KC_K),SGUI(KC_LEFT),LSFT(KC_UP),SGUI(KC_RGHT),  KC_F18,LSFT(KC_MINS), \
       KC_MUTE,KC_TRNS,  KC_NO, KC_LGUI,  KC_TAB,  KC_F21,                    KC_NO,LSFT(KC_LEFT),LSFT(KC_DOWN),LSFT(KC_RGHT),     KC_F20,  KC_F16, \
      KC_ASTG, KC_NO,  KC_NO,   KC_NO,  KC_F22,LCTL(KC_U),LGUI(KC_LBRC),LGUI(KC_RBRC),LGUI(KC_N),   KC_NO,LALT(LSFT(KC_LEFT)),LALT(LSFT(KC_RIGHT)),   KC_F17,   KC_F19, \
diff --git a/keyboards/ll3macorn/bongopad/keymaps/default/keymap.c b/keyboards/ll3macorn/bongopad/keymaps/default/keymap.c
index 807d050e1d..d91a949dee 100644
--- a/keyboards/ll3macorn/bongopad/keymaps/default/keymap.c
+++ b/keyboards/ll3macorn/bongopad/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[Layer1] = LAYOUT_default(
-		KC__MUTE, 
+		KC_MUTE, 
 		KC_7, KC_8, KC_9, 
 		KC_4, KC_5, KC_6, 
 		KC_1, KC_2, KC_3),
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
index c665e955a3..e2643d4e06 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
@@ -96,8 +96,8 @@ void sftpls_reset (qk_tap_dance_state_t *state, void *user_data);
 #define SFT_QOT LSFT_T(KC_QUOT)
 #define SYM_OS OSL(_SYM)
 #define SYS_Z LT(_SYS, KC_Z)
-#define VOL_DN S(LALT(KC__VOLDOWN))
-#define VOL_UP S(LALT(KC__VOLUP))
+#define VOL_DN S(LALT(KC_VOLD))
+#define VOL_UP S(LALT(KC_VOLU))
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -162,10 +162,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                `------'    `------'
  */
 [_SYS] = LAYOUT( \
-  QK_BOOT, DEBUG,   QWERTY,  CMK_DHM, _______,       _______,  KC_VOLD, KC_VOLU, KC_BRID,  KC_BRIU, \
-  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK,        KC_POWER, VOL_DN,  VOL_UP,  KC__MUTE, KC_MPLY, \
-  _______, _______, AU_OFF,  AU_ON,   _______,       _______,  NUMLK_E, KC_MRWD, KC_MFFD,  _______, \
-                    _______, _______, _______,       _______,  _______, _______                     \
+  QK_BOOT, DEBUG,   QWERTY,  CMK_DHM, _______,       _______,  KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \
+  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK,        KC_PWR,   VOL_DN,  VOL_UP,  KC_MUTE, KC_MPLY, \
+  _______, _______, AU_OFF,  AU_ON,   _______,       _______,  NUMLK_E, KC_MRWD, KC_MFFD, _______, \
+                    _______, _______, _______,       _______,  _______, _______                    \
 ),
 
 /* Navigation + mouse keys
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
index 7d6b211379..e795e76207 100644
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT(
    _______, KC_LBRC, KC_QUES, KC_RBRC, KC_BRMU,         KC_PGUP,  KC_HOME, KC_UP,   KC_END,  KC_VOLU,
    KC_ESC, KC_LPRN,  KC_EXLM, KC_RPRN, KC_BRMD,         KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_VOLD,
-   _______, _______, _______, _______, _______,         _______, KC_MPRV, KC_MPLY, KC_MNXT, KC__MUTE,
+   _______, _______, _______, _______, _______,         _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,
                       _______, _______, _______,        KC_DEL,  MO(_ADJUST),  _______
 ),
 [_ADJUST] =  LAYOUT(
diff --git a/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
index 24c0d2c2da..df90a94362 100644
--- a/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
+++ b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT_75_ansi(
         KC_ESC,  KC_F14,  KC_F15,  C(KC_UP), C(KC_L), KC_F11,  A(G(KC_D)), C(KC_S), C(S(KC_O)), C(G(KC_1)), C(G(KC_2)), C(G(KC_3)), KC_MPLY, KC_MUTE, 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_POWER,
+        KC_GRV,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_6,       KC_7,    KC_8,       KC_9,       KC_0,       KC_MINS,    KC_EQL,           KC_BSPC, KC_PWR,
         KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,       KC_U,    KC_I,       KC_O,       KC_P,       KC_LBRC,    KC_RBRC, KC_BSLS,          C(G(KC_N)),
         KC_CAPS, KC_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_LSPO,          KC_Z,    KC_X,     KC_C,    KC_V,    KC_B,       KC_N,    KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,             KC_RSPC, KC_UP,   KC_PGDN,
diff --git a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
index e07e74d5ab..8469d2619b 100644
--- a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
@@ -58,7 +58,7 @@ ________________________________________________________________________________
  */
 
 	[_QWERTY] = LAYOUT_default(
-		KC_ESC,  KC_F14,  KC_F15, EXPOSE, LAUNCH, KC_F11, DOCK,  SCRCAP, CS1,    CS2,    KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_PGUP, KC_PGDN, KC_POWER,
+		KC_ESC,  KC_F14,  KC_F15, EXPOSE, LAUNCH, KC_F11, DOCK,  SCRCAP, CS1,    CS2,    KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_PGUP, KC_PGDN, KC_PWR,
 		KC_GRV,  KC_1,   KC_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_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,
diff --git a/keyboards/mitosis/keymaps/mjt/keymap.c b/keyboards/mitosis/keymaps/mjt/keymap.c
index e9e9a2ba42..df94e8c5bf 100644
--- a/keyboards/mitosis/keymaps/mjt/keymap.c
+++ b/keyboards/mitosis/keymaps/mjt/keymap.c
@@ -187,11 +187,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
   case MACSLEEP:
     if (record->event.pressed) {
-      // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_POWER);
+      // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
       register_code(KC_RSFT);
       register_code(KC_RCTL);
-      register_code(KC_POWER);
-      unregister_code(KC_POWER);
+      register_code(KC_PWR);
+      unregister_code(KC_PWR);
       unregister_code(KC_RCTL);
       unregister_code(KC_RSFT);
     }
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
index bdaa0fc910..3d5bfdd13a 100644
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ b/keyboards/mitosis/keymaps/nzen/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_PSCREEN, KC_SLCK,    KC_MS_WH_LEFT, KC_MS_WH_RIGHT, KC_MS_BTN3,
+    KC_F11, KC_F12,  KC_GRAVE, KC_MUTE,  KC_ESCAPE, KC_PSCREEN, KC_SLCK,    KC_MS_WH_LEFT, KC_MS_WH_RIGHT, KC_MS_BTN3,
             _______, _______,  _______,  TG( 4 ),   TG( 5 ),    _______,    _______,       _______,
             _______, KC_4,     _______,  _______,   _______,    _______,    _______,       _______
   ),
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [ '', '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__VOLUP,           KC__VOLDOWN,
+    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,        _______,             _______,             _______,
diff --git a/keyboards/nek_type_a/keymaps/default/keymap.c b/keyboards/nek_type_a/keymaps/default/keymap.c
index 95945a4510..abb357d7d0 100644
--- a/keyboards/nek_type_a/keymaps/default/keymap.c
+++ b/keyboards/nek_type_a/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC__MUTE, KC__VOLDOWN, KC__VOLUP,
+    KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU,
     KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, KC_DELETE, KC_END, KC_PGDOWN,
     KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
diff --git a/keyboards/orthocode/keymaps/default/keymap.c b/keyboards/orthocode/keymaps/default/keymap.c
index ae06735c57..ee01cd620f 100644
--- a/keyboards/orthocode/keymaps/default/keymap.c
+++ b/keyboards/orthocode/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
      /* Rotary                                                                                                                                  */
-        KC__MUTE,
+        KC_MUTE,
      /*           esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
         RGB_TOG,    KC_GESC, KC_1,    KC_2,    KC_3,  KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_HOME,
      /*           tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
diff --git a/keyboards/orthocode/keymaps/via/keymap.c b/keyboards/orthocode/keymaps/via/keymap.c
index 0e1d843633..e28420e7d8 100644
--- a/keyboards/orthocode/keymaps/via/keymap.c
+++ b/keyboards/orthocode/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
      /* Rotary                                                                                                                                  */
-        KC__MUTE,
+        KC_MUTE,
      /*           esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
         RGB_TOG,    KC_GESC, KC_1,    KC_2,    KC_3,  KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_HOME,
      /*           tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index bedfd0e446..558d820cfd 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -148,7 +148,7 @@ LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    KC_POWER,_______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    KC_PWR,  _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/planck/keymaps/dzobert/keymap.c b/keyboards/planck/keymaps/dzobert/keymap.c
index 6012c068a9..b27476ff09 100644
--- a/keyboards/planck/keymaps/dzobert/keymap.c
+++ b/keyboards/planck/keymaps/dzobert/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_HOME, KC_PGUP, KC_PGDN, KC_END
 ),
 [3] = LAYOUT_planck_grid( /* LOWER */
-  KC_POWER,KC_PSCR, KC_SLCK, KC_PAUSE, KC_NLCK, KC_EXECUTE, KC_MENU,   KC_APP,  KC_7,  KC_8, KC_9, KC_KP_SLASH,
+  KC_PWR,  KC_PSCR, KC_SLCK, KC_PAUSE, KC_NLCK, KC_EXECUTE, KC_MENU,   KC_APP,  KC_7,  KC_8, KC_9, KC_KP_SLASH,
   KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_CAPS, KC_CANCEL, KC_UNDO, KC_AGAIN, KC_4,  KC_5, KC_6, KC_KP_ASTERISK,
   KC_TRNS, KC_INSERT,KC_CUT,   KC_COPY,   KC_PASTE,   KC_BSLS,   KC_9,   KC_0,   KC_1,   KC_2,   KC_3,  KC_KP_MINUS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_0, KC_KP_DOT, KC_KP_ENTER, KC_KP_PLUS
diff --git a/keyboards/planck/keymaps/inkwell/keymap.c b/keyboards/planck/keymaps/inkwell/keymap.c
index ab7e0189ec..92599713db 100644
--- a/keyboards/planck/keymaps/inkwell/keymap.c
+++ b/keyboards/planck/keymaps/inkwell/keymap.c
@@ -79,10 +79,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_planck_grid(
-    KC_SLEP, KC_BRID, KC_BRIU, KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE, KC__VOLDOWN, KC__VOLUP, KC_LPRN, KC_RPRN,  KC_BSPC,
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_DQT,      KC_BSLS,   KC_LBRC, KC_RBRC,  KC_PEQL,
-    KC_LSFT, KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_QUES,     KC_COLN,   KC_LABK, KC_RABK,  KC_ENT,
-    RSFT_T(KC_MPLY),  KC_LCTL, KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,       KC_SPC,    KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
+    KC_SLEP, KC_BRID, KC_BRIU, KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_LPRN, KC_RPRN,  KC_BSPC,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_DQT,  KC_BSLS,   KC_LBRC, KC_RBRC,  KC_PEQL,
+    KC_LSFT, KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_QUES, KC_COLN,   KC_LABK, KC_RABK,  KC_ENT,
+    RSFT_T(KC_MPLY),  KC_LCTL, KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,    KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
 ),
 
 /* Adjust (Lower + Raise)
@@ -172,9 +172,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
       } else {
           // VOLUME
           if (clockwise) {
-            tap_code(KC__VOLUP);
+            tap_code(KC_VOLU);
           } else {
-            tap_code(KC__VOLDOWN);
+            tap_code(KC_VOLD);
           }
       }
   }
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c
index aeb36b3687..2a01b57520 100644
--- a/keyboards/planck/keymaps/ishtob/keymap.c
+++ b/keyboards/planck/keymaps/ishtob/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT_ortho_4x12_wrapper(
   ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,    KC_PLUS,  KC_BSLS,
   _______, KC_A,    KC_UP,   KC_D,    KC_PSCR,  KC_VOLU, KC_4,    KC_5,    KC_6,    KC_PAST, KC_COLN, KC_QUOT,
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC__MUTE, KC_VOLD, KC_1,    KC_2,    KC_3,    KC_UP, KC_SLSH,   _______,
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_MUTE, KC_VOLD, KC_1,    KC_2,    KC_3,    KC_UP, KC_SLSH,   _______,
   _______, _______, _______, _______, _______, KC_SPC,  KC_0,   _______,  KC_LEFT, KC_DOWN, KC_RIGHT,   KC_NLCK
 ),
  
diff --git a/keyboards/planck/keymaps/joe/keymap.c b/keyboards/planck/keymaps/joe/keymap.c
index b520da9fa9..24a10b502e 100644
--- a/keyboards/planck/keymaps/joe/keymap.c
+++ b/keyboards/planck/keymaps/joe/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   KC_NO           ,
     KC_NO,   KC_MPLY, KC_MPRV, KC_MNXT, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   QK_BOOT           ,
     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   KC_NO           ,
-    DF(0),   DF(1),   DF(2),   DF(3),   MO(4), KC_TRNS, KC_TRNS, MO(5), KC_POWER, KC_WAKE, KC_SLEP, LCTL(LALT(KC_L))
+    DF(0),   DF(1),   DF(2),   DF(3),   MO(4), KC_TRNS, KC_TRNS, MO(5), KC_PWR,   KC_WAKE, KC_SLEP, LCTL(LALT(KC_L))
   )
 };
 
diff --git a/keyboards/planck/keymaps/mason/keymap.c b/keyboards/planck/keymaps/mason/keymap.c
index ad12e2520c..2baa863706 100644
--- a/keyboards/planck/keymaps/mason/keymap.c
+++ b/keyboards/planck/keymaps/mason/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_POWER,
+    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/mjt/keymap.c b/keyboards/planck/keymaps/mjt/keymap.c
index 371085ee15..a895d9519b 100644
--- a/keyboards/planck/keymaps/mjt/keymap.c
+++ b/keyboards/planck/keymaps/mjt/keymap.c
@@ -226,11 +226,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case MACSLEEP:
       if (record->event.pressed) {
-          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_POWER);
+          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
           register_code(KC_RSFT);
           register_code(KC_RCTL);
-          register_code(KC_POWER);
-          unregister_code(KC_POWER);
+          register_code(KC_PWR);
+          unregister_code(KC_PWR);
           unregister_code(KC_RCTL);
           unregister_code(KC_RSFT);
       }
diff --git a/keyboards/planck/keymaps/mjtnumsym/keymap.c b/keyboards/planck/keymaps/mjtnumsym/keymap.c
index 2068eebd83..86368c6dab 100644
--- a/keyboards/planck/keymaps/mjtnumsym/keymap.c
+++ b/keyboards/planck/keymaps/mjtnumsym/keymap.c
@@ -225,11 +225,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case MACSLEEP:
       if (record->event.pressed) {
-          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_POWER);
+          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
           register_code(KC_RSFT);
           register_code(KC_RCTL);
-          register_code(KC_POWER);
-          unregister_code(KC_POWER);
+          register_code(KC_PWR);
+          unregister_code(KC_PWR);
           unregister_code(KC_RCTL);
           unregister_code(KC_RSFT);
       }
diff --git a/keyboards/planck/keymaps/pete/keymap.c b/keyboards/planck/keymaps/pete/keymap.c
index cc73a251e2..d5460778f7 100644
--- a/keyboards/planck/keymaps/pete/keymap.c
+++ b/keyboards/planck/keymaps/pete/keymap.c
@@ -39,7 +39,7 @@ extern keymap_config_t keymap_config;
 #define WINPRNT KC_PSCR
 #define WINPRNT2 LGUI(KC_PSCR)
 #define CYCLWIN LGUI(KC_GRV)
-#define MACSLEEP LSFT(LCTL(KC_POWER))
+#define MACSLEEP LSFT(LCTL(KC_PWR))
 #define WINSLEEP KC_SLEP
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/planck/keymaps/smittey/keymap.c b/keyboards/planck/keymaps/smittey/keymap.c
index 02ad2bf36f..f00a487c00 100644
--- a/keyboards/planck/keymaps/smittey/keymap.c
+++ b/keyboards/planck/keymaps/smittey/keymap.c
@@ -135,10 +135,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-----------------------------------------------------------------------------------'
   */
   [_SPACE_FN] = LAYOUT_planck_grid(
-      KC_PSCR,  XXXXXXX, KC_UP,    XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,     XXXXXXX,    KC_SLEP,
-      XXXXXXX,  KC_LEFT, KC_DOWN,  KC_RIGHT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT, KC_DOWN,  KC_UP,       KC_RIGHT,   XXXXXXX,
-      XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,     XXXXXXX,    XXXXXXX,
-      XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,  _______,  _______,  XXXXXXX, KC__MUTE, KC__VOLDOWN, KC__VOLUP,  XXXXXXX
+      KC_PSCR,  XXXXXXX, KC_UP,    XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,    KC_SLEP,
+      XXXXXXX,  KC_LEFT, KC_DOWN,  KC_RIGHT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT, KC_DOWN,  KC_UP,    KC_RIGHT,   XXXXXXX,
+      XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,    XXXXXXX,
+      XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,  _______,  _______,  XXXXXXX, KC_MUTE,  KC_VOLD,  KC_VOLU,    XXXXXXX
   ),
 
 
diff --git a/keyboards/planck/keymaps/ttys0/keymap.c b/keyboards/planck/keymaps/ttys0/keymap.c
index 9dd1fa4ffd..11bad3b7c4 100644
--- a/keyboards/planck/keymaps/ttys0/keymap.c
+++ b/keyboards/planck/keymaps/ttys0/keymap.c
@@ -129,7 +129,7 @@
 #define func MO(FUNC)
 
 #define rset QK_BOOT
-#define powr KC_POWER
+#define powr KC_PWR
 
 #define ____ KC_TRNS
 #define xxxx KC_NO
diff --git a/keyboards/preonic/keymaps/pcurt854/keymap.c b/keyboards/preonic/keymaps/pcurt854/keymap.c
index 9d82aa9fd4..e4501e4220 100644
--- a/keyboards/preonic/keymaps/pcurt854/keymap.c
+++ b/keyboards/preonic/keymaps/pcurt854/keymap.c
@@ -233,8 +233,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       XXXXXXX, XXXXXXX, SCMD(KC_DOT),
                                                                  LCA(KC_J), XXXXXXX, C(LCMD(KC_Q)), XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, SCMD(KC_V),
-                                               XXXXXXX, XXXXXXX, KC__MUTE, KC__VOLUP,   XXXXXXX, LCAG(KC_UP), TG(_ADJUST),
-  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC__VOLDOWN, XXXXXXX, LCAG(KC_DOWN), XXXXXXX
+                                               XXXXXXX, XXXXXXX, KC_MUTE,  KC_VOLU,     XXXXXXX, LCAG(KC_UP), TG(_ADJUST),
+  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_VOLD,     XXXXXXX, LCAG(KC_DOWN), XXXXXXX
 )
 
 
diff --git a/keyboards/preonic/keymaps/ttys0/keymap.c b/keyboards/preonic/keymaps/ttys0/keymap.c
index 38d816de48..fbcf3ea7b1 100644
--- a/keyboards/preonic/keymaps/ttys0/keymap.c
+++ b/keyboards/preonic/keymaps/ttys0/keymap.c
@@ -128,7 +128,7 @@
 #define func MO(FUNC)
 
 #define rset QK_BOOT
-#define powr KC_POWER
+#define powr KC_PWR
 
 #define ____ KC_TRNS
 #define xxxx KC_NO
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
index e8ca64c908..4847f27a6a 100644
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[3] = LAYOUT(
     _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,      _______,    _______,   _______,  _______,  _______,  _______,  _______,   _______,
-    _______,  KC_PGUP,  KC_HOME,  KC_UP,    KC_END,  _______,  _______,  KC__VOLDOWN,  KC__VOLUP,  KC__MUTE,  _______,  _______,  _______,  _______,  _______,   _______,
+    _______,  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
diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c
index 1281b5306e..4c14e6ebd5 100644
--- a/keyboards/pteron36/pteron36.c
+++ b/keyboards/pteron36/pteron36.c
@@ -22,9 +22,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) { /* First encoder */
         if (clockwise) {
-            tap_code(KC__VOLUP);
+            tap_code(KC_VOLU);
         } else {
-            tap_code(KC__VOLDOWN);
+            tap_code(KC_VOLD);
         }
     } else if (index == 1) { /* Second encoder */
         if (clockwise) {
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 8b1362371b..5305b74cc5 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -157,7 +157,7 @@ lookup_table_t lookup_table[333] =
  {"KC_PDOT", KC_PDOT},
  {"KC_NUBS", KC_NUBS},
  {"KC_APP", KC_APP},
- {"KC_POWER", KC_POWER},
+ {"KC_KB_POWER", KC_KB_POWER},
  {"KC_PEQL", KC_PEQL},
  {"KC_F13", KC_F13},
  {"KC_F14", KC_F14},
diff --git a/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c b/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
index 17c39d0b37..4186ad5ff8 100644
--- a/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
@@ -224,7 +224,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				   DEBUG,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BTN1,  KC_MS_UP,  KC_BTN2,  KC_WH_U,  KC_NO,  KC_NO,  KC_NO, \
 				   TFS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_RIGHT,  KC_WH_D,  KC_BTN3,  KC_NO,  KC_TRNS,  \
 				   MAGSYS,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_POWER,  KC_TRNS, KC_TRNS,  KC_NO,  KC_NO
+				   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PWR,  KC_TRNS, KC_TRNS,  KC_NO,  KC_NO
 				   ),
 
   /* 3: Midi Base Layer
diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
index 53d829320e..6201eeebd3 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
   [RAISE] = LAYOUT(
       _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
-      KC__VOLUP, _______, KC_BTN1, KC_BTN3, KC_BTN2, KC_WH_U, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, _______,
-      KC__VOLDOWN, KC__MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_WH_D, KC_WH_L, KC_WH_R, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BRID, _______,
+      KC_VOLU, _______, KC_BTN1, KC_BTN3, KC_BTN2, KC_WH_U, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, _______,
+      KC_VOLD, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_WH_D, KC_WH_L, KC_WH_R, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BRID, _______,
       _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______
       ),
   [FUNCS] = LAYOUT(
diff --git a/keyboards/tada68/keymaps/ardakilic/keymap.c b/keyboards/tada68/keymaps/ardakilic/keymap.c
index efd1b88b89..f8603f6ba3 100755
--- a/keyboards/tada68/keymaps/ardakilic/keymap.c
+++ b/keyboards/tada68/keymaps/ardakilic/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
 [_BL] = LAYOUT_ansi(
-  KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_POWER, \
+  KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_PWR, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_NUBS,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_GRV, \
diff --git a/keyboards/tada68/keymaps/ardakilic/readme.md b/keyboards/tada68/keymaps/ardakilic/readme.md
index 6f04c454f0..72654f55ed 100755
--- a/keyboards/tada68/keymaps/ardakilic/readme.md
+++ b/keyboards/tada68/keymaps/ardakilic/readme.md
@@ -7,7 +7,7 @@ This layout aims to have a similar layout to Apple keyboards while using ISO lay
 The changes that were applied over default layout:
 
 * Make Win/cmd keys right next to space bar just like Apple keyboards.
-* Adding a power (`KC_POWER`) key, so the lock screen shortcut works.
+* Adding a power (`KC_PWR`) key, so the lock screen shortcut works.
 * Re-use the page up and page down keys to make ["é] (`KC_NUBS`) and [<>|] (`KC_GRAVE`) keys more accessible.
 * Optimize the function layer, by removing the mouse movement combinations and adding additional media keys.
 * Swap the positions of volume up and volume down and mute buttons on function layer, so these keys are actually with the same order as Apple keyboard layout.
diff --git a/keyboards/tada68/keymaps/mekberg/keymap.c b/keyboards/tada68/keymaps/mekberg/keymap.c
index 1acbf2c48a..732e4f1bbd 100755
--- a/keyboards/tada68/keymaps/mekberg/keymap.c
+++ b/keyboards/tada68/keymaps/mekberg/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_DEL,      KC_INS,
 //  |----------------------------------------------------------------------------------------------------------------------------------------------|
 //  |            |        |   Up   |        |        |        |        |        |        |        |        |        |        |            |  Mute  |
-        ______,    ______,  KC_UP,   ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,              KC__MUTE,
+        ______,    ______,  KC_UP,   ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,              KC_MUTE,
 //  |--------------------------------------------------------------------------------------------------------------------------|   Lock   |--------|
 //  |  Caps Lock   |  Left  |  Down  | Right  | BLight |        |        |        |        |        |        |        |        |  Screen  | VolUp  |
         KC_CAPS,    KC_LEFT, KC_DOWN, KC_RGHT, BL_BRTG, ______,   ______,  ______,  ______,  ______,  ______,  ______,  ______,  MY_LOCK,  KC_VOLU,
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_DEL,     ______,
 //  |----------------------------------------------------------------------------------------------------------------------------------------------|
 //  |            |        |   Up   |        |        |        |        |        |        |        |        |        |        |            |  Mute  |
-        XXXXXX,      ______, KC_UP,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,              KC__MUTE,
+        XXXXXX,      ______, KC_UP,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,              KC_MUTE,
 //  |--------------------------------------------------------------------------------------------------------------------------|          |--------|
 //  |              |  Left  |  Down  | Right  |        |        |  Left  |  Down  |   Up   | Right  |        |        |        |          | VolUp  |
         ______,     KC_LEFT, KC_DOWN, KC_RGHT,  ______,  ______, KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT,  ______,  ______,  ______,   ______,  KC_VOLU,
diff --git a/keyboards/tada68/keymaps/peippo/keymap.c b/keyboards/tada68/keymaps/peippo/keymap.c
index 236d7cecca..c7ffd36fbe 100644
--- a/keyboards/tada68/keymaps/peippo/keymap.c
+++ b/keyboards/tada68/keymaps/peippo/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______,    _______, _______, _______, _______, KC_PGUP, KC_UP,      KC_PGDN,    _______, _______, _______,           _______,
 		_______, _______, SGUI(KC_5), KC_F11,  _______, _______, _______, KC_LEFT, KC_DOWN,    KC_RGHT,    _______, _______, _______, _______,  KC_VOLU,
 		KC_LSFT, _______, _______,    _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______,    _______,    _______, _______, KC_RSFT, KC_MPLY,  KC_VOLD,
-		_______, _______, _______,                      _______,                               _______,    _______, _______, KC_MRWD, KC__MUTE, KC_MFFD
+		_______, _______, _______,                      _______,                               _______,    _______, _______, KC_MRWD, KC_MUTE,  KC_MFFD
 	),
 
 };
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
index 2414faf62d..c484ee7308 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
@@ -89,8 +89,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->event.pressed) {
               register_code(KC_RSFT);
               register_code(KC_RCTL);
-              register_code(KC_POWER);
-              unregister_code(KC_POWER);
+              register_code(KC_PWR);
+              unregister_code(KC_PWR);
               unregister_code(KC_RCTL);
               unregister_code(KC_RSFT);
             }
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
index b652261fed..612ec7060a 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
@@ -199,8 +199,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
           register_code(KC_RSFT);
           register_code(KC_RCTL);
-          register_code(KC_POWER);
-          unregister_code(KC_POWER);
+          register_code(KC_PWR);
+          unregister_code(KC_PWR);
           unregister_code(KC_RCTL);
           unregister_code(KC_RSFT);
       }
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
index f958dcd912..57b4a1c4b8 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
@@ -218,8 +218,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
           register_code(KC_RSFT);
           register_code(KC_RCTL);
-          register_code(KC_POWER);
-          unregister_code(KC_POWER);
+          register_code(KC_PWR);
+          unregister_code(KC_PWR);
           unregister_code(KC_RCTL);
           unregister_code(KC_RSFT);
       }
diff --git a/keyboards/torn/keymaps/kinesish/keymap.c b/keyboards/torn/keymaps/kinesish/keymap.c
index fcac46989f..13f3304068 100644
--- a/keyboards/torn/keymaps/kinesish/keymap.c
+++ b/keyboards/torn/keymaps/kinesish/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 const uint16_t PROGMEM encoder_keymaps[][2][2] = {
     [_QWERTY] =  { { C(S(KC_TAB)), C(KC_TAB) },     { G(A(KC_LEFT)), G(A(KC_RIGHT)) } },
-    [_LOWER]  =  { { C(KC_LEFT),   C(KC_RGHT) },    { KC__VOLDOWN,   KC__VOLUP } },
+    [_LOWER]  =  { { C(KC_LEFT),   C(KC_RGHT) },    { KC_VOLD,       KC_VOLU } },
     [_RAISE]  =  { { G(KC_LEFT),   G(KC_RGHT) },    { G(KC_TAB),     G(S(KC_TAB)) } },
     [_ADJUST] =  { { KC_TRNS,      KC_TRNS },       { KC_TRNS,       KC_TRNS } },
 };
diff --git a/keyboards/torn/keymaps/via/keymap.c b/keyboards/torn/keymaps/via/keymap.c
index 376471ee95..61c59909a3 100644
--- a/keyboards/torn/keymaps/via/keymap.c
+++ b/keyboards/torn/keymaps/via/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 const uint16_t PROGMEM encoder_keymaps[][2][2] = {
     [_QWERTY] =  { { C(S(KC_TAB)), C(KC_TAB) },     { KC_PGDN,      KC_PGUP } },
-    [_LOWER]  =  { { C(KC_LEFT),   C(KC_RGHT) },    { KC__VOLDOWN,  KC__VOLUP } },
+    [_LOWER]  =  { { C(KC_LEFT),   C(KC_RGHT) },    { KC_VOLD,      KC_VOLU } },
     [_RAISE]  =  { { KC_TRNS,      KC_TRNS },       { G(KC_TAB),    G(S(KC_TAB)) } },
     [_ADJUST] =  { { KC_TRNS,      KC_TRNS },       { KC_TRNS,      KC_TRNS } },
 };
diff --git a/keyboards/torn/torn_encoder.c b/keyboards/torn/torn_encoder.c
index 64804ac3a9..29380fce28 100644
--- a/keyboards/torn/torn_encoder.c
+++ b/keyboards/torn/torn_encoder.c
@@ -33,7 +33,7 @@ static int8_t  encoder_pulses = 0;
 
 __attribute__((weak)) extern const uint16_t PROGMEM encoder_keymaps[][2][2];
 
-const uint16_t encoder_default[2][2] =  { { KC_PGDN, KC_PGUP }, { KC__VOLDOWN, KC__VOLUP } };
+const uint16_t encoder_default[2][2] =  { { KC_PGDN, KC_PGUP }, { KC_VOLD, KC_VOLU } };
 
 /**
  * Tap on encoder updates using the encoder keymap
diff --git a/keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c b/keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c
index 93aa46b7b0..7ead586ac3 100644
--- a/keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c
+++ b/keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c
@@ -43,10 +43,10 @@ void matrix_scan_user(void){
             // Reset moving to 0 so that we don't get multiple attempts to do this
             int num_ticks = ((float)pot_val/max_pot_val)*max_ticks;
             for (int i = 0; i<max_ticks;++i){
-                tap_code(KC__VOLDOWN);
+                tap_code(KC_VOLD);
             }
             for (int i = 0; i<num_ticks;++i){
-                tap_code(KC__VOLUP);
+                tap_code(KC_VOLU);
             }
             moving = false;
         }
diff --git a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
index e607f8ade1..08ceea33c7 100644
--- a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
+++ b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
@@ -55,11 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/
 
 	[1] = LAYOUT(
-		KC_ESC,  _______, _______,    _______, _______, _______, _______, _______, RALT(KC_8),  RALT(KC_9), _______, _______, _______, KC_DEL,  KC__VOLUP,
-		_______, _______, _______,    _______, _______, _______, _______, KC_PGUP, KC_UP,       KC_PGDN,    _______, _______, _______,          KC__VOLDOWN,
+		KC_ESC,  _______, _______,    _______, _______, _______, _______, _______, RALT(KC_8),  RALT(KC_9), _______, _______, _______, KC_DEL,  KC_VOLU,
+		_______, _______, _______,    _______, _______, _______, _______, KC_PGUP, KC_UP,       KC_PGDN,    _______, _______, _______,          KC_VOLD,
 		_______, _______, SGUI(KC_5), KC_F11,  _______, _______, _______, KC_LEFT, KC_DOWN,     KC_RGHT,    _______, _______, QK_BOOT, _______,
 		KC_LSFT, _______, _______,    _______, _______, _______, _______, _______, _______,     _______,    _______, _______, KC_RSFT, _______, KC_MPLY,
-		_______, _______, _______,                               _______,                                   _______, _______,          KC_MRWD, KC__MUTE, KC_MFFD),
+		_______, _______, _______,                               _______,                                   _______, _______,          KC_MRWD, KC_MUTE, KC_MFFD),
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/westm/westmergo/keymaps/default/keymap.c b/keyboards/westm/westmergo/keymaps/default/keymap.c
index 4302717ec4..5db323a98b 100755
--- a/keyboards/westm/westmergo/keymaps/default/keymap.c
+++ b/keyboards/westm/westmergo/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, KC_CAPS_LOCK, _______, KC_UP,   RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_MUTE, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______,
-                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC__VOLDOWN, KC__VOLUP, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
+                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
                  _______,          _______,          _______, _______,          _______, _______,                            _______
     )
 };
\ No newline at end of file
diff --git a/keyboards/westm/westmergo/keymaps/via/keymap.c b/keyboards/westm/westmergo/keymaps/via/keymap.c
index 962efbbffc..3242351eee 100644
--- a/keyboards/westm/westmergo/keymaps/via/keymap.c
+++ b/keyboards/westm/westmergo/keymaps/via/keymap.c
@@ -29,21 +29,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, KC_CAPS_LOCK, _______, KC_UP,   RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______,  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_MUTE, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______,
-                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC__VOLDOWN, KC__VOLUP, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
+                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
                  _______,          _______,          _______, _______,          _______, _______,                            _______
     ),
     [2] = LAYOUT_alice( /* 2 */
         _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, _______, KC_UP,   _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_MUTE, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______,
-                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC__VOLDOWN, KC__VOLUP, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
+                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
                  _______,          _______,          _______, _______,          _______, _______,                            _______
     ),
     [3] = LAYOUT_alice( /* 3 */
         _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, _______, KC_UP,   _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_MUTE, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______,
-                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC__VOLDOWN, KC__VOLUP, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
+                 _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______,
                  _______,          _______,          _______, _______,          _______, _______,                            _______
     )
 };
diff --git a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c b/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
index d4f7e3448a..0a3e7b936e 100644
--- a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
+++ b/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
@@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `---------------------------'
    */
    [_BL0] = LAYOUT(
-     STOKEN1, STOKEN2, STOKEN3,     STOKEN4,
-    MO(_FL1), MACOSLK, KC__VOLDOWN, KC__VOLUP),
+     STOKEN1, STOKEN2, STOKEN3, STOKEN4,
+    MO(_FL1), MACOSLK, KC_VOLD, KC_VOLU),
   /* Keymap base layer (_FL1) - function layer 1
    * ,---------------------------.
    * |      |      |      |      |
diff --git a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
index b48d997ecf..e658dbf5d3 100644
--- a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
@@ -18,11 +18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
   // 1: Function Layer
   [FN] = LAYOUT_all(
-      KC_GRV,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_DEL,    \
-      KC_TRNS,   RGB_MOD, RGB_VAI,  KC_TRNS,  KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPLY,  KC_MRWD,  KC_MFFD,            KC_MSTP, \
-      KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_NO,              KC_ENT,    \
-      KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS,KC__VOLDOWN,KC__VOLUP,KC_NO,   KC__MUTE,KC_PGUP,  QK_BOOT, \
-      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDOWN,KC_END
+      KC_GRV,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,   KC_F12,   KC_DEL,   KC_DEL,    \
+      KC_TRNS,   RGB_MOD, RGB_VAI,  KC_TRNS,  KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPLY, KC_MRWD,  KC_MFFD,            KC_MSTP, \
+      KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS, KC_TRNS,  KC_NO,              KC_ENT,    \
+      KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,  KC_VOLU, KC_NO,   KC_MUTE,KC_PGUP,  QK_BOOT, \
+      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS, KC_TRNS,  KC_HOME,  KC_PGDOWN,KC_END
       ),
 
 };
diff --git a/keyboards/xiudi/xd60/keymaps/styr/keymap.c b/keyboards/xiudi/xd60/keymaps/styr/keymap.c
index 2fbfe2563a..abdb724923 100644
--- a/keyboards/xiudi/xd60/keymaps/styr/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/styr/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LL] = LAYOUT_all(
       XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,    \
       XXXXXXX,   RGB_TOG, XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,   XXXXXXX,    XXXXXXX,   XXXXXXX,    \
-      XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,   XXXXXXX,    KC__MUTE,   \
+      XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,   XXXXXXX,    KC_MUTE,   \
       XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX,   XXXXXXX, KC_VOLU, KC_MPLY, \
       XXXXXXX,   XXXXXXX,   XXXXXXX,                    XXXXXXX,                                            XXXXXXX,    F(0),    KC_MRWD, KC_VOLD, KC_MFFD),
 
diff --git a/layouts/community/60_iso/bifbofii/keymap.c b/layouts/community/60_iso/bifbofii/keymap.c
index 9c95384360..84c7512e53 100755
--- a/layouts/community/60_iso/bifbofii/keymap.c
+++ b/layouts/community/60_iso/bifbofii/keymap.c
@@ -80,11 +80,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------------'
      */
     [FUNCTIONS_1] = LAYOUT_60_iso(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,       KC_F8,   KC_F9,   KC_F10,              KC_F11,  KC_F12,          KC_DEL,
-        _______, _______, _______, _______, _______, KC__MUTE, KC_MPRV, KC__VOLDOWN, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, _______, _______,
-        KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD,  KC_LEFT, KC_DOWN,     KC_UP,   KC_RGHT, _______,             _______, _______,         KC_ENT,
-        KC_LSFT, _______, _______, _______, _______, _______,  _______, KC_HOME,     KC_PGDN, KC_PGUP, KC_END,              _______, MO(FUNCTIONS_2),
-        KC_LCTL, KC_LGUI, KC_LALT,                             _______,                                KC_RALT,             KC_RGUI, KC_RCTL,         _______
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,              KC_F11,  KC_F12,          KC_DEL,
+        _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, _______, _______,
+        KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,             _______, _______,         KC_ENT,
+        KC_LSFT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,              _______, MO(FUNCTIONS_2),
+        KC_LCTL, KC_LGUI, KC_LALT,                            _______,                            KC_RALT,             KC_RGUI, KC_RCTL,         _______
     ),
 
     /* More Function keys
diff --git a/layouts/community/ergodox/ordinary/keymap.c b/layouts/community/ergodox/ordinary/keymap.c
index 8d0425e49b..61506abf75 100644
--- a/layouts/community/ergodox/ordinary/keymap.c
+++ b/layouts/community/ergodox/ordinary/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MDIA] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_F11   ,KC_F12  ,KC_F13   ,KC_F14  ,KC_F15  ,KC_ESC
-,KC_TRNS ,KC_POWER ,KC_NO   ,KC_MS_U  ,KC_NO   ,KC_VOLU ,KC_WH_U
+,KC_TRNS ,KC_PWR   ,KC_NO   ,KC_MS_U  ,KC_NO   ,KC_VOLU ,KC_WH_U
 ,KC_TRNS ,KC_SLEP  ,KC_MS_L ,KC_MS_D  ,KC_MS_R ,KC_VOLD
 ,KC_TRNS ,KC_NO    ,KC_NO   ,KC_MS_D  ,KC_NO   ,KC_MUTE ,KC_WH_D
 ,KC_NO ,KC_NO   ,KC_BTN3 ,KC_BTN1  ,KC_BTN2
diff --git a/layouts/community/ergodox/ordinary_osx/keymap.c b/layouts/community/ergodox/ordinary_osx/keymap.c
index 5f794cbba1..f7edbc4af0 100644
--- a/layouts/community/ergodox/ordinary_osx/keymap.c
+++ b/layouts/community/ergodox/ordinary_osx/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MDIA] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_F11   ,KC_F12  ,KC_F13   ,KC_F14  ,KC_F15  ,KC_ESC
-,KC_TRNS ,KC_POWER ,KC_NO   ,KC_MS_U  ,KC_NO   ,KC_VOLU ,KC_WH_U
+,KC_TRNS ,KC_PWR   ,KC_NO   ,KC_MS_U  ,KC_NO   ,KC_VOLU ,KC_WH_U
 ,KC_TRNS ,KC_SLEP  ,KC_MS_L ,KC_MS_D  ,KC_MS_R ,KC_VOLD
 ,KC_TRNS ,KC_NO    ,KC_NO   ,KC_MS_D  ,KC_NO   ,KC_MUTE ,KC_WH_D
 ,KC_NO ,KC_NO   ,KC_BTN3 ,KC_BTN1  ,KC_BTN2
diff --git a/layouts/community/ergodox/townk_osx/keymap.c b/layouts/community/ergodox/townk_osx/keymap.c
index c79d74d6eb..5c0c1c8ecd 100644
--- a/layouts/community/ergodox/townk_osx/keymap.c
+++ b/layouts/community/ergodox/townk_osx/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                           KC_HOME,
                                                                     KC_BSPC,    KC_DEL,   KC_END,
               //right half
-              KC_POWER,       KC_6,       KC_7,     KC_8,           KC_9,       KC_0,     KC_MINS,
+              KC_PWR,         KC_6,       KC_7,     KC_8,           KC_9,       KC_0,     KC_MINS,
               MEH_T(KC_F17),  KC_Y,       KC_U,     KC_I,           KC_O,       KC_P,     KC_EQL,
                               KC_H,       KC_J,     KC_K,           KC_L,       KC_SCLN,  CTL_T(KC_QUOT),
               ALL_T(KC_F19),  KC_N,       KC_M,     KC_COMM,        KC_DOT,     KC_SLSH,  OSM(MOD_LSFT),
diff --git a/layouts/community/ergodox/zweihander-macos/keymap.c b/layouts/community/ergodox/zweihander-macos/keymap.c
index 0aecc24e67..c8dc8e446a 100644
--- a/layouts/community/ergodox/zweihander-macos/keymap.c
+++ b/layouts/community/ergodox/zweihander-macos/keymap.c
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     KC_HOME,
                                   KC_TRNS, KC_TRNS, KC_TRNS,
     // right hand
-       KC_TRNS,     LGUI(KC_W),     LGUI(LSFT(KC_GRV)), LGUI(KC_GRV),   KC_TRNS,                KC_TRNS,        KC_POWER,
+       KC_TRNS,     LGUI(KC_W),     LGUI(LSFT(KC_GRV)), LGUI(KC_GRV),   KC_TRNS,                KC_TRNS,        KC_PWR,
        KC_TRNS,     LGUI(KC_RBRC),  LGUI(LALT(KC_UP)),  KC_UP  ,        LGUI(LALT(KC_DOWN)),    KC_TRNS,        KC_TRNS,
                     LGUI(KC_LBRC),  KC_LEFT,            KC_DOWN,        KC_RGHT,                KC_TRNS,        KC_F16 ,
        KC_TRNS,     KC_TRNS,        KC_MPLY,            KC_MPRV,        KC_MNXT,                KC_TRNS,        KC_TRNS,
diff --git a/layouts/community/ortho_4x12/bifbofii/keymap.c b/layouts/community/ortho_4x12/bifbofii/keymap.c
index 6d24fc14cf..2042fd0fac 100644
--- a/layouts/community/ortho_4x12/bifbofii/keymap.c
+++ b/layouts/community/ortho_4x12/bifbofii/keymap.c
@@ -128,10 +128,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
  */
 [FUNCTIONS] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, KC__MUTE, KC_MPRV, KC__VOLDOWN, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, KC_DEL,
-    KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD,  KC_LEFT, KC_DOWN,     KC_UP,   KC_RGHT, _______,             _______,
-    _______, _______, _______, _______, _______, _______,  KC_HOME, KC_PGDN,     KC_PGUP, KC_END,  _______,             _______,
-    _______, _______, _______, _______, _______, _______,  _______, _______,     _______, _______, _______,             _______
+    _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, KC_DEL,
+    KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,             _______,
+    _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,             _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______
 ),
 
 /* Unicode Layer
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index 15792c0d41..f07b8cd196 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -148,7 +148,7 @@
   "KC_UP": "↑",
   "KC_APPLICATION": "Application (Windows Menu Key)",
   "KC_APP": "Application (Windows Menu Key)",
-  "KC_POWER": "Deprecated by MS in favor of KC_SYSTEM_POWER.",
+  "KC_KB_POWER": "Deprecated by MS in favor of KC_SYSTEM_POWER.",
   "KC_EXECUTE": "Execute",
   "KC_HELP": "Help",
   "KC_MENU": "Menu",
@@ -178,9 +178,9 @@
   "KC_SYSTEM_WAKE": "System Wake",
   "KC_WAKE": "System Wake",
   "KC_STOP": "Stop",
-  "KC__MUTE": "Mute (macOS)",
-  "KC__VOLUP": "vol+",
-  "KC__VOLDOWN": "vol-",
+  "KC_KB_MUTE": "Mute (macOS)",
+  "KC_KB_VOLUME_UP": "vol+",
+  "KC_KB_VOLUME_DOWN": "vol-",
   "KC_AUDIO_MUTE": "Mute",
   "KC_MUTE": "Mute",
   "KC_AUDIO_VOL_UP": "vol+",
diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h
index 16318423a8..2147b9370e 100644
--- a/quantum/keycode_legacy.h
+++ b/quantum/keycode_legacy.h
@@ -9,10 +9,6 @@
 #define KC_SCOLON         KC_SEMICOLON
 #define KC_PSCREEN        KC_PRINT_SCREEN
 #define KC_PGDOWN         KC_PAGE_DOWN
-#define KC_POWER          KC_KB_POWER
-#define KC__MUTE          KC_KB_MUTE
-#define KC__VOLUP         KC_KB_VOLUME_UP
-#define KC__VOLDOWN       KC_KB_VOLUME_DOWN
 
 #define KC_LCTRL          KC_LEFT_CTRL
 #define KC_LSHIFT         KC_LEFT_SHIFT
diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h
index 057233fb0e..b377ffaed2 100644
--- a/users/brandonschlack/process_records.h
+++ b/users/brandonschlack/process_records.h
@@ -119,9 +119,9 @@ void matrix_scan_cmd_tab(void);
  * Common shortcuts used in macOS
  * Reference: https://support.apple.com/en-us/HT201236
  */
-#define MC_POWR   KC_POWER             // Power (KC_POWER)
-#define MC_SLEP   LOPT(LCMD(KC_POWER)) // Sleep (Option-Command-Power)
-#define MC_SLPD   LCTL(LSFT(KC_POWER)) // Sleep Display (Control-Shift-Power)
+#define MC_POWR   KC_PWR               // Power (KC_PWR)
+#define MC_SLEP   LOPT(LCMD(KC_PWR))   // Sleep (Option-Command-Power)
+#define MC_SLPD   LCTL(LSFT(KC_PWR))   // Sleep Display (Control-Shift-Power)
 #define MC_LOCK   LCTL(LCMD(KC_Q))     // Lock Screen (Control-Command-Q)
 #define MC_MSSN   KC_FIND              // Mission Control: Configure karabiner for find -> mission_control
 #define MC_LHPD   KC_MENU              // Launchpad: Configure karabiner for menu -> launchpad
diff --git a/users/jjerrell/wrappers.h b/users/jjerrell/wrappers.h
index 322dbd12f6..ac150a794f 100644
--- a/users/jjerrell/wrappers.h
+++ b/users/jjerrell/wrappers.h
@@ -319,9 +319,9 @@
 #define __________________RAISE_R3___________________   KC_AT,   KC_QUOT, KC_DQUO, KC_PLUS, KC_CIRC
 
 // Adjust
-#define __________________ADJUST_L1__________________   KC_MAKE,        DEBUG,     RESET, XXXXXXX, XXXXXXX
-#define __________________ADJUST_L2__________________   KC__MUTE, KC__VOLDOWN, KC__VOLUP, KC_MPLY, KC_MNXT
-#define __________________ADJUST_L3__________________   KC_VRSN,        AU_ON,    AU_OFF, CG_SWAP, CG_NORM
+#define __________________ADJUST_L1__________________   KC_MAKE, DEBUG,   RESET,   XXXXXXX, XXXXXXX
+#define __________________ADJUST_L2__________________   KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT
+#define __________________ADJUST_L3__________________   KC_VRSN, AU_ON,   AU_OFF,  CG_SWAP, CG_NORM
 
 #define __________________ADJUST_R1__________________   MU_MOD, MU_ON,   MU_OFF,  MI_ON,   MI_OFF
 #define __________________ADJUST_R2__________________   MUV_IN, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h
index 94b4712a63..99a31db056 100644
--- a/users/ninjonas/ninjonas.h
+++ b/users/ninjonas/ninjonas.h
@@ -132,8 +132,8 @@ uint16_t encoder_rotated_timer;
 #define _____________MOD_RIGHT____________ LT_LOW, KC_BSPC, MT_DEL, T_CPAP
 
 #define _________MEDIA_1_________ KC_BRIU, KC_MPLY, KC_MUTE
-#define _________MEDIA_2_________ KC_BRID, KC_MFFD, KC__VOLUP
-#define _________MEDIA_3_________ XXXXXXX, KC_MRWD, KC__VOLDOWN
+#define _________MEDIA_2_________ KC_BRID, KC_MFFD, KC_VOLU
+#define _________MEDIA_3_________ XXXXXXX, KC_MRWD, KC_VOLD
 
 #if defined(KEYBOARD_crkbd_rev1) || defined(KEYBOARD_kyria_rev1)
   #define ________MOD_LEFT_________ T_GUI, KC_LCTL, LT_RAI

From 868c7b52930fc6d3f44a57cb257fcc39e60ac3d0 Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Tue, 11 Oct 2022 15:22:43 +0200
Subject: [PATCH 610/959] Bugfix waffling60 rev d solder (#18673)

---
 keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c | 2 +-
 keyboards/4pplet/waffling60/rev_d/rev_d.h                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c
index 9c567a0e3e..7327ba11e3 100644
--- a/keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_d/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // main layer
 [0] = LAYOUT(
-  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
   KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/4pplet/waffling60/rev_d/rev_d.h b/keyboards/4pplet/waffling60/rev_d/rev_d.h
index 88b7fab4ab..a3b75c63b6 100644
--- a/keyboards/4pplet/waffling60/rev_d/rev_d.h
+++ b/keyboards/4pplet/waffling60/rev_d/rev_d.h
@@ -22,9 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k3d, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k3d, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4d, \
     k40, k41, k42, k44, k46, k48, k49, k4a, k4b, k4c  \
 ) \

From 41159326ca7c366b50edad1392369131c4ce4008 Mon Sep 17 00:00:00 2001
From: James Thomson <thomsj@users.noreply.github.com>
Date: Tue, 11 Oct 2022 19:33:02 +0100
Subject: [PATCH 611/959] Fix boundary in `RGB_MATRIX_INDICATOR_SET_COLOR`
 (#18650)

---
 docs/feature_rgb_matrix.md      | 8 ++++----
 quantum/rgb_matrix/rgb_matrix.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 669f88e0a9..e0c46f60e2 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -912,7 +912,7 @@ Caps Lock indicator on alphanumeric flagged keys:
 ```c
 bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     if (host_keyboard_led_state().caps_lock) {
-        for (uint8_t i = led_min; i <= led_max; i++) {
+        for (uint8_t i = led_min; i < led_max; i++) {
             if (g_led_config.flags[i] & LED_FLAG_KEYLIGHT) {
                 rgb_matrix_set_color(i, RGB_RED);
             }
@@ -925,7 +925,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 Layer indicator on all keys:
 ```c
 bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    for (uint8_t i = led_min; i <= led_max; i++) {
+    for (uint8_t i = led_min; i < led_max; i++) {
         switch(get_highest_layer(layer_state|default_layer_state)) {
             case 2:
                 rgb_matrix_set_color(i, RGB_BLUE);
@@ -951,7 +951,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
                 uint8_t index = g_led_config.matrix_co[row][col];
 
-                if (index >= led_min && index <= led_max && index != NO_LED &&
+                if (index >= led_min && index < led_max && index != NO_LED &&
                 keymap_key_to_keycode(layer, (keypos_t){col,row}) > KC_TRNS) {
                     rgb_matrix_set_color(index, RGB_GREEN);
                 }
@@ -983,7 +983,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     }
     RGB rgb = hsv_to_rgb(hsv);
 
-    for (uint8_t i = led_min; i <= led_max; i++) {
+    for (uint8_t i = led_min; i < led_max; i++) {
         if (HAS_FLAGS(g_led_config.flags[i], 0x01)) { // 0x01 == LED_FLAG_MODIFIER
             rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
         }
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index 1cd054abc4..e1bdad42e0 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -81,7 +81,7 @@
 #endif
 
 #define RGB_MATRIX_INDICATOR_SET_COLOR(i, r, g, b) \
-    if (i >= led_min && i <= led_max) {            \
+    if (i >= led_min && i < led_max) {             \
         rgb_matrix_set_color(i, r, g, b);          \
     }
 

From edef8d2a84002059fb32c299499a99e4b9bcf62c Mon Sep 17 00:00:00 2001
From: Alex Ong <alex.ong@unsw.edu.au>
Date: Wed, 12 Oct 2022 23:20:16 +1100
Subject: [PATCH 612/959] Remove xealousbrown keyboard (#18658)

Co-authored-by: alexo <alex-ong>
---
 keyboards/handwired/xealousbrown/config.h     |  48 --------
 keyboards/handwired/xealousbrown/info.json    |  78 ------------
 .../xealousbrown/keymaps/default/keymap.c     |  33 -----
 keyboards/handwired/xealousbrown/matrix.c     | 115 ------------------
 keyboards/handwired/xealousbrown/readme.md    |  25 ----
 keyboards/handwired/xealousbrown/rules.mk     |  29 -----
 .../handwired/xealousbrown/xealousbrown.c     |  51 --------
 .../handwired/xealousbrown/xealousbrown.h     |  32 -----
 8 files changed, 411 deletions(-)
 delete mode 100644 keyboards/handwired/xealousbrown/config.h
 delete mode 100644 keyboards/handwired/xealousbrown/info.json
 delete mode 100644 keyboards/handwired/xealousbrown/keymaps/default/keymap.c
 delete mode 100644 keyboards/handwired/xealousbrown/matrix.c
 delete mode 100644 keyboards/handwired/xealousbrown/readme.md
 delete mode 100644 keyboards/handwired/xealousbrown/rules.mk
 delete mode 100644 keyboards/handwired/xealousbrown/xealousbrown.c
 delete mode 100644 keyboards/handwired/xealousbrown/xealousbrown.h

diff --git a/keyboards/handwired/xealousbrown/config.h b/keyboards/handwired/xealousbrown/config.h
deleted file mode 100644
index 37d424b01e..0000000000
--- a/keyboards/handwired/xealousbrown/config.h
+++ /dev/null
@@ -1,48 +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
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-#define DEBOUNCE 10
-/* layer optimization */
-#define LAYER_STATE_8BIT
-#define MAX_LAYER 2
-
-//debug scanrate
-//#define DEBUG_MATRIX_SCAN_RATE
-//debug scans taking longer than one ms
-//#define BENCHMARK_MATRIX
-#define MATRIX_IO_DELAY 15
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/xealousbrown/info.json b/keyboards/handwired/xealousbrown/info.json
deleted file mode 100644
index 372158baad..0000000000
--- a/keyboards/handwired/xealousbrown/info.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "keyboard_name": "XeaLous Brown Keyboard",
-  "manufacturer": "XeaL",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x606A",
-    "device_version": "0.0.2"
-  },
-  "layouts": {
-    "LAYOUT_60_ansi": {
-      "layout": [
-        {"label":"`", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"-", "x":11, "y":0},
-        {"label":"=", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":"[", "x":11.5, "y":1},
-        {"label":"]", "x":12.5, "y":1},
-        {"label":"\\", "x":13.5, "y":1, "w":1.5},
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":";", "x":10.75, "y":2},
-        {"label":"'", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":",", "x":9.25, "y":3},
-        {"label":".", "x":10.25, "y":3},
-        {"label":"/", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"label":"Space", "x":3.75, "y":4, "w":6.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/xealousbrown/keymaps/default/keymap.c b/keyboards/handwired/xealousbrown/keymaps/default/keymap.c
deleted file mode 100644
index c6b189e816..0000000000
--- a/keyboards/handwired/xealousbrown/keymaps/default/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Alex Ong
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_60_ansi( /* Main 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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL
-    ),
-    [1] = LAYOUT_60_ansi( /* FN_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_CAPS, KC_PGUP, KC_UP,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, 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_TRNS, 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
-    )
-};
diff --git a/keyboards/handwired/xealousbrown/matrix.c b/keyboards/handwired/xealousbrown/matrix.c
deleted file mode 100644
index f27a13df7b..0000000000
--- a/keyboards/handwired/xealousbrown/matrix.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-Copyright 2019 Alex Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <stdint.h>
-#include <stdbool.h>
-#include "wait.h"
-#include "util.h"
-#include "matrix.h"
-#include "debounce.h"
-#include "quantum.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
-
-// matrix code
-// super fast read_cols code.
-static inline matrix_row_t read_cols(void) {
-    return (PINC & (1 << 6) ? 0 : (1UL << 0)) |
-           (PIND & (1 << 7) ? 0 : (1UL << 1)) |
-           (PINE & (1 << 6) ? 0 : (1UL << 2)) |
-           (PINB & (1 << 4) ? 0 : (1UL << 3)) |
-           (PINB & (1 << 5) ? 0 : (1UL << 4)) |
-           (PINB & (1 << 6) ? 0 : (1UL << 5)) |
-           (PINB & (1 << 2) ? 0 : (1UL << 6)) |
-           (PINB & (1 << 3) ? 0 : (1UL << 7)) |
-           (PINB & (1 << 1) ? 0 : (1UL << 8)) |
-           (PINF & (1 << 7) ? 0 : (1UL << 9)) |
-           (PINF & (1 << 6) ? 0 : (1UL << 10)) |
-           (PINF & (1 << 5) ? 0 : (1UL << 11)) |
-           (PINF & (1 << 4) ? 0 : (1UL << 12));
-}
-
-static void unselect_rows(void) {
-    DDRD &= ~0b00011111;
-    PORTD &= ~0b00011111;
-}
-
-static void select_row(uint8_t row) {
-    switch (row) {
-        case 0:
-            DDRD |= (1 << 3);
-            PORTD &= ~(1 << 3);
-            break;
-        case 1:
-            DDRD |= (1 << 2);
-            PORTD &= ~(1 << 2);
-            break;
-        case 2:
-            DDRD |= (1 << 1);
-            PORTD &= ~(1 << 1);
-            break;
-        case 3:
-            DDRD |= (1 << 0);
-            PORTD &= ~(1 << 0);
-            break;
-        case 4:
-            DDRD |= (1 << 4);
-            PORTD &= ~(1 << 4);
-            break;
-    }
-}
-
-static void init_pins(void) {
-    DDRC &= ~(1 << 6);
-    PORTC |= (1 << 6);
-    DDRD &= ~(1 << 7);
-    PORTD |= (1 << 7);
-    DDRE &= ~(1 << 6);
-    PORTE |= (1 << 6);
-    DDRB &= ~(1 << 4 | 1 << 5 | 1 << 6 | 1 << 2 | 1 << 3 | 1 << 1);
-    PORTB |= (1 << 4 | 1 << 5 | 1 << 6 | 1 << 2 | 1 << 3 | 1 << 1);
-    DDRF &= ~(1 << 7 | 1 << 6 | 1 << 5 | 1 << 4);
-    PORTF |= (1 << 7 | 1 << 6 | 1 << 5 | 1 << 4);
-}
-
-// Only need to init the pins. Debounce / raw matrix are initialized already for us.
-void matrix_init_custom(void) {
-    // initialize key pins
-    init_pins();
-}
-
-// Only need to scan the result into current_matrix, and return changed.
-uint8_t matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool changed = false;
-
-    // Set row, read cols
-    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
-        select_row(current_row);
-        matrix_output_unselect_delay(current_row, changed);
-
-        matrix_row_t cols = read_cols();
-        changed |= (current_matrix[current_row] != cols);
-        current_matrix[current_row] = cols;
-
-        unselect_rows();
-        //this internally calls matrix_io_delay()
-        matrix_output_unselect_delay(current_row, changed);
-    }
-
-    return changed;
-}
diff --git a/keyboards/handwired/xealousbrown/readme.md b/keyboards/handwired/xealousbrown/readme.md
deleted file mode 100644
index fa5537e471..0000000000
--- a/keyboards/handwired/xealousbrown/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# XealouS Brown
-
-My first handwired keyboard. Originally used TMK, now ported in full glory to QMK.
-
-Build log at:
-https://sites.google.com/site/xaelous/keyboards/handwired-keyboard
-
-* Keyboard Maintainer: [alex-ong](https://github.com/alex-ong)
-* Hardware Supported: Arduino Pro Micro or clone
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/xealousbrown:default
-
-
-The brief list of speedhacks to make this keyboard blazing fast:
-1) bit-bash implementation of scanning rows, columns. Very short delay between pin waiting.
-2) Compiling with a few extra flags
-3) Eager-per-key Debouncing algorithm (no 5ms delay before message is sent)
-4) 1000hz polling
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the 
-[make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 
-
-Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/xealousbrown/rules.mk b/keyboards/handwired/xealousbrown/rules.mk
deleted file mode 100644
index 795bd74cbe..0000000000
--- a/keyboards/handwired/xealousbrown/rules.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# 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 = 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
-SPACE_CADET_ENABLE = no     # Unneeded feature.
-
-LAYOUTS = 60_ansi
-
-# special sauce for this keyboard
-DEBOUNCE_TYPE = sym_eager_pk    # Debounce using eager_pk.
-CUSTOM_MATRIX = lite        # Custom matrix that polls at 7000hz instead of a measly 2000hz.
-LTO_ENABLE = yes            # smaller binary
-SRC += matrix.c
-
-# Also remember to open tmk's rules.mk and set compilation optimization to 3
diff --git a/keyboards/handwired/xealousbrown/xealousbrown.c b/keyboards/handwired/xealousbrown/xealousbrown.c
deleted file mode 100644
index dbfa853422..0000000000
--- a/keyboards/handwired/xealousbrown/xealousbrown.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 Alex Ong
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "xealousbrown.h"
-
-#ifdef BENCHMARK_MATRIX
-#    include "timer.h"
-#    include <stdint.h>
-#    include <stdbool.h>
-#    include "wait.h"
-#    include "util.h"
-#    include "matrix.h"
-#    include "quantum.h"
-
-static int      scans          = 0;
-static uint16_t last_print_out = 0;
-static int      last_timer     = 0;
-void            matrix_scan_user(void) {
-    scans++;
-    uint16_t timer = timer_read();
-    
-    if (timer != last_timer && timer != last_timer + 1) {
-        print("MS:\n");
-        print_dec(timer);
-        print("->");
-        print_dec(last_timer);
-        print("\n");
-    }
-    
-    last_timer = timer;
-    if ((timer % 1000 == 0) && (timer != last_print_out)) {
-        print("Scans: ");
-        print_dec(scans);
-        print("\n");
-        scans          = 0;
-        last_print_out = timer;
-    }
-}
-#endif
diff --git a/keyboards/handwired/xealousbrown/xealousbrown.h b/keyboards/handwired/xealousbrown/xealousbrown.h
deleted file mode 100644
index 9624a04a76..0000000000
--- a/keyboards/handwired/xealousbrown/xealousbrown.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Alex Ong
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3C, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3B, \
-    K40, K41, K42,                K45,                K46, K47, K48, K49  \
-    ) { \
-  {  K00,  K01,  K02,  K03,    K04,    K05,  K06,    K07,    K08,    K09,    K0A,    K0B,    K0C }, \
-  {  K10,  K11,  K12,  K13,    K14,    K15,  K16,    K17,    K18,    K19,    K1A,    K1B,    K1C }, \
-  {  K20,  K21,  K22,  K23,    K24,    K25,  K26,    K27,    K28,    K29,    K2A,    K2B,    K2C }, \
-  {  K30,  K31,  K32,  K33,    K34,    K35,  K36,    K37,    K38,    K39,    K3A,    K3B,    K3C }, \
-  {  K40,  K41,  K42,  KC_NO,  KC_NO,  K45,  K46,    K47,    K48,    K49,    KC_NO,  KC_NO,  K4C }  \
-}

From cf749f2dd03a7e04395d9b6862cc11a22c76fb9d Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Thu, 13 Oct 2022 02:33:44 +0800
Subject: [PATCH 613/959] Keychron q3 (#16912)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
Co-authored-by: bootstrapper <ido.samuelson@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 keyboards/keychron/common/keychron_common.c   |  97 +++++++++
 keyboards/keychron/common/keychron_common.h   |  47 +++++
 keyboards/keychron/q3/ansi/ansi.c             | 154 ++++++++++++++
 keyboards/keychron/q3/ansi/ansi.h             |  19 ++
 keyboards/keychron/q3/ansi/config.h           |  36 ++++
 keyboards/keychron/q3/ansi/info.json          | 109 ++++++++++
 .../keychron/q3/ansi/keymaps/default/keymap.c |  58 ++++++
 .../q3/ansi/keymaps/keychron/keymap.c         |  71 +++++++
 .../q3/ansi/keymaps/keychron/rules.mk         |   4 +
 .../keychron/q3/ansi/keymaps/via/keymap.c     |  58 ++++++
 .../keychron/q3/ansi/keymaps/via/rules.mk     |   1 +
 keyboards/keychron/q3/ansi/readme.md          |   1 +
 keyboards/keychron/q3/ansi/rules.mk           |  27 +++
 .../keychron/q3/ansi_encoder/ansi_encoder.c   | 154 ++++++++++++++
 .../keychron/q3/ansi_encoder/ansi_encoder.h   |  19 ++
 keyboards/keychron/q3/ansi_encoder/config.h   |  38 ++++
 keyboards/keychron/q3/ansi_encoder/info.json  | 110 ++++++++++
 .../q3/ansi_encoder/keymaps/default/keymap.c  |  67 ++++++
 .../q3/ansi_encoder/keymaps/default/rules.mk  |   1 +
 .../q3/ansi_encoder/keymaps/keychron/keymap.c |  80 +++++++
 .../q3/ansi_encoder/keymaps/keychron/rules.mk |   5 +
 .../q3/ansi_encoder/keymaps/via/keymap.c      |  67 ++++++
 .../q3/ansi_encoder/keymaps/via/rules.mk      |   2 +
 keyboards/keychron/q3/ansi_encoder/readme.md  |   5 +
 keyboards/keychron/q3/ansi_encoder/rules.mk   |  33 +++
 keyboards/keychron/q3/config.h                | 100 +++++++++
 keyboards/keychron/q3/halconf.h               |  21 ++
 keyboards/keychron/q3/iso/config.h            |  35 ++++
 keyboards/keychron/q3/iso/info.json           | 110 ++++++++++
 keyboards/keychron/q3/iso/iso.c               | 155 ++++++++++++++
 keyboards/keychron/q3/iso/iso.h               |  19 ++
 .../keychron/q3/iso/keymaps/default/keymap.c  |  58 ++++++
 .../keychron/q3/iso/keymaps/keychron/keymap.c |  71 +++++++
 .../keychron/q3/iso/keymaps/keychron/rules.mk |   4 +
 .../keychron/q3/iso/keymaps/via/keymap.c      |  58 ++++++
 .../keychron/q3/iso/keymaps/via/rules.mk      |   1 +
 keyboards/keychron/q3/iso/readme.md           |   1 +
 keyboards/keychron/q3/iso/rules.mk            |  27 +++
 keyboards/keychron/q3/iso_encoder/config.h    |  38 ++++
 keyboards/keychron/q3/iso_encoder/info.json   | 111 ++++++++++
 .../keychron/q3/iso_encoder/iso_encoder.c     | 155 ++++++++++++++
 .../keychron/q3/iso_encoder/iso_encoder.h     |  19 ++
 .../q3/iso_encoder/keymaps/default/keymap.c   |  67 ++++++
 .../q3/iso_encoder/keymaps/default/rules.mk   |   1 +
 .../q3/iso_encoder/keymaps/keychron/keymap.c  |  80 +++++++
 .../q3/iso_encoder/keymaps/keychron/rules.mk  |   5 +
 .../q3/iso_encoder/keymaps/via/keymap.c       |  67 ++++++
 .../q3/iso_encoder/keymaps/via/rules.mk       |   2 +
 keyboards/keychron/q3/iso_encoder/readme.md   |   5 +
 keyboards/keychron/q3/iso_encoder/rules.mk    |  33 +++
 keyboards/keychron/q3/jis/config.h            |  38 ++++
 keyboards/keychron/q3/jis/info.json           | 113 ++++++++++
 keyboards/keychron/q3/jis/jis.c               | 158 ++++++++++++++
 keyboards/keychron/q3/jis/jis.h               |  19 ++
 .../keychron/q3/jis/keymaps/default/keymap.c  |  58 ++++++
 .../keychron/q3/jis/keymaps/keychron/keymap.c |  71 +++++++
 .../keychron/q3/jis/keymaps/keychron/rules.mk |   4 +
 .../keychron/q3/jis/keymaps/via/keymap.c      |  58 ++++++
 .../keychron/q3/jis/keymaps/via/rules.mk      |   1 +
 keyboards/keychron/q3/jis/readme.md           |   1 +
 keyboards/keychron/q3/jis/rules.mk            |  27 +++
 keyboards/keychron/q3/jis_encoder/config.h    |  40 ++++
 keyboards/keychron/q3/jis_encoder/info.json   | 114 ++++++++++
 .../keychron/q3/jis_encoder/jis_encoder.c     | 159 ++++++++++++++
 .../keychron/q3/jis_encoder/jis_encoder.h     |  19 ++
 .../q3/jis_encoder/keymaps/default/keymap.c   |  69 ++++++
 .../q3/jis_encoder/keymaps/default/rules.mk   |   1 +
 .../q3/jis_encoder/keymaps/keychron/keymap.c  |  82 ++++++++
 .../q3/jis_encoder/keymaps/keychron/rules.mk  |   5 +
 .../q3/jis_encoder/keymaps/via/keymap.c       |  69 ++++++
 .../q3/jis_encoder/keymaps/via/rules.mk       |   2 +
 keyboards/keychron/q3/jis_encoder/readme.md   |   5 +
 keyboards/keychron/q3/jis_encoder/rules.mk    |  33 +++
 keyboards/keychron/q3/matrix.c                | 197 ++++++++++++++++++
 keyboards/keychron/q3/mcuconf.h               |  22 ++
 keyboards/keychron/q3/q3.c                    |  87 ++++++++
 keyboards/keychron/q3/q3.h                    |  33 +++
 keyboards/keychron/q3/readme.md               |  23 ++
 78 files changed, 4014 insertions(+)
 create mode 100644 keyboards/keychron/common/keychron_common.c
 create mode 100644 keyboards/keychron/common/keychron_common.h
 create mode 100644 keyboards/keychron/q3/ansi/ansi.c
 create mode 100644 keyboards/keychron/q3/ansi/ansi.h
 create mode 100644 keyboards/keychron/q3/ansi/config.h
 create mode 100644 keyboards/keychron/q3/ansi/info.json
 create mode 100644 keyboards/keychron/q3/ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q3/ansi/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q3/ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q3/ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q3/ansi/readme.md
 create mode 100644 keyboards/keychron/q3/ansi/rules.mk
 create mode 100644 keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
 create mode 100644 keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
 create mode 100644 keyboards/keychron/q3/ansi_encoder/config.h
 create mode 100644 keyboards/keychron/q3/ansi_encoder/info.json
 create mode 100644 keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q3/ansi_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q3/ansi_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q3/ansi_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q3/ansi_encoder/readme.md
 create mode 100644 keyboards/keychron/q3/ansi_encoder/rules.mk
 create mode 100644 keyboards/keychron/q3/config.h
 create mode 100644 keyboards/keychron/q3/halconf.h
 create mode 100644 keyboards/keychron/q3/iso/config.h
 create mode 100644 keyboards/keychron/q3/iso/info.json
 create mode 100644 keyboards/keychron/q3/iso/iso.c
 create mode 100644 keyboards/keychron/q3/iso/iso.h
 create mode 100644 keyboards/keychron/q3/iso/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q3/iso/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q3/iso/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q3/iso/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q3/iso/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q3/iso/readme.md
 create mode 100644 keyboards/keychron/q3/iso/rules.mk
 create mode 100644 keyboards/keychron/q3/iso_encoder/config.h
 create mode 100644 keyboards/keychron/q3/iso_encoder/info.json
 create mode 100644 keyboards/keychron/q3/iso_encoder/iso_encoder.c
 create mode 100644 keyboards/keychron/q3/iso_encoder/iso_encoder.h
 create mode 100644 keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q3/iso_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q3/iso_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q3/iso_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q3/iso_encoder/readme.md
 create mode 100644 keyboards/keychron/q3/iso_encoder/rules.mk
 create mode 100644 keyboards/keychron/q3/jis/config.h
 create mode 100644 keyboards/keychron/q3/jis/info.json
 create mode 100644 keyboards/keychron/q3/jis/jis.c
 create mode 100644 keyboards/keychron/q3/jis/jis.h
 create mode 100644 keyboards/keychron/q3/jis/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q3/jis/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q3/jis/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q3/jis/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q3/jis/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q3/jis/readme.md
 create mode 100644 keyboards/keychron/q3/jis/rules.mk
 create mode 100644 keyboards/keychron/q3/jis_encoder/config.h
 create mode 100644 keyboards/keychron/q3/jis_encoder/info.json
 create mode 100644 keyboards/keychron/q3/jis_encoder/jis_encoder.c
 create mode 100644 keyboards/keychron/q3/jis_encoder/jis_encoder.h
 create mode 100644 keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q3/jis_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q3/jis_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q3/jis_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q3/jis_encoder/readme.md
 create mode 100644 keyboards/keychron/q3/jis_encoder/rules.mk
 create mode 100644 keyboards/keychron/q3/matrix.c
 create mode 100644 keyboards/keychron/q3/mcuconf.h
 create mode 100644 keyboards/keychron/q3/q3.c
 create mode 100644 keyboards/keychron/q3/q3.h
 create mode 100644 keyboards/keychron/q3/readme.md

diff --git a/keyboards/keychron/common/keychron_common.c b/keyboards/keychron/common/keychron_common.c
new file mode 100644
index 0000000000..d3c1294fe9
--- /dev/null
+++ b/keyboards/keychron/common/keychron_common.c
@@ -0,0 +1,97 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+bool is_siri_active = false;
+uint32_t siri_timer = 0;
+
+key_combination_t key_comb_list[4] = {
+    {2, {KC_LWIN, KC_TAB}},
+    {2, {KC_LWIN, KC_E}},
+    {3, {KC_LSFT, KC_LCMD, KC_4}},
+    {2, {KC_LWIN, KC_C}}
+};
+
+static uint8_t mac_keycode[4] = { KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD };
+
+void housekeeping_task_keychron(void) {
+    if (is_siri_active) {
+        if (sync_timer_elapsed32(siri_timer) >= 500) {
+            unregister_code(KC_LCMD);
+            unregister_code(KC_SPACE);
+            is_siri_active = false;
+        }
+    }
+}
+
+bool process_record_keychron(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LOPTN:
+        case KC_ROPTN:
+        case KC_LCMMD:
+        case KC_RCMMD:
+            if (record->event.pressed) {
+                register_code(mac_keycode[keycode - KC_LOPTN]);
+            } else {
+                unregister_code(mac_keycode[keycode - KC_LOPTN]);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_SIRI:
+            if (record->event.pressed) {
+                if (!is_siri_active) {
+                    is_siri_active = true;
+                    register_code(KC_LCMD);
+                    register_code(KC_SPACE);
+                }
+                siri_timer = sync_timer_read32();
+            } else {
+                // Do something else when release
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+        case KC_FLXP:
+        case KC_SNAP:
+        case KC_CRTA:
+            if (record->event.pressed) {
+                for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++) {
+                    register_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+                }
+            } else {
+                for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++) {
+                    unregister_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+                }
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h
new file mode 100644
index 0000000000..0bcbf951db
--- /dev/null
+++ b/keyboards/keychron/common/keychron_common.h
@@ -0,0 +1,47 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdint.h"
+#include "quantum_keycodes.h"
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD,
+    KC_LOPTN,
+    KC_ROPTN,
+    KC_LCMMD,
+    KC_RCMMD,
+    KC_SIRI,
+    KC_TASK_VIEW,
+    KC_FILE_EXPLORER,
+    KC_SCREEN_SHOT,
+    KC_CORTANA
+};
+
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+#define KC_TASK KC_TASK_VIEW
+#define KC_FLXP KC_FILE_EXPLORER
+#define KC_SNAP KC_SCREEN_SHOT
+#define KC_CRTA KC_CORTANA
+
+typedef struct PACKED {
+    uint8_t len;
+    uint8_t keycode[3];
+} key_combination_t;
+
+void housekeeping_task_keychron(void);
+bool process_record_keychron(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
new file mode 100644
index 0000000000..46ebe44144
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -0,0 +1,154 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {1, I_15,   G_15,   H_15},
+
+    {0, 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, 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},
+
+    {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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, __, 13, 14 },
+        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 },
+        { 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48 },
+        { 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 49, 62, 15, 32 },
+        { 63, __, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, __, 74, 86, 75 },
+        { 76, 77, 78, __, __, __, 79, __, __, __, 80, 81, 82, 83, 84, 85 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {26,0},  {39,0},  {52,0},  {65,0},  {85,0},  {98,0},   {111,0},  {124,0},  {143,0},  {156,0},  {169,0},  {182,0},  {198,0},  {211,0},  {224,0},
+        {0,15}, {13,15}, {26,15}, {39,15}, {52,15}, {65,15}, {78,15}, {91,15},  {104,15}, {117,15}, {130,15}, {143,15}, {156,15}, {176,15}, {198,15}, {211,15}, {224,15},
+        {3,28}, {20,28}, {33,28}, {46,28}, {59,28}, {72,28}, {85,28}, {98,28},  {111,28}, {124,28}, {137,28}, {150,28}, {163,28}, {179,28}, {198,28}, {211,28}, {224,28},
+        {5,40}, {23,40}, {36,40}, {49,40}, {62,40}, {75,40}, {88,40}, {101,40}, {114,40}, {127,40}, {140,40}, {153,40},           {174,40},
+        {8,52},          {29,52}, {42,52}, {55,52}, {68,52}, {81,52}, {94,52},  {107,52}, {120,52}, {133,52}, {146,52},           {171,52},           {211,52},
+        {2,64}, {18,64}, {34,64},                            {83,64},                               {131,64}, {148,64}, {164,64}, {180,64}, {198,64}, {211,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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    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,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi/ansi.h b/keyboards/keychron/q3/ansi/ansi.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/ansi.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q3/ansi/config.h b/keyboards/keychron/q3/ansi/config.h
new file mode 100644
index 0000000000..8535f02cc2
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/config.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, A10, H3 }
+
+/* We uses a pin with a stronger pull resistor than the internal MCU pins */
+// #define MATRIX_UNSELECT_DRIVE_HIGH
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 48
+#define DRIVER_2_LED_TOTAL 39
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
+
+/* Enable CapsLcok LED */
+#define CAPS_LOCK_LED_INDEX 50
+
diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json
new file mode 100644
index 0000000000..83be45fc23
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/info.json
@@ -0,0 +1,109 @@
+{
+    "keyboard_name": "Keychron Q3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0120",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_87": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[3,14], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[3,15], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[3,12], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[4,14], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q3/ansi/keymaps/default/keymap.c b/keyboards/keychron/q3/ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a2cad2d8c9
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/keymaps/default/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_87(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_87(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_87(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  _______,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_87(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..ee5b11e324
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_87(
+        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_SNAP,  KC_SIRI,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_87(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_87(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_87(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q3/ansi/keymaps/keychron/rules.mk b/keyboards/keychron/q3/ansi/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..b29114f76a
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
+
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q3/ansi/keymaps/via/keymap.c b/keyboards/keychron/q3/ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a2cad2d8c9
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_87(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_87(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_87(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  _______,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_87(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q3/ansi/keymaps/via/rules.mk b/keyboards/keychron/q3/ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q3/ansi/readme.md b/keyboards/keychron/q3/ansi/readme.md
new file mode 100644
index 0000000000..1e7ea53e23
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/readme.md
@@ -0,0 +1 @@
+# The ANSI variant of the Keychron Q3
diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk
new file mode 100644
index 0000000000..34f570aa15
--- /dev/null
+++ b/keyboards/keychron/q3/ansi/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
new file mode 100644
index 0000000000..8e5f692e38
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,154 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {1, I_15,   G_15,   H_15},
+
+    {0, 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, 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},
+
+    {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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, __, 13, 14 },
+        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 },
+        { 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48 },
+        { 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 49, 62, 15, 32 },
+        { 63, __, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, __, 74, 86, 75 },
+        { 76, 77, 78, __, __, __, 79, __, __, __, 80, 81, 82, 83, 84, 85 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},  {16,0},  {29,0},  {42,0},  {55,0},  {71,0},  {84,0},  {97,0},   {110,0},  {126,0},  {139,0},  {152,0},  {165,0},            {198,0},  {211,0},  {224,0},
+        {0,15}, {13,15}, {26,15}, {39,15}, {52,15}, {65,15}, {78,15}, {91,15},  {104,15}, {117,15}, {130,15}, {143,15}, {156,15}, {176,15}, {198,15}, {211,15}, {224,15},
+        {3,28}, {19,28}, {32,28}, {45,28}, {59,28}, {72,28}, {85,28}, {98,28},  {111,28}, {124,28}, {137,28}, {150,28}, {163,28}, {179,28}, {198,28}, {211,28}, {224,28},
+        {5,40}, {23,40}, {36,40}, {49,40}, {62,40}, {75,40}, {88,40}, {101,40}, {114,40}, {127,40}, {140,40}, {153,40},           {174,40},
+        {8,52},          {29,52}, {42,52}, {55,52}, {68,52}, {81,52}, {94,52},  {107,52}, {120,52}, {133,52}, {146,52},           {171,52},           {211,52},
+        {2,64}, {18,64}, {34,64},                            {83,64},                               {131,64}, {148,64}, {164,64}, {180,64}, {198,64}, {211,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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    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,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q3/ansi_encoder/config.h b/keyboards/keychron/q3/ansi_encoder/config.h
new file mode 100644
index 0000000000..0388b6dd31
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 48
+#define DRIVER_2_LED_TOTAL 39
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { A8 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
+
+/* Enable CapsLcok LED */
+#define CAPS_LOCK_LED_INDEX 50
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json
new file mode 100644
index 0000000000..1be5e52de2
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/info.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "Keychron Q3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0121",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_88": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[3,14], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[3,15], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[3,12], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[4,14], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cfc678ba5a
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_88(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_88(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_88(
+        KC_ESC,   KC_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_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_88(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q3/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..3839c5b007
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,80 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_88(
+        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_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_88(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_88(
+        KC_ESC,   KC_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_CRTA,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_88(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif // ENCODER_MAP_ENABLE
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2279eb6a8b
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_88(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_88(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_88(
+        KC_ESC,   KC_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_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_88(
+        _______,  KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q3/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3/ansi_encoder/readme.md b/keyboards/keychron/q3/ansi_encoder/readme.md
new file mode 100644
index 0000000000..97f0f5db71
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ANSI variant of the Keychron Q3
+
+- Enable rotary encoder support.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top right key pushbutton to mute.
diff --git a/keyboards/keychron/q3/ansi_encoder/rules.mk b/keyboards/keychron/q3/ansi_encoder/rules.mk
new file mode 100644
index 0000000000..4b277f6d9e
--- /dev/null
+++ b/keyboards/keychron/q3/ansi_encoder/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q3/config.h b/keyboards/keychron/q3/config.h
new file mode 100644
index 0000000000..59b9e0f54b
--- /dev/null
+++ b/keyboards/keychron/q3/config.h
@@ -0,0 +1,100 @@
+/* Copyright 2022 @ Keychron(https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110111
+#define DRIVER_ADDR_2 0b1110100
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
+#define PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* turn off effects when suspended */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* EEPROM Driver Configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q3/halconf.h b/keyboards/keychron/q3/halconf.h
new file mode 100644
index 0000000000..41bddcb279
--- /dev/null
+++ b/keyboards/keychron/q3/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q3/iso/config.h b/keyboards/keychron/q3/iso/config.h
new file mode 100644
index 0000000000..dc8a3b03e9
--- /dev/null
+++ b/keyboards/keychron/q3/iso/config.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, A10, H3 }
+
+/* We uses a pin with a stronger pull resistor than the internal MCU pins */
+// #define MATRIX_UNSELECT_DRIVE_HIGH
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 48
+#define DRIVER_2_LED_TOTAL 40
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 49
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json
new file mode 100644
index 0000000000..9b49bf6ebe
--- /dev/null
+++ b/keyboards/keychron/q3/iso/info.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "Keychron Q3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0122",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_88": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[3,14], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[3,15], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[3,12], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[4,14], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
new file mode 100644
index 0000000000..04ee78092e
--- /dev/null
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -0,0 +1,155 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iso.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {1, I_15,   G_15,   H_15},
+
+    {0, 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, 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},
+
+    {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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, __, 13, 14 },
+        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 },
+        { 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 62, 46, 47 },
+        { 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 48, 61, 15, 32 },
+        { 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, __, 75, 87, 76 },
+        { 77, 78, 79, __, __, __, 80, __, __, __, 81, 82, 83, 84, 85, 86 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {26,0},  {39,0},  {52,0},  {65,0},  {84,0},  {97,0},   {111,0},  {124,0},  {143,0},  {156,0},  {169,0},  {182,0},  {198,0},  {211,0},  {224,0},
+        {0,15}, {13,15}, {26,15}, {39,15}, {52,15}, {65,15}, {78,15}, {91,15},  {104,15}, {117,15}, {130,15}, {143,15}, {156,15}, {176,15}, {198,15}, {211,15}, {224,15},
+        {3,28}, {19,28}, {32,28}, {45,28}, {59,28}, {72,28}, {85,28}, {98,28},  {111,28}, {124,28}, {137,28}, {150,28}, {163,28},           {198,28}, {211,28}, {224,28},
+        {5,40}, {23,40}, {36,40}, {49,40}, {62,40}, {75,40}, {88,40}, {101,40}, {114,40}, {127,40}, {140,40}, {153,40}, {166,40}, {183,36},
+        {2,52}, {16,52}, {29,52}, {42,52}, {55,52}, {68,52}, {81,52}, {94,52},  {107,52}, {120,52}, {133,52}, {146,52},           {171,52},           {211,52},
+        {2,64}, {18,64}, {34,64},                            {83,64},                               {131,64}, {148,64}, {164,64}, {180,64}, {198,64}, {211,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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1,
+        8, 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, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso/iso.h b/keyboards/keychron/q3/iso/iso.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q3/iso/iso.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso/keymaps/default/keymap.c b/keyboards/keychron/q3/iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3d06cb8567
--- /dev/null
+++ b/keyboards/keychron/q3/iso/keymaps/default/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_88(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_88(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_88(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_88(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q3/iso/keymaps/keychron/keymap.c b/keyboards/keychron/q3/iso/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..53c02128a6
--- /dev/null
+++ b/keyboards/keychron/q3/iso/keymaps/keychron/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_88(
+        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_SNAP,  KC_SIRI,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_88(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_88(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_88(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q3/iso/keymaps/keychron/rules.mk b/keyboards/keychron/q3/iso/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..495e8907b4
--- /dev/null
+++ b/keyboards/keychron/q3/iso/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q3/iso/keymaps/via/keymap.c b/keyboards/keychron/q3/iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3d06cb8567
--- /dev/null
+++ b/keyboards/keychron/q3/iso/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_88(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_88(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_88(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_88(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q3/iso/keymaps/via/rules.mk b/keyboards/keychron/q3/iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q3/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q3/iso/readme.md b/keyboards/keychron/q3/iso/readme.md
new file mode 100644
index 0000000000..69db8ff532
--- /dev/null
+++ b/keyboards/keychron/q3/iso/readme.md
@@ -0,0 +1 @@
+# The ISO variant of the Keychron Q3
diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk
new file mode 100644
index 0000000000..34f570aa15
--- /dev/null
+++ b/keyboards/keychron/q3/iso/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/q3/iso_encoder/config.h b/keyboards/keychron/q3/iso_encoder/config.h
new file mode 100644
index 0000000000..4e62c1d7a0
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 48
+#define DRIVER_2_LED_TOTAL 40
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { A8 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 49
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
new file mode 100644
index 0000000000..5bd2b23443
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "Keychron Q3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0122",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_89": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[3,14], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[3,15], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[3,12], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[4,14], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
new file mode 100644
index 0000000000..06955f879d
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -0,0 +1,155 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iso_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {1, I_15,   G_15,   H_15},
+
+    {0, 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, 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},
+
+    {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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, __, 13, 14 },
+        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 },
+        { 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 62, 46, 47 },
+        { 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 48, 61, 15, 32 },
+        { 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, __, 75, 87, 76 },
+        { 77, 78, 79, __, __, __, 80, __, __, __, 81, 82, 83, 84, 85, 86 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},  {16,0},  {29,0},  {42,0},  {55,0},  {71,0},  {84,0},  {97,0},   {110,0},  {126,0},  {139,0},  {152,0},  {165,0},            {198,0},  {211,0},  {224,0},
+        {0,15}, {13,15}, {26,15}, {39,15}, {52,15}, {65,15}, {78,15}, {91,15},  {104,15}, {117,15}, {130,15}, {143,15}, {156,15}, {176,15}, {198,15}, {211,15}, {224,15},
+        {3,28}, {19,28}, {32,28}, {45,28}, {59,28}, {72,28}, {85,28}, {98,28},  {111,28}, {124,28}, {137,28}, {150,28}, {163,28},           {198,28}, {211,28}, {224,28},
+        {5,40}, {23,40}, {36,40}, {49,40}, {62,40}, {75,40}, {88,40}, {101,40}, {114,40}, {127,40}, {140,40}, {153,40}, {166,40}, {183,36},
+        {2,52}, {16,52}, {29,52}, {42,52}, {55,52}, {68,52}, {81,52}, {94,52},  {107,52}, {120,52}, {133,52}, {146,52},           {171,52},           {211,52},
+        {2,64}, {18,64}, {34,64},                            {83,64},                               {131,64}, {148,64}, {164,64}, {180,64}, {198,64}, {211,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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1,
+        8, 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, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.h b/keyboards/keychron/q3/iso_encoder/iso_encoder.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f69e0998a8
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_89(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_89(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_89(
+        KC_ESC,   KC_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_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_89(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q3/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..0750f935b8
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,80 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_89(
+        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_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_89(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_89(
+        KC_ESC,   KC_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_CRTA,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_89(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f69e0998a8
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_89(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_89(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_89(
+        KC_ESC,   KC_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_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_89(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q3/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3/iso_encoder/readme.md b/keyboards/keychron/q3/iso_encoder/readme.md
new file mode 100644
index 0000000000..9d0017b30b
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ISO variant of the Keychron Q3
+
+- Enable EC11 rotary encoder.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top right key pushbutton to mute.
diff --git a/keyboards/keychron/q3/iso_encoder/rules.mk b/keyboards/keychron/q3/iso_encoder/rules.mk
new file mode 100644
index 0000000000..4b277f6d9e
--- /dev/null
+++ b/keyboards/keychron/q3/iso_encoder/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q3/jis/config.h b/keyboards/keychron/q3/jis/config.h
new file mode 100644
index 0000000000..b6750c6567
--- /dev/null
+++ b/keyboards/keychron/q3/jis/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+    { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, A10, H3 }
+
+/* If PH3 used with a stronger pull resistor then the following definition needs be included */
+// #define MATRIX_UNSELECT_DRIVE_HIGH
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 48
+#define DRIVER_2_LED_TOTAL 43
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
+
+/* Enable CapsLcok LED */
+#define CAPS_LOCK_LED_INDEX 50
+
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json
new file mode 100644
index 0000000000..42a0f474e5
--- /dev/null
+++ b/keyboards/keychron/q3/jis/info.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "Keychron Q3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0124",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_jis_91": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[3,14], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[0,13], "x":14, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[3,15], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[3,12], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,12], "x":12.25, "y":4.25},
+                {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25},
+                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 3], "x":3.5, "y":5.25},
+                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
+                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
+                {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.75, "y":5.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[4,14], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
new file mode 100644
index 0000000000..cbe433eb4e
--- /dev/null
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -0,0 +1,158 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "jis.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},  // ESC
+    {0, I_2,    G_2,    H_2},  // F1
+    {0, I_3,    G_3,    H_3},  // F2
+    {0, I_4,    G_4,    H_4},  // F3
+    {0, I_5,    G_5,    H_5},  // F4
+    {0, I_6,    G_6,    H_6},  // F5
+    {0, I_7,    G_7,    H_7},  // F6
+    {0, I_8,    G_8,    H_8},  // F7
+    {0, I_9,    G_9,    H_9},  // F8
+    {0, I_10,   G_10,   H_10}, // F9
+    {0, I_11,   G_11,   H_11}, // F10
+    {0, I_12,   G_12,   H_12}, // F11
+    {0, I_13,   G_13,   H_13}, // F12
+    {0, I_15,   G_15,   H_15}, // Print
+    {0, I_16,   G_16,   H_16}, // Cortana
+    {1, I_15,   G_15,   H_15}, // Light
+
+    {0, 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, 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
+
+    {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, 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, 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
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 30, 13, 14 },
+        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31, 32 },
+        { 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 63, 47, 48 },
+        { 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 49, 62, 15, 33 },
+        { 64, __, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 90, 77 },
+        { 78, 79, 80, 81, __, __, 82, __, __, 83, 84, 85, 86, 87, 88, 89 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {26,0},  {39,0},  {52,0},  {65,0},  {84,0},  {97,0},   {111,0},  {124,0},  {143,0},  {156,0},  {169,0},  {182,0},            {198,0},  {211,0},  {224,0},
+        {0,15}, {13,15}, {26,15}, {39,15}, {52,15}, {65,15}, {78,15}, {91,15},  {104,15}, {117,15}, {130,15}, {143,15}, {156,15}, {169,15}, {182,15}, {198,15}, {211,15}, {224,15},
+        {3,28}, {19,28}, {32,28}, {45,28}, {59,28}, {72,28}, {85,28}, {98,28},  {111,28}, {124,28}, {137,28}, {150,28}, {163,28},                     {198,28}, {211,28}, {224,28},
+        {5,40}, {23,40}, {36,40}, {49,40}, {62,40}, {75,40}, {88,40}, {101,40}, {114,40}, {127,40}, {140,40}, {153,40}, {166,40}, {183,36},
+        {8,52},          {29,52}, {42,52}, {55,52}, {68,52}, {81,52}, {94,52},  {107,52}, {120,52}, {133,52}, {146,52}, {159,52}, {177,52},                     {211,52},
+        {2,64}, {16,64}, {31,64}, {45,64},                   {81,64},                     {119,64}, {135,64}, {151,64}, {166,64}, {180,64},           {198,64}, {211,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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1, 1, 1,
+        8, 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, 1, 1, 1,       4,       1, 1, 1, 1, 1,    1, 1, 1,
+    }
+};
+
+#endif // GB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis/jis.h b/keyboards/keychron/q3/jis/jis.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q3/jis/jis.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis/keymaps/default/keymap.c b/keyboards/keychron/q3/jis/keymaps/default/keymap.c
new file mode 100644
index 0000000000..28ffd7f4a7
--- /dev/null
+++ b/keyboards/keychron/q3/jis/keymaps/default/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_jis_91(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_jis_91(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_jis_91(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             KC_PSCR,  KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_jis_91(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q3/jis/keymaps/keychron/keymap.c b/keyboards/keychron/q3/jis/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..30fc9cb8a2
--- /dev/null
+++ b/keyboards/keychron/q3/jis/keymaps/keychron/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_jis_91(
+        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_SNAP,  KC_SIRI,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_jis_91(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_jis_91(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             KC_PSCR,  KC_CRTA,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_jis_91(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+};
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q3/jis/keymaps/keychron/rules.mk b/keyboards/keychron/q3/jis/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..495e8907b4
--- /dev/null
+++ b/keyboards/keychron/q3/jis/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q3/jis/keymaps/via/keymap.c b/keyboards/keychron/q3/jis/keymaps/via/keymap.c
new file mode 100644
index 0000000000..28ffd7f4a7
--- /dev/null
+++ b/keyboards/keychron/q3/jis/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_jis_91(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_jis_91(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_jis_91(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             KC_PSCR,  KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_jis_91(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q3/jis/keymaps/via/rules.mk b/keyboards/keychron/q3/jis/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q3/jis/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q3/jis/readme.md b/keyboards/keychron/q3/jis/readme.md
new file mode 100644
index 0000000000..f8faed6a6c
--- /dev/null
+++ b/keyboards/keychron/q3/jis/readme.md
@@ -0,0 +1 @@
+# The JIS variant of the Keychron Q3
diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk
new file mode 100644
index 0000000000..34f570aa15
--- /dev/null
+++ b/keyboards/keychron/q3/jis/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/q3/jis_encoder/config.h b/keyboards/keychron/q3/jis_encoder/config.h
new file mode 100644
index 0000000000..0d728773e9
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/config.h
@@ -0,0 +1,40 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+    { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 49
+#define DRIVER_2_LED_TOTAL 43
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { A8 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable CapsLcok LED */
+#define CAPS_LOCK_LED_INDEX 51
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json
new file mode 100644
index 0000000000..2597376c06
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/info.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "Keychron Q3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0125",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_jis_92": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[3,14], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25},
+                {"matrix":[5, 5], "x":14, "y":1.25},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[3,15], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[3,12], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,12], "x":12.25, "y":4.25},
+                {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25},
+                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 3], "x":3.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
+                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
+                {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.75, "y":5.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[4,14], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
new file mode 100644
index 0000000000..cdb98d53b0
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -0,0 +1,159 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "jis_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},  // ESC
+    {0, I_2,    G_2,    H_2},  // F1
+    {0, I_3,    G_3,    H_3},  // F2
+    {0, I_4,    G_4,    H_4},  // F3
+    {0, I_5,    G_5,    H_5},  // F4
+    {0, I_6,    G_6,    H_6},  // F5
+    {0, I_7,    G_7,    H_7},  // F6
+    {0, I_8,    G_8,    H_8},  // F7
+    {0, I_9,    G_9,    H_9},  // F8
+    {0, I_10,   G_10,   H_10}, // F9
+    {0, I_11,   G_11,   H_11}, // F10
+    {0, I_12,   G_12,   H_12}, // F11
+    {0, I_13,   G_13,   H_13}, // F12
+    {0, I_14,   G_14,   H_14}, // Mute
+    {0, I_15,   G_15,   H_15}, // Print
+    {0, I_16,   G_16,   H_16}, // Cortana
+    {1, I_15,   G_15,   H_15}, // Light
+
+    {0, 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, 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
+
+    {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, 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, 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
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
+        { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33 },
+        { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 64, 48, 49 },
+        { 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 50, 63, 16, 34 },
+        { 65, __, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 91, 78 },
+        { 79, 80, 81, 82, __, 31, 83, __, __, 84, 85, 86, 87, 88, 89, 90 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {16,0},  {29,0},  {42,0},  {55,0},  {71,0},  {84,0},   {97,0},   {110,0},  {126,0},  {139,0},  {152,0},  {165,0},  {182,0},  {198,0},  {211,0},  {224,0},
+        {0,15}, {13,15}, {26,15}, {39,15}, {52,15}, {65,15}, {78,15}, {91,15},  {104,15}, {117,15}, {130,15}, {143,15}, {156,15}, {169,15}, {182,15}, {198,15}, {211,15}, {224,15},
+        {3,28}, {19,28}, {32,28}, {45,28}, {59,28}, {72,28}, {85,28}, {98,28},  {111,28}, {124,28}, {137,28}, {150,28}, {163,28},                     {198,28}, {211,28}, {224,28},
+        {5,40}, {23,40}, {36,40}, {49,40}, {62,40}, {75,40}, {88,40}, {101,40}, {114,40}, {127,40}, {140,40}, {153,40}, {166,40}, {183,36},
+        {8,52},          {29,52}, {42,52}, {55,52}, {68,52}, {81,52}, {94,52},  {107,52}, {120,52}, {133,52}, {146,52}, {159,52}, {177,52},                     {211,52},
+        {2,64}, {16,64}, {31,64}, {45,64},                   {81,64},                     {119,64}, {135,64}, {151,64}, {166,64}, {180,64},           {198,64}, {211,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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1, 1, 1,
+        8, 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, 1, 1, 1,       4,       1, 1, 1, 1, 1,    1, 1, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.h b/keyboards/keychron/q3/jis_encoder/jis_encoder.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..668efb91f2
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_jis_92(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_jis_92(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_jis_92(
+        KC_ESC,             KC_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_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_jis_92(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+};
+
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/default/rules.mk b/keyboards/keychron/q3/jis_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..b20f267f4c
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_jis_92(
+        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_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_jis_92(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_jis_92(
+        KC_ESC,             KC_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_CRTA,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_jis_92(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+};
+
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif // ENCODER_MAP_ENABLE
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..532ada52dc
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_jis_92(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_jis_92(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_jis_92(
+        KC_ESC,             KC_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_NO,    RGB_MOD,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_jis_92(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______),
+};
+
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/via/rules.mk b/keyboards/keychron/q3/jis_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3/jis_encoder/readme.md b/keyboards/keychron/q3/jis_encoder/readme.md
new file mode 100644
index 0000000000..8fdb3bb2e0
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/readme.md
@@ -0,0 +1,5 @@
+# The JIS variant of the Keychron Q3
+
+- Enable rotary encoder support.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top right key pushbutton to mute.
diff --git a/keyboards/keychron/q3/jis_encoder/rules.mk b/keyboards/keychron/q3/jis_encoder/rules.mk
new file mode 100644
index 0000000000..4b277f6d9e
--- /dev/null
+++ b/keyboards/keychron/q3/jis_encoder/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q3/matrix.c b/keyboards/keychron/q3/matrix.c
new file mode 100644
index 0000000000..26830780ff
--- /dev/null
+++ b/keyboards/keychron/q3/matrix.c
@@ -0,0 +1,197 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "matrix.h"
+#include "quantum.h"
+
+// Pin connected to DS of 74HC595
+#define DATA_PIN A7
+// Pin connected to SH_CP of 74HC595
+#define CLOCK_PIN B1
+// Pin connected to ST_CP of 74HC595
+#define LATCH_PIN B0
+
+#ifdef MATRIX_ROW_PINS
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+#endif // MATRIX_ROW_PINS
+#ifdef MATRIX_COL_PINS
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif // MATRIX_COL_PINS
+
+#define ROWS_PER_HAND (MATRIX_ROWS)
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinInputHigh(pin);
+    }
+}
+
+static inline uint8_t readMatrixPin(pin_t pin) {
+    if (pin != NO_PIN) {
+        return readPin(pin);
+    } else {
+        return 1;
+    }
+}
+
+static void shiftOut(uint8_t dataOut) {
+    for (uint8_t i = 0; i < 8; i++) {
+        if (dataOut & 0x1) {
+            setPinOutput_writeHigh(DATA_PIN);
+        } else {
+            setPinOutput_writeLow(DATA_PIN);
+        }
+        dataOut = dataOut >> 1;
+        setPinOutput_writeHigh(CLOCK_PIN);
+        setPinOutput_writeLow(CLOCK_PIN);
+    }
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static void shiftout_single(uint8_t data) {
+    if (data & 0x1) {
+        setPinOutput_writeHigh(DATA_PIN);
+    } else {
+        setPinOutput_writeLow(DATA_PIN);
+    }
+
+    setPinOutput_writeHigh(CLOCK_PIN);
+    setPinOutput_writeLow(CLOCK_PIN);
+
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static bool select_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+        setPinOutput_writeLow(pin);
+        return true;
+    } else {
+        if (col == 8) {
+            shiftout_single(0x00);
+        } else {
+            shiftout_single(0x01);
+        }
+        return true;
+    }
+    return false;
+}
+
+static void unselect_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#else
+        setPinInputHigh_atomic(pin);
+#endif
+    } else {
+        if (col == (MATRIX_COLS - 1))
+            shiftout_single(0x01);
+    }
+}
+
+static void unselect_cols(void) {
+    // unselect column pins
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        pin_t pin = col_pins[x];
+
+        if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+            setPinOutput_writeHigh(pin);
+#else
+            setPinInputHigh_atomic(pin);
+#endif
+        }
+        if (x == (MATRIX_COLS - 1))
+            // unselect Shift Register
+            shiftOut(0xFF);
+    }
+}
+
+static void matrix_init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        if (row_pins[x] != NO_PIN) {
+            setPinInputHigh_atomic(row_pins[x]);
+        }
+    }
+}
+
+static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
+    bool key_pressed = false;
+
+    // Select col
+    if (!select_col(current_col)) { // select col
+        return;                     // skip NO_PIN col
+    }
+    matrix_output_select_delay();
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
+        // Check row pin state
+        if (readMatrixPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= row_shifter;
+            key_pressed = true;
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~row_shifter;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    matrix_init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
+
+    // Set col, read rows
+    matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
+        matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
+    }
+
+    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+
+    return changed;
+}
diff --git a/keyboards/keychron/q3/mcuconf.h b/keyboards/keychron/q3/mcuconf.h
new file mode 100644
index 0000000000..0ca8c64850
--- /dev/null
+++ b/keyboards/keychron/q3/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c
new file mode 100644
index 0000000000..5aa6029d69
--- /dev/null
+++ b/keyboards/keychron/q3/q3.c
@@ -0,0 +1,87 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "q3.h"
+#include "rgb_matrix.h"
+
+// clang-format off
+
+const matrix_row_t matrix_mask[] = {
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111101111,
+};
+
+// clang-format on
+
+#ifdef DIP_SWITCH_ENABLE
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) {
+        return false;
+    }
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    return true;
+}
+
+#endif
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    switch (keycode) {
+#ifdef RGB_MATRIX_ENABLE
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+#endif
+    }
+    return true;
+}
+
+__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+           RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+}
+
+#endif // CAPS_LOCK_LED_INDEX
diff --git a/keyboards/keychron/q3/q3.h b/keyboards/keychron/q3/q3.h
new file mode 100644
index 0000000000..bc2d458bb7
--- /dev/null
+++ b/keyboards/keychron/q3/q3.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if   defined(KEYBOARD_keychron_q3_ansi)
+#    include "ansi.h"
+#elif defined(KEYBOARD_keychron_q3_ansi_encoder)
+#    include "ansi_encoder.h"
+#elif defined(KEYBOARD_keychron_q3_iso)
+#    include "iso.h"
+#elif defined(KEYBOARD_keychron_q3_iso_encoder)
+#    include "iso_encoder.h"
+#elif defined(KEYBOARD_keychron_q3_jis)
+#    include "jis.h"
+#elif defined(KEYBOARD_keychron_q3_jis_encoder)
+#    include "jis_encoder.h"
+#endif
diff --git a/keyboards/keychron/q3/readme.md b/keyboards/keychron/q3/readme.md
new file mode 100644
index 0000000000..8e25a1b332
--- /dev/null
+++ b/keyboards/keychron/q3/readme.md
@@ -0,0 +1,23 @@
+# Keychron Q3
+
+A customizable 80% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q3
+* Hardware Availability: [Keychron](https://www.keychron.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+```
+  make keychron/q3/ansi:default
+```
+
+Flashing example for this keyboard:
+
+```
+  make keychron/q3/ansi:default:flash
+```
+
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

From fb2c7da2fd57468d473b2b8bac0a5a96023484ea Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 12 Oct 2022 22:36:51 +0100
Subject: [PATCH 614/959] Remove some .gitignore files (#18689)

---
 .gitignore                                    |   1 +
 .../cijanzen/pearl-cijanzen-keymap.jpg        | Bin 424673 -> 0 bytes
 keyboards/redox/keymaps/nrichers/keymap.png   | Bin 146904 -> 0 bytes
 .../community/ergodox/jafo/jafo-layout.pdf    | Bin 185412 -> 0 bytes
 users/arkag/mechmini2.jpg                     | Bin 3548191 -> 0 bytes
 5 files changed, 1 insertion(+)
 delete mode 100644 keyboards/pearl/keymaps/cijanzen/pearl-cijanzen-keymap.jpg
 delete mode 100644 keyboards/redox/keymaps/nrichers/keymap.png
 delete mode 100644 layouts/community/ergodox/jafo/jafo-layout.pdf
 delete mode 100644 users/arkag/mechmini2.jpg

diff --git a/.gitignore b/.gitignore
index 51b0a38e0a..b268ab0d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ quantum/version.h
 build/
 cmake-build-debug
 CMakeLists.txt
+*.pdf
 
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
diff --git a/keyboards/pearl/keymaps/cijanzen/pearl-cijanzen-keymap.jpg b/keyboards/pearl/keymaps/cijanzen/pearl-cijanzen-keymap.jpg
deleted file mode 100644
index 60e5c4746400bc6a51f8845ed8167086b804bd93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 424673
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%0AEB
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
TAL>V+H2zgd`(HN_Kj;1jS25B1

diff --git a/keyboards/redox/keymaps/nrichers/keymap.png b/keyboards/redox/keymaps/nrichers/keymap.png
deleted file mode 100644
index 8ef3fe4eaa51e027167d34c360a87b23788bd40c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146904
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

diff --git a/layouts/community/ergodox/jafo/jafo-layout.pdf b/layouts/community/ergodox/jafo/jafo-layout.pdf
deleted file mode 100644
index 760a0eccf6e50ab40efcadf09ef6df8e6a55b7ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 185412
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

diff --git a/users/arkag/mechmini2.jpg b/users/arkag/mechmini2.jpg
deleted file mode 100644
index 611a0859c0c431273e99013f3599816dff9204ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3548191
zcmZsiQ<N>+vaZWEXW6!G+qP}nwr$O_HOsa=%eL)X>+E&!*$;QL7A?Mv{`Ve{5&4v(
z<@f6Mu5+n~yM-wLfP@4k00aO404#t-7zhC14?X-CN%(&_UGe7v5cq%Mz3@NyFV8{)
z0KfwR0f7H3SNs^l5C4P!>VFLBU(G*fVFH5w&)&`-#`>2Bf0+DV4bTrW{Om>f@smHs
z_%HALFf!18^8Ry9q7ndrn4O)OwF!W{g}aG0J|n)mG=TWe%0H|B&kHM3;WN<E(=u>y
zu&^=Ev$A*sFw!%ybJBBgGBV>cFmW=nbF#1jkOE`|{->_~p8|6J<?$aT4F6Bgf9fLp
zm*f9Q5f2Uk^5f_k8R>!J|5NY$j|k*nKKfz6g#Ty&|EW6>>VGPG`-uZ3{wLQ@7y$U+
zIMfe={L4r`4EnDI^M}FyWx^i@PyF9{Apd2ApE{ua)lmLuyc59zsN{Zn_rvjt|Cx!-
z&)gFJW#b=C{Fkl%nP>jL_rgF=519YIJqG%h|CuxJzx>afLG%CfEO`FxMKAo{dH{>S
z|K}e6X%ArWf1UF$|AYa6|BFG2|I-J@pL0O}jbr_2!2U}E@m~!2UkvqM4D&DlllPxr
zkO2SyzaTt7(+?Z}*#B?h|GyZ@&usqD|MUF*<9{yy$NxA0upj%s@!+3CCqKQlLi~>x
z7gm%9x;AF9(Y42=KHHa3;}6#m8E3HoefDgIZry_;0}<|p+iAXY-{Q0P026WpG@E=e
z7Nt67X@pYC2edfi8zzcz>uTdHbE?yEJ<>pqc&b5%x2%fE2ux6P?~Hn6PxFTNd>!zr
z{ubT)6UD8%RL>(mEAa6Pt{PpGet@hIlTPflM<>itBkhmIOr>aMS0Neg(j$8@h&8|4
zu6?8$>s_EKI+33BkkC@+MB@#JCP80M)~_vPQuQ5Ha!Mx~TC?2YH?2GCk{Bop*Vw!n
zR+7}NdkE2W4VdQ~;VliGow_l#I1m{tb_MD^GwNyki`29FZ@O;79n$f>O8evWSZfKb
zsP=qcs3C{TP%3J|P)~>Bkkf#5#V&yWL(q<mzZk)<qoaZ~w#(ul#!hg7sQ2|vZ_=cx
zR1aAN)?Wr*e?by$saJ_nRp~kGQR**q&k0r<E;~y%fn*`&V`HLGt?{T=XDlpsMlK1q
z=5^!>sy@P`^;p4MS-HH{r1s4ID7lp@<MAE0=++`dwcq`PL=s59+-)#4Xf@BW8y5+n
z&XmKP@O&SQk#Hqn$`0(!80LjjE}uPBE_Gg09qoh-lPK4XvX!G0Cv?}M9R66!v(=Oq
z5uSGG=A8wu&6BN$7cp1cv}+q%FvACqzO>zft)?c~u@6xtiR57+@^E_o6Y&~VmQ75-
zwcJ=krmCd%q=94U&NDNvd76#`@siJ`!~%Lhr^txb<hR*W4{Q8Ep`{68u~)T=AmFkB
z)_Af=w4U;a;qdEXRzFmxhT(jT5F>UAbbHO;l<c{@qy~1Ssv@gq|9n-P&p+|v09r$?
zChiFYOrDU72E*WMkgI+}#8Y|*yBpK;3q7RV{UFNfCOyUEvQz1v*Vs@4C<2~pnS3A(
z`k|6^=g_9HCdWV@;OZ`XDpW$}ZQmO6kS#C8;|xc46*H(jxE<Wc7{ZzB8kGEM+6~Y1
zNITMbM@D%a&~5f)`oP_r2xzlJydhrV?+L1%V+h3Gp~aONUq1(5L9(z2B#&}C51#Kx
z@SfSDo9k$tB44a1p|LaAQS?D6>>1gpu7^Hp!(Z6At!>asUU(2ARkCLY=E+**G<wws
zX!R35(<p8er2E&g^xe+q2C5m%d(Pe&&sy;=my;4%Z|3B$*_nYw?H={#0;<qV7Dn;d
zt_j^skWi%;V>M)s(d2?;+0uk$#!*OUv;E;iLv-CXNlF(f!dsFxvP8E7F82-jMBxq`
zn^+rwJ82BR01k?Z&M*#JhXOq2F1umy1NI>vX2ghb_(DaH22O@<LM6rvo<3LP7{hLM
zOD<zpBTXd_o2GGBe0PmISB?YxT{cxQIN%pxk>a7hXvsAuZw6nOjM(ptz`q;mFCQ)E
zB<T-VSy1{c+St|ERAdFKVd4;N>R7_k!Tm_o>+9mVKR$+KmgWoAt6aC0#W@TVsbG|>
zo%e*WNlWp+XNhi$Qzl?;Q4%gF$L(Zc&0BeU4I>Y!xfH8!xOI~`-H3>}d4)kV!R{I;
z@`1nqR2|Yc-2y5)9%qkD`PioLWG71~wzWu0-FV}8Ez3T^Ow$V7tnPJzjP-*`-8mwF
z9n|3lvXtoElH@n@Q1kwA^FcS?Mic4kTnsM4Zn$3skDSOQAwe67LGpY58d1_y6<pz_
z#ZVFL;`lWFIBS{-KyY%0)9i!rWcofUUBrj-J->`#(f&ShT4>vw*0p=4hklG<LD{+z
zU05z?h3mEXigV(vXk}oG<`YTI`Q6&kxg!UeqiF0VYIHa~38zWtQ6GdWWaRR3#g59c
z*|~|jDhv6g{3|FwN4!au#g5YD>MFWgn`2O{&U!QSmLGSKIoP-rZ$T39-BlWf%ktNU
z*$0E^fdxjuRGpkmZ=^Z*pfS%q#5KYbgz8r1tm0U?HX<4n;o*LZMsnma*h_U=m#OaX
z7&o;nY7|bV>hi+DM>L1PFgYNsUDmb7fPFiToeIY%cvCkGlW_Z^F&*snk<V(1ZNg!7
zF{hzw)o`Ssr6a3!-n<9{z!z@cozLyH$a2%ojgkmo?1b1-wVy@1`w)`?xXSM}0>6*6
z)#}C-Py-Q0)<N~#>PTxT#7_Xzb|6Vqr>eVSE%iD~#Ur=I_|RBnR}Rh&k$09u9j9`S
zMl-42!q)*tJM}c~$~5HrsJ{WQiR)=eYnrCxq|AX30nGfaMRAEn_{(}beYd(SjSv<E
z_{^s}#P+G^%7Y?t8++T`X2|#bzlzNj*o!$4@WoNCH(BSCG!(Kd?<bRr_Lk;AGY)jJ
zX$G@RG$(G1uo-e<83`IicT72GK=fy1rSfgz!N_4>Feg^>EXL5;TdgX5>Cw!?a-UT`
zVQ)i4GkS9<+AywFl4^<<i)vMKoFh1DEg5g`{n9YJ84RYDV6h3@GCaIfAb~@sZ*k_>
z>0vczX<maR1J>1uidmg?1WLIP61#=@OT&siNWpsJcOk>UHqk>>vHOI@a!#zsmt&~2
zg`*fM@?&ke_1Jp!g&u}v%$zxfmKk(BZ2A+7`4-3cFyVPZFppsmPE4Mwq`IWu3+u_6
zeRd4Co5+4QlGP!q2AEhsc}W9DnyW@@H;!7CDpuHi3j@IvQkVl$+xY6=RD+M*+#Jkd
z%-8h~pvVrV<H;g3X*(A&Iysx;kBl|Q^RWE2V>ii;nVA$am*#r`P~Xo797fM^O_dBB
za%@K@csv$3g+K=}6U85HB4#JoM*#JVxG^1Hgf{y-*g0_$m1=u(bMek-qSVF8?Id*+
zdO%n%FdqsMxf0=c#ulPz!;g*Hu~{6L{!L~a<T)5gQQ+SRx#&1sdAhq#u=R4n76$MH
z(a;2>`%UqpT2OX);5@~yls_zgaaED?N0*%$D&1H5Qs%^H3%il-z-6BcV<kl#swk-y
z>7In(wzh&v(Tqlue$in<{RF#XV}A#DsdR*PE98J8UQ~EnXHwN|xkMAzz|h2`hY91#
zQmG;a?$c`*obUq>_B-p<qL*$#o7uy?2@#+%;T}T2yoqv{Lh68ZmHx7H-isRAVIu7p
z>7aM^AQ!e-m&V6~Vs59mGRsce8@l#=jt?__!Y#u}v9^TG-w04f{!8Ecos#z?le`^S
zYu%*1g~n=4XALw`e>k5>qB822b)BaBFOMm>TmF9itP~!DFk5~O%h<|0@*#+DD>yeQ
zjQwXTQ$)r&C@esBY1wEf3FqjQu|F+XX^{9`+}9B?;x^uOjtOXnEgbRD!`u{1_&kL1
z_o`(DC)NGWhksmt5iAU%Re1e5gjitdk;F(B*9#w~=i}c!4|{ZWjAL8&g2|}&_wR?s
zPVNkj%?cMRO2E3lr%SWuFynOfkfikxnd;z!CdMf)a}7^Ci`r5+&no>suD^`7l{=iB
zuyq^k+HnDj{46WbvWa<%kMC@AYSd`cY#ck^bds!#Feqz4c&XE8w8(PTk|*E{LJ)Rb
zY7zMRdD~wCNzGdvSdS>uukM?Jp5wpdWT=KckHcoOv}a6H0`R&xzvW?LUX?+-UfFDG
z%dbnN$KA;Ku$O2Qtt<AoQ2jyCkY-}hqm&9d$$mQqY7c=FyPHpe2rD^uBljt|CRz%3
z;Uznoz`6~_#LN=0H-{FSNfh&wqWtmi0MYp0iK({Qd&8u-x-`BuK1YAmqFgkf<L!d$
zO{m82=U=E<HfMW5AP~foVUh!I*By=IKIx?swdw}V9jSdQq_wBaUvR5)Zk`m=x<#ss
zbKD)1bLHc`_8yUBl_o1-A_;465&q5W<YFL5On`p`aIcwtFBBERak<^FF6p`vsf~s#
z*DX(J53+sEU11A8KDCSw$OfoxcP1Q5!qJ!BHxgcw8I-y=xi|7zqFv7e`Z#adi77!%
zDM}Gdr<;WYa?p>-ySa|w!p{;<&1O+*yFG@$E5b6#<t!lN=eq<mGse4kzPIpUm_pI@
zV$zr>ZIlcg){S{Ttpqr-4U;;kSa?-5(9Zu*?0ARPLWWi_Ve<tzl{fYG*bC6+)H>8z
znxzD*&QC02g3kt*7@xE@m8Y8-Ol*)o{^3L<x0ss0V#$H<QH`9cY)yDi;{=%tnY}{}
z0<#Hqj(G;AELZZa;)s2oM!#NUTVfV4y5X;VK>_Xa-`Ip(IrS=dpb9B0$Go+z*0=*%
z#|3`(+AuA^yj#YjRGOp*88GEgJ8OZ{FOq_hOgV)!!q7$i#o6xO`YbvAk|x<c#F5rg
zUnjC$D#)7u91Aas^6buhNdWP}A^gQjnczXP-0(TEAD%9i?87sYkeSHnUV~&lxqEw%
z^6R%(I=}zn-TUMzsVoJ=0)WtBK+(hGFgRR*D{CU%yo#)%-YCj*TSev_hRwKmt?T;&
zgdQxpGAUUkETKlzJ?|PUIbXb4Z8t|ti;y70$Q)W#za4>T=9j{iQOXy0_=G+(n}**T
zk)XMlLN3r>r0@eD_L(vBy<aYo9Anp3&K^b!#gW{5`A4v1Lq0K7H?zrT{>S&VyN3In
z9vd?sr!>-6@|=y~Fj%AJT%+}i!7v9ZPnCXpS_nN!Mi`@jLG}?EwJoS-=so~x=m8Zc
z{m&s~r;MH-fZ~Pl25g-5EDjinvUJmwC?vkUJFJn?EgXhVMSCK2gygo7H49_Mj&swa
zwG1x;@}WT5X@%st3F6}sNs}5msyj+B2Rj+SIGK2^OvIr_Df|pzeQO!$1Kyfy$yKMq
znFJx~W|b{KAZ>XWL+YJev8;~~qF$nJ{V>ZLK|(j!#0@b`Z9&IU%c8U@Y5u=S>Yt9E
zw?)N`SRkg<)sd&P-*cXx+ZUl{ukJU`37hZ@>K8|s%(C`FwT>rVqyau~8Mr6Sd??DL
z+*NiU*#nK^{1hCG_`AVLR4cJOjqY8u44T-5Y9KdiTY$Q~^;msJDuUShpR*Ysca9l5
zbV8@T?r9hiL!nf^#0Bcd!iXMkANhb~-Be|@m@G!}%s@bj79hv`@AZ&lXhA|DUaAtv
zic~nD`%)X+$|}3{M;p_Mf>IWzw@KCO%)ipBxz3XwO6SgFoEcW`yuCYeTD^Tk7b-Wv
zK6RRhgy!Nv<pf$;gV)yf<Fj&+5)f|mT&NZBj2r)m#kU!3f-TWV2Dew8-&S)SmrAP#
z=n}gM2s9Ghrso2iVS_e`1$%sLJ|9#<>DkU_pYvBM0l%6)xpU#f>mu{-yV$-<VeG6Q
zG_3zw5(R3Yy3_d$)7aq4>+@?KWEL&`QyyBzkR5en*)>w~%n&ieRT4Z9rJoqjlMq5T
zc15~@*oxg<ESV6{Y8ec?cQ#?mMuOvpcTYIlrL0{>u;#`%k-u_-y?RXIuWRHL{9=It
zDh;k&-c?j@^UlN!iV@@fhrmkFgC$W0@~H%m_7Yl)ijCYk40*j8b?9+TLz(viml`xr
z<-O$yp}qS7H_7<((A{@|I-2XiYGMYok{VYuOCBh~omr0DSQIK-lkdk@5S%-<Dmp_v
z-|0v6ZHu#-plXh1eGPPGwGkA~MmkM`Mtq1p@gIUsA!^}%xgn(Pfj86>?uLrNg2}*x
zGghf*vlApUe2Cm^{Too4PLj`lvZc|9U#^~o6yr4I7FZIP2$xx)B9CNIxE!~+u-ob_
z%G-dh{9boZV7fO*k#3lOMS0U~qU2;?A(XPTTo?lsL4r_E_`iv4dMA`o`3)TRdJ1!R
zzyd_1%*am1z3I7Ba5Ikki*mHW*oN!0mK>SRqjb#Yn%A}xm{G<<uFuY^6b(JSkUvoR
zaV%kplPZ1<S_^E$jxW9rr?Z^l^MO$wMbTwKLyJ2cF16Sr8XwY6K(8laYQEOIi*QN<
z_QTog^=~~$suoGGG50pyG1*6(rr_Mb;AqeD1lp!FJ0VmZMY8(ll#s%$ZvK&qERww?
z>+AvEVSMHAAd$3k1YIeOS^_&*$(va;X@beDOa@u2C4gZo8wnJcnKDe??jDE90gRxC
z*9wzo-)kO<)*hcFsuKs({e4u6UwkkeGPIr91p5UdwfJdcKGCH1h(^&&qbb!D)wwk$
zxGa$mBxdgCmi+aNXkvz8;x1$5*2N}_J&<<p<`UTfXW^(E?4G|feGr^BAb2(e4TqeU
zLuujm9hp;4(l~fBi<>LJFqa>u2|>WFPEG5)4G*J7tMuM@79rmB_{J-6lgzjK#b;iI
z$D2O%SsY07X55Zt=w!n*2(PsD!5!B7YJ4-9+A)P<?C9ADJpspTw=Po3ZzW6|d%6Gs
zB3}Azb1?;FYH5j;w_zkh2n&ewMC3v9p2rYYjEh(*lj*gczJT!AQ^~f1@)?WO6O97>
zS9fVZ(?sl7<$N#R{9l^dP`+E=IN5=M=3iA!TpjBKwN?b^QN{(jZSp4fqOrh$7LtSy
zCiR+x=wFd&ay(V04Lb>EAe9n4cp+-f^lT+1k5yL&`2pPb6p!46*))->YyAV_MiS3a
zuhenRHbx`C{o>!x$FB@cEutEnkhZMe<|X>0?l4ANr{p0ClIJI4dbzC3-*>}L@<(7b
zdIimaGfu^Mm7l|S#gzJOf9{LeTY+H;pS#~_nllUmP;B5WY+O^7>==C~dkFcuKvkt$
z@2Qu>FLg(vDnY-52x^V;TyFi^DzYJ<OHaUYhu&IWAm$=Iq=ujXIlL=uk%Mhw6wR9Z
zk>k5}CaV1eGYifJ!Vg76`nfkBAthw6Fl;zKCQaZitX;_4zK=BF?4bQHU>ox>^=xUB
zR`|#9@4*bGZE!N&hKTt~asZ{SPA<cBBeb+=rDuWi$WK-oZ1w!U^~?Y<xdyKQ6|SX=
z878#Nvfgh&7Gh?~1+fdif|G<zTkhdgpk0c%FKX*_fr$@>`#E=Bhq|c%rZskD_yH`L
zV&l-L%R%w!da9X7zui51x)M7=>0gg#93C<{7;w+>hu{&nt=-%dGWrAcgysXh-X)vX
zWfvo&Drmz)?S!6)V_p1Wh#kH$l8SXpm9K{qMpQv!>jNXNOH%Hv249(mJJ)zT$^K$V
z9+{8gs>84b7QNxP8k;T0KOc$`RSBYRxWVzSJzJreS%Ir6oxcTaT*VCm$=5Xg2A7eu
z+u-b=^yeVYy(&osyofF}RqZqDz7SS=7}6rc<5=CV`8HqKN~&1~9XWPKWo;wtSLFrq
zQ6E|Irb6xz@=2C#5I^)rTM*46d6R7sjzoHo-kq3nD1zkwbeI+0MU*MsU}zaadH}G}
z6n376y@6Pvz4f`WJGHG5skYZfNsHk@&^Yc)m$%9R(`snls{>E+ZBSK>(UBp9ANu2~
zsQj|)HC|rmz9WH02ri1eH5m!lTF^0)BlZhWH8G?udzjYNWcz&mI?qr(__xs_4=K4Z
z{-|!P*0P0Yc)t^uyS`~mVpO52y0w7=WGn9@#mP`Jo06m7N`eLl=C_r}95DJySI4`2
zbY{{_kzy3yA6RRk@nuR-T8$|N9)f(c>$k}yda2{zuJd;NRBaSJzm-N>)MnrH!{G~m
zbL>DFX@(xlSOGMUTXRwOq{*Q+oUB6l%X1%`vH~+CmbT4d&w;t^%N7w8aQJ~ZuKf~1
z6Rv|e3>mV~&66hQEI)=sub7{c<G<Ms){D(gE!DJuXq^6~$2tUIp9MVA!N*NoIptEy
zJk-DynHR1vt&?h4aUu3jv|87S)%P3+OkvpQ+S=kQtYik<Pdea_ZDz>fMUMiJ+*8jp
z>Xc_~MV`9qPIy&;tNRck$R5pLWp;md|4f*VzF3EKRpe_&cb#~gwUgMO@MZ43gZK>?
zs&t!eiK#OXD4t)9SI|J~glr~j+C_z71ntraEzZ+(MXn(TDILcrmsUiwxLa3e6TIih
zP2t2=c&Sd{a(NJ}pV_91&(>=_{N-X+6VZi4tF1^{YtDCxSFC=0NfpHwG+REl$@`Tz
zsT`#qzU!C%bWVyBWEjTbZgI%rejbwY;g1Sh$URvex?RegM`H&VCvKD1^+e--=_4>2
zLU%Jz(VJY!Z77?wXAZDM^7qX(0Rp}XALx5{Pi<ZFkj8KZ(Hee)H_CREqU!wX^xB`>
zTG*wMtT?VCI4i1Ck#)SeVUotSEN)rts%t$0<8MAl<3=LTzIg^4qkn?2;u!}z-06x(
z(6OuHZLt`apnR?O;2ji22TajEz}dwW;RC&#dJ>O;pJ3!ps=k21ODE(x=fG>tbuAc;
zq4a}h8)eiUI=IKaK>7m*my)8`W%6%&CMeymJ7K$DK#C`hL4osVjWcbnAS+?)$|_q~
zH%)a9iN5d+w%lFPeUGezLI?#c2I`5<6_kT~i!Q0=V3@bA0I3P}Uk3eE!6rLFT|M}^
z-!eI<7r=SdwZ=7GnFQZbG$O8?hWJU2uEKcMp`f2pO<V|1#O5bnV0FR!B7r4^x&{V8
z$k7L=@av&}g%K;TfV-X5#%kA>;(%znI^CLfrmTKl<iclIFE7tEWEG2_94J^HScV>d
zx)g}07{?_(tacJMXSDYk`&xZ<@nq7`q#yz>oHEEoSn8Y=_1Ljwfh7p0>5zfLP0wVo
zC5I9b@u}n$mE1yS2c<<8_jG2QCHJI}iDJ8CKo0_`s#pdIZLZ$ysVO+QH3E@HzS_#2
zgKZa}-$M{2Mqo12rH0_>re;|}+A1U~5+!<2qNYPffO}h#6Z}$-sInCSAMT6)-J?)H
zG{=h-A^1vLfJp9QdYJ}6>6V@cOw@Yh!?={H-hIY=d(RrK(s{C>RGO0If#zq2;F&g)
zI>N8{T!pnFp32L^bZV|L#pm~4WSIa460q_BO3_a^VQBTL=+vG4X;!7Kaj~|G2uG4M
ztLzjWexK04RJAWT&Md@6xv@*7hdu{!@Cs1u-hKFc4`8Ji5@roYJV00GB6?bG%Xg-Z
zZ<&|QlhnDuha>O`Q%_f+!a=2K6krrM@y5VPM~-IXS?jzrt3#r%n+QfuEctteajqWP
z=lfmAD1*t?-a96ua+@;6^L(_spOOeFlZxlYLV6oJmTyetG*r3LHZbY^1eAZ5NYvF5
zSsF_$u6h2gsu$^P(-G8xl=<!m4m2?);$DFphHzdq)euWG8*`Og00Yr$vGhy12zD5q
zNiS<&0dzw>4BWw307-OcJ3DM2IE<%k{>Ji9Z^b~_z6P+4lFv!oz>y3s*7;yzMyGwE
z%^K*w2F?_(;t^7Z+J39W2$Y9JOX+My0fyV@5M&C#WR(c6c^<Nxkta>+o^;VBNt?h}
zA))npG8Tyf(*V^;IGpWO&{N)$WXEKpb8~_IaIw@wOpQNRyM_Q&lqv>_BdBzqqlcfA
zR>KR$PZqa&7*Whh2+3!zfcyS5THx2wh`i383GJrQOr*&#8#p}cbRv{{$+sn25*(o|
z{SS&tWZQFd=NH_%=}sAUXEm8b)MF28R$2F^Y#->1kUhC{k{OV0F!QKrMxS#dz2Y$8
zSWQtQigTvb^jfrf78OY4E;mU`Zt_v|WT@!l*O@rIr46_h7C3v^6aFg{uv}Z?s8Px1
z>G(pn7(tp#{R@ik0#(=+8Z}yoPG`6q(Z6@w<4;E^ZWW%N9nU~qaV2zQF^ETinQCn4
zh{vYA2er<2{HZClJ1M1MmVqf{o8Kk5Ey4Gh<!FhkynSH<?o1^Q;cnv=0>YBE$R7*k
zT@f)4%(46Whx+WVcZJAWK7E&oW#>3L5fZ|1d?54i2PbaUPm7ZCaPS>pFhwa5W-o-K
zNOj;j;B{JJ#(zN60lCgs^Dv*FYV<)0n?kS+%&y_f<@EL`pf_Jb%F6vU4{qu#@|Lgr
z?cbes0RmM=>0R)%%CDs4^mgfQuvdaHyjN)p-svTjtM@Rirr99NkO^zLfQ{xQBnuf!
zI;=9_E5EQ&i<tpLfbTU~Zi+i;HSj9klRq%WMw8oRyO(id?aA;q+F=I*g(9RzDi;_%
z6C;Molwgv*vNUuOt`h|mzXDA6H?+fmNBVQR^2N%mmWjtR?fB~<nH-Q#^}-i<I^?;1
zjWXSrEFt*`f+Pg^K}c#=7X#0s^(L@C-O4v|I5(8Cc=;4TAs?6styqQGV0mXUH4=t|
z-<J1f&|A&E$MP#G8%acm?kl{eOrF64smyMhnNYYV^7utdK8H!pGEFqb32nLYcunzj
zX|i~=q6ez{w*^b-U*?|$GG$9ZM{U8KGhzzdPf#ojTfcgE+ZPs=1oG2Sp!u`U14g^0
zb6_(k)13i<#uF0SbJn9XFizH5Z(XgzpBSL)R8JM-Bse)Pw);=t?oZP;&AZO+oVSGE
zh)na1X%L|CGcAFEhgr-RR4{tCQ%^`2&<}rmTdRy1-GvWi)DF*IM?VD=Bz_d4An|@R
zENCSf_`?*GJ`y1x0y&sYUyE)_rL)XwJ>zBJXPu?AKT49mUmV?4-Z3Cdrp4}>OApt@
zVTI6vG04KPK0p+%Ykn8GwQT0K_r5dPp@k7FoYFg$EobGOUICNM-V2meLG^6OesM@7
zkX#KzI7xkH>5|Jzf2->s7$H#LG5QTU!dEk5jo*@ht0oD+L3*~`5BAZ6B%9LIS)!vh
zr7bwTkQK?LaYC|Uze!4-NF<UlE%ExIZBH0qUy`?@uGf3*B}Ag#+YB?px9mD%P|;MT
z?KK(zEDt^~(FA)6Z#|x!ei|0ipU8epcU-<l^dU#*MDlY4L+`Od<B2UnX#VZO?KAL_
z`1~`Jh8(nWWSq_M`wG;SqA_CBc4nrJ#N_ptxB$6TQ-k?aW%I-Ee94`N%i7gyQEl+E
z-4UC2h@L3^$a(B01z<HIe@bP5hO-b3<D0rFU`cSYtcBO|;yEOKyG+b&5FmE$cvZ=^
zx&X>zkNLOp%Yu^bmXM!``eN8<c*h6DIo2rmGbo;qQxe2}BQE9@$tXlvre4YW!<LVQ
zxcyTpk!azV=xO<d%yakktlWCtSTsVx90)?n`z4-c(^A<HA$J|Zzz6=;_b4KOUgryc
z*>&D(e8|i0He+nSx@&)6Q+`DI?*m?~`*>oYoNng;UAC{ASQNt~MOgH?E_L78YhXXW
z!25}<@pYnBRg?2&j%a=WKt0TaB41^mI7CxC?Mi1KhiHc&657MOrR*&HP^IciP`J}#
zw8u0TgIiO>F~o`}!vQ|wPyN<X)_Q95yAUz6fehg&Sh5qiKRK)ylwrp6yhUrs8JOk9
z8o1VqMrSO6Ud2mki0{UIh(hLa^>+T^I*eTiZ!FpPHCr$65xlHX@NfFm#?k5B*|0f<
zCxccp&IkSqSEfO#0(@)1mq4W$le~cC9b#mS)^s$~(1$b}8Ck)P#~yh{D-dqq(%+1Q
zND%i|zYL)Rf5X%sPN;XM2(8u+Y_y%Ptp8Gi!cWD*6zb(7jCZNe2$-uawdf@}A5!(@
z2A>vtImK7F)!ywkD=Pu`a2{T((b04seiGUjxsd#`CBrQimcUUa6nNk5Bz4=eUO$}=
z^j^}7vr6X;kjHF7r960aCzCO?`9?bW9@GtcH4b2Nd3~6WYaC^a9yLix`e?N*K#Q#b
zv`b?Y^g0lH#w@TWTYQVmZ)wtjqDqrqaCmD$+|j)I=uYbT?Woe^oEaC!bC>_y91Al>
zI&8%s=URYP?oXSW&g{BlrJ5uFVnCLHUqNn3(WsoB4`Zo8{Mil}lp$7*d!PWZWZH&2
zRy~zu9BVGuGZ0<Rj?}5)cE9}C#zg@}7aNDhsBu&hPXmdJRvxo*N%<)xb?^f>5Th<?
znu<AV#xV|7HAMbtX^xXps0v63P}5z1xiM22Es9f+;DP|u;`S{LQ+&$;-UflXC^KG4
zcW-Jd*Xfn%rvbkdvPD;L1VN*9Bq?zfw-(NB0-Di$N(Vg)q>*TKd4+ofz&g8I{tA>>
zj)iEgE%KU45)BXqO<+rpK8CkaDhpUnPJ`Zph_jjbvCM`_YD8gt3Jr^pfJS8=f_ZE+
zF9Ax9toQt;k{>uA-4$4KnZDtn+M)y(;ff^Dv7O<E2ab)hs<$wk!Ah70(k_25=;N1h
zyo@!ie&PvNwg)t99l`92V0#meV1c%Ztalm4W;kJ*mx!+LZrncK?<VqjBK#>x<>|9$
zAjB5`ehRRD%&bOHcvuT-l-wK2QaEpOS`Ln`St!`JeC&R`c#e|y#_B{LfeWhRIZ7pv
zQ+NNbs9={1wK=;haz`ve=Zl^Tr(AT(-}?D7y?KW(kq{PH$~!r=lX5=M?O3XmYEFfP
zorUO0@~l?T^)qUh94z)_F^os%XrQPz@%q>tU~a9D$Wm%@Ckb1ij|u?1I}<Q@u;Kd1
zY0P!6m#+OTgVK7<#AsTJ3oB!hBJr2^lhDQFtCuDRcE$FEA@aPn1a82)uh$n{rx}X^
z*!6~LEMOeCnhNahSvBS`_f!uoo|k|`tnE93O@sMUXNNf_cZgi--*<CujN%_F@O_2h
z%)GOOdbOE!`BJERK{CgSRxYhT-*Ldn3Zh@Rf-$n!Aj_q%YrFs^zd2yRK!kM(#L<KH
zerG$Mb@5U_hOheFnKaLAbgvq0As_@@lZ)Vhts&>?jg9pEErs0n?@2-Y4S87QMBE({
z!@SRRw_PFPFh9hPegz;LxqD2%@8Nk3q;0_(;uK@k;HF-1v+pzGc{$<+sRX*0k0<$n
zmqV{|C>UX&8X&UaNyRGAO7?u=cZ)(vgI~I|y&v3C8!7AWDIR%J1Ed8Q4`i_KCHsbK
zO#@N?dmAT#DF2nQ#MzT<tp`?VRiNx)s|<tNqAoPUTr^Pmdv)Jj0j`PcoPzoy(NDxZ
zeh0p<XBu}cU9dqqkE`lwfT#^=uCaT{OS@s1pLJ4--|8yZAh4;KM0xld>N9*4fk#|9
zk>Nmjm3&6#I44_h_zhxSK|*l1T7}XB?4a>}-wdg9eRvf<l3KSNHHCs44Pfq|GCwkl
zm3<%<a8`3H62^CwK4VWMTI9;MqwrPrG>xf{pLjh}tfUeWy#8VavreCQLm{%{Vo^VO
za8ONI_3OlgIe1a5bLo)7x$CwMt5wF+oX-sEt9pL+{EyC-gUVhO3_eXAdUr|)%%~fD
zE|?BH`%cT9Qes2WmGuQUBrQ*FH<YUtX8=Q^mmK^Qfnj{jzN*iVT?{85o$$;<(R5yD
zQyZY=AUxgUWuyA;fW8nJRy{o8i+Z~R;S~D#fzYMh3;Qw;%G#<nM*D6Zj0s2BK4nBY
zRTpUYq<gJPrHu}F62g5SH6(cl@ymG)zLHM5Lw^Im)uRM6?jEB&$g%>Ms`OK-3j7>_
zCrKp&%q$CH%bSPcyr%~iwg)t~8%Drh=46-iMs2`gn@((k02#%&FC8t0s20b40r|P%
z4(nc=KY5<%Sl;N~MA==eg(H<az5i+lYiT}B?wRp7ONId=_g{{OZHWG(2!qlOt7lfk
zo*D6M9hTMO5M|n|xr+>0si0iY)!$=lbNh8DyF}yzgHjMy{g@KLGX{U+o-uQD`Yv$<
z3fWPA5#LKz*fU!*9E`3F-ae?F;q+>3Avb&L7Z|?uPHihXKD|2nk<;ewO^!4{uN|#Z
z4MqLsyG4LSJ>Y=v9%0iI@y%VXABR}gC|Pd&tv4?e_=~sWo|{tvOHahvYAupvuf{U6
zbr*1>8BE<YHfsrj^2tH~vmwsbz)mhe!N;AJznY7pC#$I9GOM<Ys-Ku$@uW%+5Ju_l
zwQP5OD%~A&|6V}_E;<|bh$D^;Nq9^rq#zMl<u1Ax96PnkpccVGw%*_oSpWNhe9$d`
z8J2&?Rxpqz>7|AQi+tsllF$K2k|TibqGCi|nbixMjGty|GyZu_=;JQK`OLBKk){#3
z?br0OIO*Rqs0|%WPESrXz!)Co@vo5c0D-8Ym0A4?*OLAN+++erGw0K7kD43Xs^fca
zO8OFO$oxB0{Ite*l_gmgtYz&h)rzjG_7%XMSM5y3texM<5Cd)W2+ADR>mv0|wEPVZ
zoSywKe;ckp-O@6fF(P82=gS(y?niqs$BeB@{w%N<fI1##1`qy;H9O47d~4(4rvhq<
zF<J3@+a)OlR7?8gwQPs4&WfSyv7|Ejqj*>gLg?#XjE3kjH;qPL)~dLlZQ(;R;M{pX
z(n%zgahIY|E20<eh1dcwNrl2h<~sn9oNiRa8es-Q5$@2qCNZyAp8;o8JlRLYWkA3R
z4#HP(iSd<8()&d5WQ5_>x@SMbUdnzF%!w&)86?Y2#fvOQBM)aQHx<{XJ9wqu8VaMv
zR!NY|Y4}-?kF*dpt~2eJb?y1Sq?3B6v(S0I2O;ag54{ZUTX`J^G!T1Q*2%%&P7*LD
zi9Kx~%%ut1sAAQX15aqXv~PGb7`n3@G5vRxhARId-&X|L(`4v_dXJV#fjFaTlYit=
z?xQ0j|6MoYC9xC@dS;f^XvrO+I?_TDS7Z8eQ1<%vZ(U{Y<n`XLZ@UqD-Gv@|zlL`Z
zVpL00{|2cWj{QxS(Zq!mOTNx?L(aiGOQt>gDSHu&`ioPbW31<*9|G`5_6uI5+qu8m
zjQYTG*C)~lc4rHFQtU;W%q2}dr=ZutD5GOVNTx3jYJRg1_Y}1VTY=~}zCN(63dz-1
z#?*{n8DX2Qh{@^)0rji-a^~n#Zbe&eHc9n(>E9F~1nDlT$41o2vR?=Ct0$Ht1z}pF
zW!y3^+?g(lZBFhZmtEfII1-V6FSa?%JkcWXB)Pm&G|HtiQ+rJ)EA*`*xzM0aD7j#5
zt%Eqat^n3>WR&aN?Cl;+z{MSLD8@I7Wb4cXk-TnR-A=qeT#9An;U`|<->z7s55ecV
zK#Ck5@po0K{$#M!G+lv%$F;<u)0$W=0jDp4vEhMzZB_<Gn)to^fpEIRhQjZ`PFyho
zbtJj?!p1#(#vxDf*_I6Wn7jUY2~fR@POZ~`V!|k^l7R1<+Ao$HOhT*KDZZ2X^B?1=
zLO^P(C&XF;pX5Y_Gs<S)??sC#(`ku31Zkm%_7~x0SGIiLix{6m>B~i0L;48Jli&3l
ztwrC$VW{@2wg6N;<ok&;k;0_~D>a!j!t4ClEn}j;0v7y`?_vlB6PzB8Dmw;fL-m{&
zT3-QHm;{eVmAYKhhmc;WF|vm%%?Y%06P3esQNA%|ytXIn&ABym!Jnwnlp2gnaA_1|
z#)mt|_x~zN$$S)-=z7}55LrkpLOm#u66)xHCG1=N{=@A84l=;>*vqj9>YUqIRQbe;
z5BEe^@=2LH-8X4z))50WK_Z+{EfGj#xqM{9BXD3o7}n}pbT09}_<-V+rr3zD1j6{o
z_Er8FTWFO@B|mm&0Z<a~j!u(ZpV|{Q4MlRjb!)m|FEJI;xOfGrfpK~*dgW`+O9|*e
zI-pp+9N8{psSyTzkD-47@eVCyrklq8=C%InS0vNx7)OKJX{95*Bj{v|*cJp=(7pp^
zNwR<e>2JK>@KlH=4)%S4PtQgIM4n6%0CHzT`6;1OGK><&8-}xLEd)SY9ZLfIg$ifZ
z+$uW^b3kDiG)TVXjqVQ-YCOl}Os#R_f4o}iKI^3x8@!B5!ztGc=%>aw_DC{2)-rf<
zb>>1(9#xv~@hISfQASV(;?RcX6;aV|Bg%_Z1Jp>SBjAo^wRHTu=p<p>t^HVN(Kz2=
z79WkrXJ7qDL@|{yAU&GQ_kw_U7qT?%TQ8hzX~Pup6(%MiUN`d=CRt@d9XwGUZLh=6
zOu>bA4s{tvp-G(|^NHYSd%VzxINE}0lUF$Rvhe~G042h#m$vZ*6288?ec}IJi}^Ip
zMx^X=FXYnxC0;lV{ezT-!%QS>OtBB$+~PfH7p3qOpgTtyfeL(1vD65@z0SPoQj+2;
zxkUv%(y~K?`kK5&%ghD}4uDREYg^B;%aM-_f~YRbzPM_kh*kF_gCwf;qzs=%(`DPM
z+_hV_K5wzEjzb*Y1EJekeCR>2_=-sB8m68oBblmI9@8`%+ut>d`9kTT`gZ3XQNkY@
zZ_ft8$nWm36viccM-}gz(`MCdNLpS?JiQLRAO2>uojpjHC=9|}7e3`I=<_r&<03Qs
z$Wd#Z(NbiB{ej^EUwnWq;eTs?l?yTwf;yKt9Fk%M4nlPU&K+a$wi9HhWeHE;s&07$
zdfXs9xJXk9V-!A}A_dQbK6HOZ3jLG>P;XJ`AO1JC*Ai(nNI*Eae#uPGUXiK3meX8|
zk}55RsgGtz7O;NrQ6M+ab)$3GPNH>g07TC<qC`HNSvTeYC*MFrZk`_A4I!D;QaxfR
zFFX=h!}$wqn|svBYj4BJx{QH?vlM>(h>13Ec$R(RAj7)Xw^SwMkPJ+wicU=5Ct9P=
zzZY6tAm4Ca-iry3h<`#JmcJyF4WmT@2vcQ_y;(u1%>M2(l|+wB%y``>t5laND^?3b
z@VqMF{>^h5r!(ga^G(f>>+!30Vd3)f`@Jjd%2|=j)c%?O0Iq>Lk;eZCNiG!Am>uKh
z*YE0<xG2%)n}`4?yHL6;uC7Ja%J$?dO0}vg1{{uR0Z`215kIG(#%L#AuzD3oT230o
zIA|YN7{2-E7qx!VbYX7i$77{QXDFE7(a6hJSoBoX(93C|r|`&$MjV!;M(QH*>y`Cv
zk)=Iaa0}DH+~bg<fv35gNoTy}2d*~-u}MWeCIuY(Wsn5IAZ`lyyHadNti<*4tNNnz
zZBHw!?{R%NdcsJ9sWWi&WsqpkBW3W_&1`2`uj&jx5^-KYdwr~!n>t8%b>7Lbd+i%i
zwYsFIY=v}PSC9vqu{nIPTj1Vzj$+3;aL5xc0UrygGWG<&+Enb({D#lWBN3h=(uQIq
z?=WO=Nxf(Fq>_zty&0Rw0p(|GOJMynpLkBWJyO3}xCEnvT&hABx$lywk9#h)0A=lo
zeR_uvZfw7Hy7yt3Qne7+X;12Rvlsy%_(2rTR^d|oQCWUh;;V`Y*!?dN%P4^CJfBvF
z_wWX530#G^5%yrp;0uw#?Moe1gF}I|EOjdenkx^eI^iC@CU0&kUT2wV`*CR^vMB!b
z>&CV|E4Q|cI#yB`pxIaff8TYkl|7A6Iq10QE`?us+<VXsv4)2uTPD<gpjYD8rI@g{
zssrQ$X9+!WPHo2hr^FD;o%Z-rw0x2EkuA-UI1dSRTfDOnpy3OCFa87N7mhATWIivZ
zd2YDcI7X|0v9{+38=C!@`pr8&3v;v6$wF-_B0Pwlj|rdS+<>8?M}F1%WYAdof?)}6
zPGHDAn?jj~o*r60_7Z=E1jH{ni3N8x<>?VjU)nL$^OP&m&9q9Nl;#;WUDKoD&Zsv;
z&!Incq2rezmWY}KYybFXlzJmx97*xUb!3Z7ui4>Yic7{3ipN8ZnIaXo_?86RWO6&d
zCKnzEI^L%&K3^&HScmD`m+<=#VD0w37cxWJ*NJ%EghTikPjqD~$Pqz)bXOtX9Bh(b
z8lSjVjib&PJtNogh1%d^@lYc^_yvuJF)WzKNd-|9{%x;5`Tfv*5^6}mPlCxV4`P>d
zrBduqD!$h3lOu|BY9mpj9A|Q8$)r5z>9b18)}JptD|a-ZK3^qX;A%Hc3W7Uv>Xm1A
z&iw8-Cb{!*FkM*AfThH5O^N2I<E(*h1X~9(Rk~3l>+<S2EiuZIsnz)yH0)jpls+|g
zCwIcbInsuX(atq4sfM{p7f4BoqxlE^)_;M$s$LXDu!fJbG_Tt)ep@Wf^$H_BiVU1-
z3MeU%&!nq%qyHPRGp*JLHS?1x?O0{=-ZGr99s-|kj!fPbQxG+iNxLq2E~dgeY3Jce
z8*p!ZEIV>Bg7c#iP<?yeGl8IgQG&=;t>M}}020bUmb65m5H!&QE5jh%5h+uZ3Fueg
zR~T}FJrl}Xf1E42J-BUIWav;bms7dL*rMlRtCF?w6zb;Ty*Z9@yO-~D=X`7UDgJ(N
zl65DsEztP~EpYV26TX$XSF=r1PDG0SY6zNyl}`}bzH@q4Mleg#WqWEcsB=JYZ)zHi
z!O!<2Nx((<i8OV&0HaNJ6#P4pFjW&U^5*g}OI0ZXZcRBNm$&UrS4FBR7c7v#fu7AT
zlc!R$ySH>mN@kq3XYf;kz`c3yhUqdvGamg`EtP0m#)FY|Ox=vl6aI_~o_eMFCAFfd
zwagKPNOtU^F<XzgoT(5132IN^Sd@cZu;@G)j`x1a%tYX8S3Nrp!P$ZpULgq5d1L`b
z-1urKpg5>vS}~KDiVO{ggzHRgCfIHq&xvEdNVY0LY6W5aE>upq4JWF<Q0sVAtjU9r
zJ<GIB_6!J^fTOa0Kbtjm1>f-heI^}B{AfN4(3@zAF%Bu5Fu&SgLv&Xn`kHJ}*f4RC
z@x?R*J+NcDMgTWLgiOC^n`q4)EA`+LPvCzzJiCSaZnrj-x_sVsVwWZzWYvc?M~Q)6
zZI10UfiFw#h6&R_tk<}4_#iA4*8Sz@(C*fhc8%5&mlf}|pCK2~#bJ|oyc-4H_vIL6
z70`CVStaJQm^G7s+|TT$`9YHjA3jfDk6Az;a_1B6&pTu6{oB{lp4=*A4oY&bE*0?J
z>9zyIsZ_I3kR%?sN}cyDZ*8N#aP6puQcStn8|$N<bmZOr)XVODNaaHgvuE01Yi3vv
zZ>GSUt92W;K$0a<L+n^Z9FE)m8OkU259z357z;)3Bv=Si?$5_U2J1O|&{XTCfPT<8
z#{96Q&d*sR&=#_qW#qeq_uqUQ;W)oDEYr-$BVf{1?PT6({<`}h)o1%HSVw8_dXh~3
zRVCMyVe(Iy3}#`>&A8+#tA$GHkh2`qKZGd%p5ln<?E|fT?n=wb@op<trqSl)rMz%n
zEx%d*uwIJ7*;#n_7<M(o-3!gII$ffB6uQ<3u(BCy5d32KU4Af^taV3J<L97%EwBrf
z8uZRAfo97P3uDasf-4)Wr7w#L6aDLn8?8v$xR%xB`SZmO>cIAbVb&$1%W9XXO7bT9
zUAxHwuQd{b*t2w0go5$TdIatOd*z(1*nMW2y9zi5%-(Zx3L(q1Z<KGylN}LMg4i;z
zVEyHbpO@q1u{6VbJEVb(9*}b{gK_!EhtXg9LFG-dYuO`kY>DD2P%cw9-4Pd@ni^*7
z28}ddjA7h$f7E68eKCd%-cjsG=>EVWZFK6ZACT;*<Pj6+K_-v~{JH4ld6O*BXn5H~
zq(Amakrltoy^y<7f#jL%mv>tvAdID<8P+p@X+!Gq9U_(_{zBuG?(V!_b*O9pC8mgr
z@L}mqp^|_VC{fTR93mk|dCai(Nr^7qC?agUmRF7mow-amQybC%kBNiRSe3dq9cIfz
z^htMBqtDnV1iu^lP;V!+<-EWM@RswaA<{9|P;57iR$U2qS%>C%6AOrNMw}GKkq3k_
z_kJ6B$dRI#$G~$VvKD>$<my%OVlFW{r--?(@pjfJ_@AW@;zLQhB*ZGsv!`TV#86B{
zfPVItav}qcIhTC3TS?M@YE5NG^lIT3RT{Bouj)Uu?}-`2W>k7jj$J;Sr6EfFyLC5^
zxLe#{`4^ZNV)?i?KCme(YRUN}x;|3A2>^-2A!@c$dd5;XP3nU2w0T<cZk&*!j}}lm
zgQ^cWj8c_YJeH#BxT1Oex#cC(F0}3AAp6@1+eL+->CPuo9}QKncd_ojMGmP1P4D-H
zc>3H2Ud6d!(u5vTgcY%5Z!!hudD#zB99+7f7{GBv>r^@Ql5IuXFI;M8WZfR`7@NKz
zulMR6@yVi|LvyXs%Blz#Pt?;vHxI3fO)Hz*ZSJq?)t|Epy07BY2IwTK3UV_ft;T&#
zg~^W+x@YUhUPU)JAPX8d=r{J~(eZqFO3!3KJY4v%W98ykRLGbwA})46D5)3`(jEm+
zsZvqx1122uq$0Nk<<VXiy!OQ4s$I4rpyx!THQn8~j@tsFG;Brfdh<r0a}*!7W)+c?
za+OQ-+per_g)&ZQxgP4mh0ax{V{sjV7gzO*a7#QK;J!EINI?8iG2CyO)<U^MySmeJ
z6kE7MMip<8aNLt25w?-!b9=idqGvnY0z>-1pJfd6>P)j+2Z8lHwOLM7CTB~FO8!)O
z-yqY<PZLMXl4w--l~EJ!QnYI|UQtROuQ5KishzJPTj~k29;NRlco_y`O0&2p$X(;l
zC$>y=QVkU~42Y#4crNM**lU7pKb_eaErKyL2<wJ7G{U#B=&GJ30Thg<Gh+L~d`lY}
zopNACA@_07mV|BDxx0bC#q`eYNf_GzKca3qcJ)qft%k`hvj;l{RO95UogZ(y+eV#V
z43so{`VL}N*cN2}?uuk2i}Maz8zi3h1Awq;s*!Omn>NShM4|YOxC{CXv%94m_Nxh2
z!%ln^TLj2`7PI?BFftw$>=Tw6+p8y?PviEi7UB|IochMOyiPf&E|@v>^EelW*}#)(
zW@RS8jf?~oQ&Od@M(Ee|$*8TALZQYLR3iCxVG)-R``-X0N=Omv9K5STz_52EO?4kE
z$QM&73f1>IARz|Pb0D!G=@^2~NBVwl@gYNcTMe^SBTGn7($Y9{j4kyZl;r6<LnM*-
zt*ZqnyWFL7k{-c&-tYx0Uk;Lu7+y(jZi~%>%(b22v2pIifi!HhU;&+RG0(;qyudx)
z4d?d#9@QK=$Y;2oK^@5C;$%4iFEm^kcM*MT<NJ(x`l-sXRTAiMTT)Hgq$N(CW$L{l
zsD=yKXb`j*lcaE<ajgXjIuGxq)s!^8>8S%|P1PblNiGZ*Q+X-D<l?5^@clFl*Q=Al
z9zxUXl%uli>}ZQ*x$P!-FHP9MLeDG`kTDxrjM<Wi@dG+ce}+t{L-@PoaJ5Y$RI_vE
z&!h3(@RefUqq18dpe(|#1VQ(*`+!y0%^if@Tj@bU)nb|O-mB}u$wYHuf@0X_6_O4R
zw5Kn8=Y;TJl6k+6X2AkMxK2<8$*9L;hAEXwO>TOMU44>mbo+W>(2NWuH{nYgW=P*u
zmBqXg1%UAT*ayk|W?P1E@i}AWRHD{apcB0w#{fj1SF6(slFH_YJv4me`+PNuy(Pa6
zB2Do;a67;0H=IpPFqnnQ7)HB!g|0h{qq)Z;eX*Fe6F>_tEvjH>;XR@>(h{E1d{Igi
z+ogEjj!<jx8Tsa2RE;^zl(ADK4ug#PcYTgE*x0ZUx{sKw^uG*=Ftqpm*ULu?iz@Rr
zA$%mNy{2b}Ttf(DF<@s$;V-#HdP)me1WFzrE}9SyuBVUucf;@jISDZ~)2!UHkMxwZ
zG6wyGp;$Br<D7eG?)!f$K+&t^oUh~uGxW2`M9E-zU!1a`)VH)IisREoqT6XAGy^Pk
zI}CHup)sytt87K84g#MTzi<!(IsqeWHcMmlG7s6qo%Mo>b7>p?h5O^@tL>1z&e-O5
z1Od^a<{z}3e=absqHb7ljfzqrK%X@PcZCmOv84Am-W$Er)8b~QI&PW#ZOaY#5rz=-
z|FHMgL2-58wrJxH!QCxr@IY_~H16*1?(PJ4C%6;b-Q5Z9?iQTjx0By@?ss0*c~$Se
z|6bLbReP<m=91pCSMRQ_-eZqxmWzJ5eln!^4W(GS>Av^@u6R<BwT)KCAxz6SQo#CM
zN2JkR2m<1J%ubq>y(Nis7`oPr<MRcke;Eqp6K;E*+?|KKtil(h3hi#m7bj=%3B=3_
zk}s4#aqXi$rHvdb$pzqUh{9O@<c6gW=}II%r|kL^CL!M~8}%X@ETeE&Mdhw2bZ`<l
z$}@d`z?3T^tWbC5g)SmNY3{+;Algpw!4&-V0>+fQ?@q{*uq+6xC>mJk5T;CT%Xfg$
z?C&UfF$b<;MLQhAscS>8=Y0Tb_LpVx#F??xYp_Q{M|$y;!hOn1mZx7gS!;m*CCvuu
zkNdDa|4VWV9XaQhrWiY*fb&wT-ciO0B}josJ=HawHs_~s;#cMSuVMs36^fsIr>>2;
zwwKz!Z_FIrjiJ8maE`7z>U^}o6|IXX%R1TENYeetd55RK8<2c~B)bih9Ne8~NMWLc
zRrA8d@*}QrTAf)&lTn`{Qv2{*5|M{IKjh{>I-%h}s2ll9tdu^1kr?_s!_Y5`mgCf!
zGsM-wyJYBwpe!$rZH(or?rc_13GygN^Ty+J#Qov-H#D6v<d<5&Mia%$PZ~{rOjKiw
zz+)8Dut-?DPs}iyQA_XC5@w?0=EHNOxz*^L(YA)s?_AXt3vzL1xJoU~!v$`zW{4by
zh;B^Av48?KR?1h`-xBzBUPTu-O;=5c_gt$UM<8K`mf(uXh>V3*LMxrCpDFnrP!Wkl
z`JP6*+kR7*8Hmf#8R&ufUaFrqk~f$?bAs1E)3x~hAo2=GL$Ze(cQnaY8M!=cf=eT*
z2tZek6EgSUf0%fKRByuz(R9z5Z8JJd8(D;d_4{q7S$n}b_SKl;HhqP6uPedCwzyEE
zJwvK;6@$xl?GB+J^qNSyoSvMOBLIj|N@jl|i6A;C0HJ2-1}B{j`?YGW6YJw59g3-P
zUK|DVoF7;Oqj_wf#CRDRPUGa%io+L20-0uipnMnEQ3ezf8$7gg^h_}AmY#LUm))t{
zkrOz`w_nbJ)#?K=@Nf9m{*U$Wd=<ZJ8H7y&T3=L_#8gyTB$bq_-b?&AhCMnK!FIVa
z>r!N#(iv>vC?=$Wln|1ueHhz0#{nlax-PS)IWjBw`3l&LQ8V+|2QSB4fk~t0{XGY+
zy&8~tWi%gxrHt13b7y}K$#BT#y#1zqKCX+*c10--x-u5)Jyv-+WgxMNUiP$9TM$qW
zphE$Ez*Cp;^|A1SE-Bdnu7dg3F!C1MH~QsNGmUT6cxH|EcrRrH@beQ;_nYq#d<<Fw
zHikVKxvDs%wl~8;Kd`QN9(XbUj;{`O;#<h=^(a>PZv4=5Ty^{FG1K$R99dXM3!;0R
zpkgXriEYco`!2tNvBgf%wo?(O<pq0pugH)G`jooWQhYL9@E}3*V*PoMnEcd`xH9gq
zWQ8>WS%Y*ui&4L>8(Y@XL4EUugW7}|+@s*|%A-~6X(>1ST0`iujxW^=rAZtandQ?q
zQn6ZH?^_az*k}G$F|>jAi0rd+GGp!9*>r+gmuO%>dok1-)CJA(I}>w{?y4eo=~&O+
z{FB9A)LaPEc((Ud>W_8!eH<#)x%ydC+|ge5dTI5@x@W{6_}-4IRcv|B3>;bp5PcGr
zA_!w?mnv5m9YeGd$81h-s-(n3M~L_emTpzB&5PG0?zC%+RT-c=dkj@^rDD%)kE;Z@
zwDuL~B+vo#_r4`Mnm>d9*IGhuz*2%ckH9xgQE_ED(Fy(4TrsWzRGM-D`Gm-?&|4j$
z=`hCpL9S7kSm=`UT*zJ7GA>w&t4c%cMP($K*`24-W?GJY5d}IWM@=?t8t22=nvSBr
zDDkcI1}e+Gt#a)*O&ggH=nCW4?H{|6_<l~KhTL<Zf9KSejrb)(t!jD74(ob4z8Bvg
z9l^xjC(Y`jg+~!ForzqhYvA}Iz4N*5v05ZKSu@M>;h9~3FYxq)Iys6l(89<T;jomW
z$IXisA;19U{F)Zl7+P23)Rifz0{?EaB{oJsPf0MOJuA798X2wJBBC-c2_9c-`rv+E
zJkEu}v(6|>o&So14I$rR!g+VoCym<82#&yj4N>9}+5|1R`@!69X2*P4#6=F##8OUp
zV(DrtO`w4_5pq*Y^y?c<bUR|r{JW-ozqN*GrN?RX(p{x;BCWPEt~LY$PCbN}xQCFr
zc}v|-IcK>`b<OC0y)vSA{GVAB$`XxrXapHM9mGJ~=v7?y8G>(^BqzJ_j@x#{!x}m!
zA7UC#dkkIho@*1|3%4dr>*~3!?;)(?WKo0p#QXAz*l96giLa-GT^HJ7=D|F0Vr%yf
zW--UOG((oUFs(#==jp!H^U&XYUe0_?wz&~LGhA6ZihmVW?6!5<3SAEU*45@T>n(ji
zy!K#oJXV&Ru)}mCnsxK;KznzjD52j<=T$Z|W5H8+UVOx9sv#h>J<A8XuUr><Gl9%%
z^@9O5TRBR?MWT)D%xaW~;23Y7XKge$Usr0aL`t$QUP7^muEs2lyC7yWQX@6Zo`ML9
z&6cZBbv~AF7InV&T0ndld3Weu<A!GMa~ITzGTQEMmr_fz+=3QIS~^$A-+?$id*Yo)
zAEty2=Lw87GcGz(iD7Vv7!{jc6C&+D>2inp?vvzX;@m;%rDV&Es`bhz$ew#YuJ6?N
zSz@}+c5s$Bt47r3NTW~4I#n)d-nLaWB^CjyNv3;pu6Q+P1AO^9^ogwZC0Bi8%mA7~
zW#4Bn_+PoELv6k%YDjDeh%e4fzj*EIQ7(#j^&BGnQlBRH93`wb96j^9^5+kqjbXc*
zXon`g`%McxybYyg%*xMX=5^?Gqzj{bpIgN9AAPzUQJ1Bz<|+W=!<=3=#+5lHVg85n
zUR1R{%=-gr@mj<!+jn2;=HXCoV%K+mU9T8zQVt2bP8fD}-y(n8QbhrNP0#kJOp7XD
z6)cV8#@_cOZg<%}l)&xi8tt?bK7Fr!FS4D;Q&kiPTlU+&4i#+6Vrf++IIT!n)$(pv
zbDROxnEBAp@8D8-v$3Zsnb*?ai?NbhvXhenF@3^&LfdC>)Ot-WqF3-6px|?Avrlk6
ztwOJ#5To($Ec5w$N6<c%Hfc<0^bFh$NURyNZiO}zC}l4(pKHF)j+REt>o!h1q4!i`
zPXLm4>$>(6C$?Z@i6mtNA>bgsY7q`P60)$z#3pNuoX*)0)5R<Ph8-t1N|~DZ-N&}D
zPrk<zQC8}#VB+wF7ws8ZwI*D1qmALFK*c+z^nfaI=>;ECT>N6QMuw_!Gs<Us(tlFA
zamRmZv45>@l8L7|4*q)ixhc_EW!qm@TlpDMb|q>)Hcy#Fw~JC;@v<WfZ4}wQ)12j+
z+$J4Y?W^$GO2g3Bka@t!8?+h}8>P|@<yvHoa5rQz|H<ZGkQ2mC_9gsV6MC(`#&+k|
z+f|b3ehIfS>T#W|3CIWMYUBDJOb+30qF~EM2gkx+Y!)-mR)ms)zpi<HLe2;qpo7ez
z>M^xd=W&&IGp+z9kX7Mnv5#u$OgW$<J2Vr7Fy_L5#f2Og;~ZbD>L0bZyZ97a{@c+X
zK6P7h&Yr&&W9ljvJtj)1$n=?_ng;hr>c;&5cDu9(@UEiqOL-roQUX=whj~;?3r`O0
zs3=&zF_-monuT`rd-tG}*5J#0GjBS=uK5!#GRQ#lF4I98{Q`}+JeU&4_6#7q+TAxc
z)FpKVS5%3M`R=?EifRa{F$UjjKT{`3o9B&)PgZ^)+U8d4-6o|SraCWx6&a}MzMYMM
z^GYM%&4nQ<&Ktk;T}?mo>E=6!hMa-@QcEgqa)QO1JCNUkpuDJvHPCtYQKfdLVmG#H
zm)q?wj_K*~z89g7?o+#-%AmAs-%kVmTjW&H(F0d_t3bg#3(Un21`ACL(@TCrjM={*
zK1*1#WY;lVX4+~2HI(rN&sLCW_Qws<uSIHqZ5T3$_WGu>H%yhVMn7Djaa$c<6?I6&
zGk9iHz_&fS#-fb_)^}I?PNP_CHkPg(>(v-Kdw?jD=imtt21AK?Gx4qt#z-v&(M)uN
zP`>64(%W`$8bxR2<+nY#zfD(U!zbI5l$MY$t^j?m^1sbETRpBnE*@3csMlmrb3k$k
zxo)RwwCWkB42HCaX`>%*$qy>yKlc?0F?bPbzF0~q$!S!L$rzOsm>53mEN#=*-R}l;
z#k`b~aSVM>P4NgJ7ZR_hb7PzKM^M!MV&9UgHQnTN!xLNo#an^dg=lH6fI_62@Ck_d
zqZ~p!1n;fpo65)1c<GuYZB^|g(`rGkLaC)7q<D(;+3$Ky?ATWKAHyllE3HpGT@eh!
z6q4xU%rzeDUtaLxi8y}=bc?oj6Od-A+R*K7S|^9?Sgb`{3`}ur#V7#Ei_g_uFn_)-
z)<j`Y1KVFNS&8lW@OMBA;By`<?~gj6-zcv{Q84&zM?I#-`$>boB#<&sJd$;?`p^`p
z)I3XnZS57IU}LJEgU`g^U!&t1+B_v{&74fV6BV)_vip2rgotPL-YaDpCl>ppsj2CI
z@3E0pEXbd%^GUh<nmaY<+txD>w})(6d(Sb+*YP@TQktr+<+YEGnDfzS1#MUtQK-8p
zthbW%&Cqgp9+T}*LwV!px{zrZH;^*2gCuWb8XF5?bgWTRcED#4DM!2Hb=n)c%pk0l
zy2@(E%hFU*i28Q+{lSuc(jdi>^Wr&F?Pq1C|Cpio#;m;4&<-GYND9I&fjF%5WLeia
zpcTMFTV<o8tIyjwdfGZ};#$Ugm^TG(b}KV!6DarjC$H~Wy?ei7t>A_^=t0zs=gC)$
zG<_pW!+9(i==XOI0i-DbY@73-&V50;L{`ns!f_Vo6&GzDN!^@XF;+byH0ksOOIfoG
zXO)qi<;WPRe41+-1y=(e=H{H-7{WN6K5)K|7&0hO3k3bWV)ooUMk+*WCBEM)rNn;D
zf`0WPzODrwu<XfqWNG_^<p!1o1ADkj+<U_!KC>B`>k&4DOMH@a0?PIa$a=hx<Pvqi
z`+>!5z-+G$)b!PJd6}LT0q^w0c9u&~;R@DWk!=a76ovKbDv<-KpB$stHAO`seSAIy
z$WclmUL@l6$qaIPpd+)%Zy{?DV4pG^dK=AUu$TjWI=Q4lD2As5LkRfA=uI-b+SybP
zlj;{K<I6t*oh-lo+OPE=CE%T^tzEC2I%`)T5M_}ga8dPWw7SUKA~qSLM{#4=uKRjI
zcXrlqX&C&~Y8y_<1@vDcmeLf&li%`W2A-@_Ar~J{Mv&N-!*7CR<^|(<d(9o+a@)BL
zAEeUcEQA!Fx9KH!#g7!r6HR*&`M>ewi2qDW-2MPQB1&Xu89BmK1ougQIC4JDmgT3G
z(abZysPUA1#V@0rw*3!%MrvZBez7^BcPI#nTjCRh6?UIr`G?g@kfa{PRNoo!IM0-+
zM1y-fdCa9gVa9pc0l_^@x_<g<Rev;-CmeAwrPne}b*E(enHs`gJ77>w>*OYWuU}V$
z{JMmqnjfiQy|rbz7}{`V9kT1zQ_dayf%}EBD0)7Y!O<$S4RyTtvr#3xSe{zz!L4BE
z8NX-KqYe@-Fdeh8OP$0~C)jAaDxxizHUe&EKBz66ljVtov%#z`U&WV$nT3sujUDiR
zt^Vli{n73N2bJJ|RTUMuI6>%NRl+|b{-{ZU{p|$@3G@9K`A45m26TV}pa38_J^&d=
z6B6PdzbdE=`H%k#$p1%a@W1o{q5rl300odA=ASVdAdK*j-vNa2K|M&IH9SC=5VYo>
zR}TT<KSm8Y{;Wm!Pc4f5ADuw+f7+nxZ+{u6{-YykU=IGbM*qi8@K4SBPu-*WA00tK
zMPYGqkk7=~(b(u;fkFTrXu1EWDZc!f@el3*VTgb5A9ce2No5mK>0gyiL=gV(Dw|;7
z|50(o0QtfH!QmvJg+TVd^)o^EPo(cl?^}Qm5~AXw0FWLh$OUq~uL6VtNO157@UTb-
z@CeArNGRwenCNI|=+p#6*d&ZJ%uI|l4D_sDB=}f4L_gCr2&f8*O35fFDzNZr=xfO7
zNysb6{#gVJ85tQJ6`cwblS-DIfnE0h*xtJVsIY(zzzYNz82}s=3<4GGy&pgfI!`FD
zzxF4jKL!%wgoJ{Ifd!p3Xh6dU05})~1UMuF6ci*RsMq_CP$wiR6dEbBAT+wXJ`9;X
z28(}OE-blFO%JBR&r1qc1BU=Ocr0ujTs%rD>W?(EZ0sDLIk~<Fe-#l0iit}oDk-a|
zs;O%j8X23InweWTIyt+zy19D<1_gf$2@MO6Pe@EkPDxEm&&w|;EGjN3{ZU(2-_Y39
z+|t_H*FP{gG(0joGdnlGu(-6mvc0prw|{VWbbNAkeRF$v|M2_q=}%l>pl$yz`yb;%
z1;qsp2?+rS^CvDaaMwS9qe4QFGDD*Y%ERc}qm!}t!(s@<<<|7Tk+UjXVj4L7gvX*_
z+ortw6WZU%{+|UF@c$~Z{~g%BajgIlAwbtODg-KkA8<2UvTg|08zU&+us`OU)`d)q
zhJzSuXU@g@qb1v3%~PD*`<UQWnl<{iO`7)W4Chy<v}gbX#Z2?r=kRz^^3Gx9v>0Pt
zs>ZEpz4|cI`Ge&w70CT4amF9X$NT1&K#Qy#<Ee$rw&+0zvy{Tm<K+I{##TN_V0AGQ
zs1>8bL(k#Td>8K8U7jr?d)QnR_#e>*C#q~xsDG=@-Gf)AEBFYRkp&>Jpl}GbiawWR
z$^M3~qAH~b;Wup>K5n)dI#e>vvP@f1k5=y@J^KiFf=`=2YQz(nI;X4JW~zFw2`9;V
z-4G3HV)dG6@I{=LF6ODmxRV81Ju5jja$`vk7G`&DK1`6d%weYy#(LBYFv0P6{(dl2
zIddBMRM?vt%H^(^7d}HPr4dAD&xU4!awC-8hTqz9I-nHrWN+8vJleEo-$Rs?TecxW
z^KGy%LQ>z)x6?CyDt?8_of_#>M!BeCt}l*Pn!2^om61MQh5x(_>@nS_$(m%v4*U5B
z6TieLs+N!s5Rn&&M@#F|MzFLa+or;NiqL^4RMAMYsM;lz0Amrq3$joB@<GN>NR$BI
z9W7o=YB|GREVKx{+9jZPHCNnNIBJLL$Z_?BRb@+#6qbU%xMT|BIy~nKSceP{GtV2=
zp1GvLj>I>ea}lQIgtxSp#N%sM62Za|K@l%zE^7}iNnV{Ne8glZ3~eMaxjqgA;mwnx
z%#Ou?1dFAD<Zl}Wp0tX<Q7-ieK;L49178FD82GBYEqI#ip&h|4QOnSFcp17wvTVgi
z!xPKm%k#?2Qi@V<;}6#<RAPG{-vQF?fxitmez0jMrN=B+<fV%(ZL2YA@}<5tAnORL
zFbh||kw4BnR=w^%E-LZ|XHjm%x|g2fQoJb(94B|j8rlInBum2OYz+*zzmI)4w5JGf
zqIcZS3b{VAgx{I*6pvIzt+(OEyPcn4xftDeLdP7JI9+-m7G5cd$TIYU7O(s+{f&WK
zLh=z+<6_I_)b%S-gRIu&?TXt?jv+&*@0R4<U19v5g@<*!B#F45cAMH3(>s8yKET!>
zL4>YsC|$+H#nq<VBfX-nL&nNR^-YcILB8!#5vhH*9L;wVI`;;#uBdzQp`^g*lZH!^
z<Kg<Fyl-jXzOLiiLUIcFirE9UBtCA;s2^fR79D}w22t{?&qopKj}1^5O>>ehYKX4I
zezc><sud6UO2p@!r77ZY;}7;Z_lJ)=MVuBhEA#|A;ndcAfEkXZ*qU4L%3U$P>lrQ1
zvo8vb#UHgBtB0(znn%jioC!@owaFcH4#&~=(^7WY<N3Psq=(<gx$k0K24Ysff%Vu{
zD7tHiu1!vEZrDhZKt82Yt5cehNH&{76mp4Qn13}r78G1tq%)3aCVB@{kXjKX0s=d@
z!jb1TN}w-n=DusUhU>B+r($H8^U_!V7^ajBx}x~4YNB!YYcS>+EsRun&C5b7D5|+3
z$aq-5qPmTg9M&aJbJ3s`pka&GISmW}dd}=3DdrUnMFqNY6U0$!QY-<OzO*U|N>MqU
z{+iD)mU&#^Tak;3RRe`O=5`iXkx-NK=s1(2_LJL7hg~<7x|A}w7;hLEM5&m85iO#X
zNo0c0JyaB2xG)Vi=24c2!MjSx>zV}VyO(_#1Rk@yS!$EYp{0p9L^XzAIGE-u=^2WN
z3`NirUPMGKM{ZwTEM35s;<UA^!WM^dJqG0srKWrHu;Kzra49mt)LKKr&a7FIyVpie
zisAV|Z%MF2(@OCAjmd$F{W1`qAHD$CU}?9{#?D~#EDvRpU<7<qFNSyrRH^H+WR#N3
zWpeK%kfpm2hM`?-e_<|NRA?hSDU#KfB-*6~_YGC~StW1oLXF{+-Z0*%p`8BJ$6b<}
zc<jXzwE_R&XwL_;cqi~%txPY$n<;2B)Jm4v8zgQb*Obz+Y0Y9M+^ILx-T@Hdw(+d3
zK#EuMadF%UR`w|Ik&9m^Y;hzX^Y=AAqtBrX=8qKOmTOw&$@ROw(zwp4-4!FcvUA{)
zcvzyDt>q>7=Hx)hN%N)@Ni$(l1r&2l@cA)fxaQL>`8c%!eHXqrBd3<)lGU8?OC&G^
zPMyk?nsUkw9cv`xA(xf_4+L$W+qc?2Kq<)DvqE(~PE~x}WzhD!RGv!hGD~tHk`#3#
zn*X`{n@%)Jeu2wI(%Dr1`VF(poI&cmbpNtod{s}y@u)1l>t6GB{w90SHg{}D_%8~-
zqb5pRax((2W;y1VQ@O?(%Vu{Wb4kN}xJXqIu2H;!BRY{b)~S7_;hcQ^w!i^q^eoHT
zg?4tLoG9nwlIX4LVbSS#z?NkUnWTF<LZXo|C+Rm>b{VhP_Sk(G4E1OXx>zP}ASQZu
zeoh(3vskyDFJ7|PHS6!i;xlqiouSXHQX_8n>4M}X-BcCh8F)X&rWV@MZ`~;k-A4Bc
zLwqb)=7MHSn$IllPDO~La4`BAzK}o9@t?z6<MzNz&uTDzZdc&*#3DrGe6>VUX(dL@
zO^}&2A&4q3zOD3v*l4IK6h$!5VV+<+&oS&emh_KK%E;^?ZR>!d(yT5<gDGTd5a>3_
zlIHxhkO}!2o5iZ>o4DprjG9+E$v4z<ErD6~Qf2uJG#21YW~w%BxBrS?U!hYvaWLN|
zZ2E<1DAQ=3e>|__N(0qpR9wSAt5kfMvtfKUQR?xOZErSXqro8%?R#c`2tF&3AL4w{
ztnG$V(CTnJ=V%!XWQ>ldYVNUunx-1rSDun7_|X=whhi<U_(3eB4TqRyQJj(6Cj!NN
z@#Tc6r9+ZS;UM)-wu#`Zp@~_1#V@q`A>ZiFY+2o)x+mpv?0~-)8anp-<31(#eAwML
z#zp#lTY6D`u*CBi>fK#BXy^N?p1<v4aA4&rQdl63$50&<i8IfiiixK6h^PRCi0h+7
z4i+NigV9)Fi#a)h!2vT7H^qChIs%WyK#$KKMDFsW;9*9$W)Sf`n9?B1kow?|tAuZY
z-rb#;x_Hz+y8_Nb&lJ_4YCE>TZl@T<)sEj4JZKW1BD;?&sp5#mWtN`t{2TcVHWw*K
z43pbiT2I#UHQ4z;lciqvx|%vW_w8H#+X%_nq+=6_-W}1MGg}!#n-ohL*x)`j4zH)O
zs8;$d(xi&-2hF>0a8hYUc2Il|67^S@@nTmE9UGfT;af3=C$#(b@oetFccHyBd+3>6
zJG32>Ek-X=GX-S<$}rdLt>#s(N}RGOqV8|Sh1%vR&<M@<O_$Y2eRFsPV2ZI~e1jbl
z3x_gSgyqSqHQR|Vh0V4lyipDso5410E#ed-HbZ-fDAP}PVU^nQWx?~iHIukTZ;$*M
zvdpi*eGU0z&Ec^ui(4H+WWSf8s{uoLpo?rBlQh%ZIJ9{^DXQMj3CRI!9Y7I;QuG}a
z7=dD5O-pvFz6(+FPL*J;P8V^T%FsH)$Xk-dcY_15`4;HiUb!ws#6W%_=9kkfW3tvR
z1oH?_sD4)#{={Zo2C>5vU&f>+>jLwdY8aVF(m}7D=8XHpu9^A@la~>Nn#0D0CRK+=
zm+BEZLr(b&`1z3D^!mU<u^s9h*S$CO%I`9g*7)jk)?YP+nDnE?6{j8F+{=8tgjC!}
zlhWGSoQ_v7F*EW_a~v}ogSV?1)+dPabeIuvMrm-@cwgxXBKlgjxM$BG5C)IoxI-#E
zeK0YXl6hUvndyLpw{HAr!}(9qzVOo=LH+SsTHF^$TsCI$8f=UvrpL^hW{Zn1xyVY7
z{;esI*Ilu%f@SXji!k-{4H`-2Nv+*Z-wF|TNIFPYKdfsp#PyfDH^`XD%7Rz~mNI&K
zE-qEu9gMxo#IVjH3;O#9Sq#m1noc(vpTmcg%c=eFPHU~f_$j+H6v2^$ut-NiHYP2f
z%c!59^>&N-UTGVWbM4t%DeTEjLsYfSE$|Marmco>NSl(1&G}tfja<QEe1|H`>IU`Y
z395yb9-9nre#Eb8O`!uF1fo)GrU65<$8sy0N$`xr=IDWea~|Og<L!M0nx(tMJW_<J
zuX+$oB~QMe3dK@X6XNh7oniLqTi6ZMuvp5FI&bw@`m#`TkCls4HMB&Vm4)nZd=WhG
zl77)auSB=jWhtW9(MpBv^W`^lz8v3!WH3PL6_`gd9>gAH&gDyw{T=O9EFauBwU<t~
zey~_f(04j?D+LB%XO6v*Wf(G~6Q_T1XCM=WGSmWFBwi>T@M?76LM%@m0bKSio@(_<
zEPf_~V^p&>45k;;wP>~aYJt(lG&Pf6v=EQ5X(+ne&(xYtHa}wfc<jedx=<?XYhUL?
zCF$j$g~r6o|79#tK1FsOUW-vFQV$vaDSW17j_o>luRT!z4XKYm^i=gMkr(^{ZIbw0
z#NDXFgf7Y0L7bfEHOh43Xaqi`kwt2hPp^;Sm5%jUl$*PcA#&W1YenqHn|Ej-A_nzD
z6`_e)2t^?xz?WwsjO`bgO~V&&Zq2&%3H@fK)i05zV9H%NWiBfR8OGXtJ3Dlt`;U(E
zz`5H2dzV&|;veFv)_X?2sVz7P-VT;Ib(g}yXu8@%;L$Q0vIllhy47`UE_ZB22U+RK
z?7m3s3HW6njG9hV%YbiWbx?i&0j!UUO0D-1xf+xu?Vd68dH`4AA`g`>?W*4^^<ze(
zRp?8j1KAG^Xg;>(=hjV#j}#0r^3u2*l=Od<Wf2juZ}wMBLt9@4-=pby7*Gm=N<;Qw
zs=)7m2S}v6?rOWa6@90yJ&(>cYc#YstKAP^lqE_lwQg`DYZXNm8%7xyKP(h1Sn45b
ziTj)g0L%K~r~#jc2Hzj|@mF_6F;>AWbC<#=<i}n4mZpZ-5*NgBWR~`Kz+G8^Ckp{W
zM8Jip07HVB(AKhBNd{7|AOLK5(08zjqEj;j4QQIu-N$wO=BTC;(ds=tyJk`d`9Vib
zTbvv#O$tapTO`}a{5yO$Q+7Ei$0=sfKYV0f<={s2qXD0B+hfTnKeM8`TE&X{g}WX;
zvAp`|=K${zZ=i(?)r=|Dbs%pGdXCPX^U!v>bz>prK)C^@g0eHxjSIWM2DdHS8B_oV
zehnsc*7VYeDxMF=BMVx~MM&Js@qnXX<x1Gmg%s4-H}#)9DGE_UOz?35w1vU>G|vpH
zXx86Nc_p$0Uusk@Y|3|%3OtuWc`*q4?Ux{4>8Rzp!ipNZ8XSZ8q)tSU`GdPsUrLIq
zE~-t|lCOG?@xBh(ciXI^{8r{J#!{8fOqKjbZTE(aGj+IlQ@+gZEn(^uASH^75sW*u
zP=;#*-|otitd1<RoAKFDSptdI1*WFMwe<MF$lPm_k1-cU_vY0icru4ERT@K-%V6Jq
z^6moVhWOQEBz#}x9Wa`K7#K2DRbkHKyS`JkbS)|Gs3mSwMdh;0Q#0s6VgRMW{G|-3
zKjc&@eFqliN%|y!KiK{qaQegH^!{h%m|K>V9RdM7ee4~T<+im?=<)U4W5_0EvlL4&
zrKon0Df^&!iMZE>)^J2Z>S#=>Z}%M8%E9rNm0@&eK*POFo(!z&{(8DcdG(Ov;mTws
z*y~B@B>xI@fiL<xt-CmZ!v{{6NsFY;DDLKUzXHbujo4!jm70SS0hqEznrB{y&rj*1
z8Cf-=>;rfE7gEKJrK5U=woSWln7oY<CEAVK5P-F0$9k301*bBA$^t)g^W?w^@)t+-
z2Oau$JC!vG^4GY8$MkPoNpZEsm{<JG^Np9~%sJko=gL5ePow;-DxI6#71Xa%lJ>L@
z2yJ)l{aU(O>m0`iu6*UoMZy@fjZ68i{AZCf$`qi7;R5DAwV&GZIJ$IKB%=0mGe1Uw
zvP}%Uo|+t-0Ph(F_!#hxzZuiv+@4sxR%RNa2dBDM0s&c|tE=nBg1v*qaEfZ$g~_o?
zyajd`5zZj8k^Yj0YQDy542czl*%sI!9b+#^0qu_;(S0v;x#8s1hA^A#d&)^mXKsTh
z=JrxNclnspahXG9nY*W&pEs|r-?oUSRah!zF*`i+Csgi4_zPXO7h6Y?_poNPX@6*9
zt?j*T3J$2fO|_?9G$#=M;*jPScT0B6poT<~C2DZ-EEC)G)UqMZE1kNoC@YisRr?aD
z8i%mroi52$)QpnQAUcE0I{d<_-8j(*e}D8D6Q}o(y>C-T*uA)KAC2Oha1yVb=R1J5
zvuSZAN31x`0H8-RNQd|Huo$bYT0`vQyoXHE@uRwNaH0bkHKAqZjB}u|p7QPuqU}D^
zB<J~)@`u`j09oe1z|7@?oOY+Cxn<n>bOFL@Cf0YrA|}RhV}`DLV-vgSBBSwe0M0hd
zw9&lf>c~MB{(*Ka?IQ~x6OIeN&fH^CKnyLDAW<`TZaP+auNw<w<oDjdxhi(KAcLN^
zFi2)L?y*Z`UK;cfS7zE|AigAW;N~TJig9U#7+f;{=M24c<H<IjH4(gi-WImK7D_!;
zvkqGi@;U0@rvBXUn|V<S$+A~2nO$zFbpegBtn**F3I@bxLatx#>;wp2nV-@F=tu)h
zk`xJB6CPD6Gm6bc%;*YRY%Wgd{F>wf;)nXfWtGn?iqkw@HZ(@qzQ@4A@qeSe`>w9Z
z>C(V@DTu~5PkqGg!%nkc8okW08)p!Pyj7i}nEen!eN)UQ$!O{;EH>+TW>S>N>U~ZA
z4shG4S~0&TMbPHC<|K#13x@P<_w6ke_rbm>fti~(|5WJnnVDz}ep1=If}D7+dA6=S
zb0SHSTLCu>qsnS;hOY)v7*%u<=)#FPmEyRG@!Pt%nZGq^bCbZwnP{e9J+6u+dUP=8
z>3nsMJhbO5khsEBoF|^y#6bK)#!?gs+4UWuagsGQQt^>(;>(gvvoVFQ*WvB4W*?M>
z$CxmUs!lO4BDxj_S=1h1Z-aF^w=)&uSq;RJ*U$^U#?J(`x+dx5tBWBaH}E<}=d!Tc
z-0IGV0juhI^B0@F8yQVAi-Ce;7enVhIGjJrVmvyR(K#(!!*U)kq4c&CC#&<_$i*h}
z1k6cdN@T?flzwjev}W;uE!!ZD`-X{AwxZkyBuN+g>|x3-x`K*3X8oiRTo<e#?HDcX
z-kf1{LZ>Ti*7Nn~3?t0}+y25)n}EVy@~7Kz_&!^2ugKU3!7bBBRb87ace)#}p_%p;
z3^!hko#q1Ywx6N<R81ExYWNG7<rsvgK04Ocnr~@fPwD4<X9JAEB9Ws~%rR-JxaX@c
zv?pdqfvgkn0Iw_M^9wxgdeOmdVec;o^;Dg+36w=>M9mQF6~3Sg&7+=ET^*=z&lJ@5
zwap({)Z5%CO~oiqF%m3t-mIa_@laqoF<fob=9YS;Mv_0igayS5FI6%fEhdNUB0Ak&
zzv;2kMwPsJ_qM#l!p)Q;#pPGq-qJ=+;Gpl9sqj&C_hI=(dV64ESS;wKYhbuVl-P=b
zia>@=gn~P}<pLFF5gpDJ0OqD77u%XCNke+;(8t4vjUr19Um5IfP?|%1FYy3q@{}H-
zpwYO>AnFrZXKz$JLaQ|yAU6Dnez2Y`#JPLAkxGQK2nU|<dW`HVQ8EiQ-$ff%%-_rZ
zg)+3RT{+@j{zQuveLk8O20YaU)6-u`eJM-4?1S3cL_pjJ6qhX(@wp$jZN}>&E-)<&
zv(%?@_0b;Lqm2x=WJ|1KVz=@!bMsYoYRfl4h}?JV^N5}04c}`b`bF<GQti~&WXJ89
ziHiLn(`TEeDShv%ev?d{nA@;Zz>nb_lH;-~ow!0l8i)cA^;AZ`VI@3dvqGPYStBJ@
z&z>zh1tXyR@*2!fQE7@GqganVSCgiQcMyLu$3!4H2s6}&vasmE`@A5te|%@Y&rj2R
ziz&aCESzlN(Cv}ne=aMJmj%76#m-!pqUbg&7G_{_Cc99i26#S?Ddea3h|T-n0=8wt
z*DyjmW4ugyR8qVz<UJvV{G}RVS_ywC!}Jm(=ffrkOo!3l(irWQ%Zs#T6Oo}Oazj>e
z*NMe`{_dLdsa*Fl+rAdEEKvsh@zx5dR`67VLnC6igC<0wt*}cGA9(d0!$M6w>Yi0|
zkwH<c(pOavW}zy~cBU2QeBWB&sTu@(ow+lFS^<j~>JD|4on>WU!vJFt>xC+}s6+Nb
zPV_`Nd)zRr2f^J7?OapxX*c&&gHrrm%sPBtle4+`c$I-R$GveC?F2av@~<@_K*?Sf
z3pspAFc_}XerNkUOg68$MdavEF(&$;_%R_bIGaJ!T=Vr|h7ZM@G)wg3ld^4EG#ABv
zS?sZD{LNk>QPt2pK&M)wQ1zlLeO&}|#lYui;H!G-wRpu68-<PyCBs=ed>5Yif;Kpv
zr-Sd8lW)2T8WT$+3o+6%K1duFcJTem-n!vk$U!iy!<x&YFo&uK3x;xEnct{tFW9+?
zD6lziF@NIWSm<Jv>vp8XIUCg0Kj&h^$jBbbkChhqo+wh!El6@VHLyaoP$gcylqJIt
zTLk!G6)rbOh6&;i69xRJ<9^*0%17<pJ(WS-O|jT2jYw=VsR_^|;|=85OOG?4&RL<^
z^5YYkpwc8}hB(%W|FP^sSj$e#Ji#S?1kF3a#1hlWk7sV+`KJ6m!H|*?xWQGxV&C2U
zP%_NxhLPjPiTh9rCP?p@ZYTTe^A=6Zl#FbXgdL16J>WhE<}jLBqAhI8hbm5%nCy*h
z?b@L`+d@DJFa=qI>9Sa)iST>g7*WYdUWKH$38{zodCtGhWTYFy?#MCA@~f!8Bc%~h
zAm)@X|HK^F8klPGg<KB6?V(_rz+p$M4?ZddWB+yT7q-=&LUUz4I8ml~e5I;Gv<Pn~
zhX3#n*<7(o3jINIRmVmEMOJTlNrauLfcxP_{Z3n57+93hGt_|7bRTUt#tgbOhV^Y*
zX-y((j4J0VoyAaJHRx-)KC5pZQ~FMec)bXww8Uth+6OU&D6R5N5>D1y9Z4xA?kCFG
zDOA5DUiLkZKU1z{e$MD?{)r`OQM_>Wp?voJceee=NaY-VdCd;V1Phj7cgI^ywc+#g
z3-cUe&;zz1JlPA)7KW4z%eCQ}NF=`K=n`N<qdDH@-8r1{2@;a7+#(L6b;fG4pPtVp
z;HzNk2aRD`3RnpA^i&w7{YmM4ZoqDfY(zLuyrn-wb;vG6<v8;^!GHHVe{~-KptS(r
z*wWxRyYuaB{IVUzVD!C5^6hjo6bzrofz=rM#A~|!)8JnHPu^yngyM!`0t9V7;28)+
z^6)W*B$%#o3Bed!f?ME23sGfj7ksy8{v(`E3OMHlez?uI82fx`-Q6V*dzYMr1X*r5
z#zC=%Sy^`!R^r5yIRdhrFDFi5?rZ@A&69Sr*QFd~4*iZN7R8y78J8b#zSl85!L#G0
zc`=QUoJ$$TrKjJTph*i9U=T|jamArx^eHk?r79AdwTPJr<R93!(rg1SBWGXg*0vN6
zYs685-mZ#E-cDw_1s4-UcQZZ~pW~c;6!OTB4<b5<3%!_|r8d^>pKEDk9{B!SmFOUW
zJf9%jLXTe7@iqsX?+Wx~hYhxW$q8oOZ19D+G@mXKYJk)$(&nWUV0D;0!1>_|0Q6}`
zkLJYCcO02o@FT#de(nuye&{Aj{5i7ii!RFb`27;YPfpHhgzZ;GbQ^HN5B53dQ%f<F
zPUUJ$A)Q~K*>g@yv6UVd=RHQ-)pVTndUh+y+zig0T(*-BRlp-rQL6W2A)y`DlT!}V
z$kc5iWWv<3WPQS<K(QZ&-N$A%0l52845-to4p!c<0k)bc0*?eSW51=IDWal)M;^ng
z5}q}JkM!Qs+{wiJ`!YQay3CGoH>js#MqUrZ5>Y<7tzA)c&U?F8MPzh!i3lg=CCvaZ
z*;o@VqPZPA&N8bJGTxxOEk%iv(+L{N)^zjkLyYeXV4Tlo;u(=OMRf_%)ERQjtA0nU
zqSu0ttu7eza%<`KBm`jL02}-&2{`~?J=ajzLR$0r1UQlA8cN}3`zgSy^hbcVc|p1W
zH!d+VTN>`8DjVb!#X*8SO1-@l%m@2q&Kw6mr3qd`n0OCGe+oZNj7o0ArOkeqa64rk
zffs4^?=S!#s=(PSbHGk-^vlf0T{ar79sh90S>m)}6cOG2nI9#PJ6RqkNxgj>jw95^
zvcoT>ehC>_P|R8_oR7c;EO6~5o<p{vjJ=nx$y}D&Ek>x1U@;RDSP0Q9_kzFE!4t+Z
zW&&dc00vq45G3i0fOaRG2_8&>JHB~Thc%}O9>R9yTfj>VZ=(G5lj*6nVpjc*0O!!D
z0P*|s|G-1o0XGsC7S@$hkQEh|5&`ieKzs%er{NF(0|2nLadJ=q3Xy<r%9Frs0T4l{
zP2oW4J_+;<9qmBfe+?)r3;ZwqZ+*Y;m-+yhW%$$Yyj@ho!}i(m!*H1iG)rFizvKQ#
zgkWUsXb7Sdz=C=O4DB48K===-Lc`U`?hh^iVGIMyzqt7ib^x6q$p0thDTe8P@Ydfk
z|G~F^$0#WXgJS!$CW)b$K8RWZ{t<-f4gQ<o^uJ+iD`(I-{Ix$M4n$)c<v$D-3eZ6S
za0Dm-fB+!?2|yem0%CG-0GI(>pppZ?0AK+yf?9z8oB4cy=L-XD0d@d)fCIoBU<xn;
zIDuCB2rvZDfNB;16KFmM2mwK(Y(f220OP-}WCI$(2$~Q0vmbwI0N_Uc@B0jfHU6*f
zKRtiSe|@$&008G5i1QNrug@R_0B8yU0C1N7^-*MlGSLPB0F8Zi`VRVkSNcN^0yhEW
zw!JO}<+W7@Ws;o+WlYs{G+|}=+Yg2)1Y!tnyuaUos68+V0KjYP`}=eL`}-?spCHx%
zfNq<=Y!~pqw2MC__#cCW_)~&777&ooP|(nS4;VODXc#ycXlPgj5Y6O|fe<1BJmR0m
zU$)DiIiOh(5K!<i&@g|8{2vv6*)9mvDBb@*+vP8d=l}C;mlwIf?YXFmu=-3slgQTk
z7`x!n&qCd|r?Z9HmsMwnWjs@!JJ8WqgS*25qo0`{WiI9)GMmo&3YNaj=FUd)e;h|8
zp&{k<bgF>uGOi%g<ib~M_3H<IO+=xO7T{|*o!LH{e~|;pVeuno#q*(Gnx2i6|MsuY
z>uSGd-0qC$qGY*P#Tl04MxTwQ^B`Wf1ZtMtauwX17qsZ}lozmY?qx&+A2IJ=vg>~J
zt%@mJ4+3g)*XhW;Zz65wSE_)Qi`!Kp=L|V*)lD49<JVJU=das_@k5)`j|-REXU5dO
zG!OXCX&p4Q9%1^jYpVjzKP8#`j7a3JXdISr@(AEM%)P4&U%XeooLFNhUi~ezd>G)c
z1^j?K?%N5}Qk_d))P-^qyKMXkm#K~zEo>z`eRF&&k&VWO<Ys_)?BS&V8Jgf=0+{4=
zRAa;+oGfdfubRE3Rga=G$96od_;k-TU5GmFMQzQd{|ybFw@}RiC<DgZig$L~wM^dQ
zVujb&EiX*YpXNxo=ebB>xCe6)qyK8zw%}{g1-bln(L>8&1=aw8z)Crcw+E21$XfEY
z<^hZ1^X*_~2M4~Qq<%G)bGS++1!bG$(NgBEk;^pI;PA2x+p5br6JM&)TJxC_LyQ9@
z0Vd{H1C;9o>t-~bquoEnGI6`T+QXUGH_1Kf9dJJ2?d%bToZxB?j<Q(^3wQeH0e|S+
zwKAnMH#Sh*`+#f;IbN6)=LvDH?Yq28fF~cMdCPjA7O`RVP}&LMrm*U?GFXTcz_!;f
z5Z7_Zt#tnmK=#2fuhxQPSEQh`O-^tTvz5xq>$K_my}ug;l=ECh`^u*=gb~BM^5WEe
z#t%O_&*ORpe%-4!*t}y<fI__wc+=*!v~c5r;@bFtu9o)61Gwm6<O|2v#_c)MVCEyI
zCVEIgwC6dmxf#|4SHIer)bP;+4wdvivVY_5>h*OovdZY2$`#xo2RG}7pxq1<4R#bH
zi)(cX*OlEsHvLfHcqPZF4i8i(gY+Q8d4#r+Y^9UU`r^K4*x9pRASuZ4W(d-nL6jWO
ze+|O-Z9lCkK5^t@L2`e$(xtH(wcqG8m4&ycX->Y8W6@lrA`f;qykJ%s*g9<jCE{s_
zQ{W1kMfrttRT?GHR^kKQIT@~*bz17P`k;Vl#u#Q-lUd6KG(dl0IP&SBL;H0<aCNss
zreXf$O$$<M%3(<aci;Q9Z2YVp(~wry?B1bt@S5-{bEvqbqJpl^!(e#fN^C}$7Ip!t
znYsEjZtZ#A(a?}?NLH|&kLbrkzQg{nbKac^o!>=CNCV{z^K(h+D0aNio_J;DFS=Kq
z^_0)NyJEfU<J{q?o0|=+vX^HmShfbC)&8tdaS7aZ9`h02sFje|4EoiN!LlS_fL(U$
z16Hlt?}pL%2-wb$k>bt_CZ6iEN(+pP`!`^oE?$rBZ@&sfIO1IC<JsriSN8<>#5S)d
zLQ2oIzj}zI)9L7_W5jUclDam!5#8ynv|}Z7H_2PYGa8ZaBOQ64a_V8qMmVhOFYSC6
zXl{-ojbDmS0VLqt2@)LCqlEO1g^`S`Mg`*Nd_k#jw(rcUu1L<by*Yo~T7%Qotu)tH
zgH867w8PpUZ3!KLX}+&8OzJ_&I^?Gg%<X6mzF?F$hKJV|gKs`ka(yU43EZC}xn?xl
z#ODS~m#73q^V6P?B+oeCM2!~IMum^N_;Ex05`V2LUR{07yZWh0`GJ%Ws9>qK?{raF
zNu#9Ff}FI?jWr8gmD6L=blZ(Mu(H$S4VJ_X)K_25Stnp|e6DM#M#1HMEH>|?sc!6G
z0lHF%VUwAwlAy>ID%fK8*NAG^&F;U96Q>Y{5|;fe4hUBf8(55SkUcA{#1O%7z>16?
zfVq60UxhWaJW6V;CHrQ&?B~189%a9~biNfX{RJ!F0Gsln{j4naq>%e2Fl*`I2VQXu
zx#m!vwG65&y^xG9Y72R!he?}Za3s6+r?iwNpgvN&Bmylr1VLe#JL||1|I@tA%LL*(
zfX!28e=}~3SXN)ld8mIbc?CAFmJ^qi??pdE|I8BY9k4??9s|~T;`*b#*lx&bPV(gT
zZK2T9WMRm%%p!SqoiCg4CNb`MrfEYeIy+eIi)2@lA=MER{y|(cj^W}$^U;f{A^nDt
zd>dRM0j`fRd54Z|Xl2b1WV4gpAPV!_(XSYtr1VU#F?F>;83k91L$g+fzyat2%9vO~
zS|vLmCIu1kblOWU1xwjT&Ck}ohXK2IFWGQTk^m<+>+u0R>ow7S^uXw}o&n=`K=03n
zxUp5O+(wuO$BV}%hya>aPHdUkbhCM-be}U6(TKiI{MiLb;r+KOSh=te#jJxL8^?SE
zGYn+z#b0B5+=yA8s(FLm&vY?zjG7fmMWQ~Jk8jeU`5c#PJMJXa<5{IRYW*nq`kL>F
z-tK{Ni8(;eAqe6lcJApm4vs7nO<{-fa2sMcYKT_Y+@Mp563Ibx-WSPUQ7xV;vUju_
z2jmSPblLiPJf5omo^?e!6Sqd35&e1Il%{2+6&;c_A4NP63>&Yr`RgO{(Jr++*^g+~
z<ZV?74l1V_Ow5hL8N8SQr5Gj|G~(<}_{6C(!e?|;4?E`-XI7+b^k19NKI05szS13L
z0(aID_S{twI^5EMxT{CJ0|pkvm<??$JSqAFn)ay1Q-t3+_tN`N2i&cx3m8G!x*MdI
zZ>1k%4C1^}()!@U)td=WhX+&xcQPBIHdn|KVM0-ovf=GFF>g#?=!wxJI<21S>dIS=
z0OYg&;?BF7q6e1}Cs>pa@IYE`%Wqot(q$i)8WQQ&>yF+5xG&Z%marE*OBbJG)-_R5
z4vrI+R0&JmE+kXZPZdZh0N6S|@MrlN_Tpc@E*6E1wl3{PBIW2I2X545YtKm;qwOc*
zDN@AV)PF9iqzB@PS88Yg8=`3Tm3AJ}=k8iMDV9G*8@N~*;IXiP4G95-mGiGW@e5PN
z!NuQf)2<DPI_LML%QxxbFxpW;_vd6Qc`e$s*4v|)k^)f!ly=G5OYKETSBH<D;(3Kt
zuL?mt5%ZgM(IB#HW*PB!faOf}oh+7yIPraX<AzaOrXRUARCl+P3uxc3D_y#%zwymw
z8A6X58F?*pP1vhW(W$t4rUT(Hocadxa3gQdV*Ojc8gp8KJ_5Tz=~HKNVdzeUVVk3`
z+y*VR<FX7Zkz0lkL`g&RvuN`XY8Ga5tyhG1bCI<f;Gn0GVHU$n8FN|1pL=CIwlX4J
zf9$7bF5kb<AalRvH6MnSDY{tV*~bVea)C9P9&Cp+h>ml;JuDVd*>6NI@p?0>H95qi
zc-e2J%elPtl@x609ad?4A;@~0`$k|&%LF)Nb3T1?$#HOyo&Gt+bt(YB<s{0^q_%?B
zVa_1pp7!p^f#g5L$f+iYuD8!JN6CGu6Bsz2({rZA@bq!YjKOHnVqNe<W<Cb;wmuAi
zi6h!iE3~p~F%63PegT;6X8iPHa-8%~Na`Mgm=Zn}WpY3{6o3ZKBqr%+==-0G*`Yuu
zg1Zd~F8HD2PQv(@4K;Am7+}!c7cBiIrh(!82!Lt6D<}>fV}i0Pa2}FS2E(x#6x>&{
z69I3<fo3sR*2KT`4!tW5l@ap-AWQB>dMeGFCD1n(Vumh3*m0hi7usu8LW5~JM%&RS
zfp^m;O!>4F4`(R_(BRXpl^z5~X$L$8m2~UDa2D$|uLmWohz{dUdMI`ZL4+kDI+z<o
zg$JWDkC32fxIxX6liQ)hi$U;jOOvv&q><tH>n)8yv=n|MPcbU#_V0l%gdKIo*@S6i
z5-Sz}!+{s7ek0BLSgjR$CfqUw0bzzyT(bIBW7l_qc+1y75-y`^f<xtE$Q@EraP3v1
z4j&C>)#UY4AN-L_9Gh{R91)C%nOAmNQAMrL<ng;h4t`xQz=bb~&3?_@+REe`rSjUu
z$LGFj)R8Bpg%Q-S?eI0uIL9VV$meVcX>~A+PuOYuqlJBpdm_Y4cYH4@14;Gv<-+F{
zz0Ulmj`P(lZf^~evWA%Bsx+`H<oaSg%)4C;Hpg|+&&!cv1d5qmJbI5-{B0M$<XU&1
z^uKHHCT9~AS>}-@j3Qzn=O1yaI_sI#xv3-X2&}_Nc{NYUHrPMu6xt(H-ix&lcboSH
zD0%+5A-Yf_ZWM4J+wkKNwe)(=z$g`c+H)}>H1Ionpg1;<2pdb9VYD6I2izvqYtuse
zr}~-UUljMbrjc>1h=^5}yN?S86{TlMXli8eayU7h6j@tYccUjMwK`VVs5pCQ$!fpx
zUttI*`QaB)#PdvMS)3^#lSI~AI2sSQU`hcl1BQ|~(Yz&*{X}rKhZ@+|tZgWCh94&h
zu2G~=JSIuwG8^px2+fzW9=AK?<tA}x!$vmvkf@nuF@vf7qm)K#CuPs$ikW%a`@kq{
z5+*y8+35P^4}N)Kqt+*2r*{<$2K`{e%OAM9`-sFaBKOnM6wOyKy+eOV{2U=?av2)C
zz8dsKV(ebk`G^A%RWgx~bqn?F+zTya|3cuoK5g|IWaW(P^i1v7%1#5$F~CGu@xCxr
z2pI<=7^RGFCirp`<QFW(<|OWJUYH7~+BY3In-;<^a+>zYeeqvD*$W#RUJru_PKxb;
zcqJuBjQD9ST6!_5adQfc!Z0{ndq(zxJzRF~M9nz?IONF8aRONZQDc$2xMOHEc4`+~
z^qPd`m<~g@6t@snGa1=zKXMMU1a>cT1OPmwYZ%*s1P2*laxOiK7u7aUV7Sq@F@_K~
zxxCC0(@hlpazu{HF%8^+-qMy#hargn1+qX*ziwKZN)-wa<O7pW*^;>DB!&a{O(Xe=
zzrKx>kGvgmMSyS2K2?+gN6V4d+M6Eopd6E)eT_W=$?}|?=L&anDF8b=V<ZFbMSxJM
z9b}YcH+=g?YCw$2B}N!l`H&t|deg883K(<g^r6N{V;^8L2YM}V699X0oDtMeKu{Q|
zE8Ct=_zF>t*Z^lAdAfZKBJC%3-U;Ui86Mu$?7(qNr)w!2hf;XOCL8$9;yRSz1))lz
z49&S!{&2l<?L(tSAyr&Qv}Y$d285Uh3!Jks0Q4iZAOOY=(gG8f1HC**71}}p%HtU5
zDWr^fZ7>))$77nc03JNCwn4lwT<3Qf^`s~RWeNGXJpR7aj9X-dm|;^O_B`~YR}55z
z$IJ6)xW!tHfN^Fmn57_*wLl#|`t$)TiiD=p4l=!|435}k&g}8>(_F7YdgnRgnzVp=
zrgArY%B1z=ijv+v*l-C)IFVFyiik=}q_QH13KU|LNK0oRZt62k0z!(xV~=Pbaaia4
znnHx|%Z%VPHTWA{PI2<F;+hx`MstsD{pbO}DJ+8^XO4PM#GZD6fz3Cd+ED#y+yMl}
zNCTQcE)XLt9{e_XiZXBs#zS`Wq#q~%V1RvT0YxNjCwB^S`p^SNT#_-9!1_|*m~9Jy
zI{MNRjN_j|DGRf7UQeK@O6&(BsL8<~b;;(o{4L;(cg7C$Xb|Pmg2tfWlhpIttb9HA
zcYEWjrivL%QA7dVBAu?;`=I*Q(E3M$bngLLTG&RAtdc-o;*D{P{{RpJr_#QkD9Iiw
zKGwF8>D`=IoJ)kcA-S3Gqv4jX7LeM%ieX?aV;*`a-o?PibKbgZW%B12@kbyD^F{#v
zmDOlkj-wZbQ$W-0QfV&RFDtMBFV?Hu_zzRlw8<yD)omT6o6A&5MsUZV9qa7q+MHBY
ziD-yaWhZn^=fgY@-CsiHWE+?sJu!;uyfbYl!~wrRw>JJ$W>s_Y@$NcRZxU#l7sH<k
zN33e=aQ9aqyS75PPMuHqn(BTOoj<}q2{j#lM?P)DW#AGFeCM1ITdTFH-40~+Ih|>v
z)b+>~JNSfFk(H7819wfesp7k4i%7MG%IYsHs`<#QS%Lom_0}JS292oQO?Rs5u?4w&
zlyAC+J-zF?h7W~l3fo=yhEF+Al?XbwZVhSd-#4Mr7tE8f%;=iz0LeUvlN30U3I|W+
zT`z&WbER5p(&@U6hv!Fk{-!{qY$w0xS~k8G_%m;%iSAA8b4u8j<9-vKPHKmT^nVNM
zeml3d@Sm6=wFK;(@h(4$>048aT674erF3uW{y))lnC<Q4@U^SS4qDkGjaErMr@cGF
z5}zkg)h=yX8LkybFBr=DC_RTY&wNJHt#$7jK^%6<e#;(J)v@HBhZyf#a`>vo&re?u
z9aZ*>89@M+ay@%jLZ;MHOLJtUJ2@3J+h$wI^*EJ*NspFT=lt_k^#1@6YuaHqXGLk!
zD}sE&ep23qdRJ@Vza9KL({298J+}NXGb*Ua&p>#rzlt9dyd~i67~1KYTD-Rt7mm~?
z$%D>Vn${Z2R4;l8!f9U<rf}8}=t(D?AUi-%0q(%|#c<v~__cAQUd?Nxn4nQF`b!a#
zTkBk=t?~E6{v46z)MSKt@^Yw8%bvp(;U5-$G3y>Ox;jsV5VTJ*W;n-|5BHC)c^QUd
zgTd2$j`HkOu|DrBXQ2510QRI!D#g}G424*TghM=zxgXTmi1^Fn&yDrQd4`}otA-=&
zBRSf7lh_Y>&YQ#f#;KOHv6kv+*sPE#!EbgawF~g4#Mg64Z)afZ3$O23a@q9hz!mUV
z+-_lwlX7|-QmEv+9MW9<qW(*{>@u&kc}m#&ky1T`p^Q*Um|`8`AA1M?0Iyx`r@%d0
z<iOGkgD7x?mOY~w@9kX<o%=K2i^CX6CizASi~xJ%is6n66D4$r<&)U)HqwM4gt7qc
zND4<Pdjs!Rqp~qHX)H`0G5-K8)Q)`^3irJ?_EeHH_UoHpJ(wtu&0JxD_Up}b8ZYdr
zaS@yB`Y@7a<<>FNJx4U9fyG-yZyY?N^*&~abvflRt&GEu-M-J19_QMvSa@esypbh}
zCNf3<m;r#JvByvTwS8x#{>C>C9B>UFqL5gP!yul&TI;+w`xefR_PhN(q)rhnQZNY~
zq|%O6i?1ZEk+Q<ZDYN2RkA^-eR*>7kQYJhjXC+VZ1N|xX{{RVmQ*Cz)a;uw_U_pbD
z0qL6k0n+~fV|nEXZ5^~losJS-v8nA^x-aZu<`Zs_!EY>YnI@PKztXjqO$vHSK?)d&
z?2pfH_){A6X(alkrNV>OPDbON;0m<=00{1)ww89&-e98#%2vaBWBS+V)|dMoL2DEF
zi3FjW<SzMK_r+;L`zB~s@j1D%g5?Mx2nIZ}@9SEurw9DO^-Aw^^J*`H*Hcaa({9}*
zKteJQ5M$TYrjOt*y>hY*J4xQknL*{BmAmA3`q$|^AF_sneR3{Z&N$FUK3OuQNd6#y
zp{s-TSkSK6Pc5QGvhcFS@}lFf6;aCY@!Dt}3Zvb#^I|{QzV)Kh?Db7NK+yv7%@UF)
z4af)7kL%4`hxT1aG^Y|-%W-h>WJs&9HaWmvcCY#7zew%>0A_y(!#r@UtTL5DhYj}+
zLPc9o*~`Pw+Q}E$;tv*fkU<I$dZm}(<E)*>{hwK_8Tq;4kJ*D)w-R4InQ<24aTYRh
z=qp;^_DPoZ`7UmBmMF|~8zxC?bvWso{TH+N8{nuVS)WUiQRS#RWWnF<S0(r_;pm}z
zxOBFG#yptavRwB*!m2oI4Le;YZzG{)^{s24olySBR$@T<hKxdtY{qe(z;++juG;>|
z8bnbU-@~zlSxU*i9nBc;!0%t95&R<X=A7nuts=TWipq?5Mm=%wR;|7i_!~}?lcz?|
z&T}ke^PZ%NxJNFENx?smo(5_BO#Jk-{gZUPVEuv}2rE2e%*;R#oxZ2quGs#@z8krH
z$))|AEA29D`H{PVKgPd6<nX727G=7ZLyk3of1}7SH)FZ=#a?d;cuM9)&4sj#=rJT}
z6-la;a_4W|uehawNovo}_WgwH<5h$EA~6_~Htb*k9QDtpYeEm$i$b<}t?#@zt0N7O
z+s>=B6W5SB9`*N<cwbD0;#88*OA(9!WX1{f_NK>aqs3~)^tjzNl?><!2iVh!!6$VC
zNZ_casqsVp#+HuCk?6=0BfX;t0NgzXVNzRu#nzgwyG#9+rYPmgsX#<Wryl0M&JE$n
zE#oU|3Ot!plgkm`=}hx<+j!)SW4D`e%nuT6+{gG&u;#UL!L|G|Sm7bi`0HBzgghxc
zAi-<pDlXYUh-Y><RyFev?N|FcKg0h3ChJGin6pc@+9lwq<0l@K`m1@WTHd1h_7SA0
zNpwX6cj4Z=2lk`*eQ&DxcIHbBDNmUjZUsXEFmgxtYnv4eJ|>qcjf^W`p-v7+{IV_k
zlWfs`@f_wr-=#XnNe-hL#0kucl>;ZzuK3@>{{Zld_@?tlS1hp1K*{6|!29B}l38u%
zONd`<#=xmw$JV|{^FmfU>op_nPlBJb<X$z<?c>oe<c=MR*BOKWPf`i@uU?DxEYT&J
zIU?|@1dwjrBFKz^>FHdL>|Nv8b*~BAHl;8!G66I(jiN#aAc4?&SJ;-GENSf^k|qkP
zY@n=!4l#|n?_W)UojO=(yKZ`v@RacpypNo;-`KZDwvpu1G`J!Um6k&fE0dGQY}IX3
z_CL{~xQgCw4OSH;e5j)9p1+-aEIeHe)TP}3`9LU`UOgJ4lf_mGZW1Vwb0^HL%Md?^
zdslDPsK2sn{hdWCA2i?o#<rHx%Mi4Qg5i=V<IYs$<!X-G_BXJRjeyZ%RZ)eOQNi{n
zsKtFRCyA{bNiD6gMsxEN#{!~@#c|uj*5}D+N^`jeYF&Cwd?bBBl6xOJAK24RX!fO=
zA|d$;bGf^)_WILe{gf<p<&4LmY>e(JAdG$P?O#Vn;$0<VGpdh}0#!N@=~f`|Zk$l8
zwti#`a+|;bTe$jEdunm%f0?Sl(r3-z@X2~r`pZA|GCH!1%*nNtxb8nJcNI3D`ygoc
z%<S3)wZg`kc-|hQ{{V%388?iynWgfhjwO^ZWk}R)Aa*p^yj5aunqrDoj${Y`6`QY5
zq<<3D27=w6H$Uu`qgh8K#J(S9Un|Q}6C(uY0CcN~`zmQpu)#i$84&&E^0`oY4A;@t
zUMhgx541Y8Ov7{`N8Rm;Kesfvt;DTu7n-s#5xWDC>xzF`i<QzZ>U0!r&z^Lz**ipy
zriAF*p^aJNV!6v7@TegDm@Lh*+}e154uPX-40zl<2cWN@<?(8H(WdCai4T~9Ffycd
z`cxnAnrXKK?8_gTtDG-I`idSRgx%Z$U}*O|CLh^bNQixg`$$$sk9k=}OJ}oDFYL>r
z!!lZ3X=G0iF-Qo)p&V_+d#Lf%u#p~pA!U(9()b^6bQI6{O0-FXO16s`m;PHfCqACk
zDPiB)E9!LP)bWcS*_|z7ipBKTWWnDiI~t_lvgN6P<)2Swirzzy?vw6)>)jj18dEAW
zNBiiG-HLFmJxxYDRc~)>^4wdXh_T*e^&RL-5B#VW8lCq%Iv?3C!uY%@@y86rI3PF4
zj>L|%H|)D$&Mhu<;c+N%QQ{?d9;dZ?aq+H}qEwg4SsMlohXWr<hCds{GPG-G5uLtC
zy?s=Qu1Zf^7O7H4j@W+9c8&In(WaP4LL)>c93F&sC)T8Y*@E%yT3PJ&D=y`kRAe7|
z_6u(pSQ!kG%obHr8Ue#E;fj(^9ibr;hbl`KU%aQ-)VNV^SeeTYO}!c8gZ5#vQ6gCl
zs?e)Q<nC7g06vu@zq56<$}Dr*yFySB>UcQpE7xZ6#1mT!WrjSV$RS4y+*7~dJ=5V=
zmTP#pA;!`GLEO|TcxWZ=7a9;pjYs=2z^5}<x<q4R1SNBZ^(WkV)nxseBACY->57hH
zB#{_6AKf^wYd$xH<hT%`NG1Tl$lPZ=K9vNXI?~qGM!Jj2l@yf`5sk*D*<mI25dDod
z&mteQO}p$w)52viA8!gif}Jnyy{DN~ZuHHqxG)O1*m1)TYW0Zxc@Ccl7z=^(h9i(i
z-88@OvQ}wRVTige)<MqH_swdkVE+J-57^R3@-zD~+1bqVGz%`s{%2Gpll;v{KWA8D
zjml~J5u*&v<@3dQ)LuN%<xk$iB^V_XHZnbP-lCVsT7AIX5`4!z4w&@CZ~n^kaX{fs
zo?B(`F3#z`(>1d0#snpPQol}_rM&nR3*2l)^3*8aP+^B`SE;Xy^avd%iqk4o?_hXC
zP>&ed!-%1RHg;Tq`1yh9PAY<WAmpXo@~J)s0Xo9)g~#4xUI6qy^s#&djFaWtFz4>5
z;~ur?2gerQXJjoHi+O2$%x69M^rcT5MfR+s#8eeKM*|(}Z{5Cydpb7U^OX1p400;L
zVuT}-u_}9WpRFtY&(Ne|<t<t^kP!PpBj|lA(&PAnZ4K~yV5+%S0Gzky=|X%&ff`pa
zA>7-Xy9@)KnDsR_ZRm*Pr`+?m_$CtD%Ue|1NABZ1u)yW2MffBmL~BTcgk8cn8QkaV
z(z{0ZonZ1vW7ASMauq``>*zkUc|3a(C&^<9d8$DK{K`k5?Mc&<+9B>It338Efv_#X
zmF=+XM)2!^4PS5B!oudxQv@-Ko!qp?8xL$(SN{MB{jxGaJ1k)HhZ)X08jb!Y8C*|v
zQSwNElmGx7oBV0R4JW(=<xOnPejkDMw#A@=*a>{RO#PqfOCP`uI@y%Nrzn$V7&_-U
zuC5P>X+6Al=>$rxC(AMWz;_0v9}&_38piDy=P8g6PN$mPVW6Io)ShZPwsO*Z6tapz
zaciVU8mJg0IW6Csh7W?)T4GA8r9&BVS)U&=w^NTw=`TEU6yU`)@_f&`Zg34(Z-_C@
zvLk?gY`#Y#v{WtjP`T;bb2)w%SldF23gurp9e!_fPfv!EK>(U7c%xI07>?t$Ezge>
z4=P!TC?|4{e#73guf8E%1PdL(NZf5jasI52UvpdXP3qA%!^Ih1Iq+O_N|7`mF2!jd
zp{^%P(wO*;f3UcCW5X`*;l~ELUln-H?&jtNDswX6vbPEce|p1?&PKnUSkgv+EIZ2y
z#t&dcXH~&Q%X7rX&NF&+INyr;mXj8nDQnyoljH-dj^tO#{{RzZwwJ_hJVCsykc=CH
z^&i&0hxpxmmKIXnJZPUY7KzX54{X=U-X_#V^~90SGm>R2s-1_Yy?oAVB&zay9CQ_z
zH*&6R<+&>qq#f8Y1B_(jpIZ0dfYu47J%*Ua5Cu?fLSVS{$Je!a7sC$*rnjmao7H&6
z{9DG$%eFbqeIxLj!;2I@Xqg04K?_8yDjY%w@d4cN#eR|DuMc7|H6@H{%GO7dn_{5^
zsr5Z}(^yR<A+!w~h9Q|ZCU`v#4|>bg^{0&onIh~CcLf}r_pDeowzd(Q+j(ah#L=z;
zxapjq&a2Ne{Mkhdj=9PDSL*mq6`bmG)X^N6oaMMB4Mu8rk~8d=22%Nby$bgFRwcpI
zZ0<yet1LyyE>GR|#c587B5jH$$>rR?3s7BH!*0tYu@I8{ibH3daz~-Bu%(x(P*IM^
z@MTrbO|q0QTqK3$kQH;wsQaMvgI2BDKpDhJ6e+_$IiwcC(qAoNA#w7le3EM1miAGk
zET#Ts%z=(RZ$VbDl8(USK^7hj=-CW$CQg4!b-Mkai6FrU`&qHlr55;exe5h8yvY42
z%W6F2ounRLCAJ=M^riKAt-(sg+Y3PpCC%Yw+`&+*VM#U8!RNy)w&9iJbOlo%aC_E1
zpEMIiZjPv1B&aHK0PKIprh@dCwyAI4<Y4s!(AN$p3pr0i(W6o^r(<Gf5EE=lmLM{)
zIr@sI@|N8^sM~f0Mp2GIs8;mP7*zx+466~zJvgQ#I|sR02bP2Pirqn|qlA){rOK+Y
zENq03Bm^lufl;Y;o;VX|S9~;#cn7r>;3x>OvBpR{hdHS&e4b>E0u@}Bc@9B8;a-(G
z5wg(dl}CNZ?qD%9M3aXIG3Ei9iY94MWr=`Q1Rd+ndSq1cLnhXE;V<%TJ5LO!)7FEs
zB+Q7+HsGq9AHup-D@2Rkj0o{=WQTNOJc!t2mhVmw?vXddM*MD&Hw*2GSz|^}sVgDR
z-9wf^@Aa#emc+)_4+|uNh=UA+?^;5SGt@bpRnZ(#mSjf&Hte0lpvM%?CLQA7l1dU7
zhQP@7t5Msk?V3rDjF8MuF+%;O;_4d<YjY%$F;tBcCB4tLy>-TvBCm4`$+8*XzF5_x
zh#+&pRq8v^8#ykd-6SCgLATc!&MQLqNV?PSBC&YHQztEk%DDAfiWw|nlgMxbvk>f9
zU>|y@PJ~i-(ALvyL|03BAys6J*oHqVoPaUOrC1qElkZn7fRz~_Rhx^OEu>uEq)1bc
zr|*3#zN@Q2Zn3n|A~OIKDu6n4IO$4Qj5HU-ij69==rQd#NgOf0&>Mbxayh5L4kjp;
z;e(82e}wwhCD)8JctCHoOm>sM82QilewnPR{{V{(WwqoXPIj`W=$~5gv3dRj3c05=
zlJ3sBcq+3ySi|lXR`Nt;nORyzBjg=>_o{EI*jwcieC_!ehgLP_x4#rErB6O9xL<Rz
z5v-WN9m(%pw}`$vMFy4jh%e(=Lm#tYa;(|u$9nj@&&1510~XZNw`0DJQzrF2rf(AI
z2*KKLn-0$}Jg?W@v-MvcSPNMuOQ?ZQm39tUhw`tTyhZVcQMzLxjgg^`%wrkBcR#}1
zaf;?A@sEl%Nu*0Fn~P~3@bTl8IOnM8?_UFs@uGuLjvk%w)b0Mrk21WEebxRpXxd$|
zk}1rERJW6Zo!$CYY538l>axc6x1pIv;ITgnPf=a~F7J$9P1KF$#@=U|oHI8}5_?s<
zLbj8HXE3joxZw29di?(Y72;13;+~V`U6I`k4h}BdhqvE&+HFooBI9B)^CxyV1$tv6
ziblJU)6LFRztt|@zx`_9d_8l1*D<?7OmhG>=P39choP>$0k|pxuwVdea5L>+mS<SZ
zUSW=vdh_OQ@IHqJ8g%IL!C0^-iSJdOLayKsnDjoB*rbNxT3c9Ti6U}>S2^CpsQ`A(
zH%o?Bx_gI`Hr#ec8!!5z58nEkl_I*1Ew^rqx%WkGsq+#K-X58+An8{bZ4`?npJ}?o
zJ`N6X?Z<4>!`wz5JHV=4@Yo%FF;>@0QeEbazI+*6o(H$kQjIF|?O5s12N=UlqjI42
z=e<j8WCB>&GC>1KOn~Ai&JH>p^!zGxwYRvuj#=aLB##9G@y0qITDfoG+xvm$M{hek
zJQa#Qym$4ki%$4mtZG*_;!Qqt3t~V*5DR1Olh{=9x2=K7Fx{NY4?LGmBfwx(Osg&d
z_o-|&tGkOZ6&U%&f~Goi)A9AMUGSIe`!1(&ws7f_Fel7&CpkUA_7&;=AN`zd3|7|Z
zrmRH1S&HW;)Ot{`^(t+ll(BSSx$~Zb@Sj%IZKS$3p&nJlOz25p#=9L0;Dz~E<%3BR
z?Od5-19WfGa3{5WN#Rd`HabuuTNPzoGax@GAN_jiwBLt5AJII?(m2tk19WGRj@T93
zM=r8XZ&Ql4Wp>mN^LK}S0Nlp$%pxcqcFYr_4{uuUye05wPqxq7?BgSESr;R3rFy-@
zT3w7LSmHupLRIm?fA#C0)%-(i2rw<`$0{b~+&)vD-;H`S@N_SJTb^{WwbE;wbD!3H
zJEmy%-(|CaMixL~MK~mXg=1a|alHB4N#%K`>)tN4GJk1XIG$uDdWQRedIR3L{ZGb`
z$j0GcW8krglxOi3?Nd>w4O!>Pa+|t0?yhXW0kWWyKqn{aD>G8@07#Y<U6M#jjBpR3
zu2WF)ghdy1%(2Om*-lM!+Q*EbnYKrE*hbuZ$Nn!-T=<NA8Yt3^8m(7kbei_Mkvx|I
zf0Ui9!M;@^*0~=Rc%H`HjFxv~t41-oxG&s~YUcH?6-^>KK+IW-ZY8*H!_v7eOH;kn
z8cDv}9EluzLIKMj;Ct7Bi_IL<Q9aBqR-*4CPsIKrf><sc=M8M&ZH<2R@zewBT)wAu
z_Q5L%o(GORp(Bt_L&sXYnq|HCj9W(`+`CpLf4bfO02*!0jogvBw?n*wlfuI+amUJg
zbgv!Oa+TzJ3YRQ-Vscu&)OO%nq9o}2%PO3PKiwV0ScU>_UPyqAo;5=Yo>R~tO5A-U
z+$*i6jDZFe1VNv!XoF3-lRKkQ?6}BIS01%~+9@JEjGHm!vzA!C_9P#|ykzzjb~{Fq
zS)-7MoB(6a83^htQav_CV9_9DDU9QVJ<e)aY{M*D5Ef=9c1Pz}&bn&GwCLH~p&hYb
zCReyuOtOe$&hUNeG_aIfMR3E(kr}qd@BTHoY~)2rE$sq3z7j{q-a6;dR3&0kCAN*;
zEyrx9ovqw^dm86;6K6*yiV#5dWlTxA<bEYn$R3PpSTv!y!!sj-%w1c6Juy?PDIynv
z4$|0ToPyrek-}qzVu5hcl5*KQ{i+<1N;V0tUI}8BS5g7_91H?IIHpAo#8!Q{NsC4q
z_#-_JtxD+=F^`d!`?>j$)6lNacA)vN@)42vdK#9|XsEFyQn<IDd@lQ&Z&WAvNBC65
zW-zRe3b6ACY;YHjzSIboGHyT!()_1A2p#A!#VYwJBIZ-JScxFA{{Z^xKy2HRDFkc-
zh|bZsk^VHxw~iE8;wsWAg6|%A<EP<M6_d{~N&>pCQP_6Jy*52E>&TjUU}ac&DY$NY
z`eL(?Eksm-BLEU-kQ_*-1$_ZE1KMAip>IEMjmg@JfW+0P?CxUNww7%pZrs7nc>2`F
z*UnT92`wQ$S`rEo*FM#oj)UCGF@uu9l*;55&JIUxj+G^}QhDYjhFKM`6D)pK?ho^=
z7J@Mx(=&NxKxj+w3Ft_uW7C>7kVSB0QozLc#t(YRX|-aKS0luYAC@N@!yd#29{#kY
zFoBg0(heirgP!$jI8zdNGOG^TmpN}i=}r&=!6cU(&RdLrUX>ojwpx-!Um<?cozaF6
ze23KI?w&e|k`|Q19K<H?nPdQESPsUlHN4jsNn;#n69D9{GCFmqww|mO+^06c$}N=P
ziRfGDO;L9rGSIBCI!b(~3lcz6A>o+zrr5(Z#luYTh~>7Bs0_cK{{XJ7OKJkN&w#kg
zJ9I<s?@-!W3wD+XVwA};W(SP?tDo<GO1@PQCvpib;)dm66Bf#4K{?z{Z^ELuR!D-f
zk~8=7f=)i|X`66I0x(L28;&}69)g%4mdW$wAyxT~<;tJ-hHF?!qGuZ!q6WNJRu=&k
ziFo^i-#(vOk!<FgM2ZMYGcjer!N?tbszVZ`%wRICQorwAyAMx#WRb-nYe?i~SIW0M
z<N6Bd)tMxUGg|qxh^)7T;h!Jg?zKc)1ep{<QI<l&0@))zwYEYzS!0klmT?|WPjTy2
zZtaT5u!H5w+(kAspHM|@N!i%Sq*K_*F-Vcg=GwH8N|;^C&Oz!AY*tRAXzr4m`NqVL
zCe?Bb!?#Yp;<x9vj!<od%I{(GBC!Pru6_M0A6c`sk{MY8N>(xy#Q0(E39mwt!&76Q
z)TfMHo0S40yI3m#c5%RA(AF-XlSo{<Bgn-0rZI(a?d@F_qaWDh-y|grk%cKB1mheZ
zdgt|1z9|gOL0GqWgkV2x3|FT^;zylS=Wo@Soe2j6<zO&Z>+6ckxFCV^E;4h0*W6aN
zvnslcu$-3QhTsf!_pE883nI0=pn?22&V6gvf^8fUAe1r5CjhSuKhIid2OtC^(Ek8h
zM)KDRG63WP)SHJTjsQH4;<hks7>p?12Gi4_{An-&IG5i!;8K92EKstaN*HY$KZUsj
zcc1|S6S+ajJYaK679w*ZzE~f+MnFFFDzW8Mo_<_Xw$vN4QCQ<7_ojuoC}J`r0F%x~
zA6jt_Ao)?bI1D;;qi)GrWc3*bwIq>ABAJ7QjR*%FPtu)+Jc~ynLllZvf&1L<#~+19
z8H~AKoWJoiHvoMp@wh@8kjVS8Mpc%HWR_W3t`$MRV8K8ePf9={2M?0}04V+vKSF84
z<pjSYB#w9nng|Q#72pnEvHt)Xa8_cZu2(!@@%1$97eh#!%isb@Ae?lkWR_qZPS61!
zzLY2qNM#IFv%%m{<~AD&g5TWkezXAMRSFhH9R1cKIi{6E{<c7;pzTZM5XIR!+l6mW
zdWpGGrx?cvu1~cg3o^5#Z3JNd014|;yTZi1pWH=ND%_C$&#=u9O7OUzFr(!g(oS<w
zjO5F(xns4IoCaE?tONFyZX+sPv6tvQ%|uQc$@2r9*(?SHNE{=CX%&FsOLzACDmGRT
zY??lY=Fb!WNuBJ(ZNM4yr$z_>kO9ve^rjWqe7y2|jz%fURa*@o2k&RSD*<3e=^Tp6
zT*fkXj)4CFI_iEDXgY?qsm*Vv+hyk3HW9<;AP>&Dgq~~WNwJky*)JTZ_pg2Zi~JK7
zyYWX(jP1FGX?7$<4rGy3wlnku=e{Z{N)+hIPq8w+kI`R;+E$z4FN3}r@ao(}5KSg1
z<uZ(xkN^oJ3>GK(itxYM>&DUA-zBUP!m`8(k{#Tf0szNgeQW3qZY?^}+Qt@&NhY+k
z2^@Ryk@3sp*SELhUk-lN-ZZ+s@jd;V&H#c;$&;4bpZ>Lc?hccR<c@&UT~B*s=8ua)
zPqo`!$#<D1xOS2-cWueY&2g+wca!{Bu8YSSlU?3P2E_SWhC|ca>s;PIQGiE017AZ3
z^1&lnwCA8P7&O)(5>-!L=7L9T8bi-hk&jBD210^JBp%dbZU+8GAdb`n-|`-`m>_ie
ziU0^0%IDsY^&xoTl#$=JPI}Rd4CnAP0DyNKaY{JqM_K?33gl<p(vg+k2Nb{?01_L5
zJ!x=A_r(gV$6^eY<8FFTFi6?g-kKLdM$j>w6Tr!%B$J+?atWl$=PG~Rq{`=MjFFCm
zwHMSZE<qV513t9nI~XxsfO1s#rlALx<OAA{RhY2L4%zEQfE*P0asedZ^{33&Zz3$R
zG>xzX4#eyjz#iOm6y2ptqozqYP_z;l?<b(=nsy7=c6TA#y$8$)=}m0p23~p}^V)(!
zugo**b4WoSDPDt<k6!e|1Z8<v0DlqbN~C0N1mNW3y#bqNmgg!D%s}n!NJLzDOixk)
zq%r6>g1ffl{Gj)yNs^dm<Qy7N85l-Wo}&l73`xrr<8K6TGeCzK-H{NSZ9Pcrds9w9
z+#7;_Dn(cMbBr;-CX5Vy++&Z%mB3PRH*eZcRU@dSEDkV88RP5gNZX5TApF>*%MuB1
zm>%PxrEnZFcP`<Ke5`v?7E+3$J*=efY~(liQZYi<_3ESgQW8%D^ye6)FeeOf+4^@B
ze8;Hcs3VNhjiH9)#&ebHNwfvaaoA>n9Cv4MILP5~NACdwHRn7LN%u<Uk`E`;QGgd|
z&nLHYOa&`2B1TQ59*jEw0F54J&I<(`@)wF+1|dKsw?XMm0eS?<Jvr!UtAGS9rDI;4
zlj%WV-ACd6G!S1I`LZxE-`bR(c9lE3=9q&F3FD#3KGb1>#sD43pm1_fk=s3J3cFQZ
z4mTat0HA=%vMCFnnB%n$3~Z>}{{VP)`ifEk124Fi!S-4gEKkY5amL>3ieL^l5KeG?
z4^cu87aK_c_U%e?R16Gt!5o21C5Stlfxy7)KoTp;vUz~*+D2H9yGYFBv%U#qlg9_&
z+LH^ot{I3?(D$I69$a+f5z>o*;;bKW10$ScjANxZY+&S^WN<<5I~s|I+*z53#~>O6
zo0R8{I%D;q30hWF!5dgH-MC<%YD2hX5k!hlIp+lWQWd!pD>OOiPVr4?WXnja+Z+y_
zv<!TlorLxqusx|T=0L$V1B@x?J<T>ojp2+$FmZ-o>q~$bvYr4PM_L3(e)}qtJhTLS
z-A}DPS!9r9AtQDKilYG3E65<kKqC!7XEBGA3=EDvC;{#d%_5QxFiGd7H*jek=5pJV
zZ6l6-=}*W<o{fd%pglnxb4+4(t{17v$mbLe;`K%afspX5dk;!*A~_VZ=V;3kz5OYL
zl#*iy1CUQ@Av12;K5X!^0n<I`>J}xD=aCplgs2%&fsss%hIDxb(yf-;&<{!_jsWCa
z1_~4w403bdnnVpNj&NI}W3RXr0OKfUW_H>M`2!wErDCjwq%Fta$3Q8J#GjdVwlF=#
zIBhPj$01KE?MZ<7)lg&0!Z6B%*B-h4l#&+ne5WPI04P(O9DbD&2SUvtBL@m|oO@E8
zvM7xguLo%F>r(Cnp;&|RuytHd&joYG6v*ZQOHCPXn<!WKO-Cp%fX#;BXFQrzjQNaX
zT%Dr`ImIE~!<uygvJM9%4lrnGNW_YGE%Rhh1ZY?~<QV!M4t;&;ra*paxFCJ*#CD)A
zN?loAH5)^H&^sCfw0I7AE4M#NjT{D5AdHNINX!)sWH1>gJ;9(?CRT7rXv*bq9CR7>
zr$;J=g<NkbA=<;C<G-y!<dqVHCukc-)4e@e+vHUQ4uN}T)|vuBUuT&o%%%A~IrOGP
zV_8th&4VT!59#Sh(uO0UCxSXtB$OhRBa(O?p7ib=OA^A#IE4z3$_jb`>za>wF_=+<
zDI_pakItHA5v#a7?ctBFd{ZPmBMDRnJdAP&si$!hNh?Vn1Z=FMB0_m%*n0|ew?1<D
zn*?kl0i(ytal!fus-R#U#fC^Y>OI8~l8v3Grz%fBjR0CRV+YMlE=kJ#$J_9sWGtJa
z`Ixp9alkbKNZC6_%16xK(t<}(&Q3`5r1b(%GF45E!2pnlO`kIRk9w778I<J-b;MhL
zgo>&i)wd%lVt!n%c&8(c!HTh5;ej1}X;@{yJwzcQJ7ni`KRbQLzr9G4nAv0|H0LQ8
zOfmleX!}(pmk6PYFeL05<S)OiD$V7QED?u)GbCpquVF=)jTr8wD>KC$a!O&^S$^t_
z^T(|@wHJytox+)7l$&yj0F}K6^c9wdDFe$HARO+GCyr_HO0fmm9yb$$PfvPjFtKuL
zr)%FXM+837&Q}UpjFExTl+Pl_R%r>7A1sPU`MZjsWhuJY%e>%{V)Z@hK_ORI&@*{p
zFmgr-KDno@g2kth7A7Pid#a4E^)(!lxn+?FD*pf}!00_{6Llw>=Gvnqq~PNlLgS`8
z(^^+J8Qdco*t`bMS}X;@a*ndx2gGCUDLBdKbLc8TIWC!vija0XpO-$Ov;KYFb-WDY
z?yx-d9sQ|NdD*ceh4P2))Qk+CwGKDjq}nuI>EwY7?5nqOWq`|iXV#>)xe0n41tm~2
zjQz*PH)FRIl$W97*&2P~cLu@Fu%pit68H-HFgJ0KJ$<SjG|Eyhyp6TiHIeox<w(I4
zt$QV`{{Uz=Zwq05=NR|*`qq101`8|3?;4CTM%ozv0C(6_i1Q4~9i*(Rm~G=Y9-sYs
zmrO2OGRqS&vz!8c?4vmcu0g0RqP?`9E2!pHUEeun<w^Fa7U6_raVr{Rq0e0P`qL$p
zZ5w1DZQ2x`{m-=ulNHgaHRSgf4<zxZAPwmhcp*oB$El_Z`2vlOP)bUNb;!u=?OBg1
zzST*J?K@e4&lsiMHs6=#LYQKD145!4$h$54f(fnTPcc|?v~mx>uhOlir!cp8qq>Sc
z(1u;{<)l1up1@W@T!h>RAPi;O9D94zs@oA0_j#4Sb-UNs=}+0K1<j~+NF81gzjVq%
z6<`El^<X`H`%=Mo3dV-&*5HL=Ez8ZwZ|@&bSui_DT1denKaty@82*Nm8BXHtU6gt^
zdY@#6b9~*}#|y!!Tg?^EEaXYIDtS|Z{&V?LF7IQKA1VuWbPIzsFg?5GvDWr{2~tK2
zv*bx51iSRwPhm+skd#%pF0YIvY{hqz)cX(Ck7ua)i@KJ&ihR3?H%OS+5OW#FU$3=a
zvehpwl1byV3SdB4r2&RdVm)gX-Qc&88Eu`F4hysAa-ZODr(;MiQ7z?|$+}3?kVbGp
zJuyww70#j!eYE)+SkyAI>_DTC$CAT6xy4kt)EawfishaaAtMJPuQ{wkd~RQ4F-S;U
z9jBA|R8s0P>@dSN$ja?;kC^)dL}>}gvbx>Okf2G%&Fo8#2^}%VYO`mp8Ma?s+(YIN
zQ*dm2pzwICN4se);dtUI!*I#zQzhK7c~BIAVu^&Cb^y*#Y}UTcB;A{qo+6tjc8AXp
zzT%02=K<UgLHX3_uFGyiHQ${&$Yc)VBP4vQ&rEc#Xv(b2*(F`ek-r6b<O)%6#wTeB
zA@jj*K&kc-xLupy+H<=`S<t)^d99Sf$PZY^^!KRN^g8c0h{%!|5mfN4jAQcu06bPH
zxn_%Sl!R0J!=6}reiWi@=p8qpjms?IzCaJC^{P~rtOrio{A&c7gz^EB0od3h9sT~4
z-|btbxVVb$Yj?MhMp8|@0q<P=I)&Y=jU+@XDETIM!BTthYEQSzE!k_BnWPG&G)sVe
z@##_Zb+}!lrGs1&p%5g3L~PEu1Ak>dK}F8Fe<HoD%PUGQLM|dbPp_b^dVNjqS(g4#
zZd`3=3$&o^!1kg`l}Suj2<*zC50w2t=)*m!eN|k1?AM=DHw9sl^6}5QIW3>d7#wXl
z{{Yac8MTEhF6Oy&^JB_9N-_E#d-ug>#j$PBxsEs5e3Oz(l7F2u?I}I7qFXF;qqo`=
zzF%(}ap~WW#;s9N4r54NJ-z!q?CtiIgiW_`RcsChKfR9Csi*5lO=#neNn$b&H5J&o
z1oBSq)y=Gtu2iIw!bmI?{&o5j-lqQ02+tHO5GrL5zV5w=?r4=el&52HHG9+LrIZtI
znq9WCGT{j%=Q%&;`Al_dg_7<hNRnNiT#?7sM@|9gbDn?5=Mv^`CM#V+R(U+~xL4b?
zPdkC`aZyIr@kGWLC32FnR%s6HzK7POQA6iPRy;%Ye=E$rMU!|{cWxAR3_Je-DzO&5
zH`;;aq-lz|Mfq5BkHgxzC@wBV#1rYT`O=3Qt;}1BjB+tdTgf4T?qZJNCRWTJHb7u|
zj?_FXBnqoK%N<H@vc+>P*i!dz5M)v_f=}`t>p<!&BS##`bLAO9ET>`HjzRD5TvWQC
zwOf0O8JVX?W|<27xg(q}Psi67tJe2(Br)7vz0x?4yZN$ztp}#xZ}6yiH05?ut7E8-
z#4tw#+{rO?ws$5t-v^F1x33)3(rfp2$Rl{dszK%?%%HN9&px0J^Tlx*uCI120yzjB
z$s#ow*guOsNc9G;$#n5f;#;JZE}&4d?jc(vI47{Fd3+g4yS0vz9YG{zjyRbTSp!LQ
zl6;AtbNKpxboJHJdl?!FtBGZfSCGgYscakoJq2;!+D&k)JlosJV##mj;4$frJ!$Kz
zz18QKk;@{*BIX2>h4ohUqx(K0_RQ>Wwd=WUBWr8rwr?|P%`m|rj*Nb_JetOy*I#C|
zm+dyuWBnjXO8KRJVh8Zx*9&i`?`DQuON;5AZPCRX_*L`+^1(jUEV`S*t8Z^<Br#k`
zxv<2xK>4xgGyJJMzA{4g?C)+b+RpJ|Ge<PRP$ZykNuwhmA5uL}N{s4>5t+c1rC5td
z5%IVK{D-A*&8h8>q&EP`8f9QIleiwl{-jWv^S!giF2~tf33&)033JZF*FCZRM69_a
zCtaO=&a-9qV=LVfXN{6HZ<pp6B!m8YRln_pj^Mr3#??MqNXh%M1?b-R{#C{<u<;`$
zl*SPnl}3{iEF|*B9ppWIvs1@-R^s1KwT;cXl}Wc8mnZm_JqfG&jBHP}mF{=r#a8o_
zARB;^1HQ<B>Brq9^~a@N)AhI_xs~q%DQjYo$3NbMyEnP#@~=6y*Jb+@?(^V7J1etC
zw`eVZymfBeRln`)rJ70On2#j@Pc?JB`!0L^J*t1R(%9ZOxg>VFcZh8yaJP|}R|j*)
z$4=s%7PRo`_omWcJ~;+$VZg{a=LfZU>UgS6M@5?IXKOo$k)gF&2m{RrpP>CIE<8l+
ztu~t=w~<$T{%I$EI+Y!PK9v5Y5&dFJ^b2nkd1|)|@w81I*c2$=6NAa;sWmJfF1E9Y
zWD>>u&C%uC9!c+!{cFxoiy{(7K9#ysfRPh`b`m*0{N|?~E!C}^hN(S_abCm_nIH<@
z*!ttQ{{X2x3|kLxq1%7LQKs8z(%jr?k;!G{x<*}2<b3kL^*)&ER|kmAoFY9#QHntd
z4ZkVhk56G-EE<#^Og7iZ(X@<5%y^J{0sQK~)#8MtO)|o)-@TSc$YI;)Kl=3&z((2!
zwmYkRac#WEk=|H#Dn}zZ`3d*#dwvv;;~1xrZ0`KadEz6;o<Kagm;1OKJ#$<Pn%oTH
z;chb;D{fXNBms>70QKqCo-VeQSRYGSuG}ao61ZcybtgSKewBo>tLt*rb#u14)ZmeB
z0h!8x3nUCfC_Pw?pM^%ABe}iP{?|G>*#>A<CmR5e9wh{N`kuAJ#jYi_#8=68AP~%V
zL*{33C-}WU&*@K-Tf1D{T51r>arT^>8KWdTAdSQhfb}5u#b)xRm9A2+6S>p1`x`kt
z`6FaArqc_Nzk}EODP_2KwQX2w^1}oZc}W~|<Vt_TzqN51ez3OEi)}UuuC09bm06?(
z*@+~nEzx@li0alt${V}3n+ADVVlxoHp1H>Yv3X6+79m*r>gV>~@dAj>mox2AxFaFj
z#~g+|R~5}k`&4+-Su)9Mr^3+4q?>^&CfCnQW1c(L9NI3GB#5_`trE#U&2GmmN47gv
z=`5mUl;2MTYXaoP6e)El1AsZN+14*Ii}<wkK2z%WTYM&tr~60zLzc!%Z9S!i-d8*B
zJkmCtbX@X9Vo&2QiFf*hGaY(p<MKA-$&`Hm01+SOrD#PJ>Ph8IVt_PZZSEwD6dCGq
z-}+GvhL{;quVWXvAs2Vb=g=)-S{3nX(~~rcrA_;&$FQHr_lqQ&hP^vW9^r7&;g#bD
z<zbP)^%T$eMXx6EF70&*<t-swg=s%>02%4pw&uNSQu10xAci~}xa2%L4vU`L_N4yN
z(eJJ9NhTp72VralZr}mZrj}Tulhn6Wwq+-SEf-L0megKsMhcQh^6-0l)Ufz^+7^ob
zc;wu{iDiDHJrB2f)v~y<x{f!ux0XdH#H_M$j+`2T%KrdQ(||;a1d=2Y%egR5Y}Zo2
zyJ~07%J#ZEw(+*HXF7Q>DKe8DIL|;oymMAy(_qsgb+flQb<8m~GBeL7>ru(AK`o$~
z8;_Nll334D2e+jnc#}!kB8J6oCTNPv@XzxB>H+lht>Kr!Y8=ebxY5KBJ;aZ1B7_0q
zjA4O2K^>^Ju&}bWTPr9$t<sYrX?N_;p{$YOt9=&1?Bu<UC6x=c)a$#;9eMAb!kIq4
zS^mx~$r45yDN_Mh9(M}fI4DK#E@pHQ+dO_nic1v8*DO`mEaM}P$F)A*?$JEscWJxI
za*7DUC%E=C%t_+7;f3RSq5{Mujx`u;=dNn3-YT^>e{6`&<~R*IlaaJ`0=iWiFkbNu
zGrZHGmrs@TeKJT`fHx4Jv`O8R9)_E!%co35rOcDS7;lDDlaf2<9<{;`7Fk?O9^UtR
zyKeFjo!B0@?NL9C?=9vQmbWo0EBU5Yk9OdHhv+@3m#~Yy!QR$KesyTH=_1uUJ$=0a
z0_t0p-Q|JUXTPWa09vJ+#7?aDabYD97q)oDK+jTrO?hSajz*~@mfDQq$q)~0SL9b?
z^z`?n)qGnOp!+1(&P<Vw@uT5Yi1q9}zsav_g-cXL>R)ryqVZmw@Z_sCzA*Oz@CUAc
z8nXT;&}O=6ZQEdp7jm=YGjz!G`d5)#_?Gr-)Y7f4<NG|Id8;7c=cxzMsei&;pS)PN
zBx@l-a7iJE>+~FTr7F}fdm2aDcRgXeZE0%8?nqu~B4#TS5wxC}^sLM88rWMw<wtZ{
zStKS%Tb@t1YVwU!$B!k#*xKrm7@<tfI&>h9yYE@w@Ub;PZz9j-$d_>WY<2)*3V2}0
z)K*i>sKwegLsVw>XROWf66a6dBykA>xM+$Golm*;s`vi@5~b7croEF=6M3-bWwH57
z5zzktp4H=5-w<q;(T%0dk8hkm@3Q5)^XXNl_=BUyc4>N{iXt&8k-4{fXYuB^YG(0H
z&PA#%Estbx9~t3}%I@HAoj=je@A&p^xnbPZ8}Er$kl%|7o76&M%<mW7jDgo5-ZkTM
zd|$WwDUs~iWhcuhtTF)Tb6L{-OpaS-hByj73kfsJA46PqbLvT1Pf@HZeGg>0@!Yzj
z2<6me@)d%tYWsZNbA~>j<kH{x_6X!y@3jSvef&c2u!P4?dhp47b$s?l#^ITvWh4Q^
z20g=nN{Z*kbKk-uyfV(q_a>Br$}!VEmBRRf9m-fq9?^f}TU%xpmZ?08I-TzFbRL4U
z=J=0gbS03dm-b`=Y34Zc`(yC*uOPbdZT;C}=E$X$ahVAj9ml0r{@c2dOc$~|kmMGO
zx86Tm=c&XE-pr`r&ru%~tR`i#yVlFh2gy8K4!j2Jc&IPFBE)2OeM$mR0BrEzQC?Xj
z?9v%kLLSPapr)5;app>L1_3^m$oPh(v__v(hjY*+_@uV*Nb*H4Up`+w^XpmKkHq_n
zg-D{6ieMLDNML;{k19dVdvTggx#`ora#YVTlU7<9#|=s+PJC+(sc*5(bu6-gWVn`m
z;C35*s=S^vy^)lgxdD$R6@cwfPjWqL2Z4ct4tXMs<J<7AY35j|?#*LPF*QHoE7p9G
z8{In(m|!v5+3UD;HCAnNR+t5Q$J&P~x!_e&dkRcr<tOSZnc{27S;>`TK1+$*64IZT
z<$ye9n0G12bH_tUXdrYxnflgFQhTwA8S%890N_)4o_`8ZGmLfg#RCN3j?|lM1FsnB
zXgnO`aYhC@P<rN&0pt8=@7Je2XzxqL-Z=FX0D}Q@o;^F!gXz+OxWR7zl!vE3m#qK;
z+Lw|KG@%*(>XVM7b)><;6bKI>{{UJs+W>wPXPwx|G`mP#f(JbhS^!RcI#O}eQ<xF=
zx*9h6slhY=m^jD>6r+wY&UiGT7_dxy#PBIqOJEM9;~1a@?Ksak&J6*1BlQ&^i|6vy
zfaj8X`%og~gK>rXx##ewVO(GYa#ud0k#GqElZ;^0thhL3InQq1)Sgo_ZQF*=8KS}?
z+E=Rnbbt_X)7G97a_1fTdeEu?2N+Ut-n3bc<4TMZ*CVwnDN%_5&Nw6b)Qlq{O@t;s
z;A4_~Y0Q8#c}Q`zWl6~t`A2deEyp1V<DNQD5a5tGJq1f3kd+DvP%y2EbD;>x(c@^#
z5#QhGM<{ARwN<e0Fh@~N+5s#81awk*)UC2n<=`<q1q1b=VU>>&{KxKsJ9^XQL2@Fb
zxom<;{M>Y=g*o*e)j2>{%pWS}8PDnUruk0FXINY!95#Aq(w8V96$9Wn0zKPR@zDFz
zS~0gGKzYVT^QXoXovQfb<^*RVr%yZu)YW2tB0xgCV5?)XUW8M!73@`5$?7=lMLa|i
zca=Lp&lMwulIiEzh|a`>jA2(f;10vuoTqXr!1*}FI*$BMkgi5zDyUl+f4V#W0Q#sf
za8;D=Q_gw;Pdfp3EroCZByuW6fV-e~W(t0Nqvk2;?tLn(A_0>aNf#)j@zaV{idf?L
z&LeD)6!1NXsWvLM<V~sx*sgNG`V&hE`BD<glwtEDj*NRzYk?Z5L7m9X8zFO&2dxo^
zl!sLy9zbT{s$(0f96(C$!oEBDQ<5fmH=`>mV4cap_NQT86~u3a^N^`#;nei0Jf(fX
zivkA<ryTzPjV>d>IV2V!fZwG_Z5qhw0wcORfX$qh6j)?S4CS{*9F;@3llN)O8pw_1
zkfUx%W+Wy(eLwp2=Uh!Fcvv$Hs#W;Mzr7m}GF!~NDEWeM*VNOnt~|vw@-3<=gluJp
zR^y=brgEnP7*q2md-@YXGpZk#Y6G3;sr+fpwK)W1Zz?~Cp7g929|f}9m50nwBqx?9
z<;U}<6uE0>xqEdH#&W)1L1WUO0wjMia(41pe@dBSc4+Q=hdYT~;NT2<P|$8qBf$mV
zmjs*ENK^$1M#kz?`u%G36U7mD^6sq|^2<rIM*gS#{#8Z^XJ{4Kj#5_h3n=+i@B#Pt
zsZqm5!GkvJfx8$O_4lmYQyI|d_r7Fpdo#xx2(dJ5FiQHbZ%VuUuLR)QxpNYM(odNE
z2;^5Vt}kFVmkE}b?ej}*%Krd&*i?sByOKtd-XN_I3gm%@PM8DNHO(wMTN-vXbq!Mp
zFoVjGyr8lSvYdZ=-m@Oz?uppS#xy0FbCd($)}xclc3WnX3hXzqfAx9f@%`$k@?0@C
zx0W*!Nh%^Z%ICj-dbm<i3yE^jnSRi7x-}e=#ww)9@*gQaedmCm!aZsJY?3P~{Kha_
zXzEs@y1LxMV*c|PR9-R1U#(~&0PchLFr9&jS1Zu>#(ElJu)`3!13BZNr|ofWkAfpE
z#Fp-Rkxdb@62OwDsU3%{79GUcgsN@M<A8T{`ub731*DoX8F&OXFa;{cBy7g2dHJ!>
z5ASA-t0`4va><Ryr}^T5xM7Q7QHm}MgntO8s-^?($t-Zd^%UsLfUA}nQ;nc~;qOi0
zInGY=@}OS+)a(MT+!kU9&meXb(yXC}QhH~#J%fh*>V?3;<B>p8PBDU`f_u|QLw|Ni
zA<rFmbkBNW*%=YOa8FG0ikC0MU?)C<kw{SO9#-A0*@jQK6zqUNL*dpk5DX0U{QYUl
zN`CRSNC!y3!5@tg6@o+|Glu)V^%@xhzFl+J<KCKx5@YvbFu-7vSamt|rzsCAvoXQr
zKi#HoV#OmsG6yZ(`cf7<gY(x1jw$js1Hwm=ptJ5cQmu@8nh~TZQKtD=;n<GdsxF|C
zpDP~#+(0A0UTI763o$t7J%FdlU>y9eFbNEHx}0b0Nxg#w3JQb4KD33mDA)%8lEn4)
zqy%FsIQJC!K#`^lLVTkD?ii$E%ks8H-c<S@dW<_V6>xBV_69hmR|5w;<Bao~IZz6~
zIx+)*!|vyrbdt#|tt^rN#0|u+puiucMmYq9IXyCI%1K~nP*ko4(TpEjw2%vt^9|hX
z=tt#1!i?aOGq{udshMGb!wh<g3CRiv91ss<>rTi8`9fi1WhW$-Y=S7uC<iLU@BscA
zPrP%qobixxgFr`-wxnkxsm~O^a-464P#-Zs#(Hy~&XYUI8O8<zj-=B;WOA{v&OZMD
z_)+(lYIZyv&@tSz6$cn!nMtHp83!i-^X*OCcH%hBI<Y-yBo!@!SNMIX5V>p|DB2E5
zptix0z{fbGCj<?=AG~wd+Kq$~z+hvX^FRS5PSAS;^K+3(rAQl)lb*-DCidI0!sD)S
z&(k!e3`cR`k)C^s00`Wr+i)R{0q;mj<dK8=QV;<w((T7MG!4Lfq+sL{X<PxH8E!L<
zeZ>xNFsXtE8>sJvA3;xw3GU?kG-z4drWe1ZH5pD;in|M?xg3F%<uQUe#d-(AUxIqK
zjV=>i)r#6_aW~H^o^$l;N$|(ue~NrXsKt4xX`W5AasvMVXdiujht|FM{1^5g4_o+W
zM<|6@myt#?Jq>+sOOdOp*p=wNR&Zi*4f~Ye%y+{N2KYxpd!)EU5n6!A#9>L#-UGQl
zm3vmxmU(2=t)OXcNIM$@jlGApRkA4x#iv_>T^|!GbAk1(i*0LBk5Z3J(E*M*SO;mN
z1iJSCSJ(2W%iP%Hr%v&++?T>W8Sw_XOt65K(7;;c4mK0~Re#`*g5&WAjn%G^uH&(k
z#~j{iD;pE{y*GCJ>(F(m;P`FuUhl+0)u6o87s!EF0wgSOayxOF<~{+*7l7>U^)EeE
z6jJi5kG$uQ598jdF^;!ADpcB(QZD>{xSL+_;&?YtibNW1s-VEil6mJH4l3=3h5SdW
z_*Ok5LAc0C2b?Yr)kBPMJ!=nAo5Z*J-N%V!ZPypd!IefzuRTA;rn9~AWOk9w6jP*b
zxZHr9q<Z~*Yjqi3=^dQ0SF_cdw%@Yfh_0oH<G6q_$&-me+(_$+eyi{T>%jLB>Q}mz
zr1wnwV+h$SJCFXoZg?w6*R1qOd{cj_OuJQzc`jHMJqJB1Jp#%6L*k|W)LCu`aVS9e
z^3FLU{41&{@}i+eE>~<{iaJ|p9v9Oz>q~YCEPJP7zj&V5^s65ZEv-Byp<HVB5|KU1
z?1#+i-rmBtyhWvWi{b}~EscyJqp(pD+XVS=1~ctY_=n)f#0^S#;)*dSjy3=ekql=C
z+upRNO-eVGmp0{sCh*sRd_OhZTCT6Eq%AD_wlODik;wMXtz6aq9(*$o_V?9dj2VvW
zRmmxjR<1W&@OGi5h%9e!%FD+dX$Nnx&+A&+$Aq@%kobDe*ut|vnKXg^_U=v(Q}nH>
zRE;`!=g^e-rF%0n^ZpStb}w{7E$pG;;#0V}UJGRPHN<>p@kX1kSWBo!bkA_4CA1j%
zrZ~U^4uZWH{3^KAu5GQNM~*P~#6uio^{p*4_It6=uCsGwB@PLRrW=bM=RK?D^Bm$3
zii~CV8^(*8wU3KG;ZgYG#J34?d#AaP<Sxjow-4B3)BG#5@VD%{tlqj0?B^ax{{Tr5
zkGxN>r_#Q>(LN1mma&_w*q?M{v{EP6)6iE-Y2e6()H->whTkDUxQTdW^**M)R<0(4
z_!gphdXm)nf5D%!zn_%2ws#vmqVbG;-HA2n8VBr~rCDk6q_*+krZ*?|zaDGbA@D5P
z9F1g(ZR8T}h42_U9(Ms&;jofOWxJGok!9Vw5(j)%PZKU%bS{<>lvSRmnrVNt27~s9
zV|%0}k$0{*Jan#uP524nT{a&&@5@ZN`A~+~J<qLmaKzB-7SqLtg-W!tESv>Be;Qlk
zWS6t1k#r5bHvy)VxjS2^_O54Echf_<of=Wu8CIVMyf35NCG16I+MNt}$UVhrY2F9$
zlrki8*@cl#W06KOzW%19e-vq&exGo+lSndK?16|LXa4|Nv#0TnpB17=FJn;6nHcgx
z^!60hOhme}xhSWyHk!l3HYhC?(l=RK0nB(K-!)=gPfWFpM-Gy^O6?>Zf#}~_<d2Rt
zTghjd!u^WC!6RoMEQEdHGsqdvGga<<ZK7%Gxn_2_Cw9*>D9QAyQIwwSIq9RWeMd}D
z=gj~ts6u0caoE%|c%jNiEQlnGNs@|#a2|))R}+8n8q&?2qAP9zzV~lR&6CH_%7xZK
zs_ls6LI@|gHLtOD1y%>8w~1ha;iOnckWd6%ebe004~=4#M37sgQOT5MQTK@T_pd3`
zz9(u8A-B_64%oH<E-;|=&%IW-_?2>r9leq(MI2<3NEkipIVae)DsQRl^7y5$<5(mi
zQ+^wcLi!(Cj$ag9MyzC;axW3N7)*Lskz4#l)h?CWd}v~i%#Y^fyK(fWPsDlTgng!9
z0AfgH;GX0T)YK=~Iq5Cg>o*=TSdRED!-8?{qq+B>YqreniF&H6L1%X79>TnGe~3X`
zG?xcq!z&g!&ws+Gx5PV!5}7X(a6c<AbtjBc_H|!Dds<0udr9#WV&q1X?S0##CHfC~
zu6#`_McdCTRsR5eCiC+90bV6H#R(X+?4mVB+Fjoq4)qk@5+Y5{CDMfnmI6bPJx8rl
zp;hi?@e$~K0S}8~wzyehKf5Y-Ig>kE9EKgK$>SRtp$!zRza*As`AGJ!ohA60sHdAB
z+m+*N6kWs|d-~RHqwz~xj4al=oa+KGW%9`d9Dn+{cc!p)rtFy##X&2x>6!i`=#ho8
zzSQGJ84wp<8|Z(=tV84955a4)3-oCU6S+_NruuiUlE2|>eX>@D>iO15n|lmla(yw=
zy;eUH^;;XFt#>0M0I@2+EB@AfDSu{SU)nSJ{T0yrH2Bj)Fd@3up-h5Gx!~j1>sgn7
z7W_J9md!4pCME^&*+m3>)BNk>tFMY0q^j~<>eEd=#zu1?P)2%V)|~$U6150kD`@UO
zfg<2%<|K|uJ?g)+aaSkn)K9B!{wer!DCD=YxPs)rETrRV`ijN4_?4$fi8Y<d#LX$&
z5tHuY_^alm_@AiC3r4}V$MZQIS3HW1{w&z7v)snBGARN$)cnrb0OX#EIjfFeid%=*
zqVz}5cOMlZLmkb;61LYWB~k#cYvR|$N7ej1_BOWaW0hDi2MidFx%96Wz4)k6S<Le;
zQ29tsM(<pITFt%j)~9!7_7hDa$0`<W?a<?c>?^7`NhZ0Br;C)Le9ik!TUtlsSnlmM
zgCqn?$0e1yKd2SwAm9S4^Jl3w>OZtayp!ry_d#NiKJDdK<{a^Z+;y)oD=M5g86MT~
z`Hc@_i<C|mE@yM;AK0tn3>s`#`c>`25`j!_y9JJWdk$;ttvllOn6~z|A(DK?Hn45G
zc;sTgIzMN<ZFKEk;@(Sa?u-?XH{Cv%ucCBMA6%xJ6nAU`79(=?QR;oG*ul|_Y%*t7
z9~nAL#QH|>;>E9=_ScswxuHL1L;z#hp7hIai4ig^lS~0*$FAZ%J*($ie;VFHdPU9B
z<=gj4PI5bQ?^a>)ozCLIc@>HIkoEeHL0vynUCx!5%dzwz_=#nAa31#SX$y^tag*<g
zB>0V`qrS<+t+Xq#JOSy7`TY3OL_q<%X4*+pzmPr6Hp9i{IK*usbzpqZAMXNtnjRC(
ze_uV_{vul1tk(gIgh#azA07JpntJ?4F{(`-q=3k9ZP;Wd*WB07_Z~aAwS`hUlHf5Q
zFFE{bB=P>CEb?w}p|D#A?oja8+@I|QeUG9d__wA&?Fu?Pu}Qv0VSxVL!lQ4Bmcn#%
zaU4ikvWDY%Jw`v3eDg1i%SP9dOzc7Z;SGg9{c4B)78Gv6+I>iY82Kb_PCW%@EH9Xz
zJ-&z1AMmxb+n3vGbGaeOVZUo<rVqFCrp@tiL29=0d2Yk!0eE5$aBJqsykT^)zxq>T
zoTP=hCp{_mKM|)(pwrzJYyg3H5s~XzJRg{rI!Dkmd{wl#nT58X2qQ8Ac^rO~N&YWe
z&GHRF6}J3{ybwKW=lic6%F?&*jBhBxx&8usjw>?r#>pvM%<+Xe4d(L1e@f<_AC<3o
z(m8`mQ|W7Oj24#9wQn~DUc0&<?)_<y{7h?D+T6PpbLI$N?=DYV*Ue|*HPzAIcX9%%
zhHaw<@W-Vid_lN^-dW_lnr9rSSKyCtYL8~t%)jjx`X5S3@j@4OK4$2G;gn1BW}t71
z@HvtRuGK-nMc<x%{VV5Z_<<`Z@|;I5-<WUVN58qG9}vNWc@Z+r8j#Jq?~kXoYYWGA
zFR%Xqbow*?7PJJTNisOj){rn56#4!qL|vkV<Or#mTXu2&(65<);Wk#&*;;oB0sF6#
zM|xxU_(sLv=H@7w04?TcHCA8D4>0mRk-7M{XC1hE=D3wX2_q!qJ9-bV(uw{oM;Uk|
zy=gp<8YMF4Dtl(WaUT$jq9lnt%&;g~jud+RYDj#01ZgQ$RSenQT;!A2=qcXYF@1ks
zkE563jh)1zJvUKIFdMwX_ju$~ar{`Y;7fEOh=Q(UYzq0){u6D|$M$yzc`6ynA2Ig!
zrhme46=rGVGswy1hb@H%JuyOZ{$V_O?0p*l02H9}P{Ale5Zol+ks|sLRR_fTSmX=8
z<S&&?+>`EoE9ckoe2_-&VVedp3&zI@ifZ`wUo5e{iblo~Gu4N=r_C<pJZz7kPsMg!
z(i^0XJ;%&<T%W*DekWjUl2W7tmX8B+o|&(o$BpF^s>{D0bTB`Aj-Q1`H;!)LfXjKQ
z`9$PKn|W_zRGyoY_2zs1$Ha&l7KY;Cj57SL;qU<e06nSS@U=t6(Wan8Kn=xsF|a*B
z{*~Y>;>NeM5Y2ZcWpZ{G;j{Io&*NLrf+(59YP_iR^`@2jhu7Kf!{U{pDI@DC5P3=+
z`74k1fTv0EM#dX}7VNnLcP+vH0P9!JfAE~#Myo8B8~5<Y2S7iaSDWGu>+MTvH;u=I
z9Z!FyXrX_!Cz!sc&|mPhw{AXgZKzDApuzR0NAXrUN<8-~yeRo2I2aza^Xc)8@)wv&
z<q81kt)1WFO>Y^`6K3h%<Bf9e4loZ|yG?zfe!X+wo8tYdIfZV4mBv6V(0f!;d{(!P
zCEIbi)$l<)4}YzAIPrY)nBjzi9RBQ&yi{}<^r3uDEV4xv-sNYI@A<Gc){tG<4;wCr
zx&Hvd)B;IG#L<~l0TPD6AoM?4Rrs{SKfO6tA)9tc_OA(x#nZ)h)0zCX17a3!*d2lX
zhNHIeoy<ENNOu=)neFwhRHGlXFRoN)&?Dm%5i7+V<2o<~ML#i7>J38=#l`zcj$4tE
zo0Jj2U-7R7hsS1Z@q~1c<T1`NJ${uuUN(`@V*@z^DCkG2uKYD>Y3lA{JXG25hvK|<
zR}tJ!{$36f=EBLxPAYl6E!s3u#8qRNvZX`kk6QWv0R9qXE-Vu3ARu5&oO9Gu&x;*x
z+E#2B(;-yzkM9FstZHE=xr@csN4qD)=^OX0bWYKMhWo~(Z;7un@0#GOhyi7fsRQX=
z8*k$6p=FzP&Aj2cHDb@j?uzekc_4742^e!-kcJLgy$q#}thTZ2FYy34XE$WV;ILwP
zdsckjGcv=z3EoJ@%3a?iXT5pduZgGf#2d?Q<f-UA>vO{I_Pdpic5a}n0l@lKOlV-I
z7VhkhdYH^Z(&uBMnKf&ZU?(ynf2)u&&pm6Q@g4sF_HTxyo!o7VeAC79@z4)?qu|{>
zEg;LOUqpP&6+k!(?nkY2KNLJuWvA&EFx|ciAtD{yLle@zYaJ?n(o%+rY*#aBCU}?a
z5#s9${mE~3=gS|wjFX1XX0I23G|v^g!l9*?jje*G>)N`HiQXuiSh={4^hdffKIrEi
zv+Ih)@YTE*T9hzcl_o=+0m#M(HS(=IUMeg3nYw(G{SQm{QK4O;Ey`_KT}o}v?Syw9
z<6hCFlc(CncK1X~(QW%X3>E{sAM0Ls;G1}1wuTWG`tO!l!NFiX`&V9dWJz8-V<P~8
zR7x_yeSNF?*Ml%ve5WUjA=h)_^9j1u?#=%IGFFttj98KKWbzNznCo(cmk1<9-h_;g
zq4hP0`l2*{YnDd<NsNgwTOCF{D$T9IyIBM=$P~s|Wi6ej)PIG2d}j&04lY|4XJ0HM
zUeC1M9F+s7wmVf;p5Z4VLc74qW3cRgwI|vHa=?7yEYdhu+A>ESas4T=*sM<~?hMV#
zXOc&#^sOZo6?R+|$kI=olB}dC`MTw*+#YZsv#UOH!0+wpQ7)S#3a*mLgPvQV6(zl}
zPc6)@5H~A>yYV%jy2kE_3ni>8Ztao0m3KU=9>$d<Ngp5_q3DN<`_f%C#j2a8wiqv;
zFyIFrg;k1Z31K9gL-Gi3x_Z)XD|S>@Q$`tsxF&t9zyRZ%ejb%(JL`zT#d1^0iO27D
zVWj^60a-t6fVL(n7U71&j-H%Tq}KH7J5hIYlAz#&{n6f`)WffdqLgO(8<rC`?VfNr
zeco4cD$J5c3X>`kA<i2=FVKqTBJm!XZ*Zv7h7O>wIO3M~#_(TcL={;E5u2bL^Zqr3
zOkM_?=akY$u%lV7RE~l<WqW3~iU*XOme_t{{sNw5a|*j4FtVNCu0S2Z^{zku7FDVv
zN~Evu$|RAt-kg3lSbR!EiM*Sb@vw;kjP3P5Q(RNea)`UiqDbjj3`<`L-iw%TE?L8|
zWP}w`a1XayS#IEg1fOW~*}myKhWb~Q>mL^F;*ZT)qKQf1XPk7b`Ti}nxe%Q}cEmCm
z@)tkKzH+}EWb`Vy%3q1u9IB&=J$8Hhc<0=1(j*Oun4Wr5qwxaSLT0hlEv24C3W7yD
zM?HP3#arU^D<_oqiRBNyxMb(PO-XO@Vk>y#xGZN*NhrJl>s&QFNy#9znP1s8p2xIZ
zc)!ERYGi^&m6kGPPQ|)@Rqmg&M}Vz-W8jE<UFF7aC1Vl<gp#K{GuT(el6*#c$VAOB
zExRNq%auNr_MiL{yW_@_r`!Jk!V%(WV}{wb$qfEzKR$lx^w0F|UoFL6Ct>53IpHSF
zX=REo(%kglh@Z1wn}6Wuy4m(aXr-P&q<rU~C*0z`Ncf@f{{Y5*7rIIHZ7azsISSDd
zQPlTij+w96Jr}{A3h{=E1KYWt8<_W9D}c)2{{Rj<*Ddh}_7L#zi&jg$8r~^U@wVKJ
z+efE81%62%6*EaxN>v{!=z0{eYJ$;T=i@%P<14#2dp$<kjt(;zB|-K$u1{O|sT#y1
zuy+csMDn}vr|5gv>Hh%5{{Z+V9iw^S{5aOkNioSD00j5;uav$kf59-d?+?v2+|3w`
zr8~9)TW?~6-_p79o+aiO)ak~vOTSa56sYt^${L@<8|$pW4b#aRC&*&xJ^FR5i8YN|
zS5s=&q$(V;?&Obp_Ae0r#hxng-P#Lq@Vb`r*#_lg^e3P-!|VS5v(Jol6_Y+6m`Gaz
zk<Qt3&O!cSzJC#&<1uoys=0j4IjP4)dDZMO1R`fww^>Wg<faeP>sfbG+evX9n@6=(
zi$aQ-+6eUZuS&Z3FXCA)NA`>^n-CZygk;EZ$ZDv+2YgF&D^G1?>ljQ%(#CQRa7U$i
zlaDjp9az}opwh&^$99Cs0Q0w;W<J|}PpxL%+N*EOk};6{u8;n#b{^)v9ljFl@>=Yk
z-{(dpRdbR(N%X7MzXR_zDUw#RF`xmw)Q<=_#{;!TDneDG)bi_1E$>{#GVKExjmadB
zQfsKtG*=OR@&U`?r)3xlIs^WCSEA^@0&ik}E^RVd7`D<v;|f2E>0M@p@JjIjvRyJ`
zkXkZEa=xe9u*B7Ik1P({GNnIyO!J*9!`HCQwj}es&zZQ!(e3CymAeL&bjXoe?QjVM
zD&(tr*Rtrp04BawziU~eDHv8$(nHgXbRN~zY5xGTwCQ63k3yAVXJrLAXCtmhrFl}P
zR!--4)@esbo(pH;Teq@%qTeHo0E>oVI+5vGc771m9Ec#d3%P%LJc-H=Z$n=7rF;xu
zB3HSzF`ShiVCn(rF<lRa{sN;I<h-_5+II-08Ce&$eSVcHja%8GUN#9_@H<b0;`htl
zI|!J7;4#P0pIY=k2YdmNc|kg7m$3)P%5cKIjPO^%D><W*;^xdG*C!G}h!=M`9CiY|
zA58dnrRjtTrj5%eNf1Udqxx3R!z=3Ua#Y3CpON#ohks`IRXn-u+7y=o97Ze9yg%>)
z-qzqX#^bao4$Fj$4`InBy>sk-8SwIlnquILAnbqo^<GaI>H2!_wv`u*Y<14l?_Ct=
z#tOy~sX1!djiUS~w9`>kz^a7jEWGXZ^{sooBS_K*k-jb12N(o?K9!59{7z^sWV@PB
z;n=E1ryFtBy!XW)8tiQ)F~x9zAN7b1=l92<t+Z;(a~@^6=^CeqwCfa*MJ#9(WnVeP
zalRt)zMf@yMf_+YT!wxDKC515to&nlEcW(tF<?TZq+oj-e@f$ZpBHM^(!4h}=&RIu
zgYFV5u9g}qDpO_?ttm>;JqyGi6|Lfx%3TSg7(`S&Gap*yJV)dCZ_7Q+%C9^X;PKkL
z?^W@%7Slbe$%3u-$K7Ikiski>h)V>lMBo(!<2ld1J5*H6Ft~W~#oX4G2EA8yta=8u
z<12f0@|Hm)jgq@~$@i{9Uh%wNXn8E}6LTgmNE~ChAJVuB-xlhZsL}b}Xm%iD<v1s&
z`R1^7Kkb!>q*F4fKfGn<@;<fW;xk&69hS$fLo9+<k<;q`01>{(WUz}+*bmJjN^(MH
z*T2%S<MBqJe7<eO8IEIxk36FP0D7qn0c5&~CurAbR**2uV2aYU(d0>S8CTlBJF4Ub
z{<yCyrXq8_+3QlF2z)4Iyf<<e{orWWZIUt$?Z012vMpKT`%qD^5gMsqn|Jm0sUxx>
z7C8w82_@9>bL~^XYjDn^%WpZjhuOPicCKeObjBrTSYWmaBhF+hyMFLKhKa0%aenGE
zxX5H;GH^XA%f~KDEG~*i??i+CS`Me$n6OIIM$A~ktC>m;K=oRi+`WqM*xbqHC8gFp
z-<cwR;T`$!^q?iQ%3j(|QLqyj%MJ<pW|rxr8T%VNOuy=$QJjO`l36A%i+FxegKHH8
z0o;##(t3>#dsz}>^H*$&a_D$h80bYjPYN-NI-r<@&e7C!$DpeF#H^_>B$3H(!li}S
zku-)lkyi}NxgSrhD-?xhw@ZeBqLE1DgSJC`1yx9=np=b}S88r()2Uqc^&`D#O*-7f
zs^}G?UzPL0^vSC6K_$R4ENi(q>5OKRLAe=>vo9o<7!k(bBz-c(blh+%IPH{3wz5oP
zj1okdInSkA@=>EU@$ObFfsvD%f^&!juWSzaHl_|Yd(zPcgllCHP36Y*eZ>@zaocg|
zew8Cz;!*ZEizK8djN>YC%YJoq>GMW5J-*^pZCvAzZ(2sNjpa!Oc18mL4=cwerLZcC
zD6UGR>A}wKzzTB2(yyFtfHB2}mjjd>0an%|G3A{`<{(DHpU2vzlG#qj^Fsmi07eE!
zYKxU(gjTTxi)m*>`I2<%-rt2ek?v+!nlN1lSkq`8$KI{Cn*oYfk8F|_WM%uK{sU1+
zr^rcz0tQPjLfP&;s&!#xRi4sUw0(qz+(}hGHV03y(wuFR?NKeV1ddVjv$pN6kLyia
zjjqUKOzp-PeBFB*Yh1EG0EuDCWr)G&{AlHDM2+S=B1b^+$DCw+!_%5{%N(kS2s`6X
zFu3pAk?By0K)Wj#0X|a0J$-ZUQ47=?<1++fkR*`xIs3S#p(};bEyp5>7DQ1P&U1{@
zQa~h)BmtS^Ad&ufs>0z~7nVmTSnNo~cQ>s$X57L6_ymO@bsqWcPm)5qE?s9&kIHFq
z?VYMuEP&KePWEfH9fQVmzE8e${VIjbmoZ!zA-OW4f8XctD91uiVNa4}xZJHGIExr;
zV3YN&BSpQ$=8<J3R1;f68UPQQD3oPoC#W8j=&qy_E!xkQCp(Ju9fmyxP-&8Dh}JeK
z<>L{vWCriJ`cojjSu-G&c9KARedo_0dJZd3tD=3YG#Xi2&&yOo+lbsp8S9E<=6|x7
zrkNF8{{VWR9uIGzs*}#K!5Nh^B1!U)*iuig_|xTR<W^#=k|dZVPY3ELdmAyjw;Lq(
zMoAWO(llxEs6G3BG?5tuNgS|jet8G(p1}Imcf4kXLbHOgF<{$9M{W;#o>Ug|M|S0z
zmOaF0fN{uS^sRlJ%=w1RA$wr6aKw;yj9~s9>M5p{DT6d0E2vm<KIz9Mqw`UgC56jM
z@)C%R-`1+#$-PQQGRyZA9Ax(fx+zf9&T}H3X`_s+mk~1zl0st~^!nCS{O~#0TZbV_
zmc|F6t5=ePmnpCgs$1^*)>Zx0#lSAB9B5ma0*)8k*EQ(Ennx7pb2k1<ueX^tskcb~
z0Cq?xr>XR=ZdSYz#|Z~xGZK=fSY-7Ew)I(Jm1U8c)plU9JbGY(>s<Dz(oU-po68X$
z&n^h#90C3n-9kE?6&aPNnVd8*U=pR6k(`fDtz=yi#4_M+Jgz+jU%q8!6Txm!vh$fU
zoOkxD$u>;MB!sRroOiEI3qyvZ7()O?2RxkmP~4Jo0LMTnLq>&|Mp!!SZhKQysbS9x
z&U@B~#9RXW$`_6a9S^+#65e3}xXwj4crl&ajDCMwQdyX;;C@^Z1u+77JRdLsIpp;E
z(|{Q;Fjg(p1HjEG-08W>la06wf@we;Mhflg(-}SassW}=jtr8Iy@D~$Da(f1GB`QN
z?@dMmHIhbLd5i!jk^VG_a94A$E%))o06j}HFU|oC^NqZb+wr7OTN_+txdgXr6w2sh
zd>w$5WgR{J=?(|W#(IF=IqyoqIT^PWTxCzn6m|S4a#tafW(OG@AHs}nl}^xdKZNiN
zBx^FpJm~VyPbQcPBSh$rYXgGk1#{mVnpVL$!CnW=+>zFp=!{B&S0m*+yZTe(3%LZV
zwR8K@Pc(o}x=CUfFv4-(l171~8<6EkK-k3!a-qN^0z<O*9@MS55S3sy;PN>m(wG6?
zwE%}WW4QZz8X1c?c7326;8MDkZWOpfml^6YOXZ?Eq5@-O&hM{k06@eB#A>V~BqOLi
zded20g*(1rIv#&IaSZAcac#o|M^Qr%!+y*jg>lL4Kn-jYf>;i?9gn3WI!4Aee6uE0
zgZEpuYD5x%<f?&;DDG&ul1rGQNuy9=OmLtLzPxpy1h$Oa6^=6D<z1{5zV&^>{{RHd
z@STr{^>)?XW;1Cw3mJws;Tsv;Pp&Y2hQ1-P3a{s-q_UM8qbS$_j_2CHLx13tT5S4!
zI`#eJc^5W_Oi~||o=){Ap!Ofuy!_5iIBO@n8ePw$d}$n}JL#=1405b(^T<9?_4KdJ
z-`aa#o^4A|d99^u!*z#H+d%;1YLV1e=vT+xQs++ie|Xj>dR`%pVu$yIFiGdIugmY+
zBT>23yihG5)DR>xkF&wZWmD>Ziv(xsS!L0Sk2BnfFL|DIcW_L`OaxNL_iQ;|YOGkP
z+;fiAX6a0Fv`-{b6_J#>^lWjF>JMtJ<g*fZ>^SLOsbdMoGSrMQk?;9ZlEWaVIiw15
zLgxf>NT_INQcChi6o6-p9Qx6o1C>1S)|3EL@yAS&(tr??j-wg$qmp?1=mY`?^`#i$
zSd3?pibE4_L2lh>;~<{>1t=Kf@gN?efxr!)r2-V5aCr621#`e~JsZ-RNAVJP9Ev)w
z;4z=pfUu<P8!|E6)0Nl|6!H&V=8++iKv_ULdSvyWF7xsOxN_g@(+vdxvm7n~@7Pin
z0FABnIHc$~=zm&9&U$p|#Tx~MU7!)W9mWqzasb#vz$cc+N^V;O`*buM1^J0591+rs
zfV_}N<Fivqz~p^#O2Z`lxF@bn1x|i%PSozuv=$+_kWXR;J5U$`tla^@+t!dNRvBJT
zOdg_-yMRwo#}uvtoMYXN2Q)ZUJfY*L&w5qPNZp){2sDA1C_uRibDym{phyNbl`F~P
zaXcvh02*8j<S7{FGun`_&h9$&qvjo0<oeN|3QC;q7y|%(X$d1Clbm)v4H(^)+HeP7
zN&r0vQ~4S<0MAma1_wD5gtHC2XFi=N%DdQ}2G!0FdTt8?!Q^x4MSu=HKt07MDu;6>
z?3`d8lpVm6x1KSYQoBwVZQ~efEC8qHRaD$_oxao#zbL@$J?W=8=Y#yH;I7ho9!@EM
zyO(JS#DaQK<n8Af>P|VJmS)|7!h!%8q~3sX4^e_m8vwhCk)ONY0**>D=W`Ro1H}vS
za3t&eKC~RV5^w^Kx)y-}z&|l3rVSekftJQe=zj0kjf}jNJu{Q(NzmYb7hKVB9rBP#
zLV4S`9y3GasNOzrQN}39-UBNV4g!PTnxtbpx*p?-SI}e5HyxuO07yM)83`EuJt#nT
zZbr)vNFBZDIw>S|>OE=P2LQ~&3P~IV91=b0yc8&)5>9eEQsiW~9G(tnWnc(p!SwW|
z0uUR3N58+dD>RKKnu?><alragF;EWik=U;oH0^|eBDlf($~w>jn8;->BCsc_pS$(<
zps^*Hh(e>~Us?vmVsZy|0MfZ-UnN>H6qZwtdG(+{v@2zS8-__EsK;ta9!DFOk`!b8
zpRElcU|hG(2P)p4)UAvXppeVRJ#jz{b@~437y#oxdV*LsKm>!pJ-z8%JZ={Zt+W+m
z=|oK8Hb@sa`{x<rfsM-*%QtRu{b^VniAXBB=A1XUGOQ#n+yVV*N}zl$S9kCek@cWN
zYZ+8I$jQTC^{07mftbMi)MFs=pK(e?&>dSLNh-_S(8YJ|EzW*&Mov93K)^0#Qs~SW
z{lIWd1T!%qOA>Gj^as+EWn=<a*q^)z<BDhipvOPm3VM2)1TMqnmk0tO=hrl&Z<wLa
zA6$NPU}tj-;Eel^LqW?I3=vnaBd@k-0S5pm1ar=Nnl~NIxwgLCsXfgYz}t=(;N;NJ
zF^!%gr;n+nU;>eqR#algA&Ker6s$@yQb=L`t%p(drDH2H%u&=4(T4>4dQ$wsTr6a<
z=-%{M04kY3<+=n5mvX%ir~d$2m@r8Vv@0Q1IOu(8Sgvv+AY&NMe)NTvhC-0t2tJ;o
zivZHal&16YjI(wg)Tm@XzTCJ$(2wU#eWYy%BRt}t^5i%|PB;gl_N8DN4pjWjpW$G5
zrG6QQm_F#q1Gl9)!C(}yVn^Hq81|$)@s<R0f(YqA04z=ir7jAUF027;7W6cSa_wS@
zeUEwy5yBQRx2Vn!dKd!-L&zhz3_n^#X?|p20C9uIUvFwwM~#Ziybtb=n-t=k#!<#`
zk&gcWN&ssNovg$@G4&L?(_uwJka4@I#WkamO2P=wMcve9l#<Fz#z9^PQHnM}xQe?#
z!6k_}J-_{Q=EwjQJBi_XQ-W{HtZV=rsT|Un$oUT9&G&QGm=P#ZgAwCDk*5(5aW3L8
zzbM_%_cW()AP@rX!60=srGrFbC@>hDxaa=>)j$mqyBtRmkl^K0(vSm{+k(n?Ao294
zs8Kq{<ubZ*b~gle#UdQUsk8&QutVN}BXXO7-cv2}<JP2I$me*#INQ8ph8xG17yuK1
zq;e0gY0|7`g5`r?CR?~2ew4s#1dVX1k_pZa=|=z<)yT?&xc2s@yT6zSLP$Bu{#5oP
z24m<5+M^!y0IUnXz>K?CZ9?3P_ojlw3Fa#0j$MZos1zuYNTdsr3D0V2Vw+Wv0uR#^
zfJS2P^0w35jst)7sY4;lF$@U6!RhZy<)1ZUVe>KhGI5XowIIkvleT{D-@X3;)}r7j
zdxEiGWkDryyo2jXT}dirBP8XUsXm_6#yj8Ulakpu7|+wvow?YoE`w?uk_X<+78o>)
zz&Ukb-zvrjKaD(jAiFV?xWS04{JXn?Jt{cCC3Y@LH_NxVr5uqNnRz4@BaHjepn(fI
zjKX*&q+!s09fdg^!>eU;)Nzp1iqeJqOi7h&t1%tDsWFBM%0^E-aZCqqz)<7`$Idzm
zRa8>%By0c!<{bVQp&6SIN)vE=umkk=sMLj<hb4)|2dBLNJ%g#l(T3wYHuN6!ZkRL6
zJ+UQ6BX1+H`cqrV18ht{ISRz&l6!kl3ap?9`HBV4r?H?3A{ON&S%iW|O{l2Y1p1$E
zYDp$pUNl3qV&TSlJawaR3>Du6ANP1965igFOwZ?rk`WmL_k@qWX;=l0>ug_VjzSEr
z&f~(bsQ0B-xGB7nW86SyPD%d&3W)CjEQ_?0g?3-MDI<&K^2|=IN61+GzUS%1A@nUX
z7Kz<ra!<=98vw6jDmGOyZnmFlmcWhqY>!%GQ@RwmLN_VnBPxFiP*lEl5L1=LG0$Eo
zNJ7aZsH0($HZ7HtKcy#}v0MqGk7J=8TN9NB=}jU?(N}IGFNJ0Y0lu`+g>B7rFb;go
zb@mj%mBi{rv72V%01Y24p7fzw61$OE(44s$82TEC0WtZcyDK&jyLAK7oEajG*f3If
zSl=f<jTZsin*rpN7`qU$g{0jh5E+1B#t?nqKus>mlm<|{fzMC6dvi+PJSGEfOxwwQ
zhYF+V>+4Jg8D)vqceihlgCY@)!kn^ZKQ1`{g^4l~&PVjcH12|IM=;o+Ze|%QJuyrH
zie^EuwsN@YztVsvjnU*wPccXg4(BIn&tvUMB)N)4DRUSY$DJ7HeFaD6$v#RhSr-aO
z>_449>@!NTe((W+%AjDAMc4{uj}f!GkQ;L!Q~nh``AqKN(Wj8E*rHNG<DnkrnYvkK
z-7)?UBPzHkew5!cFo+m{Rf`8s8$aRgKoYQd1IrjYqFk~Z(-LJx4E&P#bzZCJYP_U8
zWJKBHpl-AbfKaek4VeZyj>3z9W!m|VmjJ+4$=onVq2+;^MUD?CBslro?>Br@0ww^k
zk+GcZ$5Gz~lt!R=Yn`ot7`AcmKo-8;BFhUri-nOyL6mXFdU{B?R!gHJEUo5XaD%YN
z*Yc{X1I-tbA#H|I7E#Vmr?pEWCJZsiGC7es>*?-kfh>~C<^82M3A2Ur&ImoKAeQXn
zJ14kTe2H@8k^UUiQ?}<9G0aP*0-!j?2kL5jc_n|IDSvuo-0ByUBA%B5SZ}T4lYN^>
zFPfqvtV3iDbDDfNb44(k?kOc{WGL=?9C5UC098q2Hq&|5-dR6+)E-Z%1EozIayv@W
zO79}ay>|Sdf_jfbLIQhP<C;^aOLq$IY)WTulnm1n{9Q=7ZH6`~{)h)1JJXphZImUw
zsaPVz$kGtf6OWh^iijJAw<Z^jiOEb3Q8S#A+~TPLAeIR47wt0qj}TKTu?0_Fl@+j#
zB#j)&wWM{4k;nnP8`hfQCUba^VnqZ-1LQ~rA7+&ZN4NmU0~nZa0q;x+9_7Sp^Tc36
z2uXJI$6lRJr8?M#45L4H<uS1%t^p>AW3z>lD|VICvD{V386%Q2OjHUnaT`1`0+RVh
zXc*)l{<R5#Y(31eMxSYc8DwSK8W6|;`^VQcDoV<Ub8T@G08T?Lb{?4?`Kpn+yooHX
z8cl*bVG-KEk6-UlHA`7yHn!2Ynad=^5OQ<aV}V8V6_GRDup}A80yCBYIX<TY?=d~<
zX|5uQ^%>-z8-_t7(Qn+bfI4~tdXd_phFOH+6vZ5)YQ-ar`9rzSbB_J0xtzgh@}v*t
zERC}R?_mAlPd|lA*k+4d%Oql0m&=Y}n1@omw|!5qwJ~lXxsGd1IL*(>9p?W4R5Qzi
z+|@=i{h?n=yH~hy9~d}Q13fxqepnSOuQMhaVTw#MM3Lk7p1JG~r644=)a+usdGzH!
zWVb338C!pt*~2)`siNM0vymnAlFPo~nF_WFe}ML?t0d9wF$aorOT5V#DihETUcX9j
z+b+U1(D`wjpka_n5N24%aqpi_YD&3zuAQ9R%;U<Hg4|1x0s-7((~OFiDJEk2h0dC1
z+zcyyAj~Mewu9BN$F)^MAeJcQj7Z2xgsOnNj=1l~>qsY#8DrDuoh^egQ1WNW1oMyw
zPpvzJ%_DPj1E`%rFBoXjCMALn182ANsN$Z++UjY6lr+eq;pUXH5&hCSb*#H)isHre
zyIEznXOnEVbLF??xWOF<ALp8z&SZrmxzr(<%d*K5#&;<k1_!=-(S1dBXw7~@#ipB?
zt(>bcnEcAB26qA0rMcH7x|ZJO_iHPtAGn8O;a90pIVAJPN~(1`_Oo~{Z)1W5Q5#Hc
z0eG@_=dRyss;@b5c1+W#lm0%)C<`xf{naD29Kw2+=hV%#J7AI}l2qD5E_}dwImdC=
zG}!NE)I7`EM0qXqwEVorM-2Jv&1PELt=n8Kmv*I|GUTy2CwJV>^{bYw)4Xi3uva^Y
zevSdb;D4U=Jlc#~%|hKRC40nTHU(Bm3bK%LHxBfVs3DR_BELA1Gb@!O6OIOdhZN5!
zPbI{+5+H-fCt+S?ApOx<7aFdoErga6D#Vc;$gH4pNF9EHmoQlRo;`ZX()LzQG)UIt
zY@vZree+0l_Jx-q%PYc6uILId>@!|(ZQ~76=EStNe`S)_C7_${IO)5NqrEuznNcH|
zHCS8CBVs8eAMh3WN7m^x&s6k11o*GYwO1~7^R^&9?oZwo1;>bN)-;-UoS!?(Sz~>o
z7WK_}^nNKZ$u_BPDLz>-+((?K=eX@u4~t`x!dr`ZT1a;?y5}K|dJ+7MC5)tlk+afm
zd{eOvwe^FCie@4Z*b-#%CVS_p&w6aWC3s;Mi!wtkyv3cGKtzg81}n}V#J4d|9kWX1
zf&y5auwUy{)5f4(&2CaT3rDo8{MiKZLiRrNe`rM^dp38c#|w3TJl6NJCeM}eoIkDy
zK~>kpw<{97wykR-WuRMwoR9Bg->rGH8q!NGv9i@+f;*WUs!Zfcxat`6_7wo}m{)>i
zxRKxO8EwaL9fmyxWb-(#qg3Bx(C>Us^5*3(9o97xERep?%z6Rs?Myy2vyR&8`MlUn
zcBH=pDE`>)Yt1}C;u}c(vmUA+_sni#i*VcMGyMnu0IGx@I=hN_U9L++@c@X!IAPO1
z)yF*Q5S^PeRAkl9R{sEm+R`?H5pclHgY6N@M1@lyb-QMuyz#q5r?#bceyAg2tGFB}
z9XJ)`cfK~%$@?9?q6`EFW)J{(k<Y(h<yEeHQK;Noh^M(MIl_g;2d#6<J%>h8!^rhJ
zkBKnaT}^9mb?3-n4I@7x6RQ#FilZ-&mN`~PWSASo0^M=W2RpqnUTQo^sK8mH3K~d!
zxiX-JPfCt$a{6mUwVF~wle4fv$4^d`%{=d$M#@-rdINaIc%EyGGg}5&{%HgVer%q3
z>;*+1k5x|CFJ&ukyQO)*z3Qi~eXGyozPd=vF<h|TF#Aq74|<5pBSf(l;5Sc7<$1)G
z#rp($Dtt?@ySGgzUWMcnNF`|o5n@r(804PV=~;Te#K`plg|>Aoa7rr4@|7QSpXXe6
zpE(#W$3QVn+B)Eld93PZIEJkdSbBX<oP15zV1h^z=t$BKL#k~U{^{?Esyu0bEUt$B
zXyR-)lphLP)7r3tjk|#FgU?zqk<k7%%=0{4w~>Czn&@1))+f1HRUc}*XKDRvFYP=0
zDEmnu3<Yj#3}AiQLNVC;n&p-vtex&!j8QAx%P=BGATR-f@HqCUfMq-!P<cFqj?}$y
zJ03b#ZgP{mW3obR1F4`6#0p)f9lo@Dyn+u(k$}Ma*~JH*GBfQ)2SRc6pz+ku0$^hp
z#Tn-u=9dHU^rHlhqJR@TXSFCK`cMHpb<a^i#_TZ9wrCImkU;$XDC@~RxfGxt1}JWn
z3`}v?{{YoN1RP_LN)(=R#yK=_I`hX`08gi{CXO?=AX1ga32;g5DR4$Zj0|u}&;v(u
zM`{5oMm_OP!Qe2Y7$kF(=|BO=<Gy&s1x`WjoD=A2$PVqK<DL#F!{!HbfI#%?K(0my
zPI(8KRbANt^{GH<fe3>t1_F*-{As0d096}_=}cD`SFQ*i)PvKeIVPkd<ssK@I-g&q
zIK=MTLk!?!<;OIF<Y7Q3EC>TEXjM(2xd%BUnvg2Vj&e!)fE|6s3|z4rPV8j{Itq3R
zk(3;g`2O#|wIEUVw+xewy~n*s(Xf{WGORF2^*_>`9^@NBsbF)QbUySX7b7sSA0g^`
zP*9K<s017unnm18N%ymo7mWQVYjQHCJPdre>rTj5WGblPvJP>^4?|LHLJG}3)eD@e
z{p0CUh~1@CR9%?hg&7{X^`Vw!g=A8nHb_#r8TIy|Edu0X-*)$&M2zgp1}Aa!BAW4|
zz^<U9Zo`H=eSN9hK2X!Am4bJ>9$VObDe=a;jDsz;a!Ya?dVML`0UDwYnX`_~pVp*`
z7LWjpxhH|s815<IN=_D2f=J-5MI#o;mf$bQG3Eh*_zzlQ8?<>_yu|<l3l5amiAcu6
zILeLOk9wH-+tr#RV55db;Cr81YKbR((nfY;D&$~L1YS|WRtMRD>zX{4jb3MOm3R$~
z^)OaliyRK>Wh9Z*jC2%|D>If=$v9Mq4!)q#xDn&ZK_dVazl@CJ`cu%!8Evu!EVyFJ
zll1nfBE(Y*hqfgU5wY=wZ+Z+WAXy`nw$M!FxyL+Wnm{l_2k!_yam7Splm{{#1{e+4
z^HYG%NZ4=}IRo{kuqvV=zy@u@BZ_SeI}xZS=EmZK<=Q|X`qGqC0(M4a$v(u?ks?Ve
zEUU8|i5H9?QS0=ks2MYPqa%?S=;!H5))mJ2P=Hqi2V9mz`G5MTn2;46*Jvkc9oy8?
zi+Kek4mPpl3()t)DG|mVIU^DyCPD5EA>54>n6zss2ONSa#5;|tC?YSIW2Zgo(Z;T$
z%vK?J^gm3~m&<4J=9s8(K~)@|dU^;zVJ;a^?qPws@IA;BfGJ_NOs;qexFg<`*UD(_
z01Ci-q50yTr}xVXI^cj+!u8Mcp#X@i;IMeq1;YmF2d~zY1`(`^uF`JeMQ%2ZoK$xY
zDMnZbV%#=IH6#%tN{7ue6v5i9x1U4lKnyDjDOQ&WgS`I$jZ7z*;E~!r?2!dWC<1}d
zA5v&V0!{K*xs3IUu*p5fY6T9mhM2O18IyNB9-LKJ2{x)BwKFrSC}r8k);)7mZ;@Yc
z;I0c1+wiE7$YZ(ko><QxG3VBvfr=TH21Dg-X<4!{o;dDliK~&wlNcs#>wq!<kMA7w
znt5qS7k*zP0H6(|5$Y+*C6-no2=+!Y0^lhB025G%;&_qAoES41a@;8G#Q|VQo=>z(
z0FrYG0!ojRXVg@Zxn&B8xF8$$9tL|KdLn6xs-qMS%Sfk#j>e-do>6OcF04yR>N*cY
zKo1ZQ8Qd0CQS%1qf2{~rzj&A+@$1j0wK;ImDx@#-5_oPHdVAAQhANo~H}fIr0iwer
zEpTO#QrQ0OH$NQX)}@A9W0@9kN~YnGdG-|8roU6UWd!aja)Xus01s-FE|(+~!Yp`Q
z$Oa#|9)gp&hrEk2m1*#0U7JedDm{P3rI0U@t!Q5eb0H`03~*|;!76Sq%tv_LoH6vJ
zXSv+@Ktsp-!mGwTDqL8{+sv?Knqw~{F$aV1PL5lM;VUAMkaoU0^TGTox=1B06H1A-
zcmw%R&6z)VjOBV5`Y7&ca)EjYqnXC|*rI*#4mZ>VP=Jw1B9$bgG?^>u%|ji-#~QwO
z6672%2HHvP35|(xc8rB(#!s~_Rsv0P8sXG3L>rgS&7R{l#rx%e$S33=_xGW$8Dv>P
z?+CvrTzseL+|yhX%y`Qx?kuEt>}t7K3hJUWBQa-oDAAMmed(@34=tl%xZs@eN(w^F
z<|+B(`2!!~&uV5)&?UnwbW%AKasc*{NTl=jC?H^raKqA*4hzW}C@#2VE7F=IlMIYi
zi*z{TQ%eRJz<v(a^*zQYPy#|+?nxI11BDcCC`_S(I)Q?EkEgve44^!Vh9KmV!5`sG
z^Av3xfnZNHT!1*3<KsMXPEKfT$aYA+<ob$f+;<W)k=NAH5(rf@?&Id;r8N*8m&cT;
z^0DBaxubH97pnE+r?oaY8E09dVh%7Fxu(WZbHAK*9VzmF@^Eq2`ceX@zH5?HwgV27
z)WF8vk5Erqe))W{5MUG&fLGVI=}y2X1wd1rmLxenz3GhE&elABrh*lS8@BqE?LZPq
zl2?p<>|&?~1v%aq3cQ6q=;Ln_C}v~5J-unayKJ6F3(%fe)Q+QQ63(Tu_i@lr1bJP<
z8NliZr6dwIxX3x7fDgG?a5)+4NI+l{DqA@`ew3^+!4$9#<~4EiA8(}~W^4unk&NS|
zI(dH6Ci$?xC<hCUpGs>pIR&}eqi@oSAp-sEbJwq>A(5G~aBy<mb)mjt<(9@qOHv%;
z1;%^jdWu>PQ9<s<uT0W>%bnc;;EEKk008rzSkOQj83T-hY1{_`u!k#^9gliIs;!hH
zag+3;cn5Ymj42d{2Rn&8af%ZGIbnt9Is7PH#GT8KImb#|WDKeKdE?fCq>KP^dYn+e
zLZpyzf5wBI*(=HEN&r3nrkZd+g!_{~2IU7BKK}q(P&3Fpj=azTRSpLSfk}l@1ewNp
z#Q-kl+BwHP4|)sr!5sFWDO1PP5-1Vm<$3kZG^D^nPSV)+B+{rs8QqYhkV)@Ah>S{A
zik=1s2Bo*tbqmH3!)(VVpdBjVLaj+!D^WI*)Qc}6K1%V9Nv~M_pFS3+h(F?gddKYN
zi87hnf`3k&*0;m&ff`kwi4Fe%iQ-Q(;08$CeC~T~K9%e?Flicgn3_h78bkzPX4=1f
zNa<f~lVqP(pSG&+E{n0|Vlf`oaz|r3M0lo^qqUGUR_9<59PR^*pGwxXu(#BSlUTlM
zXf}}`R^*PyilwT-E{syb(#_zDW)?s`c?sv{?~h8gtN3qT()2@fuGzZ9aTo~kcF!Q=
z`Pb99NAEC%TIh6t3BDRWyW*)ln8n?yr^@kyL0|T>R9ea@zAoF^SjXi3p6sS&`>Fx!
zUbXPgLAvnA?EQP<n6&=@HbsTXNs_N7M?vZ<&O8g??PFHd(_5L<l%F%o=j11`J?h~}
zDK>gBrG8YjXJh+BUPFCprs%5~xQf|)$(}iIgCo<{xxFLCejU?v(QR>TBmqb%ybsUm
zU0nYF3uW;=>&vWbcF3}z2YmS2eKA+`Puc6hc9Jfo;v48EP#Y+ux12c0z&Qiois^+o
zI9cwlZ|v(rSB}LGhMyLonW2Ky!PfVe49t)&GrV*6jyPX>?sfkF9j(@l{gZp)yBiCZ
z1!6G9K4N<xLGN70!jFc!XNSHcT4@>vqGYmDzF6Oq6O)bS^{aZ!Li5IVH`dUVg{KG$
zbGHQau9`{O#;I-1xvM&VVEibK);Xi!EUmeTILXCgXy0wnblEPg;&~)dkW?0P>;-hX
zhN<EEjb7fy`I;MBa0H>)Z5(reI^@?+;jb9{C()&A9V<wddxwY>X-;`3vBx5+DMwi=
zoh~j(a-4^SwLgj%)-N81rpFe?^I92`Y>uO;{3~+XT=C|)rQTg@uCS(ZiwcD#4mszO
zQh2xG?ew?tcz?s*9*V|LF+AZF!9sghb(fB`i)$gFd9pm<Ig&|+0Vl8?m6dw5>89lr
zjUfpw*@NM23Qc!ipHkP>NoImW7<M=cx#3&z#d>y?rg&3DPd8G#iROwdT1OxawU}~O
zKF6(j6uvDnT{L#m`F>~m`*mUa&&I6D;>LXpEyyH?f8Miw#m7NkADK%Rm{q;)6|zS}
z6kv~GvGH$&t!>$2f+d<iyCXNs53kmv*FH0NT(8;o2;;U)jF3!&A2R?e!Ixiw?c;wt
za&94&*pS21>s4+w7?%b}v$T?^4+<;ISxcU+m+cbjd#0oDQpZjYE|X~++skSl*_?dC
z)lETX@ykpWg34=TEfNz7M0pH<ynCAP0R2D$zn|^3v6$Me+q^Olm^*M7_8!#+sp18N
zx5YP<;XvHIK=k_6ETwg9PP$6$^~?VNkDeg4)FizUnWo0rRfzc)(?3e9s{CQ`CaGq&
z!bpKK65&tY1avsBAa56eZRSMlurdAH514&VdZ{OjZIVWjN+~P3!E^H;>07L_322D+
z@V<wxkBr*f&@?v+i5i`V0m0+kRS)=D+LCH6%{wi$hy$=}bKj2j<(GalvKf23+{UaO
zp^T8k{{V$nJ~pvK`}cM(cSL~q9OvnZe^Rr066!4vRn~qX-D<XzL2~mkd<frmJft1P
zQ=j5Z+9Xzx-UA3bQwx&k)SB{Zzlf%3C6?0h5E2WaIVT;5wN$+Lm2YyOqO3$7u{JU4
zK&@%vBYQI$;uKNpm)<+L7pvr}2+-n4w{ZEa{{Z+-WSVJir{4r@o?1rlmd~$R^65S$
z#bDv$m2e0fGnQfRn#=zHg_#7G9zx0<P)ltm_(`s%hoFvUiN8bE?fhZ(G4@fYGXav1
zD-*jtj%t*?H@px>EVH$%OEFOSI|B}x^v!uxpAl^4g`pFI$_`U@OM+^p&%}SShPRU7
zA(}0!(=P-bK^dhgG#;Y*!aZ#GzV=2>F8H@6cyW&~`h6-9<7Yq+r2AXukhHw-^d5j$
zkH3$VQazItmynGkU_a1RbMXnLE+df0slfo}p5m9XpqRb0eNSfp0EF7%$apmn>@&J1
zCn@RA^rl>R-_Ma8GXfV4D>ny@MnA21p!ka*h|3}sDBD2?mM7ENq<@JvJH@8?1mEi<
z8@p4CFw0v5t0ULr@m$f6mim}sDa3)vK41R;Ua7y0S=HsYo!iUEKF2ueURNiNBYSfs
z&Onv;Wo#73IW?De@d8=oHxS&OMi2pkf!`HQR98e#wYKN6OXB8e_W7nkDEW|eUwWl^
z;+WFijP4ajGGUH?5Ad%bm*Of*Au_zlD<{pfs^g|dr9|F7*&C4JL9n}kNqJ63Oz;!|
zpM09n+u`E0XdO$l)=!O=X(DN5IOH?#+q8BSUSAzOx;su-Dih@$-80ud{`KScem#e9
z4|1+snIbY^<J3}Hc;0(^mSnwB&VYFiGK~@S&0_J8Z=n}GV&}!m`D<~u0;3`MAou2}
z!{WPDlsDRVcf%d|<J!F5Um1wvcr0$gS;0~qWG}8WS+C<@@S%jHA|d<0Tyu(vVxXR^
z6YP&wx$$%`Gb_#=5MdZLKs~|tsDI%!VB6MA1bnl<Bk5jOCyU(|iPvV`!32XR{A!``
z)F2Zhm)hLM8yOWJ+7X9a4_12mc=AITB5<zEM2f${y+;(cJ~d$KCwR78e;8mobI+xC
z>-fw`5fRF<GdL@~x{vOYQQdgbPc?STp<e<-#&-LP9%}@y*jh)fj~y(8&u@MJV~Kpl
z$Rpd+6<X)U4AATn2X|w+k3t7y?OsWD;`n8RBVO=NAsYm*;ZWW9!uB|`1=_Q!mPgMF
zy@9N%X0()D#qakzFN>F!*LL|xlgx3xDOlqKbqXuY=8dF3D8SD-^{vfcU(_|23SZnQ
zlW4(Fz#hZ3WZWSv3lYb0UnQAWjwZh}OM+@PW~amJne04AZz2Z-$@{XWsT}j|Udd_V
zb($^dAX)zajDyGJ+PpVTW)~iOQx$mmQiqj3wcO}>)zWE-*R~tjF5fj+0>k~GU3p!8
zMBo!mtDb`1DPtUs459Ft2he*Ol{`y67Be=`231t$f%i4QN3P!_Z#}$`PZ)BA3BgnA
zQzwWLHfT41RRc)l?=qg_*jKOZ;*8bK>AXg>;3_)AA8gSU#{6^19<^dW5uuDCPA~=x
zVYx%^Tpa!=i0S@Y!tx06QQ|zwM1Cbn)n$>=7b-qS#(xp(OY114cTM6GByopEkCIkA
zkC^-V3afXkyo%m)72ER^1dRSQ%Ehe6OJ-ugwj5)X`hSHo<5>|aiDleCz`@2nj%t3e
zfa+gelW*Dg5RxDwGbhT){os4m1Fsna%L{+2CoH2l70w-M-Iy^}QXd|9f0HNpK=r0i
zt;@BNcEYg6BT=8J{HZ#sNNUGbZQ_YyjyWfnYX>`HZX5Ban_svS7#d_L&f|_ju1bFr
z1dOz@GogK@&<ug~rpw|BD`}o3x!i$4NeRi%p{R8uZN_x-Yi4@{j#>WG7nnpv4&9C4
zKEkM6-pvie+=sz+!JM4)=m%=&r|}xe1Vr4dCSpRYfMj!m4m#2eYUT@+a_9t2i6q;Y
z+aJoXoTDZ_hd~aj8pO>jp_893J=i>Y`qZ-PCf*q(LP1FQLUKv(f!et9sYeVbA}b(i
z3EUW*XVBD-u3}b<&$eBFO3pGsK9!ZwE1h(j#L78kVIcWpWx*VGrcbRHzj1FM^NQ|9
zW74@uwRrZb`L16$XOpQE=hhJjZOUC+C{JPQQra2Q#o|a6+DOO<04_%=PjgU7s|znb
z7X_qq=Bz8oAoL!>xvBMqNqo5u;s!xOfM{J(Nf1X1jDeOUWaA#ag-y`YI=MA_hPqpu
zd6UU#LhNPaKl$xaMXM#hH|h#Wfg;9m!_<M=xmVO}%x8O&g#5BE03PO&JL3e+aU8kZ
z5ZvIBFnV?GS-Oc7j+*COf8DLDO(A(U#fKPG{{U$E(#fsOYvj!&$qb1je5aCE+;q>q
zb0+@)a!DN1h*9I(tVeQr9CxUN+)V=8gmOf=F71*>rVT^HM5Pm}U35<7biFaKOtVN%
z)?V2Z#?_*g-L2$}k5lEI3I3IYF6WYC83eGv00H-Z#+Z{u3;97>Ga)@V!5!#Wg>dD$
z(MPRG<%v+189UIPMk+|PrHW&1ZXLG$<|Gtt-A6o%=2CeP5Ze!%aoQB;1HCrl{%E2y
z!L_4Pm)q3`sjBwqT&G9<w9bxJ?L&qlBOoUS(xjJHGR>1YX?6yXuK@dExtP;blGb;)
z)M2+qRWRl}lh0K?{XZJA@p(_M%nZRpI1F+}r?pb6U~##&HFcI?BAG*d(#_FFrA7AX
zL~ohmRZ<LG9mT5}TkDuu!EuF*e8VH=9`#}iv?|R6K_r$S5?K!9$F4h5`qWe0UdHB}
z+LYGZEy@`O`pldt1bTYXU+N<A)z;Qht>od~A1-}<l|puoD4Ej2M`E~ncLEQ#J!%MJ
zxsF)GI<J=;pDV`E<Y4tD+OO*|?k{A^wi<=fT1P9B<&lFkXPkd@RMF}aG^M=pu}3O-
z$KzOYD@Sz28dtYQ`B_iOr_^_=OD)J_3xy6s`D&~8f$C|;6&2J@l#M~Dr1qvYak0Tx
zd~!!&Nj|2L&T`lYpa{Xq9AiH9jRceF^E=8}qMi1FyqNLaXT2y{Ll~h^kTSrWoO_>I
zzpX*_7bKCZbAG!#tC?gwhbA+%x?~YjHn}8r<~wx`!E+3w*QV202J&QZV7-V<7|SD}
zJaRG(I!lva5NX#a3-ZQJM&rrAJu0J&g6d1BCT=H)MZ^U@&Jjlwr}1X2Tlkvgi)O)`
zd0Syb033tfxk)t`qhpDIfB9+`sipI7E$&PC?Bv7@Qbx!3XS$#B>srS!QF=06HqNp9
zQ)zBi-b;`G`Iuu2tZG#8l3b&C+v1aXR$iGMm}0ob)g_R$Dxi>|rD-vi8SV6?I?Qp&
zBHc-n$TyMH`T^-%tlC>#&Cp2hZMD1RxLa6Ugm1dLzVPC`o50#{m}5no4TUU@-!RDS
zUNP{qLDXfR?K0bgz4t6m**NsiYWh3j=9vzi7}X`VVCsPcQuaQz>*2ArBZii`vyO3I
z*()6mt$788jJ8X7yToAS#tAs@?_WQBeDSzz(*~e}%PJLRSNpthN3W%NN5uaC6wPU-
z-1)PjxF>Et{{Z1%FZk2MaB5nllSF0_pOux)?40u4^c+`-nO1SMQ|NC?-ew)@eYQz&
z?yfM(a~i11vgi5Yw0tbSMxfUcFi|9VE3=+4)6%F#7z#E_8!e5v=j-&Kq@QM$UPW9t
z-Ukdv_*aid66n@bOJk+Snl?R8NAaDa+C^&x$y5iD>+`VmHEej*(l%?Eys)pfH*_Gf
z_XpP=wd7y$kl(`*v5IoPDDuHk!5;MM&lPLwG;-Not1=LFFwWzScs(ohTo;JAyfqaB
z&pugg7cORxY}33`Z8WPS6Xqkzw_{tHW~SHn%^Vk!Dz*x+I47Rf;=T>>HO{W@BgAc7
zf2>F42f7S?mFa#M@c@!#w!VR9iWLWZYqeCK20Q24zS9B6c)U$6dwLwtE~K50QSi=*
z7OxmEnN!NR`Q(KB!STWW0P9z8qj*BjR%p`2TIu<ffcbDZ&pipO&xCSYE2mJZ6tMsj
z2XT((y{AI4(l2e&8%PxzX+emU93MkZ5yp9qSFP>X^yy_dRZTl<-17Zb;mz37=Kj*N
zk)n_8kTHSV70v2eL>3lK>n7<8dla_-eMNh3i<3>ZSu9P%nNi4=7U&K*uOIk{;tN<2
zZT|ptj0qw{Pnm~sewB~<<(X50eB7wN?5rm%ZZ~I}_=i%C#x{%lO{Iv8a@+^>9+k`A
z_}UvtawiN!5h8BE;-~TS+ANMOZP|9A$pyY#o^xJxt(ji<UqB;~QCKWSE`82x<FTG2
zXH&&W&)xMYWw>f_(Hq*Y#hXnz5iankBr481*^$)uHHUlgy4bqF_i}&<*zAO(jBp1W
zSDNb$CC%)%^AcI)CN&-MbAo?Lr8Lhd237@!Ob!Kn{wI#J%G1)Og8ID`_D@K?`0&Ob
zHqI8_Mgq;>AIMfc_r>jU?pZ~u624d7-g!QqD~bpiRkw6%va&SsqL&y({n8@fvF~19
zBZ;$|QstdjV2wCKRE_!mC-{Qm+B*rQWd1N?I3W7wsNVSR#Cn8_44R|G7ey)Z^Y{+6
zL9O?!ghcy_;0)letyW|aZH$ssju?*h=G4q_(^i#7_nK<WY5ZHN-$3>gF=)boJkByb
z_^4o#M3>BlSxIHvF=L&>u>2~Fax9#N`LG5}S%k?Nd2*1AjsYKdb<K18YLeZscPvJ%
zfu1Xg23sJO=l=k$U7v+KLq4Tx{fb&B(VHp=!(@yeYl9@lfMB**<maIErL@1fwY-Ve
zU^cj9BfV5{5{`@&&r@4xjt909BZM1OvxBsH*K_c@;uf#rtE*|_&AEYtp%0NG1Hr|4
zuY~+TZLCBf)UFfl0f1E}81yIq0Iyx<l?*eG@w&d;0>N?5`y;hyR}&6L6{>w1qK7``
z>d*WWxAx$*@jaX#5!UsaXO<<($8ftugT6EA+*j#O!fXEk2l%$y8<^QFW|A;|Q<P(m
z<zLNzfc#CZd_32!wcibDa@$U`sZX0B7<0dGe&CMdiv39ag+Jh@o)7T{hm*qoGrm|g
z8xl9~$ITfy4y<vN&u*g?`ObL^W(W6}c=JK;ZP)w*yA2vse6n^wQgsi5Hafkiovom`
zLN|Ge0o=9Z9~XaRuM16UBvE)|4>0`96Ce}LN2PVY2LAwP&jon5MT&h7#!&}l$%;nf
z-@h5Ilg1uAxW2M!EcIC0795g6+&`yE@UZ!pG%loc&kGyud`IJ-*#pB<Eya=1%BlVz
zD~A676JA5&-`Iymo>UhW5-z~T7?pTT_s44cqs87RiH`XqRs`S?f^%GEzo^?X$~=TD
zIcXoLub{)`QjImC!#poEn?4}0{e(O%VQ}AW)Be-u0s!00UyV}MzhUhiZJs+zczDkA
zWWhn}pIZAeJxfb5$R5-=9I;jHSiT^;@bqw<$r7`Sw&9Ep!o4?{RJG1khKgsy`mgL=
zrAKnJTU)7*7!o?*Hhq0-XGi^yENtCUJv>N=a#d4@!00^%eH-H4TTCG!u(c!u``C(r
z0QCp_;-iaHio(xq_bG0wc?9+Lt^T`HmFgu$J<klj{g?EUwe2*>(MR44y$APC(un^6
zXDuSy7ijGV&Ng|O>FdRNHnHN18@QYc$c$u-%zy?%j)u8!5%|8;+eSXw9ArPw<ngtC
zsWqH2PFg3aUd<+B_;cWut(}~9%+M-<lyG_cD^~a6=7Vc*5xBUBy2wNz4o4i5{xwE#
z8|gN1n9b?(0sY<^rC|7@;@yORvs^1}k7ygZk6L%C^|<bqf@>D~HlCBiZ(@cx@?j?h
zy7FreL)5JjSuP}p1!UU{!2F>5j@86?yW=LCB#RxGkVstljt?OE3gdMTj5iQ0mQl!5
zD9orwT>k)C(v?N<$?7!*)zS22uZ*oAc5AuU%uqHJZl0iugHrgvV+oRIuGTjSaGCkC
zE9P6@idv2QMhh8s%&U}*oaa8d_N+Zi##*)XA~n=xh_ERC05(ZJp!!w0Mk`4NC0TSn
zgYi$ty*|?A3TjIvTQcQ7Y%%Tit}9mf`>0+?C-x<yB#gLuCLpR~+qthJTd6e12{hm9
z4nUKxd(;}Hw**7vm6vk;@_t-aZx;$~?Akawl@*T9Tk+1nuDY(HtvE>7u!<b6bKK&x
z?sfYMXECvD*dM-8@`GG`?}>ca0>N}hLzxji@gAVoRnE7lBDKV_r<CYpWG9cW*07#!
z6)VLZH1er6X3n!$@!}$sS>i&ijr~qN>yq(DjP)y~bdKY4Ha4oSZ}Io6xutbr^Wjts
z3yBZP-|Xh1l1WC%p&;buGFKpDy>U-5#8htb(DbQgv>>)KZtnG4*DD;tGzW0Yeuvc7
zYUsM1)b|sdvbfr^N7gq7l6|YKcrC73*hHvY4bg$g_Z1nm0#7Mp5C-{oNIH9;TE*9k
zIu;+HlWn5J^1$sWSXKU5is9Vj2OsB}wJw<xT={7eA}eLpj&}WhD`{;FlJ1krEfEBf
z)F1QOt06L6ux+iAoT%;UYZp7c&7(#s6|MBeg}!K2yw&+w43I}-?M@abtiE~Mu=O7(
z&(f@UzErCY^b0JTUO~}TmfWD<1aPd;E0?yGURyo>quQmi?2Pec3{Nc0Ck#M*wg449
zy|i}?=cKq$MjW>*j)x+x86=I;=_C?J!~S`UC%!w>?J*Wj6i`IrpAsls5PIZ#Qn>7l
z(QN~-ni=piT}kS5&T0v5?a18oks`kM&ir8X3tF;98Nihp)lN)l@{%eGgt*)GhJjbk
z1!KYk!1kk1vMFB4xwlHBGJK@B82<q4)ftr)nmFBybzF`D`Wn3~FEU1kUpd^8rB|T$
zs`Fcb?+i1SXH0o9jF$B)?d?qyu~B0#Jn*i;4rB|_hovaCj&?|k>@q$fb~*XI#XfDZ
zh~6}Ghz#v>$T;YIX*fx99El@gL409x=sgd;J0Q6)?jAobHD`dgF&?3ZQctFPQ~u79
zlMTh_AfUvErE+`m*a~b<99yF$qKI-F9N?Z#O(B22jR8B;j5arqZ%SGXTx5z`!b{63
z9K1xjvyxY@ADvAly4)yhs6v++3OFj=^HO=PPueisVvKK90}4N>s3o|FIklTFyXQw<
zgV@ryV7lsCjl=wgBOoIPH*ycwlsq6QcT)MwAmb<eDwAp`;TkDIs*+w*84bruWS6iu
z)47C&NG{)ZA4-Q7JEHv8l0~|C#93kTsb9W7!lIh#B$Q8Nt|Bo7y7M{b{gGL%dXa?l
zr2XT_MoGqf2en4m@xwl6oFN@ijx$a)r6D<_T6>sfki}}?36w4w_Z0*9v)Fpn6HORm
z8OSH)V%<Kg?NuK0f0VJpv3Z1sEyzB?pqo&ZIR(ARCBVSK@ru!5-%~eGyF79e91|jf
zhcP~Jk?wnnhAV~&t!o+;SqNy`oSx)<HCydIV<(dvN*L{A-+~XWeJR$)-571aU`U0X
zxDQ(@Nh=cO%gRFn17I-2ZasPal@qY?gG&SO$IAm5W79PNCPTVaCP>dP=b`*PeJR&5
zOXecmBQr_z;oF?!Kb18Em~&i6?`8W*xsqgvM}Vrsxc)|^`$VopibRqz+GEbsp2n)%
z*u$qp@JVvaQ!ONJK4b^f)uvmP!HP6>Dl)`itv4HqHaN6ugv%z#SnVadpF(L2gs1{U
z%KV`L#~!sL@haREg^NbvS7<rGBb@rv5-|Q`pzhi743E9fQB5R<Ru?eIaMl-bzB80)
z&fhQ}e@bP<uWxJ&P`e<L_nxXf2c=HdS(nadCnPIx9H{i9@}*S-$0CI|P{Z#JTB{;m
z$N8{H2voLaF_OgZ>OB}zB!)S6s{`f?81u_wqh_~TqYNrRWgDa&GmlDG<c>frjj?GF
zfea2XO%@of=0_BBTSpstw+tkY87MK5ezhIMsTo@(EQron@to(eHEvklTtwsmvVQT(
z^f>4}>b=UjLp_tIE0H8_G9T0FLflPgR1t{WOj%AcBiIPrpIWV`+oTvtm84WTJ71IZ
zHDYKd77KC8$Q<I_E;o_eK9!xRl(@5ag}}EY<DN%7ewEcpGZ|Q~boeX@9F9@B+`fjg
z^#&jYiCZCZ02w3y0IgSUi^SqzDou)ZhjE^Rl6|WaQMr*;Hn?(*WNosq0mon~wlQZM
z<)NFbOCT>2l2McWUVicQ&td+1S2?IK%gg5zu{TDNbMtpYj=x^@t8~)I<}mq3MFaRT
z*Ym7xQdU^R@h7f3hR3CMQH`CB8irl-$t0e9cC8YT^RG}2KS5Mv^E}Ys!aD(sRMPEc
z++42iz|=CTZuvJH43bY;^b)bbCw3zeQG&1>ed9^E0&t;$=zR?%z8uDbh5%)`{b@px
z)el;vNP$^!e8A0)0ORwiV?({NK_GPl7&PRIVl0I>F=7l@!NxcuffmB7p>nO3_0Q6&
z2x^5~1%5%!4^y7hyO$vEQJmm6V^VoiI<^!Nry!BQ%||-8kj5~pv=T_oFtFE;c?%?5
z=WsnSNg}Hq?7aT~4%5@#mw3Zrj&aYmDMF;EjD&T-J@ejx5#BK622TL*_4c9ANQD9w
zB=QgN(8?JZ2nwNc3m%`3dLnVV7Z18JIc4f`=|Bd}tCJty`>befzE*byJGf&{8HmWp
zz^bNqoM7jsJ?YAg9?SvrFB$3&tpG4>89{;ycIpp$K5VI01(f{2jO2EwAaa|8iL;}f
zytlBVF-x(OVC3W-yr`ytK2oJg`=>e2uWEP<rBRom-M1X$>qw{>gi4zOaEdw4(vX=^
z7)V07Br}oI*m{5U=~;lPBPDl_kg@X<_=u(`5Tc_w#AKa~{IlAg&y2d^aJU7!(h(p)
z9m8#3lwzHLMGKda7;*+lCy#1Sj^}g(?%<X^0sjCRYqBUFY7!1`6!HH6*QOLM!!iH>
z`=gF%0%!X)GK-dsv@#48N9cWj6H&9uB@Z%>ztwty=}4pnXBflqK@_UY0YbS@xj~Le
z`ub7>LdL>d%V}Y^jhhgbeW#MS=soN7m;MQvq})UBzUJ^+{n$c4lMos-+sHqUHTk`u
z`LhvWXs%>XS=e<X{{Rhsp?|?Vq=NV0)Uv&o+0mg9u$6`p#|#Pj`gN}_H)%!)Y4kRK
zXqjwvF96?LT{}XF0|~IjcaKgwk6&8+(D>w%-D^9@GNQu8$l>>Au01hdq#v~n<g;j#
z#}x767=UFXB0<vvzc#)xOt%{4$(ek$`$KttVflau?*4U_T<vr%(dW`G#L9i&ezd}K
zl>`ns_NlJaZ^2+Pdej(T1_yo(dms&sn}g)iG0Sqp>xww%1E}C;k+22}4tknR71RL$
zhGS0LM@7bZfl2NDO&BEdM?4ehOHuU~Dj0@d2=$~H1f9b)6UQWD^)#c8e?f{sA;`!W
z9COVWAdC^upr8Oi1$*@rxCiFXewpb=1i%@=?ZBlV0m}o9iYZkKk`+k<?;k<yNrq*|
z7{^mU3PB^2fsPF|RF(>@l6ntXQVX(z*vA7Dxh#HBo_c>;1#1l<NG1OO0y`Q;B%RDh
z;3>gX56Ic|KD3-}B(G6G4Fs>uqn!5?@0bi@^PyC^C3+~yB=)2wM}MY!Py+n8?nivn
zm6b^hxd(ze8et?HXPncNkU%UrY~+rV&<5?Hlp^wSN&Xr^$U8{u(;aCK17{qXRReBR
zgS7HJX#y7jjonXwY6bw`gS4DvdeWAVbGMxEF-TZD9*2)khL~z20zOt8V<1tU3n<Um
zwF`oAj-$Dy-I2R1oN<a3fKULy;knD;_4cGKxCI1l8Q6U&CmR_Q3~+w50951=fyo%@
zPT~dWm*jiU#qqWH$3R6cHxf)=d$2rn=}J(l2f+)R0%@Qc#A6D?ob$&5mPJ)!18x`@
z`r?C?$Onx5>P5>Cgn{Z<ccua5vCEK1$65-W2SJX6(tryLlaM(%;L@(u!?Zh;@N#%2
zkPY91_xb2fdr)$tb9d-*OOYN`hB)Nnko?;evCmQn;)VhOLvGxpk;oLQxsEf2JQIp&
zD$WCE9-^Exfs=v<8T6q5vK3+?jFLg)CX?pbgO0y99Et*rfIo?_DNX?8cqar7)PMkH
zJ6EQ8Bege@4%Hd-9qGeAdpkhso~DxkalqL_wSYRD?%V5%T;s6d=Q!&~06gZEmAXiz
zah!qLkOO7gC4dLiaY=<Cve@H}XajKpax=$Xv~W6ej)2etu#Dkxj1F?$Po+B}A-07e
za6i0hsxg8xa(KlEQE=?1<!_i8X@MlANC@K_c{v=8JJTOH!H9xCh@ZVqR7P`#JBjMY
zx1}-212_Xe!g)17Ds3?txAMPvN&DW_DP+#nhi2YNmf+^25*1*;;dt$yY1_`jmLD@^
zOD|dkFt!vToT?H?Jx8@UV+F%8AOq7q>32M_nBulB+shKX{#4fq2`M9%+@k?_=71as
zDtI_NIR~%OowdRSa0nxVj=t1~AcKMlILSRds3U>`^VAY}pad+jh9W>Pyz`n}&5eWs
z&h6ANk;!elimy9YwJ;TBE>9$Jo`QfB<%n3FcXYw07L8+A0svKx>2tyMrk4c#y8s+9
z^rTf@3WI^iU)GSt&j%zfIUC1Q=}Jf{R5)eblegB8AQ9on3xY?v{<PL$k*fkX<mE?9
zQxM@UQI668IRvdZVN2wIT?awa-h*)?#uLp_y+GT@C#^KG3Ua{wy~j^+K*yY^Up{qA
zoM#7*ekfp(mU%9i<xiFs56*pg?Mzd$Kvj6^cXAl_r^fQAI~|W13_v43-joPyD-*b{
zDgoJyW|V@*<;Wy=?M5xh-z09sA1)u9({UrV;}I^y9Cn}sa{bX61n@{aQ<Rkes3*%m
zCJ#eR8%l-%l_%yKsTe33IZ_+uIqg6a5UQ+X-_Jr%Ak!H{Ocp}GD-ug*gYGF&=7<-F
z5x8vxjPXusE`Vod8)h3zGV_t%lL4e4LPC&PF(WrTdwNo2#^JXN1IVWZj0KK9x#hEv
zb4l{C+WSB!@D#2B0Ka$4AfDv@l&(P`OhMRv(5D@#K_rr6!QkVk<xOA;=YB{z#yimL
z1J)p=7|sb}kb3Q+G6q?GUB59o$?HvJ+A|7p+_!V|rZ(JpfgERsB=MhW0>q5Or!L2n
z!R_xxe6}pgrycXbrj;c?l^wEhr#Sp5e2<o2F979Ke=05mf`ma5fq=xZKK`DR(#IkN
zloe*@aO8e8q_>z$bl~HmrHf>bvU0t1xDJ$P13(40yYN0$lN3hENDCtTr@8%UrP)-1
zxyk3IC<pkN2Pc#R6u=)0xI%tkyPov$M1fJG?s!3hPxw@Pxh0Rv56lVe(wxO*Q<mGe
z?jY|)zzTo?I0eZYN#%X%*~2Ss+Cy=J`qC?wd<7(60fF~Ny$y|-U_SN_^fUnA4$|<3
z0CMjy-OVv#Sw`W{Q<mTs@Ay)?k28Bla#Rcx!9KX8k?;gkfO*absiNZrR#;BuBsUC6
z<a>&6kOl>u5Dx@&6xC;nWmN%)BW5}i=|YAGT#$rkJBJ^I0u?}IR0nqFJSoAUfkp;h
z$N}U1pLzzyZH_?PI_JF!v}DH_Vh7Aibrir*Sr9s~+%k7<>Fzz~3Aq<(1QK(%*WQqw
zpgea9MtD*wW{9Gwje*`W&Fh}n?LZ363dUY|oVgf6rvM*u^rp7Xk{k`)6!S{rNj6*g
zoG&1e#SEn+WoKNjGe7`j`P4X2!vG$q@ueP1$|PnWfrc6GIH3g66BKENZh(Mu^rIvW
z5d6m($3xzMj#(T>8$2W`Ir*?U`}@-u_j{CM<{if)pXWr31MiUI2We64DF9py?_dsc
z53K?b9!49PaHlvp<onc{%fKL!GMl+#IX_BaL%VJdBRS4#P>~tSZs6@@6bzBjZ`w}9
zAY;A<xTs}9%34jtvHQUG6#eNF85}e4HUQY?Jq-w~BP$T(laRyw@jz@JGfC#ip;#!~
zGt>?#-!V)K02s5e>OHA|CJ2sIJYldhNB;m?mPtbY0I!SX+7(K1xOyL2RuCj$s%(AB
zxRN<Ip<gnW00MEyJP&+&(Hx-RRGfjzo-ip4ra#^QIBc#EbMH(CEI_6~-k_3QbBzB0
zLr)5hOzNymV}&Qbtw!O|1gd}*W60@>bG(oc%)cQ(z-{FHeJBAN3mK3uSbgL?VvtIh
zNZD{Rla3qfnpnv}=V4sQo)~oYG#|R9W>+NOm0q7(KnNs!M;t_`Ir9kqbg=J{6=7Vv
zu>|9V9<=4y2bAndZj6TodFxTSMmNOj#DT^R1~b<b00r`a5=tC@5nSMkRb(-$2@32v
z`ME4lPs)}h7Y!Q~U8TY>J%H~`U)-~WCBgfE{d)UQ1EZ8HGB?UUybeHbdT_W%!nEqI
zwZ37u1bSwf94gq2N~mwX#OFUlOSxThB<a`{$2@<YlmHl*?`cpJPFyJGo`9cPMl7nT
zTVXviGC}k;B(jE9c-AuKKOr3bYP)^G=Sk7Iz~}Iw2YIUUe)n-y#|m%>siG1vSthh(
zQgB=!ynP3yLWo$Mh<1*-<dA9U3dX7n<N`{Qo}K7GOs6lkB@vw9t_e8)wG)`omI&$y
z$Q!yJU#%-Nn@RGD91xithWgNt5q3z`;{q|gTaxFDk^Jd^_-BGpHYp0L%CY2{d|pGr
zGmC>0qJtj(ck_<Du~A#aF&OgMLw(PeEJxv1AyStBxr{gfgnl;rkw6P1&oW7G9C6A7
zT*!;i_doq=Y$-G{ZJyQSw(|Lq0>3Y@`qMniX`_3GVIvXIPSOr~;BiitNumD$L%O>m
z4mPgSkWV?PKrE>X#@71?aRDnMKQ2!|eT7MUWYq%8Z)~y7Lj9#WD-}>OG0+~QdY;`W
zgt&HD(<;Dx(O?7qeJDcs4rU)J;b9AcIqFY(U|G4fyt}qU(=_=RAbiU&@Q^?oap|5a
z84Ph5Jg^yE3cM2^nGg4K_4J@aAc%QMG7mKFF4)NLk6%hIp|uyDb&M`sV&R>#I%5>T
zt8Vuz8Mb%wRe>ta$<N_erjt!(weqGhNFgaLylhJ6AAcv*=Og)5X<~WyF^nlr!Eu9*
zp7kU%ye_dJQm2xIK6NLr(v|fBLoLXeTFIjlpi>L&$oi@O02+4WW(8w0joE13aKXFu
z?V5(kO{=q8%22xesN9ack8w-(l(mG(aE&osldxbZ?aAsfMaGc$*h?16Xm`AFGhD*W
z^EwWUJplBlTZXZ@F9-rd$+nOd2u~#AwrR7x^G6If5HFPd8W@0iIL^}ja4IxonC>Hn
zLZsmzc1r=={{XT*YHrwAcA*@C#1vOlSxd!m;D#WMQ2TlsnJs1$Tiq<^aB&O~f=D>-
zDh0FiF4(Qfl^QTk<|Geaz*CglvxyGkBTtp1Y$$H$G=w$f4f~5ZT6UFoq;Z^iEuWj}
zew4OL0;$C4zEEO(!bTg=`cV&?EJIIqR$}etsvuWA$tSKcPcX(I7OZxogSICexbEKl
zDW_m0l<o!?t>-gIk2>j&6$UuK?e(T0vAP5q{J7V<9F_k7AFW4scWPt^H8sqU{_~Pn
zH3NVKIcmA5L2DJK+$`^sl9C7~`-~4yS~mgqSF`Dt%W-SvqQwyNtmY;~nm+1C_3Ot<
zfI#YHiKZ6T&l<F2W?XapBzN|xuBN$~-|cf-{`it5SX3w|IL{QGT!v<f%F2HvBAClI
z;+Y(g>q}t|v$xdmqq)-~n216aR+Vv+o_8NwnnY{nOGdl$BjF`rrvPJ?$NBwg1Zf)b
z7Pq%~W6Fs@Igp?BMNMyFw)0IEs1KEL_*e5zA{oyo*A%WWmh#wJrInJ$Z)#s^`K^-a
z-HUYq_56PdkIphYliLziPz5mpLu32CwO%z554Qx2{hfCCa{R(ko|x{wm3ih}Gt0W3
zK`10lB}n$7@%J|W08eUxqLuV!+?6m~dCd@#G|9sEB#&`VYZz^<l54#}8TW!hu0uxM
zPDf0Co+?|*oA{zuySfc=G@mPA5|Oa^PruToW^}nMjRdl)rt#(cgB{514|-S7q>8g^
z_RVzDskxPk;djn@4w<Gui5WnW$%;tiZVYpbdv+Cy<g;WGpIQb+Ks|e!?Re_Ug-$5w
z?R;^0r%5H{rOGst^E`4z#DIO=`wFjl;wy=BF}aOA)8;g3770F_a0Oy;a9f-nrj>dg
zdJZXlcD1)3BunR7+U(G*k+a9NKbw*P^`}ANOPeN*?c+?u>d~<7M<aH6^I6#3GDbiY
zgP;T)4@!rMtoo0ZB+aNy_cGki3Ne_H*-nI<<a$#UX_XmPP7hVZGZ^HKy$7uw`c_VJ
zd$Eh00s`kfd7y2{%7gO$RDg4karK~M9R8Iz0Krg3J9CjoQJ$x@2c9~bFai1d(f|N<
z2OgB+&kxXg4ox5(d*F4W9A~e+02yKlBcSVwOrGce0If^3gMq>BC_8rG=O>Kz6bv?#
zz+O9=OlLmbDZvhK7bo~Y??S03IL0Ueyd1IMcc6@Y@2x2WbDn*vZ~!Mc80LT)a5x~+
zjDx}L(wEC+z$!*Z8SnI^^76rP)b;H^hI9wgmjrhGIHv^xum^thd2Gx!o`1S%0lXZZ
z)NSdEjGnaY43MFK@0tkgMsO$rxWUKsqiZu@fs^S@Bj2xX^lSj(hcpGo?K?{z25>l~
z$8bIA>4Uor4;=ph^{G-Lw}i`c+dO*E7b7SX5x8(DBW?-r`c#2_Lm@p*)#It7%W?=H
z5=Y&|0GP!G1RnkAN*v%|l6s!iJXWsql#g!qTq$$boejFPMyKX7KFx!!eSVa}=&I44
zpzcy|SahTW77E>erBCISW><`GcBT$F^`wp=<)o>!w)2&4^jU*sdkTU`KU{EWe7pxB
zmRxXgim+pjAWVeh9u)V@Mdh+aM2nXGFgV&Mu&y=ZR4B~AhU$R)-;D^eF=#|;2^rja
z{uL_5^S;|?_xh38QVtt>MjPcHQSU{7ha+Y~06qGedV`iKGxCBCIQrAxIOE$I5)_}A
zh{?~jAXjB)D$Jm8RA5k*z;irXkCicHQZ|ja&#9)x4rEw}05fBAb{|@JE~=hniZ&8*
zSGT7Ws|cTL3khZ{N{sS&s<4JC<qXk+Kw<)(bB^@rytX8TEJ)k59uWGPc?Lp}sxTSJ
zWFsF+O{m43VL?&9Z*O{54F)^;Xd*4j<YX^D=j%=LnPOdxczvbH<f!(kt>ZxPO7i7h
z&iOq6_NECL6tlXo?*;}qr(pxaGUv<^#t0#h<399=nO1Bz(l8qw3Y7$HDHi2(k$~eM
z=dBJSh`4fO^0UHxs>Jocr)vN%<FNxH9N|bf8188|At%n1A_m-KQPlLsHJt*Lal(wV
zXO_=l>?z47Aqg8m`9U0hGyq2uNg)!JTrO41U>|BB{q(+K6a^ISL(ul2RznL$@&F<x
zM#%g)r}=KhT*Bc%3`hf<`cMM|t0)1+b}!u{r8Z6H<?}X-eZVpNsm4i}i=wM;7zzhf
z?hPWsfrZ2}ki7!2$p^XmPy+(thQdP0({blG<Wz$PfK;hbko@lT#VkM<3kcp+5<u#{
zrkxyiQL?fYUy~^#H_9LUC;=8YWNoT)8;_N`H@y*CrNaXwvKJ&NE%Kv|pn=mgf=?{~
z7~B})lyH9v1BuWU%I*ha1B?;;Ui9q1Y*Dinh8u-l&O)81gHlI@MTQvxP~?IKCAxL%
zPC)YFHjxWA3Q%C5dR^I7b%YNr_X7jog}4l1I-!mj3n@7uF9*~bl%mFEwtFd6Wec&1
z$Cc}mK~%MbPS<;bzSd+zz&(vb2`}U!^GG-tZlkv+wHE<dTg)OU0RZxGox+fUp|B2d
zg~;#eQy5w}A(H0Vio38@Lyh14VNp1ZOGFOE36%3&B$L!}RDft%ANP&9Nf=gfz@ip-
zrV<jZwC+r<GDq~OS~AY4K4K6RL^TsCEPD%+y}oV3C4QgbN$vwi_*Zf{I2-n|WP*Er
zDU1|tS%yn<gy4fuoroLW2gx~%=K}-z)Q*Q}Wo0Y(%Xch)p!B2z7vy{b#eX^>W-$j)
zNQujC2k@nj$%La_I|%o-T>;A<N)|-3K)cI3<as4BKs^Yg0>?1&nq(t$6P1u;b?xa&
z6hs(4;twdx(MkSvJb@(I%B{wBW1M>b0QIN}i-wM4E>8FD<#X1687nw^<OCxPm84k8
z767j}$pfFErIs%;L-vV=3WM@-pJVGt?2)kBaIB}RsOwa$1f``aWq>M@NABC6J#$W0
zf(G-Pd4rR;IOiP?_|!ng0-0CuACRvc`Wi-*fKY&-pPwVC^r`_j#pXu@vB@HLSkES%
zAV}oIjfdNiOYx6PdWw&Hib}&ERwEh5K})@s6@?La&mBoVy!4<6F~i2F{{XyDvK2qW
z)|F*BPcv%yZO{%GeGjRq3qV`%H#h=CZULtk+m(DT9d^?JNt!u}hZ|d}Dd98Q>r?*#
zXi5%ZbzH;bm5l%aJLlAs&T6-qsf9QI9vi-Yts<~hE4UmUbKZa@B!CpFg^!gv<LW7~
z$rPmlg_#4NFaihWX^hAu+aP1R1#oz!l44a}Mnb@lRa5|d@kj?`uw@bBcL0<3fBN*{
zAmK!qCybMv4^vQ*2|v6U#{@St<z?Hnr_6e`c%TADjqoIsdV)#Yz;C4i)maS8I6I1i
z&~~OYc~Kj%Kp2n@VeLhu#~R5b>7B?zWc|~gwDcW=Yph}>QV4DCM_y?|x_;|xD8^8a
zLs7f101`6C<{*BQpb!j>fM9%zdzxTK#DxW>E?<QS)Kam)XJecXl;eVFsLme<-MWRK
zs3@vbgw8h}l<Wx#rM$p|632o7?rBIM6(nItJ4ZS6%|?vd)qo=eVY<_i*bwLMDco{8
zAEhu2<~CUuIT<-T<LON*LT*4#PbVGe+e5wtpp0a<LHJT9lv{MUBOfSJjGupM1T=1t
zfItd6<E1D<s#xPB^MOcXAQopB9Fd-X`t<n#B$!44LAV}&A8H07>?}~mNMV4$;|Jc9
zVWVINLD+PtiDUAXz(0GMc?!#%5(h(`C=i$kK~sXf?kA-o%Vm!YK|75re|<*K6mogb
zxTR1D!6WAAPf7qngK$D{7=gI-#SZd@1%M<R4m*0&(Kjf4+4-=@Pc+b4G3Gk&UB~4=
z!$1j><$wnnJ$lkF-yu}w4s+6;424ShV-LV$Imfr9Czk5Cbs&zO^b7zyaHFB;J;e<f
zU*0m{5Oxgp#W|xpN6C%d3F+@l7y!l_{n7pu2tp6tJc4*4g%24Z5%Ug*oKwM4*x-zH
z9lo@O<-la==|BRUDGRq4=a1Hc&9y)yXe9mGMZjz_<2_9Ps~r8}zMbd*1+odoKAlA)
z090g;n}9P<jR%;e{_c1Rd8CmfjxRWXLlOxCp{HiRYBMXHnB-vOcA<&L=Q!#>q%4e8
ziZSO6k4jYvNmpXLak`b87@X$}GoDGH<gPtWLE5B_*5XVwcI??WI2_ae0JE-EZ?lNl
zmd54V(0bLzl-|f!AW+EMpec-C({r?Q+~ciW8cg!8^j<;vNIhzM9}H?YHwhe;$77t9
z1MdBOD%KXfoste^V=<ZXFgE1(6(`QzAD3_4B=PjFhS$KdI<#)Vq%FdZ%6fC_S`mCb
zh>s=hWO4_{Rj?5E&3Y8Fd{ouiGIgPIjWA9@Q5grh^`r|S2MRzO8t&)t1eWDla!;3n
z2+q;#Ry4l?#<t4{v)mC*-k&-3CbwB7XDbWaD;|E9v-zG|T1v$I&=lscT6k|!zLZ;9
zTefrlv4;wM3GH5%z6^pDiS1TqoD7q+Z3o)5Ej$ltHkvOCay+du41nNg*XdofvIMo9
ziT2WaBg^gl4KrMCDItzBJmqe<@3$49Z{Q;CRsaln{lIAXKA_j9X?_Qgxr#_x4n9Zp
zQ~b?tT6iUF_CTc=bpS3-Ytx~UQgOYEXI;m0%rwu2@Wuj4UD&qdjTZzTLOm<dyaDiW
zrMMc-v8SjI0Pe5A1L<8Bm7!?fAGnhL08kt5!v5wzQJ+fQms8ZHwRD$ihd=;m`&X-n
zz)+#G)a0pBQ!|g5Fgl5eV1_xiqY?6uIQd0bu#(Aa?sdpuX`=wfjpk$L2bCkgv8x(|
zvdoH;%M!^Vk0lUrryiBDAH!($p9DXO_3OXfgSG~UbSJJyt$GoRR>Z;*mCN4^=fCmx
zy=!4Ls>qN4o0c)Wj-V6mSAI3xCC83iK!*6F7SMsVGs-?X<DssP_E);ot*-9A)ng5{
zu!DJ>{$kyE9{$zJYMPuEo+P@|@1qk2yO2gf`L^!pYU$C{@}7)gdP|$Fj+<Wb?xs8w
zW8nQN>tf+jX;*|f=zX)&xxGI?@s0klnpcMI<#cHQV-VV)fs<VxpX0v@X_BS8czGs`
zqxqqB8DowVxAd<2!2UOuYgr_)@WrGiCC`|EU=KolYpRracRM*QywT)?Lh;9kbx2oN
z)2A@aAu-D2j(d}u?7U$Xqv4$%$oOjE;-2A0n$F~bpFvxi$Ba|rcCBrvNogxagUdx+
zVGeLe#b5E(kTow8Somj4yN+3{ER`i2hsr<)Y4@&(#iwPVq*b(JKMiEmv~4PT*0+tP
zVYQwA0EwHowRL|Fz8v0P>T<5TV;VfD+hr%@Ut{m@T<?fHKdjy8s|Jr~%+X;KLCZ7y
zn(AZtXX8r`2EMuCFB3zi#bq8{T64NbU^c3O)sLroq?}dyvsD=N7hU*6@c#h85<{$b
zk6-hxWPClcyEC!D<a-Z#$kIGb@bUal9;M;Cc^bwMvF5k~4UP^Mu+Kt$GgiD+q}|{6
zLfcr>=OrMvJEnH$Bh**RUl9H_rLM7Yqv=xlQAB@w@V*3t*V?%8xZkSBS9WO^PAcs8
zZ;4(e@PL?K=+~k-SQT(v?hNr<2BqVDH|<Szb#!86P&~ywG2Xl@SNM&nUbDL277BM|
zn<0mx_N?t+;!F8Hbef7zo@hiUNW<gqpKAHq*ymbKRT&=I%E<Q1pBO=J{{RzaQ7mzs
zD=You{{YvfUwlilotikqMDCzQqED3@xHa?C-apjd8CK@^bHqs@Uue#HRXMzOA$F2m
zmq6);h{?mA<xO*aZh*bKx*qv=@it<H+A$ai$8N$p`u%G!RQRA^v~MYxm0ixhXUxXD
zIXrv1LuQva5jbe%mQTJ<@Skd}edE@KPd)BD;|}BU@N#=|OY5{?uX8z6l$NKnr^TCV
zf%ZK{;kLVOGA{)MX5M^4y;NHU)B}rR&*tvQ+InR7z^@mR;uVCp<Ib6#a!iO02==VW
z{v+xQaRi=PI7dIb9UVIZ>sVCIuypr#F|_&~<uAl*hYLKHVn{-e#x6e-Syw+2ZeX@$
zxVggQ`FjW6&%Jp3zYyk<`MlT&R^&#HfKR`*XWsb2{{AL{Srs<PxZ^mkTDkQF@GweG
zbJ?Hbbkh?B%*?+o;);H6VtuPV@5gtSmh3IBW}B%^l5N2r_2gF`DAk3`mqzfDA_Qhp
zjDg$fNSgKk0FV`?W>eGV?_6@vqb(iB%GXoXCh@R!W{%~RyrOX<bv@4&LQfujuEslQ
zNQlG_no>+|J*&)DRK5yGxR4TlVqZD-roHvl<&4tjJ%Hl5C!DM4a<%Sy8+<{wd*r*C
z>B}d}Al=3Q;Qs*is<fUz1r{4o^D*9K4VLHleXD~%HaYEpeW@BYJ4hgZbg!*r{j-SZ
zCX+j%@jS&mw((f(iJ{uhBV>c$=~Qhzc`Hs9{%^D@saTcI1JD!bE0lGYX6BQpLVt>n
zDWV}HjGlR^mT`-3a8XO4*6MyXjiru#p~?Y?Oox{A$Dpd8@R`pHvRuN92|(YwJZ{fX
zT<Et7%eBY={c%dM$RA+b3Z9*+Wt(DT?{V1Qo5rqDe3>M6Z0_7Jzm-;(#&?JWunml_
z!)H5(<5?a|t<Fen@M=%84Y*<MPi)q2GQ`X62PvZ`jP)rbX2h9w!Hl=d$n>NhF4bBn
z<8WD(c7j{5stah$14SswIL0}kS<3B>jogt@_54$R80^an;wzZudzUh^x%u6k<a!EQ
zop({c*)IGvV2z3~#X>9!g3}dKx8)@L>IJheeh1-$S$$@;t;`l<{{XffqhQeoC!N52
z!||rv>sR*<vP|f30LUFjr3t1;NRe5+NFAw0n$O8V!FyvBFB4TQ!<CT9sa{M;^H``q
zE<03mPjfEfta98i9@TMdLg2Jy<o4}AvM{*~7$lLkyH;+z-t2s=s<D-A><RgQh|)~u
zNCAFTAn{j?lZIn747meu_=+CJNXGMn&m$Q%KGlzupcRj8!MhH^hG%Eo#Erc{?TWbe
zrzaq&J#abvDW=E;`IPPK#Pu{fm+CH7RS_U1o8^#<j%hrifUK&+cVc=~;cmo+DUtvR
zNTAq=#>e>_{oThoKGi(Qhbt;Z?9h~tl~y3LbtZ|n=jCyc*A<}llQe-mr9y}aTyypM
z)mx|oGcbs*)dVJbp7mRyG{Vff$^)SssmhEN{Cz8G&r)qECzS?d^7DyTAP=Qrq{1tW
z#O*tB3Ffvo#Ly+nNO30(=5#!D9@TJ@gsz5_(E@6vE!eb$Ow01P=pU_2+RXCE)5{{H
zjH<G1TmT0_RW9`TJoISODjRS(;QcA^pu}^tdW;cTD)a6xQD0WLEFnjbscvxRink8C
zBTMDUI>~{xurZ!G8l^3<^0x&%9l?ztwnp5k6AzOi`yA6%=DLrR&`o+qgu%ZG4mT;}
zA6khuS>kg8U5933KqsYEjy8=|A%H6b^D#Nf`+AyW&AHf{aveb2szD$hr}C!pGPdE$
zUxQX?$_EW7k3L!!;xb3x`uoyNsqI!9+!CY`B<uK90ThgOIvtI}6+D67oUtGtTybq5
z!p?J0@ii^D`B0Kw-2AZHzEO|eCy%XHn&#sx1k*7Cg3Z+aH1|hlXw;3}^ZhA|ug=ky
z#s~P~vi7rmLFj~%^57AiV>#!ZJ*frV#A?AV8|E1*dQvJEA~;6p&H__f7D9Z^2{^$W
zDE5=?PNV+cB4qiSeq1mogY0Qyzj&ORb}NtpW;v)uw$|F~!+OwRVgPi&M&}-sdr9{V
zNyecv;HwwO!C^{oCMY5xvihmzed@YK*&9w5b_hKM3IG^Z<es^u?I+ws;^osJTx}<l
z>S^nLBP&E30R8UV{uN(vc$Fnl%Mb@~O5+$Z3>=ZjquNin%Zq<AHx9iy%_!7e%K|pD
zaNO_!_NqIVqL9bhjqMu*4yU_u(xKFw>QQ}l0p|HdOCSLA*!r4Zwu709NY13;mAVh5
zP!7d{vBnN^JC8~hSI&4n$Gt;sl%#8&L9I%z<AO3+o<|+M>f{%VAw^T2{A8cI_4NAJ
zIwdTmgy;BbRJ~ZTgq_=S){<>9xsH;~Yk8#NP^TX#Esdu=>TN#ODJNw!hiM58q+kJ_
zgnCyrbtxouo><o+J)kJT#Y~<eyMaNsJcY<Re@eGfRw+s;>U9@+vXz2?BWKHhF#MrC
zg)2cnD{~V-gkVW1>-4U4_?zukW9<`XE=ukk=iAz>{{X^CGefrO=W?JMK^*=So2gXV
zGNjFwjw_HMxkKfiq>M3M{{ZCF@WB$Pg58!pWw7IR2Vq!)RY|1*r{Z(6VVvPA%4?vi
zhLd`!!C&tv>66zSRt{AzYNZ2K<01nyDFsGi1mF|vik3(qf#gXXJS?iRx*kCw9=(7y
zO5a@b;16dO=XXA0N};^P_Vg7zTE(YCfVMvF9DJwW)~BATDRQzzhBt`YM+pdwOp&Si
zoPS?jQzf(W(`2|YxEla$IX;;kg)jD{yte@PKnB07buHSe!G=_bVS^4h^))m%QI?AI
zPaHCd2}qqmIq%1<E_#EqGyJm}MQ<M{lNmYXj~MIiP{|`ep?+BYW02is&uY?|+3oGt
z=0^Y*B^$5dRc2Y3mh&Q+Vga0aUpW5&>s2bVw&b{@Kgo{W-C&(vAN^kA%eVJ(dkQ6i
zrGiM=V{)UFQ-QmVm4Elr#Wco5nA@iK)Sv~jamV3MykNild9;!3<x>L$_s^|YwV!f1
zB2k&7xBcLQaKH|`N6NmZ-jQLMSjJRw^AfAjo|Se~DQ@=&q_k>5Qn?r&w9#tL1Iu&0
zv$`U&l^}c7M!byOG-usP5;vAnxfEr#jz_I&=sHFH_N#92JWX#BtfE9t$KSn4;mr^G
zYgqd;PEZ!ihi(+0>-Dcw@Gpd+a~fM&#-dg$GN|3XM@(0tg`-yx?|lwR)gez#r$g|k
z!moT<_VU_DBL@-5Ap7m?2XFANO7RY(W2U5b*SA2%uz&@x%a+G~N~5LEY2f<^9@gBo
z+(d^-a8u9$_*b5MK=E90+1y8WHsxs<`RknI;0}O#SJO_irA1$%<wZHj=Kd^r>I=E<
zAhcN>Jiv=4>@tz+Jv}SQuZ`5w{i1bPzrBI}v9sIIRqb<ElUkDE{wews<p#(y5PFYl
z#=LN>@!!QGOp%9Gjj%9#*N0xan{G#CIH;>39%!TzuEvcK2KMfA(*~O)kV;vuQbT~C
z5ZhI;RU*2b<1&CEY>>gZ+$krQd~!zw#}SOHgT{N}xFsheVeABf)#gF8<ZeE_zO^Qm
z9n802SeTKY<&(^hEQ36-9<^0W_X@HQqmR17jQZDA;f)_qvcFA63rO31Bup+-f%NpQ
zoE-^PuNBhd$)t__J4J<IiUnZM!l6=9y+P`8-nxw@&B+j^L0lDO82oCUo2JJMKr$HP
z05D#o-x#g^4$9?Bg5uc8k^7OH0y`7vEA@O86=fKs&zn$Mo`LZ5SQZmUZxze5(hQRA
zz&*L_E8hGEukL|Xd57*(Iqbyu74yf1KG0EZ?n1l9+&YX6zMlB6Snz(PRu%}`m&+I+
z^*_*8rH{gUIH{$%-IrJPkZ@;N;_LYq2e_3PqLH!Yo~FKU_@m-!+g7=OW|bmBLY7Y5
z#(jP3*FGS4nIO@w7JWn(ZN5vZ<H|kj=6{L4F1yrclFS(rH<t@3VVMU~aoAVKaTY2x
zFshq&Z)4C-^3biSYVbiDPHmqXet6CpGWwtET*rwnA(Ghnm%d!U7L7*%l=SKKt5RP*
zm4d+y$y5>_HPv?#4{mx^FNpQ)OS@_1(yikdU5mVeS%*>wZk6!2vJ{<>#$P(DfripE
z^O4+D7tVV94mdSt_1Z@*JFX7`HR^q8s}44XKPboqbgom7VI*XqU#4o!lQC>5`GLwF
zz}0e$q!v(d*mkLGCTN*ekTPz|jB-T@ipIS5n6vW?fP!*GWloNmR>(WPQ;)h$dUu38
zBNn#+H@0Vc!~{;GCmn$u={#ZZzUt21uOfhNjW;6Wss8Er_o-DEQMJ(XKeM<-NaG|E
z*ZI_}T;!g1F9d#7bu@`otTQi_A#y=xI0wH@!k~ECLcynqhB%GYNDb@wRjEW)Woeid
zDq94OndYOx1T!foJmb=*k#M{A{G)<N<oi$}+6MF-`kvUKw8W8O!%&*iMglV6fxHh&
z?)(+wIFnF<876FQ0U}oWgSjTW`Z(qaJmffIz+Ss*SY?vYx5Yn@jQK1EcYAt@=c@%R
zQM4aJ>KzJud+B9|?Mn`00hyrAQ1?Ec&Zh@f&~+re(&u9w3RNbzl&&+3oR6UVtH3-x
z@i$V_E@QX2xt*=SRt@HrFOT6k>Nx0n_peCsZ^g|sQitrxZ~#Wj#UtT{dXhWhxF+2_
z8aItTeVO#%z@OVg;*Y{h`!gn`e|K!4gAu)ap;Nhj@xfl$KcMOL?}9(ztiBo6Y#}=4
zrFUf`CST5MsBYtqEAx*-*Yw>=4bYh74*Pb70EP9fYk1eoGeL5q704<VBxkVnuLl{C
zWtiEyrOPM1v^Rxn)U-$G>i+=2Ks+lphWh2VjH8}1cDgq&?Sa?&*A?PV_$X|55*X7_
zR0?y9;66URz3cPd=HgVhidbj3gxj|&Bp^4`cQswSS8$TL-QF~$FZ{IXMPvPg1qBy9
z5Z!6Fdmnzw{{RIJzZUbDbpHU7M8Szq%m~LSbAkHQdXMe7sOwOLn@WZ?F^o*j&hJcm
z*TR}tjpMhI&1v26H%1xyF!UXTY}oukYiIK>H4N`L-zNc&pdGPFSxhL}N!(F#o{d=g
z?)Ubc*DqM#N~mD+_TnbVRv+i3XKJ6c4~x-65ZcH4#SOmT<Q4wu9lo{my|2V3o)A%3
z2wQrL;K`B6&!DH@d{4Z%a3Z~lhS9u8y#91LZsq+}Z1$U<jGj2U^B#Gjh8IJ%qsbuu
z08v!i;zqqZVhQg|rY=>KU?@G0t$3~1kNoLcHM(YhEGboN06h&wdE<-1hi%#^35}qT
z2<~d3`?qyuA5@#%_C06E7f?ewMX5WGfuk<i86)o3DRbhMxp_z19R~%sG5K4#KIXi_
z^T%?To;$eSR4P2S^EfBh-xW$f8(lo*Ade1<nF|cAPi#~A^rH1NS$)yy*E;T&kk6Ul
z%$RVF{{VFRS2cO!Yg>6vU(RJ*yEg^Tr?3^zPvU7F-WHn(tmHyfvRS*=Gjpii>KBa3
zsBd&67|>&HJ;!>=c&=scqpFq)+nt5)j^em+umL2Gv_zZ`2Y;nQ{{RUjv)mITzyLB_
zFWo;%<*ta-BS*MaS=IL+FOB%)2hdfbvB(-X%A-Yw1Yp-It5d5x78;u9Y=3X+=H0F?
zBR+Ejg_E6w@Z&h9&8aC*GU_(m0oscE5&ktvJf~GxaxgG~9~-|Kj^h!_<i_|!0n4{J
zC%3groTa-pjVMQ<eP*9>Dft5ot2n^H{u+W?!!rbBL4rU7jicAzqn1`^gSqnpob4_A
zs;{34`HSXnj9`+(<`i2})KO_9ObFqR%tp>satEowsYT3>BuLAM(TSG}%MVX#s|?R_
z!sals#UgFa>~sAo)<vzC0!GRq+a!m%J*uoxXL_tMjm%RUmj~t*ERz?MM>W{mQ9}~H
zbf0>!XA-GseDKR41k6Vbp2OOic{GbJl{d^694NuZrf5h+sXA;iBbHTi00W=Ty(E*(
zmU!@hs15S`zzVCrG$cna%1=2wii+amNeG2x+RO;f-rluwi7rIa&XOy`Wf=1VWJJx9
zPuI87rGh}$0^M74$M;YVy2MsoF+l_=6i~E)e*!Ti`kbHEtO=!x2~16$i<tI|kp6`C
zs^wNEn7=I6%Mojt_6XFMQrHHar%LO%%`uiX;vJoLdK2kX?X>{}0zE=F<Z0s}z!=y)
zdGADXMv%hMlH(+RhXFY6>q*3`nsP}QW@jWZTwpgR{{YohZly+DiExCfgA%4e9=N1^
zK@cEFvacRnb~kSCk3m%4{brC5y%-(C98{=DjmaU>$t)Zy6zW_s!ROMUGPDI}jf8AY
z3!mYnTaZzjL}qg-EY5lkz*JWggR%vO8;Qta%LD1{S|~`)QbNgbGe}W@U>h+qfz<Us
zN@5bl)6G<7&Nq$^wN`tR9PI%kD1hW1xulZkWCBSg3U`pvO20F%I4f7|^dkC}r<lTw
z+d(UULg!%~^yI#cXDA(HP=M#44gKH3s6lre_zC82Cj}Y1eLZO;X#_rOe5ohoVc*t|
zW{1sVQ%$;gF4`-ILPs#d#!oB<QYxH}Ewr*o@A3i~7|Hp#Jqf5Gzl2I{qY^r}1QE#u
zbtBMrq25Ma&NjawD-J;Sr5IXQ2P>h5`bb%>BS3+im)bMO(xJW7MW~H#Zd1v3J5^Wb
zCmji?6e-&AsN2Y2uc)RZDHES6QztukOoC4*IqWNRqC>dRs?3(|@Y*{D7-VDw{WDde
zlYE|3vN4rLa9bfk=nY<bY2!wXu9d?sLdH2K>q6PZu)g3fcKoUrh6kbg^`@+e)P*hf
zy7}>mB9MUqR@=4voYIs_c%)6t%n2vu&ML$<B@Sb^^5Km-G0x}jk4kKV$&bo>fV}hl
zX>}d62qTr}K`2Cs6>q!FeR%2gsdi5m*%@JI#D`%q;Ctqxx0h=JB(VbDF$>fV$LUiw
zz_nFN)e9Lpb#9qG`RPff#+tAQq-gn_3~c#bsmT0k=p&vo={j#RV7hb1PCY6VmAQ&L
zW4R9P>fOC5uc~=rn5wQ9=J_xm*ip*v9LTi>n6Skn1OXfp>dlhFJoTq63?mZ8n9CI~
zxXWO7toW~`^6;~$jQ;?tEIw?WpqeAqkbsuSEKEVm%Guq{GCc(z&9U>uyoM-WY{(-3
z<0p_a-|J0l*v|GNZ<L@Tt}xA-pwnA#Eeg2g1q~)t<Ef^biS{yu0hn-Ec>2{UY+lhC
zal9^n(qe7O4)h!ndww+n%WexijUmX!*&C4Fn5rwOFp@GLl37|!jNtviKZ_L5_X}|I
zJm`p|Wk|_m_3S86)E!Hg<hZe(C7;bGP!*mfA2Ih8R!RKG7{ztC6)KyTkUjl=wE&WN
zC0PO%0mkHRGCP`qru!>Su*lNJe(FC^dx7m%phKB;Zixv4P9$&+6Fi!1nxB@&;$>Mr
zUoFDm1_QDG02-joh`_ehax)pu58*>j>m+ZK+sKt!G6x-M)iF6XSkxr*6U&82B}N`b
z`A5IfvnFK)rGd8%_;+OC&vAp(+OJ6;?$t|g4a*fh0qs>T<4MR8N_@}{$~eOG<a+zo
zu(C6i%w1kpknUEHgc*uG_zZjJ9e*0<wFg<1yon?Lw+`n&H+{d|1Eq8t!z7VBkRuI<
zSx-}u>+M|q{I_;+#c?F@dDp7KG~12isTl2D^wT)182XH|L|N{Y$}!rd4=2|?wTY?S
zd8*PwBBOUwxftowv8`LzlG(#qrq@B0cL9JW(>+aN-a0udvga%FlpR~Y(!DA%Tb_MZ
z)`c61WR==Sah6aC3y<<@AsZDSzh0TCw(n*08B{SK6HI521#uog`9kBpbR3N~!Xz!3
z7Bb4X+(_V4qql6Ikmo%6RIx_Pf*t_f^9JhP+*ONvXy1Enc+nR-oaa8g3I?K8hS}90
z&Q>`809IA8fmRm5Ztl`T0R=WD(~L0eed|IS7?d5*zm!)iKK=-+Fx%U0NW8@dC(A$H
zBB9PG(NktwwU#)RXNA)l1j*<<eQFE4dD;|~C5(XQD~?CLYoWH#<GN>38c9CzQy~B;
zKAxVHov9_l5F(9N=PR|)U}L>F)Qq+XLB$xXs|gL}1{pbJ>GbzBT?k1@Ba~-6fKOpk
zUx1F#i5DdBgSqcf1tJo}fsjFzjs<LtS_L5NW;w$a+0c<g<jN#vP=Mrt#t-30#o1ID
zmGDn&5-LbydG@qXuEi(KEyol9)JHLpk+iBG3`Zez>*-6d786EG1?c^==}M(H7~^bl
zhUf3DdLLSIgm}ERkdz>mRT%QmufIwJH_60B*E?OXeT@+;hGY>jc?*1|i8m0ro2Lci
z91%c}rc7&x2jz3nj`Y^xF`{K-97@20p1kIlJ4OOz1KZYuRh?EuW;?PR9AoS2LXrWJ
zOaai3e_AyFRa}zpH|^=3-k$V{=5K698C5dMeJS{0OnC)D<gp#S2dSZ*qgIs;3MV^&
zITcG_Au+fG0SKjXrMaLGq$Gr%IV4k<rV6xejhr0tbKaSdV*{_ua=`J5Oa)di^Jlrq
z_N78MU@HQ7Cp~|{h~z~^R<<s{j;(?Rx2-H{_#ls&2I(Jn0B5BZKxz1HXra_2Ym1kS
z1Mc$&Z*D8~d-ed+bm#aT{h1sn>RWuLrgQD<-oGgH2;OU$Bel0@FD6OP-2%T@KVT{4
zUxOC$+{CHnjfz4A{7=@rJms{h+qtDAn|CumYnyk_JR#@65#*7iSkMk5J&P0H9ep^j
z%^!{XV(~B7p}bjHiIJqnc|E@aU#4HSNRAC2QE?iUkTawqv%Ns%sP28e>+>7qM8ba*
zHNwUQWhlyrAOX|peQQh<QmLT}V~d!%T*xz%g4pX#D8+$LNiDQv*Xd4aRIio+$ZuYh
zz{hZ9$RV;0dK&d^2u8}WQ^O7jKhA-i5D4Sifx?iZw|Y{!zyt89++uvYNhI;_MgToB
zPp3*={PjI392}J=)MvFYxScVa43kC(IL{}g037t|&{Fb8{{UK~VUVXF5rLkx44yr^
zP%=*+%8j`hVUg1#r2rkt!ROMByb+vwaY0a{Y0h(yLF-3end8=g69XANGt)Goiw)Tv
z911%EJ!uZp-yWXy2zC_bFN_bD-kL{pri}1+9t|lRocA0OC<}(w=sC|(NKSFMckN4&
zw*(AlBOP-|j!!>PKna`z5B~tJpBk$$S8}V4pmR;wa0w@qfIHG{A#zuP#!q?xbeM8{
zwKxZg5m>H3$tMRCg;X&i#sJ{@pGpQ85J>4j3ygBBf__|Qq4lA{{nR7n?gvvqa=VM5
zCvVG-Us_Gv@_EGpxMcH|87HWv9OSV8{V5cMV8s4?4JbSe3><U1fZPJ$0CTjSNT6f@
z%Dfzm6G6{h90BuC0Vf`#fP2%pSWlHkFh&ordQev+#xwQjnngGtFwPH3aSwn(o_g^`
zz%Xz~$sG<mia<)Y2d7N)OSuL@bk7EwNzOCYozM<e=yEZhayUNJi-L2s<2(vM8%c~e
z)`koS^8xzftrrUpC6PW-Hs_%f&Dj_j0CGvCCvG{(9jO^`dJG<DY-5vaFjm6kV32A_
z#8KrSlOT1?Laaw_{L{0HzTQ-FO*@Lhm&eXAjB&?GL&g+;^{8NWmt;M7Bfqr(C?Em!
z4bqj^n3!Xcj=!Zn<=jJn3EP4Px2-i)oQ=co_5PHdsJK{Py`1sw>q8NOk>msSfuoXs
z==%Qvg(lF$1e4DcfLya+cJ#$4I3!@7Ty~^gr#$oNnqGizU<OYjfC)0oypRrYh4iN`
zRj^Ldzojso9x<NW^`{@bfWYKsvOCa#Rw_9yf;#8DBCyVTXP;V4$M1#C4>{(7K;-rB
zjxZ^RaQR<qNwgExjNpHbCgvI1atBaH>+MOrvZ^u83BdaQ06IoyU`w}AjoAGu+y^rq
zrxF!7;EoAClrG{5V+=+*XB4TGlwp9{0m<hc)ZMLs<@saR(tr)?xHlk<4o_-O(d{a!
zl5@yBP%+eu?&H((q+;Sdm;eHC^7S+T<C5Sj5Zgu%_rEGeJHAte{_rA@p4b@Aan^<a
z@YwnqH5le{z_YUO2UY8i)M1s2DaRRbdwWwuF7Q-ixXH++3xS*s!<vu=z+CQJ1}6k^
z4FX1gyi^?W*v2Sef7TzD1EKyZKJM%lDtnREjYcZ$AP+HAl2n}VJ?RhM*&>C(=Z@5}
zM#LTad5mq^dJjYIOd#Mc?%ZaJ=o$(OU=>y@8$Q&#huv(Z(oP4j^rQnE^yi9ITt3wt
zlg4_QF2*XI$7+=feMJK--*Bnuea#^o)TurCP+3Vbw_pGS)44hd4pp1WD}(cH??LkN
zKX&_nh!ft2eXOz*ka|)Kj53l>S}p=9L^)Sufs^g+KuyX(4c7xSt%IGp864-<ml+^u
zgZ$}S2N_XV%Nml{!N)_#Oj3Q^VU*->eJQ(0IYG#7Po*YCa>pL{rUQ(a`IPqL=9h38
zIU^j5^rr4$1FC$zi5wak(1u`JC3Az&pKnS`1u97+esVLPN&p~k1mGXMIs-;iCp)vZ
zg%odMfev<pa0kDC(tr$&rQGL?C<KfjT5#KjBN%kUDIAPcVC_4`K^+Y$$jguq-dquk
z@jwo2Y$~Wu<;HQ|n~bIzO0u45$lF`yAb>evQAn&*?os$RG=N0jTOm$C`7k@sz=C%i
zHhCDO5$;XF#~neSB#jw;nI7~2aB=f4LBLFMXw1zQoY?tJ0)c`k$=iTOAOXi}3#Q=l
z_B`jBXhV!(ZE{Z5Z=4PeDKn76)cyjRN(S1jNGBxcwK+;i>*oL?X6iWHY4jK|Y-FB;
z(wpTvhT1m_^a7SiUvVRr>_ErmL~)lQHhd}Mk5fg^0fFLh2;`iUJw*Xm%LP=13{DB^
zX<Bm`{n*Ysum=>QWVY<exFaMFe_v{P0L|qA!2}MY6!|3#*+dF(IyZW2M<FU>g|Nhc
zf4xX!3J&GydLE*Z&=|6a<Zs<ZQ|0-UkACz<VPuiarAh&?_9s2*c5Q8~84N(eXOln!
z%pjp(QI4Lp04NNFe8BC4m0k$+G@BXGWg~be7|sqwDJWklg1N&H_r38*1Z053kf$L*
z{b`^cs6r62$&-@UKXqtr%Ydtc>FY$&26tzG#$86x4<CoEBNaj)%--N~K>2>3T47-}
zZ6U(p0mB#dsU(=pLwQ?pFdjd;M@o)0aO%b~T(QDqtt4Aqg8T(J+t~gT40!v2Rd$Y{
zv)k5;E(4Fdyz`oAXJrC13Kl0cI3+{8c{$({!2Bo+4h}wLMk8>+&wpwPvkxqz@sdiP
z=SXpp&Q3ad{VDGhi5j$#I8&38{72G(4D)=#u-n2=WB9o=yRrm~F@wm*Q%*6=%999K
zsXr;l-eKCAw;;+RV56??f`G6enY_tE9xw<vA4*jrhcf^`B~QPlG%(0<o=Nh_84P_f
zN&!{{$rw32b)+E~QMoO&9_KhdqNIXkR$<Q6U%%_^O#8t3id%bf6yp@3q<$p9!1-`7
zKn}zT2y(%8<Q?5}LKH{c5&$#6Kh~Pk84*vEatYi!0zIhRl19zkWMFj^z;Sszv#~Ri
z&f(Bdkg1b~ZN+oAo|N7Q`F{I--Nzu0^WKQsCd?}3Sn>-TgFq6xVj}P;MN@(stc~lB
zN{OA8GKv8?%VcAkk)w@V5HdpKHsj4i6=NfFfs?|&dH|MnWss_cQjx20y?7iCdIlCn
z4H3eS$`|{_qY;9lHFBUg?+GO2ds2mtLd_E~Q^78N?EpAS_H>b)46@@VzI#*S2`k4f
zgozs-vB~pv?kYHAS!ao0kQQeN&m%sxY;<WO+`H7{U>MuaCV&|sgq8^GaJ&$358+Qk
z3X?4A-~=CWxhJrs5ypfpfwwWrl|Lz`#S<%uX16S)oyrb3ALuCn)EiHgGnE^%?87@(
z{Auc3ICz#vkw#*CVS05w^y_PB?pRwxZqhc=#15o$-_n=_tXke#@^O{f#wmd;j~Z-v
z-GZuo>Ukvh=7p9xoo2{(L4XO*PvJDXS@tY*qO{AkLl3&%gmxx`icc`vs;cZizII=g
zPp*Fo04AAyrhl_EWU(?h#v46=9Vtj-aLsCrp_NpleB_LC&u^_UA`|6fn{#6VIJ3Lm
zx$R0=tZvAzg-^;~)6mn@2L_2FW<?Bu;V^Om@AaoBk{9x?TXbaSVlEvsNKr#F+mRxw
zhRUxPJx}LL`=vXc;5PLEWakT>#-5-7qiI$h?yRa911<pvjL==K7Ff(|k;L1M4=g$y
z<FyGSgM3d1+7%<*e6RtJ9rAmBo+(n?{grOfh03gld~r4j?gvUPtO8|ZaV5(+3_e|%
z2P4>Zq>?k7u3AU?vFGP+dH`sEl6Q1f{{U8V%D4ATJTlwuisggLzdmAhDn@BBjg5r1
z2$HteF2G5iN%S8|v8gOA3|BBp&asfOfH0-;$Reo80y2d}k{K0?Gc)Id(66VxShSnW
zl-kcYRNM12bR#{-tsp}gB#r@bA#^@-5uQA=(-`i3=~1G#xRygJmt+BwK6ehiDHVj%
zN|8^u<oQ?v-1>eVwB(r*Nalz<ai~@?88T&Y>FJ+J0CMb$%Qp&)2-xN@LX3=sKJ?~}
z^w~C+<}#t%%ze2rgZ=M%h7T@aB91u=mn9LK?w;cnG)O0GLLzs@3~QX=ai4m35iZNw
z<1t&?N8}>q9!UOSfz?=kRJRW{#k^q@xg!w9yG(c(@7|$%%R?DfneIvw8KDIa&;!_0
zk}D{HQRW#*IWH&5gWP)4Oa~~HZW3r+eBHZpR1qH?hpksxA`!BSuPYJ+$Q*uMjSVB*
zOBB=FxMc*SQ4OqmjN`xcr%tUr(8WGciQ90IryB_2{{Rm3n26O9;zxCJ3$x+F6VO!A
z$r8aN(le<*LhWO@&T)b1j<k|m+%my#ZWOGn%LI}2IPQDV8a#12vaSIeVaF%b=hl}|
zh}eciyAk<wKsPL*@<8l;DbUGk3$tB`5oTEhxl{Yk?+;;5j@=#Q63-gN3WG8rJBky~
zdXq^Zo*0~6O0cWPz{e;tk%N!Dia>!LE16nrSRZ4`K+ELE$K5?C(U=x>Q#6o(!|gW{
z65=)IqW=IYBsS2p$t~<J40gM=$HydOD{;xGEz(3b@-&5f<;>EU@^<xH4&tTUVp&`p
zDTb#um~NIqw$eb|Td-h#snf-OaPn#PdP@l;RWmZS7BT)grbQL#xLehhI2HyHtGb-X
z!>}H-Uds*5$eJi+H<J;-ZZZDo?MP_nbNoY!Fb8q(ig8i_-GST#-kq>10JzEaprM%H
zjCG-pIb)HY)a63|04k|sP6poQl*Gz*IKUrxvd{w#N#%bEQ<B@80H5Jej8w4OnU&cX
zC{dnIU!@>SjH6_CBvZ2$(9CUKK<Czwr%rQ@^(w>wEMyAU`6D3ZjUyrhkgRY%Vo%*P
zg>pTl09X;|Nu*Wh1MoE{Rry#B3G13Xw;O>^az|<bGBFuA1Q0!G$&g9tNW)}wpvI#M
zocCf6YH&f1ng0MB^`Lhea9`&9alpkU)jeCkOw{KxVke2b#au*y4s+PlY>SK&wUBbG
zIX<)k8MFb&;C~eu9Rg(Ms614GHxb9mIuBDvl<gk%Oy#kIKwOV#^uW(wdNIKRsHqHN
zC1pm&dXCf-M#$fR**l5?;wX>J!!AY#A-JIs@~#MCI27)(YzkY@Ejd&Y6;4|pG3|rW
zfedKe#0$pc4v+oXP^Diu8ShV6qe+=rS+WA1t>4$_NEEbta012)1tXK|KwN2mGk3}X
z>@mhDAgIRRN3JRCQAh{n3<nL#G}cf;hm&Z}0E14*1lZ+EY-|I|cKUs3Hm@ph0biTc
zQ;c3yBS|vuV~~n?QBF{NmXt0y`9WNV8K5>J^2rz=;~YO~0yrV#;D+?*M|xQTCBQE3
zRhQ*fJw2*e?b#Kf5WJ))CP=y|J(!w2#6(nm?l!T`>|kf#(w93VGDiD$i~-ynb4#^l
z1E|Tv4#(b}5v6^R0g%7MywPyE6t5JKMp=kaoP`{dPD1g_nS&g2xc>m2De@0A<$|dI
z05QQmJ5zS5Gc25tILYfq>@G{OghFRfR6iL67CrIpM4-lu_VTInn<_}>p5FA-INC#J
zc`LEMgZ}{6NdEvlJKc;yi2_#d>M>7Cf)UdaFbV@NCwF3fsAg$dn8FFz12W(MeQHEk
zX&u!!V;GT-4e8c`h+Siix3B=P1J|gaE-|4&ADYE*$K>SXVvxfZn#ml)4nAyW@}+kU
zpfiDnAyf=){{ZXIzG7ikP@wP&E=?K*!aH(N%+A3I?Tmr<j(UDn(gdJw8-73rJAa>A
zdI2MV94i1f6*>HIP9kS7By&c)6ctjRdmU+k3b78VAt7<|8cl{lv=#@GjPZ(+bcQr$
zMPQ@?PI<|t5GLTJRZ}3sl1Tu1(Xa_5Z7PMfToqj4kItL`KRDblx!k-JKBAn$HrT>U
z;Ecc1+K6G5q#|-oPI5TUKcJ=|GaPXvt9-l8SRa=jp5~ljVo#L=mTuYRqK%);F_l(E
z`^X2}spX1P$C!*)Z_6$S2fj1yKoCv|-?#T{2m{PKllW80Zf(p}l}H~T$26}PXwf5V
z1SQ-_&N%FQ&=uKQLl|tXcE|i4{^o!LX(LsUAt6ir*#P6(oV(T^C&@_zK2r;gr|V6a
z8Bd$#INks*4*-GN(vUh!C{YZIMhH|mQh%iY3PHuhg$gTt{@&D~E*2n+@q!7GHDu+1
z^gZbn<99;w$Vp-wZZ_l76zG^c$#Tg1pi%RlgPdeg0x|<`(uR&i{ut1m+3%WkjVn0c
zJZ08Bqi^sGebb6XQiWwg0NwMie1C;KgovURw_T8(?lFSE`kzVwj1q)8C;$#~(0ZC3
zh>S*DZ0C?VA9GIHt%O!n3dy<U?%u=O+L##}nFwV@8(3%fev|-_xQaiL>0@^Xab(G1
z*i)Ta4WnaWxDA|xNRlJGLF7e@zb@<0e_9HRu!II&eeCf5<I;c|_nc()<EQIVTI}+c
zCrl@p#Hjn;l+rR5UUw<TUr+I=0a&DCaTlGuaLe+F0CP*eGV(_XwlFX-J+q3ECyF_d
zW>9c49ya4OUf*dU<%#lhh5nSTCdwGo<N)Lmk~r&{Xa`3#%L~C2q^lF>qV&dkk3mWq
z82RBtM2V8i*p3LHe7M;X;x<n=k2sy7SJ&KBNJ}Qzq)Bqe8+aH#)WDWm5h2=$+d}S$
znKQKa6xB($?GcqS08CqZ{{VP;W|BrwWR^u6QY9m{Pfx_s2iq)d8!!?NotvN-?0ZuY
zD##*6n;&=hPg+^+<b`&HD0c5a-12+W35AVJT<0K0&62I}nsP|(Zzvx&S8T+dLC*ww
zeJMMPdbB5U%PNc@@?$)<d(?6W0t~4mCw?D{(;i9LmN*nVnf?Xm7^PrA*|ZVu>+3>S
z0bwf?Ok$iB8QT%b$E_0F$r>z1a0WL3R1!GrnrRK@`9lFwGD!6_vP=}OmZ&2j2>}@=
z*Xc^k31pgb6=ab%pvWP9Y!U1IDH3CVS7HVmO1C*b&>E~{C7Mj_3yr7xQidclU<Srl
zj)tEq0(OyMZK5$D1cC|aP_qSM>nfp)X9vI1m&|gF2z6!KmLPJp#WKkvq(D3IwQ>3y
zX;=q&p_GBcIpvArMI+(Ljz|raW6_V((wH0pv6Z&5`Nl?R#!bi<dazOZvJdH0F;{mg
z6uw6!9+cRll2`JO=V{3xbfe`Usgy)Q<#%-_(~1xn&U3gQ;sc@erWPDzjLub88OO>x
z3Ue@348Siv81iWvClK#Y3XV$-zgh@f`D)vk{{SENzX~ic4<u!yc+})z7G9a|DXQan
zb%BefIAOs8m5Bp$FwQpcDGo}OVpw2gkMq)ySa344h~n7W&&<Jdx4keJfWs*`Vnc&N
z@~0%B2Z9X&3B)Q62i`d3lirXH3OR2tsQIz|DHnMgN`f<-W1P~4-GjJ+jtwC$210;T
z<m7g$OF$8^Az}{hIbtZni5Du$#OEjO=hO;zM=QBV1BC<griC~tTfYIjQ?d(cAS<2n
zo_WSN{At+=72`k|a#^#S{{V#qF5pK+^)xDyK2e--KorHW!Uh0FBpykjh8K9x&A}BW
z&8}nla5)1UgGrKvFmg!hNZ|ey0F4n<^Bo*1Tt-I#npIN3haBVP?V50mm338j*xQ?F
z`9^=OB#|^sv6v)RQ=B)ZI+}K38cL8i5&`PK_Mph*Iy#IM#sD09)5L7;k;;M39V#{q
zQ#@pS?2c*KpaePPvM@eVj=t2a3nI#71h!P52O}LbLc10OAJ48RX9Q%neZc8RV@M%!
zxDLD(r^c-@0wpA#5Bcp#s`9uIADr>C9jP%GBoId*I0vmX#3=<wo4^Wq&+#8hSkS&(
zX50=HhhL>RS>pjCUP<)nP0Is-%&qFfKc{LgfO^CjuHls}wSpc+BLlPnAIu2~JwCMO
zx?Q1s#mX<rA{Yev`<h2)cz{TX#tu$-V0}-Zr*sx#$!~%La{@fQ&&N+{U>k7WU)?*f
zd(y<B;3zCc<|~}~RjW@8YI?lsYiA3VZ}op6JB=iqouWHiR#7`wc3%YaQfOn;<ZfP2
z_chb#{{RTQb*+OXrh_5D+N|hylhd9!uEW9KvR{n#<L2tkEx9M;D<2<^rEd%-B5z2F
z_D7SA+ldLDKIj~po)|;#WCBJ24WRU|qBKv~vtEj0YSw7&EBvk(J5RNDdI#(&5;CpT
zgf|nm43P)`jGy+awmDs1tqMHzdmkRImwkH~dn+lVjZZQn5~JJRw9~*IDsqhtim;RT
zbB(`T^slqz{giY~B6w|0gpA9A7AWwjd;Goqs_v`sFGJ8n2y9X3mBL8*;RZT^>s?gx
zsvmAznmTnCL*i>chdwiyCCBz0r98|sf-*hpO2gqsy?X=sw&oqIcPZrO>0e_f!aW~E
zuz4dQ<4{#3Tfzv9BRz;ed5>N?aZ988Ad=oeDp}-(GWm|91n1Ja=;fG5%ig;)l{&3x
ze5YgZUDCxg`?=RLFyAVV$X1~E4AxtjB86NHp-3(Re|smV74>g~z7JSj-Oc8-Hxs|_
zA&r2*=cWZ&)_en|TihdDi+Gvj2$(<=H*jm$h9572OOVIv_=m4C@|~Z+`zvI5lFn<7
zA$OOE9FyGRztXQm@UCdCk<cI`7}*X^G5VVND)YfMFkQ+Zw?vg<&gEmWLF_97Qm}?Q
zL2YwtqD5j+&;gIcS8W_N7NWFbV>)%I?#~Uo_-P=vFBPjHM<K~jN&5N<m;MpCtfKo>
zqXQ|(kqmrb4%O+pv^r#W@|f)KuM&q1CqwO6w>DPxE+Cc{d1U_pRT%f@^sb2DsHb#{
z?<c!BsQfYl`Dtvb$M2H8D&3cd64rHDEo4?@!V%NzeXFGY%RzOwQn`*G&GMD#R;)#7
zX>)F3A==qwAWn^gpKkSQ43H}v^|yy2l^w36Ei8;zk$}U{3e|(dP#70Zk`x3#E_f;r
zYS@Y!IK*fp^V9%*!q_qT{c7AB<AIXKC78)33o?zteY0A^oMN^Uwe>P>JUSLxBaSpx
z*c3B!_=?lF@aCGzBZ^I&;zD!59qP<t*{%d{5=R_^3e5N`j-%Ywmyu<hJW{Wg(S=7*
z`uo*1mf+g9gt}&xru~vbb0UKI@|Bn7BzFh3Q@**f(xi&r;zhZUOG2dl!yQ{6)}+-u
zKrL*%(`rxI(+aV#%;%;>W!u~$T3q;p!~{mSN+S-$29F1fA5Zb6%$@Z)rrpsE#8&cZ
z4ROvk0@4=ckGG{>hFiPFkL=Kiw|u89_c-fL(<IQe**@DXtdo+5$}&IdE7JZ1_#)q3
z)31D0aiotX%?z6f7$>RY(uEy4mZejJs_c3Gjiz586WQBHf@d-UrynbS^@V!p?GE-@
zXM{9w3Td&%THyg>7{c$zQ|v3vydQZssqq$FV(hGOMSjg3a1J6|;D9|Vsqy5R$B(>K
zC9sYm_7z{VLm$dE{{VaHdy3x=3UjL#_U-x|lxcqDvs1xd9-Bt+#@3oPj&Kp=-Hebq
zVd+=&UxPjizmhw<{{RuJF)K5PRf)mw57*YI_-o<EjxMy>w6)SE+TS;tvS*(_D&L2E
z9pYUR#g@Ju)}u*Uc~PK%J_ZTrc6tF_5vHQrwU0(Ii-w&J)&39s60*_0)i$crI>1aI
z54`yGrucioR-PO9N3C9H*Ah)}dPt5pIcQI){41LHiD`MF__BQyO4JJ4N<oS~st<5I
ztFpe17<?gRp$$zSlI@5J3C?kxn(B`$inmgfG`Y<DC%3ooo|i24(LO|ZpU+>Mob_Ky
z>O3#wtuFgkmR0a{cXvnrJ?;v!ux{$Zq4qxh)w|&v4+q#;J+=0}lSr}bx@C+L$MBlo
z)I4eM=ixo4o1*E4{{T?Afkm?%6^x#8aydOmwGybJ-IdK_8D7>Q@XwF6SuTx)J`T6j
zB#ILxqE!GRXRZ%YeQU?RXrGLJAksWLbK^f4tYI|i8_JH~gic7#JDgSDiC?yd!ykuI
z-RnORq>gLZ)HHUmC+|);RKV->^sk2h0BWz==fq#Mj;}VEqUlFW&|#O%`!c>-QaUpM
zz~_)T!RIye8P5>m@DXsN)1TyO*RtH-_`UmZd`bA3r2hbCX<E#>eUV3v{D#96=m{RR
z<riK&7eXevxRyya;z{#?$Efd`<fM)}zn0i+F`)Ug)|qbvR|z1RQh^2(<AQxF;PE-`
zD!ccNM%&!zCHRYTF6a9`L2MjILC0_Z098@D@paQk8W6|kEW@BD*A+o*5S(CgI@86Q
z83bxE=sj!9mNOGA<P4Vg#22@1weDF683lif*EL)1^SIgOu>rRQC+?qGnmYzye3-^U
z{M(O862>r%EOINIqbR&>KJ|;MQM<Vg%&KlLTr;eUKfDj6HBH)O)>aMZPc@?2bFe^S
zU>J~OZin#nr>>sLJjP_s(~*vG>r(2=xF|Me8+loQ4Y(e;6zJ^;7*`_%f@@tgy`@@k
z0BjHx=N_4&4K*$|Wr#7J3XUGL=N}_8R@y?jg+6A=h9k8LVvG-yAZ5qi1FdYwWCVbq
zR^%?+bUyU=vI@-e78v`|000NS9fcg_avb~Hkm4}7=kA)BY|5!Dudoh4>J4f^qs}Js
zn5;2K*^cSP;76yfYE-ec5)UF}JB|ns!T0w1Q|7oR83|xnyv0B;zc6EffBN*RW*N6e
zoDq<7#cd5al#eh5a0ylmfJI3bpKlt4xLv4ERmb9J)O?7+`vS~Do&a6IoZ_6eXYcGK
zhxd9`<5@-{A80D^f^s9{gYQxOgUX*|fUq2=&G&^ZN63+qmYdW9pU28Kao(i+D{m;!
zbmTsGBc*Ay3{h>N)8vv-lf1CT53N265TEh(Q7}1fi=N+wCvfFR$!ix#{MAt7Bm$@O
zq_@-V6<hrlL<lpzhE(MKwXn7_4Yrap$XF7RDB3qve`k_QIH0(?SW7z(-gQyy^rdz_
zLWFi|rJHK7>^tV9dstyY9$lq@R#pBJ?^o8>a|c)phH{cHY+*q3^`g$$%p?#fjTMND
z%g*DT^sZ8gSL`v8hsisapiXjqYDla$Ffy;p=53XL`+~F}f>rYvFbvDKGNbsrkykA=
z@=uib4HEpyqafyvW>SfVsA=)W0fr#R&-c6W>rGoonGCFe$DT<aEBe;N_W6ukENlsL
zmN?*4KVywuvlAG^d_+f6+=^;fK;x-FY|?N*w`}JvF7K3%!xY)=lt?_#6_kwR;5Qh>
zXv1QP1E_QjjE4R%VM#5Dvn-DmQ#fVEZ(n*YwhmH?+qMo|XC9cqq+4+$Y>yEIxQ)Fr
z*0iUz^4rSBVr*tsJf1pIi%4S%v9lI(03C7eDA0VRC9`Eo9$2|(zy}%5J5*PevLmyI
z&UOwfZ7thrk)%dZ@}xm<$VXCp8iH#pX+tD3msDK&p!}!TIjH7|T$&jXM2_nF)mL{e
zS3jj6V^(D{1!fLTNydHg>00sGk`_c=s=3U8bA#+E7t<t}UDPSsK4M21{{TIy^CEc+
z#D~pdixY;=MqFp<?NSJ0S6g(2gF9z&`=|UXNI>l2Z{c&iF8S4Vi2XVKm0~MV3I<gV
zA!36kqV>)xb0i9#%!jmr;dhu38%O@NTcOWNp?zsQE<-2GP+*bNb~V*Ct3mR(DdrHZ
zxduIW^sL=OM~tgR8_Z4Hi<8iMeqAVyO+`9R+8nc~N8cKNdlwv5-jy=RhB3z`8|Kg5
zJahu6>RM(`nYi`H^v9)I&~2lQg9E()8wT!;o`$uXyi6jRk)?NFk|?_05DoIOg~q|y
zdR0f$u5wb{H#s;l5y<*`*HfeDrdxQ?o+I{|NS)gt6$64jyHpa`TwA2K6Gl=rgan#E
z36ZyBY7V}_x%u@vJ(6cU@W&AsD<34`;*jU3V@ld$qwZ-?5_v$~PxnP_wvr+u-7I8M
z-Bw8h6g_z~MQ4qxD2)m+WMVx!=ASrwBw^j@Z3Dz*w`lhtly2xT-`=84In?it-LS2e
z+CNiUqfeNzj1_2SOcEEBKi&thsbR9(U7rmwiB%K~0z03rCsM^KMhfW|jR=j5o5*(u
zj8t!?$-Cs_fsnr5wbaL^B-=j9%HiK>$9((K=Fwgm3^KreSqkq{k&J$|KGwtbDV(47
z5J(#6p%IQZ7w2~zd-7>lLmo&HN3g3B8O|K~<J!8|bpHS$%n(>hu~k^y6$UuLC#gNo
z57MDqc|41Yb%zFFx6YYIBRLrK6uq+_u}I|P(l)B0Tr7@2E7$9qVrfjJ%zt%8c9E6`
z)K^@#A`oX&<+cLJ69B=0{w4bQR8nYZA$w%u_HJc776+ji?d?z76YNpTHjcwFh26K7
zDt_*LeJC0o#EhyUV~~8Zqm263Qgq8nnc<w21~4DX;Gb$`#*GkPGTIkNV*@3hCp|EI
zC{<XU1afj|(s{8IfCW?g)h9n+#+mjJ<|9JDe)kza!Uy%PqCG9$z)NzuZc8q6QO&1_
ztxS_Dvdtk#M$if};Ge|Rs-*h^nKn`)k>!uPLEJj`;+po1+d&(NI9wX(9>HW~VGzQ$
zFi7O%wIrHX?i>g(Wcd~G_fKAw)l`Z0EapDUQMnk!HK1iuxXB~Zx(m%A)ly=LR~X!@
zfxz$YRa;FYt4#?A&5R6xoK<^8EsWhZjBg;Q1Ahc{?}}(?K5fx$9RWS7XlVB5&6464
z8&~&bTaLZ`YB}_qn9-zoH?SYP0C0+WXX{5Y7b7y3Cyhe}<2^gjRg*afBc7cq?D{j|
ze8wK{k^mmm&#*QGpc1*kBypcwE``cg1ZO9%KPpvz<%S11sSUg2hhQ>rynd9~A>2pI
z8y=pOSGWk02>x*%dEgW4OB{@Vw(d_PdV5hMaiQF;kVoDf1tVL#4=5n#sn1Yo0qG^w
zassjWVb>rq<d0ELhVDqCXp<QJAl%dl#L5|?CD)EmQP@(m4W~RD@;{{xC^?!feZEzF
z-gn8|jw(Z|`B1aQNH502$ZvmYqUDBMpc(D$OP)sO>U}y2T!<9pYsag)$`lY7C?VB)
z40Za}#+%}KW7`}}0l~<V$^_=QIOSw*q~vFkJJp4{V2djefKG5Rnukq2jbU0y=%m%R
z-Fa(szGxeKq?{)`7ap|psY?W#QbD<a4S~rWarheM)^96pZ6chU<+`70Sgw4*umT2f
zcOGgTCSSHXA*jMYU>Luqc%iOD%uFGeAG`-+=~zj6Re~d9Zy>KY`g+x<<dWtQ3|Bxr
zhvh(Vk9taso`d$v#+)}1=j^kryIlOysphmTbcyb+<1om}4#DPc83XD56&Hv6HGbD@
zt#D*`h;KDV2an+=t$H7ZJQpgeyy&VF2H6*2eZQr3;cyiz)U}K&V&e#CH{th%UQ)5m
zZMQkzWFLKf1$vf=ra_|wwYHKd_aGZ_%zuq%X_l6HJRxI4l?9kF$s^EIH(Klv&c1ER
zWfyr;{2)B-YWjFkr-gz@@#j)iWp+#BKM}#E#Is2!`lc=!U#oP+E5*EV;;FT(!5eBI
zNM$StUWE3*=~_NL@$tO8o(o`1TL^hO4ElPS<)^j#404zzNmQT?`*}ipob^4chP78#
zcY75V%B+mrtC*3dX`gBS1taetQCQb<BDrD7mjYERdUnU9UevFrPr8HT8C~nboby<2
z(zfPe0d6yljCxm>T4}o@vYN8EjVrX^7QsI%jQVz`O>uD~XtBevsl$DJ>IaY}NCz3f
zYPq0j)9ady7Vt*yvdpn;0G-5~Ry5%%lI2CWW2*Q&;9LIy75Ix{Cz}Xfa=8Ha#d|H6
z!`q9t`yI8qsYS$sLHCEHdSC4I`!UI+cz!G08o^d#$|QlL!yVmN6W1NbTvw&|@8GSh
z8eCA6OL>wn-$xk1X8!Os_c>-B7#J>Pc5+Lath7F1u+kFZ@Y=#Wl4aVklg<JDwb5AV
z?0})qnY$9JdvyFOr@r`iZ*0;u$Oh*DSbgB%<4(5lqeURMnjk>IR}Id7wfZ(!95iUE
zk$arA=~Z&GMJ*}?bIArmFo5u&`qyWm>SIiuVY`S)Awa>9;2-d+7M>eeW&xvC<bDUx
z)<=$RhM3Q5EaoYTZNcCWM_+2`#8jnL4(~*+X-X9+TFX|<{{V_UEHhYLE0qu{?qw&G
z9=`toO8L`J)Zbgw<hh$ZXe_d}?iogQ{Wz^pjDA17gnwe#UHqZGb_XQ$(AN=e_hLXN
z-I)j@jAP!v8{!PY7~FfZ(mEc!B;f<6wbh}L!b{6G4=0z1(4IIrB!kwlb-Vk??RJ!e
zIVFpvKoRaeD1zqYjI&7w^+AxMjokJB0P9vxqjPUG>g_4OJT7scYVajBZ3>gqQia==
zb1SF|j4KaXfJXDlv0tdC&AWSZjy_<0DlxPIH-HG^HG^gYTL6_-;GfEt7DbVFp}=hQ
z#%T)U0l)op);aIacm|fheJA@h+-UwFA!Kz~pu+@H$R3&XuW8l36x(WAY?q6s?Uf=d
zcb}B0>G;>kKLEUbd?n)RVS7FnY1IdAJwMNS`+H3BC8vnAFSKdXI>^?_hBrSeWB9Ag
zukO{=n#FS?<gXrhA}trh5<xAit|cwK1~!x23goqW1xsfuJOE0iV~5M+kbd@Yfu8m5
zKN~b_SH1qxjF+Ew#*jY@gQ*_4uOQScWfM$cnh9ZHn8as2`98+FC{%SJs3m66$=yd9
zF_1+VD4?`Ve+-I>J6H3RM*)$y4V>pZbjM*@w;F10c~%|h6KG)E=hB}Jn|9I}tgT&_
z$s3!l*7dC&OBd|!%!ag<X%gWr*~__8u;Xqxri(R<5>d}283FlJ`Vm`D=&fRr+^pMA
zoq)0-;kx90HGO<1s6_I~9Aj|W{%a=WVtof{$=6XdRGZl6A=BoPU)<VAe5m&p>Ol4S
zQ1(-!#!^;S87ft<Pu9Boe+EjWqls8b@q*=#-yWD91uUKomMMgKeU$HU0tp<>MjJof
z^aH0qUOH9}7fSk;sL!#7qw4-4hdy28<%d5cgcbh)^;bn@@l(gzTvJUxq@W}~M$EYc
zkEe52be{vw8WTDJyXHGa2=&j>wTFUYdoyiq671cb#X&3%GDdq>6<kFJE2MP7g+{E*
z=>8*k!&Gcd01B}$&XN*kWBMo_oafu6YA=g*OQ&d-2XU1~b?7+c)|Ib-EiDiTEmdHc
zff3wJ*2i;NKk$m+h^K`@s(jvBec|i$t}2*_IcRj#!oBQgMX73yY$uCx;Q3_oNgm#n
zde&`N7I(N;S3m;uo!+1xm91mpdpV^7NsugYZbnuiN$vjt>ZdlJ9lXjOFPX3g>;UJ~
zdsj2BZJE@t-O!e|`joIoXl@)Tk~wa^#<Zc<rg(x|P3FlPW#S__9)hcVjwqSq!$^Sv
zR0jke{P(Ht-C?&ev;#Z$DO_jin&XtN?sZ0-BCTS?chU&j9s5jxkaLom?tN-SmgKQB
zOZQ>wM_hOMRd<pI$eLivPIqzXQQF)p$1IRY&V*&mgCq?7+K+kcK3JBPBQQv#+Cu!;
zKD5;=Ro$R;keo2-$nQf0*%51%0m%%YoP+O8GsZII%7D9a4oUnfT4;7c$f85`RU%1H
zZYnc`By}{88(c#g>Fla{w5+-2rj^CKCTmEF%+cVIa(0fNQ&GI|7*=^AXxI;#vw(jN
z)Ro%}5SH=5nWIL-LP3#<-~-;Cz&vGCZr(Y`#}yoRC?gKmuNvGR-I+h-r#(lv6t6gW
z43f$>6~clrKAzQlvSD;vNkfHrV&~Jj_Qf(uOk>J!9G{q;-&&}b5{OIO+ZAQp71Z(v
z;ntY4uq%KW9A$t!f$L2|OfHdSq-H*AukO*aybcejG_2*AvxUKKHl8u>RebPcb`O?O
z@(A1SeiTbS#b}ZxK*|FH&*N9gAm&Ah<qS*73gmD|;C^1Trr`n1rCcE&y9cQ?MXwe&
zNf}N7`AOsx>F#Mf@({ezsd9emjA4G2YMr+yp5^wsk~NphWl}~yZrSvxn&A>K5yy6D
zzl-y#ttpN}ESBy^K_EPF+Z7+$!k^ydg0Ce`IQr96k`tMJX`&@If*1gx=e<DJmg~Lk
z=2;6NS8d-YG{JCoZ8L4yHw^UWwK7Q}cPkdfiLg{ZcJ4?Ws+37`xUtOE?qOLl%)F7)
zo^eYojRQg^0tWlYfa8)lCmyv}%XKT8YrA!3Nq=%<7z_yDQb%Vz(;p|P;n9IP$6@JK
zlt?C9$iCAQlMU|K4&?BE4@!F9$>o+3t1{<>9s3HdZOn{b5Y4m$A;$^Z9_E@$7E>7A
zj-U)vQHWiZ&BT-32o^xh6f+UVc<J;M0Pa8$zr=GU2u;dY9$K6egV*U*N`ovjhh*|4
zB$MhzT8%(fSmQYV0G@-seLbp@Lc0m$mQvRleXa761~6*0&ooOU_ho^IWg9r)R*V+e
z9#9VZx()dzqP(|hqD|^b79cYy>F9lFq&pc?Nb*LKqxp*?W8@sK9nCu2v39s!yOKOC
zvK-^sd-_zj@|2Xcml6D{f+A1@R3_-ckGeIHAC}7U54WWjY=OcV6b3PrVhMQ|XF2q#
z36e<ATa)GhcShrqeMLhh>M2t+{z}MjxjcRphf?z!X;3`Aj(gJOW4(#W$vjdR@OKTl
z+l=F=%@RCHPn6FoDU4_C5$panP~NA>5Xzm$c25ouOjK=f!2_1s#qdw`qmn}BFZt0X
z6`RXLjLb#?gZ#}j>JM#{w<E|`K4gVH?tA_<LR+}Phf+$r6=pwmPpv^D`+j37BOH<3
zcR2JFq-p7?E_OAV@m?LN2-+JhAmIB{X?<=PWL9x7azSSK2fbwdq2+Hmkh=v1nK)9p
z<AF&Ompd6Q;vrp&D>)laJpC%Yk|)|TRrOF`aElMSI6WI4)I)yP6F7?D9fI$D%bYK#
z=Ts%OihD+iCzTB6YRHYqBm1<m2aZD&hhxX{7X$AO)N&+GJc*6c&xvG-cbx7}FbE&g
znQ?UD@LPS3Kx9$5o<PaB92NdltjdurTZkh&*8?mMYOjP+mcuAr$wwTVdLL?fAvrcm
zZ|05`I&d<%LZu1L?^=QgE=9CYE&lH<iIAM~Pw@T};E|UKvCDvWN9A?h>OFpx=C+(i
z<w~dnDapnN2l~?skA~{tv4Cs^h5*~g<L^^jOKupY)!<(-H#4yNqqYZORY}M!<SA4N
zz<Li~e|oTqxH=`dQ?PDnTOpUzJ%t*Sn-Uu$S87fY-X2c`mh}{|X}4lv=Hm^w5u+}4
zj>eXImx9afkic04+ergE$@CtTZyKV;r981AT#+n!RZp!9V<*yYtz#01SgB8%R6lt4
z&!scV65&!awT>{|SL%H#%R>#_z%gDk#0DE-BR>BCOwesw+F!9;D0Rm2@Qmls15tD}
zdz79s!ya2G`=yD<9{Hx2B)C>slrqPbI2_}qYenoD85hib+mr`XT!N>Z0sZP(G^GyF
z+vYKV3~t4@eLX4jMGZx>C9Lj(85qaqM;20P7x=v?_O{Il^F$0r%*nWL-s8|#pV>>q
zL=dYw9kH%*J@fuGUh)M*V64HI-~vC-6e*@0tj(Wf(ljcJqi#x$*{XoFt>u~4IT;F@
zjByz3NUdAQWnI!h403G7&i=&KT=wppVS?Dq8Bg5<<~>M0)wMe|XC&-l>Rwc_Zu>^j
z<`j@H;m2d_59?SurK$T#mRo!@7%@r?RY~CBde>2?8Foq<Fjh#yOdc=^P<m&zbGpPK
z5J+NZ$}u<%oQ~D#(>W?F4qpCrkZumRS1MD|u<o`aw#MjkKs_sOR+ZI`?Xj`r=1@&x
z+_>|1ON;}`^fl>GUg_o4cVs(&0I=j9b5cVDvOW`T<~^xkAG`_*0!{~+$UfC#+TIog
zN|i1)jqFAbwQF>YQfz&-fsnLvM8r#kiIk94{cA$j)uBS^5c3>tXu<o$cjus_vbKx>
z{#!oLmoc{_dJ55o6kBldpjCbb@0hJ)Ql*XIOp?ycE*M0tcA(=Y?&qoZt0u<eL;z)O
zp(OJ7PhbB4T|Z5*j>xs&&Ti&A8B2ceVCnQVp>L&$WfqXfB6;L0#_yarQsdEUf~7{D
zhg50lv6XRe<~mCx%9{odfIyLe#t)~~vu{>bw=k3&)tIn2I3Ag<mPn&HFbJhaK3h$J
zf(NF19@UL`3b2u$+_Ev*Y@4>0eDnBK(y4Y$NLd`s{1U_tKrM~Txcj;H^{NsNFXeUt
zage9hw(jhrGwzNVrj3B}@_*G}^1Ssq>Dv{NaTJQLA+;fS01`K2*1b5pqtBYNASH`#
zVhIC)qZy&u8G{hYI|6gfFDtZ3CJ5&^?dT~O$Usuqz{;F<J*trcnNG!xT~r~d1f$6|
z@U}~2jE+I}sF10VjEjWY2I2fC`qNlD4f`2nUW__os6_UQ6p(N8PGTgm_3ceyF^~^G
z!cR(QDy|!NIlyMlGf5hd9hr&G_o%&qaM*GQBx4u{ADt-MBL&7)jti5({3s*>!K4Ij
z10%f;v?kW+(0yu?xCaC0D$G=41ox&%CiA(QEPnnweQ6d}k-VYFQIMnfkEJ!yf|A53
zBP1TRKsBTRik2Xi+m6L)08_VuG5iGaNcb&~Xat2P9Xn%+kR`W5S(RHQxKMhpy;+vg
zRQYg3?Gl`sM;o);duF1ul_I%EahxvWk=vz9a72(Hl4f!N*s5?8cKX$%tUH%9_IrEP
zMh~0=7nDNmKi>EHSL=uDRRY}n3$nh52;`OoHvvJ~#0(MaN$1+XAuT5nlq{ZWtFG*~
z0dvsT>i7H;<HRhV1LBVEXM1_24;Iz+_4dHW;a(PRerRdb(w((5KWwNh?))c`S~Wyx
zM=O(V`$*otoE#ro{Hge{mGO?C-#J+33l@G*4mmil*B{##NS@=t)0EoDHNMfYdD?w_
zEAnIG#l6fPI=mB(A(Sj+o?UU&{#39NZlgkJ98d*D<B>rdayMh&)Y9YJkbP(%5y<P%
zSE?W&sKEy(*S#HiJ$qx;ml+>U=7I?rBAA519Y;Yy9Bohl2R`P8$vpA(^rbxxKs<2N
zD}aO$a!z>UQgV3did~E`kaBu^(X$;#6lwv3k4iR-@D6e7N^%H0bBuCmBRrBh^`tQr
zm0SRG-!uV(!0*z66!ks%8SO^|4EFEqKmcC6P)iY#LB%J_*VEpVk?ap%XaNAo>7QKE
zf=^#cP8&2FXDxz#1ppx@9B@bJPV7hkW4#=n2*K<K>qs&_W*qn8fdMKpfI-elCWQ;t
zx@V9(P;hw9B=MRE<9BZU^w7j@n}}8fc0RQA8_&+Xdh`^F)G=NG%MWTy=aP6mh@e}F
z2xE<>+)`(Z?&q<k!vY-e0qcrs0A%$Zql!ZpIQkBt&{XGP>UqJSa&S5J9ce%q!vpMS
z1)!N3$^40<Ip{e9tv$qlbtDXM4;_A#!?%;q0)PytJGWyU1q5U3-j^U@WL`UCsG|Te
zF58q2qJfE=o=!bYDchVW&pet%0Gy1T{b<^8w2u8TK&%;7AJ&eUJN|CNJt+w1<|7`N
zrv>K)NErO+0RbMl6r7BXobgIoSPYC~ie02fyyG18^`Jvf86bT)=}J1}XWoOs&-I~!
z4TkDQM-<R#Dv}9gU~|D3qk)_Z<B^I`+r}Fi1Aqo8yS%p<8T3AsST_?RjPNn}(}zs2
zCp=J~f(Co>$67D~gRu29C7=N$^5f>uOj75Paf9D*q`*Co9Zq-@nFp!u){TH&*yw-y
z^b_g8&!q^vnC{L1&S(SW;2H(6y$NB)Ivh~yRj^QkRB(HH(lFY7bm}^0jk|tQKB1@p
z&l%4YXCz~udB<u1P!4}ORm&!JcccITY_dd11DtjggLGtIk6J>Ww7v75ob;xcg;?2@
zod`R5e@a#<yL3oG^urvGMKp|_PBZCCj)7Ezj&sgw-%t!MJ%&2tr6~Ksww}3AX*esi
zsWiPCAZHw$8UR4K;W^JiNtMPuvB#}B(<$a5`ANc)-kRvd91LTx6bv|F%AfW}si!HA
zId>rc01yIzIRW}-sP9UdV8w_8FC29g&|E;OG4h@{+n$1eryIyQ>^*5gQzEcqlfveg
zZULG@w*!NZynEu40i+R<P_BJXS_77ED6)Z^gN`#wRY3uxDi~vv)83j)VF-~yIQejD
zN1&xj;4mtE52XW<f~T)s(_bKf3CSHvr2qlY{d&+KBRSkh1Asfwp^k7tJ@Pmdr_}NX
z=Sn){pg!R6Xc`(u2KC?$^a8-{1d@Bw3}+ZT9yz5LA2SL72GPmy)Ou2Y1~bQ}J!u92
z`Hv&0&sqwC2Rx3{3#hDexGR7LdQ(FX*$so+j`ZLbLCPGH_ksN=LeVmuU@6bcI@1`7
zxM99h0m&JoX#<|e)1^p>3Z~<dN%_8>l$jDH#OG)wxW;LuAqWbg%c(iRL+R^H=(%TH
z{{Ra5QH{rdrzfX+a0hWjRcwL49Ew%}r-94h9@G)W<y;J79qGgnaEE_FG2WU`=O#Ae
zoOYxDip+3`PEK+C4Jg`Kok8R7ob;qs!iOw=Z@MW)0|3Vq4T$Q@KX=%1&svdX5i*^@
zuyV_e0jBL|D!xg}9uKe5ko?&vr%Y249P>|eA)Z5%o^YUGPzx!_GK}z^)Yem<pNtNs
zo<l2Pq9Kpp8+s4vO&}4{Af=-qE;$7CJ?b;v_&MVr-S?-1=8zRR&lxnEa7%ed0A+@0
z*at-kY=#);<@ct@h9=0y5Ab?aiyUALtXQjOAmDx!z%Wkd0G_;e_M*Z<BI5_jV!7v@
zqMl=oc8OzPgz$5Wnr9daTa5FMS_gLDoSgD04^iYRlRVQmnbA>4-uiYNP)G~Aa16&A
zNa`t}kKV~2HxxXI#Iat3ryL(zKnmVlZ3CawA8L6XX(Ua_A9Q~S_ca&?3{{kXxzBoX
zg3<=sF~9%}3IIn(L4y%pqa!QZ-h>QTDzH%Bc#%jxV8z&y;{fBWDz686mHB>Lb^6df
zMU5Y0O%L$(bIvK!Cf5nT;2icOj<h*RK4J+doP`(^(Xo@vM>!(|pGpT|#x)0Xt6&~>
zo_>_jlCp*nkXVp|6iCbpJZsKy0qst0>n7<X1&26ZGgWZ_O~-05ZN~us<Qh}~q{cJr
z?M-fDJBH9t%6eq~09p$Ssb?v)^1FHZ(*P4&#ElqY+r|kamFKlROQdS5c~&6<9N_xY
zWrHZppD=8&r3l0jtICbVH}Y51e}yZBkfiQ^J-ZwfQ-Eo#nITnQW`EU_&hM=;QbC#2
z9iyi;Ay8LyN~e!pVwepKUAJz*CxSS|Dv`K`Y<jn4Khl5;fC1a{aO8BLv-!-b04$(4
z85pD?8A5?1oCh2n<E1%YcgUeZ2aJkiBdZwX2h7LIk;OStoMo_751Ru73KL)}6Q7Wf
zM<XMUX~PK1xfm(s$m{r1Lz25e9)mq-Mp6qBLn!InKGX<NvDM1PRFQ$sbM5t~D>S8H
zc(Etl053k(8xz1P0S78aS{7ZhdA?~520`ydz?$Q6fucp)$Z+JIKA&2Rq*&amz6k^6
zbm>hf8PVe><>Zihel;L6I_xrn2PK(D9@Jb0k-sbz@zF}~FgoUzXeEtONfm<2lNdk5
zJ${rVMo?U^R2(=xX}>+e63xGa3XJEfjsPD_Qvt<hW{=KX?L7H>5;5M1l(>0Kvklw^
z&T@Sz=^T8R9|}MPow7a1rJBa=AN^P?;5<e%xH6uEWBiI%0b_Ytw#ewQq5?yw-R;(+
zP@&WJs>&FgVEoyqf{`Svvv2MQaOXKW=soGP{Lz(@<ZywRPx9iJ4kBprEOUkVaFK!6
z*qRHxY3D$hnnR3{!h4+lhMOwK8*Fesd|(1{ppVv`6~upLEt4rA$bX1-$EQjFb2@G&
z78^nZW+S1;C-F2byo%mIXDsW69Q?!66va84e367)1>j)fpA^k&50|(zGZPVCz5f6L
zK9s;lm>5pbn~B<lkGco*H8gUT#J7P2k>!I1z%AQw{<R#8@It$lB#U|Sk&}|gs6O8G
zo?9$ME~6_hPsz6!9{#j!1C%r}&2{#m#BJQ0IB#rvQ;cfBLm4<P^8DTL&(KphzTn}a
zDgX+|I3v?N=_Pm;*^A1ubu1T#jP{@h$i8|tq%iIC5N(j0U}v2AjwpiRT~J(HLW+`;
z(-}C%4k=nim680=GODOspdP$-sLW;wq*)d=90V(Zjn6stqyY?&3zk66<qq^<*%{CB
zp#<qEitSb~t>!C{_kr#7_Nic5ZkeE#5Q;IjU7&IAj?_sF=gg2<d5(+o<v{^|ygle1
zgnPuoQE<+(#y(xx9Zzxe=}%KJ+X~yON1d+9Fn)ynX?*f5$+?MJXd#IMIPK4Rh(RJT
zja(c!$@M3q=8K4&Ikq<LSr#a!$T|6ss6M!$#XPq1-68=YeX#9bp8o(-O^!851gjfc
z${3+mJGOea)|k3&*#(wwFJopYfjb<IxHMd0DP)m|xy+(GI4Obc^r@5gU=&ohl}^Ih
z=XbS6zv*6BjY|EdVx{CcR>!A&lT1cMwE*Q<OxuH;^u+=$$2{=)jS8dw=zXHw$^eiL
zEDv0hOc+8f*%``_EI<*%H&rH&HVc$Gjohsf2W(_?n*#+v9S%P_7BOzhuB@sX_mMv(
zm$yBs+y#~-n2C1F_T@jh4A~@O?t#;fT6FWqTuUU$9BP0{cKqr9`==dFYAGd}MoA*N
zjZipfrrClY`@ZI)xwuPsc1aA1@=4C{3K8p$xh9YyWN2FPZXr^rstSNk<B^P$>r%s$
z6mY->#m|yJ=zH_tqn<02B6-WrzD>K8HjbId_U%z5l0-~qJ*wX_oCCMkmY`dbNaeSU
z6z!fO%`WBt09-pK9lG`DNfPgwu4H^fa8@@@xO#I;igXAhhHzy$$&h@gztr`qTJAX_
z5zBiVjH+|BcI0}GQTo#WiP=KMBrqhZ#49-69J%O@KAjCuZ*W#<uBQynlLFhHXh1zZ
zDx8xp<uO~aYm_S-frmlY1NzjFM;e7cXJaci1Ia%N?}OHj2VzU95=*J2mT1bW2N4xN
zIP~MzqMCRhEi9A7T&OXrCv->9`_r~SXG7-sJ4g*F2XEny)j~rDo4x_H_nghUD&y&n
zD6kckW93D;W<U-@aDKEHij^C|E;tKQh?XV~Az2lMN=5gAj<p<n03!^*u0aQZ?@HPZ
z;z9P1-egGGQTLQ|q&DnM&{(!IeKS%n<=pZQEMRONr_+j(HjW_jN^(_m828N<Lc6&P
zaKs@Xv1e90HXc3mPi0c*Sn^NK2Tq(H{<ThHlFWHuX2g?6x+ma)lagw>Ci!t9oRtJB
zj5l9OTA>YPJ=-t48_!|dk^s?4CPRas2^k-Vr!ohL#Ih<gjH0OHAoQs~B4*vSTVTo&
zkSGEu$&Cw~6_YCNM?va64LNPvM%tF|@-A{tMmtcb%0z1r4JgAg<$ns61%_Fnj_T<V
zB$O=J1Oy#7A8%?vS7`D#tEg4`?T*y<wUEc;h&cmr$0f7rQ!4Scc_U!5GA`Z~hp#-4
zX;x@44*7ztWsGd6Joo-oAiE)W*#7=^A(ZVKM<9SWG}MYT{oKHiIcamye_E7D<Rs7t
zi<#mDSsU*2pU$0bf#od>*$SYvY@Fk{28$uxm6|m}y{;6M<ftFR*!^h~BSs_{VUv~>
za_Une`Ri;DC*4zyp606-jyUB}Cgg7FG2WfE5WZZ29w^S_L%G>gBv2MIPH>&}XPR_r
z=0*vg70EbPBo`Rz$69+kO!4kyBc|7n8Nld%lz@kGxbh?;U^&_s1-_@!p0NW9Tsx0B
zjs#=)6m&GfG-5>)22fjv>Bse{k~wx8l!%ZC3Z!+Wl3*dsiecV1;IScaSKgwEcX;vv
z8R5VK@S)~}MditEM9U#;m*Ld^01heg0`e0)Yza}wz#ow5MTSND!rQ)3Lvy)v^rsl3
zm6%5E2m^6FGwn)>BrCE!xl%q;_lLDRa_p1r<l;C%$s>m2gFu2g9stiAIRtHYC<p`7
znrp%Xn3h6hE0jez3QxCVPgsIjWv+^q`GS$d9{8f>G}t3%4g6l=zO=R;<ZMHr61D;0
zE;!xoPE)kBY~?`%c_)YZ`%_hzW<BVDrbg~_?kVi%NSS`f$`LZSAd)@kxC3pszF7Rl
z8$ytC@{ez=B0^R}1nq$B!!H;or!@PUn3^S1YKn|LUBnaknv6The5o)pK~PU$@T3B5
z4i{lyOOYUc=lWB&%B6rpN{^iY&M1!;5@TR1j)-~Vy)<PLeZp+W`BjJB=9q;I<*ILA
zn35lH;~luANnSZz72P6^xdn09QRSIIGGPAmh6kwir-ft^u#d|R9vSxKScBWrf!vN&
zgu=}!ZRM~KoB(|(OtBa8Ck>SOlVQPA?r~2WHZ&5W5aahM?a6HNMKz>($|6P+Ewl!~
zIqppt5g5wG(TPGT9qP_9a(}HlM0no}p?*NbvG4sTixSJRK<9$&*bC}tltdR0NM1Ji
zK_jDgG+YKoViA{&?<1)P1b>Z8yVMp`^A6va9AoQIpPU)KP>7&00|5O!X(b#xOBeyy
zha3a=P@4iq+R~mJINE+=z&_P1Qb1VEZh>~TcJ9vO+>c6ZCgX9M1uO!Mu2Uf?uFTEl
zx5(p`ZGZ!xK~@BhBqk+HznYF%?8Zu-l^QVl<Z^t+C2*$z4{v&wFSS7|K?Wq<@?}2u
zdsJ$I7DQOuHAf^ohrfTqfD|}Vr7*%V^C0R+y*4}$BaQI8&J~!RPf`bAO3|5Zyv2|&
z&cktEm*{@Jv^->-85SV_0L8Z>9=NAw1LTb*+#4S^ASwMv_){7ejpLGK!V{9K!)^7Y
zUnru3GA`mm$<JR=N>$<;mO#u`D(o}<O;v;{N9Hr!OK>)#hba=CojDa7iCM&oq`P1s
z{^|8Tlu2zP#97Hhjy?YXDmJ8wrdHk5C=HAs_Nr_#RBcicb#?0_1;E|uMjW!KEYH0C
z(|`xK_N4_&`E1}B6e$Oxrd%Qk1d-%y{_*KWt^|>mXZtg-G0Jwc<FTZXl%SOn@JURP
zaJcSjH8IHwvNm0x0S8m=J*rtAL<Sq9!5IjPgWIhZunjSJi5!T0#Zq=6<ZfU&rQPO_
zI^9frSMHV0Tip84lelz}COg#R9RC2T9=`O&aU_B$!?U}Rp&JShbBZj$l1qdNu%)&f
zDfzMp8S70!7C>d=Iocbatu-V}kgLCF$qISR8w7JD%l`0x7*@gm0P9g^1njcD+j(Ky
zV)>M)>JP3dB57o{bx6yd$8x7p>CdG>yo0hbKxg@nwIq__K^$*{5BI>qKEH)K0b_KY
za_o%d068P4wKOpZV^W&~666lQPfDzl0>^XpZ<G&TT6tnh?gN3w2lJ<3CRT7riLvth
zrPLq86x5bY;$%pXf&Tzkw~i`1Sz{LjT{5OeGT`72dk&_W(gsD`cMwh)cplVP3F9`#
zbu8>(_`<eudjL9AM}L;Usa@pdThtzYl*XDsL5!$yK3+OgRhmfJF~Hl<j;HHP3D!bb
zvL~5=^8h)=tqu!Gkq$R?K;3FIAUMkqLSV2xeW?SY4UWXV(pA!cALcl6sD!>g;5Z=t
zX*ga(f*5cB<R0}N*%m+C#!i0o0g@?SZst}(4%{D`kF5g&;1KTLDDB+RN4c4$jDQHn
z++@)kc~U9hf;e1efD$q`Wxt4ygis)b7|D)#=aI+KoV$kAlM2~9_7v9IMo3@)$>xE#
z0b^6a&JQ#UdhOa|WCe4FUD&{;$*_`xbFN0$Q~DZgp~>3Nk)Dc2CZv{0B$zqbyeP^<
zm;eFk>r4pYD6$z0C5Ys%@4N3yf)Ktis@Wsg=}K4y$UGDCW4$H@;J9J~WMuGYxDG8Q
z8c6oDmBC%P!1bWBWkhk|vB^B{6rNyW$VSNtIAAb7oKhjfhTvnSMG1i<Dxr&R<m2V_
z9@K3pbAr1M8SO|3EEtZb10AXGxn36sZbN4uFg=K>DOg1+$dY6*4tGY~{<OyZ>1Q(h
z<l%_pKG>(rA{SDb+y(&8>qw1m5yi}G%**?r4$xaY{i!e*#Ry@!RH)z+)Y6b$SxS&s
zuRSRhWJD6WC;|5EJd;Z5;O%^zbHeoc(gEPHaKwe*@{!mNT4-VO4ulX1VMttIfm4SV
zJoWzo3Rm2cpD{`uqdWU?RJ0g2Lx6x2?Mi`m`EI-bcI_Pxy*GowPJ@ySFftV?#NhNf
zr*Sk&#FMp?A$TsmC|PHPjL?!iv%ybadWgE74(#^H;iyS4!N5CL?=NFZnkbtx+v4VE
z-U$q{NOLC9ji(>VqC$+vDngd|hxMp@;kAf3+Bm_+?r9d|Vc)YO9ZyfCKWh{gWxczj
zR5IaNjsmaDX-lJI;EaqrGh~1&r`nxdylu!IDbMFonVTT6&(Klr;)lx1WWr+v1Gq8Z
zw;OwXO+`7~(>Tf7j=A)xe8*#!<YOERQ*ur{J?bT1`yk~cX9{wOgN|}(43D=82Tt_O
z#IeBok^JaU=AEF0_imLO)0V^7m(0L#r&CTcMt^q`4tOKpulRGoUMulU(p%{|T%}|@
zTu6+u4@|Z($?0AH0E2&I--x~<zqhoz)1-mkR^TBe)O2By>+9OOX;8#f+9GWu%)IEZ
zRm<?dDaRoD`&FwQ6T}*_m(%Q}lrr*GGDCU{_OGq}9{&KrI-|L@O<Tl^aWwhO!pZ>{
z;|f6IJa(_4{vH0qo)6LNt-!L3%eNauTTrG4VP2IyqN;zsl1RA5Q(7bQ$HM;r06cZ#
z8_PR;I|(8a;fl(iGM+LI9X<W))4V7933!`QmL%5g?wxKV!%Vyl!?ryu^jE=Ov)6?*
z=1Utr9JyxA%*qB82WsE3(Y!U`%|yUwiwH^vSi$ngrhRL&I9wGSmoc?E5A7cj_%Hqm
z;b>(0Ji0JvR2-PYWd8vAtJnS-e!(6U(`7K-X`W}<zIbF*+pzkdrF|8uc!Ji}DDC_-
zkt!ndFobUn-<pc!#Ttdpis{yII<?p$Ntpm(fBki`sZKh=2|ne<gd?Wsn`r+4vnPQx
zu`Qjv`vS_XEQ#2jpbtvDt9S#$wgBn+Ri(Q*lo?Vn_lInr-nH0C;qMSyF%F9<Dy`=L
zLuCH|2_Do~_#W$0o=M(0BYnU)b->4{_N3}N-sY)CsyWApO18IKeG^57IbkOZKsg7f
zKDCo?VKvpfvT1N-H@BNE-W9vop-13#NCvYN{kF(tC~foeoONt^ReS5-4e2wRtDB^2
zSBqe`5#f=uox>a-#*}2<&f~gEV}gUivds(Xspd=-cJDxbUTQ0U07E{YjdN%eD9Cp>
z1pE4$>NQ^<SX<gYpKWXr8#{swZ#m$PO5}A<h}!hG2G2~5Bv_-|W062VKx?9(v}}ne
zwW$4Hz*EA4TNvSH&(5siY+ro$u6tIB!%UJX?B-Dzd`r0Gj1EX1nW|ng@m1EP6b*B8
zCz~q;^3ljDeGPLO--<3RV#LvuWMZO2)97o^qe`rjxs;q@b&+_N!&-IE+VtH*0^#%I
z0rNMmPhnhNj67Wxtdm%I&`NyoHaNK8n!?olLb6=Cl|scc^0y><*Db2*{$<<T{{XDo
z0Wq(C$F+KtFljX8an!^mq)pv(#c6O1miM^YpS^*`8Be#b(zz{XUwL6>jU9+MbXv^S
z^-FupXSkV}7)yxMH!JVQTBi=I6U-<x<)CQfV~~A~dKBp>M#$owM>lp^eMMxBX(x4G
zC~$Xo^!n3wytgs1NhW@)xBgj-R%OnoWpjzI$cQYP*+Bp?>}jpy4=kDd!jUl8(gT2f
zu|%gB5TfK?Mz&NjMG-rnE{t+lpL%(AU}uVSAte6*RyZK~io{KP#XjRE@;O8RWc^K7
zzVRdq?y@ivvV-NLVVB<(jIl6Cu11ccJJ?|x9s%<bTXS|bZM8{JP52R_h;bg=5yu$E
zt$ECzGrPBitgW>OOA<_~%a_}qyH)M{UvqgYL8s+kBjtDCH-0-;H};JsD_EsTo|2l)
zt6Q6Ut9{_*(3S&ZA6mT>)=6NOarubueneLJ0UiGU8s;?p9{N~*(X7ggY{(fQ2bXVu
zYS)S@X-s!|t>Yru0AjXAz?4^f6O?YwI?{@jklWj<hSZ~yR(vQeC<Bb1f~3{-?ORfs
z7#bu`HI#jX!W+yT`0bxw)g_GgI<4_*dnRw2af~iVQNT6Vd<@WUHLr=*w(n*xTs|ZW
zzbY@OC!ob=Dta-}N>fRcz9o1z=fQp!)9y99R*A1v82qD?j=<Ne_&-;%@Xze!HU6OH
z8@VFbB8+9F&j6fPIr~dqTlj~@HeMVT1IV#$mTL;~t=!|&j;6J|H>BR`ejHsnu3}YU
z1ZHu8fz;P!I%z1>dr2MiDWy@RvN*p6K9{BIa<sP6d9J8k-+)iBuG38TnV?&Ej6-kX
z*yeOXe$$M6!?(R`XnzX)DX6rQYWn;L*2Fr-yfy*q2<j`O@dt)}6E%!-=<sg3P#Q3&
z3hj=y(-=pZ>r0(<;mZzNXj}gPgzv?gKZDPT(e085+iV3Q<g*TQ>^<tAfF!u_e~8bB
z_2CO50K#-QF%j6+{{SC&Zr<PEta^5zB+_17T&#r~kc<3E2Y+K(njNL@g}e_v+&1YX
z`vwV3rB^)<ZuPVhl5H;|bqy_X@aW0nj~w0W#>!2Tu!u?bg6-%>r_-nBTi0K+&yRdl
zszs<<>TtsX?GgEsV*q!@YT5V;;eQ<bQ)kh9DQ#-A#Dq#`zyKdgw7P$dlStLHy?W%X
zp=|F6TT_xYoDq?nlY@`1Ow)7amn3a;Qi^MFz9aBw!hZtj`hK7G;QGJXz`2}F!#ANF
z$v>5H{{Xa~js70|JJO-?UyHSS80U&ImX<Qi0g#c7G5lHWUPt?1c-rsar-LHZwM|}I
zO<ArpZ37+7j0SK)=XY`RuZp}~;~y0KMY<ZVjeJFQb8@endv~1qXfwtKzZv>h!*Lf8
z%L?8X4=c;7?Q^X{6k?t3%HI+^W2*c~@ondbZb6L=!}(FoA!gf?jAMXtj+|z&n@x0f
zwsmOVYL-GdHK0-}w`YRfDMTJ?mdc-8Q{l2z&BI&?OD-dcI*)wU=Q5n9E6LrQ()Zoj
zMRfR-GQGZJU;+TaaD7cH*m)8V$e>0(byfZ<(uUaV^1Qq|w#G6paytQ2Eulzcfc?mv
zWH;V+J--Uh=s6LLER`YwWCl42^UE#>&m$g#wIbQu2pU<-qAA#iIKvNm-Az5De=xz6
z3<SCCJuyiXF}TA{jT9_)sZF~Fxj%T(qYgx2Tj{Bno9zUvE&>(mb5hTzG|+8W!Q_J^
zYm8RHeU;g6WSLQe<`&P&exCGwh26wY2KRX~s+@3n-Ah2_MpEf&q(>s>KX{zy81$(=
z$10VS!dGMP?w=tT=xa&hl0sQj9jG$QG3}htiyT)Aa3pCWL5u<Nlic9-q#UTq{?BKS
zv=WIFa^^lmk434XvSo=v50H`<X#1`1eQQB2u5IO#;92fXnGxHNrVx5M`tn9cr%Fhz
z7AV9}zU&hrR{sA0ueC9#l$O<Fk>NyATN~H7_o;=mh#5dqA1m_?qu#VFEE8mMN{C)e
zf~wnj^#{MwmhEC`B}mjS?!b*tR(}0D3OWr$&ldKIvRd28f{=nDa!)<+=}Q%)aHxtK
zFsQt=S^0<KR?K)nw+PIV97nY6AdaMZ)WXr!D;eRC9$8gMAY+4?S3zSvB1E_lKK4~m
zKn?SKGwoBsY*jbGG6hgr2ON%iRPtM!VDrJTWsNt8%I+>b2dzytobf!7T|~%4O6plK
z7&jzw-j&-LNX=___iZoLvOwbp-klwiv-vL$&BPMydLQXmXAnEamc)4?JedK>C%8XK
zd=SSRf*Xh&hQ|I!Dtpqquvo|YG*ZPVja{QqL$H3QJwN)@HHCl?NUswBiM$6n=RGr8
zW;pH{tpu^Gam|MLIs@zP?@PAKTgZ&X;?FFH3O^by*wjjAOKIU4vXc(S3<%(Qk4g=S
zMUyJ7#yc1l%K|z9T2~T_gaT+-1Rp6+lwkMbo4$Oswobf7fbAAl4{`OR*zAnf)4-Y$
za0<xh8<n_;ao^O{h^^Ft1Z*)O!V<U{^%W>+%Pqpo<f5qgok>^i!KN2rtjffY2#l2A
z6V-sE+e5JwRx5DkBI^v$l0wP<04+Nl3ZCR$vi|^~+5YnYHqpjCed)}l5J2%68YSGP
z9Jl`fU)q}>RJlenlFf~*IwAL{l!{2Fda9NWA-z-uw&!O#=m7OOsYS42T1gcMKosxj
za60-__VLSX#?&%8kDe)ZfCC=5snL<onHWbbFu_+G590kQ9N5xD53<XG?VPXQ2Z8mc
z3t{`0X$vqU{G)|FwRFG?QN!n^&`T+lbI)&jSXu6_7(mFX!)QfczDHbo3Y)T$MJTlQ
zkIlR`Bq2a&Y1=B}Kf~#omUz;8s9w<oDuqIf=V--C5sK1z65$-9FUX8~lT40y*`gOJ
zB9xM#vvJqHJJHO_vO<-1fedk~sCHQ$lY)M}wG6Sc?S@i|<;Y3nk`HQ;Sji;TD|nt-
zAYjkc80SCzYKlo>h(5=RI>vI$GlBi#?@HmI=q#e0xBZF3M<(FOE);u_{VDHn04nn$
zumJx67B-rdu98^)0MTvHwnvt2+4Dcz9=NEP;*o?>;KoMhDt=;py{NpH?1i_ojfa~8
zNxlA8jz-8}Jx6M?_I6R+?c}6{Z&?p9oK-k(7&iNhoP}(?v`dBw>z?HLRP8&(YS&H}
z5E!aAE{Zy5)Z&wDG$yo$8C%M@Vg~YLUEJfgJ?a5zyh{p3rwzRsdB;C>slxI!DDb1m
zvIYI*L}dZ~E_#ZUZex3Qvp!ok2rLdWpIT@%XF06sS7a7Q3kHzk`YP6Su%AzuO4cmV
z@4;mp5-YTxC})A;50M;OV_<nEuyw66Xyp4{qRF;A2MBY6kG=u-{P9~xrTx}(%9>8-
z?fe&|TE3tCsSLYeX#Q3|Fc17eN3U=H098eOqpg+5yo7mj=OS4ND4g&JJZ7Enf-mh$
zS!`|9e{}nuGl9IGNEPUs=YyBT-WzD5AjqSPE(4K{IQmvHc6yYV<iBTIzce(P#Eejo
zFavkbr8zX`n%Zk7g&H+ez1ez>m<Q6dueAHrxDs4Nu~mo=qT`;Q(x}NK5y!R}8B9dx
z-*!U|^*3dqklR~bq*@f-VkX80Sl9S^jFHYbqBw71w*nY9G-Z#L(E>_?{HosMaAUR}
zND2YT%MgEu0+M|#?5{<&&ZiTw0LG|DCnGp)_8yfNY@~+8WRv9`gGxZytCa<hQBk#u
znZC+*U;%@>p*3JDvk2iEu)yFR0Pl)qY#knJLhl;PM2n7d-xVpcv@7{>%?y#*%OPby
zG+T=)=b;|>q?Jpq(#WeP0aZo?OiVLB?&ZoA!Z%Jq=aJTnaIr|TT*gdfWPmyMJkXem
z(ICO&C-{ePPith7VvQhn%7$pN4lz^RE4oMJtY8DU1pXn|G4D!|G>AtC&(i}0pI|BT
z4%(FDw?qwYk+SZO2+neG=zZy4)whL`-bM=$3$)=+x%I2FnBv(RO&Yr8RR=5y9qEpd
zF@>My0zh6SZbuxj`ubB+9gNdrNJsMb;fXABw2wneab+#ELu&4gB+MnE<yem1zgo6O
z*;07g<TNbAnG}4nspuH`)67;@*Kl20-$^)-Z4%&^_kqAU=nrG<?kV#Hv?$xow)e>l
zR&kTK5c>!2*!3qpY9ntNT)&@ik+gp^$it4kg<D9j7$3AqlDf%}Bx#OG<#FE>t!s3#
zn>)b-igzoR)0R`|PU5kiY#MPSwy4TuKQWV#N#pXW)9DD3`6#|&2lxjB<N0Q_pt1Wr
z8=>dRO{?Y}9dp1m*x*BNx+IbS?!o-Sl24%Y6m!^@8<}sUA~E^?WE+)F8@T5Kz9}Tq
zqLl=T8587)*tZP0?ma7BOBS3Pa7mSds)byYAKs~^wVHW6&5*D~R6>dJpdCwnX!fGy
zOy$186qB-f%H#pHk$Mx@`u%Ddw6$g3Zp$GD48Z)Xf2DN^rb%w(!ppgzB&2*5_NeYG
zC7Kf)5P}Q*sTde7@BHceVLC@B+Ij{dToR|}P&)l8Hq!12xG10#hG4vXE2&)&$vm^U
zNJwBESbV40Q*N}jhBIw!q=WZkW0Eu1KJ`koL^?^FjmDQ0CPiWsfw*U{wKiQLPE~$f
z0g}zr{{XFBY*v;_I2ZbRMybPGJB`EBk7|l-Bux`sMq{1~VkwiO<FTt)j^=KMV~~3p
zCQ%eDH*Wb|M_P%k+Asu!Zyj-6EzXh}GkhZimcoSKWL0aeHY-<}JG*lpBL{gSY0o(r
zts_-EjGZQo7mS1~BR@Cs5lxyUEHFvR;eq1@wHnD}K=RH`PGb3Z$E8=E+(#hu0XvQW
z_VxN!@seguSkGLH0VYC{De<6<Ol622cW0sXtD{Vl4~Usgc?vRl=}Twf-Ct3ND#E41
z6j+ZN>sZp9o`{Di$8w`GNZ~RM_fM@zBYdxu6OM3q4yXSB*IiGCejMIjO&ofNMN&v{
zw*(x0+Uv9rgjT3c(_4$6WFB?1jw1uOHR$2;d}U~+mWMS=Wg2eRJm*O8_M@oF7`K8}
z87m_czz5v=S5@I(g*uj_a@P`R#Ue!vj%C4P-vYf?N%(PTG&xIT5k$O32?L(q=DLkL
zLbtUD;gMZHRZ_SLYv}O2F(mI%o?UFx>)knz3U~)e(^?D5hGt7xv$j+IvCmxnE1-hH
zYa2#b9uc{Sl0dx|wOZ7rv(wRo$DNJyfq+{*a4VDXCyJvHJ4Ka7j}k@?IQI0e%tZ<q
z80?H`)tz=}>pmog#u052?qJ7r7Ulgp?OtQzuM)?q3GLxWiY9Ezq42=>$@HjvOX6?0
zZxM!cAZ!HTkdCJ#t#j8hJdw(7ZhY5qm14U``?d2}n)0nLBhZ8_i_luzUCX{{RybD#
z?mY*$sjRJ9;R^{<5Zer-ayQ<Sp8o*jPrJT`IT90arAQ3xpSzLJRtBf2yStTwPb(Wy
z$;c+SYE+COZ3=Eog8t&(SzTk?$ixE6A;S;pRV5_K;1Pvi$LUI>qy`xu0rE5H%^31#
zSB#Uh<}KGCde;NhorQ9f&oX&j2Rm0Iy?s0T5B|@Sc;m&kT8;IL%?t`%l%d(XBMb$2
zr^1g0U--Yp7IDI!ae0Qp5^<J24`GV^U;T+b0@-*M!Vuoc0sB)f(xrNmI_AA>vkawE
z+DY2Og*R2(q27En_%mf^1X^v?n@MdHS>CbjD0}9j@%O`pyR<V~+ebKxLII6_Vmc4P
zy|z6zJr_?~MRoJMwJjkW^yyr8i8QNQYrxHL@VtaGIZ{_Xn|oKbu@Y5owMU^E5R7bm
zk?|Md^ziB}EH-h7i7ML{?vvX-wZ}uC+pWXtaz!LyMp;$cJom4nJ|y^l%IaAQToi~%
zT>OL(-S9i+yohO6YjXEd>83L&AxmMl<JZ!@&jnFNib&_HK{uh1W8q0|p^{mo@?(k;
zMpu&EvTMjbFI?Pd7Poh|3@4g4A%hH(Kl;`09x%9zMA25((HLA@C(OmU1K4_3%OA9#
z#51HpJ&mpWa!P*rVb^fM=i0fmY|@q!1vK8RSkLO$cRT}KzL!|l<-4BDMt8P8Z1L|*
zwVo!0X9SLZ>FVq1J*o>^ZLz6$Z@s`LlkH5u``&y~IGdnCGsZsceoZM#PVaKwg^8}z
zM#$*xmdk+H81)sKaS2KM&B2%WK<cKnVzZUvS)`FcVTO$7Bi5>1g9r@*E3&r)oPa$|
zXC~R4uVR5CXxiCA#BLt6#>Zj^Jt|o@Im>`aIm(P@@Tktve8h~Q2Lw6INtqcd_qoS>
znrX*P+@AFE7Z@j;^ah$)@wWr7QYZk5R)S=^gza>2SKN;E?f(D*{yge7KxkU!*<}C{
z9nbF<p;7+UYs41?fX`Em`g_#cb^O|G^mkB$`?&)%dg8LHN;MXxMpkFln%=diYtYGO
z94YgH$nrl34`J_KPvVU!2Czg(3Xi_Ao}Q+x_+!VP+N2AYQ8b@AfPQB<9Xka8bRErT
zc#dS66`JD;ta?NSN&5HtS0rI5J0oP$T9{V0Fp1LO#k|KROiD6H_Z7XR_&y0EX+^U$
zZr<pJ00YvptS%z8o-1RxH<_7ZjlN}G!HKUz@Km<aCM1N&q<;5nebL)B$BU^}in-r~
zgeyyPCfC913T+6|05YY3C)Wo(YW=5!ZQ|xA7`&M*s>GG|$E9{QT5YSbo;O9v3XVVJ
zpRxQZ)cR^b#@W=Q$m3{EGQEy{>%*QlcRhGvA!N=hcv$%ii)`DUk1={<(AJvxV@+#Q
z6{WMp;Z#pM9zQ<9x+A6{va`Sxs4S(V`A^giwOQU{YS7DS7)qzkJZ*95k56jJ*K)D6
zXvP~D@py91dwEn1+es@b94ii-`qklM6|4Q828gjh0&U169gR<SASzPYF(hFDX%zgY
z)B#XjYCcF=(MetctZ9=<?Ua;aJ#8(m(5%V<ej>+X?kY<-Qt6D7%o0aCB`VwiI$(cF
zq35YB8ou4<<oU8mJ#qA?+WXGfW|PYywr)-{j)c+3*!iN1%Q)Y(#f&io1IZq=J@uFl
z@x)~Xeo`BSKJ}M2sCOSY>;QsP01TjZ%|`cf%OBdJK!IB_?;HW!f!>c|*)F0l{jMU;
z(%d)ByJXKr1GPfe!bT!NwG?CJ@99(}xdlvN^7}qiWAkn9K<`Q~7FkS@3?fE1HgmZ2
z<I@$YqaLPiqb^-tGD5+NsbwP!dWvMfBw2>+ACwg+-*vs}v`-u{s8P8xNCmk+oj1*i
zn-VBfyK{s;bb6m!wFP1vo7}wDtg;Di7i(<G2*(GGxT)+MdHCE;@s}mIQCZMR!A@|*
zvBo-W?0Ko6^9(O<3+$2Awn#=qeuv-bQt8EllSZ6(D3g?ia_$#~><7}Klt(%8=K16U
zJCKm8_*FN%gZFPF>>KVg;HWL%1GOZVh#14Q!w?3-dXHL_MJ7|5Xu7u(2?L`mH&2~&
zk4kJTvG3hDV$G7xoF8B+q_RHMn86~Depf$t=zZzY&Kx{UoU;6`PebWf%7x5a`%IBG
z@WnQ9mR>M>d)0YfXyhS~2W&7n;YY13`MQinD&ub$JfESaZp4g)F5C|=KP(6MP?AHv
z$tPn9i-%pg7{^TgJ?aA}W95Jt2f-z|PkONw8|IGTrCdh9mTrU|03P)Zn73_#5+GM9
zRy75P9<<OA{if>PPc}IOWF4%^nf!2i8lEz#8%VAI1Cqn<eJO11ZemtfDnh9%xN-qL
zwIVco7H=igVC?e_az|PlxGf6v#c~Ibl8%05<FWp9mg;vjGZl6KZdDk?T9uwS&+gZr
zP?hALK!2q}c{Dbl$nI7z`D9Pt&+$^+2Rpn==I!$pK_&(2N3rirxLBIoYh*d+B=q(o
zqlS1{)(HrTHzyPC<Ji?U)OPNTBtl=6Zn*dMs!?p0B#XX&*#w?uHsb*HKBA<Fr;YbW
zrFXChfA(t2{?Jpji2&T+dASCfZ{!I70B4(H;DI4Kl>1|~Ql!ZCh}dZ%aw3p0^3Lft
zHyAx~DmE$*sNb~oC+}8VnxZ5gWY+Q^=w3D)H@!-3q@0EG2TbGC<Eg4tq%UZTGRU^`
zZ~Hu(0s!fpl09lzZVG(n4od@o-K!en?j>Esx{aU~cBtUJkuFrp42l5<&OdSes?{QW
zq0k%4G)7>qRx(*1%;nhi<FFLzCU{@~%8j_4%729Q6_FJ35~%E1nX((8`eL5UmjI>2
z5{4btPNUY3X2$9f-Q6OqTxCNhaG-TL^s0|=8sKh68^7hAar%m%P*xDLM-Q6K#Ash{
z&D)x%I=Gdhj_C+c8CPaE9{kpdD#SL};Oy}3$IBa%q0e*aK)RM@j^Aq*3`!^fV4l3x
zD{N+FK6oE5b~w+lr?R{eBy+;c^A`Kxe0qcZDA+Y5HxfF^C5V;?Jff!<KIWr&2$(vS
z0~{w@w{u9+MzQWm6|zZm9dYYPay+|Y!SG*%W72^=$EDP;BSk0Ay|MwO#Ln#?@{C28
zqb!53Jq<nMMd|YbqdkUwDo-v)l@iVw9p!Kou*l$kohdsAg}k7KSyoqE6h2#HC(!#<
zyL)+KkvzCd7at)}(2rVFj!*UQ#3pdq*nkBeU-7FE1&vHEDULmdJIC^=atjsXjvqM2
zWj}L0dYtz3pgf^Lk|2jCZsg^bta(ic!&{b%U?~?F-~Hg;{*^M?M=K4eQZk^kOY;?O
z_@&H}DMhlg#PZ=9Rc)gxRd7J`_adQKUOA(A4(J)PJFngt=sl}JZ3mO(xWtT3-N){a
zUwT)zb|IELCrm1R-*Z#Whsh$Pv>@$gk%2D3zu5F5k?fs{4<yLUNLCMmq<Z?*_kvW3
z&A|%py_Xmsqu!qlwXFCkPW*g_J$<oD+Qk&9wr9hqNFx$RpcB=Ptyyb0C68sBnPPl{
zA#M+-2kTehwK2x6<^_*;$gZa)z5NAG6c$1yXIT}4oyrFTKg0!Q>+7MSqO4<$GB{f%
z2f}ijAF2NU>s5<AJ>#Dqa|S;+P2D}}<WQx&u8xZ<G5#089^*ZJl=&JJLRKcu+!kTU
zKBL;Rm1iYl<4r}4cp#24trG=fi6kHWYH^MTkC>997{DoxImIktUUWvCfCF$qe(|S7
zX1d(g?50w7qe_EmBl=cc(!K6$XpLw}fbqx{SLQb(AUCZ#OJy5^p~9%#ta;tui(#^7
zmG4n@#sDmzD?WRFpGvbNGAhLEQJO>ZoxEUDQn2}MQ}UIh7Ra7bvU1X%zT9;B)h1&I
zLlOm1oyj8SHFD&EDIRE%7=nZheOKP9N}E^alR0sWj-%4Hrq^>R#>E*!N}IfpNEl$l
zIUe<wsLIhh!EU>l4a5V2Pp7c08}cP&j&dTC%{Xp>hiu}qbwqiLmg@MO*KBTh0FIwp
z^e80V&RN|Umr&l#6J1P;wm+I+azd%&@veJNxQ=Dny<*ISARl$GdJj*=we=fGZh?j<
zre*U9xdR{{TIY3fA&tkD&AG`?r-AN$2Nmj5S2$}sBNI|9$&s*2k{oyR{HqzCE@M|h
zSa9kx3HGf$NaAH>ZR;P*p+*BXIs7X$zSd@U8=K|@1^_+l(1wvb$-A;eL^5tvZR!93
za!qPk>5U|+Vg=s;qYusrA9VUv4LTsItK~F(LCl<ip0%xLtrfGfMT8wdIo<D{TAGq+
z6$Fd+_OOeDz4Jho2H64N;Cpnd`fap0*(7^I94p9v@jjIeyd<=Z6l2Wtf}>1wyM2DX
z^{c1DC8_}M`Gg#_iylLB#s_Ni>P?-HfpW`3+>JNcN=B?BXw~`0u6kC5zM9d%%p(MH
zo?Z`_#Cx99{XW}t;lVqhB1TfYN~bvh4&tvgOiM~m+z;J9Txb0Ct~pKhI^zXnCiVoK
z9iM2z1R+!gKH01dV%>blx>PWfj}heLM#H{6Ppx&=DznK94p41l<_Lxx>T8|VEqAPw
zIKqxpNO>nXtEVkUsT~eWQMSyn%Fw!<ysqqw_9qpCdFF2oaKV{*b_<N3=qs$%t%Onp
zlH1E-qiNs69_Rl6tz71#Za^zFvj$em%B}L8^bKCV8dpb`U0In-RaK;X<GXrN5X#4L
z<eoY0QWqjtK_=4NIU_mGrA9)L^7UNpB=PmG#H?|RaNz9=&r^>|RU}9e4(87kGOz$5
z=Oh9_{#52hR`N*B4<{WdfYuwB{DgCYJ?Ts>ut^I78?Ue7N}EuOz6N^MuZKJ-f8r;0
zw6<cAoEa2w82<oTO{4}<SqN+<6fXnc>r&~K*Yn118a49c8CE^dp!csqwfJdor)Y+I
zm6B#8{MhO3ir294IUXNTab^VVKI0idl#C7<lBj_5Q>6W!44-6n&&{(KVffV>>jaN&
z&IZ{A6V*uS4SJrZ;R`)5V(MUbubC8NasljXgYh(Wt$OKhtF=GX6Tu#*kEL8@n3c|J
zl26P%4rvD`1-U(G^C%CHy-y?>X)%-Ylm5;Q2jfHBWU)TLBwTG%^MZLItp#RAluB14
z8>Q&Jf~ml{d<Fa6iR)JFB~|_1#DmJtNN$5Qq%6R*6c(!#Qf(xo7Q(j@anip>{{Y~Y
z`o;FI;2Yg9Qh+Qrsf$p(5<}Hn)7btM`PJdLT76VR@<$p+^G6sNFZB2Juf0FumYyau
zTx;GHGPF@g8nOu&<|LNg_zVnwHRk6$ki$k&?rTTha$ZNj{CqmZ9s|@%Y-kmKc=8{Z
zA3^Q@75Q2FMQQH7Dwk885oEi#Z!LtMGX?5M>;^@CvwV3=EpOq}_7Vml0w%%1kbhBM
zmmjruik5ySYsE|e2SND02Kh-V&<>y0xpK%SIW%PEl(|nHU~*eI82O0lNwsi6IOC8-
zIe;K`$0QnVatR#Zaxq?`R%P@8csrN3BRyyvcLiQ>Iu6vl=ZrBOK%^l61x`uoDFBBf
zAc8YNBP9srjxp;>1`i<nQV>7@H-6%QA$JeFbHMy_N>S5sWFX@tdQx=xI{hdd_0L{O
z^q^oyNXnjj`qGS$eZPcLNM59pGsit>#yWAHqJRb`ZwDFeO2a>KFaYBxy$mB^+>knE
znor6PAY+1i&>%b#Fg@rP0OS&T^U{oDfsQdi-N<4xdK^$Yi})N00*vE~_X2_rK*{`j
z(a1b0I2_Obz=56Agn{zy<et5$2@8YC&uUx%2=w)!NCrne=mB>OkOpz|r6GrYefv?j
zrcTg%o|MJ}vz^isMmZzWft|qZ$OqPyNY2?1@;D&U5(qyqIPHo$0EBfo$7~u7a7i6H
z(wt}K<I<6dQVASV5Wg--%@`mYiU|ieUVvvE=x1VbNyY|pKS~2pFhC_p8%9ognod}A
z&pG0Z=dZ66^+N0-0OXwgXc*k#hI@7*j2!d9&PSyR4$@eTw5-JSZryP}22>6~$DlM7
z#&S6C>q(A!<n-c|usR&^-hjAaPi{W6V;J@RRA=S{^Xv4a1Oz!9eP|Y-KtFsCC<Bf_
zIPIR)uB;S3LC*?1(7ceD=iZ-C)D#9{2jk5mu5wQU=}WifA&1j63=TWvkwAd_ybg25
zDF7oQBaYam&KNU(bPV8*52(jV5cM3NAZZKW4uFoQ(wf5@0r$E3Qi1~pBz5^|Fi%nm
zJvicv=pi%4-Mk*u1q;HDa^0yylZ*m+=mi@{B^gg0ayX<t!#K$q!5B201v$v2!9TkP
zmf+@)@tlL6m^1~2Yyv`a?@s%p<-rHmnmYCb4D-~|@;*?x_2Z=g7~>mHy(q~&X}$UV
zX~PYW*v2{bpjHJOjkpK4;lcXQskq>fGvBo*&7MaY$JA4~1MZ!^v<z-B^JKP3$R3m&
z02qP-^c3xYxhON71s&-L;GA)fN&>=xi~!&76VOsNF}G;PetOaq#_hugu0NG23{<FI
zql^wkJB5R(+)gQ{oyTb)cBc>vVV7<XLr6wOS+PaMVNQ5e<eq|%{NSAA_s1LxQJnBG
zpKi1=g&SE)?QD{JQ(zu!g?5%32W)aETml&s?&qofX#tEC$USm->M2I-f_USAMI^vq
zmlzy_`Opp*ErP`H?Lh;70~}y;(9=k5xL`Wa8;4Ahp1+kY0AZ3r>q*Es#&gn-n>gSO
z<cdHj$zA@3)2%6B>NbIpeqbp9!OL-h)7F!5Q;<jH(t)9OZ5dO5!v>Q80t*9<d847p
zBR#mIA1*QVpa27$uj(kk$H~E?A27(lAFUi5cgH!!FtB{B?lIG)1w*#+l1F~RjQ;=;
zKUxnN!ET%!(a<#{Nnc@9KYSHDec?zLvH&{dfI4IANLc45zkGixReUK`k8}0hPXq9#
zv=9>$?O5X2HvGi4PVZdO1Cpc5@1C@QcM_w&Q|mwkj9~sWz&Z?Lj^NT`18S3#+?sLu
zaKs!FkF6jF3{|s%&lIc|5G%1DE=D@~QsW>;)Gu!Ie4GYc=eRT~f^)_<U=!Yp1;J45
z!jZwwGe#7W7YaM89<-zt-~vhGB8&~8Lh?Ua5(|bvQy)Jt`HA$P29#|KK?4JxX;L?k
z<wrr!6oB+n+k51St%Nv*e17bz$TsDVTz3?x1G+;bC31Pe?dw9w0+lJ8@Qt6lO(Zgf
zQ-BUhY5-g`k%lYxN!!~LiMUD(EUd$jed%{}41|N%Z8ZMzb_@_X01k8BfE0qci5xK<
zA02&Y0diz$&fcFxN8ezifu59#LoV&$cEJ>YU5AnvC08s-?N2Jv$B6d2mCgXe15M*6
zf-*2m9<*S#6CCG(idF%kOMq50k~kRaNYUi=ZoIJRPXMzV3~W4~dK9kjCN{x6PI~9H
zNYI270IQBp4rp^9nT6ku-lBl6Vlu0t<c3UgDI#s7mQ%+g(t(cMyBXl)0~`u#voYPc
zbH_|$6y+)i$`%>t2dyDfosIX$RRf-BfY8k3C}5=US-Vo82&|~Qk<^^v(rw&uz~FWD
zr?1c0bOSiR6w=gaYxW16^vxmjOn)KHcyC-&kdYv5z-&D3UbMjMtO^0oKT4rocgk``
z23H$LCYACqQ~<zy#+49;`6t06Ac4=lG_xuZ5iA&B;B!F1gk+WrfCtadKU#7s{H%_o
z?mv2vFh<x%-cCUorRY>2mDFSh7@(UC07$|@K<wD#ieD*04bgMYe!t);e{-KPV+TKY
z6W{zPV%z{(lz`{3>p)yd-^@iGVJrqR$EfTn9S-JDyI24YDSrAFW*HwZxu<zd%tUcW
z2pHPK?|Pa*HGtrl$^bFXQfUCmE4>RIq#gx0M&Z1r1iKHqdZ?!m7$@%4!sl}!#z(zP
z>;ze6Cj%u%98-itJBpKmoB`A8PEdy~xm}|wx#aUsM%%SxkwJbi>yY2zDcnSCO0nR8
zS0a-N2;9ATFgV3NQZT5<H)M^=_ekt1k)4EY<SEG?;YbH#3Aln4NjWEyDbcd|i6S<3
zeCj{?)QVjqBt}`=Bzpj9K~5$NH-nvt)KPKRda^uEBE|@8<o5Rz#q!<5+o%PX3Nmt}
zccqmB!icgTyv$S%X&q%Tt0HbCj$K#f$N2kITtcfx>$Oy#F(n`pZp@ok9Z-&jfbR?*
zSC@hxaV)%%=~B<WDGVFI5-PD`0VoL04KO2UA)O;KTma7@MsiQc2TY1k!XV~1$;M6r
zC-vz;c8h(}My|y+gX!;zNcJL!c|$_vsdOC=Tp9p;rc#BVjkm})gT_9lmvTmpACN&s
zB54OealokElx2LuwT8i-!~AJ*84@8r36Sk#cpP;<l|G<ML$1=%H<+uGY>lK5=}8*x
z+agBJs`=dKjQi3r%ef>3Gk~t;bB=h$GCl1yrb3F)j4|xo;{t{Q%ukZ$7D$=07!EVv
z6)xD)ClOk3=jN4&Jv$NFqlJ9bA{g9)erG)w(xfisOENZP{n*O-P=qArc9$iRF|+`z
zzTVW?B4sTQKnRNw@%NnfscvDp5t7gbXkQXw@J>2=8iiSm%DV^{-V3h)`ciLEp(3|=
zA>Spmn?jY7V_>s;p2D3dj4}p=kn*Ezo(?<u(n&atV`+ozb|H*ohWsfZmKh^S?_iV5
zc?kW<0P*~(Tmcpc{!6QOkwC`PeYgjyG(VIrjDNf;uEyABzrXm?q<Ld@XJVsZCPH#O
zg)q9Rs)-Q;4d1*!dp?KL+KZup1((Y~k&l@luI}UMQ#GX1O7JC=!dQ?pLP^NaQ;&b;
zRoWMlM0n$nuozR1yhri^o*q)>>P)L+=bLdD$E6n#@Uc8Qp>7zkVZZ%Z9sP|2JGhl@
z5N%PkAp57+>S}wdTbm1|4R0TkkSvVE@JSiXM#`TnTwFpJu0tmSC-`xSoxnv>p&xbx
zN6batfJyfCH8~z!FEA_z1P-K=Q7W-#F@Vj+(&?4mo=6^*Br(eJ6l<gmN%{5=8`uui
z?_e6q3{sIRZ<r`9h<;TkqhRzn>ro^k{CRLAJ|8Mqo_c544_b84Dnzo|%a?423P~h-
zA5l=otR7FWI=VUqa;w1a)7LcafUvP#L=CDrEUI@jgF8X%$MvQpQ@S*sL4PcaDvWOQ
zKmBS+9j-}RFzitPBlw(wj5oDPaT-M!V$!QKT%s-l0yrc3(zp-3gjuKBBy}k2Gme9f
z!_;>b2#zyx<R_Hnm2edNq@Mo6)`(yYF-c|-K;tBlm5`p``ukJuZOkenF$5%GT>XCc
z(wbl_aY-8H6pXW-pfJb;clH%wv11IkGeHwH@tF3y@fI*k0oeK)ge#;lG?9$SGox(a
zfCt{D>JPJR%yPExx+Rm8U<chJ-`1VLN#+v-4EXa~W?zg9dVgAuU6N)yRP%O>l7}2)
zp1zbThq!x))Jf$*lDYe*rf8DdSS-?eh`f}1h}r)D<)?g)>r|K!Eu^zZ(=D{9(WYHb
zA1}A9FvMewMJx=AzcMaB-JbsdN^pvK?oixL!)oCOUaO8NVIpC+>?lrwLg4l6YCsGv
z6w4EQvdG}9Wb(Xq^rzb6%}9i*z{!@3kLG&{BiRJfeX)19O|ies2VtLTWLF6ih7y4&
zBo%IwC!zlU8US%-xAP2hZr(N~Mlf^9=d~idB^FrN{i-5z0sF(T9+cF3d$|fiuF5$C
zwhE8yPmRki_Kzh&!zWDV`BKmZ!eigD;*-cDJg<E7kMN}OmI&S6Q0_^}5I|wu=qcQ&
z*prZj`nkv_zA3LR!cUsJK<T%k^r-<!k~kScu^7uwj0_)7OmwA50)iB(4viZxBzot)
zLn;l(lWqZtE0ckmZuVF<G2B5pQh&}UxD$z^ZOar`+kmD+_m9`LI#m-tlnRLVVT!LQ
z@ARk|Lo|oYb0OQcPA~}cskX@RiDSA%3;wezay_WH5zIh<9j?q7ft7etJ0JeFDwj#N
z%Obj97I?-n?rD(AC+`BUGW?-fWG~_C#W(<xfYJaMfThkc>}cEvwpt&V2bA0+590Nq
z5K74-vY3Rpc);Y~cQns1D*3X@mB|1v8xO4)aw-jyMCWn>2LK)^^#Ri#I#+)ra7MzN
z6n!be23_&V4n{f2#xw6so=I*00DJR!j=Mm>z~YuLn?z8zm@%1O94>v0Gy*xbJCr|~
z2>DbuDrr?6Ll!UQD(4{m&rH!GM$t6HF2os7#|5b(Mn?|P5->NQUzm(^_s8_60*F>%
zo<g~1WAb;;s6DDM?K%|aDsaGd?N(-ze>*bDBa$Gc7jGQ&=}}1UCgx`m$cy{ODgei9
z0q;t{1i61S5E*cwC?f<?x1R1r$}CSF2|$?0{3;R_NVj=`Mo0iRC)Cu8s2g+1n9dbb
zrf@xdDQW}N_HyW1dc1k(9>=vU%H^6{J3|nDQYL-DKpg%im{>=fc?$r)JcV({?ax|i
zJ6NoetEs__Pki?jh9fGY$Rf6VyGH*2GZ_cIC{gDX3lk_Sw2xEjeW;ol6nPUk^A95(
z{g1UcEcdR;k|QyT<_Ngkia<lZqJ%l!^5>;Vyflp%Mcl*hci?`M?=5AAeXuJTK!m>}
zu*PwUY0PMrvUVlZo~@sM!=*GKceHRML!6RH0|XC4O)|>Fs9?kl{oV)v0A7w`iDXo5
z**RtzEGbo0Bi|gLxH)DW2tL$U0wD73DH90)0E^W6;+0lYBL!t3uK_y`@u{7S!p9oM
ze7FW!fr4}X6tGA+h&TkP-Zp1?o`roq>DUHCZqsa5wsKVD4frOKM%acneVaMM4u8g^
zSr|grlUi`2adE~o=~1)^ENmZ;SBxG&qyrK)-M$FRoaZr&;*?svaV*lXRor%?b<eFH
zb<3OrazFu>185yT8hIXJ-6Yr>P61r=MVJk8OdGyXtDGYY?lkDr$^@A9h6gC;?$H>X
zK)HArk(|1(%BGtX*B1`5+}pEz?Erm$N_GJxSeiBxUHM?I%A+`M%AQD-Ol;j0V2+^E
zkOz^IKQx%Y?0M<!O^hAkWnziDmMfCH_p3l5Wr5X9rGJYubDAR&M#U#`QMuSXPo*yQ
z48%H+#{rpo0o+qjq!F1>fhqiDcpmtwvH@|{MwErd4+oJ_g^mfH<&0%f6oLuKZ(qaG
zn1v1o{luPCPBHF%sR2BN!h(5r913;;*0QuW0bT%5zUC!H2q&nf7LF)dRYwixHUV#x
zk74UZ_i|Atk0gPTy#+ExRmwD~?3|LF1pp2}8`ZIo;b3{9AtvD_ahAwpxln2%q%Q9>
zsm_0;Sat#xLlI1z_0E0$sIUw6fQ0P;0x;<KBO|!<rU!|<xEV_vks|~AC;HTP3eG&R
zppbLH?LsusFlfpaR>W*Za!+bjKs+ffe3v^jfsviRQ$ruKsX_|w<7qsfdLxOv#fV3f
z7~Jc-f;;A;Jqbo-1e^|}4@}dr4wgYAWEuWc#zOE|dVUnGaIT;f0SEepUNC*ndP5q#
zn1cui?%CuHd8UjWTaGfT=|BQV@iAL=A)kZAF6i@s4nK?@)WMbkWRX;cBtL2i=L!z?
z`}ygL2e`X}{F%y+;Xa<8^nrH9cMxz11Ha?#O00l+jN>ZbDD|fusu<kv1dQ?D(wY!~
z%E%`wha&;7Fh2@d&fT~e!6zhSP}}5kfmDV75~J?>eQAe~VloB5@89W2dyDdUN~p|B
zJ7f;3Xe{1Ol_657<n-hkS$=((Y!EO&^#1@F0}-9%amd2)K!jv{t+Wg(<hDA0_31KJ
zMH_=C!TKLcS5t-a2nD*6(9&?rk}`S~?MtY~t2?gZolomZtibLV2f3ms)JRrRBl&(p
z*}*jtjibWIhjHfw^%PtOk_#&kK|jTww9*Q$=E9A~ib0>cP6j&qQm)g37{(4d=bu_h
z+;$gn8@qwm)|yCQ6oI=q27=&`o^pA`8NdL)e5o|<CWRomDUJ^#npJN#vRIN2%m)XK
zDZh9&Gn^g1<JyAD##<NziY^1t3@Z6-!HEf$;8GPa#7t-B-gg1md(x>wLIO)Uz`@{C
zmt!~##S~+C#%Z7sI+ntmdISAwe6}hasoEIjz~EC=(7SnSz{gWgX?h@H2X(4W=ms$x
zOCu6J`80`;NNk?@^`YcOZ<rNshn}>-Cf(bl>No^(P})PWF_UmD<q$x}2d}**Ss!lA
zta;o=^QgD3&>7Cr+dXJ9<;w(Mq+n6Zko6@KI*}?7ka2=Knh6T6xci)(VEa@%@IePW
z^X*5N%6+{tOWGhFWLz;&c^&DCGl?<@0G?^3i5VlMA@|@^IkA!#VU=Oj^MlY*d8Z_9
z>&GUU)A9AACm21b=a3IG9A|Oham^uP(*Sp-^U(LB9MW=Z2NS#Rb?r?#Jd>Puqpujx
zYCc?XlgBx!00bUQC^;LL^*t#W#~gI@rHVOcK3p*ub~p;Fl75uZZRi4I05V5jMkq3I
zfI9ZaO6dF_@R!EEHNG}lZj~f#7eBv7Qb)HO*RXgy_7(B1>``6c%90mguM9(gI-S`W
zA6o3Am*T5OnlaE<yRtk28!P$2mMb}3M|DGr+wiBu9~k(;V47Z)Cf(RFNTdP!WY^ul
z4L{(YdJdbX+sf0d@&p8yJV)x8?_THdyY@=(-iLPDl=^Ha%0Yq=AIiV&V!c{fDvh0H
zXsONYet!55_8Rd{wDFyFt^&M@e7IB$ueq<GybJ#T1ntrEn<E|WfR{<I5E?DTm##_g
ziu(gZ@P3C3lFx6aTE`|z`GE&G;NVuclR?oXkNZA1DoFDV{&U~xJ*&Dnd=?qC7~Psi
zg8N5}{5<`Wd^h0>IFidljznM;-c=ZpG51d$yB?yu?GNC#gK0ADFg?UaY-&f`LGRxc
z)axE71}3ub{6lrY9PG-HdV%RxZTvB=C9B0Py9SWuNPHO2erld3T%4;!Z^=&Sv{$y%
zw0jHhutZ`oy92*&&=1nA>wX}LT`XuCU8J!vCP3?q=ciiMvhW<&F{ZCHK(aUQz!?mp
ztl4}%w$j4u7uvK)vPgWjZ@hrlGpQE$F7I@5mRgn7-k!R8%_Jz<4}pT?>)y0S!);bu
z7;kPZBvcQOiP6tuPj6c2uQk66curY9+R(B@pCz=3`^O}6&O25{vGLl)?0>VoJ8v>H
zk>n)NWCcBWsl91GawAE!UhwzBgohGp%&|mYbm5nlU-o_Kd&>_A_<A|6H9T4{0NJe4
zWVp{!^cCh;e-!n}uH?3Da(0bVYI%bp8`C}OBU098)ZpEBsx<N_!!y4l@a!w4VJk~n
zGB(`wPZWGs(%NOawzvK24XHGED!3TQ9m%X&{wE8|e>yqjK+M8xnGX&}U<W~7d#`wk
zZ6atMEjN5~p;IAjjE~~3Zs*3&VGI4T=oplr-5~6G=DOj5rx@ymd!1j1{9kc#;t1{F
z)TKqZLayq>VSbgB;-4DNXQxdJH;;7QSXk6ADes?J;x(TfX!2?(8(oEEiZAqZa(na{
z9Zg_s9}#s6SCUIvBY6=sB9J<FAXj}HFFQ&mbEu%NBe<8v^4jRJzMB&{cRpm29m<EU
zdGA<vdhD>@wfajQ*|DFP?gS25M{4tpZ{lOMyT)e=k@pp_0j^tB@w>@*E_AD=Sr{lJ
zzTgM2?Ou&63XbP2@hhgMpzFRi(-z@}+R9u2LoseK+ZD`Tc=G1j+B-?_QbycXIb>cK
z`W)96tazGBIk(*~GLgm)QC!ZW<C|+Gju|IN(WGWmCpkU-mDPMM8b0)r^*LoyrAMLN
z>fR{2mN|rDY_2osg#lQ10<bkd60A$-%QoHID(4%BuQtE<uccZQS+zN2b)R>W8j=DY
z`R`orxA9f(q}y!H>Axh%F^`}X=U310bd$5xN|dF!=~o^lj_N5MeM4*RI4S=CEXH^T
z-l^SqqTOU!g~~?qK14;hIPZ^o^2z*hsLMIIu~mqe_BrYt`r@+Y)wMYn65KH-Bp&|w
zuOhb;MJq*IrH6^?H-8Y}v7My6c$<Dv;{zujO3S?Xn_&tfJ;8FsmPH3C{{YvoJYy`4
z=Cd|Wa&k>H+mcT910$1;mE=_73}o-hYN^E?g~!DSB!T>m@wqq;*9%#fpAa?q?#0A&
zWU6fQFacreYZO}}Aju$f1G%XT2#MuN<w^Gbb-_~~jI8yMrI9VhudB^&M6)mj_j#H5
znD*z>+Pm+8J{eofr}0+3GYBo*JVD&zcOSw>rCRt$@IAH5apFG~!z6JR%pk7>4)y8w
zJ{|D>jVox{Tsv*TiCNt~RXOeIc<EnJlH}N#N;T^@=y~{@Tq2xNth#Gz8c@8xR1-60
z2<p7>ym8W&@;f_uB-$CUp?49I4mktTrf=<iTU4{Ph0@tW2AHH>BF9x9-an_|TH23;
zFRkuvE!yp26P)drtX}8b*WIY3k>yi_>bs+~@F#$@jR)bS?~ZjVEt0LNRgGMdfb?Q}
z`jJ_mv-gQLJr7@>#3FcZLwt+nkCYEmeQVHsZE**O{sRjuSmTyk<?>Vm@}8Mt>U}GU
z_+zGNIvtel4V&*ve7Z*21J@(HL@76SC8Ir$XBAR0T@g03rCxZG#uxr3d%z}{vaup?
zgX!zmuULFL_?55N3ymtm>7#^w_sXkh_;{;cAMxgmZK;fDizsB;B|S5r*1eNc@xO`u
zBjKwZMhjRWx4XB*XsSL;4E}Y|2<W5RW3~`mqk;H8;Ope^B-Z{bfPU%%qRMvKr;qP-
zG|PJ#W$~@Xm2o0@R_vfhyY7RYp2Ldnz7bs8>-w&zuIg|syR6RH9OR+RL*U;ErmL@A
zUEIXKIc&;e!N+WR*3gZm%583@hl(KZ=BzZo3tVdx#P-n!ghGXe<KK_#TGn&;Pef$3
zktDrKy|I`bKX;MTpL(z0&x1PNm*Pb61^%vJ4&<Pfxld!BoL6__Z;KxcCbH7L5cqGx
zHqg&$bLVPW)ZuoP3PDiVEx42GjD2ew^*xs?WAnE{;G1@}&O68d02Xil8zJ!j0K@AT
z^gD-D`$g@x1G11#7u(miK(7t)=k5LB--NceJ{0i2pFX9i$p|+y%KUkRljd(Amie+z
zdh5SzFOI(mJ`HLA0AaM&ZMA)NczM$;<PR(xx;A<!`jMWM@OG`@Ek|6{Zm!<hR!yd5
znXp#`{m?7(&LhvGMz6ENOIEdKWNjLDXp7@d#cv$^Z}DB<ihOM-y)JMbGIoR~ussPl
z&#pe0=PdM#$B0Z~0Ye?}vU3hP4EHC}wdB*SqSTrxX4xc>Cz%Fuw4Q$oeZ(JQjHT3j
zo;SgCYyeMBsjq^aY1EsPo!c^M?^7vsvcD<~(U#z#=zD`x$6}GJh2UN7{3tLKdJl6~
zZQxc<vo+e1c@pE4&s>i61;yM_u#zd_d7v2>`-G1F0F6&G3nD0^OLOOl*_l^_+BakT
zY3*woxJ#IddPx5O!Sx-@C|p~arg;@4$uhHJ1ojmymjU4k9jlXWhj_;3Aorr|3hx>{
z%!sy<2aW-}gTWoKOS(md7%riWBUENjlpVS1r`DdgS2nrRg~TxhPcl<51-@aB3lC3D
z)g9v_KpuUfCS0!GyZx$ws?$d-3>`<DtZ+aZKs*7C)T(8YWo1yZGX*RLK?8wMOEQ)l
z<KMN&F$UxhUwV8qTFT25%*nBfd5UmX--<4Y+;@<fctW`VkW)PyJ-@=Do^dq9&Sc&{
z<Kj#O7#%PNVN;1O4xAP^;&o>(rFe7os@`Koapp%dpDlPv7a)4(nK~228>Djxrom+!
zNd$w>U!_ed$21M)A(mTp`R8A{bJGh{EpO+NF!Id3O5_eU=eNB-?NLrexn^bBcI<t)
z2dM|S^`hvjm#&LPGTU9cy1*6G0gRFdPvud><_J&9s_g7vjGs_Fs=C}Gs=O0MMi1`?
z&C`l`y&)rr#ekcMl&It!aY=>sExXNaZnE4*gq2AQa8(HYRC%$<FYjasc7q(5#_w!Z
z2f0LimfX^OrZe{`W1XUrM1X*Y<`OSIg+prNG!o*@SVB!WjSJ)w-!^?IiE!yFy0apW
zk|Qbki+@3isJGIvFd30dr)l{C1a-wVkIEI?GmZ}8cOUbPDRU$iEUoawmdzq6#Q6*t
z3zB&m?rJ$D%E(a~Jdc%2<hjpmbQN3{XIVmy6pyo&$s_%*U#&JLoWvz)HsV5v$T;J_
zwNE%$v2k(=I;Fg<%zzbE86<Wz*>0Jo!#It0hLR=jeR110Rhl@1N1QZch=KXJInHUq
zOLPjcx|^06npscE7q$gUn;B!zolwnj49e)gJYl*gY>xEhytuZRF0JlLykL}88CK6+
zj+Iv0_84yr%oc2@4y-tn{{XBh0b~*xuG4BJQa1bY5_t>srOpNGSA^{ia>X}p5tH(q
z@@dk}!f6UjOGX13*!;il0qxqUugPtQ(5NKtL|?e4sUGynW{^kb#}4SwACRyo9)_jQ
zL8oIu?pipf5#AyO0EtLE9{&JJTbZFtk}VucrUg;8jvJ0xXTEDWrMHF526W3H3khyl
zKD4WIbF|4UY9Tqp06uSV=qYm#n7og2u{3u!Mj!|elk)-FK9vm97czaGBAbW}14wcB
z`uduMAABl62h8rx!5>;=&h5Tys6kf3gkO~LP~^vQ`noOXlIHA5Bw&24kgJjW`%~t)
zNNxVhKkk`w#ODpk<LD}(xS6B!HakST%Ed>>Iu3f1?MNqf4ADm6okB?NLlUE=Jt=dv
zG|N)mGe`_FZt~A8!}xL66<wxD$B@Wm>QPkSv8D+h&M=Tv;1_uhP<<)N7AVM$-g#O#
zE#^i*3!hJVIhYbF#_;V?xmzh94}!m6T6<mJ%niM*oPJ8jhq&4fK=mE!DE2`(ifd3@
zpkWbwd*!`2r_Fw{M&4wqk%k*tR|n{Rp0slee62ZP@Wh4D^8%^B<Z@}!tguerMci#5
zQP`cFdV16%;?jG#<1qzD2I-%F%jxp>+<huwBxzNn3mS(Uw_H-@WhNp#HrCH;1V9-G
zk&FG{Pw_AKRi-Yo$py<QJa{7?#hR%C+sAW>W)UN{9LdQX_NPQbH<Cyphu_X|&w4qA
zI@&9l?!R{uhU(1UbSOP2j_59&F6NO0R}x5#v>)86o;M$QSWq_B+Q`fq0)z6FC+~ed
zskZiy01#bI6oY;x^3#l-*fhD7gkH6h12MJ{;?h_G#UqYE?laz~Ub($7$vNK0OnHyx
zBODC+^r@~QlH+#wc@Y~6BxHc5nr*^i7BWyMELE|S{xsBt(QCpNcRm@`lT*`UX(fqw
zHJ6!$xIe-e<AI)k3i_A9ng*NV2!FO<fUUgnDDvUtEQEZ(es%J;m#5xY%L61NMI5am
z-S^p#MJ@f&&rYVks{M>SL1lMgci_wG(*@F>wApV>%G;afP)W!+?dj8}1Ag+p#x*XZ
zp~rk;_!F(^N&UBNZ1KR{{O4;R{`M=y?z}&%X>D<7B4!Dg=676WyYbf*`pe<}0E2p0
zjJz@S9a_RGmz6M=Oq+-p!2-M^_JRF@bt_Rep`~fwX#;dKDtw@N5$j3L9PTNYQ?DiQ
zBjA|sEZ}f%qL<2#2`tf^U{$ywj@HeZbq?-wv$GOPcILe&$A7b@h%~KDw0qk|1_9>C
zj4)sQlZxVQyeF<hbS`d(lM)@iOUIFs!5-8}HM!SLq$IRvT+g&KBy7?TxC>xo)}pzU
zVU2C!o6CV;%q&MCvCltRu{MvZTinGzlA<#w?-9mM+#F({p2JdDe8iF&mLkE?VdR6^
ziS+GC=9`V0>eAvgnoD<yw;z<S0P)uY^`@CaDV&@uaFPR&k=0EW#!Jg7uV;<%3WWfs
zH*=5Dral|D3nkG<jJMz9;l0#!6t0J23u)fsFd%RMaso1AjP<LAE2~)6@+e9pz5*1<
z3_6kNLRhmYjH3B+01E+wk8gUn1-$1EBrmWHvBsyr_nS1E8bv{Fkx0yKK_vXly;t6y
z8c!reXOcAnO!@Lh`f*lP-Z@x8j=S<pAp7g@ib-GsXi`YnF=7!vujxhGDOiQzww@P)
z?o}$e0wry#!1rU0l<{eC8mz3U%FI&>$c*Fq_NV!x2;+IJ8c=2^@Qe<98|&Jl6Q#r=
zcws3Jm54%lQaB*eyA20zxE4{99C0jc`@jR1^(LcD8T7Y!$TBR59x0ohta&vokUB(3
zKtpAY2T*%rqMA#RmiHcb46<!7k&su`i!iznz>3K7pEcEhM^21A$G5+wGHZFyn9mS>
zon#{m810%3?63lK*%Da;5L74J_diN-+vcpG<%s~6=_7aJwH9J>L}EB%{{ToaJF<XX
z1K<(rJ*snUZ7%4bF}T<n!Z)vDQO~GFX7b!!Zptp%6t4r=3VO)*(X4A1Amt<pv;*jI
zO+~VK;xXfnP|_6LCU8oe1yRsr)|hP8>e$S-O&TdGM(h?j!RgwNL#xWdXR}pAkZ-vh
zanopC=ia7!EkH>B0P!xB<3|{Lfu83I4^H2OTxm)~xx}c^v175&hz>|kya)KyWWgP~
z$8TyE%{#Eqxs%)<df2w`t=f;Z-l--@I6!gFVZ|$W7WJ6Rat*mw{o0Ycf7ZHVfy7B@
zj9wy?cV|5;Lg88Ah4=l~+4v*e(_xEr#>T=F-I9EuGOpdp^cB`i@ae9hhFJ{DDPpro
zi}JGLkESa^9{@!fplq_R2+~HMchJ{eET0=vR#7pQI)qj3dEmFzWmLMJ(M!ZwO9J2)
z^!5ODrhmdGEyO4+SfOb!W4I-mbJo3L4~Nkuz)iUz0lim-6|toF0ibxU9@%`<kd$J$
z$n>vY4Z`@@&2uXwineJ*N8Qz)GjHHYgl{C4_aFxH(G_wTy>Zx9koYq!*2dfwGF&L$
zP>sv&lhVD~%fUy>7jtYv%zjOoKZRPf@Kvm$Ib95D?tXVnSJmNoGYu7a&AXm8Z0e)g
zSn*9K;ZsH;cx^zGFpPjsa66yzu8&LjTW*rHiDkAyC(OaPQ~fhusb}D*9$;ST0{;NQ
zz~HVuM|!)b_*yl6(X3%vw>cy4k=$3eM<T)Dm6TgN>Y0T~k8_06d<hMjfckRG%Z7~y
zuf1*B_%%!}^GCIqXJ*_6=e8@UZ4%N8lXrJ^kbduQftw|;f0bwIn%0MDZz7w{SR4R)
zdyh)&jH606ib*4x$;sTwy;jrn8mdM@fKY#5O3BvzL1U)d30~qS5B{}JRX)|9;*W?c
z6b)-_a}bQ4WN<R;-xcKkEcmBk4b1v-8QI7t850C^UT!}>qlS+x9p7`Rh6bf+Ue-Fl
z7kJc2$#EMJh)&rR`RVCgFNn2!nS(OU3Q5inBCxJ?skKxF^5gD<wQ@%6`r@e_LI{~4
zmSY-jAZ4-x8u*M}VDU0;O!nyEeUi|zeRz@<c0gm7hQndE4&K75-D(obg&si4qvclY
zYK6t*p+ax-7_r>yoRgjgDvYgjC}TRFGH}a=9>%=6R#(vMRMIV8YhG-~j|oB#-z)ia
zs_k;&{{Vfp$Uk@ZO;$k8#JiG5-2~H!EHRD`0gnSdm5tjiB!?FxB|rq8H*^&)kE7k|
zdV<*7F+nTgrYD8<s`Dy{gm@=&V*|Ep*#7`!kAm8_#4i<E>T*CtO2JY+qXm2C*EO~p
zi?3Bg9o~rgEA|Neovig2ves^N(8#i7JfW0gKZyN$*Xh^8KLp$8nrbbeLldH~Z$sY$
zwRu<Uv+$_+Ye#~{>%;2=ilLGvL5CRSfv=#g?Jc0iy|e)osQF2+p_eTfC`BFkNIqM%
zSJhGOA(HK)QlM>bTzc0d;&^TCt@eq~%EOS{lD?JO+=$iBp8+L?(h1;KCF2-`X)7!d
z7(mF+Qr?2A4%f6g<c|mVj0;O}rQ~V$otysvhP<Zw?mHHd<?{<K%H)riKBB!p;@+=4
zyS3m9q_I*67*Sp);|+IGk4Tn9X#A4I$W&n0)xx5shUa|@61<x3a32@`BQ2B{Qh#eU
zRBVgo#s{Wr<WC%GcRnWZ4Dxx-e6#YR^W~3L&wBQcjki}Coa<|Ca~Nq@w#5XEnB=#h
z_pdjH!p&r}gk)uy2byiUEspE$?O&N^S+wyOmZh>fey@1h9CR8y&GJa-v92=gFabZ;
z+OFGpW=3PYM&VaIFl(^WyfqPwH;_um+!h~qzaajGwk&)-Y<^^oi>E$XuPiIWmSavR
zBZ6%6&-g_=yJLk7^KNDwU><_7HSGpiH*SOt!z$y9dl6pJ-W`Rd%<(8gf+NVwW3jG(
z#hxFxo-l4LLdNfhm|y@sG1{h{VG4~a3a$ypH#}zk&{?pN(UT*nKP!8Rtm~G`Fywcx
zuf)16*_Y3^AtM|i>Z{On>s-ymW;sd{2p|AYdhU#rmC@wXgM%xORkCBrBaHVI8)W?6
zoj?^U3}@!a9COLVM#?_!anI*eW;30<wkbyJ_53I#3~e1vAtxO42a`aHdS0n{rrbp>
zw1hlwxE47Ay#q_}HJ^yBn@H5ei5mdKMA&%G_te*#U@_$6)w^9v;sjCW6!N)JI=8h;
zjmlCz68i4mbvIVC$WkH|`6aM88@*3XYgfS@Db#JJmfL6D`K5ed?e(uavGD<&!aRio
z0IqlZ$3N1#eL5)bu2mtBv}pio0DLoJ`c_pas*$vfDb<xZb4PR9yfNadJ8kWAbelE@
z5$@top{<BKK$@Mp$qR`coU3haeXGZG{{R$2V{>n9Y^nBK63sLG;PfC4{{ZLGx|<&u
zTU|yW0yxwSsT^biMsi6#&3x`FE^(F8J^VI4GgfZLbC}vA7*iJvtkSVL^`;|8*D;$5
za$9cIk9K!pbrq2hh%PQ8cak=hl`#U~0uQ<G#aoMY#Kz7?0PPJDuM7$6&3W#ZF6VNo
z%!>w8d?Lo>1Ag{J94>vk^Hr`VkR8l^e!J9RTikk4CB%?MrCmw_LMR-m?n(Z&nX2Bw
z3bZRR2l#;g6YWkhyA-ElTfIWvQ!$W2wrASdEAA?>z4=-=+~JQ_@ARs7QyIZWkT&6l
z-Nr|?Kn&=@D_9+f8&`KbfBN;eDn>3>G#^ln9Ql#6LYUq=pQT50aXfQ0%u%wLC3<7i
z9<^TD-dLg|&H0vW+{WCUzTe?f2+JMtZ6VG!<L>_eg*zd0F~)a|mVK(MFhq{OchfXS
zcMyp#ZEwR!?9V9j@V`JiQrr1&JH(eG&O!1=o*4W3)RIJH8*U>RBP>_t0Q&LLiy*j?
zT!vvFE47>D3VLzPI^XRR;!U1fAG)P*LG}D<8(5OeiEg+fJf7n<ZXYiS?Kp2UI}Xw}
zd((CfrKs(Rjf82n!fp)bIrhh;4j4wR@&O?wKm&p9DPu8-6;j$zKn!Is$I}!?G*UYs
zC7%N<N#On!4KdwVbS~p+`O5JFhT5MnKA_X&iQ{C7<;R!--Nrb_6$Dp6O0drAT%4&@
zz{Od4yyhlQa5*Kq(i&tk?UExL&yW<2rMTy%EQ+CgmI2fbN}iljJkA-O4WudzBMyDf
z(xYI8S1?K>QyB9V0r^ckHWx^+%RQx=OC+cSi??eG;Cdf=UpY23Q$hrv#^nD14mbv~
zuB33jWJ79&$=q^Dr+;WNTbU%wmTk<)ys^gv*i-gzaVm*3VZ7j}EY{n1o(nGuJ#kRI
z#k|1Gn^lVy^J3va9gn3^ZA$V`XLs7HqkA~X3*P`9wVkQoT*r2aY2^!Y1{Wl>r@nm$
z^`{za9aYfTlTnAuP|m;tRG#hW_zGj{F^I`$#Eq2*TNxgrvJz?MlPfZhL}SqVQa75a
z&mjaJ0<!Ww{i{!96EAHeKx!qfoLi|#p^Oq3<g;`&4EltY`x#{N_8swuUB#ICRTpU_
z{nYX<z;X&47xwy6LwgGqHwfEN$?{3${yvp{&Lp~$XtOQQ1*Mpsu5uAL0RI3=fv$1$
zs_i6lztW+%y^8AWq*jg&HxTXesPy{M+$?D;h~bc^9N^>+rBYTU-LQGX1zqJ3kCn;i
zG^sSXj7~u0?jyhd0A8Xn#_EZ1!c|AySq=&xPjgZgl2A(RAas7Bfh&%Tvnld{#!eKR
zh9BcrV7hq%%_}J94(d3-;;2Bg8I~ptu>yRz921{<czzAMQLsRANjLzL$okT~hD|A#
zXPE>{$jrlWY~%B*7O_h-B1<_6C@0NnhCvwYJAG=5aW2Bq9fgS#JFz2gY!6z~iqS1?
z1Q#tJl;Av}zF8N7Fgnv$>I0%It_*U<$mxbS&mP|N=$J(qlgb;F&yt|v40b-Ioeh#C
zVVc@O8#ybJ+;zoDmT@N5E_d!H%Vy!SI*&>nhOR(RGV<k_zGfKV54BReLnsXbhEU%-
zDE94JPZ3rTsZp^(E(cNQYM<C-m>9$)$c$JjjBP@AY<H<mSglO&vq~9+;X+^lqlN_g
z`g>BuzFq@d2?TAuq5~&Ck3m<BviXKEMpX3!xufj<Q|3G<RmlWo`~6K9L1GB)Zg3<!
zOA<r2&*AjPwLR=ln!a3Nk=O+Q@(-;~1W|<yu{Ig-v4fK5(>;w^iWY)RqR_JK`3DDU
zp84%rN^NXfiYdWqA(}!|4lt|OW2ySo@mm{mmmAzGpOuhsq*TRjBZykbV~H3Mk&Xf9
zpIVCIGb1QlrYM*y$-<N0@XbdvY^x-Qp@AYVDsIcS&Clyr;z%M^P=JO*^1nO1ap_f_
zNY`x7DNuy*o@Dj{tXW&fcF85NA)QVZX7BzKr0jw#QSihFFCb!saL0|K-lYBC&ZPsD
zKoG=!P)|(M@Ix7u1=_Jy#^4SEdj1)vE0UqS^g`sTD-4pL^!Kc}@1e3*6~u55(!zNg
zT&eB-DWtL_kXt@hL5V?3=jrJ~wDGWsV%!KDbBr)FlBCfiNe?*Xv+Gd%j^a!Zf{f&X
z4&mGnYL%cC?3a?q<usrqSvk%JTz09Ww({L$HxU9*Fhada>N86XqkN>>x0#%BGBN9l
zha`(pWGD=zt<0sqT*z09EjnprW)0=<W&nQev4tHCS%%a)$s)@W#=q+${x;{Q)7p=-
z?uCWBqemAY0g^NCQO#yrgJ`DFNDzm&V#?XhdirD1r9mn`l^w$@ugq-gxk>b?-pc6S
z#^n(emjD&#IPL09NfZnaWk<;5v`6m)>z>rq)rHE&tWzXKgN0t1EAwaT+N>Bs+Y}Li
z7n8W>npogy9b{=zKH?@BE%m2vf!QL8RFH<t;Qir_p4ARTsH8+~<6z4m5;y$w>}k!p
zpa~qP9kL0>D@o;`n9U8VMA94pUq6jIY+;fmBhGyJi`(1jLa<)NNuhyRSSU~*C>Zbv
z>QC0QuL}p+JF7W4AqEHGTNg_s58fy$qi)=M!m_SQ1m1}uNS`6s9Fg_yT0xo3SzN}w
zjv}n@DRAd$48-iLy;bBx_IRLev6W>mKV0>#OWlbCvIfeQJC|-cn!?nasQE($JeG5v
zr`T7khiKra>|$#BE@e7&%<FGA%J(6*i1Xi$wS(d*?XBfD(IYy>fdi*Q$A4Vbrm1;}
zS@$fyLEKeWhW4&|SGh2jf>Zowa)HpEO?tGI+2_`hv5lz1a0&@jZ|7`iIUdHSAPhX2
zW8BA$pkryP7c*~tszDpdo#%!XSVHQ|#2hybiu7W%Jn2168%uKVn4TTLbCnn(wd@jD
z%1FBkGk)?SoT$eD`X74B)1zpZ1!e@}1mxh>)tnbs4)S@CnM#2qg*Z{z;<@WKjj5}e
z+GVqp8<|TIaJzX5d;8Z#rr6r62(HA6HUSWgut%vrwUwtVB2<r|l>){a)DBL4E2+`+
zp_4Sy;T1qAz~>{l^cCdQscl*5QGzFfO#&&VB}qa1mR7-Po@;w_x0Jag$N>3x3VjV<
zip61!t4OkMKO-+u>6(IV@+_$s2g*`qk8jL>3gcB&q;<I27}|t#`7%5)FPop8lzsIb
z2eotB`GOgQj9p9NVnBLea!B+Q)lCTy`LFYC?a+M<W!>6M97k&IN05;zQIdOs=qs+2
zl4m_c*~Q%(cxE>1YEfT1OuUzF>?;oX1PoFsi;bVXld&F{^{&$P&Nch4;Z^=;4U#k4
z+OV$l`C2nAkPeZ*EX&3-*1Z}twy5)~MVy1c(y>GU?dK<q4Eoh=r+IZ{U^&9}t=&cl
z^yHrQNTYU<erTg_n5KO@Q?#!N-gt)TE%e(GBXu5Zi~K5j99N*KXmB{A3f|f75uG6g
zG4heu@T)dDEyl01-%JYFeX;?;89mR|y<bNCo2RkTUthjySyX=RAaG<K-p}-}WB6bD
zI;E$BzqV%4S#Bnkyt{CqE2;h?{Y6CU#wzWZw`XI)d>`;3zRP#3_?8E2NE7#ASdET*
zG4K6r+`K99A}GEbL3wMX1vgK*Sra2@>&<&siSRk1@Zv*tYXde3Ws!bI0DaT+^{c)h
zn@sTbkRZ2s;*Qb|Qy4_`A6ny<E1B5|CfVWMAoyaoULFPRg}SV~xg7ln`d2gJ5v5vO
zCY-j66b$*h_>%*n^si9yrln=#3u$g1<zEm5iyRN3{{R~C-xv6kN7FnzE}^J%GD^!D
ztADIHzyx-!={G1hEdi%=a(*tHyq<pcQy<Pr`^7-%^!BeT@eTYl%I$8T24l60bgSMo
z@vZKp<_RWn^5C;)?%?$pu4Sezkmn~E-HPg_nniR8<r}!j1anLQM^W_VjmLK2IVY#B
z01?6O>sNb$A~4Pv<Q@+_Drmw!!R8b5e(-JW=};(afsbl>IT!%o=OCWdabh<-A#rGR
zrhA}vDt_WMY&P!MHT6gQ6Vu1>XrC4=t&PxGC6UDGDZ@NRAg3KpabF~9Hy>oyEw14E
z!2bXl;oF{ru&++|AL1=q%g0(}o|}4rNq($kRK$@Ier|t@w;q{2t1NUOR|zF0duj?&
zjI=*g{C{m0wc$It63}dfWIlfI^y0ra{{U<)0^sW3YLDkZBl(D<8&9o%k6OWbFT=}Q
zDI`*6vc%57?Q%z4`kuJ2hW`L<4++VqOwd_QHf+d{rgxHgTpokpt$5jYG;3R-ob{3M
ztKrFA`<Y3}BN?O$+yY92-xV$JWxbWy0v19(K~asQeeCno(!Hr}Y_=E(QJvd;4Jcx*
zp7^1L@&-ZYfG8trE1#xnMl^*eK_mf6LuYXS@x?AiHmL!<=?D$fAFgNtK5x7SPNJ6s
z7ze*<OcBp);Bop=rd)+yIp;J05?JJbc;~ig#!t*nal!PU5EL0bcsZpw0EEfUT>k({
z0B$y%l{6j4?*p7t?FXK~^UpNU6_}F59)Qp!C?pbFo<BNKo-vFbv|#4|9tZ0~3^wh<
zfzqAFVFAd_FjVxUBO`{#JkgDygVdfyDdgkOPyl!zUdD_t#D^RnfKaM&&p!T?gayeb
ztso3%oup^2FHw`zrYP^XsrH~LZlIr90AHH~mLKejL%{<hIi)>_>~sGB)}&&?IsRQJ
z0S@&9spvYj0021W9MXaOKa~XI<|7#EKx_aG{EuozQ@aI+;Yvdhu#Pj4k9q;Y!N)(v
z+Kt7~PPxzJN(LQrG0#!jg;HN@`u<{<7|A&Vbj4Ca>LzeE4#eV=j&MQA?MQG=4}POP
zX?Z6sJ9PA<kyjA#IqrC+&eA~R*EHS$$Oo?+)36(aUN8ar_ouLg#~Xk+`qA4t2iFu}
zo;l~G1Ck4I+ob>uNEmQ%2NVSv!{i>snlLg|dwSBG2HCssdWu1?7TmjXNCJQeJ%R6<
z2^+rf>&*il!T0r|;b9JQp55_BKBAXs3(3It?MQGA>}R($g4&832ZjfXkwEhM0tg*5
z-jkD+z#wz)N?-2egOARD1_)DvcXz>{jARmWM<#%C@`5wid(!SC?P2qJW2FEg$r}hb
z1A+%MHtuuObSJeb+H$+FNZ?U{fLXyA<WK>E$B+-MDKG-yt}t?as3Rcfr(inLoMd+6
zsh}0a!5jtW`BGqGuQa8?46r#o3>r;}xW);fXi!uSz5vfObGv>92XpI3B%QzxI|@;T
z%N87e2=72x0Z>D@I8(~!1kz-1cXT}sE*#@x<dMY#3&C7*(YfY;6oA7d=N(jWflcE$
zE!6Q!3H!TFK>X+!Y$ziHVt^BO01SMDnqD#q8NuXcfDS<z88`&@q&$qOlg<yd0tLZ1
zG7g>l(x?scsmVQZXe4LLMc|HKxubUV1+j(n7@%XgCphitNz*?t_a5}1<PzL%86z}=
zvo778GyeeVpj|}ijErFP%_zo5103MzwKt&|>DbbYkTcx!XaFig=NuD*Kv9#kIrpX8
zo<Ki|rP(1ykl+OVGB_u-0b!&Kqz;TYW7dY~bI=Y*6mgHoudNv8mK^%fFg{pP%1`^b
z=qSNID9=2PN>yb|%oH8VhaQw|<7sdK9A<#91CSUVdm0I1cQXP100E)N01}{oS|bcx
zAOMye4_W|B9A_VnDHvd6uLq&+ns8FbJ5GHm8w#z)Pq%6W05CaIpHq&M4i};S02)xN
z;kJx)7*Wk4sE>0oB#s3;h*9%!2q2!mlw=W*a5MLhPr{IV#43>7{{RnBPUH=(A03IO
zs0gGGRaBC^<FzZu(nw@1pugV0#z&<gCwF2Lbfjg<>|Ac{PfSw)DZ#)Xcgg8XA{9`<
zcqC+Y&M4dtT245?rP#%@yPr%`5IQo*VwG4o1&>S$HZZ|wP&3CJMLZKD2&9mF+$*u+
zPrW2;kufRBBOYMrPqhOYM&Y@*QhMhUe8VHm3_$JcOY&pxlG*AH1W~jG3xEkd7*HV&
z-J@<n?n&a8B)&p}o{A|6C+;INlZ<-MRYL^bfI8=`01=YEyjN5H%`|+&BegE&W95KD
zgUbWdQfDA^Qa<Sa02%;X<#!eNLCFG_C6mnrZU-0xj8LQ&1zdB+DLCDc#s@ysuV55m
zm?=`(>xxht8;2ay2mRhqU~b@g{xrBu{J0o7B%IP<G?mENk&c=5qq)lRIRtm7V76H8
z;AWag027iwh-3AosKBvS3;@pF-^kEI9)piz(9(b~2yO}FXPQ+C4);dE`?zlO0N<Pe
zBA=J1y(r=}M;~>G$o{nCQdqNK6Vp8#{{XE(0f;#qo?9GHibG2r<dVmphL94uA+lIt
zpXo>5jJY1T1HLI(VX(uh=Wq9E-3g6RxeGbrMmqIA^t+{SyTAYp50{!6G7iTWJ9=lR
zrwGdA=V=L*E#KHx0E?11JOQ2ArE-Ms0E~`+{-Tv*c3tYY9S%o&WShq)AP$^&pa3aR
zxE=w|9jVB6e2mK3URxZkG%f*FBn)yX;1E~LBacoqK!n;dV|4(5mpS|Y07?n@QQA?H
zoxq>F=|&&@T7t?OB!SaD^r2l)I|ak!0K+@I{ip!QE);;r7%V9m?uZ25STV^btt#N4
zB_AM=NIYY;3?FHTq4)KmEGr{q#>jF<emM2|QVo~~kU=~t>qrVSaM>f?f&(IzPzFw0
zJ!&0>85k^B=lGAe`Rz{KhT2afp-wYN^Spab2+09)&*x2;k$^@@wipq}q#@x#@f>ax
zj#!-1Bu|3z{L7qi{3p_rA|)Z4b~!u%@jwp0)QmukL`Vo5cG1-FK*p=QWR&?y80V!0
zTHaISlnkI{l;jghx*>uKZq7;{N>)ICtAM4BfBN(W!_V(9<dg%6QF@PXedv&@&5(Ae
z`>FVUIwO$n+Z2T`K74?3J*lT?0PQNjT$*TG04so{z}#>F>-f?zN8Sj_90VZa29?QN
zOD5gJyB;w{4t%n`PIpsG0Bnw5HaXSFQIax1^%Un8kW2fJ?H)c{w?mG!#U)z{80nVC
z&lISc8>Ef9?O-?~(wcV*3mB1Q=t+Dj-Ok^yy*k+yqIFpnWKee*4-J#Rpvbs#sz784
z?UBOgx4lHN6Z0?(tCF}KN4+svk>p**B`k}8Bn)}ay%5H#1Vz*-`|a!a(_>K+C}{G`
zbDZ@Zg+AB`zjFpRvDyI{<euHA0z?fet`(GqA*1RKZq)D!NZEo$W7Ugr2VshaUDnr3
zjlwAT#_Y3u13`vU8tg*BzGOmrAFTjAQrIamu*oNK?kDpU`K7zMltU>-!hoR{9CjRc
zsQk#~ZL0xL+&JIJ{Ax($jxvJdD6IH#v!MF+G_C|u#-o{M1S_4&Ny-!aUX?sD+}qiU
zbh?P`kg!u8NgjroAVdt}EQjkKayiC*Y8lS!<vX%U0#$k1aoUrx4~p92;Q5eSNTI`R
z^BX(8K=+{emgOCG2W}#cMC2aigZ^_(j!7})vu#2Ct0(3M``l8rj~F6AGI(Pm@(-`I
zAQDB65McW}hB+4-i{t0u<oi-UfU3Z)^9c^uBZ5s5LSz65K41yJ>^o=LrisnH>^q?I
z5CC6k05K!hpHK-RhDd|RvoSeYAAcDg2el#?<2yu5e4q&>`6t?+Vo8-P)QHCNOpJKv
ztukY5g__pma_+`T<7oGzs1i+T=&+>kBw^SwVc27*9coCTi&MBUE!UD$<~@FL1_0xr
z{&iW5lF9@j-FA(O)rs{U)Z}7rHan2P2g<91NCcMd=2>En=Y)2_SXT%9^ruLr{LwoI
z+h%YMH)F7-*`=s1TId9kP8E(`A`kQTrAc9Xl`+a>a~KIT9H?)6_Miu~!n9J#q^r#e
zk1|8T0rcu=cHBTjM(QLJD2-*1e4zEg^!m`DCAZ7o#vuphlrI_X1w%5Rc_Y2~A~-P;
zdY@lvLoMifd>V?#*ZRGsjhtnkK|3*d4|PQVl5_MF%d3d4u3}grWPdMrm{^eO&~Z>F
z@XhvMMsOb>uv}B(5JXIhSOq(WnA|D$^vyegJAcAG9)_$g=eWEV4$>mai1r*{bl}u1
z@voRxe<?NtBy#dx_8IIw>1SZf@J7)`nEb&WK5l=nwK67_br%sT{`45;5^@5JcK-l9
zD7X_ny|UbWo@g#2dC&=1AD0AV5&jhnlF4golRK=-3$h5@Wnw4#p1*}ivP%SM<;sed
z>_RJl6CZk2nrnCg8hA@JY)KQ3n6^K?-?cl1id-Nrx2RJ9<y4)S?e1yPdABHtz)2Ev
zB#m$s_svGKG-@46<mYzL_dmvzB=Wl2piqoKFPsee(zu4k#T#Ob@tFAU-!v<gRh4iE
zY;Ir*<I;skxnt!iFB#6!!6Jqj%!mtP2N>WVLJb#SJ+4wl-5^j{;aW8SW9dS&zR1%k
z%1$Idbp1!AA{kiuyOcOMP*<<`VwH-=8Cjp@4VI4>W<TLT0g_P@n3NX)oxpS+!jwrJ
ztci0oB$1L8;w#QE$u!c$-1&im<p$(D?)Il3dwBy~DytR$08+!3Q`r9iIxYeP5nHUq
zgt7?<!*Ufd!8I6)MY>ocUC+02g&EBs>rkl59lT(1k4g-<U)`=4avTrkNB{{SUouRi
zZsAyR2dyhUM3Kok+x_4<&!swHBd9x7hCb-(aq4|3AYkV*092ow)qmRm0P9n;0l=YX
z%&Y=##G82S`ch11^7dg}kQQ7oKxrOV3ARjp?SgiEtUF?t0i@e4#C)7G;PN|jKn;D9
zuvsMu=Jv+`3UgdDs7<9p@(IEGMJOlkNW*gsJ2y{Y1tfb=`TL_FV=P;P_)`HHk(<m#
zWd(qV4<Mg^T+@hnGSdblKfRGgI6b|oRoBj6B6W<jU_0^vJ;$a!deTC&E4tgan5sBd
zAL|L~YJhQ?28BUfG2vUTLFf%Ni{Yg(F%gj8H(b-=EAxEu$16v)2j`sh_N9^5P1h4Z
z!Q17L$-o%zifLR3p>{%c#6Zsg<L1w<X_85VAxSQ$8*$KoQ&PGq0a8N2I9V8S<NPUO
z7@Zh8Z7;KS+~9XKtz-jcg_yJwCQiWNx)G61^I3}dk}I(L#RddpAI^zMDY{8RIV38D
z!5>;<xhdq%V^J6-Kui_~*BxlE0}Zj4NbnqBvo||vRA2-#DUq?p!}kRYuB2p+Targr
z$4YF0Wo^hpj0GyE(vv_qFO*6(s~{_hLpD$O_MvVP-NT{s$lxjKk?T@RwIu-Dd8I~L
zLcZO9&!t4{e5TzZ7DdXo-nss?tUbpT+*GIw)PTK@dUuwO9{3+4Y23gZhV~t)u|^{b
z&73&{a5=}dJtdAt-6hCSGFWZof$55?2#Lg?0TcYV!sLD5T-3k_?*bXZ5~@q>`9R0>
zrr^8+eYp}A01?)slXxCkz`zWIj-s8I5@A`^6lY`o^V{70Dr=cmSj=eAqdKUPNYjtP
zpw9L3*|wlL`9~!5#(UG&Rpdz-44@IWALle!1z>@rD<A=684t)jclD%sBf6GIys(3g
z17HtuX_CriECeOW0nR`Ge^Wxp>Y<t-1bIA<yr=om$OEL9w%x^XoNra*0DiPGlwz!^
zyM|+7_eu5k2AL)<3IG-&qva>KKA==>`-t{RK?RB3>ra#k4B36Ie{^xZP~e(+M<lYi
zh-YH%<+=*2NzT+w`+9qda9=O?i?@%yq?&xF36?-tY5)`s+l?@su3h(a<xUU(0IHe1
z1lk{PIpB7sIatdHQCDyA4qBQ(J}{&gX%Cj4d3SUF0PFUpTr}H&Vo2qQ<LE^(S>r@f
z@tw``E;-M9(-kB|Agdjulg9vh)7S}_(UcNH4B?8NgWj7Yg^QLX1sUAKf;|N=OoaJt
zcK``P7{*EUpfDRt9&?fj?@Hhyb1Z8i1MeI!dTv+D`@u4KBzLK<BaSdySvJ3Q9P{{8
zQ=>vvT4a#pcLR(b)C~%SMhGB`@q^Z!8RO+#0y=IP{3*M{qi|iI@C#7ea7#8oTpSMc
z3d4e;fC6Kjo^nkwvV;|28Cy9Ar{PM6%lVOWk%r062ek)2Se0UR2RL~Ka($^b0>s-(
zeVp>^iCd^3{{SjhjL87lzbd)hnB{%*QGzkNgSW2b;2LlVi~@EQ`LomyN-ltOr96`o
zVR!_SnvIzlF>uP{;a5BwR$>a0eq;A?cmuX+xO{9FRY8-H%@-d)Y{?i!i{%Z<`cWiq
zkC7;Bjt`-w+NlzU`^?;Y-H&<!Jfwdy2a>DOi>m-CtYj;lz@C8M=7czHs(A-IcBBXW
zo=>QtZe=)A$KJr{MbHY86yaNL;&~&Xr*3R)DmwMYQ%o$Xa87gRDFG@>ZhCVY0Y@?m
zTyPGmRS+rXcy4LvN;U`GW#s$P6C=0*Hw9mq(n%xj+*P*pz#I>HE|3UgCN%)DK*a1P
zp`~DfO8KFKjsWYP;+f`TV1jt#2LOMKBQqRf!6Tpx{OVkg$v|mbs9}Pm<sz7R9lt3D
z=E=$SrmT#lfIk2^p^n}Pk&&OMq~w|%g$$~@az=WA-k!~$lg&`Xe7GGxwHETHaOiqt
zwFSrra2X?wqJ<=dZ3k`ukaz@fNx1F%>fN^EwIdP+S+^2!!?>jB)qb?Dg2VHYPT&a~
zgWuRuk}`9QbAmrgU~F)4&p<~?0Xf`2JY$+Ug2amEF_lmh@-yC=B@A$I27C6X^UnwK
zp!YbX%*SEj{!^S`xGjoTnV1C_7#I~9I2?n|tpFXk;*Mq(6v?!P2chF4lW`pg=dB$m
z<lrCWQ*n+$+r}6S`qC4|a7HNy&F|?!0QDo%fC75sr5twreW>F<%8uCl=m0s|b4YT3
z`qa4Qj2{00od6xPKnFOW{Jfv#K_CvFPAC8)vHa-B2ZM}yQ{cCn=47`(0g<+@?^^CW
z2m3pGLh<#I>Kb*AlWfv$NhL$M{{Y$p9X-w~dRS`J-Jq@q1{<6TzoU3#U-1;{29KoA
zIb+7e;~n|0ss0Rq!97!3)O_C*Gs+QE#{e1LeMUO_kJ7%G@K5Y_;r{>*Ew!eXqr&Y2
zskl~MrZhd*j!(6EbaIK=N~7GUQ=LZbr>XGo!;jd%$37<0&Zn;0y|zvxw<DJ6&U<|;
z>3@UY@K4VVX=28E{Wd>5$Ryn&5?7DB3FKGTa{M*Y^cx5*g`%vA>*UL^NOi|U--_Ob
z%GXP=Yl$Z^x+(I2Ol11~E8W9kuy|#48~T>0M@M^}OYqP3P}4j&dFM-|*-EBzLtCg;
zMLqfJ&rx29Y4G#IdR_WjT-e$?n94LmZwIjzxd+?gw+$pA_l%)T1{HHp@RZjR9c`GF
zkO144C4F&KQxffEqVhG2BOQ#(`wcThvyVu!vX7TC7Xt(FqUXdH&{&1CK+`7ej>8+9
zu;Z|<lSuGYz2h7GQ&NmZ&QPKD=~pi;ygj8e#{O7KXne%FD}+`&V0xP2m1f<gseN=f
zEeAx`Vz?99eDcrth>YO5Jdh7c=`^ncrNpN5SXpAZGHq3pggo<s@9Rr-;@B@O?d7y}
zUoui4EAp0M++w-?SH)A_Yby=C{L6K01CZq4k<=0CRO3>tnni14x3<yzE2UgZs2c}_
zgu=vS+=|1$wrUMi#rEDzO=PyxD#`OG0|4XmuP^Zri}fv2QA=5;D6V%p#Mlq&F-dDX
z-7DMLyCX_Y`4}9JOncS;0B2NobsnWfB#y^X_@_KK6U!_~1ObF#DC_DCaa!kz?tDjk
zCA_yXi*STtT;P-ZLX%K8OKSza)H`8?m^;52Bz~s3>z^0+WZH>tE}GtC++>1LjmoDS
z0qb3KaCGVHhq1G$>Pl>5`$NkjsKj%I+*gjL)}ZkQvk9_YPwfkC*b5^C`@<N@f!?^i
zd&h5U9MkC<gl`J~@dCKmPi}hGA*=jVzt%#{e|DjuJA9>xC~tfYg1f2VpEZ&*a*90{
zQ#QIfD%)MH$05QznK?h+tQ-FTiSSs!%dP0qM(XD>M<4~4J;!SEPZIe3Cv$CN?H8T*
zvgh}_bqBR_8lR5QqJJ}2R@&ZNzH?=OAJV$Ms~E3+*umFH=z0f=ek0rK6a2RmLlAG0
zFx^Mj(zxwg$CoJ~f;)wkH|;w|&PSoIG4XfDPYw8LJ=fDb<hjg2@w*)W?~3zp6MoVY
z>Juo@w8lvg7HP|E1JjD+t(oPxJul59WaU;`Y>#W!JY@?^+H*0984E)p9IJoztDe`q
zd7x=(vub+4S;*L0IXGZDkzNNc#vdC=clM99M9jGgS}fom*sKjhR@F6IroGhXW_b^$
z20e#iTot&Y@U=MVW$dGUS?pTh#cO*Q{?Kn>kz|<eL~vLR+;*-<Sop;vG5*YES)-gd
zlRRV4{x!g~A)FYZU<Xi7CZ!fC35*rU!P-we_pcVdb&Rdn!%&LoYu@}x@ooLgm#KZR
zq{(og93O0sD;DDF`g6W(sSZw9Gn3DHm+a`g2*_f2!*{1GzSS)#3OWtlb6#~y_3JNw
zO_gL;jbwq0iZPMYj%mUoa130N!5s}s@iH-VPn-Mfeq2<kX)Cc<q9g>#ZMgc@DFIjo
zQNp%!f(<!U*-I1Brx2@y<)55zr?<E?rr1b9$Usg3Zk1f2ViZT<HvoHdrBon<9eVvf
zwK0jCAZLNdT3F$XVYcHZ=H7aN-xRH=?8u$cCEp+V%>2Of$EdEu;je(Mb?tr$FKton
zaIH9y5r8=u{A$O+--q_TJJp^|OXh_n0Zu;p<F~Ih?!WMiS$Jbli8Q!SBaAZ@8-X2(
z^sleTvMJ(iUVC&$n~TOOcZ7E<X?D7#1PHIt=<u;6B;kkqC-keah%fFDt?pCGh%xfn
zbCP=;R1j%$-w*8eF_yYJ8xN1fdsm=%E8%>4Z-Z}qL49CaD`aEmD`$Df2ERgz_G?`a
zDxEpjmEu44c<{1#<Hc_!!>o&Fc9@wz)?=J!+N^wTw)<y~9?wpRWLWH#XO7$wVQk<6
zd$)c%X0<<M84ic2%+Dvt(LD2X3_9`;f2Cz=+N`hQtBqRDA2w*7Lh!46ua-D(>su;v
zjaKh#Bh{r%EGqM7OR0Eg#NH|Jwv(ahjd0QF@dhy{&f<Ce>!R>i!7*`lZ>{PY;@Mle
z5j0=M2pAyt705-X_^RSK?sSW}%Pc2)M1R$`I%m1A^Wb%j*NUuUO;O|^TRC--Os@m)
z=ij{%(^JrmG*|J@!hZpHB-qQP>koG=)9qMdKPoR!N%iZWPAjnS_KB&FhnfwVT?dkB
zoS1;mmmUT=_x&r8&|+PCR=2fj&_!!2AS4o_o}RqdrFf%Bu+=qdJswNA)oiU-=SF2D
z5!4R#yjR2IZwhv9$mcY9rSNZtBxzw084!eJ9lGb-*QWdi_*LV7j~Z05_%m9EPPzL#
z%?;h`I7TCtQ;tHOPCz|9#bx+MPw+Lys~(fB>Z1JH#&^fiE_w`iCYRzj#%)`}`W4=d
z;H^?kBI?@PW!(0|Ybs#j0}h9e<?USfw>M9gj*{N*WNe`2B!txTFC9lNrQweiyf-&c
zTr^ERy#D|wC`cuG91t_e2iRB2pSG{XO<TctaQJ({I--AQUS=~CUpJNpGa)?`<2cP~
z_~-r#3#5E8@I~*0d=21Xf2~~PHN@8&RSEmdN#(QtHSzb1ynU|xK-cHiwRr$}8*`*`
z5>>O<_8-o_J>p&>gsJ^o4(|H3`W-9xSJzU--lcc;`SlyOH#bhe$t<j7ZNPQO=QsnC
z=qfn%1AvzClvMec@N!RYr+UJ>)e>#bX($rNge#%w-8rV->q&I6MKsdLu|&CYp%sn>
zKm(j-*1tS+zO2gUMlZzoinr{rsRPWq*^mJB$6Bui+B+*tJaOz|cCkM&&tL0Uk!ous
zzEj*4LxRdlITVoID3FVd(|^x7RNxl$Iqix$kX+V_Rf}QyJjn~N62NigE_f$BYAJOM
z$g#Aj(a5EC1q1#BPrYP+YC{0pCqQI7UnlPj{n9BeXJjm>rQ_TSIOik!RP&1H)Bezo
z<$S3(Folj)&j22P`qD+JI?I)uqaev3oVT`pt1w+MU7MwSrO*ZixH$IpsMg>$xVBbf
z7?6<Xo=;KhOP!3-xW0-gh`HDz`^vcFpMP3{TiM3fWiH?nIlw-E3a;fPk&D30LXDj8
z52&GJbs^NNl^GZuW7dvlz(}tHC|F4n42etk&q{h+x-#vNKvFUfB%fcUGDc$_8dWR_
z`9ff?_|OtoZIMUICVuZEcl;?S0W_0`GBbi(%iVz3{{ZV!NdEvVO*~|V2W+U_J)8V$
zCC4gUzsr>fIu7EZMRhB1XO2&w4HRJTJ7%9dC8B92cZFk(%xaEEWdkEMDVAoANsFS}
z#s*Zc%oue5_Nv3}2jsL>ARm~x&e2S3c~leUe5JFq9S?drftR7WU`nY088}^>gX$=0
z*+`A%Sk`Zm81&Eh)C)64<|LRg1Gvr!AEhC{e3&v(c;0h@dx|-MqFZw`O3+BM9f#)g
z7dcb!O4kSdUz!y4EZmh}Z+ePh7*#2L&Km+%k2uGtxv3N{oFalF<R}IF!;(*O4`EA~
zX^Jjnh7}DOh!-UobGttM%}YF%^TCz89(W&g=jFv!aTL-CA;|Oreo^gH!#VQSe>y&;
zS!7<Id-fEspve{7&LXx1dAvyMc><#(J0xoxvW7ltAp>ajKGgVu1f&V)G>SZsjm~q(
z$?QF8jC}NXBAIb8+Kh>up5yeS0@~b1EQ&;+OT2>YIswoTObT&}h1|i8=K}+8u%)|s
zrGWvq^5oyM=i~FINJ`FpxfI~2<$muSsayg{CHuv5#z_m?9Abo(BMUpaMv$G#^7GGd
zJ?W+QD3%!!Rb<L5jOE7%H3;7FlKV=7mjGY`{uHzVP$V(9n&8Hg641PyD>tF`#Y)P)
ze0O%m)Tkb0OUN8`_ox+%Z;`=dC|F~mBeh8TZDVO<%7##Or#K#>lLC0%rHz?3rsl$K
zkAv?>7B4jrFfwHAJFp4wPe|NDxdD!M8AzrX<c<IXy*_10_S#&kZcqtOIR>STE0C*3
zvI58D2Zhg5O!7btx>CgS1e~o}7O{vP1-DWd21ZuodiALt9J1Q2xmF_}I`f0;{VH6B
zki>=*vRz59uq8)DwdAyz##`8Xp13&aP_soWD{&LZ9FO%yNM#^(KGkANDB*0|7I|@r
zA9ey~paA#!Q{LWdg8Gg1(DM={h(`#)BzHZja}<#b@dXI*AdnSZ(-VQa9XY2w4))$|
z_g$=icB7I-SqdQCGps?Ceqk#7qwDTz-)2~|vhf+54TBu7e2SMMmW59$D5dhz$_G^w
zG@R$yeLX2O<-2M8y*gOfmMbF|^NxB}f<q#s+(yYLQUb<{^9Da!bQZR-?S|qv+Y_9s
zovrFYrOjd46)o+O2_D`ki1PqBk$(RGJdD+cv{=x~Cjk6~<Zd|U2BgKRTBI^Ohs=?H
zRXnfI(lnx06VC~f)*=;4f6Gr&K9xMpjEdsWu@K0+(SQyV;{zR!r6s+ss@urcY=KZ_
zL%SzEIH}_UX?uwTV4O!Io~hfPYFTbk!p(1Iv&s2E7{Oofd*+L~0M>{Fc+j*`6dqKM
z%8+{CdgIotMQSc?c3MM*3J7l9I_I}~W9nA6A`)N+=O*LMAnpgCUrKMB!d<FLmv5C1
z9C{P!Lb$dQ%8KSFFz@9orJ0oAbmhJ3`O>XrwKGRHSfSXCNEz&EgjZQW-zjj!n{@vG
zmSg>)@9R@0s`BP*CtHF>RxmzQB9D16x-99iSR{pB<($VD41vfYjdp$n@niTd{dE}S
zkz`2#S4PK{4^x`r<+A%*CaGsCEb#!Q4DjUkt#V|xxbj(4k%eU~ka*8NmD5TwoH=A?
zJ$64zzhW=i*TddD(ycrltY1JcEtEwRk`SM1$v=kd4u3of`ld;IJK~)i`#Sip8HkBl
zKnh1(n*2@h4~@0|008U4_S02(jlAnUw5X@$=t}3mJ^uj0zMt?<{1g+#S`-l6Y8Q!f
zZ*+D|4AOF^`^tM9j)#v<Yt5~MuS%okS4_r9a_D_m@lW6{hIRFtEl)^=WN9%K;$U&u
zA6ohI#UHYUnR#<FTP#tSBqg_wH)pV|y$|;3(0pG%*yKXW+$ok^HsQw}!`HoZmOmIg
zKjInw$8~A)fw|?1QG@MXo(7d^FMc;T=Oq`TvGebXKV=~D+_XAKRS}Gs{_kGL*0>!{
z_I{H~5?i=q7zLO}nK=IM9c%16?+|IXY|*SJ;0&FzU?J_Fdggpp28pN--9aCepfSlA
zQU^T!Yt^TMr8#p>FH;#}swHI4j&)Ci_mQM&1O{0A!?l0Lt2e`~SI?U2D9XbGYLRar
zFq63>u&=0fPY7ueL@uLL^CfSPuRwmCjZwJp4x4bXT8k`@{{S<A_q{=`>UkwOYjG^f
zaaL!`w|@`5#)9q(b2Oao8&1+sQ;ID-5q>9YPq9eMv4>|Ih6lJk@!WM4^tt$5VIvsr
zt&5b)sXug%oC;_BD*FL!%^DPcyl_Sqx+9R$WW3r)`Jyia>LypZ7LFa)3RH6bpM^#L
z00=g%XE9f>DvKB_8L~mIrx)RDH&;LlRE*>+w(c>GoOd;veikUXbXz85Rv|}Hzh7F~
zpAJG=Bxfw%UC*1YJ|12ogA8&F>3~aQdgPB<ZKuQSPT7{)8+T}=a$*QM-QPK{rGMdD
zBooIM*~aE@0<Td^fAG=|vxyMK+h#ctkC_ku0A9EM099c1vm^UzYfGOw$KXv$Og^J;
zEKkamPJnxk)f;>*nPiqrcV^5WL>Tg|^{=8O_;cjMe$i~?1tjblBzk=+OD~32w~}Rc
zgXQ&Q!1~sZ;ds7;OF5EzpFPX)=5-KSn`|6zkrZGaIR>SV;e>2jMX(!66=jifp-)kY
z`V9C3NQ8Zzrar`uS-mq-N$~JSfo>H7u)vIr5`BJ^-%o{Ub%~SCqt-{yR^JRJw%Zhm
zB)B>Ac4Vsd<n_f|viMC3n~7BJGAJ>Oa2wPL_YvS}BF~c!<PDiI(0f&wyaZLFk=Gbv
zRkMIibi;-4@p{0{dDL8Vk>cy{(4r5uh{=%x^uaYeJ^<S6t!PP%U<_cNOxLl0!WV2=
z<DHdDupV-syY#7|@H7^aW_x*E8ylGQW%jP>d^tiXdx;#A&LIBNJf_FMO>YQ_SQU34
zxw9otbM04?z_!p#w^p`g8#vtGHcmY|SEZ+f)J8X2n4Hd2Y@<7qwteYFlLT`J=4iM$
zQY*TiO-i1Q#}u<EPh@$rcs?jw$quRk-6$#C_WISxyd-BChR<jN_n@u;73lU_Hjxa;
zHS0z|Y%wS0$E7n-{=(BG^DZt`qv|791Y^>>Dc~tncWmaKHmhFhIJ<8I%pwUrnh4*3
zK>laewIlHTql8qn^Hmoc2<JU2)$fTkJ4f<00#pSuLc6dE)p`CR_-Y85Y-dfq*q#?Y
zwbKkn0)lDHT<4szwVzuTAn?7!Cw%rLcHrRu00-k!Hk7(>XA(emo&H-eZ2H%q_^acz
z8cefT-D+^EPQ_Pj{{S`s?dx8Bum05<Og7>hc~Pz-h=U?N;LHvy#l-PWU5A^B)uXbG
zRgA40v)ym?4-Z<#*VgutdCi~RNH{p`qPcxn;tiCVWyJP3aV*yFyJW*|J!|JJXZDft
zCZJSl@f48(VD|)U&$5c+bsvfzGStMAU1|rEK4?S%ai31V{;KdX9Aw+II3BeOic48D
z+dNb8j?+$_N4=foX*e$#+(v$#E6%n50NMuXCzUO<wsr&eEbIz7uR5Dl)NVIS)0r8Q
znIk>El@nUsg$*66NT>M07*k(4S2)MjZ<=~`J&JjL8k*5+Xlvd#@dmZ#Lw6`hq(8e5
zj1<WGzT&dsVizIz6U2n`(0-Kk(=J5G<-%WT<fyB5+AO|U@(_{KDCCph>t1xKUsle@
zLzhH~#_!KXOJb!D5|TOkgHB6UC~>r8=WkLE_|}b{lsB#;8_D^)VCVT&pX~3M5-72~
zh*B4lYc6Qs#;OeGt}P}KrX*#<b<acUY6iEFoQ7fu`J`s&3tb!Ov3W<%J7WX)(qobJ
ztc#I0?;;|lNg!o;BDA)IG>pR=0DPnK07wI^FsKm;6$u5tU{6C<rUA1o(H+>^l{n;7
zFk4A`I>81@X8}Oq^Zcl_%*`JPczagyCa)fyrC3QjyDG@b7Ue`d79+krI@jrE>=*ku
zzlOA1Z?;B~7>4NNWE<b|9OAxt{fa+lOYLV_x725ZG?Q(02)&12&c9Q>34AcpG+iRx
zTWOv~*!Re!;N%Xg?UBg(*SCej`#OB@b81vvrFM1x5YxZ0G$@4X;$>U{M?~x^qq2%t
zQ0%JA=O6*d_o}eP=gtUEml*tOV^6dpOU?Wv<yGoySo2NldeK~}#Y@;Gfxt{QN6K;E
z-ncIwl!DS!U`&aU2p@3z*P&~Yr`cNaL}ggimiDhE_{px@+iBCy47+1UL&*8-UD!Hp
z)ksr!N6&v7yg@1xzGU;9Fi^t)_Rry8IebF#73P@c-fNFCCIF#B)xAfxdN=JA<2g;E
zeZG5kf?!wx{{Xy<dW?T6`Kwg%Q|emAKG`MAOq&9q;P(}_dybAD3+&+aGoc&K?6IlZ
zzN0*sS7l1OV6f<a*(3T^E#8+G%(4x=LdK(jJu33*r(lWPZAZ$K80M*6U#iELuTZly
z5~O^|Uz=B4@ww@ymZJ<1+lZ~?zmiy?K)!K5bx8jJR>$~?_B60u%>=HEaG?hqv4Y-!
zR2NsVTr7~I0Iq-te!s<^dWY=_mdzWo7K!o5>Gbul9;9_GPA1K>wa|D>S;~S)9H9F8
z)H;+}IkuAGbqaH~NXW<|)O~9>>T|=qw4;2fg6J{8_NZ?4B{6{%!wtulc{ml4i%cg{
zE+-S?9X~QnI|TbWvV>urf!q_`xE*Q)ie_>#jO{(E(!51&=0wV*oz6~Ay>MFIoiy_?
zQMxrz`@DDW&!u~qNv8yl2Nwr>m=3Lvm}4U&j>e*Kf<ZXI>U&i4saGuflnyZ6SK6T^
zO5i?nK5Fhb84(9K$JdH)BaCAQzpXu#j&a(U%0BLS?kEtsDh}?Hxd)trdjU=7?_(q$
zxuAOEr9DJQjM2y>9AI_DZ+LITPp93)*Ap=Z3-XSDde=X=<OZk4`%dz>+Bn5KTz9eA
zO|8XqKiZWQhVol*;H^!j>&Xk_al~uGIr&NS&2kan%ETaXgNzEd1^dV{gprIK4hOv_
zPBK;+n@;Dccz?z}YKbD2@dEVQA;5oa!=-iFSBR``(j;4upFYtMW4Q<%^IiuQt9J|u
z3=)W=SqUVJ?)p~NkK@^Gq)bm9(m7`5Bz62N&BW!(dc^c_`1c(od)r(k#k)GFUOrXn
zk?UC+wWK!}DKVM1uK=fP3c>Kl#A_Mi@~&=!yC4z9$Cm@T`&QcP_H)Pf$hNP`xE{Q8
z$gdJ~DpHl2J!sa2NZm2Br`mCCG+~1gfOy({kF7XHZR7h#m_sw{+k#Cb)5#=XYBEOI
zIbJb}h3_DZyx+A2#tIDeKBBYKqFHU_L@yd`lRrNkk4)8-c(zFhxAP2&3$ixWh>rC_
zTe*@_k|{3WHs(0o4{=Oe`0oQEt8k?xAocdDv#_pe86~%ktuEq;1FmD6Je57cr^6{o
zOF<AZs-HJJpQx<Gy8YLd#R?*3B#>uku6=6V%-tpz34;J=<O73|)9|9fa&vby2(E}3
z03{Wa6YdUr(tV~!20~wSszgApGQ;``&1tS0=~e{Dbpb|x@$XA-HO1&L$+|NWFe=?n
zIKck^3Z)bmG+OdF-y{`nxM$A*`eLR_jo&ivIUJl|52a*FXFAHn%F03j%Z!jetyr~+
zSm6-OdL_dg5C{X?^ry%dG;Qt!w$x8I3&;nKzs{Ksp#;&q87k{GH%Zbzf2Bli<YO8l
zC;@Vj#4t(klTJ&?r(tL2#souf^P~BB>JC1gew1>c7Fmt8!kGh;44Gy;1{m%C0N18T
zcJ|T;t((ddF){`F$G$=BO)_~zTsbl-@(~6}$MF4Xbu%Tf4{A{7coJZ;gU}y(Rz%&h
zn1n+4WI1NR`MUSP_ow+TWKg7hjthDbj+H#vDz2awX2$Nok6&|0vM1Vv#vrH|2_p;A
zf=ImFA2V;tr>_Q^97ZJ)MFSLyLnAias}uZ(wGPa{$c&D`vfBp)XRxMu&m!Up)8`~O
zVe*07G+0fJ@{q;*z*UY)h8!PmDY8d}A)h!L`r@3@+{i>lfe1+}fs%34K9sKM1}-Lq
zs*nVk=M?q0bSkt+WDl_UW<D3beQ7QgK4$w&LUM!4z~GVF6*a7WWX3z@A$Rr83ooFc
zY0|FJ%oEFf=)`A(&{bZ<>QE~r+4~+O2zM|ZoyWaglgyGRos*Yhr9k_fb*UD`rEwY%
zq&8TAjQ;@js?-*{2-=A6C(6!G%lRIZb0kts%X=;ERU#xI-i)2Q5=VL#6x|V58Adx6
zHpiH2MB2=VQ~-{yM)Ejg{sN(RqFeyDVV#5y3H20RFlmrmSxp+U+b{^ue8AlDdgIci
zu+gq0kTb;C$q9qT2YSD484n%1Lf?BNE(S>*{i~(3(kw3QP11uIKOqQup7oTfC>I)T
zXErq0qKsG@P|qrFiCA$e=Num39x>XI2&R%q#lRckek2`JjC1Q-TJ4yzvQ#WQh~(f$
zoT($0_WUY~TZk?~&Y%V=HuveA(5l@H)8%4G_Hd0PcM=JK>nGhs^#j(XA|Mht=2qTt
z8yyZf=AyPsiGXB`0%R+-`T!0&H6^l4JlI0*^2f@oGBQtG)Jd|Ukolo^+53-_C(g^j
z-Ht^;l~rX@cwDm+&{U=v-B&9kFee3H1M=@pmL?8Rylw~_0gbup4Mp9{u~ndjrj9}b
zkTbYs1oir#dWIDNLc|L)lZ8|7#ay1oN!?YYkRp+SILY+-RG-=GE{svdwH7h8$>GWB
zN1&#vD-*~;ZUW(aw+P%S3}sutH8Hh7y9*vc+%wz!YR$cjFo8U6wq_(LCvuVg@2yyl
z*UO0`X5nQn&$E(GZ(&^Xs_&t+X_?VLBrOyLn1u#Bw?9McNNk->#E7OzC0%p0_pNJ)
zAeCpmiPSu302?`B=shS%B6zb5G5}N(T!XvZRC{S6{gN_awG*~-r6X+bD}XBfq!Oyh
zc!fw%2g<!hdsMF*w2H^ec)`xlIo;@K36joHJ6wf{{^M=N8@kZyN<g5I84DQ+0pGc>
zrbEE>%{AEpFDu5;NWmGlVTL=er8?M`vNK9Nqz=WAx{iAOHE!0$jEa}TVUUncGmk;+
zaZ;sX+)9zDXLf5sg>WNG3~l%Ir>(ucytrG0kmNC8oD=DTRwTDDmyOE1DeAtT-8A^1
zlZRCch5M(!u6?OF=rs~3B(*Cx%w;*=PXpSCFod_52N^ArDaIH~X6s{aEWj}vLx6c8
ze_De6Bv_<UrBE(NR_#%8^+VyfY4%(wNU*y|Jd!^S^&q%}K*4|wxbJLmSI~-xMGR3R
z8-?ACs~V1j-_+CLiCfH+MB9IiWAA+_Fhzw1bXJwaARi|kN3Av(uUg}LiRGwVrh3RI
zwA?^xWBE%R@#l~~ygfdZJ+lun3rdbhB2mx}YKH8J2w>cyp?$$l8wWgl)Ueq-#ES~3
z1)B@7V6{G1E9I#Qz_A<Q7$1oBsp7phu<l#9zIP#HWWi7NN4;Y?zJ<mqkx6clI>$7d
zh++Z{QP|T(mvunogTEa|wHF$L`JtO^kCHs4Pze736IAEDyF;~C?{H8IXEZ~eLX(V0
zuV#t}l*vBDM=tz)#C>Z%?l~f!In4V;?b1f8%z%vk1HDOf@J_7)Sxg&f-}}*q`c`%Q
z;~3o`3>%=4&q6y_bRf=ZlQOkSfe~qNc9y_n-|JlFv2aOaa!;7UAR)%zPMrm7YL^B$
zWtC&b%$=okyXjoVh}f)899O7|A_8Y+`LXCdE7rrt);zk>z093^Q;1tVh(M~xEhyt1
z@(pr&z3NFQi9s;~x<+Q?pIX(`?in)$xM>{ap^&#m@AVbUUd&~boM3_TjCJ}B!oBQ0
zJ8F3~=XNpY8}Q&2BLEKdEv$Q;P%h#@0|${+!7MUY9<DnNTD_-4vN%#QN8BLb{cEaD
z$mdS%xu;kMna|o7IYE_Dc*jmFrLwkI(n<FI^UDjg^<ToXG^kojbx~%?Cguv@fK>kg
zTIzf~XBCvHgl}?y%;a$Y0G)Z*ijAGrDVrKzoGqh_z06Ug;4?QZjC8KIP12F#Xl0C$
z!@FZXoYr2E9CrCA5M^_jFh)JAsnazZXsuEx-57(pc;pk_yev&-^gW6c;+ZVgk;bd$
zf`vxeMtkF@wN$>ef(X`9r_6l*@ej(Y=zZ!<Ls+*`S(C|anRuD99Qu#1r)t8~^<|ln
zTH^{^<wiIQ$2s<{YE<Vpq0v%siY2>CD``Wm%uS32MkMFH4P$CE!YwA25X|gO2yd4F
z^a81BUM8Md&9<Em`4r(~MaVznPmjVLC-Gh7zL{dsZ@6_5I1REOdX@v9!~X!+UY#lu
zOH<9OUYas>EmqFm%Ra4X4))sORNc>SrDJNER=2IAwY`Z&3`Q3rWaIBHI%d7I!XL90
z-;8`|7ldFD-$o<}HQ$xDjl6^EdSj;;uVR1MTGGc+)BHPYroJGD63XZ1k%{gr(1l1-
zXOmkHq_jRUZ-@RPz1{t(p)4XxWm{(62p{afeB%c_Ij^dI2!6;~XNP_oj}V<UdG#$u
zMN65_{IMNI2W1)Q+n%J?dw=^kTWJ0^f>Y(c*~0$-qXEh|_4<B>y^~DwH-q$RI4w16
zp=%nh86yLi$2cDKoqSu`2Q8;3c5$unJ4=5ET4{Qnh>c?V(g^<m)($a`YUr-){5j#B
zI^Rg&8Aum7Dn4RIBv(1{cjELO9fCbZ%U6y|VhZhrzHT}Dy~zInJuAsPcl%!WE)51-
zO-ct@!P+G(GMse+xgx67DMrVqd{gm-y}p_oPSq5_YJta<k(m$hG5-KPE5f{Y`&jsY
zMYA?uC9=1;l0wnR3dpBt72rP-{{U(YcVD<VK81ZM+81>@<jXKQ=a1*@UQ>O4f2a-D
zvw4#MN1EM8_pd^R5vO?#y%FfXIsKt^OValK6u$Cd6PXamxnt<0p4I01w~6)t01!^k
zeSBY%%%QLe_xx%B3l+?SVSe-f07{TpfH$gqz<trwk6QF&7{r?t#^QX|1mI&GsTdK{
z^A%{?l1m0tx2oom?9O;nH+AE!YNUl`RuRA40E3K@eJRTs0I$CdR^rp;Rtz%3KQPB{
zO#0M`V$GC=hCt&Zk?d-;6`4{vq?GM}8O}KXbf7{&1cDoJ47ll9lWF&Gp@_s5G6Nw&
z%M;f%R%>E~V~QeFblh@Bu4`DuGDcXtEa~P$x1583d9K^xMdN86HPbvyvF?i6=rcCl
zs9~Nz9R8KXB#j#hAt+T_41FtWMAp2iA!}D4B))8sMtUDycj?lj5guwTE2!h~-Jh=C
z1pHNHuXqy5?PfPcW8ExFa};fijtzYG`(*fI`)<N<BLjMyrAcCsXdgjRf5ARJGfU#n
z3*7iSRlSVM8|K~-jDSz5>VNw6>E9jv8>MUZ4|8*Be66KtJFp*)N40#^Iq6j8Wy%q?
z*F*BN#yWiV8qC62_Dbh2yLOJJw`$5N7~u+${>^&_?G5nS>qpd@YcZJMl&ZAAmvrni
z-yJK;X0--liEriX8FEemKGpOT-#s+gpOH|4RH$B~jwufr92|G-Dp!Gu?MX6lNFa4I
zNdVe*;#I)GL5#P00E{UuyI~`xG=Y=c^#B^2!ZYQxxDAY-dI}IWy8*`p3{VAj8*z|F
zvFl5KM=S@i{#7!-cJNCOIRmXAh)4@0ZGbtV<FObIf;RnlpsV}lr1BS>htH@z>7p^q
z1U|r?^js`Nz#QW_>q?}YV;Kjq=~6r{1{7m=OpZ+_mU^DYtrtKrXO$;B^`o~Vp5I!L
zV<3W08SFWv5juhxXC23SE-MUP4&uCGfTWN}>Ub3(iE;PN2WnM_6PXt$Xut-Gff9p~
zO8Zf;p56JWHW9Qk930@#V*{LLr!)Z>1m#Z$9cc~^CnM=n82Ra(ev}B`Zs+|wP%(oT
zB%V9c<LlF}y*MJ1kaM0FpXW{xmtuf?-3p$x0S@3kVmLIQ0yZ8qoEm$^!S=e4N8TQk
z1P(Z1k4gkH*EksCnnqo~gPiBLN|(xGv~1v<6X{J6NZYo?a5|DHp=>m6RVN^W-yG5a
zNcZ~mr}=EdX+Qz%%{gH>$-x9?r9A;6FbfcI^df+y513;FjEa8I@|SK)bRC5%#8~-E
zLSSU>??uu=vm-l*0giAu<E0#tkT~y8SlO6u9CxOb0ES`HpcGvXQMo{TwFGnCmpyi#
zojs}IDO7+)3FTFXG;F{HvDdCKO6V*w0ojxvdT|9u`n+?{o@v`Uf=5nqM%-hJHa&Qy
zaoCK80~q7I3K$*~=j&25Tzsl?{b@X+T~q@6{J++Ku+V^j!vqeZlLsf9kEcp`KsWB-
zXARFv3`8BR8NeT%0b(#ZZU-IBC>(Q+yi?v1q~#9)7Wz@LKmk?GdhtM5ZZ~9}<E;ZH
z86%U&YH<Vt2*(_I(qT^l)Z@4m3cydwTy)Mkq#5@2<E1!8*(CFy%7#;%Fv-Vi0B8h)
z2h2d@oMM!KSg!HF?@l1GRBpe*DHbj6sAWWKoR=TYfuR7$82aQ;Mld%Hd(xL@K#oRo
zcAR3BcL1&vD#y6sngC`27(H{&Da_lLISL3E;czKc3uJ}K2bDj{o3N9{a(hrPQ5zD{
zDaJ9J_oN4C4#T5zDbB3mrrw;ADY4;>Hw>OA0A)VD;EEK-yAH<$au?Q|sk^5jbIllK
z{vJPwk<;FQ8QbpQ4u{^9<^8zDD=LNgPX0~+9MUrFW(4Qu1e|oBLBSbm0OyiNK}mp5
z91QfKhxdjuIOnZ6s{%)SWCPlO00}2NXVi42vuE#PuTU^4N`i17uYB=Jpa=6dcJI*s
z6b6GxIVTw)^y^NDA#x5!9Z&M52&I5#867}9C?*h2*;Mn#J?IMo<elTMZ1ajuySWNT
z10V`hwB?)lc_4KZg9^(NN(gSa^q@5n2Jk@1`gW%k%95j!af3>b$`k@N<*+0@{k`gY
z9V1fIXKQOKNoSM{;v~o)mrj%ntsxQPE=eHdVw9+Fkl+kwB=!1K*LJg5+%2W;w9w7h
zY{|E;ZfX+BiV}0Mso_ZJKn>n92?HawDxhAx<EOPQ3$r10;Ad_*{ODJY?<@D{XaP2Y
zzcxSv*R2@@Z2;}h-uI<tA$M#&ah&y|oSu4PKGX{0Fnk;_3WFr$`qG2OSGem!pfWL6
z!N-1w@Sv{akTHSz&?XJBNhsjpbB-w$cNIk>5^;mtg~MT#5(ipT+Q$so!*Je|2w)+U
z=eJr=NjPi{d8Gk?7{CPMr&>^;N0LAp#&J}b2LNOdgXu!^+>@N~OO+=Fr?(iUl1K%J
z7(D$wMKG}9#4%uS2>SC%T*&*20km*bU<35^rsn`~eR2&VfJWYN*9Wy4g|r2B1hHVC
zcO#lz#j*<E^v)=4#PXf6MmZzelQ>QRJe(8T+LL2R4hl%g{vM=uq#%XBz{vS{=8+mQ
zz<}5X=FKdb1xhFZkIGMaE*23VXxMN@dE=!R+;(mm&nFbJ5%*(FymbEnJ!r(AbmKjC
z1?H95SW-iL$}j-qJ<TTKaufr`I&?I~XAS$Y^Lq9bFWK2!GDgZa=aG-bkPQPP3&uP8
z)3%Zc3KSFf`wD83azc`Sgc^6<A~MGS=Wn^DAqWQ~ah~)5S+IjVcBBNRU4T4vG-Uw}
zNhJp50OFbp4hJ|fp;MfKdCevP$O<uzgQvY102CP`B#asglN&LOw&U*s!1~g&1-PY2
z`F8V+kEJMQRwp5|!6aZ%(d{a5Lb~vJ@kmsi+aGZQ)2#y#sW>YcY@82DSk;>afGeDC
z2cV}IvfftHk;;(VW}dQJ!3X+MW=141900TeARwq5;Bqi}kF7dXjTuZ$$Qf*&rj@ZR
zz(}wG-~w_$qZ{z7>N&+U129+>=aczTk1>#fGP%hhVt`4>+6E5;y(kB`JpTX)9ewHU
zgQ%($Nw*9)CP62YNJ}VI!1+%;^zsXQ?H<xGgVvhE8-c)a$jIyXQRV^>xq;<Zy(0{%
zZ!>P+xW4r7kh?3ca54t$b4?+UOS=0U^rGUhH<r#Forv3q3UGdu000PBk3eb8k}Qmj
z0XqlX9Yrwi!6|~FMn_sh9hM|1PJ?h^-kgynk_d@aW*HptDT-JV(Le(kAA8!JxsxMm
zh9eloErtN@!!ZF*3~}4mnC<4PF7QwAk=~@+i15cU1JHCLm}7m#B|tay7{=d!r6CH7
zv;~uZNd&OueQC>_6>X;-K<h*>yo|9b7jkiw?kP(-LzNlt^7>E~)Ke)@FU$$p4i$TP
zQ&(Wx>V9TCf_Nj-+M6c$xtcs2WfXTb<c8%}4Ia~t#mL|T+JGOs=M!UYTNxvdr7*N+
zP0^A&1tyfX0g$q&QJj(9fU+sr;P2{2-azX>ZXdeeuq!Ys1_}JlHz*n6Xv|~`uH%}Q
z8Ap%J!))A&SMPI8X$wcSRN*+oD9HNL4Urn;mIbqw$i+xmQYK$Gs-8$bzTT89Y~aa(
zjlA|0o8&Pxit#Diw4*L_KnXA-<x&_NWcq?SQcIHTJmH)HkhtwYFN2p>&)(WO{3%&V
z96Kp(xF8R@J5x@<VLCPj0pRjKT5x!npD^s>w*xe=c}&3>nS&|VsBlYm8T6)ewC{&@
zKJxzndX>V&_R6M3h8Yqv$M<4&BuG!;#YZYEMQ!CE6p)tZ2d5)FsC!`;7cN>v9H~?H
zfBjS(6XY=m9a*@idxfk4;<sS#h2t%mP#kU_T9O5sQRE-Ii3pH}=V|CFB@G^9or5v^
zgnCkhx0!*skf>pRLvT;@phcE(CBt4_%*!jNRCB;wbl_EgJ8Jn#3WaQfK*2xZPxFJ@
zf)EpoVUHsnsvyd-mS_1Lzjzqr{RgEX5-P%Dl4<S+SbT`1=2PqRrAui;JZ5d`-+E>l
z&$p<izWL`i<&p&tlK93r>BSN-Z{I9!$^GJ?<#GI8*`@(<z{cpZ4D@n`8UFx2l`CXg
zByf@C#tGb4CqA_TCz+QKl4K+zp~=Us7R0KvtY%NM{nAfzXzBvA3At86?2a-voB(}k
z&|q7!fwBt`CQnbyQ1Ha@8CG2L$YYE(JhNQ6B!&vTln=yHvOpUnmRAuZjLi^K!*V@o
z@fnnDNh92YjqCF;9Alb;cu}@}(VgV;!1nwqX=D35xOuW#Fxl9CKz)7cbO8n3qX7az
zA-Ku&9Ag;t#Ud<G$j1IHvF_a@A$F1J)7FN$lHL&{aTHb?K~x_%`)YrsMLzhZSHtdN
z5<>ij2arVru_RMm%_e2ILvDv7<O8o5<Ef@S)7!w#>a5;jTovVb;eq`sTbVxAvAp47
zDU}6A-aSq`(>$kAW->+rUoB)+$R7UZ-jLHIF$;GF{34>p9Wlmp&N%96tYJu!N#{~`
zunCjWj7E&Aigvz4#2oGz!Nz)Ki5`1}#Foh##Gkv519Jh~p7aMn6`h<x8itUZ2f!Ha
z0s2sz3G&2vGAU5mz<*LH-dfKhF-ZhLK_eeDfboU=X{L3Q#})h%?H|Ip1wi01Kg>`)
z#gQ%d2<~A%YN#n1w{KsqN&TC1bm8K-8>D}hDH!13b*3oWxIL={J4BN#fZ%_!eSN7X
zNTL!#A>9*@0FdQ}a6$fb3f3yeBC3^=JeD6R1Cj4d0LHtX7FPZS&jitl1E1a^k%q$_
zSbJ0C`!uRdQ9NX**&ghGd!MBQjsE~!Hf{kpP+w`sALCC|PqUc`B3;-|n>{^gW`W~x
zGJSxoYIdGC=hN1r2pHu-;jp7U=mJ9v7GSEtwhYR6`DqYEE_a-j7>wudQ`p3?1xTb;
zG7$NE?*9PmQat5kExIkI0EJGUPkI1D<?@o;0004HPv!V}(J1p3VrC2!<s?yzdm3m2
zff-<goR&O_k{y#Is$CU?c~VEGr`D+;5M7uG&AE)n<=wPx2tB=Ng<}$kn|m&IZ5(aQ
zCzh$bRWcj^pEun!;LHc_NhhJldT9XTnF_;z!9gW}<Y%=sZgp0a1!BYu3<`3P$IDhF
zSB!Kc-`<$zLT{0Q1Z^8n3VmsTCSwGo#9@XaPMced=kTWIX5|23j?(0G_Zg`ddPMBF
z+qVwSgU7WYNggLH2?8OK%05sJ7(ZIBP$S-<7GTQaH#tx_C)Sl*!ro@YTsBx0$UfAk
za66Vf?Ky5bdm3v72-$ROaz0)Tdr`^+#pRk!@<@vNF&h~0KAe9#F&i(L3`cT|V}Dj1
zc<oWB`OI<5o1X(~b*WxRyqN9ajey=o%YPI5eK<7I0y&_!MOc<aMsc1=+z+9ok|`uz
z(zi^KdHJ!$DUhfo5E$QsxMi2<Y4MwQHoURCm^m?qz$3q2lvx0P$d=^9fSFFo5xF}?
zITW`bTFPx&223KKVa9VxqAP~oZ5SXhD%-MDe}ys3&i-Y^(vs(93h)PJrUT-PO2f&W
zHt-qhEy~f!7jiJCJt@UxC{V^QSc9{^I+0PiARjGDZs8BDD*+?z+`=95gi*DE<LkvX
zQwc8^LJKd*$FcPP0PE9dW<s&MHq|59i6fw(Ibe2V<I}JI0IG`s#w-CJH$MFSH6~oH
z*9xw@$e8FoX$vUH3gm&tFmivwiA0%@I(*Ed=Eec~QD7u#9cE7<fM}C)mK+~^QX^bj
zvPC!uLvA@il{E_>k^tmD8^1MI8EwaOndmXo`O}l-$RrJ@31;u?DcA`&e5_lXWPnaF
zp7c9`%qZ-|Mp=mD`T^Kd2PKv%;`vG36n*FR&!r->t{-yba&j_$l+w5k+sJOmjBWe0
zv6AtmetI9?l0vQ+dK~`%N`>B3!C3ME-GkKTl1FD)!YCUu#k-U5PSyfR7)Yi@+y>%#
z?rE-GP+DXwxL|;K4_XkTH<;zNFvNf!exjN@z2ruoV8|HHQ%`gRs^MD#Q~=;*`56BI
z8fa6sn<oJAxNvCOy-V^}*V3DU0(pU(l0#<{tN>8&z?jGf3Keia8aA#7Ty*(`Do6lk
zah1o)LGSNLFe<zN%0@=s-t;uAG$f7!>>L7529+gre=#`Q$@xLYzchuJqw?Bx3J+4e
ziWn(i5<uMY+2D$h5;ol_xDtTCWGj!oO3CJ{`CzMU8CGtz)g<9ja&ytSqlaKhoP(Sm
zC>V|Np-@8YJmAu+I}kwt=K!$d9<(HT!F`!S_n7uRpITkAvm}y&25=azR0^F_3yfqa
zO8J8y#MLNuSr`d7f`D!V0-2Uo1TunsxgwQw=d5Qfo<={d7ZBzE0fi?&`0u_c32+MK
zbKDQ>NW>1Z6aLbiZT|ooLQoTw-Ic-sarn}^7#6`LNDNnyDSXg{NOQP1$^GB1DFG@B
zPU@kC9F^oy8Q6qeJ`YS_W|hP#+;=i2K>Ne6_n;O#n*ok7f!djYxtU*c`eXE`IYa=b
z%H2pG!%E;d0{Dq$Q;>Rt!KP%CXJk9EfO~OBN)dvs$>Ro_gaDHL2MTF(0X%VA%Aurf
zp-x!(`cy}|6~i8dPfSs~C|})>bMp{-({M4j8T6-g8xCeHNN3JQIT*zOm%1Ed93GU`
zVVto!&q_?3eL1A$I}c)Z_QP;--kMmDa>pW*AZO+06ddE)mDp^>R|;}7$mHgeq0V#b
zM(&{h0Q%_9ts#rNfuG3wQZ_ngBOGFk@ssOFbC0{<gFp&4{{R+xb@ZW20iJ!1JJJ9N
z_4-hAoQeiJj2@)+#U@U9Zk=&Pdw_FDP67Q50v9;sp8S)|85jhDIqE4gG7TJqxQtK%
z$Xs#9Q%XS@C-A1@+KxJboOLt|UZ<vL!6O|p`cX-Y3=dAGfE4r8&@+qyM}BA^j1xcs
zJ&SdqfuFm;peQE?r3X0c^`HgMYEF0`mlP5@U{d24Cmi}v0&~|KQM8^opfJwvxTjlN
z&v!E0+QRZXoCwfllT9YwkPRo_ts!HQ0Ix~#AMCa9N5*$BJeoV(TTH+#t;uhteLwJH
z{t4rtSlQd$c#_aww3BZ0W{4J22S9P!y-Y4qip0HFD)SmnPRRK0!9NMSW#g;ZZS?Ij
zNa2)>T+JH<!R|Qby_4bh>>J{(XIzOjX<lnlFj3^kfcf|I{HyP8hkvsdhx{jP9-pRo
zc|x!b&nkuldwLIQ^gj=H0?r~@#?l~`l5KGi0bAS(_UYv~Ite!J&7+5#_?h!J!|&J=
zz`9kSd(9@_%{bkgf1H*67CnV~w}U<d=)M`zW0@^sjsV4S(1Ln>)BP*Gm69u@(=;79
z-KH3rxCQb$^Vn6}pAPE2B5QvSTSj4>*L;yScu~}hcdox_3U28nYwY5ck&U7FKSc1&
znAEMb=v18IRcvfNpHeAw2=AKuO<vy6%NQG#VNaVm=xe#uej8fpR#t-EM_^wK6~<2X
z$0YhzzMZ9LIwhc<+67tBPE|T*>0GnKq^%L&JDe0+9sdA`Ze!INDP)NyKf8~HLO8+2
zYD1yCTAWkfyh7E$62^xu9xF>(@fMS%NA{aI{>0L;4+Lj9Zs#M`v9EP&XsvwpyF}he
z!*)LPmo(?GOH+FK>q#>#R@US~gnY$7E&l-4s(R0i?N(RNAb&0uKtzZ?i29nt)wLEH
zTgN5p5cx5>Kh2Zr?Ocj#PS)2~H!>D-*xb$cxyIa9wD7W?tXD|tFMLyMtk$t=>l})6
zg2ygBaa6UR5NdZQWQyr_%H$(5WN<o)=9I|=_u88AF}YP^lybQped?s1A(uzEd8HA`
z<A#hk%1`%{9+~v6>Uc^}X}w0&nbO5Aq?0&Xw0VRZtr<z#8*!dJY32<uK-z@zC}oK6
zbZ?t?s5Qi2`1!@Z+2?h)A&Dr2clWM)Qt_mFmOEw$pndY&kG=(U!w%c`bPHJP8^qR-
zPxh;uV?PIMrEmwfJ!=zD@x)hhnRMIlCP>L9C&2@^=Uhgy@g{3Aadf(zQL5l<EE_*T
z>t220?~k4p(l)N93bcg(03Or0R<0B&E6zl@G<uf3<NKDhGE1nIb>P6~2R(?cE5zRr
zrMIw4nJm~zBan(tS~5HRE5Lkt`&syQ?n5q#eJPa`iAFaS>@n+JW8%-+PsiG{5?SbN
z<p)d~pS=A40Cyt-xa#K^3_7%3{S2ikGw7{n;}(dQQrYSn(nWBjY%L}cv()+wSDX0%
z0QR8p{*JF}qRMqi<_xT0KkCZ#U`P4Icm?eG?}#KaYByI5BU}Wya#};*>S}oOXl;;8
zijlhH{O!;G09w3S+(V0!YMQs14k|}ouKv<KE7t6u-p<4!&oY<J-&_HXwaMz9Gx44D
z@?1x$%&R10dMorEp4B88N(s<K5Icy;kD$+Atw}bNShF&z1nop#=hnPxxV%+w;!Uyg
zE`|WLn({d(x|T;}=PuvpnviMdAG(Q^T>vb{gZ}{5t+mmym69UG7js5<C)|5f>8Cug
z8<`_5fxuCW<J!6G9H&1XndPx!<7xZZ9OkBNEx37OWgv67aKpFIR`Id&%eF=e1D8?q
zpI@amTL>eLMmIbjjr=T6@)YbGrX*IM^39}DoA_5;ZTHPMS_~>kv6jgw>M&S#{3~{U
z4!mlQG%`NnxxB8+jt)EhDj4+m=ViD^WqC$YUrsm}^d8kp#M;J3_GnB=<-6rc`D!U3
zXpX~Z%oK)?a}H0h(zhhDZ#`z**%;iXp<H7knz6+UZjU5#xng4iK2y}6Y<HtUG-XSs
z$s{ckK*3#iDQ*URL8d*f_GXzRcPo```&47tR<y9FZz5Stfk0(UU^<?-^c7Oz#<OG0
z8%NxTbx?gz;Z>jzNpBh{c@bGzI*tJLG|1y9sAW~k<Pt|1_NPrQ(9yImu1_G4M&8Dv
zdxc+|A=<xrk33Y}1+^o%0y+LrO5_9cbRPAgpm;}H@m<R<j$&m%esWHK4_c!YwcXX~
zTiMw=Nh5%&27XiCzKi%p;b?p-qQ_}#6e4C-Wd<-x`{eZ`^IpzNm8{PZX>7j}j~9vd
z5z}&)!><Zkcvnuc($Qbcia(vlM|0HsX1d9Bc;|^UNHpnL$t9#_$mi42qtq?#lTmeO
z%DGbIk#Wzk^{tPFUJ;MQJ}HMzw6m9Fq)BqB#fqN)08I7A*1u1~(T*OHrwx(eK5Dft
z`k0rxLjAVhRFUI0*9gQgB#?L_zLoKopAUw92SE%`?3UsJcQNdH;B~JU_>HIBctgdq
zX_{58;S8&~DRJ`;LVH(z@h`>No~z&uCrU^b3uz`@?Vm8H$0|ACoL65eYCoCiVIgHC
z`Wc@LJU<7AqDItpDBdX$=2Xg<!R`M5)~($yNBBz(*8NXVmU&F1%MG!?+x7mHk?{Wj
zz}_hFLqR@~i5SjO80TDr*n{|I2DNpsf*vOD70PNFp-C;S56)B_$VshaoTqkrbh%Vx
z6pvieHJ<@^a>CNy4-BMY@ekQ$xKLI;IqEvoz8z`0WxN{Bxn-uTaYqy7rITozJ+bxa
zR6Z)&$bKI9V%eW*jqrzOBoTr*=N|QD4O+*-9t?l&D`L<(?1+Jrzm5;quSXV=-0O`#
z%X1gOdPCaDb*$Yq0i;r4f-k%qJZ?4B{4V%W;;$C?nJ#WMbdD$wopCkRPCD=hr_!{3
zANUu<e-Lzd4}$z2*EdT3b0iC&F*Cp?p!UyN)zmys<GVi$&v|vA$prTIZ)$91i_4NG
z1gi!Z9D)z!N>yU77`1=My=1J7zlj(B0JGD0n@aG9!|f@bRDvzq#<}De@IW6fPB-(<
zwolT&S^c_xJNPT%PlYcuZ8G!wM_JV+#8BHwjIikJdnm6p{ky(D_|M^%rk)<swex3t
ze5Jy|+l*>@?#ClF@wT_CY8w8dCa<jO7dQ7Z44b)UB&j^$WbipWSLT`j01{4`mJ<x!
zwsL!$K1w#W=GDiDPN96)*Ea0aIo&+ZCU-Zm>;+bBQrg-VX(wMbfo63-cxQ}OP`p)?
z>_%4#6s~ihdLx0+7VhHBnnhxA2ss_FEA#gz_cFc7{@Iw_ZKK)>ZZe*k&q_p;%tAH}
z4tP9+{VHdH;>>bKxg}4YG#@i}sQ%3yAi@>AwK-)&$o4JXvvv(ewals{jl&jD2vr=n
z<4$R%o6L<Nbif54e}4Q^aD1?^5R9xt83s!VP2pc?WaHHHpGr&#oI}K*0gt@6{c1!-
zjBOGSBp_rlAxEu8ZX?^4JD8j@q4oY${{SJz7AX~5uw&cQQYj&Jn4)}w?71ihbL-7K
zu`FD=upkeWa1`UO)}r#!qF_|*Bb8!#KAEBBm&{2Y3cuaQ2NVwMnl+fpj>yc)!1-u#
zpRGwNM#~_S7}&nyv#|84%W?rTB*~I6*!1@IsTawKgm&)Ej&_ab<{WdMY6eKMNfi0F
zkVe5ljig<{b4*D}46VYbR@?%q&V50p-?<Lcl~IH&In6Yys|~II-~dNT01SZ{&9>;l
zQM3+Oo9p`0j28-s5wn*Ax&Hw5)NLG%8o4D1kd3_v$E`hKn17;>7hy6;Tw#WK4F3R1
z1+B+Nw1-IWO8wxcBxl#&tOap!k9LD7pFDAl40b2pqlW=wntOIdW48cf%oO;e<>Z;c
z`7n+jsPv@dF_MU5hsueGAeM5+o_l^2EGm!t#AX14ka3ggPLV-vutg`7$PVLzayrt+
zgeZAqCQ>jMo&f9!qnTI&J>FX7L_lSgm<(gk{{W3FZjT9LF+`Js_{co|f}d+|a}1^_
z*UncYtB^2<(-i0+XyfwI;xQO<9S2<X`~@c@g3W+v9ZVsMoMe>hqM79~$kE5Jmrx!5
z0EI_i&aB65e6J`L*})Pa#(jVK)hpWAUNyv1T?AOv6j;y9Snv*U{OTQ4isdO6XAcx%
z0o)2?V1wzOdIWRcv+sxO$`|))hyW+K;;vn3(_TW?Owllf04%GwaOelUIvaUpl_Pb;
zk*4^txf{JdDo(1lfTB~9294s`C}%DHk>(BA0CDuDrL?7`mPb(k0D2`JzV)J(vb3oj
zix&KDl}h7x91m}$D30IB0h|XC5heyOI}d7)XvfHA+*(NXt_tkRWmGRy>M7r5Bp765
zSK0#%a6L2YR-|akEz`!*ys|WESBwGtSnMg{BOGyB%PdYJVnm=|u|2)Os#0wSD!Bx9
ziy--~6zm@~ZZISsp4Dp8NNKJDu?S0op!H9$(wPOqZ;j=WH2MDkkCC53DtRvAiq<gk
zosBCA0yoUdj=A)yZIqH2+Hys51I+T_xR?Sq0sKORg;4`Vv4b%!GV-i_y(vD`axIO;
zg9c!DjPfH~_w^_Ar`lZ=XNFh;#^-lV6qC;sY8qUU*2G()T@mug<b@}e$EUS5B90|D
z0vQpe1T2y<U;yYU7n3&PV)=5+zFv3=4^SzwyTtxva+hq3?>m$aKn*K41<=gx<g^>x
zYP#bb^Ugg;^rV{hD}dq~c<snISI-$e&)3$g#TjQ<;(kHi$2^ars)ph#gCxZt%Liq`
zF~;m3qK;6xdgA(GlKqC;awHfcOkkepC%qqNnc|LFWQl_=aGVf-rB`Sk+7=T-y`Dea
z0(jba%~y^$g;FM5h{j}f9YLd%S1z`p6fz$!=t7-*!^z#>6o*ok!6$KMY_qN~-&%qM
zQRcjn21wWE5`PYAPqNI=#Wbci^B-(MM?w8*SpcI@StKf5w<_Qeai3ak#n5G03vG2D
zE9Zm$%MSEKXzy~W=*q@VErX0~1K0V}3<1N&vIoIGFj7J0osbM>mT8N;?4dBosr*OK
zim`Wf7?l{#$kQ&>Pe;ci-jZlMxLfR#4eT+v^!Fpuk#O%M+H~(UYNHeE;~fc5dC$E&
zCIi0JIf<i1*uY_AlxJx@@lIQ*4%r=<*(4<7aDD1OvdJWE6j<{K+^oct{^=Bvylnt|
z&KXJb71tO!?M09lBR3ME@(Z&G3rbQyn0f+z2c<D5noZJ28pO-a5MT^<<MYKrBlDpW
zz0*b_%Q7e=uph#4)S8y%B4uc`I46QHEESCyD~$ByQ?dclT_J<XkOD-WX(NUnr|Vmq
zUx_4)eV@o}vnT|Z`CoJC^{foJ1e63unRDp9Gw(!tmY{52>L)*D$&F=Y=3aUZ_{})E
zMco10TWYqTB1L>3C*(%Y&06*smQj)?j6UQ3toA?BxEnbq)2&(VE=h8rrcO$a?)__0
z9adEU2-sk5V8<r9V^O`#nW?C2^63{1b7`p*iCnNG^Czm0dhEO{@yA-SNG-0FqKe!f
z-ZbPE2cYZE*1X<p*S>(+y2mP(B>-MPJwWf8&X(cqztSOgLmH7Flx_h%R8_*Psk_HR
zDwLr$sy>6$e`#y@iH64S&1`Xr_eamat!&zU(iiPFkdO>BfxX`<4msk!UjEv;m4xvs
z>;o$Tj4ONnDtJ6csYt=4oi>NaIUs}Vdsj?x*p<}cmJXjo>ib`h*7JfEP17r#`1_%K
zz3TKo8tkGhP0Plz3<l5ov+G|aCyno|Jjf!vaMFCclyJV;roY53RhW5`%NU8diJO+~
z`Bzmu*AWAnSP09h_DzSzJssilWW8;LaIX(Nd;b9St5VO$+GNn7o^vO88Yjj*0k4NY
z;caX1AuDwtE>Dt*e(CkiUDJLtc%>|6ndFg*V|i!Wl6qqm=uyw=LHqD9o>=Yfv+jiW
zli`svJKXtua5kvt{qL<cyldfmkswRiV@BbMoP6H7?ewpT^xux2A~y{8N_MIRbH65}
zpW~*aBiy26uxA2ZpW|K7;)flea=fae-JfPf<DCW>q_=CJvMOgJ=Lh_1Q{tZwM+zIM
zm~pw9HW>%DYvOsnJ$RbhQyr_UpC}=kPDXuxl}>Mu{w$G$Ez&C%!6nENaof_Z@m)*l
z09j1`0GRue{u56P#c}?Fey-a=aLx}0)|oGiygp<om&nPxD}o0->*3b@q5N9{6&7YU
zWZRwjKz#|Rr1<ILX<&`xBqN{SZ}j%9;l(m>zbP*#mvik&ykp@@BfC;UOSj0N;QHpP
zUwldMv!f<t0DZ|MIKUmN;>}Ov_lTsOEVR3~5+tC^W?X`#bXui%@xR3Qx<P!>ox5UC
z{{Y3`uVGjIwpWaO*crT$$?DIxCHS}Dv`w)>9!3BzTaU)7KgPWUTp+blQMe)U3Ho-g
ziY55d;*TvJE4ecmzy))-_adR6;=hX|@~)$lVGeFNz+gvu=a&~|9T9QJ<J9{^d~DIJ
z?uc7><&t5vsXRyj0N1Fc{h|KF6o@XP4l}#u<rH@ruZln6Jn<dG5?Q{dA|n#&QO@)D
z_2R4D_?N_2sIji2Aw~+WU5NzuCb3*unP1+qta2PZ^*+GWKWJw1!>@?qmNsJ1#7-C=
zT-Fuu?Iooa7Gm*cDyB&!Sq9ObnDsUC#rCUy*9$Jii(&wwSd){+N1#5Gsc#}g8hbWY
z2YNW*A93wmwYZlsoU~_cJf{g2sy>s{e`?!Tw-&<SENzwygdNS(Z`QcYbM~va@{Brq
zyzYegkqGxRPuS<D9+l%!S{R@)#^gv`x-kA6)8W%tMdZd9Dx4QnfXsTD;;WnE>nlob
z-lmbuaItqt?DgN;PsUn=-fYulSRL@O9C|SHKBBozL*kE(^|TPldeKF(vyp=2`s1}%
zyU>x>Y;YZi87$c#)b<`4Wg~PACU|1UjC)s~JXG4err*r%r-q8OV-k<{&bNM24NCFm
z@{|bC&OEd2{uIx!JLMyj{bAeFp{|D0M3x}1+(rVnO0%X9wOEHjl-pbC9!nsRo63>b
zt`0MgPAiGxsi$+TVWn#v#iomYc=9|}b1#siX>pSMxT&MjW{f*byIquJbHT34Js#I$
zNPx)kW#e@u4c!kFB)UDLA3JCa7v|hQm142ln*C7YZM;1xkz$g`*K=VNcrBkwwPWGA
zByTXn$U|&4&fPihT_jpHr<)tfu4EE!Pnd(pd{oBDM^&0TGFUM!A~*TzQ!H%Wh^XOG
zFl_W9TnCS5l;`C?$L&|((SZ><%91)i-idHfo|SeBSP_CE5MpA{xonPelkZwqBwNn2
z{F~o}Aw~^z)WlSgv?#$CvuSG;tio^ItcPa`183XbtKV6iG<M4I#TozvgE(M1?)CPq
zeNN=s#G+^k+b&i|Bd?(Mu4h)%qL(Fu82arGj(ha2u+DR2R^);zYS(^DY_W`j-#7>F
z*FAF~dDe9*2J`Z_I5leO>`5XdF|rNEZ<zV(*0beu@yM$n1p(Tuzk8q3y~yblk1le%
zWDZ^;WQ~W)PYgPq_2|E|-@=K!cj9QKZ9ZpB;4&VAkVSER81Tja0FAssWuR$klW`~w
zlY$g|<L&i5$gk0F*qiogx6-WbF6Xw|s29s6Ipd7y+Pyr#2P*UDdm|}J?5)}Ff3h#Y
zpZG=et9$!v9kNKF4iJ9pXc;2DtJ1W{Y^|fW1C&ALKVp3abKV8;-M@zP=$g_v!tL0K
zr-nG?zZ&cG>jI?59Du0jJ#n73>r{%rDm_drIb(KBVW-H<K#TZt4mhnLZRJDq09XvN
z(m?+JW*>JT)q9OjD4{L8Cz>N0XpXz13&z@v78cJeud^${7q6T@Xs;T>rddm5*)Ke0
zl#ZD1#d}Z0&lOnd*3(`zOCd23M2D_F!oDH>s6H%PL2-MjU+N>ujuzX2^AGkw9ff-M
zc*2|<_BrJ!^*(m^?c?iI)vk=UL}D|$=Q+teg?Ub&ti^s7MwbO!Cu?oz(BiW^dE<-E
z7I>Ols7}W+<z0X(>yNvS)|+50ptFuBRirLhp3JS(=i0tAA6i(PLzhm1jLx3hQAXUJ
zVP{TQ^ceJ_YxZs6vK5s!79Cfg=UB~pAXi(vsMi2s@;E&g-1|~nU3sbJq%t2Y?rq#|
z$?1;O=leLdYZ`k-%WZKy^AZ)4a_o{uJrs1}tU)WRamJ-oMCWqL+<#JP2wao<xs_4A
z_;tx6(=}q=Kbb?OGC)oJ&3V|WRN%BWgqt3)yRembP{f6Aynh-YfbKI8M#cFRc-vMY
zfO&;oNMnvO!qcXLIB@cz&+wIgbLeZ#mn$~2F|V}uxs4(S2`+aW^IZPD;n~p|B!e81
zzzp`T)@Z^=QMQATkbj7t)dkh1oc?4bf!YSv>9;@5s+^n}XwG!wHL2s?D$&-^k>xs<
z7%$aF836m5!+4rD5y+=@GC&=x*R}ru3%>sVBH_?74aaE6V0()5?R&$*86=Q78%N5@
zFbB1I^lL_<^E{gPcL#N`&d3yUN8agCxGRuGGgjxfbsLHk>M_nLvnLx_a0fx_TbzV!
zI3OMmT0y}S;;q!L9Wp5o89W+d0gwK-r5$>{Ip&by3=`IroDNTFYT!7Q0PX&DD##R!
zl5y7u6$U^!>%}N#9eq0011y`LEQU@nezi0kH-{tur=S%|Hp7F!J($&qWC0s->M$5n
zLfF=@)-H6({?`@IECv;T<wvNkeK*Hfwl>qk<mHr*Sn@J@isz+9jsY(KxWfbA=~X0`
zYMsc)7<{HqrlxeEQ*>M^${RD(Y`kr6K9-Q%%6!IbFlOQS>OBQ&S@?lG+}uo_Q3}Rp
zA9vJ#9<}7QH-r?8k(q)0%Le{0deyMk7{>9)<&Qh!B;cRuE6=NdruI9j<7L$J<EU7(
z$mw=Ar~ykc$>*=ItG0~tm5vFc4HItOdSv?78Kvv11<Y>VS#qoLw<8Cjt(`Yqi~}5q
zCGwke&Ny5Xz^^i{5^&h>r(QBTG9e7N5H91pEY0879@M8LOT@d#azYcpK9!dqyXKwp
z+$-Tm6-Q5Mwr^m&a{(%#ASAKIPoS<>2`8#IQ%tcPx<PT772LPX8CwEBr@cvUZ4$y#
zFu_K7Eyy|b^{CSA<qC>V?+$#fGsmS#yModwY#g8*V9<t(Um_!vB@WDd$2@xdX~tAp
zRic(M6b+;f0mr2_INexoe=`IW^7>@<_n<<b>y}vAnTTWulq1%pp-v}>q#(HrLOg6$
zbKDwqqBfYhoA+S?7}Jaq*waGnWr^4{a&eS6A<aMR<)!lOqbdN(s+=(tTtr??)68Oz
zXjWc89Z$7eiDC-UDQ0C)ok`>$N|HE%QWP=*qj7u|sU(GB2^{OPM}Ls#{bKbME<s`l
zqnYDxJ~elj<cc)lV4e^A-t`fU%%P-^BY&&NPrHv_db{>^d09Tsmqt=Bai4KbNaVQl
zlwKmc5F>Ywq0dkLy)IzoE5?$<r6DWN3`%o~id$8dDMVxyWymS~XTB>!NRD%nxfl_S
zGf**(=0}zw%8Gaxz%ATowF*s%#Sq65>=1-G-OB^d(3(ROOCg3Fw;W{k_U5cCTO*QG
z$Qa$UjGuaZvCkZGBchGU3T1i0?kQX>R7HXq8+(Rj7{r4cKBk3=*^rW1<zhkt{{She
zO}d#%Mn=*=ef`IJdLuL{@hXzC5F3m#`eK^|i191pX~MIG{uRb4V@MTntG!En%o{v<
zRH8Y2^^z_N96FwI2lAoefx<?~v&}eN&Bi^)r7mLBNaKQV#OKXm2-;Hs4{=SB%3}zB
zEVD%Amj@WlX^T1S<XB{hgR<l(8Oq|EEm0TbQafS2D<@eki}rUZTS6l#ZyDVCiR9qo
zwshS=tn(v)6+z&S)~l_w8<4_Bn1t}hC-dz}*04(&qw%zz`OXiuXDM?R81jz3o;PN-
zl0&h%%k<~HS45dyNMp*WC1l1%YTuV~e5jh)pJsNcP)jN38`mAX(nT9F^BugR80^UX
z2&SZ0E%z!~+LtZmN>(|C%;j^po_`vYTES?O&n)|-d?mC@PS6Kj`jb`$M1iEk#GLst
zE(mX2`g>4Bzh{o#A?5tc%QJw>&sr|q1sIKz4<yF~&cLw9Kt5m(y)guBZq~|(3zDqv
zIbZ(06I>(QGY7#S1pxAJDX%C*3p6E>vA<~>fb|qw<IykzKQSdRv#Pe=m%ck17XcaW
zqGsB~kr3gC?6n!en84FurW*mjLr+#QshTCoKw3s4b_aY^xPoZ7S=HRhXizk2LJW8H
z^rnKu`7&F`0}s9!Y{#$Gp@bw&9MeMR`>@L+aktR@YRrk}0RzHOQSz~;V0~*TD;E(}
z)I5t3EfGLDZl<2bX$WSMEw`y$1oj|Qa!yJH7V4!~h6kPp6v%Giaj^;7!v}fG5l~qa
zvaysDgqF|AkLUEM5E-L3lNjbgcu+V8zA8g*@-Nzvl&Lsm1Lj}Gql#!6BjqmLnL9|q
z>(ADP#F1(RgLj#Bb}lxvpSq*#+|%W6FZYT!0y#Z^6-BNgSOH~`5ty)98>#wsq`G^^
zVq4I`aKNT|1M80U7HyTGa%H!Dw)aUaA-Gu-=YB^YO1x#$qqI=@3a1SrJpDekmn4@d
z5s{nCxnZ5ae7!v?G`(v?33(xqXA0^t27P@^4m$#Rm!$IEG+nYXmpFX<sz1i7yhKi+
zUNsHD1ZQ$oR?)OdKF;kRke#tBX9u~dB`>x}8ZuZeP!C^votXDTBu?ujSy*>2*hGWw
zk?Lt8p6*-N=SW!jX|;kL2_5n2Pm03n@_eRX%ekGpan}_so}Vmm6n9rSJDpdjJw1g~
znn12J$%RQ0-as6k=)LjQh;HG%fxgZeBW_PP+y4O9sjakYvm{GnAltmN2^f+|{vT?d
z8)b>Y82qd`^ALgf{VF-4R-{l)$b7KtzmlgtyM0YrLh?x&c*CeWgg|5F?tQ9QtkI;z
zB^znTGMpc!SV(Q-iIw5n$~SM_-_o;kT?$E=?G%xstSRO)GY~ql&s^16Eba_$S~gP4
zg*f}aU(U5|nkTniv9xy^hn7e24%L@`s3a_+Rgkk1180Hts;AE0h*L=!R}jkMVTshj
z#E`t?d(|t|XAF)$RT;_SALCc`4Pto%Suj;bIeUTtD8F9gio(6tE!T6(#6*j^Nj$S>
z8-E(~DaLYo9CL9-Hm!D$+(ou*66H`6k(_rQO62v8UeYvpUfo(ZW4vz}&-aCBYx=Bk
zNS94KU<V|t46+ZWbK1Ed5MIb{*;~tXWL9Sh#?#OF74G5aH*20fdZ}E>)~31z;=GS+
zaxO!t#s_YGm5)1(;5!WCk9vI97g82hIbFxEaqU&#XbTjK7rxWin)cxySlIGsE@nP8
zc@(sXjxZNIR)(5fNQ44#a=?$h?Vn1c0;kH^-ScB-e0tT$S&}wcC13&hb`DqEQ6+RJ
zyECTK8r|VD`AlPvmTxnZ9B1lldq~wGNKC6BEV7>|Lu6y1ZflSJ)^JrWgeZ&#)Q&K_
zzbcV6$F!O#r?+ScVoORsP@cS39H=>+aju|xU8jj$!XT6>Ad+2|0Y~+#r^IFuCz5gU
z@^%b1K9%R56N6vzR;3l5mGea;fV_@=Qy)3ScPHVdr+KU$H%xhMkIGe)^vAET^sZUp
zsik=%U#`mf5Dyhgt6e>{v5>~8%!<31A93qj9vAp^;y)Ez%YNbGKnC*boDB6J;o7|)
z!GE*ldK?y7P4Q=*<M)p`MYIyfJARe)PlkRES!lWncyc==GdRuAXz)~HB=S1eX;P=L
zjZ95REe{j;7yC0utY{jSj&3yRKF@C(s<erPW*i>9y~qCmtJVGid<oJtduQ<-`Xa2E
zJ7q#iIp{rwdYQlQuZBJyN#U~$W+p<jMDc>HA3_N4^sXPrKODRf;r{>(U0GObf*GMv
z<suA&=m@OUX|&W;j%g=1c{`n#!`}+%UI^3gb?e~>x|T^8#Hav7&IaE?M_OG!T<}Jg
zZoF9f(n%=<+lG@Z8SH-w`Gdyawt&(hSoI6oRyEEYoG6szq4)N$2l4OiRjF$B?wW1%
zme5Z#EULte4tWG|ob{=W9;Ed}C~2YfUylAi+W0Q^_Uh)|IalT=(Xh(`a!TiqT-T0x
z&-UQcHMqo<+G$YSM6n)J4ma1$J|g&`;$IWTKA$z@rANxSbIN*xde%I4cegC}Gc=1I
zm-7%f9ls3MT`UVpIk7%ohjrsm+84$8)#TEx>5Zk7;N<@6(2m}mR|l=@df$j|+H0%B
zGxToQ<E>~#;pt?H$t}4G{D~mTXSg-5r}!{MBYcExjaZY*W7PVJ>`sj&RB6snL~-$H
zlN*t4ZAc88{KNY5R$<aFCL7JM+DHQ({p-7vz|V-SuNjqOV8Ctr>V5kPwJ(G1bo=Fo
zHfcnoX=u;LgBkDBKEBj_Vh>|qtIw&z+4z3p-N;3bHgJGT{7?QBY<OxttL8xP%7pGa
z&U4TV3hm<X?YwG+NB|-7V+T1Np!(C}@Z+tcNFx|&h)D?R{?Fk{+Fz-nqZG9`QQ_5w
zXP$PAK>!5{fJeWnsiW|Rn<RGfTnL@q`DzsL^{(h>Bg}L$^Ro(!2L$zCDHBDSCyp}3
zh#xLjl09m<+Ye;}h_~?gXGvV6s+<LlNZdie%~(DbMFDQDB$1HjH$${BKHo!KxAp=@
zW?DF<l2r%H5uP#XDVN$bu*>$VYZ;Q<L<-9x1%?JsALpetCNE_cjxJ3B=CWy>!UG{q
zz~HVsfA#C0)ot3{i(6Stid>-cQ=<;QP<?CEpwX>w-Z<Ja>fbVi7z01V)q&!V2;a51
zl6%yhEh8cb&O_t3C$HmOG^$zIm{p?pN1Qwn#7K7x+1xhv9*5SF#z|qhE|L$u&mBFg
z{;6thZnu4vp*ukU_ccxs$slmK{{9C~dhD`iE~%d3`y6~%e*k<@w!4<$Acj^7Bsc>n
zugm;Z`b%x4+4#FaoTbW4(%Y+(oR3~B@%zHsgxWT@YkeGMXA_n%qitd_*FAvmU!`BN
zU&U#BZ{b^WWMX8oM2_hrY=>-qV!nShrs>p-qtv)ro=N*qd@pMWWYnX!Bo|__1Gp|a
zlkZ<4YWfV3++4_E+`-$+3UR#pn*AmHq5L0vsOi(clB&|HNQ|-l(tT^<FCTb9Ju_FD
zRtoXX#R5jS3P*pXXNAN~tG0AfT+fl7Ms!<-NT5d%$i(hx7v<0Nq#hfV83ttYa@qaZ
zIL&tQXn|b>@v278f>>ui)KyqCrbbwR5wkhkSY=pb^c}iaXSR{6ppH%S10MAexhi)!
z>Q~b=4Gw9;NU?7SGR(a*T`|)pTeLg(Z;uS)k(`_ZOL3&Z9@g?^Gav$24TzZf0gkl2
zvlp>PGIY}vNYIQp1iMHwJ%uUJ;demo<*9F(l>Y!hT@AjBrJhM<RYKn@5zceSr?r&G
ztoCt6B9$=8R5NGT_CL~>wqy1uEiR8C1j`vjUPOa{f6u)#Eg#OD86}NX&eY`Ku<f4J
z)xo3bsdEjD?ZY^4mD%6hC2>w)4kfL>miEq@vO_uHlhu7c`o@#4!`NKoCDLRIE6C)8
z9PK?lg){p$;K}n9KonymliQ_sCr1k)i_1_NJ;(y(*i)awQ?Kv7&Apug54VBo^rh|C
zeO%*Y(yoBpC9|k10q30kDq*C%hhXW#VF=C{zom75@Q)N`wekzO13BTOW7r<RRE^>J
zp_&AHc*JVixsSUKW7?P27=2viC)1KEh{Sgf9HR%!Dt4*ukH(zZWRf(OWfV)dGHqNB
zz;@=k%UvO4vTOCV-vlMeP;%J^>H1Kb89Pf`I5Ggt0O&u@YM-pJ{aoeX(4I@96f7i>
zqXen`4^nC=G`3KnxNJAyQH=f-=nLV6nI-bTLFKBtFW%2=n#_L>TuX5Ad1zFw0s+ZB
zx$Q#5F#5U39Ueg`P&SRAox`;u(WPWN6pW4-^v!l{;k&DSw#ykNMJEj&TOOdE)g*oz
zX=7QEWI!8-btH4fC|I;FtFwoFCEbd7s;aA(B~MRkL!`*0#AC@ku1*2^8t&lmoR76c
zXyz#yrrFWcrxfV?CoHNVg^{4a5)zpzeKYG%>yceXu&taVS{3WX=0vI(HrzPK2hh`^
z@agkfNuXeh+c@XB`d6k!;7Fd?Vv0SApERuCki*c_tKlnEnnia~2-<`L)cWLdDnGO-
z_bp)A=CF8PSrRw<B->fo93D^(=hT`-@bAb<7LhajJ#pXbUY`CJi6xE;$lY2t1)dYe
zJwCMs$A?n+$$Jm70_U7(Be58#_4LQ}G<o!X7?HAMfR!i%uo&Cv%`)r4_wkaJ*4uWj
z;{>b7HRylvj@Yr@BAHkb=P+-Sj>8osnl#cDntN^0f&|Thz0>gR`qce-Tz^wXn_lP(
z4(WsvkX1sXFa#WPlTA+!%`84<#m-L8WA1CvZag%w+%>(SMuei~M){bMGlA(&xbWIa
zAdYP}aaJn~QOUHvda?fi>(lz>#q~vV&MtgEC@P`I$s=wsdQ(?Lo9^u$agsV$eBK>E
z738&(X?F8NFv_UyP>li)l*jwx7?fmSP>#Uy+N<kCeOTfk&>HSmSgu1DmvrnG<wfa_
zcJ`+a4&5YvVVOqZh}<qidy4Gf&?Jei=DCHH<B+tG1?AV+3fH&rWYNOt*2xTR#z@So
zmMzyA>?r!$1%_<%sB}kYgFv7L1zKkSfCv7~nrxmPSCB@Q@<z%5Gf3d4PMmkINM8%g
zXS5e99kk};mq37kxap4Om^7OhWNWzXP@*$=ir_N12c|K_FRmf1BRt^vY5eG<ECM+I
zGd2}l>+eyI4$P>yk$8~#po7JFY+e?5V2#obE<ZJ%?6Ty#<Ah&IWyXhPcPWW9@d%DE
zL<PB%>;5#>H8A>_=6~1|5b%KPR1(ZOW8R}WT!ti=%BTw+u}Pinjz2GY^hxvq6rwq;
zf|8>u2=Cl_)j70S(l$S4GR%0AM!+81M`2n=6r@kpP9?NSR!m5xLku!Ab5Ox$9rUD$
zw`?4$@$FrkXs(eLSd}o`xm=Ya`P9v!Nhyxv%_4Z@Yz#$=5!JEWXEmqR5ibmI?WRjI
zDh5Sm>yPX2PF*5dfDlZvr|`2bLH__Iy9MyvxsiU(to>CGZSzKZdk^VOZ6D<=BpAof
z8)E?o?lDj62wzt?<<f2x0%Kqa!QcI9t){kD<|s=Owa48R*}jDLH>mp=TJPnAmHBw;
zeF*;m>r)}{<X2YSSDr-TR`U^;JHX%oF~H)V))2n0sm3Or>x{*`?jVfvgB@sl7v7MZ
zD=FZg;;yy4J8>Wec@)VT6F<rP9k3`(4m*-0Sl&#KBPh7rj{Pb7c#GH^XW7p1t&C^x
z=dDV*d#f@6az=1D3Oy^X9u`eOV3KQGNA{LLRdC%o$pe~tczv$sFxy)Y2VKJlZ%x$w
zyjXo*oPud`fxBxm?!a|D{plyuW=tVqtWOLF8Lp~r5#zUcp|?1UmXbLK5)V&mmg~df
zCYY=)u?1IHr(fPi#|LT0-u5G}wI0-dz~h$9!WE9ujt|c!c=}UB5@ex|4b&+9b=1${
ze=bIjNF5q5WcE4h`FE(}(yisQOYtJelam@JmPX<|eFyWZRZ}I<XE*j|5BtP9QS(Ml
zIHfk2`Nnd?87F`%rJq5T67xBa_i2dPqsiU<+F{XUf;)YU8%pd%is{C2)Orf8bWgEo
zHTG7w0LU1IY!=5uOlT1UF_m%#O6R3?a_ADmOm`M#ST^7Q=nu6$G&2mZy?nxA8%E3k
zPh+06`Qj%@oWM}u!=1x}N^RWzz;Hi{(z<E9JqV4=?u#HhOjyG&{{UX8{{X@*s6%>*
zZFLpQYQH$xc=aDzX{Jl2(TTTU-dAo0K*wKNKqZnzh>oM>_WIXdr}!S`=~6pr!?dln
z3lEun$EfzNc>SM$Wi2aEy=`N~DHMt}2lGZ1m(_ha?McleIs2QQ8Su;CM~Xfs&K|<v
z;ceMei-8Hi&)2Wky?y@xVS9*lm>W)lON+2ub4)P1ar{H4<J!Kw@aKpA6MQGqBfQj=
zA#^R}d1P+KZaa)uoqSULuKY1~r_HBmwh%!KWUE|&6aqNpbp+$3bIP-mNg_Sxsqy8{
z?Deea+T5Bpq~I7E1PIT}PI{j~T~~*G09!n19QJX^B&<_(V1ldLC$)CB9~LxQ>%p(g
zAyV&xT<3SSdw=X#@bW*1zA$}jShIn2-1(O_;QX=!zyNwvm3~O`OGJvhIZxU9{t3mc
zd{C0s<{u6uRw7drvR)?U1dgabi~RFna(piT0D@I~An<mR3|C$iwUfz=`FB&M=@Isj
zN%YQo*Rc2>T=+xqTSBy#TGec=8_PdsiANncL&tuf&lTXGw0HazPWJw3{3GDov1W-r
zBe}LXji1qoIUssxo_*`dc-r-9S|5RYkx{&lpFeG%*gxUskra_=_O{P<ld*P${HdOZ
zKhLFnb$k0HYO{$KO^#QZISRaLo0NKF_Wo7&mYd^EXU0>=+ODM~(YTP0KH>Kr%t<Zy
z)$Kn-&@`}SxU`x(g~*?F0y_HpSD^~ij+5NYXtZa++RyBL@drz>`$SHx;1O_MJ`>Xf
zepSTlzX`l`;rUsvbQ#1EFZ#{7Qh%T6U#R{Z(VxUbS?PWlhT)D>?m$yv=uLW$g}-6%
z3;2aqd{N<8Ztfl}@mpv2Wr+0yfGNu#MjAJ$ChmSEHl3@YyBilkpM7LPHlIUKu^~4)
z5_*6u_CNNS{{VtF=(@jzW$^`wjqVm4q!v+OP!WzmJRg3dzc4;F{>pz6ehKT>8Ya77
zBaS&)ZO%6tFnaOZ9sdA9T{LS`uMTLiQcc+N1|V(`u6X2UkSQizgn4a}IS2Yx=(Ndx
zWH#(3cG`=KZX$!Gvx6=U==hOA`@dS+%&Qa#CP9Ee?t4-!V`(ZrQhMjTUi$_m5QB`2
zkwfXPbIdZ}MyF^4gY@^KQ54lxM)Q-7Pc$zha<Iwv>sOmgmB^LQaF}4ccBxL0cM3$e
zHf1D}l~OpzuhN=KMsMB3yGI8Nk--#!STSZGw@^nz?TXg^!MspniB1{5V#6RGPim~X
z70HWloE64Qs>78Y)a=6OrHpdJ0QEkUp;v`Jbe;xzty@nD-`!lSNo#{C`>b>F_cW{E
z+u5@vni&-a;JN3mG^N-t8yM}8^QLgU0i(;@LoZx$>02`RPf&rQxL6pO<p`=qaKL(0
zllT+FChC3Gs~V;{b|<|j8Fmh2U}4`WF941^b4miJ$Rjz%Gy2xR@LswcO50Ibe9qwT
z2XRe{!I$#G<}@zSK76zv-3RZ|<(FaJCTw$koR(wr9u=8$kHfVvG><8F{J`n&S{D8s
zzPOeZwNoLH_Nd%GZq$#U>Tp`U&CRe>jmYcI2mJ9<u=FVap?>~z$O4tXQp~TDfx$g}
zs?u3s<%mQqMg(e{f$LGdo%Pcxv(sfIMr8R981<!nLqfPQZy}{9K*;CxrwHAXYM+~)
zbNN)p*5Qb2D^EH%9-aCeel+;4Ze?^xZAl(x&4gg94xy=wLaK!=xlaUg4LL35+R7uz
z0I@#R)#!f(e0i_N^IKW@C=<*ROU6bz3d>&r_|2WI<kDH3CU96N9OD`Fp=+=^7_u_P
zM^llI2WoLbIhBYEIl$u|O6hDq7Wku6S#2!r2ihW!ei`xt_sOhV{VH7<m|Y1D8)=lT
z7k8klyFyx&!8=)b#yY9Mr!L&=L-Sze1w7d@l|rwU<Q!n0^=3OMoqo_E#AAaZugVXh
zq?vrIg4W$imDoTd4VL?~(&!i|18+qn)tS|zR1C^iR@lKuN`-CAvH5~%j>jS6>PNq|
zAhRQjc#sukS1o{X&{I-2jaj6RqaE4f6uwSjBoGj}3!bF+#SQaLS7YwlKKDW?^d`(r
zsu$&4l1|Z_pT>}uOt^2Daw*aop!sHmp+CgRI27@03bUgun>jlVdPB1zRrvym56s^;
zJw55ftBr~dbAcf|RE=)JM1<S9Ez@b_iWb?%9h8hQ0UM0dxLJ&3B^4YHp|V_#zSP!G
z(UfF3P;rC&>FR#Vxo%;0+H$<`PrV5wQ#c`50Ku3JGC#tLg@#B_km2&c09QS+M$mXg
z9RC1!pdOU={qudG^SRF49>cW@2IS)-Cxe`AKJ<da07f`;EWUu?(yA3uS$S-Xp5B!8
zjDfKjJ9CLg1L=x+f=IzQ4S+L&!Jr6=l1AmpJY%`0AZH~A0QB5XPimM#;y{waB8+65
za(<N0E<{lziV7Y8+s<j|76Y-AfhoZ2ww2T<+}TwP`O?J_gc3t1-afel-j!Dq`65MN
z;BH{K3_Ym<5Q`3}8x$;g^EuinL~1uIXXXPZa~^6#6ps@X#DgR$9Z&xNTAi^K_A>@W
z0i@%VGzEy8VLM2|^(Q@jsbnT;Joy>7j1A!Qz~EHV!8CFNBp6tNvjKoJ-lE!<0hBn9
zsl!Hq@(1xy4G2VnIV0!hPrS>?`WjC#vntECCxON~Q`uwPxu#+X0lDCPD2-ZI!o<Wc
z-@xSuueAcyj#!H2B+CuiAx<f)8aWRST;*3is!&9ZuEcVFVY{4CMm)?rN}z*`o&lh3
z3<VhZh(ZF~A@v@#<Y2P~G88>IUZ?t0il#<Y3QCiWpbwPyG|<5$SS8=J-wwDL1J;1B
zZB;BK0KRb+!@xfDJU_f4(YI~g!((s1y#)~;4JH&f%EOUE7C0;pbJrZ21|vr7jkKJR
zk_T~0=1C9lR1$lEfViXw3;{V@@qx(opasYwhB2Iu)Cdu>%Mp`$2Hc}=54g=LGZic&
z3RsZDfq*Gfi8o5TZTTHWGDmSiXd2)}aK<5lmtnvkN&>+q_soNrI9SvUKBAC_*zo}c
z4?7My_Y~x9{{XyG%Jj!M^dtN!3jl!|s)Ba`f_}AYR85D^GEZu;-NeOXQX_R3C9}uZ
z6o45eD<g$hLA#Hbk=ya4L}uE}yekqzo`dN^LhRvEGQ{`Ke_v`WAhs=T3dBThB9&r!
z+xYgVo;W^Nv=RY~NEqkl9+ddRZz>YN7i=6i9_E`htGG}lVHt0f57vMjRzr!Mc7<Fl
zKyt^_(mTXs61+@Vn4v^Czyqx{P_q{d7j^(Wz!ddT$7a^fFfhFV>Tyco5N`~~e|Q;w
zP~FF)eJVi8@*-YeZb--a)I*Wz2=7fT9AF!jVmDxII1W8COEd#xGRhV)%O0hNps6Vl
z{_)V3U=l_uT>aGbIPFr~L?nH!I(b0tEO`t5*Qur!Un~gGjB+_p3C;}?+$cjNk?sLP
zr<MR;ue|_094w?NnLb<>2jo8V(8M~ut+|XL4pGkRw|}6a&zR}tNE>hhMPK0+7-J|c
z8aY)w;AcMn07?TyIJg-bw(rRYZbG#wWss+vv@)CyF_TS-He~bF$xNL48hVy8M5Zq`
zFxyI%!!NdftpJ#-1;yNm@NZ^T!Sv78lXI%PVZxl?hE4}G*j`8^HtTRn-SUMv#(Pr1
z8-x*U!mDm$x1N8M0~~=AM6g2sTFOh1{Ig@P&{DEqN(IC)B!xP&c0QP<#v=h{lG;K9
zg-8#8zW)GPX-MP)%z=&$N6p0oAuBdNdmk#lE=MEMfUb+YkK*Sip`zRqAUlTUYz&@h
zMj9kBF47q1JgHw=yCOwcW4MjuTd=I4yoN);^il6l@<}BN<GK3#Q5riGx3}9PyAv9L
z)Su~1j3X+uLn#}u#2$y*gscRX-gnD#sMw9ZV#|?_dSd5<GDa1N%kAhrMKmz;nP!x}
zK;A*X`cT9enH`k58Bhm7MUW0Q^C&W7DzSp3bbrLsd8$*4FZY$XKaaI2ndaFUk%R+<
zM(RCJ6u>t``JGNU4nDmpq%m-ebH9PnzsJ^vT%mPBLgcYMsriyQ#$!-6jk|~5KGh!l
z!c-Dja>WH&LM28<+M7;Tg=Rm(J7$_ZsKW_PK5`pxYIfu2EQ|qGMGO=S;~oB#*LI2_
z41^J!s0qo<Rjvb(l}j|iPh?}zdU5MU^>hjp{KWa6Ki(7+Wtl|rHvEn=jO1`BvKbx}
zjllUF<dK3i+w`ii213RO`L|_ELm>V%o8wnq=NUN9YIKo#QZmd)DH!>4$R?OK#*B?J
z@5c%gCp4@Ao)BkfEZ;FBkUgo<n8sKV%BPU01dmagW)5}(oR7LY6Hb6K&LTi}a9=;e
zO)Wq&Css2|k%Vl-gmTB<6)blu13WYQ+krzTMQ>_i$W##!`D8mwU>s8>X(f$f2pld>
z3V?p5i&zP#xQ22JXJUi<@(0RKpaPmDi_6?Iy_l&{kGef7Cd12ylW`z6Q@^$<Xw@fC
zZ2~ZmK2=!sBzpc7&=L8o<|`)UK)GD<eg6O&Xko|z0y0i{*`D<w26qv~1cFW6u0ZGd
zR8mA$+AXJ!p!TI;6gI~MOgF0!pS2>RC>T3fwj5)%D#jg5(|m}71mo{}Q$YoJVlqBv
zBc&doOO<9SM!-)ybMmiq^`<aHECs+LB!}8?M`}QT5>j1@(30He)||s|F1!Jap#K0D
zz9_H(P!usy%McT|_cWXq3RDJTg4y9m(v%I(*qK8{o3c&@dSmNNbL5~hC)XpP_n-v~
zb^xJ<7?JaIr!LdG%LP@C7A=pMkK{A_sR$9TGpjCgSx--;NRJ_%z}oww!){!XzMy^-
z?lgu5c64ByvUyN3^`?+F5fcK~`GD<9Cf$t6`BJ|o;e$;$Xxn0c4{usmL1Im?M9DlL
zNwj|QBazRc9+cNJ79_?uXFE{<#Q;Ror&GN08?6ePvP&GV%(*z-MZ(q)q1>W0Y%$st
zo_*=wQ!IihSab5KsN@<#v4XqeU~`>;`9Acaq>aO*puZbixHLAbG={8=<^s@<m$4mw
zqMINaOpZu6&m3dvNxDWZuEPVU$2q5ND}m+$4^+o$fD|2$3S$`HGUxvQ*GwRgLyR8G
zC{rOq%)Ampwttlh-#!$EAauv`rF0<)`Aa7odV}difU1HVGkOlx5<&p<KnuSH3P>d6
zf!2|{unR1kayTcP(zwMt8;9Jg8!oxzA8&e3EsO06$_FYLy5^Qgl0%mHus&8JxAmlE
zMLFKCF`SOoED!`S<s63GI2h;ZDaDyn%8(T}$m0hdl^JYs!z0_ZAw2Co;B^$Pg3NF&
zjBNuM&lI4H62z804`3;!w-O)tze7NFIBfjGrZ^O?I{_i`OXLC1siiNxgOQwLj^32Q
zeLM9uF(l=&oOY#fu%L|c2*9C<C$A@-J5pqmz&Y#(dP04_IzeGb!SDFdk_TVPf!B<E
zXgL%BAC%<wpy!jtAR{2>>S*oHf7XB;a&o+M<KCKi@7tPO<b8Oc`<~rs1OWFVk5Nc@
z9f6>c!!-mPb3h;@@_#xAB95mNod@$23}2x7(UF{w{{U4Ul$kv!0p8}2^!z$eft-IT
zLJm0x>p%;faz-gh=hT{SPT=O0`XA*$0pMdiQS<;&N%j8#_0R&0^d0(9k3ut^X*uuQ
zcc6oVo^e16^`i%o$M{eH;DMT5xcOW4pakcxJ7m#}bo?oHl0g{!X-a{|IU|GVKn=&J
z;*NtPAFVwgmgD_GWaj}u<oyL}cyGYIDDg$uveI-riDYLHhA|L|$JFETs)Q#}T(MVU
zQEbI8*b2F%_-|j=12&PQ++2kF#u$qM`B%~33_swV9x~VAx4-d4%R<ldJ)mA$eSLBH
zSJfW{{{Upq2KXWYVWMe?_L&fQj?jU)550k2_7@?oQ(DiJ0*s|=BjX=|{{XQkjD98A
z+UnZhooyA{f1=w&m~;OAN6J6WYw7<0gCDR*gFFp#`h>b?pLD1KrOzf-&Pw|a@UN*n
z6YyftUL-cnnS8z=jWEG|MmpC^28m^)+@-dqZ4(!5yHMbdfAOzgo*My%OOiKc@SvB)
zsl#|X;LeAm!EHR63~Tc4NVEQ|kLO+9mEmm{!<s*zc^pXLjD{WkLH_MteLDA7Xsqpy
zRb<R%MhdPyd)D5c;CXd>+ez;ZVu{=L4Ilc>F~vH#iOE^JBY$=)LnB7jw4E+oc_mVH
zCLm7Wq*JtC1x>5mHQmj$kwq(zpn{wE>-4VT*F*6BhYXfhdQ!-eDcu7eRQiH{m0P)z
zLeS_hFcHlb_KYtoG1&I$TyGGq?uFVp%{RbS+DkaSyI9>&`BENy!RSwV)YE6XwPi>l
zPu-2nKF_*6&!sM}1a@~8nk|;62b$R?D}qY}$E|00`%-Hi0jwgG(pHNl;~-=X-%8Cn
z)OI5GdYegob+4;jUrepB3keVayM1ekUm4AFuFr8{G)5mc%Y}-Z5IAPR{S8oW8sAvy
z$)wp`M+&>;o$-P((>|H5e(F?>rgymAaV89E8wyWck3n5@uyShb(MMfPO@CBrwKPjc
zUoUxLy+=-e9M*Ns)Ysu9w~{Etj6|Mb&ItANtefu>OBKA)+er|RAo<vEPJ4P+JF58l
z-qJ^vp;rqDSy0J?l78?X(!DAeOD{n-u5>z{p>Js@DR8+9x<*#Y{VN|^@xIh!C7O9E
z*;YUSEstK+#A_Ztw6>X}y}C%^1AENb0IzXgaq$D=w}kXtYlQy*gqk4~Y*|=Ik@?oL
zbSTH(l2$F!oNVN@XR7OdFtyf0+*`@9?Q!Piuy*6_@z%KAQ{r`;X)KplVkB1}hWqRQ
z?O!^0zxLl$l<B@3)8n{=xksNo1|z3WnEUh<<9<B&&G8e)4Jh+uiWfVPqm_fe!~LP#
z`HJ&vXP8PV)b(rn+=)sS(E7*5zqDtDG;3gd?Wh4WxR4eDvHUyNl6b@R+qQuvvCy=c
zSV;*Bc@fXe*z?l73;P~hrit%$mYkEgO5~l*jz=|m!$B6{UBxpNkqWB3e<=g5J!{CX
zpJMB6?)nnBtZnKa9DHZu2Qg^2lSL%lgCym?e&+|Eu5`((>z7G!;yrTW;$7wZ#&U4o
zFg*tqw_~BT<b_};&hZZ^WEdN>j1oIlh0)E&&u$ToyJA8I48w+B&-quGQoUNw-;-pd
z(SZh!3d5P=iHVnU?fFXzw{M{qB@W2;pD-z0ke;6YwXrXU;%SgeX}4>G!O15Ta?4G+
znmH$i(bcx?WRXVT0l=tjA=>5?+Fj(X1@wgTm;`ZPmB%G%%ct(1BRZ?#<{-(Fw02?M
zx-q5587)?5N0!^7c2l`n{{TvCdT*5jT$avqKG70jk`G~1&JHI#9-Onj&nx%ImW34U
zP$;+2<8>1olzpyPL<s~pOdo3Kj+rr2Xz*c-e=g86obj3>v5rQDc7;NrD=QJvM{HEL
zaq^fl=@PxWPDW)YcB=Ia+dkN<5ot<gXc9z{ZGpF;z#jPimA?gyWn`LcN=jjZwhlWL
zr%MzTOp-|o#UhM`kZx8Uhth>`aXHViY=!P5wP2EEWh_U`qqz3=r^}_AuuqlykOtj@
z?+kxB)Slupg`tDwL6wsO56?Is)~K|r4(AsQv;stN4p94cIrOQ!xU7ozT7J|b-Cquy
zjAhR5I-LGhT03Y`Nbh5YLLcSjus06J+up5QTw656n|WZ0cvVhj$#=&rJqL0sJB!%i
zo+&Oe!cnzVxG916vG`RjgzQ#$MdXIY2-G<Fl)v0;{{RW}_N>WcYZmh3Cwj2}p1JfS
z_7!?*QsP-*walg*7Rbio>MD%amO+`N-Lesw;AZ)qv;3*thhiB7(e45xoq#bs0zbm4
zTwDbQ%U}*RsZsv3+nO&gWocw5VL-d43NRNvs-n+4j}%ec?r_AR2k!ftIgHqo63?`5
zQ@8FnQ|(aOx7uzN${S{qS8$Q8@S|}!=AAz$DJXd`Llx=>^sc+$mxGtZo+pm}_Sb!-
zs*=R7SwIK$AJV#TczNS75v3j3m1>HWHzsx84}K0dm8B-Ft4Nme72I&;n2z8dO7v|b
z%h7FA!h}n=<qmRj{o&{<R9f51;rV2@ngw4h0J03S<I=LOKFw)q8yQW+@`4V**ncYh
zYXyL%fux~LSoz7-m04a!hKZ$Wz96xER9+*?9ITBP1Z+=H?_Qt#AZXUwe~p^<-fhhB
zFm2DfVCSBDp7pEn+rWA*jqp0_#jry1%JIn^!G2o=ag25u{VSOLpQF6dZX=e$-INDl
z$WJYjd)K8#G}4oc*Zj_!G+#V!uXJAchPn~>rK?RQpco{mJhHugewCwl;=c=N8a=(u
z_lH{LBaxaG2Z$RO+<p0~pYX3dMdI%r+}_C?kV!P;ypsR}04vnIGw_GOBg3g}<DFgr
zW?&30CebH6bpBPpvx?<W?WyY1x^lYI%lIkdZC78ITKHzp1&9Jvh1fy<^<8~a#d^k}
zbD(Ovh@7N{cx3sB&20P<@IH^>e;waXr`;voNL?7pyhfgYR2Eu9mcA|2F4zHYEy*b<
z<dy#b0aqGtn#W~3BWuO_E%vr_Z4*hhndBCMSzbKtJ$nBDTE7p%`>kI2Y;_B`tYWo@
zZCRwsvk}S1tv}(-&xyQ4@dn1%2)2Q|w#n$2KQJSllZy4<j~@p98~i=D@Wl2$IGX3g
z`rP^c$&4#4yc-y^KT<wmfH5Pu+Ib_Mb)!b4VBV~!RmMstT%R4A_ICJdccJ_y)l^<d
zX|m%|xVBPbnU@AcRv0+y0naKjI*R!-<2U>iQ{kt=4+Y$KUrLJW#2Vvn@}_qro0mJ8
z<Y&(8vl7JQl6&U6pW74SFT?MEJ`2C`2gD1dn(po<hRVv`P14CR1TGX11_wDf9DZMw
zy1$4uFB58#YZuoDmlraZmN365`VQ6bJV~C%4>yOxzj^#p>*#M~LJ6(QzY#oT;va~<
zGr#f2j3;ZG>)8yFVZKQ6P8C7u0PR_Dm5IFB6O`p)CmX%$yc=aZ<YGQ^kf-&jaVOuC
zpYEJ+YxB0-cV-;UPVAZ`SU`~zB33zU{ohaj098pD3=roItVZSFFTGb~2_aUv8;BcK
zaydQy>RAM+q)TrgaJlV*J!>|KOq<Ioi5hiK4jI&t2fa0JWoXvjrTJ8m7*UM-pIVH|
z47-rrD2vPCz~_IZIx!@J=lO_S7Ez3T9<??d$)u4UB5jy9(erLS{b&rql@VhZVdj#V
zKT+r^C~Y0aWQCi|Vi*R-;5t;I)ub7Yd~H1EuhN!?W3OXtWq7S;{{U9G!X8}>NPLw2
z#8PerLEPMw<EOnxCY;j7TVsR2CkMBu(ya?Q6~upMf1Cm4e{lQMyA38+WhP~2-SeJz
zAG_<tGAPzS$QYQ(`5rTt{Bu?rBUK@!0z^0&{wlFOx+IbnJI9v05k?Mi%`Fh@XBCMg
zSnd#j!)lU$O13RTXJn2X1RRFP81GgBg;6AN0z_wcAY}bMl&KVPx|0)q-i`g<{{UJ}
zLrTPA5bL@)_a*?sw<qzZG*Mf}Ab44Wa7aBps!NN8iZgOmV}>u_3-X-%`qXeA^pssb
zM`kB>#^fG4ikq>Lrkj|))o&uNmZQyyvRQ|>(w{6obgq{PBM&Swb?Qg>3Yyh!Eu{Yd
zN0DV)k<3Ukz>fJnDW7UtE!K6tQ!7Zy>9?q??<UK#85f--hEV7QykV`xy&UvEl}#nQ
zUShFzB&gi63?lsnGA4<XggaeWkWV1`f$2+YeFV1XKqS14w{|c`9X;w@*z_caODhu3
zsoW$i&PpgGF;3Y7wK{7Rv}pHC8+qjyviqLKnKi(<h+W-GtQm?Drvw4OsNuN#J-D_H
z<|!pxa_56Zqy*(y$2ad|O|gt`=bZ2<*Hc<f%4W6OApprFcvWl;20c5~BP515g(Cpq
zkQi~FdP!vrj})Yx>$H{Yk4h{TG!5)CT#K1DD>4kCHUj}t%<-bhZKvBt9o#UJ?*$}P
z1$Kfbk76D+h}Z*>{V8NEjH<~YNcaiWhxNrAs^N0X*OI%-B$0^_N0Agt7cMx@wtvnl
z3#-UUHunoAT0OwR*xB_y)d4ZvutpBM+y(%g^V*hcskSwlMTkbbnVK=29{Ke4rlOFp
zOl|~`?T%GoN6pVHKD4u6%BZqsLxHhAPyxW;AO5{VBrupvQl2(t&ioAaBOl77D;l{V
z5xfoIhD#slD6$yanc5~d63Tq64>1{Ve++*r5Sb#3n2C*Cy2`+fr~D}<ie6%cCG%X3
zrH9DBUrKYp^4y1Q@)7_k7&sht#V{p_uHDu*^4cYTF=GjW4ml*#M%N|P!7OqadSlY2
zwt@y>zUL93JJ=pM?N#mJxr6s@7E{b5k<mta&;)@{Zg*Bwj5gziZ>Oa_S)+X8%VM}v
zMnLz)BzO}nC=0{E^Q2x6xb>!%oJX5mg!4CH+DP&b)6#$>cp_95@yHmaT&O&p{{TOw
zF?9B~Smuxw-bs!|as&GTQ`<;yWmi~tgde+wKn5~8l6&X*Re51MRU;wT65-!Jr=TC>
zKnoIpH$>YD0--aVxIO5NWMtZ~4ant~y7u+JrB>WTu|U%%a=}hEp5Xrg^{5l5Lkkk0
zImY9Xe;Nb|7Df^7B~Js_pYzhAiCuv6GNhJR$sc%+UvGMIND6?AGlPW1M)xZLGJ}>?
zB(6UUVt{W^(xGCKxeUs1K_m{H>C)t7<CADiGhk!^(1ZRo#hwGQ7HzJ0`HxkmT*x5-
zZo!QojORXJ{{RYB70dS;gIvO~Iw+MF1)qm2*njovH4urBVFjXy?%f+>>OVTEE~gem
zWr8=|U`AP%qJ33<$0{;_lKi`Y8_*8oor9SgkwG2AZDDd%grKtR`Ej12qL{4G2$`BR
z3NYw#(~i|jJNTAl@-Bmd!B+}S?Ee4{)~1hCwY3W*+qW!*S|T~etrm9$B+D2_B1Ohm
zrrhO^si#{lv@u*;HQP#JB0(rz2#=>DnyGiG+O%l)jzjM|!5=S92jf*P{6jgDcK-n2
z0Z2i#067QNnuB6<iZyP`Ng~N4K3@DVCAe@$2Ojklx3M+Umui8PlqiqP>5j&-Keh-9
zGm`F%P5{VZ=}n(hjnJe-MyKXgBjyIJQ;|N_CYxP=z*v<eH}7C`oy+~wX=T5T)x_}?
z5^unWaz`D<O2fI-5=09+J1K5T9lYbHrZ%l?7j?ceIFJ_4BcZEQnGUKtIdykf*d$n%
zRocb=@#FFo*tJNs^@uIOa!K=Jb|tasO>+&Yf?1j-JBBh^kuT)mw1ddO1m`t=&7pf!
zq@P|@MuO<d!Pt3iZrffnoaB+#qPW*S(F4OH?gNrD$LHF))xDkt@^-i&o~I=KG{Ev?
z?Kv397~s|N6YU!}Us_g>TrBXe?~w281~@et)|bkAM_?3^Ln?JX)rlp-!79%xqe{aH
z%rY2#Dp$6;*o-m>T;QC7DX5|xnQ&js(FiW?N-MD>E^<fs(_+=6*&0G6DC~U3k@7(8
z%|mNxdv_)ygvJQM$lzdg9V%$;B$iJqUy*^s<ZwM|v?lDTKFu2&h*hEhl1G|bd8ut~
znnEP=ALilJ&T&&csEmbphSoU1=yUx&>0#2PQRQ0|ECFCi$sl#dt|{FKr_f05ZdkmQ
zz;S@FZs>gvxuo3Fv~tWI77k0s%zBSXd^%+7Ah?YSD*?5!f*5r_N}4+%E19Qa7X@ON
zAt12o52ZWB3esc{TS!)DZrzcjIUJD7>G;&xB?BxVuRkg3r_|NREL0KZA#yoT4lz^z
z0A~?sXWlU*l^cHX9h>Rf>MA8#2+}lU%$1p)ytrk|YTr7P`~Lv_YJ%e3?gLy+GM%Vb
z<R>3W=q_}dlN5IoL9p@}P+&hC5&jg>q_T$J7*8%e%uh$oJ9eR0ribh#W7)-VdkD9M
zm`WF`t_b{TEiB=H86>xGh0b!{GMx3TzwC2y7!$~2hdJ}|N8!gbjcbX6&Z@5CXc_7U
z86NaJOh%~8%eT{JEhDxg`G0ef#!0EpkR%&!8)As^2^_n65$Ri&np$Pe!mP8ZfUqNA
zA?>@~t^WXK+AJ*1YQ#pQ{iL29iNHWTE1p=!o`&(mU21bynqh&Im2Wkh=8=vR4%I*Q
z9M6TiKW6hL3ml9%2dT&&y{mn6<&8m+IRh%LIv;wP-rf?WUM4L!`neDAk^cbd>sd<^
zIckfJ8Yswz!*fPW)Tly)C0wt{z<Sk_;TaubFEbDcbSmU1&-cBnqKf)B{IX?@Bah`#
zE(qt}-kfftX`M`Ix#J;+pzXzA@fCZUsub<9&Yc1)J9*g197`V9q#SN=dHgBSXjb-6
zh%A9(+{qwq%ahv&n%(o6K(`Ub()nb>m;|8ucKX#@TS#mnAW6e#1-j=yr6*dXmgDwN
zT?lS;i*YnhYa+)HP-flFIPFfdwOQnm;Su66H+d_C82+^8n&bCzErU9T%+e_zBAR5r
zSw<ggQY3Ay8jKyjxUBu=U81%ojRmyDq&{Oz6i*->vBoplQkB^$X<j##7YySeQF~x?
z%|OyKM#?30cv~+vHzN*;qu>1TPI)5|x7rn>3Pxii=IA}U(z72h>x=ib5WI3>T6{{0
z8D`s#aZ2}LVe@U#<xmL;{7gMQwG1U5=WLe*22F*BLG<^jBbAyckxXh?j?mwGBfT7<
za?Do*qRj=n`Ma>bV9PJFQ)Gt9HWH(lyxBQbW6KV_b`=G^#E&bMh=90YxyPB#4L0LZ
z-vRQADT-poCr`dH)O%2%?mL!YWcktMP`g6~$0DbDzc9RLp>{{OZaCfBipsOR-ETC>
za+Avm+^B=8Cmvb)b5PvNbXC)78ILOM+4KB|>rauk7qTJOFXLwU31FZV+}S-jKU(GW
zOU0Ct4&xwyx~=Wd)$LzW4;c}JGNB=yfrZarJD=rPmk3z2cHj)1&duDP<zCho4&e*5
zd3cJv(y<)P8UY$M_AR-`bsy)oLap|@sO{izts{kIKX;#RT3g0(7RcBm6M>)N`d6#|
z%>Mucbzc|jmin}saQiuxRXoJcnhpsc=bH5}m`UO)sH2WjNgk>D8-C8;+WOV4%&-qR
z9enVK%OM@jexUpg_-h}9G~eux?8O#^QT}H6fga<vd7tdN@H*GSHqyr(h>awHL~ksA
zGWw1><DP5j4-e>YX}V(R@Rwqreo}s8^{=CyCrUofpF_I~PCUHQH8hJ%s01bziNcPa
zmC<R|B(lmQAf6bGl}}5sNQ${$ssJOsZ&<(~M^hl$MsR(7D5p=BI-TW9v=Igi%JYrY
z%J`pG`!o$5t^#h{;Qs&#u9sQ7Hn#7*Nj!lW9Ok^2;(v@AL(?uUe6@Egfe}1o``NCl
zRMeRgdf4*M+E3zy8f+8kcFqK%-HCKRFFX_NUz@+Quf>6{YOSO}BgDH%FS|J)^TmAy
z`(S)^io{*KHwwk0+ad#jw>*mYW5oU<9w64_oVV^qe1Ka#p1(@t&GC+!_B7wA%~7O=
z+C0<T8QiGy#?)dstr%pQ8))MZZk64Y$r!-wO;WcO=!86Mv116~xbr<KcpmA?%+ZM$
z0IFA^`q$2KnW<}X+ZdF_T1Iz_<}5Y=HGOA9^C$BrGHo3`>kmrClH^Nl$s~XzE?reV
z^0!0J^r_&wUpzmaaku4!HhJ#!nr4b<->?Ei5UJXyEXBKLwrbcxZ-!;(Ic6=Kam8fl
zvaH0YV>gy^qB1}O-n7K=`EoIw1>5&X<S;!egAqfWomA&!TUob2<pEO5g>3Wnsn&9j
zx)k!x0Eo;tZDG{?YcZz1Yn2{YjRK9V$@hMqrlhxN{N{}|q5uh!Z{qf@DPXK@s*~Kx
z_RbPPxaS~&*FDB+C6LNIwN1iLl|bWZ^)yJ^Wl0(LK*tXvpS$>)jHzM^z`$qb8Rs3j
z^`YU?Lg!_B<Utuwz-{?)lb$<QGp|@dB!Gnh)aMw^Pq40{Ye$56GLO33mN!2)KAyE#
zQn4wG+mMf$6M}i~N-%WgawfUa<{Hk5>dhm?DlvR)-GlV3d#gz;*^KcN!27M#8uY9E
zCI)rC)So*EAp+r>>MNPlbO42eCjS6JJqhbwkf@}OHmwGo(aA|3&iM8wm{p1NKgzZ*
zbdwv9*6cX>Se`zWLgLh-hb#_H09L5xX`-o9&JWi#gE`4G@(5B$!)F*Go42+z?L~wk
z8B@gpKpY%>X-LN)gY8MrCmp%Sr?7<w1o8$tgHKrsjEs8lYCPu|8TF$o2VRv)iIzUq
zD=yu@4E@%mXWR~0<n%4r)LF+<*QFUCV{U!@DwKs{&AhCQgD44*NduK{YMKe%7`c>z
z-vX(t0r$A}%}8Y`F}vkGYPS)m7OgyNV<JUS&Pn^(_p273BY2f_BYe)=qb<XGAMvbL
zoVEhUN`uBnB9$D5`AGSW1t&@}+@(1!nb+EQ$zaTi31o|M1vvq|y=z}h@oP@dPSau8
z^1+vL4m%H8^Te5cZz5I>2@2W$MOlwpx)NeDgV8`852&msgoKvIL@_gt=dsvpu@(yP
z5x9VIc^>)ot*t)kXN;SSsyW&L##a^MnrDl(D`#Z;Np6IVzj*rA_LJk6c>sAF5PyjA
zySc9_wp%;56TX%<Em@wqXDoL!1dif7e*~VNUw?X#v}p^hDU%o_A8+0y{{Wt~$7o(E
z(&36m^E}zg10h4gjP)PNv@Lv5Y^}_@Vm~wd-+SLZg?V$KQWCX}=+=am=R^Y`F_cow
zyhapZhA34L6oe=soNgy2eTk~NR;?7S#V(ha_Xx+|k$qR#W~?To4Dqj#3V`ZBldj`f
zxXEZ}r50L7hE~`@;rJ=LlkR=0TZw$$5;MGl3}k)Nj9^xLa|ZykAS~NiKZ^ssO%#bD
zJ-OaUBfoR{;-%=y+>!wZx>I&pl>jdSu^Ie-rC2EPK>LsryOdMTJ5yc@bw>(cC`Sx_
z{{Xgo)vIfExPP3+p$6s0AD^vEq*5z18-oOFw^+`32hh`&)<T9vXz~0C22^9Nf5xuH
zk+#`pP^WfZ9C1R&ACy)AO71S$9gp;==Vfvg&6B*0uqa}H7h(56J*kUocM?ALLB}{1
zVo5}+n|S=DQOhyPlm7tM^rW?U?m<_FYoENo)Ks?0<wQ4D2;r98JbRUMBOL8DV5-Wy
zqeMoG3>6p++weW=L%K}B=+R+w^ABGB^%}-uDoiR>fzICk{{a1JhbG5lh$Xixh>?^o
z?s&;Obj>0Nk%5{$%v<GEJmaQ4s=_4FN05pm{{WU{y6*P;DGFe4LJo@9{x0PEQFazW
zDv2Wsxm>nO2FVNQQZtCo`6o@RcI{Q+55Lx%6}%R}rdgyXEh?T5rYgd^`9VS=WRT(1
z68`|<NNA0tnl)E=@SyOx!9QAHk~ogRxHx>3W6*k1Ou-;&ZXaVDg^csLLF9o^h~bKG
zCVWa*1x7taGeG)}3W0$z%pJN(yq%-d6ilp<$qac}HvGP4WA9R1vMs?0GkJk<yz%t<
z{{Sk3&yHP^m6Qf0T+8>BhhzOaRi-^jAXoEzxNjC-o?`4E<Ji-qn&lvo;DnYf_ZWPu
z&*)7;Wrk9QR^ll>QoIt_=y6tK3PwE88*bvHa4Cj_t!}QP$cHb2##6vbkL(k^A5Ze;
zQ}>8dm2Uq4g-mc=hs?^#GReR`#-I)@lt*fgzcJo-a1WvPrKrX*iU^pj%Flu&444R+
z?rO9)s}q?Ma7P#}U-x+S_p2`VcMBv|s;?MKOXes)QBcUCt$taT4BJ&Rf+@5uE=acl
zVQ(VpJ*VU${eG0OU(Ia!jj(tun9tKc;ZaQ-i5MvYwDJD{t2pDIQQn%`Wz2YMhYKJZ
zfKR%_{{Sk6kkf3N&s7qjmnukX9tP@iN4dd{ZJUqYBjwMr>}g<&E~_j@uRhgo8*<0@
zth+$@RPes_oSI0qn<IJd1Vy8eAc%7lFU<Y2xa&;vE+s&)+rIXEFgU_hq_=2W&f3iy
z46)DYOS&-MX@u-jI95Cldd<qka*_EB2{?qwjy*{o{<M(kgxq=3!p?=V$lQgiqRmw|
z$1<xh$SlY3{3+1OYY0Ftg0mbse(mY)T=J~?7NK&SmaiPG4eAwQ1IL4pm)4&QSa8h2
zh5_Mtt5+AxFlE>blJK$|e7LI7Tn3n<$g!~K7<Q;tCdT0uNgkfE$FXKqXU_5t7xBkR
za$6XnXk&$>Df2Xdb^23f)FLr?MnGJ#-LzvOn<lg)jgg-Uo{QRus*+)NB4oD{A1WB6
za(MFn38j*A60emACSm0Oqmhqa@v0AeXOTj=eTR1CI8pV-dZTfvyg^)Byt|x*+Q1mc
z_qnc!(44n3bz-(OC6?Y|=*&}Y17MIr{5#WawFdM4#j%iQJEiDPu4<ICvnXi`6;r$9
z<38T?8Pvbg$}|Q?E&Hx;+r1B{t-i0Oq<d3pT}BkkB&yut$&L@wqnh-_>6o1PoFW$B
zah`s)M|pQh+i+$dBZI&_!5`M3xV&hIM8uBA2X7lO)X=c$G5c0oxYTZv?RRGYe2Cpt
z{{TwKy}sIVv9NiL7z3Szbw7<qd3=D77!BWb_kHTdztw!%9w{bN8%A5E;qB>Nbg=Sk
zL~~TH81Bd4YAvv))*mt6Pdk>m-D_D!KWFnoKV7VHLi*rT`lh2Af)Ux64o-3puoX_z
zPy2Ra77k=!UVLM7Am|66uUdv5lcuMeTM(tx<aO)m%<{=^7nlJX=IdPL>&%JdOvjci
zPI1ZYU4`C(eX6u^L1a>IIhtsR$L_{`JNr~$@T_jGZbNyj=&QW~#7Q|EjCVX&y-JOu
zta$Y*r!85-C`H6^1`IL~H?O@tZKd+TkrbSquo(JRcXjaY%Fz-Q+-Dy<vEaq%G2GTa
zh<r9|txU4Av}6}aP+&GaJ^ia*R+Y?@lR2p}t(=w589k|r%%EU40Vg@?YFR-MD?05M
zEP=Y8rAP8_K`uZiAqneEC1G8cbodR%Ez4sg=2CK3HMyX8Vf8DRZS@Oje4#GT;qX~~
zbJ$ijg~R|6G8fJRNW5)cc=xTiyjr%_;be_tXj^)cbCv8*srIbrqtLjd_dV0$AH%Ia
z#s)?)MuOnHL8LoDIO=<60=<{v_Lt$!F=Ltm1aB;d&wLCa2eo|3;Gd3y&eiO7D>eDk
zY6U$9ax>KXRefvYuBB^hB-(Sx7DL2r#5PAyrEtzQC4Dz4(Yf|S{{RrYG2yLJTfJrC
z9%KPjNWce=p*;HZt~<p40JY7Xycbux4~Rr293)anCgmh>p@}&lcCU~8Rq=~o*V$v6
zRox`fh^Bcy_S}8LkH_g;?XItRa0|;c@uYd(ZzB?_c=^B2ddXn9mE;#mpGNrG_S*4&
zp%dwm!tyIVB)QxXSB^+uuW#18bH+a!yh*QWEb;0tLvmP?$KmhmT%FzAmyBeV)!sEY
zxQ;*hZSD_Y?Np$)yq-B$-H0lgQzxc=?t7Z(r-q{iq7!XPLe2iWt6xl$T_}_$L1{S*
z4{f~%)~m?`mw-VaY$q<N2@Cc2t9~ERrqyIyiQ|?gjQqT0ll1hi`@)|OuVW5K2Ph5N
zI%G&m;~t*koa$4ejUi5T8OG`U5s<-&*vK8QtQ3PE_~N>&KLFiX#FDv@+EKMcCjfER
zo|V?wcxosSmP=X2IGNuV#(N6WiqRE?h>ZNl<r(eoToc7gPeZz%8Zla&_Lt#%eK6%A
zGJfa>-rWzet$STAdn;Fp&NMTew0T_QR<*v7=A@SaOCpb$fxz|8tz5LxP1~=PZ;0bh
zl6K)k9@Wn(mv?7OVal{H{>415O!1sXpp_$`^`bo}1~I8t1MeJi52bG%I3>A}r7euB
zZ67i9{3&CzGazIlGPn_vnFM+te|l<Ye5}QNGDQMqjW#Or^7KB2ku>y3nbz2>kCr_A
zpn8GpT^ib3y~mRxV{ibD*zZ-Yt!<(#6^d;cjhJo*w2f5QoKi7X&k%`aiz4N=B;%d9
z{<J}*g_=*a+m*tB1kBwBeAc3=f<~Mwu>csbFcG`)QVEs}Ts5mVp4bKOKqINGl-V4p
z$W0P4x;2X9YalG?Au11{qDvj8?B+ljfCLbJQP|b@y<o>=qA<_MBZ7XFT*-MI!E0$(
z=TfpXiJjl!R;0*j6s|2Tp^272!Ge$geWAZ9&+!J29NJUcK+(HMnJn2QeMdF20&Ut8
zpu>mhQKghEA$!Cj0+t-`)ubfTy~vWfJZr_4=$BL6Ha0A4<i<x+-{>oxOHyWGDJ!^d
zY#tB$KT7n^7Wj3sCES+G=)~bwK*;O~J*$J%EH9#-K`pZ|W4R<$7$ewwSGh^4!C3NY
zCmB1G;gw`8?*3U)0c7eI+ZFZ){1c<%J)NcekzW($i11){!$^RTvUI`cJb#F<kne$5
zO0BU0M=XN}71;a-_=7irJXsd2_E}_#LWv^A`*tsL&+_)JY<?Tt;o4iF!K>NqexZ2Q
zOAixijPQdDh8@x&<#?}<{xJ9zQ(L)k43e+U8m|Sq;9|a%_z&aDKN#BSZFzFd1N`?Y
z;4x_MKpTf%d(|I}Uk$YptI4k1X)$>_w_7r(<qtxA{j21o%^C7s>w{2|XT;ZfCCv8*
z2xA6QkCnfJ+v`;2(xDPbBt$HO0pl!k2<kxWE7E*j;CO9y`^$DoR$)1LK{&>G3g)HL
z+BW&jZto`4A$sGcYiQynYctYOjP;4jPhoDZERs+i&iJA~cpQE2rAnFvA)K_5Jj46B
zz{u&3>s<rsWth$7f+YYQ-+zzc&!r<+Jc@Rlm0k!u4`Wa3Blbr<4woZM6UT2DWdsF$
zWAXJh92z`!_UjxGuG?+Ry?=uzq4nmvSak62o_Jp*aT<|^EKfYr+vrLV=GB)hM%F(4
z$9ji}8l`iYeK9Oj-5|FFJo%C38R|L{R%Fqcty<DZnq`s8p$*SIhp_gpo*g5~n8_?4
z`HQ#9Y;Xsl^{FB7_3X~+91)~DILc(O&p4_2(l6@rIeB#Ewvt^=_TEU;L>4Im4WO@T
zg|tbGgz6CaDC@k)8-`Qc1HbaFrY{WLY4=`9o<@#yfcGbI=g<T6t5ImjddP)Tf&1lT
z$@;IMsCc9`hLOiEnZ5)_<KOdqrNGbs09vCS9+<zI60s;tK0k*Z-RrKGMhOs<&luYw
z=)5<v_ou<5L`awb7CvE8e*1S6eQF@E^4R5vhGmi;w57nw1S*9*lkL*1FNch>JW<MC
zZWWby+Wn8UbynIrJT0(RZ0+6AJx{$}x3h_pb=|f`IoJX;gVcR13Ygg~k)&|Tsm$5<
zZKWpK)$mIG_j2bW(W&p@Mur@D3c)*LklwlNU2K*XhTU!d0OQ!Jf|I8tk47Epz1%9Q
zT67*+f0P4{Fnd=!#MOG6eO{W}=0}I&mP3`5Ru%d8FH`JkviN93$t}cc`CpM@Tq*a*
zt#uJEk|Y*t#B>heHqq(tP#7c<d9HwChHyK2{V98TtEinAbTB0F<VhHftnlRdfQITl
zIH^-hi2mwiP=SFgqXX$%2F@pai71zVNmJ6JI(@{9ZX=ZhXaJTLA9(su>dEfK?2<F4
zf*`CUjDeqD%Al4A#Nro^aWUbCY#ztnwqDSqtmozuzQhU8FdTv@CbAD|<%*<;#3+-D
zk6(Hem^x-4vspshnN{O)hCoj~#L}jhya<(98X{TDpU0kxD|l#1k0t6dvGRaHkGOru
zdb1{oks&V&2;zxdosLf9*FJ;NpF3SfsTeTnK5TwbaS(2S$5Zc7+-UGBpE^k6&PT{d
zCmrjfniq5BWj5dt#Yg4ERwxyf(ja6GLwSpkN2vA`Dad}w7|Wo^Bx2z#^SB@NYBvBl
z=A^mNKeOglo*@v}4jg>R{{YvmxNK&XyvuOjXj01R4j118wL;lxkuOTf%G<Nu^Xu(a
zs>nT*PJY)#j5?BoZ<xi1@00g|{*_W4BH1nGNnlk2CPs~LId4wcu9@PE2(-g2j5qp*
z2e;OnJ()2fNXbQQ&KL}zW9?lLt8+I^Bbffng%q^16&(v6qy3t{4TYNn1j@?}%z&;=
z=Jd~MyY@Ma&~=M>&gLpd%08XwOD2L{z=kR_vvEH$tvQhvOGIYQh$H>XL1Y7P1mu(L
zQHYW>=FG4gfeHXCo~`adtN#FDmmsW0R_O~M=hU21uAbXfZK9Bp$K+#^pIWQMY8JUc
zL1-5;#$sc%Gw=!Q2dSuUG{?A{UF9Qe2=|1^1K--U#+|&0B(rIqa$`|}gZ+Edf(V2{
z)_BTqY^02}9PvyXZgR2dlSmm7+$v;&AsG*j;*w22Y)WU9K2k@@n9r~k)UJ}UL>1#Z
zvPmj&$F)EEF`p?SHpvt#5Q8i3Df>$h>70{zahBzkhs;XmGQTblucb?I;mb>F5I)Tz
z+E~WvA=;<Z59wV}*f=fsH!@&0G8hhmqmxZY)NjIuA31IZ;Y-^-<hoWl*z^lOEMI-J
zGo&B|8Q90^RO0Z=M64>T+nn#W&&;ZNn(0NFu2NmiChkOQoG;V4sZE<e@?61gRxd0O
zBjA#MyH)LF++2v}(?ob;HxSuPy%?3Yak;jR1E<%x?^mt-J#H>U!0mJj{#Y1hZ%<*(
zY$c$MMh0~!U?Ag>pW&x0Ya2$TM&~3lG3OuN&%IKsC)7Dnn?8eNVJgfP;BrRZS%167
zQY$R@e%#1oo6d}<%)3ugPfjbKdux{qZ{>Mb@nw;T+~oJ>pq3k-IyoYU@yX6O80%FT
zNLEKXE{kkPh>0>uF)BAGd!KrA{vM5^CTL0$q$3u_&^qT8&_QYlMJs~NdXb-cyfnc)
zTZ|wOFhh<=tv#fWSu>G+2nI4M?Go)&R#HLrQSN(FZah4(sb@z*ug+g32V?JDHO8K)
zB&zpDMPeCaQ_38F54|;Qe9*;W`9Rut4B-2krB+OyRC3bjDzUUMp<HCQp4)_(=t2IJ
z$I~PclQaPtRf|c02h$zvu8U8EMkBd_*;J6Z>x0&*%V87Uizp$)Wkwy&LKE1ZrCO^b
zOM*GS>{X1$9d<MFWyVo+)A6W3vl38U;oPd_cCZ_m^vLuT)=yy_oB526$g*KsPF1+%
z{VB<!y|OFFn1Qm*AzYHA_V=q*Sw77ibNGG*iKA<xv#7{sIRJLu^s8EDg{DblW<`>H
zi?z{yP(FvJ*0pcm&fUqsj7E}55G;*@j==qEq0_G{EMQ$nR-GV?@T)9?<-qNZ^-83f
z6H!RW(tHD^!ehO>w^)t3{_l^J5_+Fn=6pwMYo`$_N(^#LLKstNayySfT@Q<XEkR*v
zJeqZ?&*mIPu#xhS{>kh3SDorhtZLe>Z;6gLlt_rg0$BDQfLF7C%duF8&n0M{eSAeK
zYRho6@xjpiNfp#erDL0X;YLD^;eE|}FNOaAYTZ9T(Hh)Xd5It^3M`q}$EgRm(!6F3
zDI;W88&##lNg&AwlUANMAc#e0a~z<CmQtv4PoVY{>%5W^db=Di6yHOu@xSdK<1Z0S
zHM}~Mw+A>$*Ml1W0CygsabAC|YPz8jOR4GtM{9=PZ-N4$=o=kR@~yb^<;2E&kis+$
z^9925+v+MU(8jGQ!4Zxhzdr{bLEgJ*<#>8j`BK-pi>)^+n09_AzmP{`6e_5NxFdyJ
zbv~xO-{6n!x#Dkxup2!x*4X(`1eQr(YU3COj)uH?C?T07)Mkkzh>^NYm?zU1>S^*@
zX@XtK%GkjfPreUhT=lY=HR-rWuWavjd*6@$0B=2S;tQ?xm)B(sY>5nRe5lC#%s#ww
ze+*{0TQ7~*H`j)1>&VPOOp{6^+@NP1p2z$vflW5T1O1t6cz|5;*gSq+t0TldAC}uU
z7B=kAD9nNxK3NIlcmDudxWBOJ;i>zhRg|QCIp80R_7PjG)(&1YLJ>>gO5VBjuV(mb
zKB4hC`%dt#iyXHXchc^@{pLc)j^9sD{=I&E>3$^fmW4Zuc5-1sACyn-%Aa1}k81k+
z{t2(~-@v{M_=y&g;|)+o_wkpqySierjiiQEC;a1|dhs(H6tMK=QX1IWGv?8sr=PRm
z?D?Vib566r)Gbs)5_7=$<Q+qI{C%t0;$1IHktDUYirX!?&QJ}&4ujBFoajHazrz0j
z4|rh>^tRJnMHd$FObVj<vF<zmJ!`-}Y7g7}ZlG%q1M1e-9&CTRF%OYA!0Fn)QXJEF
zOH)fb`5y1__x88&7l3r<(CjW`xVx7iv|tt72Y!Dq{{UTld*knhR^PSHh?`h#H6gWk
z&y>*Nl;DEFvBz*nar$(B13m-z)8h`WZQ_p~>!F92=cIBk%H_x)t`9&u=bz<YTzD(t
zr-ghYr!;mpaI*wazhJ>V@mfN>u=4kQ;N)*}^K;_2{1Q^)<3yKI(I#jM#8w#}gkInd
z{{T-)__yMBz@HQRGSzN0?Q=&qH@5PK<c*lJN~0roNaP$7yZK;&{SBs(p=t@XOFik2
zxgZ5|^sf*7tUqF31AJ5P#P>1i5&g0lnc}$?`EGf@9foVw!sczt)j?|XXW-tfwsBr9
zx<c`o*XJxSp!<5C{<ShG^z|ig7?{)s5uw3m?laoGH};nOnS5pNYhHM@JA0WG?j$jX
zUH}B0j7JNB)7KT`G3ok?#vGwY{LhfcbGz}cdJ<EO(5&uh{{U)RhY{Pv0`3J-zGuhR
zxT)>@R**XhBaPPLPy(D1n|(9WHIOt-NIOXkawLFdTdpWy3u?D&q}sc=VpxUhJwU2y
zipJ>phApq0Tj=W$kO=1o4Y5bptt|dNwwKN~R?%GMFcZsAtcU%hjz_g%+IUOE7qUri
zw(@!09qzaoAI#LY-WR@UXN_Xo%r@+FBaz;kgr7k>7mto5iuyApqO1w?N~zU`KJI%8
zmLD8Iv8pYQ5y2sKIqROFkyuwA5!S)pwybh8SRCYgRof2-Yu9m!AhsY$(J{M^U#X|b
zQu_<tHf+8p1(rEePmS<Tlq6reeSW_6EI$&hB9yE)C77H|D*(if_|Nd>pwPY*Yg&!M
z#i^i-?gnt9=TynY-+yZBtUqTPlM%RS&AP~ca<c;29;Y2Bw7QVlj~B%K9j%4^)}I3~
zc3ER)7{^6*AIut5@z;hLPwgg&;=7FkOA?WZIN_JjdW!0-e`nn?#>#Pb4YHL1Vn$+2
z#GVN?E|c&B;p5z_S9+B5T}L1@BvRryn12cHf!2ov2Q{T@{t3Nbu-n@J-dQh(00W+=
zeQM2(w}mbtQ#?lBIr}>Y%AwCBgWUSpO5YAX6zF!Q)Z8R4lljt5xUnOl+vqxRz^`om
zlRw~`9~J)qY&}jbOT)e&xYGP9_JFP88};(l;>iTW2Q0@J9ChoCwVaxSZpo93H$Hlf
z*TJnLM{T4%$CiLy!)!M@sp#BSaUI{mORo#2nc`c+YHgUS+DjNli24(bI&?qMzi|Hm
zWq<e~r|jqO)4(J9KjE#l#-V!`m8k2UAe+p&yBIn0%%62m56Ykp2VN`l^ZpAH{{RG$
z@bB#VVW|98_#*&)JrSEz&><KbcXH7HIV+5Sc|7A86~#{*O04-(DiY>NpAVfk;l=*9
z_P-5YT8n2;w+NW|q8u0Y9FBV&R-S?I`{A7WimkVaB4{nxys^l@?|#6yQfudn^Ql-~
zO%=S;+ba($SU0jZz;m$rjEv*dQT?lYf+w}Qlq@51DU{%!TIg_cS~AkJKGxKA?+55!
z6@yOGE@7HSZG~e&z~JDFR}10|E-TrkTYGq&WjT&5yaqivubbQA7mNJVllxKA2XtdR
zqhqM|sWkrpiJm#JV<Kv=BQeaPZg=4E^!zGS2NXBWBk9iuz?xl^-Il4R$2&A3TM35^
zo(@M`bjQ6>zxY9A@dsB=wQ1=(#HY)#RoH=X%QyFqd;KfG^zV&767=?Eigk9C!N~_X
z?cTaQFZQhXgQe;w?)Dg3NJvmE7ih<D+3J3rdsNDmRjf;cOLN)d{f_k0VI|M@Cgph%
z<(63+Fyo<29y((k4|?;jAAAA0@K&)h_*}?G-)ni)7~|uUj+pfHuH(RewqBd8JeJpU
zT&yeevN#!YjzI&c9>Ttd_(Q0CIrxt2Z9UD4%XmaL5y};tY5pY7e_rCa>Q22Cd94jq
zShjots(4cN)f#D?aM>&tKe_IB;8ZqV4%DZK?d+nqGL#I`$Ir@o5$|8E7XJY7PG10c
z>d|#gC?qlk+8Q)mH`CPpd)Gg${{X=uHA{(vnpK#1G7(l)^5iGKBcS^5eXBpMU0kT*
zXuZ+-b9La^jKD=COK%im)cIw;W5ay~BKSu3D|raAE~T>U>B}!-EA&@c{{Vtd{8-a%
z*{t;VZBZw5GhHBdk#oiZXOB$a^v!wKi@)HTzZdK+<dQ8iSj1T@7v@suji7PIar)Bw
z>R)T{IxR{{==i#S4M3s6gJSIg{KhS_j=x%P@bHF232BB0<y1KgG2i*u(0(ZWjQ%g^
zBtxipHuMJ@P0T|IanDoK`s4Jjes6+aF4CFS`$4&liw*F!M}h6f@}%+CT1w@{lwU)|
zhlORi1I%<;l2f`|lA%v*4)rT|TKPniTidLN@qppfkO1xlda3Y*-I<8qX$4v2D;kLL
zyWX4s00^ophLYLAQ@F>EnTK#HKeQ?$mKrSb`FtlN<`#H_fu90xpCaLNgYVj-m%)NX
zONpWg>e({?00>`9SE<F}WtR0;DDj`1LgVGnap_aV;WYAEbVG(>uIB|;+Z8|Bk}K+q
zvE)O*(j<=+#sq;saw6#xo{oKLL*V<kp)sp0jH#0<r$h9wT7L}2%2Ue(6~@pxAbOtS
znEnnR;^HMjQ*h%M2e_uQOYSv;@;sU!2V6*F`yL2s4ppP%j^z4MTX<p_gTz>cZ26KX
zz>I&5dadV!tdQb%K>k=D7AiL5?`Qeb)51Po%yBGn$%urq`7z{1ImaY&c*!4~X&lWy
zr7R2Vc{E-WkXyabxRK+R<c5CSRjGU}E*S;8k10p+@J=h#)4<|(X4Rl#rZUhix@`wN
z@lQS#m_|O?DsA$)UoQ+4cK0}?{ieH*>J0Jwp9u*u6n2aQaKqk%;Y*OB>+I~QZrk2X
zrx?aDUa@W9Xl0H&h;5}^`6XHM5qop%S7G>ckd?WfCIQ)$#?SJuIv=5@{ihYw7GEdO
z@u_?zsxUJBlzBl(M#c*cr~d%gL>>dayMjCTqH_>-Ezc@PP~E_<af9Ld{E0A+%sD?d
zTz`dIkHE<St<i!vR?5Br!5xVI01AhjQtndAC)n@_yalS>PU#)ERD2-JgP(EjO}Oxe
zt7j7{*-HW{>{yj>`-gJg_3v%qc-3RJxw8&T*;$!!fO~P+R2qkYKFK7u@wgzI#?IOK
zPjOHCQUZB%M}wz>@1uw;)<wQ-1!Ku1_r()<cKQP&-`PA28xj^DdmRDCO7}SY5gc&`
z7Cvh%pLsaI{`FUH2r@|TBv{|Tc8n4^>yGCXzqKP_e`nb7XuL0RdorYPp+{W2igMAf
zy;r~R_4bJh$#ZBBE=q|8cMp2@#PB3$StLtkVITn{f;<`d<R4Hfwda9+{r+?jjHpJA
zX!FPSzt1$|na2Brz-V~D(qz45gaIT6nWkTq#q51?QLdeTHMf%;#9+or0b(VJ^yK<i
zu-$w*wTc04cn}3)B7B=y1HOCyH2HoVM|#qh)AG*-<Xd&wyB!F}YSCs?`<eYhO!3d`
zOXAHFS-#S_2N(nEO@~RioU<*wjuhcS54uNO*Rx0P@h=j_IIU(oW#0tMyh$c8fPDwO
zAMma1C21|LBEv>=wl9&3lg>||^zTh(RQre2BzVBnZdTQ`0HM}0e8~3n0;RgpCR=2h
zYi2OJfRmxZu_HWJt;_KDOr4{<YYAg?eX(OZNF7@Pu4=P*8Y!I^>60He<(1_O0u>!L
zj>Ofh!VI6NyB=40p-Zt^L9r0<?s3|e`x<Fs-v)Aku#j{3n)RjdcIiq-;qe?YW9<>$
z0Q?Sw9@+GyUkIZFnS#pABMCM{2GR8Xp48SlB)k(me&0!+Nghe(5d}Md+IGLG80koK
z`6D=rCt~M<d0(%!daduno2lgy$K=Nl88Z2K^9Q1jYO0?PjF)jUK=MT_ffhwj1WkjM
zZ}xbt7CHuR1vAZB$)9W_IudfS=jC5h?@|jpcV&{@h>W-24e8hQuSSRA)xEU;0O<<%
zuHl1uBWg+Mv>t#8ZP&v{uI!_>xQ%U@CEXls2rPfQk@TVCsfl3bd8B%Np%kq-wH{iM
z+gqkTsi)mr&0@;ekT^VS2)W22y)Hk8F*MRe3{Xz7knU3;Wbjk!DE|P3c82U~DQ6o7
z$CQdr0Ubf~qx(XbEELZ(SfYKmF?_CgRB`t}{V7C7RR%T~$q_IZC68?SSE8@NsdVSK
zhf|#FeX>5t@PIe)XR-Qzl^xf@_uMWm;x=%g+FE$`Z(mW5%8##752;M^yI8J3XeEe;
zM#j_7`qZ*OSsBz~H9Oe|=N_C_pxb;mX0<YiM&$*Wn}CWBZ&GQOzYk{ALp6o7NV6yk
zu$~l-p^v|<HH@U*;q^L+90S=(@r(3jMVX4lxN#E?Ufk0cPQHzq#3nf+1=&c>2Xl(_
z%WnihZ!~t2y{bH;%kpO#5&}MD=joi(^L##;0~?EWf>uu{7T^NOkGkLP<JO<n;2%_x
z<t?V($s5FxBPKU9ufIxs*0Z~rZdIdVflte{@I5Qj2Y_v_Wmt?+nZU?LB{$=YHr}4K
zUfaMkOeeRwjNFt1%5;pYM03tZR`e9sDw!_|&pS(YWfM-j5>Uw&<;NqaKAH8VC9D0Z
zOs}^DWG^Qj`1P+qlfo7kH}hI*mf`I!V~%TyQT8wmmD}~m{JPb7{3&xCwAasSL5)6G
zp+Ln5J#+N!RIwEAt0(I6M+laME}G8{;J?ct=m)({s2uNB1#yB0e&3CC8i#}ht->Nj
zDBJ{&xXB=lll09J_*DRw<yb055pF@+eF)>J^sDyN`;+Wsa}lE<`IK$R6GX$3x$RX7
zl#lrNbF}s%yG8Jv(U>5X@k3ql6kbN=lW!;d`&DJ|gs!`0yo+&WXA2o3K6uVLaoUe<
zPq>{KoPa6{#_}8kykubJoU&nx?C7~+jH`QlQb#A3C&;-Dy9tnIpHZ4%ZKxfAVUh~x
z7&X<g&OQ9Rg)DMDY-jYOWI_yvP=~B%CkBRL^1P3MoE1F)*+3@0Xxxzi;I0dBGoQwo
z1k)-7MPK0rpL}vDW|0C$k$_5a#ZL!4jW=^467Vt6he1tdXUwRB?&W|VtugLN<w-Bf
z=uk*-rx?vV336IEw@DuuW#EDBO;Z!#zUdr{Dk;D|nWnN5F!ErI3X{mDmZBC+f>{H6
z!x(O=X(B^5K477~QpbQPuOz;5JP1mv;Y5Qyxu>jA`I}lrIZ$wN27T$RSilfag&T4(
zHlA@(tXrj2iX0gbY>#nbef^C^wVWT91aixsaoZIjk1WwgFkQf4AG{BtHAw)1GOA<>
z`3DYI=Z?ecO)OlIDFluI>CH%<PH_1-7(yEWpF``KY~aR=1hF>kmW_7u+4c1To$MhR
zR<}~3KC6Z$bCK^-C5^<8Nis64+phM{Qay*YExy?0ON*lZTO2w5`uYlqRFS+Rl~ybB
zjDUR&8-U?&B(J>`<7jLZ>b|4al0`9dEO{-{JaO$)>C;<%tTgQHwK5bO4EuTvR9|Na
zZ@JX`j#x47Jt^s6BUeRLM-0dqoCC<utvr=gVG{`hrV9T67Dw_Q&YBSCY+w>c0QVG(
ztdXk(Ey*fJT>8|#5DjlEo#lYz10?b9#V7>1X(l-eHn1EIf2|;qRm$_Y<K`!Tf5w;0
zB0MqM$=kSc-~DPXfEW~b=JNqe^&LmnoQSgSQv8$hDLk?CrVv#cbvfz^lgJbigbv>z
zRR%9wS4ob;<c36IOR8~<b^ib+nk37K*z|AS0l=p$s}U~o2H*q;af9pirkI%y#*DAa
zxGOIt9^#vQfEk)koRt{pG1LD5uR@h_XN_BOkC!dbieurhI*>9KIKiiRf!F3mQ`2`*
z`BdG2-~dcIjm1k7{(I6Z5<!M#V!(o-azLiZGdTb_!VRH7>rHpyG?>D+IO8UcVc3zS
z6GD)&0TXdutBe!ZKcxcg$OT5%LAQ6P>57PwatI`2uk@pNEsg7)paYB#{{UT2FziYv
zz?BkZ+EWC{9#7%uXkxpH{p00<mFzw0C3BERI6VlUNI+%t0WP>ZN4*@uV!)jgBy$bQ
zGtWZ4hu)Ap0wn@;XL3WHeo@=EQ&r2b!x4rZ+qk82M1@$XE6!J;^`oA^PLf$iDVkJr
z*utu}KU#sLKnZM|lg4SSAyPmD1_L?oNEyN0q#i0<!=WbhT(?}P1ZVQ5<+l*$ZaZR_
zNGAjnk<A3Ne9V73o@<DHRfa}K&C}MC%pi`~&S?oClaavfNDmntW06V7EId9i%J{+0
zJ*fnkISZWRHbz0F4Y|t$kM>O&IqyrEj@ph7w0xtX=xEP50~tKibJGU`l=H?pqU-}d
zmvQSz4mdylsyHVHuR%dOfKmV;brgXL2?v9pT+;l<AajnV9VxsKpI_FLf&Jdzv;ZD@
z4xMQ_a6kQ2t;ZNNhX;%vJ!k;!)ABSC-johU9sdA2LyU9yPy(D0)|a97G|}%%leZbi
zGysQz^KnK_ayrm(4;=btj&axV#RCD{&~Q3uKgx{flf@jKywD)yr?)hn{{WpR8;D$E
zJ?O#Up8m89Gsh;AnqE7aIU^>30gQ5KIi<loVw5X%+ISw60E3~UXdOYR1T4fT2Lyh!
z?=J^oCyu;yrF0f#SUKE#&=Ilsezh-@a7r&<?{}p(;AL1G_Qe-Nvmz=;B%VEKHV_X3
zj+H->Bv$hH<G(cIwI}6hnV651uWDS#Iays}EDjXlb*C&0&9*fp_QhIDXW9G1w`*f*
z>CH<la!9^(lMF-vA0`gpN?hor0+51Dz!=FO;EZ(o(~{h`3czuIPfYvOkZq&|BH?lJ
z4E)SZbe<acQ{!(HUc+OjXtxOzq;8esI9&DT6yT~<m7uQ5RME^@*h_U3l3So}Ed0Z{
z`d0UW{u6lD;zit6ei_l^e>9L?kcB`y=N#A59|QjYV5skGpuF*FmXJ(Cs}Gq5c;I!#
zeO2)9;4Ycq$fMHq%_b$1O{lX)5C>=($o#pldk2zEr@dX-6r(PP`D@^R>=2DI+<4Y-
zw+00}*#O(_gV*a{QhYxBo;)Gpm=fkKGT(e_fP9=}_F?Z{o2U2>PnKj@?3Bpya#yTu
z20zHI<}VLJrdw(DX=buZv>BMjGa<%$b`|s#so}7&<))XfQ&`hU>Tuduf+VujWYz8q
zDxliChae8$O6fc^r|H&KOm8Dy&Zo<8ysI9Z^{%H-@U`!VCrcZ<X`_YHGdh3(7~>VQ
zAA@v14_Kr?$GwzhZO0_zo-3ZNDM{+hG>(ZJ$A`2{O2)x&Sskt>xMf+R7z)0*?ZsTu
zz8+bbZnYgvoV0wYB!CG#pRINg!!4zX+G*CxVw94>uzPYvPpxRDLDS$9-UH`gg(oCu
zo@<U(<lT^JWogT!=`pdlww6L8`5zo16|Z86a{<5mOlydW!T`Yy+>c6+#2z8i?7SDU
z2%}kqn^guf+5Ru3ang9Ic;H)AVucAARlo=7QwUV5#MO?9(_W6m%(oDrNWa!xOU?(V
zHOlHfJb`t&Uwb@CyIqlb1JRWK05MtGuCEoeY$Ume#@spy4^v$3rQ)kA8w2ufAdrl>
zAdgz~DB!xiM-!yH)-F6nd1&u)5;#f9gNJ@FH#hm|S=x@cbi0SS7Y%$CE?_InO`gQ{
zu1@d8_Eyn_j^uAVTw$^l9)y2|alRq=p>GqpI+SXWu6Kiy-u39y!X>NO4@9&&y?4fz
zOXkfjio@og-X=g%&VLH#wT~A>9!7%cNMJs4<OKRxk$g@4qjU`>EKheGz;)WPgMi<M
zwS4vQH}=}q?~*+~M6{5voMJLE?J9$*_xjSUjmz*W-*@!XnKt90^(TpbF6eQ2qFqT+
zXxPT#U*yQ?&3IqLpW5?F(9+;7>~l^f+E(4e5>)-s?_W1~gU5dmyjQBpeHOhntZXqA
zxP1Jlt90b&@v0V{8<WgaJ(P-6Wo{h+jzW8{*A?Jm_=3G}c9d+p^(HB!xbfHRRpb8v
z9!VvJiyPZRBW+=D-!UGT917uX?RC4^qKf+A-V)oHbCJ&^5%sMrZ52GCWmbwN<Veec
zNa_V%gGiYmbh@yWU7u`DtTE~{^%db&#8s^CIb5%K?qX@$5~Pf%QZ-2d4*d>WoDWe~
z>~u?*q>+TI@w0yI-9B9Bkz4k<JWyIX&tR`0$c|QiP@mz)dY!aMBib%g_o<SKI8pD4
z!<eo_VOr^hOtL_#F$nUGK2>b;G3!>6z(opAac=7wau!A-<vzl-Z1lUSE!J6}+FZJ}
zM+?^sG19bcv`8auw#XP5xiYaR4{`^sCo7=kW__ibLhTfcB9h`gzG)n&>I#oqmfpb@
zDC3?jrArWsc8*Ui`1P%bbg;1z=f)pzK48f|PfBmu#B(ypgc74A`~Lv-sdF*%rck!g
zUhPb_q!eScI-UU)ZM39743S9E2EwpAdG{T~O&z-V^GR?_afno|!+<bOO*-o3{FJzf
z)VAyZ&73G4H@Ts<$I3Bu=nfTEGH=Vn{8;s*I$Y&Ri)JDx3Y?mrEmk#6k)TFyj_2kr
z{RL6fwM%q~pm<s-hdWDc$^1KYqfu-u*3ek0EJ4e8yQYvFk^cbJs*W0Kceb-ac1Z5*
z21q?mAFWrPRfW_2AQVZPZq4|4KAzQ^sb6`G<jST%ju~c*Z87nT`<!v~s#<PKXwz+4
z-E(^-(!(Dp8P@<2*0b)fM4{0v=YlbU(oESB9{BVXnW*a5a$C8&k|7r2k#3KMUs{Uu
zT)2`SD(>uU?3;1UKTas;L^&3k^?cWrE(DvC0l_#UJuy|<?F??oA&r<HEN3g6^{nZ&
z2*txIND(BBN`gPtj`{aBR`Tv-c&*@2%OaM4n>Zf7TApi@%wL}JNROHz4H}Q$N!eS!
z9jiKBL5yBWW_Aooao^Ib+`NPd8aDg5VoAdfLMn^M?JAH!Ab#pr9AweVLzRn{nv>i{
zu*V@AnE9Jm2OYWol}_gKa4@vMI3GNX)kpZ$au*=ItSu-(mnqRbO-4j>L{X8FCHwL^
z=W#s%Khmi(8*Fn)7?=n$QF&i5pWY8bezg?0A~EK|qs%{hXH5EIu&CL9`JPfjbO)_T
zVPiJ0be3@=u$96_=)5Zv-mVapNhrl#vSid%+130a_))2RQPtxj31P7k?3(5#0IBQW
zjCz{(^Wg0l!B$J5=oX1;B$Sk%6P7p}{&iR3Cx@;)C7?&5m3{65NT6Yl;5%1Q;z%s)
zS}TZSFLG0HXxl2hcOJF+zDJVM!C@m(OW%95=W$rMRjSf@5n0?`PkCjhu9~eAjfD_k
zx4EtK@P&?>tlOLGX#+EFgn_gvJyeR1;RcVXYkw1Tt64PjBQu5!tOAAZ!`8hU_MEad
zUlQze4I(|_8&Kur7(Dv_0G=!8Ae*S8euAS;Eps*0>bygDW1{>5dkZ<?i+*`oGUYRt
z1b065z<4713vE6aZ7pscl}p7Uj^2mfy2tSJI;VqT(pvi68Wkk(Z=0T@-n2dz_*23b
zTVGSu(b5^ghAsFkPZ<2_;RwaQHhWQxtkOBj{8Qq)$pc$J$dS73jnIPK27S$XR<q&T
zJzL=M*KTyCnp=C&WNp}Z_{K-KJl3|msCW%-8rsi7RJ&!`WMu@a5sZObGFjVc-w0sS
z<syHyUL3YS4mdb9(a576&Xs8xKMH4$PSdV$CBKLjh?vx#K=mG{rEB;j!`eUgE!L$g
zO?vaY$YQk&#x^HBj8zli*)O4r*H5))xROjN#()^t9E0ueUe)_PX}%QrEu`G|lg1XN
z?%Li0Vzx&c<$g}m5AgBVJ?k3s_EB<M^fkSqW0KMJzYXYK5p8S38c*6UcNqM^+#XJQ
z0iN~qhwYd9MtJw&#-5%!nt6WPI$|m0Y)I+}3WI_O1mo$=d!NMb+Hc_xhWsV1c=N{5
z#ihxAc+*Fu+cKjV!O0*FxbMaZugkC7ANHr#ziF?CA8v|whr`wm%cI&d?Ia$qN3R@b
zoO_dB8^l@cFnD)Hll|<!1awFDFmjh&jvwNe#cv<{WASwUFZhAt3yb@=W950R^1{A~
zy$AL0T=Y?HaLnOG?3VZS6xjY{18)G~Se~B0Q%=eQmS6|Jdi=gpZQbs2IXOGFJZA;e
z41aqZW~PM?oQZ`DdEVTo(2mtzm=Z&{ES!kJ?NTJE<g%ZY26qQOrn6&2pgTqK##rt=
zfz$j2Ix!l9wH!#pX>$1q{{ZW#5?JIWV9ZnxkO$_R)A>k20mB@SJ5;n*go=sE1H$~u
z-3DrSf_We!?B$B19&_vX)n%E~xGpf@0vL4qQ^bmxXolh&=Vs(EKAx2=F{X={aGqo~
zvK3L6Vei|Hrj=x6AV~<}vayb&RX?{hO48dqWlr2TIrjpj5^OH9Fa<y|7yHLOaqUye
zQf8zVQp+%tY4be1?i~~V0IyQC(7cT#QstyTj(t9!m5`HwL}@4A`BW+EQ%7?$#?CFu
zZR#H!)VLSSU-OI#RRX@xnRiFX_o&ujRLUj{$0vR{{HiD>^I*e`tl;g8ADEACT9P>4
zIAb4WEJG5~uNxQXQELY<lAkHo8-PPdI`qdGq2F?gc;zy<d_Nokj?}9d3>?3k^Wk>(
zK8B|9{D_{_Z9jXR<d+!s0*wZSh9Q~lSg??JY=q<!^z3QES@J`+cHvkE@qy`0lgL<J
zIlpo_Vq`dSeFi&vQ=(X%{{VDbaZ$BP_4lMOxVQ-_h?~l2;w2qH$36Y%wusoaRn@{o
zT5ZYP^HQWDFrdn)GEeUmkcZ#vRwY>3fj0<dAS*Htl#bj~x1n3IoO>8T=XT<9q_)u?
zxyMshl~OsPw|N395LQAkHxbDml-ZU@!o12PW@EI3#&Oq*u&}{ytp0O1m;okM`BOcB
z^{E6^dq~pZoZB>woEJvG$2^fu@|cyB#UlX68wmNo8n-%t?5rPS#sR?tC%rhV3cg*k
zIJQW^W@0{b-j<~m8rUvmxGavTmx%L`*bjPmwUQDcVdb0#DJN9TT#m`@gGDwr&lq@T
zJnaXtJ^e9FXyS_CwxNki#0!z~`I+d0KGemrS}0@%lEMJ&NMv%k2R(D^L!yA{u0bDv
zVI!YG=~JwB>nGV+Tm+3+VE+KB1oS8PjYuOY99Ikg1<JI5aqY*w0dl|Cu0GC0E>yP#
zh{-;gr~QecWeswYE`DN)dirxy!)nbYRpO5=nLO4!{V~#=YOius#KU)*!wNp`JDLQM
zUK@9kQVRlh<>CXB9>4u+7|AS!yzwIp84fuEwmm+THuqQiGe+X#L?eNP!98h?V@=zm
zF|r^GGxx|m@lMREqB&Azj2Q`J;NUOwG;Ey_{>~Y8{r6AhNMwo$<6DT`R$O_RY!DAj
zRave=i7`GVgk?~ZgU|D#%vVFiI&I90cb9UYheVK#zWArSj(%wPC*@+@0IHJecCopc
zTo#ag<9|XuJ?f)s(XQDe$Z~K)9l#G-wFyX<G>s{*B8^?d+jb9}F!=|t9;T*wmH`_|
zFj$69_PF${H`OifCIaE}wEWv!1fO4FQ5{M?MADLR^Ag<!SF&XLM07G;FqhAoMT$VU
zNF!apFLUl{Id4&ilBzO^mnFHyV9l%~aqd|GCzW<NC)%3Yn!XgBt02R%>JRu;DomG9
z+&2Xxj^=ejp~zHL+E{%m2h?BwJ;JJ{a+{7yw|;#q5w#nM8+ZVyz{o$!ndh?Qkg~Qu
z`8mhoRH-5zUdFx7tGh42V7p5w`_&QDz}>O7FkGm9e+tQIZe7*hP6~h&41P4-*GL46
zNjb{4DXLLKI+A9qYHAehZTMWi59#%&q}JCgk~8j6@-hAzqbHck#Njf(BX(o$QOt^<
z&yBwz1QVQ^rA{bLaxJ#0F;6i;$C;h&=}nhcA)ewmc4U!`pw(i5PS$Ln?vHwTiH;PW
zc_bc~_NwJbo3XHJ7q;`6A#NCO{+{3cdbb7r$||gr5=p~ka4I!|FFdmqJCI>Iej=M4
zgR@H-6Ox}P>^bR4xPrLzaXS~58-_Xiv9aM!dC2Mb&{=}Cat4w%<&Yk8>MG1yJi_G?
zOF1y07F_ab-L98BZ!TgyfLC&ZkEKhTVp4>emkLPM{$AGuCuq+jnn^7#ZU+AVGjJyu
zJZ;CVZJibN7YpSKkkUwa7^z=D8-SR8?oc+!qY6*A_|*GoqSYxF0?tN4Qhq<_rf{^w
zV=SyDR6bgq5IUT7HPlC;eWeSiK4U)6RQ$LcbgM7nh*p0p;HhKDjR_e406vtxyb(%-
znaIaz&O;z2SY=lnnvyLvs)BbM9OJ!qc77OJiDOvYDahK)dY?@8sip9}wVl1i&D5S-
zr~(#akPmT>T8D^<qQl9YQ&~h9TDfH;WlMVd)rhn|IrlPhxHxgcdsk@w7*fqRxP<|M
zaUopo^#}a%OBRP5MI0xZ4?~ZXd({18e^zHJZ{gW4?hK9PgR>7CCkzLty;_S%f+a@-
zfKSZc-qp}WrA823Lv1OUBsnbD3Uk;~+QlK4%r2^>hB)uurQ%s@4w28>=)Y|;#xEmf
zoP`-e2*KcFccmIXk~hTz29F@dKZxhAHNSBTQrm$t#tE3Bs(hpl$BI~^u{Vz#Xy7bE
zVRrdTcNpuMUs#a+j8ThcrCUTUztXsL`H4-;dHbp;{>(d~F@lSYkj4B+*z4|1XvF^j
zWw{dGMY=TQhB+hC>F-uw>>(qQc||Nt1&;~%<CFe-)O%@MJ(LWk(JkZx-s0Xt<O0%2
z2^f&{6dfK*Ha4PAcM*Y~y`FJeXtxbEZZ1Lyh$#Jh;>U#^riOr|(#TLNFheR4_elEm
zKD9p5Y<|uijM1i};$4RU%AcDAd;8Uevim!>+gC2CFu%jMx%$=1YX+GWqC(rIZ<81q
z>Tyym2^K@o8}A>!kDP)2$?ZwWv8bd_Yim(3o!qHz6lXd1^rbcgv!wBe%j4%(>OI9>
zwzdK_gt~~!F&n!R*iex!;HDt5Aj3q>)OH~M06LX&tW`Fs*C0G!D<EZH^s!p3YE{)_
z4sb&p9Q}J$*r7$t0vw4??;JLKzi@jGYLP8ql&i}b!i;Vi!5xV8s!B|1#bwf7Xb0JC
zT(;AfM&#qv`U<gVuM4SX*sYN&s^kOeKf<Ju)-o+(SHld<SJTx00EI#w5(VA1Bv}uc
zBOVwYgnxw&7AXlOyrBz{&gd{n`=xz-sj$H8s*y^@COMPk<LWzs{OJY2npg74k7ygi
z9ovUuKD6>LUO=;2IxMI+Oa0~aUr(h9Hw&Tj$89WrL31P${I2BmBcK$q$j<K+;3#BY
zHG7acbJ$gTMu0f8h9`LtlBgdg2Yx%6vlz(p7BJiJk`u_<Ij8K~W9A<72xFDw5r;A4
zG2pQsv)EQ-GrI_{Bv)XvF=Z!$Ju&@i^tR>YSxjDF;0&B#e^W{JCXkhw6psY40|bw1
zwMJ5V668{mrnYeLKhEoj(6(|vtuh%zFo<Q0w6ZgKk}Grgam8uDrrM*!b0V0YHY|mk
zB#y#^r7|w(00v^h9DL3A_N`VDb{96LWy~{@3OlN90ni`e?tZl?X)f;G3wxh3J9P)m
z{w6&D6{MPSfDjXwf4X{tYGsLDFoNAdjmUCTeAQ9HPE1_pV_VNWVl$D0yN{Rk6)M~L
z5=&!mxq~KQ5)ABf@9$c$K?dEgG;W)+F~{Ln+el&qY}teJWaQ(vE3%$g=dmuTFe9>+
zWryuCIz71(mQlcCk+k+F+LGeXyl)h!OB4IWQ-%XP5nIio6pgk?gxi6W{9d&m*j<<c
z6>vZ<c`_eC=qsgU)h)3;-58d-Y;lHY?Nu3r6-dT1-r}+@Zf_@wTYIPqum{iQ0P|fg
zt#2x$eVQ_kzcy6zp60o&N@x&GJdzfcTxFA?71M{wz5C5*V_y=~bTBn38P&Yx2p5Q#
z9JOXnvn*kl{_L^LfMahJcT&2B7?NQ+8B3BBjDz&2cymJ4JXfoY7CSa&n5o>O<x$^0
z{?+OIQZi~0N1M#|W&Z$&o(8z_kBBX;*^5K=l>j&(FQ!lO75X9jBm4oi)3nGWj>pL{
z0^cy;{{XZHVr$JmWPjPb#}rdt*$GR4B%5dl9+>Z6ef%Q$b7i30!#%yZ%vR$W95DQA
z+o6Ys0-fdYGio&5XLfYn0@7`??K098vzRK!vDr>ZKhnJiOSaiJnIvG1fD(VtTFTHg
z#(_Z>V0_uYUI4D9!p(|_0-d?alissZcXEACRxwLNTGK6KjRJ<+bDfRUiqLYR*{<bW
z7{28~5GnKDZuMM8k<zmD-EL_A0Ca%u1Lgyvq`m1_w)s}3UyQs%92U)V`;|id?^9nX
ze$!tV?6j*ZyF-4E7~wgLu35ht^`DL(5@69ZyNGS0CPNtlMw1I0d)MZF?VIt!=j~Hy
z5^E8>tXb4YCRqXMN$*=$uN);lV+l0X+2en-KgC<`6l?cmOU%f`=0bmi*jJb7sWh^Q
z=9M$MA~hJty)E^_>l&H94B>)+0B#Szu&X*noEI$bEVzy{&<<rjqtI8%RGg|*a(zx&
zP0mG^cFxG5{{VQC>)w^N7V=}A=2(buVgz9K%`3-++Zk^#9LM$ds1@EvXjQ-^KX}M7
znpZ+4X_doUvEwC>=LBZ0SrZ-C1QR4f1DvVv^r|9I$g$hHA2WiD%P+oa&7(#_tYN&x
zY{<m@(dkm!8okboK%Pr@uxB!_Kf$*dJrAvIBeby?WJN;5Xar+Egc|1b(;UjT7qX3|
zh*1w5cKX)+qs@3cv$U$G$_HUw)fTrp>AeY!y3UxniJfB{Ch`aW0IsZCgmo;-AW|?)
zhj!u96%-1rBc9<K2RI8S0*OPJ6%zby0Pl$hBhc0oyU^WiOzKE6$F-Dv#vnQR(DKBQ
z8RaS$qp>&wqKht~TZrGf?#>6}OZF&01-Tsl?T;T?&zC`y$0ICF6I-l_*UmUQeK37$
zwe7Yy3ux9RkpB8s$!<Dh(0hBDvhaDT)@IfI%-{way5w`y`O>Ydam2RK1F!%KJLdzp
zCz{SsOr&7y7Sqn*<G56L8w~PA!vH$_3Z;9a8-@z%k_>{SS7^`k0=kJT*s(&G4U8cJ
z@uD3jJCEEJ*!#2dcVBADk*$evQaDENjm7kH&1*bC_hG!jz&?O>tX*5fO42(ER$MSp
zLB>uw$Gv)e#)#Xt+$P2>b~qeo(1BDnpASVijwHBQUAZ|J!*|70YECaxDdFPQhmLAm
zB+!8HHuW#Gp!>l4)hVD6N>gD{oDkh}?_Qs&_*lZi=vtpG-=8TnhWb`6wcwv7Qf}=X
z?qpC@q4`2}1dpX}8nI^#@a=4H%^N4p*!xom#|6FcD_-|NxVCo*BFLa_B#*nE)t^17
zMj#Q#P-|4t%;MJNa5yKNVw4O31_drxscv(~?@7nrBOb<@uz>N-dGDG4!(@zmiU7$9
zImz|p(hU0J9gQ(qcU(7Y^TjHXF^<I3cqC+gMwATm*!DF^io>^%bGIwp;+0O`hX?!K
zl)==I!8EFP8-F9-sWB23euIwK6yYw>upD6gt>|hk*d&HLj=AgfpdLS+T96hI%f=6y
zGFXlV593k`hgHMMHxteVF;xR&t}*rLPD!>d(m~^?>sFk4fw5<*Eu<4{mE$hBW@b1e
zJq>Bw_^RR*bwYLp;xONP>+M{>+78kj9mDS9r9EVF<x3sd7&V-zQj@)nV_KwDlRJ$+
z$J0dWuefXk#JT4^@mrRE5u=@=S@<B9m$p8b>0VnL@~bnXzcBv*SA+LWNd@%c66rAc
ziQVce31#$K*w#48scw5FmGKKlU=8G>U~Xhq`H1(ewDFuejmMcZ(ZuCcL|6Eiu|D<T
zDXv|`AQ3(S<B$i<SMB^sdW*h0kC>h}bUxMR*2*J$qpqG{?PhzVULcAm5=k(SsouyN
zu&YpOmhS5@Jjmw^t@nPSygJLq`jWc&2zECTq=zk^W9eG9-w<9sfu#$c`Oeen^{zSP
zZ=ul~bb6l67NXMbiJUlb%f>N*?^3>?j3i(Q*nx=+fDL(OmGL2^LlkqlJB~o$pJSfY
ztq;WAKJWb=X%;Uq?Qy&B9ApgR<s5!B!BYWVF3DW!jxL*5x#)AWtpYrXpfeI29tg+X
zGzE;E(nR|g4H;I(Pu95&FUI<P!lJ$8ZUY~ae@~@r#p4TOz2<NcBF^>i&rmCpbSg#J
zqj=VYk<jGrW{WHiHiOPRiKLQPj84OL@OI>MU&63#yia3r9yYySW4rl}O0y4%t?i|3
zg7{EoEI}Of6_>J~V^3)Z)YB$1#hacoq#ieW4%Fll2aQyP7&ub7+<&Lms#@zda)n8y
zjY$M#d;3+JYqyOIFx@Abs?Gbw$(4BEdkU8sEz44iTa!x^)}<ne7%5`T$EY2^^)x!4
zEcsJL69u0tNpEjsRhLqGfFUdhj21>GAB8gOQC}$vu1m;51@;`~g&7AjM2zYc;)n<H
z7nW|zNJNO)AeJfySalxM$P_GXbtmsx!NP9q>?&(WzS6NsS+eJD2>ZC}#TutzA#*TI
z+x|q$v|)0~@0x0Pi4U1|Ffz74RUDpjD$_#$0B9-Xksti@Q^i}h)8;W1h@i^gkh#yb
z4aOr%?4~W{nm21{f^t7{>&qVF{{XL6MXbur!FDJ2o0kPgr_!_%$_QY0HU)xUu~IiE
z>7HsxtlD7CEuSpdKsu4?eXA!~-$PXm48@K_J0_Hk=LmpxsUm_$a9Txm0PRA!0QV=>
zv>E`Ce1&&(&N4D8yF{^NiV$1Acs~CCN=~eXpo);`=`5=gBaqF^p|B(R`qj8>E#sAu
zE!PBh8RyoRS^SoaKH^SXbkDUqOQ~Q_v<TZEjhlPpwHK)&rwET4YNNZ&Ds5QD$fM>S
z`J{Paf)X0p8A-`4M3=15`QvM`9>6!XRJfMv<xIOmG2<BE52Xqf9_0H-EeP(VQ*tgm
z*nwu+K>iW$?NQunmeGbDU|>2rpO-a4<uxhidyO_Q^2Ro*fx$IG=S0@pZ#PqCj|u@q
z<C@wu9Jex-A~D&UBV38I409J9PT%1j$@ZqUz2>>NTgZH-7$7I!$6;C4z7+9<RzgcN
z8Ml<;Y2;pmJw2)oPe`9nfo-o9jEgZ>*x3b7LNU;OxvN-Nb~F0aUsGBQcHR;vX&HpA
zk14redw=?>#5#=a{{SCRVZVp~Ir@55MWvLjD3-<sQoRFma5|rJS8adNCQE-f7nQzM
zBL_Z}6)?QI*l@)2buO-|S|KEd$S;)(I**^**!$H<wOfGZIS_el*p1Y4^grWEsWaIH
z1(Y)qtg?*l9^Um(-2AO9ts6$YBLfAhsbN&Lu`|RpSZz$R3vV&EvXBCdk?v`qX_hrE
z?8NNJBcZA?Ul5OQ0gQk)hyHo=s3+HKteqkfZRaD*{{WVZNAj+?V5NN#gt1ZXY}wk+
zc;;9x7B)fq#eR$r(xsbBiEROj<zmSoO1WS?@mbnWiR`Rye$zkG1E<oG<5F9<nA<iI
z70j{cj2`u>!Bulg#JpW44OsTNj6a(yNQVR~hWS{InG}{+P^HXQlY;nck&FcQ`qw$D
z_@Wzidq_WfE>DvPm;%}Um8WBEbS(wM?H~%9o-nz|J+oeva_g;6K3RiB&0EEmx-&Bw
zL^9pKlWQcz72J6M`VV@}z1E~<SdGMTOwI(7BJCYLI|`KPk0zIK;=7=c#}V81dD{&x
zKe|0R?~18mr>3KQ4EK_GR`HNRB6jun{{ZV(L~_arEAC}1#;x?&j>uo#LpPCcw1y@$
zoN>>3v8H$-_1pP;=$yml0Ma9W81Ih4yKN7{5M4+1h!sNZ7??K)JqWI=!}?c-bPXnb
zHr;LHy12+U8^%=UB~PVn=+UCBW0qKowO;3&S^O+X)(a(wD(}ExIR5~9>07qn4{oiC
zE|!YY?JFaM#?|S$b6vIeyWy=0!E<o~o!Bl%AmX`gXX9UmH1%XRah#G%leDMP+Nv_9
z<)(&BN=sL97vZg~o|<jNwk}<_Ncb5))O|bF4gUaywEHxBsU=l)4g0k?BOl7Ld`<gG
zczOvI=GRq$q=*C#%gc^VKMe3st$CM>KWMFEQ<?t&vtlq?%)42cM&Nx3{3`kCCuo!G
zmgj%sON~Cp)+?#r1(E>F<?v21#_vyT*O2(5SxrLpyQwfC%u%NUC#kFrZ^d_-ywb}0
zguB=%lMZnB>Bsb}>F;C#hn~z?er~w@D_F))R#&?n5n}H4H<+E<`8dx(P&>$|(kTaT
zLVHsbMxZHd=dY=!9BnG=ll|`1qE5uNNfgY$Fmet$o(6p?Xk?WMX$i(Y_xDfuRd|)#
z{ZfFSWVdX3RLKOAhBk0Wz%MErnlwOJw!I2OvJe?bD8cXm^`_ryt#EfC4peOgf5M+{
z;khSZu3u>xZh6IY8aIJtx+^7?oMr@l$a!r2dsb7aN}jEnMiZ0K9Nn&;dnA#|EF=YN
zvEv_8TNb_@yS<TNYslD2zqw>m6`Q)Bpsv49_<bBIk|nIBO~g$c<cxo^NBPLD{U^iL
zI&Jci`=TQoiCm%j3gN4brk00gEF_-i6=UFwy+Ro+V434W0LT~ty>nd^r-2&bB8okQ
zU<4IZ1A89X>}$2Ku(q_CGb+ajYzbYLIaB<rQXLegR_56icLTx3ee2GiI-`0ct{7NE
z<MiJKX|~h6zuB|E?-)f^m-7b|&}rH%5IS2$Z7K#KUAN=`@7$c$v9T9h+SQPkzzL36
zjym=gXH7+g9(m7^Bx4GoXFaoAv#TlU&Ep6~SrpEVaTKx}hYoO}SoUFtI(;f@T`hy|
z*_`qQKJGngNv|#&dhSx|7zrUCf7t&3iK-VDsOZu!n0KL2xxfrM=Au08r(|eObk>P3
zW4bKC%Bn^-=Z{X}mh(_HR?BZS+*=#~ktoI+-m)&QuIDQy%&?-O1x8`FJ%G<oYN;K?
z)%-<VvO1IIhfFe%akn17{<_*UpHf`WdhYQaH-+~Nqa~E%VLb^oEw-sVcMUQSccAFK
z2<yl7u72Wq=AX%3(X*yeUAb&^$n^KAn9Rzt&P*q7E&cDMbf`we^D|OSO#by+;En$P
zbQR}zdVM{ryxOehK&nPxhkd+s<YTo~bSM|ha#?vmI{yH@nyf8cqReNINUnCN;C*W2
z7{r#_E{o7mi+LAtZ0?hh^fe?i$t+79^~gJS6!OLZJ<dHUn?~i3q&r=?DIxpc{c5#t
zCgD=sd$-<111tVNO4CAjEJn8%NG{UUuE2J;0IoPE--=i*KGO%83LT`7bL@HiX<~>w
zn>m&CDdZD_&rsh=d~!PzG;WOQamNa9eLZnZEJpU|K1ri+irL0_C(!#-p|NT1g}O+n
z@?(Y^0sSc0sQHP4#N9)j?LF$%iWqH#leQGG^2uILt|{y-&TGY99-Hi~Jm>=!Wk5$5
z_a2qYX+9fmV|a}1G36#ryz%|tO7$&MO#5_!Q5sogQ5<1U1oo~@Z5j0M5dE$PF|?dc
zod+51{cF1mh;fH6Q<D)xnpZrx#d-tU>w)Z}+JOep!*FxlAJeU4=of8isifCAP^?3;
zoDBMVSEqQ&+wG+3wie3oC_BpF5ZwMkyuV$umr1#6TbGQ<4_RY5UV3NL*R2Q5O*VP6
zPBXFgZ|qCs>wA4J<3O>!Tc$|Dq%upFl(8hSIQb(`J%2M_O=wmVc!I_3wH;VYE!QDg
z%N?DzdY`R+Vf-iY{<Gm-Zr5GXuU;#Qc>_+#!bul(BRrmjdVMl0?!SS*9B({DaciqW
zkwfQ35%#7=JCW{d=5rh*s85}2&dO6#g^WLmo&$_cbupBX?pTK(GIP+H@x5!q(&;xc
zC8`E4`B>d@)%Ev@{4pM}70tz}BP`LE^2+q}B=)ZX@z#M2p6ju1D0Ozr%6fBvMR@a-
zmYq*S2_))So@FJ3UV4U=cQN^wp<|EIp1MlRHi*eq;h8!dR^(}KVI{`+&?$*`&mafp
z&u{RlZm!}`hh$0_K0ts0?oD$!yPmqE8yJ@QJSTGbFP1pq=V+^oqpHZEZWdHV<;swD
z`h9)sS+64yB%4AMBs(el-kef>uglv5?P;YXb^D{P2&isMwHQQb)1bG4LvB#3ljZrT
zxtBdir=#0K?If3J9I60V)o>5E_o~fxKGreBO9RP02iB#xzDXwyY@1%(<gBV2cO0Lk
zD+SRzy|$ecuulPJkd1-Ha1TF)4zi1g&|3)MEI0XT2|?@Y{xqIrPclei1-i4Zr>#iW
zQ6q;ccWwRIQJ<I8(P5O$jnq=@M}p!eJD<u<pPzbflMzWLV2QMDa!(37kULeME;WQ)
zBaD)GR?g+?ii%{8;27jpR@u3bbZ=^rT#o8X2?TOmf<RmrW79qA8+oG&Ve`hwn`w3&
zrh6Z1bGh6dMi@2@<Jz4BwkbQue5j~b=Owu3rhTgHgi5V6hhwMA*hF5Ode9(cEi8@Y
zG0MdxtICnb6(y{S&m7YsI|mYD?)qcaptzdeJ7QiZG43O2e2{yZ$=>78c(RJY6&B#`
zX6oFW_0Bugt)`-*OePY!<%~m*raM$KUtL=?UQCNQ$O?AyqaOUx7QT?Qu)%W~Yy&Pw
zN=`F-2Qo#weKbt(1W@@a8t!InVY5(+NMVvPpnQ_<XHmfQ`kJdQvRdduUk7gF8Rbu}
zxT0zQ0MWto0djIm^yj`QdpX|hIng}O+eTzp0m8|?G((TaKD0@2ujZKTKxF`l7y=Y~
zd(~+ixeFL#F`b}(eD<o6$}t_pvofe8d25^o_Z6&Q$#OJW_6XxQD)^HHLIJ`50PE8<
z`=`3KS$AV3`Q!2Fil(i-<B*&#atY%D*B$Bhw@{_&5i={uxnS#%*y=G<;3Xnko1FEL
zb|1K?yyxptGf5z6E`q`3kW?Ie!|<ylt8HsbKqYK>LEK~ldE%tEwTtXm15=1TWNqp?
zL_hs>B#~RPyl3ol7=-f0^6xUQJAvnK{{XI;h~bO@BvHGTAz1Qz<etK%yqb5Hb2wM>
z6*&XuLDHZyGe%M(6)*!9O~tCMplDjQNM2ZD7oZ^-IbKU+*V36SqB8GkBQ1lN`3LZ+
zh09MOTHL5msywDez*F2e;ohsycBQb8vv59DKQ?_uDBX>?*spVIxrA}r^&uk#xyc;l
z_7utCf;2=xQPIed$VlW;$#ofbjaaZM3l#gy{{Yvj?{jX7Eo8Yk2XV@hdHyeY-6qk5
zoJk%B4g^sG<Aq#fgWj0lO{^>SU|ry1Sx0ZBM?KZN3=-(eIbsBD4+kf?`cZLp6p=N>
z()nw*Y)SzA<~XZSb~AEB=n^Tm!6r#v&cJ=l_NJ)GSVOZA#D?s?=BtZ|ZX<;*m7`|`
zLV<$AwlUU}&9F-wOR?1e*z4ch*Xc>cpi)e^4Z)0ysG(_mwk<FtjiaEa{iV00@XH^~
zCQ7i*+NkmdxJ3i~Y5|bndmTrxrIu-O9!F2QJg}?CAJ(UqO^=yanll2c1sKQ7OCCO-
zT8-w4`Bo_<2N?!XIs@Au)~cv0sarc+qq3dRmOKs*Kg?6r(PWW_m$>!ktz2M?+?gU>
z7^aRmFA_3N+l`|vvHF^hG=#=36f?9kpDZh%oOH>k;Zt!rFD4_Ch8srb1F$`DQb#e8
zM`H;M82Oce8NtU&wG@fDI>H)IM+yRmU_S1BX{!=K?;Nd?nF{1*1JIg|Y0?Od%LiD)
zVaORZ0ZF144;9y%n*$gWeAw&w(?}hOT0U9Y*MWkhbRwgc6i~?JTH`tS8v|+Skxedz
zM6wAXj2!J__jA|kY0Y$uqF1-_PW^^A<*+-Pdeton8Wl^0+A;m%+NWJh%EXawWF1@F
zcBon=iXk#K;IiS=jzISHH6y-1e)i<6F4bHB7whh7!sw0xX7a;%E>|pAvbQH6!+}FY
z$r?v0lnCtdbHE3^Fv)2QFx&_7#l_1;i@)at4CGa@3kb*V*q%;LLO-oivJGCvbPTh{
zaF;>tys%by!48j;l_35Y{*?%VSfE#JJfpOmnKuKI=-B9g8njb$DQJK#oul}h=shaA
zwVCgH*yd9h05YIIuf0+s+=5xWhbB2yB0RFlGqlxP{Z%yUa3;IMl1|nfAH%S#T7ueX
zc9Y4d+zcWYW*p#pW82ca+h5kdwRT@yPN?j^D>D<ZLHpSC{#Dn8!%q=WMI)ZIbxJp7
z-B-lLo@iO4m(OgX{pTL|_N>qCJNszmxHm55Vo?mBk+^ffCyZ5HFHW}9wFz$4{Vnbk
z22(4Ytf1hJtw8tdY(!Ja2}xTUxL$vqeZChh!r`c;DBslZ>f$R@n`xR*IJS7*BoaG5
z=_Gaef&TE%Po+mDv}ZD2&ulVfC|7XHFz!7oIW8_Q^$)P=7Sdi`N~#tpdCoJO`VV^b
z?F;re_>ptrXYqESZ#qU~+P5A-+KNVUs(PQTU0lYE6r&S0MpD(DT>d1}Ac9HYor|B6
zKbI;!cY0M_PhXfe+jK^GI000EqaCY%$Da*vJQ1f!9;K(rCDFq|u#gIK{A0Hj$?6b8
zB;I|nV0^VQ0&-O2rE*I%t0=UzFW5#bif<Nbr%j(oNSR|{k(cLj@A*|ob^G*|IHH^|
zQ~Su|@5N1Rrd{1Ye$N@2MmUkz)6%+M2YfS=Rh3<#V#NH+;{|#CUiHrLRi3=eu2?RI
zI+uEkuNrBwNbKQ^5u@-=@e)0&rP6fI5D<*EZRJT2Wl0wd#~*vxX1$NW-wwVXXtv63
zQazF|PdEXDY~cMfT^-Ju;8<ffmNzlE3{_*5ISM=GwuUmTIq9j4lw^;dZ>DVqU$jGP
z1i4-DG05NTo|KPws7nm+ULUh0hnQX<GxfpzYu+2dKMnjq%X<a7M=z9o$XRj-9r{%r
zZ{UWLsKASEAW7#?u}b5GPs6wPS7OKAd&VtU=y=`T?3Ym;COb=GaM1*C{{SKsKgFKe
z{VTGy@cxW6f9%aWP!KFO!^$zpavL1v`}+5)-YNJ8;s}JVV`(Ieh)}|cN7?}Hr_#8o
zyfdz7cE(?{T_wxANBh#mB953H@s9PCY0<Bx>{4nyPfvs5_r>1^X_o$eyL07)Frydw
zrHuNF@yCAkqwuHWR-FDIhga4v{OOWI9LsVEjHZ1De2>Ds*4xECCAft&-D+rKn8c*Z
zaTW=SpkeRF;l&po8Ang;9V1s~jU-kO#mAqHqdl`;d%#fSdRpe5(pNuRKV<&^j~1RY
z@b$V{+}i_b5Gb)W121g;9Adty@P?(QYSyssV;OV2rgMUQ1%4O)%fGb#weXi$mqpa=
zWERp)WN0OuV<sE!5>F%a<DXjnIQTvLU+CK1m8Pem&SlN2kR^=p_~)AVe9Hq@30ckT
zcS2CB8!gYRt{T%#&BU65tY-nGBLckh;%Ds*9j>SU00^IkE&khmBKdwoK2#_e-hBpt
zUMtTe@lV9>jgv>Gcxu*o;+6Kay9$Dbt1dccpg)MOb@&DQFL-m|&AV#eD3TkELx+)=
ze4%+ELG~o`*P8QXHzlA(9IWuK+E?}$m-dGEQE#bgx>8x+No36KVBArN&niCg>DQle
zUyy&a7s1VY;CGEK{3YUT2gsfs-)Bc$8I^xQ)P8mS5d2N}`|#JnS~R+J+KfJAr*Dvh
zc^n_QqmoVz0Or0L{kcD69SioJ&~E%mqG{q8qf<S+j~-=AjFdR)5A^5Oy?nDWbY!W|
zV5uAIenaWM6g)p=dKtVwwUKto6P$u^&(rH&PKV=v18Vw8>S>~jd%I~&n<Z?q9RLbC
z=D9zOUk5x*@W;k;cyq)$Oz=%>AdX1cOF0KSTR+AK9esG~kT*OF;H!-rN{3jJX*UNx
zV@1m2_)dCy*W6)wt2EZfETodq+0}K4qJm3gvWDNxebC1ua+&AxH9+e(SC>=T+(jG8
zsspf$0;3!e=qg_jPL_-0&Vb9Dt;)9T+4QbQQP=HsS=lu^lJcu&Sx7%P>;^g>*si*e
zjXt+BP0K^R(j<7FWwo$KpBwzh!3@~sk3m}^*GE=)FC~H6B@82lHkD)3>s~iM#$8s@
z(bmSzRLV#U>>Fz5kH;0AbMZgLvxkrE#RK4|L4rMb>MNPmi+h?VG>?Ce#ad5??iO2C
zg=c8_60S&pZ%V7E{6M|8)86Awjgms;S9=EDag%}AeQUy3;$`el8pl1$C}F*w^7!^A
zwK6}5{wBFE7u$BL51DojMty5G=*!KAB}98hrQ?4QYQ7vAs@%d|K3O92FjJ5+*yw6M
z25H_n@sEzQ?}mR2d@Xyf_?KO|RkYJAt(o3-WhZb74gdg?=&DKJ5<HGSh<+iG(rBOn
zCER{Q@v+Es^gi|af&Tyovv_ae=lnb;UHIqm%T&{1{{Vzn;pQ|*Z#Iz?-NfpidKV*W
zELQR<Ampsr=*GO<%N6xZEULykFZcqtc^>2Y6o0|J+TVlxOQdVxwicmpt$2lzuRq}v
z)586Z&;Sn0xfmV6K^X(&1Y<3l{R4(ihJOQWVbQ!Jqv`s#qils*4L&vd9g?8JryLW(
z$Q=ef>hJAa`*Zv-@s_D`;NOG(C9{?VfB2}pOKvv2?57?|H$tRsASojwoDt8({{XaK
z{1h9&e-2<z4tNsV?OK%4ur~a&C<Ep$M;Xos;yvri!QyITqwOEV`T88SX-Q3_?t7oa
zzuObUo&wP?J|TGf#t|7)EG;dh^5O%WMxdMwSLYY)+y4Ls7Wk9<P{DQZ=i%pvn#)81
z{{XagNhem4W?Yp-1bnNU9G|`HI^^rqd{X_UZx_VB60dGQvED}Vw8fB!;5q4mjmI2h
z^~tVJ_KdLbN5U@wAx|$(NL^gquUQT-5b@NWp0(dfo*7~iO3AUp6==cE*FH7A_!qD0
zUL~ILNp~B(vqO!{BqyGGf1Z_#ss7HsG1IOLX2_Dn`LN}OmVE~m>wXsa^QG#(Cz@-}
z%9A-{c*ijyAQC-Eucf>N;GYkCS@4_^X!e=AmBQPrfIQ&e#LRgZ>P3E)kZ_I%J#A5|
z?=I~5tmlcbIW$zOQ_-KFH-83vb8jQHwudCDfqv3*4#C@=Irgmiz8CyJvxZBl{5;DX
zN?31|L1F3!a%=RT#Qy-YL-=FCGTrIdku~fko_3ZYiLuLIX1oi;x)p}ud3^`lNsOZ_
zuiYom4uE=lR@v_YVlp_#o>%7B&n4qLHghQ`Ew|A4_w4tQghfLU4}-l38SFDx^bZPM
zU*0N!aTA|0h|YNA4^v*d@xJ@P+FpnKhcYB`zwb$n0e>-gR4d!-TsMQfQ*Wn`*KtFT
zK5>t`^z=3P_9mRL^_&~KN7_-V?WrlHW3KS;!wWq-OpWK$ys1?0L4lP+&Pnz49jdjj
zkGw<R4NY}zI>vZJb7s!s2LYA29%u)pYgy}&YZ`o4_X1``azru7f`g{)cg=D>GJ#&=
zeNx6}xy&I}A2a1v&tGcg(pof9yJy&6vWNT?bHpA2)a>-{9^KEW*-J3DWx3lM835t8
zZ~!BN*qmb=*Xw8Ov-?<l4*j9@l)TaWM{jpBsx8%|%o0f0u0}?4f%$P?&iBKw2-*0C
zM-s%R%R_*0OtKMzG1z1CuKUA&Gx3kWe-T@Fo8h;P?sT0}-4r9iHwPH`3iKn7t~-w2
zb}K54b<GE7_!7O@d%to0G28q!@ZP0u1m$69X334?`GG!%{{XL9TIax@4obva>2RLA
zqY;c}*1slyW8e5MmyP@@b8X>Ijoutbj%gMr*Q^+oRvczn7?J@QIb488PJUm~583Db
z3O)Nj{?HnFUwA9xKAEYfB4clGH!BVbm25KO+*i(GFqphE_t*Iw#<ibge^>pNJQJuZ
zLb?=f8DE&P3}p4%J68qb{{Yx4;r{@LfK|~g%RW#ch!gnwSJJwFiZqRK+BqyPl2tE+
zkvQFv(EHTJDAy|zt1j&Mo`$&HNky6}lin=&2giT#O5X;}Guzwfk%F#CXp@o;U&pn1
zKZyST;E?d0vc}R!6mCpQ3gN-*3H1K}JXh+3@jwZAEtS_84~|VkE`z6C6+>*e&R7xO
z+O&=;OG_Ow#8g|e@teiJ@Jjyx9qACrmJ-K0IV(JAZhdkHInN#I&iqCD1bkA_gt0G$
zr+DHZ`LJ@54^i*+#eV6{;7<(QH<b3#pmKM%+RwfCHQ_7p6zQ;-lpmC+9QUGFhc{zN
zc*#NC>V5)vllEWuui@n_ci~IH8g7}@ZOJPb9H_v{G4!ru{uS=64A{TXu3_Ay{`n5|
z`T^3vpe<|mTksCBr3Z(DFdU!a1KPaX#~<)cuZEr`8=u38wGWxOMhku;x3_-vJoRpt
zhixpvpW2D|iD}^pkR^z<Tc}Aasy_2)s3i6kEv|(M`B7b1m2l+lP5{SjeJk}3;t%{1
zQ^OKny~dsPm`jpY1YMy=)N}cMmEpe<{{Y~bzYsh<<{uBAwrpb1p#dBL(MdcW{++Yy
zSXPyIH_aA$v~hSz*(Q8bainRsvq+577|G6e;Hd1ZeJaVa+{%GcUo!<GF^nq#Ubo}#
z*-zr%g3@{KJU=8h5MWM|#kdwda^tpZ&o6v4b*A2neOpesKp$*UN5<K){9VH1pYkh`
zRa;x0j6IySi!uKIvJI=Xq_W$}vV79CX^y<(9jeOse%k;+Zd(I)md~7=bgMS@&1NLB
zeW?6wzmt?X^&LPSwX+?CqOzMN6RW5>jk2<wbB{q-PE|XbMlmvCu|{XKn@$E*KqQ|7
z<n|umQ{d38Ws7uC{q{Nj>GvL=THA+Df;l5Fi4{`?UE3pZ_wVUiKiINImy|Isy;p@(
z@9A95rB3F`2;}APq*k{}9Mdt0cmcD#@yG|(sSgf8XL^DwbP_6I7Gt>W_pa&mc%v{a
zyArZUQDx+an2t#`7||Xx91?9P2@C>#;pz{qZBG|kD$-^%!@=xummU=RGVN%XF5<}F
z-zTV~9uDblmW}f!^--MrjQac6b~KpL0!XWsMlzn+JuyzT&@E#v68VVD2p(jPO6NU?
zVF2_%3%^@^ahd&Hb~s=7MBxC4V<aj609O4${^|Fo4-DJMDkS9-%mnUe@DvWj*QBPA
z6{Jmm=s|!C6N~}hKjT;z8hyOTTHN`N%o&s(1~bhI6DGvyq_#PWPYl~daF*~wg&!IF
zK@J=q$33dO*M{uvm>_(myC2@hdHQG2dRI#oq%vk5LPm}WKX&m2!whmc^r!}(B(Qy=
zBE01zS05q4@AdVoRVK)Ag^o(+K$2n&#BC&Srs$R~2;-I*;-QnnP3A=MMTG;09YFQ>
zHP}t2t=#PaxLBij!aE@OkoRCcD!u-emUcn}b#`O&G;B$K#MbojGKS_(ij&adrqG;*
zhE*msUCSstLg%sfsN2Ikj$=bLp3u^~BL*TzApZc3cNbbcx)zcfSrQWxlM7(7wmCWX
zt2X`^wz_q=vyF<#ff^!s1JwRKYp3g^eOYxlNc=4nj0XzDfJ?c;j>OXkhY@ZX@@rX`
z!asDe90_sMf&Mk=R=x{5niapWD>Q6Ca^ZJ?dVo7(pqs+B5kkvxd?GCPgsx8msRP!R
z_JyTuF#5XcdF8)`?l*~Nwot4I3`Q6I)9>q7Bk+rm@yJqR<(62YO|A45+e_idSp~w|
zmV}+H8+B8UQR`2+(%RYx?IyHaXFv{aSLSSvFh^>?u3u34yiNx1!Lo?f+I*;xWe_gc
z865N4lFP#KMSRy1>6n7v74jL>76*~PJ@H-jo|~k*NiFo38|7fCV{GyG_V=XJw5tb*
z$zvIj48B__Jca)Exb~|0)R?`5QRk<^isChWKN6!BX(Jm|hp8Ru>ES43g_=m!7%>4C
zzoU=vuG;rUh7^`7yM@ePHc$}A8-Ne^Rcp;ZPm10}mgXdkNB*_gs{@hpk8@P95)-8Z
zj86^})C}@3l99%-fg<Hy$9!}Lp1uD7DpBDuttIr*Jh7+-U{{m$9RL;9$ev_AT&Sv&
zoTH2kf!jUJF|_^dgBd`>?!WQ-)%$s}eVsnXF)xNK;kYQFq=ZJTBVz%9s5LDzKvD}U
zbU^<AbOZw=4o+*Sj?hSpa+d>_D)3_^RC=EO07^^k8cWE<l&Q8Io8@q)a<8bxYYNtW
z@e-v5v^@U+`wly&j%j|+gmM`fIRtn1tzYaZCbcs(X#0l8XB@Ep>Gt%lnqLaoEE_}~
zWNf1&b_)B0>FrDXm?0x&yY0>f;qry|t)42I(K986vB%x$Fd0R`fGlSb#}j?zVb>&e
zs#17zc=Y&f=ex^VTr}46AlgAc!y*1IE4`abe6m6}OtJ4+)C2OKFh_c4_Bz9E_6s)S
za)-<wRzdD@o|QjYLU>fp68plI;__&$)g*@EGzD1Yw{<JeZ2thBDZlWJO>m;h;i0#b
z{EPrR=YSXr>{Co@&@Jt>?XiG<Nk&YBcLZ~alGDS<VFSImG8f0%CS>`P{SRuFiPv&|
zrf}E36S9e#$?kmHl7n%NBg;Lx?glzkXFyk!M;@aIxEXlH%qoF^NFC3q?OoQTqTO0r
zm$qQW;e=6aO!<edIp-B}T^Coeo(o4yIW7KKE@FEyOj%M1LyYA29S#LY*6q|jrr$%(
zE&MGDNd#YKn8hW@c6e|MZH^co!`r1sJTEkssR~($;uE=bF>QHIO~C&EcR!zM^u1TX
z_ZE-jUBf5_FzWHgjK)V8{3<xSF&K(F_Mag}#b#WNI%bl^*={F-o9KLJ8nI+wv!1<4
z;EIn5$FK#lfzRM+z#^`E)m*X3Ir)dErI}VX1QJjIjlBUQn)~zQ#7Pz~T16zWDiD7<
zKwUBApbCEQBkt0f6vT_<mHCcvc|YMwW{nFY5->jYe?lk$fT%1{hIaG6kaOCVfsm5t
zZblg6r6_|kh?;c_e}we_{{UJ+mM5`4E_1*>v;emg2?ps1BqF4KR{-OVYEU7QWN^e<
zW&u^5{^|GndelUnsV>|C#YQ`@>Ok#5Mpa_!M$k7F<F85vIbp)fy@5pFzHzwv3Kf-y
z?v5CY6>hW#@`yfI!F+8#zPX`<D$LBg9kY|aJARZ1UUoQMp)zD)(0Ws(JNBi$tHvWu
z#FM)u_db;yWeT*>uu?EnAAA1*txFZeh~_~y(&KC6xb&u&4-8dKakQ^PPIq*XXNpFa
zO@IQqJ3WSKB?=fRV7cHG=qW=gu~*!<ToW60HCNOGkyS`nx?>6+m^oba6fi7;J9(rr
z?)f)*(!>|-2+}(k!5lABPPl<!nWD9s<=Ao*b;<VislK2Jz$}Q8e5FAr9D_-5_Joi#
zE=vGPg~uMWjIk`l6<{MkSd)TJr@cm50Oal&$so~v0GcJqVDT1w0)b92-v0oFHsMjr
zn8w}1g&i~PN#}(?q>QO0K<a8KW-bG9{(UHONevG>nl0*^Rz9l3lm0Z*!DLQEg9CWU
z7^Vq8loA^l1CyLmd5yDf+=0%0Yd&;45AzE*oadgI#~7vzD~Bu?j(YJyIB--Ej&Myh
zkbd&<-lv#p4&0~j@DFiPnZvTX<$~jA2Oq6K7=j5uOwqZsf!FCmn?Yh}B@ZZ>*8rSs
zUuuj#0r~mC$F(#Oj1DtMbLslha%?O}H#QVD206&21cn<x&wPqS2X^f9o(6dogoDlq
z^!K9r0HCh~za7OJiwtLyc@&$u=rcnN$8((e@ro`3fE%&UcPG+}xjZjk;C7}Qjy-8h
zllO)`P&gQ+eE>bPpISqZ+1rjfQI+XR%0~ot$jui3EX0m;gWimga54DzqZ#9^9XQP(
z5S(+8DL}yl5zkRZG08moQfHi=IG_M<4teLCQlo4ofae$<)ZQ~nan%oQL7)JEjvKc=
z)C_gU(-aJ`I2rZDA?N%k0ewjar3Hy6r>7Kv`~4|#)0ze+PPC&S@_w{%d-kA?XaF1z
z7x5y3FmO8epbt;Vfu02d4hLNRbOFwK4A2*XGyeeBr7B3qIrPN?5cJQl6m9vic=h(D
z5HpN)=9EXf<s%vHXaSwNfA#1C`SK~kHgH%2!Q=r-6Ot5kAFTj1bR-VGw3rHTcr_@2
z<;$EZs**_`r9bS?v1Ay-uki|3L2Hn0ZKUAw>q=Jyu{`$`GF!2H9D)ZQ;Z6!Rmkg&T
z)2XG*hh|q*z{7A4tvMsy!Zbq6c^Ky=tRxY$6lv8{AUR>m=lRo;CM$(1xENpuBzliZ
z9EZxtMY9rPaz0U(!27xF^{MC6($+6E?qhzNf*-m)KD0bi>@ldu??dTJ8r(>$B#|!C
zm~<lnhp4D>W92Id2pK1me(rf6T6A%N$Q}OorC4iVa*_PSQ!W7ew8w$)p|Owe9y3Qh
z$ID?J5`c^qEWJ<jqBKN6Bb4R7S#i%5DPZbid3tbIj?}6)=b&ZoI#lx&%18ER4)M8F
zWl+Hh&OxS|W-<m2Kr6@AtOY8i;gLbd85t+(O0Y)2$FaZ)HfNzd>2r^j5u^&l2{NM{
zhbE;+i=lU6@{f^68K*}X3|%f=-=d<9KAz^cd?VoB5qPIi7TN}lJ<Oy4KuiTa@=pSs
zVN$HE6>^kJIYjp1V{12OX51pie;V8HZ^I88{72Mcw($P|hptMrpETPDQ;xh>(Ek7e
ze_+j1R|mx&J4pwW-?@c)E>GXj@p^xrKD+p3`#pGL!WOa3r6Q`^!_MWxvF~2)4<nq?
zm1ks9i<ZaBKL$VGo;i3mPZ8V8B!*4JE>k3obO3d)tG*cg2++JYr@ob;Y2m(6=EU%V
z+;;Y_M9_Q|*8UrpTX{pXN+Yy&$S5<(9<|(fSHl*XUWGr{hwo-x#k#QPp0)H8sNwLj
zv=M3%TAVkAJ|Ahemom#9o8<*jwF$|I{rzimK=8%XnvT%{P_hQ|HsCWJGCeDz(KH*Y
zgcCmkX-?K*@6gvxq3G~w@y&Abd6I+js2qRws%m0XHYv+fozT21HTR0;GTEC{g56AD
z6Z1ZKHP+eaR+jq8YBGT&tN=LaxD0gdTG}0*)YdJiT|$OA7^c<gxb-!10jAsOmlrP?
zX_ZM;#~Ae$=hVbXV>7ID{Zm@h+Sfx+gn+Lcod!FKf$Ua&L(01d*l#SA=oobe(=}Ja
z-xB;eYa{;vW@>31o?-JOm+uk|Fg>f2@ea9nZLGi8<}r(zjE^)+^2iDM!_(G^bY~_e
z^*T=y_@dIs#TNG3Wt^tg-YiWRY@VO5HI?F@65M!+VwT=FSfX69X8E)2>0JH)0E@JF
zl~&bdz!+<Vo1Mdsr;}X9yRDL5B$=U+Q*y<e_3!RYdXzHzwV<xII|lJ0TB}8?4erA!
z89&48Tz`waeQoxEa$_MQU!Dkv41E|M<|~fXJb64@X1u-+aKxc;!m5tguQK?T`#@+O
z858-soN_#C`;VAy_a6M$r}auWe|l^ZTb`G%{6o`3d#9ZYBOx7|oyV~?$at6H)|aK|
z?<33skd;<v7~`+fzGC>H`)O#}oD=DqeY}2g9LBw3a6P-4@Q)UJS@@IV#SrS6jMjE?
zrx05{STOESP%DQMo8fTk(D#^}*F)-Wi66FphvBO?G3pq&kd(KEHQm2&Q<1>w-oAVI
zi~CUc_u>t}IxIig_T;c(86r&ge?j!F8XYGvM-+hWUzu2(o_qV|u3BiU7a?0_aw9AE
zx#vFB^Vq!88HsN0%d#g|xlQBN^~oLeO-^~EAV?Kh@cHHaGI*^d(U#)im$t(IFr@LG
z$34C3{f?1>(RuN-fddu68TR%9wBof`(bg@11YNRA(E8)Od6(3rnU!UttTBT2!cwkF
zH%<Ql?2kYyXVIf9vfDex<?<S5EUIyUxb5gGa@xUn<j8_BMse3Cu&b7uVosi80Fn8=
zTfCmW!llVrq>MXVEg+aMnj*{hLk#Wp1Rk|&-$jxnc1+2+w@6eRR=i<tkCAk-XK~m9
z43A=Z=B!)V$8H+-8Me&BX=i=PzlCJ=Wn9XONdbkrMD2sPAO~?ipw-K5EULegB84gd
zQlz$fgZ?#P?x2kfaou4-E)hp9j-+=YkZLf->-Kw<l2Sp!@)(|&{{RX>sT=8^VUgl?
z%c@|jebb(qrvy|2IoM<j22em16~?A6nH5Q0(h(%gcs`)kY1LBbIJHKVVr+SVx(wrY
z(vbH$DHg#kiH<`q6DJ>d`wGvV<77`bg_N><%I7RFc*SCBI`Z3wo*RwI2v>;x;(e-{
zc!b8r;!;q=+nF7*2eGNT6KLJIyAK1Eg@P2rWx5{Os+YQp%E!L=g8uDrr;onAp7o7B
zxdhh+_1&<`!+F1XeF*mTsyDifMh95rG6zr;K`v0|km`E_+)>O+k-K-TN|vSqBivW!
zkr(a`$Leb${{UFLcN6{iq&pm<5@N@4ed`+ISh}~FFAE@*^Bl0S<e>KSs!x3)lPg@7
z^JCia@)Qi`@ucQMZJN?*F9S<4o;Q>zF-Gcq&O5JTj{g8!&A-%^BywbJ=sds?xMF&#
zs&ZY=BuQ|DyQ`H}AH$B-Tu*Zq*OcHcaO@p;aC=m?$!xuKs@&rZG)6MHWeb)B_WD(6
zwHZWSW%a@=ysK<pF^mKGRaqqpCMHEYQGa$m@yYCJHko6S4I7Z)4XneDtt+x_SQ>@H
z6e%oZDdg?RBi^B!>59MEqzxfBIQ8_X<(Nm4BOoDpRTwQxD!bZ+Rpr4cfsfXm#3Zj7
zMU*6|Bx5i0aC>7Ej?7e#F-|#%sOj%Sk1qJ<MIocW!R2xX>ruE?V~HbaU4ED}Cvh}|
zeZ^&!TmgaRs2_jn?@>4JNGz-|_cC}C;_B(K5u0vvAZ!nQDh8d8+#KWO80%J<1H>(N
zaJH)Iti%AvrzZlwi1=CXn@8~PhwXKHh!#uJ5qp?6a9bQV<JP>h;Aet{v#t*iYPLUU
zw6|i76OIEPU+G^&X&Sztr^IfruG}L0k>G$-e|O*7zenK=r`&jovEOU{XNj3&FC_@Q
zw==YhnQxBmF`6lg5YFAlrVl|~55rG~y8i%-^{H%a<J}~1v37sDqdax*Rin`7)NZ0n
zIF>l38^gEW1JKvG{>&PDQE2*>r+a4`8$~g@4jD&d^{={g{hS@1$0iz@tvyzUp8P2`
zz83g}_G^WZ%WrYDuA8iF=m%x4qvK46Q22ocvpXz{9k$Q3#NA2fk=R#1qG=Zr_|oT8
zx?>wlJ3NS3e2Ja`Bd!H?8kOIKvKr|^6B%g<eEGQc>?-*!Q=4Pe!_rZPq<U9}JYB3<
z3G{n2BpJiHsri1jvGBLTTCSht>qzy;b{D!09~j&_92)KZ8+eORlfjo-uZHx5fZIkq
z#*hXQC;KD4X!s*iJ}U8*wzisLi9@QBDs}b)u;R4jQdehe8%-JBHnG*0;)mIyv_@6h
zQbYp{!Ta8yTIjVe6xql2KMlT@9mB@scpwFgk%GYVCbT?Fp<Yk%3hQ)o$qTA7M;v%A
zeF^^Pt(d+aY1;m^W2|Z-IBl07yA6zy)HmZ%8B=L@Na<^q?#E2O2)-_9-wkg3ZQ<P>
z0cT{5aeZ+l7;hjc$W}ZO06#BN^}sxLiw3DCn+dpie!wl-Tg#omEJO}5&wAedrGIKK
z7F~QIli_xU;xT36-8MXH5L(;rlHxQW!Wjw3Qdi~}`G*+`kbgA4YtQ&8pNl>-cy<09
zd^6Lh(Dahe4fWri3*9DhwRZj0IL><W+P+gU&njhfB(V`(^1muwyR&GxK`BX|Q~O~2
zQMUMx@xxcS(=`Joonq$N%qx~zNF#H4eeOTtAlH_vG;!tCl!1_;c%kD+<{)kX#|XzP
z2iB0bK4|xJ=ucYwvb9-Pt16P+yPR{IoZN{)%L5oAJrs=d>rUQ$!lpno$4;K6pac?B
z1_Yi7KczWx7k1H}nD(rRO_G^Vp>o`30fFm75YDY4^Z@KUZWP#nQqq|a?HMY=ij&Bl
z2Kf+UAH+HQDqWFE>>hWLOuB|G_b>qbDDvBRTx`xaDLoJLphiX%1BN&_8O2PHj1@@t
z?7;wkI)>6ID~<BfQ{~GOZ2%nS8>#9Gum}ScIr72n??T2)5LJNA<U)BK{`De4n?npD
zvYbe-oyMiIz!>Kxql}H91^{;crld&J##U!i0m14GB9t2$rX`5ml>5Hidi&JKk2n%Z
zfRXY;CJuZ46o!H_xnm+JRFCB&u6=4*BA(g-D}l&7k(`QR?jfddr2+l!2OxIG_)^1y
zzFN)u%%7Jz&!-hF6?BP8Lk-@+AIz|+j&k?`k5TpQQ^Fx2EUc$`oG$zm>}nyAAXSeo
zy?$2!g*7Zmx@X@I4!q}YZr}=rg5;>7mnKC*-*t~8k6cuV31HFNMSwwP$jB%93XSFj
zA$L^g<_bApIQ)HS%*fG6=12~CW*iKEg+W>miWt>*O?swOId*i&!RWa46+OgpBE=fC
zdn1sz3)VtMO!la4XPP+!vqn-ggp(W`{d$^gcdC$08(QWl14v}!InQbeO<0o3doVCe
zs)9nYsc)E*+NQU-dsQz4A3Fkpi3ew=<5U*xCfnAFXbZ^$IrRF|A-k4Ej!A9G?<^UK
z<#FHK`%vQ8b0lf4shyVEAln#jkdQ`wPJ0TH8JEoy&1_^+F!8?|K<+&&A+NsA858-z
z9AwDv`g?sT>!{n@h8D6G!VURuqNkCMof=5j9#TULVc1AsIKuVMYL*+Ar@E3Sgn+RO
zs32!Oe-0}qE0~|il$RzcSg{X*?b3$67O}0wt~WDdU>Gb1f2ACf4s>Zpb!P-7IT@uW
zO9<9ZdHx@2i|x_GqFEe(bFrM{FW2c*KeVIU=i9DbS8ywWah|yES=Ty=C(3x+V`pyz
zpIW%mZR$g*V{LBZWm!uQh4>@>T6_H}Nc9*$a}=|MLn|4j13QPX_N*&?Nn)NUrIh~c
zjyGc~?M<5MHJseYGyFm%Zoar3s{N8g`$KuPLnLc`_I8fhi2^qnBo6ti=T=5V#_XK!
z+QV@lhx4pMER#>?#`58?56{Qb9+ZZAjgK3B)%lLzG0*8#siAvDY)P+3g<uk7u13aO
zZ5Z!SCa(c0<}((JO8^cq-j$FK+EmHA9ZO@bJwCM@i96vDfEfG4ay_b*G%sl*O7~fL
z0d~0z#9$|J>6)neq^fs?V%;jTLo+zYQg{wP!5>-;za`neVV*O=9;4c+MIw2m$sXhs
z01~dGk<S=3iE|#u*vbR{03LD)9fd8uqXMrC1%l+dlh%c>aq`4eWA1`KI;{oo5KAMX
zw6UYJAHV62)I`#{N%oV502RRLQ^jnu48^#<Pba6+r%gT8H%}Q{pP1xeQf(knWi^IY
z4=bQ5gC;@7@9?L`1=(YgvY=nRw*%={Bh%!Kb1V#{jv_36Q}0$%#&0kP)k_uo;eJ;=
z{(_e>A0e2Q?jZ^YZcY>qeujwcq`2KHM0O#_Va9RT)}$In@12+3Se^&?)|Iw~@?s-z
z=5EL;yaGKcB~~$4Dm0|ogqmTwh0L=O@(vh%-=`fosiM=8Qx?cxWG89)@r(-ET{b9L
zV~~Vo$!N>qW74kJ=xsgFxSn`h<rq*1R$p&kD<_DJw=`5)%ztJ@_ZJ%vF)JLld(^RL
z%o)+(Py&Lu89Dxy)7bcO4Uw!C?UZxoNDgudI0Cd}@W0sEN0@|v5ImL#(>0XwOQCVY
zx4FhgpsNzZh}D<mQa)xq{{RYozKD&Dh(J7$$0zCZuCi?sP8Kvol37BlIlxi<@sIPG
zm}wU6Fg&Qv-O_jCAC+eD5-DNP%~|+<>UU*<Ro$ccn8%%f9>esjQD`Nt{I-Z0SQKxR
z0ITos?_D*vm2R>%lx!kl5iX^Oc3$O3?L?M{wt{lMBQXURD$kEkYR%#u%@qik(D-t8
zneEs2d!q`^DxZ__scpPJ5X4Ceq;ZTEB=U3AcjmRCw@93<Ya;=UcV`0~4LbF0w8eRZ
zZdc0%=61?Tf4ZZw?NaK>MW{t1A+&3Bge2C^%e0iY4}&B241c&fk>7#qR_C`2Ay}tX
z&kkKOBjfyP;fi=ioo^YqF{qIk0l`1P_*FzF?Pku^eA%NR<%BMF=hxDgG>Xt|yiu*Z
zmiY=d@&{GVaC=pW7(o=V0s=aWZ5hG-_I*u5Byz%@LIi0y7mUO(93G=R&+?|-MI6pz
zS(-7h7sh#PbRLvlur0mXs7V4wRf*XIOY<qmCaW1d(<~6EDCBSMSDvDuX)G)r^v*)6
z;t)Dy9&_tVXjcmZ$>h5}S+R}8^d8jE!b|urjm5lijew6VbPjupWS0*ltqrj%%D-@Q
z2AedX#*;}DjHx3a*uV|LgZTT@@W&#sFA3N%Lg0SCN~A4Cw%pU^ITcW++-1&Np{bf5
zG;McMb`O{?0QaP|iu&b+x<VE$+vHVTk=u4hLF-8OcGn1GhEXEK$8(|KheO3QlS3;!
zA?_7Y;Z>Q)XvohPsY|2BxnlDP19GYPm4_ddA&|@gEU}h3R&X+__;sW=R?X*0=7_&`
z7k6#I(O??3ma#%&xmPKYTzZf2rTaC4yh76CxJE2G;ak{Jqeet*S)(H$C~V{F>S+=?
z%Yw@a`J|>}5sYBx^`@1{b`t98Cz-Bc^8D3RV4-jZILP;<0X)ZHA%8z=D90ndfBN+$
z?X}w~NqcOma_f|dIuJgc1td(6INbz|u?tA(M+$vC^HicCB4ad<<XsJs02zd5ub@56
zM;7Q?F<ZE3+{-Z7FvC5)>dtn&R`W=KqzB1~7Xm){KCDGnxOrxoRN$2R#RdY7*{92(
zgbi(XXDOWg<%<oc01W$dYOuv-n8fU?PB5f$Kl=1SBtZUF!j71cHu68(6pGC{<(X6i
zhmi;Rq5b3URG^q#Y9ucE8z~<1kPqK)Pp7qB4)RIlvbNxXnKu6bt6tSzZHo=YVCuw#
z3J5L!(DW57Y31VFhx16mIqlmuae!QGkj|S%^_Ah1e3Hk&0Q3f`UW=%hNir_OE>bBY
z!jtHI1z)(5)SaM&bx)Z?a8IH7{*@C#rWSaEkM9=whzGdOrCX%fT%y*oJhL(@$GJl}
zEtX$w4@$8FQrgEEu|{?dTg&^wfgJVe>q#5R36faEaU)_Whp&8|^x<(GxCUl1yD`R3
z2i$rJBT20VbUC89S5USR5~n_313yFUPqwpmxe{+7J11a!nq+dk6YPo4nto<G{_ySi
z3b$=AKe~!31D5%ifrILCU6gRLo7hfi4=^OKylE&qha+#@r$=nEN?J$Q0ON4ZeX77J
z0e>-a+zgBZic*o}CR$8<#HV5Y73xC)J8WX=q6nh%pUXnIZ<GcUiD+Vp;GIjzK?@)_
z+G@aydKJdd$K`N2CY<ADW(m9H+VLp)fE`VBLjyOuA=O1`p@9n!zyP2-?&6y8%8q{S
zR|Cu2&(@{fmsayYk>(^HGZFW_vq+EUF-72<WtjBiftu{4fP-l>7g|DD!yJX8xwjie
zLxny4>srcr;)NtFmQ^7}J63hG1amFAuI4ymPhVqNHflhGkiqkUr19@wz7GQk%IJwy
zZ*t7$Nx)PiddKn-zbPlL<5e#uhCCI+4Y^^r7(Sw(CCWlanIPMfwC?Gi;<B|1*NGZo
zCK*S5js6w%SX>n+qemrLtt|}C5M7HaQzRRqd04Bm9!+u@jM7JYn-yhH0|jHa1K;sA
zudQE(nVCn-2i$I+{{W3)x-I<X$yP<*DB6tK+<m{ovc_RyQe3b{ENVU3mtmz{>-Q2`
z*jheIk{@r~IqUxb)~~34W>4A9ORLL0OY8(pxXh}DX>4=Htzdr6-vMrXL3thar)xKp
zBLr4t#twVpzW)86J`4>TO^mcn6miS6Z%l3@xE1BRI>O1hEl%7$FKw?wwfHgcmLCn-
z#-hqIBS5EUOcCET?HUGzB2|@}=3a=S7_9#Q4d}7kY)e%;Mg~~tA4=|YT|7touf3jI
z0=a6*)R!|oYEV&DM7nO7fMPL@c*Z&k+DMk)5whR`)O0lMHrWya#Yi9?4_bp$zk=Qt
z${gdSYb{$h*%kF|Mmtz!UCWKUF+Dx2&-``bt34Y{n&S3yt;j$RCbfJ^;y7($Gu%q5
zH+|FAzGD5O{x=(4K6sw>BidZXtk?t&oc<NjPCTmYmua)eKWtCh8GJpY+z3(C+juJN
z^X&D-etG;w@m{6kEmmf|yIFqF;oX^V%btoW(0^$UjW>QY@ea$2fir^0%+2=)Vg425
zkXlK02uAZ=TR%5ZUpbDf>Q;7oBbu!Fv|A6b(<8^1950q&CSZ6g>Gi9LY|@D)Xe33q
zT#(!zH~`|UY5IM{HqcKHX*}5*%yK#b+a3P2`^!OT9L1(q00Kc`3i}^g<<Tpcnb)6a
zL$sZ&M(yqCilq@}8%`9XeqyJ-dt{J>x(GG{EX0zy^aHu5E$4`<$q+26Hw9ivBfqzL
z!OdKDWs7;^5~IWfY_Gz|Gm%%c%R>z1fG8UdPBW8GBu@TNiB;B4WaI9P8q~3k05VE)
zIKT~!q<{6QWmQHcMmKtvY+({9ND%>WNgX-$t<4hBNUoFYw?X8JE%L%fcMhFuu9l5F
zO)3~vWa0)~xaY2Y4Qf~jE)Sa!WJrh-uSUrJmCGvn9dzJ_S)jFHBx=4}lHOY$N2#a%
zk}(jBov7b+l=GjhIyW%`aEKV=oQ&<q^{Hc7Eu~jtrP%?DD9DdK-oMJQ_PobJLt<4~
z3!VE|WPpBBN39YBxVA7v%q4P3LVoG`_NgO=LKzVb6lI5|X(3Q$D2&EJM*MWgtsKlO
zJw!yR+dPPI^P_S=>HbYTM2vzm3#$?i!^-jAh?-EVG#@|CL5)E9K<|^*ti=S<qR0m_
z<w9c^Iqy@<%SeF5xT_oui^>D~(j-AZcHjVa6Vw4#B85R{WkwOkg_w>Rj(G#=Qd&m7
zRBtOQ`GtWbec_)@!k0D1kzF8pkVuRO2O+@e^`@IF#^OheL6TP~ozL6@+OH%^{{SK|
z4%`q=094}A2Z--N@-O<eM!;kA?@=aKA<qpU!EpBsjK$*sL`NX!@~SJMNIb%mDUw{H
z#_N&>c;wevb*Joo_aT9P8*knQs|!d*c7=QlF=1IbSeH#44zb}lS2KN?i6?FV<dOar
z%j;eV46PJ=uzZ{kx=(ZIUdZ}-%@9!BGahlu`&Dbr0xACh)mwA74vGLI`qPbhM8<en
zOz=HN!nbful!!Ub0)c{k>o#3Jbz_tR95>6-y~_Upz~V^)DF_?o-lHczhtj#7Pr(6g
z*h;yOF-28eXP&jRaZ&1VPXziNSk~o9VhKI5O~K_r=e~PaWvh4^QZ_6SLc=`m<ok?P
z9-*Kmqy}SgxF;L4{Oh7MV=kv8s7^bhATK+5bMq5Pjxt9+)pA`nRL(~ve56zY3}HiH
zXNEoNRMDG@L}wh5Iu5j%90T{gbHJxEY<+}sI(ySV<G;O9WY|*2IpA^lQuP~h4tr7#
z7!Z2&%>aSbxE%dzg<(l%84Exz8129w;*b{3J%3sbG4nUnQvu<KC9--`grSZkCyuxn
zCYU~B*R3j+U!6`5t!Wovu_<$pnXpG}as@cKB(MMx*8_@!JmZ%2Ij2U(HOnI(?h(^9
zqL{2%MjOUTjok?EN{$FE!1d3qSKouWRVwSqH05L@nX`a0rB8a%G{jFN(x_=;A2Cq5
z&uV?N#vJf6PI(!@^%Yz?vDjqgyNX{iSZ*VNFe&myh1qORaHq^SSY<f`ahjR$<hg{y
z=amk4E5XfC^CLc5N`=vn3L6>xeJOmyyctgRR_eS|`zYKwnl@~FNpomOj(qL;c7J-W
zf5LTt79=F?#sDXk_O4*ajm(kY_rp_!!HS7+RJT7$&EYA%S}j(Z>UC-3>0^DXbWToG
zZNVV+C%ssU;u~A8*ym#C`61hpTxgZm!p6J#+PUvcGH!o3let$M_pGIWqWToE6+51p
zrF>O;NmfX6ARi+gy?Et?YftfIuaHd@+(BcD7T#KNt=+v1c<ho$SW6V;3IKR+p7i-A
zoP~*J+MtXT;D4Sgig`>WE2C)RYeib;uiN}ei_BEm3%X&PWGVbTYWAD)4@@#dCYTT%
zgqvH0#dx5&xY)?Ia)Re2nEr#(r%ihLG%&bTP`@bdPp)e>l%q)Fs-}Cjx5PUc<O_vH
zX4{a!h4if$yl9Unnq(mC*x2cT(>3$h*R>m1gd*v|CwRc*pIV(fS*zQ~U+rw{-BiCB
z^#iqX&nJgtb(u{cLqp?xX&GKZj3ObKRe;=m8``yPym4ieR-QFRkh&0l>GZFf*T;II
zIh@E<v9t}t<sJT{)TiP`xbZ8r;T>Cq0AvqS{Og)oEMG=wvstZ?^tPSi%RNI<^4?SB
zk^}Y!{{XK~y76_SS4|WXIx-QuHR`<ZGwWY8LGf2!wvnFR?naSYZhwF;sP#2sPm5a2
z@&uabaUKYa<7w{M?rJ}=5_%>#n@y`9Md|(_gv)mo)!rjz4J>MYbvf*PeML;3A+vi$
zk<MdcSxX!o`uhs`%E#iKq$Ed<Mu`!ARh9U2)2&>&_`$5)$GqMvvK;vvamegXZ^DUW
z*Lp>Sb6G`deG<BiEeXF9q=?P6op1vB169*gwp)_|+%KBs<0pW9K<!=)Yw@b#t=r6v
zm7D%pMt)p({3(-sR=A!+GvR<xQJwHq{v9ZeQ7H5YW_;To_kXBck>*J}ArOHqig?aD
zRMt1vS1`#GXf}o3WmCZ()$`=v7jC0cv*7|RVNlswSobvBe~kL-UZPIQ1WEG4ji8g)
zk=nLdWlo64>&oZS+C%teJ663nXsV#Hp*UjQKN^j#^lO{=<-M0;?#n2AvG>J%{{Un0
z#_}?gL2bLsB*_%+Gmla0Qr-U0nyk^r+G0S=@)0?efRh8TJ*!CN)e^Og<&3+z^%QnK
zABRqzEWEc@jD<k?#z$YRd7q7Sm~{PK+S<m=kqYgY7TuBuQC?T3{?S_dZi-t)i^~MV
zzJI;-#dDq@_<`aLX6x;j7oZdK7@~3rKC9{Uu881jRd$lGm)2BvJ&N<j_7GjFK|02&
zRBp~nw{U&xm5+|CVxCClkz<WyER7+{Gjr3@yo%e#7v)EsP>`Tw>EG*BA=EA&=1FcY
zr3oW$jh%?^&lRf5Vbz1jPoe8tpO19Qgm}%vNh^cps<t>k#m@$_XYr|NGacA3w`g6T
zcih*XNvTRo8_B~%0}=)~`X72reON3;<vh~4JJp|a1?+QM)4)-ttz$W2s!w)y`iF_+
znF5*4c43)M9QqE_$hC|8PFGM$tY|jx><1iI9sRi27ZI~QW5I=2B(Jak0AJdyX#OR)
zwX-(UM(4~d7C_^4eCMB9-`K@15uZD3-m};4ZLWlIw%DH~C1=P7obInm@I|{149M@d
z?N^Ld10D(vM?Ur9H+~?7J8@||QJBagLWk%4J!^MG_``W+V;!{9x}<7BRZ+Sj*!!P)
z&ZQ>WX$~^B=XUyLm!SBeHH}6TF`S`*jGf-O{&lE4L#4f?z>8A|O7j@>9mROIyYVLX
zR+UA)+_J>3T0Gzu_0O#=UO1lWD4@7v17~{1gLZ$1liRLA{{Z!zvt0?$^&b)V!$khd
zx3YrmE~AO}?>P&|>z;)6#d8{m#t5|OyzM^UaoQ9hBLfxZQfv3cXPZ*Iox`z+!u&*|
zKi%n{ezl!7+7PP?Fd>QDPD4}VP2IAVhpt`z(6>S@_LHdEn`J1+laA~BHIJzLao3=V
zMz<&m5y&_#pXpv~_bkCBm9vA&F9nC8q-&#w4oOqMRyoJ`)XJ1(?!~#%>OT{_Q+v5v
zR+}5cV}3?`NAkzDV_xf5*M*wq=*SE2B(caj?dkNa({ac}VSsW+tvAg%Vq9Q#<E=Fa
zLu40eSe{#^0hT$kS@Lo@{AsOmBa$49_XKfJ?kANw2N^VnB{>7HBC6uCD>{6;$K1(2
z;)E>mtYiXr9GrIarYLC~EMq&c3G@|a*4WAOD9FLV13y|<8bZf!BYeU=#12j>)wY)`
z=LOShkVx)+wRc6+US*cyK4Gv0k8dP{U3QzG+N_Wp=v7)Vzbb#$l0QLQ^>GoTZ%%`m
z&S~Beyt<RkSoW_>mB?K8#cpX{0hTL;iS8h|eYxKjR5zx5F<p+EV+&d^dm@rC`Pm2~
zXzBRYoH~4W%NwPUZJk6wFK+eZ)yyhM*&Xo0(@SF~L-1XcDGairM<hcnA?FADD{kMz
zcJ|jMNsu61H|~xVzrc5`1k+l0m-h<LH{L73Be?f9dOIXZmK9auIPdbGZuP@C&U>?|
zLNVB-1)xY&d12!$a?SiF+|=<#@x=@&03&mL^nv@o!@X(SX|FY#N?jyT!(d|r>E5f&
zY!*jBGAgJWg9DT7D?230DMfCud9jiRMg8#3Sc6wBpm+=1K`@m0U=rCOJ&t-*Eet6t
zqsHbV^956byU_ao04iX*b;J2h=B{$N;fJ9e`gN+@4G%uwaF@+eIvgGWs4lO}lQJs>
z1Cj@)wM8DHkigd_*cW{HVXy!_`1h)}6C_I8RGr;sJrmf{QM(ZLx>;DR8MhFi7RC>~
zLp0Js8%HdvKX`I6%KI8^#L@XeTfNd_0a7kE4#a!aaAJtNLnh@z)2S`#&wA*BS0RoP
ztfVlDcH{R+&mF-Y^z<Tm5C<_SJHB)GPq`hc31N~&%VsGz4UW8V+!5ZUf(4FH-cvIY
z9l7~sUr+I^z1s*_qliXKw+iY>Gt7(gFdYE)8R=2&V{5e|W!_HlC*E&QpsTjFcQ+u-
zIwWWbB>=%(p54C+RIw67L~@&$R26x;GB7wO!1L%q93NT~)xpKGi`&T~7{sM!;4#M-
z?N(CRc6ov^fN<fCbM8L1X{^P?tZEgMD-c}<S;tS(tih&5Y@*r3j8$@yXM^l$bz>36
zl$n?Poh8Hh6S6Xu<bZbp*nSmi-%7cVhqc=r#ykla5>yU^e~oJ{oP_z2A>Fr}9#6Nu
zSdQKtg0T`~T*y5>l`j$4wMV&~9hT%QWb+pvykNYs{{Z#Xi)}LU<(BqKV#}NbjX(n)
zrnJqA!63Q}s*e~|UgY-%mL_R{XKl?MNC>!9UYWrDbuOftN(mY1qqML!n?!b!Sx(+b
z{{RZmk4i8=EiI>24s-LS?XQk;=~94@MgmD7$u3y7PvPzDN7}ccmN~gr<yCp&sxD%*
zN#yY2TU(@;lB&wG7Wpzebo$pN;~N`8b3MROBt`{ziX0GogIyM*te5`)MUjZY?g00!
zeN0Czd5~?5*MsOiJ?o~Ml9FaKSB;K;LeecY$nFspJoO(eKgYM%HRhf^@SOTtx@|W_
z5{3m{O}rx#Ne4atmFbe)NulZqsDM@^Y)XKDaC_EokGwN3xgtlWOx|6<^CMI^EJ){d
zdstb`RJTTXSc+-F>vVV|S2L}<={|U0oR$D`zmN2<qkm#wio$;$+xT}<mupC(8%Rvt
zPDpNm{{R*NKS5q2<8KVfV=_l{7kK$(kxmZogQsfC@ZO~^gRI8v51Hns9I;)jt&qTu
zm^|m!w8c{P^jsOs33AHl{blgZp=Wob+#|+(#EgRjNsahF%lX%p{7%v#VAqXq(xlsi
z#-{-Q^z=1H_ILQj55$cQ4JEF&-Nc!i;ol_VvmWHvapMa^b!OJFM5WPpea;4J<SJ2W
ze2<~s88}Mk&U($8Su~KzYIb0l_ctni4Q1)p(i?Fi<v}@gen=jb-gvJ-I(%}6w|N-l
zkRFbG1z^o*<i?Xdp)wvsBd9gYC|TW}-5UJxF`Cxm-tp&<?F|@LLcb^-cohUwsg0aE
z`EGWVBb<ZS)va3c1_s@(7y`Ls!yJEwVm<Y>)PgO<hT%ds0{fq>C{uFS+H+AZdFTnl
z5Oafr!+TWr^V`cBTS<8mq|%jbt@B2G&uYv|n93PqmuLX;dFQ1~9p~?&`!rFh3KiXx
zJDB%1q_FP9My{sntO#NPa09Uj*}!v-a6KwEyIAhwy^dd+7X9L}`@nYkX0wg{+bDsw
z1bw83kxx%?{uKw><wcR&Ga4gxlaq|rN`#rOwMK>Hk1LytcZx7GC(I7nM|C*q^`hfc
zNx+^M+iMY(JQIP^vn6>WKWdtFRFq)>Cz0wZ5qBHF9$9lLl6D5h2TazU!7a@Ft1R8z
zAeHT!KQJf^0=5Vzv8ch3p<}TMfJBk^3-48;k~@?J)?L84@|*ax+<Vl^92W>}-Z^&`
z3pU2a<vsrZO220kIpoVW*C{lMd2cj|iyjDO+@y{_3Rx$bDV_(icLg(*ZaMnZYkQ2%
zi4;Nu>=_sgdwmTo*ASwwm`Vb1%W_Ragi{|o9+F(gDmz>%?a7r29oX&9N=U<$Dq{d=
zEHTDtB?9h=_sHBjsr!PQ(yqlQRZe(fxdi))iy_^y!WHv=)bb-9gkuDb!!>6UM+3_$
zM-WlY^Y@3hrBr4C-rdTUz+uKSpGs_(ZZ3Y<@rGqUs*E`L<KCsg$ZAOzF79RAB!v%_
z#AUKRZaRG_iXkjaYk|O3FP+EV&{Qt+s<Zu^B81#H^{VT4Ey3FaSmPvP?^VW(tV^h_
zUXdmfkt{>ZA1MC-d)l6aI|)9^Cz}BK`Tqb{_4TZyezG}=;Uo<nG8o{D)NOgbF>XwQ
zpWZfp^7gG23CR=fQfEVQ<}KGL6lEP0w1j1jIxc;xJDaHO<@-7Zbl{z*EJ+-S$rmcI
z{_HzspDQhrr1!^jOiRm^g`%0mNebnj1C4;5r{1Mu-N)^_8W$JfByQzNX$lrRl^@+T
zU9Pq(nQl=Ia;$h?p{gEnU)*^NQg$k;P6_YHr!yCcoW^ilYDmYa9eDPw<3`BM)ojy-
z_0_X#<m0Ivf%U4=k|RZqc0ydXBRr4C+|&|WmMtqs<(0sfY5Tx*;+y8Yd-6aG04P(H
z_ok^N4y$On_J|!kw|7TY<N?%r8m~3P;?!F~F4+;wW<~k1dpEbGMJ>z4EMf*JD@YfS
zoUS_l9dl92=?XLwTzP?q&f|i^+M0??mn)*txkQmy?Lgq}jfWe!>OPeOj>K+P^H9i0
zAuu!jKdnc)BtB%g8wN`Tz(Mc+6!f~kw3m6E65d7GAPJI3x1p-!CzzhrV`nnmO1@}`
z_YmCx_V=d4B%4AByui|us>{wh4Ado~-oPD<21l4r&GZyJk2GxR!cYg!5OftTH$&z`
z(MxZqw1OA;N6f-rN-^pwR$%f76a|$q$nEz})6*3Ma^;o5jg$lCt2ZEHsP(Bg$K|XF
zS;0GmxW+xd&lH?c?pTRYS>}=wtfLAUxIX^W*53BMT3aa+WpGy*{A#>1TkdG(R(Uak
zM7RSzIQ6OF5X{0&j^$fxLB9v;eW`Mx+?NqXfkP}&gO4zr?l|RrsYEv_1+}V@@0Lc8
zZasZ_RQB=3Y#KSEK37M;$r<iF4PMc#Vt8KO-*W89RVS7isdhk<W?a^8l89tXnE6l-
zL+|TR+}n$(M68RsaDGFy4l$F8*tpZpy}7~{5ve;+bDa8`glV2^>ay9&vEVrlamR7*
zMuTx?UA%KoF4$RimIgx0l^}Mhgli?~Bpjw0Ti4Kg)!3||nGBam%Ns~SZ97Og<2db7
zMQt2%dEp$Gd3Qzop7icD4&^I*ON)68^G-{#KQ7;uN2k`LwbGs!Ge>e{X*w$(kq4ot
zUTc=H-0hFbcLWAdI4pg;Rt~r0Yg<QeDt)qpwn)E)e-HE0sxX}1hI5@bE4FD|+rb6E
zQW8kva^8n=>PMia&8XTWYSCPkUZLdY9;fMC9=q{g*;(U4=va?Bc+?eDu1{R}pMP_5
z+I6#esNWze2v<|i?rXlDUtVur4oTwS6`|?6r;B2>xZf+QpiRoqb-?tjIesU~e|zM-
zC|HG#JRPm>ew^2wzNO+%5Z?a)XX$pYJ<`NOEFggz`tjbF`cA25I*oB!+$4W|vE}_S
z-n}|Gbv>Inr;Mo1r(N-#&Y=l_U!XyPBm)c>o`$k6Z)FH$5rrMzMZqW1sVs{GZFO=j
z!vq`BT$Ui7tNt~cs^2I<3e56_Q{|H9fPMSdwT7ib1qRW{QgW>?c)fFavOkw2F#*Fd
z-Ph=9mBq%Pd3YKtZOP{BNWjTa>zbi0#FIqw%s^Hk6-DknD_cNFnM5v*7EAySRc^$4
zdsI}$RjC$`qZE&*Kj4~wvh)0J_}QiSKF%5LwJmP#U<M(vAh+GQ*@+)1z~K6Uj^uwt
z+Q<A7J4}n=3?3HI{2>I(1(=Q2SwNOfIp_%o+x4%`Z}>Lf;8n8xKwpWP>>;6sXjaXg
z4riHiWZ?e*0>(x${8ApfabM8|tg$7qIXS@Mzdn{{Uozr4*j{c}QHtxkd;Vv7QKyGa
z*KGc3{{Y~nAMi>TJ{?<2;(rSX^yadNtoBo>%Z?7m1Pq*V8>s`h2EQh}ap28oLf0-d
z>1+*_W;nN2-;ZKP1Ju{`eg6Ojl-7O+cmu#%=f!V}ekZZhG|MeHW4xB(l<px;6fSbj
zle8%1nSdPE@~`oS;ue$f6UA5hzlH4PveJInC-!p8*pS1#?A^)vihxf&Pg7q>mtvMC
zlYO19+~aCdm6=Pzwt8lpD$98s>K#v(QSvu>pGw+q8{b$&)>ebdiZV+~hb+MLQhL`L
zYk3qq;5Q7YWBC|ol6s7PT1d5cWXfF4nA`+cW6tdN^{+>vn@zK=hsT=TyMZK($j!+^
zfa~Z-dcP0E3yB%7CXw58N6L*j3`b+=J?n#$R6caEK{#Xs3P;{rRMwD78nnhtU>qJX
z-}zHoY)gsj8V8OgyS5VAq^|ooM>~1+KEk`d4)~Jd?8kdG=+E6@j1z&|&<@q$T27-d
zoIxuvJHbXq#_al^L0$g<g1ko1+^yZkyGX^hleie=RpdJ7r?@>oTGOB0+fye5+4N_C
z^%(UF*y5hlZHhnm{BA^N{A<5IvR8zDA!*RAoeX!sYK*xXF|hS4G5O}ayWsY(rQcW!
zy=p}XJegF5upJ5G9-_XW_)50+kPF=^`^yNbk;fxr4d^}ntLL%UtVJm~L7f<SQJU2s
zEc|8v0D^OP??ADiQL%<;&_4E&RGcUr06jWzE9Q-JMe#4goBsf@c##6c^7&#V1zXI|
zM$Ze8`Pc6c!mVS#-Z9c3@c#geql!7$`CFXr$^5wg06nYckN7Gt>__1{KZiFOuY~l=
ze?IOLH=2;EFe*>Zt&DmRk4l^leO6T!I=xG)gyl|f=ze{C75E*ce$WqhsCZW1Uoc`R
zV`tp(O1uI+f0ccU`wV<E)IJJ)N1MSP7@Fc+d&OU}UQHSDqime29#j$lz|VU4JN9_}
zp!{F^A^c^7#ab=HUD-!^r&hFe=2(V90yFo(>^kSZ0I%AH)BXs4*MGAHpYfyM-nfxG
z*57Edo)ieyw?pqMt8%zu)2PP;U>e7WF&K!iXZB^WSXyzLy4@bjW2tx}z<MIz=`pOZ
z!x#@X&ASdh>wDLbd`|tUd`IGKM0hjd=J`o)-^?S(j2-|OKQaD7zBuup?OE}2!`r?H
z>(?G->cHtF_Op|^5ZwO&z`ag$-?*;-0QPkF{{Zmk;g*>C*N-*3aMK;@cXH$e0B3GG
zgYJJi@Zm=lS~lhTfzF-Yr_?_O{{UvaV*LLAZv0HXK78N3cAc`!okkC@xALyz$9^;T
zYw+j86Wc>&X#>R(AkQ!f8iC6*9;eswuZVszf5B?}38UFfW8e!pwX4U4mNbR7Mhfr)
zG0xm$rv|<@_`~~7{AB&2{6lYX;{N~}y|g%D`dzKlM-)lee5dC<$t3=j=;1P4RaLB9
zS9Xc#=6W-${l7jad@Aw(0K_ZXe+k;hCC$9PWViCgfX62RI~D3ZMm_7oyf@+h02BDz
zUAFMwgfzR0+lz)#Z44(P<~T0ih&!?VcokDuTa7n++m@SxgfKF09lF=nf3hyE@K^S7
z@B(<J;|Gas?WDN3Y3`Mjd6Fq4qQ{@SMt1Gaa&l|$x#O1LVwb%wzGoX&eUF_#Xzzf!
z@4>;R*$q<BuUg;C)ZtK1l_miLJpsmYJ8{okeA#tpt7}MEWN8&-X7Yj@j(VR{Us8VF
zKeu0pemClO9vS#k;Gw2z#k{+XUh!A$Q>Q|xp!}*p>Tr2D>}%zVZEEV>1+}HoO{ceI
ztet7qroE!qsZorSn?|OE@c!dbxQ;h?gSjM$UkVfs^{9Rqq^@r*Z(t%NW`8BPDm#qz
z#d9}WtgRNtnb;4y6yS<%H+K?Qc^_z*RSDY|Y;aFMN~qMM6>d^x3i8*O>9p^K+C*|4
zM_1P%g4!5_uA8!13Bbp`dselVfqW`1B-8J;dv#f%-)xB>^8r0G?eEgKCAyk2(A!Mm
z9X7hNXLtBi2IlR9I_@mPXP8gj1GarBs?_52h@Bd;-bbv%Z{a7?ZEqlw+Bo#GWYj#^
z@-P7#PCAq6T;-pQtt~u4HR}brvb%!k?HXpKWidvG1DqdkW5M*UMl$jK@#o%*aL8DJ
zpK;!zyOQI|`!b*1@>r+w5A)ihrASnlHLN;Rr3GuBZGO#Pv?s>D7kF889}oDMw4DuS
z&E56LRw%4UET}u5y_^xq;Pf3wioA2+PYYit{@e4W-c8n}I^^6w2?GFpx#ap}pJ87%
zd_MT4q<k~@XJj;+rMbJhjQy%bV%q`WDH!C6!)wnRc=AWowd;uqje!AUDf0FVJ#o!>
zQ<SGuU5&XkJ-@^s@KE1~J`&QdEIu08Sy;@7Ryp+uOrcvonE>av_fI_I72ux`JbCeV
z<2Jh29y;-6p?4&Tk|N&Be5GPZEU~T>F(i%v<BpsTyTD%n{6p~zQds1GtSuUniZi)E
z^!}Cf4Y%ycqv>WgoGr<*fk9OqGZB-!K9%WZxDT&lRXS0-eNH@PE{+b9oZiRG-wnPF
z_^KUv>sLr*wP^9PY1<*l&pw<Ft$jc6Tg09>_;oG5q_*nOXJjzRCL=-WFgnya&G&-*
z5u*7~UPQ%rF@z1O7=I6_&r0AtZ~H?>d$J2#i0vYE+iPRy1uMrUzfi!#1HyAvB~#z+
z=6ohK;&_@4pC`Gs&w2RC`&erl-iS0yZ9O8HG7;gBupY<!Ys>xx_%`>({xtx(Kt{j3
z)O8Dmk_%fVn(8SWg=sUu9)`G&58UZGfST^&^rK3l^73KZ>FZtIhpg#(2uqs{Ruqj_
zERnI?-lN|>_2Y3b6k~ImcZ{`L9hoN%;PPc<8{c!lKWiU>UMkT%V?T>ywvvDC0A`UQ
zIZI_7Ir?_>uNI2#+%r3QyALcC@x8yLeu{Ws$6pThYgN*`V`Fb3NbTkcTQ2H<g!ey%
zeE0iD{>=Uy)OBfmNAT?y$!B(GQf^hpJU6G;74VJ~YRS1Td-FcZjv|~OqkTUk=lvsH
z)imp&HLUU#jP6uYcMSR-pM`Bn;{$tY@JkwkT=~cd2R)eAF@0yMX&0|!s6ir29EA&Q
zAZOc-X`)Fj!ERNXf?Rd>u6|V6+U(AgNZ0j!8Cne+S~iI;M8|L5C!q(irdn#Z(Wpzt
zc{a>hM2vTC?#8hqpU&F{m<p4&LVFJM^tpY4?mM09y9%c{80ng&7A{qLoeiz+k<Xh0
zutzdPvCMZC_db=;_&efur{O(94Qs=`CA!kCBYu|ClyQ<e6~W0kKY*?R3y7ozB#^AF
z$1RVSHEP!F@^2jy-dK2n+ycZ7G6#RHS1OXT)GWH6px?6}{1&hFk@zKWnn%PN#PLOi
zx{og6<@Qbi=&r!+BOUhrM?8Ly{>$I+S%2Bn<7KU$mw)0YG%Zeb%jvqb%7vT(osws3
z4s(Ns>++68e?6Ak&ij~Wm4JoHq>6ZX8~pdJ9XrGq`b4u_+g$lXVVy1xRYu@O2<|%j
z5ISPK%uY{*#7mibugm<5xp{sQ`n>R;#6J#rkt6#qtqX~U<q^0!1Y}^3!naI`81rF>
zo~I=J(_f9B@Nf6+JEu$IuNhhVX!y-M5l5y#`UINI-XVt~Rg@!2_}_qxxZnjRA1SZZ
zO$+vc_+4|V%cbbvGPJn2j3RIQLdms=>9`(A?_V*Bz|M_nLMvja;w|pabG(W)nS9qL
z4aqIur4cg%eBihl<kfv6#oimgjiZ9`A8;J6q4cW~yaqO!$;6mDcN4{Vt}Qz>bta!u
z)K^nPnS`9<<@c*X=4*xtEIV5nJ4OJi_A}c?r+cpAI0v7~q?Ud0Zb>)|g5AE9tk7u4
zrGmz2S#FmgbjM$<V{1MV(QZ@C77;LTL$e@Z$oJ@Jb*)C?*oh#8m@8%5J%?(|vGL8M
zr|gr=yz&=!O!uuL2{Ch7=wWz^;E#Yc`#CJH^p$&34*PaMcZ1Y79M{R;wFmqYdra40
zyVragHm8%8x0*b%xXv)cow(b<=OFXY54p|Fy~HatJ9e<f2PUc9>Gron%DR9y;mWs9
z#)-le6{fFariL!98j4Auh2A#!MdDwF-Xxbm@kW>BPi{(-NdEwLAOzs&xIUlYYXRbl
z#nv){Ex`PUxKQKM(>|5@$@^%2#QHbIEdjhyqiNn{-k-W#Xy5@E0UV}(h@QZZG6y3Z
zeq{V<_+jGThML@x>WVI)jqo-{gBZ>LWjumApKjf}YM#=SPDyRipJ#x^Q^iBf!qVZj
zv^&de^OPxqL7eBldsdd8X%dIAYk@07o8{x6CxCrxpVRe7t>)S1e)aR1$jNB^kNG04
z{{U&qZM=ytL>9<*Nh2@J-oTD??O8ZUv(i#Y7iEUs%NXv&zc<X0ju+4$Q$^fgYqt9&
z(fM-1Pmv=G4aezNdf$$8pAOqw9a2_BX^SV7)DG?M{VQwXzleM*@dEDYblqkvff{_a
z?&ET2fKT|<tTk!J-HR}uD-TZm(pnVFrQMvV1h|@KZSu0N6essjy-%gc;!;JUN#{$s
z3$VhEL+OuN^m{LXTAr<BAd>wSNlpeFWmD8+tz5VLnso>l?Q`F6g~yh#2=H6gt3`mt
z?aFg3*96u1k1^EV*6L@rmhD>903;EdJ9^{Vv$c&hTPwU#Wg8w^2ID`_*R)&y%JYdo
zc#k$C%EU$v?#Jm><o%tzUu|wR3wt#LXA#^-k;e!B0M}3IIMu3y6U^{`&Umc)UFd->
z?lh@ZB5{WR=Z>6GPp8gqnn~^2MiH)EM%DiScO9|oUX$WKg}yY4e*GvUSqlV(_$2io
z;av64h2Kpjbps;40xQXoymjr(C++EcacI&Nu=Q8FBy-l5GD^k>u3=`4ce(Pp*m@&+
z`%^!$?<HniTLo)**Y{7bWH9TGde}C$x?B_83Bx=tF|_hYJbg#CK`qQS+JajUjpwFH
zM%eOm$&=~pN;RCFjT}-llTQ#`#pcAT6v|QMZmMz59=(NV+Gw_xx_aMEr^-@QA_F80
z_0N3O2sJ%6a<-7)M6S0iuFUxbKOfIELO&8%`Kh&?B#KrrqfLZipS_OY*2)zn5*v!#
z*}c<lp<@~pW{HDHz#bI;00|zogMBG^JgHX<@)b!4+vWcN_36^;^IS&J!FZ@y%lXa8
zA5-a3O>{0NdHj;ls2{!~<!0}XdU2-WwPZOa$250&@@*A%ISo6vJAfSsso2OKJGnN?
zDMtG|qm@I91I<&APXq~e)&-2y9n25RR1TxqRoNp*3%pAlka<AJksp}x@6xG6o1-p!
zWh5kUN*Uv9OwaO4{ns6UrjdNUQr^Jp@@7QZHv!nG?^piJV)Dd~n|4FWjsf;QzM`wD
zMj;c&I8<Y`7@p&)6-l`0J6z53%f}+e6pJYNgp)pZ4&PEKMWm)k)<sv54(~C)fr!RO
zy<3{r)bGDzDf>9YN?82Iq5L_iBZ}Nyi(8_qO0MYC<S_R4t<<z3#IGHMPng6kBSGdM
z?i!yJlu}BQq;9jL1D1TNeFa*$h|NFtoGR#uxM+dPFasQYDhX~RNYX}?0>4ek^C!Qx
z4o$JBqB#M{o_HZfM!`^k1MX_OTSg=c9IW3sDpAfc>7Pp2FiP8=>JrMpC^3QaE<5^E
zI=+{4WdbLfV?)cXIU^pll-tpVvqcM78adkNY2I>%!UA|-RwKCfp>!*YPc+=he9gIs
z%osum&*Rtdt(#3PWww&$6OkAjrcyvsa4<)2udQwA`g%*G{{UuOTB{+Pv^)O*<&&Il
z=ia7O8XBgKE)6E<dg?81O~a`|k$(Uk$Gr*R%ZtT(c<m)Y5|S|}1y6IITI=sLy9b^`
zfVN^lcdLEhU&g5=ylon!5rc;L19Ow_?NX|TEsQkL5v}97UBy(g#>l^P`<k-)HH=Zm
zG@fI;B$aUZOylmzJBri0xt%pxhMj;Sg*^BIWiooUKEIV#wnn)t6!Nb0kh?mJFDI@&
zs=0=ph-1<16mNLLoS!&!LUG1DDs{BBTVV`IoMg^r8?)%WKT3Qe^6A>%Xc$JPD=7g>
zbM4#SoecKvJW|FQb$0#GLxpA?bLu$!XuW|q(5)OdS9bpZZbRls&PtKVKspR`z^S3r
zFMi7Qu<22mJjQ03Q-Pk_eS7At8&h)f&wp&{6@EmB>|%4s;-<N@($?$Fb8r=-P_g;s
z5J3HEB~mHs%GCVgX(U!8w(YBcz;yPc-k1_819uoFo;%{5GFr!lg(mrl`CNmM+wnBV
z5$)eAkCc3=-M{+P`mN8-#Q+yBVqh3y26+aSNv>qUn4ok6XjsSVj<mwcyO;(&0({(l
zG>#Z&5fDc>J*c=3+~~O&J5J;B@@Y#Dppk&XmSz5R5p-4}7C$oKw{`V2g|Qe$eENgh
zlaN`Gpl%siOlV0s9erv;8~ol`CpgGq)qQHZm0aNt2*CjJ^%SMUDMlpm-1HQ4ps_sC
zK`0v|ewYZ{_T<!AQ4x+t9ZAURk4i%`VEow6w{J>gvUMwhe<h{N2{Kl5BaPBCU;wH|
zY*c%<e9WYP++g*lmnDYxC+KJ=<toGgIRg~Aim^Dm1qg=RBIkje<MF8cz;>c2;fWmg
z{{RY%vB>$e>55E$2wrJ(u(Bod<yjQ4RwJB&z^0HEP0Hkee)p|6mLGTW?@71;pU4Va
z%q&05;~B_b&W+_)Aouj9uwZcK9+~e(G70qPDCT0a9CNv_!`w9v`@q75z`)09OzvPY
z+pRaZKZv62b{)sB{{UW-3NwTM0M?`j^BpJzcRx~T1%U89J?Tkc3ZDIGx%SO38RPY!
z1GYwa>p&oXN;zzjGwMYI0=$lciUuie_{AU`WOetWB#fWdj=W-l06mG~fybvkeW=Ok
zD8M6=iUtGM^Ppppc=R-ISY#S7cI40j)MWG>=;_H6XD8p#P)9TfKi>RJE`57-rk(~f
zocE>LN6Va(Kng(Uyz$K^PSg+%037{j{{VRO_Mj{oKBkNga7X_DUYBbVfC)Xl=~gCU
zQ(*;qjB`K@=ca!uJM{eN?H*2XjDfYgQkWP6y$B!<rxXDh8SO`Y4@!_IVta)dJ7^Z{
zLlURuUCg7X9<&UM4E-r~9-wp?JXEp5(k4LYy$^q<sizBBOocWTI{@0t$v%Klbb`&0
z0CU%%rz~ZGAn{gBsV)$yVpMJlazLm3lsC%64syJ5MN5(?L6sIVNh&jrp!TI$S-4au
zJurGz=7ci5l13Sc3U-VIKmMvyXoHxu)062^=2sz2ZDo9UaTdo=2TE19E0AM39WmI|
z(`c>^$k{gX!#OymK1#7wa2PJ(lfxg&^rg<mpo*SJ2khaLjP55H$@HXXM+{#iH!3s0
ztD#}r=WiRx$aOvGC4s`EgoBjimFMxL%sx_pj4HMPQbsacr!@9b>`76)F93UYt1Ad}
zF?n3L&i%i5dJ2pqNWr0n*n{_bj8$`7o>7r2sU{=15rVj+h6hN#c~yR57&dd9_QhOF
zMe^07fq(}rhpv4oN_i6qepSl=7>tg8l}|csu2Kl$Uod1d20MOJ_fM@z(a9C5xi;*o
z*+gN3$m&3;BSwx`k;^PiAzkEj9<?R3a?5B%(-n;!yokc!zdW4Ow#rCGhjM=NWHCn`
zP`Ks)01?#FOfisR7UX=PqLeor_BA^h10zd@ML1O>q5l9pQ#PQIM3(hrkf8G70|2*N
z<I^3gF3PaBv0H=ZU0XRZo!(Nn`oKGb{V5(fokGb75z6J105ZSfOFWALp$&o@ZD4vg
zrYTZ1G6In}G7Lyda1W^Tq%ypg;Y6Py1&1FuQQI^vxFD=XGN-2Dlb>p|7D%T;)^8+j
z!{LC<Mv^MPuMXm(MnYQ|U#&ev(F;Snf`>Wz`5X@2JJJ#5?GN&?JaN!e(t+mvqD9)x
zgc&#o6&$y*mu5mX0hSwb*`rn#5F%Y}w^s`5%u3u6Yez-!_NT8%E%e)I803PYGC(7!
z2f42E;P33W<Ijp$7SrG9lEYzkiy)a-=h%4+GB_3XpTYkC*(>4Sfpkk}n@mwXtFU{3
zIgv=}SE1x*J!{#)WcZ9tr6pzNTqDfvkDY!7e#83z0E(?5)%;-|$OM7^0Ca@x1aJ>S
zlV4kWBK@3nKZnqLiM%%w-OY`nGz1g_E6?*D)#+Xw&@C(tzlXF$RgUF=Ym$J6<Mi|u
z+Sq(Px;Lw$Y8zvb6v+kBt{GPxf_s|!Ts{{Mgo068m&p|MIk<c%@!Nfgtw5QO6$&s1
zumi1inumoU@a~6fvfFQK)WHeH-ubPqUc@e|rs`UB1*Ec<VN$san{aYHd)BtQqrt0K
z$808K^9d+Q?%VzBdR5A+XdJaFjUvwP!|`ZZeWOPVN~Fk`!j|ik>suBYd|Fk2@**-n
zC=s|MeJa+Kp_Yy{whF2cM$)H7U+$6Ln%LAdR?@8_pIf+4G7Y<Q$JV&2R&voXTT?bq
z4~Ei_Y~b?Q0bm^CgV#RwrGGDlyf@*9?hB%=!s1mYki+%KHId?98c8%P_QBdKd;-y?
zascFk+*TH);w9CWbo0iDh&-nw0F%c9*0O~e)Yd_CwmNNR#Sq--(&+kAMdh@4g?D4;
z$8sx=xbfB0A?zl;M0oy5T!Jy0!MxTlEW^QPatlQ!RoHbs>z&rTR{%1{G|9;xYoFow
z{Oi-hU>u#2+&tN~FXPkoBR-uhCNksB5)YR>@t%a%Ub*9mArE<ZaE^m<L$@11{uBKx
zhw&f8od-;gcGP6s$S}E=h4s&=#dy!fFWQ^JJ{@LwJWpwpmUNZ+kM5D$y>DZN!mHI`
z%Gy1v#Geq&jjXAJ2qWAwbGRN(eJjX3d;3rLL&4jhQrBaSXn9gx{nP30E9MW0U$!@m
zHJwUbD@NA{Mw9nb2zILu!#;w%dsn&D{9An5r;0UZy12P^Q2{$uaoi6|^6@$BV)=0B
zFBP%vKN$Z2Y~6nQP`J{(8!;&<X3GLcP6kJOSBz`kBk_lgq)Byq$-mXIv_a0^d(*VP
z4qC?|$StNtUK0<%J@7qiW-SU^HH=So3Ot8uqWs%?*UsWGHLJhgO62PGIqf^c>2M;k
zkSrla*zO3yk-h%_#<fm^HMsH)BP>YdWt@Tf4)wDYgihqffNmROAZKnXK{T&A0`c33
z5+Ta4-qJU7n&fgrQMrkyXj8LAG=M(Clg9_pA3;}Q((a*|t|qoIh6Br1?!&GJYTCEb
zk?tZ^i~VT}wFU<RrC+(yj8>?aNhDV-8E@e}huX4r3s5qwtVs<Ji~}S?IUjS_)u+=Y
zSeYV>Hp7w%WC2#?NuiCVj@Ql%n4BVkg`!z(#>j32-cp<gM&M`Gp~~fQiw&YC49p_~
znIr>|$51IDWSqwH11x@KRH?vb^)y^wKq1@b6E^az#uTq%Rbszec#<R`771A5U_MdY
z{{Z^wbOzEiZZ9XeQf^%yRR=y)VMra1zAB`*76D}3?x$efH+|#iD>DB8R0njIlIAHC
zm69NE-TI29b*xAe4(Rc!23B67zO@ac$!yS`d%ebYw;(~5hX?M1*FN~F_jk<%k-So6
zPB6$h0~zG@#be2;$M%EfpEgkz2u3~m85IO`-o2Wo;WA~3n8rCp_w~g~n&?k8i}#wU
z2bS4#OGc%Tj22w=2cbC}k8$f++J?C@JKC9&6_PMF1?%5ws+anU{i&gZJgKx5U;sTo
zI;nkXjS)+hWf71`k+}!1D>o)5CdsueYU15wWn@W63j~iI?E8Iv>pn}}LPte}6?Hjh
z13deWN_k04@cDta%Pz=x`@jt6>5lbN8I1Xmv2aT?h4>!Wsk>yBV!D+iYl9-jK*)2*
zbDqPn_M$tv+T2Mq3^TDJIPuT7psEcVt0T`Hxp_9={NF5N*B$CXF<4N|axfT@F@QMz
zC<04~o)Q_r+kv^=dB^n?R^T#B(r-+z3VIXm=~6I~CTHEboj-QD;XVGfReYgq8X@x)
zC2hbqOCI3+P$s~lIhSpujHNQ@t&Q0|N2N@*!da0bk2~-qF4_6LDhVcN&z%w#1CqUV
zk7M4WTeU!>9lKoYV0s?8`qOBD-kxhl2QjwRay<`9d42x?Jf$-j$w0UyR6<OA(y%)m
zoy224)X8oSR%K96IbKiy09uW117zHo5J?yk3~gWu1Nu`^X=ZKGAsa>j^fdYBX|W1h
zMid>+!G2&pGwJP634~x6ix5fAKYFU#3t{py!T<_M+;<S&y=oSc5PZQPkmDHx82VDF
zc%oNk!7`Jy^R&|r^4Qs)>^&)@OLr8ODkNit&JNLCSHe#PpBDIs?RR!<Erq*}w8*Q_
zjzZ(Gu2w5+y+-LQ>`|nUxC@R3ee38CgMJgc@K=X~`i+TKyGC|oIWrN#Y=3u-4|@7e
z8_M209T`-QxVJd5wf&VQqV;EJ+6Il`?G_01Yap;nKX~!-8A!-9v1!m;O1^5Sh=3p`
z?+<@^zjdx1LK__p#x-QxT1ig^G5y?kIiWOrp>UB#>f6`|l<-3n(AVtHrwGQ;S|jG;
z%{ipcLO%@R)4m_4jxC{?l1RYb?|_*8A?;mX!R!0EbStOR14$!W5hPKL9CsvtTIl?B
zX{JN_KiKHz#6r&!q>d!Z2IG=D3gkW<YX`zbwDETjmo#jRBqupsXCV9c6)=tNp2+v;
zQ{-u+bJ{MEcRz?Hg`>Jy<ev=b^KAt5HR=~XvyILDh`+dj0!0@2C7t$?o|VXG-w`kL
zjeZ}nX^|vXG8JY6CAsfjsqrE$Ur+G8p0<<RPHsX8?Zc1|9CRL@)w)U9v!*aeyYM%|
zce+=FwR<T5dlZF?Pa^_D_5;vjnefiYX_Nl|Xxv@P<%M>Hf%69E3=MR?0@IsB@D=s#
z#Boa}ll!GDf-~*jqwrsc<h{}zFD_%APOm&C01|VIcBqu&8A|&dkf&&(-@$zg$Nn|(
zg~f&K$cGqP86;eSg!7a6SEBr3_;KK$0r=BK@aCD~rMuMbEna*3Xr}$lAYcvO-6WDg
z{{UpxCXM2)H$u`K{4Z)Hcz{_0$%44+gYRD?e&4^eUylA1czL`>;g~+hs%n#%q9R~Q
zjN^NMd#V2bJlB(%<0Y5D;%4mxwzlt~QHqmovgiC1SL4@#z6SUMQ1FeWrEP!Wj}XLT
zv$3|9DHK@%%Qn;4X9Kz8)Q`-gZsqpKNhIZ)us)T4#J(feJX^2ac!$KA)c4o-G8eeG
zyK>Ky+dkbm;C2G36iH)$E=FC54hv^@t}F5U(=^0pxSwlP`Yy=Aq`BpwM<(34UAsr!
zCzI|erW`)!bGY>w<Wv4ub&#pX-k9h;ezdV6J6<!9At8b61$m^{k8Ecw%D@4Rywr*|
zxhgpTY(L{pRfL8OAo)f~qst@acf%iU-%3{+OfYk|h6H5s#wpN7p<fO*<DJK^J*lg-
zfSLXxS$mOEM8JkZLlSsJ7{x;^Zb(`cjN7SPp1C~Iz^>5%s^IcG!~8VmUE|N15~W7f
zVf-iFkRaWb$ij`lo(c7=%OqJ9r3_WjC;%}$eQCtT4%kqFLBi*)MCZ?qqm=As`=p#>
z@f3z}7}y+c2Oyrb0J2IUmN`~3@tkhkQbJ=g2xO3`9I6)N{Y^%U;a&GfkeD1}spu)P
zJETs@5pS0b$0Oc=Ee1)7M$yO_vSS6Y&%dt~EK;OVFxWm}!w<X<)~lJLLXt-?3cr7U
zJ9wllMnbkioT<kIPz98k+E8OV*qm+zb@!*6$k_t1kT5(HY;)Y2s<IN2o26G)UzEl2
zfzMB^610U`QNj6sQ;hLS$aiLgNWd^ic62IBWVU<z3ToWqM>g$)APT75l_RcdijXc{
zmQWdx1xC&`)7bgQ!Xif1!D2q???sSvGV{!@G8sX(E<!Al45oj)0QIQN!@SI@n+tr6
zAnB1+QaIyx22vQP+OAGB*n4K3y5U_z#uP?IPBYCV6oT!OMRD@S5|ZROBp~R&N^G|=
z$+a91h~%O#P<!XsH59X5D!kF1vNG*b7Z_h`cc#lU(1o^bnZPPaatZBKVs1=k*j`xo
zGO~cG+~5!ANxbB&GO8C|FfvH=H5n2K9pnx2fDuPhd()?cmGc@^3y+wE#@~7aQfs|R
zE2l{|>_`q)5Pt6*=N)O0Tr{p89k|>JGY-Ck*i#LPv-xGWD~vnFa5GXuf=J1RCLr;<
zJT?z+ZYgMosT(^NGfd0J3d%4IJRmAzXCouzk-DiStiuFGU?g=OVZy7PKBAKjp`JmP
zkF0GU4@J-<%I$3!M>D~>w&6(i^%TKov5=vL@|i4qXSOQZ+Dfspl<eBMkS|}xrdubO
zyw$fYk^8AJ!yigHk`7y$$!zns=;IIDYIQj8Nga%G4>}^jN!rc3BR+<;;<7hNscgk$
zcG!m>boUq(^JJcP*=%jW-GSwUocf>4RJy4Ysk0($84@FU0Sgmhlr8}^DbvI)CBRU_
zU?dTNoOZ3DqXbEoNt#4t8BlT?p48~9V`)RlkjURF5%Q@1wLaMvsWT7kV**GZXAZw~
z;2d}Q)XS#HBp!4~rX%v_XF2}>3feZ7j5j=@DN;akPs&Hr6)I`){`O8-vf?%e9r-x)
zsCCuLR9S*FsR(#dWZuiemHWBv^{GyihF_IY;$B!9-G<4`;Tq6G9Dzct{JA5k$n8l5
zyi+qx<m{1=i41TR!SCr(>z1gQP-*x9NsRf23RqwR^{Ha8L|0cCI4Z%16{Wh{63-on
znpQ2(Zn*i6LO`IY5`?m7<5{6rXyh4T$3lBn4z!yzRHBUGqnSv!Xiv@Zpl$)jwO+Q-
z^td3BCNghv`?f50hVQ|tt?i;Rq>mY8ehU-R@~c+%if!YJN*ES9SaM(3eJUMEzNIR0
zMM(6)4BPG#YTyM5xd8jto||QBZhv=V;H&O=S@Zc0)JJY%DADP&{KWa2rpQ5#nCis-
zpOrpYp@K4((z1*POz^;d6_cE$yETj=iEknoaTK|=4U@PPKr`vjdVCh%TL?89afKkF
zBJC*sdGzD+rmIII6lqH)MtcGX>7LZ-fN4DCI94DTSm$vAh4%KSyJOIuCyY#FNjIQ<
z(*zg*3P|C9DV(5f(lIgvkOyjwr&VJaR>X=t=)(bl+n;|=@S-SSFZ;;|KuI9E`Mth^
zm4GgqMz?URyNBIipLgHhpDaj|?Nu2VVoySG(wb$BVUkOU6f{HU3!l5#(oAGT#3VTb
zaw{IA9S^NAvKCD3NWS*TM45HZBx3;f<BDvu$@W<-i+qKQi;;q)_EX#GO_K2z?IW6C
zpr}~Xr~o%K#@`%<)>kUQH#_af12pVQ*nHC6$>zyzZ;74}lwLo{sNj#x5t#!42|iu9
zZ0&A@(+tTos_*2sWRN#+>FrUy#qorjCyWSRa|0jDGr%PJQ&+f$OLra((ub32Bt;uz
zY3a=@7qJ*cs9>^>l*$eZ1K9if)lwWDNCHEQ1Kyn<o^FH_MmHbe3-d3(y;>6`h-S`s
zuHa=rGa825xQ5|!IvR12x3r9nB#c5NVYa9~p5Iz*R#$RJO2*p@10X%SZpUhqY`c{e
z!!GZcRdO4Ty_&Rzam;PJ*x{M>Cj12oavL4}aY`nZNW9r)R+-qWMMgw`bU5rOBN8a{
zBT^-hA1)rJBd_KvIevRTwc7>4Ntado$FTyfAzWRXT})Qk+HyBH@gC>eh=fxFjyY2$
z$Y|BSO!oDuV1aI#p<rTJK-vkxPkhv-6}P+FV-#<N0!L-}O8Zl=)yBjGi1!wf2*m5;
zfEyVj)cSi>c@pL!8Mi?=Mk^^*!EALH^cAzD#}$^#a{?1Pm1b^s1J2+oJx<mL;&|-v
z`6XGI`5vSi)l<3)nep1-M!|Q5nC@J1MKGIdYj=CgZ!r19q-(;F*q?7&&@o49$ute-
zqsBvE=LCAvB=*XTmk{MlcnqL-{*=`=#d4hRiREb?%4Akh@VhoLeMUP9f0RV2EXQDk
z?u;UljxnA+YE}}-Bvy|Uf;I#~<ng<{DmUPxxjRVOcJKy0eXCf}Vr>yZs|3uAbdBcV
zjAuPb$292Xg<$eR7$%v>EXQ^RbJC%CJjP{p39x*!cRxydv&$l&VH;oscU})2t7nFq
zM02Z=n>g;=k1)jOawS<Yx8AJCZKE;Ftg$*|GqZf8W7EH_LX!_L4>C59hSWj`41cXK
zJgJtFL_a6Yr7?r}(6G~!wSmnd)5Q#X5J*XEv31E(DVAkZbe7RZlfHb@*@tc_wgt>y
zO}6ARwg`6qwQ3Tx$cq5Z$#zJ<WDI-PWjwx5b0=2Jl-&7pVk8^nTy^D-VeBcMf0UvK
z-_BHGUUB>c{{RX4QpFlG3E&4Ij>gX!?rCBkX?RF%D*fDGG0$4;r<L5z))Cy20+k_~
z3^9_v^op?qxUf62ag*Afmh$0Cuv9KU$jNFF-r%a+qpNQu$adi4)Orf+S$tBpi1x1c
zA$TUZk*)la(e(<W7$?8I7Rr-b$X9Fa1wbRC1M5~+7@4=PnI9W>Gi021sEl_$Ug_iV
zRSxV0$ZYk_D;eMtWh$(S1Du&x%NvgHdXPQ+D%HNB3ohI<KkyVB3Lv!+%v;P~DTqGn
z^*!oXVsp4-bN>Jgv91>x>s|PI3Oge?JC<#3(YL__q=h4P^{GQVnarhR{vfN)J7Svv
z2N_f7c;&t7<SLs~WriD^_a4>m;pnNOo!t>ZX>}BFs>aS)$cu~v>QALPVUKB&2OoHa
zV%+C7GsMe2)Sn1ckf*3L$N8Q(UfgiG2N?RA>z*A(B8yC^B%(L+Sm9Li2*4RUlS~nA
z+}rXbAa7I0AIheQKz1^&=^OjU0IqoY(~>Rd_+i2M_8t$@(zv-2k*Z0Ig_(X(6##q;
zuk))&V}S}rxeJyc6ICJ~!j`feIoyA{{?$6>>3~4P4nYGS#4EQC89P{+w6_xG=P1HB
z!Cnsc<85K;*WbEz`#JM6cHoQ}mh)AHS(*@Yu;G;Y`+C+p$#tpRM-{w%Ne7OV^%#0S
z%9_5c@+;QolS^YV?bc^V<bAV9Z~+(@J%_z|hrq9ammVg&hUVte%vF>+7G6VDuY-RD
zwM}mMUiR63e0e5F!|XlC_anW1tMD7(ZJv>72}>}9fFx1|&^w>0t}I1rbY$(hz8eiX
z`n`+a0saU@rdx=f)QyU)>+4@j_!GmaWej$W0pAN`F+EA_eJa0${2v~bJ-wy9po<6r
zVl%iA-n|#YS^%|SZ*u@_5578eub!<}+RE(rVHF7366pGJS_NIZi*m#cmC<SOq(m6x
z&IdUi4NazLh=8fblt&ClPh(O59oa?*1LYun>gH<h#?e;PeZ|4Hv=e|<Gr@D~T#tzL
zCTZkIX4(Q|vFJVPcUZp?Sh9s+sB-8JO7Y){pAaIowVEr1@|R&yB7R4?^sVsJT&JQ6
zl6JApd~W!qr)l;MS5n*p5U5nC1a&`5{&o4y`&ayYxzzQ`-8=h6FC`AvUEg@0O7-vB
zqxO!vwA1c%-8xhgvY7tSBLYC~27A}SUMtq-@ix9M41!k-S7FIudy;<&<;}4XqYq_I
za|zVsT&T^|C!bl>gtA=;Wo{#OUcP|VrkSS(X&G(YZBgbi;|Ko$*H6-HC3QC!AVw3H
zZJEbv+0*Pctg>G1CC2~^4!j!qhLY6DUP3jjG22IJ5MMFQS-N1F=KM_{c}=9l$&r|&
zu|IrQMXTPtHtz2RP^QE<!Qbni!nrM7tml$8Nm^!iDvWw`=~&jOXxOBz$`e15#R9T`
za1@;UzM%K3Hm+_bM~tLOMjBARDIY=JnwGQLGD&jkzGH2TNY2*xtM;}{F+(QJhCq%{
zamRCt<835R`%6@jzSD7a97%4ZlI%v|(~NaBt6}zi;wYne7iQqu;CmBM!=$uxc@`1_
z2w~;Bu_xZT2&|)yML?xETq5J-IOn%D$5y&WMLKP;(=F~2A$2kt3CYYWjCup>S~iFv
zkZ$BYa!){Lx6|T@%z>raSD-iq{VLil(@3$jKp;Q}RqO3sPP1oZVPr;PC<mJ+)N_<&
z=b!PZL`=64kF%9w%Mtu198~ebu))Lx<^Ei-`A4-+7={@)MY*%fEjZL=@{~rOFWXl9
zGqd9=fsPpZW2H%LZ}yplR<bD0O9yUCdJjQKbAGmERuW4W%V6hdt3Pei?rc8O6}W{%
zk&N=k`@<b8MK-}jA<#j4YamyM1t)m#_|w)EC})Npg|gTOg5IOjqJ!-1BD4~*Da#Gy
z?jK6E8h{b@kh{Kb_D8*G7TER@F#?$7nrsz03QswyL@Yx(j&axCi+E!*rOMg33gjzE
z(ec*;thres-mr-IIb7tEOtgsY(%4VtOu(#QZ^6b-r?o!Zyv%|K%MIncz;UzEoX-q_
zOe7#U5|G*5{>dGvoJ(_PsUwJBjzZf){L&tPXRsY=8)F-}e9(<2oOck+7ih@-RUC@a
zIgwys0r_$VCZ%`Gp<DpLMsv`LhFO+HcPdbnAO`6F08dIlIUq(m=8b`2ft~`M)I_Mx
zS*H1i1Lgat-l7t`W;j|<#0|>8@VWJ-TwXMBi0)r$1pKNnS3Uje9gwbvU8F-T8;2vS
zDB`kpJsQ?ai0<ZN<^~(dYytq_3bl7CT*WI%I8l%gM%dnc{b`qStcFHe7FF7zhTM>G
z+tRt^sX7@qI(%|XB#UrPR2acbw;hdP>pl`KZ}y0wgcm1ZBZ5!2t#y}?&nOn=_#hx1
z%AK*(HJ>G=wCN$YvvIqHd7pqg<KDTiI7;b}D8@$(s(3wOfTOCkdx<R^e>mgy70usx
zQ_Ds&jgrQ@o&cvPy|ddj>UTO=Idq7sk%yZ+ueCsYHw%S%XAOr0ZOIMp-nG?F8&VoG
zo_J_T@%z0NbQ{zXo}_)sr6q)f7Fdr?4mfXm_6=9Tpj<j^QdbNc04sz2D;H7lJ*@GW
zMb^R(%mMjW`V0!}rH_MJoU_5Z=y{XG%OOs_zSKM}fSsp-(!0C=00YNt!5d*`#@K+v
z4}6~0LhHe@#zx4Moc+KLU+}J|;;BoigTmBDBx935aPTvVZZgGGat9+dy>a2oxZ810
zl%1?L{onDbQ|Om#kZqXl?gt0lR?4&=Qx{Hap_{uW0lx!J2P41X+NYMykb#l-jzvV)
z@~=R791L}>RETIpfC)JqQf|QGAY+bu&{4s|gOlEc+&=N|R;Epd62KK#9H`F}q1l*a
z2*~OwgmK@GN&&*-B>Lo4De5Z{mTkOe1HW)-0p#KN$1Ho)PW}BlWYU*&_tTtuR*I?>
ziM-sVB*-B2^rsnA=R2}U&ov6U$N{_KCXMGfW*vB7D@fIi!o;fKMid>r#&T(1Q-DKq
zTNuY8qDM{pWyntZM>Oc#GKHj*Zbkq-t7Ry?nHFP<1wxC_Se!BHX?Gqlz;5fF+*D#l
zV}-^u$GtA`8OA{!>8VGkS&}5GpfDx3HXIJZpMa>pFv}9y2B0!ze8=bj>q@V)X&h}i
z2Q^Ajdj**@G>lBXZdU+q3&kLEqZ!Cw;`OEp4nFUE{WI<BM)UxJ_|HL(y!WSQitLa$
zbGSPZjx$QHh1ln=d;QZ<w9NaTImcqS{#6-uA1OY#sc?mdc1#&S``H8#NIV*QZCIL2
z<e&kRdUmMem(AM{F{o3?AH_<t1>EZ(4BRs{HBJmJ$u}yK=N6H60#N`2d*+c+Gas7Y
zBL4sg>VG;%nHzTC+1N13a0&W)Q@p`E#TG)P;|uq48}RK^sX#8+n>^CU9|WGPKJV6;
zh(RG(ft)!arI5&DS(YNvgRrn+l1F3yH4m7DNmj;sgZ%0HI3W@jjnD)`jGfp$MNJ&2
zrE<HJkVwx2e}z?RhD8#BxZDrj91-51<^XaSF()S;r}<WHlvoxXd8KuEqa-olpGrX?
zWGxGmDzVD9ap_RWINEo}7XtueoYRb-zlt|+mm!ZhAex_KkaIG^%vM6eOe-kPSNT&H
z_iEeM89fN-YO>D1^36(|obEk6=r<s^W^;ft4tmn%g~xVUf?cw-as>c^w1d;@O<VG1
zD<R9HWf%&sw+b77lusOF_w}ZWh1rG}AY|?6YFmOHthM%m41QpN$~ib;)E`=s3&_I)
z@@^-F4g58pXU<N>&U)vswJ+M3vW8q7alonPriRlloA!Bv;e!K#{(ULZ-N=QWL-P<f
zh{hC;TFz;He>I!tBc&{J7eb`{;f#UBL#qTFtg$`YKgyFjD-05+pQSPz#<w_(=O4t!
zny=>{H(_8fdeUxga0ertipkWz!%?wpT*)3M-<B<a?afAK48@vGcXBx#`qg6W58dR9
zang{P6-&2K+ZCIeD%K}?%K!%j$-yI`_N5o|2Hee-95EaZrAM+uwU17Vfzp&&%3>!C
zfyW&)^{M6rgf|T6VjF@ESy=khSUUiy+i*C|PSz40HW9RPbJOcj77WMti;%b+RJMvq
zl*<w}kauIRtpSJ|nU5W6=+hm+05NRi0A$h|7Ddd7mG6PcrObnsl-xS*J9)>;NOBv2
zgY@rL9@HJ7i0jn)R1FDM4Y(2y%mD30?iM4#&nhx{0Z)!C&$y`v9Ou0(YF0qx5B7=X
ztick322SFBe4ahNls8~YQ7!FM<#!LSaa$G^D<Tz^A`}mp1Aspot7?ijGdSBA4F1FV
z*1R^sc$^gysKT#CA4<Zc>}?36rO>=Sw)WAhz@$0MXCH8XTIlR_O~6S6Ob-Oj*B;oc
zy$i%BnsVDtsT5vj#NXE=`I_I-wFgI8r*DvrvBjQ$6W+W^^QkAP=~7X)hMt{c9BgqL
zsYV4sJm$2m?flE6HxiaP1&S`+r_<|9w3yBoV=9u04%Qs~J?i7e%L474M2z|Jdf|Od
zaO`!W<+h#W5iBq}M6Z^0=Z|`pXd#R}<dOjF1|#XTdevB^Oc{mAh9JLnvI%c*T5ZhI
z`AEaLz>&M3N>{QA7cMWt6)M>b2hM{4ao)2or`<P~87&#-9a}xkD4yo-Wh#d)_wq4}
zZ~zrbJA0Wf8v5)sW+BUC7y$ZJD?P-~EycvwHlJ%~n4-u+l6k=FYM_@?mgP1CU=Cf7
zcEw+{vtW#^Cg|nlupD*jJt^_pC{k7uRYpKo3%lB%GE97}l&%tQEX!`HRRJpz<dNQ+
z9i#lQB&U}++sdduzNWQ2s9S2tr4Sv^%exyJx}Q@|wuTr)m(hS&ADvG^eaC7QOCa`a
zr52j;MCGAi>N(4D5Bcp=oet$76EcAUl2JhUgC3;R@dzhDy3`p4S@8Jd``GVGJ=0Bz
z<&+mug1}&YRXp-#@<h**PZBwUb17_L`wF>hWZX+20R(|rlyQN_;ZemjVWgEKG6FV(
zoC3qpRjYg5s3D0PehI+?Z#~DUrsX>Vgiy0v+u})43o7#)?!Yv~jz2Km#~he!VM}yA
z;;bZz48LlcCTNt6@$Tp9D!Y8rm?4f}q@Dg@`G=(mva~E(+9HOU1#CjVl20J#(xzzk
z?r9D~0KgtOsN#pr$c`3eTnUqL1P||Lzdc1h=2dtKMj4wqIOmUCdQ|`$mq<hTMFC^9
zwLPY|OH!&8{zH(1?vvb_Es?yyWL0su_dxgcBBzEDv8-h6-oykWpT@0465WO?tU@Q2
zO~DQoi0DY?H8cWaDT~V?h~?C9%jjvx5XrsgL>T}U8KjzaizaCRE8GqUtyFA7V??3E
zp*O3<nFqHgr8apdb>EPUjyTBTqPTfVc`+aoNZhORBeAGO;!h(9!Q7+<#{iz+L0YKI
zklaygbh1t6Hecl#8#;SY6`jk#*B1sMxF0eAysCrz>bl%4g<~$?Gh+gnZkPeN!3uMn
zaBF25+=nQc-ZIkk`<oB6THGY97{P3j)1a&$4PIK^T)mshcdG4y%W)a+pI@zS>c(5U
z8Itl95nLQb#9@vPC4IYB1FYK3qH6Kq#W0UEr;`~c59$v-mEB71SmLemT&?jRLDQzU
z`&{;{oH8-$20MLCc}}IL+*{sB4ccu|pn)e+E7|;atw(cg(Jprt%)6JIde@n2Hmh`#
zTv|F#Rvp36<yV|w``4>N?i!wLRFtlczxHPMzkTrc#HpuEe9>4r-EuY!t~34ap{woR
zhd&f7yl1CPaQky5zSy&Z*#7l?ZNn<t-bHZi!)pNR({HJ-r9WmLikDZBrJeNRY5bA5
z$oUmU?x*k_E6>buYEkyFTJ<!eJNvBqD_!tJw;D(Gk+yXZ?rA*3*W7#8l=zwnEUwz=
z8SR{@1TfqrPv~pkwEqATXu79_<+#5s=Ojw7Wbw~`%Zl=^iC!FAtuy;aNR^&4#b*IC
z<!7(wUKHrLLEm$)4^x(|yB<TT%{BgDSwJKa7h-*lQn!h%;aF|Luw0niZw%gt+O{=K
z0zEoc7e6{P0Jt3wvF%i*f=HKi@D!6cF|qC2IH-bYTF0o}*-aK!{q&AKC0t-GO+F$K
zw@1B*=yUh6R~FtzS(X{0EwgAwPFvJdL~vW%eVOE7Reok8l?T$TromXR98#`eT$Lw!
z$o(=;Z{<$|cgz7FyxPUb-9Gg!s|*)u<W35)Qd(|z0o)3&B$Cf;_K@8uUFJehUD@mZ
z0M@DGY<$CR;gjugu>pcOF4^Ju$4^R01;kSlBJ0qyj-H=NhTC&HEJ)8OATbB8_zDEm
zNhg&vH<$<mcW<w?KW4+2nE)UoutEu7;A0<^N{NTWf4yQpUoRjN@0zIPjl_i9sdZ82
z1q3J`<4BhltAx4pLJmnr$3CK`*)|;ZExSp$!;tD%9%vux$?7rO`_mfb86Gw$vJf@{
z{8;bpRfB+w3`$rBB~e?KG}$#1ZycMg#D%$ucmyA>rAnhFCs86{b27PN!DK)hIriWK
z>53q_Q4p2nB$<eG9nXKDtm~`9^G&)aX*LbMYw*O5m>q>EyNr@$d=R<EW9xxiEHbvF
zI?nnRjn9_u7DMH+1*3jQ`WlaZ$9BsHbr=#i0;t_xm?IAHl~y2!CnNCnrH<kYfYGGu
zG>gHOCddbaw2xeK>&;wn@I*R|mJ;xVFBU+TDET?yb|Rr)I(ulPnaGJQPV~VI$MF7i
z+0D#K&g!x-;}NIpO}Ik?26rVfxs-nq#cH7xtckm1`kncj>OhG5nkC&BA2}c1A4;ht
z_mNx+i;bo=VH`0kfS>`(ll(-J`T^RbnOa^ZkjCWY95*C;9^6t%Do1cF?(G^Qux)oB
zCg1VzM=g-9TY~N5k~yQnXwH1Y(MPYnNhaAh%V!7@vhFM&hWEu%7YiDdp5ZpeI8|O)
z`%~5az`j$kR|6{<<c-|qR5+pCmsVSdS)@sZ$3PG6^Rc`2?@%=G!0#yDvIW5`a*6H-
z_m8b1xI0!MBINalqYrwi1@GErk|<;(K=_b(d<_2pwd=)AtQRhCDG)IrU|S!1k5U?y
zE|zq06EI|Kv2n-yr~GO$12Em>lE7{qvG49`#4N8Ypj<}I6nVfWZotxMSQXnPG0H@d
zEwrd)jAS^-BkNKHbQxI(Oij8x<aWp7Pqy=6WqXGG;;GoDxb!~NDq8clHIS=BzErH=
zb&2IqACaih8YObC*~Ew<W*;*h=R6;36%j%m;Y!FusTui4OjWNdV|lZzYZ|ZIKY35#
z)YC<a&*i{YM`wMd)NsAU9MK;vigL#+_e!@-l3OI6fMdNp*~0Us#K&vGNjoGet}%g{
zyB&w`QA2#8u*^qFvu_eBZhLVfD8n55zQYxqsznr_*_te20A<oR*)Z<MI3B+Aq6yXj
z+wsrL%)fYlL0Zdd<&xPg1f|<7200#p_NJ}0jWftC#BoRhGP`8)>G;&Dk!5l;W<_Ta
zxM3>+B8|)QagR@}S+}%P5_!nzShmN`GwuHX*Q-sY!*Gm}#l|u792RW$_N!}Sm`X5a
z`EfI!;a}(}Ii@uR*%htDovg#{cMiY1#Aj~o5#0LLg_N_|UOJ`1{h&s#F67Qs@)sSC
zdaVWeG8paeZSJ9Ch1(X_Om)frwH5ZerQ4Bl7NR70Na(+G{d?AK@-IY-x0f+Js!wll
z3M(_so^zk!_Qgal*51Zfxwu`RZeDp+J^ky7@n6LID^@bwf{K9eSnx|fd=A;J8^zxl
zH4CYV>FBb_JV8~;;ZS-JU373&YHV{=#nY$M^;_>2X?i*chNHO{=0f0+&pUn1a=OpO
zMYE1**6HosgRzMR9PyFfyt3!UdhOVaZ}kwZ8<#>8fJnwbtmk{fa`RqYyU528a(1$w
zcMSEfN|sp&JIhngsg9JiiPviWKA!ei#-AGlEBwd5<5;))wz+a%%1|yAM$E0B^<&g?
z!4;abn9lv`LJ`v=29dQ?3h{`ttr^K3N&f%}^r_LOPvJ)#s!Ch3TTipSg~Lm5?o^ar
z#|w=0C%txm3%&_>*W%{0ZDZlx2;4<;FP4%;fVlvI3GL6X^R8Rrcf<R?h~6=S!V%m&
zP|gd;%-93*=szCy`mOsacnje7!Vd>&cQ)2`u)(H88tP3-aEJ~vOFJG&!SBuvE0Z6M
zmKvYAyCTlo8TzmM6L@~gU$KUjsCak6T6Ux3-xtm$ySUUGIn(WqOL+^h@0(~?#&{c<
zf#FpADf?S^7Wd(Py%gRjx3yd8BG1_s!~LDc0rL=aJpOs~uf2b2&-gD-!`~11a^vCG
zzz>J(;%$Dx9tH75<Y<<5q^{B}*LLX$?B#gc2*@KJl%Em2ZR1~wJ~Y1Z*NyeVd8z7?
znQkUyz$BBkNARfZD8Np<sV`|8KK=e(3FL};JqkCvyf+ewV2~Lxfw^!$0qIot;$h~v
zJ=>0gr)ZX9trVhpS+K=d0YD$;nq+XahY>F31F-5V(Q<NnhQyjZyf=5FOlMSC&P1|j
zk3sESXM%K{GF!OP^Hi4D%b4x=09Z%|PyW4fjcbr5VsHlxrw8!*RP#@9BgUyCMkD1P
zKQQC2ds4gQvJ=&xy#E03N3Yrk!rur!66u%M+N==ErCIq7nfvT8URBA@OyqNo-$P!<
z`)hx}&fgAyW}O81f8l6fh#n-K60z9m^G24otU<w^>~0aB`#@vIJ8}(wI~s4sFNzj=
z3DDEUm+5CB?R$7G<b;$RiAEU*xbIXgd`qdk(%msF=SE_arWG@iqdfs2epT{ycuOv?
zkDex^q}<-B_FkH6W2s{5Mw)_1_kY`u_WJ#>zu=)BDu0N7wGWRB8ca6~+9!nUouRRS
zo#QDOCwU6RceyM>U~!ROJ8Lto%xi9BQ?%d+_}YEzX8T%wMN{oo;$*jv5k}3AFFa@5
zipXe-6j`EH^4x`=b^`;@8v0roYB+i-oh4|;M2=ZbPFH4pi*S#hJmps|3H};J4Bslp
z)v_2KhNopDx}-bG^#JEI?<AoL_}oAs9)h&x3!=M^B}24~8DA_%r=?G9b~$3aAHC0C
zYEl@2;HweBkTZ{CLaP>CfwP|LPQq^JwQqAIE@f+t>SGuH;6{I`tsOJO<4$n|GvpE(
z!I0xU$n?!)A$A-E0GuC6Y>H&b^1&FvA%99_y-!E9`2DEpm-ds*aWID7MSMU;<B#DZ
zpcU)B3;noteM<M`h15eIo>)o)U~m^1`_=N%@<e`1A=(ct!!@npDI?RS#3~7P2h9VZ
z?kg$b=vDaRaj7_K9nY!Z{{Vuhd{EPrzJsJl*F^7%JEj2RpahKmHHGn){tB`CQhZ+U
zqxcr)XmtAqjKqXUUt^F%G0&!cUI5P|9)st95M9X~z-Ch%Zut%eE%f%PQ%`poXfd@U
z8<=hVYdGL=v7a)EOm3v@t1L%%GhPdeo3@zDOG;SayoakFO8QgwTK%;AU;8*|b7;OD
z@l!pnqi-ZvI%L-+R&0UuGAY842m(xGjx)y}F3T#0-Ha&%b~!l5BvQw)T$y*^x&#Vy
zkOz9+t{#>mJhN9uag&R>KBw^??Pn*5Z{*c9nBca)ELo*g4Iyvu4D|qZ?~3I0FN;%n
zwR7TqQKnfH^R^<Jn>;W8_Vlj`63Pl(K`})wwWi!o8`Id-(`s6n2@G!0v@hm)tbX}F
z(z<YTY2fbQm(3YeN^ft(^%*ri7g5trmlW~EcBJ`|#5Vb$obEsEdej<z%O&$#a2<}-
zEZx0NrFoQ^o}mPuRkgu(Z<+TF8`tP6&Az*Sh!$(+kx2dAY<U>!4SG<;#cqsc3EM-}
z+gP}iiC~&M5EU9V<Y0d~hgQ_JO+wu0w;JQEt;R~kc`=jJu6lFLdAfMJU$D1iw?|(w
zOGL*XA^KGI-x4)AE@GDU$tC0&6!D*3zMo3yjxP-Cnj%odKBq&k{4Kn{fa^9f6j?Bd
zx-G^)I4zpud_mw{cR;>-NiA8U-MSe{f#xnbHRxI=$30I?2@J68wvyzJFK8@-91q9R
zvwU0e1`ih9iLRhI^4Vkq18C1*Zj`Z<^7+x`r2XRzHB5YJHBl~8&MqQ*ea$dzt^+9?
zRm*)oQ>UFpmohUL&;!R6p&hF0y7je{nw6g6gnaU+1B&T2j|kgXSv)e1RxO5f;dgq0
z_*agpHm-Vdt7{|A=2+5KLU)x>%5VwvG|?M~ytErj5<(N!v}e)`Qz}4w#Y34r{=W4H
zwF>8CfJmbwJmB`nrD1k!%(@ku%W=7*BLk71e+pNgC|}Lq6aYR(IsGZ@8d<!{i2!1L
zcIlJ!tzU=U629@zjVydUr7AN`Fy7L1Odq^YTvW-~0Ny|$zg&BstMCK%TJh(NEtACB
zrK?)$_O~lIWkOb9dmr=KzN4}In6w9-HH}wgu~Y@w6ony2%aPoFD*7Mb?xpZs!2bXO
zH17t$6w3-CM#VOZo2+1vr;w!d^Z<Pap?JgK_KV_gfoA^zR==^*?;6}l#h78Y9Bdu=
z=qr34UrQF#o3^KqjLd3MZAEN&=fd9$cst?mg(dMmuC_MNg<mT2LZHg$?v(ZHFgkJT
zUU%`6_Jz@!DKzf|X+mvIMRbWR;6FcHwg)8ECy0lMZG1;<@VmoF_UqWDDW*wu%+~RS
z$Sska;B-Cz02=yR;n(c#@O$=a_&a~`58`LUOC29m)GUKf<1J6iN#n@LTXb>+K%9l=
z(DT4Qb6XdH;YtvSSDd?kXUb8-VzcZ-r72n~zvO;i{BiiD;wRM&tQNr}xMzyxr%W4p
z7lsVJpywY-@!N@{xsUrs<5PL0g^H*ol>?@E_4Ths{j7Xh@Q=lR6dHenDRR0$mg@^o
zBN-iwb0cJu%=p|%Jd@j?^LDz~8$}r<2*ZY4=iBLD6PRM^V=+>xCw))2z~O1(u+fB7
zv@{Qh{83?P1*&T|EOCZy<giR}gY8@X82HDnXqHc9s9#Aku2p1VmLUHC4t;y(xe;@>
zbk8ATM=ZQzp4(e&3_-`tbLwlAPEmJ9RH?>F%=O;~d};8~Y7yJ&8k@qZ;faz$Ngap#
z)#^I8$3G5h@S^FOagap_RC!z;gByzaX1+}})=U^%#0K7sPayi$+Z{&lPLPW`h7!2O
z{Qm$BdHgG`o-S#7+MKh&({Az5_RkPoXnOdY&X(8Cxs!XmPzExN;eWf2=Ug|4{t{cr
z8uLhvq($Wsn=WzOfn436jCH#vK4rs%88M*7_CBjyT35yGMXtBb;x%LoByODJz6kzR
zo0U0kXrWdcGnv2eCa+>k+d%R<WZXidB^37_pni3dZRU#O%PxGtPEtk2Yu9vNikc18
z``=F*yDIr&H;)^Jda?8sXIQZKW#St-b$hK|-QifmywHqgv-d&m=qg<}^4&8?)RT5-
z@rh8|rui2P-@@&W!krD(uI9VhBjX(I#t8mGy}RJg?1ST9+8f5Vo*wvZrO!RRm519U
zYlzDmc=NOe$6TC_qwb$fS1s`e;HBS!HT%C0>bBBDdt*DpekM(d9e;&KU`Hc9wThB*
zvNXD96K^<=Z2Y50KuIKS9Al@oEV|9FkusgpBEOa)b=)zIN%b|OH-}P537ve!00omc
z*xmT6HaZZL7-p6@$0a0^JdAse^`nbO&z>Z{4b}B)PZ3yZG3!hc000)5LKg=gcb@g{
zdI#+f;)_f8wBLtbD%LciZmMCH8JRX?1&ANRk~5B(^{QX9FTy_uN#RHF=3<^{n8g*<
z!tn!!D#!sHPe0PNd_|#Y?JHP#X%Wr5jIQA^xD$hqVa;z#4C`q0IICA&*0s-~{tth_
zT|a3bhZoVdy{k64Wo{G|kwBNA1drijK*0<?hQ6}+4gUZIyztkG9W1^hcyetJJ;7Mn
zfssOi)yU@=&o}^nwfRXlj%;8_tliRB-J>#c(Z8lE^jG!<{fmAM_zU4{{A2j-cWD=h
zq_s0#&wDb;x>RRATv0FGGcY5O$RyzLn)7o^uLDMloR_`iDiW<Z+78J3$KjvttMHTJ
zR0(t8zZ+U!DFm}y%&ZZ*;jnn)v9Cw)pT*lvS(ZU6%8cJ9mVQz_Yx2^^_FmL3{9mbf
z)8K>`mO3OXX0>a07(K*b=a=D`PBK)C9P|T$`VspI{4Mbp?T_HwD^Cti-W`iU)8bzd
zYFu$}#eytxk(bDg$pokv``I8@$Kq&4E8JIox}CJ;QudNPtL@gh)I;pfl6jdMQ}}+h
z<Ubm;EpNfCCy4aMVE}E;S$ZD%#cTNL4;uc?zY=EfPmD{$Zj&<EUe6OoFJcT-N`UnT
zgTXi_8OSx&#jSXI#kwz)C5Gl1hEvTs$nJ68xanST=CzT#TJpWmF8DqBPiUIUu90;j
znVI%5SI!S(n)X`{5ZY>Bm2};Kg--tfUrP8}_T%^u;~$2S$?<RDRow8$4DwuD+S|_9
zAc9zMLBSwk_Q|ei_C)^xf~0sZO<g<>@gu}P*xG`z2sL66T~~%B+ku0}&5VC1?CLhv
zwla-LMcPN`)v;}c7GXahIy&%k+a8tkr|qNr5O`nW)`@%KzYk{K^X%?cIMA_)`t2it
z=ud3qbAmWE>Yfky&*9yE+|6UC!d<>^k;4oggdckCG~IsA{@B~OQyj~OLORzqdNHWE
zWRCnUCR8WQ7Jd(WRQPS;pN4wz(RHmclv_;dw*g32ZkYD2F4x3S#RS(^Z?-E)&)Q6#
zLH__fEA{jC>ivv-Iq^S4pT#~L)2*exOLt)!$B#GVI9A642Lv8^V~pf}CVtuW9w_)J
zd8l{_5Efx4`e2m~#?M6!-zWKdQ_Ao$#m-bJ{7Y2(qv)#U%~Op?`ZRfm?G5q5PZ8>8
zO3`itMQ<1o6=RsB=yFF~{{UQ9oM^ulJa^$OL~2?Fxiz~M{qRHnuyx0<tl817F9JXc
z85oyYn>anjezjgQi#sy}l>o$uTLc>W{5As*LV~BubLFezs@AIKeb1x58UFymN&YYR
zU81)B&o{9Rs3P18D)&2&O8S@J$NUuQ;r{@MF5<WG3dw7BVpVt@!4RBtp5KVC%(aD;
z#ECIkSY&xeu=c5b&|AuTgZs_fl0d~sKDiX$Uxs@t9FuaNQ}-v~*T;VVc>coO^dAwy
ze6ll@D<}*$oDh8oJbo44X*!Li_1eQ|;#gaWS2-#F0M@U<F97^n_@Us-lNW{jS3SHA
z!b#p)4(SI%0SC}=UrT%q{{Vukd`0kuy{4Jt2qU_&j}b+5?en@Q3K5$*X5gISxu=%Z
zx4OtusTPx0KU6M!KjD2sMtQBWae|5m&G=S+rSN0HnxrUiAc9Qf03!rPpX**1@E86H
zC-6(+W%a(7d9T}P7uO0FIPawaWqfd|$B$qRIj^8RDdTSrYxc3~T21Uy#UgH!Gaw{4
zrw6ao^RF_t8l+vSMB0`ir|wF}2jcJ8ufsZ(xz#jC#83BPMP6G!#ftJz7yiV)EYa;H
zpGsLSl$MTYc96k(?e*(lT<Q9QTh1p&BMcdg=a8qZYrHx|>iwoG*594Ql>PDT?OruZ
zy9+t<C1>P%)N^cYC2ni4GxLL7_z&YP1tN(&Gj>E}x9pF51swDon&fZ%AE-ejt1XK(
z&~QI@x5@|WU#T}<1n`chbr`v`W|XGs9as#GynELL;;-40;r{@NEn4<nJ!NSfz}hji
z1JsY=HIu+jKMbyqMwWLM{6v0oT3T;^vWv*J$fZ@vW6br>wMwjQZA=rgNXw83Uz0wV
zud99|e!%R<?HUdBypfn$t!yKOgs_!8T=)G)PfGER8UD_n5Hvd|^(i#BmMG*d;EldU
zIOGnw{A-G&DpQ@Lk6Ml^4_-HmJl092xRy(WbUs{TYzmz_WPgQAZ!(A8(HBQhzb97r
zH9Y<t)Y5i|t)vc*xmA#;_dfpsN^(OT`uQ+9TZIHN#<)}-zUTQ;X;|GRMiw72BaU3E
z;n`KPp^szl?NLVN;wh(+B^w-x699s9jIKHw(>9V%9CtFJi4p#2;amZMjrjMd=84A9
zCzlX*Y<!pi4*Yu5Bvz#fVYp&l!AN5R<_q_D>+ke5`Sjy?XARsOT}3HmMHs??jGun>
zEMh&&EYdN<ZF~#{Q`nE|Rt)y%%!tOnD&=Ko#_wP#*5GH_3HEGjY|5-iKkT34t4U*R
zB&{UEaRgu%XvRi+=g?Jaok60INXQEVwFW@K`Z4Y)&8W!ol(I>hGZ+l3j4|)Wr=?Ph
z3!>?3dovpOq>?wG2ftuyOKbJi1cfZp=~L%*1YtSBIj(kF?M?=CHZoz9Y*tacbKax3
zx0qcKBrb@gIgw?+B=#fHtx~eP6P?-9E8;Uc+q-QgrrFS->_rKGZzZ_$t`Nra7TQ?u
zUt?9{(lslc9%*fav&SO<Of7*aJpev~y-j6m@WhraY>>Pxd6eZz?i<##X%6I)>JD!N
z0bLM~P`Jvu1E4g|D(U8HD_F8fE(UoHdXN6KGIMJr8!o)~%nn@>b~h8i#Z^nVl2a|s
zqu@uFUO5Nu+#lob&tg3dE>Lnt+u2&Otd=FzTcBxUl;k#eJoo0S$7ykufn--wepvPl
z#yjNqtgAl}81D+nV$v$cT65-LHhKZ+iktgoUDcA_MJ~IJPf_0#oEkyQu4oN1SN+5V
zl2$BE?BP&)`=45Z;Sw9MrmM70=pPK3*biUEqMKL^Y-TrUZrIvpk+=iU;;dWVCAItt
zEt*tuiDho3agxBEf}-sO)r*=kh^=Im8*8W_w9TEse_C?1M0u9;K*N>&?^PqH{{ZXM
zcG|s)z_yDlawL-<E_26TYbRCJ<d!#z;wa|=LRJ+UOAqVKN`$8%Z2a$HflE1a-Xb~=
ztue6R?qECT*V>*pm){=Z-h;Qf6&qlWy_4R*Sh@N3z)2vC5IgfoS9UV|o-$8QV@dLy
z^N(ZS+Lhcm$pfY^1ukKvBVgpH-~bQ3AspcFM?*n8gN#wfPMJMvH*u{4?wl*<*8+ma
zkb2{_1m~xJLqOyJI3A=@7-VsS#(B*kVh(uExTPSI@`7+PkSRS5bCEy`z{w|r{OBif
z$@J|>-#7=`G`&~=N8vyRUUSrbRGfCD=dMP2W4$IaIpTm9B#=i@-jD_-0A%KlNB|6q
zLNb14#Q-WDt+)ZlsHGUkL+wZoeq3|XfsXyh6aXCKo<9mYA5Zb1U>-(CetOZ2066xb
z0R29+ocj0cK<Bk7QdfCHk6Hi@J9MK5?-AaDKsm?ZM?;aE<Blj5faj8XP&w)OP)0G*
zji(vF=|IEW^rHhD^`#4u!sp!3$+xM=pa%YUrRVdd1Fu{W%>fyX(5ENvk6HjscL4S2
zMm<IiJs^@sDl(*YJ!wP|0p=+MPZ`HrS3#*6?nt9)Q-Q%9s(9_$n5=yIjkLdKOczxt
zf&Tz4dKxZ=W>-}`I~sDP27erivX;fNxELdr{_oPI@`HkAwtcFD0z7m6aZ2M+WfzFY
z!yyC=k?reGj@EW!q9fBFVy%lK$z=)w{o}tOMN0*%I5&ncSxyuKgD<Zgg$_vvBW$Dg
zITdylZRetq(wz(i{Ki>PLMX|8x%R8KUuKCLd}ViVr++AYy=iTrGlh~nNAgJndnR`t
z=jltELGo%OdUu}>+7ZweJ9cw`-_n*#M~*pFSy|MAL$5*XYIb;lYn9BUNfIg^c=q<F
z3>P!NlA<bPw#7YPC$G}8ySb+-E6wDzrcWq&Si=MuALrVf)<$GfBo5fiZ3j5)K9w|Z
zq)23Oi-O@&CO!M)RPAGGmn_jrV<kq#mHz<NHyIpsrsZKMl;nY8lt(h{J3&6fwMyvL
z=r-?s<B&2``V-o$EGV9AaYchR)Wa|(j(+IRN=sITJCN`smZB#aS<dEG&pZ)O<XS{x
z(s*s;yJ*a4{4Chu5rapTQHw(|hf%o!9Ovs(XLHCt-yE*w?if6G`?QB^4U;dK41g#q
zFu>=oYHr5S8p9-v>lqO&U>mHS54YDe+i=pBl_1y@WJVh&6>J4d-zV(iNa9hKE%)>5
zQ9zOuJ5UgeNOc^r&#$EyVz4|hAXknzW|#eBf&N~c4{u5XEM;8A!Y4R`aU3}7QYb@)
z+vUc?2^0P1Zv80vjlwg?0%vEI@$$z6AE&h!3l-!?c?bnnk06Er09HPpv@1DmNtF?f
zSdJ>mw@B0*g#t|cqdmI=_);A|F$oN@q<glwZs+UTi-@W~94l;G{_r0D<I<Ey!CK?X
zV5LB21Jk8T6o0-}lH5pl`7*=51cA`|3Rqp43a>1(6P6qU?mr4Hz)0r+85PU6Mp$(A
zq-7!5V~I{5=S+3{dsNDzas*1=u5rK~wG@&=8U`)$A>K|p=8zF268)F$aS{|t#nt@>
zZ~nDdhIraIuDsvfyEaBTW7FP|XLLn)SOTnEk^x*FLEWl3WLZy?(<npp0D~A~)Q?Jg
zjT6KcGcNU3jHoLg_uD;l+N0|k1%W0_%zuwPuzO;nw(})MjP9C6Bt{ftarOFB+srN@
zkRnP(F^psDMTc-UsMoQ{ag;(ZfzKO{b4@dd*kt4e#G88HRB}6Q1bnNzlHL7rL{V;F
zCTzvK=G(!iYl`EI!;!I2p5SilO+z8w6lZ%d`Bg{rq;^|!Jcr!H@Uf0deJj>J3jWF-
zHTaV(SDqo#<+rq!QSvFnx^?Ya;qcY5Gv%hPG;lr)_<!Pmh#I<S7CKbEQ(;8AP9x9p
zd!O_4`t$aA{{Vu2*l1!6SI0>l^Pic6#t!`8>|xn!+&&6^&HfAcablWooo8?6eVGJr
zBsn<rKBQN%XnF*fdg9s}QF9u^vADNP6WjE!t-)n@Y%F=Iu4#S+LKBm_*yp?<;5#cD
zm4epA8I=`OBw=#D-5_=q+xTnY_0NelsBBJ_;uQIxY-1dDHQW3>_*G|VdoHVaJG)y%
zF$(Z;p60q62(ElTbu;KT?f#J<k>ij8(qphag?CoOb2}qdD6Nbg55bx@hbQwTw)0rN
zN|C@{?)z5Oq2ZBzszGsd>kw$eM!UHjbjbFp?W~RFpl@6=d8A@2V{ff%TWR*!vLsgo
zCK&wkH$mxKl`8gR-%_rd;jwojTf{Qodtq)*9ji`14UIQbN$0j97>_YYA1@zzs>$LF
z2FCd=Y+(sKx!6_mcl-S-Gg0wQrEw&NMhhAFi6a1yYQjpS($o>Lt$349(;X~rf})4W
z2)HNxs^t7_eRZqB{iMEZjJX&ug(n=~X9B2r%UWA2A3o~zw9H5mqWsFZ;168-S2L>k
zl2x}6OFjVvMIPL3Z&T@AxNIDxlSp>Hrq$nw*3QB!e=TJPD)!;9%AkI=$KCj<((lT*
zigz1>>{rHO=YVm>ed`azekp>^)?1BscVY+0G;fZbkJ7$-_|5xeczeNjt)(r9EJjv)
zNjM4LaP_ZQQNv*uHAXcX9?!0PMT1LeEo0QxXNo7{;$PwJN2#v}_{sZQ_-nz@sfPUv
zGL$=}=3Y4fdS|_S%kgLSqVZ>sH5-wj!6bGhW;=kyOhM{E_VlkcxVF``D~K;Oxn6mc
zVmT$`IQ7MOn5^|ha!^_d_Sp2ViT?n#_l!Ou1Ety6HKnVK##fhX4{kcwoGrBaz<ISf
zT4rKgy~E|4f3hm>m!(G6FtVtYMr;@vIUhk<mO4e%vN5<(BPe2^L^6lI1$_NnMOyOa
zsP4sSJ<RAdSGLF5S|ycLOm_1w@Z->q+*ZPPb0$lP;*T+)ZO4WTco_Dp+J2s{>vGnn
zIb)4Ny8uc2t6D8NhW3!CXBaFOuekKCcRLT4LlHE%;e^dRGfJ`i?zYF~Uwn7Rr+ihb
zJvQDm=Sy>ya(Cg0&!#;qcHc-2_zjPff;$iER+mbWWp|CyUN9N)AIiPD4)uem*-9o=
zj)@8r82LdN$m#2fw{53+ujU5cMnMV)^0DeGN_$}h1{qYb5f)D<e9V14>9>~a1WU9u
zX68Mwy}n<}RBm0YR%=-7f<{~-x!$1t?9^8hM-)C=%A`a|R@=xY`qSgMOS_39je#i;
z{pz+pZk$ysyTwiL$0Dns1Y~3!($GZr_cA=bRLpI|#x|pmzsF)b)?C+WB1xbUqBNx#
zG04d3PqjmPdv6mq$z<Fl$d!p89Cq{-PJ82VCen)pY;hwuKz&E0OO=G$u={Cs8@rhT
z>elnbcNPkVc{#wx_dxw>8@*CP2bHoDE($WYPsX$EH7P`!jhKzhfn`NtH%59mBeC?V
zi+&7HTEeKrNdEx4W#r`XlUd45klA+f?_?2MX@J0U<&;B}JY<kNRBtqKP9bGPWC2R<
z<0seNvlmeNFj-zUX~VKAso;*)Ev$^o1)~)RtjtSbV4nG?X_L%JYi##1ff^FU-+ta(
z89ZmcDtN6T)KCbm<VcSWOW~Uw5OLek(rK3^ZcssS8f^IjCnWRtv*}kLQFNd@QYX$y
z1Y<Zo@z~aKV%*M}#?}ws&l{qQssj9v_H*ieX}30#T)HId<;xlW07z22s^jG(R`b|P
z61<D$`FlZ;8FPXDCZoC1L1#P34+tgMxxnq7^*s8G#hm2U5=!jN9J|#wDM!Nr{{ZT&
z(;P`UMJO<<blu1U*Xvylr)%a#=3$E%@c{(oaCyP*dsY^wYdetE_QpNKhLDfF+!0ir
z$ujTCJfWnJx+(qQ!gjD9=M@;05XU5O0vzMZFP1Bhx_#<fhItla7gtaisNmHnS5jO!
z^5f+~rV5{2)vFTjiv;pwR|vxecbwzc`kIYpHxrGo96nweMq$AoqaO6sD6$|zWzGuV
z<0SgiU(9k0vMaFpakClv(@0k$mSF%QX|kSXRy=h+=hBi%E=dj<GrJ>V;}ti_Df_u>
zatO~JqMD{8-z~z8qm`I+Vdw=`!Xjst8A-;_`>=Z)f1W6Cfcb`WE>2oC<81+2Xw{;N
z8{CDBn<NiXeJRFNjn+{bw?N!yngk+{%OZvWBwxB$mO1E8YK~#CM8+(P>=BX9YD5pX
zmS!!C<8J^`ta37zjxx%i<f`xuChQxcs6|&MH#s~qA5VI7MqVapP@%`jr>Qk0i-auQ
zhE4}TTAl##Pl-HpufuDh*hxHbOr_>Q!e^XT_<A)lHB~xl?U~L|rxz(R)IVq6huT~g
zG5C(+$QjCqNp4Ua5;;tIcjmo2#ObPB>X2Pqz!AhdS#gNe0l*%gN~NLrdTjwBia-?G
z5A>o3$`7y=)M)yxw~6i%qbTbT+KIP}^d}y*`<79HrGvmmn^tKbCtj?pSG-E!4>ZHA
z_|nfrXk%q~H?u#=eC&>%g1hgIz6689TE3faZmOXjS)CMs#~pK69|^R}JAa9AYI=ZR
z)^|cRcKJcc>5BE=+FIV%RPlzNZ7irEF>dmsIoxnD_*baa<hf4l9UgjZKT<tv4Nt`%
z3oNZIg0Gf`dB%5v>V0Xy3BDLUp%If;g&NW&IgMCu$?sU2My=um(51DqCun`2bf3_4
z09QxwD^S&6#%lVV!mXH-%h)&)bIWts(Hkw#Q7bfb`j^5#09e^bEHy2cafN6x^Da+8
z?Okt<{6Azo0i@c@#NLzp>Em)Sj9?trH^fA37ve0MEEZ-I`#Mj&9D|<N?OkV#uf*OQ
z&~&I_G7aF$9fo!hllbvkN>@>_*-9z4VLHqI00`=7DKkLxFhIMw2h<w&-`W2F!afD?
zUAOkv#0@lDTZoI88a>N9`>%2B{{Ysmdf(ySiRRK@#5zZUWxayZ(A~?m0ay`1B%fXb
z9QN9Cip%kIo-<uK%TmyMLM@?G^Cm}Ou>th_YtO_~h9ZQLcDD9<n?^39Nf_T3{{U(4
zf}RC$6L{;#(^}}37cBBx=+>&c$VJ+N1EV(3#~;MRbJYG(e%0T!zQ6lS{7sw0Y-G04
zEP;zjv6a8or}x_*#&gN-^~pN_0Jl%Y!SM&<eyyh4YYls4Yd4oO#lVtfKQLcldXHT9
z72~NEaxxY?3<5Lxn*5iDGs>BTUu6esanWnNy0WUtE5bV!p4vCUtYoM?f5g;m5s<Pk
z$_LG~{<V5V-o9a(0o{)%4qG0Ws5Yz3ffFeQ=8x9CaXXx@C338;Se7{h<{!w^v8L0>
zEOC~{YIqOj5U!}Du*<h3dUH;V6q06?A_nSLfkn_LjNpuH!nXx+`uk9Jv{~~33!RLo
zk?en^IaN*xe1dR&jX9YVD=@(vZ3Fq#H>qkP7nS)yV~@N&DPw119Y|kdJt|Koc^pF;
zY<2@_euwEw%8KtKr)dLhgB%=n<FzKnm4@sL!MAV^%p0aX>2?=8OJh7_oPke_JFa&H
z82M0)m-<uTm4wmDZx@#FHsBm&Kej3cM9y>asUUseJA2epJ1g&!Fc&y2jAEs_HxdVC
z#w0ieR|h}gOlx#UP|v)84+nsK{pq1FSHhHFFsD3w(jze>gZG;lJw-^Cs?j{kNYBcM
zPdV;SwJdNj#BSZWU^-EtS&6im<=Wvx51%9Nb5DhzdNV#sa5L*n^H8%XT(KW6I#ZSz
zWI$m7l!Lgb`={QJ$3<)e<)fP*oE2l!J?d43<Ya_G+tt2OhwoBAk_pVeW>8~{VVq@g
z+>zW=>ZU>rIeZ+UjNl*swE!@zio^Fq%vQ)|AI_a5GeAUFQXx3!0|9f``kEnuMam}D
z^D~o^#ag$sQwoU+yKW_hdUM4mB)1xiWh3^;q|9({fs_n7@_l)$A7v3Ck0o}lM2_Dn
z&u{*{TU!=TT1XjzKPu+{5mTju%aitbHXZ?B3g@`RX6nSXPDW_7WkMZUm$^OorE6A+
zOpOlY+&LXU^sPB9XDq7F?u_v5(;n2nV^ok9Qux8jo&fY}pKL#5$|BM>FD}BeB8Eg}
z%P{oxsScclx5$21QI&q6dVhsp7W;5yiN~G9avlNo$E`V4Vt?O&5fouRi2nff>LpV9
z7OAeKRkT&yu)3J>fraQX-lT0eYeyZzhR4nsK3or4wXq|VCz!d$_C2=$0C($BK$h5!
z6MT`xu1mDpVpR14quNNWSe2~w#kjfOG!7+jRuH4)9R2TMic_Ur-FdGD2!M|}j@5O8
zJ*=ye0YXBd`{O(Tic6T`mQdp42O&Z-XA6PIBe|u|E02{}p$t)=^I~wQM%OLLr^Tnq
zx*3M;fys>%?zzQYfbN{U@JAuH8R0N6P6mBx@vWJ>ON~*P8z4ZjovWYlqn(XK72vl<
zxQHVLn>_)?mV0O1)bYRo*cB9i5MHcD@)@fdb(=a#H1Z??0WuTco&d#73})e?wX}4d
zxhop39FjQ$KT6HET17XqMF!m>k|?B5;}4P>sln~^sLXhG0e}s|ChW6k*V3;|62=0&
z4+#y(k-K-MMID+*H7ITsq&bg)khtlQ>r0x*c0(bz*vsX>?iMf$?Z^c7G>Zf%<+Fp0
zvN=5G`c&%#$f#w?sg!{toNoUBVZ9H%3<I?HF~_zf82#xR-1i`QXZch)HdTt=P>``}
zjza)jo%!qs(~4E*IU|){5t1kK7XXgO{{XF0+%%9F(n}_gC(rT#9kc1{ifOxfRijob
zxk!AjcW139ajOn!Lc?yBwo(ba#%W#pY{vm<$r49!x872`kRSAf&mlVl`P4<+su<;w
zkmW~E%DCt~>JzHiDNA84SZ5)A_CMM_*rjGWqVq><Z*eEt?n6egff)yc&m<Avrm~A<
zQOAhYmPTQ<xor3L6$H-lTgGJa-bY4qktam#ee+csX<Z?ZTRJ4!+{As_O=vXDYoxaq
zW(XE^iFV4<m&i<xTzh*_b1nU>@=IqWy~0KVNhC?QI3w<odRBd$H*C!`vN4I54I^g&
zFKV#_tP!3y9#~M)Mg}sZ_4M?qwTE=eh=tL1<f+Kmc_bfNKGyd4G2KeasT%Dl!=WAi
zwFjCmWP%vMSf-O}OdlHtDR)OIv|?z+Ut%tEoOLvYEw$6ZZr2HNt{K?4kaa`Qf1gTh
z_aZWikvEnI50=ge9StkQw?1s|6mrI+WTAfO1A)?^Si~``DRPoVr#qE#{{R6b^`Mr?
zUu!$b0eF>AcgQEu(IwaVY*v!4=92~RctelS)pWQrH<TS!#zLyEQRry8xsvWANs(bb
zUe+o&`u%FTMRLSbHQlw{)ykv@6h^zBfI;BqqePc20~cMyAD8&?*!xqhrnV7D6x_qN
zD*+w*{Yj~&8`&jv@<#<yL7lvNQ(6ICv2<BwPcIFH+Hf1|ig`k163Mf9$C#MM$|;ge
z5?1op0RY%Q;Ly{@Z77IHw+R$s<dkp|KDp~ulO>jIU=bFX3J~C6GUTT{N4;CH(^Se@
z7#v3;gO)q8d;Kdu&h4EI%#kn~$q2sR<69O}2%JjNa^nR-!Hjk1-mg@I*?MgvMzA*#
zZg~|+WE=?q=nu7K-Pp+2CQDdyHhkMY=pcG_71b>83j=SJW!MX!O!oTMF|6C0X`jgj
zWNZlvw+yG85lRiVCah3wEQ>i}dNP$b!w*AI#}un9&<l4mN47^Y4lqu56ygNaMj+a;
zraZt~uWo%RC6;UFm4PLQ!x7Yga0PW!rztXAk`d;Y&J*0oT1Rrb0%L0W)XO6>29*Y5
zkd3I=3_Al*m^OyCXyx3XWHWLz@99MHq_8w`sXkKu;rEZZ_7&d@CCvS!Ee%znj#iG*
znMmcy$;YO90Zm;;7V5FtFi|0AR>3FK`z=$mk|{0ag`t*6$KRC?2Q=rlF<m*1>;NMM
zLP<DZPpx&w2Ly!bvd8wFy!)idNX9`^+u#2H*HXuI6t=H*9n@-}aPqrk4@`O-)j@2D
z6r@JsT0Qb@Kf~)%+NPg4Sxktqg&7QZKF8j=VS|Dp)MG}cZR8oI5*9}N(&qplQ}|V*
zwlgZUz<IH4X+X}=*N=K?T8ScP<c(9zd=@>|(-fxH${Qqw+^FSOrYogkW7vl_RQ~`=
zHt|}|7S%^TzE%Vub4c$wkN2R@<@9L&>gT0jxP}CVWitn4P{tHro1Wh0t1Y|QTr$gV
zBD~RUUVcC`oRRBR=(JBT-zm^W*GdKnD<YhQ`qKT4kh>XDPBM+ubL~ZqirdK1HOBqz
zpD{@s9@sT%8+G}L#8e^-Hh%EUT|7PA+7px5tui2XmS)Qs)pxH0KT5G}3qu-2@+>i{
z<(Tw2?^Y5gS5mPC@5ta&qqUH4#5<R6Tw^0|wRcjWjN2Py1fissObmU<_V7k}{c2nI
zOp!EE!?cb=rv!Z}!Gh^j$!g)_Wd#-2C0KT;7R`LoKa}D|Ud_NiO7!Vr^dYf}4VYzR
zJ3&wb9(NpaX|h^}iP6Brlet&#Vyz@>SBb&h!;QR(P`P%Eiku)TDd9&w4Rty(u(c`8
zZt;NfBDh7&YJ(nSSDp)nj2(w*B!wd!dRCaX42;pPN`uCJ_tK(mJ|>*pK->1G+>yyt
z=aL6=TvezfTyD(8^7j>Tr*|0L!v6sE>da9|CfGx+>2tM6``D!#d&vI)E;6iGV00hU
z)rhTuDJ=12RljoTIacUv2rgDrjnKBJ`=Vg`8+i@9a79~-b*vtHuscb{2YMC*kdg88
z0!SaFThm|>E14IDB$C|Mqe7#Lx)Y|J<Z|1|EG+<yS@!OXr#o}lpIWbRYvvuXD-4gA
z5_=A7OhnSjl~EaG1yCF@_o~-+h2vz7Uo7%>*G%g+iByzILfIuKb~fF(QfVAJVS=b|
zNWu(oJ!x*|ogOGHt;Rsy9iQbnsN}fv)U3_|mHCJm%X<AQigVP_Bt<MPrMD8IL5-y2
zKaFL{ev{Y@N-GP9ku!yvaOlH>pYiBwO;1pN`1qIS!NB9?#w#1mxYq8YwA192hinla
z-Or|bSF@GEe96mW&&AY=S`C%wztl_?Hcd3MCO}j7f7-87_&e}2eR1vD=G~fAZR9BY
z_f_A6KLa&gLs5fLmrN*F1P*;WlkM+cW_%j>2z326)>$o786R+zFJbHLUdAgDsKU#0
zn+b)LX>&_rufQ*Wwz_-T7Pc}t`I*simGl{}qdY6{`VBG$f#5=91V~8XNBGtM00ekO
z-%q*O6{!KDT)aaIp5Rw`qUa(78zSA2^D7SCwer<xDzeb}7(y^sL>exNk;bu)m~9x4
z^~Y-LG@B^x=TYTkx((j-TE|U+AwFsnPeap>O4JuI#(<C`0YEO*gu5d}=2(9&$}Rg3
zlus*Iy2iU}V=3}w10y8*3WvlVDTdzNqFMJIKq9=W$NvBjA&M4Pn{EjK6yTHVTH)}r
zsO(dkO6I4Jejr0_Y9q9`W4=R_M<BO;eXHZY+OPJBgTv<RL3tckOr>_LnaT|Mb;V!(
zpucFC^vEs{YATbaR2Zb%7vJ2P_$TAf#$98?dg+4GYoe2xB^!?8gOOdhsng2vu6=e#
zEUGSR7#|pZBwzTyU1_Jd^A;?Z$tUJL{f<AKb2@I4$qN}lPcUxT&PW|9orRB_@?6}R
zP!|E%@FZe-3hK0-KgbH_XUM~JO_Ils_3$;T)T>d-PgYKncP7(p2vKt?f3A;`r>;6@
z+OJ(t634U<s!$mQf6glPwY9P%0?m!NIXwrZW8dCG3?_0CMc!9ta53*#IV7%HG4;Jb
zkkLgh;G~lmdcu+z<(Ge$p<e(6ZdCWHI<3T$$QD__AdrrOA1|Txs_>-Q42hS?+6Wk7
z-2E%hoku5dxovIXa~e9SUD*Kt00$f&a%)IN_O~K$I5|kbQyO!-(2r_|PmWJF%Tbmw
zkG!Mi6|bdf>1z-!@*I*~pOU`E{A-G}WdnLt+}U!{)+pkYm=|KB1ExvpeX&>VrF(mY
z-pjGnZc;fo9la_$TVk`UlTVaCBE-W4H?Dur;Z_zF3JVo%HVXm5k=neeP08HvjCoNl
zysPElmnaD&mgIZX_SZrf65<HkIc?ze+v`!oYZQ>X2UY-os!zR+=8(#^?$0cOAgRl+
z;c?sAj%yZZM#{j;J8e{ta=v+E>Gh_(?2eKwyEpIw^&iTr&3y!7IK=U>Vj52@{G&Yp
z{{RXeS0RFc8F?z>IL%izz>rA$JgC!QIRkjfYO!OHbGgbY@wesA%~de0bFuS|Hn%8y
zpQTva8ZmTc^1=c+<hQTVt}@o(SpqdO7+ZU=0!34TJ?ia@meNcXNlw$l?KO!kmrWWp
zNwPxO-;N0SRk&^?btvR{n|KN_pMRxq3c7)*=SG4!?dROyX%0{DudXSJbgHd7WkP2U
z*QZh{qs+`1?Z5;kF`Sn6rbzc-M<Uvm1BPCKbL;C{DO`6nR_fY2kvbsqA8#Y8`<jkP
zAeKWDP4csRps^XKLQ2K5azFsLr?pEBurjQZAt6ZJj`dE!oQD|;tL49gDfRTI!igXe
zPO=v(l0#q*O1hSE74sW{4+GkUir~u~ywPk$ZRspSw{U%GO)O^16opwtEW3tF7V1Bx
zBNdAfyZoSrR+ExH8q<<5E>~N0^9fK?I2?oAR58Ub&u`@t@r}>83>^0Msc^YAGj1%>
zMOhv}x6J+9XQ`(Bl4E*qe4`m)71VK%JL9!!tSYfHSuoofJEW9u*nJ1RO7O;hVs|hf
zy_c~#>?=7@4pRzUGjwv>J=-#U;tq1T_p42$zWhvt?ND~FTw{S+L7q1eqsAkYC}fca
z{{Vh!OZK)|gf_9Z^dOdY#~!tmsEtK+F(lJOTsJB?VtRAi>r7}M+U(JY*-y;5;QDdf
zHKBbh4;wUD10OSy#(k=jO(HmzV=4&1W>7&szm0RrS&5{FeU{mj!6ZAk51Ty&CFB<P
zc~a38)<51mAj1xUK&akR<#}$UWaPMG!+L-Estc=$8H|WkWKc2>KZZM2T#n*yHXwT&
zTX`4@aL#xjs3lnR>s21g+BS7)l~t2(mhoVtcRBT^o2ey`UM%b7xFSXzl-u5hj$5dL
zyO(ugDmtDB?f(Gkt4W!=80+C%5+l5p+sc$mSR};aOm_6DT9<{N%S9H-#pG?iSo^iS
zV7X+LT|#YyoWl_r{5bDb!VvB!44eQRjy$&ats>eXq|Q51@PM^*^M_Pj!viFrL-ed`
zuME5mB$Bq-4hf8o0PKCUUWsRI1IV#QZ6n9K0FjdCJk(NndJB|j#^868`^C=Do`$-i
zim4L`;o&39ZgdAo<Yfc_{B6+tR2NzW<V6h7`DM?`o_NPv^#<^$lrqc%ZzN#FjwrhD
zR7)6eo5~-&6CFoRewDJvHM%f(G|wiu(=HX+Vu9G8%$$AEQ43Z@51bzO{VUToe+F4P
z#<9GC!QB0aPr7|;K3@t2M4D}iByte~oRB)^x?zliMl!-l9)4|PQg;uoMJJV!kU7cZ
zS8sFRxg<uGD`zjfjDf~~yN_DSZw<7H?;1D}kDal{Tx0aDqgoQ`Wh^}6&S|4NakS^&
zm6MJ$&%b)vy72VzE68Fjs=Oi(nEK<?)G~N-=?2z9HuMfLx9d;Z!?_;LeT<^m%P=60
zgB@rL-@<wJ6{a*Bl^_DA9Ph!}X|17Ls^OyAS;$-i&%e^2w})`{bL?jVLB>A!T3?uO
zP6ukfbc^O;z5oe3RFC5NRBfhDoOw-<a7HNh(c0n3F2zmEI2`*^!wm8O$0sJ9mXb3%
z6$)3bdr)m<QMim}u@$Upxa`PijK3!#vPTC!Dc)zwP-Eumanh5@f4WD^eFti8&~UAu
zeMM}sGDPyBeDS+-HV@ae9&2YI#(tEI0a9|HW73eMpEl$muMLsXrPrGdREbhl3xOEU
zbDYym-zFJydB)z<(;G3`6}j)4R=01wszwJiJWTCthbk52JGf)hy&}&nZ{|lQ%rY`N
zQ#Kue*PX_f%8;F*F^<NUwx0J3Bs^ST9!?Zw1KiVm=VP3V9)Jo`iVg|q9VxpBQ<2l2
zDt)~Bj>uM*IX&^fB9=Rbje!r})1@@Qft(&Ynmo1xJ^OJ_+t0YUP~kD>YaUK%eD@tr
zPf84Ap=Bc-!0SonkU1ZfCt7c)?1d9Ha!)?=f=L10)c44zeVva0XFinUZ0o^NKibC?
zF08wPi5~W2xB>v{NtZYZxX)UcLfgbm$s?^iY4abH!rgFvz3Doa>N^#fu>h)^1B2~K
zs?ExrZ9PfvR?ePb9&D(`plo*ZsqM5&i6V8mgsCmhu<cUnN4ZK8>}E(D0^3Oh@_j00
zf=uOD9&yKN+=Ih6Qrt!e+t2S8IS9Dx?^kWSA9{B<jyG)OLypIcipk<BuBM8GMsnX|
zcRR}M9S&*hYa@`TK{()Jn(QsSD{j(AB!!OT#9uc<-;VWa9}Fh=?O={K^KyZJ=Q!ja
zN{_BVJ0jK=OyaGywrL7m{PL&;*RBEYSE2Ca<m3WaHcKer*L9|NIzr$JP`F%YjN`cX
zt%$rkX>27?ZVaXcRY8mZPdW6gr;fU^HHHtXJlQ-SdF7cNMM%jzi)SnER&Bg9D2R)x
zQ=H_El6qph)zB=h;t0E%Lc}?9!0*K}3wY5(HHiB%G2B9cLH_dlR!<b#v7*C5Cmkn*
zMYYkhn$Bq5z~0XMF(V*SMd9fuUy>Ffi3DRCNcFD1dmzu}$qbTA$K+z%5%j1h($!cz
ziH8l98TnNDk?BcSxH?H3q0?0eXHydlhaJW{;;CHe?yDj%%68^9#!hRimre5KjuLkQ
z*)k5BdhzR7mzsQ%M6GUCLh`UX2i+dkv?^T6P|)WeO1coO(Sd|)a9P&_KBAx&rJSrw
z^D){R9B1Ft>s!sI+{Fgjvm)>10sEu+nyj`Bb8RAEDaqh)M>V>ci-C{j5Qq0f5Kq4~
zELNM2*+~N#U@GkP4*vkVnl66n5ex<Y0252HduyX<Bwr}OX;T<q{=GKa7cGZc+xdx*
zhX*Q7IbW@5S;cV@EDs#dDaIU;!0dkthR)l}3gwt0oy<x3Tic4*v4$ToeC*9P4IiN&
z$W}EcWNjGgUeau3xRE1SQ8&KWnsxb9_diq8x3nQ8zWDC1gn}s!<Y>yYY&bk0Ue%SR
zvfE7^$qXNM+>?~gu=TEn)?+IfJfvg;bGoM^>TAoa+>WYAT^$CP*B3VDPG{Jz*$m1$
zA9~e-GWRYL11AcA#yJ&-V<Sf>5+sB?Aj2eQhGW~GYSpmRVoBqb(W8|BNn<UAW7{6}
z=FK$pJqTF8HHaj;BQ%P*1<wokRC1&wt3rZ7kQ-^j=fD2|uB=Ziv&WHY7`ea!xyQ96
z+YE7q3<F44%KSRi^E;ZjqNK|oo8~zxz^RPq7$dzTuv?KN>+=~G=PY<Q>HwsWv&!)g
znYh~7;15c>CT7!OgzYI4lAx{$2dx^CkxEuXmvz0wWeO-<41>o?a!&UPx5^4o;BktA
z@(YZlu>f|<fd=2b#Y`jEtsoyVuiq!Xu&1E4M1|5;SY(a1BL)r!R`;cunpsFkQlRn`
zal4L&niDbzmSt&9K1Drq>*+*qY-g4ii20F$vnL#r&PT7k7Gt=R0?V~`CKo%Ec_*-;
zqmf94bpk>2F<v%<>+ezpk<%-;<|HxCLD*2UNfo;44{F#1ph@wUBd_7_Pf)reHtd0A
zh@zO-l*rE~)K!R2kk};vWAdR~0)1++yHM>lxDU7hi;<tDGEG7#T&u)!kCC1D&vETq
zD9w{}i_A=k93Wut$YME9uc)U<<}qhb?<$kO82N|v6-h4{C3l+`F#tP|DaP#~D2X2T
zDj2bTqODVqx#EeQ`DKvX+sJpS<RCcSPik9zMO6}U6GTWMmQK8N1P;8_R=85eSOAEY
z%#6#QrYfwnPmwLcHU}tkf%w+Zq-83$HU8MSE)=uiF_ljMcEIgQby@cBi426ERk$ig
z@~mjD%PS!`V5NeQ)~rM>qlpBPD=}hR1mr32?^{BWMsBQ`vpwjLt46`Hxt1cl#xeSu
zuNJ8s=_Iz&tH;oSypPA$s5Re`yV^yTH#-6-`GNJ%^Qi}&B8WDSk@8tU$3D30TgIA5
z&D3nN&f!2OK3i{L+>cDuaLIKvWoFu2&SnxS0f^5;IO~qar;STH811An$bl4+GR@x}
zf|V`HM5vLRZYz>MI?-7Y-OAFlWV1?R0OcDP+TULF9OV3kT)PJ(s_+TNdb2bSD3Ul8
zw*m788-VxrsC=}P<z&QYFpNe+H*hMh2&*-s$rOx%ju&&LNnkxkrDE&)dM%pV{F_rd
zKpEM`Q=awF&1oE=qnX)2P%^GVAE&iu>K0bFc2f(9@>AssppI!K<12$ntxq!4E*{!p
zrq8ICGRPU^WjJ7RMo(ewT=n>ZJ6Y}0<_M6;%pr+L-OpcdTJC&Xph_YW#TjxVA$+gm
zJ@fRg8&q><<y+(mid4K~=Jv052Gv;T&mz2BBw^gzt<9q<&UQQe&!4^R^scMHz9k+V
zy@ye@xt2A7LQ56618WcOkLy@h7qMO0nP9h7o+tU?z~v9|9CxhgZzM~JE+Cw&MF4U~
z-uL&e$<cF*O>SVMlezX^fxa+lny-dnRJ{G{`7bb&C^+LDmD=eS+Gew($$w#T!TgXW
zUo+*91Hs2|dV^mD=sqylyfLU1vYmyyFnR66;ZAyxJ9~=yH{g%N$JOnBwBJzMIz*{)
zZpwaSCjf!d99M&iz{-xRRCUvwXX<ypF!1%f?dOzuh>W(??tYcTUuo?WK4jp<D=Qe|
zZ=0v}uVb@-c$ZI-SR#&BNVX~e03UH&Z;8A%_JySpZH_kN9*o_`wR!3hI_cJwEScu)
z@+Q|n3vM~jb*HYQZzxcOf;qus*N(r1Thuhj;AyVoLL(#hY{wx_dZjE9!tDgm{QGjm
zU;&@yRT^oXig#Bal6#2BE}M{j`MO|s`U*ngWb&esS$dh*pv^ww6u3f?kV7UJG1OIg
zmKhzML*%P~zE(LTdv*q^*`VeGkaE&ofJ<z4L4d=xF>V@EV8Nb6V~0_JfzveiGF>c<
zaci-q0yQgvw;l1`rGmmqzjUm!khpz-;}o0_U68XfsgrOaM@H}LeQG9Y70aeVqUDQp
z0;ar(+agO54I(KEyZA@-H59OigogPYml$q_r;wJ}T+Gra1{nf_o!hz}T41@FMQ7W%
zD;>DTSFsfPi2Sg2j4lT3kG=GzXc?8|ShpDXb&PZ#hu(`=SGf_AG8*4#!BP9dd-`Xw
zq=mNaEcs+(yph2bWvt}MR3mbXsXui4Qy~^}-GQbnx9-QD7>~c|Jp}^lNoySO2^u-q
z%yEbuullpt<JOXRUM-1lByq<Ym$-#t!QI_~9myv@QRz<KBmv!-8hDg6Q70SEWB609
z+%$yD#ee~%WjN-QwHZp<IDq?9b4enj?r4OB6VKfz`cuWbv~nnqZslg{$UdXmojZ9}
z?RzX6ksAS2;FDIxpm&Z|A*25Qmhl1eBIB-m^V)_ba++G1&{|BKvCGV>^6l&~NXax%
z%x(mD^6(2Tb^v<S@oI|;E!?;u6BtvDGy2r9S{VV32pBfp6mEBZCZWk9lv$evlSb%b
zj44sQ-OhJ|&<{#_T0O&=N!$XB<8KS-O=*iL+0s<Dkg+=>XCnaj`~^Skc~LFIThN`Z
z$?}4~;Zo#MgEJpXY2k1q4ke5%jJ?z!T3B@Gtx&}qZH-6C^LO+$xo@Qap<(#|<#%To
z^v|tL9-NBgtZgI_ubC>U{Mhf4=}_cosWT({I7J%2n0Am}Ss$YuboK(IHmJ~mvIHEq
z2>Zv-dXrb$D_esjCDeXN8B$J0I%1MIV_67wZ@d8q_z$gS=ImOgK(?yw5S}JfN8YI4
zcpP^<$G3X1Z(`Cj2AqkcQ@I&V0Ua_s3b7rwZVCu|#$TFe-@=S>kMOHAwCNNnBALMC
zOA2%t;aK_)O6Q!UZ3<|qCX``sDoFWQ_a~Hj-HyLXNaB%QWR012rc|B*Ki0GreAh{!
zWk|^WG0XAyew2bJ$Shn1QT%;FdQ=z4in@K6N03^<=Q^R0<0NAl?@m}FjU+KcurT2d
zJ5PMonQcghQREd59)3@}{PsSS_hke;h!rCPJPeVJ-t`Y~vLKEi^8~g%5E8?=?memh
z0B43cywM;kzj+_;XVQ~18H|=wDyai;WbNopKT^N4)AXlkVBIrGjk1x29oT!(6?P8R
zAdYD5Zsl27UOy}pLH__Ohxdv1=~?=>iB`_gTiv><GZ4&17asM%c-P_!ShW8DVb&pp
z6e3aA%o)I1^W9&?TBf2+h`PAO;gyy`L+8`{E7PHu&U&-Xt&OKoMY-u7BlxXtV&p+I
zVnPZ;xB*BV{{a1U#A{y_b<49Otcz|IJjdm(PJIaV_pWjuwO!toxQvtpDMmRzU#&$x
zoh7y7&QHq3D9G(zy(|?tZh4h4bt*A$HHq9ALrMGWlOvpzW8W1D#N%{x%jO1Oy~^|L
zQYt)?Ni1Mx)G1aOBOlU%wSY+O;&lM|ju!!ab6tumI~?52?li{~Tz!^7^5nZo-_sOG
z^GL!JQp9}N$4ZeP4J1#r>{i2I<dI0QB9RK*?A-g6obo+6rbz){WE)tp7$c4e@0vun
z5-!G*B<BpL7&T+dX#v_)G0s3d=h#ycH**@t5f8hA>VKsGbsr2qAwPn(7qhd|!wZK|
zB+bc8bU#7qTOK+6r95HdEgk$Db*fz4=~mO0`yZNCIai_MJv-p~4@&dd*%mfQWZSfm
zz;JU;f-wsX=wnP^1woMB{?(JCN>k=*Qn{Upq?cCKVjCJzt0D3W9I`Kdd(<<;yoli}
zia&O7!S&4u_aN_;zEnFyE<h*x(ob<RD3B=Y#zp`Yt;y7n%R?pu@ae$^`O-uh040wI
z#GR^7CmsHkB(0fz&5Zd>GN9m(N|kM-wJHEr-nb$8$Un$XD~y`qWdJG<Dm1_t!Q6V&
zNg^_j8RYTPIr`G1EM123$|M_4O|3#o`|}e4BC$Becs=O2hwf<@`AxKh$Wn9lG=<E>
zKK}rao^U(Te38a-;K35*n;1KZ=nXmJhFg@kmoY~wfT5eAJm(^S7)vq%Jb^+v+@m3g
z?aejeX`NPCNQ`sO08^e%EhYIkXYW5!aY~@LiJ6sz%vE#Ianzav%vk~042r7YkfD2f
zA9_+4Nr0p-2KSJ3{{RYq?xRI6jHs=W81lor4^d2MQ6yqRYyc41$$b9+ASe+EDoBN4
znPU!imwtnur{0{Ik%&j!!;Rem$A6_Pk~w4M0gf<09FOZwcP|-O;5%Qj>bUMG5hRw&
z83A%wrsAWaALC6JVU46NbJy<uXpELsi86MasV&H-v}&V!NRC(#qBHl0sP&)(^5l>d
zG5`XSryc$3NaK<L9mJO*h;y|uj@?ZvEGu;rChsr)TPq%VQ$Kq$63n~ue(>OWPy^*-
zDj1#o$HB%%Fb!5`kzw+t+*wK5LBR+7D%pEo!YHLKPy*~*822CHO2QIMdvIJ}Gh+=+
z0Z=3W;6NY0Yzen)p+k}1J@G^`M$9D=vGP}RnH=Y!2CTsX4U@{s1TT=F^SAobq=p4E
z@0kE90uIlUoOJruiP)Bi76=|Tdx?Um%NWK%&#CQ7(#FmuCp>}!vBN0i{F;@m=a6|Z
zz|s<#I9}ArR%ML5g+MAeDU<Z8x+cUWJhhY|VD57nEs#g0Or@O3C_pg?Cj+S-o|N1y
z6RO;(jhFzwVBmY=qPG$(uNVx<JpsV~0P9e$!RU)J69y%o83APZdFm;mVHe&)-!VT!
z>rIV?#mHDpg_Lel+db(ZWRY_l{GrHVdWQG(6g#0LPLs^DGZw;Z2h7{^W|?t$8Zx|c
ztCv4M!;QaMtvu1Jf$k(kBlrVyYB^()8N7)aG3KuapvS#t=F3qhx74T7=lg2E&V-e0
z;|I`Io%fFXN2q|8R|=5q0L2o82i*JC8oW`)qs$HiA1%9|{<pn8H$seDWr`h<lY^h|
zsZ)~Kjlnmt`KFR)^NX0l#tOGnN#{<avISKieTw#_Vi<tQh9CgG-iC%%B!yx#joXi3
zZ>2*i4j>Q|k%eGE9e#$k{2}8z&jZ}Pwc-0UOU4^xxPD3w_^dT@>|K}!+wzh)%}67*
zl|-$mjmVkU6oALQCes~{WYhluZGRq{Pdern^6k+U0VT&ff#ruBWAU!PPW`-f>E7PM
z#J(xib!CP8(*v^<5*`Ks7{ccj^GYSOjfI7YehRnU&#0wGcooD_D(=X33(5Zg3fhJ$
zwi(`=vCCftLlUhteN&)*-oMxyw7w{g7|rg+hSpi2K3qig;~g>F*OY$IKeQ*rkBxef
zyYc6auXQz@go$qV4q&%s01qlW?T>-f44&q^sKn`)TY?rs717Q~^&+Obnle!Y5_y0C
zSg<M=9DX%eoMs~#E^5x~j5b|`!av=jv5ylgd7?3lEQE9U)J|M6P)Rx9X05VBzy!t!
z`HLQ(N{wJ<oh^a_9~=Yv=DAMt6nO(WqXKsAIZW*o=aH9rZ<t_YCsnCrw%x-di;;ja
zhaSeGWz3>ibpdha<AaZ-00MGUsr#ev5AO<+Im0#y&PD(u^!ii_4ARNxG@!3+E-FN}
zx|O$E#92V+JP-c>RW$4bu-yFW`-jMIq@JHjY>y1lG!hOuV}`-q?@+oF$}_7K<OLsi
zf3sGsw0%bYYimff_cB~Q*uvnF$EVVZun^9{1aaPQP={6MN1^qnTim~#wyPj1DxHW)
z*}L3&`_x*Er1sN3pLLk!N7`U3hejPq6x&w1j}gNj;-{H0Pny7fihscrKW-1%xAt+-
zd`aOijrQ!?zlo+n1g@^p&Wd)&126<8!Wn?iJNwk%@KVil;b+8ei^s*D0MKB!xzyuU
zzLEq7BygbPgOxeY2lB6hz8LFqXnr%d)wK%-xm!YI`!EM?;n21#*KYnL_|M~RyKApY
z0z+YA9@JQl430gAMaQos`c_z69ASxdBHiV>Fsn9~klkCs0%vJ$CV)W-4a+*6+3$>2
z0r14{AKIXQDn@TC6d5beq3`cqP4|iIbZMI2OKDz7RFDH_9`v3Zhs0XV?Y^I*cy9Mm
z)i3UXT1RVZy9I~|+yFD`MSEV#lWUpiaC=&+C5<CUpGRNptBK}<)>iYjAtMrC43IkX
z9Q#+X{>dM*AH=WQ3*swyKR~~qOz_>U<V&o0g52SvT;<Xt*#=X_I4UwSItu2#F8<Ho
z8U7jS8X)+Aqr9JMvkh`ARLWp-GSL>sHx3Q~>FJDD*MIOz-E-m{)~gS|Z5|ts4W;z5
zO9r(pVK=K48CD~S7`6sFe8(ddIhHb&JOg-HEB-#Bqe4=x`_s>VX^;3O&b9ET;sMgW
z8~CY4oqHKNeuX{klgSmtaj4wVxXww#GW@_X;PnIRKlmkIf_yipm-s{RUrN8!JXPhJ
zttKN2OBs<>SIC7q+RR^Q<EaB6F|VMt583xq_+R4*HA{UWe-NaSh@`!qHlAB~w=%gi
zm0}J{76gKE>w{lxe#qajZ-9OX_}Kh=zqW!;5NaB0EKw{Nj>t+7xlEI_$Wo+?51GAd
z;%jDDoNRrC`JaB?XR@e5ma$156X4(YCjS7%?FZu)moBwD78(Y%s6EZ~zMq*A(HC<R
zb{r{Ss=G(ZOYqswKD5<O!4KGr;O*t+hvCDg=+I7P`vs58@<>2ZM&=*g1d@GEdS8p5
zwBLYyBjJs2{t<5yT57t^mX5DwX)4HJlw=UtI2%a81n_t`=D$7scl&DmL-^dfuZ8?^
z;(xTqF5zoyY@s5I<A&+;cl7Jhxv0g)QdFnS+FiTb%!$^5m5P7xQ%~BCPugeUTlnwc
zvI|Sy3e}p&PPw@R#Uka{5;*<m3QtTT^dmL#&+MQ700msPZD!Zu@5S5L?XP^sg(ry!
zkA(yR#N-ptByoy*Yx<RkiuEstnwu}!riw+kw`U`MGsyM8>7Js$K0j-32;clX@x}J1
zrOK*?<%>Ln9&zjV4)xnh2}X21n|j{&^Yb%=)aSYT)#0CsKM%e#cvYa&^*c+Ix{QyK
zWsw;4DZ3<Y?O&E(@KfK}M)ToUimv`BcpA=SwKFvLZ32V#R^7<}^d7k9@)h%6?8*NC
z1ts{U@JCX%(ce{?=D`a80HVz!C<<}71K5snp1J20_bYzce+d5oZLfrvS_Ss29loV*
z5=kv?SP7kZ$Y4k;ppFhbM@q?H>fvjtr*v%_t<RA^W}o;e-^MT5^8VXF)_g|y+Eff9
zYg?GS$s$aAyI5lw9gcE3b6=;QvY-4F7vX2dYgDzj*W!xs#yrSb`Hb}MkIV6|$?w`P
z_AS-)oko8e_#<=K88<WvHkaU#2d`m|@UISv{{Y9o3N={nt)|p;?Ck)a6idm$E749m
zXSW!xs+bHmDRV~2zqp!_huP7e(l^Fm+Y8~Z!%u^{r;a>BtHjV+SUb+JI+r+8fS`~I
z6Try;lhk#u=g;=n{h=;DXpf1Sr-`p5HhN??lYeJf%&M}>mp)rLR&I8Ik?WjsjC0==
zzih9I{{Ry-dru5_i^Xz%iq73)nIM^iTwvs6dV(v;q}49&R$bQ863u}nz{?MOdgG;5
zTa~ON-ATL2>F9=~K1()4EvBAu3Yi$3Y)&@&liHw7t7!5^4tFyG$CJVSwPB!&AhFy^
z!Xmq6oE#rq{{Z!=ZR{pXMtK@Xl}2Gj7%HK&pM2N0mCVS4z_P>=HYJI6JGu;io+%@O
z;g~w2GOH5X*N$_|O(a{3NgHIdZyQE2kLW68iWf<);8P%Os~_DX9FghoO(I(&OJi>b
zo#o0vB$WrZwM?3S*zN?YA}no&juasIXTI-BPbxcmhm2jd#`xFHSjoa?ocmL3)$O5h
zw;_Z4vSvK6T<5(sCd+o$w|1!~k`K<i<&9sc2LR*HdRMOe8vU}qH+&$!x72h$8ZFci
zkS=uh87wexyq}lb{Nu^uw+!W&rdbpcoCX7+_Nn30tYiaFHp%91Dw|I}<ob$ojApGQ
zLxfrSQ~N!C!CJf}uBvE16T)ftvqYdgz!=WsjhvoOPHXJ1hkq4(7vsGFd`02?YAG$$
zV2E3Cqhq1RHTWScP|C8{eW?T~2rR}fSpNWY9^I?k{{Ugn+b71q1wJcj&}u#<yPw0-
zDnoy7ZJ8&JCy5AShsFj+Q}|b#TPveCc>TiWsZU$oAGPt_%RRcy6sT3l&V@)JeMk6J
z%{Nf<$c-2kA9o|6^{zL-el^nkL7>{|i>Mi5yiYPFRl(YM$RE<W%Qr^2D;p~iidP+f
z{dM!xhqJ2VeU7NfNnINALXBr2wYpfDqbJN|$t~%hPioJ-@Me#%6np(PC!LfB`2bSb
z^zBzBk_i<7Qn}y*>q`Z}S&S@>j?0+K90ncelp!@~EenjL7j${&jlX4Yhh8$vogO&k
zNZ1J^`F>;Rj+NrRIsX8Hf9iT<3w_{%7{wz6QUP2Zxb!Fc+}GF<OXirOjYAR$D#Pzo
z>0tqhMABz@+F=K`dgZHv!%aVS%<iF?V(93lbMpJ*H^E;Ucouu8rO>XRiDUDokOEb?
z<#X6~^!;mweJbK)XhbrWnE(=(I9~V_`sb?nFGKMSpV@A-7#WYrzElJi{_S}u#Glw>
z;m?cQYF1Gj3xhsnh=GjuBONQvmS0jY-FH2T8O=G_R95ppH1Fip4ZMQZ-P;7M(;>(M
zwL>)bc5<TX5=O9?!Sf0B>&<;x@oWAG<KyoQ+uYuGdr^+^HgX!_E%tz!$WpmGo3?oT
zE9dVSd@u2zgRiH9U(jTM1b$I6TbEWH&rT}|)14oUSoEplDAo8RnatRTwJAiZ;USn{
ztel0%8PD{q^4tB6Q>RIApzQ^A93N%}x&D<#_fKs-*4`J~(I=QKqV)75-_oj0t<KHo
zPqPX^3+4RZfuSyCp{sT@rJwyRFJhRq@c#g<a=lJC2Bfu$(@$9CXNiHyiOK56lB6EI
z)?B*2tdqc&p<m6A`G!ORRdJvA5hsso%NP2jdv7JSR*~3=5GN7(Fzr<uZbZ4Hb$4DX
zvbT+`?OIZ@#hDZ~(G!mT-`1<HqcrmfptUkXA_Ft4WQP9tu&kF^j6mVW{{X)1yf!-@
zPimMwv<ryc+9<|PVUjr?N^Y7+Ih!v`S#C?*O6??Za1o9fdmMXJIcD7?R#G@umA+$)
zZBKFB)Q@)*R_QF$CfPB!Z{B0+^r;%s?^nB$CXzIh3A$!LGJ}k9(-f9~W~QVeM|-;|
zqfC{CVUOLm@4DFTdmfdgVHBQpFu^dIPF;@dZO?9d3a)fp$YM7TTRNyEe6|FZ_p4^c
zeKv0{;ZjCOLprZj&tIYc02)$BhNzq*^694ZTMx6mtsH@X+U0thZPuaYE8E;$0t%0n
zKI#gfCTmMCuwO>$Y-Bqk&mcD^9_F1imr(}3x1JOQ0<Ex3#gKPChu)^hE<Ss!i>rj5
zDWXS&ZH=TjL&gT|RT(Z4;H1j!lwu30!js&n^r2nljXdQ(Z<tvQ+yFZaclM|*WSW28
zNQDSu2xJOJ;43<b+d|^e@XV-V&(22W7|F@Up{6?V@@E}+_5PJ}Z<5ZY5T%e|p9Poc
zOoB5j5QP(JfI%F$zt+D{zK6hHQke&)J;@%FnA{1*IID8lfbRzF(s6*Nk)G93WN4j)
zibgoWq*cIUJY@0Q(sPXV%^h1TGoCm!D0w(UCkF=uiUumfEQ}+F0?cp+df)J0!+#R^
zw)yRBkz$PwCYnxz+oxKWz+MxBRMaD%R(A4CyCjW%@E_;3eOvIa;m)07;rKNxZ!Q~j
zh{tmp+wKxBMjv<gx`GJ&YmXC)jvsS+G?evwA2ImX;hmp@v`;jdp6Lk}OXh;0e-1JF
zisA~DIK~MXuYUceZFK0?a{++b!~(=%{{UGhKQ`~7@7}xsV2u9&I@X0xYa5ER6eXa0
zW4$g;Ii%yif8|O*{{RD9n1)U<{HV`7^&O}Sk}^LLLHT}GpaAqIoDTE>gX!;zU5$+T
z^rLQg4URkapakun+4P{~bNbW3XJAfv;9zz3q*1hd!vn7(fEsw|oO;p7<A6tMd~v*l
zxa26wBhsdh!s36H+9rHpw$YP=MbOf0uYtQ5=dq>Q2tO&~p0xQ<1F(pfRp{OGQd?QP
z<(efd5kYp_#U|B*m5^)$1o8;%dQhkaNpaWGr7E#}>PJ4E{i;J6iG*elrIZ!}w;e?;
zVe*yCBxMScLFW{!9^%M=k_RTG{n^QpBtBnIjf$ED0sx6>L$}N%Cz8IHq~y{XiYqiD
z?>X8w@BsVNh88Q-1}%jiwQ>u0W)WZr*x~mMK<`f$-cqv=3ZNTUid^I5D$j2mQyAcF
z%YZV+?;LZAmc}?z;Ut>}=HTw=MM&0A#_A+;=Np4>zy$UKxu+|AlzEDgxlXtlP<;=*
zCo7MYEy*QDH)ZVJHbOUU+mOfmw2y5Fm3F?uz-BfbKA+=B9Jb7vck<DnX_<N_z6Dxx
z(8Bi)=0b<$jRr)kkGwr9bwybflGMZrXys+b35$Z>)Yi3(mW_zshjR?_zTaB0A%fmR
z6q7VqMQHbRQfhA|TZd_0;x~BX!Uc;2`=4qq$6};b@Xrx*77Ur&7;bp}EcB;D9idy8
zWKg@vU>Bhsi0xJkid`M!0TL~;B7nI)$i+i#1-i(Du!=V)%#(5ZzVuuK@?b{Hk`26>
zP@Hk^Px7q1rDV61$1fY?ljc%AJ*r59Tq%kogcSLiuyQ>!NV|85QI`QeM(PhdjD8fZ
z1a>U94i*U2&^ZWYT!7x@q<3NvLe7A`Fuhg14k{*bl!e`c$WPrMbLwgFnC@Apj1V9L
zEE^g1<I^-S6~A{9GD@+Ac3ETF*WW($(F#TjDGEWsX%A2Er>t?uB#i3MxkHo(8$Da;
zOjVKGqX58yz_8;!l`M7;i6h(^>L|e(S26wXrC2db9kF+k7EnWZp>vRW1^1|+c4(0$
zbyZmykCYMt>qJ)1cPiVGfXK&V!U#qOjo#fUF|7$h4aP+Qwvbj&Lr;6C73C$+vP7h$
z-+hO24mm&L?NPv?uD;K6Cf6V;zSFhw?bv&obVAt#)7+s3HNalE{<SP)WEcTunO_4c
zz+u#OQgO~H!CkQoY`BziyL)>3R8x7PRq~k^&cgX@r03jvRBX)gsW66olm;#X4mkZO
zqy)RcLKKp?AwrCFKK*Jk&_$Tx`Bl#jU#RQ1A6h`-J|$+_s1DM39^U4a*`b|eW!O{#
z0}2IlRk;yJWwzY%Dl0zjM1O(kX_4#_LlKfqtu{=Ic~kCc6C|<4_s01N+y_zaXp(0_
zHb}U}I&}5TI|}5oULp`lZL&E5*nQl8jRJC9#9s{EV?7VGR%sOxwo0ZlHtoi6bIGR*
zhKxn#zRW+$*aRLpB92iOV3nYeFCl>8+hoE{q<8vMEpcr%#x3_Cjqp{Qf$2yj^Fp$a
z#OELm{*=};ZSqSd@yXmU274NI0#huJzXZq_1#P~y7@gcCV2%&nWgRJwq{`P4oHo!8
zpvR!}q#>G89zU0Ah}A|v8WI9wcO0^Zl4ONDCJ!gtnv*yj;O*oRybrBLvT_`hU``o;
z$pidpu{@~k`_wO8j5CUM0(WryEN>KUibFTAatQ5AWsyKB8*L*DF~|eGKIP>oF57k-
z;Q<^RbsoZ^cO6~+a4_Vbx;qLIU@3B{B64u4`=vd(=bF3W{S#O5UZUDZhpgUtwgyI3
zJ5>As0G`!<;itmi5`0qE{{XZ6Kc>lWu#j#UP80%q4}P`x*X-&075IO^T4HNj)IlH0
zM~XPpCPp|oC(u``fXgc4<#(h<W5<7IFW5U?ovi#-;=Lw0f|Zej;~DSt0=~%bf5UAr
zLR)<wM2<W;{maK57BUAX{{XLB+GmHYt>(AV^wm_1g1|4XKJ9lN81MsY8vV7ClO3`z
znJj9De1{zg9Tz>j*VoXahrrY2q`qd6UChr9_!j>FTJa=S8<a>b)s{Gyl1CkVE7N=p
z;SC$YOl}@>XKaZhb-)#)rD<A!gCRE!0tIFS%;zi*pgo7RAKN-+sSuLI%d;^K0^|W)
zwJN!2i<4}0)}k4uSZ)CG23P});MBS{nQ?m{EgQ!q4nv6-?vF}kjhqo~x|-}1L$}L(
z?$4n<l_k!wx_l4)o@FHPOot)8zLn10o`{_bdZ~j+oo0mw_>Ojt=M{^4;!B&zWQNeF
zk=rq@+!b$HjdimUNS6_|$qpJ;<Y&-&S2wFRmuYq;w!f4~f>8@_O>ILD&1;me(7!yI
zn7WGnB`8Y)DFY+i)_00LTX4%TodY6*Qvd-cAEjaI9wUsRCC$k|@@-{VF@fCIn*3Gx
z!K3(M!e_p}@{C1_fOwHdzrA|&@UV(gsiH+jowYjsU&XPtgX)(uI?98M(hbS!UMcZU
z_J;7MgrT0|e-%KNER254(){Ng{<ZVR#-H2YR+9dGBg57yB!V_U3~~{S@Cz`noV-io
z4O_>$teW46?u@=!+>r)5VkfBeJdU-)iq7azhb|pmgKa$zRQRd;VtDVy7t>kzJH(R5
z3~~{fP=^Y5`d5(Zmm2ShCTTT&TIOO~d(7M%`wrD=-%FY9gl!U^H3K0+GQzd2^n$ib
z_orlulCcm5dE=kyUo~43TD!eRa%|c#tn~JQgD`Fe8+Y)JTGLGmS0w>p`*ImhfBjXx
zYoRb@NFfE70HKEmj(Dw0JuhrRRAffZ0A<N;dFfp4W94Q}m!-Niji#iFaUHkIC~TD{
zjGDct=w{vn1hSafU;$fs`P<Z!&o#Fmkrlnf&|BOrxJC12LCDWLe-BEzX{SVtir{j1
zEIn!+M$1vTQp-*`D)H<rflH7u2l$%4npAe~!QW;SZQaQ~O0jEoWh5_aZ6b+cf1Ecf
zx2NYr+zG5DxSuO9%0?6b82XP&&zZJbia_>>YP)V3cLBMPPb2H;O80h<ER7ql%^1RN
z;lIzVWnJniX%kpU42N`oJC@|<p7loeTm_79&WcJ6r1j6Rr^?uzk}loq2)kyCF>IaS
zpUSF9c?2<j`e4dj<-;5)J$S5Z&1eS~VnDbUkx1gRC)UWBXGz9Ne&QfLSr50lp{p75
zn;NzF7X!?mBv^1&l;g|?wPwq$?k@4Vkl!Llo>T+(jbq>IFzo%@8-QZdD}Csj{PwJy
z&06M1^CFpz!=IIkU<DoV+Ov1LE@>Njp03dsw_C$AxdmcgGx_zb>2)}+Wb;v)MJ<Mb
zSm%MxeFkeT>r-i6S{L1n5hC>sj%vHyDwnuqb!PkW2Ew0gQOZM+erxF4=X-L-Hu)rt
z$iV*V4)n?HCiBuuWGsxhU56Mr=dDunOoWslDvW^LOBzUGzYgvrVU)r-`-jwhXyqp5
zyLUjJ=!{^FJdwLB+3)o^tJc>rO%=JFL{e^XcO0Dx@wJrauUwC%Q@4Z?iWCCJ3O9Z4
zTzb}potN4It1u{%kYtg5=lee9rHr|x*_&%|6zHMknB=B%SEv}R>nl0gr49^^*cl6e
zgSAo9EpXmz#=+6Btiw4TqPFy{F}Zmmo#V~~Me(?IIrOec@2Pz>E?HTkv14lL#~Ew`
zxKP?I_=NFVzskk86UqEN1#D@WY<E_^b*<=BISR#hZ3B#bed^|+r^MOw8c4({t-3SB
zp1+5DR}|_cD<)Emnz`rtkB06o*hOxymYtoEmm>$0^gZjEy0nVkW_TlYborq(9l?k{
zcz?5AuYaa0Gf3qfT&P2WGvAuxyhCFQOD)W@nU^PVMaBkwJ64ga+?N}iKA{z}%;s3i
zBB<XfV4;}x!1~s8-Hzr20$B+Ft8w`H*He3K_A!+~nKOw92g_c$`uo;J%yBaiLdLNi
zo!kb`aqn8jY+R_pXv~ukkGluvDZmHbki^3RD4e-JIR}hZwDz$1hE$7cZ5y9=-u1;o
zwuK9nZ15RZAE(y0RTYWkDWoz5MR^9+Cu*oU$EY;uQa4SqqWNmaF^=5S=Gy>FtCwau
z8?nV8w@6sZiG(YbXFPk6Lz-gcE4m0(rwB;{2)XS|k|nlaq<!)_b|;#(AdwLo;y)}g
zA~T*``+HLY6>><=p#HQeFtK0BI4bH&lgkg~NT|z|d3Nn=GWv?KIsi+;rwq7aM^D0{
zjy1N31|^6;Gq+PmHN|a7w4D+BL#{!itcwhCV9hHY0%xDc+P<6kSK-Y&!a8g^MvH3<
zO(XAV5OTvEKDFcD2>uXjJ|UVP6U?e1hEXa&<8I~eob*1QoqJZBt{)G(>fhODOhar@
z1NR5Nt$v}w8EmM=Sc=fIdp3OTZC*2K5qBgubJ=P$NYi0tKRQa;J$ij>(|>0_3u!(o
z@h!~DrHG+S2xTL77!Gg;Q=jw2dGCchJ+64XTwTMNq*ZC2O_)?4PfGSr*=kKAOz{Nv
zlgw~NV-TEqZIA0;p~=N36mj6_%2QHnLy)@D<kJ2w>Xxz>%y&EAdSC|roh#D5B=|(@
z7TR{NE~I6<lHY1v@A*-2*jFjzWrO|}P4x0*WN(^Hs&gUf_?pz4M)5AQqDLLHH&UxM
z(;AL|_V%fzPEd-wx$DL}x3TFT1^gkT>7E>EFA=ZZBPRAJal5YseSIrWPO$LTi9A_l
zsMzQWY}WG?@`oD+dN35fvu%vp9rezacc;!?J8zl#oO6ML*A+K}^xaQS@h#4;cWUM)
zxnt+B7;+CEO52*vqpFlHld;kGt538)5rLmiX-u~2BYBS}1AtGUskF}x-uSP@aGR??
zE9~bhv+k;nt%|Xxe{1;v0L7<E@c2otS`gAnD-Vzk59R4znc~mcpU0mH{0*o4Le{lZ
zTWiT;h~>a(R$dgZwn~h3JGjmbaZ0=?&M=#^dLyyQDcKue5xzOycqjIC)P5cOEY)lw
z`&;>XzNe743YZ&&d~x!E0X&T7+P^!0ZBO_qW`W?}4Y$HCg<cr*^^~*_E}=Zz($_1r
zxzEh<XC!BiNzWDZ2kk+r_-Ekf!cP)-$Hg~aV}UI9Tax&BrOpDVJx|Oy{5y*Lgz+w`
z{{RVxiM0<EF_FI8I}&96E`T4%SLXatj{eSX3x=1)te;;)c+FF$oOd$Jm$TkacX2CE
zb#a*_no*KuCoRe9-Fc^?mB!Y?H&w@ae#l~VYgrh8ycTTy)ZMCy<*Mw#JW6@`*TCNA
zKI2QeW;j(q3|O-+Pd#zzO;pN_vTY>sxOG0}r9?+(JBk%dsX>zb^rU#%l@-sFSaaqM
zKmBxF0U3>Bd>jT**Kb_ZfQLjX;Kh@)h2a~%Pjg1~6M1n;WMsiYqXeJ+wIPDwm6|3b
zD-!<zFA7gniY|h{@}!7R!Vu(uQ~CXA?FQv4W5GZRGmn)=zr8*?a(5FnV50BDgYOSP
z??_|cBTf<3^UAULSo%~phhi@;&Ds`KV$Fa7Jt<Xf$P2jVapQLl{{YsjO#z!B#?@iS
zBLsTWW3@#AV_a?LCz5@tdC*yqpq@jUm@^Ww*(v}(4EoX-q!8`c@0LF{e(3i<)~+?Q
zEfMnEG07q#d-oKAAG5aiU_oD%Td}3ihswxO+s-5j2Gw7ewoOK`?tP3#@26jCzHRZa
z%V@y>8C4_a_Y}7FAitE*GP7rDGjchp_K0c?mEyFLHrmUaf#vb}=BJ9;m=#QX!vy1@
z^%ZJ3S;Ea4kkOK|D;%CZDsQsJAXm44G0J6?c=G*CXDX(OnM!nyNMk-i`D(|_^1#aa
zk?v`+*)mMcCAJPT8kXuk>qXf_YQoW1f*pVv1F=4}9Fd44mfP&lGc;rD{#nBZJn~O!
zN~<5US1St$=l#msF$xLVU$6To)}GcAUa)kB%Z!he2M0X};;$e8p;h6CSzU+RIO*<l
zQVC?i4fAn^!26@r3ZH2tS0XAUq^e}LffwaoUB^G})b{b9nj#|scmDaCqK{9n@~1-)
zDz6sO7~r5Bk?IXg98fc=f<m$ByMgag<lj-Gks87jG-3x%PY!-%IpdmqK2&cP+71Y9
z%8L7Uden;<XqpgAxQ}U>JB;v0ziOE+E@6dXj@hOx4ltwT^*r>c83z9Vv&oIyUAi-J
zF;S2qpL9-2s(kS6>V0!pEum|a5j&s&6S#~M+mEF(MZg|psIfKx3D4J>0DwxWfIF50
zApph@p7k_wm7G7Ek;<!tF2CzNN4H+I=+&c<W0oNC=MG~y+7ExNOd@8t#k37DFPA5-
z2XA3O_8S~?TSfNUYe)M%sq<N#LF?25-kol;d1@dEgflb8B8DsvMfSx$+DlhqBvWsR
z97tl8L;KFmpbo;C%q`=RD>#6+S$yf7^6ICyeFZCk*<)DGl9H%s!J8_6_IiLls!2_>
z(nxLQLug`F*&AhpW9A_JX|UZ}!*;gT7ck8XY32e`EgtT~p0u`6T*)h>o?a#SK!QGt
zpXO<ek-QHoJ-W(>&H?jWbqCWO>DH|s!~uljXA=|%I>tvF`ckxzHo?6y7DP^8g?^h`
z{Ax(Vw<JwAOoc!teo=wbfk-ZiMa8*qwK|qf;b&Ah*hf-nT1f7He69zT^F=DYGJgt=
zX(HVlNh0UW+R>=_j}<(Y6DT)|V%Xmz<EGzlR`sc|L_%0%omHn#J(qH<&yeS^0Mpt_
zhm|3kAUyv7l0pDQUvue0m2iNntFsc4x{sHPW9d=b!6<-4<TI{L@sbJ86qSH{NQ`6(
z7#CkG$+(^PJ%?lOM7bzfLK)Ra2*<a*0#BJHv$#fRTaGx~I<7rw%?u_b6R^Q2%v1az
z_x}LvP%=2KB#v08wV4`NnBmzsZA^a%J?bP?^Al@^+)hz?kUQq4nhAc&({1w9g0MK?
zjC5h^N?{3R<|a`i4nuU^-1`Ga2oxAGEQup2KXpzEekPI#$OiftV@=FMM<V6O^d6sH
z^&&J0cDB(;xz#+!joa@7)o^;yTo~CUagaV;tAk5h2JD4m7loxVy{xO1S*1J-e**!~
zREBqzn9TWQhy_qEyStxZMdHWhyZO6WqQ*{m9=PsmD~F4Eyp82Drs$ZlDt@@>LK|#!
zBHJ;vVdg|^#|V&)dxC1rQX84sqB{$(?xF*PBd;}{^DC<>Oo1H&?#~Q;sV*m)K_p3U
zEFN4TT$c6j1r7~~Nh3`qStBvBGS3s1bsuyNgYh*aS9Zv;rsZcYPQk$*+5WYNZsiij
z(=%*U8;bm_*#4BOencf5h~9bI)DKZdvur)0Hxm3y85Zneg;<#oMh@R!sWdwWfeqcE
zF$X0iJP&{H=CYx`R7n}95gpjt;~@T3Aa{<?%ObRnp`L#$?(FP9p;KYbOEmX448~Iu
zhsY74;kJ&4KhB1g;s$8jB@=K2aHFQ|RVN##8j?cBB?^quo=|sj{eP7{Vy5U!E(0B)
z4WD!mfAFmoOzz7fcs$V*b9vZ6%F*$^K7i88sLMF}MBuQAitYpefDCi$YMc{4?-{Q*
zGW^N}c*i}x0H~60GA9ub;DPevuRPOG4rW=px{2UrMmUgQ9N@9_9@MtlqujH?i^OC1
zh{!N8>+4n7huTALktK+Oy@o=MOjI}?S^d*swjMS(AbRGhB#Gu_mDHz>@hubgh~%?6
z3<IA}dgwH}sM2MZ8E8l&=KG&tdgoWmMOi16V~wyF1A@5zResLqC%GyC@^%9R+rIk_
zx$lp9t0sc_YIO5zlSzq{!7YVQ2RQ6c(zEX_e8NM_bHF5Y2h`PAuMil_w>xJnT1gK~
zb{lDpaL*q2<Us7l%vS#ZmV>b#-qld2sO~vgEN$kR))Oz<8)HVizCp=6@rsVh=j_Np
zvtWd>AtweW&Q9<1-j+65W;QB+c*7_|a$C6iRg_63WmzORbC*#bI)D1B(xFVwOs-aG
zn9V)VXNZ36s*oIdd(ySDzCJ=Srz}o5^ffx!5+ak&^3kO)ht7764k~D^0F|!VLO}pB
zf%nH@?OwGyQZj6(V;7RC40Ec$Sny9w_03p?L-Q12)E}I6$o2YFfnppyD5`cY3illJ
zH2Cb+R0(dUmcc2|S6pa`$Ye1(d95S`)l=r^H*-@9c-j>aTZ0~c?kVuZTJ2+WV5$Ij
zW#jN2%~?xn8aIXFA(Uhw9I($?>V+g`*;3>8F`qg&`I~7Wc|ne~A&MCxXkvK_g&WyV
zLFy?|+El!i+D6>S0&e6mr?soi8pSMuaB{^*1$_-_pewSZVqN}Y5+XtdG4qk@nsh4^
z$s+j-io}FwIUxGg`1Hux_D2gKJ=wi#Wwm=;TbRz)VkF86(ll?liVLU8uBJ#v^cf6z
zR}~`L$l<Q1i~z@I3&zu0G27eQtG&Z9Dx0HH-n9rwr`vVqN~ahpyN9h670?RC-IY$!
z@~=5z&{c@-CQ`2k@10HwPBDs}J+V58xXBrbfaFx+WNd=us5lA-L0y!n+g2u5v$jYr
z!pQ@wf<x?XPrXkf`DGm~%w<Ohc6WQziV%Rp`%1R}^Y|a}rXL^=v_|DHaLUI!eznx4
z%7ts8BZL#RT|pz3C)SA?H&CM7E(RHa;QQjFW{xqxc=?A1)}x6X$YmuHaUNu=z^vUy
zH4!BMLd8g7>mO1oFDXRg8+c!K&)x2B=dDO$ZJWd-D>fC!L+??y5}1}{Rx6$P`=+^O
z`HM=!Ww(T~6jIEiF8i^yy)jD$6p@@aKSAyFr2&FP8>oD-2qWVs``M<?C~IJDCHWFl
zv6XODy>ndmOLFafi%9ti5Rq4VV6zXp-t}tQ2}F!t0}!~tJP&%WYMy+Jb7^jNI)#`q
z>yP3dm1ZrXGaASaPF$Y2^scy7T%u~s92G|Ln4=MaCNfZZiiYGMERZ9tQAQ+2Cq7~C
z&0Ga$Vj?XXagauGJJoq&c;nw2W<2muEARBG_PoGRXidzhzGQHTcu6GW1CECsD=SoX
zQzAas+rc0a_*R~+saV1aw5uACv^IOzb+(bH_@(3f1dPDQyW|PM6%n7ltgb}#joYz@
z6}|6>uNn<8Cm~;HAY`wv*B!lU+x`cB&KH-lLH3<LCP@L6lwk{c`)0a7fZwyF+sv0&
zk-Uv7j#U81_}AE<2!0J(X?Lk*Z)zK4YSJq%6~EdU?d@Le8ve!?d$WodUu`SPV<X`Y
zz`Y+%(Zo|}<fBE1i=L;}z1zZm6^72n+SW+oMn(DLUPE!xtoUoe@mpG$;I}}I$8kmZ
zdj9~8b{a;F3|8xEu&&kRMmn10ttyosr>RO2g3y~o(G~|%&Jf@bzM{HIJv!dl=2c*X
zWSsMwrEak-izKLmKsN4P)R)@QMZLoozyS05*CUI1BW1Rwo4r*~gbjeF)3s#yi^Z0f
zic&M3ypY{L8t42)<2!3@?DqrA{uT#<Jw<s}#1D(sR+jQSx4}sSe9iZW?OnKR1nV?q
z?P89T$G;No?BIE1)gs)a@;D2{e8=(Y<Mp!X^R2d{z$Jsk-*v@g{Al>`aKb>^j6dqw
zfZQB<dz@Fse;htL&8*u^rCLnFN63yvIKa<;rF!-0(#!Dt)Bga6IqFxtw09)<{{Zo^
z^*57Ew!JLoT*xuWC$4=f$8DlIjnCSrmE@JAEaW#qimi9%YnM{pUEV1~h<Ud=v!7m_
zO>{a%oMzdKMm3HohnFTgli2##=lPZ{t}eGU_UKGihv-^Kjbj&1&9t$I_D}IRu9r`;
zQ31O9K3Nl&&)oX^)H-&a$ngRI4T3fd0qSc-9bkyW#aOcZyLboQympn%dJMVLqD?48
zEJdV^w+1I0hoy1a{--3Do5~h5lg}Gaj)U9l?OI+S)}WRNEjckHXZMkiNIk*y6@qUr
zS}}8Q6^M^4ilF?xjy{#ah^ft@Eh`nIibi5CAqvleV^fU%O<dFL+E-65)uh9Gpkw83
zl>19pX+ef)W{H$Ac*aA04Qp6fOK!`uby*~GBAr*|h@QKLraOxB>eNt)tvER`ZLEob
zQW%t7GY}#t1y{CzTGx$POor4Jc_RxeW97*79jiTB?kSSiOJM33<dHZH&t7{~*jgne
z+EakMVDKB>ys5V%(1Nk89o39b!scZXV~E{)RC$R^Vkq5YmPXEBAOJl*O;Lrf?N!X4
zT<l0_+BC*N?Socr1co(^L%EB#SacPWO&TUl>2R@$e516I8)sDdpIVR0d^|D88AAQ$
z8CTD0d9f2tH!SD~4Th79{uOmBp4e?yMqS&K1<o@{=yq(VS{Z^w5fmuok<kADjZFeP
zWs-0RKR21(kMtDgiBV*hRz}*V%Z*3PoYc@;toHt6jEsHW<oZ+Ris}k1jz|_re6^5?
zB^YHLcJ?6DixEdMoyrISRQDset3P6NCON@~06B4tdk=b8m3-h)P8Eg;8Rnn0NUl-@
zx7=I4_P_(Esg~YE8x&-YoPRpCWn||vywSqVA<S+u-}DtcP{3UI2h331<Dnl~aj7QC
z<U|nLN|<DfDL-}Gbv~k{dpKjk^L}=~J6P@fYH<`O<y&zhvmT#HX}*pHW@z%82z|q?
zc0x|VaY%|dqeb7mM}kHe@_w~$B#E-{NQ4o}KTs-!m;V4Ujv<zRyfL0A{?h_o<$T5n
zK3rfg)OW3uZ$T+U*Lfo(fjT6Q7{Qac_NW@=)qJhvY=e-C)A8+Cji}sxq2hTk>bZ^B
zaM|oB@?CA&=G*{F078zubgdLvokeqITZ@^Ir2z)i+OHb?`1QxNH7AZD9^&d2GA<E9
z;hDSr1!hBgI1(d;j|T{GlaKMK8c^Rkh_4*?8TB9GRqWdZG+CDBPcdzRF-aR66yZ}n
zSdYt^ad1&y8TYF(RD5+Js;fIPG!lgp@WsYS6mK|x-7eA8dYVoehcP=z6EjUHk#YcL
z#(H-Hu&VCNT-!>-GW^Sv%MYzM%`3(O76N0iA`Egrr9}43kt?*AR3tFQcc1A>P|#e(
zT~2k!m-Fr?7|#_&qm`#+l?u4QP+zYeovT7fWiojs;~*#?5y@XrY8mYj7|ii97?2Rp
z(ETflbY*cnl}M6UF&u~rxhve3^d^#3eT<tzmgjeHYRN@n9Kx*G&Jf@a{=G6dVUkIs
zT)x=DPa9`yWcL363dO~tHFBfdxB(gxjND;HGEF^_0If2E=Agh`-+20aQv8mKCiUV%
zv7-~pkLOBBQ;8gH1BD};`qHr^Q^RZI%mj>NRRTZ{-3Pe$sG1U?!;;ES1}B{TYIKlF
zm`4cQj2=!i)`nP!H!#YwBMp*Bhk)LMQELc%T6i!Cu9^94sE>jNq4uo%hlVC-q>-Oz
z-i#l-J7?Og$t<j<W@5%6jH&zMrZG@UY#MFyOTB=@DxLzKnV|~hsBXmjQKb?*Sn~*9
zl|kqay-Ml0a!<+1rg4*1pn_p=h{Sn)Bvl-``h9BKfFnP<U<tyr9PS>Ug-dn<joqR;
zfP@^3x$Y{1Xo5#&5lMzYhb{7tTG}@2al0`yvEfQL0+?e*#D8c-=NV(d`_)Ev3mAXd
z%_L}k%{V@3R6KA8b4hWd%Y8d6@nIAL7TCZHd!8#^XNwX~I=pKT`AIm)2k#G1YB;6L
zCTJ!v)sz9({hF?3Ga&eG2xbx6ss}uzn{pJM!_d+vf^8+3!*gr9JhGM`<NDUbXf6u*
zusTJY$uCTQvw_m4j$&X~;#64`_rzJUTmJy9M?8Ya=Z}PR%bRCOBmLxHn2z(czu6#C
zT=->7r^&Z%qA~KiayaA@{Y7*aR<K-8Bn=TL%D6GM4&&5R4`cveIiw{r3YNn+;q6B>
zyNbx?ZhR?XZGOvW(Ws1<ibqVBC-_PJMyP6j7POAnWN@>yWXmg@F6?kCv3qx7K%G>O
zGVGiWK~*ko<z?I=GRT?CTSgn)3aHLYsWOCF$6NS5E0|K&MorA5F+B+<iq3xwLaUou
zgwc{!SgGWLf_|R$+?_og!6<ed5%S|6pyRDNJr)_uBTeL~AQr|?UT`aAiJCBUBGKoA
z!n4Z@&R2Y3lq{=_j1NOfJTB)6BZJ0CRKY&g=qsb!#T>JkOT?!tsmCL~xjvOVwpMcz
z(@dbecti>T-Q4{uzPC}4^;jNnap0+$*zIA6#?g#|4}O&to(P;i9KJ}~&)p<fr7e}R
zw)eJdGHr@5;Ql`KBzkSKMC39%s)aE(TvPhg(0x`1n*RX8A8?>b){-iNwLxB|xy>@;
z!k06Ww$}1xIgo>#4|?>QiyKFsVvieF1(ckDRix6OnpRbBkfs@c=jeWwOA|Kr2Zn*?
ziQ#LhFuq9y0$Yr2U-72Dh9wGO*xQ@#F*V#hjiCv5l|p1Fs!1xue@c33%Nn)NwvpUF
z%IdtIY<qgvp4s;!>geD<;UAmMSY9$f9PJpzG5kF|NTzFPB6nkjZcni|uR@<gw@X#H
z0Loi&Sh0+p`qM3ZI}}JAqHo>g#*#LEWBu=M@T1$dh4pxzemp&XpT1SxyRZo8C>|fX
zRxNJ{d<?NGmHLYBZgf~;&BW0tm0u!6I91PZwAb+D7bY}Yl8+pPnPcFCkGws-jX!SC
zeOVkldJD%NnojRAj@%BXt}0RCxkT7y4(y<ql;DN+uI%_`DVt<)s=KKWs68LK$7*~&
z9}J#Iv`y3eiWzxB+~%R;8A}Zwrw?i20;S1?)mU()x%}$%UJH0*WM7yb&cuxR6J5IL
zVh=Jlw%f=+&($&49;DT{?Cm05vxJGl{EFlKU_aKdmLhD?P=Y-6*THgKL%L{(%1Yus
zp2I!OXu;tNcq0LrG}*%_97ew5*1Gx9JJ~H_xV3*S83_pw%e3REG=|dV_2;*<mIYa&
z%864fdE{oZm3dgDMg{_SM%68a&Q!?K3`ewNf!d?D(jc_BV<C*Qu>um9#w)0{gkRf>
z%V-slw#}=-7~u2usn<s`yF&tbjDGBR8^_Y6*J!m#bTPE86&VC=8jxE%Hu3@On$vwE
z+B<1hI2IRRQY`bg{jB<*O1WdC!x@bkpL}e04DxDb(~PhP?jqQC5+gr(J^kwmRaZ8Q
z6^wg}6;tK4u#J@$4u=KXx%L#n0<6ABwFt4OW^$th{d(rNzp~juoe+NUa$JqX0aC}M
z$23cDvPR=LV1pp>)~ni~`!#bq#sZQgcBmvn^Ag<Pp4p)-rFAV}%e|PSpX~eA)OupC
zmQmMZfRV0pPCY$p!s!lTF1E_soPZSYPkj1TPO?QRY{6|a<??Qku^Q$_90Tq@!k=-b
zO9hXZmc`1p_}O|m{(`r~jlShEqxocQRnA-7XT3*tZ4qxco<iXiw{Dz@UfJAEnT7qE
z<vTmR==`wo;d$TOA8LY4I4lhcL%KIy$`}GcJ+oUE8xWr?xs<6@IpF#LJ!+)t-dIqK
zvVpr`9An<KQg2f^C1VBcErBsS4gyJ>mid4^F;p(}_7Rj-DvVBWxCXZFSUc`U+FONe
zaGv#>djk0&%flpvw-fS^dwW+*CeehFW;)y0BNTZQfY}kT!yNn8b?g?__M%%jSqzNZ
z;daR<xzC~gm9eO9Whn9oDo>Q*Kp6h%_4YNFdmN;_%$#KXz&HZB;LdrYE_}wXEICFi
z!u$GtY8O>U^Fp>j%7ENw(ACMU%E(F#jlAyrxb>)@gqV$+#-k@7vFLrPbj+B`8;RME
z+5&({1SW7rX<FRO*8XLe-`qq>dbT^(d?`HJg_q5bm6=ChTzgcoF%yEMGJ(NS*W2)<
z^%{0JEM<2=1agR29qc5@+n)8(XcGCdMC7!QGmkkS$S$L<(e7)LwYX@bS&KxZ4a!K%
zGj<-pe!qokrTY{OYb!+|Y)D7Tw~le>d)F0MUt^*U&gW-kF;pz^yjWu3%6{k_kELna
z%#7kmq#j!-b&bC9{{U!vS0ibzBFeUw=+eYj@5sXh`{$auW#SiWbQ35^jKyLu<8T@6
zir|$7&bZc!J3DKoZK|2Vu46l}Sf1a7OBMCI`ELcvGo-9pTOhBo{)V|&b!0O6Qc3fU
zWkKoMttPEJm=leLMJo>F8FTOLio#T76LnoPcG+M+&2YjaxRJR1;!jGKP`!>2MCw<{
zOpN~k2{nScgE0v)+{woyq3=WL)7{9qbtGX~m~d2f`qZjzmF*FJ=Hx7h66Hd$%Q@$_
zY8LMdBWUrCMmzh~V^1RQh>*{X-eU8#9+dw8E>^W@mQBF{@}wvDjcM%BJmtxCM~ifY
z0aZ}AP&5Ak>!4~*{{S>dOGn5jgZ0m~QAnmS=41ejD`$XCd8uHv!FgnyA1vilox-U`
zD?v8*E(@3(w8|OOs3U9R2iAtUfhFA21QHNLZp4K+$Lmn}hGc1HfP_`vrEm$y2c=4|
zBSJ*%+ZY|H2*@6_Y6zDmG|tj9LuqUQ&-byDOp*tRKx9G-HYAQhNI&6ItX8rik}1I@
zHpGniC9~8KLR+jZ%<NGZ00HOb@AS=RqGs5TF=+^f;Wi(Yl#I4LD2f%1Q+E7FK3#|V
zqMzhR=VA7uk^-^gC)4XnvB1yfPj#OxWaA*@e?O&b7?MYF-!|CPvq--)lfgco*rvr|
zRlsKp3*&pXavQ(lQ$@LCD<I2A+2H-}VOA~3kqoFX+1jZ5<maEDtx_S8M{5!`C4ImQ
zAx8Os`t>9>w+*@ckP%1v!{6GZeMKO*5kp|eisja30FwR3)6$-<uPX#lPR++}-CzE_
zX%vWTf<;KNzA+w8uLtQ?Ev@7u%=<ei&J}^}>ro=4(*l;wBd01?kOf>xA`E0Ma83#X
z!TME->~zTpfJFq7My&g#Vt-$yN{DVFns}6Xa40Ci@gdJY<5ll%Wx0(?24r>Ggq&yp
z0IVtnl4LM9p2({q*h>7ZfzAa94)-myV0ls8`6$c;nfuabow@8Pw)7CZenW*>4iubh
z8S6#G`ba=BtM6}=k6&t`dv`RUzQ~P|yJRkM7<*6`u{^g{`>?O(eE3p_lkHXRt}SLO
z9m2Y@9PLLRF#1#w`OE&13?bk~04N_aw|x54bIQg^E}k%@N6J&M_oUu|dyUkEt^6~@
z*6b0`9D*|$uRifVg_<^&<w<hLb}2#$0QauuX-knCj1Oauz5VMqS+t7&BC9-ryKTxI
zhtzrs*AG^7r*zEf!Zjmf$u&(X;?gy|`!>a6wVWIb);zN_J1UmkK2z!RuJgox92Szx
z8d=CB=op>HB=rNhu0K_@Hu6YI02Jl_0C$4K`U?8G7>L!UZl{Y<lY=qiP7KU2rHZL1
zJl9q5-{Ky-;azB?Gc&}<6=IVBWFDF9E10=E3jm22Cz!`kLr8)_BSo}uc|A|~R&^;x
zakCO_JD+3xF8G$(t+}4U^%^o1k1f7sZsUsXwf45vLfX$N$ABLmtU&#1;_nCiO26=i
zv28SNtf@F@5)KvAjz>Svz5Bv{87(|xrpa?^Ouj%221Z7B!8P;voDE7+y4dZ7Sj_0P
z%?93kvTkB$j5Z_?wg=bRuy3@sGJ_?)^U&=)fGeScUyAy{?e85`kwYsd%Evua`r@t4
zqS)P{!D`L~ib!yJHa_>Tu2}o8Q+U*rPd}2<XjHG4fw+Jl?-BK?a+C!XZjnT??cE^H
z&4b2!S7oU9ZLQ(hs?X0XPDwxET+X+m#U1b1_pk0qf0S^9j{c^%PBU5>!mhfR(=@S3
z8#9Ihh-iZR-8$8X=4)h;i|v<h-H)iK?oe5klI)VsMj1yWcH*pgY_X8wki+I6ar89#
z5;Rp4D{3&L;q9&&;f>=M$oYY&6<ycLfeCDIU%$O-fKdIR%9VT~LjM4JIP3JLJ*=iw
zS%5BwYbq`{sBuiCE16Qne9<hEs>aw7Hs6#QwH1_qXEQX4tOiVBk3-U=wY4fyytQDi
zeo!(vJsPE(Pqlek_WEFx%Y}z8wE!NXp~fg_GMv)1NG&F}F{ymXD}W9=0%{2C9vN8N
zL509&8R4q)MG-=Uyue)fn~q8U0A`&HjxM5Wo&i5N9TPn>{uP@_;bNR{+$>9O(Wq>a
zC&pC)=%>`un^%4Dva;cJ$OobASBxSgCVUh^LBPN@Fw<RQ#ndtmKXDRqAwH+nRJCH1
zTQcFbgk#9Id1D6;9{z*S`kI%^Xr+=FZG>p*yHq}Q`hsfx^^}6lOB7&;NpCGrIqpqQ
z4wI$a!yUx>dqz+Pc4=|Ee|Hs}no9RAQ)MJnFg&XfDy_Ceax#5C4{E&ynT~TD@+mRK
z9Y!z;{c3AVNYY8lMxaR;U5wcwbJTm)%Y8iq4bd{G`H->deGj#B&SvqaZOZW2%0YNR
zVq5)g(X|g=M`2EVE-mHl_dEUR88fwqagNofmQM)s<z1kzWDUmb`+8FvC6Yak%n^sp
zwBY?SSvfRlk}3U}iiAj*2?o=i-rm&PyIZL3=1Uuu%c{o86oNk!R^3oG)@`a!E?c0X
zV~$xOgLrq6PMG5r9L&)qW=CxC!6l8gxXDkrBN&i(sZ2+9V}ofag0c~o#b}>DOqG#s
z_Z*M{byM7mtp&LwYLeiSgCO~rG;=V~1U8U|23XzH09B(se!iep>7rDTOm3?ZkDp+`
zUO71RsI6jU*jR|!{zOy281GggjU`hq-~$b$0Odd$zwY!kn|CW>wDH9(62SyANRu21
zvOjn4j?|t*&bX8+x(%au-Sh{Fw4zBJU|BbB1s*JLqu1Q=_)xax!B>$SqhXat-S;&t
zq{^ipMj<VW0JwHN6W*biLX73_VJ?fzakpXLHBVjfMZTWXT1ZeP%s)6|UVp9pOtXdL
zwz3{e#D(H{2qQWDYif9El{Q8daTKX;&i?PjdNs9#?8wZLfw9A2D+9^Tr?qe%J@}KP
zG!JOf`ID4lS$G?IU;$iKzwrv^P-AQz(PbnRkA)=qdS<z+%Y!qJtmZWtD<R7R_5PLW
z;j;A|W_ehQ!OKXH>i6(#v!(6CUm?h7(~qWVy}WX!=*TJ~Ib5Ds(uZ(Y=6%6{*vrNU
z?@XF6H4&Uj%vkPW!1f<X_2QCNJeJ#cWVYd9WzI_O+@LWBcYbJ<R!K;XMNp~;QpD|J
z-klP%KJ+8xA^P<`{(^*Pmu?q3vRPZ8KD6#309QipK5__lQ;dP>=~AVg+|d25#uS#;
zKo!UtC`WpRM%xfKDgvB^8-DhEJ!(XMEe*GrFsCknV~=r8_X0%>j9nZ=%lC_a52Z5U
zrQGcD#vJ1z*XGZ#ptzJ6<&+d}l?WIk{Avr0$*`FBFl>CsnqV-^<g(n$4&BaFF+3CN
z?ewHrq*1bEbPo94(<iM-JPHJ>JViIAc7L_~4MZe$RRx{ZM=E-bDKI4sfCP~33&13D
zKBk5nNDfMj{Kbz4=}cE;JJ%-wZVmjs>B{0SkesMeKs@I?#Q-q0K#B4|-GB+|MK79H
zda)&&rh6apsRWWF4q7E(+^dBdQ|U<9jqn3T%Dgf8fj-p4HACZka7q9_GM-2O0Ir=n
z%^VFj?67R$51Sn@MJ$ZPRu`1Qs-%@+o_)Tw&B7!yN%E8*IdA1fz-7vroFMs|c4XRc
zMny={v|vXBUQk8-<46I^e@bJO+$4Cn=YpBRU$3nqqfLZn7<2P89y9J~TtJ>^+$D?U
z+7AP$C#^iXnTs+z5TGM>9^Xog5P(URQMlyDKJoM()UrEm5n9Q;+p3ZGSJsQ6+T%=~
zPtWHl8R_Xlym=EAA1f9tr}}oLyh2-lDI5?Rr#WLvfg)iWMs|WRj`^i<u{hhdLo}gI
zz{u`+#(I04bf}V7$dX(Y5)!?E%`~py-eQ?Bcp1SSl%_Oh9%fgJuqQb*UgEH)J2x;O
zZaDt{>r&xmKo!EbCqA^*0hBK6f_`TwfPJZAN1Gv6aw+72`u!=ZgB7@p?QF45G3!!8
z9kQ6d%*+^*<}q)(>HzF>N|DJ1$*>OZ^;~Brf{h7q=X{@gZrltW;+TcryARFtF(eH3
z?Voyf(=Jp*OE?PbI0F<#94_Qs%5fr%(i4E3^r)UiFny)ua~PC>M;p6jA4&qkG)reY
z0x+Y8T;!UZ%`_y-Bt;!QWezie+N#PRiR3beC(9mNhsZwO^(<RsAQ;~)GxJHD(-CMG
z?xey1!vTrTKD8cqGce~p20D9+j#QT`z9JcpKqna<w6nX)<tB>(fC|cSRd6f=BgX82
zf~k^M(xiss869AP)=Y-WGq~hqpVq7HX%NpOc~Ojr&fVVMPAQSbpJ+199b7g51mcT<
z>0br>1>vs}&ougk_Oq;nAxpvuPxnEuTW{HW!}oF-qYxA^?lD^x3jB2jzGQ;t{wv63
zvU3y0*@(t=lk88Yt#0^t;&+d2uSCt`o5+gieBgqk{g68krF!@*#|?+4%Q}3=la0XQ
zYfGA(?0ZN2GBofPSTv<Yhv!KP25Euk^y0Dg57^gN^Zx*}?A4;k++$D~We2D}pIYT~
z-`acP#+M1VPZ|BDM{JKh2I0>HW1zt4R~Po-_{nDN=Sgnv0Nz$VmHoi}5$#@+%rcq9
zDbhUespk=saG1Kc?0w>>?JgfqvqkxTap&?!vB1a`%y^^rZ}Go}tfOM^-jXwLs)Q6c
z;Z)<A?QMVHpx+W8ll~?i8@7{h0Lr`*k76qHKevsRtA7LdkKyYWR1Y>(lri1h?Z6oC
z>s&QwlU1Fg7az#$q_et9-?YCo$}au{{6w)xWL+oB^9l0=ZIcl9tgEjCc%sYAYySWb
zTq4GH?+2DO^!AziRsPR<(#IaB62&6O%z>d~2mPYQr_k2y9}>T2?-0bP{{RU_oa|-_
z(Xj$T$EOCWd45~csGeh(Q;p?I^FA`WitgRyTZ?Cm$Atl+Am`KTLpuGXt)2!)*cp|^
z891-F=lEIhGsX=vTWWS9V}huXuQCDC1E<%uVQZhU*Maq`jN9B<GPEna6<1(;eBFNv
z=AKaB@aCCt&Y`tPw0v+bAj+~hU`{dDnsH^Ac_1-m88{df^e>M80AXvJ7}oy)Op4+K
zMLVL6)EN(`2im-w#a{-zN#JXyX20KV-!Jc>JF)2B<6Kp;>`euBuDherqmIK@UhIxq
zIhy6rZeSGP?;q!ij4Qfrkojrm5SxeIIrXUtGqH|ByVT-9gS8O(>AbK25A}P7LHDi`
zv_O)H3p_s}jtdNP?@WEK5ta<#0DfL_YQ(P|0GrM7^OxCyxc>l!SC!n{q)xkAA1GXO
z_n-!O<z*gfjkpA$;N$C0TY<wOZQ9>6IL_~Ch|L&W22L1;&#fb)1I&Sx`VN$?1*oNT
zP1f!_!bsfQkf-|6$j*XOEycS!#kGi!^#1^R-l?qNiCElc(4IwDg?6STkrpxcRroog
z;7c@7350DEM#~t>Zx{z152>Vbj)LAn`^PyOP73}MlE%YyGelH@kficQ)|Ctv@tGpt
zWIZ#<&#f>W6q3ePc-R1PBtBOMJr6x9=Z3X7EHyw?q#jNQmLvBLdmmcQU%b-G<{~3v
z;aRbedgJ^l%W)KFEUjB$B<4fNE8Fp)4V`CI(sf@DE$!5AzF2^BGk)=pW+(Ej%S&h^
zVP`hv!!rptVL|M8sFGWUU7)V)e8tz2J7m>~X0<lSZ3^xUo!yU4Pv=GMD;*cY-yQgS
z!ZJ^FsObqPl?uFVgXduN-Pl)C;qQ*t>X#{{Xx7#&X8D{r!w+GP*1WsOg#PdB>nf<+
zLN?se%$Cx!tkI3ffQN(ArE3bZg3!uTqdm`5v+<^cb)$H&nXQ?FNSpHIyZ!^xzNr5I
zf^vL#_%raI$2Z<H__1O&9aHVwbPG#6SCT^!Kmfq`MjLm{*XF_F82BE_+Gx}?QcA)A
zU0OWmHS5o=E3o)?;~W0~2<kBE!6puwmI<S{F_6QR8@qGQAEgzWuTPd+5UEBk=kC_I
z;LjI)Teq<IvE$DLN2hpVHV+n$ZEMpf<u?t^8waBC@7Q}Eg1_LNejojzHSHdMf+6(i
zibwsgdW?L%Jqi2ecm$9b0693|uTj$f0KvRkhlsyxkJ!^j{j7gz{SM1fznb=KE5lY&
z5MqiOW|9}3pa3A2MpANA;A3tEE9@^H`19b`>^N`yM`5B%6|add+UDy|vDgF-yk!so
z5eZ||fG_~`uZEs09N{i_+8oX{PV#AKbiDrn;FryZoE)CpU-10TTF^cocn9J4!`m+b
zTj`dmqv=+nIODqt-7-tIda)$2Zltk2>*PP$zy1nUt9&)_to{h_%(l?!jE@X@frPU=
zecjp51CmBCdUIZR`&NF~nqS8WY&=!qjY??YvqEjGE^bR9f8sk-<2?rN{<VCS@q*`5
z@y)bPZzEjEY(CL@IbpR<e(L+@w_#oMD8juiXHS(a67Iant6x<ZY;@i*{h@#15cq_3
zJB#_}x7Cn~go%DrzX0wBgU7E?#c>`d*6;M699npi*h3w>(g5<tm_<|9YWkjoJprtb
z6520{ejlZ{yi;>&0sYFZTODzqKyy?r^=9$6fS}W^W^}%@1n*!AD=*z|rycs!P^S-d
zEex*i>|p-Veh&LjiS7O->CrM;!sw7V<2eU&arZ#?_w8PB@mt`wf$@vOa%vjh){;wb
zw)>L@aOl9-zFpfz@h{;G=9Q|fkxlki0!VNI$fJ|Ak6wbjhSU3JQusA-YpXPH>Y7k>
zl30ns0Q|TgKr2|v*3{NEJ`4S#zhVCX8~7gfOZ^C3-9YRNzD>4DeMhIb{Hw$5FMcF^
zE7l)Uu)4a_t}K`pWds&%@IXDkoqdvjZGRX1F!2=n7sUHd?Tc0>BPGO3my5Sv!yT|e
z99G@Ff%`uG(>hB>WpIspVsG3lu3}TpPp|Z@wO(;v`no#Oy0PT{00%$dqWa#I9lwV@
zEoh%;0ECM92oaZVyO90S=zh7yQ2nSrID94eiK5<Fcy`{=ZW1wwV~}rIF_6a{v(LXu
zqx(qy#8UhsvxisGZZ3Yubgc2Ez$``qIAVEFaBzBLV?2uax6g{!NWv;Kpl5n>!96+a
zT@<NNo9BrQJ(*(C;jbZ<Mz&nUg|}_{$2iEOS<&W5(pQ>QQp`~F82*&VrH^-&G8GI7
zPb}>v&wr=2PYHFmOIcJTA&K52`K9$4^!BdwCP*%rpp39r3_+2xw;1Ci*WR9GmNr?I
z<y)wEc75OnAP&N#w6t>19594w6yUoC-ns2ok%{sqgZFH%L5b5lFgl;FYP9qufGn3&
zW%BB)z1}nmqC9^;YM1RW6%!?~SOSIGulu$?-Yx6j9@OoULpRwrm6)k76oYRafBN*}
zEHPV)Yg7`$F+P2|juf07%b#&nEya=sNF<4_6{A?oHNt`k?}6?rYp*8R?aEw3<=k>2
zl=3jV@;{YTST|aTC5l-gV8$g3Lo0VA`c<tiZ8aP-ylVt!GBwj@J+Qw20Mj&GB1@MV
zY?iRA!?{Zh@~odRY>(me<F!@Qb!%H&1hfFhG^B{;X8WVue_oY7r>k4b0^G+eD#~`O
z==nj|WK;YB@ax6j6ns-_Wue$Kt#-mMDc1~ea9i0i-}=%{;FnUmH;6n{eKoDEqTItA
z2o-GO0k;4E40>ey_53UAzu0&F3C-d!5W=1`@p72jd3?y!Aq5Z~2ldatd<ykH*ysKU
z_n~+_6I}6LmSlM%9&AN0H-nJJ*VtFvo)gk+bTqWH((Td_YYz&5V6RS|pUS-Kc4Z7Q
z<fQK|{e<Hw`WOBk_$tG}9vZOl#fz7Q&ILeN<%b=~@BHhsNTGmvND6=f$?kn?4$3nv
zn2z3K8><#sPbBBJzqM$6saxhRgp0O%`q$1mN>b)#(Mc@}(Oh27Gx;$Fhz=z|l09=*
zcU#^}tpvMWKo1*aoMWi0+b3foxQcdB(SSWir8rM5l#)6t4={3AWd0tNY3Zp({1;L>
zM;Ktu9zwP;nz3a&u}?2)kU4Fw(ETee##pWu1aclu1fcit$E{qEri>FA0HOKZjsW^m
zAU31ElsgxPdZKOwHZ%UsI%(v)mvM4a0PV-!KU&SRx$_u_7a_27&}Ou)(`<^U>dHAM
z8PC$OdN8qaC@m&Y=dR_*;Pf?x;?IMA4e@29)*d17>@!DnNM%F;nNO>K57xJ>83QCy
z#>aDEyX~vC*D9s0i>WSfT>5A9tmkRzElpu5Q+JC#MflDC00heLmbEOm{soxXy5OrS
zmg(8K&-v!QSNN^_5qwbiQF*xOGip&sD;ch#`>3ol%JotYZg|Jx`qvf7nVJaU;18b%
zl^(SX_lA5ot?B1Y)wIN!0~QS69r^5iYl?U!erP*C!1U>6)#>RyQTU&G;fW!1vD6kr
zEGKyCzcxCLanROP{hTWc$9FJA0Pl&oBy{WjEA@xt7wi}C&*EjA^Xa-I7MFqdnNa{>
zae=gspGx@`<6ry}bK>`ajm5@~rbnt;z=lBaLx(}vW(n(#{Ab#^Tx!#HlKGys41ONI
z&dm8*BPzopK`3}mBl|fyZQi;3sgXwWmx*K}V8fO@N&dCe>pu;3jTTugX7I)Kn{cko
zV!B*A5O6^3-1i-gQHM&p7?$r$lrSVn?txVpcK0+!ahFrMc^TRimikrHcISN3ftcc8
zFc_W>HGbM{H%hg+vey-}DLHr>gko|&l?<AF?Xg==?CXghV%d>!Hm_ro&||$-{>#+e
z<4Z%aP>|~&$dr21x_b>KY-zf>+7`Ea;6!Pc^A1Y_c*ng_)Nbt3!flrFI)o?7LziQm
z<J?tt@asz9V0JAMhBr?6UVn!k)pEl}`y8%PPc~_k0%JJXzuv+68co1<lQLT3dy6F8
zjHh`my>iH>`j66^BTaOJWzs^b`%uWAeZRUr&2$rZdepR7NkUBI#;pGUGk`u~G1zy{
z9MsU+Lk+^S1uCQ!1v7!~?rM49kkvUeFH7*=r*j)#Tg~&$4%dmt00Y<Boi2$3%*iWr
z03KwS;aK)Hy7n@>-)MM9ECQ7rGB4A)sJ_h!MrdV>v<y@;AC-r=J%1X{+Ibp#6Z5s^
zjY)-7fo13hNv$ms)ioh4n23hi!;_42)9YKBSHjIs^|#(>j~@5h9r7>-^)=X!0Sg$U
zlKSEom2HN|Q86TAzV5{T0G`$QL#YdB&(G}kIN9_yzOgb}ND<YxF_n32al!Q!&g=Rt
z+F@v>`Ia;OwFenJi8bi=J|8ki4dTif6^aCpfq*(=*ZeCo^4Tu8J=Ls7Ag;zhR!^w>
zI{Q;nWT&a;1TzpBaHpK&y`%PO_*G-$qWXp8aG2r^90|9XPj+uWykWlz^4(`aeLin8
zMJ*CBEEH|v{{V%3Z~GH#-T~9R2X8Iio&>?8x!!?7uw%$L<Ps~7ABdG27mnv$3TkrH
z;JjJzUVi~zM>dx{HtNs0R_8ujIp?oleJk3&8f%(Whk#<dztn_NPRH$5F%OnLal4)X
zHNbw--ZIc`6743n^P#pU?8;w(&jo+HeLkJ5z;6CA_}lvuT?$=ZO_wao8!GKFr}s%6
z>&aBHIM^oLtaUd^nrQ1kY2O_9Us8eeT?YCVnBGbp#<?LEqA~n`I`K73U<@CA)pXfi
zYEm1CSi20fKX&)1L@ZRPjPiKLf317;BN|lHQ#h(OIb4Hi2chSnJ!#1n?BRetfvH4t
z00Uzu?woa{C=_L}^YEt_`kL375z0i6k%N=4oHhqadPRUq!2^y*T6WRVk%n6ibKBHX
zw6V(}NYJQW6FtZH)3_*+n4N(IFi88pl_YQ^g+fRfi36qr{c}N3*<jcN<1Ipf_*Xbg
z;j!M8$7DI6w_VXBkGT$3UW@sET604MyQ48yS5de(O!w!tH4gFRvB(GRsp>tca-<U)
z<Po!HTzi^VW3n9_mc~N@L}P(~5`c1X*CLCJPDTjojS-A~>uLW03Pp-sk027n<7piS
zsHA~mbL2F*!6$Ps1J;ny0d40mgbnT9tlQkqEEyhhp<m`$*Pq1qsUo$F=ku;&aGP?A
zjvVyjohq1#i4zKdeBm;!p2m}R8bndS9Fnw)7nTa)75#p`w8-FfRr1P^7@h17KGir&
zmmzM|ox|-^Md^{=rZHT3s~nLK%-n}uagM&irtJ+RSBlkuLh4L%k_!RQ4!NnIw`X{_
zNf;77(DHB;di^Q;EuqY)B#l8IG_CiTe{_0#RLK@4^5%rJae&Sjs151<6ox>S%B9jg
zuuw^r7?pPR_Ni_yt;~w?hXBUDXPN!*IVuNgj$gDb-`M1M;X(69DN+;h$4Zs%146!Y
zNZ&RhF?^&R=jrc2(HUp9DzPV)>iNuy8<X5;rA-~P-KHR2gL&B*T(EBB`qWp^#RN$Q
zl*kK=?|iejq4X7IOF<JvA)S}ZIZ}V+n7};x(*(6CnA=XemK%l=jA4AS!-G=Y97vGF
z;t{|y$UgDLatENMZ;oj0Ba;$<F$ste2Rxs~rnidPNTNoF$#A(V8GclDVL)yzn+T?L
zmO&s<yAllKpF(M?<}6|3xl<c40HSyIK9w>&a9R0{zC`mF##8~3+<Ka?8@0d^<ssj}
z+%T(?=sVH@F8t`Dlo+vu`4`mp{{Zz<<+hZ^1>C3-5c^6h^Slm+9S1dLQEahG4TNm1
z(o}v*@yYh4NXYIj?Cn@2aqjcOZrnN?gYVveurS{-^3fA!8bvR`$mz#QV3A%I@?$9z
z@OKZG5P2U={{T-)W!3D?jV<IU8DEwo8UVXTM)y9o6S|OD?-3ke2=I2vp6Yvj4FPiA
zj_}2OA~8=cP!d&fl2@-er)zf>kQSFs3o|j>xmSUYQR#}PRz;ZHwYhbK4>lj;$Eo(E
zo?EuKj_AS_OXDcNC>ZEPOIm_<L+*;W2vN*U7{h~%5;+wUDm-Edot89ir1D9oNa-RN
z)R$P!QAYt!wLOe;?8>oq1fA``80|<0LPfHXcZj1xSs0Ffp7f_{krxFr7z8{Y_Dwby
ziYcROsKJd%$`;Qx8E0g1KHcsD$1ZT7XRbS+<wbydd6J_<mpI(u?PVp{`g;LV-|CAz
zpK7`#oe(M*S8oH1kUG;OdAYZl!Whw7B0vsD*T1zzY-gTQvBuHMzYD#1A5VG*c09#&
zU89kP+$+LaNFQAK(ky#^c-aZwU834@57*L>;1=!Xh~`oW1`_#Q-Osflc^DIK6B!k9
z+i-UeVMVSWJ3{YtkYo}cBdsRfqQpL9oELMDeT_AP%;qaRnMncQBP4OudQfKArYQ%P
zE<SL21L;*{05kJr0Tg_M@=vu%<ubpN%&|<we2%B*9-iM?h~hFoh=KQs;~uo+RB|0|
zRmofy89WY@z-_Ekt-}j=^3vs53TKb$Op!&nN&L3iBa}Xw9dYST8^ig~kKLHg0c;bF
zxIO8+P{j(`O}W{QA}gJ_@9E6~V`R8N5G)9hiB(+kJ<UE4)5c^-K3}?6^Nds}x@RAB
z?EAoV2hyg2cS+@#oDm-2N2jUwrX)D$g^vUijEZZk6+1JxJw5)lVrk-29o?$5Oa>iW
zki>UiO0Bca;7$>g?*W12pFv1tqPJ&&;t-oV=dZW9r$uQvB(z!2Po-Ig-0c1W6Xz<Y
z?|YB%rVBfZtDmyz)^`(U2NwA*821CPs*GhPWCRT~QnSXge(?|#bI2pp73&|f{{ZZT
z<4=tjQ0tdkYeA;&R%pu|@~>Q<?ypXL`&X-e${(<t{v?hM68uH`AoCBK3=9s~y*=_z
z^RKzQ1>jv1!<q=Sw2BynaRiY<fLJd84{j^zFc~t9s#p7lpyY8s1ik`zL*a*pVUEK>
zx3_rI8K24+Bn$ywrEjHPUCjgO)<wW<<~88^`wFqAX!^D7gX(q`*+|%iwkea2ojaQJ
z4Hv=*YaBmhia^Q$a5w}J&(gi;I7MlqHjGpjhE|Q>No^;FeNHH&Ngs5cUuFD1m3G$_
z_IeV>C5+}d0)<!43_T4;sOtKCm9%yd*|C_9n4ZJbRN7X8?(KU%=PsQj=N~~_RVul#
zNUt*MI;2>+L@Kgn6b>DI{VQ75&f7^@Bv^nhqhMaKkwCc8?V^z_b0naDtKH3GU0%+t
zrs5WmB-sp3F<HhEo``)55?-{kJb{!-+%h@9VV;$rd#PU7PO-zWVgQy8hWV<VyK!j~
zy565H*?h>E9~}E)xs7L87Yw@w`7n3HUjPd9Xkjm_9AnH`)jUTs+#?<CstaH+05`a<
zFUCI-G>tn*noU^1t#0O1aMFFj(~MUk@pI!|kKmsV-7)6s-#K4AZ7cQ9Bm67ke~&-5
zCcp6|-$n4BmjV!33KAlfLBlqGI_R&6!{xND^_N3LqZO&`zaKws&kWdEU0Z27n0Z-1
zj#vlG6n4jY`7_5q9R4KyP@UB^dx$Mrn|jE3U+#}=*B+6-h;Pm2tt(tg?~^F`SqC`!
zfO}T;hL)?AxN^*@0|Z<gdg8uU6`102F7kHt6O)rOG`$F1Gc0$xGIMuvBv>K8x;+hT
zT4@q8#Lz5o$QX%4iJz2o9CbB*9XZ*N*#r5!5Tov>>7P?t7S^*A+Z0(S30CsKRVT4N
zwdeC8StB+pdo@{E;M*&VDuet()BG!9&rFTSlWihwXu~*=WUJ$xdR5&r&MR1v=8P$m
zA~N7$8oy^Hu71wx5Rx;Q5P^jR@K4sWleo&3wlK{sa=Pz!7#ZUPcNJt?Tw2AA(K-j}
zse-TVPr0~?D9nv4Xr;bM7-0L6?NCj5ZdGEq4%0=Fl7_-MpK6h!)s56vVEHOfmc`^o
z^gT^7>ro2sVYx(5q0o`gcg1E$ev=)r&C`Rs*V8pmP}JQZEEow8mWdp7&jfuclwHBK
zV&vMAIx|9cte<=X%VWN3o$j?52W8L7KH@MXl=^@5>pJ&X0%+idPGoEn<EI^cfUbJ?
zT@g-JThy7A@a7}io`CelUWm=fo7dXgqX^}ZccB6%Bb8&=`kKeT@f>4N2|72Js-;{U
zV;RrVux~FXj?7&p>lIlKmmyMcPjY=KDdV;KTyJ|TyI=-rpBuiO)VZ&*pEEDXu8XN-
zzJ@tMrNLB?@}Y+WF!cATH+qf2-5Z3+VEG$(R6O(TQ2mN~ICCVjK^&~Wu^HUmc%?Q^
z60}hxd6Gm1>4|N?^V79O**d+(&wgQm7n3MA88-DJ*Xvc|bZ7Iojj|>XJAB_mQUr~}
zj{qbh;7On2@5NdBF<D`eEy-pddO`R8p2Co<$^sZ*3>IO}%s}hUze-1ll>rXi9N_XX
z^sBJJERGfz49G{Ein+<>0+lV^HZOa&HD|(%07t0;fUyh~NYbog>L{hoN0@kT_I-^O
z@d%{avld2}6Ash+rspK*wP{6cs8$&)V!8}IW{tL#{{U;AO*HA2vApYJaPr1t`Q(t2
zSPxI9N|u`{!))!#E>uQbImQ%)9M+}02Ikwyn`w>TX+kl_sQhXhTWKy?bp(X8aiWM>
zI8wu|eQQTewt3Ji{q4-yQPbX<k8+YUwD|nl$wYiGP(wCBBDU=8uB9vXX#g9uBc4Fx
zrDs`(j74`aD3OBEppOO5PsX|(A~K*gvizY#N$8~ZKK03n<&16$?VEO1u%u$*IYO{Z
zpi%O(V}Xj=n#N_c7W06p$PA#U=zCR78K8Gpmf}AoMY)*&026d7Kg0YheoLDHXf0($
z6A_WSlEc^7SI^15W3DMAavI&X=8!`nS+EXUl_T4*{*}pV@hgd0R4|ZiI2|$9@vi4t
zjm#|{mP|4am6>>R+ym)cma__rcS9D^ppvJmR@9|+t23UP91gAu%<#NS&9f3I7~L7{
ze=pLprb85B+C|<Y&fUsBT>94Uh^@uEa!uzK0msalCmx^AiprfglGg3}qQALmhs?Zm
zC;3-YWpY-gY|G`kiIm8rkCbC>d(&ok+TDDUmLr0=A;+$LDr=V!1(D<{8#dR#%P+Ye
zl~!2}!;=x-Nz5s=GEQ;_Y?{(6Os^D7vb#%k8+Y7<uQ>YDl9j?oa_Ry5sKbUHp4A>=
zM`x9A!|!cBd(xd0+mcTvHrzkf7hat9^sNZ8LLwk%GB?lBRgc{t<55rL#2GffoQt@P
z+#f;hQ^fZ1%3gT~mZNm8>zsW(>YAgpl1*@hi5QG-?Vc&E$!fzESpgshCAf91Ujle{
zQSmQ{ZBpLb&bM2DCybmBJ!>XLRQrvIOKpt^<dS+<viu(SbE@e2J9w(;e5GK%WKO^^
zKA)X^2M^_w%(2l{_hYL#ak!Y_=)HA&9=YMYGQvAo(X7!?e3PGY2YSGg*7C~v&8rC&
z(B|F7dC#foQrYTvx_nb!Y4C2AOei?XOrJ{W?>rr<-smU9X3b(dR7oJ{$GP^e-08xd
zD5V~U$-)w<_POj|vrmWN)%*#mJ;jtr_YrNGkN{y&KJG_a<bD!e$EJAF=J64sw`-S;
zWF(9#k~e|;y=%4ooAqluZw~4f2#TOsmT1s|SpNWcALc8E(-F?P!YM*YcX;W)VFgt8
z6zN`dT%_!edYn{gFGHr(Ec`!p;-PjmM<ttj4DjQjCp`Dfdj9~0FN%0Y?{rI4mJ0>_
z`-BCD;ndfY-TWZ&0^QqB_N$5FC|FCkkUN4$L0-x5uSpkQ3$OG`TXFu5hkWb(&#!u^
zPEEHShfOG^n<V&CsKKlFfv@eZ0?DzzddKf6_N^%6OZ`T8e3<}&$ta@$u{}tvZ-zR3
z?}T8M{#$6)B!Q%i%^xyz#d<I7>EJ8RioPQkD{-H-N@GRN0Vjc<VNqV9rx{hLrIFsB
zvx@R7cmu=wXN0voFBRHq5wyTNI>jeLp8o*-dd>Z`zibZ@H;1gecjHZ2CbRI&4KA5u
zZSuti)x%2o;I|kA^ce#gIq!ZXd?)ai!oQ4~hk^9XZae$SZ5<m>w~ex}%_ifHI()lM
zGDyfh#(o9=0D`0Ze$c!n;UD;B-vG^Lb*buqKZtLl8`|F6Ir4MJ3{T<)ezo&FMVjF-
zcm;`zUeT{|>s@;qVd=SET@mw7?S1=W{8Rm}HS1}7OtM&Lc87JonizpAV~HOfPoU^N
zro4t=yS~Y37U6+_t?kL@pv_v6*5du+EV9WYZMNN!xFa3K5x`Weim{Tca>vuXelb%K
zQng1pyS5H3vYB1d1wanrkm=c}rqVzbIU#2;<g|cw&-hlYtX8H)Y26VVg~sd;p!cZc
zf*7)8VvD!s1pEI0I)zc(IT1_jcLqq~5H`k-EZ*Ltq>A0$Jkf4SsUvY67<&3t=@YO4
z@gY-yM*&yU>q{NHaD_n4Bw|8#o*Z$}y?v=Uhbk*aYvlw;Atkq$k~TRYe|#TLQBM}r
zIXlyEJR_>$16I74_=9AtE(zG}k<V&KppD~J+Eqg_Xw|u2dY)#-%7_d>R0aw`;OD6y
z=e0_7`4L0gubCeNI`g#DvBx6g$c;|p^9C6pdwLpYn1nh!q(*p94$`N&{VH9`NedO5
zNX{Y*#0)WY=zVG_t&U73*fAK8<EPT4l1L;zQeF@^CPH{xkIs|LR|Rkn%v<<}sHLd%
z9UN+QhD<JS2lc6z);XD0=V4;pgd8uuCAJ&OREW0LC6^yD2mC6`PjHc}@-Rg?P0t@s
z!|7SJ%1IGPX&eW9`<6x=25t!KML81O6=NuP{a3N?%_IaXEM<uWvdZ09dXGvB!d4(a
zV+`CD`>XDMDn(dW(k5>sarwGFakrlSw8fE}D>8YWT*R`2w~A>XF4X(Z*vyBFXPQZ5
z+6MTK4~HOh7@$O~(KEXU$XP}tJMu@Mt2XOAZ@H8NWZDBR3OB7o0~uRu$bkaoS8qA=
z&#hRtMZ0CThj5&sBXOhzWl?eDD-eX1!SCuR!JVdAhzXSW(Rti)-_n`(gC<tl*LfHu
zu6U>UMO<!PM=TWJF#eS8z*yc{2LAvkxE)M=0I99+R!Es)DAC80kiRo}jMQ<TGX+i`
z18ix-FFkncOeB|+V+`^8tYE3`X<Q4~S!Gp%<$So=WK~dCYj@pAx;K^7&$BJeqa%OQ
z(xFJAxsoR<BM`x3iCYgVdU4z9N@bJEV%TDmFlfN}l#a*g-hd^J;u64#L&wl>?sMz@
zb4VL~zmp!+XACiqf8|KOY&PF&HtOh-9l(G$XVRr}BuL6+5=M)Y7)&;Ck^%n!Jtzx}
zNnlwLdF}&(*xL%=?gD`g)N-s%9DwiM11>gt1L|sIjpJ>w1_Ac6D-4{Tgc@?gERQ6g
zJ4~nxHZZ&%KpwQNG&WZf1ZizbxPQJd06&LHiYuUQqqVqFtny|s<L~3K_U}%L6EfU2
zukT}31hSq-Jf3|jbdl9oGdk^$=2PX2smCUy1~3H7_*b`h{#J+uDA~^^)7q1BhKa+4
zWRrQ3cpWiQOasP5&@ow*sgXcc^`r>T<&?dJJoYHYNb{TyK9tiL3$$^?=R+(j)NRM!
zJ<q*9+BBG(h={-g%W^i4t|_lFZ@2qOtU;$LUDKvJel+XJC6(4|Ovw|uNzg}v7ae`6
z`Uud5;s~c$?%+`ppdrQv;(KPIy0n4|)v#MhqJkVvZX_p$U~^QHQHdFX9jFv6LHWV%
ze+pRcA{L6m_2()`ca^cb(1YpiMTc};c_f+=Cq+AsIl$@D6w8?lTg@WC&=R;R4syex
z&tX*T^*C-xn%R+la}FdqA%{GU!kIO}5+5#XF5lk12?yI0`85u7TUijwsb-9hiMlPv
zBX{u}cKVu8aRQ$<-v%%@ZY_|_-{>lj?*uCoOXWu_x$_wR01wushHGWHg<c1aFEcEq
zvK#y}iaABhOC{o~r0h#9c*plxdR1tp-R7wCC7aFPka%zIsU4JhR8H3`=EmVz$CoUl
zg$#HZsN2g+edz9jVo_xWxa8o`WRP<fuWsbk9i+OmDD2pfp#hbL85pYmd=sicbt=Yp
z?TqfmJ^uju^u}h4?NAXy;T6tVkA8cTQAs4Bh80xp!Cj*ydQoI6vg2wH%1zOjZsatX
z;DzI*RFeFVCMu#i7=s|_aZCjl3JA$02%m!A{c3ChT4pb^a2tv->-7Ao@}O;iXr3Rl
zv@0ZdC6Kpc-`=N%E~OrPn~I;3HDx=S9{!aKw!7nL8|6^jm51L1cKTE8)njnd8Cn9F
z^AWjUUbFz|A}~tGB@Wv`!h_%I=}l8G1e=5*PgPuP^%UsZM2twF>|O(q4nG=`aRj+Y
zi6fz2lz?ZS<$%hi7j|MSISe|Qo-3D{-LBw~P|V~Qx;961=qkI0KwR6fDa#`sPtv1X
zkg>Q}jD}2-=zj6f=qi%XS1w#!m|jTjh!DvTZzpfeuiWSB+od%mX|2JP;|4%R)EL@D
z7ShDTi7phjKHxdUOB7OquB{&Q`P&QCeJMQ#NhZs~6t`B)S7<^bZKd(XayklS-O9^!
z_URx~<zhHhMpyCmr`yEN*j>n_i9mknIplk0l>}xi{gffzM6V+ZkEf+Oflebj1y+~L
z2jm2fpITU*rFDs26v%e7I`BTepIUUb6UcU>2;_we1p|i!oN?-Ec<c?sMI=KzkPj(G
z&AZpwP~N2KK@G%iT*)j-Re44n5u9V(pGvZiaU;0AghY&hF4X|1rVpv7Sy-jp7(BK~
zmHy<5g1A4|nzaS2QUN5SvdY^Ty~k{Js#0A;m9eAyMmWC9HJJ>gFb<sgXTE#Xs?N-$
zBKd^v4%ozF)`qp1Az6vbbU;YkOA18+@~z`L6Q3=JB>w>Qs?_@rmc{!$KHg^xoH-jM
zkbemFsio5|E};eq85vFynRqzwie-Y&lmngF%A)=3^f~QX0I>!qU>$im=*QB%d=k3U
znWbVhvyd;G(O{LqEI2<(a@z%cp|CItwtnfU<aCh$1&A$%Ry;?=AXs;pWH|s0yG|?K
zf?TIFBNpJIf<mlv79mav&tI)L#u30J#ySDenwTk*4=w~?;66W{Ol{_t+_%a$9AJ*V
zj4P%QxiVry1F{E|j=}z{sOLWZwQkEhesDS!X6|a7YVesSS;CxkBcb%EU|?`kHgz96
zVDb-o>552;k|m^$fkL1GivoEV%|)^`EUpzsa@~bl5$|_|#kb@PK|g&@S_*7al*2?f
zZF9p8!mCS_sMoiH%Tp|w3^G?IE&c+82%(CH=est43Ufypm1bF5HYxK5<YyfRr5Qqr
z<j$><Re>Cjty+|Ng_;|N!JNpsm5gs2E=f_|l@Wm%lO!qQ91o|xENHQyQbV%2<aHFH
zDIHcUjI)04j^>}Wghry+Ch$~_fc)UEEyqu4Rf*VbV)-m`7lH@9N@1F56=uSW1a?Kh
zUw?B_{hmyO1iRx3{-d$|DjqwRL|UXmpSyDLoNkZi{{U!G7^Gq6pxTT!uHnXg54~D~
z!HnX{)GUF9{m1xN^%O|4yzBOekIHakQH-9MtllbeDN;zS<g?sM6h|u@O3uZ2`cor7
zz%-Kw9%nJ*r?pv)p<-3tvPcX)sXpYQSVCZZ(nfG=KW#R(E0H3sv8=Kgi?AT$3+YiZ
zGNCc5sTsgOrcGLRkevC^t7ACZRi>3P7Iz_JVgXT%nulGFkquLC1=7iHBD)X)!QdYJ
zdeb7xvc?k&B%~4P>S@WkSbohI3(iA<jlWagqg$wC5-d%<BL4uEfOS3VCss^qDI)3-
zBf8Bml{n%Q{{WtY@T-RRa+y-xWH0XqIxzOEAnhbRTF6~;S&#7p>6)1&Se!C%bLqSE
zr%tq>!KBT*ce#6zEkoeO8fgOXIPK|Kx|XXdhPSjrRk@In_eXv`X{mWMj`o(f46-ut
zx#W9SL-79q;Wn@0k-F(moaX^YOn-QL*Q<x6D(zcilBGpY)aCS#1>bnnQxU;zV~hYq
zy-Rz6Uq}1{{hXv*IBsOMWejnGpa*YL=qtDQFZ(yCv`A*tzIfrxGsL)LBl*|U9tHSE
zWn<yk73{%jm<9+w?mC+E>C%lg?yX3SCsSGMVtg<7D+ZV3J6WijH(kq~8;-u!?A{yj
zh_$_W5)}*OeCHgG{<U4vv^XrpJ1s`U1LV&qirrbE1Ihzx?fLQ4iX3gL)tyjQAk%b+
zBe!*p@PjRaId7#sWQxMvE^!z=xhiTq?-5(tTeykSJrB~k9dpHr79oyea-@(AR4CM|
zD<nBeF;_Z$N5uB_q{Ol-HyciI`PU`l?})Z`R__;>s>OKct#H06_?DK;W?9Gy$=rC&
zc_+kAi*wBK!qRO8N!^|~^si$Flhmy5V=2~*RoT;gN%+Slvn{$yh>Nh0H{SXWO8NWZ
zug34*G^=yvuq9U{5~J3z{v`ZWn${L6b(vX;sylP}*UeuR{x40sRJWJsAm$+1Ezdkx
z&{T#GDZ@Iow6@E+=FYt9OO_w-#gB}i8J=lnwimKxGQ09g$?sk++J(=Eb+DJmd&maH
zQ-DXcMXT#KejvXWx2WD;aIpsDeQM5&rOMKI^4hbiV`~rjWt05t^8D8~t(oFEpTf3B
zMLKGl(Av`MqJWEN;Z;yc<Yb(7$9m{=-6JgtyDNudh5Mim-;Gw%bhw7WFU-o=1a<c!
zx-BxwK!Q|A!AB({et7PAuL`?T+~|NqYPP~T;BbLS%DKrkldS7&YO-5I-du~49P^)H
z=~_Chq2rIso5^E2-t008<DeDFYcgCrsJWgv*iG_mkA@%Z1Kih{iK^inBUr1M(#vtG
zv62WH6p^+ww;=aFom-Dfy7F0U{I!q}KxN#`=suO9W21+eWS&L{t-W){Bx4*_=9i?w
zEQqfGg_z@fgC$3)_OBwfbxt=rDbkeLpQq@u$tc|y&yt~I`9ksE-nHP;V}?Dk{_PZU
z@(hJ))V0yJOkNiS90iQyJdUQWOJMP%K?(=LZVKPTeJjSRUCrF|VM;KKj(%$=lrzCJ
zAfgtO%!dpIWXF0Sw0BVwC@k%h8vg(@TIFM%5<9s<<eh{rGJm>#sy`|yNZQ3&Tm4uc
z=Zepr*uGszEp(7e7!iTb-N`uh6=-R&zwV`hl=VFHK9wq8h}m5uWOW?2N6nfVcqF$d
zRh@TyzFT2~{ePuHaw#N8k)oZF$C)_bHwW67<xIOHlqlVnTzB*yl~U&RN!8;ovD@Wf
z1`oG1=ru)*tP#Xn(0s!KkA7&g9npAfm7ODuZjnIRsy<(Ttt6MQT1*Q}i17djZ{n&(
z=)t%yRF9d7>zb?fku1Js>UWQsOLW2Yrx@RHIU8%NmJ&lE$0wY>dO`C39`zhI?HdVj
z(YYiuGLAs$ipF6y%I_&tYO)V3jycCX`g>EQ-+2ewbqS8fINlBlC%3I?p%QtSvHhTS
zk_ckCEQgc-0PCrSqs|ePTNw&E3dG$cZL}i=7+B7FkFRq`W|fHzCP3qEFh{*yVuj4j
zTa7`{Ot$JIkYRR~#zj__Q;f=O5_6pHIc`AqstngM%Bac%5PY+qzlBF5+((BS41fU2
z>+=EaTgCE{+h&E;+wKxX%^NN-2VRu0OK@O#<Ct=UZYz=r^{QZfl^8w9+EBAFQgA!t
z-mYo$AZ0SXP>hlXTG}$X1lI6eNXabDKXju3zl$CH>43<J7DA=nj@_e$^vybH-VkMs
zebvf2915!><V-()rz^_irfZ>112iIFqs~>}wivU0(^J4Ufh#nnRGq4vhHpbzQeH;!
zMhddv5(K>*bjbA-&$hy`;jS7dClQVPeZ_4TadRYV&2Y?06)3xMQHC&R`&12s6Rf~@
zgR#d$S<5u2>xoWsa!)&{#$_mxMA&`ANw@fc{#Bw#eD^LHo;#G9CM|{K8=gJs(OhAG
zakOJ3vHn$7BoHjOE*(KkNxbL37^yzXDyg1DEX~2=?)q^>qQ`bf@((X;j5+O&as6q_
zG>X1suH`>>cOcYzFur4<Qy);r`B4{=K6ucoG5G^G@pr7}2=oiFvk4zRXGH~0N}u5$
z<4uym=a<ipZG|JiAn;q%)bTRq5ufIEC9pcL_*J<@o2ZOOgk$%YjGs#7oixW|8cQe?
z2A&5k9|^Jcg5HLrmM6nBYncz+^v|VeNi0%GLdJ2N1KfN2)oEChxejnJr*8(irv#RQ
zD>4GbU9pjl4l;X+j##ZAx{O;|xI029M&WVK&Fj{uY^fehBWiM4m~!5NqI;>D;X;G}
z0MCqND<+9!ZNRq0$JvCWIoxD!0X_XVr!2P0%j8_6BT0Zk``)AQH4H{=$uvq|%Y3oz
z&#0-A8R0%w!Lf4hfzD5-_*B@NkC~v1Trh2+Aq<<Fzqh?OzGDu|3uh$uJbsk0K;VNn
z%s|Y0x^qhu1xTHvW|$w{M5h@(nD0=_vmhawMOVs3PIrUf=}}v>_fks~(JAL{6n6Lb
ztKLFx&y-zVfbzlll=r0;7SddZGR8cTtdebP`}zt=>K0`OERBiCk`uzH{#mB%{>>6X
zmq?qVz&+6Q{3}x4($Jy_Sflx+c8-5Kf_rQxA_+3@D)AM@@#~tUJB6AcipkO+DWnoh
zEIU>}dS{+RNgNP{A*KE3VY$G-LF?_BSv44}qr;*Eh+sD1k?c>UJ{?e?mED8IB8}+E
z2Oh?g=jb%zA7_k8u`$|ZlMNv~MmzdaG9p6POzKq$D&%z@qK~y0Ol+>8t8ZQSJbzk>
zO-d#t$^kClE;t`iO-7>!C?ZL$BaUTTz(P1yK&0fU?^L9XW_MWS4&>|(H~<O;tUS%j
zaT+_nl+rNhqc~cG-NdTasQj<Ysygy|)~YRTX61G))-42&vT-a@fI@6PCOXu+yr`H6
z31v*9r%-+UYB-(b04oEqoS{6C>q;48GAqo^+d~otFi&iIQewFr@H${LWGMsyPB#<D
z{HiC6#U9m+5P;{7YIInmMUgG%;rE%EOpbl3SmJrZ%=kM7Tjl(z0i25{y7Oa)V3k!y
z<I1?_BhXZb&I)#_k_RqF413h!Cv;_yrp}|w9Y%W8a@#KTcb8}w<0qeSMZl;sUE_*k
z0w@gZGDo+)D@GlBpoAi+JJ+f8tBkhpRS*)Z!vWNvT4b<cS}9zjvV7wlk<?<XNdZCa
zBfE8hn`9(ylqc|m(3&lD@Tl|sr+F!{Bv&J$>OJc8GD$I8mw-l0U@H{^a*oEHV~|R*
z{hVQjLE``(^?ce0q;&2?6IxuvW#JsYea>n~?QNx3WQIn0PR-3P0E5(eRq2HH!+o^k
zM~rbFd=B9ErWm0F+f2-aC?t+Cp0w_UQ!&LH#arblet$4zA9|F<1KfF{Xo9#36-PN0
zX>8|lpC!a)08@~6dy23$(+puGY>7Tn%D5zY`&7!LS5UJkNe<XTwXrN5gxERbzqb_i
zuww}qQ5c$ExH0mv9QEvLLM=Wyv$2~B++n((b6Pg~VTKoJW@#B$F~k#^=ACP7T7zZ{
z#frt|U9G%?EI<WT&mQ^ybe8s#89de?tEkGJqy3@jT^za`_Yd~wkgv;wZ_s1c-lL08
zwOpphU=CYh95?hH)t9!=uV<-{nqsUzWM$-a2Pb|qKhLc?>r9BDSYR%8gTvsSI(t^x
zgBYL73S>J~Mmtmu8HJ3Dpa9ur+uo<zNtUUkH%jpMySW=CSkP@H4{UX<3(F|}*v%L*
zuLWer3HnoDk~?V>GYpUj9gnqIxV(<#4b~1HfW3NkAa)fOzU8Q-QA;BnV4@WZoFN>s
z^`Jz#GD{SQN$A52Pqj}koi~{S5D+eL+#jt%tuTTkIy)7VuH)PM;*jh~BsTW!U9sjB
z&I4oV#VSh-5Rnu(##;jbf_()s_rmf(%@fYt#OJ6}>FR0~gf#yEEWbL8KcF7I)Y7;b
z0(hc<<F~g%n23r``Q;(#$3M%xNRz~fo?ELh&gTt)&GhYA?t)uqx`&jFcB<#^H?O#<
zE#Ku|wS2f!ovVTmtqv#?WU{g#OwJBuDhluc{{R}SOI*PwVk0?M`VZw(#Uhg&$f(T`
z4r9mN_ddT$v1NCpBFZixX(q_>f)D^Kc_%%n*bJM9`9p5y*ZZVog~w{8ac?X^lulH*
z`5SI??OPh1>~^rq8I(3c{EN!x(z0cq-V|u%nYOPg&CpjxK5H0FBQH?Xbs43MTPgD8
zVVMW;{b~!VYm*zo)}w2wSzNEmPfk4zXkJMeo=dohJC#E0B=Ov1)~U}glN5jnJfvdY
zVf{`!3f)}iXv&_{`N0-71|oz8<b6-AXJ1&n1&raB&40dopJ7|k%epgq(j<|~^1C8o
zusQ+nRdpyLOO#6kmpCO!+(F0WD_Bj%naV21HFs<>=mBI4yLmlNaaE;@Y-M*SEKU!l
zX<o+hG>IlWut7nNRlEIbI&UY=k~D0}KrX5e$PfAGE4DJaIoh)zxSz~~kO!E=#!8H5
z9q>9;c`i0ipeE*Y8w6+gvD8!U{ONZvi<MFU931}ujaTwwRZ$2E&GRx7lC_}>y>F>v
zCd3EL5%RqmeaNdRtP}g|hEl4bOR3wm0s5ax%91I>O*9TX%wV&1Vd+Tl0kx9^AQ;|%
zi@Bks!<nO@i&WYKWPuPI_9m@a>JF<U#@H26h_KlzYn+a03-6J#_zTy9JwU5bT*je@
zmvKY$<K^AlVzQMrV&gNUk6M}`=ZlTulmTuAT#;JVdX%n!M&LY$3a6}Qxm#P)mbkVk
zOJD~asP!LTrC);gVM!E*+Ih#`9@Wn}X&XjIO%2OLL<=g&MoHR9EuQAI?Zne4WB_d$
zb!5Q<)K@WQb{t6}+#RT+%Ome+zt<J0m&GFUC4J!|%d$7?SV|3>Mn=u1*%UNrNN3s!
z?%mYY$su$ST3$k8cTJ`;c;>P#wJ4#K7^RJyk1OWNWcT`?(yfhH?fIlqQMxe6{3{72
znb8?UzvUQ^+q5BN$3ABuj=<4BlLUYXL${O}*d74vDxkX#*l=A=GB;qi<5Db_TXq;n
zvNDat9@JPlmqGqy%*wF3n9l(K=RNtWkT&!&y^-6T5Lk4q+jYBw_w4T&EJ+}b;9v2r
z3vhgemJDs&KnJn!RTL&#coH+1CQYTX7jHq|pITs%Qgt!9s7A{MUB{<tYrm9U)h1ao
zpydZbdec0{ASeTA$R}=b_|~Z+87UD1^TNrFR6As3_oaC)VpBEawj=p~UZnbQ+Mtf<
z00(i(=W;hB3W(guR4U8^0!pqrpMPr6B5t~lXI6mRG~h&eUzd@Zlss`dvJwt?a^El4
z+N-qp4I@gb2GNt17%kk7YJ0o#-eSqTVpLSX1J@OzGi-cvNYe>kSk%86Vf(y#k=mbc
zb0f&USS*U<dGUSEt|});!mMFj`JXGEz+<K<zv%KfNmn^dh^pi&{{XZ{ewC_5cP#y~
zXrVGf{$A!FkZ>f;33iK%c#+VY=2;H}p5E06l$q3>uOS-@%sxd?+z;zbSml^JD0dJy
zNs-1g)PIFlkeg(%J=BcW^GLySjEwNcoVT(F%ugr+9JkKBx*w<3pk{yo@~Z<G$||-G
z*WQ%vg~S&Oz&aA8)0Q278g>=f`EOxY3bzTC<pA$du;22W=c*j{q}*o43NvGb0}YQs
zM9yLaDzdUJS0kQ#Q0x~WWPpIyi0-PvoGWDKxXnR2yssjN_Qv21st7+rPnDUQ=EuyS
zAdBSy_di;UBEDi0v-fQEA6kK{mE^ck?w0Hh6DrN?QQkeNg=9z^1a4#p<!3c=NWqmd
zS0ezh=minm7?i~jEU3iFHs^!a0)V?Q^&J(Zv0*ge+_B04xj4^b^shhhUWFVA<_1(i
z#N0;t+#3MvKoq~&{{Tw%22tcft12Iyh~&o&_|_J?;fsArIYirIWgCJz@W;9O*LD*U
z>B`K;tu-`wUFCzpc3elD-7`=WDY;mU$}$08z3pArzu{S8yO-?{d2Qw8Lv_c}xhwl7
zg9xqDxn50s(41<kqs*N-LvoNtL=q`3uEkn0)knFmx4>Q{lf%d@qluaZE#^ual+PpZ
z&2o>JrcL7nwlSU#eQHQA?k$wWxETA)JBp_W$yt)5)4A=w9r&#b0VAI6Wm|SrBgTGW
zp1k!Vxa-Aw--J9%Wvp9^yB$s!4sh|rPImr1>*Nuy-Al2N)kaUsybs7%WANMJE~BCA
zaL0KmFkrbL;D-K!yxd*^PB()(Db}{<)*6q9JUVpwZPA!rV{AV!C+q3;uQBmwh^#Cf
zptqP8FP6#Zee2Kl-;C1R10}WE<=B{rY;9xTHRsnK5PU(Y+-Fg`UoUy{5;Wn5pwF#x
zQNc<tQl(uUvu&(FEXHNN1ee@MB<JZ{HdoIo7lF1vISewaG0^`2I`L~?88Y7?wrOKX
zR2yd9ovqUbx_vX^H=P<z>hYcXCN4lz>e%cnT9hTwP_HD<OT3c8J7rHLo#o&r@49;A
z)Tti`S;UK<-ge_0b6lODjO}$dgdJ8Cv}3g{F`Pe64^v$Zk99t|tXt?hd@m%=FjkT^
z$W_PjS0v!lI_Y8*nWq(^yBJ+cxj!o7k)D~wT>Ctc?Gsy}eEge`bjM2U=I{oc;R_Xx
zNT<5HxQld#F`fraqp3BAuG$+?kjTDFon=Wz3VRdSj^el`-Ok!oAyY(ihQQie@3ys&
zN0M1_xROt;BwB3Im}9rv7DqS?3vu5*`K?PbT2Vecq$GuuHc_y8uh;q2c`Ra>6C4hk
z+nug)pXr*HIW5i9V#Y_NISV|N?HWhbTav@2PX&ODTX2(qP#>y~QCIA(V^W42V;kp}
zl1%UV14$zkQya~@FOB6mQhR-C7bkM;kwNUSDk?G{+I-c<On{HlpN57dNq|&U%P|?^
ztw{Fqr`lzZ5~s^n3(SW-0H&Ks5SZqV@4j$9x<~V<cV#9;BvSb^TZy5HY2(<hDB)MA
z>E5hDWR^J5SzaU^HeiA{B%ec2ybCSChDZot0FFj(o}Z0ch9F}sBp8wQxd$6@)PeP^
z-sN-@%jN;*5XX@jZ%;$?r?fA)J0gGx*jVt#(w`JtP=-;2W5_+dYIL=MW57mo#Im;T
z2e;CYBRQd(HhB~W02V6i`cq(et}U35B6$$+Wlo<@O4K%UDhb@h@`4xT;r)$8J(9r^
zhmV(I{;jY`^%V}qtCj7vw@X%O5#A+_a!b1zJ;CqZp7sc%b_$Z1SvO{`K_EtWW<_A?
zF&I4ueALhjXl>mPEXg4Gxyc969@P%ztqPG^6PVA<fC_sa{M3_Ms)EkJN{^KQ;2*=O
zsr3YCEu&_dIE2z;VIMPb{HrHd*X`{jnL#ZaXc#Hsv)`Iggy!uO4pB<%wRz@65wJGR
zyE!u_P^Y)o-m!c|;yW!TOf!pwh^Z*sj!K@upIXK72gIExOR+arH)P^WGqk@laqC_`
z@dx7I*OGW_U&;mX6EV*6I-GVKahmR-f}GlH<gbjUN;*ABz9V?~?rr6;jXcYim6k_G
zzzf?o!+&XA`3i5&K*(7esrpn+JI)x~#O@gW@F!9|MGZ8NFvF`bIYlEl_pf%HC{lt*
z@G4f7NnMi3c{Fk~pojTJ20Bw7X+cQY!jef+SC-Evqw_&lh!6{(n1T9KYaEECUAx%v
zobUx`V|$L0P0zv3M+6>~EFo2yfhwf{F2{v$T8v7kYmlT4FgPZc45Y^=(-_D!0Wpq7
zg)Sl5`-u*#)REZxP+osAfKh@!cmfVF+uE8Ch(y4%2^^+D<R3#y>mJ52F%68DC%E>Y
z2Bhr-$$ty&b;dUw^V{i)NmfLKqPAeol30<P`x=#0@A;#`u+DpA(+`%h2HXx@gN~S>
z2<<1H3t3ii<~dLz0eJ^J=hzPP;>i@AVNttoM?6!dl2S#)tXSkEJqFM_`_y@O!#WV^
zIx{aBJw_>@2_Nn&T*knzLk#@h#-k1a20#G*C&n>SEKP3+Pb3kz;Nz6fQ;zi4P{E)i
z6$9pAy>ms_3mZs4FNFhx^7Ry{ff)-MC>hA$ij91>3n~&pICTd<El9fqh9u)|04KNg
zpa5aoIRIiGATd9AeW}L;c~Qb+0dO3g;QNnSN!_Q1$eGlzZm2Q%4@!;PD?7%RI{-tw
zI|%RZO)wvD78r!`s}&2h6V4kQX$*417TMf}jPe<N_I)V?gtE8J+2%qIA5s1k*rY(=
z<9w8C{O347;YGkB-dN1&UNC-lMd4^E94uNWoEaD9B;`o@Q=*J-GTTjuaz_W`$@Zxj
zIl-6)0kGkIPz@j=4$<Vra*Tm<^Co$wq>`x;tbZ{FcO3_%B%gP4w&of6z`+CQ-xRxs
zOFN7e%WWJV_J^mqqy(=D+d~wx2O>j=i2g7C097L*S+@65BO?Hwr_|EN=c9yTG7jPx
zbO*So*;F(9<+p*6o(H$qfC5GYhBLPuFdcdA??QsSV`(QiW5}T%BnJw_o_=GHKA!aT
zSq2%f+s_00zh6ps5Q`JOQwaDOR8fL+{OM2v3lglVxB+qiKJ<)>DlCQ>4%4_kFc-Ex
z>5iz)vQXJ?;0GLf)4hdaU{i3CRgko6!p3@^T0+e7obTVWq3uPqjkJ^*+S`L3-o~VP
z7U3PIyDxA#U5mGmar~-<VPcvUD9<A94Un$iDfXz6R1!3+1elBxRog4qu%{GuWu2o`
z>UK!IKor)_7kic?JCR3kS_4tiJE9W70CAiFlE3|WVOb&^DLEU59lhySd0=4+xz5%E
zepHGOOk$C?Z8?{B@clo+fJu%n^E_s6o+leYbJHEYsj4<wm{~~$i$|P-rk-O^j#w#I
z8QxC|L16KuqC+6%Sna?R0Po)+A@+nLk_Yqjr$$OQnv#6j#tF|9)s0p`1+u)-<Y5C~
z9yzAG>9M?}A;T4BJ&&igEksWnG-$5R!V*&}-jMlh!XoO0jzXRRK9rIqCSd+yViaHp
zI2?4Q+&V=PTu$F9W6Ay>rA@{?%De1{ARHaI<a-lR+dO3bskW73QIx1G2&f=<mStHa
zPzNNpbw0kPr9NTY?Q)om<y0;PJ$=uu7hz&1fv1ae!og6sBai@n`czh$0^db5Lob%d
zrLfsMhqYW(S;$aJ7C9I^x6-;F1%0Z+P>u=olHj_D8Ps5*JcH@$Qz>%AvFowOT<F?`
zmB-oc?Zjr{AfjhXuH0mPJbo2e>9PVC+Nmlrw{|n=YxD=f-?3+cK0o|FvDD+cjyc-X
zkFzc|;Bm<7Un_ia{hYjc@FQ85LGg}}Bna%yZ+OafvgeJbq2nBNu38xC6{pIcpqo6h
z$5qs{$r-fktBY1~iQ3+BrM)>GmARt)Vfd}#<d6Ol?;Gj}kgfnS=Wn)1HHC5VhRPHn
zPu>{KHJBDeRTxF*Z$eL6^kH7LKZZ>cDm16@ML&`08Yk^<@q0-o=TX!?*R_F*e1|E=
zC%$Udv-?!)z9UwTQSkh8ml#7U4X%Ay0mXS(8(5%BU}Td`Fpnz>CID>XzH3je;(2*_
zv@%#cGIvq2sei10YHE^PCYqM(Gn}Mj1K;UMZ4TuI81Plj?=bwTJx}=7X_UeqNgpBb
z7!lLxYC|-@W>!`kaJ+RMht|0+_h(J4tZPN4PTNPBA0u!*0}oN{QOTpO*(AE21(qeq
z2*)kyilCQLITBo8khljp3I|M5yG=6!?9w(kE5KFtKBkv40^Pl|H>l7mMyt*|)xlHW
zKIWyi@a@FlMQ;%<iqc5L@qzq4)tUB*V<J_46!K4c(}z=xqenEeDj30h9lO1=*l|U`
zY@P|!e3iSnBHTFL<j64OA4;445gVO`-7_F?52+k;Q6CrTAWHikzCa@La9Af!D(0Kw
z?P}SD%$DkbW5hw%@1-@$1!;T};s(1|TI0%6f#EV|=JXk>FnBLnSll$q(<dc%oy4Br
z*sh8Xi8_o|P>6K6XLUv08$=mcW2QSA*RlAE4x=Pi*7h))mHz-#Ba8+@I_@8xXroE>
z1e<38{{RS%ts^mx*^a<P!UNGgY7gvt*qD@5kRomb4oLiK-YoRp160yP*IIN1?jkBu
zHUVbOU)QLrn%9Kwj@!ntjx<=p9q7AQ_UHQ6zQK1l_7b)3cynp9LKaJ4cVzBHJfHr(
zC9nF|w}-TOlYb^Z{=IsA{{V$Fh=W_(i0&R%!7=rW`ijT9@c#gZY%Y>jnPj=$v0Zo$
zI+Y{1<Ac|&PqAiB4ID~D%?rSm>{R5W;jmEu09uI4A&^2*Swm#A4sr*rb()WcJUKM4
zac?!nrPrDZhkemHk;qU#mui8$H<=b0E^Wk85{5)V<P3j0PLzqWFrGK^!ACf91FAOM
zf!NmNj+_Rn8tOSbh|y4neguSM<aZR!W5C*mn(;w%aT7-Bu8$BPbm3dj)R*Eb%Qdiq
z7BVmTrbCQ3a(%co)LKSzO!~{<cl;Jx{t9{fDf~OJ_*?rpe0Gk*K(vsX%`P7eSQ0lV
z1%$H1&I|Iy^$c^k=L`BL`y&4U!Ay03+TY;h{u%hY;;W5ET=MgIf2qm1-0*vU4muIo
z`tob=o5=F+rnMJRJ<|ikQnp-n03S;BZ`k+azP<1p;x(U%wEM*xV<?L5+Tv`9B!85U
zGr_<)#c({c2L|U(no`x@&F`tosMDiL)YhBZ)cu6e?ruCetV&_FaFVG@MVIDQQ~X#w
z1p~id%AjZ_(r;cF<Wn5^eeBp*&r&_9zYA~l?~NCJ8#b41HMPn|CB*8$FO&$%w><Y>
zZuRNE9{e@okp%w$*q2Z=&^jbG{dOQ2IX<V`>0WwryG(8mmgk1sNiT*xb0&o}gf0FI
zLpj`pbUCJYdfMZ`UlK3$$<-FuQ$<*T94B@e=zCVD#Qh}e9vz2Vwb=9N>xC-YT`|;W
zsjRJ9B=K*B;k~tX6WhY9zES(Q``_>*Tr&3^jTWaz;n_637sPiuX_cA@hGdK$51|#~
ze;VM`JQL!3*lgQvj-sc0*x(*=54JiQ?kxT#=`V3(a}?$q$fOGXY6emO#v9+gH};P3
z)P6tscP^l^hLQvzyh<0hrA%rkB<@;{hvy&dwc)=F*j+8|ovS~Z;bUmg_cVlzjAVSE
z4mtI&otMQPCGhR%ouF!S+NgCht-P#(@%#={f=9Qddq>77Z`;NPPw@h);&xcGo}7+b
zzxnj94)HW`TWYUkWEoL2wHfkB&m{X-zlT?%lho0q<k9J$7QbyD8T?%EwYP*dIHZaQ
zEI!YBaCzPaFc%+neY=yME6Jd>XJW9$8#5pvC#SVFCwO;+mMyOi*8)BW@0yXWS~8C9
z9A!{o?C6~`D|&E^HE8Tm#*Jdz1gW%VdNa03Z?B-KA-R$(jf{%u96YfvM?QnlQb!s?
zZe&M60GDC{*>_{kN21fx6h370+n8m5W+=mQ&Hj0<Qz4TAU06JSe4WxN<7obvrvSz+
zpKC~1?h7*la54JQz3qy{9BJktc(HNw0HM7-K+RE}c^)(=GJ`J&?x!j{kyUgSH5KH#
zju_@9f0trRIOsVTJfEdNW?+wdjKngHD)6You=n<;VV`twv4;5mWt%-tagZu2i?}42
z8c7UMG0O~mojD|Wlg%8#W=`@+a(v4|(Z-SPcNss2)7q`A<>EYW$!3X$%BPev<d06?
z!``8=v6|#VZ>UN3a%3Xi)c*jl3~(23e`@**_FesvyjSsVajENmAG&)5U>4>i3WTOI
zs81|Me00I?D>>ASHFm)(yBvqWkJ)d>KNs~iE1^j&JMkhkcm;U*w*LSYI#=lD?8EyW
zcw^xugjc$*l@-RO@sBon6dd{t4ipUF0q<Rx!5@Nt7x-J@TOBsS**xn(xm^b%Kf+H|
z9@Xg<D>1i7Z9;J)JFy>qk45$ZzJD8;PPe&FMcio@G`nWgt$xjC0$~Q$h%a3F{{W3`
zTHaekM(Yr#%fgl8pL)i&g>Ppw$L2>VU5Dr4aatm1;~Qgb%A+4Q@q5>s8@*UHsiSXo
z3ha_M4oEmfZ04=3>JedfO{xzI*Ph0+?H(Cq5t$Up{na0>S%^sL@Wfb1R|rb<_pKJg
zTN<`*(W)un5`I?xwW9zNGCV8_u{(h5MPymPkwmhY73SNsl5pRLt!Udaq;Be}tbiTA
z-sh!V?GcyYWwv&k9#H$tF~Rq%m>~p=No|FfJwF=Dg%yZ+uM5YxpDY8{>sq>8v7<3l
zxRu5aIQo0ka{)DsjWUKK1-gU9Y1(EWiyVroug>9+-{DkXjwrL9tUCA4rCYYVg^Js;
z93Pk;=Th|pN(pDcp5E<MqmwM9dWyFh1=>KNS-TO=d;Kdm-a#CO5h}Dme4e299`$l5
z);0{&F77x!l?>5rUq@wf{z;GJ9%C^3!~81Mwb2I{9Q15`+KMaWc>KGViv<7{1Pl*B
zNerJjR#G|n&$qQr(Jaw|>6n&axY@S~I{kfUju>?aUdvRBG;fu0-N&K!sO{06K~jKj
zB>_D>jaY<@+lj#gjQ2Gc(!x@)!F*T!mHrugQq#PRQ$mOdw;?EY72~rE6~|sH<o^JS
z{{Zk!KN4tB%c*!4?B75XlNHQ|V8`(1ui|;Hy!^?A$yEsfu-U6|z?UGTg?V3<aq|1*
zS0!u}8rx~;dKi4q6Ngq#>&*Om@h`$Xd%;)7PS><6mUUvg_TU94r#(k%<8@sI;==c3
z-qMKsvIaQmx9eZ9zY_iecn9JX4xS*<?d2Ol-4tOt#xuup>t8GUX#W6$Y{?tRu6#cE
z9rL=@RxSt~3grB!+ZDl64O))M==bp1t{%RU(Vq&uHWx81%nFe}+mcepk?qHP_M}Ts
zDJ76vFnJ)@7)gSvJ$=u$c0MrpN8?`rYLn^L+HvzzPu|)zA3E|z@1eoL?}LixF72+`
z^}gF^=4cc;%)?|#I$(~Z*DIWlSv6~+w-zu&i5;wrk(iXvxaEf(k74aq)m}w0z7d$P
z4vY7cbRwB~ZFsh`HN;5v^N`+dNaH;RsLfrD#_Lgl+e<QAiI?S<Z_FFEJvwx#RUNN#
zl!zdTUnkE-+aV+*QYkVxAI_(^w~ADTGY~#WEUf1W#fPBpQ_p3rTHQx;_BiKEtTHkX
z3JiVVJ!$r~8|RQmX(LFg5<fA%_|AHNTFusDQatiMfYIOWyjv;1btzPjX~`pwdsQD5
z{1%r@mN6}-n3AvWQZK&{1D(g#zNa4vX2H~N%>MwphzIhY2;PStwU4WO9n`Pv14VHZ
z1eP(wEM&Bp^*x1sg*<AUlw6O8bA#C*5cuD~mfC%<_Qsj}t7}5uUhq!hc<MTu;I;cJ
zjSRcX32SnAlgq-qglBKC?}6$0eT(rM;JPG<bv3Toini7N0G46E<b|)Cem8i2$HOEh
zt#s;bl+77lj87OMz04(9PAzsg>qSP^JXglLgee-v14|<+vs@#7=<(AO?+5%t@kfU3
zTGL9_o(NsDvOWY}qyya6Cy8~NZC6ogH06J@s)dau#(mG{`eLHDkz$l6O~Z`f_C0I1
zaEzm7iiDa+QQ{97U2E2j1>U11%jN>?Uo4saFM7k=k=zSW8>xwl2|n_%JwBBfxZI5k
zHqdzt7v{!#3UGGW<g({E@_{(V*Vm;)Vxp{yySdWIb*3FE-P6kxt6->H2*x=+<oee?
za|~hp#E)qtg#PdO_o!pNm_j3wz})#Dj@08ZX_!RC$RBhM)KXEgNs{Usa@twNIgI6j
z-ud8rR(hD4YzYqtGOXW!=zCM9NaQL(c3#7O0-{`!BMZQ87vKCVNbE}hHYnKqh9@n~
zeW_JSg5(jmu1|kzauI{L9#1L9%ScK9Se#?AJ*tE&#8r0Ag@GTsRcsH=g$&@^i3dEW
z9gQh4pnar}2IU#`r2;1mhICL+5Kn3VW(zodg%}RGsijpm;6gS?s!WVI1bsfW6i`Vd
z#zt1a7z{ghsiVXateM=I0!0U}`y`qMkrTv)_a{4)0Ktzub5h3=#~F8Ust!nCa>uZz
zi*GT?*dSaVnj+hZuX9#b!D6_3Sg#PBfce-gA3bn8Vx_y3kpwZaMj;1z<(fA*9QOyc
zLh9)#3bHz($sqi>KD9esiL#DSC6DFX&@t(p`cqHK6oNa5N|T1iMm_OJV#&A2@@0+7
zKOS*@zwD9yY0<1f&AiDwJc<<vlLbAFdeT9%c|>SYSc8Rc;y&hx45Q03-o{9BK3I-N
zrcD4(40lOpm%nG)rba~*4a%qdY0W2>G_MBKk~o(Tv-6(pJ%6P^9u>Dkfhcq4E0f6Y
zf!d?<9z<y^?Odw!<`a?zd-_rx$4J(mNsG?hj&e>(+I<a3mlFwu-e6e~flLodfHH3L
z5;B81Y?1SSg-YcWwyO{}2E>DrpXWe{qruOZ5R$~<&kPS^?@heao%SrQu2<!SLgNF_
z{{W3eB+VG}q4L2{IdQvb{`D|N<lJNx-Nc2D-6PxHnnS*WQe1A4*s5m-Y47NLy{g5u
z&hv;2VT*sO5s}pQK9yQoB6rw#Z7f+yAbu3-6};Hi<^sE;;HCygsl`>0ko&PM!y9#S
z9S6#&K62mP#U;zcVTnbveWe_%@v*{=F_JqPW6v(cxJD}?x5+ntm>Bo;rHbY?o6CmT
zomB^((sEdybM4I}fs(rwivb;uHigbf`kzdC(G-)ZFc^ee*AFYP;C29x)ay&8M*Ypy
zeq_p4Wp&^T@I9)!#{$V9wl4b^ZH?c*dO%o~G-k?3HlQ1U=V?9Zfq;~xh!_lD;{ko?
zB9eIGnN*?xOBN%ar{PLwMh`lbDijd7<9DSX6gg1RfX^<>DyjSDx8OY~@~yJQ-gWCm
zFYsh!Cme!3ed&`&A_F5^nFibyUI^ly7WiUO=L5Y?aJkw)y^~77H*9Wl7DBFYeZI8j
zL<-F;p~lg-X&|Ab*(;!CjhE&j_Z)8>h^Z~%ju}J|Mp=sPW^<g9dV%fIh6HM`I917r
z<gpFT?|wQ{1eT+6JMTtZx|8y+{{URj%`84++(+gR-!9Ii=YjtK)~DSl+4ft7Z=0Y_
zp!LI2*a*TzRLTh;ju@PfJt^g)xQ&)&cPIyx$k+h-8faG-<+(pF#~=M+NhwLEQ3-j~
zPGo3~(BA4jsiBTbQ#-As(zJ3nBRR*hCYwB)f=DHgbY~6Zt^?z^r!03kVzT*7jK((P
zfkR7g3}8=z5avY#l6}1>K&(cv8HiH<05iUFpza5-H2Ez~Ryj%nIARI;Kl=39PnOYP
zpUfmVBd<;deQLuDpmi#ev*d|6KGZRl#6D6RWR*&m#EmCXI^v}wMlw#(nAoQn#s)nF
zI9nT-+?ER{JTD|UAIMQO5-=O!a#cZ1qiUc2wL76$g~B{&e$G}fPEnh$t})X!8#UZ=
zqsI>7t?~hYSL$lg#A0SQ1Okhku*MId{3-tcWw=BRk>e^)?*{}?bcJFFgt6}{XRr`*
zjJ$!KO*UyJ)R;OJP2*`GbH`zh)iidZH1mFakMaU}{3r+{cJlf1fWRNpi;r6oc_`s-
zRSalO&9XTpk=1~vJ+zEG(pd~m_lI-sQq3H3K-01n^2S{GoO=L0X><(}SMheYZ=z@s
zJhyYo1Sp*o)tk_Inz%w$B%>9nEu^&{rdwTVb1s#nN+*@%8)9tamLPHXo|X1j>}UHH
zY1TI>;|~|W^G)Rwyq>wiD~`Y)U;edpU$NipS#9CH9C(MtS}ZeaZz4A3i<r(am9MnC
zGvKfIK`a&R^q8h$2h9^g03NxotH5RS@NrYAte@arIJx`HXkci5AJFt0ODN{j2k)Ws
z)gn=rPWctRpm<;VSI&=dfw?Fp84S7O1b3@`8q((1^<TBzM!r<Qh}jo!l-__>f8jq2
zS!w&fwBuArm-j<GJ#+6~gr?HFIvkT3;O`4s>AE`ovgKrTB>ACnv~~y7)8@X^EUliy
zPmD|UjFweDFz18qQeMgZr*zhq6YPhA3~iMl_XKr5)vcrWaw{8eKJw{uMj7$Wf2DHD
zO}nvJt)zH*c;Yi^Fcx(K%?GePp7ncD@f^0(jXv7QM*=U%vT{xbT>Wakv3Y#4+uPYp
z%8|Zgd}OlLbaTDl`*yRCG!kz!76ffHqZcQr{Rc}F`n=06w4gC;d1x{E)jeNRv(fEZ
z0XLa*3%2;4G716I5#O3M{bt)ihDb0NGHzK>v9$Uc@c#ggza4Zx1o(Da?N?G`bijFS
z=4>iK>7M@p;a-&*e(yB2K^VC^9Vd)@b))GTUCi3d`HeFnEhZbD!|7ire$rpJ7lX7Y
zE;Qc{++E9bP^4Z&pX%Qj8O3;y?Fsv3>)t)QxX`U<xQZ244Rj>I4cm`O@HpYT)oz~a
zQn`DpnIZsAtV1X#JFABon>fE`M{ecHYC1&R@lVBHh+a5rx7PI=i<^04%$7{Vl^yqb
z)_sPTcc?&+eVLNcm>rIC(v#JA=$Y-`9-VJ#o*KD|MwVH!?15vPDZ{RMd!FA~+_2Fj
zj_n^FT!$Ycu_~Z<$E|$zO0t{0-PxLpWlcXySnW(wjH|gzmD{z~9T`t=aaxwTYc<{<
zcbl{)Er3AjTH02TBf48p<&}}Jk`?Qo#QIj<ribSwb_oix^RpWstbf9=l#8{DOAR52
zWsWyzL6&9cwRYCnLpsdaTX@qxT93ZRu790r!3>c$#FZ2)9tz;Mv81?|#!PHfZEeL>
zFggB}Hv%S9h&Ip)mBz;GJt;1(=VU?TFU)oVr~x2)`qURv-jas$HD#6d#~2%2p1a06
zFKW)Xy@w`II;kLqLP=srU&4STzPpBGb8~<)GLQF;J5@W`LrTii;YxxeL(kCtDzw_A
zoRO@d)=jU7*f{w}>zdD+?&EZxWU;tq-4p>1ez~IQ3EZCRRGAiAtE>1?Baaco<&n;M
zl09mb?x*&KmJ4Y?ZzJcK`Bf*k)~Q@xymxM6bj)ZNt9-$U>Wn>VkcLp94bu=wI0>JZ
z`tw4a$qUU<t|A^q$e6P1-lG9X9qNSUI0TR6<fzQDMluOL-Kyl465GyZl4M6Qg0Z?_
zF#iA=bHK2?i4<i>fFCUK#QM>6Lrt==kIl7|S}F2;fEY-?f`9tvnFYL?q_?-jN#*^(
zyrK2aYP8}xnS@sV03yUUP6q{#U_YfJq;8>vh*eMT`N1S~6kP`?SM1@EAuG3;9GjPM
z`FZ0Qq?R|0+E;e#mUS2^M@qL8rU2WZE@m4c86PpuNc^fNXwjR?C0Vi~SsOoG{U~8!
zjUBa_l<E*VF;Vvi13c#*wE**W!yC*2c^hm+c|rZ``qhCnmQowZOMdz>6ElyL0nZul
zijLmtr-7ojfw#cS>u>-ef&NuD5JhKVS!auSTnFk2+6QhslT!~eWGa^4WU;wrEWHIX
zSG9uTF>bE;+Ghezx$3<1`qen&cZqIyJ+h_Dhxdm)Gr`3!U?wwcLm!pqJd$L}qaIk#
zZ{>=*8SWu#bqlo=$XOSh9{H-m6$KUz%&aocpS$f&DDsW(FjhY(L{p4<(rl%3LOn=N
zs35v+&<Iyxi~v_1dUYnW?5<3+M<vv%j0kTaj5C4QVzXkF$!*}ZvybN)4LLpgf;$1)
zti%RHO#4x=%Hh82e|b-A`cRn8hfleYoNjd)Y{ci41orl=Z947?rc)Fz=fNpvXyn42
z@q)jta`rRY#~8SKfeMErNZg)1{mHG{CY3>hcvjd9GX?odo`SH%sQWNc)a-39B!NWb
z075h6s$`#WTB&&?VZPHI!78YXoN?a_Ymw4#6k9ZnX*ZN7+SeXvZTRY-cK-nD8rl0}
zv~3^-oyRGjF<uPgW^_hE-`;L9dH0_vX55OHC4Gmt^sEg@#525>lY*?9SIk_U-oHxG
z)vj^9?nWFa!!g33_N*Ol>N5uru-pg|2hQXDDKB)1JF}hFBJ$X*(VfaO5JDH`C-|$M
z)EdzxGE6Z0zj?Lz3I|3VkELvDm$zYAZ0y0#M0<cZ9m&sA?^t)1(<<ze7LSa)jJz`%
z>4NGc%<IV!U(AMR)d}GU%Q*i43eUM$w{jy<wZI?_#<Ug*OG`Dvt1_-opuj%Zs*+jb
zEQFHy`MT%mJu9IJqNGzSPa<ptGW_n}Uf%RibNjOeh$zj&lH0NMsg~c!nE{MA-SWnq
z0(<6~EfHlfz>PRVy_rq{2h%>4p`D$I=5`aPw@{$BAdK!c13Swo{nPF(j03{AeEU_0
ziREJfQdx<_zzw+c0;aRlFSQ5zC4^aL`B~ei{{XJErx{L4F;{GtqPsW#3iww~*L-Ca
z_OS$ame%B?o@PKtJga^c^kv1f-sw^;tWn6&j&@)vUf){tKLq?Fo4|TRbICJFEy}By
zn}XTueuBHGbrTw{m8Tfa<;%$Af~(vQ#=mIcjJ9|jyON}BC#mvzg=p8rb4Ov;lTTp2
zVMyM6q_)n4dRNjKR*_|Q`!rooVQjB+8V2dh`xEP4FKzJCRkiS{_=5h$W3(@oylDU=
z9>7<${4wzrjQ;=zuXI>ubVCtX8)iZd`;V=C43y;sV_YRE!R%)K&9Ye8HlrS_uv<qY
zJJ3lc8+I^P{{XF1=(G5C%fwSns9pW8Mv$$fA#joXNbmKme+TIT^^9*Pn1CuqupPN=
z-Ai^*I-2x<_)<$}Aic1$GTF=nlNscka(<QH$r^IBPf98=Nl5E_Qo6T?yc=nIrKCrF
zxsKo-N@QdO_2Rbv7Pij;OmD3uNggtwCjgV#>ZOl_rPh8G!=X9DK{f==#Ji5fH+*_k
zm5ToW!yXu)Lxwh+d}GdBe8U~ZH7PYEBdRf73tDPiJ&Z$AkQCZb89w4C^{%7Az97}U
z8R_R$_;Wl9JaQI!QeC@A$Sk?`HPL>}e+;}I<IN=xj>B8Q6mHY3s!qX<zV*WVK=G%-
z4*|=sT{g27o`Yh+p`P+gY>7q~p6$pdIOuE3#A7gUQ;lDSD(|tZRHpPkd;b7}jC^hQ
z$M9pq5_r$T`n0yQYs=+HeLcfTETFbG7H(Un2S3A(gBAI~uj<;Lh_$<`-Ct6=yprjJ
zjdMHv#mE`S_pe?3y1#0zNA{-pq9?X8Md6JLb-saXk`;mBrN{eSv(qH^<Hcf|dpTun
zs*jX%abJh$xrg?SVJeYtk!cm#9d1&J<R-Rux7{oygCZTOKcy_Q#rvj2X5%c%F|?7~
zdm2dgnPZ8L+>(0z(fv&{6uDLk$7xP>^$nWwi6jMMW&k4@69)^xAKo5@nKQJJ2EcF^
z1F$t3J;z3M+NW@JUzk&{rHf4)24UAY4fs$5u)9XPq>JS}Na^(+w8oz3%?wEaobDxv
zz{>g){&7y&s!~HD;2eb=zO=`72wG@ZK_M#}FBv_}7XnoC7z=n9#){jCla@p1O)5(a
zjHk_3L~oun$Ywt0(xOi}qf(nr!<_a2b~K?xY|^1s9ZM0^{{V#mO%#Mboo>9YNp8ea
z$APvrP+6M}&Nu_sp$?Kbwv>@007lWqJ!!WuG$fQUsxLgYLj%_)rJ%VhE0r*zR%Tpb
z*8-ShSCm5PbBr{KI(uTBa8}~gqm6>d%2ivg2dF-@Chse3O6?*h2|Z72(a@#2Dw}*M
zV<(z}?-s$p=xL8MDL0uTkk5~qn~Z%bQ)<#U+Z2kWFdUF_*zM>lIPDpuFih%C7~_&p
z@~CA5^6g^o;}3v2<+$K|DXye3^B9kpEHjVtDfc$f%7J7+gd8Db&lIpj1SLt#id*-}
zt)1i8o|K({W3EOvvoj0=Puv~8w6UbFu7!6Vz+;d1s#HlGmc{NwF0yV6!>^+KD#O44
z68Sz~s15SJx%Tf;1Ts3pq8ow&s_@7=<E>8})adr}iO?AdP<Hgd>FrICqqZJ&<ZS7|
z=M;?;P`2b|ZZdat1N+}f0F8DA-Q_a;=LL^%TDKHv6fuwl-MF(3S$pmE{{ZV!Tc~M7
z#nsM6Pz>dMo|R@hdAONvjPe40&ZV}ZoN!y(fFr&B(UDekw~7UF6kIUqpm2DmTlsU&
zx|GnFS726k;dtZlt8v>HVtbjMDd$cM5v~yP-#w|9UQ|#W_X@H~{{V9U91I+V{_OxI
zsV^GJ{{SKL2pMcJ0R7>Lg3ij~8<+Ah44Estk)EW}<6SZ1x?eSrGOHnebA#0nsqQ*-
z^rj?{xpce^O0HuOoDh9awkQGju*Y>|t8H`(k@GTxwO`m&n<R?fH&Y`#auCx2!Q-da
ztIc<95o?J;f}jz#us)ciTZ>^FX$;QiEcxH^<k4mY$$ZFXjz}($LgyQw?*_-+1J}}v
zsf+{-JTgrgQmo@D-npu<PV+JH5oBZChDzh99)_#MJcUin%_|uJ3mOb#2fZ#(xvh0A
z%<(<WsMe7Oz(E+<zvu^gPqh`18c9$nBkunITFj2&BDslD-*e|7oQ7QE(x>}Tg=3jf
zc8M@oZcn-TQsoPm;*iBB+6v09#D-}OQZ*e8J!%PWqg#JAM3s?Qj`4xHy}boi6Sqkv
z+zVyO56g-{a;!wYco<@U6Y1WBg5}BCjoRAD1d0M9l6hq$bo%0}E0Bzlvz5-~k35ch
zp4AzSSs@ojU9h<!RFjq?t_=!>4rP;u9Ax8<PkOY8Y?2ukH}k=1R~d;{j5n{+qrJOG
z)giaY10|H4mM8fP(ukjCN=YF=S(YviKdAPn{hnCk0vTbI<sU3-%MSeKpsKnSwjfE8
z;x?Hgbn^M+^*+2)gnmqZZMfefKhBvrW&V{STSw;ZiC!p(A82Vg`MrSmr$B_b4VQ7w
zB3^^n-krfFNf5xyY+6)uCRZOSrZ^b&rMXEh-JxPZz*h&;AEiYd#P4zTDXo8Yl5TU4
zn2%yR)RRdJQnjnku|^#hQI=wT>RZ%yxg6$LrSdJp2wo);?it<2cMSWAf#EU1_HrFn
zNpj`*B>E23I9HZj#}_U>xyPraM$oGujKD}@bI)@{^a~LQOyMPl(ST$7w37vfI+N*A
zA}hegcSm^{mNkrH$sLJ3$^591qb=mA0EHWuIp&_YncD4TMUbciV&PN{`1Lfp4G?B&
zqghf!coY?KQ<3=7T3GGCCOzfO(g*N>D$EvErhh%;D!YD2!(mH$k?%}4&RD@3?O9j-
zTc|iW`^)|mhha9e%vspsRAp3hDz&srDm3=wY<U<oTaO1nd)OaJywSXHM$VyBGh>Vw
z{{R|vmd0Jrfw{1)5+}{?fzq0G0<tJ7T1ec)K@6bdemi|ANSk|a``bI7gRml{@>+Ii
zkwb3zQwQ#kQ&K?*012Zzq6D}5Sncgaz=T^nn90F%q<!vbVzjq%Kn#ih04)<Z`MnRP
zHD)x8ol^?z>JG)=sO(AhrU&!4OEjuhGlJ>I1CD)Yy9)qVt)%;9%q$Wpf)Fq;eSOVI
z97ygVDTUed0(b!TqSiK<+SNj`tee(HJbpQ;Vi8Rf?vS*T5|KLaQ=b0-(xy$0!~V`D
ziS3&#zFFZ8G4J)Mn`5r&$OnO(atIwwC@P3m<Hj%s1`h6-rkT9E`0XWQ86*B$CJygU
zrAIcUSqd%Xo=-7H?+^Of4^4xn0O?PPD|rZlGLgAIyDY~i*BGYEEtL$5C`1kxNel6~
z@CUX}0D93Q7;XeYWw!-+S)<%g_H}N=`XADcVRDXW%o8@x_52ADr1`e`{e7y*f+tn8
zwsH`$c9o8HHah<R^{JMyMQt3`DmTnx%#3+_b|BW2c2^!kT~7j)AZ;kP1kmP-j4n`?
z3%jV+`EDWwq}U>Ohzv(_=qV$Rj5`HP$%QS9=iAz>TtLk$O}sLd1IrzctrqrDiCvm3
zkbtMlouk&S6Vz@YV;M$hwvrf<PIx)(T5#LCEJ(|^#!h+phaLTKP}|#(!6u012IcHB
zdy3VCQW!)^qvl_oit-8i*U;c5n$*Ii84NK={;pyMdU`OYeUX*7h@6r4SP$3fRuVmy
z?CTj`pl<$j_9&s6K*do(2RP@suYMARj&4_Ssz)M&xpxiR?HC8^QX-k%PUd_M-M3HW
zQm9`&6_<G+5)j~H-kThzNkT^Di9asUz^!8>wiAdOb{QXZ4!P}CEn|*EXqgZ14n9+j
zwF)|&?IUesnCI)#r$P~t%q3SCZO6SgR3jB~R<)U;1Tqp%9{}Z6n#E%tSOLQvb>&4h
zT!d5Q6=RT8w+rb}kis`rBQKF7{{V$&?X9~taYWIQ4j%_289j|EK#`KJiXDf~u;Vn?
zrjSSyI5W_wWf}bGQeh}!U}a)*cOFhVk7~|U8`+M?U{!@w6xkB7`Oib@54|`%VfQKX
zHVi5BALB>?W+ErRQJk>j@b{(}WGbws6lWbdH5~HpJ0f`6I8%DU?g$_WU%#y}Z;5ir
z9_;+1o|vSE4#8!DP>M-q2N?&rq>P}Oe1s?j1Z-p<tv_iLJ26^&rd`(a2y>NVBL1|i
zEZ$d_8w2I?81ibo@ylwDEz1bT+{e6}H$5sPmK+HPB*-y>{r;Ym<5e*<%c4?9+}|sG
z<I<Y)t1yl!RgUZ~Di)ZK#asdo22UoM)0SZp$bo}r%Euu4)q6z1n7MFSqsG?fJXCCw
z&47#m-IhJa(yPfdf)<6BcIP=Kj1NzGWS40c)RNj_cMJs}ekagWIU(Ggw{H_9Eg=j5
zh#yZ{j#(Vs8J0v28ze@&4`L}Lxt0`ZOfoAkDi@(1wM^=sd_Gl->+|Pv5%Z4V)blQa
zEToO6LepI+CEp+pH=4U=Z8oPnMQx?Yl|XVj9M*?}{vO?HxA59dC4V(}&wr<-eGTw)
z_Ii!PGhbUYry&w0UztceWcpX9g22|qOUTM~6|_9-;P=1{Ls^*KTv(GNpahVO#|O8)
zeOd5V_Ir-Oyq~Z}jRK53i;y$i*P#3+_)n*JUi4gEX{fKXI>aLi5sy=W(!CeMx)d6H
zz06`=tuA*-+pT>~IuM~xmM1J#<;=?75Aa2vhhrGFSj#J6<VD9$wb|*`7S^z<DBHB|
zAatyGFYI*d6w_8ilGtfb{HC2hjx3|JlFXg*C<B4>40jb?%IeYF)z0qi9Ua!JkjBmz
zu;F{w2EXHY?dM=zCzlvIO>tf#_>5aVbm0>pFU`<@jc_{0kD{7?vi-N_+*jso<J_9<
z!sT@<JGG$`u9nAfulz(v#EmV}A#9apJ^NPy;*W^>hm~<0OtGq{WtkhR9=vw0L&ZKZ
zxti_d)8jH*s%?qOV{;C*#%rE6iqa;MH~EOcjPtkaUr&R{qOEjtPZ86pwc~#rwcJ+_
zo2-EtGoU;uJ^rS=Z{knHdpO{d)U=AofX9hGR^!&Gd_?$}ZW?Q)l$=AeF$@p^KP&qB
zgYREH{6zSlcd5@UoL9qgr^;C3yYbk}9!ZAhoA<gSk;<iMa-z@0PmC62B#v8_5=e|8
z`Lc8G=qttVFK_jE67KtVnUja_k4kOr<>tS5t$2?64$~_UoO{!n#(Cyzcz3F*0$sW=
z_OHgXjN=iTS8|*8dLz1(IMa=hJ%yK^RB;iI<2`fruER{xS_N1}#_U38<>RTWtt(6q
zB7<u7_)tdX$R@iV4#Ra8eE2|$A&jz*p1eub<W@%Uk1;NrZf)%u)CYAZW(PU<t1WXK
zuw{@BFs^oI9Q#yd8PG=Ah!!Vk9R8I~<9w{}iE|)aha(vO02=cvR&mtoj1`LaSC>+Y
zhuA`ZFeM!isQ0GDY?53olEV1g_uIeHr-@@SD=PfW@~JJI#+>3PnMsmJ@YycME1yhu
zuPU{B?r#VeENo<!J<jp`$7xnfbL&^_?h-iPZ~$Xzke|}CA-QigR%rq(e=$C!_Tr{#
z<zQVG4y(BVUzhO}<W;=g&e(gq8t~sl;Wo?^qkOE5!0k|7Yp`7;lO@pdL;SK}f(YQB
zrBSuInoW|%6YmV*eea;DZuYg>!!8u{6GXfzu6Ipb)18f7P8L3I+5<)#=PTS)6KYD$
zvfAto$0AO<SJsx`Ni5AYk*0Qmh|>yBu=T1F%FR5JM`-aAg-}4wM_f~JM7cIy8j)uO
zw*j{*%6QMNKczYEuVGwV2+1Qch=EXj{<RB}r<mv18_feKF`uWkOKT3F79(k846+ti
zW4Hi$$LCXFb1}-6_d5;D@8ytu$U_j>`qY-7$K|4221Q-0Smp3KbKKLFVKBR4-GUr|
zded(WlxY+Y$PUg)&p9HEO1eX&l33JDGBXx@0yyLP(XnJK>N#W7H_OLi?^SK@!bn7*
zJH-5+;CkYwStAgF_b4{AIAS)3&!Fv9$}VJ2_N|d^AZ#Ollm~x$ltV4VW<)B)ef~HD
z(z7l#J9t=cl~tK|C(@>SsYH0T+{nq7Aaw?-lsSj1!w_egil|adayCHcsHR$6q>Y@G
z0kB4S1M5eaVYy2Y5pR?i$<NArXV$F6Y|z}QY8HpfBcvn(RP;HjO2WGkH<pDVlmLe!
zM&yrUQC`aaQMgFe<s;=e$2BR9V^1vxN}L=XgSX>R+-w1tJBH91k3~Pys^ipI1g*7X
z-b0Ll1~&1?_ov4^(IZ0v-pn{|K0*F991)dq3`oSU?>2%@Ju~#HF$@Kj6gJsDZZNp_
z6{KCs849}Fly_osN|4+FPo-Cxu4I&3T3Z%omkikBHFg;i7Ap5C^Nc2V&pk8Vr31=L
zqz#8|qztY<h*s%d!g`QgTS$_$_){{b*H%xwpncEQtfi2N0J%hye=%GRHUbC8exAPc
zkV|Nj2<KDf=WujxbKDwt+T)1{V4zCaDqB2u&2+(&WQk(a*ha}5E%$MO{2%RmRF7}v
z0dAXc$Ch5)b<IKc-z=0s?ecDS9IKD+(?tGKqc~iog@|sz_BFE9cSWnIlJ(LVNNC|u
z3ju(8QcpUt%S!C1KX%#V_Nwi3C6Q%;0eo&;k6xn`#WO=GlwBiXbGL8ZG|~=Y%vUXL
z<q&_YQVw|sG{Sci2pgXq0(;a}=#mtI+%nAWP77yoK7y<myr&Sd?2u&{i*=!(yBzm-
zAfK}+MU`+wiat}0N4M6ZmPbD{M6_tRJpI$$ijv>=iS}rK1z#k{GEcQWOLTdHl6Qs6
z3}6pR%1IPbX<9t_lYPOz<sZ(WTb7ka&Q(rM(7XfdR?8p(*B~=(Y>vL!s<#YGhBrqM
zs^&Fb?c5sXlrF@?b!TwXpkwO1el-}gjmcu4F+6<K;VPF@aka1u9P^5NH!TxpNQckB
zR_*UtP7MNgBx`hyeA0Zpea2?w`yc3O@p%!vdt@R-eh~WOtwr{@<9|7#^Arp=!}`@<
zwuz)D5>2cQAEqlGX4qXLN@le|wPjLAAPPZw6cQ<9-7lH);Pe>lSx{;Yr3AxZ#w0`6
zZ)2KKaeoffSa<SDk_S%NH7=clothHr5f<AUfYAc`GmZ~)P$k=3%On7(P@s~-sq_cd
zqqz$+2aQZ<a1QQEanIqJg@ee-X3CXpN3?N_ed?Y?VL3Kj7w<HRJfMdF43WpN_oy28
z%q<8dina;pDhObJ0U?)jESZQao(J`$nr|UUW{d|IV*Lj>{OD0a=3_2IK_6}qP4ezz
zkXx_eN|!riF6hqfgkYa2Tz4Lo9Hs4>ZuOHquF=Ln8faHg$dZN_42oALp1*}?m5I4&
zT@E52f1ViR5$I|=w0Mv-SRu#m#(2+sQHPO6#6Kay0CGho(IV_DYnXyBmZg4WZvOyE
zuA*+}iCRxMh3XUn<#_s3w$QE2s}#~AZsCaIk<ezV+gY@pY__sULcSzPA1dEZN}V5K
zEO9cbnK<4#&#3%G1d}h7EJEGTrr8NB2h2bE)X81Z@gYV#zIIW7gWjIe&m(zoN&+JT
zI;!QIdIR;S-qu*~kwOmQ*+%4(QFxW_SZQeki-nN+i2nfV7w)p3;UlLVL8u|rqtlDc
z0}KLu;hvoG!mX?_JWA1nziC!neZ%YTMV^|I-AgJ&j>?#GoPHouZ4F-I(n+pyd6Y59
z%DidOeJNwMR!z46I%g~taL3cyq>&<mC5$jB8Ob@uPoS%Au%F$)LL6=i=aK7KIX;Gp
zC1s9Pz}&p9(~+J%DUsNDj-}<^gR+jN>)Nl`Tcw^p&cM5pBNCkQd-GDv(7>f4gUu_!
zR69er*RZMPWpbjY_DZk{(U3!&w_XoyP%LehP?5&l6#SBB<vyT_)hQH6fhG(H$N*rE
z@u(+~9sA+OZR*^NdWt#QA1q40V~mD>EC$a5pvSFA2ap#YPndUnr2xS7H0QciRa12y
z;nO4L$EQlJjXM_#3dF;62-lvyeTRBiW3oi(Ezw9<M#(rJV-!k}g)Ea`x5_dJIQ7T%
zsAIbOPSa~An7JW>NB8@2=}8HSOPLG~=-WV$N^`XPdQ#{z%rkjFm5eY}`+;+j{xz+q
zME3`Om;*7$2dMTngtrL<pp|0IHlq)_yVL7kCXnA~wpb_FqA|IE<C;k>Z9%&sFD|3E
zhspCJa(FSQ!zup&3d@>M)5jEv<v1Dg^OGm}>sPOuDH*QX6?9eFIl&(O^_>-+)QlaI
ze%Afg&NERrb~x-v7=RC!K<ak$$E_o_L1x%_%Qh*VK(%=$npTXuV5vM(B=Ct3nI=57
z17ICRMx~C5MOO0(B#*o4^#Z07Fb8SnI_(_i-l(Bt=d!EjMcPW^AZNFwK3k|GMU7{`
zRlopp=M>UxE|GRsA$Gz-?@@x?7?IG@G|T(EMCIMeDv#m7>P1kOP*E&PJlJ*^k39zz
zf?4JvB5?~lVI^UapTezEWb>myZk1UfXxcU6QbrH|09v7YxXL4$6?T#(IL6>QW~zw_
zT%>Clcj0gk4ejsss?T>YA!FIRz6!`b==8;D8g9foh`#q{Yc#Sb7|Kjnh4;YgOqT89
z33m4?WD<O*p1A9eO3s>T5oDdwkpd05=<S}B0?hD8tt{e1{{WVYwEVu{{{TwXG?OLN
zW`pW`WM(obB>wa$;d|32*Pn4`VB`*%#(gUm;yHs%lU}5e6V@@vC%?T)cS*IpwKMHI
zi98tkZXT7dvw|}AjIn#F#pDSJI<vOcVEG>0RBbtScx4V5qRTdT3+e?_mfKOAQi=;3
zAkoObyp@j#2UF@zUy97CVPhkZRoLVP9sdCO)bvPKZQP{LvGUu^WSTw%(PSix*?{ft
z4?|Ej*juA&Z<V~!xb9L3BeiN>=`+sa-r8cDz;=`l6n7t5r!*aY*cFkSDoTlteLos{
zGFq{naV%0N+Ge>i`7T-0b~yTb_N9ttzMeyG0otKUl{^4CeQLqBjLPs$Za1EC$L^0q
z>V2xnvI(-<bwtiLI2ci$^b>2Cmzq&BNRI(lC>d8LB%aloJ&dzqT^c5g;j`5KBD#5O
zLlGNW%l3dy8-L#)!dK8$JGi2OM2%+79m@GH!xB5^u&pCeq9qHQ;nT|btqEdA2|_+*
z_8#=I+p|Wn!ic+0=aE+=4|7^=ZyKl*7Qi`(F~JS>9cl}ROhChiX<9#-<8P3!U(&i1
z+c9xS%aYv_bn6gh9Sd?ZRjy-=Wyjg_?m=co`9Spov}TNX(L?2sT;*4ws-w&&dqUY+
zGQ<Ia?ezDpV#sRc83b`Y?>ppEnA{Q$d(`F5_9eFuEO~K-#@6-sCX!gySIEHS$@vc;
znry~MZg)a66GQ-ZAH+KT6?>Dhav38;7=JJ1EsS*a9+|1**3~3SsG|Wg6%Y)PN3XYf
z#?JN-qrToUcXOYuJ?GdIGO`pW5%&Yv@ukR^)S5agD~Dt;uz#B}N6!tD_g5W$m3RAC
z6>lwC9m8NQK2~gW_O4btz^Vz6qQf60cM!n(kMXIX)N<uym6#4ZrX3HjwPfh4nkt87
zYpWGcnS6k%8KQHZd*kcYuiNSjvK_JPjyS<oI438o6I?~Ms=`82-bReZ5C?3S&#haF
zUXC~lPK@E3Y*;wm>z``P(JnPn+e3b2No52iA^=RJ{nMXb^?KIo8)*R8KqtRMvVHWA
zD<E=7_r-A%c!ot}xtdQdAa=A^<EOP~#jh)}#Qy*)C<ktGagL(1l^dGIsyjEHAKbK;
zQJ^F_kZ1RU9V*A$tk5j!CidNxiC^z~R~u`s#WVuu29d{@N^_78Opj{Ohg)L_f+B#q
zA>6MipHF(p&}h@zqo|rl;#80}+_pk@2h)m*M*&#nwySPtEsCk9U#mu;6rsiuha~=e
z>S7Qo+sy+x$tP=YbL&k;!ORmpg<jZP1^Kv_Zy<a6(@V&z$rSO(_#l8dKK|7l(}hEs
zK~~Cz1Lpcs6tTO<1f^pw(Fp2$<n|u*vPMo<EW{%RVz%eU%NS#jef_FU{$pXcBje`B
zO!oQ;f;J4L00RV&M<?^C0;Hel^W=G>heMB`C$(Bgo9IZg?180e6fQ_|++gOQl3Yv{
zEvL*l3DfIPTwY5Ys<EtK1A!de{Xzc#8i6FW4)V`*%#PSaUNGO#R<Vf<mZP0Oa<Y(%
z!+(Wbj1^X%+>{|e^7HqP{{UX2fu16*EFqRP8Oq==JwCLeNg>$9)H~!Z?u|eW1*UOq
z(E^NfA_0d{=}KprRbw)c%zt*W44x`C3+1#@Lg<?hnIYiw*YKo&E>?-AB$Q8)!)F8A
z>L>x*gJ6^=ocz6hzSP3bvj`<5Jg4N4^jcWtjlxSTY^qPm$Q#e0roWvW42a4Gc`Pyk
zH7%joXWj&b%Vz@|W}XqTB8c1ooVt&@^`|^4Tgol96ar)?0lj{Lk0yPhNRf)~<o0i+
zAh6aJ!{t{Z6ilj~ulUgrX+rHrEf70LLW9x1p0z4QW@3^6s(*-{GwD;Uui6P#w2{Lo
zSvEESUsLT$=yqfg+X4*Azq{L#N8RiFY4F0(OS$4!W#z#8rF#GmLsnz8g^))T%wbiq
zR1!|#QT`QnD<S}jD2u9cjH4y<O>R3JhlsQoZf&NKV^JX;Uy?cLUSr~q2i}<{od(eh
z=gaQL+tR)6<4H-P{piC2LvH6I(;l^jb>aOy$t8`{88S!n$gBK0=+)hZ#7c>cS}JJp
z3yltIc=Ii*p=Kiz4uh!Ay=2W1QI0@XJCv_K{;KzVPvH#u%Cwd!`3r!g5>9#$YlZPo
z!i{H4SvKI6J7ifG=Hs<{FvZfSk2-W`2dThBn`I@zLIzr;w4BE`nyyvB<+o&Qs~5U$
z&7`Wg3zCQA$mbsZwOI=xWlLOlCyXEPt*v7w%UfldIb>$x@Td<!X|9TgYrfad3QjOZ
z5j2rXlNmT%71}%c)S9^#aIBC>Bn+X8Y{?9I)~X4|nXQcPt%#yzK;lPi5tRh>Ip7+a
z*8U`(V)E^6fRIlFj^4tlqbBgL!mDm^)Z^4tvaVr@S>P(A&s=ovlTg%cWQx??)3wRN
zEOuye>RJex^<mWFzJ~pjwS5Cjy|~q$IUfC-ZH{hK0oSkdubDhOZ9b=c6dHY`vP-z(
z5pv!84uZXp!5VI(;cWtM5o;67jTB^{5tJj>it@3Mk3&jww6#8(@n6JW4A{jcxjwH1
z*IP)pKyX8Uv^x*yUN5is^|jqiuH%|454^D)svlpeuMzP#jkSr(>W<SPxopJ}+!9Vb
zNATy;pQL!=?kJXTvW?73I>s<a?rV`@B>m=X8txA0_MIm32DeD9x9twkFf4F@_a2{0
z*4=Gz&&f8<i;)}h{jv{lrFl-5@dy}ye%@qrMp={*wngoXbsnO+Z70Wes_OQ)kx0H)
zWs!R~d;|AIbJW9Xc2UNpwL9BH1si-tlK~OSbH{(D^Q%h@^KEv#fB=4A@naxYJEr)r
zPg{8Axs~G%*j8RcFR!(FcZNP1rmd$YxjoSGTmx>ibSK>Ud)J*>l&QUsLKuimUgswr
zoN<q|EYZI^n+H2V{WDJ%AG;*P${3xeJc{b|KL*36%w>)QQa=1>IM4W2T$W242#XT?
zuv8zrT+Uq?(HlxPMoU_RQWOO(_XkoBy-t>~6Te^|DDxNJ+O5TA`<YG&ZbM_Y^r>z1
z_|e3+&%Gi!Sl6!Z=iZZ)N>Pyoos9DQ>kjY+?1kVc^{E=x;nn1d4dn(-)!}PGJv{DY
zxR3(L$^ncF^dNPiEmiX{P6Cm^`^)cHIU6W5Iz2I@kqSm+L_6735!;YQdbciz588~7
zp(TI_j&e!IBiL4zrLv(Cg-}#{t^7<qD(cup0>?DOe|@3@=G)gb4ZD_+&OxVJvm1%m
z%7`w=!5BNoP-_EO@t&2VxQIlA4rGx=Hv3|zd{FqCYo=;UQHt6mX9Wlio_VjF{B!Yt
zUDhTrX%`9=n1+=G26Oj@dRKNI2P(R=hY^g0Ef(jl_|M}elV=pueWWvhS`(b)`eMAN
zUijarYDnVJ+DO@>WeF>8P=60v;w8AdD$8|t?<<_=dF1;Fgo0ei^6l8a>fL+y&%Ju|
zu&}0)<W|PjsLNNnuAzSzYpdrVf@BQGY4`fn45R?WZa{uz?mrqu*iX)PAsE7%mNh#@
z<{a=>*1A$jSsZP*xE;U@NHDzNM=j_xO){#t2evut4LO`62Z~X+XM#9i!`7Nl%A|k@
z9FRC7n1%;9CPq>RamO^Um=;aaM$Q|k4UTCtrJ2-?ynLgt=R*Rdxgedq4ECT0#}Yh=
zxSgzUTc4NSpAle24(~0A;BmpIOnXR>xdHfZo1emz6)Aw(Ku$B-fGkA&36QAekIDuz
zd(@F6LoQ`t&GPNr!4+G~EV&aX0fsWU{OVB8<}p^>>Op>ZQSK-K=2N#SSg<8r=Yq7!
z9KX$geqWJT@DI5Dw2qSbZSyMtHxdsFJ*ZfiT@OA3%zr8DPo)4xWeA>Q0(+JI^LNLf
zppXdOtVVupaY#(Zhg>n>ARN*+8|000+eY9{bL>4R0zvaJ5y%ck6yl<k`6J7FwGI#7
zBfs>Zi3!UoMHnrfq<T_IFmgieVBaeMKbfEhyF5{tPs*-xxER6pr?uFLOwAI8*a7F|
zEI*76-%nbJ_gYMWh;m2Bz+_SxqjY3fKti3tm#ClwX_w0(x$CvZ1DY9$Z=F<tK4Lo$
zT8v1cm7|e4ZZb1Sj28fPB!Z)<6ag@fA18cF%&JLp8>gY5NU^dI%gH@PbHySC1dR0<
zDeLTMa@zs`3MnO*9Oi%|MorPEbqSDJ7<|v`ijGN;2RjCH^0OY^hMLy$981c%>IwU&
z+KtP#M5B$wWUnCipb3t}`6ZAXfC*l!QM_vt4f19)%aD6}Q<g;xg_M2nHlCyU(^PqE
z%IpgTCq0xOY5-7HGKI#_#{iR@k9t%RyM@{Vsmhbn6owTzRhT-b&Tx1Fkd<B}d}L%}
zjEVqODkBjoVgW3m_0M`tgD5YRa@ioB2=}9wQIfbH#MI!sK24;yImyW*+JGcyX+C$G
z%tc^YHOSrV#W90K?9r*uRSYsmv8M+ls3#r%QPbL-iXGJqML;{Gk&kbGK~CTx1bp%-
z!B7ZMj0$o~F>)}ilmUTG-&%|ZDkXMS1+p1W1bS21AQB--2?vIajv0M%PU5g^R4N!B
zyN+A7DHW8mw4uOJlG(t=r7Ub^N0ZCTDaJdHKbfQ<+%hVV%rK$HA4)D35wOrSvJKo2
z9Q9G#>V4=?ZQ|e(S1pztwKb!cA82+3xKn|Er_&Ve^D}Ip<sWs=11H<ki;3<5n5%rg
zSz+@gJ5!7XJ7W^cWK!ArbAn9>k0&wPvnW42fQ&D-GzDpQN=hp8y^jOer59ikv4SxF
z0KEZnrPT5bJ}IFxMig#t1C8B&zvE1{M|ON&B!g+?M+2YK(_?VbF7*MklB0sd+JGlX
z7j7AH4o2Mk!~X!UPiFbho;IDJH$XiP_|!2lbPkF~Bn*s^QnT$KycuQA27dh@8p$NU
z`M?F<M+2Nx@uuR7g(^-0_svAA8bgIS+78j$o{m;BO~1{Z%ahiSB4#o)ZFa=8$k-u%
zU7&H&wY(KLZB|ulrii)%(KpSXTpro$SrK8>DQ~}=eSIre!==U4N<(4YLa<N@9P^)A
zik|}?Q}mnu3CDG*&!g#rW>FhMx;5MP(>3=u#$VXy;rHz~@OJM{o5S`JUCVA$$(kM8
zW!iAVA9V5$1bcR`&oB5VM~Ni1wOb@+Ws2`=KJWE>{m-X*{crdIs*|8Y6NT905|!XL
z*1iW4>R_`TWvkrQ5K^Zk&*$6r+Wm%pB7V(&GrX|6urk;QfJ?oH3O46xIQhDJ`{M^6
zILQ!#<%Ei3BcWyQ?mJiX{rg~k#vczqY3~GFSZbO~DR9A=9K^0w$UicII`tml{x$er
z`+ENX!8&|z`#N~C>fq?tBTtpVg8npP26A{Os^oOf(~MWx;BoZvw9{MlGUb&$Bz&6x
z0K5RV0G>!4XbQ~bwwx;NYz~5?)HK_@GEkSxDlv9djIIs`Q}m{6SdJ9=iufwX*%|aT
z+?hf=7>G#fO1a@d#~!rgAQ0B@9e|J+^R)NtQZu81U<}wyGc)HN)dvBJWU7Vvvbg~F
zs?ms+M2_AeELq9PT%70E@S-b)556Er87NIdB&I~m$^dQ^fW|3NlyI+*Jv-F2fVlSp
z<+5<B;3~$LA2)2&QJJFiKGJae2xyO{YAyVnr_4tKy*XMi<r+cA1QSvOk0g;Gc?tOr
za?8^`l{flaahM%J5)YRP%J&C7st9F?XO4DV{{T1-p6m3hUum4gE$+#0otQ4%WBiH$
zu?z<C<Lu`7E#*`U9FhmHBy{7N5Vf)i?Cu*bN(NKP_ayoXg(e#f!^ZL~U+SWaVD9uM
zztXM?yGONRWAbGX{Lv0WbmQw(oq&*Q+RDY}*i9pdmoFS{LbCL!6UF{7g5ls@bTVAW
zmWorjqW=JQ(?0c<Zp@Myj0{SSRNw|4m=wn<vHhM^Y>4u+6YKmWRdc(Q%`WEm{3QC5
zH`)_0Hozo>kI#|(K-H}$TLC`AZ1;VlLRo_h#7`yj*jFO6-aD#Y+B*ma;MpgRm1@&d
zh@-_Ejfo?|ka3S+!nBQMo}tXn;?!EaO38T;VC17YB|-lH>(f#jqh%%asMr!lV)4XC
zBp%g^rue$fIUu;WjD&?ey^I0gdIM5T<0<W|9th_=7HIZ;(#N?q(x(QE9HV2Rv+-Q|
zCA5=jPaO7g#g?|22J*wQvFK|jSpLtrv5N91YjT-*ATRSaPa%l(9qSdfNanbTYlFEE
z2_$j}RX^RwdP_Y~WJtrhM6V-xk15XPJwAe?-ETuFyM&K#Ey#O&$mDQ$^0+8**!ufa
zaen69q}IsaE0~ejpK^c4(zY}S^y@e#wx3UFRn(T3Vv)F<_Z(uV-G2U2c>oMho!A^M
zJ0D7h%w5s?2mb&Bs{N{G)NR}0ZojEKH<q@lmNyp{8Ev~rRxO<JK^Z=oudnST)cifI
zJ+`NJad_89dhc!*Jm;V1UyR=f{v~UF47_7u@fOB5OPfhbO)70r(c~S4bAUJ>H();+
z{d)Ls<Lw*cAHq#L#X3ySB+}Z669nWo0m1(O3i<4HI+W`<bYyb&JKauuEy-mizWA=w
zB&pAqd*pwd)>XcTYouzT&BF^jge-<02+yTj_;G!2;@fqyxwi7JS;7K;fQ|_KYZKy@
zsQwYxqqmA_(-VM0CRcCqW7PY0>s(ToGPv!1k1hDKYpi@M)}+*BhB<9yn3P5w`tCL9
z9}hfbrug^4vCh`e13n{?FhK(zqN#jm@Sc_NW55oOtdrbB7WHUchrs?42VbRl@9f9o
z&k*=S#n=84@grNb339>)-@^cY@$@~7VeH>6(Xvme;Gedy!$$DG#0%Y43nxf3BSgs%
zC<*6pxyLo}-;8`cs%h5msa`@5qiqr>&zeslXV6#cukA75j|=#p!m9GJGu~W)5DnSS
zP<=hC;h)<V-~jN)f#$x^;+17t%ff|vpcx~c=Dkb~Em=Zank21b<ijfOkphNbqbNEP
z=}NQ7X}aD9*(|C1!yw!hdW>eP8QMt<f>m4&<L`Yb@iRJ!t=(I12RxegNF)<l2ni6$
zET}RiN5&ZT$F)3&@V9piL~7qY)*$EG(xA2svjVxv<wzON(u9`^WH4p2Ktgf&)3}-}
z2RDku5=MC~)Gxg(aqJC#TtAcku_Y$}4u>B8f{|Ns6H6*@BdhVadsMJ&nCveCuo+V4
zj8Sk&AtgZ53CgJjxiN64eE=0}!`>X$yhW)UKTooG*!+R^{HhN@^{vl`e+>Lf@h4YJ
z8%onyH1Y(Iqrlh>dS|)E9jou(*=P1C(LNem+v=Vnl`h^16}*`ja2$Qs&))nio~|m5
z4~>bok30R6e_<<mZY?}t<J~;@_R%ZD1i+L=BZKXc`PbZj5%9K=;Y$c?^h*SRExur?
zpmIkb0nlcfrd!%+(WG%)tWxefNsISvdng0$@tk%C6{QMIb7khn%0oze$iTy#b<eeU
z7@S1w%JLFg+}O2j#McoFDso8enzIeWX>hP2l8iE2b_$xIWhi~h@)QieDvpeM3Vbbg
zE>_}3PDa-Sc*Sz*a?!bKB1?ry0*O9XV%-3#WRcY|ZjQ>wD&S-%y;hFS?%K_60*@wK
z<0F^#0<Ot%Ayl)6_h^U%0=X@o^wos!Td}z<5xBOHE&;(|#z(KUYFgY}FO@NLc~oVY
zMisp)8rj1*j(EZkGiC=F&tq4i^JBIR8twvek|_TGmPkAM)h33KwQkJL3vDbxE(i1#
zcG~9#KQyYZY>xGmhB0v(p~%2xML2GKO<cEk@`|Zm0}=A`^%YXp0jq0qa<94Zfyxz5
zzSVNl_HDsPR#ha2RRHJH{{XL8*3u|JAv{LAnalLa?^+8qart3mVJ6ZGXMzuLSi7cD
zNYz`3HZ!kQ1e}gVUA1!T0^l~^n4e0;j_1o&mTQGAjiBQP6{5<K+Z(U71!i0b!0Syk
z4Hu!2#AnHmAaWVKf5xoZyg<gy2w9zu5ucSm(x}06CCUj^Qz$TYj0}A$c%q6~mPS7@
z;D1^jni{#QWpuGh@GxM3auo72?N+V4<x;as7`VtPF|w#eZ7t#sUvD40XKsS7Ld(5>
zcIEMaLEwAhvTY5TF-U{~BlF*H8LLp9Llyae>ASbmsoQ113gaYv+3i!N88-d|_cbPE
z`)OH0D&Hv|Fg-C=AUjG9z>-dCjCqWNWB>!oo}_wJh^`hkGCCJ+fNck$q`<is&V^!;
zesP6zcm|&xp764>0^sz=2OiYO)mkuE0uMzUs@Pqqp`c~i)w9;6-Kz~d9CyUOfWHs^
zC|Jp+c%MLuZQ$+^e(i`ogDwa@m^Jc$#xM9MMedNYN#Kbcqqe(gS}D%`(H@Do_vkW7
zCmn0<?LyIP<XIq@O0XMOIXTBUG}5qNGs5x22H%=DOz!^x8s@8or&m_B@;wYTV_y#U
z(ENt+7r=iIcxvwAeQ!Znk_mrt5mL;Iat=7a$UR4?thVq%>GzNOpDaifZD605X8taF
z0qb9?UlM<3Uj=+biRU)3+svZ?qV!|@{+~+uhvLWVed0d{Ts_EzF0GN-mUT=3zN&lv
zI5pwoGRp9llF<4LK50s-vs#}g9}LFQNF%n~BVXP!uR+}7xv8S?HO-yDzQp$%Pyl0G
zg1xa`>2L6BRE?H9>re!Q?GY~AfA#A9kHWYt0fCj;7hDx5?jLj9*AKBt+05?t{Zb<E
z{{V^p9qam6k*-YkLD0Fk$PULGDD@_|jbFspn&hl(EM&8_u#v*t$=@B%xA<4bmp`^`
zu8_@f7PlN?Bv~$DlxL1cP@Y%m^sX!7xBL_*T=7aLhde3fww{Efb6Tm3%{+p{oD=mu
zewFu-$)Sdll4ryHVs%xIbN!`0H~3@2>n@pXcMhR<Jb$@cR{?F$t7F&FzA^aI;`H&1
z_xhFMyli6FknSWX@AL<#to!YL-W@V)?NZu!E?0Mx4ZP)yYEK!@-Y37WZk2)JeL{QU
zMaAG!EyF58yuN!e>5ld4VQET?uX0*)TAU<tDiX^3fjncU<5Mo+xLDaq1z&LK?kdiw
z9lUL|pKjrn0AN)%a&Qg6107F#^^>|9(Uv22R3#)`q+o_0Hy-_|?<8@$%&@uI!M3|(
z3W_MijwJ(e+kye$eQC&Jxc%vooM-1C^Yj9xq)>ualsjZIK1Krmlp{#2j*=B(2$Ubt
zQnaWFyhWmuJa0J|{{R|}VHP~X-!L2|e)TXUB>6is0b_(}Z<iXxOEAKm{Kt}gDp=!>
z?4N0AkyLhL$j@qy;@zzoOzZcQ6aeQrq<{csZQ;Q=#tEd1xEUy<jxpMhV|w|i%8mk_
zaDSa5>?dT3a^9cLs0nwxT~us;l#;m~xT0C2lq^zUC_9)S9cmdKHYXdoz-$hbENdGE
zbpQeLeAy&=iU6C;z;7*>FgzhVW7q3JxDY<oV0Uq_u5s#qw7^*vWR51lY@<IQpYRmB
zL~hX;p<v8B=@fJx*%_r_+_3D;YD!7v#;^OyO5u;7%^%th@_7-?h_SEk-^%|0SWi)(
zN~)L+tubR5Z}oe+k4(}>x<Kg)u^plZl>^k#WEW)e-I>crwL+;}kf30CQ{!|6ne2SU
zbJZJeJ?grn%_)jC4KMJHpZ>aViL!z@SMPKL?k)ZlST4uU5iv21ob#3|_p$6KV{EgM
zAeCb(Jj4?G#AC0wtw)IqZ$v5x!Ig(o+zM++lxJdhNH(z?VMlN~^rveD^(@HGI{yA9
zcTvoM;hizx=sVLb%l(xjibYj<TX=p-fzve+kslGpn~r{cr;?OT(WDD1%%$1LDx>{c
zk6%+t!?`z}f!WKU3<gLT{4q{>Jm8{74VJ-0;D86MS4CjnYzmU9kXl9PpIp+$N<P+!
zk2wgZ1kqup%MZC%dPTMge|8ndPVW5E1DN9Z6YnuynB{Tan{68jfpEifZ7Mn14{`5G
zrYPfSvc@%HcDc!6pIlHevPL9E9%?xNl2<rU>Gi2o&YA&sTXq-AS1Z_drrau-LMoWm
zuv!fAryY$pCIf6{PI7jsJ#+2&P~Lz^i6E74XXkg^L>zJL(vbji3(C?A?rn>YFVjA>
z?Xku;La!O!$tNX#p7hse1TmB`<Aq#imB4DFV9xLR*&Odv{2+8AwMw$7Ati*!gdZv}
z0K<35_ok7x+7eVGiTlPp?dP}nQ+%NI%?irKToQ~k^N;8#U`!EwlO4smNRl#FC+7V7
z(+dX(yHu);%d~M#G8K>Q3`qoSWycxr1u4&%5fFz29#7o{qzM`c3Z>$-fTM4blw>cV
z_Mx0eqwP|!nB<VEFc^Abn-uPovI%h51%q^zeW~UAn10X~cH%-HT;O{9Pz1hPNrZ_@
zF*rm$K|b^}meMxJ;gUeWM&r!Kmj3|W&!@FCB-a@7p=Us$gANGelS^q7ck_s>*_qBa
z;PLqTd(mJbB?1Wiw<wNTSzGTh_o2v){G^pUx2o~poUX4jG<%r@g=7Pw`}0qR-cl0g
zI2iorXpwWf2c|tJ3lNDB3@rl6%pC7>cwk2ydQ;+d%A`^ODU$(+7$o#sn%=_V;y||7
z3i7+1(K-@Gr6fsoqC0~I!m|?IY+&FHxD*b=ZjL~T(lV15A@j&T;fj;VXr&TIZcfZ?
z`9a9;dF#zMX*aM$ZzsZAnKwin5NB@c4{TJPUc!o{fH=w#%Kko-wi-k>@E<Z#E&?It
zw+xWgU|Pl)3u2?>23BL1Cmp>8X_DU}U!-EtG7uEDdynG!RFM{r8E*{HfZr+H4(4;y
z=(P^xL+&kYWri~pGeqN~2kXaNdQ(yu?xOom)4Hf7SVVcq?ma0kZl;W@x*stiP*{(Y
z<EDM81h~15Lp1K7$^bhC0}iBPwGoT3Hjyl-BZN-aF)l#|?;m;#?PZO(4WyM;IoVYW
z>LP<2iyFqvPnb7u&uWFHRe_9BWmoTD9-j4TB)KGBw7$38*3qe0QMXOI83gwqrBS`q
z)@az=DBP@e7<d4GQ&ny*=b6EoHpd#_R1SX<I@Fpjm8^J+Sc^{4t!8_fSSrU1CC=0Q
zSRR$EDLF|ct7dMYcf<M?wc`uebZrK~*`7kAu_T5)&!v6m`xAb}F!)-^)5RVovxZx%
zpghHRj{J_^!jtwV{f6|dKTn6nn&q$WAt1^NW#@jF_8!&tu9yD+2)}{!)zje9?q2mG
z0@+^x2JA8EUsHp@Lj@jbYd828N}H+gOJK6lG@k|OgvoPkZw@?|(U0!ewgBpVs#|>$
z`(M2;KC^HZG{Q3<^@RIUcy~qBb-CoZo)0o+lO{WXfQo;+j<xApe}-*rY_{7?0=#jC
zRRbh9v96~pJF}>-r)jWgcF;(cah3AMQ*S$f>U}E3#mZ_@MGb%fPDQ~zkD#VQX{qYc
z1dPUHCu^R7sP?XjG}q8oCP?FjfCPsb2D6;?^BP4v9Uc!4+LI-)4V~CMKt2Ao4En9M
zxQ(a9Dn#3}y~hI`fBkhO_P43(FS_R08v`T-<N?@v)_v}yrP|qvtt?tNcb1#YZhgnF
zr3g+^*Ks`%+s8K7LO2)*W?#J{XD#RtYRd6fj4Zq@Buz9THedwBj|@HQKjI(6O%ua*
z2kkS6?VdJtcX7bSZ+iG=_O<=DzpyRuv>yuVF={e0fQTml08q!VKDe(!FsFy7?JDfL
z3f)=iU$m#~o8j+=aNS4!pr2`xn`YO@E7?e|&!3C`033XI@t<3s?_1O)Ygd<gTieRO
zWE_K^r)tIVZ;1838R~!9o+7)JSx?QfNi%?doff(dV9P}!kOM2DeZlWu9yc(nij|YJ
zdk*q?6o0U;CYx>N$@{f-Sr>6Bjt9MN>E0R^n;F-V`2~0kJADOdSy)39ghmd~s#P<V
z!5+1>r)ZIGiU&r^7G?#wT>96T<$Z>uZOqL#O9>eAPQqm*ETeL__*U+P;q{FrF~!J`
zw5uy*f=}|TJugHP9ifq%XU`grp82h~?5&^xwgP!rnnqle1Nql9q*62Ov~RL`aebJS
zer1rb`8dcU{3=!uq-w!hJ+c;O`g9}St=%=1u`-a(HiKwXpP5fw=CSWDJjqK&-dU67
z1e|~erA5Xq#KLC+`b06g!=PL+L;OVdtc#1J5fbwgf>ewWN{*b<HBClH<R;1oX$jh7
zbDi9Jb`_6#tVwVU%(1c<(=O3tXgxDWGC<2$Gnj6Sg`CdOg;>saWBb0<nKkQ02$hmV
zF>b(+ih^BOnNcAoS&L-~o`<$irB$B(NNx<acd*Lj10+uu0lV?rG%09FVBOmiw?0P5
zWEfc3WbW>G>s0P<qM2SuC0QA9=B9DEM+0xCH3jA1g#Do}QDK;Dh@zj}xA6h=JXA6h
zBZrsg^3)L7>OD<Mm4xocdDd}BZ5#;E$Sw<985?%xBjp74!K#mRQYLF#rB{*mi-13N
z$2|wVC^ryYETZWQkIQ9#RnKB6kc(?`11e)OouW~ZyVMTU)R8u0q`HZ2R!IZA&b?*(
zqygX3qPn|SrAur3fCH#uG)t04rhNqv!EnzoWD@0fEP45e&nM|Yl3Dzxia63Kq}wqO
zgS05<2Vt6ONr+P;xFM%ySINK~Nbga}Jkm(7cLZv|K0pRCdS@b>%+Xy%xuP*j;x=Q*
zRy_gq2A;O_Lbl0vQ6ssL))otqk^VGuSO_hy^($c=#j?hiD9ltC!wh<Wc+NZasUukU
zjV;Rua?F9T&r_4wQpDmVNtsZI8Ixe-s}7+0QoY0?+Cv&+G5KZ_&zLjG_NDCrY_^-C
z^T}CbcKyoa;UB(#3SqU92wuZ;DLgWv+H=?Nq>f?8SyOAoVz{?t-TS{$+cbTmL}=t$
z6}+~`-T9qy-}-l?=GY5y<v@~~OQkX;xGJm(3QuG2Lb<b$?~5NG>bwGZ$<OCagn6wT
zaxjf|oQKYRvPCiw@G(}HOSqlfWk~cH?Ms*o7$Q>gznSJ>L}N??>T&H#vPmK>tO|;*
zFmSnIe!Z#(lk74j#l587N-!k(nJ97An!C0l$jS=2F5qza>Gb+i<^tuN!VmbBMGnav
z6A^RJlhB&BE+Sp?mfN|4I46M1=qo<f%1It5rCAn7$XVIGUA?NstPgQ+(nQjuZTSSF
zJ4iS={{R|JL)DrV_s<y@Q$%(NaEBx1By}~>THV|v!7i6$@Cvfypz13M(%CL1Yj?Mk
zXO;WK>KJ;D^TljgLnXQ-O>!72ZiMXJ&-Y0_gS}-|T+p#eS(?_;v{Ech8{@7Kwu7GJ
z*0r3TN8E-{2w&Z}JF<DsYZAfKsVxMdQFk`s$>#*)(ym1<vqtG~&l8s$9VY5~aoW7P
zio-5n+?SA*Aj`KQTcPw7iE|aXPqjlP*CdHD#O(vH6?*qlww5n3m6V3tv~!c{eXA<^
z;h%h$8)J-fA?P-a{=%X$a%0rWy0mMV1(>!4OOnh}f;}_T6IgnKPZF`7;Xy-~;Sl9U
zI(`_dTBf0UG6m95>{3fi&GN{npdXc1ztsVB(;X5C7!e_p1hSEyJu9LxXhkWuMSTM_
zu``(!l%V-kk(?3zDi0#!;wHMdWh)$v7HANF%uhl)R62{t<#}>JDj4Js<_5;r?TTwo
z%V|7C@JPujae>ECT?#J2anV}IwW7-Wq~|BO_w7*J?TD`R`9cx4F@{1q{{Z^wC6X|k
z6s&^-1z6ykh3*nIY)U}`@1gJCk4m)`OJiGV+Wn;!gc!h-pS)|)J_vYMNY-y5@eRbY
zGTX#hpiH2C+r4p)wdXckeeS=l+i4nYlg}i~2~`{g&n@%<zJky^4=024J8cHgm|A!N
zn{Pw!$E|&j2<4K+WBs(_ct`U*yw4D+P~?l%oqn}rsNAKz^E4O{?vh0vvGU{mDwcr|
zn&E7&EEW98KoewlIO3V6+)VdTY4IeEh*c!sdgi*16L>FH@By{e?kpn_$W)+>^0_1t
zjP&|f?21mEloqV{sx+k9li42C@ejfFi~B$6+M-$l@Xn~}gMgzQYdhgawJwR_%}UEu
zzK&~Ypebz%$H?8+clg&ssB6-Ali)NBW>Mu<{q?&HA8-ikT<^kdDotNmT{?Rl3xc8T
zm+ujr5`C*!#w(e#=wS^ayo12Hwu=s+EUe)Bw-}UXB=gYv*R*^?((a+q^zRVp^F6U7
zM{<GAHuk{j_*XM`@HbBI^}WUBo2bJSoQp&QEXO${`eMBwO3|b7AHy3R8&fZJB3$!u
zPSSdH9)s43&QVHob~jY+{Ra3|W47?b*1DvN7)9S2?jtSz;pz0KH1>{I8||>oGlS5K
z5&rS351|X)C;KN&xOmzr2rm4YK<quM*!~$O!p$SVGWeIr*HFFSv1n~<oMq%-xLyao
zKLBxx<gX`7-*<O4c7n1z_FoYAf*l?a;b}|}5>=H?`qPYJz5xFKg1h*d<HG(Z&^#xj
z_{vD9y|gzM)=*3bl7krB2P1JjcHsRh>Hh$ZpSCx{U)i_7x7VI0x`tg!12^_&kO}?t
z`1vDHppXgm;A4^iCci5_FZ@#R=f=N@I*-IJAJ69B>Jlh;&na&Z&eR^mo_$F@>)<%g
zI>RbY14~zbc<79Mn!4&?O)r`YLN*y#E5>^5>}p9SLo+Imyr5+cItqs66x+0Za)}ES
zL!VCch_WPvZ`?M4jl9?9Pf~8~FWL-<Pz}-j&=c<|?sHbein6bi+YZr_*zr~3Eehf!
zBN@xDVd?H^_R0If6FT9>H@9wj)UuOgk{HQj5RpiaoSg0+)aV&lsgH7i0ocPVp5~$7
z70_6umuX2hhf{(G>%~tK#w3y9oG}OsupgyJ^#BRw0=VtBxu`AG^2T&NYD#w}ws`tg
zhK@5BXtJjSu?LDvVGa7=MKU8V`o`)Q4rmy_x!)5+S2)Tucc*->A&zDofLM+{Dv=T(
z1d<$*paOr2oq-(2ImQCU30|L#04Dcc&l@axTo|8|ibj$<ILY#UR2c<^LC>h9h^RnO
z0vF|pZN%gG4{8;IvqoGAokkItj=d-W@kp{qnC4eNOA;6Ef;xR_bhWvNiT5Vg17d-a
zKD5yC#W9lY0=ljU^1#pGQcDDlKiZ}YgJ|;m2{`B~SxaJjbhL&kcjTiCs|M&#S|vsK
zW!bxtw~jcdp}dT<m`H4Z9UNq*(xYhEh>_-YMSQUbgZ{|(tnBVlEQaXEKG;@C4=VDn
z%75AV;-tGib-Xr_*s3y;9|x29R1i*)v%?~@Bl4S%E9><%&EhmOiSPi(B%HTBMHXO5
z6GuF)8pHCU<nAEnw<pq{9qIDf<W&)bDgyv`_Nqc;QWYC&lbJFyTzXTUSS~P+50Hb9
zH)NI_G3ow#QOd&Qi>NJTf;BA2i~u2<ci~QDp5VMba8xP+zf!pDY6QGfI=r$5+CwyI
z2IEob?#Adxa|E%*T<(+Do|vU)U^XnQWXy5H4)+c*HvB7R_)T<{o*R+iGd<Kx5Csej
z2xIOmZ^C{Zvbi5;M1pvtgf{rc+$X5Vuf0v<4O2<*&6M)TY_iJ?Kp5G;E0PCJ=CG8T
zb{&pS#4vq^1-J6m2p_w0d13y2YX;$?mgZx197<Ie$|1gdj-a1T^zBnrI*iD~@tnR}
z9C`s&Ack>-Xm&h~Lq{pe9+<6T7M7wWd3?eoGN~Zr9R)`ur_BVh+aSXg^aHIf;;DlJ
z$VNi1A1U?vQnXQds**}L`Hs`yALojs0!G&of5)^c036FO1Y_w*6d}sWK_5Oi-~;MM
zy*(|U2#>j%caZsyzvU~~VyBAocqKks#8HMMStA^eZ%P~N1Tk1i6N{M$0$B)&P;<vq
ziY2j`S)O%dRAGigfIW>^StA={^AIj_&ySmq!l9ZZWs#)^YY<s?oUzY;Z)#To6=ZQI
zl%<tMTmjH}gGn55!+>Tgif~MawMjE1i^MFUcxN36J*lYj8>4R>v2Cg_#c~Pupa)yq
z$#*Z3WJLLL&QHsatukAyV&=rgkpAp#^9FbO=Bz!FH0uZj-3Vrd0n72zkL6LloNUC(
ziX~B(O!B_i?M-L{1VLm&Bt=^!s{a6cj>G9rCF5b`#H}M8yIFI#rb|g?V;iB_#^(bC
zJ*ieV&SO%@6LQJ3s2!<Z!C_)m-hokxi{@!Z10PQ3>r({?&oe<ByO(P;0|5FTV@7<G
z1{ZT41|ut$=dnJNwo=?$BQxDb6^RcJPvOl=V@QqckS<=;qlzW@*^Wrh^QfdIXm`yx
z1~<cO7|85N^s6%w5j&$hSb+<J@{)Z|r9SFtq>Jpp1tEWXCOC2FM>7i*<bz`nE!@Pd
zmXkg4&QGNR)d9jfw%?h9WRdv#Q~bk*k);MV#^a7L=|C=3gSlfAo7Bd*%Aa3R?ME<J
zX|zWQ@yLxCes+==`r!IgOctnxy!2h?V3t=nU-Ro$RZ>l*p>5^P6*)NVNV4V`x1vhq
ze)1N^ai2<8VPsR8H?w&qTgw0v7aP8wwCH1p1_>@zdEF#|agS_M=Gwo%GjOZ9Ti^S&
z9ktp;c@s$s6$}`$Acq~+s^TVhRzWS?YOT9y^4KV4>@n*|$takv5cE4j{NvbBYcRXa
zvDvf0W*~W3`F_9SPb%<-GEWkf1f%We9^UmgE1?XCVvb0B(o-PD=r;hzlh>ieMqUhw
zRJ=P6cggySm5gl3<dy~Sett9W^rl7UMLSN{Fv{hMsaWxWp5WE=3k;9Snlv9{kd<=J
z^I(<ic<c155kic{FPt_wK>Xv-no(}?lW?V4LI%K31diZT>V;Is(TqpQC;-bIwGKrj
z5<w*LMv(;yiIqEX&N@{als48a9EDiCg^RG-7t~_5Ev-b7nB=@&y8&2--sh;O(j|>s
z$&D5ur*qE1o1a5j`%4wb+9@(k0~B$+UM#AQ?)%XN%pOs_NW!k&uam&Xf6lGWggj4g
zZMEEmlMS5Uew7vi?+fz=Ts&oXJ?fQ9p>jKpRgNW!#!K*vBNbU35>%0$)nGKu$cVIy
z^6uTkk>8$!y(PLl$hHW+WQ`+8+zhcj7d?ldr9_bcn&r$*EBQ?ngQh(zHzJgD9I(YB
z`2y9N-swU}I*AW+k58>lYY|hh5ai`pxZ@e<b5-rwB$G^&65y^kG2ubzF;?*u4)13u
zWZV0~;GVpkQO%&#Ng<2NStFT%V3>}4bo2+;6?DyX_Q|_1j)FD9jylx{Rz#6iWd<}L
zm~of<`;TgpY2k`y%yRHDxNZsbqUz<X3DMwk1jT}eJBI_B8tT{PTQ?-29&TH=_*F~W
zXs;kJ&V<Dv8{%doBh!ww`Q~+u$W#Ile5wXEj8>3#7KW4!6Gmf=%Q*vMXXO=n9odUE
zS+Un0PAf7NPSLSfBWY8@oK?GDG&zqr3IXZYHSJ*QStA*u=vf_+ik+(8I0vZ3GE(YF
zLNksA?xg$F@R-<<F)Q-pj=82WiMELwD!(uwax>W1xeB^i!J;kl+sX?;w96g~=O2bC
zr+Fa8xJ}%!?L!5|_RAi?oZ_Cb2F&xoSz}&^_yBv>p3=-*r8zDe?JaH2!k>TF>F-w(
zZH=ETm0bW}=Q#jUi1(mWl@7pI41Cx<z3Ggw1!-+1G6DD3IojR8q14c7B*`+D-T`FU
z$IZ#1XJ0K>$}56M%X9eFbn^KKscjoO$oN#<gOf_L6>_*upyA!WhuX1ocPP~?ua#op
zmE)cTFwGf7W>R*Nz>-Hl;aUFxYd&EPrFMW$Td4M;TZJoxa;F*E-2OCsR)Wa5ZZ0>(
zmYWMSnUl;s1*J)1jItfC^AbuP2cZ>G+HW#O-?fwsox>TSr1MF*R#j|m10Iz=&~_#_
zUPJFQh~pq<dFM3yi<rtavq**2a%2sFbI@bfp<^-H9a3QvZjlfVn~uh*sl97}lUr=w
z3n5}Tr_Xc+p>s0MS)uv%1M~6}dgHmO^4`2i&KE36Eh_<r_5-jKzh`1mgTC%Y&^Y{Q
z7Sk{bU<^^mCgP5~kb2OVnId07BBHcRt;i>L1RjKY(magl!_Eq0$lf}VJv}NvvgLBY
zuwN;#V{gB`JVm}kZqbzma&mt6y;6{^eTc)7r5qJ(XAF7|U#&!%hnf&vWeYJ=A5uW~
ztEM9|hVozLUo5MA>>fWV*zo7W9Y<O6Vz`Px%5o!&bkBU6-kc{^R*E6J7?yTAuAwtE
zjl8)EHs>S{!o36GufYrbc6i0><)$H+DqxRZYt+6Q`~-$Ix0=sOnTu^%*@j4J`Xk|=
z!pkitM22e^!lLfULCGC{mGu}5ktwNF-?7h9tF@8Cd@lW;EG?P_i%%~kDhkEW?)Cat
zzIZFbT6UZF4%4$UpDY8PLG4iJ7B=>}n_eap<?6qG0P+vDX)dQQS#Ben&I!ptofkY;
z(L)ZSqE<Qik+o-Y1U6({2WBkA$UN-rNd7Uiwz9+s?-@KUdE@I`UZvvHX{32BUv@Gh
z=u~=fSeKqLH-9WLF;aP4;QedRrIysG(3w?=)a-Q+8b{<hB%mQ~dCMo(xm{nzmk&AH
zsEFA7sAJ%eJBsEt9}(R=zEzTZs@Rf7IsX8FpL)r^)r%QIf#xqw?b5y6CQ702G;_}q
zo7~gYyh$vMU^iHeQ|>UyAo`x>xot;Wj0rb4U%G$2gVLF+>hi-9JKRJV=P`lEUtfCS
z{7vG7w2a6uLD`op80qcxuXhiZtMa6CPP?{*{w48ZByB6)?HT*M2(K*ogYh@)P{<;k
zQR95GXE|JTtnZ266{CTkWhjx90|fN;KK1kG#LtU&8r;UuOS&6L#D{MTJJ%L@p5Ssk
zGu1ks5fq_1&dKT2(D<G4X7^T(f9(B4q!N;>PYmAU+Puz7+ne`eH0D#EmBH;*q>b(z
zM$=>ig)DQ=rC7GLj2<E_k@74@89s;FzYff^Ojc`%b!xNGgkw%Ni9M#DwnZgMgU=-G
zBi^;_^!tfqg{|bbkoly@oaBHw9@Sq?vbYmP1abVw@1Z%xbviDH3p8=OY|KI4p!NQh
z!6g{R=8;ZJmrl^&h@gp>s}1rql0hVN_Qh{mGl)cQbbv-OS%*dbw2<k0E!?cgraT-R
z<%hLdwsw+7*b^RC$k@mYn)0z2rE8tksF692P-2Z4amhLAJ#$b-vR;U$L}kHX9zX!v
zJqZ4_d6gDu;tY(^z64<M2XpkO!dn&DY+Hic!yYs0Jq38x@iLyrTq&efj?`^f<A`y{
zRXnLZO)OUJ=FI@z<=|jHAm^=3`^OPn+`=P}whAD|{C61bODnW{!w)hz`O12l^W`SZ
zQb?__Q_Eoc!@D4E<N?p%Db7utAy~5p7$6>T?Lm@8*c)L8#Hk85E`8~f->fm9A2>!l
zs^_n2&7!Vbwu9_Zgtm{%1QtTWBL|b3cbylNn4|%DBoWSg)E4&*9D-=B6>>j#%rk}d
z_o*IM>JT0`61c*T@jjIe4&x-2KPT-mF=F7Vs<)?lg^aOpg&)gjQIN~{@lid?OMGI6
z!K001-0oN(o7j3$acwNZH@Ai4#F=Je!W?z~0P9rPE=wDzV;aJqWP^<Ie!kQsvKx1`
z*u-SFn3x4mN-klB)gm$6sy)dlCUyQSbOMN8Muen_1`gSNUJWi#xTz_HfLNb#7!AAS
z`kIdAMZ|2dBgVgZmR8FGJqYbnn6bh{cd5hV<PqtLjZdA1`B@41fEXhm%8Lca6HSUc
zxi8qsx<v=f4t`<)8%<k@BsU8-c8mbZ6D4undQ#fNvIdwTKpTZ-&mOep3j}2sJI;5q
z<nQmrG=o7SwUJ!SJ+R)nXqH6A@J>4PH9Fh*QkS31kK`F#^fccw0oqaJDIQce@E=Um
zT)L)IWjE$cr$5i7J6vS;_Ru4Fl3V<wa^b#V{wAFBz#=1gQWxZ6)tc86ypw?(nc4&_
zodC~TbT=A=lQ@z!Du5OqUO1=9?k-~VvW7pqmjP53C!wnTWweWh^FSkZ!rb-i`O{-b
z=O+#W`DC#JfIU6UB#=DtJVH!L$+djJf&T#3r^*eDvDG96@wz{ltE=`I{<UHo)O&L1
zOl6BHiN{|<S@P-7v&a^9X_zX_B4-#J3=Y+5)jW^&q#c6_r16h>rJ$2+vn<yelG-TI
z)Phdc>Bmu0$uzKt{M9NSg24QwW2SpjM>8VH5dfW=q{8#F(Q0`tt>?2=G6NAg`H8}x
zU!`pZ42x?=Cem6pQP3`bIw7@G%vVsI?D-pyL)xX=Z5u7L7oKq+GchMPJ+t1Gk|@^?
zaTq1D8a__%TvtR{Ae+3WD<dcbjhN)0@TCPJnY@6l6D}qV{73o>)KT1<s4hIaq(czF
zb{#q3eQ6$T^Q35TBM;sZI3I;=83~g?GMI$0Tn0xa3pd_Mazh(o#DSCy9fujkRcnaK
zG^!*o9(=%h4@`kdw-YI7(nTaDa8np3*0fSWx-JDtWsY?_WehyLWEJA1CDlSYZa!fy
z_`wxPCvsWj8*;c+@9$F<`8RI>Aj#eQK>AfHG2Ipo$`;tnPyjw=?MV8YGP@<#7;q4;
zU&gB>j+4g3D}l)>dsHXw4g<*vhy$4a0NVP|%7@I+B=^EM+>>uRKX?KDl~QZCi;dGT
zX%}dW9&`Qbnmxn^2&A5yd;1y#TST8~l0{kf5Ye#iJv}NMQ8#61#E_(kB-^)fp5xlA
zB*4lg^K-BaZR2krtwiXiBK~59Io$8S29?^*cl$ozW>|MexZz|Tqt_kl2}K3Rz5=TJ
z;ar{1jAOkgo(L@}79BS6nvJE-*1K<zp~4RT07`}AbX}w7^Av>&e(3kCB?|?~9yXRg
zw6rWj5=5Q8p7aACcbTIu1b9VJj5qsU)f^%n`B~Y{z+_yUC)TA>8H8?IZ}DtA5#F$p
zW4Z=dFtI5vT>RN{ftpp81#qscqBr}X<%TLIggjuCD9yM>5qz~p4TD3n7rbCc-X(b+
zwVx<oQp!${MB0M5X+!+B`+im(vsI@IBWGAlxI35vI2CRiCi^z|<1)CEh1zfc&))w4
z>r|82D>RZajjM&)zr~;DQ_PTZwq>Xi%jVl07G4@g;m4*b)OK=0QKTO+A1*yUzSU}N
zCezL`-9+F;wUx8;FC93m62xL?=2paUo%>j4JazV@>aK+<Z>gRvT18mK+%tacm*wg4
zS~8ZoGZqf`D#Pv(#t*e$SWrkNnE-C2Ap4`#dzyKc(}YkFSY)dnNcE|8S!$XgZ5jo;
zXrN&$1O=pxjsQIVH07{S9BXt4kh#mR-BH*ddYs%ak(nVUfrnmzQ6$dgS{TOv0QqO0
zMthpinoPb}q6C3iH%0OVB}X~Wu7Adf1Yj(S8*C?r9eAR7T(;@TCfu1uF^^o-N_^RT
z^>V;3$~W<kdK6fjLNbJ9MPLMtg3=D1`1hvAEO89O9t$}iIppKN(xq6Wb!g>K#fH*x
zfCsfAKp8+K1DvbI!y%W~@v7AlAlOD_i*|B$_s_4jOlP++st6UO1Lu^t1L^NfhS^nu
zugb%SmZlJHJ0wu28N+s@HF6b`{UK%qms5fBaUc6w_3cp3(>|s%pWVg0$&;`Xk&mrg
zNSAOz;AG%|)DK!oE!7pFbSDG-TOYleL$d)T!^Q)-7#RmWMJqg^8Do)InR*4rDM~<y
zklWfiVQ>VF4t+@Wrf)_82*Dij)`9FcYiOm|W`(k&1)GdyQ)O4UMrfreE^sgpYFTAR
z!U@WZe4B=HeGN8y)tR&N1|R?k!Rgx+)MP87Xp-nnwi~_f!}u3&DYmHsNg_s!#g}W0
z{o|T~E6Zaym-eMp7~huUel#`H2|h*<N1ecvlE>T9pDdV^qF=YLRJGd-ff6E5l6gO!
zXdOVsZjqQnVMz?UWcpSTT^Sp4x{$+>p4Ab&m7RXm1fEi{B&P*EGgIv3*xb>zHle&m
zQG#u9UvS9-9fz$}xxR=inVGZI0x=w(^_4E5%0xxWI{n87gPz{zn{4+_z2%L_QVgMo
z3c2bjswr+SYuLLcu?((Zd(;39S&!&VNA~uTbhmci?sl(|nErK2=G;n>!Sa0Es|D-$
zQ|E}8;+f`NV*sk27X$g#a>R!@7UR@zj`&#$I*bAbS{~_|+j^a=k~7z9fA#8)@&d+X
z!yn>3$E7S;hG69kPOXBE&hLCv<?JUW$)ao6;%Vgl?8<&tf4V(~rxj(MH!CH%DyX>;
zll)lc@T#b>94DFb202pPx2;a!zm4Zu#8Hf3Gi8sp0jVbF%f~TKnNDNDBOG<8w#g`v
z-Ed0oMp29m^gi`8K;1h_!nnbBw|&v;?V4*Ya}gy;@9b!~Rw0h!6DSD5il4Z8eQF6T
z-W|{?6=qWEt;lTE)pU74Si_h{Bw+0x^w*RC*iKk{+lF)Nk4kDy38F8v+d*wOSr!PM
z*KBdH%kJ)TLRnkG04liM5LX_)=AI;TJZmMSjT^qzmyM&;FzP<E?=XfkL`z0w!-)n+
z9@P1ml0%`0DOkf00UH9Ze|m7jmS$Wt5^_cqxAdrO{Oz&`r82}{1mls<K~a6z$#R&J
zYl(8jMK!34vK4sRLlcas0YMy^sdCarLR+o~e1<9rCmiwpX`=pj%#$k)patOL)Kg`j
za}$toxeMriwQ-9Rl4Mbc<5Ti^nCE6WA75Ho1BPy<Mk6f4j2@p#ZN!fNMJ_i=!~hqZ
zdwbMVGWnQk3Y8x+hQKwYh#w=xEvvk;v`(a}fc$_zl~ZV4AW4$(cB$UxMI?|q8nW=f
z@U`(Flz|z;ebe8L`KotPn33eT4Ios{mZJnOp*_tsuEgGiZ>H~Onkz{>q+R3};aK&@
zrDy$?)tx42WIaTYi4GWgdkUWLTT8w<;*_rjc%9Aw{^`f+Dhv58FH1=XSa%#0C!M&*
z7_Ffb88bdsSd>L?IcVH&i_GU3KBlY8j3bgbBvIy!Oju;+uO5}9Zx`C_4aAoITtSR>
z%Ey%>u1}>g?WB1`bGjfTtGl284_ehbXlBtw*;~AO3{J8G{0+fAwN6__+EL+jAe`=e
z?X5quZnN`dw3z<!l}a`aeSVc2SWK@RVl9mCgA|Rp^y^lcEf|*!@V+L5?PGw7I}Y@c
zAy~t+`G8~q`alK0Z%#swL+Wd0dnv-n1-S*#ZwSfvkMk82x^z~<f^bGg2LPT<MOvCA
zqa|K5GRW<gWWjKHD4`wvwhryRvR55?_p7p5mNCZCrsE;Zs4xgUfU2_F+zqQL{GrO0
zQH|b}X{JS**kp|)n2}k;iZJZ0g(J|^tABMgCfZb0Qn*kD-Sr^VSzwT`R#UgJ4UTC|
zyPPzGg&UEZp{wOgi?cv$5+}^8pCS8<nFM>();hDM#>|f!OiRcJ$IyBYYQ`%rer7m!
z;j#BcJtQm0P%w8YuLGW^9<@A)f~h2QiLXr^&)OrqL}p#AsGlicOn+LjX{@Zyh9=2`
zl2u8-9X|@?)_0CzS|U&YTu5*vU+#=@DQzSkOpx2lBBnBc$&$l7E_lv8XjGMo_N??x
z1I24#5Us&s88~7vMtbDd++HXb7Oge9iE?ox2KhyKUB0m@Dk`0dhYh&(9{#nZ9=Rhp
zk#0h+-@F%w6`b(OTNbN39oP24!rSI&kg>#yKZJJ2)4ga}>WE`lCX5#I3;Cq;k58p=
zHu~a;Beou6Jd6V1<Q)2wS`cds5)_fiIlwvRAN^_-2AI`Dx3j-gWm6zgxSiW_7oIau
z)U`$OUlFq|Ns>h9eTSuShs6fb9mb^|!l1^CFbjHqJq08h{qU4Tvw20Ad%)i@=ilC`
zP;Hg%QPIyjEYS&>88(s*@0bEQeMMfe`MkE+41HNwq4yQdT3j9RW!G!J$c(=*Cp_l2
ztuA&Ij%DF7xOV*NWVuR=uFY4F#~#A_)P3@ME;>|0a?0{YD()Z%kmvIrpITd4zFo80
zIavnKGBd|&vmLWKBvN89BqVPba8JLbWb`yj<#i?@ESB;X0X}Hk<}K^RNgFYf3RDBg
zAbs!ftE*=;K*J<B!yTqEmL&ERl4<t_Ha<a6qn2gq^{kyma+C_m=1CbpAm5P4$@g%2
zk9v|TGUTy~c+N@=p!(F1MdcKHWkYTx_o=MW<hPP{iKE)*4mjP<OjNnwW>Sd+wj`4f
zoGarYn~=lOtU;$fMX8O(7kgx!4F3QsmgFgg7C1>@`BhWU0sK^-YAEa{lM28Tb?Qg;
zrKwg!p|z2pXn4z!k^*o?txX-cK_(|EQ8Mnm1u_ex9D*M#WDvq6IcFcxQ=z$ymNuRz
zigO`ts6qLA0z2cqQc06`T(-2al6dZIWr-zYmdN2oIc#>T6G9Lvj#QDEvP@h7P)l+r
zoZMeLY{ovZCK;E|0o2n>w_!w6*qBf;^8|!$PenNI>MLY{61AnG<|vCGb=)1;oU!dt
zI_6|p<q@ua=!_EWjCK0do13CaFi$xd+wV?PEYZ!#{oxoL1_xSp)DJ`WS>YQ^Lrqw2
z6(p8b9&AAT!m_?7{4ulC48j{wr56Kc072@1#;JHW#<F-~?lcNy*_S(8pZ>jQYCb#E
zJV=v6Z*LPDnD)q9jhyf*y`-ZddnYZ=nY?}Q*4Ih6ym1t&u|`X5ZN&XE*Xdqgs94$B
zLZMbrSe=7++&-qhsrZ56yKn4a_M3gc1CXD4Ki)oqzGU&0tJ_}79ka0lbLA4e5$Rsm
z6A|qaO!Bc5T{&s7n`Y?5E3n(Ng4yd)Jf9&z#GL$!8#$)g2^^CqIc_&_6xDGqCTQC|
zP6*=$yPZcE*yiQd<){V}{_~b0PpXQtyOvdw8%AR}@|Gq!+}Nt|$gLu@>4n>ZgB<qF
zShcu{+Va~{bTcKi%Id1v1cRPW;rddvxm~vgeUJMd{?EE!!><HQ@dw1Vwzqnf?WgW-
zq>SR-`rx-yo;V-=yx)!574D0nUU-+px|OZEu_biWToxU74?)lQ=A!sz`)T+`OYr=#
z-^U!YM;02^P*oMNjE3mV>_1BJUyc6&94|gAUbUPTQ%7oDywK-6SF-21`f*-0I997x
z(puc7YaVxTeKqCuv%I7slZD0(Gso#bX(8lD>br?Z{{XywjZPNY+1ZXvUQ&^`_o__c
zinNGSlern2kHA;I3Q>$~Wpdni@_8*NgauaIMldpaVzn)G`}<j>GH!-BVp9HV;5IvC
zbQOfsG@>aHcVVz_*vHg&r^_6Ykq-@)$yPZBHJy4C=M5I1n?1kaE#<$8^`x`aV0mn1
zQ2tXs3H2XNE9@ORSJCD0+DMkkZ((ksUI%fw05Okq-o7LFF&45d(!)WBONYhOsJzF=
zsOf>*(z@S?zY}~zp;-R_XD+8J#)wti6VDxe>*Vn?YD*Dlv%VD+X=;0)jXor4Ei|^;
zQzlhTCU?mz*yHrBb`KLlFakvmK>NtUAfD#Fb+Y)oa?+*7;N*d}GI?R>eS6nW;jfBN
zB9iB5eC}<y3Nz4;U*%E#ou<2;P|UeK*sT%owlYVkuaJZfEN__q0JG_uu=82GzH1?t
zHBsd(E47H}n)2-v;%=QBK7J)+4nc`qkb8q$_Fob0BZORC3>FxO$-pb<J!^`l3Z!0#
zeH_aVHD{wcVy|x!yi2xIDciX2#~ft$sbr4FbI8&YBCblp*bGl>d)G6h_`PR!w);dx
zNJAnwP&<{amDOJ0JjiY0Wo^hDbsalbB&o_fqq-HT&1lUi%0nQAWFQ^5P&2{oYX`?(
zC4E0fmRlRFv5?0chqtvysOynHS>hxkAju7or@0m9pA<Z22+|tGa)DKxx^a_^p#Bxt
zgu+U#MA|rU*!a?>;}@yn-x$1etm^vp&XUulF+{~~VMXM(rh5aL;KBrPZn*%Af$8m9
z-YUQQcC~SR9GjM91y$5;e^w^4)RkO(+q1wOF<$f_psbGx&QnRriq6}W({eOq6%E#f
z+*{0I&z3CQ@@c!2@>GQfg4DTOVq=9J2&yD{mQn!$cKpL5kH(O)o+BSJoaZ!~vD2vI
zc5)BWljKI)P7iQ;&;!fzKse(#B9|pt66&Ko9C!4lWys?MeL7NnhYY|F4nY32>;!@t
z2_GgHvC5v}n$j#vSS~Zh8<J0;q}tLQ+p_JRM}JCmWri9#mnV<A`twf604lS2VOyso
zIi-Iv4bw&wJg8nj8f!CW$xt@~(0`2qK;$98;1l}MU=@ziu1NXD2^|L=>qAe|zS@#K
z#7wA(xXz@E<M?YlH<p{+aKx(|@CT(|vcFp>q)4v{g-}Zoo!LDxNDFEGnp7nA%p#C&
zGDX<qjQUjzn}rdJP=gVJnLCl_X|ifE?k#O7M`r!xY`Fw_kF8cW6S^`6AUWD_x&Hw5
zQUT9_!X7dA$<H*#1gRTvGt`g0N~KD+)3gpbJ$<PizHmu9hyj3J0QH~*ZOA;>v4uG*
z-0r5XLBRogk?v?RuvUqI!RH;CpBP4z$1;+9yn;JW1El@>s<dHnr;qdAm=aY*GN>g^
zRq^^7MSnFs!yhGx!94{8IZrGhz$a>+rhpJL0ry52{Ko>3d0Zws^#i>lN(ae|Za6EB
zPqiqGiGSe=ISe^80N_WKLX(rwQ>7bNFj5Koy!ANb(iU8gpNw<{o4K8^s!m5i-|0XI
z&m3xBVH;Z^S-SgDlNSE~ke0#9s-E<qJ_*~rXXfLj4AKHZZ7c^F0)QMPP`DuN-SayC
z00H&QEK#fpCKx$!$s^u}WrYXtGEXj}wIq>@l#)Ie4yP0VqcMgAbzYd@4|;GjOrBOl
zWbnapv+<~BkfAb>^AHz<)DGCG6=6xj$sDe#faMziXRc@f3W7f|u+fGhL5|*;^`MuH
zfpiKu^2RVg^`~#jm1C73aY*Y-c;xdu_JNAvY$Wh;+JGFtHz9(8dgq{}RYFR*W4r)C
zZaAjL8sw7`4ab$;$*Fv^f*661?+(870MP6X(Hmf#HaZV~YC-0)ND+A~Ns+n5C=L|v
zah!A=`Rz)qu8nTURP|<TbUg(CIm#;)5|Dege(q_YtCFnV%1Gs?ZS9l*DJz0cU#O=j
zj0DJKjE$s&$T;txS_DR3M?yjsaDG#Oc=h+D%OXpSq;6*WnEgdP<Wk#5Bq#%q)}IuU
zqYbes3(SkKay>KHPyslS=Fw6A0Mx?7ut9=J{$_$El{OHdu=z*n%?jZ#(H-clSg&3?
z<KBqkNQay<s#|b!bN>JVGyt;%AxS$GPZ&7fe+q+h!o{G7hJFcdNcwtI>i})4$*?n#
z`^L@(uN2=UvAnpz7~DJkDWC+Dh)SqCPDmcDQ#4scTrdRg!ybmK#|xp`5ziSL`h9A3
z+5yQV9_07*rEuJEgK%iFz_`ki*yrm`aT$=RsR4jh4B6U!X^`DN+EqaeqvhI1IrOU#
zKpZ1VpCYzPXT1X>4Up={2@BUaAo_~Z(4}K>0Q*ti959eC3O~lP#36_>5L0p77lT*r
z(jqbTm01~rFkj&wqNaZckF);(VLd@Dyk})CoTaU2m44F`F;!v@3UPzU13yari~XN(
zCVdXrNQxdc5w<!KJBs{8{fTu4{{V#BOpRt%D=yL%kMB9)0sU+Cr}kvMfixRrkqWAe
zs3Ve3^{;@=<1el!6m-$Ei#~$Wrie$j<K|WvU=KXk0rBJD2Z25__-gA!@fCz^_LL~>
z!>)QBoknwAt%Kz5kZmWNo(3vAxrmfTSOqPGC$X$>_=?zR^Fi5@B&4k+bbcd#-oNlj
zZx;9#^H%XUfNX`;vYn|3Tu1;UlAVb>alrSl&kq~;1H>K%)>}l@tQyK#q$`Hb4><4s
zd9Uib#NHav{8?ypy;{yWk(X)Sp_mU*pH9{A{{Zc~{{RG)@HfTV3%?QgLec?tS93`e
z0B4W9dSSbF;Cl-CY`-;yTSBwc%Cq)XX=r{6H035DLcBHsQH+|3NX&BXLU2zj-o4xQ
zlKqVSBYXkZzu_O&G$w}CWOj~uP?0K(oT<kxfJtA-@Nwc-Hjil=PF0Gy%x*?O74E4f
z5o${4fz-&}Vuty;sq82$STi$Zg~v=%u?{jw#yA6tYkZ`K1E&>N3o**yF3s7%-MD`$
zP4Cfw2a*Ol(?|ujN;c$Vb|>D34syI>rcD<DWN76L9FuKU7<1|EP7;8-A$(()*^YlY
zg{5JOP`TU5!0Kty&4~kGlBYQ1ik-w<p5)xBAr6li$aLTzagOxWcpEKiF$kYBE`DPD
z@O#yEy7DFrq$oecNA#&ya-=+gT~Kfp1`|Bz>p&74t?rE?d0FVb{=U^crOm~i$h)$T
zM(Eg0;6FXjKD7(SJRpmRHn_>!`1InLKb?r=k7ocXgkER@dH&TE!9}?W?ft~aZ1tuw
zEE$^wfsF0ODhG2M!MCtw<RRdLPidr;%+eE<KRF_u>;slrk;IBXbr?cdf$xu6g%)_T
zaOL*19LC?od*YrO%$ZYqsokEL$JUF(Gl0?!+<cFY7<!5>z+&C(jhyaOKY4u(Ua)7n
zZIHUi<Y5s<@q5;67I#{vp%s<5KfS`KM9<^zUqSpg_)%-5=oXRNLu||m`$f!&%*=kj
zcRi^((WJSg#_V}~8fLjAq%mAVS929Cyk|ZA=$k;))^)Uk&SNt$Kx19m&+!mDd!Ci_
z68H~HwqiV&P!3e1WE1^9wR+FMx_YmbZ<vb!WSP)>x#$#kB-USFgXl$%oa69Miu}g6
zjji?r^E>o!_D`=p>+GNSCV%Y*;%^7|mh0g^j;=ALPXfzrwZJh*GoDZIvHpEMI9vY!
zhtaLjvYys2wE0_`Y<NJVa6jJuRd>UG4z3}UbxV5|v%NvKIf?tYIr*{M+OWjeg?dgY
z0@0)I0r5h^!Jam@drRRO+(u+LT={3wz3QjN{{S5Lds))sy^mgyxqmhGHzCO9Z>PO{
zd#mfdJxiEwt~JLy1}@|dcQa!O!_@K8izzkTP85q(@h$AC3G>gJha(?!4#vE-MWm3^
zvGp&(pNp|wPBiPA!3=74B#j^pPjR2`RQ@ISU8ney#Qy-=dK|X)cItQBNgHNnB>cbU
z9M{g4*V>+)W{j}Rv0A7x#Ty;{I_LP?*0(LZZ>!n5ULO+A9G+ShjT`2S5s(`keif9k
z^4&7j`ZMT#Y2#lG+*s<@k;QcZRkt2q;7|ecf4qJ1UlIP(J~7udtE<fkUR^=_)`eOT
z)Oz#K0qb7NsB3;ByR-77*5!)kMJ+7I$0a>IiLQPh09xzULgwZOUU%XhxWWGbd(_s{
zDZ&o&WV)XAhrzxk_*>%0Ap2tYQJ{)KQYK;m7(G;XCbB=_TYN-mo67LD%Y-AC&;j-9
zU!#zGD$t!In^KAg^4n^eBL~WpzR~Ymwto&j9~-Fd8VF!_ghXMH1|9zZy^+vy)4#QP
ze_y8sZN%qu^JdH8KaMZ%k~=>R+%kE;G)2NQ=eW;rTIsYe*+1gWv2zS|x?l+?$s0*%
zTb>&~&!;u|8*ktb48?3An!><Hfr82QagsC9PpxfPX#N<mwT{}>&_*Ua%-pnue+zpI
zR#VKCz1W93N5j4b{{Vt|{6X;)vD<i|wnGwwCIJNr?Z-VaUd`Zt_$NPvbU5I-)>a#{
z=QCVKGU4Sx{D7~c?PQD*HN1|n%0l_EjtL#J>sKu&wk6s~NS)*fA~!6fqMX+h@%7tj
zFip#In)plbQ^J1?Y$34lw}<Vco-`smnFpA|(C%#IfbMw}=~@l6FcMZ40Tbp|VgjD*
zJ#$&s3mt)uSYRn{5!oOOx%2(wp0&3f$Ptk>$~0_uK`RUgKi$Xmt{RmpRG&1SrNt{3
z>}P9T(oDdkrVzU40G>$q;~70GO(b@7o>u+hfE23ZBOcX{r-Kw>UUzv|v2w$Mlh6*s
zwP;()FuP>|mxTwAzV$CuPg6|{jEKTEb&-zO0{{=DJ`oUbsdBDI-XNR<=zZ%vJf(!G
zbGk#xal#SoD%GMgB1Z%%D&Uzp#%UoM_IFCk$k|08e60D~?^oe?f%77Bw6`0ZB-VYk
zznWudA8Seet3KVa-mOI(k_TC$5rrH+IQrI#!$tdfFTB@AvNFVD-6~@Zx3SG=>GKtZ
zW|WUCXU$N0j>5B*Qb8L_akg!nV{mwJ##E0^1ztn7XNFLunALo^*J)Fp<F!TgE0vmh
zcp~ANV#Qkp$?UzV)u)+jav*6u&BT#`+tb)qb-lqe>@SpH6q0{KS~1?nr^%7PaJWVS
zwB{t9%4SHXg>3ezIVU+RGv2hc^lOOU$(S9j^C|3ot0+e#MI)0cU$UM}T(-JaL(6=p
z<^YVZ_?nq&3v*T(0aFsXGB6@W_5T12Rf~DvdDJ1mQG&VP<Gp6v%3e+*4;lUi;QRe*
z{ko})kr~_vAazys6&e?FO3G;MkhD;e&&LP()%yp!l`x1iyDEfoe;UZOd3UjvKivfz
zTyPCvhDlaW+>U@`o^U&nRk|6eZo)+J<cOeRLzn0WrCNeSRUl<R`>an&%G2hP?JTQm
z#TNtu+09>RKt)xJ$pD!*5y0(S^Uw`jW-1lR<y)gw$oGP>0x_H(I3lv_f(vz&Fxp8{
zg|c&3)q!2Rvw_pK3t}47x~F$Bu2_B2Pg7SS*)x5m6K+%k>_=LqV;}^DRV|)eo)_A#
zz;+%0BpyK=8kt_;w=Ua6epwLUcLuFT8?1!HOSn93=BUFUW)c-V9Ij7O-mEOw3J8WD
znR!AEKN>G!EEXdnfgJJ=QBSuZpP33Ow^r(E7@<+RR%5xaOJ|{}?MrWFF&wemlh5Pr
zNz4)_wLu2eC^ji9PI~_U_3B&AF4I!9ktBs3U3poQFvqv00wAP`NjrVIRj6d#fUx_A
zBR%UrZsjD_$Cr51;0Bj@GhJv5A&}ve?assNUVW_i67NQt;J>qp3qBO=`^UMjq$RX@
zEz7aXJDu39oomAyWy^o0#pWpFG-Ek6#a{u2uJ5xu=w>zOX!S?(O>e15c+<hCrPQw{
zDJi(d(oZLz)uE@}7j<aka-Vg<IS2=-tXWvwPVvWZT@|@54o|gOwUsUsMRb?_QB+9I
zInPsHqt%Z-=MvGKUxv%g9o?{Xkce{3-0Tc+GCg`#d;KF(z0?MerLr{sR_(ifRU@fB
zg1R4ueiPJnTQ*3qQVDKi2{n>Kx#j@yclH&b;~fg$MK^XfSGy&S-9(5EWM5S$+pTcg
zDnq`flj>;pv&(5Sq>~uF@(+}p^ck$Jr^^J&gz^Xr%9`8NVX{c~MIdK{ousxo^d9w>
zvk0zA5OQ1*f(O>R<FXCMX;&!~(@A>{*h=7!Q`<CNT-;pFZtf#Z$}{`8!u+GB0;^mk
zDF>WU^2|bR=)=@ftE<M(zZe+=o^ejv+-QCbY-K2NKsh||O^t?kw*A0xz;yg6(j;Zr
z3Cpg~*-rd)q1o`U$e^j`a*kBcF&k-<%y|_g7&||`_3c9BZ<$6|ju*1~(gOR4W?kRH
zrFqBr&|P8yqzC3apK1VIjT?X>-Z;Ti!J`BgV5DssC#W9Al|x9syB~bv*Ka18$8OT&
zXpEezjy=TyDoG@5i5Q1rhfTcgG>frS-){r&20Z%;P(DvJSh6QmjzIpj;I1V?sgw7W
zlyG>U1I^!V@wP*;`8mLhd(uSfkpPErLy(EpkG&%e@tCjzo=cP0+LZaM$P?wj%E|^a
z?Mw#AFksjU0qcQC>gRZZE-}?lZ-2&}<v-c{@BoV>bLu+%X=aL8@w{a11$f4CI#Hkq
z(X_>2h4&X>@&)HUxupbyxw{{jV+W7rO+m0bla_IX8RUCY<c<hRc`-O8MqQgBk9-eG
zKs8}a$tXth!)I$Z1oxnCjn37{BMMuh)4pBH^AZCcgRnj65mCNSNg4Tt01?M4!zhJ5
zNQPyTXFEy8N8?S6voc7Vl&Q#L(w(^p-eW2N<8yG{$J&tMAOycL2R!k++JGMduqXF?
zfOqX5FDId?6LvQ%5b^!M2RYA5Mcjfz8ZxfXNdEEkr&@XPt4NWaS8GWk{my%O8bzTe
zfr5RWE!)|*G=!X>Kf*`Wh|Q#dpb^NS7amxDyxzI&JJN-O%CNrWE`DYll0LLFa<Eot
zNmKIWSEUyngmxZQ_`wXkmXWw&zyMN>(8j<F7Uh|T`Nc^ckzykY=1S+Px5>A$1J<1_
ztC&fG*~#2;TOB<y{c3K4%xZagVhex(C`riAeEQN7P^bxl&+?yIlv_v^TNQ6KEM8$$
z7&tvhJ?RWK_Ng33P3osIDC#rYr7Z_xi@ql;A#5q#^Dc6IDnkn)J4+4mhHiOZY|}sp
zgv!s6l1lX+gjKj9x>B;oZi}3660aYZY5^;i<FhR33_m#Fg<SEG)cRANGVV-q5TQoR
zz-6DgK7yxIOz&A&XPLAN^Cmigd*YEw80FZcDUT&s^lbGM4#i7bK@{>_2+Y!u1Zbm-
z_u{QXV{<Hm(gLDFK5%$kbtgTlNQ~0Pk|V6w5lOleY`g>LY4IctA!#8f#C*&T1ob>s
zEkl(NTZ?GtTbm|yl&MKs+bZaI;C7-rSp*VC7%)l`=7bJeGt?1Mp`Yxs!t=tD%8ae%
zA>lK|J?gv{7Yl72yh*cU#W@+sJx{0u8K+^38pe~mMv`s{4BLiPK<S@)ZPo3Rb16$%
zOOKeCWWYduy=gAeOEh?7<u~Fv6}sl5X?)Nh&BBwz00wc`)3H3(CWzU`IE@UkwsP|s
zKK^;Y^u;)`loGx+W4}2cTCW4cX)4Qd$s#`nBG@4PX+*!f`IVA1V!@xUJYuJpQ07)9
zl2l^?O}Umc`@f%sBy+_@=0K{(Reh=t&XRr8-#)b2CqQJ87_Z7at=yf|g_<JDVF<f2
z<ecS?asCu?pynRYU7J^)2#Y8iiADY&Uvo(QTyuGiBkhqu$zoN#fbC4UkOcGHTsrl2
zf0PeZ6yPO~lw~eC%8Y^!aYrbD46Ydzg;1n9Y@CmJk1G<hMUoHQZ|{8p^rCi-HZ3OP
z;CYHT=A)MBu2XbwyH}!-)3+4VbtTCmE+hq(WDB`CGAYPmk4l1Tg;x)_=d*OrvGu1-
zEN<RpzbfEiqvLV(s`z`0q=ZJqmjDl~Xrs{0w%IP3Wq+({3u9qrB=SnZaS{`Z_u{_m
z{eu4hWEdfy4PR2yE+v`D%PrYXNh1Ib;0oZsVt?5$Ro1R8{7tUH#yKt(l4uZ>P{3dw
zIUHucO#C0<jR)aJhMGHh;7f;u8Co~!FfosQ_^+eDVPl4ewVL;y#*m=o)0V_KW|tSj
zJu*EvNzouk;y@Ng8DdW)ob@N(o#D+6^Tb-Hzqr%oC770XeiztNJUgOYYr30W>Q}Q%
zEVwBf=Mt`d{trs^FADf}+ey>ozLhe8junUAKjB?cc6WQ7sdPj9JEdtp9Yy}pkijxX
zx+Qes#yfk|F-tbFsI+z$2_6^+Wf=?Y^{F+DM_KVEpe!t`6`)Q`tBj%Pis<yO49%nI
z>2)Qi$_D3*;~<~ntY;)zBe2q}G}~vA_8=Q>6c)kHt!GYd?r$VkoIFkxG$dyPXOMeT
z`rYlGy=^VLGq6Q$2@$YC{*_4F!*0nC0HS~nc`x*<rA}MD$!wJ-Q4FHxL0F$`Zk!b-
z`_<<E02e+mczfagn{zg!d2Z1NiU!;VP;yD{RlYI&ZScRtof_(S?p#U<c@f{7VB~w^
zzcasTkJ|ghpBOGKv@HhhBGY4$nF#yrgz&>0Hh-0MRIN`1PnrBrWC|&2%}?6%_S5kv
zjy0)#GvOU^yo)v~8$}^r536*qozqXay1bWFyPRC!$&)ON!m#wkTeQ(6B1N}}46-20
zxFtdV0BBa-j+}`gE&*+zNVvc_=trRTub-`6rD-`$gHBHD&(nN4CAn#DZX;K?P+k(b
zFpk4MrnfZhAq+^NzI>49vky#q)xAF5<&eWUMF8V6C>aOP_cgbrY4S+%i8k#A_h@6r
z*6EUKmUBp}SfyvAPxg~>_g(Og9eWOddRIZB>2k;!mK4J_+&A9@AHD1<ds|3hxfb%<
z$tLyyNVouFsrpfIuoaBlZB&;#BRDNw?oxXW#l@H<jPhDdZz7=boJON5j>P(!sd1}@
zL@vHhm-7JUq56uaJ^b@Z_i;jz$g8)@<0VFMk~*L9su%b12+XeG7z{ivId5_4Q0#|$
z4%Kyt;a%eBzna@sRQ$@`zQfwEuWxTIrxy0nGBIEThoofpsBdl|M`xU4X&VB`f=+tX
zIPc!p^qE6~?n2~eY5w*r2}<I-66aICf@T*G{_-ZnBzzb5=e1?s-#Ayncg|W=MZ(5C
z53M&)b<*Z<w%ngJ+#?3b1RRiaR4%5DSs5gG0g5p3%^P7{XZ6J#$rA1ZP?=|2WR^1<
zkY8%#<nzJp^rUOM#{n(wqDS0L`6KE_Kz#?jQ<m*jOl>q#mLNodd2`&8L!@Hr8%u&+
z_XFm}+f<<$0Q%yWGbZSjXS9+?{?8*Kq^HeSe2CojAa*qCb%rK3?qqbFm5~whRC?sq
zRKBx#o@+E&3pUd_oQCbw9QzuQ(tO;tn301<L#!&DSGmt)#V%o@b0o7kVI)e?jikDa
zDvp5r`qXx_tW&Mwh|Zx&JDUxW##hh^e75@_K7E9Xu}eV$KN17a%zuibo*5eqJg`}E
z(1Z6+t~&~M0f_4i&3hE6jAH?O)yZS;+r15NkSj{Dk`aDylyE!JCA*Bo?uyM3Dy`1;
z&)pP;%5;o9&AUclA@`5FM=*xo-CKR0OHp|mqA!@{5r$%U0Q%D>cAnrsyMQVfzDWpi
z)K!Jk<7Yl}(SaI*eaB6_cc<HFklebKa8xlVBV~T0-i~y)4p!Mie2<UcDe03K!GCdA
zC$}%6+{q+>OsYcpYIl`Bp7gTWq%HEM<t_WYqwbF9G+4F5-F=~S*%&JU3l|u6KHi?x
zx$Z7fw33MBiYa3-7f_KQ{vZc`emc|M3_C^`G6ES~H$r<<vaDWt%!Q=>Bs~=O%{uOT
zTa}7;v~MsSvZPIbpbTV>dO4d73h8Lf;^ucTL=M?Edizt7*h3$Y3xFZ{yup?LcFt<b
z+y3}L<Q9>!<b^rvGm<`(_^#o5rdhQpBvptR3~}_Nq{pEeTQWw{`3(ePku<BhWMkK-
zPsX11%@Heg9vG?n;{ko@FSkW1v>{|+AU<hXeqEX4BfT*-I1b@+IQurh#v(p;=a3J2
zcVTo{ic3M~i6onE*}-v~8AoltfK|vuO3`LHF(QB>Z@jqm_pG6NI?iRkbq#O;h5~ZY
z`T|ECJ9^Z1v&%fWyP9acz79#x9X_;z=;+|M%p@hyM<l5Ezk|@#gw$n84aD<iD8NMW
zkd8;8u4XH-BY$a10c2gVx;G(5e0QtrvdBY*mQj$)6m7I7M=gq$4cOm;{1z;3Ork^t
zNF*blO1~bbv?bgFYk`S3fWztst#co3Sm$&0c>#_!RfuCQd$-n~7NZo+_T_dGK>R{a
z-90{;tR)U+G}lw3nUeX~ySp^Md_=`@>5O!&%|)%Q3AWVmVk`5<7J2q3)|fRp7k$i3
z!^vMTtSgd>?mN~zw<>KW)a}7^4fCQuEKhJMRW}w5p_jrr7_?~7gYuT$l>l_((zB)~
z?BE7TSxYLIqd8xx>?+OG>{*c>KsH1gShJijUBlPu+N#Mt+e~JO0Y;2$iY4Tae_YnF
zOpEGM3}t4CBA6&l7o7a0{{V$TWHUNIsJmr5O!>eE9+fl3QQa<OY_JSB3<b&ixb>=&
zGq_-61drhhirFBz+l!+st;CG5use2<w;1D*(xG>fFu&-fVpb*JIWO%`c#Onm4eH$q
zK9y&}-XFX1HmaIst-H1fX4>5C1Z9BkD{53{T56mX+cT8ZRo=&;e$Rd$XdQfE91kkX
zDf=q9<v`(sdJ6WR6I-2X_8aKi%fumMRPDwFJpis3!d?fz@a>JhhHgwx#DF&i<L<!s
z_Z8iELg!J`Z;q2~YroAqRlwnZ_v|b8J|DvW0A^*8rzqL(&ydDR;;}ACk!XSk)}Xa6
z(nl1D<}!?y0Q5elzK8vy{1ptI1JGwxjU{DS6>;}Q1_Af48Sy`XFTNUTR)1^{{+a}e
zv2q7FKZSd5#pTpIUGSqtX@NyWKxU0j><kh0uVK&IR8M4e;V8~AvpLU(z9f&s-VT#M
zzGb+dFY+Sp5#;{>O6YzYc*+Z}7}?$0+Q%8UCOJ%F1;?qWz5;kgJ%3g$ccq|#n`;+L
zZu~m?*P?3w00y)_5Ba*yh1`3dbyP6NfQQ`o=DM2bk?F$sv7_-i4KGHYOVq6zXrsMc
zxN-89BRrp4-qQ7(C_Di(Ez-f44IF@S$Iw-sH%ZZT?H<a<$2U>!w{j6zBrzQr9C7rj
zcbYY_UB{&811M!IT0xZ~u=dS!Ly~^$XIx{-ScPU5X{$-6%tR}><WP9X>VFF8{3YQy
zz9#EBb(Cr%5}bXYx5yW}dvRSPJ~Ob=z7uLX4Tg&u)~_v1y_L}b7&mZa!2~t|C!b3A
ztM=Fb0D^?Cz`qR5@N40KypO~(2eg*<Bjq}wU!DGgceZ%xlU_b?n?o+ZPPF~kw0zl6
zPNUbM^OyV;(fkWz`(Wyy4?Y=RjaJ{oNRaAtq{}30a${1;7!&gb+!;?QK^=%6FQ|8s
zAiI$*rBXMu4ms`ZT6&M$wdJ2#*L7Q&^$W|!lTf+4nVw6RW0N6c$<KO<SmBBmhUJim
z$0uiRL)`mU;T5aYuTj*f?<cEfkKUVo3TbYk<Y-d>4tMt+qMRZkF)J_#3G)~ZK<sKq
zw~kb3<zhEu8-{W{53#511AV}iM7i4}SUCf?wPSIlM$qTwi*5o9tPXSPY3RF{2gVP5
zy*=s5V_YiQ5;OA^f8|YVsu37Fn~X8(MamolG%qX2jUY{mN`6Fp;+-^?LBz_)K#5QR
z5Ddx(PyW3zE*F2Cr~wPK6OYhRnJv+Tw_D2)L}42k`ukD=@<koEYq@;Qkm1ZM{J8X_
z4I;|&frXJnMu+$XS2yv=H`$bY<CzXP3;r~pX+yQ&<}7fe9vJ$4DcOqXv^?3Ay2}#n
zPx)xP5%j31oPZ{pP)7xuZ(iS(Lm8F8j%En^xjlsvTqC(eQoygzk^HFz$K1ScD?<k?
z$QC|&d!JgK6ebshubk?Kd}+f+@1E723<++>W>Xkt+({tjtiyD(#TtRNqmcQbNaT8-
zr8c_>Jxu{QU9zJV!r>LuEC}`WsKm(76={odN`iP(-|102eq#X4$^pn=d8Jq<oV=x@
zAryS7q%!-TTAL#7$1USR!Gr~gJeS4*q&bWreh%WtoCeJ#cGFy|MX?G68$<o+Ip-fr
z9@;gO!pF>3Y$y+ceZ8o%5XtT)>RDLl<rwHG8fhfU&Vi&T1|#S|?@vXNNg7FARyALg
zZ27V})NW*uDk>`a;A7?XrUY@xEV2<Y5IDh3!`_u75=E0BRxVUFdXH)uj>EWo*ut<l
z3;rggR5712Tooe`sOz5X^q@%(Lo<mZkd9-*vnMP)3I4R;`DAGBu#UK9+H$;f{{RC~
zphS;(b~|4U&s_8sERM(=xLo7qUA;Yj8i!)h)9D^GpGC4rt(Br~3Akqa%Z@Wx^J{mS
zx;5j$BLO2}+4*+Q=qjN>G)5`Zx;hiNUj%yr-|16FV%LRL^Atf3lMo$Sx%$>zsTHUp
znT(P$C@wG<4hOg$jWR?;U4?>@*;m|7?{8|kZ)i+$h{}^6@k#l9H2G|2baY!b4Yvk8
zoUi*-a}Lak1kBssMt4}p3Vu`VihNM*wN!KlHMwHUga$@FzTVWZBu#QrCI&c>Ji(8c
z`r@UE7LHHfS_FODLXJ$a9)bOEc?Y*V&=zA%Bg{Ka-Mp!Odi!@Z7>$c7IOt9Y{(kjt
zc%4|hsv*VzGW1dEJxxX}3rifIWocoSO|2wv-`IAgaIp}yd66KxP!;9mV5vdsX#`4-
zCCo*(hQg+EpL(*k!6kEvi$#s^Blhe)=#6c!ZN!mEC3TRMMfpd*e=05(Dl35HC6|O7
z-46iOyLcDMl|{&mBxRM4IVaMgiQNlatZM0kvRgW3kY|St-<~m7V~z>uM3&|#NFeQH
z;zQ}jLH%hq#6s}T91%>a;ZT+Hmm?z`eRJ<fk*eGXV-1`JW;~z9n$uZI(#;j)6fPHI
zk_g9d@T+TWB%zFM26{OhsHJ@eVkn|4Be@KbEKW>`E>D<G8%{X-QbdL3SmBAz56o5a
ztL%Mg&2FI{DFZsN!l^jP?rOvl$YfNujmY3J0CVj~q=@8qk|w*3+F0Vj3`aR5twS5Z
z2>rqoQ}=wsyK(L+Mo%f!&ay^OpEV0(a-Tu#P5T5$q8Q4?iOg(CBxkSVKno(^Ng9Ej
znRrRUusyx1GLcUxMJ%z-6-&GDDp@V#ks2w>?R+U<*yGUC-q}j3vB^X7Z8%-NnEte`
z4P1;_Adw|$Lq?7B!ld(#{`AF-V_6>2q>!s+cQ!~Q^giF=R?JPa%#PMb_CN05csoz7
z2U=O}3(M!@Y?;caJU<=4?M1@KtfC$28du+(NU_Pc1Fmu0(nAdIF=<s%(YHsA1f2Kx
z_p7N3fC*B&S8}Yl`Mp<<=S^gS)gD0NMjWtyb_4C}Ly-AOzFdT|V1|)5DIj4^f1N0d
zw5vFPs<dM$04i7$^QWeJk7~SZ?S=!-=DVR0sC)+eeJU9QyTo(I094w;7{xAO@|Epg
zMYmYi-LX8a8?0CYKK}qW)}%{!xJ`=jl1b-p00UE7#wJt|NxDZ2o=6>m>VL+O!IcXF
z7GEu}y$a*LJt|zs%2o#MY0TvkIDy)zQ!MA#*i$~w5dze}Np{I_+?GAPs#v3l%N^dw
zm6b+Nw%;)NQZl?&@-?XlSCCtil6hJjnCyhNgj&HQQ>$Fa3G!V=-JJc_C$2qdZL+7y
z3hu@JN5(cB^**$rrh*@{Ba#{NTN&rn)N#hj(@4^}QgDMGboU@sHrYueX^EkTNjNGb
zQmY!E`{%hHf{DnM7n~?{RwHphxIUisQdj~cX=N*{g@ZHaJO2RL=cQQtUM(&lwRoOm
zf{4TAQ{RtThP5oMD?7#jjOQoJ$>$!_(FsBs9OXefdhQ;dTAKFSTVJ!>vX_mY4hLb5
zL8j(3nGSIt{{Y@(=Kv0sR})tYi6N3DI&YYOjE(1<<C=Y~oRUZ6q>RZE9o}I)KYX5`
zR96!2l1MD@S>qB!B~Ac8)~uPl&ATEcl?NZ+IONfAu%#YpnJpuE3aG^R;GA@%MrQ@1
zfu2Z?WQ%q){{Ysh6hvf>(%W$?+vOYh$M=4@r#Oak4Zh(t-zbi5bC0J%#Q|bi1dSSe
zjAQf5Gb;SZara5?1xSgMaV&^OI4Up))~S)S{h-K-gzb?OpOp6e=$82rC57fj7~3We
z3ZA_?RVxbiF38s6W<|O!BE%Vr^o$>GT4$7Fe=o?`dY_*pRePOE(i=9on%+&UpCFC?
zclG=#7;kT-%%V8rfs_b*(U#-X)hz{knwFEz`?QD!8;MK~Ppw*p`C2to5h@(++Hg)k
zrDFczd1|*S6lP7UJF&oX)B*h}dsmbr#-n&6fCe+qQJ$6P;Uv_En>q!!i+}E!%(4N8
zX5v5bG{0#w6mWMJZMad7#<Fd%gGAGZ!l2G`+;s!qrjq7Oi!^;(032`ydy%NEa~;b@
zO{&Ap+JUk29s&B&+G-F<aM39R&}VLXpYWziixg^Pm0eHzwFidJQ%sp{;f3COk1%0&
z^d_s?AT%Vql=B=yIYMP!&jr2xs;f=ruip8iB)Z4K?mcNCGN=hS3d5%#!&1GgyAQK~
z5aTlK!h=UT0*P}NjV-XjBrUr++Q+VGWCff?#C+o<`iho#+=gg?$T&b3g5C2@QM@3L
z2g}uf<M5^J0E1>^^Dym&#?jn*Q=_-LHwGAIR2v7FkIx7APob*`Zz2$r00HNxARd{i
zl`|o>b&h911DN_BN*u<bibBpsA~y`7vKh0`d(+=fYrT?4N|kJq8ym-Nohr=D5|&pb
z0bCr8MKK;nxsKiy5^e!T)8F2bkyb^7(?UcUSQTEu&Ooa77Lb`v5Vp`Zy(zrd9dYw3
z6=27q6&qa4jLqkv0APZ=;MFMuu{FH63>q156-HDJrke`EAqcaXrICu2QhrQwPqkM2
zOmDgO1mghbmO1HC=?QWDqq0kK3*f4B1J^Z5?b#D_Sh-iUV{&2)R1KkdKb23UXm{F$
z&}i+vz&_yHf-~=0IuC)b^}SKIT1;Tuh=LxNJfC{@{{V(x2v*uiX1Ii(F-H!V^4Hhi
zy^OOct&E?&v5i{EM?-?}2f^J=ZB`4*%QDL6ELeXJ)7rh~;rGG~I$dfQFg&gq<=KHA
zE2i*=gfuNR<@<7Ez;`1C;n$^a+FnI8cxxeU#BBvmH!gTJ_qa@+mKrvSyEq+5NtzmF
zgw}eax^5Qyd2{~&d4S+n{*iEOq<fpP{$X4Q`;L0nEuN`uYZP&}?+DJ-2LK<XR+m_v
z3rTfxx@K$?QH*n6Pln3*R@$7^E1fht+FOZa^9T;45=Y({=~*}aBY44Kcw;IK)CUEL
z^{#gJU$|J@GqBo80P~+}&%M+yZ>3)}#tgU)PeGoC+PzviPc*M1o>+*aXkF_v-R?r`
z`^DR|9&$V8sY`Ur5N41D3`TRvs_M!Kjs+MT79O=;?(b|0Ufa|cevCSCUfm2OI#IGm
z9ZK?>EzF`gjwMoz{KvbJdgie8i^B^^EU+L@;BFsu`g2LIYPQ1JB}QCAxRFEhPi||?
zJ|X-~vC{12fL(})$T5b<Z~nb>N}5{BL@2hCXw&h>#0xzz%`Ww0fxjoA^sfu?@5U*G
z%#oY5jU2HOGhi)qe-(Z;TQmk^aPhv<h-Ep+KA?J6hwGj%)V0Y=%bd1D0NDY1_4Tia
z;tnvQmP^@T-Q;ga4(lt-*YUr^tG^On$z@?P$81!IWjy5Ps`^(k1++^Vy18dkeqV1|
zZM--o`2o08JwO$9+Q77`A-PabM91H+$FX?4MqypntnS(9#wroA2rR@|o!MfHVCBI(
zy@o4N!ouP?l_W^ix7<5$GHLo|o0(N&kb=$rsEqSn9+RL+6v||QS)Fh|{vT?>@ru;a
zF>+)&Hj+{xvPZC?ETkSuJ+oa7nQZp)s8<TBoP}SyeQ30>@}gi|p+wxGOkjRpO<aO0
z<ABc4;P2%L`~Lp`O7gK-*zAt#R4u5Bu|dL-k<gw`Jw-<)$d1^uxK)xuj5>4Pq?#An
z?)M&YgOw_qc6)o8&k1=Y_@BsA695u7=O^i29eVCe>x^t&lIfn_dsQ*JJYTzE!Bf~1
z=|f5yTq~<#0~r9}y>KeHXHt@R1!62?l>*_AjQ(dorA(141!F8@cqxbD@b)#x<#R-Y
zR*?zBp`_iokUr?_G1{3N0WM@_xjtUdPDdW}<Z|*VtZLi7Qdg=ULTW)QO%IW^qzZ><
zOl~djQ==Hj;2YH=z!~6?+uo8PY%W?kX38pXp>T8D(o1&=po}`9Rm*Q|vX1B8qc;yC
zl~x;Z!NC6jIH+I|jfJC*RXF*M_2GR7)}?t?OgvJ8JE{)7xu_sAKF(EILRVvTLO+Y?
zPX(j7RGBuRL*=?~3y!>X=9PzW<p#&f<umiPI({_c7;xkyxL`0r$2A-<Nfab0U`mpy
zCw9(iM~UVU%p2!#^_Vydk8ati<rs&~DI-S??f@$w>Fy~fx(=mKhGpc8j4{U*A+j<u
z%0UDk8K1s7R4p7phF0XS0fsVrf+|p4jqVvGhA|svM)|ST4mz5SNx?2(ovoKu9la{U
z*-0Eh7C;YHVlr{*?@WdljnX;ooA<pj)YD4hA!+1|^3k#aHm2jmgVPkxHbxEvay#Rb
z6qwjMaYD%=&JGK@G0M36op>UqiXm$z*`-D=7}!S#C!AGs*f%7#$&8@5WAb5@Pu(7*
z`qj8LdBWn^cOYB_W0g4S2&kfw5>WC;RgnU^MS=9ssi`int)PY_lWMXPx+B97d(mO5
z3`=0LHMg1okuVil<w-fIBZerqrQF!S#BJz(>NV6Dk#7a6<9_vh*<tNfZZ%!POisBc
z3IOVT>7^zsq>H7M3YKE%-`)J_u}^5giOZ7Uj0VQj+Nm4(jG}kQVT@yi&OIq6)Fty2
ztZT7O=9B@ngVbWFMX@;+=a`UGGMN@I4mjL<0%}Wp*dv@7(8|GZ0Qo^bk7~u2P`LX;
zSlL^%91ku=IUM!JsruEFlI5-yVN_*c1dhY*RdQHd-HXxcHqo;}l9rSLLKB_ek6~98
zt==7;cE)!7^iIU>@ASoILh=|MW!)yxhcT$+dQ`xyYOf-25AO!<Hva&PHDniTy(Pp!
zgi)adjwK}HV8;~`&LRX(=yGtfFR!<usEm-gIDO368~1PrVUG18NU#qyMnkvBv6mr#
z+QF?N#d`tBWpfWKF!2L|<J8na%&=nGe1#>Q`k$p+iXgHXCSdtM5Gnhg<4_fj3)Z^M
zTPk*R{VPQwF(6?y%Pv?G7Xz`u@9$GDoBp;yle2Khzc1mMEz3lut!7qY=K%El2Wo7S
zM)EqOC3X-(;BtGBTE&2{q|t_XNkCT{$jDD)R~|S&vm;5OX&AXAgOA79RaA*xfGSFL
zkcQ!x+NQNl(?@SKpsNB_P<~P9rnZX`6l{!cECUw6Ksf`~H5<zt%F|p<JhbV7j6GQX
z%##Z=`2=Tf-rmNflF~H<%>!&m$O=ap^{Oh&&sGvBayF1lC<6mE2$E?WtJ~}d#fuza
zoBCFZ*pjMchE@u@zC-KV+|$~{On8k;9-9YHKD1c}D<~s7yItIcc*=jOUJJ1LcBtMN
zrM3aHw3D$>N6LLYzm;m6e=bsEj|z$iDme$%k*&mVyE6R19utAP-jj@2ax*LJsOn&m
zT^KIq0l6OI{3<wf>)#}`#GyIPLjB`glC7tbkb@d5kFYZyK_i-9Ayzy>NMhS!2b1h;
zo}^W@DMM2tJvMn8$ev_SUzQ7uk9wIj#I;cxhLQ2K4C8q0MQO`sf-U}81TGvm>ru%x
z5igx2%ktyNRqAVoX_TOmPFr{dyZP|SWK=w_P`;m9NaEZC$qQ{MgXVHTsilq!DA_j4
zA#AanKLDP39@N0Vr=C%XRU~ci_*XQXicv(-$W}d&f`|vqTz%u~P+Q85(neG+&O?Lu
zjXvVy*2NHBsq-e}NKf4Fj8qcGEP-GV`D|Z!3VCk-0F`9ZWnCibG*F^QCmWkTyTLg6
z`_m;m(S)cs{{Rbv*!Ci-mb>2^Q9dJf-tJeopsPWC(Q%EYHXvnWJ-TEXS`POG!m93&
zzSEDB*WQ^WvpAAAi}#Nn2_u|#6)|uXL|`cAcy4zOZ+b}aDDxsE!VbrrP!~iA8bJdp
zhTIbl19kSr5G0m6ZKEVIrb%u<2CTbBmD|%9E7a6-Op&P$gXQQ?VeeFsnFxkB<7iM4
zjoL=e;7>wn-cp^)@r|P!0-PUkYCp9?T>R$&FpZ4-)Tuj086CqaF7V7g>vzpoq~B7=
zSjz5j%Bp^1eJLLba8qf<K{Xt*Pl#l7%Fb{Ue-OuCr9&Z>=sFh&&N*fraoGA(vj-$u
znpoo>W|>%Lmji=}Z`v9qX-M1x^N;2Asz&lfm0*xISw`75^4RP6R1YjruguN><pVkD
zdeO^qa~fZ6jDM|gc7cWTKJ-a^L6EUixkn5$pK8l_r->2O!YVN@xN-#{V(}Y*k}Kz*
zpNx9Z$c4<!8@r@`ncygeK3u;lN3B*jqy=^P2pMMg^c7963~3_VLnE+E$si*eeZA=?
zo5~yIa7!ji5y2g?TE+<y<jGn^iC!0TwbZfN+>d$^`tIlExMkWR#j2u!6pZAa<e%wP
z{?5&GzI$io2Vg#<j%vr25;pS`mtIEBpN(kJM5f0ivOK62K_P&0!;QG-j`U8J@v_Q=
z*^)w4LlRFNeT6DU>Is-_@|dwwKK^<DdsT>{JHtp-S(AVO+`^^GBUdU2q`G4!^-$m{
zG9DM}??8dv7K-J*Orda22_21J`x?5Wb1N9s?^Hpw?)A@lb=)qId8)YE%AziQzlo@G
zT?fj_K?E=?a<OkTksR3LKK_+D#_hM4X$KB^XXq%F22+BYS8hV%IR=&%WdLV82gxIK
zBh&P$Y!V(LkIMT?$0DZEGt(xif>j+tg=Ie~p5wPZwP$P(D~Iz4l>h|4$~{IYiDws@
zS~6Im$t>9*QdS0;2v0R7jK}6e$^)u47@X%B>^gmE%NvIBL~cG&k2vLk1K0Y~qKj<p
z50o6C-o;M`J^qw1jv}II*9Vns@O}M-7kve==$c8>&)pbU#u&2v%sOCwDZwqSnM?U)
zqa>;s4-Jk3Rc61A<h+o=STG9=kuU%b<a&cZxZv#(uyM42nQpnwK1l~UMDK8^BBbOa
zNr2fucBfmc<M(J5HTk*w{{TwKxV{C<&UZ2|EUTOjn8$NXj_Feq>KlY;KX!m)1F`oe
zuh}+FwKXNwtm6#!(j;!_`{iTEUwVP%kv2drW`waNV{@J7)E`duo+Oo!#VjBhoQDN@
zBe42Ye%UOMtL8;1kOZB(ap}^jQ9^ZFG=H>G7iLVbINnLYZ(uztyc(n1Z#L#nGoE-m
zPJIngd4ibk%1EI}7;+9qInSu7^0w&$+ew^rwT^c$wP>lu5a!vjZ>(BQ(7eoD3!fyZ
z+Q-!U(LClUPY%q{fLV{<{{RoIRkemeAez$ITPcDcpRPSAS33ulxTyK0Vlu!3@6cwS
zBDndPBj1LI#cL;)Sbq4oI3A<?DOTpunZ&A9HvZ&^c`xr&^C^;Th^!VrGBsh1$28L5
z!RERuHtfhB_<#EKRwnG0_f=RT7oKj|H)2T-C0iY-me<zv+capQLpjMWou?hXwN5}U
zBzu1^gkZssLOT)bR^d`+Qegul@8EKA=~ZM;Gi-h2bKOT8D*0fp3S^9~I{j)dw9ONJ
zq&STVg-E22EV%EU=B19^5^+7`#EAf1xj!)U6cvhS-qzuO+sdIII^^{p^oH(Hxq|Un
zCB7VEDyly4$6WWvrAu*WuF<TvWQ0)5CA;J1$6x-nUXIaZP|qr?Y<^+LU}`qE-j2+T
z7%+l4;m&c8f2BTVD-}M=36uAc;2yEN<37KgD6?ln9M;4VHlSt%k4*a2m-FPvkVbw$
zFcXpJLG=L4Kr_Fl7-KG|h*+y;UV3_Fi?FgY<hP3CvcbAZ^Ry~C!k*iQr8fRFyt@zy
zqKf5q?@_}k0~xCq7CWW;X5L8H&mL4b^grWEENLgsZGuM%4Xnf$W8a>&X_C<j+mbgw
z?;9k^C>Y4>2e9;}&1THY8le$6+bpYtuw(hwgcdV}DH28qeax=kbRL5}s>k+Bvq!o(
zh-{pr5ArCxxN@At*6AZE3wFvmF5$l5?A1-}Pyz@n3Fr^qKDE7nYGaKq=88hiA&d}k
z7?0sKSlOyC+M-8hiHQRpKgP6Ev73RFHM}buN#rnez)igVbxLbDjQLCy64?hIFEzZn
zPm|@(b2iwEkf$V>2dC#%<+2e+`}nr52yNV-t~*smrJ0+7gDtTN(leCU3Hj9g{{ZaN
zb6f5R(jbY+&f?qwT@0FS-M!3ENP#78g~mW!WL0a6IAV%4Z6-;L!;!g9L*D@Ot>aNM
zHwIxyg}&+C{pCO1q%kp73m}Xu=O?9J@*jAQ?E4#W1zQIrrYIIBN!Hpm%#J=)Jn`Q(
zvS`l5LAaobK)F(I>C~E%E0-ArCKzFZ4uifaQo>0eK0zNp13hW+*(*L>8J$lU=uK9F
zvm}R8dv*a1Rk%6if&MjW9aZB)6p{g+a(dQv#4WJ-&E@iOP5t%6-b=)&7BRR1&fdnY
zST50{{jYO4TZyfekjsT*jtKVcR<!L&qY}?6f*HYdJ%Hc=SS(jQdm%YI0C*ns=x$s_
z%jT}`svDsuo}%VwXQ%4x_Q3a20PPqO5ZO{O#w%Y=)-BLR{%IlGVzasV7<D99p24Wf
zg+OnaPC5Qw^?E&ZT4^nz^BKyIFe(034wPlNq-waHm1E*4A=rWgFV5e*^D(&kk4n*p
z#1@L{B=AnM?;c@!K30z$WAU#mgI`wLo2JMlka7z98qiM`wYvgtIEVuw#&SI?InZ4V
zBZxgt*Tj(p*%~qc#I6tC{{Zz>h_#izV3SXg5G-Q{1&8(ZuPILy%Nj%Wo7Ep`&yg5x
zG-P$%=ql~Ej^i+>T}C-1P0Uwm246rAVO*2L8^;kAdQ_Uds#!+{OGwf;1@X5u=<nkL
z&3mAJY!bNvG1oq|=i|jOU(W>ld2l{f<7XV!#g~Z0t0ZWy@x}szxW;{R{VPAK$kA7c
z*+;37EQa0%DI`WPdYJ+01xFLzB*_%f>^rui?Ee5(D<?|UB5B@MNeaY@OvSh-rU#{M
zT<b4+G*T|cE^xmm0D7N#%28?9)jnh-D>UdsA1s#v<pbs_Ju33xD#rw%ENnz`82Yj5
z2<ug%kWC;|go#heGI;jINgVAI>u&K9*~2RJ2iB@8!e))Fs}&b52GXsTewibt4`EG6
z(g+@C^DA#=^7{{_X_9J;A7&6liUg7MCYI6eWsWHzWl0MYD3Njk_QhyYF2@StE-kkN
zkbKDFEDx<nEr5-r@>r3QeaEn;*rnW&Ni6V{*gi)C?|W6%wajlkc~D^hw7lT@iq2AH
zsNA5I5($z}>;!}ZZp-r%*n%q6y^}*UY?1J?Ze#pF_N$L&Dkz=>V9215dwSxm+gc{|
z-Y_IRb5SX_Tw|$^;_E226o0jbP|@LpRpWj!_;A{b%IgZKDYYCY1p3#%OQ9vmWuD<y
zHeZpDecbjw^;1;vJ(7mg?gAB^0)nSGJ$Ur3XkxvRu{Ch&q4GAp@Z($3{K;-?-B89n
zr&QsGuduFS^Fh3^nTL|?ftDpWC)&Qg*FGJiZjR-4jkxmHk{93JxDONjC9}DFZ97>=
zfmLw8_sH*Fr3`#!D>KfmfRr{qdTV!qLhU(WpZ9*Wkx1x#q>x~rx(5K)p!kR3Zlh{v
zkuBZCQD=^<K9$Nx;T>vO6(G}^L!7xEz`m!`73s#T8oE6BQkvY%S;NA^X+=2&N#M7y
zwM%0>vBn^IM(p*+LH;#8){${w%M`dWmL*0q0QyyCc-BJ+A)F2z@V||32`k*ms~2@>
zS~QMNGb&ebX6oPJS>jJJQu4n}V+X&|rM$nnx;{e?{#-#&FHCz?Xk-JVL=_(>J#$*s
zs|iot5{pYyLKvK*A&3TbDo=1Lr1(ehzhC&Z@dHoro{0|m9%cJUR{sE15YFcJHOs*(
zS^*?ne7Pe%ThhJP_9OVm;4g(<ExR5h(<58y<5bh`ZVpGzTX)c}7(Dgq#d6~3QW$wk
z8<hyDO3!26=lEfv{4tOI6^DfER!JhaSxw9l<)vo(***FE`q$2Xw3el3;a?EHhUK_h
zo5zH;;Eni<`eU~|AIiRk_{;lCcpt&KVLlbsW0S;svPhC#?pE@?UN)1{kERdSz9iRg
z^(}W^xz=@JP36k(xF6p=n2)9_#KB?fSE!{ejjGBDJgBK{JhqdUc=P5b3=axDs^aTc
zK}2aOWOJDmpT0n>+rqZYAVPj+%lF28DTyP=BCCcha2IbKJJ+qqpzO>n+PT$uZ^hbz
z%23}lWeC{8usQ5&tkC>%sSA}iT7%rcCfW+FcAlB9GqPhGt>z%ur*jj*HQ9Jl)Ws?l
zLXVuZvcJoQ?TY2A2)%`6bJ%n(ZZYM&vWd2w#f}I#>7L)#y1O3}Y`0~;oF>#R(Utj_
zbmF}4!}sYOsa0ewMne_OPjT&ADXM*xhF$Dr$Cw=S9;@sR1Xm33^yj)Xh9<2&nb7K5
zq&E<=Lv$7=iyK^%k@c@R_=BuK@kwtkWQ`E2g=`Gq_pSYB#8JZlk#5wJCS*`K9B@T>
z&yO{yZR})S;GRI?ay=`elodN!Xk_H-PVDn-PH8SRDW@O=-Gx={RbwHE3fbGs?d?~!
z6xnhI8(0jh4ng&*POf5d3b)EjZ0*llO<3s=1uKMpGmsBjT;sPm!3)qDLfIpE;0$Jv
zZQGP=W1c^XkPjP5kg<|G?e+eYjl8Ft%1H+Sv)j^@l!e>3?w)p>8bXMnkK6;-xjn@I
z2t&45FdxN69FhYl82NalJY)pOBMSMz&!s2|enntdjtx?~0nSXT$RL5k0ggTCU6sKN
z#zsasrH!MNHe)QKf;h<c^`$;bFa$FaaLgM66aW(H`{Nr)A0}5d9DtSDWWfF>=}(=&
zjCn{w+<G3g#Ew}bW-yYfGUui#uosBfWE3Fsjx)Jw8bg7-H;u#{ybviEuH0d_G5HQ@
z7@#=^J+bRka07x@4}tut8Q8d8+1k93(=?<Jox^E8jU#!UXP5>8uck#H6mEU4xZ|+y
zD9&=E=bzS^LKX#y&Oe0UQidCV0OuJz&;^Y;FE;WYKHcPu%oUO{0~PO#@t>_nappkg
z+E@zw#BMFf_WIP2-g!)oJB$&5$8SoCTaP#aCe%~aoBU`2HY=U7E<J-_(mLbjY=W(o
zJGxT4tZ{~sN2&R`ibLiQM#acn;GUv@5URx+ImzccN$7oPCE#V`R%RPYDdZ3DQpx41
zVo>f>$U^xb`_qcJAaJJuy6xnO0AVN)e8H3)44yMfmJ(#Ja=0PajC)hO$6eAmLy^~S
zK};qhLNv>Q2Y$ccC;{SGf&~O}Nj!F=%q+}M0L5^iuQ{ePY(Z}`85jpN?s5Tf$8xyO
z_)r7hRD%)BhA@8j9b5WRu*m=elh6^*N??i>W!#1KoZ*}A4@!Epfy<CwDfw61(tsK*
z^AQq2-!2(lPB3%clwu|!{M<-(mP7Y_>BUuk;}SE<lg@o9stCdrWKs!e->XmqcexE}
z;DF7;k55`$D-q^y$YMqgKN?jhBs4_lp%~<PA8JAf{nV~LZ@Mv#C;?TZ+A;|tjyDWb
zw<hw@?je^73Ft>!jhSO$ByGyw)byvW5N#(Me51J(0P+zI=?+xmAY@YErI~Gy&Ilhl
z9S5QMQ5)=#Fj5MEjGU89*ibSvva^lBaf$$uR!K6<QJFd&ypiov63EChq0dGu!u@^f
zHz4lv*M1dA!($(fI%66rj5sDm$j@(a=|B(_^BBfR%LBcSKtKBQ_<+ipqdNh>P}nVw
z`ShmdA^?(1DL5_<@~6$VNL$Hoz4GoW#~=Qx0CpQ-AnZhPT>$4F;YiEpAu0$Vw<_lY
zJu)Z?42tqG{o>%Fo>UK7Y)v3!b(vX|^;ORqpjRhYOIxJ7$lOTFj>GxWkVsHYk$|zu
zv39R~b*PmYqb(p|8xxi-!k=naxl4vK&iht4!V{b*1B~(1ngI&2pox-l%=tSN4m<D-
z8>Glo8GYFx4wS}IZUfDg$jY{I7<*ExvpU8YHsBslO`f8F6<L^krv-9OM<%9%Ra|Z(
zdYtS()}csUiMjI5By2<pz!>#Dl_CQODw5@!Dusqm)|J>65!)L~U?_4_pMO(Vv~M;t
zWF!{dfLw8k&H?3hj6hM)4a_<}y<O7YUpbMWP@BduxykREQutXc_pjMERgX{crH#Rg
zOHprlt{k3DbI3LOZTl!{aOyfek!C861Nn^HX9F1YufrdJ7n9ofg3L&!U9zJCj@jvt
z(!XiHV-0PtbPYZ^({xD!V~`5ucNOuO<MvWdxzmQXHmBD%%w}BU1dp50)H=#Mfe;}W
z=Og(VO)7Me5X3UP24m?{>Ihj|CjbsdT-T3#vbvb_l80#raO4xkJv_Oa9#`=F*BJ!;
zDKD*!$}EZ>Xy<5b5`7IaR2K2aGdT?BfO}KbYJl?J+C%n7_;c~=!q<97iF61gHxZBl
zPq^Jx$EFSs)K}xb?dSgh1iSH9!8@Dp5otP9_Zl*zyU%48%Wl~v-GCn|4y2#uoPO;`
ze3QxL%aXgjde#?@J|1{;#`=7kcC}{{30H2?qm}peuWtdH)TX_iPrS-hmp3v$mLCxK
zQvU$McT!mDOR_{5BLo6HN58dYg+^~KM$QLJ^Ix+cw`cqj=SJ~1oqw<V9?-0<ul&}z
zg2GuDB9NSxRX8}$I9y;J1^^iRt@yj}2gUyY3^n_W8&=TX)@wOTcPk>FmHOloIZ`lq
z{)Zn=PZ3J3xn05eo^ll6KU4ke_NI(rmIIoeNT-2;duCpFJ$d?5Jg~=T#!36WwXrOV
z45ODnh~|Jv`H17bY2|k1ik`S2_MpeX`=ABs>r6s6@~o`jWpE1))Tr!aRVO}Jz)&zV
z?@GX)t;kQhSCT2BIRM)z8@lBBPz15b97-gTJ;gauyBYe`h*@NnX2UQCb1DpD=~Y%x
zj9h@k4u_2UQ_@soq_0juCy_;fnpIaoo1M#l%SJgYJ1MC4vVpq<4hUgV{iMknMdhH_
zOJs0bk=g~?Rn9i$bJ+X)QUVrMVhMaG<KCk$g;2!oEy|9@r9GXZB;@VS^ZHWR+DWL~
zrkM#(GDDHaucZKYUk7|9b!|`WGr;kzc-tr)GuMx9E9l)LMz^=Kg5K&$o^QYAuL^kR
zz*iUWkHXREwu0Kq2c6#C5)~`XKm_2Q#=R=Vt#0iN^T#}Lvw21}H~<baUTtcg)^}SA
zV!5@9$Rt~7V`O5|KI|(lIQmunHKLLTq-$@S%0x1|U<URd%Bu@`<aC=*N827(%TM`g
zy^sF@uCK!k-glR90y_{9WK0}ms1=TaY`nAT6Ux!OyBSFeSO9WQLJwTj)~h9ivRmE6
z%%#715N)_V=BnGlJ;l1i6jMUWF%rzJ!mp_Jt5MoR9HA|M4+sVXEK51>yFE$klh%{i
z5h`A*OA8cJw4L#`2qUqq`)7*IK(dcAV(sU${H8J6<@BpD!*e7L1<N3P<Twd}grDW@
zQry^C$fEA`i^f0>s7lB{?!Keik09StNIXv@F0XePnkZLvQl}XFJDSVB@n)On%{9mF
zA-ce5!TFWHzCON`ljt`y6}i)I6@0RM#srWP(Ek9QD-v5qxS670j{+RDgQiL3XV$7J
zEsIm3zW9T8W2T5<h0Vhb5c1BQw$(dNiLAmgG|ve0uz`-#zrWM#Tz`vvO9iCSyU8ja
zGt0JOI7|!-A5-howHhskxvN-@?F%4>%w=fE!(+B<Wk!;P<Q8o8JtN0IX}eovF-JTo
zo==w^zUTQ@Q>W|ETq4@fXC!%l-ZRUb@%NUzlSt9^bNidCUKTx~Fh7X;9>j|6d^a84
z!H&}L=Cm<kU2an?j+=i@E0(lrt%b^uM7F=30>+G{MQo!1oQzhTjmeViCA`7am*;fs
zdylPSX?B9x!sKm1g<xAaA6nG1Ng{{|A;dw;!GVp(*FEcz?k!ErHb*FlDzbyjDme$<
zuUJncG9w4yjlt2>Vnyfm_v=(FnWPbgMJE~ge~A5R+8MmIFySz`NlJn@9=}S>>dRIw
z+s!;f{SMKYor)P*vw_?Z?dw|>G9b4|6@-(aW;yTa^sK2xq_*MZkN3)+RAx8YCTx0t
zJk_Cn_DCXQ9#9Rk068Rog=W>w6VT|i+t!XZosaLBe58?uZ|>r+TgvSFAwUt=E}(L!
zztC1BTC5K&a>M20%LPk)&@s^a)wu521Wc$&d=SI#vYv<OLTQrCi+N*qNYsPo0-;Ac
zeQN%dYKjuh7ZR*(iKH!@eQO%c<w=@IHb#U7T=n1Fk3m}6Jl65~x6z=G%bm)DXlBnW
zqoAbILVFu_5qXfA;@rWG&~wgxy((0cq>;-DWT`6n<Q#gBTBBmda*>AELuMhn88vC6
zB4W@oi2woDs3xlDrE_vNdv#B=BB|=C2h1vKMi$Q_wY!Irxo15w(z4#^pI{tg9G-AH
z;;u(5vj%j8rsV-0jzK=Z{c6h2=9Vq3($0R*01Dx^Fvn3=j`-!mb1X_6pz24pR)u0J
z%ntS=Yph&;H8Vt3<~U0gTq_yJJ%5I+I}+8+8$m4BOD@*g!Sg?!D)4EbM&MyVDy4I~
z>s4*-m8V#snUqJ!8@};9{*`!}iAiESuPH$+%h&$^*G)>~xR&(c6oF(iG-R(Q9qQ$@
zfv%BdW&w}P2LvDU+Nwk*jv=&dY?fX-{{V$uw)15R9Et``UH<^P??j4Q7wnl;N=q*G
z9SV;B0OM06k+Y?wDnhv<b2lLO%~pln?Gcb;-SZUWk9wZU+Gm{k(xD~4bF@^Vm5pfN
zRAhJ=v$tvVKT4k6rep>A!91w#Q9~-2;<pT=VL4)RQpT})iM$0HvXO4VKK0Ee-sNat
zw<v_Opc{azw&W`XasbcDDuuWzjOrWZKQTQ;Sb{|xPV<C2iJ~sXZ5lR_l!=re2_qkr
zo(ZdwFhG!Hi{~5teXBCwMu;&kSUYlY!1fh>%4J{>@D;K~a%r{}F2?wF4In_O2o3sy
z?^dmtq)QuyBxI|T`hWH7Jwg@*q|P5dG3)L0t7^vBZ=FdP>7L%z4nwh{9mGXKyhLR3
z+55t*TjWSWWUo-!{VJuJmOB&@f4Y4t^|h%$OGZ$WgS)Lm1X_h$vdJb(gOYm@*c!7E
ztIOvp0CvYpiUnoh4D-nKs|cj8E0yj5=~*^Xh>^#KDvCfS?y>1kYXoF5$ixtGxTO)k
zH=;8S;U=uBENB&xnRAi{V@25cQT%(!W*#`<mf!;CXjc9(N3Ua3L1p%3WVDbMjmE%@
z#z$QHdee%+w!mrkfkI4Dc9}9z_apfVw$aHgx-3@W-X@#pmB$k<ImdCD{T6!}Cw6*A
z!XFpg!!&m0*T{xu3v^^4za7^dJ%x21KC`l)PLu4*n`?=DyM{rRG5YT8Msr?8qHC76
zT8io#Vl+j5Li_hF!NzgxTYfG0koujBIwqAf+gjT>C7cb?NW+p?es$+MQs*h!$0g!>
zSugJ!OY>uw?CwNUM7RST2OoK{imPj+#Vf^bx@^vpF*iHN+C4GfIqh1XXM!*E3vdIf
zd8;8jwtIkUPe{=0?!*?$a_cm%86xvC=)K$d*6v)f1)=J{uvfr;4SZ7Z%0uGqE-R?g
zMk?-^^7$a(bQ}zRAB}qd0PQRP00h49?c_Il@54(^?8}js1{|0qQ=9^y!b$YUJ@H+S
z{1Z381}_!f-Nj=OwidXCP~SPpJA({z1_1}JC#E_3N$hQ}Z68c)Wt159mm>kszqb|Q
zOBYw$O3v0C(~Q&TeiVF2_*3KWg?fwWzA(_91yiwZ6*7d5IX$!QT<@5q@D5MjZ2Y3X
zZT=~K%byEAE@*RUclt%7msb%o1d=ha&wP(eX1)gfsDI#>o-ptQ!+3|`q)B;WEQ}|z
zQd42-9z5_@JQ2qoJ^dOO#U*L|;m)tA@)%$oq9|mHe9n85L|{fv6qC>2IRsVRXTtjD
zhp!(-*YsPP8^|Sfk~^5nk^#ZSM>s#utNoq#c~OwgK<Urp^seO7Eowm`Ga)`;Z1Ipe
z9@LWTXhpg?7;La%&(wQV#x!{YB#I90zF5h}y(ihOBMc<q^xe0E>}s?Dn-+NrqYhL6
zGuDVFmfanoB#<!Y9la`5jxygYWd8to=O2|LTi}KAm@4vAo_VEl*@?BCgb@(j_1nlK
zboZoXC+^Cwqps2VigZz+DI2jnTX4bWns><Lqv94VgpBjF`kFwH$Tq<sWElYP9A}@U
zJMDWNzqC{qW5^r>?d?)BV0n*h`-s}Uj7M==z8<&IrJMKimPg@`u6gu6)h<aCk%{Dm
zjJ$Xb82N>}4%w-VskV>GF^6(I$lVFf51{m|9}()BW%+3IYgAa{`D9FBzB_x0&MMmk
zuM=(~h9`r^Phm@$*mg*bqhMrMn`wo25g_T3I@D0x&gUg?IXNAw<Z;a+$hUV9L<D03
zWXA4(>Bm}eL^6n_Qd!gtN5FOV_NUA%BDdK>y9Vg08*%CHPPeua21QbLbRcB&S0;^}
z5>TJIi#y{ZB(5>mpAEDK(yiHe-Z+%SgM%R_x6+l^?22a5fCp=qUZV#K_4lh1hzL_<
zDV+ukv6F(0kMX5R#A~|d;Ztusj$7E$K=Hh+(Xe+xylmr=coeSK5q+7VM{&HU1)Z0m
z_WIN9?Yy!jwG1SW=QhCZ+C544roGHZA(55$Zjv-?WPe&;wFh}E@*_hMnAf2s{{Rpp
z`A`L|KG7UBt_qOFnaSXDPLUu18s_0uOrLmq_WbI%7X+>J!9p%}#-tbaBCJVv>36;<
zV&15yWRd3tjymy3wDcj`V~S~KMk>6WoD~`4AK^^|7AS{4WI(f_$&EdE?@=-R@Qq@T
ziVfH;-1_>`+cSv-Vd76Sg4=(ewJ}_KBg)=ww5sc{Mu=CE2Y;<T(#fManWTM^e(*6r
zFSSI4-bH1#X@WLf#ng_3k7^N|E*T6(*np0BKK|MD^`J{~dztN{ib)JcC5^WzcIf>w
z2lEs&BfGT4hGXETuhNzPvs%S0R?bt-aAkP`!TMBjUNfUBI!K*a5k^C2s6WzywmoNi
zr8kkI#6xoExKoc|-le*@ja4LJ#I1}0+zzIzt29xpOD+aZ+;C25%)s0Im63=cjA~CM
zk6yh6Qm|Zx<(|yCWQ9frx15kqPHMwVl`7$!vVf9<fWE&|PHpcum30sjd1@sXA3FB>
z(Qjz-O}YtwWaZOo#s{TU#b#F`R#uL9ff+ahjwob?Gv!2{S}Jg4eC}h{6>8=?Bp|+a
zk<QlT54}dVsq&SQHv^P)<Yt;;B6H=rxFBq3!paEh2l77j!jg#hMB9R$#OEPJTaMk7
zvt?BRlO(eof_(?2Fxs}@?-*6d&fmJinrI6CNf|B*?mK`ZA&01>Hta2lNtDUv6Y_(V
zUtCnKw^Ag5Mtq^fec1hb3Y8+b^SFg_$^sMvll>_>3#klHLlxNy;D-PZ&7F<kG}Mv^
zt`=#niF5Zhx68ZR+NKf8BVUsOIX7+F_t(=tx$jikb~8@Oo0W)ELNVoY+tP%tCfXut
z?k%0<j$p^A1ZN+eM(W^?Fl```aJ>okq+p=21a;)+tte%Lvl2d411F_ul1R&TM($8<
zE%TmNHSNE$f9&yh<G&Qx$*Za)w^D|RH;-{h!5KL9Kd0$j7s3yRlKf2Z3|0|XyF#b;
zlVc-4-S-E*ex&}xU$d+_ZjlFzCh)_^x_Mq+APTV<+%wPD+P%!L1sD73i%x~pij<F1
z_zCc*!+!}pAiB1oCEqMWNW26Ijxe>O9h}}W*52uapJIkSe4(5#Vm&JNi}h)>Tc+^t
zmus;OL2=GA!LFymUKfhO7$K4!@t{<Zq8Qx1{<Z7PuZf+i=AVOnH*04ET8lOziXf3I
z9#nmM)y+o!;_82}THLEbgd73W+chS+t7-7Swl;R`q#wAXay>w;Eepf)h)juOTW|*j
zdiTz2mQSlKE{LDOS{|LHZ<g^sQ}gV1`~K9;LtVSoH7B=$%$D!K3&)f_395Rf^XfCK
z7SLufCI%b*Qw}L1PwWWAqFl4wPQ<%y`9jpfmo%>T2~8qBR{qaTyYe*aG&1bN$Q!Eq
zA6oMN0E^!nG#`cD5}#Pq?}SpuSlbfAAo~3(-^SmJdJn=M4qWQGwfrJiRy$koAp;|W
z+P^P<YcJYo#NQnJO*A$)*Hgftp^Dg)L6gBfvHpIYbt}`tQoiy8mh7whOa9e<Ecnsl
zTboTMT6nahJcw0EQvU$nIXvfs=sEAkJd!I}GLc$Xu_5xsUzJ~c^{bY8K9y@`ES@Gs
zjk?PrAj#C^^(5BjlVp*!bIEV#Zu`iKjHs`itzFccoSoTLl#1F;kYkcrAQ@Q{BcRDS
z>yT@AOwuD&isIHbF2`$$4(<h7OA9BC9oLE(WDG)_EMWA{sjb@`KHZ)>+ldxAk&l-L
zX8bx=B&xEKDO-4X9UzY46$$2(9{!AR(2-kK77Jr$_U0kI$-!pMJyibyLs6x~kixJl
zBQrVNn?B<AG}!K=k{PY;WZE!7P0(^{Ey}V)*Ut*a3as0KBuT%3qz}4J^{nf=)U%K6
z7f7+7Vdcv!;Z*t)RQ0WNBu)ey*4;L$1D)J+T<*QAeTWI}BPQ9vK%uj=W207cnuwb;
z^$l)VuG-?&P>FC=0`Z>ttb2`CGLo^EqkQU5&7V)gsLw6L(aC$~h;0m8VQ_Lpo}#JV
zM|UI^^2;K=#>=v<1f#ukN=>qFV%DQ~mTPblc;!v3yk}|Za%(pB_8}TWWp@7ne{Hh1
zPnbaGCZv{7B1x<f7E>n({EdU5$E8Bn(puodcC#zUWN8sTUB{9JdJ2~!UCJ_E!#vX1
z?(!5MEV$0!Q=flIqYRVDGs`T?_E2(Aj20Q^p2D?cj4h)^V=C%=#0tYKN$6@TxM!SP
zTQn(y9#?YX9;J_^B`ry6=3SMHmMbL4{(DO!5{x)h>${&yxAqhftZ~Hg+X7wX-IB)~
z<Iq&XVR2};lEPs{UQ-z?7mVa}9@OTNS?3q=+$lf?QHOtDVeL-$1gu4G<gL)Xy-@KT
zyXCh~s+j259sNZ))#kT*NG~8T<h*w%oW6gA_osclC`*WALAFv=8vzOT9+ZPqMwsk)
zg5v-L+NyifyBLQ^Yl0RHSt4sy+#s2ba(Kx1rH0u=`{#@U8P4D_zp==ue%TB=j8SZJ
z^GPg?xnxp)<yL~~=46sLR*h3TB*x%*=zD?bPgWO2yOy>4EVi(=$7bIYopzq)r8m~f
z&pZsyJg?mbUXl;*dJpGWNpU=^3o@5Za8rc``I>dSlB9s{bAU_aa78{*b0YHHTg0jZ
z4cwL^u6yxJy3{6?XmA5UR}IcPec)<@guGAZ%CRz!nV5AM<Bvm1s=`H;V_-5eBpC#H
zucm2RxVf2r=J6y}gxspepfVLax$jWNcA3K4JcJFzhXV^tET%aST9s!TVpd`D{#|LV
z(M!>C2g*twGyZ!~WQBG}X1OX&x0kYCl!+tD5$tMDBIUQdOi>|B%Ly4Lwtkgd#U!$;
z1uVq*aYCm9KBkf>AeCMfm?go=GP4{g&s@{Ei7sAWA<ebQd5AXv*~FfMJ&hNJ+HkSj
z$tKAF7ZSuVgN{`F4K`^YxlwS7zaRuuZ<Vk<_&$cCm+g|PMQRyC90l9R9nBoTPaTQ5
znm~#a#-Yr+`iy#d^x~Nu)5UN0d#@@+3|KlK44#8E12@gQ76kPnaZ7P?cX4*jEKsCq
ziagZ-7Wb+^O5g=oSla~Wlai;<(=zJfSDXS#!k=o25NAnZw^<>T6tcXWhhlNl(vmBb
zm-kV~Cc|PzP%sa3Ko%0=ys>ch<p3uGJd^!t$5NIvzE@N@!nj;*9`#lHw*q#M?NW9S
z*bDFPNUt2I%_6suaxuG^4{|*PJ1YUCx05u1*|!xKZKn<Y0PCVFsly2EBHgi$^dB(<
z_V;SflJ($?WQS~|ZFtqWZ_n1QOSy6(+Pg?>sK?BCCbN(h@6zJ>KeJg%=#qev$0+9q
zs+@b&7iFdb3oqR?CussNLCN>cJZe{IiCFEp2mNCp+k?{s^QzJ@SXv3@kdVZ?A;D9e
z^HZn|y%IQRF69s*ZVN6C(9~stQ1%A_JC9#qYF80Pn_;_+LCKNjZO5NM>M9xK6Bpb^
z%%C`o{H#ZOcIli`Tara}F^EV6MWn~>-1__a)Duf7awSm35HlFYFi&ch;7uZKwTsN!
zetZm#q;s0BcPqt_7a_ppjvBR08z8$uJEfYi$>o)J-R)k(`#X4A-%7Pl5#JW`rN@{G
zV8%Ny(!9$+@UFY!okHJ6(yiCeoUun?!jaD>`3m<<E5moX6{1+&vzwKLe$%*Par#%>
zaApQoF@IQ`bdJx=@-s@xG`*U7v#0SjoyGpA9pkGaLYV^}coEb2aaunMZ|Ar8lc(6n
zrb_nj5lNSJ6aslaTCL$bi?0;;stqRY9kC=KS$H2eKz}Okyj|fNkAWU1(zOj`;FT{U
zGC}1K#zf=h$5qBhTK!(6)6(0XHXekf?_XoD{i!?`HlcN+jWo*?aoVZMoDjWs)twu}
zx|PSnF{4dj(k-le;*kbQH(~8oz9(JXYknEhA4yi3nbgeA#2DhoLH+9J{tb8@eMaCD
zB3s%r?Vd>pA(-@BeJe^3_HgD}v)78Vv6=9j#@8`xR$to7GRFc2*%<&n?l5cHz9dPf
zXj19M-WjD!$b^k-jg>~mdH1YcL*ajf?R5C<?U5FDC0W9b6rPx`R`3?1;hi^4g|+Q6
z8;GKdk1+!j!0ZoG?N^A4gHqh;!^@f*YH;^Dq&I#Xf_rhde7`d~<6t~h{VPE6ZJwVd
zr3R8Fjxt&2RVNGAIPJwc;Aws()n4MqNj8?ELh++7@f@6BS81vE-YYKv$>9w>2ij)0
zKWTq2Bn~nLJMqP1R`k+QTmA=DyBa?R{3qeB6L^lzd`%$`gfraC=MjLIZKc15BiD-j
zj{g9HvV3azWAVrK;_)`Q@K$?v@b8B$W6|t23s5|}mx<&uNQFsR13R6so>f%$uT%ZF
zzu=+1H?+_s{hfXoEykB6#H}8osY4@2JHR@iVbC04@+;x1YmL_7V^=D2Wm#7&%ughr
z>tBuWj$<5tW}`}XgcYsQ=A68V$EkcfK=M3sor@BTFv$(y=xMJpfm+)FMh+cEQomY<
z?ExY(1|>(zBkt84vM^x2K|%=gB`iDiz^{(w3$fBp#x{t`8C{8GVb{M}Y>slwPTb(`
z9e)als=EN#*rzO5^&Zst)r)=17Ujbn;C4BxvJ0_I$xq#GUYuZb`uo&=VRb7UfF5xn
z?Mo&h!pJwNlYt-JZ~nC)`7S=tqibW8W6*lyiv`%K*j?~2<*-|*WBn=*J>B;sm1mc3
zWax4HzO`yQc+jzgG?6Ogob<`(@u-Uk(WWtP0x|$>ZBT!U>q4+uk;^vWBC#uhw>ZJ$
z`P6CVIVllMxXWR30rei0D~C)v6DHNp(7eB}q>3EeEw3S@7-b^`LGM%|NFoftMvUq?
zVZWUJ0EISID-l4aehvUVew3l1i4|_7I9>xGBQ)tsn~@5@N5}}t&OP%=`ixY2c;)6|
z%`yZK0rO|no`7TdQcG+g-5s(MyZBYPKE|erJfg9d<F-4~meG|#$RSA}FGctI`_#5O
z4T-JfJB`7@<S+#F^ffe0$i`tCF$gjhzV|)-s7UugCqz_U<CZ>^VB07Q8pr_=e8BfL
zEu>nDv0Xu)FEv9CEaoweb3(?;9$9|&LX{o+)sbSxNRk-a_or%}xIUthL&*>_V|u#=
zR9p@}l`dpHR#%c0K3I}K-zmog1mpEJ6QfTcF9|NHFcr8^JJr_HCT8;*Wn{+x04$sz
zrhR>>vfDE#NRw!hepe$nKZP8~IayT3`$D2Cq=yW+<a^Vig~NTL7;W1^x85IxSPKLh
zYn&ql`CmOi_NlJjbk|F%U=yXnfG$)1S)6A${#72+P~|KAmGbE-l~|A%mH5jZq>7Wt
z5dcZtt<d9~)2+mC7V?Wo3jEUNC6A}!Q%5z#=wrBn0;$540I~O|a%CiiRf@_7oLhp@
z492INF!er^wy5sPWtAF6U|H9I2cV^t$#SAOKp_ag#xY4WA7z;Dgs8|N*X|sSrl#fC
zxo>k6Y?pAvth>l)WI5n}jYhYv6tl8j$fi&O9`TIl8K`b#OGayplq`w{1bhb`#+UC~
zt24ZWNN^BvbI=c3L)^0ptl#L^8Bhw!qpA0$iaUI5XJS>4m~wIsX_=Pd<XSAk9otOA
zCPvZQj)teUkuTA_*1?RC=A!f-nD0Xi3vcIIi6Wd~K>gD)?#iCy-kB`V0Ye45ZFejP
z9T<AjFrF(y*4GNfi3rR$AE2u(Zmi~5+aZyEcc0=NNc7Ds*iBr7!+Mi5Tt?0Npv>Da
zj1NFNW|Hxn0$ZhQgvi<eRUbiDF5E83ZY6GU93=hLK7fB(uO+yVW{S)e9$w=dha@-G
z-1HQ#9Hb`7MJ8R3lAvS^;2xY*miBB@Z13}^CAS=7o}#S_+kY<J^54vPB>mZnA;=@H
z;D4P%Ydmd<BZ!^O!P-U1QJ&+y4X{xG1;a@5$jaOg`DcJf^`W5J?K1}X&fGI`k?mGd
zBbe=$MhpgHR6LRX0;FK7fo@q*6z~fC#Gd~Er7MobM0Gm@T}17Y3`05m`&7mVq=ZK#
zat2wBStQ06AI_D$m0ZVaLxJ;14<AEO7Ku~IX8Fi0$PaH(MZlgfAUj+_30Rl~Tyw{K
z(|*ewK*oWJZY*SBoRiKzl!%5&Rb_~oe}YZeTzX(qM&QSs?IDRO-3K&)kv`0up5kQ%
zh6(}GKD5)kMhImA$quD6k58pBWp*-1&}>v776XoYel+G*0zzPv#zq;tW{~s(@-&`j
zoQo>|03OZ{ZUs8Y)66XdM>~iz7WqN{03P(%EzFS#9#RpB1<B+O@TF8i^4(m-s^by)
zhZ_cd_qq3`>^;jXZsAjC19nab$tToPR^4PX-K&RoP_7lR$Umh4C7a~)RJ>yZg~!W|
zt5eAFTtbn=gYFR9cw_HVdlh1=5&0_7TgtK{G0x%8dJ1f@Tga^>S#*fyaNSRFinPko
zl~Er-h}Bn+dK}av&6DI<8b^%%)B_~?`%!cSTZNiP<cv!i%_8j^f90C?>Cn`!rglhe
z0!ma5x;|oY&(u@yBVi1N)-^H#yN=`BeQ2Fffg2s5fZ>;_9CAS)N=<<SAt++=b0lQ2
zVmlt3RE-SJZu5PRvmwi{Aw~~Md*wn%*h263SaRSFzQUP3$+@^!yDQ|8hC~=6-ltYp
zi4n;P2_7|d1mg-b$?kosEC+nNa&A`y5y4V8&M79iOR*)qNL3{pOK!>f(oLwCWEM(5
zpJ3Z4=jo5iotRxBcHj1;k8UPM${c1q<Ir?J=jeZD!)<V7{{WWY?kJ7-o6yuZb5C&?
za}#bj^9+1`KGj;!QF#=qN~TE34H~Z`{{V$6Hiyh>nM{$%Adh28HidJ~9Y#HBjPDz`
zh>?|F-be3AYkP26Zf#OC<*wk4GR@8oK9yBqGC?U_<z#%kyRdWV^#1?~5(}2&l;vNS
znMcfXfI#Rm=qh+_OiCqtc6M?>H~<Q#63KCN*5(;P7{H0JGVSOOT9zm-6(o-4LzQ3M
z#(Jw~pXEbCEy*!d^5BS~2HfiXSoi5wuI>~<E}(vPkVtM<6=Dln0F1_-V=Dp+{{R{9
zPkS3X=|onNA3uKSQNM(H`%tVWa*eIk-R-cFD^SZ9C2}yJ_dfL~w}wlDcN&&3s3PE=
z0Pd&P2fbZebbGM#!m6Z!`=f<mKc}@#Woj;zFhjI67DK|e4?KE%RVKO$%%c^K^Ai~r
z)!V9$$I`9GrLD7xWJSm%rW-$)tAFV5Jhw`RCO?sjaEv?qeJTXlVw3E=$Vq3J@<Sfj
z^c6@%e`J8oZy>cK#UXv=vZ;_qPhWa`5XQecK{I8JBv;@bxu?kcTuxzpsLLvjzWArW
zjVQ!ys#KD99y$KC(MG2u6IUJ^%ZxKJsRWhUIuBaA9k6n~bL1m#9AGyUQquO`6fww2
zS0!cjIqW?uNG~8re#|B$pw7(ak9zhg)r^*gPAM}%t)4iek|jn-ocyHn2XZNeL!niS
zvc}nNc+X7K7nj!)qwYbB0oZLGqu#4aFpQK{VZc8(HK#CWS~8*B=P{}rNMt=T+uEdA
zrHpS_ok2Lmob%Y#2`^S`?_K+b$v7KadJ#>$y(t?&S<#67=x(_7qW2ZjF1^DKFvv<F
zz&IG)>rp+x2(Y7UL}P~|aT)dXth=33c0Xs+<Ny)5+Eva5IuCk|=T%5!TX=2cK4yA!
z2iHBRsR^@H?-l<5dh%~`@|jDJt?5loNFxYWB0&6=IL{qx65{bBV{IZdjt1p`I0SLd
zX$8|<J4fel{n*MLquW1)K5=So{{U&tfFe@CnB`df-;E^qOmS{QCST@|9tg*%s#eVN
zst`J{1;F3{J!zulgeEi(D#S@STnzWcT9aaJmqhbNEOyW`NW1?4jGVT8>4|XG@{c*2
z4*vi;vFJx(R<th%U22oG<~b1H5)1Oaz*lMDzl66J6E(%vtI3W5Z@Rx<dh~F)b}tnq
zqa7bpIaY*G$!HoDwXNTy8!|0~oU!}W>VFMB4_x0%=ibO9Qb|>1!2-LF1N<O|?B?LA
zMvKDk>V3s}UV-7uJsQzm+b5WeLSW>$^#FFSy2?0FDJj*|;jN5qXlHmQ;WdttX1b5q
z<0%))TRimXitO}TTS#N`BW<nG_kRzyP<bVR+9+dqLlDF<;l7n_IpeqjNLP6rIZmYa
zuhB4BEjuW}Hb<LN7S^qr7dIC1Kqrj?ON>c3RaEuItx6|FPnu+Lv=!Jp)_2=LjD%m8
zI4J&~)YApX4YzuQ4TVwnw)d~2rIlgnEwwn_GNg<0>f1MNm1HUR<6pc#!l+%|%_5k|
zW#{A!eqs33Z7`Na5-a)=dX*hMwB%X5(i`U72HdYtt#!tYIBbliR&S{I-r(+7OYJNB
z%&y~7Zh|*iCM=tm0F%cZ>K)<&3fy^Ydf@Ylr*o((7PFQ@ilZz^&Izq!O}Dm$r*h_}
za|m=xdz5|axH$W&J<VYFlf}^KFpKM_Nf0S361M~oO2P3@k0H@uov&qrNXmu%&mDcM
z#(pOJWU{oDNfzJ?03!tCDK)KW;qY|1>d7R!uu+$<k<olX_{(7$OE%LIwsw>~{V`uU
zd{Ow<BJY9%%`27>s5v9t`c?<TPmCJ&r*||qaR~6)Sp=C54{$qI1{O<;gL1{3mid{w
zkF9=3#Qbsfgz)$+7gl;$Y%HR=raJcK^H;ii?NpNQ(Mireo|Pn4vq+>WbnEo=H6#|Y
zZwTx+XK>>n`U=$3G^24KGDH_>$x?p#KhnQ3mo((%JzG1H=!mr4Aj>fk+(w(g3?&2*
zeJf(aOOkeGXqWeGwO9-vLt0k)Ld_fiTkm|3yLc!7``-1hVWvhRiCz#@9Q>n<XZW*O
z&Z>gB(N2#x<y|vJk#?}!3O@ud-dgB1%_;?r!w`fn<-x@=IO71t9@y1WJdR1LD)0$o
zTj1#BLad-*G4#cF*sN6QJ0^Eir5GYaxBE;Pcvdw~dY+@(+|@gg3{v44)v>~}ecD;1
zxJEu<C<9?Q<36=d?RQc$%R3baFl3cEanm14@~0zl_ZN_`3K_Sr%v*PFrB=7Qyjf&%
z<;MvbBkwU^P<t9|tGymXjDQy**ynikA4-Zr`@m+8Y6RV$m_D_GcP8%Tw$&6yg60Ng
z0F`ye?)}=D(iM=T(HydaZ6H4*9{&JNJJfcLCWuQ6zb`^F%$)Y8#RO(RtrLI_-~(}!
z)Q?J+VwJ{bX<9~u<mF2yICGw9>m=A_kzF>)xdQM?j{g9iF4!UxBtf<)-nr!a{#24b
z&K>eqfKw<uXVcoJLbe?mD2IR9SVr>Y+D=a$howq1>zSsK-a?2r?qUZhJ-zAi!4gO#
zc}X6dvAf&rPZFvtn|TpRE(e-<Cp`zfOY|99(#*_{ZFxH`-@e;^Vx6kxyb(NXhSaMM
zmMlq<pmb_Tbq9`c;ni8!%4hbZZABnuNZA1gYd>N=YHSy=Vp!tyVIwDEa6#(W=QSI|
zqEHq^Os~w+ec!D@*K))p^4tbh-2o@>6IBkN1Z@S)%A1UF8+@aa-#w{vw#MX(G8B;`
zXr#!InMMKp{{R|}Te5Kz&VZf<<>Y-m>bqXV&HL8DPq<L`^r&RHac#Ev#yrUh0~jEB
zQ&1-8u_VOpRARf|8)X?R2WqJ$_#eKxy30n#Y-(|^dgs^PqPdVqGyS~%+<8%>oVT?@
za|XqUoFY3&e|6U@j)V%R!4l+ISqxD}B#s%G7$T0UI}&NpU)&Z+0tS_MW3+I48m7o?
zj?2dc6O}>7J%(xGHdlW>GM-v1u|3J{SISQ_MT?C}P|j`S8>B$8V02;LqB@47cMkaC
zjLPe_MStN@>Hc`Cx7P0Nw-JB@eB-uybNSR$fj-G@6f<XNboqB0YABZ`B$~~{Gn;4%
z;YN2Jx%4KaPxPCJX53Ymi4dNON9)gesT^kDxLALA9}<jk!>|={-Vll<f;P&GGC9j)
zso0d;+|aVRmL^H<(Vf#dVxfTprZY~CJBh6xSralge8`k=gq}W?S}>7(fuzf~-#>MD
z=}(q99GPI8sS)6&Ig{#YH8fij{hB31wsPf9ECw<4rM1LFOh{9^2nPkR)YBn?c>#6?
zH<18j&lnv)I(#;lk;bg#xkt+}9Dzob8ZL{7qKa#i8$zWrkoD)e;*b=$v|K52>{}Qh
zui-*kN-t$cRzc*eGqLNR;R2<K&f#MPrrgSMrx-ZwDsK|4CJAtnJ`0=?)Q`G-KD6s&
zc-H1P0CAJO*k@>|7fO%qe{BWXRRD%B?ziz1>QAj*g@1MAtX^9axtES;bs~nK+th;I
z3xH#PpC_3c9X){WQNgk)T3Icm0Lk+?IbqKgsIV|9vOe9ceo`<+J*{O~NG=`ZQS<HK
z{U}wgSF<wXwh>6ztq998^2UDWr_}n2vGzG`__viro3W2m{VMm_0)WMTcN^uwAA3HB
z)}fMUBAKEQgiv=WJx{%At5|%9Q*Rtky;QIO2>|G))~u{CN4iUxwkRBcHtqMS_ZM<p
zAGAiOIK~uwr?m#_%vUB{s6YfV46`3<)lJB0Bwg}Y+7Q<&=<CBE;O3bjXq}a#c99fe
zN#my(sBPy}UCyPRP8Jnz2iBc(&kV?t9q%B^2+!RZ?^;2$!I4ZE8~qA41YoPk-COv$
z>;+9DLnXiwf&l|0o->YrT8*NLVda->E(zxc=}nNbAxwSaw>aTF>tyat>^e3etI7xp
z#F6blck;Za+xM7`Ip@}fj0Q6>;glgD;ADGKRwEe^#tQ;64^nB_1=!;&saYZ^v^Vbq
zCUOU3N`-vqxQa6rj6PIm%7gUnQO2ky!+eg450>XUvrmV45xXYm+*Jw=556lY#AuQz
zz>SgSW>#Fu=5%ji{uF}7N4iVIY;8MK1;`%8rAZ@g$(*|J&jC$K70U%>n2msL+^dBx
z-xa|%E1Ihi$zdI*$`6|4Zz`vNdxP&)XMjsEoW2+z-Nb{H<B)Mz+fcJ)c?HTVNBjVF
z6`Oyk7Mb8S`!^slZ6A2&ztXdG+>oT=h9)lKEA~ePa%3#o+O=Fx19_pN9AQc1kSjjo
z_2j!AbVZ?FqBFP5_B4}S95T%6`QU6AILA-Ir`Xufp60E*k%J?!J9c47JS%$Qi;I(N
zH?)d&sA&TZdUYO^l_kug9IFsRagMn3r83GcA$eUw&c#q3ae>~U(nIHH(2{#uEH_$e
zYZGt%;cu9t=aN0?-`WD=XL!}4-SVKw<PQ9L)=U$T2=g}X8-_8#IpEZyX$VBTw_xNQ
z><$J!y((Qah0fW3?Q%@PR0A&Kh>GJF?^R^H5{HRy01Ufa9;;Qp**^4uU?4xde0;!m
z=7Z))O8t~FGVPZw&OK?`!sfW+c2Y3W$01dIBOM9%_U}^MUP1#&a}i~e<a7t``)9RQ
z^GdO`h|1FJEWrRINB%Vn+reuRHK2bkQ;TFQPUij~bNuMgMU|DTOT}>%r6f(Us~?&q
zJdk~V3YHM<3rRXN2-tZ_8wJ;~s;h4-b4H@o+Er|<o4D!8$LUi-eBfkJxHFXVRPadP
zjCQ6iN#&YI$R*e|K2QfM=}c(YIaH0eGL74gbM&c1Zye18XssdI3Wmv1P^7`xmfgN|
zawJ#lk6}Q`c6rJpkx5ni!PoB&^xKpPwtV4S-~f5{si07$Riy?b>fK59tI1_&djT4f
zt+S}z8$a<6!=)zd30%rsaWmn7!Y1+$@tS*DNf2Za88<HC3F=Ql>;+yHE+uHZld+=#
zE(>61)7F+)EhQ<uH=P>feApjcQ|4o_oUuG^8Yc5eU8Xi1$KNKb#cL>trW9^JHb+xa
zymsKDJloz;^KIjgL+w#J2-umOlm-DCA9R{dZHFktFiCL?D1-M-S<`<Carck-cB@uV
zmS$FDd6|h-9C6r+&z|)~vqIL0>T;xmwVR*TnsopfppnFJ1zoB}TPMCpIHQ(K6p}W+
zL{&TZVn<G%wO-+)^Ss!u005O`<ni>Zw$_p<R!eJ@J4W1--|1A~*M8F^mj)vq4m#kL
z2d+B`sL-1xRbq`BiQ<Jk?Zg%NzE(VY;+O3f!Z|KpWm6c)Cpd3xRz1d}Du<rk(L(&!
zTZVTJZ%Syml?u6Yhrx*%vKu_s>kh4{ldSKdt|vDcfJh250<z-(vHluabr;yT5rkaj
z92M#XWebau6G1B~NbiQq{{X7zjE`E2?UM5h=->v%;xMj1ygjLXULoz7qc)(T600cy
zlZH`}J^kvX_lRIE5+q6sDMA;JMmy9J%W_dA*l{L8HZV$#{{TVSptxHTFiTy)GWR)P
zam{HOP>Bw5WrKJh_tFs<d?{n-ItrEtmkTp7atR|~#yu)K>nK0aio?B7;Km#8402Dc
zSo0OwOXmUR5zc;8P&(jKX;>A=rHx{b%QBVcAcp9A^Gqnyvf4G#U^3t;ADM{zzSU|Y
zY<GEhmwN5oPsqJ{QY5V*U$fi>nNHS{AU1{QDQE>HyNd7`QcRQ{TNdg&VwZeByD}a7
zI;P?Q{AulMkZ+P#PyoWH;DerX>rA(4%Qdi)IQ+)LD<~kYe)qL8h!wU<(5~{hVi@uP
zKD0^YBYBbncSttu9DWrOv{Iuyk^mIre(j?<?}|wzYdIR!M=CO)WOrT4<n<%cffouu
zrc?~@1|vBq1bP~fJFHC4C}GacgQ4^_NXQ*pW)c>4z{_<W)UnAf&9;YXgc;nK^3Q+9
zfVn*BW3^G_K4DY1F(ZTNQF$oNi!4l|81ff}1JwHGtxB%W5J572_z=Em$VLON<4Xca
zQ74BDweZaSPCumqVl@hb%bqn=&)z@7_|=PG4q%cJQTSp`8y=wcsAIMxbPJh$<|K^t
zB>mAvwZltlk0Yp&rF3}5SitChlm&~C%&jt_HX0V+9`1zteQ`~2)9jvEeA&iW5W9As
z!``Ek@s=p8^y_Alc+NMI#?#;4nzF14*q9Yuvl4#qwI#60V*w|7<jIlZ8{Nq~j=*%M
zn+aL=z2s#ikLHgDYUi&$zO@`zHnK7?XO>18%xo|?=tWD0nXWYHWe~{>D<o|FCC_1s
z7!XaSBvyMa?$4J1@IVj0oI<F?G4GuBsNc(iM?yr4<*9O~h92Jadg?)N`^%v*puik$
zIL0c3uWDwA9sIq=Zr-^)=^!A62wFg`c<UQJA`VUldWJsLB$njFCU{9HDcH-#dv2-1
zu#fEWFbk7_<C1Dw8Kg^#c9mrP*k?r>cKQ!)l~)you#zJ?LShb&g8Xvc)p2ib?TcHg
zt`u((sK`<1ed{gRt*%DpkRvj@(geqr2>XhAwrLtTp4M2*(l439<@;y&k7@&9*E<|Z
zFv^xBjpL#9#YR$pCQmX{EQz`NwZQ)X_0wgIZa2gBmXvJ@85<3boK@)3)e5Hx8j!Ax
zbGzEDv`wyM%Vr~;)(HbiA`Pm;APjXKvrLlJrB>W?9FY_ax9*PlKi0N36>l`$gl3TW
zYCy<Q{OTsMf#+bG_6Wl>H{EYv&V?i=6D4fSh^FQ@i4g)tCs%Juit|j42@DrV@rF6U
zd}Y18D`Z<NgwG`8FkR8*zG2&-_NBSfR`j*4gr7Ko7ZRM3eZ44BNsE!#<t{8dxSCdd
zfReb`)Ov&KPK!#C9Dk!UOv|_v_l`T~^{$G`O<CjFpP7kS5r_kDIQ%MWohB<2<lQD3
zWdma#hp)?9Dy<_wWO8RkWtSH4=3v{tZ0sZH>q6K_1{VM?35D<9^{%XGMo5Cp;gk)~
zDsaKG+|^gp9Rl1Wiz>UFp;whX^Hi#n?2c~ZONoZ$RxHbwQggTuPfCHbqdbJl=)@>0
z(c}_653O~wXek`8eA5YvsNE_q(4*5H)aTF%P$g(_8y$-n!P-Ys-TCcW!o8lP%8O?Z
z`eC<C(neKfYzFO~xit^=RFS(#@V4!|`X9o(YmW{~HpFWaByAu@D#IWV)}x=p^FeyH
zcQBAn0CI9R_9C}ck)N?>;-$2fJULDY`Bxm8Rav5MIUENIz{luot&_uK4>DMas8S0a
zfOgG6bKwb{82qtjJ@QE7<zehSYQ3^2*+}HP%b8a%fCA*Na4EuBTwoE5@wch1i=7C@
zklf4*iDcNa0fIiFqL)h8sEnb=cKK9%*s4;Dwli^(Gm+G>+}S6nW5^zrI?nHB_7-rT
zyezDXgU?`T-`Up+cimaEMUx|tbNN(KSx;yrk%=InAxH4~)6iO)Hrksrw5X39WdIrM
z!;Jp`^{Yn9T43n$O4!?iH{myT`d2n!lVpEpxqp@TM$dk~g-*9Dq=Y~i9I9i3OO<pV
zGe>P<;zV7yE|MgBFzWBe_*TuoijpXw_g4!%WEI*$2Q}vKTtfFMp`Dq44HLfy=qpCo
zTDXEgp5e<zNNvNQ`hO~qVxH!)tkLLEc#WD<DFbj&QG@-~_p8?WwDPI@G!ifvGCFhk
z`wH`4?P+Y|lI2<CQb)?ioO@QLmEy-{TZm_PoyQ;?WDdkqcx3i1Vj5?tX-;L7G?J@1
z9E8pY^)=J!+F57}V1`mN!*vJH*OckLG`918&*l{+er&M8&2+j~jn*Kl_ezXO2&K4x
zYUQ3DqS)-EUYlpA>6&Uuhevcc=*Q*!YhKe$f;~TLF<F*U*^{Fw?d&}ba5g^>Y^`je
zhtJD7C5b#Q`#$Eb!Q;43FLDc<e9qa;a7q;~sym}PX&ro)5gBBbNE={LlvC7t3T!Qg
zLnL5%auSgc0Rzz2Epzb*$0J!!e;TRfFh21;aDA%fpNnjzcS&bSaHEmIZ2Qu1owY@(
zkZ*ISjuDmtRyD?QPj69EKAKk8+cPK<^^kMNs5Q@8_=+V$&oTl0Oixjsm8bo)aT=s?
zp>ZMo*gwLAa@C!gqLfQ_I&#ko-R$FqX$L}j4m*EZqo`>1`jx+y@u~9LKO|!#w_34z
zt;HqE!uwFpfgk|mAPk&;c#4YOQH#oG(Rn#$0lM?ng>|U(IgNke^`-h4(LA#u3nLB-
zFV?w@SK(cqq>l>1JfH(AsO8(xk?H!^r(Dd<63mf@BP^(U)DpeBfMwi@=L*OM3x7dc
z!o5hVT*h=M&ECg?c=zEP-)E7cf<LsxyT(_H5zykiYsH=yyVCF5Oc0pm7$P_RFH$|L
z?7eSJvAeaFHiK+wA7;+u+?w+*7<@HdL`iw}Lducu5=Obe9RTn6SFM7^Hn~~mVz731
zN6igobr>xou_`&*I3CoA4i$sA+N+*(kzTdpUxc?7u3~}!s!%X4bCP)~aa?|};C({M
z-L7wJUIM2L8?fPP*o8`RJh{`HS<R~$e~n5JlsxsRW1I<t#V9YZ?p|^~9@QIJJaa9n
zU{I5_M=ZXhHEs(z636Y%m{{_~2*yC;2iG;am9%D78+z}lBnC)U7mWxK5=+0QIp`{N
zwUXvTaXh2VXh4oN2PbImYOJ>^((hF-y95E$QZ?+BZu7$UW{58T0Atp=De^(<q9vxv
z+Ka4;3aC<~k_q{$I5&WTC(OIEk<btErrb1gxqmS7I0W_jQ=!7fs7jrgI2}!KRBEM0
z(W25N`y$Xc+LvKx%DUsX^sbXi@eEPfM{3%0Ivj~6Rvcp;y{nQ)pe0&Z*o<Hh_~+2m
zk*?u`%Ye2ra9HOiu$?ZVYUiwI{y4LiVI$1v<qDFB!h?@h9Wm?eT6exLZ9h$#No7d@
zZ<)a1RQexZYVnrUE@Fvdg86_AmMCy{dQ;@_73f5UYo>D^Nlo7=2d@=}BuV6Lo$jOK
zLe3i5$yQd_?bmmqAIiDiM_7@L*tzE}WaJF?KBl?<0PSMMCXonYaD`j$`}@?9UWARK
zjc^GjQvBrligraPxQ@R2{$s|(gU}JhP%68LC+{DaFKV}OBs<DHg$@TNoz+qKAiCj+
z`@Wv_l%i^e#<NX;Bm2xiQO6#%yY~#?hz;_PG0#d}@s0c6JC_?&;P85iO{A_+U>~{-
zO@;)j<cR<u#HX*;m6k;$N`&BLa6LsjH!4}eBQp#zBRKj~8aGdzoa3PNp{+ni3xW!l
z8**@cXyHZ&1GlXWfJodrbna+9*%%%=fzZ$c<9PR~%_i9JS%@6{20PNTw1k;g3|9as
z#y>9g7%om@AT~HBo@vUX4TlE<mL9$6^#NHG@g6y2fElR+tdeX}RD<&)9trjKp`5B5
z4EE#siiw|$6UI2eq`-bgPR#A<$GD|tIZ=={^lVcjQe$}vlaIa54LMjVZwjuXfE)Fs
z0;2#V2zcA`ZyDl{>?~MFNDF`$wG6U23%qR&!sDK46tEc}4EDzupa(HLg;DoG&MBwN
zYyb#2$OU`*P<Dmf=*$Vn%Sy$Ag3Xrx5(iIuU<oTA+yagN03(JO2mC0*7CBr6>R55?
zDWl6!6gEdgxc+n;;D9*;BX>%60pBEzw4hZWV7E$B%4}kxlw{+*7-k!pK-@YWhLMT|
z->`w$=dBh2;D+R2amXW*Dm~k<Qb0&N<DdTkRXMUqVhJC_2dA|r&8X}ET&{ML*PfJE
z1W-e>>?$xfk}?R*EN>uU?X=^z-lBpLBpb7mgDM+2K9q&bYURe<E_V9T0owwu8BQ{C
zbKKKoCHEmApBMwCf523sk#?X#jB@PR$TWq9(;<%vcwBNt76Dn~8<IRf%gFRT)N_DJ
zl_P+l^gia1gAN_CLiGcj(#Fcnib{knh73OUwLYRi70gmxGJuhuOMemerOA;;DgY-X
z`j0_CC3mEby8-z)=|eb?cSsj=k{Pyu2<^w=OfCT%@3Lix=Wj|!jg+*BAtaBk52ZQ~
z(8=aOxNXK%^G%Gxn@XYCy!nKlf}~>d8wfxI0KksaBD7`y0CrhV`n}E2`_i#E4+`OA
zVk2Y7A6j&dNY2f{MgaqZ???v6x-%;*i^>3{f#;spB!m_l6pVrQx`T?1QaKLAxdD$L
z9RC22Dbd9_4J(Wwz-c5LXWD=zwzf&kidZT%eB|<5+L)-`UMG#Q%7y~~{&dL8D*{0|
zf0QjQ<d#J;7iC5#Xlw##0FEy=Y9~;5_db-Pb}%OSbAq_!no<?Mcas}_W&@}m)YG;o
z)Vx@BCoj8#y|6uK0gMD;m?2W*3`=kgJ;MgsBy6K-EZE?RS9Va%xd2tj3_ka$`q3GU
zWGNd4bF>9K=jtf{fkTc)95)PGg&w%|sXul@3GKYqD}_zi0ljI<8DEsJW@aIj4%F2v
zB8|M1$znPv^!m^($l{#F8b&2!#z1a)&u@B`2;hzU+4mNHNiWy%q$~0W{JqK!RYzia
zniq211qr;c`~?CfkrpxlMo>-$=FUYR3%Q5P$S_9JgY>2b1r9eA11iC@&T3Jd2at>&
z1_m=rP#?m^*opD{L^p40xdW9Y?bB<O3mGlb6;%o^4*vi-89`Po1ky~9xKX*jSr~9L
zO8N!0J!9aLHJ#n1#A)Qb5-5^MoVS?7@-gX;*1uoBV4Y~UhppaORGv45{vMdkemDFg
zn$p(&B(*Y11;`S_7@wQD8R$Qqey;xj!8<%cviNTvV8TwQ$oSk8kJMMlaRoOg5ynn4
zvHBySN+hz#e1<^dY3=J)<(DAw)O62Ze`><eZddy@)+n5@3C<7R6}P!rR16G`MR;ka
zq0%<vU_zM$ZO-AwDwO-VelnvVk=C!yje~$V8RoMtr3%DLB7ybkR5LpLWrjAE7U|Eu
zQqsIv15DPsf!Va}G9KsJw$)>tZ7Qs-_gg$QbDlErHSN`d-RSe;b;(5wo_i5j3q1ta
zQueu|!>HM}ofnx4^f~*@iusfFxBZ3w8~kn4E=Bi;pi7&GK%L=;WC78Kt9#c|sQhyA
zAHxlE>>e&>-Mi*exESe>J?pse*Tydec=`lrbwm>sCuVsBb;+*$E+(!XrNq*xtbP=J
z*uSuUiv9(7s^r*db5EpPFc4lqa$`}~aO08fn)#<t(I(SnHn&Ja5=2B~91i~gTK<T>
zID9PdN5riz<4e`_#JF3inc~|BUoJvUdt=ns<{#~q{{RH!ztSG_#J&r)JJ9Y$Ilxie
z0oVTkuU}7x$I`2#+~-`-e6l_eF_2CP3)|n+(nf}2(7*$`{{VKhd_|z@`UU*f`lXv&
z$cwjQ55I%S6+i;On}L;V0k?t=t#_|^T@}<!e8FBoc8#UL?deC8v5IcaJFoJgh$uGz
z6#dXTx8p!yqYN?M+|^h@HN3ID(-HMyj+9|k{G=Rm4LnQpqah^!0Ce{r^pEl>a6=yW
z7{}6t0~!*F%<*j?WruN^c}$!bPspHx8;7SUx0W*`Q99#+xw1*2ReZPe3i0=G$2sPP
zfK9T#LJ)g6?nkfEyHA4t7Hw0-hT`fyvL@EHZaCzE=iA=7D=Tm9E7<LzZN6{HTRiRW
ziuTWjo*Iuu(&K-!%4BTDPk$&3<oDaxHP48bEjE_mdRC2Y_E5E|I8P~qhVSg-&{p-V
zkzd<2l+7wc>{*Cx2X9f1aafvqgBt1!7?Ki;9IP9TKJP!>^!2OZu^uO2O146l+7IK{
zSD1v+b~$E{OM7u_%P?QMr{%(&1MQJl?c=<e&C6|`JO@b%;FHr~KHaM_*5y8FlH^Go
zpDS%052yH4%c?-LqC$)Tk7`5?PJ8i8n;NhbWp6KYGp-|yw|w)Oy=x?$Qe}^D`DJ+W
z*d6}>3d@E`Qb=vpcC@DoB<g$h^{Fk&T8FukXWUr)k{^D8kx18st4yZUnC>KB`1q9N
zHvK(%(nSb+X<ij7+pxRO8P8v8g53<_RkwCBgvJ5;hul+H$J#S+UEX8}HXJGi>PYvc
z)McpKFXf?81cPa3=*`?z@1j}VT1RHq5yX)K%3<T{pL0yoH0f>`(lZDuM&C0#NdEvD
z(1~J224Li?knn?ypYW{PupIrbgDs@Ecy27Bk%2p*l|w42>~q1btuw(|bTC0{GR&al
ziR5gOJu}=6$E{tk5Zod>(XmE<o-NorLH;jMTQ;{+{hiIl#AXCizy#t!{2);0IV(0x
zvSt*zeUvs*vqaF#Y<DD?7-7&H*6)Sv)=2)+^D9j8{n-Xaf4mQ^bK1{^?X}yuFVk0O
zq|RO-$1Vp|$4cnDD`^gy85YRSVw2<&KILz(pseMh8+S&njH?Ccf_qoP50*{eDL>M-
zaF-B9XK+kJ>=@&o-&)Ref@cc0vH%Du#Qdb5xT{8a;hA8aN-__)!>Gqv#WqSc^n0rl
zt1gx2l+0df4nFbdap(u@R_zO1n~VEHz6c{8U`6V4gZQ6X!?cGg&X&8p#UUkT{w(l5
zp4B#+=d4iMi_NzMomq~2ym}Ger4Gz`qk1nQMMHZL2#uDAwhlXI6{Tst;7FPvj*eYg
zL;kRKA4=!+_qrD7E<y7p-Hprl`RiIbd1>WUj^$olh1yu~eXA)XRm(0K<-v)TWp~3u
z1~#7H`&Q+ocM;A_`p6_0QJ3I=Fc;VXR5a-JNhjFkfHHiDk_?^w{{SC))v!hp#cOvr
zmQ?X0u5s<}P^{P%KH9J!GF1KE(hfU&d)9@csDe0HFeQkM6|s&p&1Xgo${_NF_mGXm
zj1lWs?3vjllt~nc5DJW)H&sh*2DdkD=ZkVaaL6;0#@~9jlOsm09pK@zBv5hq)^4BX
zTo4SPxn4mX52kAUx`a%5@#7zLdD~g1sYua*(;-Pimfh{2TDHg`^QREVhhW<d?DOh9
zs-1$x0{NE_;7EQ>c+Yy(ipY`nw!MkA@M9;oIQ*$IPK5eON^F9JAU7lv^A39EwCuMo
zQX~htEzth}g+m(siXnP!e|i&zCn)3AmrI7=TZNwBNpRUX3AAH1T?jPoqCpI^&y#ME
z<n1_Y=an^L+St6UI9W(Yx0v0&@{i^PK@H3zPckw`$`#9Z^&d)l%!s>WCPMRNU5_dB
z^cbm&8KQ*~CDf9@HWj+&u3JkM#{ra+_tc(Gx6-P?B0~$ju`w(Njluh;)K!}s*ye;Q
zMm*9E?gt+AqY<GCK(_C-0^nq<XNDi+SM3LvDf_rZ4T3s*)?KsiD*FR4IKZoM&9(fH
z+eiRzVUdqa)_Q_wwVaWNQ_Ld|Ap--DeQL~1LoO5MSu&*m05R!QVQ~~h2MN4>?nmiY
zBHJ{6U?heZ&1ERNl$mNNn6o+->y5;7pL(+ncVuI5;E_}<UQ2+XVIc3?a(WumZ9K;q
zn+~D44O3=?X33!-0i56-a(a8!xZlZkMHwuhk?U0A+>&e{u>ckxqtdO~$PRFX6VoD-
z?iMb<`$DX^V#l0{(XrEJos8|sZa#<U+N04lr@k#C1_}lM+uyx)dS;2`ghCZt9G0vl
zD*{(CV2Vp(WSkI+I3#i_P6(D^g?+~v>(;g5@YR+4BH865=F5@Qg;N?O#kK5^+Ai4F
zqOr~g)}_g^l1PRtc_m^YRv>alITa!(b}=bzjz&Auz_*@z#rHm6oP+nrrCYR$Naa(o
z0sikwO`(xBypo?T8A^ux+4^;<;>2sqWT?kI{pqb~G>%yb+O3kKy-Z@@2je3njw*Sq
z2l4aryk<$G+p)+}?ZF<W{{XL64%?YpX)az^?SNDvN`j}1W7eZlY|%&vkhZ`C1D)RH
zog`B<Zzy1_iSmx4+c>Y%rDl#|%&RTLduNMk#JE*lWRHAx_ovuMXO&V&L*!wjjEs*~
z6xb7SLLvotF}8N8e&FY|T0&zIzM~{#Y219cwvp&p9Ot$>*DQ-f(b%&>B50ahbB&Te
z-c#;<J6CD&yTjU^rKm@2mceC_&ypQ;w2#-NW%xr!yS=%Zd30-uWQkRh!JJ021DqKT
zW$r-d8OJsDckCzo7ixN?hM(h~h!X9zFC(k{n`=l(BorCpdJcOJTJ!N(m{5+po5B~>
z?0aYIHSoFoA>d)HUD(O?iSmyoaG`qTefj3SmTO3Zy8XR^MB9J>g2&RdXSRb#u}uov
z7_FD=>WGl8(X<W^9VspCe%rFvAKmRkwCC?1U!{1_lbhRdNvA82ix9#|L?|Zm!^4Kf
zHEiwm*d&Kl($;s`wm&lgS3OAgtpOtqHHulp*FnF0i2nd|4w>}Nr84?BZ01Roqjr`p
z<zsAs*yreLtwqOE2PDs*KWTsXC%?mQjap2X7P=z+v&;?Vq=if*bY<z2*pA?u{O|bv
z`wV<<_#LTT>J}P9YZ^M`rIykU-b9&i;Lb<@4o5jXIIr2eOQ}#5NK3F!k$52I{3|QO
zz6<c5isP2wSB$W@j4aQ$m42Lh4%OL4yrR|i5|p65)9^cP@8D?OIZSU04YDZ*q4%hx
zSeO$8B~y1REAl-}ewu#Pzwk=m3Ha_yzZ3j9En}*PgPVnBXtGa6On}UK6VwcP3iuP^
zkH9a8{{RTDrqezkcv^U2vz3+aARB=JupHoh->r7Wyk@W5>Zc`997mBEJ0o(@Db7z*
z>yuAW5Sz`NcT0>y1LJ}H;r(f2S&I3l+%yj5Qc%ML`c&}&@(eEB_-ywdUrM&wL@jCM
zBIS}W&4!Wx0Ef5~TOmSx#b6mu<Fg@#X-wX9jgU})K}Q)^T5jh+vP>N|oM3eS06x@e
zz<7c~8!(YcBLOk@Mt_|&MI^GX`ap<-hGiTD@6)|0oN%T#RX=&j{$8e-@@<4c6eTt>
zA)B1~P_8jP%7g^+PEoNL&NKM;qDGDItqTZMPJV0*_vh<LDUx?dCQRkBp-)57nsR@-
zJ$G^qF$1$spf=KjfE%ySRPoN%vxl(<sM^E>xOyD)8K}I~jK%hcME&6b%H!of;ZZV_
z4k3J#!v;KK)_^X}Wpy3D`n6f51?~VH6R6|0Rkln=7<-Ym<s)<Ff;)RsywF0dre^3D
zD#s1}$@Qgp+jCn<5sb(%8biW^KnzJ5;Jk36w4md0IVPqI*S7)^sIwx16-EH#+r0{o
z@428wiZB6@R|T8bG_Sdbm$zsP7>o?D^vwW4aA%S~HEqsG`3sC>bg3nYK1R5Ze(?E!
zXkMHS!?iswQb5v8n7P{CZZL=XRJgUanm86mGDq_>V=6)RG+YRb&<ALcZI%@q%eHq9
zU(2lyw*LTVSfxkZAPpVCZ<G`Kz^M?=a}z>Onoi@gH2|pk_cW@pOXZ_(MVo{YzuhCL
z9>)|8*DK8klHsDY1<(K_aCqJRdr=jQ$!Qc@pOkPj^C|xD_4-x2L;=7r7>o=mIOW?v
z%8bNg{{Tn1UColGoR$ZX>^juBSZNicwzX?@L@gOIlFFpyoO^cmsiCutW)57Jj9{xV
z$rWNxvzZLG=+UBJuJ*~@-2Qaf_Q<;;kz~nlJcItLAJoyz$6~p&niy3kfy$(e>$iYC
z>QqB3M>42h>WTot^{IqmW7`G5+CgRx2?|g7=qgl!q}w9LxVAR!95=tPqnH#*F9glz
z6_GsW7*%1{pS|trR&9R3mdLTWlXR@IvmRo=<R4yYz(}pxjP}wxs+P=S1RnYJ9@Pb!
z#4W<X42r1C-#G+eo~PEIHiPA}Cum<|IZg3`HprtK^x)Jkmq@D&2WH10DPDy3C%s+~
zOEhWZ*s*1kEgxJCna65Gw|8$SHt=6@1wLTIwF+f&m4pur$t;QzWqh|EBM!q9v05st
zh~hEKSe>VpC)jqWpYH~6&eCu|UO)%1?rK3{cNPW25+ONw+h-W{2iMe5&cQ_x$zvRd
zjP|6COo|QzfAy%E(H1Up8C<id;2e%Vf~_)yw?#)W1>9a)21AqB4%HmLXd4~uCr!+J
zyr?1lc<<{|b`2sITX~S%1={3cusJ6jpK4@Mh}J*f49A=(PvQRX^`>55wUUS~2Eru5
zxfsbj?LOb(S(Dv_Q#rX;ZO1VMAmi4wj2w*RD8!oTNgw_`Cs_znxx(O)S@O2!3FZ@%
zhd$k@%`z}MMh7G*ZcRibR(uA_G2u`3t>TnX&na94ODSe0LN5fGeWjh|wW(X!L2AZV
zWgbccml?)?DvoSz2(d9Gh+*F~>p!yR!@Wyc*CX*1_JTxYG22TboPc;ghZxV+x@c2%
zs;KnpC3m7ell_JN0B2oOP}MEI!J@K4B@ZD9ow@2U^{>$X029rr{4wx`m!a5RK?j;o
zm}5*ce80ty>s%M?b?}12;g`c`yj|ie>v(5qc#c=wob({~^c8ExcPrw*8O0T?%iIRZ
znVv(1Uf8dynv05zbV%!=1x;A#z7hCCR@QHhv8b6ONt}q8R|@>|lU}O=f5JDX<~w-&
z@Jg&~IuBaJ@HUzKi={x8u$4eQMGeB7dQ&_>b9t)je`Hy~+Pt`KGu(St5>md0RpQ6!
zu<APYu-6mYhC}yRQ<5vFy3}<GYhh%Qv}Ze1s{P(NRb2~BmfKGd$2%@l_d!ky`{%u9
z+)00>+#j@DdBGC`MqaJzX(Xl>S1eCGwux$P8W_xnI9C`MJx|uS--+HY)BF+O>#q}P
zy1&_8Grux_8g~Fz_N%LDmX>n(gTz{#0?N@hyGh39{^>owwfUd_00j#Dv30MC9w?u|
zz75vpT{;Q&v5fqx6!M4L-j!@bFp;~}vBIA>z0n*O?R)!R_@Cnsi}ec)C<!e02uyoP
z@>N@xKKS?kwcwC=ekpFkuC;Ki$^e|Z0^>RCG1j#7tu>bR;|j`H24-jCO!|7(wVsy>
z84<1KV;B!20zPkSdRKuu@|$v#)O@Z?uVbg(%V>h;CIT4_;s<`reR~?|Y%MhnN?T}}
z;SqOvZeWLRAanH1T+;L(v~Kf2V6cYr!NF1W?rWsebbD)ABKueRw*W9xgCG9@Ub!V%
zGSnHLWv9t+8$7nbgMRIlDEU9$tD-qA?b`L!7@^MY`KyYsDyu!XQe3P=KX3NEezj8M
zq=Rg8#w1o?r9mo3p%tGuF;+<xgtEp;!6=N#gbz37%9_j9E^n?ap^8ZwASGatrwxJY
z>&;KDYO=kpyS2P&I%G=g!XDWJ-_x~YYC4s%(^}#+jbw{)nnr)&_4ekJ<z&fr8-F|b
z-dxIgPu;v+C_TgapX*rD29oAMBuo|1EV6Z6b{|?uHQQ<I)h)77Sjlm?lfmi!HCBCL
zAoA8p9$1;TfffcwsP?W`CfN+Js^5zVVY`9t-X#GV78vc<(zEVvV!60Ca$SkHg%Z3&
z2#7zrJ!-Y?s#0NfJ*Y`Ug`-InGN10L_adUazP_4x<A+KR%CUoXtVY16(;fZ0e<f$s
zhRaf1Jb%2pu#iMRD&qrppeNHEss_1O8aH-~D=|b<z{%&6RBSIz)ZSzkvrhs)mje;}
zT<0hH)9x+q;E^7A;Zq<h8ime1i0$>M<zl^ouI&7l@_}bicb_vHj)2sEZHmq%TX1HL
zmohZ3y9cQUJx8TN>2V#%iQ!j~MpoV<mTzCFHCkqQJhr%#$t}1%TXV5T)48hUNQWX_
zK6tNQZ?fDgc~SX{irsR4@29;oBBjYkWHSxBA0R#tVcM%&+M%{ETDOrPn|WpD1J<6>
zNT<tL4kP)HvhrKG6v??L3vh{&V|664EuWNh1XQ;Qp-J85u>h+e!u0Mt4|;|bGa(DO
z2T}<M$owi<&EU3KZshYe#kDp^v@(xx=R<cI66HjM%1QZHZ3OV#QzuE=%(sTsjnU{(
zi~-vsl4(F?gb?B5`JG1!f2CJzq>T|{ZKRx*2R>)Edv~UQl5or!W{BZaG86%Dz0NzD
ziEf3<N>Rc`8Uls+FZoolp_QG=Jf3z0O`H|M<R4l_#JFI)6r3?!bgBV&pEEK5@jBs{
zuUZyHkwE~wVEpA98%;p_;{})qlwiiPXAhcpp9@X^xbsmM4>?zEG1rWA`qE%c8?M80
zA$X9Izr10&kEq8=YrK$08X!`rNmWtvDeh0HsD!EJnG_aBI7d^#H7q+Ah7#d}eD3_@
z`ifQ+#g}xDG+S7gU){-_xhKD{sU%>3cWzQR!h~?^xJ$=5^d9s?mlCVb!EjFHaoBVN
z-1<}#OCIpILF0{vLX0c()KPm3pY4kRZI<N{7hogEz+>or1xC=#_vW{5f7Hl6P<@Z6
z=ZcOq98jxW!bE$D$YedcaZ7|7q&Iu^9I<9QaC#{8{{ZV!6Csst=7*0lp^1oeib5Yf
z{{YFRCC$9Mp;)9vLx8ikSdXnaqI;9&+g`;8-IkI<c^;flTh5q?C68+b3zg_QpL(Ps
zQ$4|WWLtm)Pl7R)+mBju#-X`G9BfGv4033KGyxgiuv-jJaLesV3<<gIRj__gWNhQt
z@upCVEb=d%7>+W>W?44`9=Pe6S(*@yJY|{6Vm+<$qYqK<Rm4IWJjFtxNb?cg?Rv18
zB3pYH0gaO~GmMOT6WV|!x;rBY5+cbe4W)-h$0Ssy1;19dWnzVYc;Mq8aC&ylQHDUW
zJm%sp;xCYq_gEYZ4_dne#FlZz=b^-m(=i;bdV}p#D}ein10<tkD0o6e^JfHcl75t*
zYMM!K#T}7U5Q*3f4b<C-t<h9llFnGGVB|J>V0Nm+m~jW1q=EuD$jLoH_NhW1>Vq2@
zNs;(5uORm%Qv=H3q(KnD{{UIWMm+^Gd4ft_79`+cjyC%JYOK@7S7oqVlk*1e?@q$l
zl3AUgY2$6pE0uWEV0+|LI)%HNSw)E7k^w{fiS12kH%%O|xe_zr^TP~!RN5Yms`$HD
zhey!tCYN(z(2k^XNk84<wxdd=TB;CNY>7!mH)pH<&)yWc(e2+=)qK_AS|Y8uhQ|Xw
z)#;j!n>^QTsodQH^WkJh?T(es_;<tluZ8TPvD9HHfEgoK`@DCqv%#8u&x^ccYoguD
zvff6*I}Da?=D&H#aB;!q(59oRK2o&(z9s9qci~dnPw@`U3(H18WKrgJBpwE9*neq{
z3=6Ln>38>5%^Xl$ge$vpF(42>AL(2ljl2<g@IT@vpKvc@zqY!Ib26^qvo?7`JCZO#
z86A38qI`DKrq;YOp=);cGpsifp(Grz01W5ay+q?$tXtUa!_jbqMsAy^_@4Ji3u9p%
z$!d+}#s|!UvHDj{@N2~Sy_byaX4EZ%!RBSeoFRN;0=GYAUkmCwjM}SMTwBc@!iZkY
z*XEG621b1crFs{PJ{;-L>K0xbu(J?Jrx7IVV*!+(O6-z_`F1*B=b?Yc*8U~aHS1gL
zCr%9;K)h`PD8_O}t!Q4}z0Q}W!{?3DzIPzNR$-3S(doV-pG35^mhQ$Y$fHoQNpTp-
z80qg=_qKoAdY{|ONo#CautZ!clh*^*vZkV?Zrx7U`>5y_;XjHj?4{RkKuaroZS3lD
zr{8enHM8L>{{RPgLO8sC<NaRF!$h*SYnkS`nNfHdC5a>X;~dpr7x?>IKMyUw8R-`6
zwv)nlNUV1_UT{xbXRUr!e%zn7N5tP9_@3wB)wZuSo`a^u(cU0C8JjGoJdfc7e!oii
z?kCOa<=JfGZ+>pk^zL-igePe?vE<*jAIBXt_KW?dJY(^b!&)p>8a|__G+I0muHDx0
z{_P}T*_bZkJ8s8p*PB9L1x&*me(&*d?@W%~1-CHem&;tl<nVd@YD@_76$6pUC;ad$
z@w@X4w%x}Nf&A75`fUUG(~M6U-6D^eaO=>19@N`t?p+toDoA2WD&P_5DtRrIJh1~E
zOR2~_bg6nf1({j*1uRo}f0S+D1L}RKmQ;-n5u6c#Q@I_gQ5-&LRor%<Bxk8K!EG#(
z4Ty4h+C>@#nF}<GcOsQNcXwJ+t1}rqi9TU~<*;xn%yx{wz9g$D>Uw=CV$&T8GD>Av
zBsyd6p1Jm=bR4XTHdc}+2;?F8kRDi5TwL!48+JKtka30j)vvMd4uUBT6D8FB%=h=H
zZLMw?B5q89^N_q_{AxLpA1h@hw>c&`n|B0~ynQL(X1JXu-yu!0j7ztWf6q$1)-s|i
zGcLy^9Zyk?{{TuKPiM$^$_2;Cw~{?isQz?&L|?OITYZtQ+2CMN(`)&Iob}-PntX7w
zKo&ItLovg0O<%aRYnz0+9LbNEN-zim83VOJByh!ZlDlGTbUvL$E_BM|BiJDVIbUf%
zF%AJgLFtM`x1A8C-Q|ujqa1dtP=+#vTVlrm!a)ZIw>04iP$pTD1eYjek#`9Q>J(IS
zJCBhtw2=e`+^a>yZkT{s2e9?@sTw`#(#IYV)CF%$dirP9qHB30SnhoH2b2LvUvN8`
zmPCX}g^;X>n0043Adk97;rLWDMX>32OsV!_>cg+gg01R3DIQ4TkIXWM4oc3bgk#_H
z^rd87$mEh+0TfBd!0-Mw3Y3o2$rCt_dj(_8SkeJjBvm%n%H}j|gE7ueU&kC&W9+fF
zn9b#;;_L@a-TswjppsXKr*1a|O@jwG=~6wg1T?Yi8Rj+|pL6X>=vFJ)$0J+MZ*q}K
z4a|Anvyd~`_T!4NC7fp7AgIj@M+%JDW5zH~dT5R}a#}Vn{3L;}7x3>>6;(x<k=|g$
zI0xkm>^*8FA*hf`Yj~0icx_SRE17nn$}e7NvD*N}2>=uUcAQ}6y;*m+7YSsWk*1Fk
zK7LYrgZ_I{kU%9-b8P5v11aEObU%$I!6ZjxZ~dVpa07&do$5{sk5)bEMYL#8?_4W4
z3R`lOALB@mE5|Hx&W#ZO$o^jm&rFK560DIqMaTf|3V!$D+LhX6D;f82JgUxZi4!)>
zfaCx>`&72}zC?}oc3j68*fYYvb5>-B%x^WV-Ylj(p~G$;N{-ecGA+DTr*|YOw<n%+
z>qYbymnFBgjx`H{rPwrqPf|JO(xjEHJdz@~2p1%Tk0g`)sge1UPGES|S7%(~1a$<{
z8fe}~R7W9J%McC=W7pc1-N$8NA-5LWRJx*qOlAK7zIx`aM<TN+nlj8EE#-~7yJHnW
zQP@086mMQ#kKE_APi-usU|Q`WDy!x1Q}X-!lTD#mvZ5E3cZ$|TRa{FOzDV~Tl$SRz
z1Tn`Pu`zZYT!nH}b_dp^TXy?Ewen<hCOoi*1J^nCr7>I06r|d+M$T1%KPe-x;Ztz4
z93~d?neP#Jk8xPAqzr#LfB>n>oyD^gk5B7M8m{-bg_V&o8eDOXm>KI$x{c-qY~|=a
zVme3eN4*yvn754`&AVG9Y>}13i<~j{$ml9bx3c+!uK3glx1LT0I(MSx_fNL-P0C2>
zu_#xMfPF#lOkI+!aZP6KvbXNTFa<HsT6YA9)$U|Vfd2rylmHG!K+mYDBn0L*Mo56<
zup5hG86Mu%A};pJGM|?-GLN`BA9`_x-aob5kYWrKxAhI*K9n{I6;=^<8hO*3X<}kT
zWsgqBBA$@tArf3Nf?MTf#^dYssbP^>!dkp?65CX=<w^9X+%?E%+{h#Y4&gXJI5{4a
zg2ZDnMkaQ|K$Ubo8l#FtF|4+;G@G1+MmY?9!R=GP`&e9n9b<o(1>lcxY6m%!FL@J3
zFEOlYM$Y`27NfCZS(ViJw(S8<7~`q>4wS5|x<!s8Ea*3@Az-Wi&!Ii)talPzw22;4
zR>GBhVSwmB9dlAim64Zo#^4Q!{pRn3+J>w$eC<UIcN*@O?`%0vKc8xA+$Ik22GjGp
z_xe;GbZHs5iZbUI#_aR`Xen^AurNDr84kGlPpJ2#1-pr!DAGYX46xwwjyUG4MS7*>
zTM3GQz?U6!{{ZW!$8R+97@YjveWWHg1wA<al-IJp!(14_3Ou-#Mitw;8dr(}DRlv8
z8s=3X05*ZuvU#RV(m=jsc|bWTMtJ^}ZR}CvR+>~~gtIF2-rj@Knrx(xa>s7|Q-ID%
z2X1<iOPL_ED$8=<A(L=Z!oG69{c4Tb!WM+*ZgQj7`c|xVer$zd0I(ZKQODHOUuVM;
zBxSI6?vJ4QiaC|S#y!lF*+nYJr#|q%eVBLtl{4B&YT(GZb%-428$G`YzbyX%XSESY
z56Qpfn*%C;nWsk9Yjft!81h05+gp;@?L(XF3I<}^`OKG5NWtVjTQqD)MIFegY;;@r
zuHcy46~)FCxC1!v?T&L+W-%Mbdtk^6V{|zgIrOOo=KBvNt(cezB1Sk1p2za*NzPW#
zr4&|sLAj)H!sV4$j(dYs!Dz<fI33q{`Jz@#t_bh`G{>Gd!ZKt^FrXj3$74)e#8`&K
zJA)DdZ<yzS^a7W>$DuS5#AAk3m5V~n^Yr}3tv)+)WCkmhc>?Zd3&HlsVk)oOq&oyt
z#hBQI20WKz+L+TwB5kt&0INT}z{4s2l=)a)8Z2XNzD892==tVG?gb!Jnn^4}0`jQd
zi^C6NRQ}LnmLOwqEaj9)e*0scwHdo<;1HX*hUs$B2=K$$(^S}VBHLc1ayH1_cmc+8
z6#5@}aJ*=pMY0miaO};(@#*!f;WW1kEHc`UFU;NM#lQ#NnG}<W43Ng{v-qYN8P8$q
zS}2oqWL-i~JTfB3x0qzfE_<JTX$AB}cS|ez#FC4gE<OE)W?TG`w39-};g07gAo~wN
zRt3EG02^d>55mSqN}p1FD%22%HmeKyml4YGkamV*2*~aSr?<6CCo+U#AY94&#|y#y
zDz)vc`~o?i)l0X_3Zem=ccoR7hMGAdLaULzcrD-QTS5`JH)V+Bxo2dY;AiDz<B#tT
zQ&L;cBg5v$6E4;&#oGnF#Z-+(3~E)0<PYy0_N$P&js=mRGRhc*llT;N`kvL>NhFAq
zCy9bY_SZ1Vs*AkilEn5N^#roYL3w<|mth7i-3MdsR*O1HR3m{P-~ccWxvJ9d45}GM
zep2W7zxvhDsXLIFa}!DC?LveAGnPH+jEO0ZJCHV!v644Foy{z>T8XyWNW=l1@^(Gx
zCYQ-XGh9Su4Ur<Q6nYa)2xia~m&(YEa36o)K9mG$p;VIR66A%22MzS5tns@RR|f<U
zj-dDY)PnxufwzjqXP!6Qm;pdsaC20y^cB()D9rD&S!3Kz-z5eljX>a*@6B07EpAI%
zNCbKLHjL*zMmpxM+i15JixIW7X)t$B9?qop&33*R_;)^|a`#hO7AFEU>9_0aUY-jo
z#bV`Xqbil71aaD4g>$XNn;Ti;Rv{#oL-J?7F<oYb@Uu|5l`byy<(5+5BS+J3(!C?X
z9}8`RsFNiX`55^@@A%iD=-wUD^!VJhqNdj#U(1$%ub{8I%J@g!QmMJYQxhpRavBf9
zCDWBH=R@Y47Q*&CfNQw2@MVsl0$N+k_mA%mF}AiWwCNu=QA%4VFfoP;{c6M-dxDK|
zD8n`~-_E~7%lLId$}zX(dDStAbtJI2(^xH-ERk*FV8(d$tJ@+;H`~XJrwx|mjAM#|
z-wIj?h%5X<7$e+Ngu)TFMotGV&CYA<u-Qc_P*+->bxc&`^w^io1(p<)$QSP<oa6DQ
ztcDl!T!g~_HuTL_QzJ*_tEr8jXv*>k_o*#Y?Ds1xhjQF!KPdbSdbH?93dtBZDLb-9
znWtuRxr}E#E(bL-BQqQhSakxXwbSIglVl}>GW5?Pl{EX5P0})roICEqpL*R=(0U=(
z=1X8E3I;eWAmX98)S|qNr`lK%!A8LP)qO(t7!jj40HX{mvEZLWT%U=4Bx#lw{%ley
z+BTO%@*H-oB~B_vv4z#yx2)>+(5uRfR4Bk_JlCA~{{Z5xo|SJZoj@eG-~-7c*0~>v
zA00l;YSv3~v8N^_&pi5?`Mcr|#$88Wytt0qIVFrTh?KSqp8o)c^RJ!HxRU{r(f6I@
z(H#_M&T_PV^SJn-@!r$z5?EQh&oNR*?+6_F`qzqhqs5w!h_61|J;M<hI7Dpzb)SEE
zeXd=-)!28CE<Ciy?!`}Kr^yV38Y0EV&+_#5&3+-B@h)SW&HG7O9TDnLp$dNr)UOl{
z!|dv$pdj#m?tN<HR>>vNf(0z+86%JftzXkTJ3ZCX!zg7h%81v4&uZS%{5LJN)y2Cg
zjv)%Ea~@fwEy-U&kIuer%F5?tDL1*9rD(G$UByZ)nFk!6I#)qqq$~$wC?`1>_4KV<
zJqaNMPy45g0}?VHnEKX)Ha5XTFbtJlz@Bh>n&qjBQFcc}aO(FdT4}5Hh&M=9R5<|W
zg(J{axUAYcVCxY;9OrS#13eG;)u@whLj0`Dw|Do4r7`YejdrtuF@^@b>b2@f>5L+T
zAxtt&Bke!}U@tiJp_)Zl>}Dl`48+a;eJZ{6=H1Y|=(4hWi=Li`-k>+YFl8&1UT|@P
zUVNnQV(yUlxQ^l0V{rcfI}nm*jF0f9PjUO@-!i&_3$a{edscnUtg|=~Bkhl(rvu)j
zX;K*qt01>_0D|19>T-Q67K!FB%+~K5jDV@mP#5_}_*HogylwWIbdcwP<~Q8~y+QVo
zhJxW(#={b0xb+ngy`I!aB$xtI3`fkMXM!`(<F{&#QC!d~8J0N2a(?;o=EmG7_);vP
z(6-hN7>sYgBD0{>Qsy<EPL4@eB^{B+4elvNpLZ76qzNA4U5D`>Z%R2snU?3fXqDXq
z7h#1{z$dLE$L1GEWjpqUn{G(PIb3@EDHNFsux5N?%oyrF8gO^Ej86)Yu#(`Bf+}<l
zX2vDW!+{Iji4^2V<`0<{@alVJofXB>6yBTCGnHa;K<R_(X<4o2^00-OrNCuuY(D<g
zW*bRSXWK6a0G+>de|b$yO2s6~@tfHg$@UUpW+7X5r&H}sjLn0w`DVt`{44%@)u{v^
zylHSFh!MX%{<RE%?<Ln@z*SShVe3NFV`YvzsG8kFqc_S!w;1*MR8JPz8eraQBW)^r
zjyT0l6uZB2WG-?}G51&dr{0Z^aALi;vX(zAmVm!MHz1sMp`aoWW?=Bildu6FJU6ek
zM|8IkOwh}2lRg#IhhvIi44>(xS&RI!us96Eu%^umtYEC0Fqr`7Am^c?$OVOEG3F^z
z{{VUOC|*!{(4I><L{pG<?+5dy%LI1tO>-0=v#1i`&&)jqIyf3eGFwP?Yy@r{JyxC3
zEityQZqNXVSTi>1nfDB5^r@wc#)O9s*~wKumTF6DRFt%1aLVHfI-jR%xNM{drzi+G
zWDET2B{WitXvdx><)d)BoA;b{rp03vQ+a~ta8ej4IT=3QwY0ixiCQuVLCUr|9^lih
ztc+z@pxn_CSwQ5EQB&<w1x>RwY3~`?Jj$RPy8*@z_*0hI);vuEw&p6LF8=`SA8OQi
zqe#TE#jr6uRE|RWnpl=KCO2>tI3_?i+e_NEQm109HWJD*cPI;mk-9PTKT241{Y5T5
z&kDyO#$4^|pHE7>ks}6;gBb94N8PH-S2lMVWK$S?sT7c#x|QrJH&vP{Xs>BtyQ6)r
znB@7l3>^OecC8yok_KC-fZ7Rp6|sTaim5d4Ttt^mxkPMCaTn)zOdnHIL2&Xvmo#dJ
zW=L*JljuiaJ5)C(sYyi^;z*zcWrNI=CL)!ah|e8;PASlzB2F1tx?#y*mZC|e@`P*w
zOcppj>G2~){{RyC0;q*|@_8Hme=5r6gQ7-Jg(ny!6W27clFSN>;AFVtpGs~vg^>Kr
zPB)Gh6uxwO-XlKK7!0h#hR@QeG=*YxyC|h5a#wa)$mMhV{*^P`Bfi|@Xv%@cJ?fG&
z7DYrnF+4YVc$QtOhRz8Yb?@m~#zc>j<g{V_&cGJVbJOWba7EOuJI9jX0kmLe(wVkd
zaIXt9V+0_;0)p|%it<jx#M~<O?V8a$fY??z)oiWY<w-ItoZuRj-LkJ96b=}X+a9$9
z*FqTGWRDwuazO-@qB(<3&@9M7j4)<BGt^e_Z=kM=A(9-*pC&*7w{T54KX~osaVFe>
zyS-6+*vjqm6ta)?VDbeuZl;Xjs5lu7jtTz&3hIueIU`0~0?9mN1puzo(Br)k0W5(Q
z;Z?ABVO1VxxI_jr0VF(%*xY`U{{XfLAzM(z<aRHG9Dq8v(zj7!xogU8=_<JL&))#@
zao6dJu4Rz?k%FaIl-ud+RhDp3qMmT<0VS7%jPdoQlI7!Y(*qkQ1`@*ot3?Ea<XUU5
zwC$Lf@P1Wnee89n$8$7ovMF{s7!9{2ed?U@MDT$s6B{;EDZx|R@lFcJhGiwrc>%J0
zs<~n=W?hbbgKT8&Ant5%$2`**%2cwmuGY^a;Y~vlJZK><+jnJ&=NavqM-jO&tFx?)
zzzvN4HI%7AkDf?|?&c#q&m7}?i?x|fK_5z?J@Z80XPV<KSZ#5}PhdSOMeU5SjO|s=
zI9{TllG-%4nmMG~xp-i|GW&z;T(v3klG|ko7Gx}tC?^>y(39WkQY0$~3j!3uC+6gV
z{{ZW$;EFjTP$m)<Tt-I>`1Pryi6W4^#7H*nSktPveAg?vRz*0VjhINvKn?SuZ@hhe
zp48>C`J<W8l}Sq!C$AX%1zAXD60NaS1afjY=ARk1k~pq};KtHzagJDek7~`_cDX>r
z;B9#o$OrDOI6aTQy+)DDUO3|*BAv{=O=`&rS78$FIKuEMl=i!00L8J~u#jhxf2C%@
zrbBKbnOKPBMr`gUkc1xNxv3ThE-qVWaKAP)jyhALUm`W!!H5TNQ;pyKdVK6{?V|$(
z&iIu{`J?anRJO#B)mMoN!y^nf;L15CxcX9v{I)Qgc19$XW<4oHkuZ4UoE9U6&U5cW
zus%?dbRt4lFr(&Ej<kj>Ei}7h(<F$g8Jx0YpIxWcr1GP*I}M?TDw42dZVl9vOp4|F
znSRk5Z)ow90Am!?)B{1g<zurM$6@MdvkeJgv|%!@*(7c6xDar1d*-5++BafSA|&Nm
z$-z=PP}eA|ZWZ_{Hy3Zaj=)rRS8*gxix~|XZrLMco8Fp2Z5Fh{Y{d%4<syO?dCwis
z6?!|!<3fyq-IEF*(y)%BCB#iT{^TegRD5ogyW<~qao@c*_gQ$8?NYc^CknfI@s28-
z8xp9IsdIG%$@X|IvdVsTWA}Z&l}hJSFczL^fsHwofO1rK6;543RgfawGr|-GkR~#5
z(<ikudx+LEEzF$kA~0AeX7sC#I}<96mXlR2^N_(A0}z8aUf)thMl~tXlH<vA6A}jY
z2OxLHr9%=4N-oJm;ILuBxbKRsBFz?H@_fC`^T_<<c2VhC#xd+eldzXpSH4pVC<C3u
zg>Fd{`R{HcbqbD>?Nf*3fsWp|s-i_yB`;AX3{pZ5Sp5&Du4%w3tf?;jo?jR_=hn4J
zBP+HrCeqNyF~H0D!{);tpbC=CH%MZ+o-!sv%*UdY><IPmP)ujJmMeQ%RxyCgLhuK%
z_4TQ|%Z6dS(7QfLZTWW92)e1XgCt4=0D1T4@Tit{C5%9c5a-JP62sI}U}+tLv_!|h
zZsOfBPPj8AuzA!*ipA1E0ASx==|IUOk{O|s%#?C7BLnjho|P56my*Lg3?0VaRYxkh
z{&d)-GBM8BkfuP9erFlvaYRb$seLNQu*$|XbJQ^IN2l|o11&8+#sUlTDlq_gr0-v9
zwI#IBuKbn$EbZx0B(e!qvq36IyG{lUeMhBF6tgr>XEne8NBgBK*Xn9m(F4khGb&G!
zu}N@#;Xb~Go+g7Ni1<u-yB|A`sHaaIyGGGlknWI&onrf=JOF)99XnJ~TtRLXQYK>j
zo;V)E+uD&<C5usZd2Zg-%nX5JmM{j!9nbmZro5HBmx$XHSr84%0`>33Q)m6lO)Ftt
z$RlnyA53~w%V#NLck{?00LY`D6rF(xw+S=G05XI)R>wjIe_B_zDC5tZ2ax5Rc)<Eo
zrA1IxGsydefN#Q-+q_|8X*{jDY)Kg<{e>pSVztGrLN~E!$<NNwgPiC1sTm`8S2qgi
z6etSWA-jTVUoKV4NX2~2g$f6lPoVXuLv;jkyhhX{ih){HJR#2{FRdKN3axCnQu#5y
z$#I0-Nx}8SB*sgH^Ngez%Bz@DZUEz&&^CooTW8D?9wm?Xey7%!?$+H_Y)sy9h$}Mi
zzktVDIgoOY1oMez*s;4|N)8A6L;8<eQ#&%7R9%=SZyXPEMUK~XvXb6N%MYEg^0%QL
z{?()QX1Gx!fUa9;P`D3{nWW`rH5SaWuX7IMCO1YWYMh@;)R&I1%p;k00~pxgV|!zq
zfA#9jwutL2kpu@gb;b=c;?<U9jb!=3QmWjB1a<mTQn*=_Bt?mmX(N#D>V^5oZ=k1J
zSq4Cplq|C68NeQfr;gd>lv_9rzD<e<`GbFV=qgCykVw+X%2<4*N@F-QT?)jYO!Bjp
z0RKP$zgUsL7*yjU=}(%~W|1Y5J^PN|HBL5=I{Q$T<f^T}J7bWtVC^G{oD?ybgq~cI
zDOArnsd6bICs7c4!w%F`0o;$hOE<`-ID~DL+=W0pPC66Xi*lStGqjmPjKqEKVk$th
zLu)LN#H4K6M%<FUbMHm<D#KdK%79-^!)qxF`OYy_=S4v%W%)#4?j2wM0IgEYpvokL
za-L8O6r7Ltfay`fkbS9(F6nqBQTl(i>^-Ozh*AlRXo`2na!(l``=6yt6{<xPf(Y_i
zNyc-#)~8!hAZuu6A3EU358bE7EcZ%0?=4g@3X#Ww#~J#b^mAM}NCmvC6=NB8;fBnd
zb_3~5x3{@K$sA~inJmseVEL<GW@(5-XGw?7q<zvqyY5fvN?sBjFQzf5P}06Sk8F3P
z&!G7TmKZMLVdea!4czyuM&9pvXm%L(jK-_bf$QpO#5U0hwjfct0awmJ2AnLILJ-Ck
zB+l=D$F*ZBx|%2yS{86fg$NwsKK6YxOn4^wib!H`pn15+{{V2+_p=xRJ<7?%Y`*>d
z>5XdY6=lod;IgjJed^THA;pyK;&Q?>6mQ7{pzYr@==A8Oh(uMeB;CG8+(GSw*b2BU
zOMIn3SdL35$3KT!u@#wM;K;iQe(jNd>wD1VmcbZ1m0_`w0+#a2qn0YFc^<VSdR#zx
zk-Doqg~$Vp`T^Rm!)RGH&g9C=waWBAO1Bk|c=wpj%#cp(Y{z<^Y}VzfS2Bi{s}zy7
zxtUx7Q#*Hap1;ne8bDDdRTu>Y6$csgt%$5QuyBQP04T>f9-^jQIDo-ajITHyf5Mm6
zY-p$_xz4VY15VPSorDD`{nqcANpw^<p`~4|#>un6_O7G*D7j`t!D#tL><53wpB9jx
zDxe`TyJ_W<)Y5q7wi?2tlT8pSCg_8{>@tJF^vy#jhkz2!<QWEbf(Q|xr+Vy$lp|Iv
zYS>?x;|HmwT_;YFTkSI}at?}5sqKniUz*rHs}^w5_;bmBv_%fac=iS>kO<_F=xT#_
zPhyzDD!h(MVRAyA{>Hrq_e!?OG6D-W0M0YTRFh1JWWu%_fEG+-Vx?oMqGg1Ez)9f7
zx|PgGe6>JAFz4TQrBKxTFY<?$FjTiI5XLcHlP;LDF4a+x-#ZTD(zCC$DCEkt2WTH5
zPB2fet#3;oE^m35)WN2-Jhtz{^TnBWgXR)2tNyGGnKe%1PLcqz$i<aTS(R~$^((Io
zDUL))M%DpjQabxqR<Ypdn{%a{*8HfKdwi&%bspxuI(dyZxx+jR*2kU8V6jKYW0S<&
zvBzaJT>Yj6-g22cUBKuu#%re5G)<e}k|t&mZdPOdvpq3bI<q1_lO*AtR4kEajCK|1
zQ>z+?;hi@UoOg0UtOI<c<Y%cqwL84F*9oXQhc3BO8N!TuilHiD&hSax4s*z;jPl1J
zM^FoTbOO2+jI7Rr4PeU(CCp^5P8<-q_32uge~iMh^78SF0#t%?>7Lcb+uXPXBiyVx
zA2&Gl9@Qgile>uvM4)s*9su<`cQtKAf^v?>q1$-k3sJ~;=8&DDQcl(N$4-4}TYnwN
z=6Ps-X<OtV@<8r=E6(k;FD29uG4t}UX3rj?tXt|zu>F!IV%tvLr{;1`YD$$hKWkAP
z`*^wyKzS?-Nw|S-^A;cu#QKqgTRLZr=CzbtO+Ge&V@LbL>t0}&$}QrG=5jWC##KD2
z^gi`w9b)cK%J$7Dln}B*fXYWlC)@R^czSYHXlk_L?wRa*XOE<x%rZ|HF1td6#@>4R
zX18?z02|61ZM*r89|H%U!!_Zl;(N78A9tG?C+{VX183pf)}^<N?!L_owrCiJ%sA>u
z>s)oP5PKbTv9e23+$?-s45%cELm`L~6t^+4;GBBay`H?V$B0Tu!7~1zO7TlC8BcF<
z{*f$eJcBDIO}+Y8Nu+qXJ%mScC2mgjIP2dYmC08C;;xR$Sk)(HdbD>?-a=VrViaYz
zwl@1yt=;9cGQ~2fAdEL9NBGwnqxiVrTX}J~0F$_G<?;N5YuosNWrSTLAF(0a;YT5d
zT-OY!O=xz)yku@lAeg(nWT`>4Dc~RWy>m^SpnH{Ove>+CZ2YAAR&}PJ7?!x0Fpy?5
z9|NyLQoZ~}TzTqFF(*H8d)9u=Nt*LTqQ0}?%_C5jOK%`g6~OtGMi_dL>0Dokej7t7
zJ*!$Pql_xc$$x6@{?hO)GDQAj62e=E`;S3cmse#XTS@Lo0#?{vN6WjQC)cp9s#Pk$
z<*QDdk>frl_*S;?t?$_sEM<vEmj~Z<W9ps&j?&5n(;$0-NqJPBI&gXI?Ox%jX@=_7
zQEhCpZHxwi7y?&3o_hM8`1)2v-W#~OeXzm3Sw`F^C;tGgUW_qq{70WWGFu-#Ynlc2
zl_Pmp8>Eosr6g^Pb>LSsbqm{FKb<n3cL9zFub})@;0AN%-D&Ra=73Z#0^`=a_rzZd
zuVc8D@W&C_za(WaWCZr~0=)=UjYYY|I#Pqs^MX9q60kd1oK>q-JBOFS9D;poM^o_i
z)re0$RxqwcK>NqjH9$o0xwRo!w@`gQrF2t*PUbD&LSnmJl4Qy1+fNHjD=LIp750u-
zBcS!7K!sUSGFKQ<&CY1f?6K|!@=xhn$`NRk+8EKC0;NYeB>H;O9u$gCE+ycQPDW2p
z<yK7b#@=Pb20#W3VX^e)fIvH40m|XMYd>KIS2HNI8<57T#fi>I>Fr9+VJ!Puv(N+5
zuB0H9Pzd?38?gG+GD0IHq-BDhsmLJrtS5)I#VL@9UDqTNo`8;ml|xAT6>xjA9w_@U
zW+6i}V}YKu#8hWhV}&n+ySJ&XNmG<wrKXtWEEFmGndAlM>zYJu<mZBT81|;_V8s-Y
z8-i$Je7((`oi~BNKU&GAGJl#@^1%w{jFEsnkG(`9jyVg(CNO&L&onEhe6Yl?@Qm_l
zu2X0Y#!t#IO3Vjt3b;}^&r#6QVR-q503@GERw{@JNJdoofrnqEBQQqEA&F7PZ=t3F
zgBXQw80Y69k$50>IiNV-u%N)}gVvdnWC2E4_s_5Nr>0D-j@V@x!4&KRi7W(+K2gAB
z@9j~yUO)tP^c0|#Wssxflk_yuphi?k4;+>sbkeX3fB=XRagxOL%@P&=08~N7-;j><
zj6em#<v<E>d8gZ{oU%r6%9%xO{<xyZ2F4mk5-R5dB+@jBL13FOcqI3wY~bx+tPdN#
zDae~#6qQ+hHud%EMSyTZ6MIS&KS>+z{xmR_FdjmkPTiw}O=)ravyeSopr<n2d1%WS
zDb-jn-aYY6AQ+*V5~P4slh3^>JT6tk{JaB>=f4y|9F8~bAeX>X*i?qrb30r_sJUJM
zTnzf+sX}j{u7-w0D$#;|ZV5dFGc4PkMpR_J7dZa_>(r*&Y_!t2d~#KI$NvCck{d<&
zjDfO1DgnklNvG_l`Uf%+I7=art8w2veLl3;4kI!M%I*8yim+mpww7(hMotC=S0m;s
z%kve+KN=-YNo)zG5wP;dmbeUl@#{@!+^Yvx1ms|hQY>J}fxMh##tt!4n?r?U9J=5c
z7?7lTip@e#pj{DyP=@lj1MhXuwHr?$h6k^FihDq@hb-Xaby7y(r7K&zV1>X@oSJG9
z3ylHymRw~JJE`>PN(tIZkV=mIb4Yy5a*7!A9q~ygn5m7R<FBVQ?9g9QR#i#16mOYE
zSoF>_(ufP0Omk!xIawHF4rvPo40DA8hGYJ7OOmJ)ZZ?dJ^f{ymBT~)fw8WB5K?GoC
zkr7kmEF5Q$IL$re2ZZ5*j(X%%LnNuNND~c(44h}&`_M6}0%WpnS0ruhJ?YaJ);z$h
zU$##aKvidCnn4&b@Wl1@1G%P|7tCBn$&c@x{{WFd4%$lnoXV_Z9T0L!?N18=Dm34^
z3P=K0CkNEhNfXDIr;JCC7~tfQ>M5w`t|nMZ0gfbWgO6`YECZw77^)B+Px)v%FX2vU
z6r;0%Hm}M?08{HxBnd2_T+U-GerHy|9-LI*&i2L@wpjOcJ9Clik3&U}5i`XoLhXeI
zb_vICYH}<j{h+waYD$cso3$^Nk{>mO<Q&P5Y9*9Sv7<tVsN2$}+JMV=Fv19<EK7W)
z&q8Wrxg;>iLdcEF?d5%{yW&WgO&g;QV>|J?+Z5n<0Z70d81|&l5=IaYD|hh{6m<jp
z)Z@NIIdB0O04@%FYCZn|y7TsxM<ok=Jt<_^j*+~9!RxT|`O*;fW>dLP=b<cc0QI1>
zVYWgJM=U?OX&^+BRT2j(+&?^#?MMhH8dUPm;yFDrKx#Q$d5Qv@Zp#E-wIpF=&QodX
z6rPnHWNa*Q084YmPAOevW-^GJ2-F?9<kHv+CFCl;Xk6okQQO|7fedmPkunuY0CG_J
z)k7*IEdFj(j7Y<^S%IR3H?%I%IL6)IG5mchS{gkA;eFKhH`c9pa+00d`4?_IGwX`|
zKK}rMbZd+}IUH9us=Fox$Qzjf^z;KfSLJtso9y@Y_fSm<vq{6qq>~{X$FLRpN&f%@
z>ekiOnljA_vba)y@Z+U?)^!W6XR&Gu{Kx6vgf&dr#==$(5MU2at##JdG0y>yaNb5k
z9@Xa`4hg=2U9J{C-Gdlo)MKS~c2XEEoM0bQ{(4u<$}xh_(Msm>NxA~AM?FCFtUYqo
zi((WGSbVtk^{ArpEO3MNkC!}hYSoUXYdeVxuI3oPJq0B79_Iz(9~)nIR_-Wu1jJ38
zN~fpPR{sEl{wHYKqAES-?=!b)am{Y{pTS-l@lBzz)NK*irxJsLx%4&jPsYE79~C|h
z2JsJurJDOrS1&1v2JbJQn0t=nzv)`8Mz3vzd*8&bhTaPJzoQ)^#Trez$*_gH3C`2l
z<E?xv`$PWDKOetljcj;>;idfd+FQ;^fn1l111p1*l|48a1dgNb_rDMS0N|iHc8`Dm
z00{p8i!NFatP{+BxgTHUUhm;Aj=v86D{0H7YZ{Cbq|20%2qr&4&qM89Fl}3&It$&J
zvU;Bgd_MmGf}ZHGi{A@;T)2}-zqMj71?po88ysYOxbL2yPHVT1_JjCA@p8<jiLTjR
zte6OkC}3k@_krj^svq!CZ}=zAhyE&Q*B=tT8Y~iOv4%Hs#JfJ$fE}&7v*RFkIm2Uv
zUzENiUx=RsJXYEthV?7GK5H2Sk7~+O$=#ANp!FaT>A~(e_i*@1HDS+2Mha5DEcZUd
z{i#1>zXtgF=3QsQ)^Po$UA|B-G41R0uZR99{1x%f!`)VBZ!~Eqw~d=^^egfK{n9;a
z(YzD;eSAyMk{u_;cJgZ0@kq?~Tf#~K=V-tH<EBqwE4<UcY43vn02Qp|hs5zUjE{m6
z<$(G75$|4&FRW3Pt3yjdQMXg%yPIj)24%uVHpqo`;P%g<s1_)|XELeV)wgE8#ku$g
z@T=klu-9x_)%^7fkbd|FjDht(=bGodNBacZJX2g~VHC#Mctf3`Jx4u#jdcBHl9i>P
zN;c|z!D;0~FeSmj$Orhol`<={i40qCPD^kHt$R<2{{Up45O{c8U9G%<L}65UL6eT)
z_WD<t_{-tni!>=@Tb&l_OIW}OaIldQXOEq`bL(0vv|F;0Cd|o(z(`f?)l6rjG2)_F
zqLi}E#dfg_fw}fMtyI@El+rEizR4Ti#>_8NFbZ&fUBA|#j_ockRcv&&xJEc37l1u;
z-22voHhvZOc{L06W{v!^*ip9x9QxP2czP7nEab7eiAuae8BtdR0qT7{YlQfJ;r7zD
ztH5SpfrjPSS3HhCO7C=Mm0>|`jnNiuj5!{;_V=zFN4y5Eoh)U<V%3an2ywgRb@cWe
zR;okxi)4Y|R{@CQjAy1#dd9JcTwN`^cMPxhl~C|~O=wB1#cmqPBt^oF_YKZ#gbNTw
zEw#ap)!a_UYqE|4`ww66tCm9686}p|5fhLy%yYPo{=%}Nytu+f*0MR0P3Bn00X+_S
z{uOcytJqQ5pus&<s33xR(gR-R*vV>crbaP>FzVe8LVc)9`R*n*yH;sbDxi%=%h&_z
zed;|qE@ZXxR#6`2A(_`G$NQ(ye_B4-d3AWx$YDZ2NER427Gc37{Ad-6_NbPi+BlI$
z;#da5DC^IyN&_Xp{pc}Ej7QYx``PrYsI_0S3z2b%mIVzguhq#vcmDvbR_yh8ZNdKl
zLwRJKFiRlY80s@h!!_*XjV_~w;C2df0B#8PKi00pbgrIe@~FJ>a>Mbgcx8<l9j5@Y
zaG|;%rCWmTHj!FaUodkjDE=R(txG^^#dQopnnD;N7U+5Qtq7H)*s?zD!*VhV1<2`-
zYRHD(ba^Cug0cBw{$NQ_=sitOXD-V%lsmgN<&SVbGj?qH8jVSIHQ6F{GTYe}mNd`E
z*<d|Ky<LJiV#Ie)ua?6x7>3=W)sJ&o5$Z6{Y?o~+0vM!`u2q9C1Y^>sH}^Aa4?2*%
zDxm1Sfu!|A(Hqv+o?4RONslFz9uRgvQ&ymzjAnO+R%iK8zB0%959e5M!)_<pHQMtS
zD#}mfYW0=;vqR_ko0SeW;~Plz{HqBjwi%~yaWD2f$_op%EGAf+IZ}8k4^P(>e9LU_
z92RjCG<Yu<ke#P*@%nn!eV|4lX~z?n-tuRSzJjc2)2-d;y8C8KkFrn~9$*K#sCyG_
zO<3fxw|LrnmsQ*upK;-c{RL@RU9(&HE}%L&Bg+FACxiIbBu{B>WQ~sC#AQQdvHpUt
zTFfMjPZRF*RIiqLt~%$^v2q$WEN|jiS^mwDIok3A^DYkz4Qg0kz=<Pyo?%gy0lGGN
z)=i8{Jc{0C<p2p82Ty!|oYsU`w}oJtaIWQ2MHt`f$E6~yZd&RI9%b^?{L`{rDEpN)
zvm(nNwTEiP09Vh;xc9|nT9*=yvH}kn9G_~^w|OI&LoAEt3<Xl0pIUd&YUZVsvcSSN
zV6g1Q=isv*O=ww6AV!cBKQB4%D=G%r9!!eaY(yD*_p7TZcp4;RCD^IR<bQyyr1b+@
z8{|h2u?325!Q^vS?6pOnA{yDu&Ngp60He4a>kirnUSmFF@qNM$H+vE3T9HbU$Os`_
zP-kf1P@86vcQ&mjjNKWQ=2ENxDZG^(vIlC?x4Q@w$v7nZsOUN#`4xv_bmw$sLnALC
zMhQ9VT5wAcW|BOS<&CTxfP1i}t|pCNIa(tLa9NHvgUXNZR-KYWk%{i}yKnIHKkW*{
zhESzj3QI8F{{Y_}gZwLTuBW&W#1WbHVM8d%Y<dc9YOE{R(6%v27*b2AIL>ef)~v@8
z#C(>IXgys201Z;Ib%sn{IE<C%H~ug1tCG(tUAHToF9#i}^#asv<PwZFDCLiO(Syr)
znkZ9^o1b?lHJ@e_kkXtfA2TrH=~rQ9-GV_l^sL!8ESNlnBRkc=A&JfhrD?{GxJFnr
z5Dr(TO3Fn=2#lnvzV5YsWn!3t{z%*za56~tsd|)JhCj0@FupUL;k$~`wA9`yqmFos
zM*jfv%RhIHwMN;bky=9*K_4r1BDF2#w`){{F6RfA+t#K@TT+oUZwpAp2rN%Pe@efm
zTeGttD`p276`x?KJ>S_%2)DQfLyQ{K)O6eJ3s7qtrvQe+$(*SkqOhB`fz<6h5v48q
z^xPNk0n{IVO6-%uspYIC3-iX>^WTNOEKMWDOAX?yB%mvi*9X?U=T5e?xVZ%oc}$}X
z*aAA&9ZB+)7~J4&wE65r(Xy~E#Y2<MGt#HJ(}k{^CC)hNSaXW%HJ=Yfxy(2p-D;^0
zmXg}}H&O3Q;n${WeX3=0w0YK_cyDBq;vK9vl{oE>TGy~tjj+Lrla>RmVn?Q(1H{+5
zKqVREGDHhxkbOOIT@}5nO>UP8*uXo}9G`!sY1o8Wnj1;&9^%U}kaFq=8274CLoCcm
zOnWftR%Aqq7JbAC1~&uVq_D9Yw=z7NmjQFn){|)~vaH)bj-`rs!od;CukQ9YE$nEv
z^8CbbrLal+I(^_rT=x7ak=n}9!q@T0vx&=j(YHm%86MTw_)Fowt*hQd_jVFC)8_fn
zjj<L3gX_(Hjas!hM(vnWrztZBOSWm4-3wW6ivsdOtCA2NqqTZ}!JpZ8$KM$Bdt}pm
zIdHa;$iHJ^KKUI%Z%=>aUqOD#U$A@{`r7!f#&-^ucNm$iTkgnl%Kren`DEAI{sj1E
z;cozG&}p6*vrA|!<Ne8oJQT>mKaWFR1$@r$mI&%p;SKdXXZB_P0D^q@N8zLpYkw0y
z&8q70L=CmOZV_Ac`5k}ds}4T)Kp-3gUq(+9aU@ddaV%a!Y)gH(R34Zd0pE%ucw$s@
zZz4J|@{V#?9>jO6QQKTf@sm2RXCaWs_eMLK^EIg}%TSb?T8(REksJ4bID{SK9g-hP
zd#>UolW&+42VlS;4uc&k)R7f!)5xKfLk@9~(;}-29rs{H8|MJF4;k%`O6-L;nmOE&
za>m{lo5+$6l1N9I4<A5&l}7&nPmTqW2^-|wx(&Th_a?4Ds|>4|N{=uXF5feI52Z^r
zxp<yv*a8pl2Hf%O^{%xYH8F2fD$?N^G_?}4pc_$?;{^97xT)m1c9`22jm(kxY`EZ$
z{=cnPmOGg4CtHX<MvN?F02@!gy;@s4jH)~*c~CKqK<%GuwHs(irfq~qXUYHrsT~ie
zy>b5l7Cr%dH~5vK-P>y#JPgxCi5(N~AF1hGo%NJZn88MwoPj5o#@;&Ai8OeV6M3ot
z+;PKyvsVc?>@8EeKQjLSYVY_Zj-%k)tB)7_A(`F~reUWxSO+|?Cpg-BW2Srbua7)m
z;NKAVCivL+%SE2XW|XWeFxnp-NXKgZ{{Tx!ui=*0>`_XLfqb_>Ptv?I_JjR}{uTUP
z(e7{b?+shE!)_Rna?#1$rhf0XD`?e{en#~14%U(Qz+I;EW4KldBK_NrGwwZcPI)9n
ziUpI+atgwVoF^QTd!K&7z3cXu{{Vt~d{y`%sx`-lZ0>a}HQBbTgEB+Z<R0T3VDraX
z@LQN?h+D}Vc#ZNT0DaaR9F7R&9zM0woz>CN8Ae+XyiBAetGK|+hvaA4qxqEij!*8-
z05=~>ni(z`OjBDiF2ppTfHCYlRAM;F7@FPEG*gw&-X6L2r?EqPmbYdlcAdQLG_4wl
z)T-x`^8?0lN~n>{skk?szbfaE{xt6{HVUZWhE7y=KJ;sF8ljMlj;*}yRb}nm=AJ=x
z`-F4ymIDVg^nmW(0^~2=KXi{lPZ1d84phdZ0K#5?dXGvq9f+;%q=q#DZR9>zE8O-p
z=ZP3PJn`*i`I{ee-lY(+0%ShBaqH>zrx;owA!G~~e87$Y>w;*w)JRRd49e0wEwUgn
zo!Q>l=b!PUA=!2`iyOBHWgn2KM#5Ho>WZfXN_Yp*{{TvA#Um>DaI+@kh9D46wF0n-
zZy~pl?!Zg|lyuL3Zn>rh2Qs`YvP5t`Zl8rr+!hN2m>qp-?`GD%Tged#FvyT{DsDRv
zwXe$^#ni<kGL=~u<@vFm-SJOYOS-&>3Py6yKZNw+r(0&e*==vNq-Hxp94KsZeYmBV
zEG_+$X&PKRFmEzGna5n7)VYUi5yT8h9IlGaBw-;__g5JN=9U`}zH>8^_K+KU3}ENC
z6!ek?o5*5?G7Dp_d#R~zOmb=~1;m9=BIK$6093f@0PFOnb}^7gJ13eD#@HcCE_RRa
z3YOeQa^KnM3JZn(>E7EzC$aBQtHzG9+guBRTm4o~&ZE+-Y7)THvr7T;{G}-rXXcNN
zPJ8=`SGWV%qog{ei%lUcPm+tA5!VCyR4{`E`?+N-vmLw*tUXi@TAuNyQw(vu%`&lP
zc=!Yn@|DL=daZW%B1V=q1;Q$eaJx#kcJ?NkxXI*50_{mmX%{88XK%4R%@$~hY+!gn
z^IHom4n{o%HGIFcMF_TVtVSK%2pb>8?M_2Hv9;32=OAJ{#E%~^>&IbCYQ>v|yRb~#
z?UGA{22c(%zM1Xxrlz49vNfc|k~x2PHhjfM<Y(*Npbrem<;YpN%KX^J)`@Oz7U7}?
z%k$z;Wn=|N&lo?21r3tw_A7|)Vnsn5nF_;kaoA_IS!+40<B~{ccMtp4h!Sz0NFR+=
zw~)ypL^}W>OS#VM@%~LdMU%@?w(_)ZCfMB={OyjT(whQXi6Icrc<M}R5HX=04}AL6
zI;@e|Y>nieH{wAYg!LeO-%6J1`sNI5Qi&%DjG&Yta!q6E7gtQnAKHA`rE;#$GBJ)Z
z=}r;mWKL=*iuO|z$!f3jFU;!gk~7U_$uqRX^U33PQBqAgnl_5zhUiW~QHFm`eFa4O
z8*3^R<B-Sidy48>Ee<x@WAar7QyhGxp7kVB?zi$_XxaW_GrA9yb^@!2#F!3oj!^c`
zr`D|olqfR5gUZj!$%cQgsHP%+4d}NXCD-86>_mjI7**#ZBX(==Z`jA+MV__d9XCO`
zw0NUdLof}5Z$M9B>t8N@%U%N)m#gAQqh^*#3Lsd>F^u!adi`7dhCUr=-Wu?o*NLw5
znC_)1h~sA4x&HvY$l|_>ET<Y&okq7cr3WW-xbe*PdLD~s;axHmoWmZ)8Q~NTzWAfz
zM}uvzE>5SYD$63S-aCCO7seXKrQ(km3k#L<ytXSeKn|UTM_To7hV$B5X^63D=X7nf
zGAQfc@U7)3MixB?_C@aze_-jhNp#XW%&>f@lJJ0bJ+oB28K>LFAD;H53lho;ZtKrJ
zr{0&uw}#_YYgE&70Z>lhGrPTPXltn2#TYh;8;lhBI6j7yB_^!K(ny-(;7fD%ZGaU`
z(d-|0wPorr{i8XCIYY<yOAlW8^sP@2YM)@Td%+eYa#iF-$@&3aUHe4*UQdA^2`@Zn
zGOAxm3wajupu-$wgYV6BQ&6QBIc$iNa#lWa{{VuVe%AU|g8VT500;aXtb;L?+fnk{
zhfTN&G08d4;hOyTyVI^O<2O3Ag@y3*B#|E`G$W>Z@mjwVd~>e+P4V65i~K|%&ze?{
zjsE~EXSfHT_No?klB7oJ8Dk*e7LeqAK7zhm5mr^IxnDz~8bu=ZiDjq9YZTB)yClYm
zH_f?68?)<M`b~r)HAjy#7yaJR{3E~Cvh>)kZ5~PW8I>)-8CaK=Z1i7q>0K>^3=2bY
z%-(EjQNn;C^yk+V$GKfgwt&R#H`odZ2G?v2q<eeSh}gRo5p7-zxg%)pQLV<rj$Cb3
zVirTr?`oy2U(EpWAS)`V5AyUrx%T#@Yn6K;`i8G+&^nw(rc5-1^S9J{Rwl2nTiUzF
z71U`M8S@#rW9{isYP#MoRzelYC!rV|S1+vUmo8S^yf8ZEMKTQT2aK<)dsMkJtc>L%
z_O-6tx$<DhUJJJDjFH>kxx1}y-a;+jUoBmkLP*@Ps`nF3G@yCsKX)X2xb@?`XZ@^X
zI@{%!Diy~ddWy?^%w;lBsCiR;p59HPC5he8{X5g{@5;<mcv#XAA~@iwJw;TxycX7X
zO*{pa;LL0=8DBj?s?uJdoY_S#T03QNEAkkg)DY%dl6cHS%O)d^KfDi5bL&lvIyewU
zItGpNklFV1sta)|w&4?uuF|>tzW(B#uV&1q%*yu)xC42>9=}fXnH<+9yVNeW?X;Og
z#C*vXF|~a=cc`Recc?wh!=E$DR**3xE$A`O3T48~cUwXrW^~#ZbW{E{6mbSvqMd|u
zJMEJ>&mHmUQ(|t(C9!9@jpDj>pMFCCa;g4%(#BE?X>3uL#&Sfia@?O^T6Ao;K5W5T
z%O57-+#DQs{#3H8HnTJ_xM;+9$r;9ak(xug8vg*ijKw3djFaWOV}?G5)Cy4@#l^Uu
zRLdhDEn@&~BZ1FhQD4e_$!@GO_F2PhUzf}{?tMS~U8+l@i_EzR4%lW@Aa*CdJvsd7
z=o^g}F=i>Hos{K)Rd46(QOh%%c^X+5{{RvsV;qh%>?!jJ+0OWvema!K7aUZLcJ~@s
zwhS;_@)r&DC(?o3ir(_x#QCBk?{J=55Zn(;id%~aY~zU9Y65Z;vnvDpv+0joiq<un
zB4Y)MWmFCTKD6N<mj{}zcA+X?ug&Ov>XR7tREY)Xf8ECWqmDz)eg6QLy)4++?$9zb
zk%?U4Q|KuGxUwwrS{X!&2cLjMVDo|xdTI#c#q-MY1V27O+mB3D0P=-1Ab?4e@~Az1
z>a?vaDTx3kMkAo)RPn~lPmqP!Fx|JH2c|#5o#mGg6bd#UmEG5bKi;4Us|%gc65APe
zg&kD-)UPWd#)?u&GC=arIQRbm8hj!{8%Yabqhoj<e+L{2RziHmiqj;o&H(T2=|BQZ
zQFeKzMp3!qg#6e&{mlTpP_5ca7)O8I8AjvBq3uLTB)1DJ8vz6=gTc?G4Qm^RGDVWI
zVpYxn^ds9pohFb9CALUe!P>=$aOXRRY*TI$Z@8#cm49}nbII?DwF1W+sRhjOLX*fA
zNhDm2zwG)Nr+OaB?XCB-;fqHnT(4|Yt;y7EkTKimMxI%Hts4v$KIWZk9#U{N?qwVi
z(+8)uL}c>Fj^hn0{{Rpj2VCRV-lLLc3RuEXf#n?XIjTWo+;Ur^=2e<FAsgQ<lHQ`B
z`%*M}l%F&m*e(1y^!~L@X(p3+kg^Z?X3Bp$aF*xoX&JhR2|xgZ%Wdy~deaM&#cg#2
zt1Cge0^7__&zI}<G)Z%5Cg)dQES&tOAPR|E-_BU%+yHV_OP)t_OXfupm96Ab7yx#!
zUgUE?$#WcPu_zzB9J-V8FR7-y(p!dzg7Svt<2XiB)A6QCmvVfzxl$J_`*H~Mp_C#n
z9hky*2JFQ4#RJr}_LVAp$ypa}Oqt0Z)RSC9q?A&b0I+AtCmlzp(xOP1A&N93a}z0U
zcW3y0sl|#)vK0izpcu&O#~;d;f+3u-1fn-54jA!KGY27LkZ|8A+qXW|CM}~W9Jd9F
zIU$MQAMX2_jm*n&u*i;pebPA}jWSsr_Nj26C~d{|sYd91>()L5_!CmoZDrTxxKxsG
zg`OrqDv#kKwrk8R?QV5DsPz3R$)}N~Qn9X18$Iz}{o$Q1^4m&^8Lk!?BmhVid0cj{
zv*6qhx5qltT1RfzJiN}Tg)Uy_RpJ8-rFDmih9XoZGm_*EGAm!;-TlqKjqGM8Ve@jK
z;vA0u07}XDWu<Ex{{V~a^jql0%ell*IUpkQ!+mShzB&9F*MDcP7HAraOBB|+l1t{y
ztfh>Lw+pl!fI%mxJALc*$<8#Ii&nngXOV}6{p5E40JScWrE9Zj(%vbGDdJUMD1uz$
zJdxU}X!=i%yhq__Y`j0^UqNjcP$d~<JvNU)TK*`4-^M=)v`-ZaM0?vd+RP6{?lIWo
zwRfMhcY$v;TiGPg#3h<FK>#^tC%!AQ4M{2+{pX{5OGAnH0pcGJ_$$X&b86q{p=HIy
zGe&qh;Dh>C(LWL`d|l!{65HyURg9M(XoPcYnIHk&*EjJS;j~}ykbh=Rr<;97#e+#3
zrqd`rkFT-+01EDW8SxVL!8%R8t)|<So;b?Lmpl|W!5=|WRt^@LS7!9orLoNGT9wtt
zk!uUuy18(Ss=VW-Yph>|o+z~Nw4Ni9Ru-Zi%EfcH1FdIEI{2nTsa!y)xh-(&a6=Q&
z4*vj!bv`NhiQ+`~bw9(aEiOqd{?EfRf2=(~BzEo3TF$$vPAS6M>*#O0Nt!+i@mIr7
z1pGO@_^I(9Q-&QEMbo63cer%|MpP}c<{)H{02%Hp@Mq(%#G~=2<6nwCD$8z`uxt9v
z_cqq(<(A$Sk%}Qb&dsEr21(#_uVnqaKWaaTpB21KH^If!?lj*H=~A;?>Bdchd9p!M
zx9<f!Wc5D6zI&Q0XyFk=h!KEBh#x`E>MQVWC(M7ebDEV@pDNKWP1)ZVDsbdPHtQgD
zL^xH(#bJ~5r)*N})4=Rl@}mHe>GZ2GT9X3ZECmEbmCkdwjx$y!)7C~wq__vmPo0;5
zPxQrn^QekYE8C+*Z6Q@BdhH~yC^$L(l-Mn13*?)2+(BhnhIsz~Jk^<DgXTNmV<0N~
zzFhnJQbl(%shjO6sKmykFD>i%R&Gs|WRV2c?vYHvup)>Yk<^ol5Cv_8#DOuELB>y7
zu#x?t&AQ4=W033j-2VWFwK6LyE+l=$cS3>C9x>`j?r6K}7O>ZZDq=`WtVb$0;|zP$
z%MG^2mE)0R##iUU9(^gKga%l)Ge|}oIUkiuBq-sfkzbrN1v9_tQrOW9%ODRT030qb
zSHGnpY2$`VdpI{V!~urJ-&0P%j%Z>Gp_!S9L>MlADrK`xbqc-28v;4`SaQR-<E2vA
z2^K(yY&Q!jP(#Mc%P+sRDwRmqHCYiQ1$^ghkb3R^00U9SV<2M_Pq=ObN~4m8p!_P#
zR`L}4P>*t<!F+I7dJpMIxT2ND?2b6YGW@RF0cj3N_oVW2?AuG=juWCEU;edO5zPeV
z(WHhJa5FTkkf8Oz^~dE+js=bvjx6Ci7H%J&wVyggZbTrSDOF=tkgINXQI#O}$E`}6
zE#hX5-S`EzNI?k4xb!snV~zv~7DS-scO0)H`u>$7S};#Np>}wmG7@;lraRQR+-VTU
zYa~s8vbUDLW61p!9)J&8dkGF0BS;7)Ok*Sg#ZF_AX(V@I%*q6W4ui6qjomXI0gRJ~
zl<-)N390703lPU^AKK!0rrcj{@Eea|?ewXwAP0N-fC0E|>64y@o4qZGWGgw(?&FN$
zhxZ4yIp&rqyt4^LVoNKa1$}W&?d%#NX_d?>&@RP9AkDWqJ?go1Vk3`GMUe3<QUjLu
zKA&2KYmq7YJ-m&zxnUv3?{VlTxbvo&8hDB68E`R<JNnf|Hrz}^xGv;G$^)+4k(NCF
z07_WqAr?h^2$=JnZau|8C5!p#INkfU7-b}9=qb^ywYf0L#gawB?)$kXo+_+_Pa6ej
z_QxZWF7WJf7u<VL(-0fVok)?ou+KifN@OB)DT$Hy6SablgZhe6SNDEg+Zeyh%rXLw
zz*4XhqNI?rJb{rxDtQV?>w)W5(L{EJ-S)_UpEVJ1><?`ERZD1ah1~%qvlDrT1JvWa
zSP~()Q|2IdP!n@w@jlg@n!bZfux@Q+KV+0k=SBbozs{-H=e`AJ#|AC_&e9SXux4Y&
zUNT2Yo$kYzwTkXMq5!2-9FFHbY4Z6G5Lo2G9%N8>C;W<)pl$+iu(T^S=$wU-QGRcy
z`RhPw9D^GTf&TL!l>1Oad69&KDoD8VHw^Co019kqUO>*p1XyNo;bZ+XK*j{NxkhVp
z?d3W7!*}k!_^F|WM3z}fGe;ai$VmIA{3+8)&uY;NP81j3ga8=&j<~5~Xgr}VnQ&)N
z04=+t^~OCZx1b_Mdw5}p!!tUomJ^1;o;wO50%#s+=MNAW2!|vd^qZ17P&>vZ+*z$p
z-V6QUJu}5J+WBUPUA?)sc%*IU$^dbm2m_#~yC}JBYlMzSg0RC9j80eBj^?XfA}~i*
zD;X!uE!6vGwmVW!B-5_=<tV|jrABf)9Qu1xngDJR7r0l-11o@V3HG5}25&@-;6-8`
zN`+?O$JEj05DWQ$khlc)JuygvMvN`Y+uA&ki`BairxcSwn^a96(VXRuHvMXZNFo;n
zQW*-qKy8iR(9~jCrZU4McmQCR7zfw+Rk*EYRE=L?0m)E7%Vc#Y(xKG!<S%V{qEKU(
zZdm-J<Gwo|dJ|U*XjW<Ex@EYIMo5!8S7tYH){BLi3fSrPlDC_J#os+fa8GY)xfFA1
zmoP~*VIygbZH2&G40DQ(+`Inqmvo_uI75yzz{lZE=q+*>Ah=Qc^=Q<#0U-4LwLjP<
zS^VAKx>ne@LIHlH8j?F$RDGR%#8daT$VpZ{^(+gScNEA~2!S65Blw6t>Kk_&MRRJ7
zi82h5<VJg`9e={5Hqy1hx67tu4AIEHG0&wrFSfXn8Bj=$PQW@JT7R0RK`bm}cN>9h
zlBc~z*z^|4*`$RfRS`#$0%If*!EDr)_L0XUlPi}eHlQ9h_auK>s~)2V+8Q_mY(^VN
zINZnY3{%qSyu&n-5?K7rj57NVK~pYa-4^9rc&!olh*mN~%ERxe?fKK~Euy(!wJdI_
z2|FFSZuQ4w?^N4Vwua>k<Q9)?akFGM9Yt7ebXvvsHeJlv-pT;lzfR_&(;vD^HK&&n
zd1gJ+%2kw(6TVN@pp-(<JW;Dk+m0O%-S?`un$pS<+CjL;cjNn@Rcq}+Ss`$;Y*&nc
z!LUL0tBfSX<cn``wzumYt={7*g*!nQe@yz-FECop*3w9kFW#0lZ<$#0%~FQqD`jVb
zNd#)4r56V~o1C)$0EIUuX`LdAdDvLUoQ`|@{VR0>Ig7GhLo{T-;I1*a9Gufy^$9Wo
zg$uPq9zpI+MDY32z~roCw$^jiIO;(CDToAd`PVIl+<sy)pMTPyDi<*&#oMCCEz1mU
z+Zk0EVe3tf;Ik70`QZGrVEm+d5lXg>q`Yxq!sJNjDbGv_id$ISi`}cTz?-D<4%}zI
z6x3qE<Ym%Ta}<(oM!_47P#(Yjx_b!We8A;^7>!psC)1v$pbU~kF4<kSl0vKCF!VI(
z4joG?jEu$s!BgCyYQ9?v>~WjRxP=^_F%DG6!3Q7Coo^T@cEZTAG4laD?)5bsa{1dX
zW{@G?V~zlyGal#i=QS%k%^8ekwhf__ecyc0(9;%cXs`ZR5@iA`A@hFe>9|v(jzxtM
zTV^hR@0S=2^&Yg+@w0uV2;0eE5u`7`ao6e15!@tU@^?f=9I@}7aZ1cChfEQo21$TZ
zCP`98J&jA{yq7I;6l~x|xRFl)`c-*v%E`6{2+TfFB8(GFk5iCui6dB}Ofg}=cRg@B
z3Z$Ka=+d@@1Rg_5L|ch0=eg~gl3T=@P4FYcZOHj^k28!`WOqVI0rSAxzanJiiT-sV
z)Kx72-ZCXS{$59@s#*ojd&}4)YkP*eNgY_0x9)iQRZz?Jg3=~3MqzIL)k$Y_arTe1
zpDh>nY{Q)Q6zHxu%9fHaF2u67;gu)1w-u@+y3#gTZXqi8`D9);j@(h_kgW_cmOSKV
z<s^=9J!+h6WQ>9gMTtnnhpEr6zpXQK+(g!I`>(U)#&gb32dDF`<0}c++K*gFtc8xF
zZp;D7%19eWp{%>TL8O!H=>x3He|L|%M`rp}V%ISZlU^$-NxLRKTO*<N6=Y}{mB2v-
z*O<VDA0fd9`3mWRsZ&U!Hqs%U;bSq2_{c#fK|_x;<EPTETiQ<|GR}m;%0?JgzMJst
zP@R(G!@2k<gOW$Jcb*gYO{-rpy3}o>4!{pBMle17>)*g+ILuSkSm&vUj5at82f^ud
z%F7d~5CC#I`d4Y9d>+&ca87}PGZKDW<aZv`>i!@2Q>DXk9Dz2fMjhgDkmu66%U=xH
zPPw;($XHw)6eoA6`d8lN{1&5cXs*r);+(piSAqTx+F3@;C9nYDf)>x1O?RFb@HMuc
z!dvJHG+^yS0|(PS)wibF*~Y>Ig~?;aM+mi{X{K*xi5ZGCyF>SHZ>4^VmvH48DK#6O
zbzD<dNU3X}K^3B~h<Smx6CWIVik>|!B)MYP-+))&{{XF97TRnXZ?l#tt%K&Dn2z}R
zQ|}@oWVcIgutt7upl6=>udbn$Qi@#5<ayJ?$-T-b;@SYqIwa1e5Gd)6^azq@#DXSR
z&jpD7LahCoB$zVr%6M`<UA~m-O)!{6)C%sQ&ctTrzxvhb#|)FVL!X-a5D4}ai{|uc
z2<=h?8~m82Uo#vGWD)3VLf=gD2mm-i&Ish6LTc5WjifAAcETt*AaV)sTUs$zv1&4U
znXzf{N<@Bc4?9M2Rz;ks<au%(i`jU^So=IX*{$aR)PC%d)~V`x*s-?}?r|vl<entY
zx1~g!R;ICwZpd4k)PY)LMlr4xSaFlw8q3zT*lZwpqQDvX5I%bP*FEB&h#Gd3CXV*&
zW5@G^CjqnRUNi9@<K>z{(OBFVKnE-vhCkz6HSzd-H8(1=NqL<f#oX?`Cj3v*wC0^{
zt~0elhF9TV9M{hu6h1i3VC1dIDZGOm1FyYszY%^jYkJnC62P*=9En`FABe}+xL-2o
zRJ&{2nT^4aoHs=SK9%_&5pm?Ixlq9AXKrJ*juBZo{l>S5{D0yf5ZukN+BmV8$>p2#
zteb5v;E=A2W?$X_yloz}a@N(u7j*yvFh}r@QCe1-VOjjUk(k1UXT~>=?$_p+oMtB#
zQ=YV(pPA@FoKmtWTIkth3}}k4_s-*x4<y#5hKCEUlFUIWe5qq>jQiG(ou;Jltce=N
z&5}3&00{@BXvbt@`L-1pA1==Q{{RZ)lW%jT5sXN5NR}&aJUW@J;>PT8*ZS7Qqy^AT
zB%4^b%vf>ss!>FTK0_Vqrzi$VA5QgUXT<(wiezMn6A~~O?T{;yz22tKvSy4jExL&!
zkV*sdk)OkwA5=w_do+m^-Y~_$=rh{0yvxgrXSp*hVk4Bd+sl3<uhO4*q)5ulxpWx_
za8zSIpS5sF#yYcWkG{Djme$^N9%BxN?jP~0(%&Vcy{r<45uUBd=csS-s3eU|zCz)f
z<-sTBQBa|Y8fk8a?#hjVGmkB^-_%zfN{#Fnu{YYTFsU0P@vHCM8s`JJ&t595kj#>`
z#L!?)_>I6gUt?Ayvkqm7H&6;^D%dC9pK)x6@w-7Q06=L~@+0G+70x}%Xk9JcOK$;=
z_Cd%~(EHImMd4VIJ>F9>800p3lj%-<j;{&2RdU#8ka4&0>qyP^nKvXw8C_R;pS(RW
z-jfj!E#(>4=Ly3&Q-$;fqj=@DU~YD{;k+HZFg0RHWV)5-%Na|Qbzy}grU)HsCJcuw
z<+A5wn@>g`$W-bCR(26-tkWbd9`pBu5F5BPe&6?Sh`!XIhGu|yUn^&+_cd18dchnM
zGnoki+dGN$K9yl)4J#Pf?G6hoAGqDX^r>J=ELR94aPaSt97qA$qtK69bQdp{QEsJ~
zesWY}0M%fdT+9h&Cuv4KPoSwyq}xn0MpeMc0OOzLDl{FLA`PR;lWx+)06qTznW>|?
zxr7khAVbJp<obPTC4rG6Z24$T*JIEhYIUp^P(UNWk}olfNf^jLdJ<2qCt<6Pn3uvr
zNiKtb8OZcL^%L)wKRjENbtQL}>_3%FC95<|8#Xtd0LUZhPe|38S!CFA5K<Upr7NPW
z%KrdoxHj!_#|so>u?yCjVQq13Xs;BqkCnWc2_!^w&*NH21R<jij6;kR2e0_k;*QlF
zmSu3IK5RG2$I~6ETPZ}&Z7MNsxd{=%ckM2CC%!%Do>@zV2@IR%U*AedAP(GitMRl#
zM2=}tjGe%aap~_=E^ea=Ww`Ua$3MJfI2&`uJvgH6iKK_yT9<69g;ENxIW6@SB(_T;
zmYOoGzr(w$eic=2<Fq@P7vud-B=z<6rd-{<x*?Gt0m~GR_<<chw3=;&(l%`;wS;+&
zillYkIigAJ;zGd#54=u$Rz1D+jO<z=oCe8m0QAqTJYC0izF6l_k|xch5)L|%{uP@{
zr6g!Pu)2nYa2u1g_ye^@Z?Q7Qp_!#zZ(ep|)~i{~6TgwT##De5)wnHWF*U?Cj5jvi
z<Y4pL>r&Dk$dc+bM`-3}3IjRLay_$48Mtua<R5=`3-Xoh4NBH66owfi`G^=DiOndt
z84N+lJb~7bYDgTCQ6<_)%5FV<jXp0jW=Z3fLkDj$8<2gyjTZK*T<nazqwbL0W73CZ
z5ed0HM40Hf>G{%Zq(ZR6BvQJ<`y?a<^EnTmNIk0ba4T$qVPq-DVtawfs?%OX(G{4e
z`Aa4j13sTxYThU@*tEr+$H^c#&$UgPDLA7?e11{fL}o*UCy}1!rSsu42}F^&U=*<J
zkLOuUs1Y;Bjxiby(Jug#-jLrHj7PL%88KtOwNE1-IyA$oF8N>OT$CM&C#6+O&ov4_
z`wr}RgaQw^_Nwvf0cBapA0hdobC9&2X}JzrxNa1$1Dd4*T|)7lUQMvZ*!2gkLNBf4
zcZghM<18dNDmr4Sq@*B5EF@FJN_*!6CX#sLyo5<QZi!^T#~5+c995{0=F8t~+~Hu9
z#={>oaxv{l*Q>BOkn<thRA3T2`wFJAN@XTQau**e54=5%B#Qo17#jqGw>;pQ(lJ*T
zJ0+g&mEEmW;~6q_-RiXz7jW9ZBWEE&C7q62B>w<Pf;i_wrXQFlON?ax0+a01I<!#0
z-!aT!j(2+JwRFWKWaQhqG1MVzhPQcDytUnxI4$o%n&KvoIAaX1OEFf@C;1AB)H}pP
z(I}CLSui>JRMA>R90CNl*f|Wlv%&A0-Y&qd$=2pG#B8kiJ5;ybH9RjcU4xd8Vn!pV
z{(`Edq){m%z>)^jA#c*I!jr)qi5dCAVYd(E=qq(GtAH|u+U76=90Is3DP)P5rL>`(
zAG&|I2<uiMgi57^GHq1^f_fTBV^1tI;0FW&o`$qe<ynxv;WTgnuK74<*Mc!pK>$V<
z7~~(9o<4?}u{2B(cvZm%A22?dsnXge4Dt<;?c@W-?_X-P(*&KtV|}a;<wE6@4z#ez
zxt3UQl?NG7$JA5d8=ah6oGf_xoBZabh9nOhcM}7i8NkLf*wnkS$V6q~B1HjRNN_mY
zRpqrnM1}cL^2R!m>sI1@k(k`6baS}&U{6X}-8_kR#9J%Q&%C2OMPpJa$5OdW^s<@c
z5*7uwe+uB>_Nx-ZA2PxbR45F&$;kEhpidW>=G#ssbsWN<dYL8VsRQj&t+->(2PFDq
z*1YMhMy!zy!$<qGEA0&110JjHX<F%|xD9bAFCzp6MgRbD`c-M~;!@sfe4yoydvvVX
zFD6v--Ic*_lqmU>{eG1y5@brGQPEmoS;v_sM#M)BPx1ST&(v-pf>Nr%M*QwQexkA^
z)k4h0OBO4%{M-RmHC;*Kfh1YPftL(%$Qbvf?49*9l~vHulTvgZe49#)h|z`$pYLbA
zLpADKD@^hRTy7}cOM3k)IvJ*wS#2U|H!m@k&VH2ko!JENIuIDC5+>pfF_Gvhy_`{>
zJ1^Vnsg1!=m4^xr2=^5mY6T<@<&iRsms7^x*s3GUXxiY$8G$G^@VmYJ1wbufWkz`%
z7c8Y@CzIR{K~LGlT+Gn9zBfT<l2I1ln7a}H9rzUWyD_JmDwPF^O~1yzxa>RDd5khd
zi@d9nvoUP#Urc+`#ErG*4x`H%9-t5BOO-ByyJi0XwMapZ2o_R$0NEJzs1ow=)n>bk
z1A7HH`GyaFYKjP<Nejhrk@<)Bj7~#m&{KePkt28<Gq%-`{nj7SgpwO<WKrHa$|bp7
z#GfsK@CRUOSj5n@cQa3qES`4!zwZipHsWEMgxip+gy55op7mz_(V>bJE(DFp0C1j}
zp}PqWwTomzYirnU6_+5ycPR&)bJm+Y9#n(QTx?y)PB{1Wsq~`K!VzLn%FX+bpl8(m
z53NUev@gnb?>{;oc&Ji$F2!WIxPe)1XCNrZ1ZR`!=~dp+Ib%nX<(P>-b~hZct50h%
zWIJ=_HV9$VcBWfeVpqC^x=M4rAK<~kAa<=&L^M{4-X=0E7A?8+zA!^GpL&+ruNiXl
zByYE93l>g4x@qAGx?7`#SsQ4Ths+!6ODr<H(Qmj=kdPVT7~I~bnw`UxuCYkUF&NJ7
z6^AGMDdOH-Y(R^QtYjum@9?RGtI9^$$N+{1Bo=O*QxZr4lGUSTc*gS}I0@<i?rM`2
zg54!9k&8Amu*8bL!~WH2v|d%CT(nCvC<0)M_fM$LLsjj+cOafeG0P(3<T)UA2eCD6
zE^fpk28~;GN0bx+pL6f)S;~5rlChI`jIJIP<hJBF$shizNG;^OmkQfAWMe;pK9y;$
z&E#KWwvS|sA!n3<g&v;g+M2q3#{U2|O9v?z%&QUkoxA-7S2{?ZT}tR5QH&L~32|)4
z1qW0I893@{%n&3`=fsX3IX-d9zJ0q@(O~UzTjhj=UBy=iZ})x8B#_9FgCvWVVs`D}
zzrvx+0L4H$zqK0`;u1uGnn?cfSpp71p6AwyZTysFX?(kIcLr$k2|aLW#SpNT+91WU
zrC9P8)}(uhUd!xqOax{A>i4N^u2fRDSiv_)qYEe-W#lmR0<9ElGU}&clpF>*<F0+_
zND4~2hezd9uQ;fKUEC0tTM?uOEI;L%kL$%Js3b}vwGcF7RWt1*Zy6)-sUnW*J5>^$
z@&ZgQ!#ip_cCiJexP7unp#)7Q%s}XKO$z{!TeI&9cNLA#Q`FSzJrOL?$NRfsA}pb|
z8Mg4591-tJ4XPx~JTWNF3(2>aVeQyc;*$}`M%R&u7$cuy^r@sp^Fl}pvi|@HILF~j
znWB;*F$}IF0j6*D0k}{<j2@p_YR0JH9N}6|na}edN|s61IF(EV(Q~#X7%iT)8^pd@
zwK2+yPblXs0qkf^gRvx5kjE*!4}?a?%s3<4+}4bC5vW%u1x`z``EqIvG_#_?aTxiV
zhCM(XGgl{;^6#G@?E?zDbm>ywrA26E&k+pjAvr;i<nTfEs*0{bM2w@Kyv@k^R)qG^
zNg%sbW?(rDAsNT;;-MA*JaEYyKbIhrW^wZ##MP#fC9O)NtV-t8D1Cq~?n<8E`h9A`
z#=cu350DJA9!mZ-X>3?1-vdU*Le8!SPTPp>Pgw2teVtP(2{On}$O-NE(&rkBAc6;)
zMum1^z$#Bs>r+o`V?}tmD#U^4eREdy=%taC{h^G=oFeVU+;sZWXNDViWtQ-;KY33<
z$>ihGquOd(r=gg}G*aSEGbEWzXYTzfMgm0NA~(o080bw)EM?~M(h;{gX$L?mNUbE8
z64L@vNCb>=+ZAqF5~9jR-bZ-??%K*XMn@o2kXXkYhG`J_g)rL>Bo39OZbWh;LYPv3
zF>#h^bT;Iu+sMf{^#-NYWyX<N?L3I$j0HtfU3YY1dm3S~DIhXL<bm?4j)(eIiGtd9
z7IHu(QiM$jJnf<jRxzrxZDz;?j(Di{wls9E%7WX;B4$FN2*_@&?NUW)7o2YdYL2VQ
z=OI3#v>>xCrbQ*Ybm@=gYS7bMC@O{6sb)l9n2N?#id2la?Y?!AINxDjN$H<oYJ8|I
z;VjXT2UG(&trKJze(E=7Cxe_~p7t05Xi=D+7~_N(>rw3!AG2u9TXF~503tWxRFBg%
zEw7XeVm$XN+a9^A=G|igX?HS5mN*z({{Z#rTGufUBRFQsP<j06^M@fyI1*MVZUmbf
zlBe^j*3?MBUM>3@C?h*b?N%-H>u5uHQM5?M80vBF>rzJ);0P`e6~P2Zi-C_(@BFE`
zHVP>a+r|R6$XYgyh;b_Y(Vq19=S83F?EwVv`5!BNeW}xdGq&<s#x{)bN4+}Q2Oxts
z<YV(8UO?~74)!Y6G_9?plnG=&ts4g3INR^|dQ$l@Mp+tFGGvx+n}&G6?N79pJ9}o1
z3wbc(C?q*9JBmx2mz@D7F|_U2SLRXfYBy!85&4it8H9kaIdoI=dkV1fyg*1`FvlW&
z=NZB7DuGmzQ!rp6$W?RH9^lfY!~#d&WGoYDRD75GI|>|A1uHV)pLB^L6(>0?7q&Xo
zPcdMs@NZR^fXFtGan`C&A#{%1%*y=`9tmGhdSSSPu}g`Vs^l>l0Mv4_oRK`UG-Ls8
z9yVeo3_1_3RAoeBsBjyg4W22p$tFxLhYXv7lafVe+{nTek*!#TVi?B%0C0QNMi(=3
zxovKWTr8}Z00EC*udPVUX+Qc(uyOn)P6q19NiP!UI8C7lF63?mcE|Wt$fuIcR#M2n
zy*u|uklF2y)l#QoQ@HscMswMS&pie^)HhO#yC$`qDPo10PdkA2^r<C==H*)2+SS{C
z-Ew++d;S#!)^22IJk?2I03E{^9+|3!`jacz<#p>;aHz55xjRwFUCZt5T!y=(!Kq1$
z3#=}}$mg6NPtU!2J=Ky3%u*u&?o`V-2ZR0J@TxL+W;auWj}hl-+xm+2sMmDXho4f1
zJJj;~jT(4SL~;3uv6DNV)txSxDMRN%P60brut4?quUWeA<)n;;J3yd}Ok0tT=DBTm
zLxFCMj-MXs5EqU$J-@sU^sef7$0w=FJSvJfZK00jae?yYnv1)01G!J|*1gq{1UnFN
zK2wZyRVJ}AU?~KifDV45y47VPl2qi3^qfI2l&;7C;IYmr*7q!%SpybE$Z~o5)9&o9
z05EW54T5pnsXS67g`^nI7|mLdor}iuX^D*_+L`^~1MhoO@ZSg~c^+a3Oa@2$rm}%(
z_MyoD^UVz)Ip=~1Y*nhVMDim}Jz`j-H#V{bmpIFEt@u=vY8Mi-5bX;dKvRHEupKKP
zONIoV0KoMkqiL9OOAW`?hgv|Ojr&bR+uVJ%cRZ_rhF3UK-nX>R9f$@?$QTl=p#05`
z>6+oi!BT&CPaNi?j`&8!)xcxM2<DG&>^?+#fcTF(!RJP#Kb3_+!O!^DQQ^;s@Lx*|
zk;OcxZVU?e<PLXNh+E$>$W}7LXxxR50Q%LvKKX2>j(b_<MpM6fxxr)9(@qmbsm?ER
z=$$LYkTe5loWYox6Mseim8);!b!;L!0LKJ7bsf2{4%57S6|_pXH>M?#3V|DZ?d^)$
z(>@?aC{&3b%u)lEakp<{SW1F>8^;qRx$JgYgfgn^k-lO;V&?>ZbdT#-ZLXN*CXf|;
zharCMKJV1mn&_T5w`YtC)$+`kkShYj_v6r4Po?<6DH&2JmS~}D@4zFUTIHQ7Bc`4r
zFLR@sF(sOQ^<8|%V5l&_`<}w2iV~8uM#<$Wf>?Gw#;929Hj@=Hx~X%A*m6G_vnPnG
z?k18OHHmgF${gWOzvGI<r*oxBFR1-O+3uMqx<&|Ck~e+v=xZwb!Wvc0<F}OlTNS`R
zd*}~py$^_O$_OKfG`J*2&x0d+4{B%j$-MH^Ta%HJtUxM#@##h8wjx}N^AC!?8Pjbo
z?jKLnvdVHT<Q$B3Vb~t^<eIv|vH=p|82tDHpZ>Lauf?5e;^O*CdrN}Lozt@);LZpY
z<X6*q@=LK=M<;AZr|xs#*QI?92b<a2Tb?!{$J%ICL`hsa0g~Lwo-y>K2oh0mGoTLN
zGZV%r-4t>D>LZX&PIxAeCdpK^V3EU&cCOZ7E0hwtyWv8OtVawzDR4kCNXmgmcVn-$
zEPG&V$Ag8*^Ep%PP`jhDqC&);8N+Zt55ku<fN;1nE?F`QoypT8p9@CYq(XAs0;l=a
zaAl1hn%w6dNvTJfv?zgupP>eqI1ZRwkCsj4$NckrV0zRopDZIFCnqhQMGqpm+qdN)
z206jaFtBI&fn4+^v8dw9R|yqaf(6DoBp$i+rZX}(l*7yUzUy}Pr;x6=0Fn-Hy@#zb
zNYsqTcXN<Oe`@BG7edn+=5Rqi#M70EzU{wvk&)2Q-fE^9F@+$j4AT^lL$_|kaBC)t
zxhgWosLa9g#Ip3;Oe_d&xIJ@$$KmNsIZ@Y)<0hI(WGY->asa8aKuY8~2+H6n=hp_5
zJA?{*o*VpXFx#6uNE{EXAZ||500*4+r0fH}eneT?dgSJnoDd_*l~IyF!Tf2TE=XlL
z>_MewBn2G*0JG~-0<TfDbB|8c^AmiyL!9MUdemWnVn#vZG^~!8kjtIN?vA+i_NIUX
zL^CdV`@2cx)513P%VPi+_7t(ry@upW07u>AkLyo{Xr&=8Bm@<~U_UC-F-__r@F9{c
z$T%Ykz2BO%1*BHY5bjbAUnlO0u7EAOc|a8>A2IpV`j0{WdsMMXz?CtU1wVI#)ce<M
zDAHSy?#W!i7?DhYa=$k{y+uCdBU!<L)W#J;oO9EyRx-%S1d1`)K;^$5N^CN-voy$5
zfr7c{b6qiX`w-JDBSg7aBV&aaRy=3DO0iiW^Q4wVY!N3vDaTBDRW@LYlaRgNcLe%V
zqf;%yjDYI7j7V?@^%bh+eF?KC`#cgvZms4U+B5RG#&Cc7^&{Ha$YLeZJSYKV9JBZ2
zbgIcJ%B5ZjN$89ZL-eUXv?q-=N)s`-C<=4*G~6K8!uN^R-pts@{$Vq#@()Z?A&S);
zdEog;%d!!ZRn_E}OBCP_G4e-FJw+l)8Pj10V|=(AHA93G*lPVr-Ww^AWogWBjK<jc
zTk!t0(-IiKXc-GJ1d;cB>N#e(l2*B%76gsB0DQRg6$;D}Gcw5MEPg}D1J<I{)7YhQ
z%<$XXIF;p%jA#OYHslWe^w}+=D$3B1y+|j5DH2FzCKtPnS72nwIbwd4&$L10?S-Al
zCvyhiA5ofol)9kQB8uB%Fp+j=Vy^7-K!EwB(OsF&GoBX|u-t59oCQBNSb>aF+mNCr
zX)^f=4mN}Q>K+!9^+V=pV2^xRMJFs*rU3W)QppbWZIY-v0tpy=pnr`^9M24_cHnFY
zo(SizXv~d>*_HMZG8cpOqv~|*9L%j9wZv*dL?1jvte8IS?LmY^C_)J!@`tTh4z~=#
zNZv(1ETldN9kEQ2i81XVnOKO^Jf1t6%2+rdsj?KdUo3fV-2BWAPqiVnBX%>-LyX|n
zt3wjJYct?)#Eg3%T3eVc?k}V^j#fC6au+0SJu*MSo59DH_YQqZ-cTpWU<(WucI-Z#
z=u9H+c@&cPX^G<*;CoZh?jf9v5t0YBF(g8nA1eO<%Ro+dS3I!Aa|<g0yK?|DleJIz
z#YW~yPni>`B>c!1js;AuAYrydIQxVrPpvRv)ljzYoaNPV&!MRLyF=y}Bm)Jc3fTF#
z4xWTlb0V=>L0okVFilA007k{n@eFkoJZj07ec2c-o&crng5qF_7CBLfR^K9^<OAtK
z%dqYW6XwYhazLPx@%gaG+y3rPO`?_~BLb?Y3~(ip20+hhiBOe-_a0+ASQj2!43<;P
zFaiMc0mBRrLMbE!p<);Sa1MJ=V{OgmI+KuDvD>g7n5>m44(M|aEr~7VfG~H^9Zn-g
z2LmmW&V5BRB)grqg&Fxva!B>1SwJ5u@xfAY*VdG&$pz6S^eK{lRp*c5_Ny_v$ty`X
zVD5maQ-L4h>s1uSSxc}PZKMN&K9t~H0<i}mleV&GXHDTa8s6<@islAMRI5O9$n-V(
z3;zHF@bNS$dY01M;&2vK0OOov0D9Nwr-bECv?TYJHt|Ksk9hly@Aa><zhM6W8`x;x
zCxA~HhLu7flLVH}QTSJZo;gPib67O&yPvP03olwNHr*tY5M$jT9RVYzYq+<)jDmtf
zbJUKN<Np8%_4Jp+kf>rwLyYo%mFQY^?92pme7OTWbsm-SaJ-|a-Qz18y3UCfuV!LN
zRyPAG$F+Hvi#$u>--k1o)DlwyvH8N~6nc_9Yt(e9Ww^OWp^UypIq&qX8~rxNSF(L8
zQnZdml}a>nC?JnYq?6Hwuc|z^z@N2Ffv!vam8(w_ZVmw42Oh2IUW=vpzr&jFI&8NQ
z%^UJ#k%mrs^{)i|qCaBC@db>!$HQGn*y;+c<pNLM^czSy>(d^dmGWnZziCg}1NK?h
zVzBs$q1@eR_S>VL>tkimXKvOc0NoEc&#ri_V?tN`-ntXc<MAI&e%ODoAB27~>DOA%
zgtXCbsYkh-L-Lkle)569Ve9x;=7+^W`$_)E9wuM6PpiXeZ+=!Ag_)IIKs>R|4^H^@
z^sl}?7XJXjRel}ox^mk1msR@})RCx*?FSpjO^3c~YvT^1@F(_?@N~BNi)ptXYqn_C
zJA$l$5rdKI*PnlC^)QvCLP=GQkGU<=maB8&KZl?2SHBY4r~D&d6RqHq&>>SQ%0#1_
zki(;lci@6M^&Efg53Bqf{ifJ>&q~zv%PA%XNTs!KvP`)9r##@EaqH6+=0CN^?1_Ky
z+r;u84NTXXKiVCZV;}DzPJTvV_l9~NzP`2d)b|>$kLFC8jl?Yt!BrcM81`;DSG!9I
zhLqJ>FZ_Wuq3K%x0PMl7B+YGUaAk&6X%W-rEDs<Le`?_Mzl9z&)1+Z@;p^Dujeui}
zgvUnXwQOjAv~R_q3r7vCw~^0p1;?6-=rf#S?|Ko`bUo|3(*FQ#9V<|9o;2`)TZaQ}
z+JIHTz~y^mo@=#xRiJyfJc~^6M~}Q4F3lsvx3;8w>xMj^P^al#&WZbC{A<uWq`1^A
z?t<~<upqGi0BfFWwX^Z}z+W3pG`5kWT%=?Vw8jy!-GE`p9@Sr3_%ZOJ;@aL=WwTi>
zVP}fs8OQ~Cg5H?yeX6HMokj1Y#H7(@K>q-OfNBh_Z{oiSD*#S@U{#cQjxuZL-`UUh
zi~X1WDEJq|7hWN`v$E8rfWq2+%sBnoQW?lSayZDy{A=JZ82Cu|cKSFVyNcwoIe3n6
zImUe}0Nb%Fxh0PU!RhR4mabh&tXD3Lb}lt!nrC0}(@pquXXD$4_*Reoi6-F&**5^e
z+oA5b#t(5(d@QlEi^Uetsmxha{E==T6I|pb;mlU#a6VN`ezoX61hE#64eW^&?;M+q
zY%zrcn(LH#DWqq)>e@A<+y~Sw71<mtOxWlLr_!(6L@m|lk#~YH0DNa3(zCod;!A5y
zl0ZD!Q0`k;+iD2=lk4@V-%!!D3zpR_QsGt9Y*}9m8Sj8P*Ch24*y-)A?nDZ<ixMy!
zmGRHe8je{am4uB50Js7$e&O{$jb~V0$)DaB!zU;d@sCmJeQEa>R<On-V&Jo4Moxfw
zf!J3!E~7RqC3OzB@8?7g9L6?h(0f$Nb9&b?eT|UEAu40WTOV4hZGO-^PS-JQf4R9b
zthnbt<5F8(qe<o3%N7aFF`fzP4`EQ&ple&3nQY!zBY5R1M%MegLF<h3QVG`P<!wWS
zkrWc`!(@)DS#N&`i^!fwU>uwV#!vWFi(9#;gb@O(ft50k<^DA-0exE9P<P0rZ3@7i
z8|zo2x`rE(HT0#HJOi}j80ZaUJ=MxUz(PTg6vvi6QQe2VE!2<$h?s?rB`C!EbDvs^
zw7}K3zP6g$c~&`Fa+44oHsE>>!mY~JEU5QUl?4H1LCTzZipR8`L{%Xfv(c3Nr#_W>
z=2uw~4=zaxr~#F*y*bSn17X^4C=oLl#D6JMle_!140n2&kVhMX7#W>P@SjgYYc4%b
zG&^Qz5tD%^7z%%>sRisD{jP1JAznkkaqIs8)}^?vZRwKS#96Ke=-sjl4pY?TwBwXP
zb%^d_Ag)?LpPYJo8t10D7Z4a4;|tUQoIm?DW*N*%UU(!!8iou{$bkCNYe8RAr(4M7
zmn8&wPzHDa_8e8aDQCC2E%tT}_#Zjr+~T>IFQAz~H%2Yv<a3e%1N`E&p%#|bu;%T{
z1D&DC9Qym#O<QuWbEKL{!z@Jg{^we;WqkGvo2fxiaw7}(eg3tDZ+9$Gs0@cc>y9}C
zum}0pmA<MZw>J9}8AlG-1mm~0X5z14Iyf(u>hLTqg&Zoz>%n7J1+zwxU0U46UU{|{
z*|2guW3_WyMf74Mmpdf$Pu}bY@-?WELib5Kk^(;@^PG;gjNrNpW1@=w?@YXi$2thy
z6_OG@WcT;2J6%l;sDdV9LzZS^ouvAD4{GIZE@qNwCi2ONpNUT=fz(#5gwJ&@-OJfz
zIpYKQ8p*2{7trXNQ;IoKSDHB3^x7~pj@6-SdFHr(I5dZ&gUKSfYfIS-W-KFabFqlz
z4^jA5)Ka=xeX{N#kSuwF<{5V#Tj@;=qo9WKY-O3Y2I?{QYf9GbLQUqB&l%5u#<`g9
z&d^{1vU$nQIP3JQt1aXt$`~>(42pUa=qXAULfGk@;qyOs`-#CU4_-f)wOFyanI>5v
zxCd!DP%;{^A=Mt`Jor#XUq8EH_ka4;b_>*36GopZfxUhGYZjUv(Z6eOy9)WFBLmQK
zt@ZV-OG~KYv5L{q;Ur@#XPh3D&qb&UnAH?I0CKxX%IEpkm9^@knB!Mi+-)XIHb-+p
zb{WyzT|Dl#v)n2~7v*J-BxbMK>VhXeMbu;|0d@jSb6?vMlonB2;bdX+^e5_j3eeN$
zduynzjOv)fZdJ)(d)A5FiKD8tkyU)D6tlAs%Eu-BK7zC@E_|uH$pB)w+Kt%%0QIY%
zO-Ia<M}Q6F4=stoBzo0|uAXbFVRt6kU;SXl6miy_+a~8nXL2_-^i~IeAGT`Mt10=U
zU~uPYL(YBc3LQgWXAZ9Dcvbx?PB~d4jzwID&h}HlKTlIb&}Q0}P(ESzGDbNyZqgCu
ztg#YKe|Q1=qOtVbiRDIn+hSxYHn2PoYPVxE*-rAN?dR_)<R8MJt86vqZKzWLh)4l)
zK~P8|>sGCE5)vgU_`<m7kyIB@Ks={S&PMIa)O%IfBoihPf@OHmX8x5e-3-u<H%D0`
zLS2Z!Kf*n0LS0^4yIq&9<}iFlPi$2kI!Q&?hT$?w46vz=)+I<QwX!lg{c9OTHa$%k
zStX216M0fI0le{E;qa@)kZKl-VLqYz*x~@IcmDti@LM@V?U_gl4$=YR>s#6`qc(+f
znx>0z#z+Xqn8y;2L;VeM)ux_>Cih3tZ#Z+f;OC4Un5uKdERVYwiQ5>)4r`q7kB{Nk
ztQKIPHyh$7l|AcXE0%kM6!M;VkLg@)4lLC^WOM#B@Vx$7Yc@%`Xk;Y-T#_;CS(<LE
zaghFA*CT7AFHf(fc2{!81-{I-=5Lr2oaVXz0226OSrBSkG|bWimyd5zT1IG>9d1W%
z%_}vl5Zv*BR?O`LL82IPaO8V*s+t)V&ofOQ?^p$Fj-N`<wvHyqU`fV99`!SKm6IHF
z)c#d`Bl{uvqr^JGi%kagWl0GWO1X`J80b5D*Vliu_v|a-Ukt+q-;3UPW+XhHHsGJ^
z?dVDAk50Ak+8=~`KjCXQwA&pxM7uzAJeK3Ru9nW$-7Sk)+k{0Yl5h{un)j+zt63!E
zTa<6^k!ad}nPYFV8#v-10p&*!RKWh~_8!%G#@<(XT2}KF$L<P@WaovctfFWn6Pq)J
z1V)p3<CFBO5k!JCE<RoRKvBw{TB>xDUS@KWxfP^0K3*DdWF&&BoT>B`p>DANOsME%
z{{UIPj2v{RWeE=DiO_M7TY`OR+!CbGi9Gd?u=?Z=YU-s$CSf_YiC9Juh>#fqhuzno
zLs448JlDjkje`M)Z?ClumonT5%;z3fFr)RNIA(<h+2jg=Pnskd+z+L8Bw{qdJ-W*s
z!wIn8E27}WGy2uIr9hHK3gm!aar>ZjHCb)`#8%liGah6vPs`{IYRpo_BJN9XFC%M`
zcyD^85jK#-(!BWJ$OMd+9sX)`*0Wlp$YfYpkG&#rPoeg!w(}7Yf*`mV+!SQfu8cFG
zl2tB+KI?jag;G`~_cDx8v&n2#;ur<rwhyQHRU5Fj?HqQlyA+cjJh44b(zNHd5;KHy
z*%;itsk2z^yoNCX!T}2-Kg=_ZzS*XN`V~G%2ionPKvjX5sXX!2dR6$<;0+qdw5x6j
zkC+qAXo?htq)W50N!p|y9MkaoR!7P)d~PGBr8`{`WcZK4{vGjDM?=*#{{T5|vzB!P
zsK+E%$X~U0{1U^$e-Z8G@n^$bHVrc9ZjyU=Qwwt79!MPtI63cu>0fDDv`=#LNaZ9T
z3=`J}x20Qc(vAK@2k7`Xz^jXKDN0dyN8q2u&)LV~cfg+#e`a{sNti$!ZM_Nmut+2+
z=Yz+753YEwM17{&AiX+ynGCt}G5~L44@&*$_^I#@;ortz4$r1|mqv;ulRjW%1i!z(
zHTmEBT7SVOJWb$fAH_cg{HL~xV>;>5xiOXgAehcRfN((=8Ld@CZBDvX`JJSER`%A{
zbA77X?NrJ0IF&Qyo|{yTm0RqFLO#s7VAup63HGf$Ps5%h@V>EgqWGJ`_ZnT?9L;Tg
z5mLmH%Jw6J$S0*zSp!PZ&l5xta!TWmQC4+m#PTGPAuHPj5(1>E;Bih^BOF|_=Wkv8
z0I8BG8tEe;pJIlFEaL?ACY>n^iwwwGHC%}o1Lpq#4{9zlx~G{OQlv)#jtD<5PX6@d
zj#)En5+Oz(DiO(VOw;66@|NO2Srn0!;YZik=}`!SkRUEe`|eN6j@b011LGzK^4vzb
z;zgBmze<i@Do>G#1@o}Ra1-lKjz2zAXKxvKr649b+M||lpdHOI#l-O$QI}+IxppQp
zM<0~{MX)QEfbNe0SOcA>zG}pgrJcIFY6$0f`9^SnkAD9E;Z0bZc#R;;Y<_7!hbQ^-
zNYF5H^Dfe-Aqe9?(tsY)henPzUY{u=2S5F4YXuT4Y{7O8Rd^&*<+PUC2_E8QKrmNw
z^YlOCRpXgnHvQCwSK>A}=bubcvK7hg%WP5xcF0G{22g)^p7kxw%iSE_#~+psO4^O4
zUci%%2enmscg*Xxi4p$rM7UA-3Yf^gX2rfqH!73m$Bx|(_)ynSOjx0jBt(V=^ASl^
zLAaqk27PKvITC1mxm3d765yQvRSNE1t>$@cBNbLb#AmUn*<?o+%_iw$JB-S>1QXVP
z9}U9VWv#b5lZEo+&Ko?hJ?YBNB1tF>`=Rp|;n%l5`83F_LPpJQ(UlBI`MD(Z7^D%&
z8VOz1i^$t@4pSb#T6RE6UOy@r;J9{Hkon{u7uuvRX46KN#zkZ#%7R0Jy*~`pEgj2=
z1RHo<qcHh*cj;0@lM5MU-cn%??nz7;IqE%y1tvNPG^>k2Wh1)E(z7OH!BObg?NPhk
zG6k7iY-Fy`xW~91sz`L{BDZv&FhuRLLAMUQ!-G$2Neq!AOwvsX{H!zbj>jG8T_NjY
ztO43nFe)Sn6KEuZ&j;Aj+==a@Q|AOK<(3~)-1~iMMhj$CNk$j@z<u-I@Tyv~lxJw8
zY`U&UIZ%B)s^hCBPnINYdM)t$lCD@Xw@`Z3Ic_c4{Ft{apTm>Fr})ye!DR$Tk&H4E
zf(=6pv+rTZRO3F!n(0X+k;%QrmX0+m<`S&GFg;4r7~U)>ZOwq{Gmt^;QY(_6q$Qc#
zh9q?K6h=_0O(O``e%-)lKGjwx;~D`bA`VDyR4-p}f5xSP+8sjn-%pNH{<T4nH_QPb
zZ3DT_N<$;tqxtsRM9K27ATSx==DR<E9v!yTd}(eSA(me?5*ffJX>R*{ed}5j-Abw`
zYgc3IZ`pUi_W}!4OBk)w$_6zN=V9rS?_Z-@E}tL6&w(~pu)fiCW*_a005UP@jC3BA
z@^9>M@bZ0A#rE1Q%rLVgfn|wC;_HrbJvvv`za1_TSaj<hZsbH^TqUd^C~ORJ2e7ZK
zuHy=Dq>o00H%W4{kML%ab)9l6W`XV=ITl$OHY4yS(!JMAp7TPm`$^HEi7pVLssKcI
z?_Ou{pToM0ikhvxu)`dp%h8uUz3b5YRcUu+<-sng8VMsCt?}#E>0I?2a^<nQOLH?t
zit|;!dFQ!CiJXr)dM`E5L#M}k6W-WrWtP-!cjsw8(z3jbFHW^cY&VnF<UKR%T9=n;
zr1({?(qU}UDc*<vS`6{Wern+td!i&}O0jBsliUU(*4{nyN?U`pWxthvWq-j-KWRJ9
zi=P(md=ugQR#T<vV_^{I5s+}pobq}c4u|lsxxZ_VjusyRe`md0TerRc0Ew05vqxg1
zAbE@k?aw6swfQZt>Nhu9)z+h_+(^%PA(~5xUn+MTkUNU=vwFAXr5>8IN=YlWW83L}
zW{p-TUPQ*??B6){t$jAZrFTi=K^%xVPN4Tzs@8V*Q(>*63lq5lNe*z;(AsIDR!4HO
zu^%K+Mo<z5@p~HZ`B|i-gs_S2<p_2(PJVpH^C!Cd_N};X=2^g+0~}z5RUi$c*FLpX
zB921Q$iXIm^=iifPkM%DU$ZC^?{vzMoa5e(QaOvaQwwWPJW07&w$umipHt~v&bO<)
z4d#VpL<G21$vk$eT8^L#10<?|j4CnVtD4uZo*<B2Ia9c@IXDN}qE5(8Rw>--_VUji
zoK}-N%no7?f|=(e_N-a;crKN`%X<nc60-TR?h&4Wl=_}Q6wO;u2+mbpm3+=i;hsNF
zrDh3YTcb9_AmM~#p&fr3=9G+OG5U?u&Zbpy5nf!X@ObNwdZl-CF93!ckde6gm~h9B
z<xMgckj%2LmhHM;Gv*G;54WWxk-<FCy}GwAw3lz0Ti?)9PUbD#lkL#%%oC~=BQGf2
zu6h;6Z>>b;Kp1_ZILeIec)924QQaGhD@&Qa%0r^zQN{^5>^&-7NhO9~Ch|l{L~A7Q
z?fHTc$NvDTi!oe|;@OBWMkE&zay+N&k?HB}OFh)Gm62EzBW;l*TonpCpRGP$F%(LT
z9Fi|EJXsruq4yrO7>p||y_hAPvI_DDJmWsOr1k;Q7+Pd#WAdYMwnF0}IR3QTc|yV^
zHy{n4E3%xnJwL{qCy--o`GkXq1-M*x#X1RuObxh2Wy=WVU`~4<VMTzOagHCdiPhpK
zdb|S!lh1zj8<#T#Sc3VWZ9sl({{V$JND;xi+S4iBJWznYDeedKsHKS^mE5|>0<O!T
zeozlM$^KO~)OTdo^2QiNF$iBHE;EDaM&?o^00}qp(jS!LpvP`I)KEon1g1Ft{J6l8
zbH}KuBr!Z}XWCSPqXz_fnoMboSYj_D+siQwz%vt(7q1<u5SMpo(V8$uPxps<CzeBk
zssr!|Q;o_y8j1Y2n|TsB>K-=2{RpNjqSITM;y@I#Z!C`y+mCFHq*Eq+!beyO9u=23
z10DXp^%S%DNxSUw;Edyc0D6ylLvUS0tGYnEZD0XmO(EQTcL^=gy_zy5Kmssf&~yZM
zrYtj0GZnlcq;5BG7x1X>C7B~uj1@AStCb%q$MUDVq1Yw0yF6=wBkmiV<B|uZP}41!
zK=H;UQmFgdMEP>q#{;!QN`wK_M%&555_r#C4)p<(F81!2k#KRI$EV{=@?^FqM@Bpn
zWPjiu*`O|3l4VTEF;sOMNe2K9#QV}TfuqDzs}K&-Pw0I|y+V<+>e0mzSeiebpPl~z
zLs48w7(?bcK)|kB?__oq!sVD|S>$N^u+k!f30C2~K^}wr`#CQoor#S(McFEnNORL5
zRevS!opzyDQ~^&+{c%ezoU1yzOSUjSdcW-s<Ll`_8W!4|k;MCL5<n9LB|vfxGmm<&
zc+C<lv8dY5wMSi`4)n<0<|$TNRuL;M32~ASbBb$5j1nRgNX?MN@EiOn&}0hIL?kYE
zMiguv^W0{kNZiUK6Zw*71dw<ghCi)XnOZA`Y2#6~0o)saeKA$yF5t(WgamWblhT4U
zL!z0Gn{<~Bi<}kDUdDqcML|3P91>PsfzP+=PiW^WB+RNKLIQxlG5l$=$22g=VnSS>
zW3YPAK7fplPVDA2`A<M|QZRNQWOY?3^ME;DraDwuhE1-hRkjng+wXk`YC`P<es1oo
zv?yHWp5d*F4F3QyLhMwi04VA2noDW7$Y+s9mZu8Y``9?9tWRwSfn1o8O9DsCH*@&V
z>u(S%E>(~M!B5Hw^`t#X-c6R12922tk-1I^`=3f=*WuVt3n!GQ5m+xQK;+a@+s$!p
zFYn5O8C7g?^feN~@k)_JDBh?EA$TVo@k+=|vP-LWxVBRWebF&=Jp<G+qsE1&7<b2*
zx##}?tyWMa!v=RdMlhiL(cJxMV$+LU7+Pg>BZP>ahbM}0yq%D&dN1tl;b`u4hw)F@
z<aM?~8m8blY-c&^&+@Nf)ik)G)$R35-9-ctMS~P-FnH<iYl`?)plY5G@SJvnYhcon
z&ohEwllMokuR-vhpC^g@UuU4*gm`99V{N<>>MQp?8Nx#cl|nL)y!Ad)8z)~B?DW{Z
z@cU7RPw}Rib8~GRkPDBR-MfbMKDF*YwRV?b;(b5En%iAGNd?9PEtZu@1D<~@*9GyT
z;17#_1tx{#GK+VkYply0u;9rQk^IF7>&WC0>0X86`yDUGzYDal6j<C(B=*y!Qp1wi
z0~sgNiueBjbB(DPH}Jp2>%&FThbf)lfww@PL((p!os~?H!TiY{wbT3(@vn$J5P1IA
z#n(3Si+QG0xQQbqym{&esQyFNuKWY=v`5EJ1-rndVcLb0C4uXYTJ`?`5PUn(*76%`
z;I`L9?ui~CGmqk0^yNwwYPxBpyLlQW(pOCCK0oXJIQY-wdp{cJJ{U++I~dZ^J3f5H
zB(Z1r=NR_&&0u(rJw`tbKyDyGBTN(JTroUkFzeUxuA{<UJi72cpB}AbBWHp`8S@WA
zj2sHdI)nJC=1ogdY%ARvSl|%6^#c{fhk}Z9lx-O7&gFg1f?tI?mA-_U?7Fi}Y_{R%
zp585?4hL`Xt$z%BUHBpJx8ard#cz!oy^W=om8VQr3%iuX!-0fTzZosS1G_L8s+!lt
ze-v1FA^Z=b9oF|To$iqCcki>Od{^X8?fLOzT=7T6miTk7U0+%zpLf1}CPrn2$y2d_
z@BIk%>+$?!nbg4LQl#CdJtJ-H)ty*sP?G19+o9w?9KI*rd|CL};?Ih@j+C~~;w^sS
z@+$&^{T?TC<;HQx%7FpLaC%oiZ#}li)^i$<Fqe@301p*2>2`N)vfIq2PzpM^&m+>G
zHkmitLQYVSfNm+ZexLnn{5`alj<lQAjgI?m>d9)+v`(QNv5-%#JucEEcw}G|_zFkg
zVtRX0t%sD&zTAv9WB_nJl`2JYn_d-CH)V;8F<8fO?@;VoB1Zc{?O4kMBoapidLL?S
z++sjJ*Ze0S1GgM@^{Gv%mM4hH?Hf7Suw$=m_o3qt`=Zz?z?Q~B_Rs$ST98<-wu0@A
z>ADL%L?~gAkUL_mBxq#a69OY3s}8%n)UudbZI_Zm@?&Mf93cAOb4wE$9KvrRj#gYL
zVe)~Vzo%NBU`S+PRoM9;$VNF)fOFRrvBw@fwu}~W#tt*?JJfUDTU){&RFu293={$i
z0qIURFB~g2%n_D~U88~MDAl2lFvf=kg1JBIcW^y9>?!lY%Pf;zK^)#>YNSNlLNM>`
znx}E7M{ZIX6yjrzxTc%<MB*6Nc_bAKINUkG_M*&JMacY*Gs{_mfC1m0Ir>tcAkPy^
z36RD~L`K{5cP60ooW#(}Bu+l|^-ZJ`+v!hNdo7M`;g}T!6jRXlIsTO{<3rKobo(p3
zdxqv=w~!A?mE=pP)ntGx5wVGG-81b`3nj8~Gi_4iK1pwz9eJWS<cNK;R3tD2V~k><
zjWNqI9nr#Ag}_OVPs7*or#kt~5=R@v74V?8LwlTdH4+%-WRgktsmO{U#^&eJp99R&
znC<3{8B9fG^HU*)dH(=(d(mx2a%mbkpX~1=8B1+byXE>H@%F0mEYUDYB>BvRm6&o*
z`#yr0vwVhFW%CrK4iNAM^{C9oNH<41GVCRHFU`kc??MZYVp<?<qAMYgtjyen9<-7M
zSf-NJ7GWBE<&JZX<27C6k%yYLQx%nVki9?MsboVEM<h-|9D^Tq`qkJ>9Sg}K+uuPV
zy|6NGjE$avA70e;C|Mj^OzNr(QTd!Re~GA0Sd^4wc;M#%(y=ie$pnWA8M(j%``A4N
zR*Xcl+uzNzRMfz?R3yV0?f&*U(1hB<u*07-CPzOoC$Q(Bp#}+eC(CTBGjmRf?!+co
z@VnHm=Z_(=^`W)_Z*4um{{UOnu>Sxd$Zv0KQ~bFQmds_8eZ!oLcchz9y1ip?x2PnZ
z6<5r717`u39=!;rvzZ&r8+R4P(bqlAP1tBUDU@V{3<$~)ISt;V^METk!8yrx@9pd=
zkWnGo8+@+VU4-W#@+!<x$+4c=G<>lFGT%48eFY|v6WiQH3Oq*<GmIevk<WUH3xR2I
z=3BBZ=K^Dl@$NfQE-j^9lc;>JEgXXzkEb1}>uwQ>B!djOa#ydmXtDxb@Q}h(Asn1K
zzW{pDLdNKB^S)UAa`6l+0md;+HkT2{8bM<rM$Y-ahv+@(+C{$-Dyu}Rg+M;@ejTYh
zBs8@dzDQT?YJ?)>$XAk{htT~gV+k3M`FnSdly2MecR!6Ul3p;oy5#(WlT$?$Vr53U
zL%DubKYMmL6&EOu+R5$a5=9#%!7yf@<}2twTC*HWaUol)fYNQw6?qurr8*%Dix45>
zmw8!3HsDwIPaP^-=;gIpBAd%XsvCT3)OO@{sco^PVl=grE#@!*Mh-X!(wT7zMdhoJ
z8cMrZ7s2V%)|KRF9GM7s!354YA52pxnIe?UdIA<eM2>hrK~Bsx9t-XB3@iZ~BhOQg
z*{PN&)F60BLdSDRK^ezGS^j)}YYVxRQDYk-V}sArsi#A5$n#q*vt}5_mKm}acYOCe
zQ{`-2#-z8fq+1f;B5wKF*EseSR$W3ywq-<g!!hy{WwGjW`HHN!C0aEFR0Ef1<R4-x
zDW{OY(?z;wLy}Pa@BXz?h@6X7w}il{9E)s?HeIe0cG2oEe(~u_Z_M(SMM1yhFVH9l
zzxdS)tH{CoM0V1QsK_nCoK;JiZkW244IHb?WMJd#Rme+`r22yWn=-4Uj#zoEjkpJo
z#-Nu}wUM?PwOLDHkZ^smP%XTzX&YI{CXLR(jr=FSTAtnmoy}|*Zo$AChCM0rq!(;S
z?;(Q8(&jk|kVBPko1UMIN@aV7R7-{qq-~8`3=TNS_o!UkOybrRBNKV3%y|qwX<{(k
z2bw1h<}dF7>zwtZ(jD16QpY_10BKeEkILw$8yIys^{2DQBmLr%u5er&07pPg0WK$)
z+&X-Ssskz8xb&*bLdHJMH%3{5u5usLA3;-KyCsg{%<N@=f~*2$jt6=Y{{Vb#D#+jK
zHY?+t`+HK^TH70Sj_O7UlfF`ULFg*N3syx?8Ja$A*mUQvM|w|ST9qb;%w;756$K-S
z7a7m5y;L?f@kbnTGdz(yZ6%1^?TXWoub<@HO&oh<A8;Mf=hmv3Him{fn3%6qw=AIg
z(^m#ED{0k3LJx9cVV%S4+O+=w(PU8Qz<%!^y5s!wS@z_{Vks1^%PDqoCIcxQK9sL=
z8Y2QiRUOF-pP2K|Vw;O#or{vk5Go{9jGO`oQT6qx<c&?iR57_s86g88kLgq`^+|U!
zu-ao_51HHXrzOmC7q?V(R6FA=*fNrN9CQ@<7;`3FknLraS|)wO$gDB|$4pgerjAA0
z<yo*pY~v%))H2<wTq`U<ZUIhueGNv<F2H08xPDlll!|HsxXCh+V}21q;BooWWq6}@
zk)mftMd>Fa1EnmRiDyV$DN(jUepdFVikvA`VzRMTa6axk)|v^s4*OFfGCZHdjm*6k
zlEs?x<r>;U3}uS6uaF-E<d31KWJ#AM22!Nqk@-0GH1hsQD=eS7MaW!ozO`0F-IgMo
zbY&t6stL$$cO3Nsp`Pj(V-GVI!<?AU3Vp>g6_RFUa$;7)BeQa=o((x=wTTs8`Y5E`
zhj&aNKDg~kA>EII&XBZjqj*t`!|(eF9d2Gj8jqX+7b}+fW4%{t7DW;hxD&WYohj>f
z04We2Zr#FN{WIFCz?nIB5^j<fNece$8-t%(n%>4~<BAyENi_2n3Kx_hXD9q>j58EQ
zSx^=r?;Qvppw@+^wQ9O<+pCYB6(Tk(g530`kol1R0J2XUZ5`yF>LlD-ByS$x)iu@4
zwS-4}v9MwqGJ_e<Y|>iYTF*RbdgYmh`4%(7FQBV%_-XZcyvr+ADo*Ibw<=Fe@m*9f
z)vLZ*YV3(rjCV7q)MLC4c@%<J%Y~QA>NxBw_L-pH>;7qqaSRv>9L$6^ant_*uU)@^
zz7IY8D%ZMNo780<VB#Se?mg?!v|ofRV!vUzxAQsu+@Ux;=QZ{@X9wc(2~MVn;i-*^
zc8a;>J{|aZe|C)(#0AW8;HJzHJ$dSD&^#^hlTbF1U1|Vijk}OwV06uTSB8EcY40xi
zP~|>m+AFHlygFb+g;iEC*^m^-BhtS_$~ZcO2Bph?$l$Gva=qP-Q^9`=trcU2Sj&g|
z%tkZ*0=me2Ck>LHETRNID9&+PV@NZ^&_oKU0JEXw4?$XT=yE(LmiEdRfE`HAR~(<M
zevg9T+HjA<vE@|9rLl~fS`>=o?7}!+Fpl`(H}{2IwbNl+c`Xv)hE*6Rx%D-A$3cS6
z7G7+kCT!+b&NJGtjWXe4ju}})WP((4x3zsG91R*8+U($+dX>D9No^t$3ETim;f8UL
zD)pVYW=Ra$iAZgVy!~@lps;pvz5q@-Hy@2$gG?>3#_P3*%m=TvcE*;8*qE(%DI{#W
zrIG^5PsxMd)}0-hYk<2+XCNTY0Q%OX7G`Nlnj;?5wRdzPt;ME7knWO2^E;+Gd)BVV
zwFJy)^!89<@`D23K6%AkgHMTHctUa42Y`N^s>zPh3Bi+d5PoEhxdNcMzJ@>bhiFh(
z>@_K}tr)!rh+^}W-rZy@+_ybGl~YijIEjcwvDLF6WB02gTk*xcm64K15x8td%6U>d
z8uHH{{?HIxqo}x&CssS;<F#R15k`z0s!L;NQ<La=FN!>GZ>Gh*ThvjUO2M(Vyo2ID
z?GbHcmnkjU?Nk1YP-i~%;~x?K0BJ9@$n74a(~a0L#(weo_ch}lAozjeZF24Al5iuK
za}gORJu`~@<A^x#2Zg;nH@z>w^f35IEo6E}#D9;M+U#usyJhnx;fo%=)#aMEh_!8A
z<)^&3kb?gJDmmaBec|a;n#NhC-hr5bmEY8!_^mrV5f=t&9oUQzPCp9#k2B9R9L}dT
zS!vkxDba*}6lPfI(!AmrV`)6b!HjkP0D83SG_WI0+e4OR1P&Ng%|AyiaP8$VHuwk=
zjO6~cwWs)e+=aGGs=~#IJPe+-<MUkJH2ax0+F@rSfLS)|YSz>AZRhOw1&7I;4l+GO
zX~m>lM<Pog4&xXI++ws69j=1=3Wz~gUZr~s(r(7Fibj2{pp8T+Zrgu=XOGUO*o*|F
zCIE~s4+9^<-_ZM1(_8rgu4IvLTWUnDlaKFX@u*m)><NBsV~*9IHOorEj0nlx5QCL*
z-kBuQO9=+t#=CL|TrvD<N<4&+fbAK|)ky)j1U8}O7C9;o2tUwQor$f>qBV-SEZU1s
zRuzF&5M`N<+&-t?qn_s8;!Iw;u>c*&+f{zPrlb2b!3efYmuwKjA&oXzp;Cw$7|2TU
zI1P?LuP#&OG}JEc5=j!_<zu@sEMf4Y{j7WX)1jHdzmpfq<&>OY5`(cm`KeOaEIh(k
zg*!mTLG-3araS@SNb*?!0Hm?%5c8Amn#Huj#BXyou?)ycN&qaQmBl#Rn4dAUg?9}3
zXFpu}eQMdUjqz~^QdDJ5PagjCi(wkvZ;S=V1hDJxO6YcFNw+YNMYWYwW6H-v+w1F1
zG0Y@sE>wgB1a<jLXB_6VKFXvtEMtt3kO|}r^{LlRvoeWdxd$tmfd>qIy(>9XMJP68
zJW`ici89DHV0wC*dTG|)Nl~S+Jnfb#F^u;<wQR<&<~UTdCjfVR_Nk$cC2p7iVSyOh
zdxKEt*lGnaU?gy|EP)3l)Zo<CmME?#YfqSr5+AATYT8W_+p0+}V_6G%pmDp<`%}Y5
zgS6l_TP@Qkxc01^<n%2?A@+77VI*vg8zMrZIX!5*vq)WGianvu2yUc$=8@coV3Dz1
zfH23+?tX%!d_fR@J9>k}o3an$dQw*&g2Ex%e6<COV|$#c`tj>RCzZNPZ5b+6e~fqH
zstdJ>f3v7OwpfG7&#$1SeXj4Mk>g_$l5ELPeSgNCt}CK@nT@;!k%`!+0f#I-y)i<|
z9BdPDlX~V2yk)!o6;?~ArG16V;R6+B<(Jfdg+&$3)QlE=rZP^<4o~CTilm9TdTm+;
zoeZ}N8GH=m7{Kk?t6g71IF>kz;2;tF_~*XwtwSUwuHunYq(B0Q$2dL7sHHPJIf@|L
zjvFVSJ?ZkIT$oFGo0OMkDb-c6kF8dT<7sxZtVaFK0DejT01BP$Wb-!cWhc9OQltgo
zA21+-c7^00ue~8|SB(<>H;Q5za6rotQGx!H_^g&x9#n=#k3T44LH_{j)Xi#A^-^XV
zofSlCF}IHAxvKz3f=L|}N+4Ij`A^h)(zwzhi%yaR#nP&TZNXQMl=S?4YRD0(D3O(n
zoW>6rJ@~4ZL81!3Xhhqd9l2mfLF<o7xo!4`i6oC`k%ke9<aFR-q1>fnYh(zGCzgue
zUK{@auTO9aEU`q-vGS}B3VlbtIW6|Oh>!yr-orez9=}0R`Ku_7;XsPsCt|2ra>uVu
z^(|bji38z^#vGU6<bJf1U8HdmSd4WbbMM7hLmjkn!zJJGmPK-RFh9<l0yItbzqEqV
zk{FTqeE}W4sd9zOF<d0>vPA<+j!bCy%KO%9U+RK+4bPUb0l@<YuS&QrW^Albsz6r~
z^Yer2pGvKF0h13EvCeQ+j&=e3UyTU^WUD&C2@jJd2~V4opRa6Fmf~&Et3b_`!hi<{
z`cf^dGOw8&av4e!B!RM^dkS=L+_I<IFz+J#s*8=jhw`D=n~exA+jGa{$>tChj~E|M
zT5*gt+Z-@*H()mmdI6dl#1SOYsX22RAmy`CqL^RHc>8Y=u+B%QKhli@QGpU94q%gJ
zesW(YK9z0=ZX}gNY5T_IQHC+cdSgPW%M?Jdk%KJEbA>&<@lwI%wbYT!Bq*@}CC4GX
zsSP4A0)ZvLQ@PZu%8j>YxE{4Ea6D0n{LmnE!t;>F)Eb^R)nNNUwh|OPqaHEz?@>)}
z4aDDSmLi2dY;VG^;Z0n2Lj+*#RCf&7;GVzzYDmmKA_oU{;yK{^ihOM_?iHA0%p*AZ
zREVY27-LPU{{S!~U>=zE%{6ecDl}W94-hzBOqk$Oy}6bqLfIj3jgkgWueDrcj%8@#
zh_aR2EK(ns4&s|_1-dGt24z!&Av}F6Sjmf&fLnxgj!2u#L)RF=BdPYO;*Jz5*E#A=
z6ZpOTg-I2=z4P11-gC4-#uS`je+fTIf_P=ORGvbCSaE~bAHqdx8C)8%I>Q)@i=}7W
zPSsP44%zjqMIqdaHs>V%@l~)u#}$&7McBi%vo}QDgOC2TPX?<TPSDLD01Pi2=la&y
zXcUp984)7fHu8mxZLt3UI(&pgtvd{>ea!y=2^~#ie`}wZ?!k|TiAdalpS|vBgHlxr
z459vGv<{2vPu9ArsYwaWCd7|2GO#Pa$YL@Gq>e;izCh<V&qME7AKFW?MBs&YAjS?c
z=|gHtV>bdLAqQ)!V~X8GPNGJ^)Z)~Uq-eJ~w!qQx$m0Z5X?Y-W_XmU@CI=slXC&(K
zDnN}8PGb!HN$b*@E~YB;OCJlweEsv@s@5mkU6$n31b1s}%n2YIbk2JkihKFeHbc0!
zeryhYl-Xn~>J+Pdpt9qirBw5lK(3SRB0@PCtmdw)9L#gbUD&v2!C#rj8;_yIMJ>`8
z#8b8;&+eF>6#CF(Sj$`%kl``pvEhz=dk=oJ-z>W{NEO(oLSw1_01D-l5@Nl`zTTqO
ze2iI}a3mk~fOe=SFCENrDsJO?lo{Qgg0A^bHxaCFx0WF=Q1l|Bn#$_#6BH7z@DG$w
zW0U;8wVa|Rn=?^Ubc~k>S8h(>^DKb!zfPa$qBXV3vP&$H?#}XsNMH9)zrA)k2g6gW
zTg4^AGrr&qD8DdX<ev36i~bkgT0=aR*9?Xd2#aqgj{cRCiznUM=LvCdZqnjJbTY0s
z7r^>}Dm0lI*X+evW>#fYkB|>yYR#E9GO!~mt+bFi&q6;+s}u&_W|gNY=Hv_>2>$>Y
zkZR1DHVV5u)eIXmM!gLz*78WLBdPL8%qXPij=4SRQ7c0Lc;O(RBme^!9=`PCg=C-2
zd2kAY)9)Vm6s{H`OLUfDbtFVKLEZ@f<BVc~YYmKfh_i>7?TGS6ayje%6=&@1iMm8A
zN%=yal{{8%2!(Cs4(eZXjHu5{AI_6uXL2W4<yTjXE>}C_>?&lohYK__85cNaCm<YD
ziElf+o?J!VGzIpqJ*rb~=`eNqQV<?dx9?}JD>oslmHe@Wj(bp8kWs+kW2H+Nck`r?
z7&`#wKpDS+WG=sVAH)SVND<>^Tj2`^Bsm${51{USsmn9Z6j5Cl5-WVn20X#+Kcyz_
zGeI5$6fs*$uEZZY;d^n@6+(L`?j=csHr>T?4mOe8RM14%HvmV4ksByCe-EMcrC+jK
zxrtb~SImfw(C7T|NV{lKh+NFAa>`Z+V=U4)K}zvQY`j~#i3ky8v%H>j>?-V=rjARQ
zV~#s=O0s`=`czn1CNY#?N@ps10YF(1vaATt1e?c0@`6Kpdr}KnNp!ew7+@gdV|$vN
z(_-$H<s<V{s&7&`r`p=h<z)boRY{P6+qve8*er%YX>8IsmE>g+fC{<G9>egbU+FtG
z+eqt%0IZ6Ci_<-+)~M4><-?u9x)1ZsNqpaC4Ggx-rI!){z-|8kYxJee?iNK2JhZnn
z91I~*v(blIx?^jmlIl3hh{w*SraDz<;#RnY?Inp3$XTa<<b6K1VP-}_ENWy(q}t&+
zIQ1040k)BMP9qBo1qjSLj<lfxQ39)EHgddi>Gh|{<i_&D7|cTkCM}#X>bUi&kC-yj
zCIT*U4=#PZC>V_R4J5_B_HqXx4%HgZ_VtlkHrT_XaB1c>SW7V=5?d_acz=aUaSg?@
zZF`7b86z89Co$)f`2PSZ15ybkirOzSSyce}7bB2qZ#=ba%oSypG3B5<ao()NrrPZ;
zZSBR(G2lrXjP6`>@1K6ZN{SsX`!WWJ56is1$701YbJw*iq1lw@wGw9BnH4d)-CGzv
zx&D-S1!6568-N1~)A7w-`#IU=#|aReosN0WercB$S9b{%)^`bj{{XxWq!PI4Ny#9y
zA`n46#EwugMNo|G_dQ3xX=2m-$H9w|*-{&)x4Eq-Z509;BM4k#Jf1$aA+?Fh2@t7_
zf|9FXhW_x!@~qs_EkTq8tj%z(BzuS>YXN{b=)=8A7HOEDEl6T>Dd&;f+O8XM<vf=P
z1ED04cB>CxYI|7=c4je=_d(A)O(jwz<aQ{nvm%SDsM=Wq;0U-F?0&TrcCtp_zfU$`
zcSW)B#(Fhs3uzhrqaM%?U#&CjZ8UydMG0mndU|xH&WFgzY;DpI%p;LyZcz#Cnz)eR
zIE}NMvj*sYr9rah3B*c6?C9iG(HlxUks^=>RTv??ew7lEeM^jVD@rZoU?v4az5<Tz
z{V4^qg>tcNVUhtk$*Gbng^&q$pwG(Vy+|P=3ISlp2iR1(mC7<Jc(-A}DYFc}-u5))
zhxbk-jkj$o$&M6fkH(ykwZbq}Z!C?cY2{C-H1)EPgi{;Ps*X@DKKb<~vvqYTK#7(J
zZ5X@`jhrT1sr)ID+L+|~M>|<?BayR{?N>ab8=u`0z>onvr>Q>GEFcGB>awb?7?j{=
zxX((SeQsThvuU<ARwwS@oMVo-{{ZXL5o46^LzM&YKTmqp`!sDNDI~vm;T#?a^ghCw
zdyAWaEXpHTdPf=s&-*|RTBT52iseXQJIo>RCuJkI^sBMN8a6<fc-JkH$n>T~2biqN
z4tL?0btASa+7yHm*gLQao~IQumDy=nZ;;^<Hp2kNb^yuax%8<bTYG#x-rc$Ro2J3*
zQOR-yuBrl)kG^;Z&{WZxeAJHJL(HErDmMn>`?VKiB!=Eh9gdq;L$HjU>+4n_jy_|7
z$d@~chUXO=aVrxfB|{YiD;|g6+N@l}9?~|A09=tI%f?&NJ%vjt5xVC%pQ$_n$`A4P
zrYvE;Xn`sRDjT5hQq72@L<A#5zbFTiNa{~|ff!1qUN9H~!QhkXC`k#i400&k5Ryq^
zxc(YchT$4XrP>GZqA%U`%_X`pLS&OC2MoODnz<Zy<`)lj6n`#8@P20WJaJ9C3fCf3
zi_Hkf=2hGmci!~PNYMzCN?dRL@AqhFghg6HAq=>~0rNMpsUlaDF)paenN^W~{WWnr
z6<u67g)WdO7%WqhL=lET0B~kG+Q5E%cA@5qGK(?Wxw^3#KT2$O0i`KzBDo`nL5@GA
zYLjG>myH<2H{dVM!1BLZV_Xvm8yGl~DLRmMjD6BSP->Z-?hr)(0J|Lv0nh&cUY@0L
zJmIjamic-br4$!r&2=1zUEya&ZLbtq&H?N1?^WfJ;`OAJHpW9^3NUf$?N%U&JZKmZ
z^OlSu!O8FRt9Et<>K`$g7ABF7K>4J{TzgZn8B6D%-OmXfm=?=^2ALFhF6Yc*5&?xy
z?0xG(>rQ7-UfH&eBRjG9)^rW!NF!$$MmxPg_ok68*qNSFh*`*XA9N0*u+2dB=_?Zy
zSPj8YbDVXljA(^qkdW)jh3dKW_olVd!-*D6rx`7dgTLcbX0{D1R+a-0GG}fw%1=L?
zPi-38N{p<ss|-k|ka9f@Hc6tj6CsF=(2p?(EWq={B$s8LGByQJGFWuuq4%p%b0xHk
zHV+k~=+dl`n2BJ)v%8+3g;u$BM%^T1bgi_Ke(!OUReskqLXOge4=M8$3>=Pw=~eDE
zMQdqiXwJxh5*8d}p5Er1aPsC8sH|IcR0%Z5N^i#EI(pT6#Z-}mNg#mqcIOn?jmk{S
z*GOY@1;AcU9jX}Qy9@zOlrR{7;{O2aS5zt47`fbn>5|=ixUfhZ0C_)J#?<YLIFV6T
zCx+NNcKTM+*@uy(ECF5)?&H(xRo_c+7Tm_lvhdQd<b&LMR<Y5UyR(qG(%wsgBC(Mb
zIhS|@Hhn6drJyWvdGVYMtt%nGK7$q89VSR81&bGF0w}=fJCo~BYC1wia@&Df2T1qi
zD<0r_`&P=OnUkk<dEMTHI7VoqE+brpRXd2se_GGD)3%fhga_eJ51TlzLjM4STHbx)
z=Iz!-&e=B*ihT$bmoJB{<gvJt?l+0xh`bXHRJL)@a!IY@h-kuibkV_2r^&lv0g2&N
zMhQOkRp5~#*b`|CMhNI@vA@!wgXMNYLW~?^%RR|8jdx-(v|~J+pXMug*5=&iod+F^
zDO9Q26prU7r7-Rw^1VMQy>(<k#?lVn8`s*Pj>dITB#8aqzTUO1(=oF|8R|OY(v-6W
z%JMpqQa!7K`>4sl%V1PeWd=t=c?44s<(OjxkO}U3REspb_l}3u^u<C3F_18NQUb^3
zC`YO7K<-?(l!o($OXHS3aaUl~q_;antAaU?vsO<1+e1l@o2?5gugt(_wmZ{OXjVGS
zH^p}r@Q4E_g)+!O<<XD7dg*lUh$cm4xRFw4Tp~h3kE#Cv8uK)iM(HCs3>!N^<EQhh
zR`>FTS5cPF&&NUi1!$z6;ysg3@uOVbCT2kolDI`|VTW9v;MU%q;$wF@+gwi>ftT+E
z`GNZPuMgAwK`e6#KG>rTfUR9tk>YlXXd`Yx+r0Jsdr;`YqR?@vC_PVEhgn$SWL?V0
z36IS=W%m_kJxwHN?iS`LB6JGGa8<jXdh^{g#jYe124GS>#j*$(J?hM!HMZ03v2k)E
z6A}c{HqaRJ$F*hkX(zF#)-*BxFiy{@3pgDRl0hnSk&Nex^IMCEp=W4c4ZEVT>MO4C
zUH$(6h%PtC@u-ck3~R%$Vmp&ut<|E$?R4>#jz`!xFWzeOD7Q@`l24jfD>R;1V!?t2
z%VVx-+m<&m%A|!k3Ob)-O=yUbq5D8gHUbsSYBf7wU|9*=OUnHiS4Xt4TS8Zq>@LfJ
z{6o{)mO^A=;egz6g%~SQGi7!-BookjQ<dDaNgR9FkGQ^{(yN&<SPuUHFf3zm95#Pn
zr8^kg7RO>TRfBZny(`(Bt!j~%Rr!WEBRzBMDO4O1r*;=_OoAwP5e%g_1@f7**9VY&
zX@cF>HeoIo`^0zlsY>NbF$?@F&nA`QVS+IGN8Rc9)>4hix+{q!UzN$)KK9YcrIDlq
zb6_rT20Bxug_b?Z$P97^y+-90L9miI!uI#9C3u#sz^+DP<nxuzO(0AzOn`HTTyiND
zqAYyE!#x;wG#A@}xNaYL&q69Wkya6$@y=B<flWJ9{o-&qC)Ssi0axyldQvktEyp|&
zipjBvMn*cE;{ei(ACw;aeP{%Oo;`lF+$lI6J&jGkc6|;#L8Bn#k~ru`YH25iARL~V
zrOJVp=yTSU&<@C49P^H+wHYLU4}M$F(*eggBoW-wuF;Lmao66CYk==GvMMq8K|KaJ
zG^b!6cK{9mJ?Q~#0v8xL#wnR`oy+vdr_2P)DMm6ra5|iI_NiKQl05ABS37pLFnwyT
zE6C3yjMDB*{Nv@vKyg||t3t9Y$mTf|sQbeN`(l{43IGH!AMbUja(M)2BaAjNNM9HL
zaqmsnl3`>@_Y43)GBL=`aZ_7f{hmQA@R#G|$?5M^GIsDs)|565<|H2UM-eqE+&NW=
z<hcd+tc3fi#wtketw)z8*Dc7HyAC}nscq#%kv9jT@kki$Ag)xNr>Lt~s+Zh3Rf#^+
zES&k+Dt=SyDr0n{><^N8Yz~!EBRElo=vtI9Q?vocJoGgy6*apbB51MZqJ}FeJaq){
zX^~zPC3fdMvw%<dRAxd+0P=V_rj{50V~(U!m3cRG!<803)=3P+b?4fZ?%kLmV8bMm
zqX#utAmEeEXiectzd(N~pR80LDlRR_1&W+yKvrR#9`!N3Qy6BHW<H<{X0yw83(vXj
zO0zH<i5zqot)YvQNpMWR_L!m!t_~S-DudK|{b|xj!9W0vfCCfT6`EgjWP(T?1qv9k
zW;w|Gs=m7`i;)^jcL<Pqs#R4$$RK2T8c`!lY|e`rSlEyd{KwNKviGsb$RLh~wL8v}
zAcq`w3qr=rs5mZ$i%I|`a21yglfa}hpyXkQT(3OU6`oL6Jd%22iahBy7g-4apRH5I
zCN5IzOuxc#dS}v=<Syxy93DyzI(4d1-MRwkR1mlaZ%==%H_l)%WEjWY1Fc8alOH24
zM{o$o{Ie&QQP2MXs-F~_8N{p^K)_@jYJicEiC%NmdenmGqB4#%#t8iC;fae{gNrPO
z5rLDOIoc0l??4+sVHsx(c+bmKnsdl2@{!%Sr!C5EI|&=q0yB}HTBTYHT&%LvZHEjA
zGBFbE#{!&>A%8K3PH+^Cm0Rsf97tV32P~yJ(!9!Y@;bT4%Y)PFSM6XHWslywV_+(H
zVc+UKsissa#Ys{R3OZ(>w|ESy*Ea=JpO#VFk8etRmrzS0TSTEiZe`8`XV#8-Z&0%&
zWAp7N8R$(luvMf#DBFO<cl4($XwbBf%AhY1sp{v@R6;4vJh-2R%LeF!-jn4EGFLc8
zkgBlR)rSM|^`|xzxmkzH03fd*nvNUhiHgR0sS*Z2RoCcfS(nQt0+4?X&ZF5=dW!85
z#pbt}42l4iHti#fe~o%S!XJ$K-@}XO^=T!ZZ|wG0NR(v4pn<(lw{c!*rKT=o7}&dp
zI{inrSdUPWJ9dW|696RVs2}I0WnT$H5lO;GF3;G{*x&Z`_+8^2J}WD~8bcMzqL=$j
z%8ew10z!g$13d@V*nO4ZFNm5}sv`R|(a7=uLWu(c52vrvznZu;8EmdsP`AC3E2vYM
z;+dD_Kf*A0{5n^!{1pAV{{U#8gnE=i!@e}To;X}cw)fXBC^+f{;&3tB)Mman6T>xV
zw&+Uhv;P1yMK^0R`XST2NfWVqS=uxM?zaSc*2S&e<b_$}-pA$yb{_TlEAS`&3!0Wj
zEj!~Ehu#R^A7;DLNtw%k7?BU$1Fr1jgVMg)_#6KK1seUIJ~C{B!+#R=*Sa7RVI9B{
z#t%Ti;ODu=9M_A9!dJni?V{J2qSgDS)b^L40p|S7dZ`t~{Am53z90N-&~7w;6X<r#
zWr*%C5WxgvCa(B<$GT3V5LoWu+Te4z5znFZu7Vr5--nQ7ju4)s*0QBiRG%~%PR&`L
zlHaz+{1XSpzYAr56#O)f=I>2sb1l3pxWc%}+P!c`;hcKc#ozF@el+|R)tdhRP1kNy
z$dt$ByzKm``B9aD7$d3275yCQ-W}6?L29vT7O5meVZ?(wzLoJO?a}`L1h4R4#SJ!p
z5_mSzZS@~Hof6(Z^@R1$r`NVC-oxe;s#+6AH?whmN9HmA0D^+e;%U~;$DSM5(rs5*
z!DY`w!RiS7s;;H2d;syoUJDIQ#?0L>?;wl-!TodC_Vlhh_JRGFd~NW9T)DB;v{_(M
z%=VHnIFXd#fPaL6)Er>_4m@gmMzUjU$%k-Es;&2yy~ttUqMRLzj)%DGpR;d+Z!JFC
z;hlHPk;ZpCg@_%>uR=$qaNaBUAL5M);u}`6dxepRh@ts9aqpk4avFb%d{?4{T`N|d
zM(!8QCvVX86|_Dx_}1#eTWibk(#aqKX*tK!J^1TdsML<ZW1H19O+v!sWU&P!Ano9%
zv8a*@_#$xEGDbG-5e7dx`c{qJs+y(q>N3Ep*xKyP`r@ID?Pr!ZmO>&Af=3zkHMNrq
zkekU!^2*AfAOTq9AFW2QJg&_Gft4G8A9()&N|ydBQ*hs8k&0sndHciKqK#r=GRHj^
z4UN9^)quOELFTZ9VPlpX9dVuBmFT_}RZZ!22bT~SeDzWeFnztNgwYr5cQD_@Ze*I?
zP|(G@2`8@Ze_HJHS#2zI*0zpkQj)Qaq;18ra#WmijP>hNQC$;tbEea#wY#?`Rc5!h
zxpNfPCynY43Ng@ocddA}FSN9g+r{R^Zy?4FH)LZV{{TwktgmcE(VhsNNl=Z*CnXm>
zTW3txhxV1LT|5Ym%N8)(jxu_mdgPTh*-4|bwbZ=47HH6x$=uxI(-n5g^2%pv66A%B
zJdSg@y$7{&nswvp^0uWsi89BATYb4LjPf(obJDF_Ylh}!m0l9N$YqRS0X_YI?kgu2
zgGP0W;z=cqT1!O$w%;rP!1el7sC5ZrCM_PpL&~5#?hMC1g!EeFlUrj9bHy}rBDXGx
zFywU{_N#Wf&Aq(N=6J#Dg+D3X)pP6osvIsRnb5;?J<558K@m)(@yIYi>~ZT>EU#dd
z#5Ypq#9K_A2VMam*133YB-JGI5II|B-wfM`Ez~kU_p#Xhe+zNyzduhYSw2GC`Gg)o
zsC4cQ_BuE<CAUd7$XYm~EYas7M}AF6+K-<cS5UtAPx`pP&Uove@vcdAS&VLyU&411
zS}9PC>z}#oD#f+sk&+vOB;H(ZR!HNRfzzQLl`e>!j-nk+T2}J%uMq`FJS!ff>r;Pg
z#~TT+ZUk{JCU@Wl@1IKNpuD@7s_t0)#@o5m<>R*$sd$%=iDy9Zq=Y<q>OsbR#b)4z
zd!0q5qRv!X=4EF2RRAC<>T_1s@*(@Rau~i8IO7AUu4>No$A?>mgu9gxC_Dkzr%&;z
z9{LC%7P4OzUP|uCB<GV^xY>s1OBKUMERsd$I+Ox9kL%4@OQ|7HZK8F`?J&-BfO_ZF
zxqTN>x_~<07nL74QhscId+CbNu+-sei-@4sBbB^_*(pLof`0Bh{{Tu>Xe@O0T7|4P
z2H}ywSoW2XvI}}~(yiI*k(XcJ5fg$XjYe5dY#!X#Cu6EKvlWIw3~%!esx$q4>iD_7
zv_mXmV*#*Txykg!Lyn-Gj=xK|XdMOYaw~-;TX)I<=ufRa8_1-KZ0OQBV$l595w>_H
zu?LBCxgbSoBx#{vnmFX!=Qpl>Kb1jos7jk9cXcv+p-I920QGy+q{_M3Y5Jwu3ewxT
zSu?w68B^Oev1O<ke}4B2$h-v{VEfk@r{7w}@x9I0*`QV0q`p+PIp^N5f5Je<2DP)h
zQzDJ73iMO!Qz$mV=<aQGEW|=;0LB5pAme|xrCYY02vm_+88Wg)Sb?8f<n--PVm?H&
zh@_1M=$qzO{JK@h^(L7X-EJE^vhC`l-1=5hq=$2~OPD1RKb;=v(N$M*+$#0NuJ9vD
z#{`1DQRL&)b`{0gYa7gOZcrWn066L!)YgTbwyGsYjf9eLl9u2M`gawKpwUWJI>x$&
z+`YU{i3~y69!#A34@%awx<G?ujUu-M=k6SIKDEqQ>b4j0#cF3+CL9)1^MmS7U_E^*
z`rbpaSr|U?`?(dqQV8lQ756W5uF!4}ZLztP*#eSe$Of!KsKo?~6<9=9JDsy!#lEzV
zz<$)FyrKKgD;Wd(-{V%|)}wchCY=^Zf7NAkyq=i+DCANzXzVPn+4g~OfRVX)=j;Cf
z)~oR9E>#3extNm0NZP*j%3IzT=RR!3RpSG4ADT1jJ?m1(T1a7e9@$Ej%+g~4PpYqM
z`c_hd8g@FXHfw@K!6GQv?`M`ipZ#jl(=INcW3f|k`;tg2mhjEe>XS<zpD>aL)BajH
zCpqowS_?e3_kpgaA~G<{bH})-i{&itY-f#PhCu53obMg*D%@I>(_926dt{OoKI(zr
z{A-o6)UA<B(laOo7I6OnFSb4FMK4-HVtb9n$ONi#6W`Xg(4JGHv%Xnl^1%aZkfaa2
zpIX?p0b?@A+jb0`6U}p$Q=90c5HbTCm@dNshrL>Y@zG`yGcaY^+~5y-FLWy%WsU4`
zpp=psi3J(HW9|oGQpr4vDRQie*dAa#Kf<}|JBGM_F81UQA_6z)SoR*+tvGJUnGjtO
z8Bn1dWaqy$xrT4r&K3|6HmqQsgQ?GQd)BSJ(n)S6x3?k5!xlVOJ7FR-$uoxi()_?5
zzwL^<rD}_CfThR*&&?U=J?dYO&Z^dYT&#%U7^qUm)~uwFnbs+#2wk>~=ZeD9H7iF}
zhUWDnkx2@ttN#GIT6Tq{grrWbBJ!e6K>q;i)G^xS*xBKm?9r$jhXhu|z4Rpl8C6a;
zI48fS*06INw+iJ9Y*%Pv+^MT}Qh8*sUR3`8tSiB4&QXlF4UU(?+O^i1brtTLC{LT_
zSN=SD*QNMd#W8DZD{Uz<kQqqn^sgn;?-Eumw1ymz1}jR_QM$5_-CJBZkdNU#zLm*R
z8rZl=UsKxTl`bt84xVTo4;iag@!Q<#rPMHxKg@)7uRrjwi)XyMSTz}T<p$Y1ZuI{E
zKAo$thft0=GLvq`4pqMOaY;1nZF>^xejkfcnQh`j5GnGL_p|DKt2|m?>C7#zZJ6VY
z;BbG!y9i@T=@#xa1@?@BdB?Y{YTMXplgFJxHw72uD}!9}uA=P6?A*3L9U{=}?qZZm
zN|;m>EPnT;OK)Ohw^%OaMkhOzb`@=s7;W2p>OkuvwsH7X#k7(rq_&As(*TL~a&yiG
zYwi{mT;_FBGrYK6jl(3W0`R6zMk+`P0vb0YH+*Lc?eAA!89s2V0?ow1R1)~;x#|Xa
z$8sqk(}|oUPvu6*os4>V*6^U>V=9*!lF%~<i6zL(4l(JUTD4`S{gwrm8*-tXt{J%_
z{3$-ni6Dw5`AUF@PhV5@q>bE8u|DTP%dUCH`R!ZA2{S%xmn652FvVq3SZyc!pIT!)
zYOK-_N{k22KM_y2A>}C0mf#jS=}C79JQ0^Cj(Ih&DICUo1~($+OU7d;2_{bj4wW*r
z=>*Z-Mx!J5GO*wd;Qs)PMI)1P(MW*uHor`IgI3WNOJi#=XV}@sIC1IpspZrhm4@40
zPaUYZNKWm!P!A3}XWFERZWo#74AS!W7z^wNYDnNs%)wcmhusV~_9N1y{lr0@NZ1fC
zK5jwuH2F}7BbI62NPLzGPbV1MKgOpPauXf0GlCm%0Co1M;+8vE<Cv<tw^*G0;p}PB
zhVt1ZB?}*r4yZj176K{kgto5$W>$AQ03YhjHb|rMl_cC|7}}x82k@&%%H+qm<%h`1
zaC1y(NVoe#GCFQC#;h<)_deBDVREUrhzTN=7sP{TD%jY4>PMP1Q7z6>_#?w(b_ZIL
zC}y;@Ye7Gl3zLE~gX~XQig;B3cEc3p=eOb7nz+-kBtv|wwQ;+KQr)rK)OS`EdW=U(
zxU`Pq%%LjbK4{pEdiSTSrbqe8lBy2hQC6()8Y0Fp12bYk$_^>o<K{kW{i=UpuZLe9
zv<a<lG*9%zkA1$Q3Wd0b*f(Fpzk2-9{h+^O{{V`=0QHHEt)$%F>0(nFUI<hem4Atk
z9l1Cd>(ak*9!p!P<rfL_Y#7>cgX>(sj{X$*1IGGk(fm(m1<`OuT{tB3&-l>YM(&xd
zI`W44pMjIevE7zP<lezjM#eUbdV13nd<e{te(e3l&wTQ8U!gy>r~DFW;QL37z6jk%
zZ!EJkhfk1~g`4Ijar_~P?cW`7UkLc?;n#}(9P5+#d&gQe&YO4``7q59{ox;b7~_uo
z)kb&UL$(!RJ(+;&C1r5(Mxn9gmcsM=SfWUpG$J1{S(vLU^arsX)Jq!N1Pc_Bvl0&1
z#xdBA)YZhYn4pSA04`WQMo&;an5_%A`7V5`Nv(v;R#gdd$~J}r2LSqH4n3)o?0orq
zkZl1Y4V}L96;Z=E*bmL0)|uqWWW!t_QgV!nc>4O%3zLk%%^H&X6QYi}^rp>qy%-Ir
zc;udV{{R|}MH52u!FpEYHrV#5+I{K88c9EQ7Q{iB3olm3Ab&b67eV%j;<z)+tuYa<
z0B!*7$9jpTj^+@s%vEw*Il%|H_Nih7?3M|_vc51zNySM#QOuG`QH-(-HU<VgMJu6d
z(Ex>GiBT3%Ng?G|`AYkb>r&vXOKrFkSm7ccF#6SlYi$%QB&#$`R}sP+=3~ZB)7q4V
zg<aWIRInR@@@ia$qC#RZ25XmPSq{^M$Y1`yYMCOqR9Pod=(6&WugnK;tx0Wf_Bl<w
zjj^2Z<_xP6bC0bgN?{`5vW(!5m}hs=rODj1m5D{5z>Zr`ruqD<by6^-^*@b9@rX*T
z!i80KR*dx+^`|DuK!O`aS=~zRc`~RE@hBbt0F^S_n69CSNPNiGB1c^QI5aDRwSl6D
z#Ft905eW(xxyOG|Qro1GY?4)W!7VSCpfLXcciY;jTV2mJqRA5zB#g>qVTDW*0iyo;
zOfb2;4X_NzselJ^1y?H-(k-j2H=P7>Ze9uzyXF4?Yt!rgL*$+yk~#TC&CJ2ReYHX>
z_cIBgkT00PMnU350-JK_Zy7U1A{mKT%Nz~earCC5?i|RL>iQUMrLu<H1#!ALB;@3t
zpGwHoZszkATbqTO&BBz3Z3~X|CG_)oj|(tNAUjz<P-=q~RxUtra1)M)zu{eU;F7t`
zQg?P7+kg@~3=Dyh$R6~Hl1LUI2x(a5Kzw|@w2aF5W|NbU+mGq>rPv*0V{Ie8zzeD2
zD_*8sgEGe=pkkwcRv9ObX|XdwA(%R`&mgbMk4|V+ofLrOi31}Xfk;mzY;5C#$Aj&P
z7`73jY1d?O2Ua*hI<0%(?7QJ>(;c>{BoIRKC|JN>m<;g5{=bcQOdedf(L(Eu&H;5j
zGhbBx&bmArPLFPja%G3h0I5tB`g)UI)=P&|sVTmQ){if>if8C2{1g8G!mak}ty<F5
z2@D`hFv(rG$0yX+q<mh~&EJV3T`^JORX%j`C_7Ja?O0#2Hj#Z};JB{u7wqsYgL!al
z!%NS6cdbtusMIf%--L=YFjjc__38Dl`p#b7@1i{`^GfHYd^gbTBhfA4d-Tr0-+1r{
z=}~Ko0KVpLH!=_2Z^#(!PVhYXRkV@V%M^k^0ceZ;*8F{IKUuqy;^<3f0gV?Tc;*8j
z`teE$x2b7qWNlc&`jyhGaTwolOb&7??~0|fy4P*AlIjEi2@dX09Pv<mHz_^T)7(fw
ziar!`pK<S5o;dLg8YYvhc*j<;5G949$gac^0O-Jf5%#U;B~A^#z>}1<J_-K-g0}o?
zhs7TftbQM9m&}%04Y`xcE-@qEs2p{`+<v52$J%R0HL3u)S0$ur4tVqc_O6%XZ^R4V
ziysv=pBmoTw%fa=*}EA`a37AD0~q$Me@u*BNs^?X9YEtgpGx^^l|8K7-%@R7WN2wI
zr0crf8at@i?Bgl7)Gu>ewoo%7Ah%&4B)cbZ>?*dMYWEEZjR=(q*m`94>DsPd3r#*H
zdzmf^MESzDGQ@Sy_eEu)MO*ZbeqxYePUS2JBaT6;bLwISS;eT>Ps$g9JxxWcY7wAi
zmfBg1Mf<IfwEH(bYns-zYna_ixB-a{xa1${Qz<AbiMtQgHFb$4M3^ZmO7G_exla-5
zg6JC=EhdIXUFcZ+x#)ZGpXpF)-XeMJ=KC{w;O<9lpLA!T{{R}!GDuw{GlLl)Jo~aU
z>CdHc&Td8$ke9D4h-907`34eQ-0&&0-9+dWqCk<R7{>hW$KF1a*iqRZ%Z1krcC?4)
zcF!30rZc0dXyXNuNRl7|<-HANk(e}3J|T%l8!QxbLI+>R@}x3HIs}B45-uj(KJV6*
zA)098bhVJl8)j#W<YVdRDU!J*orWYWi7~(<u>-X<1H8fIOXVXnq+cm-n4Z|ErElH^
zj{%v0k(}k51A$H=Q6Q2jfL+@#2T|P9C5*(bBp^u~nT^26CZ51bghG75Dn=232*W$i
zp!BD!$gqoL&c=3syU?DvH5gGCjz$QxC*29q4_~cFftJoosAXa!IV;rf>_??bxCkxU
zcz<;=u-a5{gP(tTXod~aq-nl001p^HGUL8`RCjXRN>*v*3Q60%s8OE7ibQhJF>n|-
zD*Hw<bKlyXm=Ztwz*1E$uwdl$>@!izB14!K7E5Mb&L_bP=dT^9&K;!@`7F!;X$Zy$
z{^+O~rVF}Aitc;@<Pr6zqJXjes_dC46h@_FEV(2B#wiWZcw>qnn_f)vGI~`>pqXPS
z1DNMl-5WXTeJV$|Nh52RkndmvkT`66cIJ*$fSGQsT2m#+%nGLtj0ZpM9^#;lWOy4A
zhiO4FG6S@X@IAQiQOk0x1cmKR#o?6WBR;;hVa$RimLi3=Z46ffAK)q3ARv21GQ`(U
zA&9r{3O5Kp#;2YYksdjes2_FrcJwu3-qSOAH}{CK$r_a?hYk;4rxceHt2WD9hA^NZ
z6_f6c;QF6>mfiFkD;4uunIvtjxBzuON?75NY(~sC5`J<qljt$hojF!S3vSHncP<!Y
z9CfK8beuL6vnm~cADee^iY~!wFvrRkaHOA@9!bY)PbGv*fG`;>ps_o1Pnm8aC7#<1
zs63KK9^m@YOg0^}CNhDOZvl_LwL6RqG2CyA&aox{esD&5;~nZl4xe>w(pfgdh;58a
za!YjN)oYn$@+5Mc`B`^S(0^L9YO&ktrp8UO551q_0MdH`CP5?w?2T2tus2K4j`X*Y
z+sdle>c!E6H}`sW_o(8PBDsy{U_r;o{D3_TCG=&bmUNYxIRFu&akTpT3Rk&Aa@<2T
z+n!X6ZUFS+p$v-y*~1R)=W|HsJ5RTzNMnv-p^4oX$O>>-ef?@Em|V!}sK}@}F2Aq6
zRnQGca)}|fl)E?YjzLg+5$RJTE?Be5rL(}>`c%6_ZnBXfR>0qkDgOZV)QKBL%jDX!
z{QO2nPvUA^><T0)Y6_4ea9b)ydJm;YV2zx-?5!K(GSTo9f!?JF8o<bGr1N9Uf^gsj
z1oUA-`OMx-F@nJ55maT#?@`X#e5k7}luDvOg27HDSKyEFsKtzmsVsK@lam^SIpev{
zYP}*$Ht40c-yC2W;{$6G+>BH*$MY7qk(>{@!~R+E(9ovCl@MF0yH7SbcC$C{JkEd)
z>;4py#>mYcc9L>(IB#lx!V!{W1~R)q0E5517m0Cbp>Coq&bf)$a7S)?^vB^&_hhwX
z4(=_U5dl;`Ge%fs`_+5F6s)R|5UY$0*v}nmSmtL{l1qrbbAkeLNbEfYHhE=dmT4l~
z82}hiF^YE!T?-0A5$2XpEmU%(XFk>4d=2n!o#L&1HEXCm=&fWsM2o{P0E`c6<6(|i
zE+MuyuJ3T)F48bmjO6<Y^zVgQRo<7PJ>-F-k;{FN6FA3qucYB@Byl;k9OHPc&K$;W
zo)x6*+3L?=Zk;tm@|FmcheDho9Al1#wY(>G);=P$j=>^T^A)$}o!*1exz7vFeX6yO
zg_c);H2&~LygMIy?YwL7-^M=&&W)_<{ua6Z%+%$=UdRAg+;T8a(DChGx>K&9Ly`$<
ze7z`Ie9fNi`$OqEcZ$9m=-Q%5J+r`yV2^&{W!v*)bOWt(z69|7{=1>KhrBy{o@|^=
z9lPfaqc|!$6Q9<)EjI2Ch`$5Kw3BmL%u7fQ&V&y^*wv5OlXjEiJ6{t=1bZ!*dBF!S
zgYVRwR`@D0r$SB(-nr`Nn(TAF2GzV>;g1r3Y2U{7(&@8>2+<#01#0@s$J))u#vcag
z8m5h<q<Wo^*s|K>m&h3e4%r#5f8u79;hkeyo5Z%>8x~)0MJofwHW$a<;BZLC<ys#K
zuP(kHTdP|-pDnkdU~L}N6>zbsC0Fe)Kfvjy&3hQWCrximvV9j@v@uMxD@w7)$m1Xy
z?EE$G>s{3RJtnUOvZQMdnYeNSfs<6cZ{le@d3z?LutsEO0f1Z&f30*jUODkshWsGD
z5YfWPZ+JpUnDe*T9A}=GtE%e8nsHWdbE3~<OW}u${ulTsz_&jVJ|=jU%F9jDEv34+
zn)YCbh=7xv_xAkj@hkSF_{Asf8T&|hx8p-yk1tl%rWP<bz*}@BA~EnW@~9m-7&Y#H
z@Ki4!{7ljOX&1n)W=pFb7gK+?Tv{pGvO|-w@P6rKZ^cj6zEL+Oe=b+EbLRf;Bx8fL
ze-}QuufVvoFrHzZ)RTVfbV~Ypv(;3gLMjW%vHoltWbJQd3QIhYkjPiAdB;wss-*id
zY^~-J+(!QZdNO<FqG<fdo^vR9RYJn0v$r3@ef{aun1E%Cwks&eZcJ^Cxv!OF4|!73
zWQOJ<8aK%${#MB7ew6ZU%i<}PP`@)OwhIo}_NWrv#-3bp;Zu{llY`XMscUO7OVKP_
zaj~DB*y)A$r1k-km%&Kmaz`qw{3Q3KnI{tncBpWm$Z^zTik+f#nPgC0L_l^<xW~(y
zVm>DOGhC|g0LUavu=;vb0K*p8lt&;c%zVi9=W6%Kp(KrA66_Mi9LLOM#z!0vrAX0a
zt)P!*nAi;cIrXQklUm$J*Qo=jAyra6x%D{yv;h;r8_XrP{o@4;%%chip{Nr^f9)vY
z`$3Ue^1(^l5j^1fRfM#7h=g39B+0lksXs4V1M5>X63U35WswnbP@W6t*V>ENR!pka
zQ0<ag<6`mURn+i)p7eqf5)!cPQ^LBAj6F?SNS<Uzw`JI}o!C-B@z?82+Y>xtPSt)R
zQggVDxuwoK6_PwOcJ{drTXOlI#r^`GsFO%i-PR_@GB+qaa60CkAz9^$S#DNY5S9c2
z2qTOU=~6%vW|H4xG6f!Vj6UmUqWk+$<OoO=!~#pJh~7eQqi#N5a%s|}hGv%TRAQJ4
zBN$Q#Kq)PEKmy!J9G@`^z+@HAA4)(OV+fIQU-yg$$_LV;c2$uQ{{RV#XqA|pV>?gy
z(9#4|iboz^?4K-i@69@YIz(nxJ5h7GG#pfE<;^T<91etXN#qZ$QbHRV%pKlm0RYT<
zdyhl!N{I7G90;Jix$?;%3Lze8%QSK(;sFbQ-~DQPtQQdZM+PZI)lhNs4@29fJuVg_
zpUI8(i8lzjP?8^+yW`%TU|1uK+ypF1lY0_KJ&i-BY4)!2eWD3fT0fP;{oa3Cd{D@;
zvQAX=RbojFJ5UxM6pp0CQC$Jtxm@Gd2iBUgyJWXJ$vGpn4HLQyKyrg}svZILrG##e
z6O1^^I)>vEUcd^iyUUHl#4hd1xBwo;mP>CXV13(BiD=o0;Gb{nQf3B~ZRC{3@&F^r
z$j866LW&H)sA(ip11LE@#8Ggtu^8S!PFh0P&h8X{jZ7`A;V@rYPDIS)?qQV#b_2Cb
z6}8gDW4E>{=*6QUax>gDOuk{5+gpS?a9ic>e~_uW9gyjC)JW~--yC72`P?6r6Vzk%
zroi?x+yu3@D}u^yB>Rp%4{_{jsl19<-Y5gyIy)6rJS!fg`%t$n7Mm=R1!>7DkdNZ%
zNh7lV06KPTE|ENt#ETqG;n+XQ>crrGb-ih+8mhXq#k|)zb>IWpO+vSFMu{}mtj#Dp
ze3O6=bI)o>bq&zr?Ie$D5+aiapYH-aY4WhVOY%!{B5BN_AqW>@uLR?-wMTDz<q>rh
zdt3qoZuwODnxl0wc-7&B@W%~<kfXkR>89i}7|P{9%8+rB>;C}Op+e!zjbym7P?LP`
z)Ub)Lezh80h|bAmP=n?Yfy%d`^sKn<CnwDaRmdfVc;lzikQNHc(MW@4=gV+?e+p^>
z<~1k1wN!s9`^uU?Fb^Szu%@N_c=Kaoqd0bAPt;?zR1z{<LM~JNb2pY(8-Nt`wU|uF
zJjJdM3`WBX&q8|+DCI~SWcFWdzDX1(oe0iVKKI~hTHwHfT$gg>1G|X8=zg@ol8H9j
z<|yCqC||wnf%T_bY40ma(%r-&DY$P_&#0wjgf>YUDOmYv_(8T_p!cRJa<3lsa;O-_
zyl0-H=~B;R@QY|>LB4i4Slf+<rhh7pp)uTuj3<0;`^6m;V~_s;RW)LD8yh%xB&z~4
z6K_N7{{YshSVKF-Jc%NVV5}zq5IUb+)G#zM$sLGo(v~dJt6@Mr1x&LfQK|c}#z>u5
ze8isA+8)Ci!S5w04Z}tVz+$-o`Wl)wi5U&Nn<PS047n=U$4}QZ8@9l)F%@U!8z2#p
z)9Xt2tsT5cbqI=LNHM9)anR<Ed4_|{sD|V0%)`uFWONxcvO^pxAQ@YYxI15g_<GcE
zxsbeZr{2S09I~HMXt|N*l*tn8g|M-K)G!}0&w5&ne67h?rBy<^0xIRQe)ej#LK}FQ
zp@u-{eo?!q&pG#}H0`jwvwrCT!fg4N^y@?0&diSGRzxFYeaOc<hjH&t%mgpKGbC{{
zs)Edlc~P2ZlrbqBWM`rNl_T0a9py-D<rsQ@T8%A?#K#0L$=i}M$95i+a-nKQHCQ5y
zG>%{!&hp0~)Us+V72HV)Byd}4<pw&6NwoQ)VHpa@+%#n}aq0~uQ9L&6utYvoDn4B9
zUbrXlr(_zBH?RohS+}m?fhlj9{Q)$RIhIwLU7=Naj=%6PQB%AStZ@cL!}V;8A@ns7
zbd;YhmyTLTIA3~JV;d?JA}5s{lLvf6fO0xhC5mR1k~AhT10;yQb&pY+eq)v*@(~&#
z20VWe&MG)Bt}RQm7FcALY};4;SpM+OLr%cOYa5<ITA0cYmwCuz+@JovS5}r(d6~b_
z<!>x}y!^h0s2|RwislQ6%w)>8@UeVFDFyxW{OUQb-sA<E5|N?fV{-LrG8-+!DM0M1
zueCW+GyY8yN-di=2$KSX_c8EW&}Y`Oq>}D=B8l$2xKow`?>Dx4)1#ThV5ExK$yaXl
z`9VpR;kk|p&CT0^wlkQ?`F@6@R%qW0;IoY9rboB6L%G^W)J7(an*~&S%-zR5ew2u^
zw&tE($XKZxa2Nb2<rT-tK0sAe4qxP14-NIEnN?)+gM<b5GO)`(sLx<3tb*grA>~I4
z(_)c|eY{`0Xk%6fl5#SC{Z&X;W6i-iWtRtb0mo73YB!(Clw8chNdx?uUOt%gqT4b`
zuty%?PD2sYcg0T@lY2BSW3>zea5~k-E?Xfz$b(4pa>}dLKo=O#dS$X*B>Tm?I)?dJ
zbw7utZ1`isn#Qps$}HYe`7$D}J4Zq7U5=CRI`;QhwURg<AtHv@bF_N>E7Zbd*!*I>
zI6E26tRcHNTVD?AdXX_&1}z}UZc=mYk4ouuFNQbzuaj{+JckP+9E|$$iuWH4d<U0I
zvk*aUp~=fhoyR?M^sev1-wgDtNSYg)6n0~|rDgtA`VLp&^OWN2JNX<HG49%Ec*ceB
z9@ge|oM`D8Nmpb}xccYPy(7XO1{yfYx6@US$-!U%2hg6?>UvLuw7Y9V75%UZ(d|c5
zf<67}^{$j{?8ccD&d}d=M^XoKU!~>T8;7MODAP#uD&zFr!q9vRrrD!u@moi}6%9Km
z;Ag1!t$SY&K_tIuw?~dhi4P~0kf885tJXRRI*;9G;X6r3Y!_<it#p}gBrxm%HWxj<
zhQ8M?$mvsuzZ7}Zv2t(SXFX@(qRWMUEm&etEpfP2>mLrhXf4KgJQw8s4Rmp75u})r
zPnM$$>Uy8>siLroIM*jGP6V9?(!JVPDiq+O7@U)w=I+^#ZKN*dcz|LC3NNpvX(pWt
zTdNpKyAm7|)7q}V2J+h!WqROut3yv9jlgm;038i%<H}SNS3?nW!o?$4muWbC{NR6$
zSc69l<~cU)QJBci;@?`^w9;ciw5|y`3{M89n%dF<<fLCJjP4!3#*SqY`EJZ>eKoiF
zk|O{|@h|IFE$l5CL_(oLj!N`jd{v9v^no_{3$<4~cNnbOy;scI?%hBJL>K^4Q<SzX
zQe~%g00(7Y8>t)tRW7v^JDkQrRl&jQShwCX(yZNn+i|%IV4|L)yx-y<$14pQ2S_gv
z7~GIa`@YqUTulr*yxzw|aPpEp4_xt%ouowbU9nV*<nzmZHRoPG_}imtp(C`pSKadv
zvTzTfHQ>J#ziITpjKww7gruD8CoDe-@h=s8U)DTNI;FF^#3ekVe87A0&3q<x$G8j%
zaHjdC<abfQEz#`X5<h8|l1qzdZe*7(L&gpOKBBx!#a|QrSK?=q-%g5g2ydO){_S({
zTTOFuE8TCBc?rW7`^WkUw_&E483YPh(~_mI7+2((zZGVAt7*%YJ(1l`gdpygrC7Am
z?G$$`uOVX5vW#G!)ovXgGa)5eWFwsV`+8N|D?SM}GC5=-F_H2d_03<4O%Pe;>M0Ph
z#_qTW_=l~0$2O-*h4(91*<7rCRD5KTqC^}YT-M#DoM(Y&e<@67u0M;p#YthO%3mdv
zE;AU}oc{p&>q_5FF1w_)JG{P1oCO}WE=uOHfs~qQc+q7W_Q-I^c7lCPTH0gVCP@J8
zMjQg(r`oh$z?Vmvg09>JLHDUr$gD3CDE|Ogjt)W`_o;J<e2lJ&(K?doGJaMAf_{}R
zlPnPwwot{6SoIwB`c<1a;`>sWN`k-w$a)`Yw=I-#<~IQxoPx%)l~}~3PE5s?+69v$
z7xMbb6}tX^%9$&E_&JT#g$x@Q3@cV^NZL}358NQ(x-kB=TJq6jM_Y@5GlAJQhR-+y
zupK`N^RXD&N8v6smr{&YlSv?!J82A#-#RN`ZR|}+h?&S>o6lX#_kgJt<A`L=V{*6)
zoP+IAO)J}<Dm7JCQM-C)@dvlPc(p3dq^{YjNecGSqO8(om3dhd;AHltduFwEgsMK!
z2r8d@H5$A{-_J)VvFuewz>$wq1uIIRtA#s|1yEa*AJo)cjDPPVl-oxE-{s`VkCX%b
zY0U_E8r&<iu8KPFQ{JNA7ZA)Hoq;=*$OL+i@TaGm$jK5gE6+Unfc74gfRaVtL6$C`
zC{-A!+E)xpvKcxE@r|R`-kv_puNVeo5^$zR&c*}1M&#}hsRYS^_kQu}ap^_E%!###
zt|W3}VKN{<<}eO=XXq+f9c6@DJ-fza1SINs2l`cG8b^C2+M!th9%v_~Kb1<063Wp*
z6oCi~8QUXq``mUFEfkof%_5M<zF=OFjC~K*qH`oxq`@mN40je8$^P%wmU04s^9dPS
zIf&zE?N0kywjXC$QA(ZL*a9+n$faT35!#n_j_4L8SdszxPt<fZU_Hl{Vrab8JeG`O
zZ@;xxj^G{9Z$JiLY3_ZoNi@PW+YuQnxye5(gZwm_3#${&cx}+y!p>G!+|r(^alp@|
zRk&-B3tP?t!t(BzvT$1+eZG}h4YlRNK`P4d#&YFf0m<$39+hleU5J-sF4t^%OqnMg
z^G?YM<X2NX!c{n7G+{_yI2{gqRCDfsH^^e{kqxCBfEyfrX=G_7S1f^xE&&{FKHk)u
zS}8&(1yM3(9oxUssUk$Nm|yvF%mhVFBm;s^r_!7Qh=kje#u$fn9I5oC83gl3sISVy
zAP9yB{0MjTsi8>axLEf_uH*vfaHrQJ^`VJeCXCx<07fXFxMw6V#zu2eLSUK`KiVV4
z&B51zhv`v>jII&YN+aREY-iZi$d090M;^d%m|p(=)UTk$iq(~tLOx7xNl5ug_NLt1
zN@I=fr3)vTT244Tbr|WIu^LSiC4}g*ha|B=0U7QGVMW&6xhh+X1VPFF01AuhJ7`lW
z0+)*0a;X?*cgaG1{b>R7AxP|JR1uwx6R9Ty_=!D9sX|Ed`7LhB;WOp&lTM9U*d(fC
z*hobjZ}!J(7$P$=+LpMM-55qO6h(8E^fc>9jmnmC%Fn?I@|E`$G>Aw>z*bOvrXRpZ
ze0QWlC{>kVJGYS_1Yx-9JwBBqu`KgjdBzwEffQ=bAa2zhW^0>~BM6so%?c`v1Kp{Y
ziFyLcLWDdLR~a6Llqyc%Wz<1b{Ee{Sf$K;X<60RW_)9rvSkr8qPATZSztPnE#AE}{
z(vhZnm7C2*fI|o?FieM0zyJ<d)8|<uA)~h<P=j#XK3tB6-`;_epb`MXA27p~>7Pok
zIu<Q$4pD;q#rXt!RLu<2B#CVxiIzO1u9;olnDwci2?&mBhzww;QzkxH7!Irc6)$n_
zP-Zru8(?rqXHs#`_<K{Mg58T>B#$(snK1tVBxH8QS}`&|o*>9yzPxn&X`<UMBwMKM
z;*p5^G{f&7Qb$2cL0E01v$vCW#a)(7*o}C{y#^3tVr}Hil9qJe_r1M^Opv9sg3;`a
zPtCOB>x!1%ILu2dO5hyrSL>g8L$M{E3VoK~fZO*hZPh{TQ?xLum5iPF!^BTR+N&Xj
z2b(0DST0G<Nylu{E_EM26R1%b7%YFC8;<D{Ng$D#S(p&m&M-6RX$-BfB=MNh*sCcS
zBB=eo=JG=d>{M0ZpMjsknfB<#!$%(Y+y%jNk)K>svqbYE@11OfAeb^K`4>Ec^`R$5
zl(IvTc-+T<^{naj6=w6}I|3ZZ@{FnW^)*f{O7iFj2(T+T`$EW^oOB}{J!?f4OPR3x
zn34$s46kwq3i|U-mi{2wdyqn?;Bcpk#*0vjUDr0}Y-f$X-Xp$!>1Uo{Yz$>`;F6EX
z0<=&kotEzP1`-HlW^l?lPB#x+)k&6UZ9J$8lf3TB5^#F+o+*!X_*Y;_?mA?9RA~1S
z+(#QO=)+}{a9nl-*F++blap+oTc$X3CPZWqMsi2KI@B@hw=xNB=aMjgfW$D$Gr{`R
zd3@$7sQGevD!gKdtpk)<pl>uW%ZA49PAj4<5c!Fvy}p(<bzRN|GB_lA`_%DGEX)+`
zk3B#=4muibt-2sbOJ-nLf&=tEgw*gwa?S_Xq-4er;9$0U)~SNHTkR+eGpmy!4(<Iv
zl}?W-FXVirkGL>SJrDTPcFrSsrnE7x-X2VI&uWv-3gx9$ibg=OHU=~A_4Tb{%CizU
zr;(kK-IS*>!pAN3_p5M{Ez&<HYQ{^k10*s28m}Ujhis9^j2NFWTN(BksjQlF7<G&w
zB>co=6IXDyq^-I=(o8lv8&)&HCWCCys>kN0AC^$O^Zx+Xsbce85=kRfcYV8<{Gbn7
za>q1`)54+DaPs+oE<Gw5EUn}wL77QVcHo}0*0q6b%pzwSO8|i3vFZ(5ScG9!gZIHF
zu4rf$OajA<Ze!49vXzHotE_N^kVp^~05DQZ9>T16Yeu(<^U8aVHB9B?V8ms!oF8v$
zSz(&a2f0L6U~#+q-<@2xk?ntelf)D#^1QgPcXuc8{Obp~R?^4NUk7|U;JeE>Vz|9a
zXwD0~gEA4^52aD~>EYi8Y4gn{o2xy=szg>D!)vkk^{*(>{vqocQ@o>9j9e)maqLH7
zj@1W>ej)3AF0(c|qi@0x9ZolT9x5eK-K8Iy&FrOn95vJrYpGl$HzArw+{)45Mm=hj
zwoMfI$YIG%y%mpt#<lO#;^#9GpqRjL7lV#6JJl%c(dLcGW@w*s9zwSr$A6`A-J_wQ
zV~AY^wTTcMeA9F}^r@|_mtq@#o<w2>4+MIOo+#&);zhRvyrn=?055X?07`Tg?R^P`
z(bsS+RE&TydHQCdv80h!Xwux|D;{@k9Fyx)$8QvI5CG&r8^6su#O=Gw-cC<*?N%@X
zMf<glWAx>L^gguJW*;IQg&T#=N&f%}n}w1i^5RfR?%TLyEOVcFQo&H9Xw4vEcYjKb
z;exZNR*;|h=Gfiz%`sk5r|kt|A##X#C)+ewWX>DTFA{<R1BPF?{`7sGL@6YYkbv_2
z!S7Y2f?45l98xcyg&sw01os~F>ldA3OAjmNWg8YkTXOp6y%quSPPXpR%tK0<C(As5
zdSG`r?M{r#7ng3x$`qF_Km_O1)DsyU)9mWdGJLT}*dfg&y|jVUNtQw|=sKMDqQG1%
zjhR;5woru`<2~CIB1tUHk+WsX1x5-1BhsQ+<Pozf60so2PvurEn&FX>-Z7OMkZl=H
zQ&RLAD^BeMj>HF%24gbvg!&qci40zALnaYR5)L<eeJaGkVU4AAX8DP67|9s#j`Z_n
zOP!Leg@9z*K2hpvb0Mg<RYtjlE4{y#&g4b8zVYl1DaPVM3yaiQ21?B#>Gbx+T}V|k
zCglS-+`||?v`GvK%&Olaft|zed(!7u4n}6hrrU&QBaC8Cz4IP^wP+b+n|x3N%I#+u
z`GD>88LKO9+2%5Gcp|JVx&#r&wZLq?!N?x8IixiP%27t;47P+cf%q&p55!dQ+k+>V
zT~i!_<AYMmZu=huMyxY}Id5ukf>3rC8Mx{P0;SBQ0w=a~%0?DNlzqUx`kHKU2qbN#
zesTMx>PvSV)v*K3FjgcOz+oZba({>GOBJdz97a`@jtM;~J*fSeQIaIsCEXhaAh|dI
z_8e3Ei7}J_73N~&IUdz_?1>oxc`bn3j(MTrP^~x3=7GYn;EIoGjXjx6+5n9xA0sXi
zx%}!_t=ZWcJh;co2d{dR#J*{iNOGWH7ULbxDeZ1jMuItkV;CxNz$TNapeT)wz@%i9
z*mst6VouTPPgKAGV>$j1PebooG3k>uD=D^O2NFrp6OPpzTOGh7F78Sz554VJ`$J!5
z(OAS*04@?ajKs$3M;me6RN!uAQ2`qiFPz-&`u_lpO%0+kQqpA{bt4;1FWB7RT!RyT
z2!4(}o`$n>WhfNox0N!5lVLw0Q<Lvd$kAG}c~CeKxKMy+p5)e#lnU~gl(syqbB|hU
z+JqYlmD>3#M+6^wr8^1J>@quccmjq}5r_<{(Ek9meJRpgVWpMXQwldITyFOjI_BI+
zu^`^D@scoe>+4T4!wbZhONPct><%g%nQAE_J6mXG5d^@?6E8nDJ5wIjBXI1l*yV(0
zujf`Kk_IU{sS@wx#Bed|#SP{L3nJ$d4=EIV;fhydv0bf}Ma<SSC?n+?@IHqf=(tdU
zgwY+KZ5;GCs|M9o+Rfva1$QH}a7pd!S>y&SGOO@P;GBVj%{0})p<Ux;Ecw`1X<~gU
zSf`O@JCu^Kg<q6lfA#7y6s(Fo@Ww~m3aa9oA(bO%R@;Xvfrm!*HCIeYSg_t>DLz@o
z-b8DFqt=z9nnD^W(2_>>^73(x1w{@SSVt=P%D8k!JP+!7{xxrGcMha3-KYp4<0N;b
zc7~P8@<%#K7HQT502XgAK3~_=nwcX7Fc%p6&Hdp@uVy651_ef3IqG}y=}h}{G7~Ic
zFjo2Udix4|*9%ydIOW2tgb1f3x@7J2&#e)(NT4dTb0d}tt@nL1P*12uaW9(`ZmJ00
z80S28s3p7#;y3%`<xn1Jq}ZEAqF;!lExAtN`@qY|{{RXF{{YN_Y$}GzDLfP2vPIL2
zn3)`boJgc~6p>2|!bq6!+sY!g3buOHatoN%7pjo7t;+2oOAdeibr^;jWluhDEy&7}
zPE+!#(TN?JX_b$c7&`|-YFAcZ#1rOh1RVGDqm)-Hq~-RJv>b9%?vv~7OC8ZK<i-Yb
z%AUrcG2uhG5vVzlUAp}-Op)%Ti!G(iy#3BX=N{eZsD;Z>UBM*H7`a?1#$S~U?e9%%
zmU$8@r!2cZTs8|2LsXU~ga}?h`_5UhjAo^dVv>*nDo4pCKIt7n{)VfUu{^@hcO1|~
zGm$13=L3cGsU=rY<w!P+1IGkYJjTvf2ORA6_V=VlcXA=bjNEPNLG-IhiL^`RD^AG3
zp?Jm!=nuUjHM^jYKbnIfwx3V_y+may$-@#~1xUd{I_KJ=I)gDglp)+k2TXr>Rj4*c
zGDY({D+HF|SVjR~l&*cMNbfed8%T2BC<7Z$^sH-*USR4ah_F@8@Bj=u3W7~e;6}1U
z?4{cdC0y<p`=itAS}HH84zbeRYY6I=vmgqXE?K*N6_a&$V>Q8@E@LiR8xZszt19B}
zP?j@lSpumBDKW_Q_cSY*^CZfnE%Tgo9=NR|Lfew+wrD-+Wmxc3hC7c_`BV!#%|FX9
zF%0HBbw6Iz$Sjmk<}}5ZJrJDp(2ww^C5*5<rc0>gz{%RA1r?%%Q5@1^(&YK#5(_@w
zN#_HwHDpG@0Fx+PtVk}r<Lgy|0t#Sm$6ru;im@B1lb6e=0hRh=>FZ6yuqhENaorUc
z3Klr$KRWgv{<T;MguiIK*&bPfs9rES5(R2WbguEZNTb^(-GFlIj{daC9@$%J#!E<W
z8zT$#AIhpJiOCfvw3Y!2LcF`>nZ|IWcJwtEvxx@6N)W{I-D>{zh?5Cf7j8sn?~~kq
z6$8uVKbY7mqb#mDQT3})CCM@tvl74|2m>iB!H!D<{uIwH86<78d4&kxMsNV_Q?<pk
zk!B#+9T+x22iBpKp;nB<+fqN?I<_{G-`=Xoo?#=1GvwiT&f<Ad>s6+MWPy}zl|bCg
zyeaHzz+JKf8)X83gVg%_)8v9@CTZ>!<d9*CboLnSLWRZ5(lRcij%b~gTh0fOo*4Rp
zRUb+hT7q0%hDMAGZ2N@cqYB-((#*_ZP!?uFRdbP_YN+;BEha6eW}TGg10mqkQL!A%
z=JmZSU6U!bWQooW-~i2Y_r4!#vkYqMl6QtryuPE*d)Ik!W3?Etc?pk@tHAcCCD6sh
zFD=5#peO_>!C~k<s+G{4ndXN_N4P@BLXdYcIQf053yl$?4duq=S0p!52fcbN{{V;0
z#lFVV@bR_|2rLI<?tQAI?}z@=a$XkOD#we9ayei+ejeV{UeZQxnmpR)OmuC`jK2Mk
zy;Pq~+DifyW0HM;rFR$F40Fa7-Lk}zs=VZn;i^+;6NscIV(nj;GG`~c;<b%?8M-N)
zQMG8s5M=uG#WkUHJBl6!bXWR7geiE$L5>?IJa#-*UFC_3a!A0Qip%$LTf(B5&pK`<
zaXU%;C~SlC3=z{b`E!uC;BYZf^1n>-4QOUP4#U7cxisM};6pc2&N$6NF`PDeKD{Y-
z3}B7Jxg975NUs_Y$q~proYlxR1_$?!*;Cly0aR3-*eYA;KwwYFoPo}2qbCtrGinWT
zK)zVGV6Jw_8nMGKy<3-8dxb@~4LZfdODkt+^saGb!t5Oh`Mt$GZe3L2zEW}1rE04_
zq_`uZhT-lC!4=3;=57W;c=oBKnoEeBM}dau=nu`)KEk>0w@L$TIbn=@eQMM?zQlO^
z)+{3noM$86wT(o~+!;OHvq0?>z!vUGW1mq}<+gbN-f@$KIO3;k^p*v+SxX4{!j5u#
z6H#AWh_I~K^9Ly(@Sj@I%~+JBa*X(fLmWiyQ~X{1slH%P%068C(n`Ry9r^z6u4%i5
z3Y9qngPx|jomQTP_RzQXpFMwg-1KHsfJdRlOAN3W+F7T=4v2>s^fjJKASI3n=rKTY
zp@$f7GwoWeOSYsqCTKj6vIhWXCw2`WyHyM}sRV$*y8abJPlUv(3iKG_m0gjPkQ)O#
zy#+UkxO+17+qoEp6nuaH!-6Wa#1xfWE_npeZ*b@VP5}F)_w}cFtjb2-2qm&JpK<9)
z%}6;~7|9@R0)=jXjPp^nZyEW@sqM#FvhqaAiyS*wpg?|au6xrRBEv30AY|kE)Jn{x
z*;tOPjGsZ?k+8h686U&xPmqUg&Crf;F`8k?UPl<~ST<0BcKoBc;AWQ~l6rB*D8_I{
zPTtgQJ9D&;T#Aqy*x=_F@99A0{$?bO^rd=W@!FFI05=|#0E3Z}oc(D>UcC3_mjv^W
zdk<O&;~_};&;iCi_fJDX!0G(yaf8ZW00t=;TX0fGBa=^{4agZer6i2=kLy4khk9Qu
z{o|fGWKfmBOlRd3eBE)*G0iz+W%*nao=FCfugV*)dt;>*b^*KrkO&8<%_u(HQV`k5
z>D*H7z~oW@0Dlt^p0v2h+6E3O2*K_%NOPPKMaN-D1OuK09D)3(8P4sw_M@Q20pfv*
ze8N1kN2-ic1IWPu9so3h*8p?Um!7!qz%&Oy2aNmkK+kOT=QJq6EEsS&2dyFGZpJV=
zW`PQ<RkA=hIc)d#q$8d{B=rK6=VAGBd(ve6!x`hgC;?m*;h1nRK9raXkXZYi^rgYh
zI6eAN+m4?~1Q{K8;*_3w$<Kb&gyFG+liHUca!($nfC30OAdHNIOO8N2=}{XexFfHn
zIiq-^5=e{}_(<+(0gMiJ0yEGOI?^2VCZ&y|*wR1D#9<VU^&2QZDzGH}rh$p-2|rUn
zRvkg1cL&P1J%Oc=y8_F!7W>oyigvbDIrTIvGAS72)X})H1$iA0(u^;mJbrWlstUNv
zXVeqYoES4^MZgD;yk?uU<N~?%q`?5?2n703b|FVX6)-)|N>$*I*@g(kIa`oO829f;
z>mk6wC+Ygr)c~n8hCtx$Q}U8}QhAKX%Ffs)lb*DMDF6)PwoNtNiOInu+Ml$Sa3m74
zgRr(o=}YHjN!$q@p0yTEcOH24pa5{&N3}IlYp7Wh85!SsVlj?XWAmi*aEw(LK2F>o
z2fap1a&ku;QugKf#~e}5JMJ12!7CvlgAm_&N$*elWV3A|aD_S^_^Rvj;eq*-_0M0W
z8(BjXLy^hI;M4Y#wS{C_hT<sXW{p@D=ub@dtvxHmciMc3G#Z7>O%MTmx!N)?bJa*7
ze>%jDP{#=SNnBx$XlW#PzyzL1a%vk=TA`ms{0#p9f{%XEzXNVWI%kdUF6>!?#ii;p
zJ;X7OZO`(b_i>*7qwhc2+x`ph;LE6^(tbAR(rF0E9Bp+G^P^Wd`B}Iz;P*c%1FvfQ
zgcmYE;|ra`C^7le(O)p~!iFy{;Qnd(eT{iojGqIDyXED5)}QbSQ<7FcrGJ9ow)eol
zjP^0NgZ?7v*Y5ENQW!2(n_>PSx!sR)F_B)iWvuC%>a;f35y-2J#QXL&{IU3F$9^&J
zee!DF67i;|rrp6WnQwPvdhohGate{gI3VyveOLQBf5B@10BWy-lf!4@OS^9t>ClB=
zGVqvg6?zr(21E8BuqUsvA3uu7^9(#3s5Mdc_+R-K2}b&#uz$5b>|5~D<EMo$VAOP2
zbF|0;pe4!SzPZhQH-EuEzhG}0{>}Q#nzf&YLujPt&h-?Ah!e_4zrt~h9OHwJLHalQ
zD1X6q{{Uv+jo0ybXW|6U;cZ}UM}u2<k|{sBQc&1q)crZ*lU(Qg6%Y1;_%q{whPuX_
znyroO*EVhTOLEI1v+X-rkb54LzFmvQM-v(~V%JA>RO!V>nKSWH?V(v(7=vMdilHS-
zc}zwL$QbB-YDrAe-c0I(A-@i?4Ae`#2J}F~kP8ftdivD#F<?;{{MU6Xsy3+a^`i_O
zRlaPT?OyZ-XE=^NK;$3d`ceU(x(_2K+M8k#iA==z0kFLB(><zdaNvbgjGi*I#15nY
zFgeM<=A4PJX9bDvifeE*Z6}Re%n+3ueswR{btBTWZS`qw<hO!5n2dXipa*dW9S^->
z2^m8pFbd1`=hHPR-I5mo7wV!l<QjG*qoumk66zS|hFKs-Z=J^se=gNvYo=RCGkl31
zx{wN=m=oXLxr=LwrMzpafW=)vbq&O1arFGDqTx`<B!me7-2><4VdzCgiLuye+QpRC
zqDxE5khb7SER#w>2RxJQ?ONJri1g7TNj%KHVxK3RBR8#bFl#f*ZoXiNS%7IX7Z2=5
zr?o6vw2iQp4ywm7fse!3RJf)WXQ1dB%+Ou`0HfR_pSv$3F#iBk&m;rEJ*hPR02EnV
zD$Z`as6@wfP5%Hb4oKkk9`(bGeSF}_ex_5zagcVX@AW6AwOX|C46|IT!*dp1FDb2N
zh-EqZ!1M=$&1UH$xtZTsc-F}-$cfpb18a=nkMXG@*Airs?p1RNBQvUf<iY5mbv~Hu
zTm(9*G-V<Ug^>A?$bM|}BP01$^M0`1ML4@MD<BX+tVbiM&q8y>OQYD9?se<0PZPyw
zsZF}(UR7E!8YCkiHZ#z7t8nVMlW|!IAS$vq%5m#lmY=PrqYT@%2;-Xva4DAB4g&7)
zO4{AMwaUQ){JTT_o;El^-=ALQvT&Bf>UWlx&vUup4Zml|&nF3v_^GY67_J==W(7-a
zW>7#F?_4Zev5gGUoyy}0$=buO9>3#OB=IG*MmS}ak;`vF&EFlr!l&6g1=-$5uK~K;
zFxU^@$Mvbdw2j4|l-KdXi0628$zMZUOKUF(d1sN1QA$Rsf<dd1>oY7u@$~D73lbxV
zNCklX4P`2J1liUdS7Mf$QgWDVoNmWM^!BS3daSZ8W+0>e_g+5`MRNAq(n%)uw|9_^
zM63?ZKIs$<SwbYUTqa|cvl8$lC)c(}teh@dXK`h%SgAI;WD+wpTiN7(oc+_Dr_z;m
zd89DiU5Nw7CiszCgl?E><8=LWPjK?fbGymHq)aeK&rJUS7xS%H^|x4Lb%Q6%!QFr}
z+cgfHknWk?TX>GytYo#4<|x479mYsw)Mv4&Z8b<{o;PcGCv256B-jgq(2qe}L^`#^
z0WO?;?G9sw06Tqi*q?g8CbM?d@jlTS&B8LM8%P|J_4TF5>^@X>w)cie#+cGZ!IYVp
zXJ}K<{d-pQ+MT$wisA_fxM+lNDh!Rlb!zjd^_e7e5jjOb6ob^&`8+}`9U=Q9i-H8q
zI3;oDf1O7o3mwEds*<t)0B8tfP(1y^s}c8e{VPg6VnESb!JHH&_MW5OxChmso+#C2
zV1t!!Pw^(Sqtvc$EM<lZIUzd=$gbHtdp3WiCj?HXekS`WL3Gmy!wwgBUMkdDv{wso
zw&COgA?2dU{6oHbR}$CDbk=3sSGTwMR}Y0Rx183UuB!#Kf=j6aBgeKR9nY`5LyFmt
zq2F5S7I!g4aut>$n`U%uD-bzW^&Z{pR^P<3c_L)QjU1bnbps3j$sMbLu+=TzLi5Ve
z2LNH83VHPRtCrf#me-iLNf3zw3vP@^C#XHWjdIG8dZLu1k3-V+rJ34UHm*Qsi2%#}
zdjVS3nxnyRvQ2H}8Bn$xA1NKjp{@%|*Dhk3UphES;C%6bFiAXB@Ayh?X1R{Wc@Q`|
zf|1YD*j6qwMX4rt)>qLnTS+pBa4?cHbv@2&Le}k~i*raqtCew#?j4A(4#Qr%Q0;m=
zvV$fqoju2;YH2#mp$4CCAa+*s4o*o1m779#JMRzbP+Hx9w;Myg0}tT!JXZXg(_Wm3
z2IPE3QFFL-#c(z{%#y2>K#B*-T!2}-{V`hFMyo23YkMLisreWj0!jXLjOpE76&BWq
zV{JU_t!)~WRei)V^d6__T4}1>Np$zEa*>r(#EQRo4l!J=o2#r-eU@1;<mH$jmj~a{
zuUP643HGrL$Vo+3;E!LWLcCE{x!YS`nY7kf9zC+L^Kfu+>^oMCg~TcsWy45=fceQD
zy?>o?G3!DJQZ(E1E>7?0eQR>ZRS}4!x&Uwf0C_9#T1L_nR!2?!p=_J5#BJeu&tK|l
z^}X?#cRG+lfQirydi&Qfb=c&(XLZ;Dfg3OzPoN(4tp(I6Y7r;IgXU<-%PODZ_a35$
z8wW#v-&DD}wUS$CocUmeQT)wn*<3`CM$ya+fAY}dkbC~MfopQ`NA|xoFPONJR~Q9H
zpsU(!?)R>?$8;|m`BKQd0(y_H6)BNtbEPq#?F9Qg;XJSkNh0Sb9V?@@)gCz%D#nG6
z%%E|fUuxuSF0K+#ld)!08Dh1gV{l|)hgRp79V#7}YUe`NR@#&@A#JW73Z#AG>-4QF
zYlnDznWo<AFr&6>m5Sx<<Yr^AGL5WTsrIc+E_;|{Ws!jnzb<;IJ!>}g1F5#TMQG$x
zlA{N29C{kju_EQmpd5N1(z&}iXNlE|hGH-y2ZBGww=`X1$`j>W*%;&Q`+y>|sU0qa
zZP{F$Np8yO#|LoZWo~FbExgh0qqn_{CW)Kxw^3Zr_LMg<ZjNFy-AC~OS{83<e{Q%|
zSwDt0Jw5A<rE^s$vps9W-X&YKA~wQfA&*gAb&jcJJbp_{woGNPdXHN1JsS4+Nm7nV
zt}q#oBv(<O_@46E8D;_F+r)#h^sXw@Q(79rZEk*WUFeoK1+F2LK`XjqdT#H>tvw?`
z>Y>Kf7!1d!tyGgz5WdlEf<W90XK$`(x7Dqg#BxXH7G2mu^5VZqvOJr!L|MllHxequ
zPSGSyo_@5(QW8{BrGnsNocew>R?_EEloK_wM*(tTDtK>TJ!;LlWGL6gV{<7`-7>%3
z$8+yZMKNB(wm6jvgOEX=DaknfF;S{dB%{mOAJ4g+`W#fOK?S63nCe*l;pt3y3xKW@
z%g#cD<b7%Kh08EqM9H|i5a%)=;~(NpHd&!XQX|6*g(b2_)}ym24DE6){KwmvShvcD
zJx8hasBZ3VRle7K0ERf<4S+J^*B+GgAW35}nIN4)1slYe``PVJNs(ff9gIw?hGP5=
z@T%B%mG;lMS$I7_6#S|qTy83enA%Tq)X|{sNcZu>fY3=J9yg%@N2cnv9l*KY7uoYB
z(85FjegsumhnhUwX$z~21XbXA=9VOwIEEH7x#9MVaC_s@mns@;Ep4Q@zI(R;${cw|
zjE_<2R`UX`$fr@b@>r9MRW%9;W}7E@LECBXQ(NjkW}HRj#>*+&9E*%8@0|Cd#TR8*
zWeD*(X_RDb90To6dt1CXfCqdG0y)9!{{ZW%(M=SxZMM9Os|~#57~3Z~_NkU=UUdt4
zj#ml@>OIf3ARMF1kxE*-^XvD0%|O=iMlcvFJCgD?d8;uSS&I3W7!4snv9=6{*Xc_o
zyk0{fSsOoegTVEpKr-;|lLzaZAwB&n#Af1n<Cx8Y2@Ius3bz~$B#pID1yB(fedFBJ
za>OKg86qqdGSP#{^~azT?trf}^7&GQiP=?gmHWi^6>>Y3`$$2zbWy2Mw}3I<-`<+b
zG(h<-7b%5ey*>TuRydHz;zkWBjD{U?{Dm<#NfaO~${sU_i_31ymUYi04*2W%SDE~E
z{gM6-{B`i``d^7WD`wJMg2{LW*D`+zRv$8v^{+_%!Emh!-ybg{KP(TYwM!NFaFMJA
zQ18QxVLcDyN$RX5+IL6fhwWeg00g-4-@+YQZCBx`y}i?=V=MXYH$uO}fC2OKj2<}7
zNw1Y}>@MwfYppU}F5<?0DD0Nb>O3@W&!<v)=eX%#(FUQU=$<CCdoK`ai83<omLr1Q
z2;8UIzE}ONzu=gk4}LORe{E>OI4@(&k;|t?v6&Px0r7(;B%XS6RR?)k>!*n2R+;$z
z-drFwLAC>vxN(#G>P59OzR06I0M0@CgVw!c<M-^J@sIX?)ZW|0-W+?)Hd$EPYPL`k
zg>X*B9PMlj`h6?Q<9OkT<%||Upos|ui0icD^Q&p3cR|K#@hdz@`^%F9?c22#9CaP>
z?^Y$Vg)Qyp-pV9Ga863F?0&Rd-p4e)WPVurHpb9_g(tti_|#KgOB=`X6C^|CU<MmL
zqtsST?0O+gE3gNFhFJdbcmktl-4K>J6_?B?RB}{~{?sgv#0PZ^l02sVA8;uh-eKm)
z<+cU}&NovFkCIhHC>)dr=3+S%M(G90904M*krjy}9{#lyGe-=jZ!bJ@Pbv*2@flcF
zP5C*&Je>2#r4|+RCbeS(X>QG!%<m+PkDH%E+LSXWEEJEN><n{(QNglC^5)z#&QSjV
zoYGAiET3ibJne&UWG84Ry&Sran?gf0O&Y}|yt`O5Vq{=2PdmT*)X}ud5V(|)AKwG3
z0n?vKNXx8|N#!tD*qDgvA?QK%q%1ZQzvcrVhUx9~rjr%)1y+;Gj#OuClB$PqUs^;l
zvvL?II4p6FJ*p{Wki=agl>h{p3W9Uoij=aF31C`9!g))C?el+)Sgx4cg8+?Kz{Oe0
zv5eq!?eA6E;mf#^%1x2S`?hBX2d3(lN##gIwbjx(#KnV@!C$Ya^fgJy4H)0l<#I^`
zAL0kSX-!?3%2pyWAu+7d@w}FE#s~OSVdk?E%f{oim!bEmrE=`wI`W`zVZxt(N{!2e
z1jKMp1$r9kS{OFO$p8c)a&gGyQaD%L`@)zV0}+}=ZUYtydSRQWrkBPD#w6n;bf<6}
z$YuZrAnxP_>OJYqj;AXb2u=a(j8kHS?q4axG>^1xJc=D-Nf{G4921`X=>dO3fNFjv
zv$TfY(l?n^f^vF{{x$X|z{?lSmdKlG3`uSi=0zXO*T-HFGsog9Nftt^E))zLFv;!j
zUt@e8HW5!|ws%H1-T+x7B*&66823K)^tmFnITuS>$seQNvaO7k9}VNYyOj*LODe{K
zQVdE5%KZCdBiD@827&(ow{3pb!sbu4mMD$augrZbL-u*G(JlTI$zg29=0c~=edKvr
z=Y#q2QEAZJ$>PnrAVdzK7FpLJo3RJeHPco%sU&(3c4wvDi_2*3ZLQG+X4`a5tI+xy
z&hnvx31+#tGaoFL*g98B;wv3HOw+9vOZ~TRZZ|5nMsdyuYUQ;F&9K0Ywy?wF(D$Ma
z=<1AK$4&6wdv?+8HArntc!`3Na2WdI-oAJL0D^@4UDP}u`#;>rr{4K@x1vb!(eW5O
z9Qyth@4gso$n;qj5@w1pRLD3Z+upt({{Vuqc$RJ2PlBMj00HJnZrx-!_3Q?Jm1T@^
zSZ98yhb0z#Hw~LEq5Y*0V)G#LNq!i0$zFoCv>O(b2Uz9X871A$0uSnIJ4(}Suh84P
zQW#9T9pfZ<WOdJ|;<}wJ7ByKVgpl8Lj|;SMpM2uJWhRw~OH#r|DVhtmke~~N1Y;xn
z)lX5K0y$~$p?`K;IQJ*(R;IkQm7)m$0BAt_nn;fTdJkH~)%8V?&ux2YCPHsXBgR+I
zVw<v8WfU)O1Xl?o%;yi1vUDTc(z$(7<^&SLu4Nm~l$)^1N$z`!n_Jf-W>{L|WQBUU
z<oj1YsOsk9ax9Czc|eDjYUQauZ46~3h&2N{zAc=A9z=vMP<n$@t<npFn`FZ)WS2Pv
zj@b34T<TWh2`=Q6qTuCA@^RM`w|6njkq9Ikq>nM|UV3%nx!SpldX_%ME+tk{{%Z`x
zOJ@XodsSPT$)$2`1ZH>1oa_Nfs?y!dd{v-*vPbhg;BpXgfIFQ30G=uVGYM1yy@=k7
z-5!ox6LemSSKDSSESqD-SUZK~f$V*%oy5_=*hbvaW9G*h?@FtBAs0xll0VAI>ySXE
zy}B=#vT)@|FYS@jr>z!1^%BNN*=2~qEN&Na0>cb5$)-hc%_B^#n{)fML-&WT)}?qG
zaEx8Alvpv!Ww{)JX(G0@SU`CWOB1;|0iK^)VP-MYGO3N&#6~tT#!szFCG^md5118Z
zQRXoi&O3X3Doblg+9M=PyBH9g{$tm-y)1AjU$eR$i2H_l=eebHG>DqQ*4lXIx{%Kt
z*kxsNjANq;u@XlbG_a#7$L`A>2iN>*!P+Kd@|E@ye4~N5A4*}FN}_}+6|!J2oq+Z}
zw4K<*Yj!Nrg3gWx)=)s*+)*{G@i>jG%N7`AL6C$D{uH6Dr4q}(Vg>!whF`nSC*GkS
zXOULl?PLPHFeicQp5~gk3dwOT!(3g!%B`|BaGa1mJ!)&~I3ji$bkYVV5*be5K7yfD
znmB}8<Zz?+V741H@eb|I(0=r$BVFGwxgwYdQh5x*;@x3Tqjo^t<NA8i%a8=FKwmEg
zCS384z4W3OKyft9mTV4B7#*qC){@D(FsETrjQ94>VM^$B6U=crw~k>T^2eCtmDqa>
z_ok0EfC>nXJmg~-KJ@KBPrJCck#8dj#?(d_BzxklJ%!57g{4;kf+RTp9CatXOKA;7
zwQ`)1NbxG$OR=5Lnn=kb+tQyLmgyjQGC*uJh}%lz{{XL60>*Op4njuQQH&6Cjy-A^
z<8@Y%)l?EdayTPBMJwDa(IOcfMH(EHkmD=&SoHeTGQ<NF@`{85%vRur93DGSzIhfo
z?c-u&l<#0V5!n9#N}gDL)KMe2{o}UjocbCExl-R_%wSh7Gjvkf03MZYNaB2hC_<np
zCybF%T78-=QPO!3NYQ~9-Ho`<IjN&DGMM86O{y5Sa;{0_eJM6Hv>9&{rGC>o0UEvw
zFIHdgQmhUbL3ydHtt+?h5q9kzhvE8Cw2-aQGt9BDUzP?tcl~{-(YKp!k;xYAu3I~C
zzdf_*NxKas%BK^CiV*wbKXB*f^yj@?H+Z;c90;fK)sz$%C#D7|r)%ED3&<OhfQJ|!
z=BtDkBy2}nk;&!q2fYec9jr-i8s<4(H!L^oD90G*pQR{yQJz@lXj~=;VVnWpqn6X`
z=p=zzrG6SM-+8@iM2<#(HQdPiHn8kK{t_uRG^{i{a`}cb${BXDllQ*9#-9{U=^eb0
z@}!k?IKcEcrSeugV=vjHmk7WpU^3ma{>ZB`S(|hc-A;&J5XmBsmj|{gFW96-8wPPa
zdze4U&l%57)eM`S1Xfj#X6zH!9*yd1+d^Zu4$=8xi6~d2bIHv^wVvQC%!r7i{c7Nl
zf1M=kRkSIKQ8atyomo_z1!5I_&(@@l)@Zid9pzcP$dH_X#~hDNgY>J`_Dbw79z4ez
ze9)=EkotZ!*{_;r0@>9bMj=(>2W~%v`gE%1xVceU(%v()t`SQSx%zJYl^Klz*vfx*
zlFnO(K9u#EB?3gYlPvgTE%K4-J?NU_cq<z3Mr@9HamlBCqG@zAd;_6J;vI2p(@_!1
zA9@5iVS*1I;a>T9r_9kuE}sIc1Oh}{0E4*$w>9NI2sEo1o?T|*$w-U`j!4%GyLyq1
za%<Fd{Z3gRM=H(cDDtt6bI@1od>4ZDSO+<+WvTNSwO)Keis*D66r1}B`U{&FQde0r
zTXqVO&NJG+viRlk7g6|!`ypw56#mDCc$Ro4m<2ndXo(|hcI4#x;~fbV^A4l%=f{2v
z&}{r+tav8l`!4V-{{U=>w-x6Ak=Gd&?w<~I4I|<&!ONX0E59yS;xgb#jo#o2`_4*r
zZ5b^Una_rb`&*cw2kq}H^z)}^cWrW)s0{FsS7T$4)pNp4;$H-K#bmv-V3yOF#4+b5
zp5xM)@W&0VK{brBynks(Wl%=Y0qdUTzMApJhI}u5VQs70=rP;NEuzPBbFdQXI~K)y
zv!{DTIxp*Usv0XZe^c?Mo$;^X1%;P~^ivi2xsFoc1!%~~BO|Y-IuZKi9}W21!r<wi
zF4Bw+%31|gBY5m{RX!1<{t=2;W5yFdW@aNTA5cB<T_=ftBWvC~F}|vsR@M@b#~2+4
zQ_{I8;pK*(Bo)^8JE5$3h48P38(z|;yRmr~BA0lgOp)r`dRJ5MwD=CoMweRgmx`gZ
zu+vscneQ%T2^>g(vpX|z08mdgf#I!g=fR#FyuR@N05>zjK*$6kKA!dPU;Gsh;!nh%
z4#8#NB)_@SEH${AOUr1cDkY3Em%s#NNh5dH-oAT_ahQx2QCdma=#%qjW)?K(E54eZ
z7ykeSCjF|kuiA(9s@ME~;5hN5>FfQOqg};@Guy<>Ji<GMV$8k3J$hrptS((`q-{b{
z*Ahjw5VkfR-%cryX=5zv*3dL_tDWS&BXuW$2e<fB5f{%gmMbCo5;p!Ubtb<6*;wtA
zok{aDS?7utQz?!h8w~7l0mpxOnM|@Vv@w=RR4R>wjP>TKJZmHdX~5VxL^#V2ao(pg
zxM26iwnfW49AI?M{{ULEX#ymQdpRVQc3Ds&Y*C(|cK4~^SyEJF*h>EMr^>$dQYl(7
z!f*-5ZgM?EB#Q3o56(;QS9UTxXWFIeGT4#kCU_-C10GdI<>R;=&S`EW`$W<Use&}9
z0UJ7j-#x0MUd0S0rN$7D+kc1DQ=qw6?WAcVl2j-d5!4*__Ni*XT1lSh<!$`Zc=E$w
z@I8A|)S!&ByF}9E7CAX19sRvCP{PLL!Xv^)-SVuYfXnElbCc;$jYxyePu|6C)!DK_
z^Z@6sI%lsH3<X_`f*~A$9Q=UtLG=7-@W<!Kk=vcK1<Zz7e&#z5dV_p`G~!m0RT+tp
z;ZLA6=-{39Fies2VFpjQ_cT}ugxlg5P>~z&K3EI#F&#l4tw$}wMLC996utv7L9`tA
z1MAwSg;VXzD_JtaxF2WV(~rDQ^P+2b<5^-TvkWV&h<azK8L4d|l4WT_$rP}b0i{5p
zF^$XAbJ~dsb=c7u-UGv_z{jB-&%I8NJd+sSWq9xvN{(^$rx;mD#4PN|vM>iiKa1%~
z=q$>{GaItX2-<<kPebcWg(MdSIW44BlN(r(maDc>T)?k%ERnj2M2V2e>5or(fq+Qk
zow7<ZNLz0MAHoNGdQp8s+7ZZ}Oh~N@#UPoy;=~no#z4pPsN{UU^U#blDZpRCmFEG3
zvD_eeA3U6f80}HdJaGc?!oa3C7i@_e*mf03F*_0=w+G6cVlucOo|*0_xwG<Qiby6|
zp+@-~Nem7;5mk(_h~y5rk+_V5z&&yKQ(1z>kLEVT2h14c)u^#u7i^@K)+r1Y%rlbv
z#&P}?9nz8rwcL^cyKA<8Ue#JT5w_f!B=Y*U8v&GcsjjZ#n93ZlkmL7gI%Dfe#oTI1
zqSTKaf=47*ahGAXQ0t6w%{ED3^3np|E9A<@ff()2eEL-h=TwO|1!oPwbDrD}dIaDr
zE=z{yL}AzI=qd6rQZ0v)Miz+}1dv#tf8;%>7UYQ-G{QZRhAxAGqm9GbtFtL28F0><
zRY}17YJ_o0vPz;xWp%+FIL{)fLgI3<qj`7dt6DVDg}6br<6<yBy`Sq!bp*P(2{|g5
z3fn$W#~+<%ZSs*Yl17A;R?j4kzlBL|p<QQrLv9~)ZZY+z$dV_SmOj^UEJx2{6m7sn
z7;X=GY{KReXKaA|SSi||bQ$%hTgNMt0g^NFWmU&7><_gzd4RSCPGe^M>IUsawE+?~
zSqY8V3lEztPTch(o%So3%t;G4&k6w~4EOre#oeX5OD4%0J%ej2=W#u%)C0*e&gIlI
zki2x`lk}$Dfh0Ee)@fx5k}kyqAqL*u=N<D+pGroE3G%$>%??H?#E%24s|<h$kUL8l
zBsZ=pv)--2!Zdj*6mL9WcQpyfr^+d?jU*{?APMDyfM@3S&w7wR$Vb{`5#$Al+wPIr
zRVUR7<rsnU5r*TRLG4jbs59Fbn?6<!LE!H0N1&?ZlNHgdvBp`_*~2JN=9gYozP*Jf
zotPcuz!Dw5Ai*Seta&GvRY^p0FqjOOn}tv~C)T7%t}-QZH*MP*CqwV})8u02M%Ct}
zX!9w81daTpSkC_dnfUvs-m4_(5}z&|g-K%@9OK%v<Zbe~+w%k%Qrzd-gn73r3wa5~
z3l4u1LV&Jb7vcvK+HM7oCC?#y<DQgBsoX4cZC&PY6ut&VDv;SLtP3{cf7Y)|(p!{8
zc?7|iI45c74^c-duw9nk?m#!?R29JT&}C2f(>7!TmPC=)=44!q1K-@!8dxBd?vrw;
zQlt;RpXpCs;#OHv)s;h%>y7G9@bTK6tRb^3Ner_+%QHRzLU{yw9^7`OTiMAh%WDLo
z9LNeWY@T~nx0WW`6|^NHIc8a0GiMki8c4)QQKSGa>~2$neuvhJm0(1g0%D(gVT%6e
z?>Y3VL_~^ZxU!Ihi*!UEmpw2&>MYE%hc?m!FUki_KfDibb5VKmqBM}o$^iLQxyyIQ
zr6Hz?C0od$lJSrgkN!RFi05~?sT~4HsAr0ISI98~lq7UD9FwExY%j`!81z%`>S`%&
zhaeQo3~o_^N4+}*(k(<}`&0$w*&K6jlOvpC`Fm64xOgv2))zUqm5R!UzjKbcsw;bf
zpS;M7e4k%`T3GJx6=Pwr@7#`vJAZrHmngZBVTemWs^qC-vPLH)_3KQN&4nYl`BXDD
za@~08imVpyb!JHwe6VtHoM((;n5``9ByRy%jR7n<2iyv3A<RnCI;o2#QyDRl>+eY|
z)VD~<H<qCMqYJ{1!k`K_G?K9;V;k~#$EH1L_Yt%&5*0%msM;eOk&cF+DizpYY8NR1
zjdn?}5g(Q?tDjn<e%G?(p)kf&WRsI4cgL`)q_=<|XjPH>G>%C8MMm+?6A_@47a#>(
z0Dq-YNfPeJqj@8<SUmm}$zWHL`1(_(QMut|V!KquJWaqSs3M-rWDl70g&iHcFSog*
zNZ%ku8GYOX=}cPeB1Y{Ac+?gojIZ$HxTnt(G~5L)(R{;i0Q&n>keOCZrVx;-0LMQu
zZ2tf%lHy5i(|RCsTWhH6idK`@dKKfflG-TXkojUJ$jInVeAR_eu=xaU*napt{yw#9
zNAUIQ$^?-}LlPP}56zEXYU#8;g*uk416~LuiX|Zk+t1XTSEqx@aoFivoEtHzUY#|o
zIJp9$4<YimXCwe}D&3BeCCsW2ksASq$1Hs-*Zd{>IWt|0%iAdBNBfYUQ|n%j;UC%m
z07{xeadD^ZcnC2>BLEim^{=eUxEC<QMNX!kM>O%VTO+{q{{Vzi-@y#6Z6bhosB|Eb
zc+a;L-1u+c6Wzq7<g`$;0ks#FIqP2cYw)_?Oe?6(YL^%vJPdyC)BG!YN$|Fuk%FiL
zk^ZcXNc9!^7FED_RZ%w`S95}{GD&LA1H%6R2=q-RNUm2-L{`GMWyb(}S6gG?YfC7M
z^J!vz`BX*ub`M(VVbG$t23ZujJOn57t;En=qLx1}P|6E&&tqSrV7O|8Y1u~JN1am|
zqVze9JHye(5fR3600Y!}d)9`N;p>RxXOa*VU#kuWv97AqMS?Wh<(z^D!K-oUkV7)P
z)NDw7+ezWQjeRW)u8j!ArFM=9;wMqFo`Xn)Myhd#e1dt#YewHewivm%fPgqnqXoUQ
z>6+XYOJx&WG9m^WlsfXG)830Y+E|3B6_uMINZ=n|YV_eo7QMAG_phl|4J_N1x}7&W
zfUFsQ>h>a~x3@rcTc!zYh6nF`YGGv8On=fDU5-g^m2NFIL{(3-oP*T{0IfM3H7P6T
zK?Som=@B?1<{gGQ)V8phes3({zUpJ4^{ogkp@u+>b;dn9pGu_Kj4+AiY=j2{H}K-2
z&6+A{B71vPMBgk#79?}ghox9EqOJ)*2MZoK{Oc}z^8+fZq>iXFp0!4Ob|`HePI>2J
z9x`)LcPr><pw*4nzlfHTU}Xp9Q2o8VYdY^$#71XjKp5fMq4WZ|O>^P~nWn~*T}lHZ
z9e_7n`&XQNMg606iz{iPc|h5M5FeK#+PP|1p@)NWdmSo^x$4@ti?r=4b;bUmxIze1
z)Pva9oBT!npmdEgDJ<-!g;+5$y1p}?TKVhZ5A9PfsWgH+g^o1=ayn!Bn(^Nn`2PUK
z9wWVy-7k!2ISvO54?l%`9(BjLegZBu-!!`;zLpYF>GM5*;(zT%Jjb=Pyez?pbCdFq
zOpf*9-Y58{;vW^=JP&szy|Xw7;j&NHiou@2rM)jKX&@tZ2U6bkcFV)fB$1>Ap^%UD
zt}_~w-xc{DamCr5X(pVl9?0*fhf(RNpCalyozaR}9#5MKD}VtNYR61A>l`sfvCEZH
zkCc1X&98^n-YDU@QsEn!l;B8v;C8F_`V=7fLMAK0QX3-`^3ts2?)5sA7GhfHmn@$=
zpg5Q3!tsjOheQdq#TMeP!w&p<dRD!zm%lQ3VM2^5IQz%ewC(iOEreWuc>e%)rOr&+
zG*U9G^j|59Nw~+fY$RhRxHY3~qIqWwepNq}U4?D!a$y9oLXL7zxT$W$Zi}`v<!6$|
z1x-$-su4wH)1ii035*z?H4*doPI&}=RcaKqVIY|U2O)k#gY-VtS!Qu^b^v$)vks%s
zQ<_5pNfE-TsPgmNlg&f9S|aVtcCpH-X5{U`=bU>~Ikt;FLgR5hV-H%VE!Dt~A}$XE
zl6!koC7hU&Xy!~YZK``8Q&~!BAh_uz{n>SdDyx$&I+ds-)ReH6%?mC-`N=pR=e<|G
zm1lOAP=08Fx<<rj6;I2JS*HZ;Wy3c9nEqAg*2FaIhG@2+WFBCSLU;Ag098q)FC!Rb
z^JCl&M-3VDKjTqH9_x7`wUwA`&gLf!PhmyTwSBsSyArtG>eyTkIUVbQq}+ga+agJJ
zTaAoIQu)SxYAhs{ij8pD6R{(lvGn#86WkFQxEN&UtQQ~tx?#JFe1{+_eA`<%B!4>2
z%vVLbc_x+FBUZo}EW?GTw38~Nu437ovk}S1@~W*MkbdzC1{`6qc>Z)OhCwB}AwcVu
zc5WM<KoqqZZWa*|s{sj}!FObH*ON~(sg-3Bx!AdmFxcn5PxY#4dk`;htbC>c2rbAX
zu085Mv?7y|$7^IMIsE7q(W4u)VXWdUv#fGAAN_hs%gSSf@wvAEycIa=4Q4drSBg0u
zfpg|ai_;$8;Zm8LuHB5G510pa2l&2}a<Jw_mzE~9F4AD5pWUhXoqcoOsa@S7w2=v9
zC6sKFcLR^olXcK{xp&?`$W>enQ(W6z?v^=NGY{P`ae_xsN2k3zSX|d5T}5ZPSQ)Y!
zFW!O1M@%2atXmUtvMJ;#xRALVg&clAT4N+WT8pWXA)Ueu4ng(LZ|h949!$p9QD>05
z6pli69A|<(sR=e3iIL%G>=-B+B3`Tr>J2*FPY=lJy^0O0$Co|NwK6oc2`#m{Kge*?
z9_KwOW|3W<M*!hhU|&(kAB6>6I$T9>_Ju~>n8+L+IRtmbO1oMmx{e|c$W#*D2<k`H
znJu{(Smst(#`IMj$DdPHBZPzIwjX#H#{qqKq`@{dA&Fcx;!Fn1C~RZUibqD;(1$)z
zJDeyPB>JAfRf$kEFFdcmAM?y$oOb*uktL0TG>GMwx2L^D##E6>^4zBA^N7lEy8|aC
zoJX9#Wx4`gzIe*uE<1x#vX{hZAlMJ@0AJ8h^WGQ)cGlaAWJw;ujC%UhxD1BgD3|27
z$!6uZau2;&w}X2uVjuv{(s&s(*pPY32hN*+c$nyW;MA!S$TrU$i^s}(epsk%Xl1j7
z1tC=qA7I`x+3)yNsu(zxK#UWD3TGJV;+gxD4>XaO_eK^$o=69;6*@ozG$tqclc;?B
zrlh2b;spS)jhUlz=_<G09f<z`15*N$y|lk&-H8b*rv!1;jaf*QU}RMvD`z622^o@0
zNaqOKcX?!TNj-DeQ@a@w+xcpM#5RI*amYQvJ?Rn|%b6yGV7@%0JnjDQ_o>Wb?aBqj
zWxjQ0=RL@xdE@(L%X<SHXo?m|ToWr}o(Dib#*h&$s-NA+rcozY)Z+u!=}eB<LQi$S
zZvOz5IDkA6-mOI|D2`-MyNL=w<$&r1GE0QqWgj-w#AzQJPjY=tPPYOpi$bO-k(ik<
zc<sd`UuW}DKeQq&l6g%eryGC7(`LF5$K|W}dC%`j&RG8do|O@1l)M*79I7J@tUwq&
z>XLR9(Q*rtrzoT>ayH^q@2KleYvf5)<~V_$2&a({$KDm2EycCVT1R&iNS<>Pw=-??
zc;GP|Q`^5vi_V-RtS%#v;FVB#-P{jB=|?5lbE4~9vwX5hjgx@D9#5?!YI3}dyhh0J
z?PLICFz!FXvqj05%Z!F~L%LnR!}!!~Kba8<zyX{#e($|LL`OR`7X2OmW@8~kh?%+i
zA8MU0C3lU?gynu?{n6-aDjD2Js$Y7HZd4yJ9_P}M8Kr@7JX_dGN;GZ2L+hG35GgZ6
zUr24%;y9V2c^W@3V+S4ToR_6|l>-#XAx;AdbG5XSY%cMG{6OSq)C#WzP}?Fbs^N@;
z$n4n+Gt_!gNg+90V`^67Raj>vIl)uN4d_p;SZk?NmzG42c?$7$IqWl0EH4Bi7$apu
z%wqEfa!;xBq;VaiW=Btu26s=oea338h$k~f<xGml$~nny7!my`#TFZXv=#)0+*tF)
zS3vB^a~0G~3t{&Rg1_Td9OMOxHAPX#3!EQXU{x_~-tUk%Wp<1XX-p(x%yJ)_24CR^
z(9@%lQuA}d@~Yz-NL~J*)8LQo<76?hh!V-Q_$R(=MIazM5nb9t@^g%5@TWr?KQYd@
znQ)5Aat?VSn*-lH&f#oggpwkXWE+@|QR!038U$aqL`+48OaqhDgZ(Q-Bu^_A7@N$E
zpX3U}5W}ecwQ4Nek3C`qkaZ)0^roZ$!z4>??mqH4IVwJ#{<UTm%!={Mgaf=683ffS
zGLj*V9)S}(i3LFFdgh$a-cOrYCyq46S9+cs(9?=Z_Um{UZ4$XYYV|;S{uH+ITBM@H
z+q?Y#0P*nW<RjPCwT#$u+(T|Wzb<f~<1L)yH6)7i&E&Q0GBP6X5U&Zx3-!nIsn43W
z4>4fJB)L?{a6g4bCA&PEUKkn~6ov@k93Ml9=!}BHRuyS{<arm&z){qD)rf;f2FbFc
zc`F((Bj4Vh=+W+-mvNh-pa2YecA`025-s6!Ncr}#>7MzmZZwHy$yA0`4ytkrjARi_
zTVW$A&m4*siC9(eLH_p?k;t;4jLHX?<g0%Ud*ZAlO2jKa%vT$SP$+toEOvJ-Wi|XT
zzSvZjjk#v@6qe@TD%=}0(}Bka(9@DzsL@h64j<(|?fogL;Dv`|kvEu279$7n?O8O&
zGC^^PWQ3O7qkFRawHt3zWMJEZ;16G*s|D4!6>tDuzFPPC`kIPncOj)L8Gcm+j&WGc
zXao_-43ZIU(Fq*_u#>A}v7~#rz}x4d%ia=xWv0y=?%2>4VnI=i5NV3eq4vgya^o(%
z1MBs!NjGpKyI|R3!Blcw@Kn@Ml~xhOB84E8Ry`ZJK7yr@Hpp$m`JcKBGC6bU_)}ta
zl2Ie5+khEZ3^%o8*j#?_lSecYuwa?mI0SoABSSr*of|Pm#9}{`tM@+i*#6M64>~Qe
zhR#Xku6Pvivkm*%NC!CCgU_u?0!xVV6xkz)K!p^LLms4>g-hDU8ba&6bDS<qREo09
z!EwPQOpbVS{oiVcS+p?|HNkl!C(BH8Nvkj+mO!&?KuUlypVua;n`@SiNFs%#Ku*)U
zlh3cEX)U5pZhYHjIFlgf2S0~ubb4@Lirh)PvU@N+7ZkaacN$HV(PS!o^dyBIbVs2b
zmZV!*qLE>dnIL!F5kGr4<Y%y}DG!va=0eC5caq7-f2~ZmAHUuiRXnvmTa)*_Guolm
zi1}GkNbS;5G?1{0GnRI5m3ZrlowwaaB%1^unO#QFkHV*qO_JthYlUZLe=UF;RF9{n
zOtz?5qQ*dC26`V{3eHtgY6WO*8bTQ(B=+=SnsVF7<;fd2HUlZgO1B-CmkC(enlh&W
ze)9UCrAhW>Etp0#7y+A*-u0I}nWBP4WsXDS`7v?}1}Z(MTWk@!Et?O@q~K@p?N)q?
zcTpi(3i1`wOaOiTXpIrL+6K|`hdC^1b27O~=^271Z!gXO5>q^mdUH~k44}&@?PvZU
zLG-I3JlPf1MstN#0|fW_(!*_X&%L48!2GR@<a^R`WhfQI1GA|NaI8BTa81l3*i<*(
z;{*}?D%?>=mode(V`xb*bLzsZL1wQJF5oyjNIe^#2&i=#N(ibgW1o1rB&dvIXBqlZ
zc?F+iMI$1BK#csr`uqJWOhB=ag>rZ81a!}+sR|2Xvz@|C`C@%Laap;$7s!n3ojO~n
zV#2UkpMKti@r)l@nmZEGk!~=EGR2o5`)Ag#NiEEb%&4+Pc#<%<EA9<bOWSRY9j(s9
zk2w-{^#jz>O_c!MKq9}(6dz?0#qwLQBOr!9&Y-!lLPf03$_o%!{{R5TdYSbLd$AfY
zbX6E|r<WgEYuv1H%NdY5%D54c^8xtLW<Pb2HKLoOQ0awS0teq*bfk<Rn|9Iw$Ig1M
zwHH$>!-jTUyr#~enpTmQVcZjEd}M>`RPM;p8cD9(i%Fo7mPq!17q~TESfC^|<Wmr*
zd3fI+htjF4v0$lcOK$ntV{2!)6!UV*cE@g9sKy6l?^9yAi*ZX6qdYMJj52o|<wX%Z
zQ!!C6Ah9a!+1h`?p%J=Uc~Z~1Mq(Y6a2OtV$6-)LRv20trBwjuc;hs!p!u0($sm~^
zF_~oQU3mIpgpiokvdTA{Zy$TqQ&@f15~<zyN}hui7uuBk(9Px|0zp;IeQ`?6S1d;|
z!74_o3NvNH^ZL+@yePpxIUtjrqM=Kr@<gkQXDX+u_NGO2U5Yr`M^+;pXtP0dU2`01
zB#nZY17?0<?^jKsidf2AAp;E@x#76!R2J|=3P%wA-~nWAa(mQs-<F+JKyet|Cp5Jg
zcTt_Em>E#!Hw9ca3;NX~6}<Db05&9i{HLWuHQ6!)7S?4M@;7ovY9U1jF*fYBU57$X
zZ)yN}m0kSlWx}V*HV?awGCk_O)RCjQTSm+gLn@d1$KIr!o*6_*B8HT0^D**)=zqqm
zJWj474l)nSTerOkLPd8Pus{gsE};CtpIWjd44Ig+tMII?g4pz`eoG0Rm4G1z035NY
zV^O%j*<1~Se&_V`^sCU6*<mhjSDS?j3mgH}M{J*3istbk4Cj&AP;@=>OnFuqyw%=9
z9F`oD^!ik{5q*q}l0@;!1MgFw)YG^!B#+C?tR#@XQNM*A-n8xp@3X5j4xpUi{b~!z
z6=7mS05VPwC*5hwdeSPOkIOrLPCoa&Y@*EEmCHzpBxQG;5!Ci-U6PhkVH-DK$cv1e
za1B<5{{YII!4<o!ImeliwNHH0?e!TEm;yr#;ainzYBE916H?#og~Hq<g*N=^hmzF4
zYPXx_kchxIPI*16GwnwU<rXZ&kcaOBQH%Jkh<W4M>e!4+jk)&})Fi>qCaKgc?dDXB
zt-_!9_)>CHJu~T58h9a*Zeh4=fK?=w$;bZys<Y0b`{eT!HvRyCKqH^x_NKkyP`jdL
zCCEQF1Y^+E#*-n{T?^7&BF;>c0VIi%5ApkoeAhBY!VHDVhQlv14@#$e_QDUd$pL8`
z4>CnL;B*7^;+Q9mVo@C4Y9kg#BP>UzPo-+0jGWnRZ)2J{0wd-VxJVD(Ju&WS#%3fc
z!cr#XiRw>$5#FoA^9|~(jGr(LIAiUKbPSthj^UYPB$f@p2R@yuxl$(VbgE>N%kwf2
z0>nAW`U6q5xRIopuZ{{2lLr~}{{TH{;h<GwWkJ1pZ2jtzTZm&3ypk$ojoHA*sjE)J
zwAma`NpMPCPJp`YU<Uzvel+uMcPwihssPIf@VGhkCZ<8M<b9E%4C8QOII8V)Z!1IQ
zN=S*zmB|@ypO>{X<i(;RYkh=CpPnu^9+~=grzO6_jirpI4hPfpsV*gu0+%2JQN3Fu
z9Q)O8?FYHESehqD<17q|jIs8uVx&uG(6*71RGKjw7=ZIxmn!S%XqjMUF+LOmN+*A*
zs#0A&#7`(}M2Hn*$0OAHnu_jOt|3tpIc$%ZHZVI8>-4HocLyb6Wx1K;5<?=80R?vF
zaOsTIhM!`2o>Q_84gkp_vg}@UlV#JXVA%mj1a}6sEn{|9M&E^9@q_7~*0fP4m~^_8
zyh!oPxNyHLfRB{>k6IS)MnJEF7#V4bjQuILT2si<v{J?$(<)>fXR!Ly?(~87WEU3h
zRf!yA20!6eqLDnsc9~464Z<DU@&dLSZ>jaA3ov6OtX&Y~s2I<-YSP<D8wg7(r~LFI
zET_<)YPF)+Byl{mJaWnjDh@)Cp1AI6xkb!SF&F`2zFcgBE)G-!QbBC-?Nxo-bMrFh
zuSMmM>*fR!b0NoHr=>Plia5max`ENod;b9S>XZp`u@qWc+}g84BxXR&V_f5(Lr;z4
zFolXp&IuBgUaioB=|XKKp4vPE_mz)&Q*etShgD222645I_|}RD&CQX>5w`^*CIf6>
zbz}HdHHJwe`)roVWkw=@EMTu;nx0`Jv`8K`UpM!%KR6gYJxwS})SGxQa@#;7<#Fg}
zln|8462mRDYKqN`$0~Y|M|!T1#{`~F%zka(G=z~_*RZT*Uuz#R_5yox-1=1;?I!6b
zFr~gEz{7T7>-4PL8Xd~-xTI;YEJ{upx{`Yn-l<Cq3@_RhT^O^uPrv@nXv+i)Ra`qp
zPTipNIOK{?vD`?E?D4v;1MOU6+LMUWv5$3R(jhz71CZ+;IjS=0u__Wk$~j`gj=lc1
z(6yo|+X9h;oJiTIZmrp3A>v%G%;#=Gk6MQj^BiuardvZ4k80^8uaNLa3D3Cnt|wNC
zIGDyFD#4BkZ_>Mu6Wj}Z^G_gFJco>69{&KSt_xhAIawi&RXbaDK<k?7rA@{+XFXXa
zjLU*luwp<wecqK31fGZ9r693j*j{<haqUcH#tU`o2tBKFlwrUeHyx?K?LMF0&q^`Q
z<N142aex%ANGBitdH_4*4|-gX3XpS-)P(1p^gNPj4<i^W^`K}_#EgTVT5`4tBb@f8
zb-+DWr@aRSbDU)JiU5?zN8UK&t~%109B{qIAPR^QGq`mfX-jQx4{YQbcVS{tI{-dl
zG0?B|rpqfo-;+FGo|vX70Ox`ash}JwTny*9=ASbVGZHrEBRy#3l5_2kN&y{90gj^`
zPo*LP4^h{WMJ}K_JB~vf6~WB`OCEdDjifTFa!C1&IY#b;XV}#w13+c{;(?LS9)gXE
z2IOJ>*R@QMmSg3{OBLsy20GJ{5i2YfvG3fy2;}<JD1iczyJ=tw^R)U?!#DxJ!({g0
zRi)CdE*X&{4S|U;K4l)%*)&~IpL90Gl=0=RP6w@R8Wmc)MDs_fTt3&vdJcJ}t9-iy
zWc_PGO%;+j+2Cg1z}h(;=9;=C!vzsrJC`TsjZYr_)c&hl_OQ9)XE0>ooC1G}j2*#C
zbJ!Zu{{V!0S1epxHaObKnJ4h6Bk;zrD3J!AASl@=R}6i{3j>Lh(kx!qn(Ac`2L$lL
z98!P_t7jPX>00mLt!P44827(rBn%3B_$K^ZEHHlX7=d;t3J<1hMU~@U*kt`;mva@u
zGk3r|(rj!Kw49HWj+w2fd>7&=TyL=;fLA9N2jBc^NW2ZH2^u8Hz{IB<DL;iZmE#}S
zVt9&6se)7~+QX+&o^ehn0};W;DnYI3J|B31s?GL&z~OQ@IrTn*h4^{mJD6TOYi-V_
z=GuQ=m1`)+y{W&rUs|F3$3Ad`Wrru6cBOSt8Fw$>dRJ3n@V8l%3FeJLjwA|sUvcYJ
z+u;TLlB(_y4S?@;&hzX$S422}Gn{Uzvp0^zCvIbiMI`JPBd$eA3#efH78v5Y89o$U
z#sq4mWd{d5<a!E{AB1{|m_c&PjHGm2U>{nw!?~jW0GDiE+8Af{jw|N-te69!prdZs
zs#-#N4@&G);U>H<406t*+jcjcWPWt?_(7~AdAFA!MD4@G0U!_WdK!P~_G<qC<<k$Z
z;lG(2XOyG?x4+HJ5kk`t5jSM^_O8C$;T7e~trFgB2r>|^cdw|X-25iKi4~%rOrYwq
z_4TO!!OU0uyAQA7znJ6LCQ0|fIq5)*<m^rl1lL;^!W~XojiBBoc=H}t7$>o%KL~a7
zc#>9S4BJ54$GuPX24{cavHgDw{Kq6>Rn7?DbMH(EyYAw;#rRp`KQUmAA2EcuU7bh!
z#~f8zJ{<U&BAVm-EQD4dx!`8Ao=ccV{#~-8jl;d9bAUNKui^zLUP0ZCYo#9#Xa3JC
zb>~HNWFArl$`$XDInHXS@CS)9P(-c($trWjV=Si~9pK7X%scx?#J~XZ00WvB6$QV$
z-?eVZ;7v%v6hK3%#{S<!?@!ad8+e~oxEAkf5tx8b5J(51IO$O=w;4@dP-BiNgtn3w
z;jhEH?}<9d(rjmVRY)%=k01|Et#!W={tUN*FXGd5%R7l>2n6P00pxJrn6G8{S)h1x
z;lGEH)=exM*lh#3-Uj~QliTasytDR@_}y>fy<P0|TT>3_UF8@M6-F=*p+CyGV<zRI
z(9!E|=a9X#!z_YSWhmuXcgUud+lFFzJv}MnZN$h>w&RmcP+I_GG0p%zYFgJq^%_eM
zPrh@Ca<0W8$Rza!lp^jK#xu_})xae)%}sz%{9xp+a#T~5+juSM_h<k+Wq1ViCYr~Q
zk-_OtPz>WNU*==S94!D62OOS+cA>We>DW>LKIsJgJ5m8a+S^fh&Q5xoZZ~J-InQc#
z7&ci-kTMUo1P!3c>y8iWK*Ye@LX*=u^!7C63{dnV+JcVAUk7M7W*v{cC}vmMgN${@
zS^#sz%gY0RIOnZ2p<bMEoc0uq+z=bvuR}p3ovb@>F~Oih<(KBhdhzQ)P^t)WK|OQL
zA!YUCjAt|h*;hPrXaK;^Q%wpxaZYSLFnPyQ-jFaLka7X%j+6}ue=llY4guo_KGYF|
z^5>595rx8>k~;cQzMvr);GCTHqdZ`q{CiQ1<GmRx$y|}sjwt}(K?TPk51ZPboM8#z
zo_(o^H<Cdo9f9JUtXPFsP&0#`w9^v<hda@50p*YK`q0IE%!v-%V-$`XAx>FT^&O~F
zgeA!9)X)O4f4j-S`=jaWOOT*G7%=SJsp|um2$*7ULk{5jQmPQjjvJihk<yq9+y}}|
zRCOcPg5Nio&Vz3%NXAVB2}wB_BN!Z0T~Tr7u*P`@wE$Rai5vyFC5QuKDZw6x>r>6*
zPZi4&+soo>_Kq>NVv^;E1JH9+R2+eg#PFj%X;_Vg8$1lD&qF{C-Q|WTbGVY>#&T*h
zRFDZO2RI!lXGbG;LB?~_G>kr6KSR`>^z;G17B~oa<c!k93yp}ZGTf8UiioKscG^20
zqNacskqL>|lYpS{M&LaH6yWia2t8@Rk(HSn3>PYy!EdE5#Aq63{skpK{xhC}mR~Q-
zX1V!QV+1fGpK7oXlne%qhVF3Zsij=UDlX+4+o|o2)QAU`zdJc%esbIurvi?Qk&y95
zcM>~(H0&YK851!tJNeo=&@N^}k+fqWflhJhQMMUXmwJ%d^A);!3XBCt%E}7#lPjE3
zwS<vkIU*l5!phv?c0L>PsbiWM50^KZy9p|)_+y^=s<1n&GRr7pzy#VlbJm?3`ErSo
z@>G1G$9g$L)r*OHwN^KjAkPf_J%`q%I+ivox{c52$LCZdl2D~%!Cv8z9Qu#`y(lG<
zY=o&+B%xgH_V%QssA_1gsK`ns$3u{WbN=>fNVN;-j_Y&gVfPO(WD<K1L0M*5Jht9;
z0(dy&RJPAMOdy6uN0mX{)E}VyDCGlo+gxS1L-uxgGI4Cj0S}@6w6^-4%2=#3+%e6=
znI=vYdM<kbSUzLzj7JHLRN_pX#Qrq#aIRWEwE-DiM4tV@{HZvmBdN64A&x0aM<b>Q
zZ!NkHL7tTBe-ioc4WYzPGjCXAP+9)~;8n~$-15d7&-v8+@qvKD`@X`gER7x1VpL$G
z3?De)j>40Iu+i40w6Ayef+h1@1z;cU0sJ`i6>8g6Ciut%?KhUBFp%xp&uZh6`enBZ
zBW#Xc%N9QNLFDJ@Qa$)81e@>&$Wic5t!FApu^q$fW!x>ox1DSOBX-dwXQxiM{OR`k
z@YrqOm18`xLb+xH^<sPb*BY0S$uONukqRyYwsw!}Rv^{q7RGTfl}RE%sfPam>tdnN
zLq}h2tX)av>J!8k))V`P-S)8T#gB4*YURGaa`7A4+slbu`EY^Cf!98y^{z2BeZp%s
z23Wkc2`Fp@W7Q6QyValVCuvHg-y<RgMaenu&1UJ_p!7#*JXCM(k~O;8s7Q)M7$-ec
z){Hv(5VFkQyHC9#ej@|<*Po`Ue%lOo_W(x;1aX1SUEZ~F$6X)^yppN7<w*rx_aJ(A
zsFgJO1<ysc*L=xJ%BmJ+1!YIh;p>jor>1K1+#j@RdXCMhgigBv;AHm|=bCn|ZfB0>
z)f~vGMDd^u6b$^w&>!%vJ1tzv47RaegAB0(>_G*&=shbxVwl<8*!YGQn=#5{+;*6=
zfY|<3t7om-q+(ev8_Z3_+Xv(?_p{K~ovx%W)+@_9lMj&PXR|+l1B~QwYe!AJHjzr;
zvk8aFTig0nPJkYh4!%}3XtH-?Ivfzg`c?Zo!G9*(Sqr+h0dvG&{{Ua<TppdS#D$IA
zfg>n3mF|57EE?pAd?2y98z1K^K{#5+k=#n>qg(ibIiQdU#EOr$RXpz=s%vK7UvqRK
zlIwhfYo2~_fq~DpdCiB2tVEk`TWW3n@0LL4+w19Cx_-5AQYeZ7?lK}PnH75mHI%8L
zo`Y+xjjZbUE}>F2Jx_Ynwbtakk)WQ`vZ8=p01TM!53j9o16YJvJ>}GLJ^)Bk+~AYn
zK9zS!*Y_{>eTbQ)Bj$`SX36Aa*F31Po|gu!e$J_Ha;M8}@w}~*DaQ&=rCqYTo^)l9
zv~n=c7lt0cO5*f=cxsOj)NNAJ$x<U?-!zAz;B^(Vqj;Ty%(j;4DJ)?}&UUwRlh6vm
z#jODy%y$UzM-m<*!Br9xLC01;zO}U$uQV1y>0uKjFP00}A6nonb;SE@a3#4hMgeIN
zw(sk^j`*!H;}*Nq1X@MvH=0PukM1UU;Pq}kg0r_k)bAkIq=>AR?d3x1Fef{_!;fCT
zR=t;qW0iJW&LddI?+F>t{{UM(tIl-oTwFM_)6!GsoGr7iNj=Fw!Z<&UD|f>>rK~XT
znm66OfQj3dIqE%yCr;>hXzwAvQEFzoLfe~Z<ly>N<({A?NnSXMIYkr5r#nFDk58p>
zx?hQ>arSuHIm}sf0Y(TtjaanQS{asjODW}<bMm%(8t0WJTAF*FgJ-M4vqsX~?^Vaj
z271=!lc+}=l8g0ti;O1Y&NINTJ+RlMoEzkfh~*muYycpRql($m^_Zf;d%fF_8;{-g
zsf&`_t0%GD>3XwVPjLkHlE_&?fc)-G#C-){v(+yx<a=qK_Y6kGA9;OikDpv$Axw9#
z9GUr_rq9RTuF2v+@iN-V0_?<$S0wS<(yQHlM0d8DxNnwn$`uDJ-1E>MdezhQHBbnU
zDyZd0b6gIIc|5XtMYga(<;d-vfz(#+iFYm0cAdwTAB=E5pIVZ4I_NJEnNMPH0XZO=
z)Y7iStB9F5F(>aF;MXOl>Jgi-?Aev$lHpI;=IW}$vG32X@~hEmZ($-@O(-&M%V2dC
zoVC%6?X=sdWGfhxDj(OOt$XR=`!E*DT7NSPg#Q2!t#Nu*sL?Wzm{LjJdz0x~GTpV{
zUot=?3%CUT06l9LXpMW!>g^|0Uo{BEHj$o!wKV(1Nk{_(fHS+P{*}hsYtq|I8%UuL
zU<{1s*0yXlh@`p_62$@MikU8C7O~yf-g)3bJeW8bZ%Wy<yM+c>g0L8Ey~onH%`;RA
z%x)xBErOm`r@y^yN2<ucI>rdcBo4L7ICM0NJ^>mO60D5ck+&=`t0NLgJwd57D@4+_
zT1hDxY`%Yp`VT=;3vmAcdwPaAF}`;L{(4h{O%pZ246iDLiH|tPaqnNCUqj8drLVTe
z@XM!98o3HeHZiw9!~XZZKIT(vY!csW(vk9(T$MQO?kIU~5<j&?BuOHsz*;bHard!N
zSW7gvhC7fV#EtVf=zT}lnp%S_Njlp^#p4)6-R6!04*B<}BGj5;y3Li9n=IgdquQPz
zYk=0RC<al2tUWz_jYsx%k8`L*;029(xA;@D5oR<P*%K)&bAi!KMKt$<LjhIBalEc^
z`P7h4YPTV8V<j1I1ZM?X)Kp0&wXs_lVs^Iu(j2kR^rxV#D%;KW$mN|1#sC=myN~(x
zt14xk*;!&z!wnjaYPHnyD@Z2XL*qC(;82qJ=+avwM}yVJLsG|LMkZt-!TC=mP5~V;
zigUbf#Y+TL0DrXJ*`^p{Mgj<&mc~eI^Xp1pK^Z#$+%Sa4(Y@&a**8ZH^&IE!u<SkR
zZNZAV6~IxrY~_tNGu<zlcJbu~Olr8#ZYn(P0!3`Br(jj=N2L}Xq>52r3ZzI+&R4kg
zK9r56!!6`@5zWYMSP}sr)}I^sK4Z#u;dYfhb5p)vBN{72Pb^O=PaLnNanhEENVoQg
z!g=h``GD;5(RzQi?ewW_<%&63-N-_qF&x!+WDzOy!m@#dQP(~4YDbmbl(9|@cSbM)
z$8l3)i&sZZvx((rzzNDTa>{#qRab8;6^t?lPNd|h^fbnfJE>YZVr)pGbFuH}J*s&O
zep<v7dSq~E*jEib;fYGKtE`}gh12GZv%?1W?mALQ6oh##G3Whe7nA-KBwLtyJCtr*
zg58BjCi(6GSlDeJGlu<W*f%RR$dJkVhjPCwBI7P8##zA+aE2wuQ+nVJdYk7v0Yyf0
zwF?o3{{RzBmcl@$Tbq_YHVQ~GLjM4=DcqY5vc3?v+Tl^UGn}#E^XXPoPz`WExmZwg
zxn76Tu~5$>?Fun5hT(C^K9z77lrWnP6nyT(g#Q3!`_gF*HfDTA_(|Z8iTV}Bi{d>Y
zXM*8y>Z$^<{`G!+e$}7wNvq3Si|-ZuBDhOKy`;5<R%S<Xc~<)L9-X-2zenMp?1U;w
zv;^RGQB$Fg>O9@U=3C60Oin&o0Oupxnw9NyNK~Cag`dy2j=T%v{{V-Yyxth`w}s`=
zuHu}=%P<8UhbL(s!#w{0O2Bz7+7g!=gsCC&)Es2```7L#?H&6Od?fv#yfty8>bevW
zdCJcO@hB3(FK0#rIj_ub+Oz%%-|=hU74*8jga=d5gF8oe41c`0P&f>pryaA;Y#uEu
z>~>PFs%ZB<bDl#MT~l$}_dmPspIU)jGpI4-H#<5N_xx&Gn|r8Sse=-(RzV}<<{ed+
zsG(plZ7i|Ee9<4uPyDhu@9Rw~9S!O*O*0}(YiLyN!G(F;2enBn2AE3L4p$&E#z*eY
zy+H-LT-?PKw5D5t+m)eW0~6Yipm^krET2A6khao?Jm>MINU_0i+uAMVk+&`nIG{<e
zd5amyB>7$GWSN{GNQijO9ftxzib7T}$gEjMARfH+KS}_SGO;vrMy=*V#Ky-bujx#<
zE@SgyP-S=8KpY0ge@bJ8j6TU(a54)qBxm{4o<xnKxwvO&)Q#%AZuie>0Dkw8L~g@r
z`{hm!JL02jh=%2Y;aVt0;t=%q9_EqSDAq{~oJqtloa|xS9;Tq0NfTnUM=IYg+;{GM
zs-mvM-G`YSQbLAJuO1m#<m1rP6Pt+w`5@qo^1Pt~^rb3iD)AP>H_3y;8f4&ZD0Ai`
zVTf;+9<|XJsO(`WUqOYPOG<zptHQ{f9Csp{F4iQ*p%C&Ew?;j2j+Fei){@=ERAd(9
zIrOAmrZnheB$wl%>^_xff-Qku7If!;Pik~qRmhqm%0U}}#@~8GVpy?=NJk31b*VEO
zCebHfyr-^x2eldw<Y5&8scpTo$CFWqK!s5Pf#1~B(vq!}9I(QM>IFpS%qX!1#&}>l
z{b>ywKMj`2{Bvpc`*Sjo+W<dtz{o#^eOvIJ=TBSct>;I9o8{hzB>w>Q>*ZgEKfLjc
zv{73-uvTNV;DL@!eL?WsQ<lqHw~p4`<=j`vk;Xo!p4?Z|WcuNqyOl-Sx<5&OWS<aQ
zYCZ%0&(gH^kVR}(<Ve8zgFnTZw3bHaR7;sv<BmIqWMaivXeYn5aX+$$iBj&yJtbLe
zqM1jVdbrsmAK}e<F1c?i%_>PTTVaq1T=064U6ml!R{Nfftj@6OcG{JsS26zi5q9~i
ze)a`RbsK%3<z>r9xEAO*=~!A7^rF@{WVZ<r!G|3P>6+8j43aL$=IXfG2TyvKt&XVc
z8=6{7(fM1Rb`Y?`1mJ_-zc;_&ryeSwR`|Y_+vG(P?SsrY-GjoD*dOPL{S>hKdRa?&
zSwTqHg(Hjs`kMU2{{Vu9dB@`EyPe8Oa{(W`P6KD}0bF^4wH4|P&DipP55(+CVWKG9
z?mR9}r+n7QyOQ1sZdDptqf#~?{vYtHZx2NvXyTsP#EOBQTwr7A>sN0}%*N_D36eFz
zMdKsa9qYhq?98ousM$(B(HMAk9DuEW{{WS8o*>sIS&Bf96smWik-qsILB(ooSBWAl
zQ*QF4eT)anPteyVtF_I8%^cDh3}ksGQ}cj%@7B5MHi(;O%euQ?He1`71g|05T}c2Q
zxW{Z(Ow!1>Z!9YrPQs&{_BDF$Sin?)zIS3~z~cwdR&=fBg^~$Tm00ozUNKzzvz^>T
zf*B;u#k_%-5JMcOKBAN*%m`&tH^<5*(~;<Yl!-GrL_~}j*BBg^_WIP{XPP9IOZD>Q
zC^nD|M?5YnSc<D`Ct<Olv5>+z6=2%^g%xgNRB0qEv7X;wPo+ETS5mNVDcV9XRuO@p
zaaGB<F$kGHWo$5$l0KgFggWl&?h2*E+f-#hQI52kDhUgmWDJgT=xJnmrj=~o>}?7c
zJ1|uG=Aaic!8_T@i5v{8D)AxDZ%&i}G?GaXM?^bIjmKs|80MDN@uQc|is~1UNhqo_
z-?*iM8>fIpCA5G$6E?=-0q;)o(jy|m6+E&C$8n#hG_(RGFj?+#Fe*QI(kD!lk{A3c
zMa{e`X(|>5R%aWq;ZGnMc}cB_jbu=acWq<@0(qraSTIRtUF<S4y+_uiv5`m}k>fxW
z2tHiI@{Rp*PMBOu?qu7&V;rhuIPNMzY|je8cK`xOe|AS#=cgS$wR#H}=V=lK++tEk
zn0aC8?}}X38doyohWbSc_K7S``%56}>}q3W6VK*6a$s_xag28QRoHGLXZtiJHaN>;
zk1YC+e$>XfJH%1MSx*@NV?FxP=4EoELb0G#3dG3S+CSN+2t&@6qs!x#B}f_cCZv|;
zd6DH<Lb3T)HBdI=kItf#&JH4qQ5fK}vSmmA0A80fD#&w0U(H7<jJO6My@<zN!ilZS
zQz4Ss+5$GYFY^vR#-xkwHw>nB21jyE7Xg6jk7{@B8IfUpfJt_9$)(IY2qTUc-xQ`p
zfEm}f*FKaRnUdIBI|4+dkRptO@Ay<(mN>%{W^XX5L~pt~9D35MGe%KmfR=X2bv*}a
zLnD?#jwPBhfVeqt;P*7hU?o^a#g*hco1T82f~6Lc$us$oxpq(^-hNzr)7m0bT?pBB
zDIo#ljxc>`xg;)96p_;11&#{|8D^6_DC{xoQ=2wunW2v=xbs*Jea<Oow~+0V$PqGO
ziZJ`Yj=XiGTT>61fn-p~2;Oo*?nO(L%1B1UNa~is9H;KYoPs^+C3xp`-ljId!Ht5c
zBhs8Bh@nZQ$YFsdd12}7D$FV^Eu@8Xqa(6@;7N{Dbw5vfo@P4~t~9}Tjd^rcqEqF$
z1o?xGGwoIsT+Xa6t`wwcw%rjh0RI3SQ<@uR+xCf_e9R&uADIuotxWOTnfBVpEb=1b
z3UImgG@R}U5DQrfg@)LL-JZP3$4t_tv~Uv?Ff>RAV9s*KJ!!%S=SP;>8RfWx<`Kl_
zXdTWw)jO?D+`CETIC-!g)v^~Ic<d=A*;*1!X8`jgv>VtA<(T}xQA}v#+_J$Z$`oaN
zTh^YF1i6lOnlO>!x0T$kzK7PM4jwjW#&FqVk<W3*YBm;(k~a~Sl_Xq&)PjEuQvImG
zBV9!0Wh=D{422`O?M!PaXMKn!2;glhIcEOorlqaNmm+zjN4pZNiITrhdNdfzfgGb2
zGlDrTCIp~Ag%Vs}JgEiZ$8!oO0GRL*vBy1e?NbQSX>oBGL|iV`<BsEw^rpstEO~aU
z#1nyx{{Z^9?@s9ju2PTfGReA750nW;&JN;#n5BpYm&{lQkry&EI4Hj3-1=3x<F<xy
z(At+S2l4R7-`be5tGQB}nNI%z-Eh5qJt^ERVz@ieZf#`@LlE(RatP~FXj%(v{vo&1
zwD?*{COeAn;03{B?ZraZ&l;07fm#PR#9$MjUr}5C01fT$U&R*p?AsyO!Z`rL1IIr~
z?aS#Z_}X;juA5gfttT2%Yq9J)CxvYEZ3#cI?A2Uk236>zu@%wix=o5)TehnTmtwA}
zB*rnxVT#7l{8>GUNcxq!ZDhcUA2Xlt0bOpJ;k&2OV)1(Etk&=^?__m2RqOdz^fnfr
z7Y#)yFGbk+x9w+A@9#dt@b`|qG2$QC`&#hMvEi0ucWChG+Jvs8S_6za@%M)W0(!6G
zUP<s@!%5*uq`1&00y$yY5_T<?^#JlKWA=Z$v+<9Dbq^0kE?_9GkeLq0fA0a?=~@06
zH#%R746)iYlH0b~gnu%EI%75JWtciKm090eYL`Q{@0L0ZyVJG1eSIyZ(58jqxD&fZ
zyH$@+K=iM$z8QF@!9NxM0B2o8!aBx{FZQLyp<6j^N|v{jV5{Jf(2n)X>)L0Bd|P3r
zYRAKE6xQ}b&AU<t{DFW#80>xNzX-GozXEHQchkuh+0J2zbyX)OvBu#l;$Y<TYh4-H
zMMYf|tu${McqZNi@n42+t=8c-T3t$mWSu$@(Bsy+KZjl!)O<;H)|z}|$-J2(BO66^
z-xK~kTYN(B{+Zx(&>;_IOpSGnvk`zlE^%2t1lP4+2;NPsXvrD5Dnds69Z2YSt>{j)
zuzOlvjnnsR&XeI^h4c%L6JGdJP%5nipj@QP6rtecgV1}|=12S%{{Z%g_-*kY_M)};
zE%3uovbxfI1#9+wLi*T=O~vz;X<=CxAS!K8af7=c^uqlE{{RIl__gs5!#@ls_=%&7
zog-GfD{J<vIgCWBFiu+|k-Kp3k;h(tEXI(~88pb5&zQlVQFFP8Zlsg<j%)FrKgU<8
zna2;$?!_k8oBYp8g(VtyTDC(HS>D)8`i-%X+A@%@nY6^Lc`OH0kLyU$7y`uvYQhnf
zkhVrK#afR_o>>AjZ!jP}dV;Gd>Bsm~aoOCNl1n5JM4ZUduHYDYe}#U0-Oh^;Zi!qA
zV62$lT=H3uZ=j@7`wR<$2;DNN<c~_4;?m|b3de0El1VXbu}AlK$!}p&wwokHV`x=T
zz;$NeocdCBNGw%?Ih?eO0YX27oblSOeVLhv7b>$T4Ge6*GdJ|979aqbfHAWCtBz!0
z)MwJBnPiS39Cqa*XUda?e0L!FR&tOOBD71ne$6<FIO0;?O0F74Cz4O6Q_Wd6*I0O3
zbqEvZWnMu40PAr^6<OFoS7AG|_lTy+a3X`r^22ZFdx7ik^r>!4G#&kob8N~S839mY
zk{`P$BOs5%sP(3KaR|P9Nl1Q$PX`^URh##b?v$#dVkT!H3*(jcGznylTpNT@kCZy{
z-%6I4Xc8jFF}j<H5l6|6F^+^%tZ~7%F>fK2b0HzPMdJhAiT+gSXO1Y2TWFmCeDYh^
zel*m(F*Ds;%nb2?<dQN8`g-DvFwmGv?#PR6wtQ}MIKg5#&-haPrDFx+kjCY9%94+|
zd;K}-S+YwEXpuu8D(u0z<R1S3tu=2%$nmUL5sk8W{O=t&Khlm%kDStJ)n!jDGQ9b#
z*o=Dm(*@JIh1^LbfwXhirBX>+D1w<wBzZU^EX4E~_Ne7)<W@-AYXS3uIs82+RM2xW
z%=c*6V3H}_w1C`xHCeAg-wbSbsminc#3$CHG0NsKj!}y`ll<x{h{U0tn|9%r+s12H
z!6ICn9W~a{+ubC?5~ULZ>IFq`X4;a=1Asb!JJaAuo@I=$B!DCD?nMu0_BWat{J^b)
z5f8%i)D!Dgtclf#W|Aob3^L#nK;VpY`qE41{_cEvn3pVZj0|+C1+??JDgetM`4BHZ
zjRGW87ZHX7m0-Y-K7yWsW;4p#Npxc-2?QJh4`M0N!sQ!q$SN?Qe(9+#Ee<4UZbFgN
zG3n1i??~=I^5b7KYLXR4-alHA>0&l960p3g&B#!{cpv_?FrOeB#gJ!@x-w2F`{IQo
zba3Gg<{0^odWvV69BC<LRKWerr;(C*;;AMr1=@jTSDBhA6CuNJhuG7~3$l?&g`^9W
zbr=ngKq@I@%xxFhu@WwD$A`~e1w>j_jwsT7(LhTfQS&Z)d*X`)(Do?VR3zbYuh<_-
zTU5%tlBxMqF~|=Y?hQ6==1rbkNCF1)BO?bswG6Rt3LAVxlk)T*TvN7!C5~vMjNC5n
z8}BzoG^SQ{3cxAcP6);iy)=39N5pa%LuNvY@}F<>{uDa15@1&)Ms_jJ6eO+}CAFP{
zE*HxOg7OTn)Ks?;Gs5uwq+>sOC%!)_X!2Awzu#uTE4!2?oTe~MvRp^ykUng7@0v{j
z!vjkbLmY);+w-nCKD5}#khQ^LKwYSF!N(OU&HLooODeWD<B~hnM(Q__os)8@3{h|i
z9@R?h2N><=*%@UUSb`Y+z<-&kWPwnKZX}F+ggi$%Vd{OV54Dz%o2WtohG@$HfO}+j
zq8qKM&9e&e;F)<OXV#sa#dKR#g)L-E<z!vIF9IR`Nu`Y}#Oi_MGdKwxpTU4L$j1lX
zseQR5gUn~x5&lK$G0@YVcUQr3L60krjrjUfQDMxBF|1J`j^<xBA2g9AxXS~cy!FSY
zdPI@KD>AaV1TjIw{{XZHr?pl4d{Kq+)NcoX4spdc^HRhC9$;|U8D2rhN@^@lNf)yt
zrp%l%`G{N`)6Bm)A%r9-IANStZHA{iljZ`a9LB?_rwLc={&T+Dg4;?GPs`ZRYX>qe
zOCmh-?A(ZA03qimxgT0nCRNwYF+&;+qHa!lU>dB;G?6Oh!3QrQa!TW;;Zs|$nBYjt
z%Zw`j09q_G?mW+k+`MXmdaLqr+XvU$r-oUQV$uMm2r(|+LwnQ_!MyCaj696HP7lgg
zIUkK$HkUEm4MT7XovP=e5!)WMIw6ow^GNM;<`&9;%bWx5Jt|a5B`dZv8Tb*!*FK`2
zmgyL8Gv_$WYMf-BUtv~b@?&+A$}$9DzYG@#9et@?0aa~SmnbAGnapJU(dvEbSajIs
zl|Io67`JCCa7|m8Vrxc?=h(9Gxjyk8)iLtR5fY~eJhd&$4)nQ-NXuP3`CE)-S)G91
zdj9~26(n{GwB{mqk+W;#4c|W1ZhMp=fSE?e!N||~6-r%3NQ;=9Dai&vKJw76#qOac
zwNr5O#5$n!hC7ODTFWn&7zQ%W^CJE4udt<$TapPQ%wg3*KQI8F{=GwSsF{P#5UTAT
zFBu<=Riq~*PdcTozmY2KmPRP@^#pYT+Nv=~;V`sQEc?rDQ}>6rrB&25DI<pETJ20r
z7})ACa(yWww7n=zv@;NqhA!NZ{(UOr2FY@<CiN*Hj^zO<(TOJ?Us{xe6D(>AvZ!T=
zPBD@C)2%eCom`j=p@<R)ZHEMR#yXnl^lyclwzCMhjw!)*%u?Wk`0>E6M+ueVF|xHN
zHe)K#r@J{|w^vcR#R(D*xTSNCV^>>8zP#8)hH=XP+i-sl_3IuA{hswrR!!QZ(nbLr
zqJc1X4^nH=JSY1z>GNGIve_%lA9s}L%8~qErF~WdfwK%nx%9t7nt0T<M}g@700}%n
zsoTeJY@~@v%pil3JMI<N_+R#I)NWtSlGa9$9qTSK4tsqCeM4#RlTXv_O!|h#R6(?l
z;y#~B={zl=>DKUVy0s894WI@2eXI05yTkkyHy&u+oD;@P?=24r@UQIYXEO`QEK$6)
z11`MhxvxXe{ubI=d20KWN@HTD1&2U?#=EcVp>3#rsVtZ({p1b7`qsQ!VYpOyM}L)1
z^sl?XaIF|e++4pSj;1m&dTMii9q^u)Zws^7l0oF-kZNYrg6dvTQyW3dD~xW<baomf
zw(*pan=K*E<Lg#q(I9p=PQi?Aw|M6V+P<QOQA!b9%VUOE%93`8f;1$U1o9g$rNCpu
z9`$cd@czJ)x}rHdLNffrAJVth+9iy`a}M>!b`B5J8nbX>RaK8_l^I``^siPpSSFf@
z%-o)hnNVp91-m`PsF~M0a4<QmmbP&uif$lWDapX-Y3U-YivmhPbHcFePntPbYf8k9
z#0&vlQNz1>i8%EIbn?KK4Z9eSSJU33b&=QzMoAg@y(-)`UT4Zi;QSm_uPO*&+E9GC
z7|u;^>|+S(#HDv+XDzkO%PP1o6lAEYKV=a~<;xnbc^EwfESiCbWEy&6L!U92<goOr
zS6Y}z%QKv31@Y3da=*f8qFoHR+Z<)19eL|bT};}$FWOEsz&vgIYZmuYghtOS?x+az
z_MCIxvb7%<T3a`kZxn()>l%qmn?~$w3U73EGiv+r{&K3h#z^b$S@L*|A)MN}N4y`E
z^N`i%{wes`rg&~C7wvIw0D-vjzSZPjJ^iUHZ5~*39Zf+*+~NAMBP4_AUS2aa%dik`
zq|)^|Y0#9PbKm?=@h?czeCHRjGi@Poco^zy$$Vq`NoiVCtlw){HVnA)JN6#c^B;`=
z0BL<^Usg*AUNmRKkGO#^&|`sKcdz(|R`ERTD__Xy&zDj$&!<mn{MS11D+fkAxL<w#
z2c=I3B=yktpNPM;7NackeU|v7p^0QfEW1wteQU|JKZyP-@l49o-!y8kyKrtC1He3S
zSe6=l#)a148DwIuk(>`&)UvTI_z;PaP=4(OHyrYFUzKK@SDR*X_vgzV$nK>=F?tTP
zwue^_cX<mP<K%ON3fbyLIq6zf+Gm!Ws5_el)NoEeO0{RD-Ai@mO2f-lP>HhyAAefA
z40g{WS_^_1PaEUFX77smw>KwqwlwUDU)h_^=ZGl-<#4#;9qRq9o5u;aNXssA?g%9N
z3cDVi8I>csobF-#9Zw#fm2Nvi@h!u|1{AKqFitzuQIkfABvDHiL%rZJg+2KoRjXTY
zh(drs$->o@gaWa*$+&0cKg`sYu|__4$__|jkH70wpitGf4-3VdIYJRz-lj2wAZTUC
zMH`}A=kceaDMdgF1~_j}Jw-^$u*u~tP8vlDtVsEX<JeVll!yhuwpJ1$m~>LSY(DiQ
z(8oMtH_M?PHVFXx8f=VIm?dS{2V7#Q&wU~{*_n6;7;obL0P9v$nu5C>%>`BjtU-LD
zqX!={x7MS)#@EY@jGI||=hRj-ekFzzCi{=|PE}N#R5x1X%!;ya3`zNhI3HT%sfmJG
z1<|JS?sZT@WA3@{Rc>eU$R(AqPD=5%v!m2ABSjKBq<Ch2hn}LVo6kGVhC7807v^XE
z20Q&L&#8!;3!_5j=qo8#2s4tdd12}*C!NwJmLx)`cLX1KhjZ^$*6LTCZXF|eI0QK3
zBaR29GV(cX<s<C@GxJLr84OSNPhss`(vz0rawly@MY>%>%5ee_x-Wm}P{%Z@B#$M?
zkseI#L4djK?NFu7!`_GvMgo>{1_=68CV8AlS|nx!f{_3+p!fHvu`RM$Wf)XDl^RYr
zHwb-AS2uA*CL&gEn4BQ%?@x9~E~JGcaRNlLNj!`;pY|yrNZKONt0>$^4n|+;?Mw+{
zndMhINHQ<VPx;`~-)Jwl%D0mcoyhqZ2fk{%A`Qd_+>86NAF1>sy*Nvi@|$ywxhk0X
zz32kL`%7TUY8@wXsUZ1wA5%;%BvJ;Il}JA$FGeG^SN{M<iOEqU>^X9><RCo;D#DW#
zM%g1VgOb6BJ$cWy06pEKeqs6Da;U5^&#$1Sq;BqHDEq?VMRwqiZ)$5L&yXG%RHToG
z-aS3)R5AUiBd-4dlm=DfZ@n!51PLpq$ryQSxB%pJ;~!eHXAOxSQ;#izkgA7_`}zuq
zL=-Ge+hk@W9P!Wes~cuca;l|3Rtxw2Nc0sAl#vv&v{917VQj3KQM7yFlHfEuuIGbz
zU==1Dg~01pTG-2Q=-VWW#5QNBJ<q*D(3sFVf;R#J4p%<3u7RRGKHA{jeXZwH4&Rk_
ze?MH)gi*mULvJBwIYw3rs@~($lFoVNX1BS5VIl&ec<>XR{{V$w)4a=lKg+ri%*+V$
zG1mvLwGECasL&AKzD6Mc$Chvy_sH%lbc-*PWh|@rMsmLO9n3S7jck5qcFU4_FQBVy
z3gEm@KF#BHI-f!GsBCr{6hYY`BN;hB#{)g;Cbt(`kgMCe$W@;>-Pi%>Ju2G47UOH@
zMsnXGKTv%rxso-@-h!v6JZB!1n;nX=TZyFE0x?wiNp|Uu^%~k*FnONpSRKd(!xG9t
z;8U97JC7(lt+qmZnDe!mj=zOF&zVULI8P@HByAbXDb5Hz4<qYH3H+F40d3Mjw3GL`
z{b|mqBKhMawnTVr4Es}Kxfu>DBvr@Gg~2cMBc&_J3=*slGQ6-2+X4HT9X-t^nM&3n
zmO&JYY}2mnZV?`*Bc^?-OH$9y(1qKccvJN4RpnI!%a&9O*()JE38L0!+K@{zkZvls
z0ALo+L+R3iUsCf;6~t`}a)*twvTexcxTZYf6h(*+k+2nxN#mhC>5?tvNW$(&!GHB}
zjtD-rUR$&Ggk~tu%Ntx^<-7hABo{2a=w&j9ODIq|Bj!Eo2AnGcGO{`xuJe#F?NP@%
zLl}&H@k^boz0ai*6?Ot3s>hNK&4c{~J0vE_t;zEhl$R|oS=WrOx27ps@W6oE<6>hZ
z{*@4&<=TWD%aEZsrnIo`#8S2g59T-BKJ-{z)*92oqhz4-pOijEPxYu?<pUIG3BVsJ
zoc<LZ#ls_{aR6RYKm_uBp0xCZ*v6}X&77_>M;&UdVs6JY(uLhD04CfkkT^b>?NHsQ
zXqiHJWUdJ(ic5&hYF63Rn<H_TJf7eRf7#t-!!UO04nAMY(tsl{wo-O>iZ@NZU~U`K
zW7d^zt&%q}uOY|F(0ysv@kIp0%_{k0EX-Gd>PPrcQb}wkxP$_WD8!`aaP$IzvIR+{
z5=N3I%%n7GxX(Q^Ll`aNjU%_g1nwKY_q9H4E#$mL7iJN$NFaUSM>zMX?JeV277J`L
z$14z9k`LokdolGQSOkhf4Wxog$a;DXI^vk|H<OH^k0hQ6ZT-)%s|Fd?N0vm&g$I-G
zQ^^KU+#JT6e|3(z?oX(xxLC|SWRtSVGO%R<c8qNp?@VwOMV2_u;JZf|10Kh{U786J
z1%%v20AlidzO`EDO!4_bMBTgOgfBfh)h3B)*oxN<hUHmP%VXw8AnG&Q-ldA>;@N}7
zyGnxF8FE`R`)MN6);O*eBu91%81l!yDJ(4yocRtxVdd{Va(Yv^B*@YgRr@<6jf}Fg
z9y#X*pN}%+P7*~WKxFBRcjKjAiZ`}kQb5GyN|^0X#~Tn9FiANZO7cB(LS<MYf#72m
z)CI(Ys5r)beJO^@66xncOt$J-75M`^boIx2yAlY%4GC3mz8rGjN^wGpXK5E<V1hMH
zLH9LET9wLGwzLg8$s)e;pL>2VI|EjNZj7SDM1w!>`eLQKwR>nA{TZAQgqJ-t)Dcxu
zXIAn;FhaO8b_T66TETH1(#;%O*;5>K`c!bYn%IIj9#`FtVS;%5YIG#dOAzXd$Q^U(
zQORlMTdW^AF6T0n_eWe+rY4ERFDO$gI63{^P6yOuy;wrB0`Z2*ADDOgR1z?F(m3RD
zcNIR1^r@tlSrwf~BqjijIsiKRn&^bAGFK5ea~jAKs}0#Ccf~}f&j`_nL%88vlZsz1
z>F!2Rlgo@55cL4}rItAX4-)MlfOialJw<dzcM~VE+!HGna!3FU{=?R-M!TE$YC|s@
z17w3#p#nJokPz{<<z;MgYV;7HDzQXC4Uhw8lh-skSzKvci6RpI_27|whb5DDPSqmC
z98od|q~2S0OXLq>nw=6QT!eqWhdJPib3o11{{Roj0RDBGnWBR!G(%}d%4B5$>-DC|
zXe3|*Wxt4e{VPfvQ6@IHbYL?g^kMB#%?$Asl>#hekmf<kA5mGk#i9E)P`a}#D<mZC
z3NfDNzcmv<636?Yl-ankJgM~etM@UaNSi0~r2ZhI10U9zC8#1skw8*Da6g8ynvUeS
zGc?5{k>DW_=R1hxlke$FlHF2h#F*U~`>Wg$(Z8K)jXf?Tg~3<GaS(63G2WbzEwnyP
z;Ocp1DUyA%dsj1*S5c~RGZG&xIbe^uKx5d7jV<n^N6Ln9*(z7~N2O||viY0c2J(JQ
zz5TIPKeMGUmX$Dz%LW)fjbkc_4N`2$7E1B?QmbW~@8<xYQR!0so!OpABHJKP7!KI!
zT7t$ev_mX%nM$_jMd-<lAH&{}Elf(d2X1f~hDjgRx#d~d(NVEa>~A!M${)Ho90m9H
zr!AUpSp(;1B(Lz+lrg~+hE)wBal8?LJwd5$ZBWa;Gqo6VjB>S;s@bBaV?8YjMHphF
zZY76&8f<on5oWl7mNsrtk5%;^m3fYq#oj456>KpNorC;oxsDlRiR2P2r~w3Y`e&t0
z?mkq43nL0NsuUFd2W+q%snXcWr#M}&9!>`;X&&Tn-tl070+QGV9R)pg2(7K<pU7z>
zZ}o8#&;J0bmZd8Z0St0y&k8{bLvl#;q(nqMX(tPlw48+$+lz#B-vm<m;1I_H13l>(
ze|VOrZLH@E+3TLhsa!+lk`)aA0ILn#G5105_|gb`w_;;4vtS8iIodryr^6OhGRuZy
zQ12N(jX7;)i54rF)!9kPmBts}*EC%WU;ttxAli%>NCXu>-UL*L<T}W#aPEA@Jr~}C
z1g18IGF8VTamhZ}^u;_|nIwwJP(v5qt(*==e`=ivW;hfHy4L0?QCsJ7I{N`uMZ9=f
z5;DY|M`g#Y0?n+U^R9pga}183N|Na%iWQKy1MsAd3CHrR+?PVqv0Z0%n5PRHdiBjn
z?tJ5Jgo#x{ZR$3fRx!8==s-b|z;~z~?q4<TBcFnRKOF$~rjn3e#LIiVM3A^)j1?Wd
zNvgLp!*_5Yx<Db$7^eiEYAxH(xQ;c#Wpda!IiaOw46M<D56q=<exj*H!n$OZns3?E
zFp&x0ghC19wrTfvX&WiH<d-?)mG-EiyLi~UFbKFL<K`pUiM3X_GCDp~C)`xY`ifSS
z$L?5;Jvhf9yGWe;#4@vdr_hR$X1B8c07r^L^B`Z|^SJdm_NeWyR%cklGXDT|3FfQK
zn}m&LW>rZEc**&cbk1t|TPK+<iJYuXWn$^Z2`7lhuhyLxlhDkJ#C*amj2~Q8Xs%d+
zY_bO|#a2(RN+GxryB39rUz2zsZfZG6xpL-an$9>(OjQombQoqn{(w_nWrVSj6@rht
z7pTQS5=AuT6nWs06lAog3=dGlzd%9lijv+d&BM&Ohsue*RmNIEdgt1ci0(%;yMZ78
z0_6xeA4645;|X)+ld&>PXOrzunHo04iq5Xs1o8P({E;CnK2-~o^71LI1-S&qM@Ze}
z2v}qs^U|!w@6}^GE&(T}xu(RzGyC)jxxaQ8XCGR4WJ2o4E(gpTradZK4aG^8GNM^q
zGB(ga`-jxh%HVm>yvx5J5LfSig+F^NCMcFSET#4^<$&#<N`T(OpEXgL3}XfU`X1`t
zjy*?TYMWnT?_xm_S7}`Vd~Hp<Z9bK1J8wR1@embM1;+}!e8=llQt5oMQE=_RB;*19
zKJ_x*1yiR*1EO3EZex%SetL>lVRTP4kVm=&8-ov>y}c?HhSEt2ruHm=24jphQMkR0
zm=KJloD;u{4{Cz<Q)y%gZxa|$fTtrnvGZrtaaS5smqI00D7-E$%0AD(jk)yZp`K`C
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%0A@P@h
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%0A}a52{&
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%0AYdPx)Yok{smml|&l(a#rseOR^^VCdlXLd{7VM$j
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%0APdm<rC=iuKblqE
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%0A*
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%0AmB1_01c=J_+!4y>j{<
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%0D+!PeQ02Il~mjhp~eTT
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%0A@xmL0L<W;!rvo
z*u9=P=4;54JDc~588`#jRCb<3w+U{}&N4`jG07dyaloxp(9Nr|YfTO$(;>K9Unp;7
z5~%y#`KfI5xVIL#h{$4WmP`-F9qG}n#jcqoF+}k&c4UTgl`Ed3>s0KufomU=Jg9e`
zN#Lo^@~QWp#rvyr=k|V`Zs@k`=OmVocgn={TCt(V_O~<1HNwL-z}Cv+q3)zsG}`@~
z*QQX?EI~23jubHJLF{VF>X!0GhS8mpQG+2F+kw~fq|~+=lwQY3zAC$(&{;o`8FExJ
zrVf2RzJ{x`*4k~UwX>K?%H`e<?y>Ka(0wZ@RNq?*h?%74_uPHoaqUg}JmrB|2xG%;
z95qTsb6lx?t=vhey~&aoxWg0#kIS_(8#kJ9_RwTNcWzIVH@1JJTG)~@h@e&Zjz=B3
z)`T~r<}qn9pD=R{!~;H{`&IK<XhM%O)XsYd(FDmNg_9#|uOR;bO1EL87)(iVZnsL(
za#3*0$A3Xq=e7wDp5;txLE0ayeFu7c7d}E6*|$axB^bd!Ls_{=mZ20_{=}KC43?LX
z!wP)TGp{YjPhnQCEbUPe^3e!Y9H2QTj!jofn|swlUpxTH-B0D#u(b~q%ckBu&2p^C
z!p1sd=}@6LGNm}h8*=LQP}!i8=tT<?=I;C3eK_e^nuXk#XwqqS4JVS>jofEB=suN!
zs`#8<hL$Ek@*TKU;F^vtXIYvBjtfkLe0fd4C;Qd1q|&=Em2};WX>R7Uw=!yX@n!x)
z9Ag9yq~oPSapMbnMG(S^vv%ST<%iVPNzwHi>GO83sGKxmIb8eG?Q~mfZ{9_bhQ~iQ
z;6-c8O>Sq;K82t7OU2W?t8XDf<wRie55KK7Cf4s%vJixfhE?T<U@6OQ6mbtWRZXr>
zn7_;1)!FVPFb^tltP}TWqmX@RK2@?B=6ka~Eg|hMVqIF~?msvzFb;Yt^{XaH7?pVx
z?%)<)o|O56LXn%LX;sND8T-Iv-?ybf4Vv4lLXP`$xqQat1Mlrp^%~Hc(nqy<BD=Z9
z^YV?kE&dgL!uwa#w8<>(Oukb$%_FbfJ$R~R<Fwm6ka>ZI7%n#eJC9$bZ2thlOxLTM
zdv$nP6%1GdjyNOIrQEd4A$=Fx%g(MIL;PI|_hIi=>@DqH;ovT@M<5uLn<4(5l<8oC
zWyCC7oa`f%sAEU7*t01UGvzb>uOCWe*mR~cUR9bnV+s4X2svUq)m8C4c0pixHj>9{
zE;EdCny-JO-0B*leU9=#$bM*)^Uiq{r>A^BcYXK4w=nsY&I)_uwHJ!qn^bQ^Lusre
z_TOmIZ={WhCD{DI#yWddh0wL{5k0+(QW?UrW`wp2eSHO9vhc2tWgDcRA|c946CJGC
zt%z+Q1IaAHNdVd-2j(8R>^Q7tUMpj0QIq(LWcX!iW)|}0m*&Xwd!VaUo(6)<tB_=9
zl$;KVPjgz*M2VM{HwBmg81wnkD@$*2m<9nrB@L1pYX?@Op62R}HPDMkv`b{SX>0~}
zFy2Vx>sIcB+JKfB6fA64%R)1g>IkSIVv75pEOVT9T=9>kJY7XE?vrs)m{T9{zkK=%
z$)@#YipxY#Z8oW9zh-NMOGuw=h^dl(wJxn@EQi`%)ljD4BafAR%~83Dtzv2Cc8)MW
z4W0@9wO3Gvb+%cxE9itx^1Nq1ycqPPmBG6ry!!T)43j{!uJXB78Nq(UdwW&X)htrn
zOCX1PebsNfoN|4umeln<9?jfGA&<;(A;=jX)qcb5+J<5lEwCtU_YJ`Ht8lV2RW8n+
z4-zHCnL&UsLo$z;3a)hvOLH4bGc&Z?7BEg+cKTH-L1@NXNaVzl!}7@+XJ$RAo*M98
zyQyoD+}z)JP&C+lu1hHI&q|vljX9q|m-^k-lX)(l(7G<-S!5h!`}V1{y+g!$gvn(R
zD#pW+v!869;<}F#XqrxwaSW5pw_%79MZ2#YXWp@{ukLpkm&=CVcIgpUkUJ22QcW}s
zHLEAmWP;t}i%`4WDsB=iLmR%e1LjXUXu`yE!zs@lsv$MJ*_y^YrvZz9I;JLg!4Bp}
z1h(LQM_lw2(rts1MzNaS2_cpa88BqrI49Pid7kEPG!Pa^Hvm_FM_g7~>T+Bxu{kju
z0FJ|<^ggDnEXxdKo^v~|--<q}KfDE3Aw1}2t*qLsxV~T<oTttASEhZ*th?LdmdiYB
z5#!urA^L;rJDSkA(tJJ)_e{4EGd5obgZ}94QCwQZZ)t5A(-nHDj1E*|BQ5J%$CVk$
zwsUYDS{XjsEx`(m3|k2pYUnhJo6GQ#*+x_xmO^+3xj&6n)FhtzMO%oYL{dazB*r+$
zHI-|3d#7IrWF&4lPTZcAZYoI5?kv>QE?|!3$Jto29&p$Ny(*pNr*#~LTadpp`C>!?
zb^*{IU&g6luC;L~vr>Vdf=I>>wIqHX+`;G6envY&ka%xHRHGHSEy$K_Yfiamv$%<p
zU4X37HZk~AP`%yE%{7z_<{-&pKJt%B(Y4a7wB!<An4V+8fG|fr4K3G-Vv6BxH0w>W
z90kG-GuI~_DYm)_&ia+K+Zp1WQ(^^YEZfHeJeo_3O$OHa;=h_nBzMFqA9L3~L00C`
z{6T%P$}4^9*kbW^Q{Or1R`ef+l1VB{f2lHn#Y~${<Q}yyaay(t5^qFMxzis_D%SCC
zx0?jY-5BGar_!Hwq-*z<@Ie!)Mq*nE2H!!N>&?}?)+bMvILfGG!^Q?w9Bu>O6%Ed%
zZEG}gPY>Nt5S1GT9qTV`<ZbL@)tDMb!#zh-keh^=3Sc*wylw4{)vu=bKTp%=Tlj6l
zd1n&BSP<Cb@b#@Lt#vL5w`FEg2xJjSh0o#Et4kfs@FJwKIgpZ4Jnj_^rAZX2(~iW~
zb7)dXx@pwf(PV6SEP9M}6w9b|T{w%lbzR95Zd4KydUemOW8dlb*H0W*mkM29<z-wP
zb_2PnB-0ApNd(WFf_5)@e2MPH=PtvwUl#AbXyJ{dS0BPb*gZ$7sy<Gn6v(=ng*iFo
z_w@CvcJE_q8Yp!9Dx55`W3O>elTWs}w=kQWklAJj1D@5YNi7UpZ*!g0<Gi=LXO)st
zz!2!!DUV-zvmCNm!y5Ua6^UTD=O?MnY~3!DLg~wDWkorW&kWpj4c8S9_I0h=Nez@@
zG0`KRlK%ihS9C`yP6fKtE+e|KvGZfV!0Hqpt?yb|j;xbP3>Iw>QUt1mVYvIi3ac)S
za=T%Oly{II$?5bJ4yUHBm$?@EF)j<bpP4;+(zIDul0%HPOj;{>&hopCAE5Q7!)<k_
z1ZXaI0QhDD?~g(0Rpz_5-qOb#5HYs|0K?bbty^lZ3rB2_1s-nm6R+Q6-`G&%($Jn{
z_bh9gEVgDlQwzoNec1`zGCGr4t`f=_6$qA0;heGLdK$f~c#`(+FSSj18nk2QP?=(Y
zU;$Xt-|6jPxuh9lSODGqfBMwv#!YHW=N^TDtX^zn61my|n16V7098qKkR>~t2S0Zi
zC)n0~o!#8i`K*i*L$tFG(yqg8zE3hmP@!_l=V;HSduFw9iZW7^mV@oS*{s~GHt;F)
zIAjaTj+JUZ25QLSSs{6&N5{+6eNHL1+ThaUOPH-n7Hz1iGDoqgkBGcetd;^MjyK?8
zG18&A-%X8U7+YP)BezRJ@Xr8?bCp(ZcKt`KSCR=QA7_dp9axR3J65H>on>pA%gdQ1
zXOHH5@G;vJV#`mty17UppUMZN&fKbxdOf62ayDg|v}J(?@~%EvR!%p6^{SP|v?peY
z&A?-oPnUo{&wA98!Lwf639c?uK-vA%CJsk`rCigzE2i1*I)q_RugJ(SSbB5XrPZYs
zdyP`5Cu285v$?r{D(HlLxNV&Ve~TWq(CNMqwsi9*XdiIK3iKYPv|!S-kr+1767i-$
z2lCBdYcH}x<_N;3%$LU>TH~pRl%AR$5Tc^BDna0_D&E*!L=sW7m|(_1J?fm=EVhj)
zw}v;)Sg9B+{ebipyB?1P<1Nf(#EL;XWFztwt8JiY2<GXMMs`iAuOT}>+Qne%$!^Wm
z6WJWyzMl&iu5OYY?wFXwFjE4wuQb-Rw?<8BAVA4>Q=Il5*r}w@Z8o%a>QE9wmnW0!
zpGqT59LllC8RtYI0%XUOdKMt?e!p5ucONZ`Yuz_|4GMwfyAsN)fak7H<4lU$<|Q9x
zg^M--h!M+udseJ={{U$p=(g;tAC_aC$EP3RPD!KF<a?<aID}{A@Ab&4=4ogyRN0z*
zBd%S>F4^R?jX@5Q<&_x!03JPhReAh9rdSBg<<re76Si&V9XjCjuGKWF%Zo#(3%o0?
z2yf!_<I=g!S_MNYT<o0`V3;`1G(xo4N)bg%Z|rF0Xd>G*yFn1ig24LcwO`ZhEiV!{
z;IwVQ$p<_W{uP@nFg51;HsKH!QTLqtA3;`Z<dzGCl}w1+Ps$r0kEJ<kB$6#^mROVR
z7Slo&EE|X!N%J_z;ZC(Ti4#w5;ZgI94sqydiK+t_5=Dd$pEHcVwK@yfV=S^l=(*hJ
z-kzeO&c$^qYC6RB@cp9D<f@R+K5}Y;uCuDyy~|$2tso!|?t2e<)|y==ci9#Aich?V
z<33>i@3kyi)}3Ig_OU}Gj!9@FUQqu4Q}n7@EfAV*m{y({)tgdTiZH@1;#loI)g|wT
zCDw4-uA;Xs9GEbc+qHWESM^^NU0teKc?K}2c0d>z?ZsmM0BTz`^j8|4t2N58D=Hiz
z1P}-v&MSDzPg5Br^d*PES}va}PZflQU7*NiZPAh0MP6Ia+^w+FVTf<twIUc&1~R^t
zCBwlI1-{i0rP;(|BWj+2`_y0XktDY*JT}US3}IMp9G?FGN^Vk?;!%utL!VNLBD1HI
zyX3@!Z{GrwQ}H|M%q^z3Wrillo=!MCU=M1JT{`yiEJbkyYmYWBm$C21TE*2RO*Y`l
z*^q(@zD~`!>ID%=u{kt1QH)(r_IAE^g{0>s?NQqlw$@kk$g$WLl3m}s3UCzv0D7Ue
z)Y9TT%N|)+lKBCBsz2?45GLMSorfTF&$Vr4XUvIaH;_)TJi=nGOrbr08k<UpTq->3
z&=-(~<K<F28pj%+pE$bmu*{nX&)%(VJ5RozKeW7Zy|`Xu*@KVoW{E2yC(Oxp*|dvv
zRIsrD@_0Z3s~+PW%~XmAr$Hf@%Qo<-85|SbA3!?hrnt4Zx|tTsfZQMhcH`|@dQOe!
z#9L5LCt{t-!v`bSRJkOJ<!zPhmODjTIG+m4eo`_^b>Q}``%ePTsoTe>Z;))uNg7CY
zk?3()nxwHzJgFoQ%z$l7e9|7>I$%}(2gNs5AvEysxyd5~kN&l1CffH)ib>g)n?$&^
zv=)}yZrNhX2iw61rVUk=!gho_uCH;HBPoy%Z2H#H-_5Jw3zYKE=4|kB>6*^*AB`+D
zq?S8-H6qvoj&K@N+z(+;oZf{s6o_<9F`}L2x@4YbjHq|#9>YBaYKvx)M27m_c-BM%
zc^O#1?^!MJC&Jo&m<^_pb99BH8?rd*laIouw(->0_OBEZ`4Y`;e8}Wcm0wYwl%*N&
zR9q}eJ%cU6qz+te{ozK+xcqtnS~@)XeX08_Bg~Mw-pqJG*nMiSyV4%tYTgBp$@{2&
zY<iDVQt6iV&9d&vo62#Io2fsKddf}O#*nqmi1jD)fS%|iNV)RYk_~7lh+wfuC%Akx
zk&^(3=PmW^R2~E6W;<}`M$-`G+u!L-(|jRwe=^0W%jDaUn8-a3s1=RbwuOB{d%-#W
z(2<pw=Gx8oiS(*vWk&lvGi8)-mCKUZCxy>y=rybD76gLU*4=J`xmiq~dP9r?4{Tzw
z9tVy#hTlz;Gq&klt1;{c(u)HlYui90zLM%EM3?<C5_XNf!S^)nO*|%+(ZS)UBy2f!
zGPq{vr*4DSy;Rd|;051O*}8Ls6Z82B(3Tsfx{K_#d)6`puBnZSjw$JTp>DMoOwkf3
zlH*g7E&I2zh+unh>r&4hq!Oj=n?=4i+#{57=h$P4Y!S~Z8=2M758ZNbRF3q?w5X6J
z&F>MPof({-M}J{Z+j_PZNPW(;1d*gK60A?cl~4(g_Bf~ridaRp<eQNsAfV-ykGE={
zPPd-sbL2miTbWD8orB(}T<Flk-g}2x8ISM0!;(qsRU2NymBwCP+vxVD%GDG!jkXiF
z=2O=Orn}TN3z(7{rcn@W%@Uvl9CMRdlgDW+v9K&;3_+2fAmCIJ>e^+z4R06CDvZ0C
z4kTYdKMLqjyD@DdTis$COLmpZn_}f%6yqbQ1Ky(2H7Mg_cIZWd9n!}*%WXZg>sU#s
zU+XX#<+KO`ou!E3LBKqJI?8=pQC1go+==53V-dnOlpo#)y>-Tw<71Xpl4pIY_@d88
zw~%S}0x2SlG#4ia1omO{?_B1i;@fZxx{kLpvLW(ejfh#?<3BI*J*$_S#L~}eADSLV
zNnLa6ANLQgJ07&Q78h;?rzBEI7+}#z7dt+cq-e$~-ZFLNCuC^BsLD4-5=bKhA?C?s
zJ;C+*)p;+q4MrEWwVj*I+{u;d2V8mz)E*twjAmgX24vrvo1MQ-^`jbF%VQ<3g=`3T
zL7C)Hk&I-IL7voe#cY8_Pjj7)!biEY)8A1DjDL1YoH0FD>+eqSABNK2?n!Me<xSCm
zo5o6<cQvf`5L>sKDg_aI#N(%_0<Y<ox3?CDO_J;PGXl|0(frP&{oMO{()O)8p!RoG
zXBB6n>X#@XDp}NH8#!v!u(8lA#75_HPKA__j&smf&Hk%(rbL=Xk!XzZazjQ75#OHG
zod%h!YYQ&56GI)OU+WuZ%%{K7t<;pa(4S{#py%<1m8aU=Tj;(YfnC>Y&iu%{@&{p9
z_ZJ$q;0<wX(W?yFsvK-R*w(F&gbaX0(PbRuyZRIBU0hxnN#F|BXtN0XkXd?;)tsu*
zrd(*$sCn?y-51W(HmeX6;9zsox2(J?ZK%j1wXkwyPzy%fJ7cizU8a%nzBFV@yU3iE
z4yfP4z5b@Q?qRag)C+45-R}8jz#BbJze?q+j@HmRDd7JAnBlaah5rEB7cxn88Y-3f
zWawl1*K4F{UJ24+WxUg#N5bF|04_hJHVXh%t}M>z=9BLO_mB8glj%zgL9bUYAo()f
zW9eKqE7Ym+Gp-bA!Dx$jI^<I39Xi4Y<6t(EjiCB}_3CTi4(hpsP`-=Hh>@}-INJF2
ztowZ^OtM{~ZAk_t9k4k3D{9|Vp6f<BNg^Q=jL9PB3tZBdF2?FNGd{<29DYNipz})*
zMsxlZ1kg=9dnS`{2LJ^F1JbqJCB48XyPqI7)10kAs<zn;v5RA17+FB;@9j!6yRe*9
zjJr#Cbjgj)v=0P`eo;8!XTKF@=T^CKEK%74@&V>BPyzS$q*$&dyA#WBtWa)nd*iPa
z8Ww^;(@D5F<yZT@qP4iKVmSOeHPZPqhB4gBv&_c;9{&JJv8ecVeKtJ66Joax2H-K?
zk}XT@S37NImvpgh{o>_u=tpX`d4DAKNsJBQfh=$s`h6(8+er;5kuIYhq7|}LV%XfE
zXLqn2s>FJ|%u&k(<%(_OjyC;kFG<#pje56pC>I&p6KG+#JRDPQb*GB+?Y4~|Q7%kn
zLEWCY_Nw+*V&}3a)%7U=7Y#E$6a_`j0PKCuRX4N5VY{>pld;6?dSkZ~TSB+7G=gVo
z9zsd<9>db2lJiW`<4c`-<i;7WPz*QW^{wL+m5k)|yEUwJRJd02?IQVx#+{Qm9-w;E
z(MP7-U-_|Le4;#gDte!%t#Mu>@y>~)PYBbbSj>&{Lep+wan$-%8^4Hpo|SDZx^zBm
z(nY=~m<+B@QhTrKS}Zi=X6wQyO|IU>r%o)dE`&=uk+r{rp0&v9zB$q@VVcwJKo&-X
zWimki@cR1JW{aVC&&F~ajdpgAB$#A8WM`avdz#tMei_)$do0shO*D+7WQuY!4>@0_
zdg+WQQeN}a!OEpa?&yr&4@K0qHHT39P>_YhNbXL-?t6;rbngh5ViMlFT+Ixd^SI#i
z&<fkKJ{Rz<nrZiNOv!@eM7x-;QVGURJu4Si@!M-R!q38pBZ4H{lPJh%CkNlPMC!_;
z_jWW?p-pP_HS9b)Y%Qg`irJt6nY@`73_w3I0CcGaq2YZy{Tgjk5G(n&8%N9+&}aEq
zH8AmBtEi-JB#4U`^Gbc`8`C|9e|+|=yYC5V602Tnw~p+x6!PSJDD>&=QyM(Z@?&*5
zRicj2d_wTpwYad-Eh2QAD2I4v3Qk5&2Q?Ov<4f%l3AfnCIydgtXTey`cn3elTy~?a
z=sp`*p|;aL(=^SoXWh3h2Vv+dIvs1oUMrO8UL4UG2zD~NkCYzg9f|j?77`XSc$r-9
z^?x5m&n%uG)nkl8e9jOk&!z_$6^%c}JwoibI&9O&jKF@&v750V)-ILc9Zz4@AWd%l
zmMK>#(tX2@sC$oN?b^KpTP-V1v$nH|KGtoNM*}$LIO)${$F3_W#)Ta%b4W_PMcEwc
z>NooQX&#5COQ+i=9^y%UW^DEz^>!F8Y>m0Q-1g2(poPjYBdBBPpU<UgjXG%KOYKfn
z+q;;NcAufgYNe~&X;x7cyt`tjCEZ_z&u?nURE(XHDZ#~EvP)L9jczVOO7fVo0!b+<
zq@L^3KJ^Ull1UxK#17IS{p4!<atCAU&18*w+6i7AHQmZa6=am;u78W(u3E^SWl*rR
zlMY+WYzOxhYMM;XpP5**6~MQQ$GjAgw+O)GA4*G2a#GuEr4b-<t|W^+I)U#|Ex(@{
zNpwVVtCEPP?&taOR+X&uIFiAby6@b+V96!Ao_h+Wmq1OHSpk}9Euv^)mJ|dtZY90F
zDbT^9rSjWe-DWVEn3p4C`;SV2wTPe|c(&TWl?Qk^^dsJ@%cuz~vo@WZrzEl#A3r<*
zed=t=x-4oFcy(=MXoDn+3HvMg#3K@UBoADE6^(P^T~2G&i%k$I35>|QiV@rqTDP7A
zzkN6RO<`MdPwwG!kT}jOGfcG7bo()Ha#}au#K`P-b?Nl<t5#cvw---)`Q~jp(g|*z
zPU&u8LJ>2cl;^8)@7pz~o*mRAv|UG0v62ZFg9O;i4$P!>`qON6eKSjvI3kIJu5eEL
zC}ZnZBi5suK$q7|BYC)GjB<JGJw2)??K!ks0_C=>#k;q(wSO`wB#IXqVD0l~{{Yug
zUQKTb3wycLNU4=b+aZ3Z)~@Oz#jYk>=-E(Xd1vH$0BaIo8fdz8td`M2B-rFc(hy2>
z>E5(n@+Gw$%jYWzX%&`FFLW}paHrGjipbUExv+`u?V$76FUm8xd*oH!FT|Ri#lg9b
z&`&Ijhw~5x0~~QiqW96Lj_@i*+%>q2e8;~vaaLqWrnE3FY;}!N)mHiAF^P95fNcQP
z{XfDwrOER&FSJ7xNB7qf93+Pv<I@#(IIZ-1IAxYUHQH7zg|KAw3!a}!uc`R6Q*A0;
zJY1t9O5R9R##r@3>w)>!j`G;g-Hxne>^#(s=0E7ff%6@VdSsse09wx1pqkHp#8NWl
z07)XrMEd5Lsa&nhX=x;G%J^A~V+1d3A8OF>{FCZaNvG=<Ed_*R0<9h~=yUH^Wd(La
zZcfO{(zPve_Q|}9=;DGSnWZuDAUtF1pIXtju++7yWqFd~M~%rxR{3L5z$YEOtDuL&
zD`|P;>Ch^ps8&WHz4`jqo|WOvMJ~$2GRP$uR7m!OJ;AIeiG+6C))Zv-GIY-mY4>`B
z6I`pfXB+&vNH_zbJ%x1f*hwvtt3s+3hzDrkdwcuUH<m3C{PU&!(G%vrLCE@gRol&4
z=I})%h!Y4N7F7TN>PMw;)ST)&ol%TpjN6vCf;N9OQKD~>75mISz5bP6((_P(n$fP(
zH+CjhWWd?jVykL8(Jmx*jgx)~BJJJuZ+hmnEooy8X1N8>oLk69cvy5T?Ohb;IW0`5
zRw?Lo*ZwKfbf=EYU9X-2X)Vy?sXaeB%GLaM*4AP_wTE{bUez*KA5up_SeANa-_Lgx
z=IVC<iIjcp@>l3PS5c&Rek&WVBI|4-<}k}W#5}m``BuKll`>T7Ptd`Mb*s4qx7x4G
zBH+f$m2ufX_WbJZmEf3X4GygG%F?)Op(+Xf?;QuVYs;nI>9;AXSj`0X_QQ3_Xz~jB
z4@2o!tvo|}9-i-S8m+6wT=|fUhW>RjsP>6bg1@{i&xb7RlgM~uie5fd;2e&ebTwz}
zNX9r|hA$>1Ir9Gi)-!q^=~W`rf3z)H=$XFLKM`g^P_XU?YS0%+X(;<Ov}xo*JjZ3p
zk-M+g(z%;`S-espyVFqu!*;5U>%>4E>Tn3>*Bz=`yJ#=8$lf^`UpFy6&WVBC_B6}r
z=d*b3wI7yeT*nY>9jB1l@7J1+?_Sd_6?9u^m0i~|EXQt1<b(LqNy%tZv2#O#Br@CS
z@i7sq?`9i}gE-sGTi0NYHS<2lG%D-0;gPohI(~JNqTR_XChFWWuv{+oz#R6+U#%C9
zsSMf0ERn3-xs#s#MtW4)-s4Y8qOPN<M`0ndg33uG3A~7Kc=!JR3T39hB<2{dZWYG;
z@d(D;HaZjZr*62!5Lw%$yIaUf3xd)sb$s_Z$@Qu2v_-dfw89`iaLM;_$2^|iwRcF1
zJBrPB1Whz?I)4^r<$3Fo{cBbjMV!$FnE;q%NKdHk=}Dv8_<K)z7UxoH$yGq!$K;dP
zf3iA%g=KhyThrC%h+ORsp)E@CBW(0Ow36m_8)_=&X{mV5&Fv$FV~RKsY}&&i4mn}!
zO>&y9zaFU)TiYRdUD+Zmah2|Vg0gMwwTruxJfrP9KptA1ilFo-)~`c#6e%KU;U&ix
z48Rbr=s&`$6e9<8M5;HTYr>G*wwEXRD%~J<#mr<cltJiyPxGw3W(Shy-tyA_0LqdX
z7)cV3mPI4D_4M?pE+@Z^@Wl<Gw~dZVqYbCmj@1OOsb5?~ZQU9$+l$D&?ZM!FJu9LS
z*HbA=v13u56BABvOm``hD?6QpbN~u~_@a3;rCCI>I6?d58Nu~63+Wegt8ObNm`OnG
z$J5@UkHU9C+xuGC<+SqL`SGIUvkrj!RePwL&gAiFH!<3MqWe|dBa^m2D1bhcmsW-;
zEuyxv`L|_KCHvzXlU*IGv){B6M`{d;szl5N7Xt_7s8Y}OvpKj&l25%JI0HSsDLIy@
z+{Ur+>~Y`EaUHvY!AA$=1f22ceXDL5E!z5PkFyq)?bZ|}h9k#TBCjryB8WF3jf?#8
zzXDaq82<o0seDS>Wrmj}+p5DfQ5~^v$!7ZYtR+*KnkXo%vfh`YY4%!o+9#WHvuq9r
zH8sucwWJ95(k0X<azz|pBgDh_kFIN;Pl$4ARs+NA$@Y&ZtS#j2VCSZI=M{TQvALQt
zb8{b^B1R*UF~c)=VeMH;GFzG{C!!g3{joU{8?<z9nHCPJzK!ozbj>S%qS9*<J;2zZ
zVkbBs-6PW!=DD&`AhMo6G_RL5L%RJvYHMYd2t23(67Kn>Je+n@Qss4GlGMMd>ha9U
zH`t<zGar<ypcm<ZoOU1QrBkrEiDEF!sT{GAS9c`y-}%x<5V&V)VwN&jY1xh09-j2~
zvXau-WDqig^1kj^XV#(Uim`0kJ<CU?{in&bBhGmO?tR2^0sa-O2%xf+Ej5I+4uf*S
zl0Hh~gSdP3%~Y}d&Eza*5kwm@Mn^ILI%n&OQ>jF<s?V2qI9Su=TvR>FTMoFkx0?R|
zbdtm|jGW`k_x}LvQfXH++Q~eU-Kz-(*s!=OgTpE9nh><o7JJxLOO43T=YRV-?e(i3
zP4(G=;?l^y)N&IEzzE|Q+D1Ed&$SmFhg#d}H`dYG{jA9pOj)O!mL&H2*GUAj=ysO(
zX?P9G7V{N&*au4GPM5D}5Vos!%#uh>+c#ciIpYVg{{RZGy6x?=z?Rx^xM|S+x^SD8
z+A)md)rsJGVUJ;y)y9n<?HiM>jcnf`xmDW}NC6o={<y2{r)YQ9Yjvqzvm0&FJ6lLq
zow|NPx%+V>jIy0RM7AtIx_1}@(;aJG&1Cx;z>+FMCU*wpu<Qw`Z49k<VwV@KwnCVM
zEODPh-#)(e3tG#*G?s7mWCne_g#&?}^{*tb2sRDhYU{TdR#DorWxkFX$qo^-_ar>C
ze{_!C)VB+xYfSLH&Y@*-VWgir=tO27TJB&vk{7-`DxKB4#Ngb|9CBj@XyV(*9P!$!
z=>96ybc@*TwD)wGA3LFJGB<8&#rC1B+(i@JSr0W_%PBw)oDY9t?bfB)6tyySs3a44
zrr`YQ0baZR0LR{+b9*HAu*u}H!xfVUguwgU`ubL`p#&Fp%_Xv{C|&!u^kO;>{<UCD
zCDn<K$Y|w~LVU3p%APsTuS&SJB4nC0VbT}Ld;4jkSJ}CP1GRbTJ<T?4F{HG6Xl&q?
zDS<oHHmH8N{7qTYFT~+m{?(*lqkon1@!VpFudUe4WpRM9oZA7^<oDyCscxd1*FmKg
zhG~*pUO-ZHN5R=Cg|V@PXxr#E*HWe2TI2*L+)=q?Q_~)Xv!ZJ~GWKcZM#zj73BsxO
z_4?GuQ4_+q*3po%9i>0IeQ0fznnwPes@z*xCYsj{L{gpEa!B_2)>f%{BCwxj!az{D
zj9rb(lh+=Gt0|g!m81<DIoh#w$sNTPFiSkbVQ7XZ56-)?pq~E#r8I%aWwxOvB9ch=
zyJI{4>v8%D)00bv{{T;t>05Tpv~Y&Qf;i55f&8i;4ES?SzVRa4_?uQ(^vU2NQxPGe
z`g_!VA+_-5hwo<6yfu4ysoKK%w!M|Muu?ja-_orlBv8GPL~?;PBQO<_Tx1`|wNQ&w
z{?48ue{LpOK3M~tkhtKC^u<l7Bu{vcaX3p~v-yhK$N{m)Z&6fXjNV+ssaQ&*e*n7W
zRmU6y&{gP(cP!l-Nu0@Q5*26L60-8m{qJw3GF=ob$#HWo>^?+!IRtnA0P9kHsI28f
zypFO3bXf6{c>Dz_Ymi&O)}|z7^Us+(HwaHb>q%HHjTkPp(12<_U|>sa$OVVcdseT8
z{Bx$hsAe`LE#qZWwGv<)4_{OHR}p{W+gmA6-4$>jF)84ZJ^d<#-ah+M$l6|*S9w3Y
zX!0XD>592wok-cO2=?)VJ(tG1_Jb{myV3N*t11Aga01AUv=XF_pdZhQ^J#o{q*}=F
z>JIX#Jbj;&*PaJlR!dEF;_^S?A@M!UwX}F-dolA$M@YSa_4lkzO2H!4B)hlKrm(~2
zI82+5vuD)*0Gw6fu$1XXl^E2-N$s)H>N=^lX=0w<DFcA<+)K-{^&gP+u4>`@Nj#?U
zH3-@%P9O;x`AF&;-mXjG{ZCttOWVl|4}hc2QbBIPvD4bLY;*{$Vo4&IrW?u#kvsQ(
zdw)vnPMtFbs!i-?+iDudo2QLCSF~wkjf{XP#FA&Wdx2W^Iv%5|m|?$0@*$K-0uTUJ
zKA7+CTly}Qq3O$SdvR&!h(i=vB+gj%>(|<}G`&vMCz>?3NbQa=l3?Mp$p)~VAtmmk
zrk)+Yh{T)1_V$BqsSI7qJWkxR_xe_jjVyXf#TCtvk>drL-*-QsZ|Pb(^cp^`Zya{p
z(UtJyb{UR4<G23+TAKxptX8FDiIOOeBn<xmHa&8B*DR_^S~I3Jp$BwNbE(?Bi(F`T
zepH)ClF~w4vi|^d_T$u2*%*YSpp~~M1|WmxM(TL>sxV1we|nl_j-?DTGaoIbB&opQ
z5(gRS^{o5r&+JK%e8Bm;?$r;>f8Ecxq7b^W8*z%%>aR7M4Jj@)00T&4A8e0#F)st|
zukf+zK;zQ0b$=S$P9Dnrq9I~gBa#&WFh7U?0IIp)9{Bd(Qi451T}B4M98wrWZhHK#
z0OSHrKDC$OJ2`w!B$ltLJeNi$F__Z|=sxlG+s037-WYXj$ih{X?GkShYt|90+MF=3
zwmVVeMB+2wclh@;%U<}CSC7xPNlO>v*_D3b_x}JI(eYf`hMdi1qD>2AjKwc1$U5`f
zlUX(v6JFgep#%Yu+^y8Zk^mhCU`2Wq;T0RRhNR@>V_MqX^=nk#(K```gC90Kny+mv
z7PCCVQH>iuSCR)s9Sw9AnoO`rw|`=2jF!Pfj&p?`xbIZ$qmJDqj!58|BBUZm9v!*o
zlhf-`rh|~&_<7=KJS8R7t)->C<*uNo?QM4mlR4vRlhf(+J*%X$_@k+KV$Hli;S23f
z!%ULsJ^q@H=0Nx##2bKf&luzk*AE=GntquI*u=RG%Z5zhPjWrFX1DZv+wD6^npeHI
z-eD^&a>2Yx3H>o#^&uHMv!a{O*oRZ_w~6(bb)OjcTK3k;=H(*2yVI3Kq5ygS0C?b&
zj=r4YxAmAbFA8c?H-WWiwXHoy$ZuW{ts>(ia3E}M$J`#3=hwHA-CjckQ%JGKqY|;g
zD<0yuydQU_e`_V*ie;U&=)n_30^!(?$DV&mhaR{26qVVR;=4;dMi^(7(5&jte2{RY
z9;D-_s-76}jsF0`#<=kpg!Ldp+L$gRLRkPL61YD2{HuG#^F-6_ita6_cjPC`;Pg-{
zk+<;m!lPbFzv#P+tpoMlobozjy=_UU)3l7{xn-f&cn{;%rh(#(JI1<pi>KU7ll<}C
zTV^J1r*Z-^3FD~x*H_|?iyj8}v8vqaui)|F>#0wfHlJfMv~kJMk-)$|dmg0v*OY2H
z92)Ma9nHK^i6o3H%Mri`2OJJ7M&H2Z=Tm!Fe1Q`{q}&-u!vXUvdiKZHwI@b`pEpsd
z$)iNu+~2h8V<cPRLo3HB;U7Q4$4}`@FvD`*X@U05609g&4I7TVIKcd>7rBwV#7Kxc
zxDvO^B9qfU=bBr)(y)@-oCAo`EN%_{755El&&}?KO>WZ2p`nqCl43^#3iupn+NoYm
zC8Ifeh#q-cYwb>|JqKVa#nS;Km#{R2gdi9My~ptm)WF6@FeQYMm@w?}ft4rTs_h8G
z*F}sPciJYm%=^mQ$r<N8fgS#}$ZFOyqe#y27upPJ7auoz?sZFOF1*8UD=8oq-~22+
zD+9z9FvtMaKq|iwb@R_M71|N8)7r9s70ux-EO0u7v|@iQG#hdjK>VGjt#cQebdm;!
z(opXdjkKsak#o}>$n~zvRf^sR7P-MLL~Y&M{5|WN)vch9Wvj(6m>r+@QhmieN%yLD
zvC~ProcWR~UC^{rJB)~noMWDMdYn}}rP4&|K@B5d<bW~Q<F7Sx?^1b0M)6TqWhrTe
z13&E^=RT&Odr2fllL}TgB+7VS!m@3hh^=G@oPDNo5;KzGQ=Pt>ao^gvZ3&trv~Z0f
za#Y8V2=_IK3|@3(TOx&%I4&~79l@;~I`p94vPKke!yk7Z{is(7YIL?&P~2`Z%D*CD
zOjM{OakT#cjcZ$+$pkPF=7hrqCj@#QZuzc$0cz{A<aw6fP;G)zq1^Rc{{Twb(-PU?
zlEyjkv7l|G{&WYbvGn($qZgsErl1MEQJBRh=|Lp%S`f}I9C-~JVekN6Gu+l(b9qsl
zi%AcW3}Qm6nUSL(c(1NKI@X=Nl#Gb>jv1RR6e^#6Pdl?wYcnZ3v00HN`%Sw$%$W-m
z2b1b>c&3|S8z5Lp#z`)Pvc%(`prrF-K&>Q#DEDz8AQWNWBl4$Qpn=oMf>u)Dq&d%S
zNcQ%jB1nbIX(V>=L}Wvjd3eGp?MdgwDNW;WS0YqA0;9DO3+K2mBmgY95TY+E2dxUl
zLn|TTJaPs%dR3%?<Akpya|j}Fh{;0u-H&fyr8%~|(Z*#)B?7ON!<NT?r>#U~id%(&
zuMq%E*9hDd^u{}r+ND`yZQO_zRZPzz%O^j>ft=IU;F!;}%W4+Z$`*|7K4+Mr$Q|37
zulAM&?fmDJKrNJ9A~8Gz?ti5=;iDGPMGeG}CBZ1Ox!iW=vGuC4eVOBuTgR1c(MqSz
zM)D6@YQrBi?6di|R~xNSklY1Nm=pXy-qhLBXl~^z0|0O#$@`$6y;33C?KxBPL=n-)
z%*)t{uHHlq<sHBv&Rxj^J&je<8e=9Bg%Qmp4t(4ysuB2~S|^uJ)grlR>|_%}xQSwy
z8F9xxgW8y45D4Y+jOrvTs}tiR(4R_SXx1aT(W6f}n4yqvIrJi-yA}i~oE5x{Q_B7H
zO$o{MQSVX3diKzZWLTZ$c2cZ>nAfg(@9$Fiq34Ze%yCFD=g$1ZeSqs!!)jJ$OKnQ>
z)v`|Mpo5T|MoHwHRJ}&7O(~gttEmR%S3X(@#^yc9?V7Ifgew%U_IUD3XP_sZao3uW
zRya{^-f<F^#BVEPbLsd~QrcU$jS|{tk)^~j2KhntC)`pjqa)heNRU`XEQOzO2;*jb
zNbN<tT(zu;ac<k@l&Nsw9>2@dt-)^uD?B!~5}}uw8JH3Vc_Z7}sZXiHWT#KKP-j!}
z$Oy&{PCaP>Kb>s_%$F@1TgHJmz0-V$x69~B{&iaN!BnrA6UiY3l;;2ry#D}0PA#z>
z8IvWKf7$Li-=FD9T=|istg}h8D7&_U$4{W9fJmdApr1{NlHwMOFnCAIGtSmMX&xaG
z27yv}WWWow<YT)N+M7MfJ<84_*mo*zkL4pBLw+?Qth2PkD;qNb6lFg4J^Omlm=O74
z<#m=!peL9H4)5-oBWdp$tt~E9{!iXpM44!p``PYuL&rIsDj_6fhE>5IhjU0Y`&nU%
z+V194av0`q#x!+qgOB2-GAZVH1Y3b!lb!D0#<<{QQZ$H?gF9fi3NwR`@Tp>0<nt3x
zXrJuk65Go8bRhC+s#+G4Y>~P+2Y%fBM?EQ~JxJ$yTt$fy7AI!hy+|Y5tt6JW5x|jL
zxtdpUt8xb1o}f3U9V+51?HXymOCrnnR3Ib+&g}jbO6{SJHkL-(pLKFhc<=8`HDZX}
zQCn@m{{T|iU~&r7=?%<_G=5^Fv99&qkO%jAR8w2LGsgjxN`nqc6P`!iZ(LG_CK-JD
zxX6)k50`+WKE2H{k|tn_5f5zT!|!QCn?mGc6(p_pWP3JvFs-<=9zi{`+N;GT))w;I
z!=1c5pzuGbsjaSIfdIL9j6t$a%&F(EtulyyW+A0@F_!(><DsUjd6*FaBN+%#r|zG8
z)YrBX+iE55-{hNUgu*^mUb*)^w99n4yA2#=Jk(|eY<z)p)OwnC0j5bzS@U5G7>Oe>
z=PUK~sHC6IXSPD2v4&h@Be4Gf>(iyShFF}$rGfbml;<t#aZ%l~x%uv*M?k(x6vpl`
zjEZT2J+rgG(a9+a1`n7sxxMkwR1Iwma=OeGDdZo!LVCCO8djDGm572tg~Ygi58+F6
z$73jsTgzS?9$zE$#V{5Y5l&-~R7n(mWI@LadSZkZu-P3(J8=uh%r4-KxdXT7*NUpH
zB#RGf@<g1n1BNHipGtI+AjGLWOxXR@jhu7TW553ZT7VT=B?@i$A-u+C=Op&_q>@xZ
zSb33<GF_OSeW(Ii71<pFI_y%*&pk*Ko<y=T*~X`IM{!-;u*X`YwF}vZ1*w3BkYjfT
zaXC2q!`%8+kt9vk#@_C|0raMk=2<-E_6umTe7U7VjPyA7s~0j_+s*cEI>+~tC<0a>
zrg8U;TDa3-kxw{jwyE-fX&;Or=mGcXO^!KQ2Dpvad&op%_(nY_l4BJA0AY^VrIJ(;
zwbVcA*F2Moj?HbXoZ80|l?0H*{_7sB0qOLsOn11BRUEK~aSQ=fz#yLg09t8`MC5K#
z0{p58;QeWjEyR)%@hMg1*?8mn(y3zu2orAM^A{Vo^TGD2QU=Llm1AVLTZKWLq)Iqa
zf0t^sw{BzKEJYeOE4P3!KZ_pqmnp~*&l|LEN=V>iXT4d4;kC04VlvD@<hDUx!xf^H
z!8;RACCm!#ByF~6u^fUtU}rf#yi?$25vUF&ApFxsovJ$?d(;Nmgli?xc>!#kIU9Y)
zx3yM+<`}0jWGscUBPRj5>ME0Ea~5Vc>i+;Vk0TScOl(FEa!0iZcJQ;j^8+wkZiHZ!
z9Wzn6VvV%z3{Dt~l|R;*3(itgF$z@%<y7WTpW#2!s^NV}r<K)K-DKM9^T~nBDeYBe
zmNvax`B1C?Vc}NB53O1#+(wqODoOIoFu^hLk<av~{H8lX$M<-U{{R7BeD^h1U@g3J
z6h;N4k=T_3AG_m^txYYP$rqOQ@F0zH?8<W|u=;vZ!?epIE5#ZG7$D#$(9yOTa4lcV
zMH`Wa-9ELVS`?9;EI5nIH(w|R7zYe{3U!#gw~g;ICQ*PGj-JQc-mTn5%w3`i9yQ!}
z?ey<YwbPXw?PXR*WWm}#Rvmg(Mh}>+NVs<}%B<dC2X5{NsTj|3I<@0@Do)-P0n`qM
z6>G^zw)rsz=jV-jh4wWP+8CS6X^D;^a)e}`$J)1BmXjy9I(k?%*7{kuGEP*y&z<0Z
zbW}6R4kQ9)GLDhAP(5ngc9UE}u7G)HNi4%5KA!bPWeoA&6%8IXqPNP={{YslZi}^u
z;<%d3v5iI=Jea!f{{U!IZ7guWE~QBrOOPT?tKOdmV~J#i7{2DfJdl0;s?yoSnVK1y
z!p1zoo&nDznij+IGUERLUFIyMwsK=9kPmOIPCVFEu&TTGkr{Gv>+MptqVM}O;IEm3
zA3gmu-lLep=`oVvZb60^IRtxt6x2x|7Uh+a-aw@1o=$5<7~qQy^M(oomj0B*hE|0n
znl)D|mfObR+N@j3mivJO73G!r0=9y)E*c3u?`P!*;wOB(1{{I!OK`F%S<E=yApx7E
z2|Nsv7Q0q<T;ToXrIu|<{@E_4c$EW?B?<S2Il!&lu8X=EYcytew~lbaIL7h^3+qmM
zrn*xdxklKTMn(SsIjs3+fy2cCP#cF-7$kbN5!~8M8S`!mgc%H(8-40lCznf!G1sW^
zmAQ0(-W{yj>yJuwK?deBZQurc^!7B!t^>v{A^FvLjSsJ_FOhd+bLUMYZ3!Wc<>2~&
zC{s<`NYL`M&$EV%$mb!P1NTpSRYT^>aAL=nF^J?nhp!bX#cs^9ULjwbbXjZ$ZovCe
zO%%ph=DM8&aLiC~k4#rrGPS^x2%cSu1ghkW5srB7Y0<`>TQt%tqqmkf@$>prBIHLS
zc||^T<ob_FSOI8*ATp|Q26A(najOv)JoqG=%V316h1{q0H4}LYF>@yE>J=Mz108tv
zsH2YTERrRW^3al9M}I?1n&f6HcVXryA(No3l~jPSB#H=^X*+-nGtU&(m6jGljKOlq
zqZkH~E1=3%dWPH%I@EGb%Kl=88-e661J<9lg{~`>MD|NGVq20`wvq$m4Uf{Ha*r7K
zas;H{o<XW&^5I#4DvSRBEhH!o;q6XoW;;sT7CGVlzMbk8BJRkSB1v@?wvfSg2q5rO
za^tZ4Dn^~>hDS0)iW_ReTjmGXBBHuW>zIVIPJvU57`a@Iqtw+?r%GguJ-ZY*1S@>z
ziB*z%qIsHTf+9wrxe6psRYA&}_9CL4F)6xv6c$`C+rT5xQ>|o<7#b-pAI(<5GB+pN
z6(8C{Un+Se7a0+^^Q&z%JKSt?Nb#?b=eZ5nG}W1&M|T5r02eLS6(z)CNYl!VR1D-N
zT>JY}N~)liU*b4Dvst^QP1uB^NIc2H6UGa56>i!X^^18Uht5)ii2?aeJ5^VbIIvhB
zLyp7Vr;k&*wuxf2nGg&!VSezdrzID5JC{_bwGlHmae{NjLw4)2E#m#w-s8Pdz0~54
zV<XJjaq^)1zg$u^%!SKbD-;ptGONL@XNl%k4rDFFio~R=<>X{6g8=^k_38m9oLg#z
zC@`D)H~ICa35#2$yA?c~7UYco06IvNOD~t_CUQPT70Bf7OKpmTVU<wej#RfIngU9|
z#{;f@_D?4t(xh12D!kx=8G##lT>k(%k{HB@%X2T6AXBvwdh^zWsG2LSqr3tsp*dzb
zech?*EthS}GZ?_cjT!IlQf)EI6Yk%%{M&~LKdm-f8RI@dR&Oxw54Q`?r@aXwTTv#r
zmfB$(d2@*qA~^o?gU>Z?!tw>VxVY4jmuw*u3(0PSG?v<H5|K2E9A&|{nDWX8QTWx^
z;)3bE)njg{6wkE_KJ9>aC%tb=-I`%$_9k1Xe#}bBe|R>slb)Z-sNLE5l5TO8+mchM
zK9#3!X&;&mxM_enM^)e-dU3WP85PhrGD|O0U9*y!)U^ipGXBLP#F9KGl5jKB4)tQz
z%WRu&3MxnflH-6X<hHO!E+d=+f#w+(jFHe($!eq+rMF@>W-@vfs7WG~Hn%7?k*6Y*
zcSE?9MeDd#r&z?yvcn{SBOX(s&q2|u%0$7ozR*>2Kpd0pRxItjreKkkjHm<<4i9{q
zQfeyf(MJ0sly*%aK{P7S5*(hJKQ6U)J9|4>8RGfI26wju+Z3K$imcBVRRo0@>rb?6
zMz=8Dq4P_A?DQC{{iIoL>vB7bL3o5jxRfa=2yAEGp<5^~CrfL&TG9656T4%vBCZ&x
zh5YE^ZSDLnIV0Ms+|0;Nm_XXUBCz?lcO%ld-DoKdr)D$zKUL6Xl`bxD>5naxo!;El
z%eHM+-BRM%tX(Bx_qPhJ`p?>3eA(2pE*Z-DdewOKrf>>cyEaO)bPxW}_O4o$+Le>g
zNu{eaVv<`x&`JRq%Cq!8U&5dLqVXv5<?~k{pD&Gv(y~fj$tudsLjpH$Zllt)H26$q
zgs_l+j9~XY=_>PmM|<o#_g2&v^^7tT8!Cqb*WRkVz17)unTn0yJC1tvtMcj6M+v)$
zLX?nhWB&jx2cW9+WoBalXyM)&l0nP1Ir<7ER-@gH%m$Nh4a!{IP935@yJ(y49C62U
zR{q^2lL0PKf{c=IDw18q(KaMlfMby3Bzx0?mMbw))93R#5!$m=TIw1aaCn`p;g%bB
zMnW*eFH>1dd8oa^I<PyATOAbrDzo0nmJr2~ob5Q|deh+5B)7w&0_n?3v|t16S<eyX
zH!GUjex)!w5yKJpu)RLDUsRprxHl5q9o^Mi<rSYh%_DiAXjCKuT}KYJ9AsTPK`f^Z
z*mpSrN2k4H@hyXTSh<CT-Qy*MhymPsA5rO1B!T1*#}j#*j?tcd%{d~K<_Q`Tjxu_&
z{(_vT4)vV<^f?EiQ&8rbB#LKv=Z<D2QFxOTVjH_XO3<u8nHBI{oDw}glr^-sqwIx2
z5`4gsfuBlq$j@&U%V*e`K*2^>{{V$%<iLQ#6f$f=R29RXy=uFOVH;lEOoZ*{h4w#<
zTQ?EJt-V4ti}ME@;8i&_9Th>AD}i!P4oiHX`c`t1OHo}B#dSP#u#z^7qdcP?0rka4
z4a7Ew5t2(eY=-HcYP6TP8rGn;>1yiD^0bIMejREntpiv~&C)TLD)S<65FUWnJ7l>_
zp>pF{Ye;0hjK<Nh1gCS3{{Tv*KZ`s?dvGKBT1yh)k~kv(W9#0M#>(OYxs_XMatPpi
z8j=kzG?lIaS9uRGryIZe-qn+BlkYOEosPA2dhdQrDlph_j=i|+#cVE`_UMZ_2u~<+
z&MI9aNSf)QY3?@`kckw3%OE>@)s06@dnq<G(VKV+8)NP-)7Ga{IK?8Y_VLK38(0~V
z5xAEel6vN#j@d=TOLGuZQ;>0u`TmuuWgprhXhp}ISYvXYhqh`9od$T|{?MA{N#i49
zMzQ_Z&*&;#l4UscL^ro_+HbW;f;4~}9&$SV6_<B$sd?LNEQ-zD*nFUN{A;6q24|2e
z%N&mJVN{NT(4T73v+&)daH-TB7TbZe^!nC(+Lan|k;`e?ZPSl7>Mxia5srt}wlvKy
zH<2xx7v8Qy?>roiwXC+*kQZ5D!s7wEpIWzRd8fl}Wu8>y9#RG5j_sPw&s|Q4(29DI
zKAU8#<fbzc@W-Zm<J8plw&ra?Ej*->P@#-KU}LcrUr@Ny;*IqS6lqxqE{!fRp5m;>
ztN3`LY8rj{7d}{4S#gq2RUc1UmnCftn~X<W+_bUzg%}}njRdRnMn_Ob^{Wl2Sn0u|
zy_ACKlx6Ba!nu3>PgR;``wp7wtsz#FkWXH??@hb%?56upsdpeM2IMWq&g2ShD{5xy
z+30TT9xSsFeWt=d<7h&?Nk7uFtTh|`TI59)lWlR0`R603Bl^`GXzJ|RQ#_F4_foOL
zA5o7=y4Nr~3N22?*|-#LRQENEnnF`@+|`pwxU#lc?`0xJA0Y>i{<UG=%cI&$=gA>1
zhvy*R6X{EQJWHyilH1%EkuVhq{{UJ$fmSVi9es6X(@6^=u0iuL$NvCcv1M-bBe%bU
zTefXE6{WcY_imrUztq$#q~A|8k+txS6$5N>0vS(y)}D`|$EVqwd7MJ)pR%xTne*4B
zPdi#e{*v#tlmLp{GoJbOscdRJ$ZR|+){vWtO7E0{bJUL9_o;@G)&S0y=l7YyXMo?{
z9+{}(@dOe)mQhCSDvzE(*$5Ay^{q=*`*Q`jd=*R`-4Fi&UZu{)(2QALVQp(SlxANx
z7z47m83)p-!z@B2xe&VSVha<~@U1hZLo5$+g?#lT2$bY7^r%wE88aQUg!z2Nq!6dp
zq0JgtVp+Z9W>-d3Q}Te=aqbUK!laTLWnhThIQyr!9Ok9A)xODcj8z^rI3SPE(}r$C
z$!i0<lZR9p3Mx5<g}9bW*j0q0HHZaId=8b7s_S<ViBiVj&n%l?9Fg=VrCzv_NiG0f
z5Ep1gOcg!NMg^=Y3aF2N5~&?=-~RxuQ6|uv=yH0b8n&eZ$!I58<t1WG*eHEl{hDk(
z9h%|=xYb>ybsItvwOINOL0uG+#V8T9L7#v6_2cFA_oy$XjgfxP@4OSXFmZv?CZn07
zClq8wq(y1D;z7CiWDIeN(6xI<h-vba4io)gj024114GLl<>-PKPS}?c5z)A%5zLX5
zay*y9w&8~S4KZkmpwpS;Y3)k3z`5Ev6wAwofnMV6aufvw4WKvHpnGU{H`ykYB4!Fm
za#(XyTR@j_v&n4osdKb2$}k<kG=qJL`epsamiaBMom3nZVU6AT_p2+b-(Quux-qjx
zPwv!mo}Z0ami}8v9srxNHx0@+52a%2TNS+ELU~KQ6LIQ#=N(Nn(-Uqbsjiki*62W$
zn<Nh4{{UKmi*~u)91I(7*7?0U)gQL0+Z)_@KuNvi>PPwXsUW$$JK!peRPK2dalz<)
zg;F8O8<tODVQ4SJssg!xoc{m_>z}1l)-TP)kiFCG<hDnU`BS@ptjAIZTxTOSpDcGb
zHmv4k8Dq6@a(%@*(M8Rnxr{rq#&<dBfO-mAUgC0XSsc~wv8+ARw&)#XSIY#>4;&hg
zP<y+a&ke|FgkZB3;GaM{R^7&*J>(`eoF-eY%w*@GG{d9Xq^)rfV<LgNKQr!+TvO&&
zIpqm65;!h37}7HvA?P;|^B+N5x_+N6j>NjRWGK8O!#vcHY1bChB$33VkDGZ+jP}J}
zw6N7LWkiwSSwnvI+C?St*r^<SN4*YFwZ{lqnW=Ab^7&ACM4nwj_4Yp0`=16}Upbao
z{{VFojjOwp>zdlr^qH;Z7lPEn%P%ZOc=R>3Ebt|s>6I68+S}Kt^sHr7C!w;Yp64M4
zfUNCw`7hEZEPvH0=bu{8wD7bLJ5A=98C6M8z3S$<tR|hOO3>^wfP9!YV6pTZRc$lH
zR_|h|r&&wqZY<GDf<QfgT251H<K?8Ck$J4F(kExUFDY!oWar8_#y!0%DQ<1nW{S_t
z59DRU?e~c5iq5i=Q`RP)dyP>dhiN3NeY4OXT7I3Q$Y)EtwKDAlg_pR`QBu6Z?)oAt
zU0YGUGNh0s=s(rFIYrKTA6yDl@ZP7XUMp%76_0@C4g&ic*|O5$NAm@$<r{<}BxlyH
zrH#RVH+)dUoNRG|Pp&FuR@);*PW!V9{t+0XnnX#920^)tk&JZwYf38>(cycCwamaN
zMnlwr#&g@!wII`H)gW;-^lKhGvfFWy?N5CbZ4^NyzbcM$*)@}^C!=PHoL0pPeOz5z
zZjluWec<E0IH*|LZ|@m~3LxcujW&B&p_DLqS_j6~&)#nQ`&4Fma^WrlxJ&|9Jk(!Z
z3-u-vnEpo$KwMyq6+ZO%<XGhsv^&{H%11%|eQKYcqiA*^h{JE{$J^S0DQQKs%maaz
zZMf@2u1(7iEHU6E%En6_#!hlQF-tbBWYft63{b}!yEAeD>DTqF%iTiS$)j8A#DGaA
z43d4r=rh|jops{<9!p1=oMtjXLc`|mjwz~AXopoJqLNG7#Zs3WR0Ebgj8z>{IU}AX
zitwkDa?Eq{5<6Bi_`gur6k0_Z+bm=EO^k#2RXg2FSiZdS-wvx7+Zrz2?b@z1q@JWo
zwbq8k=DTNOfQu}JzlJx?)9>k6nzi1ycM?2$Y>~$DFpbOn<0GyGZdv$t`p_<?sLGqR
z1LcVRWj=)T_Nup<)vb$}<+($+^>yTZJu67^FNDf&Z*q*9KB0YU95PKiBq|Z`#fqoY
z^)-6iLz>byo@nE64@E!1Is@-nzuPXe7qhr*mdZvyhx}@^T8^)IG_pKEBCufnKD>9T
zv6^We16|qaHm@I<nVq+hBJKcsR%NcUZe^0<c_b!AD<78Mb-R5kzNe#JOs{(t%#uX-
zGPVvB{{TTtqF%O@HfFVr<3BDXU%l=q&^evU?P6AV);TusI9BRIV?2s{+77H)7+a~4
zazKn==C8}C=~ofk#b<?;T)z$TA@t2NR`E19i@DS6w^7DcHevwuJP)Ntx6rS38I##Z
z6u)JV1fL2-d$P=X5moL|_Re=VJI3+`z<4x|sa!`oU2I2GU_`rqZ^PEF$S$?0UPxd@
z1%6*7V`#@Fi#54B>|$Om+>O8HLC7FyA5X1E36kDaGDRZ3;8Y$CdsX|*KI+cw+AX<`
zF&de~t&l<V_x@Coz)@YKh0JmM;#P0F*nj$|^CXGoU|CcBIpe@!K@NR8k4l0ivuT9$
zTd*UdvmEE}tCq#S)D}qhZ#!Gjhqt{!s6w&rbq6d@%h!);OHg`hO>2E|J(Q4n=3yHX
zv?vT0Jw5SHeJ<Wx#F$#m94m%dCOn=w9{$ynZK*VB5@-U1VhgJbw>=NxQ`<|b>emG6
zO(d|QZh07gtM#G6Nr_4=6bsv==I+rX^3ln4-^+}i54B4NiOrnKH0vPvlXJ$%4oK)h
z^v-fBJDYtz8GNly^@_;fc@ERprBj~nI1#0=$XL$`$DgiiWfakjr^?HB*P8CPH`;EO
z67o?&$3IHd(Y_qL-GblUDR(4}Bp@mDBB<%Q?WE*p-C0IAFkzo@TCjMFQL%9yq%Y-@
z`?z}Wezg;GS}hGB$n|1hX&QZ?SY(TGuL~GnKECu?Sle1%BwCC|%8-2iPX;mTk6MOF
zbzA8gN0vCT^A&N)K7yVki0+k~yOEaIa5L{&zH1vr#`+W6TtROUXeAcv?p8P*fncMi
zPk*f?)*(qRu45Z>wmAnIo4Cb3-pbv`c9{kfs}4`KI!$Lu^VT_Smf@lUa2Oj&>A|T(
zZ7o?07q*s6E*?0VCHbV>cr@Kk{?1ue+RiXbrsBxl1tX`{v-M9ATiin=!q7!45{m%?
zk9x(r)~=cV0Cyf&_}`#b_7!TIW>Tz?*4%5kv+|Y=vj{>)^8CS9)O+Hv^*wq>tj(rg
zLnDzKYrzK`nyChhtzAU3Ul&v@_tm!X{uMdW*;GpBl^-O8Wr+3_ag1VTDb7V}TfJv_
zn$qlvA^`F-6dzi!`bFIC(p}<K+qz8u01wpF`)wJcvHL`Dg%T6FB<gBb@-1AnU=mS7
zg&YrRZe58`eM&lhhi#{;UY1ud#gMr>aC?1gWo6RZ*UPw36rwH2+Xh(w0CeKAV2)d&
zW_j?=%miUh7YD6O_SZ;;;v2M5i<VNE-|g*5w%(;hBs$>VIa|1|;|#nsMS2d|rm{$K
z@F)!ZK3)&KSDF(Pt#uIrq)-fG_op?>?NZ+~Zr?L0#>4MNL8oz-QKW9S6Szo~@EO0=
z@5dneXR)hRdvLL$qei5#$5+q4r4wm_?gIAtc%&e2&fq}yt8i#nsTxld3}Y>Zd~ilP
ze}zkwN>P(!cUoo9&)MTL0~mB}<az_`RqQOUE-sO0v~`bn%-QHYezmo6X@95O3t8j>
zEuqZeakJBJ_*6Er4PI$2uUGdN{po=1KT%nGO$|9UEZ=E1T2iEzZI^GEW0&UJ$6Dt#
z4L0^b7%?E0^BD#dR_(r#Y4(X;()MeZ;Z^<qNdRX7PI{WPYp4F|Pqjp0w-1$O=;zj@
zRIuGUnf@QM0^iKJc4=KP8!xY~(yt9JA2J}$1ci=MJU6iStxX^$wacqpEb+*jBM}T3
z&#3jMNe`GyS|;a+WFcIY`qplv=DDJRNXf8<C@u_>>Bd<U<i@9KaCpzPUDE9()ScL5
zOC*QPVsdfV8dP_d>IwAwjJ&K-VhNI1b#9ywttp+YW;X30g5^GGB~{vhdY?*}NwKA3
zK@hi}WU#X^`AlPlBj4V%EUhiA7CSklC}fcNj2rG}kf+dAQeN8X5TxmMxu++}jm|vM
zJLl4?&u6LK7r2*F`J`1@PQtjyQH=DcwaUGXZASGNu|(derwW6TdS<HI%M8R?zM_cI
zWMzjxK~YC_b7v?Fhxd!O%xrw$K~^pG3n=4xuC&#5518KrF|Zv!ogB6c+^Tf6ba)}W
zk~LyVxnc?R0QMEqXdWH3K%zO;LaDhx7zfza1p4Y~3|e(k#~Wh+0HE>3TNhf0iDkAz
z6lFl^ll>`4O4b^&Yg@T{7Z%aj2PE^j0=rLAJ;iZ8Cb89C;7J?ELy{sTjsW!k0PEKM
z%4(PKJ-SK?;BI2Pq3=zeDb`aIs>l>7p~guRL){eB^fB}g3h0sQt#Pb0vmv+KyT(GX
z9ZhygW1;GLWOfU0xWn2!4gP@pdsKQRns1%rvt$yiTfDh3kiFQCO3t{SRI!v?!?GaR
z-obcc4<vh2lX3{C!51vFJ6$ln%;h6@ZZp>&m2m6u+QKc`bt$_cSB9)TN5!jo5OWCy
zIFxPg?OEU2GF>dJs3Q#-*ktREZ+c1%?ha`ims-phF->y|D3u61WRoSAHGnlAGUiry
zD{fo&VL4)R$Zy7?pFp>?(c4qJnba})7`YqR{{RksDuw09duNi?K%o;33i8ByRmKYX
z8Om*ze%*C&=6jieY?X>A*s7}Msr5Az$qPuA4Zrt9fU6-GH4`*ZUFXVRB}4&p_f9fe
zr<CcI(F>Q5`6}PM56NNeSFxShWi?1G{{Vk`37X+a@=-`oGt)k`V%F`YkIPnQ+?*L0
zebed1QMI&LT-pFjIo-QCARdCYTSr+`SQM9gGNB-S&N(!s;){xGf=xeE`$NZVdY`<H
z=E@R;9^=r}Jx)8D8*eIWhLu&Y8FSS7S3_~({Z<JT)-Ym<Ka~m*x7_;uYAa0wd&0hK
zYGYnqzlV9KRZ?a0I~>eV+}_A-{HEM~;}2g-n#aO!ZVbAO&eui+BXhR8%P$Ybrrj9~
z$j*!kmG%Ds3e!f=>|l_eEd{|DEHcdAgVKpteFqvh+)oc^no8-dF|dw#QNMWYjDvx}
zA52#{tN2PCS6lL|8*8E5F~Xh?Z(n-o^$kiJby(s-=HO(Z!7JHMsj7OiOl>~b1S4`U
z%%8+hrDGR0E1I<)TO9r8hh<3qdv<&P2N)wAj(ZA&LeTX4dF2tvo_ojul2yo6t)Z*N
zu|+NXF3^T34(?ofA5bd_e-g=kBU@?qZqgPZ7^vIDbVu4rSi(x0cQx)`Pum>P-=c*j
zTmg;V{{Tu!d_!v-ky#7BD|SI$yn~MQi3X9cYK}y+#TsC<JcEx+3h8aN9VW`c8(n8g
zLvUPqj*br0$54CJ${f3DILWe&yfR$6BVEUELCQ!5+z&(RP+nO{dIi1R!CjK`5aDt-
zr|LKMQ7cJh2E!xbIS)A<t3K0L=gHO8T1h@nG9iF{!2XmdO4kQ9dlzKz<Y;%ra>^C=
zGRDM^J1^r-w6wd9;$Jq}LFS+eq+o&#KsB4_XEItqSgb)^{Q&4bwJe@0zJehg)sw>Q
z$@7T(#wxjF(LB+)rGIU&TTKo9?W}gL(WxQS5~PmU=s@r5R6n(Jn<(1K*&~z6&hx)N
z@F05UHBReWykr;po#=heH}yGAlwa!l0ELC6zQD)=j-|cH$4V3!IifvI>fKxsa}0<G
zV9^`}C;HZX)XGvw?hfe3FXcAUew9RP5&f&m2n=j68=wchReee*oGgK#94QB{zCA0Z
zFlijpsErlBh8T|N+AvQW`6uaC<hvq4JQHA|@Sta$e>%*ty|4wYC%7P$`5UOGNhOTe
zQHU;DMj&8k87H+j7jY@*OD4N}41!2*7kGT8MoB)kLi12TGb^iZVU}lX<o7kDs5{BF
z5dyA87)Ai+-1=21EG+ILZ!s8@8Nh5AKl;?;%hZ|ky^2!n4IQ@Dbt%gcw<qcCQCrJ#
zJf>t>2w#{0eXB_{P>c<&unI`u85zj`01D8DO?PC8e6Z2;D{UCsdQ~~bD1{1=W&%TX
zGX;dcGrw^;C)%tX9h%r6grvNf$WObTq}N|%;Y&+_oj)!)^9qi7btm{h=B}oVYMOdL
ztj{*~9(h~_Tyg;P9P?cA#K)nuaNW*pOVKr}*lok4N|Q`uW)X3~;OF>%9xF=cM$)31
zIOItr+QdyCV%YEPTl0OI*3vs$H7O*YA@f@}<A6<JNe-=cOt;hhnl~mtm2%8S@S4Zk
zxjUPxYAVAc(ZqZH$pLMP^CEyl4@}gPSx*eY1cBp=Zc8xbfgh!6>XvdtX>Dhxq8XS4
zX;kos92#Vz>C{1aBtgVv$s(@=4!9rEquR-$`4ZU7v$WIXEgj65eYjLs=ub@5gwm{S
zVo2=nyuv};RGcTO<GHIFVDlrEK#EG@8T0;sI&PnGQfQ2KaH6xanO!(eeQH~5rDRDB
zy`;bCCf%6EnBIr@Ppw@40E9bLlF>!BojTjTThE`B41ZBs>!fQlN}p=Kj@~(^I6)a3
zy~!QB*H@?b$6T_}E_B^S_A8i{K(PS5K==GB8Md}INgU+bHlv_i!+5Z}+pzMb2a=xW
z+MoTU7usJ<xSaWjyOJgxus`J1i};~M+uOk~N87#DM9%f;$FKCJT-{4EM|E*zWt~u@
zL?{7IVo&)sH*axS5gW_fVz<$taz-YBS1c3`5BQ3j4Nm&j_8F~YLSuZsc?_g<s`mEL
z%ksk}z#kI%j&tw$3e$qZ(#uMd9$d`%W@tuoy^8u$b{e^GUPGvW_dww13ON2%E}?0p
zTWR|(t=|ilk=N$jJu&TB0yA!iQ!zy#`4O9zC;3z3(aH_;>r)6+{Kt91=ij|YDDFTd
zwU*#UE`%!&%^ZQx&7VLznik49$dY+O5t3xV3NzS>kz><R<xQCmBwdDZG6p+=OQdNR
zID5%;2#Ju9BvNF2pz(~>mqOO$?RzYC=gpJO!NQPnSbC<VBx^KUJR#kI639kC&$Vu)
z#*}SITl8{(utUby>G;+(n%0)_te<H}?jAx45rRnVRRw*Jq}7P+tpRxK@4i-e!Ck6X
zV`HvrTgSDqg&HY`nxiBSUutcfviOSWWRmO>gk{DT1JjDl)KFULNiEc%N52YB&E^h&
zD$zm7*oP#Q%dzX0@yzhv2-rlsr9h!}hWdXMMRTj^T9lGqLp$2V8YtN-<hdMeQ{0nS
z*Pb-Av}vuawEqA(k}@KdKs&wp?@iO5=To{+@seZtkwE!IM}L3iTB=r8W?tD}LtvzL
z43^T3tsuq^P(KQ-I?Lp(rNgL22W*Nke*^1N+T5+QQcrxLL?fRwu6km!PNm0{3Y9?R
zl}OGBq@vr<a+)-oO|_0FAMFn`X_jJG=cggPX|Y9c#yL!A2x7>}x!OB^HJsP(AZ0tY
z^uQdSYNHEY-^p(cg}@3~jK_KTf&N(Zs!)5Gxuc@E)bFljgvDrW<2el^@q$=)&*Rdu
zFK<iC(plh;_-4maJN|WQ`Cm>*?bypCWM|Hs?#waH(bNy;S#r*>HU+}F9F+iYGtV_t
z<E_OxJ&Tri8i0tWnk|)Ib4te~{XHrRnB)OkINDbv>`>V(eF&(nmG9*cq)uBo1ou9?
zQFm{DD=aqAG2DOFryFt9n$pTF&h4U9(=BDSnt8)VCIKjf{{Y`VT8>Q?T}TlL5iT&H
zdXKGK(eyo9{%4+0%?w}_DhTJ^w9~`)H&=&Ec%CGe9&X{Z4EE1ziB(a0GUG|fYICsY
zlWEp%J*AU*$Qybv&Oq)5V_W)l&Z%>27X9p-2ky3G%ozK=!nH2+xa_WGO*viTSkY2q
z*<tEA>shvKc$bZ1q}#mmte{G+augmw_RVJMDeh|+D3e*2QZ232!lqA|7!A?=D$LMJ
z5ASYu1V&Oy%Ia{<?@4zT_EA}`<J#U~-mA+-JLb7<YgW9}q<c+1;3}#8+;X?f-r)Kg
zP>Y)!q@ro++MH7^+2rINS}*{{I{j*Z@g?oFO%{}kE<no#1=Hw#YORNbwcUR0Wtwvg
zl7Nw}(}9l19V?{p&xVDp&eBG^(YCNFfsx<b9&1M7O?M%4$(T?>;~x-8u*V$mtdjhW
z%e1%o{cEhX_*bZXoXO%nUOBF218uZmmh=X<VAZtW3diRZ4=l(V4~77D`U>X!SK~L5
zQ7x<aGqjtQR5>Ib!_Zbd^QkLESksaaSChEOE&l+rrjptn49f+w{`ACv_2VZ!IjH5d
zOPFDak|mnq$WR;RIP85ZHvZRJ`y$5EXYFoI^mCH9&opV5I?AMBEfz(Mm~PvGPu8_@
zcHGaMUe-44JU(r1TH;cUm>A^bIPL9SL^oE}_BfJN{o3UbM?!kn2{UT<jknBb;zhyQ
zzj?cJ?N--Pol+}!Za2<=Z)Y3@^&`DwI5|7BcugaxI+es?IYcrvWc-16Vt=ho9;c|t
z47UN9@v<|Y^=s}c2{lt~0>9dFZY0|iIL`O%2cW0fwz$(VnIkz<x=6+VB=V$p`qo^Q
zH0Cs=ywrqKrjcYMxM)bVFO8yJ%-+>A>spg(5Y0UC&3qR(en`Tj_s6j9?O9K#t*Vc<
z9jb@tBZ{#E>nkJ?G;^%0mT<fk^!KT2L8dLe+*V8Wi`Quk?fbTbecwVo>g=!P>E<Pp
zUDzb!g7l8FUS<`v@{69kG8E&f^r+^(w$tHAh3L4NPPj}2KD7;YD{aSV_L`l{Z*G=y
zhuOvs;q>~}l#uDxq}ysDU*4`T$2)L3S3f6=p|vsy=a4GD%#pS-eziwY@q5VY3yByx
zIAXvBC%?GjnxRr`msXrn&|Y}s%e9kDvOvMm#UpJ1<2~yJ^I2rm4b952Xjp*&Y!)9{
z#JKSaBYCq*9YbP3gAJOYs%!Tbu-pwkBF5ekv&<WmXT5dP!o?i3#AwN*)TNr@Y46#U
z3gQ)sjuW4}eMzR?Yw*Dtl6aa~5;7xI0B6(jtV@kwQ+u|(lgbFutawGi<Gn`}!$tEe
z5CfJwxzD#X*r-Knak}l6?yj{fyH^&r&ALJZM7(^y=B+{DYl{?n9d;*y8Zh?mALh$d
zOKopd0pruH{MRP|NXBw~d)C&G;4c<ywvuXE=Cd7`RmqBcla8Ib3UiXCwRS>^b9!oI
z%RZTH8fo#WvW$+OGBEZ2wY#Nwyrtw<HtL>31xcUD8*&FwI|`E5!a7+&X(~45UEgbn
z<SX>!J${wYe`L(crS$mcA~3rWH9&ny{HvO!cr&Jz8Kz|1-9f0cG?$U@VnDX?&kObG
zimZt(wcnZ~3lgUa4}W^>8^W^1X0qE@F$V!-Vlu}ay{e7Qks2$d<+)O;myeH^>+4vm
z(KmEtQ;dIX1&v~jim&fDA0|ijtH(oVthU?2Q3CLb(NBM&siFvwA|<#%w}c<X{?%W%
zk&T-zz07E0`HueJ^#p%fiB5Z?NWv>}q#9?37~5T0x0!Pb<=1h@IQy^1HEKOONV%Fz
z3rjTuQ-)GN1&=sCjTf5Eh2g6wHgkEB$e^h}7^5D!^{Teo$M%FM@>qpn#061@Z*y5c
zYSr#&l{?uQmVOzv^GeLh(S`e}F_K3k=qpcM@XBe?Mr`AENMQ~Ks}avNo2J<7Qn%U`
zWLU@DRwr^FUwY_KH3!mK+g7<)<B1DLCNaF{?)ujx<nOCCjC47JJn>mA)MpVPJ5ojY
z)c36jET%<Bbo;pFLVUoJla0i3x$VtYO*&aFWRq!KhjA>#?+5u*(Jz(;O9D^IU-*6M
z8y$;(*%I1F1=YD&*|H)hg(uupA_PP-T(-fyq>fK+#;7!UvfPl@(ZLh2Rboj{+3TNE
z>04SwhMgtc)8A?dA{bQ@a~@;|zqLcqYf;*EoRC?`ZyJV3^N?7Qz?!pn0k!g^xs8y8
zIaAYt#Z}ht!?3s0tX?4(GCIkVAsl`JsomT}k;bgW@h0g|vFnb6{{TwOLCKYLi&Ni5
zhB&PXdB=z8&-hkr&3S363(ZE;%?yA|3}ZR}0BCv&iscepLnW2ctF*+jzDdWS^c7Mc
z5Z!5(7dBH|d2kRzOk?}GJwZH*>8D5Cxtp3s_NA!!PUT}ucmyh=bRn3MTy+Hc3d3z$
zOQAK@vKfxRRn!fxdu<++`#Y-zks!T|o;Cw?Yy3mk@v8UF3fv+WWG=+pl6sHspIlb7
z>8Q%YPEOhkH=b<iw&~VJU}O>wryVirQQhClQQmcSC_Yk8%1^KzDx}6p({xeqkzBH{
z<lxm=rMkYmi8T9p09gQ(zX47;IPYC55i;gx+RE^0`Hfac%Ms@?{KbzwPin=~d{bd*
zIhfssLcv)b{$?YtJ-zDeULU%O8;MS-lOm9T*yG#}N~Z^a{4XSnd8%EObN;PFgoZuw
zP8^A9Oq|}t8pp;P0Sj2@8e_=&N0k(9wV3;yaa@M|f5f+v-)fhQAC^pp+!Aw+GCeEO
zVfb~Uh>gaZZqbt<E=~(%e@eM!p;!&m+ysr>k+eoIanrSJ8uVbj)I*_KZ{BC0X+8tC
zwS>LIK60v=V<Zq{WBfV#cQw=LS_Q47@ZY|e7G0o}mjso^10I66VbiCY`Xzz~ZKo~3
zAdG&vtE{I=mRWD$h|S~x(rg<*^#if2r-+o<q;T<y)X%jLSV=6GP^x)~JgJy~h&%rP
zp43?0+%uUhVsu~cDCO{fL0tEW{Bfp(Z)2yxZaFIOoDzf7`&8E6GrsW}u8rYaJjDxv
zFlEDr?}OY5J)HS&!A>`_HLdJCqW0~mDgz-VXUiDN9OLk+HyY=MJSP#ev$k1hm5SU<
zaj*`#RqgbvGWa#t&+S(?6Md~XSr$?O$<ER`AL&#V!8bRTWtudSB~kmeLP$Qe>H99P
zK}}C|j87AMMbvd0NS4+mNaYS9oDjP)--@B7cyGpf%#Wzw+(`;ZgL^8HvoD|>1$UNy
z8ncE2G}dv5qhMT|9DOTC`)bcml-k%TC_oH|0O)!V=~nSDg0(b4!^%$cXAHgtwbRir
zbr_oHGh#T1{o(*V@UEXhwXjQAH1MVta#Xs2uH&fZ{A%QvD;#fk5((HLFzgv1`T%OC
zlK%i}l0iBLbUT@pU_?*(=~zy@>PJ&((u5v{z1M}}g3+}J=8yMBA$bg=+*WJJ8)}yF
zz^yB|+YnFSBdeckl*ErB&vSOtu>0&>g>l$ouU)N`u(#YivRoJ>VfP;$zY67ZYjaB@
zm+^M3;#+Hlk4u9wu>wYA$RKscy;B+m-oF@&Qr9GS!Q*P}3Z!?(-Xpbi8idnM@Zf{8
za$N#&R~-H|R_4YF+ZDWl+29OWghZo*?0Z*LDXvtKIqF98cNm%;iJ>Dy2@kR$5wV>6
z<kT&9Wd+C1hb}P)Cxypx?@$KR0BZnbjy5HCNSTs8`EOd2!`g16sid<Z7Yc;!9XfD-
zm1?}m^ejnwt~ax*h8Tx$1p57HAk$=;T=~LatMZ-1<oi{KtRlFO5WBpwlOplA*i$ZU
z^63l#VHg`SIXLP?EdZuGGZ&UFE#jDzC7v@OVSsw${Pe4_L7+u&x8qQim@q|%9O1y{
zK7yi)QS;|nEcZ6oA*V;c29gE1c?XpNfGZz4SwT7f0PFS5G1%O=@fD7|>uDvdgdtV(
z1iM2vI_9ZK;cHv@WLvFEcg?vF0vqUkg-{cl6Xu4=L6;5G4{DV!eC&louqgS#<Y%TS
zJCw8*<3ZCQjoK##mpc)h{NGxpC3`!cGSsWc7l$0|_a6TBZNIc6Rk^uT5X631_WaG*
zoQkT}+HP6zBblbh`Z`4TP&@9bjqj+Pj2qjXTK80IBP;&p16;l_yq<vlD))!HC#33E
z&|T`+1bIc8BpC?DrU~_@+dh@0wAZsCaGi56+$8n)`c~G9i~E?QiBaN%mWfwx{Ph^^
z>sKjRXlEGR>QKG2va=x~ZzpzCh3L!Q1J<j{=G@!KHKUl_RCxw*k)Lonaa+2Un{2LN
zB&=}_+fOVr{3>dt?Y`)R%+Q$QR>^I+;CJ_|)UH&bVd_#Xx(jreI+hHK>Pv<rrhPpt
zZ^EArVbqlCT7|*Qvu;Q^>UhZ={<R*NrD|%%`PEQJNrB!xg1P8LZCXMtVR_PbdB_2L
zqCn5MrBbU($&Q^g-PuM@0a{z-?Ia9>QXg+6YAZWP6v-9M!p_m<Q4x7@o-<l&s$RjU
zHMzC&N}yz7xXWjdeN9l7VC!{nYSD=pZ)J@#@xO9CN$ZNqN^;WWxWYP{S|+PtkhGs*
z5=;~2lXp@N1MsblW^r{DvC|bpr#A{08RLb|u4{vb#!+lYj0#yYB`bh&oDw~1#)aZr
z``g2(EX-kaCNNXEJ#+d|DiYm|Rg2Iy9eO)g-yUXhaLVk_<xjB{S6tV;wT&)`dF3Gy
zRlY&~_A66e@Q$|D1!Rn<FSt1v<Lg-8*$T20yth7FiH2<YcCD!@NnFl+<{iF~sOmE_
zY7KE3mSY+NjQS8e)`p$oc_KtvWjB({n`L)g79*z}fb^}~D|>ma)*IPWe&tpt2N@mk
zeSPWDT1ROhHf5Z|0fo0@V4g_#_pK#b`XXaVbr(p|9>zqPBN@2P01^DBJ+bXWY3+A>
ztElRau~_dUa)bN<skGfjZ8}$$(1(^5-{qVV0q>7mntet)*|>#O+-1-VZTkAxJCkoy
zWffwadKyCQacy|gswoB-$=e|M8rU8M@jjuae{X444Kxr162^`JP)<3|Uj02QI(=;E
za->>>(JQ$lXk0em?+;vYRQ~|sF4n@mjgXhfQTxnDaHqR{J*ZHemW5sj(JO7D+)1bE
z`m`}DA2gFG;d}m-nd0w=`gMhx+vzrO{{W<w`z6DW!d#EO2<R&vpH$W)0&4^jd8cy{
z2yi=*-!*pU;qmc3;#{+c?Zj$}5Kr}Z>PObJ_H?1F*`Ga0X%tYKRM-4V34%KbB%PRu
z%tITO9=)qeLhwWyjk;ZGdWG!5EU6c=0!9WlmK{L+>wm-AM4BV4_V(>=py5^dAbQq~
z{1(<mYgw5#NT8xA$0w7KS<beWiE*U&kj2pjtZ~{K7F00;fk)p5xD@-J4Qdv4pz5~5
z5uMv5IUte7aqUvA^vu3u<=sFCySo8_wyWG+UR_)~y2SE%WCd8r`SIyo?Xz@<9lpb#
zCuYYR9fAT+d~;MTq<h3MS+dNmI03r1^a8Y-O1)?e)G(HZlezf7_o@yot)<&N$|^73
zkvJbpxREW2k{b(Iqf2{fw=ml?G`Ll4b{(qw={B!r=D3S_Tq>~SA75&zeF&MI*q{-h
z+S$M>@BTE{rphpA8AOrc^U;^pYeZptF`gri$4*GC)<&JBi-HLTHpfH$HH)UhsOirP
zZ>CIq=?cWAUJ;K!H?3^jTj|r^qfE>)p;SvDAP(89*LS*gh0IpSQf-o9helpGBQ>Ix
zks3Wp?+x@~JBjQT4Y*k&nQ|npRK4*1nhS3b>7iu@F}xB1k8F3YYsEexp8DafRu*?$
zc~5TG2)O-8s#ZEm&2YC8-O8*+=UH5xx$FfyHm=yztn^1-v)ieP^1?M?48CMa@$gTl
zwMBb>CFS#rdvP2tGcP0Ne&Yh0V`F?FXvxS@Jh02jCX`30$mZH>6%8j0RX{82S=}zC
zy4zwIBZ?_J*(7IJKxU32R|nkGma;;{#4<%H$bc`Feq-OQSbI6{q>9qoM1l9=caOct
ze`?XZ@SOHmP|Ia3M5`UsM;{2?`0ZKBtQLlmiy?~U>Em5GCELF{UUCUW$8SoG_rkGB
zD3bZ)IfoNQ=YpgB^{aE;X^^+t7TM9!0<$}U8v~v`wG_89>M<n7+F2nh_rrglD-L(L
zql#-%v>qPO?`>nY(|1cE$&egjf$T$i3X<1Px3_JVTA<90v-eC!57*X_?yoGb3Y5eG
zAt8}h1sCw^R(!ijpo#55PXvdF2lu<J9P)dDj8?;LEN#BftGQ!U7>-WteziO>NiD#R
z!evqd`C?979{C^EptZYcCJ|dk?J=9m5U|JqbvdmKW@{^bL+y(Xl`LUZ)G)|gb@!>}
zD#F-J736bYfDs{(D<MBKFgWejt=Y?K1AUU}&&*RHnqp25Jr_QejBZt9R{JZmkbH>Z
zAT#HwC(^WZsnX)&84`R+fSy#R?w>+^X%!vGuM#VPz9&Xlj_B>=`}sYyP|FjXs|JXa
z`3?ctPqj@Zjcac+OtLX=m_G7y4|;TQT}-I2WXjSVkpf4}j{d_GxscphO(D9pmN$+j
zdG~>WK1mbl+w0o34ARR6WSE9l;ezAK_W*aM%V906#$tA8*|x<11jw!iTP^8Q+<lhO
z5hQ1HkZ~|vY;QwK<4VO1OH;pQXrh~YC;-aCa9##JhZT3jR(JY55?seSnA_)-%JI1O
z9)hXg_{&A`_LQ1_t8z<;A8dv&5p&r4`~DS?sCeq);Ud$mr1K)U9C=)B9dYlEY7&tS
zQHj_`cc<8GxVpcNG)%D*uMSVQYKv0weT!d-ER`lAAgqzE$h>#=u0dhfb!b-N;_7(d
z4~C4OC68=-*HK~M+glrGZzGOY0N6k$zmbnJ?)g;Xqf+-);H2fT6}9f6s>E*;JP8wm
zk&*NIXNsE6*=?F;NM24iG|X}olhY@?TawZ{P`5HDS0^im#z%4mR=P08T3fkT#TxXD
zum`yJq+Z4ATb&UiNN!=38X`=yMmS)453NgRWrc1bdtey8VRq+g9>d?>vu-ZrnIp6o
zlAu$#ZXgU1?bOrZ^PxikxGrMJl@uMtPa|nPaYc|O%Q{TYXR1X7#OrZs47=owK~_+E
z1Kj@rD$~{f0O23FwQGGc&&rZav?50zA?|9LS=?Gd4AI+}${oP%&hh>=H2OT3_UmzU
zTGhESEQ|L~Y-9OUa;uK!1lJaETQ$Y5qNU>`l;?LGW8SMvt;2mGw<=@uut>%a<~r7n
zv7lWwyv=%z=Rpv7rd7sNdSk6q@({$A*S2LIHP0+CN3C>0E>aqI7f+q!jm(#-h)z^W
zx!ga(uiJ&QfS5#nT%T~SAUWibRjnX*VKut>tX~ln!P<M1?Ni+;lI8B>*rAYOG)^);
z@%E(BxGfQyy3N&v<LTnvr;XfscS|5`jh<0~=N<D}dS0n(Z+=ITTr`16C*(f4^{k7@
zTFfxn5hX!(3(<W?y+LKH#Id=Fi9o-+5-8e7p*^bFx)OF~&atXreX8u(6eo?!7bj^w
zLFvU%w!fdsn<I25_i}FN&z_m=YQ!IBydv4I0<sLVuU7}6<JzIrkPCAS;yH~D5mapi
zpHot-Up0{ply>l2UHEcomRO^Y%#Ji~or7{mK9!|&E{o(OR`Mbhh%&@m<|osqTIRKF
zLMWC*X#BUfhj*Bxk?0w_{VEfyPjLdgw&b)*T%DNnGt(I9T6;cYK6@559ZKrjV|i~j
z=i9PStH@E$Iqz7ShP@zUvw~F#E0eX8k9^dZ&vkWk_DeRE!NX3HfEwQ;ki>NrBzil`
zbsR{rNfNNmU--LY+PY$)1#=eXJ&INq+O_F>_9R=Y?IF`4M{+%LU3Z5(4RwEKCa3+O
zZES6bk*seCNoR{VEgk_3LB>JG0nKR4e%T~;UuRTRRW9+zz~hzTqp;JjuWn?zy<@c-
z5EeNL+ZB~c@@mUM;YBB@KAWZZdOHiN-EHqJrw{&(5|5F`bt(pP(1JZGNPH(dTu9dl
zPURkCZaLYW8`xE&VH|s8ypf}c8#7!;Nh&eG$9iYl?xuy@gXTKy%QxOp(R2FNJkotl
zlp(W5)~WErSMb_LF1Cpkyyy%nqjvB{Mo+FgRvfl0i6Vl*vPf9RKA5h`;_2e>%rM1%
z(mb)^Z?#BS6X}}e^yRr-T4>TmoI9$+EL~9dJoc<<%2K;#t}*CR*KO`6@?*A_X@Vec
zAlrhY9f<xe<WzRduWs*VOv*X{InU$J3h3nU!fIMw*V!)-nh4rc3g>tO?;Q8_u5Jx-
zEfQ!YxP(d^5{jc6t9T_fWK5qcyDtlg<z|f~LhOMOM;HM1C)X8sU6$s?*<!j_q$vny
zcn1fLr`oukcf{U&rrf|7m)s!>f}W??Rn0HOsed|KYLZ6;1w6K8``GvVt52%V+{SMc
z3)qT(9N6g>Q#8dJ?H1q|@CHCR<Bqk>TKN5SEnLkyqWQ0jcqDEY9SI-KwtQpZ{WvUl
z^I6X&pgXf~$qEM~d;3&AC$P~qEk522CqRK#01DkJVdYW>Q~hhYA6L`6IA<!7XAk0I
zt8f0-y_xQtaq}XBpgr)p-~rOTXT!f9wVf~FmYMLbO(MqjDCaKsNP;OXqGHXk;C$?N
za!)wxTyCvm`sKgbmGTvYN#({CL<1Z#9-h7G&6bFklO@Aj5^czB?7u97(;e#SN|RbL
zAf*;V;+-2y@oma#w#rr;S(q_LU?2UH?^kr|6oLZ`tGyX=sR-I4e{<Z{rM%adc7t<4
z6fKr9lpi-Z;Ew+Q%A$rBnlz3Zc_Z61VkrRKC)e0lJF4wwYssy|O>a@rk?`B?omqUh
zOtK7qx#JZK(Thtc?yY2zTHy$uNjWM{VdzKYS1q)Q`C*FdPQAB9Ns7w^ptGWmrn>zi
z&K*ZaHrKjZZ+9yd<Y9Iw^egM{SxToa$l4T~_c?nJrpJDwOP#x8RAeub;~fa~tM--~
z^%&Pra?r(q#Ys40>-6c(X<hhh`!TK>%19!bID*9_gFa?^ufO^2RV}To?dE9XR?Dts
zK_Lvs*B+IhHQB1C%0E=KM7TCGu!=jQu^MFg1A&|pI&}V3T5Up2A)~QfJ&~?o7gr<Z
zR9tXZ-`b^`?PRksh?-dU6C+AN3VHy))}_%eG^=Q)gI}G}Hy&cQR#*Q3XRdl<6-hB!
zTpvrlj%e+*yEh2rtU83l%K&3M1NY85eSIq?b0?Ht*-|esgCv|JyyF7BXH@u?apNx!
z+jv9Awpw(y*4tN2k>CPLV~hf>IV6q<t`74>w9_u6xRUW2J91hyol6bC_8qBHbrSc&
zQIA4z4tQAjg&#@KwQDO&xS|hkXM7~z?Cu}dwXQU+A#MDkVX>Cnko$=~YxE}_hrMJz
zqkrOIY4$%0{{Uy|4B3jp)pBJD3CJJ;w}MIF3YS{(J+`H-0pblWGl*15kc=RFW7D3M
zt?p-{Iq66#ExC;OQYc491GjK{eJQImToPj$+S^6|8*%GWIhrlP&4i9e?)d}~eT_u>
zE?7fy!W^&6PXr$QJJ;Oqer7Ytk>{Q}sKQ}X#M#H^Q9KPGb8%}ez(MmBeVOzhN_@{0
zp;3uZDcgrXHV1k@R^u+S{^>@=VyBWiimi#bnwD)YRb5O*bX9R91Lg6az5bPxtKa>q
z%v#H6vjl%ET#y394_prC`c?b9OB&caAZc6u9!r+OgN~W)o|)-cx33(GGNvNjTca;R
zI+8yQwK7*ml--%d>-INo9EKTEFD#$G9(>>SN2PODqTJfL>PYtQA~2bh@dA(M&uZ(n
zdv+GLcay}-fRd`shdlPKH(z_JhZ-%kF0joBWRhjcIqDB{)2&KcSnj6oV_d~GwBlnF
zGf4LMRwMUpr=j})0EJ`Rz|us4q9_jJ63hq=-OdL=TUYi*%_Bi;At5q>+wXDMdR9fn
zv@uKeXGdvfO|gLIY;D&jlSf=$gi9o>-@Ge;Fu_+Ct2V-AwEG>*2<lmb7}IMg_4lgx
z2sf~f4U)#Y3oB$X$6R(aTC%|crQ@F{KkplN%nd6PYayC6n#Ko-+E|x#Z_k&|<R9r>
zCY;kU{jzuzwBQWJoI0mtj<w6_*BQC<CTPSFoT)u=-=C#xX?C&3i*F^=kz4IDAdHg4
zx4&Wh>6pywt>=)!R_1uOxh$}V@tpLlZ@Ti~0KItL*+VL(dE)~Z^sM~|TKRD4_bgo`
zd`T!jGLFY5x3yncOt$%rOT3PDwsG=<jQaMdOy`xZT}eL86IlyjJoVaL&@f@tgX#V?
z8jE;P#|t|;{{X99`55=jOJNt<CTJtKxx)}`=7jOP_>K=@QM*a!#iU*;I<s&4QCwyI
zoq(j3!uBi68mGvzmELe$KQi&#&{UR!BCIC5jZV@dRu~NahNXDqOIGttW>sUnp#Bbk
zk4i~gj5M&LsxH{A_JCiGPtvJbfXVIx#7h+t>;hvVfw$0mR1w`-O>mR_o@ibM8I`2S
z4bud79q2Q{@~YfUWKE<<iPVnSC$1_cdEVV+Sa9Wvw&FT=G|*@k#^%yTk#3`B^Gig6
zEUJ=uJk&(sVo4HN03a#(SMeRHM2Voej0Tk@g^a<N5*Ye{=qf2oGc!$zx2AFzZtr?`
z8XC7~NEa7ss@!jJz#f!9>a#3NH^Qfs{x&}6(xdx3NOrtNIDo?$d!Ip%(w1A8w=5Gz
zlH+SbBu*97W1;n?G>YcZ>Pva#ebJ&8D%j58PfjW}RI~D<x|x2`r}r@t)F1DA)tRA~
zENm>LnWmAJHi@_#XAC{PYAdZi^UhSZF**prbqaEvat>-;i$zFaH#b;>dF)#fz%zv$
z{NBg4M#4xfi-;N$&dQ!+0>d7Z$z`@LhPZok58e#;+z+lg)F$FxgY26fl<tj~WFO9_
zsdg+}%^d3L@eruLGbcy<J5x)tF_9#}E7TLxg;zTg;ml$|mLs_IrX;sANUbWzx6J+7
zjAViD{OJu0#j&#Ax!6Z5WkiG$+3A{OzF*l)4Px=WPwylk?FZhHN%0hykhhlM%9fO5
zA8<QVMpW~f<!1Av@`8m>KnJ-w>T^p$tBZWPV>AwR2Wb!P<&P(FfH+`!QzN%)WLsvR
zYjc9mNj}-Bg2=BL++mQgM@1Maq;t(IsIKx_tOiJtK~;^$=*MTz^QCk<6#<^w53)xg
zbz(;HoR6vYsoLa862mOxh51@D)MK~3IzxLcssxq{%EciCKIglCjaOkHaU2gA0EP2e
zK2Uu??adbp7EQ&(bH^l>&m4=l37p{LfZqM-w-?KLMZL`FvN;J>SoV^~gOly+L6>qf
zT%lKucNQlZBaVZvX_Ke!o*O_|1rDqZcW&ym?mGlh!EG8m5Jt|jnI+rkIs$*CR(q>U
ztC9QIktPRdR>I`<scx;--eWmNiD3h9c0Ql}x=57hu{05B@k)#P#SEdr1ZOLrX^cdO
zm?D!d!Z}XqMsa{R6(+}$=2S*SjqO)v)Z8GD_hZ{M$>mt!S*{SQb7Th%fPFz8-Knr$
zG|;?a<qJ#l?NNY0Jbh`V1meQ+Ez;qmFB~A9=rE_$nyCe>*32NcktA42a}0oxs!v*y
zLo~58_b^KwARgyw>`xR+s$OhB0<>-NZV?Q!4ud{|nq?vhRwuJ)CfZfWBOiEu4Oq%b
z<|dI8s)G_|133QxJ$u!8C3i^-HxchC(bMk#0QIV5bd0oZ^D?O3!FV3Vs^tux$*`A*
zE}{j;l(I3v^~ctnFrbpFu})RM+lHqHYiBd1^30NQQGqJH!#ygs%-aE$YiUYLg-k94
zjogoFcVI~92^(D#=gEyvDt#O4OK}k+%)E(SH6vh&e(Cl4)I!}-?8uh6oRuNjvw}JT
zDN5}oX)bd#u7A<dag28qhkKHgk_ZGF*Kb?}`Hp?+rNgXvmTUr#hf}~l-qk+Tk%C3@
zvm9+Nj30kWg7)4oFvWXsD)0lY?iGivS`gc7n}}ouB|(?q70v<mGynr`RKqVx3h|#|
z+Jm?>bBI8QE))UO0n2~&>0*vY`B6h7sLS-mJLk1BZa2&GCh~$hNC*;hk@$Q2P}`Ox
zh=XL~j-sBCq|(M9llM|K)Zf7k>z?$gk)#b2kiK$Hn8zDVX@X+M1V~*kvmzAQkT>05
zf2}(3%W9i#$i_frCvy%uA4(0jZA7v_-@B80%e><rgm?TZwcL<LnPVz4$1FdJsWIO|
zNN(VpD;qQjtUo_<-kl_nGz}R!RmpH$1P`rOmNRK^vLdsju!E4@y$J8kFWU?vKomac
zu-Q@5(yHSYViMpq<ZN{V8SU8QRf|>gtz$9##z`3&v(ZOEQ2FZwk<Sg6%Q;x$R$xPs
z)O%B{l55G{-BgEV{l}NVM$b9+#Zq84?|r%Qm~Ce`P~#t+A{<EZPFy=<a9#qRUuty8
zJj*4Wg^aUKBLSpx2_EA=N@cQN3pTd9jg{cTN(dW(&IV86Rd#@|^975_j_FAcpDBSY
zk6hDam1mWv(v?`D9$AzE17rMiOfrB+&4}HyG5{_QV0|dGYr9yYun4L=#>ij>)h9gF
zsa=gB{{Uyaj^$Y)3Z;H_3-X5Vk4m22(rKiON07z%z~CHorGtFv!pM-ZxK)wPM?G>Y
zN^KdXff6aoOu&$UV|N`#psnKxNnIKwiZeovJgNNX)kfmTc7Wc7qXZMb?E6`qf~10^
zW3DR1&*iv=RcO!wlOunuZtLw;^!O6x(iT>QO~x0@JmWl{dY0K%u#(x`+%S+L6m=?4
zCtq5g-pb-AmK-1?<8}^L9f<8uwSqg%MoVi+P9T^MG(H!anq{%mnZXiDP;ChuncU~U
zJ*!%Jvea%Z)xE^wStA(=6yb1q9co98Ib>fl;bRZ-?FoUv>OCq;nVnG^?5wJ(jmmyv
z*#1=yo<lRED+0J|43B@MbT+J7Rsb3+W{M&_hCG4Yy>r@&Hc2LHTUJ&f4&s9#dgtDw
z5zlafL_!edaz|m*`_y)YEF^1tb_mjS+HvL#)kaBzB$nx}ioM0!#~59RfM5)I<Goj&
z-XAruE)~wy{n_1sxa-AAlFuXq$cGNnGO9K@=b`@q8nVk9%_y~tV;F#a<Q{wd2NkD5
znGG{r%B2ZqDV^T_^(C#u_V%x0k(-~ieA7H!VZA-69u1jUZb=Tr%Z%lh+t^gr@mnx&
zB)5{Q#Id&v>QB89xGhLZ+$<=AB#fBUkC-1qf2~+sZz?u2N43}tV0Arttryd6Ok(O1
z>9`HCvCjMtz3eI15!@kbbSWSzHf>&n_sOkND#*$S3eV*1GVlKYSsZPS52k8pVpfRE
zCD=IzIXQ4eG0UNvC0&vg#BZGK^*E}L$#w?CQ8&xC%m<#meW|%}lg(mz?&E}*W<|oT
z<Ol{%eQK=I&SZ2(j4W%t*$)7o*roeTyl>{4sJK!JXOKr?YHdDiJL_|83|}LYzaV_x
zv?<-%;<=qOo3kT}lnO1w94Q(90A!kq*pL!p>x3LD9vj;gxArf!NYKG*S=lzloM4Zq
zdZl-2ktdcwMutzAI`j1QtfvN@&@?8WEcZ=-5*Y|11$a^TRhy?b*2^8zE67{-WjI`p
zKMKrtmMKh3n{xax=jExbuT+9yn0%{_PI&bm^y$^*R%22wPSMP$@sJ25RJkN6$0O@d
zmPyNpRzn!dxI6>X1XWq5SruZCksMFG2skG_ezaS{?G)0ir^|8o*#4DYS(A1^<*9k)
zX@lM*Sq!2#41VrEhzg3zPqRxV>xGRKK!kde)}f9^lHn0xJ2Ub*ZvFF5ig+WHPs`>j
z?q$zW^s0?*ZZ2Zi+NASw9E`T>7~Z4)S~q%*YlzLdsa4w27X%D2<JZ!eJc2vCKya?3
zlDIfM#Y1$_O>Xje%JTuR#5ltCHMHuqfyjw&p4<$+;u!qGtVwi}L{*!j;lj5#s{TeW
z#9#r*JxwwhB+F(ju^3Pn)48nSQLPAW#mBaVH1&c=NRYAHBR+R6E|;i(XU>wOVZ6CM
z={X;cYQK>@Vly`g&GIu07d`Rl1xD8EZqme&o$PvpmCwCv?WGo)3+ifKUp@Ax_V;3u
zIQyh<2<|aaTd-SkECpZ7%My*2B-L2lKbI`Z4ZLrOAJ^1U2Y@T8Cdlwg;koP9x)pwH
zLgmJHRuQy;*o=&hR3Be@h2)LMDIk0|%&IwG#-VX@AXuP;I}?SFcc|cwc+iWo5bn!A
zOj31S#My6h%&x9Z-!B84AO5{K6bzEgxkt!YbApTq-l~pdQhe3{Pe<%(dwFA3R$|49
zp1sGlYfhwO#i*-o=b!bN9rqqShLYwtDiI&<ugt}I{XMG0cGAyv4p@0Zl#Gt9M|!z7
zWw&KzQvDm$A4<9M*l9Bt0pKv1759D9xAd!K*%mXIPnfvEkGc*zRG()N?H?$?&d_n1
z1ah^r%!)P)^1hz6mC`Gerwyl;xp-X4jC{kp<s-26r^yo>GN=Tw*%o>Ct6LMy+Z;!F
zpcn^+9{#4LjeNM7WU*-*AG$dMY5LU3=p3b6Sl(t5v`%9O4(c<r9Wzp;oGBwV9c5_w
zZRec-04i3u32N*NsTV$CF~cz*!|zU-;uvGzWMy)rWKKE8DJfbzjEKUfKeO%mSmSBx
zD(;=7$YdeQx`G+^AG$hmS@!y$kok&aX&8LSM(?Fwu+?rJHG(UgKHlT0_o9_}Ia!S)
z%gJkJ1al-Ql$ADYkmR2Hnx1PUYhZ}+l~5aS=sl}8XPFA#UPR168>4`5N2sgv#{>mo
z=vxma=i>*`yB;Evc1*P!4!4=(yWix<&m?$JAKeN%wkg*ZvY6Ej!9gFoCxTD8s`i?d
z$r3HBVju}oBPbxLJt?zF#O*4?!_G6**F8*3l&p(URxGHCAzg#Ugl}>(GghLET$eGk
zupF5|>*;~ov+bga-c^!omI6*fpI@bELvMF8mbhe%@H~)%0oUHMSh<#xB({PXT|`au
z07K=E6*@y{uuE?-l1-&tDdTYd6Ht8c#?qKdgVZs`?t0WxT}f#tl^hHZAYl3KY0nbc
zvn$<0uVjvOHvV44Ro>x;Kb>b8)>35`AZ;Ib6O4L_pHfS(pqR_Nz%Q0RizBXTEjq$y
zAzXP%Q)|ZDjQZxem04VwUQE+#+gYZH&O3u4@_|yVp4`+|x^z=o3xcfqljdUIbPnHI
zv8CxU#SC_~^G29vD=Q~c{uOpPp56jswpS{|I+4bEwku8dD9K+A!j}zm_Jm--1&L2i
z{QK0mnq|1TS>S=pai9S+*BwnZ>ho!788>tC2>3bm_ohp9<wC5%3NYt6A46EVz)r*F
zj>tk@2=c~EmUGkEn`I)}w5VNKT!M$G6wB-HHprPH10djzFg<FHE*{-x4s#rt+`X|-
z>ZrX5y`F~C-rP%OL`6(%_kxessLWnQ`4vQj<r%)|KH{_PP3#2C9h8y*Al|Cj0R21r
zinz%ym}9w&v#<tTrvL&wQSI&~+ag&cksKI;$u3n+I4Arm4EI-81}l`<;R2~qfZezh
zmkB#Zve*FO{!+()Ju2ObJE4_=22L0_`IOc&n&?WoR^}UF99EYRN~t@QGlRmMbSJei
zNQ*Io;xh6yc#WgS0B{evtG5=~Op4Zb*HW}u$V6^Kb>geVZ*2*2XoRBkASWarT>k({
z=A7>ID%z4HZ#*c1*g3&j3Lb;rnAS_=`3WJw1Q!SH`&6+=40vV-bKr=^HjiI=nQp#G
zAc93)xDl~WynE-`qnVDycw!3>8_7MuCoBg}YGjLR7h-ZcDeG2jrLn!5W{xITf-S=*
zDoE>!Y&t|5y^~#8>W1Ft7B4C`PVRX8DRb%;8+jZd9$R-}fC3O6LB};mb>soABS(F!
zh`l}jv_kP}H!B6z=!#BM2=W0nZK1PPix)tTHwSAUPH6UwG%@ciZgmM;&ze9Oj#u~%
zX3eC^?8_vIk^R82uLS!2YpM|in|9-{50!^jHF_%z0qtRmWpx0Z$WAk!;M7T9R!fb}
zR>sQZ?ZuoW<(v($Nf6;%{i@ZoEw}9#%A)aO^5nNtLV!Pr4(It+ii2+?*7{;aZZZOK
zxtM==Q|=%K6Hfb>3@KH?3_G7{&CP65iI6Nj$&i#ml0(XK)3-`wkS(gkHO0HT1|l|#
zp!cmgY^RlE^4u!~7+^ST)`p9xY5U(xc`{vcjK_d|L9C@KA@Z2;Tg^4I`AM{q%wXWL
z_03+jvrDfo;x#@{ZL-L7@{!jcjXn!qKS_D@8MP%5?91D_l2L&<Dt?`*(|E^D8hcr2
z;Ut1j^>XAL&EF=nl;zO181)--Wfim%#chxS?gJPsPg7CJaH^YOnH4ty$;zK&?^Na1
zwJZ5hrJf@V^FDb@bo$hh*<4*l-f~J1NxT5NdH#Z>N2?om(GyzVeVyct1!QA{Pk!e<
zm2*zLO+lGVxQ!Sjq^~RQS+nROXKALmj7G8IMci`3)MBKzdz~>A=a@?XO{xg_im$0X
zezlyWx)n{exv{KR$8B!*(>Rb74I8F@W$n#!cV|_e>8x#{XwV<^jr>1_bkO*hO)wPL
z$AOk7Ay=@hi~Fmq*@_EYq=U84U;*j{WVxFzrmI6PZ4P^@X)Y$zBz6&$ML7Ty+~S?#
zrM9w#((f&E2;~ry$79WD4-UxNTkQ`SJSJR_`Slg6rTA*Xb`xGYvn+WYTW!ugeQ7zU
zqd3!(W__IchM{8eT3QvIiSmFvveXaZ8?8Z2%=Zqt=@a&T;MYT@X;Qi0CA+v*B&-8z
zRrfWtG@Uj(CEa=)vu=taK4m@gS-SSv+t}Z8n9;l_noAiWW!zWysQ&;l`j1MLG$crw
z6{8?!iU3q+Ju7Z0W7Fh$X14{Cox{_xtm)=!q35hF%FK6_7~5G&w3{?k;*nd-hSd%8
z%oy}x{n9<UReQf2nIl^`pUy7W0wm}$-mHrxiZ+TXV~lWF@;UWA%{_GVaT+WtN}gG8
z1ATp}T<$Jc(8|;%xYV38gKot@g@OG402-qogEdR_dz+h^napdscFD-Dmg7%JVUu$p
zDl&xdbJOLdmKm*WV{+gloHKOE^`n~WL2~P<TSy2j%vW}z-PB>5fZtPArjzWE53(_G
z2_zq1T7?qd?Ck>YVhJlI?Cv@KLY}K~_?}sn*KXe_*A2U~3YQ|)k~D2$lHt6|bu3JH
z1$q|rYFVb9#3;Ct7EnHNyi|IAuWP4U8%v+{kIZl*V7c}BRtJiFN2tnXhSm`ztbsu*
zfQS5QTN|24zp1=yBPF~1!0u;bfs_0v(xrn^`w}YKT>wbu1C_2IpBc_^bdL-y0+s4d
zvl_g{?k%@+NKm1{iAg($dW}i;mwF?qieI%@%_+IvG<@v?1;I65B%0u>n_?6;5Ib-W
zy;7RTRC$E@JMS$J`CR;~{{YvdZBk}dw!XI7z#qBL(ruN^eajkyOSD_vvc<QVLZ%O}
z$fn16Bmh`n#vJbR1cw81o}TresJx9Ciqc}Qv}1A4IH%dY+>-2!tds2k4ZRP(dr~E`
zZ6#u|yPHt+oQWHkC+@GNDs4hT2?iUqaKkZMgyoO-v)Zt4wIgFQtg`&u$$Wngx3x@G
zOPOMG9I-2~<(sD;cpl$MS0|ZRyp0kW<cXz<XyW;q&Q*c!j>es*KiF-;Nvaf*Kz1vG
zjGs!VmfvTUW}fk+Or6b>lD>!5nQ3(B(o1tNh^qr^gk(7W@cyIPozSjoi?ae|;x(33
z<IQ!(SFrpmp16+g>hsFe;tnNZ%_evRe@f}JYkM6=aVE2L!V)(U7a2a4a_Y;&Q?ku%
zXK>Q&A)`mY<EKhFk_N7F(P;wuHbWE0@qkH<u&jL#wOkP?l-tP~qZJ=J^dr#J*E(zk
zn&J;V7$1@~n;9dq^{AOv<qr7S*?DVxVE#UoITLFUt)<a&>2AcS`G{T+Q;oc{+&$DA
zRm(4v0uBis&!DT8!hbO>8zNZ<SmBLw&F$|}MPm!xx<@Lc%0~1#%Kd#SH&Vl~MkvBY
zv&|6%XUvGNKj+f5EVQjY_fK18wK2`Ti)3>7?0qVvI=-0}sM60cj79)wmw?#p1!d~q
zB$9WQ?@YFL`G}Bj+mJdMn@(>*HyG|{-rJiv8_z|L4YzA{&-J3#_B|REy0`(If$~rB
zWOw>j2-0<55?s9Y_hxO7?pRTd<p6W_#cbR72JlA^yq;&+nGEgIJdsr67_WJfq~!Dw
zd|!8{v=$LYKzZ1(034D!6Hv=-;t7EhFd?@eER3?A+4rqm9}U~tIBSLhoxVai$G6tC
zqVVLaZjT5)Xkt(=Ve9W%xy3(pr3p2u%SYkl1{tsCXyrmkEuJ&m-n#7*K+yDUIL#bB
zWy7um=Q#Z8wARwk7A}H=8QjHtV~U|ZwRxq;_g2xFNH`hC$~}ISE>e+dDg?K>J@69m
zv{4Z_CuY&lVri=-rMd_pxElutcQ`(v`c_r$x2@m6qgPoz&RZ^#oOAu}dWh?9CBlnq
zSC@DT5ZVAI-}0x***xgKsB1SC<rdBc-rR31)|+=GrK-p0T$YY$4=4^Qo#Z-%NXh3a
zxcQfO&(u}>DAQz<HNzHYg8clA-rkg&QAH;v%U&Gw=eF`y%##*9$lH$9rS`wFj9Wsk
z=-YsH&g1y@tkET{rrVk2*gCTVii_=*lekM;sH9=gtMb25S-n}Zm64&V>X#RYW0KYx
zk?=ym0*Kqc<4h?O){Ans$8rJ#Zs3~A)Mu8?C0A7-%b5{)>+9`Hdv|d<q^b%sj6Mep
zC{Yugk!tShz^Q~vQ0*Jl`j-BJsOmOX@}tiI$&E4;9B&?^`U<1=Jx<xis|3kB4;jqz
zbSL|yclN6i>a1;w$cnp@5-xu5{*`Jr*vZXFYEe%F-}s3h<@J#U4&NqDS8w>5r8j|7
zMY>B%*DlgWxfrhBExqZNUNF42yI8Gl0wZw=&nkWDEpNp7mb(}Fb=+<uU9w1n21AT(
zKEt(cl}`E`(v>&1<?D<69?CHVim70rIW5DtbJO&$lGj=A)KkXs#NK15^5o<1W0Q<m
z1*z!Ty7^akapB4<TSM7b9b4Bl*o>C3i?MsR0GE)rQQQw|mjxtDYPh|Q<6hP#wy<cE
za8@}|M-qEiFQ{2GrDVL3&@nqA&pF3ReU`Ozas%D)xWp=X$o}xD+_(Z`5NA9h4xskO
z){<O<Z<wq02!-;^kbuN6tlX21b5?9hyTt^zO2`KFWL=?~`={2QacHn!M=jo&BvS~1
zJI@)%LOm*-ysoxNXFC|X6-F55o$f1Gwz`RyCWcs~NS)7^t&f}hN3~JBnkG^$W-gs0
zbr=D?DY6M}q|MFOk(_x^F#E^T>sMj3F~{XSo2-Q70zm<NXwe4cUku4_ZFsgUpfrT=
z?aLGBdsdbI0Ee$`Zp^~j$WQ=$ZosFV9?=5cNp%XMAC(Ue&s=)esqtoyr9t*6?^apJ
z8$$iX_BAca{^}_tmZk^%Bhb#w#_w#={{X9n$qG-tD@G3jc!Nw)d?oV{m=tJ91U5Qi
zuzX45S9^wz(%C~d-(=?p+x#jE9~XG4GZnqP!+E)42VazrO0HS8sXXvZ>UBYTrHLO^
zvA~KECg;H%`qw{quG)t!<@rSyAm=LIK~vo78t$=TmfD=L?HueJF>dGSS+Z&NkzFEQ
zTN55K7AD5y?Mf+i6y)B+Us7wS)nP|Ap?4hT_h-9iqPlV;b&g3DjtF*dln+r_liO+2
zTFDin?JBusX6NW@CL0}7Te>znU_q74i2ZTx?^;DG7|P<obe3_falyUa@^Uf{;ZVPc
z=hI_lfx%4S)kX^+PtKvZ@b0wphFBzEqdmd;)tgTT%?!~Szm>DO(;49Z09t<UQ$OA}
zqA5v#sO$3xTHR4w<&1aFu0?F=p9%a!tJ<5p$&dtp^*|Ak)3s`88a{<@0C3@2OoxrL
z@-RI!>sz{ainPBCpDX)7N(s&!WGOwWB~n{N))Zjf=FC{W9$D!#B*q^!B4$m1jDL<R
zDaF(pu)G%eRbZ&4zGnl!(zo^Rh?dey_qMl@On~hH0Oa~&xs5{dOZ%BMi6QdDfG+Rh
zA3^I=9(L~{=gA+0p8olwx{%1x%7lg@BaCO9XV#+r*s(|iYZl+{25g_9HA-7}q?DqP
zoMZ=Ld8-1`PqUqEUhQUe0h&c$m5J;=m7-BH=9R>65?tLQt+YS8#s?ge>s6+XSqQkA
zP>csBKYQ5Jm->WJ%JM@V0)PPu2OhOau5Yh0u-cH3pP0X6{VAxfgvwXkzhS0BJ=0Hh
zbcD#bU{6|_dF`~a6)k}&oq?1SoOP_rXr+jsGD6#c$FZvsNfh!K-b}P$W<oQx4)lRC
z<(byCsLkWVSrKyYFUzyHPW5)vPP`esmk7*4!h7S_6;{IL^6F-W*(Q-(Ze|hiN4KZa
zwe78)A&&UMKypIc$}r;{e+tS{v(V^-E<<x`ePF1wDL!E(cXb0Cwkn_7V0j@C%NPv!
zBOSY+t!rKx6401k7%F6m4odrH*V>t3qenDQT+I*?d89tU!1f;XDpp#Q;i+1CIkfpB
zFiHN8aB&k6_s?)?E%fVx3A>aR-a^6#Hy+&jR{URLYhfMrqccXukQT<;WEXa+DqL9z
z@KEkjp@8=u^*+$AW{Ot2T<a>Et6?1EbCJUO8n<hs=u%pxma%3;z_#gOat1v}$8l5L
z8@*2N&TCMil~fVcvD|x9Y9P0@4)=r;pD%t(G0*a>+}kUaA=+M@r6i_3BIQCxGN6)q
z&v9E)X!>NfA~>$Rk{pw?{H({R_U5@cJY+OE&eEmS3`rUcfPK5wQ{#^i-CV48)`3aj
zK_UVfPf&gR`x;K1o}uj{9S!Yb&HS%AX`v{G46es<9@R%qOGvJo)(i<*cLfc>C%N{l
ztCOv22ND%X<UcY3PnV9_t6F}PvcmTk%;d)(&fNO(gGVY$RxWO4ZCvVhntUl}Z9jdS
zA1#3A+*3vLmm)}Fg_&6J9CY;q(EHT79+juf6m#mE(q|Y+B<ctFQ_h~2m;V6Sb~=hQ
zl8x-o%H!Do07{Fkk)@vHs~ZhA(?&BqrC1V3XE{^oYc!dSq_=j{Ool(1b_2QFJ+V@(
zi3N)+mpgLg31mDDdejLO<*nBH8<6<n;bD+Rb{?6elN;1a*d@4&iHvd;0PGmS^yBrZ
z?5?hDEG5&fVOgWOA}NZlSy!(a?^aSR%?rzGD#&ERMsP3>tzFZ6Id?3QT-nT3M=oR;
z3PI|=l$?@UjV8((lR<8cBuEu<s~MDmw0eDOHhb}ZXl*SVx%07vT=U!?Kr5j)7A9Xi
z#hOHHp@@k~aVM)_a7|OzM}s_<xzU~NXO9l+zpC~<DJQ5n*r8|PO-lOU+}z#;0EOAl
zLFjuPYhKbT9X<wQksLpACO<Ns<oeckhjqO^ESu}IwTb)B!k*@#)~}#z?=~yF`$jO0
zz#r{ZK4$e5(nQi~Hj+-))<}{^_g`ua*%fg$Z8|t4jAXe`Uw=g%h^)Ivp_gQ$?NqK#
zbMlkvRqoWmBN*=3`M4qWbRL+e%7xEj`POW$nXT3dC6WI5EscZLpqEiHNG6Kp7R~`2
z;}x8B2UuPxq4Ql_;h(NOy?&HkYF74&ZDh5<Fy)BHDtpy(SX|O&U43M4GgGpXM!9Tn
z+aVjk?f(GQt2X{4a<N#n%^L*C^SM<20B1E6z9X=aW3e_t2;w#B%zL#~n#pd12%%<H
z<g*R{J<T-~Mc(Muv%Ro;hPhW)EV(c%=V#aJQvq*sfXSye<jE3l;15d3(R8gk)?_7E
z?@}0};Hd1w*0hGBExc`P0e>)H007(dr0j;S$gb`j+BTaDtby`TU!C5==~(bA4GPNY
z#0d!4t^7mMwp&VqdE(*m3vR<V$_ey8&bmu~0crPk@!nZ!?)YDrM%WoWe-rCj%Csr&
zQl}}ik(WW#SZx-}2wyRWs-NXkTX=cW?Qa4Z_TU&}B$1BbbOO7PpxRl*A)U&}!bFmu
zRQ~{XJ?fqQruJ#}c<cx`#GY6gZ^p4$hb@ctQI6&oo8f;E*|R9LQdzgAduOLTt4i`a
zIY4P|ytavfkd7QM;-iyMHwcilvctTd3G4Y(CDltiHWE*joca#*+i!8`jbp9411m_<
zk^=d0^2`T8PdbxbpoGea8Yy!Wd=Vk)8nOP?U?xZ+{qQ_th6klf7M(Lnw^Gc52lugz
zt2e*Wi$r&1*9Pfk^P{;t**@mp0QdDGmr%I#HrvQlkf4&h6UR~MLg}|L#AYH^UB@yG
zi|tvWNkhpTyt3q>W5#pP`c+0ZVr`-ndz*WiZd%~HC+@}@<{yn*l6^;4QTA6Z!agKH
zg<q)ksux<2(`^>y`423NRdP8io>@hAI)dqb8`0Kl3yW8Ffn*S&%MeCOeSNCuc<hOd
zk3PEauD7S(Tgj;1G{7-ui3!T&aD6jTU&Ui>6RS-!%I~#MaktdwwY3iw>N=&ww)Rj3
zZ!3FAv;YT6!IVa_V)8%^33A4_k26}CO3Py0cT#R(R5CJvN*+iZjaAfQnkfF$Brb%$
z6LTD}AJU79tvWW1BERzsbFqG0@$2bSF7->9$B`!B4t`k&ryNsA&D2R6ntq96_GvFJ
zbwcFEe7Hj#2H=y5bQ-KWJo!|PV-OCx0OyWy4P&K^`h>arQ=ke?)g*5Aq>@VmYDD)S
z$`9Wlk1Tq7pVF$=BidOL-*}4hdzQb`A!gb+3cq*PG|PD|CMC5whH;P&92$W&F@bL!
zilu&Um#b4GxbqY=v9n0T;A9WP3Z)fm6U^DKbu<kKHkT<VBLg6eanD-CyLlE(vX(+l
zO8Qb;O9_}uG=l|z>(kb)U5KyTtT`_q`m{Y=eW|5kHsp+!ONjSxf0c*Ixa(6|+PH8A
zU*!P+9M$VM;GR)$c^E1j1YmGQX-#Wy1nQR1f!TjAz3eHvmL)*LHj+;v9!s7vv~l&R
zpwZ+--2*Un;2h^3^>^&Dd9ehQR2IXKIW=(_${S-a-MAb(V~@hKl~#=*O*TgslN@nu
zOQe<12ABeWct0OcN|hpKaR`8X+_av99AH(OoepV{UeXC1DsRMRued+sQo(5)OAHaZ
z?_zw`^c9b^HdMyFlo8v*J-}jJh<8Tof$2|*-fJm7XgsjP<t#q%rrNEUMYozpc2^}G
z9E=}&(YK0AwlPMgXyPEV0gws)Rg|XeX%tDP-I(oO(rCcm2o7<vfjp~v)vW_pvz}+X
z^OMO8V-JpuI*fLzl3bYM@=ca@WVcR1;E_|^O`z%UnG;ZiEWuO^@`tHETEbrOrP3{H
zR+bn=OQn)lJBoA)I|J`c((UxSLAk#E^78LF13kd>u3uI7hvD?pWwwP_GcMS0cPf$H
zyPW?3oK{Wui8ZU+SdmB#BapH&+DmpHO4>MDl8(9=I?zn-Zlcgk4IA9zMSn3L%s()!
zO=H9wMxPL|v%N<O<nL|@G3#9AzK7x)z2Dk5YzZ51Sd8bjZ|Oe^Y<&2n*R=s0Dxba>
zJFrI^ed@iHDl6WV!A_-5h9PCGTHi{mX#++Cd)4OTGkRi~du6B<5=|-uX+L_QaJlXD
zt=arJqUnY=)9zf`s($KM`^0;m=Cg17Yob}$&81twk{P3D<nst^!1W+@IPXywrv1cI
z_gB1bXu2f#v8dE8keM6|gMf-U0DWs->r3#QD9I)IWi#a{lz@zTpHuE@%I-XWcQw!1
z#ldTMKuF?^w)tbeao&wnRG(eFBTG{b$cL6)&Ls8CIbf=}UArJys%dDB!&UJvlLWEF
zrZP<?cFeqdsyp*p_dYQ)t8BF}fN~gP2k1L}Ym&O~)VB+^ZA`gk&eX^(d#zg1{2i;^
z>IrY=Osdd>=eZ?tKZdqcD8f3kFKt#&V|ot|CgB{Chmff;05Bie{{W3&iu?O)Mo`HH
z<?_lTn?jMsPAZkJg)MZ?F6!#?Ev<zLPb~g}(wldA_BDMr(Ky-ixfwY<{{ReD5{xGO
z(^$$$d&ZTm>)K55;Q2wYCqFj-0AM{TbbW*gS=>fTuF^uW_pAu6^*f0c;yX13P$!rU
z21lp8GgQ^>JUOPWfnj|t^Igo%a^>>Lo^ZZ^bSJ$}ux;oySuI)GrNxD$t2Nf45<Htq
zstz{w$Q7ThYo2|>TWONS@=9`yI$(GD*PcnJ-f9gbCU=j@P*IVHKmB1^T3(MNGA^QT
zyuut6R&u3V9FjdNPpYM>WPM@15-w{R+^}r1v5AbEi}|cRS7X=@PpxLhf8q(Q66*HI
z2-W^pWWX=egI2Dkwex(NYnHe(KJo||W9{fF-jAjEdDLc7-d;*Z?UIetAbR8a)~QAj
z(HS=>%W|2xH?YlgVv!lYbWsl6<E}ucHCS~R_Q~cIDh3qv+lt+l?d^)k5_z6u=3~ZG
zkyQ1#yx8K6B?168tE%Lus5B{Su$s`yj^5hZVFaVgiT-Agj;cpE^`Z|L%N##vv9oBP
zFSHSY#~ql|))ux`5{qk=VX=s2X3316gbH=dy}f`oaM+Lm`K0Y9y<Uy#PQ3~Xdp4sv
zj`mVeoEOe9{{ZTu;_fK#VpNd0QUl=dzUG@UM;vBD1IQW3WZi<knf9oqHt~QiP?s(9
z5ZD;U997v9c3!x=b-6bp?job^0Jy>LnyT8QR!&`ELKG5qo;OrN+T!$iaK=$wV9DLR
zF;{K06p<1gP7oEoS!6@s)Ou2Uv09JbdkY?<-XNS=#>}p<?o#JD9@yw9BJjNOEK%KD
z@0H{}Sd0)!>}y8O<4Ew-jRmR~nd4PSc)|4^^-});#BU_8JeJZrt^`V)5$-E4X<yyg
z(#qcPs||{2#4}7$k%yYt>Fa=cRhwa^$9%I)0$UdzU_D9otX(eKSh#rC_l@RfY-Msz
zdUM~>wqo$D%+|?qaefPID$ro=iT!H{w4SWmH)}${mLImfdVTg5Sq37AXK#Fw`q3!W
zZWxKdJKtbze+d36nfyO2R^Zs%IFxW^A8_&CxX-O>X&xN8y-4lly^cNS<emDU9=_i7
zgsR3U)-Y_Lpe?7C{{Y%oxSgdc?57)Wco_P2spPaV%w(}$vKHFP7bS=I)vxT|?7N7{
zu$)OFZj~2+eQ<ff?N%*dp8Db^wgo_J76X&?u6I=@b5%{XW0cl3i|d(WyE3x0kFi5%
z86BFgXqsk_*89b}eXV{;Q((+&Jv~3dx=a563d8oeZy|R9a<f{wBukOhdVPMiU35EJ
zcp7)PiYaaL_GR2hnt!-(KU%eljH6`5>>bX2`dRefF)c6FKQ=NYP=Js<K<!twi_IHd
zNbUSS9wk@;nI~+kuoxs~o=>eyJboI}+ikpR_cA_k(q={Pj(dAm7$lAhY45Bp&f_T_
zTzJS}c{uDVMJ{ARk1I2E-A7llcaHX0&^PY?0C^S(QR(eeqtl*ySZ!4nKx8|E9Bn_|
zC(^f4%HHbyHn9wnCzJ}#&NH6sN4FI<#*GczTw7X@#xw+}TozO4D|JytSsC&+$Sw3O
z2Trj_ukYRF8;k}yND;BY<a9LThfe!DJhxz=8<~(`li%q~zwp$GQMAy+#sdT-k(_eB
zT83qPEuI-7AZ*LT&CfkSp*Jq2Y--78X!>oyv5rW=jF@DRx|7u6vh<%1-Q3@K;x?6{
z#^D-aQGM#(l-GB5>I^RgOvec$ZXta^t$1dz(|^(IoTCC6<S(7WxTNIPg+?jrC8ekK
zY^C9ei%0-qR1gQJwKC#6D1)Qi50GwLF&yTS=UJ8RM9`*YDln?U?)Go~y=6~*V-m=j
z4=8MqUp#fiLX4SB#wfFP(8m#bqOyXe)Tzc#Z^EnC>RNxzEzY47P&#3YoDJFNzLlSO
zeW>0~<iVynQ5O861Pt+leJYNzry)dw_TEHLglr9s+3qn~s%hxVWmlExYR%$9aXE`d
zj_HneNg?})qxqU-nw$|si_3<NHf#w{<+JIE!?D(`EFybL>Hh%H-{l}4V;;PBtwh)K
z+X&JvI@uh`2twm_Pg28<D^Fz<W~#TjUssP+juyCql~W|_Wy?w{pPFAe9!ATC`B^-|
z4;{U$PsA6^sWg&WO3k$bqAnDxcdV1333CJ&LPrNP0iTe6jdW8{OH-b!a(Waenn>r{
zZzyn!_W>m5(4Xs96T~yxhZc#tR#2+g2dA&CX&nbjx0UCfO_4_sXKmSYj=x&5V-|&C
zq+VGMn-6ZmvT%RBS~<eo7^q77m^L~+&CDY5Sr_M!s;)419@wpoFT(Imc*9kKVv(o_
zpx`rqTHVkgw$)^5?IDb-%0L@BWBb0ImC_%v>8O!hX>S=oN;80Y_pVyFnI~j))5FJh
za(8+im5<M7VIv6e(a2j1AoMl8X`^czw1KWJ)>cKzqNxSY_VhUSt?v&<rrt`Asw`q9
zIdx?LK>R<IKgOOl@Nb6Vi$~LyB)bHX@EnwkjNtm$4C~aC`BK#EjW|JFvpY`E&xc}?
z#(BU=4&+ix5tEkBrafsN#(GAd7E#hw$q~6>@`2RXKjHf?7kow4CAED=`yS5%GjTuP
zWhDH|&p022Uhx-%{5jxFO?1saRBci%q(m7&X70oe`09PC+#<A_)JmiKCFb$Xh4k^w
z73o-HAziVI{XMEXj}*qpWP;sWYcjNq`-_f%5!iYfg6~PvH48;+aT?6fktipHQ_zZw
z!~PPUZB*(+`7E)lNT-!hGuPCd{uL|OqOVn%+P91+xsFS1Cz)-Rs7$Z>zgljc;g1^L
zmDF$V3~!KD5Xa_UUO2^e`ZtF3C?#ZTHNej09oxA+wXuG5$YL<tT84Fu7|ds>J-(jQ
z-YPLxf*QlhPV#3h;g1DJa>)$#uG8;3nfs|dYqGQO)9H-2F~F>2C1qW^wvSx)rPCRp
zWVW>V#Ebjkw~&6dZ&G+P+bK=u$&C^tyC;`EpGxALS=47#DaHtOwX9Ya?SCSnF(2L|
zukfCRvG1eSB)wRnh)iUE-Kabh+v!=?pA=T={@x2neD+K!MF6hR$0xa@pT<s-O#@1W
z)Q2Pxp)={}Q|v0fgLPrt(znp{w%*dR`SLg(Uq)|iRJRdZX})CFQ|1VyUBYvRi;uX+
zp&;i6jErWviF{RMe`h7tozqJYL$XAh=G-_W9^h9fviQs5CZ`RhwyLmOx5~3zsRCpf
z11G<+tri*YCuC&nEt1sjbzh14R+FkURuaNsSpNXh6vw?>ciZn!>3%S4)|&G27W+Sv
z8X+3(^D=s8x7M^QehBD#6p`vaDAqxhfMtiA1_P)b^)|7g_;*aUTWvXaGxFpgl;`<U
zz8~R^tflRDWKqu?s<&mIYw&IN5ZLw2Rn#OFFo>^1M}{rs7Ah3_nq(LHV)?M#Jicl9
zBO&lm{X62Zb&LN1vtH$|eEcph9f>Lc>DT#H)1_ui=B!wGV7qx^N#!xhxO7r*e;(h~
zrnr~SR7;7;GB8|q2Lp`O9QPM)k37({ObE-b-7DCDD)qI1xVE;ux4&;XHYVe5D<b2L
zI~wV-NW+=3?WBw)l5ox>R@nQH@CQns>f=_P&P%IUqcOw4cTh}k(2?~Nz=au$-KOB9
zV>!Z++v;hHZxr|81kD}@EQB0n^*HTP+9@HiNj{Bn6!$j^1d^ZJ{FyD0lacRN?X(+h
zdhQ9~y^Nxg?;y&U*l~l7qNK9&S5;54*|o&Qb}Ws8(XKlJIX?ZXPI;2m;<B=~Eg%5M
z;{XBQBi6E<-pJB1?m;!CnFKNwpY07IVNNiMkLQ}nve7J4S6S}M$j(ay1nrL>(zL=t
z^0ZSs1ZM=Q^;Paitu(Ci+gw4Q-FfJeZE00E5!?g*6$!Lek)oRHYc}Pv+ZU1(4U8YC
z9cqH=HWS-0lG<R4AzViMo_|4D*E8zUu#U-gO&es+!z&^F?lan(bE)eh*)1crOtiU`
z(MKm7=g?KCHYZZr7H_;n{vO+V3m1(Tqa!v-rZ^|*@7A%eZ9HY;JEodBgi(;I7)<1k
zRz2%`!<t+YJhytF-twLqjsOF(9saedkEdGZO9*5uwB}Mq8{7{{6xBDT;^lK!dmNR=
z!RsiaHkTTjOL9OnxpKQ#9cy>M+6mL;EpHIHiqv4q0__nFn~!r@v)p~M{4`f$IYhs|
z5@ok9p#bs6O4abkiR9BGXVb2u32+(`iyrOg(zKlFN;<JdFpJQS#J(WZY&CdnZU)<F
zvL9-69Ycfs$M{l<+j|(k(AOAJcPmER$UOy52Z!amA8fjoNlb?<t}%iA(d;ToJTPJg
zNg^;s0W1Mt6rQ|RDp0aa)y3SeHm7T-lO~@N#*CY!g@#GM<a%bGG%;Kiy*A!TxB&U2
zb{#nBQQr8AN3x9A+68%%K++L_V;|$~S+n?>OF;H<G-62s+vcuW81fBi8gib*N~B|>
zX2s0@ABx3(!p|&=ljXT8=zDt_%+&l>VyZ8ou`1)`cvOILKfFI$$JM+=Zh{$2+4E#L
z+)v+Ze=6fVMdJfyezD06&bx3}j355LHPJ^1-^6oO#3ixaKZ+hwR@4&ghjeV9g1=tX
zkp{PVE<??`d2(Tc%q&-^+%waR^H@4e8qTe2aWe;1RNb^M-rRZ$+R}VB_Otz`P`EKp
z`1>qQFu-Gx?_CZQX(o(R=RHkpohx0xf&T!rgGjL;CMekMP<oPc%@+1r;~zXu(aE$d
zfsRC~I{*(Ar=@FfX%U-a5MopJts~&_f6o;pm(VrN<EFYz&zEqnHk3cZx6~f>$;|s2
z*r|1MZ+59~e$8xz?P-Hyg7(fj)2*&F{Xb+$d*p{FFV5Kq^vyKGsY`SAyS9&Pe6_kJ
zOo{9N0M@72%N3MTG-}R`^Y53RFDIoTl0&D0WV*6;^4I1OvjEmWDZi4e$Gs#r#u-HO
zsgbvWtXG9Tp2C(ilIq-CHNb`;AreC(eB<Aa)oKWtPnRmog1<0T;E!*5X{1%ICb;7M
z{y1!{qe;YL%(R3B9F932y=oXFoh_E)3u!|aD>byp1d$QfJ&!&6^`w#r)<uv(GO<6q
z+;CKSlm2<9TFGzcwVmD3*kj7JerF#3-t^Yi8L{DQD%wb<hJ7XOT5-D}vQ+1ag8S_H
z9OO!n`Qh;Kz5wU7SJ8DHW65RGkZmpqaNmEPl-+X6Qi9xS8m+547AzrjA9L&8vrf|0
zmu1Rxx3XPb&pn2ajU24xw2Vnb2a(6ETer2kmN3sSHv%oCLXn(%R-T=xTeNtzfXHPZ
zEAjF#`TT0-)|VNPLYJA}AL@HnuBt>RHglGGHNCQLxQ$%Ah1og)bDG-z(EiSh-rLw1
znDOTp1b!7F*~2N2N5eSs!7bcWQ}}Ym-M-Z|l+iQbyBmgR!vTU-3Br?(K<`lIrJ&Rt
zQ1~?%HDem-jMFs0`I0*4Ve}N)t;~~071}Nf>>v-gJrCBi*H^Rf=AyC1c=s?k-0?u6
zUNCx*p1%J8N{T;-+H|t3*hA;yf0`|$datQI)O$I-iF1P7-?EENONF)jdwG2BEDy@x
z-Ky7~CAqfLE!G<p2@ey;(<A%Y^{!h`@f@b=OI<WG{Gi5wZYoLVdG)AQ#NTK?=@&{-
z7t7iQ%rJS+b5yYJc0;bVM&`fc%Y9>0l3Sbgw*f)7Q5YMTcO-VK+spNiIA)A}o#vT@
zR}wj2G5-J#-iEE(Su@<M7RhTd02JJrUVqQwRUg8ZmrCDfzG$ZN36-XD$_9EU{u<IT
zrwz!LG>RC~=a61N9X@h}rIV7wuF=?M^Q~(usJu8fhjiT8Uo(=V{{SIQ&^#V(WofOF
zY0;dPE;G+U0PXEt{vOa_@eTYMJ;^rk`NeLU;XZZ8Zb!8hD#q3-ojG3R`=1%ZtXspQ
zGAI$p^8)z~$MBz1=~V*Q{jL~p<7M1=jgCHCR=0~Z{U1bix3PvX`@ONN4jbGbQ&@3Y
zK`x}W`klZ@kdCd7m8+3iY;-jGnzvHgMQD#@1bf5mm05ZwKJfIcO-eSkhINfYtB$Js
zcAmK>u&pcGcaHSwv&3VHY%(k@$m8#4(w%LhT3zg&l_iOT2^pV`J*tzl2Cimk_KNng
z+=!YceD7`f4m%O;R;{d>;wDRp<425_N5KH|+t8XxZev5mtB9g(+sKClJqgFBr7US9
zk2Nk4S3G>V-Rp`Ro75C-xh%SDI;<rwqw{78L_qwZ2d-+0cwuzXmeNY7cWnfd-?6Jw
z+_-E-GOI*#?Bj+WnC)7cW$v4(Mq-msY2?QfB$xmX!<tH@k}sAml`m{;<Fi=gctJ+P
z%@W}5#{l{YO(y5;cd=gCU3qLckpk`vzMS{(Qr^ca%*<j$VnLK+<pZYQtwkM`;=mZ%
zNU%8~3DpKSdgs!zc4e(L7g5z?wT4nJ3rgn)9aGR^p^s8~&?Q(HHUKQ(XCsW_q`T9u
zBmMItVMouC^AI|aDwW=;XQV_VcJrc<3mFN)Ui=?QsMD16M9OM9vs&F&D-yEWJI5r2
zw=b`Ldsb!t0E&&P$}R6ASz;OI40iS(TIcm|99{{U!WY8*oJgz=M2dTicH+7FjY{)T
znVW$C0J^&LJ;*iJO9uCm%~KS%iPh?UG6<kOh1)LfAQFLseSWnite2NDO)R$I3XGWC
z<w*YN_pFUGLDDa-A%juWCrf$1<Kje<j2`NJYkOI|(X?9x(DYdvOI6R8Hga6!oRiOL
zbA%I7iXt<dwUI2d*+vD$!ZV=8^$o!v-E3AaspF9pZu4BMD9!toSivfN1z;>1w!d_?
z(WJ2^a`D9EWpj`{{p+sNyeVl5#eI7mO!1x32V8l4V+41r<fTb_&g@s5_A;4#MXR8i
zIDDobJ7i#$>_F^l_MN3oD|r&a`{ZI-UA|%d72I2CdR4B5CTLmirBY&?5D8!I<IsB6
zBIwW~`4&kcOvio~lat(5E~WY!DrHloTq?$4jLGIP2*NxC!0%fcFNa!p7Q){WXC7uV
zzdf;6bX_KE-!eHbgm&?+*&|Vj6}lWA*sWWsto$=(*IGrBT)U<=mfb2I%sstp8Pt}>
z(S%U_Q$YUAvil^VRw$4kJTEM9)Bgb1Tvn^%jV97aw#r1a%vB=?Es@;+0F6zn>wYJ?
zx(Ohi)t3(Hzw0yW>?)ML2DF;uJDpbGrNoPzZy|@%{3>A>tz<dMO<E|qZ>il$D(cZ%
z1tIYiX9uUhO5MKKHEY{g#-yugfqqm20CCij)SAoEw7oY<Ds7>26TWAU%`6{`5;M~{
z>01`Ix&*REJg+p67R0vlwgg!0PCM5<S;Ly?8&iau)XjUPl*OjX7HD5PWmMWzKg4}U
z^Qmn#$cU2RZcmoHKGr9Z=sitr%cR(b^W&TbQ;1Q<NgbCx>Yd-29EQS6h@lZMc_Q+;
zUERqYO=ay<b~RM=)T1iOLpwB(WN{%}md|W<0;|LRg=)47BAo8big25~N2Okh(A>ah
zOM?6ymE&@Q_lK~n3!$5vXNKcX4-=4LkRQ&MwTj(`BV=}$Qo{cLYx`6&r<4PO4tIgn
zf;-h4`6HfBwcM++ZX!U*hR0$nZhZ-~>Gr62)+m*&z+CMos3X7Dvh1#)x0Tvk$sCz~
z)y}v?1GlbEKb18#C3FrAXvamRTty2*0}xmORr$_+4{j@<(d=d42%aU|zxPa67~}l&
zP+RMlQI~5Xiqa+>S|Hd__32dgO;&45QE<XSLCP>~p!-pIH)4{Eb-BB$G=5+UB1wbu
zgz5!kPdJi85J@w;<sjqn_7$If@gGCBwTj<Rkr2rHOpDh(mCsyjI@YTwZ88V)?j+%r
zxftkk>Frv=jHS7p>cwcaI~jacq*&R^6!}c+<%wi`jQ2l{a<|?g)Gt_D>G51JGL%K?
z5wXh?=~8K$4yAnS2BSIo<SQbye<>d4x7NCZ@YbKC+DBt^Au|EyO9(guGv2TFbf0!b
zr&Gw}U&6j1)HOx9`$T_YmNgRzqTS|@2xRAh*ZS94p?GFJ7Qn-4Yvwc(d9VeKK3O$&
zB}Z2B>`b0gWe`3#j+7?9sOU0zf?^P$a2YT&{n8IwiPW7<3ymniO+I53@td_TDw0>^
z!kW;N#rFDcpCz;w$U`yR=C=TM<J9`s7pi!==Kkrdtz}h}q$L<83bD`VDlI?4dX~Ku
zs$O{}Wcj3&l@5Kq1utc#<S%K_8hX!+<J1f=>Dpw{v}KGtIl=FrZ+eGLeNN`++G;Se
z$ts3@r{rH_@AR!*1H%$o>CbcaCxj+MtDNsWGCe+(ct&IoZ)pJ~_U>(<k&jAGmt-q9
zsLOboQm{VeEO1Ubioa_#lbD6>1Sr_RP#QdXnydCu7Fq5m{p(;Lk0T&=9`#~7=pqwa
zte}vKkU%?!wJQ~=siMgygMIz2VW__S{6{kG!hJeZ{6phKx<tF2z-4KVnKO(A1Ev?X
zWn3lOT8o6;<PKP`-o<7{l0$UY0tJ<!%ZHbhW%^U)Xf!&Jt4HTYJl5zZjRV24vb^^q
zkm=URbp(&7*@-jfNVv*I2<f+`dt$k?*CMyJkPw#=$sS9>K-xe0)r)uHsieGAc+18=
z)z28h{{X=M0LH0Oa$<5xYIgdzo2TjeskDM*A+X|0U$_|ak&jN|v6obPmvJH@7~2G@
z;0zuJJ#uRj*HyW_52xhYc}tuUeqen)O<H^VyCwTx*xbh+7AXK5k8j4QQ?}yfx-K=A
znR9Bz?gO!6Qr%86bL&;F^qY%hHrjE40UM<byOGz>k<znc)vs=E<Iy9I3v0GO!E>J|
zALi9$ODqG*GKi5$^Y;v~KToY!ERb_1T({Swo!-eTBL`p!EMNwd_ZjR5>T8nmFN?1y
zf=xbqX^LDDkeFMQKEIV|Yg$I9eUk#oZlyqwfs6t=jCb~`P-(&&<&NzVIHEvqWh;~A
zALC!ft_dwn<mIr<4lBvzg4XpM#c({bhm|~WxS!U#EjPlmTV44DHWHyyKo8ygeLZUS
zm8Q!Tv6o7ME30&iCRq<Ir?<b>qS5a);du5>6D+%bb|+8aKf--D?^sl><n%R#G`BQ0
zKMvb?QD%oyiaBPHKXWWY_j9kmxAmwrxO5#~z{zPgiS}(`8>ty?N{pCE;2d?w=nt^O
z(CN4Lu{pT9jZwL4S;-~9>$ltKR&DI%uxoJ}mW|sECFvStJo=6+4`}VVx3kpgJ{sx2
z4`=Z0-k0JnO7_!GNyPTIF{WajIu!NmkMo>T)vWAvonbWlCRsemH=V1=Ty;N6W|wno
zYOj5FbX-aDg;mDf9tarkSH`cWXu5^IrK?39>>#P~)qZkwoHwBUb;T*wb8Q_FjAD$t
zn|s|&CGrGvLjsnG$iepw{VO6Uqk`-0kwq+l$U>~yRP{dJTJ%qgelPe_;&-0+z`9(z
zWyRbv8N9N5xg01Af7$8Kbv)OX++IeXy54Z-YM4(!>TA0XDwB)3jZRc)%cubxM{Mk3
z2vjS+;2YR>HA_#`^p6c$m~LZpaMvI4@Lvs%y*tzktXW*#?6{p`R8SRSI3)Br_wQWw
z<j<*DNpS?mD3MuW7YB1Y1C9-L!k;v(&Uw}4S4UCe9~vauUCqXwdkFHtV&sxfw;g@!
zgS^#S#4}57vrf$y?-8RrKx4t%@9j>}q<cF6){bN)h$`bO8$958QrNtDP2`sga}C5G
zi5*jqES|Y0y$Up=O&pafIkK?R9vdr&TJ@S!7!e)kaLLXOy=EP9%Sd^y^*Ice5vJRC
z`YXS<^r`$!;x*MS1Qrn@%F0^SNM*)k>9w)dYPxtgTh=4{1@u75(C(1{0F~e~4D|!s
zn%~{FrYlpa@Yjy@7@<RWsPV{|@>)D89-Q{AoiD?>?~fpecy~{EFP?JEXBzMj9)u3Z
zucc)8H%Gik{JR!O_hAQ~fQ5{3ai08FqI^ArSI{*@@vnn5Szy$3=`rSrgF-p`uB<V)
zjz3ISn_a;-$aPYS>SgNQ4!rQblP%`4rM0Y^irsmU{m?&$9dlXo!E2{Vf*Z)Dw^asN
zl;mwAKQ4L^UAK$ADBbwI9_LxnBe<R2jpgedt2^{1RCFGd!RXTq_#I<~RTbHmM~@qU
zJr#S`B9znjjoej`(*jMlNbOjnzd~_={p!1G3f)}@-sNFv_L${i#(E5TnzB;n?N&>)
zJEKfQg*LN}m^kby2Aa1FtG~}!Uw@LI?m_9E^`|w)qh@umcq7Exj4yP)8-oY~87(6U
zB|d}>nf3fDE-U!->$gZF@}Y@|o+(GpPexyEdQ&_*;tvpLa={&q#lg32!I(>s0sjCB
zXNomBwFnwZXgsvDjJ*C}8}2=ELe#t1n^M$mq()0<-bQHi3oyu5{_obXHEWGV+5vSf
zp4nBlJ1FH_)7uoyH(S-OZOoRo?Gq|_kw(f3N;_cHo9`+Mf3@96q1jF&k@17wzO|x<
zyhNvTQ#Y@0;cV^^SR9#lZdlGa<JbDu(`kMmZwlJpj}b=&?Zx3mvXOIz<L3vqefn|u
zak1(amNx?GJAok%NXuae_aEaz-_3DjCaZX2g_w}jGw=?00CpJk_pSY#XELgjvA3=G
zveQWy8hKA9FaoTSeBsIJW9|?6`a(4`GBnL{>jY8f$Z^a5J@P9W8(9AUwAN|WXK9!!
z%fBfQ$1U`&87<{SWs*=N37aWfK2^i_g|YW?2My34tzWZ@Q6AD#WxYCk?G@tI?X?F(
zf+G@2#p6@l9>bhsu3l;yRppElSsRDBD#qZV{{X8V{{UX1vaeXi+u^d2BtIp^w2ldn
zBdHzgfYmK*F8;#TLdrd%qmaJjk&j+~r8P^KT=v}Bxsipt%DQ-s)D?#<kQjF-)}o0-
z_NM4h2GDlw-GW=c&{WguvRp(M#?UK20$*;uI@D>W*;?GplPGDTh)ThE0W<fpUumU}
z&NUef21!!s0VwITv3^jmQIAi4l(WGq1%Z^W8C5-(`@`4kOSM`k<dxD-G26_?0H<I+
zw8?@+5?sq0w$&jvwpl{-2ileOD64;SC<WEyO#G~8Kvjk?2tBJl`YDPhmafi^l6r0!
z?dU6B=GE<ykljGZa|T3?n}lTb82<HBYe}bULn_SVU`VTgSJIW!1)<DqkbSO3mIo0Q
z7?jK31Md3@<u9!b+<Wchkjm)GZzA;Ls6O3my47uB1=>i122&cY>}2<@UtO|*DUNk=
zsxa{bfzz+G5?Y-!XKfB5{v;O$;yZa;C>7&(`G(&0g?5HGyoTN;d0a&iKQTU;uD@T=
zbqFKGwr(;3iseRlJpuK_b8}fs6D@$aF7VIhF(BaQ)3~EUzA{Y9mM27(IN77}S9g}<
zC7Ak}jwvp#B{N(kNg-XT(Jugdk6O8OqDZE<kBHq)<x|Uh=lWGu7Ix93s{a7H95b&u
z`cg?2X~T6KXd{|vOqt1Hz$58f8g<mGbS+WUqE-!XP<+Qd06nm40v3t}7i`HKsq;jV
z4cmvO9ctB+eT)ePr3+5;W?k#R9fmz=Nh=d2bF$Ml8&`HQ$a5QmCiWXovHt)H*@jYM
zf##Ah^GsP-9tiEzwQ}|vlDceHhZ)L3P<-CMg=%Sc_Lor`m6vLVAch=+(~nBUHgn1;
zGgi)ajzEoi@fR)TqXIUsY-7DWFE&NxS-SbDo&I3mwR;2ZYd&Q%&axxB1RuVJM#)s?
z<^)xn*&(qo>9+R-`Kl#|b=(N&p7hDsuw_~06Gd|igBT6h4m~L%M`&7E?OrL9BH2mn
z&NG49tFds)9l3@$-;yLBc=`{=(wlJ<FidW@I*`A-CR2}oy#)vY;#+X$Sf6A_yJXHj
zRvl>{WU<P!xnk?L1EKm;t<rg5j@rr;*zDPPFh@VHG_y%?%CYStGWf>a9-VX8aZcf3
z#U%|Kra^@RXy<oMl}=wOMf)D%Bbo3c1MZSNdsL3_vPt$?cNoUxnNEC`>67p6M6*jI
zurl692IKP)9u`K&-UGEX^cf8IR^Yt$l7%rLSGke0qaAqdk6NcPiIgRzEYe87!O^~+
z-RkVNx_+x1kX|v4-GCP?u2c{YAY-0=JJm+}aywk!%Wo7YN7&I6?jxoN9XO=fq-;ba
zYg7?D#y^~>fr;D+{yp8kl*^kld1DZGW=|=ZZY~6*JjyzL0;P`DYiR&mc5x>=8|KJ8
zv;Iv)#S_bo#>p^#&a(6*bsT>>LrUd&cS)36fTwO7dgYmE8X}A?E}(YYn^_R;;B;U+
zQqHS0ExOyt<owPZ`E~Rd>55oYVVx}HSCO-mIc$Yf*ypcGS1e@l-A8K`!rHQnpvi8M
z954fd$J@8QD!kHIy^6ZX@s-Zjjn3%+;F0ZC76%VB(L_A`zcG=w4ZX4HP&|@G7Fn7!
zfr;~*W*vT?;YTp+CEU@x&uJyn$UK!W@wX)P1a~5vJTGr4N$q7)V;KjlXVcJAzR!DZ
zKG!vl_&^3ZkZ_~ip7k36GsyDZyty4f+Ede-mdZn-WEUP(6Ni&v5kL>jr`3t3D2c7w
zTV=%H5qAkVECKE9?fBD#0$taWA@fo%-MnXNf;%7Y8eoq5>~T*lK)Z%g>No>GsiZOS
ztSHZXAoHO`3x#w0&r$Ui4b(E&+e<pz`Qjj1q3^Wz_r_{Nh~zM>q=^hMZ!s&6l}}gq
zIifJIO3EiL6sxEMB2_%~?e0CPfJcUp&b2Kdi4>~=_W|sFoj(d~wAT?{OqNps3j!x)
z7$egiu}wDUR!f+z?wrVeMn}RoIoiYg^rqv@Lbnhz2H}`63-qP~;09^Lj}uB}2XM{<
zCp~}9Y9o+{<8ktaa*pzj8yy$gph(>iyGYH3<~BVCV5XkY0%f{ob88q^xI%KOdJ?C$
zdx~khfgae^0)Q2K#&4M99QL9xEu)Til?g7#U|v)X{{XEL`D-HEN(^prVrG5_JqNu*
z4g5=YaxQG-ERg^TU?hj}>5jZpKohZ4^2eCZlk=(L2h>u>GCkTim@uu9z;FgVDIOd4
zK12|+ua+Nv-c%m`;++Cqyo)8rm$U$~GDoxkdzz#)$b_;q4H3JFCSt+Fk>t3~1CGL_
zYrC&LD|>r^Bd07va96PR`qRV_TO(V>8w|v~#D^u0dM}_9+1hU>%1D+Iu!fYVCY_jF
zjPn%lc-JFw-xHkY)Nw?tu}}7B?_-sK46vcklabK-(9($z%e@x}0uGzcOjJb@26plm
zJORCw^Z5FjdWG2acwrd8L<^GTv&lcsq=4T+GER^Wm9Ye_gRgx50F6Zqu)}2L;xTbN
zjzHSKA}_c-&*@6CBdl*0_63gr0GomIpgD&%w($+CI)NmlJgiEBJt{bw(Ik#Z9iT;G
zs)Uv+k6MXiw`oIMN?Ai?fj9~|r5j>Mmg-R%cQ`rW$7UYfbf<PZ>Pz;^G>Po4L5<rk
zjvKB|1K47j8{0_nG0UpW^F}1V&%d=+mh9e4(xFy;fisQ(9AoKGBFAhbx`zfwJ3_Zb
zVadp*n*@_ICw7t<C-cDw#E=)SZU<@=r5KF@u10hBuquRe&4o!pak!Sp7#_5-p%G$T
z%96PSRgOpFRJ9eXU7jB{X%ldaqK3qbdG*KmRW+C$%9sOp-8|zRPvcU^&cON1s<99w
zQr_K3sM}1DW@%@(U=ag(yMR(nFtZGuvjD^}P*AY>Sf5WpO2kIryCiTok<&ijoYU^D
zks-rPk+&?U*l(}WqPI_xof*oi<qIx+)88I|RotYkI^NYDRY(pCzsy*Yp!@n%o<n(W
zXLR9Zc08{Q$3iMtE$ra8n&Bgmd5N*1cjS7p_NV=wCL+=~5=ogyl_}0Kjw!2^$}GY)
zoo-_<5~OOZvNsKZOu3TQJB7HCQtSfm5tD~F<NTVjJ)*?rrb5^PHpHA{cdFkbD_My{
zp~%c*1#|9xl~;Ewl#!C|T}a+}aqNyI{n=a)z*O<V$d1aYL#W@ma!1ms+fQwX<yj8(
zeT*bxM$!DuNwFllEG1-=C~qkV`Ny#7_*JK1vPGz)wvdAv^A&&(5)uje`&F|$GkG%K
z6=nw`8D(5{sy6o<Pn#xH<r_j{ZboW!l5a1BEh2-C23ynctyN7lHChWWSqu3JVsR4r
zakFmNf4qH3rrV^667QSM22<wDiH(QQ`cvjIK+*Y`GL{>WPbtQ7Y7$HmOB6Q%i-Wr1
zM*)voOLB$t+28C>7*!9w3h|NeQyG|m<xkFbl7p4ULTU+0i)0DHOCeaK2ZH$Np0%NI
zrb?FT6_lgLjHt#Bekzk_YRs<l#rvl$SNEF(s~j=+6v%*kR<^gC2zN0Izr^|Mds6K-
z;bDY4Zin}5+~nhsMLuaRB!Jnj-z|pZi6iBk9G~k}q}$YY7$7i__JGkl3@+ospL%SP
zt^;i`u>>Q^e(@fHq5ECjV`aG;<QsMs2Y2VztGcw4gqnP?88MN94}5x6skAGX66OH`
zTbzTE%ObV__BAEd=<*H9+bCp@vwiP+rm>Q%8MkJVP9u!J4^BJbR~E_^HH-pe0kD0&
z1!$_iqrJySj%SWnh;AT!h}qh4>qe7h4XQj&(gl>2mC?8v_M%Np!iMFQR2KVz0Nsz|
zDbZad)0T`X#_9&%;k*3>Txui<>S!CAyg!{LS~#|ZBkvBvq5DPfSkxd=Tlby9E-ESH
z*#KyW4kRFg-raLiTs*Pe#<sSriFj!XWHWpE3f0x@S1|jlyLj#P+ReIFByRM_Vh?Jj
z_a17=aIh4VN3<&NHxF8h<4&3(D$6IDM<z(Y1bYEaUzUBu1`L4Yo)p$z(YL7sr5b#;
z<`=WXzw_6B%0CZUNuE*yI^!QQ1sKO3)eF4dNi7!VDqCjEWKk!S$R>hv#nTMLaD-9q
zEEgXZr+EOC(VRDz`?n_qHfldU?)q@=ZqhLzJ7@0y0QKo^QrT^chT|`@ET9pOaZq{0
zAYnEM96l*Jl6^tgRaGe11qmbo$DGsIqm>fg8$YwTTr&p9C)D~=0h)9Y+kC-Wfw%Ri
zGG$KK*aODn-lv(dT!KM38(meg_eZS=&d!pwxs87OU}F@QQ@NNth{T*Oamc2VZRayW
zKm-Ng_wP~8t`|kfSr^P{U~Q5o?y`6XJ^ug-SXM`y%@JXUD6$dIQ!OXBz6oIrh~aWJ
z;AiQYPqj0nOuM%z##@YI*0)kgTz5r=iZ)>GOB`c^&<c&9xGd8(s{%ngvBLpSCbafZ
zyq2UA<7prQJ@_?h=Tw5~!Z}3QaHSeBakTp4wDz!TaXCba;Zh>5SZ#g*2cgGGWKqiz
z+YCf=fCnVi5p{Pq$!9=UamL;U{{URnqGeop#fIKSI)hopv|A^cHcs<19i>TRB!wrH
zG<~DYJeJwF<{)Efs`77U1h6Nw4gk+$eQG5LN0uaDyzUI$z3Iyk(-UsyfQHdxj^+v5
zX~>d3!1~i8j_D?jQ5Tqw#1-k&*V>}8U$c?rtGsHU<Q}KmtivwAS~)~+Pe<gDTGN*}
z`VL?8&-Kg|G0}J*UMb}f{IM|`5b@XnQbh~2tg<Lgs-{d1p!CK+m05z>k|tt^?4gUF
zL7oS-b}1s#Y^fEvEX?qbcKnT;in$n&qDHQY`6WxPaDA!q+Z24nyF`Eo$<N_a2)u~Q
z=*#7(!5v5<v{Fc=5<ei!!YD}%DBI=^h~4r#RLB-23J72uVQ@O1Q|U`&re;Pe<ZdTw
za8IeH&3i4CiH#Lcn;}<UEE1#C`U)Lau+p&$q(>kWWzQgbRDWeyQJEuR2+IX0k7{+y
z*HW;JBI9o|6$1klhSiegU9OtlT|p(eQaj?DWULK#8p0_e8#e|A2M6x`Xg4ui9r9be
zilc;6$*EsTKuTQBL3Q~;5;u=(vu&coa01vy?2LfOq@1Z05}a1!NtyO$>RjB(X2LXF
zIdhyI)QP73pe?CmEUe_J?(gV*1!*(}Xqq_7xd(HE8ByD(b5EYov`=sycJw4J57bt2
zsJa%Q%s8!KS9qa-2Z46Gb~*H`mPryv_7e$E7l&K|D@NMV+6y;ZNWO4BP3I+>y+rWr
zKy4FqbG^VHDIG;-tjbWaEOJF1q4Hs8E6xGu-m6{6(*^mNgGqu&<waW4(1uH+6oN%>
zn=SW&^s6_z9>p?gu2wdDJI%=lxW#8D%OcXcGVP+0NF;~M8|3+Oj>EY1tr)FjQJFU6
z4qUHKdT0`9*0GqZmR1sygz?v@`cmBL_S%V)Hc~&5piCn;U!`cLpsk^JTH8Siyr4fD
zx1q}89YsAg3lLU0;xj&S6gJ<N99A1$T^JbIT@{IB*z31DbJSJM8qZ9%nirbz%p@nw
z+<ss^sEt^*tUH>QH?hdlG;r>W#1&%$C4FkNQEXDi8AeI_$2)$tHS8=x!31j@aG#O;
zzG;avpk<O!2wb=)?*ZvYGi2W5Tu9FumQV`k2!D#CjKEYNTsD4ew^Qj)7Re|i0CEP<
zPfx8!G-4QAF_(>;ZIOB*rmj|nu+m&W{!C;@pK>C8XUFmtSYEhCM^df_1RM%tM{_*>
zTvFkRU^;!|9=!F(r7iBCKb0S!a5odnpu&(TN^BFkR$Hlz!bC+Z7a#@iP>AD<q>83B
zWBcJD>S}o6^NA5M##`kK=eBzNDTB#uK<<((hhS#xJ%38Uy-8qgiisb~^6~&?cg|Lq
z?EXmsrHzpf%<+;#XQnFjcXqb%8+)5z<rr-vy4Gy6MLhCFW&#7sv$p^qxb-!Yn2R>{
z%)mhC1e@}qj|V*}W{$)kvx%`HzFZdjzQ(aGlJ3qTvBflvpOH!GJL0BE7{8KE*93WL
zbC%<wsrHrv<jn|<PcjnO<p@7}(xQ^(?bmzZOSUjiImI$Evf@}2h5M};Y~rFe)3j$0
z5Y3Uf$K4t14NIG1xh=)(Dz^1tQ>Y7%#;Qkj_XEt>(jYlcEwPi_8gN+_SnVa3WA%;X
zUI_lRN@*|Jadq}}UU1!%s6TiQdcsq20{UFCgm4K0PE}5Pzp1HYz4F+*OY$6GW1RX_
zHVAJlUh*iyCzwOWj{f4EW&NW%i7ug!=3+95jt5G7*Fk%hp^izJRz_snGR#{51M7-s
z+r0k(FxpH@5wx;>)&sY=p{+A86Bb|Z#2dHLoo8Vzj&2^>XxTUk&;i)v-jkBujEZYX
zBy_v6k<hB;l#%mM9mTce?FHqdt3;uqc-sMq^{q68m6dI6MC?9c$RnPldJ2|XRfN0B
z%AlwsFql7uN41GcEs)1+a;7(Hu)`ldM+!0g>cpRCn&0fU^A(UW4$aBurYbATh!G-3
zoaSfSB9_B#$5BnY*7V74Q|uP=aCRmf9i(?B6)tjUt0ZWmE6gI^vF#i_JLA8lS8IuM
z^CHH8sb7#0mdX0mP+Z@sXzpT2pimCu$tJADp-C_LY^1uC;CY=ZCeq!HeToz7mZ=~t
z!Gow-IL0&B_N4oL)x1w;wj?sP_@wtejY`^7@R^cLKhBNU=8pjGU&gNK`fPB{vf1BB
zDl}-pC65geBPClsaqC&Si48_fp>GpGc9(Z^mLmo|+yf_GJ%vMcpu*P+CA@Kncb1kk
zU7!=m#y!n-4W^)pH9W;DE9c6`+&wv{n!$j3Yq-NO1h&DBz5f6T%2m@eR7qgaG&Q!4
z>n0$P;gMv{c=W0_S2j92d4lKd3||s%YyiD-D)ib`nR9L+iuq#9TS^jsV0-3>v@o!>
zy{)pylKiuRGoR1tSUIce&3&D=MFw~^Gq&GNL|F#uCTVawdUmR3!`C<Wiz7bhNehJN
zPxP&%)9h`eEFv;5m$f8~uo!w{zA3jxduZe~&=}C;F|h0Y6_cvg!}fi`9WU%QFCl{j
zf}2%F0QIVJ+Cv(fhsa*#PaykMn6-_HE$(g?G9LVA*isSXF;tBkEt7-7{cApXmCF&f
zh1%gDi4@8F2+PP7BVNI$ub(t&8ArsgoZ$LmnXq0v7(+DA!ai}d_RqBo6mVS$q>s#a
zkIgUevGl>Hy~6e{{{U)U`LA(fA(q<;t|CkY?oMe9{IO3g@yZ$;4bD@5f2CArkVXvm
z$L5nPktP5h{<OYINn+PyQBs0Z9u*zEaY?d^@lKbUmP}-)-XG4X%o!tH{{XyIC*_Zf
z4(6g)^Ha=>l33so+MLr(E3{EZwNU|-0m1(O0Z9qF4_WP(e1=tYR2T>NPx#S!a|AX`
zJ)N_=h07#ul0ETLL3gHaTZ>qvk{J*wPyxetBD1Eq)U>PS)NLdRvL7wWFICS>QtBNH
ztB(`w7qhHZRwHqc2>jLIkMySLkZL#6%(s_5Q<f#;+(=SAJu1egkUONdk^w5YEJsXZ
zrAH;vi6cadYy;($*Q*~)(RPfU<*Uhc0v12)@Uo!Vv7x|!b6Izq9=)tbHTIixDoJj*
znG}#g9^Hjq)30Q^w*J%Am5N0tmZ*mXPi1eY=l=lJPqewXu$iS+5&4hAZ^>crMfwJe
ztE0oH#GYl`p{I#?Z|+pLrUY@eCzIs)LUKcQCam1*gfy|jQa6zRky$~(^s0AJ%^Z77
zQXno1NQ3W_{VCiuv1Zb5KVn?md2k^4hR?n2n%cSWu9v9WDYRkpt|J-heGPLaE30V(
z#N`=>D<IBS`@kA}UNW*kQc2kHfh1>x>T&o~S&dF9YFoR}?z}pnNii!bkYV4-dm7J|
zRfHJqpt)FGr1{yGcgtCN=ZmJAX$&gZ#sNI>+v`x@TwH3fBU;%!D}W1u(XrH3a<e&B
ziqRW7l(t%Br=2~@OA&lA&N=I!rDxk~wry}`is5<20=Ium)>-iOp{iX(jUyd{nCI%<
zj~<@&G*@=|ZcHL35%3k1VEWO^V?S!!H6v@8CkA^JWp^LGRUGlqkLy?5kq6kNc*`>q
zxZo-Gu5R00fZH|EhE=#mI3)F4@IC2Ht$D1YD!>&)n2<<7A^kDhp~bS))r}Xq@?}Pm
z*eR3dW5_H0X_D#|*LNo3F}wkY*y9V^IIMZ%)V|(hoHC?Ixa9D}*6QeRt)w?lPGp$M
z2b6~ac<OyBT1X<?i<Y<MJ9TIyX5I41wCAUAD$Rmj3CTAM(gpJ)T;LH^ZLAs#pkht2
zb{Wafx3y?4nJZ#TRtqAZ-U$K!03cLzBSe_UE+V*<EhV>o_$?t*wNE`hwH>UX=2;+F
z9}*qWFy#Qx41FpqYdQ4sFWcs6Su*h=o<Kj&u1MC`R=fVzyNZ13hX?3r<^(!RJE>Fc
zQqIr<+oM$CPMqM5*fm;AY1U+0xDJW}A!CvUPEBWDc%~?ThxdizY;P_1c<5@R$6eH<
zHxWXs8;z}Tw}I`76fQ)k*nfyGtS&AQrEEUYmCpp@oK|XFTxtMW>GsSHa?&#MAGf_<
zwD@m#s9hkrGM85QAm7W6T-L&AqfB=}Y_13hyHo}T-mT6tRx?!REl6~|72usO(%r@!
zG?GIm&^YOj>0M2xqAo~yvR8ruJgFYFlMS+@szAhm@Hb#*y-g9nGLak`f}TRJZ(8M?
zoSD^59EjB{E*Ov%OotdFfZnvBoJQGVZZJS?*dLWvX(WKGjLLu?l(O{qr4nV96iva0
z-W|Q_F3l`Y2Zj7asi1px0zIe9eW&y_PHhVQ(sK=>W<37@q%^CNeZ7WjO3TK2<%OEq
zr_B!hd2QT!gHYaU?|P3UY6ClBQbu!%)_%!FI7;uSHoMgrz9G`D@3i)g-Eka4=5<b2
z>FP~W(0m;&tbpHnq~|O1;H_>!s3cRx6tXjHZO*+gdm41wj56OeCfSI%P^%~)C}H}F
zj&_xW$s3e43uU?9W<W5wQ=Uym)^e;V3`w>qhUo&fOJ}})s@=uBkV?qu(K$xsk9w(e
z#SqREhbi)?J%@Tpjo5)?WZX8EQrk>rvPt}UR5IFF<pqm*Qf@o8bzf0Yi_vzd@WkkM
z9G2sEu0E8>X2LQR0F#m5BiHF#YGmX~ajDu{Zk^z1S8vSyM$y`!eO@MueZHMB66a%w
z9X_3fRg(Tgc&h^d;c*~92q5RRA-fG3RfH=d;Wu<7^{cU$J<T{?TV-2ijSOw`n8@|(
z_||Rz0NKL4@vCDeYJ>A0YCS?(nl+8@RE+InszE`Hxu`F!=7<j_;hr`FWBohOlDRUK
z(N0N6+9Zxp6wCgswlKKoA5&3k@yiXoap|y!R{_kbGB<iuvP6-iB;XUc7XI=u=xW#7
zQbbEtnm0ncC|qnk@;z%up^DU_Wp%5ho33p)N4FdIXPkOfsIBAklHgj2q6@m=iNImm
zaoVlh7~u~A0Eb+SzMi70$EVy}+Y4BrkS^nx*Rb`exk@DKW9FvoBaP&fgUn<5wKc8P
z)r|2;1Vl2D%EdwRIPIR4^|QBxU@IxuJhERIJ;AGXns%KF6LWhcis~4n9C>a2&m4MG
zwpxfI&2xCSGv0$Npepa=0qA>Xs%v^yp(N($l-+=>l){X6_Nk+vNVLCS-!YO|1|ny`
z1Kz3YJ}cC&ZQkBnB@ryeLv8t6rv(21T9lp2ZCKp7x6*X&EMA9+*gz9%;N#yuwaedl
zx=1|8t(8Pkt|yc(ay`4|o%VU|ECdp(!grR2Hf-jZABIT3OKI$6mPrsdl@s;#1b!WA
zqM*JaB;@upF15W*`sEoSVyzw^mmH|ae|nPJ!t?4e3GHv0wh}HEr#_;$^z8y0=w2w|
zG6qt}@$k`*a6t9NXU}sbmOQ+eWS7fH&mbQ8$4Y$t5gyI;D=&tl(~)JG9JwV*f_EtO
z#dMb1C6$hwzhIj!`^E$2hz^)O^^kPC%{us7zNjT|fbY(72<_`u?k&xgpuTy}mg|kA
zlk;(qeJUj7E~Q0AJqO+1X|{Idp3!{ql7PvA)sOw9VW~wVH#dG!bMmm`Y4-Q2ZqY7Z
zFe#ac!#f|iJ*XDCev}sC^3TlK^E^ayN3Bvx6DHd%Somr0=0giJh?jQtV}>4w)~>^(
zt&PNYmhvQQgbX)UKBLmA+jzP=eB5cVM*e5~vkicvvhOtu{abTGFdISMM_>N6H5om`
z<rT5j-gtvfjivt6nL~x;BVWCN(>}G%YaTb6>LCuDq<Lt(7c2<}*w%YRZxkMN*!e=7
zv16A10A$n_7g}@v@<{Lkl4B3k-`<>Qq{x*?HDS_!Z{1;S=K>PhP@Q)X&V4Go=vs_-
z49{}p^=2o4aoVq2-nq%Nj4sv7vJ9!uN@v)vFCZc-z4LjWDg~>(h;g|NmfC%UzI?W2
z*LNzX8;^2*DqUY$OM&FuLA_V9^j}^*Y0Kg1?n}wN$qRspzbQHXbz;{<`x+UhWeS94
z$nR6l0jN}J)-k5IzFTHkBM-mj4UR|G(xSDr)k~PpSg8$_Z0)YX+e=tU^WamFk&rni
ziTpV6$ratIq)RCM_>^)n>FrYLqQ0*#=0qBFuBv8*71WVF?&BO0{uO>L8qRw;E*gET
ztMe7^I|{vV{f!K5{h+L%pxDg#Ao}}?&(w9bwS>v1h?5`y#OHCW`KK+7Ibj4${uQ2B
z{?%=_Vhz&cpHIrHS@?g$_VYz1ue>W0zC}AnP6c45p{rh`j<86P5&QO!xzE>%cb(>l
z*7?h#bp^T}$LmF=_hROPcS!A@#ySp_ri+~_5L527aiHDloSK72@v7fW(MzQ+S-;lc
z5g5<tO>>$(y|vxW+o|xQ?*$kQ?^d49^Gdm0O4iN%qmjtrfc5pP++vMX<kiiK=;CiU
zK%QDUoI3&6)KzPE%6Sgg1c;R6V*sC8qc4oCqfa2h!^|5uG6Hem6=zP?{P`SP+e)HX
z`I1D)+x_2aEbKmLwrp7~q(~;zB`g%~Ra1=9po>I;@aiVz7~|)Qu=XR~v0K90$O1U+
zuI|=CObCbO1E~b}t9H61s#L`l!UP{Y4l>6bL9E)3b5DD*t*ZEj3pf@#Jvv7cl2Txx
z`B)t1-`=@9>#b{2y!$nTO1a6G<oSoV^cA@hYC0oJ3we?wFPP33sVDB>^a7ISQW9Q$
zy461Vsw$Kj01u}FIif8`VM#e|Q?>BT&4(A7YcP;v=10a*bswE<X*T*KK_i;kS~oit
zzla}DYP44q%`?bVw<_avwn68xsqEvD67L+UcQ)hl@t*kfr7217G?F0Ht?Ui<%TL{f
za;yOAG55Z{)S@UZW%EP%Y=>&bIM4gT)4poXsjOJQi)DElt2+Xxjo(Uia;~BbO>6TN
z!t59!eF^XVDtZj3cG{nq8r2_gVIEv%PamZs_-|F7c{NAes7ICn<yD7M?OO5a(uq+v
zuyFqXaIfC>sV7UjXm+);#6x}8Jwf#pb9Ne!b242oQMRxieWNsPHsr2%{{V$wvVzCV
zSF(ac3xt!*8Rs15(0WuC8npY2c9Ti-WlVU;KDZTH4NhX_2__IA8FL`O$DzkLqS9iz
zOwrV}SnZ*Z+FO|<*g_oSoOb^J3ZrSSYKc0?mre{w3PgVI&D0UoKJ`~sws_qxH2crr
z?*9N%A0X$a(wk{%J=D7<)MN8@{`HVxFSaSDB!uSfO{#fUO)G*}?fD!z3lZ<fb5!N=
zWu&Cq$pJ@+0`dlZDAg__j@jWee7gvDEzi_?n#I1eirM3qNQ?Q{P*w0i#&gYFV;-h*
zleoI2<)hEHXk{mr-Hg;$+V#3QXzitppyPQ4n*JM_?hA=@)RJ#376bU00g^zgFzGQz
zrKRo5WnZiW;g=r2TG8^EtK6|?s=eLH#L<YA$lCY-1K)~e&Ci!KkcrjYa$Yv!MPAc<
zEuhZ}U*B99$xoFQVh(7BNc&TLngm2FcB?YvH>crQ-YJ?S*_~nlx@Me{4+JJ~a1T8D
z)S8XUO?YOCMUXZ&5V%k=&<}4~=tqaGV`Po4qgmhNQrs%A{z9^Jt6M1s!(?sbd0Cz(
zlW_;3V0#0Kl~FPBv{Z(|R93%<Q*37+Fa+kFlC6-9FJqCXL-Q(+m5}rY*0&Qu)1`J@
zISiYW7E>WRJ<qmjwsUDZF0z)-2%I!z%W%z<SM&hVbuY0>42MYY=Ap0NM?79tylID4
zJ$4V_AXeqyhGe$2bUsVP_qKzHN%Y-MpT+j+1Z$;O1VE<}Mg|G*Sz3pQ-gYp>6XAwk
zjw_l{oSCvvNYb~qu!Q60D#KxpTxET$e@^i&$A>41AG1cWMT5E2Z3i7bwZ=z1)}c7J
zfHO$Q56jdq^)+Z4%bQKNR?<c~EHfTk9ZqW*Q&M`D86=H=6YEQ>PctRC2yuv5bZ`E>
zax%-Q$*3*8#nFlvo8{a&2hi2YZyMkUV7h3eNj8Zcat1iT^`>0QExVRT7Jrx=oPLD#
ztzi`y*%2pw#>mnt%9heH91t2s-HM*qPrKA0NMFl%(C0DmIpYW4-l)j_Rno_wHTMQY
zCzI=+YO@2hqDP5BkTAQtob?#1B)uk`9f~jqXo+`uZb>Wcp5~xBk^!-!bBt$b=bC|%
z^6up%lH|>~mL!58K#v_W>QArIty$_0*AHPmppIdf^Rym4XwWZWShZW(G~r<YF+$R|
z=8<ySjb`d{7+^RA$rf^moRVtBsin<f=3T;Nd5Q&CLF2FAHO^`tDb$@F$l^3rD$BFx
z2iHBbTGNf*hEtl1M<ulPTiRG~k}d->{n733R`$yct+Y)W9gaa=`C>8DliIoaPZVCI
zx*@t!#!{tr@weC9(p~EF+&9^l;O;z@=t%zn3hMT4vkz?(X}nnlfRZaz4kS2`I)jw&
zip11)qkTI%#)Y~<iPR|drX_{kw&5fuGS7vSj(O*gT9jy)b}i-HBmAqpKFl(y?}}<M
ziIk@~6r{QPCLu-+gl@v}a(N({h~2-N<i#6gs312u9<;Y6SnfZ65XLgHsK9DNW{V=+
z2{6oXdHdtg4%MQumZZpT4j0WQcM70%G|QNpbySvc7#tug!y3I~YZdJ3sFETg0@AR^
z1oro$O9|16Jjov5cJ3c|e@cZVdlky;Lt)`rTIUJoMY9>f&U4!pa$8%A8-W$|ldPX~
zLP%C$My%_JZG=Id?c-D!4zdu%sV_A>PC^<;nt4?KMq|&g%^I=jjmu3I!r??W_i1e9
z{!=jf#GZf(ZO)qxnjPi7g;p7GACf?<jV>K-^}|N2t>)~SS$Xo#Jw1IZN?(WC)WKwe
z?pe&LNl?9yu4)@e*~rmdtE5MCY@RZ<vx#9JJaZ=ipYfsRxRP%s**DKJjH@1SKb1?T
zX!=f<D74g!=gME*!n_7=_PwaM)bvdyqdI--hhe$A!@1GBk6}r)_6>TP)*cJhVYf@o
zPA!|8D0gfOJq<kG>3V;dWVwy}r7Xz97#+?#)(zi?_5F5bg4jIn%eP@T82*(p@J6>5
zoNjd^D~SipfPBz*$*kN`e)~33{#0I@#wlwNv$nN%iJ}b~L*JfNhvih{@f^B^+Di-t
zUvJ*P0e!LSSFCN!c1dS+fz*%PZ2%M==czR;mS$-)FpNjQ+=>)0AI_rm;#H?ErF}MA
z$?hW4ZkAx;e3ByrAodldCFY@PaXQ$AW{s4fD}{Xj0C;{C92Nm?Rt389iBM8W4p<Lk
z>sRe`PM2hfLJUMpa;!S%)SAXs70n?QXWy>9Bx2_3BcC@e@U8*&tUK)oP}C=Us7T~r
znZtJ#+<8x@+NHx<Nb4(=U>FcT+N#$UFkQ&sXN-wd0L4cGJ@M;TPY~j?LY*#dr!S^>
zVhaeB<QaB+DODSf;ChPa645S-#i?0a%II*8BONio$E|8vPo+f~++5m?@wPXh=m5t`
z&(yE9+c<z(nn%fDjtK<tew8w-I)jZkK-GofxwT}T-Zf<VfT#_$bm`R9d&{d>V;48U
z(Zhiff_EYH$9kirU&DAztmV=Xxpo{7-kI-K3A)rR-fP=jHc5o!WcnYaV&iA2chf=U
zdux~_Ysnid2uOz;o8GzoL&A%FdXhsJ!lvm+VkAs-VUD9UuCrfU2=2bdFl5Eh0AX>*
zO4ieKhPqi+#_=O8yQH~z_Z5%0Mech5cpYm<)Ri}MLxP&KI4j=@+6Y$RwDKg7l-j%(
z9;f_GUDEtFb)wvf8rYO|{r>=(GB)FYJq>i)y~0MR5Vk&CdBg+*E<H)_^sJpq;jKKo
z>E|0+uoMoQb*-abtmA8$x=@R~i-%9$Zw=gbA7)+Oy4*qc&P7p&Q`BQ3z{lmOotY(0
z$KUzUYp-53J5a{nWBie#@E6qo0QIPzTe%`jl#NRVVueS`Am~OaRr-~F#8T>Sbgy$F
zDKNhbox5)Ktxpa3FZ)AFxQQ-8PxDC}lF9P1>OidZTPqmC-8%iIM?0ej8wXG^-lD#^
zmipMqD;VI1?y9!kt?S1<C~4b3y6QRJJ6S-NRkxItF{?({`M#aaWZdYH-^kPbpv3W!
zh9e<|_kE2%Ic?DrO^YT}m|GniH8qXFnqMiM7bgYC<8iIhXv$KHE6b%prnyO3WHP22
zG|uG*o@pbuk;GRK%d|$=V%fnShN8Ps98GO3!Z(e}Jd8*uC)T02iuq#uU89EDNSY(_
zZeQ;K*j1$2lXiL+S>kA3GMT~q%HMYei))LBQRRv@22fN_yM_0~MW@emF5p}$fOp{m
zBxa+Poo-AK<c0vQM_N`HeXd2ai6QeOl^6HTCjwFJ>57i?SB;UatRw)4{&kb@HhS~z
zO}5i6ri4Qwb=or{KO_%Y%GC7P!im;R%(9ZX&RA1XR}*E)ubK9&FqOc<hVF66CZM&G
zT%Ki;Ms0z%A^s43dew~^`#wv-Wg@hova_&kZ3nN^dsg+#vEJPcHqOl;hCXC+yfWkO
zew3v(7i5PRwqPx#&BHmolWc@!F&G2f;-$1H70hiYiT-VeX#1xfYS`1Jy+(|Bkg7BD
zbAiucS{g@$b!%&|_ZG>&0EpyHzW)G9&Q)TIRNG}JBtd9pOLb>r-du}-gWuYzy^gJR
zTH@BwMg#46BtLxmV19<W&-g`VxSeL!Sz!#=^4H~32V?6?b0v<BvItXi$f0*0pHWz<
z%K967KIT@P;5*@sPWs%)n}WEL<tTff*1AnM!u}68aaj2hdBF=Q4Uxd<S<9^46dHBB
zvJm*hkI5&!TD9>5#Of6z3eFdECx7<6D+;okdzw>(5zt(CKG#dO7x2hDox8aoGFCjc
zvRp)d#~UHuOHRXZVf3zw&enUCYq@WlKw%zh0fkfO2YPJ!JT~#K_TAz@xXF0NK3<@a
zTprb@W2=!`=3S|p7#bPoQj(|LKhCd150x-7S)6%e57R&6ROZ$EGZM)p*UPv*5;-`?
z9+gJp#kT2qij&9&&)qggGJ1pQO~Q3H1t`SaO)B2u-g}v(jgf!VFQ<Mg_0F^5j|$tH
zdp1d>Wf{0`LU+I(wZmBWp7T_57T0@l<UHWxc0D_q)Q-~LSwDRNmKFd!ImSn>dsMtT
zQumnD)7WOA<1I%}ns2k)84^YVi14wX?oY3^Q=eR#c|5r+%0E>qe(=Zhtp(Gfiz^~X
zk-_sgQ|r)s(+fidkJ?zPZE`~G>z?(|4`#GT&8c@Ot^L*VFWYqJvl@_Q3Ij0gIP|Hk
zg}YjXu(QZ=OR^Ep4?nF_`)$3G?znVsG4heKV1euJR!4{<Y0NO&2!27-j31?IX+4R&
zQ!ZQhTI%WtyPh)=5`43}g~dASQ-eseW|2XCq_xOlwFkX3{t~&NN4L6yMvTRlXvhQq
z0IgiD{r%Rc?H$BSw)2pS2sl3Z^s0q9N$M$7j8=yJiQ*j|{&%*YQ%DM-cphE@H@BzM
z)d{Dv+a&)0YDol=kk?2K-aWl5Ip*-xSN>FOBe)wHUo#PrkGoUNtlV7MNR|*Jaa*AI
zL}LJbd)GpRnS-fysdf!cNF$A5jpq);Zcs3T91~Dasaq^wZRFcyQb}aU2uEthg7W(6
zBY$<Oz=Q%)BvZSC-yLeaw@-54Wl~kY))MFCIsUb$vmw>C#o2sDWRb*>KH{O3LjYNO
z0M<Y$zjOU6snl#%MvCfrVvvwlBlm&F2i#P1nJvCqqGCE3Fg{$;!yIzkf&*O0(cxr4
z$@J&at#YG2X-KVms?TLBOAYQzAOJ2$xFCAf2`{xxMFor^XPYIMD{^z&+P1Wh2J07Y
zm)e+&L>%u|;{*I_Qs2Vf7t>uYE<8yV;y10j<Zi*>7WDS2=Ztnl^2wCEJ>cBw&2e>T
zVjJ^3lD7bQ8kb$Pw$XOl+Fd5~aPX8FDUshbPsINK5h1n{S!uxr^&5(E54J0tm;Mrc
zUUroUV<rPh8uav~7*0=`PRJ!FrD&Zjek9OrOI%;uE6xT0A1)86_xG&HJV`siqShFc
zvz_Hr8-eGqT9ZKdQ>*JYD!Pr_kt4nx<R5?6ZhB(94#&bD4?I7nLeXfZ`J$AD5;^(L
zeEJSQN>wXRr0lh0g(|aGYR8`1SnAix(x7PLBk!=`k9GF0o5Ow+u=5VDaWqamkRyyf
zbLt57s~#x7woB)@NTard3|qz2s*c{|deihD1$c*Fjw5HMNeY>K#4z_C-oUKqT{vH2
z;Y;4`RlC%i!}jH^8ry0TUKs`?ZO4M0vOO!EpT@o?*QScnG-O1Pk;AAvk6>%jwLgbT
zr`pAL;wxq{FU-vG;E+8lFH^Db%$6^w>5wa277XS?jIZ$H1B!}u>2GV5Qk2uR>|<I@
zsajbi*Ec3I82RuP?eAFA>P;q~(OFo$?#y-&LEJr!bu#!~8_p$)R)t7EGadV}(~iQf
z=)Mzz(n8l(ra3XRGM)!K5$Q*_rww|Cv8g*QhccR8zkh8BH-f<Vo0vNi_yhQH{Hw3f
zd=+UVe`}83K{6cgxR9O47~BV8?OJxQL8I?KW`)9xySnAaxE__KXdo&llHpmM0f)-y
zSJYP(Y)qu|M{OK3j^uh)kD<gJH9KwXFB^fzPjAAe)Qz5<w`>stK1ft?&wP&O+|zIE
z?jp4jTuHKG+mmSIq3AxfS}8pCF~@Esk~RY%f<t=q(z$t@wK{oJOIkg%Lo3``#t3EI
z3Ng#)x}WH3X4CAgGcTG|3gx-w4{$3=ZAa}of7(r)amqmRcAy-N0OGm75Np=fDILAe
zpC;|a$yWz=9FJ;Iyx2J?E1E5>>e^z<Z>C$~+`=8*qYPWngZ(Rk@xH%%s7}i^r6AY=
zW<!Dg?OxUVW_3i6X{mPdNf*iXbsJ+NrcX{iDz=s3ooi8+OUdm_fd=!oK8LyXuG$fW
zH+dYDXDXT_3ddA11~$lJCkN#K0gnFF&}hCG)O=M7L#SFZgp^1m8~_hY<JaD`bUzB|
zjVyN;7Gh65v9Pu{9=?LNHLELaE(qh&r=B-&mQc;X_CD2hF)8U3Ds*k}GM<m{n@`g;
z*&6=tIACVN#t$Kh<%T+SsAkjjTL|7eH%Z-2#)f6!sP4a7ss8{82b#NQ)G*?68<zxZ
z$MCj#anSxXk$>ZDA}v#NNr^4+V=_1*Zp4A@?^ydP)i2D;bEgBQ)Vx%wWRl##L!Xi;
z%Ve?aGf+I^Ta3Xqr2DPcGNLxsV0alKxxE*}t*FRilGm9h+zgB}w>^iYbXSo}9;Tw#
zQH5i8hUE*)gCB68K}*=GY_Dm~j%M|>0do-3tP03vDpqF5P&<>~{Pm@pJNv|0Ev-$$
z2O?Q;0&*~GK{V%z54T?1$s)+@<*J{(gUG9v+Cu79j~sC{Fh4G`Hvs#QTgqu86$aT}
z8+k;Cs}j3Kw9J5fpksso0M@PBbWKvh;L_|wVIMOzYBtI0IOr;rF+&;~hMF~z{{VC(
zVs;#Ktr+!7v1R^|7_|hH5XJxx{@)(8gy(&Y;}nUegTwJgmT+2^3Z<mp`-bD#)LMKn
zY6YG4<p~TF^c^cU>f$Rr#Idl(N{#(<>rb)Pw8<=`MTOZnd2i+LK=043X8F1gOPWS|
zO*#gG&>t~D+F7{=*ELgBy8-}hBqIy^z<ZysYR}bWwa}0D-R-=dP>HuA&(TNmAEk4*
zemvH$_vw*%T6>6|J<!ao6kzk8af;fN8P8N_I<bz2M|phFz!nk)REOH%GV#=V)Ve2(
zY$CCbM~t$^0<%jjU;!Z~{PnJHLh!$dHMyaaRZl6Sm&}D>=K~$j(z?q(4O-bbj>=F1
zs4^8Gg>UYke*XZCYc)<fZf6%asflZ=_^-qahQ`383p1$>m?VQ&E%ZD1W{Ml2vCPex
z6sZWxdmnnWX{+g)RPezy&eCRQV8;Q^rfZk+Kg6JKWR}t^g@7>$blAb{Mmpm?`~I|{
z8kJq5hbcxX?CrF{Z>OlZG44gk4<Y#n)~Rax{+O(gwa@P)a;7-XE!<<$yyD|g_<^lD
z+S@|Wz*L6_4^!#SdfxEI!v6pfjX8B2i=E0GvDyyg2fsd*Q^UrVvym~aIq4K=+TFn;
zd5-Com64f#_!;3?_ae2l%R4sW5>Q3Y$~Kktz^v=f1;=M(_JRo&Q}>f7BsNc1&0^ko
zze~{`D@Zl#i^Nhx7F8_(9hmXEJddE{(ouCj5vg)~M`?ND$Fj5*Q3EVEB(ks0J;g<+
z>r-7=JlA@FSCs(EF<u8kPpxno*Tk!>Xta=Na($6d6`255Ur<lCTF$q&ywwTa=SaL2
zW|-|>c{n|5XkhHGBRS%(?2S(r_=7@_%Vpu2XO`wzcN?7ih}p*FJ;i6)Cycd8mfjfm
zM5HTD6C1eX=dcxRE^Krdq`QgYx{;Un-Npy-;P$FIw}{abCR61ypOqVE1ok!A7};4I
z(v{uYHX-oEm9s`KwOHp6x!o4>3X(ZEqSnhtySps~gtE*ZYZ-Y6gZPIW*BhvKg6iht
zIikG#LMA`e43y*7y>ID}_>OsGy|A~E546UK8?f~1-ol)s;;z{-l9RGWQDZib4w}wn
zQet+=2M1{N`c>^OPPFkYzn5`*V)9NvBL@eK%0*^)bHTd3<;~J+cS^BG5|6bAil@v^
z1J$@R>y^9nn%X(uD1gN6oHLGtk<eEJ`CGDQTyB=9L9UG&(X4GW$U&Ai@}q@_Eg{>D
z#g9|&YQ3$xO(L0XnOYVj=6*q{8f?0J_YgyKX>jnw*`DF1!5x8K=bqihY4;kH)Ga34
zgixa>&cA=2p2roRD=POcc@1lRhTC{~9Ofn&z#ql!OL<`|Hl`~JlxZG9%vfYbPkdCq
z4!pM0?N5kgoJ}_K9%keN^r$cOIOe-+yN1Mv?z*lQ@*Sv2+<I7w)=TK+Ht;GUy6(iQ
zxux|B=xe00ww~6-H7!DNkwKp#Rs(V$?w?cG8t3KK65{G6XwVRUcP;=baaA?tyS+fL
zYBMh4ckN<ApHL{}ZR?<3+Y;XD+Iqn)oukh$&hIl9-d86$C$JTtdvzV;lH95vFx!P-
zrvwaeN2OcSJUJblNE{Ii&9u31;_5;5sN{m;d*f`@Y#Acj93c6}rUy6}t)t1%mgH<`
zel?FtTYD>wGj*(3V!Q*Kax+?Y+KtDEq?Y1QBr5TRjU*p*dR85dgZ7ByYsgB@ube*|
zcCLc+P|~!m9wqTEr4(XGio$?x$pfiAmCsQ_o82~qoxS3gouTSc+ZD60LmKC6#(MM6
z`_$1#G!qM%uObni7t16v5!5jLwUvAEZ${DWW}ik#nj3tqlFD}(&Od+-obWz|xSdDF
z+P{ddgfYl%GbZT~NZdi}F<QcnN$#{Jb?L)Jt357X7->3e1}Ni)&LsIpQZ}6b0AG6N
zyj|m0xr|yt8CfDy>Jjl9WPgov*C#|-NxHtcx{aTD#~hnXUoH<mzO_p8QWM(`vstup
zsS2graC7PE1#3?a1uL_frY2I2hrwj>%G#~=q|!^vfTaAMpaEB+)-0?gmL{<uytf}_
zkyvH3)b!-$vvl1*Q`90CK5$PnD*H|YfN}Ew04mtgz8~ErQr${Sih;2k9I!s1`g>PI
zr3Je=;~BT28KvDva}vp8VI{oKzHSQ;$tR{U-|JSi-vnPBLA6^b6f}S<M$3=~B%f-#
z7ll&7)I$uUdC8Xx$p^pCR@JS%x?)3XJ@4<I9!ukck)C~pVJfy-9T21Z#CA42Rv$e{
zA^v7wHjhzLi+fcf+AM&~Tuj3|y^Uz;NSeLdMdl!$HOAnWQ~6X^*4K8|BHrF2@n?MJ
zvJY>@xf^ZWopFVb-?ZD>+mUf2!5<~$kDh%nJ!;K`qFV;I4od_K(Fe<>dHm_{v^Mbz
zm@GMDJ7jDTyU_d8bL)016k(%C=3JL$9eu#4)s~V)j}TlYr=**AMQI56S3IEg2iMlK
zEiE+b$>xUOhRv{!MrO%9w)<3)U;U&c(3M1F+9WvHpG^AIG=Z({zi<^ENf-#_9Fyu#
z_i5_H*|QWIg2c8?6am0FaHGCzVP@BH`BB6KEyFNu2K54{SzT&mqQPqA<!yzE;0$&A
zD$JL5@NKrZf%h|<G);g#aZ*w$>vj#NZYgpkFvhJCTY__*szL4rR@1+?rjRwZkR)Ch
zDv$^sxUD;A5?lDZ$rKTisUvkB=CtG0>|v5UL&!mK6BRQ=01TZmj`TTOrNYG-^jSaS
z`bYvKk$}K1a(!vvX1LPeI$f3$3xwSx?9Kq^gVb|UYJN4BPj9i`+lPV3XtuBiC%$XX
zweKBb`sOV;+=4esrcSH<<@EYhQ>RjIVkcG<)~8b1rkQPOvVF4yb75s-NcGK8yZEnZ
zqoQfigq9~IRgi+Y>-c^Z#iixPh+{^%iJB=6(GYE<pIp?oJ_VZY_9(8V7VwA6F6+XM
z<oef4aP;E+<C)?sOW{GU_}fy{F60_Kvpf?<1hGh%CmfOwQU3tetc^m~#C{;3bk|cD
zSr=uxoB`W${<YKE=-O6|A~nQ<Xxz7)%H#$ErZd{K+QF75nkWjak^bx|e8RU?Aq8ZN
z-8s$s%;cf)RmYg}Txxkxz&eIMHU~g^3evaJCHp@6J8jnhl{<L|qrN?BTJu4^4%b%~
zQ9~0#2a=KDmmkDWsjE6f63j#zvaBO_%pw~y4@TqZL#(ZGqd_3k?Qag9_FuCsV6knE
znIk>(+M~GAuH~3Rd2+82IEiDA1K*nIt#rLVPng_`!tw+GRz~?Y_55oa#2!A<AechX
zDl9<1niLOgS1e^ZlJ`-&jAFGcw}$T$2$sd7ie0<MA2X;Qps7CHZyb>#rs*@fP2+%l
z1#`DPD0|=ZhrUw71WLyTY4pc$YQVbjOmf^9W4o0=kQJ5=e6|Pm&!udrO|49wct>N?
zbUU3o3rX&bo1Rmc+sq}Co`*dE&uXQ4;uNs+V6nK`&ZM)*GH`m4_}3+*=zcGIl-Dk9
zm96du(Qj^~1Yhr9^(XQb*LZW`e9Hd-Wz}_MIdL(#m~x26fWE&<!fF)Xyv<`dO>Aaq
zK05I=?xXfS5*v4g2l_;k#CPMd4b$*7)p&njlTOwnx&}|Q6vE6H6a@9))#!W^rhSf8
ziG)JfkRs>_C#hl78l^0D_BM-ueHvT&j$v6+JgP_sLOTKnTE=cOdLvjSw>oQ|4OwdT
z-)ho~r*X<MHaEHZ*d2$ZVqR!>R<kgY)%_KiWwZU#JAG?wL)Y)FtfREYlCcos)DM|^
z<I=Un`hKf%B=2w|p5hNG0~pT0I-C)LeGjd1I*u~4Myo_{&!_58#CO5vvZm%Gdar-V
zv!+|MokRtgleq0{s}EZ3HEl53+L$kG-gMjhxE20o&#QMnwU2kBtUu`S+ca;u5?KAy
z*>O+WMQUiH%(N-nT51uPb9n4tLAhU&JqCZJT)dN3x{_I1B;76|AjCHX1Md$?b+k%x
z3&h)toxuk=_NyvdCJ*M7kw`vcrbo4NIdeOkq>$(k+sv_>NgmeXA0}o|$`CWjso~V#
z<`uKJM2(g|E!9^81As@RGAST}U!PG@pMF9K#_vpatX)S~wy=g<>t^#KekSuqbM8F_
z5QL{IA-O0kvtz`1wf(iiypFD}qBW6!fa9U}tc^`2(|*p^w~>6gkdU0X#~jx$u6Wja
zsgq8!w~(VYcT6$}^&YhA%bSFc&AVoAAc9dcM426jYV;{#Wfkunlf)@IBWQSq7G$x~
z<2QFVA%g*rlzK7kSw1X-#5c(vn`D`D7UJl5L+$P=Sgfps#`ezSh1eY?L;NIUf_s5l
zu&3DWt)Ar(p^?|1z}?vAwt7{*T2APN%~2Vi9r#usWcq}_v#8z~j|cn1-_%!CZQ!`A
zB2x<as}mi|895+T{W!=bHum!(yoWoPc=~%)9Zy!2l=Ed`;l5Rba((Na)tuhvOld+0
zTcm#@WQ0bf{_<rXb$tl#X^U?pHt!<EJichyxP0sbpkivxte4UQ9nG?!&SE14r2hc*
zRh9nFv1F3^M_gwhHw63pR9v*QG5k-fY6)QWc5#2Dd0+`p07B!bAJ)0%w!GGDS?;x<
zBvun!K`}g$g(PF9Gy2y>tLt{RZXkx(i2*2X7!Tf_*!HSlU}dssT_PefT_b4zc-yAo
zkIK4fOO<SMRJ)O%9oN})2e+`YOPNSq^Of3vi}0=eJl{chW|+#+tV7FD*Kq5{rBbl)
z<S7)Ijm^$xjDjOoBN_g6qiqWR0Iaf>Jm)*cSTX7OdsS7GWUPV_wx+Axh{{NJ9mfH;
zW43TbSGt{~D$%hE8wTLvi+x2g8a#R7UR*XESAmaOWQE}ihVvhGNCSd93c)05Seo-t
zn%GBV=@KzJ+GWmL)MKSOeJfgl5%mjQicc>9`ANrGhCORYfEgajLd5fGvJc&koAXme
zuiQ;$Z7dyRUpH!m!3f^|f}MqNvff-;quSmhI><nC9|cERt#Kr-BTH%V`_Gy%IRhQd
zNT8dkVb*65J8*<9RZrA)th<d;7_I~tQi!E&>@EFA^{rzY>`Q4HGuz!++U#giLa`-V
z0Bt<(&w5*Z56!syL~FVkh%*SrM1Xc4m^DT9h;5@5laT!kcLBaaPgTL@q_fvr5VkOu
z7NnA~;BVjGp2DiqL|qTLfN2CJ+#t;n4uCM>I~M#Zg~X!lOqOpOB*&L?ou|}#dQ{q7
z&F-V9eV*>bI?Cl-Kk%US^)=F6XtwDIZ7)uLD&clCg+>U+=~CY)?Q?^?)0;}xov#Mb
z5=SVwQ-|Dh@-M4nwG#N1BUfAK_}*lKWn4J*4tv)1-kKqd8Esi*L@O5VR1aUT@~nxx
zH)}4Svg(I&IxH}w5&<Or;5*fGr@5abmc&}Wi*=J31PLONH7Jp$264b+>sEAc2za|%
z)9!UUi@S7yMgmy7A2M9^BOi2rwbSZ80Py511Q6?=Xqd`8;TXckG5X?@?8&9sOK$f`
zBPaTqv4PgHopl)6DAF`!-@M4QjUv-a(@n6uo=L)%g=BNXamIZIy=ugf%OrD6KGkUc
zXvpPQ4_^7GENvyZyHBzP!EhBp&&}L^HPLGx7qrssVwX^z;gdUzGWC&2?OYS7?`rou
zVFZzhcR9B)U0zy+m6VtfSBD)q{{TH{l3vSbif`>?W1Y%?fI#h8dWVQ()Dmk+A2$wm
z#cHx*NaF_pgWrK!GkA{P*5GN<&4}CvcaZKVJr91>yfE{TjO)e>?yaM^@k1<HX02;#
z@W$ogxPbiU0~la%q;s5u)N(5V?oaHv{F^J~`$X(lGRRB2djs0I%~!^{je|#T^E`JB
zOn7_{KMu7tTHDOiO{v++X0}B!M<Zu=BZ3d7>s@s4t}j+$EJ|xbZY@G_mVzm~^pj-e
z&QWvRj@0&fXI3dHgo#NA69z&$<Iq<<d#^#ITdcD-?=TSHoGQ0a8njcyI!38xmng1_
zApZbKkT}l+_<aR+Dt31;bsHB<n?V+L7WaCGmv%RKFt|DAoRe5uuCS)iOj%kuiO$1?
z2i~nur`~Hf5o#99zCb%fj5rI=Jas0lX?_BeQo5S>s;a8vW^#-=el@am>8rClPI@CB
zN|xhPmN}-8PWSm0eqG=FYTZ5@xYac2(ie!UM#(qHh73D<{{ULh(|k3jeWg<6$uKbH
zHQF)gJ?l#DHEAZ)E$pOI92^D4=2h*EnfI(}Vzu{8VL`Qaae7CD=Cinwt(M<>v4wV(
zGE@%Z(AKrJhN8b``#iD9Ews3F^2qX&9YOAEUK=Q`VpOx!8bcu^X51HI{{UJ@3<)4u
zEtnuXLpyw|-k(awrY3V%G>rs{kXc*ZL}SyUF@nLFkb*aNz^;JlTArJuPj<<1Z)gA$
z?QEo@s3x%3O=BX;kqGagKO~FyQzO%%_O5}vRjJ!Vnnt5!jkK%D67Y<1(2D0$X<X<_
zp@*obk-|=ew~v<%@-RIGBoHgztasB3a8qyESw2|(ushWLAn_)Hr@&)KqcXNw9Pq8w
zfIS6rI`_o*b+uS@xi@F!S22x}5y2#5APUwLs#SjK(9Tt14cX`#cZV;QTYF)w*_XHg
zthX<OLUFg|CmB5mKBJy0rn92!8hDb{;x&%)-eyS%`A|M^SMWKmR@1~YUFkDIWfw^@
zGS1Sc%Nt{mqx7zlO-IKU-Wapg{8{1CW1_eaSxq<0mkqb79<0X%p5q6Bir3gUtw~kW
zdL3?w2ZX2arK}c~v)kXdm@k&$fr@M#Z;0S}jl-N8=O0wK(Y1@6GV%*~k>CopZl5v?
z=OMjKbv_&MSBd<0;dp!%cO9JCHi)5w%>WYGo^Vx%CxXN1ewE7jlTxx>S`X~Y&)=DR
zu(Cmt$@TBeK36Ae5~kMWb-UA~m1go972EfN1B2{qb4c(czCW^__rn?u=Aky95o@Ci
z49KI5la8H7*R^tFTurCQX8qi&Gdz)j$mflqclPOB&%<wwUNiVnZ#~X~ty}4>a6jT;
zw=g7&Bu5;8MstDd+~ghz#}KhGr+O;vYH^n5op{5;k?6Uzx)%Qcy!(bJK~bJ_o|T>9
z@!@%NxniA#$|)+c!slw>@^EXa@i&RQC*s{eYOvcyZFDY~o=Dep4p@>ffM64x)enfD
z5B~t+8ICr%xnTDvbH{BK)s2YGPC9#v?4;)4l=Npb<84t^Z97RCKID~Slw{f>lauU!
z4)sAbbD?k4q=4K$<&0aiagXm1dJ3ni-cJp@aYn}xOXgg&51Sar<(}1*d9FRB%ik=~
z#8~5WiJi;pJq2{apL3p7ZLxF39xjJdd9TIVq?V|6O2-OSda1{!Vrs5~uEB3=(#rA5
zTpuR`D5pO$!RmeM8pa#>BKs0t#Wbq!`;mB&S&7L9sI5C4BG<%INd%WmyB|N63W&(y
z;0~F`O4`aO%bHEx@9|`e19_i55=MDR1QE!`YEY8MTFspm3Snhl81vAc^i4FD)}Lr4
zOj5QU-BcF*O$&PQ+(t^o*71O;`>sJF=E?4B>T1GN<z{?5Y{ZPqYaFq%N4U4iBQ9_~
zDi(|d^J3WREPGi4dVh^hsT5LekiPXhVTAM~^d_N|l~v@9NS#yUD;W8a`-AUT-%*i)
zvOrOGM;hg0esJCS^{UbvAY+PKt%B)@*$d(FIs7W)TD`OwxVLy!NiE#--k^9Q(}|tp
zNp2qkCkGoBs66+nY-Tp01S+p?_fe#KvK5IXN%b{_so9YW7r0%-5XiateL1d|Rfhgh
zCYMjzreGD0K5>qpO2O43TdzH&w3ax_Z3T|p`hq(O(J)HKBdXdYY~}=F@h0aE<ggt$
z_O4F$3wt?MIFe9NOL>6g5=rAHpcUO~+I*I-gUNQ0kPnxlr*6GXak|5KO4D3EV&2M6
z3K)8U=}sqY7papwNFx$kz%E#1`D?*XQgg*sGs)(pj~ENL1{Fd1)2=4Az8SlD7BQ6q
zBZg(^+o-CNPiqNih$`#{lNf$+-#)pfj?IxYSKybDID+5}rO5eCdV89)V$;NTL20>z
z5+h-f%~V6Yu}djav_x4$ApOzLQflOAV44{ni4KbF@pFJjQAw=>b9+vjXyGbgRb$99
z05+fQn%b~*@}u7SgE21};aGhKpeDIpGHuNBH_VtMuxzU+J!^W)Q7liBJPh7Pn7flD
zy$7)RS2Jly%1N|t38oQ<(%*o<JdUFb4{xBWaNR`>yIRcgv}MlLW%-vs-8GwMb#HW$
z%O9C6?wb_v!bV42j@5M~FNk4(v^LSaMx3L1pFzbl28khSdntyiaEd&Y#>u%L4mkAd
zPL|d<!HVS>(WB${nK(S){&bO)MlnZlp~uc%MI@1)gXvQwQjN_NJGUS{bc5x_dE?fQ
zEeK?{lHzalks3y00S4j=FzP`a1~J7C1jsz~h4w6fM>3r4Y;qWXT3<5JO2Sca7?PpB
zZhbvzlIhxkid)NDl2uo1krR_AIpBMGQwxobV+GW$s6!l4Ne<Lk7!S`Z0P9s+H=5br
z-sU+zW>sYw+3EDFKW)2?1E|M&2x!L5@<o#X^cn9}rDTl^5?;jFB*_y-RZe*sKhM^h
z1-T3P@xdIokq3e~vdDu3pMPBbwH$WG?Gnn?41~*)Jj~&HW3Z_Nae}f>88a3k*b*0K
zU<W}=duZd8BDqJ}T=|%gjDzdwC}xO?^^(ZNAx|sJVzG_+ImUmLK_hLAGcuy@DIR&;
z*!#Kl?^3J{J)D*+1GDX8Xy|gt$AIHG&lMbY6KXTWC%0C3{&5%F2_lScsp?v>3dpxP
zwURah0v!sTha9U@E@2mvD7cpePV@n>mFa>7T)Hw|+=(si@%y#g8e=89)pHgcO*CRW
zjkpWQ#UhB7^j!HfCA5zlNMn_gA9Y86VNp77B6w6gbpY}M4mhc=Ayi2%M686y8QD+p
zp5xw}u`R#Zt?sk2A8{GMAdg>KMO=dN+t0LR7ds)0gXOakl5w1R^GLSW7Z)ZHiRF>=
zPn<6UAB9)F4{tDzRVFucvCl*4RxM#kq>{~ULOQ@1RgQC$=|#pPN^W9Xt6;?-LKLnr
zor`0=KOS$DGsq=KiEz;_5R?3>CxTs0_9j_UBu7}JDlh{P)Oym~&vdb}TDH|cBg9i6
zWB9$ZieNKLYhN@zp=Q!V^5B(x5PN6ZkzrVaI!X_g$8*NSk7|u1gi5hJ;)U}wz`$ev
z6*M-(QB+VsNZH(~u^W$aPwS6rb`{8)OL1`&cd{7eG4GBo`%*>ZZeM><)|M+-ZZ4a0
z`B9`H(3Rmva85hsrjq6vrHaz<LlVt}jJn_k!Q&(D<PW7*xoHe?J?+$JA_3k&=Lehw
z<M|K%wHDAW3ePDMOB$}iRU`fpj;+UY>S`xv5xfusBCyZd%VTzZPoSwKOH{iS_E+L)
zW<X;RXAItr>?x%d8$m3qyLNWVk?YPyP+W%PNZhG1AVdtFYUd5yXSE`QWr$g^-tGIr
zAo&3A`qZr}31pHfqG=j16z#}f*#p*_8p|3Y!?n=o%sYA><a$#T#y#9I0V}iZQ-%QJ
z%pQWDwg-!BirAR!j4NOd_r1O9#B1b8C7DrLDEG#ajCaOY)cf|Tw+<bdOz|qX!h$&&
z>J2m(WVZ;`6AL-+Rd!&jo^U;C1M{(Xrio)y$!z5M;-zc3rI0{k^A&CONL2wMG2G{{
zs@H6hM+uMvg({v)e6601&rY5Gl}IiPzEE8v4$RwB4tjd}QnDwQ!K77*fDCr>4|7pl
zs|F+}jmRMb9Pa$8P1a0Q+*~qwV{u@6{U{5KidI;^d#J_cyA>N#7#ZNxE-uz<c`p(b
zi^y_W7>uzUz#Rv*N{IlSr_?T^iHeW{p(h=)RU)*3e{&L++zYd@<CEXeQz<b_{{U!?
zG-p?7BrPI^!P<HXvt=q;%-3?+NY4ZXt)t+p6UWV-!>_L$x`-l!?HLi^1RIr^_U=74
z@y!Ct;?iKL427l}P)huk>wtYI85%SO5V5f_$fxZ%0GB!HFgP@`#D*a?!judCrZnn3
z&#6AOG*)T1e2VcC_fYj#>T!;>If_+au2(XgGX(AH?b4|`l#xh4A2LP)q@xYaPyYZ~
zriR^Ocw~)=<%ton&m+^*G{@T;8Ho;D?MT$)1a+%6W>k~O5d=~;$j`}N{=G5T2yN03
zBYPn!iG-#H=_ma&Z)59GUCx)+38?*x%9zMhTbAND#{ha7lWotFCZTf~REdha4z8o7
zD3%$dK^NLL#8)c2ISuQdUut(6L}GodC8T!6rI9l!ai5p4rmQ5aO)Io)WF#m&Q^;8^
z8dyY|;e~$C6pVw@AJ(7#g$Od*58NDXGCw)TC+Sq0DIqTI?(ZZyniM5=u`zLsa1J`u
ztmH6h!iALr$0Be*1Kau1UZs>4HuG6r3AfDBc^J#HW1&6Q*i<QQS|z&j7#Sry^4w$4
z4#J(vC6TNM#jV(KQ(!FT8TG|Lmr%S$(N_%#$dOMV`X5@G?EY|&`3QEXI8%;k#@&m?
zEu}&{%sTmhe~#4dRf@(r-K3US40*xE+yXs)vr<D0ZFK}|9uw~g+45A8?M}I|zF3`Y
z<ixJuyG&<!^e49!X&%f<2!Zy52+<x2u<FC{s!S|J8@;0W%IUr{m6Ao=0s2((#UeSK
z=8gBS&*hGt`Shm5OH3j`=7#(HagXl(X&Krm`HN_cODf}__w}kwWY*H!i+2gQ%OZgb
z2F~wLYI}=j({_EfH%WHxh#qn)C9bU@Sf?@;V<GbPw$)O9#;hu|iq{P+nRW<>%uY|W
zT6ZZ)7hq(yQl{CJTsC8DF^rz90pJol(`USNvTJYNsdI&Z9GMSnp2NLG=1UVI&lwKH
ztH`H?9)^}EWRgha`#_CDWV!zUmSg-)JC5NS%*_N>5SC*55-r#z&thp=BDX}gHw+xg
zz-6$}x$T;Y-uf7>1>79GQvU5vIXr@Dr`nR*A0j4|!Ig-8xe>8EnrVg7E)wc|=obNU
z3uBnibM>ZM*`zkVXH}3o$Xq<ll4#y!R7r?GH$~%k^`}S#j#4!ZDO|2wmj3_>tK3&0
zo=K1+oEVFd6DaBHRNROdstmT@^+AayuH9NkZ?fJ<_7x?BMZRI4q*O9N1OYC?@02NE
zsycde-ixriV=*+P7C?>*4a#`P9Pnz*g_i62=UZ`^22e=*LZ45iF=JJZF*IxoxdE~U
zIO;v>V|gP+ZG451p^p+uMh`tdl~R%#L*fYW$7cj?(gIpy&7Uxn)BTkc%X^oO<?a=S
zmL%HlgE%9qpGsw|<LT}S+XiP`Nej2k%h`eY_N0|0ju_!Y-5&D(OlJj~smZHS8YZ}j
zWDX*SE3}o`-F?ZbCP?KUE2xlUDL-@{dYa}-gE4z>%NFG_DIE0aQ3(hJSffy&ZF0b2
zezZ2&n-RRk%<TCpnaDg~cNG!=a}Y2#(9B)iKYQuvRt!lZeT`yi8cuQt%DL_Js8~Z0
zAfZ5{03Wgbf}P1Bm76a<!ppEO6!rEsBHO&s3*FIe&eXLZd2!tT0F6IUQmVq@$;&PY
z@{T)GGd-lN(YnNv!~-M8o<66g4S?5ZCX|Sz^5g^N8Q_m`OL21~s#(V8=&XYn#~H;|
zxVw|g5(ZUa@}0|%m)fFfRAhvGs57+=Gf?W-IjlP7Mq%bA?dz5%syv_&s6JuIZrQ0N
zF2`yI1o9M&@%?JEt`1%^&pWeR)01yP8y>f>2@^tgusGhdjXaYpBRB)8!N%%{Wly2(
z4LK2HQSuVOx(@XUb85o76-i_}G87yTPik}!$g&xC7S8~Vl;n*Sl^t+N`G`MsRfwQc
z-eXEio(>bQxT}h7j?InFmk*L)V!6mT=zXeqtP5m<ca!`_m8l`NmuV{^hYQq>7x49~
z)|RJnA}~NvleW7lq~4~Hh03v6GAh9@2wRhmIqqot9DuUJZe_}0*l~gD^sRFO!n>IP
zQTOr510Iz2)69F6M}%b=C#v`BU7pSj8hbM?I|1b^vOy>)`NF;d_o))u90^zFkIce3
zToB&owO37PX3RO0Y7e*$2dzetJY~?pk(?hb+ZZf;yHlppm61xC8kUV5g`iWk;~_?S
zb5<G^wo=<;A&(;*AFW!_G`GJgHL^U4tVR)t1-pYuG;R_Ld&^)MC1D{a0zueUQn6Yh
z1e$Ab^CCvZFPYPC-W0IGZt{;eI~Z<|1JmhK$EVml-eZN@yq7F^Ki$WAl6z%C8%rWc
z=bey_KELBbny`xMXMz;+qbbW4Q^_N@H7=g^H;{{QY+!SrF$v2^bKax3mNP7i9%N)d
z#4C0usH-vFLv9Sh2T-FqZpXfAIe?Y4C6?3e0FC(|KpQN5{e@Cn7q@1$EUXxl^Db}?
zP(2M;m&86)j?j@3APfK*&U<Eqa$zP|0VEK`Lg$0lj(ZiOAXuBt!jM&C9#EU_3Z5A*
z6&YY=2N)$se@eF<i(SnQ=~Lz<*+}Qxp497oIYd(`!pCYB&hDJna;TaqM5}I+O6vm@
z1Su(n!1p8GrWVHwaE_aqPX%%S_V=dS%MHEC2u2rfNMn=linwlr+ZDHkU<FQNVVocD
z4@}l>O_#AnAeuN=%G)7VJC_{^sitc+(o8bLnc|V;+=B&>{{RUc`R`AV+e#u>^SVMq
zggr6dmhQ+{tee+!J_4Nm;CVEz!sQ5UuPww{v@aTjB<+-BC_ORnPD3)M&iRnBXWV-K
z0EJ6((m?@H6Df%aiC>)iVy}2|!ruAenr*&hh<wIyIQ%<Mo0AbjD}y@*Vp{}&B<e?{
zGUnOdR=SM}2T-L{fVm#kZ&ESEB#H8f<5EP6)Sp3AE<9Cd6|7d!S+sIzlbzi9eR!#q
zkvB++;RHaWj>`iciaI_z{c3A@1XkurUNQ$p92GwGoc9-#$Y8UHVwIbfm#;qFwIXS^
z7jj2$a{gOn2RX*y{=G*t+*eJPV$>~TiKSmKMHwZ-xg?X^e}yD^n3hP;+meOy(yvvg
zHMP_-l%5Tx2noQ!{{R|{Uag#grH=#5%N@KAaaGR7YfRGH#*-2iT;!A7dVP9QTk6kg
zD-=~|q#Jy>M*#ZOSDw=GQe8hJ6S%-1I5_K{=~Qm-mcnLBvm-0*3RQE4_w=jwwg)43
zI&YY>#_f%{n{mM1=sl{f<?Ia-DU<ifAu6TtrF|-d8m+&XB6+4=xW*1JeJZ?@$u$1}
zB=9SL37l{by+o_%9LToXt+Z_ZaZw`>5drEwDjiblB$v!>v6fsSmiFjtI5o&{{%HN-
z+a$=GL<V^kWvyaxaT#PolOuDu`j1NIbtK8=WR{I{dAd0XhXW<IWMe#I*EEsanM#|a
z!-pgVVlsMmr`TLurlhGlZ$X7%IK@e*PHk=39ZuNTmcoutZ>270U|NyhG(|)#@@`fp
zGOf|QKD9lznSCvsvZQSrD&V#`UeyB5=@-~UPZKcnL0~w~dX=vXo@N=?l~I9^J<ryY
zk{*n=Wu(JyH>{xo0lr3K^Lm<osi(}6t3i5(1p%USp1%H-m2Kh#x4nBeaWgVzI8z*b
zO>FBPCzDdrqOzLJ5=C9R+A+34k8jGM)oJKbvqn@0QPs)w3IZPyjCJ+=D!=v$TVJ&I
z@kq>!8JJ6eqp+*(XLWmcHcpXlj35ZVck-=GE?Y}?c&{|~V(aCSafBVo&r|PN&Y}da
zX4q)Z$9BwQW)FgqD_~^$`qr{(kXqS^=Se)m<uF@-K9wV#vcq#8nTW01_e`W^$E_@o
z&wp_wfc(q`22UgDSxTgtR!Gj89X(20EK_e|hGk>;Rh>Rt%{9FF?Br~8E!<RXr?s5G
z-cOd0<{+)NZ}`-@W}gzt<^8H{y&h*JvCd8h=~CsO(z`EQi+NeDp+O35%Lw`kp{d--
zs%?tdLNsmn&vofjsVNJw1u`&In?3&koi-w4!lXrxag2<d^);H6nX8GKnnGRN2bs1i
zz5!-D@!GX5bTPBaw}>Ew85r&9+oeenou)DegUnnQVB4GzQ}0)lFq6)?h@5~QX~!PF
zN>i;Rq8ur%rFPR=NZFOp7mwtThIa~^N|glPVwMGI6yT<Dk?T{*X$`(!-q?oDaHp~4
z;8brDT}Kuo+agF<G3|=xb8=Q}+A&LF)S5H6lKR#nL0_G_40ITw^w=$}yxGYv-!i;y
zfTy^}dTpii!vo69M7bnHgRM+dhDMO=Vw;zF$Qkd7j%HnvS!29KbYv`tktQ$&HD5D_
zMg(oaDsxlHp~)_ABpj6BXVeOgQ!L=ZtrTHXCSbglq}Z&>maGh$WO&Oc2h7`mNB2ml
z3%1#`T|^Q`-5;0Sk9w_TGQP!mgRxwBoiXf1YH7=+*~w`g!bDdjt1tJDUMn{4%_3Dv
zA{MNx2>{4jX&mI9YPHTmbWfNOhjKHIYT2I7*u1S3>`0+^D!xYio^f2>ul|cEGnXPS
zpXBKNf}xH~j`G^(G4_w#wg?Ccec!Lvt2zDSfhvH6ZzVqNX<~%8nIZEDxQt<Uebetz
zrPZ~?$CEnA9{2LH>-VwzKzeX`^`x$hv?h%uo?o-9%HjClnHZ;_ka=qzxsdMLka<&%
zwH@3Swq=Ae!f<isD*UXyvEMY7)0>HR7{)_^ob~mkxE5veMptnUkD0dr07^|Vb8V?6
zr7R)LXXjqW-`b^_FYTgh%P=HN6%qlToBOp4Ho;*JD;6kD_|)^B{89^|#oS6`H!+My
zE0Q?j1y*>OZe(jINR!K4mTZiA8oyzCDYktvnidY5qXcn}tz~K#{{UdTXkJM7f;k;O
z{Zw5A(W9qoaq04IwOGufscuvb{Cd<HzOg9{G>y4NO8kSLQT_(8{@)>qk={94LPI2D
z80V<^(o3kkL0a})pukw%VB`AIyB9LC4b{Y|-hY;SvVKw*q4%odRfNX)1w70)7onuo
z<1)&E((XoqPUb>BVaGp(K{V3ow+S<t-YEzrk01|W>q4=VrDD~k<=w=R$!TP6Jin8A
z0l?4QZ>39jq)l$E71pZ?qb})jo$-U%d)8&wi=ed+X`{rVGoLx)Jdl5_Qq`~SZzfob
zj{=xfw4mfjzQ?X=t#db0D`L&mwz_rMXPlR4z;t&cupKHWd{;H0bcH5)4jX701MsX^
zZQ)5omsb+HzY=a@NEEhrLrezrx!vXjgl9Mcs>Uv)n<mt?JyTqlJJ>G%a^z$DK9s?t
zv>U$PaLS!ow-KK~#aq8!PU<5xT5&}YhLzL|4Ep1}Qj*H{WlNdo+JN*2uecN|klwnN
zBfPY-K&Vjf`FG5CMfLj9MXg`zGRJ47n874~nETzTou}9$a<}pXMZtELklggGJ8gOa
zAV@qkQbz<sG*|&gVod;@%GUaA@L6UzTV+r|1f1^APo+h1VGIl{V`Z7JB;JlnhVBh$
z+S?nuK_=tB%sFpEnvM?#z5Va{B$x=>oDxCL_*C63%jIuk?vr6_EHXXxGJxs=6c_=s
z*0pTRw(>@;Zxq`}B_1#sk3(6p+w0JgZ+z<s$I7I1^dhxon!+U}YsFiE9$V+-@!fu&
zm5iHg=!8;3E|$i1-!Tz}a!RoIx>kj~zuE#vZxI<>1CAHp+}2Zgg5OEI`_Wu%T$PY>
zli25=s+ayY@dmEq7;Q=c$y82NeZ6Zp88X!1j-?=i&fSF4s+Krx^&{8mSh}x?Ep4O;
z75d15_e{X!k4)8TO+Q(9OKVcJkz;g!Hqw2LD#!LT02uzqx$(HHm^o8WxmM*jDJ=|v
zs@!T<1`Al+4>NPI`^9}TTUs`Z>2Weia<e8fHWS8qsBG;-F0erZ1!*>;U}aA|Po;0#
z+1pxy1PEE5g4z3~l%%=}5pQvtXNT;yVu|G}ZlHqF4qu)D^{F7yWs3Rj<y8^!wHa_w
z_suP&^FXsa&~0S|L|F1quhOnH{kPfLX9igc035azPp`dV<s+d&11=@Dx3Musibm`^
z1M{!at6W6}=5&S1;B$`twDr4t-Lk=nj{Tsh7#~_o$n`6Eg|z5XE0*~`k*QZqG_e~C
zXy7S<A#NCk=}`%H&9`y;p%swhr+m~U?j0K9OHHW93OW@a_0Od?C9(|ucBHbx-zkb5
z?nyeF`U<iev2mQqZW)ULOAV|JRE{|nXHS65D#FKOpSoD^YbN7dwzDPDZOU-5xH&%f
z`cOPirz*4-u(^G_o&NxI(P!8><J{1^^HyOS%oHd&haCNCyU(y05N=ffF&$UxDx{jU
zcWD@bOG^sj<a6_4qLSh~7nq1hIC4qB2fYd`mo!?x^AZHPN!OEyQ|bOR#?_3a5u{fE
zumX%6dQ}m0Wr>#F<9Y&q=O-h$r7?Y}V7t1F23+k5a9574inNgqMVK|au{4mRM1#OC
zGI5@S{{UKrUg|qpF0S(mv*AMyhp?tgdu^w*&SQCFg+nxodV5q}A@LMCu9X#?v_5La
z*~rFs9^XMtC(ur6+OU>gK1n>Qn`xDTor)yEX8b!;H!@sYTX{D7H>b=o{Hs3V>Stvz
zmyS?!ByNEB#a6tO+}r)0#yz{31(m_b{_!65qK>8xWV3l!H&HxH(JvxianIq}iDodT
z$oXJ%kAG@{8C}($XtwP*P<pu?YSq+WSjl<_NZ?RaB<fi4!S7Z=5*x5(jZzbk`=p76
zbL){ytLp~tZ?;VvDRJejYQJ!S)Z@~brd!`bafz+id7yu-;koV&Tum}4(AtTZ#@SuV
z)k*#%np!41I~lga%PN!b?~t-*f<5Zw8h*w5RlS*F`B5e~BmDQPDRrhTiZ#S=yy*KQ
zeBeGih4=TWGwavMDf=V`5Xc&B>&MV~Q`PJ(5oTX5$M;@(ZX*!KCv5j7n`Poi=09MW
z<BivYA>k9>)RS4PCe&`*QMponbMm8bwQk=*TaB|eog)=|mi`v{idIW-O}C+CwJ9zx
z0$Ri;0ON2t9^_PwWvQYKL8XmBAS^|@RQhI$khrt9fU_g{lQSG(e{_0%Dr-n|<2=iK
zVI!E+Fh>-aT$B7>)tiz}Lq!*2g{GfrBFMK>ypo3{aHj-%6X+_`7Lu&03P#Et22ws!
zJvpgb!^oLtisihp!OStY-s{0Wl;vwHq*FSuNao!h<JG?kmnO?mNQ&xtyssrRr+i3C
zvZ%+>rM9+~+sY;r6w)~|K5|F*dH$8rX~y;|#k8@tjz^mU;pIVy$6BGQ>NXL5qwH=(
zsz?K_&wNzg=z0|=j%S%qnjj#2&J!3N$OFA)+}PMheIlw2vbIR{<Eiwh<nfwAwh01G
ztMeHT-eKufS6h3#lXDIuQsnHBbNC->r3oS>I2$1#;Y^VhDf_f=er#4=sS<sSE}_3!
z9LU4S83bd#Kdo1}zK~mQo_~=EIUjg_G|6q?xdLr2;1d4;#VZm^dk(^>CY{XXB_(8M
zM|Z17aV`RsIQdAy`c<};ZA#e9az~qus~&NTbj?i`n&N%#rMVly?~b(Dv?)?HFfQhi
zfp0O0+B*LLky^Hyk1T*`4{K`;)wn~3CRmVUkAF(1J4+qGHs~S*^BeMi55~20=q|3A
zt*rwUM#PRs-aWwftqZRUCG138{{XBCHb|eL2A48hm+aeG7!gA3OGy?^eq?@fz4)d-
zhoX5J?j=a^$sIH8U1hI?WYjFhtlN_0sZTLDJ9`oDRPMCnr8`^Q$f)Q(>twJ|{6{_N
zeWH60*>@;fLpGj?J6Q!Tr5}2X5!3@$EiG)~mOH5}@W|ViC2y5m)~TIl7tC)uynesk
zs+YbY`y-oVi_BrpQ;<~A%P9hIfzro4yB&fRjwYKdM;xBKj+EQIPfYOi(kGB5j~^!T
zGw;v!t}0D(>REw?1GzEtvBEdEy+eC-dw7OBxL;}IhxDcFwbV|!wus+PAKO{T>GokJ
z)0R9OdVUoR_lxJ$n-Vwxu2nOPRt>GUmoc^pgR~rHClvczD~Rrllf&i~IKqr%de!?l
z8GBlcv2@IL%qC}YxB^0O2em<`T`!up(!xm2<x|fmsTFeHONRB_PaK~h&fWYULB($9
zniafqM<g~aBSyQnIN?vNOs5zj#+;`snb1u&y^QfLe|UDtfpB(%kWFXYwa@O<pvyVv
zI&t2+CWPNeBbMGYDuG>9KsfD+tlkEaR!L$)q_G)piamYvSt_yWZ7MRhh7F*)go6}_
z%0BoCaDA&@&ihoowR>6Zf*s#3PeuOlr!JfJ0J2=jrcL`m1La^k;<tP=aix@Kt}RiW
zNFld-{{Sy)nbcgjNV;_8dtAnoN{(O>RE&kdR$;;a01DRAd_Q-mxLei<8?a<%UIP6)
z)u`+xyt<Y+{HF^b5rj?~J*wT@TCKc+=9Lt>;fP#;{sOR-Ni}3|7)B<Ymx(n`3?lhg
z(HnM;d=0Q2!2bXepVJkEF0Xxge)_7i#v78wa07py)eoC%ZFVHKwUj$yNVsf=Aacs5
zqUR&u8KjbAwO=OUO`%(M*B#A5RxPsHU)-3nGON2}x@`U*TF#c*IHY+VM|P2L*yuUW
z6?!|hxAPJO4J5IE3y^W&imH&`>Q^Bd85PL~fC&EpXjLL5sFK=8XkiO*pEurIA5NcI
zvmKPOI4GbuXu<1OEc`F26^%7Jl|^xl=0BeujXP9Z4JzN~ofxp%m^eF!f5*~}Wb_1z
zGuqzGZzOkGN%B-=J0RTW&>w1>PK9k?Z?+O7+004zm!3ZwhD~VM&ah8-jUEH-Cj=hi
zvhO@X^W3$ajpR|FT#{EMN%yKzV&;l8HU9t+%V}(6Eb3e3UOsL;aaob;t#iJ4W_Z*L
z&l~bwdIQ><adQRy5zMpiSjN^X&pxK9O#@Cmx4BS?Lr1h=vHs~bqKZaxlewX(-P+v`
zuvuRi!HaS>dCocK+Or0(k^+dE&Tud=4k@2wKv<=Wo3of^XTS~Lk4j7XOM`9$-b65S
z9>LMOinNj;$&H@nZa2v-*@+h&7=nKhQ$cfc2GxZKRL{;i{{Vp>TBNq&XO9D`jEDXq
zj+Hbh9i)w<Cyedr80YTO(3Nu5({hqactfAOUOoc<0G~>6nka!$8g3*j7IE_X`&2gf
zAiKjZ3rE&C_}l(9Z7otuu(QO6VkuyK53NJcwW=0zCdl6EWb()QuP@~+M{0)LT|{M+
zshF?Ljkzj4>hnQwrx!ccOvXw{CsiJUJx}=7Jboi<9YH37ZGi?vOgiV*rYXx{Z7t0J
z_OrqkX%wp=ZNa!8jtC;PEK^aE<{d)bXgsS}^6{eKj~K}n%1z=VoA>U!7oETX$*m1C
zeOB}(#kIQ!G2&EJ`{+7;6r~21ql}SnQoccJCB@uwM29N!nJ_b+Hv86G-Ygc<c^0HR
zvB&fLytOW)rd`~~%Y7^PFveU!SHF6a&cni1*1$o1i`E`%yu{}R_;HQ^qADqBCgk3Q
zXYpT&<*^o!#Fp_*%!kSaqywVv>?(aP!{T*1j-z_sNW(R{NOBwNRfe-6kjtWftc-#%
zfs}gj?@aTxYpakVh15)bY!0Ws2Wo9;WuTK+yE<6(i#vG{EU$=Axboy;c|X>*wBHI@
z!6er=w~?_33i)9Cwa?gS{vxu7Nqr9VVTJP-7;4?Nvb%;9XVjw04sHJci`}v4E0$hP
z=IM=lm(y<IcZi1*XL_yxUc#<i-N)jHt|E=5P!zA2IP!f>R=<it4q>{EW<}ha4tM)j
zSdx9$H%56uI0Yj(R0I3orlmsVDVE<&7Iwnj=2wZ=K2CVu{p|bq6v*UD*UV6a2-{r0
zAa*8$YY~bOdnt6z@D<2r80l5NwlwW5i0t=a%PtQkG3!kx_7iJz<eGGLC}g^xBk~Yk
z0SwF34r!Wo=AAv@N4iB+0LonBX!afJ16%Q?p??}#LWp)LWy*kD`e(IZ-0C;dux~5K
z=jLbRsjcBfwW);bsK0dWwf_JT+-b8sdQF0&D9N}C2^s12tUGTN>UPq{aTK4tE_~@(
z0cRi5vOl!m`dKEql1X-`QUSmpg#zj2Mg89^)<QV;2DgnUC1#8zT1}k<ek#1xWN|&m
zm-7!YMjR^o9CaqDYtdLr9R=14kGjXF*0IQ0;*vYC>RTajamIbBR%s$Z8I&^lV1h|3
zSKl>CoKw0X&B<y)zhk%Bu*;CVGUM)wux~WiN0HH*W*bqrec!^eA6k}Kyo+dj&Ni07
z`G#q;+Dh)*$pEOy$42x3!azO0HMb@AGUwMrO|RiXRitT`7)`B>r`P`gtx*2}Zt6vh
zPc}$g24kK*DqR~#lHiMT14xX7I|jzj_J^<1l5HNxNdU<*lBXXr=brrasrMADRi@Ei
zAvA<c#gsox`h6<YHn2zK0tW5m{H@CS{c8QZ63JwcB4EoQ0ZQ`g?0qUZv^eCtjji3b
zB%t%u@zB)sqSP5w_?0bDq_MRmu0TxWDelIjS+#rV<DO^&BMgUOkl*25c88+qHUQk*
z+AO1PNRPSns(Ocr{5NanHKvwOGZkrigy*ouW~wIak)x#2yJtLf4MZupxwt}-F;oCy
zSo<2g3DWenlG^nabpQZ&;4A+Cg-3EVZE{~C+ReZRd`?c#Q1``Kv-oW@s!t)2(;Kqc
z$GP{XDMr?lB~z9C)LtJDCV?DU*v7-j2(RUW2jD6RJb8bpMYS45P~W>^xEsB((zf)^
z2}5TS+%B9sj0JGtDL$Ol-7873vqhKeie`BjCA@$T$J7eubtuK`bjFoeyEz!6)b93+
zyLXY@%CznGNF#+f>FjGu!@dgB?qvynr^#>i$`8zdbBy|$>Bf&~ad4vQ<XbmVp?V)f
z#X}&9)jZhaWmaMpj|IKG>LrMiR$3ZHf==viv8L#nL}qIZ75R(za<hT7@$$Fyr+u$k
zYZbM;E0$b_jywkAfXA*Xdk7(&{F{QsU+(#h*ZqQOE0p^gV=vxcy1CAMtDVX9H|0xW
zCAITP!5l#IlInnRM^9iWvsl`^@xgZq01w>k`F>&C)TYB!SB_u<Apn()a5?_9Vi@DP
z%G|TYsxZ&DJbL{pa|bDr4xTP$OXawc(6LAI#yqk(#w(}N?W`?TlJW&2IEjm6aHRF)
z)c%!L^3pvb6t@gqf6F<PXLd$$ROZwrCMdkI5g9EQ9Q{e9tdMCEO=?t`W0Ox=9in0c
zDtKXznCNPxFDiMLz?kJDV<0DUk3c$Rq!w&}1<RH(9nr{64&&5u?NMD@0>VfpC<AiG
zsP(E!+7j6X%=68uOty)HjuHEkc@BO3Y1W<%T~}=LOgz%RyiLa`{{YseE&Y@tEjrR%
zByus6a`M^ajP=fG_gA-9Fd5S6W7xP*R|I=;*0f4XVm;obj2;>`E-&t<5JPOFMQB?B
zS2)T1YUCFdmT)|d3%d+#D}X!T*DnsMtKQoAlG}%o4ilcErcGOlU21E<9rJG(0^L$P
zK1k#q&CYQ{rzf~6rLh*FuO^)dw$tKdo_9Ika=GoAjl5m0-AZn>w8lV+RdmMEzum`9
zd)2S_MdH1Od-<X5*tD#tJ4b)1to=h%w}u&Q?d-@B0I@h>h|hLETGBC#(#CRZlIz4;
zyO>i^ff7K(#OMc@s(-!fif){Xdv!3@E@2If+sph7>Nfo=FbN()ks!+S4&Q&!ZtN;(
zt^C3-e&7DA5+eiVTy+N>Yi>mpXUy9#%=%@p*=cZ9fyra{NdEvmsbz%Q+b!OmZtSK)
zTsv^XzC8t2w6N3G6?c+PC<61y*(48YpI6s$X&t<9JK2`o)9&%qpL&a3j_EB-%lZ7d
z&C?cO!ya>Uv}32?RZg!Z#>vbjmm5&8-N5cgtw*R&G?xrV&V+ywF`vX!Vq17T%Vo+m
zV|zq<gU;doYoSG0#!`1IL2s#FO6w6tL|wsv``+HviKA+*E)x-$oM7(Ylj~5~YgV>5
zW)wo(m^aHO82A4G3YPNy8g!oSJjak@hBn)g>qAcBx(laicP!23DZ+e%ufA%&>zHR~
zV;eUCxw{qgs{zN_cLHOLzVIWU^%V+41i$Fuv`jZM$<$L?ZceO@d)Z@R(Jz$|11frt
ztvcIWv1@_-p>PiwNmGtJG5n2Ky72AY&XXjC%5KgXlQ{f6Dx&yaTYHslML=a3E(R3w
z(;l>QL9M~5r?F(}GbD<TM0}SYD2={wJxx@z(e>?C?S-ge8s~czB(LXNajuhL7BvZ3
zWI!B&+;&oFmtHe>A}uN<K&LEY1Lot`wNEs@$}Z7b$l1{R3#nh*d2y<FWd8PDm>{3&
z?OQkA6NgEaW1i|3W{4?-=dL=}4Hv|(5?e-#G{ehR#@)Yld*{}yH^hsJ$2PHAJDwZu
z2Luu9E1p!VN?V%3r6jgJ6efwHIlQ=@66%1TmkRuS)9F>Oz9rjOS?{ycHzvZqX3%l{
zYlydPW5mUy*z0b<1_b=Uy~T7oM~5Z0Q}&o08vvs+<TCnuS2XF<hO>7!grzTq7+xgt
zUyFP|i)_*EwnpC!aHiHd9nX4pnc!_w{Tc6Mb(mzV4CJokj=1Sv)EYjQ70|tVKxJ?P
zAm9;>-koXJdeR6C-)BpBp~^A9;~n$sN#Zo+f+<nEyqRM`_+O!=tXDdgtgX36m?O^M
z*ykRc)Ae{fC!)mG>HGOtmWXsC-mvfW=ChORbIT+~;WHGwju;+=YcAhQhVo{gQ`9Fa
ztBEBN5ww3(Sg1}~$(vn8S}41!{79DFhM8+_Rum%`k0i1F9Ez)ZscPEEWp<V$9y2p9
z1mmFf;<hx;59wpbTN#pBdVo0#^(U$KsIT=c4$k3YON1_@{_OQ9zG|Z?aenG0sXf_^
zABOIA3z(92b#*(SJGgLbX6wUREw!_0mh2Hq{NFJx8=kz?Yh7&pv4y-Z=Hoe3+_>yL
zsq#;EFUfNnhHijxaq4}k&U2I8BNT^RHHD~(-U!4(KadbQoOk!F2!c&wL{e=hm%-#8
z=~$A-G_3Q%aAgr7GD?Gk>^=KbO>rqh6qCsk$eF`%KA&1#oWadzS=78!C9F}|{gs_w
zY&)X@ao8Gy0ew7gcY1<2_YtuD><XqXqE|<P+_(Ve`sSH&HI}AQ-LAe@!%4Bq?)o0x
zD_GL8o2bW0sK;-2<wB51mmmgtmoI_H13fX#MRU643{kr=Qd=c(7<L&Rm6>t&dkfF9
zM1}mZkbK<jW6lXZc&hE<d1BivQ?jJlSkVC6?~&<Uai;B|&gw3voy_wyMQwdAm$|-o
zjPO7mG1{~4_1m#GnLI_6ID{1doKyzqQN6dvm%t6WU^*Y^Nj1A%+X)2za<){ExWWE{
zwTwA;GjqPhIWCOXGG8UTZ*!f9co^zyK`&PB!)KnQByGy2v63;7$3au*_7)KDGv7vq
zhQ)Eo&!MTVwCh`Ve#xd=WROg+w}#Ji=|hxnVJOPiG0R)TWs=Dc&&#HIH?>U_lNn@|
z5L#V;gS&Sg!mnFtt#K~-7kN>;Z%mIsYFISgR7ehoW@Ky<?&CgK&+Ag=fkE8AbET!^
zaKUXE4=iA}n&al<llW62y71qH?DK0cnQ+ql$oboz_#MBMMGl#&T`O8&0}A<@{>s05
z8UFXF{HiSz!m~%HwD(XlGd~et9N|goe+tU+OIB-VeG!{~;tvyRE_Ar8<c(TQ%H&`m
z^(1wuKj8+~^{awS*a|*bOQ{$KxE1NX8q&NuV{px>C!7$1xNny}+*XdMX{D8Rw22Ey
zpTWQb-m!S62WX=Htfal>a^3;>E27&hlWP}oNX9|b^S9Es^*uwuz7}B~pQbFuUuN|j
z2J|ALYdCGKzRMHL36pzHNgy7;RZE=))@7RJ@k^79zdi@$-nrdL)Son&vZn|}(L@&7
zwzcAYLE<q8EkFn6j|B78Yg79KNn<pR<~GoH3_|1I)YSy>7M-Eo$91e*Nh(b@l^Q^!
zG2n8?+lo&U{A2L`g%aA^MAFM5mRRE(l}PU2)~Ujzq?AyU;S}7NZcQ4_Ye=;_#8!$v
z5VHN}9jZ&ujJBQ@2HwgU9rl2dTc{zQj4nG5@UJ_$@xO|^T`X4R;%Np%1s7yd6Zf1i
zb|7QFwRD~c_+4e9Z`O6&(=FNp=#jBIbM@==ttUnl<9e^;L~71b{n;L~<NpAN-Zyz5
zwSs9r(hoAnk0=iR0OyK4E8vZK>r#(UzqktUu+Hq`KBL#@Yr2lqBrz?5kV5BZUU}>F
zsjcIV)W>HqWk!5*IybMib4wPZ2N)|I5yQDlnr`K&ygLKLt#x|}$m{cOQn~gR?^N$B
zp|OO^3=9DUSOb&zdezG--6-5i=SjTata0z;AMaCM;yH^VNrFD>70(sN%`2UWBvxBS
z5^lV-HtcY|V}O24a84>mi~BjJF+6Ig3<576{C3S-T`KlyWtKZ)cQ4LY_>W;jXt&pL
z!(z61XF<J*`FZSpDLD?sBdQ2wX)Pi`%z#P1l5x`qu=cFkCDX1hiTgW#^lc9urE*7J
z2Yl6kAG976jK`?ogqzIUv^D~sxy^GB_{L#&v*;}wgkZ8H$;VDuAA0MhMb0-zHA=}l
z9gU8s6mT_^cPk{rB4}NU7E{ps3WcJwg}%=e;#oj0ZJg!X{{XF6IyAm0pHmvNmM)`t
zRw)laGt_!ww_ion^&57Y_GF1RoXVi975etYIVDa>8OHKgH}oa&yEUDTp=h?=aA72I
zAC*os$*BBGs_9l1>l_Jys!+)rVI>*p-rQFod*kg3!P5T#WLjKJb8)n7ZNTzRa(fTy
zTui!#z2cDYw){&gnB%r$6q0#jJu6ChX-(c*Af6^MR*tOgwSOPlTQeJeQKR95cl7oZ
zfq(I8^7&%Z?csT2EJjq|t9ldZS=QbQ)PpI$oJyo%tFPT$bjS6sk4w;O^!qehOLZ=w
z?MF~>amcQ<3_Ue{&TH1F`xJaV;qMiA!toOA8U!N~$sybd`f=W`-uxA}vvj|^hC(yt
z#T;%&mOcKp)%bQftnFih(k3#3e89cI{(`OEO)b2Fd&VA8aWm&970&S!=J!sB(1$O)
zU|9H9?28xJEyw|tCEPMX<L?USH083hxbo+QHV~iP796jxb69$}#Qy*a+1)0YZz+;3
zm@>s6+&z!2Vc%X&tLZYWwD&5_^4qhYo=%+c{LiIJg-Jhnu6l4*iPr1>D)5$xAhw!I
zcwvt+Fb53m-AMGVYX1P@4BC~{8W)Fj_1xr*(Xjjv_043(@Y3!{Us2Y4@wI<>6#V7A
z25Vo!o*IKlxcfwQN)h7)q?3bz*=eX#gl~JZK6;aO*%x%JHtfmvjX@3MvaZyMFO?#0
z=N`4GWhjPEBKFL`@Vsh&)%%}HMmG{f%?x8{A1=}NPobwz1%zKC#d9>9K$)X#D*9%y
zZszG(SY(#)%_PxB1Cqc6k2yPib62i($n7*8vFXzhB#gUP7z>Vb{xsb-Yh60ZNgm{R
z%=jgTPp9}(uDnO~xEjrFKx5Pak@$~K=Tomi-5B;dWEXmo8kt#QSi+~7(;vyP#az_l
z(u)Y~?a6r0?|xtlr(g$frDa^{+ODB+JgHR4D;AGvAQC-2D$bFjYWMzcny(^)51gZE
z&rA&V;;pu|xi&@LwLxuU*7{1x8uBLG-!h->=CQ6XHCz7xGS5ebLc2(1+w!CLC+S+Z
zzD=~gLqjW0oH=eXK9yPZfcB(mqz^f^vV+b6>Nw|`sJ%8NqK(F%eRFCP#Me<yU<<nD
z2+9Ds>5im|ZKs4Z@3cuByhT=cfQoiIl#aC9o3*={F6^#1v}B~{5P*bn$US-dDPz>`
zG`neI)2|X%BR@2MDlzMTdRF$6Mo*P9df!6Qw4oNIs7&awC}lao&1UO=8ayqdIWStw
zGP8Wk2i+sRa{7cmHSrX}6uV}Jl3FGpXB^`{%DKC*4%z6J0u4gpjDL7B&RCvE=C-GW
zr!S4%%5~)rg&V#g_<`d802}I!W2TYhN(a~m+%R89BfTj2dp(VWI;OiUVs&!O6e@83
zg!*yTvb2laogOsRhMyx^qv4p~W7vA}RxNMu{7*Vt3%4bmhJ4e?6Tl>N$E|d@IB5+L
zikCCIwPws3ZMshsTD9UJcH0zcn{l3*9V?pG{9Z{Kew}9KD`#Y4k#i$=IUNOGwD5kl
zs9iOc?c2=Jp&~NJbgSu}*d6Psu+n@Z;awLta7}S|QxQQb@4)U`j1R3(JZbLkS0tvi
zRy^}f(fm<-fWxIrZ4twVnNHRR{PnH3_+sz&hK~3MW42i#Nf5W%+@G08KPUq{`r^9y
zE^fR-C9RgCflACA6u?|#8%{b8YPsS?lvs-k2`%v(7Tn_*Z$XaU)ts?Y=CVb{4I655
zJ|6HboN>U0)mGtIr3$Z<3Ft@h8tSymdw5^$a!dQ*H*8hoY5rB7@dmh8dv;l70bIt|
zMB}Lb?OL@|yJ&1|qnXP|<;dakcH^(ov8gFk+}03`HaBd%LnW+>rcPE!Ir1Ij0F3_t
z4;@JCYPH?9uwv6qvLXrE%Z_Ub=Uue4x1Pwd{^;&WCX=e?ou|83GkxQEPNNc8Sx+*#
z8yZK-{c%~-!^yo6<x(qit-7?nKyEFiNm@`+HbKJUr{hGn`aQC5*DWTLtb3Ud;DQGu
z70=svp~QyYQbvRU_lE&V>PNjz2DkmSe+ZuSJhYE=aGn_Bjl}o-Yh_MJne!os#P%<&
zM2nQNLAj@3LPOW7?%&F<Xpw2pwI#Tg<IR-3G6`_AWc}QB6&=;BtjtZ!ZzNKDutJN>
zWc6;G{{V$whfOmTx8D-W5}csnut!npRP6R8a~qd&_)5!8OFK>9+IzPc<Zx35kh$z@
zJ`1}8F}%2+Z<Kc|Y0g`rA3<3cHd+`E&3kr2#>I9dtPj3TM`?AV>Fn_)rjP>QTO`a+
zntJk2N`*}_x!JRIe{A<`)~d2a78`oE%DEl=>J49Ao?kK>Wj4~w7!h15f>+$uUG2jZ
z6WB!TFhhXD8@(I-pL(sQS!(wn%|4ws*$NVu8?ph<C)X6!IH7a1Mf`KI7f-fB_K5OW
zvg9{xn#hmB`nQQLT77!@M*=cXd52&m^!&e-UxH6A%`R4G<cZ{E9$a~8G21n#rrBv0
zDEIo#pwV4OfW>HKAqxFF9CfCWhNu<gxrM0s2T#-QzR+GPyJU?s8tzscavME)?^#mX
zneP>JZ7xCOIWV{YlEXPZzPL53;;nB@wYyc0X-HGPMBkG)950~9r9zt9-&-ZTT5PK5
z42Y-zat~%cm8>N+uFPc^w`66ekFQ?K_G_q2OCttZLi3)v_N|R4LAFWO>+Fn5{q-^&
zdS@S6)rU>Lxg*Qd!Emb0GrtU{sN%Hav!2Ft4Xkmq1sxZTm7MFnk)$ZC*=J3&@Xn8F
ze#|4gic}5eB%72u8OS}pl;d}0DuuU$0dR90a8G*7WxA975+;s091|icVmzOI#-vRe
z#>t3^=1JY7!vt~_Pf{^l)@_|!$txO#qed*CWD&U-bBuMVVY9Un8*}rvGQ)AogXn#0
zKTEp%bYbnA%yuPQbz%YZ^c8FED;p$ezFdxW#*W$C-oHv6&?_^d(Z-cwr3-6_SzI{?
z%6?LR+C6H8&bcU;?2yH{9FjJVm)|v)CEUp*sU(C#W5lklf;~w3RY|VZEX}oq``E{X
z+;h9rG$h{Rb4h4k7wGZsj&I!-JP>i7{8M0p2fP<@OpIc~BBp;Ds+S2R$`3qAC<-59
zZBW?f3)p>X!s)k{F^9O7<7Ah5`9qdpL+wqZkvDA9)K^J+NTz8cRSojQ4%7~PduFKW
zGs<qHj#Uy!#Z0#wFr;GvLiSPH6q;?l<@6KAu@AHEBIY*$;d|%Mnx&{l?IW;>%uz1p
zec9YQ1MTffD(t5%3-Pu2l`SEk%S`0VMpc0ycaEQ0){Z+^G?go8h$C`yBjt(iLG-R(
z&%`(K#~`(eJS1cIcn3bct20y8^?TbVm8_pE`&`EO*uJ>#eT6qgwokRPH|Oysjij!{
z&<BrU1mxpAE0nqTi6M-AhTc~K<iv_bGJSK{RV(ig-)a)bFLhOgRD<SV?%C=9?^iUh
z4%tO&(JZWOVk83GF+JP!?OVp3I4yNKrBbZkg*mP~L93{<k#Nq;f+%uN;hy!S55u@@
zbm-&1w2)4+dA?|n{m#n%zvt4m>~yzHJ=_r^sU<F$Z8464ea~Kh!kc+_tpN-Y6^MiT
zxg;45JCTp;N!09AY4v5z3rW)2KQ>t-Uoai1Ai>@3j@4(&w`^MKE~Yc`uu-&w?N#)N
z?6j75)^AqkXF_e7B;by?+g2M;H>n-cD+9AEn?Tw1tlYIXOG_ezS_)05M*4lDpCFK9
zX53^R+4SPA{e>;VT*)U0`Q?s5>C@7z+TF>emDCp1C&O_2uoK%I>oZu@bq#9quC49N
zIBmnt7zf(}wJvM0wT%mNrpX%IM4xE+_sWvD%5ZoePik^&w%T3fmzsrw%ItSYK2;lg
z1>*n@<xQ~CVjw;B%A!cPGhpq<rUgeXonbx97I$+-sX5skleqvtZhL2@eQHyU$7f=l
z``qhj7CXI)u35^q(myW#)z9jB1n&g1LG#Y!;oN1x{^<v&xB16cCYcKdwT{@v#C*^b
z^Dp~Z9qCrW+TZv0kR7p&!a&`<{cBiORQ4iNoX$f`@E!K0cF<q%Vl97n0t_mX{7!wV
zV$Z=A+EMcw1XWesX6y*;Yq5&MO_xbq>nqVB$k>uJ;zb^(+uown@9nIMT*Ge^qBq?s
zm~KG7PUO@}8B#-z8k|J%!%w8fws#j1%<_EUkq62;jE_puxV)0i&8`&{pLXWC>M`gA
zXIjr^Z>Oi(?V3mP7>7p2)F*%kwOgL<$4mfSTD+h(OhDslBd<LxmQR{jIuc13_d2Gj
zsoPvj9m7PDMq?0@-#u7UV3PVPOFy@2=-ykh!i<Cy{`b??pQv5iE~DhyTMYSOjHK}S
z?T+=4s6(jT+#^eHs}4@~Rl$jI)K-v+W^$C4$6W`AY}I5ETF-Fnfbv>C)qrQKFM6B%
zXHdMcbW#-&j$~EA0Q4ictX~M}H<s!?$vX(<09;K!JE8}-t!~@Fz5zYf7{<o|7q)od
zb*v{Eac0qTmgimJ8SL-WX?8BmV~u>jH0}iV>sEE23+pCBaV!BMRt+W0X}ksX<E3-9
z7fWG$rD7st2K~Lgv0K)jG{0QMX)6RtGSPw5dLPG{<df9W&N`!>y^hY$OS(3OSyggg
zOzqpxuWHPjR=ScoT@lJ8W5{rM&vWz@(O+u~f2e(`C`^u2?~Ne^Nbiy9Sobz99Kz`l
zKzG30I336X)|7nBQ*9a7mv3sTBV8+_V1O6yoOeCz4^p|hzL34-%eMu7RoXFK71om;
zsIf<OjT|c>Wh!t~`{Js{Zjd-e3h}m1!n_~E*JTQn;JnUyu$-BNai!hfX^xiG-eR&H
zj~fByd!KKmYNnGl#jHlyCiFq`0!S=7{c8MI7B)8m={$rn+U_yQ$!}~^rZGsVJ)^3x
zmLz6=m^}deY1G8Gq6kn+RxsJy!rN63&CHv-k~(9iD#Rk<NFU6NmQtQr1P!4_M#U|j
zp06pA;xPVL5=N!Ji~KR#opS38@?6->=b1wM;A9MS81x3Q=5jRUQAM~fA`H?tLVy4V
zwmoT)>NX#00xu89Wn;K9NH(eLYc6}M%efXv_6Spxv~}!3sr0LzDmDb(NKssqyTAVc
zTAv_$L!-64w3gg~3hzv_up^V{ip<nk%t0`p36f-yTm4!0s&Q-6A}!onTSkc?5y%)|
zws_4fZ1c=z+^hj2c${D`JfCWDk1M#`)Rl;%veeDdS?$b<R1y^iRG;Gi0P9uZrOi2M
zf3#tRqlkHG$Vb{6`=pM8`P7<tiZlDLRj>px?j(<?t3vkSt~Oo49_aCuWB@QfPL)nf
zNg{;$YTHZp^;rXvwJjukZ}$hKJ!e=qA{gbCF_#e>Dlzt_$!)q>ft2M+y`z`N9;1pb
zqDUA^HL>4u9@w_9T#?Ts-?a(djp$3J`L~xQBH*A+?16sfJMm0bkz#on!Fdn*um%-#
z{Og{yyGfz)pthbV8e`@WCLgbCe=6A1b;x3y?aK&OjzIy2QNYLXAFW?3h;qJ#NZLqD
z&wFo$o?JSH{sGe;;aV1!Hn%a%`bsQ$Ih$*4AbR80s`!Z}vJEVetEfAb#CYc!#Yd&x
z%`Ra;o?}P5<ZLq!?&G~%i)fW3or}8b&o-9UwlWoyXj5*n=WzA*to<{>UOw@K#nq36
zygMcJ=v3YjL2$i_{zvjYm7{9XsYcXg*v%mFllpPqw){CRtEcPs`i_^b9VmxZH<30s
zFg-sUR633eLAdj3bJF-bTCuPfULv-8Y2|IdW120m30}D!vsv+KEo!mJc_KfM{7eu7
z*N@7*E8>TW^o?deGQn0`g27%P-_(MC8sKeow6(trYERkOvKn8U`Mt-m6;P`wM^brR
ziS)?sp)*~}D3m;*?e?!DJ#&uUmC<SbB97ME`!aiJ0=On2k;`{dKdookn|M^Un?~O*
zBq4bR>FZV=>@~bswlJ@ltij#JM40F?+ZBwa*|LJMYf`hbyO<<cVdbvq!TFOToYpL`
zh;EkF2_q#*W%GF`-_z??ouWvRI9GDY51vUN4E86jXG|ix0x2bp8<kfLfB^1IOgWny
zRz!BjNtWJt<zzl{mqr=L>59_Qe$N#0+ZmKgGJzMEGMlr|`f*WccY1e+?H<`;7dFlg
zOSjJ(laf^SAI_@Wc!I*xIVQHAIJ~6uH%fE7=bRjIQz~+k(G5;9S8VES^<6VbYiMt+
z1-y*Ki=&OseMhBnejxabd8kP|jdG44ki=1>CBV-F6I}ke;^mTY2bTV2%7TR-B1QHi
zrD4y19;Y<-TDZwY45ksca9+n9hp&3+ql1ifmghBGQ)<yJ-Rt*St@M`h+DJ<%Sf*6~
z=ep*!lH?sb`#qsh0+o=J`H1h6)K@*YvhTNMiZk<--I5R2`c$#%nv4+rwgA6-Y>F3g
zG50+6uFgY~ne`>rwJkY{!*pU0M<4E*PNx~*<ERyvW2yLp_I9{%^1v5r-9ns#I&t*r
z^r<a$p{?BgzF1DwB*hY*7qHK*c2-^=v$IjBTU>(hg=wHs^2E#m{K)DJIZZ+#7`ZZz
zm!g|p*IKp6xryQj$y7VB-y^xLojXa=XOU;Kks38@y1(6V>5Oq!;PCy(j&!q@HhBR3
z@nezx$of@n7Aa!7SnpfPn95aVBLRo7^{#hP>vMS1aeA8zr(5}q?F0F2N0O*GZ1v!D
z6(`#k!rpBr-I5<S?<x*|{dH<7Beswjr(n!5q>iJx$7-<JW}$oLGQhVx0AX??0|U_g
zE1kD<sU(hW%Hm5)=88*MS`Y>%UV!`8XQx}mByw2l<C};w<}~0hQBinfP_ofAB)GhS
zDP$a^BmxV2`&7F9`|7i-(Gu@5`FxSU9)lfzl)4RB89L^fWVgE@x@WiBhf>)5y()#g
zw?-J}dwBepk(MpVz{hjx^{dfYf5g(_-g}mm#EQgVoM)iTI@;SxluVk0?4=Xrh#nb<
z<37}e?6xxmS2hGqb$<kf=59iqDEw+kUi$u1YZQ(|Oc^Fc=W!o*H0#YeE0~k)cHrD5
zM6rj;`!bK`NZPf`HYs5Yk8A|v&6QLZLFzsDtsxF(L!Go4d*Ho4T+-y1Ou0L)pKS5Y
z#LBKf&IhQ^>s<Bc!<cn_KxkIVEz(I8J4)L?Z>Z^$*1nO_yl?Q+;-`o0Ve#gjq-lDF
zi3-Oau#yPwH3jDjE(gtlw1Q6ucLKbh;vTEvD?bpuzKdw$9(RUp?qGiSu8I|^CCh6Z
zwIHPKW$J$qbx#0aE{oy?c;zvHZmPkf869#sU`Kjq_RgU;forGU>po?Ul_UL!PPrwF
z9FWX|)a2my3_!pnR)xok{7tRtUS_jz<}9uwib9;CjsoY`70YTib`k1Q-`U+dyi68!
zagizhmC%%`Zb!n6eOtvdPY}M*Vj5b)#~GNPIZir&KyH7}TE*4;P`4KWe8;%BFz$6x
zgjes=pr+khtWf>4QMN)!A{Q@!t=t9g$K_QtEiYHs;kkPVSz)pvox+b^$GvKxw=tbb
zY+ms7t^M7YFwWV5yxX@j5*N`uNF8boLgEXF1h-J!86;BBNUU)n2cci(S&ykC7jGq%
z>pHpFDL_W`9Y^QhrnT|rso@zR)jTsOOW0A<O?e?%JiWt~AoK&Cdwpw58M&HJNjqrq
z>3VI%8y;Znc6{-v!QlFupIyA3Jx*N*OV_S0EoBH57;f6+e8o>u?mdUSO<}J1CgZ{L
zYC5Id>EcOF<QDPeE>1@G$6z@)9Qsxct#Kxsb1jOLn8p@p@9f`lxNr{m@z<{);Ev#8
zr7N+y*;?Z@-8CbZ$X!IFsKXGuG4rrK>GU7{YUVYFbt9=QwD5hR24S+=F}0y$Imtb%
za{I+vzlpU7r?<L}2(6-6Ze@}Hz=6i#M}J!0@a?yTF0YQKuKCiiA~aY|)@2>}AI`Ps
z<c_9Xyv*mVZBCtNUL`>@jghR0z#T_5cv(Orj_Ix0ZbD*DEw+aq!n$9xX#!iFQEo-G
zqF@Lvlt@U=E5QE%^;UGl$ZtPU3Q>+A3&6+!0IITe9J&|Ek<!S(?`F0Q8GXf513v!M
z9FXEoikOUnh0a(Cb>!s+(H0D+4geo2^~b$K3#2yU;R8D<VHj+k$FDxs_W7MT(#6Ux
z-1tgQnwn^Otc@>|7Nr`yMjXoMa;ct!{i>|8m`O=IxI;N{9?nY>$z$qz({A-4Zx}as
zw#He9mz|g+z6kC0sIOo)(2HF}0Rs^2hUP`@k58p=B#ja$AV)6@%e}{%&zw5rfr@3@
zokA&IL?T@N@w3YIA4-9Z#IredK2}#T7R#0O2Ad_zTuAaQxR0c13mmr{%}Z7thF{wv
zG-~9eg?NdW^O5OTnyX17NR!*;N^A!>{2TmhQfFJnc_T-5YzSnHzVi+?RyLz$c9$Px
zlF~+ujoB}TL)6nia{AOUN#+kVni8NN-jY;~+4ZhJUY-bMd#jaM6KEb-JfF|Cc3vTP
zq_%18Y|BF_F$G5G<M_WG^~Gy@t|z*d<f2B48n)bZ9fe$Eb<$R59LX~icGAWKkMl;U
zf(L9=QrX%^Il6=}Vx#7Bk_hfSD@$0G3%i(nyKgPa2=<l(am8odEuFo@YR`}`7`%k2
ze?#p~JDrJ@V=FvTz*cXZZF9RDhI3Y}L`f+zE2coohsgBCDxj7qohP`L%#(TY(jkEU
z$JkTWX161Bior&AD*e+`_8GP=rIqGObXcBfwg}xuIO~zxwQU-EsbFDbqD4@Our3DB
zI6wV*=WHei%d@nZWH~I}XwK~Q9-vm%i+a9jjsxYBfUd*t`)0W38!<JZyQdi1-EG{o
zG07=enob#)xftnN7Owye1ahA(00}BL&IW$zJxye3x4vS}sml+V@h;tpFi8go1J<-+
zxbrg$$Wh)rqY=XTWK}Iu$kwKeCOZ(OYh(BKMvQ*<ezcJjcG8l$Opp&vzTZJqh27P}
ztcx2eh=7(tqvsy0=xTLHCtofbS4fiqT1UwYM>)q{lvq|DE!xLpB9M{iIecZuJ*te6
zMBA1PMJ=RRLnvlqN&e{`^?Lrw-g%N1lPs*IBnKN#Jv-GqnGL~`@<mf3xkds$tU7%?
zX{|!TXCG^tON~N!;E5DvfY==Lz#hL^Na1-*kp%MKG5+zchDgU^d(jfWs}yd+S9zF9
z3E&)Ofle?j+-`1II&Q#JVhZ{n{<SbEn`?`;1ztx<oT!Zf8}a=rE2%!jt$96-%3L4{
zqE3YL2v)SGSeiC6UaUlXz?}T2ra0(otnplVuwCSDc?iU(D<T2aXelxcv3ar0G;<Rg
z?w&<_U}MswFul}DBt_gZ5RyS4bmUX!DKbs=duh<)FA^QhRCOaAeQ2IFn7mf^C^jHv
zeCKz!9q47DvLiHxOFMSlh`HmxaqUS3p+X{9T>)+thfi*4>jw01EHER7DtI1)9<&(b
zj!|xwlf2mosLj-#=RF6lMT$foT<aSZfy9R)!;T8)gH78aTe*M_Fyu!htGfre1N5op
zNW;tLOn&G>rHCcRzo)mgRhm{FUzq_=xd4JNO%^C|3v(*kPaq1d@|R2u5!6*@(%KgL
zT=$ml%GeRdyX8#q**#51EzHWhe3p?T`GF$?clUEnvbchFX(WbGGN3YUZ<MZj0qsSH
za#W7qF}`bbl$@0G2S0cY=9?rQPx{#1ow#Dn@<-nz)S9xlaNF3(Qq9`tY?!bC0ecae
zihO?d=gMv)1)>M;pYIItJN{H4xn4U7-X~!jDy!}i6&Y`*(x9G2c|n%%WKw@{V{SOl
z9eJxSF4lYKC2ZgzF`Tcz6qeD5tghg*y0tF<05mc<&+jwH$6!TL0<%bC4z~9zE>MAw
zo0H$3hN6ZTwxN`lKuJ^_9QQv@dbu)9h%Rm=hBQVpN*ORD!27>U(;<d8Z#8aIZX3{r
zJ4ii+I}36+)@x)iY1b)ijBsT!?<wDm{{Ru`O9$9&<nwK|fh+yiJAi(@`V;9+Z!pOW
zvD<<Xj$EEwu>7gMMyK|*h6IH&3&O1*B202mzB|wa6ERztxsBs_f`0B58vt&-F~t@a
zHi)ZrAVyixr<DCecT?%le)L9<bR%T}nR6|`QOHi6ezgkBT32OsQrOy{a6SH}nm|~Q
zr<r6)Bf^9qGY`Ay2dC1jUPRX*&E+V0BOw=V0NcTAe_F9`8r(6sM=P~4i3tKs9^dCQ
zI)so5cT)1lwc8mWbtfIDy@JFG9Hkl<*+R$wb_0eKfw)r%P|W*Za^*<=l%e2vGQz+*
zDGj-f!av4{Bbj3sl3KGwQz<7v`8@m4b_6n*qGef~REH!3#(4g8=@LanjV={LodI4>
zM@-Vl@<%C#XmEN2JxS)7Dm2UzFn1(-l(FSbIX_wxcN#-xXk>SaJ9!ayC~(iv{ePt^
z&MtEkF9CMBQULVDG8>3qNM?<`@%`GrM<cF%sqjHLiD3+{IdXO?^(5zyYIm_njTKva
z3uk;G5d~~+AoKJC)|S^!C^r?FR!~ez{Z)@qnw|ig*&_t9jLHLc&ri;$L;$as42Lb$
zzv=i<%<Ni34+C4<#GY!bk~4X5t7Vgp{*<V@Fd;@L%2m#CKs{-)CCRx+Z7kT_ugsI4
z6duDASzX-RA1-J-i-^fLG3_6`=cx1osWR*~6@T?ox`_Ee+c{kKG_k5QVl9Q`QbSIs
zjP@8cCEP`w#m?t%ECLkm{{Z!xd<Njb9mUMhn9=q}ZL<&V#QGmvcVn^x=L;g=DG|A6
zY;ZlX>s3UnaLXf3y?6>X`DfL?#;u~*`LYZ6qzV9SsV8IHdYY#`*zISY7=jmzB^Z6|
z9trdm@2Jw~7Y1dtmf|?bB0NUJgkTSUS`}lK>NUNDx`kHC@T@<=tT~Bnys7S8jIrm;
zD}dyVR4-xaRcC9Hcnhf8<tl_DX#8r^up-La-CjyHCEIEdzi^>GR>uU4REuV14#=^@
z?g=c!?ay)tsixR1yo%P!@4?>@X8iWmsf;qgBC4;O2;CHCt7oa=n$%@Eu5II0nq~zg
z8vsMJtB&W|ogA{pL^je1Hp#jo6P?}arOZioSSZ-!?h5CUX;x=>FsvI20)Q|<9ckSR
zxh2iCZ=1M|=a7<-jkzAQ(!~n2*9zdb2sm`dsqam<hTdCc204{Ov1r-yexUZKpk)Zr
zynE3AE0+0*&#f}9Kg@{7CPa~hV#Pop?>#zp_NPWZ%`(Mt3!?xSlK%iB6H%?h$lx1!
z08^Lq7<}KA3FUca8(8FZcOjYEAbuyHs!R!%c9o=r+oHVgRbyZ>0PoWjSv+vb_O!?*
zO!;N<2~&*wQzD7v0iB!6jquTd^JB3MNE%q-JL2-unE89Lgg&S1RG1UZBE95ntFbO5
z#HvpRk6%i!<;^3pmkM0%UZZdagH~+hS$E788vtYj+thkfRwbSnkrpu+Q}>T6&r$hP
zxD~fvNdfaB+qw8nqa)uv{*>isNn}vMM_9uaRl@V_Qf?6KamfQXWA{x%D$HPXEuKt`
zv2aKS?wod~%pFPAMp+9PVMDNPLNk-tdm3APUR^#mZz3|_Wv~H!_8F?uO*<rw9k4`b
zLrE!&5Ixu4jp3X;XB&_JSvrqeYHW8b-CYZdmAsMH%##J0Maf3?s?8L>Qwaf)fn)Lv
zXY=VzOUqcMQ*|TxdEDx!kxctcC<DkC%B_@9Da4+{Q|AI`t^>wGqjGYJz!ImuHJJ^<
z3C<Zn&p&vM<a$!9mdw#XHPQu=L%jzKfc3$qNj!d6lAz?j$nW=p_UG`XqytP$@X0R1
z3*|ij0Pysrgv^SG98UgL?cup~9<;YAE!}Qom4@ZQE1tYl1gNVhi*mfN?2w*F=cx3i
zq!%m+n%&Xlwrzm{P=AblX|hTk%!>z==Klc8Am1ta)J#l3>}JL|jGW~E07{Nahyt>#
zPB#F^&fOch$E9h^kPm6o2^Q%gUo(T8VEWa0F5k+WmB9n<=kI&_denE<#z{=~2QI*J
zqo^L07?l(&Njzno;3(`W9LRDWld+AYA=$R#GrNU9N{~r&a~sKY!9u8Axa(Ejqmp-$
z-SV!uWe1Q)^r_}z@db~92Vd(#mBC4}wZq5urCGsf++e8f?@J^}XBdiBEa2r^cN<SZ
zQ!Tu+CzN1jZo9zi+w!GIOsC3?0XgR<^Zr#9)GW%8u1}d8INQsqIXI;jO(SLqnc-3X
zuy!?YS-VDOw~R8oZQMEr9gRr0URlI43=l&ijtTX}2_f>cF|84mWRV?4;<+u&So;IV
zh_-<Kpzu8^!a}Jo%ZVfT@KgcbtV5(~a?QGQ+>g)5I%C$7NTmyuZQ_WaW*C(i<mc~u
zVyr9|GDxW#6(Mq1kGy?==~__QI!=+8!aCuJC<xkrnWTo_Z~DY12N@h3Rj8V%Sd2in
zuBjsLmuM0Z#^0@4hTJ2Fr%*QzR8%nA5<H2CZV#5=_Vg#e)~pE*=puqx(&Kjo`eUi|
z6|7y2BCJmf$0~)2G4nnoAp3W#M0wj_W(ef`%un#+jy-C#+}k5GgLA75qDcPk;n(n@
z<V<4n-YGy|m^^(?<LOoH9gPd7d2KDEODV?51|K6VJ%v@0)K55T>o)S#sb*HeU-2}^
z#mJB>kmW-Han*;YsUaydNplMq^3*hWKYZs0@D!Csm=na2MKSv|#L%pKf(}+df2~I?
z%3C3M4lvmTzlY!JPFYHgk0e1$?%;GMtv)y-m1awV%_A@FQ~`m{e_H5<A*~p!ip!|I
z#k8?mFYgc%tjobC(yPU(U(2gSZ8WNgk#gW;=l=j2)`Av+n&MC)+%}df2nYR<>sDpc
znjM~PxC%fi`>~bdB$`siD~BU8Ewof!%N&gvBOu`JIXS^Kc6}o0?WBx5;D8jrRX&8(
zn>6#Tnn=hD$^wt?V}V){%XId_2X*pL=1s|shtQh3Ra~_nB1b)Kr$udUT0~_LwjX)t
zHK(N6S-UW6&m(|PIXKN#ze{Va!fS-&<yg4^$EJJKaor{f$z{jQ&p}RAZp4yCocAjd
zI@!bvZOPm|@by}XOR3RX4ax+V<30TiQq?sXudIa8&ZIyBsXP$AneS3sJ(|WES1N<%
zcPBi1R({i62XSSZ3rl88kPxxLv1}l0@t;bLOVcYMif~xC4#U&@DXkRoUCC{+OjjTf
ztl0s2l6@+j)C)cT0GVTTAX69&jx)O*y{j44mBQxkk#{h=kO(6%yDCP^Io;psQtFdD
zl1jJRx8s7GZKx9YZY<UngJY`v!vJR;2&!!`2YtobsAkC+I0N3c_Np-$lis8ZsSU!0
z1LqPpLvg^SL8(U_$~4Rpa-?NW0Un@K4v<UcNjwPd&y^vuw0hM|cJdFj3&e@g91Y`~
z06KdL=Xj39wrbC8@|dNYa)dcd9;f_jy!LbX%c{Hs5ga^Wa8P>tlThh;$u4mJ0J>Zf
zu6brWaaJb24R|gRUAf_q@(A=k^*+}6lXT4pn$B{!Ap;|gt06qbef{c@Fxf;>bPU^$
z6rTD1bjvWR1KFXO9f)YRWP|DNP|qus61*;fT<wVR`Sqr%q1_kPQVo*GOY8&ZJbfyp
z(t^({Qt#YK>>aVx8m$Gb=AJ~`3r1z!R!%_&sHmFaNg+ppqY;Ul2dN{!)YIo|mm<`6
zc9zmaziIMz47!d-)9X^++&s?BEV&X8%p)8E2O0FLw#g;UyZx1h?c_4D=Zw@+THGRT
z%WaX0u6yJ9Qs-jb4ss@TlsRqVX?)>S{{T}^&X+sZ5~IuuxF$YUTz9Q8r8`Ch(KZ6^
zK&{4c-`cb0nPYO&$e<6r;C1#CtiwWZcgOR)A2D{Y01PfV4_dsl!qL5yDAC6%1^I|9
zPyYa}tJ>?jb-l7B-MnF=%QHI;0qIY7onT!;DAk>b3c-HneMf3{NLCi%$%8Y6gg|l`
zxL|u^(!+BEX)|2JWnU}<yzqYtZH|+u-yx3u12Gt8M#wAcS_425qRz;yAsj>-9%d?K
zG>cJ_F>WWFNx2B_SYQnD2W(Y{w2O^K1@o`ughIRBBOfxKUvpbh>2OBM9tmTK@r2JR
zdyspd{<T<>?FllUC1Z{}D-fe5vUOKOMNM@%y+6U)d@`H6$qa@}vNTy49{&JZ>a?vM
z((_Mw8gK+D`?!Zw^`=`{>K9S7HK+j??btah?^3~UvSfzfGUt#%#z%fdXYCCXEwL<G
zZ0ZbA0N!XGYXszu-%3NKwZS87s$l`JTLj~deX878P0Bzamuzwe>CZz^8DtFUDOj<<
zGIO|kQk0<f1ql@<)8%;HGVDVp1f=cB^v7zN*H4-Yd`x6w04E3MQR`av^G9(CCG<h2
zV~E{21bg~acd`RHR0y!(D&wwu^XXW*K8Dezkq`ELy2xfWe={KY<v9Rju&Z`<nrta6
z+^gry!C3o>lS4~8>(sZoyhK89?);EFG3i$Cw1!E%(JKT(N<MHHb~T)vEkzvd#ia6*
z$!zh)NA9@JN3Xp{ZE5@W@@8DJkDCOXj^of*Mz#`2t2465RlZzt(yHIuT1R-dGB207
z{`bo~AO5vNl!s(vN2T20YWDCqmano$Ber?1TZ@^Etgzd8azyckEK>|Uv-PHG8jD81
zWQK4t_d&)v?~2d+M9T=v<hFly7q9zOn{AI`#mtd;?Y3uKu>m405_*3+kt4U3G?eaE
zMLcBXKECypBy)YGWr9M4@Dn_f?rPPw%#na1w~$~QtB;sB@o`evC$6Takr+=hNmMUl
zeJZ-m7-F{HFq42Cvz&IV9WqTjP=Ibb9yKF*>^_x`a|NSYl!{4qhAkwAfV}pp<|(Td
z<&B|`tAYVhu)py7(+s2jd0@E44{_^RcGo4OXl@kz&9*GDA%O4r)8*77nrBI+5x15y
z53f!!(vy|NeGL=7I7Qffptb=co+*~vj4~aUYCw$e!LjpptZDB2m<^yZH<^&i+=d6!
z(u;j!##^XuVRcE6ZD=KKgWP{wo3eePOz2?MS|TNO3>1>k<B{pjRJgd?A-R%mp@}RT
zs#PeR*;NXX%Ea#9_l9Y1@v&J|gUv42C9(${F;ecz=DBJ~?L3Bs$#ozVmNVBin;xNP
zlQeeQox^25euR4FnQ<KUmjcq^ytr2qeW6AagOETy`_Xx!qeU&_lOrGvz5#=ZX(VRb
zH#9iX;u7f^GDb_`hCn`_T3h=w2$C06iAeKzV+3cY$gXO~#ur*`>ZR40X)pvk90iPj
zwd!jAz2Y|1VrR2;W99I~aL3S8H1DAK)rs$Qdq|><Ad#@S=y(U|>r@xSC89IJOENJH
z7a2c|V(JmflLxhx#KiznBXB<tTCUo(R+4_=Wq9NPWpU9DeE$ITsc2;CyPB`5T+Mg#
zO0h&n*%Y@6>Ui%{>KF0e*>5m2G)R26&&vLQ`&Th<;!Qpn-Uhd6q%2HWJW0>;r!K3m
zU!<!XJE4+4o^7B7=b#j|LUmI{fYj1CE$%0cOOg@1sW8fY`&2XQ_O|zv$LEPlpyzin
zp5TmrqNrV39a2GVk)8lQD`R)%+Mu@6E#P*ToP`*D-^6_frB<CxT&7KPu4)MZlFWui
zBuIAUvD*~MQtmh+xt`}@nHUno<<36v^c4G;VGh1rB?sQaHhA`^<I?508@%A^-lX7u
z9jT^>ZLqY0$f1(m-GKxXyT5WNF0^Z#wNq>*00Z(aPUilUsBLWJ5z0wM7){3;k9>Pp
zmA8)UY^~N9bl~!Vv}c@SxE_>Ut%FCSF{RQcypL@0$^w1yoPKm$`A|(At=xf|%myX{
zin$}}{wKKm1)aB*7Bel$TnwJn==>w7&!|TmObmDmq%VH|07^NM+)54XRyy3y(xs?<
zrFOp=2cDn(YLyo6P?Z2GofX4!3i=O9-?Q+>pQl3-TgkYilO{PC^d6?9gGRD~C%v~p
zy!^v|AdK`Q{3|zFHqhBomr}lk;p<s%oiA<Tc#L}{-T?p~>sOP)mfCcSYil@JB|B8k
za)Ek)J<VBFwUkFJR!qpmuin7jjzOw=jpg~~ak*kU6rjNa{{XF7bIwmgWe7!VNd=N7
zW}UXjysIc&5Jyu-{3N!TQUM%dVpy1&Q#=n}TCFaa(yINM_^|*NUoigg`c;^$B!&%+
zr()!k#t0qp?@6`PYW)h@uZZq-qLH022@7Pf;06Bx8iMmmyVT<sD|A!Kka=;H<~$C*
z=Cvb&KPh~ueoXS@^24yHqqJWzs<zNR{su_RE_9WUI5}=m8e-hcS5ttqwgik<9$@Xw
zY3aIpSxK2fp^Sn&!OHqn7Ird0cNAA)))`#xc^iN|jciy=94_JG^A%V3a~@RsX0x2#
zv^1v(r>I>)51uY#UCvkUW8@!&EwpgQd26Rk@w;3~7FqF+EqzXU0a84MNJpB*i;fir
zIsTMLuz7#Iby3mT`-AE2S*CAfL#V^0+}rK3WocGI41?~l9)hdeBrCcpE^^@I0BjNL
zM|zkWXT4i^<P3o`6wAWy_x7l+Ae}I{ja{2+NIB=$jmX$b>xiLcxC+R)3n!R!$M{qa
zGWmXgn4mGlM86rQO@9HgxQgT=xdjLZoO+L1$hg0>usDj@OlyMM<j5qBxb00vvpG#8
ze$!UBhGTOSiexxeJ-;s1O6SBkcQ*6OJaTzak`CZG8SPjv;$*vhw()`GE+5Jt=bDyD
zj<IaA>4lMkl2Oh9JrCk)l{I}#-DhnJ6ZnGGJ27(6F&QfC(vF?D^s2X>B}>TD${-j1
zD8>Q*0P9s*^tkSjtoH4=sReok=bkFonV?N^Dx`8px<RreBfoBH)L^wUa-52vXc~;C
zY?~7yUEF-R{3=l%qa4UY%GhnjQy(9NZChy?ew!M@ddj7V5=P828@M$dxv%NAF(g*c
z8^s72kw!3kftnPX(IGgbuGvP?857LDYts(%iIzdjVwEp!#JIY;C>Z3)w;_KD!oKkx
z-nBEelC+I8Y-MHPeL1G-`evu7J6ajPehwl>I1I;uSIVt+XYDnzH6`&hT4lkMynb0+
z$0)`bk7}nciY_%MVvgPdt|o6d^aP)7!lu0NTWPm(uBAF3A@^Oja;gaX%lOs5u!$w|
z%qljhEb4$Oj?^awu>JN`RWAUJ{&3=9i4!CO2d!6{*56H;Ahf(t*E3=`vBC^>_pRZl
z%?_QqI~@6re7SLuJ%1W@l_i~=n{RA9;^XfX8AI(;%vUAMNi@rsk*uV-5=k!}bX<M|
z(xq<?-pi*)90i1o2;_X@6{o9O+Udn^VY*K{er1RcxTmN80IIX^JYLd7_RjuVMxZn8
z$Iye;sW!yYS~9SX=Gg4Iw<xhG0#`qK{{XK`9r%Js-K|5r0z9WbFC7S~yR|r$Ru*Dm
zw<ONrFDE$_Ew6<xH7k(5Os(eOqh)jQk?1O~6}dXSir2d3?xPV{BQm<T%)K^!NUE{e
z>vuA?_K{z1-GW1m{XJ`|)BG+pxD)Mmq&%{eK3_xZ)u5U^gi<V#*t^XZcLqJWU{+4N
zBJ7J)B`sOYTIh17#+li6V7Hj0ocA8pt7WB3%1lhmvPp-^@qybuwV-5Zp;*^wky(b;
z#z(bBU}BPZCoBNzKo-Abj5*m7<YTT+zt*AEl##4yMkArnq2=x6MT{TbDO}|G1K8Bs
zSzRtwxcf&t@{ut9bp2LaAtV;@S~!k&!Bmr{`$n?vwfiU<Mw01B18So#GwONmQ66~|
z`67*ZFOu%&8<%y5&zyuZ5CeWyeq9eoytOh%I~7s$Mi_=~r>M<ww|@|9?IlFIvhz_n
zK3My_U=V7wzB3n=az$@&VfjgXXOE}9wO_NDkG7_|n!2UDdTKQGbFqj%C5X0NR32D%
ztgEejPJ-Ge8+YXa`^5IeKJo3=&Kt$ly!Dkp@`8{@9F{eOcVnqN+nM&R@C0v;Kj0_U
zw2E6Z8Pt~O=<IxNc8=!l8bXonJ6mo?rhRLg)I3Y6TtAzq!z4jijf~l1N#`b?YoKc8
zCzQh`)Hx_eQQtLfG=z<#eXWN9mvZn8RiK#-)tWM3O+s1Y6R|+;f)8GL<kp%%@!X%Y
zToD3brty<0$0t37bf57}>XtdWWQC)TY9vd7TyS~{#=N_=h<O%^x-#2GPm~V-0Hq~6
z=sr$eTOVfx63A{Qk(jFGL0^>f(2wg=T4}PuEVma>vx0wk$T?Bl=}>99?W_ggdU=vI
z5lP{_hqXFwQtk_g<yqq+aorjWaqI6zq{~hTT<GD_Y#&N%%|6}S0lAL+wtvrRTWB=6
z_Zd{Ylj1dq^k4SB8s^~fYTAiiinh_hhQ}3=CyjMm`-1kC#zrlGcHm>{OWDotTdhqU
z@BAYZ`GV<WjxeWd;PhU+`_(4#6k0Z+Esdqza#@50na+N1;vDnMVR&Cs*7dDeMDfYw
zsVggQ$j&_~{;S~wsZPOWMR?=jK0ssd=|?I~(qrawSBfRQ_^|<#5Gg<uBxt{RN7k`d
zQrA2|A%+wWBZIMu@f!P{=iaSa_%`28SDNB+EZcI+5aCC4KjTtqJ}c8S3-brrME+<B
z%Ypl~9sTN(g4QU_^FN8$%UurTB3Z5`2pNijBJn4-MQG^|Xx3+J){-bul>xa2+?rdT
z8>PUKcr4?&Qzm18FDi4?dQ+}bQP!srv<Vy&s1vM8GBetTCv8O-#XSXCbX%*T6s(Y;
zI6h}{>BU#M(k$YcVYj#!1E>J~-_NZ@CxR!s4A%2YB0(n6D`)qA?|asdhdel7BwS7A
z2%NOCV1h@cDjcAd(<w$x>V$&UXGKjvMvrmIhLag5*FKe2{{TSOJjRYl;@*k6MTt&V
zo}<*)RcN;Ms-_EJa1@g+@-u_lucIWE5?t8%D>O_3q@10n)7G$coy~oWZK=%ZI!E?o
zG2C4iEaMxa7~|1_^sTuxt0^s3Yb%)?1H{PK#}!Xe*A^?1klM*U!Taep@Vw(A)~rWp
zUS*Qn<U)juh9rj=<YTpF<lg3r9J(6T@n|}138+hO(w&=G9e!N@0F73kTik{SVDk<L
zNQWHu=BwN_&Ah_h%8-8U4;aVlYOJxqk{6z5C9qX<&<dL-?p@ht3rjorp592Ee6`F-
z$L8}p=iB+y*H5&!n9iiOz%wLgfN}jQdjSM^+2zX3%4PY^D^l|6&{(81+bl|hGB_N$
zJ%H|NTVRqfBh>BTx?2mFikRl#`>8M;Pp`dd*=ajR_KX)y(6J%lnTg2lSz4xrVqLG}
zf@WzB9Z>SWg*!#@6}7#{x6~jaSl2BPem3W+?0=m$y8?FHOYIWiUj3o(RaXQu;FFJI
z+O9-wbns!G7a~Z;RnG0h>S`<R5!sm~Yd2FF8;cHi`z>UhdMPG0^Q?-vz+&8|uN2f|
z#OD-f+}~M1%`l!aI{C~#RsR6%3ZZSTLX)lR5|`W#3Fv-<u&O$qrLcdX`D~+rvK)dv
z54~o}7U_&@7vDk&EyunqSkrB4Wh#kmZcpN77ZJ#}?5!utM&dyoaa5mBlKw}Ac>%+2
zj}l}9>MJ@6SQrVeF2rdN!m!Ebr8I<(<T9*jyYCJwUPz=zw38>h(Qa-wYI944U_z_^
z02v*AlqK!9nnV%VnPx$dm>9>sItQL$q+(6HTfR;SrfRoW4yVnu0pnZ&7y!Bd0P9ee
zq_?2e)t+ftps{F7zauEdKDevuEt!#GlP=4EJ#aY~tR%m<w3B7pgeS4?DtFhs_<X3X
zrAarF8=PYvp0r9miBd+l*;-3x12S(VOl#D8ip!qb`pHuAdp8lQ;DR|{tz3#dM8g&C
zpLB}O4*ka`Be1O~h2FDiE}yJv((e&-BK)OKt~=Coa+)Q5jC)uzByTaw$VM_Vx9RCx
zP}wB1d2+?JFoA&w1RrXhbPL2$YZ4WYXfR76Z4$mY00W<DexKmYdnU_PX_p6aV-W*!
z=hupfRfFnMgDG0+@J}N{XA>#gmJP;zPHCp?H1@c)n@?#Oln9bH<eu3+mFNxOxvcca
zZEs?VOby8>TpSVk*FUN0wlG{QzE97}gZwT26`HGdQ-zK%#aBAz?ZJZT6BvO(RkvOS
zM@)|O1Ro9jUiQm-e*;AniMu3am3rj+*G^3GzmqP<iGE~dzz5j+)ti41YNk0@OsglB
zcB>5U8R#ojT1i?aPMVai&TiMjDw{W}l*h@I=RNCtMzR)&8Y_9yUARymADu{#1gZti
z+D9oHyrMDJx3vdVn%@5a?0QbynWIh8KvVCpam_^KIp|zeVo7zRYR@ZM!{xZSj0fDO
zAay4_t0Vpq3tzUp(p|xD8J0N_2|YdQQtQR+bk>K;lGaH#BD|O-f87<01b0!}OC7DY
zK#MCNZ@P2e)}|_U)Fk6`ptQ2^u9S$f**Z3M%P2SnJ$|)DYq$fo)vGLVfIx7)P;h@5
z%Ya<TY%Q)QId<q<`5JZho>tw_H={aW2jms+NkY$7K5MNItK$p1bFyTTXv=aK{Mhx+
z=}!LBH#g67YO@EOR5LO8ln#qVi>BM#Tsk;1#3NrX9Bm!RtqY57It#VD(=ORvM(Ec)
zJ^kovD`X|i`jeYzB)N8rPi2rs8P#MXamOdpvhFUv&3m;I<dtw^&jq`aQ`rcnxQI3D
zq8SNic0Es}Qq?RZ`$Qs3a^y%tsFR#}(HQDB?5=b^6VqSB7E?)a1IZ+NvQvVC)K@v;
zOMA^chq|{Uq^!}XI0O#O>*{It+S}>t_PcwTtsRco$!-e{{^RRVUige_Hd9(^pc&Zi
z`?wLGQT3~YB&U9ca+-0mP90+2;@)=}P796lkVj1a0153;>bEu*EbFJLsz`$?-3TAf
zplt@~Wd`2;7Aa7bI3sE94M7#CjsmhFATb4puhzPkFGH2NbsQwz@ms{(fG5o>{c0q<
zxs}UBYGRBp%p8tQDU(mOl@elOW1YEt0(}pyG8@5kSL|CH<mFg(szi$v^RW`#D2(Uk
zBb<6woj=33SBzWjjk)@`;41o5pJtW`O2>zF0G*>a&uY`Nv%nCxR{$`<<mcA2l+;zr
zg*PTuZ35p+)124{<R8Pd<+u8O^{V!r;Z0*$e<m9^qE$>!aU$R*dx7g(`d*(7ml)KZ
z!)%QyLlc~qAKwDDVb@YD{hm~ZVu6Rj$nW*8cUn(lsx%?g=i%@S*3w7k+>|lorp7pM
zd;My2;d@IcqPf(h!bc$}%(*%L06pq`Z^Sk~Ybv_Z?2Rz2qY7A$(zEWoP}+=9nROu{
zjy;9MVRjGe^`Y~<O)X7mB-%L3tS}W&=0w5c+={fiG{QwK(nabMjCy@)y{4eHG8dBF
z$s+|x``(N_s=ddH<gz6^rwlS!w?z7S)URmWtPk18R%mJd7}Rc2Zo!f$<6=W+0l@A5
z0PCw(z8=#qfxfv$lg%Y#fd&*X?tLp2J}T;(h<KyY)GWtf@`(9y{6Kyj(nqY`LvbzL
z^s3vi6h)9S2W)rt6r~E@fTu|7Z4QMUvc1eIv#wFY^j}O5T7vsjT|H3ABB53!N7HiS
zrE>TBmEN4jIb0Cv8w2kQ^N+1&UU-4NVy;SL7X;^E9FtQVH07&c>m{+*zl|*7+jJ+4
z0OX5yA9vr=H1F*RF0K;d!X}Mab(4^%9Ml#X7LxY@O+C`;NiEUDom6fa6zFu@dwIO6
zuADW?ZD_*~t&c(4rKl!ab7koDjXKuUSZeI7+lfaFf=T!81wjSmHxkB?N&)kT9%;zw
z)km!wpNE$2NSY>Cq=~mi(j1`}?^d+<G@U*e=7SQuNJ?%$bovbUJ-w?Z%WI<5@2K5R
zM!&X{+(~eD90c3Kk7MspSzG;%DIvI41>bycBWGzp!&+BfCywUSEYXFDj@^W0<aHSJ
ztjQ#n>NyOCC<z%@rEXCAwkboJ+Kx>pp{J+nLf6h|*hsrRSjQWWwL&i}rn;SMw{K+v
zL>;S~xbXyfbZV1cq|dzMfwzxg+*35a6>9rup58EXkinxHjbE^BT#s!V*y)X@+9i82
zF-CRa3mxt4S@)3L>DLbdkp^+LEPTNIPfEg)O;-N$2Z+2Z32#0}>}u@y`hk)qXY(cm
zD>TD7AKv$>RN5ufOp&L1+2n`LXdOrIcMSaqrF$Fulvyk_1920NljOr^zH{$UUTRY$
zg|7r{Dvhf4>wrhU_|!?LJ^2x!4;PpBm9d}7wB=;;CS9@8?*qXO14#1~cro(<>zW%)
zlS_G0cgfyzjNK2VM`fs9#}*{FA0vI$Kg0F!QC?jei-~{ImQ|DmUBKmiX(cAZnIu{_
zHxOc2;PRu4<PDh&eKX#x&8zAs<+BBDBn5z%q+{3oJt~Cv;hHknQXeS%xNHJCRATL|
zi#fPeA@erjlOR0+^v9)YqRgDpatmEoQH=@K=ZMJrq}X=sUsLN%Iz_#!Jl=VkV>#rI
zBtD-?p%vD%sNF{$!3yd~Qd4N#o)m%n>UJ8G7i^DW(9046%OUx8`j1+*7K!G$CZng^
zTF18cYL|cBB5|-0ocq-+)5ryuowTGfWF%{Xx&9(*8E$80Gf5!?jiBz%1vYD(&*m4x
zak*E5+*PQwX5@=MYq~}&Ba({PBd0%Fib-elrnq~M;KmBXy{Zd)h$guv>7Q&TDg$6K
z^fh5_7G*QSWBHCaT#S$DP3RZ79GaTP2IaLV>^^BuG6$tsS<H;HI0akfECvV_YF#o*
zgbb0K6NP8vb7Pzen%BWsce^5XmN}mxA;$;bJ*jiSbrOV`o|<Nns3~=CE#oIP{QSW8
z&1oGJPYMF@ro|*9laiot1v<~eEvK+uUg#{u{{W+>ck9WmE6sk<E#Zb6h~;p*H?&<o
zm7MA}{nJRnEzI~VBw~<4+nPqh7W<%obegwgrrKP|BvM?)tr5ZAaKDMH+smzAP`Xj3
zE_VE)ITsl??^d*kwF%Mw-E7c_aI&L;k_T=oCgsbyQA?XdT-5d5D$zc{YkaKCxM91I
zj)N7KHQm<cS&AXf{5t*6dK~(i($qA~9vGGlIxr<HGG%Y!^&Y&`7k(Fe_bv92N+`)c
zbewjjPE_Kx9OF_?Ln%_m@?`T~Mo@4-W7poS>An=Xh(4t%vOs=FgAbXTx%L&&=w1x8
z^2BKqyC*U*<A47ESXRx3foltvnkhyXCv#-`@ljJ380d!#G@j=@ru;Osng~v*wpKD`
zFpfc7{{VZ|v~<6R8b8`(-8g-+<-p3|dsj&njEOQCEM7HYyIIc)Jx(gz@<v)op4o~Z
z`3}$n5!djpIby24nbjOUHPCgBhx7-tXN5|bR}2Z{FZaF8Lw#;-=L_>D^aeD}c=h+F
zp=*-^O27=a+#@*|=xU;By6v>)No-?{<x;5RhYAlFO!vp-T>8!G&Gbt`eM;w0x{xe3
zWU-F|P%x@M?kbJeopF6`5-C)~MrMSLcX!QbSZenvY!>PO@~9vyoE9FnR^sv(W{^V2
zP;!9aH^0)UT`<v-+1gp@$dhU+WRa9C0oY&<PH4N<tn`L3EJ-YbmWcp3C-`~qSl8t*
zB?bvt$iO$1xZvP*_7xS5nD%kWCG0yT3S^LV&$z8rZ>wf)*_X8qTUpiYZZ0fz86r|j
zG6DpO2UCICv+VQ>nVL(PZRU~DceZ*c`qspj_co(+PU?>kc95Py_WuA1ZLf$dL=mL<
zFv#UhnZV!vMG<W;bpuPOV@1|HjXhFG(jd;pWif%39lo_8fps|pS~P7mpXyh$j=-Nv
zgIL$RI}VtOZz2>AnPeyDTy-PV3glnKl0&F8`c0cGY~n!+H*Vy5XC0}+ol3fsDaH#^
zSH+U*nsD7~rxayl=7k(4I+8sPYRlBM84Lvy<r@G7a84owa&g@D<N8*9rQ%Im`FHFw
zr<hEP=O#dUCVeX^;jNX#iFb|7i3xH*_QiS>aPO5|<EdFUp|v&rrk)t-*Ro8Exrm1)
zfbKc#S@Yb^CsQbR%6!VCV178Pr_>B=?;N4oPBtg<G|06LN_j%X7tPSdPgVA=n9@;4
zJE?N|$oChq-b}=zKH(Da&wQFja!i<vsF42bU|~<SGexu2bpX=aTkcTp8Qs=0I_K$E
zZLA*Hl9Gwg=Om6n2a+?|n`sRu%Fk(iF6k{Gm6$Kh8k}d|rPJQ#21LHKE#@4oah!bJ
z!St;dfV#RtV+)BAAXYFkWyjtp9Ta+=_0ZVq7n56+k|aoqZU9CL6Q5qy&r-6Avo?h%
zBRbX{HVbJ@{5xHgY)oJ#eMfp%)5Y8QQeAzWv4vgVFdx>mWYOkH72^&Ns2hOGIRmG#
zt8m8VNETakNh556pcX5R^~&ol&DA%tou+6u_Qh=+v1a82jmh?_*4CGM7+Vt?NaZCA
zIN<Pj=qsd4D5SPP@B}dc(gHaQdSv=kucO_qiXzxCotT@MF~DBjb^^JcA;{TLNaN$v
zqO_PtB&J7|@RN+>x6{(KBhv0KA^Szl1g3E+0mvha=iaZ)r@>(}&v#@;mPQ%6W7u}5
z+<Z{*u9&Z3EzAtUEx^76ZcnGZOO;7{C}~13QibN70EKOBBP^w`WzIIAZ%WhC^wjbR
zX?Ep!$mOxtu_gGa;oG^Rg2Le%c@(LQlNiU>y>mM6jP;wl=CX-oRgdNhK2e{qp{j)%
zwH=zVGph(I-01vE<Gl+`wlL{8+p)PW1C7ja*bdktxl5lL&#bT6tz^jLv}5m_dLGrA
zCWbX#Ox#}vR*(k=aSFcv^{;QG+G%k|cV=VW9Bzr1mQml_S8Qn0q`R|{Rch6Jk%@B#
zyQn;lqDW%6K(@-ylDO(mpslFB8?C5FCcc*8-2*hvxWOZk2c~-;&aK{Ec&A#rOKmSi
zhE)u{WU3WHp&fgELz?Y8GvPg8S-kqA@`HRpM~%(X0<*7)l{n~K96V<ADfnOErkQ1C
z9`4kk&&*%$lj;X*yQgXTb&RbIyzJ`?hpUppwQV$~Si>2Nct0|;<cia>)3gf<#hvC=
zaJdY_Bk}dGDs`tfc6v~y2&*Edn+>#<j3$=~Iozk_+wJdDTv+MP8l-m;6@F3M)OM*P
zHY6<8a;cJ2y5-P(fjbl)wUe)E@LAi>cjqgJSLKbL1dQ{=W|ZXgG`fn^8p1tMgESju
z5)iw1U<VoEoj#$aX~AT;y;MOUK_Kb7rr)k>&%8_V2KA)-9B9xhf2t+GVmtKfSjgJ_
z=#J{*;%L0GT_Hxv1b-0s#dp)e&8y2pnpl*bqK{40el5diYdl&-i+QlCZA0CM1bt7f
zavF!lZyjFTNE%kQfn)vBqTzu(*n?QwU7nc<7LRc>t0N8U@{-C=IRy8uR<P3~m+bT1
z2qXK*C2TaKvVuQ4+B7Iq*%-RDCNQPPi{`eQR+Sz&^OEF+VbJdM_Ntd!-iM@<Z6%_-
zVB#qwY-4HTj`cj6OBf}N!r@R#feNrVQ`~`BQ}`oJ`&>;G!;drXw2nx~9S@~%A7^V{
zLn(7~7Eg#iB)FWzq22jJHtev*N2e6X{6XWbP8lrq3x_EA-xOyA4`2TPRdgO6@I`>P
zO+rhUUvR(*56f1c!N@P*xt`)Hk1PkmIZzK^f5Mci(TmXvH0nKDIi&E_rkxB@-61U&
zBx51VVEWfb;cF`kX`O7~Q|1y$V~?o%RMKga2;T4}S%FCubAkQee`<~mE9~A|EN>JD
zH+d71cbsx_>FwULoo;2htZDMdwG0=NyIaO`P!I`^ms9EVt%x*TKTo$3Y7>bii8C2y
z#tG_3sv4HHd?AgjbmnK1<qR-9qmH!bd^vM@J2tg(AXy;@s4_5m?mniuoSRDQ=w3!m
z{{W1&J8P%4(c)=iBO7B}pL3eW)EC5B%+lCLe>J=XGVV#iC#VPf^Ig@(i)o}iw3gP2
zR1L3=;19i@@vK{q5@}i`ua+%KL}VqSToB`_AlA^Rt?sQ%rwKQ!C}{o$(&HjkvfQY=
zIbF<Ky>_}bfu`8nMR9*{h)R;OsN{~^cCKZ<BHv9n*{n3#6#xZVH~?H@kEy1|ABZ(s
z5X*4UMx>ddE5yM19>evisH#hL5cYA|9c9+5r3-eovb#yyNoNwAupP5hF1)MQgWFwi
zc@+Gg-N&vgHv2$`n5VazIKEy<B!B?uPkOaue`#}Wth#$h&zR(BhydfiJpsmXS#qSb
zG`oA3?V*|rf3x{c+sFjR@6eO!M2jHau}H{J;J$J>{${Gdb#l%28xqPw<lt_?`kz|9
zmN!cht*nSjF@4R@f3;HdDLa%cyxmImbp1Lh-Gc3Dc4R5{^fYRkT4}crDo$rH$A^VD
z-;TWc3cY#ai2N&MBHLbL%sZx;Qv{RL3c=Lw9`<e4w=4#CJK*6-_4E}`i;)gV5cr?Q
zejD)2Fg&+K$KF`ulP%My){+kvPjdF{9oP}Nmr06$s|UCqzsjwh2{m0hIc#*eB>ONs
zm_`obc&=wy(nK&w){QJ~Mh&`+&$xB~bgq~}l$E-e%5#pUzOSm;+1f`Yqpg;ZOj#Wp
z=9>eBC(w26(y~X1t>-ewX*OJp#+!Ll)Q~Cg_$OAnvxf5L{VB-=S*o8gPrqz>ifz%J
z$)D}|GeYqZ`?x^f!~3SUjA0dIXDLa$hxV4AWjt59?9A~@Jh$@OZ^}6t$A5pql6^`$
z%c)?tB1DY?W-@W?Gx=24uxZlTnWcphkqPqH{pCKDOG%4RivB1qBifJ5W>g1ubC7+#
z>qMg^aci+pQSmQ`E-lwbwy=`Y2p=~gR2S#mbpHSvx1e}p%TbLR#20e}-a@H=nSI#y
z6{mTk>T-?u=&Kuzt2}GBIQ}2QwLePGkVx}NSSl#<OEJLu3YRr&AW-+N%MIZRdmA*K
z8>uegwv)_Q*?1s#Vd+p!1D!|BwbKL>OhHzS0;_#0&ZDa7E<%536oDKcC`q-X$7AX<
zQpw_75(tIe=`ihGtYjgA{vAbS%{v<Mz=u$}O*PHTma{CGP|{=qIQ<1@r-&?K4QmvQ
zB#o9;SpjDrhuBtLr9JnFA(B52O81bsXr!H-gOYm=zlB)vcf<Sm-^|ouhs}&*&fG$T
z^gYR|QG$)+^)u(3rD&}S7W#$XiRSwbhXaEl9(B|FpaJLyr*EZc>3S}qZ6n;zcJoME
z5iHG+2<m;QZY}hG2mb)Xz{wexU?qIqFXdPsCh<+h%x|Y8(W$z|)s3*l&p<KI8kH9}
zrp37^Eq6LKzwoA*X127rmgZSx%(5AC6g|mY_x(Snea5!;OCiy1_L(w~NWXQ!>KeJ|
zd=;sP5j9EWU+-Hn+QGW@9<|))ULCQH*&k1VqCf#;kY@+KA6ir7rnek9>OHJ-H}<co
zY*{Yhnh;7O2==QJ*XfU1xu9A7gvT5{T#+jN;ocxyIp+t^S61F1fUJ_hrQnbS7cQGo
z3CZK!_WDySwD_$|QQpfMq(gD?$A525Dt)&!Y>M_4cV;Bk5Xl0gKtzSMq=b(BGAcu*
z67I&;9$lMVqg*Hhp!TcRx|OsC%SaKUm9Z0?W;gUFwNP&nNG>)9+NsDpa=W{O-1MrC
zGe&JB$*fUU5oLbTrc|suIL>`)X(f!TQNpZu4YEJ+NAK&J%Kp=u`sCbOP75#}Ixb3|
zP%7QUgX@tAVQFENK_4WClk3NNZE7MZtx`Cpv5FPAEO=#;ZoqlxJ?k>}HgFY|c!UAS
zUFo>1ah`t)+n(N7S(e_+U`7E9epEg8cP6rR4QESzGDxghVv$KRG}v<@^vGVrKaE^n
z$a)g!{&W+nUCOB(-|7+9{bKw66>jgxT1Js#_K}5Xkx$8t1M0QO-_LuhFPCi;(|MdL
z#&+yJneB>_*WuQ=bX56HA|EpO<K<)D-x=>!%9gE>&nKi&Gkifhg|C_YjU;Fs{g&R{
z0NCEA+LiTh5csA)ve?_KGP4v7FyL|1j^?)X&jQ%#P{6v?!p(6Eg`e#COoRL+binql
zeLqf^TshM%e8|x<^E_aY&sF#Sl@qHN?2RK%Z+2za_)kmI?Ur3?2}-){xOH!tNFRHi
zn5`jerdcEnYZ}NT;5=`V$~)9om#c4^8@uhd4huU@g;m!*N3Xp!>iThklFkH}DvV7L
z+IZ`LM<TGi<Z7b`mLi_#RZ|VV+kK$0QaAv5kxahVbj>ugMSOvxRar8A{(9p*D+2!W
zR=j(yF5l%26w1;r(xb6B>^-Yb{t*?_Jhs$WTu$+95-8i4{{Xv>>s8AYxjfRA#(mF;
zAiZg3u$n!}z&s3d!2VRt4nGm=cX8cV?r4J_v=T6=qdax%@9kUmJ_^zFq+406SsBmE
zD)T2jz42Pg_PSC@rUnRrW=R75?`+jM#VbTngqyo%J6lzU7SUX?OCtb=G4m+zQp;*%
zQ#5gyjFO)%q|YRG_No)>=S|xxjL2su22co-ugHBqzSS<Fty(>@O&YsAM-3kCySm_1
zG-=F`@hh8hlCaEV?}<iy&!sF7$*NvOeH`UN<aubHGce!`j+m%yH2q%k@Uuc~{H4Tw
z_h<Nr)6%Z$8jg|St32ImDH{S?$Q|3e4?=w?*Pv+kG%fVCGDU2<f<l9d?rw+8$oszL
zmr(IeouMn*+szzr8hp|_au?Spsjeqo@ub(63wNhP64+qk;N+IZI*x*{btcxY;ttV~
z^X_F~kly3adsdO4<?#_LLXX0ZuH)i<jk$%CsT{LOwf=0Zr#u5#y0?h6Jyt8Ltwc#3
zpO@vQk(kI}c{!|q4(S%RQ#ngHE?H&yngzlG+z)YEc3O6mHSD(%%QF`WEv+V#DIp#4
z(;QZ=H0kVOrBbHjJS$@p-KDMF#Lr<Ooy!ckY~zET{l2x?TSXo0KW8>3HC4#C>K7bm
z9<^E)jtJzqxV4BF?Z?_;01OVtiqo>RXyA%>x>ExUt%0<R_8z9Wrza<KqMSKZig8-n
zSpNP+j!AL0M~{-Lo(>Osie<Nw%2}Rdd;%kYaAaPb<EPfOV_1BaOBe()thg&L&BtcV
zLw|1^2g_!SK3%sC*dc-B<I<r>wybAa>FFwsJ_9(AvGV-JB(8gVdJ5f}M7(ICOXW-;
z!m7uOym$3Aif)0ndz%>ykLBVCBW#x)hrh9@7F|ffEUi{|Y-U9dlb*f$bfK}UT+kQ#
zZk`%Ddq{=sUpmPq3a6(YwN@Qo`sV58w~14DA(%&v$G;wxFw#x*jU~0TrIA6E++}l)
zaqaC_ENq~3Smu-W+w!fAsgLPdy3t6kM#}m=h=xxx-5PwHv|EV^4_wxTo}D7zw3o3F
z6i6_E2R`40S-85h(k7PRUt2~cQ53es{OqHXk4|cZ=BKGki0v$j#rz=~aa8ptu$4(j
z)-Z}i*=_9YEZ*WJ5=4ORP;f?nm0}+@S=LKQhm>ChWEscM_Nx~n^7U5E>e=mh+RwZF
zU_BUm{S8{tw1_ON9$TkZX;;b!+-IlFj==V!F34?MsRfnPrEP_ag@3%P*(^W3pGutD
z7=afS+d`gJQ_yy!$*_WUvs;C@9AZRrMi21*6=YjHYOzY{*&GmaxOU{yyB5U=(lxru
zvj7`;0kEt;sP?OHN~*Fg-HB-AT*PDG6aEx5aL*zSErTXjG<O+O-0{|;i$uDP<&*6a
zG#T?ew&|1U?0qTo3d9!|#?ZKqO{B%yIUMz-M=jo>1J1@&-Se;=7u<KP)zS%!UPmMn
z8;JIh2{_x;NU1KgurASBKPEpZb^#tYanI-LN3@C`DNf%{n&Ec6x;K{|Ba?0mdlN+P
zM9&%fGDjjW?^#rBZZHNrR)wrdY(?y`x+=zekDG^odV%Ja6!YzhM7w&j<mbQZNlCU+
zid%#UW2KnxFPC`Rf&*jb#{l{YmOV<*q*k+ykz!oR0OLR5S<_rR>*h!0+!m8-n2t7j
zoF1mE+#O9rTP3&?ZX4JPhEfJN{*;_LvXikq`i0~nZlxks93w)QBaXiHLibhj6)kfi
zA-A^HAjS`Tj`TEeL2mHHJeZ17Woa0l`SkQ2)v4jjZ93}r?RPf;<HDlGnB44pf$2&~
zMQk+NW3BaD^n(xPMj$(&cz^|zj)eEA%$DK+Zyk$+x+s`!C8{43-Pzho*7C@PN8uok
zsmEjJYORb<c{FlrDIj9NqVDBDu4yLqHH?zbxUk1@c9Y2>tZ#toppwJT)md$|HGs;t
zv9wD$3Ry5y{EF*m(CzK~yXfy@iYAliEVv8D^{m}WIj-!Dx7yRobt<Q4AwlA?jY(Y5
z#aPKpRE}A$ZR|eNxdd=d2n!MFbL;e}wQI;4SG2vhh_8~30N4~c@5L;)O%|S(Z*c@a
zV`ApmFW(2QeQAq46Y5MORujmB1@Kgk#XT!z-R{iZh_3QG&he`J!4!;fupj4D?+hr(
z6}0M!fyo5@Nc?L;*TbHD%$I*@W>JN}Y;E>F^qQueWwMQz{al67CL^I8e*s!Tq+G0s
zlx1s}anCa>vRm61^8RLY8B#u-zLjMx=a+2K$L0W}yixT4j=sW~X$_LavdLvKAU<J7
z$YuI>HL0hzl{_*>Ewso~ZdX?Q2^G72jFfwnF5!bmirr>Mj2+**X)-}Q&04p;(`Af#
z?###nj2;X2&-hhVnQszdZEVL2%g9063C2CorB(X~ibjR4=88OSSqaLP_V=c>LcN))
zZssMo6kVg{0Ar6&tvpEkN?YA3mLD`^63jdE+NiEnmYI-~$qkXe{{XE~>Nk<4l-9`4
z8A!J^!=58Q-Ou^rg&VyF-IdKL^~+0gk-RG$F{jAH;hDV&s?+$=-segZOz<S8Qn3ba
znMa`PeQT5PCZ!&z)7``lWVT4j4tC&ipT?<w!WXFho+xc)D#-ic^Hh>a`@s5rMRmr6
zId0Br)|KpyZF^ph+W!E3tL$-vRwtA=``=p2{@d5CFJDi#vh&1;A81CxG5&e0npcLF
zCknBk-rJ?~Sg|eYGhHTu;fSDAxRTt65sMj<_*fo6{{TL<a;r|1Y(!yJqbvAk&r|UQ
zm)Ny9?@|22v@yYq1CB?h9cywg4cXhX%M=e3$arAn;Yaa%R?4}Aym8O7D4|G?{b)V2
zRrN)>oHebz%ANx63yu$Od{>_=M5QCXG*nRzoqROg?UwNgB-$BC1Lq%8TEuDc-Feq>
zE4hyWIw)h^MQ4UhJyky43kZhRjgu^=)Sr5e=KkhOaOy#nvGUud&#0{1ax_{kN$0#)
z!yyG?Vxd%W8`m|K(ObNWd8a!hELd#GD$YLf_Nh$H50@0^p<6ECaUOb>`qg*1c_SAF
z@;8ThJ5h1?iq<KjB+)GQNgPH=5z*9cK&_5F52>nFx|6yoOT~407?e_eL+hT^4c?@&
zfh#YVi;(C>c&s@!p>8*jt11>R9NYl8<2bG1Ma;r=IZnh&cX<J5u40G-%gS()FM7q*
zHH|vj{4I>Y!jJpeWRRbnkGqb;`PU@gC%V41nW2I}5yXWbA@iU4W;$ckRKrKtrny_a
zO5e)1y1`bQZS%3|=qsW)bsfy5S<7Q;>sPyx5$xlW?JF@z(a8PjJ-snhr8n}+h8vNe
z{alIi?j2PAHBMbl%Gk&?Ys?+nM2y=+ev9?=HCE$alF}j?FkMDs1@bf4AHuCtlGzzb
zcig(cVrdrE2%wqRl9<3w<&=BXs33~+-bR#@6P!$ufHx@b?awubr`$fRG?zB*EbbpJ
z4hfI82en(ahf#@|TeT=l{_AMQ;Cg~7xV57cUsJHsT07X2P8L?}Z3CAhVBF&vJk>38
zMoXaAT5~eO;KU%{$c#A89jdmN{zD;*xkcrVaqCtm)_=2!k)v#ZouqPC>s;KeO6b*c
zv?Z2;V1w;i%#Cdb0wyq>u3N89UiEo=OQ2~oiDQ&AV{eqwa>x7F_N=Rm8~sx6=C_jE
z%Yz)!IUs%m(yeJ94lZZaBb1|Dvc;1AS5eiEu*Wo~DE+2XRG-3)tuMuIa_gqpSuBYv
zk_aCtJxgb`O*Wl3+AZ%bCTX2>vMCn}8xhoc)`hGZK9?oD7M6HjyoMtl{kRmVdu<~%
z%o3}{4kC>Y%bxhIXC-|OxWU^}-s^_8`*fjK5#mH~g2WEMR)(9aSjA**t!@PEBt#Vw
zU?HwbT}TUrXS2Bo`3KBDn5{c2>xc*2FGO2o>bpkmgVWU1m2%YAHri<`6TA7#wVZMk
z^})>}z0%q5w1JBT$d5QEf4si+M%wUd*GYW@EG?msu)5#~&q8tDwbm=R<QKP0tQkfn
z94S%X+Ma^CEA6^Q4?L^(fP>197&sj>@9JtDR%mRH2`33GhjQ`3By{#3^_{Hvj@Hy&
zPURhyN0v)rnTKzsWNLbrqcmnsM&uJRV2IZZ9~^OAbg<H%uVbF2c&!n+tLyq*wwSV|
z(Men7`Ii{=$?sWuPPYlvqG{v%Oid^fAZ%q%eE$GiheGgjYdUr2wKk}Tbl5{ZyG~iA
z1mgjEWM?P8J@9c_+U9Kr^fZkb5|WYSa#Rj;j>i?-3NVCPM?9*^PUk@^8YS(N*E)iE
z2-%L!R!%_&hU30E=Ba8Lz1`KKLv|Jhwv!58AWVax40}~6^$A;0^F)eJM2*5=epL;Y
zsd068CAZHlw1=63{o|fPdI8wc3Ou@#DYj^|<*io1ZzhO4lA)WRJxIkGY$jb!IJDr>
zySP?!(NupEXWzX)TRM7a2GY^llWqjTztv=Y;oO?%>?gmEQG-dkn<U7)E|Bd)4|01C
zT-Dpiha%>`d1<O?)BUz%fQRhzpvLx7*mkaaRKL_Lp@sB&TbpQZpKPrx*j@);&$sff
zi^dvycxz9QPNU|}CD;+Qwi-Vy^(;?J_WWxLThuJ>?5D6ho(Gg0VIUjjAx7hY$OEV0
zO+8HJ>|!<5+TS(A61elnl`JFWMRCsJe}~kXwP|r>DYr>XkN1_NjNnMU*>n6g1^$h2
z(aPk@`|NEBdD-pidsE?*IXaXPOpdYQEiN)YdcbWvbHrfdo`d@7bD3V`_UOqE+2FX4
z`K(&nM(RD(_VlMuYk#RjC9SK=ZxRe7s=NpOCHni;h_sbfY2<{(0z$Y)Pn$jPM`2WE
zwI65uU52Pp<2&GvRwgog<af<Nk*%43N$`lbvNrQrOB6SWftheg{`ccomF2gY(gk23
zj0p~Y>eZj^_>Hnc_G>JQ9(SR}8@>l%Dz2Y*Z>vcymAs*pkMy=2FkeIYcBtlT)kfPI
zmbX_o8G;MDX4x4sK^%EIeLvnlv_}=S&=B0)%px!IbF{D2`u_lvSlX7q9*<(Woy4dL
zPqs;*`AxiQ(3AXBPpjHB%#v7Y0^$i#UMbQ|$UzxAdeY^SL3Fn|+qa#Ml?B2ip_q9t
zGm-0`T8`nQmT$CMO5z}ZFhj-%Q=a_Ouc0fO$s+(n+vk!ojOUI&8miK*q_Enb-Ue@;
zGr<6i@H<!D=CGV`v*zmVd<_PjBrWcjry!S8)9j=$h{2SZa#VLC)X=L0YO-0O3{GUX
zmO{_B91&67!EJ1wRm2m#Ql1t!Ib8aGTAjkKr237k;rx|SUy;DZN2Phz(AbUSfvt=}
z?lx~QnUHWoo`9ckN`dYf$Db(JWB&kFRPq4mc<O0xQcFvDB6~J=o*<Ex?US7TRTQQh
zSke`dBM3{NBRzYA{V7{O2EK|t<ekNa=t3}1Soa==v$ZQjE5?#W<~`UuSgR?=Jl2t(
zD8QOn)<77(#lXQm>aL)LZC+L0?m^r0bDu&xds1saM;EJFD#t5X#jvJV=8%!My8+Oe
z<aJf@E>~^5Zw!F>51gw%aM|d64R^ZEoYyaA@1#oLmp2nDVPY8UJ$?IEH7%vRtSxnK
z3Q2CN##NbjW1f2V_pH>c&bn<Qikb_U%u3TDH=00c#!C7Se@<$fFmlNy+QTC;4+}3X
zj^ea+GLIn-G-gYmmIzM|*MXkHwrUH8V{EA!N9RP$vq0)MMnLKQ2c=q(*%zTjR%nY(
z8)Ih$F_tIW-jQaG+8Hg=Pmnu|$}$O1ImSCxhqT=73PCE!ArBO+{aE$s*m~1r%;hCU
zlglah+B{&6xb>>$xW`%fmlIpX5EA*BF{Eb?pF({FZ0MHjs9cM9Wh2TM9&2JT*pFQQ
z04!#)1(oV4Hn52mmnBuOR|k`t*szikqFp%zrZbke+(~1Oc<b+3RY1;~%3riXlE>ya
zRw!jo3geCW?g#X%f>Sgi8E)c{k-q$V7b3IaoeYWP-Nz=xR-QNx02uqcamS@wv<no8
zac>TPd|GI6%7NVH)}}7#<&tTZ;+ow{3yYx&nEqYeOMiB+D@i1AUA%h&oq{~{Aax_u
z^{j_4e=L`?ppG?dw(*6@QV(2;md@h!NfWCEOzeHREIZXbNiWZP1d%X+1%+RUSc8_w
zARlUMzFCnLNmT({sVl+bl08jVnn0?tI-<shd<=RqImq`k8D?W68;G101xQX}_8#=?
zgh?@p-5THbl0(X_>>ia8l~<Nsg&7lYw=ITqo}l_tO*35EkWfjrfl@dpwm}_z#Y|yP
zGqKAk{p5}JSK5J(h|3&8KPgNtlPgGo;GRg&YNmAf(UNGKWVtaRY@fr>b5a@YCEXjw
z&%H)r4c|X|9+fQDH<z<5<kwM~jhh3c0Bi%G3OM>u2673~WovdJ(TPw8Bifv?CDN_6
zk_^Vg$tP&@*nv`CTC3>|WbivoOKp}W!9VAkY{uf=+(QB^w%Y`9+`_mjG0x(7%>^w=
z)34bBtG_tf>H))#K~2AaJ)3zKGe<c;HuII+kGgyQUX@_CkWsBJ<3$4&{%USf$NoG|
ztyZ|6S*0?p$t3ZBKr8Z-)2C`q%@nR9+(a>V_PAYQQidW4WgveL@9kA5c;Jm-Yna^w
znH|)13^>8;2c=kfk~cRK$s8s;GZF?}M^FVfiDWXV1hB%Lzb@0;9q6^0N!*3tc+@@E
z%tU0E_}V&;#L@!|s<S}b)^x*0e}r{AiRn|2WO${D9zewEl4oiUQB)@TLy4xhg`WWJ
zicyX`k8@7f8DQU9yGs+@vPO`GGB+m&rrcCa>~0Oj^9N}HfWb&mM`AlvGquFe43@68
z=Y=Lnw-*@unC?evl*sn-u$n-#Y#ReF%Iojx^`w=CBTkDe3xl+k%xs4WTeu*1#Z3Z~
zzw^vHW>^Eq8!z4mrBt5frd5vFRZi{97-g6JplU|Anoz8_k(7}B?bUhQy;S-SdK$RX
zuq>-A%W)jhyk<bRHtf0bWBwxE=9WR2ZfB8XWMi1+fbH4`b<gsrNXG4olN<{)n^{6&
zk&bizd8U27OU4M&hFBD=XsM1mWcu`_)CWpTu?e0c6C_5?g9F~8zgeyoU`UucuH-nu
zZryz-mG;RjqS{-6@hYPEn^oJm0Q40)z0r)KNgJaOj=OTn?V4<QvZ)O)LFH{$J6mew
zf39)Xpz{ir1~5wyrM82Ne=4(duo=u-o!%pqDt4&#%_Nr7$r+X7ZIIxoMdkC<{{Xrv
zrW~bc<F&obl%>gq!>fs~0d6YI!#gz6z~(fORx*tk%QE#K`gf+S+yZYfz^~FR!9Z0W
zr_`TXm|CE+lHK`|K;BUg!Y^WdXkd{-J2_*V!)^?{$`t9Ixu`6x-U+0U#F8|J3XJ&*
z2UCv1wgrnUP|qZ7v6$_h4^lh()LvbjZT4M4=}^o5sgP~?y)j63DBRlMW#w5$(T^{x
z`{%i)#P;n2B)1_~aStPol{7LW@LXF#WF5?TmQC5f2eIu$aJW+xy8$X(g1j*FrFJxs
zg3n`^?q&#NLFI2Bf9Xxy`!_R2N*|n};~)KcnBBBc$8~9L^So|b$^d0QKJ^Qv3lhT|
zg=CS7vbo8RJmAwQ5x?3eh3#RtJKi(%D)7GN9qMEeHPlfxyp0fu8Kw<@+4S_qME?N0
zDr9y>J%Gl2{{Z^b-Sa{o8KVLKauYnt#N?2B4{us!7M43{A|Gvbjt%4o4ah%U^vo+S
zl{{(;BZ+~)K7oxz0yGL#xH)VjL~;kNYHhP5O9XJDq(qR+bGto%3Te9yZbx$Lp`$TL
zE4+A8tH3_I_Nv#D2wh%lj1~ZIQI0_L?Mo!{nB|gLNe#!yxNbWSZ)%2Ccx6S%3>Y&K
zy$KyYwC~)cToWwu4<cZyqbVYc?ZD^iY1+h!-dxu+q^98l?M?|e;2%L%Z8mL@jKO07
z@Or85k9wNyyue`r-~~<r+uYS$Xktlq6pbu}0xlFZyz)C|w;WY>mLNm4z_YR7wt4iW
z`#cdwV_QcGi<K=W3`y*J)WStSFW6EPL<UDB66dELlxhQ_5d|<8Eb21KvS8r%A4-yI
z;d{C`iHBl@3`Z}I^VXw4Voxx@ttk7$jz)N?BQr(0@gC+p0J*D72FY(TLM1RCDcfjV
z@~7PU(=RP&K#s~775QE>=qcg}R^~ZmnIm{yJkc_ovh&40C?K7lYncH>8`)5hN|VR~
z+Nm*+MCNN}M@QItk-^XT?L_PnAs3gK8L$|Smu@;5dj*drGakYWTh2)OdYUAVsXOB?
z`|<#60)CX!0rzbX-16MU5Fk}`UQ~{w>rk|1u?cpKnTAU-#@}&K%e`T6p*A<(57heo
zKC~jnu?2)X4ZBqC$sdh7jWYC7y~mhhi5LjXVGD3T>T&)xR_&*eqM6V}$Uk=j@@4cq
zcBY@Rh|45xn6P7vz8RbP(6+65jpaBD?S^su82<o0Dw7M6*`?gi<wb1kDQ(LbUL^MR
zsjgPqc#BSw!XGN}vvQ<yjyhFnV3116Zk8RO71~Z@_Z4Opw}FhS8$@M<{_1AkxQ?c&
zFcNtTi@B}I3ZFE4zG9=NHD2KPap6RW4hqbtln1Cjq<YkF>VU{?@8H~ke5HO|AFWAh
z_qup8vnR`vz^Gsc<4c${xRUu%-FccoY;7B(XWxO2ThpGj$(L&@THFbhx-L)3*yl9s
zX-F>eXXjE=VFM>U>LBR_sbH8Y#G)wqnCI8hj$}Ork)cabaAw}h<y`>j(xZvQks);{
zmn5+qfl^H29yuY{9f=acS37wAXY{CENgh!0g-{MzO5pw!oRFK;aeHulsU3GS@>u+&
zcKm6}C<sK)x<-)X1A&g;O0KsNI<v<jkiW$I;L|RyBS`}jk1+seZZkrth0I%uXx)mI
z`CI;4Gkw~Lq)sA91G1d4LyV8`s_O0mllNvaa6#+uO55awl#RFqV;yPp+*i3PTrX1K
zu5q+v5mC6`9_ZBkr0y<qLG=1kG0SF0UVtD2zokY2Nxo@$knIT7YC>X76Tntj-+IWr
zda3VFeVJx({30sj1Fn5)%G<2$?Ho+c7~O?#efX)Pf;I&efhVu1^`~^iqS+n14GJVr
z4%H3w9Ckg=txp=@w64nN2qd7uqBZj_ScPsB1R3f-#;ql>bP;V>v6cacZ+ul=$hgFf
zJjjohj;DY3N8^fe!WL5!h0CvQir$3wsXopN?^nnQ56TWHVvw!7dAkCm7WtP2zZy;5
z8YC{^8W^HuI8_Whu7UkdY1X<Xsc|!{tZ~TuHykGbpI=I`X=cJREC3bclE=4USFI4*
z0+6dCN%J;e89jdrNuxxQD6WlpXE4)?K<y~Rtp5PP^gXM4!JZ1S*Del<my*C``Bp`f
z=zIItb@h$hkt>`dvwX7v58+xi7t`2Cv%<bnjEu}2WAd(?Ea+3jMpdJDt<i2Tm8kA7
zihM68hxKEp3z0XI^1SQckLg)4M$Vxok~U!6G7MpRS4XPCHKp_9y~8taC|Hg7?Z;f!
zCg~!P+V0I`kbld*aM<i?OjM{k?b23{Mc8pt<@bn|-Zeg9kOe0J4^}?EN^ylCDzb$0
zTc$V;I}G-#scX5_ppB)GAqB8HA3;fZVKg>l&zLeyIUsV4>Fr$H?&gZbaK&z6YgmDX
zIYwqj86^G{RV{wWY$6V13R?<?J4e!_ZDuVtQ7VxioSt9KH)kDc5AAp-4fZ(9Z0*CM
za_8EW*ejQ9bklQitrD}AU)`){kZQff)}3gJ1;lbQxjsyBz6%l7thJ@Uh$PTl#pJ1d
z;QIF%>qV}aZzDqzLFNTxERz=GpZ0w_@kun8_e2otHs(1R7+N6Q7~Mf59<`+c2?{3t
z&RaQA#ZyGJSv=3PIfyy)a@aWZHEJVfk@->ik``Z(qyGS_^v|s|JFw8RZ*Olo^6n+_
zm`RAsw;A>N)p?|zNSExaHe{rVz?KH0yOi9c#O2k1%HVeth*}t4>S;GQz}i~{Ppvm3
z$IKRboX`lZ<AZTY36?^mAP%2FS7W}PQ@JwCqhzgy&jG%*nf9AVB$*P*Nm}3l@+)8;
zr9%T|Ws2H%X+i%0Qm>FczLim_%dokNdX2I}0fIP@wmw;RWG}d?uNo}O8A^!&z*gfP
zzSUptx0f)yaX_$0?Sk_kzk|jx+OuW5)TOxl6xOVgWQiF^%4#Q8??X2wb7t=S9tMsJ
zK_={CFxWokt<MLXS#2YAeSno5;A0#L%?~tAvRy=ozzyg)Dm!!PYHLg5b28Z5xLJd4
zR++x&^r2LJMw$t(?Ny4hx-t#3Z*GIOX%l$Nh*Y9*Svn~7CYgIR<ku10c}imq<;rpa
zVh2M^b@Q!eK^ZHvYXERhH4>9-8zx;&_6fw1B4HSO&G%2Js@kNM*KtYZNK3i-QD3Lw
z=}<GUj!3Q8JVq>ePCj6B$p)B_!jP)n?<*M0haBV6iibAzChUIU3$*u<zTJUkVAv#j
z3YnyLwS6(!i*=A9<+h%K@S^Hipardz$g!v+cP+I0delq4CJ@9~f{n`HbI&+GN?k-l
z5Qfz-@$AEVvPk`Yp7mnd>NR;4M!_5W%FoFrqexm}i?=MS97!inz<Sk~EFh7}OBwT-
zi)S1FXjc$e>aw(3t)lYeSzC7h0Pg#H(!I8<vdeQSgtyoNG31l$nwl*-SB6HmWR1Y;
z-1G14R$?z~-cn8)G6$O@F9$ujt5QR;M%L=_LO{5ZAjRh1dYo~C{VK(ko}F`~wxM#%
zy>}lXHwsm|5Ic{0QWoit?pFsn$3Q)5Idt2rso7EmMG1i}(X{(kk*gKBnrx2B_TjD6
z%8{c-lZgIO!_fNGs2U5&Lf#O=Il}Nk{3<B4%|hj(yD%_C%xtKf5<8l`ZKbu0(a#PL
z=jLVvg(udNsT5pcCR)CN>fc9>Q4-t<2^&+5qu!{`p*83?OK!l%fXGW>0q6!hn%8Sr
zMMrr|$s=u8<5DntoSxM6iZDbzU&`c_T>ad2KU!Ya`xVG!*mz#TS<&uow;$rmR^&Q$
zox8@apu(pN8-h=zEwl;ed1d!62aY!VYH0RIRL+5<MkR87R_qQdIZ3u$AdwZ`kR!Ms
zXDbvq%LCPy9f<E#WDRbKZ)!I-^4Mn1SL;@83MmpwjkpdQ%=rNx)Z1-dJE?N|YRVCS
zjKoLEPjgaMgtiuQhenotk+Wrd;gAofwKDDGhWVmtk<<{y6m<8g7tH$$NhA#KBR296
z0Y{*uxwx}Sfeq97W<*di)UUCrzNKi5t4&H<xHc`mOp)x`$^l?I(<MZX2iuLOI94Ap
zK9z4qyVLC~Wod1E$znhT=j4vYsA_k2a_Vrkq(z|wdE1m^9CaSmo6(yk?v-VdD_HR?
ziv$NannT~y+|*I{i$sulYi##H0TRr|YN70T>r;QiJvOU&v)!{Q2{yum0N+3$zZl$l
zwkz3u8T%wZjeI!`)xNh1&av<EFbcoafNSV-E*8!>m!Ik|=H)nXnT8huXIfTF@oQU~
zyV;U$I#J}4`_^D^z;+d(HKdzNMl<s$BzIBkTAm{Kd*W{c_@3uP@hmTIBpfj#C|4X1
zK*8YgRYa?E5rzV?I^%HuExx1j>0Ty32aC%wQp4gQ%Q)_t*+Qi{^wi+)nG7;Rr;j^o
z#;Q6=$&e1i6tAs3@`*6=G3C*Z3OzAV-p4AtB;YEj9FfSXGwGLBaUDi<VACD22+v%1
z{HuY={Y|dpvNrVlt)*ku2{9Jk85tM{v8gqECL7ou=EioyFUZcv3;1_6m2Ij|EBR4L
z8F<hZiI+HE@uKSR*(7?QpCG9QBHt?k)|K?I+v--hxJbY<NUZ*5-KcYc?@G3^wZKJ2
zaKr|Y58cf=+I=ruxbonXMI#W<0m&oZ=~`Nbm2;*9X`ur+*&!H5H7@8$a~N|&cCknm
z6__~~$3^w})X;gmi$;ZUg3eC^{{XL3Yg0pc3Z<;9Cr2Vy{ubk<K^nqr=9Q%K@g5X0
z>T}Q1qT+j&Z5rMdR++W{$7Wj$+4iVzo>rBlo8?Z*PhY~BACoN3p-5(o0PV@gs?#o}
zwzE$tE8wnj{IR6iT&;OIict45D#S2J#y0&bwAzeTvly->P^4r^r#yD6j}%Uf(+}M-
z!teXpJ*l#3`dEQ{=PDZ@svdAEbTfBl8|&>?R<#1(a)bmp5rA9hdsATWwe%Cke-jX!
zNBTs=J5Q#1n%cFB&{?YO8_<#S9vOR76J1Mk#woy6&jEj!{Hksoi>oKl5;+~=o+rX`
z%*XSq7y6!&6hOe^Cn}7mq4lh3XPU-YC-W88h9n$w=~2&VdwVIHPq#)*yRJ9#G3vic
zZ&!9dXq0R|JG&??0vx+6tjoRr@XvayrudmAcb?JMGciU-KPuy|6`iQ+g3{x4!iFJ$
zK%+VT00C6(Zlt^q62;}lk`iMJhB@z_tt;5Y&r@3F^4jipx{fm(QS$O*JoKfS@nA$`
zQbrD47+@M^pQptzSgu{;WF$Hk`B-+%MR%s#!5qJ1jfKCPmXx+YZvOyEmhKwZuG33(
z6p>AC7`tR`IDWl7u}LR}w6`W%(cy`R!iPC0)P6M$)ylyzohJf9!w`}DIH^}p)&AQS
zQdL<G$uZ?uBd#f2jT_XH`wrg872u2r!9Tpte+sh|mZf28*OA$5f?`#39!`7JyIm&j
zHd?eo;zc=UOod$cAk<__A@WV$(v9=0kC$h2P~^%{u}bpFF$=t_Asaq(3EEJ5{VJgf
z!^x8BDC1S)M<)xOr`*<!)B^G;Uc|Mzegx7sRe<##p7oEY=vNkVq?)Acu_)e~MngBR
zu%{P&$d%CjLgVaevRg1Hcv%=^9CfIY+WzfhUSf>CU6f?VKcK5f`e=`2LCF{-?-<X1
zDGjyAMvC2x`^e!q#XF*PWp~rk_C41Zq%3kDB(NZE^r(fEyesFaA*4GKJ@M&Q;L@(I
zCpKT&3lxY8sAN2QAAZ%Wo*lTewUYVuD=`O@3&>M<mPz#WG<!=Fp>iJ&>M|R{WXa`0
z<%QkH%--Jh(ZgY=AX}ksjSOczjzRaXa_3U=?3Jw6Gc!syumh;{<BHH-QukCtVl8D!
zq(ivp3WvGJY~rz<<*B?Him|P6sM^}8b0YrlEFD)E&sxg3)+~P364MAAbBEkB>+Mp<
z;LDkz`%Jf4Vw}RnkZQ$`haj_@EN~(>-ajt~6&Hk2qf=&G{5qY)$@WPUDdQyIG5jih
z8s1xsJ<AR8%0hs8k=H)e&{#H~4Z=x$6;Vz@GT<Tq02+dO%__>?TY{Tres~!306gGS
z`$pB0AG5Q&W9{t{(22#K@}x0DUR3)1D)MMojS;-mZT|q#t_ceyBnC$Q@c#e`=Wje+
z9PHC+u+0)Oh}EQFxsEx&^zBk<o-);Avq){x3{G}|FGT?Ied-)#xoU7)Sd#Bnw$tQz
zudX559~%^W$2~JZ@qV9i2iY`;N>0*jK_CarHBNmAukK|L7P;Q|j~o(DZ=kHGhNIzW
zSiQEv6O!eZbDuyfPE}(!Cv&U5p3}%%tCC!z;#*c+5X0+S&EJh|o_5pYnWGXNrAhrN
z_1B1X4NBCAtuP%o7GMhl-FU7>eGY5e(&pf-nB1VR8T!>ygm3Q|RH-HKo3G-VtI6Sx
zDC7nbMt7aE@z9UTufp1lkQuJ7*~b0Y11dB8HJhaAG1;gaUwUBd9r)+1X+6!n(z{s5
z$jJ~Ola(j9#VIJKWH`Asb|v44A_i+=ex6<iKo}wM`U<LbtNA0@Xc*uIR~e+R(`C3;
zeW9F4T!uK_Ke`WNT7DnX%U#U&$Qh$h4ZOo7Wd5|h)P|g!FfT4|;G9ahD!4455(w{)
zdeYOpFK?<bbhu=b?*MXCdt$aVZ6`|`wCN_pf(uI*Rmkc1R5n`fm!Y2}X7jwX+vSc3
z`u%BhHna{@w=q}3dXAqgzqmeL<A9?9$@MiozlLQ6C%Sf6Vb7e1`$?#Ezlis7Pb3k{
zk||KaG+bc%6I}JrinTpbc2LXa2=ch}&o!ci<cwuflwOBdd#q^MYX-9(bZQ2~k-la)
z=uKy89y)=_S=!sWNuFViFbBSCE(j#Ox>;lZ#z@@>Jd!$$)|7Wv+Cg{JY}ODkL35T+
zJv)+U<xvGGNoZz8ZLK`*cF!bW0>HjlwtEWH(=^>8+DmouG<Ooj^5-!ftPM(+(?@hx
zdtJ*q<{-GpW7z%`HMB<Dn}lIBZ^Gp`M;~|`(sFhM1$&RbySB5G+gaI0EP%<F;IYkT
zUOaOcXL;3z@<JdWkUAXIu^-R62{9K#=6asromKl37CWR?X(o*B+=qo7c7S?NtTv09
zMa*7gk9^<guMk&8&UiV<Kb1|XPi?2p_ltEKz~~AmWN&{;&32TRnk&R&k?z=6_)k(Q
z)Vdt9+7`CGje{;(N|U;c2WCreuHMG)Z3$#oi+1obt)955iKyL4D<imIapV*jB!keJ
z*wFOLTZl!JvopFyy}}Q>{{YtFqrK8><kUmyb1E+z*z#A_qn<a=c5ibn?WNV^l5!i6
z7Da9fp5nAuLegf0i-Uw@2uz17pIrJ@q&g{B)^RjvoT*mef$R0EZjLQvyAT5k$(fUP
z4bN{%hc@;qFkMRTqAk0P@++d84l=FnS5nEL%QS2qNF=GoK9wDv=8g+Pa_t)V;E-D*
zp4DPqX)K|*(|pLDX67^;l6wR1S;|v-8%8mSHLuzVG*=Ogs^9n8`q6sPfL7M$5J;g)
zx898RIjotyLk+C%01YM=?GgEySoq*`S=ZhuhHwZ9yMYaZ_m8GKQjIyuiPfhSxvMqN
zNmwdGB0x4qS1lp#b5ySH;IM=%Jc%!uSxdJ7dSG;{sXRj+t)G<`^BPGoSe%q!Y}Q5l
z-|7U;9OHKzdyh)#g%^EJdEyr@x>>sM6b(1caUu|YQqFLH`qiA;t=zJ_Yj6rO@Q%61
zxTf6bmzNQXrNIFF!yJmSX{W<-O!6i?rQG=I>0K#82;q~dH>pk?Q&f3mg4#7Z(`yGz
zkH)9A((W%?c~S{aoX5cb0P9w=3pwoyBBV^i5f&Vg^&M%cZcJEJB|*!T;6JrXn;NHQ
zsiCLovf63wi-&O<<g1L}p5I#5(}#sL%XqHuE@7HZrYvX6KD_ibg=2lFG{qLv<cN)m
z=fAyH{{VzXP`-s_n6z=pD?T5lGsr%*gGs$kgzd66B=K#X^~9I9ktkSxS6;i<>HMl2
zzZ?GmX+`APX@W4>KuUsRUitMt^&PK<+QVe~@|(a`kNCZhwMnT7E~mw{x;Z^WU~%=Q
zXk351XwQ~up=UNNwOa`$?s8ARYRsPnwg<wae8amQ<LOpKh2_Jwz05_EKQo5L1#fA;
z4z*owKRz9wXEAWaIv$xdZlyYVvo#8n*&Owbv2L*b^4xh4=X{Qw^Ts{sy3_R)D;2*e
z@47iNoM-q?rF7a?hV3-mK(M@yj6((=Be44Rt1)TOT28F-hGuQUfsdtR@i9-`G>#rt
zvoUl(hVQ8lwrXIdzU|Y-oE|%7w1<Ul;oh2Y*}1=Vg?{XR<6RZLsq*1KD8uHB0Kq4?
zp-x!hJ>Fgmj{N@sAy~XcM(=Z`G+`7`u<+HEm8Q$~JCXLL`IqH5O!hvsnvLb^POSuL
z-zFu>j9?F1y?G6dobfcWNxM6WE8}@1k@T#+Lh2zLvBbEym*r<+^GE74{Hj!&cVlTq
zSr}TTo2y<o+3h4EH_42GcQO9y`c_l;blVXv^};N<Amgz2HMRDwYFLT3w1`_^s|P<h
z=e1X~(kImK3>R1C7-Im+e4Ove`>XF=P@R#@C|#BG`7EH!kXk6n`N+WykMq*D^lffm
zGtPp*60A0r0|fhy!jQIrG&Ow#OL*OGifz0(W+U$oJ7+(QU(kQDVwINe@-r&|vH`*R
zbnRHwnsL<{Q-z(8arNo$Y^0AzvR9BM3wdBGzxWT<pqK57bR>X@Wg&dzRNAg_$@T!&
zrlVtQk%?`t5qRV&<nhw8Zoz^%CrH_q)G9=$kbCC2lR6qLS!u~Ih}_*q3zDeEBXvIV
z!7OBFh5{tU2oIfrdwSGX^MsA!nlK~^8D(C8{{VLs*)=aRVyu{W*K_1>L8b!9Y?7i}
z#)d>7j4lRP57whm<V5q>m>|g;)@+hJ!S$&vmhSD$7j}CRB;GLC!6&Gz7ZBRLs!e`F
zVYa#`8Qa*?La_u-4cc#sH~EB!*c^i2(zbMsC&QZ2Xz!cJV4GVlhTJ-jYR|UR1*>^5
zNQn^P*rz}{iludbX0b?PoV1zBI)4~H%8gnT(XXobPe{?Oh4sC`c&)%cyO{1#@9HX@
z_O-HN67DA8G+-`B9<`Y@?Ze#V<j7dQXxpjHP`#5^Sr*0!qsq49BM+Eo`c)`ja$M|-
z(0Gpa*Hjb1GO|jzkh%W=II7pWzlZezE(;WBnUR$^D*f^+p1Gb~MtKtH)G0eaM%&J6
z<TjTEFSC%beB%-kkXNuLt!>K~qb_+eX~oUGxP|35`$=_tXK+2Lv{y0RNYhCd%)}_k
z!8q?)8fCn<mj*JZtgV>@=cwtxq|`Lw9kR@k10axzQ+F%>0P3cswj`#OZG9+)_D?MI
z+Cg8;)bsdk#bVbM^O-P78wnd2eQ7S?y7Hrf*;?Q+%EXFGsK?$X(~h-D^IDqT+{Jd~
z89`X#?%t>H#WdvJg41zc+15SRGKE)MG)madxy3SDjXnU-UV+4bu3H%T)d#fHuTINI
zq(wb@k)HK6w}vj{xbh}fnm_`gy8Z8S?NxNQWL>wSBpThnn9$qA*(WL^91l}X@^x)W
zQWSY6HYEue$;V%<ZAYd}rbO0vI)2`BydVLI?hmK6Yg+hzJE0oSa3LrM?-+1T;nuO0
zc*W?A6)8z-afe8`zHqGUdtp~N$9mbY@T8V(5?PVU$GuAR&(^o&@Z9##C8SqS83_I9
zZWo^3wKlC{`emQmWkd^af<l}D#bqo^rJ^*A2(4KUhWsxUp?e*r%Lt=Y+-4&M^ZWze
zx3ybKT>|_2F(V-YhIWwW1Ghcv2{j=!EprPKHgOt;=zVyqy4Ir8BF4Irlgn^t-JW>o
z8R#pWsZLs&t0kd+FA>{GbdeTWv6d1j!lCv0)tyhq8j4~m8J~B|#TSMc<LE1$k_aA1
z;FeA7&y+uOZ6ogE`qb-q`P~h)k*ke?Wjug5Ijt2qi<y$e<ICA3Sfzd9NpN=Y<&W{H
zWSxXE$>ljhySMJ>JCjY*b$=#Tfi#GwW6DTSXK>C%S(!?}9&3nl`7y({9G;-l<V&Er
zjIBd#aj`~Hg?>pCaC22H$M%_yTd766Mnb8G;|Jdz>i($K*3BQ<WQ}BenIjF;ih$}-
ztUqY`G*O~wEC>Mq0JZO0t&G_tY0)B^8~gYqNgN-vGm+)zqOqtgoiw|lDY#9=iV58C
zN3B<Ls9sq}G}TpkK3NsO<YuZvwH&0k2wXS%&c9p=Y7LU*V@`cW&h}I*aE5Y7NR=|A
zdgm2X=^EXH@d&Px<)1s*7v&z<?NO!NcJ8H>T&X)14mNw#Qr|?|oEbK$+&q`TW88aF
zQE3w7w>13NZ!HC)I5%p{U4}NO?Z<ObPpUD;+U6Kx^Q>d0I%m?b+f$QI1l%er^2K^S
z-qlWRTHXTB6wAGng$M5sTBSj^shh83ZtGl?kxWstZ_4B_;C9ci(yK$LuH4M*dY9U8
zLH?DEE~O-luMB{Wsz*lu0P9q7-^gT=LohEG1&2Xeswo+|&gRv|tdXwyB#`cG4ZR1s
z6<T|lUU01|Cpa71wmQ~qI>G=ISjo7Yg{=$7<h{4wX{V4(Kr~YxPruTRNX3axQrLP&
z<U9SY<VuPF<nTVV4c4tQ&F0!piz_Gq;~)yLXW<*Wq<c@dpjC%+M#Pfm(>|4>4}@}3
z-a9pBk}<VO$8Y2+T<OQDN);utF;262<;x5#P9y#61j1*~`c=Iu(&~6)y1POVv&J|E
zyDcxm_6a0liC#3om^zGLcK5Bgth_3^UBuUu1q`HNR~uK>u%00=g&V?$GS!}cVc=G~
zoPDxImP3*iK^sSIPkOm);OkvF%st((hjSbPd-{V{8uQ60EN4+`_fky!&Ga<QPsA}r
zF4T?Y3$;qQ0a3BbbJO0V+E$aYEmEf)Y+s8?(zN?!n)!&gC`fF4#~*th^$Z%vh2R0r
z%r@%n^E88V1RVh&f1KAbas8zu8`RU~7VD5+ISE%jgp<;lrD%(Ba<SY<ib7^ZCzV6n
z+|yK}Ysrh+%IQTKddG-?l)$RafSu0?AG=P(dXwo{cYY~nk>d}rN&<kxo;!os)`IwP
z#1b`?v$_&j%~r?+eQCe&hu#?lxKLcg82p@b-!-HiD54~)%VV9p)lqke_crn{gPeMt
zcdNFms!YXTWq9@l8<&%s=rlh7T<X^@vgz&npbU<n06vv&;vp2TWgW7{Q{{omg$#R~
zdhyn(SeR`TDA1nrW;M2pti+;wokm2FA7~{A7{}c?{VGe{4X?q9Y>3!!x%r#ak4o2x
z^=pl~b<(Rt7~LJifsCJ1)Z(-(t?fg~FKyY2pkK79!h!8v?zEG+x}>dRl}Ift_QhzS
zx!9pk@nfcaY8245>D6q^Vkpu6S(soZdz@Em9+9QWiEnC=%7R~(;RZaZJCZu*AI_(m
zD?4XP3)q0R+)J)7?d~aicD4^<jyq5Ib$K+hdHSG|Ncr<}+X(c<ZuoP;+IEq;=U0Lk
zxy}|fA1=>Bo~ECy>(F^#ZLk)}7|KW0i2mvI=~=(qR}Hp#Hc7N+XMCQ3(sQj*ZXC4W
z&W3GP)J83>R7W|^02spOr{U>U{{Z12h6H$gw3NRnMluNM2c>bh7n<Z(BHiuVGLj2}
zf`FQ+_kJL2p<`=oAuGem%gIyxs^f(7CD*q@w7Axwj!0sWBv)24Gc)iM_V=vW{7<JX
z!Mj<57|GcvafKb*2l3{xZM1!INM1Xu$$YXok|iXM{<UoAKMyqBM(W=4QD%5IV(pBZ
zMm>l0tM*iBtF}+It2bnc<?#lTmSDoqadRlbBu61vuH)`%h?`!T><e2Z+nl*0Ir{rn
z?f(FW^v?}QvcW1C$-++R0tD^bjC#~@c%nEabb{6wgs@v#&;l4^l6`)@l?qn)QB7;_
zGcfpBrY$A<gCi#A1mp7b6|LdTJ57RgXO)@rg<{xMAJo=vsp3YKc;%T^RNv*5Q;Z(R
z=}8^Tl0+k&*>X<FLBc8b$2g)&q@$=s!95LM5nt$fG$!IW(pedf<uAd<r=@awzN>e3
z#w$i9Sx?SK@F!~Axr<NKVe;<bGG`(tg}&+Teg2g~Mz@Ctl}Oh(36^|yr%5O)ZcRqy
z8dj9+B0b&FXO&1qVn9+mpHW&STX>c2+Blk4K--XE572h3<hq*X5i6mMnec~pNKbrI
zjorY3eDJs+qDZPUB7@sKg*KaFi%~?^I?7)mj^0!eAO~mhGk=9qyP9SUCy#2f{IB;;
zeTb;9u2mUQ-vPRebCKy#JoDVynI12c3^2#s_x7z}3u<R6TyNS;f$f`eWMr{!G3qIe
ze>hSAP!(_hT$Are>;^5Pky!(7^9NJM-KOdqg_M@@UMx)$%G(D62Oik1tc;tnW%UV!
z(Ou6Zk}N|TbGIWH=hm*t;w#62VK+-4EAqR5c8}*+(6oiO7|A5zRQLK+-(a|sHcP8b
zpqzZi92!kTYElDxV|RDtN0i)ud$IF_+~c)4v%S+KA!JotJE_k<(zG;f2Hw&~jzvS1
z%8=MBdvo5pEgIh58+4i*B#`c9aLO``?kg$Oj13`5Q`MZ0*<=M{hBj8l;kkM*t#0WW
z1hQU2*0C$Xq&>vR(MNNSb6c9UH*Fg|nkHpUtr(00`P6<GwwB6QH;j%X#9?Dys)w$9
z$*d=cPA1W#X%2h4JsnIzp?GCKCzyb|XSvVytesoN7Z-oK(<6|oN1c&GK?HvmYfr=)
z4eqsc96V@9+PiQwkLgyeG|Au#Z#BCtWky(x0!L%*-mq08xvwOih~_4<@m|07d%LY2
zVzDc-TZB7UfIEBCb{Y`2S$0bPQC-O!^WXgDyICL2xEBo)poK=%k+^Z}D>KN`8Mi|0
zlQhMr^WTYA`>H>LdK#~6+O>q~B<>n*wAYd>Q>rv*s%4ZY8#CLEwV`|ASk)ft8??e9
z3OU338lc*)i|55{r)hE$jq^K7K2h8e?N%VvF7?C_LWOPF!24Q`G3p1Wy<;aP?r9Yi
ztW>b@B-4Qm?9#g*H6$)_qo?IpXVWe8k1pEYMclu_pr0(CUvpIMG>u0})V##Fml6=I
zGr8J8>9lsMF=$uUjJFMR$6@)~J-upV+t%g9CD65`3yVnq0Cgb_>dhhBkSg7Vw)VFo
zYbh1N1D4yKdx8x@(6n3P^S~l7a*A_|^`;G8(n}*Uz(XsPK%fTC(z0nX^)K($Zu2$M
zkF%<VjWdGY$JV8|)ZRN+n)X7WN6MJuFgyF2$++<au(<m@sbeay%ou#VJ5nX(<>j(Z
zbq3A3U8;Cr_o_Ki@1dusYmiF>ky_ovtjc!pL-&VHduQIL>Kdi&lR}fC0PcLpjxeAc
zby55^R_X_gn1pgJ)&<mbWh0(y{+Fug2088g&z{`@^5;K00(*OYwMspO&D@US&RAnI
z+dxN}Hj^XgJ^ug-mfF@Pxmf2rnPb3Je%=278qIGPz>!W&D$(x&2!4k(pD&38!_PE9
zFfc$F$T`MyT1J%Qh?Q7JsnBb3+S=H>aKZb~epD<5R8~f>;|oYkmI-qhe<%Vr@^U#o
z)r+X=kxsr<=bC_EhFNe=zth^PrlD!%GPROTJdUds#{7J_=RTtyE2f?sm0g_j#Pmjm
z*Nf-5+afV4KnkQ0jB&cDHNLTVb{1PnODE4}Ao)h))REtg^%|w3-jv=Xw=K1|eeb8e
zCGN9lXr4xtCiw~Sq%W6K>7Q!pj1ti!2~@u9vgBFB@m=Z>O7SO|wX#+7*!$LH{{V>R
z1kE}o<Xkf%02OOG;NEKT;N1iYK5#}ieKAto_-%gFvfRu{N3;iQ<0rjrp&07Sx#cYp
zQtMvT@0gF3m3W0hU}O54o(&r6=0LMZVJ<;J%Zz`HYogP<DdaG<ypdww3r68L2Kstc
zh%|`ec+f`DNX@jVIX{(5tHL`M8WVe%R$dZIagZAUj`k#+pIXt;G`l;@uJw&0X8q}0
z?s41Nw`?>S1=wqt9ivfzSnXfO)|}ccrIaq#H|QJ8W@w}*<zxI_!nx&$=2p41XejDa
z7WP*M?C{1VL{P`bI2r!EI#cHG$!6N}HfA3<9BdR@_=`u=3KfA((#w`}AON1@6%4--
zHBCb9PqS&k!1+ITpenDeXZ!Aki`ktghWs~W9hsgh<b=YQf0r#N?f(GktyvRIg5DcV
zKP6*w^GZ6iAK~@`)9YN-oLbD%M=X}khEND7epLF8O4qUe&=Hw$6KBpw0^{+nI-Jew
z&Y0OP3uZ)|7q*p1W40`>410=}3sp0$3kcsK3!HU6nXK4#Yj|&CvYKR%VJCAB;`9}N
zO`6_YA2i;W<uWr6{+a44H*(dDLlupT!t+zq)T*W?02~kp-6Odbh2r0c(&<`!np|x>
z?{OO#?rreCU!XbaM<3Rmu3BAAk*$r-k>>vZt&&wPG3q@ks(23TQB|~_<Vzmy#KxSH
z`1BO%s!B=BQ*|1&P8Y-;Kk){<0+iXvg`8)T#s)i{m3zZK3_MffiCWtF1u-(^@H+cs
z^!keQT^GQ<7t`naOI?WNUJQG4^JBjpR+Z#p&cQ4+#oLm1F+8a2pT@c+jEavfHDegz
zTX&ne&&BYo!yX*5GPWd=ObxQ1m=H79+PI$=OJiv;h7iF6Y!VZl?Tr2d(>2rhpH0?v
zmR~aM$Ck%y7b+KwV~Vk$cqT`)jRmxGhb5X>S0%C6@TE$(Bj=kHN?h7S9(|`nt!vV)
ztaj}4$TmZ_<x%X%&=2MKS8b#GDmrYx+PA;Iltd#_JCV0Na61azw9zzw58LA39(k0p
zkheqWR^`<$=LR_sm;m{ihhL><TNzev(9su54G1rPRzakAYST`X7~mz>h9$mJ_;$r=
z%X(o!98zv&;V|9)m5p_%O3Dx^VIysBae+~nU;qwSA<1BRn&g!^&E7{saEh`tq|{sz
zQ~(&^#yJ#R-b~O*aFe2>Ys!wN@vIF>_VLJy&N&cDz%g;is~UM1PzYnV<bos&IAK<(
z*=ioul{GC&{7hF&TZ0K+&7G&dYmkx&?yvsT{&dUc0^zO+C!W1}bJNnge-dgJ+Gt|X
zu?)Ld!~oa_udQTh{{U#dSfjN_7tJin3Vh7Rza0nv0A9PPS`oTAr+G3fZwJDc@=bGa
zviYNOWD(@?+x#kMEv@|3mr0%GxrFf`Z;&7MM{3r#(k~&0H&=$_5HT!6X&#`DN_$Bb
zha$8V-)KpHiX{UEhgGpEb|}H7%FeeE?b^(DhFzswza24C!Xvj3K$lALB#uX}Po`?!
zzL{sJ$hMoD!z8E7Rde#^-@iSo-m9i*T0GI)X||1YV^7{lI;s45tlaL)P|(PNDGNqI
zNr3s<%g#N|dX^nBGR_bw#!EYW)jp=CwuexWmJ5^qskb8x4CkjxyjExz&S?Cgs#*NS
z;z9idL#XycQCo{`WnpGjbjyaG-DDnR!5ltE&9rp@9tM3YehW_xY-E}=w+Nxs7v=HR
zxVG^Vh~rqKR+>P>q+_u5^r+?4b=htsg4)nXgyftIsK>2Kr8#QGszxVRmlnFCZPP4K
zE%|93{`N;oihm75aUxHtUB?`1+ngymZ(;rw&FOZU>12srVvc7dBAk~au<y-lPdT^T
zg5?kh!xWGc&q6(qy+ebHt#XvpTBAn&{6A}KtEI%xhsN#Oit)%avD{n?+@c(?*rG$o
z{{RZ(H6I&EYpA7$l{`|rxK@x3BVMil00PHKqpE7&BfgeKhWw?pM=*gO%-*WrzSX=i
z(rWFID)CQ5bsi~>T{}$0_3xJqk}#0&JDWWGr_g#-R(4uGrKLk|@+!drV<^YY%hPZ@
zg>kZYM^)4=W4_fjhjfiYK@-SBjP)b86?;t5<I-h$mhG+?qUR34p&p{TJ&a=uC#jFM
zla<;!r?}EWD@NbDL9#g<?I*AXkuNm%noA2g73W0Uv9t1h@z{ITHHpw}Eo1%bTuPhF
zS$v3JxNm$DgZOb*qrKAf$wm67n&L6JnDAG(^{iz~wLJ+OBr`{69KK^*5*UMkrv#o2
zT1Jx2I8#x-Qy-bM+$4KdPoc;2tQ)To#S!~o*;Z$f_N!zKo%pKvGQIudK?b10GzwZ4
zJhpnD!mUxcE~cknbK=W=I^O8%wsE|(E+q&92SL~$p*(ulR;jAZ_Bhx3K_rAGP^%o{
z`;13ifBNg0)^%%?FQiynOt7xkONh8<J@)zvgI&9dXxC7i&5qsxpu)c@vvHi`xjfd8
z!@?|?Rc566oz<%SvM(}WA^C0Ga=xTzr}d~T?`71kR?bU_?N#O4`}r94IO|k2y>{pA
zYLX1gxlDV&#yt&fTc@2MnrWHBOXfz3n|HT=_zi61%b^Lm8Yjh2+gck7dygf&-LkxY
zc3*6Es@@{Io?Eze3ma0cBJ$7-gS38?YRcxzPmIT9Zxz!@TOq*x+3Svb`_)LJzk=iK
zR?gPue0`?EWE+%&#EN?lQSI2~vq>j%uF16j021r^Y%<8CLT6o*lDT3(p{)C1bZ*+|
zu6Bn109LK@9QV$8){dp3&AaXQm<q%KrLZ%P*ELFLbn6?TE}~z}3$YM(2l%m1OM}!b
zgp!Xk?mgpq4=SL+9f1{pMAI7cSo0^DL{Ki}?T7yBdJ4tVd}}Sc3n*`4hE+RZ+Zf37
z$nI-DS=DuW=!;8c{#Z?<+cq-Y!yftTPnEKHqM6nBugCT<$8RLayX2jsbO3RI)Q-d6
zxtrZ|&tmshw=-Gomk_Btnb>s){hFIi@H*<6$J(bdeU=zhjqifT9FKe+_0*@r%`VNn
z=Y+yZ3<l!LgCBd}H8PbNdS6kcIh-wqjeDv~{itS*m1WFFX(ayudy498JRxY9)GpOl
zM~}-Bo~#GAU^7qDY~#_SAnFkv-*?Jf5Gs(4_Gbb+_Lj-=ZUUwW13eF6p4@c&DLL~Y
z#tI&$o!#DssrI`|#6xPpOo*7=0Ox_;vh`hV<5NFk)0`lXd5ycHC$SZ3*FkokDKEpU
z1xL@j0fFuhb5q*r)`kgI@&en5jTANtfPVMsQOy)xq}GQ$CY`GIj~21S922xgqcSk{
z9+lGQo(O}((D~8nrCMGllH><tf!Lmdn$Xarv(reuyW6}1Etq#Bx2;)Z7sZ-O)lWGH
zX-gfc^r)R_Jr>51qZO;%V%@Hx8pbTqkrxRdQMeJ<p5~{sy9n_tA(3S2Tw`ai{{XI|
znY3LVz(Z$xJmdt#>iG(Lk}H+fym4x}?Y-2B^4i9mZgC)8$JKuy#-=pqQ)5X~g+0#e
z#GW|R^~R1pPFUqw`U4nM>5hZwIj%cg@kCZP2T{Bc$r4~RQT(jOwmqvG#a=eKzPpKZ
zctA~oRpc3B0OKHbAFX3Wr0e?a_<Otko@)hRwBd2z71K(GD!h(rwcOpJUcc6EKFS+T
zxZAd3@<$;ANDuHIPTc!c(b<H!Lk9I$P5yjxWf{*^#b{`H6na&hlS^qCz#u#F7-#Qu
z{Ho+PkEeN;QCdb+Durnf6j7dVJ?h-n$jL>$Sw<N32;ym-BDRV(-{uwh!2CKBQ|VgG
zrkOarvW8ceJDiCyp#2SJYu+GRS)H7ml<AH!*dJ=a({8n`Qsl0iWb6sT;d_pG_Ts5Q
z$~R(jv$8vO*G{2tCZiC6jBkRSixNIx_m8Daz8TSHy;(9+V#Y}o*X9I{SC7)Nv~4?9
zS)zN?M3y31Rw(eNJ;pdE`Bz2uT}I+REp3q8G<%_$eo#Hnt#irQ`>fgu`=Qf6hpn0j
zw7oPfr$aDcPDiiQ)OQ-C?b4fqf+pB@#21nW7{xbApHF+II<(PSxx`XR?}QDW{+Xig
z^3krNwz5{0##TwO#yev*p1n)yp_^lUEbz6@koMq`u9pXuBe}&vt7@9=jH?Ep5W4$b
zcFwP~CmH!`PU_L@B8Kwr(o`FWP&$+E>sBJuY^1!2?lwpvQ1QkNH@O_2Vf^Zp)Mcs@
zgL@o!(tKH~Tn4_sD;wam%O2qx_fLB0Y&;ctHLP~GGH+y){TPpz1KS_gx_GQDo;dXl
zPW?oYx9%b%YQ{c;sXaOA_|vZ~+VaK1X_IXL;d)^D=dhwxr7g5U8ZnNn=Hao5>f&2?
z)G%cc+=c|Ypsh=2Q%bh;<e5N<U%ba8FKn8q&nmGh-d(~Ck;xh4`e*yq4ZE2l7O_Y3
zxgt>GJJ_Cnf}X7gk=WImR+dSl6P@oKRQ~`MKAwiFJ*r;Xu!boTCS9!?H!MeRY8kKR
zw2((8#+W_?sy^VxKN^Acbh(O4ITS-GzxvJCP!C4@Xi#A0ix%D#msh-dcs#U4Q6<Z>
z9H1Va^`EP1)*1$+mJMPj`AL#RkO2IAzf2yrnc^9Bne`aj#%GOUAf?1?KxQ35_NrP}
zhHgx+sp@-@+2<sJFw9RZR<?{Z)WTAC(H3R#?zM3m*(RnIT(XCT5uJy#4s(t$eMMAV
z5?hP)ad$ci5EVC0U!PH)m9uN4Y0#N1^vOKmGYcE-+++Hl^{Bc$&uYSE{{U79Sqk8R
zPo67bs7dZ+X&Nq(VQnp}*6k(4fV5Az>_6`V(0kRpI~d@*jvKgq`CYfn$O5V_ZauxK
z+<IN2Ut8HvBO!D<UPd@Ak7{?3JeCo>4vQF>ln0M2*x-;)YQ|H0qSR4ZJtbrYHI-DH
zov?hT8P4u0+I^HZ_p+M+&m^|naNW7>p82cE=Br69g}M159%lgV^#Jy!O$4_SHlYoK
zk)tBVhhddr&Ose3Hz#uWQBUouZ4=JX7r9uxxuJLAm(bR@)h?s5w|4tD5t7lFSMOwF
zZ|l~oUNo1NUR>IHMAAcyoui(gkJhTgYR1)B?Imd$N_k-Aa69{bYFSCx(mI8(m3PB7
zMsUji0DI~^1xKi)G7`#-Ae9KX8}hO7#%Z?KmX;c{aNe|kX1Rzgjl1SXAJV3HVv0#E
zqL4U0IgL(6)BIGgVy$u7XuFOW{@kWnpyw)pe7%M}g<Xe9i5O}Zw;OVI0TCeQ-m6%{
z<&PjEIZ>2g{Xyt6-n8Ygx}JY0?9xm=UB)qunH-wRq`DeLHbtSY+x?DvGY0q}O~Pot
zQI7fbHH9XxsA_?P-c7x@B{@)cA^v3kmAz}>d+V1*wy~0BV}KOkanzcteGQ}#+}KYV
zyr?%o$N<A<*V3?$D%i53MW@>Annm+vRnA+Jx6|uTrl1!x+mfvz;iGKx>FrhmEz$wy
zGCp$PK0^WA9@NM*+c*)H6pTkBnH*;!g*za-Bx{2u#_8eSj(~67f`=UOS`p~UsK@q~
zLj*{p{bQe;`l%nwwO6y#Eg^^P_i{yX9IcCZ5=<}yyL(gS)n8F*AxV)H7nsQTbJHW!
zG@jvc1m9+x&3`Q;PI9BEt2#Zbm!?5wcCWwY`O|<i&(KqJ?KVsQ04hB(P_wSn0XvVo
z16TCxKkNj!gxp6XNH)Y2<evO`3YRW}vSYNJCr)W)p7Vu^nP&$o52xeOi{Yk0a}~yx
zmmYHumN`${J;C<xnu_vC?Sx5cLNuiA0ecbY>si{Qk6_3yWPD?d(sHBJp5l~KZtQHg
zXLS?GZ5k&H_oJFV5wp})zqM(%*76DU8DW+$oEco5$DmRD+UH>VR--EYiMJ{Pu@K{P
zdV^Y8Zks=xvr9W8x?zK^Re<URTZ$z%UBA4ZeKYNBff79a=#IYik9zaK>m0T-k2n2H
zppA@rfJa<<A8NaB_7|5UOOkeqHb1<UX2+DjLDc4rOT#`T)8QAFR_yVx3vab}DnE!5
z{JT{_sEypE1hEuSB}WYGB#b805%;ZqJ518`D+g=K#)%}jP`420eY>xGb^JOJ*15T^
z<FL6l6Wpw8jJ3n`!Ro&3Dx|v9gj~mG1m@;7Q*91$=czofCxeV1deOs~XvtFL-0nPC
z;lB-dD%_^G;>e8eIQuKx&AK_k83#Dv5!tXo$m?9~_P;oqNNl4(W>6EzTooApe)V5Y
z(0{fx>2+JDa!jATGBNVwUO2~dRxHwOC^9{(PSVH%NPuT&_l9~3BLx`h?k;IJp(H*R
z*KS@LyTL0iLaf81jC%W3^|LxK{r$bchEe;wrf<65!@eo9c#0JP;3hSQpC>Pr_s{ED
znxBZTF5`s-(#ZqL%L#Fn$sE>Bol1{g5vM#Lj-J<5RCSK(Mw!HAgoXY`Pf!mT#aOu2
zbau8#?QSE9HuHzwf`6YqtDCUXZ>EYHoo?nh-P>XyIM_Q8>&0CbmiDEfd1Euea?vX1
zDcVK$_UbWMN{=hh(ls58CSm53ix&*hfg?tM;C3`yUE0TRk92{&whOU%$@TvL>s1Kv
zVSy&Ov6p1B$G0WVAa|-p`euo8>6Ijc7XpaVoQLfqbdqZ}@XT#wyMi{Dg$m1n52IFI
zv8hQUOdx^X7D7D5`?>BwtjJb)+!l?W11T$=*(Ri(@>^pPNpKmN{#8NVt~697p)#oC
zgpeC(h1@VnBtfyd-G)HxnztIsbjM^)BP1DCA;T}I$4`37v++%pqdYKK$rRGe%1baP
z-$9Q50M4#m_?;&~CYzWhWy?Zv0+IYJ^{s6qG~!%Kct)x%31?D)l~r+{V^LhqbtFiQ
zZ#u{3Fb?2s>Hc}8vbvjE)AOW<Gl?+v@&F{qxgDxIqR$c-WhE8aS|Sh3dy(y$71Pum
ziWgd))wVv-WXEyGKz8~Q=~NY8TD+4_jz{?ubEsX)N4Wn0J*xHPi<Mc@P^_=Rc06|-
z{i;hnI{G^@ZRR%e7Rg~4K4(3vWhEU^lZ%tox28j<>2^ZwS^2YPI|2=^qk<S3g4)_`
zi*AxH+2dkk6LRsAe(vt#p9Ytx${F=GV8T*XATUYkk&fQgr(vP1&X7Q+S!Osy&nn)h
z+M-oiae{1<NznYuuP)Ldh&Hmw!#kMu$E9npmkpte91|&#!jHY{kw`7AVPcOq)rc!J
zi=UYE#(h1h>8gVhM;)T5mpGlk%H#T1ES#me)fmPkmo^vHQl-_!qoh+PWV!p%vXPOu
z-`c5NPOwESyd%yK{N_YYnX}ktv|dNK($-6Rx44gM5EOi|H%^_Zrn?H+THD`mKx9Ma
zg+C)UKI!g1#-cjP!*)odjEktrCH?$h$qIu4N0yC1`>pDI>WsHg1Q*iU%7hcOJi*T1
z;<9y(X{>HqGNf!!RG+*@*Qo-kwy`;Njg(9Zlji^iN$dw|?S%(xoYJan{{U>;#pkKh
z%!zdl814YCJ;!lLZkBrNZ@t+T5xPSO>G%$n&RyJGpcA~91Y$N{<6+c(6(@%7FZ4!j
zQ%FhfE>jF3epK_^R{qT-W$hbwB-Fe+;sh|>+g*enW_GfZ=BJ?_$kt`%o3<;Pdx;Fi
zlW9GhCbxCJ6D9qWX(s6IH<C(>1E1jldU{lUV`y#UySSY#)i73h6XjxmgnFOlT0(M)
zB2kMnA<;#$F)R#A9>~);JN+BbR`#7ftrneaF019-Dxa84nH&rR8R!7u3aMeI2$tr1
zwj&L-qz%L5_8rf)Xi0B9%mE^^^SrhF&=O%({{VYFzO<@TZ*jsMj(5ZwBvPpJrAU0`
z+Ko8M@_tog>z;;_O!!%Q9P!=2k97==8d8c+*_;mK{{WL+N7?P|H8-=rl}LDzq?Nzb
zl7EK>rEYjq-E|9?w3Jp7TuX>0RskgRAB9WBR8dJ3u<>%cIcr}IEv&6__AJl57xG5c
z_CH!}#iWBbGP;Q^+`8-lY~vjIn(KT^q21_mJYl1DSwhar+2ry#^r}(aX}Vsjut}!*
z@p)?PaLfqz81<}utgc(76``A9q{#*BD5)|>It*Nd+=-E$-&$KA1tJZ)mDAlv45n3y
zA7OU>>mN@1dSLOzYuHP3eRS6PbTUFG&LDChf_r12tA|azjTqcQu{;DB5<quK5Ai2#
z4&c^qtgdMqa5L;Q>v1fzhhXf3dNX8?LGAr<TL}iIsYCXA8IZ_`Jk`JrBx3-9>yEsA
zYdYgrv$nnRL&qxx0i<QaGV_7>9Mmyuo>&a+x>FfoQ;tF4dscRnHC(aKx2r2#p|>H+
zHvt)bVm&^Umo3P#xe!TZB8BB+M!<=P`{UQ%tX*D3eCZ{l$|Ul}?=kmbyW`Y)RzQFh
zcwXQb;U(f=NqyPnTh_LvO})(LD?JTsYq@T15oL?a48$~tj8$8$N>~s@b8!*e<~Sq+
z0H5nww^x@;!s;cKc?yL@h<~ddtUU!qdv`s=3v+pBjLJZYB;%3%Ue&y4YGmrOr?>GO
zZD;$~VGuw_ZKsz#{=VXyW8yo<ifuLIjpJqp0#6L2^*(@CF{n!g>@r0xE(*pBNgS9A
z-q@=`<u2fk<9aH>;aP#hlZ<URt>cG+MozQXv8uzSu!Uuv8Gh7vJ2A#_o_(p11e)$k
z*=~Y6s7U4i0G4s%p~v;8FZDStZ3deziq9l!#wLgbX#W7(Z&5~%saonb#@Y*ZkVd&B
z2-`2N4{GaM9P(=AC6@Nm{o2k${*CiU6k<7Z#_xZnS-qYeO5Zn^EM*z;$V?6gPCM3A
zTASRh#k{u6sO(ZiByNp&cd2wsi=A3VGeYqBEI<d6<2VEX{Hpm`mojY9S4hIocP3So
zDnx+p82%&e+KKJ8iS31<LXoi`&av&t>==&1ovXlnKP<6a+Dex)z@{jf!QbhR@Tv75
z6_@bbc6SLOBZk-lvdQTF!`79hu=*HUzOfF4{++AeA-7c9BKd@6y8-TN2Is~$6J48O
z6Aj=t!1&wfNgb-)(?zJ=8LX{M#l%E3aJytPbQtYW+jvV#y453|^Gv#ybx$(y%V4A_
z>bM+yr||sfm63~cZ$k81mZ58Ciq@)9X~)`F9Q=fR{(U;)uT7%rdSsK$X(hDsFa;(F
zxH97^;C3AM=bnP0u+wcCb-5aJozi^CxGa4Kur;Np*gf+_rdYq1B)_{x=PbR6HItFF
zV|A&TmatnwseL?cAx|)@Pr~PtG5sp$pW%DBY$fpwHrDMN{5%FiagV#W_8rbT)rhpV
zz40ZzwwY?POB;yefm8uAbldovwc>3DUGRpwuxkDlzp;5TZfqyObU5X4&|?)2US+6T
zQ!)#UN^9goz`}DJvjoboUziTV+xb<w^!FNaM=hK|mvIh>@(_OOdh#k|dsnrVI4s^&
zk{m2Zz#JaA`c-{9#4_52npmE7f&Tz?1_$p*>~qk2QoOnqr&4Co;)c}Cb*e(%YGGCk
zhCqF4iH26Udqgp(mH-zqt`(O*b-VsGHO!ig)vTAPY^yY^b0pv?W87^WKMHKt(0!32
zd)1Td?q*gXs@%Q@$;aIv;X=K&6S1A*2;uP@Ej8pZ{hrlANfciq$T5MEI+N*G&#77H
z!}~=BAw&?RtOJ;c>R5F2=i0U<wz<?}Nv|!WGD|xJf+h+TPoNwV+uE5ghpeP&CY4q{
zDMIgQa0veEdXZYGSy;kRce&nQSWh&Id|pWmi_0qTpnjPds8aTO$Qmi42<mVM19!2{
zr6tAH!x>_WVq}GkcFt&&;WPfM6XoUc!R~AB^DDe;-H(K#{{VJ}mJcj$t+Gj9Ywv8L
z;BZHwG{Y1j3`$6R;rE`@B(~B?9-F329(8^9PNVm6r$L<i)UvC}uv=;~#9@1lo^p+$
zMmqY}4b4%XI}|cBkjkvF{^Tj)2=0C9gc!>Gm@2D`xs#H|9FgcM&DEUJ$utcrsx)|x
ze4c~8dyXmt6UpU89GN8fj=^)gj^2WffH5bAHJW&VkqQN5Czr=xpcM`5XjV&@!39ux
zYRrCP>^&-3VN@X(a_l?z6O|zGx7^ivEEeYJWWV#!sLLz1HV(uA{HbYRX|`kE$9)C7
zw=I0Hxd{OAx72&rJFZw<HN<8x3=>0_$UAY}Pp3c1y1jnfLlQjJ%&|OYYXOm;{=IXT
z);Dps!kI?-h+uioZ>3`;W^V(F)L}9hu3@(#85<Hbz<IHi=)U;;kF96h#MhdW!8P0w
z%Qn!(*BgN8oOG^-U9nrlm2NF$l0(1<c7f@)(-nz*XC#+#THDzyR|p55@|@vu-`<0=
z4(QL+SzcFY2=exAE1Y469Q##yHbRAG+^e(YbYry%>T&B<Zd=UVJKn-hcCsvgG6CyV
z&SSca+uuU5%%NCLGEcwLHA?1}u^>f}l0EUNxCTXFPT)J|`c<tq=1ZMTZoyFTs;$44
zFms$><E>PJVz&{Q3VEZ9jBObHAS(WyGTX4ZQjQV9oUS)2o`$AL*b~&;w7Bv-`#7!w
zm5pQ;<~$imJwY9L>MKUnK#@o;F1+iE{`NH_G-t6N;aGNaEbz%KrQ$~Fjq^{*BcLnk
zirCUtF=-UY3#@}^yXXlWayr&3>60|Aa@IxkDwgiiKb?ss>Zj326+BS1HxfpEU4so0
zlY&pbV0|g?W{g&80BnuOo@Ui<#NbnmaUn6m0~p8(s?Ipb=k={sj0mHNAPBI+(Zvxi
z##6ZNIp7*D5mp0pX}Ex`xQ@H=)PIFrNT-OODl%Rb%WfF~eMi!mW4M)fBgV4A?8p#s
z!1c)eb4)}rShGmbSqCvKs<e`@EEYm}9>%1J<WzVqrCFnYmun39Y&zuBGHkYt-73yq
zSgKmW{76k&xv`cAB~^q+Y_W!!Nz1Dd${cs379x%a5@{|bEM248N}Mh;k;knhQcEOn
zc&veeK2rt2VVqF10Sewrg!1xsw>bm1)YE2`Ic8$JZGs?@K_|>eKf(ax-iwV8q>x8E
zTAXn+JS;<D`r|wi&{J-wiqW7;uv$4><S4>&GItMCO^#?}X)f*qM!$7Xo_6Q2y*#z8
z<T5kBB|{d=dBb4=?~&_{^q%Df<^KTMEyG<!1e-tA7}y3tIKdy*v)UPBLo{$K=_W?_
z&H}eyYRQnn`~Lv4$DCk!z+v&*=~ceQwzDymF%G-QEI<VF$F(Am$BOIhf;gTWs~1^X
zEREmYC#k31UJIMXyhcwcV**ha#?}J`vDi}}VQ}FgbA(br9N=^;Y8mp7Ow7oV$!=l+
z*N05~;ZEff$kWAXxWKN5lFBjW`T~6gS9?ozNRQ1cdBs^4P5>kC59Lacv;a@#y4#Q=
zgvfsLcOstn-p9*m_Qn8{gOY!Wi-ATv1&a1REm@`#ksLyDb`#EixTUmvsaeb0C}xnM
zSMLz&NvjWUJcxeTWZ{u<CzZjFc4ai^t!><vnVgV7iA0zS?B2Be#zywG{#a$W^A-{x
zlYqmrliq=EYN!F9$qwu`zg8W`u=lH`CxN6p(OVk|o=4LZwilOR!y!nN2@YYJ5L_tW
zgZ(L8ftNMJ5}~$<T2CoSi4^nC9G>*n^ZdYFS|(5i8F^fH;<WV(StLm1)9&F=vJ!2)
zypzXlcB;>7GJynAqp)&a_I%kRprJ9?q=(I!8e8=U(tYnQg5ILE29kuNmh5ANTYEDx
zIc#!$skbq__Ym2Y3-)js0LBoJjOV#EX4cAiBQZ~N8Z7?+D+W>m5$os;Chl2M?iu8s
zI0d0-<~UiDe5Zq){{WA@L2VVxi6ZH-O2JN9hw&zH`2$uRl0XApeDKOjgluEBeZ^F{
zYlxj^Fi8s*`DES6`V7#3bWS9>k!@|B7C-=5fFR?p?|*u-s?zyV`A6h(S%Av77{yhB
zOF;2jB1~G`hm{1JxILKlH6zGc86b`JE2}cXdlG%RVw-Gemee$s?g<Ge%<Bm!gPz{>
zml2OTE2ok)2zMlYUgBJO)I!cl?IT+$$s10|GD947rrRUC#|&k%zc4vFy$*jWdyk<N
z%t#g0omm*<%8R!rJ-vk>SVrhB1FS(wXG7F_kMO5DEwo-x5=NWJ#o5e^$F6_6qmRyz
zz>vx#Tct4o8KgNPOpZ$W0Y_2w5vH2j;u$7jh0qAy)8%FCKDh5t>_Pj;t=-F$xs}IG
zcsZ-{O=xdpj`kTmuouc?lwpQ3(xaZ$?UjY?!bHe(ms|!?c*ZG)hGe2B)#FBxZUC#h
zZY%!)>Ze9lWZx(ok+@;N81IUb^4fK`Y2b~U1o>(PcOK&ujM9tvw8@bW6yB1^ybd`B
z6s|Gy+Zm!4VmCYAU~=3X3T$#)Oyy%kAyx}2M%mguPoSyn@75cMph+BwEyBSvt^g$S
z!5-C3?iSv8V3~r>s5iwQO}XRhXt*Xd;%H}yq#{K!@W5el>7QDL)R+rNEGZi*GeonT
z;Ahjhr`+5LXO7rfP34cg0N6k$zmI|CoN`C4H_8AA-c@9CwTh3rJ!#x!n{O@M1c13!
zB!$2PQ7mkV(_wpogP!#5Itg_Ik!@Zzh7a|!Iph<-6x;mU22Zn`kD5k8HWBJQD7j;0
zi6^>Pp|pIoY6}<2=hGdjl0fMb$qEhY(<3<Tf<LVyDGIYAp1Iq*J5OwykybaAVn)DW
z`{u@Y?ms%TF<s5Hn?e=^MgUCY9<>uYVWPQ-!On5ek^O09Qud~4c-lz&-EeR*NXTGg
zH`<ZphzCU(`MBv+m|2dJ8J`mQExKGTT=L_v&$T2{+k#AzYzxLDY;9rG8gG=)%L9hs
z&Ar(C%Ak&z?M=6mLIjg2!oE>TaQyZ9RVQ&4WM^&iFU=ap3`8#_zq}8is;c54=GvsH
z;f~1|<THAYN}b&qjB?B-1@c5=Y3H!^sANlrDqAIseZ(2sJ7?aQ?lChHnXQu!zy|Y%
zL!SJ06tBh+&K*W_8vvj1sSIj~<}@;gKu$|_9=N4Q-bh4?YEKv}Ks|f=QxMdUsYy)f
zxHdq?Q|n3QBFfh@s4crV4Yg0yRQC4w54*{<-y|wnFi>{(s<KTh!7IqBUMTlFD&TT(
z1vJt?*&^I9O^XoV7BAfTVv${C5pI7i7!dw$OCj#V(=}Ror<GlVWRjRF0N_$jHW^kJ
z+4mqAQ^+{yKGbsx<dU(G1~zPQgpyC|PKI*Pm}6MWA>?D0?TVu#$t#wL8N;Xrf#4DC
z?M_wuM0+Dr88TdksOMpQNu|4+<+WxJfX5)G-5-ZjP)9AoO6D{r0LTn^29!pn0a)F(
zciqW7JJ2HmRmdt;iB@ih)}_gYtP)r-BX?oE5+qZ~nu;c!j>9tU40h+Y)YPUn*zy9o
z?8m3lq6!vYDbOb2lxz>1)caJn0<5TC3v!^yyH6aPdec;^5VH}5Z0<cOVu2LM?5YUH
zX^#YG;yD%AgZFxM=BYG*me$#CZW0HNV!0byX2Rz^N%X1SIG}f)(p8jXsC3Q_JB;?I
zZDUm?;{H$FCP|Ap+<O836#4Ej1I&eAZd)S&kEJyxHL#LJZex}^m|t*EVpJd!Ph8Yk
zE*~QRFBtp7-!#)aGe+Kg!Bs}!?0TNVihg{z+=#%i45$0v-qoU*iC|b+k=?g1W=6qd
z?^Z4&xV5!wJBxKM8x}*1GUwi*iZOK$m33^&k~zs=mtpl4cG|%_wr?s!60go=Zcq4C
zbDBjqL2GX-%pxRgd=5t{-iEH*+PtMp##gR)3}YN(rG~;I9BUkF9DA}Pk@*Dw06La7
zSduuWP`3r#2QBilp2T+PL!HfI8x+io9@5h^0yQP3JcFLt^`sFAV`&OA2?s&JPjD*Z
z+Xy9+(WUbYG4ExJZXr)o(<c=@t-DPh+n`_^C@5qcI(mUkNfpXhg;r3kKp|hQ>=H58
z0<YVc-tZ;mx~e$I0CA5`sin8D5+M>oRY}8~41wuVe`HNNt?UvQ3>@K)2h*B4i%6C&
zCfiNh9jp^FPsCxQFXf)O=B9?-ZMLP{XsatS`Hnaz)7q&?sx|C^*>*ZM3aH@r;D1^q
zxO<r13wc##jdCNK_{X(0%h-}rZiZN$_v4Vt$1x8~Ra=YrVwyJ_W}Tbok$EwuIvn@@
zRH6w@@Sf7`k;(%+WMu91{OQ(OZMl=lk(xDj!?0c#+}4XkAz;6|wN`rxgh5GW&shhx
zLmYQksPfGtDyx=cZVCET#kZ13C9{?^QM(abHwC%JAB8j+i{Y2%gzyRBzN6BGD*+^$
zUY}=UAd1=dPBMYH=hmaNw9@UZqmFx#7n0@VgfGk+(=_J1m(5@Flf0d*;BcV&eJVda
z%CbJijxKV`pEUh?{uDX3GFCwg#saVfiz*f;a3ifm(y4`mzyh-q6RUR~l?=L^7MrA&
z?|Uv9MqY#co_bVBk?Qv;d16Y%5X`NQxt=lytw3Cs;?C{iiG*hg`=5C{r@lJWV^WMx
z%@nxZ@~d>?=~3I8_|an3C&<YWvZ>tE`^#wTolU&EjLGw4XCL88;6(9iPO_wOIZ{4V
z+ro@>&#haE+WjnJojkUU@(%IyF{FjkG31+tixK|vGICCM%GB`*FM`_wilInXkmHJJ
zv1&FL9(**iMy;GW=YR)sRqiaU;Tsbyj>mad+QaH<+%})t(Iu?5=&=*H+%x>rdjfqb
zXRx@AA2w)~IObd-W#{Wo;n2mqh6J;C?uP8C!-xC6l_tR@vaQ(4l-jaK@`nEa>(z-M
zifcK1n{=5#I|{Z)Bd;ClvM7svyez5~C3zNJaL2Ox8VM;}qe=3|30Su6Wpk3;b<HX>
zAywE3Krjbip*0+jd3KF3wRu!7^o%YUG1TUgVGmX>8ZhH0AB6<AT9eI{e8`d{Bpt}Z
zBp>mp-6nYuk+%aS)vz<^PP0T+0_x#D_TYuF^ck%bfl@bV86pJ>6)BbcDK?QwHjJ3z
zM{tS@lK8<KeK@Dg(??}-r^N&2Rw8dR951(^tM|5YGDiW&mgh0~E6W4d1a&n|;|m+b
zG{I39`29W2Pf*yaGF!ni8z4?o_obU6F^)c_nvC)gV!2QN+(=Ah`g>H?uOz@dyMQGB
z09L|0u01{TPHir0Qr9<9Io>~d#dd%?@H<j%EyB(0SM%YD-|bLHUDe3gP6~fYeU<Es
z1n|Te&Nmie%Y7=u9u|^DW@4e^Uolog)OO8n>H0;KPa9iI2xQ^N$SvQGN}p(vN}QRR
zu{#+p;$?Pd#sdBBdmPq;mJ(k__C|6P#rwh+8$jxKt=m5h3#$*c%>jm0fAx$;2<_6U
zh7wAU97VcDQ@nA<f2C&X+}TpGnQf)5jjP6zwZ_nVqJtUtIjciTx+@$AKvwykarb}v
z^>*IP<Yl*MBX!U3B#dBV+OKKW_VGA*Kq?#LIpM#;moqfvNY2yj?5-v&Z8+GO4&aix
z`g+r?qKI2b3~ESbE0B2yJf3Rpt<|NZ?(J@?8a_-&!*&VkYOVeBMrLbpfX2JzR_TvU
zJJq2!kz>!4+Y3$zMfuo{Pp8tGYhbHuzFC2c7RrH#9;8uieQj{93{yt|k}y<Cz?1YN
zt|+~`x3wF*mzqeh$IEO2ex96F+*&deytBCGDc1@=)q|gudY<N!P&ZH{k-=^pn0&=-
zagSqB+v*n=Y*$FML^3%6$^sbmJXWTk@axAOJk+AlbW1dvd4B9F#Y=kh2Dih|t%|Iv
z(TkLyL}fWBM(x=c7P89r#^Kg7Cw;Ojo`W4TQQy7(mm-S=iCLt`ld6t0gInG!_(9{}
zg&K@HKacbqn;5SHeTgKA_U{B_ZXkNreeIT;Y8jd=gaS!aNy%?&yjC8z3b(SY7a1;$
zm|CQ77G~LM_tyew*$SW;z~gZzkSlXV2_V^Ush_<QN%y_QX2ezC`)}FHmN{fXIP?{2
z^Fr3+4lJHX?AaCOW{>7k)Qr~+Nk!?gv=o-6^zzxn8f!%RLMY}q&JIUh)m=-(_ZP8w
z8YQv>D}q@8bK8oo;n*jFU69X(km5#m%CJ4FLgk~=OiOJXMZ+8_jGTJcGj?Y}ZK7`s
z=`d@4Beb`_yNU?+Dh8bLu1L>%`%mGYhkO(8-@?ZF>%_3h3`hi<9|cYaPh6V#GJRZ)
zVJ+t*GB|kSD}o!S=e>7&Z^X@JZ6z$VO-@CEEN-;jkjLMQ*Y7?Sc#o2Bz7D1v6He26
zOS$oUOORr-YLS#B?yb??e$)OY(DlC+TxwcX`$~%nqbYBdhXnpYyl%r?whH3HM%Ydj
znB{@*irCh*-7?-_8t?_Uaupn71dpd$z`243xy`f&G*!qWscQV&j<d`zf1XPfORewN
z`aGu%QwM^LDReaS`6IkUdxUjH&f_7$9_QM!F1%Hz={kXiTaD`}ZzabnpnnjnYjWtS
zM1gJQJ7ktYkOz9tzOmD<V=HwEHMY};!sE;%xIUHfZT3AT-zf}tx}D{y)ihfqWMlI<
zZd`UEll~D)i`#{WTofq5<%(A%HhO{S)~_a~Z((otXjc+OqcKU0oQ^Z?MeeNf>{JRS
zjd3EC$68lp>C`k>4~8ap)6oj#dD2QUz-On>X02;pGQ75kz0{%8BzZwHBnQ*dvgNpn
zI395(RU;?nCk}gxuQd01oH2Pe?2@B=g_IqG*A!n-^I2IMQEFDYj3zrrTYc;X`9~3h
z{b+lwK1Fi`;r0R@NaT^*6-8pU@@C$}!8nwI#yvi@Gg)buF>W_(uM&>LG8#fsW`vd&
z(8>1rix%<*RoMPttyZ38@}-r5d5k+Fjkr?%kFcsT>QO>m-Cm!%Fs#@(^%YSy6L%Nd
zZRTx+kh%UkhJ@scGhE#lL2}|rbChLVDdUnVHo6E|QNxGqe}wm{%7Nq|7y=GiOLX@i
z;ZZ!L(8~mj!3Ryb^L=scM&vm%=i8!;fGwpX1!Q+&l08LA*EaWYne4{Yz)+#SWFoU5
zy1KZPciBo8ZUW$CN2xWbrrDWQB}kl|+#%`p6)mJSc2l%=xRGzI6(t^HB#=92cfYkI
z{f*==zeACOs$s23B~<-=YF$#!RFSTl(nvO)rw0I^!la7&dxLIn(5oN4jBVg|spngu
z<tf@)+F!);+}mts1#oz6!1wm66IolcAo30qpOoVx6>H>XGDR8l0Rl0cZXT6uQqUcA
z_}<n+qBbup=Y>Pt9nNbhRo2BQBb~Uqy^6u@ZR}YW%qKE1C)*~OZKmEy0kOThIbayC
zINW*=Yf^pE+kJ*qS9v8SK)4%Mx75^838TFxNU<0}ox|=AQ%{{(mjX>U!|Qz;#x2pA
zfdz{7tk;(E#Iyz}Qf3VtLP3zY{xB<`vX;gPqGpY*TRfyv;Z%G2)xA?sT|!^CEE|Ab
z+5YEjRxYzr)UHI)fEQ3pJlssfa0>4bATjo-W3ZZ8{HY{V%HiWHoG+pGtC7NyIgN?{
zK*VRU`qS-gZwY&QdEoQkEh5UCvgd#eFKKX4Adg71xwm5M%Bq_}tNrh4%GCTfCCo+`
z!~ExKZ8^vIR?MPnb08|Qh2#wN^{Waz<Pj^6m~g;#H41WzxZEQoa$oR`CW_+XYvA#y
zT!kMoK8BWSg^DJc)m5EeB~y||(zb83X*D?Ge=&9}g<2&91KU4SQs~+ShXu+t;;)#$
zBA{*;-`v)o(OXg#K8VG8%}!wd0B3+auAn?|pc_E%?Z;ZPqv=|ljQij)qeGu9zGWWy
zt;_hK6A55kDB(h=1=f}C^vyQbLv%!F6D#JN40p$=spodkrB2(jjn<VDSv2c`9^K5_
za7i77Lh@YNDO5s*z$Yuo9jdIF^^#2;s$CY1+c7Gfk`JJ%mV50)G!umm7jh=t7RT^|
z>+M#rZAfiBi_79U;<jfOt87yNBXrA1doFubIsPE(9$ca;P_vVSR~;MFeQDOd9g*fs
zi`kgTkajuk=m)J@)ch}}LefnuY(fFuD`3QZX@2c8zj)D?J>QA1oya~+UPv-YE()t2
zy*iOrY;7;??k(=MNuK^4xltP9cO60gm3v3Awlgl0(W6F(dq|&jgVY~Vf2}B<>dNXU
z*3L_7S>!%hm<%fq{RA2ufk&$wd10pBTHCeG9z~gqcHr$jIx+P1r)k!jO|Se&U4_Kb
zBQzp8KH)r{!khM+M>1R7T$w|z-N-hwob!)gN`}(L+R%Ac(L{_th_NnL(9{>`CDroS
zPi(=9TdQI@BPWOS&w7tr)14$}?zuM#0V;X*r)pYz+S(Hyp&iOG#8JeDF`mDly&_u6
zZ1Kl*3}~nxNhEBP{{TPZMeHZ3UdKb4-UB_Xl1&-;cCJU1J;CdmN4JQ~%K{Wt1MiM~
z^X;0v;@6py<IW*|`Y~0_RhwL}fwMLw+@)qg(S-_4u{9J;q|5esWBEMKBPA3MU$0u0
z=K95<0^}?bLU%D-0H?Q3=DGWy99n6jC?S$1SQwbY{M~wwdd<{4S2fbKkVY6x*>xj7
z{-IQ%CS@wniqPw>wap_=j9WZ`<Q&MOt`9?57oIS+OQrqdhEcRKHzV4(`>AiPFOA2V
zNMs79Jw+CFvb5f8?4V<482i6k-ZW#?obMGj?2)yp__pfnY%94$nNY#G#yZtoXV&LC
zjEK_4cx>Qfu{r8!vanWjCCtjIgDmVYD|Bfor-YT`M-Lau*x-+9O~M)qDy3I;WZYT8
z@I?~9qIn4}=Yam$_NlG3aS$-NA$(zcv-h*wwJa@ko24+_-}zFj6B0V|!1r3xlTD5!
zSGBN`Qpx+Whd3j<X0vr|qBn&Vd$S(SA!DgqSzl=~v?TnJA;DG0B<HRxM)u;u(Peu9
z9IGxAJlyo|x#?B!Af8EMz;cA)<j?xLa@bs46nmHqcI%LU0sF(;`wGpwyR%zcL|2W;
zNhC=&<Cai9Y-g^0s#`naml9dPtk%&t%^_j5vF<(dNGzTON4$)pd50k29lo`4%ERp_
zmXgAt%buJmQg}2;rKlxx8<^f{ONd*}MH^y6z&_*Fh_u<Gx+!qwUR56>54w9CirGy)
z+5D2bSyXNG&#r0z0NGO8pC#;ONRL^Y8De^o-xZg&Mf)>8+SUcP7A!)$u@7<=3$*q>
zO3*f5NFi<k7|s<xl}$Z`v)jfKmR87hehBxf_pjtz{i1u-UP#@70|DqN9QpPdjftVr
zpqj=_Rw>%vZG|1x&&)ITNcH;GD{5DkcDuDTKw^E*<?*;4l|8PW_E%AxO=(Bk4t{nl
ztPdm~N`n6REVUHAkz-_jL_}nNyg{uY7jro@im_`NfSgYSurV~45j$fU{<P`t5ha=C
z0wquj#?Q`AaqU#EykDoh=@gz@NRC-R;Gd_`urD>cyOXweS4MUVCf<7VC%!9q({G{A
zI?;~I-PE-^0#wIxvMD`@$~f;>_x>X=$dd$=v|OZ$e)ADj6}36;0E#o^#M$4sgPOZ<
z;fv{DYrV|mzBf3|J$Ur1QG|77POVA&B}p~Ao7OR+7Iqk5Tdgb>xA}Py_7?8LJAR&@
zTE7;FYEfjd1!oeGIb*;d(zNWf2W2f3WtVm&l=a83^r!6-S^}jxKY5wjSB6Wsn$k3w
z845BhNiCW;R|}R?kT%rz7SmYX8?UuE4si(!yMfmgqa+Z#WUP#>A^G==0>4hV&2!4O
zrtzebGJLz+X}qP0cgUc!Fc?sI`Mv5SP4{bY1TLd?B`P=sfA#BKt(3^n#WYy}aL1hb
z)~%Ci^7wS1l_HW8!;n65NEr9$@u_vJwk=Y-Iopp5-rk7jwZ`Ju*alk|>yF-)Bz_jX
zw1P{^r+B79QSDd|QyuZ@di^V*({1i;ZzP%!vCN9DkGDJh4MVHl-fB;q>-8?g9oun_
z^Zcqktl0gO61kZMk$8n}ENzH#Kq~y?cg<Oj)_85g-h8a@fgkXze@xW+6Rm~Wl53GL
zEs_Ru$J5wV&+SRyP!h$YHO;&ye3%0O`})*MZsw7utX0!=f@Km0j7tzdxOO{SXY!|w
zDPy*I(ma_YIWZ4I{{YvmZ7O?hM~AX8s}?(n1Lp1Y6t8b2#x;^45S^f78TxwGZlsM>
zIGC@eK@o*xkyjEDcP3ShYQYSa7O*Ctb{;t$g~>vCV}be9k85dY>un^4P3%bx(4Rr+
zO|`j|R#^>}V@@BDlpeoYP28mw9T1UQ#djpOS2mC39<qam1K5gNts_jgji<K^n>r)0
zB#MT2Mk=B?A}{{0FWdUmT9V79D7L$}Gf5)?jUQAP{#2F0+o=`qp<`rBQCl&M(=Nb|
zn>~d?V|XTZNh5f{Id^PsBeI-!u6M+`rlc;E#cn*cZP*8sP0=4wzSLDM?dJQxya$nr
z+mqe7&gy%|MR{j&s7jz+k_!NZ_`s~o``a5F+f6gbyUMv=T=n`<rcbC{qYK}Vra(iU
zdFm;%>3i-Cq@a!iVUJw<(5-NHWGwA7BB+hTWR;E~_jBrM#ioaF@U_UfD1iK_wDt6>
z7S@)jBQz@8As`kEK4v{ZtM>5TJZ9M2vc&1O7JLoIJmcx>M5ovz3+`5vOO8%1tt3{8
zFxISJ9%FX~tUaccZ4^^Iuvy#t!=cA3TUvL8uI|*&z1BVgmhX>xPxwXeAZER}o-+=3
zfksarr{1yloW{zXj(!Ha23cpgO~t=*qa=~&ewC%9+SzKiZZEEk4nS0ikIH@NmpV?J
zr$#PO3N9EaX3j@&D?a{5gnh2l5=N+1R1UxXs-<~sCe(K<>TruWB$njujBuq+Hv!P&
z(yKw{aWRld=6r|<#t8MSGkt$>e$EnB50#2?z=b~k-k(ac#E0K-jO!W#j;Cm5?s4f_
zs!rONI;#2|3Tn2t@JlSoATods{@CgcDwXD{ZlwME>Z<Ft0{33oKi0CwqicH7OMiCo
z#;OZ~-k(ZhNG6TtwvcUOz+=zU8fq5Y9Y)I!btI5Ayu{&8%a;4z)fqPu$mtBKlB#pL
zdJj*+s!MflQ_i!!46z(L1N>guri+AoNgj1^3yp{rat?adiYU#t%@|kAjbLb=Wo5%j
z8OPvBsVBJ7uB_fW(;&HUL}4YtQaBm)s*pza6OB44mEF*Mif|t^Gfk(Xp|n`xfr)0A
zf_EO@r6JzHt8Hpc@PSNaF#DGyBdMpss_C#<$dX$Z6Y#EE0aw&|nqZd792xJ19y7UB
zPs^Wb%${3F?}eR|?{xAYVCl-KJ%v(@$>y<d`*Pi`gtqErEZ7<9K=h`~ZK~>5c!63w
zbISRgZuJEJ09vgD*>WLkcUeP|xv}#5jC8Awc5hN&vP+Ox3%FopclPN{OO@ye+<uw%
zyIaM$h{@(T+qIA1QT#sQr$c6L+G$`(5Dr_YjQ;?3mrc?yE}dh6S=u)Fg8k(uxD}~m
z;d_W6MY^@iv#~Mf1=rLM@@omyS1vHn&9}4DZxqRGD;0Ix#wI*{G2XS4!!X!d2D-W`
z>;cJgSf^~(ww-IEX^~BHCD)MF@osB&!RmSpbv2XX7%eUq4Mx^x3gm`~iQUh)VOUC2
zlQmIE5ksk1M%M=J>81I9aTq;)>CC@s5#A-p!Y)E1XYs0OXLg{xR*gGGFaq)P8Ki-l
z2+ZpVGpk@m4mKZNXmQYKm(t%+)vcb|FD`s_5%ynyQ%g3HJ;cpvJ?NEK2HH;xf$QJt
zRU>Q5*N|Ai6aYNa9~}A;Dbm<@hRNOUBah2yfoMZ~@n^X|%u?mKS48)IAHISCEtR7?
z2J;V<(MP!THBGGLGdZ}obLOBZ0LI^3)u=po1+Ajm+^mw9J6Yp6E03>gz}9?0b8zIv
za04+VMtCFoRnw<Yy-^aW6tpz8Yl}r^k5Sg6P84oP`5bm4vX@Y>h;5$j<N>nLGaP}~
z)@-&KgT^7czTAT+VlUp$Y}29e;I|%YmLb#Smv&A%<C^P@IK>>YsW$W_e-K^Xu!hoN
zj2IM<3}lLpZG2B8uF4z<56gxmZuJAVtzBDdJ2k^LT15p{KXm%k&}!aDj^f@h{{Uw{
zGpF~DLf(R#ve^Q^RyNm8yNo5x-lDTKNw~AGLFx6Vt~DDdj>#ldX8D`2AK_KCJyP=G
z?e1hM71tO80R959Zf+Voa$0gwpPk%teZG}Zh4&&=IaY?X-lu7ED!c6{xFc(09{hDR
zQfr%;Bxy_^Hqo?t`c)XESgt(QD$9Yk+#W*GKb!#A12%K%f$v%<BxLF~X-6#IXIVVJ
z#$2gjy)oAVwIGq>bhnb-)tK#1o2kcIsRT?XP1otQ&M}^Z^{MUcZUnLjIaqK*G06wk
zlSu{S!t%!ENWf^qBJ;VI=HKb;1rg~GTu6&?9$8259B1CH=}7|5w^;KG67*=eF`V`H
zHFn2Ho&u%q$S3d5pO+nuK9w@5%2a9d8CKd=q+U#@!C`3%;dwsduG;7_Pa%ZFkwBo5
zTypvTRk>ql;lT`Z>K<s!yFr2QcjtlzI#lsk=!tXZTg=iKWZSjdp!#~&60Ik(yl5__
zKm02Ay!h@d<&G$n0>r7w&!uWv=ulfMjd)N3HbgU)Y=4Dl#i>Uac&`u@Sg^l703N^n
zYOASE^DVsaq<P8QRE%xMAO5<>o}{#9v4uEnfN8oFldaX=+M|*boSXrSjQi83md;Yw
zR#!_RsK8F>M|#UrZrV9o-gZFSR5N_J?rPK)x`pNb`z1b7kgfvqN58kdCYfj+R}#f-
zr`*k!U{*rJ{N99i#Z|eRP?hJj9wH<h7meV?<K2CSy=-cF1@@e=-Oq0M&jm+O+mA}E
z4xg#ZY+m8gSyhhM!r=AeC)4~XCbtK29X=a9yu_?}Z9jB+{xxq=(Jb$7<NF1StU>ve
zeqhHP>a>=(k$}$_8=DTpqI(Q}m3KzhZuGegsJCQI`;2dbz@GW{>q)1&8q;xy!s0tY
z9DaI5B!#7pM!?VaewBL1MevHGk9lo4aF~)!*eY|{rCnTIPP1OSygzgzFU=o3k~`IF
zww^?GRcYj5wmDUBt?9)_yj7x#UtrU$6YP@Qd2wzmu``lRPf%)md5hoqcK6Y`#(;pU
z&JO?|VN6{PQD;1_Kb-1wIgzupbini;)n7=0+Qvzyza|x2GBYv6i~ZA0rqH%$NoRd^
z4wgR6360&z4)_4Jc>F%KLV4d;e=>a(#dd^=vH{o!@ng1WE-&pMw23_Z``m|Kpaav2
zW&O^j6`(LHyGTHpf^}ZNpHFI?nQWfb<C4hC*2+}A)r^n5jxs%{`4)dN+=lYV&T)c!
zf$56GhW7VN)W)G5wCNylRyO5G9l+^Yx|Xvo>}A&3K_?7iQSveFMJE(1j2hHd_p+4=
zXGr$tdKK-TrBl0}JI^+0Adoc5JlUE4@ErjD=oEubxVj+Rg~F4D2WfNu6|B}a_Ld@R
zcJpMAVPeP2p83x~M#9yYGHADRJYqP_!IAcuvxCon!nFK7;JaH%q?T#Xv&Kmzf!$B|
z)kCQ1sNQY0*xp=*ZTJh1<OMc8TTO;ng4+3|EWAjLLa{w~KhB@N)`WYDR&UFucw#Gc
zj_Tw}*<!djDx<Og02;^DCGfm9!g!$)V>^(x3XnS*#=pG;vqvkCoj`6#^!Kc*#Cg|!
z?b8)p?nD^Jr`PFP(xWS;*_`U7vNZ0zOKW)`Ht>Z)xIR;Iv<u;MgUEaU`5>N07&xq<
zX<))Rmh=}V5yFZ=WA9pVSxVLtvNJ|h?PYYv-$S40T`n++v67Q)tNojNK!SUxdsb$D
z-jaO7=m&bT+HA2!8+l6_Nx;~1k9<=kyh~3gNpOP)5jHb}+=`6r3lxG|g$zmBLW~t(
z?+;2^u)153G$cEQVVKwkcHkBE_ocJF-9Bv9<qsy@uO>WoH67L5Godj2g*j5ktyY5a
z>^d|FxW5EOFb!IT(VsP$si|E_YcxqA8%yDWagIMBR8c3A=-nN{I1b|K+{S$f?^a*K
zT8r8VE<}L40t+zPj=1{O3#E$6V<DSrfwh?Q9<)L+dLWZ~nzpNEo?J<UGe}&5-|Lw6
z82h97)OWgdot?>w+VxaK!c5B{W)9!NF~&UwVZ*E}!PYB~7z{@4dK#6r7m@zY0^scA
z$h>auMKwvMaeGB#+%s7LJQ6Mm8I7B%eD?Ge1XsnRmNj6ZfLRl6IrXYR<`Raw1dN=r
z^u<jKB@t&>-blwu4^j24IZ{MjvR|{tW-Syh<$xFhr(F_zm0OMJfO5xg2ip}C5l-Ng
zSsbzXN}LRO6X{x-R98M}v{+qZ3AniIPg7Aja;*&`8?p@|&{>f*Pxn}oU31>A+u3>3
z2De@1@JkMVAySPZ{!*~V3rPt~o0$4zxW#U1-VVC3kL?#N8o(pn3EhTQu36PfQ=$~?
zXWLlYLJYQca(S#aEUtG1C-|{jz8>(^#8+lpf+X0#Fa+)Tk59&_m|sb_jkP30EDm-?
z8wmOJ_4-u$ABk?Xt4n~8yU%lQT5mKCndk@bfI5F#<f%DHd#2EeOw-hKdq{>S&gN6)
zm2>ivKb<T#I$fJWvJzQFLKA?;9Ys3#RDD8dRqc<K2niS%#z!rmdSnn;-Cg-Nw-Uth
zg6Mbfe!kVu?<J|Vix!%NypX(5Xv?)*5<G|H1KP5$^;=7F&<)5UY>8d{f2XBqYrZeB
zw1Mp{W-eVFZi2Vn^!)K$mBs$4;y|%7For%s&N6GJjv7+c=!|DoMcExO*DQ4g#jK19
zF$`G$09up#5=)lF@^1ufgbt^VTF3D2m@JcN4Dh-6(TD5wuCBrnFlD(SNWcM3NCbLj
ziittl4i}!}E#dUCwerP?CgLC%XLfyv{{T6pdyBgn-u`9~!m)*!wtR!z>sPNH1f3;;
zwtzN*PD%d&>v~lXO34i7<9tae-v-~|_s>&V-M!1QOt^2ZZY{j|Wm#?Ze(3pJlke?T
zE%MRFb2aU=84eaWl!8=u$7;pa_3>usP19IUJgPP<WMN7E6YeWEE6qyZW5PnJA@iBn
zb7#H<9?O_~_ByDZ(mRi{i|?J=0|1;a)|H^LVh-%6ei=pyKA!c7Wev^h5So;6NZ4gh
z;!*GQtG8Np&7HitzQd{9v3C0XDqJk=H7lAad8gYXi28hU62Rw-{VKkpI?uWZq7g?S
z<PVgu*BxsG^=rShJZ`GdynIZf1rL5Z(xvLZminSPLUIWw3=d{sT>I7g2{Ij2i+4Kx
z#hrskXjzp(QmCPvFLTdY$hp3^)7d`U?9D7}tMg#EKDAR))`AZ*C3S8`%0VtYYNYoO
z$rkH*k<5b#TyPq?snBs+oV6=lFSX04Rc%Tvqi)|UsM?_S&vQ#{;q6}48tO%FB1hT)
z{xgi@6`OWaCNc=g1dZE{az~{sw>tKyhI?dSU|qq(Wr*pJJ78B*f=fe{&g`$O%Xy_r
z(IupS6Y}|oJf77HUh0=m<;`pnnlZR18_#3yS{A+^mU*Ej34r9qB<-G0Tzb~dji$#K
z7Z(=z1<H-;GD!5M>P9G0r#Z;MvC(yjL7rP#ldlZj2d!PV(Vhra1TV4jTuIkC{{R~4
zZf>mLoh+^|qd_MKSDXxIrD^FpBzlG3%YBk=P*GU_01b1`5YDJ!(%j^<{Xa4mT`oyZ
zapWMzK=dZJbpHSf28fqO8<#sIY>3aHu7X=7&~0VCwzpPQKRe1s7azi>*12s@;!eA%
z1~xWPLeYG_LdFOKJx|xv)?D>!y$yLGNos0a+Ua&H_8Yxj7tNF8mT3yAu|ISZ>&Fy{
ztoU0?y%(1mdx%f(6{Om$=s@lDt}5!=#d_VxnG9t~W8|S3DtoXV)xTx%V^<Kp_O-9a
z9Im772_lv<4x{PCQ>RKR-;pt?Qg7Ww{ZHbJg!BIZXX$Vz9Ds)z&)3?rZZuC7YnJlN
zu*zX9!dc>6Y#HEVxUQE?@E(U|(fO<8t1blC<xlmki&!DkV05;+^A*!`9DVPlV=C0C
z=}jBPl}Y?(4Wj%tvS_#K_ESh*hT-Ow&(POtZ{eK|%G>PlXyprZl19mI{<op0!egFu
zZhv<psM{Qalj>^it+S~jRbvrdyPK#r%~rhXZq2FDj5Z=m2&4mbv#PM#=Qz$jl#!!H
zz6jhqMm}Q0Am^a1$FLIE#*sqh*Zx`OlD?*@TiWW8I>Po*6;?Z@Aah*)(KBvFj(&dy
zrQPVA=3-eg0|GIgqdv8NOwb|HcgD{n%F%)YKH(p1iq^M|4DF6a#&V`Zo^#GB)bY&>
zjWl-qP$=9Pcpkt0s!p>Srje6s_cHD#CUsOH+mDrfaaOmRXwccWGH|WiIH~8>w5wPe
zJG)W#pD46N8vw6t`i`~B-F#EgETkS>=+bQ=Jf-134*b<dGpVu@lwfsGLo~NYh(x>k
zx(o*OqVDq2%^1sh915iGX@7_g!_vIY+sD2q)$LNo-9L43(g$eQ41^!Op4GqL-4gFp
zmI*cMr<6RKVt}3puU@43)yoektFl#V>~!XR7woGl+%3dzeq<lQKE9@@Z?&;`EVRuw
z>NaUN6lpWG9(ex%3bj6mqv*F!BfbiA8Y#kq?_9RE;^(-$Rnz5fFvwM;#|Q@nt2jfR
zRzT-y+}D<SS><ar2QEHs`S}mMQ*^kpDsC?P(hnsD0-s9f<nav6a$}WlB?>ar#5jMi
zwOd_Xq=H4Vl?ph?c3<W1T?&niT+=j7!~!SO1m;KGw+erU>C>%Cre52b)vhe0kZmW*
z4~~DOVZNw}Be|7XSqU;OakzH+RMz^>+w}RPUosF=Gf5c6#SAbqI`TSntM+yUElWDo
z_cKahYjz6*hYAk^BcU~4NPCFg;=6B^$x##VSDu-xCgEpx`w=cBj2~V{Q$)7Sdu<#N
z75nE7gAI>UPo;&sxg^US(+K>dxdtRGKIgdg`c+*%(%$1zZ9+wisyGVJ5*5hp?dnBc
zNN(-m`!l$ZBInEl9D3ySG}Lvsg_BNA+s5VE0aC}D{&hEL6q31eX_;+a>Li3TvVQO{
z-XME=R!Xhi#p<j!q(rU1&qMcE`ij@KFf>Nm@*rfuB(JHem$nv`+OWU16A2n1j={2z
z=s@jJ8C!DN&>*wBTcU050cAkVBB8>Q*N<9~8wFcK6k>d~=4rPc4tnI(yG=V*yu(|<
z1{;@E?eA9MgvD&~OyReZrFP&9b>g#>mBx`q+UhGii+L_=*^E+TnAhd${9js!#d@}(
zt;IH-W<Pf-0%Bz9f7v6YO#XBiAQ#Md{n-8>eGjc))2(2XyG?M5k&(v=ezcqA)Gc$1
z(>ydZ``D2ZPc+HB{K3it(2wO^Gsl=k@r7etm6<;7+;qpetDZ8F%HL!fd<`T*6*4?$
z=5vn5q42aZUP8v>OqyG9lHX{Pq0L;XN>RBnf=<PI8J5c6UfbDZrzl&UzV#LDyUwP0
zBET6d{@q@i>?<sGQCzcbW00qucFFXpFLc|6+R;iwOOY8r^3UHDF_LXu8nMmKr)lWM
z<~ToiR~wVK?@~b>jL~f?AdyC5Qh0B3inPcXoXKq?$r@o+7UZ1u1HaOteJWzfsavm@
zS2=}#^q-GlE3rExp4yF-7C3=;a?PKgcj;B$&^Qn;oQ2LEqx-`>GwoY8wmxxKZRL%~
z0|ax)>w)b_b!k0<7$?0&1<7J~WAyJzGGl8)COtaO!;d5}$rznin8Tb(J-zC@y5u&l
zusAze!EC7g*+0U4sJxY@xrzwo+Zda4jz)I@oR4bKzVRlFeu$~2`DJ4R$dLz_F~;M^
zwQiEq<XsubaJtBq?XBZSNBKvtJAgY=Kea4U*{@v_Vw2{QxLyu0JvpjBYPc6EeI2`H
zB+tpg$4-5{ssyywbxYp6;xe7P6A0j*PCu<`lC{WkW}o)8jl>GlF;tDq;NvJgIO=KU
z$4|R~<cm@BR&%mgC0wCX-xVBMVMv<&R10Y25tTo9x2QD~F-30ecX_F-g&5*EMgU%U
z$?9nI3wJMCcw<FizHH^BELGSs0lhwzYST^BCxYtW6t!5!+kBj{1C8HG#FxYnX*P0A
zV5VJ}WkPp+-lO~}EN-=}URdSUu2wjua138`?L9%qK}p6<4K$sOk!|!FR8xPiMkkk~
zs7P1*Db^a5wwHWoxV977x5z`C%p7ze_RpnqlUzzK{HqvUlO<t@;F6=M9@Snu3!P@(
zW`^c?q>$`^5s5`y@_xSksdB4o7kv#s7kK*TUAb*O&c*)FS8KtyI9{3b{{RZ3VWaBC
z;5^q3u<@3ZlI(kd>FrwjH-lLt`%H7@APALJkC+gD5IxRoX2rZaqM^Cfbq};&`B{aX
zHe(;``%vY|tq~}>Ya^Vu@L!zGe=gmKF}RPJe!ixrwU0ya#BzPIcetPKTc|&~Ku%8J
zdY^h`r{X!aO)la~Qpo2aB`P-V&rAxX4}vZ=Ta$A<@=O~9+vMR}9G_uI_g?!8Tj4|Q
z{7+>Bu&c~GvnVk@9EUhP3G~Syn5nFMP2(*@c@V=a(OkP`H*Kt=wmVhb6T=%Wqk`Fj
zmjWxP3T8EruGY_fIP^HKh5RuUw#j6+XJ%lrN5AAC54?Eb))jFSVC=Otg*vj_=AhFx
z%lMu3h|E4v%ErSjkEpF(JHz)z)LcoYPZUd^EWDf(-ntneo^rQWa6gd_6^fwg=qYvI
z6Zm^dwT?GtYmN9+XTaHx<GpkHc~sIU*;9;lY@|f?_RC{^W)o@3cgBB}Tei~dL}OOI
zx++|4Rag6fcgLyqu47m6^^_We#RR6~%ur$INXY4*Z}6@^U-6Ess$H1v?+j?M?2jLN
zc6rZZTf+%fqt`+wh^Gy;JtI}|FNbs+V{ly>aHXPG<ycpoc#Gm3*OSR@r9kn<&43GF
zZthndKDC``qU(CngLe(X2YtJNCuTbRE1|IXeqMO(ZsGD6uH|+)W?WZPDbb+4=XP_-
zrE1$~j$B<!b#l_hsNB2k{o;uTBvyuxp+y|;G?2NFF7MtGg*pCp(m#gmwE0zpV87gE
zW#9~T1J<C2N=Y>NKFK>3RxNGG#EcIkK9!@Z7aK%{N=e;`V`FC8c}UD~IGCHZchAUw
zyYKDz)V3P7lWln%IxK4}B(Q%zd@vw%KVH>~tJwIe_UWv?&XLI)1G8?@bKC1zJSp(h
zYGtC-43^GtBaQmVGxHuhRLhY<@?}Sz%F#yM{{W1%sjVWlg4$^ARgU<d44`AD9cr90
z-D>v+9ZEAKVRMD~6}^Xi;=6q#;Z?1Uow;q2XWz0n2fwCGP`c7AG_oTzp^;=N(5c+<
zwlmMBYmHZ@v=PzlrM#KW+jtIrV)`ic8JOC!4dw3r;8FDJ+PcjHz<wXoZw1|>%$SFP
zG@L7EragV@6H)Q*m88cR7Ob}{N--zq$mlWJv+cZ3;tfgs*NCby`4xJT-2VXes-^Ab
zuJ#i4P-j`G!{Pq`4@?r(gikAHWz3jXJ<9r5H?3<LmHhH)cGy88W(6Hphf$IL0P3l(
zbmM%+9qlZ52IF&<F_JraRQ9?prH#F)nj*2IF^SR7&Zn+VQ&S#T?pwPt^vxSuyR->$
zYcNZQiJv@zJ#*aF_L-)v7ZKfDU67y*$W(;sf%K;}%9}~_+ZAcIk{N;J6!ikDTwKPH
zZ;R~`otsQ*e)t`+>qBywB$1~z#3h#99Jx?PnT|qd+MQ{9A_8msba_|qvW=(@WBGQh
z%WK$Yw~9wTS{Vpj47Pu|aZ%h&ZF>N^YmkhRy3HJ{e|QH20)-cG+`PJ^*RwOj^C={e
z{oimq{VMF2_g1zl@Vt_jL$hh%oOjP^!v55?veUNO?pR`GEiw6+`hnlts$6)1?}A7D
zqN?SxU}eY3exI#Uq`H&OV^ZSk8CEN)kYNc03C7m-KDn$tLtVIzGi_vpbdFUUJ^eFU
zmU>mS#9!N&m*>s5=@OrjK>qmXYJDrh*7{)o0ECBAuro8r#UL$(3Qr8Rag-uwB`G7F
zgxnYNC1+WTdu5H7>{I?U<c8+`#-j$^@Wd7|8j>AH7;jKBocq>|)|n=#&TZs(3g0rt
z)Gzm29lhy|X?3Md6!F^0_Hp+}A20`~ts67tV{9OKgtn!hYK+e-^pKu`NATnItHR1F
z_Kq8`Fr-|n<luUPO`1DcWZPpC2+D#0Z@O{c*P4B;<deCI+TKMGkQ>e*Zf{ZSYAoz(
ztaKWB+FM4DLuibucOv)4p{*94-pa}DZ{klZo!JBe+5R7D%CQ!9O4^G`#^Y!*!c?4N
z`c#3|{zZ}%aI)igKf-;7YRQ(0w{0Yo?}|5DW#@bH(ULj}VQ6AtaL!Yfh#$T0S8lE5
zx0s}slOv2QYQu*g)YUu9D&q99lIzNFa;(6v%y#3wO~#Pj@cC~WtB*78bHL|2T9vF~
z)FvitS(+t4Wq4*P$_KFPTKYY;wv(sHr|K%LGsa9wyCi4$kF8SkQhh=zIN1YC0!bhr
zC?m0?&>|+ZF{56znSh{J)a99R+@Dj$L%zyM{L4p`Rh4|$q+&Ss^sU=XW?v7+{vU%&
zh8PGTOqh1udEJxOp48avZS{M%p5ieC%^1KO2FD$^9<`f#>QXre(qLPsx>98;8#GZa
zNh8zVw|qGT+|w-g5G|yS2ts91kiUg#CW~w$1wj#K4Iw>FdBCKa-oiN&NL8H1agxOR
zqu1J|Qs!1ED>3?QmAu-Kh|VHA0TX`;)~=mBgb<*%ot@<@pvd3r2t4E3vC`vAxwOU9
zk{H@THlt&HJ7>@utu?IL`<*`8GYB~H<qd$R>)Nq#yVSeeV(!1=pX?Np#umiHhLRM1
zR33yM<}07mb*t@C;#o@{EF7FKE_28q;a6<D2?dn1UERuNxZCnglZP4mm_N>^OPhxt
zZl!LK+~;IL6a#_Nf!FI#mYh|Pd(GXJt?V@Gn~27%GsK7QEK(3mWL4GE^!r3qvY%uu
ze{$z6SPu1{VDa3@%pi7>F@j&AZ|Eylc|o&BlHIq)m;ewkJ?l1#DeF3f`i0c0*3jFL
z61)!@fE@H70n_<bdqr`0iS{IoVx9cCr;u=}I<Fnc{J%<{QJ&z%i(RcK7)2}Et6b_A
zilF_O(*tNwfB-w3RVe5t&BVEmCbv%ylxd0)xc${2bj2%Q-rZgKw`~Rs10aemx#OC|
z(r)f9;b`_U0Ofaq-}+XJkl>*5cPgOSChwOW{-&YCY21@izm^FaNS$6Hn^smCDo;<u
zRz0<~^~0>1-ONRz2O$)M&tvuV6{&A{1=xk{m*pABBMdrzl(!ca*RiX@$YUU&i3dg=
zyi(N;*BhiS+2%!9gT{orl^Di*k4m{>Z*5qVCu@_pE1Ywjil!hpY%QX>48?NE5a<VD
zd()%1y1YRdB;(}r`ZAu_^vyfmHZNTZE7;aMn3fBGcHCSpO0xDKW34Oe7i(a;b)3?)
zCVwsoZW}vKsPqP?NfhzOCb+!HDq*1`3_hp6Dm#hfnk3XChDIh$#R29#3~t3cCLG19
z`Lz4;V%02SSe8$iDr0kF81}4HHWm^Ub#o9of+lR0Z?C;ac396O1UckLtnZTK_270C
zx^0wqQO9$A9EmzeWKfOsI2;TQL0iEjjN8;*L&uTcZk7n1DB@8Wu__mHd*YjJH9N~m
zF0NUEf?P0NrAMdIw{5iTGV0j7G6`jnt0ar_MUUbm9Ok+N(4erjGF;ELG$2VkfyPIA
zPOM|H8jEL~#i7oVc~Z!Hxf|t0B<>waHLGc8`@EYgbTFahh2aNt{{Yvm9~8*(L~L~C
zRgGjBEg#K-J!-02n`>K$jQ;>>-53D^?F4b3tz2i#8=`q^K`hrYONkZFk@G||$Onzo
z5|O6nGkoAIPOeE)-|(jyZIWg(f>c}Vf-?9jJrA$eqPKgi3|}nhJj45>E0eT+cp`^p
zG|RTyY#Oz!*NrnDC5A$=0Gg&RAu~xdj0DIw77vx!I&s|9yX{);Yo0D`<4IywE~|mN
zxd3&nW}TVdRFWeWaFRqgcJE3ly~imfvCu(zCA@FtO&%T`GVJ~n+<VtOt!pz$%&@#c
zfJkHm8~&c=u2|k&wXnI0(TtA!OnZSK_WTWPHLjbem$}sKon<Nl41gkjo3TquY=06s
zxh1%|g-_XDHby7sY=p=6kJFmHWn*(G3U5+b4=T#NJq2qvl9D5_ZPAx8yo<=sagOz^
zr|1x=jV`SlX-ox)zHOjz-%n~zsz9l>%9=)w)@ZZEYcwfwlC17eBky3=q;``=jXV~{
zVlsS$7$kj9Ppv!w6UXGc%>n{Zv-b(=D&i@IHB@wwnTMFbe525R^{bvzzNYbtE86KM
zSaO!Kz$64Z-2l%KJn{!0<4l82jAmPb=j=Gje5=>Dx&13^?5P#wO?Pv(rioBLV~*IY
z>-|L8-9-$L4=sr@;W9YxJ^j1VyJd1Dhg!w<WBb+GfsdA5vPZKY>qvHK(h%|Ql3aoT
z!>51q?OJ!%DPrwssiNEY@vFxvaga}Jde%m@tJp{7K@={{9J`~CAD4mrUCwDM$=Dw(
zRmkopxLCf`4bs82cDz!Ii3jo@TDPIeWcS8hTY8m@Y{|l*^grWVKZ>>AvqL?_>TL|W
z#D%aI=sT0zu_yS!t!lGaui9eHLQduYGN51r2Vdu13k_0A=;nBs#p-)pTK(;%^~H~c
ztyb(!Yz@Vt#2K6}Nx{ZP)7V#?c*|G0xzyme(PEn2fo8sn;2)ce1;<6f{A(jg@!XNz
z%QcPTrQ8QA8WITfD#N90YI@P}6`EV!+p0`K-yz_zJwe4)Iv&n<30C%z(B`$MpHxM*
zOSg&S;(wTyjAJ>?Y3W*BotB&ag62aT9f6#aBYN}Fi(M*PX%g90S}@;u6VuZ*qvn;d
zc`V^Ynkh3II%jb12=w=^rzK+;#oVN9B9OhUn(nyU<|mx|ZvN;Vw8P>1xh0A@<hX`d
z$&nf<2;}`b*0ren9rIt!1Wz0x9yuLw%un7``c?bgX=XTsNi!t)SfxS%Q;eMYRCBcK
zjTBQx6^5I2Vu-ia@<{C~JZ>;Nv)qyNtNM3`Zm(pHXm64B%+CxNEQ8l@>`3TpRDuh+
z)mlQVTZY}-b>go?H3&hHJ3W!i0BKer5znT3deq8o=u(13HMdi6VY*-ul$cpK+TG8$
z*1Ek1!n#ztdo()45V42k69PnoIXL(Ct}9%*o5O(3G)NVGcTw{lwOsg*Sh<QB?Pg|;
z+YzykgkQtGPbB8FA3S1qTCesErlYe~3ed^7_n8=xanuph>0I>wHM7!gVz$#zL{e7E
zFvwBrJqfOVRq<S!REej`{&dqmXNmdp$>d|)`U=aIO<wB$NT)$3+9Lk|MG&qI{<}%~
zcNI#FmZUn#%E<2YTl>Efytd96^7vRm`M@WP`ijz@M;Zh{A1Y;R$nqSQ9hV(|uT=2I
zhkgp`KMQnk6!<0?^#1@HO%RV<vec(fv)eEPW*kNd$Q!w1jri<w<-Rk#)L_)^9LpT*
zZy(Jm;1i#^PoVX#3RTr<$}wALbfmd%%YGZ4($Y6&oA=QY(V*nEPZ>1bQ~O4FUOT-&
z5ZI8IlO9?0`c@W|uMJA<+Sp3Q;&ceCz+w6H>^lQfHmP?M4JGcH#yF=aLbeX!+*ZEM
zK%}fmso77b!Y-N^_sHNp?sBF-QRr%}qigmF3~^+|B4s4qy9D;nZ)&5i>Y8?(vB@;8
zZqE4&F)pAH_f9&K+tRjl9eQm?!&e$th;-PZ7XJV}w5fq3A?|V1irzHjtV5b-GZwBU
zx%)9hflzIYC2n)ie^X4B;{ANc=9vmA0`fw;LS*zOxu+XV3flee+R{si*qw@Bmip9E
z>v3I24S~}lfnHPQMi@5K^**H6bYh;zETwJ7Szbd0#@iPWc9$+#6W=Dc*G{*CMLMK2
zB+qk{Yj~F|xb6q3u0rYvr-tWE(`RIj3E98zIXzULPkNU|@r1UFlW9sL^4IM97z5=I
z)w%ELd)D5`+e0-~UsH15Olh62S{L#pO_6zrX^s63J$oOmV`>p4rNi1;+sfrvdpbTA
zG2iNa>Dun88nw2eW2`e9qId37u|_`ku+M+Wvh^KVA+(hwoJu8t$z!#)nHY5q{>kim
zR+Q<tt1_KPt&NMD>oatAYEEs$3LY|kb{OfN<297mH#TxD%n|PMGlLJ@gbb3{_w}l_
zy0b@gZtjR{cehrJg5XBr@+!aD9b$BbW(y>RvN_u9a#Z^tO6ZIto~JCTT@&gWoq|Ho
zG-Qj0BI0PIz<dq?{^+k^_&edxht}Q-z1Kb>i}QPRW&Z#Y8{IL(!E6EPA|Jf@#v7af
zM<2!HDdE`lRf_s{GDb;LZ5v>*9CPhmE|zbsnhiGL?qQA?*;W*j2_E1+VmqEID)w=*
zWzxOw&i4NRT<~^>;VaEQRMHLY<m6o1Ymk8QL<bvG9Px~d401`YKJg^_Jo>Wgb}2o*
ztnsQr6s@%H$KE5}u1fM*LmjLVqyzq2Nc}L~3g@TNm@V4sDI$mo8BRRbO~m`JrDL--
zu}aTNlJfcoQqlQLLTngOk@t>2Kf=2Cuk?*GNwd(Pg#i9Q0l$32l*@TJjCs>B92Gr~
zbH#FY@Lw*VZS@HltVj%ANF&!I`u!-m@o$rM)|Wmbw1(^;F_|O(09=6M<Q}7rC~2{#
zk$UM>A-;wis4ZZ-KqZKbvh&nqjN`Rr!+R9(^IOb{Bq?l*E<W$^G4(xZx3~Iz#E`<p
zA&Yn}H=H};uOG^ydF8%i4b<r6*X~4^Wlo#Em=w7}_t@RiFYMyG+?UG)g_p{2Fo%hU
z@sc~%=C|<<_rwt0&Eow^O;+;gD#NL}{J^gq=e9Z@O3l+g8`|CIFlt|H3d~qCwo7?^
zn?36u8&`mvTl;xqWp-bkxMc^1_TsW?E!`TYG^|<D(&pCjETR%5>fz(uI9&6S=qp0|
zN3)&o9|O&jJk2a;3J0+04r;7Y#^pn_j7SL5q2zjG)|5nVeLO=LY%8ww)q9c;T3Z(t
za<R9BTkbFx`#v4sHsJ?N#-I^fJ)D}x<W?ks6Tc0Ez{hO*(=~4qrNs9OXLO!akccI6
z2Hl;(^)-Zzb1V-v+{mvR6okeO*G}AhIn6#-xejSNBWKJpFuAl}Ds_F^Ty7DcLs8yp
zF`;njZ#a+xG)%inpRe+&cJ@%fi!$6xD*1j}A28s5pIWsUhACcan?`iDMe|IbHt$S(
z3U;z4?d*0B2bKW2)8&kU8c7KsbpHSiQ;ys0Vq*wJc}4<DCgdFFAo`zLu^iU%#pXvV
zD0C?TKk<5wdeh=aRoZ)-86{GIb{6?J_WBQ6{R=abSg9#1ADz&@vqKar#XOc~IE1k%
zk|u4<E<0xx8pUWQjfJGrs+^Pu=8KL=%}q2SJHr(0GJ#1k5y>O9RoQs*h@!m_8Bnj6
zB4i$Vlj&Y<nYw6w-K0>oBKjk`Y_dR-;5f%~=}=-uNlQcf){F!rff)ybie<(1;$OpN
zw-&xb5VEr&$sF<z@PcXAM{`_6>?ScL<qC1T&;v_diXpiY#UGjWLR5|?z}ioI3ShR9
z=4FZ?^E<EKQ@|eeBtdRTHqbc2e9G;T4}K~MVZVazE12&Q;kiPS!w~u69nL-IL$O|U
zH#WBxb0?g;a~dea2hKSswm&-OwRoU1t2M}#_Ymt5Ib03_u9V1;yIM3}V8%XQyo0eP
zy<+MM93>;QomC?x<ebNn`S$D9hh|hRnaAB(wdS2LGZ)<M72qTYuzE4|tUX@l-_HZY
z5y&F)$CV^XBl5uY{`PC5*9E%5Wt6HT$id%!6`T942Tx<`T=m!5ZEnnRT$se`vT<=9
z^%0J6qwxN<mX|vzn8ofJ%iHBAn#44PILB=Mm0IrJIaTC)V>rN9aBvXx&0C%~XA#ED
z%NCIBBn0ixsjU4@3%JU-VHZC=t1sS9Qfk+csNr^--6OSMF=7!$?m@u!s}M^dn3x_o
z+^*1tGo1eb_3J!HWW3&tg$P}sb{+n;cTa{%V|KM=DI0B;Vlu1GLFi~`4anB|29n-a
zwTYvPCJ`Ub<F8Tr*0!1F-b)^#Zyptf3M%DJ2P6)F*E?+-(MDR@RY{I~sT->(=rP>&
zt^Fp>TR{X%GZV0~F&GF>Es^!Cq_xl_{nK97;t+<~IF?444(V01w00j_eC{4YJcwFD
z0-`V7BOlk^ptgA@fJmtwyGbKQ9FlOP{{VPnpfxqRs-cbsd3>;PNy%<{^Uw-R=N$Va
zwq=S|+6LBE<nh!KNLELW%(n^xrr;0p0nk#zBBYCT9J%u4A*0V3_Y{{<L}M3{2{)@9
z^6tX0JunA<YH5Kq%#&M&d*N*e1g6k8GvlUvRdH{q3rTf*#s++m9ksYPRUO-(nU7rl
z9jZr&Pi-V3R8@*kHdsL9FTF#pPkfCVaEWn*Nh2KR9Ss|SB!(#@jQK90F5;l@c<Ozs
zz0AoN5{X37w4D)oR`vQ)$uy*^Zw(Zu%9CQ?#z5<uMBj4@2;z55zch$GP&3eDy(?IE
z(1(1Mw+B$Vht9?Ujc^aI1J;q^%SAS!14;IFG9VId^7Gk%`^Khpw~#cpobFM!Lfoky
zqM?#lq!L`l9IE4Vs=pu|$oHgD8RsfV8b&u6GD^z3k+}USl3IPaqmDy0vVwLzr-mc0
zG0+N<Me?R+SehpQ6%Ka*J^iW(#D*gTtt{;#llGDFuI%%)bpUh}wi+0=vhBH@E-mbq
zNQ7oJ+|P2^_2`R%^(6aK2H2vW3s}o8z(i6WN$ymhl{9nd!eI>JMSw<1-Nxf$`(wGy
zM}0d(W#+{D-ybxf0+{t4^wC!#Fhr9UiU)X~9C^R$+Z^P2)bT+B60a#_m*tHW@JStW
zMyDJWYBd#de1unyKt4<nj-Be=y~UUi=_?19a;#os)VOX&20H%$Dh8QCNZGC2#~iXp
zf~hh|_gm1?gt<Z_hih$IOaS}7{>L>lc^4|J5=kHo+q{mY0ptPQsg~v$iy0Xq2Rq^|
zxZ^)Aao((A#P+euSzvZy2v}lg>e=P-+|oyGk08En`@<D2oE0P1h?*N&8&*~YkwQF<
zaw8w!{{ZV!MR5d56L2uRm~)@JNzdR77DxrXxVE;6IU)t5n3YKZz#|#KrV|=CadfF5
zV3EjjLY#N^_o$NT=2GCMBbAWGR{%Gs)YR7TNi;74&mW#S+ah2$BkuZ|9fpR_eJ9#p
z)(8aTsAoF?R0FP0tw(b^L7RxiButqibCB`lf(L4I5Ca#_F%hvlFzcF*=3Vf^cC8ae
z%ZF4LAOYX}Dt0Lqe#~xWS$y#l#<`goXL@^Mtv2@Z(pURjj%0)o6KTPV1F7|-xjSMr
zCZdrWY{?9anJ&lpa65a`ofb7&rjjzU51jdXMsdi+8<lbD(xF5Xpux+rU%aQM)}ncy
z7+fT~GDufs&NJGcsOf<4mU)|GCpatUed)JRymtu`jnWALRUhB(X$^@SZ58`XE$b9`
zlswS`h`k6Ms%WCPxYGsAygWo$nc;uD-G|nxMJ~xDDvd0HOi3(lwMKez-mHDHG`Lx(
zWK$5!h?8QI?mA~RO@ekNlkHwhwZwT=i*3=61Gn+2@?7~+ZZfKv<H3G*vilCzG!t2w
zR9yzz=v4!fL$T}A)~N~M*&WR0OJ$6*c~fAVgO1*`E8K190^tz1l6Nwu;5TH|jV-RU
zX*}kO%@W7+TTC|to_WnsQY8c}tgggm3Xz#P{vTXak$s|g{N}Zq7U?96GLioP_00{t
z615eq<w)8=EA9?k1<rHXeu9;w-E^`T_Y_~4?#FIHsa{DuhK^F9BhJ}E{M`2UH4L!9
z_HVMwxG8oMI}9@^=Za+^lG|<$3(2{cY6WgF>-DFYk_Hnq4S@h~;~5@=`qN{ODg=Z`
zGa*=)s{kmTa^^_Ue6m!2?&F?&k?1Ks21Nc<qASYo(WxRcDa!(R#(U$XMqy|}M9@eW
ze9Yzk@jT#q0akJ(Dr1;zX2geX<M>r}5bknv#5PhDZcRIl4n})M7Z&zS8a@Q9PF48N
zKhB>F5?iy)ad5BajH0;X1F#*>YOF2=y~;xCB$oL*WE}%{>-kdKYM(ck8C~||yiF?P
zXVQz5Pb`rs^K!qu0xv2qO85D@6HW|ckcs6|pfB9x9+>qf(xXp2%MNa0G8V`xm>FuE
zLTxTcxC0;zu<YKVnqwi9!R2CDC3g}t1P_3%&}Y->P5V-3&X5SzxGwkrW35Xui9~5A
zmG;PT;kh~PYOL0)G)5W88?xALpXAl17Z!MuTV;D=BD2if-*#2UVm$>YQRcFVT1H?L
z?P35F=9L}exFNDWQxEq*9ch9YQAt=^0Fxt;_p{oaz-rD*`7!{!?G&*>V7q(C6}*f9
zvI2QM#WaY4M^X<vSnlC!K+x~|JnGp)nAkTMJwX)i#dJC_>+&RSTdCd2#W3C5qkxgL
zd)$mW{o~x!Qru-FibE;$067hS06hWxDm$s*h%?;Ij<F~zsym*>nqq98;!9SC%t>F)
zB<_h^<fmirRb`o29qvKK2?w{hspCZ`!a0<F>nixp;D3gRVcJ5x0dO&fP6(vfUgQrm
zpg16@<bXM&Gr=Ppe5Al-$vNZG6y}MMnl~y*;1NweT3ZB?Ki+wSyD9D3oz;XqPRkj$
zc*5--VaV=#)N&-4NZr6@ke$f90q;{ax16nP@v{d|JjFc$qBtaA=wmwse=GGX&w7T+
zR~Z>s+{BO+a7f{eBvQvAGb3b<8aC{E)b{q#B#kWEq<Dk|VgWmW>;*-2A_gtH3ReUX
z+Lh46WFUa}+&N!yO(Y;@l3=RJ58UK?W|gmCf+-d4AAHKH8>tvM#TK^L3JIG~-9Jd}
zQZ2>F^*_R(XP&vo)Jp+Gv8V|otF=!px2Ai2YB?q+9$^^HLNUQ_Y}Bh}T|9<DLjn~6
z!3WZi+iY<P6d(_kTkmJTG_C|6VYr@En$sbijA4so+a9%QJ6PEsT|!0=_X1~~!=S4+
zHnGJZau^k0=*n=U=cR0{GKVV_h>Acr2zHDdj(dJJN@lUAb#nzY;L@|n67Ng`p#9PA
zJ!<8(y0&CO51Me>zl09Lt+lPZWZSBM@S%S#Tb3+&`k$>@v$9#>I}ip@yK8n7`Hdq@
zBBEL=f6G##M*;iQsO>H>B$Dh`KsF!Ylh}%q-dIU_*tR&%2MdbRiWGMU69-^r3YpKi
zs!cMvQJ9uUk~3ULuA~V7IRK9M^rl=x2B7Ib+0{mVMP7jisqb4;Y4?&vzI0VZLzHym
zC$CDcGFrTBh#w7wUEB=!`U<O9Wk@Z{Z<09-Q*dB-x{MzFwSVlgx;ngQUya2^G44Go
zt-Gu#b1Piru-gO!hR8ge{{VKaN9Ef@R7~z9P3*ZO=dTC)Q%w%e#ivz-$%O<6hVobV
zYK86Hy~xCIHpM_==hLb8rs{g8AZr*UEYkoTSmddyQrtbV1=;4fA0%K7Pkj4Rb3<AS
zAh?z@G`BIMFb8-~n**Q%tl8bflNjOydXbl7l0B-Na`d@E&Q$*FCujP4RE;ZI6@<wf
ziQ8}me~YOH(xFbwXx5Mkkok5Z9r)f$b;t1o+v!#O(FuD<<SsH<iVwOy39R`Hi)}s0
zyI7-)43^2{{{RT7EMvdbbsy}z1Tqs5k<<(>M?g<%-khaUN-<ioHj=w0X`#9eiHX>y
z$YbBoW4%;2kxe4rEPDw}q%q_H>t2iS%l3KJ{AwrFbt5IR!ERb*h-NlmIs=O4yiMS1
zOASl@CD#BYqO#m04o|1+UqOxG+|w`1;ft>eMq3=z@sul7bmH|#F(v)Uj7MRn&n7Yt
z0|5J;)Z|%bfhGZ>11HOFa(WTRTCrhmc^WsCTthB)%^3T{9)wi)S-dJFks>jHAXH2Z
z-_zE-3$v!hc<khj{E7Cf{{YKZbjBClRj)M`WtK+{j1^**F@VjCepLfXT2VBxyQ3f9
zobto4_oXrmYn6b^g}k+CAx?hJxMT)BH+uudYFp5xk|w!WA~GV}q>@_zWse+;j)UKt
zt|N{BZD3)CO~{gro_#6dn%~R3BXY+f-y8LD>M9vE7-pCVA_4ehQgXxTQ+5oFYgk3u
zcT8*w(-QvxHyywF)dY8zh0OOCDw0I`NcS8!x7M}bxVF371=6O$AU<IL5uVu{YH4(j
z2;1DxB==Ir%7LTG??T6^992Q{%aoU<q@Ewt?XHT!eWVF3P~`)za8FWw1zqtrm1U+h
zQpc&K<6NDo3LYRB;~urlUFu$3a#{vuj!Xgv0f$@zQQB*B!0V>mJ`zlA`FanpYTZ?W
zrsCtTa#=ORWJtIL7CCqek&-(fY9fLX+oh0)+*mW7Hy(rOQA2G6AVs~xOEK8;F(96&
z-mSrLGzjE8U^4Q}7bJhPn#$-3=FTBFGRn*tVfK={sjq1Rk0#;wsBDKrf)BT)Sdq-9
zVv<;lmB&Rr>ayC%i10hRBxi6edFGB`+T@>X5C*u9PmIRvwF9n80n`tFdWgv;pvszK
zGQzBW&}BI&*ys&jg4Ro<#o8G>uv*!oTwr$%>&0kWY1z{Syn7Y~%MFQ=3F>~el&U0Y
z7&c(TZK-*HUCiW0GY^*7^2zUyTvf|mCMZ|R`y)x_oXE{4Ligx>Yi2zj&F*25R2`UH
z7C$)0L+@52(I3h_WxJ`~LJt1`{d&#UW}d|vv1#K`w=#!F-*FM5b-?1KOEiT9Q(MV0
zIVrf1M(;yXtQS^m{*Y0EISQ-twoh8U6~>w&g5C((L6D$8bG6S>YdKA_;}nJ^j2AL_
zZE61iEP}-A-yK1s$QxuZs>YxUC&|eA)k$tF^rw=}Y35_U_j4n08<XkjO}5vC(P+q4
zpBUOu0k^Yz)T^?zM@08?T<OG@h@!SOMmembCAF;N>bG%uZV8G-82STMp;@jGL{lmi
zC7BmE13e8&`ZSV~<_|Ok%Yrg7>6$K=QR?;>{wEgjB55`vSvPSeIuB8vwG@!*PiptD
z&m+e(k#Q0ZV`1ES4^djWO^il(<hHhDR9s>3PJ7k+8AXnEMuAIw%d~p;s#8cgTinK*
zK$`v;t|X8tj@%guBo-a9j{MeQX_}MF(Oatpiw?}(hW5>LvMg{5nM$maO&JWR*x%`o
zN{!!5nc%v6IU)#wS`zs452x0v+6$8AEV=}mlnS>Y&^-B!MsNwoEBMy8{38nv*ymS#
zDDqY|AV-eP>sBVTXe`P`r)o>)qLcFieJbXWcX1k<Nut;$U*3l29rNu+wRX@s65N|j
z`y4XGA&nxAHUZmjLErJM9}M{CTJRr<V(~7WDRUF%B#W<J{{Z1sgBXdHIpQdby9~X5
z`t?fscw~)ZdDJ_<2N>FarF7u2_?)*B97PFQQ6i-%R;S4&q3*vJzC9=H8SwJL!(X1!
zZuFIBjy6tJhy#=Bh5F>2*UvF&78-L$E8h9CNXN{LxmNbiVL-cmKI&*}uEY^aqs@mL
zzB}fcl9$?eY@7f(3iLRKKdr<VnBpo%(@M_UGBCJkVQKp{svjkdg|rPWmm4ZGZk9P)
zAz%BoAN)++Hcxm~Aj9ni$s-?MO0Z;KG~CMzA&o&1H_RpN(zER~2xgvSCodXht%%^M
zJqWL#ySdY4Z3LRm<!=@%TcG8?cmM<{$Lc*vt<57Aw<hxT$(bEO$uS^=6^ysHxm(Gd
zAE<?Z;YX!Q2BoSsmBbep5jJ9A!^^-Ro-yx31nka_RnvSkePSk#=)ojeD$FyuA8N*1
z+az*QebJWKvW|LpBCy`#Pweq5lglO91w<SEWdore)Xh5o0Lp{PGoVC&-ny?t=zWDl
zm4leuyS0Yx+WuAnAyCFv=-)x>Q8cCY1{-iopzE5Tb@UU6<qb4!FxwXj!`iLEtHEmr
z_Hnf`76hRkN4TYMa=7ED&lEC6@*kIPleZw|sb1Y*-M-jC^A$qjmkPezQ@25PbS+j>
z9E5@nf7W{nwLYC3cFjDO3Q7}{L(6+qi&G})p5f(5SngE;-?$!`_Nh`rE}H5o*r0`X
zM0q)1dTye|3uJF1Lm4H4$JCzx09uOHWW9}8tHf6)1oiefrE+#Gx`|mMKz9tt#rO-6
z`B4SiN}pwpbuGzKMmC?VSJd>mB!4CEcX`MPxMHCXr@ksEUJXjtOAF8r&-IHFZQMV+
zKQ5H+#+j=x+F|)5iBdkNYIP^QRcYk5W?^vK<v3%GcGK*x<FjEL$s;5DgcFjZu{rNe
zyS0$M@TUM_Bnyqgi?K3>qYO7ohqrUNN|(+`kMXFj43?@Oju&88YV8~^;a3!2Np!Kn
zX2dQT+W>|gG5-M9s4pUWbRkuvCm}Z+<KHxi8)lQ4THV+%&Qxvtx%I0qlB#)^1Pm?~
zL|kP1dsK}SPiOW><pSZ95>RBHZ>11zEdiO=dy=39J6G%VsdBK?Mr?T?%kFZ+G8E$=
zbQONq_FG$4P>-^H7DeoRy(%%J1wgj4?v!VC;z$7Xz^Xo5n3bhwLFN#sy%hB4>siWC
zk}YUYs%v-poq)5N(88+660(dEJDgQ@o*Ax#F>JDY?1wAIw`|pjEtE5@%yJPL?{(eD
z_7v&#@bK)0JV@DQ8?n2%Q|Vc`MQDd+#kTuVw+{BQ6d!efA0hS6deO1fBI4HWS1j2G
zpktH$?{9jH0VTTJHN1$)7-tzDA;vb4IQ&Icxr<PW^={*K5wfXS{J)fAuI$z_T*WOB
zJ>tNMU=k@ihzC66`WlHX;<{fZ8>I|*nIDaq^)*>9t?qYRG?B!llAvUndlI;*^y`I|
zR$G}y-z;r&*Mr~Ik9i=`giv`lhATT)k)CEH)wn0PK9yq0gYy|^-dM`1B%S1c4nM6=
z7<sU;GAc6UfHAmwik2AC*e{WggQBYBgWj`pxY8*-wZ)*3E}$h!<SFV;rhRGccO9!i
z70tN{haWc>By=XUZY;!*gh<N1!dJ~bf6uK`lTVT3FhwA8=Z*1}+3Ux1=}9rzig@6S
zqgf*P4<$f7J?XJoPL^@pLo&U%XJR8#S$&VCL~X8ZotbVVXLKS(BY}?9cR?1-5{tQH
zK^qfxSF-jvAIgToE3&<wpd*zH;;~)WSa=18u4`V}3p=ZJk}FRr1G+ThmhOKVZn15m
z*<3T)UJIS979s}?k^L!ct>?GEW=1SNMF%*kZsjCZzS5c~=8@!+YA)uVuF!h{?Of)+
zrb~GeeX8)JBj!?gUU<*7c7jL)2J;u?IAGk7>&JS}*FlWPmi|nR>INM~z^B*Rt`ljB
za8gD-g=J?9%+lP)0Fp5oB?lmSRk^LL(c`tZigw!DqkY{Q``M_NG$CS}%91dCSwi3+
zUBAkhZfAtX@yW4+?h4~Ohi-dTuI-sCBwD$-h8XfdSI#-=N&Zy=+%dIpv_#C=#$@E;
zmho;proXynNXr0aD}Y=2R;9h(n|TVX0TL&SBD>(0Z}KTMVy|-+({+?`NpW$2q?{q>
zy|Y$vt6V|k!ylh%ck)Q>7%Bk=0OzK8#aOslw22~Ze8wSmWip`ZdvWPm7v3&S5#Hk3
zQ7m%CLx6IiXMjZlZ6sW6CMylr*9|0&2xTmJiATSBWP;A!yxUut*_3V`a5+=yS(n}=
zhgP?N1>tm1STdY$Byy~Kipy<5o<(Q4^Hg%tsm=$b7HrMVDAc;tHpW&Yz;bi5j8%AV
z-EHLxo1}HyybOgNhd<7#Y8TdRYL`(Wm10$(5@pkl^^<q2?7dhPauw79gQ@k!Qj2DC
zt7CfZ^5)_LJTf7Q0h1W}%zAe3ST`D-&Hm+ORgGAWEDSbj_Frt3iH_P|E&^D(x6HZq
z^{cm9OgfN_nE`0I`&2wGJ^fB<<7hohq~}o>AK7yV*UpdRX&JG%k}A|TFK-xVp=OOq
zGC1g!vf5?5mgjWs19P;VOXK=fvRM6**7o2L6p4vs94ugS$foNpiH!z|7P0-V;xxH<
z*|z{2Xi<;Dy<VG6v6f>Mn)zEBEQPrv*V?qSn`;qp_cwO%qO2H+fyj10#yvijc2#R=
zlI}-^qYHy0pyZF|SW2_LheT;bBPaVdArsqaa|emQEVA+{SVYl9BrkKh9dOGUWQ-o8
z(w{xTMC(2E#4Jh6Gzvgb*Z?}8YSB7P)v+r&g<*y$SGQhGX6L4+i6yZ@eLB+qb&5NZ
z?4U4o7}`BO%`;Dp?XQHh$u+cXAdSnCK{>`h+09>y2aZC@p?5bA*q=(7V02e8<-flc
z-bOm-G`Z1sGvpSHBf8ujv4RL3<bRD{)7;Mta($4r2&WlN=Zu=M4w)Uy>SSVwslG&1
z<d09SLh;+}iv8}KD#&pT{BSttrc&ls9g9OthVmtQ%WxbX0~`ildSci$yR_~UlO_r;
zWgP`Ucdx_eNFt4lK!LT0`G_4ywLw3M?5xp}OPI@^N|S&;I+Y5nZNYUeO?*TpCOF<m
zc>e&1fzqZL>?S;!F)N@|QgU1A=qr`h{A;Hztb1YtM|0*eY~#=h#*@aY<$(}on|ax>
zf&2*lYjuW{mZmbqLJrqE`}@(S*vWFJ9X9!Cx3eC93gvYl5(St=b0H+J$Oix##!YKj
zm5sf=_@j9<xbhsHxvNsO+z%Y$1bEo+UNC-d@U0<5Lvsn&bv7fr*9@`7@W{g?lBa`N
zcQ;zIt0G&xYKmVZWSrKmswU$l-rdefB|z!zPDr96IW5}-n8v$~Nj|6AwC9X^892&a
zOekzFC5tx)cpo_9m2Xe2TZc-u4uHhLx8>DO0H5VrX{AYJ3~KhKGS0*nIbwaPB?Tl^
zk~4`iA=%SC$)xJvV2u=6me)u78(Q0>(Y&V{Rk%~!)vG(3dwXN0tR%2FLK`gS(Ee20
zD`@4H5oSkH6uy4zR-J{6I)v|OJ;ur7a8g*50<Hb-odsg$bD}U^3b)#7!y>ywByh|E
zzT<+Y86m2DCrf=wGb=m7pqS)kBmxIR?@N8HA-Zejo;$XUwuW@TIOFb`%+|b9dvru|
zOsa?Fi6a3>KD>6MxujFFI(YB&Xk#`L>JcOD<K^Ic=CXA!80it;3wR(G5&r-bql}T$
z2hzE@EblcN(`OaaMoeJgpDahUX~W?2YjYbl*786i5;}3nquD|lwk~-~M2!n=YSJZd
z^kMtneAOcy_9CuY+n|~OYK)#^@JTGHeR0^IT8~Q5B88zasNS-d3dfV^53sE$?G2=R
zo(DtoH<;(|dt=kyv6P~ohOvyE<Q5ihJj~Y<NeK*9{{VPME1nPk09vM!!BSSXjxs?}
z<-4D~Q)%#7%L<Vk@s^O1WI6La#yeHmETd_@!3Fmi1<Z?+&td6VbF)<q3Rad@-cf6Y
zWoXA`>VLpimxt0TPch^J%8^f)F~j;Ar*#}g;x@OH)uKNr4cE3!N#x5S$+G-@@i_`Q
zA75co-OEWLOSjV2SGlp2s|dbmSn|!;YDtW2k-)blPQckcQHbeTG22aI&osAfHd7I%
zK5gFSt)#QvzxISSZ?wi1R40%}R>xsL?#Ie5(juyjEOK=!zcS;!C7qn+=uMNbf2${j
zkpBRMD82G$5ec!C1$$<Z?iEr<AYyl+Bc6@dk4k!rL^|ZW0pya+%d%`N{SvWNFIHJ3
zxsVr;@ScpL^&eWYZzqg2*GzEng&>{=Kdn@e?k?@-mrk~kU0ZBYPmV`($8SowqbWO)
z%cWXr_t?2rduZ3potcmB^T=AcqfepCTIL<`Tpkn$!U3Kz1!rmA9urKqcbBD&#ub5M
z{cCDC^gS9zBGs9O5qZE*e0Qpr#K9|;n?$#`j5?C6ql}J+-j**4YBIq0qsnl(Qn=?m
zg=gwsFdB5ANh30xD+B}P_NtBJy+YD9+y0N2B1q*N?d*N4B?^sbXy;8DI<4iehwZ|M
z<9WAj*&>Vs=tWb5R40GgT+FHWV!$ko?d|<5nAJQ(b9pOH>Lh-O2VqGbw$UKCwPXx<
zke<v3dfiZyMh>!1L$m(?gx^?8U+no<Mu$0&3<W;p(z32~+o@FE+`BiHq`uZ59CZC_
z7T9XqrPxsx42!fdJQ3^fQfgM(u9<GuGVb#v<yuAH`~4}ZF;2wFw3#bwB65kSOj!se
z(OU(FrB$}oFD%YpZ{53-78mrY;?h|n5&0~n6Y~St=~iLV<0>F{L2oGeWt-*t*6Btl
z#mY=-O!LU%bXe5B>xXVKo`W4KQzer;X3xw3u?VjD+y`M$`4%w1mbZ5#$^j+25$RKv
zhSni@<`~pAB`xXOZ>1*CE0nG-+h~k|6mc>0B$V{eV^bv8*D(E|EkmdoMvM)w@5dF;
z+E{o(>cUuUqBkz_f((oZKA9cspVcn)7?kNyz>Zk{>&jibPp7b<O+74CtXb0Fww6LK
zg2qGSNCp%W*pFX&vvGfAZ4JX2(lZk7VddmEJy+1yFkNNDlC)^75PXa}A45w$t=-&E
zG<Sm@USH(T&FSw$ioW8zwuG|l)~0iHWXg(02Emejs*UEWeRi_k{f*s7*xR@n9jZHx
zFYFTUmQ#!Zzzk%Xu^US)Y9b6k$YNAsN7L4{QHs=y&FE*C@1(jD&djN_6O-HD)K<-w
zlc#BR!G@x(DEYyUIKk|FC`}%3Bs}T1GH_1M*Vt92(Av>nDYppTG0SJ>9>$cWo`a1x
zipzS8&2JkZ&kXp^d*GVa(yVN5Aw;^I<~J@-U=Y59_vWZvSm~^Z9iS)6;DUbcM?>mq
z-c`lKM*cZu8xvy0!-fN~tY_~dSm@4)yhWn;O6DC-I7@w_YOA~Qia(3`RzA1m__bT9
zPMd2fZ#Q%k^eE%|zJvLSr20MO-|uxJB(BMVWb3o02e9c@^t~HTlIAe?0bzkjl3eum
zKjB%bbmObsyUFN??R5=G?r}S#?%AE0``)B_{VLO3C|7Cjzj{{?u?H#mcd6#P(-6Yz
z09k{P=8`tXzP&otQ+Vrgl37ZnazJ$e?#Sv7VNjL&4HooWF5+95-d#WimC8zylkzY3
zu~J@*HUgh&zgI;q=LN_ux2H<Ub&aAT(r>+yz9|mkeQKPNHId9qm5hAhhH_7OrA^6+
z%as}zejrUYV3Em~<#jSVXN+TjJ^iaH?^D!u4>BH1jN6cJ<$cXnp7LjZF&A+ygaB|4
zr8YfY+Dyc93?p;SdN;S>TgH@Pj(JtSgYWd2Y+-B5w~-^1g^7>%y=z~?^XRGvon%sM
z6>l(uxcY(ERyD?>J@dsBjvhVPMv=bnxTvL;cw`czxC4@Uk}BG55TudU>;4^ET`1j0
zsK&tj>l&^Y9yqR4Ur(d3H*Cs+Lfb&e1ox>T@h$W*G<NO12>GL9l6|?X>y1`b3ogvC
za##=uA58b92ur9=qI(7P(AXbiNOQl=-`~^Pqg`6^6l4wvKYs&;9)_y<o_)gz&iQ7>
z^e2pZQ)g$IbcN$7Zd?qg`=+<DNau5Hmm|1qqS31i9#|95A9_o>N$sC-MRZ|+2RT1V
zxu<wm{J6fhKw{hkisPJjKU&#cFbNqNc((!jtPWDLl~~1^#+0VDIpnh{o1wP_<ih^|
z^{L6GYHKJB3d+FX`9H#a4R!iohhPC?l?rY-O!N$U)`Tx%Z)hQo#yE^_e8=M~d*-ru
zhtV5H44&r*z8=(Mzlz;$8|8h)vDl7yu9n8yc!${UQ3`>?VE`q4Nvqm~W_y_BNfa`$
zJIe3|IviEOtXPR6u)eh|Ade|JU<A+cdx471b!9YZ3Q>VVJtIncc;3$A_weNHl>Cwp
zO0#B`nuO(yigJZ#gniZZ{OKb}uWp%ctlbp|k!Df?y87ayzQ0g0CCqEIf<$T;Abl$<
zwrONoe-GXLkk4vj3l>Q)&IhI{q}ny)60ERJk+EIpaOXat_NgJfy40EPQTGAJ+6deS
zY<dc9?b{??MySCzug+JdKMHE-c1;Op@EchGvuBB)FD`SICj?UJFi8Yv;u!WY!6HT7
zza3W{s+?Xk)AW19jUW;$f2}))8BcW;M^*TP6s!Wk3TJC`m;V6uRjPAuVjW0DZf&Ky
z5*pzTmnKdS?b}x(p3>Q5#F&391ya~2>s;QAs@%w4NUfwOIe8zD273zDp6cdUyvsSE
zk)MWEkLLVpX9k^_agu1ieXK~T@rnNcd*xy`W4IBHgnCh>Us}0AaEl^_#IC0SiS7RY
z)~<T`TZpqNLN_qOlgG>43ZrqZYBn$+hTS~4oU~4(lw;R-tqO{gu`aJGJG-c~n{)oR
z%Y+QG9&$geP`$j<k!DeLj_wBD+ke8i=G1&we&%a&ga_x7&>ulpBJj1%^}Cy&5FnO9
zKXf;4Zhy(6*(h$s?OWL!nh%LIYk8h4tMxLnl}*es5zl{Gk5Ja{BAPpkC|JcNLrEKO
zeZcKp+?H0>a>;Hj!<dfMWj#K%1&iN9e;jb35N`QYo)h2ks`hJgeXO=Op}f?khGS)D
zRbD`4-cC+C9%^MbQOL~2LN;(;ora4IMXeaxM2PQjaHcl<zUT6(q_VcXg-n+ODL)_s
zt9$zz&8CebuTxt|(qy}~Tgk4WWSs#}i^8zzPpRl@ZVQW>XpO!BX%}f52VY-m$G6h&
z^k{^)GN}p%Qa|DL#Y1!A6C}-VG8B-2$BbwH0Ils==xUlsyQ`(1sbeLyH%1$nn-3ve
zh91=f(b-ze%_--}8(Kc3`~GIATx$y~YJz0sk{M1nXSHTsYjH;@Qz#pV!h_$x;l&CK
zu{oq_U0qwll@PEFagyCL>S~;q(}-FN7k5Ns<_vfK>8z`bV$r0LZJKvn0VIXKRraQv
z_jsD-B34bmAx6j}(;mI^S}IR-7gb!ddoHDZj*DjK8|7G54u{^ECA#G;%nFiY4b%{Q
z52aO;#QMacNxdw`E43Gs{`b<UOw%}Lxw(<Dc9vcW*3qW#sf?zXdUt|2#ofORE>Onp
zpO}A*RJ}=IjF_BDCeq6o80XOaDJ`OkX_8iq{_lWU@&_MydYX?_k|jlo2?B*bdAgkS
z=C)C@v72`yhFR^|ZZ`tR0m=`~tyy@2?pPWr?!!orm4FNfT=XOQ)lv3v-gUTQ#c}2q
z$OGwCO}&fS?@5Gn^ioE559w6YSd(bCeR)2mF7g)$2FS<@wEh*Hdb0@Sg-G61fKOxV
zO=*c9Te!eHs{a58{-&#4-8>{k5K_c^y~aPS5sskbS-Z5hxGM6?<@phYR!2By^u;zE
zN;qz#xrxB?kIuc1*V40LmTBR33gNeKN#Of?RiUTcw8_2?Ib03OtAn5Lt7%(PH752n
zF1$fB@Q*t2T><^l4y#!gavSE56k=jIC{M4YUQIDpb%sKyRf7dRhrLfMHuGjU7$8>X
zaLK7o5ZI=rGcMlG8Ml_*nlgiK!H<~w*1@+HcBvGWpl#)Hxh=;^hBr2oNibF@pa6w>
zwRPH8g<nw^wY=WZ;LZYP0FFTPBC@SnM#hw>H?fHYvfu}_R0Ls{10eqZLsQu4pK2h=
zuMk!|9DKliD_t}jm=H}oMp*KEsG=AEdXjq6ltZGzE=9S>KQxoJK?j^4VO)~0eU6n%
z+nE=dba6$xOIJ^vkiGHg$6A=RwXjvWE3<A~CkGhy?^Z8$#n)Lr##3}`Ss0JJdSFy(
zp<QZg8!gCzt{ldE)aE}{9jNBh-Yb^RK+-%_r|6~OcTlqoS)%i?v((k8HQy6!7CuF{
zm6c<I<el06@b#-#J`d3}i$f@8l0{x!j_s$WMP2aCj4LEkrS@4yeAx#L>9^PESx#_!
zBBL2!Q#R8<)x<HueG{10LnN&tWuGIrrE5c_3z8#^6U>Q84Cku$R`tbP)uy_&iDtHt
zG>rRPft4Tqddrr5Nj%9O7AJ31Ty8#|)r)PKB$1_XG`%({Zgq`g%rZm?ias)ZGuRJG
z<@Mhj%`B2>+ALEmN{bphN07vNcgMYI$)dcfmwJ`aL{;6jj}7g`RFg!FH(e6OLy(LP
zK=dN6lBXAWYRR8F(Hxl2H7#a2)s_6#Y#=H^x%4ObR<57nIjz+pmI>4h5|6`Y(Bq2g
zY%Om@e`4|<aEl5;j1qasG`AW_(_JOMyGw~(dD!H6XZzSSw6PLu$c05MS&eF8S)K^s
zlptT20t>IX_N(%0Hnxczaw9B^a?88r&tvVHRF39L$tCh2iq%m-$1czAe_U3Du8(gx
zk7Aw9=g&^(>7IhJY}G3nBU84#w=ZolWG8_ebMz*ok)sIGGlCPB0f-C_r@dLa&>B0u
zTA)@BhETk)s;_NviKj+Xjvw`=O!4YRr5Xv2hQ{3`P{B!+aS&cI2VcZe3kcB33^!5C
z@*myAy;IZ^+OuwTmVty?UBdY+Kody0C)I{}R#pE1iBVQqZJBpJ$aZnO`x@31rz0s;
zjCVC|?c{(?V7g86VNS-wW4=9V1@R)rn>IAC#&F86OL4|C-`26xOVewKhsuq{3H!&;
z_cW_B#>GsF`?b%OtB1~c#dNAM>T}Aho6xg8{K+cYT{4j5kjLf7J*h64=81%@A!zVX
z3z3oj6u||&@w41qmX86Xkn~?tDm_y94B|a9Hei<H%aM*(ZaVw=)ma&~**(6D_miNx
zo9wYM+$Ebi0QdS*7*&6E*DCKBAW0hFFdaDkY7IL@@fM?U7+id%RLIUUSa$$>S7oDk
zG8wIemWU*kTQ9tiyHPrdB~zs-?sC>P5#Iy8&DY5#fg_>xHFhmNNT&0x?KT3KkOBH)
zwqw)3)0#mZ(5>?#arhHgQ$tzpgGG9<lH7>_B;&5y%2iuOL}<n)AK35j<rf!>B6v`F
zOC|!ZvB!GRO&Hz8hVfn{R{QXM-T3M&S}EYt)<?9^p5ootY^{*b8TBC53;XD8Lh070
zAYs1G5YEuvo~PEaa&l(8swIZgd<URe31)zYjWZ#ZQpQkzy-({{1IBS$pC?X@@x1wE
zMo;J1Q=|BK;x7=+(_UV=wt#L7%6GT19kJ_OSBJa@;ja(atgu+Llg_-E<lUcab`>(6
zDr;AEIKrgfnj?j})bI6(8pd?EMOlmeoa7cgaf;m0ybgA?#LQMpr3)~B;Kxj2x8;E@
z?;6e+7aIUFq71L&QlB<EwbCt7H$<Df(0*Qjy-C;7(JnMKyDMpy5$VA!u^#B$m2xrj
zeS21`u#pQ+qy%5OMnN8inWtJ^-m*&#qD(ga_0fjh`c<zXrGQBC;DAF&ybe17T$7t@
z>5O?%1X-At+%m%_aOgW?pY}U-Rv-mu?2X2MrA2XTa}3ey2!R8P1#W!9>OCstYSO5C
zt5Xy}3^Cw2tmUBWKFSs#80^|`rvqj(N7k$+oYUF3x0uGo&Q@MRpI_-!@1?p%64*1O
zN`y3i=lH&q?H|Q9P&e3a6-<mkS3S>sk4nm1&tlb!x)sc}QxSV@Am5nI-gb}ggIe&5
zYuzqr?WK%59FLch0puS~tzzoeb0wV57Nc(gClR6h(jLH8WxlU_bsHFM2#FLam!{?&
zN6=P$j#`z>mWGY}<T_)Po-KzwM%)!1zgo}LJY14kv@u5V5=w{u82-MdrJ5Kn%E>e@
zB&Z4A&7Qu3s%lnn*~prTD~Bt!!#D2u?gwM*TGLU!q)p1&89JVaFNh&7+R3$jhiL<^
zt}CB!3R!7BYibu?eRhHqb_ZfBrJDK}Hv<S@4so1g+#1Z)XSKRvb7d~vrX*%yaqhM0
zQf(_7lS#8Qc!tkQYilhk!dr(;#^P}p!;EJb?OIx1rFp4B67I@qW02-447e%v$4{*?
z#?o6iSYmZCox4?rT%TWaSFi43g+H>qrBk%C6(cX6<J;P<T(3(BU214pYEN$<vNp!x
z%r=tkpP}Znwdl+@4|yzMk~I0;AOL;>t6J+<DR2_fBC;QmT6OK}J-bz%M)WlD!F1`m
zBn>2a0F#cwvWz)pp-tTxT7(gpoh_o6hmZGi#@{F>sXl_M*x4D{8QSB`5du}PLV`H_
zO=~TM#K7H>p&bEGNB{%;>qkZK+*8<;mgoTs830kqC#gQwZP=b$yO?uWX)?hp%M77f
zJkFtyUtgtJvavc!i1f%F=KyC1<&kmR9@Q<?lrt!bXIw0wIo*I4*0ijw3^2U55-MyP
zqIrI8{X6<pIXe`f*;dC+Wj;(2qYz7d+#Y*W_WDfI-1$CA!<WK2BxBd;YUD{AmXGG#
zrs?vkpkedvS1oK{nig56Hsu0==H#m%Z+gO0l4j9?LfcA+H<>y}gt?8HMkI0D6>RAG
zb*!xa0B70`8I@lHrC4UOww26IU6Drk*!IU-uXU-xKa$pLT^r>mvVJ}5K6x_iksS7M
z*h<Dbr7Pu!XG6vh)~)GH1Ma&>qHv3a`GLv)l*#nDCCW%rMK~@|@Bpl<okK~txkyC*
zV@;il22SjD#Wfc)TTx}{wIJ{p)8BFz$c{6O-o?Es1GDZk+D_`jIf&z7_pI@ACB4LN
zBS=^s#uZ*F?7E!N1&$fELRg9WAO5vBPnTfkxRN|}>Lg;w+2hRT0;|P$60=8W+nL|w
zjPfd-){lLv7LZ)IFyy3QkUplSwbm{4(IEL+at7Fnf=6OUrE00GXlCRtr3z|yi!}2}
zjHGW2NE>^M57M;byS8y8UU7vZP+(ODE`Fn_u5SMT#xct>TG~hy$k_8rZU}$In{ln)
z7`JJ+F$Y%aW8A0wDxE1cVmZ<`S*%u5aeW@gA9<Aa?fBIzjYc`7SSFmt(6M9;-!UGZ
z^#Hpu!;9GD`%@2?X9I8dvG3_sFXe=+Q%f%7c}f>Q^3MY}KJ-G1Pf<#tHKvy=Htl_B
zE0l7_eo69<dy~}FyM0^xCe?-9LR4-%$XE|2zT@j$z4o;(nhZBgW!mJ&Bt(eR5yH2t
zan_^$)W6nj#1@L%%A8!H;YiOT9=vs}{hijPUePU%g8Nl*Znu_F#pcJ7S}u&IrxnlY
zUM{>B5=E+8eDN?IY<!)#{VLH7DmzAm&mwIh2M$2(j-S%A(?_(1=|q;#1|<e`mQ0-Y
z6|5r|naWL+<J2!TX<j%YbdQF4ImqXXeQS2s(-1w~<8GEr2xVi>9jMb|)-R{Izls}V
zwvsUmi6Z%z1dNPy0|Weuh(!j48j0pNbHrGx2@cjCy!5MWGF6u2uPv<Ni2nd++_YQx
zPb}ey?8n>r)9s|u>=m@#B35}__cDnOKBNQpK|GP`SeKqG*0nn}(=BwIAt(3J09i>q
zVETJi-5W){wXkc=Le^Gx1w@Fvk>8%w+DU4|n(soycOE9y!$)JM7lI;A&o3Bk;GB-8
ztHlwxy-hn&xQS#ZauLFhVtZFXrR!r#i6Tqb<FZyIvZHd2;GX9+kZIOd_OGd3PZJ+B
z`M4MgGmuE_QO{;wu2hppjT~gFBQNfn74MJfR-n_}A!l7OO^P!l>;c?;y((Lq#7Ja{
z)(<gN14imGk>3>^rnNn+uNqx$kPuotWmKMkk6M=|%CbV-L3tuMgvS!$Lo87I?f%F;
zkF70}$!8(AOUTFo@#TO<dV}hH=~lt@d*s=v$nP5#-xw;YPf$SpD^kZox`rR@)PTES
zl_ff7wofGb)JmjdyD3Gp2KrNQ@kEoPQpEew{KBY5rbqSfRF8%3{6iZ2)3mKKD^9Qe
ztxkFjbM0NVpN5qbEVh9oW-9F996xc2wQXr=mw#!7P09#D#PF&s8RB_YySbvHeavfL
z1jD7uUrx7Wia69k9HVwmech{3{5;Y~t1AHeH#<N!^N(t?uXx_mLRjKkHJK3@&A5di
zdgRv&;(v|*0O(R_+GJ<#Y`KXMM%;Uv&M?Gc9)&qlq_sP^pwhH^WO>nXD-a+j?;hr<
zYJU=ZKLqVEED<bd6oT0VbmaE0BD&Ny?-j_B-CSHtB%gT4DH{kJjz229;r{>zPj|N6
zQKos*_bT9=f_dxLky|VTBdp|P@l%$NM?>PjixC$~9Wwb^IetyC45-NGKK0Jo_<sKY
z#7egpnvKFJW^xM>V_$Dt>O42_(@3;`v|q+;RX$_9<maK!(zZ1L;mdb{bjzh?W(ns;
z+%X@*c&&Y<Di(|p3Y|)h@;EI!!t-hjCPi|p<R~YX!N(OV=pIN(ppRllpR}P)V;zY;
zq}OeyXjaQC!YLL+X52!y84rAVQ}t~kf3v;B5=IeM_l#Gl9jSe7%2prMl1DwHTeyJ|
zIm03`XGLF_4xFD#x2jDIg2i(L4RTqqHp_=oj@j-#Dp}?J$cjZWrMpQU2b{Z$DdgY|
zw7=Sr*+FR2>G8{F<`<HFGmLTvrAuwQ*l8rJQZRUnRh|jpvc#TY$z!_%w@wMGKiF~t
zv1%|gpEt~mryE=7Dskc~y-s<q>=j^uU^GEN1F+<J)KO|nr{CLMTu-(mC>Ju5kgLu}
z_oUpK&}!E-?X0A}a#*W419RYHW7FQQ4PM7Vw0l!?6wjQyss-DgpGxFBQQ}=fO+sA<
z!}exmNdYojxcNyL&U^N#Z9E;~?+{(JzN&W0@vd4ds<QSRdVf02)6(;L7tj2tzo`6A
zYde_iG+T!AS@9u1I_J<2TEUl1@rJIm>Ng%_GJ}$;NMHfuJo8;{hv4fE4#mFVLn0CK
zIQhNEKU&rn7B?WR?s50G$HTY#IrbGwwJJ`~LG0x}iJUm_p4a<r^RJr`5;W3es=r{z
z`c~eFqg!G-VQ$LPOkJ1F;hX#E{n71PXGylXfv1*BeVAm47?LAAjFXOA9Zf*j3#Z%1
zG&U?=B0~l_Eso%J6%)kDO2dsPz?OY6Z1msl2}D8}CSWE;;EzM^SQ>`3mUr?%&<WL$
zY-@J;RQvjUD_-*3T-M@U*1u<1fncESQiqbj4)rdX;O`CSpXnNf)2E-0G0}-o4`4eQ
zm`*7+$0Xjya_M@mrRC|C(zT>AMkR*%m*p+pJ!;X=tt_n?cvXym5*Wx&)YRTF@pg;h
zi8k3w=h&*9vG5;uKJPWd$K&r5Yj<jpByrmwL@O3~^e6QodRI+2RGQ}58Ol(Lw^L73
zyV5i}D0JIfw<X=ol4s^;Zg4+Zt28&V%AkovNHSV8&hJD1f0bL)^h-PFjMunJuuGRR
zXUtwUw0P-`;NXmRtM&n=V+>kb+{Spsco|@N=egsW*O^B`EaYTaMLyM@<0&7Tv_Uw*
z{{ZWs@T+lYK1JJHI&OT0eVr6_87HMpclMis_KVs4$suw>?BxOD1b02NRy5oF3M)&S
z8C!nz4Y6hU(YoaKq~!Vwl-ls^;@PFu@zY_tv}1`ZWE&VT931x@GmgHr<h(k(t#x;E
zv|Gc<#U4DNo_=5DSQh>*i&d5Z3~rIMn?6y<P;gJZUTEUdZl+e$3;Ey}T?ba|r21BF
z7k6ffmgTUH^&@RMHMiW`OsLu1Gtq~7jf%bE>AI7=Y|V@kG41$N5?{f*TdOOxuF26G
zln1?9(_^!}xHk6bBTpP(H1iy;-oxun`>0wyjE!eUo+C6--74@(7YArPx^>Mv!^mR*
zT;fRp+baRVKAzRLaU09!E&i7xGjSOt0;9R5fh{!4M}e+ll1R?$b!h%~&OTH9<DQ-A
zDv6*`v$;FkNn&BWmgK;Q*-{VQ1aceKtu5`{g9#3uCgv&o$l0;;0o%}4UaxbgZxA{=
z8Jp)LAG#oR6lgkPOs}Zwspd)vNTgOOF`lFFrLwy#sS^02;%GkG3=<GRK`RWNILOao
z&{9KvtlWWYwrezU9L*aZN8?&L&90N-`(_hd5foAH2&XP{)qU!YnW>BT;b;I67caCR
z7(VBys!cU}3f3-J>G!u5%`8AGs}d7AW&^N3wV|cykcW7rpD{Xzk~QVfj;AA~OQFcw
z7Zci;@aJanjo(Vs*8D}HT3AUfq$wE2E;gsk7uy|c2{~TK(lJ)KK`i53O(vS#<~YN)
za0gGN8k<|}Q)>f5w0`h!&QJ8NdiTYethYu>XiM0-F59MDuHM7j>ss1;Q|gw>u?P&O
zaX)kqU!^AtYQZ$dTx$_QcrC;XyQBTkCm^2ZHJfyGOW9+V+EB0N;gv=P!Jf6T4xMJp
z8b>DQjSDLi!~0X>vx-7?##alUGdvIWNbgeGTMo=_hoW0tTbQn*k~vY!Je-ho(}B{h
zL1wVsiB>Y;<ylnr9r01g0>t43{{WWk09e$YnEIb;d@B<)%|7^viwP>f5AHoHHm+JF
znl+j*7a*b)4U$UwW|(YkVcB~=7h+`X<nA5*o#_mcB+9mE1V%8wX_KCNgX(Gs<Xz1T
zxh!%^7U)Uu&uWVdmQawmdnvcEZ=2Je=hl(68<}mI8014FvK2A}`=oY0f|aZyj@C^<
zF3Ix~%P7SBhx^0Qp!+Sv_%_nStbqB&`t1YnQWfk--X6Qu>>BvPEUg(J`E9ghe<4#%
zrrTM_Oi;*V2n%7iBA@A5=J}n(FzU+DBtgG$<fNJIJxy4%xBFT~(@QIslK~==Xd~W+
zm?nv!`#sF-Z)Xd+&pTLPA5U}bQ{8EI7SMf~=E6mlw=|(#{Hl5p=zVD<v(u~?h7B7A
z02O?0&#g;)Wa7~s?imyeFlIS#Y}BI4F~u2~;et)k$bd5ulNs;$(n~aU(Rs2TB~f=Y
zxWFF6{i98WWI^V^8^Y4&GOy3ep8o*jL{fQ|C?3(=XJ|se0MtM$zbW_peQER;QOf@S
zZGsynw{(s+GDjjEtU>i7tru62HRsu_JjR(6WR)Coz;E%Z7SXZ+1hXtrF~cm2^I-n~
z4r)uY5(bLaTp+@L>Np<em4?b@=^kV^0Yk6=i8xZ;m1up5t=S`(%#LtbALb|N=~R{O
zA(<`YmMN41eB~I}zK1<=RwC8mzCm!di4^g!!pn`ULE(V+s!?RzW5;Q840?Urh_}kY
zraf1VI&`L_dTE_PMAuSm!n`uzMBm=`_Z6WHwbjW7P!AdCCi1u=`?wwb4Mr`V3pIo6
z=!?0$woGML(Y;T-XqJM|tu_b{+)fpg<WCX#Ty_So*=koP%l2e4IZ_=6+>SlL?Nl{e
z00K-VP@yo<fPWKO3bs0Jvb<MHBXsHy-92&iH1uI}I`-yE%W}Y+5<;;V9Cxgn>91BL
zvbVWsWo&~G<o$gsa^mhe-AY8EnaF2MVF#uMdd|Fby4<$W>}b%a+AuTfYT}4&t7mYc
z+9Q8*k=(mDi68Guqp11}_4lhEZ;B^dN0b4Kpk>a|d;3*LBfPhNI?*E9k?_(k<0m|T
zdt<Nv0IIJnQ!G)1V7ce_s0b(A_NvhdHdm5cTdQPci1~hD4C>uau<cRW+oaH>@LVdG
zCt{GI<b%_nQ{J^=($?-~c+T7=5qp;JQjI!DHr#{=n{eYC=h*tzeCwfHr8_Hao2M*T
zrzt9oX9uAbarA5ZqFz%r=??jheq4GGDJ<=5<Gx0>)FX-pOl_5kXLHzk*1S+pEti)h
zrXr+=lV=$1$9l?gHjGADX>N)lw}E2-AKi8B)~=~GVmU3OF{|WFHaOsY(Vm>s{><qK
z)1#Q%$14VwRZYc*`#r@;6`Yd9732>By9OhsJ!>1L&D3m)$Y(J+7(z#uWbQJ3PrYB$
zFD<d=Lb1&Y4ZBI?FzPewSz4FwPnVMLgOZ20p$40O;t#OH_IYou6;uZTH2chbPimzX
zEs1hb-030JbeNTfskkM&?u|z*#P;{abJxBiv5U-{sz{9{P-i9*Kdo|_--|xU=fyI}
zBf#5+`GX(fB>MKQe%D>Oj$s2kp$BrtQ*qi&Z%+p{uFh(h$ll2GVdE=?ws`d`WMeYy
zg5`!pYC93!<GpfTHNV#9Mzho6mmxPK>V8MhrDj{}TE*FAjQMQGZKyG4Xb0~R=xcvR
zvX<^yX1JIb(E}<Dk{<Z<^{t~z*vjTEtE-{KOq#vPN#`vPwNh0s$zgGxHi6q7^vyd?
zySNE&EvmyH&SV%P1o8kLo~FAA>{dCVHj{4*`8(ptPp73*{>pX@JWvQ2G0Ao7&nJ%6
zzqD2{_HN`+S+0<RN$x{Lz+z=iPCFl3(6Cv{sywLWo8-VCu=S~Q%NWW*DU~LcIT(l#
z<n2D7@rsn&Ey!k)+vSJ&;^S_6gZ(QPGibq~5;(Bi6}TJ9#!utLO>UCBsT@k%7@wQ2
z2lc1irln~QnvsN&kchrqHa%)fTUB^apdo<X`5b-&wN1?wNbGIY6}lH2zV;SEaEGD%
zYft+!5TwUENS;^$iyex`u|B=&u&h@eZNJ&wLPePz0fWy2>sb@n>h{*>PPM&vh{#w1
zI6!&MeMhY|7Rqf!8dqAp7D)^$kTHTn9gzI$duKkiS5fg@{-X@B{gL1si+Lf&$hgKp
z9Z9T~({138&3S1f&v5%<l*z#N$9|n^$Jrsf4{znOwn3D{+yFk6rzC7gJlWUS{4LaU
z%|6##@m2gUZ+mO!z}EA5j*Fl5a(Wzh<YyzdJco#N9VT0)i$`Pjc6KPSw<-s7j+M8j
zcwbnvk($d>mOFVP%iC@&vLkwW8jSdSX_*%23NwO)!~+xk)9qPCc4bNpqms1IHH}W;
z87`vpM7!f6Jn`6mRkx$)x`lyZG;yZcce{oE08~$W){V`8hUvc5cN@OIV;1SNXMUaP
z24%Lll^I!tpa8LqnIFGii;mT!lajF!ii0+w@pZF97lu{XT?g}}xPFC4ap(nRrPiMY
zrExvQ$+#1J;Mpoy>EG$;S@+kMlUt+_wh_(>tY8!LJ!#$^Z|xhX^!uBIj@V2@({**v
zQa+xQ3X)qE>l-?rjxFpw`>UAC+!EhtvdV)WU^9c$wPLN@!r6Dm^2m(9MH~FgJ29(z
zmByo_>1RlePqez+GsAFKhhBK+kN~cCSHGTEl0bZ=oREH8F@NI09V=>dn`U(?EzxT0
zP-KDLJD)8hVJ6vm4E}@A*6ro4l>}DWkB3>-<c!^YqHLmNdk*~97^SRA!!*w=vW$dv
zA%H!3?n&uLmv3REJ;PrKL{|*a3z9~{dMWkAbbA$J1ytD8^)DtVe8dP9Kh}T(kb00i
zR#ncY9kGT8m-n*Cur@F{aHRU0Y;xUd5`SiuK_$#tl|tu(({H9~JBx|+R6%)eAr@*%
z#W5LDK3tM3q7daqa-T7B9lDLT*!1hLBoZIAM*jeO9^*dM441K6TrI(}{lX2BB)I+H
zA9(&g^;=538hxw59kQ6!2s1|5^2t4O)cq=h>Xx@ANR=Kz5dHKhd!D=>TGA-WPeN<I
z5k;gj-pM#?JE?rNiGXjDuEXuq(y}Ji1>~20BD<MaW+RFj+a6Lc@Nv|W>Ds2bw~J8K
z5w%3}WRBQ1v=PWLf!O~5d4R5?!=4P%2Ac$zK>5(SktCyRaK_yH%iNxE{&A($QI(}8
zbI@F$`22y+Bp)IIK4t)9DC{cDj*}J7+1ae#7J=BPl3%#z>C~U|?H%2{zLlvneUV)g
zCuA>xah{%nw!A$QSK4;@?jvYivnsS@SZA*t{XUeN(%_b-N#U&}ta2l=@-Af=luB{{
z<B&TOTbFuvoogCIlWzrl&oNF|pHHByO)FhUqY+<R1Tmoq>&ZQaeSoh-(R^#+X#5!Z
zF1@5%O?b==rloI%Slh5;jt8%A(!AR9lpe=SQOV1r%LU6>-3XI#%Zs7L2*?@jR&RA%
zTSy|(bU5RcF_xcT$$WLsTn^vo7#=g#Ztf;nt!^AhS+`8<kOn#d-`c5ZpV~=qlf1v_
z2^fsYw2($WyV|WmwRTczGS07gdo0dmB)$jlqd);4<6P{v52$a7?if)LP0(GkkKI2^
z=DP^AEk1i_?ex;mgY!hPoaFU9{xz4YX|o+ctcr<YNQ0_GyfN+%sTFE#V3Zrwheh!C
zg56V4yN5jf_0)~t)un5vX|@-0-F>-Gq#${l3G)CyaPh}lZMWIpQEDy`qw>S~Y`G`Z
zX~~zH?9(|`l>DlA-nE;Srjd=2sr{ie(fLp-8AN-+#&7`aG1CH<Q?WDI#?wldGP^NZ
zQFezo>G)N1XLqMME&iW5w`IdTZNN_1YMWSnHdvyMOSmew!^|bvosLIO{=H{?O)OKj
z(C*sXeVHW}ahlWv<|*zu>si;HE=gdv)1`PFqmah3qK_~xPD2sP0oYTe-!7wX6}|JV
z!^yN^k0g)0eT79XgSz0E>_Ru(TZO;{yW`%eG_@v4y^L#{%WLVbzQ+WzX}Wo4zLk`K
z{-Fm_bBfo}bXQ5%$k|A;PZ#<y-NJVqcQ~yLKShG>*`U3GL_;nn4EPxANgZj@T28pV
zw2REPj!X-ooyWEp&<awU*$y=NnbE^?VJA?wYdJE+COWT9amG(tw`FE;H5IeBxs!81
zp;i;PsUP0W5Hm!RSeZ)68TsRsZf&IYKDE^NV$VX-E)2dQjqSIhv_;=(KksqUr<(c}
zqp1ztf9mceyjMgSibP%rBm62YQDKJNR(qr7$AWyeJ1|EF9qRK-ytq-mRU5pJ0Lb+o
z)esQGbEx@^wX#Ym11F#((!Wm4WlnW@qP0IS!`(+xKeR;fEYevR*_#GHe)b0(dSaaN
z&uMD$l8lnJ1d4!_9dpe?awU@C*dSD78{-G&&rP7zlcd&+rvCs-Dp#rVI6Pzn=zXij
zZQScy5h<KS{h<E<XOUQWZ?YbNdJlSt##c_5O>7Lf-i9NBqdmRq#lmSZ!{^(|@w1$|
zE0QBWPUfkJe$y*OXD68G3-3-;FZDjuw^u6qjh!Ht6uDc~+KgUkmm!}W6cO*#RcR#_
z7baUs<A=>aWZrVj{+{1TlwBc=+?EK-ytAAYZ}xzqXyTos1r(CJXOP()MJw2%Ikj73
zJl9`k3ev(9#-|xRzSYg^X>^lsieQ*r&mJ<{eRJ(wv%x%8^GOm0bR3d052Dsys?5ee
zv)sq!2L0@2Ji8oy-1=sYXxOMbNaJ<Ooi<B36H2v;;s5}h)@-sbe!OO}?q#=%WV((S
zA%UMWEbWrf;~RnOJMmo>u@#)MPO@7>QdPs-t~ouy9mltN!qx=R$>&H?<)@4zM5+M*
ze-1ke#qM@Q!@Re(%0nf|mIW+cNL_|kvuE4VvgMP@j6lnl3_`x_?gyrO=C57bK*+Gg
z6~sw#KF41(B}cY8RY#iQK+m!yNF*y1&YY9e9{&JZ*&6Crk7u3x!~mx_UO4sltM)f?
zi*>ajS{WIi%3hA({r>=OO3Z;KX*|7*?IYqAQ;Zz<_N!55*v}l1mXbKPv>~y#o=^CS
z0Nt^i$pmg5IAc~aEN>oUbJMS3{OawU)!SM$Mof~-$t$jZ16Z)3lHJ+emRAE~qZ~S)
zO4hPy<hT+WcZ?$`h_ix81KOfVfw80gs%ztQ;t1n{28~Jx7v&%AeNA4qo>;LR;ZYQl
zVU-u=Wy#<gr>B_`HMWK<tn#qmAmL9^G1{(J+TIwXzlK3PQe_s{NAt$O^~vj5vl(ta
z;USvjOXM`Hm{pT@*7EtlY<0(Ko;cnq8tn*hth)gRYOw3qy+$-5Ac1Z**p+|QJH}4(
zKfCx+h@xmExQ0h)80`|HACm`?2dSahjczt8aSW2h<}$3!@`8SF+0H%b_ZIBZDNwtH
z0;xZBv5bmr>u+kz@y#KQ*@V#+bGcj8p5xS1R}tPe>12e?SNE?ZV*!-+0*%10cX=J0
zA8Bdg65FxLXQ$M6G}$73ip?R2?lLaSg?#@2bPv|0cx_=vk>F4zAyo;<X3tUep=|FY
zg`!J@#8bDM3n|?g{_sD{Q)3{4>IuGSm<gkEx;YNaj>8?#wMQ_!xWe9rSwrr4BjazT
z>~T_-g`*PNvPmD9cbDatAH=7(J*rU*Lgd?7NMsinF@+y7Y;p<oAIMQ+kqfdZ+a3H<
zJ0~#tWDq@0ds0trJ)B~BFW@n4`A9>RZ|<6wOvP+%%wgMcFDFLZ=suKQ*v0^g;w`8n
z4!fVIJq;@&kyqr{h|#HcB)V?K2e9?0D7X`=TwEeVqYl1E`97z=)}12qmkTUlv+b4=
zzcB!CN79kul6^)f<+?<S<IN6-45V|%dKxKQhFi#5RIt=7<}m6plvYuU0pHr0B;qxD
z>#5yd0HWE$Z80c4Mma2f`*x<^HU0jpwpg7YwM@+*AnzR&7aaaoWHqI{MQ&vfG;n#X
z6wC>e*dCmB_or)W7a@`jk*%~cNogUJ$>$c_;1Qgl{$i|1eCAnZjv=@Nca1i*gfHL6
z)~kJzc99t_JjZx^#dbU=u=L~kQig;$yz=Fd8a=*zQVb?K@O>(VK1d?CD%Ua0V*_%C
zM$+G3QB`hYo^%q(R@zx);oqWQ@W2k{tt^);>z;phGCQ#CijRC&9(+a=k-*MoIUM!C
zGz_P63g5<UZ`^rN6Dm5K5=g<o9co)x<-J(#V~`gwh@Bsy9V$nPTX~jNMN}gnE;66(
z3N7G@;YgO>%8oEvDBZ#|hdoIhGuDS;>v9Cnk#!^&dNj=}t+#oUe4z4JgH49P?%c<4
z7Ufw<jpJ>oPp7qAw{?qQSb>o_#D^o;5_;7s?+kH-RVf=gNh|?z&-4{K6s|wZ`!o}s
zHR2L^BWla@nBP3+qTdr-?v0j7W9C2?<jEburdv3=wT|ZA#%F|1M9mq<9?W|Vxb?yG
zsmsXmCCsX0fJ)0Gi~-!Aha#4P)UWpu)qs*oay-U7Mn|<FR<;VVyKe{P+P^U4j=cb<
z&LXz6WQGwOOb8-lxb4qXG{j^wxNuov+87hWqp(x{aX{`<nkHpPBYm<LJDGXh4{Un-
z(iCYG)<_yShas7VIO|r-V9ydoWjR@&WKymU$uW|o{W=<oC0MN;?+V6{IWHUVT<53w
z&;u-CL*>V(vtipN8Klemu+M5_Km#PQ#>}j6vYt85YO$(9w{Ik@%7ntZ6l6EK80adr
zkln_MJXY<s{$0f6Z5>DljMGRP8rJiqD>t6fIFXAn<I5QBQmkzp4FXFb4%?Xncl9*Y
zic6W|V|x<B#DcpHPyx>4+?roHYlz@>oNoD&H4F1>9X`KWZCnu~=g-5~{FwvH^F~NG
z!Dasd>(o<$5D+cFk&~Bf=WxdZCYy-akzHKn_OVyM1KySx=Tahg#Hu9u9Y+}_{3(^7
z((%Sbb4(**z^HTc7N|^<N{*L{hH`dKfChRIkEKqrg2G8qI1G0d>b&$GwGml4+N4Dg
zCP`RingDZ6C{YwbD2zmas<|?IpHo7tf>mgtVo|ql;AHpwKf;sAo)&@70Of-!Hy{sF
zQ%Cl8l3RC}H<EXU9A(c{pk*aVJfj2)y#o@8M<kQYJ2IJA+(wvSO2nzOqYqzdlGYoG
z(9VhFlyYRoG6r$m`BYNG@yurO-+24kJ*s+uqD32X2yEwfJq9W88EsfZvWtMjbZ)Wn
z&+zlsp+nIcMPf<Xn|iO;y)ervTBD1ERT7dTBj!`}>?z$1GTdo5*<GZ4f;S<<E_Y<q
za`|Yd6K-=Z6-oXODw&Whiz3hErthCW#80o|PLAX=q{1dUALdei@b#fIK4NB-+`OU}
zAjQe-JAO3D8YKX;xhISU;Cq^_E0hZ?Ok3t4z!;JT_kizDyNFxeEv!zguNYv<$Q)$n
z)BgaiOjl!>gr#8#!E7FXN<znAc%voMuwR?*nsh7^bH)MQpfrb}9@OPoQb@zcy@|*O
zFbV7%Ju0q(?5ZwqE%f$|+SOg8VpvQv*v?4jpsP?sE#muQf_EG}zTVgz^Zt0EOIa^c
zS>8zEQc6m@c~7P~ds4fXREZNNG{J23_vV){BsSP9I8ud*Hd`EUeX2`_nrPlVjLwUN
z1ajT5G2W6CR6-{`K+E*{3YC;c8mE{P2i?acA6)v<aw#nc<hPR9RynPiV^_d3E;m1M
zpXo^zyoOMrLYWWD4lqB!3a~CE1VJ%r7inxi^9R<WA}OL<co9_#VX|_0>(60JosX0)
z7AwYANZ)4dyMuKjztWZd(DE4Jc*&3z8%8=(sEDkFBqYbt3t@oIVcw^=nmK0sH<jiE
zUFDH_1L|nGNnEQfgS;sjgrjcxigG@Np}4TO^PV}KqemN#<CZ*h_N~BXv{ap=SB1D%
z3&C$fX}2~q+`z^u(2&63$AW!9G`W?__GT1NToxe^5UKNIXXW*)me4ntQbqg0L~=qf
z2h`N^SlbsQatQ#rd@Bx}KC~^k1m;r_Om9bzrafp<LR84FH2(lS9%~emE{gBhpKp4a
z+r#o(S_i&Tw=E{v!)FRTTkBS>qLtb!NjG9g+}AOmlrL-!=C&;?<CHzr5Khr1H_qcI
z4@`Y{=~F2#hLM8Yp%#}UaW%oW*pjJ8*pE)&REJERv}wqdSIbQK#fd8227A?l>f$)s
zK+Wcs-Mavf?w?A|)-JA1vAVWRsXLT~2+lFql4iOjN~*Tj@?7nO5!eH8=aNVAs_&|W
zStEg17abXSJo@@o1-84ro6Egc5gY>9;2&{X*3l9c*>;%I?{7ab?UCp>s=b7r%>6F@
zN#&Ahn4(6Rl~{Bc$4cnDJ$I`Kk|mK?K0LMwf>+RHt6L?bs9-mh2Y}!!4EOe@d5}H?
zw_DL)d<z)C^f>kvN<}56rq;E0J<Xh2Y!b^7G{i{ps3)iCSa)|GZObHaxsoxID%?L9
z=~gbUCXK&x1InwqH0kDMvS*T0V4^seDCC3(<`N#f`crdk8c3NnW|kRN+E`gim1y>S
z@w%RK^`wFBu5LsrsV4Pc%&nY({o1W_iC8Qwz%Uz#`^)Y5(lxtW0w95rahauz@;%Ay
zDtVZTY4(C%NiCHY7bBiY2fk^qAYU#B+y_@LF7e68{z9O)l37|i7L8aJ+E}&$`jgtD
zhUI62?B8mRRaPZuLD-yi>w!h|9qeDS^PW|PFbfAILa$$XC57Ofg!byCPDw40ex8*_
zF|zr049v=N6Qh;Sy+8NMzCgkDMUxp^kbOt37YmP-vRDBbNmFgSPuPy7y?(W?;Wm!L
zU4r?Y+`0(mSWn5$I5mZD5{MQ_i%XoHoA7@=!nAbT`0dG_+THLJG*N@gx7X6TaJY|Q
zh>b<|T4Hfii(SvDybbYJM9_37{3~ea2!|4${Qm$CzI|)PzAWi8P2vlQ;)Sh|*@%ob
zH;nOF8h?wVv$!`BFftSc!sF%kH5Z7yU3IN6j{8v|hb-(lPT*JRdG{Jp&$3m9sI4Vy
zTgdWoS!2OsT;lGTffF^o<mK*y22~0lIb-NMQ(fiWV~IA6puXkLKhmn}8s3vEChly9
zUL}h>G3k~1`c`e%iX?$Tq(m|0a(5Cjz$U*la!H=Nrxa;RIJYTsSeA}Vqix{&@m20`
zLWv@g(ojM9Q-ay`thMnE+gV)+7z70V<99gqrblUgaW=@6W0GD~owJ{8R5>#@Qu`Xu
zs9QC>aXiv2hz{m2#@uxGHJ<nD72;kP+jK-SK5z&XVtp3!I3l^Yiz=*C82G{Ox}vwX
zYrWF3k6=4C9;Y6aE=`H^FtydCd08y&*g|E?hHgV1bD!x~r?;B%L|0NYZp;juSb_&?
zfo&#u-O|i6`G7hAIRn$)v{DvnJf~$6;0aUs*N%tqry24qvZEPGMn2l*t|4m~p^4*}
z@#Ylypup>&!liY(wt;kuyEHqbCON`^k&eE#az7459I0b-cN|M3c?Fn|RE&^Msi@<G
zrHUoa^BPLRG;#B&?a$D4sg@yMLuk`>)T%W3l>k)p7_ltJqA%0dh%}pLxt1+Lc?J|Q
zMsvXJirBFJ&1;7HUAskYLaxI3Z1*|z?@Or798(lTLyiF*U4O!%*OSo}p&iKWbf_VC
zt{On_$~MTmvQ!R~nw_1bQ7x=)rIeDS{JVkfYQ4Uw+LUHnBODQs%7#Vz$EO~(UfakQ
zVKv)V3jqD^?|6`&nDqKo-cNQ{x{XaTD@6ffzC~nkdU3Gztt+d0YdOr8GlG{u4i0jC
zJ*zUuO%TX#kr^#yU>9-8Q~hc?%bjiRh-*;WkcC*(4CA=;%`3Z>osoVyt;QB`%2khk
zDK7j$1&+xY;~P%}j~yzET6OjGQQEAeIXjGFmikkd!<JDbsPGw?RDgzGm=pEsPntbS
zyq?IftZS>TJUX6{YVHFR5rx4d4oUSM^x+1o^2aO$FUz#VN8LF4!``;^y$U;IE^XLi
zFc2~2Po-!Gqe%CVs96r?+CD+tk9wD0DcKEElho(*%^?*LibzW2GdTOkrM<A8c|=y4
zdn1Lwk$?j}p4F;sz}kjltXm<0zzf)YYgsi7En*PdpbD%6PQwI0txvU;^eI7GQ=YJS
znn4^;c`OK4j(EWmDDDqoT4LPWktmrX4a53l(;l@}OVyK6L#fKDsUa?iF~6uB_8scA
z_O7-pZR3%eOm0RacT?#?xbBgDHApSq3uv%ejtDv24Nd2y5jEhkXGp&MEO`KMO>?$-
z&G~U;*6fn2F`j1oik+L=G->y7YPL?+_b&0}mRCnOetLZ>t}bM1%X?=%!An`yUBD{?
zo^kc5bkiN<2aQ0T82M$!LiWxohMlHqSM1Q6*vhg55|=rT)O~90jm5Q#i)6QDeu@F)
zf!{xdY4ZYCFT626VKM^P`J_Aof2C6ptaA&I8DgD4exjonf-AYCO~p2X>`&$ht1?_F
zL?@Enc90pR1Z^PnqnLIZCESe}GDL9P0gi&AxiZ|zndCzl7*ZDmepPBX?42I;U2WR9
zF*i9rquQxAn31>0ci@2e;mJH7U@9dia6~$Wmu{2&qTKJ1A;Anz+@EToZ(iOcl(2Db
z<hIovara2A7_TReHMEgYq>LO9)rt4-Rjwm26n20XIV_m#?NX%n6GG_P<Oc0-phl6H
z=gm`<2hjRdI<=$RTqdlt!k%-LbN5+D>~Y$qwy}XMT6O)xu^|^7{W$7sYl{TEkIXjB
z@~8|L@O=$eIuOfvt#3xyCEQ{{R^BziZ&UOgYJ_)DJd7_VjO_$7rwB4}gYQ=6WwUga
z2(~)D0~5-(aaB=m<dnu^Rub{E95<<@exU3y$9R__8N%d%Jk6LYJ5^}{MInlL7AA9*
zC!~$&YT{~MVVc%OL}=M?#N?Gdf$vdVULwL-ZKG|63UCUKdQ6=No#Ipw-OjN_j#@#C
z5kwc$$2hk)5w96nW#b(2pIUYNX>o5PNd%r}mJ7+;^y41gt2_Hb)gxA(DKOay5hHOU
zzp$xnlI_ecBTI{o>oi|H4!KefY}DFKmZcQY>M~r3QZjbDoDKe%tj$95>S+GXlKIg~
z9?=@F%!kmLhek`w7c=TM(>y5|F-TbL59r^8FEHlT#)hE@O-1B_a^76Kr$x@yW9{0I
z!8*<V03QmHWN%=+51{p{7Pj%duiFxJkk7-Y>X<#xdTQH7ZNQK-NU|_?FO@$}PAOcg
z65U(JaR`QJcqegE-!^@Hg+~#MXL)qV*X{)#V&rZg(=@ENB5@E#-zEfGMoR<fQazpB
zv<qy|6^u$km0X!~*C)_ZPRLra?al4Hz%<s$9P1v|kYHr`;-Iv;OLAUsGG)om;lldU
z7%Z{kD2%GFwesGTO8z}b=2H}m$sZv=z#^5#I`-Dtq%1F3yP)}Fate;X_Ny92t-I<X
z-r<U@st^OnbLf3Ow8)^56weWlbEnUd_f&fRHDb^A>l}&$F>S2<2jNOi(b0!d+K!oH
z6~~oh=Bl8=F>+3O<oZ)Btt1<SV6v0@!y53FZwm31X>b>YZ|>9W!$&f?hikGC6A}Uw
z{yz1CsO@6XC{J!y+sj!(e8jwxF~&a*`J{D%7)+^bWRbJxVX@G0^r>1AA|a9j6tP(d
zJO}itWw2PSzR??p+J_)ypUR_{b|6S}-!d3&=lR^_+DQ+~$KA)RPpF7(V=~V?Y~$r1
za0jM+>N%|ATQek#5pj^`l84aOIX0=Q-(01PDIC#mDkRy!9nZO;B_d@mQ+6x%wV&-0
z7BXY^-ez%*!n3u_PD^--L3q-njLj@^`~5fodQ?_cTC3i}1H{tA{A8ZF^*+@((e3Ud
z^De<lb(Ets9&_G{BujFV(9h9i)pfnl#~NFR<J=kgfu5rk(b!w6S?n>W3zr*@%s}__
zt6G1DVpI}aT|woA8@Tz%>;+23-rOku&3Pmem6XXKz+847p4Ahb-H~vMOH$UFu0R(S
z*;xTGkT4hP{xxMZyQqRi8CHr;BaShiPkh#K*B;VTYnhP5Uja69N2OUFGHZ)x8e~j~
z8QZ&HBzuoa!NzQ|$kQi|DI+%p!jfb!%OL*%>sD>`%$8C-=_i;Kco7eo!0x%}P+e+Q
zGNF>;)R3f=KtnM<&a&>c0IDu!4GV23N$JO+tBf0Ba!As&y!&uPh<Pi{^B~F3xu?rG
zhS`=&*!bo@EMtGJeZA`+OYuIDY|>k5HgYo+#^B%s%~HA7FI}Cjt<hqa<yc>qBkS*0
zsXLJBMI(NFXB%LaL`66#SYtW&q)k-DN?R~jCp*VGezng$EqYQ!SrG0EwVOLz(E3%Y
z3pPp2YcA&9nI9yU1Jlq|do+-hM$Nc&*k+LkR%p@kTwrb^wrTo>>|bIs$!g_gQasW|
z!hHw5WUE1`-KLvs1d!XJm-|$bgXceR0O+In)!Rwd?=ZFmq#dv+$}@D}cJ-v9isqGy
zO(YL$*U-apE?1aY@vx8ND#xE|F?EU=cBDCXM%}c5&*NCLU9@I+Wx5edf}}9P$UOcO
zY8Ou`6}6DSc7ou4A3>2;k&~I#9ZoH4MMx*MSlscohe7IUE2%B);Y537N!R90#|jte
zT--Xkvor(GmQA4=P}n4%*!KRkx~9I$QqEFYq5-mtobk~A0EIhrC)yKU>T^W9pd;+^
zGYK-gkG?a|S3i9#UBq4(*eq;AMJFv=x?EOz-rHOG%yX=sWK9YA0{2Jv_wCc(scRP2
z5Xn89ciw37_e13H%E!MVh}!ldcaexL<%LSh=oT@Uz!?7kCZ84KE31oR3hm3xc@Api
z*2O?)2&pau%OZ>~_*A-fmx*Ibn?Wip*>W4@Ap3T$8cTCNNnA*@%@SRU75@M-J`0e3
zZ&Ok)hb@)PBvWhw@?=EG59r6=*0e9Q3q2w+9j2!Y{&d8)ImSl|pVFUkt?4!~HNE3T
z>?2*MueWO-Z>3=7{>iG0R^<qyNaPXuh^|0c7mS7V_p2*yX>StCZWuc;-5G47ejT$?
zX!_ots7)z#i^vO$cVrv4X9RoH&ueo7nPJ-Lvnr){&(@*0)U=mDB(l3uuwAf4b|q(Y
z;RZTm^rptrys<?l$%45J60Zz9gZ_A`_ZH&L%(`6=S^iDLu`S(2XhWvl*xW+*HydPS
z3|kr7?0xE6DO^Yez2BKFu~kr{2+8??Jbsll>31c(AViBbrdk-~T<&B2?`oDf?e1W8
zVi3r`F5WkOJ*im2WM?Zej4Jb-vB$5qXL9UjY1&2Hm!4I{s7H~@NC@gra6K!ewXoG~
ztxOm2#9@EEAU`sS%(K^Lx4z$RYBq3MHc({GvF%an`sCIJ&LDv<Nm-6~9sQ|$(hU;S
z(UQ`}-a%(+akYG~%J0bxYcEjOKGe^0?zagEKRhGL<Z*`ftc^#-F+7P2N9UOr=bkw*
z6k@S&wQ1%?c&th@51h)w7!|cTE$(AF@k+?t9xGVw)ufe#%*P>LkEVSqKIg@XOFT{-
zXKMnv`ikc+KHGOIEV7;s<BkSTVN$_ja`T`hw;1i8>GiIqP6+08>OBiLz9y9wf|ezE
zFK{ZOYLn_MoZudS_xGp6X=UcG+AW#S1y_Cn$FHcV*Gz(P3=Dv`S3D2?u&Z3C$@5Eg
zM4Ecsg%UPMISrrZRwC0;a*DCUu0u4eGxf$h)!i1x%Kk|0XJ=6In8T+98`S%8TP@)I
zLeU;%ng`m$d!BN?PSq2sV`$QB!-5H-onwuB&C8I0a6cZ^bZN~BkF;7z76-_#+>&cf
z8zi_Tqk!9$06fxQjC9}%yDgop+HsQZJ>moMG-DaZ8@cURN~31+rjj{vZ6(4Bi&czC
z1jH+ofIaX!{xxkacSw=>D!d*405@JaBCkoOSm}3BO?f&^Z7KPd2Ef7owNiZEMDy5e
zEUZLX=)RfsspjS%Er)%c-X>V)nWXZFVpJT)r>1jFZEHzT)-7(T=%l-|ag6o#6-I3;
z{^jOty-k>f1T-gU2hjUf*nAH1!Y*}-U6GX=XD15h`=kznpSYH+o6YQq6UDRMOo1hh
zA&6)9Fn|;uH(+%q)}yt3Ms1SY-6?J5qG);%>+f9^kAwcmlFJ3ElYz0&4_?F4l<1<_
zT~@?GM1}T_3b%8|Ow{wop-P;R)WWs!#o>+{=iM=RSV-%@U#RRWTS~BxOY>ICOpZly
z^LfZ0emd>XO5gDHo>E(DWrdb?`Pg*DO|1<xPKZX+M#&#4P-9`oO3GDRb~RMeS2HxP
z4}GTB&J$Zi?n?+{>Z9xHS1t4gA1%tMW=;Yg2e_;>)--7^9`1P>O_&f2;4jzIR{e#{
zsQV!U%)mQazxWD?^Op`n<Q5iV%llwtjGd-XKJUN3(w=l%C|YN})lJJN0us3!eF3bS
z<=q=B6H4M|-Sas<TXiGYdR2J5K`eJtKon*u)wZ{MoEp!POw*n#LsEH|v9@Vf<&QbW
z3iItuY1klb%1HaHqX#rasN3B`=G#cF0Xv6MJ-zCx-div%(g5-N+&>ZzOi^Y&YnB4d
zW{S@;KJlC?{LDU;dqj#0*-T+XA%QY^hmwAkR$GgBjCU5OT2>ppw(HZSCC)9P6Gbj0
z2dL@+^{Lf?U&NN83z?^q>0*r`0F?)TJ^gC6mE2OyB({o1n{Gsrx5~@tN3C=a*<0Re
zZ57U?7WU`M*_VH6&$E3WK)HKs2^|EdbG*FZ_fhGZwJikJra6;QmN_FDWP&lv9F5D9
z&*M>>YpA73#L|Z+5rg+s<D-9#ZEE_oGsWdJZ3JVPO98pPxa(O{Y7@LJvT5aGafr@A
z-_KgsEwpDOu1+-=ED1>>k7)VUDUaSKtxu`zusnZa7D6vIfRBt|{{V$!Ja(7SvM&sW
z4-AJm?UCtAr!4l*AiY@%$sPofobDdOwlPDBWb+20s%ksj#zZddwoT|VsylJsvma3~
zOZ%fNppBuK@<Vs}RomSzI8-`J1OQ~n#E^YWW=IfD&unt#2bUt8hF@HIR<KCQZQNP!
z1=wpDLbOOS(Vx8e9W&Tgee}@FjI6IC512^#;B+5_UONIuAVST*7Yw77Pw!PdR@lMj
zLveDWVGS57_p{SAv{FpT>=vd+n9T#mnO&`w;~&<wPlqir_P165C~c7(XO40!J5DjI
zfifA1%BXI&uGbFmnDgb34&cL+?Nd?7Jp__yWsD4qy2elRmHE**&$r`_)ilyis88qK
zUZN=&kz~tlKBB65QePE}M=&L_uNlWr=~v;??b6@uw^)q3W=3vFUMn`rv0mQp8*(j;
zytfYQW8DDzqu1+Ei)&yS&TT+Mh<|;PmQZ_VwRD!yT3U}au3{Vk9(n`VpG?+G@UmFi
z=S@YC%NDziMeFKE<Jyv*r8x4dmF;Aj-U2lHILr)6lPU&f8R`kAf5JbhUZTk33dDlI
zWk;q(WZi0$UurD2*38KmP+*C<9)r_0tEFq2@{<H=h$Q>Ku5drbu1Ta!T5Pojm~CW7
zk<`wd#=mt~k3cD-`%SJI8MOG_b~EH4&1&0QeWC=OcST6t?^Yi+Po-XuSMbe~JPl~T
zq6|B*%Aa3)!=JIgB53Ed%Z-uCV|QdXNOG$(^NjlUr%M&Au+0_3Dxbu!j0HLS%l$=Y
zYkncOzLhQPCxuE4&o068oMRQ7_da8)IwGIp`hn4@rrxZUk}_{JS!G|e$8wT}AG~BI
z0Dd(#m!~_!<ieo~jy%Qf>r?8ITi?k9_BOH;ARcn5+Npup9+gIGyU_%X2@IZYJjNd@
z4?*o(sY$C5%9FX-TMHp?Db?>Il5&7e8m0q*(S55L?rV)oWr5sD8aEq%<(IeCx#ZS0
zYfFM<vt|szJkW9gJprxFH^lH-BS#IQ#$v-vMl#-pv-Wa}xuTq9pptlgSmb#wXKyf_
zq8t%{@9$Uiy(;NrOd{eug6ET;dabEyqI5GV$XF<2Dli*q)_T3A(Ri#`{z!rH#GJ_|
zeEJG@lNY)y^G_Ot+qOZt6=nOrj6cGv&2un6XObVCKx4E30reuPynosfPS2<S$hq>_
zh}-n_s`A~w&6g6U(x6BO-hckJRANk|ku}7TiJp1#cBbs^`9k{+=9bc9<w0(4Ry2{A
zx|GR5^{kmL<Y$glT<msPBmVOL0EIH@@5*hZN|?|x?)CTftvNI@b!=;E?QE@$GVB2w
zZgyUbYZ~+Il3g{+f*xfB#&}`dim7pY({BP%mRu@l1K)~vm#PPs9!^;ojmN0|wQ+|k
zGL=qdJwuqn%Hf!khx?&P_5M`J&;rqUi?<jhMl<xOT4*H(NBKcNDgl8|Ok|Q|j@~lz
z^-$b{RETI>3yTXm0Mr9G50F{0$E7;?n^BuGKb0PMD(4s-1u{DgN?1cjZH8vXF`OSm
zR!4_jUv28JXw!F;co{UCiqsO5DO_5(1Y7a~=Xm~94G&hC{K+ib5&(`pxiWwCtEIDD
z8o}WgGNS{6r)~l__fPoLTAz;96(hB>!+E5aL>ZH{PqdTS5820d$_e3Tg?#&{T?2i>
zcxCmg2Tsv#!lV+NxyuLSufM-FP<WeB)Mt`2r_98kkqUrRpKnT*FAeINy~^Aj@c=Nv
zP~e<?l`c>1GUAunM%J6H&1dCH3qdk@yB!MW<@c=wztdLUNZ`|2HD=u#hTtCgHH)Wc
z&!;!o(h(~XOE@`J9l<rTqNa;!7X41>fN}&*+;i9-)z3Q}P`=EWoh6V%Ym_^Ih!^T{
z*!t6xO}ey_Ib(EGe6jP-%&puIdV5uES4_5w+|6lt%oC?kjQUqOHU0ID=wUu~K@aCK
zW<l%CC_%_`nvUl~sA>?{UMZZ36yQ3mfTW*(fC|c+#V|&X1*}C%Nu9^$Du2SUC7Gp%
z%e^L1yFO5S1OEWlr8m%T%gUj_3Uh(@S3;#@o>iMJzln7V)RWAV24F#S8+i5=Nb2gY
zWK6i*z*Z-kWYNtxn1%<9fgpz%BC5=`wsDCQdokl`^d9E5QHhMDBGYTym71)`%usZV
z2h2Yjis!^vcd|(p#HXMGXYl=L_H!hX0p;v6FU!V59^=}ln@CwO>uUQXA$T0I{{RYh
zf_kA|ZD?jqrrqie(##kQqi9}~TWQx8^9d&avWzJ`N46`c(sa1VbR0B*ZaqULdSbV<
zeGb|u^Y65!AR#ckgl*5E^);O9sJj|N4&|#kT{88f4y6OA<6$@?^~P%LmY~_el&pcW
z6L0y=cUBsIhi-+YnSG{*N04A!fF*&t@6YjjgVa|&uXtYd?;lbZ7VbozT1NzX0)hNT
z>sUI9PgHb!Cl#X^3};qmYn$ZrcK+`vfd1Zsvt`rmwCQ}3TXQkWXF2w*S#<C0)JX2H
zBPhwaR16T_p!MddJi{T<LAW;=J!(@MjrS7P+88X_c(S3mXe2y=RWIN&N4%}Vl{rZv
zY!Q#<DtSXQW=Rj7&U=o3m1NvsU&yh<vX+W6MpO8?=B_%K$=J}b((N$1)y?S)%yw<g
z*5jiON@cdGr@=RucJcY`Aq$QadSaomgY8h6F77;-+Cj9l75pklZA0ZFv>QyhgsOtf
z^+ceK<n1jXjYxB!Q<GM-&01JsXl{&aBjgZIEIVSVDODljv;~XporuoU>5j&)jXvVa
zM2`B~8?aR*U9LU-swCBmjm!4BlqV5A%A%}zDUwgOJ&jUW;S;mS@~~zbM1=1D0QFU`
z?6}OSJa8$Ajv1nVo83>nRgtDkudzoYp@{v=a)G%1HJz^XG;g@*)^>_XVKFZyT(W)D
z&!@c>$#Fbq{v`u>1Qoy~uzIifRcpCzjDBN=Cjc;Jz{u^6^vheeo^-fi$QAf}@I9&W
z$d@RQ>Uta&`;{NdK$!|0@=sj))k}EBmv0v70=u($iVjy9IAO;ebsp53z3ll}W>qdE
zC7(D1cH`2Zdl_Yi?WXM+8-W=6!2bY+bwVx2Q=Uy<Lt0B4Nc7Qqlc0UXm=~*hAE&iu
z-$<^jEODef;!biK-yNxp*H(yyINAwP-Ffw_`DTu1c+(}2aHX-l`wvQSk8&J|?W9pC
zmI=whB}z9RjYz}oA28<wmh?3Rs<f)xFa|kATyx(Q5r*nZr3zdr<xfD>R@7H6uGn1^
zs3C~R&N!&pO6bDh7+1?4zksR4Fh+>U3%F+h2Yy+*<Iq&gr^MGQ6kxOO1pL?w{xqDD
zDJIH)Wo)yHr2`zH?meo-uAK_qiDb&nkKKm*fO_J!o5PPKiMU&vc9qUjCH^2kl~;LC
z#IeNS1maa3l_%HGR&JxVg?l@0Bz8>Mxc$@QVnqqS{3!*d;t_3~S;_MmTkfdnYUP!c
z?B$Xxas&LTz<uHVH8<F<THvg)e(PeZk@ER?_4?LMY}G+CI@eB)=H+0r%z{CQU5-c<
zr>Dg&yv9)i5{rc;0p2@~e?v~aFll~ShS<QX!ZUx%LVJ7FY4ul)TFNCvEC7=rAH;f8
zw&YS#iE~VkPm1+!Z)aIhlm3s46(8g8T}_4m0EaaFC4^+a@yKL%4syQ4_chGg-|c`;
z6`*D<w94u@0*iE>{4BPRNYO^bI3scs-#(SkH1}rkX>4>lo~$(sG}LU}cCjdtN6E<U
zYc|~6URz5Glq?jPk;X$VdV5nX^vS2V7FJtQUo(2{Y$#*yJDRg8W?8J-5xs}+B`d*h
z;<3H9F4x?>rT9+jSRlPRcnQfzMEQXC^sP7W)K=O&fZVJSOvDA7=3sxNSn!X<DJ^tU
z;aj^Xl0&(7yhCtbbLmpuEzYH8*V4_qXA!rT_lLKssB&!5F;+R7yK9BK1Y1cYByEyK
z=?({0`qp)Y_Lh#3E!OCukh8#KIc{)3^sPNkYm~Yx3`RM2WQRH9(2C2q)1+jU{^rm@
zb{i0{1zdF}>Fru1x|zu|&5yK;f?m?w%SBKTROfmB02-xpsN8AKCESp@I9<+IWl8#W
zsWi)fIwWhyDpkoZoO94(t$A=medS(UDFHyiT<-Sz(5x0D(tJs0c^g_oZJmQ8k_jaB
z<FKhhCCNLZ4I2aI2si`V+L?0(k%;2c^z<_`Vi|YzC$4Ixz`J?Y+wCZ>oJx?46d&HA
z$a@n@sskixY|N3M{prUmS+^;Dt6Z1Vnl=nUQiEt9bf%3;<4l>OYnTP0Y%@wS!_<#b
zYL>0yTSsOwg;)@LjLm}IL0Uqbp2*GAjCVG7Sy;Qzb7bRWW66-eMecFm*qYBiC%U$I
zjmn@udfr8D3i>zr*EN6QiM1d+yfY&0SLu}OzUHcvd8n2xA<X0|FF=O6p@vO+#xlfq
zI-B1WoB6}6-cv{d?`8l4*o=0pyNzD%Nk@@v!(xEwr-%3Y6U}4&w!+oq{?RO^2==UF
z_|Hx%JKb_<Nhs*jI)GJ2-5#G>(P7}7(Tl9@sWtR1JGI2ciUGBkb_$xVXN_Tw7O+(j
zk_HF_ilsKJO}Ugp!~=o}{VIEH688LwC0PV>Fht<<pW*t}wozJ`-O1S&^zA~@Io2DO
z1Ptxmcn90x6=wec!}7GNab%3CusAD{%6ptvjfca@&>MTJSM#vGRH}33=ljFC#ct@H
z1%??UfZn?#E9OZ!Vp}=n0qIyyv=h;rMvU6k9JQZ@bvdp+%q~%*372O>h6k{&mrwA3
ziD9$1g?`Sl51o@IJ;AMCvgq1;TU0cX5uM8T5s&evMdMv7O<AmgF6J%yBbdNFNUUc$
zOJizrgh@2b8WSms6dU4vHU~rR?MpY=e93hn#SOPE6#S$P<W*=qMl}oJbEiwPR)8~=
zP9{#r@TSFMdv|Va#2XFP<p3OpY?Gg*b4fJyI#a%gwSB3+t7=2SA&Nvlxhex6az}cK
z*G+KoTFM<`9ElORLt0X4ZKvMZSl?Vk<dD~Lupwg`cmQ`Nr?)kF#z`-3rdyj-W{3ty
zjX+(8rhRJ}*5z6k8du!Uw9)`ce7lBIAOz<*G)<;7SCGbH9$PjJ)%&L%b6ZGlg}W$5
zc~FwOTLT@b89dJ~V&%clPC2YSteLuuS3&kuEt)X34B2nqF+Ad<)+Mr8oV!I12Jb6z
z&JU-(I@aFiONLVx_|Sngk+<E?^QT_vk=|S+d*dv>aR}s(T9)q0&|NL8<A?V#GUZ5-
zWXBowtsOu6BHmE?jB&<_M%OFGf7+}&Yk2g~(Ik?(uPwc@ah{p)PMYgepK~p$$boPf
zM{h&)sd45R)?Mp50@w$*vUr^{z2Z=!QP=_76^ng6l#q#6OJzd&+rOyw6-FCtv2s^Y
zyWQp>J6rC?G27hKk8~0^9bs}+_N-%&zwLfCoM529&57C>UjEWhGW%LNL1rBK9tCVc
zacwQU*pXW06orjWN7N5mMYK0e)5jk5JiLj>9<=6r9X8Jv3b}cADbHV8sXk%sF{48v
zcoI#)K5U%*Y7wSesE+8O5hLY79;3O>YN-0U&v9`ZNYRzX<YSHC_WD&hvnW{Y<TmII
zalG^EO;eDri~5^eNpL1<GF7mJfxsV1j_Xmgv9t3amvo`>AYK9W`VV@gu1O7*ubZb_
ziS_`@!0^Y@p4H7s;)RvoDV{aS$Z*~L51{w1s(5KsF`Zb!>UIgJpqWzI@;@wm#z`_r
z<E3X^YGU!co7>XrGSVbNXkqJIh5rDH?DXhkYboNBGBA@2NzdcZRyCiC^^Ikwx3jiM
zAc?mr+k?2DUiH~aFKgasH1Tm-9o^=&V+r$a=kg3)75Ye|dwW$mb;~<qkXy#5dlFlW
zdjalipR>}uL#RnJPcvKGn7&Z!oO=Q5TDoqZWaVPB+-6*;ihSfgK5Eg^g)(C~&!J`u
znS9}Ju>SF%3Z=PFKd7w(1(m7uTorPEdhW!MeE{uMPR4-*T3V?Ge3KT*80piRwQVao
zH&Ou2D&dI$<IwvG#$HCKntMx2<zZt#oHz^=V4(WYJU^yMYT^eeA>d)jAdge&OJ$+T
z_g`zYhGNVx#J|h$SLU>m(-!F)IT>UlqnvZiV<|PUY9=<JVJvd1M8;M{89|?&vDj7p
z5*x{&TZ`l6!26ZXcCwM!)rV%c-6SA1#YdEzdEMz%?z}&$-G8Ptm>~f9fsfzy<Jy(m
z3s}X}d_gvt%55PRQL~km3U1sz{RLIK)_g~Q6AQRSyeykwF^npE`{ufRGe)$sx+cw3
zDZw0W1JsQ7t5MHw3~el$DvhUuE)L$^DwM6Ih05Pk8^ciQ@uE$Aa<2K@vTZoP-~sPl
z4W0T7z0_N>NZQYV{{YskJ#WO3!@fk8H4Jg(0rP!uItszO@wT}ni*2T9NpKu(ky<<v
z{?I>%PkKF*s5LbMxw^QU$`ahT`OXKI!5)Cr9wG5InWO2OCPW|%vvHMdbrrzgYMw6C
z<yj_~Y}rmWAjw?ulUkPWM8I2LPLAn}ZUpZ48S6*Y;~m87H?g0oc+XhZF0*2cR4|bM
zeY^3-2(7OK=-S%fjdM~`o?t50!>&6J+2gHD+J2W~0J}y3U;T39ImdPM`c<Uy0^6_)
zADfi{LhuoN^VYR;_iY7YBk^8Lp5n~}!^^a|jYPjVc|L4XwxMqn5<vFDauOYnU7t@{
zqdv1PrHgBL9nn~nkhk0i)c5+)KBpjnstx&0UjrhcQ+Cw1F2gN6NqcWOwTT`e%2qQX
z=geOG`qNn&`oc$u$GB%<Q;ok<-m6?)AP)_>GF=F>Y=QV}_XD@qvtl1=opjfq$!Bg<
z6P7)|1L;~Qq-5mDyqjxAR%CLLG5HDT-OV~Z&1ECoIxJabD$DZ*?nNf1U~eLALT0y9
zDO6YBwgxwG+Lq$(-cT*(3mK4kaPD9-eQ{NCHXV0o9B{<VEBVn6GC73Do;b+#9+e~-
z?3WrzxM?AH)!C33apoR}1HZAS!FO$_Hp%Xz7ZHHFWBw!@3XTYEE+cGRZ!t_=qE*3F
z=|#hIXH9o9?4HWvFc20+kwbZe`i}Um3u3mGVj?Z&kw1AG!Z4~&B^Y+7E_B;pG4Ev4
zWLVh>#HlaMzt<HT2xKEomfLPd)<tc(&wTpTUh2e_f3-fvc!J*MI7nj483PzSs~&rq
z?xDGwEjgM<^X4-@+&S(36?WH1x3*zts5=0qh-N2oB=ygrt<5`4(k&VrV`LsR8<DtQ
zF^?qk+w097(L%FlBXw`B-T87usj8=zI82e#zp1IAvE3waTDt*ocHGN$bF_}b@vf2`
zDr<*WB(g<zl#;M08P806bgNI{>xiWY*2p%fU?g0spI>S{tZX$+vkObpAzPm^<dU)d
z)f^1_)}^MWsoPpfYiDa2MnAg@ISrqBwe|rBSns8eW2t7C4Y&u=q&L=f@+HsN%%xY$
zwq*c^KBRwI&Q&gr6l_&XKQiTG)U2X-_YJ5%P#@g>wM}KY*X}2>vGUcDLY`zxm0Wet
z_|}|SJ(Tdr1>U4%h{{Pk<xhP2)~1!G*yu2MIy^BrM=}|9@IgJrOP+-&wqr}-i}tmS
zR%0{tbWEuO*Z%;mSM+}jT4_QxToSFhNMcEE_On_r%LU7suAHvoTPS!3J%u!C2LRnb
zBEL<I?xINKkT(e+#z&|B0A90mlQd9Eb3;ys%S=DNc!SDwC(FU_f-26Vb7=$;-ZYLJ
z58e<u4#(QL`~Lulx*RrX9884UzHS((&pn5(D~a(R#H*X-n%he*uPf}1H|Zk!{V0tI
z)L}ZXf;#KJ5L;X3VW=ZQZ~zQR411rgb9%qT-Adb5Fxw&!RZ>G7V`_oUNBGo<do{+0
zmY=zv<}dY#v28MO`U<6|cz;hjnPhi?n7E0^E{snqPC3PG3RL5MZA>Lra@eV>>srr^
zF2%*`xsAv{80bL$E-L<!@W5+YM7p)yffa6X5g8Z*1CT#TeV(2B-P^V{a#$}4zvEi*
z={L9VohfeGAtL8#Vlq2t9Zg%PqOBbXj4tmjNbS5U4wn&!Pq~K*rDn=!U_E~tk|TK)
z(2q(|cPQI10C{-s4{E=lXwq3ENqXhH$r)xO;{bFg)|sqFZ7j(0PDqTL7)~?j54B?E
z<jvGlLR$EL#Cp7{_j9yShs=yd6}?V>onN=I@TQmMS=?NL$E3%AO<-Q@TC$@>6t3uS
zJe1&|{_#EQ4^q_5qS4q#a?ORvJn%<SPiktDsnk-RA?Q~gCebaeQrxU2IF9G&jM?|^
zT!)B!apcTRxW%-`Yj+{}<PO89*YK(u4}-3}PS(w=-m}}Z#9O#OGBD$xQT;2V()<@D
zj~Yb&UPSMi+B~C=$F(k66ke}VZ&sr6In59L5)D&Sg5upntS$^u$eAsk3Ff+sYbX=X
zTX;5h@@@uj-N(?Lm3j+#-A~z+E*B^FcrEF-{3<Kmddo<J-rO!^L_aKm3}dcyQBrcK
z{nFtG!D>=VXIqE6yJbS)3xs&~h5+CWI#zVP1l0UZsIqCd2rZHD5;Ksk>6+T`rn_x%
zA-%juymuwyg>a)Cl#&kviqex_)1xxl!#ry<jnSA_0KZZQ9XQW5nw4nFL|-j7w<&1;
z6}Hgy;b$GY0*uGzA2xfEeJV?<*=-?vQxf@sK}JJ`+I!}+b#I6=9W7zAluJ8KRboZX
zNb6a*a$jE-c!ONYC>TheYPk0F0*_}oJIozO$3$z|-do-3VecA47?1Y@KQljZk7}Cc
z`^&mZc`T$1W8BWX1s$8~R5bNlR2P#<v9x)?JyX`MPvXB1`O(~5+{Eh|j3{h*j0a46
z`gg3QPFJ)_Q&ziVmNwB$zE#+FQl*M+z}x=OtGcbmkzuDpJc`VSIv&5DrEq>L_>(rS
zC9<)!5r$9_G5}t@gNlK!we3$y5?@~!?e-YN3NQ)p&2J1O?RjWo>#d?_YF`)RjLTvo
zSm!OWIU^%#sqc>bRwkpW_^-wnCh@$*ZzWS@xhkv|k1#HH%|64z`c?5;yO<tWPs;&_
z^3o6CKGo2l4&3S1qS@@iJN(W;$=m(WU1`vx@GVSlQlr$&PYqbaAZxkgYjni3M{>lm
zIK~Ip{5n?L15B_%CZDFHYr7^T!9TB0TBUhB*3!i-<;-4h-GT;Q54YDH`%@#;Ah`29
zt?@FP7$xAhJdy2C+~?G^k~gicY^5S4RYg`TUNOn`Ja8$R=ZG{*Ib(_mM0t<>Z$PKi
zamlO(mV5YK-%gOk;OBdiRe|)!T6NEXbvx}iO(bPSxn_;!$XAezaovCV^pc8qY^%ww
z3z}v8S4=N1z<CN3k>EcpiJme&`qgRlpP41HwJ|bDnB-^N#D8^<rEA&f5b3RI`f(5#
zmzdaRdB-{R=B-1dJlFf<fNYXK-VE>v?mo0Sv5U}rl92xZ3TYM^Wux6{f9Wz3TgriO
zGI|5<D^paO28FEc^u~fS7%}GrgZ(QzM~hL?4#-fjIl-B8#%prjt>%I~S}9p(M)~2H
zKh^=<4@%^m+o^k-Mk?Bzz0QjJrIS##*sP(4mQLV3&0Di%({lC~35ioBq!}6Y`c>&|
z4a}zLSTCN$84ukU?NG~YWMl}a+oT^mH!4T4?OOXqB6%8PwArp_MuJ#X<pXlaM+yh8
z)}IEEdhPw8HO;&dl`U@*@D@*cu@L^xja5KmMiw#C@%E|P!g`LSZ2FpBz=jq-AyP}B
z9YFT{>py6s%Tc;3XqM5-Bn*ZdoQz2-9s%x7dWv0A)ss|;Ek5K-;1UEWl{|BS+ZA%l
zN7L<Kj_{dQ<zn*CBVr^O`^0x+@6w&8UTNBLm{!QVu5cfA1ZTZ3Xxk1{k;vY7I_l}x
zT|#-b%J`FRNnG+jD%H~bCl->vRI;j^fLwwBAJVU;t!*^qX_AE}<u@7J0Xe4K-@dVC
zEu?%cqv4-!10PY|v~_0Hn3N)(hJL4X$nR@n?Bh9ydE*rvcFxMbXnnHav{Dwx&vTDj
z)0WmdbTbgwN*5&{Uzi_E(no6<^2NIsNmqC!Kh=}e8cL#K<QZdc1-iAx_R|;}nQ?%}
z+<!{8B@7il(H7kC5-vIPKGhGD<%ZS_7w_@N9=}STOK4&9rMqQmQFCpBg)5#({{R}9
zU6&PM{zNwq6B{G;Ie`rzmjzjW`t>iJ5F#NEm@GiX`N2Q_uX=1U3!o&4Hijn(IXJ0I
z5sPy7I8_`zTOUf#n7&q3aT>}cb|OMBKm_1>(~Df&`D_p|kPuZ<ASe|Xxk*)_SqVia
zcpXpU=}T}V5Hu0URwrG~?7wtlr57ZM=g&oW<(*a{H)R*@=cqo1-jU#%(VP7Vz`!vv
zfA#!xk4#jC_B&!(;8ouq6=iND9)s4ZE!CyftB@ulHzrRl`Hb}ZK9sd&wpdAG1gBB6
z8+YWB=xV$zX>lCMDe|Pwz^eHJo`c?)wsOyMizK2ue1gLm&%SE%SZS8B`KcCP%PPb-
z-5#Ug-iKs^R!?i;==UQfgQ*7sG;D18_9yvOkF-Y)R$D-`#5VazMtJDeoVOD!UQv!g
z0+4demT~G&VN9P=5RI=QhGrWV9e$psrN&YzJ8Wss95%4Ws(JA=sn$7j^Lu&&?^&0o
zI0KYM%Y4dNiBQ!VYH%guJ=00$x5)PS&PT3ldxn6>;TZWUKu`}=?rHKg7r7kwO3{6$
z;njb>*~UdZB7vFS>Ew{QhKpz2!0C#a;?Z8(NUW{h!5LpQ`*%31@#+@Oa`3#$E<Byb
zCjn4#fIWVlD!t|djF)(Gb#EkPz|Wt?<?L6|k)+(BV}?LB2!oNIQcrKKN}6Tm-J5Dw
zR_x3^RuUcSuyy0t`BfLWOIa~{8IgemMHkC~?^;F?71)zU2!=SUM%ImwnEUrD1KZlK
zY0$}X%Q8aXJ76-$_p!kus*5XYS&n4#mSMc_B#aTzd(`o35$s>F-$fxt+BWsax4l%N
z`UyVfoYy~Qf3wMQ;aiB*j1@TOYPH4ugEK?qgO9pLLs{24%UoU<%yTSkIGMuyr~1`M
zmf_|wO5jS^XpzDBx$HgZMw_;v<Xo0}d&s9%xZO71V^VncK7ygQ3uQmqWV{Tn2F6U_
z=bUrtMZJSOjPrt<*K6-PK{@HgOu9o(5=OaAs4xOAL)hl6r4oJSPYt6KL6D+EWp@Pb
zQP=aS^lbwD&Lfo&svJimWmspwy*?`@Qm$2w0Nz00`&Ra!K8bCoJ>9}P-0mVc)=n3v
z1XeShhLMH;00_pRVyctbt;$Fn&Jhd+2cW2-vxLOZy~87+Ik#-*KHh?^_@BfNGNM{I
zUoiZy8*q5&K9z%YsbA`M3p|bFvz?w`UZf6(>rOG0w+AGPnwGz7X^4Zz4ip0Cg5Tn5
zq<5FPyo~m2tacdQ6gdOb<FWUvdM|}-E&@rv&vcV5EZ;WCJqPrz+RI1LG<yaD)jZY#
zu6&?5Zo@r?d{%WQN|uRTmk7#QoR*!Y2yM}C5hYc8i*^_&dS`WXmXgBh6^kQA6z9*B
z=K%Zn$E{>v>bGlqCG@utEK>s$Mq?X-kMq{4N3OzTC2rI+#yqHr?hisc4|<meHfX9w
z8Xb0>9gNri0NB==np|F75^#XvbH^sAYnrt7hD{P17V~3sy~2R99{&JJ;qHDTO9bfF
ztcx7ZM31-ziMk)9O>glZPu4W~Vj8S3<r0cn@OO9j=M{0m)ZLQtl-`SS<?g?GJm%9)
zw+R$O=Z<5R+<MnDtm>Mz)w{d_5;Ty5`>e9JPsX>$#H7?T_;l8>vN1-@n}H549fuot
ze|N8Le+uXBwM|0kq{@OfS0e^7uxGwI*L5mt9S$0`9Qu@PpwzFWNv?~Gz7aNp3GNTq
z*0$_?G{W9!=V1v{^8!2k>Gl5rW}}YIDcoJOfn-Jpa{Ra;V4Mz>qiF(MyGU~6#u1bp
zGp$tQ`V$Bzxmq0+eC3ibBrLdQN5OdepP>Bfa?0K-c%!?GL`aN6qqgA6JD*&db*`S4
z@vLiTVsugzNZB|&jX5Fm!@&$8N0XH}$lc!=>C(C8+d3fy60O`%cQe8>8wCu~IQd3;
z4m;4Aa=0awWk<|&{&=k?(OXuwWfHQs!R9`G@3mSwWHCzjK1-1VE4p3W55V=TxsuS)
zK+CkXiI_TEM;VXi*rS&GeLl5%&p?x1u#nnJiz7%>!JJ`#ym8w<)~?#ySZZ^}HT=<A
zzm@W`kG!6^9qKf<5VWS+<wh49fa7j@)^d~RT8RVLy1;+5rH!UQQy`E?906I^pdj)t
zjL~i!9-BP{YR&fRxmrYlT>%QLql4J~HCF2KRh1x-1d<ST86y}9I{i&mIcumjp_etZ
z$^QTo1e~lJLcDo7kdFTVO1Etjn`gF~McF7J-@5zel`V`@2DY~o9C6NYJF5d)8ZhwY
zp=eFT*=U+lvw3;>K<oHb%55!$80sWiBgq_c+sGqse3v6|$Q&GcR)ktznDT$oys535
zbgdZ!&Lm?P@6RHO?L$wAB)QY(6Uzt*ZX=TkfzzJmp}aP_g@ar}t9h3QLv38H$Mhq(
z70r6G+|%7lLwiWM(seyCJh<B4@fm;)a5j#B_N<A#Lt{PA8k<KB<qTvi@;_ikD;n|b
z8fm4SWx3fJvn(!CcRrq(sBUlO)J&h+H_=?S;kDz4BB1P`0oYctqVIRHE`0^puQbV^
zSu7C8bqlwg9Q0nqd(}^}UERu&h^7-x-?)tw<%k(A$3gE*x|MYMS9@D|3ae%*8wFVR
z0GgiH#q-`sE*8vLu*Tehlh~1uy1&l5BTcC2bINM^l`a-}+D7{`ks1jyKmj`(d(}vF
ziyK8>u*VBdN11eYa*Lk7S~Z<oZBpc1Sq3c>rai@W<&SI*)sJkC_IV3wp=M@a&c{Au
zXP!G^x*<;J=aox64N3fFEn{maFJt@Je>3J{8<EfO`&A3emk~z{Ga?ppL~^G*jP74b
zsWdUiD?t>o%*dILZTo=#0C;!BX5H&Hc7-6jl-)5P$#Bns0-lT)(~M%bjU=`)l<&D>
z#zwliRI!q23r&ds0E_0&=)J2(T{2j$m-|pdm3ClMWM{a?Z>>@LG@7r6=hXZ?s3bS6
z`vk}`i-JC2zT?-7pK7=ExUM9g3kdwESr>FNjN)u^GuNKHb*pPpCT8kLV7Ys@oq@``
z%t_%#Kt7(8PG2r-S*>A3c%^;ng^p!zydT#c>tj~%-k+(wO>rq40&^h&eNG2juGZE}
zf_Y?Iq@*7$itq*l0ot@pbtSD#d$hULQK468Wj}m6{{Rj@yWEZ{#+9cHE6bK3_W&}p
zT}a=3hH$Un1GQ|#wo*WnM2j5IfCSQ=#m7PQH6hbu@}xR!$teSDkGF+lc|xbYY4a|k
z<um5KYfJUCn#LAW7<l9$26-DfDtiIb9csnCqWYJcWu#xElScyXG7?otKXt#Mq|-bV
z{h==RWO;)fidgk08%MorTljX~)P1G`sc#DGy)7Ba<M>Z=&q__f4Mmu@P~XI}T<ThL
zM+~u*xK==}zJwo7YT2+rE+0=@$c4$bP^I!tdkl8ty-#lrmwRMddAG$XvMhHT`O)VD
zA8L2lmc~_*(&8yzEvppgoGAOMN#v2!H7<7!MwuR<mv*<#hS-=D6^RS;NPFY`k?UF(
z@<8o1wEC9E^205f6Sxk<j`cR4{ujRj(^PB8r4o6Q%M80rKHpE%6?!c;8D)}tM@Ntx
z34-DF4uJY#RuwBnXm1Kqdle?K1|^SBk;XoClpa)iA6kB!Z7!KScWXD7b1UWz-!iBi
z<n}(btL0c($YQvOo8<l255ut?K9x#4Y1;S6^I=G1QRXuYh{@_RT;A2oLw{$=E#1Si
zdAG-6-Am<1a2IOG{c*?L9)!{Tk9D>iY14F(NK9;vv|)!reLX0jOIzDvExpq1Gh`^s
z89?KwVOvl{@>$IH*Puyn9_58l<d5zTQfoIYOHsb&b>uf!*D>k3cAgexKoAUVCm8$Q
zrnEGxDDU7)OUqFywwn^Fwi-4)MtwzSJ&lxGZl2YlMu{el$(ZEHfyh0Fu;Qsn;x*H+
zg@jsq+q{!`q#}$A^=A6_G@O}gDH_^^j*%Km2A?T#r<-XBJCu$|KVH?r_@3rlIOh8f
zi#*LDY>A<e1zaDz+3j5tYN>T_E-dcUTZY7i!O8l5H9~lN`3!dv<>hP%k#LARf;}o!
ztn~>i>}2T47OAOPPphnm<(4A<0CWNC$3a`~q*z*B{{Us^<>ZFmZPxfZhEGy+*0XLc
zW{i0j+MH1{KGl@Rk~7o*d-_(Kn$lQ;Y-Ccl>K0}S4h}kJ*FCAZi6T8t&gwOq_g-a!
z1(+<i5vC5qfD>T*>`52{nu6&Cvrl2C+$_<|1};^&iHBd8v8J75=`*eU>}uA?cX>qR
zgLf^S#;jO>#KQ79?jwpcyK$RxFv>Ic^XXF9EeaPcHk%WciD!}Uir{eF^Z8VETHWRC
zw&a7%+U$lIj!6TKr=?uD6GN#Wu-f7aftdyms3V%k)ZvWW&8SBU0AI@yq1&HU$G@#K
z(-f~0xAUd@J0XeuxWQl%M&>>8eFY`pYi0XHCRSO{BFYpHp5x!QwMP)cu`$Z6oP6?N
zfBLA}5qCkpH92zf9QlO*0CaX0`c5utbsI<Kbdyn6DqO{BW;TmC_in_BWzQJl$K%vf
zWq?A=qEy|%1qnMz91;y&oZdV}3rkZoGGzRNkZLcKx)&?vfCFK1k=rA^aJG$7Aai#l
z-fTpYz+eQzmLJ4BeQKnlK-(jOV-KAM00q0BVODQrkqJoeQPqBCMM81MAbOKgNdZ**
zJk}F@%fBvu@$^1`R!&8tw37nmge<$q&75Q0ibHWLNFk0~IpjXy<?l?pb~zG<KOyLx
z=g?GW^TfdU%2R0D9^9PwAkuOzA<uq?bQaQiVn3PH#(6zXJDSP7l6FBf%Mp;d$CkTx
zfzv+qa_!x%lgx|~k~YwsA7I|KLi$k#^=Xh{HxNhiG_G1k9;=re+q$8b2WpMX-iOdu
z7OK*T8fj-#bzRaIj|>1D3<~HqT&oD;cOGHM!OMe=x%RGmRGv6)Ji#g!WCX|<F;7kp
ze`=Xp=S&W6`QeQgc<ul$#2gX=cjwTW&bVX|IfmL;l;ohDgM8h{tqpWfA}e0S=FY>2
z;!S~+4&t-#?xdRLIF$mhh;0Q1F^+icS}hT_rE9R0lEq#>-GKQVl>@LHd8w`4M1E9}
zx6Cj`?m+Z46micr!rUxjn}mUvs2%?R8d#(d7miq4csmL)7$-b^K9ueTv}h-EOK7G*
z&KSWfe87R!9>TV*;86g!Q=d4ng5e3oZQno8*E?ccV?D&mWOl=}goVeT1Ep?hiqRuZ
zBY9R3UBqW4qx2s1rt}?+y*^c*-1!#rw#7baEHes&jsEog9WG-JBqm$eM=WHB;Ysu!
zf}5gP$uX4a@k(NzFlIA#RqM2$LFrc`jU={cVwcO2fdUB085#TBcC1V!TS&aA*{v-S
z+@vBzYmDP3uL7Krvxu%>Wo$@BLCUwP`gQM7l#YE)Xl)CajfyInWy=XU8TJ%{TP;q?
zC63-`OisdBOW|FI2dAznq(zBYR3_V!HnWvB_{0AIz`d$D43=)UCN`E=lWdP0;x$pz
zgVLV!O&^&Q5j3*w8HI7UuWV<nJ{yQ(x_fEtCL>~*V{!rK-?bYIrm=mV;pMTpOy?_(
zcKYJ0v_O)u+e?B0LFRH>JfEdnnjNYljT__z)d${Vo)<L%nnjS!cWBn@xBXfB?B1gt
zDv%6Wq=I8}8V{F-iQ~_i&mo8PsBPkfuH}L@kVF|>T2{*|9-w2jO>7|nQW8g;*pZ3c
z!v}#&nOw^wz`*Uxo&i+{pdHOslNutP-ul*7TeaRDK1M~rQRsb6DX~oqO3~ZMj>Q0P
zH0M8`Pil_l8E2L^iJCar4DW2ojC1v={G>7oH0yCHvV}$*j+Cs5O^GTLLwzY9yJ7PM
z`-2^EOq$D5p5;|a%po~NVYkoYrh0)=%CScrj3qI@lk+s419lkt_NLw<Trb&BNfgp;
z%Wvhl1mhhAB9pNj!zIFq?37xF)67FUW!g{fF$V)4z3H~rGu$NCS5U_!_Yv%l*JjkV
zQTLnuqQ{;H0Cu7$StXL`Wm1R$*rfcxagVKAvVkuqiWzPSG>$_^`2kng1E-}c6q!vd
zBesS+DQ)JG1q@#6%)xQ}&u}U^)@ziI&2EXlGN~G<TrX~&=-gzL(#K&6%&M$O+k?sc
zY2kj=Y+BgiPD4shrvwj9Xc=8v*4h;&<avu3ZzXe;UYX4oS2mXx?;Fb*RETX;)UoN4
zPMs|$np0`KF;V6M*(31us`4cBq?xzf=EJe3z}tiTkEI)wiPdC^83phK;D>fuI;rjN
zQQJcI2$M}{rZ#dy%rY1b-%7G4npL*3TS*AOjTwLhaoqO<6pw7Sk_3tO1!6~_C#k{c
zDtU)tXPn(!Ex~q{HXuq8FcvUB$f}X~!a17q4anf46$1mFGg3X>#lb6gX*3G!wnZ2U
z%h|>~eJK*&Hi@J1ozaj9PX1VWieoCtXC!xCY?66RDuigdEQ{1+4!+c*h7l~GWSis%
zI2axAR=l;2eeN>S5gck;B}fOk?}~}1aSI!0x4MIgR1SIcK9qp3G}h8fJ<3hF3`-df
zaIQyj=}{JmSVrp4v~EqWjh>+T)8%A#@={pxIVw*)(-sL|b*rn$ACfVQj^jOXRb~P-
zv#e;3=EVe#RU{b5^&s{&62%jjw`f{17~Kmq<Ug_Rp85X(A$NfUv&R`FK>!}uJ%v6w
zTS}30I?iqanAmkfdB;AKYy=Dh&Sqd(xY*p|AbR>#62TfQk~24y_)r5MmA$It2fC5=
zTf4JiLdG%3KAp{1SmcG|yjw|QZJSk`=L`>AcBU~}MP_Mch#5FW3&IXK+&dgpd*Ve%
zoRCa}ESVsWp{Fs0CUr;s;Xq$4_kiv1%^(b7WowWL1U6UhgWOSj2T&?4)T+fA6D}CB
z$R?NU@<i$+{uSJ<f~%Z$0+}D~RJ$ost>v_genw8m>rS@00GORg^4OCjjD;SCn9%uK
z%0`edMG>4aT;cngYed)#z$oJ(hYo)V9ISiPmddX0C>}umwGM8T(UuL$`C=8ik6&R^
za33QQ(!1?Ga_#vz>FH9JF~EXIvZ_f?q;u=L)~nmJak9w-n*ccq+~xDsRKPrQ?N^Af
zATl!HN4M1aQ%wwI)xo*GMS<gv+C&@neeKx(RM)dawlgf-=8zRg!=1{*xzB2fIaFNv
z8-IH=m{eiT?@yqlp5{GDS#Kbhe$)|}6ksb3yis*vBNDvovphyH<bX)qwTE6QBV`vO
z%TF>#IFR-uwOoxQme@SdDlWzn?gK0CKE9OI4<_5Wl~xOIxQ;c!bMAZ6dyJyos93;|
ziAu-=bRLxpgA+HCFW+n+Cp%BAU%IxnkQuDjG?AYsF#iB3V^x|QN(@mJ8}_ybL)`r;
zKuBPgD}giwvoRQOJJQQ*J)x2%k-W(lGaPjP01B2XU9B93-~~xAqX*|>@8~LM;D{2J
z4D1Kqz{Y<c=|$``n;?w}$ULG0x`3?1An{X2Z2&E5tsr2zea*vX)6i9eV$nRWBxWNN
zVdV|T+InLh{i*D#mf}QU%E$5g(sFHRTw~m*Y+0?}P!|d@@)pU%<F-GoNnxf>eKN{a
zFf20NJg_}!*04gedE!Fbq#M!la6X;sE~kYjk*(s9qYajI>GcAp?4=YWax^k*Xor^0
zL6OrSFZj~x7jfIa+F<hG!2p(Af&l8i{?yj{Wy1q&14|~|vBHD5ueqtevF_xL_llun
z$CMd(S0kFMp{TZ2c86e!8OytpzyN+h?@fj`+vUUnJBeeCr_fdP)2+qZ!oo{-D7)H5
z<<2@|(xebKl#nv3Y$V4dYqaG0{{W2~$Z8DEi%nOaIsC~tCQ2@Naqn7okj?VNYbv8V
z5J+A){{ZXMP{Fter-k8GVlrPC8T-Q&`$SuWh(_LQam>Quq69D=p!PrGNy_EMHZ3K&
zV9VvP<L6SnJ@MM5a<3vxz(<3(Y@_dBf1YX^S*$M=l_R*$(y;#XX*`kh9^$1%jp2gb
z<uaCX#Ah51$J^ed)Mmwd#Iq0uXJPxv7lrhwirvJXUE8dZD;>ob0Q1253cDDdSqGG2
zY4?qhO1W8ArqP3u$9~mW;}IZhYk5*QpKOaiJC1oDOx2-SWwVG6od_Yfe(lNmbLo#t
zo_%WWD+aQEFr&y!zE=yA=qfnu;ettKl?=Ov;1*nLKEwJ|vuaUeGh4h7u{$p1#sgzL
zX-hy?88OVQ8z&|(3X_63?^UI?Sm7UN{{U9xnA9;0tU8faT_n6o?-tS3Q4~nd-B+ep
z9Zf<bQ6y~=F@664JIwh|o}!D4e6g*yzn3I{dH4bG_eZ0DjVQWHNF$Zt%z@cZ=ZO>#
z<yDesB6LEMO43SDvNr^F7&JJZHIVso5*INIzv_;9`{t5kPQ`<FZE~^Q2-QepyF*|)
z<G3BE7IAd}M$4%u62^LV#%i?oZe>(vRzjhOL4wWH<W-f2c>6rAB8pWGs)ueIbz%M9
zl=*`9Vx!!=a(Q;eqm6!YK_y7{_4cZgz+kw9%XJco4r2&N+Ii0J@ux_-cq=8v!>dNS
zqKrsJ^PB*2)}sYP#foPm<~^vmTyr(NR-*E2g;@8ICL5n`uUcV^ywHJz^M|)z`DhPH
zmMf*VjoJ?^2Lur69Irh`r6gAoM<_7Kws^S`l?6#7h9BYTD7c16Y-7ZbO&TF!0F)ib
zeX1B#<IIK>OK|vM@89*SQ^joZMzaSAfYOz0G4~#yN~-Z`zh;<4avCwfUBo|LxTnlA
zOx)}*_9+@Tfn<I@eDxf56hQ54@lECiiU!`~edhlFW}-Ky+{rvnW|79!Md%3ck4mb#
zgqCtO{nCfq$XsKZE=y?}SND27^}9ZwF_Ia9dDb2tBmL3rJt~~~!fjZR<$7^}fHPPN
zdv|i-QV@tvUOu0ZrGnP(d3QWa!*&!7cKv9JNS8Oz*FGW>K=xx1M<VQSK;CicY6-4x
zwF|?2_N;7)Rhf?gM@;+D+Ua6wndOOsC_CJ*U-o{rp&puH+aZr&kw!#=BX6M<Zb=O}
z$j7<00#>+ar*nYICOA3jF;-5U48B;9l_Y$dPxGyBEWE-TA2jvcM^9l-x6;`&YiOUn
zl}e)?RA-Z(^m{~7rFKxZ(R`=-N0*!(y)Zxe=Co~exL5b~;RysWWEm>M(zWz^dqXIS
zW{yUQfQgC1tM@pq0imU&%W{`+y2{5AD&avLbLcA>RcV{Tl8VshTENdCks%7wzwcW;
zN7J<=cH2Tdt-2~fDcXer=b_K|*5&S%8oElT8|M4*wg=<wS-OJ3WeQ6qz{c)K3B#XJ
z^rsrFl;L2s)2=lIc-*3_M6^<>;|Jdz>clZx&vED7Tm_j3K{*&4dWz0IAeAF+IvBu5
zBOyTJ)1LJ*rT(dMw$n~6(4gHW-Xu8b$4XA@OG3rtn-y!HBg~NrJ9lI{j_1%-M)5Gz
zZcs&T(;+{;k#IY9^u=ju%Jz2hL3*Nj2|K`U5BET+ZL}*(IhJ7;%)~KHgFSx$DJK=V
zR&2))sa&v}sJ8j=OZ?lH*be5cMQ3euI*I2hAxujM$R|GitD&{h;=JAEKoqds5oQ?O
z-k_euLFTc^!u;cIX>+2v8JgDUST(kthC%z1%nF0<DmU=fs)Srz`Ep3hy}(RlcKoXH
z>k-7yZxjx$6C31S8$Oj<=KkVl8(?E7K*Muz<I~tsoURr_ZLRI@;hiodloU^wE<j#z
zNX1)gxNOXK5oSCl)(y@;9YrKIcRG|lUA&{qMBLD-;fOs*H2ZBY?DLDUDoG{^ggH1K
zpIS~xq>Is8&GX&a46#5kqX*us&8NtlBzp$jMiGF(-QRUUm-7p6CN%PkHzbUa`Bc+*
zfXqd?AQHd`<l}h9Bvw4k+B~)kVDiimL_?Fb?>%brT$o}u$IB(;C{>p%wUK)ycObe0
z<(JrjTLr2cy=C;<c%!<UMkSxhg^12hIuqOLMeaUpB7JJ&CAK^FvhFC-!hU5vhASga
z8qDxWj3kyp%t~JX{{V$eX{g0-Bilte+qn72>yis|$?scmU1-+297bnTGDyU^7~Vg^
zubRk@iI`TJQTs=ks4H#$E$xDzQ(Dnm+fO#jsC>C(T*otg(!Bu{TK@oAzqy@dw1OjV
zI2+Uf_eX5^HJW@utKQ$oH0UCWI0b;=NATjQO5)KP_t)YDbV%ZLk|44YpoasotgRyO
zDw7r@cqBU(Fcc<zM|#r<Z+mJ>#k6DhgdT&~)hTp~D6SsvIHX<0cL?7Ffa#hqaXrm6
zAj)T3V#O3RjS2v(pKj))xPRW37fND{RzRvgZ2KCoYUUW)V<y5E_jx=YudO<Hq>Svi
zMUFzdfMvj8>a^}s&{$=236%&tvzYev`qkOBSC-Z60wi#(A2JjlF(;5KE?Huf2+%kH
zW!xNR+M4q1L<*j2N6CygBk`qhxndiZhU!QnyN)s=QmD(EgGJ1!kp*{DcPDOo6a6bO
z?xKX8LnwJVvXF4Tgwv(h_D3Q~G(}S$SY-rckGfC2GE~uG=j|I@*rEr(#_qo4Rfz7b
zVSGC>5Sb;;er$HEYo8Fr-{{8G;#C7<C;;y64O52x;%9Mp6DsF&v|N=Q{`9$TxV@se
ztrywsq%LNXW|Wg2U*tpAq4ufm^=PkcrLvM!f_VygKSSwPWRFX})1bOCwqpRd7z}aH
z{cD^4*;^~Q3c!e<ks-+WMtvywhUSqZqgbBlXJqm%#M}p6+q-f_MLdNXNN(gHBL-OZ
z;DhXHSJi}Cd(UZb>hcr7`GXHoD-P=R=Ty5(D`+N=%0M8DF~G?=>;@>iW^$57ifi^Z
z6YkZffDGUge&?p|dY4-BTGgerMP+gRrY8A-^)-qA00_alzgwHTGj$pucZd7K+tk+m
zgtrjPg(HYC<U-0Dj>^W96kML>WsSwgp#EI)`7$8PnK{b#$E`^wo2-~y?Xg5aJKds8
zGoa`{4!l;C>)PFsEY_(E&=THUd=~ABTOC%~DMZpCmMIj54lq!9)VU7Y8FqKeWplG|
zm4M3u(Lw3>)$5H;9YW?SWD6W+z%nrTPDf0CBT-LfZ+RmN8+KC~?(<!~Spoi()wR@a
zCkq?K?7$>pW5#J*3(>-sYPQq5tZOkO4!J!SJ<Uq?_ZK$muVxiX6_O-4Ab)#3{pyvC
zmFz5FpMe~k!%h$1HD+7uJ4jYnxXXfa6CfI!_9+ufV|8vm(Pbz}6@XH}k@!_heP2}4
zZbU^q=se80Dl)8ko_#7iZxmV)6yc<8(rgg{mH>Yc^{a3!I-(pxZQ5B5UPF@J;C>Wc
zrKn!z%_~oW<{!7qc@$8}<S{wG`g+qNNSc4K+)ozpg^7(w2h)z(r=`8rvX43+mfUQD
z6&O%@Za>zvt`|*;*UvI5&$kR?A1;5TX5{W#Gv3k-!NCETZSwQf0npNm1~DtS04XjC
zsTdyKrlXSZBABL_ZrVV7oZ$ZeT9;hY-YZxyv|T~vV3`}7mBu<6hbOZgkfJEeEvQ8a
zUnzfl%-j_8Vch%GNen}LdmG7Nza~xFSoIn0NozT}ad3=rAjH05<8bT8)~3$z#FZo_
zNDI(XZo(j0?waitLMpFVi0VCR<+7Gz<jS#2ypNdhKf<7%NbKN|$IPlX9zkR$`g>FF
zCb5Dr$#{~!#U*i$y}p$$MI<aDMYopR#l2myH=aj4nua|#-LE5sVJooj+nfRF2&?OV
zV?1*UxCo!h9$TT~*n87uhBS3_n{=)ek`Dr-nU2V-;o`DhTtRrk6@~o3NF+LvKm#59
zs$UYtXQ%IiYlSfd5;v4MIT`#awam9VWy>2WV`bmEc)x|XtUX6ryS$YzZ-7OVl#LZR
z1a@kr7Ugm!H5Fp;@g0tsRv70(cI9`B=RLDmWbr&VXpr1skbYNg3Y=FlZKkof4Q&Z#
zL6;17ZO=HzsjaDeGA}J-j{f!~lXmF1EBH6kt;RPZGn+I&(EiZ7oH+w<MQ%!-;;P<U
z!vt>3&9gYlanGl{Hp5Q0wuB35)U&x#S&2E$I6Z|l-9tPk(q~=p$Z&*Vhi-o^w5?`U
z*vku<ZZz>V;yR}0D9kWNJahdjo$iBos?O3vC3x}!AUrActKV#rMnDnPAjMQ|8-E{K
zrGI~S6ycs1j^0ir&&#}zLD*F*q9jlj5<xVvTwAj2Bg!l}&w7|y+M^h*w?pPeLras0
z$FCjfx7UpuG^)kET;q05aZoMF+}flXq=jRLb0Q+`#!gO1>V3@`nL8sz<%%d^WSL#W
zczI*U4T1NtY4B=7AP^~2i~_tDA74t!4J$?&Nob@vSv>&meT5>Ff<~71<>i>4kaSn}
zQQDaKiSIQiQ5rj28-x-ap*MoTzq~yKRsPYJ%oA^QSU?~vVT=3v0s7P0MoEj_9g;Eu
z2`6a{*dN2aGUDbbAwwD<Br$Q+t9lwNOOq0L<&|ZQU~uS6j_2h7_4moD@mxuFB88g?
z4<-7aOjB-cX1k0p-5pzT>OCt{OtHFn$X_f1xKLy2LFq<`6RTyLoi@rVc=Zc8$(39E
zN;k|n?^I5osCkl`JmJ_KzFy*_`c};L?P5S%bMuYN$TB22=(Pl?b!dLjZQe<-lxWWp
z9;7htaY;*3>{FIYvW(X;h>@b(95DbJaQ-4ktx0JtQnN>QY@uQSn?HU*>6*{gbx9aG
z895=PE-<a^Dy6y9Xa4|6+QtVVO98<4&0Vx1%Ff8xxmaK?HMnh$_oJ1v3VVC>s9RoG
za<<xO3)?u(e!i7SG|TCyTZ^`LwpYWIJnip~(yrTE>GQj-q^_|8gbZ`|($Q`-<sn9+
ze|tL12u;evd}2HXALCKS;S0;_#?)R%C>!L$ecx=>jir$Y^Fo9%UKpH(BhXfh-4QHe
z;Qse$Fu@qwfw9z&!<vUaU5ylPxkFCy#nqzu#Www+zFZHu!@2s^`x}U0FBQc904&F8
zcONc6=jlyZJo}ksy_Q6jTZUI8s8gOe?^XQYl$oZEI9%<0>-SE1Vd<L2SC;0A(b(63
z>2j+>F%G~VC`LIx`K$I8`c2su?{W~}V6e{P{VSHbzR+!8XVPxkFuh^~?j&_=_7#_V
z;|T2}4<yonW8;DIdx}w~Ic$Y0u!iSTsA-p4b4r&os|1j+W#9qS4|>49@hlc|xQ=o|
zfEjmkrm*jPL#k_zA``aWh%?mt)n|<oGLv*g=z8b4t)Yjv#B<LPe}ve)@l25o@i~lv
zoQx2{u<rGX$>d`rH_UJu`2>1WsDpspnIDb6#8#BROl>Mc<}^HS9jjQv5$Izn&Rs+7
zb6nf9s+=C7j|6{(UY_1p!JU)+P(qtHBOiEFF<U*tKicFm#?g-}{{XL7;I%f!Id5T+
z7BCrukG#0`qEfKq8<~d8Oc=yJc$_iLMmr2s;?rj`8H?qL1t>`Ye-Bezlh}!_VQWit
z3poMAT>PE6^`g^B3{XJ>#>Q4sWo}6A^r-fl8mc!lth8uu<P*gvWsK#cVsrHRR*YIr
zyRdU}8oPp8ED&-(kgL&nT6=Q4<04j&mXmiIPfYsOhLdLvw2gPDKqi7R72NP!o}Ws}
zRl6F-k}=MUCAtqee|mX^BI%z)>Ty>ePSj_yifdO`<arq$+44+ablvNk-PE*YTS0N6
zwjuL3FqO0ApIr78Quj?Z<?nRM?eYKv$W)aB9-msz+Nm3ISfdL<(Qj2`C+|5qBh+H8
zMLe>}y_mQh?*IUC*pAhENLb^MR`X60nNQ6iZ@PY+g-xjFFhRWOQihF}_xU{iN6^$d
ziuNf%v}V}&Gfud^kV^=7WgE5^A(uSldUmT?XN9!g5;r<)NidPfmN|x5SJ<CQf++4`
zjy?90GzpR<jGUJG)%d3o+n~6Y%o7q4MCd(@M4Y-ZqZsuoHkMN2G`F`@kA7X9K{%@m
zr=W?R?@&#O<jA2;D@NiSw#z-;%x8`W;D!FRjjCK*$iHBVP>wS%-wl#*dyh&<%42-7
zM0cJn(yf^VylohE+qwDNJw;?{UN|?B&21*1<uHsGN|1MBsQha;RGn5pw(ig5F+@28
z`~DS}*0WB_Fr8U|B^0RzJwf`{L}^8Ca?Y%_H*IzM(PHpg!qLXjl1NX!Ke#d8ocbl@
z?9YGp$&Jdu43@Hz6%=p@_pHRxA91`*N#Kr1!$%1x<zd$qdreJBA2Jy(%Nd5%k-9H_
zYMf%W6kML>lsZn8Yik%cae0?tC}2AdxT~<MNQ$t=-dJ+JcVY)nYbMX_WZ=h;(i|5!
z!Re7(a3!RAbDO!`Z9gPKJhytrdNXJhQsYvH#%HwhkVt&UT!O@Q<WgPeZE-8h1-q+F
zx6hfm3ZtM=+N|1KM>KD6A$V0zH{7VkYev_}W>vVCf^nbzw|dFV$70k|+{x49I&;b$
z!F~XE#uw{OlH7tNn%S_xg_&?S9{hS%@bKM+p=|cw+5sh2%#V+hsrL1(ZBoJ=G9h?w
z8dr^&M-r3Dj;tt*l$hGG7`KKAQKMtIFjdcUinlz>wk+r)lH&x(=k9=gtD2L<HrCOr
zm{>ZwWHKC&!``W0_^}|jX;KLbIl}YC<LmA1S}IME?NT~tx@1_TmS7o<V=CC)`Br8A
zt0lavb8~$Y$gi}P$jJ5lE1uKh)~?;uzFd(Y4Unfjhoxyn1QPtN6r7#m$MFxZYPU^9
zpJ>^kHlZ1x>=Rvi#$X7QPCE0zHB!J^Ey$ikW(xb6jQ;>Cf!q&TZSJ9BB7#U^4Kz+e
zlGx9;(y2bZ6n9Sqc8E}X`DOrTJwBAwB*}AKPNYGlYS}SeEv%9p12bV<`Vu;3vMzPI
z-7a^E=F}98fo73-LDL@Qx!C+ueKh3-xWvzh!5?=S;QM-0=Q@S^mbkcQ2tnH4$oo|)
zO+83;Q(79jmy2z$+cQ9XwOn~Yhs-?=J624(gwsf-&c&5N{L%tA_N9kO3nuvyyv97a
zI0rqkSBmNSViSA0QPgkRI-GujuicKsw<oz#Y<2xXrM;Rku4CG&i-17r4l2~X7rVAa
zSA?|8fu>GKP)B^y%i_xmL{;<R3X70qClY&OxvEz_Dc5xmFb8e2INu{LPeJq)FKXF0
zf+lSqID$m%=<hB!spvg%R&^WrWr3D$v9urRf{YxFK5tTLoxYE$-p+0f>tvwwT&chV
zrakJ_zlOsx62~Jvi=Q@NK>A{v<m$>wO=yZ2UL(|4GFirB3Iv8nOcF<IRdK57T9wxO
za?31$GhlUL=sODOQ^OXMO&pTk9q52Eo-i@T*0wx1Zr&ffOO>=wwnW*8x&jb?jz20+
zwIsAdRA%0+<6*Ydbr?^bbW_Y5WskA;HL<7oa^S$WR}CVeI9#y=x7NBLK9g((*s(%o
zVxdz25_+Hhy+?Pi+a-*4QN+Kwl=*l(?myD7bzHVas*G0VUB8D-s|(aovIiTLatSqU
z?sVG*`z@2BAH4IBKKUI0>MK80zVg$}OQw!bI}%Je+NZ8ZdXq}mXSTJL8+#}vkiYI<
zVBCFr{{T89q}HN~igrf+sE(pJWMF*79%cszj=t5;>Yry=8tTqq%o||<l0Y7nqI7G^
ztEY?2krl$3Qc_4x{k>^s(NfYcw#-#gGF6X5>-bi2X)@%lb5@EaLmaMDu`MDK$Q8Au
z=__$?BbH&dBn2|OxIMG&PG`^xw(`<>zc64n<obIGrrt2OjRmYKid6pffyq(maaz7<
zY>3frZO@@tSt0_`DJ0;7$F9~Ml}7XXC^83+g5NM#;5VVHOO1B%#FFY4W<~Qx!ya*t
z-(RI@II)`-R~G?hDTD}4)WG9Dq|#85+-^yfXVmQhYe2iBG7`WKz5W=cM}Vd@17wF1
zF--3t(wTUcHaAh+$m**qZE)v5Fz<?`bFJPyxsqL{ugV4(dwO)O;+t9=?p9^#mQbzc
zH_IT}pdY$D{pu+^%PG=WBL~fo=h)c5_dc~yUiq>on%PB@aSD3U$#~2T5z6n&ARMpw
z)3t=<ayd0s{{ULAh3CwZ>DsGJeHviSaGhH(f(O>CPjM^AW4DN`V<4*xlT{;*dCA=q
z066)&R;nn%Qg<&&sKkIf+#uhby#D|?WJoS;{MVfA+*p9v&p7<5ICN2QIXhgEqd4iB
zp32e~E~2z3Riq>m`Qdxe?6wl-dyGvQdF5u5e5!IAI43;?O>g1(AQ9X+Wic@%Fys!H
zt(CjC((L7RfJrXUAa`BBVE+I-cdC<K&nk!_1fw2=bCcGmnoPb(t;DjkxBmcJF@Kf5
zR9y2`Eo~!EWSF;<vJ(*tjmN$XP?q0ZyH=U)<N+eUSU}!Xb;qfxZ1i_g<bAej7tGxf
zF~-n(pQ)tuTa=T&#)Hh3tDQDPSqJ*WZb2Tn?Nvk?#l)N1bjpI*UbyXw+px2RQH<8Y
zX}01x;uy&FC%?U0wzId18|^kfDNHP<_!_yLRTFhZvzyYiJx2I$S;ISmSQN;{dRDfH
z;Y(DLbn@Y%eZ@-m_N}OGNrpL45)_po7X*8Xj9gv1M*w)$!{C!28%h3k60JEG8ZeIG
z5z@4K=+jKLQnMUMaXHH`8PDNDh}{+_?g>^c<}`c_+2iS2#>c|iG!orOa4sBxW6NhF
zzZK1DelPNF$+UQ+ML)WaV8{dcn$A4)dKxzfEln#Q4Qg`0_SVjc8V$@gat3;4i~SM}
zHr`w7th7mnX!DYNsx1@5dXmC*Jx5fG!#N<w<^1EHyY=+?R&R*4L#~FoxxA9tpxTkf
zIAQ+Ry<A}~VqD|PatqH9ZC4WHmTciq0D66E2;EI}aUmEPd|=~0LTFgN%w&z_V<R30
zc&MO@QMb5BE$y-M^0FpFeQT~Uj8VxsN=#db+7fU8{_Z_#_7L0MFZx=jQgbfj*VxvT
zriXDn#jot%BJzPDUILGAO6Y7n1E$&+p6r0(3kZ`rBm2a6^`$DYh}9`b<fMh?1i%|;
zI96_W^fe@28~ap0Xlvz6kKL;ShV>a0)mrJ0l9y?vOFS%2#f<>S9Z$Vk)XDod*(O-R
zD`)p{fXk7<tezvWqQkDIC262AA#KB8a9LOG{xzhUKbZNAB?=<}WMjl_-Kzbhf$e;#
zu?(*40x-_%ziTt>33s!}CuGQYBNY;>CR}MnBRfLXE%eKkmsGGr8et?LVV|C&uC}<6
z39YpG6uwI`vS(=QG1{AbVP$g7cM8b9S@}er8;%P4)!C)Ex6{i>98t|IL0@!0laGH&
zj$~+)NY95}jnX$Vd2<&hXgDX_Q#Boa@F&@#vfUYScP=*;{)73`ZFK8anWVp(Fm`T@
zk@-`ec&2&QaKj{W-V?P6jhJmN*{7hJWp}jICcQ}HEFR`jxtpRcIW?^Yg=1wK$!}`R
z>NdNv$N=}}zI)d{ZGRic>czJr2Sg9|$v(c7(|CQNx6?k;dvc_^5>VuoUrbY#(J*RE
z&$+Rh)+2El5Qw?KOqM;dROPXnR6!7pU7sNe1!)g)j@7BE+}Xo7`X$c}xguxXk8$Z(
z7uSLE*GOM*+8!f}3Tv6{66KEN{X@f6<}q;S<>74oom=K}j-H%;wO3fupoSRkEiT#%
ztACutPYuT#M`KiNjoZz<Ut{FKCpkX#HI;<7F_*m7qkV~yA<h_kd;3)-CA%_mi`fZt
za<RlGjxh}R0!H1OuN_BB)$9KN5k;v)FQWk?w^c<+MqOA8a(mWl#J^{fIng#BmNTAP
znyYvqg&iPcv>ZyA<R4nTRM@$iEnMHrYT_7WRgy!yxl^8Vide0+y+S<i4nV@Xj#HYZ
zAhK(q*3*`h?G1u<up_6|t$zC4EVlD9?Qh;AuMPC}s<K-XcFD!P#f++El?-6=(k??E
zN}%`14qb!oWAY*DJ?gFTSs7=#l2fumNk=&6+LALP%aG?We82(LtwAlxa=9<r<GdRu
zbPT*KkCBBvjymF-HPMZYv?URM!%5UP;Zh3*ok^L>5Hp49O(4@{y<s4T<$8>Er*tbe
zLjHZg*qL|RlOa4Gpr)>oCHancp^tK5at<)x<6F9Rn>=zPhB(#HbGlXFkELzi+-Og3
zPuSv)VUAM+2f3`JR?f*68cIs+=Pa}t;8^uNLI+!9VyqQ@X2nG<tYKD0E~Y|Ct1doY
zN}B7$Z>k4fAzVej_l1sCxyDD<pQqdFQmZ7=W+mm&s3a*rr5^RJ#-khA5-qi&%@B@O
zR@elJ+^S%8#X8a(YgsdB49xiw5;7Flm5!SX?3VK12xBY=m?q|L_G?lf4MekjmfqdI
zVU{Y{3=dDnxusewLuk@%9K80^%!Oq{8-@l6!0&=-Ac8e>EOG(3VfgAhj8?{@rrp~<
z!58lk@-}eZg0pN*)x%2i?6;QP{{VWjCnwwrxXnpj3B{&pX}1$c3ffrha>sIlyNn|}
zN4;0o<<+m`nh6m@MS~{Q!k_lQ{*|E(vnt?E_Gg{OU&{OA`@fA$+HAKFGZ?VTDGaPK
zz*a7CjIL;*ba9YDs@_Ta*KZ|Qlar9WvsWziH86?e4CS-tNbY&|9+lBsXy!0)V_X2m
zL_~5heJE`gF7d%?V#p4d<OAR7L&PqGst>5kJ2+Qo+g!w(aUHye1&?q|T7nDMf=wGF
zF&81=3-`T=sVw4Kh$e*Eu^~YZAo)g5YMv?Wtjlk=4-1SabH@JwT>4imrsU3*1d$v%
zWIB^Qr18j+N&B`)&R7HPD_-Biaa+b9l?sT*$%ZV-2k{*BtUJAa8&o#2+(Q}O51ftb
z@7}66juKg=h6{rULRFQYESNYsA5m2rbtTYFaEsjORN7i`XA4gwg0i$=626(ITWey}
zvU!ex0&+(Lf3sQs7S?njX>c`J8|{tFzmWV$r18h|rud>QRu3huVp&W70INVg;UmAG
zrE5DfuJ<}fb=^MXc^Z^3D+T?_n8xp^{{R|;QvS@bgh+0qG7?CIlLUHKEu^*J*5p|-
z(Hmj=!VcAb;-=P?8#{>f>uo?vWsEqG<b&$J(uEIt$&%)}fS6tRh#g`jNev*{3D05L
zt4F9wrmR=e>T#rRKg+oZ$nDpqW9k~qZv#+prZa@k@bS|XpFXL3s7ljZgM{N7Fu3*l
z*K9EIdz|vDk<w~DBelfMZ*ZnCL1@>4g!TOEGV8^NlYN@i3}#=JPC<49zIuUJcUP8)
zC!K3B2*V7-lY?3Jdfc|)O&W%gNW&Ba5G$q_cq5*8hHk6sS2puYa_EQ@s0=tGJw`j?
zt7;lHq@-R&D0PlMGB<K|w;yzS)>L}FqOK*gg>X()S-1rCHF^nd?@|8%v@ZOZRW~%K
zq=0>gy=<VOW$ii0BEN($ng9wLCNe(jdK!WCIVPNW5^%D7pe{DI)~)Hf18h>#tcBc`
zR^toU{c7|+5|Tn%+~Dr!GsojfQ-ofip;B8ISM$on&ha1sHvDk;>?+duTT{7MQLQF~
zoP5Q4an#ncXgBRX>9ofd<NaKr0A1MRALm*rq#KKwTT^*$AxM+#?9vguo)06nXDmcw
zi-iXFBJhua>@@|F+t1u!9PCm6|3Co0GEb&@*7ld9O{L-Dob4p;M@-;)k9u7-Kj9xo
zotOa%d6{AN{k`gjp{#4#hn44AvbUMJQZ>d!dGo6}l4|-Lu%{YpMXA!o;{N~+={EAl
z@+fDIViIw@j&qvi^^Y3eYS6rTC7W8V)3M3O-Jbrm$I^8TR(3Lj99hTj7lH08R?ET{
zwlO4a7UeJeYlDN_3M1?(YV~86wVsH}(fs{d(dNBpSd?ON4l+mb&2>^}I(_BZn`;ra
zOLX5NpSl3)inATFd4FO18W`bF6{Cy|{{ULhw6nNtV{rm8b>Y+6x$5GZdKy!rlGM+R
z*3uF7IN26ra*v!Vj><>jS3}#w3J)z~2<4_d$;Yo@R#!(@i%Y1@6j6lSrOr6@sv54h
z;msxyESiGP2n5Q2V?XTV_pV-gl^%xcmIz4nwZEC+mRTQvG0p}AL)YB>YhiEn#EK-k
zxQZrrD90Gd9X~%x^F3eU!rv^Kc8?^Y9fxv-<p*F`b*y!`@s0EXe=2mfm2lgJ?f%Q(
zKT7FXI*ohI#$Q>F*;hR$U-6n)Z<Zy2w~fA9kWU?trE;2&#Qy*k>mi!T)5-GG?P8eN
zqrV?|ulP&hWY?^%sYu0|9LU6+Z0-41Y`z!prkb%zE;lS76x-0rj{cw4vvnv@c1rAO
zHEL^n94Cjbd|c4n-0D-Wl_IO#%@M**4_psg-iGsE+X6~Ud1pB*hDFD7{cB$G!$g+N
z>=xN$S!MH;Qyj55BaYs~y-#ry$vE?H86!~RZVoYwRx_%lE8519rsB6VhY~s|W@kWr
ztnr^(vtYB>sDjN*ai(0M8SB=cIP$F@WE;L;;XJRteJUM4S%x@Fv8R|_e{}3VQU~-j
zxvpt@ZcQ@>fumc1>dH!$>QAAoS{98x&y%Yq`GO3Pe8tY^?me;VSyDW~UFEeq*+Vpu
zwiQR99<<ihE@Zf5nr*VOe(DumDvy6t{HSog!sbZY@dl-99N{#<<t%&^UN<&5IP|R8
zbnBgZDQ>Q>0x}=ng<N}J;;KEg+ZE^3kh_u$OV?+w{{UXOjceizdJXc!r`|lO{{VhG
z=kxX$t!ZKEP5Y>c)`S+U*3>@PVkDTA7UD9pJfkkGKhG71bK;mS<bb@Oq;h=W&RN$T
zE0MVIuC;d^%f9xORv>OX6wjyftgG!;SdJwhWy*p{J9)2KmJZ($=T*ipvUNTx@k2;S
zwvD!&`C~o34RUha-(6h!bI4*sHxyo^)`pR!Yg(~(ds&%6D@n0)@{`iGtb8G9X%oq)
z%2buiT;TQTis?>`2-xRpt$AGMVzjiDWEQCBbKy(3EPukf{{RknckH2DvLmBqn6C<b
zaqC(ZI%bbz5+>6Y0WZv2b__ap9jkiI$4{QwkDL&+Ktf2$u^p?I5sUY26Q+(CMct8G
z*;-G#WZ9Qs+JxhEL@l7zj1L=adwELDD;y#1w~zD1YQ+wxa$~r+w?vQ-uOx^*U^w||
zNOW|xAbIF_F)BI2o~I+$yw_RW?c~tUx6>YH+$0Rlz<GdRW9dc0ExfPfTq5^;uM7vR
zTGV8<v`0&um5h;$2Ek$J$4)7?Qfc;a#|%Kt83Bxiw_!-m3GYctO^vG=^6Jr8+C9Yj
zg8ZlEP!2KM6(9U0wk9woy^U8VXjdV)_4cfNPy1I})LY21aTsm5Ksg7G#*;|!KCU&T
ziu@leu*qb`0nY^2Pb4jN%v|K%k-T-Q1eqR7wFF^<D`!5{W*vNLQAp9LMQm+(Ps&HN
zQ<F~c{{V+#FR3D++`$2Cm*?~qTKiYG)nkrDv6CoDsv_ZEBa9EFXXsZmH#BQ`^(kI5
zllf<&#=MWOwOQ75JE#W2Or$37F%MCX*B_-&(luFZF%`VqSjC4q>F6mhb&I)OT_ZAX
zY%txoXztZI^A*gjWNLac%_`k1;}~7xaDD#(3T1|#ESTFzdWxWi5S*4)2k&I`&1yz$
zVuDw_zA9rG!5@D;F;#A&SZ&+{RtkmWaz9W0wP>7--L6*3+WE37#lCWU(YKc#p4g_O
zNwC8e!aJzQlLT?-K9yi1xCqXIMj0Rvxt^KzH0wyC7Qbh_m3-1p84l2#_2#bPC`qIs
zyc4#h(hyXj0g8?}81?t7$pn&KNe1Tg{Ge5c;fHJrFCm%)B230Z;7EhzAMI4TAeqFP
zeg65E1zlMDyn0jAEXbYZVfKh4X(Qn$SjG-VxAdrP8b{5;5ELg&V`&}zs#~20#B5Hj
zd!@KAe9$ZsZC3vPd)}ju?JpU&)GbQP@3@XWVBH7dO$dZXA+|sdmdzn6JFm*1{{TuE
zqp*K1rG-qta0Sb8)xMPNMr*dRm`L7JCQMPtoUrM@?_B-0<HvYlGrDe%ciLQMW_>*>
z(rsLaD;oNSr+26)mU04TGqMZ?$E8-ZxwW^RJJ!@vR7`&IRltn?J-zDe7B^RM$1S00
zV{S8!r@8u6i{Y6sCN~!rttKMcfkqNA4^lsfno3byip`lXsVXsTE(f@fb03rk&6C!z
zS<A2M7ZVF16dU3Z+?f;>I2-|vhONzg;M;qM?N;nX8t}}#9pG{YAC+e6{xbVa$!De8
zfRQ%z+M|QtBy}{?=h+Fgx|%ljHY!XpzsQNX%(E8U!>?Y|Bm(AW)Oi-p?sq8ivPL=)
z?~2EtOVzIyIBsm6ZX|8~Y)|r(JdOou=$2Z-qZ^1r?QBCT@y~iqCDdx|l1mKHT?k^D
zH`?RRk)tPao=9JQ-qoQbQCKpq)w{^!<_JzcTy&>t{t(n=x0LDflWwS5W_<jIzddtP
z&uMXIY?^7*R#aI2^q+YKI)m%|D;G5MM#?tTi(%p`YYjpzO5eltTwNlOZEl1dA5+^N
zwYIYzRtCDgf+d!C_PUXSjPj!#b*vj{t>wK@YVGB^>=zMrR>vfdPfvQ8k&Uv&7n>Wi
zkfGb3ueC$exVskad^vA-E1B*&iY!M6Cpqn(P(3Ro`RQ^+rMHzMKh3-j2<``9YQ^Lt
z%z3)5re%3X(e`;tw$a+CNp*0x?|TX?=)WRD=MSG!dkUo%iES2dE+9?vqPX6f4#$-}
z$E7mQThnGiJntl1Fd8O&1MW!eQP1LCDoa+d`wP1O5;+5fRy|4j3g#v8I-!-#$W?r+
z#3Ki0D`--4GnGXXu!B-rW|Avp+Ff#PSmh7l+Mu6PwGM8tZq)fe1ly1tdk+5qTIcMw
zWDcn-PK&oO<DW2nf2C5?wEa_4xk#jTiatS<X8<4SYStZJRzs_%hKGqY9U50rZ3!rT
z@Xy~TvwI50(zLBhP`i;WjB4&bcZJV<1@^02e}{~PA-K4c5f<96KKS?cuC07M29;+F
z!NhK(dJJG5D&;uQk18fGl}C0~@ZW{?rewIgD2jjyM4S@6!K+u+@WXMjL6#3QD2TgT
z+>_~6WW2oF6o$}&I_;H^{Gb8%g;kr&mg#KZy)7b*#ht!W#{=}PNlH?8XF`gKu>g^w
zx0w0(ate$tLa%SBtI%pN-dh-9l*c?sa^-WMOjUb*K4_)#<h)(@CCE(eC$=ih)XK0y
z9I9j9c1O1XneprRP}s<&zmz0$hCesTP7epy6qdIBV}y=P*K<j=7oDs+^Xc`dBhz(@
z$fcIv+stKSx)|344utbb9j(L+izVSPhUm-l4`b_()}H8>b7Ah~)$A8bu(MDaQ|5&O
zw^C0~yi*2^V{34!Z6KU&B(NVZ(>=y&3r#-e;aw!Uf8T%_SaP{upo~_Px?I>=iy7vL
z;u&S~mz@27oo3|H(6t-xOJ}B|DqlekLd&=1!r`&suoXV3sN7gveUj$oB#gK2N-jY4
z9`yv*&?xeJ<z!{dia5_5DzBZGQYbCLqNytpIb|K#=CM(fo!NIu6tzox*SEN2k%4G`
zcOp3ohp#^Mjj3G6d221DwxJ!~ZT|pyFvuClBnIb-y{_soUb5*n7YvTcjkqOTpYLL;
zXx|Mk?yoaE!e)vs+e;7&`mgvJ?WUm^-JH^Gy$r~8%}&Ed32k<(xpusYxIA>vp{O)%
z8(G$5O+p)qBbXA(7?406kGFc-)btg#hB0vvMw=mm_s4pnc@dsxwy?L9NwGn5J`|DD
zZ=vInTPB*&&dqLH(=-!jD1!3*Ok;mOQ34U=sr5bT-R`erX=*Np<&j*7t)osz^#p&O
zE1r*E)ov~Y$Cf_#l|8gWYwZ~XkMDEatt?PVnt~gRSfG{1mL!be1N^BvTI#`0+ZOIM
z1FT5)P)Ms9HbZaaN$Z?Y+7nsqm2}sVONj@UDLL}-{9eMNv$oY5N3}~xjOIeB%AfMj
z)c*i@*0dT1si=c}=PXYa6f<WIqu1KAn^4%erzTOc&=SV!wM)5SV9kkh9!FlIJqf8&
zH^03S%%T-Z2I#hBP<oGg-E9JEdtr32gax>jo8*+^r_feTx2oFsX4Hnij!ESVPUYYZ
zz50sFo^=_gBw&SW8!7I$!jcHzlyz(`zHwSQYN*`u+^y7Mf~$;zr_(;w&iHr5b6-4q
zTO_WIcNzA8BL}~@_O7<d`qKX5OJNeh_Iq$rNj~hd6WjsQiq5K(9hp@5X0D98oeE1^
zk3J|GSB-NU6P^#&tH-9Yf@hv3Rbr_G(c#JZ_sw*c_cnI6%xC`qNR`PhfZ!+RP!*E;
z=~fs-frdi`1pNo4N~=2>I%tbeft6O#BSdG$(;|#7w;j!2w9;n^vQ2n|w&C_i2LOAX
zpN&Io>XJA!#)d2sHsy)WEA{uOpcis8hyal>y_o&bqu<uElX7K7HZ9p{Xz3I-<)kjf
zROcr>ahjIfP_(nMlHcsIyU8xW8YnF1Jprn>9xO}yWJ0l-A#B8LNLF6m2U@1uliS>?
z+CEM<WRAJ&G281=Vy=;`sQ7}~!rn*KH1v)m!4AMQXP^hvo<6k_NpiqmhfuCIf~&&&
zW7ex_@!Wl)8`#1dqy$W7`L~1Ej-NwTEbS#}BU^PL-O4wZGFWvyb{_RWLT;^MJ6cDH
zAUm0d-RIZb)0*Z;5=JqJe8m0Oj0~yu=cP$35yb=Dq@_V55P32Hc>sS}t><~HBKtFi
zR@}uv+*k1aR3Oxz*K<jP`5B_)%sjWYJw;yAHLHy=Ry%eHE5FIOWaNEnlH16hP0i)D
z71)?mwip5GX~x|GkkCl16q2m@IPFG^7KO{LK-|28AtY{C0fG3A)sZYF@+0<%9b(BU
zRfuId_4TbgYb#BjY|d5LHiNq%N58ESMJ=3hsjzm9n{SbUxpUl;(09!VsEww~->}>Z
z=;n%O)+HHaP)6=LH@#`;cNQ8{2I_STa!jEA0Czn_OC5v|qg-9yN9IDs;{fpJMm7=L
z^Viy_J>Ar7V7jp$T)e`O;|D#Dr91N?bcxq!T8^0|$i4eCK1tdek%k_IsB1SdT}v~=
z5Q}t&XbJ#z_7#n5b#U?hm7<OqUopE#IRm*E@7k#U0K#KyrrgHSIg(<yh@MUd*R@P(
zyXZGkHq^Q%5JnpHK75_#BaOp652h+xSaf;reBZLTn65(k-zgo%WLlkj#FEG??Ly1A
z5#}Bk`{K3XKiRQ)w~neo`<!xn{uNSIL@8aH8fKC&)g?&Z%0?{VTMRMiYUZ(TWvAKs
zx6;QH!~q(wB<K6XwP6nw{h0X{sN+19L-PK9{*{$1x}K!Pu4O8+x6UKvf!Nk65^qyq
zYLc=izSk{nCYIhY`{BVDA3xHnYWJF@#jJM9>W=>abZ4AZl+r*BTIM!rS90zI9(ch$
z>dNWyCA^adjf_eOLDxUhuIf7(+EU!ix3T*~FwLneDYuu*nH>C};~5^6Vo3H%S`^rX
z0-5AX@0zsnHNTN7$g_uXtr6n`uUdV@;Ei4(YE`zDKrlca-%3hN$T?C)Ygv+9Jm^ns
zX9Rm3cByp>dw6Zz?Dr-x>9{+bfPK9MXIje1b0XVaM(+?-k&~v=&=FIs?+q5v=0)TK
z(0b$2s?Ot2LMy2r8D8wcGb2W--29RcK}|C59#U!YhF{(@vjPC<06mRGaXrX$v=#@2
zi*7z|=~3DnoQS840iDDi0BrO%tYe`)OBV9nha2TkA0WnK<Tuu>!mj`l$c17tgn3BF
zVcx6QS^0B~Lvxu9d2_($u=;Q-V#mWW$!s8qI8J4Wna|CW$owfcZN`&kEEh9dT{~Y+
zLbBo*;~WLg89m7u;-q~>Cbb6p5I|)iae~Z!u~sz=BwQ!ijmTLYh)sZ!q<5-XsgFjt
zf_tlrc{YG<9Y)p291;D~T16>rCizRh+P60IG}?5n5S#@tNPcHk<F`)LR!g}qrBQeU
zWu(Cjoa57q=8my_=3IGJqm|x{dFMXesvFM~MW+{Q+meP94rJSr&wO>oYN$yWI>_qP
zZZ9G)86^>lux07kVxp2*<7b9@h-4}LsG{K3KA+=1?MH^j86^!lc^S%uRY0WfC)11!
zcOs^@*7cjx*OppLZxn<=)2w3={{Xf<Pqilp9mmd|#;8;yZNyFG9!JlB$GE9<{W|LC
z$pXqGlV)R-4inQJ^tx?@tZy>h&I87SWOC#NKDqa;y#m|A)@?o1nzrdYuq0^mQ9XW!
zvXq+G(IsNFm4)V?BsW(U@yW1dgo)SR9qQUVO?Ml`6low+nDg?Id*iiJ*L+!^*%bQ_
zl2&yiagbw=;Ulj##p*hh#<y!E*7408vu+Bm<y!#tIOr)VbDpn4U0B5GFFamXYFH0D
z$Z`V0M!-j1)h&*-adEb5a3Ug1$Rrsc{vE5IhR|5S1W9DxOhg&nlezLZEA5)<29aYe
zv~t>919Yb%G&@S1clG+!wN5CQxl2-ki0Tpv0o|DkD-IWTd=Av@I@zvecy1tNZ~0_X
zyXT>+(AX@oNpTj{Vn_-H48y1bi?0)DR^Z7D0VGA+GUxqSAI#_S{!@0<qFt@IZpH5O
zP;%>?**4`eNI%roO>f1v@fO200H5AFx%ofYU^@F6=P&$a6p+kfz7fi(+uJ+1&s81G
zaegAzwM|XsxqaJWwpX<=J~uCN-ln#vg;RHtjZ9A>vN}y)$7>zKPLhW5<J>?Q+t;po
zn&+hPrnPrxFto6BAQEmFc|7sQpsc+r*5dV~ySmgPXk%3pMo^g;AL056>n!{;ZDABQ
zFgrYqqs)Z4Vi(l<4{GmFrA=8Qh0b$(oZ^d}eNx`zQ;B1lPnod@C(^WZ9}L}T;UE1U
z&Lo27FPN{bbZ}`F_Y)=L+IlpRWXh1?RG=6b1N`@^cAD3Pv{{mSapnoOscVM^1b6lV
zrd4#ZMaGu8vc8GoY2~*PNeF2bnUz`bkET6qNp$lBvA_U6V{I<O?jGatr``CINxfIM
z(>9YB#J*6*N$S9QdsT}~JuYE8Z?KJwtc30dyANvRl;2aPFkK0Bt6eJNP%4^yzEo-q
z>|cgGKLBdfcCjPNaSXyVf;^cdPC5P)^r)h=R4;1Hlq-)gJ{CY~?VCQ>)gzV6eEE3=
zWFOZUtfbr6-YB1Sl=A(S(HItmL{gK(9_&4-o>EURw1VB2c^@b_E$f5YmOI$qNg<x#
zFzTad8%gv&p4C*{Cz`OdZV4j|o(pGyJJv>)Mz)El!DBnz>Ph7)Wp>Z^TOBk10N1Pj
zAf0AWG|HZ2kcWXu07>bOU!_v;{-Xt*=(pBwqnbB|K3gvs&q94__N4Y!5u3{yAeacV
zZyf&sb~g1Ke7=>*G~H{OEh2Mv*QDReWpNWV#K&m`umb-8cO9#5NYgcY)Q;{LqrhUa
z4VecW6#9K@laEx64c>B(wMb6qA9auSm(W(ekK!5Nv|DLqSkQ9*LvpRu7WJ*A8A>`C
zsie(ivMnT$GbB?-_oD~yu|Id*)(*Ae7_FjPNhObBI~dz<=hvFKJ;GgicF+d%?i}sd
zcm(>^2iO|#T8>F?5&V_}MKa(r_a98rLYq$W9a*Hk(tRUQ{?V3S?5xPhGXx+4Mh`8Y
z;;Wx!)$Z<+&sUvn<dQJa2%*}f_T+y$l1n`#TT0qKn)d22(!6qf!GZ0JV0%<II*J%x
zdC<-v03x$(<J!01WMrk>Tl+_}x=5t7XjlGPBMb=}9cpV0OGT9)*6vTT+!3F(39+<#
z5!`wj&D1<Ye{&hSefNSE4YjZWj+h79u`j$!r`g{sNgGWQHf3bS<T&)}fm=q5q_rYd
zqZ30|)n>MJZ9NumHOx*GzF<0nbK0Au%XK2U%Q~aNg_6uimTr0H`ul!aF}>ceY9_dz
zIK0_dTM#z1pdQ%h0IjQNC9w^AX0j3&_keN&4&?fGuBA>fiOub0DO|UD*AZKfwL~Mf
zej<o+!H-bb?O0c<3^yyKtj?0S4*SW**6Gh-S~@|txzy*i)~*@^`xYXSKAB>1$9kfz
z9hHoCdW%NVrd5dhua5lm`c*<U6y<UVTUS?(3+*Q1pn_q83S$qR3m-~?ZARY8bEZ$I
zMnIXRE3*uYe(=p|&+$)J@J@<jAsbG-a&EH-X)%tfPvk!e;q~2HSk-kog}$806R0ji
z{PCd~$tT;rYa5wLN;?nLyh@AnPioO_QeiOT4uG5nZuLgZq}7|xHliDQl2N2$2~U4~
zcBz*}x4%V8>uFUab^AJlfXX;0j@TciYw0>6g61oWdo*~|;KUmt*FSqbfbUu@43{*X
zrLPI-vS=3fvgz8wOC0v-lC+3hjOUE~)9u=%xtQ*bRkx2Y?g&_o-tAVQg*96_Ep1{k
zPjNAfn1)f*9tZ=yLjD=Hk57AP?c^-Z$uF4X5Jy73pGup?=E^SG8Mhjcg#sjIQ6qlz
zju|}&{{Rn4fW@zQ=lerOjpbI%OtJv7q5d!Sap_ktblD<!m9CImr!AQB<n%bJHkxFy
zqP5MkEFfaoZT=kdlisgIb|jl+JvP$gOp4rDw35Ou9Za%dh%z&`o~`L!29Yi5TnU=m
zI3q;>%*qP=NFC~ZHp<=^m(N6XM%?>382WnC<H{r6rICf+M#l4y;B>(4T+^w|p}b*X
z(^zP*-NkncNeqjYVZQ^B_rUe~)KY3|YE|46K-lwF1V6DI%~)MR;FDl&6BDNCZVY21
z*dE`7IS7I{#Ktx$AqyVNWcO@;TFUIvBux&Pej{7&v6*a;kjM~Z590onQtj@nLP=pI
zoJkC&r;_3=%E(6weGj3l&>~9aYk1@nKgf{@56E-(hi}56nrLN;JNTA4mN|+^4$Ote
zRzB4ZQcSK`*sLLr=}};~P@!`2GVNFIw~m6gt*)EPd#y_56p(-u<k`UJryicQp2phh
z^z9*h&^)Ci6k*>Ot2jr7J2<f;O8Z?KpkG1xR#g*|G>5uRCGEJ4PVYGb?vYWxW%Z_5
z#b~cARybhtZx6pCarLO;wX}ek*+@v_8`T@;0QS#(R+38<)PoQh(I03y3cPpVclWHX
z%c-JV!&cV%*6rX6463Lkl0-}e&+up0{P9xSC?(>abq^|?vN1VMd(wGQN{uU8?}VMK
z(Y7#qgYQ-blLfV_+1TBra=c)_m`fQm(1Y#XmC)^GY-u;P;z<sny64P*C&(}cI%Cqa
z^=}R7lihv3$Vmgq!xlTZAHr(8-OL$;7g3=Rd0^uqkN21BQC(i$L1vP?rs_CyuB*XD
z9f|g$<IsZg<eP;_U<NQVbp#+ODmVll!#zbw=36LYB#=OirfCZdll{@{?fBG_YcXHj
zMFfyWzH?#aY%cykMXZ;-YsPD2k8rig-;54;KVFp5Y|Xn9TuUXiVkp&CBPl8*Op~8O
z>r`jGlGs8;xp;i$8{tui+Zp+@-k&_j%tDh!46BHmVtRKg@7pzzb8xnyE+tEgc_U^h
zu6|bMqc20#ApZc3RAF*liQ>FmvGYU1!0vY$&QBtpYp%7VnPMFRow+$V>;bHsyZGAP
zOO=m$wsxC!=sUJO1zU0UxTBaWB1C|z0fkon@gDWBDz>J4%()cbZ-U*DP|1R3jR650
zwlUQDip0OT*Oq))glUHC%OdAs>^9b=w6`MmIQ)?Zlk+^%W6L@EbSA1@EuGX-K_p<Q
z&zKSMw4ZU!R3ekPGI|~R2$J8*lIk&qCP>_KwDiZVO3S|CSjFdLs+f_noDK?}!`7pc
zOY#i5JaNq;WnEq{!7w=_8g<RwQp*gslL2iUV9F6WFOQh7r#1JOhwnWP&tSAfYcG@L
zvmuBR#O(fu?w@L8&*t53+B2{az~gIoq$>`@*$V|@y`wFbkW_O!2^h&5h>ED)_5QWY
zt*Kg!o<&symHD%~Ju1A0VQ+P92BKO?6DW$gWGB--{{TvM)QT3hh&-hR?Zx?WN%?uG
z{{XZ;$9o@}Vq`@?=)i%=>Zj>hNtz@uLY6LWBE8)aiA*s|lItMq3m&KW)hD0#ZRJ5G
z1g#-r0LjN8eX3oo;5DqFkTVxtZfH(=Ra=;D<PnveEQs8~$?}kU{c0M!G(&G3EM8=G
z?ea&vWA!;5>Nz90ipTp#8(prUu^>=XjBpRH)}`_;H=^J?p|G2W81?t1YulJ?-qcK`
z0+Q;h@}F@=rJUZkqpUiF7rXHRi!4JD$oR?jJl8d-n}xDjZ)Aj+*`I%twDZwUI^c9Q
z)M~k(Yuf}xDpD54TNvjfy>r^+iqT0mxhl&BC0PdSW82iywx-n1OH{Uqvn*E!%zQTa
z9F@nlX3Z({13Qd|##CcI!_Zc>{7C7zNX)xK0*lc5e=4CZoWbUeW7u9k3#iC%=~Q&?
zQ!qB>k`$6Qg9mUt20p&^BHCP#V}?X_NX)xJo_$aG^r@YeIgu@=+MZghu`tPI@A}jT
zrb(9GSeiGILZLz0Pq*VhSktpqmOv4JkIM=Jf=2Q_Y~r@91|B~;Bnr)gBw*mE<0saz
ztV~eCjU4E)#^>c`Cmx}_{p)K?iL9dg3S0T!eq>_p&fcJcdVK{<_6D>%4Km{5CYENr
z-tv5s!l*!D*pA;?neH~H?(AJ;Acs^S?gQ7*Rzxwua};;iF2l^sR_g<i<hb?sBDA2L
z8fR$b5nd!}86TA(e-IzeqAbEl&{nv(x=Wjr5hgWR2FwDZr%tAxk~PdvAP4<f@^@iV
zuThTmTo__?MvrN16=rR`j_d8)6#0@xVv8zVA1iuA5F-b^bK0up50xM6<)Q&pp$Nod
zEI*YsC-UO+rIa$nxSX)YeT7DoL2w9wNi>nZTq|QdV;fIFQ)(AeU3~Ty>Wu~wLSXK0
z{Cd;fYC9215X|-oIFXVuA&E1)2h;p1o=lLh%fkX>h_K6N(v(|T#vaDXIaVU2q$Y3Q
zD;}(;xCgZ?sAaWT%ByE0CK<;ZWS?4Ki1yBooA46^$Vy<VdY?g0hA7K<$#9Rb9f%Z`
zUsLZ(97~@fD`{>7pb3OWoOUNa!=BYLLm?&@+9qhu@Wnsz+D=TQW?rj9Br|zT20G^(
z&#3mI=-Jsqw{yI)!lU=jnOrgS_sw6uRhkEy?}kBy1PmeRimwgKaLyA^@`&g}oQ(Y`
zr*Z04i~c=hLVy!1i5f=8VcY3P&XW~sqad(Q0+3=pq|k_OZKqL~L1qF+8RI=gKo;Id
zmf9OzsN=Sb86Iv`^Tq>r^`~S5-WX&GvF&AP2s6UlRY>>sqFLELa!VLhK0po*d*t;r
z39lit7FJqZzi0WHSyThb{eSxO#)je)jyFKQP$iomFv#v|ZDvvt!=3V$U8DgBMLdz$
zr6-z<gUggY(sxA=<bR(^MTrtrB1Vmn<uKSM{AulI9b&wAWJwIf@NlF3t~%zB?h|?P
zOBK|TEGruViRECw90tW!7S|~mH-pQ09rLrJDLj2KQl#V-xp_S0jFPgBQ_!mq<Z8rn
zq{=*`5yv1K9l#_10If;rRm%44kw+t2w1Of6nIvqfZumWoR@9v@cO~iEOkff|UI##N
z)~CLZ%0zOmJfe2MkJCNRudP$eP!A~!Y$pxBoVQ$$K}Cv8bd$!aUTfIOM;fs%Nylx!
zT2;GQfw&h4V+8MI7y_%>G_Nt0B2^&bYz*uf`@*GjD0W+>jC`kO$OiNs&%GOk$F1xU
zgpes@0ho|}Rrlw<DjBA>wq%ywrDbLSN4s%R)U`=x9G5Wtu4$u+CC`|$bGbb@q@T-Y
zk5swKZaY;sZOV`7iUvyzW<{OsY*u)tA20-bpN&O#_DO(vB9J^s1q1bLb^25fC9|W&
zZv)9JO__YTxkNn<D4I>IzG03`97VDAkWY4|0!q?bsJW5i0SbVmV3YndIazL6TaBBh
z;xPnx@&E(oKBul}7~9R|Lwht+BvNjTh&V&)eN8`m?((IGGNH(5Fau|Uoby$v6mfU^
z!1po6Fg&S{<T3A`dUj)k`4B?u9?Z!rOOd$s>&WJ$y?ax(-%qh=A}g6AV}@T=Q&E?-
zRu%%{GG$Si^OCFTe=3`Rr6XWsXYz6PT3%1nj<nZ1h%OZaou!-ji1hRoI{fLGB-)Be
zgtGkHag6#^aVpH^ljR7YFpy*tdVxjCu?(?&x-n+#WL%a~qY6*IwM8uRUq(z*N0Q}c
zRU8a)nzG=OEF7ZpySovdoKqIrY;D?T);S%HLLlIuQ<_&}uv}ghMU_AS6AL4bdUKy#
zRBbF!K=**FtZDPAWEc8px3BrZeF)Tim}X%hSvLe#+DlTx43ae0Ilvost}=vhc<De`
zwP`4VA3kev*7FP%ILnT_9>S{>Xk%#zCLP6)5z3y*JxQm;-eH-qEixV;q(s3+M|B;t
zJ5`rRZG=<0Z)gE^b&!&BKH(k6>}VaCohb-JNbICG@YwmIK7`e1-g}A4vXG^-AuEiJ
zY<1?ft}Wweqlya|e2t{Miu;*!$t~+qJPO-Y-5HPuNn;#i=}y2$6WaN)MSTp;u7oQn
z#>4Mc>~wXO=tyq)JVM2e*FM6VXo{|nC}o#9ea*lFrZL~zuR!7rx0yv~GX7Mjmj3{D
zmoiUNNW$b-eipaVEjQds;@~mik3vr$N~Dl1rJ{n}(1ybyZNw4Z@vWU_P=ispd;3=|
zWPo|lPIHF-m74bL5-KV49f)*v1QI<DtvZv0pSnIv5j<W<VC+6@<YSt8hFO;{wIjiW
z8-@*zNj>RWINnKR0j7PR<90Y4V0Pl1$W@+MUD$0I-Z_ulR#z(8jf|;Gz*uk2bN+f#
zT!o%bD%l<;z&|?zTaLhV6(CvBwyPw8(=JM5Z_v}=fo2<_{pR)i;dmeYY|(U5O_0l`
z2P-2^W7wg%CnM|YQzfIe1e;DfsK*sOq;Hu1(JV^SHpP{P%1=BWPh;y=t`s7eRy-jA
z6<d-R^*ujYT*$Q!<utX94W>ChaQq-RWc+GiRtH$GqjM4+!ZLP(2<m8K5~Q1>C{=JH
zZeMnBnvP{eS4p37AZ~ng<E1Oyw5&YHe8X$0TNN!Dn|qMJZbQ>PpbqsMaa$6x8N-m+
zk<^k0py^UHo?>j7Lw@UGk%6>RE#bCF6}CKU8h|#Q8|z49O%=+*WOzaO+hmS0&u_w#
zF)XoxAW^rC@va8$^*RV<Vf*;piMF}ge|9}-z*~!XqY$=7%qA_E`u_k3>yt?gjy1cI
za$~TSB9JI!C;%URJ7%nlS4ke;>5=A+EQLnf<|nH9(lxYh_?$DD6A!hI1F*+xV!3vW
zZX*Ni@p+2D@v(Yi+|%X@Si2q7tO@6+Ng0M30&-U!$Gtl8)+lXGrYAetZEr06k&f6O
z-si1l%c-@xMHvD$k<XKGz+v;-B80cTxVL|?T>Psj-?d5J4_*y5s67idZ>PYXL@4cU
z@s(sPxq<c1Qfe2}1ITRdRiujD2FqdT>(6?0wvp+>bdry>TS#4gW3(wBt5fF=ZU9@9
zi9!c_s3rT3aZchX%GXzAbt{87dv!bDLA7zv1_P%Q>zg}rsIvx<7zg=Wji((APR%XZ
z&CIf5MdnmcH=pjDew3*kN~6w=%BFvI4_Y~p2^^CwD<H&1Gnhd^$@ly!JgMI6aLldI
z(3}?TDqHJ#6g|{sUO0d$f`0dKMME1!8pRyWa!WCeKj9vu-ix3eBoW&=j&yy4<`*j8
z#7Es8{i#|=o+5=AB$;r#*c^Ki+M#$Sv64BYb&@i7j(B0~%{gQ<NUS0cy@KuC-|J4`
zMRsQZGh3aAaFXMN6<oY=GlZ2?V|zyJlb)N`)9F&(EY`8l1VTphKKLz>*QHZ?@RFBE
zRit5tasgeVvG$~xo3T6GgCI{fGz0})jBfhSbrKySx8TA)Y^WQvP>7T4?Q<%JEO#Vp
z#z(b5aK~#$9@1nOQ6l7;V!3baGc%~1G7xgcQTMxG4@$2j_tH3P$j2nAY)~`qan_k<
zBriHc704KErb&<8KU%-1{h3|G=#8aZ?2H^|oMwi?*E6J91aU~L!Ayio2VJ<U=@Cf4
zHm&n;T#SYu)b`UK&IU+!=c?o7Y}K)2It6>1g##H8qMkUTnGHpm>7%qv$L|LDlLPdt
zv1w1ccbDbia=?sk81}6jUk{k|C>GM-ppq@ntiX`YLCE&2X>Da|X%+3nxLKH>M>xX{
z{=+p6qUdcJUCLIvbkRp5+e}<T5oX+&R?l3H`26YcX@)z6SwWCEQzXEAs;9MR%{+2k
zAazp8m<3w{f%?)%1Q${V5|Iuu<u4gM>OG@0P)Msbp9Rb^Ka@nO+hQU9Y<Bupm#}En
zB)LIt&V1Ew2OUSHT(^QC4AKVk6a7&=G44D4YEL8WCTm@RR3JH!e59X2Nz}P&HY-~;
zH0{>bpD|_#(%=K=+3!^6zlhv5q-fr1aVUSgoOQ=xSFWuLa>&=H!H5W`%tB|_dy0iL
z_I7(iZ}ZFmj#!5z`ZuubXpE4WY^?^a&vOmEo2W?}WRgkH`j2c=8%w*pzIf-JGb65I
zSjHD<JR07$(V&hMw~p8p1gS&Rlhlf{VQAK@tkJ3Rjsoo+JqfDzi=fmQ$X|G7C{LMi
z7GoQRLlbTJy-&4oY4-5jJWV4<Bytgu!x#W{6{$X#ZF0(FgshUW3U_h%3X??9Z9doi
zmS%g0U-<fwc*k%Dp!TIInhr43&9LzF3wb5Qv}C6J=w1Hydi^SWRw!h5ox`kKKm{|5
zj-dYljY)NPZ4`?DwvkE63A>;l%+t~G5=az=9Du_k>55lxR%v9mENK?%5;&l@D7$j3
z<0>;()ijwQ7I&&4k%>_1-F@*{`gPQBt4RrD3{K=DIQ7S+PA+VvUGfG5E<q!f9+i}?
z<WexNyg3uxw9urF8}K(V?Nh^~+FJycIQ-R&{Mc{P=~pk_dnkmvSX?+hUgPqC+ltH6
z?(QblKErt;pbO?18;#lRiqSbVD@Np(>-L8+tZg3k{{WUlXanCBLsQmd(?nRcB!$YD
zmyChm+}6&crN<A+9nqXH-x@0)o7nqRON(K0`{!SoP%3U1Qbh@%l6EoTn_Jb}&Xyw@
zV0_9jN99TOZBVn%d2uT=YnBoJ0LwJ!KN{V%xwW;Ni;E^HFbWAEF7D!@)FQW@{JdeL
z$pTWnjyO-kg;K=wvZkE2s|uKz%t#I-W;y4sYDKqrF$>6BD~OIdkALx}TG&q>tiNSO
zl1zWczupA;`&G;DwE2EpMvWnGHw6JltxJ}rC83Tq?LZd1hF!QNKqDg`<5v<NJ(ktt
z^5IZ2WIO_T{&i+Jt(Hbxb!~$H?ri-{HLh&@=YjCCfC96hybohXFsw1*U$TXYEwNh?
zA;R@N{<Ti#3wY&ZloANscN}BrD$JL0t(=iuXAI;9FOMvC`kKkT)uo1EYXoNDq`{Wx
zk%-r}GxVml2GTY(nNk-Xe1Iby65SMb{A$d@?DOxy20xlW!{s8W+4*=`Zs8^}K1?6I
z{xw=%LTTb)@vyiu9l_fH)Nl{dsWDv8ySTT8AGH@;JMDP6Ja+n3R=xW;k{jEPG{y@<
zx2{i4y|Gp9?x&Iga~zPMkojv78DdBA4{AlZiq)jIn(i4IBn>R6hvg@x+>X3-s^4K>
zTLazB1|)6Za;%*Xy;T~&+8SwEF&K@2SW95B^lVmz-HcBVlHTPSFE4Yl3?4^3Ru73U
zG)ox%(6=UMi2)l<57QXtsw(Dlc3PTo#xFxnaK%h(lrc5{Z>MuqS!ROO;<?$G8L(7v
zeevsE*X;iQ@HfZ*033j}@Q#{V@zfh=qL4GVBO@S=zsnVw`#^rqKOO%7XB)Ald{FSQ
zOKE04PNN8B3n2vTEEFhgWaH2uLyxPe!CXg6E{;A_AF^wj{$0;8X4oms(~Ork$0c)n
z5e{Zma;O3g_!;#zO5<JBQI^ux3mGNj3xUU{d{uoRZpZpIqX3yF{^7}AsjKGI<3x^R
z;5Y8%D~3{krYq)U6&Gf8rztC<;&_L}8nwH|)7!-H92I2&agMkh>XoImlSK2~x~cOB
zan4xx#aj^A$NSwbQ8IBGXP-5Hi;u5*oh)n|3n=6d6Ot8~zUk}u{{V$$%@k?M-s7!J
z-j^?#YW_lqenT{Q>+X1~x^$M!GfQ(iC^3PvXFI)f=~Z1N+TUupNs=_&T$}}7oC=W1
za`#Ux5CIpEjSOr6+<kp<SxMa5D?u*aB)JmFGNEsk8Mw&ws8Gu>FhdIoGFe(No!?4p
z+sQOvXVoJ&Wx#Uqrox{==qgKSqPMz++SQou`P?IX@hIv@>_5hp)q_%7sr0tBXrU6c
z(#AH2ZmsF>RZ_zB?q!*0M~$Ocj2jN&?hmC|xk#j$rMD6JxXrXn%Yo39_o|*wr*C%g
z$pKYgm1SYoyQ%avub{OrKAmTzx=()`%J%9chBb4wfgi=|^!BBFSu7c5TbR&D*;tT#
z$G%6PsO|JuzO)6Tn=lqL68R0D0Q@~FOI;S$X-K(Na}-+;sKY7s`c%0^ZaX$IX>PCZ
zkV-%;yL5w&ohoF}f3y%=-N;oz%)}46J-zDVMHE(o1O<=$v}4XkwL=W>iGa6OF3Lxk
zTjk=Xp8FNcZOP&A^|V&VbmU0zSRXg5DfB+H%U?23ZKJot+p#hS19<I`Rp2*s1)UwG
zVIlSmGt(7*Sd_?<N`f<x#kb*;@$ZjHhc>rmB)SO&_3h+S%WEo36a{qy8Rz;^UcmC)
zyq<cP0xn}rj2`^=IjQU=+d9b%MZ*#c#<(7(vHfam$SuxV+R{V>WeGfHqnvg#E-kK7
zAG5=Fqi@WG(>OTkSFA3iHlo>KWcf*OK*3{8irdbJTimLl3`irW2l<*?t?LlEg5!H6
zd2_c46mdh9!qzL?+ev6v-b+s}E4fz~=iaEzDZRmt_@lDz!j5u1Df-5vEyR(Bj%k`x
z<;3cE9A}f*R0PNjX%qy;#QyNE3b%3erig5sE2edZCPhOtnDE1skMC5oSz1Z+&w(eI
ziI|=+Jq1ya%pfY{H_UKA!2+t?TuBtZUBts<pfT+@!+m?7YHBTun#SA?kdrKqRkM_K
zA1PlzJ!)Alo=KKQghmM)2k?RG_}4cNi3PmP9N@7<Bg)Qj$GtOB*QSceZUp<3$%z46
z6+VP^6niOLJ*qkzn^hrN{&@W0$8yGTk=WID{?4#x6I=qUM!>`GX1VKKLh@+kkicEB
zx->(A53YSEdxz9-QW^Ca;==$*9Us#IsZ+L%lImZfwEB!T7ZQtjRhwwcs5w9Ws;wW1
zQai|?XnxVZIE_!-KBlu>FJfb6&Rj<S06(exeJL#Ti)2fS`-`$C4~X_~ai8T+l_DJF
z(6e)`2(AoG7zDS>N#G8{+L!GX(#aIQa;Yp;=8*N{fGVD>);ACnZFP{N_p)a^{{VL$
zwN<s2!rP>K(HA~brgr}T_37H;b2U>|5k@AI6kx;@KAyE-UDsDpkwmego}OyA2k`Aw
z5ijl)F6AVwu0d7jXdR79Y_K)RiO@5Vz$=gd^`&bQ%_pF+N(AORmkL;9xL>@!f}a~G
zoJ1_7o+WN}wm9`P>+1`Zwf@pDvlZcXdUVgQtme42b$3rRkiATYgXxa+C2==rsizDQ
zPD~4K;xtd*%ID-<pXPt1H_2Zx8KPpOZB-4-WOo%_DTTy>12|<M1CNy)d)A$$g}k=T
zQt%Jm{K1Jl4&e5wZpfthie}nL=PJ_{k(3ETbG3VZH6Pf{U&@1Ps)51bMt=4`rCOG4
zsUda<>VUx>F~0|qnyWse0f<Tza>TnU=K%J_3AQK7iEZYyvzdP19`tY&hHP#=zSNf<
zD!hpr%T0}g@;ujG7tm&@YBum+TZxuXva4VzZb<j7T`FJnarT>3c>2iF0n;5tH_DaR
zE4>VxTkGH!*v#ryLd!62BR@~+ThUsZ+cmU9AY%D4q5VMbRW9^vjYXOZ3r{rl`A5n@
zsr0Q6U%tDGPKIZ+!RBI_3P1YwGL(817_{ukCew8El+7Zn&Zh{9NCac4s)iUNOjt{U
zl1L<!Vh>DLRVJIK>F{|`PVXv=G>S4k$JVP}rLy8*vY9p<szyNkdRA(wqo#~oGP6iv
zie1jFyJ%cvJ&3E)U;hAW86#UbA-G%us-Z&T__0-9SnO_6;&Hk*!m$_*e;-PlP}Fq$
zdq}357F(P)*cHC=_F{Vqw%Zc4Q3TiFWm_cq<2h~UFi)@HNj9*HC)={JfB{kmpvNBd
zmfGwxPP(j7t`zMNslbo1{Ocy?QJH~>3lbRN$oYBZwTv6w!c~&k*SYa{ggnFL+%o1y
z<N?rDE$51EWG(XsUEed~sPw?;RU`zwl0Q6xN2k)3J4a}Wx&~Jm2Nkk}B67;DNsFjl
z%z#W~E9NgOtZ>4kw7Pj&Qs9zQVlcfFRgqxjS!HqdaDb4*?wZxnG?o`Au%vRUs5xch
z9=_B{QHm5{IkJ|Y5WX@e+2v@_a#j=bA78CqeJ&?fpKc)_D3g9e99LQ4-wfJL1<IX+
zc37YpY<3kMt)QT|n%*llj36=rk+gd8>+4*S#4cm9ICi3QNufNl!yt0oi3${OqaEtN
z(}*%$#S=FHe6z?VwQXaP8R7d&v?ZGYWf{Q7^R1Zew5e^C7lvH4a%bgluk)ytW@{P<
z$guGI_jb~GR>UzvWb+r1=suMP_B*Z8rN!sk3aH))A%2*x6ogyaq^3!vmKhn@!(cLd
z4?$Pp9#z=6iVr)^0PRo;o;f`Bter+`siM86iGO)&-`P^c&f^mxk0hw+kEIYKvE4Ym
zXxipK^?)zPF~H;2tlAm0natMlykW^~XQ$BBYl)(Tvou8&zGqcDwtI@s^0{p!gteOH
z6}XN&q+;NeEI1iGF<bg2j+v?3B13ir(KhBr83g)P47P|#WR^Giesi9A?M~BT)HLg+
znQzgRq6*999-fE%X->^(3v&LdZ#289;PNoDuo!jd4_-Ygaj09WwU9($fHSfT0shIR
z>GDaf@V8!bDtyvsI0Ln7XqpzEs)ZNMkpA-?Tk*Rc{*{wyBSpE93=>J_UD}~V@0HHs
z@8~@ZSy*DYgUYxH(nz^jhf!AURxLhBVUgLlJ`tlBQS54rv&M_^C|8}f6Z}LDe*xBu
z+<Oj@*4<hVr6h(t?2z$;Shsg@TfA|->`)dtK*xqPttqr%P3lUiyMwz29sadaYik)L
zb+og>!UG8<0Duo0aauvxnQfuVPvUKMd+)GXnApt4Ba%RH2fz5%ZT*g`Z+?)=tH*NA
z`y^{q%wToN?e(t8>K!UoWt=aa#?!bi!Rt?nEMb7zTIpg0$M0ly2hGo1epR}tmqP~$
zJ<J$<EMSN2QpU*<j4VJg<-K#<(*FQryb=HchXifN>*-x2SJ2HW+o~(92nxmr8T9(n
zTUu&2(hFqLnpq_|%b>#Zz|Ajc#;GG7-$I#?#`b~RJESi7`E$Wu!mLb@G;edK$q888
zD-GMXfx!pRdRE!+<<6fYEz~|+5Dd9~Kt7dW;?T6cKQ^|D3I70=fxtdydyYM8H#@S_
z5;0_g!sAXi3uYx)^Rbn?_NsDRp`IA-H4z%4aM=5;P1H5JD{GQ%3L-WEQrrVoZeeL(
z%V_dsIYNJ(QiFSv+D7y`vqFw9BlDEtO#43Xq59NUn%Wp#!qK85Wu;&5b|cccNUrrQ
zLFKTMR1n4=Wa@gl=a1#mtSUy<`z{9fmR-`uq~XZvPuWMPy`$(^x$*7Aw6j8zlIs}c
zFH!6DHA>@K*DoZF<!y5cIAa0(-=D2cvuV*-%Pqi-9)FS~BP`td<E2NZ_@c{AGTdFo
z^QX%bhX5u!k&4klFNGPo-Py7|H^bVlp?f1<+D^*v^Tr1$>c3jjz0>q>3kcEDM3^}y
zDFAJl>_=l%AIEbvhUdfjV+S#1LP!SZ?)g8;vL}N2>TQpB#(S1H$v9r*^G!x_dgv)i
z3u5ipiOL@}riMU``^e!<rAKB5`c+x)bv;J#n{-&whz26O{c<YqkKxOC<VLu+K2-kz
zE9a@ldeF7d;E!+GAIgp}#$Pi&xELawrA{QpPDeckkk?arGTm$lGv-RfWS`-twwRXp
z07%>2d6%9FS6Ovq2(TvBSe9#b`9rQlXScbmcaCz2Br37_jfW*cBOQ$>)aDzfV?N%}
z!D4HhJCNlcHtq*={0u$4Yf8#Fiv$-D4l>)5mh~R>b5GD=o=D-1QBrr#0OvhP`cp3S
zm^AWdg85_)#4bt6J@7p#IrBRLg^Ds>!qPp2VnZnVj4(mZr}E~hO{eO5hEn1w1_2+t
zZ<L=?SMDdUhA%UEt0=&boK-peNMliMlc*>O0I%N7TvWOfCmyV|rTjX+no)avvC4~r
zhz8S>+O_WdKWkvo+f8ckIpt!Bh8v2)(+7;Tm<`^Y1HH5^3&|UDdFS%#YeoU9HTl%1
z%M}<8j(~B;rA)co)t3%bv__S?kr5GtnHOZJv5cto{{ZXN>F#c?fRj`UD@1n0kfzXx
z02yyn?^(;K>2}b=J<Z=THV`K}#yx7S^WD!L$O8bpPOrf${uQ4qlQri_8x#18PPU0*
zWmR~|K65a@80de-s@%^Qfn|zdk;{;>7B~uepVqNIv!76vu3fi?)GVIErakJxhSDhG
zDjG+P_(mit{3*I|LiUnoj*qCd&A`*<i5fVG@}(z?dYVae+kHaXeM3vWGGl@^@(4Y>
zX|}qhgi_r@a>7hRGOC+?Z$s=os=WR&iq16h;|0Jwo;+>Oxb0KREBmN9qL!trEdj4t
zh14Y^>?X>G_9L}uL#J8kv9tg$JncM{{A(T`9Hj70@ou<z5EfEK;B#5}q`INESc(8{
zxekQm2b@vKHtfmgf?6F#{{W6*h9!YnSxE}gA^YHV{41E(JXfvVPbH;@Qv(j0a!07m
zR<#paI+w#s8O%z<klp^ZYz-_Tzmx>CN%Mtmqj#=5RmPlQshp}xMRm8oy|$HPxNWF`
zoQ?tx<36<$HG;RBWW_@!K7YJTS-QMSgDtWy)!l;{j0OJy6It(f5Sz#>$N>3{G7q(D
zt21uI(n&S6U%Q?#k}el==Lgs8QKW@Ol?=o#GvzTPvF=BuRlECPm1BumM0vyasZ}G9
zgo+q6eHb<u@~W~#U6DFXaIY-eq>V;$Gsojp?jfEqC6_)*HcJDHR)~bP$^{Q5c>zA@
zC$XvLvee2m>Q-Qw<G>zP0rtfl>MS{2jNK;McSpFFAy^O?43Gi-b*Z4-rKX~nh7a8U
zcNs_^d;MuAj>^^oX9hJZoNmU?UOUxoQ^a<bk$G_d>dZE{>C>ncH|E%C(OR3nBhxgi
z@h$C)3ly&q1LeZZ_~!$#tflb$$Uo9hqsX`*{{R5>s*(7X@@%|eWd#24D)WzTN}9u4
z)pbWA3s!W9e3LgSqtMdT7w*V(Pzyw4dDQM)D`y8k<3;>ZT%nYe+!N+?{vXHIwr#A|
z-gxF~7FpQkR$@MGKJXodPQugsE$kv_*KEFKcq+v9G`Z|rr`+ajwE3=aD#+{;fXmMq
z@9SD=rpb_P!(k3piv9E4k3m;Y+hUO*mH?(E$X%n7d-2=auiDw(>XYoaiYaorM~!wW
zdgi888BwPcP>M^YhsbDFH)F(v0vFW#Rc03UlHzt&c~F?7L5`iV>st2^!DR=S^C2aQ
zfVm`ln$Fg5Y@&>dNda#!=0+Tketl~I#Xvg0HF*^666_+@Ygo;^l9$Nyf}Y*6j+EH%
zt!$;ZmhR{-(TK{vRF9{vb8X_Q=p!)0BEOn)p%(*><yBG*Qs;8C;xgd2NY32*RjMy`
zL#@#rMxo=tmSQ`5xYi|772)fS=j-oSw>~V^E_R(g&@5cWO6MNGiKs1nGcu5pIbSfG
zf;#8DX;^4JP7)<nU@#AFtyQT&j%u?qCjQjAZ?w!_CX{@+bA}>_^!teAM0lBk@?0KI
zu01QGmrRXTKP}c)Z<JtQ1MN{mrZ<}?QL;$Xe&~(cs8v#02eNJIXOpVVV_iHV?L5N#
zw1d+%qyGR1ma7fCb4xFt@}2Dss5>M70A!K|Te&?uRmk+Xpp{{`vyseTNYO=&#Gcvh
zS{8><g7QY0O8L7?5RSR-r?BnKWh#%MtZDZ$EPOR9p?j2F#faOESL^RvR$3jR&X(d}
z9!SC#enx#j?NSTV=QK#5gaAz08CL%9v8L)5Hg^`${f;a=L6>Ilm}mI2S-H+k(lLy7
zLv9V3jg7nSmNFEn?~h+f$bDYyUwxX|<SA^n=H;2YFS7ptT1$EEe$2957f`Q{FbtU!
zJrDFXHLZltHsWDYu34ia=LzaP>7{ML?d({z*Dh_~SrX`#R{4qy6>j3BhVtr36>cqj
z#gv`SK;(TYH@3KV)t&^F8AjGI{JTB<&04jePP2uli5b9*?B6DNUNP<UsM7iuXJRRB
z{N2HUj42tHIKlM#)}(gUP#{3TcXcC>53l1`7dnQYaG~wp_sO3uGjKh4{<PD6@v4?X
zwaHdOPDsaEc5I$xnbO1m00{b{!>TlbSqI;D!1mfcovS}xyLFL~6rwgZL)3x&?9~CO
zT+1j^ADk975Vt}&=yTWWQQc}$UB=*D`7<P7T!}_@W735eaXBj#C6>|dMDogFBy;n8
z!xZb*veYgTFSKA_802jC9+fV+_6D^dW-8N_QfEQI1aJVX!yM*a^RpM)04O?RrxmhE
zm^n1dch;6RQj0k6w@N@BPB3wgUiAQ$>e62{Uovm`V?quIAIMZ6Yg;*Dn)7t5pq>XV
zf2CZq)7E=Q?iy!16dW<&5_(l~_cObD6-@UAIU<sAB1nhK^7EW`rc1I*80LsS50M!-
z+A+rC-lCe^No(gNyDDUbY~U*jk=Ehh%1<1q(F3%n(>SU~mnKASCi%$PWqc@<oCwGD
zr$sDrNX}Ffv;^8t-2FXjw2ZK+GA7n<l}Az={3#OxUoBq^k)C=VUux5l6U}1w^k`Yk
zOj~}%S3h&qnyY^(4ZPf|;QZS`?b9Zf&KZKEESUyOZ#;unUrt!x?E8?)&I-gmO(pKJ
z?qgaVN)<8|0mI}Fyb;)StMM6fMp%XUn{fUwPhcu*+sN-E5b7}bO&k2p8UROb0H|(n
zY~hvVW%5z5B9DGZ$Eog5dZzih0!a>@BxqzJWkDifDvX@fjW!EmeH{9PqDVmf{?C_j
z1M~v2kBF`0l~h}@AYYt;%~-Ox)pZ$U5uy7rL6+Im+v;gF($sNjy$yX@??|0i&c&0>
zQMr7+j6bbVo?DAnVwS8jxzA?$dRDEkgd}L<Q)wh>tam${G2@JSVy!=itn~Y7CAhd7
zVfm%Y<PdsR9@Y`j8*)jQ(CNCI;G2tyK#2ntQIUh%uiE%ZOMf!p+Ptsjh7p!OFg^M0
zPP^4@ZRTGs@)!@9Iu1XTUWZeX>Uh6=t-v8R;9w8sS=F6Hu8WLfIc=nPe#Y=cZ7EPp
zix?hY^!60Ck;!i-+1a5ePtB1{xQ!)qbsfPh!E(nuW1tm}uHPVV+H@x&fbz4Ft&V=2
z)->-@R=IA`=ye9($S^jL;!wP%?2La*(^prwvXG>W<=iM48@W+jexGZqUqdrbbto|W
z%n|U%Khm{f_<yTB5j>MjvANwFl1_8i@TWR-;{E0|IW?j;pH#NHVE32kBqwZ8jsmFa
z+5RGP{Hs3d($>=Z<R>pC;>*bjJ-eE*ZQ%Qh2pOl6JEc4{dBZQbJ*d<?IP9_B`RB+|
z0162>$Lm=sK|L8(lUj%;X|FbU{$jG`JoSX*zo#AP+6B(AEZ$|eX$m_W{{VXjuhN}0
zy{)N5ia{)oz<7_{2l!h(>U6zThAC}kVGKo<NPruZ_XpOdPU}LVtjlw1LheWs-bj=d
z#L5RdvHdEg)4jFRqDow{fUXZ4yZ#kPui_3PiIOz?z_$b+T+|cltq^G?+bAo!T}KV<
zJt&PUy+-C*I@Qr0T1w(HAfPBP{-gf@uT<rgOfy-_I>Z|-xrxAI+N&S8-zrK-`!l}P
z2)JSFO<1t--je9atm*}tGxDKg44Lort&|}XK4#8#=S8}_pUIVpM{F|3oDYAkT#vzj
zU_(95NFxE%ka!*aYkO4?+sv^=14S0lBXBYp`_)->%dvB@uGTfk^JSGX03ARdg=(iZ
zv@&plcV^dwbqFl%qXOLusQu3M2lA<PJwpD@RwiAIa-~{8nOM)E2dCD#<<@Od<lpHR
zX@I18a<?V=5(Q>m>-RUPMcWvh=kIg6vyL6kS1whf6=Ppe)gJL37V)jZCM76&anNHO
z{i~k3xwy5FR`z|V8hMDJh{T8Zf$U9EePZHS8b%*=u&kry1bS6g)Wjsn@cGKb`KWm#
z-<s~HML`^Mt;|b(tHTQcJZ&ohxtn$~nx!_V?!cslW6oGH>FrU<mU7<4E$2VH<7*u4
z_Mx=<i@AhL2FKmP=kAYFT?r$V%1w-koPi8#c9$iC9Ou@jj9W<HTdVCS8%fEl@pwL2
z<7sW?`GW)iNsOOgr7Gx_+H9<{ONlXsQ^{lPLz*0E$&hK<eAi^eSLOtqFYvEy`_}cY
zn{0qPNwzF)Dp>v`)q8Cs@)TRVMv6#X#j&5QZCL2CUI{Jd3vSUUa?jFGc-!skn&qoj
zDQ<Prr27nlO+GuApfU+^Gb4rLWm|>fVYE1rTPyM&SKQR_=n`10aa&pxk2qk*Bxl_I
zm7!^7i3_y$>KHB+3gDlquRg6*-iKr$($vUZK3QXu%TtvAk}wbkBO^Hk3cPfP=Z|Im
zw2a7pWsu=;I0qGG8|^Mz8;db(9N?i0AE`gx6?Vej*`fh%mNiuY<C%*yXSd;4N~5u=
zj-(dwKpF2Y;42Hou|o~OfO^)ww!Nf+iEXCECDSJD{0*RR4nL(s_Sc3N^6uhTOKl;d
z&VH4dc+lD2d6tvzkb#+0aKG%4SwDG~vCyWOqe&9nz6n`3@9CEG$EUSZy?ovMt*$q^
zj35Vv{41Ha)wR1_QSIUjakvjDGmt?%gIjTH8kO|JO~2EX1UO+RK%|5GC;VwTa*Ny)
zqQ$w^tTbqpEXqhz<`CHjzvo!e{9*eXYaOksN_i!^WcyaJ@N(;#Ot9PhjrM}ZNBN5L
z(~5&b_(N*9(%eeH+BrrBep8;{cB_Q2(NCXNOqFK+)0EUaTjG6rp-n#0WHLG4UngdL
zN2O0?@Po!4BaS=0X8K5C-hATu!Cu%NroCPbGfx&qQ4-HIUnF}JDfS23-lEknV3Nge
z(H&YGt6K)|(BOBW<6IS~#UT2!ma=y_Ei>WwhCD3>O{)cU3oFSd8;5W|rCGVvd>5m)
zovN5j$;!yBfCe$Z?Zrc=>00lIrdX|>;xJo?#Cx`nU#&v^0TwbBy@@AsysIuZdvo5S
z+Nu0<A15xzSbiX1YBvzAjiRhY%K4!DfqMq`u8U7yN$r8Uok(xJ^71PqPtmm1kXszU
zikp}y`Eoib6{!xTZ=_qZ!8+nb`PKeyxcd6~Ry8?qXro9rw<mi!?bJC4%93wmpSlmH
zy*dp-+Iy*f(SExe422&ucHsKfP1d<PnHkQ=kIj}H`_i=fV@3AAwJSE<s80U0Mx3NK
zQ6hW$)`C`o7@jl<^2sONf2XPTs0GqX8d^nZ<&apjt^$%zJa*=@b#EM5TiNcOSmj7^
zRab+aookNPJb$ZdmuBA1;Zhf1S88Je)84x%;U_hz%~KH=z0U6Y#CjH$XCu$42bZFu
zCm{D8mCS4Z01@qM)=O(d%M~nS3=Yq1*Ew}z;wz?cc?7!<1_czHuYPJ9KMbsv@<S9)
z<Q$uWw>xrse}#8b!qKMg-Og#^D$7JWS@A}ztBui4=vfBi8=QmcDVAC|y0{ZvT(V0j
z<%*IC1Gw#5niqznB@*csLjC!ZgSVi-twBDOWh9zP+{fm$cmS`>j=Uekn%T`qNFy}~
zOIb5E!%EZdG_+~c%9bZ_<{!H1IH$LQV7zFW)%Q&6<|bH`2e3YrurkRqm5dM=tZGjU
z>}#RY^leI86LUO?3`^8)`PT=h)6%f1R#4R56r(LHGRDOt7_~teDYk8kfHD4hR@H^3
zkrZ(WwC_Gt%R9(_U&5kGSz~bwP<f|@2zbEj&0DsP6nPTr=gJ5JJgvg=dJ6OERB~r*
zV3HK*ng+C5=0WCu?_x%+!h7e|q|^KZcWWS$((Ome7C4SdmG`S&9<sO9%gec9f+;@w
zgNFd%k&3x*s!gOZcvwzjl(Hv4!_u&GlXgamG2NLK+IiD80(AoNxO|RI(daQ!>eq=p
z%_1Pf$K|n9!!OdS>UyJVI+&58W#e&)B*8w_N&G=!r9tHukh@9Ih%CQc^{P;8nMos|
z(!499-CD@{h33>`=^*)!9Wz-sc77hRc^>t_iDC+|sle;bYb#UuimIPuk<_#DiyL%P
z(X;(4oBMXDtVV|R8N?CIxyW(@u6R;<{uQM>Jx1=`k({c<EfH&9@oj`!gfVz|+699v
z8WEC7{v-bY*Q)E|-FoXb@ZSb#qdsofxFqq<(zM~xwEqA!%W@J8&OE|KNEqXqT~2E|
z8>qCcF4-OSZkdF6E$fc;)VVgX&+k1<%PTpqXS2T7Z$8wmI~9#dU7UBVAMHD94e>@*
zgYu<^&7W-athntiq|{bcMiCK^`-T^<Ja_F{R$6hi9$oW1i86v%AjW%r1vw-N<A;cC
zWq&cW_JxVSaz+^Yj=<90UHz;)^2~xr-vA)SKA?7`u+c5`Ti_wQjpSzXgpKlpgZD`3
zpL%VMi8bD$_V1>cB@SblT)y3)9{q>brqRBG)QTT5yv^6al$-!p?vGG?ed|Ik4^X_Y
zYj`Xj*LG9}$v<Cehg*LOX){G6z9NJI+gEN%j1GH#6`4Q9O>azQZ3fk{hYJ2!Wdqda
zsZyy?dx)1c9nOvXHn6d|)b83fRm<#b9w}z=2ZD5KBPOL{X1G5rau>p}^dl9<rn{<Z
z)^|~A*X<c`xh{d~bJLEawOP8iw9>XVvdMWEm`fx!%v4A*!kqsA54ANxr|&Uy-(v5G
z{B;hm3s~s7FpThKd7I>kKdn>HZ#59*r<pM$kTSUWM}J{fY$MdJV3OJ$G)X1MVv)#z
z0KHT(^yyZTOK3D<71AHJ1u@TcDuq-8jO_!k<PN75riobzU9$F>t64%bsHC!6oS7U*
zai347D;HCmT|^Yqbh(xpCS?=I`$S{=r}|Zd(r@o9H(1T(TC0@>e)}-&KD7?3<LLCe
zv2S^$s~BR$XmB^SIXS3|WaXx%N=n+1TWOcKS1i|!F*)kTCM*naKPrr>SmGDAK<g&v
zaxww!^s4Xi8#*MGmNG1Nld}nBARWkhCr{K?N=vV5Go{>il6gV4N#>3ichC9FYN^Yq
zi>VvvbkcaCB7%8s5XI%ixL^Va&M*aKPpWI0<UVzilqd;O#{)gHj?`NCMmwqDn)_2w
zqFni9h-`XSVl6c70bT85MUHp?Mj$tq-SAIy+*C?b>FlmlROh+Ej}B_rE(6WyM$MOz
z6P)+QpsvOr3V07k)6!*z;ioH=V<9D*9+>DV#+wbxd2az|qGQSk!O1_$thu`m+u0ax
z#G}jPpF!zaRIMo*)1?^d%CY!;t!$ao%2tyst0Nq@<5r$wqQwHhvCI)k%BS5p=Ae@L
z*`sTRyaXsA5Ds!UEHlu0)teQP@?iz25{W<tO}r9&4@%2@%~H0-wbg#pr<ruuMMEB0
zOK?xnbvdqJX*c?n!#1HLyQOSDmBQ`*?;Y!;n?SU(y^)8OCb#*S6ypH#(y=w2TT!yJ
znIX9nMp%CAC(jAb-X65zwa`;~Cd)d8tz}_ubo*(QE-k=SW*m`@0YBqZwJlydB}v5I
zYg{N9Ae<069@Uj3vFfsUcL?$VHpt<)C;Vw9(=Jlnq}M(|DBN0HkbSG7G|XJxv@SKp
zfV?_@x=104C27o{u?^?|?@;T0Dbh5%pC?YXmhRxkm6jv-i5cZjr@eDJw6>ak*OPO6
zQYSfI-sO+IT(QzErzw2})>2XzdbiETITgC46|30E)NR=m?zJBgc!|mzxZ&ELePaL*
z_HaAZoj=0c<V)N6cf4!{(4+|)`=++EjW+5qtSm%ANlLt%RlK#&Q|@bYX;+a1f;f^P
zE>F&b=Hu^sQk8WLB3x*<tcqGADTC}9suOG^&zA~-z@L7?hSDvPWweV?jDX~kC^;+G
zeie7@&jUp?R_(w%kGjo{hO3J^i_tVfbx8bxZKh?;=`+qftCh-IoAM%{w~9N)w1uT}
z<^0Y3IIT@8z@+fYdvNz9BP1h&0uJB)s?yQyyga&6$m(UeMa<5wcs&6l)7qP>OJ<h-
zUZZ-EtSlHQ`AZ*6ipj~z*%YFpwFoquU$XhvGYFaAYbhkEFX7&+YrYqIw+(YT6BZgD
zC}Si2qf~rB@ha0zyb)>oM%bM)v8;iJ<C1-|R&72p!K>JR!Y!w0Ec48PUg;1K0X_NW
z98&gm7NO4u>`gE&Gg+c3X(9_6!}pE{@p=z>rFVRmaS3kR5UqvmLk~)Z>%%&{s4wEU
znIuvcR$Ssi>GZ3yXtu3vmb${LxqZ+@8NeUy=ehN&_g1Vu=B#61_=8y2C;L8~C}o&n
zh`v(lJAd`7V@1;DNJ-QoW!lACc<cDqy}kB{rWhMe(-Gy0QcR3SSa%>}k4mpTq|7CW
zB@xFWlChDVGtNEgWj8G%f-&WHWS2>672>s|(iL=A+@3H1s>14PbuhtX!CA<82?rkh
z^r#*i?N)0|A4;FkR+zN1j<Jk%{*`l3hwOQQrD*b?1$5&c^p=~AyP5M`>Ju|<j1>v;
zDF8D8{6P1nS!p*=+%@F7i<f2n;FlwJ)7VtaJZgN4iB?o*+KdJ^`mjB!8|_MaxQCY!
ze=SULs_+<&`K?vV-GV7Js~Op5j#JUR(D+wx^V*-N_@;Q#thD)}hBgEDop&}mdsZ~<
zF=a=(D;Q0!85sr7UVBwIzQbt<fu{j7LaQ<R-nl*NbxA$U`K({mHTk@j7YfgA(Cpj*
z1rOBssH2YKRgG_w)-!J#Vt0t)p}^p`sWkz*u#Pv93B-~{PnjP4>>o-?ol8(hit5_a
z%ZLD4BBKmDkUf62r!BT2%H^o^D@fKqB1K0+O}y$!2v1$!rjH?^m^ig}kc>JLkid5W
ztU<3>T;DRxn-r>*h!2~kRn@h~U}kH48;Bn<Oa0U8eH3@8wAo3;9d3i8=-ObC=USQ4
zN$tRbHg3e^<M6EQcgEUu8Me{b7_FOkn8P85asL3<u2ks$B)rrb;jSl=IS@!+aRJHx
z=+6u3TUrl+ZXvb{eyZ;<Ir(w3zcqxZ(~IVuu4x(0O3_ACdbfzR=lceqa<Iod#4h$H
zW_<wZQQv$z)b&kA&APa0<b;0iGzV$G>G;=ir`TEM8ykq>i6Q&as*T4z>TBT~9#Mi)
zV+5&q{_*!df}!GhU%HD}er4}7m(p~xq@wC_+cOU@W80t`cH`6A`c?G2jv*RHCL_RK
zI5y%3W9n+e@J%JV+!D~r%-<;)4hKd6cJ`|G5W#OSkx$QZ>V-hUmd8*r$4be|pH^Cr
zDzYsLI|(%hhEVf1#bLHW1ZS~7UrOGyu|uY$K74UykC@867u&e1c28zs?9sRm$L4Z(
zbB=hcF=?%HAd1pfnn^+PB@9CC9^I=3&7z9ezG_}1R#pZ`jGrNh42JismsTvoCN{Dw
z#-zHdVNQR%2U?QO7qh=NUP`EqK;JJQp5nCaH0Y;Sl1s&MbMvnQKA51Sj#+d?iDQP%
z(h{;UGBV|uxA6Tc&7Gd?kpe7=a6@w3ai67ZHkmA*Ud9`coq&vh$Guc2EYP$hEz>bs
z8+KGDt|&-NBqX|g5yH&UFYf>hq>yv|6%F0)*$c(FSvK;AkU--Ulfw5QnI&`$!RI{F
zm?I~iBn)wgvN_1^KgOCuxob#ugHniHS~PIWgLGJAus?eqpHEtu?6laf$$*$c^;J8J
zW3^|jx93uh00)({7gry6W2Sv-d)vv8iaceJfKnsCWN+@b<@nRs39ZhbXKiz*O{-hn
z&e0Z3XNAv0o~?n~)~iErdo9{XZQo?5KF_z3anzq-RhsE6ofhUENy}t&k6MFK@y4BJ
zWcONByOc3kk|x~w?g#g1jAb{X6PzNoH$3Z0HVH9pz!M}y{M&oBJt_;mX3_}4+=9i<
zW7_?A;2%$F;Pu}c>6V1ecX1`ds^wlOzGTlp-oHw~gI4ixil=YveKzgkM$F+rQdj%j
z<AM3tL~xRS6FJ@{{{RX*%}>SfIc!TB7;>)~zDl3&u<UAsc#`1SvA55j<=u;Xz<Lj1
z^sJ3L!xw=K&BT(qe5oJC2Vi|`r_lZ$#bq3GO)r}xjzA<89Y+<Uqe7H-Grd`}8L#!L
z%{-;8nZ?XyUQ}bT8`O6dZ%FXV++QZAs3elKartQp_4Eh&*I#d8r)f|vrQ8h88*xF6
zp?}2IR;6)kbEr6to;Zt*#dr(!_pE)b-H~dQw=P-Ui+Ey+D`tha5a|B^dn2(mn|oz*
zs9YHu^;LuA(SbQm-%8cf<5qJOwDI|f0TIc|DxUfEsbRi?-^`jPRB$#(WK4%&ZYw*x
zn%hE}SP0R~aL7xhJk8%K9>jaq;*e==6HOv-AQe<R7ROI&=e0i+Lp!dYr#W^me8oB2
zgWXSapURR8-9SW4us6w^<Y)5tsc@47(q~b7Ge;8YW-x7}J6W9Yq;(ZiIef-@fp5E<
zv}kZjj)t?Mml(Ed?=d7lBu6Bv?hQ3{D?4kIHwn5-;iD4ZGWH^)*|NE{F0AqDC_=<`
zazA+31F<z-uh!7UVcmlJQyibKJqNu(_R`8EwvsX?B~f<dd*+)op&)gfmyL!Ds<_|m
zK9y00gx$*xv0;%+aR!Y`F+qZJ(=^td<3TFpVHk2p%;VGPLbZ@pn&L)K4%r}A`LXMt
zUt>_s1*Ec-y0{U#o#8_sM`7(+BqAcy&3JQkM#S2YmHVLd$?kpYPfXFnG;H9e!N_i(
zU;e#S5&13)%!BPIh?D|%df?T&y;jn~&0a9%B5l~ml5yMChkk=j#OCVK$>ME7JVm^g
zBaOrSDm_cb_SUxl0NL<rQAfSl+gp>DBOl7SyUl%WFO9bRT$qDIu0HTQV0Jj~>5=PM
zWo~sXlV6Bk;bK*hc4N2AT@>g?d6~+q=xssqB1s9F-AfVkqbd!o!-A*Mx&HtWO{r^h
z#P)Zq8(gl-$X_g=A5Ph;_8u9HfU_`!jx*+9u>te$IW^GeJ`spQsRAn*2`qZCKA%rY
z(p6~D+jBJ<l@4D*@b024=Z5P~xm-X*Qj@?r?N+S58QXbsUf-m%yz8=H9P}rrwR#Vm
z8XvOT!+{iPLF<#=p@!vTc_l#6zaz>h0Uq_oEOeg7Lc>LFa<+aPw*)}<Ke~;4xR4wY
zJrA{XpV_djg|&sUNA_!33k!7^EaY<Eo+@|K^y`F<d7=QUpsG9LC$Z!CR2t-WnrL^r
zk|@^S=9m4TdUIGh^Q$GPq-n+xW@X;^izIiuUC-|&b<R2Gis$uxT75J%!d$p6;xH2+
zH`I6asV+6?t)>v%#E7>WffDjpo-*E_N}AtG7i_*(qO$CR{b^1ayX_r_$6D{ExpikG
z+m^;2t9Rl{$Ue*?i*O~DLB{d*{u;fZ=@VsI=5UE3Y$jq!4~}u^S7Fg~%PTT;_+13V
z`J&<XZavRF^pp6Zt!*C6+QD;jhXG>)4yT~UVk+e)CGL=-qVCD;8W`q^*v~7ZQJChA
zU_dAMSRUVxwlU6n3r`jcdrz@mJ-3}0#IfxFf!hYW?(f7mTC&Sw46?->(uKHI7%E3W
zk@Wp4&4j6POB_ASD~4|~@2_F{eiVBI_ZqEjj)z$BP2{mAte#|0N0AIHzcR4uc<N1H
zTwdR5K2@5AjV33|w|~Eb$T{`(s?Vw|lC}1%j}cem-#Km$I2|hK)@>op#BCgRE%LXR
zLv0<H4%}9;f`-OYo0HU{`bznUc^r=%&<`;4%Z`BhU{YF=%`6tP#HLaE!m)-9bNoNu
z6?$WFG;erzPV53l6}a25d-~LP@?mC=Puj#_B9J$p<a&K8blNd#82Xj86I}tlAi4w`
zDIDXbaaQf_WP-(RH1Y(9&eBOU5F{VnKaWbYqIi2yyuN3+MYNF@d~rNkX$F2@o71o9
zTedzCRlG)QIUh6mfb3)6@TDq{j^l+n%T$J0wAXD7#+z>-#37z7*<f+h8q>G%9Qu(-
zE<r#}S{7bF?s%)3UXa#~w+@QOc`nhMd1IUmdRIqpr~d$E+ed$UKGc=4ia&^+LZAM%
zan8HHx^~l}b?+Gs;0MxU3u|<ercae3jF1mITY;Q*J!;e%Rj-*0mgvmLb0QOjY;o4E
zM)KJu%n&miA$f_$5R<?j=9t%Nh@qxdftL*#8+O0ev2$;8bqJyx5gpW$Ln??Mg-MO%
z=yGwlj;5p*cRyv^()ntnuvpaP@!S#8ppxxGUu3vN@)YM_I63ZXJ6-X7mJ&jnJiB*)
zmDFd<Y;+#nbflfZwG&Eso*B0*1qDNe13Y@xbo#s&@x1b0p-kc<8t!I3qNpylJ>{cI
z8!ASmhi5#Y_NPU1EaH#Nl_f-S5n(_u4^}?ETB{j3u7$_cbr6Nt!bFA@+^{<jF^TGP
z{VElf_E{E7a^a=Qvbo4%+<FhKXzA9rnuKyiY*lX45;PJq{pudW(x}}=vAU_305Kvp
z?0pS1)x_Ji$l<p#O_&tAsSD+=L4nZJ_Yp#}DYUv4(l-|)ZsEY-5${#!)glO&H{~Ii
zu>%dX0oak=qyE<@@-@7u+mtK50T1m~pxK`_nW^^aBu(&TWkn#iHthq~=~=g0oM>&N
zXah!MC@0&)6a6bcP}OF>glX5eXd>K1K?lzu?xc>wocFNV+a<`ynkCpG#!#<j$7<Fz
zwA50marbxEZKt)RjlhUQA!!^bC!X2wQcJmQqS$^&fn@=+wY!s1U)Ws>xE4lu^M>-H
zUR)9B+|hYHkbJv)rJ4yOm&t<?;XKdo$a@pp-;Uz8P)nhoGi6`xJDiJBxsF_fErs6x
zpM_e|?Q}_OV2bWEYtK2OlJK@TAHqgB#baIS5!>I-Z8Rk%v^bJkSLH%ZHi6vJVAbXR
z%GnN`DV#{nEGVI|lhmHvbBftS#miD?H3qcSE-h|smK>a0T}$&MOP+AO*pJG(yIp?P
z$3VJ65KO>!%#V}F<dOQ<5frjtNi6FoBoTz%%YdBy-*fz`Xr|QXnCW^*MQK1u-f^6d
zP(3)J(R+z9eRlCR3qxfSg}PM4cQ7^tibn)uvS7FI4dun0H}IH4OjX0ScdtW{pVqr2
z(Co#k*fePjk*IGp4mO&~j>7j$)mq@R4Ea{KxaE&i@?iUaKWb`9+7Ff7>^w#AL&Tm4
z)1i~a`s^CEmp!V_rY)idbVeU>fE|w+Je+%GxX7aNZ~n=sLnXkNVUYm&N4fMB*umnj
z8tI-MpG?y&OwRKi@3SRQy6}5*T<x@o+Kl#M*}Un~b3mt^-lxzSh*WC#W{#ek6>fA1
zBY|L^2Si}T+1G$G*Yv5Zw0Ke{wua(3%0?PsSe&W<025nrY5Sm!i%TPg!-gMo*m}}g
z1Zi4dvIUV&)n@>29+;%-=v-*(Lu;nX9I1J4IY0*iI3)UyKr3eId(Cu1J;I_jpF7F`
z*&Jk%*EC;`JsRumLlVX#%x%ixau2;xmFAenBA)^hSfZ{=fzZ}2PE6fFBxh<C(aCxt
zwze^O>@e^8pJl4>*~MtGL_Sd#UC{|6lgkYB9qM<U-dj`lxx@MHK)HeV4WGJ4Z}KUZ
zwpSv~OIV?E8^%Mr9ONIbO42fRvoVx=7W^?B-YLFqHo`UD2g?L~O8)?RKAyEb{h6@4
zXryKY1Lg+gFS^xj7VUHuZ7jqP$cnLujwZqW9FDbVuRhss?{jS=cM6y=O2cr$>VGPU
zUz<YXZc@Ilr|WU)@J(fL8^o=-)mJ2fI%lz{bsa%0Ax4=?9AhAikE!$(T3tqCE!Wv3
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%0AX-%N$=*AUYL*`vcwXN1FYYxKyFOU*
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%0A8%eZe@XP8Zsl^SIo{6aO?D@
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


From 4dec07741b4bfb1b9858f5d862589754b28dec5c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 12 Oct 2022 22:40:53 +0100
Subject: [PATCH 615/959] Remove unused LED_INDICATORS constant (#18686)

---
 lib/python/qmk/constants.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 622199e46e..8a13029a8a 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -121,13 +121,6 @@ TIME_FORMAT = '%H:%M:%S'
 COL_LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijilmnopqrstuvwxyz'
 ROW_LETTERS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnop'
 
-# Mapping between info.json and config.h keys
-LED_INDICATORS = {
-    'caps_lock': 'LED_CAPS_LOCK_PIN',
-    'num_lock': 'LED_NUM_LOCK_PIN',
-    'scroll_lock': 'LED_SCROLL_LOCK_PIN',
-}
-
 # Constants that should match their counterparts in make
 BUILD_DIR = environ.get('BUILD_DIR', '.build')
 KEYBOARD_OUTPUT_PREFIX = f'{BUILD_DIR}/obj_'

From 29169243a73cfc26adbf3b0b4ea09ae88927f598 Mon Sep 17 00:00:00 2001
From: Dicko <dickofn@gmail.com>
Date: Thu, 13 Oct 2022 05:19:07 +0700
Subject: [PATCH 616/959] [Keyboard] Support for dumbpad_v3x (#18663)

* feat: support for dumbpad_v3x

- all credit goes to
- ref: https://github.com/qmk/qmk_firmware/pull/16285

- included comment from noroadsleft
- ref: https://github.com/qmk/qmk_firmware/pull/16285#pullrequestreview-1038213899

* fix: add newline on every .c, .h, .mk files end

* feat: response to change https://github.com/qmk/qmk_firmware/pull/18663#discussion_r991515821

* feat: response to change https://github.com/qmk/qmk_firmware/pull/18663#discussion_r991516192
---
 keyboards/dumbpad/v3x/config.h                |  84 ++++++++++++
 keyboards/dumbpad/v3x/info.json               |  18 +++
 .../dumbpad/v3x/keymaps/default/keymap.c      |  81 ++++++++++++
 .../dumbpad/v3x/keymaps/deveth0/keymap.c      | 104 +++++++++++++++
 keyboards/dumbpad/v3x/keymaps/via/keymap.c    |  81 ++++++++++++
 keyboards/dumbpad/v3x/keymaps/via/rules.mk    |   1 +
 keyboards/dumbpad/v3x/readme.md               |  27 ++++
 keyboards/dumbpad/v3x/rules.mk                |  23 ++++
 keyboards/dumbpad/v3x/v3x.c                   | 121 ++++++++++++++++++
 keyboards/dumbpad/v3x/v3x.h                   |  33 +++++
 10 files changed, 573 insertions(+)
 create mode 100644 keyboards/dumbpad/v3x/config.h
 create mode 100644 keyboards/dumbpad/v3x/info.json
 create mode 100644 keyboards/dumbpad/v3x/keymaps/default/keymap.c
 create mode 100644 keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
 create mode 100644 keyboards/dumbpad/v3x/keymaps/via/keymap.c
 create mode 100644 keyboards/dumbpad/v3x/keymaps/via/rules.mk
 create mode 100644 keyboards/dumbpad/v3x/readme.md
 create mode 100644 keyboards/dumbpad/v3x/rules.mk
 create mode 100644 keyboards/dumbpad/v3x/v3x.c
 create mode 100644 keyboards/dumbpad/v3x/v3x.h

diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
new file mode 100644
index 0000000000..c64409c967
--- /dev/null
+++ b/keyboards/dumbpad/v3x/config.h
@@ -0,0 +1,84 @@
+/*
+Copyright 2022 imchipwood && deveth0
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+
+/* Column/Row IO definitions */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 5
+#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
+#define UNUSED_PINS
+
+/* Single rotary encoder */
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { D4 }
+
+/* Onboard LEDs  */
+#define LED_00 B1
+#define LED_01 B3
+#define LED_02 B6
+
+/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
+#define BOOTMAGIC_LITE_ROW 3
+#define BOOTMAGIC_LITE_COLUMN 0
+
+#define RGB_DI_PIN D1
+#define DRIVER_LED_TOTAL 16
+
+// Cleanup RGB
+#ifdef RGB_MATRIX_ENABLE
+
+#define RGB_DISABLE_TIMEOUT 300000 // 5 minutes (5 * 60 * 1000ms)
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
+#define RGB_MATRIX_KEYPRESSES
+
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#endif
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
new file mode 100644
index 0000000000..f29108fb39
--- /dev/null
+++ b/keyboards/dumbpad/v3x/info.json
@@ -0,0 +1,18 @@
+{
+    "keyboard_name": "dumbpad/v3x",
+    "url": "https://www.github.com/imchipwood/dumbpad",
+    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
+                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
+                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
+                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/dumbpad/v3x/keymaps/default/keymap.c b/keyboards/dumbpad/v3x/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b96e0e71ce
--- /dev/null
+++ b/keyboards/dumbpad/v3x/keymaps/default/keymap.c
@@ -0,0 +1,81 @@
+/*
+Copyright 2022 imchipwood && deveth0
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+            BASE LAYER - Num Pad
+    /-----------------------------------------------------`
+    |             |    7    |    8    |    9    |    -    |
+    |             |---------|---------|---------|---------|
+    |             |    4    |    5    |    6    |    +    |
+    |             |---------|---------|---------|---------|
+    |             |    1    |    2    |    3    |    *    |
+    |-------------|---------|---------|---------|---------|
+    |    Mute     |  TT(1)  |    0    |         |  Enter  |
+    \-----------------------------------------------------'
+    */
+    [0] = LAYOUT(
+                    KC_P7,      KC_P8,    KC_P9,             KC_PMNS,
+                    KC_P4,      KC_P5,    KC_P6,             KC_PPLS,
+                    KC_P1,      KC_P2,    KC_P3,             KC_PAST,
+        KC_MUTE,    TT(1),      KC_P0,    _______,           KC_ENTER
+    ),
+    /*
+            SUB LAYER  - RGB controls, Modes on encoder
+    /-----------------------------------------------------`
+    |             | On/Off  | Bright- | Bright+ |  Reset  |
+    |             |---------|---------|---------|---------|
+    |             |         | Hue-    | Hue+    |         |
+    |             |---------|---------|---------|---------|
+    |             |         | Sat-    | Sat+    |         |
+    |-------------|---------|---------|---------|---------|
+    |             |  TT(1)  | Effect- | Effect+ |         |
+    \-----------------------------------------------------'
+    */
+    [1] = LAYOUT(
+                    RGB_TOG,    RGB_VAD,     RGB_VAI,      RESET,
+                    KC_NO,      RGB_HUD,     RGB_HUI,      KC_NO,
+                    KC_NO,      RGB_SAD,     RGB_SAI,      KC_NO,
+        KC_NO,      _______,    RGB_SPD,     RGB_SPI,      KC_NO
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            // main layer, volume
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+            break;
+        default:
+            // rgb control layer, effects
+            if (clockwise) {
+                rgblight_step();
+            } else {
+                rgblight_step_reverse();
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c b/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
new file mode 100644
index 0000000000..b95e6270e8
--- /dev/null
+++ b/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
@@ -0,0 +1,104 @@
+/*
+Copyright 2022 imchipwood && deveth0
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#define MUTE_HOLD_DELAY 400
+static uint16_t mute_hold_timer = 0;
+
+enum custom_keycodes {
+    MUTE_TEAMS = SAFE_RANGE,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+            BASE LAYER - Media Controls
+    /------------------------------------------------------------------------------------`
+    |             | Media Prev         |    Media Pause    |    Media Next    |         |
+    |             |--------------------|-------------------|------------------|---------|
+    |             |    Teams - Mute    |                   |                  |         |
+    |             |--------------------|-------------------|------------------|---------|
+    |             |                    |                   |                  |         |
+    |-------------|--------------------|-------------------|------------------|---------|
+    |    Mute     |  TT(1)             |                   |                  |  Enter  |
+    \------------------------------------------------------------------------------------'
+    */
+    [0] = LAYOUT(
+                    KC_MPRV,    KC_MPLY,  KC_MNXT,    KC_NO,
+                    KC_NO,      KC_NO,    KC_NO,      KC_NO,
+                    MUTE_TEAMS, KC_NO,    KC_NO,      KC_NO,
+        KC_MUTE,    TT(1),      KC_NO,    KC_NO,      KC_NO
+    ),
+    /*
+            SUB LAYER  - RGB controls, Modes on encoder
+    /-----------------------------------------------------`
+    |             | On/Off  | Bright- | Bright+ |  Reset  |
+    |             |---------|---------|---------|---------|
+    |             |         | Hue-    | Hue+    |         |
+    |             |---------|---------|---------|---------|
+    |             |         | Sat-    | Sat+    |         |
+    |-------------|---------|---------|---------|---------|
+    |             |  TT(1)  | Effect- | Effect+ |         |
+    \-----------------------------------------------------'
+    */
+    [1] = LAYOUT(
+                    RGB_TOG,    RGB_VAD,     RGB_VAI,      RESET,
+                    KC_NO,      RGB_HUD,     RGB_HUI,      KC_NO,
+                    KC_NO,      RGB_SAD,     RGB_SAI,      KC_NO,
+        KC_NO,      _______,    RGB_SPD,     RGB_SPI,      KC_NO
+    ),
+};
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // props to https://www.reddit.com/r/olkb/comments/oewbr2/comment/h49z38r
+    switch (keycode) {
+        case MUTE_TEAMS:
+            if (record->event.pressed) {                               // when keycode MUTE_TEAMS is pressed
+                mute_hold_timer = timer_read();                        // mark the time the key was pressed
+                tap_code16(LCTL(LSFT(KC_M)));                          // tap Ctrl + Shift + M (mute shortcut)
+            } else {                                                   // when keycode MUTE_TEAMS is released
+                if (timer_elapsed(mute_hold_timer) > MUTE_HOLD_DELAY)  // if held longer than MUTE_HOLD_DELAY
+                    tap_code16(LCTL(LSFT(KC_M)));                      // tap the mute shortcut again
+            }                                                          // otherwise do nothing
+            break;
+    }
+    return true;
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            // main layer, volume
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+            break;
+        default:
+            // rgb control layer, effects
+            if (clockwise) {
+                rgblight_step();
+            } else {
+                rgblight_step_reverse();
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/dumbpad/v3x/keymaps/via/keymap.c b/keyboards/dumbpad/v3x/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b96e0e71ce
--- /dev/null
+++ b/keyboards/dumbpad/v3x/keymaps/via/keymap.c
@@ -0,0 +1,81 @@
+/*
+Copyright 2022 imchipwood && deveth0
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+            BASE LAYER - Num Pad
+    /-----------------------------------------------------`
+    |             |    7    |    8    |    9    |    -    |
+    |             |---------|---------|---------|---------|
+    |             |    4    |    5    |    6    |    +    |
+    |             |---------|---------|---------|---------|
+    |             |    1    |    2    |    3    |    *    |
+    |-------------|---------|---------|---------|---------|
+    |    Mute     |  TT(1)  |    0    |         |  Enter  |
+    \-----------------------------------------------------'
+    */
+    [0] = LAYOUT(
+                    KC_P7,      KC_P8,    KC_P9,             KC_PMNS,
+                    KC_P4,      KC_P5,    KC_P6,             KC_PPLS,
+                    KC_P1,      KC_P2,    KC_P3,             KC_PAST,
+        KC_MUTE,    TT(1),      KC_P0,    _______,           KC_ENTER
+    ),
+    /*
+            SUB LAYER  - RGB controls, Modes on encoder
+    /-----------------------------------------------------`
+    |             | On/Off  | Bright- | Bright+ |  Reset  |
+    |             |---------|---------|---------|---------|
+    |             |         | Hue-    | Hue+    |         |
+    |             |---------|---------|---------|---------|
+    |             |         | Sat-    | Sat+    |         |
+    |-------------|---------|---------|---------|---------|
+    |             |  TT(1)  | Effect- | Effect+ |         |
+    \-----------------------------------------------------'
+    */
+    [1] = LAYOUT(
+                    RGB_TOG,    RGB_VAD,     RGB_VAI,      RESET,
+                    KC_NO,      RGB_HUD,     RGB_HUI,      KC_NO,
+                    KC_NO,      RGB_SAD,     RGB_SAI,      KC_NO,
+        KC_NO,      _______,    RGB_SPD,     RGB_SPI,      KC_NO
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            // main layer, volume
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+            break;
+        default:
+            // rgb control layer, effects
+            if (clockwise) {
+                rgblight_step();
+            } else {
+                rgblight_step_reverse();
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/dumbpad/v3x/keymaps/via/rules.mk b/keyboards/dumbpad/v3x/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/dumbpad/v3x/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dumbpad/v3x/readme.md b/keyboards/dumbpad/v3x/readme.md
new file mode 100644
index 0000000000..96b0537946
--- /dev/null
+++ b/keyboards/dumbpad/v3x/readme.md
@@ -0,0 +1,27 @@
+# dumbpad v3.x - rgb & hotswap
+
+![dumbpad](https://i.imgur.com/ND03FiFl.png)
+
+A 4x4 numpad/macropad with a rotary encoder to the left of the bottom row of keys.
+
+-   Keyboard Maintainer: [imchipwood](https://github.com/imchipwood) // [deveth0](https://github.com/deveth0)
+-   Hardware repository: [dumbpad on github](https://github.com/imchipwood/dumbpad)
+-   PCB Revisions Supported: v3.1
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dumbpad/v3x:default
+
+Flashing example for this keyboard:
+
+    make dumbpad/v3x:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the encoder and plug in the keyboard
+-   **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+-   **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk
new file mode 100644
index 0000000000..832bd6d67f
--- /dev/null
+++ b/keyboards/dumbpad/v3x/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/dumbpad/v3x/v3x.c b/keyboards/dumbpad/v3x/v3x.c
new file mode 100644
index 0000000000..4a8ba12c47
--- /dev/null
+++ b/keyboards/dumbpad/v3x/v3x.c
@@ -0,0 +1,121 @@
+/* Copyright 2022 imchipwood && deveth0
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "v3x.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = {{// Key Matrix to LED Index
+                              {NO_LED, 0, 1, 2, 3},
+                              {NO_LED, 7, 6, 5, 4},
+                              {NO_LED, 8, 9, 10, 11},
+                              {NO_LED, 15, 14, 13, 12}},
+                             {// LED Index to Physical Position
+                              {0, 0},
+                              {75, 0},
+                              {149, 0},
+                              {224, 0},
+
+                              {224, 21},
+                              {149, 21},
+                              {75, 21},
+                              {0, 21},
+
+                              {0, 43},
+                              {75, 43},
+                              {149, 43},
+                              {224, 43},
+
+                              {224, 64},
+                              {149, 64},
+                              {75, 64},
+                              {0, 64}},
+                             {// LED Index to Flag
+                              4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}};
+#endif
+
+void keyboard_pre_init_kb(void) {
+    // Set LED IO as outputs
+    setPinOutput(LED_00);
+    setPinOutput(LED_01);
+    setPinOutput(LED_02);
+    keyboard_pre_init_user();
+}
+
+void shutdown_user() {
+    // Shutdown LEDs
+    writePinLow(LED_00);
+    writePinLow(LED_01);
+    writePinLow(LED_02);
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    // Layer LEDs act as binary indication of current layer
+    uint8_t layer = get_highest_layer(state);
+    writePin(LED_00, layer & 0b1);
+    writePin(LED_01, (layer >> 1) & 0b1);
+    uprintf("%d string", layer);
+    return layer_state_set_user(state);
+}
+
+// Optional override functions below.
+// You can leave any or all of these undefined.
+// These are only required if you want to perform custom actions.
+
+void matrix_init_kb(void) {
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+    uint8_t led_delay_ms = 80;
+    for (int i = 0; i < 2; i++) {
+        writePinHigh(LED_00);
+        writePinHigh(LED_01);
+        writePinHigh(LED_02);
+        wait_ms(led_delay_ms);
+        writePinLow(LED_00);
+        writePinLow(LED_01);
+        writePinLow(LED_02);
+        if (i < 1) {
+            wait_ms(led_delay_ms);
+        }
+    }
+
+    matrix_init_user();
+}
+
+bool led_update_kb(led_t led_state) {
+    if (!led_update_user(led_state)) return false;
+    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+    writePin(LED_02, !led_state.num_lock);
+    return true;
+}
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            // main layer, volume
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+            break;
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/dumbpad/v3x/v3x.h b/keyboards/dumbpad/v3x/v3x.h
new file mode 100644
index 0000000000..f939b6a594
--- /dev/null
+++ b/keyboards/dumbpad/v3x/v3x.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 imchipwood && deveth0
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+
+#define LAYOUT( \
+             k01, k02, k03, k04, \
+             k11, k12, k13, k14, \
+             k21, k22, k23, k24, \
+        k30, k31, k32, k33, k34 \
+) \
+{ \
+    { KC_NO, k01, k02, k03, k04 }, \
+    { KC_NO, k11, k12, k13, k14 }, \
+    { KC_NO, k21, k22, k23, k24 }, \
+    { k30,   k31, k32, k33, k34 }, \
+}

From f5ac3ecaa74d61ced78c765c9f5da65ba85f5aca Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 12 Oct 2022 16:11:48 -0700
Subject: [PATCH 617/959] Viendi 8L Layout Refactor (#18677)

---
 keyboards/viendi8l/info.json                | 10 +++--
 keyboards/viendi8l/keymaps/default/keymap.c | 34 +++++++++-------
 keyboards/viendi8l/keymaps/via/keymap.c     | 45 ++++++++++++---------
 keyboards/viendi8l/viendi8l.h               | 30 +++++++++++---
 4 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json
index 745937869d..86464fd103 100644
--- a/keyboards/viendi8l/info.json
+++ b/keyboards/viendi8l/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "8L", 
+    "keyboard_name": "8L",
     "manufacturer": "Viendi",
-    "url": "https://viendi.co/", 
-    "maintainer": "gondolindrim", 
+    "url": "https://viendi.co/",
+    "maintainer": "gondolindrim",
     "usb": {
         "vid": "0x8673",
         "pid": "0x0877",
@@ -30,6 +30,7 @@
                 {"label":"=", "x":16.5, "y":0},
                 {"label":"Bksp", "x":17.5, "y":0},
                 {"label":"Bksp", "x":18.5, "y":0},
+
                 {"label":"-", "x":0, "y":1},
                 {"label":"7", "x":1, "y":1},
                 {"label":"8", "x":2, "y":1},
@@ -48,6 +49,7 @@
                 {"label":"{", "x":16, "y":1},
                 {"label":"}", "x":17, "y":1},
                 {"label":"|", "x":18, "y":1, "w":1.5},
+
                 {"label":"+", "x":0, "y":2},
                 {"label":"4", "x":1, "y":2},
                 {"label":"5", "x":2, "y":2},
@@ -66,6 +68,7 @@
                 {"label":"\"", "x":16.25, "y":2},
                 {"x":17.25, "y":2},
                 {"label":"Enter", "x":18.25, "y":2, "w":1.25},
+
                 {"label":"Enter", "x":0, "y":3},
                 {"label":"1", "x":1, "y":3},
                 {"label":"2", "x":2, "y":3},
@@ -84,6 +87,7 @@
                 {"label":"Shift", "x":15.75, "y":3, "w":1.75},
                 {"label":"\u2191", "x":17.5, "y":3},
                 {"x":18.5, "y":3},
+
                 {"label":"Enter", "x":0, "y":4},
                 {"label":".", "x":1, "y":4},
                 {"label":".", "x":2, "y":4},
diff --git a/keyboards/viendi8l/keymaps/default/keymap.c b/keyboards/viendi8l/keymaps/default/keymap.c
index 3a7ff83fa0..8051e739ad 100755
--- a/keyboards/viendi8l/keymaps/default/keymap.c
+++ b/keyboards/viendi8l/keymaps/default/keymap.c
@@ -21,25 +21,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MTRSFT RSFT_T(KC_UP)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
     [0] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_PMNS, KC_P7,   KC_P8,   KC_P9,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_PPLS, KC_P4,   KC_P5,   KC_P6,   LTCAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC,
-        KC_PENT, KC_P1,   KC_P2,   KC_P3,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  KC_NUHS,
-        KC_PENT, KC_P0,   KC_P0,   KC_PDOT, KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,           TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT, MO(2)
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
+        KC_PENT, KC_P0,   KC_P0,   KC_PDOT,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
+
     [1] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC, KC_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_PMNS, KC_P7,   KC_P8,   KC_P9,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_PPLS, KC_P4,   KC_P5,   KC_P6,   LTCAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC,
-        KC_PENT, KC_P1,   KC_P2,   KC_P3,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  KC_NUHS,
-        KC_PENT, KC_P0,   KC_P0,   KC_PDOT, KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,           TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT, MO(2)
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_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_BSPC,
+        KC_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
+        KC_PENT, KC_P0,   KC_P0,   KC_PDOT,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
+
     [2] = LAYOUT_all(
-        KC_MUTE, KC_F10,  KC_F11,  KC_NUM,  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, XXXXXXX,
-        KC_MINS, KC_F7,   KC_F8,   KC_F9,   KC_TAB,  XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL,
-        KC_EQL,  KC_F4,   KC_F5,   KC_F6,   _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,  XXXXXXX,          GUI_TOG, KC_SLEP,                   XXXXXXX,          XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______
+        KC_MUTE, KC_F10,  KC_F11,  KC_NUM,     KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, XXXXXXX, XXXXXXX,
+        KC_MINS, KC_F7,   KC_F8,   KC_F9,      KC_TAB,  XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL,
+        KC_EQL,  KC_F4,   KC_F5,   KC_F6,      _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, KC_F1,   KC_F2,   KC_F3,      XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,     XXXXXXX, GUI_TOG, KC_SLEP,                            XXXXXXX,                   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX
     )
+
 };
diff --git a/keyboards/viendi8l/keymaps/via/keymap.c b/keyboards/viendi8l/keymaps/via/keymap.c
index 5e7cf5d89b..c85ddf9ed0 100755
--- a/keyboards/viendi8l/keymaps/via/keymap.c
+++ b/keyboards/viendi8l/keymaps/via/keymap.c
@@ -21,32 +21,37 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MTRSFT RSFT_T(KC_UP)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
     [0] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_PMNS, KC_P7,   KC_P8,   KC_P9,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_PPLS, KC_P4,   KC_P5,   KC_P6,   LTCAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC,
-        KC_PENT, KC_P1,   KC_P2,   KC_P3,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  KC_NUHS,
-        KC_PENT, KC_P0,   KC_P0,   KC_PDOT, KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,           TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT, MO(2)
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
+        KC_PENT, KC_P0,   KC_P0,   KC_PDOT,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
+
     [1] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC, KC_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_PMNS, KC_P7,   KC_P8,   KC_P9,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_PPLS, KC_P4,   KC_P5,   KC_P6,   LTCAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC,
-        KC_PENT, KC_P1,   KC_P2,   KC_P3,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  KC_NUHS,
-        KC_PENT, KC_P0,   KC_P0,   KC_PDOT, KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,           TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT, MO(2)
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_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_BSPC,
+        KC_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
+        KC_PENT, KC_P0,   KC_P0,   KC_PDOT,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    TG(1),   MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
+
     [2] = LAYOUT_all(
-        KC_MUTE, KC_F10,  KC_F11,  KC_NUM,  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, XXXXXXX,
-        KC_MINS, KC_F7,   KC_F8,   KC_F9,   KC_TAB,  XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL,
-        KC_EQL,  KC_F4,   KC_F5,   KC_F6,   _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,  XXXXXXX,          GUI_TOG, KC_SLEP,                   XXXXXXX,          XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______
+        KC_MUTE, KC_F10,  KC_F11,  KC_NUM,     KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, XXXXXXX, XXXXXXX,
+        KC_MINS, KC_F7,   KC_F8,   KC_F9,      KC_TAB,  XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL,
+        KC_EQL,  KC_F4,   KC_F5,   KC_F6,      _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, KC_F1,   KC_F2,   KC_F3,      XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,     XXXXXXX, GUI_TOG, KC_SLEP,                            XXXXXXX,                   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX
     ),
+
     [3] = LAYOUT_all(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,                   XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
     )
+
 };
diff --git a/keyboards/viendi8l/viendi8l.h b/keyboards/viendi8l/viendi8l.h
index 80070619f0..7303e764ba 100644
--- a/keyboards/viendi8l/viendi8l.h
+++ b/keyboards/viendi8l/viendi8l.h
@@ -21,12 +21,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ___ KC_NO
 
+/* ┌────────────Numpad─────────────┐   ┌───────────────────────────────────────Alphas─────────────────────────────────────────────────────────────────┐
+ *             ┌───┬───┬───┐                        ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐          ┌───────┐
+ *         (00)│01 │02 │03 │                        │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │0G │0H │2H │          │0H     │ 2u Backspace
+ * ┌───┐   ┌───┼───┼───┼───┤   ┌───┐                ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤          └─┬─────┤
+ * │   │   │10 │11 │12 │13 │   │   │                │14   │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │1G │1H   │            │     │
+ * │10 │   ├───┼───┼───┼───┤   │23 │    2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤         ┌──┴┐2G  │ ISO Enter
+ * │   │   │20 │21 │22 │23 │   │   │    LShift      │24    │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │2G      │         │3H │    │
+ * ├───┤   ├───┼───┼───┼───┤   ├───┤   ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌───┬─┴───┴────┤
+ * │   │   │30 │31 │32 │33 │   │   │   │34      │   │34  │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3F │3G    │5H │   │3F │3G        │ 1u/2.75u RShift
+ * │30 │   ├───┼───┼───┼───┤   │33 │   └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤   └───┴──────────┘
+ * │   │   │40 │41 │42 │43 │   │   │                │44  │46  │47  │5A                      │5C │5D │5E │5F │5G │   ┌──────┬───┬───┐
+ * └───┘   └───┴───┴───┴───┘   └───┘                └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘   │3F    │3G │5H │ 1.75u RShift/1u/1u
+ *         ┌───────┐                                                                        ┌────┬────┬────┬────┐   └──────┴───┴───┘
+ *         │41     │                                                     Standard (4x1.25u) │5C  │5D  │5F  │5G  │
+ *         └───────┘                                                                        └────┴────┴────┴────┘
+ *             ┌───────┐
+ *             │42     │
+ *             └───────┘
+ */
+
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, \
-	K40, K41, K42, K43, K44,      K46, K47,           K5A,      K5C, K5D, K5E, K5F, K5G, K5H  \
+    K00, K01, K02, K03,   K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K2H, \
+    K10, K11, K12, K13,   K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
+    K20, K21, K22, K23,   K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K3H, K2G, \
+    K30, K31, K32, K33,   K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K5H, \
+    K40, K41, K42, K43,   K44, K46, K47,                K5A,           K5C, K5D, K5E, K5F, K5G  \
 ) { \
 	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
 	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \

From 80894f5c4458e50c584629698b2422641c16fb5b Mon Sep 17 00:00:00 2001
From: Alex Ong <alex.ong@unsw.edu.au>
Date: Thu, 13 Oct 2022 10:12:06 +1100
Subject: [PATCH 618/959] Quefrency xeal (#18657)

---
 .../quefrency/rev2/keymaps/xeal/config.h      | 40 +++++++++++++++++
 .../quefrency/rev2/keymaps/xeal/keymap.c      | 44 +++++++++++++++++++
 .../quefrency/rev2/keymaps/xeal/rules.mk      |  4 ++
 3 files changed, 88 insertions(+)
 create mode 100644 keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h
 create mode 100644 keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
 create mode 100644 keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk

diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h b/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h
new file mode 100644
index 0000000000..c87e45d053
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h
@@ -0,0 +1,40 @@
+/*
+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
new file mode 100644
index 0000000000..8d61a0fd9a
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
@@ -0,0 +1,44 @@
+// 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_SLCK, 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
new file mode 100644
index 0000000000..3d5257b7b4
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk
@@ -0,0 +1,4 @@
+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

From a195f78200a40f2065b0bf75271fabbb7d381385 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 12 Oct 2022 16:17:35 -0700
Subject: [PATCH 619/959] Vertex ARC60 Layout Refactor (#18670)

---
 keyboards/vertex/arc60/arc60.h                | 156 +++-
 keyboards/vertex/arc60/info.json              | 707 ++++++++++++++++--
 .../vertex/arc60/keymaps/default/keymap.c     |  35 +-
 keyboards/vertex/arc60/keymaps/via/keymap.c   |  60 +-
 4 files changed, 832 insertions(+), 126 deletions(-)

diff --git a/keyboards/vertex/arc60/arc60.h b/keyboards/vertex/arc60/arc60.h
index f259cb324f..c007dd0fca 100644
--- a/keyboards/vertex/arc60/arc60.h
+++ b/keyboards/vertex/arc60/arc60.h
@@ -19,24 +19,146 @@
 #include "quantum.h"
 
 #define ___ KC_NO
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │      │0E     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1E   │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │     │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │   │3D        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
+ *              │40  │41  │42  │46                      │4A  │4B  │4C  │4E  │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │40   │41 │42   │46                         │4B   │4C │4E   │ Tsangan/WKL/HHKB
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
+
 #define LAYOUT_all( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,K0E, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,     K1E, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     \
-        K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,K3E, \
-        K40, K41, K42,                K46,                K4A, K4B, K4C,     K4E  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4E  \
 ) { \
-        { K00,  K01,  K02,  K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,K0E }, \
-        { K10,  K11,  K12,  K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   ___,K1E }, \
-        { K20,  K21,  K22,  K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,___ }, \
-        { K30,  K31,  K32,  K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   ___,   K3D,K3E }, \
-        { K40,  K41,  K42,  ___,   ___,   ___, K46,   ___,   ___,   ___, K4A, K4B,   K4C,   ___,K4E }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40, K41, K42,                K46,                     K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_tsangan_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+    K40, K41, K42,                K46,                     K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \
+    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_iso( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_iso_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_iso_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40, K41, K42,                K46,                     K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, ___, K4E }  \
+}
+
+#define LAYOUT_60_iso_tsangan_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+    K40, K41, K42,                K46,                     K4B, K4C, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, ___, K4E }  \
 }
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index 5f38121bef..7d2b2a452e 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -1,81 +1,654 @@
 {
     "keyboard_name": "ARC60",
+    "manufacturer": "vertex",
     "url": "",
-    "maintainer": "Eason",
-    "manufacturer":"vertex",
+    "maintainer": "EasonQian1, Vertex-kb",
     "usb": {
         "vid": "0x8354",
         "pid": "0x8370",
         "device_version": "0.0.1"
     },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0 },
-                {"x": 1, "y": 0 },
-                {"x": 2, "y": 0 },
-                {"x": 3, "y": 0 },
-                {"x": 4, "y": 0 },
-                {"x": 5, "y": 0 },
-                {"x": 6, "y": 0 },
-                {"x": 7, "y": 0 },
-                {"x": 8, "y": 0 },
-                {"x": 9, "y": 0 },
-                {"x": 10, "y": 0 },
-                {"x": 11, "y": 0 },
-                {"x": 12, "y": 0 },
-                {"x": 13, "y": 0 },
-                {"x": 14, "y": 0 },
-                {"x": 0, "y": 1, "w": 1.5 },
-                {"x": 1.5, "y": 1 },
-                {"x": 2.5, "y": 1 },
-                {"x": 3.5, "y": 1 },
-                {"x": 4.5, "y": 1 },
-                {"x": 5.5, "y": 1 },
-                {"x": 6.5, "y": 1 },
-                {"x": 7.5, "y": 1 },
-                {"x": 8.5, "y": 1 },
-                {"x": 9.5, "y": 1 },
-                {"x": 10.5, "y": 1 },
-                {"x": 11.5, "y": 1 },
-                {"x": 12.5, "y": 1 },
-                {"x": 13.5, "y": 1, "w": 1.5 },
-                {"x": 0, "y": 2, "w": 1.75 },
-                {"x": 1.75, "y": 2 },
-                {"x": 2.75, "y": 2 },
-                {"x": 3.75, "y": 2 },
-                {"x": 4.75, "y": 2 },
-                {"x": 5.75, "y": 2 },
-                {"x": 6.75, "y": 2 },
-                {"x": 7.75, "y": 2 },
-                {"x": 8.75, "y": 2 },
-                {"x": 9.75, "y": 2 },
-                {"x": 10.75, "y": 2 },
-                {"x": 11.75, "y": 2 },
-                {"x": 12.75, "y": 2 },
-                {"x": 13.75, "y": 2, "w": 1.25 },
-                {"x": 0, "y": 3, "w": 1.25 },
-                {"x": 1.25, "y": 3 },
-                {"x": 2.25, "y": 3 },
-                {"x": 3.25, "y": 3 },
-                {"x": 4.25, "y": 3 },
-                {"x": 5.25, "y": 3 },
-                {"x": 6.25, "y": 3 },
-                {"x": 7.25, "y": 3 },
-                {"x": 8.25, "y": 3 },
-                {"x": 9.25, "y": 3 },
-                {"x": 10.25, "y": 3 },
-                {"x": 11.25, "y": 3 },
-                {"x": 12.25, "y": 3, "w": 1.75 },
-                {"x": 14, "y": 3 },
-                {"x": 0, "y": 4, "w": 1.25 },
-                {"x": 1.25, "y": 4, "w": 1.25 },
-                {"x": 2.5, "y": 4, "w": 1.25 },
-                {"x": 3.75, "y": 4, "w": 6.25 },
-                {"x": 10, "y": 4, "w": 1.25 },
-                {"x": 11.25, "y": 4, "w": 1.25 },
-                {"x": 12.5, "y": 4, "w": 1.25 },
-                {"x": 13.75, "y": 4, "w": 1.25 }
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0 },
+                { "x": 14, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2 },
+                { "x": 13.75, "y": 2, "w": 1.25 },
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14, "y": 3 },
+
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4, "w": 1.25 },
+                { "x": 11.25, "y": 4, "w": 1.25 },
+                { "x": 12.5, "y": 4, "w": 1.25 },
+                { "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0, "w": 2 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2, "w": 2.25 },
+
+                { "x": 0, "y": 3, "w": 2.25 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 2.75 },
+
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4, "w": 1.25 },
+                { "x": 11.25, "y": 4, "w": 1.25 },
+                { "x": 12.5, "y": 4, "w": 1.25 },
+                { "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0 },
+                { "x": 14, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2, "w": 2.25 },
+
+                { "x": 0, "y": 3, "w": 2.25 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14, "y": 3 },
+
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4, "w": 1.25 },
+                { "x": 11.25, "y": 4, "w": 1.25 },
+                { "x": 12.5, "y": 4, "w": 1.25 },
+                { "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0, "w": 2 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2, "w": 2.25 },
+
+                { "x": 0, "y": 3, "w": 2.25 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 2.75 },
+
+                { "x": 0, "y": 4, "w": 1.5 },
+                { "x": 1.5, "y": 4 },
+                { "x": 2.5, "y": 4, "w": 1.5 },
+                { "x": 4, "y": 4, "w": 7 },
+                { "x": 11, "y": 4, "w": 1.5 },
+                { "x": 12.5, "y": 4 },
+                { "x": 13.5, "y": 4, "w": 1.5 }
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0 },
+                { "x": 14, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2, "w": 2.25 },
+
+                { "x": 0, "y": 3, "w": 2.25 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14, "y": 3 },
+
+                { "x": 0, "y": 4, "w": 1.5 },
+                { "x": 1.5, "y": 4 },
+                { "x": 2.5, "y": 4, "w": 1.5 },
+                { "x": 4, "y": 4, "w": 7 },
+                { "x": 11, "y": 4, "w": 1.5 },
+                { "x": 12.5, "y": 4 },
+                { "x": 13.5, "y": 4, "w": 1.5 }
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0, "w": 2 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2 },
+                { "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 2.75 },
+
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4, "w": 1.25 },
+                { "x": 11.25, "y": 4, "w": 1.25 },
+                { "x": 12.5, "y": 4, "w": 1.25 },
+                { "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0 },
+                { "x": 14, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2 },
+                { "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14, "y": 3 },
+
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4, "w": 1.25 },
+                { "x": 11.25, "y": 4, "w": 1.25 },
+                { "x": 12.5, "y": 4, "w": 1.25 },
+                { "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0, "w": 2 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2 },
+                { "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 2.75 },
+
+                { "x": 0, "y": 4, "w": 1.5 },
+                { "x": 1.5, "y": 4 },
+                { "x": 2.5, "y": 4, "w": 1.5 },
+                { "x": 4, "y": 4, "w": 7 },
+                { "x": 11, "y": 4, "w": 1.5 },
+                { "x": 12.5, "y": 4 },
+                { "x": 13.5, "y": 4, "w": 1.5 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0 },
+                { "x": 14, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+                { "x": 7.5, "y": 1 },
+                { "x": 8.5, "y": 1 },
+                { "x": 9.5, "y": 1 },
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+                { "x": 12.5, "y": 1 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 6.75, "y": 2 },
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+                { "x": 9.75, "y": 2 },
+                { "x": 10.75, "y": 2 },
+                { "x": 11.75, "y": 2 },
+                { "x": 12.75, "y": 2 },
+                { "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.25, "y": 3 },
+                { "x": 8.25, "y": 3 },
+                { "x": 9.25, "y": 3 },
+                { "x": 10.25, "y": 3 },
+                { "x": 11.25, "y": 3 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14, "y": 3 },
+
+                { "x": 0, "y": 4, "w": 1.5 },
+                { "x": 1.5, "y": 4 },
+                { "x": 2.5, "y": 4, "w": 1.5 },
+                { "x": 4, "y": 4, "w": 7 },
+                { "x": 11, "y": 4, "w": 1.5 },
+                { "x": 12.5, "y": 4 },
+                { "x": 13.5, "y": 4, "w": 1.5 }
             ]
         }
     }
diff --git a/keyboards/vertex/arc60/keymaps/default/keymap.c b/keyboards/vertex/arc60/keymaps/default/keymap.c
index c8618f6429..d63bc676b7 100644
--- a/keyboards/vertex/arc60/keymaps/default/keymap.c
+++ b/keyboards/vertex/arc60/keymaps/default/keymap.c
@@ -13,19 +13,24 @@
  * You should have received 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 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_1, KC_BSPC,
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,       KC_BSLS,
-     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,KC_BSLS,  KC_ENT,
-     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1),
-     KC_LCTL, KC_LGUI, KC_LALT,                  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,  _______, _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,           _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,  QK_BOOT,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,          _______,_______,
-     _______,_______,_______,                          _______,                           _______, _______,  _______,         _______),
- };
+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_1,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            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,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/vertex/arc60/keymaps/via/keymap.c b/keyboards/vertex/arc60/keymaps/via/keymap.c
index ba5b601744..5e4ccb0330 100644
--- a/keyboards/vertex/arc60/keymaps/via/keymap.c
+++ b/keyboards/vertex/arc60/keymaps/via/keymap.c
@@ -13,34 +13,40 @@
  * You should have received 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 QMK_KEYBOARD_H
 
- const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+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_1, KC_BSPC,
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,       KC_BSLS,
-     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,KC_BSLS,  KC_ENT,
-     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1),
-     KC_LCTL, KC_LGUI, KC_LALT,                  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,  _______, _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,           _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,  QK_BOOT,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,          _______,_______,
-     _______,_______,_______,                  _______,                                  _______, _______,  _______,         _______),
-   [2] = LAYOUT_all(
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,  _______, _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,           _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,  QK_BOOT,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,          _______,_______,
-     _______,_______,_______,                  _______,                                  _______, _______,  _______,         _______),
-   [3] = LAYOUT_all(
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,  _______, _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,           _______,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,_______,  QK_BOOT,
-     _______,_______,_______,_______,  _______,_______,_______, _______,_______,_______, _______, _______,          _______,_______,
-     _______,_______,_______,                  _______,                                  _______, _______,  _______,         _______),
+    [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_1,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            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,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
 
- };
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};

From cd5b2e84f50e02a080d2a6743f44ce0c72c35d01 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Wed, 12 Oct 2022 17:18:33 -0600
Subject: [PATCH 620/959] =?UTF-8?q?Fixup=20handwired/jopr=20=E2=80=94=20re?=
 =?UTF-8?q?move=20deprecated=20keycode=20(#18668)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboards/handwired/jopr/keymaps/default/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/handwired/jopr/keymaps/default/keymap.c b/keyboards/handwired/jopr/keymaps/default/keymap.c
index 7827b5f171..6ba6d88955 100644
--- a/keyboards/handwired/jopr/keymaps/default/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   KC_LWIN,   KC_LALT,   KC_SPC,                                                KC_RALT, KC_RWIN, LT(_FN,KC_APP),  KC_RCTL,     KC_P0,            KC_PDOT,            KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT(
-		_______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______,   KC_SYSREQ, _______, _______, _______,
+		_______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______,   KC_SYRQ, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______,
 		_______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       KC_MSTP, KC_VOLU, _______, _______,
 		_______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              KC_MPRV, KC_MPLY, KC_MNXT,            _______, KC_MUTE, _______,

From 2078a56369af376e3275f02e21d48ab6cc39bc36 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 13 Oct 2022 10:28:49 +1100
Subject: [PATCH 621/959] Fix joystick functionality for ChibiOS and OTG
 (Blackpill) (#18631)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
---
 tmk_core/protocol/chibios/usb_main.c | 164 +++++++++++++--------------
 tmk_core/protocol/chibios/usb_main.h |  40 -------
 tmk_core/protocol/usb_descriptor.h   |  13 +--
 3 files changed, 84 insertions(+), 133 deletions(-)

diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 5eda5dd09f..2bf273488b 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -127,7 +127,7 @@ static USBInEndpointState kbd_ep_state;
 static const USBEndpointConfig kbd_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    kbd_in_cb,              /* IN notification callback */
+    NULL,                   /* IN notification callback */
     NULL,                   /* OUT notification callback */
     KEYBOARD_EPSIZE,        /* IN maximum packet size */
     0,                      /* OUT maximum packet size */
@@ -145,7 +145,7 @@ static USBInEndpointState mouse_ep_state;
 static const USBEndpointConfig mouse_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    mouse_in_cb,            /* IN notification callback */
+    NULL,                   /* IN notification callback */
     NULL,                   /* OUT notification callback */
     MOUSE_EPSIZE,           /* IN maximum packet size */
     0,                      /* OUT maximum packet size */
@@ -163,7 +163,7 @@ static USBInEndpointState shared_ep_state;
 static const USBEndpointConfig shared_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    shared_in_cb,           /* IN notification callback */
+    NULL,                   /* IN notification callback */
     NULL,                   /* OUT notification callback */
     SHARED_EPSIZE,          /* IN maximum packet size */
     0,                      /* OUT maximum packet size */
@@ -173,6 +173,42 @@ static const USBEndpointConfig shared_ep_config = {
 };
 #endif
 
+#ifdef JOYSTICK_ENABLE
+/* 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 */
+    NULL,                   /* 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 */
+    NULL,                   /* 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 USB_ENDPOINTS_ARE_REORDERABLE
 typedef struct {
     size_t              queue_capacity_in;
@@ -314,12 +350,6 @@ typedef struct {
 #endif
 #ifdef VIRTSER_ENABLE
             usb_driver_config_t serial_driver;
-#endif
-#ifdef JOYSTICK_ENABLE
-            usb_driver_config_t joystick_driver;
-#endif
-#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
-            usb_driver_config_t digitizer_driver;
 #endif
         };
         usb_driver_config_t array[0];
@@ -361,22 +391,6 @@ static usb_driver_configs_t drivers = {
 #    define CDC_OUT_MODE USB_EP_MODE_TYPE_BULK
     .serial_driver = QMK_USB_DRIVER_CONFIG(CDC, CDC_NOTIFICATION_EPNUM, false),
 #endif
-
-#ifdef JOYSTICK_ENABLE
-#    define JOYSTICK_IN_CAPACITY 4
-#    define JOYSTICK_OUT_CAPACITY 4
-#    define JOYSTICK_IN_MODE USB_EP_MODE_TYPE_BULK
-#    define JOYSTICK_OUT_MODE USB_EP_MODE_TYPE_BULK
-    .joystick_driver = QMK_USB_DRIVER_CONFIG(JOYSTICK, 0, false),
-#endif
-
-#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
-#    define DIGITIZER_IN_CAPACITY 4
-#    define DIGITIZER_OUT_CAPACITY 4
-#    define DIGITIZER_IN_MODE USB_EP_MODE_TYPE_BULK
-#    define DIGITIZER_OUT_MODE USB_EP_MODE_TYPE_BULK
-    .digitizer_driver = QMK_USB_DRIVER_CONFIG(DIGITIZER, 0, false),
-#endif
 };
 
 #define NUM_USB_DRIVERS (sizeof(drivers) / sizeof(usb_driver_config_t))
@@ -482,6 +496,12 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
 #endif
 #ifdef SHARED_EP_ENABLE
             usbInitEndpointI(usbp, SHARED_IN_EPNUM, &shared_ep_config);
+#endif
+#ifdef JOYSTICK_ENABLE
+            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
             for (int i = 0; i < NUM_USB_DRIVERS; i++) {
 #ifdef USB_ENDPOINTS_ARE_REORDERABLE
@@ -690,7 +710,6 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
 
 /* Start-of-frame callback */
 static void usb_sof_cb(USBDriver *usbp) {
-    kbd_sof_cb(usbp);
     osalSysLockFromISR();
     for (int i = 0; i < NUM_USB_DRIVERS; i++) {
         qmkusbSOFHookI(&drivers.array[i].driver);
@@ -764,21 +783,6 @@ __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
  *                  Keyboard functions
  * ---------------------------------------------------------
  */
-/* keyboard IN callback hander (a kbd report has made it IN) */
-#ifndef KEYBOARD_SHARED_EP
-void kbd_in_cb(USBDriver *usbp, usbep_t ep) {
-    /* STUB */
-    (void)usbp;
-    (void)ep;
-}
-#endif
-
-/* start-of-frame handler
- * TODO: i guess it would be better to re-implement using timers,
- *  so that this is not going to have to be checked every 1ms */
-void kbd_sof_cb(USBDriver *usbp) {
-    (void)usbp;
-}
 
 /* Idle requests timer code
  * callback (called from ISR, unlocked state) */
@@ -889,15 +893,6 @@ unlock:
  */
 
 #ifdef MOUSE_ENABLE
-
-#    ifndef MOUSE_SHARED_EP
-/* mouse IN callback hander (a mouse report has made it IN) */
-void mouse_in_cb(USBDriver *usbp, usbep_t ep) {
-    (void)usbp;
-    (void)ep;
-}
-#    endif
-
 void send_mouse(report_mouse_t *report) {
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
@@ -925,19 +920,6 @@ void send_mouse(report_mouse_t *report) {
 }
 #endif /* MOUSE_ENABLE */
 
-/* ---------------------------------------------------------
- *                   Shared EP functions
- * ---------------------------------------------------------
- */
-#ifdef SHARED_EP_ENABLE
-/* shared IN callback hander */
-void shared_in_cb(USBDriver *usbp, usbep_t ep) {
-    /* STUB */
-    (void)usbp;
-    (void)ep;
-}
-#endif
-
 /* ---------------------------------------------------------
  *                   Extrakey functions
  * ---------------------------------------------------------
@@ -991,20 +973,51 @@ void send_programmable_button(report_programmable_button_t *report) {
 #endif
 }
 
-void send_digitizer(report_digitizer_t *report) {
-#ifdef DIGITIZER_ENABLE
-#    ifdef DIGITIZER_SHARED_EP
+void send_joystick(report_joystick_t *report) {
+#ifdef JOYSTICK_ENABLE
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
         osalSysUnlock();
         return;
     }
 
+    if (usbGetTransmitStatusI(&USB_DRIVER, JOYSTICK_IN_EPNUM)) {
+        /* Need to either suspend, or loop and call unlock/lock during
+         * every iteration - otherwise the system will remain locked,
+         * no interrupts served, so USB not going through as well.
+         * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */
+        if (osalThreadSuspendTimeoutS(&(&USB_DRIVER)->epc[JOYSTICK_IN_EPNUM]->in_state->thread, TIME_MS2I(10)) == MSG_TIMEOUT) {
+            osalSysUnlock();
+            return;
+        }
+    }
+
+    usbStartTransmitI(&USB_DRIVER, JOYSTICK_IN_EPNUM, (uint8_t *)report, sizeof(report_joystick_t));
+    osalSysUnlock();
+#endif
+}
+
+void send_digitizer(report_digitizer_t *report) {
+#ifdef DIGITIZER_ENABLE
+    osalSysLock();
+    if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
+        osalSysUnlock();
+        return;
+    }
+
+    if (usbGetTransmitStatusI(&USB_DRIVER, DIGITIZER_IN_EPNUM)) {
+        /* Need to either suspend, or loop and call unlock/lock during
+         * every iteration - otherwise the system will remain locked,
+         * no interrupts served, so USB not going through as well.
+         * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */
+        if (osalThreadSuspendTimeoutS(&(&USB_DRIVER)->epc[DIGITIZER_IN_EPNUM]->in_state->thread, TIME_MS2I(10)) == MSG_TIMEOUT) {
+            osalSysUnlock();
+            return;
+        }
+    }
+
     usbStartTransmitI(&USB_DRIVER, DIGITIZER_IN_EPNUM, (uint8_t *)report, sizeof(report_digitizer_t));
     osalSysUnlock();
-#    else
-    chnWrite(&drivers.digitizer_driver.driver, (uint8_t *)report, sizeof(report_digitizer_t));
-#    endif
 #endif
 }
 
@@ -1139,16 +1152,3 @@ void virtser_task(void) {
 }
 
 #endif
-
-void send_joystick(report_joystick_t *report) {
-#ifdef JOYSTICK_ENABLE
-    osalSysLock();
-    if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
-        osalSysUnlock();
-        return;
-    }
-
-    usbStartTransmitI(&USB_DRIVER, JOYSTICK_IN_EPNUM, (uint8_t *)report, sizeof(report_joystick_t));
-    osalSysUnlock();
-#endif
-}
diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index fb33c8cd0f..dd105e7b5e 100644
--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -17,9 +17,6 @@
 
 #pragma once
 
-// TESTING
-// extern uint8_t blinkLed;
-
 #include <ch.h>
 #include <hal.h>
 
@@ -48,43 +45,6 @@ void usb_event_queue_init(void);
 /* Task to dequeue and execute any handlers for the USB events on the main thread */
 void usb_event_queue_task(void);
 
-/* ---------------
- * Keyboard header
- * ---------------
- */
-
-/* extern report_keyboard_t keyboard_report_sent; */
-
-/* keyboard IN request callback handler */
-void kbd_in_cb(USBDriver *usbp, usbep_t ep);
-
-/* start-of-frame handler */
-void kbd_sof_cb(USBDriver *usbp);
-
-#ifdef NKRO_ENABLE
-/* nkro IN callback hander */
-void nkro_in_cb(USBDriver *usbp, usbep_t ep);
-#endif /* NKRO_ENABLE */
-
-/* ------------
- * Mouse header
- * ------------
- */
-
-#ifdef MOUSE_ENABLE
-
-/* mouse IN request callback handler */
-void mouse_in_cb(USBDriver *usbp, usbep_t ep);
-#endif /* MOUSE_ENABLE */
-
-/* ---------------
- * Shared EP header
- * ---------------
- */
-
-/* shared IN request callback handler */
-void shared_in_cb(USBDriver *usbp, usbep_t ep);
-
 /* --------------
  * Console header
  * --------------
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index f8b7a863aa..6e842f6984 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -240,7 +240,7 @@ enum usb_endpoints {
 #        ifdef USB_ENDPOINTS_ARE_REORDERABLE
 #            define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
 #        else
-    CONSOLE_OUT_EPNUM   = NEXT_EPNUM,
+    CONSOLE_OUT_EPNUM = NEXT_EPNUM,
 #        endif
 #    else
 #        define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
@@ -265,23 +265,14 @@ enum usb_endpoints {
     CDC_OUT_EPNUM         = NEXT_EPNUM,
 #    endif
 #endif
+
 #ifdef JOYSTICK_ENABLE
     JOYSTICK_IN_EPNUM = NEXT_EPNUM,
-#    ifdef USB_ENDPOINTS_ARE_REORDERABLE
-    JOYSTICK_OUT_EPNUM = JOYSTICK_IN_EPNUM,
-#    else
-    JOYSTICK_OUT_EPNUM    = NEXT_EPNUM,
-#    endif
 #endif
 
 #ifdef DIGITIZER_ENABLE
 #    if !defined(DIGITIZER_SHARED_EP)
     DIGITIZER_IN_EPNUM = NEXT_EPNUM,
-#        ifdef USB_ENDPOINTS_ARE_REORDERABLE
-    DIGITIZER_OUT_EPNUM = DIGITIZER_IN_EPNUM,
-#        else
-    DIGITIZER_OUT_EPNUM = NEXT_EPNUM,
-#        endif
 #    else
 #        define DIGITIZER_IN_EPNUM SHARED_IN_EPNUM
 #    endif

From 14b522bb34df9fa9a7f1c8857434518e35d3a312 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 13 Oct 2022 02:22:16 +0100
Subject: [PATCH 622/959] Remove keymaps that still reference legacy macros
 (#18690)

---
 keyboards/tada68/keymaps/mtdjr/keymap.c       |  44 -
 keyboards/tada68/keymaps/mtdjr/readme.md      |   3 -
 keyboards/tada68/keymaps/mtdjr/rules.mk       |  18 -
 keyboards/xiudi/xd75/keymaps/mtdjr/config.h   |  21 -
 keyboards/xiudi/xd75/keymaps/mtdjr/keymap.c   |  37 -
 keyboards/xiudi/xd75/keymaps/mtdjr/readme.md  |   1 -
 keyboards/xiudi/xd75/keymaps/mtdjr/rules.mk   |  19 -
 .../community/ergodox/ab/keyboard-layout.json | 387 -------
 layouts/community/ergodox/ab/keymap.c         | 152 ---
 layouts/community/ergodox/ab/readme.md        |  21 -
 layouts/community/ergodox/ab/rules.mk         |   7 -
 layouts/community/ergodox/absenth/keymap.c    | 179 ----
 layouts/community/ergodox/absenth/readme.md   |  11 -
 layouts/community/ergodox/adam/config.h       |   5 -
 layouts/community/ergodox/adam/keymap.c       | 144 ---
 layouts/community/ergodox/adam/readme.md      |   3 -
 layouts/community/ergodox/albert/config.h     |   7 -
 layouts/community/ergodox/albert/keymap.c     | 661 ------------
 layouts/community/ergodox/albert/readme.md    | 188 ----
 layouts/community/ergodox/albert/rules.mk     |   2 -
 layouts/community/ergodox/alexjj/keymap.c     | 231 -----
 layouts/community/ergodox/alexjj/readme.md    | 179 ----
 layouts/community/ergodox/bepo/keymap.c       | 368 -------
 layouts/community/ergodox/bepo/readme.md      |  36 -
 layouts/community/ergodox/bepo/rules.mk       |   7 -
 layouts/community/ergodox/bepo_csa/keymap.c   | 524 ----------
 layouts/community/ergodox/bepo_csa/readme.md  | 162 ---
 layouts/community/ergodox/bryan/keymap.c      | 222 ----
 .../ergodox/common_nighthawk/keymap.c         | 212 ----
 .../ergodox/common_nighthawk/rules.mk         |   4 -
 layouts/community/ergodox/csharp_dev/keymap.c | 235 -----
 .../community/ergodox/csharp_dev/readme.md    |  48 -
 .../ergodox/dvorak_programmer/README.md       |  39 -
 .../ergodox/dvorak_programmer/keymap.c        | 406 --------
 .../ergodox/dvorak_programmer/rules.mk        |   8 -
 .../ergodox/dvorak_programmer_swe/keymap.c    | 328 ------
 .../ergodox/dvorak_programmer_swe/readme.md   |  57 --
 .../community/ergodox/dvorak_spanish/keymap.c | 279 -----
 .../ergodox/dvorak_spanish/readme.md          |  98 --
 .../community/ergodox/french_hacker/keymap.c  | 168 ---
 .../community/ergodox/french_hacker/readme.md |  27 -
 layouts/community/ergodox/galson/keymap.c     | 179 ----
 layouts/community/ergodox/galson/readme.md    |  11 -
 layouts/community/ergodox/galson/rules.mk     |   2 -
 .../ergodox/german-manuneo/compile_keymap.py  | 684 -------------
 .../community/ergodox/german-manuneo/keymap.c | 781 --------------
 .../ergodox/german-manuneo/keymap.md          | 188 ----
 .../community/ergodox/ishigoya-jp/keymap.c    | 958 ------------------
 .../community/ergodox/ishigoya-jp/readme.md   |  54 -
 layouts/community/ergodox/italian/keymap.c    | 219 ----
 layouts/community/ergodox/italian/readme.md   |  72 --
 layouts/community/ergodox/josh/keymap.c       | 210 ----
 layouts/community/ergodox/josh/readme.md      |   8 -
 layouts/community/ergodox/kristian/keymap.c   |  75 --
 layouts/community/ergodox/osx_de/keymap.c     | 359 -------
 .../ergodox/osx_de/osx_de_highres.png.md      |   1 -
 layouts/community/ergodox/osx_de/readme.md    |  40 -
 .../ergodox/osx_de_experimental/keymap.c      | 592 -----------
 .../osx_de_experimental_highres.png.md        |   1 -
 .../ergodox/osx_de_experimental/readme.md     |  21 -
 .../ergodox/swissgerman/keyboard-layout.json  | 419 --------
 .../swissgerman/keyboard-layout_1_2.json      | 436 --------
 .../community/ergodox/swissgerman/keymap.c    | 283 ------
 .../community/ergodox/swissgerman/readme.md   |  15 -
 layouts/community/ergodox/tm2030/keymap.c     | 239 -----
 layouts/community/ergodox/tm2030/readme.md    | 136 ---
 layouts/community/ergodox/townk_osx/config.h  |  40 -
 layouts/community/ergodox/townk_osx/keymap.c  | 279 -----
 layouts/community/ergodox/townk_osx/readme.md |  77 --
 layouts/community/ergodox/townk_osx/rules.mk  |   2 -
 layouts/community/ergodox/twey/keymap.c       | 232 -----
 layouts/community/ergodox/twey/readme.md      |  14 -
 layouts/community/ergodox/twey/rules.mk       |   4 -
 .../ergodox/win10_writers-block/config.h      |  30 -
 .../ergodox/win10_writers-block/keymap.c      | 324 ------
 .../ergodox/win10_writers-block/readme.md     | 113 ---
 .../ergodox/win10_writers-block/rules.mk      |   7 -
 layouts/community/ortho_4x12/crs/config.h     |  28 -
 layouts/community/ortho_4x12/crs/keymap.c     | 253 -----
 layouts/community/ortho_4x12/crs/readme.md    |  15 -
 users/mtdjr/config.h                          |   7 -
 users/mtdjr/mtdjr.c                           | 163 ---
 users/mtdjr/mtdjr.h                           |  99 --
 users/mtdjr/readme.md                         |  14 -
 users/mtdjr/rules.mk                          |   2 -
 users/mtdjr/solenoid.h                        |  98 --
 86 files changed, 13332 deletions(-)
 delete mode 100644 keyboards/tada68/keymaps/mtdjr/keymap.c
 delete mode 100644 keyboards/tada68/keymaps/mtdjr/readme.md
 delete mode 100644 keyboards/tada68/keymaps/mtdjr/rules.mk
 delete mode 100644 keyboards/xiudi/xd75/keymaps/mtdjr/config.h
 delete mode 100644 keyboards/xiudi/xd75/keymaps/mtdjr/keymap.c
 delete mode 100644 keyboards/xiudi/xd75/keymaps/mtdjr/readme.md
 delete mode 100644 keyboards/xiudi/xd75/keymaps/mtdjr/rules.mk
 delete mode 100644 layouts/community/ergodox/ab/keyboard-layout.json
 delete mode 100644 layouts/community/ergodox/ab/keymap.c
 delete mode 100644 layouts/community/ergodox/ab/readme.md
 delete mode 100644 layouts/community/ergodox/ab/rules.mk
 delete mode 100644 layouts/community/ergodox/absenth/keymap.c
 delete mode 100644 layouts/community/ergodox/absenth/readme.md
 delete mode 100644 layouts/community/ergodox/adam/config.h
 delete mode 100644 layouts/community/ergodox/adam/keymap.c
 delete mode 100644 layouts/community/ergodox/adam/readme.md
 delete mode 100644 layouts/community/ergodox/albert/config.h
 delete mode 100644 layouts/community/ergodox/albert/keymap.c
 delete mode 100644 layouts/community/ergodox/albert/readme.md
 delete mode 100644 layouts/community/ergodox/albert/rules.mk
 delete mode 100644 layouts/community/ergodox/alexjj/keymap.c
 delete mode 100644 layouts/community/ergodox/alexjj/readme.md
 delete mode 100644 layouts/community/ergodox/bepo/keymap.c
 delete mode 100644 layouts/community/ergodox/bepo/readme.md
 delete mode 100644 layouts/community/ergodox/bepo/rules.mk
 delete mode 100644 layouts/community/ergodox/bepo_csa/keymap.c
 delete mode 100644 layouts/community/ergodox/bepo_csa/readme.md
 delete mode 100644 layouts/community/ergodox/bryan/keymap.c
 delete mode 100644 layouts/community/ergodox/common_nighthawk/keymap.c
 delete mode 100644 layouts/community/ergodox/common_nighthawk/rules.mk
 delete mode 100644 layouts/community/ergodox/csharp_dev/keymap.c
 delete mode 100644 layouts/community/ergodox/csharp_dev/readme.md
 delete mode 100644 layouts/community/ergodox/dvorak_programmer/README.md
 delete mode 100644 layouts/community/ergodox/dvorak_programmer/keymap.c
 delete mode 100644 layouts/community/ergodox/dvorak_programmer/rules.mk
 delete mode 100644 layouts/community/ergodox/dvorak_programmer_swe/keymap.c
 delete mode 100644 layouts/community/ergodox/dvorak_programmer_swe/readme.md
 delete mode 100644 layouts/community/ergodox/dvorak_spanish/keymap.c
 delete mode 100644 layouts/community/ergodox/dvorak_spanish/readme.md
 delete mode 100644 layouts/community/ergodox/french_hacker/keymap.c
 delete mode 100644 layouts/community/ergodox/french_hacker/readme.md
 delete mode 100644 layouts/community/ergodox/galson/keymap.c
 delete mode 100644 layouts/community/ergodox/galson/readme.md
 delete mode 100644 layouts/community/ergodox/galson/rules.mk
 delete mode 100644 layouts/community/ergodox/german-manuneo/compile_keymap.py
 delete mode 100644 layouts/community/ergodox/german-manuneo/keymap.c
 delete mode 100644 layouts/community/ergodox/german-manuneo/keymap.md
 delete mode 100644 layouts/community/ergodox/ishigoya-jp/keymap.c
 delete mode 100644 layouts/community/ergodox/ishigoya-jp/readme.md
 delete mode 100644 layouts/community/ergodox/italian/keymap.c
 delete mode 100644 layouts/community/ergodox/italian/readme.md
 delete mode 100644 layouts/community/ergodox/josh/keymap.c
 delete mode 100644 layouts/community/ergodox/josh/readme.md
 delete mode 100644 layouts/community/ergodox/kristian/keymap.c
 delete mode 100644 layouts/community/ergodox/osx_de/keymap.c
 delete mode 100644 layouts/community/ergodox/osx_de/osx_de_highres.png.md
 delete mode 100644 layouts/community/ergodox/osx_de/readme.md
 delete mode 100644 layouts/community/ergodox/osx_de_experimental/keymap.c
 delete mode 100644 layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md
 delete mode 100644 layouts/community/ergodox/osx_de_experimental/readme.md
 delete mode 100644 layouts/community/ergodox/swissgerman/keyboard-layout.json
 delete mode 100644 layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json
 delete mode 100644 layouts/community/ergodox/swissgerman/keymap.c
 delete mode 100644 layouts/community/ergodox/swissgerman/readme.md
 delete mode 100644 layouts/community/ergodox/tm2030/keymap.c
 delete mode 100644 layouts/community/ergodox/tm2030/readme.md
 delete mode 100644 layouts/community/ergodox/townk_osx/config.h
 delete mode 100644 layouts/community/ergodox/townk_osx/keymap.c
 delete mode 100644 layouts/community/ergodox/townk_osx/readme.md
 delete mode 100644 layouts/community/ergodox/townk_osx/rules.mk
 delete mode 100644 layouts/community/ergodox/twey/keymap.c
 delete mode 100644 layouts/community/ergodox/twey/readme.md
 delete mode 100644 layouts/community/ergodox/twey/rules.mk
 delete mode 100644 layouts/community/ergodox/win10_writers-block/config.h
 delete mode 100644 layouts/community/ergodox/win10_writers-block/keymap.c
 delete mode 100644 layouts/community/ergodox/win10_writers-block/readme.md
 delete mode 100644 layouts/community/ergodox/win10_writers-block/rules.mk
 delete mode 100644 layouts/community/ortho_4x12/crs/config.h
 delete mode 100644 layouts/community/ortho_4x12/crs/keymap.c
 delete mode 100644 layouts/community/ortho_4x12/crs/readme.md
 delete mode 100644 users/mtdjr/config.h
 delete mode 100644 users/mtdjr/mtdjr.c
 delete mode 100644 users/mtdjr/mtdjr.h
 delete mode 100644 users/mtdjr/readme.md
 delete mode 100644 users/mtdjr/rules.mk
 delete mode 100644 users/mtdjr/solenoid.h

diff --git a/keyboards/tada68/keymaps/mtdjr/keymap.c b/keyboards/tada68/keymaps/mtdjr/keymap.c
deleted file mode 100644
index d75b9bf4a8..0000000000
--- a/keyboards/tada68/keymaps/mtdjr/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mtdjr.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Ins |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Gui |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_QWERTY] = 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_INS, \
-  KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,    KC_LBRC,  KC_RBRC,KC_BSLS, KC_DEL, \
-  KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN, KC_QUOT,    KC_ENT,        KC_PGUP,  \
-  KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,  KC_RSFT,KC_UP,   KC_PGDN, \
-  KC_LCTL,KC_LALT,KC_LGUI,                KC_SPC,                         KC_RALT,KC_LOWR, KC_RCTRL, KC_LEFT,KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Grv |
-   * |----------------------------------------------------------------|
-   * |     |  RT | PPLY| PS |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      | BL- |BL | BL+|BLG|   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |CP|PST |   | PLY| NXT|MUT|VD |VU | McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_LOWER] = LAYOUT_ansi(
-  _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRV,  \
-  _______,KC_ROOT,KC_PPLY,KC_PSEF,_______,_______,_______,_______,_______,_______,KC_PSCR,_______,_______,_______, KC_HOME, \
-  _______,BL_DEC ,BL_TOGG,BL_INC,BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        _______, KC_END,  \
-  _______,_______ ,_______,KC_XCPY,KC_XINS,_______,KC_MPLY,KC_MNXT,KC_MUTE,KC_VOLD,KC_VOLU,KC_BTN1,KC_MS_U,KC_BTN2, \
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_R),
-};
diff --git a/keyboards/tada68/keymaps/mtdjr/readme.md b/keyboards/tada68/keymaps/mtdjr/readme.md
deleted file mode 100644
index 53412d7c25..0000000000
--- a/keyboards/tada68/keymaps/mtdjr/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# default TADA68 layout
-
-This layout replicates the default factory layout of the TADA68.
diff --git a/keyboards/tada68/keymaps/mtdjr/rules.mk b/keyboards/tada68/keymaps/mtdjr/rules.mk
deleted file mode 100644
index 14367f2f8a..0000000000
--- a/keyboards/tada68/keymaps/mtdjr/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/xiudi/xd75/keymaps/mtdjr/config.h b/keyboards/xiudi/xd75/keymaps/mtdjr/config.h
deleted file mode 100644
index f70569b024..0000000000
--- a/keyboards/xiudi/xd75/keymaps/mtdjr/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides here
-#undef MANUFACTURER
-#define MANUFACTURER    "mtdjr"
diff --git a/keyboards/xiudi/xd75/keymaps/mtdjr/keymap.c b/keyboards/xiudi/xd75/keymaps/mtdjr/keymap.c
deleted file mode 100644
index 98e21cf32f..0000000000
--- a/keyboards/xiudi/xd75/keymaps/mtdjr/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mtdjr.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_ortho_5x15(
-        KC_EXC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PGUP, KC_MPNT, KC_PGDN, 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_INS,  KC_HOME, KC_DEL,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_EQL,  KC_ELCK, KC_MINS, 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_LBRC, KC_BSLS, KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ELCK,
-        KC_LOWR, KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC,  KC_LOWR, KC_RASE, XXXXXXX, KC_SPC,  KC_APP,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-    [_LOWER] = LAYOUT_ortho_5x15(
-        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        XXXXXXX, KC_ROOT, KC_PPLY, KC_PSEF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, KC_MPLY, XXXXXXX, KC_MNXT, KC_VOLD, KC_VOLU, KC_MNXT
-    ),
-
-    [_RAISE] = LAYOUT_ortho_5x15(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RST,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BLI,  XXXXXXX, KC_BLD,  XXXXXXX, XXXXXXX, XXXXXXX, KC_XLCK, XXXXXXX, XXXXXXX,
-        KC_RGB,  KC_RHUI, KC_RHUD, KC_RSAI, KC_RSAD, KC_RVAI, KC_RVAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R
-    )
-};
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        capslock_led_on();
-    } else {
-        capslock_led_off();
-    }
-    return false;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/mtdjr/readme.md b/keyboards/xiudi/xd75/keymaps/mtdjr/readme.md
deleted file mode 100644
index d53c0f34a8..0000000000
--- a/keyboards/xiudi/xd75/keymaps/mtdjr/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for xd75
diff --git a/keyboards/xiudi/xd75/keymaps/mtdjr/rules.mk b/keyboards/xiudi/xd75/keymaps/mtdjr/rules.mk
deleted file mode 100644
index 6b7d69d4f2..0000000000
--- a/keyboards/xiudi/xd75/keymaps/mtdjr/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BACKLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/layouts/community/ergodox/ab/keyboard-layout.json b/layouts/community/ergodox/ab/keyboard-layout.json
deleted file mode 100644
index e2badad4de..0000000000
--- a/layouts/community/ergodox/ab/keyboard-layout.json
+++ /dev/null
@@ -1,387 +0,0 @@
-[
-  {
-    "name": "Beginner's Keymap for Ergodox-EZ",
-    "author": "Anand Babu Periasamy"
-  },
-  [
-    {
-      "x": 3.5
-    },
-    "#\n3\n\n\nF3",
-    {
-      "x": 10.5
-    },
-    ")\n0\n\n\nF10"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "@\n2\n\n\nF2",
-    {
-      "x": 1
-    },
-    "$\n4\n\n\nF4",
-    {
-      "x": 8.5
-    },
-    "(\n9\n\n\nF9",
-    {
-      "x": 1
-    },
-    "_\n-\n\n\nF11"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "%\n5\n\n\nF5",
-    "^\n6\n\n\nF6",
-    {
-      "x": 4.5
-    },
-    "&\n7\n\n\nF7",
-    "*\n8\n\n\nF8"
-  ],
-  [
-    {
-      "y": -0.875,
-      "w": 1.5
-    },
-    "~\n`\n\n\nEsc",
-    "!\n1\n\n\nF1",
-    {
-      "x": 14.5
-    },
-    "+\n=\n\n\nF12",
-    {
-      "a": 7,
-      "w": 1.5
-    },
-    "Backspace\n\n\n\nBackspace"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5
-    },
-    "E\n\n\n\n<i class=\"fa fa-caret-up\" aria-hidden=\"true\"></i>",
-    {
-      "x": 10.5
-    },
-    "I"
-  ],
-  [
-    {
-      "y": -0.8799999999999999,
-      "x": 2.5
-    },
-    "W"
-  ],
-  [
-    {
-      "y": -0.9950000000000001,
-      "x": 4.5,
-      "a": 4
-    },
-    "R",
-    {
-      "x": 8.5,
-      "a": 7
-    },
-    "U",
-    {
-      "x": 1
-    },
-    "O"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "T",
-    {
-      "h": 1.5
-    },
-    "<i class=\"fa fa-chevron-circle-left\" aria-hidden=\"true\"></i>",
-    {
-      "x": 4.5,
-      "h": 1.5
-    },
-    "<i class=\"fa fa-chevron-circle-right\" aria-hidden=\"true\"></i>",
-    "Y"
-  ],
-  [
-    {
-      "y": -0.875,
-      "a": 6,
-      "w": 1.5
-    },
-    "Tab",
-    {
-      "a": 7
-    },
-    "Q",
-    {
-      "x": 14.5
-    },
-    "P",
-    {
-      "a": 4,
-      "w": 1.5
-    },
-    "|\n\\"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5,
-      "a": 7
-    },
-    "D\n\n\n\n<i class=\"fa fa-caret-down\" aria-hidden=\"true\"></i>",
-    {
-      "x": 10.5
-    },
-    "K"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "S\n\n\n\n<i class=\"fa fa-caret-left\" aria-hidden=\"true\"></i>",
-    {
-      "x": 1,
-      "c": "#c4bcbc"
-    },
-    "F\n\n\n\n<i class=\"fa fa-caret-right\" aria-hidden=\"true\"></i>",
-    {
-      "x": 8.5
-    },
-    "J",
-    {
-      "x": 1,
-      "c": "#cccccc"
-    },
-    "L"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "G",
-    {
-      "x": 6.5
-    },
-    "H"
-  ],
-  [
-    {
-      "y": -0.875,
-      "a": 4,
-      "fa": [
-        0,
-        0,
-        0,
-        2
-      ],
-      "w": 1.5
-    },
-    "\n\n\nCtrl\n\n\nCaps",
-    {
-      "a": 7
-    },
-    "A",
-    {
-      "x": 14.5,
-      "a": 4
-    },
-    ":\n;",
-    {
-      "a": 7,
-      "w": 1.5
-    },
-    "Enter"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6.5,
-      "h": 1.5
-    },
-    "PgDn",
-    {
-      "x": 4.5,
-      "h": 1.5
-    },
-    "PgUp"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3.5
-    },
-    "C\n\n\n\n<i class=\"fa fa-hand-o-up\" aria-hidden=\"true\"></i>",
-    {
-      "x": 10.5,
-      "a": 4
-    },
-    "<\n,"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5,
-      "a": 7
-    },
-    "X\n\n\n\n<i class=\"fa fa-hand-o-left\" aria-hidden=\"true\"></i>",
-    {
-      "x": 1
-    },
-    "V\n\n\n\n<i class=\"fa fa-hand-o-right\" aria-hidden=\"true\"></i>",
-    {
-      "x": 8.5
-    },
-    "M",
-    {
-      "x": 1,
-      "a": 4
-    },
-    ">\n."
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5,
-      "a": 7
-    },
-    "B",
-    {
-      "x": 6.5
-    },
-    "N"
-  ],
-  [
-    {
-      "y": -0.875,
-      "w": 1.5
-    },
-    "Shift",
-    "Z",
-    {
-      "x": 14.5,
-      "a": 4
-    },
-    "?\n/",
-    {
-      "w": 1.5
-    },
-    "\"\n'"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5,
-      "a": 7
-    },
-    "Alt\n\n\n\n<i class=\"fa fa-search-minus\" aria-hidden=\"true\"></i>",
-    {
-      "x": 10.5
-    },
-    "<i class=\"fa fa-long-arrow-down\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-down'></i>"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "<i class='fa fa-linux'></i>\n\n\n\n<i class=\"fa fa-search\" aria-hidden=\"true\"></i>",
-    {
-      "x": 1
-    },
-    "Alt\n\n\n\n<i class=\"fa fa-search-plus\" aria-hidden=\"true\"></i>",
-    {
-      "x": 8.5
-    },
-    "<i class=\"fa fa-long-arrow-left\" aria-hidden=\"true\"></i>\n\n\n\n<i class=\"fa fa-undo\" aria-hidden=\"true\"></i>",
-    {
-      "x": 1
-    },
-    "<i class=\"fa fa-long-arrow-up\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-up'></i>"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 0.5
-    },
-    "Ctrl\n\n\n\n<i class='fa fa-download'></i>",
-    "Esc",
-    {
-      "x": 14.5
-    },
-    "<i class=\"fa fa-long-arrow-right\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-off'></i>",
-    "Fn"
-  ],
-  [
-    {
-      "r": 30,
-      "rx": 6.5,
-      "ry": 4.25,
-      "y": -1,
-      "x": 1
-    },
-    "<i class=\"fa fa-clone\" aria-hidden=\"true\"></i>",
-    "("
-  ],
-  [
-    {
-      "h": 2
-    },
-    "Space",
-    {
-      "h": 2
-    },
-    "Del",
-    "["
-  ],
-  [
-    {
-      "x": 2
-    },
-    "{"
-  ],
-  [
-    {
-      "r": -30,
-      "rx": 13,
-      "y": -1,
-      "x": -3
-    },
-    ")",
-    "<i class=\"fa fa-paste\" aria-hidden=\"true\"></i>"
-  ],
-  [
-    {
-      "x": -3
-    },
-    "]",
-    {
-      "h": 2
-    },
-    "Enter",
-    {
-      "h": 2
-    },
-    "<i class=\"fa fa-chevron-left\" aria-hidden=\"true\"></i>"
-  ],
-  [
-    {
-      "x": -3
-    },
-    "}"
-  ]
-]
\ No newline at end of file
diff --git a/layouts/community/ergodox/ab/keymap.c b/layouts/community/ergodox/ab/keymap.c
deleted file mode 100644
index 0046f5ed21..0000000000
--- a/layouts/community/ergodox/ab/keymap.c
+++ /dev/null
@@ -1,152 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define BASE 0 // default layer
-#define FN1  1 // media layer
-
-#define CAPS_CTL CTL_T(KC_CAPS)  // Caps on tap, Ctrl on hold.
-#define COPY     LCTL(KC_V)      // C-c Copy
-#define PASTE    LCTL(KC_V)      // C-v Paste
-#define ZM_NRM   LCTL(KC_0)      // C-0 Zoom Normal
-#define ZM_OUT   LCTL(KC_MINS)   // C-- Zoom Out
-#define ZM_IN    LCTL(KC_PLUS)   // C-+ Zoom In
-#define EM_UNDO  LCTL(KC_UNDS)   // C-_ Emacs Undo
-
-#define _MOB  1 // Mobile#
-#define _CUS1 2 // Custom macro 1
-#define _CUS2 3 // Custom macro 2
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  |  6   |           |   7  |   8  |   9  |   0  |   -  |   =  | BSpace |
- * |--------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  | Fwd  |           | Back |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |Caps/Ctl|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | Enter  |
- * |--------+------+------+------+------+------| PgDn |           | PgUp |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  |   '    |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  Esc | LGui | Alt  | Alt  |                                       | Left |  Dn  |  Up  | Right|  Fn  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Copy |  (   |       |   )  | Paste|
- *                                 ,------|------+------|       |------+------+------.
- *                                 |      |      |  [   |       |   ]  |      |      |
- *                                 |Space | Del  |------|       |------| Enter|BSpace|
- *                                 |      |      |  {   |       |   }  |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-    [BASE] = LAYOUT_ergodox(  // layer 0 : default
-	// Left hand
-	KC_GRV,   KC_1,    KC_2,    KC_3,     KC_4,     KC_5,    KC_6,
-	KC_TAB,   KC_Q,    KC_W,    KC_E,     KC_R,     KC_T,    KC_WBAK,
-	CAPS_CTL, KC_A,    KC_S,    KC_D,     KC_F,     KC_G,
-	KC_LSFT,  KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,    KC_PGDN,
-	KC_LCTL,  KC_ESC,  KC_LGUI, KC_LALT,  KC_LALT,
-	COPY,     KC_LCBR,
-	KC_LPRN,
-	KC_SPC,   KC_DEL,  KC_LBRC,
-	// Right hand
-	KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
-	KC_WFWD,  KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSLS,
-	KC_H,     KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_ENT,
-	KC_PGUP,  KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_QUOT,
-	KC_LEFT,  KC_DOWN, KC_UP,   KC_RIGHT, TG(FN1),
-	KC_RCBR,  PASTE,
-	KC_RPRN,
-	KC_RBRC,  KC_ENT,  KC_BSPC),
-/* Keymap 1: Fn Keys, media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  Esc   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | BSpace |
- * |--------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      | LClk | MClk | RClk |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Teensy|      | ZmNrm| ZmOut| ZmIn |                                       | Undo |VolDn |VolUp | Mute |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------+------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// FN1 Layer
-    [FN1] = LAYOUT_ergodox(
-	// Left hand
-	KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-	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_BTN1, KC_BTN3, KC_BTN2, KC_TRNS, KC_TRNS,
-	QK_BOOT, KC_TRNS, ZM_NRM,  ZM_OUT,  ZM_IN,
-	KC_TRNS, KC_TRNS,
-	KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS,
-	// Right hand
-	KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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_MPLY,
-	KC_TRNS, M(_MOB), KC_TRNS, M(_CUS1),M(_CUS2),KC_TRNS, KC_TRNS,
-	EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS,
-	KC_TRNS, KC_TRNS,
-	KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS
-	),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    // MACRODOWN only works in this function
-    switch(id) {
-    case _MOB: // Your mobile# here.
-	return MACRODOWN(T(1), T(2), T(3), T(MINS),
-			 T(1), T(2), T(3), T(MINS),
-			 T(1), T(2), T(3), T(4),
-			 END);
-    case _CUS1: // Your custom macro 1
-	return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(SPC), END);
-    case _CUS2: // Your custom macro 2
-	return MACRODOWN(T(L), T(S), T(SPC), T(MINS), T(L), T(ENT), END);
-    };
-    return MACRO_NONE;
-};
-
-// 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/layouts/community/ergodox/ab/readme.md b/layouts/community/ergodox/ab/readme.md
deleted file mode 100644
index 22a7922d97..0000000000
--- a/layouts/community/ergodox/ab/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Beginner's keymap for Ergodox-EZ
-Beginner's keymap emulates standard QWERTY keyboard for beginners. Once you get comfortable with the Ergodox-EZ, you may fork this keymap and customize it for your own needs or find a suitable one from the community contributed keymaps. 
-
-![Beginner's Keymap](https://i.imgur.com/dAIocc8.png)
-
-#### Pros
-* Easier to switch between regular keyboards and Ergodox-EZ.
-* Easy on beginners. It has everything you need for your day to day usage.
-
-#### Cons
-* Keys are not ergonomically placed to take full advantage of Ergodox-EZ. Take a look at this [Default Keymap](https://github.com/qmk/qmk_firmware/blob/master/layouts/default/ergodox/default_ergodox/keymap.c)
-* While multiple layers are possible, beginner's keymap only uses one additional layer for mouse, function and volume keys.
-
-#### Notes
-* Ideally number key [6] should have started from the right-hand side of the keyboard. Doing so breaks the familiar QWERTY layout.
-* Quote key ['] should have been placed between [:] and [Enter]. Due to lack of key space, it is placed below [Enter].
-* Double [Alt] keys are placed adjacent to each other for convenience.
-* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users.
-* Additional bracket keys are placed in the center of the keyboard for programmer's convenience.
-
-
diff --git a/layouts/community/ergodox/ab/rules.mk b/layouts/community/ergodox/ab/rules.mk
deleted file mode 100644
index 839dd82e1e..0000000000
--- a/layouts/community/ergodox/ab/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Having a file like this allows you to override Makefile definitions
-# for your own particular keymap
-
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-COMMAND_ENABLE   = no  # Commands for debug and configuration
-
-
diff --git a/layouts/community/ergodox/absenth/keymap.c b/layouts/community/ergodox/absenth/keymap.c
deleted file mode 100644
index 884167aa31..0000000000
--- a/layouts/community/ergodox/absenth/keymap.c
+++ /dev/null
@@ -1,179 +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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   | A/L2 |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LS/PO  |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RS/PC  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
-        KC_BSPC,        LT(MDIA, KC_A),         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSPO,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
-                                              ALT_T(KC_APP),  KC_LGUI,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(SYMB),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
-                          KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-             MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSPC,
-                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------| left | down |  up  | down |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 | Lclk | Rclk |------|       |------|      |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_BTN1, KC_BTN2, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,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
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-// 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/layouts/community/ergodox/absenth/readme.md b/layouts/community/ergodox/absenth/readme.md
deleted file mode 100644
index 744c67afea..0000000000
--- a/layouts/community/ergodox/absenth/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ErgoDox EZ Absenth Configuration
-
-## Changelog
-
-
-* Sept. 14, 2016 (V0.2):
-  * Added Space Cadet to Left and Right Shift.  Pressing Left shift with no other key adds an "(" and pressing Right shift with no other key adds an ")"
-* Sept. 8, 2016 (V0.1): 
-  * Made A key double as MEDIA Layer change when you hold it.  Added mouse buttons to the large thumb buttons on the left side on the Media Layer.  Added vi/vim style arrow keys on HJKL on media layer.
-
-![Absenth](https://i.imgur.com/D1enl2x.jpg)
diff --git a/layouts/community/ergodox/adam/config.h b/layouts/community/ergodox/adam/config.h
deleted file mode 100644
index 1555ae11fd..0000000000
--- a/layouts/community/ergodox/adam/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/adam/keymap.c b/layouts/community/ergodox/adam/keymap.c
deleted file mode 100644
index 9dd611e03e..0000000000
--- a/layouts/community/ergodox/adam/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-
-#define BASE 0 // default layer
-#define FLOCK 1 // symbols arrows and F keys on F held down
-#define JLOCK 2 // same as Flock but with fall thru J and mapped to J held down
-#define CAPLOCK 3 //caps on until space / enter / esc
-#define SFLOCK 11 // symbols arrows and F keys on F held down
-#define SJLOCK 12 // same as Flock but with fall thru J and mapped to J held down
-
-// Sends macro when key is tapped, presses mod when key is held
-#define tap_mod_macro(record, mod, macro) ( ((record)->event.pressed) ? \
-     ( ((record)->tap.count <= 0 || (record)->tap.interrupted) ? MACRO(D(mod), END) : MACRO_NONE ) : \
-     ( ((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (macro) : MACRO(U(mod), END) ) )
-
-#define tap_mod_shift(record, mod, macro) ( ((record)->event.pressed) ? \
-          ( ((record)->tap.count <= 0 || (record)->tap.interrupted) ? MACRO(D(mod), END) : MACRO_NONE ) : \
-          ( ((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (MACRO( D(LSFT), T(LBRC), U(LSFT), END)) : MACRO(U(mod), END) ) )
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Layout
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |   1  |   2  |   3  |   4  |   5  |      |           |      |   6  |   7  |   8  |   9  |   0  |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |;     |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |  Z   |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |     |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |        |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 |      |      |------|       |------|        |      |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-        [BASE] = LAYOUT_ergodox(
-                // left hand
-                GUI_T(KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS,
-                _______, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TAB,
-                _______, SFT_T(KC_A), ALT_T(KC_S), CTL_T(KC_D), F(FLOCK), GUI_T(KC_G),
-                _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC,
-                _______, _______,  _______,  _______ ,_______,
-                _______,  _______,
-                _______,
-                KC_SPC, _______, _______ ,
-
-                // right hand
-                KC_EQL,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             _______,
-                KC_TAB,     KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             _______,
-                GUI_T(KC_H),   F(JLOCK),   CTL_T(KC_K),   ALT_T(KC_L),   SFT_T(KC_SCLN),           _______,
-                KC_DELETE,  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_QUOT,           _______,
-                _______,  _______,_______,_______,          _______,
-                _______,        _______,
-                _______,
-                _______,_______, KC_ENT
-        ),
-        [FLOCK] = LAYOUT_ergodox(
-                // left hand
-                XXXXXXX,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
-                XXXXXXX,KC_LBRC,XXXXXXX,  XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-                XXXXXXX,S(KC_LBRC),XXXXXXX, XXXXXXX,_______,XXXXXXX,
-                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,TO(CAPLOCK),XXXXXXX,
-                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-                XXXXXXX,XXXXXXX,
-                XXXXXXX,
-                KC_ESC,XXXXXXX,XXXXXXX,
-                // right hand
-                KC_F12, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  XXXXXXX,
-                XXXXXXX, XXXXXXX, KC_HOME,   KC_PGUP,    XXXXXXX,    KC_RBRC, XXXXXXX,
-                KC_LEFT, KC_DOWN,   KC_UP,    KC_RIGHT,    S(KC_RBRC), XXXXXXX,
-                XXXXXXX, XXXXXXX, KC_END,   KC_PGDOWN,    KC_QUES,    KC_SLSH, XXXXXXX,
-                XXXXXXX, XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,
-                XXXXXXX, XXXXXXX,
-                XXXXXXX,
-                XXXXXXX, XXXXXXX, XXXXXXX
-        ),
-        [JLOCK] = LAYOUT_ergodox(
-                // left hand
-                XXXXXXX,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
-                XXXXXXX,KC_LBRC,KC_GRV,  KC_TILD,XXXXXXX,XXXXXXX,XXXXXXX,
-                XXXXXXX,S(KC_LBRC),XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,
-                XXXXXXX,KC_BSLS,KC_PIPE,XXXXXXX,XXXXXXX,TO(CAPLOCK),XXXXXXX,
-                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-                XXXXXXX,XXXXXXX,
-                XXXXXXX,
-                KC_ESC,XXXXXXX,XXXXXXX,
-                // right hand
-                KC_F12, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  XXXXXXX,
-                  XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,    XXXXXXX,    KC_RBRC, XXXXXXX,
-                XXXXXXX, _______,   XXXXXXX,  XXXXXXX,    S(KC_RBRC), XXXXXXX,
-                XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,    XXXXXXX,    XXXXXXX, XXXXXXX,
-                XXXXXXX,XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,
-                XXXXXXX, XXXXXXX,
-                XXXXXXX,
-                XXXXXXX, XXXXXXX, XXXXXXX
-        ),
-        [CAPLOCK] = LAYOUT_ergodox(
-                // left hand
-                TO(BASE), _______, _______, _______, _______, _______, _______,
-                _______, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), _______,
-                // _______, SFT_T(S(KC_A)), ALT_T(KC_S), CTL_T(KC_D), F(FLOCK), GUI_T(KC_G),
-                _______, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G),
-                _______, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), _______,
-                _______, _______,  _______,  _______ ,_______,
-                _______,  _______,
-                _______,
-                TO(BASE), _______, _______ ,
-
-                // right hand
-                _______,     _______,   _______,   _______,   _______,   _______,             _______,
-                _______,     S(KC_Y),   S(KC_U),   S(KC_I),   S(KC_O),   S(KC_P),             _______,
-                         S(KC_H),   S(KC_J),   S(KC_K),   S(KC_L),   S(KC_SCLN),           _______,
-                _______,  S(KC_N),   S(KC_M),   S(KC_COMM),S(KC_DOT), S(KC_QUOT),           _______,
-                _______,  _______,_______,_______,          _______,
-                _______,        _______,
-                _______,
-                _______,_______, TO(BASE)
-        )
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-  uint8_t layer = get_highest_layer(layer_state);
-
-  switch (layer) {
-    // TODO: Make this relevant to the ErgoDox EZ.
-      case 1:
-          break;
-      case 2:
-          break;
-      default:
-          // none
-          break;
-  }
-};
diff --git a/layouts/community/ergodox/adam/readme.md b/layouts/community/ergodox/adam/readme.md
deleted file mode 100644
index 9d03df5d57..0000000000
--- a/layouts/community/ergodox/adam/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Adam's ErgoDox
-
-Currently only really uses keys available on Let's Split, for ease of switching
diff --git a/layouts/community/ergodox/albert/config.h b/layouts/community/ergodox/albert/config.h
deleted file mode 100644
index f0f524b306..0000000000
--- a/layouts/community/ergodox/albert/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* using UK layout for space-cadet-shift */
-#define LSPO_KEY KC_9
-#define RSPC_KEY KC_0
-
-#define LEADER_TIMEOUT 800 // leader key sequence timeout in millis
diff --git a/layouts/community/ergodox/albert/keymap.c b/layouts/community/ergodox/albert/keymap.c
deleted file mode 100644
index 0b2efd3311..0000000000
--- a/layouts/community/ergodox/albert/keymap.c
+++ /dev/null
@@ -1,661 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#include <stdarg.h>
-
-/* use UK keymap */
-
-#define UK_HASH KC_NONUS_HASH
-#define UK_BSLS KC_NONUS_BACKSLASH
-#define UK_PIPE LSFT(UK_BSLS)
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define NUMB 2 // numbers and hex
-#define CRSR 3 // cursor keys
-#define MOUS 4 // mouse keys
-#define KEYW 5 // keyword macros
-#define EMAC 6 // emacs
-
-// my macros
-#define UM_ECET   M(0)  // { }
-#define UM_0x     M(1)
-#define UM_PUB    M(2)
-#define UM_PRO    M(3)
-#define UM_PRV    M(4)
-#define UM_CLS    M(5)
-#define UM_STR    M(6)
-#define UM_RET    M(7)
-#define UM_INC    M(8)
-#define UM_OBJ    M(9)
-#define UM_GITLOG M(10)
-#define UM_GOODM  M(11)
-#define UM_NAMESP M(12)
-#define UM_EMTR   M(14) // emacs toggle read-only
-#define UM_EMWR   M(15) // emacs write buffer (save)
-#define UM_EMUN   M(16) // emacs undo
-#define UM_EMRE   M(17) // emacs redo
-#define UM_EMPB   M(18) // emacs previous buffer
-#define UM_EMNB   M(19) // emacs next buffer
-#define UM_GOODN  M(20)
-#define UM_ECETS  M(22)  // { };
-#define UM_TMPL   M(23)
-#define UM_TYPN   M(24)
-#define UM_CONT   M(25)
-#define UM_BREAK  M(26)
-#define UM_CONST  M(27)
-#define UM_SMILY  M(28)
-#define UM_SADF   M(29)
-#define UM_SCARF  M(30)
-#define UM_DECAF  M(31)
-#define UM_OPER   M(32)
-#define UM_NULP   M(33)
-#define UM_EXTR   M(34)
-#define UM_VIRT   M(35)
-#define UM_EMFB   M(36) // emacs font bigger
-#define UM_EMFS   M(37) // emacs font smaller
-#define UM_VOLAT  M(38)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | ESC    |   1  |   2  |   3  |   4  |   5  | SfLt |           | SfRt |   6  |   7  |   8  |   9  |   0  | BkSp   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  | Del    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Caps/L2|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |Enter/L2|
- * |--------+------+------+------+------+------|  L6  |           |  L6  |------+------+------+------+------+--------|
- * | LSft/( |   Z  |   X  |   C  | V/L3 | B/L4 |      |           |      | N/L4 | M/L3 |   ,  |   .  |   /  | RSft/) |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Ctrl/[| Alt/]|   #  | Left |Right |                                       |  Up  | Down |   -  | Alt/[|Ctrl/]|
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  L2  | lead |       | lead |  Ins |
- *                                 ,------|------|------|       |------+------+------.
- *                                 | Space| BkSp | Home |       | PgUp | Enter|Space |
- *                                 |  /   |  /   |------|       |------|   /  |  /   |
- *                                 | Ctrl | Alt  |End/L5|       |PDn/L5|  Alt | Ctrl |
- *                                 `--------------------'       `--------------------'
- */
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,            KC_1,            KC_2,       KC_3,      KC_4,           KC_5,           LSFT(KC_LEFT),
-        KC_TAB,            KC_Q,            KC_W,       KC_E,      KC_R,           KC_T,           MO(SYMB),
-        LT(NUMB, KC_CAPS), KC_A,            KC_S,       KC_D,      KC_F,           KC_G,
-        KC_LSPO,           KC_Z,            KC_X,       KC_C,      LT(CRSR, KC_V), LT(MOUS, KC_B), MO(EMAC),
-        CTL_T(KC_LBRC),    ALT_T(KC_RBRC),  UK_HASH,    KC_LEFT,   KC_RGHT,
-                                                                                     TG(NUMB),        KC_LEAD,
-                                                                                                      KC_HOME,
-                                                                     CTL_T(KC_SPC),  ALT_T(KC_BSPC),  LT(KEYW, KC_END),
-        // right hand
-             LSFT(KC_RGHT),   KC_6,            KC_7,            KC_8,      KC_9,       KC_0,             KC_BSPC,
-             MO(SYMB),        KC_Y,            KC_U,            KC_I,      KC_O,       KC_P,             KC_DEL,
-                              KC_H,            KC_J,            KC_K,      KC_L,       KC_SCLN,          LT(NUMB, KC_ENT),
-             MO(EMAC),        LT(MOUS, KC_N),  LT(CRSR, KC_M),  KC_COMM,   KC_DOT,     KC_SLSH,          KC_RSPC,
-                                               KC_UP,           KC_DOWN,   KC_MINS,    ALT_T(KC_LBRC),   CTL_T(KC_RBRC),
-           KC_LEAD,            KC_INS,
-           KC_PGUP,
-           LT(KEYW, KC_PGDN),  ALT_T(KC_ENT),   CTL_T(KC_SPC)
-    ),
-/* Keymap 1: Symbol Layer with F keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   ##   |  F1  |  F2  |  F3  |  F4  |  F5  |  ##  |           |  ##  |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |   ##   |   !  |   "  |   £  |   $  |   %  |  ##  |           |  ##  |   -  |   +  |   =  |   @  |   ~  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   ##   |   ^  |   &  |   *  |   _  |   #  |------|           |------|   {  |   }  |   ;  |   '  |   #  |   ##   |
- * |--------+------+------+------+------+------|  ##  |           |  ##  |------+------+------+------+------+--------|
- * |   ##   |   \  |   |  |   `  |   -  |   /  |      |           |      |   [  |   ]  |   <  |   >  |   ?  |   ##   |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |  ##  |  ##  |  ##  |  ##  |  ##  |                                       |  ##  |  ##  |  ##  |  ##  |  ##  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  ##  |  ##  |       |  ##  |  ##  |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |  ##  |       |  ##  |      |      |
- *                                 |  ##  |  ##  |------|       |------|  ##  |  ##  |
- *                                 |      |      |  ##  |       |  ##  |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[SYMB] = LAYOUT_ergodox(
-        // left hand
-        KC_TRNS,   KC_F1,       KC_F2,       KC_F3,       KC_F4,          KC_F5,       KC_TRNS,
-        KC_TRNS,   KC_EXLM,     LSFT(KC_2),  LSFT(KC_3),  LSFT(KC_4),     LSFT(KC_5),  KC_TRNS,
-        KC_TRNS,   LSFT(KC_6),  LSFT(KC_7),  LSFT(KC_8),  LSFT(KC_MINS),  UK_HASH,
-        KC_TRNS,   UK_BSLS,     UK_PIPE,     KC_GRV,      KC_MINS,        KC_SLSH,     KC_TRNS,
-        KC_TRNS,   KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,
-                                                                            KC_TRNS,   KC_TRNS,
-                                                                                       KC_TRNS,
-                                                                 KC_TRNS,   KC_TRNS,   KC_TRNS,
-        // right hand
-             KC_TRNS,   KC_F6,       KC_F7,       KC_F8,          KC_F9,          KC_F10,         KC_F11,
-             KC_TRNS,   KC_MINS,     KC_PLUS,     KC_EQL,         LSFT(KC_QUOT),  LSFT(UK_HASH),  KC_F12,
-                        KC_LCBR,     KC_RCBR,     KC_SCLN,        KC_QUOT,        UK_HASH,        KC_TRNS,
-             KC_TRNS,   KC_LBRC,     KC_RBRC,     LSFT(KC_COMM),  LSFT(KC_DOT),   LSFT(KC_SLSH),  KC_TRNS,
-                                     KC_TRNS,     KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,
-           KC_TRNS,   KC_TRNS,
-           KC_TRNS,
-           KC_TRNS,   KC_TRNS,  KC_TRNS
-    ),
-/* Keymap 2: Numerics and hex
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |   ##    |  A   |  B   |  C   |  D   |  E   |  F   |           |  A   |  B   |  C   |  D   |   E  |   F  |   ##   |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |   ##    |  *   |  7   |  8   |  9   |  *   |  0x  |           |  0x  |  *   |   7  |   8  |   9  |   *  |   ##   |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   ##    |  /   |  4   |  5   |  6   |  /   |------|           |------|  /   |   4  |   5  |   6  |   /  |   ##   |
- * |---------+------+------+------+------+------|  ##  |           |  ##  |------+------+------+------+------+--------|
- * |   ##    |  -   |  1   |  2   |  3   |  -   |      |           |      |  -   |   1  |   2  |   3  |   -  |   ##   |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |   =   |  +   |  0   |  ,   |  .   |                                       |   0  |   ,  |   .  |   +  |  =   |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  ##  |  ##  |       |  ##  |  ##  |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |  ##  |       |  ##  |      |      |
- *                                 |  ##  |  ##  |------|       |------|  ##  |  ##  |
- *                                 |      |      |  ##  |       |  ##  |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[NUMB] = LAYOUT_ergodox(
-        // left hand
-        KC_TRNS,   KC_A,        KC_B,        KC_C,        KC_D,           KC_E,        KC_F,
-        KC_TRNS,   KC_ASTR,     KC_7,        KC_8,        KC_9,           KC_ASTR,     UM_0x,
-        KC_TRNS,   KC_SLSH,     KC_4,        KC_5,        KC_6,           KC_SLSH,
-        KC_TRNS,   KC_MINS,     KC_1,        KC_2,        KC_3,           KC_MINS,     KC_TRNS,
-        KC_EQL,    KC_PLUS,     KC_0,        KC_COMM,     KC_DOT,
-                                                                            KC_TRNS,   KC_TRNS,
-                                                                                       KC_TRNS,
-                                                                 KC_TRNS,   KC_TRNS,   KC_TRNS,
-        // right hand
-             KC_A,      KC_B,        KC_C,        KC_D,           KC_E,           KC_F,           KC_TRNS,
-             UM_0x,     KC_ASTR,     KC_7,        KC_8,           KC_9,           KC_ASTR,        KC_TRNS,
-                        KC_SLSH,     KC_4,        KC_5,           KC_6,           KC_SLSH,        KC_TRNS,
-             KC_TRNS,   KC_MINS,     KC_1,        KC_2,           KC_3,           KC_MINS,        KC_TRNS,
-                                     KC_0,        KC_COMM,        KC_DOT,         KC_PLUS,        KC_EQL,
-           KC_TRNS,   KC_TRNS,
-           KC_TRNS,
-           KC_TRNS,   KC_TRNS,   KC_TRNS
-    ),
-/* Keymap 3: Cursor movement
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         | Home |      |  Up  |      | PgUp |      |           |      | PgUp |      |  Up  |      | Home |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         | End  | Left | Down | Right| PgDn |------|           |------| PgDn | Left | Down | Right| End  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   ##    |  Up  |      | Down |  ##  |      |      |           |      |      |  ##  | Down |      |  Up  |   ##   |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Left  | Down | Right|      |      |                                       |      |      | Left | Down | Right|
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |  ##  |  ##  |------|       |------|  ##  |  ##  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[CRSR] = LAYOUT_ergodox(
-        // left hand
-        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-        KC_NO,     KC_HOME,   KC_NO,     KC_UP,     KC_NO,     KC_PGUP,   KC_NO,
-        KC_NO,     KC_END,    KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_PGDN,
-        KC_TRNS,   KC_UP,     KC_NO,     KC_DOWN,   KC_TRNS,   KC_NO,     KC_NO,
-        KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_NO,     KC_NO,
-                                                                   KC_NO,     KC_NO,
-                                                                              KC_NO,
-                                                        KC_TRNS,   KC_TRNS,   KC_NO,
-        // right hand
-             KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-             KC_NO,     KC_PGUP,   KC_NO,     KC_UP,     KC_NO,     KC_HOME,   KC_NO,
-                        KC_PGDN,   KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_END,    KC_NO,
-             KC_NO,     KC_NO,     KC_TRNS,   KC_DOWN,   KC_NO,     KC_UP,     KC_TRNS,
-                                   KC_NO,     KC_NO,     KC_LEFT,   KC_DOWN,   KC_RGHT,
-           KC_NO,   KC_NO,
-           KC_NO,
-           KC_NO,   KC_TRNS,   KC_TRNS
-    ),
-/* Keymap 4: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | Lclk | MsUp | Rclk |      |      |           |      |      | Lclk | MsUp | Rclk |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |MsLeft|MsDown|MsRght|      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Lclk  | MsUp | Rclk |MsDown|      |  ##  |      |           |      |  ##  |      |MsDown| Lclk | MsUp | Rclk   |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |MsLeft|MsDown|MsRight      |      |                                       |      |      |MsLeft|MsDown|MsRght|
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[MOUS] = LAYOUT_ergodox(
-        // left hand
-        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-        KC_NO,     KC_NO,     KC_BTN1,   KC_MS_U,   KC_BTN2,   KC_NO,     KC_NO,
-        KC_NO,     KC_NO,     KC_MS_L,   KC_MS_D,   KC_MS_R,   KC_NO,
-        KC_BTN1,   KC_MS_U,   KC_BTN2,   KC_MS_D,   KC_NO,     KC_TRNS,   KC_NO,
-        KC_MS_L,   KC_MS_D,   KC_MS_R,   KC_NO,     KC_NO,
-                                                                   KC_NO,   KC_NO,
-                                                                            KC_NO,
-                                                          KC_NO,   KC_NO,   KC_NO,
-        // right hand
-             KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-             KC_NO,     KC_NO,     KC_BTN1,   KC_MS_U,   KC_BTN2,   KC_NO,     KC_NO,
-                        KC_NO,     KC_MS_L,   KC_MS_D,   KC_MS_R,   KC_NO,     KC_NO,
-             KC_NO,     KC_TRNS,   KC_NO,     KC_MS_D,   KC_BTN1,   KC_MS_U,   KC_BTN2,
-                                   KC_NO,     KC_NO,     KC_MS_L,   KC_MS_D,   KC_MS_R,
-           KC_NO,   KC_NO,
-           KC_NO,
-           KC_NO,   KC_NO,   KC_NO
-    ),
-/* Keymap 5: Keywords
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |      |      | scarf| sadf | smily|      |           |      | decaf|      |      |      |      |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         | const| volat| oper |  ret | tmpl |      |           |      | typen| cont |  prv |  pro | pub  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |  str |  obj |      | gitl |------|           |------|      |      |      | nulp |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      | extr |  cls | virt | break|      |           |      |namesp| goodm| goodn|      |      |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |  inc |      |      |                                       |      |      |      |      |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       | ecet | ecets|
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |  ##  |       |  ##  |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[KEYW] = LAYOUT_ergodox(
-        // left hand
-        KC_NO,     KC_NO,     KC_NO,     UM_SCARF,  UM_SADF,   UM_SMILY,   KC_NO,
-        KC_NO,     UM_CONST,  UM_VOLAT,  UM_OPER,   UM_RET,    UM_TMPL,    KC_NO,
-        KC_NO,     KC_NO,     UM_STR,    UM_OBJ,    KC_NO,     UM_GITLOG,
-        KC_NO,     KC_NO,     UM_EXTR,   UM_CLS,    UM_VIRT,   UM_BREAK,   KC_NO,
-        KC_NO,     KC_NO,     UM_INC,    KC_NO,     KC_NO,
-                                                                   KC_NO,    KC_NO,
-                                                                             KC_NO,
-                                                          KC_NO,   KC_NO,    KC_TRNS,
-        // right hand
-             KC_NO,     UM_DECAF,  KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-             KC_NO,     UM_TYPN,   UM_CONT,   UM_PRV,    UM_PRO,    UM_PUB,    KC_NO,
-                        KC_NO,     KC_NO,     KC_NO,     UM_NULP,   KC_NO,     KC_NO,
-             KC_NO,     UM_NAMESP, UM_GOODM,  UM_GOODN,  KC_NO,     KC_NO,     KC_NO,
-                                   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-           UM_ECET,  UM_ECETS,
-           KC_NO,
-           KC_TRNS,  KC_NO,   KC_NO
-    ),
-/* Keymap 6: emacs
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |      |      |      |      |      | empb |           | emnb | emfs | emfb |      |      |      |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         | emtr |      |      |      |      |      |           |      | emun | emre | w-up |      |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      | emwr |      |      |      |------|           |------|      |w-left|w-down|w-rght|      |        |
- * |---------+------+------+------+------+------|  ##  |           |  ##  |------+------+------+------+------+--------|
- * |         |      |      |      |      |      |      |           |      |      |      |w-down|      |      |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      |      |      |      |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[EMAC] = LAYOUT_ergodox(
-        // left hand
-        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     UM_EMPB,
-        KC_NO,     UM_EMTR,   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-        KC_NO,     KC_NO,     UM_EMWR,   KC_NO,     KC_NO,     KC_NO,
-        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_TRNS,
-        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-                                                                   KC_NO,   KC_NO,
-                                                                            KC_NO,
-                                                          KC_NO,   KC_NO,   KC_NO,
-        // right hand
-             UM_EMNB,   UM_EMFS,  UM_EMFB,        KC_NO,          KC_NO,          KC_NO,     KC_NO,
-             KC_NO,     UM_EMUN,  UM_EMRE,        LSFT(KC_UP),    KC_NO,          KC_NO,     KC_NO,
-                        KC_NO,    LSFT(KC_LEFT),  LSFT(KC_DOWN),  LSFT(KC_RGHT),  KC_NO,     KC_NO,
-             KC_TRNS,   KC_NO,    KC_NO,          LSFT(KC_DOWN),  KC_NO,          KC_NO,     KC_NO,
-                                  KC_NO,          KC_NO,          KC_NO,          KC_NO,     KC_NO,
-           KC_NO,   KC_NO,
-           KC_NO,
-           KC_NO,   KC_NO,   KC_NO
-    ),
-};
-
-enum next_key_down_up {
-    NK_DOWN_UP,
-    NK_DOWN,
-    NK_UP // a bit of a hack, this works as long as NK_UP < KC_A
-};
-
-void send_keystrokes(uint8_t key, ...)
-{
-    va_list vl;
-    va_start(vl, key);
-    enum next_key_down_up nkdu = NK_DOWN_UP;
-    while (key != KC_NO) {
-        if (key < KC_A) {
-            nkdu = key;
-        } else {
-            switch (nkdu) {
-            case NK_DOWN_UP:
-                register_code(key);
-            case NK_UP:
-                unregister_code(key);
-                break;
-            case NK_DOWN:
-                register_code(key);
-            }
-            nkdu = NK_DOWN_UP;
-        }
-        key = va_arg(vl, int);
-    }
-    va_end(vl);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-    switch(id) {
-    case 0: // { }
-        if (record->event.pressed) {
-            return MACRO(T(ENT), D(LSFT), T(LBRC), U(LSFT), T(ENT),
-                         D(LSFT), T(RBRC), U(LSFT), T(UP),
-                         T(TAB), END);
-        }
-        break;
-    case 1:
-        if (record->event.pressed) {
-            return MACRO(T(0), T(X), END);
-        }
-        break;
-    case 2:
-        if (record->event.pressed) {
-            SEND_STRING("public");
-        }
-        break;
-    case 3:
-        if (record->event.pressed) {
-            SEND_STRING("protected");
-        }
-        break;
-    case 4:
-        if (record->event.pressed) {
-            SEND_STRING("private");
-        }
-        break;
-    case 5: // class
-        if (record->event.pressed) {
-            return MACRO(T(C), T(L), T(A), T(S), T(S), T(ENT),
-                         D(LSFT), T(LBRC), U(LSFT), T(ENT),
-                         T(P), T(U), T(B), T(L), T(I), T(C),
-                         D(LSFT), T(SCLN), U(LSFT), T(ENT), T(ENT),
-                         T(P), T(R), T(I), T(V), T(A), T(T), T(E),
-                         D(LSFT), T(SCLN), U(LSFT), T(ENT),
-                         D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(ENT),
-                         T(UP), T(UP), T(UP), T(UP), T(UP), T(UP), T(UP),
-                         T(END), T(SPC), END);
-        }
-        break;
-    case 6: // struct
-        if (record->event.pressed) {
-            return MACRO(T(S), T(T), T(R), T(U), T(C), T(T), T(ENT),
-                         D(LSFT), T(LBRC), U(LSFT), T(ENT),
-                         D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(ENT),
-                         T(UP), T(UP), T(UP), T(UP),
-                         T(END), T(SPC), END);
-        }
-        break;
-    case 7:
-        if (record->event.pressed) {
-            SEND_STRING("return");
-        }
-        break;
-    case 8: // #include
-        if (record->event.pressed) {
-            return MACRO(T(NONUS_HASH), T(I), T(N), T(C), T(L), T(U), T(D), T(E), END);
-        }
-        break;
-    case 9:
-        if (record->event.pressed) {
-            SEND_STRING("objdump -CT -x -d");
-        }
-        break;
-    case 10:
-        if (record->event.pressed) {
-            SEND_STRING("git log --oneline --graph --decorate=short");
-        }
-        break;
-    case 11:
-        if (record->event.pressed) {
-            SEND_STRING("good morning");
-        }
-        break;
-    case 12:
-        if (record->event.pressed) {
-            SEND_STRING("namespace");
-        }
-        break;
-    case 14: // emacs toggle read-only
-        if (record->event.pressed) {
-            return MACRO(D(LCTL), T(X), T(Q), U(LCTL), END);
-        }
-        break;
-    case 15: // emacs write buffer
-        if (record->event.pressed) {
-            return MACRO(D(LCTL), T(X), T(S), U(LCTL), END);
-        }
-        break;
-    case 16: // emacs undo
-        if (record->event.pressed) {
-            return MACRO(D(LCTL), D(LSFT), T(MINS), U(LSFT), U(LCTL), END);
-        }
-        break;
-    case 17: // emacs redo
-        if (record->event.pressed) {
-            return MACRO(D(LALT), D(LSFT), T(MINS), U(LSFT), U(LALT), END);
-        }
-        break;
-    case 18: // emacs previous buffer
-        if (record->event.pressed) {
-            return MACRO(D(LCTL), T(X), U(LCTL), T(LEFT), END);
-        }
-        break;
-    case 19: // emacs next buffer
-        if (record->event.pressed) {
-            return MACRO(D(LCTL), T(X), U(LCTL), T(RGHT), END);
-        }
-        break;
-    case 20:
-        if (record->event.pressed) {
-            SEND_STRING("good night");
-        }
-        break;
-    case 22: // { };
-        if (record->event.pressed) {
-            return MACRO(T(ENT), D(LSFT), T(LBRC), U(LSFT), T(ENT),
-                         D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(UP),
-                         T(TAB), END);
-        }
-        break;
-    case 23:
-        if (record->event.pressed) {
-            SEND_STRING("template");
-        }
-        break;
-    case 24:
-        if (record->event.pressed) {
-            SEND_STRING("typename");
-        }
-        break;
-    case 25:
-        if (record->event.pressed) {
-            SEND_STRING("continue");
-            return MACRO(T(SCLN), END);
-        }
-        break;
-    case 26:
-        if (record->event.pressed) {
-            SEND_STRING("break");
-            return MACRO(T(SCLN), END);
-        }
-        break;
-    case 27:
-        if (record->event.pressed) {
-            SEND_STRING("const");
-        }
-        break;
-    case 28:
-        if (record->event.pressed) {
-            SEND_STRING(":-)");
-        }
-        break;
-    case 29:
-        if (record->event.pressed) {
-            SEND_STRING(":-(");
-        }
-        break;
-    case 30: // dazed
-        if (record->event.pressed) {
-            send_keystrokes(NK_DOWN, KC_LSFT, KC_8, KC_MINS, KC_8, NK_UP, KC_LSFT, KC_NO);
-        }
-        break;
-    case 31: // decaf
-        if (record->event.pressed) {
-            send_keystrokes(NK_DOWN, KC_LSFT, KC_C, KC_9, KC_MINS, KC_0, NK_UP, KC_LSFT, KC_NO);
-        }
-        break;
-    case 32:
-        if (record->event.pressed) {
-            SEND_STRING("operator");
-        }
-        break;
-    case 33:
-        if (record->event.pressed) {
-            SEND_STRING("nullptr");
-        }
-        break;
-    case 34:
-        if (record->event.pressed) {
-            SEND_STRING("extern");
-        }
-        break;
-    case 35:
-        if (record->event.pressed) {
-            SEND_STRING("virtual");
-        }
-        break;
-    case 36: // emacs font smaller
-        if (record->event.pressed) {
-            return MACRO(D(LCTL), T(X), T(EQL), U(LCTL), END);
-        }
-        break;
-    case 37:  // emacs font bigger
-        if (record->event.pressed) {
-            return MACRO(D(LCTL), T(X), T(MINS), U(LCTL), END);
-        }
-        break;
-    case 38:
-        if (record->event.pressed) {
-            SEND_STRING("volatile");
-        }
-        break;
-    }
-    return MACRO_NONE;
-}
-
-LEADER_EXTERNS();
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    LEADER_DICTIONARY() {
-        leading = false;
-        leader_end();
-
-        SEQ_TWO_KEYS(KC_G, KC_A) {
-            SEND_STRING("git add .");
-        }
-        SEQ_TWO_KEYS(KC_G, KC_D) {
-            SEND_STRING("git diff");
-        }
-        SEQ_THREE_KEYS(KC_G, KC_D, KC_S) {
-            SEND_STRING("git diff --staged");
-        }
-        SEQ_TWO_KEYS(KC_G, KC_L) {
-            SEND_STRING("git log");
-        }
-        SEQ_THREE_KEYS(KC_G, KC_L, KC_O) {
-            SEND_STRING("git log --oneline");
-        }
-        SEQ_TWO_KEYS(KC_G, KC_F) {
-            SEND_STRING("git fetch");
-        }
-        SEQ_TWO_KEYS(KC_G, KC_O) {
-            SEND_STRING("git checkout");
-        }
-        SEQ_TWO_KEYS(KC_G, KC_P) {
-            SEND_STRING("git pull");
-        }
-        SEQ_TWO_KEYS(KC_G, KC_S) {
-            SEND_STRING("git status");
-        }
-        SEQ_TWO_KEYS(KC_G, KC_C) {
-            SEND_STRING("git commit -m ''");
-            send_keystrokes(KC_LEFT, KC_NO);
-        }
-        SEQ_THREE_KEYS(KC_G, KC_C, KC_A) {
-            SEND_STRING("git commit --amend");
-        }
-
-        SEQ_TWO_KEYS(KC_C, KC_C) {
-            SEND_STRING("const_cast<>");
-            send_keystrokes(KC_LEFT, KC_NO);
-        }
-        SEQ_TWO_KEYS(KC_C, KC_D) {
-            SEND_STRING("dynamic_cast<>");
-            send_keystrokes(KC_LEFT, KC_NO);
-        }
-        SEQ_TWO_KEYS(KC_C, KC_R) {
-            SEND_STRING("reinterpret_cast<>");
-            send_keystrokes(KC_LEFT, KC_NO);
-        }
-        SEQ_TWO_KEYS(KC_C, KC_S) {
-            SEND_STRING("static_cast<>");
-            send_keystrokes(KC_LEFT, KC_NO);
-        }
-
-        SEQ_ONE_KEY(KC_SLSH) {
-            send_keystrokes(KC_SLSH, NK_DOWN, KC_LSFT, KC_8, KC_8, NK_UP, KC_LSFT, KC_ENT,
-                            NK_DOWN, KC_LSFT, KC_8, NK_UP, KC_LSFT, KC_ENT,
-                            NK_DOWN, KC_LSFT, KC_8, NK_UP, KC_LSFT, KC_SLSH, KC_UP, KC_END, KC_SPC,
-                            KC_NO);
-        }
-    }
-}
diff --git a/layouts/community/ergodox/albert/readme.md b/layouts/community/ergodox/albert/readme.md
deleted file mode 100644
index e20e047ac6..0000000000
--- a/layouts/community/ergodox/albert/readme.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# ErgoDox EZ Configuration for typing like a boss.
-
-This layout has 7 layers:
-0. Base layers
-1. Symbols and F-keys
-2. Number pad (with hexadecimal)
-3. Cursor keys
-4. Mouse movement and clicks
-5. Keyword macros
-6. Emacs
-
-There are also some leader keys defined for frequently used commands (git etc).
-
-## The layers
-
-Double hashes (`##`) indicate transparent keys (`KC_TRNS`) and blanks indicate no key (`KC_NO`).
-
-### 0. Base layer
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-| ESC    |   1  |   2  |   3  |   4  |   5  | SfLt |           | SfRt |   6  |   7  |   8  |   9  |   0  | BkSp   |
-|--------|------|------|------|------|-------------|           |------|------|------|------|------|------|--------|
-| Tab    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  | Del    |
-|--------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-| Caps/L2|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |Enter/L2|
-|--------|------|------|------|------|------|  L6  |           |  L6  |------|------|------|------|------|--------|
-| LSft/( |   Z  |   X  |   C  | V/L3 | B/L4 |      |           |      | N/L4 | M/L3 |   ,  |   .  |   /  | RSft/) |
-`--------|------|------|------|------|-------------'           `-------------|------|------|------|------|--------'
-  |Ctrl/[| Alt/]|   #  | Left |Right |                                       |  Up  | Down |   -  | Alt/[|Ctrl/]|
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |  L2  | lead |       | lead |  Ins |
-                                ,------|------|------|       |------|------|------.
-                                | Space| BkSp | Home |       | PgUp | Enter|Space |
-                                |  /   |  /   |------|       |------|   /  |  /   |
-                                | Ctrl | Alt  |End/L5|       |PDn/L5|  Alt | Ctrl |
-                                `--------------------'       `--------------------'
-```
-
-Space Cadet shift is enabled. Ctrl and Alt doubles up as normal keys when tapped.  
-SfLt and SfRt sends Shift + left and Shift + Right respectively - for use with emacs with `windmove-default-keybindings`.  
-Caps and Enter may be held down to activate layer 2 (hexadecimal number pad).  
-Please see `matrix_scan_user` function in `keymap.c` for list of commands available via `lead` key.
-
-### 1. Symbols and F-keys
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   ##   |  F1  |  F2  |  F3  |  F4  |  F5  |  ##  |           |  ##  |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-|--------|------|------|------|------|------|------|           |------|------|------|------|------|------|--------|
-|   ##   |   !  |   "  |   £  |   $  |   %  |  ##  |           |  ##  |   -  |   +  |   =  |   @  |   ~  |   F12  |
-|--------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|   ##   |   ^  |   &  |   *  |   _  |   #  |------|           |------|   {  |   }  |   ;  |   '  |   #  |   ##   |
-|--------|------|------|------|------|------|  ##  |           |  ##  |------|------|------|------|------|--------|
-|   ##   |   \  |   |  |   `  |   -  |   /  |      |           |      |   [  |   ]  |   <  |   >  |   ?  |   ##   |
-`--------|------|------|------|------|-------------'           `-------------|------|------|------|------|--------'
-  |  ##  |  ##  |  ##  |  ##  |  ##  |                                       |  ##  |  ##  |  ##  |  ##  |  ##  |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |  ##  |  ##  |       |  ##  |  ##  |
-                                ,------|------|------|       |------|------|------.
-                                |      |      |  ##  |       |  ##  |      |      |
-                                |  ##  |  ##  |------|       |------|  ##  |  ##  |
-                                |      |      |  ##  |       |  ##  |      |      |
-                                `--------------------'       `--------------------'
-```
-
-### 2. Number pad (with hexadecimal)
-
-```
-,---------------------------------------------------.           ,--------------------------------------------------.
-|   ##    |  A   |  B   |  C   |  D   |  E   |  F   |           |  A   |  B   |  C   |  D   |   E  |   F  |   ##   |
-|---------|------|------|------|------|------|------|           |------|------|------|------|------|------|--------|
-|   ##    |  *   |  7   |  8   |  9   |  *   |  0x  |           |  0x  |  *   |   7  |   8  |   9  |   *  |   ##   |
-|---------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|   ##    |  /   |  4   |  5   |  6   |  /   |------|           |------|  /   |   4  |   5  |   6  |   /  |   ##   |
-|---------|------|------|------|------|------|  ##  |           |  ##  |------|------|------|------|------|--------|
-|   ##    |  -   |  1   |  2   |  3   |  -   |      |           |      |  -   |   1  |   2  |   3  |   -  |   ##   |
-`---------|------|------|------|------|-------------'           `-------------|------|------|------|------|--------'
-  |   =   |  +   |  0   |  ,   |  .   |                                       |   0  |   ,  |   .  |   +  |  =   |
-  `-----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |  ##  |  ##  |       |  ##  |  ##  |
-                                ,------|------|------|       |------|------|------.
-                                |      |      |  ##  |       |  ##  |      |      |
-                                |  ##  |  ##  |------|       |------|  ##  |  ##  |
-                                |      |      |  ##  |       |  ##  |      |      |
-                                `--------------------'       `--------------------'
-```
-
-### 3. Cursor keys
-
-```
-,---------------------------------------------------.           ,--------------------------------------------------.
-|         |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|---------|------|------|------|------|------|------|           |------|------|------|------|------|------|--------|
-|         | Home |      |  Up  |      | PgUp |      |           |      | PgUp |      |  Up  |      | Home |        |
-|---------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|         | End  | Left | Down | Right| PgDn |------|           |------| PgDn | Left | Down | Right| End  |        |
-|---------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|   ##    |  Up  |      | Down |  ##  |      |      |           |      |      |  ##  | Down |      |  Up  |   ##   |
-`---------|------|------|------|------|-------------'           `-------------|------|------|------|------|--------'
-  | Left  | Down | Right|      |      |                                       |      |      | Left | Down | Right|
-  `-----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------|------|------|       |------|------|------.
-                                |      |      |      |       |      |      |      |
-                                |  ##  |  ##  |------|       |------|  ##  |  ##  |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-### 4. Mouse movement and clicks
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------|------|------|------|------|-------------|           |------|------|------|------|------|------|--------|
-|        |      | Lclk | MsUp | Rclk |      |      |           |      |      | Lclk | MsUp | Rclk |      |        |
-|--------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |MsLeft|MsDown|MsRght|      |        |
-|--------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|  Lclk  | MsUp | Rclk |MsDown|      |  ##  |      |           |      |  ##  |      |MsDown| Lclk | MsUp | Rclk   |
-`--------|------|------|------|------|-------------'           `-------------|------|------|------|------|--------'
-  |MsLeft|MsDown|MsRight      |      |                                       |      |      |MsLeft|MsDown|MsRght|
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------|------|------|       |------|------|------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |      |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-### 5. Keyword macros
-
-```
-,---------------------------------------------------.           ,--------------------------------------------------.
-|         |      |      | scarf| sadf | smily|      |           |      | decaf|      |      |      |      |        |
-|---------|------|------|------|------|------|------|           |------|------|------|------|------|------|--------|
-|         | const| volat| oper |  ret | tmpl |      |           |      | typen| cont |  prv |  pro | pub  |        |
-|---------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|         |      |  str |  obj |      | gitl |------|           |------|      |      |      | nulp |      |        |
-|---------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|         |      | extr |  cls | virt | break|      |           |      |namesp| goodm| goodn|      |      |        |
-`---------|------|------|------|------|-------------'           `-------------|------|------|------|------|--------'
-  |       |      |  inc |      |      |                                       |      |      |      |      |      |
-  `-----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       | ecet | ecets|
-                                ,------|------|------|       |------|------|------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |      |
-                                |      |      |  ##  |       |  ##  |      |      |
-                                `--------------------'       `--------------------'
-```
-Please see `keymap.c` for the keywords/commands.
-Some are const, volatile, operator, return, template, typename, continue, private,
-protected, public, struct, class, extern, virtual, break, namespace.
-Also a git log command I use a lot (`git log --oneline --graph --decorate=short` (I know git can be configured but that is boring)).
-
-### 6. Emacs
-
-```
-,---------------------------------------------------.           ,--------------------------------------------------.
-|         |      |      |      |      |      | empb |           | emnb | emfs | emfb |      |      |      |        |
-|---------|------|------|------|------|------|------|           |------|------|------|------|------|------|--------|
-|         | emtr |      |      |      |      |      |           |      | emun | emre | w-up |      |      |        |
-|---------|------|------|------|------|------|      |           |      |------|------|------|------|------|--------|
-|         |      | emwr |      |      |      |------|           |------|      |w-left|w-down|w-rght|      |        |
-|---------|------|------|------|------|------|  ##  |           |  ##  |------|------|------|------|------|--------|
-|         |      |      |      |      |      |      |           |      |      |      |w-down|      |      |        |
-`---------|------|------|------|------|-------------'           `-------------|------|------|------|------|--------'
-  |       |      |      |      |      |                                       |      |      |      |      |      |
-  `-----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------|------|------|       |------|------|------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |      |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-Some emacs shortcuts like toggle read/write mode (emtr), write file (emwr), previous-buffer (empb),
-next-buffer (emnb), smaller font(emfs), larger font (emfb), undo (emun), redo (emre) and switching between windows in a frame.
diff --git a/layouts/community/ergodox/albert/rules.mk b/layouts/community/ergodox/albert/rules.mk
deleted file mode 100644
index 47549b50f6..0000000000
--- a/layouts/community/ergodox/albert/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMMAND_ENABLE = no        # Commands for debug and configuration
-LEADER_ENABLE = yes
diff --git a/layouts/community/ergodox/alexjj/keymap.c b/layouts/community/ergodox/alexjj/keymap.c
deleted file mode 100644
index 77250e6ded..0000000000
--- a/layouts/community/ergodox/alexjj/keymap.c
+++ /dev/null
@@ -1,231 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-#define UNIC 3 // unicode entry layer
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   ESC  |  1!  |  2@  |  3#  |  4$  |  5%  |  6^  |           |  7&  |  8*  |  9(  |  0)  |  -_  |  +=  |  BkSp  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  {   |           |   }  |   Y  |   U  |   I  |   O  |   P  |  |\    |
- * |--------+------+------+------+------+------|  [   |           |   ]  |------+------+------+------+------+--------|
- * | Win    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  :;  |  '"    |
- * |--------+------+------+------+------+------| Home |           | End  |------+------+------+------+------+--------|
- * | LShift |Z/Alt |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  | Alt  | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl | COPY | PASTE| Left | Right|                                       | Down |  Up  |Hyper |  `~  | RCtrl |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *   Hyper = Ctrl+Super+Alt+Shift         | ~L3  |  F5  |       |  F2  | ~L2  |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      | PgUp |       | Ins  |      |      |
- *                                 | Enter| BkSp |------|       |------| ~L1  |Space |
- *                                 |      |      | PgDn |       | Del  |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
-        KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,
-        KC_LGUI,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        ALT_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_HOME,
-        KC_LCTRL,       LCTL(KC_C), LCTL(KC_V),  KC_LEFT,KC_RGHT,
-                                                      TT(UNIC),  KC_F5,
-                                                              KC_PGUP,
-                                               KC_ENT,KC_BSPC,KC_PGDN,
-        // right hand
-             KC_7,     KC_8,   KC_9,   KC_0,   KC_MINS,   KC_EQL,        KC_BSPC,
-             KC_RBRC,  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_END,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,
-             KC_DOWN,KC_UP, ALL_T(KC_NO),KC_GRV,   KC_RCTRL,
-             KC_F2, TT(MDIA),
-             KC_INS,
-             KC_DEL,TT(SYMB), KC_SPC
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |PrintScr|
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |   £  |      |      |      |                                       |      |    . |   0  |   =  |Alt+F4|
- *   `----------------------------------'                                       `----------------------------------'
- *              ↑                         ,-------------.       ,-------------.
- *           THERE!                       |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *    CAD = Ctrl + Alt + Delete    |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       | CAD  |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,M(3),KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_F7, KC_F8,   KC_F9,  KC_F10,   KC_F11,   KC_F12,  KC_PSCR,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_TRNS,
-                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,  LALT(KC_F4),
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       LCTL(LALT(KC_DEL)), KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | TEENSY |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolDn |VolUp | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-                          KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-/* Keymap 3: Unicode Entry
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  Alt   |  1   |   2  |  3   |  4   |   5  |  6   |           |   7  |  8   |   9  |  0   |  +   |  +   |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  Alt   |      |      |   E  |      |      |      |           |      |      |   7  |   8  |  9   |  +   |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Alt   |   A  |      |   D  |   F  |      |------|           |------|      |   4  |   5  |  6   |  +   |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Alt   |      |      |   C  |      |   B  |      |           |      |      |   1  |   2  |  3   |  +   |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Alt  |  Alt | Alt  |      |      |                                       |   0  |   0  |  0   |  +   |       |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *      WINDOWS ONLY SETUP!!              | ~L3  |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |  Alt |  Alt |------|       |------|  Alt | Alt  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[UNIC] = LAYOUT_ergodox(  // layer 3 : Unicode Entry
-        // left hand
-       KC_LALT,       KC_P1,      KC_P2,      KC_P3,  KC_P4,     KC_P5,   KC_P6,
-      KC_LALT,       KC_TRNS,    KC_TRNS,    KC_E,   KC_TRNS,   KC_TRNS, KC_TRNS,
-      KC_LALT,       KC_A,       KC_TRNS,    KC_D,   KC_F,      KC_TRNS,
-      KC_LALT,       KC_TRNS,    KC_TRNS,    KC_C,   KC_TRNS,   KC_B,    KC_TRNS,
-      KC_LALT,       KC_LALT,    KC_LALT,    KC_TRNS,KC_TRNS,
-                                                     KC_TRNS,   KC_TRNS,
-                                                                KC_TRNS,
-                                             KC_LALT,KC_LALT,   KC_TRNS,
-        // right hand
-           KC_P7,    KC_P8,     KC_P9,   KC_P0,   KC_PPLS,KC_PPLS,      KC_TRNS,
-           KC_TRNS,  KC_TRNS,   KC_P7,   KC_P8,   KC_P9,  KC_PPLS,      KC_TRNS,
-                     KC_TRNS,   KC_P4,   KC_P5,   KC_P6,  KC_PPLS,      KC_TRNS,
-           KC_TRNS,  KC_TRNS,   KC_P1,   KC_P2,   KC_P3,  KC_PPLS,      KC_TRNS,
-                                KC_P0,   KC_P0,   KC_P0,  KC_PPLS,      KC_TRNS,
-           KC_TRNS, KC_TRNS,
-           KC_TRNS,
-           KC_TRNS,KC_LALT, KC_LALT
-                  ),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          register_code(KC_RSFT);
-        } else {
-          unregister_code(KC_RSFT);
-        }
-      case 3: // this would trigger when you hit a key mapped as M(3)
-        if (record->event.pressed) {
-          return MACRO( I(255), D(LALT), T(P1), T(P5), T(P6), U(LALT), END  );
-      }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/layouts/community/ergodox/alexjj/readme.md b/layouts/community/ergodox/alexjj/readme.md
deleted file mode 100644
index 4845cbbd91..0000000000
--- a/layouts/community/ergodox/alexjj/readme.md
+++ /dev/null
@@ -1,179 +0,0 @@
-Englishman in New York
-===========================
-
-:microphone: :tea:
-
-About
-------
-
-After using the massdrop configurator to get the basics, I wanted to add a
-little extra to my ergodox. Notably the Hyper hotkey, the press and hold,
-and a way to have my beloved £ :pound: symbol available<sup>[1](#unicode)</sup>. Why not switch to a GB
-layout? Well the computers I use are US keymap'd and I can't always change
-that. Plus I've got used to 2/@ and 3/# and moving to the ergodox was hard
-enough. :sweat_smile:
-
-I started from the default and edited from there as I needed. It's somewhat
-similar to a regular layout, particularly R1 and shift/controls. I ended up
-with a few keys that were blank, so I'm testing out some shortcuts. Alt+F4 for
-quitting things in Windows, is one example, but I felt it was better placed on 
-the 1st layer - in case of fat fingers.
-
-Layout
--------
-
-![Layout](https://i.imgur.com/4bDwHLS.jpg "Isn't it lovely")
-
-### Base Layer
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   ESC  |  1!  |  2@  |  3#  |  4$  |  5%  |  6^  |           |  7&  |  8*  |  9(  |  0)  |  -_  |  +=  |  BkSp  |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-| Tab    |   Q  |   W  |   E  |   R  |   T  |  {   |           |   }  |   Y  |   U  |   I  |   O  |   P  |  |\    |
-|--------+------+------+------+------+------|  [   |           |   ]  |------+------+------+------+------+--------|
-| Win    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  :;  |  '"    |
-|--------+------+------+------+------+------| Home |           | End  |------+------+------+------+------+--------|
-| LShift |Z/Alt |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  | Alt  | RShift |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |LCtrl | COPY | PASTE| Left | Right|                                       | Down |  Up  |Hyper |  `~  | RCtrl |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-  Hyper = Ctrl+Super+Alt+Shift         | ~L3  |  F5  |       |  F2  | ~L2  |
-                                ,------|------|------|       |------+------+------.
-                                |      |      | PgUp |       | Ins  |      |      |
-                                | Enter| BkSp |------|       |------| ~L1  |Space |
-                                |      |      | PgDn |       | Del  |      |      |
-                                `--------------------'       `--------------------'
-``` 
-
-### Symbol Layer
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |PrintScr|
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |   £  |      |      |      |                                       |      |    . |   0  |   =  |Alt+F4|
-  `----------------------------------'                                       `----------------------------------'
-             ↑                         ,-------------.       ,-------------.
-          THERE!                       |      |      |       |      |      |
-                                ,------|------|------|       |------+------+------.
-   CAD = Ctrl + Alt + Delete    |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |      |
-                                |      |      |      |       | CAD  |      |      |
-                                `--------------------'       `--------------------'
-```
-### Media Layer
-
-Not touched this, not used either.
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-| TEENSY |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |      |      | Lclk | Rclk |                                       |VolDn |VolUp | Mute |      |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------|------|------|       |------+------+------.
-                                |      |      |      |       |      |      |Brwser|
-                                |      |      |------|       |------|      |Back  |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-### Unicode Layer
-
-Used to enter/test unicode input on Windows. All numbers are numpad keys.
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|  Alt   |  1   |   2  |  3   |  4   |   5  |  6   |           |   7  |  8   |   9  |  0   |  +   |  +   |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|  Alt   |      |      |   E  |      |      |      |           |      |      |   7  |   8  |  9   |  +   |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|  Alt   |   A  |      |   D  |   F  |      |------|           |------|      |   4  |   5  |  6   |  +   |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|  Alt   |      |      |   C  |      |   B  |      |           |      |      |   1  |   2  |  3   |  +   |        |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  | Alt  |  Alt | Alt  |      |      |                                       |   0  |   0  |  0   |  +   |       |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-     WINDOWS ONLY SETUP!!              | ~L3  |      |       |      |      |
-                                ,------|------|------|       |------+------+------.
-                                |      |      |      |       |      |      |      |
-                                |  Alt |  Alt |------|       |------|  Alt | Alt  |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-
-Usage
-------
-
-~L1 / L2 / L3 will momentarily switch to a layer if held and another key is pressed.
-If pressed and released will remain on layer until pressed again.
-
-### Unicode
-
-This layout is for Windows only. To enter a character Press and Hold Alt, type + and hex code then release Alt.
-
-Changelog
------------
-
-### [0.2.1] - 2016-04-05
-
-* Changed £ to alt code in Windows. Windows sucks at unicode.
-
-### [0.2.0] - 2016-03-27
-
-* Added unicode layer
-* Moved Copy/Paste to left hand side
-* Switched Enter and Space (again)
-* Added L3 (unicode layer) toggle
-* Removed Press and Hold for Alt on right hand size (/)
-* Swapped Volume Up/Down to match arrows
-* Tried fixing £ macro
-* Removed * in the matrix function things (upstream change)
-
-### [0.1.1] - 2016-03-23
-
-* Changed £ input to a macro
-
-
-### [0.1.0] - 2016-03-22
-
-After actually using the keyboard, I've made some changes:
-
-* Swapped Enter and Space
-* Moved backspace to thumb keys (top right still remains)
-* Added Ctrl+Alt+Delete
-* Added Teensy Reset on 2nd layer
-* Switched Up and Down
-* Changed copy/paste to be Ctrl+c and Ctrl+v as KC_COPY/PASTE didn't work (in Windows)
-* Moved ~L2 to replace +L1 after learning how the function works (notes above)
-* Hopefully fixed GBP symbol (unicode enabled in MakeFile)
-
-### [0.0.1] - 2016-03-21
-
-First version
-
-
-Issues
--------
-
-Space for feedback and notes for future improvements
-
-----
-<sup><a name="unicode">1</a></sup>: For Windows only, and you have to edit the [registry](https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input).
diff --git a/layouts/community/ergodox/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c
deleted file mode 100644
index ec46066391..0000000000
--- a/layouts/community/ergodox/bepo/keymap.c
+++ /dev/null
@@ -1,368 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_bepo.h"
-#include "keymap_french.h"
-
-// keymaps
-#define BEPO 0	// default layer, for bepo compatible systems
-#define QW_B 1	// bepo to qwerty base compat layer, for qwerty systems
-#define QW_A 2	// bepo with altgr key to qwerty compat layer
-#define QW_S 3	// bepo with shift key to qwerty compat layer
-#define AZ_B 4	// bepo to azerty base compat layer, for azerty systems
-#define AZ_A 5	// bepo with altgr key to azerty compat layer
-#define AZ_S 6	// bepo with shift key to azerty compat layer
-#define FNAV 7	// function / navigation / mouse layer
-#define NUMK 8	// numeric keypad layer
-
-// macros
-#define KP_00 0	// keypad "double 0"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: default layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   (  |   )  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |   %    |   B  |E_ACUT|   P  |   O  |E_GRAV|Backsp|                                  |CapsLo|   ^  |   V  |   D  |   L  |   J  |   Z    |
- * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
- * |   W    |   A  |   U  |   I  |   E  |   ,  |------|                                  |------|   C  |   T  |   S  |   R  |   N  |   M    |
- * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
- * | E_CIRC |A_GRAV|   Y  |   X  |   .  |   K  |      |                                  |      |   '  |   Q  |   G  |   H  |   F  | C_CEDIL|
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |Escape|Insert|LSuper| LCtrl|  LAlt|             | BEPO |QWERTY|      |AZERTY| BEPO |             | AltGr| RCtrl|RSuper|PrntSc| Pause|
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |L_NumK|      |L_NumK|      |      |
- *                                             | Space|LShift|------|      |------|RShift|Enter |
- *                                             |      |      |L_FNav|      |L_FNav|      |      |
- *                                             `--------------------'      `--------------------'
- */
-[BEPO] = LAYOUT_ergodox(
-// Left hand
-BP_DLR,		BP_DQUO,	BP_LDAQ,	BP_RDAQ,	BP_LPRN,	BP_RPRN,	KC_DEL,
-BP_PERC,	BP_B,		BP_EACU,	BP_P,		BP_O,		BP_EGRV,	KC_BSPC,
-BP_W,		BP_A,		BP_U,		BP_I,		BP_E,		BP_COMM,
-BP_ECIR,	BP_AGRV,	BP_Y,		BP_X,		BP_DOT,		BP_K,		KC_TAB,
-KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
-														DF(BEPO),	DF(QW_B),
-																MO(NUMK),
-												KC_SPC,		KC_LSHIFT,	MO(FNAV),
-// Right hand
-				KC_SLCK,	BP_AT,		BP_PLUS,	BP_MINS,	BP_SLSH,	BP_ASTR,	BP_EQL,
-				KC_CAPS,	BP_DCIR,	BP_V,		BP_D,		BP_L,		BP_J,		BP_Z,
-						BP_C,		BP_T,		BP_S,		BP_R,		BP_N,		BP_M,
-				KC_NUM,	BP_QUOT,	BP_Q,		BP_G,		BP_H,		BP_F,		BP_CCED,
-								KC_ALGR,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
-DF(AZ_B),	DF(BEPO),
-MO(NUMK),
-MO(FNAV),	KC_RSHIFT,	KC_ENTER),
-/* Keymap 1: bepo to qwerty base compat layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   (  |   )  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |   %    |   b  |   e  |   p  |   o  |   e  |Backsp|                                  |CapsLo|   ^  |   v  |   d  |   l  |   j  |   z    |
- * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
- * |   w    |   a  |   u  |   i  |   e  |   ,  |------|                                  |------|   c  |   t  |   s  |   r  |   n  |   m    |
- * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
- * |   e    |   a  |   y  |   x  |   .  |   k  |      |                                  |      |   '  |   q  |   g  |   h  |   f  |   c    |
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |Escape|Insert|LSuper| LCtrl|  LAlt|             | BEPO |QWERTY|      |AZERTY| BEPO |             | AltGr| RCtrl|RSuper|PrntSc| Pause|
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |L_NumK|      |L_NumK|      |      |
- *                                             | Space|LShift|------|      |------|RShift|Enter |
- *                                             |      |      |L_FNav|      |L_FNav|      |      |
- *                                             `--------------------'      `--------------------'
- */
-[QW_B] = LAYOUT_ergodox(
-// Left hand
-KC_DOLLAR,	S(KC_DQUO),	S(KC_COMM),	S(KC_DOT),	KC_LPRN,	KC_RPRN,	KC_DEL,
-KC_PERCENT,	KC_B,		KC_E,		KC_P,		KC_O,		KC_E,		KC_BSPC,
-KC_W,		KC_A,		KC_U,		KC_I,		KC_E,		KC_COMMA,
-KC_E,		KC_A,		KC_Y,		KC_X,		KC_DOT,		KC_K,		KC_TAB,
-KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
-														KC_TRNS,	KC_TRNS,
-																KC_TRNS,
-												KC_SPC,		MO(QW_S),	KC_TRNS,
-// Right hand
-				KC_SLCK,	KC_AT,		KC_PLUS,	KC_MINUS,	KC_SLASH,	KC_ASTR,	KC_EQUAL,
-				KC_CAPS,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,
-						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		KC_M,
-				KC_NUM,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,
-								MO(QW_A),	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	MO(QW_S),	KC_ENTER),
-/* Keymap 2: bepo with altgr key to qwerty compat layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   [  |   ]  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |   %    |   |  |   e  |   &  |   o  |   e  |Backsp|                                  |CapsLo|   ^  |   v  |   d  |   l  |   j  |   z    |
- * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
- * |   w    |   a  |   u  |   i  |   €  |   ,  |------|                                  |------|   c  |   t  |   s  |   r  |   n  |   m    |
- * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
- * |   e    |   \  |   {  |   }  |   .  |   ~  |      |                                  |      |   '  |   q  |   g  |   h  |   f  |   c    |
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |Escape|Insert|LSuper| LCtrl|  LAlt|             | BEPO |QWERTY|      |AZERTY| BEPO |             | AltGr| RCtrl|RSuper|PrntSc| Pause|
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |L_NumK|      |L_NumK|      |      |
- *                                             |   _  |LShift|------|      |------|RShift|Enter |
- *                                             |      |      |L_FNav|      |L_FNav|      |      |
- *                                             `--------------------'      `--------------------'
- */
-[QW_A] = LAYOUT_ergodox(
-// Left hand
-KC_DOLLAR,	S(KC_DQUO),	S(KC_COMM),	S(KC_DOT),	KC_LBRC,	KC_RBRC,	KC_DEL,
-KC_PERCENT,	KC_PIPE,	KC_E,		KC_AMPR,	KC_O,		KC_E,		KC_BSPC,
-KC_W,		KC_A,		KC_U,		KC_I,		RALT(KC_5),	KC_COMMA,
-KC_E,		KC_BSLASH,	KC_LCBR,	KC_RCBR,	KC_DOT,		KC_TILDE,	KC_TAB,
-KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
-														KC_TRNS,	KC_TRNS,
-																KC_TRNS,
-												KC_UNDS,	MO(QW_S),	KC_TRNS,
-// Right hand
-				KC_SLCK,	KC_AT,		KC_PLUS,	KC_MINUS,	KC_SLASH,	KC_ASTR,	KC_EQUAL,
-				KC_CAPS,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,
-						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		KC_M,
-				KC_NUM,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,
-								KC_TRNS,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	MO(QW_S),	KC_ENTER),
-/* Keymap 3: bepo with shift key to qwerty compat layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   #    |   1  |   2  |   3  |   4  |   5  |Delete|                                  |ScroLo|   6  |   7  |   8  |   9  |   0  |   =    |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |   `    |   B  |   E  |   P  |   O  |   E  |Backsp|                                  |CapsLo|   !  |   V  |   D  |   L  |   J  |   Z    |
- * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
- * |   W    |   A  |   U  |   I  |   E  |   ;  |------|                                  |------|   C  |   T  |   S  |   R  |   N  |   M    |
- * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
- * |   E    |   A  |   Y  |   X  |   :  |   K  |      |                                  |      |   ?  |   Q  |   G  |   H  |   F  |   C    |
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |Escape|Insert|LSuper| LCtrl|  LAlt|             | BEPO |QWERTY|      |AZERTY| BEPO |             | AltGr| RCtrl|RSuper|PrntSc| Pause|
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |L_NumK|      |L_NumK|      |      |
- *                                             | Space|LShift|------|      |------|RShift|Enter |
- *                                             |      |      |L_FNav|      |L_FNav|      |      |
- *                                             `--------------------'      `--------------------'
- */
-[QW_S] = LAYOUT_ergodox(
-// Left hand
-KC_HASH,	KC_1,		KC_2,		KC_3,		KC_4,		KC_5,		KC_TRNS,
-KC_GRV,		S(KC_B),	S(KC_E),	S(KC_P),	S(KC_O),	S(KC_E),	KC_TRNS,
-S(KC_W),	S(KC_A),	S(KC_U),	S(KC_I),	S(KC_E),	KC_SCOLON,
-S(KC_E),	S(KC_A),	S(KC_Y),	S(KC_X),	KC_COLON,	S(KC_K),	S(KC_TAB),
-S(KC_ESC),	S(KC_INS),	S(KC_LGUI),	S(KC_LCTL),	S(KC_LALT),
-														KC_TRNS,	KC_TRNS,
-																KC_TRNS,
-												KC_TRNS,	KC_TRNS,	KC_TRNS,
-// Right hand
-				KC_TRNS,	KC_6,		KC_7,		KC_8,		KC_9,		KC_0,		KC_TRNS,
-				KC_TRNS,	KC_EXLM,	S(KC_V),	S(KC_D),	S(KC_L),	S(KC_J),	S(KC_Z),
-						S(KC_C),	S(KC_T),	S(KC_S),	S(KC_R),	S(KC_N),	S(KC_M),
-				KC_TRNS,	S(KC_SLASH),	S(KC_Q),	S(KC_G),	S(KC_H),	S(KC_F),	S(KC_C),
-								S(KC_RALT),	S(KC_RCTL),	S(KC_RGUI),	KC_TRNS,	KC_TRNS,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	KC_TRNS,	KC_TRNS),
-/* Keymap 4: bepo to azerty base compat layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   (  |   )  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |   %    |   b  |e_acut|   p  |   o  |e_grav|Backsp|                                  |CapsLo|   ^  |   v  |   d  |   l  |   j  |   z    |
- * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
- * |   w    |   a  |   u  |   i  |   e  |   ,  |------|                                  |------|   c  |   t  |   s  |   r  |   n  |   m    |
- * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
- * |   e    |a_grav|   y  |   x  |   .  |   k  |      |                                  |      |   '  |   q  |   g  |   h  |   f  | c_cedil|
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |Escape|Insert|LSuper| LCtrl|  LAlt|             | BEPO |QWERTY|      |AZERTY| BEPO |             | AltGr| RCtrl|RSuper|PrntSc| Pause|
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |L_NumK|      |L_NumK|      |      |
- *                                             | Space|LShift|------|      |------|RShift|Enter |
- *                                             |      |      |L_FNav|      |L_FNav|      |      |
- *                                             `--------------------'      `--------------------'
- */
-[AZ_B] = LAYOUT_ergodox(
-// Left hand
-FR_DLR,		FR_DQUO,	FR_LABK,	FR_RABK,	FR_LPRN,	FR_RPRN,	KC_DEL,
-FR_PERC,	KC_B,		FR_EACU,	KC_P,		KC_O,		FR_EGRV,	KC_BSPC,
-FR_W,		FR_A,		KC_U,		KC_I,		KC_E,		FR_COMM,
-KC_E,		FR_AGRV,	KC_Y,		KC_X,		FR_DOT,		KC_K,		KC_TAB,
-KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
-														KC_TRNS,	KC_TRNS,
-																KC_TRNS,
-												KC_SPC,		MO(AZ_S),	KC_TRNS,
-// Right hand
-				KC_SLCK,	FR_AT,		FR_PLUS,	FR_MINS,	FR_SLSH,	FR_ASTR,	FR_EQL,
-				KC_CAPS,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,
-						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		FR_M,
-				KC_NUM,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,
-								MO(AZ_A),	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	MO(AZ_S),	KC_ENTER),
-/* Keymap 5: bepo with altgr key to azerty compat layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   $    |   "  |   <  |   >  |   [  |   ]  |Delete|                                  |ScroLo|   @  |   +  |   -  |   /  |   *  |   =    |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |   %    |   |  |   e  |   &  |   o  |   e  |Backsp|                                  |CapsLo|   ^  |   v  |   d  |   l  |   j  |   z    |
- * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
- * |   w    |   a  |u_grav| trem |   €  |   ,  |------|                                  |------|   c  |   t  |   s  |   r  |   n  |   m    |
- * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
- * |   /    |   \  |   {  |   }  |   .  |   ~  |      |                                  |      |   '  |   q  |   g  |   h  |   f  |   c    |
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |Escape|Insert|LSuper| LCtrl|  LAlt|             | BEPO |QWERTY|      |AZERTY| BEPO |             | AltGr| RCtrl|RSuper|PrntSc| Pause|
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |L_NumK|      |L_NumK|      |      |
- *                                             |   _  |LShift|------|      |------|RShift|Enter |
- *                                             |      |      |L_FNav|      |L_FNav|      |      |
- *                                             `--------------------'      `--------------------'
- */
-[AZ_A] = LAYOUT_ergodox(
-// Left hand
-FR_DLR,		FR_DQUO,	FR_LABK,	FR_RABK,	FR_LBRC,	FR_RBRC,	KC_DEL,
-FR_PERC,	FR_PIPE,	FR_EACU,	FR_AMPR,		KC_O,		FR_EGRV,	KC_BSPC,
-FR_W,		FR_A,		FR_UGRV,	S(KC_LBRC),	FR_EURO,	FR_COMM,
-FR_SLSH,	FR_BSLS,	FR_LCBR,	FR_RCBR,	FR_DOT,		FR_TILD,	KC_TAB,
-KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
-														KC_TRNS,	KC_TRNS,
-																KC_TRNS,
-												FR_UNDS,	MO(AZ_S),	KC_TRNS,
-// Right hand
-				KC_SLCK,	FR_AT,		FR_PLUS,	FR_MINS,	FR_SLSH,	FR_ASTR,	FR_EQL,
-				KC_CAPS,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,
-						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		FR_M,
-				KC_NUM,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,
-								KC_TRNS,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	MO(AZ_S),	KC_ENTER),
-/* Keymap 6: bepo with shift key to azerty compat layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |   #    |   1  |   2  |   3  |   4  |   5  |Delete|                                  |ScroLo|   6  |   7  |   8  |   9  |   0  |   °    |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |   `    |   B  |   E  |   P  |   O  |   E  |Backsp|                                  |CapsLo|   !  |   V  |   D  |   L  |   J  |   Z    |
- * |--------+------+------+------+------+------|  ace |                                  |      |------+------+------+------+------+--------|
- * |   W    |   A  |   U  |   I  |   E  |   ;  |------|                                  |------|   C  |   T  |   S  |   R  |   N  |   M    |
- * |--------+------+------+------+------+------|  Tab |                                  | NumLo|------+------+------+------+------+--------|
- * |   E    |   A  |   Y  |   X  |   :  |   K  |      |                                  |      |   ?  |   Q  |   G  |   H  |   F  |   C    |
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |Escape|Insert|LSuper| LCtrl|  LAlt|             | BEPO |QWERTY|      |AZERTY| BEPO |             | AltGr| RCtrl|RSuper|PrntSc| Pause|
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |L_NumK|      |L_NumK|      |      |
- *                                             | Space|LShift|------|      |------|RShift|Enter |
- *                                             |      |      |L_FNav|      |L_FNav|      |      |
- *                                             `--------------------'      `--------------------'
- */
-[AZ_S] = LAYOUT_ergodox(
-// Left hand
-FR_HASH,	FR_1,		FR_2,		FR_3,		FR_4,		FR_5,		KC_TRNS,
-FR_GRV,		S(KC_B),	S(KC_E),	S(KC_P),	S(KC_O),	S(KC_E),	KC_TRNS,
-S(FR_W),	S(FR_A),	S(KC_U),	S(KC_I),	S(KC_E),	FR_SCLN,
-S(KC_E),	S(FR_A),	S(KC_Y),	S(KC_X),	FR_COLN,	S(KC_K),	S(KC_TAB),
-S(KC_ESC),	S(KC_INS),	S(KC_LGUI),	S(KC_LCTL),	S(KC_LALT),
-														KC_TRNS,	KC_TRNS,
-																KC_TRNS,
-												KC_TRNS,	KC_TRNS,	KC_TRNS,
-// Right hand
-				KC_TRNS,	FR_6,		FR_7,		FR_8,		FR_9,		FR_0,		FR_DEG,
-				KC_TRNS,	FR_EXLM,	S(KC_V),	S(KC_D),	S(KC_L),	S(KC_J),	S(FR_Z),
-						S(KC_C),	S(KC_T),	S(KC_S),	S(KC_R),	S(KC_N),	S(FR_M),
-				KC_TRNS,	FR_QUES,	S(FR_Q),	S(KC_G),	S(KC_H),	S(KC_F),	S(KC_C),
-								S(KC_RALT),	S(KC_RCTL),	S(KC_RGUI),	KC_TRNS,	KC_TRNS,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	KC_TRNS,	KC_TRNS),
-/* Keymap 7: function / navigation / mouse layer
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |VolMut|                                  |      |  F6  |  F7  |  F8  |  F9  |  F10 |        |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |        | Next |LClick|  Up  |RClick| WhUp |VolDwn|                                  |      | PgUp | Home |  Up  |  End |  F11 |        |
- * |--------+------+------+------+------+------|      |                                  |      |------+------+------+------+------+--------|
- * |        | Prev | Left | Down | Right|WhDown|------|                                  |------| PgDn | Left | Down | Right|  F12 |        |
- * |--------+------+------+------+------+------| VolUp|                                  |      |------+------+------+------+------+--------|
- * |        | Undo |  Cut | Copy | Paste|      |      |                                  |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |             |      |      |      |      |      |             |      |      |      |      |      |
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |      |      |      |      |      |
- *                                             |      |      |------|      |------|      |      |
- *                                             |      |      |      |      |      |      |      |
- *                                             `--------------------'      `--------------------'
- */
-[FNAV] = LAYOUT_ergodox(
-// Left hand
-KC_NO,		KC_F1,		KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_MUTE,
-KC_NO,		KC_MS_BTN5,	KC_MS_BTN1,	KC_MS_UP,	KC_MS_BTN2,	KC_MS_WH_UP,	KC_VOLU,
-KC_NO,		KC_MS_BTN4,	KC_MS_LEFT,	KC_MS_DOWN,	KC_MS_RIGHT,	KC_MS_WH_DOWN,
-KC_NO,		KC_UNDO,	KC_CUT,		KC_COPY,	KC_PASTE,	KC_NO,		KC_VOLD,
-KC_NO,		KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,
-														KC_TRNS,	KC_TRNS,
-																KC_TRNS,
-												KC_NO,		KC_TRNS,	KC_TRNS,
-// Right hand
-				KC_NO,		KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_NO,
-				KC_NO,		KC_PGUP,	KC_HOME,	KC_UP,		KC_END,		KC_F11,		KC_NO,
-						KC_PGDOWN,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_F12,		KC_NO,
-				KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
-								KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_NO,		KC_NO,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	KC_TRNS,	KC_NO),
-/* Keymap 8: numeric keypad layer, sends keypad codes
- *
- * ,--------------------------------------------------.                                  ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |                                  |      |      | NumLo|   /  |   *  |   -  |        |
- * |--------+------+------+------+------+-------------|                                  |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |                                  |      |      |   7  |   8  |   9  |   +  |        |
- * |--------+------+------+------+------+------|      |                                  |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|                                  |------|      |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |                                  |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |                                  |      |      |   1  |   2  |   3  | Enter|        |
- * `--------+------+------+------+------+-------------,-------------.      ,-------------`-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |             |      |      |      |      |      |             |   0  |  00  |   .  | Enter|      |
- *   `----------------------------------'      ,------|------|------|      |------+------+------.      `----------------------------------'
- *                                             |      |      |      |      |      |      |      |
- *                                             |      |      |------|      |------|      |      |
- *                                             |      |      |      |      |      |      |      |
- *                                             `--------------------'      `--------------------'
- */
-[NUMK] = LAYOUT_ergodox(
-// Left hand
-KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
-KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
-KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
-KC_NO,		KC_NO,		KC_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_NO,		KC_TRNS,	KC_TRNS,
-// Right hand
-				KC_NO,		KC_NO,		KC_NUM,	KC_KP_SLASH,	KC_KP_ASTERISK,	KC_KP_MINUS,	KC_NO,
-				KC_NO,		KC_NO,		KC_KP_7,	KC_KP_8,	KC_KP_9,	KC_KP_PLUS,	KC_NO,
-						KC_NO,		KC_KP_4,	KC_KP_5,	KC_KP_6,	KC_KP_PLUS,	KC_NO,
-				KC_NO,		KC_NO,		KC_KP_1,	KC_KP_2,	KC_KP_3,	KC_KP_ENTER,	KC_NO,
-								KC_KP_0,	M(KP_00),	KC_KP_COMMA,	KC_KP_ENTER,	KC_NO,
-KC_TRNS,	KC_TRNS,
-KC_TRNS,
-KC_TRNS,	KC_TRNS,	KC_NO)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
-    // keypad "double 0"
-    case KP_00:
-      if (record->event.pressed) {
-        return MACRO( T(KP_0), D(KP_0), END );
-      } else {
-        return MACRO( U(KP_0), END );
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
diff --git a/layouts/community/ergodox/bepo/readme.md b/layouts/community/ergodox/bepo/readme.md
deleted file mode 100644
index 14a1d22196..0000000000
--- a/layouts/community/ergodox/bepo/readme.md
+++ /dev/null
@@ -1,36 +0,0 @@
-![bepo.png](https://i.imgur.com/TnO8ApW.png)
-
-# BEPO keymap for the ErgoDox
-
-This keymap has been made for the BEPO layout (http://bepo.fr), which is an ergonomic french keyboard layout based on Dvorak rules. As it's made for french people, the following of this readme will be in french.
-
-# Disposition BÉPO pour l'ErgoDox
-
-Cette keymap a été pensée pour la disposition BÉPO (http://bepo.fr), qui est une disposition de clavier francophone, ergonomique et libre, élaborée selon la méthode Dvorak. L'adaptation de cette disposition à l'ErgoDox a été réalisée en conservant les points forts du clavier TypeMatrix 2030 (très répandu dans la communauté bépo, avec un excellent rapport ergonomie / prix) voir en réglant certains de ses défauts (3 colonnes pour l'auriculaire droit et touche "Ê") et en apportant son lot de nouveautés (compatibilité avec les systèmes azerty et qwerty).
-
-Particularités
---------------
-
-Touches de repos des pouces : "espace" à gauche et "entrée" à droite.
-
-Placement des touches de combinaison ("Shift", "Alt", "Ctrl"...) adapté aux pouces, et permettant de conserver chaque doigt pour les rangées de lettres auxquelles ils sont assignés sans avoir à changer la touche de combinaison de côté (exemple : "A" majuscule puis "M" majuscule avec les auriculaires et un seul appui d'une touche "Shift").
-
-Les touches "Alt" et "Alt Gr" sont accessibles avec les pouces sur la rangée du bas comme sur la TypeMatrix 2030, avec une symétrie gauche / droite.
-
-Les touches "Ctrl" sont placées sur la même ligne que les touche "Alt" et "Alt Gr" comme sur un clavier clasique, elles sont accessibles aux pouces sur la rangée du bas (moins éloigné que le groupe de touches de pouces pour des petites mains).
-
-Les touches "Backspace" et "Delete" sont placées comme sur la TypeMatrix 2030, du côté gauche uniquement (pour laisser celles de la main droite servir de {caps,num,scroll}lock puisqu'elles ont des LED).
-
-La touche "Tab" est placée comme sur la TypeMatrix 2020.
-
-Meilleure symétrie et accessibilité que la TypeMatrix 2030 : les touches "W" et "%" ont dû être déplacées du côté gauche en raison du nombre de touches de l'ErgoDox, mais l'auriculaire droit ne gère maintenant que deux colonnes de touches au lieu de trois. La touche "Ê" redevient accessible sur la même rangée que les autres lettres, comme sur un clavier classique en disposition bépo. Les lettres, chiffres et symboles sont tous regroupés sur 4 lignes et 6 colonnes pour chaque main, et la première rangée de lettres à la main gauche conserve une identité visuelle "BÉPO".
-
-Touche de fonction permettant de saisir les touches F1 à F12, les touches F1 à F10 sont placées de façon logique par rapport aux chiffres 1 à 0. Cette même touche permet l'accès aux touches directionnelles sans déplacer la main droite et d'effectuer des actions souris avec uniquement la main gauche. Les touches "Home" et "End" sont placées de la même façon que sur une TypeMatrix 2030 par rapport aux touches directionnelles. Les touches "Page Up" et "Page Down" sont également accessibles facilement sans déplacer la main droite. Les fonctions "VolUp" et "VolDown" sont placées comme sur la TypeMatrix 2030, avec la fonction "Mute" juste au dessus. Les fonctions "Undo", "Cut", "Copy" et "Paste" sont placées côte à côte comme elles le seraient sur un clavier QWERTY en combinaison avec la touche "Ctrl" (à l'emplacement des lettres "Z", "X", "C" et "V"). Par rapport au layout "SpaceFN", l'utilisation d'une touche de fonction dédiée au pouce permet de ne pas ajouter de latence, et la touche espace reste compatible avec les jeux (action au moment de l'appui et possibilité d'appui long).
-
-Touche de fonction permettant l'accès au pavé numérique comme sur la TypeMatrix 2030, mais sans avoir à déplacer la main droite : avec les doigts sur la rangée de repos, possibilité de saisir les chiffres "4", "5" et "6" comme sur un pavé numérique classique. Le double "0" de la TypeMatrix a été conservé, et gagne une possibilité de répétition en simples "0".
-
-Touche permettant de basculer en mode BEPO sur un système configuré pour un clavier QWERTY. Cette compatibilité n'est pas parfaite (pas encore de gestion des accents mais ça devrait être faisable avec une disposition en qwerty international, et les combinaisons de touches ne sont pas toutes supportées puisque le clavier traduit déjà certaines touches en combinaisons) mais reste pratique pour une saisie de texte occasionnelle et pour des accès BIOS ou console en QWERTY.
-
-Touche permettant de basculer en mode BEPO sur un système configuré pour un clavier AZERTY. Cette compatibilité n'est pas parfaite (pas de gestion des caractères non présents sur le clavier AZERTY, et les combinaisons de touches ne sont pas toutes supportées puisque le clavier traduit déjà certaines touches en combinaisons) mais reste pratique pour une saisie de texte occasionnelle et pour faire du bureau à distance vers un système Windows sans BEPO.
-
-> Olivier Smedts <olivier@gid0.org>
diff --git a/layouts/community/ergodox/bepo/rules.mk b/layouts/community/ergodox/bepo/rules.mk
deleted file mode 100644
index 839dd82e1e..0000000000
--- a/layouts/community/ergodox/bepo/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Having a file like this allows you to override Makefile definitions
-# for your own particular keymap
-
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-COMMAND_ENABLE   = no  # Commands for debug and configuration
-
-
diff --git a/layouts/community/ergodox/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c
deleted file mode 100644
index 8345d820c1..0000000000
--- a/layouts/community/ergodox/bepo_csa/keymap.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* TypeMatrix-2030-like keymap  */
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "action_util.h"
-#include "led.h"
-#include "keymap_extras/keymap_bepo.h"
-#include "keymap_extras/keymap_canadian_multilingual.h"
-
-enum layers {
-    LR_BASE, // default layer
-    LR_CSA, // BÉPO over Canadian Multilingual (CSA)
-    LR_CSA_SFT, // shifted BÉPO over CSA
-    LR_CSA_AGR, // altgr-ed BÉPO over CSA
-    LR_CSA_AGR_SFT, // altgr-shifted BÉPO over CSA
-    LR_NUMR, // numeric layer
-    LR_FN, // fn layer
-};
-
-#define IS_CA_MULT_ENABLED()    (layer_state & (1 << LR_CSA))
-
-enum macros {
-    // Characters that do not exist in CSA and must be implemented based on unicode support
-    // Note: these are intentionally declared first to be used as indexes in spec_chars below
-    UC_NDSH, // –
-    UC_MDSH, // —
-    UC_ELPS, // …
-    END_UC, // indicates the last unicode character macro
-    // other macros
-    M_CSA_SFT, // toggle shift on CSA
-    M_CSA_AGR_SFT, // toggle shift on LR_CSA_AGR (goes to LR_CSA_AGR_SFT)
-    M_CSA_SFT_AGR, // toggle AltGr on LR_CSA_SFT (goes to LR_CSA_AGR_SFT)
-    // macros for characters that need to be un-shifted in LR_CA_MULT_SHIFT
-    M_1,
-    M_2,
-    M_3,
-    M_4,
-    M_5,
-    M_6,
-    M_7,
-    M_8,
-    M_9,
-    M_0,
-    M_DEGR,
-    M_SCLN,
-    M_GRV,
-    M_NBSP,
-    // macros for characters that don't have a simple key combination in LR_CA_MULT_ALTGR
-    M_CRC,
-    // other layer macros
-    M_DBL0, // double 0
-    M_FNLR, // fn layer
-    M_NMAL, // num+alt
-};
-
-#define CSA(name)   M(M_CSA_##name)     // calls a CSA macro
-
-const uint16_t unicode_chars[] = {
-        [UC_NDSH] = L'–',
-        [UC_MDSH] = L'—',
-        [UC_ELPS] = L'…',
-};
-
-/* shortcut for unicode character macros */
-#define MUC(name)   M(UC_##name)    // calls a unicode macro
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   $    |   "  |   «  |   »  |   (  |   )  | Del  |           | Del  |   @  |   +  |   -  |   /  |   *  |   W    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   B  |   É  |   P  |   O  |   È  |Backsp|           |Backsp|   ^  |   V  |   D  |   L  |   J  |   Z    |
- * |--------+------+------+------+------+------|ace   |           |ace   |------+------+------+------+------+--------|
- * |   =    |   A  |   U  |   I  |   E  |   ,  |------|           |------|   C  |   T  |   S  |   R  |   N  |   M    |
- * |--------+------+------+------+------+------|Enter |           |Enter |------+------+------+------+------+--------|
- * | LShift |   À  |   Y  |   X  |   .  |   K  |      |           |      |   '  |   Q  |   G  |   H  |   F  | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl |  fn  | LGui |numAlt| LAlt |                                       |Alt Gr|   %  |  App |   Ç  | RCtrl|
- *   `----------------------------------'                                       `----------------------------------'
- *                                       ,--------------.       ,-------------.
- *                                       |  Esc  | num  |       | Left |Right |
- *                                ,------+-------+------|       |------+------+------.
- *                                |      |       | PgUp |       |  Up  |      |      |
- *                                |Space | Home  |------|       |------| End  |Space |
- *                                |      |       | PgDn |       | Down |      |      |
- *                                `---------------------'       `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[LR_BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        BP_DLR,     KC_1,      KC_2,    KC_3,      KC_4,     KC_5,    KC_DEL,
-        KC_TAB,     BP_B,      BP_EACU, BP_P,      BP_O,     BP_EGRV, KC_BSPC,
-        BP_EQL,     BP_A,      BP_U,    BP_I,      BP_E,     BP_COMM,
-        KC_LSFT,    BP_AGRV,   BP_Y,    BP_X,      BP_DOT,   BP_K,    KC_ENT,
-        KC_LCTL,    M(M_FNLR), KC_LGUI, M(M_NMAL), KC_LALT,
-
-                                                   KC_ESC,   TG(LR_NUMR),
-                                                             KC_PGUP,
-                                          KC_SPC,  KC_HOME,  KC_PGDN,
-
-        // right hand
-        KC_DEL,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,     BP_W,
-        KC_BSPC,   BP_DCIR,  BP_V,    BP_D,    BP_L,    BP_J,     BP_Z,
-                   BP_C,     BP_T,    BP_S,    BP_R,    BP_N,     BP_M,
-        KC_ENT,    BP_QUOT,  BP_Q,    BP_G,    BP_H,    BP_F,     KC_RSFT,
-                             KC_ALGR, BP_PERC, KC_APP,  BP_CCED,  KC_RCTL,
-
-        KC_LEFT, KC_RGHT,
-        KC_UP,
-        KC_DOWN, KC_END,   KC_SPC
-    ),
-/**
- * Same as default but for use with Canadian Multilingual on OS side
- */
-[LR_CSA] = LAYOUT_ergodox(
-        // left hand
-        KC_DLR,      CA_DQUO,    CA_LDAQ,   CA_RDAQ,   KC_LPRN,  KC_RPRN,   KC_TRNS,
-        KC_TRNS,     KC_B,       CA_EACU,   KC_P,      KC_O,     CA_EGRV,   KC_TRNS,
-        KC_EQL,      KC_A,       KC_U,      KC_I,      KC_E,     KC_COMM,
-        CSA(SFT),    CA_AGRV,    KC_Y,      KC_X,      KC_DOT,   KC_K,      KC_TRNS,
-        KC_TRNS,     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,
-
-                                                       KC_TRNS,  KC_TRNS,
-                                                                 KC_TRNS,
-                                            KC_TRNS,   KC_TRNS,  KC_TRNS,
-
-        // right hand
-        KC_TRNS,  KC_AT,     KC_PLUS,  KC_MINS,  CA_SLSH,   KC_ASTR,   KC_W,
-        KC_TRNS,  CA_CIRC,   KC_V,     KC_D,     KC_L,      KC_J,      KC_Z,
-                  KC_C,      KC_T,     KC_S,     KC_R,      KC_N,      KC_M,
-        KC_TRNS,  CA_QUOT,   KC_Q,     KC_G,     KC_H,      KC_F,      CSA(SFT),
-                      MO(LR_CSA_AGR),  KC_PERC,  KC_TRNS,   CA_CCED,   KC_LCTL, // RCTL has a special behaviour in CSA so use LCTL
-
-        KC_TRNS,  KC_TRNS,
-        KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS
-    ),
-/* Shifted BÉPO over Canadian Multilingual
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   #    |   1  |   2  |   3  |   4  |   5  |      |           |      |   6  |   7  |   8  |   9  |   0  |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |   !  |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   °    |      |      |      |      |   ;  |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |   :  |      |      |           |      |   ?  |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |   `  |      |      |       |
- *   `----------------------------------'                                       `-----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[LR_CSA_SFT] = LAYOUT_ergodox(
-        // left hand
-        KC_HASH,  M(M_1),   M(M_2),   M(M_3),  M(M_4),   M(M_5),   KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
-        M(M_DEGR),KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  M(M_SCLN),
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_COLN,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
-
-                                                      KC_TRNS,  KC_TRNS,
-                                                                KC_TRNS,
-                                          M(M_NBSP),  KC_TRNS,  KC_TRNS,
-
-        // right hand
-        KC_TRNS,  M(M_6),    M(M_7),   M(M_8),   M(M_9),   M(M_0),   KC_TRNS,
-        KC_TRNS,  KC_EXLM,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  CA_QUES,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                        CSA(SFT_AGR),  M(M_GRV), KC_TRNS,  KC_TRNS,  KC_TRNS,
-
-        KC_TRNS,  KC_TRNS,
-        KC_TRNS,
-        KC_TRNS,  KC_TRNS,  M(M_NBSP)
-    ),
-/* AltGr-ed BÉPO over Canadian Multilingual
- * "////" indicates that the key is disabled (unsupported bépo character)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |    –   |   —  |   <  |   >  |   [  |   ]  |      |           |      |   ^  |   ±  | //// |   ÷  |   ×  | dead ˘ |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   |  |dead '|   &  |   œ  |dead `|      |           |      |   ¡  |dead ˇ|   ð  | //// |   ij  | ////// |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | ////// |   æ  |   ù  |dead "|   €  |   ̛’  |------|           |------|   ©  |   þ  |   ß  |   ®  |dead ~| dead ¯ |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   \  |   {  |   }  |   …  |   ~  |      |           |      |   ¿  |dead °|   μ  | //// |dead ˛|        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      | //// |      |dead ¸|       |
- *   `----------------------------------'                                       `-----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |   _  |      |------|       |------|      |  _   |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[LR_CSA_AGR] = LAYOUT_ergodox(
-        // left hand
-        MUC(NDSH),    MUC(MDSH),  CA_LABK,   CA_RABK,   CA_LBRC,    CA_RBRC,   KC_TRNS,
-        KC_TRNS,      CA_PIPE,    CA_ACUT,   KC_AMPR,   CA_OE,      CA_GRV,    KC_TRNS,
-        KC_NO,        CA_AE,      CA_UGRV,   CA_DIAE,   CA_EURO,    CA_RQSU,
-        CSA(AGR_SFT), CA_BSLS,    CA_LCBR,   CA_RCBR,   MUC(ELPS),  CA_TILD,   KC_TRNS,
-        KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,
-
-                                                      KC_TRNS,  KC_TRNS,
-                                                                KC_TRNS,
-                                        KC_UNDS, CSA(AGR_SFT),  KC_TRNS,
-
-        // right hand
-        KC_TRNS,  M(M_CRC),  CA_PLMN,   KC_NO,     CA_DIV,   CA_MUL,    CA_BREV,
-        KC_TRNS,  CA_IEXL,   CA_CARN,   CA_ETH,    KC_NO,    CA_IJ,     KC_NO,
-                  CA_COPY,   CA_THRN,   CA_SS,     CA_REGD,  CA_DTIL,   CA_MACR,
-        KC_TRNS,  CA_IQUE,   CA_RNGA,   CA_MICR,   KC_NO,    CA_OGON,   CSA(AGR_SFT),
-                             KC_TRNS,   KC_NO,     KC_TRNS,  CA_CEDL,   KC_TRNS,
-
-        KC_TRNS,  KC_TRNS,
-        KC_TRNS,
-        KC_TRNS,  CSA(AGR_SFT),  KC_UNDS
-    ),
-/* AltGr-shifted BÉPO over Canadian Multilingual
- * "////" indicates that the key is disabled (unsupported bépo character or unused in bépo)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |    ¶   | //// |   “  |   ”  | //// | //// |      |           |      | //// |   ¬  |   ¼  |   ½  |   ¾  | ////// |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   ¦  |   ˝  |   §  |   Œ  |   `  |      |           |      | //// | //// |   Ð  | //// |   IJ  | ////// |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | ////// |   Æ  |   Ù  |dead-˙| //// | //// |------|           |------| //// |   Þ  |   ẞ   |   ™  | //// |   º    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | //// |   ‘  |   ’  | //// | //// |      |           |      | //// | //// | //// | //// |   ª  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[LR_CSA_AGR_SFT] = LAYOUT_ergodox(
-        // left hand
-        CA_PARA,       KC_NO,     CA_LDQU,     CA_RDQU,   KC_NO,     KC_NO,     KC_TRNS,
-        KC_TRNS,       CA_BRKP,   CA_DACU,     CA_SECT,   S(CA_OE),  M(M_GRV),  KC_TRNS,
-        KC_NO,         S(CA_AE),  S(CA_UGRV),  CA_DOTA,   KC_NO,     KC_NO,
-        CSA(AGR_SFT),  KC_NO,     CA_LSQU,     CA_RSQU,   KC_NO,     KC_NO,     KC_TRNS,
-        KC_TRNS,       KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,
-
-        KC_TRNS,  KC_TRNS,
-        KC_TRNS,
-        KC_TRNS,  CSA(AGR_SFT),  KC_TRNS,
-
-        // right hand
-        KC_TRNS,  KC_NO,     CA_NOT,      CA_QRTR,     CA_HALF,   CA_TQTR,    KC_NO,
-        KC_TRNS,  KC_NO,     KC_NO,       S(CA_ETH),   KC_NO,     S(CA_IJ),   KC_NO,
-                  KC_NO,     S(CA_THRN),  S(CA_SS),    CA_TM,     KC_NO,      CA_MORD,
-        KC_TRNS,  KC_NO,     KC_NO,       KC_NO,       KC_NO,     CA_FORD,    CSA(AGR_SFT),
-                        CSA(SFT_AGR),     KC_TRNS,     KC_TRNS,   KC_TRNS,    KC_TRNS,
-
-        KC_TRNS,  KC_TRNS,
-        KC_TRNS,
-        KC_TRNS,  CSA(AGR_SFT),  KC_TRNS
-    ),
-/* Numeric Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |      |      |  Tab |   /  |   *  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |  F6  |  F7  |  F8  |  F9  |  F10 |      |           |      |      | Home |   7  |   8  |   9  |   +    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |  F11 |  F12 |      |      |      |------|           |------|  Up  | End  |   4  |   5  |   6  |   +    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           | Left | Down | Right|   1  |   2  |   3  |KpEnter |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |   0  |  00  |   .  |Etr/Ctl|
- *   `----------------------------------'                                       `-----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |n.lock|c.lock|
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[LR_NUMR] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
-       KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-       KC_TRNS, KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                              KC_TRNS, KC_TRNS,KC_TRNS,
-
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,   KC_TAB,  KC_PSLS,  KC_PAST, KC_PMNS,
-       KC_TRNS, KC_TRNS, KC_HOME, KC_P7,   KC_P8,    KC_P9,   KC_PPLS,
-                KC_UP,   KC_END,  KC_P4,   KC_P5,    KC_P6,   KC_PPLS,
-       KC_LEFT, KC_DOWN, KC_RGHT, KC_P1,   KC_P2,    KC_P3,   KC_PENT,
-                         KC_TRNS, KC_P0,   M(M_DBL0),KC_PDOT, CTL_T(KC_PENT),
-
-       KC_NLCK, KC_CAPS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* fn layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |~CA-mult|      |      |      |      |      |Insert|           |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |VolUp |           |      |      |      |      |      |      | Pause  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  QK_BOOT |      |      | Calc | Mail |Browsr|------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | App  | cut  | copy |paste | Mute |VolDn |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      | Next |       |      |      |      |
- *                                 | Mute | play |------|       |------|      |      |
- *                                 |      |      | Prev |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[LR_FN] = LAYOUT_ergodox(
-       TG(LR_CSA), KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_INS,
-       KC_TRNS,    KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_VOLU,
-       QK_BOOT,    KC_TRNS, KC_TRNS,      KC_CALC,     KC_MAIL,      KC_WHOM,
-       KC_TRNS,    KC_APP,  S(KC_DEL),    LCTL(KC_INS),S(KC_INS),    KC_MUTE, KC_VOLD,
-       KC_TRNS,    KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_MPRV,
-                                  KC_MUTE, KC_MPLY, KC_MNXT,
-
-    // right hand
-       KC_INS,   KC_EJCT, KC_PWR,  KC_SLEP, KC_WAKE, KC_PSCR, KC_SLCK,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-void hold_shift(void) {
-    register_code(KC_LSHIFT);
-}
-
-void release_shift(void) {
-    unregister_code(KC_LSHIFT);
-}
-
-uint16_t hextokeycode(int hex) {
-    if (hex == 0x0) {
-        return KC_P0;
-    } else if (hex < 0xA) {
-        return KC_P1 + (hex - 0x1);
-    } else {
-        return KC_A + (hex - 0xA);
-    }
-}
-
-void send_unicode(uint16_t unicode)
-{
-    // For more info on how this works per OS, see here: https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input
-    // Implemented for Windows:
-    // Pressing ALT followed by + followed by the unicode code point in hex.
-    // Requires registry key HKEY_CURRENT_USER\Control Panel\Input Method\EnableHexNumpad set to String 1
-    register_code(KC_LALT);
-    register_code(KC_PPLS);
-    unregister_code(KC_PPLS);
-
-    for (int i = 12; i >= 0; i -= 4) {
-        register_code(hextokeycode((unicode >> i) & 0xF));
-        unregister_code(hextokeycode((unicode >> i) & 0xF));
-    }
-
-    unregister_code(KC_LALT);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-    switch(id) {
-        case 0 ... END_UC:
-            if (record->event.pressed) {
-                send_unicode(unicode_chars[id]);
-            }
-            break;
-        case M_CSA_SFT:
-            // BÉPO over CSA: toggle shift layer
-            layer_invert(LR_CSA_SFT);
-            if (record->event.pressed) {
-                hold_shift();
-            } else {
-                release_shift();
-            }
-            break;
-        case M_CSA_SFT_AGR:
-            // BÉPO over CSA: from shift layer, momentary altgr+shift layer
-            layer_invert(LR_CSA_AGR);
-            layer_invert(LR_CSA_AGR_SFT);
-            if (record->event.pressed) {
-                // shift not needed for LR_CSA_AGR_SFT
-                release_shift();
-            } else {
-                // back to shift layer
-                hold_shift();
-            }
-            break;
-        case M_CSA_AGR_SFT:
-            // BÉPO over CSA: from altgr layer, momentary altgr+shift layer
-            layer_invert(LR_CSA_SFT);
-            layer_invert(LR_CSA_AGR_SFT);
-            break;
-        case M_1 ... M_0:
-        case M_DEGR:
-        case M_SCLN:
-        case M_GRV:
-        case M_NBSP:
-            // macros of the shift layer that require to release shift
-            if (record->event.pressed) {
-                release_shift();
-                switch (id) {
-                    case M_1 ... M_0:
-                        register_code(KC_1 + (id - M_1));
-                        break;
-                    case M_DEGR:
-                        return MACRO(DOWN(KC_ALGR), D(SCLN), END);
-                    case M_SCLN:
-                        return MACRO(D(SCLN), END);
-                    case M_GRV:
-                        return MACRO(I(75), DOWN(KC_ALGR), TYPE(CA_CIRC), UP(KC_ALGR), T(SPACE), END);
-                    case M_NBSP:
-                        // use weak mod such that pressing another key will not be affected
-                        add_weak_mods(MOD_BIT(KC_ALGR));
-                        return MACRO(D(SPACE), END);
-                }
-            } else {
-                hold_shift();
-                switch (id) {
-                    case M_1 ... M_0:
-                        unregister_code(KC_1 + (id - M_1));
-                        break;
-                    case M_DEGR:
-                        return MACRO(UP(KC_ALGR), U(SCLN), END);
-                    case M_SCLN:
-                        return MACRO(U(SCLN), END);
-                    case M_NBSP:
-                        del_weak_mods(MOD_BIT(KC_ALGR));
-                        return MACRO(U(SPACE), END);
-                }
-            }
-            break;
-        case M_CRC:
-            if (record->event.pressed) {
-                return MACRO(I(75), TYPE(CA_CIRC), T(SPACE), END);
-            }
-            break;
-        case M_DBL0:
-            if (record->event.pressed) {
-                return MACRO( I(25), T(P0), T(P0), END );
-            }
-        break;
-        case M_FNLR:
-            layer_invert(LR_NUMR);
-            layer_invert(LR_FN);
-            break;
-        case M_NMAL:
-            layer_invert(LR_NUMR);
-            if (record->event.pressed) {
-                register_code(KC_LALT);
-            } else {
-                unregister_code(KC_LALT);
-            }
-            break;
-    }
-    return MACRO_NONE;
-};
-
-// 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) {
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    // led 1: numeric layer
-    if (layer_state & (1 << LR_NUMR)) {
-        ergodox_right_led_1_on();
-    }
-    // led 2: BÉPO over Canadian Multilingual
-    if (IS_CA_MULT_ENABLED()) {
-        ergodox_right_led_2_on();
-    }
-    // led 3: caps lock
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-      ergodox_right_led_3_on();
-    }
-};
diff --git a/layouts/community/ergodox/bepo_csa/readme.md b/layouts/community/ergodox/bepo_csa/readme.md
deleted file mode 100644
index d4975b2265..0000000000
--- a/layouts/community/ergodox/bepo_csa/readme.md
+++ /dev/null
@@ -1,162 +0,0 @@
-# BÉPO Keymap with firmware-remapping for software CSA layout
-
-This is a keymap intended to be used with the [BÉPO layout](http://bepo.fr), a French ergonomic layout designed by following Dvorak's principles.
-
-The particularity of this keymap is that it supports using the [Canadian Multilingual Standard layout](https://en.wikipedia.org/wiki/QWERTY#Canadian_Multilingual_Standard) (also known as _ACNOR keyboard_ or _CSA keyboard_, see also the [French page](https://fr.wikipedia.org/wiki/QWERTY#Clavier_canadien_multilingue_standard) which contains more details) on the OS side, by enabling the _CSA_ layer. This is especially useful for operating systems that natively provide CSA, but not BÉPO, like Windows. The CSA layout was chosen because it is probably the standard layout that provides the best character set coverage.
-
-This keymap is based on the [tm2030](../tm2030/) keymap, whose goal was to have a [TypeMatrix™ 2030](http://typematrix.com/2030/features.php) inspired layout for the ErgoDox EZ.
-
-As this keyboard is intended for French people, the rest of this page will be in French.
-
-# Keymap BÉPO avec support en firmware pour utilisation avec la disposition CSA en software
-
-Cette keymap a été conçue pour être utilisée avec la [disposition BÉPO](http://bepo.fr), la disposition francophone, ergonomique et libre basée sure les principes de Dvorak.
-
-La particularité de cette keymap est qu'elle supporte l'utilisation du [clavier canadien multilingue standard](https://fr.wikipedia.org/wiki/QWERTY#Clavier_canadien_multilingue_standard) (aussi appelé _clavier ACNOR_ ou _clavier CSA_) du côté du système d'exploitation, en activant la couche _CSA_. Ceci s'avère particulièrement utile pour les systèmes d'exploitations qui fournissent nativement le CSA, mais pas le BÉPO, comme Windows. Le clavier CSA a été choisi comme base car c'est probablement la disposition standard qui fournit la meilleure couverture en termes de caractères disponibles.
-
-Cette keymap est basée sur la keymap [tm2030](../tm2030/), dont le but est de fournir une disposition inspirée du [TypeMatrix™ 2030](http://typematrix.com/2030/features.php) pour l'ErgoDox EZ.
-
-## Couche de base
-C'est la couche par défaut, proche du TypeMatrix, avec les différences suivantes:
-- La ligne du haut (les touches `F`) et la colonne de droite sont retirées, les touches correspondantes étant déplacées ailleurs.
-- Les touches situés en bas à gauche sont redisposées dans cet ordre: `Ctrl`, `fn`, `Gui`, `num+Alt`, `Alt`
-- Les touches `shuffle` (`Alt+Tab`) et `desktop` ne sont pas supportés
-- `W` est déplacé à la place de `=`
-- `=` est déplacé sous `Tab` (au lieu d'avoir un grand `Shift`)
-- `%` et `Ç` sont déplacés à la place de `Home` et `End` respectivement
-- Les flèches ainsi que `PgUp`/`PgDown`/`Home`/`End` sont déplacées sur les pouces
-
-À noter que pour `W` et `Ç`, le but a été de ne pas les déplacer trop par rapport à la disposition BÉPO _standard_, afin de pouvoir repasser facilement sur un TypeMatrix ou un clavier traditionnel.
-
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   $    |   "  |   «  |   »  |   (  |   )  | Del  |           | Del  |   @  |   +  |   -  |   /  |   *  |   W    |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-| Tab    |   B  |   É  |   P  |   O  |   È  |Backsp|           |Backsp|   ^  |   V  |   D  |   L  |   J  |   Z    |
-|--------+------+------+------+------+------|ace   |           |ace   |------+------+------+------+------+--------|
-|   =    |   A  |   U  |   I  |   E  |   ,  |------|           |------|   C  |   T  |   S  |   R  |   N  |   M    |
-|--------+------+------+------+------+------|Enter |           |Enter |------+------+------+------+------+--------|
-| LShift |   À  |   Y  |   X  |   .  |   K  |      |           |      |   '  |   Q  |   G  |   H  |   F  | RShift |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |LCtrl |  fn  | LGui |numAlt| LAlt |                                       |Alt Gr|   %  |  App |   Ç  | RCtrl|
-  `----------------------------------'                                       `----------------------------------'
-                                      ,--------------.       ,-------------.
-                                      |  Esc  | num  |       | Left |Right |
-                               ,------+-------+------|       |------+------+------.
-                               |      |       | PgUp |       |  Up  |      |      |
-                               |Space | Home  |------|       |------| End  |Space |
-                               |      |       | PgDn |       | Down |      |      |
-                               `---------------------'       `--------------------'
-```
-
-### Changer de couche
-
-- Utilisez `num` pour activer/désactiver [la couche numérique](#couche-numérique)
-- Maintenez `fn` pour activer temporairement [les couches numériques et Fn](#couche-fn)
-- Maintenez `numAlt` pour activer temporairement la couche numérique combinée avec `Alt` (facilite l'utilisation des raccourcis tels que `Alt`+`F4`)
-
-### Diodes
-Les diodes de l'ErgoDox EZ (côté droit) sont utilisées de la façon suivante :
-
-- diode de gauche (rouge) : indique l'activation de [la couche numérique](#couche-numérique)
-- diode du milieu (verte) : indique l'activation du [mode CSA](#couche-csa)
-- diode de droite (bleue) : indique le verrouillage majuscules
-
-## Couche CSA
-La couche _CSA_ est la même que la couche de base, pour une utilisation avec un clavier Canadien Multilingue configuré dans le système d'exploitation.
-
-Pour l'activer, appuyez sur `fn`+`$`. La [diode](#diodes) verte indique que la couche CSA est activée.
-
-### Limitations
-Seuls les caractères présents dans le clavier CSA sont parfaitement supportés. De manière générale, il s'agit des caractères suivants :
-
-- toute la couche de base
-- tous les caractères accessibles en `Shift`
-- tous les caractères de la main gauche accessibles en `AltGr` à l'exception du `≠`
-- environ la moitié des caractères de la main droite accessibles en `AltGr` et la moitié des caractères accessibles en `AltGr`+`Shift` (consultez [le fichier source](keymap.c) pour voir les caractères supportés)
-
-En particulier, les caractères suivants sont émulés via le support Unicode (Windows seulement):
-
-- le tiret cadratin (tiret long) : —
-- le tiret demi-cadratin (demi tiret) : –
-- les points de suspension : …
-
-L'implémentation actuelle ne fonctionne pas dans toutes les applications, en particulier les applications MS Office.
-
-Il est probable que l'utilisation de la couche CSA ne fonctionne pas correctement dans certains jeux vidéos.
-
-Cette fonctionnalité a été conçue et testée essentiellment pour Windows (7).
-
-### Détails techniques
-Techniquement, la couche CSA est en réalité composée de 4 couches servant à émuler la couche de base, les appuis sur `Shift` ou `Alt` et la combinaison des deux.
-
-Le changement de couches se fait par des macros afin d'activer ou désactiver plusieurs couches et la touche `Shift` en même temps.
-
-Certains caractères sont également implémentés par des macros, notamment ceux de la couche `Shift` qui n'ont pas besoin de cette touche en CSA, comme les chiffres.
-
-Les caractères Unicode se basent sur une implémentation spécifique et non celle fournie dans QMK — il faudrait sans doute migrer le code. Notez la façon dont ces caractères sont déclarés tels quels dans [le code source](keymap.c) (tableau `unicode_char`).
-
-## Couche numérique
-Couche numérique proche du TM lorsqu'on active `num`, avec les différences suivantes :
-
-- Le clavier numérique est déplacés de 1 vers le haut et vers la droite.
-- Les flèches sont décalées de 1 vers la gauche.
-- Fournit l'accès aux touches `F1` à `F12`, `caps-lock` et `num-lock`.
-
-La couche numérique est indiquée par la [diode](#diodes) de gauche (rouge). Caps-lock est indiqué par la diode de droite (bleue).
-
-La touche `numAlt` de [la couche de base](#couche-de-base) permet d'activer la couche numérique et la touche `Alt` simultanément, afin de faciliter les raccourcis claviers comme `Alt`+`F4`.
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |      |      |  Tab |   /  |   *  |   -    |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        |  F6  |  F7  |  F8  |  F9  |  F10 |      |           |      |      | Home |   7  |   8  |   9  |   +    |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |  F11 |  F12 |      |      |      |------|           |------|  Up  | End  |   4  |   5  |   6  |   +    |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |      |      |      |      |      |           | Left | Down | Right|   1  |   2  |   3  |KpEnter |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |      |      |      |      |                                       |      |   0  |  00  |   .  |Etr/Ctl|
-  `----------------------------------'                                       `-----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |n.lock|c.lock|
-                                ,------|------|------|       |------+------+------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |      |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-## Couche Fn
-Activée simultanément avec la couche numérique lorsque l'on maintient la touche `fn`. Comme sur le TM, elle fournit l'accès aux fonctionnalités suivantes :
-
-- `couper`, `copier` et `coller` — attention: ne pas utiliser dans l'explorateur de fichiers.
-- monter/baisser/couper le volume — seulement accessible en main gauche, contrairement au TM.
-- piste précédente/suivante
-- calculatrice, e-mail et page d'accueil du navigateur web
-- `insert`, `power`, `sleep`, `wake`, `print screen`, `scroll-lock` et `pause`
-- ~CSA: (dés)activation de [la couche CSA](#couche-csa) sur `$`
-- RESET: rechargement du firmware avec Teensy-Loader (pour les développeurs)
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|  ~CSA  |      |      |      |      |      |Insert|           |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        |      |      |      |      |      |VolUp |           |      |      |      |      |      |      | Pause  |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|  RESET |      |      | Calc | Mail |Browsr|------|           |------|      |      |      |      |      |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        | App  | cut  | copy |paste | Mute |VolDn |           |      |      |      |      |      |      |        |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |      |      |      |      |                                       |      |      |      |      |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------|------|------|       |------+------+------.
-                                |      |      | Next |       |      |      |      |
-                                | Mute | play |------|       |------|      |      |
-                                |      |      | Prev |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
\ No newline at end of file
diff --git a/layouts/community/ergodox/bryan/keymap.c b/layouts/community/ergodox/bryan/keymap.c
deleted file mode 100644
index ab301e8922..0000000000
--- a/layouts/community/ergodox/bryan/keymap.c
+++ /dev/null
@@ -1,222 +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
- *
- * ,--------------------------------------------------------.           ,--------------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | Cmd,Shft,[ |           | Cmd,Shft,] |   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------------|           |------------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1        |           |  L1        |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|            |           |            |------+------+------+------+------+--------|
- * |BkSp/Cmd|   A  |   S  |   D  |   F  |   G  |------------|           |------------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper      |           | Meh        |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |            |           |            |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Ctrl/Esc|PgUp|       | App  | LGui |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | PgDn |       | Home |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | Esc  |       | Alt  |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_EQL,                KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   M(2),
-        KC_DEL,                KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
-        GUI_T(KC_BSPC),        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,               CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
-                                                 CTL_T(KC_ESC),KC_PGUP,
-                                                               KC_PGDN,
-                                               KC_SPC,KC_BSPC, KC_ESC,
-        // right hand
-             M(3),        KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(SYMB),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
-                          KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-             MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
-                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
-
-             ALT_T(KC_APP),  KC_LGUI,
-             KC_HOME,
-             KC_LALT,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |  <-  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, M(1), KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-// KC_COMM, KC_MINS
-
-/* 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
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-        case 1:
-        if (record->event.pressed) { // For resetting EEPROM
-          eeconfig_init();
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-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/layouts/community/ergodox/common_nighthawk/keymap.c b/layouts/community/ergodox/common_nighthawk/keymap.c
deleted file mode 100644
index 976fb68982..0000000000
--- a/layouts/community/ergodox/common_nighthawk/keymap.c
+++ /dev/null
@@ -1,212 +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
-
-//Tap Dance Declarations
-enum {
-  TD_U_LBRC = 0,
-  TD_I_RBRC,
-};
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_U_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_U, KC_LBRC),
-  [TD_I_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_RBRC)
-};
-
-//Macro Declarations
-static uint16_t sunds_timer;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  _     |   x  |   x  |   _  |  Esc | Hypr | Home |           | End  | Hypr |   [  |   ]  |  `~  |  `~  |  Bks   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |Ctrl/Tab|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  |   U  |   I  |   O  |   P  |  Ctrl  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Cmd/"' |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Cmd/Entr|
- * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
- * |  Shft  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |  Shft  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |  Bks |   x  |   x  |  Alt |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Teensy| VolUp|       | Play |  Del   |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | VolDn|       | Next |        |      |
- *                                 |Sp/~L1|  L2  |------|       |------|   L2   |'"/~L1|
- *                                 |      |      | Mute |       | Prev |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_UNDS,         KC_1,          KC_1,          KC_UNDS,         KC_ESC,   ALL_T(KC_NO),      KC_HOME,
-        CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
-        M(1),            KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
-        KC_LSFT,         KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
-        KC_LALT,         KC_1,          KC_1,          KC_1,            KC_LEFT,
-                                                                        QK_BOOT,  KC_VOLU,
-                                                                        KC_VOLD,
-                                                                        LT(SYMB, KC_SPC),  TG(MDIA), KC_MUTE,
-        // right hand
-        KC_END,          ALL_T(KC_NO),  KC_LBRC,        KC_RBRC,        KC_GRV,   KC_GRV,            KC_BSPC,
-        KC_PGUP,         KC_Y,          KC_U,           KC_I,           KC_O,     KC_P,              KC_LCTRL,
-                         KC_H,          KC_J,           KC_K,           KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           KC_RSFT,
-                                        KC_RGHT,        KC_BSPC,        KC_1,     KC_1,              KC_RALT,
-        KC_MPLY,         KC_DEL,
-        KC_MNXT,
-        KC_MPRV,         TG(MDIA),      LT(SYMB, KC_QUOT)
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   ^  |   [  |   (  |   {  |      |           |      |   =  |   7  |   8  |   9  |   0  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   &  |   $  |   ]  |   )  |   }  |------|           |------|   +  |   4  |   5  |   6  |   *  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   \  |   @  |   #  |   %  |   |  |      |           |      |   -  |   1  |   2  |   3  |   /  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |   0  |   0  |   .  |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_TRNS,
-       KC_TRNS,  KC_EXLM,  KC_CIRC,  KC_LBRC,  KC_LPRN,  KC_LCBR,  KC_TRNS,
-       KC_TRNS,  KC_AMPR,  KC_DLR,   KC_RBRC,  KC_RPRN,  KC_RCBR,
-       KC_TRNS,  KC_BSLS,  KC_AT,    KC_HASH,  KC_PERC,  KC_PIPE,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                                               KC_TRNS,  KC_TRNS,
-                                               KC_TRNS,
-                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
-       // right hand
-       KC_TRNS,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_TRNS,
-       KC_TRNS,  KC_EQL,   KC_7,     KC_8,     KC_9,     KC_0,     KC_TRNS,
-                 KC_PLUS,  KC_4,     KC_5,     KC_6,     KC_ASTR,  KC_TRNS,
-       KC_TRNS,  KC_MINS,  KC_1,     KC_2,     KC_3,     KC_TRNS,  KC_TRNS,
-                           KC_0,     KC_0,     KC_DOT,   KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,
-       KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      | WhDn | WhUp |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      | R-Ck | L-Ck |      |------|           |------| MsLt | MsDn | MsUp | MsRt |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       M(0),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS,     KC_WH_U,     KC_WH_D,     KC_TRNS,     KC_TRNS, KC_TRNS,
-                 KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_UP,    KC_MS_RIGHT, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS,
-                              KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-          }
-          break;
-
-        case 1:
-          if (record->event.pressed) {
-            sunds_timer = timer_read();
-            register_code (KC_LGUI);
-          } else {
-            if (timer_elapsed (sunds_timer) < TAPPING_TERM) {
-              unregister_code (KC_LGUI);
-              register_code (KC_LSFT);
-              register_code (KC_QUOT);
-              unregister_code (KC_QUOT);
-              unregister_code (KC_LSFT);
-              register_code (KC_LGUI);
-            }
-            unregister_code (KC_LGUI);
-          }
-          break;
-
-      }
-    return MACRO_NONE;
-};
-
-// 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_3_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-    if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-        ergodox_right_led_1_on ();
-    }
-};
diff --git a/layouts/community/ergodox/common_nighthawk/rules.mk b/layouts/community/ergodox/common_nighthawk/rules.mk
deleted file mode 100644
index 180880c165..0000000000
--- a/layouts/community/ergodox/common_nighthawk/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBPROJECT_DEFAULT = ez
-TAP_DANCE_ENABLE = yes
-
-
diff --git a/layouts/community/ergodox/csharp_dev/keymap.c b/layouts/community/ergodox/csharp_dev/keymap.c
deleted file mode 100644
index 852bef5a7d..0000000000
--- a/layouts/community/ergodox/csharp_dev/keymap.c
+++ /dev/null
@@ -1,235 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define BASE 0 // default layer
-#define FKEYS 1 // F keys + macros
-
-#define MACRO_PUBLIC 10
-#define MACRO_PRIVATE 11
-
-#define MACRO_STATIC 12
-#define MACRO_CONST 13
-
-#define MACRO_VOID 14
-#define MACRO_VAR 15
-#define MACRO_STRING 16
-
-#define MACRO_INT 17
-#define MACRO_FLOAT 18
-#define MACRO_BOOL 19
-
-#define MACRO_RETURN 20
-#define MACRO_NULL 21
-#define MACRO_BREAK 22
-
-#define MACRO_TODO 23
-#define MACRO_NEW 24
-#define MACRO_PARENTHESE 25
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   (    |   1  |   2  |   3  |   4  |   5  |  "   |           | Save |   6  |   7  |   8  |   9  |   0  |   [    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   )    |   Q  |   W  |   E  |   R  |   T  |Bkspa |           | Del  |   Y  |   U  |   I  |   O  |   P  |   ]    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   {    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   _  |   Redo |
- * |--------+------+------+------+------+------|   /  |           |  ;   |------+------+------+------+------+--------|
- * |   }    |Z~Alt |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   '  |   !  |   ?  |   Undo |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Tab~CL|  <   |  >   |   |  |  &   |                                       |   =  |   +  |   -  |   *  |  L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |. ~L1 | ,    |       |Home  |End~L1|
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      | Copy |       | UP   |      |      |
- *                                 | Enter| Space|------|       |------| Space|Enter |
- *                                 | ~WIN | ~LSFT| Past |       | DOWN | ~LSFT| ~WIN |
- *                                 `--------------------'       `--------------------'
- */
-// 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_LPRN,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_QUOTE),
-        KC_RPRN,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_BSPACE,
-        KC_LCBR,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_RCBR,        ALT_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_SLASH,
-        CTL_T(KC_TAB), LSFT(KC_COMMA),LSFT(KC_DOT),KC_PIPE,KC_AMPR,
-                                              LT(1,KC_DOT),  KC_COMM,
-                                                              LCTL(KC_C),
-                                               GUI_T(KC_ENTER),SFT_T(KC_SPACE),LCTL(KC_V),
-        // right hand
-             LCTL(KC_S)  ,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,     KC_LBRC,
-             KC_DELETE,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_RBRC,
-                          KC_H,   KC_J,   KC_K,   KC_L,   KC_UNDS,LCTL(KC_Y),
-             KC_SCOLON,KC_N,   KC_M, KC_QUOTE  ,KC_EXLM , LSFT(KC_SLASH),   LCTL(KC_Z),
-                                  KC_EQUAL,KC_PLUS  ,  KC_MINUS,KC_ASTR  ,     TG(1),
-             KC_HOME,         LT(1,KC_END),
-             KC_UP,
-             KC_DOWN,SFT_T(KC_SPACE), GUI_T(KC_ENTER)
-    ),
-
-/* Keymap 1:  F keys + macros
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  ESC   |  F1  |  F2  |  F3  |  F4  |  F5  |  `   |           | Calc |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  Tab   |Public|Static|string|int   |return|      |           |      |//TODO|      |      |      |      |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |Privat|Const |var   |float |null  |------|           |------|new   |      |      |      |      |        |
- * |--------+------+------+------+------+------|  \   |           |  ~   |------+------+------+------+------+--------|
- * |        |      |      |void  |bool  |break;|      |           |      |();   |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |  WIN | Alt  |      |      |                                       | PgUp | PgDw | Ins  | PtSc |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      | Cut  |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------| Left | Right|
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// FKEYS + MACROS
-[FKEYS] = LAYOUT_ergodox(
-       // left hand
-       KC_ESCAPE,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_GRAVE,
-       KC_TAB,M(MACRO_PUBLIC),M(MACRO_STATIC),  M(MACRO_STRING),M(MACRO_INT),M(MACRO_RETURN),KC_TRNS,
-       KC_TRNS,M(MACRO_PRIVATE),M(MACRO_CONST), M(MACRO_VAR),M(MACRO_FLOAT),M(MACRO_NULL),
-       KC_TRNS,KC_TRNS,KC_TRNS,M(MACRO_VOID),M(MACRO_BOOL),M(MACRO_BREAK),KC_BSLASH,
-       KC_TRNS,KC_LGUI,KC_LALT,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,LCTL(KC_X),
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_CALCULATOR, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, M(MACRO_TODO),   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, KC_F12,
-                M(MACRO_NEW), KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
-       KC_TILD, M(MACRO_PARENTHESE), KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
-                         KC_PGUP,KC_PGDOWN,  KC_INSERT,   KC_PSCREEN,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_LEFT, KC_RIGHT
-),
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-		case MACRO_PUBLIC:
-			if (record->event.pressed) {
-				return MACRO( T(P), T(U), T(B), T(L), T(I), T(C), T(SPACE),END);
-			}
-			break;
-		case MACRO_PRIVATE:
-			if (record->event.pressed) {
-				return MACRO( T(P), T(R), T(I), T(V), T(A), T(T), T(E), T(SPACE),END);
-			}
-			break;
-		case MACRO_STATIC:
-			if (record->event.pressed) {
-				return MACRO( T(S), T(T), T(A), T(T), T(I), T(C), T(SPACE), END);
-			}
-			break;
-		case MACRO_CONST:
-			if (record->event.pressed) {
-				return MACRO( T(C), T(O), T(N), T(S), T(T), T(SPACE), END);
-			}
-			break;
-		case MACRO_VOID:
-			if (record->event.pressed) {
-				return MACRO( T(V), T(O), T(I), T(D), T(SPACE), END);
-			}
-			break;
-		case MACRO_VAR:
-			if (record->event.pressed) {
-				return MACRO( T(V), T(A), T(R), T(SPACE), END);
-			}
-			break;
-		case MACRO_STRING:
-			if (record->event.pressed) {
-				return MACRO( T(S), T(T), T(R), T(I), T(N), T(G), T(SPACE), END);
-			}
-			break;
-		case MACRO_BOOL:
-			if (record->event.pressed) {
-				return MACRO( T(B), T(O), T(O), T(L), T(SPACE), END);
-			}
-			break;
-		case MACRO_INT:
-			if (record->event.pressed) {
-				return MACRO( T(I), T(N), T(T), T(SPACE), END);
-			}
-			break;
-		case MACRO_FLOAT:
-			if (record->event.pressed) {
-				return MACRO( T(F), T(L), T(O), T(A),T(T),T(SPACE), END);
-			}
-			break;
-		case MACRO_RETURN:
-			if (record->event.pressed) {
-				return MACRO( T(R), T(E), T(T), T(U),T(R),T(N), END);
-			}
-			break;
-		case MACRO_NULL:
-			if (record->event.pressed) {
-				return MACRO( T(N), T(U), T(L), T(L), END);
-			}
-		case MACRO_BREAK:
-			if (record->event.pressed) {
-				return MACRO( T(B), T(R), T(E), T(A), T(K), T(SCOLON), END);
-			}
-			break;
-		case MACRO_TODO:
-			if (record->event.pressed) {
-				return MACRO( T(SLASH), T(SLASH), D(LSHIFT) ,T(T), T(O), T(D), T(O),U(LSHIFT), T(SPACE),END);
-			}
-			break;
-		case MACRO_NEW:
-			if (record->event.pressed) {
-				return MACRO( T(N), T(E), T(W), T(SPACE), END);
-			}
-			break;
-		case MACRO_PARENTHESE:
-			if (record->event.pressed) {
-				return MACRO(  D(LSHIFT),T(9), T(0),U(LSHIFT), T(SCOLON), END);
-			}
-			break;
-      }
-    return MACRO_NONE;
-};
-
-// 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/layouts/community/ergodox/csharp_dev/readme.md b/layouts/community/ergodox/csharp_dev/readme.md
deleted file mode 100644
index 980480d626..0000000000
--- a/layouts/community/ergodox/csharp_dev/readme.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# ErgoDox EZ C# Developer configuration
-
-## Changelog
-
-* Feb 12, 2016 (V1): 
-  * First version commit
-* Mar 20, 2016 (V2):
-  * Removed "Classic QWERTY" layer, inverted GUI and SHIFT on Hold for Space and Enter
-
-## About
-This layout was conceived in an attempt to optimise keyboard layout for developers (C# more specifically, but it can work with most of other languages), and limit the keys required to perform the most frequent actions.
-
-I came to the realization that my main tool as a developer, the qwerty keyboard was something that did not evolved at its core in almost 150 years.
-There are a lot of reasons to this, and it would be a massive entreprise to change a standard so strongly anchored, but I wanted to give it a try and see how would look an input device dedicated to developers, more specifically a C# developer in my case.
-The biggest flaw in standard QWERTY keyboards was that I always needed to perform key combination to access commonly used characters or actions. Think about it a minute, how many times a day do you press a modifier key such as Ctrl or Shift, it's insane and could be so easily optimized to require only one key press.
-
-Then I came across the ErgoDox EZ project, that allowed a full customization of its firmware, and a unique 2 parts design.
-
-![CSharpDev](https://i.imgur.com/PkNqi7V.png)
-![CSharpDev](https://i.imgur.com/0IcMgMf.png)
-
-## Layout design principles
-* No key combination required for the most common input characters ( (),[],{},<> ... )
-* No key combination required for the most common actions (copy/paste/undo/save)
-* Regroup characters by usage ( + - * =  ...)
-* Easy access to the most commonly used characters: ; / " . ,
-* Preregistered macro for the most common C# langage instructions: public / private / string / int / float ...
-
-## Why is it specific to C Sharp
-I defined the characters priority based on their usage in C# language, most of this characters are also used in other coding languages but it may require some tweaking. 
-For example there is no direct access to ~ or $ keys which can be very common in some languages.
-Note it is also specific to Windows environement as the shortcut used in action keys would not work on Mac Os
-
-## In usage
-It was relatively easy to get used to the layout, but it's hard for me to define how easy it was as I was getting used to a blank Ergodox keyboard at the same time.
-Still it's extremely satisfying to Save your file with just one easily accessible key or to have one big key to end your code line ( ; )
-
-## Improvements
-This layout was shared after a bunch of iterations and only once I was happy with it.
-Still there are many way to improve or iterate on this:
-* Make it language agnostic
-* Check and compile language's keyboard's heatmaps to statistically define keys priority (e.g.  https://dzone.com/articles/most-pressed-keys-various )
-* QWERTY is still not the most efficient typing layout, I would like to create a Dvorak based similar layout in a near futur
-
-## Issues 
-One of the issues encountered while creating this layout was that I did not find a way to have a key to send a modifier on hold, and a key combination while pressed (e.g. I can't set a Key to do Save (Ctrl + S) when pressed and Shift modifier when hold )
-
-
diff --git a/layouts/community/ergodox/dvorak_programmer/README.md b/layouts/community/ergodox/dvorak_programmer/README.md
deleted file mode 100644
index 36722469fe..0000000000
--- a/layouts/community/ergodox/dvorak_programmer/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Dvorak Programmer Layout
-========================
-
-This is a dvorak-only layout. The overall philosophy is that the left hand contains a number of layer-switching shortcuts, and the right hand key codes vary based on the layer selected.
-
-Layers
-------
-
-* BASE: this is where you type.
-* SHELL_NAV: hold down the Tab key to access shell/terminal navigation shorcuts such as forward/backward word, history, Ctrl+C, screen tab movement.
-* KEY_NAV: arrow key movement with backward/forward word support, and copy/paste.
-* KEY_SEL: same as above, but every movement shift-selects.
-* NUMBER: keypad layer.
-* SYMBOL: all the symbols.
-* BRACKET: special brackets-only layer for programming. Activated by pressing left capslock (OSL)
-* SHORTCUTS: sends Hyper keys for Autohotkey to interpret. I use this to switch between specific apps.
-* MOUSE: use mouse keys
-
-Updates
--------
-
-2017/02/10:
-* Made left shift an MO for SHELL_NAV, and symbol+right shift CAPSLOCK. Made all modifiers OSM.
-
-2017/01/28:
-* Made the capslock key a dual momentary layer activation for BRACKETS and SHELL_NAV. One keypress held down for BRACKETS, one keypress, released and then held down for SHELL_NAV
-
-2017/01/22:
-* Made brackets toggle an OSL on the left capslock
-* Added SHELL_LAYER
-
-2016/12/10:
-* toggle for brackets layer is now on left thumb cluster.
-
-2016/11/05:
-* removed brackets anywhere but in brackets layer
-* added mouse layer back in
-* put semicolon-newline and end-newline on symbol layer
-* replaced all HYPR with MEH, added more shortcut keys
\ No newline at end of file
diff --git a/layouts/community/ergodox/dvorak_programmer/keymap.c b/layouts/community/ergodox/dvorak_programmer/keymap.c
deleted file mode 100644
index 43a6d8e89e..0000000000
--- a/layouts/community/ergodox/dvorak_programmer/keymap.c
+++ /dev/null
@@ -1,406 +0,0 @@
-
-#include QMK_KEYBOARD_H
-#include "led.h"
-#include "debug.h"
-#include "action_layer.h"
-#include "action_code.h"
-
-#define BASE    0 // default layer
-#define SHELL_NAV 2
-#define KEY_NAV 3 // key navigation layer
-#define KEY_SEL 4 // key selection layer
-#define NUMBER  5  // number layer
-#define SYMBOL  6
-#define BRACKETS  7
-#define SHORTCUTS 8
-#define MOUSE 9
-
-// macros
-#define MC_COPY_LINE  0
-#define MC_CUT_LINE   1
-#define MC_PASTE_LINE 2
-#define MC_NEW_SEARCH_TAB 3
-#define SCREEN_TAB_LEFT 4
-#define SCREEN_TAB_RIGHT 5
-#define SCREEN_NEW_TAB 6
-#define SWITCH_NDS 7
-#define SCREEN_COPY_MODE 8
-#define SCREEN_PASTE 9
-#define OPEN_CLOSE_PAREN 10
-#define OPEN_CLOSE_BRACKET 11
-#define OPEN_CLOSE_CURLY 12
-#define OPEN_CLOSE_SINGLE_QUOTE 13
-#define OPEN_CLOSE_DOUBLE_QUOTE 14
-#define SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND 15
-#define SEMICOLON_NEWLINE 16
-#define END_NEWLINE 17
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// base layer
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,                    KC_F1,          KC_F2,       KC_F3,        KC_F4,       KC_F5,       KC_F6,
-        KC_TAB,                    KC_QUOT,        KC_COMM,     KC_DOT,       KC_P,        KC_Y,        MO(KEY_SEL),
-        MO(BRACKETS),              KC_A,           KC_O,        KC_E,         KC_U,        KC_I,
-        MO(SHELL_NAV),             KC_SCLN,        KC_Q,        KC_J,         KC_K,        KC_X,        MO(KEY_NAV),
-                   OSL(SHORTCUTS),OSM(MOD_LCTL), OSM(MOD_LALT),OSL(SYMBOL),MO(NUMBER),
-                                              // thumb cluster
-                                               OSM(MOD_LSFT), RCTL(KC_S),
-                                                          RCTL(KC_DEL),
-                                               KC_BSPC,RCTL(KC_BSPC),KC_DEL,
-        // right hand
-             KC_F7,       KC_F8,       KC_F9,       KC_F10,        KC_F11,       KC_F12,       KC_BSLS,
-             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,         OSM(MOD_LSFT),
-                                  // lower keys - browser tab control
-                                  RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), LALT(KC_LEFT), RCTL(KC_W),
-             // thumb cluster
-             KC_HOME,KC_END,
-             KC_UP,
-             KC_DOWN,KC_ENT, KC_SPC
-    ),
-
-
-
-
-// shell navigation layer
-[SHELL_NAV] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-               // bottom row
-               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       // thumb cluster
-                                       KC_TRNS,KC_TRNS,
-                                               LALT(KC_D),
-                               KC_TRNS,RCTL(KC_W),KC_TRNS,
-       // right hand
-       KC_TRNS,    KC_TRNS,        KC_TRNS,             KC_TRNS,         KC_TRNS,         KC_TRNS,        KC_TRNS,
-       RCTL(KC_L), RCTL(KC_W),     KC_HOME,             KC_UP,           KC_END,          LALT(KC_D),     RCTL(KC_R),
-                   LALT(KC_B),     KC_LEFT,             KC_DOWN,         KC_RIGHT,        LALT(KC_F),     LALT(KC_DOT),
-       RCTL(KC_C), RCTL(KC_U),     M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V),      RCTL(KC_K),     M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
-                // bottom row
-                 M(SCREEN_TAB_LEFT), M(SCREEN_TAB_RIGHT), M(SCREEN_NEW_TAB),  KC_TRNS,    KC_TRNS,
-       // thumb cluster
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-
-// key navigation layer
-[KEY_NAV] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-               // bottom row
-               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       // thumb cluster
-                                       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_PGDN,        KC_HOME,    KC_UP,      KC_END,     KC_PGUP,        M(MC_COPY_LINE),
-                RCTL(KC_LEFT),  KC_LEFT,    KC_DOWN,    KC_RIGHT,   RCTL(KC_RIGHT), M(MC_CUT_LINE),
-       KC_TRNS, KC_TRNS,        RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_TRNS,        M(MC_PASTE_LINE),
-                // bottom row
-                KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,
-       // thumb cluster
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-// key selection layer
-[KEY_SEL] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-               // bottom row
-               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       // thumb cluster
-                                       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,
-       RSFT(KC_PGUP), RSFT(KC_PGDN),       RSFT(KC_HOME), RSFT(KC_UP),   RSFT(KC_END),   RSFT(KC_PGUP),        M(MC_COPY_LINE),
-                      RSFT(RCTL(KC_LEFT)), RSFT(KC_LEFT), RSFT(KC_DOWN), RSFT(KC_RIGHT), RSFT(RCTL(KC_RIGHT)), M(MC_CUT_LINE),
-       RSFT(KC_PGDN), KC_TRNS,             RCTL(KC_C),    RCTL(KC_X),    RCTL(KC_V),     KC_TRNS,              M(MC_PASTE_LINE),
-                // bottom row
-                KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,
-       // thumb cluster
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-// number layer
-[NUMBER] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-               // bottom row
-               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       // thumb cluster
-                                       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_PLUS,  KC_7,    KC_8,    KC_9,     KC_ASTR, KC_TRNS,
-                KC_MINS,  KC_4,    KC_5,    KC_6,     KC_SLSH, KC_TRNS,
-       KC_TRNS, KC_EQUAL, KC_1,    KC_2,    KC_3,     KC_COLN, KC_TRNS,
-                               // bottom row
-                                KC_0, KC_DOT, KC_COMMA, KC_TRNS,  KC_TRNS,
-       // thumb cluster
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-
-[SYMBOL] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_PLUS, KC_AMPR, KC_ASTR, KC_GRAVE,KC_TILD, KC_TRNS,
-                KC_MINS, KC_DLR,  KC_PERC, KC_CIRC, KC_PIPE, KC_TRNS,
-       KC_TRNS, KC_EQUAL,KC_EXLM, KC_AT,   KC_HASH, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       M(SEMICOLON_NEWLINE), M(END_NEWLINE),
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-[BRACKETS] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_TRNS,KC_TRNS,             KC_TRNS,            KC_TRNS,               KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,M(OPEN_CLOSE_CURLY), M(OPEN_CLOSE_PAREN),M(OPEN_CLOSE_BRACKET), KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_LPRN, KC_RPRN,            KC_LBRC,            KC_RBRC,               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,
-       // right hand
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS, KC_TRNS, M(OPEN_CLOSE_BRACKET),M(OPEN_CLOSE_PAREN),M(OPEN_CLOSE_CURLY),KC_TRNS,KC_TRNS,
-                KC_TRNS, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, 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
-),
-
-[SHORTCUTS] = LAYOUT_ergodox(
-       // left hand
-       KC_NO,  MEH(KC_F1), MEH(KC_F2), MEH(KC_F3),  MEH(KC_F4), MEH(KC_F5), MEH(KC_F6),
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                         MEH(KC_0),MEH(KC_1),
-                                                   MEH(KC_2),
-                               MEH(KC_3),MEH(KC_4),MEH(KC_5),
-       // right hand
-       MEH(KC_F7), MEH(KC_F8), MEH(KC_F9), MEH(KC_F10),  MEH(KC_F11), MEH(KC_F12),  M(SWITCH_NDS),
-       KC_TRNS, MEH(KC_A), MEH(KC_B),    MEH(KC_C),    MEH(KC_D),    MEH(KC_E), MEH(KC_F),
-                MEH(KC_G), MEH(KC_H),    MEH(KC_I),    MEH(KC_J),    MEH(KC_K), MEH(KC_L),
-       KC_TRNS, MEH(KC_M), MEH(KC_N),    MEH(KC_O),    MEH(KC_P),    MEH(KC_Q), KC_CAPS,
-                           MEH(KC_S),    MEH(KC_T),    MEH(KC_U),    MEH(KC_V), MEH(KC_X),
-       MEH(KC_6), MEH(KC_7),
-       MEH(KC_8),
-       MEH(KC_9), MEH(KC_Y), MEH(KC_Z)
-),
-
-
-[MOUSE] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-	   KC_TRNS, KC_BTN1, KC_BTN2
-),
-
-};
-
-
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case MC_COPY_LINE:
-            if (record->event.pressed) {
-                return MACRO( T(HOME), D(LSFT), T(END), U(LSFT), D(LCTL), T(C), U(LCTL), END);
-            }
-            break;
-        case MC_CUT_LINE:
-            if (record->event.pressed) {
-                return MACRO( T(HOME), D(LSFT), T(END), U(LSFT), D(LCTL), T(X), U(LCTL), END);
-            }
-            break;
-        case MC_PASTE_LINE:
-            if (record->event.pressed) {
-                return MACRO( T(END), T(ENTER), D(LCTL), T(V), U(LCTL), END);
-            }
-            break;
-        case MC_NEW_SEARCH_TAB:
-             if (record->event.pressed) {
-                return MACRO( D(LCTL), T(T), T(K), U(LCTL), END);
-            }
-            break;
-        case SCREEN_TAB_LEFT:
-             if (record->event.pressed) {
-                return MACRO( D(LCTL), T(A), U(LCTL), T(P), END);
-            }
-            break;
-        case SCREEN_TAB_RIGHT:
-             if (record->event.pressed) {
-                return MACRO( D(LCTL), T(A), U(LCTL), T(N), END);
-            }
-            break;
-        case SCREEN_NEW_TAB:
-             if (record->event.pressed) {
-                return MACRO( D(LCTL), T(A), U(LCTL), T(C), END);
-            }
-        break;
-        case SCREEN_COPY_MODE:
-            if (record->event.pressed) {
-                return MACRO( D(LCTL), T(A), U(LCTL), T(ESC), END);
-            }
-        break;
-        case SCREEN_PASTE:
-            if (record->event.pressed) {
-                return MACRO( D(LCTL), T(A), U(LCTL), T(RBRC), END);
-            }
-        break;
-        case SWITCH_NDS:
-             if (record->event.pressed) {
-                return MACRO( D(LSFT), T(F11), U(LSFT), W(255), D(LALT), T(TAB), U(LALT), END);
-            }
-        break;
-        case OPEN_CLOSE_PAREN:
-            if (record->event.pressed) {
-                return MACRO( D(LSFT), T(9), T(0), U(LSFT), T(LEFT), END);
-            }
-        break;
-        case OPEN_CLOSE_BRACKET:
-            if (record->event.pressed) {
-                return MACRO( T(LBRC), T(RBRC), T(LEFT), END);
-            }
-        break;
-        case OPEN_CLOSE_CURLY:
-            if (record->event.pressed) {
-                return MACRO( D(LSFT), T(LBRC), T(RBRC), U(LSFT), T(LEFT), END);
-            }
-        break;
-        case OPEN_CLOSE_SINGLE_QUOTE:
-            if (record->event.pressed) {
-                return MACRO( T(QUOT), T(QUOT), T(LEFT), END);
-            }
-        break;
-        case OPEN_CLOSE_DOUBLE_QUOTE:
-            if (record->event.pressed) {
-                return MACRO( D(LSFT), T(QUOT), T(QUOT), U(LSFT), T(LEFT), END);
-            }
-        break;
-        case SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND:
-            if (record->event.pressed) {
-                return MACRO( T(UP), T(HOME), D(LALT), T(D), U(LALT), END);
-            }
-        break;
-		case SEMICOLON_NEWLINE:
-            if (record->event.pressed) {
-                return MACRO( T(END), T(SCLN), T(ENTER), END);
-            }
-		break;
-		case END_NEWLINE:
-            if (record->event.pressed) {
-                return MACRO( T(END), T(ENTER), END);
-            }
-		break;
-
-
-      }
-    return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-    return;
-};
-
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        ergodox_right_led_1_on();
-    } else {
-        ergodox_right_led_1_off();
-    }
-}
-
-
-// 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_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case NUMBER:
-        case SYMBOL:
-		case BRACKETS:
-		//case SHELL_LAYER:
-            ergodox_right_led_2_on();
-            break;
-        case KEY_NAV:
-        case KEY_SEL:
-            ergodox_right_led_3_on();
-            break;
-        case SHORTCUTS:
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            // none
-            break;
-    }
-    return;
-};
diff --git a/layouts/community/ergodox/dvorak_programmer/rules.mk b/layouts/community/ergodox/dvorak_programmer/rules.mk
deleted file mode 100644
index a3ac8ed6ff..0000000000
--- a/layouts/community/ergodox/dvorak_programmer/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE=no
-SLEEP_LED_ENABLE=no
-FORCE_NKRO = yes
-DEBUG_ENABLE = no
-CONSOLE_ENABLE = no
-TAP_DANCE_ENABLE = no
-MOUSEKEY_ENABLE = yes
diff --git a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
deleted file mode 100644
index 2578547f17..0000000000
--- a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
+++ /dev/null
@@ -1,328 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_swedish.h"
-//#include "keymap_nordic.h"
-//#include "keymap_norwegian.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // mouse keys
-#define DEVL 3 // dev keys
-
-#define MACRO_PUBLIC 10
-#define MACRO_PRIVATE 11
-#define MACRO_PROT 12
-
-#define MACRO_SHARED 13
-#define MACRO_CONST 14
-#define MACRO_DIM 15
-#define MACRO_STRING 16
-#define MACRO_INT 17
-#define MACRO_DEC 18
-#define MACRO_BOOL 19
-
-#define MACRO_RETURN 20
-#define MACRO_NOTHING 21
-#define MACRO_TODO 22
-
-#define MACRO_SAVE 24
-#define MACRO_BUILD 25
-#define MACRO_DEBUG 26
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   L3   |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   \    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   -  |   ,  |   .  |   P  |   Y  |  LT1 |           |  LT1 |   F  |   G  |   C  |   R  |   L  |   Å    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | WIN    |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |   S  |   Ä    |
- * |--------+------+------+------+------+------|  LT2 |           |  LT2 |------+------+------+------+------+--------|
- * | LShift |   Ö  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |Z/Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | CTRL |  L1  |Alt   | Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | AltShf|Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        MO(DEVL),       KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   KC_LEFT,
-        KC_DEL,         SE_MINS,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(SYMB),
-        KC_LGUI,        KC_A,           KC_O,    KC_E,   KC_U,   KC_I,
-        KC_LSFT,        CTL_T(KC_SCLN), KC_Q,    KC_J,   KC_K,   KC_X,   TG(MDIA),
-        CTL_T(KC_NO),   MO(SYMB),       KC_LALT,  KC_LEFT,KC_RGHT,
-                                              ALT_T(KC_APP),  KC_LGUI,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSLASH,
-             TG(1),       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,             SE_ARNG,
-                          KC_D,   KC_H,   KC_T,   KC_N,   KC_S,             SE_ADIA,
-             TG(MDIA),KC_B,   KC_M,   KC_W,   KC_V,   CTL_T(KC_Z),      KC_RSFT,
-                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
-             LALT(KC_LSFT),        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   @  |   {  |   }  |   [  |   ]  |      |           |      |   <  |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   (  |   )  |   \  |   /  |------|           |------|   >  |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   ~  | UND  | CUT  | COP  | PAS  |      |           |      |   ?  |   1  |   2  |   3  |   %  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |   .  |   0  |   =  |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),      KC_F1,   KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_TRNS,
-       KC_TRNS,   SE_AT,   ALGR(KC_7),  ALGR(KC_0),  SE_LBRC,   SE_RBRC,  KC_TRNS,
-       KC_TRNS,   KC_HASH, SE_LPRN,  SE_RPRN,  ALGR(KC_MINS), SE_SLSH,
-       KC_TRNS,   SE_TILD, LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C),    LCTL(KC_V),  KC_TRNS,
-       KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, SE_LABK,   KC_7,   KC_8,    KC_9,    KC_KP_ASTERISK, KC_F12,
-                SE_RABK, KC_4,   KC_5,    KC_6,    KC_KP_PLUS, KC_TRNS,
-       KC_TRNS, SE_QUES, KC_1,   KC_2,    KC_3,    LSFT(KC_5), KC_TRNS,
-                         KC_DOT,KC_0,  LSFT(KC_0),    KC_TRNS,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// 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_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 3: Developer keys in vb.net
- * shortened in layout beneth, for example int-> integer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | Save |Build |Debug |PrtScr|  $   |      |           |      | bool | int  |string| dec  | Todo |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   ´  |  '   |   |  |      |  £   |------|           |------| priv | publ |shared| prot |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |  £   |      |           |      | const| dim  |return|nothin|      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[DEVL] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, M(MACRO_SAVE), M(MACRO_BUILD), M(MACRO_DEBUG), KC_PSCR, ALGR(KC_4), KC_TRNS,
-       KC_TRNS, SE_ACUT, SE_QUOT, SE_PIPE, KC_TRNS, ALGR(KC_3),
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ALGR(KC_5), KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  M(MACRO_BOOL), M(MACRO_INT), M(MACRO_STRING), M(MACRO_DEC), M(MACRO_TODO), KC_TRNS,
-                 M(MACRO_PRIVATE), M(MACRO_PUBLIC), M(MACRO_SHARED), M(MACRO_PROT), KC_TRNS, KC_TRNS,
-       KC_TRNS,  M(MACRO_CONST), M(MACRO_DIM), M(MACRO_RETURN), M(MACRO_NOTHING), KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-            if (record->event.pressed) {
-                register_code(KC_RSFT);
-            } else {
-                unregister_code(KC_RSFT);
-            }
-            break;
-        case MACRO_PUBLIC:
-			if (record->event.pressed) {
-				return MACRO( T(P), T(U), T(B), T(L), T(I), T(C), T(SPACE),END);
-			}
-			break;
-		case MACRO_PRIVATE:
-			if (record->event.pressed) {
-				return MACRO( T(P), T(R), T(I), T(V), T(A), T(T), T(E), T(SPACE),END);
-			}
-			break;
-        case MACRO_PROT:
-			if (record->event.pressed) {
-				return MACRO( T(P), T(R), T(O), T(T), T(E), T(C), T(T), T(E), T(D), T(SPACE),END);
-			}
-			break;
-		case MACRO_SHARED:
-			if (record->event.pressed) {
-				return MACRO( T(S), T(H), T(A), T(R), T(E), T(D), T(SPACE), END);
-			}
-			break;
-		case MACRO_CONST:
-			if (record->event.pressed) {
-				return MACRO( T(C), T(O), T(N), T(S), T(T), T(SPACE), END);
-			}
-			break;
-		case MACRO_DIM:
-			if (record->event.pressed) {
-				return MACRO( T(D), T(I), T(M), T(SPACE), END);
-			}
-			break;
-		case MACRO_STRING:
-			if (record->event.pressed) {
-				return MACRO( T(S), T(T), T(R), T(I), T(N), T(G), T(SPACE), END);
-			}
-			break;
-		case MACRO_BOOL:
-			if (record->event.pressed) {
-				return MACRO( T(B), T(O), T(O), T(L), T(E), T(A), T(N), T(SPACE), END);
-			}
-			break;
-		case MACRO_INT:
-			if (record->event.pressed) {
-				return MACRO( T(I), T(N), T(T), T(SPACE), END);
-			}
-			break;
-		case MACRO_DEC:
-			if (record->event.pressed) {
-				return MACRO( T(D), T(E), T(C), T(I), T(M), T(A), T(L), T(SPACE), END);
-			}
-			break;
-		case MACRO_RETURN:
-			if (record->event.pressed) {
-				return MACRO( T(R), T(E), T(T), T(U),T(R),T(N), T(SPACE), END);
-			}
-			break;
-		case MACRO_NOTHING:
-			if (record->event.pressed) {
-				return MACRO( T(N), T(O), T(T), T(H), T(I), T(N), T(G), T(SPACE), END);
-			}
-		case MACRO_TODO:
-			if (record->event.pressed) {
-				return MACRO( KC_BSLASH, D(LSHIFT) ,T(T), T(O), T(D), T(O), KC_DOT, U(LSHIFT),  T(SPACE),END);
-			}
-			break;
-        case MACRO_SAVE:
-			if (record->event.pressed) {
-				return MACRO( D(LCTL) ,T(S), U(LCTL),END);
-			}
-			break;
-        case MACRO_BUILD:
-			if (record->event.pressed) {
-				return MACRO(  D(LCTL), D(LSHIFT) ,T(B), U(LSHIFT), U(LCTL),END);
-			}
-			break;
-        case MACRO_DEBUG:
-			if (record->event.pressed) {
-				return MACRO( KC_F5 ,END);
-			}
-			break;
-      }
-    return MACRO_NONE;
-};
-
-// 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/layouts/community/ergodox/dvorak_programmer_swe/readme.md b/layouts/community/ergodox/dvorak_programmer_swe/readme.md
deleted file mode 100644
index 78d872ab5b..0000000000
--- a/layouts/community/ergodox/dvorak_programmer_swe/readme.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# ErgoDox EZ Dvorak Programmer SWEDISH
-
-Dvorak layout adjusted for a suitable programmer layout and swedish special characters added:
-
-* åäö characters added
-* Layout for common vb.net keywords
-* Common Visual Studio commands like Save, Build, Debug
-
-TODO:
-
-* (Layer 4 is qwerty (for easier gaming & less fortunate keyboard users)) Like this idea, will add it later on
-
-Known issues:
-
-* Keymap 2 modifier has not gotten its place yet..
-
-
-## Changelog
-* 2019-03-11
-  * Added currency $, £, € to keymap 3
-  * Added pipe character to keymap 3
-  * Added the acute accent character to keymap 3
-
-* 2019-03-08
-  * Switched position on Alt and Alt-shift
-  * Added tilde character to symbol layer
-  * Added Print Screen to keymap 3
-  * Added ' (NO_QUOT) to keymap 3
-  * Added how to install help in this readme
-
-* 2017-05-16
-  * Initial release
-
-
-# How to install - reminder
-0. Docs:  https://docs.qmk.fm/#/newbs
-1. Download flashing tool - teensy (from ergodox-ez visual designer)
-2. Setup build environment: https://docs.qmk.fm/#/newbs_getting_started
-
-QUICK HOWTO WSL:  (this is not supported anymore it seems, why?)
-The Toolchain setup is done through the Windows Subsystem for Linux, and the process is fully automated. If you want to do everything manually, there are no other instructions than the scripts themselves, but you can always open issues and ask for more information.
-Open "Bash On Ubuntu On Windows" from the start menu.
-Go to the directory where you cloned qmk_firmware. Note that the paths start with /mnt/ in the WSL, so you have to write for example cd /mnt/c/path/to/qmk_firmware.
-Run util/wsl_install.sh and follow the on-screen instructions.
-Close the Bash command window, and re-open it.
-You are ready to compile and flash the firmware!
-
-3. Build the firmware with:  
-Run the following in the root qmk folder:
-make KEYBOARD=ergodox_ez KEYMAP=dvorak_programmer_swe
-
-
-# Author
-Christian Westerlund
-cwesterlund @ github
-
-Thanks to the author of keymap csharp_dev for inspiration!
\ No newline at end of file
diff --git a/layouts/community/ergodox/dvorak_spanish/keymap.c b/layouts/community/ergodox/dvorak_spanish/keymap.c
deleted file mode 100644
index 7bac2dd167..0000000000
--- a/layouts/community/ergodox/dvorak_spanish/keymap.c
+++ /dev/null
@@ -1,279 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-/******************************************************************************************
- * SPANISH DVORAK LAYOUT (see http://djelibeibi.unex.es/dvorak/)
- * Layer 1: auxiliary keys
- * Layer 2: full qwerty layout
- ******************************************************************************************
- * IMPORTANT: Software layout must be set to SPANISH QWERTY to work properly
- *****************************************************************************************/
-
-// LAYERS
-#define BASE    0 // dvorak layout (default)
-#define AUX     1 // auxiliary keys
-#define QWERTY  2 // qwerty layout
-
-// MACROS
-#define OBRACE 0 // key { or shift
-#define CBRACE 1 // key } or shift
-#define OBRACK 2 // key [ or left alt
-#define CBRACK 3 // key ] or left alt
-#define CAPS   4 // caps lock
-
-// LEDS
-#define USB_LED_NUM_LOCK    0
-#define USB_LED_CAPS_LOCK   1
-#define USB_LED_SCROLL_LOCK 2
-#define USB_LED_COMPOSE     3
-#define USB_LED_KANA        4
-
-// TIMERS
-#define KEY_TAP_FAST 85
-#define KEY_TAP_SLOW 95
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base layer
- * Keys with double values (like Esc/Ctrl) correspond to the 'tapped' key and the 'held' key, respectively
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   \    |   1  |   2  |   3  |   4  |   5  |  <>  |           |   ¡  |   6  |   7  |   8  |   9  |   0  |   '    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | F1/~L1 |   .  |   ,  |   Ñ  |   P  |   Y  |MEH_T |           |  L1  |   F  |   G  |   C  |   H  |   L  |ALL_T/+ |
- * |--------+------+------+------+------+------| DEL  |           | ~L1  |------+------+------+------+------+--------|
- * |Esc/Ctrl|   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   R  |   T  |   N  |   S  |'/RCtrl |
- * |--------+------+------+------+------+------| LGUI |           | RALT |------+------+------+------+------+--------|
- * | {/LSft |   -  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |   Z  | }/RSft |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |[/LALT| HOME |PGDOWN| PGUP | END  |                                       | LEFT | DOWN |  UP  |RIGHT |]/LALT|
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |F5/CAG|F6/~L1|       |F7/~L1|F8/CAG|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |F4/CA |       |F11/CA|        |      |
- *                                 | ENTER| TAB  |------|       |------|  BSPC  | SPACE|
- *                                 |      |      |F3/SA |       |F12/SA|        |      |
- *                                 `--------------------'       `----------------------'
- *  CAG = CTRL-ALT-GUI
- *   CA = CTRL-ALT
- *   SA = SHIFT-ALT
- *
- */
-[BASE] = LAYOUT_ergodox(
-        // left hand
-        KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NUBS,
-        LT(AUX, KC_F1), KC_DOT, KC_COMM,KC_SCLN,KC_P,   KC_Y,   MEH_T(KC_DEL),
-        CTL_T(KC_ESC),  KC_A,   KC_O,   KC_E,   KC_U,   KC_I,
-        M(OBRACE),      KC_SLSH,KC_Q,   KC_J,   KC_K,   KC_X,   KC_LGUI,
-        M(OBRACK),      KC_HOME,KC_PGDN,KC_PGUP,KC_END,
-                                                           LCAG_T(KC_F5),  LT(AUX, KC_F6),
-                                                           MT((MOD_LALT | MOD_LCTL), KC_F4),
-                                           KC_ENT,KC_TAB,MT((MOD_LALT | MOD_LSFT), KC_F3),
-        // right hand
-                    KC_EQL,    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINUS,
-                    TT(AUX),   KC_F,   KC_G,   KC_C,   KC_H,   KC_L,   ALL_T(KC_RBRC),
-                               KC_D,   KC_R,   KC_T,   KC_N,   KC_S,   CTL_T(KC_QUOTE),
-                    KC_RALT,   KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,   M(CBRACE),
-                                       KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,M(CBRACK),
-        LT(AUX, KC_F7), LCAG_T(KC_F8),
-        MT((MOD_LALT | MOD_LCTL), KC_F11),
-        MT((MOD_LALT | MOD_LSFT), KC_F12),KC_BSPC, KC_SPC
-    ),
-/* Keymap 1: Aux layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  | SLEEP            | PWR  |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |  <   |  >   | MsUp |      |      |      |           | ~L0  |      |   7  |   8  |   9  |   *  |  `^    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |   4  |   5  |   6  |   +  |   Ç    |
- * |--------+------+------+------+------+------|      |           |PSCR  |------+------+------+------+------+--------|
- * |CAPSLOCK|      |      |      |      |      |      |           |      |      |   1  |   2  |   3  |   /  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |CTRL-S|CTRL-Z|CTRL-X|CTRL-C|CTRL-V|                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      | Play |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       | VolUp|      |      |
- *                                 | Lclk | Rclk |------|       |------| Prev | Next |
- *                                 |      |      |  L2  |       | VolDn|      |      |
- *                                 `--------------------'       `--------------------'
- */
-[AUX] = LAYOUT_ergodox(
-       // left hand
-       KC_NO  , KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_SLEP,
-       KC_TRNS, KC_NUBS, LSFT(KC_NUBS), KC_MS_U, KC_NO, KC_NO, KC_NO,
-       KC_NO  , KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO  ,
-       M(CAPS), KC_NO, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO,
-       LCTL(KC_S), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V),
-                                                            KC_NO  , KC_TRNS,
-                                                                       KC_NO,
-                                                KC_BTN1, KC_BTN2, TG(QWERTY),
-       // right hand
-            KC_PWR,  KC_F6,   KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,
-            KC_TRNS, KC_NO,   KC_7,   KC_8,   KC_9,    KC_PAST, KC_LBRC,
-                     KC_NO,   KC_4,   KC_5,   KC_6,    KC_PPLS, KC_BSLASH,
-            KC_PSCR, KC_NO,   KC_1,   KC_2,   KC_3,    KC_PSLS, KC_NO,
-                              KC_NO  ,KC_DOT, KC_0,    KC_PEQL, KC_NO,
-       KC_TRNS, KC_MPLY,
-       KC_VOLU,
-       KC_VOLD, KC_MPRV, KC_MNXT
-),
-/* Keymap 2: QWERTY layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   \    |   1  |   2  |   3  |   4  |   5  |  <>  |           |   ¡  |   6  |   7  |   8  |   9  |   0  |   '    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  TRANS |   Q  |   W  |   E  |   R  |   T  |MEH_T |           | TRANS|   Y  |   U  |   I  |   O  |   P  |ALL_T/+ |
- * |--------+------+------+------+------+------| DEL  |           |      |------+------+------+------+------+--------|
- * |Esc/Ctrl|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   Ñ  |'/RCtrl |
- * |--------+------+------+------+------+------| LGUI |           | RALT |------+------+------+------+------+--------|
- * | {/LSft |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   -  | }/RSft |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |[/LALT| HOME |PGDOWN| PGUP | END  |                                       | LEFT | DOWN |  UP  |RIGHT |]/LALT|
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |F5/CAG| TRANS|       | TRANS|F8/CAG|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |F4/CA |       |F11/CA|        |      |
- *                                 | ENTER| TAB  |------|       |------|  BSPC  | SPACE|
- *                                 |      |      | TRANS|       |F12/SA|        |      |
- *                                 `--------------------'       `----------------------'
- *  CAG = CTRL-ALT-GUI
- *   CA = CTRL-ALT
- *   SA = SHIFT-ALT
- *
- */
-[QWERTY] = LAYOUT_ergodox(
-        // left hand
-        KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NUBS,
-        KC_TRNS,        KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   MEH_T(KC_DEL),
-        CTL_T(KC_ESC),  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,
-        M(OBRACE),      KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LGUI,
-        M(OBRACK),      KC_HOME,KC_PGDN,KC_PGUP,KC_END,
-                                                                  LCAG_T(KC_F5),  KC_TRNS,
-                                                           MT((MOD_LALT | MOD_LCTL), KC_F4),
-                                                                    KC_ENT,KC_TAB,KC_TRNS,
-        // right hand
-                    KC_EQL,    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINUS,
-                    KC_TRNS,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   ALL_T(KC_RBRC),
-                               KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,CTL_T(KC_QUOTE),
-                    KC_RALT,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,M(CBRACE),
-                                       KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,M(CBRACK),
-        KC_TRNS, LCAG_T(KC_F8),
-        MT((MOD_LALT | MOD_LCTL), KC_F11),
-        MT((MOD_LALT | MOD_LSFT), KC_F12),KC_BSPC, KC_SPC
-),
-};
-
-static uint16_t key_timer;
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case OBRACE: {
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                register_code(KC_RSFT);
-            } else {
-                unregister_code(KC_RSFT);
-                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
-                    register_code(KC_RALT);
-                    register_code(KC_QUOTE);
-                    unregister_code(KC_QUOTE);
-                    unregister_code(KC_RALT);
-                }
-            }
-            break;
-        }
-        case CBRACE: {
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                register_code(KC_RSFT);
-            } else {
-                unregister_code(KC_RSFT);
-                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
-                    register_code(KC_RALT);
-                    register_code(KC_BSLS);
-                    unregister_code(KC_BSLS);
-                    unregister_code(KC_RALT);
-                }
-            }
-            break;
-        }
-        case OBRACK: {
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                register_code(KC_LALT);
-            } else {
-                unregister_code(KC_LALT);
-                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
-                    register_code(KC_RALT);
-                    register_code(KC_LEFT_BRACKET);
-                    unregister_code(KC_LEFT_BRACKET);
-                    unregister_code(KC_RALT);
-                }
-            }
-            break;
-        }
-        case CBRACK: {
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                register_code(KC_LALT);
-            } else {
-                unregister_code(KC_LALT);
-                if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
-                    register_code(KC_RALT);
-                    register_code(KC_RIGHT_BRACKET);
-                    unregister_code(KC_RIGHT_BRACKET);
-                    unregister_code(KC_RALT);
-                }
-            }
-            break;
-        }
-        case CAPS: {
-            if (record->event.pressed) {
-                register_code(KC_CAPS_LOCK);
-            } else {
-                unregister_code(KC_CAPS_LOCK);
-            }
-            break;
-        }
-      }
-    return MACRO_NONE;
-};
-
-// 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_3_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-    // Turn the caps lock led on
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-        ergodox_right_led_1_on();
-    }
-
-}
diff --git a/layouts/community/ergodox/dvorak_spanish/readme.md b/layouts/community/ergodox/dvorak_spanish/readme.md
deleted file mode 100644
index 1256c6887d..0000000000
--- a/layouts/community/ergodox/dvorak_spanish/readme.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Ergodox Spanish Dvorak Layout
- * Software layout must be set to SPANISH QWERTY to work properly
-
-## Keymap Layers
- - L0: spanish dvorak with some customizations (see layout below)
- - L1: auxiliary keys (includes qwerty shortcuts, numpad...)
- - L2: qwerty layout with customizations
-
-
-### Keymap 0: Base layer
-Keys with double values (like Esc/Ctrl) correspond to the 'tapped' key and the 'held' key, respectively
-
-<pre><code>
-
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   \    |   1  |   2  |   3  |   4  |   5  |  <>  |           |   ¡  |   6  |   7  |   8  |   9  |   0  |   '    |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-| F1/~L1 |   .  |   ,  |   Ñ  |   P  |   Y  |MEH_T |           |  L1  |   F  |   G  |   C  |   H  |   L  |ALL_T/+ |
-|--------+------+------+------+------+------| DEL  |           | ~L1  |------+------+------+------+------+--------|
-|Esc/Ctrl|   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   R  |   T  |   N  |   S  |'/RCtrl |
-|--------+------+------+------+------+------| LGUI |           | RALT |------+------+------+------+------+--------|
-| {/LSft |   -  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |   Z  | }/RSft |
-'--------+------+------+------+------+-------------'           '-------------+------+------+------+------+--------'
-  |[/LALT| HOME |PGDOWN| PGUP | END  |                                       | LEFT | DOWN |  UP  |RIGHT |]/LALT|
-  '----------------------------------'                                       '----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |F5/CAG|F6/~L1|       |F7/~L1|F8/CAG|
-                                ,------|------|------|       |------+--------+------.
-                                |      |      |F4/CA |       |F11/CA|        |      |
-                                | ENTER| TAB  |------|       |------|  BSPC  | SPACE|
-                                |      |      |F3/SA |       |F12/SA|        |      |
-                                '--------------------'       '----------------------'
- CAG = CTRL-ALT-GUI
-  CA = CTRL-ALT
-  SA = SHIFT-ALT
-
-</pre></code>
-
-### Keymap 1: Aux layer
-
-<pre><code>
-
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |  F1  |  F2  |  F3  |  F4  |  F5  | SLEEP|           | PWR  |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        |  <   |  >   | MsUp |      |      |      |           | ~L0  |      |   7  |   8  |   9  |   *  |  '^    |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |   4  |   5  |   6  |   +  |   Ç    |
-|--------+------+------+------+------+------|      |           |PSCR  |------+------+------+------+------+--------|
-|CAPSLOCK|      |      |      |      |      |      |           |      |      |   1  |   2  |   3  |   /  |        |
-'--------+------+------+------+------+-------------'           '-------------+------+------+------+------+--------'
-  |CTRL-S|CTRL-Z|CTRL-X|CTRL-C|CTRL-V|                                       |      |    . |   0  |   =  |      |
-  '----------------------------------'                                       '----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      | Play |
-                                ,------|------|------|       |------+------+------.
-                                |      |      |      |       | VolUp|      |      |
-                                | Lclk | Rclk |------|       |------| Prev | Next |
-                                |      |      |  L2  |       | VolDn|      |      |
-                                '--------------------'       '--------------------'
-
-</pre></code>
-
-### Keymap 2: QWERTY layer
-
-<pre><code>
-
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   \    |   1  |   2  |   3  |   4  |   5  |  <>  |           |   ¡  |   6  |   7  |   8  |   9  |   0  |   '    |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|  TRANS |   Q  |   W  |   E  |   R  |   T  |MEH_T |           | TRANS|   Y  |   U  |   I  |   O  |   P  |ALL_T/+ |
-|--------+------+------+------+------+------| DEL  |           |      |------+------+------+------+------+--------|
-|Esc/Ctrl|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   Ñ  |'/RCtrl |
-|--------+------+------+------+------+------| LGUI |           | RALT |------+------+------+------+------+--------|
-| {/LSft |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   -  | }/RSft |
-'--------+------+------+------+------+-------------'           '-------------+------+------+------+------+--------'
-  |[/LALT| HOME |PGDOWN| PGUP | END  |                                       | LEFT | DOWN |  UP  |RIGHT |]/LALT|
-  '----------------------------------'                                       '----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |F5/CAG| TRANS|       | TRANS|F8/CAG|
-                                ,------|------|------|       |------+--------+------.
-                                |      |      |F4/CA |       |F11/CA|        |      |
-                                | ENTER| TAB  |------|       |------|  BSPC  | SPACE|
-                                |      |      | TRANS|       |F12/SA|        |      |
-                                '--------------------'       '----------------------'
- CAG = CTRL-ALT-GUI
-  CA = CTRL-ALT
-  SA = SHIFT-ALT
-
-</pre></code>
-
-
-## Generation of .hex file
-> [Download scripts from here](https://github.com/johgh/keyboard/tree/master/ergodox)
-
-> Execute install.sh and generate.sh scripts.
-
-> Flash with `teensy_loader` binary (should be installed from previous step)
diff --git a/layouts/community/ergodox/french_hacker/keymap.c b/layouts/community/ergodox/french_hacker/keymap.c
deleted file mode 100644
index 73e3076475..0000000000
--- a/layouts/community/ergodox/french_hacker/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_french.h"
-
-#define BASE 0 // default Colemak Mod-DH layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base Colemak Mod-DH layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    | & _1 | é _2 | " _3 | ' _4 | ( _5 |      |           |      | - _6 | è _7 | _ _8 | ç _9 | à _0 |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   Q  |   W  |   F  |   P  |   B  | TO(0)|           |TO(2) |   J  |   L  |   U  |   Y  |   ;  | Ins    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Tab    |   A  |   R  |   S  |   T  |   G  |------|           |------|   M  |   N  |   E  |   I  |   O  | Bcksp  |
- * |--------+------+------+------+------+------| TO(1)|           | MEH  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   D  |   V  |      |           |      |   K  |   H  |   ,  |   .  |   :  | Rshift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |  ù   |      | Left | Right| MO(2)|                                       | MO(2)| Down |  Up  | PgDn | PgUp  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      | Ralt |       | Ralt |      |
- *                                ,-------|------|------|       |------+------+------.
- *                                |       |      | Home |       | End  |      |       |
- *                                | Space | Ctrl |------|       |------| Ctrl | Enter |
- *                                |       |      | LAlt |       | LAlt |      |       |
- *                                `---------------------'       `---------------------'
- */
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,         KC_2,       KC_3,        KC_4,    KC_5,   KC_NO,
-        KC_NO,          FR_Q,         FR_W,       KC_F,        KC_P,    KC_B,   TO(BASE),
-        KC_TAB,         FR_A,         KC_R,       KC_S,        KC_T,    KC_G,
-        KC_LSFT,        FR_Z,         KC_X,       KC_C,        KC_D,    KC_V,   TO(SYMB),
-        FR_UGRV,        KC_NO,        KC_LEFT,    KC_RIGHT,    MO(SYMB),
-                                               KC_NO,             KC_RALT,
-                                                                  KC_HOME,
-                                               KC_SPC,KC_LCTRL,   KC_LALT,
-        // right hand
-        KC_NO,        KC_6,    KC_7,       KC_8,             KC_9,      KC_0,             KC_NO,
-        TO(MDIA),     KC_J,    KC_L,       KC_U,             KC_Y,      FR_SCLN,          KC_INS,
-                      FR_M,    KC_N,       KC_E,             KC_I,      KC_O,             KC_BSPC,
-        OSM(MOD_MEH), KC_K,    KC_H,       FR_COMM,          FR_DOT,    FR_COLN,          KC_RSFT,
-                               MO(SYMB),   KC_DOWN, KC_UP,   KC_PGDN,   KC_PGUP,
-
-        KC_RALT,        KC_NO,
-        KC_END,
-        KC_LALT,KC_RCTL, KC_ENT
-                  ),
-
-
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   §  |   <  |   {  |   \  |   ~  |      |           |      |   %  |   @  |   }  |  >   |   ¨  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   '  |   =  |   -  |   (  |   +  |------|           |------|   *  |   )  |   _  |  /   |   "  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   `  |   ?  |   #  |   [  |   |  |      |           |      |   &  |   ]  |   $  |   !  |   ^  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |   €  |   £  |   ¤  |  ²   |      |                                       |      |   °  |  µ   |   ß  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),       KC_F1,     KC_F2,      KC_F3,      KC_F4,       KC_F5,      KC_TRNS,
-       KC_TRNS,    FR_SECT,   FR_LABK,    FR_LCBR,    FR_BSLS,     FR_TILD,    KC_TRNS,
-       KC_TRNS,    FR_QUOT,   FR_EQL,     FR_MINS,    FR_LPRN,     FR_PLUS,
-       KC_TRNS,    FR_GRV,    FR_QUES,    FR_HASH,    FR_LBRC,     FR_PIPE,    KC_TRNS,
-          FR_EURO, FR_PND,    FR_CURR,    FR_SUP2,    KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,
-       KC_TRNS,    FR_PERC,    FR_AT,      FR_RCBR,    FR_RABK,    FR_DIAE,    KC_F12,
-                   FR_ASTR,    FR_RPRN,    FR_UNDS,    FR_SLSH,    FR_DQUO,    KC_TRNS,
-       KC_TRNS,    FR_AMPR,    FR_RBRC,    FR_DLR,     FR_EXLM,    FR_CIRC,    KC_TRNS,
-                               KC_TRNS,    FR_DEG,     FR_MICR,    ALGR(KC_S), KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      | Lclk | Rclk |      |      |  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_BTN1, KC_BTN2, 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
-),
-};
-
-// 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 SYMB:
-      ergodox_right_led_1_on();
-      break;
-    case MDIA:
-      ergodox_right_led_2_on();
-      break;
-    default:
-      // none
-      break;
-    }
-
-};
diff --git a/layouts/community/ergodox/french_hacker/readme.md b/layouts/community/ergodox/french_hacker/readme.md
deleted file mode 100644
index 829013597a..0000000000
--- a/layouts/community/ergodox/french_hacker/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# French hacker layout
-
-[Colemak Mod-DH](https://colemakmods.github.io/mod-dh/) layout for
-users keeping an `azerty` layout configuration on their OS.
-
-## Introduction
-
-This keymap is for users keeping their operating systems configured with
-`azerty` - for typing passwords in their native languages, or for their laptop
-keyboard - but who wants a Colemak Mod-DH layout on their mechanical keyboard.
-
-The symbols layers was done after analysing various programming
-languages sources codes and should be close to optimal for typing
-confort, see the link at the end of the README.
-
-The design is done to minimize the usage of the pinky fingers and reduces stress
-on the hands, thus Alt and Ctrl keys are accessible for both hands.
-
-## Flashing the firmware
-
-```
-qmk flash -kb ergodox_ez -km french_hacker
-```
-
-## Design explanations
-
-See my [blog post](http://www.dialectical-computing.de/blog/blog/2017/01/29/a-better-coder-layout-for-the-ergodox-ez-keyboard/).
diff --git a/layouts/community/ergodox/galson/keymap.c b/layouts/community/ergodox/galson/keymap.c
deleted file mode 100644
index 83c6638d57..0000000000
--- a/layouts/community/ergodox/galson/keymap.c
+++ /dev/null
@@ -1,179 +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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   +    |   1  |   2  |   3  |   4  |   5  | rclk |           | lclk |   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   =    |   Q  |   W  |   E  |   R  |cmd/T |shift |           |shift |cmd/Y |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|  (   |           |  )   |------+------+------+------+------+--------|
- * |   "    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|    '   |
- * |--------+------+------+------+------+------| ctrl |           | ctrl |------+------+------+------+------+--------|
- * |   {    |   Z  |   X  |   C  |   V  |   B  |  [   |           |   ]  |   N  |   M  |   ,  |   .  |   /  |    }   |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |  _   |   `  |  $   | Left | Right|                                       |  Up  | Down |   :  |   *  |  !     |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |   <  |  |   |       |   &  |   >   |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |  #   |       |   @  |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   |  %   |       |  ESC |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// 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_PLUS,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_BTN2,
-        KC_EQL,          KC_Q,         KC_W,   KC_E,   KC_R,   GUI_T(KC_T),   KC_LSPO,
-        KC_DQUO,  KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LCBR,  CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   CTL_T(KC_LBRC),
-        KC_UNDS,         KC_GRV,       KC_DLR, KC_LEFT,KC_RGHT,
-                                                               KC_LABK,  KC_PIPE,
-                                                                       KC_HASH,
-                                                       KC_SPC, KC_BSPC,KC_PERC,
-        // right hand
-        KC_BTN1,         KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-        KC_RSPC,  GUI_T(KC_Y),   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
-                         KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN), KC_QUOT,
-        CTL_T(KC_RBRC),  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RCBR,
-                                 KC_UP,  KC_DOWN,KC_COLN,KC_ASTR,          KC_EXLM,
-        KC_AMPR,          KC_RABK,
-        KC_AT,
-        KC_ESC,         KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | 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
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-// 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/layouts/community/ergodox/galson/readme.md b/layouts/community/ergodox/galson/readme.md
deleted file mode 100644
index ebc916725b..0000000000
--- a/layouts/community/ergodox/galson/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Galson keymap
-
-
-Sep 26, 2016.
-
-This is an ergonomic layout for programming for those with typing-related injuries. Key features:
-
-- As many symbol keys as possible are accessible without shifting. These should be accessed by moving the entire hand and pressing with a strong finger.
-- Arrow keys and left and right mouse clicks for mouse-free navigation when combined with head mouse or eyetracker.
-- Modifier keys are dual role and relocated to positions convenient for the index finger.
-- Positions are more convenient when the keyboard is vertically mounted (as it should be!)
\ No newline at end of file
diff --git a/layouts/community/ergodox/galson/rules.mk b/layouts/community/ergodox/galson/rules.mk
deleted file mode 100644
index f008f50793..0000000000
--- a/layouts/community/ergodox/galson/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMMAND_ENABLE   = no  # Commands for debug and configuration
-
diff --git a/layouts/community/ergodox/german-manuneo/compile_keymap.py b/layouts/community/ergodox/german-manuneo/compile_keymap.py
deleted file mode 100644
index ae7ff50397..0000000000
--- a/layouts/community/ergodox/german-manuneo/compile_keymap.py
+++ /dev/null
@@ -1,684 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""Compiler for keymap.c files
-
-This scrip will generate a keymap.c file from a simple
-markdown file with a specific layout.
-
-Usage:
-    python compile_keymap.py INPUT_PATH [OUTPUT_PATH]
-"""
-from __future__ import division
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import os
-import io
-import re
-import sys
-import json
-import unicodedata
-import collections
-import itertools as it
-
-PY2 = sys.version_info.major == 2
-
-if PY2:
-    chr = unichr
-
-KEYBOARD_LAYOUTS = {
-    # These map positions in the parsed layout to
-    # positions in the LAYOUT_ergodox MATRIX
-    'ergodox_ez': [
-        [0, 1, 2, 3, 4, 5, 6],
-        [38, 39, 40, 41, 42, 43, 44],
-        [7, 8, 9, 10, 11, 12, 13],
-        [45, 46, 47, 48, 49, 50, 51],
-        [14, 15, 16, 17, 18, 19],
-        [52, 53, 54, 55, 56, 57],
-        [20, 21, 22, 23, 24, 25, 26],
-        [58, 59, 60, 61, 62, 63, 64],
-        [27, 28, 29, 30, 31],
-        [65, 66, 67, 68, 69],
-        [32, 33],
-        [70, 71],
-        [34],
-        [72],
-        [35, 36, 37],
-        [73, 74, 75],
-    ]
-}
-
-ROW_INDENTS = {'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]}
-
-BLANK_LAYOUTS = [
-    # Compact Layout
-    """
-.------------------------------------.------------------------------------.
-|     |    |    |    |    |    |     |     |    |    |    |    |    |     |
-!-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-|     |    |    |    |    |    |     |     |    |    |    |    |    |     |
-!-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-|     |    |    |    |    |    |-----!-----!    |    |    |    |    |     |
-!-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-|     |    |    |    |    |    |     |     |    |    |    |    |    |     |
-'-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- |    |    |    |    |    |                     !    |    |    |    |    |
- '------------------------'                     '------------------------'
-                        .-----------. .-----------.
-                        |     |     | !     |     |
-                  .-----+-----+-----! !-----+-----+-----.
-                  !     !     |     | !     |     !     !
-                  !     !     !-----! !-----!     !     !
-                  |     |     |     | !     |     |     |
-                  '-----------------' '-----------------'
-""",
-
-    # Wide Layout
-    """
-.---------------------------------------------. .---------------------------------------------.
-|       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
-!-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
-|       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
-!-------+-----+-----+-----x-----x-----!       ! !       !-----x-----x-----+-----+-----+-------!
-|       |     |     |     |     |     |-------! !-------!     |     |     |     |     |       |
-!-------+-----+-----+-----x-----x-----!       ! !       !-----x-----x-----+-----+-----+-------!
-|       |     |     |     |     |     |       | !       |     |     |     |     |     |       |
-'-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
- |      |     |     |     |     |                             !     |     |     |     |      |
- '------------------------------'                             '------------------------------'
-                              .---------------. .---------------.
-                              |       |       | !       |       |
-                      .-------+-------+-------! !-------+-------+-------.
-                      !       !       |       | !       |       !       !
-                      !       !       !-------! !-------!       !       !
-                      |       |       |       | !       |       |       |
-                      '-----------------------' '-----------------------'
-""",
-]
-
-DEFAULT_CONFIG = {
-    "keymaps_includes": ["keymap_common.h",],
-    'filler': "-+.'!:x",
-    'separator': "|",
-    'default_key_prefix': ["KC_"],
-}
-
-SECTIONS = [
-    'layout_config',
-    'layers',
-]
-
-#       Markdown Parsing
-
-ONELINE_COMMENT_RE = re.compile(
-    r"""
-    ^                       # comment must be at the start of the line
-    \s*                     # arbitrary whitespace
-    //                      # start of the comment
-    (.*)                    # the comment
-    $                       # until the end of line
-""", re.MULTILINE | re.VERBOSE
-)
-
-INLINE_COMMENT_RE = re.compile(
-    r"""
-    ([\,\"\[\]\{\}\d])      # anythig that might end a expression
-    \s+                     # comment must be preceded by whitespace
-    //                      # start of the comment
-    \s                      # and succeded by whitespace
-    (?:[^\"\]\}\{\[]*)      # the comment (except things which might be json)
-    $                       # until the end of line
-""", re.MULTILINE | re.VERBOSE
-)
-
-TRAILING_COMMA_RE = re.compile(
-    r"""
-    ,                       # the comma
-    (?:\s*)                 # arbitrary whitespace
-    $                       # only works if the trailing comma is followed by newline
-    (\s*)                   # arbitrary whitespace
-    ([\]\}])                # end of an array or object
-""", re.MULTILINE | re.VERBOSE
-)
-
-
-def loads(raw_data):
-    if isinstance(raw_data, bytes):
-        raw_data = raw_data.decode('utf-8')
-
-    raw_data = ONELINE_COMMENT_RE.sub(r"", raw_data)
-    raw_data = INLINE_COMMENT_RE.sub(r"\1", raw_data)
-    raw_data = TRAILING_COMMA_RE.sub(r"\1\2", raw_data)
-    return json.loads(raw_data)
-
-
-def parse_config(path):
-    def reset_section():
-        section.update({
-            'name': section.get('name', ""),
-            'sub_name': "",
-            'start_line': -1,
-            'end_line': -1,
-            'code_lines': [],
-        })
-
-    def start_section(line_index, line):
-        end_section()
-        if line.startswith("# "):
-            name = line[2:]
-        elif line.startswith("## "):
-            name = line[3:]
-        else:
-            name = ""
-
-        name = name.strip().replace(" ", "_").lower()
-        if name in SECTIONS:
-            section['name'] = name
-        else:
-            section['sub_name'] = name
-        section['start_line'] = line_index
-
-    def end_section():
-        if section['start_line'] >= 0:
-            if section['name'] == 'layout_config':
-                config.update(loads("\n".join(section['code_lines'])))
-            elif section['sub_name'].startswith('layer'):
-                layer_name = section['sub_name']
-                config['layer_lines'][layer_name] = section['code_lines']
-
-        reset_section()
-
-    def amend_section(line_index, line):
-        section['end_line'] = line_index
-        section['code_lines'].append(line)
-
-    config = DEFAULT_CONFIG.copy()
-    config.update({
-        'layer_lines': collections.OrderedDict(),
-        'macro_ids': {'UM'},
-        'unicode_macros': {},
-    })
-
-    section = {}
-    reset_section()
-
-    with io.open(path, encoding="utf-8") as fh:
-        for i, line in enumerate(fh):
-            if line.startswith("#"):
-                start_section(i, line)
-            elif line.startswith("    "):
-                amend_section(i, line[4:])
-            else:
-                # TODO: maybe parse description
-                pass
-
-    end_section()
-    assert 'layout' in config
-    return config
-
-
-#       header file parsing
-
-IF0_RE = re.compile(r"""
-    ^
-    #if 0
-    $.*?
-    #endif
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-COMMENT_RE = re.compile(r"""
-    /\*
-    .*?
-    \*/"
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-
-def read_header_file(path):
-    with io.open(path, encoding="utf-8") as fh:
-        data = fh.read()
-    data, _ = COMMENT_RE.subn("", data)
-    data, _ = IF0_RE.subn("", data)
-    return data
-
-
-def regex_partial(re_str_fmt, flags):
-    def partial(*args, **kwargs):
-        re_str = re_str_fmt.format(*args, **kwargs)
-        return re.compile(re_str, flags)
-
-    return partial
-
-
-KEYDEF_REP = regex_partial(r"""
-    #define
-    \s
-    (
-        (?:{})          # the prefixes
-        (?:\w+)         # the key name
-    )                   # capture group end
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-ENUM_RE = re.compile(r"""
-    (
-        enum
-        \s\w+\s
-        \{
-        .*?             # the enum content
-        \}
-        ;
-    )                   # capture group end
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-ENUM_KEY_REP = regex_partial(r"""
-    (
-        {}              # the prefixes
-        \w+             # the key name
-    )                   # capture group end
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-
-def parse_keydefs(config, data):
-    prefix_options = "|".join(config['key_prefixes'])
-    keydef_re = KEYDEF_REP(prefix_options)
-    enum_key_re = ENUM_KEY_REP(prefix_options)
-    for match in keydef_re.finditer(data):
-        yield match.groups()[0]
-
-    for enum_match in ENUM_RE.finditer(data):
-        enum = enum_match.groups()[0]
-        for key_match in enum_key_re.finditer(enum):
-            yield key_match.groups()[0]
-
-
-def parse_valid_keys(config, out_path):
-    basepath = os.path.abspath(os.path.join(os.path.dirname(out_path)))
-    dirpaths = []
-    subpaths = []
-    while len(subpaths) < 6:
-        path = os.path.join(basepath, *subpaths)
-        dirpaths.append(path)
-        dirpaths.append(os.path.join(path, "tmk_core", "common"))
-        dirpaths.append(os.path.join(path, "quantum"))
-        subpaths.append('..')
-
-    includes = set(config['keymaps_includes'])
-    includes.add("keycode.h")
-
-    valid_keycodes = set()
-    for dirpath, include in it.product(dirpaths, includes):
-        include_path = os.path.join(dirpath, include)
-        if os.path.exists(include_path):
-            header_data = read_header_file(include_path)
-            valid_keycodes.update(parse_keydefs(config, header_data))
-    return valid_keycodes
-
-
-#       Keymap Parsing
-
-
-def iter_raw_codes(layer_lines, filler, separator):
-    filler_re = re.compile("[" + filler + " ]")
-    for line in layer_lines:
-        line, _ = filler_re.subn("", line.strip())
-        if not line:
-            continue
-        codes = line.split(separator)
-        for code in codes[1:-1]:
-            yield code
-
-
-def iter_indexed_codes(raw_codes, key_indexes):
-    key_rows = {}
-    key_indexes_flat = []
-
-    for row_index, key_indexes in enumerate(key_indexes):
-        for key_index in key_indexes:
-            key_rows[key_index] = row_index
-        key_indexes_flat.extend(key_indexes)
-    assert len(raw_codes) == len(key_indexes_flat)
-    for raw_code, key_index in zip(raw_codes, key_indexes_flat):
-        # we keep track of the row mostly for layout purposes
-        yield raw_code, key_index, key_rows[key_index]
-
-
-LAYER_CHANGE_RE = re.compile(r"""
-    (DF|TG|MO)\(\d+\)
-""", re.VERBOSE)
-
-MACRO_RE = re.compile(r"""
-    M\(\w+\)
-""", re.VERBOSE)
-
-UNICODE_RE = re.compile(r"""
-    U[0-9A-F]{4}
-""", re.VERBOSE)
-
-NON_CODE = re.compile(r"""
-    ^[^A-Z0-9_]$
-""", re.VERBOSE)
-
-
-def parse_uni_code(raw_code):
-    macro_id = "UC_" + (unicodedata.name(raw_code).replace(" ", "_").replace("-", "_"))
-    code = "M({})".format(macro_id)
-    uc_hex = "{:04X}".format(ord(raw_code))
-    return code, macro_id, uc_hex
-
-
-def parse_key_code(raw_code, key_prefixes, valid_keycodes):
-    if raw_code in valid_keycodes:
-        return raw_code
-
-    for prefix in key_prefixes:
-        code = prefix + raw_code
-        if code in valid_keycodes:
-            return code
-
-
-def parse_code(raw_code, key_prefixes, valid_keycodes):
-    if not raw_code:
-        return 'KC_TRNS', None, None
-
-    if LAYER_CHANGE_RE.match(raw_code):
-        return raw_code, None, None
-
-    if MACRO_RE.match(raw_code):
-        macro_id = raw_code[2:-1]
-        return raw_code, macro_id, None
-
-    if UNICODE_RE.match(raw_code):
-        hex_code = raw_code[1:]
-        return parse_uni_code(chr(int(hex_code, 16)))
-
-    if NON_CODE.match(raw_code):
-        return parse_uni_code(raw_code)
-
-    code = parse_key_code(raw_code, key_prefixes, valid_keycodes)
-    return code, None, None
-
-
-def parse_keymap(config, key_indexes, layer_lines, valid_keycodes):
-    keymap = {}
-    raw_codes = list(iter_raw_codes(layer_lines, config['filler'], config['separator']))
-    indexed_codes = iter_indexed_codes(raw_codes, key_indexes)
-    key_prefixes = config['key_prefixes']
-    for raw_code, key_index, row_index in indexed_codes:
-        code, macro_id, uc_hex = parse_code(raw_code, key_prefixes, valid_keycodes)
-        # TODO: line numbers for invalid codes
-        err_msg = "Could not parse key '{}' on row {}".format(raw_code, row_index)
-        assert code is not None, err_msg
-        # print(repr(raw_code), repr(code), macro_id, uc_hex)
-        if macro_id:
-            config['macro_ids'].add(macro_id)
-        if uc_hex:
-            config['unicode_macros'][macro_id] = uc_hex
-        keymap[key_index] = (code, row_index)
-    return keymap
-
-
-def parse_keymaps(config, valid_keycodes):
-    keymaps = collections.OrderedDict()
-    key_indexes = config.get('key_indexes', KEYBOARD_LAYOUTS[config['layout']])
-    # TODO: maybe validate key_indexes
-
-    for layer_name, layer_lines, in config['layer_lines'].items():
-        keymaps[layer_name] = parse_keymap(config, key_indexes, layer_lines, valid_keycodes)
-    return keymaps
-
-
-#       keymap.c output
-
-USERCODE = """
-// 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 L1:
-            ergodox_right_led_1_on();
-            break;
-        case L2:
-            ergodox_right_led_2_on();
-            break;
-        case L3:
-            ergodox_right_led_3_on();
-            break;
-        case L4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case L5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        // case L6:
-        //     ergodox_right_led_2_on();
-        //     ergodox_right_led_3_on();
-        //     break;
-        // case L7:
-        //     ergodox_right_led_1_on();
-        //     ergodox_right_led_2_on();
-        //     ergodox_right_led_3_on();
-        //     break;
-        default:
-            ergodox_board_led_off();
-            break;
-    }
-};
-"""
-
-MACROCODE = """
-#define UC_MODE_WIN 0
-#define UC_MODE_LINUX 1
-#define UC_MODE_OSX 2
-
-// TODO: allow default mode to be configured
-static uint16_t unicode_mode = UC_MODE_WIN;
-
-uint16_t hextokeycode(uint8_t hex) {{
-    if (hex == 0x0) {{
-        return KC_P0;
-    }}
-    if (hex < 0xA) {{
-        return KC_P1 + (hex - 0x1);
-    }}
-    return KC_A + (hex - 0xA);
-}}
-
-void unicode_action_function(uint16_t hi, uint16_t lo) {{
-    switch (unicode_mode) {{
-    case UC_MODE_WIN:
-        register_code(KC_LALT);
-
-        register_code(KC_PPLS);
-        unregister_code(KC_PPLS);
-
-        register_code(hextokeycode((hi & 0xF0) >> 4));
-        unregister_code(hextokeycode((hi & 0xF0) >> 4));
-        register_code(hextokeycode((hi & 0x0F)));
-        unregister_code(hextokeycode((hi & 0x0F)));
-        register_code(hextokeycode((lo & 0xF0) >> 4));
-        unregister_code(hextokeycode((lo & 0xF0) >> 4));
-        register_code(hextokeycode((lo & 0x0F)));
-        unregister_code(hextokeycode((lo & 0x0F)));
-
-        unregister_code(KC_LALT);
-        break;
-    case UC_MODE_LINUX:
-        register_code(KC_LCTL);
-        register_code(KC_LSFT);
-
-        register_code(KC_U);
-        unregister_code(KC_U);
-
-        register_code(hextokeycode((hi & 0xF0) >> 4));
-        unregister_code(hextokeycode((hi & 0xF0) >> 4));
-        register_code(hextokeycode((hi & 0x0F)));
-        unregister_code(hextokeycode((hi & 0x0F)));
-        register_code(hextokeycode((lo & 0xF0) >> 4));
-        unregister_code(hextokeycode((lo & 0xF0) >> 4));
-        register_code(hextokeycode((lo & 0x0F)));
-        unregister_code(hextokeycode((lo & 0x0F)));
-
-        unregister_code(KC_LCTL);
-        unregister_code(KC_LSFT);
-        break;
-    case UC_MODE_OSX:
-        break;
-    }}
-}}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {{
-    if (!record->event.pressed) {{
-        return MACRO_NONE;
-    }}
-    // MACRODOWN only works in this function
-    switch(id) {{
-        case UM:
-            unicode_mode = (unicode_mode + 1) % 2;
-            break;
-{macro_cases}
-{unicode_macro_cases}
-        default:
-            break;
-    }}
-    return MACRO_NONE;
-}};
-"""
-
-UNICODE_MACRO_TEMPLATE = """
-case {macro_id}:
-    unicode_action_function(0x{hi:02x}, 0x{lo:02x});
-    break;
-""".strip()
-
-
-def unicode_macro_cases(config):
-    for macro_id, uc_hex in config['unicode_macros'].items():
-        hi = int(uc_hex, 16) >> 8
-        lo = int(uc_hex, 16) & 0xFF
-        yield UNICODE_MACRO_TEMPLATE.format(macro_id=macro_id, hi=hi, lo=lo)
-
-
-def iter_keymap_lines(keymap, row_indents=None):
-    col_widths = {}
-    col = 0
-    # first pass, figure out the column widths
-    prev_row_index = None
-    for code, row_index in keymap.values():
-        if row_index != prev_row_index:
-            col = 0
-            if row_indents:
-                col = row_indents[row_index]
-        col_widths[col] = max(len(code), col_widths.get(col, 0))
-        prev_row_index = row_index
-        col += 1
-
-    # second pass, yield the cell values
-    col = 0
-    prev_row_index = None
-    for key_index in sorted(keymap):
-        code, row_index = keymap[key_index]
-        if row_index != prev_row_index:
-            col = 0
-            yield "\n"
-            if row_indents:
-                for indent_col in range(row_indents[row_index]):
-                    pad = " " * (col_widths[indent_col] - 4)
-                    yield (" /*-*/" + pad)
-                col = row_indents[row_index]
-        else:
-            yield pad
-        yield " {}".format(code)
-        if key_index < len(keymap) - 1:
-            yield ","
-            # This will be yielded on the next iteration when
-            # we know that we're not at the end of a line.
-            pad = " " * (col_widths[col] - len(code))
-        prev_row_index = row_index
-        col += 1
-
-
-def iter_keymap_parts(config, keymaps):
-    # includes
-    for include_path in config['keymaps_includes']:
-        yield '#include "{}"\n'.format(include_path)
-
-    yield "\n"
-
-    # definitions
-    for i, macro_id in enumerate(sorted(config['macro_ids'])):
-        yield "#define {} {}\n".format(macro_id, i)
-
-    yield "\n"
-
-    for i, layer_name in enumerate(config['layer_lines']):
-        yield '#define L{0:<3} {0:<5}  // {1}\n'.format(i, layer_name)
-
-    yield "\n"
-
-    # keymaps
-    yield "const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\n"
-
-    for i, layer_name in enumerate(config['layer_lines']):
-        # comment
-        layer_lines = config['layer_lines'][layer_name]
-        prefixed_lines = " * " + " * ".join(layer_lines)
-        yield "/*\n{} */\n".format(prefixed_lines)
-
-        # keymap codes
-        keymap = keymaps[layer_name]
-        row_indents = ROW_INDENTS.get(config['layout'])
-        keymap_lines = "".join(iter_keymap_lines(keymap, row_indents))
-        yield "[L{0}] = LAYOUT_ergodox({1}\n),\n".format(i, keymap_lines)
-
-    yield "};\n\n"
-
-    # macros
-    yield MACROCODE.format(
-        macro_cases="",
-        unicode_macro_cases="\n".join(unicode_macro_cases(config)),
-    )
-
-    # TODO: dynamically create blinking lights
-    yield USERCODE
-
-
-def main(argv=sys.argv[1:]):
-    if not argv or '-h' in argv or '--help' in argv:
-        print(__doc__)
-        return 0
-
-    in_path = os.path.abspath(argv[0])
-    if not os.path.exists(in_path):
-        print("No such file '{}'".format(in_path))
-        return 1
-
-    if len(argv) > 1:
-        out_path = os.path.abspath(argv[1])
-    else:
-        dirname = os.path.dirname(in_path)
-        out_path = os.path.join(dirname, "keymap.c")
-
-    config = parse_config(in_path)
-    valid_keys = parse_valid_keys(config, out_path)
-    keymaps = parse_keymaps(config, valid_keys)
-
-    with io.open(out_path, mode="w", encoding="utf-8") as fh:
-        for part in iter_keymap_parts(config, keymaps):
-            fh.write(part)
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/layouts/community/ergodox/german-manuneo/keymap.c b/layouts/community/ergodox/german-manuneo/keymap.c
deleted file mode 100644
index b6217800c3..0000000000
--- a/layouts/community/ergodox/german-manuneo/keymap.c
+++ /dev/null
@@ -1,781 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "keymap.h"
-#include "keymap_german.h"
-
-#define UC_ASYMPTOTICALLY_EQUAL_TO 0
-#define UC_DIVISION_SIGN 1
-#define UC_DOWNWARDS_ARROW 2
-#define UC_ELEMENT_OF 3
-#define UC_EMPTY_SET 4
-#define UC_FOR_ALL 5
-#define UC_GREEK_CAPITAL_LETTER_ALPHA 6
-#define UC_GREEK_CAPITAL_LETTER_BETA 7
-#define UC_GREEK_CAPITAL_LETTER_CHI 8
-#define UC_GREEK_CAPITAL_LETTER_DELTA 9
-#define UC_GREEK_CAPITAL_LETTER_EPSILON 10
-#define UC_GREEK_CAPITAL_LETTER_ETA 11
-#define UC_GREEK_CAPITAL_LETTER_GAMMA 12
-#define UC_GREEK_CAPITAL_LETTER_IOTA 13
-#define UC_GREEK_CAPITAL_LETTER_KAPPA 14
-#define UC_GREEK_CAPITAL_LETTER_LAMDA 15
-#define UC_GREEK_CAPITAL_LETTER_MU 16
-#define UC_GREEK_CAPITAL_LETTER_NU 17
-#define UC_GREEK_CAPITAL_LETTER_OMEGA 18
-#define UC_GREEK_CAPITAL_LETTER_OMICRON 19
-#define UC_GREEK_CAPITAL_LETTER_PHI 20
-#define UC_GREEK_CAPITAL_LETTER_PI 21
-#define UC_GREEK_CAPITAL_LETTER_PSI 22
-#define UC_GREEK_CAPITAL_LETTER_RHO 23
-#define UC_GREEK_CAPITAL_LETTER_SIGMA 24
-#define UC_GREEK_CAPITAL_LETTER_TAU 25
-#define UC_GREEK_CAPITAL_LETTER_THETA 26
-#define UC_GREEK_CAPITAL_LETTER_UPSILON 27
-#define UC_GREEK_CAPITAL_LETTER_XI 28
-#define UC_GREEK_CAPITAL_LETTER_ZETA 29
-#define UC_GREEK_SMALL_LETTER_ALPHA 30
-#define UC_GREEK_SMALL_LETTER_BETA 31
-#define UC_GREEK_SMALL_LETTER_CHI 32
-#define UC_GREEK_SMALL_LETTER_DELTA 33
-#define UC_GREEK_SMALL_LETTER_EPSILON 34
-#define UC_GREEK_SMALL_LETTER_ETA 35
-#define UC_GREEK_SMALL_LETTER_FINAL_SIGMA 36
-#define UC_GREEK_SMALL_LETTER_GAMMA 37
-#define UC_GREEK_SMALL_LETTER_IOTA 38
-#define UC_GREEK_SMALL_LETTER_KAPPA 39
-#define UC_GREEK_SMALL_LETTER_LAMDA 40
-#define UC_GREEK_SMALL_LETTER_MU 41
-#define UC_GREEK_SMALL_LETTER_NU 42
-#define UC_GREEK_SMALL_LETTER_OMEGA 43
-#define UC_GREEK_SMALL_LETTER_OMICRON 44
-#define UC_GREEK_SMALL_LETTER_PHI 45
-#define UC_GREEK_SMALL_LETTER_PI 46
-#define UC_GREEK_SMALL_LETTER_PSI 47
-#define UC_GREEK_SMALL_LETTER_RHO 48
-#define UC_GREEK_SMALL_LETTER_SIGMA 49
-#define UC_GREEK_SMALL_LETTER_TAU 50
-#define UC_GREEK_SMALL_LETTER_THETA 51
-#define UC_GREEK_SMALL_LETTER_UPSILON 52
-#define UC_GREEK_SMALL_LETTER_XI 53
-#define UC_GREEK_SMALL_LETTER_ZETA 54
-#define UC_INFINITY 55
-#define UC_LEFTWARDS_ARROW 56
-#define UC_MULTIPLICATION_SIGN 57
-#define UC_NOT_AN_ELEMENT_OF 58
-#define UC_NOT_EQUAL_TO 59
-#define UC_PLUS_MINUS_SIGN 60
-#define UC_RIGHTWARDS_ARROW 61
-#define UC_SUBSCRIPT_EIGHT 62
-#define UC_SUBSCRIPT_FIVE 63
-#define UC_SUBSCRIPT_FOUR 64
-#define UC_SUBSCRIPT_NINE 65
-#define UC_SUBSCRIPT_ONE 66
-#define UC_SUBSCRIPT_SEVEN 67
-#define UC_SUBSCRIPT_SIX 68
-#define UC_SUBSCRIPT_THREE 69
-#define UC_SUBSCRIPT_TWO 70
-#define UC_SUBSCRIPT_ZERO 71
-#define UC_SUPERSCRIPT_EIGHT 72
-#define UC_SUPERSCRIPT_FIVE 73
-#define UC_SUPERSCRIPT_FOUR 74
-#define UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N 75
-#define UC_SUPERSCRIPT_NINE 76
-#define UC_SUPERSCRIPT_ONE 77
-#define UC_SUPERSCRIPT_SEVEN 78
-#define UC_SUPERSCRIPT_SIX 79
-#define UC_SUPERSCRIPT_THREE 80
-#define UC_SUPERSCRIPT_TWO 81
-#define UC_SUPERSCRIPT_ZERO 82
-#define UC_THERE_DOES_NOT_EXIST 83
-#define UC_THERE_EXISTS 84
-#define UC_UPWARDS_ARROW 85
-#define UC_VULGAR_FRACTION_ONE_EIGHTH 86
-#define UC_VULGAR_FRACTION_ONE_FIFTH 87
-#define UC_VULGAR_FRACTION_ONE_HALF 88
-#define UC_VULGAR_FRACTION_ONE_QUARTER 89
-#define UC_VULGAR_FRACTION_ONE_SIXTH 90
-#define UC_VULGAR_FRACTION_ONE_THIRD 91
-#define UC_VULGAR_FRACTION_THREE_QUARTERS 92
-#define UC_VULGAR_FRACTION_TWO_THIRDS 93
-#define UM 94
-
-#define L0   0      // layer_0
-#define L1   1      // layer_1
-#define L2   2      // layer_2
-#define L3   3      // layer_3
-#define L4   4      // layer_4
-#define L5   5      // layer_5
-#define L6   6      // layer_6
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * .------------------------------------.------------------------------------.
- * |MO(5)| 1  | 2  | 3  | 4  | 5  |ACUT | GRV | 6  | 7  | 8  | 9  | 0  |CIRC |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |MO(4)| X  | P  | F  | W  | G  |HOME |TG(2)| H  | J  | K  | L  | Q  |  Z  |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |MO(1)| U  | I  | A  | E  | O  |-----!-----! S  | N  | R  | T  | D  | SS  |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |MO(3)| UE | OE | AE | C  | V  |END  | TAB | B  | M  |COMM| DOT| UP |  Y  |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- *  |    |    |LGUI|LALT|LCTL|                     !RCTL|RALT|LEFT|DOWN|RGHT|
- *  '------------------------'                     '------------------------'
- *                         .-----------. .-----------.
- *                         |INS  |TG(2)| !M(UM)|DEL  |
- *                   .-----+-----+-----! !-----+-----+-----.
- *                   !     !     | APP | ! PGUP|     !     !
- *                   !     !     !-----! !-----!     !     !
- *                   |BSPC |LSFT | ESC | ! PGDN|ENTER|SPACE|
- *                   '-----------------' '-----------------'
- */
-[L0] = LAYOUT_ergodox(
- MO(5),   DE_1,     DE_2,     DE_3,    DE_4,    DE_5,    DE_ACUT,
- MO(4),   DE_X,     DE_P,     DE_F,    DE_W,    DE_G,    KC_HOME,
- MO(1),   DE_U,     DE_I,     DE_A,    DE_E,    DE_O,
- MO(3),   DE_UDIA,  DE_ODIA,  DE_ADIA, DE_C,    DE_V,    KC_END,
- KC_TRNS, KC_TRNS,  KC_LGUI,  KC_LALT, KC_LCTL,
- /*-*/    /*-*/     /*-*/     /*-*/    /*-*/    KC_INS,  TG(2),
- /*-*/    /*-*/     /*-*/     /*-*/    /*-*/    /*-*/    KC_APP,
- /*-*/    /*-*/     /*-*/     /*-*/    KC_BSPC, KC_LSFT, KC_ESC,
- DE_GRV,  DE_6,     DE_7,     DE_8,    DE_9,    DE_0,    DE_CIRC,
- TG(2),   DE_H,     DE_J,     DE_K,    DE_L,    DE_Q,    DE_Z,
- /*-*/    DE_S,     DE_N,     DE_R,    DE_T,    DE_D,    DE_SS,
- KC_TAB,  DE_B,     DE_M,     DE_COMM, DE_DOT,  KC_UP,   DE_Y,
- /*-*/    /*-*/     KC_RCTL,  KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT,
- M(UM),   KC_DEL,
- KC_PGUP,
- KC_PGDN, KC_ENTER, KC_SPACE
-),
-/*
- * .------------------------------------.------------------------------------.
- * |     |EXLM|DQOT|PARA|    |    |     |     |    |    |    |    |RING|     |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |     |ASTR|PIPE|SLSH|LCBR|RCBR|     |     |HASH|LESS|MORE|    |DQOT|     |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |UNDS|MINS|AMPR|LBRC|RBRC|-----!-----!DLR |LPRN|RPRN|TILD|QUOT| QST |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    |PLUS|EQL |    |    |     |     |BSLS|PERC|SCLN|COLN| ↑  |     |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- *  |    |    |    |    |    |                     !    |    | ←  | ↓  | →  |
- *  '------------------------'                     '------------------------'
- *                         .-----------. .-----------.
- *                         |     |     | !     |     |
- *                   .-----+-----+-----! !-----+-----+-----.
- *                   !     !     |     | !     |     !     !
- *                   !     !     !-----! !-----!     !     !
- *                   |     |     |     | !     |     |     |
- *                   '-----------------' '-----------------'
- */
-[L1] = LAYOUT_ergodox(
- KC_TRNS, DE_EXLM, DE_DQUO, DE_SECT, KC_TRNS,               KC_TRNS,               KC_TRNS,
- KC_TRNS, DE_ASTR, DE_PIPE, DE_SLSH, DE_LCBR,               DE_RCBR,               KC_TRNS,
- KC_TRNS, DE_UNDS, DE_MINS, DE_AMPR, DE_LBRC,               DE_RBRC,
- KC_TRNS, KC_TRNS, DE_PLUS, DE_EQL,  KC_TRNS,               KC_TRNS,               KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    /*-*/                  KC_TRNS,               KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    /*-*/                  /*-*/                  KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,               KC_TRNS,               KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               DE_DEG,                KC_TRNS,
- KC_TRNS, DE_HASH, DE_LABK, DE_RABK, KC_TRNS,               DE_DQUO,               KC_TRNS,
- /*-*/    DE_DLR,  DE_LPRN, DE_RPRN, DE_TILD,               DE_QUOT,               DE_QUES,
- KC_TRNS, DE_BSLS, DE_PERC, DE_SCLN, DE_COLN,               M(UC_UPWARDS_ARROW),   KC_TRNS,
- /*-*/    /*-*/    KC_TRNS, KC_TRNS, M(UC_LEFTWARDS_ARROW), M(UC_DOWNWARDS_ARROW), M(UC_RIGHTWARDS_ARROW),
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * |     | F1 | F2 | F3 | F4 | F5 | F11 | F12 | F6 | F7 | F8 | F9 |F10 |PEQL |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |     |    |    |    |    |    |     |     |    | P7 | P8 | P9 |PAST|PSLS |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    |    |    |    |    |-----!-----!    | P4 | P5 | P6 |PMNS|PMNS |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    |    |    |    |    |     | NLCK|    | P1 | P2 | P3 |PPLS|PPLS |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- *  |    |    |    |    |    |                     ! P0 |PCMM|PDOT|PENT|PENT|
- *  '------------------------'                     '------------------------'
- *                         .-----------. .-----------.
- *                         |     |     | !     |     |
- *                   .-----+-----+-----! !-----+-----+-----.
- *                   !     !     |     | !     |     !     !
- *                   !     !     !-----! !-----!     !     !
- *                   |     |     |     | !     |     |     |
- *                   '-----------------' '-----------------'
- */
-[L2] = LAYOUT_ergodox(
- KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PEQL,
- KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PSLS,
- /*-*/    KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, KC_PMNS,
- KC_NLCK, KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PPLS,
- /*-*/    /*-*/    KC_P0,   KC_PCMM, KC_PDOT, KC_PENT, KC_PENT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * |     | ¹  | ²  | ³  | ⁴  | ⁵  |  ∀  |     | ⁶  | ⁷  | ⁸  | ⁹  |  ⁰ |     |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |     | ×  | ½  | ÷  | ¼  |  ⅕ |     |     | ⅙  |    | ⅛  |    |    |     |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    | ±  | AT |EURO| ∅  |-----!-----! ∞  | ⁿ  | ∃  | ∈  |    |     |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     | ⅓  | ≠  | ⅔  | ¾  | ≃  |     |     |EXLM|    | ∄  | ∉  |    |     |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- *  |    |    |    |    |    |                     !    |    |    |    |    |
- *  '------------------------'                     '------------------------'
- *                         .-----------. .-----------.
- *                         |     |     | !     |     |
- *                   .-----+-----+-----! !-----+-----+-----.
- *                   !     !     |     | !     |     !     !
- *                   !     !     !-----! !-----!     !     !
- *                   |     |     |     | !     |     |     |
- *                   '-----------------' '-----------------'
- */
-[L3] = LAYOUT_ergodox(
- KC_TRNS, M(UC_SUPERSCRIPT_ONE),           M(UC_SUPERSCRIPT_TWO),                  M(UC_SUPERSCRIPT_THREE),          M(UC_SUPERSCRIPT_FOUR),               M(UC_SUPERSCRIPT_FIVE),          M(UC_FOR_ALL),
- KC_TRNS, M(UC_MULTIPLICATION_SIGN),       M(UC_VULGAR_FRACTION_ONE_HALF),         M(UC_DIVISION_SIGN),              M(UC_VULGAR_FRACTION_ONE_QUARTER),    M(UC_VULGAR_FRACTION_ONE_FIFTH), KC_TRNS,
- KC_TRNS, KC_TRNS,                         M(UC_PLUS_MINUS_SIGN),                  DE_AT,                            DE_EURO,                              M(UC_EMPTY_SET),
- KC_TRNS, M(UC_VULGAR_FRACTION_ONE_THIRD), M(UC_NOT_EQUAL_TO),                     M(UC_VULGAR_FRACTION_TWO_THIRDS), M(UC_VULGAR_FRACTION_THREE_QUARTERS), M(UC_ASYMPTOTICALLY_EQUAL_TO),   KC_TRNS,
- KC_TRNS, KC_TRNS,                         KC_TRNS,                                KC_TRNS,                          KC_TRNS,
- /*-*/    /*-*/                            /*-*/                                   /*-*/                             /*-*/                                 KC_TRNS,                         KC_TRNS,
- /*-*/    /*-*/                            /*-*/                                   /*-*/                             /*-*/                                 /*-*/                            KC_TRNS,
- /*-*/    /*-*/                            /*-*/                                   /*-*/                             KC_TRNS,                              KC_TRNS,                         KC_TRNS,
- KC_TRNS, M(UC_SUPERSCRIPT_SIX),           M(UC_SUPERSCRIPT_SEVEN),                M(UC_SUPERSCRIPT_EIGHT),          M(UC_SUPERSCRIPT_NINE),               M(UC_SUPERSCRIPT_ZERO),          KC_TRNS,
- KC_TRNS, M(UC_VULGAR_FRACTION_ONE_SIXTH), KC_TRNS,                                M(UC_VULGAR_FRACTION_ONE_EIGHTH), KC_TRNS,                              KC_TRNS,                         KC_TRNS,
- /*-*/    M(UC_INFINITY),                  M(UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N), M(UC_THERE_EXISTS),               M(UC_ELEMENT_OF),                     KC_TRNS,                         KC_TRNS,
- KC_TRNS, DE_EXLM,                         KC_TRNS,                                M(UC_THERE_DOES_NOT_EXIST),       M(UC_NOT_AN_ELEMENT_OF),              KC_TRNS,                         KC_TRNS,
- /*-*/    /*-*/                            KC_TRNS,                                KC_TRNS,                          KC_TRNS,                              KC_TRNS,                         KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS,                         KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * |     | ₁  | ₂  | ₃  | ₄  | ₅  |     |     | ₆  | ₇  | ₈  | ₉  | ₀  |     |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |     | χ  | π  | φ  | ω  | γ  |     |     | η  | ξ  | κ  | λ  |    |  ζ  |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     | υ  | ι  | α  | ε  | ο  |-----!-----! σ  | ν  | ρ  | τ  | δ  |  ς  |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    | θ  |    |    |    |     |     | β  | μ  |    |    |    |  ψ  |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- *  |    |    |    |    |    |                     !    |    |    |    |    |
- *  '------------------------'                     '------------------------'
- *                         .-----------. .-----------.
- *                         |     |     | !     |     |
- *                   .-----+-----+-----! !-----+-----+-----.
- *                   !     !     |     | !     |     !     !
- *                   !     !     !-----! !-----!     !     !
- *                   |     |     |     | !     |     |     |
- *                   '-----------------' '-----------------'
- */
-[L4] = LAYOUT_ergodox(
- KC_TRNS, M(UC_SUBSCRIPT_ONE),              M(UC_SUBSCRIPT_TWO),            M(UC_SUBSCRIPT_THREE),          M(UC_SUBSCRIPT_FOUR),             M(UC_SUBSCRIPT_FIVE),             KC_TRNS,
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_CHI),     M(UC_GREEK_SMALL_LETTER_PI),    M(UC_GREEK_SMALL_LETTER_PHI),   M(UC_GREEK_SMALL_LETTER_OMEGA),   M(UC_GREEK_SMALL_LETTER_GAMMA),   KC_TRNS,
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_UPSILON), M(UC_GREEK_SMALL_LETTER_IOTA),  M(UC_GREEK_SMALL_LETTER_ALPHA), M(UC_GREEK_SMALL_LETTER_EPSILON), M(UC_GREEK_SMALL_LETTER_OMICRON),
- KC_TRNS, KC_TRNS,                          M(UC_GREEK_SMALL_LETTER_THETA), KC_TRNS,                        KC_TRNS,                          KC_TRNS,                          KC_TRNS,
- KC_TRNS, KC_TRNS,                          KC_TRNS,                        KC_TRNS,                        KC_TRNS,
- /*-*/    /*-*/                             /*-*/                           /*-*/                           /*-*/                             KC_TRNS,                          KC_TRNS,
- /*-*/    /*-*/                             /*-*/                           /*-*/                           /*-*/                             /*-*/                             KC_TRNS,
- /*-*/    /*-*/                             /*-*/                           /*-*/                           KC_TRNS,                          KC_TRNS,                          KC_TRNS,
- KC_TRNS, M(UC_SUBSCRIPT_SIX),              M(UC_SUBSCRIPT_SEVEN),          M(UC_SUBSCRIPT_EIGHT),          M(UC_SUBSCRIPT_NINE),             M(UC_SUBSCRIPT_ZERO),             KC_TRNS,
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_ETA),     M(UC_GREEK_SMALL_LETTER_XI),    M(UC_GREEK_SMALL_LETTER_KAPPA), M(UC_GREEK_SMALL_LETTER_LAMDA),   KC_TRNS,                          M(UC_GREEK_SMALL_LETTER_ZETA),
- /*-*/    M(UC_GREEK_SMALL_LETTER_SIGMA),   M(UC_GREEK_SMALL_LETTER_NU),    M(UC_GREEK_SMALL_LETTER_RHO),   M(UC_GREEK_SMALL_LETTER_TAU),     M(UC_GREEK_SMALL_LETTER_DELTA),   M(UC_GREEK_SMALL_LETTER_FINAL_SIGMA),
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_BETA),    M(UC_GREEK_SMALL_LETTER_MU),    KC_TRNS,                        KC_TRNS,                          KC_TRNS,                          M(UC_GREEK_SMALL_LETTER_PSI),
- /*-*/    /*-*/                             KC_TRNS,                        KC_TRNS,                        KC_TRNS,                          KC_TRNS,                          KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS,                          KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |     | Χ  | Π  | Φ  | Ω  | Γ  |     |     | Η  | Ξ  | Κ  | Λ  |    |  Ζ  |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     | Υ  | Ι  | Α  | Ε  | Ο  |-----!-----! Σ  | Ν  | Ρ  | Τ  | Δ  |     |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    | Θ  |    |    |    |     |     | Β  | Μ  |    |    |    |  Ψ  |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- *  |    |    |    |    |    |                     !    |    |    |    |    |
- *  '------------------------'                     '------------------------'
- *                         .-----------. .-----------.
- *                         |     |     | !     |     |
- *                   .-----+-----+-----! !-----+-----+-----.
- *                   !     !     |     | !     |     !     !
- *                   !     !     !-----! !-----!     !     !
- *                   |     |     |     | !     |     |     |
- *                   '-----------------' '-----------------'
- */
-[L5] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS,                            KC_TRNS,                          KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_CHI),     M(UC_GREEK_CAPITAL_LETTER_PI),    M(UC_GREEK_CAPITAL_LETTER_PHI),   M(UC_GREEK_CAPITAL_LETTER_OMEGA),   M(UC_GREEK_CAPITAL_LETTER_GAMMA),   KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_UPSILON), M(UC_GREEK_CAPITAL_LETTER_IOTA),  M(UC_GREEK_CAPITAL_LETTER_ALPHA), M(UC_GREEK_CAPITAL_LETTER_EPSILON), M(UC_GREEK_CAPITAL_LETTER_OMICRON),
- KC_TRNS, KC_TRNS,                            M(UC_GREEK_CAPITAL_LETTER_THETA), KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            KC_TRNS,
- KC_TRNS, KC_TRNS,                            KC_TRNS,                          KC_TRNS,                          KC_TRNS,
- /*-*/    /*-*/                               /*-*/                             /*-*/                             /*-*/                               KC_TRNS,                            KC_TRNS,
- /*-*/    /*-*/                               /*-*/                             /*-*/                             /*-*/                               /*-*/                               KC_TRNS,
- /*-*/    /*-*/                               /*-*/                             /*-*/                             KC_TRNS,                            KC_TRNS,                            KC_TRNS,
- KC_TRNS, KC_TRNS,                            KC_TRNS,                          KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_ETA),     M(UC_GREEK_CAPITAL_LETTER_XI),    M(UC_GREEK_CAPITAL_LETTER_KAPPA), M(UC_GREEK_CAPITAL_LETTER_LAMDA),   KC_TRNS,                            M(UC_GREEK_CAPITAL_LETTER_ZETA),
- /*-*/    M(UC_GREEK_CAPITAL_LETTER_SIGMA),   M(UC_GREEK_CAPITAL_LETTER_NU),    M(UC_GREEK_CAPITAL_LETTER_RHO),   M(UC_GREEK_CAPITAL_LETTER_TAU),     M(UC_GREEK_CAPITAL_LETTER_DELTA),   KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_BETA),    M(UC_GREEK_CAPITAL_LETTER_MU),    KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            M(UC_GREEK_CAPITAL_LETTER_PSI),
- /*-*/    /*-*/                               KC_TRNS,                          KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS,                            KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    |    |    |    |    |-----!-----!    |    |    |    |    |     |
- * !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
- * |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- *  |    |    |    |    |    |                     !    |    |    |    |    |
- *  '------------------------'                     '------------------------'
- *                         .-----------. .-----------.
- *                         |     |     | !     |     |
- *                   .-----+-----+-----! !-----+-----+-----.
- *                   !     !     |     | !     |     !     !
- *                   !     !     !-----! !-----!     !     !
- *                   |     |     |     | !     |     |     |
- *                   '-----------------' '-----------------'
- */
-[L6] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,
- /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-#define UC_MODE_WIN 0
-#define UC_MODE_LINUX 1
-#define UC_MODE_OSX 2
-
-// TODO: allow default mode to be configured
-static uint16_t unicode_mode = UC_MODE_WIN;
-
-uint16_t hextokeycode(uint8_t hex) {
-    if (hex == 0x0) {
-        return KC_P0;
-    }
-    if (hex < 0xA) {
-        return KC_P1 + (hex - 0x1);
-    }
-    return KC_A + (hex - 0xA);
-}
-
-void unicode_action_function(uint16_t hi, uint16_t lo) {
-    switch (unicode_mode) {
-    case UC_MODE_WIN:
-        register_code(KC_LALT);
-
-        register_code(KC_PPLS);
-        unregister_code(KC_PPLS);
-
-        register_code(hextokeycode((hi & 0xF0) >> 4));
-        unregister_code(hextokeycode((hi & 0xF0) >> 4));
-        register_code(hextokeycode((hi & 0x0F)));
-        unregister_code(hextokeycode((hi & 0x0F)));
-        register_code(hextokeycode((lo & 0xF0) >> 4));
-        unregister_code(hextokeycode((lo & 0xF0) >> 4));
-        register_code(hextokeycode((lo & 0x0F)));
-        unregister_code(hextokeycode((lo & 0x0F)));
-
-        unregister_code(KC_LALT);
-        break;
-    case UC_MODE_LINUX:
-        register_code(KC_LCTL);
-        register_code(KC_LSFT);
-
-        register_code(KC_U);
-        unregister_code(KC_U);
-
-        register_code(hextokeycode((hi & 0xF0) >> 4));
-        unregister_code(hextokeycode((hi & 0xF0) >> 4));
-        register_code(hextokeycode((hi & 0x0F)));
-        unregister_code(hextokeycode((hi & 0x0F)));
-        register_code(hextokeycode((lo & 0xF0) >> 4));
-        unregister_code(hextokeycode((lo & 0xF0) >> 4));
-        register_code(hextokeycode((lo & 0x0F)));
-        unregister_code(hextokeycode((lo & 0x0F)));
-
-        unregister_code(KC_LCTL);
-        unregister_code(KC_LSFT);
-        break;
-    case UC_MODE_OSX:
-        break;
-    }
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    if (!record->event.pressed) {
-        return MACRO_NONE;
-    }
-    // MACRODOWN only works in this function
-    switch(id) {
-        case UM:
-            unicode_mode = (unicode_mode + 1) % 2;
-            break;
-
-case UC_GREEK_SMALL_LETTER_OMICRON:
-    unicode_action_function(0x03, 0xbf);
-    break;
-case UC_LEFTWARDS_ARROW:
-    unicode_action_function(0x21, 0x90);
-    break;
-case UC_GREEK_CAPITAL_LETTER_RHO:
-    unicode_action_function(0x03, 0xa1);
-    break;
-case UC_SUBSCRIPT_THREE:
-    unicode_action_function(0x20, 0x83);
-    break;
-case UC_VULGAR_FRACTION_ONE_EIGHTH:
-    unicode_action_function(0x21, 0x5b);
-    break;
-case UC_GREEK_SMALL_LETTER_LAMDA:
-    unicode_action_function(0x03, 0xbb);
-    break;
-case UC_VULGAR_FRACTION_ONE_THIRD:
-    unicode_action_function(0x21, 0x53);
-    break;
-case UC_GREEK_SMALL_LETTER_XI:
-    unicode_action_function(0x03, 0xbe);
-    break;
-case UC_THERE_DOES_NOT_EXIST:
-    unicode_action_function(0x22, 0x04);
-    break;
-case UC_SUPERSCRIPT_ONE:
-    unicode_action_function(0x00, 0xb9);
-    break;
-case UC_GREEK_SMALL_LETTER_BETA:
-    unicode_action_function(0x03, 0xb2);
-    break;
-case UC_SUBSCRIPT_FIVE:
-    unicode_action_function(0x20, 0x85);
-    break;
-case UC_GREEK_CAPITAL_LETTER_IOTA:
-    unicode_action_function(0x03, 0x99);
-    break;
-case UC_VULGAR_FRACTION_ONE_FIFTH:
-    unicode_action_function(0x21, 0x55);
-    break;
-case UC_GREEK_SMALL_LETTER_PSI:
-    unicode_action_function(0x03, 0xc8);
-    break;
-case UC_SUBSCRIPT_NINE:
-    unicode_action_function(0x20, 0x89);
-    break;
-case UC_SUPERSCRIPT_FOUR:
-    unicode_action_function(0x20, 0x74);
-    break;
-case UC_RIGHTWARDS_ARROW:
-    unicode_action_function(0x21, 0x92);
-    break;
-case UC_SUPERSCRIPT_SIX:
-    unicode_action_function(0x20, 0x76);
-    break;
-case UC_DOWNWARDS_ARROW:
-    unicode_action_function(0x21, 0x93);
-    break;
-case UC_GREEK_SMALL_LETTER_PI:
-    unicode_action_function(0x03, 0xc0);
-    break;
-case UC_SUPERSCRIPT_TWO:
-    unicode_action_function(0x00, 0xb2);
-    break;
-case UC_GREEK_CAPITAL_LETTER_OMEGA:
-    unicode_action_function(0x03, 0xa9);
-    break;
-case UC_GREEK_CAPITAL_LETTER_PSI:
-    unicode_action_function(0x03, 0xa8);
-    break;
-case UC_SUBSCRIPT_FOUR:
-    unicode_action_function(0x20, 0x84);
-    break;
-case UC_GREEK_CAPITAL_LETTER_NU:
-    unicode_action_function(0x03, 0x9d);
-    break;
-case UC_DIVISION_SIGN:
-    unicode_action_function(0x00, 0xf7);
-    break;
-case UC_GREEK_SMALL_LETTER_SIGMA:
-    unicode_action_function(0x03, 0xc3);
-    break;
-case UC_GREEK_SMALL_LETTER_RHO:
-    unicode_action_function(0x03, 0xc1);
-    break;
-case UC_VULGAR_FRACTION_ONE_SIXTH:
-    unicode_action_function(0x21, 0x59);
-    break;
-case UC_GREEK_SMALL_LETTER_GAMMA:
-    unicode_action_function(0x03, 0xb3);
-    break;
-case UC_VULGAR_FRACTION_TWO_THIRDS:
-    unicode_action_function(0x21, 0x54);
-    break;
-case UC_GREEK_SMALL_LETTER_NU:
-    unicode_action_function(0x03, 0xbd);
-    break;
-case UC_GREEK_SMALL_LETTER_ZETA:
-    unicode_action_function(0x03, 0xb6);
-    break;
-case UC_GREEK_SMALL_LETTER_EPSILON:
-    unicode_action_function(0x03, 0xb5);
-    break;
-case UC_GREEK_SMALL_LETTER_KAPPA:
-    unicode_action_function(0x03, 0xba);
-    break;
-case UC_SUPERSCRIPT_SEVEN:
-    unicode_action_function(0x20, 0x77);
-    break;
-case UC_GREEK_CAPITAL_LETTER_PI:
-    unicode_action_function(0x03, 0xa0);
-    break;
-case UC_GREEK_SMALL_LETTER_FINAL_SIGMA:
-    unicode_action_function(0x03, 0xc2);
-    break;
-case UC_GREEK_CAPITAL_LETTER_XI:
-    unicode_action_function(0x03, 0x9e);
-    break;
-case UC_GREEK_SMALL_LETTER_THETA:
-    unicode_action_function(0x03, 0xb8);
-    break;
-case UC_GREEK_SMALL_LETTER_ETA:
-    unicode_action_function(0x03, 0xb7);
-    break;
-case UC_SUBSCRIPT_TWO:
-    unicode_action_function(0x20, 0x82);
-    break;
-case UC_ASYMPTOTICALLY_EQUAL_TO:
-    unicode_action_function(0x22, 0x43);
-    break;
-case UC_GREEK_SMALL_LETTER_ALPHA:
-    unicode_action_function(0x03, 0xb1);
-    break;
-case UC_GREEK_CAPITAL_LETTER_PHI:
-    unicode_action_function(0x03, 0xa6);
-    break;
-case UC_GREEK_SMALL_LETTER_PHI:
-    unicode_action_function(0x03, 0xc6);
-    break;
-case UC_INFINITY:
-    unicode_action_function(0x22, 0x1e);
-    break;
-case UC_GREEK_CAPITAL_LETTER_OMICRON:
-    unicode_action_function(0x03, 0x9f);
-    break;
-case UC_ELEMENT_OF:
-    unicode_action_function(0x22, 0x08);
-    break;
-case UC_MULTIPLICATION_SIGN:
-    unicode_action_function(0x00, 0xd7);
-    break;
-case UC_SUBSCRIPT_ZERO:
-    unicode_action_function(0x20, 0x80);
-    break;
-case UC_GREEK_CAPITAL_LETTER_SIGMA:
-    unicode_action_function(0x03, 0xa3);
-    break;
-case UC_GREEK_SMALL_LETTER_OMEGA:
-    unicode_action_function(0x03, 0xc9);
-    break;
-case UC_SUBSCRIPT_ONE:
-    unicode_action_function(0x20, 0x81);
-    break;
-case UC_GREEK_CAPITAL_LETTER_ZETA:
-    unicode_action_function(0x03, 0x96);
-    break;
-case UC_GREEK_SMALL_LETTER_TAU:
-    unicode_action_function(0x03, 0xc4);
-    break;
-case UC_SUPERSCRIPT_FIVE:
-    unicode_action_function(0x20, 0x75);
-    break;
-case UC_THERE_EXISTS:
-    unicode_action_function(0x22, 0x03);
-    break;
-case UC_PLUS_MINUS_SIGN:
-    unicode_action_function(0x00, 0xb1);
-    break;
-case UC_VULGAR_FRACTION_THREE_QUARTERS:
-    unicode_action_function(0x00, 0xbe);
-    break;
-case UC_SUPERSCRIPT_THREE:
-    unicode_action_function(0x00, 0xb3);
-    break;
-case UC_EMPTY_SET:
-    unicode_action_function(0x22, 0x05);
-    break;
-case UC_UPWARDS_ARROW:
-    unicode_action_function(0x21, 0x91);
-    break;
-case UC_SUPERSCRIPT_NINE:
-    unicode_action_function(0x20, 0x79);
-    break;
-case UC_GREEK_SMALL_LETTER_DELTA:
-    unicode_action_function(0x03, 0xb4);
-    break;
-case UC_GREEK_SMALL_LETTER_MU:
-    unicode_action_function(0x03, 0xbc);
-    break;
-case UC_GREEK_CAPITAL_LETTER_KAPPA:
-    unicode_action_function(0x03, 0x9a);
-    break;
-case UC_SUBSCRIPT_EIGHT:
-    unicode_action_function(0x20, 0x88);
-    break;
-case UC_GREEK_CAPITAL_LETTER_ALPHA:
-    unicode_action_function(0x03, 0x91);
-    break;
-case UC_SUBSCRIPT_SEVEN:
-    unicode_action_function(0x20, 0x87);
-    break;
-case UC_GREEK_CAPITAL_LETTER_BETA:
-    unicode_action_function(0x03, 0x92);
-    break;
-case UC_GREEK_CAPITAL_LETTER_ETA:
-    unicode_action_function(0x03, 0x97);
-    break;
-case UC_SUPERSCRIPT_EIGHT:
-    unicode_action_function(0x20, 0x78);
-    break;
-case UC_SUPERSCRIPT_ZERO:
-    unicode_action_function(0x20, 0x70);
-    break;
-case UC_NOT_AN_ELEMENT_OF:
-    unicode_action_function(0x22, 0x09);
-    break;
-case UC_GREEK_SMALL_LETTER_UPSILON:
-    unicode_action_function(0x03, 0xc5);
-    break;
-case UC_NOT_EQUAL_TO:
-    unicode_action_function(0x22, 0x60);
-    break;
-case UC_GREEK_CAPITAL_LETTER_CHI:
-    unicode_action_function(0x03, 0xa7);
-    break;
-case UC_FOR_ALL:
-    unicode_action_function(0x22, 0x00);
-    break;
-case UC_GREEK_CAPITAL_LETTER_TAU:
-    unicode_action_function(0x03, 0xa4);
-    break;
-case UC_VULGAR_FRACTION_ONE_QUARTER:
-    unicode_action_function(0x00, 0xbc);
-    break;
-case UC_GREEK_SMALL_LETTER_CHI:
-    unicode_action_function(0x03, 0xc7);
-    break;
-case UC_GREEK_CAPITAL_LETTER_THETA:
-    unicode_action_function(0x03, 0x98);
-    break;
-case UC_GREEK_SMALL_LETTER_IOTA:
-    unicode_action_function(0x03, 0xb9);
-    break;
-case UC_GREEK_CAPITAL_LETTER_LAMDA:
-    unicode_action_function(0x03, 0x9b);
-    break;
-case UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N:
-    unicode_action_function(0x20, 0x7f);
-    break;
-case UC_GREEK_CAPITAL_LETTER_UPSILON:
-    unicode_action_function(0x03, 0xa5);
-    break;
-case UC_GREEK_CAPITAL_LETTER_MU:
-    unicode_action_function(0x03, 0x9c);
-    break;
-case UC_GREEK_CAPITAL_LETTER_EPSILON:
-    unicode_action_function(0x03, 0x95);
-    break;
-case UC_GREEK_CAPITAL_LETTER_GAMMA:
-    unicode_action_function(0x03, 0x93);
-    break;
-case UC_SUBSCRIPT_SIX:
-    unicode_action_function(0x20, 0x86);
-    break;
-case UC_GREEK_CAPITAL_LETTER_DELTA:
-    unicode_action_function(0x03, 0x94);
-    break;
-case UC_VULGAR_FRACTION_ONE_HALF:
-    unicode_action_function(0x00, 0xbd);
-    break;
-        default:
-            break;
-    }
-    return MACRO_NONE;
-};
-
-// 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 L1:
-            ergodox_right_led_1_on();
-            break;
-        case L2:
-            ergodox_right_led_2_on();
-            break;
-        case L3:
-            ergodox_right_led_3_on();
-            break;
-        case L4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case L5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        // case L6:
-        //     ergodox_right_led_2_on();
-        //     ergodox_right_led_3_on();
-        //     break;
-        // case L7:
-        //     ergodox_right_led_1_on();
-        //     ergodox_right_led_2_on();
-        //     ergodox_right_led_3_on();
-        //     break;
-        default:
-            ergodox_board_led_off();
-            break;
-    }
-};
diff --git a/layouts/community/ergodox/german-manuneo/keymap.md b/layouts/community/ergodox/german-manuneo/keymap.md
deleted file mode 100644
index 3f476ad2a0..0000000000
--- a/layouts/community/ergodox/german-manuneo/keymap.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# ManuNeo Ergodox Keyboard Layout
-
-Compile this file to a `keymap.c` file using `compile_keymap.py`
-
-    python compile_keymap.py keymaps/german-manuneo/keymap.md
-
-Tested with python 2.7 and python 3.4
-
-
-# Layout Config
-
-    {
-        "layout": "ergodox_ez",
-        "keymaps_includes": [
-            QMK_KEYBOARD_H,
-            "action_layer.h",
-            "keymap_common.h",
-            "keymap_extras/keymap_german.h",
-        ],
-        "key_prefixes": ["DE_", "KC_"],
-        "macros": {
-            // TODO: implement macros
-            // "MUC": "",
-        },
-        // TODO: implement default unicode mode
-    }
-
-
-# Layers
-
-
-## Layer 0
-
-    .------------------------------------.------------------------------------.
-    |MO(5)| 1  | 2  | 3  | 4  | 5  |ACUT | GRV | 6  | 7  | 8  | 9  | 0  |CIRC |
-    !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-    |MO(4)| X  | P  | F  | W  | G  |HOME |TG(2)| H  | J  | K  | L  | Q  |  Z  |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |MO(1)| U  | I  | A  | E  | O  |-----!-----! S  | N  | R  | T  | D  | SS  |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |MO(3)| UE | OE | AE | C  | V  |END  | TAB | B  | M  |COMM| DOT| UP |  Y  |
-    '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
-     |    |    |LGUI|LALT|LCTL|                     !RCTL|RALT|LEFT|DOWN|RGHT|
-     '------------------------'                     '------------------------'
-                            .-----------. .-----------.
-                            |INS  |TG(2)| !M(UM)|DEL  |
-                      .-----+-----+-----! !-----+-----+-----.
-                      !     !     | APP | ! PGUP|     !     !
-                      !     !     !-----! !-----!     !     !
-                      |BSPC |LSFT | ESC | ! PGDN|ENTER|SPACE|
-                      '-----------------' '-----------------'
-
-
-## Layer 1
-
-    .------------------------------------.------------------------------------.
-    |     |EXLM|DQOT|PARA|    |    |     |     |    |    |    |    |RING|     |
-    !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-    |     |ASTR|PIPE|SLSH|LCBR|RCBR|     |     |HASH|LESS|MORE|    |DQOT|     |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |UNDS|MINS|AMPR|LBRC|RBRC|-----!-----!DLR |LPRN|RPRN|TILD|QUOT| QST |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    |PLUS|EQL |    |    |     |     |BSLS|PERC|SCLN|COLN| ↑  |     |
-    '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
-     |    |    |    |    |    |                     !    |    | ←  | ↓  | →  |
-     '------------------------'                     '------------------------'
-                            .-----------. .-----------.
-                            |     |     | !     |     |
-                      .-----+-----+-----! !-----+-----+-----.
-                      !     !     |     | !     |     !     !
-                      !     !     !-----! !-----!     !     !
-                      |     |     |     | !     |     |     |
-                      '-----------------' '-----------------'
-
-
-## Layer 2
-
-    .------------------------------------.------------------------------------.
-    |     | F1 | F2 | F3 | F4 | F5 | F11 | F12 | F6 | F7 | F8 | F9 |F10 |PEQL |
-    !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-    |     |    |    |    |    |    |     |     |    | P7 | P8 | P9 |PAST|PSLS |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    |    |    |    |    |-----!-----!    | P4 | P5 | P6 |PMNS|PMNS |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    |    |    |    |    |     | NLCK|    | P1 | P2 | P3 |PPLS|PPLS |
-    '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
-     |    |    |    |    |    |                     ! P0 |PCMM|PDOT|PENT|PENT|
-     '------------------------'                     '------------------------'
-                            .-----------. .-----------.
-                            |     |     | !     |     |
-                      .-----+-----+-----! !-----+-----+-----.
-                      !     !     |     | !     |     !     !
-                      !     !     !-----! !-----!     !     !
-                      |     |     |     | !     |     |     |
-                      '-----------------' '-----------------'
-
-
-
-## Layer 3
-
-http://symbolcodes.tlt.psu.edu/bylanguage/mathchart.html
-
-    .------------------------------------.------------------------------------.
-    |     | ¹  | ²  | ³  | ⁴  | ⁵  |  ∀  |     | ⁶  | ⁷  | ⁸  | ⁹  |  ⁰ |     |
-    !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-    |     | ×  | ½  | ÷  | ¼  |  ⅕ |     |     | ⅙  |    | ⅛  |    |    |     |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    | ±  | AT |EURO| ∅  |-----!-----! ∞  | ⁿ  | ∃  | ∈  |    |     |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     | ⅓  | ≠  | ⅔  | ¾  | ≃  |     |     |EXLM|    | ∄  | ∉  |    |     |
-    '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
-     |    |    |    |    |    |                     !    |    |    |    |    |
-     '------------------------'                     '------------------------'
-                            .-----------. .-----------.
-                            |     |     | !     |     |
-                      .-----+-----+-----! !-----+-----+-----.
-                      !     !     |     | !     |     !     !
-                      !     !     !-----! !-----!     !     !
-                      |     |     |     | !     |     |     |
-                      '-----------------' '-----------------'
-
-
-## Layer 4
-
-
-    .------------------------------------.------------------------------------.
-    |     | ₁  | ₂  | ₃  | ₄  | ₅  |     |     | ₆  | ₇  | ₈  | ₉  | ₀  |     |
-    !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-    |     | χ  | π  | φ  | ω  | γ  |     |     | η  | ξ  | κ  | λ  |    |  ζ  |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     | υ  | ι  | α  | ε  | ο  |-----!-----! σ  | ν  | ρ  | τ  | δ  |  ς  |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    | θ  |    |    |    |     |     | β  | μ  |    |    |    |  ψ  |
-    '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
-     |    |    |    |    |    |                     !    |    |    |    |    |
-     '------------------------'                     '------------------------'
-                            .-----------. .-----------.
-                            |     |     | !     |     |
-                      .-----+-----+-----! !-----+-----+-----.
-                      !     !     |     | !     |     !     !
-                      !     !     !-----! !-----!     !     !
-                      |     |     |     | !     |     |     |
-                      '-----------------' '-----------------'
-
-
-## Layer 5
-
-    .------------------------------------.------------------------------------.
-    |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
-    !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-    |     | Χ  | Π  | Φ  | Ω  | Γ  |     |     | Η  | Ξ  | Κ  | Λ  |    |  Ζ  |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     | Υ  | Ι  | Α  | Ε  | Ο  |-----!-----! Σ  | Ν  | Ρ  | Τ  | Δ  |     |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    | Θ  |    |    |    |     |     | Β  | Μ  |    |    |    |  Ψ  |
-    '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
-     |    |    |    |    |    |                     !    |    |    |    |    |
-     '------------------------'                     '------------------------'
-                            .-----------. .-----------.
-                            |     |     | !     |     |
-                      .-----+-----+-----! !-----+-----+-----.
-                      !     !     |     | !     |     !     !
-                      !     !     !-----! !-----!     !     !
-                      |     |     |     | !     |     |     |
-                      '-----------------' '-----------------'
-
-
-## Layer 6
-
-    .------------------------------------.------------------------------------.
-    |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
-    !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-    |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    |    |    |    |    |-----!-----!    |    |    |    |    |     |
-    !-----+----+----+----x----x----!     !     !----x----x----+----+----+-----!
-    |     |    |    |    |    |    |     |     |    |    |    |    |    |     |
-    '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
-     |    |    |    |    |    |                     !    |    |    |    |    |
-     '------------------------'                     '------------------------'
-                            .-----------. .-----------.
-                            |     |     | !     |     |
-                      .-----+-----+-----! !-----+-----+-----.
-                      !     !     |     | !     |     !     !
-                      !     !     !-----! !-----!     !     !
-                      |     |     |     | !     |     |     |
-                      '-----------------' '-----------------'
-
diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c
deleted file mode 100644
index 2a5b89ad8b..0000000000
--- a/layouts/community/ergodox/ishigoya-jp/keymap.c
+++ /dev/null
@@ -1,958 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_japanese.h"
-
-static uint16_t start;
-
-#define BASE 0 // EN layer
-#define JP 1 // Japanese
-#define JPXON 2 // JP + Fn
-#define JPKAZARI 3 // JP + KAZARI
-#define JPTOPROW 4 // JP + TOPROW
-#define JPTRKZ 5 // JP + TOPROW + KAZARI
-#define NUM 6 // Numbers
-
-#define CTLSHFT 1
-#define CUTCOPY 2
-
-//kana macro definitions start here
-
-#define JPVU 4
-#define JPNU 6
-#define JPKO 7
-#define JPSA 8
-#define JPKE 9
-#define JPHE 10
-#define JPSHI 11
-#define JPKA 12
-#define JPKI 13
-#define JPSU 14
-#define JPSO 15
-#define JPHI 16
-#define JPCHI 17
-#define JPFU 18
-#define JPSE 19
-#define JPTSU 20
-#define JPKU 21
-#define JPTE 22
-#define JPTA 23
-#define JPTO 24
-#define JPHA 25
-#define JPHO 26
-#define JPXKE 27
-#define JPXU 28
-#define JPXKA 29
-#define JPXA 30
-#define JPXO 31
-#define JPGO 32
-#define JPZA 33
-#define JPGE 34
-#define JPBE 35
-#define JPYU 36
-#define JPJI 37
-#define JPGA 38
-#define JPGI 39
-#define JPZU 40
-#define JPZO 41
-#define JPBI 42
-#define JPDI 43
-#define JPZE 44
-#define JPDU 45
-#define JPGU 46
-#define JPYA 47
-#define JPYO 48
-#define JPDE 49
-#define JPDA 50
-#define JPDO 51
-#define JPBA 52
-#define JPBO 53
-#define JPRI 54
-#define JPRE 55
-#define JPRA 56
-#define JPNA 57
-#define JPNO 58
-#define JPMI 59
-#define JPMU 60
-#define JPME 61
-#define JPNE 62
-#define JPMA 63
-#define JPXTU 64
-#define JPWA 65
-#define JPRU 66
-#define JPWO 67
-#define JPNI 68
-#define JPNN 69
-#define JPMO 70
-#define JPRO 71
-#define JPXE 72
-#define JPXI 73
-#define JPXYU 74
-#define JPXYA 75
-#define JPXYO 76
-#define JPPE 77
-#define JPPU 78
-#define JPPI 79
-#define JPPA 80
-#define JPPO 81
-#define JPBU 82
-
-// kana macro definitions end here
-
-#define SHIFT 86
-#define KAZARI 87
-#define JPFN 88 //shifts to JPXON layer
-#define TOJPLOUT 89
-#define TOENL 90
-#define TOJPL 91
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- *
- * ,----------------------------------------------------.           ,--------------------------------------------------.
- * | En / 和  |      |   ^  |   %  |      |      |Selall|           | Undo |      |   $  |   @  |   LT |  UP  |   RT   |
- * |----------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab      |   Q  |   D  |   R  |   W  |   B  | Cut  |           | PgUP |   J  |   F  |   U  |   P  |  DN  |   \    |
- * |----------+------+------+------+------+------| Copy |           |      |------+------+------+------+------+--------|
- * |   /      |   A  |   S  |   H  |   T  |   G  |------|           |------|   Y  |   N  |   E  |   O  |   I  |   ,    |
- * |----------+------+------+------+------+------|Paste |           | PgDN |------+------+------+------+------+--------|
- * | Ctl+Shft |   Z  |   X  |   M  |   C  |   V  |      |           |      | .    |   L  |   K  |  '   |   ?  | tmux   |
- * `----------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LCtrl  | LGui |   Alt|   _  | Esc  |                                       |MouseL|MouseR|   -  |  ~   | Ctrl |
- *   `------------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |MidMs | Del  |       | VolUp| Mute |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |      |       | VolDn|        |      |
- *                                 | Space| Shift|------|       |------| Backsp |Enter |
- *                                 |      |      | Num  |       |  Esc |        |      |
- *                                 `--------------------'       `----------------------'
- *
- *
- * tmux prefix set to C-b
- *
- */
-// 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
-        M(TOJPLOUT),   KC_NO,   KC_EQL, LSFT(KC_5), KC_NO,   KC_NO,   LCTL(KC_A),
-        KC_TAB,        KC_Q,         KC_D,   KC_R,   KC_W,   KC_B,   M(CUTCOPY),
-        KC_SLSH,       KC_A,         KC_S,   KC_H,   KC_T,   KC_G,
-        M(CTLSHFT),    KC_Z,         KC_X,   KC_M,   KC_C,   KC_V,   LCTL(KC_V),
-        KC_RCTL,       KC_LGUI,      KC_LALT,JP_UNDS,KC_LCTL,
-                                              KC_BTN3,  KC_DEL,
-                                                              KC_NO,
-                                               KC_SPC,KC_LSFT,MO(NUM),
-        // right hand
-             LCTL(KC_Z), KC_NO, LSFT(KC_4),      JP_AT,   KC_LEFT,       KC_UP,   KC_RIGHT,
-             KC_PGUP,    KC_J,       KC_F,       KC_U,       KC_P,       KC_DOWN, LSFT(KC_3),
-                         KC_Y,       KC_N,       KC_E,       KC_O,       KC_I,    KC_COMMA,
-             KC_PGDN, KC_DOT,     KC_L,       KC_K,       LSFT(KC_7), KC_QUES,   LCTL(KC_B),
-                                  KC_BTN1,  KC_BTN2,KC_MINS,JP_TILD,          KC_RCTL,
-             KC_VOLU,        KC_MUTE,
-             KC_VOLD,
-             KC_SPC,KC_BSLS, KC_ENT
-    ),
-/* Keymap 1: Japanese
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | En / 和|      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | 　 nu |  ko  |   sa |  he  |  ke  |      |           |      |  fu  |  se  | tsu  | ku   |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   to |  shi |  ka  |  ki  |  su  |------|           |------|  a   |  ha  | te   | ta   |  u   |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   mu |  so  |  hi  |  chi |  me  |      |           |      |      |  ma  |  ho  |  i   |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 | shift|  fn  |------|       |------|      |kazari|
- *                                 |      |      | Num  |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- *
- *
- *
- */
-[JP] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, M(JPNU), M(JPKO), M(JPSA), M(JPHE), M(JPKE), KC_TRNS,
-       KC_TRNS, M(JPTO), M(JPSHI), M(JPKA), M(JPKI), M(JPSU),
-       KC_TRNS, M(JPMU), M(JPSO), M(JPHI), M(JPCHI), M(JPME), KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_NO,
-                                  M(SHIFT), M(JPFN), MO(NUM),
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  M(JPFU), M(JPSE), M(JPTSU), M(JPKU), KC_TRNS, KC_TRNS,
-                 KC_A, M(JPHA), M(JPTE), M(JPTA), KC_U, KC_TRNS,
-       KC_TRNS,  KC_TRNS, M(JPMA), M(JPHO), KC_I, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS,        KC_TRNS,
-             KC_TRNS,
-             KC_TRNS,KC_TRNS,M(KAZARI)
-),
-/* Keymap 2: Japanese with Fn
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | 　    |  xe  |      |      |  xke |      |           |      |  xya |      | xtsu |  xo  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |  xka |      |      |------|           |------|  xa  | xyo  |      |      |  xu  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |  xi  |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- *
- *
- *
- */
-[JPXON] = LAYOUT_ergodox(
-	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
-	   KC_NO, KC_NO,    M(JPXE),        KC_NO,    M(JPXKE),   KC_NO, KC_NO,
-       KC_NO, KC_NO,    KC_NO,          M(JPXKA),      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_TRNS, KC_TRNS,
-    // right hand
-	   KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,  M(JPXYA), KC_NO, M(JPXTU), M(JPXO), KC_NO, KC_NO,
-                 M(JPXA), M(JPXYO), M(JPXYU), KC_NO, M(JPXU), KC_NO,
-       KC_NO,  KC_NO,KC_NO, KC_NO, M(JPXI), KC_NO, KC_NO,
-                          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO, KC_NO,
-       KC_NO,
-       KC_NO, KC_NO, KC_NO
-),
-/* Keymap 3: Japanese with kazari
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | 　    |  go  |  za  |  be  |  ge  |      |           |      |  bu  |  ze  |  du  |  gu  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |  do  |  ji  |  ga  |  gi  |  zu  |------|           |------|      |  ba  |  de  |  da  |  vu  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |  zo  |  bi  |  di  |      |      |           |      |      |      |  bo  |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- *
- *
- *
- */
-[JPKAZARI] = LAYOUT_ergodox(
-	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
-	   KC_NO, KC_NO,    M(JPGO),        M(JPZA),    M(JPBE), M(JPGE), KC_NO,
-       KC_NO, M(JPDO),    M(JPJI),        M(JPGA),    M(JPGI), M(JPZU),
-       KC_NO, KC_NO,    M(JPZO),        M(JPBI),    M(JPDI), KC_NO, KC_NO,
-       KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_NO,
-                                           KC_NO, KC_NO,
-                                                    KC_NO,
-                                  M(SHIFT), KC_NO, KC_TRNS,
-    // right hand
-	   KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,  M(JPBU), M(JPZE), M(JPDU), M(JPGU), KC_NO, KC_NO,
-                 KC_NO, M(JPBA), M(JPDE), M(JPDA), M(JPVU), KC_NO,
-       KC_NO,  KC_NO, KC_NO, M(JPBO), KC_NO, KC_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
-),
-/* Keymap 4: Japanese with Toprow
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | 　    |  e   |  -   | re   |      |      |           |      |  ya  | ne   |  ru  | o    |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | ra   |  ri  | na   | no   | mi   |------|           |------| wa   |  yo  | yu   | ni   | nn   |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      | mo   | ro   |  wo  |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- *
- *
- *
- */
-[JPTOPROW] = LAYOUT_ergodox(
-	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO,   KC_NO, KC_NO,
-	   KC_NO, KC_NO,    KC_E,       KC_MINS,  M(JPRE), KC_NO, KC_NO,
-       KC_NO, M(JPRA),  M(JPRI),       M(JPNA),  M(JPNO), M(JPMI),
-       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_TRNS, KC_NO, KC_NO,
-    // right hand
-	   KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,  M(JPYA), M(JPNE), M(JPRU), KC_O, KC_NO, KC_NO,
-                 M(JPWA), M(JPYO), M(JPYU), M(JPNI), M(JPNN), KC_NO,
-       KC_NO,  KC_NO, M(JPMO), M(JPRO), M(JPWO), KC_NO, KC_NO,
-                          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO, KC_NO,
-       KC_NO,
-       KC_NO, KC_NO, M(KAZARI)
-),
-
-/* Keymap 5: Japanese with Toprow and Kazari
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | 　    |      |      |  pe  |      |      |           |      |  pu  |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |  pa  |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |  pi  |      |      |      |           |      |      |      |  po  |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- *
- *
- *
- */
-[JPTRKZ] = LAYOUT_ergodox(
-	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
-	   KC_NO, KC_NO,    KC_NO,        KC_NO,    M(JPPE),KC_NO,  KC_NO,
-       KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO,
-       KC_NO, KC_NO,    KC_NO,        M(JPPI),    KC_NO, KC_NO, KC_NO,
-       KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_NO,
-                                           KC_NO, KC_NO,
-                                                    KC_NO,
-                                  KC_TRNS, KC_NO, KC_NO,
-    // right hand
-	   KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,  M(JPPU), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-                 KC_NO, M(JPPA), KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,  KC_NO, KC_NO, M(JPPO), KC_NO, KC_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
-),
-/* Keymap 6: Number Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |   "  |   [  |   ]  |      |           |   |  |   %  |   7  |   8  |   9  |      |   F12  |
- * |--------+------+------+------+------+------|   ;  |           |      |------+------+------+------+------+--------|
- * |        |      |   /  |   +  |   {  |   }  |------|           |------|   !  |   4  |   5  |   6  |   0  |   ,    |
- * |--------+------+------+------+------+------|   :  |           |   &  |------+------+------+------+------+--------|
- * |        |      |   *  |   -  |   (  |   )  |      |           |      |   .  |   1  |   2  |   3  |   ?  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |   #  |                                       |   <  |   =  |   >  |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------| Back |  Ent |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// Numbers
-[NUM] = LAYOUT_ergodox(
-       // left hand
-	   KC_NO, KC_F1,      KC_F2,          KC_F3,      KC_F4,   KC_F5,   KC_NO,
-	   KC_NO, KC_NO,    KC_NO,        JP_DQUO,   KC_RBRC,   KC_BSPC, KC_SCLN,
-       KC_NO, KC_NO,    KC_SLSH,        JP_PLUS,    LSFT(KC_RBRC),   JP_RCBR,
-       KC_NO, KC_NO,    JP_ASTR,        KC_MINS,    LSFT(KC_8), LSFT(KC_9), JP_COLN,
-       KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_HASH,
-                                           KC_NO, KC_NO,
-                                                    KC_NO,
-                                  KC_NO, KC_NO, KC_TRNS,
-       // right hand
-       KC_NO, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       LSFT(JP_YEN), KC_PERC,   KC_7,   KC_8,    KC_9,    KC_NO, KC_F12,
-                KC_EXLM, KC_4,   KC_5,    KC_6,    KC_0, KC_COMM,
-       LSFT(KC_6), KC_DOT, KC_1,   KC_2,    KC_3,    KC_QUES, KC_NO,
-                         KC_LT,JP_EQL,  KC_GT,    KC_NO,  KC_NO,
-       KC_NO, KC_NO,
-       KC_NO,
-       KC_SPC, KC_BSLS, KC_DOT
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-
-  // MACRO only works in this function
-	switch(id) {
-		case 0:
-			if (record->event.pressed) {
-				register_code(KC_RSFT);
-			} else {
-				unregister_code(KC_RSFT);
-			}
-			break;
-		case CTLSHFT:
-			if (record->event.pressed) {
-				return MACRO( D(LSFT), D(LCTL), END);
-			} else {
-				return MACRO( U(LSFT), U(LCTL), END);
-			}
-			break;
-		case CUTCOPY:
-			if (record->event.pressed) {
-				start = timer_read();
-			} else {
-				if (timer_elapsed(start) > 150) {
-					return MACRO( D(LCTL), T(X), U(LCTL), END);
-				} else {
-					return MACRO( D(LCTL), T(C), U(LCTL), END);
-				}
-			}
-			break;
-
-		// kana macros start here
-
-		case JPVU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(V), T(U), END);
-			}
-			break;
-		case JPNU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(N), T(U), END);
-			}
-			break;
-		case JPKO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(K), T(O), END);
-			}
-			break;
-		case JPSA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(S), T(A), END);
-			}
-			break;
-		case JPKE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(K), T(E), END);
-			}
-			break;
-		case JPHE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(H), T(E), END);
-			}
-			break;
-		case JPSHI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(S), T(I), END);
-			}
-			break;
-			case JPKA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(K), T(A), END);
-			}
-			break;
-		case JPKI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(K), T(I), END);
-			}
-			break;
-		case JPSU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(S), T(U), END);
-			}
-			break;
-		case JPSO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(S), T(O), END);
-			}
-			break;
-		case JPHI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(H), T(I), END);
-			}
-			break;
-		case JPCHI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(T), T(I), END);
-			}
-			break;
-		case JPFU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(F), T(U), END);
-			}
-			break;
-		case JPSE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(S), T(E), END);
-			}
-			break;
-		case JPTSU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(T), T(U), END);
-			}
-			break;
-		case JPKU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(K), T(U), END);
-			}
-			break;
-		case JPTE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(T), T(E), END);
-			}
-			break;
-		case JPTA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(T), T(A), END);
-			}
-			break;
-		case JPTO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(T), T(O), END);
-			}
-			break;
-		case JPHA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(H), T(A), END);
-			}
-			break;
-		case JPHO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(H), T(O), END);
-			}
-			break;
-		case JPXKE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(K), T(E), END);
-			}
-			break;
-		case JPXU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(U), END);
-			}
-			break;
-		case JPXKA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(K), T(A), END);
-			}
-			break;
-		case JPXA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(A), END);
-			}
-			break;
-		case JPXO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(O), END);
-			}
-			break;
-		case JPGO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(G), T(O), END);
-			}
-			break;
-		case JPZA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(Z), T(A), END);
-			}
-			break;
-		case JPGE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(G), T(E), END);
-			}
-			break;
-		case JPBE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(B), T(E), END);
-			}
-			break;
-		case JPYU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(Y), T(U), END);
-			}
-			break;
-		case JPJI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(J), T(I), END);
-			}
-			break;
-		case JPGA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(G), T(A), END);
-			}
-			break;
-		case JPGI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(G), T(I), END);
-			}
-			break;
-		case JPZU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(Z), T(U), END);
-			}
-			break;
-		case JPZO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(Z), T(O), END);
-			}
-			break;
-		case JPBI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(B), T(I), END);
-			}
-			break;
-		case JPDI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(D), T(I), END);
-			}
-			break;
-		case JPZE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(Z), T(E), END);
-			}
-			break;
-		case JPDU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(D), T(U), END);
-			}
-			break;
-		case JPGU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(G), T(U), END);
-			}
-			break;
-		case JPYA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(Y), T(A), END);
-			}
-			break;
-		case JPYO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(Y), T(O), END);
-			}
-			break;
-		case JPDE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(D), T(E), END);
-			}
-			break;
-		case JPDA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(D), T(A), END);
-			}
-			break;
-		case JPDO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(D), T(O), END);
-			}
-			break;
-		case JPBA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(B), T(A), END);
-			}
-			break;
-		case JPBO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(B), T(O), END);
-			}
-			break;
-		case JPRI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(R), T(I), END);
-			}
-			break;
-		case JPRE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(R), T(E), END);
-			}
-			break;
-		case JPRA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(R), T(A), END);
-			}
-			break;
-		case JPNA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(N), T(A), END);
-			}
-			break;
-		case JPNO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(N), T(O), END);
-			}
-			break;
-		case JPMI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(M), T(I), END);
-			}
-			break;
-		case JPMU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(M), T(U), END);
-			}
-			break;
-		case JPME:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(M), T(E), END);
-			}
-			break;
-		case JPNE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(N), T(E), END);
-			}
-			break;
-		case JPMA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(M), T(A), END);
-			}
-			break;
-		case JPXTU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(T), T(U), END);
-			}
-			break;
-		case JPWA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(W), T(A), END);
-			}
-			break;
-		case JPRU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(R), T(U), END);
-			}
-			break;
-		case JPWO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(W), T(O), END);
-			}
-			break;
-		case JPNI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(N), T(I), END);
-			}
-			break;
-		case JPNN:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(N), T(N), END);
-			}
-			break;
-		case JPMO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(M), T(O), END);
-			}
-			break;
-		case JPRO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(R), T(O), END);
-			}
-			break;
-		case JPXE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(E), END);
-			}
-			break;
-		case JPXI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(I), END);
-			}
-			break;
-		case JPXYU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(Y), T(U), END);
-			}
-			break;
-		case JPXYA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(Y), T(A), END);
-			}
-			break;
-		case JPXYO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(X), T(Y), T(O), END);
-			}
-			break;
-		case JPPE:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(P), T(E), END);
-			}
-			break;
-		case JPPU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(P), T(U), END);
-			}
-			break;
-		case JPPI:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(P), T(I), END);
-			}
-			break;
-		case JPPA:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(P), T(A), END);
-			}
-			break;
-		case JPPO:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(P), T(O), END);
-			}
-			break;
-		case JPBU:
-			if (record->event.pressed) {
-				return MACRO( I(1), T(B), T(U), END);
-			}
-			break;
-
-			// kana macros end here
-
-			break;
-		case SHIFT:
-		if (record->event.pressed) {
-			start = timer_read();
-			if (layer_state == (1<<JPKAZARI)) {
-				layer_state = (1<<JPTOPROW)| (1<<JPTRKZ);
-			} else {
-				layer_state = (1<<JPTOPROW);
-			}
-      } else {
-			layer_state = (0<<JPTOPROW);
-			clear_keyboard_but_mods();
-			if (timer_elapsed(start) < 100) {
-				return MACRO( I(1), T(SPC), END);
-			}
-      }
-      break;
-		case KAZARI:
-		if (record->event.pressed) {
-			start = timer_read();
-			if (layer_state == (1<<JPTOPROW)) {
-				layer_state = (1<<JPKAZARI)| (1<<JPTRKZ);
-			} else {
-				layer_state = (1<<JPKAZARI);
-			}
-			break;
-      } else {
-		  	layer_state = (0<<JPKAZARI);
-			layer_state = (0<<JPTRKZ);
-		if (timer_elapsed(start) < 100) {
-          return MACRO( T(ENTER), END);
-        }
-      }
-      break;
-		case JPFN:
-			if (record->event.pressed) {
-				start = timer_read();
-				layer_state = (1<<JPXON);
-			} else {
-				layer_state = (0<<JPXON);
-				if (timer_elapsed(start) < 100) {
-					return MACRO( T(F7), END);
-				}
-			}
-      break;
-		case TOJPLOUT:
-			if (record->event.pressed) {
-				if (default_layer_state == (1<<JP)) {
-					default_layer_state = (0<<JP);
-				} else {
-					default_layer_state = (1<<JP);
-				}
-				return MACRO( T(ZKHK), END);
-			}
-			break;
-/*
-		// TOJPL and TOENL switch keyboard language.
-		// The Ctrl+[] commands here load the appropriate ibus-anthy input engine via a WM shortcut
-		// The first key pressed in the new engine is missed, thus the space key
-		// TOJPLOUT works in the same way but is used for switching engines on external systems.
-		case TOJPL:
-			if (record->event.pressed) {
-				default_layer_state = (1<<JP);
-				return MACRO( D(LCTL), T(END), U(LCTL), END);
-				//return MACRO( D(LCTL), T(END), U(LCTL), W(250), W(250), W(250), T(SPACE), END);
-			}
-			break;
-		case TOENL:
-			if (record->event.pressed) {
-				default_layer_state = (1<<BASE);
-				return MACRO( D(LCTL), T(HOME), U(LCTL), END);
-			//return MACRO( D(LCTL), T(HOME), U(LCTL), W(250), W(250), W(250), T(SPACE), END);
-			}
-			break;
-*/
-		}
-    return MACRO_NONE;
-};
-
-// 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);
-   uint8_t deflayer = get_highest_layer(default_layer_state);
-
-	ergodox_board_led_off();
-	ergodox_right_led_1_off();
-	ergodox_right_led_2_off();
-	ergodox_right_led_3_off();
-
-
-	switch (layer) {
-		case 0:
-			//none
-			break;
-//		case 1:
-//			ergodox_right_led_2_on();
-//			break;
-		case 6:
-			ergodox_right_led_3_on();
-			break;
-    }
-    switch (deflayer) {
-		 case 0:
-		 ergodox_right_led_1_off();
-		 break;
-		 case 1:
-		 ergodox_right_led_1_on();
-		 break;
-	}
-};
diff --git a/layouts/community/ergodox/ishigoya-jp/readme.md b/layouts/community/ergodox/ishigoya-jp/readme.md
deleted file mode 100644
index 839fe978d1..0000000000
--- a/layouts/community/ergodox/ishigoya-jp/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-This is a dual English-Japanese keymap that utilises a thumb-shift system for Japanese input. You can read more about this layout on my blog [here](https://ishigoya.com). 
-
-### Some Editing Necessary
-The system I created this on is a Chromebook, and uses a Japanese keymap, so some of the key mappings may not be the same as those on your system. In particular, the Escape key on layer 0 is mapped to KC_LCTL.
-
-### Layouts
-------
-#### English layer - layer 0
-The English layout is a modified Workman layout, and is pictured below:
-
-![English layout](https://i.imgur.com/X1j2Mya.png)
-
-Some of the punctuation keys have been moved to a separate number/symbol layer.
-
-#### Number / Symbol layer - layer 6
-
-The Number / Symbol layer is reachable through a ACTION_LAYER_MOMENTARY function. The blue LED is illuminated when this layer is active. It is accessible from the English or Japanese layers.
-
-![Number layout](https://i.imgur.com/oNSNXPU.png)
-
-#### Japanese layers - layers 1-5
-
-There are 5 layers involved in Japanese input. The TOJPLOUT macro is mapped to the En / 和 button, and switches default layer between layer 0 (English) and 1 (main Japanese layer). When layer 1 is the default layer, the red LED is on. It also outputs the ZKHK button to change the input method language.
-
-On keypress, strings of romaji characters are output by the keyboard using macros, and these simulate the input of individual keys on a latin keyboard.
-
-![Japanese layout](https://i.imgur.com/qMvt92j.png)
-
-Layer 1 is the JP layer. Keys on this layer correspond to singleton keys, or keys on the bottom row where a key is shared. For example, pressing the "ふ や" key outputs `ふ` (or "fu").
-
-Layer 2 is the JPXON layer, and is active while holding the Fn key. This prints keys that are prefaced by "x" when writing in romaji. For example, pressing the "ふ や" key while holding the Fn key outputs `ゃ` (or "xya").
-
-Layer 3 is the JPKAZARI layer, and is active while holding the 飾り key. This provides letters with dakuten. For example, pressing the "ふ や" key while holding the 飾り key outputs `ぶ` (or "bu").
-
-Layer 4 is the JPTOPROW layer, and is active while holding the シフト key. Keys on this line correspond to top row keys on shared keys in the image. For example, pressing the "ふ や" key while holding the シフト key outputs `や` (or "ya").
-
-Layer 5 is the JPTRKZ layer, and is active while holding both the シフト key and the 飾り key. This layer contains handakuten keys. For example, pressing the "ふ や" while holding both the シフト key and the 飾り key outputs `ぷ` (or "pu").
-
-I've also separated out the #define sections and the macros required for kana for easy copying, in case anyone else should wish to make a kana-based layout.
-
-When tapped, the シフト key acts as a space key, and the 飾り key acts as a return key. This allows them to function as 変換 and 無変換, respectively, in many IMEs.
-
-Furthermore the Fn key, when tapped, acts as an F7 key, providing easy switching to katakana in many IMEs.
-
-### Other features
-The cut/copy button gives copy functionality on a short press, and cut functionality on a long press.
-
-The tmux prefix button outputs Control-B.
-
-The Control & Shift key acts as holding the control and shift keys at the same time.
-
-SelAll outputs Control-A.
-
-Undo outputs Control-Z.
diff --git a/layouts/community/ergodox/italian/keymap.c b/layouts/community/ergodox/italian/keymap.c
deleted file mode 100644
index feac635092..0000000000
--- a/layouts/community/ergodox/italian/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define 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
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   \    |   1  |   2  |   3  |   4  |   5  | ESC  |           |  T2  |   6  |   7  |   8  |   9  |   0  |   '    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  | TT1  |           |  TT1 |   Y  |   U  |   I  |   O  |   P  |   è    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Caps   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ò  |   à    |
- * |--------+------+------+------+------+------| Alt  |           | Alt  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   ù  |-/RShift|
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |</Win |   +  |   -  |   *  |//Ctr |                                       |ì/RAlt| Left | Down |  Up  | Right  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Ins  | LGui |       | Win  | Ctrl |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 |Backsp| Del  |------|       |------|  Enter |Space |
- *                                 |ace   |      | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_GRV,                      KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
-        KC_TAB,                      KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TT(SYMB),
-        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_LALT,
-        MT(MOD_LGUI,KC_NUBS),        KC_PPLS,      KC_PMNS,KC_PAST,MT(MOD_LCTL,KC_PSLS),
-                                                           KC_INS,  KC_LGUI,
-                                                                    KC_HOME,
-                                                   KC_BSPC,KC_DEL,  KC_END,
-        // right hand
-             TG(MDIA),    KC_6,   KC_7,                 KC_8,   KC_9,   KC_0,      KC_MINS,
-             TT(SYMB),    KC_Y,   KC_U,                 KC_I,   KC_O,   KC_P,      KC_LBRC,
-                          KC_H,   KC_J,                 KC_K,   KC_L,   KC_SCLN,   KC_QUOT,
-             KC_LALT,     KC_N,   KC_M,                 KC_COMM,KC_DOT, KC_BSLASH, MT(MOD_RSFT,KC_SLSH),
-                                  MT(MOD_RALT,KC_EQL), KC_LEFT,KC_DOWN,KC_UP,     KC_RIGHT,
-             KC_LGUI,     KC_RCTL,
-             KC_PGUP,
-             KC_PGDN,     KC_ENT, KC_SPC
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |      |   7  |   8  |   9  |      |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   [  |   ]  |   &  |------|           |------|      |   4  |   5  |   6  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   (  |   )  |      |      |           |      |      |   1  |   2  |   3  |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |   .  |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |  0   |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS, KC_EXLM,                RALT(KC_SCLN), RALT(KC_LCBR), RALT(KC_RCBR), KC_TILD,  KC_TRNS,
-       KC_TRNS, RALT(KC_QUOT),          KC_DLR,        RALT(KC_LBRC), RALT(KC_RBRC), KC_CIRC,
-       KC_TRNS, KC_PERC,                LSFT(KC_EQL),  LSFT(KC_8),    LSFT(KC_9),    KC_TRNS,  KC_TRNS,
-       KC_TRNS, KC_TRNS,                KC_TRNS,       KC_TRNS,       KC_TRNS,
-		              KC_TRNS,          KC_TRNS,
-                                                KC_TRNS,
-                              KC_TRNS, KC_TRNS, KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_TRNS, KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_TRNS, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_0
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      | Lclk | Rclk |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |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_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_BTN1, KC_BTN2, 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
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-        case 1:
-        if (record->event.pressed) { // For resetting EEPROM
-          eeconfig_init();
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-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/layouts/community/ergodox/italian/readme.md b/layouts/community/ergodox/italian/readme.md
deleted file mode 100644
index 215c24a5af..0000000000
--- a/layouts/community/ergodox/italian/readme.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# ErgoDox Italian layout
-
-## Layer 0
-```
- 
- ,--------------------------------------------------.           ,--------------------------------------------------.
- |   \    |   1  |   2  |   3  |   4  |   5  | ESC  |           |  T2  |   6  |   7  |   8  |   9  |   0  |   '    |
- |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- | Tab    |   Q  |   W  |   E  |   R  |   T  | TT1  |           |  TT1 |   Y  |   U  |   I  |   O  |   P  |   è    |
- |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- | Caps   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ò  |   à    |
- |--------+------+------+------+------+------| Alt  |           | Alt  |------+------+------+------+------+--------|
- | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   ù  |-/RShift|
- `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-   |</Win |   +  |   -  |   *  |//Ctr |                                       |ì/RAlt| Left | Down |  Up  | Right  | ~L1  |
-   `----------------------------------'                                       `----------------------------------'
-                                        ,-------------.       ,-------------.
-                                        | Ins  | LGui |       | Win  | Ctrl |
-                                 ,------|------|------|       |------+--------+------.
-                                 |      |      | Home |       | PgUp |        |      |
-                                 |Backsp| Del  |------|       |------|  Enter |Space |
-                                 |ace   |      | End  |       | PgDn |        |      |
-                                 `--------------------'       `----------------------'
-```
-
-## Layer 1
-```
-
- ,--------------------------------------------------.           ,--------------------------------------------------.
- |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- |        |   !  |   @  |   {  |   }  |   |  |      |           |      |      |   7  |   8  |   9  |      |   F12  |
- |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- |        |   #  |   $  |   [  |   ]  |   &  |------|           |------|      |   4  |   5  |   6  |      |        |
- |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- |        |   %  |   ^  |   (  |   )  |      |      |           |      |      |   1  |   2  |   3  |      |        |
- `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-   |      |      |      |      |      |                                       |   .  |      |      |      |      |
-   `----------------------------------'                                       `----------------------------------'
-                                        ,-------------.       ,-------------.
-                                        |      |      |       |      |      |
-                                 ,------|------|------|       |------+------+------.
-                                 |      |      |      |       |      |      |      |
-                                 |      |      |------|       |------|      |  0   |
-                                 |      |      |      |       |      |      |      |
-                                 `--------------------'       `--------------------'
-```
-
-## Layer 2
-```
-
- ,--------------------------------------------------.           ,--------------------------------------------------.
- |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- |        |      |      | MsUp |      |      |      |           |      | Lclk | Rclk |      |      |      |        |
- |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-   |      |      |      |      |      |                                       |VolUp |VolDn | Mute |      |      |
-   `----------------------------------'                                       `----------------------------------'
-                                        ,-------------.       ,-------------.
-                                        |      |      |       |      |      |
-                                 ,------|------|------|       |------+------+------.
-                                 |      |      |      |       |      |      |Brwser|
-                                 |      |      |------|       |------|      |Back  |
-                                 |      |      |      |       |      |      |      |
-                                 `--------------------'       `--------------------' 
-```
-
-
diff --git a/layouts/community/ergodox/josh/keymap.c b/layouts/community/ergodox/josh/keymap.c
deleted file mode 100644
index d98b98b236..0000000000
--- a/layouts/community/ergodox/josh/keymap.c
+++ /dev/null
@@ -1,210 +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
-
-//macros
-#define CTL_SFT_T 100 // open type
-#define CTL_SFT_G 101 // find references
-#define CTL_ALT_H 102 // open call hierarchy
-#define CTL_SFT_R 103 // open resource
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | ESC  |           |M100/3|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |TAB /Alt|   Q  |   W  |   E  |   R  |   T  | Meh  |           | Meh  |   Y  |   U  |   I  |   O  |   P  |\ / ALT |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | LCTL   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / CTL |
- * |--------+------+------+------+------+------| ~L1  |           | ~L1  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | WIN  |  `   | M 102| M 101|AltShf|                                       |AltShf| Left | Down |  Up  | Right  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LALT |       | Alt  |  CAPS  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------| Delete |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        LT(MDIA, KC_EQL),KC_1,        KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
-        ALT_T(KC_TAB),  KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   ALL_T(KC_NO),
-        KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   MO(SYMB),
-        KC_LGUI,        KC_GRV, M(CTL_ALT_H),M(CTL_SFT_G),LALT(KC_LSFT),
-                                              CTL_T(KC_APP),  KC_LALT,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             LT(M(CTL_SFT_T),
-                M(CTL_SFT_R)),KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   LT(MDIA, KC_MINS),
-             MEH_T(KC_NO),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,                 KC_BSLS,
-                              KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN), CTL_T(KC_QUOT),
-             MO(SYMB),        KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,
-                        LALT(KC_LSFT),KC_LEFT,KC_DOWN,KC_UP,            KC_RIGHT,
-             KC_LALT,        KC_CAPS,
-             KC_PGUP,
-             KC_PGDN,KC_DEL, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  | F11  |           | F12  |  F6  |  F7  |  F8  |  F9  |  F10 |  CALC  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Left | Down |  Up  | Right|      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_F12,  KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_CALC,
-       KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                KC_LEFT, KC_DOWN,KC_UP,   KC_RIGHT,KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |QK_BOOT |           |QK_BOOT |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | 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, QK_BOOT,
-       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
-       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_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
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-    switch(id) {
-        case 0:
-            if (record->event.pressed) {
-                SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-            }
-            break;
-        case CTL_SFT_T:
-            if (record->event.pressed) {
-                return MACRO(D(LCTL), D(LSFT), T(T), END);
-            }
-            return MACRO(U(LCTL), U(LSFT), END);
-            break;
-        case CTL_SFT_G:
-            if (record->event.pressed) {
-                return MACRO(D(LCTL), D(LSFT), T(G), END);
-            }
-            return MACRO(U(LCTL), U(LSFT), END);
-            break;
-        case CTL_ALT_H:
-            if (record->event.pressed) {
-                return MACRO(D(LCTL), D(LALT), T(H), END);
-            }
-            return MACRO(U(LCTL), U(LALT), END);
-            break;
-        case CTL_SFT_R:
-            if (record->event.pressed) {
-                return MACRO(D(LCTL), D(LSFT), T(R), END);
-            }
-            return MACRO(U(LCTL), U(LSFT), END);
-            break;
-    }
-    return MACRO_NONE;
-};
-
-// 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/layouts/community/ergodox/josh/readme.md b/layouts/community/ergodox/josh/readme.md
deleted file mode 100644
index cee19d47ea..0000000000
--- a/layouts/community/ergodox/josh/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Layout is based on the default layout that comes on the ergodox infinity. Focused mostly on making ctl and alt easy to reach. I spend most my day working in Eclipse which has just so many 3 key shortcuts.
-
-* Removed numpad keys from symbol layer (I don't use them)
-* Added arrow keys under h, j, k, l on symbol layer. vi movement keys!
-* Added a few macros for eclipse hotkeys that I used all the time
-* Added calc button on symbol layer
-* tap vs hold on tab and \. Gives alt, ctl and shift on both sides of the keyboard
-
diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c
deleted file mode 100644
index d5e571b06a..0000000000
--- a/layouts/community/ergodox/kristian/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_swiss_fr.h"
-#include "keymap_french.h"
-#include "keymap_german.h"
-#include "keymap_swiss_de.h"
-#include "keymap_nordic.h"
-#include "keymap_norwegian.h"
-#include "keymap_spanish.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[0] = LAYOUT_ergodox(NO_LABK,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_QUOT),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPS,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_ARNG,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSTR),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_QUOT),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_QUOT,KC_LALT,KC_LGUI,KC_ENTER),
-
-[1] = LAYOUT_ergodox(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_TRANSPARENT,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_7,KC_8,KC_9,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_4,KC_5,KC_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_0,KC_1,KC_2,KC_3,NO_LBRC,NO_RBRC,KC_LSHIFT,KC_COMMA,KC_DOT,LSFT(NO_LBRC),LSFT(NO_RBRC),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LALT,KC_LGUI,KC_ENTER),
-
-[2] = LAYOUT_ergodox(KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LALT,KC_LGUI,KC_MS_BTN1,KC_MS_BTN2,KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_SPACE,KC_LGUI,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_ESCAPE,KC_MS_WH_UP,KC_MS_WH_DOWN,KC_MS_ACCEL0,KC_MS_ACCEL1),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case 5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        case 6:
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        case 7:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-    }
-
-};
diff --git a/layouts/community/ergodox/osx_de/keymap.c b/layouts/community/ergodox/osx_de/keymap.c
deleted file mode 100644
index cbbfc42280..0000000000
--- a/layouts/community/ergodox/osx_de/keymap.c
+++ /dev/null
@@ -1,359 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_german_mac_iso.h"
-
-#define BASE 0
-#define SYMB 1
-#define MDIA 2
-#define SMLY 3
-#define NUMB 4
-#define EGOS 5
-
-#define M_CTRL_CMDV 0
-#define M_CTRL_CMDC 1
-#define M_MEH_SH_ACUT 2
-#define M_LGUI_SHFT 3
-#define M_CTL_SFT_HASH 4
-#define M_DE_CIRC_CTRLCMD 5
-#define M_DE_PLUS_CTRLALT 6
-#define SM_SMILE 7
-#define SM_SMIRK 8
-#define SM_CRY 9
-#define SM_SAD 10
-#define SM_HEART 11
-#define SM_LAUGH 12
-#define SM_KISS 13
-#define SM_FROWN 14
-#define M_TOGGLE_5 15
-
-//Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE]=LAYOUT_ergodox(
-//left half
-    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(M_CTL_SFT_HASH),
-    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,
-    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,
-    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,
-                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), KC_UP, KC_DOWN,
-                                              M(M_MEH_SH_ACUT), TG(MDIA),
-                                                     KC_HOME,
-                                       KC_BSPC, KC_DEL, LT(SMLY,KC_END),
-    //right half
-    M(M_CTL_SFT_HASH), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,
-    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,
-           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),
-    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,
-                         KC_LEFT, KC_RIGHT, LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),
-    TG(NUMB), ALL_T(DE_ACUT),
-    KC_PGUP,
-    KC_PGDN, KC_ENT, KC_SPC),
-[SYMB]=LAYOUT_ergodox(
-//left half
-    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
-    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS,
-    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,
-    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,
-                                       KC_TRNS, KC_DEL, KC_TRNS,
-    //right half
-    M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_LABK, DE_RABK, DE_EXLM,
-           DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), DE_HASH,
-    KC_TRNS, DE_PIPE, DE_TILD, DE_CIRC, KC_UP, DE_MINS, LSFT(KC_4),
-                         DE_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
-    KC_F13, KC_F12,
-    KC_F14,
-    KC_F15, KC_TRNS, KC_TRNS),
-[MDIA]=LAYOUT_ergodox(
-//left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,
-                                       KC_TRNS, KC_TRNS, KC_TRNS,
-    //right half
-    KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-           KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,
-    KC_TRNS, KC_TRNS,
-    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_WBAK),
-[SMLY]=LAYOUT_ergodox(
-//left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,
-                                       KC_TRNS, KC_TRNS, KC_TRNS,
-    //right half
-    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,
-           M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,
-    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS),
-[NUMB]=LAYOUT_ergodox(
-//left half
-    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_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,
-    //right half
-    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-    KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12,
-           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_MINS,
-    KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS,
-                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,
-    KC_TRNS, KC_TRNS,
-    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS),
-[EGOS]=LAYOUT_ergodox(
-//left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                  KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_F1, KC_F2,
-                                                     KC_F3,
-                                       KC_SPC, KC_LCTL, KC_F4,
-    //right half
-    M(M_TOGGLE_5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,
-    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-static uint16_t start;
-switch(id) {
-case M_TOGGLE_5:
-//Macro: M_TOGGLE_5//-----------------------
- if (record->event.pressed){
-           layer_state ^= (1<<5);
-           layer_state &= (1<<5);
-        }
-
-break;
-case M_CTRL_CMDC:
-//Macro: M_CTRL_CMDC//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),END);
-			} else {
-				return MACRO(U(LCTRL),D(LGUI),T(C),U(LGUI),END);
-			}
-		}
-
-break;
-case M_DE_PLUS_CTRLALT:
-//Macro: M_DE_PLUS_CTRLALT//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),D(LALT),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),U(LALT),END);
-			} else {
-				return MACRO(U(LCTRL),U(LALT),T(RBRC),END);
-			}
-		}
-
-break;
-case SM_KISS:
-//Macro: SM_KISS//-----------------------
-if (record->event.pressed) {
-			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(RBRC),U(LSFT),END);
-		}
-
-break;
-case SM_FROWN:
-//Macro: SM_FROWN//-----------------------
-if (record->event.pressed) {
-			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LALT),T(8),U(LALT),END);
-		}
-
-break;
-case SM_CRY:
-//Macro: SM_CRY//-----------------------
-if (record->event.pressed) {
-			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END);
-		}
-
-break;
-case SM_SMILE:
-//Macro: SM_SMILE//-----------------------
-if (record->event.pressed) {
-			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END);
-		}
-
-break;
-case SM_SMIRK:
-//Macro: SM_SMIRK//-----------------------
-if (record->event.pressed) {
-			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END);
-		}
-
-break;
-case M_LGUI_SHFT:
-//Macro: M_LGUI_SHFT//-----------------------
-if (record->event.pressed){
-			return MACRO(D(LGUI),D(LSFT),END);
-		}else{
-			return MACRO(U(LGUI),U(LSFT),END);
-		}
-
-break;
-case SM_HEART:
-//Macro: SM_HEART//-----------------------
-if (record->event.pressed) {
-			return MACRO(T(GRV),T(3),END);
-		}
-
-break;
-case SM_LAUGH:
-//Macro: SM_LAUGH//-----------------------
-if (record->event.pressed) {
-			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(D),U(LSFT),END);
-		}
-
-break;
-case M_CTL_SFT_HASH:
-//Macro: M_CTL_SFT_HASH//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),D(LSFT),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),U(LSFT),END);
-			} else {
-				return MACRO(U(LCTRL),U(LSFT),T(BSLS),END);
-			}
-		}
-
-break;
-case SM_SAD:
-//Macro: SM_SAD//-----------------------
-if (record->event.pressed) {
-			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END);
-		}
-
-break;
-case M_DE_CIRC_CTRLCMD:
-//Macro: M_DE_CIRC_CTRLCMD//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),D(LGUI),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),U(LGUI),END);
-			} else {
-				return MACRO(U(LCTRL),U(LGUI),T(NUBS),END);
-			}
-		}
-
-break;
-case M_CTRL_CMDV:
-//Macro: M_CTRL_CMDV//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),END);
-			} else {
-				return MACRO(U(LCTRL),D(LGUI),T(V),U(LGUI),END);
-			}
-		}
-
-break;
-case M_MEH_SH_ACUT:
-//Macro: M_MEH_SH_ACUT//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),D(LSFT),D(LALT),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),U(LSFT),U(LALT),END);
-			} else {
-				return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END);
-			}
-		}
-
-break;
-}
-return MACRO_NONE;
-};
-
-// 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 SYMB:
-        ergodox_right_led_1_on();
-
-
-        break;
-    case MDIA:
-
-        ergodox_right_led_2_on();
-
-        break;
-    case SMLY:
-
-
-        ergodox_right_led_3_on();
-        break;
-    case NUMB:
-        ergodox_right_led_1_on();
-
-        ergodox_right_led_3_on();
-        break;
-    case EGOS:
-        ergodox_right_led_1_on();
-        ergodox_right_led_2_on();
-        ergodox_right_led_3_on();
-        break;
-default:
-// none
-break;
-}
-
-};
diff --git a/layouts/community/ergodox/osx_de/osx_de_highres.png.md b/layouts/community/ergodox/osx_de/osx_de_highres.png.md
deleted file mode 100644
index ee3dc53505..0000000000
--- a/layouts/community/ergodox/osx_de/osx_de_highres.png.md
+++ /dev/null
@@ -1 +0,0 @@
-https://i.imgur.com/kvSzkXK.png
diff --git a/layouts/community/ergodox/osx_de/readme.md b/layouts/community/ergodox/osx_de/readme.md
deleted file mode 100644
index e4ccee3aa6..0000000000
--- a/layouts/community/ergodox/osx_de/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Ergodox EZ für OSX 
-
-Dies ist nur ein kleiner Tweak der bestehenden firmware für das ErgoDox-EZ-Keyboard. Leider passte das layout nicht wirklich für OSX, deswegen habe ich einige Anpassungen gemacht. Dabei wurden folgende features umgesetzt:
-
-- Die Umlaute sollten an einigermassen sinnvollen Plätzen liegen
-- der Umstieg sollte dadurch erleichtert werden, dass einige Tasten an ihren "normalen" Platz zurückgewandert sind. Z.B. ESC, Tab,...
-- die Leertaste ist jetzt auf der rechten seite, neben Enter. Dafür hat der linke Daumen nun Backspace und Delete. 
-- die CMD- und Alt-Tasten sind in der Mitte einfach erreichbar.
-- es gibt eine neue Layer die für Spiele genutzt werden kann (egosooter wie Counter Strike). Dort liegen die wichtigsten Tasten auf der linken Seite, im Daumenblock z.B. space und ctrl sowie die F-Tasten 1-4. Diese Layer ist über die Symbollayer erreichbar.
-- Die Symbollayer wurde dahingehend angepasst, dass die klammern, etc nun auf beiden hälften der Tastatur zu finden sind
-- der Zehnerblock wurde in eine eigene Layer umgezogen
-- die Meh und Hyper-Tasten wurden in die Daumenblöcke umgezogen
-
-# Erstellt Mit Dem ErgodoxLayoutGenerator
-
-Der ErgodoxLayoutGenerator ist ein kleines Werkzeug, welches die Erstellung und Pflege der eigenen Keymaps erleichtern soll. Es ist in java geschrieben und kann [hier](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases) heruntergeladen werden. Damit das Tool funktioniert sollte das offizielle Oracle JDK in aktueller Version installiert sein.
-
-
-
-------------------------------   
-
-# ErgoDox EZ for OSX
-
-This is  only a little tweak of the existing default layout for the ErgoDox keyboard. Unfortunately the default layout did not work well with german OSX, so I created som adjustments. These were the features added and changed:
-
-- the umlaut-keys should be at their useful place more or less
-- the switching should be made more easy so some other keys (like tab, esc) were moved to their default place
-- the space key can now be used with both hands
-- the CMD- and ALT-Keys moved to the middle, can be reached more easily.
-- there is a new layer for using the cursor-keys, placed like on the default keyboard. This makes them useable for games also
-- the symbollayer now has only symbols
-- the number block was moved to a special layer
-- meh and hyper went down to the thumb block
-
-# Created Using the ErgodoxLayoutGenerator
-
-The ErgodoxLayoutGenerator (ELG) is a little tool, which makes the creation and maintenance of keycaps a lot easier. It was written in Java and can be downloaded  [here](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases). To use the tool, you need to have a current version of Oracles JDK installed.
-
-The documentation of the ELG can be viewed [here](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/).
-
diff --git a/layouts/community/ergodox/osx_de_experimental/keymap.c b/layouts/community/ergodox/osx_de_experimental/keymap.c
deleted file mode 100644
index faf238726f..0000000000
--- a/layouts/community/ergodox/osx_de_experimental/keymap.c
+++ /dev/null
@@ -1,592 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_neo2.h"
-#include "keymap_uk.h"
-#include "keymap_colemak.h"
-#include "keymap_nordic.h"
-#include "keymap_dvorak.h"
-#include "keymap_german.h"
-#include "keymap_norwegian.h"
-#include "keymap_swiss_fr.h"
-#include "keymap_german_mac_iso.h"
-#include "keymap_spanish.h"
-#include "keymap_bepo.h"
-
-
-/**
-* This layout was generated using the ErgodoxLayoutGenerator (ELG). You can download it from https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases
-* documentation about it can be found here https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/
-* Thanks to the team of Erez Zukerman for building the great Ergodox-EZ!
-*
-* use at own risk!
-**/
-
-#define BASE 0
-#define SYMB 1
-#define MDIA 2
-#define SMLY 3
-#define NUMB 4
-#define EGOS 5
-
-#define SMLY_TOG_QUOT 0
-
-#define M_TOGGLE_5 1
-
-#define TGH_NUM 2
-
-#define M_DE_PLUS_CTRLALT 3
-
-#define SM_KISS 4
-
-#define SM_FROWN 5
-
-#define SM_CRY 6
-
-#define SM_SMILE 7
-
-#define SM_SMIRK 8
-
-#define M_LGUI_SHFT 9
-
-#define SM_HEART 10
-
-#define TOG_HLD_MDIA 11
-
-#define SM_LAUGH 12
-
-#define SM_SAD 13
-
-#define M_DE_CIRC_CTRLCMD 14
-
-#define M_MEH_SH_ACUT 15
-
-
-//Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/**
-* Layer: BASE
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | ESC                | 1                  | 2                  | 3                  | 4                  | 5                  | Hold or toggle     |                       | Hold or toggle     | 6                  | 7                  | 8                  | 9                  | 0                  | ß                  |
-* |                    |                    |                    |                    |                    |                    | Layer NUMB         |                       | Layer MDIA         |                    |                    |                    |                    |                    |                    |
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | TAB                | Q                  | W                  | E                  | R                  | T                  | Cmd                |                       | Cmd                | Z                  | U                  | I                  | O                  | P                  | Ü                  |
-* |                    |                    |                    |                    |                    |                    |                    |                       |                    |                    |                    |                    |                    |                    |                    |
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/\-------------------\                        \-------------------\/-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | Alt                | A                  | S                  | D                  | F                  | G                  |                                                                 | H                  | J                  | K                  | L                  | Ö                  | Ä                  |
-* |                    |                    |                    |                    |                    |                    |                                                                 |                    |                    |                    |                    |                    | ALT                |
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/                        /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | Shift              | Y                  | X                  | C                  | V                  | B                  | Alt                |                       | Alt                | N                  | M                  | ,                  | .                  | -                  | Shift              |
-* |                    | Ctrl               |                    |                    |                    |                    |                    |                       |                    |                    |                    |                    |                    | Ctrl               |                    |
-* \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\                        \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\
-*
-*
-*                                           /-------------------//-------------------//-------------------//-------------------//-------------------/                                                                                       /-------------------//-------------------//-------------------//-------------------//-------------------/
-*                                           | <                  | LongPress / Type   | LongPress / Type   | Shift+Ctrl         | Type               |                                                                                      | #                  | ACUT               | CMD+Shift          | ALT+Shift          | +                  |
-*                                           | SYMB               | DE_CIRC_CTRLCMD    | DE_PLUS_CTRAlt     |                    | Toggle SMLY        |                                                                                      | Meh                | Hyper              |                    |                    | SYMB               |
-*                                           \-------------------\\-------------------\\-------------------\\-------------------\/-------------------//-------------------/   /-------------------//-------------------/                     \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\
-*                                                                                                                               | HOME               | END                |  | LEFT               | RIGHT              |
-*                                                                                                                               |                    |                    |  |                    |                    |
-*                                                                                                                               \-------------------\/-------------------/   /-------------------/\-------------------\
-*                                                                                                                                                    | PGUP               |  | UP                 |
-*                                                                                                                                                    |                    |  |                    |
-*                                                                                                          /-------------------//-------------------//-------------------/   /-------------------//-------------------//-------------------/
-*                                                                                                          | BSPC               | DEL                | PGDN               |  | DOWN               | ENT                | SPC                |
-*                                                                                                          |                    |                    |                    |  |                    |                    |                    |
-*                                                                                                          \-------------------\\-------------------\\-------------------\   \-------------------\\-------------------\\-------------------\
-*
-*
-**/
-[BASE]=LAYOUT_ergodox(
-//left half
-    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(TGH_NUM),
-    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,
-    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,
-    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,
-                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), LSFT(KC_LCTRL), M(SMLY_TOG_QUOT),
-                                              KC_HOME, KC_END,
-                                                     KC_PGUP,
-                                       KC_BSPC, KC_DEL, KC_PGDN,
-    //right half
-    M(TOG_HLD_MDIA), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,
-    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,
-           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),
-    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,
-                         MEH_T(DE_HASH), ALL_T(DE_ACUT), LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),
-    KC_LEFT, KC_RIGHT,
-    KC_UP,
-    KC_DOWN, KC_ENT, KC_SPC),
-/**
-* Layer: SYMB
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
-* | APPLICATION| F1         | F2         | F3         | F4         | F5         | F5         |               | F6         | F6         | F7         | F8         | F9         | F10        | F11        |
-* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
-* |            | <          | >          | !          | ?          |            |            |               |            | \          | [          | ]          | <          | >          | !          |
-* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |
-* /-----------//-----------//-----------//-----------//-----------//-----------/\-----------\                \-----------\/-----------//-----------//-----------//-----------//-----------//-----------/
-* |            | #          | $          | \          | /          | .          |                                         | /          | (          | )          | {          | }          | #          |
-* |            |            |            |            |            |            |                                         |            |            |            |            |            |            |
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/                /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
-* |            |            | <          | %          | |          | ~          |            |               |            | |          | ~          |            |            |            |            |
-* |            |            |            |            |            |            |            |               |            |            |            |            |            |            |            |
-* \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\                \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\
-*
-*
-*                           /-----------//-----------//-----------//-----------//-----------/                                                       /-----------//-----------//-----------//-----------//-----------/
-*                           |            |            |            |            |            |                                                      | '          | DQOT       |            | Toggle 5   |            |
-*                           |            |            |            |            |            |                                                      |            |            |            |            |            |
-*                           \-----------\\-----------\\-----------\\-----------\/-----------//-----------/   /-----------//-----------/             \-----------\\-----------\\-----------\\-----------\\-----------\
-*                                                                               |            |            |  | F13        | F12        |
-*                                                                               |            |            |  |            |            |
-*                                                                               \-----------\/-----------/   /-----------/\-----------\
-*                                                                                            |            |  | F14        |
-*                                                                                            |            |  |            |
-*                                                                  /-----------//-----------//-----------/   /-----------//-----------//-----------/
-*                                                                  |            | DEL        |            |  | F15        |            |            |
-*                                                                  |            |            |            |  |            |            |            |
-*                                                                  \-----------\\-----------\\-----------\   \-----------\\-----------\\-----------\
-*
-*
-**/
-[SYMB]=LAYOUT_ergodox(
-//left half
-    KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5,
-    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QST, KC_TRNS, KC_TRNS,
-    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,
-    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,
-                                       KC_TRNS, KC_DEL, KC_TRNS,
-    //right half
-    KC_F6, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-    KC_TRNS, DE_BSLS, DE_LBRC, DE_RBRC, DE_LABK, DE_RABK, DE_EXLM,
-           DE_SLSH, DE_LPRN, DE_RPRN, DE_LCBR, DE_RCBR, DE_HASH,
-    KC_TRNS, DE_PIPE, DE_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         DE_QUOT, DE_DQUO, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,
-    KC_F13, KC_F12,
-    KC_F14,
-    KC_F15, KC_TRNS, KC_TRNS),
-/**
-* Layer: MDIA
-* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
-* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/
-* |      |      | BTN1 | U    | BTN2 | U    |      |         |      |      |      |      |      |      |      |
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
-* /-----//-----//-----//-----//-----//-----/\-----\          \-----\/-----//-----//-----//-----//-----//-----/
-* |      |      | L    | D    | R    | D    |                       |      |      |      |      |      |      |
-* |      |      |      |      |      |      |                       |      |      |      |      |      |      |
-* /-----//-----//-----//-----//-----//-----//-----/          /-----//-----//-----//-----//-----//-----//-----/
-* |      |      | L    | D    | R    | BTN3 |      |         |      |      |      |      |      | UP   |      |
-* |      |      |      |      |      |      |      |         |      |      |      |      |      |      |      |
-* \-----\\-----\\-----\\-----\\-----\\-----\\-----\          \-----\\-----\\-----\\-----\\-----\\-----\\-----\
-*
-*
-*               /-----//-----//-----//-----//-----/                               /-----//-----//-----//-----//-----/
-*               |      |      |      |      |      |                              |      |      | LEFT | DOWN | RIGHT|
-*               |      |      |      |      |      |                              |      |      |      |      |      |
-*               \-----\\-----\\-----\\-----\/-----//-----/   /-----//-----/       \-----\\-----\\-----\\-----\\-----\
-*                                           |      |      |  | MPRV | MNXT |
-*                                           |      |      |  |      |      |
-*                                           \-----\/-----/   /-----/\-----\
-*                                                  |      |  | VOLU |
-*                                                  |      |  |      |
-*                                    /-----//-----//-----/   /-----//-----//-----/
-*                                    |      |      |      |  | VOLD | MUTE | MPLY |
-*                                    |      |      |      |  |      |      |      |
-*                                    \-----\\-----\\-----\   \-----\\-----\\-----\
-*
-*
-**/
-[MDIA]=LAYOUT_ergodox(
-//left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,
-                                       KC_TRNS, KC_TRNS, KC_TRNS,
-    //right half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,
-    KC_MPRV, KC_MNXT,
-    KC_VOLU,
-    KC_VOLD, KC_MUTE, KC_MPLY),
-/**
-* Layer: SMLY
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
-* |         |         |         |         |         |         |         |            | Typing  | Typing  | Typing  |         |         |         |         |
-* |         |         |         |         |         |         |         |            | SM_SMILE| SM_SMIRK| SM_LAUGH|         |         |         |         |
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
-* |         |         |         |         |         |         |         |            |         | Typing  | Typing  | Typing  |         |         |         |
-* |         |         |         |         |         |         |         |            |         | SM_FROWN| SM_SAD  | SM_CRY  |         |         |         |
-* /--------//--------//--------//--------//--------//--------/\--------\             \--------\/--------//--------//--------//--------//--------//--------/
-* |         |         |         |         |         |         |                                | Typing  | Typing  |         |         |         |         |
-* |         |         |         |         |         |         |                                | SM_HEART| SM_KISS |         |         |         |         |
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* \--------\\--------\\--------\\--------\\--------\\--------\\--------\             \--------\\--------\\--------\\--------\\--------\\--------\\--------\
-*
-*
-*                     /--------//--------//--------//--------//--------/                                           /--------//--------//--------//--------//--------/
-*                     |         |         |         |         |         |                                          |         |         |         |         |         |
-*                     |         |         |         |         |         |                                          |         |         |         |         |         |
-*                     \--------\\--------\\--------\\--------\/--------//--------/   /--------//--------/          \--------\\--------\\--------\\--------\\--------\
-*                                                             |         |         |  |         |         |
-*                                                             |         |         |  |         |         |
-*                                                             \--------\/--------/   /--------/\--------\
-*                                                                       |         |  |         |
-*                                                                       |         |  |         |
-*                                                   /--------//--------//--------/   /--------//--------//--------/
-*                                                   |         |         |         |  |         |         |         |
-*                                                   |         |         |         |  |         |         |         |
-*                                                   \--------\\--------\\--------\   \--------\\--------\\--------\
-*
-*
-**/
-[SMLY]=LAYOUT_ergodox(
-//left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,
-                                       KC_TRNS, KC_TRNS, KC_TRNS,
-    //right half
-    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,
-           M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,
-    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS),
-/**
-* Layer: NUMB
-* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/
-* |     |     |     |     |     |     |     |        |     | F6  | F7  | F8  | F9  | F10 | F11 |
-* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |
-* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/
-* |     |     |     | UP  |     |     |     |        |     | /   | 7   | 8   | 9   | *   | F12 |
-* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |
-* /----//----//----//----//----//----/\----\         \----\/----//----//----//----//----//----/
-* |     |     | LEFT| DOWN| RGHT|     |                    | /   | 4   | 5   | 6   | +   | -   |
-* |     |     |     |     |     |     |                    |     |     |     |     |     |     |
-* /----//----//----//----//----//----//----/         /----//----//----//----//----//----//----/
-* |     |     |     |     |     |     |     |        |     | %   | 1   | 2   | 3   |     |     |
-* |     |     |     |     |     |     |     |        |     |     |     |     |     |     |     |
-* \----\\----\\----\\----\\----\\----\\----\         \----\\----\\----\\----\\----\\----\\----\
-*
-*
-*             /----//----//----//----//----/                           /----//----//----//----//----/
-*             |     |     |     |     |     |                          | 0   | .   | ,   | =   |     |
-*             |     |     |     |     |     |                          |     |     |     |     |     |
-*             \----\\----\\----\\----\/----//----/   /----//----/      \----\\----\\----\\----\\----\
-*                                     |     |     |  |     |     |
-*                                     |     |     |  |     |     |
-*                                     \----\/----/   /----/\----\
-*                                           |     |  |     |
-*                                           |     |  |     |
-*                               /----//----//----/   /----//----//----/
-*                               |     |     |     |  |     |     |     |
-*                               |     |     |     |  |     |     |     |
-*                               \----\\----\\----\   \----\\----\\----\
-*
-*
-**/
-[NUMB]=LAYOUT_ergodox(
-//left half
-    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_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,
-    //right half
-    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-    KC_TRNS, DE_SLSH, KC_7, KC_8, KC_9, DE_ASTR, KC_F12,
-           DE_SLSH, KC_4, KC_5, KC_6, DE_PLUS, DE_MINS,
-    KC_TRNS, DE_PERC, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,
-                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,
-    KC_TRNS, KC_TRNS,
-    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS),
-/**
-* Layer: EGOS
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* /--------//--------//--------//--------//--------//--------/\--------\             \--------\/--------//--------//--------//--------//--------//--------/
-* | Shift   |         |         |         |         |         |                                |         |         |         |         |         |         |
-* |         |         |         |         |         |         |                                |         |         |         |         |         |         |
-* /--------//--------//--------//--------//--------//--------//--------/             /--------//--------//--------//--------//--------//--------//--------/
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* |         |         |         |         |         |         |         |            |         |         |         |         |         |         |         |
-* \--------\\--------\\--------\\--------\\--------\\--------\\--------\             \--------\\--------\\--------\\--------\\--------\\--------\\--------\
-*
-*
-*                     /--------//--------//--------//--------//--------/                                           /--------//--------//--------//--------//--------/
-*                     | Ctrl    |         |         |         |         |                                          |         |         |         | Toggle 5|         |
-*                     |         |         |         |         |         |                                          |         |         |         |         |         |
-*                     \--------\\--------\\--------\\--------\/--------//--------/   /--------//--------/          \--------\\--------\\--------\\--------\\--------\
-*                                                             | F1      | F2      |  |         |         |
-*                                                             |         |         |  |         |         |
-*                                                             \--------\/--------/   /--------/\--------\
-*                                                                       | F3      |  |         |
-*                                                                       |         |  |         |
-*                                                   /--------//--------//--------/   /--------//--------//--------/
-*                                                   | SPC     | Ctrl    | F4      |  |         |         |         |
-*                                                   |         |         |         |  |         |         |         |
-*                                                   \--------\\--------\\--------\   \--------\\--------\\--------\
-*
-*
-**/
-[EGOS]=LAYOUT_ergodox(
-//left half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                  KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                              KC_F1, KC_F2,
-                                                     KC_F3,
-                                       KC_SPC, KC_LCTL, KC_F4,
-    //right half
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,
-    KC_TRNS, KC_TRNS,
-    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-static uint16_t start;
-switch(id) {
-case SMLY_TOG_QUOT:
-//Macro: SMLY_TOG_QUOT//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-           layer_state ^= (1<<SMLY);
-           layer_state &= (1<<SMLY);
-			return MACRO_NONE; 		} else {
-           layer_state ^= (1<<SMLY);
-           layer_state &= (1<<SMLY);
-			if (timer_elapsed(start) >150) {
-				return MACRO_NONE;
-			} else {
-				return MACRO(DOWN(KC_LSFT),TYPE(DE_HASH),UP(KC_LSFT),END);
-			}
-		}
-
-break;
-case M_TOGGLE_5:
-//Macro: M_TOGGLE_5//-----------------------
- if (record->event.pressed){
-           layer_state ^= (1<<5);
-           layer_state &= (1<<5);
-        }
-
-break;
-case TGH_NUM:
-//Macro: TGH_NUM//-----------------------
-if (record->event.pressed){
-         start = timer_read();
-         layer_state ^=(1<<NUMB);
-         layer_state &=(1<<NUMB);
- } else {
-         if (timer_elapsed(start) > 150) {
-                 layer_state^=(1<<NUMB);
-                 layer_state&=(1<<NUMB);
-         }
- }
-return MACRO_NONE;
-
-break;
-case M_DE_PLUS_CTRLALT:
-//Macro: M_DE_PLUS_CTRLALT//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(DOWN(KC_LCTRL),DOWN(KC_LALT),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),U(LALT),END);
-			} else {
-				return MACRO(UP(KC_LCTRL),UP(KC_LALT),TYPE(KC_RBRC),END);
-			}
-		}
-
-break;
-case SM_KISS:
-//Macro: SM_KISS//-----------------------
-if (record->event.pressed) {
-			return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_RBRC),UP(KC_LSFT),END);
-		}
-
-break;
-case SM_FROWN:
-//Macro: SM_FROWN//-----------------------
-if (record->event.pressed) {
-			return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LALT),TYPE(KC_8),UP(KC_LALT),END);
-		}
-
-break;
-case SM_CRY:
-//Macro: SM_CRY//-----------------------
-if (record->event.pressed) {
-			return MACRO(DOWN(KC_LSFT),TYPE(KC_COMM),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_8),UP(KC_LSFT),END);
-		}
-
-break;
-case SM_SMILE:
-//Macro: SM_SMILE//-----------------------
-if (record->event.pressed) {
-			return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_9),UP(KC_LSFT),END);
-		}
-
-break;
-case SM_SMIRK:
-//Macro: SM_SMIRK//-----------------------
-if (record->event.pressed) {
-			return MACRO(DOWN(KC_LSFT),TYPE(KC_COMM),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_9),UP(KC_LSFT),END);
-		}
-
-break;
-case M_LGUI_SHFT:
-//Macro: M_LGUI_SHFT//-----------------------
-if (record->event.pressed){
-			return MACRO(DOWN(KC_LGUI),DOWN(KC_LSFT),END);
-		}else{
-			return MACRO(UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),U(LGUI),U(LSFT),END);
-		}
-
-break;
-case SM_HEART:
-//Macro: SM_HEART//-----------------------
-if (record->event.pressed) {
-			return MACRO(TYPE(KC_GRV),TYPE(KC_3),END);
-		}
-
-break;
-case TOG_HLD_MDIA:
-//Macro: TOG_HLD_MDIA//-----------------------
-if (record->event.pressed){
-         start = timer_read();
-         layer_state ^=(1<<MDIA);
-         layer_state &=(1<<MDIA);
- } else {
-         if (timer_elapsed(start) > 150) {
-                 layer_state^=(1<<MDIA);
-                 layer_state&=(1<<MDIA);
-         }
- }
-return MACRO_NONE;
-
-break;
-case SM_LAUGH:
-//Macro: SM_LAUGH//-----------------------
-if (record->event.pressed) {
-			return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_D),UP(KC_LSFT),END);
-		}
-
-break;
-case SM_SAD:
-//Macro: SM_SAD//-----------------------
-if (record->event.pressed) {
-			return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_8),UP(KC_LSFT),END);
-		}
-
-break;
-case M_DE_CIRC_CTRLCMD:
-//Macro: M_DE_CIRC_CTRLCMD//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(DOWN(KC_LCTRL),DOWN(KC_LGUI),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),U(LGUI),END);
-			} else {
-				return MACRO(UP(KC_LCTRL),UP(KC_LGUI),TYPE(KC_NUBS),END);
-			}
-		}
-
-break;
-case M_MEH_SH_ACUT:
-//Macro: M_MEH_SH_ACUT//-----------------------
-if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(DOWN(KC_LCTRL),DOWN(KC_LSFT),DOWN(KC_LALT),END);
-		} else {
-			if (timer_elapsed(start) >150) {
-				return MACRO(U(LCTRL),U(LSFT),U(LALT),END);
-			} else {
-				return MACRO(UP(KC_LCTRL),UP(KC_LALT),TYPE(DE_ACUT),UP(KC_LSFT),END);
-			}
-		}
-
-break;
-}
-return MACRO_NONE;
-};
-
-// 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 SYMB:
-        ergodox_right_led_1_on();
-
-
-    break;
-    case MDIA:
-
-        ergodox_right_led_2_on();
-
-    break;
-    case NUMB:
-
-
-        ergodox_right_led_3_on();
-    break;
-    case EGOS:
-        ergodox_right_led_1_on();
-        ergodox_right_led_2_on();
-        ergodox_right_led_3_on();
-    break;
-default:
-// none
-break;
-}
-
-};
diff --git a/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md b/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md
deleted file mode 100644
index 1fca8a5bb5..0000000000
--- a/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md
+++ /dev/null
@@ -1 +0,0 @@
-https://i.imgur.com/GIkRdX3.png
diff --git a/layouts/community/ergodox/osx_de_experimental/readme.md b/layouts/community/ergodox/osx_de_experimental/readme.md
deleted file mode 100644
index dde28eee41..0000000000
--- a/layouts/community/ergodox/osx_de_experimental/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Ergodox und Ergodox-EZ experimentelles Layout
-
-dieses layout ist experimentell und wird im Lufe der Zeit viele Änderungen und Verbesserungen durchlaufen. Falls diese sich als vorteilhaft erweisen, werden sie evtl. auch in das `osx_de` layout übernommen.
-
-
-
-# Erstellt Mit Dem ErgodoxLayoutGenerator
-
-Der ErgodoxLayoutGenerator (ELG) ist ein kleines Werkzeug, welches die Erstellung und Pflege der eigenen Keymaps erleichtern soll. Es ist in java geschrieben und kann [hier](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases) heruntergeladen werden. Damit das Tool funktioniert sollte das offizielle Oracle JDK in aktueller Version installiert sein.
----------------------------------------------------------------------------------------------------------------------
-
-# Ergodox and Ergodox-EZ experimental layout
-
-This is an experimental layout which will undergo heavy changes over time. If changes prove to be good, they might also move into the `osx_de` layout.
-
-Created Using the ErgodoxLayoutGenerator
-
-The ErgodoxLayoutGenerator (ELG) is a little tool, which makes the creation and maintenance of keycaps a lot easier. It was written in Java and can be downloaded  [here](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases). To use the tool, you need to have a current version of Oracles JDK installed.
-
-The documentation of the ELG can be viewed [here](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/).
\ No newline at end of file
diff --git a/layouts/community/ergodox/swissgerman/keyboard-layout.json b/layouts/community/ergodox/swissgerman/keyboard-layout.json
deleted file mode 100644
index 6958952b48..0000000000
--- a/layouts/community/ergodox/swissgerman/keyboard-layout.json
+++ /dev/null
@@ -1,419 +0,0 @@
-[
-  {
-    "backcolor": "#ffffff",
-    "name": "Ergodox Swiss German Layout - Base Layer",
-    "author": "Andreas Schmidt (https://github.com/remigius42)"
-  },
-  [
-    {
-      "x": 3.5
-    },
-    "#\n3",
-    {
-      "x": 10.5
-    },
-    "*\n8"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "@\n2",
-    {
-      "x": 1
-    },
-    "$\n4",
-    {
-      "x": 8.5
-    },
-    "&\n7",
-    {
-      "x": 1
-    },
-    "(\n9"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "%\n5",
-    {
-      "a": 7
-    },
-    "<i class='fa fa-arrow-left'></i>",
-    {
-      "x": 4.5
-    },
-    "<i class='fa fa-arrow-right'></i>",
-    {
-      "a": 4
-    },
-    "^\n6"
-  ],
-  [
-    {
-      "y": -0.875,
-      "w": 1.5
-    },
-    "°\n§",
-    "!\n1",
-    {
-      "x": 14.5
-    },
-    ")\n0",
-    {
-      "w": 1.5
-    },
-    "?\n'\n\n'"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5
-    },
-    "E",
-    {
-      "x": 10.5
-    },
-    "I"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "W",
-    {
-      "x": 1
-    },
-    "R",
-    {
-      "x": 8.5
-    },
-    "U",
-    {
-      "x": 1
-    },
-    "O"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "T",
-    {
-      "c": "#b56b6b",
-      "a": 6,
-      "h": 1.5
-    },
-    "Toggle Code Layer",
-    {
-      "x": 4.5,
-      "h": 1.5
-    },
-    "Toggle Code Layer",
-    {
-      "c": "#cccccc",
-      "a": 4
-    },
-    "Y"
-  ],
-  [
-    {
-      "y": -0.875,
-      "a": 6,
-      "w": 1.5
-    },
-    "Delete",
-    {
-      "a": 4
-    },
-    "Q",
-    {
-      "x": 14.5
-    },
-    "P",
-    {
-      "w": 1.5
-    },
-    "è\nü\n\n["
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5
-    },
-    "D",
-    {
-      "x": 10.5
-    },
-    "K"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "S",
-    {
-      "x": 1
-    },
-    "F",
-    {
-      "x": 8.5
-    },
-    "J",
-    {
-      "x": 1
-    },
-    "L"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "G",
-    {
-      "x": 6.5
-    },
-    "H"
-  ],
-  [
-    {
-      "y": -0.875,
-      "a": 6,
-      "w": 1.5
-    },
-    "Backspace",
-    {
-      "c": "#79c777",
-      "a": 4
-    },
-    "A\n\nLyr3",
-    {
-      "x": 14.5
-    },
-    "é\nö\nLyr3",
-    {
-      "c": "#748adb",
-      "w": 1.5
-    },
-    "à\nä\nCmd\n{"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6.5,
-      "c": "#cccccc",
-      "a": 6,
-      "h": 1.5
-    },
-    "Hyper",
-    {
-      "x": 4.5,
-      "h": 1.5
-    },
-    "Meh"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3.5,
-      "a": 4
-    },
-    "C",
-    {
-      "x": 10.5
-    },
-    ";\n,"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5,
-      "c": "#748adb"
-    },
-    "X\n\nAlt",
-    {
-      "x": 1,
-      "c": "#cccccc"
-    },
-    "V",
-    {
-      "x": 8.5
-    },
-    "M",
-    {
-      "x": 1,
-      "c": "#748adb"
-    },
-    ":\n.\nAlt"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5,
-      "c": "#cccccc"
-    },
-    "B",
-    {
-      "x": 6.5
-    },
-    "N"
-  ],
-  [
-    {
-      "y": -0.875,
-      "a": 6,
-      "w": 1.5
-    },
-    "Shift",
-    {
-      "c": "#748adb",
-      "a": 4
-    },
-    "Z\n\nCtrl",
-    {
-      "x": 14.5
-    },
-    "_\n-\nCtrl",
-    {
-      "c": "#cccccc",
-      "a": 6,
-      "w": 1.5
-    },
-    "Shift"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5,
-      "a": 7
-    },
-    "<i class='fa fa-arrow-left'></i>",
-    {
-      "x": 10.5
-    },
-    "<i class='fa fa-arrow-down'></i>"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5,
-      "a": 4
-    },
-    "£\n$\n\n}",
-    {
-      "x": 1,
-      "a": 7
-    },
-    "<i class='fa fa-arrow-right'></i>",
-    {
-      "x": 10.5,
-      "a": 6
-    },
-    "AltGr"
-  ],
-  [
-    {
-      "y": -0.9950000000000001,
-      "x": 14,
-      "a": 7
-    },
-    "<i class='fa fa-arrow-up'></i>"
-  ],
-  [
-    {
-      "y": -0.7549999999999999,
-      "x": 0.5,
-      "c": "#b56b6b",
-      "a": 4
-    },
-    ">\n<\nCode Layer\n\\",
-    {
-      "c": "#cccccc"
-    },
-    "`\n^\n\n~",
-    {
-      "x": 14.5
-    },
-    "!\n¨\n\n]",
-    {
-      "c": "#b56b6b"
-    },
-    "\n\nCode Layer"
-  ],
-  [
-    {
-      "r": 30,
-      "rx": 6.5,
-      "ry": 4.25,
-      "y": -1,
-      "x": 1,
-      "c": "#748adb"
-    },
-    "Apps\nAlt",
-    {
-      "c": "#cccccc",
-      "a": 6
-    },
-    "Win / Cmd"
-  ],
-  [
-    {
-      "h": 2
-    },
-    "Space",
-    {
-      "h": 2
-    },
-    "Back Space",
-    "Home"
-  ],
-  [
-    {
-      "x": 2
-    },
-    "End"
-  ],
-  [
-    {
-      "r": -30,
-      "rx": 13,
-      "y": -1,
-      "x": -3
-    },
-    "Alt",
-    {
-      "c": "#748adb",
-      "a": 4
-    },
-    "Esc\nCtrl"
-  ],
-  [
-    {
-      "x": -3,
-      "c": "#cccccc",
-      "a": 6
-    },
-    "Pg Up",
-    {
-      "h": 2
-    },
-    "Tab",
-    {
-      "h": 2
-    },
-    "Enter"
-  ],
-  [
-    {
-      "x": -3
-    },
-    "Pg Dn"
-  ]
-]
diff --git a/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json b/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json
deleted file mode 100644
index 38a728514f..0000000000
--- a/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json
+++ /dev/null
@@ -1,436 +0,0 @@
-[
-  {
-    "backcolor": "#ffffff",
-    "name": "Ergodox Swiss German Layout - Symbol & Media Layer",
-    "author": "Andreas Schmidt (https://github.com/remigius42)"
-  },
-  [
-    {
-      "x": 3.5,
-      "t": "#b81c1c"
-    },
-    "F3",
-    {
-      "x": 10.5
-    },
-    "F8"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "F2",
-    {
-      "x": 1
-    },
-    "F4",
-    {
-      "x": 8.5
-    },
-    "F7",
-    {
-      "x": 1
-    },
-    "F9"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "F5",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "",
-    {
-      "x": 4.5
-    },
-    "",
-    {
-      "t": "#b81c1c",
-      "a": 4
-    },
-    "F6"
-  ],
-  [
-    {
-      "y": -0.875,
-      "t": "#000000\n\n\n#529151",
-      "w": 1.5
-    },
-    "\n\n\nFlash",
-    {
-      "t": "#b81c1c"
-    },
-    "F1",
-    {
-      "x": 14.5
-    },
-    "F10",
-    {
-      "t": "#b81c1c\n\n\n#529151",
-      "w": 1.5
-    },
-    "F11\n\n\nFlash"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5
-    },
-    "{\n\n\n<i class='fa fa-arrow-circle-up'></i>",
-    {
-      "x": 10.5,
-      "t": "#b81c1c"
-    },
-    "8"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "@",
-    {
-      "x": 1
-    },
-    "}",
-    {
-      "x": 8.5,
-      "t": "#b81c1c\n\n\n#529151"
-    },
-    "7\n\n\nHTML ul",
-    {
-      "x": 1
-    },
-    "9\n\n\nHTML ol"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5,
-      "t": "#b81c1c"
-    },
-    "|",
-    {
-      "t": "#000000",
-      "a": 7,
-      "h": 1.5
-    },
-    "",
-    {
-      "x": 4.5,
-      "h": 1.5
-    },
-    "",
-    {
-      "t": "#b81c1c",
-      "a": 4
-    },
-    "<i class='fa fa-arrow-up'></i>"
-  ],
-  [
-    {
-      "y": -0.875,
-      "t": "#000000",
-      "a": 7,
-      "w": 1.5
-    },
-    "",
-    {
-      "t": "#b81c1c",
-      "a": 4
-    },
-    "!",
-    {
-      "x": 14.5
-    },
-    "*",
-    {
-      "w": 1.5
-    },
-    "F12"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5,
-      "t": "#b81c1c\n\n\n#529151"
-    },
-    "(\n\n\n<i class='fa fa-arrow-circle-down'></i>",
-    {
-      "x": 10.5
-    },
-    "5\n\n\nHTML li"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "$\n\n\n<i class='fa fa-arrow-circle-left'></i>",
-    {
-      "x": 1
-    },
-    ")\n\n\n<i class='fa fa-arrow-circle-right'></i>",
-    {
-      "x": 8.5,
-      "t": "#b81c1c"
-    },
-    "4",
-    {
-      "x": 1
-    },
-    "6"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "`",
-    {
-      "x": 6.5
-    },
-    "<i class='fa fa-arrow-down'></i>"
-  ],
-  [
-    {
-      "y": -0.875,
-      "t": "#000000",
-      "a": 7,
-      "w": 1.5
-    },
-    "",
-    {
-      "t": "#b81c1c",
-      "a": 4
-    },
-    "#",
-    {
-      "x": 14.5
-    },
-    "+",
-    {
-      "t": "#000000\n\n\n#529151",
-      "w": 1.5
-    },
-    "\n\n\n<i class='fa fa-play'></i><i class='fa fa-pause'></i>"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6.5,
-      "t": "#000000",
-      "a": 7,
-      "h": 1.5
-    },
-    "",
-    {
-      "x": 4.5,
-      "h": 1.5
-    },
-    ""
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3.5,
-      "t": "#b81c1c\n\n\n#529151",
-      "a": 4
-    },
-    "[\n\n\nHTML code",
-    {
-      "x": 10.5
-    },
-    "2\n\n\n<i class='fa fa-fast-backward'></i>"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5,
-      "t": "#b81c1c"
-    },
-    "^",
-    {
-      "x": 1,
-      "t": "#b81c1c\n\n\n#529151"
-    },
-    "]\n\n\nHTML br",
-    {
-      "x": 8.5,
-      "t": "#b81c1c"
-    },
-    "1",
-    {
-      "x": 1,
-      "t": "#b81c1c\n\n\n#529151"
-    },
-    "3\n\n\n<i class='fa fa-fast-forward'></i>"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5,
-      "t": "#b81c1c"
-    },
-    "~",
-    {
-      "x": 6.5
-    },
-    "&"
-  ],
-  [
-    {
-      "y": -0.875,
-      "t": "#000000",
-      "a": 7,
-      "w": 1.5
-    },
-    "",
-    {
-      "t": "#b81c1c",
-      "a": 4
-    },
-    "%",
-    {
-      "x": 14.5
-    },
-    "\\",
-    {
-      "t": "#000000",
-      "a": 7,
-      "w": 1.5
-    },
-    ""
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5,
-      "t": "#000000\n\n\n#529151",
-      "a": 4
-    },
-    "\n\n\nleft click",
-    {
-      "x": 10.5,
-      "t": "#b81c1c\n\n\n#529151"
-    },
-    ".\n\n\n<i class='fa fa-volume-down'></i>"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5,
-      "t": "#000000",
-      "a": 7
-    },
-    "",
-    {
-      "x": 1,
-      "t": "#000000\n\n\n#529151",
-      "a": 4
-    },
-    "\n\n\nright click",
-    {
-      "x": 8.5,
-      "t": "#b81c1c\n\n\n#529151"
-    },
-    "?\n\n\n<i class='fa fa-volume-up'></i>",
-    {
-      "x": 1,
-      "t": "#b81c1c"
-    },
-    "0"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 0.5,
-      "t": "#000000",
-      "a": 7
-    },
-    "",
-    {
-      "t": "#b81c1c",
-      "a": 4
-    },
-    "EPRM RST",
-    {
-      "x": 14.5,
-      "t": "#000000",
-      "a": 7
-    },
-    "",
-    ""
-  ],
-  [
-    {
-      "r": 30,
-      "rx": 6.5,
-      "ry": 4.25,
-      "y": -1,
-      "x": 1
-    },
-    "",
-    ""
-  ],
-  [
-    {
-      "t": "#000000\n\n\n#529151",
-      "a": 4,
-      "h": 2
-    },
-    "\n\n\nEnter",
-    {
-      "t": "#000000",
-      "a": 7,
-      "h": 2
-    },
-    "",
-    ""
-  ],
-  [
-    {
-      "x": 2
-    },
-    ""
-  ],
-  [
-    {
-      "r": -30,
-      "rx": 13,
-      "y": -1,
-      "x": -3
-    },
-    "",
-    ""
-  ],
-  [
-    {
-      "x": -3
-    },
-    "",
-    {
-      "h": 2
-    },
-    "",
-    {
-      "t": "#000000\n\n\n#529151",
-      "a": 4,
-      "h": 2
-    },
-    "\n\n\nWeb back"
-  ],
-  [
-    {
-      "x": -3,
-      "t": "#000000",
-      "a": 7
-    },
-    ""
-  ]
-]
diff --git a/layouts/community/ergodox/swissgerman/keymap.c b/layouts/community/ergodox/swissgerman/keymap.c
deleted file mode 100644
index 7c9dd32c07..0000000000
--- a/layouts/community/ergodox/swissgerman/keymap.c
+++ /dev/null
@@ -1,283 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "string.h"
-
-#ifdef SUBPROJECT_infinity
-#include "visualizer/lcd_backlight.h"
-#endif
-
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-#define EPRM M(1) // Macro 1: Reset EEPROM
-#define HTML_LI M(10)
-#define HTML_UL M(11)
-#define HTML_OL M(12)
-#define HTML_CODE M(13)
-#define HTML_BR M(14)
-
-#define SEND_TAG(TAG) do {\
-    send_key(KC_NONUS_BACKSLASH); \
-    SEND_STRING(TAG); \
-    send_larger_than(); \
-    send_key(KC_NONUS_BACKSLASH); \
-    SEND_STRING("&"); \
-    SEND_STRING(TAG); \
-    send_larger_than(); \
-    go_back_based_on_tag(TAG); \
-  } while (0)
-
-#define SEND_SHORT_TAG(TAG) do {\
-    send_key(KC_NONUS_BACKSLASH); \
-    SEND_STRING(TAG); \
-    SEND_STRING("&"); \
-    send_larger_than();	       \
-  } while (0)
-
-void send_key(uint16_t keycode);
-void go_back_based_on_tag(char* tag);
-void send_larger_than(void);
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   §    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   '    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Z  |   U  |   I  |   O  |   P  |   ü    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   | A /L2|   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |ö / L2|ä / Cmd |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |Y/Ctrl|X/Alt |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |./Alt |-/Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |< / L1|   ^  |   $  | Left | Right|                                       |  Up  | Down |AltGr |   ¨  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
-        KC_BSPC,        LT(MDIA, KC_A),KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        CTL_T(KC_Z),  ALT_T(KC_X),   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_NUBS), KC_EQL, KC_BSLS,  KC_LEFT,KC_RGHT,
-                                              ALT_T(KC_APP),  KC_LGUI,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-	KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-	TG(SYMB),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_LBRC,
-	KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-	MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,ALT_T(KC_DOT), CTL_T(KC_SLSH),   KC_RSFT,
-                             KC_UP,  KC_DOWN,KC_RALT,KC_RBRC, TT(SYMB),
-             KC_LALT,CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      | EPRM |      |      |      |                                       |   ?  |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), ACTION_MODS_KEY(MOD_RALT, KC_2),  ACTION_MODS_KEY(MOD_RALT, KC_QUOT), ACTION_MODS_KEY(MOD_RALT, KC_BSLS),ACTION_MODS_KEY(MOD_RALT,KC_7),KC_TRNS,
-       KC_TRNS,ACTION_MODS_KEY(MOD_RALT,KC_3),KC_BSLS, ACTION_MODS_KEY(MOD_LSFT, KC_8), ACTION_MODS_KEY(MOD_RSFT, KC_9),ACTION_MODS_KEY(MOD_LSFT,KC_EQL),
-       KC_TRNS,ACTION_MODS_KEY(MOD_LSFT,KC_5),KC_EQL, ACTION_MODS_KEY(MOD_RALT, KC_LBRC), ACTION_MODS_KEY(MOD_RALT, KC_RBRC),ACTION_MODS_KEY(MOD_RALT,KC_EQL),KC_TRNS,
-          KC_TRNS,EPRM,KC_TRNS,KC_NUBS, ACTION_MODS_KEY(MOD_LSFT, KC_NUBS)/*KC_TRNS,KC_TRNS*/,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    ACTION_MODS_KEY(MOD_RSFT,KC_3), KC_F12,
-       KC_DOWN, KC_4,   KC_5,    KC_6,    ACTION_MODS_KEY(MOD_RSFT,KC_1), KC_TRNS,
-       KC_TRNS, ACTION_MODS_KEY(MOD_RSFT,KC_6), KC_1,   KC_2,    KC_3,  ACTION_MODS_KEY(MOD_RALT,KC_NUBS), KC_TRNS,
-       ACTION_MODS_KEY(MOD_RSFT,KC_MINS),KC_DOT,  KC_0,   KC_EQL, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | QK_BOOT  |      |      |      |      |      |      |           |      |      |      |      |      |      | QK_BOOT  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |H_UL  |      |H_OL  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |H_LI  |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |H_CODE|      |H_BR  |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Enter |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, HTML_CODE, KC_TRNS, HTML_BR, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_ENT, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-       KC_TRNS,  KC_TRNS, HTML_UL, KC_TRNS, HTML_OL, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, HTML_LI, 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
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-      case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      case 1:
-        if (record->event.pressed) { // For resetting EEPROM
-          eeconfig_init();
-        }
-        break;
-      case 10:
-	if (record->event.pressed) {
-	  SEND_TAG("li");
-	}
-	break;
-      case 11:
-	if (record->event.pressed) {
-	  SEND_TAG("ul");
-	}
-	break;
-      case 12:
-	if (record->event.pressed) {
-	  SEND_TAG("ol");
-	}
-	break;
-      case 13:
-	if (record->event.pressed) {
-	  SEND_TAG("code");
-	}
-	break;
-      case 14:
-	if (record->event.pressed) {
-	  SEND_SHORT_TAG("br");
-	}
-      }
-    return MACRO_NONE;
-};
-
-// 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);
-
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-    case 0:
-      ergodox_board_led_off();
-      ergodox_right_led_1_off();
-      ergodox_right_led_2_off();
-      ergodox_right_led_3_off();
-
-      #ifdef SUBPROJECT_infinity
-      lcd_backlight_hal_color(0, 0, 0);
-      #endif
-      break;
-    case 1:
-      ergodox_right_led_1_on();
-
-      ergodox_board_led_off();
-      ergodox_right_led_2_off();
-      ergodox_right_led_3_off();
-      #ifdef SUBPROJECT_infinity
-      lcd_backlight_hal_color(5000, 0, 0);
-      #endif
-      break;
-    case 2:
-      ergodox_right_led_2_on();
-
-      ergodox_board_led_off();
-      ergodox_right_led_1_off();
-      ergodox_right_led_3_off();
-      #ifdef SUBPROJECT_infinity
-      lcd_backlight_hal_color(0, 5000, 0);
-      #endif
-      break;
-    default:
-            // none
-            break;
-    }
-
-};
-
-void send_key(uint16_t keycode) {
-  register_code(keycode);
-  unregister_code(keycode);
-}
-
-void go_back_based_on_tag(char* tag) {
-  const int BRACKETS_AND_SLASH_LENGTH = 3;
-
-  for (int i=0; i < strlen(tag) + BRACKETS_AND_SLASH_LENGTH; i++) {
-    send_key(KC_LEFT);
-  }
-}
-
-void send_larger_than() {
-  register_code(KC_LSFT);
-  send_key(KC_NONUS_BACKSLASH);
-  unregister_code(KC_LSFT);
-}
diff --git a/layouts/community/ergodox/swissgerman/readme.md b/layouts/community/ergodox/swissgerman/readme.md
deleted file mode 100644
index fa7fc1618f..0000000000
--- a/layouts/community/ergodox/swissgerman/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# ErgoDox Swiss German Configuration
-
-Swiss German keyboard layout based on the Ergodox EZ default layout.
-
-Keyboard diagrams created with the [keyboard layout editor](http://www.keyboard-layout-editor.com).
-
-Diagram sources: [default layer](keyboard-layout.json), [layer 1 & 2](keyboard-layout_1_2.json)
-
-![Layout Layer 0](https://i.imgur.com/yf4HNXV.png)
-![Layout Layer 1&2](https://i.imgur.com/Q814cKa.png)
-
-## Changelog
-* Jan 21, 2017:
-  * Initial version based on default layout.
-
diff --git a/layouts/community/ergodox/tm2030/keymap.c b/layouts/community/ergodox/tm2030/keymap.c
deleted file mode 100644
index 3f82800377..0000000000
--- a/layouts/community/ergodox/tm2030/keymap.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* TypeMatrix-2030-like keymap  */
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "led.h"
-
-#define BASE 0 // default layer
-#define DVRK 1 // Dvorak layer
-#define NUMR 8 // numeric layer
-#define FNLR 9 // fn layer
-
-#define MDBL0 1
-#define MFNLR 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  | Del  |           | Del  |   6  |   7  |   8  |   9  |   0  |   ]    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |Backsp|           |Backsp|   Y  |   U  |   I  |   O  |   P  |   [    |
- * |--------+------+------+------+------+------|ace   |           |ace   |------+------+------+------+------+--------|
- * | LShift |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | '/Shift|
- * |--------+------+------+------+------+------|Enter |           |Enter |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | \/Shift|
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl |  fn  | LGui | Play |App/Alt|                                      | RAlt |   -  | Home |   =  |End/Ctl|
- *   `-----------------------------------'                                      `-----------------------------------'
- *                                       ,--------------.       ,-------------.
- *                                       |Esc/Alt| num  |       | Left |Right |
- *                                ,------+-------+------|       |------+------+------.
- *                                |      |       | PgUp |       |  Up  |      |      |
- *                                |Space |LShift |------|       |------|RShift|Space |
- *                                |      |       | PgDn |       | Down |      |      |
- *                                `---------------------'       `--------------------'
- */
-// 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_DEL,
-        KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_BSPC,
-        KC_LSFT,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_ENT,
-        KC_LCTL,        M(MFNLR),     KC_LGUI,KC_MPLY,ALT_T(KC_APP),
-
-                                              ALT_T(KC_ESC),  TG(NUMR),
-                                                              KC_PGUP,
-                                            KC_SPC, KC_LSFT,  KC_PGDN,
-
-        // right hand
-             KC_DEL,      KC_6,   KC_7,    KC_8,    KC_9,    KC_0,     KC_RBRC,
-             KC_BSPC,     KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,
-                          KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN,  SFT_T(KC_QUOT),
-             KC_ENT,      KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  SFT_T(KC_BSLS),
-                                  KC_RALT, KC_MINS, KC_HOME, KC_EQL,   CTL_T(KC_END),
-
-             KC_LEFT, KC_RGHT,
-             KC_UP,
-             KC_DOWN, KC_RSFT,  KC_SPC
-    ),
-/* Dvorak layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  | Del  |           | Del  |   6  |   7  |   8  |   9  |   0  |   =    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   '  |   ,  |   .  |   P  |   Y  |Backsp|           |Backsp|   F  |   G  |   C  |   R  |   L  |   /    |
- * |--------+------+------+------+------+------|ace   |           |ace   |------+------+------+------+------+--------|
- * | LShift |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |   S  | -/Shift|
- * |--------+------+------+------+------+------|Enter |           |Enter |------+------+------+------+------+--------|
- * | LShift |   ;  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |   Z  | \/Shift|
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl |  fn  | LGui | Play |App/Alt|                                      | RAlt |   [  | Home |   ]  |End/Ctl|
- *   `-----------------------------------'                                      `-----------------------------------'
- *                                       ,--------------.       ,-------------.
- *                                       |Esc/Alt| num  |       | Left |Right |
- *                                ,------+-------+------|       |------+------+------.
- *                                |      |       | PgUp |       |  Up  |      |      |
- *                                |Space |LShift |------|       |------|RShift|Space |
- *                                |      |       | PgDn |       | Down |      |      |
- *                                `---------------------'       `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[DVRK] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_GRV,   KC_1,      KC_2,    KC_3,    KC_4,   KC_5,   KC_DEL,
-        KC_TAB,   KC_QUOT,   KC_COMM, KC_DOT,  KC_P,   KC_Y,   KC_BSPC,
-        KC_LSFT,  KC_A,      KC_O,    KC_E,    KC_U,   KC_I,
-        KC_LSFT,  KC_SCLN,   KC_Q,    KC_J,    KC_K,   KC_X,   KC_ENT,
-        KC_LCTL,  M(MFNLR),  KC_LGUI, KC_MPLY, ALT_T(KC_APP),
-
-                                              ALT_T(KC_ESC),  TG(NUMR),
-                                                              KC_PGUP,
-                                            KC_SPC, KC_LSFT,  KC_PGDN,
-
-        // right hand
-             KC_DEL,      KC_6,   KC_7,    KC_8,    KC_9,    KC_0,     KC_EQL,
-             KC_BSPC,     KC_F,   KC_G,    KC_C,    KC_R,    KC_L,     KC_SLSH,
-                          KC_D,   KC_H,    KC_T,    KC_N,    KC_S,     SFT_T(KC_MINS),
-             KC_ENT,      KC_B,   KC_M,    KC_W,    KC_V,    KC_Z,     SFT_T(KC_BSLS),
-                                  KC_RALT, KC_LBRC, KC_HOME, KC_RBRC,  CTL_T(KC_END),
-
-             KC_LEFT, KC_RGHT,
-             KC_UP,
-             KC_DOWN, KC_RSFT,  KC_SPC
-    ),
-/* Numeric Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |      |      |  Tab |   /  |   *  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |  F6  |  F7  |  F8  |  F9  |  F10 |      |           |      |      | Home |   7  |   8  |   9  |   +    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |  F11 |  F12 |      |      |      |------|           |------|  Up  | End  |   4  |   5  |   6  |   +    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           | Left | Down | Right|   1  |   2  |   3  |KpEnter |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |   0  |  00  |   .  |Etr/Ctl|
- *   `----------------------------------'                                       `-----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |n.lock|c.lock|
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[NUMR] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
-       KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-       KC_TRNS, KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                                               KC_TRNS, KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,   KC_TAB,  KC_PSLS, KC_PAST, KC_PMNS,
-       KC_TRNS, KC_TRNS, KC_HOME, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-                KC_UP,   KC_END,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-       KC_LEFT, KC_DOWN, KC_RGHT, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-                         KC_TRNS, KC_P0,   M(MDBL0),KC_PDOT, CTL_T(KC_PENT),
-
-       KC_NLCK, KC_CAPS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* fn layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |Insert|           |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |VolUp |           |      |      |      |      |      |      | Pause  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      | Calc | Mail |Browsr|------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      | cut  | copy |paste | Mute |VolDn |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       | Next |      |      |
- *                                 | Mute |      |------|       |------|      |      |
- *                                 |      |      |      |       | Prev |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[FNLR] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_INS,
-       KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_VOLU,
-       KC_TRNS, KC_TRNS, KC_TRNS,      KC_CALC,     KC_MAIL,      KC_WHOM,
-       KC_TRNS, KC_TRNS, LSFT(KC_DEL), LCTL(KC_INS),LSFT(KC_INS), KC_MUTE, KC_VOLD,
-       KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_MUTE, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_INS,   KC_EJCT, KC_PWR,  KC_SLEP, KC_WAKE, KC_PSCR, KC_SLCK,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
-       KC_TRNS, KC_TRNS,
-       KC_MPRV,
-       KC_MNXT, KC_TRNS, KC_TRNS
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-    switch(id) {
-        case MDBL0:
-            if (record->event.pressed) {
-              return MACRO( I(25), T(P0), T(P0), END );
-            }
-        break;
-        case MFNLR:
-            layer_invert(NUMR);
-            layer_invert(FNLR);
-            break;
-    }
-    return MACRO_NONE;
-};
-
-// 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) {
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    // led 1: numeric layer
-    if (layer_state & (1 << NUMR)) {
-        ergodox_right_led_1_on();
-    }
-    // led 2: Dvorak layer
-    if (default_layer_state == 1 << DVRK) {
-        ergodox_right_led_2_on();
-    }
-    // led 3: caps lock
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-      ergodox_right_led_3_on();
-    }
-
-};
diff --git a/layouts/community/ergodox/tm2030/readme.md b/layouts/community/ergodox/tm2030/readme.md
deleted file mode 100644
index fce0c46e7d..0000000000
--- a/layouts/community/ergodox/tm2030/readme.md
+++ /dev/null
@@ -1,136 +0,0 @@
-# TypeMatrix™ 2030 inspired layout
-
-This is a [TypeMatrix™ 2030](http://typematrix.com/2030/features.php) inspired layout for the ErgoDox EZ. The _TypeMatrix_ is a nice small ergonomic keyboard with a matrix layout, and it provides several nice features like `enter`, `backspace` and `delete` at the center, bigger `shift` keys and international `cut`, `copy` and `paste` keys.
-
-The idea in this ErgoDox layout is to make it is as close as possible to the TM2030, such that it would be easy to switch between the TM and the ErgoDox. No _fancy_ features have been implemented, as this is intended to be a base for further customization if desired. Some keys have been duplicated in order to accomodate for most people.
-
-Most of the TM2030 features are supported except
-* automatic window switching (alt-tab key, at the left of the space key)
-* show desktop key (at the right of the space key)
-* 102/106 modes
-
-Dvorak mode is even supported by pressing [`Magic`](/docs/feature_bootmagic.md)+`1` (`Magic` is by default `LShift`+`RShift`)
-
-Some keys had to be moved around to fit into the ErgoDox, especially the `F1`-`F12` keys and the arrow keys.
-
-## Base Layer
-This is the default layer, close to the TM with the following differences:
-
- - Top row (with the `F`-keys) and rightmost column (with application shortcuts) are removed, the corresponding keys are displaced elsewhere.
- - Bottom-left keys are reorganized on a single row as: `Ctrl`, `fn`, `Gui`, `Play`, `App`/`Alt`.
- - `shuffle` and `desktop` are not supported.
- - `right-shift` is moved on `'`, `\` and on the right thumb (the latter is actually the only _true_ `right-shift`, and must be used in the `Magic` key combination).
- - `right-ctrl` is moved on `End`.
- - `]` is moved in place of the dash (`-`).
- - Dash (`-`) and `=` are moved on bottom right row.
- - Arrows and `PgUp`/`PgDn` are moved on the thumbs.
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   `    |   1  |   2  |   3  |   4  |   5  | Del  |           | Del  |   6  |   7  |   8  |   9  |   0  |   ]    |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-| Tab    |   Q  |   W  |   E  |   R  |   T  |Backsp|           |Backsp|   Y  |   U  |   I  |   O  |   P  |   [    |
-|--------+------+------+------+------+------|ace   |           |ace   |------+------+------+------+------+--------|
-| LShift |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | '/Shift|
-|--------+------+------+------+------+------|Enter |           |Enter |------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | \/Shift|
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |LCtrl |  fn  | LGui | Play |App/Alt|                                      | RAlt |   -  | Home |   =  |End/Ctl|
-  `-----------------------------------'                                      `-----------------------------------'
-                                      ,--------------.       ,-------------.
-                                      |Esc/Alt| num  |       | Left |Right |
-                               ,------+-------+------|       |------+------+------.
-                               |      |       | PgUp |       |  Up  |      |      |
-                               |Space |LShift |------|       |------|RShift|Space |
-                               |      |       | PgDn |       | Down |      |      |
-                               `---------------------'       `--------------------'
-```
-
-### Layer Switching
-- Use `num` to toggle the Numeric Layer.
-- Hold `fn` to temporarily activate the Numeric & Fn Layers.
-
-As on the original TM 2030, when `num` layer is activated, holding `fn` disables it but enables the other `fn` keys.
-
-## Dvorak Layer
-Same as Layer 0 but with _Dvorak_ layout, to use with QWERTY OS layout.
-
-Enable Dvorak layout with [`Magic`](/docs/feature_bootmagic.md)+`1` (`LShift`+`RShift`+`1`), disable with `Magic`-`0`.
-
-The middle (green) led indicates when the Dvorak layer is activated.
-
-    ,--------------------------------------------------.           ,--------------------------------------------------.
-    |   `    |   1  |   2  |   3  |   4  |   5  | Del  |           | Del  |   6  |   7  |   8  |   9  |   0  |   =    |
-    |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-    | Tab    |   '  |   ,  |   .  |   P  |   Y  |Backsp|           |Backsp|   F  |   G  |   C  |   R  |   L  |   /    |
-    |--------+------+------+------+------+------|ace   |           |ace   |------+------+------+------+------+--------|
-    | LShift |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |   S  | -/Shift|
-    |--------+------+------+------+------+------|Enter |           |Enter |------+------+------+------+------+--------|
-    | LShift |   ;  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |   Z  | \/Shift|
-    `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-      |LCtrl |  fn  | LGui | Play |App/Alt|                                      | RAlt |   [  | Home |   ]  |End/Ctl|
-      `-----------------------------------'                                      `-----------------------------------'
-                                          ,--------------.       ,-------------.
-                                          |Esc/Alt| num  |       | Left |Right |
-                                   ,------+-------+------|       |------+------+------.
-                                   |      |       | PgUp |       |  Up  |      |      |
-                                   |Space |LShift |------|       |------|RShift|Space |
-                                   |      |       | PgDn |       | Down |      |      |
-                                   `---------------------'       `--------------------'
-
-## Numeric Layer
-Numeric layer close to the TM when toggling `num`, with the following differences:
-
-- Numpad is displaced by 1 to the top left.
-- Arrows are displaced by 1 to the left.
-- Provides access to `F1`-`F12`, `caps-lock` and `num-lock`.
-
-The numeric layer is indicated with the left (red) led. Caps-lock is indicated with the right (blue) led.
-
-    ,--------------------------------------------------.           ,--------------------------------------------------.
-    |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |      |      |  Tab |   /  |   *  |   -    |
-    |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-    |        |  F6  |  F7  |  F8  |  F9  |  F10 |      |           |      |      | Home |   7  |   8  |   9  |   +    |
-    |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-    |        |  F11 |  F12 |      |      |      |------|           |------|  Up  | End  |   4  |   5  |   6  |   +    |
-    |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-    |        |      |      |      |      |      |      |           | Left | Down | Right|   1  |   2  |   3  |KpEnter |
-    `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-      |      |      |      |      |      |                                       |      |   0  |  00  |   .  |Etr/Ctl|
-      `----------------------------------'                                       `-----------------------------------'
-                                           ,-------------.       ,-------------.
-                                           |      |      |       |n.lock|c.lock|
-                                    ,------|------|------|       |------+------+------.
-                                    |      |      |      |       |      |      |      |
-                                    |      |      |------|       |------|      |      |
-                                    |      |      |      |       |      |      |      |
-                                    `--------------------'       `--------------------'
-
-## Fn Layer
-Activated simultaneously with the Numeric layer when holding the `fn` key. As on the TM, it provides access to the following features:
-- `cut`, `copy` and `paste`
-- `volume up`, `volume down` and `mute` — as opposed to the TM, these are only on left hand
-- `previous track` and `next track`
-- `calculator`, `mail` and `browser home`
-- `insert`, `power`, `sleep`, `wake`, `print screen`, `scroll-lock` and `pause`
-
-Note: the `eject` key does not work due to jackhumbert/qmk_firmware#82
-
-    ,--------------------------------------------------.           ,--------------------------------------------------.
-    |        |      |      |      |      |      |Insert|           |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
-    |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-    |        |      |      |      |      |      |VolUp |           |      |      |      |      |      |      | Pause  |
-    |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-    |        |      |      | Calc | Mail |Browsr|------|           |------|      |      |      |      |      |        |
-    |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-    |        |      | cut  | copy |paste | Mute |VolDn |           |      |      |      |      |      |      |        |
-    `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-      |      |      |      |      |      |                                       |      |      |      |      |      |
-      `----------------------------------'                                       `----------------------------------'
-                                           ,-------------.       ,-------------.
-                                           |      |      |       |      |      |
-                                    ,------|------|------|       |------+------+------.
-                                    |      |      |      |       | Next |      |      |
-                                    | Mute |      |------|       |------|      |      |
-                                    |      |      |      |       | Prev |      |      |
-                                    `--------------------'       `--------------------'
diff --git a/layouts/community/ergodox/townk_osx/config.h b/layouts/community/ergodox/townk_osx/config.h
deleted file mode 100644
index c817dadf50..0000000000
--- a/layouts/community/ergodox/townk_osx/config.h
+++ /dev/null
@@ -1,40 +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/>.
-*/
-
-#pragma once
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-//#define DEBUG_MATRIX_SCAN_RATE
-#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 3000
diff --git a/layouts/community/ergodox/townk_osx/keymap.c b/layouts/community/ergodox/townk_osx/keymap.c
deleted file mode 100644
index 5c0c1c8ecd..0000000000
--- a/layouts/community/ergodox/townk_osx/keymap.c
+++ /dev/null
@@ -1,279 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "action_util.h"
-#include "led.h"
-#include "keymap.h"
-#include "timer.h"
-
-/*
-
-# Why this Layout
-
-This layout was based on Kinesis layout and other ErgoDox user layouts
-available. It's target to be used on a MacOS but I'm pretty sure it can be
-addapted to Windows and/or Linux easily.
-
-## Function Key
-
-The `fn` key work almost like it would in any other keyboard with the exception
-it has a semi-sticky behavior. What does that mean?
-
-Well, if you press the `fn` and release it, the keyboard will be put on the
-_function layout_ and the next key stroke will be processed as if the `fn` key
-was pressed. Aftwards, the leyout get back to _normal_. If you hold `fn` and
-press any other key, when you release them, the keyboard leyout is back to
-_normal_.
-
-While pressing the `fn` with the left hand and strikeing the other keys on the
-right hand is farly easy, the same cannot being said for the other keys on the
-left side. So, instead of trying to do contorcionism with my left hand, I
-decided to do a semi-sticky version of `fn`. This way, I can press the  `fn`
-key with my pinky, release it and press the `1` key to issue an `F1` to the
-operating system.
-
-## Key-Pad Key
-
-The `key pad` key is a layout switch key. If pressed, it will put the keyboard
-on the _key pad layout_ and stay there until key is pressed again.
-
-This is used to make the keyboard behave mostly like a **num pad keyboard**.
-
-## Notes
-- Regardless in which layout you are, keys from other layouts are not
-  accessible. This means that if you are on the _key pad layout_, the left hand
-  will be pretty much unusable.
-  Of course that like anything else, there are exceptions to this rule.
-  Modifiers should remain accessible throughout the layers.
-- The _shift key_ is, like the _function key_, also configured to have a sticky
-  behavior.
-- All sticky keys have a timeout of 3 seconds.
-
-*/
-#define BASE   0
-#define KEYPAD 1
-#define FN     2
-
-#define MACRO_TMUX_ESC        10
-#define MACRO_TMUX_PASTE      11
-#define MACRO_OSX_COPY        12
-#define MACRO_OSX_PASTE       13
-
-#define M_TESC   M(MACRO_TMUX_ESC)
-#define M_TPASTE M(MACRO_TMUX_PASTE)
-#define M_OSXCPY M(MACRO_OSX_COPY)
-#define M_OSXPST M(MACRO_OSX_PASTE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base Layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |        `~ |   1  |   2  |   3  |   4  |   5  | ESC  |           | Pwr  |   6  |   7  |   8  |   9  |   0  | - _       |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Tab       |   Q  |   W  |   E  |   R  |   T  | F16  |           | F17  |   Y  |   U  |   I  |   O  |   P  | = +       |
- * |-----------+------+------+------+------+------| Meh  |           | Meh  |------+------+------+------+------+-----------|
- * | \ (Ctrl)  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | ' " (Ctrl)|
- * |-----------+------+------+------+------+------| F18  |           | F19  |------+------+------+------+------+-----------|
- * |  LShift   |   Z  |   X  |   C  |   V  |   B  | Hyper|           | Hyper|   N  |   M  |   ,  |   .  |   /  |   RShift  |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *     | FN    | KPAD |LCtrl | LAlt | LGui |                                       | RGui | RAlt | RCtrl| KPAD |    FN |
- *     `-----------------------------------'                                       `-----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         | M(0) | M(1) |           | M(2) | M(3) |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      | Home |           | PgUp |      |      |
- *                                  |Backsp| Del  |------|           |------| Enter| Space|
- *                                  |      |      | End  |           | PgDn |      |      |
- *                                  `--------------------'           `--------------------'
- *
- * M(0) = Ctrk+A Esc
- *        (this is used to issue the Esc key to the Tmux application)
- * M(1) = Ctrk+A P
- *        (this is used to issue the Paste key to the Tmux application)
- * M(2) = Cmd+C
- * M(3) = Cmd+V
- */
-[BASE]=LAYOUT_ergodox(//left half
-              KC_GRV,         KC_1,       KC_2,     KC_3,           KC_4,       KC_5,     KC_ESC,
-              KC_TAB,         KC_Q,       KC_W,     KC_E,           KC_R,       KC_T,     MEH_T(KC_F16),
-              CTL_T(KC_BSLS), KC_A,       KC_S,     KC_D,           KC_F,       KC_G,
-              OSM(MOD_LSFT),  KC_Z,       KC_X,     KC_C,           KC_V,       KC_B,     ALL_T(KC_F18),
-              OSL(FN),        TG(KEYPAD), KC_LCTRL, KC_LALT,        KC_LGUI,
-                                                                                M_TESC,   M_TPASTE,
-                                                                                          KC_HOME,
-                                                                    KC_BSPC,    KC_DEL,   KC_END,
-              //right half
-              KC_PWR,         KC_6,       KC_7,     KC_8,           KC_9,       KC_0,     KC_MINS,
-              MEH_T(KC_F17),  KC_Y,       KC_U,     KC_I,           KC_O,       KC_P,     KC_EQL,
-                              KC_H,       KC_J,     KC_K,           KC_L,       KC_SCLN,  CTL_T(KC_QUOT),
-              ALL_T(KC_F19),  KC_N,       KC_M,     KC_COMM,        KC_DOT,     KC_SLSH,  OSM(MOD_LSFT),
-                              KC_RGUI,    KC_RALT,  CTL_T(KC_LBRC), LT(KEYPAD, KC_RBRC),  OSL(FN),
-              M_OSXCPY,       M_OSXPST,
-              KC_PGUP,
-              KC_PGDN,        KC_ENT,     KC_SPC),
-
-/* Keymap 1: KeyPad Layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           |      | LClk | RClk | MClk |      |      |           | BTab | Clear|   /  |   *  |   ^  |   (  |           |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | M.Accel 2 |      |ScrlUp|  U   |ScrlDn|      |      |           | Tab  |   7  |   8  |   9  |   +  |   )  |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * | M.Accel 1 |      |   L  |  D   |  R   |      |------|           |------|   4  |   5  |   6  |   -  |      |           |
- * |-----------+------+------+------+------+------|      |           |Return|------+------+------+------+------+-----------|
- * | M.Accel 0 |      |ScrlL |      |ScrlR |      |      |           |      |   1  |   2  |   3  |   =  |      |           |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *     |       | XXXX |      |      |      |                                       |   0  |   .  |   ,  | XXXX |       |
- *     `-----------------------------------'                                       `-----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         |      |      |           |      |      |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      |      |           |      | XXXX |      |
- *                                  |      |      |------|           |------| XXXX |      |
- *                                  |      |      |      |           |      | XXXX |      |
- *                                  `--------------------'           `--------------------'
- */
-[KEYPAD]=LAYOUT_ergodox(//left half
-                KC_NO,        KC_NO,    KC_MS_BTN1,    KC_MS_BTN2,     KC_MS_BTN3,     KC_NO,   KC_NO,
-                KC_MS_ACCEL2, KC_NO,    KC_MS_WH_UP,   KC_MS_U,        KC_MS_WH_DOWN,  KC_NO,   KC_NO,
-                KC_MS_ACCEL1, KC_NO,    KC_MS_L,       KC_MS_D,        KC_MS_R,        KC_NO,
-                KC_MS_ACCEL0, KC_NO,    KC_MS_WH_LEFT, KC_NO,          KC_MS_WH_RIGHT, 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,
-                //right half
-                LSFT(KC_TAB), KC_CLEAR, KC_KP_SLASH,   KC_KP_ASTERISK, KC_CIRCUMFLEX,  KC_LPRN, KC_NO,
-                KC_TAB,       KC_KP_7,  KC_KP_8,       KC_KP_9,        KC_KP_PLUS,     KC_RPRN, KC_NO,
-                              KC_KP_4,  KC_KP_5,       KC_KP_6,        KC_KP_MINUS,    KC_NO,   KC_NO,
-                KC_KP_ENTER,  KC_KP_1,  KC_KP_2,       KC_KP_3,        KC_KP_EQUAL,    KC_NO,   KC_NO,
-                                        KC_KP_0,       KC_KP_DOT,      KC_KP_COMMA,    KC_TRNS, KC_NO,
-                KC_NO,        KC_NO,
-                KC_NO,
-                KC_NO,        KC_TRNS,  KC_NO),
-
-/* Keymap 2: Functions Layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  Vol. Up  |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * |           | Stop |  Rw  |  Rec |  FF  |      | XXXX |           | XXXX |      |      |      |      |      | Vol. Down |
- * |-----------+------+------+------+------+------| XXXX |           | XXXX |------+------+------+------+------+-----------|
- * |  CapsLock | Eject| Prev | Play | Next |      |------|           |------| Left | Down |  Up  | Right|      |   Mute    |
- * |-----------+------+------+------+------+------| XXXX |           | XXXX |------+------+------+------+------+-----------|
- * |  L Shift  |      |      |      |      |      | XXXX |           | XXXX |      |      |      |      |      |  R Shift  |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *     | XXXXX |      | XXXX | XXXX | XXXX |                                       | XXXX | XXXX | XXXX |      | XXXXX |
- *     `-----------------------------------'                                       `-----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         |      |      |           |      |      |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      |      |           |      |      |      |
- *                                  |      |      |------|           |------|      |      |
- *                                  |      |      |      |           |      |      |      |
- *                                  `--------------------'           `--------------------'
- *
- * XXX = These keys are transparent keys that, when pressed, they issue the key from the previous layer.
- */
-[FN]=LAYOUT_ergodox(//left half
-            KC_NO,   KC_F1,          KC_F2,               KC_F3,               KC_F4,                 KC_F5,  KC_F6,
-            KC_NO,   KC_MEDIA_STOP,  KC_MEDIA_REWIND,     KC_MEDIA_SELECT,     KC_MEDIA_FAST_FORWARD, KC_NO,  KC_TRNS,
-            KC_CAPS, KC_MEDIA_EJECT, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,   KC_NO,
-            KC_LSFT, KC_NO,          KC_NO,               KC_NO,               KC_NO,                 KC_NO,  KC_TRNS,
-            KC_TRNS, KC_NO,          KC_TRNS,             KC_TRNS,             KC_TRNS,
-                                                                                                      KC_NO,  KC_NO,
-                                                                                                              KC_NO,
-                                                                               KC_NO,                 KC_NO,  KC_NO,
-            //right half
-            KC_F7,   KC_F8,          KC_F9,               KC_F10,              KC_F11,                KC_F12, KC_VOLU,
-            KC_TRNS, KC_NO,          KC_NO,               KC_NO,               KC_NO,                 KC_NO,  KC_VOLD,
-                     KC_LEFT,        KC_DOWN,             KC_UP,               KC_RIGHT,              KC_NO,  KC_MUTE,
-            KC_TRNS, KC_NO,          KC_NO,               KC_NO,               KC_NO,                 KC_NO,  KC_RSFT,
-                                     KC_TRNS,             KC_TRNS,             KC_TRNS,               KC_NO,  KC_TRNS,
-            KC_NO,   KC_NO,
-            KC_NO,
-            KC_NO,   KC_NO,          KC_NO)};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  // MACRODOWN only works in this function
-  switch(id) {
-    case MACRO_TMUX_ESC:
-      if (record->event.pressed) {
-        return MACRO(D(LCTRL), T(A), U(LCTRL), D(ESC), END);
-      }
-      return MACRO(U(ESC), END);
-    case MACRO_TMUX_PASTE:
-      if (record->event.pressed) {
-        return MACRO(D(LCTRL), T(A), U(LCTRL), D(P), END);
-      }
-      return MACRO(U(P), END);
-    case MACRO_OSX_COPY:
-      if (record->event.pressed) {
-        return MACRO(D(LGUI), D(C), END);
-      }
-      return MACRO(U(C), U(LGUI), END);
-    case MACRO_OSX_PASTE:
-      if (record->event.pressed) {
-        return MACRO(D(LGUI), D(V), END);
-      }
-      return MACRO(U(V), U(LGUI), END);
-  }
-  return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-uint8_t current_layer = BASE;
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-  uint8_t layer = get_highest_layer(layer_state);
-
-  ergodox_led_all_off();
-  ergodox_led_all_set(LED_BRIGHTNESS_LO);
-
-  switch (layer) {
-  case BASE:
-    current_layer = BASE;
-    break;
-  case KEYPAD:
-    current_layer = KEYPAD;
-    break;
-  default:
-    // none
-    break;
-  }
-
-  // layer leds
-  if (current_layer == KEYPAD) {
-    ergodox_right_led_3_on();
-  }
-
-  // capslock
-  if (host_keyboard_leds() & (3<<USB_LED_CAPS_LOCK)) {
-    ergodox_right_led_1_on();
-  }
-
-  // Temporary leds
-
-  // The function layer takes over other layers and we need to reflect that on the leds.
-  // If the current layer is the BASE, we simply turn on the FN led, but if the current
-  // layer is the KEYPAD, than we must turn it off before turning on the FN led.
-  if (layer == FN && !has_oneshot_layer_timed_out()) {
-    ergodox_right_led_3_off();
-    ergodox_right_led_2_on();
-  }
-
-  // if the shifted is pressed I show the case led in a brighter color. This is nice to
-  // differenciate the shift from the capslock.
-  // Notice that I make sure that we're not using the shift on a chord shortcut (pressing
-  // shift togather with other modifiers).
-  if((keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) &&                                 // is shift pressed and there is no other
-      !(keyboard_report->mods & (~MOD_BIT(KC_LSFT) & ~MOD_BIT(KC_RSFT)))) ||                           //    modifier being pressed as well
-     (get_oneshot_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) && !has_oneshot_mods_timed_out())) {  // or the one shot shift didn't timed out
-    ergodox_right_led_1_set(LED_BRIGHTNESS_HI);
-    ergodox_right_led_1_on();
-  }
-};
diff --git a/layouts/community/ergodox/townk_osx/readme.md b/layouts/community/ergodox/townk_osx/readme.md
deleted file mode 100644
index e10e447829..0000000000
--- a/layouts/community/ergodox/townk_osx/readme.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Townk's Keymap
-
-Trying to take care of an enjury on my arm I borrow an ergonomic keyboard from
-a frient ([Kinesis Advantage](https://www.kinesis-ergo.com/shop/advantage2/)).
-
-I really enjoyed my time with it but there were some anoyancies:
-
-* The curvature on the keys bothered me since I'm a Vim user and using the
-  motion keys on my editor was awkard.
-* I had to spend too much time remapping the keyboard to make some symbol keys
-  more accessible to me.
-* The fact that my hands had to stay close to each other was a bit stressfull
-  to my sholders.
-
-After a long research I find out that Ergodox EZ would be perfect for my needs
-and purchase one. Before the keyboard even got in my hands I started to think
-on the layout I would use on it and soon enough I planed couple adjustments
-from the Kinesis I was using so far.
-
-## The layout
-
-Here are the layout mapping in images so you can have a glimpse on it:
-
-![Base Layout](https://i.imgur.com/m1yyQvU.png)
-![fn Layout](https://i.imgur.com/AJIzrjq.png)
-![Keypad & Mouse Layout](https://i.imgur.com/9I6Qr0e.png)
-
-Notice that, differently from the default behavior, my layer keys are not transparent
-by default, which means that if you press any non-labeled white key, nothing will be
-handled to the OS.
-
-### One shot keys
-
-It all started with the access to the function keys (F1, F2, F3...), since
-those keys are located on a different layer I needed a way to press them with
-minimal effort without disrupting my flow.
-
-For me, togglihg a layer to press a button and than toggle it back is a waste
-of time (although I admit it's a single tap from what I have), so I decided to
-do it as a one shot key. I could press it and the next pressed key would be
-handled by the target layer which just after it delivers the key to the OS it
-would get back to the previous layer.
-
-After setting up my layout to do just that I realized that occasionally I
-would stop myseld on the middle of the process and the one shot layer would be
-still triggered until I press any other key. So to prevent me from tapping
-keys I don't want I added a timeout of 3 seconds for the one shot actions.
-
-Ultimately I tested the shift key as a one shot one and really like it, so
-here you have it, all the one shot keys on my layout.
-
-## Glossary
-
-If you're not familiar with the Mac symbols used on some keys, here is a
-reference to them:
-
-| Symbol | Description         |
-| :----: | ------------------- |
-|   ⌘    | Command             |
-|   ⇪    | Caps Lock           |
-|   ⇧    | Shift               |
-|   ⌥    | Option (alt)        |
-|   ⎋    | Esc                 |
-|   ⇥    | Tab forward         |
-|   ⇤    | Tab backward        |
-|   ⌃    | Control             |
-|   ␣    | Space               |
-|   ⌫    | Backspace           |
-|   ⌦    | Delete              |
-|   ⏎    | Enter               |
-|   ⌤    | Return              |
-|   ⌽    | Power on/off button |
-|   ↖    | Home                |
-|   ↘    | End                 |
-|   ⇞    | Page up             |
-|   ⇟    | Page down           |
-|   ⌧    | Clear               |
diff --git a/layouts/community/ergodox/townk_osx/rules.mk b/layouts/community/ergodox/townk_osx/rules.mk
deleted file mode 100644
index c06021b9fb..0000000000
--- a/layouts/community/ergodox/townk_osx/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# I don't want my keyboard blinking lights when is suppose to be asleep.
-SLEEP_LED_ENABLE = no
\ No newline at end of file
diff --git a/layouts/community/ergodox/twey/keymap.c b/layouts/community/ergodox/twey/keymap.c
deleted file mode 100644
index dac153f070..0000000000
--- a/layouts/community/ergodox/twey/keymap.c
+++ /dev/null
@@ -1,232 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_steno.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define STEN 2 // steno
-#define MDIA 3 // media keys
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,---------------------------------------------------.           ,---------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4   |   5  | STEN |           | NONE  |   6  |   7  |   8  |   9  |   0  |   \    |
- * |--------+------+------+------+-------+-------------|           |-------+------+------+------+------+------+--------|
- * | Del    |   '  |   ,  |   .  |   P   |   Y  |  Esc |           | Caps  |   F  |   G  |   C  |   R  |   L  |   /    |
- * |--------+------+------+------+-------+------|      |           |       |------+------+------+------+------+--------|
- * | BkSp   |   A  |   O  |   E  |   U   |   I  |------|           |-------|   D  |   H  |   T  |   N  |   S  |   -    |
- * |--------+------+------+------+-------+------|  Tab |           | Enter |------+------+------+------+------+--------|
- * | LShift |   ;  |   Q  |   J  |   K   |   X  |      |           |       |   B  |   M  |   W  |   V  |   Z  | RShift |
- * `--------+------+------+------+-------+-------------'           `--------------+------+------+------+------+--------'
- *   |  L1  | NONE |  Grv | Left | Right |                                        |  Up  | Down |   [  |   ]  |  L1  |
- *   `-----------------------------------'                                        `----------------------------------'
- *                                        ,--------------.         ,---------------.
- *                                        |  PgUp | PgDn |         | Home  |  End  |
- *                                 ,------|-------|------|         |-------+-------+------.
- *                                 |      |       | NONE |         | AltGr |       |      |
- *                                 | Alt  | Enter |------|         |-------| Space | Ctrl |
- *                                 |      |       | Supr |         | ~MDIA |       |      |
- *                                 `---------------------'         `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(STEN),
-        KC_DEL,         KC_QUOT,      KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_ESC,
-        KC_BSPC,        KC_A,         KC_O,   KC_E,   KC_U,   KC_I,
-        KC_LSFT,        KC_SCLN,      KC_Q,   KC_J,   KC_K,   KC_X,   KC_TAB,
-        MO(SYMB),       KC_NO,        KC_GRV, KC_LEFT,KC_RGHT,
-                                                      KC_PGUP,KC_PGDN,
-                                                              KC_NO,
-                                              KC_LALT,KC_ENT ,M(0),
-        // right hand
-             KC_NO,       KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    KC_BSLS,
-             KC_CAPS,     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_ENT,      KC_B,   KC_M,   KC_W,   KC_V,   KC_Z   , KC_RSFT,
-                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC, MO(SYMB),
-             KC_HOME, KC_END,
-             KC_RALT,
-             MO(MDIA),KC_SPC,KC_RCTL
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Keymap 2: Steno for Plover
- *
- * ,---------------------------------------------------.           ,---------------------------------------------------.
- * |        |      |   #  |   #  |   #   |   #  |      |           |       |   #  |   #  |   #  |   #  |   #  |        |
- * |--------+------+------+------+-------+-------------|           |-------+------+------+------+------+------+--------|
- * |        |      |   S  |   T  |   P   |   H  |   *  |           |   *   |   F  |   P  |   L  |   T  |   D  |        |
- * |--------+------+------+------+-------+------|      |           |       |------+------+------+------+------+--------|
- * |        |      |   S  |   K  |   W   |   R  |------|           |-------|   R  |   B  |   G  |   S  |   Z  |        |
- * |--------+------+------+------+-------+------|   *  |           |   *   |------+------+------+------+------+--------|
- * |        |      |      |      |       |      |      |           |       |      |      |      |      |      |        |
- * `--------+------+------+------+-------+-------------'           `--------------+------+------+------+------+--------'
- *   |  L1  |      |      | Left | Right |                                        |  Up  | Down |      |      |  L1  |
- *   `-----------------------------------'                                        `----------------------------------'
- *                                        ,--------------.         ,---------------.
- *                                        |       |      |         |       |       |
- *                                 ,------|-------|------|         |-------+-------+------.
- *                                 |      |       |      |         |       |       |      |
- *                                 |   A  |   O   |------|         |-------|   E   |   U  |
- *                                 |      |       |      |         |       |       |      |
- *                                 `---------------------'         `----------------------'
- */
-
-
-[STEN] = LAYOUT_ergodox(  // layout: layer 2: Steno for Plover
-        // left hand
-        KC_NO,  STN_N1, STN_N2, STN_N3,  STN_N4, STN_N5,  KC_TRNS,
-        KC_NO,  KC_NO,  STN_S1, STN_TL,  STN_PL, STN_HL,  STN_ST1,
-        KC_NO,  KC_NO,  STN_S2, STN_KL,  STN_WL, STN_RL,
-        KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,   STN_ST2,
-        KC_TRNS,KC_NO,  KC_NO,  KC_TRNS, KC_TRNS,
-                                          KC_NO, KC_NO,
-                                                 KC_NO,
-                                 STN_A,  STN_O,  KC_TRNS,
-        // right hand
-          KC_NO,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,   KC_NO,
-        STN_ST3,  STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,   KC_NO,
-                  STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,   KC_NO,
-        STN_ST4,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-                          KC_TRNS, KC_TRNS,   KC_NO,   KC_NO, KC_TRNS,
-        KC_NO,  KC_NO,
-        KC_NO,
-        KC_TRNS, STN_E, STN_U
-),
-
-/* Keymap 3: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      | STEN |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      | Back |      | Frwd |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      | Lclk | Mclk | Rclk |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      | Prev | Play | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// 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_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_WBAK, KC_TRNS, KC_WFWD, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_BTN1, KC_BTN3, KC_BTN2, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_MPRV, KC_MPLY, 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
-),
-};
-
-// press `key`, but deactivate `layer` whilst it's held
-void press_without(int pressed, int key, uint8_t layer)
-{
-  static bool was_on;
-  if (pressed) {
-    was_on = layer_state_is(layer);
-    layer_off(layer);
-    register_code(key);
-  } else {
-    if (was_on) layer_on(layer);
-    unregister_code(key);
-  }
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-  switch(id) {
-  case 0:
-    press_without(record->event.pressed, KC_LGUI, STEN);
-    break;
-  }
-  return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-  steno_set_mode(STENO_MODE_BOLT);
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    __attribute__ ((unused))
-    uint32_t layer0 = layer_state & (1UL << 0),
-             layer1 = layer_state & (1UL << 1),
-             layer2 = layer_state & (1UL << 2),
-             layer3 = layer_state & (1UL << 3);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-
-    if (layer1) ergodox_right_led_1_on();
-    if (layer2) ergodox_right_led_2_on();
-    if (layer3) ergodox_right_led_3_on();
-};
diff --git a/layouts/community/ergodox/twey/readme.md b/layouts/community/ergodox/twey/readme.md
deleted file mode 100644
index 52190cb1f8..0000000000
--- a/layouts/community/ergodox/twey/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Twey's Home Configuration
-## Layers
-- Layer 0: Non-ANSI Dvorak layout, with modified modifiers — all
-  modifiers on thumb keys, as well as return and space.
-- Layer 1: Default symbol layout.
-- Layer 2: Plover-oriented stenography layer.
-- Layer 3: Extended media/mouse layout.
-
-## Hardware notes
-The default Ergodox EZ keycaps are delightfully staggered, which seems
-like it would make them terrible for steno, but in fact flipping the
-top row (`QWERTYUIOP`) and the middle thumb keys upside down brings
-them close enough together to give a rather pleasant steno experience,
-without interfering much with standard Dvorak typing.
diff --git a/layouts/community/ergodox/twey/rules.mk b/layouts/community/ergodox/twey/rules.mk
deleted file mode 100644
index 87af2f7606..0000000000
--- a/layouts/community/ergodox/twey/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIRTSER_ENABLE = yes
-STENO_ENABLE = yes
-MOUSEKEY_ENABLE = no
-FORCE_NKRO = yes
diff --git a/layouts/community/ergodox/win10_writers-block/config.h b/layouts/community/ergodox/win10_writers-block/config.h
deleted file mode 100644
index ca75f83aab..0000000000
--- a/layouts/community/ergodox/win10_writers-block/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_MAX_SPEED
-#undef MOUSEKEY_TIME_TO_MAX
-
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_MAX_SPEED      3
-#define MOUSEKEY_TIME_TO_MAX    10
-
-#define TAPPING_TOGGLE  1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-#undef TAPPING_TERM
-#define TAPPING_TERM    300
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
-/* 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
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
-    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
diff --git a/layouts/community/ergodox/win10_writers-block/keymap.c b/layouts/community/ergodox/win10_writers-block/keymap.c
deleted file mode 100644
index 443e403b18..0000000000
--- a/layouts/community/ergodox/win10_writers-block/keymap.c
+++ /dev/null
@@ -1,324 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "wait.h"
-
-#define BASE 0 // default layer  -  helpful for writing in Office-style word processors.
-#define SYMB 1 // symbol layer   -  NumPad, etc. - same as Ergodox EZ default but no EEPROM or Version key
-#define RIMW 2 // rimworld layer -  made for the game RimWorld, by Tynan Sylvester | feel free to remap for your favorite game!
-#define MDIA 3 // media layer    -  mouse and music - close to Ergodox EZ default media layer
-
-#define CO_PA M(0)                  // hold copy, tap paste
-
-#define W_CUT    LCTL(KC_X)         // C-x Cut
-#define W_COPY   LCTL(KC_C)         // C-c Copy
-#define W_PASTE  LCTL(KC_V)         // C-v Paste
-#define W_UNDO   LCTL(KC_Z)         // C-z Undo
-#define W_FIND   LCTL(KC_F)         // C-v Find
-#define W_CAD    LCTL(LALT(KC_DEL)) // one-tap ctrl-alt-del
-
-
-
-//Tap Dance Declarations
-enum {
-  CAKEWARP,
-  CTRLALTMDIA,
-};
-
-void cake_count (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    layer_on (SYMB);        //define double tap here
-    layer_off (MDIA);
-  }
-  else {
-    layer_off (SYMB);       //define single tap or hold here
-    layer_off (MDIA);
-  }
-  if (state->count == 3) {
-     layer_on (RIMW);       //define triple tap here
-     layer_off (MDIA);
-  }
-  else {
-   	layer_off (RIMW);       //define single tap or hold here
-	layer_off (MDIA);
-    reset_tap_dance (state);
-  }
-}
-
-void dance_cad_mdia_fin (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_LCTL);
-    register_code (KC_LALT);
-	register_code (KC_DEL);
-  } else {
-    layer_on (MDIA);
-  }
-}
-
-void dance_cad_mdia_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_DEL);
-    unregister_code (KC_LALT);
-	unregister_code (KC_LCTL);
-  } else {
-    ;
-  }
-}
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  // tap for Layer 0, tap twice to switch to symbol layer, and tap three times to switch to rimworld layer.
-  [CAKEWARP] = ACTION_TAP_DANCE_FN(cake_count)
-  // tap for ctrl-alt-del, tap twice for media layer
-  ,[CTRLALTMDIA] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cad_mdia_fin, dance_cad_mdia_reset)
-  // 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] = {
-/* Keymap 0: Basic layer - TD(one_tap, two_taps, three_taps...)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  | 6    |           |  7   |   7  |   8  |   9  |   0  |   -  |   =    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | F12/L1 |   Q  |   W  |   E  |   R  |   T  |  {/[ |           |TD(L0 |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |L1 L2)|------+------+------+------+------+--------|
- * |Caps/Win|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------|  }/] |           TD(ctrl|------+------+------+------+------+--------|
- * |LShift/(|Z/Ctrl|   X  |   C  |   V  |   B  |      |           |altdel|   N  |   M  |   ,  |   .  |  /   |RShift/)|
- * `--------+------+------+------+------+-------------'           |L3)   |------+------+------+------+------+--------'
- * |  Undo  |  Cut |CopyPa| Meh  | LGui |                         '------|      | Enter| Left | Up   | Down | Right  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Esc  | VolUp|       | F4   | Mute |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | VolDn|       | F5   |        |      |
- *                                 |Backsp|Delete|------|       |------|  Tab / |Space |
- *                                 |ace   |      | Find |       | Alt  |  CTRL  |      |
- *                                 `--------------------'       `----------------------'
- */
-// 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,
-LT(SYMB, KC_F12),         KC_Q,         KC_W,         KC_E,        KC_R,   KC_T,   KC_LBRC,
-  GUI_T(KC_CAPS),         KC_A,         KC_S,         KC_D,        KC_F,   KC_G,
-         KC_LSPO,  CTL_T(KC_Z),         KC_X,         KC_C,        KC_V,   KC_B,   KC_RBRC,
-          W_UNDO,        W_CUT,        CO_PA, MEH_T(KC_NO),     KC_LGUI,
-                                                                         KC_ESC, KC_VOLU,
-                                                                                 KC_VOLD,
-                                                             KC_BSPC, KC_DELETE,  W_FIND,
-        // right hand
-                       KC_7,   KC_7,   KC_8,   KC_9,    KC_0,   KC_MINS,          KC_EQL,
-               TD(CAKEWARP),   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,            KC_BSLS,
-                               KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN,         KC_QUOT,
-            TD(CTRLALTMDIA),   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,         KC_RSPC,
-                                       KC_ENT, KC_LEFT, KC_UP,  KC_DOWN,        KC_RIGHT,
-                      KC_F4,        KC_MUTE,
-                      KC_F5,
-                    KC_RALT, CTL_T(KC_TAB), KC_SPC
-    ),
-
-/* Keymap 1: Symbol Layer | No EEPROM Or Version keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |   xx |           | xx   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |TD(L0 |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |L1 L2)|------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |   -    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-         KC_NO, 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_MINS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,    KC_NO,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Keymap 2: RimWorld Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  ESC   |   1  |   2  |   3  |   4  |   5  |  6   |           |   7  |   7  |   8  |   9  |   0  |   -  |   =    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  TAB   |   C  |  ,<  |   W  |   >. |   R  |      |           |TD(L0 |  U   |  B   |   N  |  J   |  M   |   PGUP |
- * |--------+------+------+------+------+------| F10  |           |L1 L2)|------+------+------+------+------+--------|
- * |   I    |   F  |   A  |   S  |   D  |   8  |------|           |------|  X   |  L   |   P  |  Y   |  H   |  ENTER |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   K    |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |   PGDN |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |  F   |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |SPACE |  C   |------|       |------|  E   |SPACE |
- *                                 |      |      |  Q   |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// RIMWORLD
-[RIMW] = LAYOUT_ergodox(
-       // left hand
-        KC_ESC,   KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,
-        KC_TAB,   KC_C, KC_COMM,     KC_W,  KC_DOT,    KC_R,  KC_F10,
-          KC_I,   KC_F,    KC_A,     KC_S,    KC_D,    KC_8,
-          KC_K,  KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,
-       KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                                     KC_C,KC_Q,KC_TRNS,
-       // right hand
-          KC_7,    KC_7,    KC_8,        KC_9,    KC_0,    KC_MINS,  KC_EQL,
-       KC_TRNS,    KC_U,    KC_B,        KC_N,    KC_J,       KC_M, KC_PGUP,
-                   KC_X,    KC_L, SFT_T(KC_P),    KC_Y,       KC_H,  KC_ENT,
-         KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,     KC_F12, KC_PGDN,
-                            KC_F,     KC_LEFT,   KC_UP,    KC_DOWN,KC_RIGHT,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS,    KC_E, KC_TRNS
-),
-/* Keymap 3: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 | Lclk | Rclk |------|       |------|      |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_BTN1, KC_BTN2, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_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
-),
-};
-
-static uint16_t key_timer;
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0: {
-            if (record->event.pressed) {
-                key_timer = timer_read(); // if the key is being pressed, we start the timer.
-            }
-            else { // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down").
-                if (timer_elapsed(key_timer) > 150) { // 150 being 150ms, the threshhold we pick for counting something as a tap.
-                    return MACRO( D(LCTL), T(C), U(LCTL), END  );
-                }
-                else {
-                    return MACRO( D(LCTL), T(V), U(LCTL), END  );
-                }
-            }
-            break;
-        }
-      }
-    return MACRO_NONE;
-};
-
-// Anything you want to do once when the keyboard initializes.
-// Tests LED function when the keyboard initializes.
-void matrix_init_user(void) {
-
-  wait_ms(500);
-  ergodox_board_led_on();
-  wait_ms(200);
-  ergodox_right_led_1_on();
-  wait_ms(200);
-  ergodox_right_led_2_on();
-  wait_ms(200);
-  ergodox_right_led_3_on();
-  wait_ms(200);
-  ergodox_board_led_off();
-  wait_ms(200);
-  ergodox_right_led_1_off();
-  wait_ms(200);
-  ergodox_right_led_2_off();
-  wait_ms(200);
-  ergodox_right_led_3_off();
-
-};
-
-
-// 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:
-            // none
-            break;
-    }
-
-};
diff --git a/layouts/community/ergodox/win10_writers-block/readme.md b/layouts/community/ergodox/win10_writers-block/readme.md
deleted file mode 100644
index cb135b4437..0000000000
--- a/layouts/community/ergodox/win10_writers-block/readme.md
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- -*- mode: markdown; fill-column: 8192 -*- -->
-
-Win10 Writer's Block ErgoDox - v1.0
-
-=======================
-
-This is a QWERTY layout for QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
-
-Professional writers may find this layout useful -- copywriters, technical writers, novelists, etc.  
-
-I use my ErgoDox with this keymap as a daily driver at my office.
-
-A gaming layer is unobtrusively built into this layout. I use that layer to play RimWorld. 
-
-Feel free to modify the gaming layer to your personal taste.
-
-## Table of Contents
-
-* [Layouts](#layouts)
-    - [Base layer](#base-layer)
-    - [Symbol layer](#symbol-layer)
-    - [Gaming layer](#rimworld-layer)
-    - [Media layer](#media-layer)
-* [Tools](#tools)
-    - [Layer notification](#layer-notification)
-* [Building](#building)
-    - [Using on Windows](#using-on-windows)
-* [License](#license)
-* [Special Thanks](#special-thanks)
-
-# Layouts
-
-* TapDance will teleport you to the layer you want: 
-* One Tap for the Base layer
-* Two Taps for the Symbol layer
-* Three Taps for the Rimworld/Gaming layer
-
-* Where the "Meh" key is located on the Ergodox EZ default layout, I've changed it to another tap dance key:
-* One Tap for CTRL-ALT-DEL
-* Two Taps for the Media/Mouse layer
-
-## Base layer
-
-[![Base layer](https://i.imgur.com/1PTR0SG.png)](http://www.keyboard-layout-editor.com/#/gists/8fd9bbdd3a23bbb5a8779de3624a3be1)
-
-This is a QWERTY layout with some quirks. 
-
-* Enter is located on a key that won't cause as much thumb fatigue.  
-* Copy and Paste work from the same key. Just hold the key to copy and tap the key to paste!
-* Undo, Find and Cut are also one-touch keys. 
-* F12 is where you would normally find TAB on standard layouts. Quickly save in Word, safely.
-* You'll find bracket keys below the "6" key.
-
-* The Meh Key is a single-button CTRL+ALT+SHIFT modifier.
-
-* Space Cadet Shift: Tap L Shift for "(" and R Shift for ")" -- holding either shift works like a normal shift.
-* Tap "Z" or Tab to use either normally. Hold them for CTRL. 
-* Tap Caps Lock to use it normally. Hold it for Win key combinations (Win+D to minimize all programs, etc).
-
-## Symbol layer
-
-[![Symbol layer](https://i.imgur.com/8nEzpcp.png)](http://www.keyboard-layout-editor.com/#/gists/04eb6458b8b17882e472f64d482f12b4)
-
-Your standard Ergodox EZ symbol + numpad layout, minus the Version and EEPROM keys.
-
-* From the base layer, hold the F12 Key to temporarily access this layer (use for quick access to numpad)
-* Release F12 to return to the base layer.
-
-## Rimworld layer
-
-[![Rimworld / Gaming Layer](https://i.imgur.com/Yh3eBjJ.png)](http://www.keyboard-layout-editor.com/#/gists/d53af8391e6e443ed0a98ccfbdb4eace)
-
-This layer was made to play RimWorld, a Sci-Fi Colony Survival Game by Tynan Sylvester and Ludeon Studios, available on Steam. 
-
-* Have fun!
-
-## Media layer
-
-[![Media layer](https://i.imgur.com/r5ysFy1.png)](http://www.keyboard-layout-editor.com/#/gists/3209d09ed4bd997e4f49f28c6ada2ab3)
-
-This is the standard Ergodox EZ media layout with more options for mouseclick buttons. 
-
-* In this layer, your "space" key changes into a back button for your browser.
-
-## LED states
-
-Your LEDs will change to indicate your layer. You'll know you are in the base layer if all LEDs are off.
-
-# Building
-
-To build, you will need the [QMK][qmk] firmware checked out. from there, dive into `keyboards/ergodox/keymaps/win10_writers-block/`
-
-[qmk]: https://github.com/qmk/qmk_firmware
-
-```
-$ make keyboard=ergodox keymap=win10_writers-block
-```
-
-## Using on Windows
-
-This layout is tested in Windows 7 Pro and Windows 10 Home environments. 
-
-# License
-
-GPL 3+
-
-# Special Thanks
-
-* To algernon for his coding help. I'm a novice but I still made this work (and figured out tap dance) with his help.
-
-* To /r/MechanicalKeyboards for being an all-around great community.
-
-* To /u/profet23 for his amazing custom Ergodox boards.
\ No newline at end of file
diff --git a/layouts/community/ergodox/win10_writers-block/rules.mk b/layouts/community/ergodox/win10_writers-block/rules.mk
deleted file mode 100644
index 83c5090c5f..0000000000
--- a/layouts/community/ergodox/win10_writers-block/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Having a file like this allows you to override Makefile definitions
-# for your own particular keymap
-
-TAP_DANCE_ENABLE=yes
-
-
-
diff --git a/layouts/community/ortho_4x12/crs/config.h b/layouts/community/ortho_4x12/crs/config.h
deleted file mode 100644
index 9ba64c921b..0000000000
--- a/layouts/community/ortho_4x12/crs/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
diff --git a/layouts/community/ortho_4x12/crs/keymap.c b/layouts/community/ortho_4x12/crs/keymap.c
deleted file mode 100644
index e0d553362c..0000000000
--- a/layouts/community/ortho_4x12/crs/keymap.c
+++ /dev/null
@@ -1,253 +0,0 @@
-// Can't Remember Sh*t Keymap for 4x12 ortho
-// http://www.keyboard-layout-editor.com/#/gists/c6c0ac051b2b118a34ef84ebadab54c7
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _ARROW  1
-#define _GAME   2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  ARROW,
-  GAME,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  PLOVER,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  \   | Alt  | Lower|SpcRse| Space|Raise |   [  |   -  |   =  |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12( \
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC, \
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), \
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER,  LT(4, KC_SPC),  KC_SPC,  RAISE,  LT(3, KC_LBRC), KC_MINS, KC_EQL, CTL_T(KC_RBRC) \
-),
-
-/* Arrow
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  \   | Alt  | Lower| Space| Space|Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROW] = LAYOUT_ortho_4x12( \
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC, \
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), \
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER,  KC_SPC,  KC_SPC,  RAISE,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
-),
-
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Shift |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Alt  |   4  |   3  |   2  | Lower|    Space    |Raise | Left | Down |  Up  | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_ortho_4x12( \
-     KC_1,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC, \
-  KC_LSFT,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, \
-  KC_LCTL,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, _______ , \
-  KC_LALT,   KC_4,    KC_3,    KC_2,    LOWER,  KC_SPC,  KC_SPC,   RAISE,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
-),
-
-
-/* Lower   (switched to # because KP# were weird in terminal emulators)
- * ,-----------------------------------------------------------------------------------.
- * |  Del |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Tab |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |   .  |  *   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Esc |      |      |      |      |      |   0  |      |      |      | KP_+ |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12( \
-   KC_DEL,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,  KC_8, KC_9,    KC_0,  _______, \
-   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_4,  KC_5, KC_6,  KC_DOT, KC_ASTR, \
-  _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12,  KC_1,  KC_2, KC_3, KC_SLSH,  _______, \
-  KC_ESC, _______, _______, _______, _______, _______,    KC_0, _______,  _______, _______, KC_PLUS, _______ \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  | Wh Up|RightC| M-Up | LeftC|QWERTY| Left | Down |  Up  | Right|  |   |   `  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Wh Dn| M-L  | M-Dn | M-R  |      |  -   |  =   |  [   |  ]   |  \   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | App  |      |      |      |      |  Ins |      | Home | PGDN | PGUP |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12( \
-  KC_TILD,   KC_EXLM,     KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,   KC_RPRN, KC_DEL, \
-   KC_DEL,   KC_WH_U,   KC_BTN2, KC_MS_U, KC_BTN1, QWERTY, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,   KC_PIPE,  KC_GRV, \
-  _______,   KC_WH_D,   KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLASH, _______, \
-  _______,   KC_APP,   _______, _______, _______, _______, KC_INS, _______, KC_HOME, KC_PGDN,   KC_PGUP,  KC_END \
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_ortho_4x12 ( \
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   , \
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, \
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX \
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | C-A-I|Qwerty|      |      |Reset |Macro0|      |      |      |      |PLOVER|C-A-D |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps | Arrow|      |Aud on|Audoff| Game |AGswap|AGnorm| PrtSc|ScrLck| Break|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff| Prev | Next | Mute | VolDn| VolUp|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      |      |      |      | Play/Pause  |      | BL_T |BL_DEC|BL_INC|BL_ST |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12( \
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, _______, _______, _______, PLOVER, LALT(LCTL(KC_DEL)), \
-  KC_CAPS, ARROW, _______, AU_ON,   AU_OFF,  GAME, AG_SWAP, AG_NORM,  KC_PSCR, KC_SLCK,  KC_PAUS,  _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV, KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
-  BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP \
-)
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is.
-{
-  switch(id) {
-    case 0: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), T(LEFT), U(LSFT), D(LCTL), T(X), U(LCTL), T(RIGHT), D(LCTL), T(V), U(LCTL), T(LEFT),  END  ); // this swaps the characters on either side of the cursor when the macro executes
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
-
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_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 GAME:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(music_scale);
-        #endif
-        persistant_default_layer_set(1UL<<_GAME);
-      }
-      return false;
-      break;
-
-
-      case LOWER:
-        if (record->event.pressed) {
-          layer_on(_LOWER);
-          update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-          layer_off(_LOWER);
-          update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-     }
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/layouts/community/ortho_4x12/crs/readme.md b/layouts/community/ortho_4x12/crs/readme.md
deleted file mode 100644
index 66b03cfd43..0000000000
--- a/layouts/community/ortho_4x12/crs/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# CRS 4x12 Ortholinear Layout
-
-Since I started with a Planck and a 2u space, it's not as optimal on a split or grid but it's what I'm used to using.
-
-Goals:
-
-* Maximum compatibility with standard keyboards
-  * I have to work on other staggered Qwerty keyboards all the time so I wanted to keep essentially the same layout instead of optimizing too much.
-* Trying to fit as many characters as possible on the default layer
-  * its easier for me to remember logical functions than characters
-  * Using the extra punctuation caps in place of arrows frees up some Row 4 caps
-  * however, I'm trying out an arrows layout with the other punctuation on the Raise layer and it is quite nice too
-* A number pad AND a number row
-
-[Here is the layout in easily readable KLE form.](http://www.keyboard-layout-editor.com/#/gists/c6c0ac051b2b118a34ef84ebadab54c7)
diff --git a/users/mtdjr/config.h b/users/mtdjr/config.h
deleted file mode 100644
index 9769ebc18a..0000000000
--- a/users/mtdjr/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef USERSPACE_CONFIG_H
-#define USERSPACE_CONFIG_H
-
-// Put normal config.h settings here:
-#define TAPPING_TERM 250
-
-#endif // !USERSPACE_CONFIG_H
diff --git a/users/mtdjr/mtdjr.c b/users/mtdjr/mtdjr.c
deleted file mode 100644
index cd67bf3b5f..0000000000
--- a/users/mtdjr/mtdjr.c
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "mtdjr.h"
-
-#ifdef SOLENOID_ENABLE
-  #include "solenoid.h"
-#endif
-
-#ifndef RGB_MODE
-  #define RGB_MODE 2
-#endif
-#ifndef RGB_HUE
-  #define RGB_HUE 285
-#endif
-
-// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESC]     = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_ESC),
-  [TD_ALTLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, LGUI(KC_L)),
-  [TD_ENDLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_END, LGUI(KC_L)),
-  [TD_PRINT]   = ACTION_TAP_DANCE_DOUBLE(LGUI(LSFT(KC_3)), LGUI(LSFT(KC_4))),
-};
-
-// Macros
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  if (record->event.pressed) {
-      switch(id) {
-          case ROOT:
-              SEND_STRING("sudo su -\n");
-              return false; break;
-          case PPLY:
-              SEND_STRING("puppet apply /etc/puppetlabs/code/environments/production/manifests/site.pp\n");
-              return false; break;
-          case PSEF:
-              SEND_STRING("ps -ef | grep ");
-              return false; break;
-      }
-  }
-  return MACRO_NONE;
-};
-
-void matrix_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-    rgblight_enable_noeeprom();
-    rgblight_mode_noeeprom(RGB_MODE);
-    rgblight_sethsv (RGB_HUE, 255, 255);
-  #endif
-  #ifdef SOLENOID_ENABLE
-    solenoid_setup();
-  #endif
-}
-
-void matrix_scan_user(void) {
-  #ifdef SOLENOID_ENABLE
-    solenoid_check();
-  #endif
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #ifdef SOLENOID_ENABLE
-    if (record->event.pressed) {
-      solenoid_fire();
-    }
-  #endif
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_ADJUST);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case SOLENOID_TOG:
-      #ifdef SOLENOID_ENABLE
-        if (record->event.pressed) {
-          solenoid_toggle();
-        }
-      #endif
-      break;
-    case SOLENOID_DWELL_MINUS:
-      #ifdef SOLENOID_ENABLE
-        if (record->event.pressed) {
-          solenoid_dwell_minus();
-        }
-      #endif
-      break;
-    case SOLENOID_DWELL_PLUS:
-      #ifdef SOLENOID_ENABLE
-        if (record->event.pressed) {
-          solenoid_dwell_plus();
-        }
-        #endif
-      break;
-    case SOLENOID_BUZZ_ON:
-      #ifdef SOLENOID_ENABLE
-        if (record->event.pressed) {
-          solenoid_buzz_on();
-        }
-      #endif
-      break;
-    case SOLENOID_BUZZ_OFF:
-      #ifdef SOLENOID_ENABLE
-        if (record->event.pressed) {
-          solenoid_buzz_off();
-        }
-      #endif
-      break;
-  }
-  return true;
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _RAISE:
-      #ifdef RGBLIGHT_ENABLE
-      rgblight_sethsv_noeeprom (240, 255, 255);
-      #endif
-      break;
-    case _LOWER:
-      #ifdef RGBLIGHT_ENABLE
-      rgblight_sethsv_noeeprom (0, 255, 255);
-      #endif
-      break;
-    case _ADJUST:
-      #ifdef RGBLIGHT_ENABLE
-      rgblight_sethsv_noeeprom (0, 0, 255);
-      #endif
-      break;
-    default:
-      #ifdef RGBLIGHT_ENABLE
-      rgblight_sethsv_noeeprom (RGB_HUE, 255, 255);
-      #endif
-      break;
-    }
-  return state;
-}
diff --git a/users/mtdjr/mtdjr.h b/users/mtdjr/mtdjr.h
deleted file mode 100644
index 4d0b046fc3..0000000000
--- a/users/mtdjr/mtdjr.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef USERSPACE
-#define USERSPACE
-
-#include "quantum.h"
-
-// Layers
-enum user_enum {
-  // Layers
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  SUPER,
-  ADJUST,
-  // Solenoid
-  SOLENOID_TOG,
-  SOLENOID_DWELL_MINUS,
-  SOLENOID_DWELL_PLUS,
-  SOLENOID_BUZZ_ON,
-  SOLENOID_BUZZ_OFF,
-};
-
-// Macro / Send String
-enum user_macros {
-  ROOT,
-  PPLY,
-  PSEF,
-};
-
-// TapDance
-enum user_tapdance {
-  TD_ENDLOCK,
-  TD_ALTLOCK,
-  TD_PRINT,
-  TD_ESC,
-};
-
-
-// Layers
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-#define _SUPER  3
-#define _ADJUST 16
-
-// Macros
-#define KC_ROOT M(ROOT)
-#define KC_PPLY M(PPLY)
-#define KC_PSEF M(PSEF)
-
-// Tapdance
-#define KC_EXC  TD(TD_ESC)
-#define KC_ELCK TD(TD_ENDLOCK)
-#define KC_ALCK TD(TD_ALTLOCK)
-#define KC_MPNT TD(TD_PRINT)
-
-// Custom Keycodes
-#define KC_     KC_TRNS
-#define KC_xxxx KC_NO
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_SUPR SUPER
-#define KC_RST  RESET
-
-// Key Combos
-#define KC_XCPY LCTL(KC_INS)
-#define KC_XINS LSFT(KC_INS)
-#define KC_CAD  LCTL(LALT(KC_DEL))
-#define KC_XCAD LCTL(LALT(KC_DEL))
-#define KC_XLCK LGUI(KC_L)
-
-// Solenoid
-#define KC_STOG SOLENOID_TOG
-#define KC_SDM  SOLENOID_DWELL_MINUS
-#define KC_SDP  SOLENOID_DWELL_PLUS
-#define KC_SBON SOLENOID_BUZZ_ON
-#define KC_SBOF SOLENOID_BUZZ_OFF
-
-// RGB and Backlighting
-#define KC_RGB  RGB_TOG
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-#define KC_MOD  RGB_MOD
-#define KC_RMOD RGB_RMOD
-#define KC_RPLN RGB_M_P
-#define KC_RBTH RGB_M_B
-#define KC_BLT  BL_TOGG
-#define KC_BLS  BL_STEP
-#define KC_BLI  BL_INC
-#define KC_BLD  BL_DEC
-#define KC_BLB  BL_BRTG
-#define KC_BLON BL_ON
-#define KC_BLOF BL_OFF
-
-
-#endif
diff --git a/users/mtdjr/readme.md b/users/mtdjr/readme.md
deleted file mode 100644
index e795ee23a5..0000000000
--- a/users/mtdjr/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright 2018 @mtdjr
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/users/mtdjr/rules.mk b/users/mtdjr/rules.mk
deleted file mode 100644
index 6eec4b5b85..0000000000
--- a/users/mtdjr/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += mtdjr.c
-TAP_DANCE_ENABLE = yes
diff --git a/users/mtdjr/solenoid.h b/users/mtdjr/solenoid.h
deleted file mode 100644
index 4ef329b4ad..0000000000
--- a/users/mtdjr/solenoid.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef SOLENOID_H
-#define SOLENOID_H
-
-#include <timer.h>
-
-
-#define SOLENOID_DEFAULT_DWELL 12
-#define SOLENOID_MAX_DWELL 100
-#define SOLENOID_MIN_DWELL 4
-#ifndef SOLENOID_ACTIVE
-  #define SOLENOID_ACTIVE false
-#endif
-#ifndef SOLENOID_PIN
-  #define SOLENOID_PIN F6
-#endif
-
-
-bool solenoid_enabled = SOLENOID_ACTIVE;
-bool solenoid_on = false;
-bool solenoid_buzz = false;
-bool solenoid_buzzing = false;
-uint16_t solenoid_start = 0;
-uint8_t solenoid_dwell = SOLENOID_DEFAULT_DWELL;
-
-
-void solenoid_buzz_on(void) {
-  solenoid_buzz = true;
-}
-
-void solenoid_buzz_off(void) {
-  solenoid_buzz = false;
-}
-
-void solenoid_dwell_minus(void) {
-  if (solenoid_dwell > 0) solenoid_dwell--;
-}
-
-void solenoid_dwell_plus(void) {
-  if (solenoid_dwell < SOLENOID_MAX_DWELL) solenoid_dwell++;
-}
-
-void solenoid_toggle(void) {
-  solenoid_enabled = !solenoid_enabled;
-}
-
-void solenoid_stop(void) {
-  writePinLow(SOLENOID_PIN);
-  solenoid_on = false;
-  solenoid_buzzing = false;
-}
-
-void solenoid_fire(void) {
-  if (!solenoid_enabled) return;
-
-  if (!solenoid_buzz && solenoid_on) return;
-  if (solenoid_buzz && solenoid_buzzing) return;
-
-  solenoid_on = true;
-  solenoid_buzzing = true;
-  solenoid_start = timer_read();
-  writePinHigh(SOLENOID_PIN);
-}
-
-void solenoid_check(void) {
-  uint16_t elapsed = 0;
-
-  if (!solenoid_on) return;
-
-  elapsed = timer_elapsed(solenoid_start);
-
-  //Check if it's time to finish this solenoid click cycle
-  if (elapsed > solenoid_dwell) {
-    solenoid_stop();
-    return;
-  }
-
-  //Check whether to buzz the solenoid on and off
-  if (solenoid_buzz) {
-    if (elapsed / SOLENOID_MIN_DWELL % 2 == 0){
-      if (!solenoid_buzzing) {
-        solenoid_buzzing = true;
-        writePinHigh(SOLENOID_PIN);
-      }
-    }
-    else {
-      if (solenoid_buzzing) {
-        solenoid_buzzing = false;
-        writePinLow(SOLENOID_PIN);
-      }
-    }
-  }
-}
-
-void solenoid_setup(void) {
-  setPinOutput(SOLENOID_PIN);
-}
-
-#endif

From a8df5fd3031e97a43c1577e31af6c066bf66b712 Mon Sep 17 00:00:00 2001
From: leah-splitkb <103112489+leah-splitkb@users.noreply.github.com>
Date: Thu, 13 Oct 2022 05:06:18 +0200
Subject: [PATCH 623/959] [Keyboard] Add splitkb.com's Aurora Sweep (#18691)

---
 keyboards/splitkb/aurora/sweep/config.h       |  22 ++
 keyboards/splitkb/aurora/sweep/glcdfont.c     | 234 +++++++++++++
 keyboards/splitkb/aurora/sweep/info.json      |  67 ++++
 .../aurora/sweep/keymaps/debug/config.h       |  21 ++
 .../aurora/sweep/keymaps/debug/keymap.c       |  77 +++++
 .../aurora/sweep/keymaps/debug/readme.md      |  25 ++
 .../aurora/sweep/keymaps/debug/rules.mk       |  18 +
 .../aurora/sweep/keymaps/default/config.h     |  34 ++
 .../aurora/sweep/keymaps/default/keymap.json  |  93 +++++
 .../aurora/sweep/keymaps/default/readme.md    | 142 ++++++++
 keyboards/splitkb/aurora/sweep/readme.md      |  48 +++
 keyboards/splitkb/aurora/sweep/rev1/config.h  |  45 +++
 keyboards/splitkb/aurora/sweep/rev1/info.json | 155 +++++++++
 keyboards/splitkb/aurora/sweep/rev1/rev1.c    |  33 ++
 keyboards/splitkb/aurora/sweep/rev1/rules.mk  |  17 +
 keyboards/splitkb/aurora/sweep/rules.mk       |  16 +
 keyboards/splitkb/aurora/sweep/sweep.c        | 322 ++++++++++++++++++
 17 files changed, 1369 insertions(+)
 create mode 100644 keyboards/splitkb/aurora/sweep/config.h
 create mode 100644 keyboards/splitkb/aurora/sweep/glcdfont.c
 create mode 100644 keyboards/splitkb/aurora/sweep/info.json
 create mode 100644 keyboards/splitkb/aurora/sweep/keymaps/debug/config.h
 create mode 100644 keyboards/splitkb/aurora/sweep/keymaps/debug/keymap.c
 create mode 100644 keyboards/splitkb/aurora/sweep/keymaps/debug/readme.md
 create mode 100644 keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk
 create mode 100644 keyboards/splitkb/aurora/sweep/keymaps/default/config.h
 create mode 100644 keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
 create mode 100644 keyboards/splitkb/aurora/sweep/keymaps/default/readme.md
 create mode 100644 keyboards/splitkb/aurora/sweep/readme.md
 create mode 100644 keyboards/splitkb/aurora/sweep/rev1/config.h
 create mode 100644 keyboards/splitkb/aurora/sweep/rev1/info.json
 create mode 100644 keyboards/splitkb/aurora/sweep/rev1/rev1.c
 create mode 100644 keyboards/splitkb/aurora/sweep/rev1/rules.mk
 create mode 100644 keyboards/splitkb/aurora/sweep/rules.mk
 create mode 100644 keyboards/splitkb/aurora/sweep/sweep.c

diff --git a/keyboards/splitkb/aurora/sweep/config.h b/keyboards/splitkb/aurora/sweep/config.h
new file mode 100644
index 0000000000..429b64bbe6
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// Not yet available in `info.json`
+#ifdef OLED_ENABLE
+#   define OLED_FONT_H "keyboards/splitkb/aurora/sweep/glcdfont.c"
+#endif
diff --git a/keyboards/splitkb/aurora/sweep/glcdfont.c b/keyboards/splitkb/aurora/sweep/glcdfont.c
new file mode 100644
index 0000000000..d6a58634d1
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/glcdfont.c
@@ -0,0 +1,234 @@
+#include "progmem.h"
+
+// NOTE: This file is a copy of `crkbd/soundmonster/glcdfont.c`
+
+// Corne 8x6 font with QMK Firmware Logo
+// Online editor: https://helixfonteditor.netlify.com/
+// See also: https://github.com/soundmonster/glcdfont_converter
+
+const unsigned char font[] PROGMEM = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
+0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
+0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC,
+0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00,
+0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2,
+0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
+0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
+0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
+0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
+0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
+0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
+0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
+0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
+0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
+0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
+0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
+0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
+0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
+0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
+0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
+0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
+0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
+0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
+0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
+0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
+0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
+0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
+0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
+0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
+0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0,
+0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
+0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
+0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
+0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
+0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
+0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
+0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
+0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
+0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
+0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
+0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
+0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
+0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
+0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
+0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
+0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
+0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
+0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
+0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
+0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
+0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
+0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
+0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
+0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
+0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
+0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
+0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F,
+0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F,
+0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F,
+0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C,
+0x78, 0x78, 0x38, 0x1C, 0x0F, 0x00,
+0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
+0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
+0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
+0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
+0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
+0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
+0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
+0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
+0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
+0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
+0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
+0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
+0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
+0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
+0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
+0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
+0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
+0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
+0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
+0x03, 0x02, 0x01, 0x01, 0x00, 0x00
+};
diff --git a/keyboards/splitkb/aurora/sweep/info.json b/keyboards/splitkb/aurora/sweep/info.json
new file mode 100644
index 0000000000..12d739e7be
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/info.json
@@ -0,0 +1,67 @@
+{
+    "manufacturer": "splitkb.com",
+    "url": "https://splitkb.com/products/aurora-sweep-pcb-kit",
+    "maintainer": "splitkb",
+    "usb": {
+        // pid is not defined here as that is
+        // revision-specific due to VIA limitations
+        "vid": "0x8D1D",
+        "device_version": "1.0.0"
+    },
+    // Technically it only uses Pro Micro pins,
+    // but most people buy the Elite-C controller
+    // so we want to use the atmel-dfu bootloader.
+    "development_board": "elite_c",
+    "split": {
+        "enabled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"label": "L01", "x":  0, "y": 0.93},
+                {"label": "L02", "x":  1, "y": 0.31},
+                {"label": "L03", "x":  2, "y": 0},
+                {"label": "L04", "x":  3, "y": 0.28},
+                {"label": "L05", "x":  4, "y": 0.42},
+                {"label": "R05", "x":  7, "y": 0.42},
+                {"label": "R04", "x":  8, "y": 0.28},
+                {"label": "R03", "x":  9, "y": 0},
+                {"label": "R02", "x": 10, "y": 0.31},
+                {"label": "R01", "x": 11, "y": 0.93},
+
+                {"label": "L06", "x":  0, "y": 1.93},
+                {"label": "L07", "x":  1, "y": 1.31},
+                {"label": "L08", "x":  2, "y": 1},
+                {"label": "L09", "x":  3, "y": 1.28},
+                {"label": "L10", "x":  4, "y": 1.42},
+                {"label": "R10", "x":  7, "y": 1.42},
+                {"label": "R09", "x":  8, "y": 1.28},
+                {"label": "R08", "x":  9, "y": 1},
+                {"label": "R07", "x": 10, "y": 1.31},
+                {"label": "R06", "x": 11, "y": 1.93},
+
+                {"label": "L11", "x":  0, "y": 2.93},
+                {"label": "L12", "x":  1, "y": 2.31},
+                {"label": "L13", "x":  2, "y": 2},
+                {"label": "L14", "x":  3, "y": 2.28},
+                {"label": "L15", "x":  4, "y": 2.42},
+                {"label": "R15", "x":  7, "y": 2.42},
+                {"label": "R14", "x":  8, "y": 2.28},
+                {"label": "R13", "x":  9, "y": 2},
+                {"label": "R12", "x": 10, "y": 2.31},
+                {"label": "R11", "x": 11, "y": 2.93},
+
+                {"label": "L16", "x": 3.5, "y": 3.75},
+                {"label": "L17", "x": 4.5, "y": 4},
+                {"label": "R17", "x": 6.5, "y": 4},
+                {"label": "R16", "x": 7.5, "y": 3.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/debug/config.h b/keyboards/splitkb/aurora/sweep/keymaps/debug/config.h
new file mode 100644
index 0000000000..9e639dbc35
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/keymaps/debug/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#   define RGBLIGHT_EFFECT_BREATHING
+#endif
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/debug/keymap.c b/keyboards/splitkb/aurora/sweep/keymaps/debug/keymap.c
new file mode 100644
index 0000000000..5bdc5f2b42
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/keymaps/debug/keymap.c
@@ -0,0 +1,77 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _DEFAULT = 0,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT] = LAYOUT(
+        KC_A, KC_B, KC_C, KC_D, KC_E,     S(KC_E), S(KC_D), S(KC_C), S(KC_B), S(KC_A),
+        KC_F, KC_G, KC_H, KC_I, KC_J,     S(KC_J), S(KC_I), S(KC_H), S(KC_G), S(KC_F),
+        KC_K, KC_L, KC_M, KC_N, KC_O,     S(KC_O), S(KC_N), S(KC_M), S(KC_L), S(KC_K),
+                          KC_P, KC_Q,     S(KC_Q), S(KC_P)
+    )
+};
+
+#ifdef RGBLIGHT_ENABLE
+void keyboard_post_init_user(void) {
+  rgblight_enable_noeeprom(); // enables RGB, without saving settings
+  rgblight_sethsv_noeeprom(HSV_RED); // sets the color to red without saving
+  rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); // sets mode to Fast breathing without saving
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    // 0 and 1 are left-half encoders
+    // 2 and 3 are right-half encoders
+    if (index == 0) {
+        tap_code(KC_0);
+    } else if (index == 1) {
+        tap_code(KC_1);
+    } else if (index == 2) {
+        tap_code(KC_2);
+    } else if (index == 3) {
+        tap_code(KC_3);
+    }
+
+    if (clockwise) {
+        tap_code16(KC_PLUS);
+    } else {
+        tap_code(KC_MINUS);
+    }
+
+    return false;
+}
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    // A 128x32 OLED rotated 90 degrees is 5 characters wide and 16 characters tall
+    // This example string should fill that neatly
+    const char *text = PSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789!@#$%^&*()[]{}-=_+?");
+
+    if (is_keyboard_master()) {
+        oled_write_P(text, false);
+    } else {
+        oled_write_P(text, false);
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/debug/readme.md b/keyboards/splitkb/aurora/sweep/keymaps/debug/readme.md
new file mode 100644
index 0000000000..6d4d5aaff6
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/keymaps/debug/readme.md
@@ -0,0 +1,25 @@
+# Aurora Sweep's Debug Keymap
+
+Due to the complex layer setup, the default keymap for the Aurora Sweep is relatively hard to debug.
+This debug keymap should make that a lot easier.
+
+## Keys
+
+![Keys](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/debug/keys.png)
+
+The left side uses lowercase letters, the right side uses uppercase ones.
+
+## Encoders
+
+Encoders output a number of 0 to 3, depending on the installed position.
+These correspond to the index used for custom encoder code.
+
+The number is followed by either a `+` or a `-`, depending on the direction turned.
+
+## LEDs
+
+Both underglow and per-key RGB should be fading between red and off.
+
+## OLEDs
+
+Both the primary and secondary side should be filled with characters.
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk b/keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk
new file mode 100644
index 0000000000..066675cb48
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk
@@ -0,0 +1,18 @@
+# Copyright 2022 splitkb.com <support@splitkb.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ENCODER_ENABLE = yes
+OLED_ENABLE = yes
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/config.h b/keyboards/splitkb/aurora/sweep/keymaps/default/config.h
new file mode 100644
index 0000000000..b35ec79511
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// Not yet available in `keymap.json` format
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON 
+#endif
+
+// Not yet available in `keymap.json` format
+#ifdef MOUSEKEY_ENABLE
+     // The default is 100
+#    define MOUSEKEY_WHEEL_INTERVAL 50
+     // The default is 40
+#    define MOUSEKEY_WHEEL_TIME_TO_MAX 100
+#endif
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
new file mode 100644
index 0000000000..0af1244c1f
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
@@ -0,0 +1,93 @@
+{
+    "keyboard": "splitkb/aurora/sweep",
+    "keymap": "default",
+    "version": 1,
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "KC_Q"        , "KC_W"        , "KC_E"           , "KC_R"          , "KC_T"          , "KC_Y"          , "KC_U"        , "KC_I"           , "KC_O"          , "KC_P",
+            "LSFT_T(KC_A)", "LT(5,KC_S)"  , "LT(1,KC_D)"     , "LT(3,KC_F)"    , "KC_G"          , "KC_H"          , "LT(4,KC_J)"  , "LT(2,KC_K)"     , "LT(6,KC_L)"    , "LSFT_T(KC_SCLN)",
+            "KC_Z"        , "LCTL_T(KC_X)", "LALT_T(KC_C)"   , "KC_V"          , "KC_B"          , "KC_N"          , "KC_M"        , "LALT_T(KC_COMM)", "LCTL_T(KC_DOT)", "KC_SLSH",
+                                                               "KC_P0"         , "KC_BSPC"       , "LT(7,KC_SPC)"  , "KC_P1"
+        ],
+        [
+            "RGB_TOG"     , "RGB_MOD"     , "RGB_HUI"        , "RGB_SAI"       , "RGB_VAI"       , "RGB_SPI"       , "KC_BTN1"     , "KC_WH_U"        , "KC_BTN2"       , "KC_TRNS",
+            "KC_TRNS"     , "KC_BTN2"     , "KC_NO"          , "KC_BTN1"       , "KC_TRNS"       , "KC_TRNS"       , "KC_MS_L"     , "KC_MS_D"        , "KC_MS_U"       , "KC_MS_R",
+            "KC_TRNS"     , "RGB_RMOD"    , "RGB_HUD"        , "RGB_SAD"       , "RGB_VAD"       , "RGB_SPD"       , "KC_WH_L"     , "KC_WH_D"        , "KC_WH_R"       , "KC_TRNS",
+                                                               "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"
+        ],
+        [
+            "KC_TRNS"     , "KC_TRNS"     , "KC_PGUP"        , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+            "KC_LEFT"     , "KC_UP"       , "KC_DOWN"        , "KC_RGHT"       , "KC_TRNS"       , "KC_TRNS"       , "KC_LGUI"     , "KC_NO"          , "LCTL(KC_LALT)" , "LCA(KC_LSFT)",
+            "KC_TRNS"     , "KC_HOME"     , "KC_PGDN"        , "KC_END"        , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+                                                               "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"
+        ],
+        [
+            "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_UNDS"     , "KC_PIPE"        , "KC_QUOT"       , "KC_TRNS",
+            "KC_CIRC"     , "KC_ASTR"     , "KC_AMPR"        , "KC_NO"         , "KC_TRNS"       , "KC_HASH"       , "KC_TILD"     , "KC_SLSH"        , "KC_DQUO"       , "KC_DLR",
+            "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_MINS"     , "KC_BSLS"        , "KC_GRV"        , "KC_TRNS",
+                                                               "RGB_RMOD"      , "KC_TRNS"       , "KC_TRNS"       , "RGB_MOD"
+        ],
+        [
+            "KC_TRNS"     , "KC_COLN"     , "KC_LT"          , "KC_GT"         , "KC_SCLN"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+            "KC_LCBR"     , "KC_RCBR"     , "KC_LPRN"        , "KC_RPRN"       , "KC_AT"         , "KC_TRNS"       , "KC_NO"       , "KC_EQL"         , "KC_PLUS"       , "KC_PERC",
+            "KC_TRNS"     , "KC_EXLM"     , "KC_LBRC"        , "KC_RBRC"       , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+                                                               "KC_VOLD"       , "KC_TRNS"       , "KC_TRNS"       , "KC_VOLU"
+        ],
+        [
+            "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_F7"       , "KC_F8"          , "KC_F9"         , "KC_F10",
+            "KC_TRNS"     , "KC_NO"       , "LCTL(KC_LALT)"  , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_F4"       , "KC_F5"          , "KC_F6"         , "KC_F11",
+            "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_F1"       , "KC_F2"          , "KC_F3"         , "KC_F12",
+                                                               "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"
+        ],
+        [
+            "KC_PSLS"     , "KC_7"        , "KC_8"           , "KC_9"          , "KC_PPLS"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+            "KC_0"        , "KC_1"        , "KC_2"           , "KC_3"          , "KC_PMNS"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_NO"         , "KC_TRNS",
+            "KC_PAST"     , "KC_4"        , "KC_5"           , "KC_6"          , "KC_PEQL"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+                                                               "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"
+        ],
+        [
+            "KC_TRNS"     , "KC_TRNS"     , "KC_COLN"        , "KC_ESC"        , "KC_TRNS"       , "KC_TRNS"       , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_DEL",
+            "KC_TRNS"     , "KC_PERC"     , "KC_SLSH"        , "KC_ENT"        , "KC_TRNS"       , "DF(1)"         , "KC_LGUI"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+            "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_EXLM"       , "KC_TRNS"       , "DF(0)"         , "KC_TRNS"     , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)", "QK_BOOT",
+                                                               "KC_TRNS"       , "KC_TAB"        , "KC_NO"         , "KC_TRNS"
+        ]
+    ],
+    "config": {
+        "features": {
+            "oled": true,
+            "rgb_matrix": true,
+            "rgblight": false
+        },
+        "encoder": {
+            "enabled": true
+        },
+        "rgblight": {
+            "hue_steps": 8,
+            "saturation_steps": 8,
+            "brightness_steps": 8,
+            "sleep": true
+        }
+    },
+    "mouse_key": {
+        "enabled": true,
+        // Set the mouse settings to a comfortable speed/accuracy trade-off,
+        // assuming a screen refresh rate of 60 Htz or higher
+        // The default is 50. This makes the mouse ~3 times faster and more accurate
+        "interval": 16,
+        // The default is 20. Since we made the mouse about 3 times faster with the previous setting,
+        // give it more time to accelerate to max speed to retain precise control over short distances.
+        "time_to_max": 40,
+        // The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
+        "delay": 100,
+        // It makes sense to use the same delay for the mouseweel
+        "wheel_delay": 100
+    },
+    // Pick good defaults for enabling homerow modifiers
+    "tapping": {
+        "term": 200,
+        "permissive_hold": true,
+        "ignore_mod_tap_interrupt": true,
+        "force_hold": true
+    }
+}
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/readme.md b/keyboards/splitkb/aurora/sweep/keymaps/default/readme.md
new file mode 100644
index 0000000000..535580f9a7
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/readme.md
@@ -0,0 +1,142 @@
+# Aurora Sweep's Default Keymap
+_This keymap is a copy of the [Ferris default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default), with the addition of RGB modifier keys._
+
+A usable default keymap for the Ferris keyboard
+===============================================
+
+Keymaps in general are quite personal, so it is difficult to come up with a default that will suit every user.
+
+This keymap makes heavy use of keys behaving differently when tapped and held, so that all the keys one may need remain accessible despite the low number of thumb keys.
+
+It comes with a number of layers to give access to most of the keys one may need on a keyboard. It is not meant to be the best possible keymap, but rather a good base on which to build a keymap that works for you.
+
+This is not the only way to make 34 keys a comfortable typing experience, but it is one way to do so. If you don't already know of a better way, this may be as good a starting point as any :)
+
+Note that this keymap was built from the perspective that it is OK to take a steep learning curve if it results in a keymap that is easier to use in the long run. This means that it may take more effort to learn this keymap than some alternatives. "Easy to use" was assessed against the workflow of the author, so your mileage may vary on some of the details.
+
+What do all these layers do?
+----------------------------
+
+### Layer 0: Base layer
+
+![Layer 0](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer0.png)
+
+On tapping the keys, our base layer is qwerty with space on the right homing thumb and backspace on the left homing thumb.
+
+In this layer, the non-homing-thumb positions have 0 and 1. I recommend modifying this to some frequently accessed shortcut such as copy/paste, previous/next tab or anything that makes most sense in your own workflow. O and 1 are place-holders and make it easy to troubleshoot that all keys are working properly before soldering in the switches.
+The reason I recommend convenience shortcuts instead of more commonly used keys like tab or meta is that unhoming of the thumbs was a frequent source of typos for me when I used more than one thumb key frequently in the context of typing.
+
+Despite being missing on this layer, "meta", "tab", "esc" and such are accessible from any other layer: see Layer 7.
+
+The behaviour of some keys differ when held:
+* Both homing pinkies behave as shift.
+* Both bottom-row ring fingers behave as ctrl.
+* Both bottom-row middle fingers behave as alt.
+
+* The homing left ring finger gives access to the Function keys layer
+* The homing right ring finger gives access to the Numbers layer
+* The homing left middle finger gives access to the Mouse layer
+* The homing right middle finger gives access to the Navigation layer
+* The homing left index finger gives access to the Right symbols layer
+* The homing right index finger gives access to the Left symbols layer
+* The homing right thumb gives access to the Always accessible layer
+
+### Layer 1: Mouse
+
+![Layer 1](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer1.png)
+
+Layer 1 is a mouse layer: it can be used one-handed or two-handed. The most common way to use it is two handed, with left and right click on the homerow of the left hand and directions on the homerow of the right hand.
+Scrolling is available on the right hand with mid finger up and down for vertical scroll and index and ring finger down for horizontal scroll.
+On the right hand, left click and right click are also available with index and ring finger up to allow one handed operation. This can be particularly handy when enabling the mouse layer permanently (no need to hold the left middle finger), which can be done from Layer 7.
+
+**Addition**: The Aurora Sweep allows the RGB settings to be modified on this layer. This is an extra feature over the default Ferris / Sweep keymap.
+
+### Layer 2: Navigation
+
+![Layer 2](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer2.png)
+
+The navigation layer somewhat mirrors the mouse layer. It is accessed by holding the right middle finger and gives access to arrow keys on the left homerow. Page up and down, Home and End mirror the vertical scrolling and horizontal scrolling on the mouse layer.
+
+On the right hand, in addition to ctrl and alt which are available through transparency, ctrl + alt, ctrl + alt + shift and meta are accessible on the homerow to enable common shortcuts in some window managers. This part is quite workflow dependent, so make sure to adapt it to your own workflow as appropriate.
+
+### Layer 3: Right symbols
+
+![Layer 3](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer3.png)
+
+When holding down the left index, one may access about half of the symbols. The pinkies store `^` and `$` symbols that represent begin and end in vim. The left homerow hosts `*` and `&`, symbols which are related in the way that they represent some form of indirection in programming languages such as rust. On the right hand, most symbols used when navigating the command line are stored together, organized by columns of related symbols. 
+
+### Layer 4: Left symbols
+
+![Layer 4](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer4.png)
+
+When holding down the right index, one may access the other symbols. On the left hand, most of the different brackets are laid out. The most frequent ones (round brackets and curly brackets) get a spot on the homerow. The rest of the layer hosts the remaining symbols that are easier to access here than on any other layers.
+
+### Layer 5: Function keys
+
+![Layer 5](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer5.png)
+
+By holding down the left ring finger, one may access the function keys, roughly in a numpad layout.
+This means that alt+F4 is easy to type, with F4 being on the homerow.
+There is a shortcut for ctrl+alt on the left hand to enable convenient switching between virtual terminals on Linux.
+
+### Layer 6: Numbers
+
+![Layer 6](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer6.png)
+
+The number layer is accessed by holding the right ring finger. It hosts the numbers and some duplicated symbols that are commonly accessed next to numbers, such as mathematical operators.
+The number are layed out similarly to a numpad, but with the middle row and the homerow swapped so that the most used numbers: 0, 1, 2 and 3 are all available in homing positions. 
+
+### Layer 7: Always accessible
+
+![Layer 7](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/keymaps/default/layer7.png)
+
+Layer 7 is accessed by holding the right homing thumb down. Because this position is left transparent from every other layer, this layer is always accessible.
+It gives access to some essential keys that would typically be accessed on a thumb cluster or pinkies, such as meta, enter, tab, esc and delete.
+
+As the layer hosting esc, we duplicated some symbols here to allow for fast navigation in vim. For instance, esc, :, w, q can be done in a single roll.
+
+Where is the keymap.c?
+----------------------
+
+The keymap.c file is not published to the repository. It is generated from `keymap.json` by the build system.
+
+This avoids duplicating information and allow users to edit their keymap from the qmk configurator web interface.
+
+How do I edit and update the keymap?
+------------------------------------
+
+The `keymap.json` file is generated from the qmk configurator interface and formatted for better readability in the context of the Ferris keyboard.
+
+To edit it, you may:
+* Edit it directly from a text editor.
+* Edit it from the qmk configurator.
+
+If you decide to use the latter workflow, here are the steps to follow:
+
+* From the qmk configurator, hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it).
+* Browse to the location of your keymap (for example, `<your qmk repo>/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json`)
+* Perform any modification to the keymap in the web UI
+* Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it)
+* Replace your original keymap with the one you just downloaded
+
+I want to do more than the configurator supports!
+-------------------------------------------------
+
+While the `json` format is easy to use, it does lack certain functionality - most notably custom OLED or encoder behaviour.
+
+To add this, you need to convert it to the `c` format. Do keep in mind that this is generally a one-way operation.
+
+First, from the root of your qmk repo, move to your keymap folder
+
+```bash
+cd ./keymaps/splitkb/aurora/corne/my_personal_keymap
+```
+
+Next, convert your `keymap.json` to a `keymap.c`
+
+```bash
+qmk json2c -o keymap.c keymap.json
+```
+
+You can add custom C code to the newly generated `keymap.c` file. Do note that you have to use **either** a C file **or** a JSON file - you cannot do both!  
+**If a JSON file is present, the C file is ignored.**
diff --git a/keyboards/splitkb/aurora/sweep/readme.md b/keyboards/splitkb/aurora/sweep/readme.md
new file mode 100644
index 0000000000..05a3134bb9
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/readme.md
@@ -0,0 +1,48 @@
+![Aurora Sweep](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/sweep/sweep.jpg)
+
+# Aurora Sweep
+The Aurora Sweep is a redesign by splitkb.com of the popular Sweep (Sweep Bling MX) by David Barr and contributors.
+
+Keyboard Maintainer: [splitkb.com](https://github.com/splitkb)  
+Hardware Supported: Pro Micro 5V/16MHz and compatible.  
+Hardware Availability: [splitkb.com](https://splitkb.com).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make splitkb/aurora/sweep/rev1:default
+
+Example of flashing this keyboard:
+
+    make splitkb/aurora/sweep/rev1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+You can enter the bootloader in 3 ways:
+
+* **Physical reset button**: Briefly press the button on the side of the PCB, next to the TRRS socket.
+* **Bootmagic reset**: Hold down the bootmagic key and plug in the keyboard. For the left half, this is the top-left button. For the right half, this is the top-right button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
+
+# Assembly
+A build guide for the entire Aurora series will become available soon at [docs.splitkb.com](https://docs.splitkb.com).
+
+# Features
+The Aurora Sweep supports the following features:
+
+- Support for MX or Kailh Choc (v1 sold at splitkb.com, not v2) switches;
+- Top mounted controllers for a lower profile;
+- Up to two 128×32 pixel OLED displays;
+- Up to two EC11 rotary encoders per half in two of four possible positions;
+- Per-key RGB backlight by individual RGB LEDs;
+- Underglow by individual RGB LEDs;
+- Support for a power switch for wireless controllers;
+- Support for the splitkb.com tenting puck.
+
+# What is the Aurora Series?
+
+The Aurora series were designed as a homage to open source keyboard kits that have carved their space into the community. Kits that provided something new and unique, kits that resonated with the community and that have both received and have given a lot of love in return.
+
+With the Aurora series, we aim to make these kits available to the community in a way that both honors the original, while also offering the best possible feature set and a consistent, well-documented build experience.
+
+For each kit sold, we give back to the community by donating €1 across [the firmware projects we support](https://opencollective.com/splitkb). This way we support open source projects and benefit everyone using keyboards, whether they use our kits or their own.
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
new file mode 100644
index 0000000000..e7b603b575
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// `SPLIT_HAND_PIN` can currently be defined in `info.json`,
+// but can't yet be given a value
+#define SPLIT_HAND_PIN F4
+
+// Not yet available in `info.json`
+#ifdef OLED_ENABLE
+#    define OLED_DISPLAY_128X32
+#    define SPLIT_OLED_ENABLE
+#endif
+
+// Not yet available in `info.json`
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define SPLIT_TRANSPORT_MIRROR
+#endif
+
+// Not yet available in `info.json`
+#ifdef BOOTMAGIC_ENABLE
+     // Top left key on left half
+#    define BOOTMAGIC_LITE_ROW 0
+#    define BOOTMAGIC_LITE_COLUMN 4
+     // Top right key on right half
+#    define BOOTMAGIC_LITE_ROW_RIGHT    4
+#    define BOOTMAGIC_LITE_COLUMN_RIGHT 4
+#endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
new file mode 100644
index 0000000000..16c490ad5f
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -0,0 +1,155 @@
+{
+    "keyboard_name": "Aurora Sweep rev1",
+    "usb": {
+        "pid": "0xEC17"
+    },
+    "features": {
+        "mousekey": true,
+        "bootmagic": true,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                // Note: `label` is here only for readability,
+                // order must match the parent's definition!
+                {"label": "L01", "matrix": [0, 4]},
+                {"label": "L02", "matrix": [0, 3]},
+                {"label": "L03", "matrix": [0, 2]},
+                {"label": "L04", "matrix": [0, 1]},
+                {"label": "L05", "matrix": [0, 0]},
+                {"label": "R05", "matrix": [4, 0]},
+                {"label": "R04", "matrix": [4, 1]},
+                {"label": "R03", "matrix": [4, 2]},
+                {"label": "R02", "matrix": [4, 3]},
+                {"label": "R01", "matrix": [4, 4]},
+
+                {"label": "L06", "matrix": [1, 4]},
+                {"label": "L07", "matrix": [1, 3]},
+                {"label": "L08", "matrix": [1, 2]},
+                {"label": "L09", "matrix": [1, 1]},
+                {"label": "L10", "matrix": [1, 0]},
+                {"label": "R10", "matrix": [5, 0]},
+                {"label": "R09", "matrix": [5, 1]},
+                {"label": "R08", "matrix": [5, 2]},
+                {"label": "R07", "matrix": [5, 3]},
+                {"label": "R06", "matrix": [5, 4]},
+
+                {"label": "L11", "matrix": [2, 4]},
+                {"label": "L12", "matrix": [2, 3]},
+                {"label": "L13", "matrix": [2, 2]},
+                {"label": "L14", "matrix": [2, 1]},
+                {"label": "L15", "matrix": [2, 0]},
+                {"label": "R15", "matrix": [6, 0]},
+                {"label": "R14", "matrix": [6, 1]},
+                {"label": "R13", "matrix": [6, 2]},
+                {"label": "R12", "matrix": [6, 3]},
+                {"label": "R11", "matrix": [6, 4]},
+
+                {"label": "L16", "matrix": [3, 1]},
+                {"label": "L17", "matrix": [3, 0]},
+                {"label": "R17", "matrix": [7, 0]},
+                {"label": "R16", "matrix": [7, 1]}
+            ]
+        }
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "rows": ["F6", "F5", "F7", "B1"],
+        "cols": ["B6", "D4", "C6", "D7", "E6"]
+    },
+    "encoder": {
+        "rotary": [
+            {
+                "pin_a": "B5",
+                "pin_b": "B4"
+            },
+            {
+                "pin_a": "B3",
+                "pin_b": "B2"
+            }
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "main": "pin",
+        "matrix_pins": {
+            "right": {
+                "rows": ["B1", "F7", "F6", "B3"],
+                "cols": ["B5", "B4", "E6", "D7", "C6"]
+            }
+        },
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {
+                        "pin_a": "B2",
+                        "pin_b": "B6"
+                    },
+                    {
+                        "pin_a": "F5",
+                        "pin_b": "D4"
+                    }
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "pin": "D3",
+        "led_count": 46,
+        "split": true,
+        "split_count": [23, 23],
+        "max_brightness": 128
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            {"flags": 2, "x":  71, "y": 15},                   // L RGB1
+            {"flags": 2, "x":  51, "y":  8},                   // L RGB2
+            {"flags": 2, "x":  10, "y": 13},                   // L RGB3
+            {"flags": 2, "x":  10, "y": 42},                   // L RGB4
+            {"flags": 2, "x":  41, "y": 45},                   // L RGB5
+            {"flags": 2, "x":  76, "y": 50},                   // L RGB6
+            {"flags": 4, "matrix": [0, 4], "x":   0, "y": 15}, // L SW01
+            {"flags": 4, "matrix": [0, 3], "x":  20, "y":  5}, // L SW02
+            {"flags": 4, "matrix": [0, 2], "x":  41, "y":  0}, // L SW03
+            {"flags": 4, "matrix": [0, 1], "x":  61, "y":  4}, // L SW04
+            {"flags": 4, "matrix": [0, 0], "x":  81, "y":  7}, // L SW05
+            {"flags": 4, "matrix": [1, 4], "x":   0, "y": 31}, // L SW06
+            {"flags": 4, "matrix": [1, 3], "x":  20, "y": 21}, // L SW07
+            {"flags": 4, "matrix": [1, 2], "x":  41, "y": 16}, // L SW08
+            {"flags": 4, "matrix": [1, 1], "x":  61, "y": 20}, // L SW09
+            {"flags": 4, "matrix": [1, 0], "x":  81, "y": 23}, // L SW10
+            {"flags": 4, "matrix": [2, 4], "x":   0, "y": 47}, // L SW11
+            {"flags": 4, "matrix": [2, 3], "x":  20, "y": 37}, // L SW12
+            {"flags": 4, "matrix": [2, 2], "x":  41, "y": 32}, // L SW13
+            {"flags": 4, "matrix": [2, 1], "x":  61, "y": 36}, // L SW14
+            {"flags": 4, "matrix": [2, 0], "x":  81, "y": 39}, // L SW15
+            {"flags": 4, "matrix": [3, 1], "x":  71, "y": 60}, // L SW16
+            {"flags": 4, "matrix": [3, 0], "x":  92, "y": 64}, // L SW17
+            {"flags": 2, "x": 150, "y": 15},                   // R RGB1
+            {"flags": 2, "x": 190, "y":  8},                   // R RGB2
+            {"flags": 2, "x": 210, "y": 13},                   // R RGB3
+            {"flags": 2, "x": 220, "y": 42},                   // R RGB4
+            {"flags": 2, "x": 183, "y": 45},                   // R RGB5
+            {"flags": 2, "x": 155, "y": 50},                   // R RGB6
+            {"flags": 4, "matrix": [4, 0], "x": 143, "y":  7}, // R SW05
+            {"flags": 4, "matrix": [4, 1], "x": 163, "y":  4}, // R SW04
+            {"flags": 4, "matrix": [4, 2], "x": 183, "y":  0}, // R SW03
+            {"flags": 4, "matrix": [4, 3], "x": 204, "y":  5}, // R SW02
+            {"flags": 4, "matrix": [4, 4], "x": 224, "y": 15}, // R SW01
+            {"flags": 4, "matrix": [5, 0], "x": 143, "y": 23}, // R SW10
+            {"flags": 4, "matrix": [5, 1], "x": 163, "y": 20}, // R SW09
+            {"flags": 4, "matrix": [5, 2], "x": 183, "y": 16}, // R SW08
+            {"flags": 4, "matrix": [5, 3], "x": 204, "y": 21}, // R SW07
+            {"flags": 4, "matrix": [5, 4], "x": 224, "y": 31}, // R SW06
+            {"flags": 4, "matrix": [6, 0], "x": 143, "y": 39}, // R SW15
+            {"flags": 4, "matrix": [6, 1], "x": 163, "y": 36}, // R SW14
+            {"flags": 4, "matrix": [6, 2], "x": 183, "y": 32}, // R SW13
+            {"flags": 4, "matrix": [6, 3], "x": 204, "y": 37}, // R SW12
+            {"flags": 4, "matrix": [6, 4], "x": 224, "y": 47}, // R SW11
+            {"flags": 4, "matrix": [7, 0], "x": 132, "y": 64}, // R SW17
+            {"flags": 4, "matrix": [7, 1], "x": 153, "y": 60}  // R SW16
+        ]
+    }
+}
diff --git a/keyboards/splitkb/aurora/sweep/rev1/rev1.c b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
new file mode 100644
index 0000000000..ce19aea5ce
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef SWAP_HANDS_ENABLE
+// clang-format off
+    __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+        {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}},
+        {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}},
+        {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}},
+        {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}},
+        {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}},
+        {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}},
+        {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}},
+        {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}}
+    };
+// clang-format on
+#    ifdef ENCODER_MAP_ENABLE
+        const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {3,2,1,0};
+#    endif
+#endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/rules.mk b/keyboards/splitkb/aurora/sweep/rev1/rules.mk
new file mode 100644
index 0000000000..c4275031ca
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/rev1/rules.mk
@@ -0,0 +1,17 @@
+# Copyright 2022 splitkb.com <support@splitkb.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Although no rules are defined,
+# presence of this file is required for QMK to compile it.
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/sweep/rules.mk b/keyboards/splitkb/aurora/sweep/rules.mk
new file mode 100644
index 0000000000..ec1e102039
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/rules.mk
@@ -0,0 +1,16 @@
+# Copyright 2022 splitkb.com <support@splitkb.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+DEFAULT_FOLDER = splitkb/aurora/sweep/rev1
diff --git a/keyboards/splitkb/aurora/sweep/sweep.c b/keyboards/splitkb/aurora/sweep/sweep.c
new file mode 100644
index 0000000000..605847d99b
--- /dev/null
+++ b/keyboards/splitkb/aurora/sweep/sweep.c
@@ -0,0 +1,322 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// The first four layers gets a name for readability, which is then used in the OLED below.
+enum layers {
+  _DEFAULT,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#ifdef OLED_ENABLE
+// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne,
+// and has been copied directly from `crkbd/soundmonster/keymap.c`
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+void render_space(void) {
+    oled_write_P(PSTR("     "), false);
+}
+
+void render_mod_status_gui_alt(uint8_t modifiers) {
+    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
+    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
+    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
+    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
+
+    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
+    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
+    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
+    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[] = {0xc7, 0};
+    static const char PROGMEM on_off_2[] = {0xc8, 0};
+    static const char PROGMEM off_on_1[] = {0xc9, 0};
+    static const char PROGMEM off_on_2[] = {0xca, 0};
+    static const char PROGMEM on_on_1[] = {0xcb, 0};
+    static const char PROGMEM on_on_2[] = {0xcc, 0};
+
+    if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_1, false);
+    } else {
+        oled_write_P(gui_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
+        oled_write_P(on_on_1, false);
+    } else if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_1, false);
+    } else if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_1, false);
+    } else {
+        oled_write_P(alt_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_2, false);
+    } else {
+        oled_write_P(gui_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
+        oled_write_P(on_on_2, false);
+    } else if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_2, false);
+    } else if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_2, false);
+    } else {
+        oled_write_P(alt_off_2, false);
+    }
+}
+
+void render_mod_status_ctrl_shift(uint8_t modifiers) {
+    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
+    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
+    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
+    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
+
+    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
+    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
+    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
+    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[] = {0xc7, 0};
+    static const char PROGMEM on_off_2[] = {0xc8, 0};
+    static const char PROGMEM off_on_1[] = {0xc9, 0};
+    static const char PROGMEM off_on_2[] = {0xca, 0};
+    static const char PROGMEM on_on_1[] = {0xcb, 0};
+    static const char PROGMEM on_on_2[] = {0xcc, 0};
+
+    if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_1, false);
+    } else {
+        oled_write_P(ctrl_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
+        oled_write_P(on_on_1, false);
+    } else if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_1, false);
+    } else if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_1, false);
+    } else {
+        oled_write_P(shift_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_2, false);
+    } else {
+        oled_write_P(ctrl_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
+        oled_write_P(on_on_2, false);
+    } else if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_2, false);
+    } else if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_2, false);
+    } else {
+        oled_write_P(shift_off_2, false);
+    }
+}
+
+void render_logo(void) {
+    static const char PROGMEM aurora_logo[] = {
+        0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, 
+        0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, 
+        0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, 
+        0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, 
+        0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, 
+        0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, 
+        0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, 
+        0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28
+    };
+    oled_write_raw_P(aurora_logo, sizeof(aurora_logo));
+    oled_set_cursor(0, 4);
+}
+
+void render_logo_text(void) {
+    oled_write_P(PSTR("sweep"), false);
+}
+
+void render_kb_LED_state(void) {
+    // Host Keyboard LED Status
+    led_t led_usb_state = host_keyboard_led_state();
+    oled_write_P(led_usb_state.num_lock ? PSTR("N ") : PSTR("  "), false);
+    oled_write_P(led_usb_state.caps_lock ? PSTR("C ") : PSTR("  "), false);
+    oled_write_P(led_usb_state.scroll_lock ? PSTR("S ") : PSTR("  "), false);
+}
+
+void render_layer_state(void) {
+    static const char PROGMEM default_layer[] = {
+        0x20, 0x94, 0x95, 0x96, 0x20,
+        0x20, 0xb4, 0xb5, 0xb6, 0x20,
+        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
+    static const char PROGMEM raise_layer[] = {
+        0x20, 0x97, 0x98, 0x99, 0x20,
+        0x20, 0xb7, 0xb8, 0xb9, 0x20,
+        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
+    static const char PROGMEM lower_layer[] = {
+        0x20, 0x9a, 0x9b, 0x9c, 0x20,
+        0x20, 0xba, 0xbb, 0xbc, 0x20,
+        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
+    static const char PROGMEM adjust_layer[] = {
+        0x20, 0x9d, 0x9e, 0x9f, 0x20,
+        0x20, 0xbd, 0xbe, 0xbf, 0x20,
+        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
+    if(layer_state_is(_LOWER)) {
+        oled_write_P(lower_layer, false);
+    } else if(layer_state_is(_RAISE)) {
+        oled_write_P(raise_layer, false);
+    } else if(layer_state_is(_DEFAULT)) {
+        oled_write_P(default_layer, false);
+    } else {
+        oled_write_P(adjust_layer, false);
+    }
+}
+
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        // Renders the current keyboard state (layers and mods)
+        render_logo();
+        render_logo_text();
+        render_space();
+        render_layer_state();
+        render_space();
+        render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
+        render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
+        render_kb_LED_state();
+    } else {
+        // clang-format off
+        static const char PROGMEM aurora_art[] = {
+            0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, 
+            0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 
+            0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 
+            0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, 
+            0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, 
+            0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, 
+            0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, 
+            0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, 
+            0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, 
+            0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, 
+            0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, 
+            0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 
+            0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, 
+            0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, 
+            0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, 
+            0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, 
+            0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, 
+            0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, 
+            0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, 
+            0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, 
+            0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, 
+            0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, 
+            0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, 
+            0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, 
+            0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, 
+            0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, 
+            0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, 
+            0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00
+        };
+        // clang-format on
+        oled_write_raw_P(aurora_art, sizeof(aurora_art));
+    }
+    return false;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    // 0 and 1 are left-half encoders,
+    // 2 and 3 are right-half encoders
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 2) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 3) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+#endif

From 3f4fd85dc7f91d008c778e516dc261b5b2e72b55 Mon Sep 17 00:00:00 2001
From: jack <0x6a73@protonmail.com>
Date: Wed, 12 Oct 2022 21:09:10 -0600
Subject: [PATCH 624/959] Fixup keychron/q3 (#18687)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/keychron/q3/ansi/ansi.c                    |  2 +-
 keyboards/keychron/q3/ansi/config.h                  |  2 +-
 keyboards/keychron/q3/ansi_encoder/ansi_encoder.c    |  2 +-
 keyboards/keychron/q3/ansi_encoder/config.h          |  2 +-
 keyboards/keychron/q3/iso/config.h                   |  2 +-
 keyboards/keychron/q3/iso/iso.c                      |  2 +-
 keyboards/keychron/q3/iso_encoder/config.h           |  2 +-
 keyboards/keychron/q3/iso_encoder/iso_encoder.c      |  2 +-
 keyboards/keychron/q3/jis/config.h                   |  2 +-
 keyboards/keychron/q3/jis/jis.c                      |  2 +-
 keyboards/keychron/q3/jis/keymaps/default/keymap.c   | 12 ++++++------
 keyboards/keychron/q3/jis/keymaps/keychron/keymap.c  | 12 ++++++------
 keyboards/keychron/q3/jis/keymaps/via/keymap.c       | 12 ++++++------
 keyboards/keychron/q3/jis_encoder/config.h           |  2 +-
 keyboards/keychron/q3/jis_encoder/jis_encoder.c      |  2 +-
 .../keychron/q3/jis_encoder/keymaps/default/keymap.c | 12 ++++++------
 .../q3/jis_encoder/keymaps/keychron/keymap.c         | 12 ++++++------
 .../keychron/q3/jis_encoder/keymaps/via/keymap.c     | 12 ++++++------
 keyboards/keychron/q3/q3.c                           |  4 +++-
 19 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
index 46ebe44144..beff3bc5ec 100644
--- a/keyboards/keychron/q3/ansi/ansi.c
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q3/ansi/config.h b/keyboards/keychron/q3/ansi/config.h
index 8535f02cc2..f7c1c16931 100644
--- a/keyboards/keychron/q3/ansi/config.h
+++ b/keyboards/keychron/q3/ansi/config.h
@@ -26,7 +26,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 48
 #define DRIVER_2_LED_TOTAL 39
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define CKLED2001_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
index 8e5f692e38..13f6c26d2d 100644
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q3/ansi_encoder/config.h b/keyboards/keychron/q3/ansi_encoder/config.h
index 0388b6dd31..505a45b79c 100644
--- a/keyboards/keychron/q3/ansi_encoder/config.h
+++ b/keyboards/keychron/q3/ansi_encoder/config.h
@@ -23,7 +23,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 48
 #define DRIVER_2_LED_TOTAL 39
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { A10 }
diff --git a/keyboards/keychron/q3/iso/config.h b/keyboards/keychron/q3/iso/config.h
index dc8a3b03e9..c6992eb52b 100644
--- a/keyboards/keychron/q3/iso/config.h
+++ b/keyboards/keychron/q3/iso/config.h
@@ -26,7 +26,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 48
 #define DRIVER_2_LED_TOTAL 40
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define CKLED2001_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
index 04ee78092e..e753a39c1b 100644
--- a/keyboards/keychron/q3/iso/iso.c
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q3/iso_encoder/config.h b/keyboards/keychron/q3/iso_encoder/config.h
index 4e62c1d7a0..0cc5fbf1d9 100644
--- a/keyboards/keychron/q3/iso_encoder/config.h
+++ b/keyboards/keychron/q3/iso_encoder/config.h
@@ -23,7 +23,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 48
 #define DRIVER_2_LED_TOTAL 40
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { A10 }
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
index 06955f879d..02aac01ddc 100644
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q3/jis/config.h b/keyboards/keychron/q3/jis/config.h
index b6750c6567..856dd14df4 100644
--- a/keyboards/keychron/q3/jis/config.h
+++ b/keyboards/keychron/q3/jis/config.h
@@ -28,7 +28,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 48
 #define DRIVER_2_LED_TOTAL 43
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define CKLED2001_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
index cbe433eb4e..20983c6a5f 100644
--- a/keyboards/keychron/q3/jis/jis.c
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q3/jis/keymaps/default/keymap.c b/keyboards/keychron/q3/jis/keymaps/default/keymap.c
index 28ffd7f4a7..bd764ecdf3 100644
--- a/keyboards/keychron/q3/jis/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/jis/keymaps/default/keymap.c
@@ -26,11 +26,11 @@ enum layers{
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_jis_91(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            KC_NO,    KC_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_jis_91(
         _______,            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,
@@ -42,11 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [WIN_BASE] = LAYOUT_jis_91(
         KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             KC_PSCR,  KC_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_jis_91(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            _______,  _______,  RGB_TOG,
diff --git a/keyboards/keychron/q3/jis/keymaps/keychron/keymap.c b/keyboards/keychron/q3/jis/keymaps/keychron/keymap.c
index 30fc9cb8a2..b65d92ae62 100644
--- a/keyboards/keychron/q3/jis/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/jis/keymaps/keychron/keymap.c
@@ -27,11 +27,11 @@ enum layers{
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_jis_91(
         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_SNAP,  KC_SIRI,  RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_jis_91(
         _______,            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,
@@ -43,11 +43,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [WIN_BASE] = LAYOUT_jis_91(
         KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             KC_PSCR,  KC_CRTA,  RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_jis_91(
         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            _______,  _______,  RGB_TOG,
diff --git a/keyboards/keychron/q3/jis/keymaps/via/keymap.c b/keyboards/keychron/q3/jis/keymaps/via/keymap.c
index 28ffd7f4a7..bd764ecdf3 100644
--- a/keyboards/keychron/q3/jis/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/jis/keymaps/via/keymap.c
@@ -26,11 +26,11 @@ enum layers{
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_jis_91(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            KC_NO,    KC_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_jis_91(
         _______,            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,
@@ -42,11 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [WIN_BASE] = LAYOUT_jis_91(
         KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,             KC_PSCR,  KC_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_jis_91(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            _______,  _______,  RGB_TOG,
diff --git a/keyboards/keychron/q3/jis_encoder/config.h b/keyboards/keychron/q3/jis_encoder/config.h
index 0d728773e9..322f04cb0f 100644
--- a/keyboards/keychron/q3/jis_encoder/config.h
+++ b/keyboards/keychron/q3/jis_encoder/config.h
@@ -25,7 +25,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 49
 #define DRIVER_2_LED_TOTAL 43
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define CKLED2001_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
index cdb98d53b0..efaf5fc5f2 100644
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
index 668efb91f2..ca51f194a2 100644
--- a/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c
@@ -26,11 +26,11 @@ enum layers{
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_jis_92(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_jis_92(
         _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   RGB_TOG,  _______,  _______,  RGB_TOG,
@@ -42,11 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [WIN_BASE] = LAYOUT_jis_92(
         KC_ESC,             KC_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_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_jis_92(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RGB_TOG,  _______,  _______,  RGB_TOG,
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
index b20f267f4c..48532104f6 100644
--- a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c
@@ -27,11 +27,11 @@ enum layers{
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_jis_92(
         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_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_jis_92(
         _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   RGB_TOG,  _______,  _______,  RGB_TOG,
@@ -43,11 +43,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [WIN_BASE] = LAYOUT_jis_92(
         KC_ESC,             KC_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_CRTA,  RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_jis_92(
         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RGB_TOG,  _______,  _______,  RGB_TOG,
diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
index 532ada52dc..f14ca16c8b 100644
--- a/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c
@@ -26,11 +26,11 @@ enum layers{
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_jis_92(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_HANJ,                      KC_SPC,                       KC_HAEN,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_jis_92(
         _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   RGB_TOG,  _______,  _______,  RGB_TOG,
@@ -42,11 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [WIN_BASE] = LAYOUT_jis_92(
         KC_ESC,             KC_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_NO,    RGB_MOD,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_JYEN,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                        KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,    KC_ENT,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RO,      KC_RSFT,                      KC_UP,
-        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_MHEN,                      KC_SPC,                       KC_HENK,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,      KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_jis_92(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RGB_TOG,  _______,  _______,  RGB_TOG,
diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c
index 5aa6029d69..120013e77e 100644
--- a/keyboards/keychron/q3/q3.c
+++ b/keyboards/keychron/q3/q3.c
@@ -72,7 +72,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; }
     // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
 
     if (host_keyboard_led_state().caps_lock) {
@@ -82,6 +83,7 @@ __attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min,
            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
         }
     }
+    return true;
 }
 
 #endif // CAPS_LOCK_LED_INDEX

From a9e5e230634e61210401631a60369b346e76381a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 13 Oct 2022 04:17:20 +0100
Subject: [PATCH 625/959] Remove keymaps that still reference legacy macros
 (#18693)

---
 keyboards/atomic/keymaps/pvc/config.h         | 153 ----
 keyboards/atomic/keymaps/pvc/keymap.c         | 605 ---------------
 keyboards/atomic/keymaps/pvc/rules.mk         |  16 -
 keyboards/atreus/keymaps/xk/config.h          |  36 -
 keyboards/atreus/keymaps/xk/keymap.c          | 311 --------
 keyboards/atreus/keymaps/xk/rules.mk          |  15 -
 keyboards/atreus62/keymaps/mneme/README.md    |  58 --
 keyboards/atreus62/keymaps/mneme/config.h     |   6 -
 keyboards/atreus62/keymaps/mneme/keymap.c     | 337 ---------
 keyboards/atreus62/keymaps/mneme/rules.mk     |   6 -
 keyboards/atreus62/keymaps/mneme/unicode      | 114 ---
 .../frosty_flake/keymaps/QFR_JM/config.h      |   4 -
 .../frosty_flake/keymaps/QFR_JM/keymap.c      | 117 ---
 .../frosty_flake/keymaps/QFR_JM/readme.md     |  86 ---
 .../frosty_flake/keymaps/QFR_JM/rules.mk      |  17 -
 .../frosty_flake/keymaps/nikchi/config.h      |  19 -
 .../frosty_flake/keymaps/nikchi/keymap.c      | 241 ------
 .../frosty_flake/keymaps/nikchi/readme.md     |  24 -
 .../frosty_flake/keymaps/nikchi/rules.mk      |  20 -
 .../keymaps/nikchi/variableTapDance.md        |   6 -
 .../duck/lightsaver/keymaps/rasmus/config.h   |   8 -
 .../duck/lightsaver/keymaps/rasmus/keymap.c   | 102 ---
 .../duck/lightsaver/keymaps/rasmus/readme.md  |  12 -
 .../duck/lightsaver/keymaps/rasmus/rules.mk   |   2 -
 keyboards/dz60/keymaps/n0velty/keymap.c       |  50 --
 .../keymaps/heartrobotninja/config.h          |  18 -
 .../keymaps/heartrobotninja/keymap.c          | 680 -----------------
 .../keymaps/heartrobotninja/rules.mk          |  32 -
 .../ergodox_ez/keymaps/profet_80/keymap.c     | 179 -----
 .../ergodox_ez/keymaps/profet_80/readme.md    |  10 -
 .../satan/keymaps/admiralStrokers/config.h    |   3 -
 .../satan/keymaps/admiralStrokers/keymap.c    | 189 -----
 .../satan/keymaps/admiralStrokers/readme.md   |  13 -
 .../satan/keymaps/admiralStrokers/rules.mk    |  20 -
 .../keymaps/milestogo/babblePaste.c           | 460 ------------
 .../keymaps/milestogo/babblePaste.h           | 238 ------
 .../keymaps/milestogo/babblePaste.txt         | 123 ----
 .../keymaps/milestogo/config.h                |  28 -
 .../keymaps/milestogo/keymap.c                | 261 -------
 .../keymaps/milestogo/readme.md               |   1 -
 .../keymaps/milestogo/rules.mk                |  20 -
 keyboards/jc65/v32a/keymaps/naut/keymap.c     |  84 ---
 keyboards/jc65/v32a/keymaps/naut/readme.md    |  16 -
 keyboards/jc65/v32a/keymaps/naut/rules.mk     |   2 -
 keyboards/jc65/v32u4/keymaps/naut/keymap.c    |  93 ---
 keyboards/jc65/v32u4/keymaps/naut/readme.md   |  18 -
 keyboards/jc65/v32u4/keymaps/naut/rules.mk    |   2 -
 keyboards/jd45/keymaps/blakedietz/README.md   | 129 ----
 .../keymaps/blakedietz/blank_key_template.md  |  13 -
 keyboards/jd45/keymaps/blakedietz/config.h    |  16 -
 keyboards/jd45/keymaps/blakedietz/keymap.c    | 365 ---------
 keyboards/jd45/keymaps/jeebak/keymap.c        | 454 ------------
 keyboards/jd45/keymaps/jeebak/readme.md       | 129 ----
 keyboards/kc60/keymaps/workman-dead/keymap.c  | 180 -----
 keyboards/kc60/keymaps/workman-dead/readme.md |  17 -
 .../keymaps/andylikescandy6x18/config.h       |  35 -
 .../keymaps/andylikescandy6x18/keymap.c       |  82 ---
 .../nyquist/keymaps/DivergeJM/README.md       | 184 -----
 .../keebio/nyquist/keymaps/DivergeJM/config.h |  27 -
 .../keebio/nyquist/keymaps/DivergeJM/keymap.c | 303 --------
 .../keebio/nyquist/keymaps/DivergeJM/rules.mk |  34 -
 .../keebio/nyquist/keymaps/pitty/README.md    |  79 --
 .../keebio/nyquist/keymaps/pitty/config.h     |  39 -
 .../keebio/nyquist/keymaps/pitty/keymap.c     | 168 -----
 .../keebio/nyquist/keymaps/pitty/rules.mk     |   3 -
 keyboards/kinesis/keymaps/carpalx/config.h    |   8 -
 keyboards/kinesis/keymaps/carpalx/keymap.c    | 192 -----
 keyboards/kinesis/keymaps/carpalx/readme.md   |  83 ---
 keyboards/kinesis/keymaps/carpalx/rules.mk    |  18 -
 keyboards/kinesis/keymaps/milestogo/config.h  |   8 -
 keyboards/kinesis/keymaps/milestogo/keymap.c  | 365 ---------
 keyboards/kinesis/keymaps/milestogo/readme.md |   2 -
 keyboards/kinesis/keymaps/milestogo/rules.mk  |  18 -
 keyboards/lets_split/keymaps/dlaroe/config.h  |  32 -
 keyboards/lets_split/keymaps/dlaroe/keymap.c  | 251 -------
 keyboards/lets_split/keymaps/dlaroe/rules.mk  |   0
 keyboards/lets_split/keymaps/xk/config.h      |  43 --
 keyboards/lets_split/keymaps/xk/keymap.c      | 367 ---------
 keyboards/lets_split/keymaps/xk/rules.mk      |  16 -
 .../minidox/keymaps/tomb0y/README.md          |  49 --
 .../minidox/keymaps/tomb0y/keymap.c           | 142 ----
 .../v2/keymaps/2u_space_ortho/keymap.c        |  45 --
 .../mechmini/v2/keymaps/ortho/keymap.c        |  45 --
 keyboards/mitosis/keymaps/mjt/config.h        |  24 -
 keyboards/mitosis/keymaps/mjt/keymap.c        | 337 ---------
 keyboards/mitosis/keymaps/mjt/rules.mk        |  12 -
 keyboards/miuni32/keymaps/ht_156/config.h     |   8 -
 keyboards/miuni32/keymaps/ht_156/keymap.c     | 181 -----
 keyboards/miuni32/keymaps/ht_156/readme.md    |   1 -
 keyboards/miuni32/keymaps/ht_156/rules.mk     |  18 -
 .../planck/keymaps/ab/keyboard-layout.json    | 199 -----
 keyboards/planck/keymaps/ab/keymap.c          | 113 ---
 keyboards/planck/keymaps/ab/readme.md         |  18 -
 keyboards/planck/keymaps/ab/rules.mk          |  60 --
 keyboards/planck/keymaps/alexey/keymap.c      |  45 --
 keyboards/planck/keymaps/alexey/rules.mk      |  22 -
 keyboards/planck/keymaps/brandon/config.h     |  32 -
 keyboards/planck/keymaps/brandon/keymap.c     | 395 ----------
 keyboards/planck/keymaps/brandon/rules.mk     |  12 -
 keyboards/planck/keymaps/cbbrowne/config.h    |  43 --
 keyboards/planck/keymaps/cbbrowne/keymap.c    | 359 ---------
 keyboards/planck/keymaps/cbbrowne/readme.org  | 117 ---
 keyboards/planck/keymaps/cbbrowne/rules.mk    |  20 -
 keyboards/planck/keymaps/chance/config.h      |  16 -
 keyboards/planck/keymaps/chance/keymap.c      | 368 ----------
 keyboards/planck/keymaps/chance/rules.mk      |   3 -
 keyboards/planck/keymaps/dlaroe/config.h      |  33 -
 keyboards/planck/keymaps/dlaroe/keymap.c      | 264 -------
 keyboards/planck/keymaps/dlaroe/readme.md     |  12 -
 keyboards/planck/keymaps/dlaroe/rules.mk      |  22 -
 keyboards/planck/keymaps/espynn/keymap.c      | 133 ----
 keyboards/planck/keymaps/espynn/layout.json   | 290 --------
 keyboards/planck/keymaps/espynn/readme.md     |  24 -
 keyboards/planck/keymaps/espynn/rules.mk      |  60 --
 keyboards/planck/keymaps/jacob/keymap.c       |  48 --
 keyboards/planck/keymaps/jacob/readme.md      |   3 -
 keyboards/planck/keymaps/jacob/rules.mk       |  22 -
 keyboards/planck/keymaps/jeebak/config.h      |  26 -
 keyboards/planck/keymaps/jeebak/keymap.c      | 448 -----------
 keyboards/planck/keymaps/jeebak/readme.md     | 127 ----
 keyboards/planck/keymaps/jeebak/rules.mk      |  19 -
 keyboards/planck/keymaps/joe/keymap.c         |  74 --
 keyboards/planck/keymaps/joe/rules.mk         |  19 -
 keyboards/planck/keymaps/khord/config.h       |  40 -
 keyboards/planck/keymaps/khord/keymap.c       | 215 ------
 keyboards/planck/keymaps/khord/rules.mk       |   3 -
 keyboards/planck/keymaps/lucas/keymap.c       | 155 ----
 keyboards/planck/keymaps/lucas/rules.mk       |  19 -
 keyboards/planck/keymaps/lukas/keymap.c       |  57 --
 keyboards/planck/keymaps/lukas/rules.mk       |  22 -
 keyboards/planck/keymaps/luke/keymap.c        | 347 ---------
 keyboards/planck/keymaps/luke/readme.md       |   2 -
 keyboards/planck/keymaps/luke/rules.mk        |  22 -
 keyboards/planck/keymaps/mollat/keymap.c      | 145 ----
 keyboards/planck/keymaps/mollat/rules.mk      |  19 -
 keyboards/planck/keymaps/nico/keymap.c        |  64 --
 keyboards/planck/keymaps/nico/rules.mk        |  19 -
 keyboards/planck/keymaps/pete/keymap.c        | 252 -------
 keyboards/planck/keymaps/pete/readme.md       |  14 -
 keyboards/planck/keymaps/pete/rules.mk        |  12 -
 keyboards/planck/keymaps/pvc/config.h         |  78 --
 keyboards/planck/keymaps/pvc/keymap.c         | 596 ---------------
 keyboards/planck/keymaps/pvc/rules.mk         |  19 -
 keyboards/planck/keymaps/rai-suta/config.h    |   8 -
 keyboards/planck/keymaps/rai-suta/keymap.c    | 105 ---
 keyboards/planck/keymaps/rai-suta/readme.md   |   3 -
 keyboards/planck/keymaps/rai-suta/rules.mk    |  22 -
 keyboards/planck/keymaps/tak3over/keymap.c    | 121 ---
 keyboards/planck/keymaps/tak3over/rules.mk    |  19 -
 keyboards/planck/keymaps/unicode/config.h     |  26 -
 keyboards/planck/keymaps/unicode/keymap.c     | 325 --------
 keyboards/planck/keymaps/unicode/rules.mk     |   8 -
 keyboards/planck/keymaps/yale/keymap.c        |  95 ---
 keyboards/planck/keymaps/yale/readme.md       |   1 -
 keyboards/planck/keymaps/yale/rules.mk        |  22 -
 keyboards/planck/keymaps/yang/config.h        |  14 -
 keyboards/planck/keymaps/yang/keymap.c        |  73 --
 keyboards/planck/keymaps/yang/readme.md       |   2 -
 keyboards/planck/keymaps/yang/rules.mk        |   7 -
 keyboards/planck/keymaps/zrichard/config.h    |  72 --
 keyboards/planck/keymaps/zrichard/keymap.c    | 634 ----------------
 keyboards/planck/keymaps/zrichard/rules.mk    |  27 -
 .../preonic/keymaps/CMD-Preonic/README.md     |  77 --
 .../preonic/keymaps/CMD-Preonic/config.h      |  26 -
 .../preonic/keymaps/CMD-Preonic/keymap.c      | 319 --------
 keyboards/preonic/keymaps/dlaroe/config.h     |  26 -
 keyboards/preonic/keymaps/dlaroe/keymap.c     | 251 -------
 keyboards/preonic/keymaps/dlaroe/readme.md    |   7 -
 keyboards/preonic/keymaps/dlaroe/rules.mk     |  22 -
 keyboards/preonic/keymaps/kinesis/config.h    |   9 -
 keyboards/preonic/keymaps/kinesis/keymap.c    | 136 ----
 keyboards/preonic/keymaps/kinesis/readme.md   |   1 -
 keyboards/preonic/keymaps/kinesis/rules.mk    |  24 -
 .../sentraq/s60_x/keymaps/bluebear/config.h   | 100 ---
 .../sentraq/s60_x/keymaps/bluebear/keymap.c   | 695 ------------------
 .../sentraq/s60_x/keymaps/bluebear/readme.md  |  67 --
 .../sentraq/s60_x/keymaps/bluebear/rules.mk   |  14 -
 .../bananasplit/keymaps/kamon/config.h        |  25 -
 .../bananasplit/keymaps/kamon/keymap.c        |  92 ---
 .../bananasplit/keymaps/kamon/readme.md       |  34 -
 .../bananasplit/keymaps/kamon/rules.mk        |  33 -
 .../minivan/keymaps/jeebak/keymap.c           | 419 -----------
 .../minivan/keymaps/jeebak/readme.md          | 129 ----
 .../minivan/keymaps/jeebak/rules.mk           |  18 -
 .../minivan/keymaps/mjt/config.h              |  14 -
 .../minivan/keymaps/mjt/keymap.c              | 188 -----
 .../minivan/keymaps/mjt/readme.md             |  26 -
 .../minivan/keymaps/mjt/rules.mk              |  18 -
 .../roadkit/keymaps/singles/config.h          |   8 -
 .../roadkit/keymaps/singles/keymap.c          |  52 --
 .../roadkit/keymaps/singles/readme.md         |   3 -
 .../roadkit/keymaps/singles/rules.mk          |  18 -
 .../roadkit/keymaps/singlesBrent/config.h     |  15 -
 .../roadkit/keymaps/singlesBrent/keymap.c     | 234 ------
 .../roadkit/keymaps/singlesBrent/readme.md    |   3 -
 .../roadkit/keymaps/singlesBrent/rules.mk     |  19 -
 .../zeal60/keymaps/ryanmaclean/config.h       |  21 -
 .../zeal60/keymaps/ryanmaclean/keymap.c       |  84 ---
 keyboards/xiudi/xd75/keymaps/adi/config.h     |  20 -
 keyboards/xiudi/xd75/keymaps/adi/keymap.c     | 199 -----
 keyboards/xiudi/xd75/keymaps/adi/readme.md    |  21 -
 keyboards/xiudi/xd75/keymaps/adi/rules.mk     |  16 -
 .../xiudi/xd75/keymaps/atomic_style/config.h  |  19 -
 .../xiudi/xd75/keymaps/atomic_style/keymap.c  | 180 -----
 .../xiudi/xd75/keymaps/atomic_style/readme.md |   1 -
 .../xiudi/xd75/keymaps/atomic_style/rules.mk  |  15 -
 .../xiudi/xd75/keymaps/cbbrowne/config.h      |  34 -
 .../xiudi/xd75/keymaps/cbbrowne/keymap.c      | 310 --------
 .../xiudi/xd75/keymaps/cbbrowne/readme.md     |  22 -
 .../xiudi/xd75/keymaps/cbbrowne/rules.mk      |  19 -
 keyboards/xiudi/xd75/keymaps/emilyh/config.h  |  19 -
 keyboards/xiudi/xd75/keymaps/emilyh/keymap.c  | 181 -----
 keyboards/xiudi/xd75/keymaps/emilyh/readme.md |   1 -
 keyboards/xiudi/xd75/keymaps/emilyh/rules.mk  |  15 -
 214 files changed, 20806 deletions(-)
 delete mode 100644 keyboards/atomic/keymaps/pvc/config.h
 delete mode 100644 keyboards/atomic/keymaps/pvc/keymap.c
 delete mode 100644 keyboards/atomic/keymaps/pvc/rules.mk
 delete mode 100644 keyboards/atreus/keymaps/xk/config.h
 delete mode 100644 keyboards/atreus/keymaps/xk/keymap.c
 delete mode 100644 keyboards/atreus/keymaps/xk/rules.mk
 delete mode 100644 keyboards/atreus62/keymaps/mneme/README.md
 delete mode 100644 keyboards/atreus62/keymaps/mneme/config.h
 delete mode 100644 keyboards/atreus62/keymaps/mneme/keymap.c
 delete mode 100644 keyboards/atreus62/keymaps/mneme/rules.mk
 delete mode 100644 keyboards/atreus62/keymaps/mneme/unicode
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk
 delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
 delete mode 100644 keyboards/duck/lightsaver/keymaps/rasmus/config.h
 delete mode 100644 keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
 delete mode 100644 keyboards/duck/lightsaver/keymaps/rasmus/readme.md
 delete mode 100644 keyboards/duck/lightsaver/keymaps/rasmus/rules.mk
 delete mode 100644 keyboards/dz60/keymaps/n0velty/keymap.c
 delete mode 100644 keyboards/ergodox_ez/keymaps/heartrobotninja/config.h
 delete mode 100644 keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c
 delete mode 100644 keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
 delete mode 100644 keyboards/ergodox_ez/keymaps/profet_80/keymap.c
 delete mode 100644 keyboards/ergodox_ez/keymaps/profet_80/readme.md
 delete mode 100644 keyboards/gh60/satan/keymaps/admiralStrokers/config.h
 delete mode 100644 keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c
 delete mode 100644 keyboards/gh60/satan/keymaps/admiralStrokers/readme.md
 delete mode 100644 keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk
 delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.c
 delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.h
 delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.txt
 delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/config.h
 delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/keymap.c
 delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/readme.md
 delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk
 delete mode 100644 keyboards/jc65/v32a/keymaps/naut/keymap.c
 delete mode 100644 keyboards/jc65/v32a/keymaps/naut/readme.md
 delete mode 100644 keyboards/jc65/v32a/keymaps/naut/rules.mk
 delete mode 100644 keyboards/jc65/v32u4/keymaps/naut/keymap.c
 delete mode 100644 keyboards/jc65/v32u4/keymaps/naut/readme.md
 delete mode 100644 keyboards/jc65/v32u4/keymaps/naut/rules.mk
 delete mode 100644 keyboards/jd45/keymaps/blakedietz/README.md
 delete mode 100644 keyboards/jd45/keymaps/blakedietz/blank_key_template.md
 delete mode 100644 keyboards/jd45/keymaps/blakedietz/config.h
 delete mode 100644 keyboards/jd45/keymaps/blakedietz/keymap.c
 delete mode 100644 keyboards/jd45/keymaps/jeebak/keymap.c
 delete mode 100644 keyboards/jd45/keymaps/jeebak/readme.md
 delete mode 100644 keyboards/kc60/keymaps/workman-dead/keymap.c
 delete mode 100644 keyboards/kc60/keymaps/workman-dead/readme.md
 delete mode 100644 keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
 delete mode 100644 keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
 delete mode 100644 keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
 delete mode 100644 keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
 delete mode 100644 keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
 delete mode 100644 keyboards/keebio/nyquist/keymaps/DivergeJM/rules.mk
 delete mode 100644 keyboards/keebio/nyquist/keymaps/pitty/README.md
 delete mode 100644 keyboards/keebio/nyquist/keymaps/pitty/config.h
 delete mode 100644 keyboards/keebio/nyquist/keymaps/pitty/keymap.c
 delete mode 100644 keyboards/keebio/nyquist/keymaps/pitty/rules.mk
 delete mode 100644 keyboards/kinesis/keymaps/carpalx/config.h
 delete mode 100644 keyboards/kinesis/keymaps/carpalx/keymap.c
 delete mode 100644 keyboards/kinesis/keymaps/carpalx/readme.md
 delete mode 100644 keyboards/kinesis/keymaps/carpalx/rules.mk
 delete mode 100644 keyboards/kinesis/keymaps/milestogo/config.h
 delete mode 100644 keyboards/kinesis/keymaps/milestogo/keymap.c
 delete mode 100644 keyboards/kinesis/keymaps/milestogo/readme.md
 delete mode 100644 keyboards/kinesis/keymaps/milestogo/rules.mk
 delete mode 100644 keyboards/lets_split/keymaps/dlaroe/config.h
 delete mode 100644 keyboards/lets_split/keymaps/dlaroe/keymap.c
 delete mode 100644 keyboards/lets_split/keymaps/dlaroe/rules.mk
 delete mode 100644 keyboards/lets_split/keymaps/xk/config.h
 delete mode 100755 keyboards/lets_split/keymaps/xk/keymap.c
 delete mode 100644 keyboards/lets_split/keymaps/xk/rules.mk
 delete mode 100644 keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
 delete mode 100644 keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
 delete mode 100644 keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
 delete mode 100755 keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
 delete mode 100644 keyboards/mitosis/keymaps/mjt/config.h
 delete mode 100644 keyboards/mitosis/keymaps/mjt/keymap.c
 delete mode 100644 keyboards/mitosis/keymaps/mjt/rules.mk
 delete mode 100644 keyboards/miuni32/keymaps/ht_156/config.h
 delete mode 100644 keyboards/miuni32/keymaps/ht_156/keymap.c
 delete mode 100644 keyboards/miuni32/keymaps/ht_156/readme.md
 delete mode 100644 keyboards/miuni32/keymaps/ht_156/rules.mk
 delete mode 100644 keyboards/planck/keymaps/ab/keyboard-layout.json
 delete mode 100644 keyboards/planck/keymaps/ab/keymap.c
 delete mode 100644 keyboards/planck/keymaps/ab/readme.md
 delete mode 100644 keyboards/planck/keymaps/ab/rules.mk
 delete mode 100644 keyboards/planck/keymaps/alexey/keymap.c
 delete mode 100644 keyboards/planck/keymaps/alexey/rules.mk
 delete mode 100644 keyboards/planck/keymaps/brandon/config.h
 delete mode 100644 keyboards/planck/keymaps/brandon/keymap.c
 delete mode 100644 keyboards/planck/keymaps/brandon/rules.mk
 delete mode 100644 keyboards/planck/keymaps/cbbrowne/config.h
 delete mode 100644 keyboards/planck/keymaps/cbbrowne/keymap.c
 delete mode 100644 keyboards/planck/keymaps/cbbrowne/readme.org
 delete mode 100644 keyboards/planck/keymaps/cbbrowne/rules.mk
 delete mode 100644 keyboards/planck/keymaps/chance/config.h
 delete mode 100644 keyboards/planck/keymaps/chance/keymap.c
 delete mode 100644 keyboards/planck/keymaps/chance/rules.mk
 delete mode 100644 keyboards/planck/keymaps/dlaroe/config.h
 delete mode 100644 keyboards/planck/keymaps/dlaroe/keymap.c
 delete mode 100644 keyboards/planck/keymaps/dlaroe/readme.md
 delete mode 100644 keyboards/planck/keymaps/dlaroe/rules.mk
 delete mode 100644 keyboards/planck/keymaps/espynn/keymap.c
 delete mode 100644 keyboards/planck/keymaps/espynn/layout.json
 delete mode 100644 keyboards/planck/keymaps/espynn/readme.md
 delete mode 100644 keyboards/planck/keymaps/espynn/rules.mk
 delete mode 100644 keyboards/planck/keymaps/jacob/keymap.c
 delete mode 100644 keyboards/planck/keymaps/jacob/readme.md
 delete mode 100644 keyboards/planck/keymaps/jacob/rules.mk
 delete mode 100644 keyboards/planck/keymaps/jeebak/config.h
 delete mode 100644 keyboards/planck/keymaps/jeebak/keymap.c
 delete mode 100644 keyboards/planck/keymaps/jeebak/readme.md
 delete mode 100644 keyboards/planck/keymaps/jeebak/rules.mk
 delete mode 100644 keyboards/planck/keymaps/joe/keymap.c
 delete mode 100644 keyboards/planck/keymaps/joe/rules.mk
 delete mode 100644 keyboards/planck/keymaps/khord/config.h
 delete mode 100644 keyboards/planck/keymaps/khord/keymap.c
 delete mode 100644 keyboards/planck/keymaps/khord/rules.mk
 delete mode 100644 keyboards/planck/keymaps/lucas/keymap.c
 delete mode 100644 keyboards/planck/keymaps/lucas/rules.mk
 delete mode 100644 keyboards/planck/keymaps/lukas/keymap.c
 delete mode 100644 keyboards/planck/keymaps/lukas/rules.mk
 delete mode 100644 keyboards/planck/keymaps/luke/keymap.c
 delete mode 100644 keyboards/planck/keymaps/luke/readme.md
 delete mode 100644 keyboards/planck/keymaps/luke/rules.mk
 delete mode 100644 keyboards/planck/keymaps/mollat/keymap.c
 delete mode 100644 keyboards/planck/keymaps/mollat/rules.mk
 delete mode 100644 keyboards/planck/keymaps/nico/keymap.c
 delete mode 100644 keyboards/planck/keymaps/nico/rules.mk
 delete mode 100644 keyboards/planck/keymaps/pete/keymap.c
 delete mode 100644 keyboards/planck/keymaps/pete/readme.md
 delete mode 100644 keyboards/planck/keymaps/pete/rules.mk
 delete mode 100644 keyboards/planck/keymaps/pvc/config.h
 delete mode 100644 keyboards/planck/keymaps/pvc/keymap.c
 delete mode 100644 keyboards/planck/keymaps/pvc/rules.mk
 delete mode 100644 keyboards/planck/keymaps/rai-suta/config.h
 delete mode 100644 keyboards/planck/keymaps/rai-suta/keymap.c
 delete mode 100644 keyboards/planck/keymaps/rai-suta/readme.md
 delete mode 100644 keyboards/planck/keymaps/rai-suta/rules.mk
 delete mode 100644 keyboards/planck/keymaps/tak3over/keymap.c
 delete mode 100644 keyboards/planck/keymaps/tak3over/rules.mk
 delete mode 100644 keyboards/planck/keymaps/unicode/config.h
 delete mode 100644 keyboards/planck/keymaps/unicode/keymap.c
 delete mode 100644 keyboards/planck/keymaps/unicode/rules.mk
 delete mode 100644 keyboards/planck/keymaps/yale/keymap.c
 delete mode 100644 keyboards/planck/keymaps/yale/readme.md
 delete mode 100644 keyboards/planck/keymaps/yale/rules.mk
 delete mode 100644 keyboards/planck/keymaps/yang/config.h
 delete mode 100644 keyboards/planck/keymaps/yang/keymap.c
 delete mode 100644 keyboards/planck/keymaps/yang/readme.md
 delete mode 100644 keyboards/planck/keymaps/yang/rules.mk
 delete mode 100755 keyboards/planck/keymaps/zrichard/config.h
 delete mode 100755 keyboards/planck/keymaps/zrichard/keymap.c
 delete mode 100755 keyboards/planck/keymaps/zrichard/rules.mk
 delete mode 100644 keyboards/preonic/keymaps/CMD-Preonic/README.md
 delete mode 100644 keyboards/preonic/keymaps/CMD-Preonic/config.h
 delete mode 100644 keyboards/preonic/keymaps/CMD-Preonic/keymap.c
 delete mode 100644 keyboards/preonic/keymaps/dlaroe/config.h
 delete mode 100644 keyboards/preonic/keymaps/dlaroe/keymap.c
 delete mode 100644 keyboards/preonic/keymaps/dlaroe/readme.md
 delete mode 100644 keyboards/preonic/keymaps/dlaroe/rules.mk
 delete mode 100644 keyboards/preonic/keymaps/kinesis/config.h
 delete mode 100644 keyboards/preonic/keymaps/kinesis/keymap.c
 delete mode 100644 keyboards/preonic/keymaps/kinesis/readme.md
 delete mode 100644 keyboards/preonic/keymaps/kinesis/rules.mk
 delete mode 100644 keyboards/sentraq/s60_x/keymaps/bluebear/config.h
 delete mode 100644 keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
 delete mode 100644 keyboards/sentraq/s60_x/keymaps/bluebear/readme.md
 delete mode 100644 keyboards/sentraq/s60_x/keymaps/bluebear/rules.mk
 delete mode 100644 keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h
 delete mode 100644 keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c
 delete mode 100644 keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md
 delete mode 100644 keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
 delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
 delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md
 delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
 delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/mjt/config.h
 delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
 delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md
 delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singles/config.h
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md
 delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
 delete mode 100644 keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h
 delete mode 100644 keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c
 delete mode 100644 keyboards/xiudi/xd75/keymaps/adi/config.h
 delete mode 100644 keyboards/xiudi/xd75/keymaps/adi/keymap.c
 delete mode 100644 keyboards/xiudi/xd75/keymaps/adi/readme.md
 delete mode 100644 keyboards/xiudi/xd75/keymaps/adi/rules.mk
 delete mode 100644 keyboards/xiudi/xd75/keymaps/atomic_style/config.h
 delete mode 100644 keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
 delete mode 100644 keyboards/xiudi/xd75/keymaps/atomic_style/readme.md
 delete mode 100644 keyboards/xiudi/xd75/keymaps/atomic_style/rules.mk
 delete mode 100644 keyboards/xiudi/xd75/keymaps/cbbrowne/config.h
 delete mode 100644 keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
 delete mode 100644 keyboards/xiudi/xd75/keymaps/cbbrowne/readme.md
 delete mode 100644 keyboards/xiudi/xd75/keymaps/cbbrowne/rules.mk
 delete mode 100644 keyboards/xiudi/xd75/keymaps/emilyh/config.h
 delete mode 100644 keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
 delete mode 100644 keyboards/xiudi/xd75/keymaps/emilyh/readme.md
 delete mode 100644 keyboards/xiudi/xd75/keymaps/emilyh/rules.mk

diff --git a/keyboards/atomic/keymaps/pvc/config.h b/keyboards/atomic/keymaps/pvc/config.h
deleted file mode 100644
index 01fa0f4313..0000000000
--- a/keyboards/atomic/keymaps/pvc/config.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#undef PRODUCT_ID
-#define PRODUCT_ID      0x0419
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-#define BACKLIGHT_PIN B7
-#define BACKLIGHT_BREATHING
-
-#define AUDIO_PIN C6
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* 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
-
-// Enable Keyboard Locking via magic key
-#define KEYBOARD_LOCK_ENABLE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-#define MAGIC_KEY_BOOTLOADER       B
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-#ifndef NO_DEBUG
-#  define NO_DEBUG
-#endif
-
-/* disable print */
-// #ifndef NO_PRINT
-// #  define NO_PRINT
-// #endif
-
-/* Only print user print statements */
-#define USER_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-//#define VIBRATO_ENABLE
-//#define VIBRATO_STRENGTH_ENABLE
-
-#endif
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c
deleted file mode 100644
index d4eee803ac..0000000000
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ /dev/null
@@ -1,605 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "led.h"
-#include "mousekey.h"
-
-#ifdef AUDIO_ENABLE
-    #include "audio.h"
-    #include "song_list.h"
-#endif
-
-enum keyboard_layers {
-  LAYER_QWERTY = 0,
-  LAYER_UPPER,
-  LAYER_LOWER,
-  LAYER_FUNCTION,
-  LAYER_MOUSE,
-  LAYER_ADJUST,
-};
-enum keyboard_macros {
-  MACRO_QWERTY = 0,
-  MACRO_UPPER,
-  MACRO_LOWER,
-  MACRO_FUNCTION,
-  MACRO_MOUSE,
-  MACRO_TIMBRE_1,
-  MACRO_TIMBRE_2,
-  MACRO_TIMBRE_3,
-  MACRO_TIMBRE_4,
-  MACRO_TEMPO_U,
-  MACRO_TEMPO_D,
-  MACRO_TONE_DEFAULT,
-  MACRO_MUSIC_TOGGLE,
-  MACRO_AUDIO_TOGGLE,
-  MACRO_INC_VOICE,
-  MACRO_DEC_VOICE,
-  MACRO_BACKLIGHT,
-  MACRO_BREATH_TOGGLE,
-  MACRO_BREATH_SPEED_INC,
-  MACRO_BREATH_SPEED_DEC,
-  MACRO_BREATH_DEFAULT,
-  MACRO_MOUSE_MOVE_UL,
-  MACRO_MOUSE_MOVE_UR,
-  MACRO_MOUSE_MOVE_DL,
-  MACRO_MOUSE_MOVE_DR,
-  MACRO_HELP_1,
-  MACRO_HELP_2,
-  MACRO_HELP_3,
-  MACRO_HELP_4,
-  MACRO_HELP_5,
-  MACRO_HELP_6,
-  MACRO_HELP_7,
-  MACRO_HELP_8,
-  MACRO_HELP_9,
-};
-
-#define M_QWRTY             M(MACRO_QWERTY)
-#define M_UPPER             M(MACRO_UPPER)
-#define M_LOWER             M(MACRO_LOWER)
-#define M_FUNCT             M(MACRO_FUNCTION)
-#define M_MOUSE             M(MACRO_MOUSE)
-#define TIMBR_1             M(MACRO_TIMBRE_1)
-#define TIMBR_2             M(MACRO_TIMBRE_2)
-#define TIMBR_3             M(MACRO_TIMBRE_3)
-#define TIMBR_4             M(MACRO_TIMBRE_4)
-#define TMPO_UP             M(MACRO_TEMPO_U)
-#define TMPO_DN             M(MACRO_TEMPO_D)
-#define TMPO_DF             M(MACRO_TONE_DEFAULT)
-#define M_BACKL             M(MACRO_BACKLIGHT)
-#define M_BRTOG             M(MACRO_BREATH_TOGGLE)
-#define M_BSPDU             M(MACRO_BREATH_SPEED_INC)
-#define M_BSPDD             M(MACRO_BREATH_SPEED_DEC)
-#define M_BDFLT             M(MACRO_BREATH_DEFAULT)
-#define M_MS_UL             M(MACRO_MOUSE_MOVE_UL)
-#define M_MS_UR             M(MACRO_MOUSE_MOVE_UR)
-#define M_MS_DL             M(MACRO_MOUSE_MOVE_DL)
-#define M_MS_DR             M(MACRO_MOUSE_MOVE_DR)
-#define M_HELP1             M(MACRO_HELP_1)
-#define M_HELP2             M(MACRO_HELP_2)
-#define M_HELP3             M(MACRO_HELP_3)
-#define M_HELP4             M(MACRO_HELP_4)
-#define M_HELP5             M(MACRO_HELP_5)
-#define M_HELP6             M(MACRO_HELP_6)
-#define M_HELP7             M(MACRO_HELP_7)
-#define M_HELP8             M(MACRO_HELP_8)
-#define M_HELP9             M(MACRO_HELP_9)
-
-
-#define VC_UP               M(MACRO_INC_VOICE)
-#define VC_DOWN             M(MACRO_DEC_VOICE)
-
-
-#define SC_UNDO             LCTL(KC_Z)
-#define SC_REDO             LCTL(KC_Y)
-#define SC_CUT              LCTL(KC_X)
-#define SC_COPY             LCTL(KC_C)
-#define SC_PSTE             LCTL(KC_V)
-#define SC_SELA             LCTL(KC_A)
-#define SC_SAVE             LCTL(KC_S)
-#define SC_OPEN             LCTL(KC_O)
-#define SC_ACLS             LALT(KC_F4)
-#define SC_CCLS             LCTL(KC_F4)
-
-#define TG_NKRO             MAGIC_TOGGLE_NKRO
-#define OS_SHFT             OSM(MOD_LSFT)
-
-#define ________________    _______, _______
-#define XXXXXXXXXXXXXXXX    XXXXXXX, XXXXXXX
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* LAYER = LAYER_QWERTY
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | BACKSP . BACKSP |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | \      | DEL    |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | CAP LK | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | ENTER  . ENTER  | PG UP  |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | RSHIFT . RSHIFT | UP     | PG DN  |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | LCTRL  | LWIN   | FN     | LALT   | UPPER  | SPACE  . SPACE  | LOWER  | OSHIFT | RALT   | APP    | RCTRL  | LEFT   | DOWN   | RIGHT  |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-  [LAYER_QWERTY] = LAYOUT_ortho_5x15(
-    KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,
-    KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
-    KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , KC_ENT , KC_PGUP,
-    KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_RSFT, KC_UP  , KC_PGDN,
-    KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_RALT, KC_APP , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  /* LAYER = LAYER_UPPER
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | PRINT  | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | KP /   | KP *   | KP -   | XXXXXX | XXXXXX | ______ . ______ |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | PAUSE  | F1     | F2     | F3     | F4     | NUM LK | KP /   | KP 7   | KP 8   | KP 9   | KP -   | ______ | ______ | ______ | INS    |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | F5     | F6     | F7     | F8     | CAP LK | KP *   | KP 4   | KP 5   | KP 6   | KP +   | ______ | ______ . ______ | HOME   |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | F9     | F10    | F11    | F12    | SCR LK | KP 0   | KP 1   | KP 2   | KP 3   | KP ENT | ______ . ______ | ______ | END    |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | ______ | ______ | ______ | UPPER  | KP 0   . KP 0   | ______ | RALT   | KP .   | KP ENT | ______ | ______ | ______ | ______ |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-  [LAYER_UPPER] = LAYOUT_ortho_5x15(
-    KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, _______, _______,
-    KC_PAUS, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS ,
-    _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, KC_HOME,
-    _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_SLCK, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______, _______, KC_END ,
-    _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, _______, _______, _______, _______
-  ),
-  /* LAYER = LAYER_LOWER
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | PRINT  | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | ______ . ______ |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | $      | {      | [      | (      | %      | #      | )      | ]      | }      | @      | ______ | ______ | ______ | INS    |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | ^      | *      | +      | -      | /      | \      | _      | '      | "      | `      | ______ | ______ . ______ | HOME   |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | |      | &      | !      | ~      | ;      | :      | =      | <      | >      | ?      | ______ . ______ | ______ | END    |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | ______ | ______ | ______ | ______ | ______ . ______ | LOWER  | ______ | ______ | ______ | ______ | ______ | ______ | ______ |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-  [LAYER_LOWER] = LAYOUT_ortho_5x15(
-    KC_PSCR, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______,
-    _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT  , _______, _______, _______, KC_INS ,
-    _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, KC_HOME,
-    _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT  , KC_GT  , KC_QUES, _______, _______, _______, KC_END ,
-    _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, _______, _______, _______, _______
-  ),
-  /* LAYER = LAYER_FUNCTION
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | F13    | F14    | F15    | F16    | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | F17    | F18    | F19    | F20    | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | F21    | F22    | F23    | F24    | CAP LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ______ . ______ | VOL UP | MUTE   |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | ______ | FN     | ______ | ______ | PLAY   . PLAY   | ______ | ______ | ______ | ______ | ______ | PREV   | VOL DN | NEXT   |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-  [LAYER_FUNCTION] = LAYOUT_ortho_5x15(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_VOLU, KC_MUTE,
-    _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-  ),
-  /* LAYER = LAYER_MOUSE
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | ESC    | MS AC0 | MS AC1 | MS AC2 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL  | MS U   | MS UR  | XXXXXX | XXXXXX | XXXXXX | MS WHL | MS WHR |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | MS BT5 | MS BT4 | MS BT3 | MS BT2 | XXXXXX | XXXXXX | MS L   | XXXXXX | MS R   | XXXXXX | XXXXXX | XXXXXX . XXXXXX | MS WHU |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS DL  | MS D   | MS DR  | XXXXXX | ______ . ______ | MS U   | MS WHD |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | ______ | ______ | ______ | ______ | ______ | MS BT1 . MS BT1 | ______ | ______ | ______ | ______ | ______ | MS L   | MS D   | MS R   |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-  [LAYER_MOUSE] = LAYOUT_ortho_5x15(
-    KC_ESC , KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_R,
-    XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, XXXXXXX, _______, _______, KC_MS_U, KC_WH_D,
-    _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-  ),
-  /* LAYER = LAYER_ADJUST
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | XXXXXX | HELP 1 | HELP 2 | HELP 3 | HELP 4 | HELP 5 | HELP 6 | HELP 7 | HELP 8 | HELP 9 | XXXXXX | MUSIC  | AUDIO  | XXXXXX . XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | BRTOG  | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | QK_BOOT  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | VOICE+ | XXXXXX |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-    | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER  | XXXXXX . XXXXXX | LOWER  | XXXXXX | XXXXXX | XXXXXX | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-  [LAYER_ADJUST] = LAYOUT_ortho_5x15(
-    XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, XXXXXXX, MU_TOG , AU_TOG , XXXXXXX, XXXXXXX,
-    XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, QK_BOOT, XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP
-  ),
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_my_startup[][2] = SONG(ODE_TO_JOY);
-float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-
-float tone_audio_on[][2]   = SONG(CLOSE_ENCOUNTERS_5_NOTE);
-float tone_music_on[][2]   = SONG(DOE_A_DEER);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-float tone_caps_on[][2]    = SONG(CAPS_LOCK_ON_SOUND);
-float tone_caps_off[][2]   = SONG(CAPS_LOCK_OFF_SOUND);
-float tone_numlk_on[][2]   = SONG(NUM_LOCK_ON_SOUND);
-float tone_numlk_off[][2]  = SONG(NUM_LOCK_OFF_SOUND);
-float tone_scroll_on[][2]  = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
-
-#endif /* AUDIO_ENABLE */
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-
-  // MACRODOWN only works in this function
-  switch(id) {
-
-        case MACRO_HELP_1:
-            if (record->event.pressed)
-            {
-        uprintf("1");
-            }
-            break;
-
-        case MACRO_HELP_2:
-            if (record->event.pressed)
-            {
-        uprintf("2");
-            }
-            break;
-
-        case MACRO_HELP_3:
-            if (record->event.pressed)
-            {
-        uprintf("3");
-            }
-            break;
-
-        case MACRO_HELP_4:
-            if (record->event.pressed)
-            {
-        uprintf("4");
-            }
-            break;
-
-        case MACRO_HELP_5:
-            if (record->event.pressed)
-            {
-        uprintf("5");
-            }
-            break;
-
-        case MACRO_HELP_6:
-            if (record->event.pressed)
-            {
-        uprintf("6");
-            }
-            break;
-
-        case MACRO_HELP_7:
-            if (record->event.pressed)
-            {
-        uprintf("7");
-            }
-            break;
-
-        case MACRO_HELP_8:
-            if (record->event.pressed)
-            {
-        uprintf("8");
-            }
-            break;
-
-        case MACRO_HELP_9:
-            if (record->event.pressed)
-            {
-        uprintf("9");
-            }
-            break;
-
-        case MACRO_BREATH_TOGGLE:
-            if (record->event.pressed)
-            {
-                breathing_toggle();
-            }
-            break;
-
-        case MACRO_BREATH_SPEED_INC:
-            if (record->event.pressed)
-            {
-                breathing_period_inc();
-            }
-            break;
-
-        case MACRO_BREATH_SPEED_DEC:
-            if (record->event.pressed)
-            {
-                breathing_period_dec();
-            }
-            break;
-
-        case MACRO_BREATH_DEFAULT:
-            if (record->event.pressed)
-            {
-                breathing_period_default();
-            }
-            break;
-
-        case MACRO_QWERTY:
-            if (record->event.pressed)
-            {
-                persistent_default_layer_set(1UL<<LAYER_QWERTY);
-            }
-            break;
-
-        case MACRO_UPPER:
-            if (record->event.pressed)
-            {
-                layer_on(LAYER_UPPER);
-                breathing_period_set(2);
-                breathing_pulse();
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            else
-            {
-                layer_off(LAYER_UPPER);
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            break;
-
-        case MACRO_LOWER:
-            if (record->event.pressed)
-            {
-                layer_on(LAYER_LOWER);
-                breathing_period_set(2);
-                breathing_pulse();
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            else
-            {
-                layer_off(LAYER_LOWER);
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            break;
-
-        case MACRO_FUNCTION:
-            if (record->event.pressed)
-            {
-                breathing_period_set(3);
-                breathing_enable();
-                layer_on(LAYER_FUNCTION);
-            }
-            else
-            {
-                breathing_period_set(1);
-                breathing_disable();
-                layer_off(LAYER_FUNCTION);
-            }
-            break;
-
-#ifdef MOUSEKEY_ENABLE
-
-        case MACRO_MOUSE:
-            if (record->event.pressed)
-            {
-                layer_invert(LAYER_MOUSE);
-            }
-            break;
-
-#endif /* MOUSEKEY_ENABLE */
-
-#ifdef AUDIO_ENABLE
-
-        case MACRO_TIMBRE_1:
-            if (record->event.pressed) set_timbre(TIMBRE_12);
-            break;
-
-        case MACRO_TIMBRE_2:
-            if (record->event.pressed) set_timbre(TIMBRE_25);
-            break;
-
-        case MACRO_TIMBRE_3:
-            if (record->event.pressed) set_timbre(TIMBRE_50);
-            break;
-
-        case MACRO_TIMBRE_4:
-            if (record->event.pressed) set_timbre(TIMBRE_75);
-            break;
-
-        case MACRO_TEMPO_U:
-            if (record->event.pressed) increase_tempo(10);
-            break;
-
-        case MACRO_TEMPO_D:
-            if (record->event.pressed) decrease_tempo(10);
-            break;
-
-        case MACRO_TONE_DEFAULT:
-            if (record->event.pressed)
-            {
-                set_timbre(TIMBRE_DEFAULT);
-                set_tempo(TEMPO_DEFAULT);
-            }
-            break;
-
-/*
-        case MACRO_AUDIO_TOGGLE:
-            if (record->event.pressed)
-            {
-                    if (is_audio_on())
-                    {
-                        audio_off();
-                    }
-                    else
-                    {
-                        audio_on();
-                        PLAY_SONG(tone_audio_on);
-                    }
-            }
-            break;
-
-        case MACRO_MUSIC_TOGGLE:
-            if (record->event.pressed)
-            {
-                    if (IS_LAYER_ON(LAYER_MUSIC))
-                    {
-                        layer_off(LAYER_MUSIC);
-                        stop_all_notes();
-                    }
-                    else
-                    {
-                    PLAY_SONG(tone_music_on);
-                    layer_on(LAYER_MUSIC);
-                    }
-            }
-            break;
-        case MACRO_INC_VOICE:
-            if (record->event.pressed)
-            {
-                #ifdef AUDIO_ENABLE
-                    voice_iterate();
-                    PLAY_SONG(music_scale);
-                #endif
-            }
-            break;
-
-        case MACRO_DEC_VOICE:
-            if (record->event.pressed)
-            {
-                #ifdef AUDIO_ENABLE
-                    voice_deiterate();
-                    PLAY_SONG(music_scale);
-                #endif
-            }
-            break;
-*/
-
-#endif /* AUDIO_ENABLE */
-
-#ifdef BACKLIGHT_ENABLE
-        case MACRO_BACKLIGHT:
-            if (record->event.pressed)
-            {
-                backlight_step();
-            }
-#endif
-
-        default:
-            break;
-
-    }
-    return MACRO_NONE;
-};
-
-
-#ifdef AUDIO_ENABLE
-
-void matrix_init_user(void)
-{
-    set_voice(default_voice);
-    startup_user();
-    println("Matrix Init");
-}
-
-void led_set_user(uint8_t usb_led)
-{
-    static uint8_t old_usb_led = 0;
-
-    _delay_ms(10); // gets rid of tick
-
-    if (!is_playing_notes())
-    {
-        if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-        {
-                // If CAPS LK LED is turning on...
-                PLAY_SONG(tone_caps_on);
-        }
-        else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-        {
-                // If CAPS LK LED is turning off...
-                PLAY_SONG(tone_caps_off);
-        }
-        else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
-        {
-                // If NUM LK LED is turning on...
-                PLAY_SONG(tone_numlk_on);
-        }
-        else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
-        {
-                // If NUM LED is turning off...
-                PLAY_SONG(tone_numlk_off);
-        }
-        else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-        {
-                // If SCROLL LK LED is turning on...
-                PLAY_SONG(tone_scroll_on);
-        }
-        else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-        {
-                // If SCROLL LED is turning off...
-                PLAY_SONG(tone_scroll_off);
-        }
-    }
-
-    old_usb_led = usb_led;
-}
-
-
-void startup_user()
-{
-    _delay_ms(10); // gets rid of tick
-    PLAY_SONG(tone_my_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_my_goodbye);
-    _delay_ms(2000);
-    stop_all_notes();
-}
-
-void audio_on_user(void)
-{
-	PLAY_SONG(tone_audio_on);
-}
-
-void music_on_user(void)
-{
-	PLAY_SONG(tone_music_on);
-}
-
-void music_scale_user(void)
-{
-	PLAY_SONG(music_scale);
-}
-
-#endif /* AUDIO_ENABLE */
diff --git a/keyboards/atomic/keymaps/pvc/rules.mk b/keyboards/atomic/keymaps/pvc/rules.mk
deleted file mode 100644
index 9385227ef6..0000000000
--- a/keyboards/atomic/keymaps/pvc/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = 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 = yes # Enable keyboard backlight functionality
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = yes # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight. 
-LTO_ENABLE       = yes # Optimize size of firmware
-
-# 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/atreus/keymaps/xk/config.h b/keyboards/atreus/keymaps/xk/config.h
deleted file mode 100644
index a8b9c88057..0000000000
--- a/keyboards/atreus/keymaps/xk/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TOGGLE 1
-#define TAPPING_TERM 300
-#define ONESHOT_TAP_TOGGLE 3
-#define ONESHOT_LAYER_TOGGLE 3
-#define ONESHOT_TIMEOUT 800
-
-#define MOUSEKEY_INTERVAL 50
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-
-#define MOUSEKEY_WHEEL_DELAY 0
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define PERMISSIVE_HOLD
-
-#endif
diff --git a/keyboards/atreus/keymaps/xk/keymap.c b/keyboards/atreus/keymaps/xk/keymap.c
deleted file mode 100644
index c3f6b1e9f8..0000000000
--- a/keyboards/atreus/keymaps/xk/keymap.c
+++ /dev/null
@@ -1,311 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#include QMK_KEYBOARD_H
-
-#define _COLEMAK  0
-#define _KAMELOC  1
-#define _IKAPILA  2
-#define _IKASHFT  3
-#define _FNCTION  5
-#define _NINEKEY  6
-#define _GAMEQWERTY   7
-#define _MLAYER   8
-#define _GRVTABL  9
-
-enum custom_keycodes {
-  COLEMAK = SAFE_RANGE,
-  KAMELOC,
-  IKAPILA,
-  IKASHFT,
-  FNCTION,
-  NINEKEY,
-  GAMEQWERTY,
-  MLAYER,
-  GRVTABL,
-};
-
-//TD Declarations
-enum {
-VOM = 0,
-PRN,
-EGT,
-HRD,
-XRD,
-DSH,
-ESC,
-EQE,
-PGN,
-HND,
-COD,
-UND,
-MND,
-F11,
-F12,
-F13,
-F14,
-F15,
-F16,
-F17,
-F18,
-F19,
-F20,
-//unicode_inputctl
-LINUX,
-WIN,
-WINSH,
-OSX,
-};
-
-// action-TAP for key/mod behavior LT(layer, KC)
-#define XK_TAB      LT(_KAMELOC, KC_TAB)
-#define XK_BSP      LT(_KAMELOC, KC_BSPC)
-
-#define XK_SPC      LT(_IKAPILA, KC_SPC)
-#define XK_ENT      LT(_IKAPILA, KC_ENT)
-#define XK_PGDN     LT(_IKASHFT, KC_PGDN)
-#define XK_APO      LT(_IKASHFT, KC_QUOT)
-#define XK_PGUP     LT(_IKASHFT, KC_PGUP)
-#define PIPBOY      LT(_FNCTION, KC_BSLS)
-
-#define XK_DEL      LT(_IKASHFT, KC_DEL)
-#define XK_ESC      LT(_GRVTABL, KC_ESC)
-
-// mod-TAP for mod/key behavior MT(modkey, KC)
-#define ALT_IT      MT(MOD_RALT, KC_SCLN)
-#define SFT_IT      MT(MOD_RSFT, KC_DOT)
-#define CTL_IT      MT(MOD_RCTL, KC_SLSH)
-#define SFT_ENT	    MT(MOD_RSFT, KC_ENT)
-
-//sticky modifiers
-#define KYCTL       OSM(MOD_LCTL)
-#define KYSFT       OSM(MOD_LSFT)
-#define KYALT       OSM(MOD_LALT)
-#define CAKY        OSM(MOD_LCTL | MOD_LALT)
-
-//shortcuts
-#define CADEL       LALT(LCTL(KC_DEL))
-#define CAINS       LALT(LCTL(KC_INS))
-#define TGNKRO      MAGIC_TOGGLE_NKRO
-
-#define NAVCH       LCTL(KC_HOME)
-#define NAVCPD      LCTL(KC_PGDN)
-#define NAVCPU      LCTL(KC_PGUP)
-#define NAVCE       LCTL(KC_END)
-#define NAVCU       LCTL(KC_UP)
-#define NAVCD       LCTL(KC_DOWN)
-#define NAVCL       LCTL(KC_LEFT)
-#define NAVCR       LCTL(KC_RGHT)
-#define NAVGU       LGUI(KC_UP)
-#define NAVGD       LGUI(KC_DOWN)
-#define NAVGL       LGUI(KC_LEFT)
-#define NAVGR       LGUI(KC_RGHT)
-
-#define KC_NDSH     LCTL(KC_PMNS)
-#define KC_MDSH     LALT(LCTL(KC_PMNS))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*
-    TAP
-    ┌────┬────┬────┬────┬────┐              ┌────┬────┬────┬────┬────┐
-    │ Q  │ W  │ F  │ P  │ B  │              │ J  │ L  │ U  │ Y  │ ;  │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │ A  │ R  │ S  │ T  │ G  │              │ M  │ N  │ E  │ I  │ O  │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │ X  │ C  │ D  │ V  │ Z  ├────┐    ┌────┤ K  │ H  │ ,  │ .  │ /  │
-    ├────┼────┼────┼────┼────┤    │    │    ├────┼────┼────┼────┼────┤
-    │SFTn│CTLn│ALTn│ROUS│SPC │BKSP│    │TAB │ENT │PGDN│ '  │ \  │ESC │
-    └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-     HOLD
-    ┌────┬────┬────┬────┬────┐              ┌────┬────┬────┬────┬────┐
-    │    │    │    │    │    │              │    │    │    │    │ALT │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    │              │    │    │    │    │    │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    ├────┐    ┌────┤    │    │    │    │CTL │
-    ├────┼────┼────┼────┼────┤    │    │    ├────┼────┼────┼────┼────┤
-    │SFT │CTL │ALT │ROUS│L123│L OH│    │L OH│L123│L!@#│    │L FN│LESC│
-    └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-     DOUBLETAP
-    ┌────┬────┬────┬────┬────┐              ┌────┬────┬────┬────┬────┐
-    │    │    │    │    │    │              │    │    │    │    │    │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    │              │    │    │    │    │    │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    ├────┐    ┌────┤    │    │    │    │    │
-    ├────┼────┼────┼────┼────┤    │    │    ├────┼────┼────┼────┼────┤
-    │OSML│OSML│OSML│NADA│    │    │    │    │    │    │    │    │    │
-    └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  */
-
-  // Colemak PB&J (Mod-DH)
-  [_COLEMAK] = LAYOUT( \
-    KC_Q,   KC_W,   KC_F,   KC_P,         KC_B,                      KC_J,    KC_L,    KC_U,     KC_Y,    ALT_IT, \
-    KC_A,   KC_R,   KC_S,   KC_T,         KC_G,                      KC_M,    KC_N,    KC_E,     KC_I,    KC_O,   \
-    KC_X,   KC_C,   KC_D,   KC_V,         KC_Z,                      KC_K,    KC_H,    KC_COMM,  SFT_IT,  CTL_IT, \
-    KYCTL,  KYSFT,  KYALT,  TT(_MLAYER),  XK_SPC,  XK_TAB,  XK_BSP,  XK_ENT,  XK_PGDN, XK_APO,   PIPBOY,  XK_ESC  \
-  ),
-
-  // useful for one-handed typing
-  [_KAMELOC] = LAYOUT( \
-    KC_SCLN,  KC_Y,    KC_U,         KC_L,     KC_J,                        KC_B,    KC_P,     KC_F,   KC_W,   KC_Q, \
-    KC_O,     KC_I,    KC_E,         KC_N,     KC_M,                        KC_G,    KC_T,     KC_S,   KC_R,   KC_A, \
-    KC_SLSH,  KC_DOT,  KC_COMM,      KC_H,     KC_K,                        KC_Z,    KC_V,     KC_D,   KC_C,   KC_X, \
-    XK_ESC,   PIPBOY,  TT(_MLAYER),  KC_PGDN,  KC_ENT,  _______,  _______,  XK_SPC,  KC_PGUP,  KYALT,  KYCTL,  KYSFT \
-  ),
-
-  /*
-    ┌────┬────┬────┬────┬────┐              ┌────┬────┬────┬────┬────┐
-    │ 1  │ 2  │ 3  │ 4  │ 5  │              │ 6  │ 7  │ 8  │ 9  │ 0  │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │ M  │ V- │ V+ │NEXT│PLAY│              │ ←  │ ↓  │ ↑  │ →  │DASH│
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │ -  │ =  │ `  │GUI │UNDO├────┐    ┌────┤HOME│END │HOME│INS │ \  │
-    ├────┼────┼────┼────┼────┤    │    │    ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    │    │    │    │    │GUI │    │    │    │
-    └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  */
-
-  [_IKAPILA] = LAYOUT( \
-    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                           KC_6,     KC_7,     KC_8,     KC_9,     KC_0,    \
-    KC_MUTE,  KC_VOLD,  KC_VOLU,  TD(MND),  KC_MPLY,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  TD(DSH), \
-    KC_MINS,  KC_EQL,   KC_GRV,   KC_LGUI,  LCTL(KC_Z),                     TD(HND),  KC_HOME,  TD(HND),  KC_INS,   KC_BSLS, \
-    _______,  _______,  _______,  _______,  _______,     _______, _______,  _______,  KC_LGUI,  _______,  _______,  KYSFT    \
-  ),
-
-  /*
-    ┌────┬────┬────┬────┬────┐              ┌────┬────┬────┬────┬────┐
-    │ !  │ @  │ #  │ $  │ %  │              │ ^  │ &  │ *  │ (  │ )  │
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │PSCR│ ←  │ ↓  │ ↑  │ →  │              │NEXT│PGUP│ V+ │ V- │DASH│
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │ _  │ +  │ ~  │HOME│END ├────┐    ┌────┤ {} │ () │ <> │ [  │ ]  │
-    ├────┼────┼────┼────┼────┤    │    │    ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    │DEL │    │BKSP│    │    │    │    │    │
-    └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  */
-
-  [_IKASHFT] =  LAYOUT( \
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \
-    KC_PSCR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,                  TD(MND), KC_PGUP, KC_VOLU, TD(VOM), KC_MDSH, \
-    KC_UNDS, KC_PLUS, KC_TILD, KC_HOME, KC_END,                   M(1),    M(0),    M(5),    KC_LBRC, KC_RBRC, \
-    _______, _______, _______, _______, _______, KC_BSPC, KC_DEL, _______, _______, _______, _______, _______  \
-  ),
-
-  /*
-    ┌────┬────┬────┬────┬────┐              ┌────┬────┬────┬────┬────┐
-    │ F1 │ F2 │ F3 │ F4 │ F5 │              │ F6 │ F7 │ F8 │ F9 │ F10│
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │ F21│ F22│ F23│ F24│PAUS│              │    │SCLK│BOOT│    │NKRO│
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    ├────┐    ┌────┤    │    │    │    │CAPS│
-    ├────┼────┼────┼────┼────┤    │    │    ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    │    │    │    │    │    │    │    │    │
-    └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  */
-
-  [_FNCTION] =  LAYOUT( \
-    TD(F11), TD(F12), TD(F13), TD(F14), TD(F15),                    TD(F16), TD(F17), TD(F18), TD(F19), TD(F20), \
-    KC_F21,  KC_F22,  KC_F23,  KC_F24,  XXXXXXX,                    XXXXXXX, KC_SLCK, XXXXXXX, XXXXXXX, TGNKRO,  \
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, \
-    _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______  \
-  ),
-
-  [_GAMEQWERTY] = LAYOUT( \
-    KC_P,    KC_Q,    KC_W,    KC_E,    KC_R,                        KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    \
-    KC_SCLN, KC_A,    KC_S,    KC_D,    KC_F,                        KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    \
-    KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,                        KC_B,    KC_N,    KC_M,    KC_COMM, TD(COD), \
-    _______, _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______, _______  \
-  ),
-
-  /*
-    ┌────┬────┬────┬────┬────┐              ┌────┬────┬────┬────┬────┐
-    │^HOM│^PGD│^UP │^PGU│^PGU│              │    │MW_L│ MU │MW_R│ AC2│
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │^END│^LFT│^DWN│^RGT│^PGD│              │    │ ML │ MD │ MR │ AC1│
-    ├────┼────┼────┼────┼────┤              ├────┼────┼────┼────┼────┤
-    │ M5 │ M2 │ M4 │ M3 │ M1 ├────┐    ┌────┤    │MW_D│MW_U│    │ AC0│
-    ├────┼────┼────┼────┼────┤    │    │    ├────┼────┼────┼────┼────┤
-    │    │    │    │    │    │    │    │    │    │    │    │    │    │
-    └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  */
-
-  [_MLAYER] = LAYOUT( \
-    LALT(KC_ESC), KC_9,    KC_8,    KC_7,    KC_6,                      M(1),    M(0),    KC_MS_U, M(0),    M(2),     \
-    KC_0,         KC_2,    KC_3,    KC_4,    KC_5,                      M(5),    KC_MS_L, KC_MS_D, KC_MS_R, KC_ACL2,  \
-    KC_1,         KC_0,    XXXXXXX, XXXXXXX, KC_BTN5,                   KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, M(5),     \
-    _______,      _______, _______, _______, KC_BTN1, KC_BTN2, KC_BTN2, KC_BTN1, KC_BTN2, _______, KC_ACL0, _______ \
-  ),
-
-  //one_ring=2__rule__them-all
-  [_GRVTABL] = LAYOUT( \
-    LALT(KC_PSCR), M(4),            KC_PWR,      KC_PWR,       QK_BOOT,                        QK_BOOT,      KC_R,         KC_E,        KC_I,            LALT(KC_PSCR), \
-    TG(_NINEKEY),  TG(_FNCTION),    TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA),                   TG(_IKAPILA), KC_S,         KC_U,        KC_B,            TG(_NINEKEY),  \
-    M(3),          TG(_GAMEQWERTY), XXXXXXX,     XXXXXXX,      XXXXXXX,                        KC_MYCM,      KC_CALC,      XXXXXXX,     TG(_GAMEQWERTY), M(3),          \
-    TT(_GRVTABL),  TG(_FNCTION),    TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), _______, _______, TG(_IKAPILA), TG(_IKASHFT), TG(_MLAYER), TG(_MLAYER),     TG(_NINEKEY)   \
-  ),
-};
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [VOM] = ACTION_TAP_DANCE_DOUBLE(KC_VOLD, KC_MUTE),
-  [PRN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),
-  [EGT] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
-  [HRD] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
-  [DSH] = ACTION_TAP_DANCE_DOUBLE(KC_NDSH, KC_MDSH),
-  [ESC] = ACTION_TAP_DANCE_DOUBLE(KC_ESC,  LALT(KC_F4)),
-  [EQE] = ACTION_TAP_DANCE_DOUBLE(KC_EQL,  KC_ENT),
-  [UND] = ACTION_TAP_DANCE_DOUBLE(KC_Z,    LCTL(KC_Z)),
-  [PGN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_PGUP),
-  [HND] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
-  [COD] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
-  [MND] = ACTION_TAP_DANCE_DOUBLE(KC_MNXT, KC_MPRV),
-  [F11] = ACTION_TAP_DANCE_DOUBLE(KC_F1,   KC_F11),
-  [F12] = ACTION_TAP_DANCE_DOUBLE(KC_F2,   KC_F12),
-  [F13] = ACTION_TAP_DANCE_DOUBLE(KC_F3,   KC_F13),
-  [F14] = ACTION_TAP_DANCE_DOUBLE(KC_F4,   KC_F14),
-  [F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5,   KC_F15),
-  [F16] = ACTION_TAP_DANCE_DOUBLE(KC_F6,   KC_F16),
-  [F17] = ACTION_TAP_DANCE_DOUBLE(KC_F7,   KC_F17),
-  [F18] = ACTION_TAP_DANCE_DOUBLE(KC_F8,   KC_F18),
-  [F19] = ACTION_TAP_DANCE_DOUBLE(KC_F9,   KC_F19),
-  [F20] = ACTION_TAP_DANCE_DOUBLE(KC_F10,  KC_F20),
-};
-
-void matrix_init_user(){
-  set_unicode_input_mode(UC_LNX);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  if (record->event.pressed) {
-    switch(id) {
-      case 0:
-        return MACRO( D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), T(LEFT), END );
-      case 1:
-        return MACRO( D(LSFT), T(LBRC), U(LSFT), D(LSFT), T(RBRC), U(LSFT), T(LEFT), END );
-      case 2:
-        return MACRO( T(LBRC), T(RBRC), T(LEFT), END);
-      case 5:
-        return MACRO( D(LSFT), T(COMMA), U(LSFT), D(LSFT), T(DOT), U(LSFT), END );
-      case 3:
-        clear_keyboard();
-        return false;
-        break;
-      case 4:
-        return MACRO( D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(LBRACKET), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(BSLASH), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(7), U(LSFT), D(LSFT), T(RBRACKET), U(LSFT), T(SCOLON), D(LSFT), T(SCOLON), U(LSFT), END );
-      case WINSH:
-        set_unicode_input_mode(UC_WIN);
-        return false;
-        break;
-      case WIN:
-        set_unicode_input_mode(UC_WINC);
-        return false;
-        break;
-      case OSX:
-        set_unicode_input_mode(UC_MAC);
-        return false;
-        break;
-    }
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/atreus/keymaps/xk/rules.mk b/keyboards/atreus/keymaps/xk/rules.mk
deleted file mode 100644
index a2c5143eff..0000000000
--- a/keyboards/atreus/keymaps/xk/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 
-TAP_DANCE_ENABLE = yes
-
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-
diff --git a/keyboards/atreus62/keymaps/mneme/README.md b/keyboards/atreus62/keymaps/mneme/README.md
deleted file mode 100644
index e65bf5de1c..0000000000
--- a/keyboards/atreus62/keymaps/mneme/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- -*- mode: markdown; fill-column: 8192 -*- -->
-
-Mnemes Swedish Bonanza
-=======================
-
-My Layout in process, most of the code is shamelessly stolen from [algernons][algernon] excellent layout
-
- [algernon]: https://github.com/algernon/ergodox-layout
-
-It's for Windows (current work forces me to) and Swedish (matter of birth) so ymmw.
-
-## Table of Contents
-
-* [Layouts](#layouts)
-    - [Base layer](#base-layer)
-    - [Nav layer](#nav-layer)
-    - [Sym layer](#sym-layer)
-    - [LED states](#led-states)
-
-# Layouts
-
-## Base layer
-
-![Base layer](http://imgur.com/zTYxnE0)
-
-
-* The number row doubles as a function row. Short presses produces numbers, long presses produces Fxx
-* The `Shift`, `Alt`, and `Control` modifiers are one-shot.
-* `Backspace` and `Enter` doubles as switches to the `sym` layer when held
-* The `ESC` key also doubles as a one-shot cancel key.
-* The **Lead** key is followed by a sequence of keys.
-    - `LEAD l`   : `lgui+l`.
-    - `LEAD s l` : `λ`.
-    - `LEAD s s` : `¯\_(ツ)_/¯`
-    - `LEAD s f` : `凸(ツ)凸`
-    - `LEAD u l` : Set unicode input mode to linux.
-    - `LEAD s w` : Set unicode input mode to windows.
-    - `LEAD a *` : Application switching based on position in start menu. Very specific to my computer.
-
-
-## Nav layer
-
-![Nav layer](http://imgur.com/cbMWVDC)
-
-Basic navigation on the right hand and modifiers close
-by for the left. The latter because I tend to use `ctrl+arrows` quite a lot.
-
-## Sym layer
-
-![Sym layer](http://imgur.com/n2jmqFU)
-
-* Easy access to most symbols I use on a daily basis. Most common are on the home row, the rest are grouped as best as I could.
-
-- `eq` : Tapdance, produces `===` and `!==`
-- `fun`: Tapdance, produces `=>` and `() => {\n`
-
-# License
-  GPL-3+
diff --git a/keyboards/atreus62/keymaps/mneme/config.h b/keyboards/atreus62/keymaps/mneme/config.h
deleted file mode 100644
index a89bf5503c..0000000000
--- a/keyboards/atreus62/keymaps/mneme/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define ONESHOT_TIMEOUT 3000
-#define TAPPING_TERM 200
-#define FORCE_NKRO
-#define LEADER_TIMEOUT 1000
-
-#include "../../config.h"
diff --git a/keyboards/atreus62/keymaps/mneme/keymap.c b/keyboards/atreus62/keymaps/mneme/keymap.c
deleted file mode 100644
index e76751c335..0000000000
--- a/keyboards/atreus62/keymaps/mneme/keymap.c
+++ /dev/null
@@ -1,337 +0,0 @@
-#include <stdarg.h>
-#include QMK_KEYBOARD_H
-#include "led.h"
-#include "action_layer.h"
-#include "action_util.h"
-
-/*
- *WINDOWS SWEDISH
- */
- /*
-  *WINDOWS SWEDISH
-  */
- #define KN_HALF KC_GRV          // 1/2
- #define KN_PLUS KC_MINS         // +
- #define KN_ACUT KC_EQL          // ´
- #define KN_AO	 KC_LBRC         // Å
- #define KN_UMLA KC_RBRC         // ¨
- #define KN_OE	 KC_SCLN         // Ö
- #define KN_AE	 KC_QUOT         // Ä
- #define KN_QUOT KC_NUHS         // '
- #define KN_LABK KC_NUBS         // <
- #define KN_MINS KC_SLSH         // -
- #define KN_EXLM LSFT(KC_1)      // !
- #define KN_DQT  LSFT(KC_2)      // "
- #define KN_AT   RALT(KC_2)      // @
- #define KN_HASH LSFT(KC_3)      // #
- #define KN_EUR  LSFT(KC_4)      // €
- #define KN_DLR  RALT(KC_4)      // $
- #define KN_PERC LSFT(KC_5)      // %
- #define KN_AMPR LSFT(KC_6)      // &
- #define KN_SLSH LSFT(KC_7)      // /
- #define KN_LPRN LSFT(KC_8)      // (
- #define KN_RPRN LSFT(KC_9)      // )
- #define KN_EQL  LSFT(KC_0)      // =
- #define KN_UNDS LSFT(KN_MINS)   // _
- #define KN_QUES LSFT(KN_PLUS)   // ?
- #define KN_GRAV LSFT(KN_ACUT)   // `
- #define KN_LCBR RALT(KC_7)      // {
- #define KN_RCBR RALT(KC_0)      // }
- #define KN_LBRC RALT(KC_8)      // [
- #define KN_RBRC RALT(KC_9)      // ]
- #define KN_RABK LSFT(KN_LABK)   // <
- #define KN_COLN LSFT(KC_DOT)    // :
- #define KN_SCLN LSFT(KC_COMM)   // :
- #define KN_PIPE RALT(KN_LABK)   // |
- #define KN_QUES LSFT(KN_PLUS)   // ?
- #define KN_CIRC LSFT(KN_UMLA)   // ^
- #define KN_ASTR LSFT(KN_QUOT)   // *
- #define KN_TILD RALT(KN_UMLA)   // ~
- #define KN_BSLS RALT(KN_PLUS)   //
-
-#define OSM_LCTL OSM(MOD_LCTL)
-#define OSM_LALT OSM(MOD_LALT)
-#define OSM_LSFT OSM(MOD_LSFT)
-
-#define KC_HYP LSFT(LALT(LCTL(KC_LGUI)))
-
-#define KC_COPY LCTL(KC_C)
-#define KC_PASTE LCTL(KC_V)
-#define KC_UNDO LCTL(KC_Z)
-#define KC_REDO LCTL(LSFT(KC_Z))
-
-// Layers
-enum {
-  BASE = 0,
-  NAV,
-  SYM
-};
-
-//Macros
-enum {
-  KF_1 = 0, // 1, F1
-  KF_2, // ...
-  KF_3,
-  KF_4,
-  KF_5,
-  KF_6,
-  KF_7,
-  KF_8,
-  KF_9,
-  KF_10,
-  KF_11,
-  KF_12
-};
-
-// Tapdance
-enum {
-  TD_FUN = 0,
-  TD_EQ
-};
-
-//State and timers
-uint16_t kf_timers[12];
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [BASE] = LAYOUT(
-    M(KF_11), M(KF_1),  M(KF_2),  M(KF_3),  M(KF_4), M(KF_5),                    M(KF_6), M(KF_7), M(KF_8), M(KF_9), M(KF_10), M(KF_12),
-    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KN_AO,
-    OSM_LCTL, KC_A,     KC_S,     KC_D,     KC_F,    KC_G,                       KC_H,    KC_J,    KC_K,    KC_L,    KN_OE,    KN_AE,
-    OSM_LSFT, KC_Z,     KC_X,     KC_C,     KC_V,    KC_B,                       KC_N,    KC_M,    KC_COMM, KC_DOT,  KN_MINS,  OSM_LSFT,
-    MO(NAV),  OSM_LCTL, OSM_LALT, KC_LGUI,  MO(SYM), KC_BSPC,  KC_DEL,  KC_ENT,  KC_SPC,  MO(SYM), KC_LEAD, KC_LALT, KC_LCTRL, KC_HYP
-  ),
-
-  [NAV] = LAYOUT(
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_LSFT,  KC_LCTL,  KC_LALT,  KC_L,     KC_TRNS,                    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_VOLU
-  ),
-
-  [SYM] = LAYOUT(
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TD(TD_EQ),                   TD(TD_FUN), KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KN_LABK,  KN_RABK,  KN_LCBR,  KN_RCBR,  KN_PLUS,                     KN_AT,      KN_DQT,   KN_QUOT,  KN_GRAV,  KN_SLSH,  KC_TRNS,
-    KC_TRNS,  KN_EXLM,  KN_EQL,   KN_LPRN,  KN_RPRN,  KN_MINS,                     KN_UNDS,    KN_CIRC,  KN_DLR,   KN_AMPR,  KN_PIPE,  KC_TRNS,
-    KC_TRNS,  KN_EUR,   KN_PERC,  KN_LBRC,  KN_RBRC,  KN_ASTR,                     KN_HASH,    KN_SCLN,  KN_COLN,  KN_QUES,  KN_BSLS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
-  )
-};
-
-#define TAP_ONCE(code)  \
-  register_code (code); \
-  unregister_code (code)
-
-static void m_tapn (uint8_t code, ...) {
-  uint8_t kc = code;
-  va_list ap;
-
-  va_start(ap, code);
-  do {
-    register_code(kc);
-    unregister_code(kc);
-    wait_ms(50);
-    kc = va_arg(ap, int);
-  } while (kc != 0);
-  va_end(ap);
-}
-
-static void m_handle_kf (keyrecord_t *record, uint8_t id) {
-  uint8_t code = id - KF_1;
-
-  if (record->event.pressed) {
-    kf_timers[code] = timer_read ();
-  } else {
-    uint8_t kc_base;
-    uint8_t long_press = (kf_timers[code] && timer_elapsed (kf_timers[code]) > TAPPING_TERM);
-
-    kf_timers[code] = 0;
-
-    switch(id){
-      case KF_1 ... KF_10:
-        if (long_press) {
-          // Long press
-          kc_base = KC_F1;
-        } else {
-          kc_base = KC_1;
-        }
-        code += kc_base;
-        break;
-      case KF_11:
-        code = long_press ? KC_F11 : KC_ESC;
-        break;
-      case KF_12:
-        code = long_press ? KC_F12 : KN_PLUS;
-        break;
-    }
-    register_code (code);
-    unregister_code (code);
-  }
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch (id) {
-    case KF_1 ... KF_12:
-      m_handle_kf(record, id);
-      break;
-  }
-  return MACRO_NONE;
-};
-
-// Custom keycodes
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool queue = true;
-
-  //Cancle one-shot mods.
-  switch (keycode) {
-    case KC_ESC:
-      if (record->event.pressed && get_oneshot_mods() && !has_oneshot_mods_timed_out()) {
-        clear_oneshot_mods();
-        queue = false;
-      }
-      break;
-  }
-  return queue;
-}
-
-// TAP DANCE SETTINGS
-void dance_eq (qk_tap_dance_state_t *state, void *user_data) {
-  switch (state->count) {
-    case 1: // ===
-      register_code(KC_LSHIFT);
-      m_tapn(KC_0, KC_0, KC_0, 0);
-      unregister_code(KC_LSHIFT);
-      break;
-    case 2:
-      register_code(KC_LSHIFT);
-      m_tapn(KC_1, KC_0, KC_0, 0);
-      unregister_code(KC_LSHIFT);
-      break;
-    default:
-      reset_tap_dance(state);
-  }
-}
-
-void dance_fun (qk_tap_dance_state_t *state, void *user_data) {
-  switch (state->count) {
-    case 1: // =>
-      register_code(KC_LSHIFT);
-      m_tapn(KC_0, KN_LABK, 0);
-      unregister_code(KC_LSHIFT);
-      break;
-    case 2: // () => {}
-      register_code(KC_LSHIFT);
-      m_tapn(KC_8, KC_9, KC_SPC, KC_0, KN_LABK, KC_SPC, 0);
-      unregister_code(KC_LSHIFT);
-      register_code(KC_RALT);
-      m_tapn(KC_7, 0);
-      unregister_code(KC_RALT);
-      TAP_ONCE(KC_ENT);
-      break;
-    default:
-      reset_tap_dance(state);
-  }
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_FUN] = ACTION_TAP_DANCE_FN (dance_fun),
-  [TD_EQ] = ACTION_TAP_DANCE_FN (dance_eq)
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-  set_unicode_input_mode(UC_WINC);
-};
-
-LEADER_EXTERNS();
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-  LEADER_DICTIONARY() {
-    leading = false;
-    leader_end();
-    SEQ_ONE_KEY(KC_L){
-      register_code(KC_RGUI);
-      TAP_ONCE(KC_L);
-      unregister_code(KC_RGUI);
-    };
-
-
-    SEQ_TWO_KEYS (KC_A, KC_W) {
-      //Web - chrome
-      register_code (KC_LGUI); TAP_ONCE (KC_1); unregister_code (KC_LGUI);
-    }
-    SEQ_TWO_KEYS (KC_A, KC_P) {
-      //sPotify
-      register_code (KC_LGUI); TAP_ONCE (KC_2); unregister_code (KC_LGUI);
-
-    }
-    SEQ_TWO_KEYS (KC_A, KC_T) {
-      //Total Commander
-      register_code (KC_LGUI); TAP_ONCE (KC_3); unregister_code (KC_LGUI);
-
-    }
-    SEQ_TWO_KEYS (KC_A, KC_A) {
-      //Atom
-      register_code (KC_LGUI); TAP_ONCE (KC_4); unregister_code (KC_LGUI);
-
-    }
-    SEQ_TWO_KEYS (KC_A, KC_E) {
-      //Emacs
-      register_code (KC_LGUI); TAP_ONCE (KC_5); unregister_code (KC_LGUI);
-
-    }
-    SEQ_TWO_KEYS (KC_A, KC_C) {
-      //Cmdr
-      register_code (KC_LGUI); TAP_ONCE (KC_6); unregister_code (KC_LGUI);
-
-    }
-    SEQ_TWO_KEYS (KC_A, KC_S) {
-      //Slack
-      register_code (KC_LGUI); TAP_ONCE (KC_7); unregister_code (KC_LGUI);
-    }
-
-    SEQ_TWO_KEYS (KC_U, KC_L) {
-      set_unicode_input_mode(UC_LNX);
-    }
-
-
-    SEQ_TWO_KEYS (KC_U, KC_W) {
-      set_unicode_input_mode(UC_WINC);
-    }
-
-
-    SEQ_TWO_KEYS (KC_S, KC_S) {
-      // ¯\_(ツ)_/¯
-      unicode_input_start(); register_hex(0xaf); unicode_input_finish();
-      register_code (KC_LALT);
-      register_code (KC_LCTL);
-      TAP_ONCE (KN_PLUS);
-      unregister_code (KC_LCTL);
-      unregister_code (KC_LALT);
-
-      register_code (KC_RSFT); TAP_ONCE (KC_8); unregister_code (KC_RSFT);
-      unicode_input_start (); register_hex(0x30c4); unicode_input_finish();
-      register_code (KC_RSFT); TAP_ONCE (KC_9); TAP_ONCE(KC_7); unregister_code (KC_RSFT);
-      unicode_input_start (); register_hex(0xaf); unicode_input_finish();
-    }
-
-    SEQ_TWO_KEYS (KC_S, KC_F) {
-      // 凸(ツ)凸
-      unicode_input_start(); register_hex(0x51F8); unicode_input_finish();
-      register_code (KC_RSFT); TAP_ONCE (KC_8); unregister_code (KC_RSFT);
-      unicode_input_start (); register_hex(0x30c4); unicode_input_finish();
-      register_code (KC_RSFT); TAP_ONCE (KC_9); unregister_code (KC_RSFT);
-      unicode_input_start (); register_hex(0x51F8); unicode_input_finish();
-    }
-
-    SEQ_TWO_KEYS (KC_S, KC_L) {
-      // λ
-      unicode_input_start();
-      register_hex(0x03bb);
-      unicode_input_finish();
-    }
-  };
-};
diff --git a/keyboards/atreus62/keymaps/mneme/rules.mk b/keyboards/atreus62/keymaps/mneme/rules.mk
deleted file mode 100644
index 160ce6edbf..0000000000
--- a/keyboards/atreus62/keymaps/mneme/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TAP_DANCE_ENABLE = yes
-NKRO_ENABLE = true
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-LEADER_ENABLE = yes
diff --git a/keyboards/atreus62/keymaps/mneme/unicode b/keyboards/atreus62/keymaps/mneme/unicode
deleted file mode 100644
index b3f62b6d31..0000000000
--- a/keyboards/atreus62/keymaps/mneme/unicode
+++ /dev/null
@@ -1,114 +0,0 @@
-Todo
-☐	2610 Todo
-☑	2611 Done
-☒ 2612 Failed
-
-Operator
-×	00D7	Multiplication
-÷	00F7	Division
-≤	2264	LessEqual
-≥	2265	MoreEqual
-± 00B1  Plusminus
-
-Math
-∏ 220F Product
-∑ 2211 Sum
-≈ 2248 Almost
-≡ 2261 Equivalent
-∞ 221E Infinity
-‰ 2030 Mille
-
-Set
-⊂ 2282 Subset
-⊃ 2283 sUperset
-∩ 2229 Intersextion
-∪ 222A Union
-∈ 2208 Element
-∉ 2209 Notelement
-∍ 220D Contains
-∌ 220C doesNotcontain
-
-Logic
-¬ 00AC Not
-∧ 2227 And
-∨ 2228 Or
-∃ 2203 Exists
-∄ 2204 Notexists
-
-Greek
-µ 00B5 Micro
-λ 03BB Lamda
-Ω 2126 Omega
-α	03B1 Alpha
-β	03B2 Beta
-γ	03B3 Gamma
-π	03C0 Pi
-δ 03B4 Delta
-
-Other
-☁ 2601 Cloud
-☼ 263C Sun
-☂ 2602 Rain
-☠ 2620 Skull
-♺ 267A Recycle
-👍1F44D thumbsUp
-👎1F44E thumbsDown
-💩 1F4A9 Poo
-
-
-//Todo
-SEQ_THREE_KEYS(KC_U, KC_G, KC_T){m_unicode(0x2610);}; // Todo
-SEQ_THREE_KEYS(KC_U, KC_G, KC_D){m_unicode(0x2611);}; // Done
-SEQ_THREE_KEYS(KC_U, KC_G, KC_F){m_unicode(0x2612);}; // Failed
-
-//Operator
-SEQ_THREE_KEYS(KC_U, KC_O, KC_M){m_unicode(0x00D7);}; //  Multiplication
-SEQ_THREE_KEYS(KC_U, KC_O, KC_D){m_unicode(0x00F7);}; //  Division
-SEQ_THREE_KEYS(KC_U, KC_O, KC_L){m_unicode(0x2264);}; //  LessEqual
-SEQ_THREE_KEYS(KC_U, KC_O, KC_M){m_unicode(0x2265);}; //  MoreEqual
-SEQ_THREE_KEYS(KC_U, KC_O, KC_P){m_unicode(0x00B1);}; //  Plusminus
-
-//Math
-SEQ_THREE_KEYS(KC_U, KC_M, KC_P){m_unicode(0x220F);}; // Product
-SEQ_THREE_KEYS(KC_U, KC_M, KC_S){m_unicode(0x2211);}; // Sum
-SEQ_THREE_KEYS(KC_U, KC_M, KC_A){m_unicode(0x2248);}; // Almost
-SEQ_THREE_KEYS(KC_U, KC_M, KC_E){m_unicode(0x2261);}; // Equivalent
-SEQ_THREE_KEYS(KC_U, KC_M, KC_I){m_unicode(0x221E);}; // Infinity
-SEQ_THREE_KEYS(KC_U, KC_M, KC_M){m_unicode(0x2030);}; // Mille
-
-//Set
-SEQ_THREE_KEYS(KC_U, KC_S, KC_S){m_unicode(0x2282);}; Subset
-SEQ_THREE_KEYS(KC_U, KC_S, KC_P){m_unicode(0x2283);}; suPerset
-SEQ_THREE_KEYS(KC_U, KC_S, KC_I){m_unicode(0x2229);}; Intersection
-SEQ_THREE_KEYS(KC_U, KC_S, KC_U){m_unicode(0x222A);}; Union
-SEQ_THREE_KEYS(KC_U, KC_S, KC_E){m_unicode(0x2208);}; Element
-SEQ_THREE_KEYS(KC_U, KC_S, KC_N){m_unicode(0x2209);}; Notelement
-SEQ_THREE_KEYS(KC_U, KC_S, KC_C){m_unicode(0x220D);}; Contains
-SEQ_THREE_KEYS(KC_U, KC_S, KC_D){m_unicode(0x220C);}; doesNotcontain
-
-//Logic
-SEQ_THREE_KEYS(KC_U, KC_L, KC_N){m_unicode(0x00AC);}; // Not
-SEQ_THREE_KEYS(KC_U, KC_L, KC_A){m_unicode(0x2227);}; // And
-SEQ_THREE_KEYS(KC_U, KC_L, KC_O){m_unicode(0x2228);}; // Or
-SEQ_THREE_KEYS(KC_U, KC_L, KC_E){m_unicode(0x2203);}; // Exists
-SEQ_THREE_KEYS(KC_U, KC_L, KC_N){m_unicode(0x2204);}; // Notexists
-
-//Greek
-SEQ_THREE_KEYS(KC_U, KC_G, KC_M){m_unicode(0x00B5);}; // Micro
-SEQ_THREE_KEYS(KC_U, KC_G, KC_L){m_unicode(0x03BB);}; // Lamda
-SEQ_THREE_KEYS(KC_U, KC_G, KC_O){m_unicode(0x2126);}; // Omega
-SEQ_THREE_KEYS(KC_U, KC_G, KC_A){m_unicode(0x03B1);}; // Alpha
-SEQ_THREE_KEYS(KC_U, KC_G, KC_B){m_unicode(0x03B2);}; // Beta
-SEQ_THREE_KEYS(KC_U, KC_G, KC_G){m_unicode(0x03B3);}; // Gamma
-SEQ_THREE_KEYS(KC_U, KC_G, KC_P){m_unicode(0x03C0);}; // Pi
-SEQ_THREE_KEYS(KC_U, KC_G, KC_D){m_unicode(0x03B4);}; // Delta
-
-//Zother
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_C){m_unicode(0x2601);};  // Cloud
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_S){m_unicode(0x263C);};  // Sun
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_R){m_unicode(0x2602);};  // Rain
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_K){m_unicode(0x2620);};  // sKull
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_R){m_unicode(0x267A);};  // rEcycle
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_U){m_unicode(0x1F44D);}; // thumbsUp
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_D){m_unicode(0x1F44E);}; // thumbsDown
-SEQ_THREE_KEYS(KC_U, KC_Z, KC_P){m_unicode(0x1F4A9);}; // Poo
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h
deleted file mode 100644
index 017ead4255..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-// place overrides here
-#define TAPPING_TERM 150 //reduce time required to register a held key
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
deleted file mode 100644
index 9bb38d8b88..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum QFR_layers {
-  _COLEMAK,
-  _QWERTY,
-  _DVORAK,
-  _LOWER,
-  _MOUSE
-};
-
-enum QFR_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  DVORAK,
-  LOWER,
-  MOUSE
-};
-
-enum custom_macros {
-  R_PIPE,
-  R_POINT
-};
-
-#define SPC_LW LT(_LOWER, KC_SPC)
-#define MSE MO(_MOUSE)
-#define PIPE M(R_PIPE)
-#define POINT M(R_POINT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_COLEMAK] = 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_SLCK,KC_PAUS, \
-      KC_GRV,    KC_1,      KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP, \
-      KC_TAB,    KC_Q,      KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC,KC_BSLS,  KC_DEL, KC_END, KC_PGDN, \
-      KC_BSPC,   KC_A,      KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,    KC_O,    KC_QUOT,         KC_ENT ,                           \
-      KC_LSPO,KC_NUBS,KC_Z, KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,          KC_RSPC,                   KC_UP,          \
-      KC_LCTL,KC_LGUI,      KC_LALT,                SPC_LW,                                  MSE,     KC_RGUI, KC_APP, KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT
-      ),
-
-[_QWERTY] = 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_SLCK, KC_PAUS, \
-       KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP, \
-       KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN, \
-       KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_ENT, \
-       KC_LSFT,KC_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,                SPC_LW,                                 MSE,    KC_RGUI , KC_APP,  KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT
-       ),
-
-[_DVORAK] = 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_SLCK, KC_PAUS, \
-       KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP, \
-       KC_TAB, KC_QUOT,KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,   KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN, \
-       KC_BSPC,KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,   KC_S,   KC_QUOT,          KC_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_RSFT,            KC_UP, \
-       KC_LCTL,KC_LGUI,KC_LALT,                SPC_LW,                                 MSE,    KC_RGUI, KC_APP,  KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT
-       ),
-
-[_LOWER] = LAYOUT_tkl(\
-      QK_BOOT,  _______,    _______,   _______, _______,  KC_MPLY,   KC_MSTP,   KC_MPRV,   KC_MNXT,  _______, KC_MUTE, KC_VOLD, KC_VOLU,           QWERTY, COLEMAK,DVORAK, \
-      KC_TILD,  KC_EXLM,    KC_AT,     KC_HASH,  KC_DLR,  KC_PERC,   KC_CIRC,   KC_AMPR,   KC_ASTR,  KC_LBRC, KC_RBRC, KC_UNDS, KC_PLUS, KC_BSPC,  _______,_______,_______, \
-      KC_TAB,   KC_PGUP,    KC_HOME,   KC_UP,    KC_END,  XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_PIPE,  _______,_______,_______, \
-      KC_CAPS,  KC_PGDN,    KC_LEFT,   KC_DOWN,  KC_RGHT, XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, _______,          _______,                           \
-      _______,XXXXXXX,POINT,PIPE,      KC_LCBR,  KC_LBRC, KC_GRV,    KC_PIPE,   KC_RBRC,   KC_RCBR,  _______, _______,                   _______,          _______,         \
-      _______,  _______,    _______,             _______,                       KC_RALT,   _______,  _______, _______,                            _______,_______,_______  \
-      ),
-
-[_MOUSE] = LAYOUT_tkl(\
-      _______,  _______,   _______,   _______,  _______, _______,   _______,   _______,   _______,  _______, _______, _______, _______,            _______,_______,_______, \
-      KC_GRV,   KC_1,      KC_2,      KC_3,     KC_4,    KC_5,      KC_6,      KC_7,      KC_8,     KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,    _______,_______,_______, \
-      KC_TAB,   KC_WH_U,   KC_WH_L,   KC_MS_U,  KC_WH_R, XXXXXXX,   XXXXXXX,   KC_BTN3,   KC_BTN4,  KC_BTN5, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS,   _______,_______,_______, \
-      KC_BSPC,  KC_WH_D,   KC_MS_L,   KC_MS_D,  KC_MS_R, XXXXXXX,   XXXXXXX,   KC_BTN1,   KC_BTN2,  XXXXXXX, XXXXXXX, XXXXXXX,          _______,                            \
-      _______,XXXXXXX,PIPE,POINT,     XXXXXXX,  XXXXXXX, XXXXXXX,   XXXXXXX,   XXXXXXX,   _______,  _______,  _______,                  _______,           _______,         \
-      _______,  _______,   _______,             KC_ACL2,                       MSE,       _______,  _______,  _______,                             _______,_______,_______  \
-      )
-};
-
-// Macros to send R pointer & dplyr pipe
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    switch(id) {
-        case R_POINT:
-            if (record->event.pressed) { // pointer
-                SEND_STRING("<- ");
-//                return MACRO(D(LSFT), T(COMM), U(LSFT), T(MINS), END);
-            }
-            break;
-        case R_PIPE:
-            if (record->event.pressed) { // dplyr pipe
-                SEND_STRING("%>% ");
-//                return MACRO(D(LSFT), T(5), T(DOT), T(5), U(LSFT), END);
-            }
-            break;
-    }
-    return MACRO_NONE;
-}
-
-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/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md
deleted file mode 100644
index f12a0ffba1..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md
+++ /dev/null
@@ -1,86 +0,0 @@
-
-# TKL keymap for frosty\_flake
-```
-make frosty_flake:QFR_JM
-
-dfu-programmer atmega32u2 erase
-dfu-programmer atmega32u2 flash frosty_flake_QFR_JM.hex
-dfu-programmer atmega32u2 start
-```
-
-##Layers
-```
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  |ESC |    | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 |F10 |F11 |F12 | |PrSc|ScLk|PsBk|
-  '----'    '-------------------' '-------------------' '-------------------' '--------------'
-  ,-------------------------------------------------------------------------. ,--------------. 
-  |  ` | 1  |  2 |  3 | 4  |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |  Bspc  | | Ins|Home|PgUp| 
-  |-------------------------------------------------------------------------| |--------------| 
-  | Tab  | Q  |  W | F  | P  | G  | J  | L  |  U |  Y | ;  | [  |  ] |   \  | | Del|End |PgDn| 
-  |-------------------------------------------------------------------------| '--------------'
-  |  Bspc | A  | R  |  S |  T | D  | H  | N  | E  | I  | O  | '  |   Enter  |                 
-  |-------------------------------------------------------------------------|      ,----.     
-  |   LSPO  | Z  | X  |  C | V  |  B |  K |  M |  , |  . |  / |    RSPC     |      | Up |     
-  |-------------------------------------------------------------------------| ,--------------.
-  |Ctrl|LGUI|LAlt|             Space/Lower              |MSE |RGUI|Menu|Ctrl| |Left|Down|Rght|
-  '-------------------------------------------------------------------------' '--------------'
-
-```
-### Base Layer - Colemak
-The base layout is Colemak by default, but this can be changed to QWERTY via the *LOWER* layer. 
-* I've implemented COLEMAK = SAFE\_RANGE when enumerating the custom\_keycodes, but I don't actually know what this does...
-
-* Space cadet is implemented in the shift keys (hold for shift, tap for respective parentheses)
-
-#### Layer Shifting
-* The spacebar is a **TAP_KEY** macro - Hold for momentary *LOWER* layer, Tap for Space.
-* The Right hand ALT key is a **TAP_TOGGLE** macro for the *MOUSE* layer (RAlt is accessible through LOWER, if you want...)
-	
-### LOWER
-```
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  |ESC |    | F1 | F2 | F3 | F4 | |>/|||Stop| << | >> | | F9 |MUTE|Vol-|Vol+| |QWTY|CLMK|PsBk|
-  '----'    '-------------------' '-------------------' '-------------------' '--------------'
-  ,-------------------------------------------------------------------------. ,--------------. 
-  |  ~ | !  |  @ |  # |  $ |  % |  ^ |  & |  * |  ( |  ) |  _ |  + |  Bspc  | | Ins|Home|PgUp| 
-  |-------------------------------------------------------------------------| |--------------| 
-  | Tab  |PgUp|Home| Up | End|    |    |    |    |    |    | {  |  } |   |  | | Del|End |PgDn| 
-  |-------------------------------------------------------------------------| '--------------'
-  | Bckspc|PgDn|Left|Down|Rght|    |    |    |    |    |    | '  |   Enter  |                 
-  |-------------------------------------------------------------------------|      ,----.     
-  |   LSPO  | <- |%>% |  { | [  |  ` | |  |  ] |  } |  . |  / |    RSPC     |      | Up |     
-  |-------------------------------------------------------------------------| ,--------------.
-  |Ctrl|LGUI|LAlt|               		                    |RAlt|RGUI|Menu|Ctrl| |Left|Down|Rght|
-  '-------------------------------------------------------------------------' '--------------'
-```
-The *LOWER* layer contains a navigation cluster on the left hand. This layer is momentary when the spacebar or LOWER (RAlt) key is held and toggled on/off when the LOWER key is tapped.
-	
-* The Navigation cluster is offset to the right compared to the traditional **WASD** nav cluster. With this implementation, you don't need to move your hand from the home position when navigating. Page Up & Down keys are found on the far left of the cluster.
-
-* All unused (blank on the above keymap) keys are locked out using the XXXXXXX filler (KC\_NO), all modifiers (edge |\_| keys \[except 0, \. & Fn\] on the above keymap) and the ZXCV cluster are transparent (\_\_\_\_\_\_\_) to the Base layer.
-
-* The base layer can be switched to QWERTY or COLEMAK by pressing the Pause Break or Scroll Lock keys respectively
-
-### MOUSE
-```
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  |ESC |    | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 |F10 |F11 |F12 | |PrSc|ScLk|PsBk|
-  '----'    '-------------------' '-------------------' '-------------------' '--------------'
-  ,-------------------------------------------------------------------------. ,--------------. 
-  |  ` | 1  |  2 |  3 | 4  |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |   Del  | | Ins|Home|PgUp| 
-  |-------------------------------------------------------------------------| |--------------| 
-  | Tab  | WhU| WhL| MsU| WhR|    |    | M3 | M4 | M5 |    | [  |  ] |   \  | | Del|End |PgDn| 
-  |-------------------------------------------------------------------------| '--------------'
-  | BSPC  | WhD| MsL| MsD| MsR|    |    |LClk |RClk |    |    | '  |   Enter  |                 
-  |-------------------------------------------------------------------------|      ,----.     
-  |   LSPO  | Z  | X  |  C | V  |    |    |    |  , |  . |  / |    RSPC     |      | Up |     
-  |-------------------------------------------------------------------------| ,--------------.
-  |Ctrl|LGUI|LAlt|               Accel ++               |MSE |RGUI|Menu|Ctrl| |Left|Down|Rght|
-  '-------------------------------------------------------------------------' '--------------'
-```
-The *MOUSE* layer contains keys replicating functions found on the mouse. 
-
-* The navigation cluster (Up, Down, Left, Right) is a replication of the Navigation cluster on the *LOWER* layer. The scroll keys are analagous to the Page Up & Downkeys.
-* The primary click (right & left) buttons are on the right home row (index & middle fingers)
-* Secondary click buttons are above the standard keys (M3/Wheel click, M4, M5) but I do not use this function.
-
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk
deleted file mode 100644
index 2c5d53c821..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
deleted file mode 100644
index e45034f9a8..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// place overrides here
-#define TAPPING_TERM 200
-#define TAPPING_TERM_PER_KEY
-#define LEADER_TIMEOUT 800
-
-#define DISABLE_SPACE_CADET_ROLLOVER
-
-#define UNICODE_TYPE_DELAY 0
-
-#define LSPO_KEY KC_9
-#define RSPC_KEY KC_0
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY    0
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
deleted file mode 100644
index 6db177c183..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
+++ /dev/null
@@ -1,241 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define MAXEMOJITAPS 80
-
-
-//declarations for tap dancing emojis
-void register_hex32(uint32_t hex);
-void cycleEmojis(qk_tap_dance_state_t *state, void *user_data);
-void cycleAnimals(qk_tap_dance_state_t *state, void *user_data);
-void cycleFoods(qk_tap_dance_state_t *state, void *user_data);
-void cycleEtc(qk_tap_dance_state_t *state, void *user_data);
-void cycleAll(qk_tap_dance_state_t *state, void *user_data);
-
-void tap(uint16_t keycode){
-    register_code(keycode);
-    unregister_code(keycode);
-};
-
-//Tap Dance Declarations
-enum taps{
-  TD_CTCPS = 0,
-  EMOJIS,
-  ANIMAL,
-  HAND,
-  MEMES,
-  COPA,
-  ALLS
-};
-
-enum unicode_name {
-  EMOTIS = 1,//80, //1F60x - 1F64x
-  ANIMALS, //64, //1F40x - 1F43x
-  SYMBOLS,// = 45, //1F300 - 1F32C
-  FOODS,// = 87 , //1F32D -
-  ETC,// = 192, //1F44x -1F4Fx
-  VEHICLES,// = 83, //1F68x - 1F6Dx
-  SUPPLEMENT,// = 32, //1F91x-1F92x
-  ALCHEMY,// = 116 //1F70x - 1F773
-
-};
-
-enum my_macros {
-  NEWDESK = 0,
-  LEFTDESK,
-  RIGHTDESK,
-  CLOSEDESK
-};
-
-
-// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  // Tap once for CTRL, twice for Caps Lock
-  [TD_CTCPS]  = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_CAPS),
-  [COPA]  = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)),
-  [EMOJIS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEmojis, NULL, NULL),
-  [ANIMAL] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAnimals, NULL, NULL),
-  //[SYMBOLS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleSymbols, NULL, NULL),
-  [FOODS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleFoods, NULL, NULL),
-  [ETC] = ACTION_TAP_DANCE_FN_ADVANCED(cycleEtc, NULL, NULL),
-  //[VEHICLES] = ACTION_TAP_DANCE_FN_ADVANCED(cycleVehicles, NULL, NULL),
-  //[SUPPLEMENT] = ACTION_TAP_DANCE_FN_ADVANCED(cycleSupplement, NULL, NULL),
-  [ALLS] = ACTION_TAP_DANCE_FN_ADVANCED(cycleAll, NULL, NULL)
-// Other declarations would go here, separated by commas, if you have them
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(EMOJIS):
-        case TD(ANIMAL):
-        //case TD(SYMBOLS):
-        case TD(FOODS):
-        case TD(ETC):
-        //case TD(VEHICLES):
-        //case TD(SUPPLEMENT):
-        case TD(ALLS):
-            return 800;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-// macros
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  switch(id) {
-    case NEWDESK: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( I(1), D(LGUI), D(LCTL), D(D), U(LGUI), U(LCTL), U(D), END  ); // NEW DESKTOP
-      }
-      break;
-    case LEFTDESK: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( I(1), D(LGUI), D(LCTL), D(LEFT), U(LGUI), U(LCTL), U(LEFT), END  ); // LEFT DESKTOP
-      }
-      break;
-    case RIGHTDESK: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( I(1), D(LGUI), D(LCTL), D(RGHT), U(LGUI), U(LCTL), U(RGHT), END  ); // RIGHT DESKTOP
-      }
-      break;
-    case CLOSEDESK: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( I(1), D(LGUI), D(LCTL), D(F4), U(LGUI), U(LCTL), U(F4), END  ); // CLOSE DESKTOP
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
-
-
-// emojis in unicode
-const uint32_t PROGMEM unicode_map[] = {
-  [EMOTIS]     = 0x1F600,
-  [ANIMALS]    = 0x1F400,
-  [SYMBOLS]    = 0x1F300,
-  [FOODS]      = 0x1F32D,
-  [ETC]        = 0x1F440,
-  [VEHICLES]   = 0x1F680,
-  [SUPPLEMENT] = 0x1F910,
-  [ALCHEMY]    = 0x1F700
- };
-// Layouts
-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_SLCK, KC_PAUS,                                        \
-    KC_GRV,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
-    KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS, \
-    KC_LCTL,      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,            \
-    KC_LSPO,      KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
-    TD(TD_CTCPS), KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LEAD, KC_RGUI, KC_APP,  MO(1),      KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT           \
-  ),
-  [1] = LAYOUT(\
-    TD(ALLS),             KC_F1,      KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,                                        \
-    KC_GRV,   TD(EMOJIS), TD(ANIMAL), TD(ETC), TD(FOODS), KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_MPRV, KC_MPLY, KC_MNXT,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
-    KC_TAB,   KC_Q,       M(0),       KC_E,    KC_R,      KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_UP,   KC_RBRC, KC_BSLS,    KC_MUTE, KC_VOLD, KC_VOLU,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS, \
-    KC_LCTL,  M(1),       M(3),       M(2),    KC_F,      KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_LEFT, KC_RGHT,          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_DOWN,          KC_RSFT,             KC_MS_U,             KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
-    KC_BTN1,  KC_BTN3,    KC_BTN2,                                 KC_SPC,                             KC_RALT, KC_RGUI, TG(2),   _______,    KC_MS_L, KC_MS_D, KC_MS_R,    KC_P0,            KC_PDOT           \
-  ),
-  [2] = LAYOUT(\
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,                                        \
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_MPRV, KC_MPLY, KC_MNXT,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_MUTE, KC_VOLD, KC_VOLU,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS, \
-    KC_LCTL, KC_D,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,            \
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_MS_U,             KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
-    KC_BTN1, KC_BTN3, KC_BTN2,                            KC_SPC,                             KC_RALT, KC_RGUI, TG(2),   KC_NO,      KC_MS_L, KC_MS_D, KC_MS_R,    KC_P0,            KC_PDOT           \
-  ),
-};
-
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {
-  LEADER_DICTIONARY() {
-    leading = false;
-    leader_end();
-
-    SEQ_TWO_KEYS(KC_A, KC_A) { // select all and copy
-      register_code(KC_LCTL);
-      tap(KC_A);
-      tap(KC_C);
-      unregister_code(KC_LCTL);
-    }
-  }
-}
-
-void matrix_init_user(void) {
-  _delay_ms(500);
-  set_unicode_input_mode(UC_WINC);
-};
-
-void cycleAll(qk_tap_dance_state_t *state, void *user_data) {
-  if(state->count == 1) {
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[EMOTIS]));
-    unicode_input_finish();
-  }
-  else if(state->count <= 1642) {
-    tap(KC_BSPC);
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[1])+state->count);
-    unicode_input_finish();
-  }
-};
-
-
-void cycleEmojis(qk_tap_dance_state_t *state, void *user_data) {
-  if(state->count == 1) {
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[EMOTIS]));
-    unicode_input_finish();
-  }
-  else if(state->count <= 80) {
-    tap(KC_BSPC);
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[EMOTIS])+state->count);
-    unicode_input_finish();
-  }
-};
-
-void cycleAnimals(qk_tap_dance_state_t *state, void *user_data) {
-  if(state->count == 1) {
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[ANIMALS]));
-    unicode_input_finish();
-  }
-  else if(state->count <= MAXEMOJITAPS) {
-    tap(KC_BSPC);
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[ANIMALS])+state->count);
-    unicode_input_finish();
-  }
-};
-
-void cycleFoods(qk_tap_dance_state_t *state, void *user_data) {
-  if(state->count == 1) {
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[FOODS]));
-    unicode_input_finish();
-  }
-  else if(state->count <= 87) {
-    tap(KC_BSPC);
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[FOODS])+state->count);
-    unicode_input_finish();
-  }
-};
-
-
-void cycleEtc(qk_tap_dance_state_t *state, void *user_data) {
-  if(state->count == 1) {
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[ETC]));
-    unicode_input_finish();
-  }
-  else if(state->count <= MAXEMOJITAPS) {
-    tap(KC_BSPC);
-    unicode_input_start();
-    register_hex32(pgm_read_dword(&unicode_map[ETC])+state->count);
-    unicode_input_finish();
-  }
-};
-
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md
deleted file mode 100644
index 0b01f9dbf8..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# The Nikchi's keymap for frosty_flake
-
-### FEATURING
--SPACE CADET 
--Caps Lock is now LCTRL
--LCTRL is Tap(LCTRL, Caps Lock)
-
-### LEADER KEY - RALT
-COMBOS
--a,a => Select All, Copy
-
-
-
-### FN REBINDS for Windows
-```
-   [W]                 [New Desktop]
-[A][S][D]   [Left Desk][Delete Desk][Right Desk]
-
-[Ins][Hom][PUp]     [RW][PP][FF]
-[Del][End][PDn]     [MU][VD][VU]
-
-Arrows are Mouskeys, left three mods are clicks
-
-```
\ No newline at end of file
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk
deleted file mode 100644
index c2682fb1b4..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = yes     # unicodemap
-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
-LEADER_ENABLE = yes
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
deleted file mode 100644
index c3fce50f2a..0000000000
--- a/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Tap Dancing to different beats.
-Tap Dance is constrained normally by `TAPPING_TERM` defined in your keyboard's config.h This proves to be challenging to work with when sometimes you just need more time to tap out your dance, or even a different "beat".
-
-
-
-- Implementing `uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record)`, you can set a specific tap dance to have a longer or shorter tap in between your taps, giving you more, or less, time in between each tap. The return value should be the same type and range of values that one would put into the `TAPPING_TERM` definition in the config.h file.
diff --git a/keyboards/duck/lightsaver/keymaps/rasmus/config.h b/keyboards/duck/lightsaver/keymaps/rasmus/config.h
deleted file mode 100644
index f2b5d264e7..0000000000
--- a/keyboards/duck/lightsaver/keymaps/rasmus/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define FORCE_NKRO
-
-#endif
diff --git a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c b/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
deleted file mode 100644
index 07becf96fa..0000000000
--- a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2017 Rasmus Schults <rasmus.schults@gmail.com>
- *
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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_F1GL TD(TD_F1_GAME)
-#define KC_CLFN TD(TD_CAPS_FN)
-
-enum custom_layers {
-    BASE,   // Base QWERTY layer
-    GAME,   // Gaming layer
-    FN = 5, // Function layer
-};
-
-//Tap Dance Declarations
-enum {
-  TD_F1_BASE,
-  TD_F1_GAME,
-  TD_CAPS_FN
-};
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_F1_GAME] = ACTION_TAP_DANCE_LAYER_MOVE(KC_F1, GAME),
-  [TD_CAPS_FN] = ACTION_TAP_DANCE_LAYER_MOVE(KC_CAPS, 5)
-};
-
-enum macro_id {
-  SHRG,
-};
-
-#define TYPE_SHRUG MACRO( \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(A), T(F), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(5), T(C), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(5), T(F), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(2), T(8), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(3), T(0), T(C), T(4), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(2), T(9), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(5), T(F), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(2), T(F), \
-  D(LCTRL), D(LSHIFT), T(U), U(LCTRL), U(LSHIFT), \
-  T(0), T(0), T(A), T(F), \
-  T(SPACE), END \
-)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE] = LAYOUT(\
-      KC_ESC,   KC_F1GL, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_INS,  KC_HOME, KC_PGUP, KC_PSLS, \
-      KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_DEL,  KC_END,  KC_PGDN, KC_PAST, \
-      KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, \
-      MO(FN),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
-      KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_SLSH, KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
-      KC_LCTL,  KC_LALT, KC_LGUI,                                              KC_SPC,                    KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT), \
-
-[GAME] = LAYOUT(\
-      _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LOCK, _______, _______, _______, _______, _______,  \
-      _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,  \
-      _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,  \
-      KC_CLFN,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,  \
-      _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,  \
-      _______,  KC_LGUI, KC_LALT,                                              _______,                   KC_RALT, _______, _______, _______, _______, _______, _______ ), \
-
-[FN] = LAYOUT(\
-      _______,  M(SHRG), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_SLCK, RGB_TOG, RGB_MOD, _______, _______,  \
-      _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_TOGG, _______, _______, _______,  \
-      _______,  _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, _______,          _______, _______, _______, _______, _______,  \
-      _______,  _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,                   _______, _______, _______, _______, _______,  \
-      _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, QK_BOOT,  \
-      _______,  _______, _______,                                              _______,                   _______, _______, _______, _______, _______, _______, _______ ), \
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  switch(id) {
-    case SHRG:
-      return (record->event.pressed ? TYPE_SHRUG : MACRO_NONE );
-      break;
-  }
-
-  return MACRO_NONE;
-};
diff --git a/keyboards/duck/lightsaver/keymaps/rasmus/readme.md b/keyboards/duck/lightsaver/keymaps/rasmus/readme.md
deleted file mode 100644
index 7670145f76..0000000000
--- a/keyboards/duck/lightsaver/keymaps/rasmus/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-![Lightsaver Layout Image](https://i.imgur.com/KqdZQZZ.png)
-
-# rasmusx's Lightsaver Layout
-
-Custom keymap for Lightsaver.
-
-
-## Features
-
-* Default layer has ALT/SUPER switched and FN key in Caps Lock place.
-* FN layer - Control RGB underglow and backlight. HJKL Vim style movement.
-* Game layer - ALT/SUPER in normal positions. FN behaviour: 1 tap Caps Lock, 2 taps FN
diff --git a/keyboards/duck/lightsaver/keymaps/rasmus/rules.mk b/keyboards/duck/lightsaver/keymaps/rasmus/rules.mk
deleted file mode 100644
index 3b11f9a9c5..0000000000
--- a/keyboards/duck/lightsaver/keymaps/rasmus/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-KEY_LOCK_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/n0velty/keymap.c b/keyboards/dz60/keymaps/n0velty/keymap.c
deleted file mode 100644
index b66fc13398..0000000000
--- a/keyboards/dz60/keymaps/n0velty/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _DL 0 //default
-#define _F1 1 //function 1
-#define _F2 2 //function 2
-
-#define KC_NOPE LALT(KC_F4) //alt+f4
-
-#define RGB_STA RGB_M_P //rgb static
-#define RGB_BRE RGB_M_B //rgb breathe
-#define RGB_RAI RGB_M_R //rgb rainbow
-#define RGB_SWI RGB_M_SW //rgb swirl
-#define RGB_SNA RGB_M_SN //rgb snake
-#define RGB_KNI RGB_M_K //rgb knight
-#define RGB_GRA RGB_M_G //rgb gradient
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DL] = LAYOUT_true_hhkb( //default Layer
-	KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  \
-	KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
-	KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           \
-	KC_LSPO, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC, MO(_F1), \
-	         MO(_F1),          KC_LALT,                   KC_SPC,                                      MO(_F2),          KC_RGUI),
-
-[_F1] = LAYOUT_true_hhkb( //function Layer 1
-	KC_NOPE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_GRV,  \
-	KC_BSPC,          KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_UP,   KC_HOME, KC_END,  \
-	KC_CAPS,          KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLU, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT, _______,          \
-	_______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, _______, _______, _______, _______, KC_PGDN, KC_DOWN,          _______, _______, \
-		     _______,          KC_MSEL,                   KC_MUTE,                                     _______,          _______),
-
-[_F2] = LAYOUT_true_hhkb( //function Layer 2
-	QK_BOOT, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, _______, _______, _______, _______, KC_SLEP, KC_PWR,  \
-	RGB_TOG,          RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_ACL2, KC_BTN1, KC_MS_U, KC_BTN2, _______, \
-	RGB_MOD,          RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_ACL1, KC_MS_L, KC_MS_R, _______,          \
-	BL_TOGG, XXXXXXX, BL_STEP, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, KC_ACL0, KC_MS_D,          _______, _______, \
-		     _______,          _______,                   _______,                                     _______,          M(0)),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    if (record->event.pressed) {
-        switch(id) {
-            case 0:
-                SEND_STRING("https://www.reddit.com/r/MechanicalKeyboards/");
-        }
-    }
-    return MACRO_NONE;
-};
diff --git a/keyboards/ergodox_ez/keymaps/heartrobotninja/config.h b/keyboards/ergodox_ez/keymaps/heartrobotninja/config.h
deleted file mode 100644
index 40d80b7018..0000000000
--- a/keyboards/ergodox_ez/keymaps/heartrobotninja/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef CONFIG_HEARTROBOTNINJA_H
-#define CONFIG_HEARTROBOTNINJA_H
-
-#include "../../config.h"
-
-#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 1000
-
-#undef LEADER_TIMEOUT
-#define LEADER_TIMEOUT 1000
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-
-#undef TAPPING_TOGGLE
-#define TAPPING_TOGGLE 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c b/keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c
deleted file mode 100644
index 91884c8e76..0000000000
--- a/keyboards/ergodox_ez/keymaps/heartrobotninja/keymap.c
+++ /dev/null
@@ -1,680 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "action_util.h"
-#include "debug.h"
-#include "eeconfig.h"
-#include "version.h"
-#include "wait.h"
-
-/* Aliases */
-#define ____ KC_TRNS
-
-/* Layers */
-enum
-{
-  COLE = 0,
-  LOWER, // right hand 10 key
-  RAISE, // Function keys
-  AUX,   // Things like rebooting the board to be flashed. NUM + RAISE
-};
-
-/* Macros */
-enum
-{
-  NONE = 0,
-
-  // OS Functions
-  F_PASTE,
-
-  // Config Macros
-  CF_EPRM,
-  CF_VERS,
-
-  // RGB Macro
-  RGB_ANI,
-};
-
-/* Tap Dancery */
-enum
-{
-  TD_BTK,
-  TD_TDE,
-  TD_LPRN,
-  TD_RPRN,
-  TD_MIN,
-  TD_USC,
-  TD_COPY,
-  TD_UNDO,
-  TD_FIND,
-};
-
-/* OS Identifier */
-enum
-{
-  OS_WIN = 0,
-  OS_OSX,
-  OS_LIN,
-};
-
-uint8_t os_type = OS_WIN;
-
-static uint16_t rgb_timer;
-bool time_travel = false;
-bool skip_leds = false;
-
-/* Keymaps */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-        /* Keymap 0: Colemak Layer
-         *
-         * ,-----------------------------------------------------.           ,-----------------------------------------------------.
-         * |    Find   | 1  ! | 2  @ | 3  # | 4  $ | 5  % | Undo |           | VOLUP| 6  ^ | 7  & | 8  * | 9  ( | 0  ) |    LOCK   |
-         * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
-         * |-----------+------+------+------+------+------+------|           |------+------+------+------+------+------+-----------|
-         * |  '  "  `  |   Q   |   W  |   F  |   P  |  G  | CCopy|           | VOLDN|   J  |   L  | U Ü  |   Y  | = +  |  ~  :  ;  |
-         * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
-         * | (  [  {   | A  Ä  |   R  | S  ß |   T  |  D  |------|           |------|   H  |   N  |   E  |   I  | O Ö   | )  ]  }  |
-         * |-----------+------+------+------+------+------| Paste|           | MUTE |------+------+------+------+------+-----------|
-         * |  -  ,  <  |  Z   |   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |  / ? | \ |  |   ^  |  _  .  >  |
-         * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
-         *     |  AUX | RAISE | LOWER | LEAD | GUI  |                                      |  ESC | RUN  |   <  |   v  |   >   |
-         *     `-----------------------------------'                                       `-----------------------------------'
-         *                                         ,-------------.           ,-------------.
-         *                                         | ALT  | CTRL |           | HOME |  END |
-         *                                  ,------|------|------|           |------+------+------.
-         *                                  |      |      | Del  |           | PGUP |      |      |
-         *                                  | Space|Backsp|------|           |------| Enter| Shift|
-         *                                  |      |      | Tab  |           | PGDN |      |      |
-         *                                  `--------------------'           `--------------------'
-         */
-
-        [COLE] = LAYOUT_ergodox(
-            // Left Hand
-            TD(TD_FIND), KC_1, KC_2, KC_3, KC_4, KC_5, TD(TD_UNDO),
-            TD(TD_BTK), KC_Q, KC_W, KC_F, KC_P, KC_G, TD(TD_COPY),
-            TD(TD_LPRN), KC_A, KC_R, KC_S, KC_T, KC_D,
-            TD(TD_MIN), KC_Z, KC_X, KC_C, KC_V, KC_B, M(F_PASTE),
-            TT(AUX), TT(RAISE), TT(LOWER), KC_LEAD, OSM(MOD_LGUI),
-            OSM(MOD_LALT), OSM(MOD_LCTL),
-            KC_DEL,
-            KC_SPC, KC_BSPC, KC_TAB,
-
-            // Right Hand
-            KC_VOLU, KC_6, KC_7, KC_8, KC_9, KC_0, LGUI(KC_L),
-            KC_VOLD, KC_J, KC_L, KC_U, KC_Y, KC_EQL, TD(TD_TDE),
-            KC_H, KC_N, KC_E, KC_I, KC_O, TD(TD_RPRN),
-            KC_MUTE, KC_K, KC_M, KC_SLSH, KC_BSLS, KC_UP, TD(TD_USC),
-            KC_ESC, LGUI(KC_R), KC_LEFT, KC_DOWN, KC_RGHT,
-            KC_HOME, KC_END,
-            KC_PGUP,
-            KC_PGDOWN, KC_ENT, OSM(MOD_LSFT)),
-
-        /* Keymap 2: LOWER Layer
-         *
-         * ,-----------------------------------------------------.           ,-----------------------------------------------------.
-         * |   ----    | ---- | ---- | ---- | ---- | ---- |      |           |      |   (  |   )  |   ^  |   /  | ---- |           |
-         * |           |      |      |      |      |      | ---- |           | ---- |      |      |      |      |      |   ----    |
-         * |-----------+------+------+------+------+------+------|           |------+------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- |      |           |      |   7  |   8  |   9  |   *  | ---- |   ----    |
-         * |-----------+------+------+------+------+------| ---- |           | ---- |------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- |------|           |------|   4  |   5  |   6  |   -  | ---- |   ----    |
-         * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- | ---- |           | ---- |   1  |   2  |   3  |   +  | ---- |   ----    |
-         * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
-         *     | ----  | ---- | ---- | ---- | ---- |                                       |   0  |   =  | ---- | ---- | ----  |
-         *     `-----------------------------------'                                       `-------------------------------------'
-         *                                         ,-------------.           ,-------------.
-         *                                         | ---- | ---- |           | ---- | ---- |
-         *                                  ,------|------|------|           |------+------+------.
-         *                                  |      |      | ---- |           | ---- |      |      |
-         *                                  | ---- | ---- |------|           |------| ---- | ---- |
-         *                                  |      |      | ---- |           | ---- |      |      |
-         *                                  `--------------------'           `--------------------'
-         */
-        [LOWER] = LAYOUT_ergodox(
-            // Left Hand
-            ____, ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____,
-            ____, ____,
-            ____,
-            ____, ____, ____,
-
-            // Right Hand
-            ____, KC_LPRN, KC_RPRN, KC_CIRC, KC_PSLS, ____, ____,
-            ____, KC_7, KC_8, KC_9, KC_PAST, ____, ____,
-            KC_4, KC_5, KC_6, KC_PMNS, ____, ____,
-            ____, KC_1, KC_2, KC_3, KC_PPLS, ____, ____,
-            KC_0, KC_PEQL, ____, ____, ____,
-            ____, ____,
-            ____,
-            ____, ____, ____),
-
-        /* Keymap 3: RAISE Layer
-         *
-         * ,-----------------------------------------------------.           ,-----------------------------------------------------.
-         * |    F1     |  F2  |  F3  |  F4  |  F5  |  F6  | ---- |           | ---- |   !  |   @  |   #  |   $  |   %  |   `  ~    |
-         * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
-         * |-----------+------+------+------+------+------+------|           |------+------+------+------+------+------+-----------|
-         * |    F7     |  F8  |  F9  | F10  | F11  |  F12 | ---- |           | ---- |   ^  |   &  |   *  |   (  |   )  |   -  _    |
-         * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- |------|           |------|  [ { |  } ] | \  | |  ; : | '  " |   =  +    |
-         * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- | ---- |           | ---- | , <  |  > . | /  ? | ---- | ---- |   ----    |
-         * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
-         *     | ----  | ---- | ---- | ---- | ---- |                                       | ---- | ---- | ---- | ---- | ----  |
-         *     `-----------------------------------'                                       `-----------------------------------'
-         *                                         ,-------------.           ,-------------.
-         *                                         | ---- | ---- |           | ---- | ---- |
-         *                                  ,------|------|------|           |------+------+------.
-         *                                  |      |      | ---- |           | ---- |      |      |
-         *                                  | ---- | ---- |------|           |------| ---- | ---- |
-         *                                  |      |      | ---- |           | ---- |      |      |
-         *                                  `--------------------'           `--------------------'
-         */
-        [RAISE] = LAYOUT_ergodox(
-            // Left Hand
-            KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, ____,
-            KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____,
-            ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____,
-            ____, ____,
-            ____,
-            ____, ____, ____,
-
-            // Right Hand
-            ____, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_GRV,
-            ____, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_MINS,
-            KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_EQL,
-            ____, KC_COMM, KC_DOT, KC_SLSH, ____, ____, ____,
-            ____, ____, ____, ____, ____,
-            ____, ____,
-            ____,
-            ____, ____, ____),
-
-        /* Keymap 7: Configuration Layer
-         *
-         * ,-----------------------------------------------------.           ,-----------------------------------------------------.
-         * |  EEPROM   | ---- | ---- | ---- | ---- | ---- | ---- |           | PWR  | ---- | ---- | ---- | ---- | ---- |           |
-         * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |  VERSION  |
-         * |-----------+------+------+------+------+------+------|           |------+------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- |      |           |      | ---- | ---- | ---- | ---- | ---- |   ----    |
-         * |-----------+------+------+------+------+------| ---- |           | SLP |------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- |------|           |------| ---- | ---- | ---- | ---- | ---- |   ----    |
-         * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
-         * |   ----    | ---- | ---- | ---- | ---- | ---- | ---- |           | WAKE | ---- | ---- | ---- | ---- | ---- |   ----    |
-         * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
-         *     | ----  | ---- | ---- | ---- | ---- |                                       | ---- | ---- | ---- | ---- | ----  |
-         *     `-----------------------------------'                                       `-----------------------------------'
-         *                                         ,-------------.           ,-------------.
-         *                                         | ---- | ---- |           | TOG  | ANI  |
-         *                                  ,------|------|------|           |------+------+------.
-         *                                  |      |      | ---- |           | VAI |      |      |
-         *                                  | ---- | ---- |------|           |------| HUI  | HUID |
-         *                                  |      |      | ---- |           | VAD |      |      |
-         *                                  `--------------------'           `--------------------'
-         */
-        [AUX] = LAYOUT_ergodox(
-            // Left Hand
-            M(CF_EPRM), ____, ____, ____, ____, ____, KC_PWR,
-            ____, ____, ____, ____, ____, ____, KC_SLEP,
-            ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____, ____, KC_WAKE,
-            ____, ____, ____, ____, ____,
-            ____, ____,
-            ____,
-            ____, ____, ____,
-
-            // Right Hand
-            KC_PWR, ____, ____, ____, ____, ____, M(CF_VERS),
-            KC_SLEP, ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____, ____,
-            KC_WAKE, ____, ____, ____, ____, ____, ____,
-            ____, ____, ____, ____, ____,
-            RGB_TOG, M(RGB_ANI),
-            RGB_VAI,
-            RGB_VAD, RGB_HUI, RGB_HUD),
-};
-
-void unredo(qk_tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1)
-  {
-    register_code(KC_LCTL);
-    register_code(KC_Y);
-    unregister_code(KC_Y);
-    unregister_code(KC_LCTL);
-  }
-  else
-  {
-    register_code(KC_LCTL);
-    register_code(KC_Z);
-    unregister_code(KC_Z);
-    unregister_code(KC_LCTL);
-  }
-  reset_tap_dance(state);
-}
-
-void ccopy(qk_tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1)
-  {
-    register_code(KC_LCTL);
-    register_code(KC_X);
-    unregister_code(KC_X);
-    unregister_code(KC_LCTL);
-  }
-  else
-  {
-    register_code(KC_LCTL);
-    register_code(KC_C);
-    unregister_code(KC_C);
-    unregister_code(KC_LCTL);
-  }
-  reset_tap_dance(state);
-}
-
-void findreplace(qk_tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1)
-  {
-    register_code(KC_LCTL);
-    register_code(KC_H);
-    unregister_code(KC_H);
-    unregister_code(KC_LCTL);
-  }
-  else
-  {
-    register_code(KC_LCTL);
-    register_code(KC_F);
-    unregister_code(KC_F);
-    unregister_code(KC_LCTL);
-  }
-  reset_tap_dance(state);
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-        [TD_BTK] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_GRV),
-        [TD_TDE] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_TILD),
-        [TD_LPRN] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LPRN),
-        [TD_RPRN] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RPRN),
-        [TD_MIN] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_MINS),
-        [TD_USC] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_UNDS),
-        [TD_COPY] = ACTION_TAP_DANCE_FN(ccopy),
-        [TD_UNDO] = ACTION_TAP_DANCE_FN(unredo),
-        [TD_FIND] = ACTION_TAP_DANCE_FN(findreplace)};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch (id)
-  {
-  case F_PASTE:
-    if (record->event.pressed)
-    {
-      register_code(KC_LCTL);
-      register_code(KC_V);
-      unregister_code(KC_V);
-      unregister_code(KC_LCTL);
-    }
-    break;
-  case RGB_ANI:
-    if (record->event.pressed)
-    {
-      rgb_timer = timer_read();
-    }
-    else
-    {
-      if (timer_elapsed(rgb_timer) > 300)
-      {
-        rgblight_mode(1);
-      }
-      else
-      {
-        rgblight_step();
-      }
-    }
-  case CF_EPRM:
-    if (record->event.pressed)
-    {
-      eeconfig_init();
-    }
-    return false;
-    break;
-  case CF_VERS:
-    if (record->event.pressed)
-    {
-      SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-    }
-    return false;
-    break;
-  }
-  return MACRO_NONE;
-};
-
-/*
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{}
-*/
-
-void tap(uint16_t code)
-{
-  register_code(code);
-  unregister_code(code);
-}
-
-LEADER_EXTERNS();
-void matrix_scan_user(void)
-{
-
-  uint8_t layer = get_highest_layer(layer_state);
-
-  if (keyboard_report->mods & MOD_BIT(KC_LSFT) ||
-      ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) &&
-       !has_oneshot_mods_timed_out()))
-  {
-    ergodox_right_led_1_set(LED_BRIGHTNESS_HI);
-    ergodox_right_led_1_on();
-  }
-  else if (layer == RAISE || layer == AUX)
-  {
-    ergodox_right_led_1_set(LED_BRIGHTNESS_LO);
-    ergodox_right_led_1_on();
-  }
-  else
-  {
-    ergodox_right_led_1_off();
-  }
-
-  if (keyboard_report->mods & MOD_BIT(KC_LCTL) ||
-      ((get_oneshot_mods() & MOD_BIT(KC_LCTL)) &&
-       !has_oneshot_mods_timed_out()))
-  {
-    ergodox_right_led_2_set(LED_BRIGHTNESS_HI);
-    ergodox_right_led_2_on();
-  }
-  else if (layer == LOWER || layer == AUX)
-  {
-    ergodox_right_led_2_set(LED_BRIGHTNESS_LO);
-    ergodox_right_led_2_on();
-  }
-  else
-  {
-    ergodox_right_led_2_off();
-  }
-
-  if (keyboard_report->mods & MOD_BIT(KC_LALT) ||
-      ((get_oneshot_mods() & MOD_BIT(KC_LALT)) &&
-       !has_oneshot_mods_timed_out()))
-  {
-    ergodox_right_led_3_set(LED_BRIGHTNESS_HI);
-    ergodox_right_led_3_on();
-  }
-  else if (layer == COLE || layer == AUX)
-  {
-    ergodox_right_led_3_set(LED_BRIGHTNESS_LO);
-    ergodox_right_led_3_on();
-  }
-  else
-  {
-    ergodox_right_led_3_off();
-  }
-
-  LEADER_DICTIONARY()
-  {
-    leading = false;
-    leader_end();
-
-    SEQ_THREE_KEYS(KC_W, KC_I, KC_N) { os_type = OS_WIN; };
-    SEQ_THREE_KEYS(KC_O, KC_S, KC_X) { os_type = OS_OSX; };
-    SEQ_THREE_KEYS(KC_L, KC_I, KC_N) { os_type = OS_LIN; };
-
-    SEQ_ONE_KEY(KC_A)
-    {
-      switch (os_type)
-      {
-      case OS_WIN:
-        tap(KC_NLCK);
-        register_code(KC_RALT);
-        tap(KC_KP_0);
-        tap(KC_KP_2);
-        tap(KC_KP_2);
-        tap(KC_KP_8);
-        unregister_code(KC_RALT);
-        tap(KC_NLCK);
-        break;
-      case OS_OSX:
-        register_code(KC_RALT);
-        register_code(KC_RSFT);
-        register_code(KC_SCLN);
-        unregister_code(KC_SCLN);
-        unregister_code(KC_RSFT);
-        unregister_code(KC_RALT);
-        tap(KC_A);
-        break;
-      case OS_LIN:
-        tap(KC_RALT);
-        tap(KC_DQT);
-        tap(KC_A);
-        break;
-      }
-    }
-    SEQ_TWO_KEYS(KC_A, KC_A)
-    {
-      switch (os_type)
-      {
-      case OS_WIN:
-        tap(KC_NLCK);
-        register_code(KC_RALT);
-        tap(KC_KP_0);
-        tap(KC_KP_1);
-        tap(KC_KP_9);
-        tap(KC_KP_6);
-        unregister_code(KC_RALT);
-        tap(KC_NLCK);
-        break;
-      case OS_OSX:
-        register_code(KC_RALT);
-        register_code(KC_RSFT);
-        register_code(KC_SCLN);
-        unregister_code(KC_SCLN);
-        unregister_code(KC_RSFT);
-        unregister_code(KC_RALT);
-        register_code(KC_LSFT);
-        register_code(KC_A);
-        unregister_code(KC_A);
-        unregister_code(KC_LSFT);
-        break;
-      case OS_LIN:
-        tap(KC_RALT);
-        tap(KC_DQT);
-        register_code(KC_LSFT);
-        register_code(KC_A);
-        unregister_code(KC_A);
-        unregister_code(KC_LSFT);
-        break;
-      }
-    }
-    SEQ_ONE_KEY(KC_O)
-    {
-      switch (os_type)
-      {
-      case OS_WIN:
-        tap(KC_NLCK);
-        register_code(KC_RALT);
-        tap(KC_KP_0);
-        tap(KC_KP_2);
-        tap(KC_KP_4);
-        tap(KC_KP_6);
-        unregister_code(KC_RALT);
-        tap(KC_NLCK);
-        break;
-      case OS_OSX:
-        register_code(KC_RALT);
-        register_code(KC_RSFT);
-        register_code(KC_SCLN);
-        unregister_code(KC_SCLN);
-        unregister_code(KC_RSFT);
-        unregister_code(KC_RALT);
-        tap(KC_O);
-        break;
-      case OS_LIN:
-        tap(KC_RALT);
-        tap(KC_DQT);
-        tap(KC_O);
-        break;
-      }
-    }
-    SEQ_TWO_KEYS(KC_O, KC_O)
-    {
-      switch (os_type)
-      {
-      case OS_WIN:
-        tap(KC_NLCK);
-        register_code(KC_RALT);
-        tap(KC_KP_0);
-        tap(KC_KP_2);
-        tap(KC_KP_1);
-        tap(KC_KP_4);
-        unregister_code(KC_RALT);
-        tap(KC_NLCK);
-        break;
-      case OS_OSX:
-        register_code(KC_RALT);
-        register_code(KC_RSFT);
-        register_code(KC_SCLN);
-        unregister_code(KC_SCLN);
-        unregister_code(KC_RSFT);
-        unregister_code(KC_RALT);
-        tap(LSFT(KC_O));
-        break;
-      case OS_LIN:
-        tap(KC_RALT);
-        tap(KC_DQT);
-        register_code(KC_LSFT);
-        register_code(KC_O);
-        unregister_code(KC_O);
-        unregister_code(KC_LSFT);
-        break;
-      }
-    }
-    SEQ_ONE_KEY(KC_U)
-    {
-      switch (os_type)
-      {
-      case OS_WIN:
-        tap(KC_NLCK);
-        register_code(KC_RALT);
-        tap(KC_KP_0);
-        tap(KC_KP_2);
-        tap(KC_KP_5);
-        tap(KC_KP_2);
-        unregister_code(KC_RALT);
-        tap(KC_NLCK);
-        break;
-      case OS_OSX:
-        register_code(KC_RALT);
-        register_code(KC_RSFT);
-        register_code(KC_SCLN);
-        unregister_code(KC_SCLN);
-        unregister_code(KC_RSFT);
-        unregister_code(KC_RALT);
-        tap(KC_U);
-        break;
-      case OS_LIN:
-        tap(KC_RALT);
-        tap(KC_DQT);
-        tap(KC_U);
-        break;
-      }
-    }
-    SEQ_TWO_KEYS(KC_U, KC_U)
-    {
-      switch (os_type)
-      {
-      case OS_WIN:
-        tap(KC_NLCK);
-        register_code(KC_RALT);
-        tap(KC_KP_0);
-        tap(KC_KP_2);
-        tap(KC_KP_2);
-        tap(KC_KP_0);
-        unregister_code(KC_RALT);
-        tap(KC_NLCK);
-        break;
-      case OS_OSX:
-        register_code(KC_RALT);
-        register_code(KC_RSFT);
-        register_code(KC_SCLN);
-        unregister_code(KC_SCLN);
-        unregister_code(KC_RSFT);
-        unregister_code(KC_RALT);
-        tap(LSFT(KC_U));
-        break;
-      case OS_LIN:
-        tap(KC_RALT);
-        tap(KC_DQT);
-        register_code(KC_LSFT);
-        register_code(KC_U);
-        unregister_code(KC_U);
-        unregister_code(KC_LSFT);
-        break;
-      }
-    }
-    SEQ_ONE_KEY(KC_S)
-    {
-      switch (os_type)
-      {
-      case OS_WIN:
-        tap(KC_NLCK);
-        register_code(KC_RALT);
-        tap(KC_KP_0);
-        tap(KC_KP_2);
-        tap(KC_KP_2);
-        tap(KC_KP_3);
-        unregister_code(KC_RALT);
-        tap(KC_NLCK);
-        break;
-      case OS_OSX:
-        register_code(KC_RALT);
-        tap(KC_S);
-        unregister_code(KC_RALT);
-        break;
-      case OS_LIN:
-        tap(KC_RALT);
-        tap(KC_S);
-        tap(KC_S);
-        break;
-      }
-    }
-  }
-}
-
-void matrix_init_user(void)
-{
-
-  ergodox_led_all_on();
-  rgblight_init();
-  rgblight_enable();
-  rgblight_setrgb(255, 0, 0);
-  for (int i = LED_BRIGHTNESS_HI; i > LED_BRIGHTNESS_LO; i--)
-  {
-    ergodox_led_all_set(i);
-    wait_ms(5);
-  }
-  rgblight_setrgb(255, 255, 0);
-  wait_ms(1000);
-  for (int i = LED_BRIGHTNESS_LO; i > 0; i--)
-  {
-    ergodox_led_all_set(i);
-    wait_ms(10);
-  }
-  rgblight_setrgb(0, 255, 255);
-  ergodox_led_all_off();
-  wait_ms(1000);
-
-  rgblight_effect_knight(50);
-}
diff --git a/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk b/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
deleted file mode 100644
index 3cd837d569..0000000000
--- a/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE=no
-SLEEP_LED_ENABLE=no
-NKRO_ENABLE = yes
-FORCE_NKRO = no
-DEBUG_ENABLE = no
-CONSOLE_ENABLE = no
-TAP_DANCE_ENABLE = yes
-KEYLOGGER_ENABLE = no
-UCIS_ENABLE = no
-MOUSEKEY_ENABLE = no
-AUTOLOG_ENABLE = no
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_ANIMATION = yes
-EXTRAKEY_ENABLE = yes
-LEADER_ENABLE = yes
-
-OPT_DEFS += -DUSER_PRINT
-
-KEYMAP_VERSION = $(shell \
- if [ -d "${KEYMAP_PATH}/.git" ]; then \
-  cd "${KEYMAP_PATH}" && git describe --abbrev=6 --dirty --always --tags --match 'v*' 2>/dev/null; \
- else echo QMK; fi)
-
-KEYMAP_BRANCH = $(shell \
- if [ -d "${KEYMAP_PATH}/.git" ]; then \
-  cd "${KEYMAP_PATH}"; \
- fi; \
- git rev-parse --abbrev-ref HEAD 2>/dev/null)
-
-OPT_DEFS += -DKEYMAP_VERSION=\"$(KEYMAP_VERSION)\\\#$(KEYMAP_BRANCH)\"
-
diff --git a/keyboards/ergodox_ez/keymaps/profet_80/keymap.c b/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
deleted file mode 100644
index 6f602e828e..0000000000
--- a/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
+++ /dev/null
@@ -1,179 +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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |  1   |  2   | Home |       | PgUp |   3    |   4  |
- *                                 |------|------|------|       |------|--------|------|
- *                                 | Space| BkSp | End  |       | PgDn |  Tab   |Enter |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox_80(  // layer 0 : default
-        // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
-        KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
-                                              ALT_T(KC_APP),  KC_LGUI,
-                                               KC_1,  KC_2,   KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(SYMB),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
-                          KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-             MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
-                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,KC_3,   KC_4,
-             KC_PGDN,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |------|------|------|       |------|------|------|
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox_80(
-       // left hand
-       M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+----------.
- *                                 |      |      |      |       |      |      |          |
- *                                 |------|------|------|       |------|------|----------|
- *                                 |      |      |      |       |      |      |BrwserBack|
- *                                 `--------------------'       `------------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox_80(
-       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, 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_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-// 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/ergodox_ez/keymaps/profet_80/readme.md b/keyboards/ergodox_ez/keymaps/profet_80/readme.md
deleted file mode 100644
index 7380e3465f..0000000000
--- a/keyboards/ergodox_ez/keymaps/profet_80/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# ErgoDox 80 Default Configuration
-
-This is based on the default Ergodox EZ keymap.
-The difference is that this keymap supports 80 key layouts.
-If you own an 80 key Ergodox, use this as an example to get your desired keymap.
-
-**NOTE:** This layout is not physically supported by the Ergodox EZ.
-
-
-![Default80](https://i.imgur.com/P2Lga9x.png)
diff --git a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
deleted file mode 100644
index 60c6ad4a12..0000000000
--- a/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define DISABLE_SPACE_CADET_ROLLOVER
diff --git a/keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c b/keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c
deleted file mode 100644
index a3626dff87..0000000000
--- a/keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-static uint16_t key_timer;
-
-bool checktime(void){
-		return (timer_elapsed(key_timer) < 150) ? true : false;
-	};
-
-// general keydefs
-#define norm 0		// Default layer
-#define elev 1		// Layer directional keys
-#define supr 2		// F-keys and mediakeys
-#define spac 3		//
-#define FNO1 4		//
-#define FNO2 5		//
-#define FNO3 6		//
-#define MAC0 M(0)	//
-#define MAC1 M(1)	//
-#define MAC2 M(2)	//
-#define MAC3 M(3)	//
-#define MAC4 M(4)	//
-#define MAC5 M(5)	//
-#define MAC6 M(6)	//
-#define MAC7 M(7)	//
-#define MAC8 M(8)	//
-#define MAC9 M(9)	//
-#define GRAV KC_GRV //
-#define MEDI F(FNO1)//
-
-// General shortenings
-#define ESCA KC_ESC
-#define MINS KC_MINS
-#define EQUL KC_EQL
-#define BSPC KC_BSPC
-#define DELE KC_DEL
-#define LBRC KC_LBRC
-#define RBRC KC_RBRC
-#define ALTR KC_RALT
-#define SCLN KC_SCLN
-#define QUOT KC_QUOT
-#define NUHS KC_NUHS
-#define ENTE KC_ENT
-#define NUBS KC_NUBS	// Less/ greater sign
-#define COMM KC_COMM	// Comma
-#define FSTO KC_DOT		// Full stop
-#define SLSH KC_SLSH
-#define ALTL KC_LALT
-#define GUIL KC_LGUI
-#define GUIR KC_RGUI
-#define MENO KC_MENU
-// The F-row/layer:
-#define FK01 KC_F1
-#define FK02 KC_F2
-#define FK03 KC_F3
-#define FK04 KC_F4
-#define FK05 KC_F5
-#define FK06 KC_F6
-#define FK07 KC_F7
-#define FK08 KC_F8
-#define FK09 KC_F9
-#define FK10 KC_F10
-#define FK11 KC_F11
-#define FK12 KC_F12
-#define FK13 KC_F13
-#define FK14 KC_F14
-// Special Actions and Media Keys
-#define INSE KC_INS  	// Insert here
-#define HOME KC_HOME 	// Go to beginning of line
-#define ENDI  KC_END 	// go to end of line
-#define PSCR  KC_PSCR 	// Print Screen
-#define SLCK  KC_SLCK 	// go to end of line
-#define PGDN  KC_PGDN 	// go to end of line
-#define PGUP  KC_PGUP 	// go to end of line
-#define PLPS KC_MPLY 	// Play/Pause
-#define PAUS KC_PAUS 	// Pause button
-#define MUTE KC_MUTE 	// Mute sound
-#define VOLU KC_VOLU 	// Volume increase
-#define VOLD KC_VOLD 	// Volume decrease
-#define MNXT KC_MNXT 	// next track
-#define MPRV KC_MPRV 	// prev track
-#define MSTP KC_MSTP 	// stop playing
-#define MSEL KC_MSEL 	// Select media (Start playing it)
-#define MAIL KC_MAIL 	// Open default mail app
-#define CALC KC_CALC 	// Open default calculator app
-#define MYCM KC_MYCM 	// Open default file manager
-//#define LILO KC_XXXXXX	// Reserved for later
-//#define LIHI KC_XXXXXX	// Reserved for later
-
-
-// dual-role shortcuts
-#define DUTB LT(elev, KC_TAB) 	// `tabs` layer on hold and tab on tap
-#define DUSP LT(spac, KC_SPACE)	// `spce` layer on hold and space on tap
-#define LOCK LGUI(KC_L)			// lock computer (win)
-
-// Space Admiral Strokers
-#define SADL MAC0 				// Hold for lshift and { on tap
-#define SADR MAC1				// Hold for rshift and } on tap
-#define CADL MAC2				// Hold for lctrl and [ on tap
-#define CADR MAC3				// Hold for rctrl and ] on tap
-
-// arrow cluster duality bottom right corner
-#define ARLF ALT_T(KC_LEFT) // Left arrow
-#define ARRT CTL_T(KC_RIGHT)// Right arrow
-#define ARUP SFT_T(KC_UP)	// Up arrow
-#define ARDN GUI_T(KC_DOWN) // Down arrow
-
-// brackets
-#define NOCL RALT(KC_7)    // [
-#define NOCR RALT(KC_0)    // ]
-#define NOPL LSFT(KC_8)    // (
-#define NOPR LSFT(KC_9)    // )
-#define NOAL KC_NUBS       // <
-#define NOAR LSFT(KC_NUBS) // >
-#define NOBL RALT(KC_8)    // [
-#define NOBR RALT(KC_9)    // ]
-
-// increase readability
-#define XXXX	KC_TRNS
-#define DEAD 	KC_NO
-#define SCAN	KC_TRNS // Scandinavian keys, the Row 5 key 5 is actually Row 1 key 15 on the PCB
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[ norm ] = LAYOUT_all( // Normal scandinavian mapping (danish has QUOT and SCLN wapped)
-        GRAV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MINS, EQUL, BSPC, DELE,\
-        DUTB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, LBRC, RBRC, DEAD,\
-        ALTR, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SCLN, QUOT, NUHS, ENTE,\
-				SADL, NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, COMM, FSTO, SLSH, SADR, DEAD,\
-				CADL, ALTL, GUIL,           		DUSP,             	    GUIR, MEDI, MENO, CADR),
-
-[ elev ] = LAYOUT_all( // The f-Row (with f13-14), Special keys and media keys
-				LOCK, FK01, FK02, FK03, FK04, FK05, FK06, FK07, FK08, FK09, FK10, FK11, FK12, FK13, FK14,\
-				XXXX, XXXX, XXXX, XXXX, MAIL, XXXX, XXXX, HOME, INSE, PSCR, SLCK, PAUS, PGUP, XXXX,\
-			    XXXX, XXXX, XXXX, XXXX, MYCM, XXXX, XXXX, MPRV, PAUS, MNXT, XXXX, XXXX, PGDN, ENDI,\
-				XXXX, XXXX, XXXX, XXXX, CALC, XXXX, XXXX, XXXX, MUTE, VOLD, VOLU, XXXX, ARUP, DEAD,\
-				XXXX, XXXX, XXXX, 					PLPS,			  		XXXX, ARLF, ARDN, ARRT),
-
-[ spac ] = LAYOUT_all( // The space controls (by pressing space)
-				XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,\
-				XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,\
-			    XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,\
-				XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, DEAD,\
-				XXXX, XXXX, XXXX, 					XXXX,			        XXXX, XXXX, XXXX, XXXX),
-
-[ supr ] = LAYOUT_all( // Additional layer for later use.
-				XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,\
-				XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,\
-			    XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,\
-				XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, DEAD,\
-				XXXX, XXXX, XXXX, 					XXXX,			  		XXXX, XXXX, XXXX, XXXX),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function
-    switch(id) {
-        case 0: //MAC0 - Hold for lshift and { on tap
-					if (record->event.pressed) {
-						key_timer = timer_read();
-						return MACRO(D(LSFT), END );
-					} else {
-						return checktime() ? MACRO(U(LSFT),D(RALT),T(7),U(RALT),END): MACRO(U(LSFT),END);
-					}; break;
-			  case 1:	//MAC1 - Hold for rshift and } on tap
-					if (record->event.pressed) {
-						key_timer = timer_read();
-						return MACRO(D(RSFT), END );
-					} else {
-						return checktime()  ? MACRO(U(RSFT),D(RALT),T(0),U(RALT),END): MACRO(U(RSFT),END);
-					}; break;
-        case 2: //MAC2 - Hold for lctrl and [ on tap
-						if (record->event.pressed) {
-							key_timer = timer_read();
-							return MACRO(D(LCTL), END );
-						} else {return checktime() ? MACRO(U(LCTL),D(RALT),T(8),U(RALT),END):MACRO(U(LCTL),END);
-						}; break;
-       	case 3: //MAC3 - Hold for rctrl and ] on tap
-						if (record->event.pressed) {
-							key_timer = timer_read();
-							return MACRO(D(RCTL), END );
-						} else {
-							return checktime() ? MACRO(U(RCTL),D(RALT),T(9),U(RALT),END):MACRO(U(RCTL),END);
-						}; break;
-      	case 4: //MAC4 reserved for later.
-						if (record->event.pressed) { } else { }; break;
-       	case 5: //MAC5 reserved for later.
-						if (record->event.pressed) { } else { }; break;
-       	case 6: //MAC6 reserved for later.
-						if (record->event.pressed) { } else { }; break;
-    } return MACRO_NONE;
-};
diff --git a/keyboards/gh60/satan/keymaps/admiralStrokers/readme.md b/keyboards/gh60/satan/keymaps/admiralStrokers/readme.md
deleted file mode 100644
index eb3a20bb95..0000000000
--- a/keyboards/gh60/satan/keymaps/admiralStrokers/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Admiral Strokers keymap
-## For the  Satan GH60 PCB
-The Admiral STN60 is a layout for users of the satan GH60, optimized with some nice	features such as mod tap for brackets (Similar to Space Cadett), space mod for F-row/  layer with easy to access media and control keys. The layout below is just as an example and is ISO based, ANSI and JIS layouts will be included later.
-
-``````
-[ _tmp ] = LAYOUT_all(	// Copy this to get started. SCAN is scandinavian layout specific.
-XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,\
-XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, DEAD,\
-XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, SCAN, XXXX,\
-XXXX, SCAN, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, DEAD,\
-XXXX, XXXX, XXXX, 					XXXX,		   SCAN, XXXX, XXXX, XXXX, XXXX),\
-
-```
diff --git a/keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk b/keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk
deleted file mode 100644
index ad6c0131ae..0000000000
--- a/keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = no # Console for debug(+400)
-COMMAND_ENABLE = no # Commands for debug and configuration
-SLEEP_LED_ENABLE = no # Enables your LED to breathe while your computer is sleeping.
-NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-MIDI_ENABLE = no # MIDI controls
-AUDIO_ENABLE = no # Audio output on port C6
-UNICODEMAP_ENABLE =	no # This allows sending unicode symbols using X(<unicode>) in your keymap.
-UNICODE_ENABLE =no # Unicode
-UCIS_ENABLE = no # Keep in mind that not all will work (See WinCompose for details on Windows).
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no# Breathing sleep LED during USB suspend
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.c b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.c
deleted file mode 100644
index e035648706..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*  A library to output the right key shortcut in any common app.
-Given a global variable babble_mode to show the environment and a
-key that calls the paste macro, do the right type of paste.
-Setting the context is done by another macro, or TBD interaction with the host.
-
-Huge thanks to https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts
-and https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/jeebak/keymap.c
-*/
-
-#include "babblePaste.h"
-
-#include "action_macro.h"
-
-#ifdef USE_BABLPASTE
-
-// GLOBAL variable to determine mode.  Sets startup default if no eeppom
-uint8_t babble_mode =0 ;
-
-// small function that we might also want to call from a keymap.
-
-macro_t* switch_babble_mode( uint8_t id) {
- babble_mode= id;
- return MACRO_NONE; //less typing where called
-}
-
-
-// Today I learned that the preprocessor can not create a switch statement label from an argument
-// And else statements have problems, see https://gcc.gnu.org/onlinedocs/gcc-3.0.1/cpp_3.html#SEC15
-#define BABLM(ent, macro...) \
-	if ( ent == shortcut ) \
-		 {  action_macro_play( MACRO(macro)); return MACRO_NONE; }
-
-
-/* this function runs the appropriate babblepaste macro, given
-the global babble_mode, and a shortcut from the ENUM in babblePaste.h
-TODO, the pointers in this function should be stored in a PROGMEM array, not ram.
-But that requires even more clever preprocessor foo.
-*/
-const  macro_t *babblePaste (keyrecord_t *record,  uint8_t shortcut) {
-/*
-	 if ( shortcut < BABL_START_NUM || \
-			 shortcut >= (BABL_START_NUM + BABL_NUM_MACROS ) ) {
-			return MACRO_NONE;
-		}
-*/
-
-
-#ifdef MS_MODE
-	if ( BABL_WINDOWS  == shortcut ) { return switch_babble_mode(MS_MODE);  }
-#endif
-#ifdef MAC_MODE
-	if ( BABL_MAC == shortcut) { return switch_babble_mode(MAC_MODE);  }
-#endif
-#ifdef LINUX_MODE
-	if ( BABL_LINUX == shortcut ) { return switch_babble_mode(LINUX_MODE);  }
-#endif
- #ifdef READMUX_MODE
-	if ( BABL_READLINE == shortcut  ) { switch_babble_mode(READMUX_MODE); return MACRO_NONE; }
-#endif
-#ifdef VI_MODE
-	if ( BABL_VI == shortcut  ) { return switch_babble_mode(VI_MODE);   }
-#endif
-#ifdef EMACS_MODE
-	if ( BABL_EMACS == shortcut  ) { return switch_babble_mode(EMACS_MODE);   }
-#endif
-
-
-
-    switch(babble_mode) {
-
-#ifdef MS_MODE
-
-	 case MS_MODE:
-		BABLM( BABL_GO_LEFT_1C,	T(LEFT), END );
-		BABLM( BABL_GO_RIGHT_1C ,	T(RIGHT), END );
-		BABLM( BABL_GO_LEFT_WORD,	D(LCTL), T(LEFT), U(LCTL), END );
-		BABLM( BABL_GO_RIGHT_WORD, D(LCTL), T(RIGHT), U(LCTL), END );
-		BABLM( BABL_GO_START_LINE,	T(HOME), END );
-		BABLM( BABL_GO_END_LINE,	T(END), END );
-		BABLM( BABL_GO_START_DOC,	D(LCTL),T(HOME),  U(LCTL),END );
-		BABLM( BABL_GO_END_DOC,	D(LCTL),T(END),  U(LCTL),END );
-		BABLM( BABL_GO_NEXT_LINE,	T(DOWN), END );
-		BABLM( BABL_GO_PREV_LINE,	T(UP), END );
-		BABLM( BABL_PGDN,			T(PGDN), END );
-		BABLM( BABL_PGUP,			T(PGUP), END );
-		BABLM( BABL_DEL_RIGHT_1C,	T(DEL), END );
-		BABLM( BABL_DEL_LEFT_WORD,	D(LCTL), T(BSPACE), U(LCTL), END );
-		BABLM( BABL_DEL_RIGHT_WORD,		D(LCTL), T(DEL), U(LCTL), END );
-		BABLM( BABL_DEL_TO_LINE_END,	D(RSFT), T(HOME), U(RSFT), T(DEL),  END);
-		BABLM( BABL_DEL_TO_LINE_START,	D(RSFT), T(END), U(RSFT), T(DEL),  END );
-#ifndef BABL_MOVEMENTONLY
-		BABLM( BABL_UNDO, 		D(LCTL), T(Z), U(LCTL), END );
-		BABLM( BABL_REDO, 		D(LCTL), T(Y), U(LCTL), END );
-		BABLM( BABL_CUT, 		D(LCTL), T(X), U(LCTL), END );
-		BABLM( BABL_COPY, 		D(LCTL), T(C), U(LCTL), END );
-		BABLM( BABL_PASTE, 		D(LCTL), T(V), U(LCTL), END );
-		BABLM( BABL_SELECT_ALL, D(LCTL), T(A), U(LCTL), END );
-		BABLM( BABL_FIND, 		D(LCTL),T(F),  U(LCTL),END );
-		BABLM( BABL_FIND_NEXT, 			T(F3),END );
-		BABLM( BABL_FIND_REPLACE,		D(LCTL),T(H),  U(LCTL),END );
-		BABLM( BABL_RUNAPP, 	D(LGUI),T(R),  U(LGUI),END );
-		BABLM( BABL_SWITCH_APP_NEXT, D(LALT),T(TAB), U(LALT),END );
-		BABLM( BABL_SWITCH_APP_LAST, D(LSFT),D(LALT),T(TAB), U(LALT), U(LSFT),END );
-		BABLM( BABL_CLOSE_APP, 	D(LALT),T(F4), U(LALT),END );
-		BABLM( BABL_HELP,		T(F1),END );
-#ifndef BABL_NOBROWSER
-		BABLM( BABL_BROWSER_NEW_TAB,		D(LCTL), T(T), U(LCTL),END );
-		BABLM( BABL_BROWSER_CLOSE_TAB,		D(LCTL), T(W), U(LCTL),END );
-		BABLM( BABL_BROWSER_REOPEN_LAST_TAB,		D(LCTL), D(RSFT),T(T), U(RSFT),U(LCTL),END );
-		BABLM( BABL_BROWSER_NEXT_TAB,		D(LCTL), T(TAB), U(LCTL),END );
-		BABLM( BABL_BROWSER_PREV_TAB,		D(LCTL), D(RSFT), T(TAB), U(RSFT), U(LCTL),END );
-		BABLM( BABL_BROWSER_URL_BAR,		D(LCTL), T(L), U(LCTL),END );
-		BABLM( BABL_BROWSER_FORWARD,		D(LALT), T(RIGHT), U(LALT),END );
-		BABLM( BABL_BROWSER_BACK,			D(LALT), T(LEFT), U(LALT),END );
-		BABLM( BABL_BROWSER_FIND,			D(LCTL), T(F), U(LCTL),END );
-		BABLM( BABL_BROWSER_BOOKMARK,		D(LCTL), T(D), U(LCTL),END );
-		//BABLM( BABL_BROWSER_DEV_TOOLS,	T(F12), U(LCTL),END  ); // EDGE
-		BABLM( BABL_BROWSER_DEV_TOOLS,		D(LCTL), T(T), U(LCTL),END  ); // Chrome
-		// Chrome
-		BABLM( BABL_BROWSER_RELOAD,			D(LCTL), T(F5), U(LCTL),END ); // hard reload w/o cache
-		BABLM( BABL_BROWSER_FULLSCREEN,		T(F11),END ); //command shift F
-		BABLM( BABL_BROWSER_ZOOM_IN,		D(LCTL), D(RSFT), T(EQL), U(RSFT), U(LCTL),END ); // ctr+ +
-		BABLM( BABL_BROWSER_ZOOM_OUT,		D(LCTL), T(MINS), U(LCTL),END );
-#endif
-#endif
-
-		// Todo, ring bell, flash light, show user this isn't supported
-		return MACRO_NONE;
-
-
-#endif /* MS_MODE*/
-
-
-#ifdef LINUX_MODE
-
-	 case LINUX_MODE:
-		BABLM( BABL_GO_LEFT_1C  , 	T(LEFT), END );
-		BABLM( BABL_GO_RIGHT_1C  , 	T(RIGHT), END );
-		BABLM( BABL_GO_LEFT_WORD  , 	D(LCTL), T(LEFT), U(LCTL), END );
-		BABLM( BABL_GO_RIGHT_WORD  , D(LCTL), T(RIGHT), U(LCTL), END );
-		BABLM( BABL_GO_START_LINE , 	T(HOME), END );
-		BABLM( BABL_GO_END_LINE  ,	T(END), END );
-		BABLM( BABL_GO_START_DOC  , 	D(LCTL),T(HOME),  U(LCTL),END );
-		BABLM( BABL_GO_END_DOC  , 	D(LCTL),T(END),  U(LCTL),END );
-		BABLM( BABL_GO_NEXT_LINE  , 	T(DOWN), END );
-		BABLM( BABL_GO_PREV_LINE  , 	T(UP), END );
-		BABLM( BABL_PGDN  , 			T(PGDN), END );
-		BABLM( BABL_PGUP  , 			T(PGUP), END );
-		BABLM( BABL_DEL_RIGHT_1C  , 	D(DEL), END );
-		BABLM( BABL_DEL_LEFT_WORD  ,	D(LCTL), T(BSPACE), U(LCTL), END );
-		BABLM( BABL_DEL_RIGHT_WORD  , D(LCTL), T(DEL), U(LCTL), END );
-		BABLM( BABL_DEL_TO_LINE_END,	D(RSFT), T(HOME), U(RSFT), T(DEL),  END);
-		BABLM( BABL_DEL_TO_LINE_START,	D(RSFT), T(END), U(RSFT), T(DEL),  END );
-#ifndef BABL_MOVEMENTONLY
-		BABLM( BABL_UNDO  , 	D(LCTL), T(Z), U(LCTL), END );
-		BABLM( BABL_REDO  , 	D(LCTL), T(Y), U(LCTL), END );
-		BABLM( BABL_CUT  , 	D(LCTL), T(X), U(LCTL), END );
-		BABLM( BABL_COPY  , 	D(LCTL), T(C), U(LCTL), END );
-		BABLM( BABL_PASTE  ,	D(LCTL), T(V), U(LCTL), END );
-		BABLM( BABL_SELECT_ALL, D(LCTL), T(A), U(LCTL), END );
-		BABLM( BABL_FIND,	D(LCTL),T(F),  U(LCTL),END );
-		/* BABLM(BABL_FIND_NEXT  , T(F3),END ); KDE */
-		BABLM( BABL_FIND_NEXT,	D(LCTL),T(G),  U(LCTL),END ); // Gnome*/
-		/* BABLM(  , D(LCTL),T(R),  U(LCTL),END ); KDE */
-		BABLM( BABL_FIND_REPLACE,	D(LCTL),T(H),  U(LCTL),END ); // Gnome*/
-		BABLM( BABL_RUNAPP,			D(LALT),T(F2),  U(LALT),END );
-		BABLM( BABL_SWITCH_APP_NEXT,	D(LCTL),T(TAB), U(LCTL),END );
-		BABLM( BABL_SWITCH_APP_LAST,	D(LSFT),D(LCTL),T(TAB), U(LCTL), U(LSFT),END );
-		BABLM( BABL_CLOSE_APP,	D(LALT),T(F4), U(LALT),END );
-		//BABLM( BABL_HELP, 		END );
-
-#ifndef BABL_NOBROWSER
-		BABLM( BABL_BROWSER_NEW_TAB,		D(LCTL), T(T), U(LCTL),END );
-		BABLM( BABL_BROWSER_CLOSE_TAB,		D(LCTL), T(W), U(LCTL),END );
-		BABLM( BABL_BROWSER_REOPEN_LAST_TAB,		D(LCTL), D(RSFT),T(T), U(RSFT),U(LCTL),END );
-		BABLM( BABL_BROWSER_NEXT_TAB,		D(LCTL), T(TAB), U(LCTL),END );
-		BABLM( BABL_BROWSER_PREV_TAB,		D(LCTL), D(RSFT), T(TAB), U(RSFT), U(LCTL),END );
-		BABLM( BABL_BROWSER_URL_BAR,		D(LCTL), T(L), U(LCTL),END );
-		BABLM( BABL_BROWSER_FORWARD,		D(LALT), T(RIGHT), U(LALT),END );
-		BABLM( BABL_BROWSER_BACK,			D(LALT), T(LEFT), U(LALT),END );
-		BABLM( BABL_BROWSER_FIND,			D(LCTL), T(F), U(LCTL),END );
-		BABLM( BABL_BROWSER_BOOKMARK,		D(LCTL), T(D), U(LCTL),END );
-		BABLM( BABL_BROWSER_DEV_TOOLS,		D(LCTL), T(T), U(LCTL),END  ); // Chrome
-		BABLM( BABL_BROWSER_RELOAD,			D(LCTL), T(F5), U(LCTL),END ); // hard reload w/o cache
-		BABLM( BABL_BROWSER_FULLSCREEN,		T(F11),END ); //command shift F
-		BABLM( BABL_BROWSER_ZOOM_IN,		D(LCTL), T(PLUS), U(LCTL),END );
-		BABLM( BABL_BROWSER_ZOOM_OUT,		D(LCTL), T(MINS), U(LCTL),END );
-#endif
-#endif
-	 return MACRO_NONE;
-
-#endif
-
-#ifdef MAC_MODE
-
-	 case MAC_MODE:
-		BABLM( BABL_GO_LEFT_1C ,	T(LEFT), END );
-		BABLM( BABL_GO_RIGHT_1C,	T(RIGHT), END );
-		BABLM( BABL_GO_LEFT_WORD ,	D(LALT), T(LEFT), U(LALT), END );
-		BABLM( BABL_GO_RIGHT_WORD ,	D(LALT), T(RIGHT), U(LALT), END );
-		BABLM( BABL_GO_START_LINE ,	D(LGUI), T(LEFT), U(LGUI),  END );
-		BABLM( BABL_GO_END_LINE ,	D(LGUI), T(RIGHT), U(LGUI), END );
-		BABLM( BABL_GO_START_DOC ,	D(LGUI),T(UP),  U(LGUI),END );
-		BABLM( BABL_GO_END_DOC ,	D(LGUI),T(DOWN),  U(LGUI),END );
-		BABLM( BABL_GO_NEXT_LINE ,	T(DOWN), END );
-		BABLM( BABL_GO_PREV_LINE ,	T(UP), END );
-		BABLM( BABL_PGDN ,		D(LALT),T(DOWN), U(LALT), END );
-		BABLM( BABL_PGUP ,  	D(LALT),T(UP), U(LALT), END );
-		BABLM( BABL_DEL_RIGHT_1C ,	D(DEL), END );
-		BABLM( BABL_DEL_LEFT_WORD ,	D(LALT), T(BSPACE), U(LALT), END );
-		BABLM( BABL_DEL_RIGHT_WORD,	D(LALT), T(DEL), U(LALT), END );
-		BABLM( BABL_DEL_TO_LINE_END,	D(LCTL), T(K), U(LCTL), END );// there must be another way
-		BABLM( BABL_DEL_TO_LINE_START,	D(LGUI), T(BSPACE), U(LGUI),   END );
-#ifndef BABL_MOVEMENTONLY
-		BABLM( BABL_UNDO , 		D(1), D(LGUI), T(Z), U(LGUI), END );
-		BABLM( BABL_REDO , 		D(LSFT),D(LGUI), T(Z), U(LSFT),U(LGUI), END );
-		BABLM( BABL_CUT ,		D(LGUI), T(X), U(LGUI), END );
-		BABLM( BABL_COPY ,		D(LGUI), T(C), U(LGUI), END );
-		BABLM( BABL_PASTE ,		D(LGUI), T(V), U(LGUI), END );
-		BABLM( BABL_SELECT_ALL ,	D(LGUI), T(A), U(LGUI), END );
-		BABLM( BABL_FIND ,			D(LGUI),T(F),  U(LGUI),END );
-		BABLM( BABL_FIND_NEXT, 		D(LGUI),T(G),  U(LGUI),END );
-		BABLM( BABL_FIND_REPLACE,	D(LGUI),T(F),  U(LGUI),END );
-		BABLM( BABL_RUNAPP ,		D(LGUI),T(R), U(LGUI),END );
-		BABLM( BABL_SWITCH_APP_NEXT ,	D(LGUI),T(TAB), U(LGUI),END );
-		BABLM( BABL_SWITCH_APP_LAST ,	D(LSFT),D(LGUI),T(TAB), U(LGUI), U(LSFT),END );
-		BABLM( BABL_CLOSE_APP ,			D(LGUI),T(Q),  U(LGUI),END );
-		BABLM( BABL_HELP ,				D(LSFT),D(LGUI),T(SLASH), U(LGUI), U(LSFT),END );
-
-#ifndef BABL_NOBROWSER
-		BABLM( BABL_BROWSER_NEW_TAB,		D(LGUI), T(T), U(LGUI),END );
-		BABLM( BABL_BROWSER_CLOSE_TAB,		D(LGUI), T(W), U(LGUI),END );
-		BABLM( BABL_BROWSER_REOPEN_LAST_TAB,		D(LGUI), D(RSFT),T(T), U(RSFT),U(LGUI),END );
-		BABLM( BABL_BROWSER_NEXT_TAB,		D(LGUI),D(LALT), T(RIGHT),U(LALT), U(LGUI),END );
-		BABLM( BABL_BROWSER_PREV_TAB,		D(LGUI), D(RSFT), T(LEFT), U(RSFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_URL_BAR,		D(LGUI), T(L), U(LGUI),END );
-		BABLM( BABL_BROWSER_FORWARD,		D(LGUI), T(RIGHT), U(LGUI),END );
-		BABLM( BABL_BROWSER_BACK,			D(LGUI), T(LEFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_FIND,			D(LGUI), T(F), U(LGUI),END );
-		BABLM( BABL_BROWSER_BOOKMARK,		D(LGUI), T(D), U(LGUI),END );
-		//BABLM( BABL_BROWSER_DEV_TOOLS,	T(F12), U(LGUI),END  ); // EDGE
-		BABLM( BABL_BROWSER_DEV_TOOLS,		D(LGUI), D(LALT), T(I), U(LALT),U(LGUI),END  ); // Chrome
-		// Chrome
-		BABLM( BABL_BROWSER_RELOAD,			D(LGUI), T(R), U(LGUI),END ); // add shift for reload w/o cache
-		BABLM( BABL_BROWSER_FULLSCREEN,		D(LGUI), D(LCTL), T(P), U(LCTL), U(LGUI),END ); //command shift F
-		BABLM( BABL_BROWSER_ZOOM_IN,		D(LGUI), D(RSFT), T(EQL), U(RSFT), U(LGUI),END ); // ctr+ +
-		BABLM( BABL_BROWSER_ZOOM_OUT,		D(LGUI), T(MINS), U(LGUI),END );
-#endif
-#endif
-
-	 return MACRO_NONE;
-#endif
-
-#ifdef EMACS_MODE
-
-	 case EMACS_MODE:
-	 	switch(shortcut) {
-//probably should allow meta to not be ALT
-
-		BABLM( BABL_GO_LEFT_1C,			T(LEFT), END );
-		BABLM( BABL_GO_RIGHT_1C, 		T(RIGHT), END );
-		BABLM( BABL_GO_LEFT_WORD, 		D(LALT), T(B), U(LALT), END );
-		BABLM( BABL_GO_RIGHT_WORD ,		D(LALT), T(F), U(LALT), END );
-		BABLM( BABL_GO_START_LINE ,  	D(LCTL), T(A), U(LCTL),  END );
-		BABLM( BABL_GO_END_LINE ,  		D(LCTL), T(E), U(LCTL), END );
-		BABLM( BABL_GO_START_DOC , 		D(LALT), D(LSFT), T(COMM),U(LSFT), U(LALT) ,END );
-		BABLM( BABL_GO_END_DOC , 		D(LALT), D(LSFT), T(DOT), U(LSFT), U(LALT) ,END );
-		BABLM( BABL_GO_NEXT_LINE , 		D(LCTL), T(N), U(LCTL), END );
-		BABLM( BABL_GO_PREV_LINE ,  	D(LCTL), T(P), U(LCTL), END );
-		BABLM( BABL_PGDN ,				D(LCTL), T(V), U(LCTL), END );
-		BABLM( BABL_PGUP ,  			D(LALT), T(V), U(LALT), END );
-		BABLM( BABL_DEL_RIGHT_1C, 		D(LCTL), T(D), U(LCTL),END );
-		BABLM( BABL_DEL_LEFT_WORD , 	D(LCTL), T(BSPACE), U(LCTL), END );
-		BABLM( BABL_DEL_RIGHT_WORD , 	D(LALT), T(D), U(LALT), END );
-		BABLM( BABL_DEL_TO_LINE_END,	D(LCTL), T(K), U(LCTL), END );
-		BABLM( BABL_DEL_TO_LINE_START,	T(ESC),  T(0), D(LCTL), T(K), U(LCTL),  END );
-#ifndef BABL_MOVEMENTONLY
-		BABLM( BABL_UNDO , 		D(LCTL), T(X), U(LCTL),T(C), END );
-		BABLM( BABL_REDO , 		D(LCTL), T(X), U(LCTL),T(C), END ); // arguably
-		BABLM( BABL_CUT , 		D(LCTL), T(W), U(LCTL), END );
-		BABLM( BABL_COPY , 		D(LALT), T(W), U(LALT), END ); //really?
-		BABLM( BABL_PASTE ,  	D(LCTL), T(Y), U(LCTL), END );
-		BABLM( BABL_SELECT_ALL ,D(LCTL), T(X), U(LCTL),T(H), END );
-		BABLM( BABL_FIND , 		D(LCTL), T(S), U(LCTL),END );
-		BABLM( BABL_FIND_NEXT , D(LCTL), T(S), U(LCTL),END );
-		BABLM( BABL_FIND_REPLACE , 		D(LALT),D(LSFT), T(5),U(LSFT),  U(LALT), END );
-		BABLM( BABL_RUNAPP , 			D(LALT), T(X), U(LALT),T(S),T(H),T(E),T(L),T(L),END );// arguably
-		BABLM( BABL_SWITCH_APP_NEXT , 	D(LCTL), T(X), U(LCTL),T(RIGHT), END ); // arguably
-		BABLM( BABL_SWITCH_APP_LAST , 	D(LCTL), T(X), U(LCTL),T(LEFT), END ); // arguably
-		BABLM( BABL_CLOSE_APP ,			D(LCTL), T(X), U(LCTL),T(C),END );
-		BABLM( BABL_HELP , 				D(LCTL),T(H), U(LCTL),T(A),END); // start search in help
-#ifndef BABL_NOBROWSER
-/* you get to figure w3 out
-		BABLM( BABL_BROWSER_NEW_TAB,		D(LGUI), T(T), U(LGUI),END );
-		BABLM( BABL_BROWSER_CLOSE_TAB,		D(LGUI), T(W), U(LGUI),END );
-		BABLM( BABL_BROWSER_REOPEN_LAST_TAB,		D(LGUI), D(RSFT),T(T), U(RSFT),U(LGUI),END );
-		BABLM( BABL_BROWSER_NEXT_TAB,		D(LGUI),D(LALT), T(RIGHT),U(LALT), U(LGUI),END );
-		BABLM( BABL_BROWSER_PREV_TAB,		D(LGUI), D(RSFT), T(LEFT), U(RSFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_URL_BAR,		D(LGUI), T(L), U(LGUI),END );
-		BABLM( BABL_BROWSER_FORWARD,		D(LGUI), T(RIGHT), U(LGUI),END );
-		BABLM( BABL_BROWSER_BACK,			D(LGUI), T(LEFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_FIND,			D(LGUI), T(F), U(LGUI),END );
-		BABLM( BABL_BROWSER_BOOKMARK,		D(LGUI), T(D), U(LGUI),END );
-		//BABLM( BABL_BROWSER_DEV_TOOLS,	T(F12), U(LGUI),END  ); // EDGE
-		BABLM( BABL_BROWSER_DEV_TOOLS,		D(LGUI), D(LALT), T(I), U(LALT),U(LGUI),END  ); // Chrome
-		// Chrome
-		BABLM( BABL_BROWSER_RELOAD,			D(LGUI), T(R), U(LGUI),END ); // add shift for reload w/o cache
-		BABLM( BABL_BROWSER_FULLSCREEN,		D(LGUI), D(LCTL), T(P), U(LCTL), U(LGUI),END ); //command shift F
-		BABLM( BABL_BROWSER_ZOOM_IN,		D(LGUI), D(RSFT), T(EQL), U(RSFT), U(LGUI),END ); // ctr+ +
-		BABLM( BABL_BROWSER_ZOOM_OUT,		D(LGUI), T(MINS), U(LGUI),END );
-*/
-#endif
-#endif
-				break;
-
-	 return MACRO_NONE;
-	}
-
-#endif
-
-
-#ifdef VI_MODE
-	 case VI_MODE:
-// you have to track the modes yourself. Otherwise motion is awful (bell, bell, bell)
-
-
-			BABLM( BABL_GO_LEFT_1C , T(H), END );
-			BABLM( BABL_GO_RIGHT_1C , T(L), END );
-			BABLM( BABL_GO_LEFT_WORD , T(B),END );
-			BABLM( BABL_GO_RIGHT_WORD , T(W), END );
-			BABLM( BABL_GO_START_LINE , D(LSFT), T(6),U(LSFT), END ); //^
-			BABLM( BABL_GO_END_LINE ,   D(LSFT), T(4),U(LSFT) , END ); //$
-			BABLM( BABL_GO_START_DOC , T(G),T(G) ,END );
-			BABLM( BABL_GO_END_DOC , D(LSFT), T(G),U(LSFT),END );
-			BABLM( BABL_GO_NEXT_LINE ,  T(J), END );
-			BABLM( BABL_GO_PREV_LINE,  T(K), END );
-			BABLM( BABL_PGDN ,D(LCTL), T(F), U(LCTL), END );
-			BABLM( BABL_PGUP , D(LCTL), T(B), U(LCTL), END );
-			BABLM( BABL_DEL_RIGHT_1C ,  T(X),END );
-			BABLM( BABL_DEL_LEFT_WORD ,  T(D),T(G),T(E),END );
-			BABLM( BABL_DEL_RIGHT_WORD ,  T(D),T(W),END );
-			BABLM( BABL_DEL_TO_LINE_END,	T(D),D(LSFT), T(4),U(LSFT) ,END ); // d$
-			BABLM( BABL_DEL_TO_LINE_START,	T(D),D(LSFT), T(6),U(LSFT) ,END );
-#ifndef BABL_MOVEMENTONLY
-			BABLM( BABL_UNDO , T(U), END );
- 			BABLM( BABL_REDO ,  D(LCTL), T(R), U(LCTL), END );
- 			BABLM( BABL_CUT ,  T(X), END );
- 			BABLM( BABL_COPY , T(Y),END );
-			BABLM( BABL_PASTE ,  T(P), END );
-			BABLM( BABL_SELECT_ALL , D(LSFT), T(SCLN),U(LSFT),D(LSFT), T(5),U(LSFT),T(Y), END ); // wrong but helpful?
-			BABLM( BABL_FIND ,   T(SLASH),END );
-			BABLM( BABL_FIND_NEXT , T(N),END );
-			BABLM( BABL_FIND_REPLACE ,  D(LALT),D(LSFT), T(5),U(LSFT),  U(LALT), END );
-			BABLM( BABL_RUNAPP,END );
-			BABLM( BABL_SWITCH_APP_NEXT		,END );
-			BABLM( BABL_SWITCH_APP_LAST		,END );
-			BABLM(BABL_CLOSE_APP,	D(LSFT), T(SCLN),U(LSFT), T(Q), D(RSFT), T(1),U(RSFT), END );
-			BABLM(BABL_HELP,	 D(LSFT), T(SCLN),U(LSFT),T(H),END); // start search in help
-#ifndef BABL_NOBROWSER
-/* you get to figure this out
-		BABLM( BABL_BROWSER_NEW_TAB,		D(LGUI), T(T), U(LGUI),END );
-		BABLM( BABL_BROWSER_CLOSE_TAB,		D(LGUI), T(W), U(LGUI),END );
-		BABLM( BABL_BROWSER_REOPEN_LAST_TAB,		D(LGUI), D(RSFT),T(T), U(RSFT),U(LGUI),END );
-		BABLM( BABL_BROWSER_NEXT_TAB,		D(LGUI),D(LALT), T(RIGHT),U(LALT), U(LGUI),END );
-		BABLM( BABL_BROWSER_PREV_TAB,		D(LGUI), D(RSFT), T(LEFT), U(RSFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_URL_BAR,		D(LGUI), T(L), U(LGUI),END );
-		BABLM( BABL_BROWSER_FORWARD,		D(LGUI), T(RIGHT), U(LGUI),END );
-		BABLM( BABL_BROWSER_BACK,			D(LGUI), T(LEFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_FIND,			D(LGUI), T(F), U(LGUI),END );
-		BABLM( BABL_BROWSER_BOOKMARK,		D(LGUI), T(D), U(LGUI),END );
-		//BABLM( BABL_BROWSER_DEV_TOOLS,	T(F12), U(LGUI),END  ); // EDGE
-		BABLM( BABL_BROWSER_DEV_TOOLS,		D(LGUI), D(LALT), T(I), U(LALT),U(LGUI),END  ); // Chrome
-		// Chrome
-		BABLM( BABL_BROWSER_RELOAD,			D(LGUI), T(R), U(LGUI),END ); // add shift for reload w/o cache
-		BABLM( BABL_BROWSER_FULLSCREEN,		D(LGUI), D(LCTL), T(P), U(LCTL), U(LGUI),END ); //command shift F
-		BABLM( BABL_BROWSER_ZOOM_IN,		D(LGUI), T(PLUS), U(LGUI),END );
-		BABLM( BABL_BROWSER_ZOOM_OUT,		D(LGUI), T(MINS), U(LGUI),END );
-*/
-#endif
-#endif
-		 return MACRO_NONE;
-#endif
-
-
-
-
-#ifdef READMUX_MODE
-// Readline command line editing + tmux windowing
-// I havent decided how much to do readline and how much tmux
-
-
-	case READMUX_MODE:
-
-		BABLM( BABL_GO_LEFT_1C , 		T(LEFT), END );
-		BABLM( BABL_GO_RIGHT_1C , 		T(RIGHT), END );
-		BABLM( BABL_GO_LEFT_WORD , 		D(LALT), T(B), U(LALT), END );
-		BABLM( BABL_GO_RIGHT_WORD , 	D(LALT), T(F), U(LALT), END );
-		BABLM( BABL_GO_START_LINE ,  	D(LCTL), T(A), U(LCTL),  END );
-		BABLM( BABL_GO_END_LINE ,  		D(LCTL), T(E), U(LCTL), END );
-		//BABLM( BABL_GO_START_DOC		,END );// tmux?
-		//BABLM( BABL_GO_END_DOC		,END );  // tmux?
-		BABLM( BABL_GO_NEXT_LINE ,  	D(LCTL), T(N), U(LCTL), END );
-		BABLM( BABL_GO_PREV_LINE ,  	D(LCTL), T(P), U(LCTL), END );
-		BABLM( BABL_PGDN , 			T(PGDN), END );
-		BABLM( BABL_PGUP , 			T(PGUP), END );
-		BABLM( BABL_DEL_RIGHT_1C , 	D(LCTL), T(D), U(LCTL),END );
-		BABLM( BABL_DEL_LEFT_WORD , D(LCTL), T(W), U(LCTL), END );
-		BABLM( BABL_DEL_RIGHT_WORD , 	D(LALT), T(D), U(LALT), END );
-		BABLM( BABL_DEL_TO_LINE_END,	D(LCTL), T(K), U(LCTL), END );
-		BABLM( BABL_DEL_TO_LINE_START,	D(LCTL), T(U), U(LCTL),  END );
-#ifndef BABL_MOVEMENTONLY
-		BABLM( BABL_UNDO , 			D(LALT), T(R), U(LALT) , END );
-		BABLM( BABL_REDO , 			D(LCTL), T(X), U(LCTL),T(C), END ); // arguably
-		BABLM( BABL_CUT , 			D(LCTL), T(K), U(LCTL), END ); // wrong half the time
-		//BABLM( BABL_COPY		,END );
-		BABLM( BABL_PASTE ,  		D(LCTL), T(Y), U(LCTL), END );
-		BABLM( BABL_SELECT_ALL ,	D(LCTL), T(A), T(K), T(Y), U(LCTL) , END );
-		BABLM( BABL_FIND ,  		D(LCTL), T(R), U(LCTL), END ); // search history
-		BABLM(BABL_FIND_NEXT,  		D(LCTL), T(S), U(LCTL), END );
-		//BABLM( BABL_FIND_REPLACE		,END );
-		BABLM( BABL_RUNAPP ,  		D(LCTL), T(B), U(LCTL),  T(C),END );  //tmux
-		BABLM( BABL_SWITCH_APP_NEXT ,  D(LCTL), T(B), U(LCTL),  T(N),END );  //tmux
-		BABLM( BABL_SWITCH_APP_LAST ,  D(LCTL), T(B), U(LCTL),  T(P),END );  //tmux
-		BABLM( BABL_CLOSE_APP , 		D(LCTL), T(B), U(LCTL),  T(D),END); // usually what I want
-		// BABLM( BABL_HELP		,END );
-#ifndef BABL_NOBROWSER
-/* Add lynx shortcuts?
-		BABLM( BABL_BROWSER_NEW_TAB,		D(LGUI), T(T), U(LGUI),END );
-		BABLM( BABL_BROWSER_CLOSE_TAB,		D(LGUI), T(W), U(LGUI),END );
-		BABLM( BABL_BROWSER_REOPEN_LAST_TAB,		D(LGUI), D(RSFT),T(T), U(RSFT),U(LGUI),END );
-		BABLM( BABL_BROWSER_NEXT_TAB,		D(LGUI),D(LALT), T(RIGHT),U(LALT), U(LGUI),END );
-		BABLM( BABL_BROWSER_PREV_TAB,		D(LGUI), D(RSFT), T(LEFT), U(RSFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_URL_BAR,		D(LGUI), T(L), U(LGUI),END );
-		BABLM( BABL_BROWSER_FORWARD,		D(LGUI), T(RIGHT), U(LGUI),END );
-		BABLM( BABL_BROWSER_BACK,			D(LGUI), T(LEFT), U(LGUI),END );
-		BABLM( BABL_BROWSER_FIND,			D(LGUI), T(F), U(LGUI),END );
-		BABLM( BABL_BROWSER_BOOKMARK,		D(LGUI), T(D), U(LGUI),END );
-		//BABLM( BABL_BROWSER_DEV_TOOLS,	T(F12), U(LGUI),END  ); // EDGE
-		BABLM( BABL_BROWSER_DEV_TOOLS,		D(LGUI), D(LALT), T(I), U(LALT),U(LGUI),END  ); // Chrome
-		// Chrome
-		BABLM( BABL_BROWSER_RELOAD,			D(LGUI), T(R), U(LGUI),END ); // add shift for reload w/o cache
-		BABLM( BABL_BROWSER_FULLSCREEN,		D(LGUI), D(LCTL), T(P), U(LCTL), U(LGUI),END ); //command shift F
-		BABLM( BABL_BROWSER_ZOOM_IN,		D(LGUI), T(PLUS), U(LGUI),END );
-		BABLM( BABL_BROWSER_ZOOM_OUT,		D(LGUI), T(MINS), U(LGUI),END );
-*/
-#endif
-#endif
-
-	return MACRO_NONE;
-
-#endif
-
-	default:
-    	return MACRO_NONE;
-    }
-
-}
-
-
-#endif
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.h b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.h
deleted file mode 100644
index 1e8206212a..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*  A library to output the right key shortcut in any common app.
-Given a global variable babble_mode to show the environment and a
-key that calls the paste macro, do the right type of paste.
-
-Setting the bable_mode is done by another macro, or TBD interaction with the host.
-
-Huge thanks to https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts
-and jeebak & algernon's keymap
-*/
-#ifndef _babblePaste_h_included__
-#define _babblePaste_h_included__
-#include "config.h"
-#include "action_layer.h"
-#include "quantum_keycodes.h"
-
-#ifdef USE_BABLPASTE
-
-/* ***************************
-
-// Uncomment any modes you want. Whatever mode = 0 will be the default on boot
-// Expect to get errors if you comment a feature out and leave it in your keymap.
-
-#define USE_BABLPASTE
-
-//#define MS_MODE 0 // Windows.
-//#define MAC_MODE 1
-//#define LINUX_MODE 2 //aka gnome+KDE
-//#define EMACS_MODE 3
-//#define VI_MODE 4
-//#define WORDSTAR_MODE 5
-//#define READMUX 6  // Readline and tmux
-
-// This removes everything but cursor movement
-//#define BABL_MOVEMENTONLY
-// and this just removes browser shortcuts
-//#define BABL_NOBROWSER
-****************************/
-
-
-// Uncomment if you need more free flash space
-// It removes everything but cursor movement
-//#define BABL_MOVEMENTONLY
-
-
-// Define starting number for BABL macros in the macro range.
-// Probably can start the default even lower
-#define BABL_START_NUM 50
-
-/* Macros handled by babblepaste. Most should be available for all platforms.
-Whatever isn't defined will NOP  */
-enum  {
-// Movement macros
-	// left & right
-	BABL_GO_LEFT_1C= BABL_START_NUM,
-	BABL_GO_RIGHT_1C,
-	BABL_GO_LEFT_WORD,
-	BABL_GO_RIGHT_WORD,
-	BABL_GO_START_LINE,
-	BABL_GO_END_LINE,
-	// now up & down
-	BABL_GO_START_DOC,
-	BABL_GO_END_DOC,
-	BABL_GO_NEXT_LINE,
-	BABL_GO_PREV_LINE,
-	BABL_PGDN,
-	BABL_PGUP,
-	// And the delete options
-	//BABL_DEL_LEFT_1C == backspace, so why bother.
-	BABL_DEL_RIGHT_1C, // usually = Del
-	BABL_DEL_LEFT_WORD,
-	BABL_DEL_RIGHT_WORD,
-	BABL_DEL_TO_LINE_END, // delete from cursor to end of line
-	BABL_DEL_TO_LINE_START, // delete from cursor to begining line
-#ifndef BABL_MOVEMENTONLY
-	   // Cut & Paste
-    BABL_UNDO,
-	BABL_REDO,
-	BABL_CUT,
-	BABL_COPY,
-	BABL_PASTE,
-	BABL_SELECT_ALL,
-	/* not yet implemented
-	BABL_SWAP_LAST2C // swap last characters before the cursor
-	BABL_SWAP_LAST2W // Swap the last two words before the cursor
-	*/
-		// find & replace
-	BABL_FIND,
-	BABL_FIND_NEXT,
-	BABL_FIND_REPLACE,
-		// GUI or app
-	BABL_RUNAPP,
-	BABL_SWITCH_APP_NEXT,
-	BABL_SWITCH_APP_LAST, // previous
-	BABL_CLOSE_APP,
-	BABL_HELP,
-
-#ifndef BABL_NOBROWSER
-	BABL_BROWSER_NEW_TAB,
-	BABL_BROWSER_CLOSE_TAB,
-	BABL_BROWSER_REOPEN_LAST_TAB,
-	BABL_BROWSER_NEXT_TAB,
-	BABL_BROWSER_PREV_TAB,
-	BABL_BROWSER_URL_BAR,
-	BABL_BROWSER_FORWARD,
-	BABL_BROWSER_BACK,
-	BABL_BROWSER_FIND,
-	BABL_BROWSER_BOOKMARK,
-	BABL_BROWSER_DEV_TOOLS, // hard one to remember
-	BABL_BROWSER_RELOAD,
-	BABL_BROWSER_FULLSCREEN,
-	BABL_BROWSER_ZOOM_IN,
-	BABL_BROWSER_ZOOM_OUT,
-
-#endif
-
-#endif
-// Macros for mode switching
-#ifdef MS_MODE
-	BABL_WINDOWS,
-#endif
-#ifdef MAC_MODE
-	BABL_MAC,
-#endif
-#ifdef LINUX_MODE
-	BABL_LINUX,
-#endif
-#ifdef EMACS_MODE
-	BABL_EMACS,
-#endif
-#ifdef VI_MODE
-	BABL_VI,
-#endif
-#ifdef READMUX_MODE
-	BABL_READLINE,
-#endif
-
-
-};
-
-// BUG, used to jump to babble functiion. Surely there is a way to calculate size of enum?
-#define BABL_NUM_MACROS 48+4 // 48 + # of defined modes.
-
-/* And all the shorthand keymap ready versions */
-// First the mode switching macros
-#ifdef MS_MODE
-#define B_WIN  	M(BABL_WINDOWS)
-#endif
-#ifdef MAC_MODE
-#define B_MAC 	M(BABL_MAC)
-#endif
-#ifdef LINUX_MODE
-#define B_LNX 	M(BABL_LINUX)
-#endif
-#ifdef EMACS_MODE
-#define B_EMAX  M(BABL_EMACS)
-#endif
-#ifdef VI_MODE
-#define B_VI  	M(BABL_VI)
-#endif
-#ifdef READMUX_MODE
-#define B_READ  M(BABL_READLINE)
-#endif
-
-// and all the movement & action.
-
-#define B_L1C  M(BABL_GO_LEFT_1C)
-#define B_R1C  M(BABL_GO_RIGHT_1C)
-#define B_L1W  M(BABL_GO_LEFT_WORD)
-#define B_R1W  M(BABL_GO_RIGHT_WORD)
-#define B_GSOL  M(BABL_GO_START_LINE)
-#define B_GEOL  M(BABL_GO_END_LINE)
-#define B_GTOP  M(BABL_GO_START_DOC)
-#define B_GEND  M(BABL_GO_END_DOC)
-#define B_DOWN  M(BABL_GO_NEXT_LINE)
-#define B_UP  M(BABL_GO_PREV_LINE)
-#define B_PGDN  M(BABL_PGDN)
-#define B_PGUP  M(BABL_PGUP)
-//#define B_BKSP  M(BABL_DEL_LEFT_1C) == backspace so why bother.
-#define B_DEL  M(BABL_DEL_RIGHT_1C) // usually = Del
-#define B_DLW  M(BABL_DEL_LEFT_WORD)
-#define B_DRW  M(BABL_DEL_RIGHT_WORD)
-#define B_DEOL  M(BABL_DEL_TO_LINE_END) // delete from cursor to end of line
-#define B_DSOL  M(BABL_DEL_TO_LINE_START) // delete from cursor to begining line
-#define B_UNDO  M(BABL_UNDO)
-#define B_REDO  M(BABL_REDO)
-#define B_CUT  M(BABL_CUT)
-#define B_COPY  M(BABL_COPY)
-#define B_PAST  M(BABL_PASTE)
-#define B_SELA  M(BABL_SELECT_ALL)
-#define B_FIND  M(BABL_FIND)
-#define B_FINDN  M(BABL_FIND_NEXT)
-#define B_FINDR  M(BABL_FIND_REPLACE)
-#define B_RAPP  M(BABL_RUNAPP)
-#define B_NAPP  M(BABL_SWITCH_APP_NEXT)
-#define B_PAPP M(BABL_SWITCH_APP_LAST) // previous
-#define B_CAPP  M(BABL_CLOSE_APP)
-#define B_HELP  M(BABL_HELP)
-#define B_NTAB  M(BABL_BROWSER_NEW_TAB)
-#define B_CTAB  M(BABL_BROWSER_CLOSE_TAB)
-#define B_ROTB  M(BABL_BROWSER_REOPEN_LAST_TAB)
-#define B_NXTB  M(BABL_BROWSER_NEXT_TAB)
-#define B_PTAB  M(BABL_BROWSER_PREV_TAB)
-#define B_NURL M(BABL_BROWSER_URL_BAR)
-#define B_BFWD  M(BABL_BROWSER_FORWARD)
-#define B_BBAK  M(BABL_BROWSER_BACK)
-#define B_BFND  M(BABL_BROWSER_FIND)
-#define B_BOOK  M(BABL_BROWSER_BOOKMARK)
-#define B_BDEV  M(BABL_BROWSER_DEV_TOOLS) // hard one to remember
-#define B_BRLD  M(BABL_BROWSER_RELOAD)
-#define B_BFUlL  M(BABL_BROWSER_FULLSCREEN)
-#define B_ZMIN  M(BABL_BROWSER_ZOOM_IN)
-#define B_ZMOT  M(BABL_BROWSER_ZOOM_OUT)
-
-
-
-
-
-
-
-/*  from action_macro.h
-typedef uint8_t macro_t;
-
-#define MACRO_NONE      (macro_t*)0
-#define MACRO(...)      ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; })
-#define MACRO_GET(p)    pgm_read_byte(p)
-
-#define BABL_MSTART (entry, os,  macro...) ( const macro_t bablDict[entry][os] PROGMEM = { macro... }; )
-
-*/
-
-const macro_t *babblePaste(keyrecord_t *record,  uint8_t shortcut);
-
-macro_t* switch_babble_mode( uint8_t id);
-
-
-#endif
-#endif
-
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.txt b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.txt
deleted file mode 100644
index cf75e153e8..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.txt
+++ /dev/null
@@ -1,123 +0,0 @@
- BabblePaste is a library of common macros used to make sure that
-you can have one "paste" button on one layer, and it will do the 
-right thing on any OS or app. Windows=Ctrl-V. Mac = Command-V and so on. 
-
-The babblepaste library looks for the current status in a babble_mode global variable. 
-To switch modes, run the switch_babble_mode() function, or a pre defined macro. 
-Currently supported  are Windows, OS X, Gnome/kde, Emacs, VI and readline, 
-across 42+ common macro actions. 
-
-
-###To use the library
-1) Paste the following into your config.h. 
-
-//////Begin//////
-#define USE_BABLPASTE 1 
-
-#ifdef USE_BABLPASTE
-/* define BabblePaste maps. Whatever = 0 will be the default. */
-// MAC_MODE   0
-// MS_MODE 1
-// LINUX_MODE 2 
-// EMACS_MODE 3
-// VI_MODE 3
-// Readline and tmux
-// READMUX_MODE 2 
-// WORDSTAR_MODE 5
-#endif
-
-// Uncomment these to remove options an free up  flash space
-
-// This removes everything but cursor movement
-// BABL_MOVEMENTONLY
-// and this just removes browser shortcuts
-// BABL_NOBROWSER
-///////End///////
-
-2) Add the following to your keymap in the action_get_macro
-
-//////Begin//////
-#ifdef USE_BABLPASTE
-
-   if( id >= BABL_START_NUM && id < (BABL_START_NUM + BABL_NUM_MACROS ) ) {
-   		if (record->event.pressed)  { // is there a case where this isn't desired?
-  
-   			babblePaste ( record,  id );
-   			return MACRO_NONE;
-   		}
-   	}
-#endif
-///////End///////
-
-3) add Babbelpaste actions to your keymap. See the full list in babblePaste.h, or the
-list below
-B_L1C  // go left 1 char
-B_R1C  // go Right 1 char
- B_L1W //GO_LEFT_1 WORD
- B_R1W  //BABL_GO_RIGHT_1 WORD
- B_GSOL  // BABL_GOTO_START of _LINE
- B_GEOL  // BABL_GOTO_END_LINE
- B_GTOP  //BABL_GOTO_START_DOC
- B_GEND  //BABL_GO_END_DOC
- B_DOWN  //BABL_GO_NEXT_LINE
- B_UP   // BABL_GO_PREV_LINE
- B_PGDN  //PGDN
- B_PGUP  //PGUP
-// B_BKSP  //backspace so why bother. 
- B_DEL  // DEL_RIGHT_1 Char // usually = Del
- B_DLW  // DEL_LEFT_ 1 WORD)
- B_DRW   //DEL_RIGHT_1 WORD
- B_DEOL  // delete from cursor to end of line
- B_DSOL  // delete from cursor to begining line
- B_UNDO  //UNDO
- B_REDO  // REDO
- B_CUT  // CUT)
- B_COPY  // COPY)
- B_PAST  // PASTE)
- B_SELA  // SELECT_ALL
- B_FIND  // FIND)
- B_FINDN  //FIND_NEXT)
- B_FINDR  // FIND_REPLACE)
- B_RAPP  // open application launcher
- B_NAPP  // switch to next app
- B_PAPP  // switch to previous app
- B_CAPP  // CLOSE_APP)
- B_HELP  // HELP)
- B_NTAB  // BROWSER_NEW_TAB)
- B_CTAB  //BROWSER_CLOSE_TAB)
- B_ROTB  //BROWSER_REOPEN_LAST_TAB)
- B_NXTB  //BROWSER_NEXT_TAB)
- B_PTAB  //BROWSER_PREV_TAB)
- B_NURL //BROWSER_jump to URL_BAR)
- B_BFWD  // BROWSER_FORWARD (in history) 
- B_BBAK  //BROWSER_BACK (in history)
- B_BFND  // BROWSER_FIND)
- B_BOOK  //BROWSER_New BOOKMARK)
- B_BDEV  //BROWSER_ Open DEV_TOOLS) // hard one to remember
- B_BRLD  // BROWSER_RELOAD Page
- B_BFUlL // BROWSER_FULLSCREEN)
- B_ZMIN  // BROWSER_ZOOM_IN)
- B_ZMOT  //BROWSER_ZOOM_OUT)
-
-
-#### Development notes
--Why a new function? Because it would make the keymap too ugly to put it there.  
--Why not return the macro to action_get_macro? Because I kept running into scope problems
-and pointers to the wrong type. 
--Why not an array of arrays as a lookup instead of a function? That would allow you 
-to store the lookup table in PROGMEM.  True, but that takes more pre-processor skill 
-than I had. 
-
--Have you tested this on every platform? No. Submit a patch.  
-
-
-### Next steps for someone. 
-Make it easier to pair macros with modifiers. So key foo will jump to start of line, and 
-Shift(foo) will jump to the first tab in a browser. 
-
-## Thanks
-
-Thanks to https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts
-and https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/jeebak/keymap.c
-And of course QMK... 
-
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/config.h b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/config.h
deleted file mode 100644
index 9d6be063e2..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#define USE_BABLPASTE
-
-// Expect to get errors if you comment a feature out and leave it in your keymap.
-
-#ifdef USE_BABLPASTE
-//define BabblePaste maps
-// Windows.
-#define MAC_MODE   0
-#define MS_MODE 1
-//aka gnome+KDE
-//#define LINUX_MODE 2
-//#define EMACS_MODE 3
-#define VI_MODE 3
-// Readline and tmux
-#define READMUX_MODE 2
-//#define WORDSTAR_MODE 5
-#endif
-
-// Uncomment if you need more free flash space
-
-// This removes everything but cursor movement
-//#define BABL_MOVEMENTONLY
-// and this just removes browser shortcuts
-//#define BABL_NOBROWSER
-
-// place overrides here
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/keymap.c b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/keymap.c
deleted file mode 100644
index 94d9289cdc..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/keymap.c
+++ /dev/null
@@ -1,261 +0,0 @@
-#include "babblePaste.h"
-#include QMK_KEYBOARD_H
-
-#define _QWR 0
-#define _CDH 2
-#define _SYM 3
-#define _MOV 4
-#define _TRAN 5
-
-
-enum layer_keycodes {
-QWR,
-CDH,
-SYM,
-MOV,
-NUM,
-TRAN
-};
-
-
-// Shorter spacing
-#define XXXX  KC_NO
-#define ____  KC_TRNS
-
-// Custom macros
-
-/* Fn Keys */
-#define LT_SYM LT(_SYM, KC_SPC)
-#define TT_SYM MO(_SYM)
-#define TT_MOV LT(_MOV,KC_BSPC)
-#define TT_NUM MO(_NUM)
-
-enum macro_keycodes {
-DHPASTE=1,
-VIBRK,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*  QWERTY
-*
-* |ESC | F1 | F2 | F3 | F4 | F5 | F6 | f7 | F8 | F9 | F10| F11| F12|Vol-|Vol+|_CDH|
-*  -------------------------------------------------------------------------------'
-* | ESC |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Bakspace| Del|
-* ---------------------------------------------------------------------------
-* | tab  |  q |  w |  e |  r |  t |  y |  u |  i |  o |  p |  [ |  ] |  \    |    |
-*  -------------------------------------------------------------------------------'
-* |Bak/Mov|  a |  s |  d |  f |  g |  h |  j |  k |  l |  ; |  ' | enter     |PgUp|
-* --------------------------------------------------------------------------------
-* |Lsft    |  z |  x |  c |  v |  b |  n |  m |  , |  . |  / |      Rsft| Up| PgDn|
-* ---------------------------------------------------------------------------------
-* |Lctl   |Lgui  |Lalt |       Space/Sym      | GUI |  Sym |  Rctl |Left|Down|Rght|
-* ---------------------------------------------------------------------------------
-*/
-
-[_QWR] = LAYOUT( \
-   KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,   KC_F9, KC_F10,    KC_F11,   KC_F12, KC_VOLD, KC_VOLU, CDH,\
-   KC_ESC,   KC_1, KC_2, KC_3 ,KC_4, KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINUS, KC_EQL, KC_BSPC, KC_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,\
-   TT_MOV,  KC_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_SYM, KC_RGUI,TT_SYM,KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
-),
-
-[_CDH] = LAYOUT(\
-   ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     QWR,  \
-   KC_ESC,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,   \
-   KC_TAB,  KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U,    KC_Y,   KC_SCLN, ____,    ____,   ____,\
-   TT_MOV,  KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E,    KC_I,   KC_O,    KC_QUOT, KC_ENT, KC_2,\
-   KC_LSFT, KC_Z, KC_X, KC_C, M(DHPASTE), KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, ____,   KC_1,\
-  ____,     ____, ____ , LT_SYM, ____, ____, ____, ____, ____,   ____
-
-),
-
-
-/*  SYM
-*
-* |ESC | F1 | F2 | F3 | F4 | F5 | F6 | f7 | F8 | F9 | F10| F11| F12|Vol-|Vol+|_CDH|
-*  -------------------------------------------------------------------------------'
-* | ESC |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Bakspace|Del |
-*  --------------------------------------------------------------------------
-* | ESC: | ^  |  { |  } |  @ |  % |    |   [ | ( | )  | _  |  [ |  ] |  \    |    |
-*  -------------------------------------------------------------------------------'
-* |Bak/Mov|  ! |  # |  0 | =  |  { |   } | -  | 1 |  + |  ] |  ` | enter     |PgUp|
-* --------------------------------------------------------------------------------
-* |Lsft    |  ; | ~ |  : | ~  | "|"|  $ | *   |    |  .  |  / |      Rsft| Up| PgDn|
-* ---------------------------------------------------------------------------------
-* |Lctl   |Lgui  |Lalt |       Space/Sym      | GUI |  Sym |  Rctl |Left|Down|Rght|
-* ---------------------------------------------------------------------------------
-*/
-
-[_SYM] = LAYOUT(\
-  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     ____,  \
-  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,   \
-  M(VIBRK),  KC_CIRC, KC_LCBR, KC_RCBR,KC_AT, KC_PERC,         ____,   KC_LBRC,KC_LPRN,KC_RPRN,KC_UNDS,   ____,   ____,   ____,\
-  ____,    KC_EXLM, KC_HASH,  KC_0,  KC_EQL, KC_LCBR,            KC_RCBR,KC_MINS,KC_1,  KC_PLUS,KC_RBRC,  KC_GRV,   ____,  ____,\
-  ____,    KC_SCLN, KC_TILDE,  KC_COLN,  KC_TILDE,  KC_PIPE,     KC_DLR, KC_ASTR, ____,  KC_DOT ,   KC_SLSH,     ____, ____, ____,\
-  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____
-),
-/*
-* |ESC | MAC| Win|RdLn| VI |    |    |    |    |    |    |    |    |    |    |    |
-*  -------------------------------------------------------------------------------'
-* |     |    |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Bakspace| Del|
-* ---------------------------------------------------------------------------
-* | tab  |    |    |Find|    |pTab |DSOL|DelW| Up |DelW|DEOL|  [ |  ] |  \    |    |
-*  -------------------------------------------------------------------------------'
-* |Bak/Mov|    |    |    |    |nTab |GSOL| <- | Dwn | -> | EOL |  ' | enter   |PgUp|
-* --------------------------------------------------------------------------------
-* |Lsft    |Undo| Cut|Copy|Pste|    |    |    |    |    |  / |      Rsft| Up| PgDn|
-* ---------------------------------------------------------------------------------
-* |Lctl   |Lgui  |Lalt |       Space/Sym      | GUI |  Sym |  Rctl |Left|Down|Rght|
-* ---------------------------------------------------------------------------------
-*/
-
-[_MOV] = LAYOUT(\
-  ____,    B_MAC,B_WIN,B_READ, B_VI, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     ____,  \
-  ____,      ____, B_PAPP, B_NAPP, ____, ____,      ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,   \
-  ____,     B_UNDO, ____, B_BFND, ____, B_PTAB,     B_DSOL, B_DLW, B_UP,   B_DRW, B_DEOL,  ____,  ____,   ____, \
-  ____,     B_SELA, B_BRLD, ____, ____, B_NXTB,     B_GSOL, B_L1C, B_DOWN, B_R1C,B_GEOL,   ____, ____, ____,\
-  ____,     B_UNDO,B_CUT, B_COPY, B_PAST, B_PAST,    ____, ____, ____, ____, ____,       ____,  ____,   ____, \
-  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____
-),
-
-[_TRAN] = LAYOUT(\
-  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     ____,  \
-  ____,     ____, ____, ____, ____, ____,      ____, ____, ____, ____, ____,    ____, ____,   ____, ____,   \
-  ____,     ____, ____, ____, ____, ____,      ____, ____, ____, ____, ____,    ____, ____,   ____, \
-  ____,     ____, ____, ____, ____, ____,      ____, ____, ____, ____, ____,    ____, ____,   ____, \
-  ____,     ____, ____, ____, ____, ____,      ____, ____, ____, ____, ____,    ____, ____,   ____, \
-  ____,     ____, ____, ____, ____, ____,      ____, ____, ____, ____
-)
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWR:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        layer_off(_CDH);
-      }
-      return false;
-      break;
-
-    case CDH:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        layer_on(_CDH);
-      }
-      return false;
-      break;
-
-    case SYM:
-      if (record->event.pressed) {
-        layer_on(_SYM);
-      } else {
-		layer_off(_SYM);
-      }
-     return false;
-     break;
-
-   }
- return true;
-
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-
-/* If id is in the range of BABL macros, call the babl function */
-/* Any clever remapping with modifiers should happen here e.g. shift bablkey does opposite*/
-#ifdef USE_BABLPASTE
-
-   if( id >= BABL_START_NUM && id < (BABL_START_NUM + BABL_NUM_MACROS ) ) {
-   		if (record->event.pressed)  { // is there a case where this isn't desired?
-
-   			babblePaste ( record,  id );
-   			return MACRO_NONE;
-   		}
-   	}
-#endif
-
-
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-
- /* Colemak mod-dh moves the D key to the qwerty V position
-   This hack makes apple-V_position do what I mean */
- 	case DHPASTE:
-		if(keyboard_report->mods & MOD_BIT(KC_LGUI) ) {
-			if (record->event.pressed) {
-	  	 		clear_keyboard_but_mods();
-		 		register_code(KC_V);
-	     	} else {
-		 		unregister_code(KC_V);
-	    	}
-		} else {
-            if (record->event.pressed) {
-          		register_code(KC_D);
-            } else {
-           		unregister_code(KC_D);
-	   		}
-		}
-	break;
-
-	case VIBRK: // vi esc:
-		 if (record->event.pressed) {
-			return MACRO( T(ESC),D(LSFT),T(SCLN),U(LSFT), END );
-		 }
-	break;
-
-
-
-
-	default:
-    	return MACRO_NONE;
-    }
-
-
-return MACRO_NONE;
-};
-
-
-
-
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-
-}
-
-
-void led_set_user(uint8_t usb_led) {
-
-}
-
-
-
-
-
-
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/readme.md b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/readme.md
deleted file mode 100644
index 3cb1380d1c..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# A more programmer oriented keymap for Microsoft Sculpt Mobile
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk
deleted file mode 100644
index 5b45f586b5..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = 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
-
-# Keymap specific files
-SRC = babblePaste.c
diff --git a/keyboards/jc65/v32a/keymaps/naut/keymap.c b/keyboards/jc65/v32a/keymaps/naut/keymap.c
deleted file mode 100644
index 52a0c8ce1e..0000000000
--- a/keyboards/jc65/v32a/keymaps/naut/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Define Layers
-#define _BASE 0
-#define _FNX  1
-#define _MAC  2
-#define _RGB  3
-
-// Define Macros
-#define M_PRTS  M(0)
-#define M_PRTA  M(1)
-#define M_PRTSC M(2)
-#define M_PRTAC M(3)
-#define M_MSSN  M(4)
-#define M_APPS  M(5)
-#define M_SPOT  M(6)
-#define M_LEFT  M(7)
-#define M_RGHT  M(8)
-#define RGB_WHT M(9)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Base Layer
-    [_BASE] = LAYOUT(
-         KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_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_NO,         KC_ENT,KC_PGUP,
-        KC_LSFT,  KC_NO,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,  KC_UP,KC_PGDN,
-          MO(1),KC_LALT,KC_LGUI,         KC_SPC, KC_SPC, KC_SPC,                        KC_RGUI,  KC_NO,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-    // Fn Layer
-    [_FNX] = 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,  TG(3),
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,          TG(2),KC_VOLU,KC_MPLY,
-        KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,KC_MRWD,KC_VOLD,KC_MFFD
-    ),
-    // Mac Layer
-    [_MAC] = LAYOUT(
-          TO(0), KC_F14, KC_F15, M_APPS, M_MSSN, KC_F11, KC_F12,KC_MRWD,KC_MPLY,KC_MFFD,KC_MUTE,KC_VOLD,KC_VOLU,KC_EJCT,  KC_NO,  KC_NO,
-          KC_NO, M_PRTS, M_PRTA,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,        KC_BSPC,  KC_NO,
-          KC_NO,M_PRTSC,M_PRTAC,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,         KC_ENT,  KC_NO,
-          KC_NO,  KC_NO,  KC_NO,   KC_X,   KC_C,   KC_V,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          TO(0), M_MSSN,  KC_NO,
-          KC_NO,  KC_NO,KC_LGUI,         M_SPOT, M_SPOT, M_SPOT,                        KC_RGUI,  KC_NO,  KC_NO, M_LEFT, M_APPS, M_RGHT
-    ),
-    // RGB and BL Layer
-    [_RGB] = LAYOUT(
-          TO(0),  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  TO(0),
-          KC_NO,RGB_HUD,RGB_HUI,RGB_WHT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,BL_TOGG,
-          KC_NO,RGB_SAD,RGB_SAI,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,RGB_TOG,
-          KC_NO,  KC_NO,RGB_VAD,RGB_VAI,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,RGB_MOD,RGB_RMOD,         KC_NO,RGB_M_P,RGB_M_R,
-          KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,                          KC_NO,  KC_NO,  KC_NO,  KC_NO,RGB_M_G,RGB_M_SW
-    ),
-};
-
-// The Macros
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    if (record->event.pressed) {
-        switch(id) {
-            case 0:
-                return MACRO(D(LGUI), D(LSFT), T(3), U(LSFT), U(LGUI), END);                   // Mac print screen
-            case 1:
-                return MACRO(D(LGUI), D(LSFT), T(4), U(LSFT), U(LGUI), END);                   // Mac print area
-            case 2:
-                return MACRO(D(LCTL), D(LSFT), D(LGUI), T(3), D(LCTL), D(LSFT), D(LGUI), END); // Mac print screen to clipboard
-            case 3:
-                return MACRO(D(LCTL), D(LSFT), D(LGUI), T(4), D(LCTL), D(LSFT), D(LGUI), END); // Mac print area to clipboard
-            case 4:
-                return MACRO(D(LCTL), T(UP), U(LCTL), END);                                    // Mac mission control
-            case 5:
-                return MACRO(D(LCTL), T(DOWN), U(LCTL), END);                                  // Mac app windows
-            case 6:
-                return MACRO(D(LGUI), T(SPC), U(LGUI), END);                                   // Mac spotlight search
-            case 7:
-                return MACRO(D(LCTL), T(LEFT), U(LCTL), END);                                  // Mac mission left
-            case 8:
-                return MACRO(D(LCTL), T(RGHT), U(LCTL), END);                                  // Mac mission right
-            case 9:
-                rgblight_setrgb(0xff, 0xff, 0xff);                                             // White rgb shortcut
-                break;
-        }
-    }
-    return MACRO_NONE;
-};
diff --git a/keyboards/jc65/v32a/keymaps/naut/readme.md b/keyboards/jc65/v32a/keymaps/naut/readme.md
deleted file mode 100644
index e7d1096666..0000000000
--- a/keyboards/jc65/v32a/keymaps/naut/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Naut's Keymap
-=======
- 
-Layer 1: HHKB Split backspace, 6.25u space, control on caps, Fn on L-Ctl.
-
-Layer 2: F Row on numrow, caps on tab, media shortcuts on arrows
-
-Layer 3: Mac Media buttons on numrow
-
-Layer 4: RGB control
-
-Keymap Maintainer: [Jason Barnachea](https://github.com/nautxx)
-
-Difference from base layout: HHKBish layout. HHKB Fn layer. Mac media layer. RGB control layer.
-
-Intended usage: Daily driver for keyboard peacocking. 
diff --git a/keyboards/jc65/v32a/keymaps/naut/rules.mk b/keyboards/jc65/v32a/keymaps/naut/rules.mk
deleted file mode 100644
index d7463419b4..0000000000
--- a/keyboards/jc65/v32a/keymaps/naut/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/jc65/v32u4/keymaps/naut/keymap.c b/keyboards/jc65/v32u4/keymaps/naut/keymap.c
deleted file mode 100644
index 33e0a264ff..0000000000
--- a/keyboards/jc65/v32u4/keymaps/naut/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Define Layers
-#define _BASE 0
-#define _FNX  1
-#define _MAC  2
-#define _RGB  3
-#define _OFF  4
-
-// Define Macros
-#define M_PRTS  M(0)
-#define M_PRTA  M(1)
-#define M_PRTSC M(2)
-#define M_PRTAC M(3)
-#define M_MSSN  M(4)
-#define M_APPS  M(5)
-#define M_SPOT  M(6)
-#define M_LEFT  M(7)
-#define M_RGHT  M(8)
-#define RGB_WHT M(9)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Base Layer
-    [_BASE] = LAYOUT(
-         KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_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_NO,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,  KC_UP,KC_PGDN,
-          MO(1),KC_LALT,KC_LGUI,         KC_SPC, KC_SPC, KC_SPC,                        KC_RGUI,  KC_NO,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-    // Fn Layer
-    [_FNX] = 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,  TG(4),  TG(3),
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,          TG(2),KC_VOLU,KC_MPLY,
-        KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,KC_MRWD,KC_VOLD,KC_MFFD
-    ),
-    // Mac Layer
-    [_MAC] = LAYOUT(
-          TO(0), KC_F14, KC_F15, M_APPS, M_MSSN, KC_F11, KC_F12,KC_MRWD,KC_MPLY,KC_MFFD,KC_MUTE,KC_VOLD,KC_VOLU,KC_EJCT,  KC_NO,  KC_NO,
-          KC_NO, M_PRTS, M_PRTA,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,        KC_BSPC,  KC_NO,
-          KC_NO,M_PRTSC,M_PRTAC,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,                 KC_ENT,  KC_NO,
-          KC_NO,  KC_NO,  KC_NO,   KC_X,   KC_C,   KC_V,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          TO(0), M_MSSN,  KC_NO,
-          KC_NO,  KC_NO,KC_LGUI,         M_SPOT, M_SPOT, M_SPOT,                        KC_RGUI,  KC_NO,  KC_NO, M_LEFT, M_APPS, M_RGHT
-    ),
-    // RGB and BL Layer
-    [_RGB] = LAYOUT(
-          TO(0),  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  TO(0),
-          KC_NO,RGB_HUD,RGB_HUI,RGB_WHT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,BL_TOGG,
-          KC_NO,RGB_SAD,RGB_SAI,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,                  KC_NO,RGB_TOG,
-          KC_NO,  KC_NO,RGB_VAD,RGB_VAI, BL_DEC, BL_INC,  KC_NO,  KC_NO,  KC_NO,  KC_NO,RGB_MOD,RGB_RMOD,         KC_NO,RGB_M_P,RGB_M_R,
-          KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,                          KC_NO,  KC_NO,  KC_NO,  KC_NO,RGB_M_G,RGB_M_SW
-    ),
-    // Mash Layer
-    [_OFF] = LAYOUT(
-          TO(0),  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,
-          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,                  KC_NO,  KC_NO,
-          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,
-          QK_BOOT,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,                          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-    ),
-};
-
-// The Macros
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    if (record->event.pressed) {
-        switch(id) {
-            case 0:
-                return MACRO(D(LGUI), D(LSFT), T(3), U(LSFT), U(LGUI), END);                   // Mac print screen
-            case 1:
-                return MACRO(D(LGUI), D(LSFT), T(4), U(LSFT), U(LGUI), END);                   // Mac print area
-            case 2:
-                return MACRO(D(LCTL), D(LSFT), D(LGUI), T(3), D(LCTL), D(LSFT), D(LGUI), END); // Mac print screen to clipboard
-            case 3:
-                return MACRO(D(LCTL), D(LSFT), D(LGUI), T(4), D(LCTL), D(LSFT), D(LGUI), END); // Mac print area to clipboard
-            case 4:
-                return MACRO(D(LCTL), T(UP), U(LCTL), END);                                    // Mac mission control
-            case 5:
-                return MACRO(D(LCTL), T(DOWN), U(LCTL), END);                                  // Mac app windows
-            case 6:
-                return MACRO(D(LGUI), T(SPC), U(LGUI), END);                                   // Mac spotlight search
-            case 7:
-                return MACRO(D(LCTL), T(LEFT), U(LCTL), END);                                  // Mac mission left
-            case 8:
-                return MACRO(D(LCTL), T(RGHT), U(LCTL), END);                                  // Mac mission right
-            case 9:
-                rgblight_setrgb(0xff, 0xff, 0xff);                                             // White rgb shortcut
-                break;
-        }
-    }
-    return MACRO_NONE;
-};
diff --git a/keyboards/jc65/v32u4/keymaps/naut/readme.md b/keyboards/jc65/v32u4/keymaps/naut/readme.md
deleted file mode 100644
index ef5947f7ce..0000000000
--- a/keyboards/jc65/v32u4/keymaps/naut/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Naut's Keymap
-=======
- 
-Layer 1: HHKB Split backspace, 6.25u space, control on caps, Fn on L-Ctl.
-
-Layer 2: F Row on numrow, caps on tab, media shortcuts on arrows
-
-Layer 3: Mac Media buttons on numrow
-
-Layer 4: RGB control
-
-Layer 5: Keyboard off (for mashing purposes and reset)
-
-Keymap Maintainer: [Jason Barnachea](https://github.com/nautxx)
-
-Difference from base layout: HHKBish layout. HHKB Fn layer. Mac media layer. RGB control layer. Button mashing layer.
-
-Intended usage: Daily driver for keyboard peacocking. 
diff --git a/keyboards/jc65/v32u4/keymaps/naut/rules.mk b/keyboards/jc65/v32u4/keymaps/naut/rules.mk
deleted file mode 100644
index d7463419b4..0000000000
--- a/keyboards/jc65/v32u4/keymaps/naut/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/jd45/keymaps/blakedietz/README.md b/keyboards/jd45/keymaps/blakedietz/README.md
deleted file mode 100644
index 2e45a46d9b..0000000000
--- a/keyboards/jd45/keymaps/blakedietz/README.md
+++ /dev/null
@@ -1,129 +0,0 @@
-jeebak's JD45 layout
-=======================
-NOTE: This is a port of jeebak's planck layout, for jd45.
-
-This WIP keymap attempts to minimize fingers straying away from the home row.
-To aid in this endeavor, when additional modifyer keys to switch layers are
-needed, they will be mapped to home row keys. The `keymap.c` file will contain
-the exact changes. The diagrams in this README shows the highlights of the
-changes from the default mappings.
-
-I also decided to change all calls to `persistant_default_layer_set()` to
-`default_layer_set()` since this is my personal perference.
-
-## Macros
-```
-#define ALT_TAB     M(KC_ALT_TAB)
-```
-
-## Base Layers (Qwerty/Colemak/Dvorak)
-These base layers are mostly the same as the default mappings. The interesting
-changes are shown below.
-
-- The `Ctrl/Esc`, will emit an `Escape` when tapped, and act as a `Control` key when held,
-- `GUI/;` as `;` and `GUI`,
-- `Alt/"` as `"` and `Alt`,
-- `Sft/Ent` as `Enter` and `Shift`, and
-- `Hyper/Tab` as `Tab` and `Hyper`
-
-A `TODO` item is to see if it can also act as a `CapsLock` when double-tapped.
-The arrow keys, which have been moved to the
-[TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been
-replaced with the Media keys as shown. The `MC/kc` key activates the
-`MouseCursor` layer when held, and emits the corresponding `kc` for its layer,
-when tapped.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  | Bksp |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  | Ctrl/Esc |   A  |   S  | MC/D |   F  |   G  |   H  |   J  |   K  |   L  |GUI/; |   Alt/"    |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   Shift   |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Sft/Ent  |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |   RGUI |  Alt  |  GUI  | Lower | TC/Space | TC/Space |  Raise  |  Vol-  |  Vol+  |   Play   |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## Lower Layer (Symbols and Function Keys)
-The symbols and functions keys are essentially the same as the default mapping.
-The most notable changes are that the symbol keys from the `RAISE` layer have
-been moved here. The remaining Media keys replace those that are now on the
-base layers. The `BACKLIT` key has also been moved here.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |   ~     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      | Bksp |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |   [      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |   "|"      |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   ]       |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |    \      |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  | Brite  |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## Raise Layer (Numbers and Arithmetic Operators)
-All of the numbers and arithmetic operators are available on this layer. Some
-keys are duplicated for the convenience of their positions. The `0` and `$`
-keys at the far left are for quick access to beginning and end of line in vim.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |   0     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      | Bksp |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |   $      |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |   "|"      |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   =       |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |    \      |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  | Brite  |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## TouchCursor layer plus personal customizations
-[TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key
-as the modifier, with the `IJKL` home row keys representing the inverted-T of
-the arrow keys. All of the default TouchCursor keymappings for the right hand
-are represented below. My personalizations include all of the keys shown for
-the left hand. Having the `Alt` and `Shift` keys (as well as the `Control` key
-from the base layers) readily accessible from the home row allows quick word
-jumps and highlighting when used in conjunction with the arrow keys. The
-`Alt-Tab` macro is not only useful under Windows, but also under Mac when used
-with alternative switchers like [HyperSwitch](https://bahoom.com/hyperswitch).
-The `Cmd-Tab` and `Ctrl-Tab` sequences are duplicated for easy access while in
-this layer. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and `KC_AGAIN`
-keycodes do not seem to work. There are macros in place that'll "automatically"
-choose the correct version (`Cmd-Tab` vs. `Alt-Tab`, `Cmd-C` vs. `Ctrl-C`,
-etc.) depending on which layout you've currently selected (`AG_NORM` or
-`AG_SWAP`) in the `_ADJUST` layer. The `Desk_L` and `Desk_R` macros are what I
-use to switch between Virtual Desktops Left/Right. The `Tab_C`, `Tab_N` and
-`Tab_R` are for "Close Tab," "New Tab" and "Reopen Closed Tab" for apps such as
-Google Chrome.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  | AltTab  |CmdTab|CtlTab| GUI  |Shift |  ~   |Insert| Home |  Up  | End  | Bksp |      |      |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |          | Alt  |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L|  Desk_R    |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |           | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |Tab_N |Tab_R |iTerm2|           |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |        |       |       |       |          |          |         |        |        |          |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## Mouse Layer
-The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer.
-The `D` key (on QWERTY) is used to activate this layer. All 16 keycodes for the
-mouse from the `doc/keycode.txt` file are represented, and logically located,
-IMHO. The left and right click buttons are duplicated; on the right hand side,
-for a quick click here and there, and again on the left hand side for when the
-buttons need to be held for dragging things or highlighting text, thus allowing
-the right hand to be free to use the up/down/left/right actions.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |         |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |      |      |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |          |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 |   BTN5     |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |           |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |           |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |        |       |       |       |          |          |         |        |        |          |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
diff --git a/keyboards/jd45/keymaps/blakedietz/blank_key_template.md b/keyboards/jd45/keymaps/blakedietz/blank_key_template.md
deleted file mode 100644
index 2a58cfdd13..0000000000
--- a/keyboards/jd45/keymaps/blakedietz/blank_key_template.md
+++ /dev/null
@@ -1,13 +0,0 @@
-```
-/* Name
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |         |      |      |      |      |      |      |      |      |      |      |      |      |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          |      |      |      |      |      |      |      |      |      |      |            |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      |      |     |       |      |      |      |      |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-```
diff --git a/keyboards/jd45/keymaps/blakedietz/config.h b/keyboards/jd45/keymaps/blakedietz/config.h
deleted file mode 100644
index eb4cf3bdfb..0000000000
--- a/keyboards/jd45/keymaps/blakedietz/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-/**
- * This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
- * you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
-/**
- * Improve the smootheness of mouse interaction
- */
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    5
-#define MOUSEKEY_MAX_SPEED      2
-#define MOUSEKEY_WHEEL_DELAY    0
diff --git a/keyboards/jd45/keymaps/blakedietz/keymap.c b/keyboards/jd45/keymaps/blakedietz/keymap.c
deleted file mode 100644
index a6631c9d99..0000000000
--- a/keyboards/jd45/keymaps/blakedietz/keymap.c
+++ /dev/null
@@ -1,365 +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 _ADJUST 16
-#define _LOWER 3
-#define _MEDIA 8
-#define _MOUSECURSOR 7
-#define _QWERTY 0
-#define _RAISE 4
-#define _VIM 9
-// TODO: (bdietz) - make a symbols layer for fun emoji and ascii art
-// TODO: (bdietz) - make a symbol layer for greek symbols
-
-// Keycodes
-enum planck_keycodes
-{
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-};
-
-enum macro_keycodes
-{
-    KC_ALT_TAB,
-    KC_CMD_TAB,
-    KC_CTL_TAB,
-    KC_CMD_SLSH,
-    KC_AG_FIND,
-    KC_AG_AGAIN,
-    KC_AG_UNDO,
-    KC_AG_CUT,
-    KC_AG_COPY,
-    KC_AG_PASTE,
-    KC_AG_DESK_L,
-    KC_AG_DESK_R,
-    KC_AG_TAB_C,
-    KC_AG_TAB_N,
-    KC_AG_TAB_R,
-};
-
-/**
- * This section of macros is for tap or hold functionality. Keys will fire off the second symbol in the name if tapped
- * or fire the first symbol in the name if held. For example
- * GUI_Z
- *
- * - will fire z if tapped
- * - will fire cmd/super/win if held
- */
-#define ALT_DOT ALT_T(KC_DOT)
-#define ALT_X ALT_T(KC_X)
-#define CTL_SLSH CTL_T(KC_SLSH)
-#define CTL_Z CTL_T(KC_Z)
-#define GUI_C GUI_T(KC_C)
-#define GUI_COMM GUI_T(KC_COMM)
-#define HPR_ESC ALL_T(KC_ESC)
-#define HPR_QUO ALL_T(KC_QUOT)
-
-// Toggle to VIM when left space button is held, emit space keycode when left space is tapped
-#define TGL_VIM LT(_VIM, KC_SPC)
-// Toggle to the mouse layer when the right space button is held and emit enter when right space is tapped
-#define TGL_MOUSE LT(_MOUSECURSOR, KC_ENT)
-
-// TODO: (bdietz) - need to audit these keycodes to see what sort of cool things the default layout was doing.
-#define ALT_TAB M(KC_ALT_TAB)   // Macro for Alt-Tab
-#define CMD_TAB M(KC_CMD_TAB)   // Macro for Cmd-Tab
-#define CTL_TAB M(KC_CTL_TAB)   // Macro for Ctl-Tab
-#define CMD_SLSH M(KC_CMD_SLSH) // Macro for Cmd-Slash (personal shortcut to toggle iTerm2 visibility)
-#define AG_FIND M(KC_AG_FIND)   // Macros for Cmd-[x] vs Ctrl-[x] based on current AG_NORM or AG_SWAP settings
-#define AG_AGAIN M(KC_AG_AGAIN)
-#define AG_UNDO M(KC_AG_UNDO)
-#define AG_CUT M(KC_AG_CUT)
-#define AG_COPY M(KC_AG_COPY)
-#define AG_PASTE M(KC_AG_PASTE)
-#define AG_D_L M(KC_AG_DESK_L) // For Virtual Desktop Switching: Left, and
-#define AG_D_R M(KC_AG_DESK_R) //                                Right
-#define AG_T_C M(KC_AG_TAB_C)  // For Chrome, etc. Tab Close,
-#define AG_T_N M(KC_AG_TAB_N)  //                  Tab New, and
-#define AG_T_R M(KC_AG_TAB_R)  //                  Tab Reopen Closed
-
-/* Qwerty
- *
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |   Tab   |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |      |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |Hyper/Esc|   A  |   S  |  D   |   F  |   G  |   H  |   J  |   K  |   L  |MEDIA/;|  Hyper/"   |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   Shift   |CTL/Zl|ALT/X |GUI/C |   V  |   B  |   N  |   M  |GUI/, | ALT/.|CTL// |  Shift    |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       | Lower | VIM/Space| MOUSE/Ent|  Raise  |        |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, ALL_T(KC_NO),
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        HPR_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(_MEDIA, KC_SCLN), HPR_QUO,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        KC_LSFT, CTL_Z, ALT_X, GUI_C, KC_V, KC_B, KC_N, KC_M, GUI_COMM, ALT_DOT, CTL_SLSH, KC_RSFT,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, LOWER, TGL_VIM, TGL_MOUSE, RAISE, _______, _______, _______),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    // TODO: (bdietz) - update the keymap documentation to include the modifier keys on the third row
-    /* Lower
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |   `     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp | Bksp |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |   [      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |   "|"      |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   ]       |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |    \      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_LOWER] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_BSPC,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        KC_LBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        KC_RBRC, CTL_T(KC_F7), ALT_T(KC_F8), GUI_T(KC_F9), KC_F10, KC_F11, KC_F12, KC_MINS, GUI_T(KC_EQL), ALT_T(KC_LBRC), CTL_T(KC_RBRC), KC_BSLS,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Raise
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |   ~     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp | Bksp |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |   $      |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |   "|"      |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   =       |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |    \      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_RAISE] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        KC_DLR, KC_4, KC_5, KC_6, KC_DOT, KC_PLUS, KC_DOT, KC_4, KC_5, KC_6, KC_ASTR, KC_PIPE,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        KC_EQL, CTL_T(KC_7), ALT_T(KC_8), GUI_T(KC_9), KC_0, KC_MINS, KC_DOT, KC_1, GUI_T(KC_2), ALT_T(KC_3), CTL_T(KC_SLSH), KC_BSLS,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Mouse Layer
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |         |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |      |      |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 |   BTN5     |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-
-    [_MOUSECURSOR] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        _______, _______, _______, KC_MS_U, _______, _______, _______, KC_ACL2, KC_ACL1, KC_ACL0, _______, _______, _______,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Adjust (Lower + Raise)
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |         |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          |      |      |      |      |AGnorm|AGswap|Qwerty|Mouse |      |Plover|            |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      |      |     |       |      |      |      |      |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |  Reset   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_ADJUST] = LAYOUT(
-
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* VIM
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |         |      |      |      |      |      |      |      |      |      |      |      |      |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          |      |      |      |      |      | LEFT | DOWN | UP   |RIGHT |      |            |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      |      |     |       |      |      |      |      |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_VIM] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Media
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |         |      |      |      |      |      |      |      |      |      |      |      |      |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          |      |      |      |      |      |      | Prev | Next | Mute |      | Play/Pause |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      |      |     |       | VolD | VolU |      |      |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_MEDIA] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE, _______, KC_MPLY,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-};
-
-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)
-        {
-            default_layer_set(1UL << _QWERTY);
-        }
-        return false;
-        break;
-    case LOWER:
-        if (record->event.pressed)
-        {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        else
-        {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case RAISE:
-        if (record->event.pressed)
-        {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        else
-        {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    }
-    return true;
-}
-
-/*
- * Macro definition
- */
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    if (!eeconfig_is_enabled())
-    {
-        eeconfig_init();
-    }
-
-    bool use_cmd = true; // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc.
-    // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in:
-    // quantum/quantum.c
-    if (keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1)
-    {
-        use_cmd = false; // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc.
-    }
-
-    switch (id)
-    {
-    case KC_ALT_TAB:
-        if (use_cmd)
-        {
-            return (record->event.pressed ? MACRO(D(LALT), D(TAB), END) : MACRO(U(TAB), END));
-        }
-        else
-        {
-            return (record->event.pressed ? MACRO(D(LGUI), D(TAB), END) : MACRO(U(TAB), END));
-        }
-    case KC_CMD_TAB:
-        if (use_cmd)
-        {
-            return (record->event.pressed ? MACRO(D(LGUI), D(TAB), END) : MACRO(U(TAB), END));
-        }
-        else
-        {
-            return (record->event.pressed ? MACRO(D(LALT), D(TAB), END) : MACRO(U(TAB), END));
-        }
-
-    case KC_CTL_TAB:
-        return (record->event.pressed ? MACRO(D(LCTRL), D(TAB), END) : MACRO(U(TAB), END));
-    case KC_CMD_SLSH:
-        return (record->event.pressed ? MACRO(D(LGUI), D(SLSH), END) : MACRO(U(SLSH), END));
-
-    case KC_AG_FIND:
-        return use_cmd ? MACRODOWN(D(LGUI), T(F), END) : MACRODOWN(D(LCTRL), T(F), END);
-    case KC_AG_AGAIN:
-        return use_cmd ? MACRODOWN(D(LGUI), T(G), END) : MACRODOWN(D(LCTRL), T(G), END);
-    case KC_AG_UNDO:
-        return use_cmd ? MACRODOWN(D(LGUI), T(Z), END) : MACRODOWN(D(LCTRL), T(Z), END);
-    case KC_AG_CUT:
-        return use_cmd ? MACRODOWN(D(LGUI), T(X), END) : MACRODOWN(D(LCTRL), T(X), END);
-    case KC_AG_COPY:
-        return use_cmd ? MACRODOWN(D(LGUI), T(C), END) : MACRODOWN(D(LCTRL), T(C), END);
-    case KC_AG_PASTE:
-        return use_cmd ? MACRODOWN(D(LGUI), T(V), END) : MACRODOWN(D(LCTRL), T(V), END);
-
-    case KC_AG_DESK_L:
-        return use_cmd ? MACRODOWN(D(LGUI), D(LCTRL), T(SCLN), END) : MACRODOWN(D(LALT), D(LCTRL), T(SCLN), END);
-    case KC_AG_DESK_R:
-        return use_cmd ? MACRODOWN(D(LGUI), D(LCTRL), T(QUOT), END) : MACRODOWN(D(LALT), D(LCTRL), T(QUOT), END);
-
-    case KC_AG_TAB_C:
-        return use_cmd ? MACRODOWN(D(LGUI), T(W), END) : MACRODOWN(D(LCTRL), T(W), END);
-    case KC_AG_TAB_N:
-        return use_cmd ? MACRODOWN(D(LGUI), T(T), END) : MACRODOWN(D(LCTRL), T(T), END);
-    case KC_AG_TAB_R:
-        return use_cmd ? MACRODOWN(D(LGUI), D(LSHIFT), T(T), END) : MACRODOWN(D(LCTRL), D(LSHIFT), T(T), END);
-    }
-
-    return MACRO_NONE;
-}
diff --git a/keyboards/jd45/keymaps/jeebak/keymap.c b/keyboards/jd45/keymaps/jeebak/keymap.c
deleted file mode 100644
index a14009a43b..0000000000
--- a/keyboards/jd45/keymaps/jeebak/keymap.c
+++ /dev/null
@@ -1,454 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _TOUCHCURSOR 6
-#define _MOUSECURSOR 7
-#define _ADJUST 16
-
-// Keycodes
-enum planck_keycodes
-{
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-    DVORAK,
-    PLOVER,
-    LOWER,
-    RAISE,
-    BACKLIT,
-    EXT_PLV
-};
-
-enum macro_keycodes
-{
-    KC_ALT_TAB,
-    KC_CMD_TAB,
-    KC_CTL_TAB,
-    KC_CMD_SLSH,
-    KC_AG_FIND,
-    KC_AG_AGAIN,
-    KC_AG_UNDO,
-    KC_AG_CUT,
-    KC_AG_COPY,
-    KC_AG_PASTE,
-    KC_AG_DESK_L,
-    KC_AG_DESK_R,
-    KC_AG_TAB_C,
-    KC_AG_TAB_N,
-    KC_AG_TAB_R,
-};
-
-// Custom macros
-#define CTL_ESC CTL_T(KC_ESC)  // Tap for Esc, hold for Ctrl
-#define SFT_ENT SFT_T(KC_ENT)  // Tap for Enter, hold for Shift
-#define HPR_TAB ALL_T(KC_TAB)  // Tap for Tab, hold for Hyper
-#define GUI_SEM GUI_T(KC_SCLN) // Tap for Semicolon, hold for GUI
-#define ALT_QUO ALT_T(KC_QUOT) // Tap for Quote, hold for Alt
-// Requires KC_TRNS/_______ for the trigger key in the destination layer
-#define LT_TC LT(_TOUCHCURSOR, KC_SPC) // L-ayer T-ap T-ouch C-ursor
-#define LT_MC(kc) LT(_MOUSECURSOR, kc) // L-ayer T-ap M-ouse C-ursor
-#define ALT_TAB M(KC_ALT_TAB)          // Macro for Alt-Tab
-#define CMD_TAB M(KC_CMD_TAB)          // Macro for Cmd-Tab
-#define CTL_TAB M(KC_CTL_TAB)          // Macro for Ctl-Tab
-#define CMD_SLSH M(KC_CMD_SLSH)        // Macro for Cmd-Slash (personal shortcut to toggle iTerm2 visibility)
-#define AG_FIND M(KC_AG_FIND)          // Macros for Cmd-[x] vs Ctrl-[x] based on current AG_NORM or AG_SWAP settings
-#define AG_AGAIN M(KC_AG_AGAIN)
-#define AG_UNDO M(KC_AG_UNDO)
-#define AG_CUT M(KC_AG_CUT)
-#define AG_COPY M(KC_AG_COPY)
-#define AG_PASTE M(KC_AG_PASTE)
-#define AG_D_L M(KC_AG_DESK_L) // For Virtual Desktop Switching: Left, and
-#define AG_D_R M(KC_AG_DESK_R) //                                Right
-#define AG_T_C M(KC_AG_TAB_C)  // For Chrome, etc. Tab Close,
-#define AG_T_N M(KC_AG_TAB_N)  //                  Tab New, and
-#define AG_T_R M(KC_AG_TAB_R)  //                  Tab Reopen Closed
-
-/* Qwerty
- *
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp | Bksp |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * | Ctrl/Esc |   A  |   S  | MC/D |   F  |   G  |   H  |   J  |   K  |   L  |GUI/; |   Alt/"    |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   Shift   |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Sft/Ent  |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |   RGUI |  Alt  |  GUI  | Lower | TC/Space | TC/Space |  Raise  |  Vol-  |  Vol+  |   Play   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_BSPC,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        CTL_ESC, KC_A, KC_S, LT_MC(KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, GUI_SEM, ALT_QUO,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        KC_RGUI, KC_LALT, KC_LGUI, LOWER, LT_TC, LT_TC, RAISE, KC_VOLD, KC_VOLU, KC_MPLY),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Colemak
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |Hyper/Tab|   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp | Bksp |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * | Ctrl/Esc |   A  |   R  | MC/S |   T  |   D  |   H  |   N  |   E  |   I  |   O  |    "       |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * | Shift     |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |  Sft/Ent  |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |   RGUI |  Alt  |  GUI  | Lower | TC/Space | TC/Space |  Raise  |  Vol-  |  Vol+  |   Play   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_COLEMAK] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        CTL_ESC, KC_A, KC_R, LT_MC(KC_S), KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        KC_RGUI, KC_LALT, KC_LGUI, LOWER, LT_TC, LT_TC, RAISE, KC_VOLD, KC_VOLU, KC_MPLY),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Dvorak
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |Hyper/Tab|   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp | Bksp |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * | Ctrl/Esc |   A  |   O  | MC/E |   U  |   I  |   D  |   H  |   T  |   N  |   S  |    /       |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * | Shift     |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |  Sft/Ent  |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |   RGUI |  Alt  |  GUI  | Lower | TC/Space | TC/Space |  Raise  |  Vol-  |  Vol+  |   Play   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_DVORAK] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_BSPC,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        CTL_ESC, KC_A, KC_O, LT_MC(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, SFT_ENT,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        KC_RGUI, KC_LALT, KC_LGUI, LOWER, LT_TC, LT_TC, RAISE, KC_VOLD, KC_VOLU, KC_MPLY),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Lower
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |   ~     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp | Bksp |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |   [      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |   "|"      |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   ]       |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |    \      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * | Brite  |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_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_BSPC,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        KC_LBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        KC_RBRC, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        BACKLIT, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Raise
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |   0     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp | Bksp |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |   $      |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |   "|"      |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   =       |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |    \      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * | Brite  |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_RAISE] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        KC_DLR, KC_4, KC_5, KC_6, KC_DOT, KC_PLUS, KC_DOT, KC_4, KC_5, KC_6, KC_ASTR, KC_PIPE,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        KC_EQL, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_DOT, KC_1, KC_2, KC_3, KC_SLSH, KC_BSLS,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        BACKLIT, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * | AltTab  |CmdTab|CtlTab| GUI  |Shift |  ~   |Insert| Home |  Up  | End  | Bksp |      |      |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          | Alt  |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L|  Desk_R    |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |Tab_N |Tab_R |iTerm2|           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- *
- * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't
- * seem to work on Mac. Presumably they'll work under Windows.
- */
-
-    [_TOUCHCURSOR] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        ALT_TAB, CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______, _______,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        _______, KC_LALT, KC_SPC, AG_T_C, AG_FIND, AG_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, AG_D_L, AG_D_R,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        _______, AG_UNDO, AG_CUT, AG_COPY, AG_PASTE, KC_GRV, KC_PGDN, KC_DEL, AG_T_N, AG_T_R, CMD_SLSH, _______,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Mouse Layer
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |         |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |      |      |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 |   BTN5     |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-
-    [_MOUSECURSOR] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        _______, _______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______, _______,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        _______, KC_ACL2, KC_BTN2, _______, KC_BTN1, KC_ACL1, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN4, KC_BTN5,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        _______, _______, _______, _______, KC_BTN3, _______, KC_WH_D, KC_BTN1, _______, _______, KC_BTN3, _______,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Plover layer (http://opensteno.org)
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |      #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |         |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |     D       |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * | TogOut    |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |    Z      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * | Exit   |       |   A   |   O   |          |          |    E    |   U    |        |          |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-
-    [_PLOVER] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        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_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, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX),
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-
-    /* Adjust (Lower + Raise)
- * ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
- * |         |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |---------`------`------`------`------`------`------`------`------`------`------`------`------|
- * |          |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|            |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      |      |     |       |      |      |      |      |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |        |       |       |       |          |          |         |        |        |  Reset   |
- *  `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
- */
-    [_ADJUST] = LAYOUT(
-        /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-        /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
-        _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
-        /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        /*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT)
-    /*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/
-};
-
-void persistent_default_layer_set(uint16_t default_layer)
-{
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    switch (keycode)
-    {
-    case QWERTY:
-        if (record->event.pressed)
-        {
-            default_layer_set(1UL << _QWERTY);
-        }
-        return false;
-        break;
-    case COLEMAK:
-        if (record->event.pressed)
-        {
-            default_layer_set(1UL << _COLEMAK);
-        }
-        return false;
-        break;
-    case DVORAK:
-        if (record->event.pressed)
-        {
-            default_layer_set(1UL << _DVORAK);
-        }
-        return false;
-        break;
-    case LOWER:
-        if (record->event.pressed)
-        {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        else
-        {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case RAISE:
-        if (record->event.pressed)
-        {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        else
-        {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case BACKLIT:
-        if (record->event.pressed)
-        {
-            register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-            backlight_step();
-#endif
-        }
-        else
-        {
-            unregister_code(KC_RSFT);
-        }
-        return false;
-        break;
-    case PLOVER:
-        if (record->event.pressed)
-        {
-            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;
-}
-
-/*
- * Macro definition
- */
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    if (!eeconfig_is_enabled())
-    {
-        eeconfig_init();
-    }
-
-    bool use_cmd = true; // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc.
-    // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in:
-    // quantum/quantum.c
-    if (keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1)
-    {
-        use_cmd = false; // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc.
-    }
-
-    switch (id)
-    {
-    case KC_ALT_TAB:
-        if (use_cmd)
-        {
-            return (record->event.pressed ? MACRO(D(LALT), D(TAB), END) : MACRO(U(TAB), END));
-        }
-        else
-        {
-            return (record->event.pressed ? MACRO(D(LGUI), D(TAB), END) : MACRO(U(TAB), END));
-        }
-    case KC_CMD_TAB:
-        if (use_cmd)
-        {
-            return (record->event.pressed ? MACRO(D(LGUI), D(TAB), END) : MACRO(U(TAB), END));
-        }
-        else
-        {
-            return (record->event.pressed ? MACRO(D(LALT), D(TAB), END) : MACRO(U(TAB), END));
-        }
-
-    case KC_CTL_TAB:
-        return (record->event.pressed ? MACRO(D(LCTRL), D(TAB), END) : MACRO(U(TAB), END));
-    case KC_CMD_SLSH:
-        return (record->event.pressed ? MACRO(D(LGUI), D(SLSH), END) : MACRO(U(SLSH), END));
-
-    case KC_AG_FIND:
-        return use_cmd ? MACRODOWN(D(LGUI), T(F), END) : MACRODOWN(D(LCTRL), T(F), END);
-    case KC_AG_AGAIN:
-        return use_cmd ? MACRODOWN(D(LGUI), T(G), END) : MACRODOWN(D(LCTRL), T(G), END);
-    case KC_AG_UNDO:
-        return use_cmd ? MACRODOWN(D(LGUI), T(Z), END) : MACRODOWN(D(LCTRL), T(Z), END);
-    case KC_AG_CUT:
-        return use_cmd ? MACRODOWN(D(LGUI), T(X), END) : MACRODOWN(D(LCTRL), T(X), END);
-    case KC_AG_COPY:
-        return use_cmd ? MACRODOWN(D(LGUI), T(C), END) : MACRODOWN(D(LCTRL), T(C), END);
-    case KC_AG_PASTE:
-        return use_cmd ? MACRODOWN(D(LGUI), T(V), END) : MACRODOWN(D(LCTRL), T(V), END);
-
-    case KC_AG_DESK_L:
-        return use_cmd ? MACRODOWN(D(LGUI), D(LCTRL), T(SCLN), END) : MACRODOWN(D(LALT), D(LCTRL), T(SCLN), END);
-    case KC_AG_DESK_R:
-        return use_cmd ? MACRODOWN(D(LGUI), D(LCTRL), T(QUOT), END) : MACRODOWN(D(LALT), D(LCTRL), T(QUOT), END);
-
-    case KC_AG_TAB_C:
-        return use_cmd ? MACRODOWN(D(LGUI), T(W), END) : MACRODOWN(D(LCTRL), T(W), END);
-    case KC_AG_TAB_N:
-        return use_cmd ? MACRODOWN(D(LGUI), T(T), END) : MACRODOWN(D(LCTRL), T(T), END);
-    case KC_AG_TAB_R:
-        return use_cmd ? MACRODOWN(D(LGUI), D(LSHIFT), T(T), END) : MACRODOWN(D(LCTRL), D(LSHIFT), T(T), END);
-    }
-
-    return MACRO_NONE;
-}
diff --git a/keyboards/jd45/keymaps/jeebak/readme.md b/keyboards/jd45/keymaps/jeebak/readme.md
deleted file mode 100644
index 2165196148..0000000000
--- a/keyboards/jd45/keymaps/jeebak/readme.md
+++ /dev/null
@@ -1,129 +0,0 @@
-jeebak's JD45 layout
-=======================
-NOTE: This is a port of jeebak's planck layout, for jd45.
-
-This WIP keymap attempts to minimize fingers straying away from the home row.
-To aid in this endeavor, when additional modifyer keys to switch layers are
-needed, they will be mapped to home row keys. The `keymap.c` file will contain
-the exact changes. The diagrams in this README shows the highlights of the
-changes from the default mappings.
-
-I also decided to change all calls to `persistent_default_layer_set()` to
-`default_layer_set()` since this is my personal perference.
-
-## Macros
-```
-#define ALT_TAB     M(KC_ALT_TAB)
-```
-
-## Base Layers (Qwerty/Colemak/Dvorak)
-These base layers are mostly the same as the default mappings. The interesting
-changes are shown below.
-
-- The `Ctrl/Esc`, will emit an `Escape` when tapped, and act as a `Control` key when held,
-- `GUI/;` as `;` and `GUI`,
-- `Alt/"` as `"` and `Alt`,
-- `Sft/Ent` as `Enter` and `Shift`, and
-- `Hyper/Tab` as `Tab` and `Hyper`
-
-A `TODO` item is to see if it can also act as a `CapsLock` when double-tapped.
-The arrow keys, which have been moved to the
-[TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been
-replaced with the Media keys as shown. The `MC/kc` key activates the
-`MouseCursor` layer when held, and emits the corresponding `kc` for its layer,
-when tapped.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  | Bksp |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  | Ctrl/Esc |   A  |   S  | MC/D |   F  |   G  |   H  |   J  |   K  |   L  |GUI/; |   Alt/"    |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   Shift   |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Sft/Ent  |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |   RGUI |  Alt  |  GUI  | Lower | TC/Space | TC/Space |  Raise  |  Vol-  |  Vol+  |   Play   |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## Lower Layer (Symbols and Function Keys)
-The symbols and functions keys are essentially the same as the default mapping.
-The most notable changes are that the symbol keys from the `RAISE` layer have
-been moved here. The remaining Media keys replace those that are now on the
-base layers. The `BACKLIT` key has also been moved here.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |   ~     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      | Bksp |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |   [      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |   "|"      |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   ]       |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |    \      |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  | Brite  |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## Raise Layer (Numbers and Arithmetic Operators)
-All of the numbers and arithmetic operators are available on this layer. Some
-keys are duplicated for the convenience of their positions. The `0` and `$`
-keys at the far left are for quick access to beginning and end of line in vim.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |   0     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      | Bksp |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |   $      |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |   "|"      |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   =       |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |    \      |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  | Brite  |       |       |       |          |          |         |  Prev  |  Next  |   Mute   |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## TouchCursor layer plus personal customizations
-[TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key
-as the modifier, with the `IJKL` home row keys representing the inverted-T of
-the arrow keys. All of the default TouchCursor keymappings for the right hand
-are represented below. My personalizations include all of the keys shown for
-the left hand. Having the `Alt` and `Shift` keys (as well as the `Control` key
-from the base layers) readily accessible from the home row allows quick word
-jumps and highlighting when used in conjunction with the arrow keys. The
-`Alt-Tab` macro is not only useful under Windows, but also under Mac when used
-with alternative switchers like [HyperSwitch](https://bahoom.com/hyperswitch).
-The `Cmd-Tab` and `Ctrl-Tab` sequences are duplicated for easy access while in
-this layer. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and `KC_AGAIN`
-keycodes do not seem to work. There are macros in place that'll "automatically"
-choose the correct version (`Cmd-Tab` vs. `Alt-Tab`, `Cmd-C` vs. `Ctrl-C`,
-etc.) depending on which layout you've currently selected (`AG_NORM` or
-`AG_SWAP`) in the `_ADJUST` layer. The `Desk_L` and `Desk_R` macros are what I
-use to switch between Virtual Desktops Left/Right. The `Tab_C`, `Tab_N` and
-`Tab_R` are for "Close Tab," "New Tab" and "Reopen Closed Tab" for apps such as
-Google Chrome.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  | AltTab  |CmdTab|CtlTab| GUI  |Shift |  ~   |Insert| Home |  Up  | End  | Bksp |      |      |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |          | Alt  |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L|  Desk_R    |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |           | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |Tab_N |Tab_R |iTerm2|           |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |        |       |       |       |          |          |         |        |        |          |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
-
-## Mouse Layer
-The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer.
-The `D` key (on QWERTY) is used to activate this layer. All 16 keycodes for the
-mouse from the `doc/keycode.txt` file are represented, and logically located,
-IMHO. The left and right click buttons are duplicated; on the right hand side,
-for a quick click here and there, and again on the left hand side for when the
-buttons need to be held for dragging things or highlighting text, thus allowing
-the right hand to be free to use the up/down/left/right actions.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+------+------.
-  |         |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |      |      |
-  |---------`------`------`------`------`------`------`------`------`------`------`------`------|
-  |          |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 |   BTN5     |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |           |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |           |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |        |       |       |       |          |          |         |        |        |          |
-   `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
-```
diff --git a/keyboards/kc60/keymaps/workman-dead/keymap.c b/keyboards/kc60/keymaps/workman-dead/keymap.c
deleted file mode 100644
index 6c3560d393..0000000000
--- a/keyboards/kc60/keymaps/workman-dead/keymap.c
+++ /dev/null
@@ -1,180 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _WM 0
-#define _QW 1
-#define _DK 2
-#define _FUN 3
-#define _MS 4
-
-#define _DK_ACT 0
-#define _DK_REL 1
-#define _KC_COMS 2
-#define _KC_CENT 3
-
-#define DK_ACT  M(_DK_ACT)       // activate dead key layer
-#define DK_REL  M(_DK_REL)       // release dead key layer
-#define KC_COMS M(_KC_COMS)      // comma + space
-#define KC_CENT M(_KC_CENT)      // comma + enter
-#define KC_TABM LT(_MS, KC_TAB)  // press for tab, hold for mouse layer
-#define KC_SPFN LT(_FUN, KC_SPC) // press for space, hold for function layer (aka spacefn)
-#define KC_DFQW DF(_QW)          // set default layer to qwerty
-#define KC_DFWM DF(_WM)          // set default layer to workman
-#define KC_CMDQ LGUI(KC_Q)       // command + q
-#define KC_CMDD LGUI(KC_D)       // command + d
-#define KC_CMDA LGUI(KC_A)       // command + a
-#define KC_CMDS LGUI(KC_S)       // command + s
-#define KC_CMDZ LGUI(KC_Z)       // command + z
-#define KC_CMDX LGUI(KC_X)       // command + x
-#define KC_CMDC LGUI(KC_C)       // command + c
-#define KC_CMDV LGUI(KC_V)       // command + v
-#define KC_CSTB S(RCTL(KC_TAB))  // shift + control + tab
-#define KC_C_TB RCTL(KC_TAB)     // control + tab
-#define KC_C_LF RCTL(KC_LEFT)    // control + left
-#define KC_C_RT RCTL(KC_RGHT)    // control + right
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// Workman
-/*
-* ,-----------------------------------------------------------.
-* |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Bsp   |
-* |-----------------------------------------------------------|
-* |Tab/M|  Q|  D|  R|  W|  B|  J|  F|  U|  P|  ;|  [|  ]|  \  |
-* |-----------------------------------------------------------|
-* |Ctrl  |  A|  S|  H|  T|  G|  Y|  N|  E|  O|  I|  '| Return |
-* |-----------------------------------------------------------|
-* |Shift   |  Z|  X|  M|  C|  V|  K|  L|  ,|  .|  /| Shift    |
-* |-----------------------------------------------------------|
-* |Ctrl | Alt | GUI |  Space/FN   | Alt | GUI | Ctrl | qwerty |
-* `-----------------------------------------------------------'
-*/
-[_WM] = LAYOUT( /* Workman */
-  KC_ESC,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
-  KC_TABM,          KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, \
-  KC_LCTL,          KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT, _______, KC_ENT,  \
-  KC_LSFT, _______, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    DK_ACT,  KC_DOT,  KC_SLSH,          _______, KC_RSFT, \
-  KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPFN,          _______, KC_RALT, KC_RGUI, KC_RCTL, KC_DFQW),
-
-// QWERTY
-/*
-* ,-----------------------------------------------------------.
-* |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Bsp   |
-* |-----------------------------------------------------------|
-* |Tab/M|  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-* |-----------------------------------------------------------|
-* |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return |
-* |-----------------------------------------------------------|
-* |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shift    |
-* |-----------------------------------------------------------|
-* |Ctrl | Alt | GUI |  Space/FN  | Alt | GUI | Ctrl | workman |
-* `-----------------------------------------------------------'
-*/
-[_QW] = LAYOUT( /* QWERTY */
-  KC_ESC,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
-  KC_TABM,          KC_Q,    KC_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,    DK_ACT,  KC_DOT,  KC_SLSH,          _______, KC_RSFT, \
-  KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPFN,          _______, KC_RALT, KC_RGUI, KC_RCTL, KC_DFWM),
-
-// dead key layer
-/*
-* ,-----------------------------------------------------------.
-* |    |  |   |   |   |   |   |   |   |   |   |   |   | Bsp   |
-* |-----------------------------------------------------------|
-* |     |  %|  &|  ?|  +|  @|  $|  _|  [|  ]|  !|   ~|  ^|    |
-* |-----------------------------------------------------------|
-* |      |  #|  (|  =|  0|  {|  }|  1|  *|  )|  -|  `| Return |
-* |-----------------------------------------------------------|
-* |        |  6|  7|  8|  9|  ||  \|  2|  3|  4|  5|          |
-* |-----------------------------------------------------------|
-* |Ctrl | Alt | GUI |       ,       | Alt | GUI | Ctrl |      |
-* `-----------------------------------------------------------'
-*/
-[_DK] = LAYOUT( /* dead key layer */
-  XXXXXXX,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, \
-  XXXXXXX,          KC_PERC, KC_AMPR, KC_QUES, KC_PLUS, KC_AT,   KC_DLR,  KC_UNDS, KC_LBRC, KC_RBRC, KC_EXLM, KC_TILD, KC_CIRC, _______, \
-  _______,          KC_HASH, KC_LPRN, KC_EQL,  KC_0,    KC_LCBR, KC_RCBR, KC_1,    KC_ASTR, KC_RPRN, KC_MINS, KC_GRV,  _______, KC_CENT, \
-  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_PIPE, KC_BSLS, KC_2,    DK_REL,  KC_4,    KC_5,             _______, _______, \
-  KC_LCTL, KC_LALT, KC_LGUI,                   KC_COMS,          _______, KC_RALT, KC_RGUI, KC_RCTL, _______),
-
-// function layer
-/*
-* ,-----------------------------------------------------------.
-* |   | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|Del |
-* |-----------------------------------------------------------|
-* |Esc  | Cq| Cd|cstb|ctb|   |   |pgd| up|pgu|   |   |   |ins |
-* |-----------------------------------------------------------|
-* |Shift | Ca| Cs|clt|crt|   |   | lt| dw| rt|home|end| Bsp   |
-* |-----------------------------------------------------------|
-* |Shift  | Cz|  Cx|   | Cc| Cv| V-| V+|mute|   |   |         |
-* |-----------------------------------------------------------|
-* |Ctrl | Alt | GUI |              | Alt | GUI | Ctrl | Reset |
-* `-----------------------------------------------------------'
-*/
-[_FUN] = LAYOUT( /* function layer */
-  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_ESC,           KC_CMDQ, KC_CMDD, KC_CSTB, KC_C_TB, _______, _______, KC_PGDN, KC_UP,   KC_PGUP, _______, _______, _______, KC_INS,  \
-  KC_LSFT,          KC_CMDA, KC_CMDS, KC_C_LF, KC_C_RT, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_END,  _______, KC_BSPC, \
-  KC_LSFT, _______, KC_CMDZ, KC_CMDX, _______, KC_CMDC, KC_CMDV, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          _______, _______, \
-  KC_LCTL, KC_LALT, KC_LGUI,                   KC_TRNS,          _______, KC_RALT, KC_RGUI, KC_RCTL, QK_BOOT),
-
-// mouse layer
-/*
-* ,-----------------------------------------------------------.
-* |    |  |   |   |   |   |   |   |   |   |   |   |   |       |
-* |-----------------------------------------------------------|
-* |    |fast|med|slow|   |   |   |   | up|   |   |   |   |    |
-* |-----------------------------------------------------------|
-* |      |   |   |   |   |   |   | lt| dw| rt| rc|   |        |
-* |-----------------------------------------------------------|
-* |        |   |   |   |   |   |   |   |   |   |   |          |
-* |-----------------------------------------------------------|
-* |     |     |     |      lc       |     |     |      |      |
-* `-----------------------------------------------------------'
-*/
-[_MS] = LAYOUT( /* mouse layer */
-  XXXXXXX,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  XXXXXXX,          KC_ACL2, KC_ACL1, KC_ACL0, _______, _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, \
-  _______,          _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______, _______, _______, \
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______,                   KC_BTN1,          _______, _______, _______, _______, _______),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
-    case _KC_COMS:
-      if (record->event.pressed) {
-        return MACRO(T(COMM), T(SPC), END); // comma + space
-      }
-      break;
-    case _KC_CENT:
-      if (record->event.pressed) {
-        return MACRO(T(COMM), T(ENT), END); // comma + enter
-      }
-      break;
-    case _DK_ACT:
-      if (record->event.pressed) {
-        if (keyboard_report->mods & MOD_BIT(KC_LSFT) || keyboard_report->mods & MOD_BIT(KC_RSFT)) { // act as comma when shift is pressed (eg <)
-          register_code(KC_COMM);
-        } else { // activate oneshot dead key layer otherwise
-          layer_on(_DK);
-          set_oneshot_layer(_DK, ONESHOT_START);
-        }
-      } else { // make sure to deactive dead key layer on key release
-        clear_oneshot_layer_state(ONESHOT_PRESSED);
-        unregister_code(KC_COMM);
-      }
-      break;
-    case _DK_REL:
-      if (record->event.pressed) { // act as 3 on keypress
-        register_code(KC_3);
-      } else { // make sure to deactive dead key layer on key release
-        clear_oneshot_layer_state(ONESHOT_PRESSED);
-        unregister_code(KC_3);
-      }
-      break;
-  }
-
-  return MACRO_NONE;
-};
diff --git a/keyboards/kc60/keymaps/workman-dead/readme.md b/keyboards/kc60/keymaps/workman-dead/readme.md
deleted file mode 100644
index 7b4f543f77..0000000000
--- a/keyboards/kc60/keymaps/workman-dead/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Workman dead with spacefn (kc60 @ QMK)
-
-## Layout reference
-![workman dead with spacefn](http://imgur.com/Ep8gePQ)
-
-## Build
-
-To build this keymap, simply run `make KEYMAP=workman-dead`.
-
-## Notes
-
-* the default layout is `workman` (try it out, it's awesome!), but it can be changed to `qwerty` with the `rebel` key (the function layer won't change though)
-* `comma` acts as a dead key, that means tapping/holding it will activate the **oneshot** `dead key` layer (marked red in the reference)
-* hold `space` to access the `function` layer (marked blue in the reference)
-* hold `tab` to activate the mouse layer
-* the `function` layer contains mostly osx specific shortcuts
-* on the right side of the bottom row `alt` and `super` are switched compared to a standard layout
diff --git a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
deleted file mode 100644
index 786e107f9c..0000000000
--- a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
- #define PERMISSIVE_HOLD
-
-#endif
diff --git a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c b/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
deleted file mode 100644
index 455964ac39..0000000000
--- a/keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include "action_layer.h"
-
-
-
-#define _BASE 0
-#define _QWERTY 1
-#define _RAISE 2
-#define _NAVIGATION 3
-
-//Switch Layouts
-#define SWBASE M(_BASE)
-#define SWQWERTY M(_QWERTY)
-
-// layer access
-#define RSESPC LT( 2, KC_SPC)
-#define NAVSPC LT( 3, KC_SPC)
-
-// Key Combos
-#define CTRLSFT LCTL(KC_LSFT)
-#define CTLALTSFT LALT(LCTL(KC_LSFT))
-#define CTLALTDEL LALT(LCTL(KC_DEL))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_BASE] = LAYOUT( \
-    CTLALTSFT,  KC_F1,    KC_F2,    KC_F3,   KC_F4,    KC_F5,         KC_F6,          KC_F7,            KC_F8,        KC_F9,          KC_F10,     KC_F11,             KC_F12,  KC_PSCREEN,  KC_PAUSE,   KC_CAPS,    KC_INSERT,      KC_EQL,     \
-    KC_GRV,     KC_1,     KC_2,     KC_3,    KC_4,     KC_5,          KC_HOME,        KC_NUM,           KC_KP_SLASH,  KC_KP_ASTERISK, KC_LBRC,    KC_RBRC,              KC_6,    KC_7,        KC_8,       KC_9,       KC_0,           KC_MINS,   \
-    KC_TAB,     KC_Q,     KC_W,     KC_F,    KC_P,     KC_G,          KC_END,         KC_P7,            KC_P8,        KC_P9,          KC_PMNS,    KC_PGUP,              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_DEL,         KC_P4,            KC_P5,        KC_P6,          KC_PPLS,    KC_PGDN,              KC_H,    KC_N,        KC_E,       KC_I,       KC_O,           KC_QUOT,          \
-    KC_LSFT,    KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,          SFT_T(KC_ENT),  KC_P1,            KC_P2,        KC_P3,          KC_UP,      KC_BSLASH,            KC_K,    KC_M,        KC_COMM,    KC_DOT,     KC_SLSH,        SFT_T(KC_ENT),      \
-    KC_LCTL,    CTRLSFT,  KC_LGUI,  KC_LALT, RSESPC,   NAVSPC,        KC_LCTL,        KC_P0,            KC_PDOT,      KC_LEFT,        KC_DOWN,    KC_RGHT,              NAVSPC,  RSESPC,      KC_RALT,    KC_RGUI,    KC_APPLICATION, KC_RCTL       \
-),
-[_QWERTY] = LAYOUT( \
-    CTLALTSFT,  KC_F1,    KC_F2,    KC_F3,   KC_F4,    KC_F5,         KC_F6,          KC_F7,            KC_F8,        KC_F9,          KC_F10,     KC_F11,               KC_F12,  KC_PSCREEN,  KC_PAUSE,   KC_CAPS,    KC_INSERT,      KC_EQL,     \
-    KC_GRV,     KC_1,     KC_2,     KC_3,    KC_4,     KC_5,          KC_HOME,        KC_NUM,           KC_KP_SLASH,  KC_KP_ASTERISK, KC_LBRC,    KC_RBRC,              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_END,         KC_P7,            KC_P8,        KC_P9,          KC_PMNS,    KC_PGUP,              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_DEL,         KC_P4,            KC_P5,        KC_P6,          KC_PPLS,    KC_PGDN,              KC_H,    KC_J,        KC_K,       KC_L,       KC_SCLN,           KC_QUOT,          \
-    KC_LSFT,    KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,          SFT_T(KC_ENT),  KC_P1,            KC_P2,        KC_P3,          KC_UP,      KC_BSLASH,            KC_N,    KC_M,        KC_COMM,    KC_DOT,     KC_SLSH,        SFT_T(KC_ENT),      \
-    KC_LCTL,    CTRLSFT,  KC_LGUI,  KC_LALT, RSESPC,   NAVSPC,        KC_LCTL,        KC_P0,            KC_PDOT,      KC_LEFT,        KC_DOWN,    KC_RGHT,              NAVSPC,  RSESPC,      KC_RALT,    KC_RGUI,    KC_APPLICATION, KC_RCTL       \
-),
-[_RAISE] = LAYOUT( \
-    CTLALTDEL,  SWBASE,     SWQWERTY,   XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,      XXXXXXX,    XXXXXXX,    XXXXXXX,   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_EXLM,    KC_AT,      KC_HASH,    KC_DLR,         KC_PERC,    XXXXXXX,      XXXXXXX,    XXXXXXX,    XXXXXXX,   _______,    LCTL(KC_PGUP),             KC_CIRC,    KC_AMPR,    KC_ASTR,    KC_LPRN,    KC_RPRN,    _______,        \
-    KC_DEL,     KC_1,       KC_2,       KC_3,       KC_4,           KC_5,       XXXXXXX,      XXXXXXX,    XXXXXXX,    XXXXXXX,   _______,    LCTL(KC_PGDN),             KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       _______,      \
-    _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,    _______,      XXXXXXX,    XXXXXXX,    XXXXXXX,   _______,    LSFT(KC_BSLASH),           XXXXXXX,    _______,    _______,    _______,    _______,    _______,    \
-    _______,    _______,    _______,    _______,    _______,        _______,    _______,      _______,    _______,    _______,   _______,    _______,                   _______,    _______,    _______,    _______,    _______,    _______    \
-),
-[_NAVIGATION] = LAYOUT( \
-    CTLALTDEL,  SWBASE,     SWQWERTY,   XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,      XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,   XXXXXXX,                   XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        \
-    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,      XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,   XXXXXXX,                   XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    _______,        \
-    _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,      XXXXXXX,    XXXXXXX,    XXXXXXX,    _______,   LCTL(KC_PGUP),             XXXXXXX,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     _______,       \
-    KC_DEL,     _______,    XXXXXXX,    KC_LSFT,    KC_LCTL,        XXXXXXX,    XXXXXXX,      XXXXXXX,    XXXXXXX,    XXXXXXX,    _______,   LCTL(KC_PGDN),             XXXXXXX,    KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   _______,        \
-    _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,    _______,      XXXXXXX,    XXXXXXX,    XXXXXXX,    _______,   LSFT(KC_BSLASH),           XXXXXXX,    XXXXXXX,    _______,    _______,    _______,    _______,        \
-    _______,    _______,    _______,    _______,    _______,        _______,    _______,      _______,    _______,    _______,    _______,   _______,                   _______,    _______,    _______,    _______,    _______,    _______      \
-)
-
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case _BASE:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_BASE);
-          }
-          break;
-        case _QWERTY:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md b/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
deleted file mode 100644
index 86d764818b..0000000000
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/README.md
+++ /dev/null
@@ -1,184 +0,0 @@
-Copyright 2017 James Morgan <ja.morgan1@outlook.com>
-
-#MogranJM's Nyquist layout
-
-```
-make nyquist/rev1:DivergeJM
-```
-
-This keymap is based on my Terminus_Mini (../../../terminus\_mini/default) layout (credit for the names of these layouts goes to UniKeyboard & reddit's /u/blahlicus)
-
-The terminus_mini is a handwired 4x12 ortholinear keyboard with two 2U thumb bar keys. This implementation of the layout converts it to a split 5x12 (two halves, each 5x6) keyboard with a 2U thumb key on the inner bottom corner of each half. 
-
-The TERMINUS\_MINI layout (../../../terminus_mini/terminus_mini.h) is handwired and the 2U keys are handled using KC_NO to detail that two columns do not have a 4th column. This layout is based on a PCB, so the keymap represents the 2U keys as duplicates of the same 1U key.
-
-```
-.----------------------------------------.     .-----------------------------------------. 
-| Esc |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  | Del  | 
-|-----+------+------+------+------+------|     |------+------+------+------+------+------| 
-| Tab |   Q  |   W  |   F  |   P  |   G  |     |   J  |   L  |   U  |   Y  |   ;  |  \\  | 
-|-----+------+------+------+------+------|     |------+------+------+------+------+------| 
-| BS  |   A  |   R  |   S  |   T  |   D  |     |   H  |   N  |   E  |   I  |   O  |  '   | 
-|-----+------+------+------+------+------|     |------+------+------+------+------+------| 
-| LSPO|   Z  |   X  |   C  |   V  |   B  |     |   K  |   M  |   ,  |  \.  |   /  | RSPC | 
-|-----+------+------+------+------+------|     |------+------+------+------+------+------| 
-| Ctrl| LGUI | LAlt | Lower| Space/Lower |     | Enter/Raise |  Fn  | Mouse| Menu | Ctrl | 
-'----------------------------------------'     '-----------------------------------------' 
-```
-
-### Base Layer - Colemak
-The base layout is Colemak by default. Since the CapsLock key is replaced with BackSpace, this layout has the delete key in the traditional backspace location. 
-
-* QWERTY and Dvorak layers are accessible via the Adjust layer using the standard case switch macro as defined in the default Planck keymap.
-* I've implemented COLEMAK = SAFE\_RANGE when enumerating the custom\_keycodes, but I don't actually know what this does...
-* Space cadet is implemented in the shift keys (hold for shift, tap for respective parentheses)
-* I never find myself using the right-modifiers on a standard keyboard, so I've only implemented LGUI and LALT. I have intentions of improving my use of the ctrl key in correct hand alternation, so CTRL is implemented in both outside corners of the home row.
-
-### Alternate Base Layers - QWERTY & Dvorak
-```
-QWERTY
- .----------------------------------------.     .-----------------------------------------.
- | Esc |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  | Del  |
- |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- | Tab |   Q  |   W  |   E  |   R  |   T  |     |   Y  |   U  |   I  |   O  |   P  |  \   |
- |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- | BS  |   A  |   S  |   D  |   F  |   G  |     |   H  |   J  |   K  |   L  |   ;  |  "   |
- |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- | LSPO|   Z  |   X  |   C  |   V  |   B  |     |   N  |   M  |   ,  |   .  |   /  | RSPC |
- |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- | Ctrl| LGUI | Lower| LAlt |    SpaceLW  |     |    RSEnter  |  Fn  | Mouse| Menu | Ctrl |
- `----------------------------------------'     '-----------------------------------------'
-
-DVORAK
- .----------------------------------------.     .-----------------------------------------.
- | Esc  |   1  |   2  |   3  |   4  |   5 |     |   6  |   7  |   8  |   9  |   0  | Del  |
- |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- | Tab  |   "  |   ,  |   .  |   P  |   Y |     |   F  |   G  |   C  |   R  |   L  |  \   |
- |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- |  BS  |   A  |   O  |   E  |   U  |   I |     |   D  |   H  |   T  |   N  |   S  |  /   |
- |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- | LSPO |   ;  |   Q  |   J  |   K  |   X |     |   B  |   M  |   W  |   V  |   Z  | RSPC |
- |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- | Ctrl | LGUI | Lower| LAlt |   SpaceLW  |     |   RSEnter   |  Fn  | Mouse| Menu | Ctrl |
- `----------------------------------------'     '-----------------------------------------'
-```
-
-#### Layer Shifting
-* The 4th key on the bottom row of the left hand PCB is used to access the *LOWER* layer via Tap/Toggle
-* The left 2U key is a **TAP_KEY** macro - Hold for momentary *LOWER* layer, Tap for Space.
-* The right 2U key is a **TAP_KEY** macro - Hold for momentary *RAISE* layer, Tap for Enter
-* The 2nd key on the bottom row of the right hand PCB is a **LAYER_MOMENTARY** for the *FUNCTION* layer
-* The 3rd key on the bottom row of the right hand PCB is a **TAP_TOGGLE** macro for the *MOUSE* layer
-
-The base layout is Colemak. Since the CapsLock key is replaced with BackSpace, this layout has the delete key in the traditional backspace location. 
-
-* QWERTY and Dvorak layers have been removed from the keymap that was initially developed from the default Planck keymap.
-* I've implemented COLEMAK = SAFE\_RANGE when enumerating the custom\_keycodes, but I don't actually know what this does...
-
-* Space cadet is implemented in the shift keys (hold for shift, tap for respective parentheses)
-* I never find myself using the right-modifiers on a standard keyboard, so I've only implemented LGUI and LALT. I have intentions of improving my use of the ctrl key in correct hand alternation, so CTRL is implemented in both outside corners of the home row.
-
-### LOWER - Numpad & Navigation keys
-```
- ,-----------------------------------------.    .-----------------------------------------. 
- |  Esc |      |      |      |      |      |    |   =  |   /  |   \* |  \-  |      | Del  | 
- |------+------+------+------+------+------|    |------+------+------+------+------+------| 
- |  Tab | PgUp | Home |  Up  |  End |      |    |   7  |   8  |   9  |  \+  |      |  \\  | 
- |------+------+------+------+------+------|    |------+------+------+------+------+------| 
- |  BS  | PgDn | Left | Down |Right |      |    |   4  |   5  |   6  | Enter|      |   '  | 
- |------+------+------+------+------+------|    |------+------+------+------+------+------| 
- | LSPO |   Z  |   X  |   C  |   V  |      |    |   1  |   2  |   3  | Enter|      | RSPC | 
- |------+------+------+------+-------------|    |-------------+------+------+------+------| 
- | Ctrl | LGUI | Alt  | LOWER| Space/Lower |    |      0      |  \.  |  Fn  |ADJUST| Ctrl | 
- `-----------------------------------------'    `-----------------------------------------' 
-```
-The *LOWER* layer contains a navigation cluster on the left hand and a numpad on the right. This layer is momentary when the left thumb-bar or LOWER key is held and toggled on/off when the LOWER key is tapped.
-
-The Navigation cluster is offset to the right compared to the traditional **WASD** nav cluster. With this implementation, you don't need to move your hand from the home position when navigating. Page Up & Down keys are found on the far left of the cluster.
-
-All unused (blank on the above keymap) keys are locked out using the XXXXXXX filler (KC_NO), all modifiers (edge |_| keys \[except 0, \. & Fn\] on the 
-above keymap) and the ZXCV cluster are transparent (_______) to the Base layer.
-
-The ADJUST layer can be accessed via the second from right key on the bottom row. This layer contains a keymap that is used to change the base layer.
-
-[] TO DO!! - It would be nice to have a **TAP_DANCE_DOUBLE** implementation whereby a double tap of the right 2U key sends KC_PENT
-* Couldn't get this to work in Rev1, produced an error in the Make process.
-* When this is done, I can remove the clunky double Enter on the 4th column of the right hand PCB (numpad enter).
-
-### RAISE - Symbol Layer
-```
- ,-----------------------------------.     .-----------------------------------.
- | Esc |  1  |  2  |  3  |  4  |  5  |     |  6  |  7  |  8  |  9  |  0  | Del |
- |-----+-----+-----+-----+-----+-----|     |-----+-----+-----+-----+-----+-----|
- | Tab |  !  |  @  |  #  |  $  |  %  |     |  ^  |  &  |  *  |  -  |  +  |  \  |
- |-----+-----+-----+-----+-----+-----|     |-----+-----+-----+-----+-----+-----|
- | BS  |     |     |     |     |     |     |     |     |     |     |     |  '  |
- |-----+-----+-----+-----+-----------|     |-----+-----+-----+-----+-----+-----|
- | LSPO|  <- | %>% |  {  |  [  |  `  |     |  |  |  ]  |  }  |  .  |  ?  |RSPC |
- |-----+-----+-----+-----+-----+-----|     |-----+-----+-----+-----+-----+-----|
- | Ctrl|LGUI | Alt |     |Space/Lower|     |Enter/Raise|  Fn |Mouse| Menu| Ctrl|
- '-----------------------------------'     '-----------------------------------'
-```
-The *RAISE* layer contains the symbols. This layer is momentary when the right thumb bar is held.
-
-* Standard symbols can be found on the row above home, in the traditional number row order as they occur on a standard keyboard.
-* Shifted symbols can be found on the second-from bottom row, above the bars - these include brackets, braces, grave and pipe keys.
-	* At this stage, you need to shift to get to the Tilde key. I'd like to remove the shift requirement as I've done with the "|" Pipe, but we'll see. 
-	* Special operators for R (Pointer: <- and dplyr pipe: %>%) can be found next to the left shift key
-* The bottom row of this layer is a replication of that of the Base layer, except that the **TAP_TOGGLE** *LOWER* key is blocked with **XXXXXXX**.
-
-### FUNCTION - Function & Media keys
-```
-,-----------------------------------------.     .-----------------------------------------.
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |     |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|------+------+------+------+------+------|     |------+------+------+------+------+------|
-| Esc  | Mute | Vol- | Vol+ |      | 	  |     |      |      |      |      |      | Ins  |
-|------+------+------+------+------+------|     |------+------+------+------+------+------|
-| Caps | Stop | |<<  | >/|| |  >>| |      |     |      |      |      |      |      |PrtSc |
-|------+------+------+------+------+------|     |------+------+------+------+------+------|
-| LSOB |      |      |      |      |      |     |      |      |      |      |      |ScrLk |
-|------+------+------+------+------+------|     |------+------+------+------+------+------|
-| Ctrl | LGUI | Alt  |      | Space/Lower |     | Enter/Raise |  Fn  | Mouse|      |PsBrk |
-'-----------------------------------------'     '-----------------------------------------'
-```
-The *FUNCTION* layer contains media keys as well as the F-row. This layer is momentary and requires Fn to be held.
-
-* The media cluster is based on the nav cluster in the *LOWER* layer, with RW, PP & FF in the Left, Down & Right positions.
-* Mute, and Vol +/- are next to each other in ascending (L->R) volume order, Stop is below Mute.
-* Insert, Print Screen, Scroll Lock & Pause Break are all implemented on the far right column. I don't really use these keys so their position is not optimised.
-* Caps lock is implemented on this layer, in the traditional position, in place of BackSpace on the Base layer.
-
-### MOUSE - Mouse keys: The functionality of this layer is not as optimal as using a true mouse, generally slower but will work in a pinch.
-```
- ,----------------------------------------.     .----------------------------------------. 
- |  Esc |      |      |      |      |     |     |     |      |      |      |      |  Del | 
- |------+------+------+------+------+-----|     |-----+------+------+------+------+------| 
- |  Tab | WhlU | WhlL | MsUp | WhlR |     |     |     |  M3  |  M4  |  M5  |      |      | 
- |------+------+------+------+------+-----|     |-----+------+------+------+------+------| 
- |      | WhlD | MsL  | MsDn | MsR  |     |     |     |LClick|RClick|      |      |      | 
- |------+------+------+------+------+-----|     |-----+------+------+------+------+------| 
- | LSPO |      |      |      |      |     |     |     |      |      |      |      | RSCB | 
- |------+------+------+------+------+-----|     |-----+------+------+------+------+------| 
- | Ctrl |      |      |      |Sensitivity |     | Sensitivity|      |MOUSE |      | Ctrl | 
- '----------------------------------------'     '----------------------------------------'
- ```
-The *MOUSE* layer contains keys replicating functions found on the mouse. 
-
-* The navigation cluster (Up, Down, Left, Right) is a replication of the Navigation cluster on the *LOWER* layer. The scroll keys are analagous to the Page Up & down keys.
-* The primary click (right & left) buttons are on the right home row (index & middle fingers)
-* Secondary click buttons are above the standard keys (M3/Wheel click, M4, M5) but I do not use this function.
-
-### ADJUST - Keyboard Settings: Primarily used to change the base layer at this stage
-```
-,-----------------------------------------.     ,----------------------------------------.
-|      |      |      |      |      |RESET |     |     |      |      |      |      |      |
-|------+------+------+------+------+------|     |-----+------+------+------+------+------|
-|      |      |      |      |      |      |     |     |      |      |      |      |  Del |
-|------+------+------+------+------+------|     |-----+------+------+------+------+------|
-|      |      |      |      |      |      |     |     |Qwerty|Colemk|Dvorak|      |      |
-|------+------+------+------+------+------|     |-----+------+------+------+------+------|
-|      |      |      |      |      |      |     |     |      |      |      |      |      |
-|------+------+------+------+------+------|     |-----+------+------+------+------+------|
-|      |      |/LOWER|      |             |     |            |      |      |/RAISE|      |
-`-----------------------------------------'     `----------------------------------------'
-```
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h b/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
deleted file mode 100644
index 43696b046c..0000000000
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2017 James Morgan <ja.morgan1@outlook.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#define TAPPING_TERM 150 //reduce time required to register a held key
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c b/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
deleted file mode 100644
index 5cf639775e..0000000000
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/keymap.c
+++ /dev/null
@@ -1,303 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum custom_layers {
-  _COLEMAK,
-  _QWERTY,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _FUNCTION,
-  _MOUSE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  DVORAK,
-  LOWER,
-  RAISE,
-  FUNCTION,
-  MOUSE,
-  ADJUST
-};
-
-enum custom_macros {
-  R_PIPE,
-  R_POINT
-};
-/*
-// Tap Dance Declarations
-enum {
-  TD_ZERO_ENT = 0
-};
-
-// Tap Dance Definitions
-  qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ZERO_ENT]  = ACTION_TAP_DANCE_DOUBLE(KC_0, KC_ENT)
-};
-*/
-#define SPC_LW LT(_LOWER, KC_SPC)
-#define ENT_RS LT(_RAISE, KC_ENT)
-#define FNC MO(_FUNCTION)
-#define MSE MO(_MOUSE)
-#define PIPE M(R_PIPE)
-#define POINT M(R_POINT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * .----------------------------------------.     .-----------------------------------------.
- * | Esc |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  | Del  |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Tab |   Q  |   W  |   F  |   P  |   G  |     |   J  |   L  |   U  |   Y  |   ;  |   \  |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | BS  |   A  |   R  |   S  |   T  |   D  |     |   H  |   N  |   E  |   I  |   O  |   "  |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | LSPO|   Z  |   X  |   C  |   V  |   B  |     |   K  |   M  |   ,  |   .  |   /  | RSPC |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Ctrl| LGUI | Lower| LAlt | Space/Lower |     | Enter/Raise |  Fn  | Mouse| Menu | Ctrl |
- * `----------------------------------------'     `-----------------------------------------'
- */
-[_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_DEL,  \
-  KC_TAB,  KC_Q,    KC_W,   KC_F,    KC_P,   KC_G,    KC_J,   KC_L,    KC_U,      KC_Y,    KC_SCLN, KC_BSLS, \
-  KC_BSPC, KC_A,    KC_R,   KC_S,    KC_T,   KC_D,    KC_H,   KC_N,    KC_E,      KC_I,    KC_O,    KC_QUOT, \
-  KC_LSPO, KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,    KC_K,   KC_M,    KC_COMM,   KC_DOT,  KC_SLSH, KC_RSPC, \
-  KC_LCTL, KC_LGUI, LOWER,  KC_LALT, SPC_LW, SPC_LW,  ENT_RS, ENT_RS,  FNC,       MSE,     KC_APP,  KC_RCTL  \
-  ),
-
-/* QWERTY -
- * .----------------------------------------.     .-----------------------------------------.
- * | Esc |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  | Del  |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Tab |   Q  |   W  |   E  |   R  |   T  |     |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | BS  |   A  |   S  |   D  |   F  |   G  |     |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | LSPO|   Z  |   X  |   C  |   V  |   B  |     |   N  |   M  |   ,  |   .  |   /  | RSPC |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Ctrl| LGUI | Lower| LAlt | Space/Lower |     | Enter/Raise |  Fn  | Mouse| Menu | Ctrl |
- * `----------------------------------------'     '-----------------------------------------'
- */
-
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,    KC_0,    KC_DEL,  \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,    KC_P,    KC_BSLS, \
-  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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,  KC_SLSH, KC_RSPC, \
-  KC_LCTL, KC_LGUI, LOWER,   KC_LALT, SPC_LW,  SPC_LW,  ENT_RS,  ENT_RS,  FNC,       MSE,     KC_APP,  KC_RCTL \
-  ),
-
-/* Dvorak
- * .----------------------------------------.     .-----------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5 |     |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y |     |   F  |   G  |   C  |   R  |   L  |  \   |
- * |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- * |  BS  |   A  |   O  |   E  |   U  |   I |     |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- * | LSPO |   ;  |   Q  |   J  |   K  |   X |     |   B  |   M  |   W  |   V  |   Z  | RSPC |
- * |------+------+------+------+------+-----|     |------+------+------+------+------+------|
- * | Ctrl | LGUI | Lower| LAlt | Space/Lower|     | Enter/Raise |  Fn  | Mouse| Menu | Ctrl |
- * `----------------------------------------'     '-----------------------------------------'
- */
-
-[_DVORAK] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSLS, \
-  KC_BSPC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
-  KC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC, \
-  KC_LCTL, KC_LGUI, LOWER,   KC_LALT, SPC_LW,  SPC_LW,  ENT_RS,  ENT_RS,  FNC,     MSE,     KC_APP,  KC_RCTL \
-),
-
-/* Lower
- * ,-----------------------------------------.    .-----------------------------------------.
- * |  Esc |      |      |      |      |      |    |   =  |   /  |   *  |   -  |      | Del  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |  Tab | PgUp | Home |  Up  |  End |      |    |   7  |   8  |   9  |   +  |      |   \  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |  BS  | PgDn | Left | Down |Right |      |    |   4  |   5  |   6  | Enter|      |   '  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | LSPO |   Z  |   X  |   C  |   V  |      |    |   1  |   2  |   3  | Enter|      | RSPC |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Ctrl | LGUI | Lower| LAlt | Space/Lower |    |      0      |   .  |  Fn  |ADJUST| Ctrl |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-[_LOWER] = LAYOUT( \
-  _______, XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,  KC_PEQL, KC_PSLS, KC_PAST, KC_MINS,  XXXXXXX, _______, \
-  _______, KC_PGUP,  KC_HOME,  KC_UP,    KC_END,  XXXXXXX,  KC_7,    KC_8,    KC_9,    KC_PPLS,  XXXXXXX, _______,\
-  _______, KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT, XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_PENT,  XXXXXXX, _______,\
-  _______, _______,  _______,  _______,  _______, XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_PENT,  XXXXXXX, _______,\
-  _______, _______,  _______,  _______,  _______, _______,  KC_0,    KC_0,    KC_DOT,  FNC,      RAISE,   _______ \
-),
-
-/* Raise
- * ,-----------------------------------------.     .-----------------------------------------.
- * |  Esc |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * |  Tab |   !  |   @  |   #  |   $  |   %  |     |   ^  |   &  |   *  |   -  |   +  |   \  |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * |  BS  |      |      |      |      |      |     |      |      |      |      |      |   "  |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | LSBO |  <-  | %>%  |   {  |   [  |   `  |     |   |  |   ]  |   }  |   .  |   ?  | RSBC |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Ctrl | LGUI |      | LAlt | Space/Lower |     | Enter/Raise |  Fn  | Mouse| Menu | Ctrl |
- * `-----------------------------------------'     `-----------------------------------------'
-*/
-[_RAISE] = LAYOUT( \
-  _______,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    _______, \
-  _______,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC,  KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  _______, \
-  _______,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, \
-  _______,  POINT,   PIPE,    KC_LCBR, KC_LBRC, KC_GRV,  KC_PIPE,  KC_RBRC, KC_RCBR, KC_DOT,  KC_SLSH, _______, \
-  _______,  _______, XXXXXXX, _______, _______, _______, ENT_RS,   ENT_RS,  FNC,     MSE,     _______, _______ \
-  ),
-
-
-/*Function
- * ,-----------------------------------------.     .-----------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |     |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Esc  | Mute | Vol- | Vol+ |      |      |     |      |      |      |      |      | Ins  |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Caps | Stop | |<<  | >/|| |  >>| |      |     |      |      |      |      |      |PrtSc |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | LSOB |      |      |      |      |      |     |      |      |      |      |      |ScrLk |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Ctrl | LGUI |      | LAlt | Space/Lower |     | Enter/Raise |  Fn  | Mouse|      |PsBrk |
- * `-----------------------------------------'     `-----------------------------------------'
- */
-
-[_FUNCTION] = LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12, \
-  _______, KC_MUTE, KC_VOLD, KC_VOLU,  XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, KC_INS , \
-  KC_CAPS, KC_MSTP, KC_MPRV, KC_MPLY,  KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, KC_PSCR, \
-  _______, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, KC_SLCK, \
-  _______, _______, _______, _______,  _______, _______, _______, _______, FNC,     _______,  _______, KC_PAUS \
-  ),
-
-/* MOUSE
- * ,----------------------------------------.     .----------------------------------------.
- * |  Esc |      |      |      |      |     |     |     |      |      |      |      |  Del |
- * |------+------+------+------+------+-----|     |-----+------+------+------+------+------|
- * |  Tab | WhlU | WhlL | MsUp | WhlR |     |     |     |  M1  |  M2  |  M3  |      |      |
- * |------+------+------+------+------+-----|     |-----+------+------+------+------+------|
- * |      | WhlD | MsL  | MsDn | MsR  |     |     |     |LClick|RClick|      |      |      |
- * |------+------+------+------+------+-----|     |-----+------+------+------+------+------|
- * | LSPO |      |      |      |      |     |     |     |      |      |      |      | RSCB |
- * |------+------+------+------+------+-----|     |-----+------+------+------+------+------|
- * | Ctrl |      |      |      |Sensitivity |     | Sensitivity|      |MOUSE |      | Ctrl |
- * `----------------------------------------'     `----------------------------------------'
- */
-
-[_MOUSE] = LAYOUT(
-   KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_DEL, \
-   KC_TAB,  KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R,  XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4,  KC_BTN5, XXXXXXX, XXXXXXX, \
-   KC_BSPC, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R,  XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2,  XXXXXXX, XXXXXXX, XXXXXXX, \
-   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_RSPC, \
-   _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_ACL1,  KC_ACL1, KC_ACL0, KC_ACL0, XXXXXXX,  MSE,   XXXXXXX, KC_RCTL \
-  ),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------.     ,----------------------------------------.
- * |      |      |      |      |      |QK_BOOT |     |     |      |      |      |      |      |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |     |      |      |      |      |  Del |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |     |Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |     |      |      |      |      |      |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |             |     |            |      |      |      |      |
- * `-----------------------------------------'     `----------------------------------------'
- */
-
-[_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, QK_BOOT,      _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, KC_DEL, \
-  _______, _______, _______, _______, _______, _______,      _______, QWERTY,  COLEMAK, DVORAK, _______,  _______, \
-  _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______ \
-  )
-
-};
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Macros to send R pointer & dplyr pipe
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    switch(id) {
-      //R Pointer: <-
-        case R_POINT:
-            if (record->event.pressed) { // Pointer <-
-                SEND_STRING("<- ");
-//                return MACRO(D(LSFT), T(COMM), U(LSFT), T(MINS), END);
-
-            }
-            break;
-      //dplyr pipe: %>%
-        case R_PIPE:
-            if (record->event.pressed) { // dplyr pipe %>%
-                SEND_STRING("%>% ");
-//                return MACRO(D(LSFT), T(5), T(DOT), T(5), U(LSFT), END);
-            }
-            break;
-    }
-    return MACRO_NONE;
-}
-
-/* Cases to switch default layer to QWERTY, COLEMAK or DVORAK
-    and to access ADJUST layer to access the switch keys */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/DivergeJM/rules.mk b/keyboards/keebio/nyquist/keymaps/DivergeJM/rules.mk
deleted file mode 100644
index bbed7e8581..0000000000
--- a/keyboards/keebio/nyquist/keymaps/DivergeJM/rules.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2017 James Morgan <ja.morgan1@outlook.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no      # Enable Tap Dance
diff --git a/keyboards/keebio/nyquist/keymaps/pitty/README.md b/keyboards/keebio/nyquist/keymaps/pitty/README.md
deleted file mode 100644
index af933a6a56..0000000000
--- a/keyboards/keebio/nyquist/keymaps/pitty/README.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# Pittyolo's Nyquist Layout
-
-This Nyquist layout is mostly based of 333fred's keymap (kudos!), modified for my ISO Hungarian taste :)
-
-It's still a WIP.
-
-I wrote the keys that will appear when using Hungarian layout in Windows and the respective English keys in brackets.
-
-
- ### Qwerty
-```
-,-----------------------------------------------------------------------------------.
-| 0(') |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  | Ö(0) | Ü(-) |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   E  |   R  |   T  |  Z(Y)|   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |LTVIMF|   G  |   H  |   J  |   K  |   L  |  É(;)| Á(") |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|Í/Shft| Y(Z) |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  -(/)| Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl |  GUI |  Alt |LOWER |  Spc |  Spc | Bksp | Ent  |  Alt | =(&) | GAME | Del  |
-`-----------------------------------------------------------------------------------'
-```
- 
- Tap left shift writes the missing ISO key, hold is Shift. I have 2u Space.
-
-
- ### Gaming mode (Toggle layer)
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |      |      |QWERTY|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |Lower |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |   F  |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Shift|      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      | Left | Down |  Up  | Right|
-`-----------------------------------------------------------------------------------'
-```
- 
-Disabled some of the functions in the main layer to help with better gaming experience.
-
-
- ### Lower (double tap toggles the layer, and hold for momentary switch)
-```
-,-----------------------------------------------------------------------------------.
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |  Up  |      |  Del |  Ins |      |   7  |   8  |   9  |   /  |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      | Left | Down | Right| Home |  End |      |   4  |   5  |   6  |   *  |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|      |      |      | PGUP | PGDN |      |   1  |   2  |   3  |   -  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |   0  |   .  |   =  |   +  |      |
-`-----------------------------------------------------------------------------------'
-```
- 
- Function layer with everything that is missing from the main layer plus an additional numpad.
-
-
- ### Vim Movement (Hold down F)
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |      |DM_stp|      |      |      |      |      |   Ő  |  Ű   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |DM_REC|      |      |  Ú   |   Í  |   Ó  |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | DLeft|DRight| LCTRL|      |      | Left | Down |  Up  | Right|      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      | LShft|      |      |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
- 
- Turns hjkl into vim movement. DLeft and DRight macros are for sending WIN+Left and WIN+Right. I moved the respective accented Hungarian letters here.
diff --git a/keyboards/keebio/nyquist/keymaps/pitty/config.h b/keyboards/keebio/nyquist/keymaps/pitty/config.h
deleted file mode 100644
index b393e6a5f6..0000000000
--- a/keyboards/keebio/nyquist/keymaps/pitty/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#define TAPPING_TOGGLE 2
-
-#endif
-
diff --git a/keyboards/keebio/nyquist/keymaps/pitty/keymap.c b/keyboards/keebio/nyquist/keymaps/pitty/keymap.c
deleted file mode 100644
index 2016cd1c46..0000000000
--- a/keyboards/keebio/nyquist/keymaps/pitty/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _GAME 1
-#define _LOWER 2
-#define _VIM 3
-
-
-enum custom_macros {
-    DLEFT,
-    DRIGHT,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | 0(') |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  | Ö(0) | Ü(-) |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  Z(Y)|   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  É(;)| Á(") |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Í/Shft| Y(Z) |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  -(/)| Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  Alt |LOWER |  Spc |  Spc | Bksp | Ent  |  Alt | =(&) | GAME | Del  |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_MINUS, \
-  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, \
-  MT(MOD_LSFT, KC_NUBS), KC_Z,      KC_X,    KC_C,       KC_V,             KC_B,             KC_N,     KC_M,    KC_COMM, KC_DOT,       KC_SLSH,       KC_RSFT, \
-  KC_LCTL,               KC_LGUI,   KC_LALT, TT(_LOWER), LT(_VIM, KC_SPC), LT(_VIM, KC_SPC), KC_BSPC,  KC_ENT,  KC_RALT, KC_AMPERSAND, TG(_GAME),     KC_DEL \
-),
-
-/* Gaming mode
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |QWERTY|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |  Spc |  Spc |      |      | Left | Down |  Up  | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] =  LAYOUT( \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY),    \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    \
-  KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    \
-  _______, _______, _______, _______, KC_SPC,  KC_SPC,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |      |   7  |   8  |   9  |   /  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Left | Down | Right|      |      |      |   4  |   5  |   6  |   *  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |   1  |   2  |   3  |   -  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   0  |   .  |   =  |   +  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_UP,   _______, _______, _______, _______,  KC_7,    KC_8,      KC_9,         KC_KP_SLASH,    _______, \
-  _______,   KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,  KC_4,    KC_5,      KC_6,         KC_KP_ASTERISK, _______, \
-  KC_LSFT,   _______, _______, _______, _______, _______, _______,  KC_1,    KC_2,      KC_3,         KC_KP_MINUS,    _______, \
-  _______,   _______, _______, _______, _______, _______, _______,  KC_GRV,  KC_KP_DOT, KC_KP_EQUAL,  KC_KP_PLUS,     _______ \
-),
-
-
-/* Vim Movement (Hold down SPACE)
- * ,-----------------------------------------------------------------------------------.
- * | Ins  | Home | PGUP |      |DM_stp|      |      |      |      |      |   Ő  |  Ű   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  | End  | PGDN |      |DM_REC|      |      |  Ú   |   Í  |   Ó  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | DLeft|DRight| LCTRL|      |      | Left | Down |  Up  | Right|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | LShft|      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_VIM] =  LAYOUT( \
-  KC_INS,  KC_HOME,  KC_PGUP,   _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_NUHS, \
-  KC_DEL,  KC_END,   KC_PGDN,   _______, _______, _______, _______, KC_RBRC, KC_NUBS, KC_EQL , _______, _______, \
-  _______, M(DLEFT), M(DRIGHT), KC_LCTL, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
-  _______, _______,  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______,  _______,   KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______ \
-)
-
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    switch(id) {
-        case DLEFT:
-            if (record->event.pressed) { // Windows move desktop left
-                return MACRO(D(LCTL), D(LGUI), T(LEFT), U(LGUI), U(LCTL), END);
-            }
-            break;
-        case DRIGHT:
-            if (record->event.pressed) { // Windows move desktop right
-                return MACRO(D(LCTL), D(LGUI), T(RIGHT), U(LGUI), U(LCTL), END);
-            }
-            break;
-    }
-    return MACRO_NONE;
-}
-
-#ifdef RGBLIGHT_ENABLE
-bool rgb_layer_change = true;
-#endif
-
-#define rgblight_set_blue        rgblight_sethsv (0xFF,  0xFF, 0xFF);
-#define rgblight_set_red         rgblight_sethsv (0x00,  0xFF, 0xFF);
-#define rgblight_set_green       rgblight_sethsv (0x78,  0xFF, 0xFF);
-#define rgblight_set_orange      rgblight_sethsv (0x1E,  0xFF, 0xFF);
-#define rgblight_set_teal        rgblight_sethsv (0xC3,  0xFF, 0xFF);
-#define rgblight_set_magenta     rgblight_sethsv (0x12C, 0xFF, 0xFF);
-#define rgblight_set_yellow      rgblight_sethsv (0x3C,  0xFF, 0xFF);
-#define rgblight_set_purple      rgblight_sethsv (0x10E, 0xFF, 0xFF);
-#define rgblight_set_white       rgblight_sethsv (0x00,  0x00, 0xFF);
-#define rgblight_set_black       rgblight_sethsv (0x00,  0x00, 0x00);
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-#ifdef RGBLIGHT_ENABLE
-  uint8_t default_layer = eeconfig_read_default_layer();
-  if (rgb_layer_change) {
-    switch (get_highest_layer(state)) {
-    case _LOWER:
-      rgblight_set_purple;
-      rgblight_mode(5);
-      break;
-    case _VIM:
-	  rgblight_set_green;
-      rgblight_mode(23);
-      break;
-	case _GAME:
-      rgblight_mode(8);
-      break;
-    default:
-      if (default_layer & (1UL << _GAME)) {
-      }
-      else
-      rgblight_mode(14);
-      break;
-    }
-  }
-#endif
-  return state;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/pitty/rules.mk b/keyboards/keebio/nyquist/keymaps/pitty/rules.mk
deleted file mode 100644
index 53a426157e..0000000000
--- a/keyboards/keebio/nyquist/keymaps/pitty/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-NKRO_ENABLE = yes
-
diff --git a/keyboards/kinesis/keymaps/carpalx/config.h b/keyboards/kinesis/keymaps/carpalx/config.h
deleted file mode 100644
index 8893d122e0..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/kinesis/keymaps/carpalx/keymap.c b/keyboards/kinesis/keymaps/carpalx/keymap.c
deleted file mode 100644
index 28d724518a..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/keymap.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _CX 0 // Carpalx layer
-#define _QW 1 // Qwerty layer
-#define _KP 2 // Keypad + Media Layer
-
-// Macro name shortcuts
-#define DVORAK M(_DV)
-#define QWERTY M(_QW)
-#define COLEMAK M(_CM)
-
-/*
-
-        Function Keys on All Layers (Keypad toggles):
-        ,---------------------------------------------------------------.
-        |  L0  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8   |
-        `---------------------------------------------------------------'
-        ,---------------------------------------------------------------.
-        |  F9  |  F10 |  F11 |  F12 | PSCR |  L1  |  L2  |  L2  | QK_BOOT |
-        `---------------------------------------------------------------'
-
-        L0 Carpalx layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   G  |   M  |   L  |   W  ||   B  |   Y  |   U  |   V  |   ;  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   D  |   S  |   T  |   N  |   R  ||   I  |   A  |   E  |   O  |   H  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   F  |   J  ||   K  |   P  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L2) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L1 QWERTY layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L1) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L2 Keypad + Media layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      | Mute | Vol- | Vol+ |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        | Stop | Prev | Play | Next | Sel  ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |   (  |   )  | KP . |KP Ent|      |
-                 `---------------------------'              `----------------------------------'
-                                   ,----------------.,----------------.
-                                   |       |        ||        |       |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |        ||        |       |       |
-                            |      |       |--------||--------|KP Entr| KP 0  |
-                            |      |       |        ||        |       |       |
-                            `-----------------------'`------------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_CX] = LAYOUT(
-           // Left Hand
-           TO(_CX),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_DEL,   KC_1,    KC_3,    KC_5,    KC_7,    KC_9,
-           KC_TAB,   KC_Q,    KC_G,    KC_M,    KC_L,    KC_W,
-           KC_ESC,   KC_D,    KC_S,    KC_T,    KC_N,    KC_R,
-           KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_F,    KC_J,
-                     KC_GRV,  KC_LBRC, KC_LEFT, KC_RGHT,
-           // Left Thumb
-                     KC_LCTL, KC_LALT,
-                              KC_RGUI,
-           KC_BSPC,  KC_ESC,  MO(_KP),
-
-           // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, TO(_QW), TO(_KP), TO(_KP),  QK_BOOT,
-           KC_0,    KC_8,    KC_6,    KC_4,    KC_2,    KC_MINS,
-           KC_B,    KC_Y,    KC_U,    KC_V,    KC_SCLN, KC_EQL,
-           KC_I,    KC_A,    KC_E,    KC_O,    KC_H,    KC_QUOT,
-           KC_K,    KC_P,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                    KC_DOWN,   KC_UP, KC_RBRC, KC_BSLS,
-           // Right Thumb
-           KC_RALT, KC_RCTL,
-           KC_RGUI,
-           MO(_KP), KC_ENT,  KC_SPC
-    ),
-
-[_QW] = LAYOUT(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
-           _______,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-           _______,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    _______,
-           KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, _______,
-           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_KP] = LAYOUT(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-           _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand */
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
-           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-                    KC_LPRN, KC_RPRN, KC_PDOT, KC_PENT,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, KC_PENT, KC_P0
-    )
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch(id) {
-    case _CX:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_CX);
-      }
-      break;
-    case _QW:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QW);
-      }
-      break;
-    }
-    return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
diff --git a/keyboards/kinesis/keymaps/carpalx/readme.md b/keyboards/kinesis/keymaps/carpalx/readme.md
deleted file mode 100644
index 2db75c9539..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/readme.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Carpalx Kinesis Keymap
-
-## About this keymap
-
-Carpalx layout (also known as QGMLWBY) is an optimized alternative keyboard layout.
-Learn more about it at:
-[http://mkweb.bcgsc.ca/carpalx/?popular_alternatives](http://mkweb.bcgsc.ca/carpalx/?popular_alternatives)
-
-The layout also includes a QWERTY layer to help with the transition.
- - Scroll Lock: QWERTY layer
- - Esc (Fn row): Carpalx layer
- - Keypad: Keypad and Media layer
-
-## Details mapping
-
-        Function Keys on All Layers (Keypad toggles):
-        ,---------------------------------------------------------------.
-        |  L0  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8   |
-        `---------------------------------------------------------------'
-        ,---------------------------------------------------------------.
-        |  F9  |  F10 |  F11 |  F12 | PSCR |  L1  |  L2  |  L2  | RESET |
-        `---------------------------------------------------------------'
-
-        L0 Carpalx layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   G  |   M  |   L  |   W  ||   B  |   Y  |   U  |   V  |   ;  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   D  |   S  |   T  |   N  |   R  ||   I  |   A  |   E  |   O  |   H  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   F  |   J  ||   K  |   P  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L2) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L1 QWERTY layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        | Del    |   1  |   3  |   5  |   7  |   9  ||   0  |   8  |   6  |   4  |   2  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   =    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | ESC    |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   [  | Left | Rght |              |  Dn  |  Up  |   ]  |   \  |
-                 `---------------------------'              `---------------------------'
-                                   ,----------------.,----------------.
-                                   | LCtl  |  LAlt  ||  LAlt  | RCtl  |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |  RGUI  ||  RGUI  |       |       |
-                            | BkSp |  ESC  |--------||--------| Enter | Space |
-                            |      |       | MO(L1) || MO(L2) |       |       |
-                            `-----------------------'`------------------------'
-
-        L2 Keypad + Media layer:
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      | Mute | Vol- | Vol+ |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        | Stop | Prev | Play | Next | Sel  ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |   (  |   )  | KP . |KP Ent|      |
-                 `---------------------------'              `----------------------------------'
-                                   ,----------------.,----------------.
-                                   |       |        ||        |       |
-                            ,------|-------|--------||--------+-------+-------.
-                            |      |       |        ||        |       |       |
-                            |      |       |--------||--------|KP Entr| KP 0  |
-                            |      |       |        ||        |       |       |
-                            `-----------------------'`------------------------'
-
diff --git a/keyboards/kinesis/keymaps/carpalx/rules.mk b/keyboards/kinesis/keymaps/carpalx/rules.mk
deleted file mode 100644
index 1c26f881f2..0000000000
--- a/keyboards/kinesis/keymaps/carpalx/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kinesis/keymaps/milestogo/config.h b/keyboards/kinesis/keymaps/milestogo/config.h
deleted file mode 100644
index 8893d122e0..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/kinesis/keymaps/milestogo/keymap.c b/keyboards/kinesis/keymaps/milestogo/keymap.c
deleted file mode 100644
index 710ef97c59..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/keymap.c
+++ /dev/null
@@ -1,365 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mousekey.h"
-
-#define _QWERTY 0 // Base qerty
-#define _SYMB 1// Symbol layer
-#define _MOUSE 2//
-#define _TRANS 3//
-#define _SYMB2 4// old symbol level, more ergodox like
-
-/* Macros */
-enum {
-  NONE = 0,
-  // Diagonal mouse movement
-  A_MUL,
-  A_MUR,
-  A_MDL,
-  A_MDR,
-};
-
-
-//  Train out of using uncomfortable esc  and GUI keys.
-/****************************************************************************************************
-*
-* Keymap: Default Layer in Qwerty
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* | no     |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F8  |  F9  |  F10 |  F12 |  FN0 |  FN1 |  FN2 |      |  bOOT  |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* | `~     |  1!  |  2@  |  3#  |  4$  |  5%  |                           |  6^  |  7&  |  8*  |  9(  |  0)  | -_     |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* | Tab    |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  | \|     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |MouseFN0|   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,<  |  .>  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          | ~`   | ESC  |GUI/L |L1/RT |                                         | L1/UP|GUI/DN| [{   | ]}   |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL | ALT  |         | ALT  | GUI |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Del  |         | PgUp |      |      |
-*                                 | BkSp | BkSp |------|         |------|Return| Space|
-*                                 |      |      | FN0  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT(
-           XXXXXXX, KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8,
-           KC_GRAVE, KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,
-           KC_TAB, KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,
-           TT(_MOUSE) ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,
-           KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,
-              KC_GRAVE,  KC_ESC, MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
-			   		KC_LCTL,KC_LALT,
-			   		KC_DEL,
-              		KC_BSPC, KC_DEL ,TT(_MOUSE) ,
-        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,TT(_MOUSE) ,TG(_MOUSE)  ,TT(_SYMB), KC_NO, QK_BOOT,
-	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
-	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,
-	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
-	KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-		LT(_SYMB, KC_UP), MT(MOD_LGUI,KC_DOWN),  KC_LBRC ,KC_RBRC,
-           KC_RALT,KC_RGUI,
-           KC_PGUP,
-           KC_PGDN,KC_ENTER ,KC_SPC
-    ),
-
-
-/* _SYMB level, more planck like. Much work to make sequences into multi-finger rolls. eg ([1,0]), !=0
-* Also sorted by frequency / strength of finger.
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |  ^   |   {  |   }  |  @   |  %   |                           |   &  |  [   |   (  |   )  |   _  |   \    |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |  !   |   #  |   0  |   =  |  ~   |                           |   *  |   +  |   1  |  -   |   ]  |  `     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |   6  |  7   |   8  |  9   | pipe |                           |   $  |  2   |   3  |   4  |  5   |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |  :   |GUI/L |L1/RT |                                         | L1/UP|GUI/DN|  \   |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL |      |         | ALT  | GUI |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |      |         |      |      |      |
-*                                 | Cut  | Paste|------|         |------|      |      |
-*                                 |      |      |Reset |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-
-
-[_SYMB] = LAYOUT(
-         _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  KC_CIRC,  KC_LCBR, KC_RCBR,  KC_AT,  KC_PERC,
-         _______,  KC_EXLM,  KC_HASH,  KC_0,   KC_EQL,  KC_TILD,
-         _______,   KC_6,   KC_7,   KC_8,  KC_9, KC_PIPE,
-                   _______,  KC_COLON,  MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  QK_BOOT,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         KC_AMPR,  KC_LBRC,  KC_LPRN, KC_RPRN,  KC_UNDS,  _______,
-         KC_ASTR,  KC_PLUS,  KC_1,    KC_MINS,   KC_RBRC,  KC_GRV,
-         KC_DLR,   KC_2,   KC_3,   KC_4,  KC_5, XXXXXXX,
-                   LT(_SYMB, KC_UP), MT(MOD_LGUI,KC_DOWN),   KC_BSLS,  XXXXXXX,
-         _______,  _______,
-         _______,
-         _______,  _______,  _______
-    ),
-
-
-/* _SYMB2ol level, more ergodox like
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* |        |      |   *  |   #  |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |  /   |   <  |   >  |      |      |                           |      |      |   +  |   *  |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  {   |   }  |      |      |                           |      |      |   =  |   -  |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |   =  |  (   |   )  |      |      |                           |      |      |      |   |  |      |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |GUI/L |L1/RT |                                         | L1/UP|GUI/DN|  {   |   }  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL |      |         | ALT  | GUI |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |      |         |      |      |      |
-*                                 | BkSp | Del  |------|         |------|Mouse1|Mouse2|
-*                                 |      |      |Reset |         |      |LClick|Rclick|
-*                                 `--------------------'         `--------------------'
-*/
-
-
-
-[_SYMB2] = LAYOUT(
-         _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  _______,  KC_ASTR,  KC_HASH,  _______,  _______,
-         _______,  KC_SLSH,  RSFT(KC_COMM), RSFT(KC_DOT),  _______,  _______,
-         _______,  _______,  RSFT(KC_LBRC),  RSFT(KC_RBRC),   _______,  _______,
-         _______,  KC_EQL,  RSFT(KC_9),  RSFT(KC_0),  _______,  _______,
-                   _______,  _______,  MT(MOD_LGUI,KC_LEFT), LT(_SYMB, KC_RIGHT),
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  QK_BOOT,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
-         _______,  _______,  _______,  KC_ASTR,  _______,  _______,
-         _______,  _______,  KC_PLUS,  KC_MINS,  _______,  _______,
-         _______,  _______,  KC_EQL,  KC_PIPE,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-                   LT(_SYMB, KC_UP), MT(MOD_LGUI,KC_DOWN),   _______,  _______,
-         _______,  _______,
-         _______,
-         _______,  _______,  _______
-    ),
-/* Keymap: Movement and function layer
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* | Caps   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F8  |  F9  |  F10 |  F12 |  FN0 |  FN1 |  FN2 |  Tada |  bOOT  |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* | =+     |  !   |   @  |   #  |   $  |   %  |                           |  ^   |   &  |   *  |  (   |   )  |MS Fast |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* | Tab    |      |      |      |      |PgUp  |                           | MwU  |MS_UL | MS_U |MS_UR |      | Ms Norm|
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |MouseFN1|GUI_V |GUI X |GUI C |GUI_V |      |                           |      | MS_L |Mouse1| MS_R |      |MS Slow |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |PgDown|                           | MWD  | MDown|MS Dwn|MS_DR  |  ?  |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          | `~   | ESC  |      |      |                                         |      |      |  {  |    }  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | CTRL | GUI  |         | ALT  | GUI  |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 | BkSp | Del  |------|         |------|Mouse1|Mouse2|
-*                                 |      |      | End  |         | PgDn |LClick|Rclick|
-*                                 `--------------------'         `--------------------'
-*/
-
-
-[_MOUSE] = LAYOUT(
-         KC_CAPS,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  KC_EXLM  ,KC_AT,    KC_HASH,  KC_DLR   ,KC_PERC   ,
-         _______,  KC_NO,    KC_NO,    KC_UP,    KC_NO,    KC_PGUP,
-         TG(_MOUSE),   LGUI(KC_Z),LGUI(KC_X),LGUI(KC_C),LGUI(KC_V), KC_NO,
-         _______,  KC_NO,    KC_NO,    KC_UP,    KC_NO,    KC_PGDN,
-                   _______,  _______,  KC_NO,  KC_NO,
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE),QK_BOOT,
-         KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_ACL2,
-         KC_WH_U,  M(A_MUL), KC_MS_U,  M(A_MUR), KC_NO,  KC_ACL1,
-         KC_NO,    KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_NO,  KC_ACL0,
-         KC_WH_D,  M(A_MDL), KC_MS_D,  M(A_MDR), RSFT(KC_LBRC), RSFT(KC_RBRC),
-                   KC_LCBR,  KC_RCBR,  KC_NO,  KC_NO,
-         _______,  _______,
-         _______,
-         _______,  KC_BTN1,  KC_BTN2
-    ),
-
-
-
-/* EMPTY
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |  bOOT  |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |      |      |                                         |      |      |    |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | Ctrl | Alt  |         | Gui  | Ctrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 | BkSp | Del  |------|         |------|Mouse1|Mouse2|
-*                                 |      |      | End  |         | PgDn |LClick|Rclick|
-*                                 `--------------------'         `--------------------'
-*/
-
-
-
-[_TRANS] = LAYOUT(
-         _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-          _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,
-                   _______,  _______,  _______,  _______,
-                             _______,  _______,
-                                       _______,
-                    _______, _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, TT(_MOUSE), KC_2,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______,
-                   _______,  _______,  _______,  _______,
-         _______,  _______,
-         _______,
-         _______,  _______,  _______
-    ),
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-
-	// from  algernon's ErgoDox EZ layout,
-       case A_MUL:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_UP);
-          mousekey_on(KC_MS_LEFT);
-        } else {
-          mousekey_off(KC_MS_UP);
-          mousekey_off(KC_MS_LEFT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MUR:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_UP);
-          mousekey_on(KC_MS_RIGHT);
-        } else {
-          mousekey_off(KC_MS_UP);
-          mousekey_off(KC_MS_RIGHT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MDL:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_DOWN);
-          mousekey_on(KC_MS_LEFT);
-        } else {
-          mousekey_off(KC_MS_DOWN);
-          mousekey_off(KC_MS_LEFT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MDR:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_DOWN);
-          mousekey_on(KC_MS_RIGHT);
-        } else {
-          mousekey_off(KC_MS_DOWN);
-          mousekey_off(KC_MS_RIGHT);
-        }
-        mousekey_send();
-        break;
-     }
-    return MACRO_NONE;
-};
-
-
-void matrix_init_user(void) {
-
-
-}
-
-void matrix_scan_user(void) {
-
-#ifdef ALVICSTEP_CONFIG_H
- int8_t layer = get_highest_layer(layer_state);
-
-        switch (layer) {
-        case 1:
-                if (!(host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK))) {
-                        all_led_off();
-                        caps_lock_led_on();
-                }
-                break;
-
-        case 2:
-                if (!(host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK))) {
-                        all_led_off();
-                        scroll_lock_led_on();
-                }
-        case 0:
-                all_led_off();
-                num_lock_led_on();
-                break;
-        default:
-                break;
-        }
-#endif
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kinesis/keymaps/milestogo/readme.md b/keyboards/kinesis/keymaps/milestogo/readme.md
deleted file mode 100644
index 76356a6871..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# a programmer friendly keymap for the kinesis-advantage
-# not really baked yet. 
diff --git a/keyboards/kinesis/keymaps/milestogo/rules.mk b/keyboards/kinesis/keymaps/milestogo/rules.mk
deleted file mode 100644
index 93e7cd8bb7..0000000000
--- a/keyboards/kinesis/keymaps/milestogo/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/lets_split/keymaps/dlaroe/config.h b/keyboards/lets_split/keymaps/dlaroe/config.h
deleted file mode 100644
index e898e2ed2a..0000000000
--- a/keyboards/lets_split/keymaps/dlaroe/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#endif
diff --git a/keyboards/lets_split/keymaps/dlaroe/keymap.c b/keyboards/lets_split/keymaps/dlaroe/keymap.c
deleted file mode 100644
index d68982c37d..0000000000
--- a/keyboards/lets_split/keymaps/dlaroe/keymap.c
+++ /dev/null
@@ -1,251 +0,0 @@
-// Can't Remember Sh*t Keymap for Let's Split
-// Trying to fit as many characters as possible on the default layer
-// 	as its easier for me to remember logical functions than characters
-// Also, I like me some numpad
-
-
-#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 _ARROW  1
-#define _GAME   2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  ARROW,
-  GAME,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  PLOVER,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  \   | Alt  | Lower|SpcRse| Space|Raise |   [  |   -  |   =  |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT( \
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC, \
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), \
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER,  LT(4, KC_SPC),  KC_SPC,  RAISE,  LT(3, KC_LBRC), KC_MINS, KC_EQL, CTL_T(KC_RBRC) \
-),
-
-/* Arrow
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  \   | Alt  | Lower|SpcRse| Space|Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROW] = LAYOUT( \
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC, \
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), \
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER,  KC_SPC,  KC_SPC,  RAISE,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
-),
-
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Shift |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Alt  |   4  |   3  |   2  | Lower|    Space    |Raise | Left | Down |  Up  | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT( \
-     KC_1,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC, \
-  KC_LSFT,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, \
-  KC_LCTL,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, _______ , \
-  KC_LALT,   KC_4,    KC_3,    KC_2,    LOWER,  KC_SPC,  KC_SPC,   RAISE,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
-),
-
-
-/* Lower   (switched to # because KP# were weird in terminal emulators)
- * ,-----------------------------------------------------------------------------------.
- * |  Del |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Tab |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |   .  |  *   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Esc |      |      |      |      |      |   0  |      |      |      | KP_+ |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT( \
-   KC_DEL,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,  KC_8, KC_9,    KC_0,  _______, \
-   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_4,  KC_5, KC_6,  KC_DOT, KC_ASTR, \
-  _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12,  KC_1,  KC_2, KC_3, KC_SLSH,  _______, \
-  KC_ESC, _______, _______, _______, _______, _______,    KC_0, _______,  _______, _______, KC_PLUS, _______ \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  | Wh Up|RightC| M-Up | LeftC|QWERTY| Left | Down |  Up  | Right|  |   |   `  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Wh Dn| M-L  | M-Dn | M-R  |      |  -   |  =   |  [   |  ]   |  \   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | App  |      |      |      |      |  Ins |      | Home | PGDN | PGUP |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT( \
-  KC_TILD,   KC_EXLM,     KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,   KC_RPRN, KC_DEL, \
-   KC_DEL,   KC_WH_U,   KC_BTN2, KC_MS_U, KC_BTN1, QWERTY, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,   KC_PIPE,  KC_GRV, \
-  _______,   KC_WH_D,   KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLASH, _______, \
-  _______,   KC_APP,   _______, _______, _______, _______, KC_INS, _______, KC_HOME, KC_PGDN,   KC_PGUP,  KC_END \
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT ( \
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   , \
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, \
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX \
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | C-A-I|Qwerty|      |      |Reset |Macro0|      |      |      |      |      |C-A-D |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff| Game |AGswap|AGnorm|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff| Prev | Next | Mute | VolDn| VolUp|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      |      |      |      | Play/Pause  |      | BL_T |BL_DEC|BL_INC|BL_ST |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT( \
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), \
-  _______, _______, _______, AU_ON,   AU_OFF,  GAME, AG_SWAP, AG_NORM,  _______, _______,  _______,  _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV, KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
-  BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP \
-)
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is.
-{
-  switch(id) {
-    case 0: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), T(LEFT), U(LSFT), D(LCTL), T(X), U(LCTL), T(RIGHT), D(LCTL), T(V), U(LCTL), T(LEFT),  END  ); // this swaps the characters on either side of the cursor when the macro executes
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
-
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_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 GAME:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(music_scale);
-        #endif
-        persistant_default_layer_set(1UL<<_GAME);
-      }
-      return false;
-      break;
-
-
-      case LOWER:
-        if (record->event.pressed) {
-          layer_on(_LOWER);
-          update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-          layer_off(_LOWER);
-          update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-     }
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/keyboards/lets_split/keymaps/dlaroe/rules.mk b/keyboards/lets_split/keymaps/dlaroe/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lets_split/keymaps/xk/config.h b/keyboards/lets_split/keymaps/xk/config.h
deleted file mode 100644
index a5cd518576..0000000000
--- a/keyboards/lets_split/keymaps/xk/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TOGGLE 1
-#define TAPPING_TERM 300
-#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_LAYER_TOGGLE 2
-#define ONESHOT_TIMEOUT 800
-
-#define USE_I2C
-
-#define MOUSEKEY_INTERVAL 50
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-
-#define MOUSEKEY_WHEEL_DELAY 0
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define PERMISSIVE_HOLD
-
-#endif
diff --git a/keyboards/lets_split/keymaps/xk/keymap.c b/keyboards/lets_split/keymaps/xk/keymap.c
deleted file mode 100755
index 8a3109b7ad..0000000000
--- a/keyboards/lets_split/keymaps/xk/keymap.c
+++ /dev/null
@@ -1,367 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-#define _COLEMAK  0
-#define _KAMELOC  1
-#define _IKAPILA  2
-#define _IKASHFT  3
-#define _ARROWKY  4
-#define _FNCTION  5
-#define _NINEKEY  6
-#define _NAVIGAT  7
-#define _QWERTY   8
-#define _MLAYER   9
-#define _GRVTABL  15
-
-enum custom_keycodes {
-  COLEMAK = SAFE_RANGE,
-  KAMELOC,
-  IKAPILA,
-  IKASHFT,
-  ARROWKY,
-  FNCTION,
-  NINEKEY,
-  NAVIGAT,
-  QWERTY,
-  MLAYER,
-  GRVTABL,
-};
-
-//TD Declarations
-enum {
-VOM = 0,
-PRN,
-EGT,
-HRD,
-XRD,
-DSH,
-ESC,
-EQE,
-PGN,
-HND,
-COD,
-UND,
-F11,
-F12,
-F13,
-F14,
-F15,
-F16,
-F17,
-F18,
-F19,
-F20,
-//unicode_inputctl
-LINUX,
-WIN,
-WINSH,
-OSX,
-};
-
-// action-TAP for key/mod behavior LT(layer, KC)
-#define XK_TAB      LT(_FNCTION, KC_TAB)
-#define XK_BSP      LT(_KAMELOC, KC_BSPC)
-#define XK_APO      LT(_KAMELOC, KC_QUOT)
-
-#define XK_SPC    LT(_IKAPILA, KC_SPC)
-#define XK_ENT      LT(_IKAPILA, KC_ENT)
-#define XK_PGDN     LT(_IKASHFT, KC_PGDN)
-#define XK_PGUP     LT(_IKASHFT, KC_PGUP)
-#define PIPBOY      LT(_FNCTION, KC_BSLS)
-#define XK_DEL      LT(_IKASHFT, KC_DEL)
-#define XK_GRV      LT(_GRVTABL, KC_GRV)
-
-// mod-TAP for mod/key behavior MT(modkey, KC)
-#define ALT_IT      MT(MOD_RALT, KC_SCLN)
-#define CTL_IT      MT(MOD_RCTL, KC_DOT)
-#define SFT_ENT	    MT(MOD_RSFT, KC_ENT)
-
-//sticky modifiers
-#define KYCTL       OSM(MOD_LCTL)
-#define KYSFT       OSM(MOD_LSFT)
-#define CAKY        OSM(MOD_LCTL | MOD_LALT)
-
-//shortcuts
-#define CADEL       LALT(LCTL(KC_DEL))
-#define CAINS       LALT(LCTL(KC_INS))
-#define TGNKRO      MAGIC_TOGGLE_NKRO
-
-#define NAVCH       LCTL(KC_HOME)
-#define NAVCPD      LCTL(KC_PGDN)
-#define NAVCPU      LCTL(KC_PGUP)
-#define NAVCE       LCTL(KC_END)
-#define NAVCU       LCTL(KC_UP)
-#define NAVCD       LCTL(KC_DOWN)
-#define NAVCL       LCTL(KC_LEFT)
-#define NAVCR       LCTL(KC_RGHT)
-#define NAVGU       LGUI(KC_UP)
-#define NAVGD       LGUI(KC_DOWN)
-#define NAVGL       LGUI(KC_LEFT)
-#define NAVGR       LGUI(KC_RGHT)
-
-#define KC_NDSH     LCTL(KC_PMNS)
-#define KC_MDSH     LALT(LCTL(KC_PMNS))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-  TAP
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │TAB │ Q  │ W  │ F  │ P  │ B  │    │ J  │ L  │ U  │ Y  │ ;  │DEL │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │BKSP│ A  │ R  │ S  │ T  │ G  │    │ M  │ N  │ E  │ I  │ O  │ '  │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │OSFT│ X  │ C  │ D  │ V  │ Z  │    │ K  │ H  │ ,  │    │ .  │ /  │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │OCTL│GUI │ESC │ALT │PGUP│SPC │    │ENT │PGDN│ () │ {} │ \  │ `  │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-   HOLD
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │L FN│    │    │    │    │    │    │    │    │    │    │ALT │L!@#│
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │L OH│    │    │    │    │    │    │    │    │    │    │    │L OH│
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │SFT │    │    │    │    │    │    │    │    │    │    │CTL │SFT │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │CTL │GUI │ESC │ALT │L!@#│L123│    │L123│L!@#│L  M│    │L FN│LGRV│
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-   DOUBLETAP
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │    │    │    │    │    │    │    │    │    │    │    │    │    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │    │    │    │    │    │    │    │    │    │    │    │    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │OSML│    │    │    │    │    │    │    │    │    │    │    │    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │OSML│OSML│!F4 │    │    │    │    │    │    │    │    │    │    │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  Switch type
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │Br  │mxC │Z   │Z   │Z   │Z   │    │Z   │Z   │Z   │Z   │Br  │G   │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │G   │Z   │Z   │Z   │Z   │Z   │    │Z   │Z   │Z   │Z   │Z   │Z   │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │Y   │Z   │Z   │Z   │Z   │Z   │    │Z   │Z   │Z   │B   │B   │Y   │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │Y   │Y   │mxC │Z   │BLK │BLK │    │BLK │BLK │Z   │Z   │B   │G   │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  with DCS keycaps
-  Top Row   R1 (reversed?)
-  M Row1    R3 (with reversed pointer finger)
-  M Row2    R4
-  B Row     R2 (reversed)
-*/
-
-// Colemak PB&J (Mod-DH)
-[_COLEMAK] = LAYOUT( \
-   XK_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,            KC_J,    KC_L,        KC_U,         KC_Y,  ALT_IT,         XK_DEL, \
-   XK_BSP,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,            KC_M,    KC_N,        KC_E,         KC_I,    KC_O,         XK_APO, \
-    KYSFT,    KC_X,    KC_C,    KC_D,    KC_V,    KC_Z,            KC_K,    KC_H,     TD(COD),       KC_DOT,  CTL_IT, SFT_T(KC_SLSH), \
-    KYCTL, KC_LGUI, TD(ESC), KC_LALT, XK_PGUP,  XK_SPC,          XK_ENT, XK_PGDN, MO(_MLAYER), TT(_NAVIGAT),  PIPBOY,         XK_GRV \
-),
-
-// useful for one-handed typing
-[_KAMELOC] = LAYOUT( \
-   XK_DEL, KC_SCLN,    KC_Y,    KC_U,    KC_L,    KC_J,            KC_B,    KC_P,    KC_F,    KC_W,    KC_Q,  XK_TAB, \
-  _______,    KC_O,    KC_I,    KC_E,    KC_N,    KC_M,            KC_G,    KC_T,    KC_S,    KC_R,    KC_A, _______, \
-    KYSFT, KC_SLSH,  KC_DOT, KC_COMM,    KC_H,    KC_K,         TD(UND),    KC_V,    KC_D,    KC_C,    KC_X,   KYSFT, \
-   XK_GRV,  PIPBOY,    M(1), KC_BTN1, KC_HOME,  KC_ENT,          KC_ENT,  KC_END, KC_LGUI, TD(ESC), KC_LALT,   KYCTL \
-),
-
-/*
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │    │ 1  │ 2  │ 3  │ 4  │ 5  │    │ 6  │ 7  │ 8  │ 9  │ 0  │    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │ M  │ V- │ V+ │NEXT│PLAY│    │ ←  │ ↓  │ ↑  │ →  │DASH│INS │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │ -  │ =  │TGL │    │    │    │HOME│END │HOME│    │ \  │ ~  │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │    │    │    │    │    │    │    │    │    │    │    │    │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-*/
-[_IKAPILA] = LAYOUT( \
-  _______,    KC_1,    KC_2,    KC_3,    KC_4,       KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, \
-  _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT,    KC_MPLY,         KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, TD(DSH),  KC_INS, \
-  _______, KC_MINS,  KC_EQL, XXXXXXX, XXXXXXX, LCTL(KC_Z),         KC_HOME, TD(HND), KC_HOME, XXXXXXX, KC_BSLS, KC_TILD, \
-  _______, _______, _______, _______, _______,    _______,         _______, _______, _______, _______, _______, _______ \
-),
-
-/*
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │    │ !  │ @  │ #  │ $  │ %  │    │ ^  │ &  │ *  │ (  │ )  │BSPC│
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │DEL │    │ ←  │ ↓  │ ↑  │ →  │    │NEXT│PGUP│ V+ │ V- │DASH│PSCR│
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │ _  │ +  │END │HOME│END │    │    │    │    │ [  │ ]  │    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │    │    │    │    │    │    │    │    │    │    │    │    │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-*/
-
-[_IKASHFT] =  LAYOUT( \
-  _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-   KC_DEL, TD(PGN), KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,         KC_MNXT, KC_PGUP, KC_VOLU, TD(VOM), KC_MDSH, KC_PSCR, \
-  _______, KC_UNDS, KC_PLUS,  KC_END, KC_HOME,  KC_END,            M(1),    M(0),    M(2), KC_LBRC, KC_RBRC, _______, \
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______ \
-),
-
-/*
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │    │ →  │ ↑  │ ←  │ ↓  │ →  │    │ →  │ ↓  │ ←  │ ↑  │ ↑  │    │ just in case someone hacks my IP with a 10MeG pipe, you know?
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │ ←  │ ↓  │ →  │ ↑  │ ←  │    │ ↑  │ ←  │ ↓  │ →  │ ←  │    │ hacker_evasion layer
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤ >>init network SEQUENCE
-  │    │ ↑  │ ←  │ ↓  │ →  │ ↑  │    │ ↓  │ ←  │ ↑  │ →  │ ←  │    │   sleep 11; echo "DONE\n"
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤   throttle INPUT 11001001 OUTPUT 010011001 ? FULL )); \
-  │    │    │    │ →  │ ←  │ ↓  │    │ →  │ ↑  │ ←  │ ↓  │ ↑  │    │ <<chKConfig cargoCode ==== "'1'"
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘   up down left right KC_b KC_a GUI
-*/
-
-[_ARROWKY] =  LAYOUT( \
-
-
-  _______, KC_RGHT,   KC_UP, KC_LEFT, KC_DOWN, KC_RGHT,           KC_UP, KC_LEFT, KC_DOWN, KC_RGHT,   KC_UP, _______, \
-  _______, KC_LEFT, KC_DOWN, KC_RGHT,   KC_UP, KC_LEFT,         KC_DOWN, KC_RGHT,   KC_UP, KC_LEFT, KC_DOWN, _______, \
-  _______,   KC_UP, KC_LEFT, KC_DOWN, KC_RGHT,   KC_UP,         KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_LEFT, _______, \
-  _______, _______, KC_RGHT,   KC_UP, KC_LEFT, KC_DOWN,         KC_RGHT,   KC_UP, KC_LEFT, KC_DOWN, KC_RGHT, _______ \
-),
-
-/*
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │    │ F1 │ F2 │ F3 │ F4 │ F5 │    │ F6 │ F7 │ F8 │ F9 │ F10│    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │ F21│ F22│ F23│ F24│PAUS│    │    │SCLK│BOOT│    │NKRO│CAPS│
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │    │    │    │    │    │    │    │    │    │    │    │    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │    │    │    │    │    │    │    │    │    │    │    │    │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-*/
-
-[_FNCTION] =  LAYOUT( \
-  _______, TD(F11), TD(F12), TD(F13), TD(F14), TD(F15),         TD(F16), TD(F17), TD(F18), TD(F19), TD(F20), _______, \
-  _______,  KC_F21,  KC_F22,  KC_F23,  KC_F24, XXXXXXX,         XXXXXXX, KC_SLCK, XXXXXXX, XXXXXXX,  TGNKRO, XXXXXXX, \
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, \
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______ \
-),
-
-/*
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │    │ →  │ F7 │ F8 │ F9 │ ↑  │    │ P7 │ P8 │ P9 │NLCK│ P- │BDEL│
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │ ←  │ F4 │ F5 │ F6 │ ↓  │    │ P4 │ P5 │ P6 │^INS│ P+ │ () │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │CALT│ F1 │ F2 │ F3 │    │    │ P1 │ P2 │ P3 │    │ P* │ =  │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │    │ F0?│    │    │    │    │ P0 │ 0  │ P. │TGL │ P/ │    │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-*/
-
-[_NINEKEY] =  LAYOUT( \
-  _______, KC_RGHT,   KC_F7,   KC_F8,   KC_F9,   KC_UP,       KC_P7,   KC_P8,   KC_P9,      KC_NLCK,KC_PMNS, KC_DEL, \
-  _______, KC_LEFT,   KC_F4,   KC_F5,   KC_F6, KC_DOWN,       KC_P4,   KC_P5,   KC_P6,        CAINS,KC_PPLS, M(0), \
-  _______,    CAKY,   KC_F1,   KC_F2,   KC_F3, XXXXXXX,       KC_P1,   KC_P2,   KC_P3,      XXXXXXX,KC_PAST, TD(EQE), \
-  _______, _______, _______,  KC_F11, _______, _______,       KC_P0,    KC_0, KC_PDOT,         CAKY,KC_PSLS, _______ \
-),
-
-/*
-  ┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-  │ESC │^HOM│^PGD│^UP │^PGU│^PGU│    │    │MW_L│ MU │MW_R│ AC2│    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │^END│^LFT│^DWN│^RGT│^PGD│    │    │ ML │ MD │ MR │ AC1│    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │ M5 │ M2 │ M4 │ M3 │ M1 │    │    │MW_D│MW_U│    │ AC0│    │
-  ├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-  │    │    │    │    │    │    │    │    │    │    │    │    │    │
-  └────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-*/
-
-[_NAVIGAT] =  LAYOUT( \
-   KC_ESC,   NAVCH,  NAVCPD,   NAVCU,  NAVCPU,  NAVCPU,         XXXXXXX, KC_WH_L, KC_MS_U, KC_WH_R, KC_ACL2, _______, \
-  _______,   NAVCE,   NAVCL,   NAVCD,   NAVCR,  NAVCPD,         XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_ACL1, _______, \
-  _______, KC_BTN5, KC_BTN2, KC_BTN4, KC_BTN3, KC_BTN1,         XXXXXXX, KC_WH_D, KC_WH_U, XXXXXXX, KC_ACL0, _______, \
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______ \
-),
-
-//ew. jk
-[_QWERTY] = 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_SCLN, KC_QUOT, \
-  _______,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, SFT_ENT, \
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______ \
-),
-
-[_MLAYER] =  LAYOUT( \
-  _______,UC(0x250C),UC(0x252C),UC(0x2510),UC(0x2500),UC(0x2502),       _______, _______, _______, _______, _______, _______, \
-  KC_QUOT,UC(0x251C),UC(0x253C),UC(0x2524),   _______,   _______,          M(1),    M(0),    M(2), _______, _______, _______, \
-  _______,UC(0x2514),UC(0x2534),UC(0x2518),   _______,   _______,       _______, _______, _______, _______, _______, _______, \
-  _______,     WINSH,       WIN,       OSX,   _______,   _______,       _______, _______, _______, _______, _______, _______ \
-),
-
-[_GRVTABL] =  LAYOUT( \
-    TG(5),LALT(KC_PSCR),    M(4),  KC_PWR,KC_PWR,     QK_BOOT,         QK_BOOT,  KC_R,    KC_E,    KC_I,LALT(KC_PSCR),TG(3), \
-    TG(1),        TG(6),   TG(7),   TG(9),   TG(3),   TG(2),           TG(2),    KC_S,    KC_U,    KC_B,   TG(6),   TG(1), \
-     M(3),        TG(8), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,         KC_MYCM, KC_CALC, XXXXXXX, XXXXXXX,   TG(8),    M(3), \
-   TT(15),        TG(6),   TG(7),   TG(9),   TG(3),   TG(2),           TG(2),   TG(3),   TG(9),   TG(7),   TG(6), _______ \
-)};
-
-
-qk_tap_dance_action_t tap_dance_actions[] = {
- [VOM] = ACTION_TAP_DANCE_DOUBLE(KC_VOLD, KC_MUTE),
- [PRN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),
- [EGT] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
- [HRD] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
- [DSH] = ACTION_TAP_DANCE_DOUBLE(KC_NDSH, KC_MDSH),
- [ESC] = ACTION_TAP_DANCE_DOUBLE(KC_ESC,  LALT(KC_F4)),
- [EQE] = ACTION_TAP_DANCE_DOUBLE(KC_EQL,  KC_ENT),
- [UND] = ACTION_TAP_DANCE_DOUBLE(KC_Z,    LCTL(KC_Z)),
- [PGN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_PGUP),
- [HND] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
- [COD] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
- [F11] = ACTION_TAP_DANCE_DOUBLE(KC_F1,   KC_F11),
- [F12] = ACTION_TAP_DANCE_DOUBLE(KC_F2,   KC_F12),
- [F13] = ACTION_TAP_DANCE_DOUBLE(KC_F3,   KC_F13),
- [F14] = ACTION_TAP_DANCE_DOUBLE(KC_F4,   KC_F14),
- [F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5,   KC_F15),
- [F16] = ACTION_TAP_DANCE_DOUBLE(KC_F6,   KC_F16),
- [F17] = ACTION_TAP_DANCE_DOUBLE(KC_F7,   KC_F17),
- [F18] = ACTION_TAP_DANCE_DOUBLE(KC_F8,   KC_F18),
- [F19] = ACTION_TAP_DANCE_DOUBLE(KC_F9,   KC_F19),
- [F20] = ACTION_TAP_DANCE_DOUBLE(KC_F10,  KC_F20),
-};
-
-void matrix_init_user(){
-  set_unicode_input_mode(UC_LNX);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  if (record->event.pressed) {
-    switch(id) {
-  case 0:
-    return MACRO( D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), T(LEFT), END );
-  case 1:
-    return MACRO( D(LSFT), T(LBRC), U(LSFT), D(LSFT), T(RBRC), U(LSFT), T(LEFT), END );
-  case 2:
-    return MACRO( T(LBRC), T(RBRC), T(LEFT), END);
-  case 3:
-    clear_keyboard();
-  case 4:
-    return MACRO( D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(LBRACKET), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(BSLASH), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(7), U(LSFT), D(LSFT), T(RBRACKET), U(LSFT), T(SCOLON), D(LSFT), T(SCOLON), U(LSFT), END );
-  case WINSH:
-    set_unicode_input_mode(UC_WIN);
-    return false;
-    break;
-  case WIN:
-    set_unicode_input_mode(UC_WINC);
-    return false;
-    break;
-  case OSX:
-    set_unicode_input_mode(UC_MAC);
-    return false;
-    break;
-   }
-  }
- return MACRO_NONE;
-};
diff --git a/keyboards/lets_split/keymaps/xk/rules.mk b/keyboards/lets_split/keymaps/xk/rules.mk
deleted file mode 100644
index a624479b59..0000000000
--- a/keyboards/lets_split/keymaps/xk/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-USE_I2C = yes
-TAP_DANCE_ENABLE = yes
-
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-
diff --git a/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md b/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
deleted file mode 100644
index c00cca1c5b..0000000000
--- a/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-```
-/* Base layer - workman
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   q  |   d  |   r  |   w  |   b  |           |   j  |   f  |   u  |   p  |   ;  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   a  |   s  |   h  |   t  |   g  |           |   y  |   n  |   e  |   o  |   i  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   z  |   x  |   m  |   c  |   v  |           |   k  |   l  | dead |   .  |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,---------------------.
- *                 | tab   | esc  | enter|    |bckspc| space|   tab |
- *                 | shift | ctrl | alt  |    |  gui |   fn | shift |
- *                 `-------+------+      |    |      |------+-------.
- *                                `------'    `------'
- */
-
-/* Dead key layer
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   %  |   &  |   ?  |   +  |   @  |           |   $  |   _  |   [  |   ]  |   !  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   #  |   (  |   =  |   0  |   {  |           |   }  |   1  |   *  |   )  |   -  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   6  |   7  |   8  |   9  |   |  |           |   \  |   2  |   3  |   4  |   5  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,---------------------.
- *                 | tab   | esc  | comma|    |bckspc| comma|   tab |
- *                 | shift | ctrl |+enter|    |  gui |+space| shift |
- *                 `-------+------+      |    |      |------+-------.
- *                                `------'    `------'
- */
-
-/* Function layer
- *
- * ,----------------------------------.           ,---------------------------------.
- * |      |  del |⌃←  |  ⌃→ |      |           | mute | vol- | vol+ | ⌘⌃p |      |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   `  |  end | pgup | pgdn | home |           |  ←  |   ↓  |   ↑  |  →  |   '  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | ⌥⇥ |      |⇧⌃⇥| ⌃⇥  |       |           |      |  br- | ,    | br+  |  ^   |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,---------------------.
- *                 | tab   |      | enter|    |bckspc|      |   tab |
- *                 | shift |      | alt  |    |  gui |      | shift |
- *                 `-------+------+      |    |      |------+-------.
- *                                `------'    `------'
- */
-```
diff --git a/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c b/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
deleted file mode 100644
index cb7cd4d0a5..0000000000
--- a/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _WM      0
-#define _DK      1
-#define _FUN     2
-
-#define _DK_ACT  0
-#define _DK_REL  1
-#define _KC_COMS 2
-#define _KC_CENT 3
-
-#define DK_ACT   M(_DK_ACT)        // activate dead key layer
-#define DK_REL   M(_DK_REL)        // release dead key layer
-#define KC_COMS  M(_KC_COMS)       // comma + space
-#define KC_CENT  M(_KC_CENT)       // comma + enter
-#define KC_ENOP  ALT_T(KC_ENT)     // press for enter, hold for option
-#define KC_BSCM  GUI_T(KC_BSPC)    // press for backspace, hold for command
-#define KC_CTES  CTL_T(KC_ESC)     // press for escape, hold for control
-#define KC_SHTB  SFT_T(KC_TAB)     // press for tab, hold for shift
-#define KC_SPFN  LT(_FUN, KC_SPC)  // press for space, hold for function layer (aka spacefn)
-#define KC_OPTB  RALT(KC_TAB)      // option + tab
-#define KC_CCSP  RGUI(RCTL(KC_P))  // control + command + p
-#define KC_CSTB  S(RCTL(KC_TAB))   // shift + control + tab
-#define KC_C_TB  RCTL(KC_TAB)      // control + tab
-#define KC_C_LF  RCTL(KC_LEFT)     // control + left
-#define KC_C_RT  RCTL(KC_RGHT)     // control + right
-#define KC_BRUP  KC_F15            // brightness up on osx
-#define KC_BRDN  KC_F14            // brightness down on osx
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Base layer - workman
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   q  |   d  |   r  |   w  |   b  |           |   j  |   f  |   u  |   p  |   ;  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   a  |   s  |   h  |   t  |   g  |           |   y  |   n  |   e  |   o  |   i  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   z  |   x  |   m  |   c  |   v  |           |   k  |   l  | dead |   .  |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,---------------------.
- *                 | tab   | esc  | enter|    |bckspc| space|   tab |
- *                 | shift | ctrl | alt  |    |  gui |   fn | shift |
- *                 `-------+------+      |    |      |------+-------.
- *                                `------'    `------'
- */
-  [_WM] = 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,    DK_ACT,  KC_DOT,  KC_SLSH, \
-                      KC_SHTB, KC_CTES, KC_ENOP,     KC_BSCM, KC_SPFN, KC_SHTB                    \
-  ),
-
-/* Dead key layer
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   %  |   &  |   ?  |   +  |   @  |           |   $  |   _  |   [  |   ]  |   !  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   #  |   (  |   =  |   0  |   {  |           |   }  |   1  |   *  |   )  |   -  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   6  |   7  |   8  |   9  |   |  |           |   \  |   2  |   3  |   4  |   5  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,---------------------.
- *                 | tab   | esc  | comma|    |bckspc| comma|   tab |
- *                 | shift | ctrl |+enter|    |  gui |+space| shift |
- *                 `-------+------+      |    |      |------+-------.
- *                                `------'    `------'
- */
-  [_DK] = LAYOUT( \
-    KC_PERC, KC_AMPR, KC_QUES, KC_PLUS, KC_AT,       KC_DLR,  KC_UNDS, KC_LBRC, KC_RBRC, KC_EXLM, \
-    KC_HASH, KC_LPRN, KC_EQL,  KC_0,    KC_LCBR,     KC_RCBR, KC_1,    KC_ASTR, KC_RPRN, KC_MINS, \
-    KC_6,    KC_7,    KC_8,    KC_9,    KC_PIPE,     KC_BSLS, KC_2,    DK_REL,  KC_4,    KC_5,    \
-                      KC_SHTB, KC_CTES, KC_CENT,     KC_BSCM, KC_COMS, KC_SHTB                    \
-  ),
-
-/* Function layer
- *
- * ,----------------------------------.           ,---------------------------------.
- * |      |  del |⌃←  |  ⌃→ |      |           | mute | vol- | vol+ | ⌘⌃p |      |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   `  |  end | pgup | pgdn | home |           |  ←  |   ↓  |   ↑  |  →  |   '  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | ⌥⇥ |      |⇧⌃⇥| ⌃⇥  |       |           |      |  br- | ,    | br+  |  ^   |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,---------------------.
- *                 | tab   |      | enter|    |bckspc|      |   tab |
- *                 | shift |      | alt  |    |  gui |      | shift |
- *                 `-------+------+      |    |      |------+-------.
- *                                `------'    `------'
- */
- [_FUN] = LAYOUT( \
-    XXXXXXX, KC_DEL,  KC_C_LF, KC_C_RT, XXXXXXX,     KC_MUTE, KC_VOLD, KC_VOLU, KC_CCSP, XXXXXXX, \
-    KC_GRV,  KC_END,  KC_PGUP, KC_PGDN, KC_HOME,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT, \
-    KC_OPTB, XXXXXXX, KC_CSTB, KC_C_TB, XXXXXXX,     XXXXXXX, KC_BRDN, KC_COMM, KC_BRUP, KC_CIRC, \
-                      KC_SHTB, XXXXXXX, KC_ENOP,     KC_BSCM, _______, KC_SHTB                    \
-  )
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
-    case _KC_COMS:
-      if (record->event.pressed) {
-        return MACRO(T(COMM), T(SPC), END); // comma + space
-      }
-      break;
-    case _KC_CENT:
-      if (record->event.pressed) {
-        return MACRO(T(COMM), T(ENT), END); // comma + enter
-      }
-      break;
-    case _DK_ACT:
-      if (record->event.pressed) {
-        if (keyboard_report->mods & MOD_BIT(KC_LSFT) || keyboard_report->mods & MOD_BIT(KC_RSFT)) { // act as comma when shift is pressed (eg <)
-          register_code(KC_COMM);
-        } else { // activate oneshot dead key layer otherwise
-          layer_on(_DK);
-          set_oneshot_layer(_DK, ONESHOT_START);
-        }
-      } else { // make sure to deactive dead key layer on key release
-        clear_oneshot_layer_state(ONESHOT_PRESSED);
-        unregister_code(KC_COMM);
-      }
-      break;
-    case _DK_REL:
-      if (record->event.pressed) { // act as 3 on keypress
-        register_code(KC_3);
-      } else { // make sure to deactive dead key layer on key release
-        clear_oneshot_layer_state(ONESHOT_PRESSED);
-        unregister_code(KC_3);
-      }
-      break;
-  }
-
-  return MACRO_NONE;
-};
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
deleted file mode 100644
index b78584c3aa..0000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FN1 1
-#define _FN2 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_BL] = LAYOUT_2u_space_ortho(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-		KC_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_CAPS, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-
-	[_FN1] = LAYOUT_2u_space_ortho(
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
-		KC_TRNS, KC_TRNS, KC_TRNS, M(1), M(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-	[_FN2] = LAYOUT_2u_space_ortho(
-		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
-		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_HOME, KC_END, KC_TRNS,
-		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_PGDN, KC_PGUP, KC_MPLY),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-
-
-	switch (id) {
-		case 1:
-			if (record->event.pressed) {
-				return MACRO( D(LCTL), T(C), U(LCTL), END );
-			}
-			break;
-		case 2:
-			if (record->event.pressed) {
-				return MACRO( D(LCTL), T(V), U(LCTL), END );
-			}
-			break;
-	}
-	return MACRO_NONE;
-}
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
deleted file mode 100755
index e931aab63b..0000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FN1 1
-#define _FN2 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_BL] = LAYOUT_ortho(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-		KC_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_CAPS, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-
-	[_FN1] = LAYOUT_ortho(
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
-		KC_TRNS, KC_TRNS, KC_TRNS, M(1), M(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-	[_FN2] = LAYOUT_ortho(
-		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
-		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_HOME, KC_END, KC_TRNS,
-		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_PGDN, KC_PGUP, KC_MPLY),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-
-
-	switch (id) {
-		case 1:
-			if (record->event.pressed) {
-				return MACRO( D(LCTL), T(C), U(LCTL), END );
-			}
-			break;
-		case 2:
-			if (record->event.pressed) {
-				return MACRO( D(LCTL), T(V), U(LCTL), END );
-			}
-			break;
-	}
-	return MACRO_NONE;
-}
diff --git a/keyboards/mitosis/keymaps/mjt/config.h b/keyboards/mitosis/keymaps/mjt/config.h
deleted file mode 100644
index 830cbc9e09..0000000000
--- a/keyboards/mitosis/keymaps/mjt/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define AUDIO_VOICES
-#define AUDIO_PIN C6
-
-// fix iPhone power adapter issue
-#define USB_MAX_POWER_CONSUMPTION 50
-
-
-#endif
diff --git a/keyboards/mitosis/keymaps/mjt/keymap.c b/keyboards/mitosis/keymaps/mjt/keymap.c
deleted file mode 100644
index df94e8c5bf..0000000000
--- a/keyboards/mitosis/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,337 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#include QMK_KEYBOARD_H
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum mitosis_layers
-{
-  _QWERTY,
-  _SHIFTED,
-  _FUNCTIONPC,
-  _FUNCTIONMAC,
-  _FUNCSHIFT,
-  _ADJUST
-};
-
-enum mitosis_keycodes
-{
-  FNKEY = SAFE_RANGE,
-  SHIFT,
-  MACSLEEP,
-  FNMAC,
-  FNPC,
-  AUDIOTEST,
-  DYNAMIC_MACRO_RANGE,
-};
-
-
-// Macro definitions for readability
-enum mitosis_macros
-{
-  VOLU,
-  VOLD,
-  ESCM
-};
-
-
-#include "dynamic_macro.h"
-
-#define LONGPRESS_DELAY 150
-#define LAYER_TOGGLE_DELAY 900
-
-// Fillers to make layering more clear
-#define __MOD__ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT( /* QWERTY adapted to this crazy thing */
-    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_SLSH),
-                KC_LCTL, M(ESCM),  KC_TAB,  KC_QUOT,       KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,
-                KC_LALT, KC_LGUI, KC_SPC,  SHIFT,          FNKEY,   KC_BSPC, KC_ENT,  MO(_ADJUST)
-  ),
-
-
-  [_SHIFTED] = LAYOUT( /* Shifted Layer, layered so that tri_layer can be used, or selectively
-                                         able to modify individual key's shifted behaviour */
-    _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______,
-             __MOD__, KC_DEL,  _______, _______,       _______, _______, _______, _______,
-             __MOD__, __MOD__, _______, __MOD__,       __MOD__, _______, _______, XXXXXXX
-  ),
-
-
-  [_FUNCTIONPC] = LAYOUT( /* Function Layer mimicks planck's raise layer somewhat */
-    KC_1,       KC_2,          KC_3,    KC_4,      KC_5,          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    LCTL(KC_A), LCTL(KC_S),    _______, LCTL(KC_F),_______,       _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
-    LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V),_______,       _______, KC_BSLS, _______, _______, KC_QUOT,
-                __MOD__,        KC_DEL, _______,   KC_GRV,        KC_HOME, KC_PGDN, KC_PGUP, KC_END,
-                __MOD__,       __MOD__, _______,   __MOD__,       __MOD__, _______, KC_PSCR, XXXXXXX
-  ),
-
-  [_FUNCTIONMAC] = LAYOUT( /* Function Layer mimicks planck's raise layer somewhat */
-    KC_1,       KC_2,          KC_3,    KC_4,      KC_5,          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    LGUI(KC_A), LGUI(KC_S),    _______, LGUI(KC_F),_______,       _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
-    LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V),_______,       _______, KC_BSLS, _______, _______, KC_QUOT,
-                __MOD__,        KC_DEL, _______,   KC_GRV,        KC_HOME, KC_PGDN, KC_PGUP, KC_END,
-                __MOD__,       __MOD__, _______,   __MOD__,       __MOD__, _______, KC_PSCR, XXXXXXX
-  ),
-
-  [_FUNCSHIFT] = LAYOUT( /* Function Shifted Layer mimicks planck's lower layer somewhat */
-    _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______,
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         KC_F6,   _______, _______, KC_LCBR, KC_RCBR,
-    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,        KC_F12,  _______, _______, _______, _______,
-             __MOD__, KC_DEL,  _______, KC_TILD,       _______, _______, _______, _______,
-             __MOD__, __MOD__, _______, __MOD__,       __MOD__, _______, _______, _______
-  ),
-
-
-  [_ADJUST] = LAYOUT( /* Adjust layer for fancy stuff and macros */
-    QK_BOOT, FNPC,    _______, _______,  _______,       _______, DYN_REC_START1,  DYN_REC_START2,  _______,  _______,
-    FNMAC,   _______,   AU_ON, AU_OFF,   _______,       _______, _______,         _______,         MACSLEEP, _______,
-    MUV_DE,  MUV_IN,    MU_ON, MU_OFF,   _______,       _______, KC_MUTE,         KC_MPRV,         KC_MNXT,  KC_MPLY,
-             __MOD__, _______, _______,  _______,       _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,  _______,
-             __MOD__, __MOD__, _______,  __MOD__,       __MOD__, _______,         _______,         __MOD__
-  )
-
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dyn_macro_rec[][2]     = SONG(DVORAK_SOUND);
-float tone_dyn_macro_play[][2]    = SONG(COLEMAK_SOUND);
-float tone_fnpc[][2]     = SONG(PLOVER_SOUND);
-float tone_fnmac[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-static uint16_t function_layer = _FUNCTIONMAC;
-static uint16_t key_timer;
-
-void persistent_function_layer_set(uint16_t new_function_layer) {
-  // eeconfig_update_function_layer(new_function_layer);
-  function_layer = new_function_layer;
-  // should clear layers to avoid getting stuck.
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-  switch(id) {
-
-  //switch multiplexing for media, short tap for volume up, long press for play/pause
-  case VOLU:
-    if (record->event.pressed) {
-      key_timer = timer_read();           // if the key is being pressed, we start the timer.
-    } else {         // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down").
-      if (timer_elapsed(key_timer) > LONGPRESS_DELAY) {           // LONGPRESS_DELAY being 150ms, the threshhold we pick for counting something as a tap.
-        return MACRO(T(MPLY), END);
-      } else {
-        return MACRO(T(VOLU), END);
-      }
-    }
-    break;
-
-  //switch multiplexing for media, short tap for volume down, long press for next track
-  case VOLD:
-    if (record->event.pressed) {
-      key_timer = timer_read();
-    } else {
-      if (timer_elapsed(key_timer) > LONGPRESS_DELAY) {
-        return MACRO(T(MNXT), END);
-      } else {
-        return MACRO(T(VOLD), END);
-      }
-    }
-    break;
-
-  //switch multiplexing for escape, short tap for escape, long press for context menu
-  case ESCM:
-    if (record->event.pressed) {
-      key_timer = timer_read();
-    } else {
-      if (timer_elapsed(key_timer) > LONGPRESS_DELAY) {
-        return MACRO(T(APP), END);
-      } else {
-        return MACRO(T(ESC), END);
-      }
-    }
-    break;
-  }
-  return MACRO_NONE;
-};
-
-static bool singular_key = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint16_t macro_kc = (keycode == MO(_ADJUST) ? DYN_REC_STOP : keycode);
-  if (!process_record_dynamic_macro(macro_kc, record)) {
-    return false;
-  }
-  uint8_t layer;
-  layer = get_highest_layer(layer_state);  // get the current layer
-
-  //custom layer handling for tri_layer,
-  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 FNKEY:
-    if (record->event.pressed) {
-      key_timer = timer_read();
-      singular_key = true;
-      // layer_on(_FUNCTION);
-      layer_on(function_layer);
-    } else {
-      if (timer_elapsed(key_timer) < LAYER_TOGGLE_DELAY || !singular_key) {
-        layer_off(function_layer);
-      }
-    }
-    update_tri_layer(function_layer, _SHIFTED, _FUNCSHIFT);
-    return false;
-    break;
-  //SHIFT is handled as LSHIFT in the general case
-  case SHIFT:
-    if (record->event.pressed) {
-      key_timer = timer_read();
-      singular_key = true;
-      layer_on(_SHIFTED);
-      register_code(KC_LSFT);
-    } else {
-      if (timer_elapsed(key_timer) < LAYER_TOGGLE_DELAY || !singular_key) {
-        layer_off(_SHIFTED);
-        unregister_code(KC_LSFT);
-      }
-    }
-    update_tri_layer(function_layer, _SHIFTED, _FUNCSHIFT);
-    return false;
-    break;
-  case FNPC:
-    if (record->event.pressed) {
-      persistent_function_layer_set(_FUNCTIONPC);
-      #ifdef AUDIO_ENABLE
-        PLAY_SONG(tone_fnpc);
-      #endif
-    }
-    return false;
-    break;
-  case FNMAC:
-    if (record->event.pressed) {
-      persistent_function_layer_set(_FUNCTIONMAC);
-      #ifdef AUDIO_ENABLE
-        PLAY_SONG(tone_fnmac);
-      #endif
-    }
-  return false;
-  break;
-    case AUDIOTEST:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-        PLAY_SONG(music_scale);
-        register_code(KC_M);
-        unregister_code(KC_M);
-        #endif
-        register_code(KC_A);
-      } else {
-        unregister_code(KC_A);
-      }
-    return false;
-    break;
-  //If any other key was pressed during the layer mod hold period,
-  //then the layer mod was used momentarily, and should block latching
-  default:
-    singular_key = false;
-    break;
-  }
-
-  //FUNCSHIFT has been shifted by the SHIFT handling, some keys need to be excluded
-  if (layer == _FUNCSHIFT) {
-    //F1-F12 should be sent as unshifted keycodes,
-    //and ] needs to be unshifted or it is sent as }
-    if ( (keycode >= KC_F1 && keycode <= KC_F12)
-         || keycode == KC_RBRC ) {
-      if (record->event.pressed) {
-        unregister_mods(MOD_LSFT);
-      } else {
-        register_mods(MOD_LSFT);
-      }
-    }
-  }
-
-  return true;
-};
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
-
-void matrix_scan_user(void) {
-  uint8_t layer = get_highest_layer(layer_state);
-
-  switch (layer) {
-  case _QWERTY:
-    set_led_off;
-    break;
-  case _FUNCTIONMAC:
-    set_led_blue;
-    break;
-  case _FUNCTIONPC:
-    set_led_cyan;
-    break;
-  case _SHIFTED:
-    set_led_red;
-    break;
-  case _FUNCSHIFT:
-    set_led_green;
-    break;
-  case _ADJUST:
-    set_led_white;
-    break;
-  default:
-    break;
-  }
-};
diff --git a/keyboards/mitosis/keymaps/mjt/rules.mk b/keyboards/mitosis/keymaps/mjt/rules.mk
deleted file mode 100644
index 9060940ea5..0000000000
--- a/keyboards/mitosis/keymaps/mjt/rules.mk
+++ /dev/null
@@ -1,12 +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
-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 = yes           # Audio output on port C6
-UNICODE_ENABLE = no          # Unicode
-BLUETOOTH_ENABLE = no        # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no         # Enable WS2812 RGB underlight.
diff --git a/keyboards/miuni32/keymaps/ht_156/config.h b/keyboards/miuni32/keymaps/ht_156/config.h
deleted file mode 100644
index df06a26206..0000000000
--- a/keyboards/miuni32/keymaps/ht_156/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/ht_156/keymap.c b/keyboards/miuni32/keymaps/ht_156/keymap.c
deleted file mode 100644
index f0cbc2c659..0000000000
--- a/keyboards/miuni32/keymaps/ht_156/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Keyboard layer definitions
-#define BASE    0
-#define NUMBERS 1
-#define SYMBOLS 2
-#define MEDIA   3
-
-// Keyboard macro defintions
-#define GIT_ST  M(0)
-#define GIT_PU  M(1)
-#define GIT_CM  M(2)
-#define HM_DIR  M(3)
-
-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  |  RSFT |
-     * |---------------------------------------------------------------------------------------|
-     * |LT(2|Z)|LT(3|X)|   C   |   V   |   B   |  SPC  |   N   |   M   |   ,   |LT(1|.)|  RCTL |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [BASE] = LAYOUT_ortho_3x11(
-    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,        KC_RSFT,
-    LT(2, KC_Z), LT(3, KC_X), KC_C, KC_V, KC_B, KC_SPC, KC_N, KC_M, KC_COMMA, LT(1, KC_DOT), KC_RCTL
-  ),
-  /* Level 1: Numbers Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |  ESC  |   7   |   8   |   9   |   /   |   *   |   .   |   ,   |   (   |   )   |  DEL  |
-     * |---------------------------------------------------------------------------------------|
-     * |  TAB  |   4   |   5   |   6   |   -   |   +   |  HOME |   UP  |  END  |  INS  |  PGUP |
-     * |---------------------------------------------------------------------------------------|
-     * |  LATL |   1   |   2   |   3   |   0   |  ENT  |  LEFT |  DOWN |  RGHT | !TRNS!|  PGDN |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [NUMBERS] = LAYOUT_ortho_3x11(
-    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_INSERT, KC_PGUP,
-    KC_LALT, KC_1, KC_2, KC_3, KC_0,    KC_ENT,  KC_LEFT, KC_DOWN, KC_RGHT, _______,   KC_PGDN
-  ),
-  /* Level 2: Symbols Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |   _   |   =   |   ?   |
-     * |---------------------------------------------------------------------------------------|
-     * | QK_BOOT |  LSFT |   ~   |   {   |   }   |   \   |   |   |   ;   |   :   |   `   |   "   |
-     * |---------------------------------------------------------------------------------------|
-     * | !TRNS!|  LCTL |  TRNS |   [   |   ]   |  TAB  |   <   |   >   |  TRNS |  RCTL |  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [SYMBOLS] = LAYOUT_ortho_3x11(
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_EQL, KC_QUES,
-    QK_BOOT, KC_LSFT, KC_TILD, KC_LCBR, KC_RCBR, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_GRV, KC_DQUO,
-    _______, KC_LCTL, _______, KC_LBRC, KC_RBRC, KC_TAB,  KC_LABK, KC_RABK, _______, KC_RCTL, _______
-  ),
-  /* Level 3: Media Layer
-   * ,---------------------------------------------------------------------------------------.
-   * |RGB_TOG|RGB_HUI|RGB_SAI|RGB_VAI| GIT_CM|  CALC |  WREF |  WFAV |  MUTE |  VOLD |  VOLU |
-   * |---------------------------------------------------------------------------------------|
-   * |RGB_MOD|RGB_HUD|RGB_SAD|RGB_VAD| GIT_ST|  WHOM |  WBAK |  WFWD |  TRNS |  STOP |  PLAY |
-   * |---------------------------------------------------------------------------------------|
-   * |  TRNS | !TRNS!|  TRNS | HM_DIR| GIT_PU|  MYCM |  WSTP |  WSCH |  MSEL |  MPRV |  MNXT |
-   * |---------------------------------------------------------------------------------------|
-   */
-  [MEDIA] = LAYOUT_ortho_3x11(
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, GIT_CM, KC_CALC, KC_WREF, KC_WFAV, KC_MUTE, KC_VOLD, KC_VOLU,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, GIT_ST, KC_WHOM, KC_WBAK, KC_WFWD, _______, KC_MSTP, KC_MPLY,
-    _______, _______, _______, HM_DIR,  GIT_PU, KC_MYCM, KC_WSTP, KC_WSCH, KC_MSEL, KC_MPRV, KC_MNXT
-  )
-};
-
-void press_and_release_key(uint8_t code)
-{
-    register_code(code);
-    unregister_code(code);
-}
-
-void press_and_release_mod_key(uint8_t mod, uint8_t code)
-{
-    register_code(mod);
-    register_code(code);
-    unregister_code(code);
-    unregister_code(mod);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id)
-      {
-        case 0:
-          if (record->event.pressed)
-          {
-            return MACRO(T(G), T(I), T(T), T(SPC),
-                         T(S), T(T), T(A), T(T), T(U), T(S), END);
-          }
-        break;
-        case 1:
-          if (record->event.pressed)
-          {
-            return MACRO(T(G), T(I), T(T), T(SPC),
-                         T(P), T(U), T(L), T(L), END);
-          }
-        break;
-        case 2:
-          if (record->event.pressed)
-          {
-            return MACRO(T(G), T(I), T(T), T(SPC),
-                         T(C), T(O), T(M), T(M), T(I), T(T), END);
-          }
-        break;
-        case 3:
-          if (record->event.pressed)
-          {
-            /*press_and_release_key(KC_C);
-            press_and_release_key(KC_D);
-            press_and_release_key(KC_SPC);
-            press_and_release_mod_key(KC_LSFT, KC_GRV);
-            press_and_release_key(KC_SLSH);
-            press_and_release_key(KC_Q);
-            press_and_release_key(KC_M);
-            press_and_release_key(KC_K);
-            press_and_release_mod_key(KC_LSFT, KC_MINS);*/
-            return MACRO(I(0),
-                         T(C), T(D), T(SPC),
-                         D(LSFT), T(GRV), U(LSFT), T(SLSH),
-                         T(Q), T(M), T(K), D(LSFT), T(MINS), U(LSFT),
-                         T(F), T(I), T(R), T(M), T(W), T(A), T(R), T(E), T(SLSH),
-                         T(K), T(E), T(Y), T(B), T(O), T(A), T(R), T(D), T(S), T(SLSH),
-                         T(M), T(I), T(U), T(N), T(I), T(3), T(2), T(SLSH),
-                         T(K), T(E), T(Y), T(M), T(A), T(P), T(S), END);
-          }
-      }
-    return MACRO_NONE;
-};
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
-}
diff --git a/keyboards/miuni32/keymaps/ht_156/readme.md b/keyboards/miuni32/keymaps/ht_156/readme.md
deleted file mode 100644
index e46cc6d539..0000000000
--- a/keyboards/miuni32/keymaps/ht_156/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# ht_156's keymap for miuni32, using 33 keys
diff --git a/keyboards/miuni32/keymaps/ht_156/rules.mk b/keyboards/miuni32/keymaps/ht_156/rules.mk
deleted file mode 100644
index 1022078ba6..0000000000
--- a/keyboards/miuni32/keymaps/ht_156/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/planck/keymaps/ab/keyboard-layout.json b/keyboards/planck/keymaps/ab/keyboard-layout.json
deleted file mode 100644
index 29ca73fb6f..0000000000
--- a/keyboards/planck/keymaps/ab/keyboard-layout.json
+++ /dev/null
@@ -1,199 +0,0 @@
-[
-  {
-    "name": "AB's Practical Keymap for Planck",
-    "author": "Anand Babu Periasamy"
-  },
-  [
-    {
-      "fa": [
-        2,
-        2,
-        0,
-        2
-      ]
-    },
-    "F1\n1\n\n!\n\n\n\n\n\nTab",
-    "F2\n2\n\n@\n\n\n\n\n\nQ",
-    "F3\n3\n\n#\n\n\n\n\n\nW",
-    "F4\n4\n\n$\n\n\n\n\n\nE",
-    "F5\n5\n\n%\n\n\n\n\n\nR",
-    "F6\n6\n\n^\n\n\n\n\n\nT",
-    "F7\n7\n\n&\n\n\n\n\n\nY",
-    "F8\n8\n\n*\n\n\n\n\n\nU",
-    "F9\n9\n\n(\n\n\n\n\n\nI",
-    "F10\n0\n\n)\n\n\n\n\n\nO",
-    "F11\n-\n\n_\n\n\n\n\n\nP",
-    "F12\n=\n\n+\n\n\n\n\n\n<i class=\"fa fa-chevron-circle-left\" aria-hidden=\"true\"></i>"
-  ],
-  [
-    {
-      "a": 7,
-      "f": 3
-    },
-    "Ctrl",
-    {
-      "f": 3
-    },
-    "A",
-    {
-      "f": 3
-    },
-    "S",
-    {
-      "f": 3
-    },
-    "D",
-    {
-      "c": "#c4bcbc",
-      "a": 4,
-      "f": 3
-    },
-    "\n(\n\n\n\n\n\n\n\nF",
-    {
-      "c": "#cccccc",
-      "f": 3
-    },
-    "\n)\n\n\n\n\n\n\n\nG",
-    {
-      "f": 3
-    },
-    "\\\n\n\n\n\n\n\n\n\nH",
-    {
-      "c": "#c4bcbc",
-      "f": 3
-    },
-    "|\n\n\n\n\n\n\n\n\nJ",
-    {
-      "c": "#cccccc",
-      "a": 7,
-      "f": 3
-    },
-    "K",
-    {
-      "f": 3
-    },
-    "L",
-    {
-      "a": 6,
-      "f": 3
-    },
-    ";\n\n:",
-    {
-      "f": 3
-    },
-    "'\n\n\""
-  ],
-  [
-    {
-      "a": 7,
-      "f": 3
-    },
-    "Shift",
-    {
-      "f": 3
-    },
-    "Z",
-    {
-      "f": 3
-    },
-    "X",
-    {
-      "f": 3
-    },
-    "C",
-    {
-      "a": 4,
-      "fa": [
-        2,
-        2,
-        0,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ]
-    },
-    "\n[\n\n\n\n\n\n\n\nV",
-    "\n]\n\n\n\n\n\n\n\nB",
-    {
-      "fa": [
-        0,
-        2,
-        0,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ]
-    },
-    "`\n{\n\n\n\n\n\n\n\nN",
-    "~\n}\n\n\n\n\n\n\n\nM",
-    {
-      "a": 6
-    },
-    ",\n\n<",
-    ".\n\n>",
-    "/\n\n?",
-    {
-      "a": 7
-    },
-    "Shift ↵"
-  ],
-  [
-    {
-      "a": 4,
-      "fa": [
-        2,
-        2
-      ]
-    },
-    "<i class='fa fa-download'></i>\n<i class='fa fa-lightbulb-o'></i>\n\n\n\n\n\n\n\nCtrl",
-    "\n<i class=\"fa fa-search\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\nEsc",
-    "\n<i class=\"fa fa-search-minus\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\n<i class='fa fa-linux'></i>",
-    "\n<i class=\"fa fa-search-plus\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\nAlt",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "<i class='fa fa-sort-down'></i>",
-    {
-      "a": 4,
-      "fa": [
-        1,
-        1
-      ],
-      "w": 2
-    },
-    "PgUp\nPgDn\n\n\n\n\n\n\n\nSpace",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "<i class='fa fa-sort-up'></i>",
-    {
-      "a": 4,
-      "fa": [
-        2
-      ]
-    },
-    "<i class=\"fa fa-undo\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-left\" aria-hidden=\"true\"></i>",
-    {
-      "f": 3
-    },
-    "<i class='fa fa-volume-down'></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-down\" aria-hidden=\"true\"></i>",
-    {
-      "f": 3
-    },
-    "<i class='fa fa-volume-up'></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-up\" aria-hidden=\"true\"></i>",
-    {
-      "f": 3
-    },
-    "<i class='fa fa-volume-off'></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-right\" aria-hidden=\"true\"></i>"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ab/keymap.c b/keyboards/planck/keymaps/ab/keymap.c
deleted file mode 100644
index e10d5e4422..0000000000
--- a/keyboards/planck/keymaps/ab/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Symbolic names for macro IDs.
-#define _QWERTY  0 // QUERTY layer
-#define _LOWER   1 // Lower layer
-#define _RAISE   2 // Raise layer
-#define _CUSTOM  3 // Custom layer (LOWER + RAISE)
-#define _BL      4 // Backlight
-#define _MOB     5 // Mobile#
-#define _CUS1    6 // Custom macro 1
-#define _CUS2    7 // Custom macro 2
-
-// Macro shortcuts.
-#define QWERTY  M(_LOWER)
-#define LOWER   M(_LOWER)
-#define RAISE   M(_RAISE)
-#define CUSTOM  M(_CUSTOM)
-#define BL      M(_BL)
-#define MOB     M(_MOB)
-#define CUS1    M(_CUS1)
-#define CUS2    M(_CUS2)
-
-// Func macro definitions.
-#define LWR_PGDN LT(_LOWER, KC_PGDN) // Tap for PgDn, hold for LOWER
-#define RSE_PGUP LT(_RAISE, KC_PGUP) // Tap for PgUp, hold for RAISE
-#define CTL_CAPS MT(MOD_LCTL, KC_CAPS) // Tap for Caps, hold for Ctrl (DOESN'T SEEM TO WORK)
-#define SFT_ENT  MT(MOD_RSFT, KC_ENT) // Tap for Enter, hold for Shift
-#define ZM_NRM   C(KC_0) // Zoom normal
-#define ZM_IN    C(KC_MINS) // Zoom out
-#define ZM_OUT   C(KC_PLUS) // Zoom in
-#define EM_UNDO  C(KC_UNDS) // Emacs Undo
-
-// This config can be found at Keyboard layout editor site: http://goo.gl/zjXL2l
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_planck_grid( /* QWERTY */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_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, SFT_ENT,
-    KC_LCTL, KC_ESC,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_LOWER] = LAYOUT_planck_grid( /* LOWER */
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    BL,      ZM_NRM,  ZM_IN,   ZM_OUT,  KC_TRNS, KC_PGDN, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-[_RAISE] = LAYOUT_planck_grid( /* RAISE */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV,  KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE
-),
-[_CUSTOM] = LAYOUT_planck_grid( /* CUSTOM */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MOB,     KC_TRNS, CUS1,    CUS2,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
-};
-
-// Set a layer persistently.
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Macro actions for each corresponding ID.
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch(id) {
-    case _RAISE: // Raised layer.
-	if (record->event.pressed) {
-	    layer_on(_RAISE);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	} else {
-	    layer_off(_RAISE);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	}
-	break;
-    case _LOWER: // Lowered layer.
-	if (record->event.pressed) {
-	    layer_on(_LOWER);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	} else {
-	    layer_off(_LOWER);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	}
-	break;
-    case _BL: // Backlight
-	if (record->event.pressed) {
-	    register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-	    backlight_step();
-#endif
-	} else {
-	    unregister_code(KC_RSFT);
-	}
-	break;
-    case _MOB: // Your mobile# here.
-	return MACRODOWN(T(1), T(2), T(3), T(MINS),
-			 T(1), T(2), T(3), T(MINS),
-			 T(1), T(2), T(3), T(4),
-			 END);
-    case _CUS1: // Your custom macro 1
-	return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(SPC), END);
-    case _CUS2: // Your custom macro 2
-	return MACRODOWN(T(L), T(S), T(SPC), T(MINS), T(L), T(ENT), END);
-    };
-    return MACRO_NONE;
-}
diff --git a/keyboards/planck/keymaps/ab/readme.md b/keyboards/planck/keymaps/ab/readme.md
deleted file mode 100644
index 5f52e4436a..0000000000
--- a/keyboards/planck/keymaps/ab/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Practical keymap for Planck Ortholinear 40% Mechanical Keyboard
-A practical keymap that emulates standard QWERTY keyboard for Planck. Once you get comfortable with this keymap, you may fork and customize it for your own needs. 
-
-![Layout](https://i.imgur.com/xnlaiZd.png "Practical Keymap")
-![Photo](https://i.imgur.com/1kQPbLv.jpg "Planck Keyboard")
-
-* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/bda299020baaafe6a2a4a82e615e3cfc
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=ab make dfu
-```
-# Notes
-* Simultaneous RAISE+LOWER enters CUSTOM layer. You may add your own macros and custom keys here.
-* RAISE and LOWER also acts as PgUp and PgDn when tapped.
-* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users.
-* Bracket keys are placed in the center of the keyboard for programmer's convenience.
diff --git a/keyboards/planck/keymaps/ab/rules.mk b/keyboards/planck/keymaps/ab/rules.mk
deleted file mode 100644
index 4c79e946e6..0000000000
--- a/keyboards/planck/keymaps/ab/rules.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device.
-#                Please customize your programmer settings(PROGRAM_CMD)
-#
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-# make dfu = Download the hex file to the device, using dfu-programmer (must
-#            have dfu-programmer installed).
-#
-# make flip = Download the hex file to the device, using Atmel FLIP (must
-#             have Atmel FLIP installed).
-#
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
-#               (must have dfu-programmer installed).
-#
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
-#                (must have Atmel FLIP installed).
-#
-# make debug = Start either simulavr or avarice as specified for debugging,
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
-# Build Options
-#   change to "no" to disable the options, or define them in the makefile.mk in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/alexey/keymap.c b/keyboards/planck/keymaps/alexey/keymap.c
deleted file mode 100644
index 44befdc971..0000000000
--- a/keyboards/planck/keymaps/alexey/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QW 0
-#define _LW 1
-#define _RS 2
-
-// This layout tries to imitate the Atreus keyboard
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QW] = LAYOUT_planck_grid( /* Qwerty */
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, MO(_LW),
-  KC_TRNS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_TRNS,
-  M(0),    KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_SPC,  KC_SPC,  MO(_RS), KC_MINS, KC_QUOT, KC_ENT,  KC_TRNS
-),
-[_RS] = LAYOUT_planck_grid( /* RAISE */
-  KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_PGUP, KC_7,    KC_8,    KC_9, KC_ASTR, KC_TRNS,
-  KC_TRNS, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,  KC_PGDN, KC_4,    KC_5,    KC_6, KC_PLUS, KC_TRNS,
-  KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1,    KC_2,    KC_3, KC_BSLS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_EQL,  KC_TRNS
-),
-[_LW] = LAYOUT_planck_grid( /* LOWER */
-  KC_TRNS, KC_INS,    KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-  KC_TRNS, KC_DELETE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_F4,   KC_F5,   KC_F6,   KC_F11,  KC_TRNS,
-  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F12,  KC_TRNS,
-  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_TRNS
-)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            backlight_step();
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
-
diff --git a/keyboards/planck/keymaps/alexey/rules.mk b/keyboards/planck/keymaps/alexey/rules.mk
deleted file mode 100644
index d86b02fd1c..0000000000
--- a/keyboards/planck/keymaps/alexey/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/brandon/config.h b/keyboards/planck/keymaps/brandon/config.h
deleted file mode 100644
index c2244d8bc8..0000000000
--- a/keyboards/planck/keymaps/brandon/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY 0
-
-#endif
diff --git a/keyboards/planck/keymaps/brandon/keymap.c b/keyboards/planck/keymaps/brandon/keymap.c
deleted file mode 100644
index 97cf9c15ae..0000000000
--- a/keyboards/planck/keymaps/brandon/keymap.c
+++ /dev/null
@@ -1,395 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_plover.h"
-
-extern keymap_config_t keymap_config;
-
-// Keymap layers
-enum planck_layers {
-  BASE_QWERTY_LAYER,
-  BASE_COLEMAK_LAYER,
-  BASE_STENO_LAYER,
-  LOWER_LAYER,
-  RAISE_LAYER,
-  NAVIGATION_LAYER,
-  GUI_LAYER,
-  KEYBOARD_LAYER
-};
-
-// Key aliases for legibility
-#define ___x___ KC_NO
-
-// Macros
-enum planck_macros {
-  LALT_BRACE,
-  RALT_BRACE
-};
-
-// Dashes (macOS)
-#define KC_NDSH LALT(KC_MINS)
-#define KC_MDSH S(LALT(KC_MINS))
-
-// Window manager keys
-#define WM_FULL LALT(LGUI(KC_F))
-#define WM_NEXT LCTL(LALT(LGUI(KC_RGHT)))
-#define WM_PREV LCTL(LALT(LGUI(KC_LEFT)))
-#define WM_NW   LCTL(LGUI(KC_LEFT))
-#define WM_N    LALT(LGUI(KC_UP))
-#define WM_NE   LCTL(LGUI(KC_RGHT))
-#define WM_E    LALT(LGUI(KC_RGHT))
-#define WM_SE   S(LCTL(LGUI(KC_RGHT)))
-#define WM_S    LALT(LGUI(KC_DOWN))
-#define WM_SW   S(LCTL(LGUI(KC_LEFT)))
-#define WM_W    LALT(LGUI(KC_LEFT))
-#define WM_CNTR LALT(LGUI(KC_C))
-
-#define LT_NAVS LT(NAVIGATION_LAYER, KC_SCLN)
-#define LT_NAVO LT(NAVIGATION_LAYER, KC_O)
-#define LT_GUIL LT(GUI_LAYER, KC_LBRC)
-#define LT_GUIR LT(GUI_LAYER, KC_RBRC)
-
-// Special key codes
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  STENO,
-  LOWER,
-  RAISE,
-  PV_EXIT,
-  PV_LOOK
-};
-
-//Tap Dance Declarations
-enum {
-  TD_ESC_GRV = 0
-};
-
-// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  // Tap once for Esc, twice for Backspace
-  [TD_ESC_GRV]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_GRV)
-  // Other declarations would go here, separated by commas, if you have them
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Base layer (Qwerty)
-   *                ,-----------------------------------------------------------------------.
-   * Double tap 4 ~ | ESC | Q   | W   | E   | R   | T   | Y   | U   | I   | O   | P   | '   |
-   *                |-----------------------------------------------------------------------|
-   * Tap for Tab -- |Ctrl | A   | S   | D   | F   | G   | H   | J   | K   | L   |; Fn4|Ctrl | -- Tap for Enter
-   *                |-----------------------------------------------------------------------|
-   *   Tap for ( -- |Shift| Z   | X   | C   | V   | B   | N   | M   | ,   | .   | /   |Shift| -- Tap for )
-   *                |-----------------------------------------------------------------------|
-   *   Tap for [ -- | Fn3 |Hyper| Alt |Super| Fn1 |   Space   | Fn2 |Super| Alt |Hyper| Fn3 | -- Tap for ]
-   *                `-----------------------------------------------------------------------'
-   *                        /                                                     /
-   *   Tap for ] [ --------'-----------------------------------------------------'
-   */
-  [BASE_QWERTY_LAYER] = LAYOUT_planck_grid(
-    TD(TD_ESC_GRV),  KC_Q,           KC_W,          KC_E,    KC_R,  KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,          KC_P,           KC_QUOT,
-    MT(MOD_LCTL, KC_TAB),            KC_A,           KC_S,          KC_D,    KC_F,  KC_G,   KC_H,    KC_J,  KC_K,    KC_L,          LT_NAVS,        MT(MOD_RCTL, KC_ENT),
-    KC_LSPO,         KC_Z,           KC_X,          KC_C,    KC_V,  KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,        KC_SLSH,        KC_RSPC,
-    LT_GUIL,         ALL_T(KC_RBRC), M(LALT_BRACE), KC_LGUI, LOWER, KC_SPC, KC_BSPC, RAISE, KC_RGUI, M(RALT_BRACE), ALL_T(KC_LBRC), LT_GUIR
-  ),
-
-  /* Base layer (Colemak)
-   *                ,-----------------------------------------------------------------------.
-   *                |     | Q   | W   | F   | P   | G   | J   | L   | U   | Y   | ;   |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     | A   | R   | S   | T   | D   | H   | N   | E   | I   |O Fn4|     |
-   *                |-----------------------------------------------------------------------|
-   *                |     | Z   | X   | C   | V   | B   | K   | M   |     |     |     |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |     |     |     |     |           |     |     |     |     |     |
-   *                `-----------------------------------------------------------------------'
-   */
-  [BASE_COLEMAK_LAYER] = LAYOUT_planck_grid(
-    _______, 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,    LT_NAVO, _______,
-    _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* Base layer (Qwerty-Steno)
-   *                ,-----------------------------------------------------------------------.
-   *                |  #  |  #  |  #  |  #  |  #  |  #  |  #  |  #  |  #  |  #  |  #  |  #  |
-   *                |-----------------------------------------------------------------------|
-   *                |Look |     |  T  |  P  |  H  |           |  F  |  P  |  L  |  T  |  D  |
-   *                | -up |  S  |-----+-----+-----|     *     |-----+-----+-----+-----+-----|
-   *                |     |     |  K  |  W  |  R  |           |  R  |  B  |  G  |  S  |  Z  |
-   *                |-----------------------------------------------------------------------|
-   *                |Exit |     |     |  A  |  O  |           |  E  |  U  |     |     |     |
-   *                `-----------------------------------------------------------------------'
-   */
-  [BASE_STENO_LAYER] = LAYOUT_planck_grid(
-    PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM,  PV_NUM,
-    PV_LOOK, PV_LS,   PV_LT,   PV_LP,  PV_LH,  PV_STAR, PV_STAR, PV_RF,  PV_RP,  PV_RL,   PV_RT,   PV_RD,
-    PV_LOOK, PV_LS,   PV_LK,   PV_LW,  PV_LR,  PV_STAR, PV_STAR, PV_RR,  PV_RB,  PV_RG,   PV_RS,   PV_RZ,
-    PV_EXIT, ___x___, ___x___, PV_A,   PV_O,   _______, _______, PV_E,   PV_U,   ___x___, ___x___, ___x___
-  ),
-
-  /* Numeric layer
-   *                ,-----------------------------------------------------------------------.
-   * Application -- |D-Grv| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | #   |
-   *      window    |-----------------------------------------------------------------------|
-   *    switcher    |     | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     | -   | =   | `   | \   |     |ndash|mdash| ,   | .   | /   |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |     |     |     |     | Backspace |     |     |     |     |     |
-   *                `-----------------------------------------------------------------------'
-   */
-  [LOWER_LAYER] = LAYOUT_planck_grid(
-    LGUI(KC_GRV), KC_F1,          KC_F2,         KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,         KC_F10,         S(KC_3),
-    MT(MOD_LCTL, KC_TAB),         KC_1,           KC_2,          KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,          KC_0,           MT(MOD_RCTL, KC_ENT),
-    KC_LSPO,      KC_MINS,        KC_EQL,        KC_GRV,  KC_BSLS, ___x___, KC_NDSH, KC_MDSH, KC_COMM, KC_DOT,        KC_SLSH,        KC_RSPC,
-    LT_GUIL,      ALL_T(KC_LBRC), M(LALT_BRACE), KC_LGUI, LOWER,   KC_BSPC, KC_BSPC, RAISE,   KC_RGUI, M(RALT_BRACE), ALL_T(KC_RBRC), LT_GUIR
-  ),
-
-  /* Symbol layer
-   *                ,-----------------------------------------------------------------------.
-   *                |     | F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | #   |
-   *                |-----------------------------------------------------------------------|
-   *                |     | !   | @   | #   | $   | %   | ^   | &   | *   | '   | "   |     | \
-   *                |-----------------------------------------------------------------------|  |-- Mostly shifted version
-   *                |     | _   | +   | ~   | |   |     |ndash|mdash| ,   | .   | /   |     | /    of lower layer
-   *                |-----------------------------------------------------------------------|
-   *                |     |     |     |     |     |  Delete   |     |     |     |     |     |
-   *                `-----------------------------------------------------------------------'
-   */
-  [RAISE_LAYER] = LAYOUT_planck_grid(
-    _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,     S(KC_3),
-    _______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_QUOT, S(KC_QUOT), _______,
-    _______, KC_UNDS, KC_PLUS, KC_TILD, KC_PIPE, ___x___, KC_NDSH, KC_MDSH, KC_COMM, KC_DOT,  KC_SLSH,    _______,
-    _______, _______, _______, _______, _______, KC_DEL,  KC_DEL,  _______, _______, _______, _______,    _______
-  ),
-
-  /* Directional navigation layer
-   *
-   *         Large movements -----/```````````````````\   /```````````````````\----- Vim-style arrow keys
-   *                ,-----------------------------------------------------------------------.
-   *                |     |     |     |     |     |     |     |     |     |     |     |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |     |Home |PgUp |PgDn | End |Left |Down | Up  |Right|     |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |     |     |     |     |     |     |     |     |     |     |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |     |     |     |     |           |     |     |     |     |     |
-   *                `-----------------------------------------------------------------------'
-   */
-  [NAVIGATION_LAYER] = LAYOUT_planck_grid(
-    ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
-    _______, ___x___, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, LT_NAVS, _______,
-    _______, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, _______,
-    _______, _______, _______, _______, ___x___, ___x___, ___x___, ___x___, _______, _______, _______, _______
-  ),
-
-  /* GUI (window management/mouse/media controls) layer
-   *
-   *        Mouse keys -----/```````````````````\               /```````````````````\----- Window manager
-   *                ,-----------------------------------------------------------------------.
-   *                |     |Ms B2|Ms Up|Ms B1|Ms WD|     |     |Prev | NW  |  N  | NE  |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |Ms L |Ms Dn|Ms R |Ms WU|     |     |Full |  W  |Centr|  E  |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |Ms WL|Ms B3|Ms WR|     |     |     |Next | SW  |  S  | SE  |     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |Prev |Play |Next |Brig-|   Sleep   |Brig+|Mute |Vol- |Vol+ |     |
-   *                `-----------------------------------------------------------------------'
-   *                        \___ Media ___/   \___ Screen/sleep __/   \___ Volume __/
-   */
-  [GUI_LAYER] = LAYOUT_planck_grid(
-    _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_D, ___x___, ___x___, WM_PREV, WM_NW,   WM_N,    WM_NE,   _______,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, ___x___, ___x___, WM_FULL, WM_W,    WM_CNTR, WM_E,    _______,
-    _______, KC_WH_L, KC_BTN3, KC_WH_R, ___x___, ___x___, ___x___, WM_NEXT, WM_SW,   WM_S,    WM_SE,   _______,
-    _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_SLCK, KC_SLEP, KC_SLEP, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU, _______
-  ),
-
-  /* Keyboard settings layer
-   *                ,-----------------------------------------------------------------------.
-   *    Firmware -- |     |Reset|     |     |     |     |     |     |     |     |     |     |
-   *                |-----------------------------------------------------------------------|
-   *   Set layer -- |     |Qwert|Colem|Steno| ... |     |     |     |     |     |     |     |
-   *                |-----------------------------------------------------------------------|
-   *       Audio -- |     |Voic-|Voic+|Mus +|Mus -|MIDI+|MIDI-|     |     |Aud +|Aud -|     |
-   *                |-----------------------------------------------------------------------|
-   *                |     |     |     |     |     |  Toggle   |     |Toggl| BL- | BL+ |     |
-   *                `-----------------------------------------------------------------------'
-   *                                                    \_____________\_ Backlight _/
-   */
-  [KEYBOARD_LAYER] = LAYOUT_planck_grid(
-    ___x___, QK_BOOT, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
-    ___x___, QWERTY,  COLEMAK, STENO,   ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
-    ___x___, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  ___x___, ___x___, AU_ON,   AU_OFF,  ___x___,
-    ___x___, ___x___, ___x___, ___x___, LOWER,   BL_TOGG, BL_TOGG, RAISE,   BL_TOGG, BL_DEC,  BL_INC,  ___x___
-  )
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
-    case LALT_BRACE:
-      if (record->event.pressed) {
-        register_mods(MOD_LALT);
-        record->tap.interrupted = 0;
-      } else {
-        unregister_mods(MOD_LALT);
-
-        if (record->tap.count && !record->tap.interrupted) {
-          add_weak_mods(MOD_LSFT);
-          register_code(KC_LEFT_BRACKET);
-          unregister_code(KC_LEFT_BRACKET);
-          del_weak_mods(MOD_LSFT);
-        }
-
-        record->tap.count = 0;
-      }
-      break;
-    case RALT_BRACE:
-      if (record->event.pressed) {
-        register_mods(MOD_RALT);
-        record->tap.interrupted = 0;
-      } else {
-        unregister_mods(MOD_RALT);
-
-        if (record->tap.count && !record->tap.interrupted) {
-          add_weak_mods(MOD_LSFT);
-          register_code(KC_RIGHT_BRACKET);
-          unregister_code(KC_RIGHT_BRACKET);
-          del_weak_mods(MOD_LSFT);
-        }
-
-        record->tap.count = 0;
-      }
-      break;
-  }
-  return MACRO_NONE;
-}
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]   = SONG(STARTUP_SOUND);
-float tone_qwerty[][2]    = SONG(QWERTY_SOUND);
-float tone_colemak[][2]   = SONG(COLEMAK_SOUND);
-float tone_plover[][2]    = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-float music_scale[][2]    = SONG(MUSIC_SCALE_SOUND);
-float tone_goodbye[][2]   = SONG(GOODBYE_SOUND);
-
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Send PHROPB ({PLOVER:RESUME}).
-void plover_resume(void) {
-  register_code(PV_LP);
-  register_code(PV_LH);
-  register_code(PV_LR);
-  register_code(PV_O);
-  register_code(PV_RP);
-  register_code(PV_RB);
-  unregister_code(PV_LP);
-  unregister_code(PV_LH);
-  unregister_code(PV_LR);
-  unregister_code(PV_O);
-  unregister_code(PV_RP);
-  unregister_code(PV_RB);
-}
-
-// Send PHROF ({PLOVER:SUSPEND}).
-void plover_suspend(void) {
-  register_code(PV_LP);
-  register_code(PV_LH);
-  register_code(PV_LR);
-  register_code(PV_O);
-  register_code(PV_RF);
-  unregister_code(PV_LP);
-  unregister_code(PV_LH);
-  unregister_code(PV_LR);
-  unregister_code(PV_O);
-  unregister_code(PV_RF);
-}
-
-// Send PHROBG ({PLOVER:LOOKUP}).
-void plover_lookup(void) {
-  register_code(PV_LP);
-  register_code(PV_LH);
-  register_code(PV_LR);
-  register_code(PV_O);
-  register_code(PV_RB);
-  register_code(PV_RG);
-  unregister_code(PV_LP);
-  unregister_code(PV_LH);
-  unregister_code(PV_LR);
-  unregister_code(PV_O);
-  unregister_code(PV_RB);
-  unregister_code(PV_RG);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<BASE_QWERTY_LAYER);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<BASE_COLEMAK_LAYER);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(LOWER_LAYER);
-        update_tri_layer(LOWER_LAYER, RAISE_LAYER, KEYBOARD_LAYER);
-      } else {
-        layer_off(LOWER_LAYER);
-        update_tri_layer(LOWER_LAYER, RAISE_LAYER, KEYBOARD_LAYER);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(RAISE_LAYER);
-        update_tri_layer(LOWER_LAYER, RAISE_LAYER, KEYBOARD_LAYER);
-      } else {
-        layer_off(RAISE_LAYER);
-        update_tri_layer(LOWER_LAYER, RAISE_LAYER, KEYBOARD_LAYER);
-      }
-      return false;
-    case STENO:
-      if (record->event.pressed) {
-        layer_off(RAISE_LAYER);
-        layer_off(LOWER_LAYER);
-        layer_off(KEYBOARD_LAYER);
-        layer_on(BASE_STENO_LAYER);
-        if (!eeconfig_is_enabled()) {
-          eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-        plover_resume();
-      }
-      return false;
-    case PV_EXIT:
-      if (record->event.pressed) {
-        plover_suspend();
-        layer_off(BASE_STENO_LAYER);
-      }
-      return false;
-    case PV_LOOK:
-      if (record->event.pressed) {
-        plover_lookup();
-      }
-      return false;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-#ifdef AUDIO_ENABLE
-  startup_user();
-#endif
-}
diff --git a/keyboards/planck/keymaps/brandon/rules.mk b/keyboards/planck/keymaps/brandon/rules.mk
deleted file mode 100644
index 30275cf1f6..0000000000
--- a/keyboards/planck/keymaps/brandon/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# This gets included at the beginning of the Planck's Makefile.
-# Alternatively, you can run make from the keymap directory
-# and the main Makefile will be included after.
-
-COMMAND_ENABLE   = no   # Disable shift combination, which conflicts with shift-parens
-NKRO_ENABLE      = yes  # N-key rollover required for use as a steno board
-AUDIO_ENABLE     = no   # Audio output on port C6
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE  = yes
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-
diff --git a/keyboards/planck/keymaps/cbbrowne/config.h b/keyboards/planck/keymaps/cbbrowne/config.h
deleted file mode 100644
index 87953c339e..0000000000
--- a/keyboards/planck/keymaps/cbbrowne/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2017  Christopher Browne
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif
-#ifndef NO_PRINT
-#define NO_PRINT
-#endif
-
-#include "../../config.h"
-
-#define LEADER_TIMEOUT 300
-
-#ifndef KEYBOARD_planck_light
-#define BACKLIGHT_BREATHING
-#endif
-
-/* cbbrowne user configuration */
-
-#define randadd 53
-#define randmul 181
-#define randmod 167
-
-/* Filler to make layering a bit clearer *
- * borrowed from basic keymap            */
-
-#define _____   KC_NO
diff --git a/keyboards/planck/keymaps/cbbrowne/keymap.c b/keyboards/planck/keymaps/cbbrowne/keymap.c
deleted file mode 100644
index 22e0cbc492..0000000000
--- a/keyboards/planck/keymaps/cbbrowne/keymap.c
+++ /dev/null
@@ -1,359 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-/* Each layer is given a name to aid in readability, which is then
-   used in the keymap matrix below.  The underscores do not denote
-   anything - you can have a layer called STUFF or any other name.
-
-   Layer names don't all need to be of the same length, obviously, and
-   you could also skip them entirely and just use numbers, though that
-   means needing to manage the numbers.
-
-   It is preferable to keep the symbols short so that a line worth of
-   key mappings fits compactly onto a line of code. */
-
-/* This was originally based on planck/keymaps/default/default.c, and
-   then cbbrowne has revised things */
-
-/* Things I did not like about the default mapping
-
-   - I found control too hard to get to.  I use it more than Tab, so
-     switched it there.
-   - Having dash on [lower-j] is a bit nonintuitive, but may be OK
-   - I'll bet I should switch ESC/TAB
-   - I'm suspicious that I want to shift M(0) from [4][1] to [4][2],
-     and shift ESC off the first column so KC_LCTL and KC_LALT can
-     be on the first column.
-   - I needed to swap ' and ENTER
-
-   - All of the above are done :-)
-
-   - Dropped out support for Dvorak and friends.  They aren't
-     improvements to me
-*/
-
-
-/* Some interesting things implemented
-
-   - There is a macro that writes out "cbbrowne" just to show that I
-     could
-   - There is a (somewhat cruddy) linear congruential random number
-     generator.
-     - I seed it somewhat with clock info to make it look more random
-   - There are two macros that use the random number generators
-     - one, M_RANDDIGIT, generates a random digit based on state
-       of the random number generator
-     - the other, M_RANDLETTER, generates a random letter based on state
-       of the random number generator
-     - in both, note the use of register_code()/unregister_code()
-       to indicate the desired key
-   - I do indeed want a sweet number pad!
-*/
-
-/* Other things to do...
-
-   - Need to think about what zsh and readline actions I use lots
-   - Ought to ensure that Control-Alt-Delete is convenient enough
-   - How about Alt-F1 thru Alt-F8?  Not yet...
-   - What's the keystroke to get from X to console these days?
-   - A layer for doing console switching would not be a bad idea
-
-   - I'm messing with jeremy-dev's keymap that shifts everything
-     outwards.  Gotta figure out how to make it sensible...
-*/
-
-enum layers {
-  _QWERTY = 0,  /* Qwerty mapping */
-  _LOWER, /* Lower layer, where top line has symbols !@#$%^&*() */
-  _RAISE, /* Raised layer, where top line has digits 1234567890 */
-  _KEYPAD, /* Key pad */
-  _ADJUST, /* Special Adjust layer coming via tri-placement */
-
-};
-
-enum my_keycodes {
-  MY_ABVE = SAFE_RANGE,
-  MY_BELW,
-  MY_TERM,
-  MY_DEQL, // /=
-  MY_MEQL, // *=
-  MY_SEQL, // -=
-  MY_PEQL, // +=
-  MY_NEQL, // !=
-  MY_LTGT, // <>
-  MY_DPIP, // ||
-  MY_DAMP, // &&
-};
-
-enum macro_id {
-  M_LED = 0,
-  M_USERNAME,
-  M_RANDDIGIT,
-  M_RANDLETTER,
-  M_VERSION,
-  MACRO_UPPER,
-  MACRO_LOWER,
-};
-
-#define M_LOWER M(MACRO_LOWER)
-#define M_UPPER M(MACRO_UPPER)
-#define ROT_LED M(M_LED)   /* Rotate LED */
-#define QWERTY DF(_QWERTY)   /* Switch to QWERTY layout */
-#define KEYPAD DF(_KEYPAD)   /* Switch to keypad */
-#define USERNAME M(M_USERNAME) /* shortcut for username */
-#define RANDDIG M(M_RANDDIGIT)
-#define RANDALP M(M_RANDLETTER)
-#define CTLENTER MT(MOD_RCTL, KC_ENT)
-#define SHIFTQUOTE MT(MOD_RSFT, KC_QUOT)
-#define ALTRIGHT MT(MOD_LALT, KC_RGHT)
-#define MVERSION M(M_VERSION)
-#define ALTSLASH LALT(KC_SLSH)
-
-
-/* Note that Planck has dimensions 4 rows x 12 columns */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_planck_grid( /* Qwerty */
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, CTLENTER,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SHIFTQUOTE ,
-  KC_TAB,  KC_LALT, ROT_LED, KC_LGUI, M_LOWER, KC_SPC,  KC_SPC,  M_UPPER, KC_LEFT, KC_DOWN, KC_UP,   ALTRIGHT
-  /* Note that KC_SPC is recorded TWICE, so that either matrix position can activate it */
-),
-[_RAISE] = LAYOUT_planck_grid( /* RAISE */
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  _______, KC_4,    KC_5,    KC_6,    _______, _______, _______,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_7,    KC_8,    KC_9,    _______, _______, _______,  QWERTY,  KEYPAD,  KEYPAD,  ALTSLASH,_______,
-  _______, KC_0, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_HOME, KC_END,  KC_PGUP
-),
-[_LOWER] = LAYOUT_planck_grid( /* LOWER */
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  _______, KC_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,  QWERTY,  KEYPAD,  KEYPAD, ALTSLASH,   _______,
-  _______, KEYPAD, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_HOME,  KC_END, KC_PGUP
-    ),
-[_KEYPAD] = LAYOUT_planck_grid( /* Key Pad */
-  KC_ESC,  USERNAME,    MVERSION,   KC_F10,   KC_F11,  KC_F12,   KC_PGUP, KC_KP_ENTER, KC_7, KC_8, KC_9, KC_BSPC,
-  KC_LCTL, RANDDIG,   KC_F5,   KC_F6,    KC_F7,   KC_F8,    KC_PGDN, KC_KP_MINUS, KC_4, KC_5, KC_6, KC_PIPE,
-  KC_LSFT, RANDALP,   KC_F1,   KC_F2,    KC_F3,   KC_F4,    KC_DEL,  KC_KP_PLUS,  KC_1, KC_2,  KC_3, KC_ENTER,
-  KC_TAB,  KC_LALT, ROT_LED, KC_LGUI,  M_LOWER,  KC_SPC,    KC_SPC,  QWERTY,   KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT
-),
-
-[_ADJUST] = LAYOUT_planck_grid( /* Adjustments - gonna shift the wild tools in here */
-  ROT_LED,USERNAME,MVERSION, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-  _______, RANDDIG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-  _______, RANDALP, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ ,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 
-)
-};
-
-/* This bit of logic seeds a wee linear congruential random number generator */
-/* lots of prime numbers everywhere... */
-static uint16_t random_value = 157;
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  uint8_t clockbyte=0;
-  clockbyte = TCNT1 % 256;
-  uint8_t rval;
-  // MACRODOWN only works in this function
-  switch(id) {
-  case M_LED:
-    if (record->event.pressed) {
-      register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-      backlight_step();
-#endif
-    } else {
-      unregister_code(KC_RSFT);
-    }
-    break;
-  case M_USERNAME:
-    if (record->event.pressed) {
-      SEND_STRING("cbbrowne");
-    }
-    break;
-  case M_VERSION:
-    if (record->event.pressed) {
-      SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION "@" QMK_BUILDDATE);
-    }
-    break;
-  case M_RANDDIGIT:
-    /* Generate, based on random number generator, a keystroke for
-       a numeric digit chosen at random */
-    random_value = ((random_value + randadd) * randmul) % randmod;
-    if (record->event.pressed) {
-      /* Here, we mix the LCRNG with low bits from one of the system
-         clocks via XOR in the theory that this may be more random
-         than either separately */
-      rval = (random_value ^ clockbyte) % 10;
-      /* Note that KC_1 thru KC_0 are a contiguous range */
-      register_code (KC_1 + rval);
-      unregister_code (KC_1 + rval);
-    }
-    break;
-  case M_RANDLETTER:
-    /* Generate, based on random number generator, a keystroke for
-       a letter chosen at random */
-    /* Here, we mix the LCRNG with low bits from one of the system
-       clocks via XOR in the theory that this may be more random
-       than either separately */
-    random_value = ((random_value + randadd) * randmul) % randmod;
-    if (record->event.pressed) {
-      rval = (random_value ^ clockbyte) % 26;
-      register_code (KC_A + rval);
-      unregister_code (KC_A + rval);
-    }
-    break;
-  case MACRO_UPPER:
-    if (record->event.pressed)
-      {
-	layer_on(_RAISE);
-#ifdef BACKLIGHT_BREATHING
-	breathing_period_set(2);
-	breathing_pulse();
-#endif
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    else
-      {
-	layer_off(_RAISE);
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    break;
-  case MACRO_LOWER:
-    if (record->event.pressed)
-      {
-	layer_on(_LOWER);
-#ifdef BACKLIGHT_BREATHING
-	breathing_period_set(2);
-	breathing_pulse();
-#endif
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    else
-      {
-	layer_off(_LOWER);
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    break;
-
-  }
-  return MACRO_NONE;
-};
-
-void press_key(uint16_t key) {
-  register_code(key);
-  unregister_code(key);
-}
-
-void press_two_keys(uint16_t key1, uint16_t key2) {
-  register_code(key1);
-  register_code(key2);
-  unregister_code(key2);
-  unregister_code(key1);
-}
-
-void press_three_keys(uint16_t key1, uint16_t key2, uint16_t key3) {
-  register_code(key1);
-  register_code(key2);
-  register_code(key3);
-  unregister_code(key3);
-  unregister_code(key2);
-  unregister_code(key1);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case MY_BELW:
-      if (record->event.pressed) {
-        press_two_keys(KC_LGUI, KC_RGHT);
-        press_key(KC_ENT);
-      }
-
-      return false;
-
-    case MY_ABVE:
-      if (record->event.pressed) {
-        press_two_keys(KC_LGUI, KC_LEFT);
-        press_key(KC_ENT);
-        press_key(KC_UP);
-      }
-
-      return false;
-
-    case MY_TERM:
-      if (record->event.pressed) {
-        press_three_keys(KC_LGUI, KC_LSFT, KC_ENT);
-      }
-
-      return false;
-
-    case MY_DEQL: // /=
-      if (record->event.pressed) {
-        press_key(KC_SLSH);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_MEQL: // *=
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_ASTR);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_SEQL: // -=
-      if (record->event.pressed) {
-        press_key(KC_MINS);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_PEQL: // +=
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_PLUS);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_NEQL: // !=
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_EXLM);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_LTGT: // <>
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_LABK);
-        press_two_keys(KC_LSFT, KC_RABK);
-      }
-
-      return false;
-
-    case MY_DPIP: // ||
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_PIPE);
-        press_two_keys(KC_LSFT, KC_PIPE);
-      }
-
-      return false;
-
-    case MY_DAMP: // &&
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_AMPR);
-        press_two_keys(KC_LSFT, KC_AMPR);
-      }
-
-      return false;
-  }
-
-  return true;
-}
-
diff --git a/keyboards/planck/keymaps/cbbrowne/readme.org b/keyboards/planck/keymaps/cbbrowne/readme.org
deleted file mode 100644
index 2b10058584..0000000000
--- a/keyboards/planck/keymaps/cbbrowne/readme.org
+++ /dev/null
@@ -1,117 +0,0 @@
-* cbbrowne custom keyboard
-
-  Due to cbbrowne@acm.org
-  Christopher Browne
-
-  This was originally based on the default keyboard map, but I have
-  been doing sundry experimentation:
-
-** Useful Experiments
-
- - It made sense to mess around some with keyboard maps.
-   - I added a keypad, originally based on keymaps/numpad.c, but
-     mighty substantially revised, as that one seems to be rotated 90
-     degrees from usual conventions for number pads
- - The keypad layer also includes some sample "hacks" of cool things,
-   all using actions attached in using the function action_get_macro()
-   - Key [1][2] aka "q" types out my name, cbbrowne, as a fun example
-     of a key generating a bunch of keystrokes.  The keystroke is
-     sufficiently inconvenient that it isn't terribly practical for me
-     to use it, but hey, it shows how others might use this facility
-     in a more useful context.
-   - Key [2][2] aka "a" uses a random number generator to select a digit 0-9 at random
-   - Key [3][2] aka "z" uses a random number generator to select a letter a-z at random
-   - Key [1][3] aka "e" spits out the keymap version number
-  - Trying out sgoodwin's "hold Enter down to get Shift"
-    - Liking this Quite Well Enough...
-    - Applied this to both Shift and Quote
-    - It seems likely that Alt should get a right-hand-side, akin to this...
-    - Alt needs to move, and get a RHS
-      - Hence ALTRIGHT, and shifted ROT_LED over
-      - Emacs likes this!!!  :-)
-    - I'm suspicious that I'll want to shift ROT_LED another location over,
-      so some modifier can replace the OS/KC_LGUI key
-  - I have added an alternate ADJUST layer that is activated via update_tri_layer()
-    - e.g. - LOWER+RAISE simultaneously
-    - This seems entirely more useful for handling my "special keys"
-      like the random numbers, user name, and such, than the keypad layer
-  - The _ADJUST layer provides a good place to have RESET
-    - But this isn't strictly enough; I want RESET somewhat accessible from
-      main layer lest an error hide that layer
-    - I never use the OS/KC_LGUI key (that's Command on MacOS, Windows
-      Key on Windows), so that's a good place to have it as a chord of
-      some sort
-        
-
-** Some code structure ideas
-
-   Each layer is given a name to aid in readability, which is then
-   used in the keymap matrix below.  The underscores do not denote
-   anything - you can have a layer called STUFF or any other name.
-
-   Layer names don't all need to be of the same length, obviously, and
-   you could also skip them entirely and just use numbers, though that
-   means needing to manage the numbers.
-
-   It is preferable to keep the symbols short so that a line worth of
-   key mappings fits compactly onto a line of code.  It might be an
-   interesting idea to express the maps rotated 90%, so that you
-   only need to fit 4 symbols onto each line, rather than 12.
-
-   I use enums to manage layer IDs and macro IDs so that I don't need
-   to care (beyond "start at 0", and arguably even that's not needed)
-   about their values.
-
-** Things I did not like about the default mapping
-
-
-   - I found control too hard to get to.  I use it more than Tab, so
-     switched it there.
-   - Having dash on [lower-j] is a bit nonintuitive, but may be OK
-   - I switched ESC/TAB/M(0) around
-   - I'm suspicious that I want to shift M(0) from [4][1] to [4][2],
-     and shift ESC off the first column so KC_LCTL and KC_LALT can
-     be on the first column.
-   - I needed to swap ' and ENTER
-
-** Unuseful experiments
-
-I have tried some things out that didn't turn out particularly well.
-I'll note some of these for posterity, hopefully helpful in not doing
-unwise things again...
-
-   - I tried added Workman alongside Dvorak and Colemak
-     - Boy, oh boy, these don't help!!!
-     - I have done 30 years of learning of Emacs key mappings, and
-       these alternative keyboards massively mess me up
-
-   - Space Cadet Shift; switching L_SHIFT to KC_LSP0, so that when I
-     just hit SHIFT, I get a left parens.  In principle, this is great
-     for Lisping.
-     - Unfortunately, there are times when mouse interfaces use SHIFT
-       to allow selecting multiple items, and this really interferes
-        with that
-
-** TODO
-
-  - I use tmux quite a lot; the mollat keymap seems to have some
-    interesting helpers.  It might be interesting to add a "tmux
-    layer," or to have a few keys in a layer oriented towards that
-    - Keys for...
-      - Picking windows 0 thru 8
-      - next/prev/new window
-  - The mollat tmux layer also suggests some thoughts about Emacs
-    helpers.    
-  - I do not presently have anything that handles X11 screen
-    switching, as with Control-Alt-various
-  - I ought to probably look into KC_LEAD, to have some key combos
-    that do not need to be concurrent
-  - The jeebak keymap seems to have some neat ideas:
-    - Number layer which is aggressive about having numbers in several places
-    - TouchCursor layer seems interesting
-      - It sets up a layer with cursor keys on the home keys
-  - The jeremy-dev keymap has some very interesting concepts
-    - Shift hands outwards; the special keys go in the center
-    - Symbol layer has some compound keys for C operators like /=, *=, -=, +=, ...
-    - This is likely what I'll use for my XD75re, and maybe I'll fork a
-      planck keymap for similar
diff --git a/keyboards/planck/keymaps/cbbrowne/rules.mk b/keyboards/planck/keymaps/cbbrowne/rules.mk
deleted file mode 100644
index 13c2530dd4..0000000000
--- a/keyboards/planck/keymaps/cbbrowne/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 = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/chance/config.h b/keyboards/planck/keymaps/chance/config.h
deleted file mode 100644
index 3a1ab58563..0000000000
--- a/keyboards/planck/keymaps/chance/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 165
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 10     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-//#define BACKLIGHT_ENABLE
-#endif
diff --git a/keyboards/planck/keymaps/chance/keymap.c b/keyboards/planck/keymaps/chance/keymap.c
deleted file mode 100644
index 458e9a4f53..0000000000
--- a/keyboards/planck/keymaps/chance/keymap.c
+++ /dev/null
@@ -1,368 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _NUMPAD 6
-#define _ADJUST 16
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  NUMPAD,
-  EXT_NUM,
-  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  |   ,  |   .  |   /  |En/sh |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-  KC_LCTRL,KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |     |      | Home |  End |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      |      |      |      |             |      | Play | Vol- | Vol+ | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,KC_HOME, KC_END, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT
-),
-\
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |     |      | PgUp | PgDn |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      |      |      |      |             |      | Play | Vol- | Vol+ | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PGUP, KC_PGDN, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |      |      |   ^  |   /  |   7  |  8   |   9  |  -   |   =  |      | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Esc |      |      |   %  |   *  |   4  |  5   |   6  |  +   |   (  |   )  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shft |      |      |   $  |  Del |   1  |  2   |   3  |Enter |   [  |   ]  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit | Ctrl |  Alt |  Gui |      |      0      |   .  | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_grid(
-  KC_TAB,  XXXXXXX, XXXXXXX, KC_CIRC, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_EQL, XXXXXXX, KC_BSPC,
-  KC_ESC,  XXXXXXX, XXXXXXX, KC_PERC, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_LPRN, KC_RPRN, XXXXXXX,
-  KC_LSFT, XXXXXXX, XXXXXXX, KC_DLR,  KC_DEL,  KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LBRC, KC_RBRC, KC_ENT ,
-  EXT_NUM, KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_P0,   KC_P0,   KC_PDOT, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Login|      |      |      |      |      |  Num |Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |RGBTOG|RGBMOD| Hue+ | Hue- | Sat+ | Sat- | Val+ | Val- |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-   M(1)  , _______, _______, _______, _______, _______,  NUMPAD,  QWERTY, COLEMAK,  DVORAK,  PLOVER,  _______,
-  KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-  switch(id) {
-    case 0:
-    if (record->event.pressed) {
-      register_code(KC_RSFT);
-      register_code(KC_RCTL);
-      register_code(KC_ESC);
-    }
-    else{
-      clear_keyboard();
-    }
-    break;
-    case 1:
-    if (record->event.pressed) {
-      register_code(KC_LCTL);
-      register_code(KC_LALT);
-      register_code(KC_DEL);
-    }
-    else{
-      clear_keyboard();
-    }
-    break;
-  }
-  return MACRO_NONE;
-};
-
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-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);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool 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 NUMPAD:
-      if (record->event.pressed) {
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_NUMPAD);
-      }
-      return false;
-      break;
-    case EXT_NUM:
-      if (record->event.pressed) {
-        layer_off(_NUMPAD);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistant_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistant_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-}
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
diff --git a/keyboards/planck/keymaps/chance/rules.mk b/keyboards/planck/keymaps/chance/rules.mk
deleted file mode 100644
index 2febfd9699..0000000000
--- a/keyboards/planck/keymaps/chance/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-AUDIO_ENABLE = no
-
diff --git a/keyboards/planck/keymaps/dlaroe/config.h b/keyboards/planck/keymaps/dlaroe/config.h
deleted file mode 100644
index 86cd56d1cc..0000000000
--- a/keyboards/planck/keymaps/dlaroe/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    100
-#define MOUSEKEY_MAX_SPEED      10
-#define MOUSEKEY_WHEEL_DELAY    0
-
-#endif
diff --git a/keyboards/planck/keymaps/dlaroe/keymap.c b/keyboards/planck/keymaps/dlaroe/keymap.c
deleted file mode 100644
index 86e4365781..0000000000
--- a/keyboards/planck/keymaps/dlaroe/keymap.c
+++ /dev/null
@@ -1,264 +0,0 @@
-// Can't Remember Sh*t Keymap for Planck
-// http://www.keyboard-layout-editor.com/#/gists/c6c0ac051b2b118a34ef84ebadab54c7
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-
-enum planck_layers {
-  _QWERTY,
-  _ARROW,
-  _GAME,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  ARROW,
-  GAME,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  PLOVER,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  \   | Alt  | Lower|    Space    |Raise |   [  |   -  |   =  |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC,
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT) ,
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, KC_SPC,  KC_SPC,  RAISE,  LT(_LOWER, KC_LBRC), KC_MINS, KC_EQL, MT(MOD_RCTL, KC_RBRC)
-),
-
- /* Arrow
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  \   | Alt  | Lower|    Space    |Raise | Left | Down |  Up  | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROW] = LAYOUT_planck_grid(
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC,
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT) ,
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, KC_SPC,  KC_SPC,  RAISE,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
-),
-
-
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Shift |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Alt  |   4  |   3  |   2  | Lower|    Space    |Raise | Left | Down |  Up  | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_planck_grid(
-     KC_1,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC,
-  KC_LSFT,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-  KC_LCTL,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, _______ ,
-  KC_LALT,   KC_4,    KC_3,    KC_2,    LOWER,  KC_SPC,  KC_SPC,   RAISE,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
-),
-
-
-/* Lower   (switched to # because KP# were weird in terminal emulators)
- * ,-----------------------------------------------------------------------------------.
- * |  Del |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Tab |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |   .  |  *   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Esc |      |      |      |      |      0      |      |      |      | KP_+ |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-   KC_DEL,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,  KC_8, KC_9,    KC_0,  _______,
-   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_4,  KC_5, KC_6,  KC_DOT, KC_ASTR,
-  _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12,  KC_1,  KC_2, KC_3, KC_SLSH,  _______,
-  KC_ESC, _______, _______, _______, _______,   KC_0,    KC_0, _______,  _______, _______, KC_PLUS, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  | Wh Up|RightC| M-Up | LeftC|QWERTY| Left | Down |  Up  | Right|  |   |   `  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Wh Dn| M-L  | M-Dn | M-R  |      |   -  |   =  |   [  |   ]  |  \   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | App  |      |      |      |     Ins     |      | Home | PGDN | PGUP |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_TILD,   KC_EXLM,     KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,   KC_RPRN, KC_DEL,
-   KC_DEL,   KC_WH_U,   KC_BTN2, KC_MS_U, KC_BTN1, QWERTY, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,   KC_PIPE,  KC_GRV,
-  _______,   KC_WH_D,   KC_MS_L, KC_MS_D, KC_MS_R, _______,  KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLASH, _______,
-  _______,   KC_APP,   _______, _______, _______, KC_INS, KC_INS, _______, KC_HOME, KC_PGDN,   KC_PGUP,  KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | C-A-I|Qwerty|      |      |Reset |Macro0|      |      |      |      |PLOVER|C-A-D |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps | Arrow|      |Aud on|Audoff| Game |AGswap|AGnorm| PrtSc|ScrLck| Break|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff| Prev | Next | Mute | VolDn| VolUp|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      |      |      |      | Play/Pause  |      | BL_T |BL_DEC|BL_INC|BL_ST |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, _______, _______, _______, PLOVER, LALT(LCTL(KC_DEL)),
-  KC_CAPS, ARROW, _______, AU_ON,   AU_OFF,  GAME, AG_SWAP, AG_NORM,  KC_PSCR, KC_SLCK, KC_PAUS,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV, KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-  BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP
-)
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is.
-{
-  switch(id) {
-    case 0: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), T(LEFT), U(LSFT), D(LCTL), T(X), U(LCTL), T(RIGHT), D(LCTL), T(V), U(LCTL), T(LEFT),  END  ); // this swaps the characters on either side of the cursor when the macro executes
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
-
-#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 ARROW:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_ARROW);
-      }
-      return false;
-      break;
-    case GAME:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_GAME);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/dlaroe/readme.md b/keyboards/planck/keymaps/dlaroe/readme.md
deleted file mode 100644
index 0fc89886fb..0000000000
--- a/keyboards/planck/keymaps/dlaroe/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# CRS Planck Layout
-Goals:
-
-*Maximum compatibility with standard keyboards
-  * I have to work on other staggered Qwerty keyboards all the time so I wanted to keep essentially the same layout instead of optimizing too much.
-* Trying to fit as many characters as possible on the default layer
-  * its easier for me to remember logical functions than characters
-  * Using the extra punctuation caps in place of arrows frees up some Row 4 caps
-  * however, I'm trying out an arrows layout with the other punctuation on the Raise layer and it is quite nice too
-* A number pad AND a number row
-
-[Here is the layout in easily readable KLE form.](http://www.keyboard-layout-editor.com/#/gists/c6c0ac051b2b118a34ef84ebadab54c7)
diff --git a/keyboards/planck/keymaps/dlaroe/rules.mk b/keyboards/planck/keymaps/dlaroe/rules.mk
deleted file mode 100644
index 7e80f01312..0000000000
--- a/keyboards/planck/keymaps/dlaroe/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/espynn/keymap.c b/keyboards/planck/keymaps/espynn/keymap.c
deleted file mode 100644
index fb7abd5c8d..0000000000
--- a/keyboards/planck/keymaps/espynn/keymap.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-
-// Symbolic names for macro IDs.
-#define _QWERTY  0  // QUERTY layer
-#define _LOWER   1  // Lower layer
-#define _RAISE   2  // Raise layer
-#define _CUSTOM  3  // Custom layer (LOWER + RAISE)
-#define _BL      4  // Backlight
-#define _CUS0    5  // Mobile#
-#define _CUS1    6  // signature
-#define _CUS2    7  // macro 2
-#define _CUS3    8  // macro 3
-#define _CUS4    9  // macro 4
-#define _CUS5    10 // email
-#define _COPY    11 // copy
-#define _PASTE   12 // paste
-#define _CUT     13 // cut
-
-// Macro shortcuts.
-#define QWERTY  M(_LOWER)
-#define LOWER   M(_LOWER)
-#define RAISE   M(_RAISE)
-#define CUSTOM  M(_CUSTOM)
-#define BL      M(_BL)
-#define CUS0    M(_CUS0)
-#define CUS1    M(_CUS1)
-#define CUS2    M(_CUS2)
-#define CUS3    M(_CUS3)
-#define CUS4    M(_CUS4)
-#define CUS5    M(_CUS5)
-#define COPY    M(_COPY)
-#define PASTE   M(_PASTE)
-#define CUT     M(_CUT)
-
-// Func macro definitions.
-#define LWR_PGDN LT(_LOWER, KC_PGDN) // Tap for PgDn, hold for LOWER
-#define RSE_PGUP LT(_RAISE, KC_PGUP) // Tap for PgUp, hold for RAISE
-#define CTL_CAPS MT(MOD_LCTL, KC_CAPS) // Tap for Caps, hold for Ctrl (DOESN'T SEEM TO WORK)
-#define SFT_ENT  MT(MOD_RSFT, KC_ENT) // Tap for Enter, hold for Shift
-#define ZM_NRM   C(KC_0) // Zoom normal
-#define ZM_IN    C(KC_MINS) // Zoom out
-#define ZM_OUT   C(KC_PLUS) // Zoom in
-
-// This config can be found at Keyboard layout editor site: https://goo.gl/cF7uIO
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_planck_grid( /* QWERTY */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_DEL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-    KC_LCTL, KC_ESC,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_LOWER] = LAYOUT_planck_grid( /* LOWER */
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_MINS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_QUOT, KC_DQT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, ZM_NRM,  ZM_IN,   ZM_OUT,  KC_TRNS, KC_PGDN, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-[_RAISE] = LAYOUT_planck_grid( /* RAISE */
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,    KC_RPRN,    KC_UNDS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PLUS,    KC_TRNS,    KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_GRV,  KC_TILD, S(KC_COMM), S(KC_DOT),  KC_BSLS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, KC_MNXT,    KC_VOLD,    KC_VOLU, KC_MPLY
-),
-[_CUSTOM] = LAYOUT_planck_grid( /* CUSTOM */
-    KC_F1,   KC_F2,   KC_F3,              KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, CUS0,    CUS3,    CUS4,    KC_TRNS, KC_F12,  KC_TRNS,
-    KC_TRNS, KC_TRNS, CUT,                COPY,    PASTE,   CUS1,    CUS5,    CUS2,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    BL,      QK_BOOT, LALT(LCTL(KC_DEL)), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
-};
-
-// Set a layer persistently.
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Macro actions for each corresponding ID.
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch(id) {
-    case _RAISE: // Raised layer.
-	if (record->event.pressed) {
-	    layer_on(_RAISE);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	} else {
-	    layer_off(_RAISE);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	}
-	break;
-    case _LOWER: // Lowered layer.
-	if (record->event.pressed) {
-	    layer_on(_LOWER);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	} else {
-	    layer_off(_LOWER);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	}
-	break;
-    case _BL: // Backlight
-	if (record->event.pressed) {
-	    register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-	    backlight_step();
-#endif
-	} else {
-	    unregister_code(KC_RSFT);
-	}
-	break;
-    case _CUS0: // enter your mobile# here
-	    return MACRODOWN(T(9), T(9), T(9), T(MINS),T(9), T(9), T(9), T(MINS),T(9), T(9), T(9), T(9),END);
-    case _CUS1: // signature line for email
-	    return MACRODOWN(T(ENT), T(ENT), T(MINS), T(J), T(W), END);
-    case _CUS2: // Custom macro 2
-	    return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_L), UP(KC_LSFT), END );
-    case _CUS3: // custom macro 3
-	    return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_F), UP(KC_LSFT), END );
-    case _CUS4: // custom macro 4
-	    return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_I), UP(KC_LSFT), END );
-    case _CUS5: // Enter your email here
-	    return MACRODOWN( TYPE(KC_F),
-        DOWN(KC_LSFT), TYPE(KC_2), UP(KC_LSFT),
-        TYPE(KC_G), TYPE(KC_M), TYPE(KC_A), TYPE(KC_I), TYPE(KC_L), TYPE(KC_DOT), TYPE(KC_C), TYPE(KC_O), TYPE(KC_M), END );
-    case _CUT: //cut macro
-	    return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_X), UP(KC_LCTL), END );
-    case _COPY: // copy macro
-	    return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_C), UP(KC_LCTL), END );
-    case _PASTE: // paste macro
-	    return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_V), UP(KC_LCTL), END );
-    };
-    return MACRO_NONE;
-}
diff --git a/keyboards/planck/keymaps/espynn/layout.json b/keyboards/planck/keymaps/espynn/layout.json
deleted file mode 100644
index ccdf2afdea..0000000000
--- a/keyboards/planck/keymaps/espynn/layout.json
+++ /dev/null
@@ -1,290 +0,0 @@
-[
-  {
-    "backcolor": "#858585",
-    "name": "Planck 40%",
-    "author": "James Folkert",
-    "notes": "# Espynn's keymap for Planck Ortholinear 40% Mechanical Keyboard\nAdded several custom functions to the keymap from the \"ab\" map. Special thanks to \"mollat\" for demonstration of macros in their keymap.c\n \n\n![Layout](keyboard-layout.png \"Practical Keymap\")\n\n* Online keyboard layout editor: http://goo.gl/mlLAFZ\n\n# Notes\n* Front legend text is the custom layer (both raise and lower)\n* Holding is denoted by down arrow, for example, right shift is an enter button when tapped, shift when held\n* Simultaneous RAISE+LOWER enters CUSTOM layer. Several custom keymaps are here\n* I disregarded the advice of Jack and used macros for passwords. I accept my fate.\n* RAISE and LOWER also acts as PgUp and PgDn when tapped.\n* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users. (not sure if this works)\n* Bracket/ paran/ brace keys are placed in the center of the keyboard for programmer's convenience.",
-    "background": {
-      "name": "Aluminium brushed",
-      "style": "background-image: url('/bg/metal/aluminum_texture1642.jpg');"
-    },
-    "switchMount": "cherry",
-    "switchBrand": "cherry",
-    "switchType": "MX1A-A1xx",
-    "pcb": true,
-    "plate": true
-  },
-  [
-    {
-      "fa": [
-        2,
-        2,
-        0,
-        0
-      ]
-    },
-    "!\n1\n\n\nF1\n\n\n\n\n<i class='kb kb-Tab-2'></i>",
-    "@\n2\n\n\nF2\n\n\n\n\nQ",
-    "#\n3\n\n\nF3\n\n\n\n\nW",
-    "$\n4\n\n\nF4\n\n\n\n\nE",
-    "%\n5\n\n\nF5\n\n\n\n\nR",
-    "^\n6\n\n\nF6\n\n\n\n\nT",
-    "&\n7\n\n\nF7\n\n\n\n\nY",
-    "*\n8\n\n\nF8\n\n\n\n\nU",
-    "(\n9\n\n\nF9\n\n\n\n\nI",
-    {
-      "fa": [
-        2,
-        0,
-        0,
-        0
-      ]
-    },
-    ")\n0\n\n\nF10\n\n\n\n\nO",
-    {
-      "fa": [
-        2,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
-      ]
-    },
-    "_\n-\n\n\nF11\n\n\n\n\nP",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "<i class='kb kb-Unicode-BackSpace-DeleteLeft-Big'></i>"
-  ],
-  [
-    {
-      "f": 3
-    },
-    "<i class='mss mss-Unicode-DeleteRight-Big-2'></i>",
-    {
-      "f": 3
-    },
-    "A",
-    {
-      "f": 3
-    },
-    "S",
-    {
-      "a": 4,
-      "f": 3
-    },
-    "=\n_\n\n\n\n\n\n\n\nD",
-    {
-      "t": "#ff0000",
-      "f": 3
-    },
-    "\n(\n\n\n\n\n\n\n\nF",
-    {
-      "t": "#000000",
-      "f": 3
-    },
-    "\n)\n\n\n\n\n\n\n\nG",
-    {
-      "f": 3
-    },
-    "\n{\n\n\nMacro0\n\n\n\n\nH",
-    {
-      "t": "#ff0000",
-      "f": 3
-    },
-    "\n}\n\n\nMacro3\n\n\n\n\nJ",
-    {
-      "t": "#000000",
-      "f": 3
-    },
-    "+\n-\n\n\nMacro4\n\n\n\n\nK",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "L",
-    {
-      "a": 6,
-      "fa": [
-        2,
-        2,
-        2
-      ]
-    },
-    "\n\n:\n\nF12\n\n\n\n;",
-    {
-      "a": 7,
-      "fa": [
-        9
-      ]
-    },
-    "<i class='mss mss-Unicode-Enter-3'></i>"
-  ],
-  [
-    {
-      "f": 3
-    },
-    "Shift",
-    {
-      "f": 3
-    },
-    "Z",
-    {
-      "f": 3
-    },
-    "X\n\n\n\nCut",
-    {
-      "f": 3
-    },
-    "C\n\n\n\nCopy",
-    {
-      "a": 4,
-      "fa": [
-        2,
-        2,
-        0,
-        0
-      ]
-    },
-    "\\\n[\n\n\nPaste\n\n\n\n\nV",
-    "|\n]\n\n\nMacro1\n\n\n\n\nB",
-    "`\n'\n\n\nMacro5\n\n\n\n\nN",
-    "~\n\"\n\n\nMacro2\n\n\n\n\nM",
-    {
-      "fa": [
-        2,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ]
-    },
-    "<\n\n\n\n\n\n\n<\n\n,",
-    {
-      "fa": [
-        2,
-        2,
-        0
-      ]
-    },
-    ">\n\n\n\n\n\n\n>\n\n.",
-    {
-      "fa": [
-        0,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ]
-    },
-    "\\\n\n\n\n\n\n\n?\n\n/",
-    {
-      "fa": [
-        0,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2,
-        9
-      ]
-    },
-    "\n\n\n<i class='kb kb-Arrows-Bottom-4'></i>Shift\n\n\n\n\n<i class='mss mss-Unicode-Enter-3'></i>\n\n<i class='kb kb-Arrows-Bottom-4'></i>Shift"
-  ],
-  [
-    {
-      "a": 7
-    },
-    "Ctrl\n\n\n\nBLight",
-    {
-      "a": 4,
-      "fa": [
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2,
-        9,
-        9
-      ]
-    },
-    "\nZNorm\n\n\nRESET\n\n\n\n\n<i class='mss mss-Unicode-Escape-3'></i>",
-    {
-      "fa": [
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2,
-        9,
-        6
-      ]
-    },
-    "\nZIn\n\n\nc.a.del\n\n\n\n\n<i class='kb kb-logo-windows-8'></i>",
-    {
-      "fa": [
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2,
-        9,
-        9
-      ]
-    },
-    "\nZOut\n\n\n\n\n\n\n\n<i class='kb kb-Unicode-Alternate-1'></i>",
-    {
-      "a": 7,
-      "fa": [
-        9
-      ]
-    },
-    "&dArr;",
-    {
-      "a": 4,
-      "fa": [
-        9,
-        5,
-        5
-      ],
-      "w": 2
-    },
-    "\n<i class='kb kb-Unicode-Page-Down-3'></i>\n<i class='kb kb-Unicode-Page-Up-3'></i>",
-    {
-      "a": 7
-    },
-    "&uArr;",
-    {
-      "a": 4,
-      "fa": [
-        2
-      ]
-    },
-    "<i class='kb kb-Multimedia-FastForward-End'></i>\n\n\n\n\n\n\n\n\n&larr;",
-    "<i class='kb kb-Multimedia-Volume-Down-1'></i>\n\n\n\n\n\n\n\n\n&darr;",
-    "<i class='kb kb-Multimedia-Volume-Up-1'></i>\n\n\n\n\n\n\n\n\n&uarr;",
-    "<i class='kb kb-Multimedia-Play-Pause'></i>\n\n\n\n\n\n\n\n\n&rarr;"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/espynn/readme.md b/keyboards/planck/keymaps/espynn/readme.md
deleted file mode 100644
index a7e8f02f4a..0000000000
--- a/keyboards/planck/keymaps/espynn/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Espynn's keymap for Planck Ortholinear 40% Mechanical Keyboard
-Created by James Folkert: https://twitter.com/trekloFsemaJ
-Added several custom functions to the keymap from the "ab" map. Special thanks to "mollat" for demonstration of macros in their keymap.c
- 
-
-![Layout](https://i.imgur.com/PEI4eva.jpg "Practical Keymap")
-
-
-* Online keyboard layout editor: http://www.keyboard-layout-editor.com/
-* [JSON of raw layout] (layout.json "JSON of raw layout")
-
-# Notes
-* Simultaneous RAISE+LOWER enters CUSTOM layer. Several custom keymaps are here
-* I disregarded the advice of Jack and used macros for passwords. I accept my fate. These have been abstracted to macros 2, 3, and 4
-* add your mobile and email to the keymap before make
-* RAISE and LOWER also acts as PgUp and PgDn when tapped.
-* Bracket/ paran/ brace keys are placed in the center of the keyboard for programmer's convenience.
-
-## changes
-* Removed some unneeded keys from raise and lower layers
-* moved the + and = signs, backspace is now more intuitive
-* moved all the Function keys to CUSTOM layer
-* added ctrl alt del to CUSTOM layer
-* simplified the layout picture greatly
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/espynn/rules.mk b/keyboards/planck/keymaps/espynn/rules.mk
deleted file mode 100644
index 4c79e946e6..0000000000
--- a/keyboards/planck/keymaps/espynn/rules.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device.
-#                Please customize your programmer settings(PROGRAM_CMD)
-#
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-# make dfu = Download the hex file to the device, using dfu-programmer (must
-#            have dfu-programmer installed).
-#
-# make flip = Download the hex file to the device, using Atmel FLIP (must
-#             have Atmel FLIP installed).
-#
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
-#               (must have dfu-programmer installed).
-#
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
-#                (must have Atmel FLIP installed).
-#
-# make debug = Start either simulavr or avarice as specified for debugging,
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
-# Build Options
-#   change to "no" to disable the options, or define them in the makefile.mk in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/jacob/keymap.c b/keyboards/planck/keymaps/jacob/keymap.c
deleted file mode 100644
index f9a0465d2d..0000000000
--- a/keyboards/planck/keymaps/jacob/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-//Simple Keymap where CTRL, WINKEY, and ALT keys are placed in a more familiar location for Windows users.
-//Focus of this particular keymap is to enable easy transition from more traditional keyboards to OLKB Planck.
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-#define _QW 0
-#define _LW 1
-#define _RS 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT_planck_grid( /* Qwerty */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,   KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-    KC_LCTL, KC_LGUI, KC_LALT, M(0),   MO(_LW), KC_SPC, KC_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-  [_RS] = LAYOUT_planck_grid( /* RAISE */
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL ,
-    KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-  [_LW] = LAYOUT_planck_grid( /* LOWER */
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL ,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  )
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-  switch(id) {
-    case 0:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/jacob/readme.md b/keyboards/planck/keymaps/jacob/readme.md
deleted file mode 100644
index 7ec2d35222..0000000000
--- a/keyboards/planck/keymaps/jacob/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Focus of this particular keymap is to enable easy transition from more traditional keyboards to OLKB Planck.
-
-![layout](https://i.imgur.com/YG7xVp8.png)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/jacob/rules.mk b/keyboards/planck/keymaps/jacob/rules.mk
deleted file mode 100644
index d86b02fd1c..0000000000
--- a/keyboards/planck/keymaps/jacob/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/jeebak/config.h b/keyboards/planck/keymaps/jeebak/config.h
deleted file mode 100644
index 2bebf48a1c..0000000000
--- a/keyboards/planck/keymaps/jeebak/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/jeebak/keymap.c b/keyboards/planck/keymaps/jeebak/keymap.c
deleted file mode 100644
index adf72a5ac3..0000000000
--- a/keyboards/planck/keymaps/jeebak/keymap.c
+++ /dev/null
@@ -1,448 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _TOUCHCURSOR 6
-#define _MOUSECURSOR 7
-#define _ADJUST 16
-
-// Keycodes
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-enum macro_keycodes {
-  KC_ALT_TAB,
-  KC_CMD_TAB,
-  KC_CTL_TAB,
-  KC_CMD_SLSH,
-  KC_AG_FIND,
-  KC_AG_AGAIN,
-  KC_AG_UNDO,
-  KC_AG_CUT,
-  KC_AG_COPY,
-  KC_AG_PASTE,
-  KC_AG_DESK_L,
-  KC_AG_DESK_R,
-  KC_AG_TAB_C,
-  KC_AG_TAB_N,
-  KC_AG_TAB_R,
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper
-#define GUI_SEM     GUI_T(KC_SCLN)              // Tap for Semicolon, hold for GUI
-#define ALT_QUO     ALT_T(KC_QUOT)              // Tap for Quote, hold for Alt
-// Requires KC_TRNS/_______ for the trigger key in the destination layer
-#define LT_TC       LT(_TOUCHCURSOR, KC_SPC)    // L-ayer T-ap T-ouch C-ursor
-#define LT_MC(kc)   LT(_MOUSECURSOR, kc)        // L-ayer T-ap M-ouse C-ursor
-#define ALT_TAB     M(KC_ALT_TAB)               // Macro for Alt-Tab
-#define CMD_TAB     M(KC_CMD_TAB)               // Macro for Cmd-Tab
-#define CTL_TAB     M(KC_CTL_TAB)               // Macro for Ctl-Tab
-#define CMD_SLSH    M(KC_CMD_SLSH)              // Macro for Cmd-Slash (personal shortcut to toggle iTerm2 visibility)
-#define AG_FIND     M(KC_AG_FIND)               // Macros for Cmd-[x] vs Ctrl-[x] based on current AG_NORM or AG_SWAP settings
-#define AG_AGAIN    M(KC_AG_AGAIN)
-#define AG_UNDO     M(KC_AG_UNDO)
-#define AG_CUT      M(KC_AG_CUT)
-#define AG_COPY     M(KC_AG_COPY)
-#define AG_PASTE    M(KC_AG_PASTE)
-#define AG_D_L      M(KC_AG_DESK_L)             // For Virtual Desktop Switching: Left, and
-#define AG_D_R      M(KC_AG_DESK_R)             //                                Right
-#define AG_T_C      M(KC_AG_TAB_C)              // For Chrome, etc. Tab Close,
-#define AG_T_N      M(KC_AG_TAB_N)              //                  Tab New, and
-#define AG_T_R      M(KC_AG_TAB_R)              //                  Tab Reopen Closed
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------------.
- * | Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |----------+------+------+------+------+-------------+------+------+------+------+--------|
- * | Ctrl/Esc |   A  |   S  | MC/D |   F  |   G  |   H  |   J  |   K  |   L  |GUI/; | Alt/"  |
- * |----------+------+------+------+------+------|------+------+------+------+------+--------|
- * | Shift    |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Sft/Ent |
- * |----------+------+------+------+------+------+------+------+------+------+------+--------|
- * | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
- * `-----------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S, LT_MC(KC_D),KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    GUI_SEM, ALT_QUO,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_PSCR, KC_RGUI, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------------.
- * | Hyper/Tab|   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  Bksp  |
- * |----------+------+------+------+------+-------------+------+------+------+------+--------|
- * | Ctrl/Esc |   A  |   R  | MC/S |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   "    |
- * |----------+------+------+------+------+------|------+------+------+------+------+--------|
- * | Shift    |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Sft/Ent |
- * |----------+------+------+------+------+------+------+------+------+------+------+--------|
- * | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
- * `-----------------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, KC_A,    KC_R, LT_MC(KC_S),KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_PSCR, KC_RGUI, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------------.
- * | Hyper/Tab|   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  Bksp  |
- * |----------+------+------+------+------+-------------+------+------+------+------+--------|
- * | Ctrl/Esc |   A  |   O  | MC/E |   U  |   I  |   D  |   H  |   T  |   N  |   S  |   /    |
- * |----------+------+------+------+------+------|------+------+------+------+------+--------|
- * | Shift    |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Sft/Ent |
- * |----------+------+------+------+------+------+------+------+------+------+------+--------|
- * | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
- * `-----------------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O, LT_MC(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,    SFT_ENT,
-  KC_PSCR, KC_RGUI, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   [  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   ]  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_LBRC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_RBRC, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MSTP, KC_MSEL, KC_MUTE
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   $  |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   =  |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_0,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_DLR,  KC_4,    KC_5,    KC_6,    KC_DOT, KC_PLUS,  KC_DOT,  KC_4,    KC_5,    KC_6,    KC_ASTR, KC_PIPE,
-  KC_EQL,  KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS,  KC_DOT,  KC_1,    KC_2,    KC_3,    KC_SLSH, KC_BSLS,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MSTP, KC_MSEL, KC_MUTE
-),
-
-/* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations
- * ,-----------------------------------------------------------------------------------.
- * |AltTab|CmdTab|CtlTab| GUI  |Shift |  ~   |Insert| Home |  Up  | End  | Bksp |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Alt  |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L|Desk_R|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |Tab_N |Tab_R |iTerm2|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- *
- * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't
- * seem to work on Mac. Presumably they'll work under Windows.
- */
-
-[_TOUCHCURSOR] = LAYOUT_planck_grid(
-  ALT_TAB, CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_BSPC, _______,
-  _______, KC_LALT, KC_SPC,  AG_T_C, AG_FIND,AG_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, AG_D_L,  AG_D_R ,
-  _______, AG_UNDO, AG_CUT,  AG_COPY, AG_PASTE,KC_GRV,  KC_PGDN, KC_DEL,  AG_T_N,  AG_T_R,  CMD_SLSH,_______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Mouse Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_MOUSECURSOR] = LAYOUT_planck_grid(
-  _______, _______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______,
-  _______, KC_ACL2, KC_BTN2, _______, KC_BTN1, KC_ACL1, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN4, KC_BTN5,
-  _______, _______, _______, _______, KC_BTN3, _______, KC_WH_D, KC_BTN1, _______, _______, KC_BTN3, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |Reset |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   QK_BOOT
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-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);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-/*
- * Macro definition
- */
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    if (!eeconfig_is_enabled()) {
-      eeconfig_init();
-    }
-
-    bool use_cmd = true;    // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc.
-    // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in:
-    // quantum/quantum.c
-    if(keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1) {
-      use_cmd = false;      // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc.
-    }
-
-    switch (id) {
-      case KC_ALT_TAB:
-        if(use_cmd) { return (record->event.pressed ? MACRO( D(LALT),  D(TAB), END ) : MACRO( U(TAB), END )); }
-        else        { return (record->event.pressed ? MACRO( D(LGUI),  D(TAB), END ) : MACRO( U(TAB), END )); }
-      case KC_CMD_TAB:
-        if(use_cmd) { return (record->event.pressed ? MACRO( D(LGUI),  D(TAB), END ) : MACRO( U(TAB), END )); }
-        else        { return (record->event.pressed ? MACRO( D(LALT),  D(TAB), END ) : MACRO( U(TAB), END )); }
-
-      case KC_CTL_TAB:
-        return (record->event.pressed ? MACRO( D(LCTRL), D(TAB), END ) : MACRO( U(TAB), END ));
-      case KC_CMD_SLSH:
-        return (record->event.pressed ? MACRO( D(LGUI),  D(SLSH),END ) : MACRO( U(SLSH),END ));
-
-      case KC_AG_FIND:
-        return use_cmd ? MACRODOWN( D(LGUI), T(F), END ) : MACRODOWN( D(LCTRL), T(F), END );
-      case KC_AG_AGAIN:
-        return use_cmd ? MACRODOWN( D(LGUI), T(G), END ) : MACRODOWN( D(LCTRL), T(G), END );
-      case KC_AG_UNDO:
-        return use_cmd ? MACRODOWN( D(LGUI), T(Z), END ) : MACRODOWN( D(LCTRL), T(Z), END );
-      case KC_AG_CUT:
-        return use_cmd ? MACRODOWN( D(LGUI), T(X), END ) : MACRODOWN( D(LCTRL), T(X), END );
-      case KC_AG_COPY:
-        return use_cmd ? MACRODOWN( D(LGUI), T(C), END ) : MACRODOWN( D(LCTRL), T(C), END );
-      case KC_AG_PASTE:
-        return use_cmd ? MACRODOWN( D(LGUI), T(V), END ) : MACRODOWN( D(LCTRL), T(V), END );
-
-      case KC_AG_DESK_L:
-        return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(SCLN), END ) : MACRODOWN( D(LALT), D(LCTRL), T(SCLN), END );
-      case KC_AG_DESK_R:
-        return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(QUOT), END ) : MACRODOWN( D(LALT), D(LCTRL), T(QUOT), END );
-
-      case KC_AG_TAB_C:
-        return use_cmd ? MACRODOWN( D(LGUI),            T(W), END ) : MACRODOWN( D(LCTRL),            T(W), END );
-      case KC_AG_TAB_N:
-        return use_cmd ? MACRODOWN( D(LGUI),            T(T), END ) : MACRODOWN( D(LCTRL),            T(T), END );
-      case KC_AG_TAB_R:
-        return use_cmd ? MACRODOWN( D(LGUI), D(LSHIFT), T(T), END ) : MACRODOWN( D(LCTRL), D(LSHIFT), T(T), END );
-    }
-
-    return MACRO_NONE;
-}
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-}
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
diff --git a/keyboards/planck/keymaps/jeebak/readme.md b/keyboards/planck/keymaps/jeebak/readme.md
deleted file mode 100644
index 7c4bf908c6..0000000000
--- a/keyboards/planck/keymaps/jeebak/readme.md
+++ /dev/null
@@ -1,127 +0,0 @@
-jeebak's layout
-=======================
-This WIP keymap attempts to minimize fingers straying away from the home row.
-To aid in this endeavor, when additional modifyer keys to switch layers are
-needed, they will be mapped to home row keys. The `keymap.c` file will contain
-the exact changes. The diagrams in this README shows the highlights of the
-changes from the default mappings.
-
-I also decided to change all calls to `persistent_default_layer_set()` to
-`default_layer_set()` since this is my personal perference.
-
-## Macros
-```
-#define ALT_TAB     M(KC_ALT_TAB)
-```
-
-## Base Layers (Qwerty/Colemak/Dvorak)
-These base layers are mostly the same as the default mappings. The interesting
-changes are shown below.
-
-- The `Ctrl/Esc`, will emit an `Escape` when tapped, and act as a `Control` key when held,
-- `GUI/;` as `;` and `GUI`,
-- `Alt/"` as `"` and `Alt`,
-- `Sft/Ent` as `Enter` and `Shift`, and
-- `Hyper/Tab` as `Tab` and `Hyper`
-
-A `TODO` item is to see if it can also act as a `CapsLock` when double-tapped.
-The arrow keys, which have been moved to the
-[TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been
-replaced with the Media keys as shown. The `MC/kc` key activates the
-`MouseCursor` layer when held, and emits the corresponding `kc` for its layer,
-when tapped.
-```
-  ,-----------------------------------------------------------------------------------------.
-  | Hyper/Tab|      |      |      |      |      |      |      |      |      |      |        |
-  |----------+------+------+------+------+-------------+------+------+------+------+--------|
-  | Ctrl/Esc |      |      |MC/kc |      |      |      |      |      |      |GUI/; | Alt/"  |
-  |----------+------+------+------+------+------|------+------+------+------+------+--------|
-  |          |      |      |      |      |      |      |      |      |      |      |Sft/Ent |
-  |----------+------+------+------+------+------+------+------+------+------+------+--------|
-  | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
-  `-----------------------------------------------------------------------------------------'
-```
-
-## Lower Layer (Symbols and Function Keys)
-The symbols and functions keys are essentially the same as the default mapping.
-The most notable changes are that the symbol keys from the `RAISE` layer have
-been moved here. The remaining Media keys replace those that are now on the
-base layers. The `BACKLIT` key has also been moved here.
-```
-  ,-----------------------------------------------------------------------------------.
-  |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-  |------+------+------+------+------+-------------+------+------+------+------+------|
-  |   [  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-  |------+------+------+------+------+------|------+------+------+------+------+------|
-  |   ]  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |  \   |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
-  `-----------------------------------------------------------------------------------'
-```
-
-## Raise Layer (Numbers and Arithmetic Operators)
-All of the numbers and arithmetic operators are available on this layer. Some
-keys are duplicated for the convenience of their positions. The `0` and `$`
-keys at the far left are for quick access to beginning and end of line in vim.
-```
-  ,-----------------------------------------------------------------------------------.
-  |   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-  |------+------+------+------+------+-------------+------+------+------+------+------|
-  |   $  |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |  |   |
-  |------+------+------+------+------+------|------+------+------+------+------+------|
-  |   =  |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |  \   |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
-  `-----------------------------------------------------------------------------------'
-```
-
-## TouchCursor layer plus personal customizations
-[TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key
-as the modifier, with the `IJKL` home row keys representing the inverted-T of
-the arrow keys. All of the default TouchCursor keymappings for the right hand
-are represented below. My personalizations include all of the keys shown for
-the left hand. Having the `Alt` and `Shift` keys (as well as the `Control` key
-from the base layers) readily accessible from the home row allows quick word
-jumps and highlighting when used in conjunction with the arrow keys. The
-`Alt-Tab` macro is not only useful under Windows, but also under Mac when used
-with alternative switchers like [HyperSwitch](https://bahoom.com/hyperswitch).
-The `Cmd-Tab` and `Ctrl-Tab` sequences are duplicated for easy access while in
-this layer. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and `KC_AGAIN`
-keycodes do not seem to work. There are macros in place that'll "automatically"
-choose the correct version (`Cmd-Tab` vs. `Alt-Tab`, `Cmd-C` vs. `Ctrl-C`,
-etc.) depending on which layout you've currently selected (`AG_NORM` or
-`AG_SWAP`) in the `_ADJUST` layer. The `Desk_L` and `Desk_R` macros are what I
-use to switch between Virtual Desktops Left/Right. The `Tab_C`, `Tab_N` and
-`Tab_R` are for "Close Tab," "New Tab" and "Reopen Closed Tab" for apps such as
-Google Chrome.
-```
-  ,-----------------------------------------------------------------------------------.
-  |AltTab|CmdTab|CtlTab|  GUI |Shift |  ~   |Insert| Home |  Up  | End  | Bksp |      |
-  |------+------+------+------+------+-------------+------+------+------+------+------|
-  |      | Alt  |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L|Desk_R|
-  |------+------+------+------+------+------|------+------+------+------+------+------|
-  |      | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |Tab_N |Tab_R |iTerm2|      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      |      |      |      |             |      |      |      |      |      |
-  `-----------------------------------------------------------------------------------'
-```
-
-## Mouse Layer
-The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer.
-The `D` key (on QWERTY) is used to activate this layer. All 16 keycodes for the
-mouse from the `doc/keycode.txt` file are represented, and logically located,
-IMHO. The left and right click buttons are duplicated; on the right hand side,
-for a quick click here and there, and again on the left hand side for when the
-buttons need to be held for dragging things or highlighting text, thus allowing
-the right hand to be free to use the up/down/left/right actions.
-```
-  ,-----------------------------------------------------------------------------------.
-  |      |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |      |
-  |------+------+------+------+------+-------------+------+------+------+------+------|
-  |      |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 |
-  |------+------+------+------+------+------|------+------+------+------+------+------|
-  |      |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      |      |      |      |             |      |      |      |      |      |
-  `-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/jeebak/rules.mk b/keyboards/planck/keymaps/jeebak/rules.mk
deleted file mode 100644
index 10de3bfc03..0000000000
--- a/keyboards/planck/keymaps/jeebak/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/joe/keymap.c b/keyboards/planck/keymaps/joe/keymap.c
deleted file mode 100644
index 24a10b502e..0000000000
--- a/keyboards/planck/keymaps/joe/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_colemak.h"
-
-#define FN3_ESC LT(6, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_planck_grid( /* Joe colemak */
-    FN3_ESC, KC_Q,    KC_W,    KC_F,    KC_P, KC_G,   KC_J,   KC_L, KC_U,    KC_Y,    KC_SCLN, KC_MINS,
-    KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T, KC_D,   KC_H,   KC_N, KC_E,    KC_I,    KC_O,    KC_ENT ,
-    MT(MOD_LSFT, KC_TAB),   KC_Z,    KC_X,    KC_C,    KC_V, KC_B,   KC_K,   KC_M, KC_COMM, KC_DOT,  KC_UP,   KC_QUOT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, MO(4),KC_SPC, KC_SPC, MO(5),KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_planck_grid( /* Joe soft Colemak */
-    FN3_ESC, CM_Q,    CM_W,    CM_F,    CM_P, CM_G,   CM_J,   CM_L, CM_U,    CM_Y,    CM_SCLN, KC_MINS,
-    KC_BSPC, CM_A,    CM_R,    CM_S,    CM_T, CM_D,   CM_H,   CM_N, CM_E,    CM_I,    CM_O,    KC_ENT ,
-    MT(MOD_LSFT, KC_TAB),   CM_Z,    CM_X,    CM_C,    CM_V, CM_B,   CM_K,   CM_M, KC_COMM, KC_DOT,  KC_UP,   KC_QUOT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, MO(4),KC_SPC, KC_SPC, MO(5),KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [2] = LAYOUT_planck_grid( /* Joe NUMPAD */
-    FN3_ESC, KC_NO,   KC_UP,   KC_NO,   KC_NO, KC_NO,   LSFT(KC_9), LSFT(KC_0), KC_PSLS, KC_P7, KC_P8,   KC_P9  ,
-    KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO,   LSFT(KC_5), KC_PEQL,    KC_PAST, KC_P4, KC_P5,   KC_P6  ,
-    MT(MOD_LSFT, KC_TAB),   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,      KC_PCMM,    KC_PMNS, KC_P1, KC_P2,   KC_P3  ,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, MO(4), KC_TRNS, KC_TRNS,    MO(5),      KC_PPLS, KC_P0, KC_PDOT, KC_PENT
-  ),
-  [3] = LAYOUT_planck_grid( /* Joe 1337 haxOr5*/
-    FN3_ESC, KC_Q,    KC_W,    KC_F,    KC_P, KC_6,   KC_J,   KC_L, KC_U,    KC_Y,    KC_SCLN, KC_MINS,
-    KC_BSPC, KC_4,    KC_R,    KC_5,    KC_7, KC_D,   KC_H,   KC_N, KC_3,    KC_1,    KC_0,    KC_ENT ,
-    MT(MOD_LSFT, KC_TAB),   KC_Z,    KC_X,    KC_C,    KC_V, KC_B,   KC_K,   KC_M, KC_COMM, KC_DOT,  KC_UP,   KC_QUOT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, MO(4),KC_SPC, KC_SPC, MO(5),KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [4] = LAYOUT_planck_grid( /* Joe LOWER fn1 */
-    KC_GRV,  KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO, M(3),    M(2),    M(1),    M(0)   ,
-    KC_BSPC, KC_1,    KC_2,    KC_3,    KC_4,  KC_5,    KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_TRNS,
-    KC_BSLS, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO, KC_LBRC, KC_RBRC, KC_PGUP, KC_EQL ,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(4), KC_TRNS, KC_TRNS, MO(5), KC_NO,   KC_HOME, KC_PGDN, KC_END 
-  ),
-  [5] = LAYOUT_planck_grid( /* Joe UPPER fn2 */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,              KC_F11,              KC_F12             ,
-    KC_DEL,  KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_WH_U, KC_BTN4, KC_LEFT, KC_DOWN, KC_UP,               KC_RGHT,             KC_NO              ,
-    KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_L, KC_WH_D, KC_WH_R, KC_NO,   KC_NO,   LCTL(KC_PGUP),       LCTL(LALT(KC_UP)),   LCTL(KC_PGDN)      ,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(4),   KC_NO,   KC_NO,   MO(5),   KC_NO,   LCTL(LALT(KC_LEFT)), LCTL(LALT(KC_DOWN)), LCTL(LALT(KC_RGHT))
-  ),
-  [6] = LAYOUT_planck_grid( /* Joe SPECIAL fn3 */
-    KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   KC_NO           ,
-    KC_NO,   KC_MPLY, KC_MPRV, KC_MNXT, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   QK_BOOT           ,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,    KC_NO,   KC_NO,   KC_NO           ,
-    DF(0),   DF(1),   DF(2),   DF(3),   MO(4), KC_TRNS, KC_TRNS, MO(5), KC_PWR,   KC_WAKE, KC_SLEP, LCTL(LALT(KC_L))
-  )
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch (id) {
-        case 0:
-            /* :) */
-            return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_SCLN), TYPE(KC_0), UP(KC_LSFT), END );
-            break;
-        case 1:
-            /* :( */
-            return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_SCLN), TYPE(KC_9), UP(KC_LSFT), END );
-            break;
-        case 2:
-            /* (: | :) */
-            return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_9), TYPE(KC_SCLN), TYPE(KC_SPC), TYPE(KC_SPC), TYPE(KC_SCLN), TYPE(KC_0), UP(KC_LSFT), TYPE(KC_LEFT), TYPE(KC_LEFT), TYPE(KC_LEFT), END );
-            break;
-        case 3:
-            /* :( | ): */
-            return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_SCLN), TYPE(KC_9), TYPE(KC_SPC), TYPE(KC_SPC), TYPE(KC_0), TYPE(KC_SCLN), UP(KC_LSFT), TYPE(KC_LEFT), TYPE(KC_LEFT), TYPE(KC_LEFT), END );
-            break;
-        default:
-            break;
-    }
-    return MACRO_NONE;
-}
diff --git a/keyboards/planck/keymaps/joe/rules.mk b/keyboards/planck/keymaps/joe/rules.mk
deleted file mode 100644
index 10de3bfc03..0000000000
--- a/keyboards/planck/keymaps/joe/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/khord/config.h b/keyboards/planck/keymaps/khord/config.h
deleted file mode 100644
index 819cef60c6..0000000000
--- a/keyboards/planck/keymaps/khord/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(SONIC_RING)
-    #define MUSIC_ON_SONG SONG(ZELDA_PUZZLE)
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#ifndef KEYBOARD_planck_light
-#define BACKLIGHT_BREATHING
-#endif
-#define TAPPING_TERM 150
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-                                
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/planck/keymaps/khord/keymap.c b/keyboards/planck/keymaps/khord/keymap.c
deleted file mode 100644
index 93e405feca..0000000000
--- a/keyboards/planck/keymaps/khord/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  ADMIN,
-  SMSPC1,
-  W10SLP
-};
-
-// LED backlight breathing
-#define MACRO_BREATH_TOGGLE    21
-#define MACRO_BREATH_SPEED_INC 23
-#define MACRO_BREATH_SPEED_DEC 24
-#define MACRO_BREATH_DEFAULT   25
-#define M_BRTOG M(MACRO_BREATH_TOGGLE)
-#define M_BRINC M(MACRO_BREATH_SPEED_INC)
-#define M_BRDEC M(MACRO_BREATH_SPEED_DEC)
-#define M_BRDFT M(MACRO_BREATH_DEFAULT)
-
-// Tap Dance Declarations
-enum {
-  SFT_CAP = 0
-};
-
-// Dylan's additions
-#define C_A_DEL LALT(LCTL(KC_DEL))
-#define C_A_INS LALT(LCTL(KC_INS))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  TD(SFT_CAP),   KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT),
-  BACKLIT,       KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  SLP |      | End  | Home |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  W10SLP,  _______, KC_END,  KC_HOME, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Pg Dn |Pg Up |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PGDN, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |string|string|  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|      |      |BRTHdf|BRTHup|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |BRTHtg|BRTHdn| CAIns|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | CADel|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, ADMIN,   SMSPC1,  KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, M_BRDFT, M_BRINC, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, M_BRTOG, M_BRDEC, C_A_INS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_A_DEL
-)
-
-};
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  switch(id) {
-    case MACRO_BREATH_TOGGLE:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_BREATHING
-          breathing_toggle();
-        #endif
-      }
-      break;
-    case MACRO_BREATH_SPEED_INC:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_BREATHING
-          breathing_period_inc();
-        #endif
-      }
-      break;
-    case MACRO_BREATH_SPEED_DEC:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_BREATHING
-          breathing_period_dec();
-        #endif
-      }
-      break;
-    case MACRO_BREATH_DEFAULT:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_BREATHING
-          breathing_period_default();
-        #endif
-      }
-      break;
-  }
-  return MACRO_NONE;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case ADMIN:
-      if (record->event.pressed) {
-        SEND_STRING("Administrator");
-      }
-      return false;
-      break;
-    case SMSPC1:
-      if (record->event.pressed) {
-        SEND_STRING("Simspace1!");
-      }
-      return false;
-      break;
-    case W10SLP:
-      if (record->event.pressed) {
-        SEND_STRING(SS_LGUI("x")"us");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/khord/rules.mk b/keyboards/planck/keymaps/khord/rules.mk
deleted file mode 100644
index 444fa38a93..0000000000
--- a/keyboards/planck/keymaps/khord/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/planck/keymaps/lucas/keymap.c b/keyboards/planck/keymaps/lucas/keymap.c
deleted file mode 100644
index 703dea81ea..0000000000
--- a/keyboards/planck/keymaps/lucas/keymap.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* 
-This is the keymap of /u/deepshitgoeshere!
-Layer 1 exists so I can have the symbol positions of QWERTY while having my system in german.
-The second layer has all the german umlauts I need and with capital and small letters on the 
-same layer there is no need to press shift+lower.
-This keymap is made to work with software implemented QWERTZ.
-The "Gaming" layer is mainly customized for CS:GO.
-If you have any question about this keymap feel free to shoot me a message on reddit!
-*/
-
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-#define LT_SPC LT(4, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Colemak   
-    * ,-----------------------------------------------------------------------.
-    * | Esc | q   | w   | f   | p   | g   | j   | l   | u   | y   | ;   |  -  |
-    * |-----------------------------------------------------------------------|
-    * | BS  | a   | r   | s   | t   | d   | h   | n   | e   | i   | o   |  '  |
-    * |-----------------------------------------------------------------------|
-    * | SFT | z   | x   | c   | v   | b   | k   | m   |  ,  |  .  |  /  | Ent |
-    * |-----------------------------------------------------------------------|
-    * | CTL | GUI | Tab | ALT |Lower|   Space   |Raise|Left |Down | Up  |Right|
-    * `-----------------------------------------------------------------------'
-    */
-  KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Z,    DE_SCLN, DE_MINS,
-  KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    DE_QUOT,
-  M(0),    KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    DE_COMM, DE_DOT,  DE_SLSH, KC_ENT,
-  KC_LCTL, KC_LGUI, KC_TAB,  KC_LALT, MO(3),   LT_SPC,  LT_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[1] = LAYOUT_planck_grid( /* Symbols
-    * ,-----------------------------------------------------------------------.
-    * |     |     |     |     |     |     |     |     |     |     |  :  |     |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |     |     |     |  "  |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |  <  |  >  |  ?  |     |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |           |     |     |     |     |     |
-    * `-----------------------------------------------------------------------'
-    */
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_DOT,  KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_DQUO,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(1),    DE_RABK, DE_QUES, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-[2] = LAYOUT_planck_grid( /* Raise
-    * ,-----------------------------------------------------------------------.
-    * |     |  Ä  |     |     |     |     |     |     |  Ü  |  Ö  |     |Game |
-    * |-----------------------------------------------------------------------|
-    * | Del |  ä  |     |  ß  |     |     |     |     |  ü  |  ö  |     |FVol+|
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     |     |     |     |Stop | Prv | Nxt |FVol-|
-    * |-----------------------------------------------------------------------|
-    * |LCTL |LGUI | Tab |LALT |Lower|   Space   |     |Mute |Vol- |Vol+ | P/P |
-    * `-----------------------------------------------------------------------'
-    */
-  KC_NO,   S(DE_ADIA), KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   S(DE_UDIA), S(DE_ODIA), KC_NO,   TG(5),
-  KC_DEL,  DE_ADIA,  KC_NO,   DE_SS,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   DE_UDIA,  DE_ODIA,  KC_NO,   RALT(KC_F12),
-  KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_MSTP,  KC_MPRV,  KC_MNXT, RALT(KC_F11),
-  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_MUTE,  KC_VOLD,  KC_VOLU, KC_MPLY
-),
-[3] = LAYOUT_planck_grid( /* Lower 
-    * ,-----------------------------------------------------------------------.
-    * |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |  +  |
-    * |-----------------------------------------------------------------------| 
-    * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  =  |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |  |  |  [  |  ]  |  {  |  }  |  €  |     |  \  | Ent |
-    * |-----------------------------------------------------------------------|
-    * |LCTL |LGUI | Tab |LALT |     |   Space   |Raise|Home |PgDn |PgUp | End |
-    * `-----------------------------------------------------------------------'
-    */
-  DE_TILD, DE_EXLM, DE_AT,   DE_HASH, DE_DLR,  DE_PERC, DE_CIRC,  DE_AMPR, DE_ASTR, DE_LPRN, DE_RPRN, DE_PLUS,
-  DE_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    DE_EQL,
-  KC_NO,   KC_NO,   KC_NO,   DE_PIPE, DE_LBRC, DE_RBRC, DE_LCBR,  DE_RCBR, DE_EURO, KC_NO,   DE_BSLS, KC_ENT,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-[4] = LAYOUT_planck_grid( /* Function
-    * ,-----------------------------------------------------------------------.
-    * | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 |
-    * |-----------------------------------------------------------------------|
-    * | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |
-    * |-----------------------------------------------------------------------|
-    * |     |     |     |     |     | KP- | KP+ |     |     |     |     |Reset| 
-    * |-----------------------------------------------------------------------|
-    * |     |Light|BL DN|BL UP|     |     |     |     |Mute |Vol- |Vol+ | P/P | 
-    * `-----------------------------------------------------------------------'
-    */
-  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_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,   KC_PMNS, KC_PPLS, KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,
-  KC_NO,  BL_TOGG, BL_DEC, BL_INC, MO(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[5] = LAYOUT_planck_grid( /* Gaming
-    * ,-----------------------------------------------------------------------.
-    * | Buy | ESC | q   | w   | e   | r   | t   | y   | u   | i   | o   |  p  |
-    * |-----------------------------------------------------------------------|
-    * | ENT | BS  | a   | s   | d   | f   | g   | h   | j   | k   | l   |  ;  |
-    * |-----------------------------------------------------------------------|
-    * | CTL | SFT | z   | x   | c   | v   | b   | n   |  m  |  ,  | Up  |  /  |
-    * |-----------------------------------------------------------------------|
-    * |     |     | Tab | ALT |     |   Space   |CrJmp| GUI |Left |Down |Right|
-    * `-----------------------------------------------------------------------'
-    */
-  MO(6),   KC_ESC,  KC_Q,   KC_W,    KC_E,  KC_R,   KC_T,   KC_Z,         KC_U,    KC_I,    KC_O,    TG(5),
-  KC_ENT,  KC_BSPC, KC_A,   KC_S,    KC_D,  KC_F,   KC_G,   KC_H,         KC_J,    KC_K,    KC_L,    DE_SCLN,
-  KC_LCTL, KC_LSFT, KC_Y,   KC_X,    KC_C,  KC_V,   KC_B,   KC_N,         KC_M,    DE_DOT,  KC_UP,   DE_SLSH,
-  KC_NO,   KC_NO,   KC_TAB, KC_LALT, KC_NO, KC_SPC, KC_SPC, LCTL(KC_SPC), KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT
-),
-[6] = LAYOUT_planck_grid( /* Gaming 
-         * CS:GO buy binds
-    * ,-----------------------------------------------------------------------.
-    * |     |     |     |     |     |     |     |     |  7  |  8  |  9  |     |
-    * |-----------------------------------------------------------------------|
-    * | BS  |     |     |     |     |     |     |     |  6  |  5  |  4  | End |
-    * |-----------------------------------------------------------------------|
-    * | CTL | SFT |     |     |     |     |     |     |  1  |  2  |  3  |Pgdn |
-    * |-----------------------------------------------------------------------|
-    * |     |     | Tab | ALT |     |   Space   |CrJmp|     |  0  | KP+ |PEnt |
-    * `-----------------------------------------------------------------------'
-    */
-  KC_TRNS, KC_NO,   KC_Q,   KC_W,    KC_F,  KC_P,   KC_G,   KC_J,         KC_P7, KC_P8, KC_P9,   KC_NO,
-  KC_BSPC, KC_NO,   KC_A,   KC_R,    KC_S,  KC_T,   KC_D,   KC_H,         KC_P4, KC_P5, KC_P6,   KC_END,
-  KC_LCTL, KC_LSFT, KC_Y,   KC_X,    KC_C,  KC_V,   KC_B,   KC_K,         KC_P1, KC_P2, KC_P3,   KC_PGDN,
-  KC_NO,   KC_NO,   KC_TAB, KC_LALT, KC_NO, KC_SPC, KC_SPC, LCTL(KC_SPC), KC_NO, KC_P0, KC_PDOT, KC_PENT
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 
-{
-  switch(id) {
-    case 0: // M(0)
-        if (record->event.pressed) {
-            register_code(KC_LSFT);
-            layer_on(1);
-        } else {
-            layer_off(1);
-            unregister_code(KC_LSFT);
-        }
-        break;       
-    case 1: // M(1)
-        if (record->event.pressed) {
-            unregister_code(KC_LSFT);
-            register_code(DE_LABK);
-        } else {
-            unregister_code(DE_LABK);
-        }
-        break;    
-  }
-  return MACRO_NONE;
-
-};          
diff --git a/keyboards/planck/keymaps/lucas/rules.mk b/keyboards/planck/keymaps/lucas/rules.mk
deleted file mode 100644
index 10de3bfc03..0000000000
--- a/keyboards/planck/keymaps/lucas/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/lukas/keymap.c b/keyboards/planck/keymaps/lukas/keymap.c
deleted file mode 100644
index 510cb147bd..0000000000
--- a/keyboards/planck/keymaps/lukas/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// This simple keymap is optimized for xmonad users using super as their modifier key.
-// M(1) makes it possible to change virtual screens and swap windows between them.
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-#define _QW 0
-#define _LW 1
-#define _RS 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT_planck_grid( /* Qwerty */
-    KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D, KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-    KC_LCTL, KC_LALT, KC_LGUI, M(1), MO(_LW), KC_SPC, KC_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-  [_RS] = LAYOUT_planck_grid( /* RAISE */
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL ,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-  [_LW] = LAYOUT_planck_grid( /* LOWER */
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  )
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-  switch(id) {
-    case 0:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      break;
-    case 1:
-      if (record->event.pressed) {
-        register_code(KC_LGUI);
-        layer_on(_RS);
-      } else {
-        unregister_code(KC_LGUI);
-        layer_off(_RS);
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/lukas/rules.mk b/keyboards/planck/keymaps/lukas/rules.mk
deleted file mode 100644
index d86b02fd1c..0000000000
--- a/keyboards/planck/keymaps/lukas/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/luke/keymap.c b/keyboards/planck/keymaps/luke/keymap.c
deleted file mode 100644
index 8f20a55867..0000000000
--- a/keyboards/planck/keymaps/luke/keymap.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * A keyboard layout for the gridded planck.
- *
- * Copyright (C) 2017 Luke Silva
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- *
- * This layout uses colemak by default, and is designed for programming, with easy access to symbols
- * through either double purpose modifiers or colemak style rolling for commonly used symbol clusters
- * Eg: compare colemak 'this' to '(){\n}' on the symbol layer.
- *
- * The layout also supports a range of multilingual characters, covering those
- * needed for French, German, Swedish and likely some other European Languages.
- * In the future full support for Colemak's multilingual deadkeys may be introduced.
- *
- * The multilingual characters are inputted through QMK's unicode engine, using
- * the Linux input method by default, however this can be changed at runtime.
- *
- */
-
-
-#include QMK_KEYBOARD_H
-
-// Layers
-#define _COLEMAK 0
-#define _QWERTY 1
-#define _SYM 2
-#define _NUM 3
-#define _GR  4
-#define _GR_S 5
-#define _ADJ 6
-#define _NAV 7
-#define _PLOVER 8
-
-// Macro ID numbers
-#define M_ALT_HASH 1
-#define M_GR_DASH  2
-#define M_SYM_LPRN 3
-#define M_NAV_UNDS 4
-#define M_NUM_RPRN 5
-#define M_CTRL_DLR 6
-#define M_LCBR_ENT 7
-#define M_PLOVER   8
-#define M_EXT_PLV  9
-#define M_WINDOWS 10
-#define M_LINUX   11
-#define M_OSX     12
-#define M_FUNCTION 13
-#define M_THEN     14
-#define M_CATCH    15
-
-// Macro keys
-#define ALT_HASH MACROTAP(M_ALT_HASH)   // tap for #, hold for Alt
-#define GR_DASH  MACROTAP(M_GR_DASH)    // tap for -, hold for GR layer            a-class-name
-#define SYM_LPRN MACROTAP(M_SYM_LPRN)   // tap for (, hold for symbols layer       if()
-#define NAV_UNDS MACROTAP(M_NAV_UNDS)   // tap for _, hold for navigation layer    snake_case_variable
-#define NUM_RPRN MACROTAP(M_NUM_RPRN)   // tap for ), hold for numbers layer       else if()
-#define CTRL_DLR MACROTAP(M_CTRL_DLR)   // tap for $, hold for ctrl                $php_is_really_weird
-#define LCBR_ENT M(M_LCBR_ENT)          // {\n                                     easier code formatting
-#define PLOVER   M(M_PLOVER)            // PHROPB (plover) or ERFVIK(qwerty)       starts plover
-#define EXT_PLV  M(M_EXT_PLV)           // PHRO*F (plover) or ERFVYU(qwerty)       stops plover
-#define WINDOWS  M(M_WINDOWS)           // Sets Unicode handler to windows
-#define LINUX    M(M_LINUX)             // Sets Unicode handler to linux
-#define OSX      M(M_OSX)               // Sets Unicode handler to OSX
-#define FUNCTION M(M_FUNCTION)
-#define THEN     M(M_THEN)
-#define CATCH    M(M_CATCH)
-
-
-// Renames of QMK keys... (would have otherwise been a macro)
-#define QWERTY DF(_QWERTY)
-#define COLEMAK DF(_COLEMAK)
-
-
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |  ;:  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Bksp |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '"  |
- * |------+------+------+------+------+------+------+------+------+------+------+------`---.
- * |Shift=|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |  ,<  |  .>  |  /?  |Shift/Ent |
- * |------+------+------+------+------+------+------+------+------+------+------+----------|
- * |CtCaps|GUIF4 | Alt# | Gr-  | Sym( | Nav_ |Space | Num) |Ctrl$ | F11  | F12  |Nav toggle|
- * `---------------------------------------------------------------------------------------'
- */
-
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,         KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_BSPC,        KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SFT_T(KC_EQL),  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT) ,
-  CTL_T(KC_CAPS), KC_LGUI,  ALT_HASH, GR_DASH, SYM_LPRN, NAV_UNDS,  KC_SPC, NUM_RPRN, CTRL_DLR, KC_F11, KC_F12, TG(_NAV)
-),
-
-
-
-/* QWERTY
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Bksp |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |  '"  |
- * |------+------+------+------+------+------+------+------+------+------+------+------`---.
- * |Shift=|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  |Shift/Ent |
- * |------+------+------+------+------+------+------+------+------+------+------+----------|
- * |CtCaps|GUIF4 | Alt# | Gr-  | Sym( | Nav_ |Space | Num) |Ctrl$ | F11  | F12  |Nav toggle|
- * `---------------------------------------------------------------------------------------'
- */
-
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT) ,
-  CTL_T(KC_CAPS),    KC_LGUI, KC_LALT, GR_DASH, SYM_LPRN,KC_SPC,  KC_SPC, NUM_RPRN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
-),
-
-
-/* Symbols
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  `   |  @   |  /   |  *   |  ^   |  %   |  :   |  +   |  -   | Del  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  [   |  ;   |  }   |  (   |  "   |  '   |  )   | {\n  |  !   |  ]   |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Shift |  .   |  {   |  <   |  >   |  ~   |  X2  |  =   |  &   |  |   |  ?   |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Sym  |  _   |Space | NUM  |  X2  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_SYM] = LAYOUT_planck_grid(
-  KC_TAB,  KC_GRV,  KC_AT,   KC_SLSH, KC_ASTR, KC_CIRC, KC_PERC, KC_COLN, KC_PLUS, KC_MINS, KC_DEL,  KC_BSPC,
-  FUNCTION,KC_LBRC, KC_SCLN, KC_RCBR, KC_LPRN, KC_DQT,  KC_QUOT, KC_RPRN, LCBR_ENT,KC_EXLM, KC_RBRC, KC_BSLS,
-  KC_LSFT, KC_DOT,  KC_LCBR, KC_LABK, KC_RABK, KC_TILD, _______, KC_EQL,  KC_AMPR, KC_PIPE, KC_QUES, KC_ENT ,
-  THEN,    CATCH,   XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______
-),
-
-
-/* Numbers
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Bksp |  x   |  D   |  E   |  F   |  +   |  -   |  4   |  5   |  6   |  0   |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Shift |  (   |  A   |  B   |  C   |  *   |  /   |  1   |  2   |  3   |  )   |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  GR  | SYM  |  _   |Space | NUM  |  0   |  .   |  f   |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_NUM] = LAYOUT_planck_grid(
-  KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_BSPC, KC_X,    S(KC_D), S(KC_E), S(KC_F), KC_PLUS, KC_MINS, KC_4,    KC_5,    KC_6,    KC_0,    KC_ENT ,
-  KC_LSFT, KC_LPRN, S(KC_A), S(KC_B), S(KC_C), KC_ASTR, KC_SLSH, KC_1,    KC_2,    KC_3,    KC_RPRN, KC_ENT ,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_0,    KC_DOT,  KC_F,    _______
-),
-
-
-/* Gr layer / international keys
- * ,-----------------------------------------------------------------------------------.
- * |      |  ä   |  å   |      |  ¢£  |  €¥  |      |  ë   |  ê   |  ü   |  ù   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  â   |  à   |  ß   |      |      |      |  è   |  é   |  ï   |  ö   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  æ   |  ô   |  ç   |  œ   |      |      |  û   |  «   |  »   |  î   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_GR] = LAYOUT_planck_grid(
-  _______,  UC(0xE4),UC(0xE5), _______,UC(0xA2), UC(0x20AC),_______,UC(0xEB),UC(0xEA),UC(0xFC),UC(0xF9), _______,
-  _______,  UC(0xE2),UC(0xE0),UC(0xDF), _______, _______,   _______,UC(0xE8),UC(0xE9),UC(0xEF),UC(0xF6), _______,
-  MO(_GR_S),UC(0xE6),UC(0xF4),UC(0xE7),UC(0x153),_______,   _______,UC(0xFB),UC(0xAB),UC(0xBB),UC(0xEE), MO(_GR_S),
-  _______,  _______, _______, _______, _______,  _______,   _______, _______, _______, _______, _______, _______
-),
-
-// Shifted layer of the above
-[_GR_S] = LAYOUT_planck_grid(
-  _______,  UC(0xC4),UC(0xC5), _______, UC(0xA3), UC(0xA5),_______, UC(0xCB),UC(0xCA),UC(0xDC),UC(0xD9),_______,
-  _______,  UC(0xC2),UC(0xC0), UC(0xDF),_______,  _______, _______, UC(0xC8),UC(0xC9),UC(0xCF),UC(0xD6),_______,
-  MO(_GR_S),UC(0xC6),UC(0xD4), UC(0xC7),UC(0x152),_______, _______, UC(0xDB),UC(0xAB),UC(0xBB),UC(0xCE),MO(_GR_S),
-  _______,  _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/* Adjust Layer (Gr + Num)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+-------------+------+------+------+------+------+------+------+------+------|
- * |      |     |Prntscr| ESC  |VOLUP | PLAY | PREV |QWERTY|COLEMAK|PLOVER|     |      |
- * |------+-------------+------+------+------+------+------+------+------+------+------|
- * |      |     |BACKLIT| INS  |VOLDWN| MUTE | NEXT | WIND |LINUX | OSX  |      |      |
- * |------+-------------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_ADJ] = LAYOUT_planck_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12 ,
-  XXXXXXX, XXXXXXX, KC_PSCR, KC_ESC,  KC_VOLU, KC_MPLY, KC_MPRV, QWERTY,  COLEMAK, PLOVER,  XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, BL_STEP, KC_INS,  KC_VOLD, KC_MUTE, KC_MNXT, WINDOWS, LINUX,   OSX,     XXXXXXX, XXXXXXX,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/* Navigation
- * ,-----------------------------------------------------------------------------------.
- * |      |      | BTN3 | BTN2 | BTN1 |      | ACL0 | HOME | PGDN | PGUP | END  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |MSLEFT| MSDN | MSUP |MSRGHT|      | ACL1 | LEFT | DOWN | UP   | RGHT |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |WHLEFT| WHDN | WHUP |WHRGHT|      | ACL2 |C-LEFT|C-PGDN|C-PGUP|C-RGHT|Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |  _   |Space | ACL0 | ACL1 | ACL2 |      |TGLNAV|
- * `-----------------------------------------------------------------------------------'
- */
-
-[_NAV] = LAYOUT_planck_grid(
-  XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN2, KC_BTN1, XXXXXXX, KC_ACL0, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_BSPC,
-  XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, KC_ACL1, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_ENT ,
-  XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX, KC_ACL2, LCTL(KC_LEFT), LCTL(KC_PGDN), LCTL(KC_PGUP), LCTL(KC_RIGHT), KC_ENT ,
-  _______, _______, _______, _______, _______, _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______
-),
-
-/* Plover Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   #  |   A  |   O  |   E  |   U  |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  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,
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_1,    KC_C,    KC_V,    KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-
-
-};
-
-void matrix_init_user(){
-  set_unicode_input_mode(UC_LNX);
-}
-
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
-    case M_ALT_HASH:
-      return MACRO_TAP_SHFT_KEY_HOLD_MOD(record, 3, LALT);
-    case M_GR_DASH:
-      {
-        const macro_t* macro = MACRO_TAP_HOLD_LAYER(record, MACRO(T(MINS)), _GR);
-        update_tri_layer(_NUM, _GR, _ADJ);
-        return macro;
-      }
-    case M_SYM_LPRN:
-      return MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, 9, _SYM);
-    case M_NAV_UNDS:
-      return MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, MINS, _NAV);
-    case M_NUM_RPRN:
-      {
-        const macro_t* macro = MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, 0, _NUM);
-        update_tri_layer(_NUM, _GR, _ADJ);
-        return macro;
-      }
-    case M_CTRL_DLR:
-      return MACRO_TAP_SHFT_KEY_HOLD_MOD(record, 4, LCTL);
-    case M_LCBR_ENT:
-      return MACRODOWN(I(10), D(LSFT), T(LBRC), U(LSFT), T(ENT), END);
-    case M_PLOVER:
-      if (record->event.pressed) {
-        layer_and(0);
-        layer_on(_PLOVER);
-        default_layer_set(_PLOVER);
-
-        // Starts plover
-        return MACRO(I(10), D(E), D(R), D(F), D(V), D(I), D(K), U(E), U(R), U(F), U(V), U(I), U(K), END);
-      }
-      break;
-    case M_EXT_PLV:
-      if (!record->event.pressed) {
-        layer_off(_PLOVER);
-        default_layer_set(_COLEMAK);
-
-        //Pauses plover
-        return MACRO(I(10), D(E), D(R), D(F), D(V), D(Y), D(U), U(E), U(R), U(F), U(V), U(Y), U(U), END);
-      }
-      break;
-    case M_WINDOWS:
-      set_unicode_input_mode(UC_WIN);
-      break;
-    case M_LINUX:
-      set_unicode_input_mode(UC_LNX);
-      break;
-    case M_OSX:
-      set_unicode_input_mode(UC_MAC);
-      break;
-    case M_FUNCTION:
-      if (record->event.pressed) {
-        SEND_STRING("function");
-      }
-      break;
-    case M_THEN:
-      if (record->event.pressed) {
-        SEND_STRING("then");
-      }
-      break;
-    case M_CATCH:
-      if (record->event.pressed) {
-        SEND_STRING("catch");
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/luke/readme.md b/keyboards/planck/keymaps/luke/readme.md
deleted file mode 100644
index 3a4824b5b4..0000000000
--- a/keyboards/planck/keymaps/luke/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# A more basic Planck Layout for copying
-
diff --git a/keyboards/planck/keymaps/luke/rules.mk b/keyboards/planck/keymaps/luke/rules.mk
deleted file mode 100644
index 49547d19a0..0000000000
--- a/keyboards/planck/keymaps/luke/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/mollat/keymap.c b/keyboards/planck/keymaps/mollat/keymap.c
deleted file mode 100644
index fc2a8bc47c..0000000000
--- a/keyboards/planck/keymaps/mollat/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// This layout is based on the following needs:
-//
-// should be as close as possible to querty/us-international layout (using international/AltGr as o/s driver)
-// added german umlauts at known places from de-layout
-// all movement keys should be at known places from vi/bash (eg HJKL for cursor keys)
-// Fn layer (at CapsLock place like the Pok3r does) for missing keys
-// additional layer for tmux window switching
-//
-// This is work in Progress! If you have suggestions write me at github.com/mollat/qmk_firmware/ and check
-// this fork for updates as I probably won't bother jack with my pull requests frequently.
-//
-
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _HIGH 1
-#define _LOW 2
-#define _FN 3
-#define _TMUX 4
-#define _LCTL 5
-#define _MOUSE 6
-#define __________ KC_NO // just for easy reading
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_planck_grid( /* Qwerty */
-   LT(_MOUSE, 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(_FN, KC_TAB),KC_A,   KC_S,       KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT    ,
-   KC_LSFT,    KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,       KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    SFT_T(KC_ENT),
-   __________, __________, KC_LGUI,    KC_LALT,    KC_LCTL,LT(_TMUX, KC_SPC),LT(_HIGH, KC_SPC),MO(_LOW),KC_RALT,KC_RGUI,   __________, __________
-),
-
-// missing keys regarding to the form factor
-// keeping the dot and comma for typing faster IP addresses and (german) float values
-// putting the backslash on the slash's place
-[_HIGH] = LAYOUT_planck_grid(
-   KC_GRV,     KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,    KC_CIRC,    KC_AMPR,    KC_ASTR,    KC_LPRN,    KC_RPRN,    KC_MINS    ,
-   __________, KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_EQL     ,
-   __________, __________, __________, __________, __________, __________, __________, __________, KC_COMM,    KC_DOT,     KC_BSLS,    LSFT(KC_BSLS),
-   __________, __________, __________, __________, __________, __________, KC_TRNS,    __________, __________, __________, __________, __________
-),
-
-// classic Fn-Layer triggered with 'CapsLock-key' like on Pok3r
-// SPC and ENT are doubled for using repeat (which I switched off, see https://github.com/tmk/tmk_keyboard/issues/287)
-// '€' sign is on the '5' position as this is the usual AltGr place on the US Internation layout
-// home/end at the 'a' and 'e' position like in bash
-// ins at 'i'
-// del besides backspace (had no better place for it because of the umlauts)
-// pg-down at 'f' (forward in vi), pg-up at 'b' (back in 'vi')
-//
-[_FN] = LAYOUT_planck_grid(
-   __________, __________, __________, KC_END,     __________, __________, __________, __________, KC_INS,     __________, KC_DEL,     RALT(KC_Y) ,
-   KC_TRNS,    __________, RALT(KC_S), __________, KC_PGDN,    RALT(KC_5), KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    RALT(KC_P), RALT(KC_Q) ,
-   __________, KC_HOME,    __________, __________, __________, KC_PGUP,    __________, __________, __________, __________, __________, KC_ENT     ,
-   QK_BOOT,    __________, __________, __________, __________, KC_SPC,     KC_SPC,     __________, __________, __________, __________, __________
-),
-
-// function key layer and some shift + (missing key at the small form factor)
-[_LOW] = LAYOUT_planck_grid(
-   KC_TILD,    __________, __________, __________, __________, __________, __________, __________, __________, KC_LCBR,    KC_RCBR,    KC_UNDS    ,
-   __________, KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_LBRC,    KC_RBRC,    KC_PLUS    ,
-   __________, __________, __________, __________, __________, KC_F9,      KC_F10,     KC_F11,     KC_F12,     __________, __________, __________ ,
-   __________, __________, __________, __________, __________, __________, __________, KC_TRNS,    __________, __________, __________, __________
-),
-
-// most macros will switch tmux screens
-// two macros are for vi's save/quit at 'w' and 'q'
-[_TMUX] = LAYOUT_planck_grid(
-   __________, M(14),      M(13),      __________, __________, __________, __________, __________, __________, __________, M(11),      __________ ,
-   M(0),       M(1),       M(2),       M(3),       M(4),       M(5),       M(6),       M(7),       M(8),       M(9),       __________, __________ ,
-   __________, __________, __________, M(12),      __________, __________, M(10),      __________, __________, __________, __________, __________ ,
-   __________, __________, __________, __________, __________, KC_TRNS,    __________, __________, __________, __________, __________, __________
-),
-
-// mouse movement can be improved (e.g. can't press hj at once), but I will use this seldom, so I stick with hjkl keys.
-[_MOUSE] = LAYOUT_planck_grid(
-   KC_TRNS,    __________, __________, __________, __________, __________, __________, __________, __________, __________, __________, __________ ,
-   __________, __________, __________, __________, KC_WH_D,    __________, KC_MS_L,    KC_MS_D,    KC_MS_U,    KC_MS_R,    __________, __________ ,
-   __________, __________, __________, __________, __________, KC_WH_U,    __________, __________, __________, __________, __________, __________ ,
-   __________, __________, __________, KC_ACL2,    KC_ACL1,    KC_ACL0,    KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, __________, __________, __________
-)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_0), END );
-          break;
-        case 1:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_1), END );
-          break;
-        case 2:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_2), END );
-          break;
-        case 3:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_3), END );
-          break;
-        case 4:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_4), END );
-          break;
-        case 5:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_5), END );
-          break;
-        case 6:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_6), END );
-          break;
-        case 7:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_7), END );
-          break;
-        case 8:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_8), END );
-          break;
-        case 9:
-          // tmux last window
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_L), END );
-          break;
-          // tmux next window
-        case 10:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_N), END );
-          break;
-          // tmux previous window
-        case 11:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_P), END );
-          break;
-          // tmux new window
-        case 12:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), TYPE(KC_C), END );
-          break;
-        case 13:
-          // vi save document
-          return MACRODOWN( TYPE(KC_ESC), DOWN(KC_LSFT), TYPE(KC_SCLN), UP(KC_LSFT), TYPE(KC_W), TYPE(KC_ENT), END );
-          break;
-        case 14:
-          // vi quit
-          return MACRODOWN( TYPE(KC_ESC), DOWN(KC_LSFT), TYPE(KC_SCLN), UP(KC_LSFT), TYPE(KC_Q), TYPE(KC_ENT), END );
-          break;
-          // tmux press ctrl-b
-        case 15:
-          return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_B), UP(KC_LCTL), END );
-          break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/mollat/rules.mk b/keyboards/planck/keymaps/mollat/rules.mk
deleted file mode 100644
index b9760d72e2..0000000000
--- a/keyboards/planck/keymaps/mollat/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/planck/keymaps/nico/keymap.c b/keyboards/planck/keymaps/nico/keymap.c
deleted file mode 100644
index bc3a3f94d8..0000000000
--- a/keyboards/planck/keymaps/nico/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QW 0
-#define _CM 1
-#define _DV 2
-#define _LW 3
-#define _RS 4
-
-#define LW_BSPC LT(_LW, KC_BSPC)
-#define RS_ENT  LT(_RS, KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QW] = LAYOUT_planck_grid( /* Qwerty */
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_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 ,
-  M(0),    KC_ESC,  KC_LALT, KC_LGUI, LW_BSPC, KC_SPC,  KC_SPC,  RS_ENT,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_CM] = LAYOUT_planck_grid( /* Colemak */
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_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 ,
-  M(0),    KC_ESC,  KC_LALT, KC_LGUI, LW_BSPC, KC_SPC,  KC_SPC,  RS_ENT,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_DV] = LAYOUT_planck_grid( /* Dvorak */
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  M(0),    KC_ESC,  KC_LALT, KC_LGUI, LW_BSPC, KC_SPC,  KC_SPC,  RS_ENT,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_RS] = LAYOUT_planck_grid( /* RAISE */
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
-  M(0),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14,  KC_F15,  KC_TRNS, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[_LW] = LAYOUT_planck_grid( /* LOWER */
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
-  M(0),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14,  KC_F15,  KC_TRNS, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
-)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            backlight_step();
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/nico/rules.mk b/keyboards/planck/keymaps/nico/rules.mk
deleted file mode 100644
index 10de3bfc03..0000000000
--- a/keyboards/planck/keymaps/nico/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/pete/keymap.c b/keyboards/planck/keymaps/pete/keymap.c
deleted file mode 100644
index d5460778f7..0000000000
--- a/keyboards/planck/keymaps/pete/keymap.c
+++ /dev/null
@@ -1,252 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _FCT 5
-#define _SETUP 6
-#define _MAC 7
-#define _WIN 8
-#define _LIN 9
-#define _MICMUTE 16
-#define _OS 17
-
-
-// Macro name shortcuts
-#define QWERTY M(_QWERTY)
-#define COLEMAK M(_COLEMAK)
-#define DVORAK M(_DVORAK)
-#define LOWER M(_LOWER)
-#define RAISE M(_RAISE)
-#define FCT M(_FCT)
-#define OS M(_OS)
-#define MAC M(_MAC)
-#define WIN M(_WIN)
-#define LIN M(_LIN)
-#define MICMUTE M(_MICMUTE)
-
-#define MACPRNT LGUI(LSFT(KC_3))
-#define MACPRNT2 LGUI(LSFT(KC_4))
-#define WINPRNT KC_PSCR
-#define WINPRNT2 LGUI(KC_PSCR)
-#define CYCLWIN LGUI(KC_GRV)
-#define MACSLEEP LSFT(LCTL(KC_PWR))
-#define WINSLEEP KC_SLEP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_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 ,
-  OS,     KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  OS,      KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  OS,      KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,  _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-[_RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _RAISE,  _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-[_SETUP] = LAYOUT_planck_grid( /* Setup */
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, WIN,     MAC,     _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
-),
-[_MAC] = LAYOUT_planck_grid( /* Mac */
-  CYCLWIN,MACSLEEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_DEL ,
-  _______, MICMUTE, KC_MUTE, KC_VOLD, KC_VOLU, MACPRNT,MACPRNT2, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX,
-  _______, BL_STEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
-  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDOWN,KC_PGUP,KC_END
-),
-[_WIN] = LAYOUT_planck_grid( /* Windows */
-  CYCLWIN,WINSLEEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_DEL ,
-  _______, MICMUTE, KC_MUTE, KC_VOLD, KC_VOLU, WINPRNT,WINPRNT2, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX,
-  _______, BL_STEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
-  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDOWN,KC_PGUP,KC_END
-),
-[_LIN] = LAYOUT_planck_grid( /* Linux */
-  KC_L,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-int currentOs = _MAC;
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2] = {
-  {440.0*pow(2.0,(31)/12.0), 12},
-  {440.0*pow(2.0,(28)/12.0), 8},
-  {440.0*pow(2.0,(19)/12.0), 8},
-  {440.0*pow(2.0,(24)/12.0), 8},
-  {440.0*pow(2.0,(28)/12.0), 20}
-};
-
-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);
-
-float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
-float goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case _QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          break;
-        case _COLEMAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
-          }
-          break;
-        case _DVORAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dvorak);
-            #endif
-            persistent_default_layer_set(1UL<<_DVORAK);
-          }
-          break;
-        case _LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _SETUP);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _SETUP);
-          }
-          break;
-        case _RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _SETUP);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _SETUP);
-          }
-          break;
-        case _FCT:
-          if (record->event.pressed) {
-            layer_on(_FCT);
-          } else {
-            layer_off(_FCT);
-          }
-        break;
-        case _MICMUTE:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            register_code(KC_RCTL);
-            register_code(KC_RALT);
-            register_code(KC_RGUI);
-          } else {
-            unregister_code(KC_RSFT);
-            unregister_code(KC_RCTL);
-            unregister_code(KC_RALT);
-            unregister_code(KC_RGUI);
-          }
-        break;
-        case _OS:
-          if (record->event.pressed) {
-            layer_on(currentOs);
-          } else {
-            layer_off(_MAC);
-            layer_off(_WIN);
-            layer_off(_LIN);
-          }
-        break;
-        case _MAC:
-        case _WIN:
-        case _LIN:
-          if (record->event.pressed) {
-            layer_off(currentOs);
-            currentOs = id;
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-void matrix_init_user(void) {
-  #ifdef AUDIO_ENABLE
-    _delay_ms(20); // stops the tick
-    PLAY_SONG(tone_startup);
-  #endif
-}
-
-#ifdef AUDIO_ENABLE
-void play_goodbye_tone()
-{
-  PLAY_SONG(goodbye);
-  _delay_ms(150);
-}
-
-uint8_t starting_note = 0x0C;
-int offset = 0;
-
-bool process_action_user(keyrecord_t *record) {
-
-  if (IS_LAYER_ON(_MUSIC)) {
-    if (record->event.pressed) {
-        play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
-    } else {
-        stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
-    }
-    return false;
-  }
-  return true;
-}
-#endif
diff --git a/keyboards/planck/keymaps/pete/readme.md b/keyboards/planck/keymaps/pete/readme.md
deleted file mode 100644
index 3cf594f3a9..0000000000
--- a/keyboards/planck/keymaps/pete/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Planck Layout by Pete
-
-This layout is based on the default layout but uses a FN key in the bottom left corner instead of the shift / backlight key.
-On the FN layer you can do the following things
-
-- Step through back light
-- Put a mac to sleep
-- The Fxx keys in a block to click with the right hand
-- The delete key in the upper right corner
-- Quick access to screenshot functions
-- Control volume and media playback
-- Home/PgDown/PgUp/End buttons where the arrow keys are
-
-Pressing the lower and raise buttons allows to reset and change from QWERT to Colemak or Dvorak.
diff --git a/keyboards/planck/keymaps/pete/rules.mk b/keyboards/planck/keymaps/pete/rules.mk
deleted file mode 100644
index 8a328f6b6c..0000000000
--- a/keyboards/planck/keymaps/pete/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-AUDIO_ENABLE = no
-NKRO_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/pvc/config.h b/keyboards/planck/keymaps/pvc/config.h
deleted file mode 100644
index 78e12d3120..0000000000
--- a/keyboards/planck/keymaps/pvc/config.h
+++ /dev/null
@@ -1,78 +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
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-/* Planck PCB default pin-out */
-#ifndef KEYBOARD_planck_light
-#define MATRIX_ROW_PINS { D0, D5, B5, B6 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#endif
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-#ifndef NO_DEBUG
-#  define NO_DEBUG
-#endif
-
-/* disable print */
-// #ifndef NO_PRINT
-// #  define NO_PRINT
-// #endif
-
-/* Only print user print statements */
-#define USER_PRINT
-
-#ifndef KEYBOARD_planck_light
-#define BACKLIGHT_BREATHING
-#endif
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/planck/keymaps/pvc/keymap.c b/keyboards/planck/keymaps/pvc/keymap.c
deleted file mode 100644
index e03e692d4e..0000000000
--- a/keyboards/planck/keymaps/pvc/keymap.c
+++ /dev/null
@@ -1,596 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mousekey.h"
-
-#ifdef AUDIO_ENABLE
-    #include "audio.h"
-    #include "song_list.h"
-#endif
-
-enum keyboard_layers {
-  LAYER_QWERTY = 0,
-  LAYER_UPPER,
-  LAYER_LOWER,
-  LAYER_FUNCTION,
-  LAYER_MOUSE,
-  LAYER_ADJUST,
-};
-enum keyboard_macros {
-  MACRO_QWERTY = 0,
-  MACRO_UPPER,
-  MACRO_LOWER,
-  MACRO_FUNCTION,
-  MACRO_MOUSE,
-  MACRO_TIMBRE_1,
-  MACRO_TIMBRE_2,
-  MACRO_TIMBRE_3,
-  MACRO_TIMBRE_4,
-  MACRO_TEMPO_U,
-  MACRO_TEMPO_D,
-  MACRO_TONE_DEFAULT,
-  MACRO_MUSIC_TOGGLE,
-  MACRO_AUDIO_TOGGLE,
-  MACRO_INC_VOICE,
-  MACRO_DEC_VOICE,
-  MACRO_BACKLIGHT,
-  MACRO_BREATH_TOGGLE,
-  MACRO_BREATH_SPEED_INC,
-  MACRO_BREATH_SPEED_DEC,
-  MACRO_BREATH_DEFAULT,
-  MACRO_MOUSE_MOVE_UL,
-  MACRO_MOUSE_MOVE_UR,
-  MACRO_MOUSE_MOVE_DL,
-  MACRO_MOUSE_MOVE_DR,
-  MACRO_HELP_1,
-  MACRO_HELP_2,
-  MACRO_HELP_3,
-  MACRO_HELP_4,
-  MACRO_HELP_5,
-  MACRO_HELP_6,
-  MACRO_HELP_7,
-  MACRO_HELP_8,
-  MACRO_HELP_9,
-};
-
-#define M_QWRTY             M(MACRO_QWERTY)
-#define M_UPPER             M(MACRO_UPPER)
-#define M_LOWER             M(MACRO_LOWER)
-#define M_FUNCT             M(MACRO_FUNCTION)
-#define M_MOUSE             M(MACRO_MOUSE)
-#define TIMBR_1             M(MACRO_TIMBRE_1)
-#define TIMBR_2             M(MACRO_TIMBRE_2)
-#define TIMBR_3             M(MACRO_TIMBRE_3)
-#define TIMBR_4             M(MACRO_TIMBRE_4)
-#define TMPO_UP             M(MACRO_TEMPO_U)
-#define TMPO_DN             M(MACRO_TEMPO_D)
-#define TMPO_DF             M(MACRO_TONE_DEFAULT)
-#define M_BACKL             M(MACRO_BACKLIGHT)
-#define M_BRTOG             M(MACRO_BREATH_TOGGLE)
-#define M_BSPDU             M(MACRO_BREATH_SPEED_INC)
-#define M_BSPDD             M(MACRO_BREATH_SPEED_DEC)
-#define M_BDFLT             M(MACRO_BREATH_DEFAULT)
-#define M_MS_UL             M(MACRO_MOUSE_MOVE_UL)
-#define M_MS_UR             M(MACRO_MOUSE_MOVE_UR)
-#define M_MS_DL             M(MACRO_MOUSE_MOVE_DL)
-#define M_MS_DR             M(MACRO_MOUSE_MOVE_DR)
-#define M_HELP1             M(MACRO_HELP_1)
-#define M_HELP2             M(MACRO_HELP_2)
-#define M_HELP3             M(MACRO_HELP_3)
-#define M_HELP4             M(MACRO_HELP_4)
-#define M_HELP5             M(MACRO_HELP_5)
-#define M_HELP6             M(MACRO_HELP_6)
-#define M_HELP7             M(MACRO_HELP_7)
-#define M_HELP8             M(MACRO_HELP_8)
-#define M_HELP9             M(MACRO_HELP_9)
-
-
-#define VC_UP               M(MACRO_INC_VOICE)
-#define VC_DOWN             M(MACRO_DEC_VOICE)
-
-
-#define SC_UNDO             LCTL(KC_Z)
-#define SC_REDO             LCTL(KC_Y)
-#define SC_CUT              LCTL(KC_X)
-#define SC_COPY             LCTL(KC_C)
-#define SC_PSTE             LCTL(KC_V)
-#define SC_SELA             LCTL(KC_A)
-#define SC_SAVE             LCTL(KC_S)
-#define SC_OPEN             LCTL(KC_O)
-#define SC_ACLS             LALT(KC_F4)
-#define SC_CCLS             LCTL(KC_F4)
-
-#define TG_NKRO             MAGIC_TOGGLE_NKRO
-#define OS_SHFT             OSM(MOD_RSFT)
-
-#define ________________    _______, _______
-#define XXXXXXXXXXXXXXXX    XXXXXXX, XXXXXXX
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* LAYER = LAYER_QWERTY
-  .-----------------------------------------------------------------------------------------------------------.
-  | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BACKSP |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ESC    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | UP     | ENTER  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | LCTRL  | LWIN   | FN     | LALT   | UPPER  | SPACE  | SPACE  | LOWER  | OSHIFT | LEFT   | DOWN   | RIGHT  |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_QWERTY] = LAYOUT_planck_grid(
-   KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC ,
-   KC_ESC , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT ,
-   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_ENT  ,
-   KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_LEFT, KC_DOWN, KC_RGHT
-),
-/* LAYER = LAYER_UPPER
-  .-----------------------------------------------------------------------------------------------------------.
-  | PRINT  | F1     | F2     | F3     | F4     | NUM LK | KP /   | KP 7   | KP 8   | KP 9   | KP -   | DEL    |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | PAUSE  | F5     | F6     | F7     | F8     | SCR LK | KP *   | KP 4   | KP 5   | KP 6   | KP +   | INS    |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | F9     | F10    | F11    | F12    | PAUSE  | KP 0   | KP 1   | KP 2   | KP 3   | KP ENT | HOME   |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | ______ | ______ | UPPER  | KP 0   | KP 0   | ______ | RALT   | KP .   | KP ENT | END    |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_UPPER] = LAYOUT_planck_grid(
-   KC_PSCR, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, KC_DEL  ,
-   KC_PAUS, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_SLCK, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_INS  ,
-   _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PAUS, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_HOME ,
-   _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, KC_END
-),
-/* LAYER = LAYER_LOWER
-  .-----------------------------------------------------------------------------------------------------------.
-  | ______ | $      | {      | [      | (      | %      | #      | )      | ]      | }      | @      | PG UP  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ^      | *      | +      | -      | /      | \      | _      | '      | "      | `      | PG DN  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | |      | &      | !      | ~      | ;      | :      | =      | <      | >      | ?      | HOME   |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | ______ | ______ | ______ | ______ | ______ | LOWER  | ______ | ______ | ______ | END    |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_LOWER] = LAYOUT_planck_grid(
-   _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT  , KC_PGUP ,
-   _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , KC_PGDN ,
-   _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT  , KC_GT  , KC_QUES, KC_HOME ,
-   _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, KC_END
-),
-/* LAYER = LAYER_FUNCTION
-  .-----------------------------------------------------------------------------------------------------------.
-  | XXXXXX | F13    | F14    | F15    | F16    | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | F17    | F18    | F19    | F20    | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | F21    | F22    | F23    | F24    | CAP LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | VOL UP | MUTE   |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | FN     | ______ | ______ | PLAY   | PLAY   | ______ | ______ | PREV   | VOL DN | NEXT   |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_FUNCTION] = LAYOUT_planck_grid(
-   XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE ,
-   _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-),
-/* LAYER = LAYER_MOUSE
-  .-----------------------------------------------------------------------------------------------------------.
-  | ESC    | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL  | MS U   | MS UR  | MS WHL | MS WHR |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | MS BT5 | MS BT4 | MS BT3 | MS BT2 | XXXXXX | XXXXXX | MS L   | XXXXXX | MS R   | XXXXXX | MS WHU |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS DL  | MS D   | MS DR  | MS U   | MS WHD |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | ______ | ______ | ______ | MS BT1 | MS BT1 | ______ | ______ | MS L   | MS D   | MS R   |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_MOUSE] = LAYOUT_planck_grid(
-   KC_ESC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, KC_WH_L, KC_WH_R ,
-   XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, KC_WH_U ,
-   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, KC_MS_U, KC_WH_D ,
-   _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-),
-/* LAYER = LAYER_ADJUST
-  .-----------------------------------------------------------------------------------------------------------.
-  | XXXXXX | HELP 1 | HELP 2 | HELP 3 | HELP 4 | HELP 5 | HELP 6 | HELP 7 | HELP 8 | HELP 9 | MUSIC  | AUDIO  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | BRTOG  | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | QK_BOOT  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | VOICE+ | XXXXXX |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER  | XXXXXX | XXXXXX | LOWER  | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_ADJUST] = LAYOUT_planck_grid(
-   XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, MU_TOG , AU_TOG  ,
-   XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, QK_BOOT, XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX ,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP
-),
-
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_my_startup[][2] = SONG(ODE_TO_JOY);
-float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
-
-float tone_audio_on[][2]   = SONG(CLOSE_ENCOUNTERS_5_NOTE);
-float tone_music_on[][2]   = SONG(DOE_A_DEER);
-float tone_caps_on[][2]    = SONG(CAPS_LOCK_ON_SOUND);
-float tone_caps_off[][2]   = SONG(CAPS_LOCK_OFF_SOUND);
-float tone_numlk_on[][2]   = SONG(NUM_LOCK_ON_SOUND);
-float tone_numlk_off[][2]  = SONG(NUM_LOCK_OFF_SOUND);
-float tone_scroll_on[][2]  = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-#endif /* AUDIO_ENABLE */
-
-void persistent_default_layer_set(uint16_t default_layer)
-{
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-
-    // MACRODOWN only works in this function
-    switch(id)
-    {
-
-        case MACRO_HELP_1:
-            if (record->event.pressed)
-            {
-				uprintf("1");
-            }
-            break;
-
-        case MACRO_HELP_2:
-            if (record->event.pressed)
-            {
-				uprintf("2");
-            }
-            break;
-
-        case MACRO_HELP_3:
-            if (record->event.pressed)
-            {
-				uprintf("3");
-            }
-            break;
-
-        case MACRO_HELP_4:
-            if (record->event.pressed)
-            {
-				uprintf("4");
-            }
-            break;
-
-        case MACRO_HELP_5:
-            if (record->event.pressed)
-            {
-				uprintf("5");
-            }
-            break;
-
-        case MACRO_HELP_6:
-            if (record->event.pressed)
-            {
-				uprintf("6");
-            }
-            break;
-
-        case MACRO_HELP_7:
-            if (record->event.pressed)
-            {
-				uprintf("7");
-            }
-            break;
-
-        case MACRO_HELP_8:
-            if (record->event.pressed)
-            {
-				uprintf("8");
-            }
-            break;
-
-        case MACRO_HELP_9:
-            if (record->event.pressed)
-            {
-				uprintf("9");
-            }
-            break;
-
-        case MACRO_BREATH_TOGGLE:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_toggle();
-              #endif
-            }
-            break;
-
-        case MACRO_BREATH_SPEED_INC:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_period_inc();
-              #endif
-            }
-            break;
-
-        case MACRO_BREATH_SPEED_DEC:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_period_dec();
-              #endif
-            }
-            break;
-
-        case MACRO_BREATH_DEFAULT:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_period_default();
-              #endif
-            }
-            break;
-
-        case MACRO_QWERTY:
-            if (record->event.pressed)
-            {
-                persistent_default_layer_set(1UL<<LAYER_QWERTY);
-            }
-            break;
-
-        case MACRO_UPPER:
-            if (record->event.pressed)
-            {
-                layer_on(LAYER_UPPER);
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(2);
-                  breathing_pulse();
-                #endif
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            else
-            {
-                layer_off(LAYER_UPPER);
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            break;
-
-        case MACRO_LOWER:
-            if (record->event.pressed)
-            {
-                layer_on(LAYER_LOWER);
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(2);
-                  breathing_pulse();
-                #endif
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            else
-            {
-                layer_off(LAYER_LOWER);
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            break;
-
-        case MACRO_FUNCTION:
-            if (record->event.pressed)
-            {
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(3);
-                  breathing_enable();
-                #endif
-                layer_on(LAYER_FUNCTION);
-            }
-            else
-            {
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(1);
-                  breathing_self_disable();
-                #endif
-                layer_off(LAYER_FUNCTION);
-            }
-            break;
-
-
-#ifdef BACKLIGHT_ENABLE
-		case MACRO_BACKLIGHT:
-			if (record->event.pressed)
-			{
-				backlight_step();
-			}
-#endif
-
-#ifdef MOUSEKEY_ENABLE
-
-        case MACRO_MOUSE:
-            if (record->event.pressed)
-            {
-                layer_invert(LAYER_MOUSE);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_UL:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_UP);
-              mousekey_on(KC_MS_LEFT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_UP);
-              mousekey_off(KC_MS_LEFT);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_UR:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_UP);
-              mousekey_on(KC_MS_RIGHT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_UP);
-              mousekey_off(KC_MS_RIGHT);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_DL:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_DOWN);
-              mousekey_on(KC_MS_LEFT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_DOWN);
-              mousekey_off(KC_MS_LEFT);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_DR:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_DOWN);
-              mousekey_on(KC_MS_RIGHT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_DOWN);
-              mousekey_off(KC_MS_RIGHT);
-            }
-            break;
-
-#endif /* MOUSEKEY_ENABLE */
-
-#ifdef AUDIO_ENABLE
-
-        case MACRO_TIMBRE_1:
-            if (record->event.pressed) set_timbre(TIMBRE_12);
-            break;
-
-        case MACRO_TIMBRE_2:
-            if (record->event.pressed) set_timbre(TIMBRE_25);
-            break;
-
-        case MACRO_TIMBRE_3:
-            if (record->event.pressed) set_timbre(TIMBRE_50);
-            break;
-
-        case MACRO_TIMBRE_4:
-            if (record->event.pressed) set_timbre(TIMBRE_75);
-            break;
-
-        case MACRO_TEMPO_U:
-            if (record->event.pressed) increase_tempo(10);
-            break;
-
-        case MACRO_TEMPO_D:
-            if (record->event.pressed) decrease_tempo(10);
-            break;
-
-        case MACRO_TONE_DEFAULT:
-            if (record->event.pressed)
-            {
-                set_timbre(TIMBRE_DEFAULT);
-                set_tempo(TEMPO_DEFAULT);
-            }
-            break;
-
-#endif /* AUDIO_ENABLE */
-
-        default:
-            break;
-
-    }
-    return MACRO_NONE;
-};
-
-
-#ifdef AUDIO_ENABLE
-
-void matrix_init_user(void)
-{
-    set_voice(default_voice);
-    startup_user();
-    println("Matrix Init");
-}
-
-void led_set_user(uint8_t usb_led)
-{
-    static uint8_t old_usb_led = 0;
-
-    _delay_ms(10); // gets rid of tick
-
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-    {
-            // If CAPS LK LED is turning on...
-            PLAY_SONG(tone_caps_on);
-    }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-    {
-            // If CAPS LK LED is turning off...
-            PLAY_SONG(tone_caps_off);
-    }
-    else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
-    {
-            // If NUM LK LED is turning on...
-            PLAY_SONG(tone_numlk_on);
-    }
-    else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
-    {
-            // If NUM LED is turning off...
-            PLAY_SONG(tone_numlk_off);
-    }
-    else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-    {
-            // If SCROLL LK LED is turning on...
-            PLAY_SONG(tone_scroll_on);
-    }
-    else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-    {
-            // If SCROLL LED is turning off...
-            PLAY_SONG(tone_scroll_off);
-    }
-    old_usb_led = usb_led;
-}
-
-
-void startup_user()
-{
-    _delay_ms(10); // gets rid of tick
-    PLAY_SONG(tone_my_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_my_goodbye);
-    _delay_ms(2000);
-    stop_all_notes();
-}
-
-void audio_on_user(void)
-{
-	PLAY_SONG(tone_audio_on);
-}
-
-void music_on_user(void)
-{
-	PLAY_SONG(tone_music_on);
-}
-
-void music_scale_user(void)
-{
-	PLAY_SONG(music_scale);
-}
-
-#endif /* AUDIO_ENABLE */
diff --git a/keyboards/planck/keymaps/pvc/rules.mk b/keyboards/planck/keymaps/pvc/rules.mk
deleted file mode 100644
index bbe6711f06..0000000000
--- a/keyboards/planck/keymaps/pvc/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = yes # Console for debug(+400)
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE      = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = yes # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/rai-suta/config.h b/keyboards/planck/keymaps/rai-suta/config.h
deleted file mode 100644
index b36aa3db92..0000000000
--- a/keyboards/planck/keymaps/rai-suta/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM    ( 200 )
-
-#endif
diff --git a/keyboards/planck/keymaps/rai-suta/keymap.c b/keyboards/planck/keymaps/rai-suta/keymap.c
deleted file mode 100644
index 3765f0307b..0000000000
--- a/keyboards/planck/keymaps/rai-suta/keymap.c
+++ /dev/null
@@ -1,105 +0,0 @@
-// This keymap assumes that the keyboard is recognized as JIS keyboard from the OS.
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#include "sendstring_japanese.h"
-
-// JIS keyboard
-#define JK_CIRC KC_EQL      // ^
-#define JK_AT   KC_LBRC     // @
-#define JK_LBRC KC_RBRC     // [
-#define JK_CLN  KC_QUOT     // :
-#define JK_RBRC KC_BSLS     // ]
-#define JK_BSLS JP_BSLS     // Backslash(\)
-#define JK_DQT  S(KC_2)     // "
-#define JK_AMPR S(KC_6)     // &
-#define JK_SQT  S(KC_7)     // '
-#define JK_LPRN S(KC_8)     // (
-#define JK_RPRN S(KC_9)     // )
-#define JK_S0   S(KC_0)     // Tilde(~) at IBM 5576-A01 spec
-#define JK_EQ   S(KC_MINS)  // =
-#define JK_TLD  S(JK_CIRC)  // ~
-#define JK_PIPE S(JP_YEN)  // |
-#define JK_GRV  S(JK_AT)    // `
-#define JK_LCBR S(JK_LBRC)  // {
-#define JK_PLUS S(KC_SCLN)  // +
-#define JK_ASTR S(JK_CLN)   // *
-#define JK_RCBR S(JK_RBRC)  // }
-#define JK_QUES S(KC_SLSH)  // ?
-#define JK_UNDS S(JK_BSLS)  // _
-
-enum user_macro {
-  UM_MHEN,
-  UM_HENK,
-  UM_DEBUG,
-};
-#define M_MHEN  MACROTAP(UM_MHEN)
-#define M_HENK  MACROTAP(UM_HENK)
-#define M_DEBUG M(UM_DEBUG)
-
-enum keymap_layer {
-  KL_QWERTY,
-  KL_LOWER,
-  KL_RAISE,
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [KL_QWERTY] = LAYOUT_planck_grid(
-     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
-    KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  JK_CLN,
-    KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-    JP_ZKHK, JP_KANA, KC_LGUI, KC_LALT,  M_MHEN,  KC_SPC,  KC_SPC,  M_HENK, KC_RALT, KC_RGUI,  KC_APP,  KC_ENT
-  ),
-
-  [KL_LOWER] = LAYOUT_planck_grid(
-    KC_GESC, KC_EXLM,  JK_DQT, KC_HASH,  KC_DLR, KC_PERC, JK_AMPR,  JK_SQT, JK_LPRN, JK_RPRN,   JK_S0,  KC_DEL,
-    _______, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT,  KC_DEL, KC_BSPC,   JK_EQ,  JK_TLD,  JK_GRV, JK_LCBR, JK_PIPE,
-    _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_Y), XXXXXXX,  KC_ENT, KC_LABK, KC_RABK, JK_RCBR, JK_UNDS,
-      QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [KL_RAISE] = LAYOUT_planck_grid(
-    KC_CAPS,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,
-    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_MINS, JK_CIRC,   JK_AT, JK_LBRC, JP_YEN,
-    _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10, KC_F11,  KC_F12, XXXXXXX, KC_COMM,  KC_DOT, JK_RBRC, JK_BSLS,
-    M_DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  dprintf( "record.\n"
-           "  event.pressed = %u\n"
-           "  tap.count = %u\n"
-           "  tap.interrupted = %u\n"
-              , record->event.pressed
-              , record->tap.count
-              , record->tap.interrupted );
-  dprintf( "id = %u\n", id );
-  dprintf( "opt = %u\n", opt );
-
-  switch(id) {
-
-    case UM_MHEN: {
-      return MACRO_TAP_HOLD_LAYER( record, MACRO(TYPE(JP_MHEN), END), KL_LOWER );
-    } break;
-
-    case UM_HENK: {
-      return MACRO_TAP_HOLD_LAYER( record, MACRO(TYPE(JP_HENK), END), KL_RAISE );
-    } break;
-
-    case UM_DEBUG: {
-      if (record->event.pressed) {
-        debug_enable = !debug_enable;
-        if (debug_enable) {
-          dprint("\nDEBUG: enabled.\n");
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-      }
-    } break;
-
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/rai-suta/readme.md b/keyboards/planck/keymaps/rai-suta/readme.md
deleted file mode 100644
index cb73c172aa..0000000000
--- a/keyboards/planck/keymaps/rai-suta/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rai-suta's Planck Layout
-
-This keymap assumes that the keyboard is recognized as JIS keyboard from the OS.
diff --git a/keyboards/planck/keymaps/rai-suta/rules.mk b/keyboards/planck/keymaps/rai-suta/rules.mk
deleted file mode 100644
index 9341788b16..0000000000
--- a/keyboards/planck/keymaps/rai-suta/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = 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 = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/tak3over/keymap.c b/keyboards/planck/keymaps/tak3over/keymap.c
deleted file mode 100644
index 7e8b953dd2..0000000000
--- a/keyboards/planck/keymaps/tak3over/keymap.c
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-//Dropped the Dvorak layer and added two my layer buttons.  Both Raise and lower can be accessed from either side now.
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QW 0
-#define _CM 1
-#define _LW 2
-#define _RS 3
-#define _FN 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Func  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QW] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LCTL, KC_LALT, KC_LGUI, MO(_FN), MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Func  |Lower |    Space    |Raise | Left | Down |  Up  |Right
- * `-----------------------------------------------------------------------------------'
- */
-[_CM] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LCTL, KC_LALT, KC_LGUI, MO(_FN), MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Func  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_RS] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_UNDS, KC_PLUS, 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
-),
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  | Reset| Ins  | Home | PGUP |Colemk| Left |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Brite| Del  | End  | PGDN |Qwerty| Del  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Func  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_LW] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TRNS, QK_BOOT, KC_INS,  KC_HOME, KC_PGUP, DF(_CM), KC_LEFT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, M(0),    KC_DEL,  KC_END,  KC_PGDN, DF(_QW), KC_DEL,  KC_UNDS, KC_PLUS, 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
-),
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  | GUI  |   X  |   C  |   V  |  Z   | Left | Down |  Up  |Right | Del  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Shift | Ctrl |   X  |   C  |   V  |  Z   | Next | Mute | Vol- | Vol+ | Play |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Func  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_FN] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TRNS, KC_RGUI, KC_X,    KC_C,    KC_V,    KC_Z,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  KC_BSLS,
-  KC_TRNS, KC_RCTL, KC_X,    KC_C,    KC_V,    KC_Z,    KC_MNXT, 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
-)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/tak3over/rules.mk b/keyboards/planck/keymaps/tak3over/rules.mk
deleted file mode 100644
index 10de3bfc03..0000000000
--- a/keyboards/planck/keymaps/tak3over/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/unicode/config.h b/keyboards/planck/keymaps/unicode/config.h
deleted file mode 100644
index 2bebf48a1c..0000000000
--- a/keyboards/planck/keymaps/unicode/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/unicode/keymap.c b/keyboards/planck/keymaps/unicode/keymap.c
deleted file mode 100644
index 24e7a7d901..0000000000
--- a/keyboards/planck/keymaps/unicode/keymap.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-   Copyright
-   2015 Jack Humbert <jack.humb@gmail.com>
-   2016 Francois Marlier <fmarlier@gmail.com>
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   For more info on how this works per OS, see here
-   https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input
-*/
-
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-// Macro name shortcuts
-#define QWERTY M(_QWERTY)
-#define COLEMAK M(_COLEMAK)
-#define DVORAK M(_DVORAK)
-#define LOWER M(_LOWER)
-#define RAISE M(_RAISE)
-#define M_BL 5
-#define PLOVER M(12)
-#define EXT_PLV M(13)
-#define TOG_OUT M(14)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  UC_q,    UC_w,    UC_f,    UC_p,    UC_g,    UC_j,    UC_l,    UC_u,    UC_y,    UC_SCLN, UC_BSPC,
-  KC_ESC,  UC_a,    UC_r,    UC_s,    UC_t,    UC_d,    UC_h,    UC_n,    UC_e,    UC_i,    UC_o,    UC_QUOT,
-  KC_LSFT, UC_z,    UC_x,    UC_c,    UC_v,    UC_b,    UC_k,    UC_m,    UC_COMM, UC_DOT,  UC_SLSH, KC_ENT,
-  KC_TRNS, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, 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 |      |      |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  TOG_OUT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-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);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case _QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          break;
-        case _COLEMAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
-          }
-          break;
-        case _DVORAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dvorak);
-            #endif
-            persistent_default_layer_set(1UL<<_DVORAK);
-          }
-          break;
-        case _LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          break;
-        case _RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          break;
-        case M_BL:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-        case 12:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              stop_all_notes();
-              PLAY_SONG(tone_plover);
-            #endif
-            layer_off(_RAISE);
-            layer_off(_LOWER);
-            layer_off(_ADJUST);
-            layer_on(_PLOVER);
-            if (!eeconfig_is_enabled()) {
-                eeconfig_init();
-            }
-            keymap_config.raw = eeconfig_read_keymap();
-            keymap_config.nkro = 1;
-            eeconfig_update_keymap(keymap_config.raw);
-          }
-        break;
-        case 13:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_plover_gb);
-            #endif
-            layer_off(_PLOVER);
-          }
-        break;
-        case 14:
-          if (record->event.pressed) {
-            return MACRO( D(E), D(R), D(F), D(V), D(O), D(L), U(E), U(R), U(F), U(V), U(O), U(L), END );
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-}
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
-
diff --git a/keyboards/planck/keymaps/unicode/rules.mk b/keyboards/planck/keymaps/unicode/rules.mk
deleted file mode 100644
index 70866cb8bb..0000000000
--- a/keyboards/planck/keymaps/unicode/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
-#
-UNICODE_ENABLE   = yes  # Unicode
-
diff --git a/keyboards/planck/keymaps/yale/keymap.c b/keyboards/planck/keymaps/yale/keymap.c
deleted file mode 100644
index 0baa24bdb7..0000000000
--- a/keyboards/planck/keymaps/yale/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _NUM 5
-#define _FUNC 6
-#define _NAV 7
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* _QWERTY
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Ctrl/Tab| A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | GUI  |  Num |    Space    |  FN  |  GUI |  Alt | Ctrl | Enter|
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_ESC,        KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_BSPC,
-    CTL_T(KC_TAB), KC_A,       KC_S,       KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_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(_NUM),   KC_SPC,     KC_SPC,     MO(_FUNC),  KC_RGUI,    KC_RALT,    KC_RCTL,    KC_ENT
-),
-
-/* _NUM
- * ,-----------------------------------------------------------------------------------.
- * |  ___ |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | ____ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   `  |  [   |  {   |  (   |  /   |  \   |   )  |   }  |   ]  |   -  |  =   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ____ |   !  |  @   |  #   |  $   |  %   |  ^   |  &   |  *   |   _  |   +  | ____ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ___  | ___  | ___  | XXXX |    ______   | ____ | ____ | ____ |  __  | ____ |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUM] = LAYOUT_planck_grid(
-    _______,   KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       _______,
-    KC_LCTL,   KC_GRV,     KC_LBRC,    KC_LCBR,    KC_LPRN,    KC_SLSH,    KC_BSLS,    KC_RPRN,    KC_RCBR,    KC_RBRC,    KC_MINS,    KC_EQL,
-    _______,   KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,    KC_CIRC,    KC_AMPR,    KC_ASTR,    KC_UNDS,    KC_PLUS,    _______,
-    _______,   _______,    _______,    _______,    _______,    _______,    _______,    MO(_NAV),   _______,    _______,    _______,    _______
-),
-
-/* _FUNC
- * ,-----------------------------------------------------------------------------------.
- * | ____ |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | ____ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ____ |Shift | Ctrl |  Alt |  GUI | ____ | Left | Down |  Up  |Right | Del  | ____ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ____ |Light | ____ | Vol- | Prev | Play | Mute | Next | Vol+ | ____ | ____ | ____ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ | ____ |    _____    | XXXX | ____ | ____ | ____ | ____ |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_planck_grid(
-    _______,   KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       _______,
-    _______,   KC_LSFT,    KC_LCTL,    KC_LALT,    KC_LGUI,    _______,    KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_DEL,     _______,
-    _______,   M(0),       _______,    KC_VOLD,    KC_MPRV,    KC_MPLY,    KC_MUTE,    KC_MNXT,    KC_VOLU,    _______,    _______,    _______,
-    _______,   _______,    _______,    _______,    MO(_NAV),   _______,    _______,    _______,    _______,    _______,    _______,    _______
-),
-
-[_NAV] = LAYOUT_planck_grid(
-    KC_MS_ACCEL2,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    XXXXXXX,        KC_WH_D,        KC_WH_U,    XXXXXXX,        XXXXXXX,    XXXXXXX,
-    KC_MS_ACCEL1,  KC_MS_BTN4, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX,    KC_MS_LEFT,     KC_MS_DOWN,     KC_MS_UP,   KC_MS_RIGHT,    XXXXXXX,    XXXXXXX,
-    KC_MS_ACCEL0,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    XXXXXXX,        XXXXXXX,        XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,
-    XXXXXXX,       XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,        XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX
-),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    // MACRODOWN only works in this function
-            switch(id) {
-                case 0:
-                    if (record->event.pressed) {
-                        register_code(KC_RSFT);
-                        #ifdef BACKLIGHT_ENABLE
-                            backlight_step();
-                        #endif
-                    } else {
-                        unregister_code(KC_RSFT);
-                    }
-                break;
-            }
-        return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/yale/readme.md b/keyboards/planck/keymaps/yale/readme.md
deleted file mode 100644
index 5b57450f52..0000000000
--- a/keyboards/planck/keymaps/yale/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-![pic](https://i.imgur.com/OmARVcw.jpg)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/yale/rules.mk b/keyboards/planck/keymaps/yale/rules.mk
deleted file mode 100644
index d86b02fd1c..0000000000
--- a/keyboards/planck/keymaps/yale/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/yang/config.h b/keyboards/planck/keymaps/yang/config.h
deleted file mode 100644
index 4ed19d76f9..0000000000
--- a/keyboards/planck/keymaps/yang/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D1
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 28     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#endif
diff --git a/keyboards/planck/keymaps/yang/keymap.c b/keyboards/planck/keymaps/yang/keymap.c
deleted file mode 100644
index 0a77b2be2f..0000000000
--- a/keyboards/planck/keymaps/yang/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QW 0
-#define _CM 1
-#define _DV 2
-#define _LW 3
-#define _RS 4
-#define _RGB 5
-
-#define RGB_SPC LT(_RGB, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QW] = LAYOUT_planck_grid( /* Qwerty */
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), RGB_SPC, RGB_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_CM] = LAYOUT_planck_grid( /* Colemak */
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), RGB_SPC, RGB_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_DV] = LAYOUT_planck_grid( /* Dvorak */
-  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 ,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), RGB_SPC, RGB_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_RS] = LAYOUT_planck_grid( /* RAISE */
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[_LW] = LAYOUT_planck_grid( /* LOWER */
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_CM), DF(_DV), QK_BOOT, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[_RGB] = LAYOUT_planck_grid( /* RGBLIGHT */
-  KC_TRNS,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_DEL,
-  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_TRNS,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_END,   KC_TRNS,
-  KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
-)
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/planck/keymaps/yang/readme.md b/keyboards/planck/keymaps/yang/readme.md
deleted file mode 100644
index e42d9f912c..0000000000
--- a/keyboards/planck/keymaps/yang/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-![rgb](https://i.imgur.com/97E6aSo.jpg)
-![wiring](https://i.imgur.com/yL2ybk6.jpg)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/yang/rules.mk b/keyboards/planck/keymaps/yang/rules.mk
deleted file mode 100644
index 05f0fb04aa..0000000000
--- a/keyboards/planck/keymaps/yang/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-AUDIO_ENABLE = no
-
diff --git a/keyboards/planck/keymaps/zrichard/config.h b/keyboards/planck/keymaps/zrichard/config.h
deleted file mode 100755
index eaedf65575..0000000000
--- a/keyboards/planck/keymaps/zrichard/config.h
+++ /dev/null
@@ -1,72 +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
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-/* Planck PCB default pin-out */
-#ifndef KEYBOARD_planck_light
-#define MATRIX_ROW_PINS { D0, D5, B5, B6 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#endif
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-#ifndef NO_DEBUG
-#  define NO_DEBUG
-#endif
-
-/* disable print */
-// #ifndef NO_PRINT
-// #  define NO_PRINT
-// #endif
-
-/* Only print user print statements */
-#define USER_PRINT
-
-#ifndef KEYBOARD_planck_light
-#define BACKLIGHT_BREATHING
-#endif
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/planck/keymaps/zrichard/keymap.c b/keyboards/planck/keymaps/zrichard/keymap.c
deleted file mode 100755
index 6494231a2a..0000000000
--- a/keyboards/planck/keymaps/zrichard/keymap.c
+++ /dev/null
@@ -1,634 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mousekey.h"
-
-#ifdef AUDIO_ENABLE
-    #include "audio.h"
-    #include "song_list.h"
-#endif
-
-enum keyboard_layers {
-  LAYER_QWERTY = 0,
-  LAYER_UPPER,
-  LAYER_LOWER,
-  LAYER_FUNCTION,
-  LAYER_MOUSE,
-  LAYER_ADJUST,
-};
-enum keyboard_macros {
-  MACRO_QWERTY = 0,
-  MACRO_UPPER,
-  MACRO_LOWER,
-  MACRO_FUNCTION,
-  MACRO_MOUSE,
-  MACRO_TIMBRE_1,
-  MACRO_TIMBRE_2,
-  MACRO_TIMBRE_3,
-  MACRO_TIMBRE_4,
-  MACRO_TEMPO_U,
-  MACRO_TEMPO_D,
-  MACRO_TONE_DEFAULT,
-  MACRO_MUSIC_TOGGLE,
-  MACRO_AUDIO_TOGGLE,
-  MACRO_INC_VOICE,
-  MACRO_DEC_VOICE,
-  MACRO_BACKLIGHT,
-  MACRO_BREATH_TOGGLE,
-  MACRO_BREATH_SPEED_INC,
-  MACRO_BREATH_SPEED_DEC,
-  MACRO_BREATH_DEFAULT,
-  MACRO_MOUSE_MOVE_UL,
-  MACRO_MOUSE_MOVE_UR,
-  MACRO_MOUSE_MOVE_DL,
-  MACRO_MOUSE_MOVE_DR,
-  MACRO_HELP_1,
-  MACRO_HELP_2,
-  MACRO_HELP_3,
-  MACRO_HELP_4,
-  MACRO_HELP_5,
-  MACRO_HELP_6,
-  MACRO_HELP_7,
-  MACRO_HELP_8,
-  MACRO_HELP_9,
-  MACRO_MINE,
-  //MACRO_SHENT,
-};
-
-enum {
-  TD_SPENT = 0
-};
-
-#define M_QWRTY             M(MACRO_QWERTY)
-#define M_UPPER             M(MACRO_UPPER)
-#define M_LOWER             M(MACRO_LOWER)
-#define M_FUNCT             M(MACRO_FUNCTION)
-#define M_MOUSE             M(MACRO_MOUSE)
-#define TIMBR_1             M(MACRO_TIMBRE_1)
-#define TIMBR_2             M(MACRO_TIMBRE_2)
-#define TIMBR_3             M(MACRO_TIMBRE_3)
-#define TIMBR_4             M(MACRO_TIMBRE_4)
-#define TMPO_UP             M(MACRO_TEMPO_U)
-#define TMPO_DN             M(MACRO_TEMPO_D)
-#define TMPO_DF             M(MACRO_TONE_DEFAULT)
-#define M_BACKL             M(MACRO_BACKLIGHT)
-#define M_BRTOG             M(MACRO_BREATH_TOGGLE)
-#define M_BSPDU             M(MACRO_BREATH_SPEED_INC)
-#define M_BSPDD             M(MACRO_BREATH_SPEED_DEC)
-#define M_BDFLT             M(MACRO_BREATH_DEFAULT)
-#define M_MS_UL             M(MACRO_MOUSE_MOVE_UL)
-#define M_MS_UR             M(MACRO_MOUSE_MOVE_UR)
-#define M_MS_DL             M(MACRO_MOUSE_MOVE_DL)
-#define M_MS_DR             M(MACRO_MOUSE_MOVE_DR)
-#define M_HELP1             M(MACRO_HELP_1)
-#define M_HELP2             M(MACRO_HELP_2)
-#define M_HELP3             M(MACRO_HELP_3)
-#define M_HELP4             M(MACRO_HELP_4)
-#define M_HELP5             M(MACRO_HELP_5)
-#define M_HELP6             M(MACRO_HELP_6)
-#define M_HELP7             M(MACRO_HELP_7)
-#define M_HELP8             M(MACRO_HELP_8)
-#define M_HELP9             M(MACRO_HELP_9)
-#define MY_MACRO 	    M(MACRO_MINE)
-//#define M_SHENT 			M(MACRO_SHENT)
-
-
-#define VC_UP               M(MACRO_INC_VOICE)
-#define VC_DOWN             M(MACRO_DEC_VOICE)
-
-
-#define SC_UNDO             LCTL(KC_Z)
-#define SC_REDO             LCTL(KC_Y)
-#define SC_CUT              LCTL(KC_X)
-#define SC_COPY             LCTL(KC_C)
-#define SC_PSTE             LCTL(KC_V)
-#define SC_SELA             LCTL(KC_A)
-#define SC_SAVE             LCTL(KC_S)
-#define SC_OPEN             LCTL(KC_O)
-#define SC_ACLS             LALT(KC_F4)
-#define SC_CCLS             LCTL(KC_F4)
-
-#define TG_NKRO             MAGIC_TOGGLE_NKRO
-#define OS_SHFT             OSM(MOD_RSFT)
-
-#define ________________    _______, _______
-#define XXXXXXXXXXXXXXXX    XXXXXXX, XXXXXXX
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* LAYER = LAYER_QWERTY
-  .-----------------------------------------------------------------------------------------------------------.
-  | ESC    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BACKSP |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | TAB    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | UP     | SH/ENT |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | LCTRL  | LWIN   | FN     | LALT   | LOWER  | SPACE  | SPACE  | UPPER  |  MENU  | LEFT   | DOWN   | RIGHT  |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_QWERTY] = LAYOUT_planck_grid(
-   KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC ,
-   KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT ,
-   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SFTENT /*M_SHENT*/ ,
-   KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_LOWER, KC_SPC , KC_SPC , M_UPPER, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT
-),
-/* LAYER = LAYER_UPPER
-  .-----------------------------------------------------------------------------------------------------------.
-  | PRINT  | F1     | F2     | F3     | F4     | NUM LK | KP /   | KP 7   | KP 8   | KP 9   | KP -   | DEL    |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | PAUSE  | F5     | F6     | F7     | F8     | SCR LK | KP *   | KP 4   | KP 5   | KP 6   | KP +   | HOME   |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | F9     | F10    | F11    | F12    | PAUSE  | KP 0   | KP 1   | KP 2   | KP 3   | KP ENT | END    |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | ______ | ______ | LOWER  | KP 0   | KP 0   | ______ | RALT   | KP 0   | KP ENT | RTCTRL |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_UPPER] = LAYOUT_planck_grid(
-   KC_PSCR, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, KC_DEL  ,
-   KC_PAUS, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_SLCK, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_HOME ,
-   _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PAUS, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_END  ,
-   _______, _______, _______, _______, M_LOWER, KC_KP_0, KC_KP_0, _______, KC_KP_0, KC_PDOT, KC_PENT, KC_RCTL
-),
-/* LAYER = LAYER_LOWER
-  .-----------------------------------------------------------------------------------------------------------.
-  | ______ | $      | {      | [      | (      | %      | #      | )      | ]      | }      | @      | PG UP  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ^      | *      | +      | -      | /      | \      | _      | '      | "      | `      | PG DN  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | |      | &      | !      | ~      | ;      | :      | =      | <      | >      | ?      | HOME   |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | ______ | ______ | ______ | ______ | ______ | UPPER  | ______ | ______ | ______ | END    |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_LOWER] = LAYOUT_planck_grid(
-   _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT  , KC_PGUP ,
-   _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , KC_PGDN ,
-   _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT  , KC_GT  , KC_QUES, KC_HOME ,
-   _______, _______, _______, _______, _______, _______, _______, M_UPPER, _______, _______, _______, KC_END
-),
-/* LAYER = LAYER_FUNCTION
-  .-----------------------------------------------------------------------------------------------------------.
-  | XXXXXX | F13    | F14    | F15    | F16    | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | F17    | F18    | F19    | F20    | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | F21    | F22    | F23    | F24    | CAP LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | VOL UP | MUTE   |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | FN     | ______ | ______ | PLAY   | PLAY   | ______ | ______ | PREV   | VOL DN | NEXT   |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_FUNCTION] = LAYOUT_planck_grid(
-   XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE ,
-   _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-),
-/* LAYER = LAYER_MOUSE
-  .-----------------------------------------------------------------------------------------------------------.
-  | ESC    | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL  | MS U   | MS UR  | MS WHL | MS WHR |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | MS BT5 | MS BT4 | MS BT3 | MS BT2 | XXXXXX | XXXXXX | MS L   | XXXXXX | MS R   | XXXXXX | MS WHU |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS DL  | MS D   | MS DR  | MS U   | MS WHD |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | ______ | ______ | ______ | ______ | ______ | MS BT1 | MS BT1 | ______ | ______ | MS L   | MS D   | MS R   |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_MOUSE] = LAYOUT_planck_grid(
-   KC_ESC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, KC_WH_L, KC_WH_R ,
-   XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, KC_WH_U ,
-   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, KC_MS_U, KC_WH_D ,
-   _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-),
-/* LAYER = LAYER_ADJUST
-  .-----------------------------------------------------------------------------------------------------------.
-  | XXXXXX | HELP 1 | HELP 2 | HELP 3 | HELP 4 | HELP 5 | HELP 6 | HELP 7 | HELP 8 | HELP 9 | MUSIC  | AUDIO  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | BRTOG  | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | QK_BOOT  | XXXXXX | MOUSE  | XXXXXX | XXXXXX | VOICE+ | MACRO  |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | XXXXXX | XXXXXX | XXXXXX | XXXXXX | LOWER  | XXXXXX | XXXXXX | UPPER  | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
-  '-----------------------------------------------------------------------------------------------------------'
-*/
-[LAYER_ADJUST] = LAYOUT_planck_grid(
-   XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, MU_TOG , AU_TOG  ,
-   XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-   XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, QK_BOOT, XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , MY_MACRO,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP
-),
-
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_my_startup[][2] = SONG(QWERTY_SOUND);
-float tone_my_goodbye[][2] = SONG(QWERTY_SOUND);
-
-float tone_audio_on[][2]   = SONG(CLOSE_ENCOUNTERS_5_NOTE);
-float tone_music_on[][2]   = SONG(DOE_A_DEER);
-float tone_caps_on[][2]    = SONG(CAPS_LOCK_ON_SOUND);
-float tone_caps_off[][2]   = SONG(CAPS_LOCK_OFF_SOUND);
-float tone_numlk_on[][2]   = SONG(NUM_LOCK_ON_SOUND);
-float tone_numlk_off[][2]  = SONG(NUM_LOCK_OFF_SOUND);
-float tone_scroll_on[][2]  = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-#endif /* AUDIO_ENABLE */
-
-void persistant_default_layer_set(uint16_t default_layer)
-{
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-
-    // MACRODOWN only works in this function
-    switch(id)
-    {
-
-        case MACRO_HELP_1:
-            if (record->event.pressed)
-            {
-				//uprintf("1");
-            }
-            break;
-
-        case MACRO_HELP_2:
-            if (record->event.pressed)
-            {
-				//uprintf("2");
-            }
-            break;
-
-        case MACRO_HELP_3:
-            if (record->event.pressed)
-            {
-				//uprintf("3");
-            }
-            break;
-
-        case MACRO_HELP_4:
-            if (record->event.pressed)
-            {
-				//uprintf("4");
-            }
-            break;
-
-        case MACRO_HELP_5:
-            if (record->event.pressed)
-            {
-				//uprintf("5");
-            }
-            break;
-
-        case MACRO_HELP_6:
-            if (record->event.pressed)
-            {
-				//uprintf("6");
-            }
-            break;
-
-        case MACRO_HELP_7:
-            if (record->event.pressed)
-            {
-				//uprintf("7");
-            }
-            break;
-
-        case MACRO_HELP_8:
-            if (record->event.pressed)
-            {
-				//uprintf("8");
-            }
-            break;
-
-        case MACRO_HELP_9:
-            if (record->event.pressed)
-            {
-				//uprintf("9");
-            }
-            break;
-
-        case MACRO_BREATH_TOGGLE:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_toggle();
-              #endif
-            }
-            break;
-
-        case MACRO_BREATH_SPEED_INC:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_period_inc();
-              #endif
-            }
-            break;
-
-        case MACRO_BREATH_SPEED_DEC:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_period_dec();
-              #endif
-            }
-            break;
-
-        case MACRO_BREATH_DEFAULT:
-            if (record->event.pressed)
-            {
-              #ifdef BACKLIGHT_BREATHING
-                breathing_period_default();
-              #endif
-            }
-            break;
-
-        case MACRO_QWERTY:
-            if (record->event.pressed)
-            {
-                persistant_default_layer_set(1UL<<LAYER_QWERTY);
-            }
-            break;
-
-        case MACRO_UPPER:
-            if (record->event.pressed)
-            {
-                layer_on(LAYER_UPPER);
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(2);
-                  breathing_pulse();
-                #endif
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            else
-            {
-                layer_off(LAYER_UPPER);
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            break;
-
-        case MACRO_LOWER:
-            if (record->event.pressed)
-            {
-                layer_on(LAYER_LOWER);
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(2);
-                  breathing_pulse();
-                #endif
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            else
-            {
-                layer_off(LAYER_LOWER);
-                update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
-            }
-            break;
-
-        case MACRO_FUNCTION:
-            if (record->event.pressed)
-            {
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(3);
-                  breathing_enable();
-                #endif
-                layer_on(LAYER_FUNCTION);
-            }
-            else
-            {
-                #ifdef BACKLIGHT_BREATHING
-                  breathing_period_set(1);
-                  breathing_self_disable();
-                #endif
-                layer_off(LAYER_FUNCTION);
-            }
-            break;
-
-        case MACRO_MINE:
-        	if(record->event.pressed)
-        	{
-        		return MACRO( I(03), T(R), T(O), T(O), T(T), W(10), T(TAB), W(10), T(T), T(O), T(O), T(R), T(ENTER), END );
-        	}
-        	break;
-
-        /*
-        case MACRO_SHENT:
-        	if (record->event.pressed)
-        	{
-			start = timer_read();
-			return MACRO( D(LSHIFT), END );
-		}
-		else
-		{
-			if (timer_elapsed(start) > 100)
-			{
-				return MACRO( U(LSHIFT), END);
-			}
-			else
-			{
-				return MACRO( U(LSHIFT), T(ENTER), END);
-			}
-		}
-		break;
-		*/
-
-
-#ifdef BACKLIGHT_ENABLE
-		case MACRO_BACKLIGHT:
-			if (record->event.pressed)
-			{
-				backlight_step();
-			}
-#endif
-
-#ifdef MOUSEKEY_ENABLE
-
-        case MACRO_MOUSE:
-            if (record->event.pressed)
-            {
-                layer_invert(LAYER_MOUSE);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_UL:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_UP);
-              mousekey_on(KC_MS_LEFT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_UP);
-              mousekey_off(KC_MS_LEFT);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_UR:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_UP);
-              mousekey_on(KC_MS_RIGHT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_UP);
-              mousekey_off(KC_MS_RIGHT);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_DL:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_DOWN);
-              mousekey_on(KC_MS_LEFT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_DOWN);
-              mousekey_off(KC_MS_LEFT);
-            }
-            break;
-
-        case MACRO_MOUSE_MOVE_DR:
-            if (record->event.pressed)
-            {
-              mousekey_on(KC_MS_DOWN);
-              mousekey_on(KC_MS_RIGHT);
-            }
-            else
-            {
-              mousekey_off(KC_MS_DOWN);
-              mousekey_off(KC_MS_RIGHT);
-            }
-            break;
-
-#endif /* MOUSEKEY_ENABLE */
-
-#ifdef AUDIO_ENABLE
-
-        case MACRO_TIMBRE_1:
-            if (record->event.pressed) set_timbre(TIMBRE_12);
-            break;
-
-        case MACRO_TIMBRE_2:
-            if (record->event.pressed) set_timbre(TIMBRE_25);
-            break;
-
-        case MACRO_TIMBRE_3:
-            if (record->event.pressed) set_timbre(TIMBRE_50);
-            break;
-
-        case MACRO_TIMBRE_4:
-            if (record->event.pressed) set_timbre(TIMBRE_75);
-            break;
-
-        case MACRO_TEMPO_U:
-            if (record->event.pressed) increase_tempo(10);
-            break;
-
-        case MACRO_TEMPO_D:
-            if (record->event.pressed) decrease_tempo(10);
-            break;
-
-        case MACRO_TONE_DEFAULT:
-            if (record->event.pressed)
-            {
-                set_timbre(TIMBRE_DEFAULT);
-                set_tempo(TEMPO_DEFAULT);
-            }
-            break;
-
-#endif /* AUDIO_ENABLE */
-
-        default:
-            break;
-
-    }
-    return MACRO_NONE;
-};
-
-
-
-#ifdef AUDIO_ENABLE
-
-void matrix_init_user(void)
-{
-    set_voice(default_voice);
-    startup_user();
-    println("Matrix Init");
-}
-
-void led_set_user(uint8_t usb_led)
-{
-    static uint8_t old_usb_led = 0;
-
-    _delay_ms(10); // gets rid of tick
-
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-    {
-            // If CAPS LK LED is turning on...
-            PLAY_SONG(tone_caps_on);
-    }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-    {
-            // If CAPS LK LED is turning off...
-            PLAY_SONG(tone_caps_off);
-    }
-    else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
-    {
-            // If NUM LK LED is turning on...
-            PLAY_SONG(tone_numlk_on);
-    }
-    else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
-    {
-            // If NUM LED is turning off...
-            PLAY_SONG(tone_numlk_off);
-    }
-    else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-    {
-            // If SCROLL LK LED is turning on...
-            PLAY_SONG(tone_scroll_on);
-    }
-    else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-    {
-            // If SCROLL LED is turning off...
-            PLAY_SONG(tone_scroll_off);
-    }
-    old_usb_led = usb_led;
-}
-
-
-void startup_user()
-{
-    _delay_ms(10); // gets rid of tick
-    PLAY_SONG(tone_my_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_my_goodbye);
-    _delay_ms(2000);
-    stop_all_notes();
-}
-
-void audio_on_user(void)
-{
-	PLAY_SONG(tone_audio_on);
-}
-
-void music_on_user(void)
-{
-	PLAY_SONG(tone_music_on);
-}
-
-void music_scale_user(void)
-{
-	PLAY_SONG(music_scale);
-}
-
-#endif /* AUDIO_ENABLE */
diff --git a/keyboards/planck/keymaps/zrichard/rules.mk b/keyboards/planck/keymaps/zrichard/rules.mk
deleted file mode 100755
index ef2e120355..0000000000
--- a/keyboards/planck/keymaps/zrichard/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Please remove if no longer applicable
-$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD)
-$(warning Please disable some options in the Makefile to resolve)
-
-# NOTE: the maximum .hex file size on Planck is 7000h (28672 decimal)
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes 	# Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes 	# Audio control and System control(+450)
-CONSOLE_ENABLE   = no 	# Console for debug(+400)
-COMMAND_ENABLE   = no 	# Commands for debug and configuration
-NKRO_ENABLE      = yes 	# Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes 	# Enable keyboard backlight functionality
-MIDI_ENABLE      = yes 	# MIDI controls
-AUDIO_ENABLE     = no 	# Audio output on port C6
-UNICODE_ENABLE   = no 	# Unicode
-BLUETOOTH_ENABLE = no  	# Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no  	# Enable WS2812 RGB underlight. 
-TAP_DANCE_ENABLE = no	# Enable double or n tap macros
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/README.md b/keyboards/preonic/keymaps/CMD-Preonic/README.md
deleted file mode 100644
index 2b80c2b3a6..0000000000
--- a/keyboards/preonic/keymaps/CMD-Preonic/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-CMD-Preonic
-===================
-The CMD project seeks to improve productivity by optimizing usage of the left hand via clever use of the function layers. 
-
->Note: This project is currently optimized for grid layout, and has not been confirmed to work 100% on MIT layout, although it is expected to work correctly.
-
-----------
-
-Modes
--------------
-
-####  QWERTY
-
->CMD-Qwerty is very similar to the default Preonic with a few key differences:
-
- - Dual-role Raise/Enter Key at Caps Lock position. -Don't need to take your hand off the mouse to submit URLs
- - Space_Function under left space (Grid layout) -Don't need to take your thumb off of the spacebar to use lower.
- - Dedicated arrow keys replaced with ( - , = , [ , and ] ) - big improvement for programmers who are used to fn layer.
-
-----------
-
-#### Game
-
-> Disables extra features to facilitate easier usage of the Preonic while gaming. this mode is toggled in the adjust layer.
-
- - Dual Role Function key becomes Caps Lock.
- - Space_Function disabled and replaced with normal spacebar.
- - Windows Key disabled.
-
-----------
-
-#### Numpad
-
-> Enables left-hand numpad
-
- - Left-side numpad
- - Can be toggled on in Adjust layer (under . key)
-
-----------
-
-####  Arrow - (Lower)
-
-> Makes arrow keys easily accessible to Left Hand, and much more.
-
- - Arrow keys at WASD, Backspace at Q, Delete at E.
- - Media Keys near arrow cluster, mute at A.
- - Web Nav keys.
- - Mouse cluster at YGHJ.
- - Numpad in right side of board.
- - Can be toggled on in Adjust layer (Under , key)
-
-----------
-
-####  Function- (Raise)
-
-> Basic Functions. Open Keys for customization.
-
- - Turns WASD into Navigation cluster (Home, End, Page up and Page Down)
- - Pok3r style right hand arrow cluster for accessibility (familiar for many users.)
- - Doubles as shift key for top row numbers.
- - Print Screen, Insert, etc.
-
-----------
-
-####  Adjust- (Raise + Lower)
-
-> Switch Modes
-
- - Default modes moved to the left and new layer toggle modes located to the right.
- - Sleep and Wake keys added.
- - Reset button moved under Spacebar(s).
-
-Notes:
--------------
-
-Please feel free to reach out to Commandlinedesign@gmail.com with suggestions.
-Special Thanks to Jack for QMK firmware and the Preonic!
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/config.h b/keyboards/preonic/keymaps/CMD-Preonic/config.h
deleted file mode 100644
index 2bebf48a1c..0000000000
--- a/keyboards/preonic/keymaps/CMD-Preonic/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
deleted file mode 100644
index b20568506c..0000000000
--- a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
+++ /dev/null
@@ -1,319 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _GAME 3
-#define _ARROW 12
-#define _NUMPAD 13
-#define _LOWER 14
-#define _RAISE 15
-#define _ADJUST 16
-
-// Macro name shortcuts
-#define QWERTY M(_QWERTY)
-#define COLEMAK M(_COLEMAK)
-#define DVORAK M(_DVORAK)
-#define GAME M(_GAME)
-#define ARROW M(_ARROW)
-#define NUMPAD M(_NUMPAD)
-#define LOWER M(_LOWER)
-#define RAISE M(_RAISE)
-#define M_BL 5
-
-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  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | 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|   -  |  =  |   [   |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_1x2uC( \
-  KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     KC_BSPC, \
-  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_BSLASH, \
-  LT(_RAISE, KC_ENT), KC_A,    KC_S,    KC_D,    KC_F,                KC_G,    KC_H,    KC_J,     KC_K,     KC_L,     KC_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, \
-  M(M_BL),   KC_LCTL, KC_LALT, KC_LGUI, LOWER,       LT(_LOWER, KC_SPC),       RAISE,   KC_MINUS, KC_EQUAL, KC_LBRC,  KC_RBRC  \
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    | Raise|   -  |  =  |   [   |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_1x2uC( \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, 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_COMM, KC_DOT,  KC_SLSH, _______, \
-  _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______  \
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    | Raise|   -  |  =  |   [   |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_1x2uC( \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______, \
-  _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    _______, \
-  _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______, \
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______  \
-),
-
-/* GAME
- * ,-----------------------------------------------------------------------------------.
- * |  Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | XXX | Lower |    Space    | Raise|   -  |  =   |   [  |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_preonic_1x2uC( \
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     KC_BSPC,  \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_BSLASH,\
-  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_ENT,   \
-  _______, _______, _______, XXXXXXX, _______,     _______,      _______, _______, _______,   _______,  _______   \
-),
-
-/* NUMPAD
- * ,-----------------------------------------------------------------------------------.
- * |  Esc |   /  |   *  |   -  |   4  |   5  |   6  |   7  |   8  |   9  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   7  |   8  |   9  |   +  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   4  |   5  |   6  |   +  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   1  |   2  |   3  | Enter|   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   0  |   0  |  .   | Enter| Lower|    Space    | Raise|   -  |  =   |   [  |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_preonic_1x2uC( \
-  KC_ESC, 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,  _______,     _______,      _______, _______, _______, _______, _______  \
-),
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   F1 |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Mute | BkSpc|   Up |  Del | Forwd| MBtn1|   MUp| MBtn2|   /  |   7  |   8  |  9   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Left | Down | Right| Refr  MLeft|  MDn  |MRight|   *  |   4  |   5  |  6   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Vol+| Prev | Play | Next | Back |  MWDn| MBtn3| MWUp |  -   |   1  |  2   |  3   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Vol- |      |      |      |      |             |      |   +  | Enter|  0   |  .   |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_1x2uC( \
-  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_MUTE, KC_BSPC,  KC_UP,   KC_DEL,   KC_WWW_FORWARD, KC_BTN1, KC_MS_U, KC_BTN2, KC_PSLS,  KC_P7,   KC_P8,  KC_P9,  \
-  _______, KC_LEFT,  KC_DOWN, KC_RIGHT, KC_WWW_REFRESH, KC_MS_L, KC_MS_D, KC_MS_R, KC_PAST,  KC_P4,   KC_P5,  KC_P6,  \
-  KC_VOLU, KC_MPRV,  KC_MPLY, KC_MNXT,  KC_WWW_BACK,    KC_WH_D, KC_BTN3, KC_WH_U, KC_PMNS,  KC_P1,   KC_P2,  KC_P3,  \
-  KC_VOLD, _______,  _______, _______,  _______,           _______,       _______, KC_PPLS,  KC_PENT, KC_P0,  KC_PDOT \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Bksp | PgUp |  Del |      |      |      | PgUp |  Up  | PgDn |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Home | PgDn |  End |      |      | Home | Left | Down | Right|   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Pause| Ins  |      |      | Print|Screen| End  |      |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_1x2uC( \
-  KC_GRV, KC_EXLM, KC_AT,    KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,  KC_RPRN, KC_BSPC, \
-  _______, KC_BSPC, KC_PGUP, KC_DEL,  _______, _______, _______, KC_PGUP, KC_UP,   _______,  _______, _______, \
-  _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, \
-  _______, KC_PAUSE, KC_INS, _______, KC_PSCR, KC_PSCR, _______, KC_END,  _______, _______,  _______, _______, \
-  _______, _______, _______, _______,     _______,      _______, _______, _______, _______,  _______, _______  \
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |qwerty|ColMak|Dvorak|      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |AGNorm|AGSwap|      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Aud On|AudOff|MidiOn|MdiOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus On|MusOff| Sleep| Wake | Arrow| Game |NUMPAD|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |     Reset   |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_1x2uC( \
-  _______, _______,  QWERTY, COLEMAK,  DVORAK, _______,          _______,        _______, _______, _______, _______, _______, \
-  _______, QK_BOOT, _______, AG_NORM, AG_SWAP, _______,          _______,        _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, _______, AU_ON,   AU_OFF,  MI_ON,            MI_OFF,         QWERTY,  COLEMAK,  DVORAK, _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_SYSTEM_SLEEP,  KC_SYSTEM_WAKE, ARROW,      GAME,  NUMPAD, _______, _______, \
-  _______, _______, _______, _______, _______,              QK_BOOT,              _______, _______, _______, _______, _______  \
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float start_up[][2] = {
-   MUSICAL_NOTE(_B5, 20),
-   MUSICAL_NOTE(_B6, 8),
-   MUSICAL_NOTE(_DS6, 20),
-   MUSICAL_NOTE(_B6, 8),
-};
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-
-float goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case _QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          break;
-        case _COLEMAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
-          }
-          break;
-        case _DVORAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dvorak);
-            #endif
-            persistent_default_layer_set(1UL<<_DVORAK);
-          }
-          break;
-        case _GAME:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-            persistent_default_layer_set(1UL<<_GAME);
-          }
-          break;
-        case _NUMPAD:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dvorak);
-            #endif
-            persistent_default_layer_set(1UL<<_NUMPAD);
-          }
-          break;
-        case _ARROW:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-            persistent_default_layer_set(1UL<<_LOWER);
-          }
-          break;
-        case _LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          break;
-        case _RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          break;
-        case M_BL:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-
-void matrix_init_user(void) {
-  #ifdef AUDIO_ENABLE
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(start_up);
-  #endif
-}
-
-#ifdef AUDIO_ENABLE
-
-void play_goodbye_tone(void)
-{
-  PLAY_SONG(goodbye);
-  _delay_ms(150);
-}
-
-#endif
diff --git a/keyboards/preonic/keymaps/dlaroe/config.h b/keyboards/preonic/keymaps/dlaroe/config.h
deleted file mode 100644
index 2bebf48a1c..0000000000
--- a/keyboards/preonic/keymaps/dlaroe/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/dlaroe/keymap.c b/keyboards/preonic/keymaps/dlaroe/keymap.c
deleted file mode 100644
index 796ef64550..0000000000
--- a/keyboards/preonic/keymaps/dlaroe/keymap.c
+++ /dev/null
@@ -1,251 +0,0 @@
-// Dale's Planck with a number row, I mean Preonic.
-// I could have done something cooler with the top row I guess but I'm pretty much a Planck guy, that is the reason for the duplication of keys.
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-enum preonic_layers {
-  _QWERTY,
-  _ARROW,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  ARROW,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  \   |  Alt |Lower |    Space    |Raise |   [  |   -  |   =  |  ]   |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_1x2uC( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_DEL,  \
-  KC_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, MT(MOD_RSFT, KC_ENT), \
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER,      KC_SPC,       RAISE,  LT(_LOWER, KC_LBRC), KC_MINS, KC_EQL, MT(MOD_RCTL, KC_RBRC) \
-),
-
-/* Arrow
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  \   |  Alt |Lower |    Space    |Raise | Left | Down |  Up  | Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROW] = LAYOUT_preonic_1x2uC( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_DEL,  \
-  KC_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, MT(MOD_RSFT, KC_ENT), \
-  KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER,      KC_SPC,       RAISE,  KC_LEFT, KC_DOWN, KC_UP,  MT(MOD_RCTL, KC_RGHT) \
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |   .  |  *   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |   /  | Ent  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      0      |      |   [  |   -  |   +  |   ]  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_1x2uC( \
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
-  KC_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_4,    KC_5,    KC_6, KC_DOT, KC_ASTR,     \
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_1,    KC_2,    KC_3, _______, _______,    \
-  _______, _______, _______, _______, _______,     KC_0,      _______, _______, _______, KC_PLUS, _______        \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  | Wh Up|RightC| M-Up | LeftC|QWERTY| Left | Down |  Up  | Right|  |   |   `  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Wh Dn| M-L  | M-Dn | M-R  |      |  -   |  =   |  [  |   ]   |  \   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | App  |      |      |      |     Ins     |      | Home | PGDN | PGUP |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_1x2uC( \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-   KC_DEL,   KC_WH_U,   KC_BTN2, KC_MS_U, KC_BTN1, QWERTY, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,   KC_PIPE,  KC_GRV,
-  _______,   KC_WH_D,   KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLASH, _______,
-  _______,   KC_APP,   _______, _______, _______,     KC_INS,     _______, KC_HOME, KC_PGDN,   KC_PGUP,  KC_END
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | C-A-I|Qwerty|      |      |Reset |Macro0|      |      |      |      |      |C-A-D |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps | Arrow|      |Aud on|Audoff|      |AGswap|AGnorm| PrtSc|ScrLck| Break|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff| Prev | Next | Mute |VolUp |VolDn |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      |      |      |      | Play/Pause  |      | BL_T |BL_DEC|BL_INC|BL_ST |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_1x2uC( \
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  LALT(LCTL(KC_INS)), QWERTY,   _______, _______, QK_BOOT, M(0),  _______, MAGIC_TOGGLE_NKRO, _______, _______, _______, LALT(LCTL(KC_DEL)),
-  KC_CAPS, ARROW, _______, AU_ON,   AU_OFF,  _______, AG_SWAP, AG_NORM,  KC_PSCR, KC_SLCK, KC_PAUS,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  KC_MPRV,  KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-  BACKLIT, _______, _______, _______, _______,     KC_MPLY,     _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP
-)
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is.
-{
-  switch(id) {
-    case 0: // this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), T(LEFT), U(LSFT), D(LCTL), T(X), U(LCTL), T(RIGHT), D(LCTL), T(V), U(LCTL), T(LEFT),  END  ); // this swaps the characters on either side of the cursor when the macro executes
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
-
-#ifdef AUDIO_ENABLE
-float tone_startup[][2] = {
-  {NOTE_B5, 20},
-  {NOTE_B6, 8},
-  {NOTE_DS6, 20},
-  {NOTE_B6, 8}
-};
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          return false;
-          break;
-        case ARROW:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_ARROW);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-}
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-#endif
diff --git a/keyboards/preonic/keymaps/dlaroe/readme.md b/keyboards/preonic/keymaps/dlaroe/readme.md
deleted file mode 100644
index f0dfdbb106..0000000000
--- a/keyboards/preonic/keymaps/dlaroe/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Dale's Preonic layout 
-
-Really just my Planck layout for the Preonic.
-
-The hardware number row is mostly to avoid context switching delay inherent in receiving auditory input while trying to type. Frankly I like my Planck Game layer more than I like using the number row.
-
-I cut most of the plate vertical supports on the left side to use the Rev. 1 Preonic PCB's alternate switch placement to allow the use of 1.25 mods.
diff --git a/keyboards/preonic/keymaps/dlaroe/rules.mk b/keyboards/preonic/keymaps/dlaroe/rules.mk
deleted file mode 100644
index 4a62771e70..0000000000
--- a/keyboards/preonic/keymaps/dlaroe/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/preonic/keymaps/kinesis/config.h b/keyboards/preonic/keymaps/kinesis/config.h
deleted file mode 100644
index 2e8585d0eb..0000000000
--- a/keyboards/preonic/keymaps/kinesis/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D1
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 28     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/preonic/keymaps/kinesis/keymap.c b/keyboards/preonic/keymaps/kinesis/keymap.c
deleted file mode 100644
index 44d51da4a0..0000000000
--- a/keyboards/preonic/keymaps/kinesis/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _FN 1
-#define _ULCK 2
-
-#define HYP_TIC ALL_T(KC_GRV)
-#define EQ_LOCK TD(TD_EQ_LOCK)
-#define MIN_ULK TD(TD_MIN_ULOCK)
-
-//Tap Dance Declarations
-enum {
-  TD_EQ_LOCK = 0,
-  TD_MIN_ULOCK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * |   =  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |  FN  |   `  | Alt  | LGUI | Back | ESC  |ENTER | SPCE | RGUI |   [  |  ]   |  FN  |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_preonic_grid( \
-    EQ_LOCK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    MIN_ULK, \
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
-    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-    KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, \
-    MO(_FN), HYP_TIC, KC_LALT, KC_LGUI, KC_BSPC, KC_ESC,  KC_ENT,  KC_SPC,  KC_RGUI, KC_LBRC, KC_RBRC, MO(_FN)  \
-  ),
-
-  /* Fn
-   * ,-----------------------------------------------------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |  F11 |  F12 |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      | VOL- | VOL+ | MUTE |BLtogg|      | LEFT | DOWN |  UP  | RGHT |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      | BL-  | BL+  |Aud on|AudOff|AGnorm|AGswap|      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |Voice-|Voice+|Mus on|MusOff|      |      |PLY/PS|      | PREV | NEXT |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_FN] = LAYOUT_preonic_grid( \
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, \
-    _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  _______, \
-    _______, KC_VOLD, KC_VOLU, KC_MUTE, BL_TOGG, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
-    _______, BL_DEC,  BL_INC,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______, KC_MPLY, _______, KC_MPRV, KC_MNXT, _______  \
-  )
-
-};
-
-float tone_startup[][2] = {
-  {NOTE_B5, 20},
-  {NOTE_B6, 8},
-  {NOTE_DS6, 20},
-  {NOTE_B6, 8}
-};
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-float music_scale[][2]  = SONG(MUSIC_SCALE_SOUND);
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-/*bool process_record_user(uint16_t keycode, keyrecord_t *record) {*/
-  /*return true;*/
-  /*[>switch (keycode) {<]*/
-    /*[>case QWERTY:<]*/
-      /*[>return true;<]*/
-  /*[>}<]*/
-/*};*/
-
-void matrix_init_user(void) {
-  startup_user();
-}
-
-void startup_user()
-{
-  _delay_ms(20); // gets rid of tick
-  PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-  PLAY_SONG(tone_goodbye);
-  _delay_ms(150);
-  stop_all_notes();
-}
-
-void music_on_user(void)
-{
-  music_scale_user();
-}
-
-void music_scale_user(void)
-{
-  PLAY_SONG(music_scale);
-}
-
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for equal, twice for hyper + X (alfred lock)
-  [TD_EQ_LOCK] = ACTION_TAP_DANCE_DOUBLE(KC_EQL,  HYPR(KC_X)),
-  //Tap once for minus, twice for time.heals.nothing
-  [TD_MIN_ULOCK] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, M(_ULCK))
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
-    case _ULCK:
-      if (record->event.pressed) {
-        /* time.heals.nothing */
-        return MACRO( I(220), T(T), T(I), T(M), T(E), T(DOT), T(H), T(E), T(A), T(L), T(S), T(DOT), T(N), T(O), T(T), T(H), T(I), T(N), T(G), END);
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/preonic/keymaps/kinesis/readme.md b/keyboards/preonic/keymaps/kinesis/readme.md
deleted file mode 100644
index e911968dd9..0000000000
--- a/keyboards/preonic/keymaps/kinesis/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default Preonic layout - largely based on the Planck's
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/kinesis/rules.mk b/keyboards/preonic/keymaps/kinesis/rules.mk
deleted file mode 100644
index 2f8516a96e..0000000000
--- a/keyboards/preonic/keymaps/kinesis/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes          # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/sentraq/s60_x/keymaps/bluebear/config.h b/keyboards/sentraq/s60_x/keymaps/bluebear/config.h
deleted file mode 100644
index 8037a0d1e7..0000000000
--- a/keyboards/sentraq/s60_x/keymaps/bluebear/config.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#undef DEVICE_VER
-#define DEVICE_VER      0x0003
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* 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
-
-/* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 3
-
-/* Underlight configuration
- */
-#undef RGBLIGHT_HUE_STEP
-#undef RGBLIGHT_SAT_STEP
-#undef RGBLIGHT_VAL_STEP
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-// For Tap Dancing
-
-#define TAPPING_TOGGLE 1
-#define TAPPING_TERM 300
-
-/*
- * 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
-
-// Space Cadet Rollover - if set, allows to tap opposite shift key to cancel erroneous press
-#define DISABLE_SPACE_CADET_ROLLOVER
-
-#endif
diff --git a/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c b/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
deleted file mode 100644
index 4186ad5ff8..0000000000
--- a/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
+++ /dev/null
@@ -1,695 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Keyboard Layers
-
-enum keyboard_layers {
-  BASE,        //Base Layer
-  ARROWFN,     //Arrow/FN Layer
-  MOUSE,       //Mouse Layer
-  MIDI_BASE,   //Midi Layer
-  MIDI_CHORDS, //Midi Chord Layer
-  MORSE,       //Morse Code Layer
-};
-
-// Morse Code Macro Keys
-
-enum morse_macros {
-  MC_0 = M(0),
-  MC_1 = M(1),
-  MC_2 = M(2),
-  MC_3 = M(3),
-  MC_4 = M(4),
-  MC_5 = M(5),
-  MC_6 = M(6),
-  MC_7 = M(7),
-  MC_8 = M(8),
-  MC_9 = M(9),
-  MC_A = M(10),
-  MC_B = M(11),
-  MC_C = M(12),
-  MC_D = M(13),
-  MC_E = M(14),
-  MC_F = M(15),
-  MC_G = M(16),
-  MC_H = M(17),
-  MC_I = M(18),
-  MC_J = M(19),
-  MC_K = M(20),
-  MC_L = M(21),
-  MC_M = M(22),
-  MC_N = M(23),
-  MC_O = M(24),
-  MC_P = M(25),
-  MC_Q = M(26),
-  MC_R = M(27),
-  MC_S = M(28),
-  MC_T = M(29),
-  MC_U = M(30),
-  MC_V = M(31),
-  MC_W = M(32),
-  MC_X = M(33),
-  MC_Y = M(34),
-  MC_Z = M(35),
-  MC_DOT = M(36),
-  MC_COMM = M(37),
-  MC_APOS = M(38),
-  MC_SLSH = M(39),
-  MC_SCLN = M(40),
-  MC_EQL = M(41),
-  MC_MINS = M(42),
-  MC_SPACE = M(43),
-};
-
-// Custom Keys
-
-enum custom_keys {
-
-  // Miscellaneous Keycodes
-
-  TFS = LCTL(LALT(KC_DEL)), // Three Finger Salute - Sends Ctl-Alt-Del
-  MAGSYS = SAFE_RANGE, // Magic SysRq key - Sends Alt-PSCR
-  MC_LSFT, // Morse Code Left Shift
-  MC_RSFT, // Morse Code Right Shift
-
-  // MIDI Chord Keycodes - Major
-
-  MI_CH_C,
-  MI_CH_Cs,
-  MI_CH_Db = MI_CH_Cs,
-  MI_CH_D,
-  MI_CH_Ds,
-  MI_CH_Eb = MI_CH_Ds,
-  MI_CH_E,
-  MI_CH_F,
-  MI_CH_Fs,
-  MI_CH_Gb = MI_CH_Fs,
-  MI_CH_G ,
-  MI_CH_Gs,
-  MI_CH_Ab = MI_CH_Gs,
-  MI_CH_A,
-  MI_CH_As,
-  MI_CH_Bb = MI_CH_As,
-  MI_CH_B,
-
-  // MIDI Chord Keycodes Minor
-
-  MI_CH_Cm,
-  MI_CH_Csm,
-  MI_CH_Dbm = MI_CH_Csm,
-  MI_CH_Dm,
-  MI_CH_Dsm,
-  MI_CH_Ebm = MI_CH_Dsm,
-  MI_CH_Em,
-  MI_CH_Fm,
-  MI_CH_Fsm,
-  MI_CH_Gbm = MI_CH_Fsm,
-  MI_CH_Gm,
-  MI_CH_Gsm,
-  MI_CH_Abm = MI_CH_Gsm,
-  MI_CH_Am,
-  MI_CH_Asm,
-  MI_CH_Bbm = MI_CH_Asm,
-  MI_CH_Bm,
-
-  //MIDI Chord Keycodes Dominant Seventh
-
-  MI_CH_CDom7,
-  MI_CH_CsDom7,
-  MI_CH_DbDom7 = MI_CH_CsDom7,
-  MI_CH_DDom7,
-  MI_CH_DsDom7,
-  MI_CH_EbDom7 = MI_CH_DsDom7,
-  MI_CH_EDom7,
-  MI_CH_FDom7,
-  MI_CH_FsDom7,
-  MI_CH_GbDom7 = MI_CH_FsDom7,
-  MI_CH_GDom7,
-  MI_CH_GsDom7,
-  MI_CH_AbDom7 = MI_CH_GsDom7,
-  MI_CH_ADom7,
-  MI_CH_AsDom7,
-  MI_CH_BbDom7 = MI_CH_AsDom7,
-  MI_CH_BDom7,
-
-  // MIDI Chord Keycodes Diminished Seventh
-
-  MI_CH_CDim7,
-  MI_CH_CsDim7,
-  MI_CH_DbDim7 = MI_CH_CsDim7,
-  MI_CH_DDim7,
-  MI_CH_DsDim7,
-  MI_CH_EbDim7 = MI_CH_DsDim7,
-  MI_CH_EDim7,
-  MI_CH_FDim7,
-  MI_CH_FsDim7,
-  MI_CH_GbDim7 = MI_CH_FsDim7,
-  MI_CH_GDim7,
-  MI_CH_GsDim7,
-  MI_CH_AbDim7 = MI_CH_GsDim7,
-  MI_CH_ADim7,
-  MI_CH_AsDim7,
-  MI_CH_BbDim7 = MI_CH_AsDim7,
-  MI_CH_BDim7,
-
-};
-
-//Keymaps
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* 0: Custom Dvorak/HHKBish Base Layer
-
-	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-	 │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  [  │  ]  │  \  │  `  │
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │ TAB │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │BSPC │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │CT/ES│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│CT/EN│█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │LSPO │▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSPC │▒▒▒▒▒│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │MO(2)│L_GUI│L_ALT│█████│█████│█████│SPFN1│█████│█████│█████│AG/AP│R_GUI│CT|S │CT|AL│█████│
-	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-  */
-
-  [BASE] = LAYOUT(
-				  KC_ESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_GRV, \
-				  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,	\
-				  CTL_T(KC_ESC),  KC_A,  KC_O,  KC_E,  KC_U,  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_MINS,  KC_NO,  MT(MOD_RCTL, KC_ENT),	\
-				  KC_LSPO,  KC_NO,  KC_SCLN,  KC_Q,  KC_J,  KC_K,  KC_X,  KC_B,  KC_M,  KC_W,  KC_V,  KC_Z,          KC_RSPC,  KC_NO, \
-				  MO(2), KC_LGUI, KC_LALT,  LT(1, KC_SPACE),  ALGR_T(KC_APP),  KC_RGUI,  OSM(MOD_LCTL | MOD_LSFT),  OSM(MOD_LCTL | MOD_LALT)
-				  ),
-
-  /* 1: Arrow/FN Layer
-
-	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-	 │     │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │TO(3)│TO(5)│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │     │     │     │     │     │     │PGUP │  UP │     │     │     │ INS │ DEL │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │CAPS │HOME │     │ END │     │     │     │LEFT │DOWN │RIGHT│     │     │▒▒▒▒▒│     │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │▒▒▒▒▒│     │     │     │     │     │SPACE│PGDN │PSCR │SLCK │PAUSE│▒▒▒▒▒│     │▒▒▒▒▒│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-  */
-
-  [ARROWFN] = 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,  TO(3),  TO(5), \
-					 KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_PGUP,  KC_UP,  KC_NO,  KC_NO,  KC_NO,  KC_INS,  KC_DEL, \
-					 KC_CAPS,  KC_HOME,  KC_NO,  KC_END,  KC_NO,  KC_NO,  KC_NO,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_NO,          KC_NO,  KC_TRNS,  \
-					 KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_SPACE,  KC_PGDN,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_NO,  KC_TRNS,  KC_NO, \
-					 KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS
-					 ),
-
-  /* 2: Mouse Keys Layer
-
-	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-	 │QK_BOOT│ F13 │ F14 │ F15 │ F16 │ F17 │ F18 │ F19 │ F20 │ F21 │ F22 │ F23 │ F24 │     │     │
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │DEBUG│     │     │     │     │     │     │BTN1 │MS_UP│BTN2 │WH_UP│     │     │     │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │TFS  │     │     │     │     │     │     │MS_LT│MS_DN│MS_RT│WH_DN│BTN3 │▒▒▒▒▒│     │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │MAGSYS▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │     │     │█████│█████│█████│ PWR │█████│█████│█████│     │     │     │     │█████│
-	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-  */
-
-  [MOUSE] = LAYOUT(
-
-				   QK_BOOT,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21, KC_F22,  KC_F23,  KC_F24,  KC_NO,  KC_NO,  \
-				   DEBUG,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BTN1,  KC_MS_UP,  KC_BTN2,  KC_WH_U,  KC_NO,  KC_NO,  KC_NO, \
-				   TFS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_RIGHT,  KC_WH_D,  KC_BTN3,  KC_NO,  KC_TRNS,  \
-				   MAGSYS,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_PWR,  KC_TRNS, KC_TRNS,  KC_NO,  KC_NO
-				   ),
-
-  /* 3: Midi Base Layer
-
-	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-	 │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│     │TO(4)│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │OCT+ │     │  C# │  D# │     │  F# │  G# │  A# │     │  C# │  D# │     │     │     │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │OCT- │  C  │  D  │  E  │  F  │  G  │  A  │  B  │  C  │  D  │  E  │  F  │▒▒▒▒▒│     │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │ Cm  │▒▒▒▒▒│ Gm  │ Dm  │ Am  │ Em  │ Bm  │ Gbm │ Dbm │ Abm │ Ebm │ Bbm │▒▒▒▒▒│ Fm  │▒▒▒▒▒│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │     │     │█████│█████│█████│A-OFF│█████│█████│█████│     │     │     │     │█████│
-	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-  */
-
-  [MIDI_BASE] = LAYOUT(
-					   TO(0),  MI_CH_C,  MI_CH_G,  MI_CH_D,  MI_CH_A,  MI_CH_E,  MI_CH_B,  MI_CH_Gb,  MI_CH_Db,  MI_CH_Ab, MI_CH_Eb,  MI_CH_Bb,  MI_CH_F,  KC_NO,  TO(4), \
-					   MI_OCTU,  KC_NO,  MI_Cs,  MI_Ds,  KC_NO,  MI_Fs,  MI_Gs,  MI_As,  KC_NO,  MI_Cs_1,  MI_Ds_1,  KC_NO,  KC_NO,  KC_NO, \
-					   MI_OCTD,  MI_C,  MI_D,  MI_E,  MI_F,  MI_G,  MI_A,  MI_B,  MI_C_1,  MI_D_1,  MI_E_1,  MI_F_1,  KC_NO,  KC_NO,  \
-					   MI_CH_Cm,  KC_NO,  MI_CH_Gm,  MI_CH_Dm,  MI_CH_Am,  MI_CH_Em,  MI_CH_Bm,  MI_CH_Gbm,  MI_CH_Dbm,  MI_CH_Abm,  MI_CH_Ebm,  MI_CH_Bbm,          MI_CH_Fm,  KC_NO, \
-					   KC_NO,  KC_NO,  KC_NO,  MI_ALLOFF,  KC_NO, KC_NO,  KC_NO,  KC_NO
-					   ),
-
-  /* 4: Midi Chord Layer
-
-	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-	 │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│TO(3)│     │
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │OCT+ │  Cm │  Gm │  Dm │  Am │  Em │ Bbm │ Gbm │ Dbm │ Abm │ Ebm │ Bbm │ Fm  │     │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │OCT- │Cdom7│Gdom7│Ddom7│Adom7│Edom7│Bdom7│Gbdo7│Dbdo7│Abdo7│Ebdo7│Bbdo7│▒▒▒▒▒│Fdom7│█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │Cdim7│▒▒▒▒▒│Gdim7│Ddim7│Adim7│Edim7│Bdim7│Gbdi7│Dbdi7│Abdi7│Ebdi7│Bbdi7│▒▒▒▒▒│Fdim7│▒▒▒▒▒│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │     │     │█████│█████│█████│A-OFF│█████│█████│█████│     │     │     │     │█████│
-	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-  */
-
-  [MIDI_CHORDS] = LAYOUT(
-						 TO(0),  MI_CH_C,  MI_CH_G,  MI_CH_D,  MI_CH_A,  MI_CH_E,  MI_CH_B,  MI_CH_Gb,  MI_CH_Db,  MI_CH_Ab, MI_CH_Eb,  MI_CH_Bb,  MI_CH_F,  TO(3),  KC_NO, \
-						 MI_OCTU,  MI_CH_Cm,  MI_CH_Gm,  MI_CH_Dm,  MI_CH_Am,  MI_CH_Em,  MI_CH_Bm,  MI_CH_Gbm,  MI_CH_Dbm,  MI_CH_Abm,  MI_CH_Ebm,  MI_CH_Bbm,  MI_CH_Fm,  KC_NO, \
-						 MI_OCTD,  MI_CH_CDom7,  MI_CH_GDom7,  MI_CH_DDom7,  MI_CH_ADom7,  MI_CH_EDom7,  MI_CH_BDom7,  MI_CH_GbDom7,  MI_CH_DbDom7,  MI_CH_AbDom7,  MI_CH_EbDom7,  MI_CH_BbDom7,  KC_NO,  MI_CH_FDom7, \
-						 MI_CH_CDim7,  KC_NO,  MI_CH_GDim7,  MI_CH_DDim7,  MI_CH_ADim7,  MI_CH_EDim7,  MI_CH_BDim7,  MI_CH_GbDim7,  MI_CH_DbDim7,  MI_CH_AbDim7,  MI_CH_EbDim7,  MI_CH_BbDim7,          MI_CH_FDim7,  KC_NO, \
-						 KC_NO,  KC_NO,  KC_NO,  MI_ALLOFF,  KC_NO, KC_NO,  KC_NO,  KC_NO
-						 ),
-
-  /* 5: Morse Code Layer
-
-	 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-	 │TO(0)│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │     │     │     │     │
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │BSPC │█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │SHIFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│SHIFT│▒▒▒▒▒│
-	 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-	 │     │     │     │█████│█████│█████│SPACE│█████│█████│█████│     │     │     │     │█████│
-	 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-  */
-
-  [MORSE] = LAYOUT(
-				   TO(0),  MC_1,  MC_2,  MC_3,  MC_4,  MC_5,  MC_6,  MC_7,  MC_8,  MC_9,  MC_0,  KC_NO,  KC_NO,  KC_NO,  KC_NO, \
-				   KC_TAB,  MC_APOS,  MC_COMM, MC_DOT,  MC_P,  MC_Y,  MC_F,  MC_G,  MC_C,  MC_R,  MC_L,  MC_SLSH,  MC_EQL,  KC_BSPC, \
-				   KC_NO,  MC_A,  MC_O,  MC_E,  MC_U,  MC_I,  MC_D,  MC_H,  MC_T,  MC_N,  MC_S,  MC_MINS,  KC_NO,  KC_ENT, \
-				   MC_LSFT,  KC_NO,  MC_SCLN,  MC_Q,  MC_J,  MC_K,  MC_X,  MC_B,  MC_M,  MC_W,  MC_V,  MC_Z,          MC_RSFT,  KC_NO, \
-				   KC_NO, KC_NO, KC_NO,   MC_SPACE,  KC_NO,  KC_NO,  KC_NO, KC_NO
-				   ),
-
-};
-
-// Morse Code Macros
-
-int mc_shift_on = false; // Variable that defines whether MC_LSFT or MC_RSFT are pressed
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-
-  switch(id) {
-
-  case 0: //Number 0-)
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.-
-	  }
-	  else {
-		return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //-----
-	  }
-	}
-	break;
-
-  case 1: //Number 1-!
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.--
-	  }
-	  else {
-		return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.----
-	  }
-	}
-	break;
-
-  case 2: //Number 2-@
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-.
-	  }
-	  else {
-		return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //..---
-	  }
-	}
-	break;
-
-  case 3: // Number 3
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...--
-	}
-	break;
-
-  case 4: //Number 4-$
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..-
-	  }
-	  else {
-		return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //....-
-	  }
-	}
-	break;
-
-  case 5: //Number 5
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.....
-	}
-	break;
-
-  case 6: //Number 6
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-....
-	}
-	break;
-
-  case 7: //Number 7-&
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-...
-	  }
-	  else {
-		return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //--...
-	  }
-	}
-	break;
-
-  case 8: //Number 8
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---..
-	}
-	break;
-
-  case 9: //Number 9-(
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--.
-	  }
-	  else {
-		return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //----.
-	  }
-	}
-	break;
-
-  case 10: //Letter A
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(MINS), T(SPACE), END); //.-
-	}
-	break;
-
-  case 11: //Letter B
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-...
-	}
-	break;
-
-  case 12: //Letter C
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-.
-	}
-	break;
-
-  case 13: //Letter D
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-..
-	}
-	break;
-
-  case 14: //Letter E
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(SPACE), END); //.
-	}
-	break;
-
-  case 15: //Letter F
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-.
-	}
-	break;
-
-  case 16: //Letter G
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--.
-	}
-	break;
-
-  case 17: //Letter H
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //....
-	}
-	break;
-
-  case 18: //Letter I
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(SPACE), END); //..
-	}
-	break;
-
-  case 19: //Letter J
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.---
-	}
-	break;
-
-  case 20: //Letter K
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.-
-	}
-	break;
-
-  case 21: //Letter L
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-..
-	}
-	break;
-
-  case 22: //Letter M
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(MINS), T(SPACE), END); //--
-	}
-	break;
-
-  case 23: //Letter N
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(DOT), T(SPACE), END); //-.
-	}
-	break;
-
-  case 24: //Letter O
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //---
-	}
-	break;
-
-  case 25: //Letter P
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--.
-	}
-	break;
-
-  case 26: //Letter Q
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.-
-	}
-	break;
-
-  case 27: //Letter R
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.
-	}
-	break;
-
-  case 28: //Letter S
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //...
-	}
-	break;
-
-  case 29: //Letter T
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(SPACE), END); //-
-	}
-	break;
-
-  case 30: //Letter U
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..-
-	}
-	break;
-
-  case 31: //Letter V
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-
-	}
-	break;
-
-  case 32: //Letter W
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.--
-	}
-	break;
-
-  case 33: //Letter X
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..-
-	}
-	break;
-
-  case 34: //Letter Y
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-	  }
-	  return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.--
-	}
-	break;
-
-  case 35: //Letter Z
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--..
-	}
-	break;
-
-  case 36: //Punctuation .
-	if (record->event.pressed) {
-	  return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.-
-	}
-	break;
-
-  case 37: //Punctuation ,
-	if (record->event.pressed) {
-	  return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //--..--
-	}
-	break;
-
-  case 38: //Punctuation '-"
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-..-.
-	  }
-	  else {
-		return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-....-
-	  }
-	}
-	break;
-
-  case 39: //Punctuation /-?
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //..--..
-	  }
-	  else {
-		return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-..-.
-	  }
-	}
-	break;
-
-  case 40: //Punctuation ;-:
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //---...
-	  }
-	  else {
-		return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-.-.
-	  }
-	}
-	break;
-
-  case 41: //Punctuation =-+
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.-.
-	  }
-	  else {
-		return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-...-
-	  }
-	}
-	break;
-
-  case 42: //Punctuation --_
-	if (record->event.pressed) {
-	  if (mc_shift_on == true) {
-		return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.-
-	  }
-	  else {
-		return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-....-
-	  }
-	}
-	break;
-
-  case 43: //Morse Space
-	if (record->event.pressed) {
-	  return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse
-	}
-	break;
-  }
-  return MACRO_NONE;
-}
-
-// Custom Keys
-
-bool process_record_user (uint16_t keycode, keyrecord_t *record) {
-
-  uint16_t root_note = MIDI_INVALID_NOTE; // Starting value for the root note of each chord
-
-  switch(keycode) {
-
-	// Miscellaneous Keycodes
-
-  case MAGSYS: //Magic SysRq function - Toggles key on and off depending on state of LALT key
-	if (record->event.pressed) {
-	  if (keyboard_report->mods & (MOD_BIT(KC_LALT))) {
-		unregister_code(KC_PSCR);
-		unregister_code(KC_LALT);
-	  } else {
-		register_code(KC_LALT);
-		register_code(KC_PSCR);
-	  }
-	}
-	break;
-
-  case MC_LSFT ... MC_RSFT:
-	if (record->event.pressed) {
-	  mc_shift_on = true;
-	}
-	else {
-	  mc_shift_on = false;
-	}
-	break;
-
-	// MIDI Chord Keycodes
-
-  case MI_CH_C ... MI_CH_B: // Major Chords
-	root_note = keycode - MI_CH_C + MI_C;
-	process_midi(root_note, record);
-	process_midi(root_note + 4, record); // Major Third Note
-	process_midi(root_note + 7, record); // Fifth Note
-	break;
-
-  case MI_CH_Cm ... MI_CH_Bm: // Minor Chord
-	root_note = keycode - MI_CH_Cm + MI_C;
-	process_midi(root_note, record);
-	process_midi(root_note + 3, record); // Minor Third Note
-	process_midi(root_note + 7, record); // Fifth Note
-	break;
-
-  case MI_CH_CDom7 ... MI_CH_BDom7: // Dominant 7th Chord
-	root_note = keycode - MI_CH_CDom7 + MI_C;
-	process_midi(root_note, record);
-	process_midi(root_note + 4, record); // Major Third Note
-	process_midi(root_note + 10, record); // Minor Seventh Note
-	break;
-
-  case MI_CH_CDim7 ... MI_CH_BDim7: // Diminished 7th Chord
-	root_note = keycode - MI_CH_CDim7 + MI_C;
-	process_midi(root_note, record);
-	process_midi(root_note + 3, record); // Minor Third Note
-	process_midi(root_note - 3, record); // Diminished 7th Note
-	break;
-  }
-  return true;
-}
diff --git a/keyboards/sentraq/s60_x/keymaps/bluebear/readme.md b/keyboards/sentraq/s60_x/keymaps/bluebear/readme.md
deleted file mode 100644
index d2cf6a4c58..0000000000
--- a/keyboards/sentraq/s60_x/keymaps/bluebear/readme.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Bluebear’s custom S60X layout
-
-Custom keyboard layout for my S60X, my first ever custom mechanical keyboard kit.
-
-This layout was inspired in part by the HHKB line of keyboards and a quest to find the perfect ergonomic, logical layout for what I do. If you like this layout, please feel free to use it, modify it and share it.
-
-## [BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20BASE%20layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff7a00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9;;&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E&_c=#cccccc;&=!%0A1&=/@%0A2&=#%0A3&=$%0A4&=%25%0A5&=%5E%0A6&=/&%0A7&=*%0A8&=(%0A9&=)%0A0&=%7B%0A%5B&=%7D%0A%5D&=%7C%0A%5C&=~%0A%60;&@_w:1.5;&=Tab&=%22%0A%27&=%3C%0A,&=%3E%0A.&=P&=Y&=F&=G&=C&=R&=L&=?%0A//&=+%0A/=&_w:1.5;&=Backspace;&@_w:1.75;&=Ctrl%20(hold)%0AEsc%20%20(tap)&=A&=O&=E&=U&=I&=D&=H&=T&=N&=S&=/_%0A-&_w:2.25;&=Enter%20(tap)%0ACtrl%20(hold);&@_w:2.25;&=Shift%20(hold)%0A(%20(tap)&=/:%0A/;&=Q&=J&=K&=X&=B&=M&=W&=V&=Z&_w:2.75;&=Shift%20(hold)%0A)%20(tap);&@_w:1.25;&=Mouse%20Layer%20(hold)&_w:1.25;&=Win&_w:1.25;&=Alt&_a:5&w:6.25;&=Space%20(tap)%0AArrowFN%20Layer%20(hold)&_a:4&w:1.25;&=AltGr(h)%0AComp%20(t)&_w:1.25;&=Win&_w:1.25;&=Ctrl%20+%20Shift%20(oneshot)&_w:1.25;&=Ctrl%20+%20Alt%20(oneshot))
-
-- Dvorak keyboard layout
-- Hold left control key for LCTL, and tap it for ESC
-- Hold enter key for RCTL and tap for ENT
-- Hold the space key to momentarily switch to ARROWFN layer
-- Left bottom key acts as momentary switch to the MOUSE layer
-- Hold right alt key for AltGr and tap for APP(which I have mapped to Compose in OS)
-- Hold left shift key for LSFT and tap for ( (Space Cadet style)
-- Hold right shift key for RSFT and tap for ) (Space Cadet style)
-- Tap key on bottom row, second from the right (where APP usually is) to get CTL-Shift (one shot modifier - next key pressed will be modified by ctl-shift)
-- Tap key on bottom right to get CTL-Alt (one shot modifier - next key pressed will be modified by ctl-alt)
-
-## [ARROWFN Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20ARROWFN%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true%3B&@_c=%23ff6b00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9%3B%3B&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class%2F=%27kb%20kb-logo-commodore%27%3E%3C%2F%2Fi%3E&_c=%23cccccc%3B&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F0&=F11&=F12&=To%20MIDI%20Layer&=To%20MORSE%20Layer%3B&@_a:7&w:1.5%3B&=&=&=&=&=&=&=&_a:4%3B&=PgUp&=%3Ci%20class%2F=%27kb%20kb-Arrows-Up%27%3E%3C%2F%2Fi%3E&_a:7%3B&=&=&=&_a:4%3B&=Ins&_w:1.5%3B&=Delete%3B&@_w:1.75%3B&=Caps%20Lock&=Home&_a:7%3B&=&_a:4%3B&=End&_a:7%3B&=&=&=&_a:4%3B&=%3Ci%20class%2F=%27kb%20kb-Arrows-Left%27%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F=%27kb%20kb-Arrows-Down%27%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F=%27kb%20kb-Arrows-Right%27%3E%3C%2F%2Fi%3E&_a:7%3B&=&=&_a:4&w:2.25%3B&=Enter%3B&@_a:7&w:2.25%3B&=&=&=&=&=&=&_a:4%3B&=Space&=PgDn&=Print%20Screen&=Scroll%20Lock&=Pause&_a:7&w:2.75%3B&=%3B&@_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:6.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=)
-
-- Number row becomes F1 to F12
-- C, T, H, N keys become Up, Down, Left, Right (equivalent to IJKL on QWERTY keyboard)
-- Access to various other keys normally found on a full sized keyboard (INS, DEL, PSCR, SLCK, PAUSE, PGUP, PGDN, HOME, END)
-- Top right button toggles MORSE layer
-- Second from right, top row, toggles MIDI_BASE layer
-- Holding Space-B lets you send Space repeatedly
-- Hitting the LCTL button in this layer toggles caps lock
-
-## [MOUSE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MOUSE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff7f08&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9;;&=Reset%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E&_c=#cccccc;&=F13&=F14&=F15&=F16&=F17&=F18&=F19&=F20&=F21&=F22&=F23&=F24&_a:7;&=&=;&@_a:4&w:1.5;&=Debug&_a:7;&=&=&=&=&=&=&_a:4;&=Mouse%20Button%201&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Up%27%3E%3C//i%3E&=Mouse%20Button%202&_f:3;&=Mouse%20Wheel%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Up%27%3E%3C//i%3E&_a:7;&=&=&_w:1.5;&=;&@_a:4&w:1.75;&=Ctl+%0ADel%0A%0A%0A%0A%0AAlt+&_a:7;&=&=&=&=&=&=&_a:4&f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Left%27%3E%3C//i%3E&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Down%27%3E%3C//i%3E&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Right%27%3E%3C//i%3E&_f:3;&=Mouse%20Wheel%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Down%27%3E%3C//i%3E&=Mouse%20Button%203&_a:7&w:2.25;&=;&@_a:4&w:2.25;&=Magic%0AToggle%0A%0A%0A%0A%0ASysRq&_a:7;&=&=&=&=&=&=&=&=&=&=&_w:2.75;&=;&@_w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&w:6.25;&=Power&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=)
-
-- Move the mouse with mouse keys
-- Hitting the escape key in this layer will give RESET, which puts the controller into dfu mode for flashing firmware onto it
-- If Debug is enabled, hitting the TAB key in this layer activates debugging to the console when listening with hid-listen
-- TFS button (Three Finger Salute) sends Ctl-Alt-Del
-- MAGSYS toggles the Magic SysRq key (works only in Linux)
-- Hitting the space key in this layer is like hitting power button on computer
-- Number row becomes F13 to F24
-
-## [MIDI_BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MIDI%20BASE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff8300&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&f:3;&=%F0%9F%8E%B6%0ACmaj&_f:3;&=%F0%9F%8E%B6%0AGmaj&_f:3;&=%F0%9F%8E%B6%0ADmaj&_f:3;&=%F0%9F%8E%B6%0AAmaj&_f:3;&=%F0%9F%8E%B6%0AEmaj&_f:3;&=%F0%9F%8E%B6%0ABmaj&_f:3;&=%F0%9F%8E%B6%0AF#maj%0A%0A%0A%0A%0AGbmaj//&_f:3;&=%F0%9F%8E%B6%0AC#maj%0A%0A%0A%0A%0ADbmaj//&_f:3;&=%F0%9F%8E%B6%0AG#maj%0A%0A%0A%0A%0AAbmaj&_f:3;&=%F0%9F%8E%B6%0AD#maj%0A%0A%0A%0A%0AEbmaj//&_f:3;&=%F0%9F%8E%B6%0AA#maj%0A%0A%0A%0A%0ABbmaj//&_f:3;&=%F0%9F%8E%B6%0AFmaj&_a:7;&=&_a:4&f:3;&=To%0AChord%0A%0A%0A%0A%0AMidi;&@_f:3&w:1.5;&=Octave%20Up&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AC#//Db&_f:3;&=%E2%99%A9%0AD#//Eb&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AF#//Gb&_f:3;&=%E2%99%A9%0AG#//Ab&_f:3;&=%E2%99%A9%0AA#//Bb&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AD1b%0A%0A%0A%0A%0AC1#//&_f:3;&=%E2%99%A9%0AE1b%0A%0A%0A%0A%0AD1#//&_a:7;&=&=&_w:1.5;&=;&@_a:4&f:3&w:1.75;&=Octave%20Down&_f:3;&=%E2%99%A9%0AC&_f:3;&=%E2%99%A9%0AD&_f:3;&=%E2%99%A9%0AE&_f:3;&=%E2%99%A9%0AF&_f:3;&=%E2%99%A9%0AG&_f:3;&=%E2%99%A9%0AA&_f:3;&=%E2%99%A9%0AB&_f:3;&=%E2%99%A9%0AC1&_f:3;&=%E2%99%A9%0AD1&_f:3;&=%E2%99%A9%0AE1&_f:3;&=%E2%99%A9%0AF1&_a:7&w:2.25;&=;&@_a:4&f:3&w:2.25;&=%F0%9F%8E%B6%0ACm&_f:3;&=%F0%9F%8E%B6%0AGm&_f:3;&=%F0%9F%8E%B6%0ADm&_f:3;&=%F0%9F%8E%B6%0AAm&_f:3;&=%F0%9F%8E%B6%0AEm&_f:3;&=%F0%9F%8E%B6%0ABm&_f:3;&=%F0%9F%8E%B6%0AF#m%0A%0A%0A%0A%0AGbm//&_f:3;&=%F0%9F%8E%B6%0AC#m%0A%0A%0A%0A%0ADbm//&_f:3;&=%F0%9F%8E%B6%0AG#m%0A%0A%0A%0A%0AAbm//&_f:3;&=%F0%9F%8E%B6%0AD#m%0A%0A%0A%0A%0AEbm&_f:3;&=%F0%9F%8E%B6%0AA#m%0A%0A%0A%0A%0ABbm//&_f:3&w:2.75;&=%F0%9F%8E%B6%0AFm;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=All%20notes%20off&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=)
-
-This layer was inspired by the [Satan Midi layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/satan/keymaps/midi) and gives access to basic MIDI notes. What I added were two layers of MIDI chords (major and minor triads) arranged in a circle of fifths pattern. Thanks to @fredizzimo for helping me with the code for these.
-
-- Top right button toggles MORSE_CHORDS layer
-- Escape brings you back to the BASE layer
-
-## [MIDI_CHORD Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MIDI%20CHORD%20Layer&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true&pcb:false;&@_c=#ff8300&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&f:3;&=%F0%9F%8E%B6%0ACmaj&_f:3;&=%F0%9F%8E%B6%0AGmaj&_f:3;&=%F0%9F%8E%B6%0ADmaj&_f:3;&=%F0%9F%8E%B6%0AAmaj&_f:3;&=%F0%9F%8E%B6%0AEmaj&_f:3;&=%F0%9F%8E%B6%0ABmaj&_f:3;&=%F0%9F%8E%B6%0AF#maj%0A%0A%0A%0A%0AGbmaj//&_f:3;&=%F0%9F%8E%B6%0AC#maj%0A%0A%0A%0A%0ADbmaj//&_f:3;&=%F0%9F%8E%B6%0AG#maj%0A%0A%0A%0A%0AAbmaj&_f:3;&=%F0%9F%8E%B6%0AD#maj%0A%0A%0A%0A%0AEbmaj//&_f:3;&=%F0%9F%8E%B6%0AA#maj%0A%0A%0A%0A%0ABbmaj//&_f:3;&=%F0%9F%8E%B6%0AFmaj&_f:3;&=To%20Midi%20Base&_a:7;&=;&@_a:4&f:3&w:1.5;&=Octave%20Up&_f:3;&=%F0%9F%8E%B6%0ACm&_f:3;&=%F0%9F%8E%B6%0AGm&_f:3;&=%F0%9F%8E%B6%0ADm&_f:3;&=%F0%9F%8E%B6%0AAm&_f:3;&=%F0%9F%8E%B6%0AEm&_f:3;&=%F0%9F%8E%B6%0ABm&_f:3;&=%F0%9F%8E%B6%0AF#m%0A%0A%0A%0A%0AGbm//&_f:3;&=%F0%9F%8E%B6%0AC#m%0A%0A%0A%0A%0ADbm//&_f:3;&=%F0%9F%8E%B6%0AG#m%0A%0A%0A%0A%0AAbm//&_f:3;&=%F0%9F%8E%B6%0AD#m%0A%0A%0A%0A%0AEbm//&_f:3;&=%F0%9F%8E%B6%0AA#m%0A%0A%0A%0A%0ABbm//&_f:3;&=%F0%9F%8E%B6%0AFm&_a:7&w:1.5;&=;&@_a:4&f:3&w:1.75;&=Octave%20Down&_f:3;&=%F0%9F%8E%B6%0AC7&_f:3;&=%F0%9F%8E%B6%0AG7&_f:3;&=%F0%9F%8E%B6%0AD7&_f:3;&=%F0%9F%8E%B6%0AA7&_f:3;&=%F0%9F%8E%B6%0AE7&_f:3;&=%F0%9F%8E%B6%0AB7&_f:3;&=%F0%9F%8E%B6%0AF#7%0A%0A%0A%0A%0AGb7//&_f:3;&=%F0%9F%8E%B6%0AC#7%0A%0A%0A%0A%0ADb7//&_f:3;&=%F0%9F%8E%B6%0AG#7%0A%0A%0A%0A%0AAb7//&_f:3;&=%F0%9F%8E%B6%0AD#7%0A%0A%0A%0A%0AEb7//&_f:3;&=%F0%9F%8E%B6%0AA#7%0A%0A%0A%0A%0ABb7//&_f:3&w:2.25;&=%F0%9F%8E%B6%0AF7;&@_f:3&w:2.25;&=%F0%9F%8E%B6%0ACdim7&_f:3;&=%F0%9F%8E%B6%0AGdim7&_f:3;&=%F0%9F%8E%B6%0ADdim7&_f:3;&=%F0%9F%8E%B6%0AAdim7&_f:3;&=%F0%9F%8E%B6%0AEdim7&_f:3;&=%F0%9F%8E%B6%0ABdim7&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AGb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0ADb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AAb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AEb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0ABb&_f:3&w:2.75;&=%F0%9F%8E%B6%0AFdim7;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=All%20notes%20off&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=)
-
-After figuring out how to code my MIDI chord function, I decided to dedicate a full layer to these chords. This chord layout was inspired by the [Stradella Base system](https://en.wikipedia.org/wiki/Stradella_bass_system) found on accordions. This layer is a tool for musical composition and songwriting. Originally, I had written the chord functions using the F(n) functions, but finally ended up using process_record_user and custom keycodes. I think this was a more efficient and elegant way of coding these.
-
-- Second from right, top row, toggles MIDI_BASE layer
-- Escape brings you back to the BASE layer
-
-## [MORSE LAYER](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MORSE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff8a00&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&fa@:5&:5;;&=-.-.--%0A.----&=.--.-.%0A..---&=%0A...--&=...-..-%0A....-&=%0A.....&=%0A-....&=.-...%0A--...&=%0A---..&=-.--.%0A----.&=-.--.-%0A-----&_a:7;&=&=&=&=;&@_w:1.5;&=&_a:4;&=.-..-.%0A.----.&=%0A--..--&=%0A.-.-.-&=.--.&=-.--&=..-.&=--.&=-.-.&=.-.&=.-..&=..--..%0A-..-.&=.-.-.%0A-...-&_f:3&w:1.5;&=Backspace;&@_a:7&w:1.75;&=&_a:4&f:3;&=.-&_f:3;&=---&_f:3;&=.&_f:3&n:true;&=..-&_f:3;&=..&_f:3;&=-..&_f:3&n:true;&=....&_f:3;&=-&_f:3;&=-.&_f:3;&=...&_f:3;&=..--.-%0A-....-&_f:3&w:2.25;&=Enter;&@_f:3&w:2.25;&=Shift&_f:3;&=---...%0A-.-.-.&_f:3;&=--.-&_f:3;&=.---&_f:3;&=-.-&_f:3;&=-..-&_f:3;&=-...&_f:3;&=--&_f:3;&=.--&_f:3;&=...-&_f:3;&=--..&_f:3&w:2.75;&=Shift;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=Space%20(%5C%20)&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=)
-
-This layer is really just for fun, and because I am a ham radio operator and morse code enthusiast. Hitting the alphanumerical keys in this layer will send a series of dits (.) and dahs (-) representing that character in morse code. This is all done through M(n). There are also a couple of characters that are sent through a shifted key on a regular layout, like @ or !. The same applies on this layer. And because I type using the Dvorak layout, this layer is also arranged in this manner. 
-
-- Escape brings you back to the BASE layer
-
-### THIS IS STILL A WORK IN PROGRESS
-
-This keyboard layout is still a work in progress and there are a couple of kinks left to iron out. But it is still very usable and the midi and morse code layers are lots of fun to use. Please feel free to use, share and improve all, or part of this layout.
-
-
-
-
-
diff --git a/keyboards/sentraq/s60_x/keymaps/bluebear/rules.mk b/keyboards/sentraq/s60_x/keymaps/bluebear/rules.mk
deleted file mode 100644
index ca4fd4b9e9..0000000000
--- a/keyboards/sentraq/s60_x/keymaps/bluebear/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = no	        # Console for debug(+400)
-COMMAND_ENABLE = no	        # Commands for debug and configuration
-NKRO_ENABLE = no	        # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = yes	        # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no		# Enable tap dancing keys
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h
deleted file mode 100644
index af6cf8ef1f..0000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 Balz Guenat
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#define GRAVE_ESC_CTRL_OVERRIDE
-
-#endif
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c
deleted file mode 100644
index c0bc1b2686..0000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2017 Balz Guenat
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
--------------------------------------------------------------------------------------------
-|GvEsc|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
--------------------------------------------------------------------------------------------
-|  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
--------------------------------------------------------------------------------------------
-|  Ctrl   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
--------------------------------------------------------------------------------------------
-|    Shift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  Shift  |     |
--------------------------------------------------------------------------------------------
-| Fn1   |  GUI  |  Alt  |   Space    | Space |   Space    |  Alt  |  Fn1  |  Fn1  | Ctrl  |
--------------------------------------------------------------------------------------------
-*/
-[0] = LAYOUT_base( \
-    KC_GESC, KC_1,    KC_2,    KC_3, KC_4,   KC_5,  KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
-    KC_TAB,  KC_Q,    KC_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, M(0),\
-    MO(1), KC_LGUI, KC_LALT,   KC_SPC, KC_SPC, KC_SPC,      KC_RALT, MO(1), KC_NO,   MO(1),  KC_RCTL \
-),
-/*
--------------------------------------------------------------------------------------------
-|  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |  Delete   |
--------------------------------------------------------------------------------------------
-| TAB    |Home | Up | End  |PgUp |     |     |     |     |     |     |     |     | PrtSc  |
--------------------------------------------------------------------------------------------
-|  Ctrl   |Left |Down |Right |PgDn |    |     |     |     |     |     |     |      Enter  |
--------------------------------------------------------------------------------------------
-|    Shift    |     |     |     |     |     |     |     |     |     |     |  Shift  |     |
--------------------------------------------------------------------------------------------
-| Fn1   |  GUI  |  Alt  |   Space    | Space |   Space    |  Alt  |       |       | Ctrl  |
--------------------------------------------------------------------------------------------
-*/
-[1] = LAYOUT_base( \
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,   KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL, \
-    KC_TAB,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, ______, ______,  ______, ______, ______, ______, ______, ______, KC_PSCR, \
-    KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ______, ______,  ______, ______, ______, ______, ______, ______, \
-    KC_LSFT, ______,  ______,  ______,  ______,  ______, ______,  ______, ______, ______, ______, KC_RSFT, ______, \
-    ______,  KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC, KC_RALT, ______, ______, ______, KC_RCTL \
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  switch(id) {
-      case 0:
-        // Sends Alt+Shift on both key down and key up.
-        // Fesigned to switch between two keyboard layouts on Windows using a locking switch.
-        // Does nothing if right shift is pressed for easier resync.
-        if (!(get_mods() & MOD_BIT(KC_RSFT)))
-          return MACRO(D(LALT), T(LSFT), U(LALT), END);
-        else
-          return MACRO_NONE;
-  }
-  return MACRO_NONE;
-};
-
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md
deleted file mode 100644
index a08bea519f..0000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Kamon's keymap for the Bananasplit
-A simple layout to get you started with the BananaSplit60.
-
-Default layer:
-
-```
--------------------------------------------------------------------------------------------
-|GvEsc|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
--------------------------------------------------------------------------------------------
-|  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
--------------------------------------------------------------------------------------------
-|  Ctrl   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
--------------------------------------------------------------------------------------------
-|    Shift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  Shift  |     |
--------------------------------------------------------------------------------------------
-| Fn1   |  GUI  |  Alt  |   Space    | Space |   Space    |  Alt  |  Fn1  |  Fn1  | Ctrl  |
--------------------------------------------------------------------------------------------
-```
-
-Fn1 layer:
-
-```
--------------------------------------------------------------------------------------------
-|  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |  Delete   |
--------------------------------------------------------------------------------------------
-| TAB    |Home | Up | End  |PgUp |     |     |     |     |     |     |     |     | PrtSc  |
--------------------------------------------------------------------------------------------
-|  Ctrl   |Left |Down |Right |PgDn |    |     |     |     |     |     |     |      Enter  |
--------------------------------------------------------------------------------------------
-|    Shift    |     |     |     |     |     |     |     |     |     |     |  Shift  |     |
--------------------------------------------------------------------------------------------
-| Fn1   |  GUI  |  Alt  |   Space    | Space |   Space    |  Alt  |       |       | Ctrl  |
--------------------------------------------------------------------------------------------
-```
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
deleted file mode 100644
index d924278d3f..0000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017 Balz Guenat
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-# MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-# EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-# CONSOLE_ENABLE = no         # Console for debug(+400)
-# COMMAND_ENABLE = yes        # Commands for debug and configuration
-# NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-# BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-# MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-# AUDIO_ENABLE = no           # Audio output on port C6
-# UNICODE_ENABLE = no         # Unicode
-# BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-# RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-# SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
deleted file mode 100644
index acf01cd9a4..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
+++ /dev/null
@@ -1,419 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _TOUCHCURSOR 6
-#define _MOUSECURSOR 7
-#define _ADJUST 16
-
-// Keycodes
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-enum macro_keycodes {
-  KC_ALT_TAB,
-  KC_CMD_TAB,
-  KC_CTL_TAB,
-  KC_CMD_SLSH,
-  KC_AG_FIND,
-  KC_AG_AGAIN,
-  KC_AG_UNDO,
-  KC_AG_CUT,
-  KC_AG_COPY,
-  KC_AG_PASTE,
-  KC_AG_DESK_L,
-  KC_AG_DESK_R,
-  KC_AG_TAB_C,
-  KC_AG_TAB_N,
-  KC_AG_TAB_R,
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper
-#define GUI_SEM     GUI_T(KC_SCLN)              // Tap for Semicolon, hold for GUI
-#define ALT_QUO     ALT_T(KC_QUOT)              // Tap for Quote, hold for Alt
-// Requires KC_TRNS/_______ for the trigger key in the destination layer
-#define LT_TC       LT(_TOUCHCURSOR, KC_SPC)    // L-ayer T-ap T-ouch C-ursor
-#define LT_MC(kc)   LT(_MOUSECURSOR, kc)        // L-ayer T-ap M-ouse C-ursor
-#define ALT_TAB     M(KC_ALT_TAB)               // Macro for Alt-Tab
-#define CMD_TAB     M(KC_CMD_TAB)               // Macro for Cmd-Tab
-#define CTL_TAB     M(KC_CTL_TAB)               // Macro for Ctl-Tab
-#define CMD_SLSH    M(KC_CMD_SLSH)              // Macro for Cmd-Slash (personal shortcut to toggle iTerm2 visibility)
-#define AG_FIND     M(KC_AG_FIND)               // Macros for Cmd-[x] vs Ctrl-[x] based on current AG_NORM or AG_SWAP settings
-#define AG_AGAIN    M(KC_AG_AGAIN)
-#define AG_UNDO     M(KC_AG_UNDO)
-#define AG_CUT      M(KC_AG_CUT)
-#define AG_COPY     M(KC_AG_COPY)
-#define AG_PASTE    M(KC_AG_PASTE)
-#define AG_D_L      M(KC_AG_DESK_L)             // For Virtual Desktop Switching: Left, and
-#define AG_D_R      M(KC_AG_DESK_R)             //                                Right
-#define AG_T_C      M(KC_AG_TAB_C)              // For Chrome, etc. Tab Close,
-#define AG_T_N      M(KC_AG_TAB_N)              //                  Tab New, and
-#define AG_T_R      M(KC_AG_TAB_R)              //                  Tab Reopen Closed
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   Bksp      |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * | Ctrl/Esc |   A  |   S  | MC/D |   F  |   G  |   H  |   J  |   K  |   L  |GUI/; |   Alt/"    |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   Shift   |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Sft/Ent  |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |   Alt   |   GUI   |  Lower  |    TC/Space    |   TC/Space     |  Raise  |   Vol+  |  Play   |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-[_QWERTY] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    HPR_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    CTL_ESC ,   KC_A, KC_S,LT_MC(KC_D),    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, GUI_SEM,    ALT_QUO     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    KC_LSFT  ,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,    SFT_ENT    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    KC_LALT   ,   KC_LGUI     ,   LOWER ,      LT_TC     ,      LT_TC      ,  RAISE  ,     KC_VOLU     ,    KC_MPLY   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* Colemak
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |Hyper/Tab|   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |   Bksp      |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * | Ctrl/Esc |   A  |   R  | MC/S |   T  |   D  |   H  |   N  |   E  |   I  |   O  |    "       |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * | Shift     |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |  Sft/Ent  |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |   Alt   |   GUI   |  Lower  |    TC/Space    |   TC/Space     |  Raise  |   Vol+  |  Play   |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-[_COLEMAK] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    HPR_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,    KC_BSPC      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    CTL_ESC ,   KC_A, KC_R,LT_MC(KC_S),    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    KC_LSFT  ,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,    SFT_ENT    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    KC_LALT   ,   KC_LGUI     ,   LOWER ,      LT_TC     ,      LT_TC      ,  RAISE  ,     KC_VOLU     ,    KC_MPLY   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* Dvorak
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |Hyper/Tab|   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |   Bksp      |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * | Ctrl/Esc |   A  |   O  | MC/E |   U  |   I  |   D  |   H  |   T  |   N  |   S  |    /       |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * | Shift     |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |  Sft/Ent  |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |   Alt   |   GUI   |  Lower  |    TC/Space    |   TC/Space     |  Raise  |   Vol+  |  Play   |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-[_DVORAK] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    HPR_TAB,KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    CTL_ESC ,   KC_A,    KC_O,LT_MC(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,    SFT_ENT    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    KC_LALT   ,   KC_LGUI     ,   LOWER ,      LT_TC     ,      LT_TC      ,  RAISE  ,     KC_VOLU     ,    KC_MPLY   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* Lower
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |   ~     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   Bksp      |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * |   [      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |   "|"      |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   ]       |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |    \      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |  Brite  |         |         |                |                |         |   Vol-  |   Mute  |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-[_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_LBRC ,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,    KC_PIPE     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    KC_RBRC  ,  KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC,    KC_BSLS    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    BACKLIT   ,    _______    , _______ ,     _______    ,     _______     , _______ ,     KC_VOLD     ,    KC_MUTE   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* Raise
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |   0     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   Bksp      |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * |   $      |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |   "|"      |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   =       |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |    \      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |  Brite  |         |         |                |                |         |   Vol-  |   Mute  |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-[_RAISE] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    KC_0   ,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    KC_DLR  ,   KC_4,    KC_5,    KC_6,  KC_DOT, KC_PLUS,  KC_DOT,    KC_4,    KC_5,    KC_6, KC_ASTR,    KC_PIPE     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    KC_EQL   ,   KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_DOT,    KC_1,    KC_2,    KC_3, KC_SLSH,    KC_BSLS    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    BACKLIT   ,    _______    , _______ ,     _______    ,     _______     , _______ ,     KC_VOLD     ,    KC_MUTE   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * | AltTab  |CmdTab|CtlTab| GUI  |Shift |  ~   |Insert| Home |  Up  | End  | Bksp |             |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * |          | Alt  |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L|  Desk_R    |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |Tab_N |Tab_R |iTerm2|           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |         |         |         |                |                |         |         |         |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- *
- * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't
- * seem to work on Mac. Presumably they'll work under Windows.
- */
-
-[_TOUCHCURSOR] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    ALT_TAB,CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD,  KC_INS, KC_HOME,   KC_UP,  KC_END, KC_BSPC,    _______      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    _______ ,KC_LALT,  KC_SPC,  AG_T_C, AG_FIND,AG_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,  AG_D_L,    AG_D_R      ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    _______  ,AG_UNDO,  AG_CUT, AG_COPY,AG_PASTE,  KC_GRV, KC_PGDN,  KC_DEL,  AG_T_N,  AG_T_R,CMD_SLSH,    _______    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    _______   ,    _______    , _______ ,     _______    ,     _______     , _______ ,     _______     ,    _______   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* Mouse Layer
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |         |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |             |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * |          |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 |   BTN5     |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |         |         |         |                |                |         |         |         |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-
-[_MOUSECURSOR] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    _______,_______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2,    _______      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    _______ ,KC_ACL2, KC_BTN2, _______, KC_BTN1, KC_ACL1, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN4,    KC_BTN5     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    _______  ,_______, _______, _______, KC_BTN3, _______, KC_WH_D, KC_BTN1, _______, _______, KC_BTN3,    _______    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    _______   ,    _______    , _______ ,     _______    ,     _______     , _______ ,     _______     ,    _______   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* Plover layer (http://opensteno.org)
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |      #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |     #       |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * |         |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |     D       |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * | TogOut    |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |    Z      |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * | Exit    |    A    |    O    |                |                |    E    |    U    |         |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-
-[_PLOVER] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    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   ,     KC_C      ,   KC_V  ,     XXXXXXX    ,     XXXXXXX     ,   KC_N  ,      KC_M       ,    XXXXXXX   ),
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-
-/* Adjust (Lower + Raise)
- * ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
- * |         |      |      |      |      |      |      |      |      |      |      |    Del      |
- * |---------`------`------`------`------`------`------`------`------`------`------`-------------|
- * |          |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|            |
- * |----------`------`------`------`------`------`------`------`------`------`------`------------|
- * |           |      |      |      |      |     |       |      |      |      |      |           |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
- * |         |         |         |                |                |         |         |  Reset  |
- *  `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
- */
-[_ADJUST] = LAYOUT(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_DEL      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    _______ ,_______, _______, _______, _______, AG_NORM, AG_SWAP,  QWERTY, COLEMAK,  DVORAK,  PLOVER,    _______     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    _______  ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    _______   ,    _______    , _______ ,     _______    ,     _______     , _______ ,     _______     ,    QK_BOOT     )
-/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        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;
-}
-
-/*
- * Macro definition
- */
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    if (!eeconfig_is_enabled()) {
-      eeconfig_init();
-    }
-
-    bool use_cmd = true;    // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc.
-    // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in:
-    // quantum/quantum.c
-    if(keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1) {
-      use_cmd = false;      // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc.
-    }
-
-    switch (id) {
-      case KC_ALT_TAB:
-        if(use_cmd) { return (record->event.pressed ? MACRO( D(LALT),  D(TAB), END ) : MACRO( U(TAB), END )); }
-        else        { return (record->event.pressed ? MACRO( D(LGUI),  D(TAB), END ) : MACRO( U(TAB), END )); }
-      case KC_CMD_TAB:
-        if(use_cmd) { return (record->event.pressed ? MACRO( D(LGUI),  D(TAB), END ) : MACRO( U(TAB), END )); }
-        else        { return (record->event.pressed ? MACRO( D(LALT),  D(TAB), END ) : MACRO( U(TAB), END )); }
-
-      case KC_CTL_TAB:
-        return (record->event.pressed ? MACRO( D(LCTRL), D(TAB), END ) : MACRO( U(TAB), END ));
-      case KC_CMD_SLSH:
-        return (record->event.pressed ? MACRO( D(LGUI),  D(SLSH),END ) : MACRO( U(SLSH),END ));
-
-      case KC_AG_FIND:
-        return use_cmd ? MACRODOWN( D(LGUI), T(F), END ) : MACRODOWN( D(LCTRL), T(F), END );
-      case KC_AG_AGAIN:
-        return use_cmd ? MACRODOWN( D(LGUI), T(G), END ) : MACRODOWN( D(LCTRL), T(G), END );
-      case KC_AG_UNDO:
-        return use_cmd ? MACRODOWN( D(LGUI), T(Z), END ) : MACRODOWN( D(LCTRL), T(Z), END );
-      case KC_AG_CUT:
-        return use_cmd ? MACRODOWN( D(LGUI), T(X), END ) : MACRODOWN( D(LCTRL), T(X), END );
-      case KC_AG_COPY:
-        return use_cmd ? MACRODOWN( D(LGUI), T(C), END ) : MACRODOWN( D(LCTRL), T(C), END );
-      case KC_AG_PASTE:
-        return use_cmd ? MACRODOWN( D(LGUI), T(V), END ) : MACRODOWN( D(LCTRL), T(V), END );
-
-      case KC_AG_DESK_L:
-        return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(SCLN), END ) : MACRODOWN( D(LALT), D(LCTRL), T(SCLN), END );
-      case KC_AG_DESK_R:
-        return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(QUOT), END ) : MACRODOWN( D(LALT), D(LCTRL), T(QUOT), END );
-
-      case KC_AG_TAB_C:
-        return use_cmd ? MACRODOWN( D(LGUI),            T(W), END ) : MACRODOWN( D(LCTRL),            T(W), END );
-      case KC_AG_TAB_N:
-        return use_cmd ? MACRODOWN( D(LGUI),            T(T), END ) : MACRODOWN( D(LCTRL),            T(T), END );
-      case KC_AG_TAB_R:
-        return use_cmd ? MACRODOWN( D(LGUI), D(LSHIFT), T(T), END ) : MACRODOWN( D(LCTRL), D(LSHIFT), T(T), END );
-    }
-
-    return MACRO_NONE;
-}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md b/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md
deleted file mode 100644
index f781d55558..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md
+++ /dev/null
@@ -1,129 +0,0 @@
-jeebak's TV44 layout
-=======================
-NOTE: This is a port of jeebak's planck layout, for tv44.
-
-This WIP keymap attempts to minimize fingers straying away from the home row.
-To aid in this endeavor, when additional modifyer keys to switch layers are
-needed, they will be mapped to home row keys. The `keymap.c` file will contain
-the exact changes. The diagrams in this README shows the highlights of the
-changes from the default mappings.
-
-I also decided to change all calls to `persistent_default_layer_set()` to
-`default_layer_set()` since this is my personal perference.
-
-## Macros
-```
-#define ALT_TAB     M(KC_ALT_TAB)
-```
-
-## Base Layers (Qwerty/Colemak/Dvorak)
-These base layers are mostly the same as the default mappings. The interesting
-changes are shown below.
-
-- The `Ctrl/Esc`, will emit an `Escape` when tapped, and act as a `Control` key when held,
-- `GUI/;` as `;` and `GUI`,
-- `Alt/"` as `"` and `Alt`,
-- `Sft/Ent` as `Enter` and `Shift`, and
-- `Hyper/Tab` as `Tab` and `Hyper`
-
-A `TODO` item is to see if it can also act as a `CapsLock` when double-tapped.
-The arrow keys, which have been moved to the
-[TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been
-replaced with the Media keys as shown. The `MC/kc` key activates the
-`MouseCursor` layer when held, and emits the corresponding `kc` for its layer,
-when tapped.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
-  |Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   Bksp      |
-  |---------`------`------`------`------`------`------`------`------`------`------`-------------|
-  | Ctrl/Esc |   A  |   S  | MC/D |   F  |   G  |   H  |   J  |   K  |   L  |GUI/; |   Alt/"    |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   Shift   |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Sft/Ent  |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |   Alt   |   GUI   |  Lower  |    TC/Space    |   TC/Space     |  Raise  |   Vol+  |  Play   |
-   `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
-```
-
-## Lower Layer (Symbols and Function Keys)
-The symbols and functions keys are essentially the same as the default mapping.
-The most notable changes are that the symbol keys from the `RAISE` layer have
-been moved here. The remaining Media keys replace those that are now on the
-base layers. The `BACKLIT` key has also been moved here.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
-  |   ~     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   Bksp      |
-  |---------`------`------`------`------`------`------`------`------`------`------`-------------|
-  |   [      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |   "|"      |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   ]       |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |    \      |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |  Brite  |         |         |                |                |         |   Vol-  |   Mute  |
-   `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
-```
-
-## Raise Layer (Numbers and Arithmetic Operators)
-All of the numbers and arithmetic operators are available on this layer. Some
-keys are duplicated for the convenience of their positions. The `0` and `$`
-keys at the far left are for quick access to beginning and end of line in vim.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
-  |   0     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   Bksp      |
-  |---------`------`------`------`------`------`------`------`------`------`------`-------------|
-  |   $      |   4  |   5  |   6  |   .  |   +  |   .  |   4  |   5  |   6  |   *  |   "|"      |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |   =       |   7  |   8  |   9  |   0  |   -  |   .  |   1  |   2  |   3  |   /  |    \      |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |  Brite  |         |         |                |                |         |   Vol-  |   Mute  |
-   `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
-```
-
-## TouchCursor layer plus personal customizations
-[TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key
-as the modifier, with the `IJKL` home row keys representing the inverted-T of
-the arrow keys. All of the default TouchCursor keymappings for the right hand
-are represented below. My personalizations include all of the keys shown for
-the left hand. Having the `Alt` and `Shift` keys (as well as the `Control` key
-from the base layers) readily accessible from the home row allows quick word
-jumps and highlighting when used in conjunction with the arrow keys. The
-`Alt-Tab` macro is not only useful under Windows, but also under Mac when used
-with alternative switchers like [HyperSwitch](https://bahoom.com/hyperswitch).
-The `Cmd-Tab` and `Ctrl-Tab` sequences are duplicated for easy access while in
-this layer. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and `KC_AGAIN`
-keycodes do not seem to work. There are macros in place that'll "automatically"
-choose the correct version (`Cmd-Tab` vs. `Alt-Tab`, `Cmd-C` vs. `Ctrl-C`,
-etc.) depending on which layout you've currently selected (`AG_NORM` or
-`AG_SWAP`) in the `_ADJUST` layer. The `Desk_L` and `Desk_R` macros are what I
-use to switch between Virtual Desktops Left/Right. The `Tab_C`, `Tab_N` and
-`Tab_R` are for "Close Tab," "New Tab" and "Reopen Closed Tab" for apps such as
-Google Chrome.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
-  | AltTab  |CmdTab|CtlTab| GUI  |Shift |  ~   |Insert| Home |  Up  | End  | Bksp |             |
-  |---------`------`------`------`------`------`------`------`------`------`------`-------------|
-  |          | Alt  |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L|  Desk_R    |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |           | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |Tab_N |Tab_R |iTerm2|           |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |         |         |         |                |                |         |         |         |
-   `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
-```
-
-## Mouse Layer
-The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer.
-The `D` key (on QWERTY) is used to activate this layer. All 16 keycodes for the
-mouse from the `doc/keycode.txt` file are represented, and logically located,
-IMHO. The left and right click buttons are duplicated; on the right hand side,
-for a quick click here and there, and again on the left hand side for when the
-buttons need to be held for dragging things or highlighting text, thus allowing
-the right hand to be free to use the up/down/left/right actions.
-```
-  ,---------+------+------+------+------+------+------+------+------+------+------+-------------.
-  |         |      |ACCL0 |      |      |      |      |WHL_L |  Up  |WHL_R | BTN2 |             |
-  |---------`------`------`------`------`------`------`------`------`------`------`-------------|
-  |          |ACCL2 | BTN2 |      | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 |   BTN5     |
-  |----------`------`------`------`------`------`------`------`------`------`------`------------|
-  |           |      |      |      | BTN3 |      |WHL_Dn| BTN1 |      |      | BTN3 |           |
-  |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------|
-  |         |         |         |                |                |         |         |         |
-   `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------'
-```
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
deleted file mode 100644
index 93e7cd8bb7..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h b/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h
deleted file mode 100644
index e89a3ea125..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#ifdef BACKLIGHT_ENABLE
-    #define BACKLIGHT_PIN B2
-    #define BACKLIGHT_LEVELS 7
-#endif
-
-#define USB_MAX_POWER_CONSUMPTION 50
-
-#endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
deleted file mode 100644
index c484ee7308..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,188 +0,0 @@
-//Author: mike terhar
-#include QMK_KEYBOARD_H
-
-#ifdef BACKLIGHT_ENABLE
-  #include "backlight.h"
-#endif
-
-enum minivan_layers {
-  _QWERTY,
-  _NUMSYM,
-  _FKEYS,
-  _FKEYGRV,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  DYNKEY,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#define FKEYS LT(_FKEYS, KC_TAB)
-#define NUMSYM TT(_NUMSYM)
-#define FKEYGRV LT(_FKEYS, KC_GRV)
-#define MACSLEEP M(5)
-#define PLOVER M(6)
-#define LAYERRESET M(7)
-#define BACKLIT M(8)
-#define ADJUST M(9)
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = {
-  {FKEYS, KC_Q,   KC_W,   KC_E, KC_R,   KC_T,   KC_Y,   KC_U, KC_I,   KC_O,  KC_P,   KC_BSPC},
-  {KC_ESC, KC_A,   KC_S,   KC_D, KC_F,   KC_G,   KC_H,   KC_J, KC_K,   KC_L,  KC_SCLN,KC_QUOT},
-  {KC_LSFT,KC_Z,   KC_X,   KC_C, KC_V,   KC_B,   KC_N,   KC_M, KC_COMM,KC_DOT,KC_SLSH,SFT_T(KC_ENT) },
-  {KC_LCTL,KC_LALT,KC_LGUI, KC_SPC,XXXXXXX,XXXXXXX,XXXXXXX,NUMSYM,KC_LEFT,KC_DOWN,KC_UP ,KC_RIGHT}
-},
-[_NUMSYM] = {
-  {FKEYGRV,  KC_1,  KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,  _______},
-  {KC_DEL,KC_EXLM, KC_AT,  KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, ADJUST },
-  { _______,  KC_UNDS,KC_PLUS, KC_LCBR,KC_RCBR,KC_PIPE , KC_MINS,KC_EQL,KC_LBRC, KC_RBRC, KC_BSLS, _______},
-  {_______,_______,_______,_______,XXXXXXX,XXXXXXX,XXXXXXX,_______,    KC_HOME, KC_PGDN, KC_PGUP, KC_END}
-},
-[_FKEYS] ={
-  {_______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5, KC_F6, KC_F7,  KC_F8,  KC_F9,  KC_F10, _______},
-  {KC_DEL, KC_F11, KC_F12,  KC_F13,  KC_F14,  KC_F15, _______, _______,  _______,  MACSLEEP, DYN_REC_START1, DYN_REC_START2 },
-  {KC_CAPS,  _______, _______,  _______,  _______, _______, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,_______,DYN_REC_STOP},
-  {_______,_______,_______,LAYERRESET,XXXXXXX,XXXXXXX,XXXXXXX,LAYERQK_BOOT,  KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
-},
-[_PLOVER] = {
-  {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},
-  {LAYERRESET, XXXXXXX, KC_C,    KC_V,   XXXXXXX ,  XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX}
-},
-[_ADJUST] = {
- {_______ , QK_BOOT, _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_PSCR, KC_DEL },
- {_______ , _______, _______, _______, _______,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,  PLOVER, _______},
- {_______ , _______,  _______,  _______,   _______,  _______,   _______,  _______, _______, _______, _______, _______},
- {BACKLIT, _______, _______, LAYERRESET, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______}
-}
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]           = SONG(STARTUP_SOUND);
-float tone_qwerty[][2]            = SONG(QWERTY_SOUND);
-float tone_dyn_macro_rec[][2]     = SONG(DVORAK_SOUND);
-float tone_dyn_macro_play[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]            = SONG(PLOVER_SOUND);
-float tone_adjust[][2]            = SONG(PLOVER_GOODBYE_SOUND);
-float music_scale[][2]            = SONG(MUSIC_SCALE_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 5: // MACSLEEP
-            if (record->event.pressed) {
-              register_code(KC_RSFT);
-              register_code(KC_RCTL);
-              register_code(KC_PWR);
-              unregister_code(KC_PWR);
-              unregister_code(KC_RCTL);
-              unregister_code(KC_RSFT);
-            }
-        break;
-        case 6: // PLOVER
-              if (record->event.pressed) {
-              #ifdef AUDIO_ENABLE
-                stop_all_notes();
-                PLAY_SONG(tone_plover);
-              #endif
-              layer_off(_NUMSYM);
-              layer_off(_FKEYS);
-              layer_off(_ADJUST);
-              layer_on(_PLOVER);
-            }
-        break;
-        case 7: // LAYERRESET
-              if (record->event.pressed) {
-              #ifdef AUDIO_ENABLE
-                PLAY_SONG(tone_qwerty);
-              #endif
-              layer_off(_NUMSYM);
-              layer_off(_FKEYS);
-              layer_off(_PLOVER);
-              layer_off(_ADJUST);
-            }
-        break;
-        case 8: // BACKLIT
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-        case 9: // ADJUST
-          if(record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              stop_all_notes();
-              PLAY_SONG(tone_adjust);
-            #endif
-            layer_off(_NUMSYM);
-            layer_off(_FKEYS);
-            layer_off(_PLOVER);
-            layer_on(_ADJUST);
-          }
-      }
-    return MACRO_NONE;
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint16_t macro_kc = keycode;
-  if (keycode == FKEYS || keycode == ADJUST || keycode == FKEYGRV ){
-    macro_kc = DYN_REC_STOP;
-  }
-  if (!process_record_dynamic_macro(macro_kc, record)) {
-    return false;
-  }
-
-  return true;
-}
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-}
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-#endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md b/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md
deleted file mode 100644
index c86985f6cb..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Mike's Minivan
-
-- Arrow Layout (45key)
-- Dynamic Macros
-- Media Keys
-- Works with iPhone Camera Adapter
-
-## Layers
-
-Qwerty for letters and mods.
-
-Numsym for all numbers and symbols used in typing. Follows a similar approach to
-planck but puts both on the same layer eschewing the F-keys.  
-
-Fkeys layer is for the seldom used stuff like F-keys and some additional features
-such as dynamic macros, media keys, and a sleep shortcut for OS X.
-
-Adjust layer is tough to get to so it is only for keyboard configuration stuff.
-
-## Dynamic Macros
-
-Hold TAB key, then press ";" to record macro 1 and "'" to record macro 2.
-
-When you are done recording, press TAB again.
-
-For playback of macros, TAB+"," plays macro 1 and TAB+","plays macro 2.
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
deleted file mode 100644
index 0a249a3352..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singles/config.h b/keyboards/thevankeyboards/roadkit/keymaps/singles/config.h
deleted file mode 100644
index df06a26206..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singles/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
deleted file mode 100644
index 7920b4283d..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
+++ /dev/null
@@ -1,52 +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 _NP 0
-#define _L1 1
-
-// Macro name shortcuts
-#define NUMPAD M(_NP)
-#define LAYER1 M(_L1)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_NP] = LAYOUT_ortho_4x4( /* Numpad */
-    KC_KP_7, KC_KP_8,   KC_KP_9, KC_KP_PLUS, \
-    KC_KP_4, KC_KP_5,   KC_KP_6, KC_KP_MINUS, \
-    KC_KP_1, KC_KP_2,   KC_KP_3, KC_KP_ENTER, \
-    KC_KP_0, KC_KP_DOT, TG(_L1), KC_BSPC
-  ),
-  [_L1] = LAYOUT_ortho_4x4( /* LAYER 1 */
-    KC_NUM,  _______, _______,  KC_VOLU, \
-    _______, KC_UP,   _______,  KC_VOLD, \
-    KC_LEFT, KC_DOWN, KC_RIGHT, _______, \
-    _______, _______, _______,  _______
-  )
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case _L1:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_L1);
-          }
-          break;
-        case _NP:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_NP);
-          }
-          break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md
deleted file mode 100644
index 48ea4a8b35..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The singles keymap for roadkit
-
-This keymap has a base layer with numpad functionality, and then a second layer with some additional keys. The user is encouraged to develop their own keymap using this as a starting point.
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
deleted file mode 100644
index 93e7cd8bb7..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h
deleted file mode 100644
index 57468e122a..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#define TAPPING_TERM 175
-
-#ifdef BACKLIGHT_ENABLE
-    #define BACKLIGHT_PIN B5
-	#define BACKLIGHT_LEVELS 3
-    #define BACKLIGHT_ON_STATE 0
-#endif	
-	
-#endif
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c
deleted file mode 100644
index e5c14eec8d..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c
+++ /dev/null
@@ -1,234 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-#define _NP 0
-#define _L1 1
-#define _L2 2
-#define _L3 3
-
-// Macro name shortcuts
-#define NUMPAD M(_NP)
-#define LAYER1 M(_L1)
-#define LAYER2 M(_L2)
-#define LAYER3 M(_L3)
-
-void matrix_init_user(void) {
-	backlight_level(4);
-}
-
-
-
-//Tap Dance Declarations
-
-enum {
-
-  TD_EQUAL_NP = 0,
-  TD_KP_PLUS_L1,
-  TD_DOT_L2,
-  TD_0_L3
-
-};
-
-//Tap Dance Definitions
-
-
-	//TD equal to turn on layer NP
-void _td_equal_tg_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code(KC_EQUAL);
-  } else if (state->count == 2) {
-    backlight_set(3);
-	layer_on(_NP);
-	layer_off(_L1);
-	layer_off(_L2);
-	layer_off(_L3);
-  }
-}
-
-void _td_equal_tg_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code(KC_EQUAL);
-  }
-}
-
-
-	//TD kp plus to toggle layer 1
-void _td_kp_plus_tg_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code(KC_KP_PLUS);
-  } else if (state->count == 2) {
-//    layer_invert(_L1);
-    backlight_set(2);
-	layer_on(_L1);
-	layer_off(_L2);
-	layer_off(_L3);
-  }
-}
-
-void _td_kp_plus_tg_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code(KC_KP_PLUS);
-  }
-}
-
-
-	//TD dot to toggle layer 2
-void _td_dot_tg_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code(KC_DOT);
-  } else if (state->count == 2) {
-    backlight_set(1);
-	layer_on(_L2);
-	layer_off(_L1);
-	layer_off(_L3);
-  }
-}
-
-void _td_dot_tg_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code(KC_DOT);
-  }
-}
-
-	//TD 0 to toggle layer 3
-void _td_0_tg_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code(KC_0);
-  } else if (state->count == 2) {
-    backlight_set(0);
-	layer_on(_L3);
-	layer_off(_L1);
-	layer_off(_L2);
-  }
-}
-
-void _td_0_tg_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code(KC_0);
-  }
-}
-
-//TD Actions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_EQUAL_NP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, _td_equal_tg_finished, _td_equal_tg_reset),
-  [TD_KP_PLUS_L1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, _td_kp_plus_tg_finished, _td_kp_plus_tg_reset),
-  [TD_DOT_L2] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, _td_dot_tg_finished, _td_dot_tg_reset),
-  [TD_0_L3] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, _td_0_tg_finished, _td_0_tg_reset)
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Numberpad
-   * ,-----------------------.
-   * |  7  |  8  |  9  |  /  |
-   * |-----`-----`-----`-----|
-   * |  4  |  5  |  6  |  *  |
-   * |-----`-----`-----`-----|
-   * |  1  |  2  |  3  |  -  |
-   * |-----`-----`-----`-----|
-   * |  0  |  .  |  +  |  =  |
-   * `-----`-----`-----`-----'
-   * Tapdances:
-   * | L3  | L2  | L1  | NP  |
-   * `-----`-----`-----`-----'
-   */
-  [_NP] = LAYOUT_ortho_4x4( /* Numpad */
-    KC_7,        KC_8,          KC_9,              KC_SLASH, \
-    KC_4,        KC_5,          KC_6,              KC_KP_ASTERISK, \
-    KC_1,        KC_2,          KC_3,              KC_MINUS, \
-    TD(TD_0_L3), TD(TD_DOT_L2), TD(TD_KP_PLUS_L1), TD(TD_EQUAL_NP)
-  ),
-
-  /* L1
-   * ,-----------------------.
-   * | Esc |Bksp |Home |PgUp |
-   * |-----`-----`-----`-----|
-   * | Tab | Up  | End |PgDn |
-   * |-----`-----`-----`-----|
-   * |Left |Down |Right|Enter|
-   * |-----`-----`-----`-----|
-   * |  0  |  .  |  +  |  =  |
-   * `-----`-----`-----`-----'
-   */
-  [_L1] = LAYOUT_ortho_4x4( /* LAYER 1 */
-    KC_ESCAPE, KC_BSPACE, KC_HOME,  KC_PGUP, \
-    KC_TAB,    KC_UP,     KC_END,   KC_PGDOWN, \
-    KC_LEFT,   KC_DOWN,   KC_RIGHT, KC_KP_ENTER, \
-    _______,   _______,   _______,  _______
-  ),
-
-  /* L2
-   * ,-----------------------.
-   * |Sleep|LClik|RClik|VolUp|
-   * |-----`-----`-----`-----|
-   * |AltF4| F11 |WinTb|VolDn|
-   * |-----`-----`-----`-----|
-   * |PrvTk|Play |NxtTk|Mute |
-   * |-----`-----`-----`-----|
-   * |  0  |  .  |  +  |  =  |
-   * `-----`-----`-----`-----'
-   */
-  [_L2] = LAYOUT_ortho_4x4( /* LAYER 2 */
-    KC_SYSTEM_SLEEP,     KC_MS_BTN1,          KC_MS_BTN2,          KC_AUDIO_VOL_UP, \
-    LALT(KC_F4),         KC_F11,              LGUI(KC_TAB),        KC_AUDIO_VOL_DOWN, \
-    KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, \
-    _______,             _______,             _______,             _______
-  ),
-
-  /* L3 needs cut, copy, paste, undo, again (redo), find, calc, www back, www forward, F5
-   * ,-----------------------.
-   * |WBack|WHome|WFor | F5  |
-   * |-----`-----`-----`-----|
-   * |Calc |Undo |Redo |WSrch|
-   * |-----`-----`-----`-----|
-   * | Cut |Copy |Paste|Find |
-   * |-----`-----`-----`-----|
-   * |  0  |  .  |  +  |  =  |
-   * `-----`-----`-----`-----'
-   */
-  [_L3] = LAYOUT_ortho_4x4( /* LAYER 3 */
-    KC_SYSTEM_SLEEP,     KC_MS_BTN1,          KC_MS_BTN2,          KC_AUDIO_VOL_UP, \
-    LALT(KC_F4),         KC_F11,              LGUI(KC_TAB),        KC_AUDIO_VOL_DOWN, \
-    KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, \
-    _______,             _______,             _______,             _______
-  ),
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-const macro_t * action_get_macro(keyrecord_t * record, uint8_t id, uint8_t opt) {
-  switch (id) {
-  case _L3:
-    if (record->event.pressed) {
-      persistent_default_layer_set(1UL<<_L3);
-    }
-    break;
-  case _L2:
-    if (record->event.pressed) {
-      persistent_default_layer_set(1UL<<_L2);
-    }
-    break;
-  case _L1:
-    if (record->event.pressed) {
-      persistent_default_layer_set(1UL<<_L1);
-    }
-    break;
-  case _NP:
-    if (record->event.pressed) {
-      persistent_default_layer_set(1UL<<_NP);
-    }
-    break;
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md
deleted file mode 100644
index 48ea4a8b35..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The singles keymap for roadkit
-
-This keymap has a base layer with numpad functionality, and then a second layer with some additional keys. The user is encouraged to develop their own keymap using this as a starting point.
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
deleted file mode 100644
index 3f07fbafce..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dance functionality
-
diff --git a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h b/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h
deleted file mode 100644
index f1531eb345..0000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-/* enable/disable LEDs based on layout */
-#undef RGB_BACKLIGHT_USE_SPLIT_BACKSPACE
-#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 1
-
-#undef RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
-
-#undef RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 1
-
-#undef RGB_BACKLIGHT_USE_7U_SPACEBAR
-#define RGB_BACKLIGHT_USE_7U_SPACEBAR 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
-
diff --git a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c
deleted file mode 100644
index 2e342b497c..0000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-// Ryan MacLean's layout for Zeal60
-// Note that LGUI and RGUI are swapped with LALT and RALT respectively, for use with Macs
-// Also note that Control has replaced Caps Lock, and that pressing left or right shift once
-// will output left parenthese and right parenthese respectively. 
-#include QMK_KEYBOARD_H
-
-// [0,13] is either left key of split backspace (e.g. HHKB \| key) or 2U backspace
-// [1,13] is either backslash or ISO Enter
-// [2,12] is either ANSI Enter or key left of ISO Enter
-// [2,13] is right key of split backspace (e.g. HHKB `~ key)
-// [3,1] is right key of split left-shift (e.g ISO key)
-// [3,13] is right key of split right-shift (e.g. HHKB Fn key)
-
-
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. KC_LSFT KC_LALT KC_LGUI KC_4
-{
-  switch(id) {
-    case 0: // macOS screenshot to capture are to clipboard - this would trigger when you hit a key mapped as M(0)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), D(LCTL), D(LGUI), T(4), U(LSFT), U(LCTL), U(LGUI), W(255), END  ); // this sends the string 'hello' when the macro executes
-      }
-      break;
-    case 1: // macOS screenshot capture area to file - this would trigger when you hit a key mapped as M(1)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), D(LGUI), T(4), U(LSFT), U(LGUI), W(255), END  ); // this sends the string 'hello' when the macro executes
-      }
-      break;
-    case 2: // macOS screenshot to clipboard - this would trigger when you hit a key mapped as M(2)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), D(LCTL), D(LGUI), T(3), U(LSFT), U(LCTL), U(LGUI), W(255), END  ); // this sends the string 'hello' when the macro executes
-      }
-      break;
-    case 3: // macOS screenshot to file - this would trigger when you hit a key mapped as M(3)
-      if (record->event.pressed) {
-        return MACRO( D(LSFT), D(LGUI), T(3), U(LSFT), U(LGUI), W(255), END  ); // this sends the string 'hello' when the macro executes
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
-
-#define CADETL MT(KC_LSFT, KC_LBRC)
-#define CADETR MT(KC_RSFT, KC_RBRC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// Default layer
-[0] = {
-	{KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS},
-	{KC_TAB,  KC_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_LGUI, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_GRV},
-	{KC_LSPO, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, FN_MO13},
-	{KC_LCTL, KC_LALT, KC_LGUI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_SPC,  KC_NO,   KC_NO,   KC_RGUI, KC_RALT, KC_RCTL, FN_MO23}
-},
-
-// Fn1 Layer
-[1] = {
-	{KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS},
-	{KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL},
-	{KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS},
-	{KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS},
-	{KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
-},
-
-// Fn2 Layer
-[2] = {
-	{KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-	{KC_TRNS, M(2), M(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, M(1), M(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-	{KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-	{KC_TRNS, KC_TRNS, 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 Layer (zeal60 Configuration)
-[3] = {
-	{KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  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},
-	{KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-	{KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-	{KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
-}
-
-};
diff --git a/keyboards/xiudi/xd75/keymaps/adi/config.h b/keyboards/xiudi/xd75/keymaps/adi/config.h
deleted file mode 100644
index 08bed9ccb9..0000000000
--- a/keyboards/xiudi/xd75/keymaps/adi/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Disable backlight
-#undef BACKLIGHT_ENABLE
diff --git a/keyboards/xiudi/xd75/keymaps/adi/keymap.c b/keyboards/xiudi/xd75/keymaps/adi/keymap.c
deleted file mode 100644
index 93bc5a2ccd..0000000000
--- a/keyboards/xiudi/xd75/keymaps/adi/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Fillers to make layering more clear
-#define ___T___ KC_TRNS
-
-// Layer shorthand
-#define _QW 0
-#define _LW 1
-#define _RS 2
-#define _FN 3
-#define _ENTFN 4
-#define _MEDIA 5
-#define _MOUSE 6
-
-#define M_BACK 0
-#define M_FWRD 1
-#define M_PTAB 2
-#define M_NTAB 3
-#define M_ZOUT 4
-#define M_ZOIN 5
-#define M_ENTR 6
-#define M_SCRN 7
-#define M_NSPC 8
-#define M_PSPC 9
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  KC_GRAVE,KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_INSERT,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    LT(_MOUSE, KC_SCLN), LT(_MEDIA, KC_QUOT), LT(_ENTFN, KC_ENT),  LT(_ENTFN, KC_ENT), KC_PGUP,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
-  KC_LCTL, MO(_FN), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), LT(_ENTFN, KC_ENT), KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
-/* LOWERED
- */
- 
- [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
- ),
-
-/* RAISED
- */
- 
- [_RS] = LAYOUT_ortho_5x15( /* RAISED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
- ),
- 
-/* FUNCTION
- */
- 
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
-  KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
-  KC_CAPS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______,
-  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_PGUP, KC_WH_D,
-  _______  , _______, AG_SWAP, AG_NORM, _______, KC_BTN1, KC_BTN1, _______, AG_NORM, AG_SWAP, _______, _______, KC_HOME, KC_PGDN, KC_END
- ),
-
- [_ENTFN] = LAYOUT_ortho_5x15( /* Enter FN */
-  _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
-  _______, M(M_PTAB), M(M_NTAB), M(M_PSPC), M(M_NSPC),  _______,  _______,  _______,  _______,  M(M_ZOUT), M(M_ZOIN),  _______,  _______,  _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______,
-  _______, M(M_BACK),  M(M_FWRD), _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______, _______,
-  _______  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_MEDIA] = LAYOUT_ortho_5x15( /* Media */
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_VOLU, _______, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, _______, _______, _______, _______, _______,
-  _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_MOUSE] = LAYOUT_ortho_5x15( /* Mouse */
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-  keyevent_t event = record->event;
-
-  if (!eeconfig_is_enabled()) {
-    eeconfig_init();
-  }
-  bool use_cmd = true;    // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc.
-  // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in:
-  // quantum/quantum.c
-  if(keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1) {
-    use_cmd = false;      // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc.
-  }
-    switch(id) {
-      case M_BACK:
-          /* Command + [ or previous page */
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), T(LBRC), U(LGUI), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LALT), T(LEFT), U(LALT), END ) : MACRO(END));
-          }
-      case M_FWRD:
-          /* Command + ] or next page */
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), T(RBRC), U(LGUI), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LALT), T(RIGHT), U(LALT), END ) : MACRO(END));
-          }
-      case M_PTAB:
-          /* Command + { or prev tab. */
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), D(RSFT), T(LBRC), U(RSFT), U(LGUI), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LCTRL), D(RSFT), T(TAB), U(RSFT), U(LCTRL), END ) : MACRO(END));
-          }
-      case M_NTAB:
-          /* Command + } or next tab*/
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), D(RSFT), T(RBRC), U(RSFT), U(LGUI), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LCTRL), T(TAB), U(LCTRL), END ) : MACRO(END));
-          }
-      case M_ZOUT:
-          /* Command + - or Ctrl + -*/
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), T(MINS), U(LGUI), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LCTRL), T(MINS), U(LCTRL), END ) : MACRO(END));
-          }
-          break;
-      case M_ZOIN:
-          /* Command + = or Ctrl + =*/
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), T(EQL), U(LGUI), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LCTRL), T(EQL), U(LCTRL), END ) : MACRO(END));
-          }
-          break;
-      case M_ENTR:
-          /* Command + Enter or Ctrl + Enter*/
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), T(ENT), U(LGUI), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LCTRL), T(ENT), U(LCTRL), END ) : MACRO(END));
-          }
-      case M_SCRN:
-          /* Command + Enter or Ctrl + Enter*/
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LGUI), D(LCTRL), D(LSFT), T(4), U(LSFT), U(LGUI), U(LCTRL), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( T(PSCR) ) : MACRO(END));
-          }
-      case M_NSPC:
-          /* Next space / desktop */
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LCTRL), T(RIGHT), U(LCTRL), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LGUI), T(RIGHT), U(LGUI), END ) : MACRO(END));
-          }
-          break;
-      case M_PSPC:
-          /* Previous space / desktop */
-          if (use_cmd) {
-              return (event.pressed ? MACRO( D(LCTRL), T(LEFT), U(LCTRL), END ) : MACRO(END));
-          } else {
-              return (event.pressed ? MACRO( D(LGUI), T(LEFT), U(LGUI), END ) : MACRO(END));
-          }
-        default:
-            break;
-    }
-  return MACRO_NONE;
-};
diff --git a/keyboards/xiudi/xd75/keymaps/adi/readme.md b/keyboards/xiudi/xd75/keymaps/adi/readme.md
deleted file mode 100644
index 0d481fa535..0000000000
--- a/keyboards/xiudi/xd75/keymaps/adi/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Adi's XD75re Keymap
-
-This is my own (@adiron) keymap. It was originally made for the Planck. Since then a modified layout has expanded to encompass the XD75re as well, which I mostly use.
-
-Below is a summary of the important functions in the keymap. For more, consult the keymap file.
-
-## Multi-use keys
-
-Enter (thumb key) - HJKL become left, down, up, right (VIM movement keys). Q and W become previous and next tab, E and R switch spaces in macOS, A and Z go back and and forward in the browser.
-
-Semicolon - VIM movement keys become mouse. U left click. I right click.
-
-Quote key - JKL are back, pause/play and forward. AZ are volume up and down, Q and W are brightness down and up.
-
-## Misc
-
-Lower + Quote - a Hebrew maqaf (־) in macOS
-
-## AG swap
-
-Macros refer to AG_SWAP to check whether to send the macOS or the Windows shortcut. Very useful to me since I alternate between the two.
diff --git a/keyboards/xiudi/xd75/keymaps/adi/rules.mk b/keyboards/xiudi/xd75/keymaps/adi/rules.mk
deleted file mode 100644
index a0c4fc9678..0000000000
--- a/keyboards/xiudi/xd75/keymaps/adi/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style/config.h b/keyboards/xiudi/xd75/keymaps/atomic_style/config.h
deleted file mode 100644
index a72596783d..0000000000
--- a/keyboards/xiudi/xd75/keymaps/atomic_style/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
deleted file mode 100644
index 004bd12da9..0000000000
--- a/keyboards/xiudi/xd75/keymaps/atomic_style/keymap.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Fillers to make layering more clear
-#define ___T___ KC_TRNS
-
-// Layer shorthand
-#define _QW 0
-#define _CM 1
-#define _DV 2
-#define _LW 3
-#define _RS 4
-#define _FN 5
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY - MIT ENHANCED / GRID COMPATIBLE
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | \      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | ESC    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | XXXXXX . ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | XXXXXX . RSHIFT | UP     | PG DN  |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | BRITE  | LCTRL  | LALT   | LGUI   | RAISE  | XXXXXX . SPACE  | LOWER  | RGUI   | RALT   | RCTRL  | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-	
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
-/* COLEMAK - MIT ENHANCED / GRID COMPATIBLE
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | F      | P      | G      | J      | L      | U      | Y      | ;      | [      | ]      | \      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | ESC    | A      | R      | S      | T      | D      | H      | N      | E      | I      | O      | '      | XXXXXX . ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | K      | M      | ,      | .      | /      | XXXXXX . RSHIFT | UP     | PG DN  |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | BRITE  | LCTRL  | LALT   | LGUI   | RAISE  | XXXXXX . SPACE  | LOWER  | RGUI   | RALT   | RCTRL  | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-	
- [_CM] = LAYOUT_ortho_5x15( /* COLEMAK */
-  KC_GRV,  KC_1,    KC_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_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
- ),
-	
-/* DVORAK - MIT ENHANCED / GRID COMPATIBLE
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | '      | ,      | .      | P      | Y      | F      | G      | C      | R      | L      | [      | ]      | \      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | ESC    | A      | O      | E      | U      | I      | D      | H      | T      | N      | S      | /      | XXXXXX . ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | LSHIFT | ;      | Q      | J      | K      | X      | B      | M      | W      | V      | Z      | XXXXXX . RSHIFT | UP     | PG DN  |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | BRITE  | LCTRL  | LALT   | LGUI   | RAISE  | XXXXXX . SPACE  | LOWER  | RGUI   | RALT   | RCTRL  | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_DV] = LAYOUT_ortho_5x15( /* DVORAK */
-  KC_GRV,  KC_1,    KC_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_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
-/* LOWERED
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      |        |        |        | INS    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | _      | +      | {      | }      | |      | XXXXXX .        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |        | XXXXXX .        |        |        |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        | XXXXXX .        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* RAISED
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |        |        | INS    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | -      | =      | [      | ]      | \      | XXXXXX .        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |        | XXXXXX .        |        |        |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        | XXXXXX .        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_RS] = LAYOUT_ortho_5x15( /* RAISED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- 
-/* FUNCTION
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | NUM LK | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | SCR LK | F13    | F14    | F15    | F16    | F17    | F18    | F19    | F20    | F21    | F22    | F23    | F24    | PAUSE  | PR SCR |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT   | VOL+   | VOL-   | PLAY   |        | XXXXXX .        | WHEEL+ |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | RGB TG | RGB MD | RGB HI | RGB HD | RGB SI | RGB SD | RGB VI | RGB VD | BL TOG | BL INC | BL DEC | XXXXXX .        | MOUS U | WHEEL- |
- * |--------+--------+--------+--------+--------+-- 2u -----------+--------+--------+--------+--------+-----------------+--------+--------|
- * | QK_BOOT  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
-  KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
-  KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
-  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D,
-  QK_BOOT, _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
- )
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style/readme.md b/keyboards/xiudi/xd75/keymaps/atomic_style/readme.md
deleted file mode 100644
index d53c0f34a8..0000000000
--- a/keyboards/xiudi/xd75/keymaps/atomic_style/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for xd75
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style/rules.mk b/keyboards/xiudi/xd75/keymaps/atomic_style/rules.mk
deleted file mode 100644
index 52a8f38d45..0000000000
--- a/keyboards/xiudi/xd75/keymaps/atomic_style/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/keyboards/xiudi/xd75/keymaps/cbbrowne/config.h b/keyboards/xiudi/xd75/keymaps/cbbrowne/config.h
deleted file mode 100644
index 0ff61e1f42..0000000000
--- a/keyboards/xiudi/xd75/keymaps/cbbrowne/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides here
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif
-#ifndef NO_PRINT
-#define NO_PRINT
-#endif
-
-#define LEADER_TIMEOUT 300
-#define BACKLIGHT_BREATHING
-
-/* cbbrowne user configuration */
-
-#define randadd 53
-#define randmul 181
-#define randmod 167
diff --git a/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c b/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
deleted file mode 100644
index de90a83484..0000000000
--- a/keyboards/xiudi/xd75/keymaps/cbbrowne/keymap.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Copyright 2017 Christopher B Browne
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-/* Fillers to make layering more clear */
-#define ___T___ KC_TRNS
-
-/* Layer shorthand */
-
-enum layers {
-  _QWERTY = 0,  /* Qwerty mapping */
-  _LOWER, /* Lower layer, where top line has symbols !@#$%^&*() */
-  _RAISE, /* Raised layer, where top line has digits 1234567890 */
-  _ADJUST, /* Special Adjust layer coming via tri-placement */
-  _FUNCTION /* Function key layer */
-};
-
-
-/* Macros need to be uniquely identified; using an enum to do this
-   automatically
- */
-
-enum macro_id {
-  M_LED = 0,
-  M_USERNAME,
-  M_RANDDIGIT,
-  M_RANDLETTER,
-  M_VERSION,
-  MACRO_UPPER,
-  MACRO_LOWER,
-};
-
-/* I want some short forms for keycodes so that they fit into
-   limited-width cells */
-
-#define M_LOWER M(MACRO_LOWER)
-#define M_UPPER M(MACRO_UPPER)
-#define ROT_LED M(M_LED)   /* Rotate LED */
-#define QWERTY DF(_QWERTY)   /* Switch to QWERTY layout */
-#define QCENT2 DF(_QCENT2)   /* Switch to QWERTY-with-centre layout */
-#define USERNAME M(M_USERNAME) /* shortcut for username */
-#define RANDDIG M(M_RANDDIGIT)
-#define RANDALP M(M_RANDLETTER)
-#define CTLENTER MT(MOD_RCTL, KC_ENT)
-#define SHIFTQUOTE MT(MOD_RSFT, KC_QUOT)
-#define ALTRIGHT MT(MOD_LALT, KC_RGHT)
-#define MVERSION M(M_VERSION)
-#define ALTSLASH LALT(KC_SLSH)
-#define FUNCTION MO(_FUNCTION)
-#define MRAISE MO(_RAISE)
-#define MLOWER MO(_LOWER)
-#define ALTPLUS ALT_T(KC_PLUS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY - MIT ENHANCED / GRID COMPATIBLE
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | \      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | ESC    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | XXXXXX . ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | XXXXXX . RSHIFT | UP     | PG DN  |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | BRITE  | LCTRL  | LALT   | LGUI   | RAISE  | XXXXXX . SPACE  | LOWER  | RGUI   | RALT   | RCTRL  | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  /* layout for centred keypad + qwerty...
-
-|ESC| 1 | 2 | 3 | 4 | 5 | ? | ? | ? | ? | 6 | 7 | 8 | 9 | 0 |
-|TAB| q | w | e | r | t | ? | ? | ? | ? | y | u | i | o | p |
-|CTL| a | s | d | f | g | ? | ? | ? | ? | h | j | k | l | ; |
-|SHF| z | x | c | v | b | ? | ? | ? | ? | n | m | , | . | / |
-|ALT|LED|   |   |   |   |   |   |   |   |   |   |   |   |   |
-
-
-keys needing to be assigned:
-51 - KC_TAB - tab
-   - ROT_LED - rotate LED
-15 - KC_LALT - Left ALT
-53,55 - M_RAISE - switch to RAISE layer
-5b - M_LOWER - switch to LOWER layer
-56,59,5a   - KC_SPC - space
-5c - KC_LEFT - famous arrows
-5d - KC_DOWN - famous arrows
-5e - KC_UP - famous arrows
-5f - KC_RIGHT - famous arrows
-3f - KC_ENT - enter
-   - KC_GRV - leftwards quote
-4f - KC_QUOT - rightwards quote
-1f - KC_BSPC - backspace
-11 - KC_ESC
-19 - KC_GRV - ` - raised
-19 - KC_TILD - ~ - lowered
-
-  */
-
-[_QWERTY] = LAYOUT_ortho_5x15( /* QWERTY, with keypad in the centre */
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_EQL, KC_MINS, KC_EQL,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC ,
-      KC_LALT, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_7,    KC_8,   KC_EQL,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, ALTPLUS ,
-      KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_LBRC, KC_RBRC,KC_MINS, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, CTLENTER ,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_PGUP, KC_EQL,   KC_BSLS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SHIFTQUOTE ,
-       KC_TAB,  FUNCTION, MRAISE,  FUNCTION, MRAISE, KC_SPC,KC_PGDN,  KC_MINS, KC_SPC, KC_SPC,  MLOWER, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* LOWER
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      |        |        |        | INS    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | _      | +      | {      | }      | |      | XXXXXX .        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |        | XXXXXX .        |        |        |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        | XXXXXX .        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-[_LOWER] = LAYOUT_ortho_5x15( /* LOWERED */
-    ___T___, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  _______, _______, KC_TILD,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11 ,
-    ___T___, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_INS  ,
-    ___T___, 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,  _______, _______, _______, _______, _______, ___T___, ___T___, _______ ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* RAISED
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |        |        | INS    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | -      | =      | [      | ]      | \      | XXXXXX .        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |        | XXXXXX .        |        |        |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        | XXXXXX .        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-[_RAISE] = LAYOUT_ortho_5x15 ( /* RAISED */
-   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,  MVERSION, _______, KC_GRV,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___ ,
-   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   USERNAME, _______, KC_7,    KC_8,    KC_LCBR, KC_RCBR,    _______, _______, KC_INS   ,
-   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   RANDDIG, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___ ,
-   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RANDALP, _______, _______, _______, _______, ___T___, ___T___, _______, _______  ,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* FUNCTION
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | NUM LK | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | SCR LK | F13    | F14    | F15    | F16    | F17    | F18    | F19    | F20    | F21    | F22    | F23    | F24    | PAUSE  | PR SCR |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT   | VOL+   | VOL-   | PLAY   |        | XXXXXX |        | WHEEL+ |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | RGB TG | RGB MD | RGB HI | RGB HD | RGB SI | RGB SD | RGB VI | RGB VD | BL TOG | BL INC | BL DEC | XXXXXX |        | MOUS U | WHEEL- |
- * |--------+--------+--------+--------+--------+-- 2u -----------+--------+--------+--------+--------+-----------------+--------+--------|
- * | QK_BOOT  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-[_FUNCTION] = LAYOUT_ortho_5x15( /* FUNCTION */
-   KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, QK_BOOT,
-   KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  ,
-   KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  ,
-   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D  ,
-   QK_BOOT, _______, DF(_QWERTY), DF(_QWERTY), DF(_QWERTY), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
- )
-};
-
-/* This bit of logic seeds a wee linear congruential random number generator */
-/* lots of prime numbers everywhere... */
-static uint16_t random_value = 157;
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  uint8_t clockbyte=0;
-  clockbyte = TCNT1 % 256;
-  uint8_t rval;
-  /* MACRODOWN only works in this function */
-  switch(id) {
-  case 0:
-    if (record->event.pressed) {
-      register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-      backlight_step();
-#endif
-    } else {
-      unregister_code(KC_RSFT);
-    }
-    break;
-  case M_USERNAME:
-    if (record->event.pressed) {
-      SEND_STRING("cbbrowne");
-    }
-    break;
-  case M_VERSION:
-    if (record->event.pressed) {
-      SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP);
-    }
-    break;
-  case M_RANDDIGIT:
-    /* Generate, based on random number generator, a keystroke for
-       a numeric digit chosen at random */
-    random_value = ((random_value + randadd) * randmul) % randmod;
-    if (record->event.pressed) {
-      /* Here, we mix the LCRNG with low bits from one of the system
-         clocks via XOR in the theory that this may be more random
-         than either separately */
-      rval = (random_value ^ clockbyte) % 10;
-      /* Note that KC_1 thru KC_0 are a contiguous range */
-      register_code (KC_1 + rval);
-      unregister_code (KC_1 + rval);
-    }
-    break;
-  case M_RANDLETTER:
-    /* Generate, based on random number generator, a keystroke for
-       a letter chosen at random */
-    /* Here, we mix the LCRNG with low bits from one of the system
-       clocks via XOR in the theory that this may be more random
-       than either separately */
-    random_value = ((random_value + randadd) * randmul) % randmod;
-    if (record->event.pressed) {
-      rval = (random_value ^ clockbyte) % 26;
-      register_code (KC_A + rval);
-      unregister_code (KC_A + rval);
-    }
-    break;
-  case MACRO_UPPER:
-    if (record->event.pressed)
-      {
-	layer_on(_RAISE);
-#ifdef BACKLIGHT_ENABLE
-	breathing_period_set(2);
-	breathing_pulse();
-#endif
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    else
-      {
-	layer_off(_RAISE);
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    break;
-  case MACRO_LOWER:
-    if (record->event.pressed)
-      {
-	layer_on(_LOWER);
-#ifdef BACKLIGHT_ENABLE
-	breathing_period_set(2);
-	breathing_pulse();
-#endif
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    else
-      {
-	layer_off(_LOWER);
-	update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-    break;
-  }
-  return MACRO_NONE;
-};
-
-void matrix_init_user(void) {
-  rgblight_enable();
-  rgblight_mode(1);
-  rgblight_sethsv(325,255,255);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch(get_highest_layer(state)) {
-  case _QWERTY:
-    rgblight_sethsv_white();
-    break;
-  case _LOWER:
-    rgblight_sethsv_blue();
-    break;
-  case _RAISE:
-    rgblight_sethsv_green();
-    break;
-  case _ADJUST:
-    rgblight_sethsv_orange();
-    break;
-  case _FUNCTION:
-    rgblight_sethsv_red();
-    break;
-  default:
-    rgblight_sethsv(325,255,255);
-    break;
-  }
-  return state;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/cbbrowne/readme.md b/keyboards/xiudi/xd75/keymaps/cbbrowne/readme.md
deleted file mode 100644
index f2a1306eed..0000000000
--- a/keyboards/xiudi/xd75/keymaps/cbbrowne/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-cbbrowne custom keyboard
-==============================
-
-Due to cbbrowne@acm.org
-Christopher Browne
-
-Much of this is copied from my Planck keymap...
-
-1.  TODO
---------------------------------------------------
-
- * Set up keypad in the middle of the screen?
- * Or perhaps I should set up a layer for that?
- * Need the Random, version, my name keys
- * Almost certainly I want shift/control/alt on the right side,
-   superimposed on whatever is at the rightmost end
- * Need a good place for RESET
- * Definitely want the keyboard to "breathe"
- * Perhaps nice to have some programming constructs as in jeremy-dev
-   - It had C operators such as /=, *=, -=, +=, ...
- * Should I have some tmux commands like in mollat?
- * How about adding some emacs commands?
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/cbbrowne/rules.mk b/keyboards/xiudi/xd75/keymaps/cbbrowne/rules.mk
deleted file mode 100644
index 9b7d553c95..0000000000
--- a/keyboards/xiudi/xd75/keymaps/cbbrowne/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/xiudi/xd75/keymaps/emilyh/config.h b/keyboards/xiudi/xd75/keymaps/emilyh/config.h
deleted file mode 100644
index a72596783d..0000000000
--- a/keyboards/xiudi/xd75/keymaps/emilyh/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c b/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
deleted file mode 100644
index e325dbd664..0000000000
--- a/keyboards/xiudi/xd75/keymaps/emilyh/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "backlight.h"
-
-// Fillers to make layering more clear
-#define ___T___ KC_TRNS
-
-// Layer shorthand
-#define _QW 0
-#define _CM 1
-#define _DV 2
-#define _LW 3
-#define _RS 4
-#define _FN 5
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY - MIT ENHANCED / GRID COMPATIBLE
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | \      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | ESC    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | XXXXXX . ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | XXXXXX . RSHIFT | UP     | PG DN  |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | BRITE  | LCTRL  | LALT   | LGUI   | RAISE  | XXXXXX . SPACE  | LOWER  | RGUI   | RALT   | RCTRL  | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-	
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,  KC_PSLS, KC_PAST, KC_PPLS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 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_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_ENT,  KC_P1,   KC_P2,   KC_P3,
-  KC_LCTL, M(0),    KC_LGUI, KC_LALT, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_SLSH, KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,   KC_PDOT, KC_PENT
- ),
-
-/* COLEMAK - MIT ENHANCED / GRID COMPATIBLE
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | F      | P      | G      | J      | L      | U      | Y      | ;      | [      | ]      | \      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | ESC    | A      | R      | S      | T      | D      | H      | N      | E      | I      | O      | '      | XXXXXX . ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | K      | M      | ,      | .      | /      | XXXXXX . RSHIFT | UP     | PG DN  |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | BRITE  | LCTRL  | LALT   | LGUI   | RAISE  | XXXXXX . SPACE  | LOWER  | RGUI   | RALT   | RCTRL  | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-	
- [_CM] = LAYOUT_ortho_5x15( /* COLEMAK */
-  KC_GRV,  KC_1,    KC_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_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
- ),
-	
-/* DVORAK - MIT ENHANCED / GRID COMPATIBLE
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | '      | ,      | .      | P      | Y      | F      | G      | C      | R      | L      | [      | ]      | \      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | ESC    | A      | O      | E      | U      | I      | D      | H      | T      | N      | S      | /      | XXXXXX . ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | LSHIFT | ;      | Q      | J      | K      | X      | B      | M      | W      | V      | Z      | XXXXXX . RSHIFT | UP     | PG DN  |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | BRITE  | LCTRL  | LALT   | LGUI   | RAISE  | XXXXXX . SPACE  | LOWER  | RGUI   | RALT   | RCTRL  | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_DV] = LAYOUT_ortho_5x15( /* DVORAK */
-  KC_GRV,  KC_1,    KC_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_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
-  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
-/* LOWERED
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      |        |        |        | INS    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | _      | +      | {      | }      | |      | XXXXXX .        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |        | XXXXXX .        |        |        |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        | XXXXXX .        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS,
-  QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* RAISED
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |        |        | INS    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | -      | =      | [      | ]      | \      | XXXXXX .        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |        | XXXXXX .        |        |        |
- * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        | XXXXXX .        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_RS] = LAYOUT_ortho_5x15( /* RAISED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- 
-/* FUNCTION
- * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | NUM LK | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | SCR LK | F13    | F14    | F15    | F16    | F17    | F18    | F19    | F20    | F21    | F22    | F23    | F24    | PAUSE  | PR SCR |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT   | VOL+   | VOL-   | PLAY   |        | XXXXXX .        | WHEEL+ |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
- * | RGB TG | RGB MD | RGB HI | RGB HD | RGB SI | RGB SD | RGB VI | RGB VD | BL TOG | BL INC | BL DEC | XXXXXX .        | MOUS U | WHEEL- |
- * |--------+--------+--------+--------+--------+-- 2u -----------+--------+--------+--------+--------+-----------------+--------+--------|
- * | QK_BOOT  |        | QWERTY | COLEMK | DVORAK | XXXXXX . MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
-  KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
-  KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
-  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D,
-  QK_BOOT, _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
- )
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/xiudi/xd75/keymaps/emilyh/readme.md b/keyboards/xiudi/xd75/keymaps/emilyh/readme.md
deleted file mode 100644
index 743aae5b3c..0000000000
--- a/keyboards/xiudi/xd75/keymaps/emilyh/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Modified keymap for xd75 with numpad on right
diff --git a/keyboards/xiudi/xd75/keymaps/emilyh/rules.mk b/keyboards/xiudi/xd75/keymaps/emilyh/rules.mk
deleted file mode 100644
index 52a8f38d45..0000000000
--- a/keyboards/xiudi/xd75/keymaps/emilyh/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

From d5b908186461814cfc999fd5878d5d1ed5df2370 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 13 Oct 2022 00:13:16 -0700
Subject: [PATCH 626/959] Keychron Q3 Layout Touch-Up (#18696)

---
 keyboards/keychron/q3/ansi/info.json                      | 2 +-
 keyboards/keychron/q3/ansi/keymaps/default/keymap.c       | 8 ++++----
 keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c      | 8 ++++----
 keyboards/keychron/q3/ansi/keymaps/via/keymap.c           | 8 ++++----
 keyboards/keychron/q3/ansi_encoder/info.json              | 2 +-
 .../keychron/q3/ansi_encoder/keymaps/default/keymap.c     | 8 ++++----
 .../keychron/q3/ansi_encoder/keymaps/keychron/keymap.c    | 8 ++++----
 keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c   | 8 ++++----
 keyboards/keychron/q3/iso/info.json                       | 2 +-
 keyboards/keychron/q3/iso/keymaps/default/keymap.c        | 8 ++++----
 keyboards/keychron/q3/iso/keymaps/keychron/keymap.c       | 8 ++++----
 keyboards/keychron/q3/iso/keymaps/via/keymap.c            | 8 ++++----
 keyboards/keychron/q3/iso_encoder/info.json               | 2 +-
 .../keychron/q3/iso_encoder/keymaps/default/keymap.c      | 8 ++++----
 .../keychron/q3/iso_encoder/keymaps/keychron/keymap.c     | 8 ++++----
 keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c    | 8 ++++----
 keyboards/keychron/q3/jis/info.json                       | 4 ++--
 keyboards/keychron/q3/jis_encoder/info.json               | 2 +-
 18 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json
index 83be45fc23..de2b72cd7b 100644
--- a/keyboards/keychron/q3/ansi/info.json
+++ b/keyboards/keychron/q3/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "layouts": {
-        "LAYOUT_ansi_87": {
+        "LAYOUT_tkl_ansi": {
             "layout": [
                 {"matrix":[0, 0], "x":0, "y":0},
                 {"matrix":[0, 1], "x":2, "y":0},
diff --git a/keyboards/keychron/q3/ansi/keymaps/default/keymap.c b/keyboards/keychron/q3/ansi/keymaps/default/keymap.c
index a2cad2d8c9..3837a59fad 100644
--- a/keyboards/keychron/q3/ansi/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/ansi/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_87(
+    [MAC_BASE] = LAYOUT_tkl_ansi(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_87(
+    [MAC_FN] = LAYOUT_tkl_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,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_87(
+    [WIN_BASE] = 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,  _______,  RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_87(
+    [WIN_FN] = LAYOUT_tkl_ansi(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c
index ee5b11e324..32a9d010ea 100644
--- a/keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/ansi/keymaps/keychron/keymap.c
@@ -25,7 +25,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_87(
+    [MAC_BASE] = LAYOUT_tkl_ansi(
         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_SNAP,  KC_SIRI,  RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_87(
+    [MAC_FN] = LAYOUT_tkl_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,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_87(
+    [WIN_BASE] = 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_CRTA,  RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_87(
+    [WIN_FN] = LAYOUT_tkl_ansi(
         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/ansi/keymaps/via/keymap.c b/keyboards/keychron/q3/ansi/keymaps/via/keymap.c
index a2cad2d8c9..3837a59fad 100644
--- a/keyboards/keychron/q3/ansi/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/ansi/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_87(
+    [MAC_BASE] = LAYOUT_tkl_ansi(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_87(
+    [MAC_FN] = LAYOUT_tkl_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,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_87(
+    [WIN_BASE] = 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,  _______,  RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_87(
+    [WIN_FN] = LAYOUT_tkl_ansi(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json
index 1be5e52de2..3b75c97509 100644
--- a/keyboards/keychron/q3/ansi_encoder/info.json
+++ b/keyboards/keychron/q3/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "layouts": {
-        "LAYOUT_ansi_88": {
+        "LAYOUT_tkl_f13_ansi": {
             "layout": [
                 {"matrix":[0, 0], "x":0, "y":0},
                 {"matrix":[0, 1], "x":1.25, "y":0},
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
index cfc678ba5a..b154fa935a 100644
--- a/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_88(
+    [MAC_BASE] = LAYOUT_tkl_f13_ansi(
         KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_88(
+    [MAC_FN] = LAYOUT_tkl_f13_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,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_88(
+    [WIN_BASE] = LAYOUT_tkl_f13_ansi(
         KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     KC_MUTE,  KC_PSCR,  KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_88(
+    [WIN_FN] = LAYOUT_tkl_f13_ansi(
         _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
index 3839c5b007..5cd33b38e6 100644
--- a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c
@@ -25,7 +25,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_88(
+    [MAC_BASE] = LAYOUT_tkl_f13_ansi(
         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_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_88(
+    [MAC_FN] = LAYOUT_tkl_f13_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,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_88(
+    [WIN_BASE] = LAYOUT_tkl_f13_ansi(
         KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     KC_MUTE,  KC_PSCR,  KC_CRTA,  RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_88(
+    [WIN_FN] = LAYOUT_tkl_f13_ansi(
         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
index 2279eb6a8b..9369b6a60c 100644
--- a/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_88(
+    [MAC_BASE] = LAYOUT_tkl_f13_ansi(
         KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_88(
+    [MAC_FN] = LAYOUT_tkl_f13_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,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_88(
+    [WIN_BASE] = LAYOUT_tkl_f13_ansi(
         KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     KC_MUTE,  KC_PSCR,  KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_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,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_88(
+    [WIN_FN] = LAYOUT_tkl_f13_ansi(
         _______,  KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json
index 9b49bf6ebe..fdf5a5d875 100644
--- a/keyboards/keychron/q3/iso/info.json
+++ b/keyboards/keychron/q3/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "layouts": {
-        "LAYOUT_iso_88": {
+        "LAYOUT_tkl_iso": {
             "layout": [
                 {"matrix":[0, 0], "x":0, "y":0},
                 {"matrix":[0, 1], "x":2, "y":0},
diff --git a/keyboards/keychron/q3/iso/keymaps/default/keymap.c b/keyboards/keychron/q3/iso/keymaps/default/keymap.c
index 3d06cb8567..e8a98f32db 100644
--- a/keyboards/keychron/q3/iso/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/iso/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_iso_88(
+    [MAC_BASE] = LAYOUT_tkl_iso(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_iso_88(
+    [MAC_FN] = LAYOUT_tkl_iso(
         _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_iso_88(
+    [WIN_BASE] = LAYOUT_tkl_iso(
         KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_iso_88(
+    [WIN_FN] = LAYOUT_tkl_iso(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/iso/keymaps/keychron/keymap.c b/keyboards/keychron/q3/iso/keymaps/keychron/keymap.c
index 53c02128a6..cff222e885 100644
--- a/keyboards/keychron/q3/iso/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/iso/keymaps/keychron/keymap.c
@@ -25,7 +25,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_iso_88(
+    [MAC_BASE] = LAYOUT_tkl_iso(
         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_SNAP,  KC_SIRI,  RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_iso_88(
+    [MAC_FN] = LAYOUT_tkl_iso(
         _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_iso_88(
+    [WIN_BASE] = LAYOUT_tkl_iso(
         KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_iso_88(
+    [WIN_FN] = LAYOUT_tkl_iso(
         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/iso/keymaps/via/keymap.c b/keyboards/keychron/q3/iso/keymaps/via/keymap.c
index 3d06cb8567..e8a98f32db 100644
--- a/keyboards/keychron/q3/iso/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/iso/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_iso_88(
+    [MAC_BASE] = LAYOUT_tkl_iso(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_iso_88(
+    [MAC_FN] = LAYOUT_tkl_iso(
         _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_iso_88(
+    [WIN_BASE] = LAYOUT_tkl_iso(
         KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_iso_88(
+    [WIN_FN] = LAYOUT_tkl_iso(
         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
index 5bd2b23443..58ec1240ad 100644
--- a/keyboards/keychron/q3/iso_encoder/info.json
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "layouts": {
-        "LAYOUT_iso_89": {
+        "LAYOUT_tkl_f13_iso": {
             "layout": [
                 {"matrix":[0, 0], "x":0, "y":0},
                 {"matrix":[0, 1], "x":1.25, "y":0},
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
index f69e0998a8..999470fa87 100644
--- a/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_iso_89(
+    [MAC_BASE] = LAYOUT_tkl_f13_iso(
         KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_iso_89(
+    [MAC_FN] = LAYOUT_tkl_f13_iso(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_iso_89(
+    [WIN_BASE] = LAYOUT_tkl_f13_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_MUTE,  KC_PSCR,  KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_iso_89(
+    [WIN_FN] = LAYOUT_tkl_f13_iso(
         _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
index 0750f935b8..b7292e9fa4 100644
--- a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c
@@ -25,7 +25,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_iso_89(
+    [MAC_BASE] = LAYOUT_tkl_f13_iso(
         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_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_iso_89(
+    [MAC_FN] = LAYOUT_tkl_f13_iso(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_iso_89(
+    [WIN_BASE] = LAYOUT_tkl_f13_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_MUTE,  KC_PSCR,  KC_CRTA,  RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_iso_89(
+    [WIN_FN] = LAYOUT_tkl_f13_iso(
         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
index f69e0998a8..999470fa87 100644
--- a/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers{
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_iso_89(
+    [MAC_BASE] = LAYOUT_tkl_f13_iso(
         KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_iso_89(
+    [MAC_FN] = LAYOUT_tkl_f13_iso(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_iso_89(
+    [WIN_BASE] = LAYOUT_tkl_f13_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_MUTE,  KC_PSCR,  KC_NO,    RGB_MOD,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_iso_89(
+    [WIN_FN] = LAYOUT_tkl_f13_iso(
         _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json
index 42a0f474e5..757c1e45c0 100644
--- a/keyboards/keychron/q3/jis/info.json
+++ b/keyboards/keychron/q3/jis/info.json
@@ -41,8 +41,8 @@
                 {"matrix":[1,10], "x":10, "y":1.25},
                 {"matrix":[1,11], "x":11, "y":1.25},
                 {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[0,13], "x":14, "y":1.25, "w":2},
+                {"matrix":[1,13], "x":13, "y":1.25},
+                {"matrix":[0,13], "x":14, "y":1.25},
                 {"matrix":[1,14], "x":15.25, "y":1.25},
                 {"matrix":[1,15], "x":16.25, "y":1.25},
                 {"matrix":[3,15], "x":17.25, "y":1.25},
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json
index 2597376c06..ebe1a08f56 100644
--- a/keyboards/keychron/q3/jis_encoder/info.json
+++ b/keyboards/keychron/q3/jis_encoder/info.json
@@ -98,7 +98,7 @@
                 {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
                 {"matrix":[5, 1], "x":1.25, "y":5.25},
                 {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 3], "x":3.5, "y":5.25},
                 {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
                 {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
                 {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25},

From 4a74e3d02d585ff099c5f900eb05ce3c16c985d7 Mon Sep 17 00:00:00 2001
From: Wilba <wilba@wilba.tech>
Date: Thu, 13 Oct 2022 18:14:58 +1100
Subject: [PATCH 627/959] Fix Caps Lock indicators on Wilba Tech PCBs (#18695)

---
 keyboards/wilba_tech/wt_main.c           |  8 --------
 keyboards/wilba_tech/wt_mono_backlight.c | 24 ++++++++++--------------
 keyboards/wilba_tech/wt_mono_backlight.h |  1 -
 keyboards/wilba_tech/wt_rgb_backlight.c  |  9 +--------
 keyboards/wilba_tech/wt_rgb_backlight.h  |  1 -
 5 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index a7afeb5907..bc1a1d3c87 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -115,14 +115,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record)
     return process_record_user(keycode, record);
 }
 
-void led_set_kb(uint8_t usb_led)
-{
-#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
-    backlight_set_indicator_state(usb_led);
-#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
-    led_set_user(usb_led);
-}
-
 void suspend_power_down_kb(void)
 {
 #if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 71bf8e0284..0fc6e346a1 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -53,7 +53,6 @@ backlight_config g_config = {
 };
 
 bool g_suspend_state = false;
-uint8_t g_indicator_state = 0;
 
 // Global tick at 20 Hz
 uint32_t g_tick = 0;
@@ -118,11 +117,6 @@ void backlight_set_suspend_state(bool state)
 	g_suspend_state = state;
 }
 
-void backlight_set_indicator_state(uint8_t state)
-{
-    g_indicator_state = state;
-}
-
 void backlight_set_brightness_all( uint8_t value )
 {
 	IS31FL3736_mono_set_brightness_all( value );
@@ -168,7 +162,9 @@ void backlight_effect_indicators(void)
 #if defined(MONO_BACKLIGHT_WT75_A)
     HSV hsv = { .h = g_config.color_1.h, .s = g_config.color_1.s, .v = g_config.brightness };
     RGB rgb = hsv_to_rgb( hsv );
-    // G8, H8, I8 -> (6*8+7) (7*8+7), (8*8+7)
+    // SW7,CS8 = (6*8+7) = 55
+    // SW8,CS8 = (7*8+7) = 63
+    // SW9,CS8 = (8*8+7) = 71
     IS31FL3736_mono_set_brightness(55, rgb.r);
     IS31FL3736_mono_set_brightness(63, rgb.g);
     IS31FL3736_mono_set_brightness(71, rgb.b);
@@ -183,20 +179,20 @@ defined(MONO_BACKLIGHT_WT75_A) || \
 defined(MONO_BACKLIGHT_WT75_B) || \
 defined(MONO_BACKLIGHT_WT75_C) || \
 defined(MONO_BACKLIGHT_WT80_A)
-    if ( g_indicator_state & (1<<USB_LED_CAPS_LOCK) ) {
-        // Caps Lock: D1 -> (4*8+0)
-        IS31FL3736_mono_set_brightness(32, 255);
+    if ( host_keyboard_led_state().caps_lock ) {
+        // SW3,CS1 = (2*8+0) = 16
+        IS31FL3736_mono_set_brightness(16, 255);
     }
 #endif
 #if defined(MONO_BACKLIGHT_WT80_A) 
-    if ( g_indicator_state & (1<<USB_LED_SCROLL_LOCK) ) {
-        // Scroll Lock: G7 -> (6*8+6)
+    if ( host_keyboard_led_state().scroll_lock ) {
+        // SW7,CS7 = (6*8+6) = 54
         IS31FL3736_mono_set_brightness(54, 255);
     }
 #endif
 #if defined(MONO_BACKLIGHT_WT75_C) 
-    if ( g_indicator_state & (1<<USB_LED_SCROLL_LOCK) ) {
-        // Scroll Lock: G8 -> (6*8+7)
+    if ( host_keyboard_led_state().scroll_lock ) {
+        // SW7,CS8 = (6*8+7) = 55
         IS31FL3736_mono_set_brightness(55, 255);
     }
 #endif
diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h
index 2f913d2cb6..88183fd847 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.h
+++ b/keyboards/wilba_tech/wt_mono_backlight.h
@@ -56,7 +56,6 @@ void backlight_timer_enable(void);
 void backlight_timer_disable(void);
 
 void backlight_set_suspend_state(bool state);
-void backlight_set_indicator_state(uint8_t state);
 
 // This should not be called from an interrupt
 // (eg. from a timer interrupt).
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index a696fe7ed4..af4b84c5cf 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -144,7 +144,6 @@ backlight_config g_config = {
 };
 
 bool g_suspend_state = false;
-uint8_t g_indicator_state = 0;
 
 // Global tick at 20 Hz
 uint32_t g_tick = 0;
@@ -1982,11 +1981,6 @@ void backlight_set_suspend_state(bool state)
     g_suspend_state = state;
 }
 
-void backlight_set_indicator_state(uint8_t state)
-{
-    g_indicator_state = state;
-}
-
 void backlight_effect_rgb_test(void)
 {
     // Mask out bits 4 and 5
@@ -2425,8 +2419,7 @@ void backlight_effect_indicators_set_colors( uint8_t index, HS color )
 // colors already set
 void backlight_effect_indicators(void)
 {
-    if ( g_config.caps_lock_indicator.index != 255 &&
-            ( g_indicator_state & (1<<USB_LED_CAPS_LOCK) ) )
+    if ( g_config.caps_lock_indicator.index != 255 && host_keyboard_led_state().caps_lock )
     {
         backlight_effect_indicators_set_colors( g_config.caps_lock_indicator.index, g_config.caps_lock_indicator.color );
     }
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.h b/keyboards/wilba_tech/wt_rgb_backlight.h
index 529f84636a..2114789213 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.h
+++ b/keyboards/wilba_tech/wt_rgb_backlight.h
@@ -81,7 +81,6 @@ void backlight_timer_enable(void);
 void backlight_timer_disable(void);
 
 void backlight_set_suspend_state(bool state);
-void backlight_set_indicator_state(uint8_t state);
 
 // This should not be called from an interrupt
 // (eg. from a timer interrupt).

From f50ba3b03132edcc04d9ad2c0a5faa5e73a73d48 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:53:16 +0800
Subject: [PATCH 628/959] Update info.json of Q3 ISO with Encoder (#18697)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 keyboards/keychron/q3/iso_encoder/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
index 58ec1240ad..9c635521c3 100644
--- a/keyboards/keychron/q3/iso_encoder/info.json
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -5,7 +5,7 @@
     "maintainer": "lalalademaxiya1",
     "usb": {
         "vid": "0x3434",
-        "pid": "0x0122",
+        "pid": "0x0123",
         "device_version": "1.0.0"
     },
     "layouts": {

From 474c0bc8a2886077fa8dbdb4a8a7a57f4e1291d1 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 13 Oct 2022 11:26:42 -0600
Subject: [PATCH 629/959] Fixup dumbpad/v3x (#18692)

---
 keyboards/dumbpad/v3x/config.h                 | 6 +-----
 keyboards/dumbpad/v3x/keymaps/default/keymap.c | 4 ++--
 keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c | 4 ++--
 keyboards/dumbpad/v3x/keymaps/via/keymap.c     | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index c64409c967..d689863cf7 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/keyboards/dumbpad/v3x/config.h
@@ -16,15 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "config_common.h"
-
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
 
 /* Single rotary encoder */
 #define ENCODERS_PAD_A { B2 }
@@ -40,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BOOTMAGIC_LITE_COLUMN 0
 
 #define RGB_DI_PIN D1
-#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT 16
 
 // Cleanup RGB
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/dumbpad/v3x/keymaps/default/keymap.c b/keyboards/dumbpad/v3x/keymaps/default/keymap.c
index b96e0e71ce..0c65fac187 100644
--- a/keyboards/dumbpad/v3x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v3x/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     \-----------------------------------------------------'
     */
     [1] = LAYOUT(
-                    RGB_TOG,    RGB_VAD,     RGB_VAI,      RESET,
+                    RGB_TOG,    RGB_VAD,     RGB_VAI,      QK_BOOT,
                     KC_NO,      RGB_HUD,     RGB_HUI,      KC_NO,
                     KC_NO,      RGB_SAD,     RGB_SAI,      KC_NO,
         KC_NO,      _______,    RGB_SPD,     RGB_SPI,      KC_NO
@@ -77,5 +77,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
             break;
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c b/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
index b95e6270e8..3d0fd20ecf 100644
--- a/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
+++ b/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     \-----------------------------------------------------'
     */
     [1] = LAYOUT(
-                    RGB_TOG,    RGB_VAD,     RGB_VAI,      RESET,
+                    RGB_TOG,    RGB_VAD,     RGB_VAI,      QK_BOOT,
                     KC_NO,      RGB_HUD,     RGB_HUI,      KC_NO,
                     KC_NO,      RGB_SAD,     RGB_SAI,      KC_NO,
         KC_NO,      _______,    RGB_SPD,     RGB_SPI,      KC_NO
@@ -100,5 +100,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
             break;
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/dumbpad/v3x/keymaps/via/keymap.c b/keyboards/dumbpad/v3x/keymaps/via/keymap.c
index b96e0e71ce..0c65fac187 100644
--- a/keyboards/dumbpad/v3x/keymaps/via/keymap.c
+++ b/keyboards/dumbpad/v3x/keymaps/via/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     \-----------------------------------------------------'
     */
     [1] = LAYOUT(
-                    RGB_TOG,    RGB_VAD,     RGB_VAI,      RESET,
+                    RGB_TOG,    RGB_VAD,     RGB_VAI,      QK_BOOT,
                     KC_NO,      RGB_HUD,     RGB_HUI,      KC_NO,
                     KC_NO,      RGB_SAD,     RGB_SAI,      KC_NO,
         KC_NO,      _______,    RGB_SPD,     RGB_SPI,      KC_NO
@@ -77,5 +77,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
             break;
     }
-    return true;
+    return false;
 }

From 5629ba18077ee5dcde72e497ddf46d848817dd5c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 14 Oct 2022 04:28:14 +1100
Subject: [PATCH 630/959] Remove legacy keycodes, part 4 (#18683)

* `KC_PGDOWN` -> `KC_PGDN`

* `KC_PSCREEN` -> `KC_PSCR`

* `KC_SCOLON` -> `KC_SCLN`

* `KC_BSLASH` -> `KC_BSLS`

* `KC_BSPACE` -> `KC_BSPC`
---
 .../25keys/zinc/keymaps/toshi0383/keymap.c    |  2 +-
 keyboards/abacus/keymaps/default/keymap.json  |  2 +-
 keyboards/abacus/keymaps/unicodemap/keymap.c  |  4 +--
 .../aleblazer/zodiark/keymaps/via/encoder.c   |  2 +-
 .../atreus/keymaps/dvorak_42_key/keymap.c     |  6 ++--
 keyboards/avalanche/avalanche.c               |  2 +-
 .../basekeys/slice/keymaps/default/keymap.c   |  4 +--
 .../keymaps/default_split_left_space/keymap.c |  2 +-
 .../slice/rev1/keymaps/2moons/keymap.c        | 10 +++----
 .../slice/rev1/keymaps/default_all/keymap.c   |  4 +--
 .../keymaps/default_split_backspace/keymap.c  |  2 +-
 .../basekeys/slice/rev1/keymaps/via/keymap.c  |  8 ++---
 .../rev1_rgb/keymaps/2moons_rgb/keymap.c      |  8 ++---
 .../slice/rev1_rgb/keymaps/via/keymap.c       |  8 ++---
 .../bastardkb/scylla/keymaps/cykedev/keymap.c |  2 +-
 .../scylla/keymaps/german_gaming/keymap.c     |  2 +-
 .../tbk/keymaps/german_gaming/keymap.c        |  2 +-
 keyboards/bioi/g60/keymaps/default/keymap.c   |  2 +-
 keyboards/bioi/g60/keymaps/via/keymap.c       |  2 +-
 .../bioi/morgan65/keymaps/default/keymap.c    |  2 +-
 keyboards/bioi/morgan65/keymaps/via/keymap.c  |  2 +-
 keyboards/bioi/s65/keymaps/default/keymap.c   |  2 +-
 keyboards/bioi/s65/keymaps/via/keymap.c       |  2 +-
 keyboards/blackplum/keymaps/default/keymap.c  |  2 +-
 keyboards/blackplum/keymaps/via/keymap.c      |  2 +-
 .../bt66tech60/keymaps/default/keymap.c       |  2 +-
 .../bt66tech/bt66tech60/keymaps/via/keymap.c  |  2 +-
 keyboards/cantor/keymaps/zeromist/keymap.c    |  2 +-
 .../chavdai40/keymaps/42keys-dvorak/keymap.c  |  4 +--
 .../chavdai40/keymaps/42keys-eucalyn/keymap.c |  2 +-
 .../chavdai40/keymaps/42keys-qwerty/keymap.c  |  4 +--
 .../chavdai40/keymaps/44keys-dvorak/keymap.c  |  4 +--
 .../chavdai40/keymaps/44keys-eucalyn/keymap.c |  2 +-
 .../chavdai40/keymaps/44keys-qwerty/keymap.c  |  4 +--
 keyboards/chavdai40/keymaps/default/keymap.c  |  4 +--
 .../quark/keymaps/ajp10304/keymap.c           |  4 +--
 .../cipulot/kallos/keymaps/default/keymap.c   |  2 +-
 keyboards/cipulot/kallos/keymaps/via/keymap.c |  2 +-
 keyboards/contender/keymaps/default/keymap.c  |  4 +--
 .../m0110_usb/keymaps/default/keymap.c        |  2 +-
 .../m0110_usb/keymaps/zyber/keymap.c          |  2 +-
 keyboards/converter/sun_usb/command_extra.c   |  2 +-
 .../sun_usb/type3/keymaps/default/keymap.c    |  2 +-
 .../usb_usb/keymaps/chriskopher/keymap.c      |  2 +-
 keyboards/crkbd/keymaps/gotham/keymap.c       |  2 +-
 .../crkbd/keymaps/julian_turner/keymap.c      |  6 ++--
 keyboards/crkbd/keymaps/nimishgautam/keymap.c | 18 +++++------
 keyboards/crkbd/keymaps/sulrich/keymap.c      |  4 +--
 .../keymaps/vlukash_trackpad_left/keymap.c    |  2 +-
 .../keymaps/vlukash_trackpad_right/keymap.c   |  2 +-
 .../borsdorf/keymaps/default/keymap.c         |  2 +-
 .../cutie_club/borsdorf/keymaps/via/keymap.c  |  2 +-
 keyboards/do60/keymaps/default/keymap.c       |  2 +-
 keyboards/do60/keymaps/test/keymap.c          |  2 +-
 keyboards/do60/keymaps/via/keymap.c           |  2 +-
 .../drhigsby/ogurec/keymaps/dack/keymap.c     |  4 +--
 keyboards/dz60/keymaps/LEdiodes/keymap.c      |  2 +-
 keyboards/dz60/keymaps/billiams/keymap.c      |  2 +-
 .../dz60/keymaps/billiams_layout4/keymap.c    |  2 +-
 keyboards/dz60/keymaps/bingocaller/keymap.c   |  4 +--
 keyboards/dz60/keymaps/crd_2u_lshift/keymap.c |  4 +--
 keyboards/dz60/keymaps/doogle999/keymap.c     |  2 +-
 .../dz60/keymaps/iso_split-spacebar/keymap.c  |  2 +-
 .../dz60/keymaps/marianas/keyDefinitions.h    |  2 +-
 keyboards/dz60/keymaps/mpaarating/keymap.c    |  4 +--
 keyboards/dz60/keymaps/olivierko/keymap.c     |  2 +-
 keyboards/dz60/keymaps/pinpox/keymap.c        |  2 +-
 .../dztech/dz60rgb/keymaps/mekanist/keymap.c  |  4 +--
 .../dz60rgb_ansi/keymaps/bingocaller/keymap.c |  2 +-
 .../dztech/dz65rgb/keymaps/yuannan/keymap.c   |  8 ++---
 .../keymaps/bpruitt-goddard/keymap.c          | 16 +++++-----
 .../ergodox_ez/keymaps/danielo515/keymap.c    | 22 +++++++-------
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c | 16 +++++-----
 .../keymaps/hacker_dvorak/hacker_dvorak.c     | 16 +++++-----
 keyboards/ergodox_ez/keymaps/lukaus/keymap.c  | 24 +++++++--------
 .../ergodox_ez/keymaps/matrixman/keymap.c     |  2 +-
 .../keymaps/nathanvercaemert/keymap.c         | 10 +++----
 keyboards/ergodox_ez/keymaps/nfriend/keymap.c | 30 +++++++++----------
 keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c | 10 +++----
 keyboards/ergodox_ez/keymaps/rmw/keymap-win.c |  8 ++---
 keyboards/ergodox_ez/keymaps/stamm/keymap.c   | 12 ++++----
 keyboards/ergodox_ez/keymaps/testing/keymap.c |  4 +--
 .../util/keymap_beautifier/README.md          | 26 ++++++++--------
 .../ergodox_stm32/keymaps/default/keymap.c    |  4 +--
 .../flygone60/rev3/keymaps/default/keymap.c   |  6 ++--
 keyboards/flygone60/rev3/keymaps/via/keymap.c |  6 ++--
 .../butterstick/keymaps/dennytom/keymap.c     | 14 ++++-----
 .../georgi/keymaps/colemak-dh/keymap.c        |  2 +-
 .../gboards/georgi/keymaps/dennytom/keymap.c  |  8 ++---
 keyboards/gh60/revc/keymaps/bluezio/keymap.c  |  4 +--
 keyboards/gh60/satan/keymaps/abhixec/keymap.c |  4 +--
 keyboards/gh60/satan/keymaps/chaser/keymap.c  |  4 +--
 .../gh60/satan/keymaps/dende_iso/keymap.c     |  4 +--
 .../gh60/satan/keymaps/isoHHKB/readme.md      |  2 +-
 .../h0oni/hotduck/keymaps/default/keymap.c    |  2 +-
 keyboards/h0oni/hotduck/keymaps/via/keymap.c  |  2 +-
 keyboards/handwired/aek64/config.h            |  2 +-
 .../atreus50/keymaps/ajp10304/keymap.c        |  4 +--
 .../handwired/co60/keymaps/default/keymap.c   |  2 +-
 .../keymaps/jmdaly_hhkb_split_space/keymap.c  |  2 +-
 .../handwired/d48/keymaps/anderson/keymap.c   |  2 +-
 .../handwired/d48/keymaps/default/keymap.c    |  2 +-
 .../4x5/keymaps/dvorak/keymap.c               |  2 +-
 .../5x6/keymaps/default/keymap.c              |  2 +-
 .../5x6/keymaps/impstyle/keymap.c             |  2 +-
 .../5x6/keymaps/squirrel/keymap.c             |  4 +--
 .../6x6/keymaps/default/keymap.c              |  2 +-
 .../6x6/keymaps/default_5_thumb/keymap.c      |  2 +-
 .../6x6_4/keymaps/default/keymap.c            |  2 +-
 .../6x7/keymaps/default/keymap.c              |  2 +-
 .../dactyl_promicro/keymaps/impstyle/keymap.c |  2 +-
 .../handwired/ibm122m/keymaps/lukaus/keymap.c | 12 ++++----
 .../leftynumpad/keymaps/default/keymap.c      |  2 +-
 .../handwired/ortho5x14/keymaps/2u/keymap.c   |  4 +--
 .../ortho5x14/keymaps/default/keymap.c        |  2 +-
 .../ortho5x14/keymaps/split1/keymap.c         |  2 +-
 .../owlet60/keymaps/default/keymap.c          |  2 +-
 .../owlet60/keymaps/oled_testing/keymap.c     |  2 +-
 .../4x6_right/keymaps/default/keymap.c        |  2 +-
 .../5x6_right/keymaps/default/keymap.c        |  2 +-
 .../handwired/unk/keymaps/default/keymap.c    | 18 +++++------
 keyboards/hhkb/rn42/rn42_task.c               |  6 ++--
 .../bastyl/keymaps/german_gaming/keymap.c     |  2 +-
 .../id67/keymaps/vinorodrigues/keymap.c       |  2 +-
 .../idobao/id80/v2/ansi/keymaps/msf/keymap.c  |  2 +-
 .../keymaps/dudeofawesome/keymap.c            | 12 ++++----
 .../ergodox_infinity/keymaps/gordon/keymap.c  |  8 ++---
 .../ergodox_infinity/keymaps/narze/keymap.c   |  2 +-
 .../keymaps/not-quite-neo/keymap.c            |  4 +--
 keyboards/jd40/keymaps/myoung34/keymap.c      |  2 +-
 .../thedogkeyboard/keymaps/default/keymap.c   |  2 +-
 .../thedogkeyboard/keymaps/kakunpc/keymap.c   |  4 +--
 .../baguette66/rgb/keymaps/default/keymap.c   |  2 +-
 .../baguette66/rgb/keymaps/via/keymap.c       |  2 +-
 .../soldered/keymaps/default/keymap.c         |  2 +-
 .../baguette66/soldered/keymaps/via/keymap.c  |  2 +-
 .../boop65/rgb/keymaps/default/keymap.c       |  2 +-
 .../kbdfans/boop65/rgb/keymaps/via/keymap.c   |  2 +-
 .../keymaps/adamdehaven/keymap.c              |  2 +-
 .../mkiirgb/keymaps/codecoffeecode/keymap.c   |  2 +-
 .../kbd67/mkiirgb/keymaps/default/keymap.c    |  2 +-
 .../kbd67/mkiirgb/keymaps/dnsnrk/keymap.c     |  2 +-
 .../kbd67/mkiirgb/keymaps/jonavin/keymap.c    |  2 +-
 .../mkiirgb/keymaps/pascalpfeil/keymap.c      |  2 +-
 .../kbd67/mkiirgb/keymaps/spx01/keymap.c      |  2 +-
 .../kbd67/mkiirgb/keymaps/via/keymap.c        |  2 +-
 keyboards/kbdfans/kbd6x/keymaps/via/keymap.c  |  2 +-
 .../kbd75/keymaps/adamdehaven/keymap.c        |  2 +-
 .../mk2/keymaps/iracing_replay/keymap.c       |  2 +-
 .../kbdfans/maja/keymaps/default/keymap.c     |  2 +-
 keyboards/kbdfans/maja/keymaps/via/keymap.c   |  2 +-
 .../maja_soldered/keymaps/default/keymap.c    |  2 +-
 .../maja_soldered/keymaps/via/keymap.c        |  2 +-
 .../bfo9000/keymaps/abstractkb/keymap.c       |  2 +-
 .../bfo9000/keymaps/shadyproject/keymap.c     |  2 +-
 .../keebio/iris/keymaps/impstyle/keymap.c     |  2 +-
 .../iris/keymaps/olligranlund_nordic/keymap.c |  2 +-
 .../keymaps/olligranlund_nordic_v2/keymap.c   |  2 +-
 keyboards/keebio/iris/keymaps/sq5rix/keymap.c |  2 +-
 keyboards/keebio/iris/keymaps/vyolle/keymap.c |  2 +-
 .../levinson/keymaps/issmirnov/keymap.c       |  2 +-
 .../keebio/levinson/keymaps/numpad/keymap.c   |  2 +-
 .../keebio/levinson/keymaps/steno/keymap.c    |  2 +-
 .../nano_slider/keymaps/midi2vol/keymap.c     |  2 +-
 .../keycapsss/plaid_pad/keymaps/oled/keymap.c |  2 +-
 .../q0/rev_0130/keymaps/default/keymap.c      |  2 +-
 .../keychron/q0/rev_0130/keymaps/via/keymap.c |  2 +-
 .../q2/rev_0113/keymaps/dhertz/keymap.c       |  2 +-
 keyboards/keyprez/bison/bison.c               |  2 +-
 .../keyprez/rhino/keymaps/default/keymap.c    |  2 +-
 .../rhino/keymaps/default_ergo/keymap.c       |  2 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/keymap.c |  6 ++--
 .../kprepublic/jj40/keymaps/brdlf/keymap.c    |  2 +-
 keyboards/ktec/ergodone/keymaps/art/keymap.c  | 12 ++++----
 keyboards/ktec/ergodone/keymaps/vega/keymap.c |  2 +-
 .../labyrinth75/keymaps/default/keymap.c      |  2 +-
 keyboards/labyrinth75/keymaps/via/keymap.c    |  2 +-
 .../latin60rgb/keymaps/default/keymap.c       |  2 +-
 .../latin60rgb/keymaps/via/keymap.c           |  2 +-
 .../latin64ble/keymaps/default/keymap.c       |  6 ++--
 .../latin64ble/keymaps/via/keymap.c           |  6 ++--
 .../latinpad/keymaps/default/keymap.c         |  2 +-
 .../latinpad/keymaps/via/keymap.c             |  2 +-
 .../the40/keymaps/ortho/keymap.c              |  2 +-
 .../lazydesigners/the40/keymaps/via/keymap.c  |  2 +-
 .../the50/keymaps/mikethetiger/keymap.c       |  2 +-
 keyboards/lets_split/keymaps/adam/keymap.c    |  4 +--
 .../lets_split/keymaps/cpeters1982/keymap.c   |  2 +-
 .../lets_split/keymaps/geripgeri/keymap.c     |  2 +-
 .../keymaps/heartrobotninja/keymap.c          |  2 +-
 keyboards/lets_split/keymaps/piemod/keymap.c  | 10 +++----
 .../lets_split/keymaps/shaymdev/keymap.c      |  2 +-
 keyboards/lets_split/keymaps/zer09/keymap.c   |  8 ++---
 .../keymaps/doxish_dvorak/keymap.c            |  4 +--
 .../minidox/keymaps/bepo/keymap.c             |  2 +-
 .../minidox/keymaps/tw1t611/keymap.c          |  2 +-
 .../mechkeys/acr60/keymaps/mitch/keymap.c     |  2 +-
 .../mechlovin/kanu/keymaps/dhertz/keymap.c    |  2 +-
 .../mercutio/keymaps/fearless_spiff/keymap.c  |  2 +-
 .../keymaps/fearless_spiff_en/keymap.c        |  2 +-
 .../melgeek/mj64/keymaps/default/keymap.c     |  2 +-
 keyboards/melgeek/mj64/keymaps/via/keymap.c   |  2 +-
 .../melgeek/mj65/keymaps/default/keymap.c     |  2 +-
 keyboards/melgeek/mj65/keymaps/via/keymap.c   |  2 +-
 .../ludmila/keymaps/default/keymap.c          |  2 +-
 .../miller/gm862/keymaps/default/keymap.c     |  4 +--
 keyboards/miller/gm862/keymaps/via/keymap.c   |  4 +--
 keyboards/mino/keymaps/default/keymap.c       |  4 +--
 keyboards/mino/keymaps/via/keymap.c           |  4 +--
 .../chocolatebar/keymaps/default/keymap.c     |  2 +-
 .../chocolatebar/keymaps/via/keymap.c         |  2 +-
 .../karina/keymaps/default/keymap.c           |  2 +-
 keyboards/mitosis/keymaps/nzen/keymap.c       | 14 ++++-----
 keyboards/mlego/m65/keymaps/default/readme.md |  2 +-
 keyboards/mlego/m65/keymaps/dk/readme.md      |  2 +-
 keyboards/mlego/m65/keymaps/uk/readme.md      |  2 +-
 keyboards/mntre/keymaps/default/keymap.c      |  8 ++---
 .../mokey/xox70hot/keymaps/default/keymap.c   |  2 +-
 keyboards/mokey/xox70hot/keymaps/via/keymap.c |  2 +-
 keyboards/ms_sculpt/keymaps/default/keymap.c  |  2 +-
 keyboards/mt/mt40/keymaps/default/keymap.c    |  2 +-
 keyboards/mt/mt84/keymaps/default/keymap.c    |  4 +--
 keyboards/mt/mt84/keymaps/via/keymap.c        |  4 +--
 keyboards/mt/split75/keymaps/art/keymap.c     |  4 +--
 .../nack/keymaps/farfalleflickan/keymap.c     |  2 +-
 keyboards/nek_type_a/keymaps/default/keymap.c |  6 ++--
 keyboards/nimrod/keymaps/default/keymap.c     |  2 +-
 .../keymaps/default_center_space/keymap.c     |  2 +-
 .../keymaps/default_left_space/keymap.c       |  2 +-
 .../keymaps/default_right_space/keymap.c      |  2 +-
 .../keymaps/default_split_space/keymap.c      |  2 +-
 .../nyhxis/nfr_70/keymaps/default/keymap.c    |  2 +-
 .../nyhxis/nfr_70/keymaps/tsangan/keymap.c    |  2 +-
 keyboards/nyhxis/nfr_70/keymaps/via/keymap.c  |  2 +-
 .../rev1/keymaps/greenshadowmaker/keymap.c    |  2 +-
 keyboards/org60/keymaps/default/keymap.c      |  2 +-
 keyboards/orthodox/keymaps/shaymdev/keymap.c  |  2 +-
 keyboards/pearl/keymaps/phil/keymap.c         |  2 +-
 .../percent/canoe/keymaps/boy_314/keymap.c    |  2 +-
 .../percent/canoe/keymaps/default/keymap.c    |  2 +-
 .../percent/canoe/keymaps/dhertz/keymap.c     |  2 +-
 keyboards/planck/keymaps/abishalom/keymap.c   |  2 +-
 .../planck/keymaps/charlesrocket/keymap.c     |  8 ++---
 keyboards/planck/keymaps/dc/keymap.c          |  2 +-
 keyboards/planck/keymaps/deft/keymap.c        |  2 +-
 .../planck/keymaps/dvorak2space/keymap.c      |  4 +--
 keyboards/planck/keymaps/emiller/keymap.c     |  2 +-
 keyboards/planck/keymaps/gunp/keymap.c        |  4 +--
 keyboards/planck/keymaps/impossible/keymap.c  |  2 +-
 keyboards/planck/keymaps/matrixman/keymap.c   |  6 ++--
 keyboards/planck/keymaps/narze/keymap.c       |  2 +-
 keyboards/planck/keymaps/oryx/keymap.c        |  8 ++---
 keyboards/planck/keymaps/piemod/keymap.c      | 10 +++----
 .../planck/keymaps/roguepullrequest/keymap.c  |  6 ++--
 keyboards/planck/keymaps/samuel/README.org    |  2 +-
 keyboards/planck/keymaps/samuel/keymap.c      |  4 +--
 keyboards/planck/keymaps/tehwalris/keymap.c   |  4 +--
 keyboards/planck/keymaps/tk/keymap.c          |  4 +--
 keyboards/planck/keymaps/tylerwince/keymap.c  |  8 ++---
 keyboards/planck/keymaps/vaire/keymap.c       |  2 +-
 .../tnln95/keymaps/default/keymap.c           |  6 ++--
 .../tnln95/keymaps/default_ansi/keymap.c      |  6 ++--
 keyboards/preonic/keymaps/AlexDaigre/keymap.c |  6 ++--
 keyboards/preonic/keymaps/egstad/keymap.c     |  8 ++---
 keyboards/preonic/keymaps/fig-r/keymap.c      |  2 +-
 .../preonic/keymaps/laurentlaurent/keymap.c   | 10 +++----
 keyboards/preonic/keymaps/mverteuil/keymap.c  |  2 +-
 .../preonic/keymaps/mverteuil_2x2u/keymap.c   |  2 +-
 .../wete/v1/keymaps/default/keymap.c          |  2 +-
 .../ramonimbao/wete/v1/keymaps/iso/keymap.c   |  2 +-
 .../ramonimbao/wete/v1/keymaps/jis/keymap.c   |  2 +-
 .../ramonimbao/wete/v1/keymaps/via/keymap.c   |  2 +-
 .../cocoa40/keymaps/default/keymap.c          |  6 ++--
 keyboards/redox/keymaps/german/keymap.c       |  2 +-
 keyboards/redox/keymaps/italian/keymap.c      |  2 +-
 keyboards/redox/keymaps/ptillemans/keymap.c   |  2 +-
 .../redox_media/keymaps/default/keymap.c      |  2 +-
 keyboards/redox_w/keymaps/danielo515/keymap.c |  4 +--
 keyboards/redox_w/keymaps/italian/keymap.c    |  2 +-
 .../reviung39/keymaps/toshi0383/keymap.c      |  2 +-
 keyboards/rgbkb/mun/keymaps/default/keymap.c  |  2 +-
 keyboards/rgbkb/mun/keymaps/via/keymap.c      |  2 +-
 .../signum/3_0/keymaps/sgurenkov/keymap.c     |  2 +-
 keyboards/sofle/keymaps/default/keymap.c      |  2 +-
 keyboards/sofle/keymaps/devdev/keymap.c       |  2 +-
 keyboards/sofle/keymaps/flare576/keymap.c     |  2 +-
 .../sofle/keymaps/j4ckofalltrades/encoder.c   |  2 +-
 keyboards/sofle/keymaps/killmaster/keymap.c   |  2 +-
 keyboards/sofle/keymaps/rgb_default/keymap.c  |  2 +-
 keyboards/sofle/keymaps/via/encoder.c         |  2 +-
 keyboards/sparrow62/keymaps/74th/keymap.c     |  2 +-
 keyboards/splitkb/kyria/keymaps/rmw/keymap.c  |  6 ++--
 keyboards/tada68/keymaps/fezzant/keymap.c     |  8 ++---
 .../hecomi/keymaps/kakunpc/keymap.c           |  2 +-
 .../team0110/p1800fl/keymaps/default/keymap.c |  2 +-
 .../team0110/p1800fl/keymaps/via/keymap.c     |  2 +-
 .../vitamins_included/keymaps/numpad/keymap.c |  2 +-
 .../westm/westm68/keymaps/default/keymap.c    |  2 +-
 keyboards/westm/westm68/keymaps/via/keymap.c  |  2 +-
 keyboards/whale/sk/keymaps/default/keymap.c   |  2 +-
 keyboards/xiudi/xd60/keymaps/Jos/keymap.c     |  4 +--
 .../ansi_split_bs_rshift_space/keymap.c       |  2 +-
 keyboards/xiudi/xd60/keymaps/birkir/keymap.c  |  4 +--
 keyboards/xiudi/xd60/keymaps/default/keymap.c |  2 +-
 keyboards/xiudi/xd60/keymaps/finnish/keymap.c |  2 +-
 .../xiudi/xd60/keymaps/petesmom/keymap.c      |  2 +-
 .../xd60/keymaps/split_bksp_arrows/keymap.c   |  2 +-
 .../xiudi/xd60/keymaps/stanleylai/keymap.c    |  2 +-
 keyboards/xiudi/xd60/keymaps/via/keymap.c     |  2 +-
 keyboards/xiudi/xd60/keymaps/yuuki/keymap.c   |  2 +-
 keyboards/xiudi/xd75/keymaps/4sstylz/config.h |  2 +-
 .../xd75/keymaps/developper_bepo/keymap.c     |  2 +-
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |  4 +--
 keyboards/yampad/keymaps/traditional/keymap.c |  2 +-
 keyboards/ymdk/sp64/keymaps/daed/keymap.c     |  8 ++---
 keyboards/ymdk/sp64/keymaps/default/keymap.c  |  4 +--
 .../ymdk/sp64/keymaps/minkezhang/keymap.c     |  4 +--
 keyboards/ymdk/sp64/keymaps/via/keymap.c      |  4 +--
 keyboards/ymdk/sp64/keymaps/walston/keymap.c  |  4 +--
 keyboards/ymdk/yd60mq/keymaps/64key/keymap.c  |  2 +-
 .../60_ansi/mechmerlin-ansi/keymap.c          |  2 +-
 layouts/community/60_ansi/readme.md           |  2 +-
 .../mechmerlin-split/keymap.c                 |  2 +-
 layouts/community/ergodox/adnw_p_u_q/keymap.c |  4 +--
 layouts/community/ergodox/bepo_alt/keymap.c   |  2 +-
 layouts/community/ergodox/berfarah/keymap.c   |  2 +-
 .../community/ergodox/choromanski/keymap.c    |  2 +-
 layouts/community/ergodox/dave/keymap.c       |  2 +-
 .../community/ergodox/dvorak_emacs/keymap.c   |  2 +-
 .../ergodox/dvorak_intl_squisher/keymap.c     |  2 +-
 .../community/ergodox/german-kinergo/keymap.c |  2 +-
 .../community/ergodox/german-lukas/keymap.c   |  2 +-
 layouts/community/ergodox/issmirnov/keymap.c  |  6 ++--
 layouts/community/ergodox/maz/keymap.c        | 10 +++----
 .../community/ergodox/mclennon_osx/keymap.c   |  2 +-
 .../community/ergodox/meagerfindings/keymap.c | 12 ++++----
 layouts/community/ergodox/osx_neo2/keymap.c   | 30 +++++++++----------
 .../twentylives_dvorak_with_hebrew/keymap.c   | 10 +++----
 .../community/ortho_4x12/ajp10304/keymap.c    |  4 +--
 layouts/community/ortho_5x12/333fred/keymap.c |  2 +-
 .../community/planck_mit/guidoism/keys.json   | 10 +++----
 quantum/keycode_legacy.h                      |  6 ----
 users/anderson/seq.c                          |  4 +--
 users/arkag/arkag.c                           |  2 +-
 users/art/art.c                               | 18 +++++------
 users/art/funcs/string_funcs.c                |  4 +--
 users/danielo515/danielo515.c                 |  2 +-
 users/danielo515/tap_dance.c                  |  2 +-
 users/dennytom/chording_engine/engine.part.1  |  4 +--
 .../dennytom/chording_engine/tests/minunit.h  |  4 +--
 users/edvorakjp/edvorakjp.h                   |  6 ++--
 users/ericgebhart/edge_keys.h                 |  6 ++--
 users/gordon/gordon.h                         |  8 ++---
 users/issmirnov/rows.h                        |  4 +--
 users/kuatsure/kuatsure.c                     |  2 +-
 .../nqn-keys-on-quertz-de-latin1.h            |  6 ++--
 users/rmw/rmw.h                               |  4 +--
 users/romus/romus.h                           |  2 +-
 users/scheiklp/koy_keys_on_quertz_de_latin1.h |  6 ++--
 users/txkyel/txkyel.c                         |  2 +-
 users/xulkal/custom_tap_dance.c               |  4 +--
 users/zigotica/tapdances.c                    |  2 +-
 362 files changed, 688 insertions(+), 694 deletions(-)

diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
index 1f7bd727c1..e76f95983d 100644
--- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
@@ -15,7 +15,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_ortho_4x12(
-   KC_ESC, KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,             KC_Y,  KC_U,  KC_I, KC_O,   KC_P, KC_BSPACE,
+   KC_ESC, KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,             KC_Y,  KC_U,  KC_I, KC_O,   KC_P, KC_BSPC,
    KC_TAB, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,             KC_H,  KC_J,  KC_K, KC_L,   SFT_T(KC_SCLN), KC_RGUI,
    KC_SPC, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_N,  KC_M,  KC_RCTL, KC_DOT, KC_RALT, RGUI(KC_RSFT),
    KC_LGUI, KC_LALT, _______, _______, LOWER, KC_ENT,    KC_ENT, RAISE, _______, _______, _______, _______
diff --git a/keyboards/abacus/keymaps/default/keymap.json b/keyboards/abacus/keymaps/default/keymap.json
index 562caf01c7..3409843c8f 100644
--- a/keyboards/abacus/keymaps/default/keymap.json
+++ b/keyboards/abacus/keymaps/default/keymap.json
@@ -3,7 +3,7 @@
   "keymap": "default",
   "layout": "LAYOUT",
   "layers": [
-    ["KC_ESCAPE", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPACE", "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCOLON", "KC_BSLASH", "KC_LSHIFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_UP", "KC_DELETE", "KC_LCTRL", "KC_LGUI", "MO(1)", "KC_SPACE", "KC_ENTER", "MO(2)", "KC_LEFT", "KC_DOWN", "KC_RIGHT"],
+    ["KC_ESCAPE", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC", "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_BSLS", "KC_LSHIFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_UP", "KC_DELETE", "KC_LCTRL", "KC_LGUI", "MO(1)", "KC_SPACE", "KC_ENTER", "MO(2)", "KC_LEFT", "KC_DOWN", "KC_RIGHT"],
     ["KC_GRAVE", "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_LBRC", "KC_RBRC", "KC_QUOTE", "KC_SLASH", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MINUS", "KC_EQUAL", "KC_TRNS", "KC_TRNS", "KC_LALT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_END"],
     ["KC_GRV", "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", "RGB_MODE_PLAIN", "RGB_MODE_BREATHE", "RGB_MODE_RAINBOW", "RGB_MODE_SWIRL", "RGB_MODE_SNAKE", "RGB_MODE_KNIGHT", "RGB_MODE_GRADIENT", "KC_NO", "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUI", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]
   ]
diff --git a/keyboards/abacus/keymaps/unicodemap/keymap.c b/keyboards/abacus/keymaps/unicodemap/keymap.c
index 4392bd3c51..fc8d4032ad 100644
--- a/keyboards/abacus/keymaps/unicodemap/keymap.c
+++ b/keyboards/abacus/keymaps/unicodemap/keymap.c
@@ -62,8 +62,8 @@ const uint32_t PROGMEM unicode_map[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE,
-        KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_BSLASH,
+        KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_BSLS,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE,
         KC_LCTRL, KC_LGUI, MO(_UPPER), KC_SPACE, KC_ENTER, MO(_LOWER), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
diff --git a/keyboards/aleblazer/zodiark/keymaps/via/encoder.c b/keyboards/aleblazer/zodiark/keymaps/via/encoder.c
index c08cfed5c1..a9d66b1519 100644
--- a/keyboards/aleblazer/zodiark/keymaps/via/encoder.c
+++ b/keyboards/aleblazer/zodiark/keymaps/via/encoder.c
@@ -25,7 +25,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         }
     } else if (index == 1) {
         if (clockwise) {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         } else {
             tap_code(KC_PGUP);
         }
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index 20ff5c2af6..c6a628e217 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT(
     KC_QUOTE,      KC_COMMA,      KC_DOT,     KC_P,                KC_Y,                                 KC_F,       KC_G,      KC_C,    KC_R,          KC_L,
     KC_A,          KC_O,          KC_E,       KC_U,                KC_I,                                 KC_D,       KC_H,      KC_T,    KC_N,          KC_S,
-    KC_SCOLON,     KC_Q,          KC_J,       KC_K,                KC_X,                                 KC_B,       KC_M,      KC_W,    KC_V,          KC_Z,
+    KC_SCLN,       KC_Q,          KC_J,       KC_K,                KC_X,                                 KC_B,       KC_M,      KC_W,    KC_V,          KC_Z,
     OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER,   KC_SPACE,  KC_BSPC, RCTL(KC_BSPC), KC_CAPS, OSM(MOD_LSFT)
   ),
 
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [KEYNAV] = LAYOUT(
     KC_ESC,             VS_DEFINITION,       RCTL(KC_Z),      RCTL(KC_S),       MEH(KC_A),                           MEH(KC_B),     KC_HOME,    KC_UP,           KC_END,     KC_PGUP,
     VS_BACK,            VS_SYMBOLEDITOR,     RSFT(KC_TAB),    KC_TAB,           SHELL_DEL_WORD,                      LCTL(KC_LEFT), KC_LEFT,    KC_DOWN,         KC_RIGHT,   LCTL(KC_RIGHT),
-    VS_LINE,            VS_FILE,             VS_TABLEFT,      VS_TABRIGHT,      VS_CLOSETAB,                         KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDOWN,
+    VS_LINE,            VS_FILE,             VS_TABLEFT,      VS_TABRIGHT,      VS_CLOSETAB,                         KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDN,
     VS_COMMANDS,        VS_CMT_LINE,         VS_BM_PREV,      VS_BM_NEXT,       VS_BM_TOGGLE,          KC_TRNS, KC_ENTER, KC_SPACE,      KC_BSPC,    RCTL(KC_BSPC),   KC_DELETE,  LCTL(KC_DELETE)
   ),
 #else
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [KEYNAV] = LAYOUT(
     KC_ESC,             AS_GO_IMPLEMENTATION,  RCTL(KC_Z),      RCTL(KC_S),       MEH(KC_A),                           MEH(KC_B),     KC_HOME,    KC_UP,           KC_END,     KC_PGUP,
     AS_BACK,            AS_SYMBOL,             RSFT(KC_TAB),    KC_TAB,           SHELL_DEL_WORD,                      LCTL(KC_LEFT), KC_LEFT,    KC_DOWN,         KC_RIGHT,   LCTL(KC_RIGHT),
-    AS_FINDUSAGE,       AS_CLASS,              AS_TABLEFT,      AS_TABRIGHT,      AS_CLOSETAB,                         KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDOWN,
+    AS_FINDUSAGE,       AS_CLASS,              AS_TABLEFT,      AS_TABRIGHT,      AS_CLOSETAB,                         KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDN,
     AS_CLOSETOOLWINDOW, AS_GO_DECLARATION,     KC_TRNS,         KC_TRNS,          AS_ALTENTER,          KC_TRNS, KC_ENTER, KC_SPACE,      KC_BSPC,    RCTL(KC_BSPC),   KC_DELETE,  LCTL(KC_DELETE)
   ),
 #endif
diff --git a/keyboards/avalanche/avalanche.c b/keyboards/avalanche/avalanche.c
index 08d95043b2..7efdf591d5 100644
--- a/keyboards/avalanche/avalanche.c
+++ b/keyboards/avalanche/avalanche.c
@@ -16,7 +16,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
         if (clockwise) {
             tap_code(KC_PGUP);
         } else {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         }
     }
     return true;
diff --git a/keyboards/basekeys/slice/keymaps/default/keymap.c b/keyboards/basekeys/slice/keymaps/default/keymap.c
index 069b8660ab..52c407630f 100644
--- a/keyboards/basekeys/slice/keymaps/default/keymap.c
+++ b/keyboards/basekeys/slice/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
        RGB_MODE_FORWARD,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT(
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,      KC_BSPACE,
+       KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,      KC_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c b/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c
index 245eccba3b..c1174324f8 100644
--- a/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c
+++ b/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c
@@ -32,7 +32,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_split_left_space(
   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
index e0f73fab2f..5038efffb6 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
@@ -53,7 +53,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS, 
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FLOCK] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS, 
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-      KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPACE, KC_DEL,
+      KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPC, KC_DEL,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
       _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,  _______,   _______, 
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS, 
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS, 
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c
index 59c19d50e3..3702bc4b69 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c
@@ -34,7 +34,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
-       KC_ESC,TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPACE,    KC_DEL,
+       KC_ESC,TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPC,    KC_DEL,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c
index 7e846f3e26..13ded633b8 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c
@@ -34,7 +34,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_split_backspace(
   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
index 57b94c5bdf..46232c54da 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ enum layer_number {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPACE,    KC_DEL,
+       KC_ESC, KC_GRAVE,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPC,    KC_DEL,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPACE, KC_BSPACE, KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       RGB_MODE_FORWARD,   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
index 4b2de19761..d3add93257 100644
--- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
+++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
@@ -46,7 +46,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
        RGB_MODE_FORWARD,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT(
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,      KC_BSPACE,
+       KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,      KC_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT(
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC,  KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPACE,
+       KC_ESC,  KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       RGB_MODE_FORWARD,    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT(
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,       KC_BSPACE,
+       KC_ESC, KC_GRAVE,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,       KC_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       RGB_MODE_FORWARD,    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c
index fa5abd90a5..4e37d1146f 100644
--- a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c
+++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ enum layer_number {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
        RGB_MODE_FORWARD,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_all(
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC,  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_BSPACE,
+       KC_ESC,  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_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
        RGB_MODE_FORWARD,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_all(
   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPACE,
+       KC_ESC, KC_GRAVE,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,      KC_BSPC,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
        RGB_MODE_FORWARD,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC,   KC_BSLS,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
index 42915e43e4..9f497e2c14 100644
--- a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
@@ -187,7 +187,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 const key_override_t tilde_esc_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, S(KC_GRAVE));
 const key_override_t grave_esc_override = ko_make_basic(MOD_MASK_GUI, KC_ESC, KC_GRAVE);
-const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPACE, KC_DELETE);
+const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DELETE);
 
 
 const key_override_t **key_overrides = (const key_override_t *[]){
diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
index f4f8cfd1da..bc894df647 100644
--- a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_split_4x6_5(
     KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCREEN, KC_MUTE,
+    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCR   , KC_MUTE,
     _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
     _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD,
 
diff --git a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
index f4f8cfd1da..bc894df647 100644
--- a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
+++ b/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_split_4x6_5(
     KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCREEN, KC_MUTE,
+    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCR   , KC_MUTE,
     _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
     _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD,
 
diff --git a/keyboards/bioi/g60/keymaps/default/keymap.c b/keyboards/bioi/g60/keymaps/default/keymap.c
index 3c4024aef2..f7fb671072 100644
--- a/keyboards/bioi/g60/keymaps/default/keymap.c
+++ b/keyboards/bioi/g60/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base Layer
     LAYOUT_all(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPACE, KC_GRV,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
diff --git a/keyboards/bioi/g60/keymaps/via/keymap.c b/keyboards/bioi/g60/keymaps/via/keymap.c
index f7c25cba3a..7796741100 100644
--- a/keyboards/bioi/g60/keymaps/via/keymap.c
+++ b/keyboards/bioi/g60/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base Layer
     [0] = LAYOUT_all(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPACE, KC_GRV,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
diff --git a/keyboards/bioi/morgan65/keymaps/default/keymap.c b/keyboards/bioi/morgan65/keymaps/default/keymap.c
index 991e240362..f58514949d 100644
--- a/keyboards/bioi/morgan65/keymaps/default/keymap.c
+++ b/keyboards/bioi/morgan65/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base Layer
     [0] = LAYOUT_all(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPACE, KC_GRV, 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_GRV, KC_F1,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_F2,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT, KC_F3,
         KC_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_F4,
diff --git a/keyboards/bioi/morgan65/keymaps/via/keymap.c b/keyboards/bioi/morgan65/keymaps/via/keymap.c
index 991e240362..f58514949d 100644
--- a/keyboards/bioi/morgan65/keymaps/via/keymap.c
+++ b/keyboards/bioi/morgan65/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base Layer
     [0] = LAYOUT_all(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPACE, KC_GRV, 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_GRV, KC_F1,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_F2,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT, KC_F3,
         KC_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_F4,
diff --git a/keyboards/bioi/s65/keymaps/default/keymap.c b/keyboards/bioi/s65/keymaps/default/keymap.c
index 50784cc0f7..ad76a5eb87 100644
--- a/keyboards/bioi/s65/keymaps/default/keymap.c
+++ b/keyboards/bioi/s65/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base LayerKC_W
     [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_BSPACE, KC_INS, KC_HOME, KC_PGUP,
+        KC_ESC, KC_1, KC_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_NONUS_HASH, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
diff --git a/keyboards/bioi/s65/keymaps/via/keymap.c b/keyboards/bioi/s65/keymaps/via/keymap.c
index 1a6f1a1df0..7911a4f6e3 100644
--- a/keyboards/bioi/s65/keymaps/via/keymap.c
+++ b/keyboards/bioi/s65/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base LayerKC_W
     [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_BSPACE, KC_INS, KC_HOME, KC_PGUP,
+        KC_ESC, KC_1, KC_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_NONUS_HASH, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
diff --git a/keyboards/blackplum/keymaps/default/keymap.c b/keyboards/blackplum/keymaps/default/keymap.c
index 94d4b8e60b..cecd5545aa 100644
--- a/keyboards/blackplum/keymaps/default/keymap.c
+++ b/keyboards/blackplum/keymaps/default/keymap.c
@@ -16,7 +16,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_68_ansi(
     KC_GESC, 	KC_1,    	KC_2,    	KC_3,    KC_4,    	KC_5,    KC_6,    KC_7,    	KC_8,    	KC_9,    	KC_0,    	KC_MINS, 	KC_EQL,  	KC_BSPC, 	KC_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_PGDOWN,
+    KC_TAB,  	KC_Q,    	KC_W,    	KC_E,    KC_R,    	KC_T,    KC_Y,    KC_U,    	KC_I,    	KC_O,    	KC_P,    	KC_LBRC, 	KC_RBRC, 	KC_BSLS, 	KC_DEL,		KC_PGDN,
     KC_CAPS, 	KC_A,    	KC_S,    	KC_D,    KC_F,    	KC_G,    KC_H,    KC_J,    	KC_K,    	KC_L,    	KC_SCLN, 	KC_QUOT, 				KC_ENT,
     KC_LSFT, 	KC_Z,    	KC_X,    	KC_C,    KC_V,    	KC_B,    KC_N,    KC_M,    	KC_COMM, 				KC_DOT,  	KC_SLSH, 				KC_RSFT,	KC_UP,
     KC_LCTL , 	KC_LGUI , 	KC_LALT ,                      	KC_SPC ,											KC_RALT , 	MO(_FN) ,	KC_RCTL, 	KC_LEFT,	KC_DOWN,	KC_RIGHT
diff --git a/keyboards/blackplum/keymaps/via/keymap.c b/keyboards/blackplum/keymaps/via/keymap.c
index f9b6685e3f..e078b962b7 100644
--- a/keyboards/blackplum/keymaps/via/keymap.c
+++ b/keyboards/blackplum/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_68_ansi(
     KC_GESC, 	KC_1,    	KC_2,    	KC_3,    KC_4,    	KC_5,    KC_6,    KC_7,    	KC_8,    	KC_9,    	KC_0,    	KC_MINS, 	KC_EQL,  	KC_BSPC, 	KC_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_PGDOWN,
+    KC_TAB,  	KC_Q,    	KC_W,    	KC_E,    KC_R,    	KC_T,    KC_Y,    KC_U,    	KC_I,    	KC_O,    	KC_P,    	KC_LBRC, 	KC_RBRC, 	KC_BSLS, 	KC_DEL,		KC_PGDN,
     KC_CAPS, 	KC_A,    	KC_S,    	KC_D,    KC_F,    	KC_G,    KC_H,    KC_J,    	KC_K,    	KC_L,    	KC_SCLN, 	KC_QUOT, 				KC_ENT,
     KC_LSFT, 	KC_Z,    	KC_X,    	KC_C,    KC_V,    	KC_B,    KC_N,    KC_M,    	KC_COMM, 				KC_DOT,  	KC_SLSH, 				KC_RSFT,	KC_UP,
     KC_LCTL , 	KC_LGUI , 	KC_LALT ,                      	KC_SPC ,											KC_RALT , 	MO(1) ,		KC_RCTL, 	KC_LEFT,	KC_DOWN,	KC_RIGHT
diff --git a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
index 7e2326ad21..2c85b0985b 100644
--- a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
+++ b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_60_ansi(
     	  KC_GRV,      KC_F1,       KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,    KC_F7,   KC_F8,    KC_F9,     KC_F10,  KC_F11,  KC_F12, 	KC_DEL, 
-    KC_MS_ACCEL0, KC_MS_BTN1,    KC_MS_UP, KC_MS_BTN2, 	 _______,    _______, 	 _______,  _______, _______,  _______, KC_PSCREEN, _______, _______, _______, 
+    KC_MS_ACCEL0, KC_MS_BTN1,    KC_MS_UP, KC_MS_BTN2, 	 _______,    _______, 	 _______,  _______, _______,  _______, KC_PSCR, _______, _______, _______, 
     KC_MS_ACCEL1, KC_MS_LEFT,  KC_MS_DOWN,KC_MS_RIGHT, 	 _______,    _______,	 _______,  _______, _______,  _______,    _______, _______,          _______, 
     KC_MS_ACCEL2,    _______,     _______,    _______,    _______,    _______,    _______,  _______, _______,  _______,              KC_UP,          MO(_FN1), 
     	 _______,    _______,     _______,                                       _______,                                 KC_LEFT, KC_DOWN, KC_RGHT, _______
diff --git a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
index 498f11d67d..6c3f82ef3b 100644
--- a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
+++ b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [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_MS_ACCEL0, KC_MS_BTN1,    KC_MS_UP, KC_MS_BTN2, 	 KC_TRNS,    KC_TRNS, 	 KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_PSCREEN, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_MS_ACCEL0, KC_MS_BTN1,    KC_MS_UP, KC_MS_BTN2, 	 KC_TRNS,    KC_TRNS, 	 KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_MS_ACCEL1, KC_MS_LEFT,  KC_MS_DOWN,KC_MS_RIGHT, 	 KC_TRNS,    KC_TRNS,	 KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, 
     KC_MS_ACCEL2,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,              KC_UP,          MO(2), 
     KC_TRNS,    KC_TRNS,     KC_TRNS,                                       KC_TRNS,                                 KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS
diff --git a/keyboards/cantor/keymaps/zeromist/keymap.c b/keyboards/cantor/keymaps/zeromist/keymap.c
index 1c4f56a727..993020200b 100644
--- a/keyboards/cantor/keymaps/zeromist/keymap.c
+++ b/keyboards/cantor/keymaps/zeromist/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       */
     [2] = LAYOUT_split_3x6_3(
       //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_MSTP, KC_MPLY,    KC_MPRV,   KC_MNXT,  KC_NO,    KC_CAPS,              KC_PGDOWN,    KC_PGUP,    KC_INS,      KC_PSCR,    KC_NO,    KC_BSPC,
+        KC_MSTP, KC_MPLY,    KC_MPRV,   KC_MNXT,  KC_NO,    KC_CAPS,              KC_PGDN,      KC_PGUP,    KC_INS,      KC_PSCR,    KC_NO,    KC_BSPC,
       //--------------------------------------------------------------         ---------------------------------------------------------------------------------
         KC_NO,   KC_HOME,    KC_END,    C(KC_C),    C(KC_V),   KC_NO,         KC_LEFT,    KC_DOWN,   KC_UP,    KC_RGHT,    KC_DEL,   KC_NO,
       //--------------------------------------------------------------         ---------------------------------------------------------------------------------
diff --git a/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c b/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
index 0f147a61b0..81b0741436 100644
--- a/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
@@ -28,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *      `---------------------------------------------'
    */
     LAYOUT_42key( /* Base */
-        KC_TAB, KC_SLASH, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_MINUS, KC_BSPACE,
+        KC_TAB, KC_SLASH, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_MINUS, KC_BSPC,
         KC_LCTRL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER,
-        KC_LSFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(1),
+        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
         KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
diff --git a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
index 4baddcfec7..81635076c2 100644
--- a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *      `---------------------------------------------'
    */
     LAYOUT_42key( /* Base */
-        KC_TAB, KC_SCOLON, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPACE,
+        KC_TAB, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPC,
         KC_LCTRL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
diff --git a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
index 4097a3724d..d89fa5fd22 100644
--- a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *      `---------------------------------------------'
    */
     LAYOUT_42key( /* Base */
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPACE,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENTER,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
+        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
diff --git a/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c b/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
index 3b698dfedf..61705f51cf 100644
--- a/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
@@ -28,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *      `---------------------------------------------'
    */
     LAYOUT_44key( /* Base */
-        KC_TAB, KC_SLASH, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_MINUS, KC_BSPACE,
+        KC_TAB, KC_SLASH, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_MINUS, KC_BSPC,
         KC_LCTRL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER,
-        KC_LSFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_DELETE,
+        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
         KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
diff --git a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
index 5338c31c6f..07cf5031c3 100644
--- a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *      `---------------------------------------------'
    */
     LAYOUT_44key( /* Base */
-        KC_TAB, KC_SCOLON, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPACE,
+        KC_TAB, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPC,
         KC_LCTRL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
diff --git a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
index 224e9091ba..db8ac6da81 100644
--- a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *      `---------------------------------------------'
    */
     LAYOUT_44key( /* Base */
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPACE,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENTER,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
+        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
diff --git a/keyboards/chavdai40/keymaps/default/keymap.c b/keyboards/chavdai40/keymaps/default/keymap.c
index 224e9091ba..db8ac6da81 100644
--- a/keyboards/chavdai40/keymaps/default/keymap.c
+++ b/keyboards/chavdai40/keymaps/default/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *      `---------------------------------------------'
    */
     LAYOUT_44key( /* Base */
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPACE,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENTER,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
+        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
diff --git a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
index f05b85a548..2f1273cf63 100644
--- a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNC] = LAYOUT_ortho_4x12(
   KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
   KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
-  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
+  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
   _______,   _______, _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_ortho_4x12(
-  KC_GRV,     XXXXXXX, M_WORD_SEL, KC_LBRC,       KC_RBRC,       XXXXXXX,   XXXXXXX,       KC_PGUP,  KC_HOME,  KC_PGDOWN,  XXXXXXX,        KC_PSCREEN            ,
+  KC_GRV,     XXXXXXX, M_WORD_SEL, KC_LBRC,       KC_RBRC,       XXXXXXX,   XXXXXXX,       KC_PGUP,  KC_HOME,  KC_PGDN,    XXXXXXX,        KC_PSCR               ,
   KC_GRV,     XXXXXXX, XXXXXXX,    LSFT(KC_9),    LSFT(KC_0),    XXXXXXX,   XXXXXXX,       KC_HOME,  KC_UP,    KC_END,     XXXXXXX,        LCTL(LSFT(KC_EQL))    ,
   _______,    XXXXXXX, XXXXXXX,    LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX,   LCTL(KC_LEFT), KC_LEFT,  KC_DOWN,  KC_RIGHT,   LCTL(KC_RIGHT), LCTL(KC_MINS)         ,
   MO(_MOUSE), _______, _______,    _______,       _______,       KC_LALT,   KC_ENT,        _______,  XXXXXXX,  _______,    _______,        _______
diff --git a/keyboards/cipulot/kallos/keymaps/default/keymap.c b/keyboards/cipulot/kallos/keymaps/default/keymap.c
index 501e8fb482..6331b4ef70 100644
--- a/keyboards/cipulot/kallos/keymaps/default/keymap.c
+++ b/keyboards/cipulot/kallos/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_default(
 	  KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MO(1),   KC_DEL,
       KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,  KC_PGUP,
-      KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDOWN,
+      KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
       KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
       KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
       KC_LCTL,           KC_LALT,                            KC_SPC,                    KC_RCTL,          KC_RALT,          KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/cipulot/kallos/keymaps/via/keymap.c b/keyboards/cipulot/kallos/keymaps/via/keymap.c
index 501e8fb482..6331b4ef70 100644
--- a/keyboards/cipulot/kallos/keymaps/via/keymap.c
+++ b/keyboards/cipulot/kallos/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_default(
 	  KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MO(1),   KC_DEL,
       KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,  KC_PGUP,
-      KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDOWN,
+      KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
       KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
       KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
       KC_LCTL,           KC_LALT,                            KC_SPC,                    KC_RCTL,          KC_RALT,          KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/contender/keymaps/default/keymap.c b/keyboards/contender/keymaps/default/keymap.c
index 6ba7247176..016c9c36d5 100644
--- a/keyboards/contender/keymaps/default/keymap.c
+++ b/keyboards/contender/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-                           KC_ESCAPE,   KC_LSFT,      KC_TAB,          KC_BSPACE,
+                           KC_ESCAPE,   KC_LSFT,      KC_TAB,          KC_BSPC,
                            KC_NLCK,     KC_KP_SLASH,  KC_KP_ASTERISK,  KC_EQUAL,
                            KC_KP_7,     KC_KP_8,      KC_KP_9,         KC_KP_MINUS,
       MO(_FUNCTION),       KC_KP_4,     KC_KP_5,      KC_KP_6,         KC_KP_PLUS,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Lightning */
     [_UNRULY] = LAYOUT(
-                           KC_ESCAPE,   KC_LSFT,      KC_TAB,          KC_BSPACE,
+                           KC_ESCAPE,   KC_LSFT,      KC_TAB,          KC_BSPC,
                            KC_NLCK,     KC_KP_SLASH,  KC_KP_ASTERISK,  KC_EQUAL,
                            KC_KP_7,     KC_KP_8,      KC_KP_9,         KC_KP_MINUS,
       KC_TRNS,             KC_KP_4,     KC_KP_5,      KC_KP_6,         KC_KP_PLUS,
diff --git a/keyboards/converter/m0110_usb/keymaps/default/keymap.c b/keyboards/converter/m0110_usb/keymaps/default/keymap.c
index 797c7939b3..a02bab923b 100644
--- a/keyboards/converter/m0110_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/m0110_usb/keymaps/default/keymap.c
@@ -52,7 +52,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_P7,   KC_P8,  KC_P9,   KC_PMNS,
 	       KC_LCAP, KC_A,    KC_S, KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,   KC_SCLN,          KC_QUOT,          KC_ENT,   KC_P4,   KC_P5,  KC_P6,   KC_PPLS,
 	       KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,                            KC_UP,    KC_P1,   KC_P2,  KC_P3,   KC_PENT,
-	       KC_LALT, KC_LGUI,                   KC_SPC,                      MO(1),  LT(1, KC_BSLASH), KC_LEFT, KC_RGHT, KC_DOWN,  KC_P0,           KC_PDOT),
+	       KC_LALT, KC_LGUI,                   KC_SPC,                      MO(1),  LT(1, KC_BSLS),   KC_LEFT, KC_RGHT, KC_DOWN,  KC_P0,           KC_PDOT),
 		
 	
 	/* Cursor Layer:
diff --git a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
index f3a16b9955..3b683e1c95 100644
--- a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
+++ b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
@@ -37,7 +37,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_ENT,      KC_P7,   KC_P8,  KC_P9,   KC_PMNS, \
 	       CTRL_C_UP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN,          KC_QUOT, KC_NUHS,              KC_P4,   KC_P5,  KC_P6,   KC_PPLS, \
 	       KC_LSFT,   KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,                                KC_P1,   KC_P2,  KC_P3,   KC_PENT, \
-	               KC_LALT,   KC_LGUI,                        KC_SPC,                        MO(1),                                LT(1, KC_BSLASH), KC_DOWN),
+	               KC_LALT,   KC_LGUI,                        KC_SPC,                        MO(1),                                LT(1, KC_BSLS), KC_DOWN),
 
 
 	/* Cursor Layer:
diff --git a/keyboards/converter/sun_usb/command_extra.c b/keyboards/converter/sun_usb/command_extra.c
index 332776ab90..b15f9dc9bd 100644
--- a/keyboards/converter/sun_usb/command_extra.c
+++ b/keyboards/converter/sun_usb/command_extra.c
@@ -47,7 +47,7 @@ bool command_extra(uint8_t code)
             uart_write(0x0E);
             uart_write(0xFF);
             break;
-        case KC_PGDOWN:
+        case KC_PGDN:
             print("LED all off\n");
             uart_write(0x0E);
             uart_write(0x00);
diff --git a/keyboards/converter/sun_usb/type3/keymaps/default/keymap.c b/keyboards/converter/sun_usb/type3/keymaps/default/keymap.c
index e8b4799b94..84f4b821ae 100644
--- a/keyboards/converter/sun_usb/type3/keymaps/default/keymap.c
+++ b/keyboards/converter/sun_usb/type3/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_F12,KC_F13,  KC_ESC,KC_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_MPRV, KC_MPLY, KC_MNXT,
       KC_F14,KC_F15,  KC_TAB,  KC_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_HOME, KC_UP,   KC_PGUP,
       KC_F16,KC_F17,  KC_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_INSERT,KC_RIGHT,
-      KC_F18,KC_F19,  KC_LSFT,     KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_RCTL,  KC_END,  KC_DOWN,KC_PGDOWN,
+      KC_F18,KC_F19,  KC_LSFT,     KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_RCTL,  KC_END,  KC_DOWN,KC_PGDN,
                       KC_LGUI,KC_LALT,                      KC_SPC,                        KC_RALT,KC_RGUI
          ),
 };
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
index b9b9c5ad2c..37ba674f03 100644
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                        ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
         ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_MINS, S(KC_EQL), S(KC_9), S(KC_0),  ______,  ______,                     ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
         ______,  ______,  ______,  ______,  ______,  ______,  S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC),  ______,                       ______,                                    ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  KC_EQL, S(KC_BSLASH), S(KC_COMM), S(KC_DOT), S(KC_SLSH),                             ______,               ______,              ______,  ______,  ______,  ______,
+        ______,  ______,  ______,  ______,  ______,  ______,  KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH),                             ______,               ______,              ______,  ______,  ______,  ______,
         ______,  ______,  ______,                    ______,                                                            ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
     ),
 
diff --git a/keyboards/crkbd/keymaps/gotham/keymap.c b/keyboards/crkbd/keymaps/gotham/keymap.c
index 4c05e54999..c58e7b10ec 100644
--- a/keyboards/crkbd/keymaps/gotham/keymap.c
+++ b/keyboards/crkbd/keymaps/gotham/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
      _______, KC_ANGL, KC_ANGR, KC_LPRN, KC_RPRN, KC_PGUP,                      KC_MINS, KC_LEFT, KC_UP,   KC_RIGHT,KC_PLUS, _______,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     _______, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_PGDOWN,                    KC_UNDS, KC_HOME, KC_DOWN, KC_END,  XXXXXXX, _______,
+     _______, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_PGDN,                      KC_UNDS, KC_HOME, KC_DOWN, KC_END,  XXXXXXX, _______,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                          _______, _______, _______,    _______, LOW_DEL, _______
                                       //|--------------------------|  |--------------------------|
diff --git a/keyboards/crkbd/keymaps/julian_turner/keymap.c b/keyboards/crkbd/keymaps/julian_turner/keymap.c
index f293f4eb2c..56f6998c50 100644
--- a/keyboards/crkbd/keymaps/julian_turner/keymap.c
+++ b/keyboards/crkbd/keymaps/julian_turner/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
        KC_LEFT_CTRL,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,                         DE_N,    DE_M, KC_COMM,  DE_DOT, XXXXXXX, XXXXXXX,
         //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                         MO(_NUMBER), MO(_SYMBOL), KC_SPC,   KC_BSPACE, KC_ENTER, XXXXXXX
+                                         MO(_NUMBER), MO(_SYMBOL), KC_SPC,   KC_BSPC, KC_ENTER, XXXXXXX
                                             //`--------------------------'  `--------------------------'
 
         ),
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
        KC_LEFT_CTRL, DE_HASH,  DE_DLR, DE_PIPE, DE_TILD,  DE_GRV,                      DE_PLUS, DE_PERC, DE_DQUO, DE_QUOT, XXXXXXX, XXXXXXX,
         //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                      MO(_NUMBER), MO(_SYMBOL),    KC_SPC,   KC_BSPACE, KC_ENTER, XXXXXXX
+                                      MO(_NUMBER), MO(_SYMBOL),    KC_SPC,   KC_BSPC, KC_ENTER, XXXXXXX
                                             //`--------------------------'  `--------------------------'
 
         ),
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
        KC_LEFT_CTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX,    DE_1,    DE_2,    DE_3, XXXXXXX, XXXXXXX,
         //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        MO(_NUMBER), MO(_SYMBOL),  KC_SPC,   KC_BSPACE, KC_ENTER, DE_0
+                                        MO(_NUMBER), MO(_SYMBOL),  KC_SPC,   KC_BSPC, KC_ENTER, DE_0
                                             //`--------------------------'  `--------------------------'
 
         ),
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
index 7e29f265af..7705aef429 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c
+++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
@@ -54,7 +54,7 @@ enum {
 
 #define MOVE_LEFT_TERMINAL LALT(KC_LEFT) //move cursor one word left on the terminal... does not work if .inputrc is set to use vim bindings!
 #define MOVE_RIGHT_TERMINAL LALT(KC_RIGHT) //move cursor one word left on the terminal... does not work if .inputrc is set to use vim bindings!
-#define DEL_WORD_TERMINAL LALT(KC_BSPACE) // delete one word back on terminal ... does not work if .inputrc is set to use vim bindings!
+#define DEL_WORD_TERMINAL LALT(KC_BSPC) // delete one word back on terminal ... does not work if .inputrc is set to use vim bindings!
 
 enum custom_layers {
     _BASE,
@@ -66,7 +66,7 @@ enum custom_layers {
 };
 
 // combo - press space and backspace together to get 'scroll lock', used as the compose key on my custom linux
-const uint16_t PROGMEM compose_combo[] = {KC_BSPACE, KC_SPACE, COMBO_END};
+const uint16_t PROGMEM compose_combo[] = {KC_BSPC, KC_SPACE, COMBO_END};
 
 // combo - press the 2 larger keys on the inner part of the corne to get the search window ('finder' as I'm calling it)
 const uint16_t PROGMEM search_combo[] = {LT(_FN_KEYS, KC_ENTER),LT(_TEXT_NAV, KC_PAST), COMBO_END};
@@ -78,13 +78,13 @@ const uint16_t PROGMEM vim_paste_combo[] = {KC_COMM, KC_DOT, COMBO_END};
 const uint16_t PROGMEM calculator_combo[] = {LT(_NUMS,KC_LPRN),  LT(_NUMS,KC_RPRN), COMBO_END};
 
 // combo - press combo+ a to get å
-const uint16_t PROGMEM acircle_combo[] = { KC_BSPACE, KC_SPACE, MT(MOD_LCTL, KC_A),COMBO_END};
+const uint16_t PROGMEM acircle_combo[] = { KC_BSPC, KC_SPACE, MT(MOD_LCTL, KC_A),COMBO_END};
 
 // combo - press combo+ l to get ä
-const uint16_t PROGMEM adot_combo[] = {KC_BSPACE, KC_SPACE, MT(MOD_RALT,KC_L), COMBO_END};
+const uint16_t PROGMEM adot_combo[] = {KC_BSPC, KC_SPACE, MT(MOD_RALT,KC_L), COMBO_END};
 
 // combo - press combo+ ; to get ö
-const uint16_t PROGMEM odot_combo[] = {KC_BSPACE, KC_SPACE, MT(MOD_LCTL,KC_SCLN),COMBO_END};
+const uint16_t PROGMEM odot_combo[] = {KC_BSPC, KC_SPACE, MT(MOD_LCTL,KC_SCLN),COMBO_END};
 
 combo_t key_combos[COMBO_COUNT] = {
     COMBO(compose_combo, COMPOSE_MACRO),
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       LT(0, SHOW_WIN_LEFT), KC_Z, KC_X,  KC_C, KC_V,  KC_B,   KC_N,                  KC_M,  KC_COMM, KC_DOT,  KC_SLASH,  LT(0, NUMERIC_WIN_RIGHT),
   //|--------+--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------+--------|
-                                         LT(_NUMS,KC_LPRN),   KC_BSPACE,  LT(_FN_KEYS, KC_ENTER),     LT(_TEXT_NAV, KC_PAST),   KC_SPACE, LT(_NUMS,KC_RPRN)
+                                         LT(_NUMS,KC_LPRN),   KC_BSPC,  LT(_FN_KEYS, KC_ENTER),     LT(_TEXT_NAV, KC_PAST),   KC_SPACE, LT(_NUMS,KC_RPRN)
                                       //`--------------------------'                    `--------------------------'
 
   ),
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
      SCREENSHOT,   KC_EXCLAIM,KC_AT, KC_HASH, KC_DOLLAR,KC_PERCENT,            KC_CIRCUMFLEX,    KC_7,    KC_8,    KC_9,    KC_TRANSPARENT, KC_PIPE, 
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI,KC_PLUS,                    KC_EQL, KC_4,  KC_5,  KC_6,  KC_BSLASH, KC_TRANSPARENT,
+      TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI,KC_PLUS,                    KC_EQL, KC_4,  KC_5,  KC_6,  KC_BSLS, KC_TRANSPARENT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LCBR, KC_LBRC, KC_GRAVE, KC_TILD, PASTE_NOSTYLE, KC_AMPERSAND,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3, KC_RBRC, KC_RCBR,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+-C```-------+--------+--------|
@@ -248,9 +248,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             switch (keycode){
                 case DEL_WORD:
                     if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(LCTL(KC_BSPACE));
+                        tap_code16(LCTL(KC_BSPC));
                     } else { //osx
-                        tap_code16(LALT(KC_BSPACE));
+                        tap_code16(LALT(KC_BSPC));
                     }
                 break;
                 case SELECT_LEFT_WD:
diff --git a/keyboards/crkbd/keymaps/sulrich/keymap.c b/keyboards/crkbd/keymaps/sulrich/keymap.c
index 84668b53c8..adab2b68ae 100644
--- a/keyboards/crkbd/keymaps/sulrich/keymap.c
+++ b/keyboards/crkbd/keymaps/sulrich/keymap.c
@@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_TRNS, KC_HASH,  KC_DLR, KC_LPRN, KC_RPRN,KC_GRAVE,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, KC_TRNS,KC_ENTER,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                      KC_UNDS, KC_AMPR, KC_LABK, KC_RABK,KC_BSLASH,KC_TRNS,
+      KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                      KC_UNDS, KC_AMPR, KC_LABK, KC_RABK,KC_BSLS,KC_TRNS,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS, KC_TRNS,KC_BSPACE,   KC_TRNS, KC_TRNS, KC_TRNS
+                                          KC_TRNS, KC_TRNS,KC_BSPC,     KC_TRNS, KC_TRNS, KC_TRNS
                                       //`--------------------------'  `--------------------------'
   ),
 
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
index e47e2df539..6072c66c71 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
         KC_TAB,  KC_CTLA,     KC_S,     KC_D,     KC_F,     KC_G,                      KC_H,     KC_J,     KC_K,     KC_L, KC_CTLSC,  KC_QUOT,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLASH,
+      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLS,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
                                   KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                               //`--------------------'  `--------------------'
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
index 703be80d96..a90b589e83 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
         KC_TAB,  KC_CTLA,     KC_S,     KC_D,     KC_F,     KC_G,                      KC_H,     KC_J,     KC_K,     KC_L, KC_CTLSC,  KC_QUOT,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLASH,
+      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLS,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
                                   KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                               //`--------------------'  `--------------------'
diff --git a/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c b/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c
index 2b4b1c2c47..3427775deb 100644
--- a/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c
+++ b/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_all(
         KC_GRV,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,      KC_EQL,     KC_BSPC,                KC_PGUP,
-        KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,                            KC_PGDOWN,
+        KC_TAB,     KC_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_LSFT,    KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,      KC_RSFT,    MO(1),      KC_UP,
         KC_LCTL,    KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RGUI,                  KC_LEFT,    KC_DOWN,    KC_RIGHT
diff --git a/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c b/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c
index b2d1e00ceb..152fddd404 100644
--- a/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c
+++ b/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
         KC_GRV,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,      KC_EQL,     KC_BSPC,                KC_PGUP,
-        KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,                            KC_PGDOWN,
+        KC_TAB,     KC_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_LSFT,    KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,      KC_RSFT,    MO(1),      KC_UP,
         KC_LCTL,    KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RGUI,                  KC_LEFT,    KC_DOWN,    KC_RIGHT
diff --git a/keyboards/do60/keymaps/default/keymap.c b/keyboards/do60/keymaps/default/keymap.c
index b99119ad4c..50f086b8b6 100644
--- a/keyboards/do60/keymaps/default/keymap.c
+++ b/keyboards/do60/keymaps/default/keymap.c
@@ -16,6 +16,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,          KC_DEL,
       KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DEC, KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
+      KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
 
 };
diff --git a/keyboards/do60/keymaps/test/keymap.c b/keyboards/do60/keymaps/test/keymap.c
index 8188bde5e4..dd4f76ac8e 100644
--- a/keyboards/do60/keymaps/test/keymap.c
+++ b/keyboards/do60/keymaps/test/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,          KC_DEL,
       KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
+      KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
 
 };
 
diff --git a/keyboards/do60/keymaps/via/keymap.c b/keyboards/do60/keymaps/via/keymap.c
index aa0c1cce7b..1c21cdba33 100644
--- a/keyboards/do60/keymaps/via/keymap.c
+++ b/keyboards/do60/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,          KC_DEL,
       KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DEC, KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
+      KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
 
   [2] = LAYOUT_all(
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,    KC_TRNS,
diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c b/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
index 420ff3d88d..1f1edae03a 100644
--- a/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
+++ b/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
@@ -58,14 +58,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_ortho_3x12(
         KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P,
-        KC_A, KC_S, FNK_D, FAR_F, KC_G, KC_GRAVE, KC_SCOLON, KC_H, KC_J, KC_K, KC_L, KC_QUOT,
+        KC_A, KC_S, FNK_D, FAR_F, KC_G, KC_GRAVE, KC_SCLN, KC_H, KC_J, KC_K, KC_L, KC_QUOT,
         SFT_Z, CTL_X, WIN_C, ALT_V, KC_B, KC_BSPC, CLS_SPC, KC_N, ALT_M, WIN_COMM, CTL_DOT, SFT_ENT
   ),
 
     [_CLOSE] = LAYOUT_ortho_3x12(
         KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,       KC_8,     KC_9,    KC_0,
         KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR,    KC_ASTR,  KC_LPRN, KC_RPRN,
-        KC_MINUS, KC_UNDS, KC_EQL,  KC_PLUS, _______, _______, vvv,     _______, KC_SCOLON,  KC_COLON, KC_SLSH, KC_QUES
+        KC_MINUS, KC_UNDS, KC_EQL,  KC_PLUS, _______, _______, vvv,     _______, KC_SCLN,    KC_COLON, KC_SLSH, KC_QUES
   ),
 
     [_FAR] = LAYOUT_ortho_3x12(
diff --git a/keyboards/dz60/keymaps/LEdiodes/keymap.c b/keyboards/dz60/keymaps/LEdiodes/keymap.c
index f7467db390..ffb7d59c36 100644
--- a/keyboards/dz60/keymaps/LEdiodes/keymap.c
+++ b/keyboards/dz60/keymaps/LEdiodes/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, KC_WH_U, KC_UP,   KC_WH_D,  _______, _______,_______,  _______,  _______,  _______,   KC_PSCR, _______,  _______,                      _______,   \
       _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_HOME, _______,  _______,  _______,   KC_HOME, _______,                        _______,   \
       _______,           _______,  KC_APP,  BL_STEP,_______,  KC_END,   KC_VOLD,  KC_VOLU,   KC_MUTE, _______,  _______,  _______, KC_PGUP,   _______,   \
-      _______, _______, _______,                                _______,_______,_______,                _______, _______,         KC_HOME, KC_PGDOWN, KC_END),
+      _______, _______, _______,                                _______,_______,_______,                _______, _______,         KC_HOME, KC_PGDN, KC_END),
 
 /* Keymap _L2: (Layer 2) This is function layer 2
  * This layer is activated while the Fn2 key is being held down.
diff --git a/keyboards/dz60/keymaps/billiams/keymap.c b/keyboards/dz60/keymaps/billiams/keymap.c
index 746c671c43..ed562fd96f 100644
--- a/keyboards/dz60/keymaps/billiams/keymap.c
+++ b/keyboards/dz60/keymaps/billiams/keymap.c
@@ -43,6 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
       KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
+      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
       ),
 };
diff --git a/keyboards/dz60/keymaps/billiams_layout4/keymap.c b/keyboards/dz60/keymaps/billiams_layout4/keymap.c
index 02fddee32d..4f21ccb83e 100644
--- a/keyboards/dz60/keymaps/billiams_layout4/keymap.c
+++ b/keyboards/dz60/keymaps/billiams_layout4/keymap.c
@@ -43,6 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
       _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
       KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
+      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
       ),
 };
diff --git a/keyboards/dz60/keymaps/bingocaller/keymap.c b/keyboards/dz60/keymaps/bingocaller/keymap.c
index cc0c0dc1f8..7c09b1f2a8 100644
--- a/keyboards/dz60/keymaps/bingocaller/keymap.c
+++ b/keyboards/dz60/keymaps/bingocaller/keymap.c
@@ -2,7 +2,7 @@
 
 #define WORD_BACK A(KC_LEFT)
 #define WORD_FORWARD A(KC_RIGHT)
-#define DELETE_WORD_BACK A(KC_BSPACE)
+#define DELETE_WORD_BACK A(KC_BACKSPACE)
 #define DELETE_WORD_FORWARD A(KC_DELETE)
 #define FINE_VOLUP S(A(KC_VOLU))
 #define FINE_VOLDOWN S(A(KC_VOLD))
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_HDUE] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, DELETE_WORD_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_PGUP, KC_END, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, DELETE_WORD_BACK, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
diff --git a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
index b72d348d6a..520d6d74a3 100644
--- a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
+++ b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
@@ -41,9 +41,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_directional(
       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,  KC_F11,    KC_F12,  _______, KC_DEL,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, KC_HOME,   KC_PGUP, _______,
-      _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_END,  KC_PGDOWN, _______,
+      _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_END,  KC_PGDN,   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______,   KC_PGUP, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
+      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
       ),
 
   /* FN2 Layer (Media)
diff --git a/keyboards/dz60/keymaps/doogle999/keymap.c b/keyboards/dz60/keymaps/doogle999/keymap.c
index 787fc8890c..8ecd0402f9 100644
--- a/keyboards/dz60/keymaps/doogle999/keymap.c
+++ b/keyboards/dz60/keymaps/doogle999/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       QK_BOOT, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_VOLD, KC_VOLU, KC_MUTE,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, BL_DEC, BL_INC, BL_TOGG, KC_APP,
       KC_LSFT, ______, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_TOG, KC_RSFT, KC_PGUP, KC_INSERT,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, TO(2), ______, KC_HOME, KC_PGDOWN, KC_END
+      KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, TO(2), ______, KC_HOME, KC_PGDN, KC_END
       ),
 
   /* Hardware calculator layer
diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
index a93f0ab4ca..89cc8354c0 100644
--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	    KC_ESC,    KC_F1,     KC_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_MS_LEFT,KC_MS_DOWN,KC_MS_UP,  KC_MS_RIGHT,_______,  _______,   KC_LEFT,   KC_DOWN,   KC_UP,     KC_RIGHT,  _______,   _______,   _______,
-        _______,   _______,   _______,   _______,   _______,   KC_MS_BTN1,KC_MS_BTN2,_______,   KC_HOME,   KC_PGDOWN, KC_PGUP,   KC_END,    _______,
+        _______,   _______,   _______,   _______,   _______,   KC_MS_BTN1,KC_MS_BTN2,_______,   KC_HOME,   KC_PGDN,   KC_PGUP,   KC_END,    _______,
         _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______),
 
   /* Keymap NL: Numpad Layer
diff --git a/keyboards/dz60/keymaps/marianas/keyDefinitions.h b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
index dfdea36695..f3122acf5f 100644
--- a/keyboards/dz60/keymaps/marianas/keyDefinitions.h
+++ b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
@@ -4,7 +4,7 @@
 #define BACKSPC KC_BSPC
 #define ENTER_OR_SQL LT(SQLMACROS,KC_ENT)
 #define ESCAP KC_ESC
-#define PSCR KC_PSCREEN
+#define PSCR KC_PSCR
 #define SCRL KC_SCRL
 #define PAUS KC_PAUSE
 #define NSRT KC_INSERT
diff --git a/keyboards/dz60/keymaps/mpaarating/keymap.c b/keyboards/dz60/keymaps/mpaarating/keymap.c
index 3ad32aae0a..37de7be6d5 100644
--- a/keyboards/dz60/keymaps/mpaarating/keymap.c
+++ b/keyboards/dz60/keymaps/mpaarating/keymap.c
@@ -7,8 +7,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[L0] = LAYOUT_60_2_function(
-		KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSLASH, 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_BSPACE,
+		KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSLS, KC_GRAVE,
+		KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(L1),
 		KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL, KC_RGUI, MO(L1)
diff --git a/keyboards/dz60/keymaps/olivierko/keymap.c b/keyboards/dz60/keymaps/olivierko/keymap.c
index 8d3d4eb3d2..2622fafa69 100644
--- a/keyboards/dz60/keymaps/olivierko/keymap.c
+++ b/keyboards/dz60/keymaps/olivierko/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_DELETE,
 		KC_NO,		DF(_BL),	DF(_SL),	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_INS,	
 		KC_LSFT,	KC_NO,		KC_NO,		KC_CAPS,	KC_NO,		KC_NO,		KC_NO,		KC_MUTE,	KC_NO,		KC_NO,		KC_NO,		KC_PGUP,	KC_RSFT,	
-		KC_LCTL,	MO(_CL),	KC_LALT,										KC_MPLY,										KC_HOME,	KC_PGDOWN,	KC_END,		KC_RCTL),
+		KC_LCTL,	MO(_CL),	KC_LALT,										KC_MPLY,										KC_HOME,	KC_PGDN,	KC_END,		KC_RCTL),
 											
 	[_CL] = LAYOUT_olivierko(								
 		RGB_TOG,	RGB_MOD,	RGB_HUI,	RGB_HUD,	RGB_SAI,	RGB_SAD,	RGB_VAI,	RGB_VAD,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,			KC_NO,
diff --git a/keyboards/dz60/keymaps/pinpox/keymap.c b/keyboards/dz60/keymaps/pinpox/keymap.c
index dd2aefe68f..a762a379be 100644
--- a/keyboards/dz60/keymaps/pinpox/keymap.c
+++ b/keyboards/dz60/keymaps/pinpox/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Special keys
 	[1] = LAYOUT_60_ansi(
 			KC_SLEP, KC_F1,   KC_F2,    KC_F3,   KC_F3,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,   KC_DEL,
-			KC_NO,   RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_DOWN, KC_RGHT, KC_NO,   KC_NO,  KC_NO,   KC_PGUP,   KC_PGDOWN,KC_NO,
+			KC_NO,   RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_DOWN, KC_RGHT, KC_NO,   KC_NO,  KC_NO,   KC_PGUP,   KC_PGDN,  KC_NO,
 			KC_CAPS, BL_TOGG, RGB_TOG,  KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,     KC_MFFD,
 			KC_NO,   BL_INC,  BL_DEC,   BL_BRTG, KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_HOME, KC_END, KC_NO,   KC_PSCR,
 			KC_NO,   KC_NO,   KC_TRNS,  KC_MPLY, KC_NO,   KC_NO,   KC_TRNS, KC_NO
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index efed4494ef..ff140341cb 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,    KC_P0,    KC_PDOT,                        KC_ENT,                             KC_P0,    KC_PDOT,  _______,  _______,              _______),
 	[_LAYER4] = LAYOUT( /* WIN */
 		KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,            KC_MINS,  KC_EQL,  KC_BSPC,
-		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,            KC_LBRC,  KC_RBRC, KC_BSLASH,
+		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,            KC_LBRC,  KC_RBRC, KC_BSLS,
 		CTL_T(KC_CAPS),     KC_A,     KC_S,  KC_D,  KC_F,  KC_G,    KC_H,  KC_J,    KC_K,     KC_L,  KC_SCLN,  KC_QUOT,           KC_ENT,
 		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
 		KC_LCTL,  KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,  MO(5)  , KC_LEFT,         KC_DOWN,           KC_RIGHT),
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,  KC_BRID,  KC_BRIU, LCTL(KC_UP), LSFT(KC_F12),     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
 		_______,  _______,  KC_UP,    _______,  _______,  _______,  KC_CALC,  _______,  KC_INS,   _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT,
 		_______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,            _______,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDOWN, KC_VOLU,           KC_MUTE,
+		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN, KC_VOLU,           KC_MUTE,
 		_______,  _______,  _______,                      TO(0),                        _______,  _______,  KC_MPRV,  KC_VOLD,            KC_MNXT),
 }
 ;
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
index 2d1d971f78..994c2a3a9a 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
@@ -29,7 +29,7 @@ enum layers {
 /* Word movement/deletetion */
 #define WORD_BK A(KC_LEFT)
 #define WORD_FW A(KC_RIGHT)
-#define D_WORD_BK A(KC_BSPACE)
+#define D_WORD_BK A(KC_BACKSPACE)
 #define D_WORD_FW A(KC_DELETE)
 /* Fine volume control */
 #define FVOLU S(A(KC_VOLU))
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
index c1996417ef..64b64c6694 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
@@ -36,9 +36,9 @@ enum my_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_ALPHA_LAYER] = LAYOUT_65_ansi(
-		KC_GESC,	KC_1,	KC_2,	KC_3,   KC_4,	KC_5,	KC_6,	KC_7,	KC_8,		KC_9,	KC_0,		KC_MINUS,	KC_EQUAL,		KC_BSPACE,	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_BSLASH,	KC_PGUP,
-		KC_LCTRL,	KC_A,   KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,		KC_L,	KC_SCOLON,	KC_QUOTE,	        KC_ENTER,	        KC_PGDOWN,
+		KC_GESC,	KC_1,	KC_2,	KC_3,   KC_4,	KC_5,	KC_6,	KC_7,	KC_8,		KC_9,	KC_0,		KC_MINUS,	KC_EQUAL,		KC_BSPC,	KC_HOME,
+		KC_TAB,		KC_Q,	KC_W,	KC_E,	KC_R,	KC_T,	KC_Y,	KC_U,	KC_I,		KC_O,	KC_P,		KC_LBRC,KC_RBRC,	KC_BSLS,	KC_PGUP,
+		KC_LCTRL,	KC_A,   KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,		KC_L,	KC_SCLN,	KC_QUOTE,	        KC_ENTER,	        KC_PGDN,
 		KC_LSHIFT,	KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMMA,	KC_DOT,	KC_SLASH,           KC_RSHIFT,          KC_UP,		KC_END,
 		KC_CAPS,KC_LGUI,FN_MO13,				KC_SPACE,                       FN_MO23,	KC_LALT,    KC_RCTRL,       KC_LEFT,	KC_DOWN,	KC_RIGHT
     ),
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRAVE,	    KC_F1,		        KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_F11,		KC_F12,		KC_DELETE,	KC_INSERT,
 		KC_TRNS,	    KC_TRNS,	        KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	DEL_HOME,	KC_HOME,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_SCRL,
 		KC_TRNS,	    KC_TRNS,	        KC_TRNS,	KC_TRNS,	KC_TRNS,	DEL_LINE,	KC_LEFT,	KC_DOWN,	KC_UP,		KC_RIGHT,	KC_TRNS,	KC_TRNS,		    KC_MPLY,        KC_PAUSE,
-		KC_TRNS,        AUTOCLICK_TOGGLE,   KC_TRNS,	AUTO_BURST,RAPID_BURST,	KC_TRNS,	DEL_END,	KC_END,	    KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_VOLU,	KC_PSCREEN,
+		KC_TRNS,        AUTOCLICK_TOGGLE,   KC_TRNS,	AUTO_BURST,RAPID_BURST,	KC_TRNS,	DEL_END,	KC_END,	    KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_VOLU,	KC_PSCR,
 		DEC_CLICK_SPEED,INC_CLICK_SPEED,	KC_TRNS,                                KC_TRNS,						            KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MPRV,    KC_VOLD,	KC_MNXT
     ),
     [_MOUSE_LAYER] = LAYOUT_65_ansi(
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
index 1c7308cb3a..61a6779ebf 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
@@ -47,37 +47,37 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Layer 0: basic keys.
   [BASE] = LAYOUT_ergodox_pretty(
-    KC_DLR,           KC_AMPR,  KC_LBRC,  KC_LCBR, KC_RCBR, KC_LPRN, KC_CIRC,           KC_F4,        KC_EQUAL,KC_ASTR, KC_BSLASH, KC_PLUS, KC_RBRC,     KC_EXLM,
-    GUI_T(KC_BSLASH), KC_SCOLON,KC_COMMA, KC_DOT,  KC_P,    KC_Y,    KC_PERC,           KC_DELETE,    KC_F,    KC_G,    KC_C,      KC_R,    KC_L,        KC_SLASH,
+    KC_DLR,           KC_AMPR,  KC_LBRC,  KC_LCBR, KC_RCBR, KC_LPRN, KC_CIRC,           KC_F4,        KC_EQUAL,KC_ASTR, KC_BSLS,   KC_PLUS, KC_RBRC,     KC_EXLM,
+    GUI_T(KC_BSLS),   KC_SCLN,  KC_COMMA, KC_DOT,  KC_P,    KC_Y,    KC_PERC,           KC_DELETE,    KC_F,    KC_G,    KC_C,      KC_R,    KC_L,        KC_SLASH,
     MO(NUM),          KC_A,     KC_O,     KC_E,    KC_U,    KC_I,                                     KC_D,    KC_H,    KC_T,      KC_N,    KC_S,        KC_MINUS,
     KC_LSPO,          KC_QUOTE, KC_Q,     KC_J,    KC_K,    KC_X,    KC_LALT,           TD(TAP_MACRO),KC_B,    KC_M,    KC_W,      KC_V,    KC_Z,        KC_RSPC,
     KC_AT,            KC_HASH,  KC_GRAVE, KC_LEFT, KC_RIGHT,                                                   KC_UP,   KC_DOWN,   KC_HOME, KC_END,      TO(QWERTY),
                                          ALT_T(KC_APPLICATION), ALL_T(KC_NO),           KC_PGUP, KC_LGUI,
-                                                                   KC_BSLASH,           TO(MAC),
-                                          KC_ENTER, KC_TAB, CTL_T(KC_ESCAPE),           CTL_T(KC_ESCAPE), KC_BSPACE,  KC_SPACE),
+                                                                   KC_BSLS,             TO(MAC),
+                                          KC_ENTER, KC_TAB, CTL_T(KC_ESCAPE),           CTL_T(KC_ESCAPE), KC_BSPC,  KC_SPACE),
 
   // Layer 1: function and numpad keys.
   [NUM] = LAYOUT_ergodox_pretty(
     ___,  KC_F1,   KC_F2,    KC_F3,       KC_F4,       KC_F5,      ___,         ___, KC_F6,   KC_F7,  KC_F8,  KC_F9,      KC_F10,       KC_F11,
     ___,  KC_EXLM, KC_COMMA, KC_DOT,      KC_MS_BTN1,  KC_MS_BTN2, ___,         ___, KC_UP,   KC_7,   KC_8,   KC_9,       KC_ASTR,      KC_F12,
     XXX,  ___,     KC_LCBR,  KC_RCBR,     MC_ARROW,    KC_GRAVE,                     KC_DOWN, KC_4,   KC_5,   KC_6,       KC_PLUS,      KC_UNDS,
-    ___,  ___,     KC_CIRC,  KC_LBRC,     KC_RBRC,     KC_TILD,    ___,         ___, KC_0,    KC_1,   KC_2,   KC_3,       KC_KP_SLASH,  KC_BSLASH,
+    ___,  ___,     KC_CIRC,  KC_LBRC,     KC_RBRC,     KC_TILD,    ___,         ___, KC_0,    KC_1,   KC_2,   KC_3,       KC_KP_SLASH,  KC_BSLS,
     ___,  ___,     ___,      ___,         ___,                                                ___,    KC_0,   KC_KP_DOT,  KC_EQUAL,     ___,
                                                            ___,    ___,         KC_KP_ASTERISK, KC_KP_SLASH,
                                                                KC_LCTL,         ___,
-                                      KC_KP_PLUS,  KC_KP_MINUS, KC_DLR,         KC_DELETE, KC_BSPACE,  KC_SPACE),
+                                      KC_KP_PLUS,  KC_KP_MINUS, KC_DLR,         KC_DELETE, KC_BSPC,  KC_SPACE),
 
   // Layer 2: QWERTY control.
   [QWERTY] = LAYOUT_ergodox_pretty(
     /* left hand */
     KC_EQUAL,   KC_1,     KC_2,         KC_3,     KC_4,     KC_5,    KC_LEFT,           KC_RIGHT,     KC_6,   KC_7,   KC_8,     KC_9,         KC_0,         KC_MINUS,
-    KC_DELETE,  KC_Q,     KC_W,         KC_E,     KC_R,     KC_T,    KC_Y,              TO(BASE),     KC_Y,   KC_U,   KC_I,     KC_O,         KC_P,         KC_BSLASH,
+    KC_DELETE,  KC_Q,     KC_W,         KC_E,     KC_R,     KC_T,    KC_Y,              TO(BASE),     KC_Y,   KC_U,   KC_I,     KC_O,         KC_P,         KC_BSLS,
     MO(NUM),    KC_A,     KC_S,         KC_D,     KC_F,     KC_G,                                     KC_H,   KC_J,   KC_K,     KC_L,         KC_SCLN,      GUI_T(KC_QUOT),
     KC_LSFT,    KC_Z,     KC_X,         KC_C,     KC_V,     KC_B, ALT_T(KC_NO),         MEH_T(KC_NO), KC_N,   KC_M,   KC_COMMA, KC_DOT,       KC_SLASH,     KC_RSPC,
     KC_GRAVE,   KC_QUOTE, LALT(KC_TAB), KC_LEFT,  KC_RIGHT,                                                   KC_UP,  KC_DOWN,  KC_LBRC,      KC_RBRC,      TO(BASE),
                                                   ___, KC_LGUI,                         ___, KC_ESCAPE,
                                                        KC_HOME,                         KC_PGUP,
-                                      KC_ENTER, KC_TAB, KC_END,                         KC_PGDOWN, KC_BSPACE, KC_SPACE),
+                                      KC_ENTER, KC_TAB, KC_END,                         KC_PGDN, KC_BSPC, KC_SPACE),
 
     // Layer 3: Mac layer
     [MAC] = LAYOUT_ergodox_pretty(
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
index d2158ae370..e8ebc69525 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
@@ -30,10 +30,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB              ,KC_Q                ,KC_W                ,KC_E                ,KC_R                ,KC_T                ,TD(PASTE_DANCE) ,
     KC_DELETE           ,KC_A                ,LT(3,KC_S)          ,LT(2,KC_D)          ,LT(4,KC_F)          ,KC_G                ,
     KC_GRAVE            ,KC_Z                ,KC_X                ,KC_C                ,KC_V                ,KC_B                ,TD(COPY_CUT) ,
-    KC_BSLASH           ,OSM(MOD_LCTL)       ,OSM(MOD_LALT)       ,KC_LEFT             ,KC_RIGHT            ,
+    KC_BSLS             ,OSM(MOD_LCTL)       ,OSM(MOD_LALT)       ,KC_LEFT             ,KC_RIGHT            ,
     OSM_SF_CMD          ,KC_PLUS             ,
     KC_INSERT           ,
-    OSM(MOD_LSFT)       ,LT(2,KC_BSPACE)     ,OSM(MOD_LGUI)              ,
+    OSM(MOD_LSFT)       ,LT(2,KC_BSPC)     ,OSM(MOD_LGUI)              ,
 
 
     TO(1)               ,KC_6                ,KC_7                ,KC_8                ,KC_9                ,LT(3,KC_0)          ,KC_DQUO             ,
@@ -73,14 +73,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT,KC_TRANSPARENT,
                                   RGB_HUI       ,
     KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUD       ,
-    KC_DELETE     ,KC_A          ,KC_B          ,KC_C          ,KC_D          ,KC_E          ,KC_BSPACE     ,
+    KC_DELETE     ,KC_A          ,KC_B          ,KC_C          ,KC_D          ,KC_E          ,KC_BSPC     ,
     KC_ENTER      ,KC_F          ,KC_7          ,KC_8          ,KC_9          ,KC_PERC       ,KC_TRANSPARENT,
                    KC_HASH       ,KC_4          ,KC_5          ,KC_6          ,KC_PLUS       ,KC_KP_ASTERISK,
-    KC_KP_ENTER   ,KC_COLON      ,KC_1          ,KC_2          ,KC_3          ,KC_SLASH      ,KC_BSLASH     ,
+    KC_KP_ENTER   ,KC_COLON      ,KC_1          ,KC_2          ,KC_3          ,KC_SLASH      ,KC_BSLS       ,
                                   KC_0          ,KC_COMMA      ,KC_DOT        ,KC_EQUAL      ,KC_TRANSPARENT,
     RGB_TOG       ,RGB_SLD       ,
     RGB_VAI       ,
-    RGB_VAD       ,KC_BSPACE     ,KC_SPACE
+    RGB_VAD       ,KC_BSPC     ,KC_SPACE
   ),
 
   [3] = LAYOUT_ergodox(
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     LALT(LSFT(KC_UP))  ,KC_HASH            ,KC_LCBR            ,KC_RCBR            ,KC_KP_ASTERISK     ,KC_PERC            ,KC_DLR             ,
                         KC_AMPR            ,KC_LPRN            ,KC_RPRN            ,CLN_EQ             ,KC_KP_PLUS         ,KC_PIPE            ,
-    LALT(LSFT(KC_DOWN)),KC_EXLM            ,KC_TILD            ,KC_CIRC            ,ARROW              ,KC_BSLASH          ,KC_BSLASH          ,
+    LALT(LSFT(KC_DOWN)),KC_EXLM            ,KC_TILD            ,KC_CIRC            ,ARROW              ,KC_BSLS            ,KC_BSLS            ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     QK_BOOT              ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT     ,KC_F1              ,KC_F2              ,KC_F3              ,KC_F4              ,KC_F5              ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,LCTL(KC_Q)         ,LCTL(KC_DOWN)      ,LGUI(KC_DOWN)      ,WIN_LEFT_HALF      ,WIN_RIGHT_HALF     ,LALT(LSFT(KC_UP))  ,
     LCTL(LSFT(KC_P))   ,LCTL(KC_A)         ,SAVE               ,LCTL(KC_D)         ,KC_TRANSPARENT     ,RGUI(KC_R)         ,
-    LCTL(LSFT(KC_F))   ,UNDO               ,CUT                ,KC_PSCREEN         ,KC_TRANSPARENT     ,LGUI(KC_RIGHT)     ,LALT(LSFT(KC_DOWN)),
+    LCTL(LSFT(KC_F))   ,UNDO               ,CUT                ,KC_PSCR            ,KC_TRANSPARENT     ,LGUI(KC_RIGHT)     ,LALT(LSFT(KC_DOWN)),
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,
@@ -117,10 +117,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LALT(KC_UP)        ,LSFT(KC_HOME)      ,LSFT(KC_LEFT)      ,KC_UP              ,LSFT(KC_RIGHT)     ,LSFT(KC_END)       ,KC_F13             ,
                         KC_HOME            ,KC_LEFT            ,KC_DOWN            ,KC_RIGHT           ,KC_END             ,KC_F12             ,
     LALT(KC_DOWN)      ,LSFT(KC_INSERT)    ,LCTL(LSFT(KC_J))   ,LSFT(KC_UP)        ,KC_PGUP            ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
-    KC_TRANSPARENT                                             ,LSFT(KC_DOWN)      ,KC_PGDOWN          ,WIN_TO_LEFT        ,WIN_TO_RIGHT     ,
+    KC_TRANSPARENT                                             ,LSFT(KC_DOWN)      ,KC_PGDN            ,WIN_TO_LEFT        ,WIN_TO_RIGHT     ,
     KC_TRANSPARENT     ,KC_SYSTEM_SLEEP    ,
     KC_TRANSPARENT     ,
-    KC_TRANSPARENT     ,KC_BSPACE          ,KC_TRANSPARENT
+    KC_TRANSPARENT     ,KC_BSPC          ,KC_TRANSPARENT
   ),
 
   [5] = LAYOUT_ergodox(
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
     KC_PGUP             ,LCTL(LGUI(KC_RIGHT)),KC_MS_WH_UP         ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
     LGUI(RCTL(KC_LEFT)) ,KC_MS_WH_DOWN       ,LCTL(KC_C)          ,KC_TRANSPARENT      ,KC_MEDIA_STOP       ,KC_MEDIA_PLAY_PAUSE ,
-    KC_PGDOWN           ,LCTL(LSFT(KC_N))    ,LCTL(LSFT(KC_J))    ,KC_MEDIA_PREV_TRACK ,KC_MEDIA_NEXT_TRACK ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
+    KC_PGDN             ,LCTL(LSFT(KC_N))    ,LCTL(LSFT(KC_J))    ,KC_MEDIA_PREV_TRACK ,KC_MEDIA_NEXT_TRACK ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
     KC_AUDIO_VOL_UP     ,KC_AUDIO_VOL_DOWN   ,KC_AUDIO_MUTE       ,KC_TRANSPARENT      ,KC_TRANSPARENT      ,
     KC_TRANSPARENT      ,KC_TRANSPARENT      ,
     KC_TRANSPARENT      ,
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_SPACE      ,KC_LSHIFT     ,KC_TRANSPARENT,
 
     TO(0)         ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
-    KC_PGDOWN     ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
+    KC_PGDN       ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
     KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
     KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
     KC_ENTER      ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index b92895efe5..bfe8af5c34 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -217,7 +217,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_ESC,            KC_F1,         KC_F2,      KC_F3,        KC_F4,   KC_F5,   KC_F6,
       OSL(SCREEN_NAV),   KC_QUOTE,      KC_COMMA,   KC_DOT,       KC_P,    KC_Y,    MO(VSCODE_NAV),
       OSL(SHELL_NAV),    KC_A,          KC_O,       KC_E,         KC_U,    KC_I,
-      OSL(SHELL_SCREEN), KC_SCOLON,     KC_Q,       KC_J,         KC_K,    KC_X,    MO(VSCODE),
+      OSL(SHELL_SCREEN), KC_SCLN,       KC_Q,       KC_J,         KC_K,    KC_X,    MO(VSCODE),
       MEH(KC_0),         OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL),
 
       // left thumb cluster
@@ -252,7 +252,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,KC_TRNS,       KC_TRNS,    KC_TRNS,         KC_TRNS,    KC_TRNS,         MEH(KC_G),
     KC_TRNS,KC_NO,         KC_HOME,    KC_UP,           KC_END,     KC_PGUP,         MEH(KC_H),
             LCTL(KC_LEFT), KC_LEFT,    KC_DOWN,         KC_RIGHT,   LCTL(KC_RIGHT),  MEH(KC_I),
-    KC_TRNS,KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDOWN,       MEH(KC_J),
+    KC_TRNS,KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDN,         MEH(KC_J),
                            KC_BSPC,   RCTL(KC_BSPC),    KC_DELETE,  LCTL(KC_DELETE), MEH(KC_K),
 
     // right thumb cluster
@@ -678,33 +678,33 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         case SCREEN_READREG_1:
             tap_code16(C(KC_A));
-            tap_code16(S(KC_SCOLON));
+            tap_code16(S(KC_SEMICOLON));
             SEND_STRING("readreg 1\n");
             break;
         case SCREEN_READREG_2:
             tap_code16(C(KC_A));
-            tap_code16(S(KC_SCOLON));
+            tap_code16(S(KC_SEMICOLON));
             SEND_STRING("readreg 2\n");
             break;
         case SCREEN_READREG_3:
             tap_code16(C(KC_A));
-            tap_code16(S(KC_SCOLON));
+            tap_code16(S(KC_SEMICOLON));
             SEND_STRING("readreg 3\n");
             break;
 
         case SCREEN_PASTEREG_1:
             tap_code16(C(KC_A));
-            tap_code16(S(KC_SCOLON));
+            tap_code16(S(KC_SEMICOLON));
             SEND_STRING("paste 1\n");
             break;
         case SCREEN_PASTEREG_2:
             tap_code16(C(KC_A));
-            tap_code16(S(KC_SCOLON));
+            tap_code16(S(KC_SEMICOLON));
             SEND_STRING("paste 2\n");
             break;
         case SCREEN_PASTEREG_3:
             tap_code16(C(KC_A));
-            tap_code16(S(KC_SCOLON));
+            tap_code16(S(KC_SEMICOLON));
             SEND_STRING("paste 3\n");
             break;
     }
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
index 89ef3512ad..40e67140ff 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, TG(LAYERS), PV_NUM,     PV_NUM,     PV_NUM,
 
         // left thumb
-              KC_SPACE, KC_BSPACE,
+              KC_SPACE, KC_BSPC,
                         KC_HOME,
         PV_A, PV_O,     KC_END,
 
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // right thumb
         KC_DELETE, KC_ENTER,
         KC_PGUP,
-        KC_PGDOWN, PV_E,     PV_U
+        KC_PGDN, PV_E,     PV_U
     ),
 
     [GAMING] = LAYOUT_ergodox(
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left thumb
                    MO(MEDIA_FN), KC_NLCK,
                                  KC_SCLN,
-         KC_SPACE, KC_ENTER,     KC_BSPACE,
+         KC_SPACE, KC_ENTER,     KC_BSPC,
 
         // right hand
         KC_QUOT,       KC_Y,       KC_K,        KC_U,        KC_KP_7, KC_KP_8,  KC_KP_9,
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left thumb
                   XXXXXXX,   XXXXXXX,
                              KC_HOME,
-        KC_SPACE, KC_BSPACE, KC_END,
+        KC_SPACE, KC_BSPC,   KC_END,
 
         // right hand
         LGUI(KC_X), XXXXXXX,       LCTL(KC_X), KC_MS_WH_UP,   XXXXXXX,       XXXXXXX,        XXXXXXX,
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // right thumb
         XXXXXXX,   XXXXXXX,
         KC_PGUP,
-        KC_PGDOWN, KC_DELETE, KC_ENTER
+        KC_PGDN, KC_DELETE, KC_ENTER
     ),
 
     [MOUSE] = LAYOUT_ergodox(
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left thumb
                   XXXXXXX,   XXXXXXX,
                              KC_HOME,
-        KC_SPACE, KC_BSPACE, KC_END,
+        KC_SPACE, KC_BSPC,   KC_END,
 
         // right hand
         KC_X, KC_A, KC_B,   KC_C, KC_D,     KC_E,    KC_F,
@@ -243,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // right thumb
         XXXXXXX,   XXXXXXX,
         KC_PGUP,
-        KC_PGDOWN, KC_DELETE, KC_ENTER
+        KC_PGDN, KC_DELETE, KC_ENTER
     ),
 
     [LAYERS] = LAYOUT_ergodox(
@@ -278,7 +278,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MPRV, KC_F9,         KC_F7,      KC_F5,   KC_F3,        KC_F1,   KC_WWW_HOME,
         KC_PAUS,            KC_F19,        KC_F17,     KC_F15,  KC_F13,       KC_F11,
         RGB_HUD,             XXXXXXX,       XXXXXXX,    _______, KC_F23,       KC_F21,  KC_WWW_BACK,
-        RGB_VAD,             KC_CAPS,       KC_PSCREEN, XXXXXXX, MO(FIRMWARE),
+        RGB_VAD,             KC_CAPS,       KC_PSCR,    XXXXXXX, MO(FIRMWARE),
 
         // left thumb
                  _______, XXXXXXX,
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
index dcae1712d7..26574313f6 100644
--- a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Programmer's Dvorak layer
   [0] = LAYOUT_ergodox(
     DVP_ESC,      DVP_AMPR,         DVP_LBRACKET, DVP_LCBR,         DVP_RCBR,     DVP_LPRN,   DVP_AT,
-    KC_TAB,       KC_SCOLON,        KC_COMMA,     KC_DOT,           KC_P,         KC_Y,       MO(4),
+    KC_TAB,       KC_SCLN,          KC_COMMA,     KC_DOT,           KC_P,         KC_Y,       MO(4),
     MO(3),        KC_A,             KC_O,         KC_E,             KC_U,         KC_I,
     KC_LSHIFT,    KC_QUOTE,         KC_Q,         KC_J,             KC_K,         KC_X,       KC_HYPR,
     KC_LCTL,      KC_LALT,          KC_LGUI,      LCTL(KC_C),       LCTL(KC_V),
@@ -61,9 +61,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TT(4),        KC_F,             KC_G,         KC_C,             KC_R,         KC_L,       KC_SLASH,
                   KC_D,             KC_H,         KC_T,             KC_N,         KC_S,       KC_MINUS,
     KC_MEH,       KC_B,             KC_M,         KC_W,             KC_V,         KC_Z,       MO(3),
-                                    KC_DELETE,    KC_BSLASH,        KC_RGUI,      KC_RCTL,    LCTL(KC_F),
+                                    KC_DELETE,    KC_BSLS,          KC_RGUI,      KC_RCTL,    LCTL(KC_F),
 
-      KC_F17,     KC_F18,   KC_PGUP,  KC_PGDOWN,  KC_ENTER,   KC_BSPACE
+      KC_F17,     KC_F18,   KC_PGUP,  KC_PGDN,  KC_ENTER,   KC_BSPC
   ),
   // Gaming QWERTY layer
   [1] = LAYOUT_ergodox(
@@ -76,12 +76,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_HOME,  TO(0),  KC_F15,  KC_SPACE, KC_LCTL,  KC_LALT,
 
     KC_6,       KC_7,   KC_8,     KC_9,         KC_0,       KC_MINUS,   KC_EQUAL,
-    KC_F24,     KC_Y,   KC_U,     KC_I,         KC_O,       KC_P,       KC_BSLASH,
-                KC_H,   KC_J,     KC_K,         KC_L,       KC_SCOLON,  KC_QUOTE,
+    KC_F24,     KC_Y,   KC_U,     KC_I,         KC_O,       KC_P,       KC_BSLS,
+                KC_H,   KC_J,     KC_K,         KC_L,       KC_SCLN,    KC_QUOTE,
     KC_F17,     KC_N,   KC_M,     KC_COMMA,     KC_DOT,     KC_SLASH,   KC_RSHIFT,
             KC_DELETE,  KC_F19,   KC_LGUI,       KC_F21,     KC_F22,
 
-      KC_F17,   KC_F18, KC_PGUP,  KC_PGDOWN,    KC_ENTER,   KC_BSPACE
+      KC_F17,   KC_F18, KC_PGUP,  KC_PGDN,    KC_ENTER,   KC_BSPC
   ),
   [2] = LAYOUT_ergodox(
     KC_ESCAPE,  KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_C,
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,     KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_KP_ENTER,     KC_NO,  KC_NO,
                KC_KP_0,        KC_KP_DOT,      KC_NO,          KC_NO,           KC_NO,
 
-      TO(0), KC_F18, KC_PGUP,  KC_PGDOWN,  KC_ENTER, KC_BSPACE
+      TO(0), KC_F18, KC_PGUP,  KC_PGDN,  KC_ENTER, KC_BSPC
   ),
   // Function Layer
   [3] = LAYOUT_ergodox(
@@ -108,15 +108,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSHIFT,      LALT(KC_Z),       KC_TRANSPARENT,     KC_TRANSPARENT,     KC_F12,             KC_TRANSPARENT, ALL_T(KC_NO),
     KC_LCTL,        KC_LALT,          KC_LGUI,            KC_CAPS,            LSFT(KC_F12),
 
-     KC_PSCREEN, KC_PGUP,  KC_PGDOWN,  KC_SPACE, KC_LSHIFT,  KC_INSERT,
+     KC_PSCR,    KC_PGUP,  KC_PGDN,  KC_SPACE, KC_LSHIFT,  KC_INSERT,
 
     KC_F6,          KC_F7,            KC_F8,              KC_F9,              KC_F10,             KC_F11,         KC_F12,
-    KC_NO,          KC_HOME,          KC_TRANSPARENT,     KC_PSCREEN,         KC_SLCK,            KC_TRANSPARENT, KC_TRANSPARENT,
+    KC_NO,          KC_HOME,          KC_TRANSPARENT,     KC_PSCR,            KC_SLCK,            KC_TRANSPARENT, KC_TRANSPARENT,
                     KC_LEFT,          KC_DOWN,            KC_UP,              KC_RIGHT,           KC_TRANSPARENT, KC_TRANSPARENT,
     MEH_T(KC_NO),   KC_CALCULATOR,    KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT, KC_RSHIFT,
                                       KC_DELETE,          KC_INSERT,          KC_TRANSPARENT,     KC_F19,         KC_RCTL,
 
-     TO(2),KC_TRANSPARENT,KC_TRANSPARENT,LALT(KC_F10),KC_ENTER,KC_BSPACE
+     TO(2),KC_TRANSPARENT,KC_TRANSPARENT,LALT(KC_F10),KC_ENTER,KC_BSPC
   ),
   // Keypad, Lighting, and Mouse emulation layer
  ///*
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,          KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_EQUAL,         RGB_SLD,    RGB_HUD,
                                     KC_KP_0,        KC_KP_DOT,      KC_KP_ENTER,      RGB_MOD,   RGB_TOG,
 
-      KC_F17, KC_F18, KC_PGUP,  KC_PGDOWN,  KC_ENTER, KC_BSPACE
+      KC_F17, KC_F18, KC_PGUP,  KC_PGDN,  KC_ENTER, KC_BSPC
   )
   //*/
   /*
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,    SHFT_DOT,       KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_EQUAL,       RGB_HUD,
               KC_NO,                       KC_KP_0,        KC_KP_DOT,      KC_KP_ENTER,    RGB_TOG,
 
-      KC_F17, KC_F18, KC_PGUP,  KC_PGDOWN,  KC_ENTER, KC_BSPACE
+      KC_F17, KC_F18, KC_PGUP,  KC_PGDN,  KC_ENTER, KC_BSPC
   )
   */
 
diff --git a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c b/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
index bb6ba5ae34..2ef62f7276 100644
--- a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                          KC_TRNS,
                                KC_TRNS,    KC_TRNS,      KC_TRNS,
        // right hand
-       KC_PSCREEN,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
+       KC_PSCR,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
        KC_TRNS,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
                     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_F11,   KC_ENT,
        KC_TRNS,     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F12,   KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
index 8471471abf..0f5fd4223a 100644
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
@@ -67,13 +67,13 @@ void shiftto13_reset (qk_tap_dance_state_t *state, void *user_data);
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ergodox_pretty(
     KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,                                          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,
-    KC_INSERT,      KC_Q,           LGUI_T(KC_W),   MT(MOD_HYPR, KC_E),LT(5,KC_R),  KC_T,           KC_NO,                                          KC_NO,          KC_Y,           LT(6,KC_U),     MT(MOD_HYPR, KC_I),RGUI_T(KC_O), KC_P,          KC_PSCREEN,
-    KC_ESCAPE,      LSFT_T(KC_A),   LCTL_T(KC_S),   LALT_T(KC_D),   LT(1,KC_F),     KC_G,                                                                           KC_H,           LT(2,KC_J),     RALT_T(KC_K),   RCTL_T(KC_L),   RSFT_T(KC_SCOLON),KC_CAPS,
+    KC_INSERT,      KC_Q,           LGUI_T(KC_W),   MT(MOD_HYPR, KC_E),LT(5,KC_R),  KC_T,           KC_NO,                                          KC_NO,          KC_Y,           LT(6,KC_U),     MT(MOD_HYPR, KC_I),RGUI_T(KC_O), KC_P,          KC_PSCR,
+    KC_ESCAPE,      LSFT_T(KC_A),   LCTL_T(KC_S),   LALT_T(KC_D),   LT(1,KC_F),     KC_G,                                                                           KC_H,           LT(2,KC_J),     RALT_T(KC_K),   RCTL_T(KC_L),   RSFT_T(KC_SCLN),KC_CAPS,
     KC_HOME,        LT(9,KC_Z),     MT(MOD_LGUI | MOD_LCTL,KC_X), LT(7,KC_C), LT(3,KC_V), KC_B,     KC_NO,                                          KC_NO,          KC_N,           LT(4,KC_M),     LT(8,KC_COMMA), MT(MOD_RGUI | MOD_RCTL, KC_DOT), KC_QUOTE, KC_END,
     KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_DELETE,                                                                                                      KC_TAB,         KC_NO,          KC_NO,          KC_NO,          KC_NO,
                                                                                                     KC_NO,          KC_NO,          KC_NO,          KC_NO,
                                                                                                                     KC_NO,          KC_NO,
-                                                                                    TO(10),         KC_BSPACE,      KC_NO,          KC_NO,          KC_ENTER,       KC_SPACE
+                                                                                    TO(10),         KC_BSPC,        KC_NO,          KC_NO,          KC_ENTER,       KC_SPACE
   ),
   [1] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [5] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_HASH,        KC_BSLASH,      KC_GRAVE,       KC_TILD,        KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_HASH,        KC_BSLS,        KC_GRAVE,       KC_TILD,        KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [13] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_PGUP,        KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_NO,          KC_PGDOWN,      KC_NO,          KC_NO,          KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_NO,          KC_PGDN,      KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
index f7615a4d0d..af1cdc2514 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_J,   /**/   KC_L,   /**/   KC_U,   /**/   KC_Y,   /**/ KC_SCOLON,/**/ _______,  /**/
+                    /**/ _______,  /**/   KC_J,   /**/   KC_L,   /**/   KC_U,   /**/   KC_Y,   /**/ KC_SCLN,  /**/ _______,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -203,7 +203,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/   KC_H,   /**/   KC_J,   /**/   KC_K,   /**/   KC_L,   /**/ KC_SCOLON,/**/ _______,  /**/
+                    /*===============*/   KC_H,   /**/   KC_J,   /**/   KC_K,   /**/   KC_L,   /**/ KC_SCLN,  /**/ _______,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -246,7 +246,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_SCOLON,/**/   KC_Q,   /**/   KC_J,   /**/   KC_K,   /**/   KC_X,   /**/ _______,  /**/
+        /**/ _______,  /**/ KC_SCLN,  /**/   KC_Q,   /**/   KC_J,   /**/   KC_K,   /**/   KC_X,   /**/ _______,  /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
@@ -339,7 +339,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /**/           /**/           /*===============*/
                                                                                 /**/           /**/           /**/           /**/
-                                                                                /**/ KC_BSPACE,/**/ _______,  /**/ KC_ENTER, /**/
+                                                                                /**/ KC_BSPC,  /**/ _______,  /**/ KC_ENTER, /**/
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /*=============================================*/
 
@@ -351,7 +351,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ KC_HYPR,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ KC_BSLASH,/**/
+                    /**/ KC_HYPR,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ KC_BSLS,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -390,7 +390,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______  ,/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LALT(KC_BSPACE),
+        /**/ _______  ,/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LALT(KC_BSPC),
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -466,7 +466,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LCTL(KC_BSPACE),
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LCTL(KC_BSPC),
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -499,7 +499,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
                     /*=========================================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                  LALT(KC_PSCREEN),/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                  LALT(KC_PSCR),   /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -622,11 +622,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-       LGUI(KC_BSPACE),/**/ KC_HASH,  /**/ KC_UNDS,  /**/ KC_LPRN,  /**/ KC_RPRN,  /**/ KC_AMPR,  /*===============*/
+       LGUI(KC_BSPC),  /**/ KC_HASH,  /**/ KC_UNDS,  /**/ KC_LPRN,  /**/ KC_RPRN,  /**/ KC_AMPR,  /*===============*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_BSLASH,/**/ KC_SLASH, /**/KC_LBRC,        KC_RBRC,  /**/ KC_TILD,  /**/ _______,  /**/
+        /**/ _______,  /**/ KC_BSLS,  /**/ KC_SLASH, /**/KC_LBRC,        KC_RBRC,  /**/ KC_TILD,  /**/ _______,  /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
@@ -655,7 +655,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ KC_CIRC,  /**/KC_KP_PLUS,/**/KC_KP_MINUS,    KC_GRAVE, /**/ KC_SCOLON,/**/ _______,  /**/
+                    /**/ _______,  /**/ KC_CIRC,  /**/KC_KP_PLUS,/**/KC_KP_MINUS,    KC_GRAVE, /**/ KC_SCLN,  /**/ _______,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -698,7 +698,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPACE),  OC(KC_RIGHT),    OC(KC_K), /*===============*/
+        /**/ _______,  /**/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPC),    OC(KC_RIGHT),    OC(KC_K), /*===============*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -735,7 +735,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPACE),  OC(KC_RIGHT),    OC(KC_K), /**/ _______,  /**/
+                    /*===============*/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPC),    OC(KC_RIGHT),    OC(KC_K), /**/ _______,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -807,7 +807,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/RGUI(KC_J),/**/ KC_BSPACE,/**/  KC_UP,   /**/ KC_DELETE,  RGUI(KC_SCOLON),  _______,  /**/
+                    /**/ _______,  /**/RGUI(KC_J),/**/ KC_BSPC,  /**/  KC_UP,   /**/ KC_DELETE,  RGUI(KC_SCLN),    _______,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -883,7 +883,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/RCTL(KC_J),/**/ KC_BSPACE,/**/  KC_UP,   /**/ KC_DELETE,  RCTL(KC_SCOLON),  _______,  /**/
+                    /**/ _______,  /**/RCTL(KC_J),/**/ KC_BSPC,  /**/  KC_UP,   /**/ KC_DELETE,  RCTL(KC_SCLN),    _______,  /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
diff --git a/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c b/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c
index f7bce47c13..9d230aaae0 100644
--- a/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c
+++ b/keyboards/ergodox_ez/keymaps/rmw/keymap-mac.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TD(CTLALL),     OSL(ADJUST),    TD(GUCTL),  TD(SGCA),  TD(AGC), 
                                                                OS_CMD,    OS_CTL   , 
                                                                           KC_ESCAPE, 
-                                                   KC_BSPACE,  TD(SHENT), OSL(EDIT), 
+                                                   KC_BSPC,  TD(SHENT), OSL(EDIT), 
 
         KC_F5,       KC_6,             KC_7,       KC_8,    KC_9,             KC_0,          KC_BSPC, 
         TO(NUMPAD),   KC_Y,             KC_U,       KC_I,    KC_O,             KC_P,          KC_BSLS, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TD(CTLALL),     OSL(ADJUST),    TD(GUCTL),  TD(SGCA),  TD(AGC), 
                                                                OS_CMD,    OS_CTL   , 
                                                                           KC_ESCAPE, 
-                                                   KC_BSPACE,  TD(SHENT), OSL(EDIT), 
+                                                   KC_BSPC,  TD(SHENT), OSL(EDIT), 
         KC_F5,       KC_6,             KC_7,       KC_8,    KC_9,             KC_0,          KC_BSPC, 
         TO(NUMPAD),   KC_Y,             KC_U,       KC_I,    KC_O,             KC_P,          KC_BSLS, 
                      KC_H,     LT(JSYM,KC_J),   KC_E,    KC_L,    LT(EDIT,KC_SCLN),       KC_QUOTE, 
@@ -41,11 +41,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_CAPS,  SFT_T(KC_ENT),  KC_SPC), 
 
   [NUMPAD] = LAYOUT_ergodox(VRSN, KC_F11, KC_F12, KC_F1, KC_F2, KC_F3, _______, 
-    _______, _______, KC_PGUP, KC_UP, KC_PGDOWN, _______, TO(QWERTY), 
+    _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, TO(QWERTY), 
     _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, 
     _______, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_Y), _______,
     _______, _______, _______, _______, _______, 
-    _______, _______, KC_PSCREEN, _______, _______, TO(QWERTY), 
+    _______, _______, KC_PSCR, _______, _______, TO(QWERTY), 
 
     _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, 
     TO(EDIT), _______, KC_7,   KC_8,   KC_9, KC_KP_MINUS, _______, 
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, 
     _______, _______, _______, _______, _______, TO(NUMPAD), 
     _______, _______, _______, S(KC_UP), _______, _______, KC_DELETE, 
-    TO(QWERTY), LGUI(KC_T), KC_PGUP, KC_UP, KC_PGDOWN, KC_PSCREEN, _______, 
+    TO(QWERTY), LGUI(KC_T), KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______, 
              LGUI(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LGUI(KC_RIGHT), _______, 
     _______, S(LGUI(KC_LEFT)), S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), S(LGUI(KC_RIGHT)), LCTL(KC_LEFT), 
     _______, _______, FORM_GET, FORM_PUT, _______, 
diff --git a/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c b/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c
index 33b5b396a2..aada71fd4f 100644
--- a/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c
+++ b/keyboards/ergodox_ez/keymaps/rmw/keymap-win.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TD(CTLAND),       OSL(ADJUST),    TD(SCAG),  TD(TDGUI),  TD(ACG), 
                                                                OS_ALT,    OS_CTL   , 
                                                                           KC_ESCAPE, 
-                                                   KC_BSPACE,  TD(SHENT), OSL(EDIT), 
+                                                   KC_BSPC,  TD(SHENT), OSL(EDIT), 
 
                      // RIGHT HAND
         KC_F5,       KC_6,             KC_7,       KC_8,    KC_9,             KC_0,          KC_BSPC, 
@@ -24,11 +24,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
   [NUMPAD] = LAYOUT_ergodox(VRSN, KC_F11, KC_F12, KC_F1, KC_F2, KC_F3, _______, 
-    _______, _______, KC_PGUP, KC_UP, KC_PGDOWN, _______, TO(0), 
+    _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, TO(0), 
     _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, 
     _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_Y), _______,
     _______, _______, _______, _______, _______, 
-    _______, _______, KC_PSCREEN, _______, _______, TO(0), 
+    _______, _______, KC_PSCR, _______, _______, TO(0), 
 
     _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, 
     TO(EDIT), _______, KC_7,   KC_8,   KC_9, KC_KP_MINUS, _______, 
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, 
     _______, _______, _______, _______, _______, TO(NUMPAD), 
     _______, _______, _______, S(KC_UP), _______, _______, KC_DELETE, 
-    TO(0), LCTL(KC_T), KC_PGUP, KC_UP, KC_PGDOWN, KC_PSCREEN, _______, 
+    TO(0), LCTL(KC_T), KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______, 
              KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, _______, 
     _______, S(KC_HOME), S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), S(KC_END), _______, 
     _______, _______, _______, _______, _______, 
diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
index a110d68401..65382ff074 100644
--- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
@@ -57,19 +57,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_NUBS,              KC_EXLM,              KC_AT,         KC_HASH,        KC_DLR,       KC_PERC,   KC_AUDIO_MUTE,
   KC_LEAD,              KC_Q,                 KC_W,          E_NUMBERS,      R_MOUSE,      KC_T,      XXXXXXX,
   LCTL(KC_B),           LSFT_T(KC_A),         LCTL_T(KC_S),  LALT_T(KC_D),   LGUI_T(KC_F), KC_G,
-  KC_BSLASH,            KC_Z,                 KC_X,          KC_C,           KC_V,         KC_B,      XXXXXXX,
+  KC_BSLS,              KC_Z,                 KC_X,          KC_C,           KC_V,         KC_B,      XXXXXXX,
   ALT_TAB,              XXXXXXX,              XXXXXXX,       MO(_1_NUMBERS), ARROWS,
   KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,
   XXXXXXX,
   KC_ENTER,             KC_TAB,               KC_ESCAPE,
   KC_CAPS,              KC_CIRC,              KC_AMPR,       KC_ASTR,       KC_LPRN,            KC_RPRN,   KC_MINUS,
   XXXXXXX,              KC_Y,                 KC_U,          KC_I,          KC_O,               KC_P,      KC_LBRC,
-  KC_H,                 RGUI_T(KC_J),         RALT_T(KC_K),  RCTL_T(KC_L),  RSFT_T(KC_SCOLON),  KC_QUOTE,
+  KC_H,                 RGUI_T(KC_J),         RALT_T(KC_K),  RCTL_T(KC_L),  RSFT_T(KC_SCLN),    KC_QUOTE,
   KC_RBRC,              KC_N,                 KC_M,          KC_COMMA,      KC_DOT,             KC_SLASH,  KC_EQUAL,
   XXXXXXX,              XXXXXXX,              XXXXXXX,       XXXXXXX,       XXXXXXX,
   KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,
   XXXXXXX,
-  KC_ESCAPE,            KC_BSPACE,            KC_SPACE
+  KC_ESCAPE,            KC_BSPC,              KC_SPACE
 ),
 [_1_NUMBERS] = LAYOUT_ergodox(
   _______,  KC_F1,      KC_F2,    KC_F3,     KC_F4,    KC_F5,      _______,
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  KC_F6,      KC_F7,    KC_F8,     KC_F9,    KC_F10,     KC_F11,
   _______,  _______,    KC_7,     KC_8,      KC_9,     KC_ASTR,    KC_F12,
   _______,  KC_4,       KC_5,     KC_6,      KC_PLUS,  _______,
-  _______,  _______,    KC_1,     KC_2,      KC_3,     KC_BSLASH,  _______,
+  _______,  _______,    KC_1,     KC_2,      KC_3,     KC_BSLS,    _______,
   KC_0,     KC_KP_DOT,  _______,  KC_EQUAL,  _______,
   _______,  _______,
   _______,
@@ -217,7 +217,7 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
     case RGUI_T(KC_J):
     case RALT_T(KC_K):
     case RCTL_T(KC_L):
-    case RSFT_T(KC_SCOLON):
+    case RSFT_T(KC_SEMICOLON):
     case ARROWS:
       return true;
     default:
@@ -237,7 +237,7 @@ bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
     case RGUI_T(KC_J):
     case RALT_T(KC_K):
     case RCTL_T(KC_L):
-    case RSFT_T(KC_SCOLON):
+    case RSFT_T(KC_SEMICOLON):
     case ARROWS:
       return false;
     default:
diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c
index f29b806db5..cd8733a21f 100644
--- a/keyboards/ergodox_ez/keymaps/testing/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c
@@ -20,9 +20,9 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER),
+  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
 
-  [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDOWN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCOLON,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI),
+  [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCLN,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI),
 
   [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK),
 
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/README.md b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
index 0fe7692556..0402b68e08 100644
--- a/keyboards/ergodox_ez/util/keymap_beautifier/README.md
+++ b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
@@ -7,7 +7,7 @@ This Python 3 script, by [Tsan-Kuang Lee](https://github.com/tsankuanglee) takes
 For example, the original `keymap.c` looks like
 
 ```
-[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER),
+[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
 ```
 
 The beautifier parses it and outputs:
@@ -18,7 +18,7 @@ The beautifier parses it and outputs:
 
 KC_EQUAL      , KC_1       , KC_2           , KC_3   , KC_4    , KC_5, LCTL(KC_MINUS),
 KC_DELETE     , KC_Q       , KC_W           , KC_E   , KC_R    , KC_T, KC_LBRC   ,
-KC_BSPACE     , KC_A       , KC_S           , KC_D   , KC_F    , KC_G,
+KC_BSPC       , KC_A       , KC_S           , KC_D   , KC_F    , KC_G,
 KC_LSPO       , CTL_T(KC_Z), KC_X           , KC_C   , KC_V    , KC_B, ALL_T(KC_NO)  ,
 LT(1,KC_GRAVE), KC_QUOTE   , LALT(KC_LSHIFT), KC_LEFT, KC_RIGHT,
 
@@ -31,8 +31,8 @@ KC_SPACE, KC_UNDS              , KC_END ,
 // right hand
 
 LCTL(KC_EQUAL), KC_6, KC_7       , KC_8    , KC_9       , KC_0           , KC_MINUS       ,
-KC_RBRC       , KC_Y, KC_U       , KC_I    , KC_O       , KC_P           , KC_BSLASH      ,
-                KC_H, ALT_T(KC_J), KC_K    , KC_L       , LT(2,KC_SCOLON), GUI_T(KC_QUOTE),
+KC_RBRC       , KC_Y, KC_U       , KC_I    , KC_O       , KC_P           , KC_BSLS        ,
+                KC_H, ALT_T(KC_J), KC_K    , KC_L       , LT(2,KC_SCLN)  , GUI_T(KC_QUOTE),
 MEH_T(KC_NO)  , KC_N, KC_M       , KC_COMMA, KC_DOT     , CTL_T(KC_SLASH), KC_RSPC        ,
                       KC_UP      , KC_DOWN , KC_LBRC,     KC_RBRC        , TT(1)          ,
 
@@ -40,37 +40,37 @@ MEH_T(KC_NO)  , KC_N, KC_M       , KC_COMMA, KC_DOT     , CTL_T(KC_SLASH), KC_RS
 
 KC_LALT  , CTL_T(KC_ESCAPE),
 KC_PGUP  ,
-KC_PGDOWN, LT(1,KC_TAB)    , KC_ENTER
+KC_PGDN, LT(1,KC_TAB)    , KC_ENTER
 )
 ```
 
 Optionally, it can also render [LAYOUT_ergodox_pretty](https://github.com/qmk/qmk_firmware/blob/ee700b2e831067bdb7584425569b61bc6329247b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c#L49-L57):
 ```
 [0] = LAYOUT_ergodox_pretty(
-  KC_ESCAPE,        KC_1,     KC_2,    KC_3,     KC_4,           KC_5,          KC_LEAD,      KC_LEAD, KC_6          , KC_7            , KC_8            , KC_9               , KC_0              , KC_BSPACE           ,
-     KC_TAB,        KC_Q,     KC_W,    KC_E,     KC_R,           KC_T,          KC_HYPR,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLASH           ,
-   KC_LCTRL,        KC_A,     KC_S,    KC_D,     KC_F,           KC_G,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCOLON         , KC_QUOTE            ,
+  KC_ESCAPE,        KC_1,     KC_2,    KC_3,     KC_4,           KC_5,          KC_LEAD,      KC_LEAD, 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_HYPR,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLS             ,
+   KC_LCTRL,        KC_A,     KC_S,    KC_D,     KC_F,           KC_G,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
   KC_LSHIFT,        KC_Z,     KC_X,    KC_C,     KC_V,           KC_B,           SH_MON,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSHIFT           ,
 LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI,  KC_LALT,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
 
                                                        LT(6,KC_GRAVE),     MEH_T(KC_NO),      KC_LEFT, KC_RIGHT      ,
                                                                        LT(10,KC_DELETE),      KC_UP  ,
-                                             KC_SPACE, LT(8,KC_ENTER),  LT(7,KC_BSPACE),      KC_DOWN, LT(7,KC_SPACE), LT(8,KC_ENTER)
+                                             KC_SPACE, LT(8,KC_ENTER),  LT(7,KC_BSPC),        KC_DOWN, LT(7,KC_SPACE), LT(8,KC_ENTER)
 )
 ```
 
 We can also align everythng t othe left (easier editing in my opinon):
 ```
 [0] = LAYOUT_ergodox_pretty(
-KC_ESCAPE  , KC_1       , KC_2    , KC_3   , KC_4    , KC_5          , KC_LEAD         ,      KC_LEAD, KC_6          , KC_7            , KC_8            , KC_9               , KC_0              , KC_BSPACE           ,
-KC_TAB     , KC_Q       , KC_W    , KC_E   , KC_R    , KC_T          , KC_HYPR         ,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLASH           ,
-KC_LCTRL   , KC_A       , KC_S    , KC_D   , KC_F    , KC_G          ,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCOLON         , KC_QUOTE            ,
+KC_ESCAPE  , KC_1       , KC_2    , KC_3   , KC_4    , KC_5          , KC_LEAD         ,      KC_LEAD, 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_HYPR         ,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLS             ,
+KC_LCTRL   , KC_A       , KC_S    , KC_D   , KC_F    , KC_G          ,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
 KC_LSHIFT  , KC_Z       , KC_X    , KC_C   , KC_V    , KC_B          , SH_MON          ,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSHIFT           ,
 LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI, KC_LALT ,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
 
                                                        LT(6,KC_GRAVE), MEH_T(KC_NO)    ,      KC_LEFT, KC_RIGHT      ,
                                                                        LT(10,KC_DELETE),      KC_UP  ,
-                                             KC_SPACE, LT(8,KC_ENTER), LT(7,KC_BSPACE) ,      KC_DOWN, LT(7,KC_SPACE), LT(8,KC_ENTER)
+                                             KC_SPACE, LT(8,KC_ENTER), LT(7,KC_BSPC)   ,      KC_DOWN, LT(7,KC_SPACE), LT(8,KC_ENTER)
 )
 ```
 
diff --git a/keyboards/ergodox_stm32/keymaps/default/keymap.c b/keyboards/ergodox_stm32/keymaps/default/keymap.c
index 460f01afe7..d35adf46c8 100644
--- a/keyboards/ergodox_stm32/keymaps/default/keymap.c
+++ b/keyboards/ergodox_stm32/keymaps/default/keymap.c
@@ -1,9 +1,9 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ergodox(KC_GRAVE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LPRN,KC_ESCAPE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSHIFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_RPRN,KC_LCTRL,KC_LGUI,KC_LALT,KC_LGUI,KC_LALT,KC_INSERT,MO(1),KC_HOME,KC_SPACE,KC_DELETE,KC_END,KC_EQUAL,KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPACE,KC_LBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_QUOTE,KC_RBRC,KC_N,KC_M,KC_COMMA,KC_DOT,KC_SLASH,KC_RSHIFT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_RCTRL,MO(1),TG(2),KC_PGUP,KC_PGDOWN,KC_BSPACE,KC_ENTER),
+  [0] = LAYOUT_ergodox(KC_GRAVE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LPRN,KC_ESCAPE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSHIFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_RPRN,KC_LCTRL,KC_LGUI,KC_LALT,KC_LGUI,KC_LALT,KC_INSERT,MO(1),KC_HOME,KC_SPACE,KC_DELETE,KC_END,KC_EQUAL,KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPC,KC_LBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOTE,KC_RBRC,KC_N,KC_M,KC_COMMA,KC_DOT,KC_SLASH,KC_RSHIFT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_RCTRL,MO(1),TG(2),KC_PGUP,KC_PGDN,KC_BSPC,KC_ENTER),
 
-  [1] = LAYOUT_ergodox(KC_TILD,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_GRAVE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_CAPS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(LGUI(KC_Q)),KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP),
+  [1] = LAYOUT_ergodox(KC_TILD,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_GRAVE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_CAPS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_BSPC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(LGUI(KC_Q)),KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP),
 
   [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_NUM,KC_KP_SLASH,KC_KP_ASTERISK,KC_KP_MINUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_7,KC_KP_8,KC_KP_9,KC_KP_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_4,KC_KP_5,KC_KP_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_KP_1,KC_KP_2,KC_KP_3,KC_ENTER,KC_TRANSPARENT,KC_KP_DOT,KC_KP_0,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT),
 
diff --git a/keyboards/flygone60/rev3/keymaps/default/keymap.c b/keyboards/flygone60/rev3/keymaps/default/keymap.c
index 6470527bfe..b78c795b45 100644
--- a/keyboards/flygone60/rev3/keymaps/default/keymap.c
+++ b/keyboards/flygone60/rev3/keymaps/default/keymap.c
@@ -31,9 +31,9 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_60_ansi_arrow(
-        KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
+        KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSHIFT, KC_UP, KC_SLASH,
         KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
diff --git a/keyboards/flygone60/rev3/keymaps/via/keymap.c b/keyboards/flygone60/rev3/keymaps/via/keymap.c
index e1f1fcedd4..c966a5e14a 100644
--- a/keyboards/flygone60/rev3/keymaps/via/keymap.c
+++ b/keyboards/flygone60/rev3/keymaps/via/keymap.c
@@ -33,9 +33,9 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_0] = LAYOUT_60_ansi_arrow(
-        KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
+        KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSHIFT, KC_UP, KC_SLASH,
         KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_1), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
diff --git a/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
index cc0e1f563b..c90431cd9d 100644
--- a/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
@@ -158,10 +158,10 @@ bool handle_US_ANSI_shifted_keys(int16_t keycode, bool in) {
             regular_keycode = KC_RIGHT_BRACKET;
             break;
         case KC_PIPE:
-            regular_keycode = KC_BSLASH;
+            regular_keycode = KC_BACKSLASH;
             break;
         case KC_COLON:
-            regular_keycode = KC_SCOLON;
+            regular_keycode = KC_SEMICOLON;
             break;
         case KC_DOUBLE_QUOTE:
             regular_keycode = KC_QUOTE;
@@ -594,7 +594,7 @@ uint8_t counter_22 = 0;
 const struct Chord chord_22 PROGMEM = {H_TOP9 + H_BOT9, QWERTY, &state_22, &counter_22, KC_L, 0, autoshift_dance};
 uint8_t state_23 = IDLE;
 uint8_t counter_23 = 0;
-const struct Chord chord_23 PROGMEM = {H_TOP0 + H_BOT0, QWERTY, &state_23, &counter_23, KC_SCOLON, 0, autoshift_dance};
+const struct Chord chord_23 PROGMEM = {H_TOP0 + H_BOT0, QWERTY, &state_23, &counter_23, KC_SEMICOLON, 0, autoshift_dance};
 uint8_t state_24 = IDLE;
 uint8_t counter_24 = 0;
 const struct Chord chord_24 PROGMEM = {H_BOT1, QWERTY, &state_24, &counter_24, KC_Z, 0, autoshift_dance};
@@ -732,7 +732,7 @@ uint8_t counter_78 = 0;
 const struct Chord chord_78 PROGMEM = {H_BOT5, NUM, &state_78, &counter_78, KC_RIGHT_BRACKET, 0, autoshift_dance};
 uint8_t state_79 = IDLE;
 uint8_t counter_79 = 0;
-const struct Chord chord_79 PROGMEM = {H_BOT6, NUM, &state_79, &counter_79, KC_BSLASH, 0, autoshift_dance};
+const struct Chord chord_79 PROGMEM = {H_BOT6, NUM, &state_79, &counter_79, KC_BACKSLASH, 0, autoshift_dance};
 uint8_t state_80 = IDLE;
 uint8_t counter_80 = 0;
 const struct Chord chord_80 PROGMEM = {H_BOT7, NUM, &state_80, &counter_80, KC_QUOTE, 0, autoshift_dance};
@@ -847,7 +847,7 @@ const struct Chord chord_134 PROGMEM = {H_TOP7 + H_TOP8, ASETNIOP, &state_134, N
 uint8_t state_135 = IDLE;
 const struct Chord chord_135 PROGMEM = {H_TOP8 + H_TOP9, ASETNIOP, &state_135, NULL, KC_L, 0, single_dance};
 uint8_t state_136 = IDLE;
-const struct Chord chord_136 PROGMEM = {H_TOP9 + H_TOP0, ASETNIOP, &state_136, NULL, KC_SCOLON, 0, single_dance};
+const struct Chord chord_136 PROGMEM = {H_TOP9 + H_TOP0, ASETNIOP, &state_136, NULL, KC_SEMICOLON, 0, single_dance};
 uint8_t state_137 = IDLE;
 const struct Chord chord_137 PROGMEM = {H_TOP1 + H_TOP3, ASETNIOP, &state_137, NULL, KC_X, 0, single_dance};
 uint8_t state_138 = IDLE;
@@ -930,9 +930,9 @@ const struct Chord chord_175 PROGMEM = {H_TOP4 + H_TOP7, ASETNIOP_123, &state_17
 uint8_t state_176 = IDLE;
 const struct Chord chord_176 PROGMEM = {H_TOP7 + H_TOP8, ASETNIOP_123, &state_176, NULL, KC_6, 0, single_dance};
 uint8_t state_177 = IDLE;
-const struct Chord chord_177 PROGMEM = {H_TOP8 + H_TOP9, ASETNIOP_123, &state_177, NULL, KC_BSLASH, 0, single_dance};
+const struct Chord chord_177 PROGMEM = {H_TOP8 + H_TOP9, ASETNIOP_123, &state_177, NULL, KC_BACKSLASH, 0, single_dance};
 uint8_t state_178 = IDLE;
-const struct Chord chord_178 PROGMEM = {H_TOP9 + H_TOP0, ASETNIOP_123, &state_178, NULL, KC_SCOLON, 0, single_dance};
+const struct Chord chord_178 PROGMEM = {H_TOP9 + H_TOP0, ASETNIOP_123, &state_178, NULL, KC_SEMICOLON, 0, single_dance};
 uint8_t state_179 = IDLE;
 const struct Chord chord_179 PROGMEM = {H_TOP4 + H_TOP0, ASETNIOP_123, &state_179, NULL, KC_BSPC, 0, single_dance};
 uint8_t state_180 = IDLE;
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index af7edc2a9b..bb6ed9dd3e 100644
--- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
@@ -185,7 +185,7 @@ uint32_t processQwerty(bool lookup) {
 	P( SYM | RL,			SEND_STRING("]"));
 	P( SYM | RT,			SEND_STRING("?"));
 
-	P( SYM | ST3 | ST4,		SEND(KC_BSLASH));
+	P( SYM | ST3 | ST4,		SEND(KC_BACKSLASH));
 	P( SYM | RF  | RR,		SEND(KC_EQUAL));
 	P( SYM | RP  | RB,		SEND_STRING("\""));
 	P( SYM | RG  | RL,		SEND_STRING("+"));
diff --git a/keyboards/gboards/georgi/keymaps/dennytom/keymap.c b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
index 53275f7eb0..902d2271d7 100644
--- a/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
@@ -169,10 +169,10 @@ bool handle_US_ANSI_shifted_keys(int16_t keycode, bool in) {
             regular_keycode = KC_RIGHT_BRACKET;
             break;
         case KC_PIPE:
-            regular_keycode = KC_BSLASH;
+            regular_keycode = KC_BACKSLASH;
             break;
         case KC_COLON:
-            regular_keycode = KC_SCOLON;
+            regular_keycode = KC_SEMICOLON;
             break;
         case KC_DOUBLE_QUOTE:
             regular_keycode = KC_QUOTE;
@@ -593,7 +593,7 @@ const struct Chord chord_11 PROGMEM = {H_TOP10, QWERTY, &state_11, NULL, KC_O, 0
 uint8_t state_12 = IDLE;
 const struct Chord chord_12 PROGMEM = {H_TOP11, QWERTY, &state_12, NULL, KC_P, 0, single_dance};
 uint8_t state_13 = IDLE;
-const struct Chord chord_13 PROGMEM = {H_TOP12, QWERTY, &state_13, NULL, KC_BSLASH, 0, single_dance};
+const struct Chord chord_13 PROGMEM = {H_TOP12, QWERTY, &state_13, NULL, KC_BACKSLASH, 0, single_dance};
 uint8_t state_14 = IDLE;
 const struct Chord chord_14 PROGMEM = {H_TOP1 + H_BOT1, QWERTY, &state_14, NULL, KC_INS, 0, single_dance};
 uint8_t state_15 = IDLE;
@@ -619,7 +619,7 @@ uint8_t state_23 = IDLE;
 uint8_t counter_23 = 0;
 const struct Chord chord_23 PROGMEM = {H_TOP10 + H_BOT10, QWERTY, &state_23, &counter_23, KC_L, KC_RALT, key_key_dance};
 uint8_t state_24 = IDLE;
-const struct Chord chord_24 PROGMEM = {H_TOP11 + H_BOT11, QWERTY, &state_24, NULL, KC_SCOLON, 0, single_dance};
+const struct Chord chord_24 PROGMEM = {H_TOP11 + H_BOT11, QWERTY, &state_24, NULL, KC_SEMICOLON, 0, single_dance};
 uint8_t state_25 = IDLE;
 const struct Chord chord_25 PROGMEM = {H_BOT1, QWERTY, &state_25, NULL, KC_TAB, 0, single_dance};
 uint8_t state_26 = IDLE;
diff --git a/keyboards/gh60/revc/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
index daa8a290bc..cabe0b28fd 100644
--- a/keyboards/gh60/revc/keymaps/bluezio/keymap.c
+++ b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
@@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        and caps lock where it used to be */
     LAYOUT_BZIO(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,     KC_F4,      KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, \
-        KC_TRNS,          KC_PGUP, KC_UP,   KC_PGDOWN, KC_INSERT,  KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
+        KC_TRNS,          KC_PGUP, KC_UP,   KC_PGDN,   KC_INSERT,  KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
         KC_TRNS,          KC_LEFT, KC_DOWN, KC_RGHT,   KC_DELETE,  KC_MS_BTN1, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, \
-        KC_TRNS, KC_TRNS, KC_HOME, KC_SPC,  KC_END,    KC_PSCREEN, KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, \
+        KC_TRNS, KC_TRNS, KC_HOME, KC_SPC,  KC_END,    KC_PSCR,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, \
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/gh60/satan/keymaps/abhixec/keymap.c b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
index 59a8c43120..3254a85f22 100644
--- a/keyboards/gh60/satan/keymaps/abhixec/keymap.c
+++ b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   
   KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,  \
   _______,KC_LCTL,KC_WH_U,_______,_______,KC_MS_U,KC_PGUP,KC_HOME,KC_UP,KC_END,KC_DEL, KC_GESC, _______,_______, \
-  _______,KC_LALT,KC_WH_D, KC_LSFT,_______,KC_MS_D,KC_PGDOWN,KC_LEFT,KC_DOWN,KC_RIGHT, KC_BSPC,_______,_______, \
+  _______,KC_LALT,KC_WH_D, KC_LSFT,_______,KC_MS_D,KC_PGDN,KC_LEFT,KC_DOWN,KC_RIGHT, KC_BSPC,_______,_______, \
 _______,KC_UNDO,KC_CUT,KC_COPY,KC_PASTE, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2,KC_MS_LEFT,KC_MS_RIGHT,_______,_______, _______, \
   _______,_______,_______,                _______,                        _______,_______,_______,_______),
 
@@ -67,7 +67,7 @@ _______,KC_UNDO,KC_CUT,KC_COPY,KC_PASTE, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2,KC_M
 [_FL] = LAYOUT_60_ansi_split_rshift(
   
   KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,  \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCREEN, BL_DEC, BL_INC,BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR, BL_DEC, BL_INC,BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,_______,_______, \
   _______,_______,_______,_______,_______,_______,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_AUDIO_MUTE,KC_END,_______,_______, TG(_CL), \
   _______,_______,_______,                _______,                        _______,_______,_______,_______)
diff --git a/keyboards/gh60/satan/keymaps/chaser/keymap.c b/keyboards/gh60/satan/keymaps/chaser/keymap.c
index 41bc3c8cbf..4ec33acf7b 100644
--- a/keyboards/gh60/satan/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/satan/keymaps/chaser/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_all(
     KC_GRV      , KC_F1     ,KC_F2      ,KC_F3      ,KC_F4        ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12     ,KC_DEL     ,_______,  \
-    KC_MS_BTN3  ,KC_MS_BTN2 ,KC_MS_UP   ,KC_MS_BTN1 ,KC_MS_WH_UP  ,_______,_______,_______,KC_INS ,_______,QK_BOOT,_______,_______    ,KC_PSCREEN ,          \
+    KC_MS_BTN3  ,KC_MS_BTN2 ,KC_MS_UP   ,KC_MS_BTN1 ,KC_MS_WH_UP  ,_______,_______,_______,KC_INS ,_______,QK_BOOT,_______,_______    ,KC_PSCR    ,          \
     _______     ,KC_MS_LEFT ,KC_MS_DOWN ,KC_MS_RIGHT,KC_MS_WH_DOWN,_______,_______,_______,_______,_______,_______,_______,_______    ,_______    ,          \
     _______     ,_______    ,_______    ,_______    ,_______      ,_______,_______,_______,_______,_______,_______,_______,KC_PGUP    ,_______    ,          \
-    KC_LCTL     ,_______    ,KC_LALT    ,                                  _______,                        KC_RCTL,KC_HOME,KC_PGDOWN  ,KC_END ),
+    KC_LCTL     ,_______    ,KC_LALT    ,                                  _______,                        KC_RCTL,KC_HOME,KC_PGDN    ,KC_END ),
 };
diff --git a/keyboards/gh60/satan/keymaps/dende_iso/keymap.c b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
index 66aa2f9695..0a33183c24 100644
--- a/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
 [_FNK] = LAYOUT_60_iso_split_bs_rshift(
   DE_CIRC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS, _______, \
-  _______, KC_PGUP, KC_UP,  KC_PGDOWN, _______, _______, _______, _______,  KC_INS, KC_HOME, KC_PGUP, _______, _______, \
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDOWN, _______, _______, _______, \
+  _______, KC_PGUP, KC_UP,  KC_PGDN,   _______, _______, _______, _______,  KC_INS, KC_HOME, KC_PGUP, _______, _______, \
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN,   _______, _______, _______, \
   _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, _______,                             _______,                             _______, _______, _______, _______),
 
diff --git a/keyboards/gh60/satan/keymaps/isoHHKB/readme.md b/keyboards/gh60/satan/keymaps/isoHHKB/readme.md
index 64911a0430..d6a83e8882 100644
--- a/keyboards/gh60/satan/keymaps/isoHHKB/readme.md
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/readme.md
@@ -52,7 +52,7 @@ Where:
 - `BTG` is `BL_TOGG` (toggles key backlighting)
 - `INC` increases backlighting brightness
 - `DEC` decreases backlighting brightness
-- `PSR` is `KC_PSCREEN`
+- `PSR` is `KC_PSCR`
 - `RGB` is `RGB_TOG`
 - `FRW` jumps to next RGB mode
 - `BRT` activates RGB breathing mode directly
diff --git a/keyboards/h0oni/hotduck/keymaps/default/keymap.c b/keyboards/h0oni/hotduck/keymaps/default/keymap.c
index e06bac51ba..503f0bc74c 100644
--- a/keyboards/h0oni/hotduck/keymaps/default/keymap.c
+++ b/keyboards/h0oni/hotduck/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
       KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,    KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,   KC_BSPC,    MO(1),  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_SLSH,     KC_DEL, KC_END,  KC_PGDOWN,
+      KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_SLSH,     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_BSLS,             KC_RSFT,              KC_UP,
       KC_LCTL,  KC_LALT, KC_LGUI,                 KC_SPC,                         KC_RGUI, KC_RALT, KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/h0oni/hotduck/keymaps/via/keymap.c b/keyboards/h0oni/hotduck/keymaps/via/keymap.c
index e06bac51ba..503f0bc74c 100644
--- a/keyboards/h0oni/hotduck/keymaps/via/keymap.c
+++ b/keyboards/h0oni/hotduck/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
       KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,    KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,   KC_BSPC,    MO(1),  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_SLSH,     KC_DEL, KC_END,  KC_PGDOWN,
+      KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_SLSH,     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_BSLS,             KC_RSFT,              KC_UP,
       KC_LCTL,  KC_LALT, KC_LGUI,                 KC_SPC,                         KC_RGUI, KC_RALT, KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
index 784eeb1298..8382ec8cad 100644
--- a/keyboards/handwired/aek64/config.h
+++ b/keyboards/handwired/aek64/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Enable the space-cadet options */
 #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_PGUP
-#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDOWN
+#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDN
 #define LSPO_KEYS KC_LSFT, KC_TRNS, KC_HOME
 #define LCPO_KEYS KC_LCTL, KC_TRNS, KC_END
 
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 6388c8d9cc..44d105078b 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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               ,
   KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,                      KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT            ,
-  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
+  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
   _______,   _______, _______,  _______,       _______, _______, _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT(
-  KC_GRV,     XXXXXXX, M_WORD_SEL, KC_LBRC,       KC_RBRC,       XXXXXXX,                   XXXXXXX,       KC_PGUP,  KC_HOME,  KC_PGDOWN,  XXXXXXX,        KC_PSCREEN         ,
+  KC_GRV,     XXXXXXX, M_WORD_SEL, KC_LBRC,       KC_RBRC,       XXXXXXX,                   XXXXXXX,       KC_PGUP,  KC_HOME,  KC_PGDN,    XXXXXXX,        KC_PSCR            ,
   KC_GRV,     XXXXXXX, XXXXXXX,    LSFT(KC_9),    LSFT(KC_0),    XXXXXXX,                   XXXXXXX,       KC_HOME,  KC_UP,    KC_END,     XXXXXXX,        LCTL(LSFT(KC_EQL)) ,
   _______,    XXXXXXX, XXXXXXX,    LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX,                   LCTL(KC_LEFT), KC_LEFT,  KC_DOWN,  KC_RIGHT,   LCTL(KC_RIGHT), LCTL(KC_MINS)      ,
   MO(_MOUSE), _______, _______,    _______,       _______,       KC_LALT, _______, _______, KC_ENT,        _______,  XXXXXXX,  _______,    _______,        _______
diff --git a/keyboards/handwired/co60/keymaps/default/keymap.c b/keyboards/handwired/co60/keymaps/default/keymap.c
index b5a1c9c500..a77d42eb7a 100644
--- a/keyboards/handwired/co60/keymaps/default/keymap.c
+++ b/keyboards/handwired/co60/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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,
     _______, BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______,   _______,   KC_PGUP,    _______,  KC_INSERT,
     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_HOME,   KC_END,     _______,
-    _______, BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______,   KC_PGDOWN, _______,
+    _______, BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______,   KC_PGDN,   _______,
     _______, _______, _______,                            _______,                              _______,   _______,    _______,  _______
   )
 };
diff --git a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
index f16f39e68e..d9634786a8 100644
--- a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
+++ b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,    KC_F11,     KC_F12,   _______, _______,
     BL_BRTG, BL_TOGG, BL_INC,  BL_DEC, BL_ON, BL_OFF, _______, _______, _______, _______,   _______,   KC_PGUP,    KC_INSERT,  KC_DEL,
     _______, RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_HOME,   KC_END,     _______,
-    _______, BL_DEC,  _______, _______, _______, _______, _______, DF(_L1), DF(_L2), _______,   KC_PGDOWN, _______, _______,
+    _______, BL_DEC,  _______, _______, _______, _______, _______, DF(_L1), DF(_L2), _______,   KC_PGDN,   _______, _______,
              _______, _______,          _______,          _______,          _______, _______,   _______,   _______
   )
 };
diff --git a/keyboards/handwired/d48/keymaps/anderson/keymap.c b/keyboards/handwired/d48/keymaps/anderson/keymap.c
index 003c757ff8..786a854ae0 100644
--- a/keyboards/handwired/d48/keymaps/anderson/keymap.c
+++ b/keyboards/handwired/d48/keymaps/anderson/keymap.c
@@ -185,7 +185,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                         (new_time[4]) * 10 + (new_time[5])
                 );
                 for (int i = 0; i < 6; i++) {
-                    tap_code(KC_BSPACE);
+                    tap_code(KC_BACKSPACE);
                 }
             }
         }
diff --git a/keyboards/handwired/d48/keymaps/default/keymap.c b/keyboards/handwired/d48/keymaps/default/keymap.c
index 261866c9a4..c18bbf460e 100644
--- a/keyboards/handwired/d48/keymaps/default/keymap.c
+++ b/keyboards/handwired/d48/keymaps/default/keymap.c
@@ -143,7 +143,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                         (new_time[4]) * 10 + (new_time[5])
                 );
                 for (int i = 0; i < 6; i++) {
-                    tap_code(KC_BSPACE);
+                    tap_code(KC_BACKSPACE);
                 }
             }
         }
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
index 009d88fd0e..9d51f9906e 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT( \
   ____, ____,  KC_MU, ____,  ____,                          KC_VOLU, ____,    KC_UP,   ____,     KC_PGUP,   \
-  ____, KC_ML, KC_MD, KC_MR, ____,                          KC_MUTE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDOWN, \
+  ____, KC_ML, KC_MD, KC_MR, ____,                          KC_MUTE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN,   \
   ____, ____,  ____,  ____,  ____,                          KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES,  KC_PIPE,   \
         ____,  ____,                                                          KC_MB1,  KC_MB2,              \
                                    ____, ____,  ____, ____,                                                 \
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
index 5bb5836fbc..16dbb9dd42 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
         KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                          KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
                                          RAISE,KC_SPC,                        KC_ENT, LOWER,
                                          KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
index 179b448664..3c5f875009 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
      KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
      KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                       KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
                                       RAISE,KC_SPC,                           KC_ENT, LOWER,
                                       KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
index a4bd37c27b..2c33aa3e57 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_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_BSLASH,
+     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_LCTRL,                                                       KC_DEL, KC_PMNS,
                                       KC_SPC, MO(_ARROWS),                          MO(_MOUSE), KC_ENT,
                                       KC_LCMD, MO(_SYMBOLS),                        KC_EQL, KC_RALT,
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    QK_BOOT,_______, _______ ,_______,_______ ,TG(_WINDOWS),                        _______,_______,_______,_______,_______,_______,
                    _______,_______,_______,_______,_______,_______,                        _______, KC_HOME , KC_UP , KC_END ,_______,_______,
                    _______,_______,_______,_______,_______ ,_______,                        KC_HOME, KC_LEFT , KC_DOWN , KC_RIGHT ,KC_END,_______,
-                   _______,_______,_______,_______,_______,_______,                        _______, KC_PGDOWN , _______ , KC_PGUP ,_______ ,_______,
+                   _______,_______,_______,_______,_______,_______,                        _______, KC_PGDN ,   _______ , KC_PGUP ,_______ ,_______,
                                         QK_BOOT,_______,                                                       _______, _______,
                                                            _______,_______,            _______,_______,
                                                            _______,_______,            _______,_______,
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
index 8c85746986..7835e7043f 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
         KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                          KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
                                          RAISE ,KC_SPC,                        KC_ENT, LOWER,
                                          KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
index b68ec078e0..c7bc0a97e8 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                        KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_BSPC,
         KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                        KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_MINS,
         KC_LSFT,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                        KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
-        KC_LCTL,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                        KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+        KC_LCTL,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                        KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                         KC_LBRC,KC_RBRC,                                                        KC_PLUS,KC_EQL ,
                                         RAISE  ,                                        LOWER  ,
                                                 KC_TAB ,KC_HOME,       KC_END  ,KC_DEL,
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
index 9b4de373ec..4524124291 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
         KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
         _______,_______, KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,_______,_______,
                                          RAISE,KC_SPC,                        KC_ENT, LOWER,
                                          KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
index 2b699eb683..b5b63a8537 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT_6x7(
         KC_ESC , KC_F1   , KC_F2  , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8  , KC_F9  , KC_F10, KC_F11, KC_F12   , _______,
         _______, KC_GRV  , KC_1   , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7   , KC_8   , KC_9  , KC_0  , KC_LBRC  , KC_RBRC,
-        _______, KC_TAB  , KC_Q   , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U   , KC_I   , KC_O  , KC_P  , KC_QUOT  , KC_BACKSLASH,
+        _______, KC_TAB  , KC_Q   , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U   , KC_I   , KC_O  , KC_P  , KC_QUOT  , KC_BSLS,
         _______, KC_LSFT , KC_A   , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J   , KC_K   , KC_L  ,KC_SCLN, KC_LSFT  , _______,
         _______, KC_LCTL , KC_Z   , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M   , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL  , _______,
                                     KC_LBRC,KC_RBRC,                                                         KC_PLUS, KC_EQL,
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
index d396e46762..38a8bf04ff 100644
--- a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
+++ b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC  ,  KC_1  , KC_2  , KC_3  ,  KC_4  , KC_5  ,      KC_6  , KC_7   , KC_8   , KC_9   , KC_0  ,KC_BSPC,
      KC_TAB  ,  KC_Q  , KC_W  , KC_E  ,  KC_R  , KC_T  ,      KC_Y  , KC_U   , KC_I   , KC_O   , KC_P  ,KC_MINS,
      KC_LSFT ,  KC_A  , KC_S  , KC_D  ,  KC_F  , KC_G  ,      KC_H  , KC_J   , KC_K   , KC_L   ,KC_SCLN,KC_QUOT,
-     KC_LCTL ,  KC_Z  , KC_X  , KC_C  ,  KC_V  , KC_B  ,      KC_N  , KC_M   ,KC_COMM , KC_DOT ,KC_SLSH,KC_BSLASH,
+     KC_LCTL ,  KC_Z  , KC_X  , KC_C  ,  KC_V  , KC_B  ,      KC_N  , KC_M   ,KC_COMM , KC_DOT ,KC_SLSH,KC_BSLS,
      KC_PLUS , KC_LEFT,KC_UP  ,KC_DOWN, KC_RGHT, RAISE ,      LOWER , KC_HOME, KC_PGUP, KC_PGDN,KC_END ,KC_EQL,
                _______,KC_LALT,KC_PSCR, KC_LGUI, KC_SPC,      KC_ENT,KC_GRAVE, KC_AT  ,KC_PSCR ,_______
                                                              
diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
index 9f37798ed1..56c74b12f6 100644
--- a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                             KC_F13,   KC_F14,   KC_F15,       KC_F16,   KC_F17,   KC_F18,   KC_F19,   KC_F20,       KC_F21,   KC_F22,   KC_F23,       KC_F24,
                             KC_F1,    KC_F2,    KC_F3,        KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,        KC_F9,    KC_F10,   KC_F11,       KC_F12,
     KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-    KC_NO,      TO(2),      KC_TAB,   KC_SCOLON,KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,      KC_NO,      MO(3),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_P4,   KC_P5,   KC_P6,   MO(4),
     LCTL(KC_F), KC_LALT,    KC_LSHIFT,KC_ESC,   KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     LCTL(KC_C), LCTL(KC_V), KC_LCTRL, KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTRL,                      KC_DOWN,             KC_P0,            KC_PDOT
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_F11,    KC_F12,
     KC_ESC, TO(0),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  KC_NO,  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_NO,  KC_NO,  MO(3),    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCOLON, KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
+    KC_NO,  KC_NO,  MO(3),    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
     KC_NO,  KC_NO,  KC_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_NO,  KC_LALT,KC_LCTRL, KC_LGUI,                                      KC_SPC,                                KC_RALT,  KC_RCTRL,                    KC_DOWN,             KC_P0,            KC_PDOT
   ),
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_F11,    KC_F12,
     KC_ESC, TO(1),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  TO(0),  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_NO,  KC_NO,  KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCOLON, KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
+    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_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_NO,  KC_LALT,KC_LCTRL, KC_LGUI,                                        KC_SPC,                              KC_RALT,  KC_RCTRL,                    KC_DOWN,             KC_P0,            KC_PDOT
   ),
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       KC_F13,   KC_F14, KC_F15,               KC_F16,               KC_F17,               KC_F18,   KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,     KC_F24,
     MU_TOG, KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK,    KC_PSLS,    KC_PAST,    KC_PMNS,
     MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,  KC_NO,    KC_NO,    KC_PGUP,  KC_DEL,   KC_NO,    KC_NO,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
-    KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,      KC_AUDIO_MUTE,        KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_SCOLON,  KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
+    KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,      KC_AUDIO_MUTE,        KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_SCLN,    KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
     KC_NO,  KC_LALT,  KC_LSHIFT,KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
     KC_NO,  KC_NO,    KC_LCTRL, KC_LGUI,                                                                            KC_SPC,                                 KC_RALT,    KC_CAPS,                               KC_DOWN,             LSFT(KC_A),             KC_PDOT
   ),
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                           KC_F13,   KC_F14,   KC_F15,       KC_F16,   KC_F17,   KC_F18,   KC_F19,   KC_F20,       KC_F21,   KC_F22,   KC_F23,       KC_F24,
                           KC_F1,    KC_F2,    KC_F3,        KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,        KC_F9,    KC_F10,   KC_F11,       KC_F12,
   KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
-  KC_NO,      TO(2),      KC_TAB,   KC_SCOLON,KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_BTN1,  KC_MS_U,  KC_BTN2,  KC_NO,
+  KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_BTN1,  KC_MS_U,  KC_BTN2,  KC_NO,
   KC_NO,      KC_NO,      TO(0),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_MS_L,  KC_NO,    KC_MS_R,  KC_TRNS,
   LCTL(KC_F), KC_LALT,    KC_LSHIFT,KC_NO,    KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_GT,    KC_MS_D,  KC_GT,    KC_PENT,
   LCTL(KC_C), LCTL(KC_V), KC_LCTRL, KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTRL,                      KC_DOWN,             KC_BTN1,            KC_PDOT
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [2] = LAYOUT(
      KC_LCTRL,    KC_LALT,  KC_C,     KC_RALT,    KC_E,       KC_F, KC_G, KC_G, KC_H, KC_J, TO(0),  TO(1),  KC_M,     KC_N,   KC_QUOT,    KC_DOWN,  KC_UP,  KC_R,     KC_S,       KC_ENTER,
-     KC_PPLS,     KC_B,     KC_C,     KC_D,       KC_A,       KC_S, KC_D, KC_F, KC_J, KC_J, KC_K,   KC_NO,  KC_K,     KC_L,   KC_SCOLON,  KC_P4,    KC_DEL, KC_P5,    KC_P6,      KC_RIGHT,
+     KC_PPLS,     KC_B,     KC_C,     KC_D,       KC_A,       KC_S, KC_D, KC_F, KC_J, KC_J, KC_K,   KC_NO,  KC_K,     KC_L,   KC_SCLN,    KC_P4,    KC_DEL, KC_P5,    KC_P6,      KC_RIGHT,
      KC_PMNS,     KC_1,     KC_C,    KC_D,       KC_1,       KC_2, KC_3, KC_4, KC_7, KC_J, KC_K,   KC_L,   KC_8,     KC_9,   KC_0,       KC_NLCK,  KC_PGUP,KC_PSLS,  KC_PAST,    KC_T,
      KC_A,        KC_ESC,   TO(0),KC_D,     KC_GRV,     KC_F, KC_G, KC_5, KC_6, KC_J, KC_K,   KC_L,   KC_EQL,   KC_N,   KC_MINUS,   KC_BSPC,  KC_INS, KC_HOME,  KC_S,       KC_T,
      KC_PPLS,     KC_NO,    KC_TAB,   KC_D,       KC_Q,       KC_W, KC_E, KC_R, KC_U, KC_J, KC_K,   KC_L,   KC_I,     KC_O,   KC_P,       KC_P7,    KC_PGDN,KC_P8,    KC_P9,      KC_T,
diff --git a/keyboards/handwired/leftynumpad/keymaps/default/keymap.c b/keyboards/handwired/leftynumpad/keymaps/default/keymap.c
index d75e42211f..9a21d9a509 100644
--- a/keyboards/handwired/leftynumpad/keymaps/default/keymap.c
+++ b/keyboards/handwired/leftynumpad/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_7,    KC_8,   KC_9,
         TG(_NP),   KC_4,    KC_5,   KC_6,    KC_PPLS,
         KC_PGUP,   KC_1,    KC_2,   KC_3,
-        KC_PGDOWN, KC_00,   KC_0,   KC_PDOT, KC_PENT
+        KC_PGDN,   KC_00,   KC_0,   KC_PDOT, KC_PENT
     ),
 /* Macropad/Function Layer
     ,---------------------------------------.
diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
index 62d17206ee..61516bc611 100644
--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -349,7 +349,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 
    [TD_SHIFT_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,lshift_finished, lshift_reset),
    [TD_SPC_ENT]    = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_ENT),
-   [TD_SPC_BKSPC]  = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_BSPACE),
+   [TD_SPC_BKSPC]  = ACTION_TAP_DANCE_DOUBLE(KC_SPACE, KC_BSPC),
    [TD_LSPACE]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL,lspace_finished,lspace_reset),
 
    [ALT_OSL1]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL,alt_finished, alt_reset),
@@ -383,7 +383,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_QWERTY] = LAYOUT(
   //,-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+----------------+-----------------+-----------------+------------------.
-     TD(TD_DEL_BSPC)  , KC_BSPACE       , KC_1           , KC_2        , KC_3         , KC_4         , KC_5         , KC_6 , KC_7      , KC_8            , TD(TD_9_LPRN)  , TD(TD_0_RPRN)   ,TD(TD_MINS_UNDS) , TD(TD_EQL_PLUS),
+     TD(TD_DEL_BSPC)  , KC_BSPC         , KC_1           , KC_2        , KC_3         , KC_4         , KC_5         , KC_6 , KC_7      , KC_8            , TD(TD_9_LPRN)  , TD(TD_0_RPRN)   ,TD(TD_MINS_UNDS) , TD(TD_EQL_PLUS),
   //|-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+----------------+-----------------+-----------------+------------------|
      TD(TD_PGUP_HOME) , TD(TD_TAB_TILDE), TD(TD_Q_LrALT), KC_W         , KC_E         , KC_R         , KC_T         , KC_Y , KC_U      , KC_I            , KC_O           , KC_P            ,TD(TD_LBRC_LCBR) , TD(TD_RBRC_RCBR),
   //|-----------------+-----------------+---------------+--------------+--------------+--------------+--------------+------+-----------+-----------------+----------------+-----------------+-----------------+------------------|
diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
index 2fdafbe052..9103858300 100644
--- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_QWERTY] = LAYOUT(
   //,---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------.
-     TD(TD_DEL_BSPC), KC_BSPACE       , KC_1  , KC_2  , KC_3     , KC_4 ,KC_5,KC_6,KC_7  , KC_8           , KC_9          , KC_0           ,TD(TD_MINS_UNDS),TD(TD_EQL_PLUS) ,
+     TD(TD_DEL_BSPC), KC_BSPC         , KC_1  , KC_2  , KC_3     , KC_4 ,KC_5,KC_6,KC_7  , KC_8           , KC_9          , KC_0           ,TD(TD_MINS_UNDS),TD(TD_EQL_PLUS) ,
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
      KC_HOME        , TD(TD_TAB_TILDE),KC_Q   ,KC_W   ,KC_E      ,KC_R  ,KC_T,KC_Y,KC_U  , KC_I           , KC_O          , KC_P           ,TD(TD_LBRC_LCBR),TD(TD_RBRC_RCBR),
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
index 10f23c2735..adb6c46145 100644
--- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
@@ -317,7 +317,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_QWERTY] = LAYOUT(
   //,-----------------+--------------+-------------+--------------+--------------+--------------+-----------------+-----------------+------+--------+----------------+---------------+---------------+-----------------.
-     TD(TD_DEL_BSPC)  , KC_1         , KC_2        , KC_3         , KC_4         , KC_5         , KC_DELETE       ,  KC_BSPACE      , KC_6 , KC_7   , KC_8           , TD(TD_9_LPRN) , TD(TD_0_RPRN) ,TD(TD_MINS_UNDS),
+     TD(TD_DEL_BSPC)  , KC_1         , KC_2        , KC_3         , KC_4         , KC_5         , KC_DELETE       ,  KC_BSPC        , KC_6 , KC_7   , KC_8           , TD(TD_9_LPRN) , TD(TD_0_RPRN) ,TD(TD_MINS_UNDS),
   //|-----------------+--------------+-------------+--------------+--------------+--------------+-----------------+-----------------+------+--------+----------------+---------------+---------------+-----------------|
      TD(TD_TAB_TILDE) ,TD(TD_Q_LrALT), KC_W        , KC_E         ,TD(TD_R_LrKey), TD(TD_T_LrMS), TD(TD_LBRC_LCBR), TD(TD_RBRC_RCBR), KC_Y , KC_U   , KC_I           , KC_O          , KC_P           ,TD(TD_EQL_PLUS),
   //|-----------------+--------------+-------------+--------------+--------------+--------------+-----------------+-----------------+------+--------+----------------+---------------+----------------+----------------|
diff --git a/keyboards/handwired/owlet60/keymaps/default/keymap.c b/keyboards/handwired/owlet60/keymaps/default/keymap.c
index e8e81bc530..d4f57452f9 100644
--- a/keyboards/handwired/owlet60/keymaps/default/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_owlet60_full_bsp(
     KC_1,    KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,    KC_EQL,     KC_BSPC,   KC_PGUP,
-    KC_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_PGDOWN,
+    KC_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_PGDN,
     KC_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,                KC_HOME,
             KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,    KC_RSFT,    KC_UP,     KC_END,
             KC_LCTRL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT
diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
index 8636ac7536..f6388df54d 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
@@ -24,7 +24,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_owlet60_full_bsp(
     KC_1,    KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,    KC_EQL,     KC_BSPC,   KC_PGUP, \
-    KC_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_PGDOWN, \
+    KC_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_PGDN, \
     KC_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,                KC_HOME, \
             KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,    KC_RSFT,    KC_UP,     KC_END, \
             KC_LCTRL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT \
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c
index 6f56f886e0..00ab669d99 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_4x6_right(
     KC_ESC,  KC_Q,  KC_W,   KC_E,   KC_R,   KC_T,               KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_MINS,
     KC_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_BSLASH,
+    KC_LSFT, KC_Z,  KC_X,   KC_C,   KC_V,   KC_B,               KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_BSLS,
                     KC_LBRC,KC_RBRC,                                            KC_PLUS, KC_EQL,
                                     RAISE,  KC_SPC,                     LOWER,
                                     KC_TAB, KC_HOME,                    KC_ENT,
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c
index 30dafdf516..488f6e4b92 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
      KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
      KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                       KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
                                       RAISE,KC_SPC,                                    LOWER,
                                       KC_TAB,KC_HOME,                                  KC_DEL,
diff --git a/keyboards/handwired/unk/keymaps/default/keymap.c b/keyboards/handwired/unk/keymaps/default/keymap.c
index a38b1f92d8..73d005983e 100644
--- a/keyboards/handwired/unk/keymaps/default/keymap.c
+++ b/keyboards/handwired/unk/keymaps/default/keymap.c
@@ -23,18 +23,18 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
-    KC_ESC,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,      KC_5,   KC_6,                   KC_7,    KC_8,      KC_9,    KC_0,    KC_MINS,    KC_EQL,     KC_BSPACE, 
-    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_BSLASH,
+    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_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_PSCREEN, 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_PGUP,
-    LOWER,      KC_LCTL, KC_LALT, KC_LGUI, RAISE,   KC_SPACE,                                         KC_SPACE,  RAISE,   KC_RALT, KC_RCTL,    KC_DELETE,  KC_PGDOWN
+    KC_PSCR,    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_PGUP,
+    LOWER,      KC_LCTL, KC_LALT, KC_LGUI, RAISE,   KC_SPACE,                                         KC_SPACE,  RAISE,   KC_RALT, KC_RCTL,    KC_DELETE,  KC_PGDN
   ),
   [_COLEMAK] = LAYOUT(
-    KC_ESC,     KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,     KC_5,   KC_6,                  KC_7,    KC_8,      KC_9,    KC_0,    KC_MINS,    KC_EQL,     KC_BSPACE, 
-    KC_HOME,    KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,     KC_G,                 KC_J,    KC_L,    KC_U,      KC_Y,    KC_SCLN, KC_LBRC,    KC_RBRC,    KC_BSLASH,
-    KC_END,     KC_BSPACE, 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_PSCREEN, KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,                          KC_K,    KC_M,      KC_COMM, KC_DOT,  KC_SLSH,    KC_LSFT,    KC_PGUP,
-    LOWER,      KC_LCTL,   KC_LALT, KC_LGUI, RAISE,   KC_SPACE,                                         KC_SPACE,  RAISE,   KC_RALT, KC_RCTL,    KC_DELETE,  KC_PGDOWN
+    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_HOME,    KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,     KC_G,                 KC_J,    KC_L,    KC_U,      KC_Y,    KC_SCLN, KC_LBRC,    KC_RBRC,    KC_BSLS,
+    KC_END,     KC_BSPC,   KC_A,    KC_R,    KC_S,    KC_T,     KC_D,                          KC_H,    KC_N,      KC_E,    KC_I,    KC_O,       KC_QUOT,    KC_ENT,
+    KC_PSCR,    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,                          KC_K,    KC_M,      KC_COMM, KC_DOT,  KC_SLSH,    KC_LSFT,    KC_PGUP,
+    LOWER,      KC_LCTL,   KC_LALT, KC_LGUI, RAISE,   KC_SPACE,                                         KC_SPACE,  RAISE,   KC_RALT, KC_RCTL,    KC_DELETE,  KC_PGDN
   ),
 
   [_LOWER] = LAYOUT(
diff --git a/keyboards/hhkb/rn42/rn42_task.c b/keyboards/hhkb/rn42/rn42_task.c
index 3a95ee0ac1..26dacbd650 100644
--- a/keyboards/hhkb/rn42/rn42_task.c
+++ b/keyboards/hhkb/rn42/rn42_task.c
@@ -446,16 +446,16 @@ static uint8_t code2asc(uint8_t code)
         case KC_0: return (shifted ? ')' : '0');
         case KC_ENTER: return '\n';
         case KC_ESCAPE: return 0x1B;
-        case KC_BSPACE: return '\b';
+        case KC_BACKSPACE: return '\b';
         case KC_TAB: return '\t';
         case KC_SPACE: return ' ';
         case KC_MINUS: return (shifted ? '_' : '-');
         case KC_EQUAL: return (shifted ? '+' : '=');
         case KC_LEFT_BRACKET: return (shifted ? '{' : '[');
         case KC_RIGHT_BRACKET: return (shifted ? '}' : ']');
-        case KC_BSLASH: return (shifted ? '|' : '\\');
+        case KC_BACKSLASH: return (shifted ? '|' : '\\');
         case KC_NONUS_HASH: return (shifted ? '|' : '\\');
-        case KC_SCOLON: return (shifted ? ':' : ';');
+        case KC_SEMICOLON: return (shifted ? ':' : ';');
         case KC_QUOTE: return (shifted ? '"' : '\'');
         case KC_GRAVE: return (shifted ? '~' : '`');
         case KC_COMMA: return (shifted ? '<' : ',');
diff --git a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
index 16844a6c6e..9846c9af2f 100644
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT(
     KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCREEN, KC_MUTE,
+    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCR   , KC_MUTE,
     _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
     _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD,
 
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index d759a5f7c9..bb393530b5 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BASE] = LAYOUT_65_ansi_blocker(
         KC_GESC,  KC_1,     KC_2,    KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_BSPC,   KC_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_BSLASH, KC_DELETE, \
+        KC_TAB,   KC_Q,     KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,   KC_RBRC, KC_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),
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
index bc31cfb0b8..cff9cdeba6 100644
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
@@ -50,7 +50,7 @@ enum combos {
 
 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_BSPACE, COMBO_END};
+const uint16_t PROGMEM raltBackspace_combo[] = {KC_RALT, KC_BSPC, COMBO_END};
 
 combo_t key_combos[COMBO_COUNT] = {
   [SLSHDN_PGDN] = COMBO(slashDown_combo, KC_PGDN),
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
index 35f72292ea..dfed69f8a5 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
@@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRC,     KC_Y, KC_U,  KC_I,    KC_O,    KC_P,                KC_BSPACE,
-               KC_H, KC_J,  KC_K,    KC_L,    KC_SCOLON,           KC_QUOTE,
+  KC_RBRC,     KC_Y, KC_U,  KC_I,    KC_O,    KC_P,                KC_BSPC,
+               KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN,             KC_QUOTE,
   _______,     KC_N, KC_M,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
 
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRC,     KC_J, KC_F,  KC_U,    KC_P,    KC_SCOLON,           KC_BSPACE,
+  KC_RBRC,     KC_J, KC_F,  KC_U,    KC_P,    KC_SCLN,             KC_BSPC,
                KC_Y, KC_N,  KC_E,    KC_O,    KC_I,                KC_QUOTE,
   _______,     KC_K, KC_L,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,   KC_1,      KC_2,    KC_3,    KC_4,  KC_5, KC_ESC,
   KC_TAB,   KC_QUOT,   KC_COMM, KC_DOT,  KC_P,  KC_Y, KC_LBRC,
   KC_ESC,   KC_A,      KC_O,    KC_E,    KC_U,  KC_I,
-  KC_LSFT,  KC_SCOLON, KC_Q,    KC_J,    KC_K,  KC_X, _______,
+  KC_LSFT,  KC_SCLN,   KC_Q,    KC_J,    KC_K,  KC_X, _______,
   TT(_NUM), KC_LCTL,   KC_LALT, KC_LGUI, LOWER,
 
                                                   KC_MPLY,  _______,
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,  KC_DEL,
-  KC_RBRC,     KC_F, KC_G,  KC_C,    KC_R,    KC_L,  KC_BSPACE,
+  KC_RBRC,     KC_F, KC_G,  KC_C,    KC_R,    KC_L,  KC_BSPC,
                KC_D, KC_H,  KC_T,    KC_N,    KC_S,  LT(MOUSE, KC_SLSH),
   _______,     KC_B, KC_M,  KC_W,    KC_V,    KC_Z,  RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // right hand
   KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRC,     KC_J, KC_L,  KC_U,    KC_Y,    KC_SCOLON,           KC_BSPACE,
+  KC_RBRC,     KC_J, KC_L,  KC_U,    KC_Y,    KC_SCLN,             KC_BSPC,
                KC_H, KC_N,  KC_E,    KC_I,    KC_O,                KC_QUOTE,
   _______,     KC_K, KC_M,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
                      RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
index a95302b3f6..18c2fafa7f 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   TT(_STREET_FIGHTER),  ________,
          KC_PGUP,
-  KC_PGDOWN, LT(_NAV,KC_ENTER), SPAC_TXT),
+  KC_PGDN, LT(_NAV,KC_ENTER), SPAC_TXT),
 
 
   //**************************SYMBOLS LAYER**************************
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
                   ________, ________, ________, ________, ________, ________, NUMLOCK,
                   ________,TIL_SLASH,  KC_PIPE,  KC_PLUS,  KC_AMPR, ________, CAPLOCK,
-                             EQRIGHT,  KC_DQUO, KC_EQUAL, KC_QUOTE,KC_SCOLON, ________,
+                             EQRIGHT,  KC_DQUO, KC_EQUAL, KC_QUOTE,KC_SCLN, ________,
                   ________, KC_M, BK_SLASH,  ASTERSK,   KC_DOT, KC_SLASH, ________,
                   ________,________ ,________,TILD3,________,
                                                               ________,________,
@@ -218,11 +218,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
                                                 KC_NO ,    TT(_QWERTY_KIDS) ,
                                                             KC_NO  ,
-                                    KC_LSHIFT, KC_BSPACE,    KC_NO    ,
+                                    KC_LSHIFT, KC_BSPC,      KC_NO    ,
 
                    KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,   KC_NO ,
                   KC_NO  ,    KC_Y,      KC_U, KC_I,     KC_O,      KC_P,    KC_NO ,
-                             KC_H,   KC_J,     KC_K,    KC_L,    KC_SCOLON , KC_NO,
+                             KC_H,   KC_J,     KC_K,    KC_L,    KC_SCLN , KC_NO,
                KC_NO ,     KC_N,    KC_M,   KC_COMMA ,   KC_DOT ,  KC_SLASH,   KC_NO ,
                                        KC_UP,  KC_DOWN,   KC_DELETE,    KC_TILD,    KC_UNDS,
 
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
index 4869cfae20..2ad9151bed 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
@@ -354,7 +354,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              _______, _______,  _______,   _______,  _______,   _______,   _______,
              _______, _______,  KC_MINS, S(KC_EQL),  S(KC_9),   S(KC_0),   _______,
                    S(KC_MINS),  KC_LBRC,   KC_RBRC, S(KC_LBRC), S(KC_RBRC),   _______,
-             _______,  KC_EQL, S(KC_BSLASH), S(KC_COMM), S(KC_DOT), S(KC_SLSH),  _______,
+             _______,  KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH),  _______,
                                 _______,   _______,  _______,   _______,   _______,
              _______,        _______,
              _______,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
index ad512082fb..7b1191805d 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                        KC_PGUP,
                                      KC_SPACE,KC_LSHIFT,KC_PGDN,
   //--
-  XXXXXXX,  KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPACE,
+  XXXXXXX,  KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_LEAD,                L01_RIGHT_01,                 KC_ENTER,
                           L01_RIGHT_02,                 MO(L03),
   MO(LFN),                L01_RIGHT_03,                 KC_RSHIFT,
@@ -244,7 +244,7 @@ L06 -> <TBD>: UNSPECIFIED
                                       _______, _______, _______,
   //--
   _______, _______, _______, _______, _______, _______, QK_BOOT,
-  _______,                 L06_RIGHT_01,                KC_BSPACE,
+  _______,                 L06_RIGHT_01,                KC_BSPC,
                            L06_RIGHT_02,                KC_INSERT,
   _______,                 L06_RIGHT_03,                KC_DELETE,
                     KC_VOLU, KC_VOLD, KC_MUTE, _______, _______,
diff --git a/keyboards/jd40/keymaps/myoung34/keymap.c b/keyboards/jd40/keymaps/myoung34/keymap.c
index d1baa22202..4798dbac49 100644
--- a/keyboards/jd40/keymaps/myoung34/keymap.c
+++ b/keyboards/jd40/keymaps/myoung34/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_AL] = LAYOUT(
          KC_GRV,      KC_1,      KC_2,      KC_3,         KC_4,        KC_5,       KC_6,      KC_7,     KC_8,      KC_9,      KC_0, KC_DEL,
          KC_TAB,     KC_F1,     KC_F2,     KC_F3,        KC_F4,       KC_F5,      KC_F6,     KC_F7,    KC_F8,     KC_F9,    KC_ENT,
-        _______,   _______, KC_SCOLON,  KC_QUOTE,  KC_LBRC, KC_RBRC,  KC_BSLASH,  KC_MINUS,  KC_EQUAL,   KC_PGUP,  KC_SLASH,
+        _______,   _______, KC_SCLN,    KC_QUOTE,  KC_LBRC, KC_RBRC,  KC_BSLS,    KC_MINUS,  KC_EQUAL,   KC_PGUP,  KC_SLASH,
         _______,   _______,   _______,   _______,      MO(_UL),     TG(_UL),    _______,   KC_HOME,  KC_PGDN,    KC_END
     ),
 
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
index 9ec9e70617..6e78184236 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all( /* Base */
-        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,KC_SCRL,KC_PAUSE,
+        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCR,KC_SCRL,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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
index b7b29b534b..bcd8cdd8c4 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
@@ -25,7 +25,7 @@ enum layers
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_all( /* BASE */
-        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,KC_SCRL,KC_PAUSE,
+        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCR,KC_SCRL,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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
         KC_LCTL,KC_LGUI,KC_LALT,KC_COMMAND,KC_SPC,KC_SPC,KC_SPC,KC_F14,KC_RALT,KC_NO,KC_NO,KC_COMMAND,   KC_LEFT,KC_DOWN,KC_RIGHT,           KC_P0,   KC_NO, KC_PDOT,   KC_NO ),
     [COMMAND] = LAYOUT_all( /* COMMAND */
-        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCREEN,KC_SCRL,KC_PAUSE,
+        KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCR,KC_SCRL,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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
index 3e0eb8d96f..53aef4a6bc 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT_all(
                          KC_ESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_GRAVE, 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_BSLASH, 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_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_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
index 73c34ec12a..75317159ec 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [0] = LAYOUT_all(
                          KC_ESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_GRAVE, 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_BSLASH, 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_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_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
index 56ed15ad30..2c65df1b93 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT_all(
                          KC_ESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_GRAVE, 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_BSLASH, 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_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_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
index 56ed15ad30..2c65df1b93 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT_all(
                          KC_ESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_GRAVE, 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_BSLASH, 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_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_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
index b14cb56e1d..2e6476c24e 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT_65_ansi_blocker( 
 			KC_ESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
-		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLASH, KC_PGUP,
+		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			KC_CAPS, KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
index 7f94d44418..7a2732a10e 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT_65_ansi_blocker( 
 			KC_ESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
-		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLASH, KC_PGUP,
+		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			KC_CAPS, KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
index 3248acff84..b688bf5a50 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
@@ -18,7 +18,7 @@ qk_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_PGDOWN)
+    [TD_END] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_PGDN)
 };
 
 /*
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
index ab13116a07..39f5ae90ad 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [0] = LAYOUT_65_ansi_blocker( /* Base */
         KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, 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_END, 
         CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGUP,
         KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  MO(2),             KC_UP,     KC_PGDN,
         KC_LCTL,       KC_LGUI,  KC_LALT,                KC_SPC,                KC_BTN2,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
index 8fa4412179..2d6296d6c7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[_LAYER0] = LAYOUT_65_ansi_blocker( /* Base */
 			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, KC_PGUP,
+		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
 		    KC_LCTL,       KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
index 5515db60ac..dacdadce79 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
@@ -27,7 +27,7 @@ enum {
 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_BSLASH, KC_PGUP,
+                                       KC_TAB,  KC_Q,     KC_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),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
index 4adebffccf..a5e06eaa2a 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_65_ansi_blocker(
         KC_GESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, KC_PGUP,
+        KC_TAB,   KC_Q,     KC_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,
       TT(_LOWER), KC_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_LSFTCAPSWIN, KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
         KC_LCTL,  KC_LGUI,  KC_LALT,                             KC_SPC,                    MO(1),   KC_RCTL,            KC_LEFT, KC_DOWN,   KC_RIGHT
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
index 21f991df3c..f6ba07cee1 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi_blocker( 
 		KC_GESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, 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_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
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
index 04b1afc691..e01bb62ab3 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
@@ -32,7 +32,7 @@ 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_BSLASH, KC_PGUP,
+        KC_TAB,               KC_Q,     KC_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),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
index 4f538b93d8..3cad9b2ba2 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT_65_ansi_blocker( 
 			KC_GESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, KC_PGUP,
+		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			KC_CAPS, KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
index 2636a6718a..497df43cf2 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,  KC_F11,   KC_F12,  KC_INS, KC_GRV,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK,   KC_PAUS, KC_UP,    KC_TRNS, KC_TRNS,
       KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,   KC_LEFT, KC_RIGHT, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDOWN, KC_DOWN, KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN,   KC_DOWN, KC_TRNS,  KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   MO(2),                     KC_STOP, KC_TRNS,   KC_TRNS
       ),
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
index 134cf28db7..b33f6fd961 100644
--- a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
@@ -48,7 +48,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     // Tap once for PageUp, twice for Home
     [TD_PGUP] = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, KC_HOME),
     // Tap once for PageDown, twice for End
-    [TD_PGDN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDOWN, KC_END)
+    [TD_PGDN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_END)
 };
 
 // Fire on keypress
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
index 39ebb77ff8..5fb451f467 100644
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P7,          // start
 
     LSFT(KC_B),     // prev sub cam
-    KC_PGDOWN,      // prev driver cam
+    KC_PGDN,        // prev driver cam
     LCTL(KC_P4),    // prev session
     KC_P1,          // end
 
diff --git a/keyboards/kbdfans/maja/keymaps/default/keymap.c b/keyboards/kbdfans/maja/keymaps/default/keymap.c
index e38e38485b..eecc43601e 100755
--- a/keyboards/kbdfans/maja/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
 			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, KC_PGUP,
+		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
diff --git a/keyboards/kbdfans/maja/keymaps/via/keymap.c b/keyboards/kbdfans/maja/keymaps/via/keymap.c
index 1c6f491e56..da6363f636 100755
--- a/keyboards/kbdfans/maja/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/via/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
 			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, KC_PGUP,
+		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
index 5c7808ae7b..e10b2aa3be 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
 			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,KC_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_BSLASH, KC_PGUP,
+		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
index 960a1f0f15..2daf51946e 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
 			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,KC_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_BSLASH, KC_PGUP,
+		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
index ad56226ac6..2ae6bae7a7 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MPLY,	KC_PSLS,	KC_PAST,	KC_ESC,		KC_F1,		KC_F2,		KC_F3,		KC_F4,		KC_F5,			KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_F11,		KC_F12,		MYRGB_TG,	KC_PGUP, \
 	KC_MUTE,	KC_PPLS,	KC_PMNS,	KC_GRV,		KC_1,		KC_2,		KC_3,		KC_4,		KC_5,			KC_6,		KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,	KC_EQL,		KC_DEL,		KC_PGDN, \
 	KC_P7,		KC_P8,		KC_P9,		KC_TAB,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,			KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_LBRC,	KC_RBRC,	KC_BSLS,	KC_HOME, \
-	KC_P4,		KC_P5,		KC_P6,		KC_BSPACE,	KC_A,		KC_S,		KC_D,		KC_F,		KC_G,			KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,	KC_QUOT,	KC_ENT,		XXXXXXX,	KC_PSCR, \
+	KC_P4,		KC_P5,		KC_P6,		KC_BSPC,	KC_A,		KC_S,		KC_D,		KC_F,		KC_G,			KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,	KC_QUOT,	KC_ENT,		XXXXXXX,	KC_PSCR, \
 	KC_P1,		KC_P2,		KC_P3,		KC_LSFT,	KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,	KC_RSFT,	KC_UP,		KC_CAPS,	KC_INS, \
 	KC_P0,		KC_PDOT,	KC_PENT,	KC_LCTL,	TO(_LIST),	KC_LGUI,	KC_LALT,	XXXXXXX,	KC_SPC,			KC_SPC,		XXXXXXX,	KC_RALT,	KC_RGUI,	KC_RCTL,	KC_LEFT,	KC_DOWN,	KC_RGHT,	KC_NLCK \
 ),
diff --git a/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c b/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
index faa858da72..77c91612fc 100644
--- a/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
@@ -74,7 +74,7 @@ Function layer
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_BSLS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, KC_BSLASH, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, KC_PIPE, _______, _______
 ),
 
diff --git a/keyboards/keebio/iris/keymaps/impstyle/keymap.c b/keyboards/keebio/iris/keymaps/impstyle/keymap.c
index c1964f5e1a..bb371faa3f 100644
--- a/keyboards/keebio/iris/keymaps/impstyle/keymap.c
+++ b/keyboards/keebio/iris/keymaps/impstyle/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
      KC_TAB , KC_Q  , KC_W  ,KC_E  , KC_R  , KC_T  ,                          KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
      KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_PLUS,         KC_MOUS,KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_PLUS,         KC_MOUS,KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                                      KC_LGUI,KC_RASE,KC_SPC ,         KC_ENT ,KC_LOWR,KC_LALT
   ),
 
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
index c5911ae5d3..c4c5a2cc23 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
@@ -58,7 +58,7 @@ LT(_LOWER, KC_TAB),KC_Q,  KC_W, 	KC_E, 	 KC_R, 	  KC_T,                				  KC_
 	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
 	   SE_TILD,  KC_EXLM, SE_AT,   KC_HASH, SE_DLR, KC_PERC,                     		SE_CIRC,  SE_AMPR, SE_ASTR, SE_SLSH, SE_LPRN, SE_RPRN,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   KC_TRNS,  KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_PGUP, KC_UP, KC_PGDOWN, SE_LCBR, SE_RCBR,
+	   KC_TRNS,  KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_PGUP, KC_UP, KC_PGDN,   SE_LCBR, SE_RCBR,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
 	  KC_TRNS,  KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, SE_BSLS,                     		KC_TRNS, KC_LEFT,  KC_DOWN, KC_RGHT, SE_LBRC,  SE_RBRC,
 	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
index b8a124baf0..7db5211311 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
 	 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                			KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   KC_TRNS,  KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_PGUP, KC_UP, KC_PGDOWN, KC_TRNS, KC_RBRC,
+	   KC_TRNS,  KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_PGUP, KC_UP, KC_PGDN,   KC_TRNS, KC_RBRC,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
 	   KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS,                     		KC_TRNS, KC_LEFT,  KC_DOWN, KC_RGHT, KC_TRNS, KC_BSLS,
 	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
index 752fc392f3..a479f9fe52 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
+++ b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_RAISE] = LAYOUT(
-     _______,  KC_VOLD, KC_VOLU, KC_MUTE, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,    KC_PSCREEN, _______, _______, _______, _______, QK_BOOT,
+     _______,  KC_VOLD, KC_VOLU, KC_MUTE, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,    KC_PSCR,    _______, _______, _______, _______, QK_BOOT,
      _______,  KC_SLSH, KC_6,    KC_5,    KC_4,    KC_EQL,                            KC_CIRC, KC_PGUP, KC_UP,   KC_PGDN, _______, RGB_VAI,
      _______,  KC_3,    KC_2,    KC_1,    KC_0,    KC_DOT,                            KC_EQL,  KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
      _______,  KC_ASTR, KC_9,    KC_8,    KC_7,    KC_PLUS,  _______,        _______, KC_PLUS, KC_HOME, KC_COLN, KC_END,  _______, RGB_MOD,
diff --git a/keyboards/keebio/iris/keymaps/vyolle/keymap.c b/keyboards/keebio/iris/keymaps/vyolle/keymap.c
index 431def355e..da9fb70a66 100644
--- a/keyboards/keebio/iris/keymaps/vyolle/keymap.c
+++ b/keyboards/keebio/iris/keymaps/vyolle/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_GRAVE,  KC_TILD, KC_UNDS, KC_EQL,   KC_PIPE,  _______,                          _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_BSLASH,KC_LCBR, KC_RCBR, KC_MINUS, KC_LBRC, KC_RBRC,                            _______, KC_LEFT, KC_UP, KC_RGHT, _______, _______,
+     KC_BSLS,KC_LCBR, KC_RCBR, KC_MINUS, KC_LBRC, KC_RBRC,                            _______, KC_LEFT, KC_UP, KC_RGHT, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_COLN,  KC_LT,   KC_GT,  KC_PLUS,  KC_LPRN, KC_RPRN, _______,          _______, _______, _______, KC_DOWN, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
index 1c71a5aa2b..abdb91192a 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 KC_ESC  , _________________QWERTY_L1_________________, _________________QWERTY_R1_________________ , APPS      ,
 KC_TAB  , _________________QWERTY_L2_________________, _________________QWERTY_R2_________________ , MO(_NAVI) ,
 OSMSFT  , _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ , KC_QUOTE  ,
-KC_LCTL , MODSFT , KC_LALT , KC_LGUI , KC_BSPACE , KC_SPC , KC_ENTER , KC_TAB , KC_UP  , KC_DOWN , KC_LEFT       , KC_RGHT
+KC_LCTL , MODSFT , KC_LALT , KC_LGUI , KC_BSPC , KC_SPC , KC_ENTER , KC_TAB , KC_UP  , KC_DOWN , KC_LEFT       , KC_RGHT
 ), // Note: visualizer expects this closing parens to be right at the start of the line.
 
 // Run `./qmk show levinson` from parent dir to see this layer.
diff --git a/keyboards/keebio/levinson/keymaps/numpad/keymap.c b/keyboards/keebio/levinson/keymaps/numpad/keymap.c
index e93d391f1f..851abb3657 100644
--- a/keyboards/keebio/levinson/keymaps/numpad/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/numpad/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [0] = LAYOUT_ortho_4x12(
-    KC_KP_0,     KC_KP_1, KC_KP_4,    KC_KP_7,     KC_BSPACE,      OSL(1),  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_KP_0,     KC_KP_1, KC_KP_4,    KC_KP_7,     KC_BSPC,        OSL(1),  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_COMMA,    KC_KP_2, KC_KP_5,    KC_KP_8,     KC_KP_SLASH,    KC_DOWN, KC_NO, KC_A,  KC_B,  KC_C,  KC_D,  KC_NO,
     KC_KP_DOT,   KC_KP_3, KC_KP_6,    KC_KP_9,     KC_KP_ASTERISK, KC_UP,   KC_NO, KC_E,  KC_F,  KC_G,  KC_H,  KC_NO,
     KC_KP_ENTER, KC_NO,   KC_KP_PLUS, KC_KP_MINUS, KC_KP_EQUAL,    MO(1),  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
diff --git a/keyboards/keebio/levinson/keymaps/steno/keymap.c b/keyboards/keebio/levinson/keymaps/steno/keymap.c
index cd7493467a..0ea24980d7 100644
--- a/keyboards/keebio/levinson/keymaps/steno/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/steno/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_GRAVE,  KC_TILD, KC_UNDS, KC_EQL, KC_PIPE,  _______,                         KC_HOME, KC_DEL, _______, KC_INS, KC_PGUP, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_BSLASH,KC_LCBR, KC_RCBR, KC_MINUS, KC_LBRC, KC_RBRC,                          KC_END, KC_LEFT, KC_UP, KC_RGHT, KC_PGDN, _______,
+     KC_BSLS,KC_LCBR, KC_RCBR, KC_MINUS, KC_LBRC, KC_RBRC,                          KC_END, KC_LEFT, KC_UP, KC_RGHT, KC_PGDN, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_COLN,  KC_LT,   KC_GT,  KC_PLUS,  KC_LPRN, KC_RPRN,                            _______, _______, KC_DOWN, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼                          ┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
index 07ba118e35..bd1f399086 100644
--- a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
+++ b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_NAV] = LAYOUT(
         MO(_TOOGLE),
-        KC_SPC, KC_UP, KC_BSPACE,
+        KC_SPC, KC_UP, KC_BSPC,
         KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENTER      
     ),
     [_VOLUME] = LAYOUT(
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
index 540a735fc5..ff5c9231ea 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
@@ -164,7 +164,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
       case _NAVIGATION:
         // Page Down/Up
         if (clockwise) {
-          tap_code16(KC_PGDOWN);
+          tap_code16(KC_PGDN);
         } else {
           tap_code16(KC_PGUP);
         }
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
index c9250e6094..387ff2d686 100644
--- a/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
+++ b/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ enum layers { _BASE, _FN1};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_numpad_6x4(
-        MO(_FN1), KC_ESC,  KC_BSPACE, KC_TAB,
+        MO(_FN1), KC_ESC,  KC_BSPC,   KC_TAB,
         KC_NUM,   KC_PSLS, KC_PAST,   KC_PMNS,
         KC_P7,    KC_P8,   KC_P9,
         KC_P4,    KC_P5,   KC_P6,     KC_PPLS,
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
index 93bacad361..32fd198cf0 100644
--- a/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
+++ b/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_numpad_6x4(
-        MO(_FN1), KC_ESC,  KC_BSPACE, KC_TAB,
+        MO(_FN1), KC_ESC,  KC_BSPC,   KC_TAB,
         KC_NUM,   KC_PSLS, KC_PAST,   KC_PMNS,
         KC_P7,    KC_P8,   KC_P9,
         KC_P4,    KC_P5,   KC_P6,     KC_PPLS,
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
index 4a80b8ac36..0d4f7e6a22 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CMD_SFT_L, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS, KC_END,
       KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, CMD_ALT_C, 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_PGDOWN, KC_END
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
       ),
 };
 
diff --git a/keyboards/keyprez/bison/bison.c b/keyboards/keyprez/bison/bison.c
index 66b86dfc90..30e0cdbe2b 100644
--- a/keyboards/keyprez/bison/bison.c
+++ b/keyboards/keyprez/bison/bison.c
@@ -26,7 +26,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
         }
     } else if (index == 1) {
         if (clockwise) {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         } else {
             tap_code(KC_PGUP);
         }
diff --git a/keyboards/keyprez/rhino/keymaps/default/keymap.c b/keyboards/keyprez/rhino/keymaps/default/keymap.c
index a44805f557..80e04b1c48 100644
--- a/keyboards/keyprez/rhino/keymaps/default/keymap.c
+++ b/keyboards/keyprez/rhino/keymaps/default/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,  _______, _______, _______, _______, _______, _______, KC_INS,
         _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, KC_BSLS, _______,
-                 _______, _______, _______, _______,     _______,           _______,    KC_HOME, KC_PGUP, KC_PGDOWN, KC_END
+                 _______, _______, _______, _______,     _______,           _______,    KC_HOME, KC_PGUP, KC_PGDN, KC_END
     ),
 
     /* RAISE Layer
diff --git a/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c b/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
index ed57c543f9..68aaf2f24e 100644
--- a/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
+++ b/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_PIPE,
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F12, _______, _______, _______, _______, _______, KC_DEL,  KC_INS,
         _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,                   _______, _______, _______, _______, KC_BSLS, _______,
-                 _______, _______, _______, _______,     _______,           _______,    KC_HOME, KC_PGUP, KC_PGDOWN, KC_END
+                 _______, _______, _______, _______,     _______,           _______,    KC_HOME, KC_PGUP, KC_PGDN, KC_END
     ),
 
     /* RAISE Layer
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
index a9bf663c19..bf9cc1d419 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
@@ -27,14 +27,14 @@ 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_PGDOWN,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,        KC_ENT,    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_RCTRL, 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_PGDOWN,
+        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
     ),
@@ -171,7 +171,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     //     // Do something else when release
     //   }
     //   return false; // Skip all further processing of this key
-    // case KC_PGDOWN:
+    // case KC_PGDN:
     //   if (record->event.pressed) {
     //       switch(dfa_state){
     //         case 0 :{
diff --git a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c b/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
index 625961ae23..4a7b39d26d 100644
--- a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_ortho_4x12(
-  KC_GRV,        KC_BSLS,       KC_NO,        KC_LBRC,       KC_RBRC,       KC_NO,   KC_NO,         KC_PGUP, KC_HOME,      KC_PGDOWN, KC_NO,          KC_PSCREEN         ,
+  KC_GRV,        KC_BSLS,       KC_NO,        KC_LBRC,       KC_RBRC,       KC_NO,   KC_NO,         KC_PGUP, KC_HOME,      KC_PGDN,   KC_NO,          KC_PSCR            ,
   LSFT(KC_BSLS), LSFT(KC_MINS), KC_EQL,       LSFT(KC_9),    LSFT(KC_0),    KC_NO,   KC_NO,         KC_HOME, KC_UP,        KC_END,    KC_NO,          LCTL(LSFT(KC_EQL)) ,
   LSFT(KC_GRV),  KC_MINS,       LSFT(KC_EQL), LSFT(KC_LBRC), LSFT(KC_RBRC), KC_NO,   LCTL(KC_LEFT), KC_LEFT, KC_DOWN,      KC_RIGHT,  LCTL(KC_RIGHT), LCTL(KC_MINS)      ,
   _______,       _______,       _______,      _______,       _______,       KC_SPC,  LCTL(KC_BSPC), _______, LCTL(KC_DEL), _______,   _______,        _______
diff --git a/keyboards/ktec/ergodone/keymaps/art/keymap.c b/keyboards/ktec/ergodone/keymaps/art/keymap.c
index d43a340769..2acfc84aec 100644
--- a/keyboards/ktec/ergodone/keymaps/art/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/art/keymap.c
@@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [QWERTY] = LAYOUT_ergodox(
   // -----------------------------------------------------left hand-----------------------------------------------------
   KC_GRAVE,         KC_1,         KC_2,       KC_3,       KC_4,              KC_5,      KC_ESCAPE,
-  KC_TAB,           KC_Q,         KC_W,       KC_E,       KC_R,              KC_T,      KC_BSLASH,
+  KC_TAB,           KC_Q,         KC_W,       KC_E,       KC_R,              KC_T,      KC_BSLS,
   KC_CAPS,          KC_A,         KC_S,       KC_D,       KC_F,              KC_G,
   KC_LSFT,          KC_Z,         KC_X,       KC_C,       KC_V,              KC_B,      TT(FKEYS),
   KC_LEFT,         KC_RIGHT,      KC_LWIN,    KC_LALT,    KC_LCTRL,
 
                                            KC_INS,    KC_PGUP,
-                                                      LT(MEDIA,KC_PGDOWN),
+                                                      LT(MEDIA,KC_PGDN),
                           LT(NAV,KC_SPC),  KC_BSPC,   LT(COMBOS,KC_DEL),
 
   // -----------------------------------------------------right hand-----------------------------------------------------
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LALT,          _______,          _______,          _______,          _______,          _______,          _______,
                     _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          _______,          _______,          _______,          _______,          KC_F11,
-                    _______,          _______,          _______,          KC_PSCREEN,       KC_F12,
+                    _______,          _______,          _______,          KC_PSCR,          KC_F12,
 
     _______,     _______,
     _______,
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // -----------------------------------------------------left hand-----------------------------------------------------
   _______,          _______,          _______,          _______,          _______,          _______,      _______,
   _______,          KC_ESC,           KC_HOME,          KC_UP,            KC_END,           KC_PGUP,          _______,
-  _______,          XXXXXXX,          KC_LEFT,          KC_DOWN,          KC_RIGHT,         KC_PGDOWN,
+  _______,          XXXXXXX,          KC_LEFT,          KC_DOWN,          KC_RIGHT,         KC_PGDN,
   _______,          LCTL(KC_Z),       LCTL(KC_X),       LCTL(KC_C),       LCTL(KC_V),       XXXXXXX,          _______,
   _______,          _______,          _______,          _______,          _______,
 
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // -----------------------------------------------------left hand-----------------------------------------------------
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          CTL_ALT(KC_HOME), CTL_ALT(KC_UP),   CTL_ALT(KC_END),  CTL_ALT(KC_PGUP), _______,
-  _______,          _______,          CTL_ALT(KC_LEFT), CTL_ALT(KC_DOWN), CTL_ALT(KC_RIGHT),CTL_ALT(KC_PGDOWN),
+  _______,          _______,          CTL_ALT(KC_LEFT), CTL_ALT(KC_DOWN), CTL_ALT(KC_RIGHT),CTL_ALT(KC_PGDN),
   _______,          _______,          LCTL(KC_X),       LCTL(KC_C),       LCTL(KC_V),    _______,          _______,
   _______,          _______,          _______,          _______,          _______,
 
@@ -214,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // -----------------------------------------------------left hand-----------------------------------------------------
   _______,          _______,          _______,          _______,          _______,          _______,          _______,
   _______,          _______,          LSFT(KC_HOME),    LSFT(KC_UP),      LSFT(KC_END),     LSFT(KC_PGUP),    _______,
-  _______,          _______,          LSFT(KC_LEFT),    LSFT(KC_DOWN),    LSFT(KC_RIGHT),   LSFT(KC_PGDOWN),
+  _______,          _______,          LSFT(KC_LEFT),    LSFT(KC_DOWN),    LSFT(KC_RIGHT),   LSFT(KC_PGDN),
   _______,          _______,          LCTL(KC_X),       LCTL(KC_C),       LCTL(KC_V),       _______,          _______,
   _______,          _______,          _______,          _______,          _______,
 
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
index a0dddd5791..89e98f1ea6 100644
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
@@ -686,7 +686,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [MATH] = LAYOUT_ergodox(
 	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-	KC_TAB,	X(Mc),	X(Munion),	X(arwl),	X(or),	X(exists),	KC_BSLASH,
+	KC_TAB,	X(Mc),	X(Munion),	X(arwl),	X(or),	X(exists),	KC_BSLS,
 	X(arwr), X(root), X(and), X(imply), X(nexists), X(forall),
 	KC_LSPO,	KC_SCLN,	X(intgrl),	X(Mn),	X(Mz),	X(member),	X(arwl),
 	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
diff --git a/keyboards/labyrinth75/keymaps/default/keymap.c b/keyboards/labyrinth75/keymaps/default/keymap.c
index a2417d5e08..33138f0f27 100644
--- a/keyboards/labyrinth75/keymaps/default/keymap.c
+++ b/keyboards/labyrinth75/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [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_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPACE,  KC_DEL,
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPC,  KC_DEL,
         KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP,
         KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,   KC_PGDN,
         KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSHIFT,   KC_UP, KC_END,
diff --git a/keyboards/labyrinth75/keymaps/via/keymap.c b/keyboards/labyrinth75/keymaps/via/keymap.c
index 3113901b95..148d37593b 100644
--- a/keyboards/labyrinth75/keymaps/via/keymap.c
+++ b/keyboards/labyrinth75/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [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_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPACE,  KC_DEL, 
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPC,  KC_DEL, 
         KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP, 
         KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,   KC_PGDN, 
         KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSHIFT,   KC_UP, KC_END, 
diff --git a/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
index 478b4872dc..7c4291efbb 100644
--- a/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
@@ -21,7 +21,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_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         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),   MO(2),
-                       KC_LCTRL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDOWN
+                       KC_LCTRL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDN
     ),
     [1] = LAYOUT_60_latin_hhkb(
         RGB_TOG,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
diff --git a/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
index 478b4872dc..7c4291efbb 100644
--- a/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
@@ -21,7 +21,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_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         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),   MO(2),
-                       KC_LCTRL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDOWN
+                       KC_LCTRL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDN
     ),
     [1] = LAYOUT_60_latin_hhkb(
         RGB_TOG,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
diff --git a/keyboards/latincompass/latin64ble/keymaps/default/keymap.c b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
index 8a1e9f6366..97d6ef54d4 100644
--- a/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
@@ -25,17 +25,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_CAPS, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
-	KC_LCTL, KC_LCTL, KC_LALT,          KC_SPC,       MO(2), KC_PGDOWN, KC_PGUP, KC_CALCULATOR,KC_DEL),	
+	KC_LCTL, KC_LCTL, KC_LALT,          KC_SPC,       MO(2), KC_PGDN, KC_PGUP, KC_CALCULATOR,KC_DEL),	
     [1] = LAYOUT( 
     RGB_TOG,  RGB_MOD, RGB_M_K, RGB_M_X, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_BSPC,
 	RGB_SAI,  RGB_SAD,  RGB_HUI, RGB_HUD,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_DEL,
 	RGB_VAI, RGB_VAD,  RGB_SPI,  RGB_SPD,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	RGB_SPI, RGB_SPD,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
-	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),	
+	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDN, KC_CALCULATOR,KC_DEL),	
     [2] = LAYOUT( 
     KC_NUM,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10,    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_DEL,
 	KC_CAPS, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
-	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),	
+	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDN, KC_CALCULATOR,KC_DEL),	
 };
diff --git a/keyboards/latincompass/latin64ble/keymaps/via/keymap.c b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
index f25f7db173..9aea66260e 100644
--- a/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
@@ -10,19 +10,19 @@ 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_CAPS, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
-	KC_LCTL, KC_LCTL, KC_LALT,          KC_SPC,       MO(2), KC_PGDOWN, KC_PGUP, KC_CALCULATOR,KC_DEL),	
+	KC_LCTL, KC_LCTL, KC_LALT,          KC_SPC,       MO(2), KC_PGDN, KC_PGUP, KC_CALCULATOR,KC_DEL),	
     [1] = LAYOUT( 
     RGB_TOG,  RGB_MOD, RGB_M_K, RGB_M_X, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_BSPC,
 	RGB_SAI,  RGB_SAD,  RGB_HUI, RGB_HUD,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_DEL,
 	RGB_VAI, RGB_VAD,  RGB_SPI,  RGB_SPD,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	RGB_SPI, RGB_SPD,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
-	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),	
+	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDN, KC_CALCULATOR,KC_DEL),	
     [2] = LAYOUT( 
     KC_NUM,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10,    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_DEL,
 	KC_CAPS, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
 	KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD,  KC_MY_COMPUTER, MO(1),
-	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),	
+	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,       MO(2), KC_PGUP, KC_PGDN, KC_CALCULATOR,KC_DEL),	
     [3] = LAYOUT( 
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,
 	_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______, _______,
diff --git a/keyboards/latincompass/latinpad/keymaps/default/keymap.c b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
index e2f263005f..cf966d6826 100644
--- a/keyboards/latincompass/latinpad/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
@@ -30,7 +30,7 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_PGUP, KC_PGDOWN,
+        KC_PGUP, KC_PGDN,
         KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
         KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
diff --git a/keyboards/latincompass/latinpad/keymaps/via/keymap.c b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
index e2c99f38d2..9fe60f09a7 100644
--- a/keyboards/latincompass/latinpad/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
@@ -28,7 +28,7 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_PGUP, KC_PGDOWN,
+        KC_PGUP, KC_PGDN,
         KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
         KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
diff --git a/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c b/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
index 18f4ad9e9e..7c65c24f31 100644
--- a/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
+++ b/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
@@ -22,7 +22,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho(
         KC_ESC,    KC_Q,    KC_W,    KC_E,     KC_R,     KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,       KC_BSPC,
-        LT2_TAB,   KC_A,    KC_S,    KC_D,     KC_F,     KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCOLON,  KC_ENT,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,     KC_F,     KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,   KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,    KC_N,    KC_M,    KC_COMMA, KC_DOT,   KC_QUOTE,   MO(2),
         KC_LCTL,   KC_LGUI, KC_RALT, KC_LSFT,  LT1_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_UP,    KC_DOWN,  KC_LEFT,    KC_RGHT
         ),
diff --git a/keyboards/lazydesigners/the40/keymaps/via/keymap.c b/keyboards/lazydesigners/the40/keymaps/via/keymap.c
index 69780dd949..615bbf6b80 100644
--- a/keyboards/lazydesigners/the40/keymaps/via/keymap.c
+++ b/keyboards/lazydesigners/the40/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho(
         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_SCOLON,  KC_ENT,
+        KC_TAB,    KC_A,    KC_S,    KC_D,     KC_F,     KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,   KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,    KC_N,    KC_M,    KC_COMMA, KC_DOT,   KC_QUOTE,   MO(2),
         KC_LCTL,   KC_LGUI, KC_RALT, KC_LSFT,  KC_SPC,   KC_SPC,  KC_SPC,  KC_SPC,  KC_UP,    KC_DOWN,  KC_LEFT,    KC_RGHT
         ),
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
index 70b32d4f44..531374a2c9 100644
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
@@ -44,7 +44,7 @@ KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,            KC_SPC,
 
 [_L1] = LAYOUT(
 KC_GRAVE,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL, KC_NUM,  _______, KC_PSLS,
-_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, _______, KC_LBRC, KC_RBRC,        KC_BSLASH, KC_MINS,  KC_EQL, KC_PAST,
+_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, _______, KC_LBRC, KC_RBRC,          KC_BSLS, KC_MINS,  KC_EQL, KC_PAST,
 _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_COMM,          KC_DOT , KC_SLSH, _______, _______, _______, KC_PMNS,
 _______, _______, _______,          _______,            _______,                 KC_SCLN, KC_QUOT, _______, _______, _______, KC_PPLS
 ),
diff --git a/keyboards/lets_split/keymaps/adam/keymap.c b/keyboards/lets_split/keymaps/adam/keymap.c
index baa4e0852a..6e0a33a24f 100644
--- a/keyboards/lets_split/keymaps/adam/keymap.c
+++ b/keyboards/lets_split/keymaps/adam/keymap.c
@@ -37,13 +37,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,      KC_F2,      KC_F3,       KC_F4,      KC_F5,      KC_F11,     KC_F12,     KC_F6,      KC_F7,      KC_F8,     KC_F9,    KC_F10, \
   KC_LBRC,    KC_GRV,     KC_TILDE,    S(KC_1),    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_HOME,    KC_PGUP,   XXXXXXX,  KC_RBRC, \
   S(KC_LBRC), _______,    _______,     _______,    _______,    XXXXXXX,    XXXXXXX,    KC_LEFT,    KC_DOWN,    KC_UP,     KC_RIGHT, S(KC_RBRC), \
-  KC_BSLS,    KC_PIPE,    XXXXXXX,     XXXXXXX,    XXXXXXX,    KC_ESC,     KC_ESC,     XXXXXXX,    KC_END,     KC_PGDOWN, KC_QUES,  KC_SLASH \
+  KC_BSLS,    KC_PIPE,    XXXXXXX,     XXXXXXX,    XXXXXXX,    KC_ESC,     KC_ESC,     XXXXXXX,    KC_END,     KC_PGDN,   KC_QUES,  KC_SLASH \
 ),
 [JLOCK] = LAYOUT ( \
   KC_F1,      KC_F2,      KC_F3,       KC_F4,      KC_F5,      KC_F11,     KC_F12,     KC_F6,      KC_F7,      KC_F8,     KC_F9,    KC_F10, \
   KC_LBRC,    KC_GRV,     KC_TILDE,    S(KC_1),    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_HOME,    KC_PGUP,   XXXXXXX,  KC_RBRC, \
   S(KC_LBRC), _______,    _______,     _______,    _______,    XXXXXXX,    XXXXXXX,    KC_LEFT,    _______,    KC_UP,     KC_RIGHT, S(KC_RBRC), \
-  KC_BSLS,    KC_PIPE,    XXXXXXX,     XXXXXXX,    XXXXXXX,    KC_ESC,     KC_ESC,     XXXXXXX,    KC_END,     KC_PGDOWN, KC_QUES,  KC_SLASH \
+  KC_BSLS,    KC_PIPE,    XXXXXXX,     XXXXXXX,    XXXXXXX,    KC_ESC,     KC_ESC,     XXXXXXX,    KC_END,     KC_PGDN,   KC_QUES,  KC_SLASH \
 )
 };
 
diff --git a/keyboards/lets_split/keymaps/cpeters1982/keymap.c b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
index 34174ac8c9..0dceef3675 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/keymap.c
+++ b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, KC_LEFT,  KC_DOWN, KC_RGHT, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PERC, KC_GRV, KC_TILD, \
-  KC_ASDN, KC_ASUP, KC_ASRP, _______, _______, _______, _______, KC_RBRC, KC_LBRC, KC_MINS, KC_EQL, KC_BSLASH \
+  KC_ASDN, KC_ASUP, KC_ASRP, _______, _______, _______, _______, KC_RBRC, KC_LBRC, KC_MINS, KC_EQL, KC_BSLS \
 )
 
 
diff --git a/keyboards/lets_split/keymaps/geripgeri/keymap.c b/keyboards/lets_split/keymaps/geripgeri/keymap.c
index d6f6f0537f..427467f17a 100644
--- a/keyboards/lets_split/keymaps/geripgeri/keymap.c
+++ b/keyboards/lets_split/keymaps/geripgeri/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_ortho_4x12(
   KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL,
   SLIGHTLY, SMILE, JOY, RELAXED, HEART, _______,              KC_HOME, KC_PGUP, _______, KC_LCBR, KC_RCBR, KC_PIPE,
-  SAD, CRY, NETRURAL, SCREAM, THUMBSUP, _______,              KC_END, KC_PGDOWN,_______, KC_LBRC, KC_RBRC, KC_PSCREEN,
+  SAD, CRY, NETRURAL, SCREAM, THUMBSUP, _______,              KC_END, KC_PGDN,  _______, KC_LBRC, KC_RBRC, KC_PSCR,
   _______, _______, _______, _______, _______, KC_INSERT,     KC_DEL, _______,  TD(NEXTPREV), KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/keymap.c b/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
index 950eda4a45..7b01273bc4 100644
--- a/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
+++ b/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             QK_BOOT, ____, ____, ____, ____, ____, ____, LGUI(KC_L), ____, ____, ____, KC_VOLU,
             ____, ____, LGUI(KC_R), ____, ____, ____, ____, ____, ____, ____, ____, KC_VOLD,
             ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, KC_PGUP, KC_MUTE,
-            ____, ____, ____, ____, KC_TAB, KC_DEL, ____, ____, ____, KC_HOME, KC_PGDOWN, KC_END)
+            ____, ____, ____, ____, KC_TAB, KC_DEL, ____, ____, ____, KC_HOME, KC_PGDN, KC_END)
 
 };
 
diff --git a/keyboards/lets_split/keymaps/piemod/keymap.c b/keyboards/lets_split/keymaps/piemod/keymap.c
index cfb7fbdc0c..7cbbf1e8d8 100644
--- a/keyboards/lets_split/keymaps/piemod/keymap.c
+++ b/keyboards/lets_split/keymaps/piemod/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT( \
   KC_ESC,  KC_QUOTE,  LT(7, KC_COMMA),  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_DELETE, \
   KC_TAB,  LT(1, KC_A),  LT(2, KC_O),  LT(3, KC_E),  LT(4, KC_U),  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_ENTER, \
-  KC_LSHIFT,  KC_SCOLON,  LT(5, KC_Q),   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS, \
-  C(KC_LALT), LT(6, KC_LCTRL),  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPACE,  KC_SPACE,  KC_RCTRL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT \
+  KC_LSHIFT,  KC_SCLN,  LT(5, KC_Q),   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS, \
+  C(KC_LALT), LT(6, KC_LCTRL),  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTRL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT \
 ),
 
 [_ARROW] = LAYOUT( \
@@ -41,8 +41,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_SYMBOL] = LAYOUT( \
   KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRC,  KC_RBRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN, \
-  KC_NO,  KC_NO,  KC_TRNS,  KC_SCOLON,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH), \
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLASH,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE, \
+  KC_NO,  KC_NO,  KC_TRNS,  KC_SCLN,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH), \
+  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLS,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE, \
   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,   KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL \
 ),
 
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_FUNCTION] = LAYOUT( \
-  KC_PSCREEN,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6, \
+  KC_PSCR,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6, \
   KC_NO,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_TRNS,  KC_NO,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12, \
   KC_NO,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_NO,  KC_NO, KC_NO,  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  KC_MEDIA_PLAY_PAUSE, \
   QK_BOOT,  RGB_TOG,  RGB_MOD,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END \
diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c
index cb3e1fff54..b9878314eb 100644
--- a/keyboards/lets_split/keymaps/shaymdev/keymap.c
+++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPACE, KC_DELETE);
+const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DELETE);
 
 // This globally defines all key overrides to be used
 const key_override_t **key_overrides = (const key_override_t *[]){
diff --git a/keyboards/lets_split/keymaps/zer09/keymap.c b/keyboards/lets_split/keymaps/zer09/keymap.c
index 628e334a29..4bca2d7484 100644
--- a/keyboards/lets_split/keymaps/zer09/keymap.c
+++ b/keyboards/lets_split/keymaps/zer09/keymap.c
@@ -5,15 +5,15 @@ extern keymap_config_t keymap_config;
 #define _baseLayer LAYOUT( \
   KC_QUOTE,    KC_COMMA,    KC_DOT,      KC_P,        KC_Y,           /**/KC_F,           KC_G,        KC_C,        KC_R,        KC_L,        \
   CTL_T(KC_A), SFT_T(KC_O), ALT_T(KC_E), KC_U,        KC_I,           /**/KC_D,           KC_H,        ALT_T(KC_T), SFT_T(KC_N), CTL_T(KC_S), \
-  KC_SCOLON,   KC_Q,        KC_J,        KC_K,        KC_X,           /**/KC_B,           KC_M,        KC_W,        KC_V,        KC_Z,        \
-  TD(DA_UPLY), MO(_VL),     KC_TAB,      KC_BSPACE,   KC_ESC,         /**/KC_INS,         KC_HOME,     KC_PGUP,     MO(_VL),     TD(DA_UPLY), \
+  KC_SCLN,     KC_Q,        KC_J,        KC_K,        KC_X,           /**/KC_B,           KC_M,        KC_W,        KC_V,        KC_Z,        \
+  TD(DA_UPLY), MO(_VL),     KC_TAB,      KC_BSPC,     KC_ESC,         /**/KC_INS,         KC_HOME,     KC_PGUP,     MO(_VL),     TD(DA_UPLY), \
   TD(DA_DWLY), TD(DA_LCTL), KC_SPC,      TD(DA_LSPR), LSFT_T(KC_CAPS),/**/SFT_T(KC_CAPS), TD(DA_RALT), KC_ENT,      TD(DA_RCTL), TD(DA_DWLY))
 
 #define _GMLayer LAYOUT(                                              \
   KC_QUOTE,    KC_COMMA,    KC_DOT,      KC_P,        KC_Y,           /**/KC_F,           KC_G,        KC_C,        KC_R,        KC_L, \
   KC_A,        KC_O,        KC_E,        KC_U,        KC_I,           /**/KC_D,           KC_H,        ALT_T(KC_T), SFT_T(KC_N), CTL_T(KC_S), \
-  KC_SCOLON,   KC_Q,        KC_J,        KC_K,        KC_X,           /**/KC_B,           KC_M,        KC_W,        KC_V,        KC_Z, \
-  TD(DA_UPLY), MO(_VL),     KC_TAB,      KC_BSPACE,   KC_ESC,         /**/KC_INS,         KC_HOME,     KC_PGUP,     MO(_VL),     TD(DA_UPLY), \
+  KC_SCLN,     KC_Q,        KC_J,        KC_K,        KC_X,           /**/KC_B,           KC_M,        KC_W,        KC_V,        KC_Z, \
+  TD(DA_UPLY), MO(_VL),     KC_TAB,      KC_BSPC,     KC_ESC,         /**/KC_INS,         KC_HOME,     KC_PGUP,     MO(_VL),     TD(DA_UPLY), \
   TD(DA_DWLY), TD(DA_LCTL), KC_SPC,      TD(DA_LSPR), LSFT_T(KC_CAPS),/**/SFT_T(KC_CAPS), TD(DA_RALT), KC_ENT,      TD(DA_RCTL), TD(DA_DWLY))
 
 #define _upLayer LAYOUT( \
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
index f92700ca16..e24ad18320 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
@@ -38,14 +38,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT( \
   KC_QUOTE,    KC_COMMA, KC_DOT,  KC_P,    KC_Y, KC_TAB, KC_BSPC, KC_F,  KC_G,    KC_C,    KC_R,    KC_L, \
   KC_A,        KC_O,     KC_E,    KC_U,    KC_I, KC_ENT, KC_ENT,  KC_D,  KC_H,    KC_T,    KC_N,    KC_S, \
-  KC_SCOLON,   KC_Q,     KC_J,    KC_K,    KC_X, OSM(MOD_LSFT), OSM(MOD_RSFT), KC_B,  KC_M,    KC_W,    KC_V,    KC_Z, \
+  KC_SCLN,     KC_Q,     KC_J,    KC_K,    KC_X, OSM(MOD_LSFT), OSM(MOD_RSFT), KC_B,  KC_M,    KC_W,    KC_V,    KC_Z, \
   KC_LCTL, KC_LGUI, KC_LALT, OSM(MOD_LSFT), KC_SPC, LOWER, RAISE, KC_SPC, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
 
 /*[BASE] = LAYOUT(
  *   KC_QUOTE,      KC_COMMA,      KC_DOT,     KC_P,                KC_Y,                                 KC_F,       KC_G,      KC_C,    KC_R,          KC_L,
  *   KC_A,          KC_O,          KC_E,       KC_U,                KC_I,                                 KC_D,       KC_H,      KC_T,    KC_N,          KC_S,
- *   KC_SCOLON,     KC_Q,          KC_J,       KC_K,                KC_X,                                 KC_B,       KC_M,      KC_W,    KC_V,          KC_Z,
+ *   KC_SCLN,       KC_Q,          KC_J,       KC_K,                KC_X,                                 KC_B,       KC_M,      KC_W,    KC_V,          KC_Z,
  *   OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER,   KC_SPACE,  KC_BSPC, RCTL(KC_BSPC), KC_CAPS, OSM(MOD_LSFT)
  * ),
  *KC_GRV,
diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
index 331a22314d..699822ffc0 100644
--- a/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT(
   ALGR(BP_B), BP_EACU,    ALGR(BP_P), ALGR(BP_O),    BP_EGRV,        KC_PGUP,   KC_HOME, KC_UP,   KC_END,   KC_MS_WH_UP,
-  ALGR(BP_A), ALGR(BP_U), ALGR(BP_I), ALGR(BP_E),     BP_DLR,        KC_PGDOWN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MS_WH_DOWN,
+  ALGR(BP_A), ALGR(BP_U), ALGR(BP_I), ALGR(BP_E),     BP_DLR,        KC_PGDN,   KC_LEFT, KC_DOWN, KC_RIGHT, KC_MS_WH_DOWN,
      BP_AGRV,    KC_LALT,    KC_LCTL,    KC_LSFT,    BP_CCED,        _______,   KC_LSFT, KC_LCTL, KC_LALT,  _______,
                              _______,    _______,    _______,        _______,   _______, _______
 ),
diff --git a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
index c50571c78d..8686d6e877 100644
--- a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_LOWER] = LAYOUT( \
-  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  DE_LBRC,  DE_RBRC,  KC_AUDIO_VOL_UP,  KC_HOME,      KC_PGDOWN,  KC_PGUP,  KC_END,   DE_TILD,  \
+  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  DE_LBRC,  DE_RBRC,  KC_AUDIO_VOL_UP,  KC_HOME,      KC_PGDN,    KC_PGUP,  KC_END,   DE_TILD,  \
   KC_ESC,   DE_LABK,  DE_LPRN,  DE_RPRN,  DE_RABK,                          KC_LEFT,      KC_DOWN,    KC_UP,    KC_RIGHT, KC_ENT,  \
   KC_BSPC,  KC_DEL,   DE_LCBR,  DE_RCBR,  KC_PSCR,                        	_______,  DE_ADIA,  DE_ODIA,  DE_UDIA,  DE_SS,  \
                         _______, _______, _______,                    _______,  MO(_ADJUST), _______  \
diff --git a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
index 97899700f1..fddd71a2bb 100644
--- a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Layer 1: Functions, primary layer switching, media controls, directional */
   [_FN] = LAYOUT_mitchsplit(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10, KC_F11, KC_F12, KC_DEL, \
-      KC_CAPS, bbbbbb,  bbbbbb,  bbbbbb,  bbbbbb, bbbbbb, KC_HOME, KC_PGUP, KC_UP ,  KC_PGDOWN,KC_END, bbbbbb, bbbbbb, bbbbbb,  \
+      KC_CAPS, bbbbbb,  bbbbbb,  bbbbbb,  bbbbbb, bbbbbb, KC_HOME, KC_PGUP, KC_UP ,  KC_PGDN,  KC_END, bbbbbb, bbbbbb, bbbbbb,  \
       ______,  KC_VOLD, KC_VOLU, KC_MUTE, bbbbbb, bbbbbb, bbbbbb,  KC_LEFT, KC_DOWN, KC_RIGHT, bbbbbb, bbbbbb, ______,   \
       ______,  KC_MPRV, KC_MPLY, KC_MNXT, bbbbbb, bbbbbb, bbbbbb,TO(_DFT),TO(_NGUI), bbbbbb,   bbbbbb, ______, ______,  \
       ______,  ______,  ______,           ______, ______, ______,                    ______,   ______,TG(_SFX),______  \
diff --git a/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c b/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c
index 56fd470831..1446ad8cf4 100644
--- a/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c
+++ b/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CMD_SFT_L, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, CMD_ALT_C, 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_PGDOWN, KC_END
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
       ),
 };
 
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
index 4ebd8c45ac..53e0566005 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                set_selected_encoder_key(selected_encoder_key_id);
             }
             if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGDOWN);
+                tap_code16(KC_PGDN);
             }
             if (IS_LAYER_ON(FN_2)) {
                 tap_code(KC_VOLU);
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
index eb9aa104b8..73bc282a7e 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                set_selected_encoder_key(selected_encoder_key_id);
             }
             if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGDOWN);
+                tap_code16(KC_PGDN);
             }
             if (IS_LAYER_ON(FN_2)) {
                 tap_code(KC_VOLU);
diff --git a/keyboards/melgeek/mj64/keymaps/default/keymap.c b/keyboards/melgeek/mj64/keymaps/default/keymap.c
index 1d8f3f1118..25a47d369b 100644
--- a/keyboards/melgeek/mj64/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_64_ansi( /* Base */
 			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
-		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLASH,
+		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
 			KC_CAPS,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,   KC_DEL,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN, KC_RIGHT
diff --git a/keyboards/melgeek/mj64/keymaps/via/keymap.c b/keyboards/melgeek/mj64/keymaps/via/keymap.c
index 7fe6458550..d33e2f7562 100644
--- a/keyboards/melgeek/mj64/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_64_ansi( /* Base */
 			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
-		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLASH,
+		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
 			KC_CAPS,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,   KC_DEL,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN, KC_RIGHT
diff --git a/keyboards/melgeek/mj65/keymaps/default/keymap.c b/keyboards/melgeek/mj65/keymaps/default/keymap.c
index 4efc7e12da..ef9fe71e4c 100644
--- a/keyboards/melgeek/mj65/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
 			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, 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_PGUP,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
diff --git a/keyboards/melgeek/mj65/keymaps/via/keymap.c b/keyboards/melgeek/mj65/keymaps/via/keymap.c
index 858254f7ba..121a1c3830 100644
--- a/keyboards/melgeek/mj65/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
 			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, 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_PGUP,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
diff --git a/keyboards/mexsistor/ludmila/keymaps/default/keymap.c b/keyboards/mexsistor/ludmila/keymaps/default/keymap.c
index e1aaddadd1..785188dfca 100644
--- a/keyboards/mexsistor/ludmila/keymaps/default/keymap.c
+++ b/keyboards/mexsistor/ludmila/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum keyboard_layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT( /* Base */
-    KC_COPY, KC_PSCREEN, KC_MUTE,
+    KC_COPY, KC_PSCR, KC_MUTE,
     KC_PASTE, KC_ENTER
 
   ),
diff --git a/keyboards/miller/gm862/keymaps/default/keymap.c b/keyboards/miller/gm862/keymaps/default/keymap.c
index eeceec6c20..ec777cacf8 100644
--- a/keyboards/miller/gm862/keymaps/default/keymap.c
+++ b/keyboards/miller/gm862/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[_LAYER0] = LAYOUT_60_ansi( /* Base */
 			KC_GESC,         KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,      KC_MINS,  KC_EQL,  KC_BSPC,
-		    KC_TAB,          KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,      KC_LBRC,  KC_RBRC, KC_BSLASH,
+		    KC_TAB,          KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,      KC_LBRC,  KC_RBRC, KC_BSLS,
 			CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,   KC_QUOT,           KC_ENT,
 		    KC_LSFT,         KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,   KC_RSFT,
 		    KC_LCTL,         KC_LGUI,  KC_LALT,                KC_SPC,                         KC_RALT,  MO(1),     KC_RGUI,             KC_RCTL),
@@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				KC_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_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
-				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDOWN,KC_MNXT,
+				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				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/miller/gm862/keymaps/via/keymap.c b/keyboards/miller/gm862/keymaps/via/keymap.c
index eeceec6c20..ec777cacf8 100644
--- a/keyboards/miller/gm862/keymaps/via/keymap.c
+++ b/keyboards/miller/gm862/keymaps/via/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[_LAYER0] = LAYOUT_60_ansi( /* Base */
 			KC_GESC,         KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,      KC_MINS,  KC_EQL,  KC_BSPC,
-		    KC_TAB,          KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,      KC_LBRC,  KC_RBRC, KC_BSLASH,
+		    KC_TAB,          KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,      KC_LBRC,  KC_RBRC, KC_BSLS,
 			CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,   KC_QUOT,           KC_ENT,
 		    KC_LSFT,         KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,   KC_RSFT,
 		    KC_LCTL,         KC_LGUI,  KC_LALT,                KC_SPC,                         KC_RALT,  MO(1),     KC_RGUI,             KC_RCTL),
@@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				KC_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_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
-				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDOWN,KC_MNXT,
+				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
 		};
\ No newline at end of file
diff --git a/keyboards/mino/keymaps/default/keymap.c b/keyboards/mino/keymaps/default/keymap.c
index 27c70c7e6b..d55d97a039 100644
--- a/keyboards/mino/keymaps/default/keymap.c
+++ b/keyboards/mino/keymaps/default/keymap.c
@@ -25,8 +25,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_default(
-        KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV, KC_BSPACE,
-        KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENTER,
+        KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV, 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_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,
         KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_DEL, KC_SPACE, MO(_1), MO(_2), KC_RCTRL
     ),
diff --git a/keyboards/mino/keymaps/via/keymap.c b/keyboards/mino/keymaps/via/keymap.c
index 6cfdb50164..7dbda932b6 100644
--- a/keyboards/mino/keymaps/via/keymap.c
+++ b/keyboards/mino/keymaps/via/keymap.c
@@ -25,8 +25,8 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_0] = LAYOUT_default(
-        KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV, KC_BSPACE,
-        KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENTER,
+        KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV, 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_ENTER,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,
         KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_DEL, KC_SPACE, MO(_1), MO(_2), KC_RCTRL
     ),
diff --git a/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c b/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c
index 957d826d93..76082c5307 100644
--- a/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c
+++ b/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [META] = LAYOUT(
 		KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELETE, 		            KC_7, KC_8, KC_9, 
 		KC_TAB, KC_GRAVE, KC_MINUS, KC_EQUAL, KC_F, KC_G, KC_H, KC_J, KC_K, KC_QUOT, KC_SCLN, 		        KC_4, KC_5, KC_6, 
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLASH, KC_BSLASH,		  KC_PGUP,				KC_1, KC_2, KC_3, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLASH, KC_BSLS,		  KC_PGUP,				KC_1, KC_2, KC_3, 
 		KC_LCTL, KC_LALT, KC_TRNS, KC_SPC, KC_BSPC, KC_TRNS, KC_LCTL,		 KC_WBAK, KC_PGDN, KC_WFWD,		KC_0, KC_NLCK),
 		
 	[SUPER] = LAYOUT(
diff --git a/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c b/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c
index c92069d13f..60dc14baac 100644
--- a/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c
+++ b/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [META] = LAYOUT(
 		KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELETE, 		            KC_7, KC_8, KC_9, 
 		KC_TRNS, KC_GRAVE, KC_MINUS, KC_EQUAL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		        KC_4, KC_5, KC_6, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLASH, KC_BSLASH,		  KC_PGUP,				KC_1, KC_2, KC_3, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLASH, KC_BSLS,		  KC_PGUP,				KC_1, KC_2, KC_3, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,		 KC_WBAK, KC_PGDN, KC_WFWD,		KC_0, KC_NLCK),
 		
 	[SUPER] = LAYOUT(
diff --git a/keyboards/misonoworks/karina/keymaps/default/keymap.c b/keyboards/misonoworks/karina/keymaps/default/keymap.c
index a9af182f8a..470c7ceaf0 100644
--- a/keyboards/misonoworks/karina/keymaps/default/keymap.c
+++ b/keyboards/misonoworks/karina/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         if (clockwise) {
             tap_code(KC_PGUP);
         } else {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         }
     }
     else if (index == 1) {
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
index 3d5bfdd13a..0b91d9f0c3 100644
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ b/keyboards/mitosis/keymaps/nzen/keymap.c
@@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_QWERTY] = LAYOUT(
     KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,     KC_Y,      KC_U,        KC_I,        KC_O,   KC_P,
-    KC_A,      KC_S,      KC_D,      KC_F,      KC_G,     KC_H,      KC_J,        KC_K,        KC_L,   KC_SCOLON,
+    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_BSPACE, KC_DELETE, KC_LCTRL,  TG( 2 ),  TG( 3 ),   KC_RCTRL,    KC_ENTER,    KC_BSPACE,
+               KC_BSPC,   KC_DELETE, KC_LCTRL,  TG( 2 ),  TG( 3 ),   KC_RCTRL,    KC_ENTER,    KC_BSPC,
                KC_LALT,   KC_0,      KC_LSHIFT, KC_SPACE, KC_SPACE,  KC_RSHIFT,   KC_CAPS,     KC_RALT
   ),
   /*
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [ '', '4', '', '',/ ** / '', '', '', '',  ]
    */
   [_WORKMAN] = LAYOUT(
-    KC_Q, KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,     KC_P,    KC_SCOLON,
+    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,
           _______, _______, _______, _______, _______, _______, _______,  _______,
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [ '', '6', '', '',/ ** / '', '', '', '',  ]
    */
   [_NUMBERS] = LAYOUT(
-    KC_9,       KC_8,       KC_7,       KC_6,       KC_5,    KC_F2,   KC_PGDOWN,     KC_UP,    KC_TAB,   KC_PGUP,
+    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 ), _______,       _______,  _______,
@@ -81,9 +81,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ['', '7', '', '',/ ** / '', '', '', '',  ]
    */
   [_PUNCT] = LAYOUT(
-    KC_HASH,     KC_AT,       KC_AMPERSAND, KC_DOT,      KC_SCOLON, KC_UNDERSCORE, KC_COMMA,    KC_PIPE, KC_CIRCUMFLEX, KC_PERCENT,
+    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_BSLASH,   KC_QUESTION, KC_LT,        KC_LBRC,     KC_DOLLAR, KC_TILDE,      KC_RBRC,     KC_GT,   KC_EXCLAIM,    KC_SLASH,
+    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,         _______,     _______,   _______,       _______,     _______, _______
   ),
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_PSCREEN, KC_SLCK,    KC_MS_WH_LEFT, KC_MS_WH_RIGHT, KC_MS_BTN3,
+    KC_F11, KC_F12,  KC_GRAVE, KC_MUTE,  KC_ESCAPE, KC_PSCR,    KC_SLCK,    KC_MS_WH_LEFT, KC_MS_WH_RIGHT, KC_MS_BTN3,
             _______, _______,  _______,  TG( 4 ),   TG( 5 ),    _______,    _______,       _______,
             _______, KC_4,     _______,  _______,   _______,    _______,    _______,       _______
   ),
diff --git a/keyboards/mlego/m65/keymaps/default/readme.md b/keyboards/mlego/m65/keymaps/default/readme.md
index ae71342232..97f9b345d0 100644
--- a/keyboards/mlego/m65/keymaps/default/readme.md
+++ b/keyboards/mlego/m65/keymaps/default/readme.md
@@ -5,7 +5,7 @@
 This is the default layout for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a UK
 turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
 number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
-KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, KC_EQL in layer 2 aka
+KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PRINT_SCREEN, KC_DEL, KC_EQL in layer 2 aka
 RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
 
 flashing is done by LWR+RSE+r
diff --git a/keyboards/mlego/m65/keymaps/dk/readme.md b/keyboards/mlego/m65/keymaps/dk/readme.md
index 06fed3bda6..76ecd8c139 100644
--- a/keyboards/mlego/m65/keymaps/dk/readme.md
+++ b/keyboards/mlego/m65/keymaps/dk/readme.md
@@ -5,7 +5,7 @@
 This is the Danish keymap for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a DK
 turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
 number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
-KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, DK_ACUT in layer 2 aka
+KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PRINT_SCREEN, KC_DEL, DK_ACUT in layer 2 aka
 RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
 
 flashing is done by LWR+RSE+r
diff --git a/keyboards/mlego/m65/keymaps/uk/readme.md b/keyboards/mlego/m65/keymaps/uk/readme.md
index bc29d23905..0242a7d007 100644
--- a/keyboards/mlego/m65/keymaps/uk/readme.md
+++ b/keyboards/mlego/m65/keymaps/uk/readme.md
@@ -5,7 +5,7 @@
 This is the default layout for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a UK
 turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
 number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
-KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, KC_EQL in layer 2 aka
+KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PRINT_SCREEN, KC_DEL, KC_EQL in layer 2 aka
 RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
 
 flashing is done by LWR+RSE+r
diff --git a/keyboards/mntre/keymaps/default/keymap.c b/keyboards/mntre/keymaps/default/keymap.c
index edf334a60f..eb367b2f8d 100644
--- a/keyboards/mntre/keymaps/default/keymap.c
+++ b/keyboards/mntre/keymaps/default/keymap.c
@@ -13,11 +13,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
         KC_ESC,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,     KC_F9,    KC_F10,  KC_F11,      KC_F12,      MO(_FN),
-        KC_GRAVE,  KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,    KC_8,      KC_9,     KC_0,    KC_MINUS,    KC_EQUAL,    KC_BSPACE,
-        KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,      KC_O,     KC_P,    KC_LBRC,     KC_RBRC,     KC_BSLASH,
-        KC_LCTRL,  KC_APP,  KC_A,     KC_S,     KC_D,    KC_F,    KC_G,     KC_H,    KC_J,      KC_K,     KC_L,    KC_SCOLON,   KC_QUOTE,    KC_ENTER,
+        KC_GRAVE,  KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,    KC_8,      KC_9,     KC_0,    KC_MINUS,    KC_EQUAL,    KC_BSPC,
+        KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,      KC_O,     KC_P,    KC_LBRC,     KC_RBRC,     KC_BSLS,
+        KC_LCTRL,  KC_APP,  KC_A,     KC_S,     KC_D,    KC_F,    KC_G,     KC_H,    KC_J,      KC_K,     KC_L,    KC_SCLN,     KC_QUOTE,    KC_ENTER,
         KC_LSHIFT, KC_DEL,  KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,     KC_N,    KC_M,      KC_COMMA, KC_DOT,  KC_SLASH,    KC_UP,       KC_RSHIFT,
-        KC_RGUI,   KC_LGUI, KC_RCTRL, KC_SPACE, KC_LALT, KC_RALT, KC_SPACE, KC_PGUP, KC_PGDOWN, KC_LEFT,  KC_DOWN, KC_RIGHT
+        KC_RGUI,   KC_LGUI, KC_RCTRL, KC_SPACE, KC_LALT, KC_RALT, KC_SPACE, KC_PGUP, KC_PGDN,   KC_LEFT,  KC_DOWN, KC_RIGHT
     ),
 
     [_FN] = LAYOUT(
diff --git a/keyboards/mokey/xox70hot/keymaps/default/keymap.c b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
index e7955ce89b..6ea7623603 100644
--- a/keyboards/mokey/xox70hot/keymaps/default/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_tkl_nofrow_ansi_tsangan(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,  KC_INSERT, KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  KC_PGDOWN,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  KC_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_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
index 53f66e5214..aae027eb1c 100644
--- a/keyboards/mokey/xox70hot/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT_tkl_nofrow_ansi_tsangan(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,  KC_INSERT, KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  KC_PGDOWN,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  KC_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_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/ms_sculpt/keymaps/default/keymap.c b/keyboards/ms_sculpt/keymaps/default/keymap.c
index b82c37a773..ceb684d609 100644
--- a/keyboards/ms_sculpt/keymaps/default/keymap.c
+++ b/keyboards/ms_sculpt/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
   [_BASE] = LAYOUT_iso( \
     /*  0      1        2        3        4        5         6        7       8        9         10      11          12         13         14        15       16  */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,     KC_F12,  KC_PSCREEN, KC_SLCK, KC_PAUSE, KC_CALC, \
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,     KC_F12,  KC_PSCR, KC_SLCK, KC_PAUSE, KC_CALC, \
     KC_GRV,  KC_1,    KC_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_END, \
     KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_NUHS, KC_ENT,  KC_INS,  KC_PGUP, \
diff --git a/keyboards/mt/mt40/keymaps/default/keymap.c b/keyboards/mt/mt40/keymaps/default/keymap.c
index 0feadbfb74..7dc77dd7e1 100644
--- a/keyboards/mt/mt40/keymaps/default/keymap.c
+++ b/keyboards/mt/mt40/keymaps/default/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______, _______, _______, _______, _______, _______, KC_QUOT, KC_EQL,  KC_LBRC, KC_RBRC, KC_NUBS,
         KC_GRAVE, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
         _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,  _______, _______, _______, _______,     _______,      OOOOOOO, KC_HOME, KC_PGDOWN, KC_PGUP, KC_END),
+        _______,  _______, _______, _______, _______,     _______,      OOOOOOO, KC_HOME, KC_PGDN, KC_PGUP, KC_END),
 
     [3] = LAYOUT_planck_mit(
         _______, _______, _______, _______, _______, _______, KC_COPY, KC_PGUP, _______, _______,  KC_PASTE, KC_DEL,
diff --git a/keyboards/mt/mt84/keymaps/default/keymap.c b/keyboards/mt/mt84/keymaps/default/keymap.c
index 40e1aa0b90..e3c7fa8b87 100644
--- a/keyboards/mt/mt84/keymaps/default/keymap.c
+++ b/keyboards/mt/mt84/keymaps/default/keymap.c
@@ -25,10 +25,10 @@ enum mt84_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_DEFAULT] = LAYOUT_75_ansi(
-    	 KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9  , KC_F10, KC_F11,    KC_F12,   KC_PSCREEN, KC_PAUSE, KC_DELETE,
+    	 KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9  , KC_F10, KC_F11,    KC_F12,   KC_PSCR, KC_PAUSE, KC_DELETE,
         KC_GRAVE,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDOWN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,  KC_END,
         KC_LCTL,    KC_LALT, KC_LWIN,              KC_SPC,                                          MO(1),  KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
                         ),
diff --git a/keyboards/mt/mt84/keymaps/via/keymap.c b/keyboards/mt/mt84/keymaps/via/keymap.c
index ca62790cde..f65f36647e 100644
--- a/keyboards/mt/mt84/keymaps/via/keymap.c
+++ b/keyboards/mt/mt84/keymaps/via/keymap.c
@@ -18,10 +18,10 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_75_ansi(
-    	KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9, KC_F10, KC_F11,    KC_F12,   KC_PSCREEN, KC_PAUSE, KC_DELETE,
+    	KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9, KC_F10, KC_F11,    KC_F12,   KC_PSCR, KC_PAUSE, KC_DELETE,
         KC_GRAVE,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDOWN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,  KC_END,
         KC_LCTL,    KC_LALT, KC_LWIN,              KC_SPC,                                          MO(1),  KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 	LAYOUT_75_ansi(
diff --git a/keyboards/mt/split75/keymaps/art/keymap.c b/keyboards/mt/split75/keymaps/art/keymap.c
index 25a58ee591..0196505854 100644
--- a/keyboards/mt/split75/keymaps/art/keymap.c
+++ b/keyboards/mt/split75/keymaps/art/keymap.c
@@ -115,7 +115,7 @@ _______,  _______,    _______, _______,   _______,  _______,  LT(COMBOS,KC_BSPC)
                 _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
 KC_8,  KC_9,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
 KC_6,  KC_7,    _______,  KC_ESC,   KC_HOME,  KC_UP,    KC_END,   KC_PGUP,              XXXXXXX, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, XXXXXXX,  _______,  _______,  _______,           _______,
-KC_4,  KC_5,    _______,  XXXXXXX,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDOWN,            KC_APP,  CTR_ALT, KC_RSFT, CTR_ALT_SHIFT, _______, _______, _______,          _______,
+KC_4,  KC_5,    _______,  XXXXXXX,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDN,              KC_APP,  CTR_ALT, KC_RSFT, CTR_ALT_SHIFT, _______, _______, _______,          _______,
 KC_2,  KC_3,    _______,  XXXXXXX, LCTL(KC_X),LCTL(KC_C),LCTL(KC_V), XXXXXXX,           XXXXXXX,  XXXXXXX,   _______,  _______,  _______,                      _______,  _______, _______,
 KC_0,  KC_1,    _______,  _______,  _______,  KC_DEL,   _______,                        _______,             _______,  _______,  _______,            _______,  _______,  _______
   ),
@@ -165,7 +165,7 @@ _______,  _______,   TO(QWERTY),_______,  _______,  _______,  _______,
                       _______,  KC_F1,    _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
 _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,   _______,  _______,  _______,  _______,  _______,  _______,           _______,
 _______,  _______,    _______,  _______,  CTL_ALT(KC_HOME),  CTL_ALT(KC_UP),    CTL_ALT(KC_END),   CTL_ALT(KC_PGUP),              _______,  _______,_______, _______,_______,_______,_______,  _______,           _______,
-_______,  _______,    _______,  _______,  CTL_ALT(KC_LEFT),  CTL_ALT(KC_DOWN),  CTL_ALT(KC_RIGHT), CTL_ALT(KC_PGDOWN),              _______,_______,_______,_______,_______,  _______,  _______,           _______,
+_______,  _______,    _______,  _______,  CTL_ALT(KC_LEFT),  CTL_ALT(KC_DOWN),  CTL_ALT(KC_RIGHT), CTL_ALT(KC_PGDN),                _______,_______,_______,_______,_______,  _______,  _______,           _______,
 _______, _______, TO(WORKMAN),  LCTL(KC_Z), LCTL(KC_X),      LCTL(KC_C),        LCTL(KC_V),        _______,              _______,  _______,   _______,  _______,  _______,                      _______, _______,  _______,
 TO(NUMPAD), TO(NUMPAD), TO(BASE),  _______,  _______,  _______,  CTL_ALT(KC_BSPC),                KC_LSFT,             _______, _______, _______,                      _______, _______,  _______
   ),
diff --git a/keyboards/nack/keymaps/farfalleflickan/keymap.c b/keyboards/nack/keymaps/farfalleflickan/keymap.c
index cf09a46b72..e0478f2e3c 100644
--- a/keyboards/nack/keymaps/farfalleflickan/keymap.c
+++ b/keyboards/nack/keymaps/farfalleflickan/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  | |---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_PGDOWN,   KC_END
+       ____,        ____,        ____,        TO(BASE),    KC_NO,      KC_NO,        MO(FN),      ____,        KC_GRV,      KC_PDOT,     KC_HOME,     KC_PGDN,   KC_END
 //   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
     ),
     [FN] = LAYOUT(
diff --git a/keyboards/nek_type_a/keymaps/default/keymap.c b/keyboards/nek_type_a/keymaps/default/keymap.c
index abb357d7d0..cf76231c4b 100644
--- a/keyboards/nek_type_a/keymaps/default/keymap.c
+++ b/keyboards/nek_type_a/keymaps/default/keymap.c
@@ -18,9 +18,9 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
     KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU,
-    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, KC_DELETE, KC_END, KC_PGDOWN,
-    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
+    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC, KC_INSERT, KC_HOME, KC_PGUP,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DELETE, KC_END, KC_PGDN,
+    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
     KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT, KC_UP,
     KC_LCTRL, KC_LALT, KC_LCMD, KC_SPC, KC_SPC, KC_RCMD, KC_RALT, KC_RCTRL, KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT
   ),
diff --git a/keyboards/nimrod/keymaps/default/keymap.c b/keyboards/nimrod/keymaps/default/keymap.c
index 3a113bbc8c..47b8f4ac78 100644
--- a/keyboards/nimrod/keymaps/default/keymap.c
+++ b/keyboards/nimrod/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NUM_SYM] = LAYOUT_ortho_4x10(
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
   ),
 
diff --git a/keyboards/nimrod/keymaps/default_center_space/keymap.c b/keyboards/nimrod/keymaps/default_center_space/keymap.c
index 0ebb2bb9e7..c87ab2cb46 100644
--- a/keyboards/nimrod/keymaps/default_center_space/keymap.c
+++ b/keyboards/nimrod/keymaps/default_center_space/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NUM_SYM] = LAYOUT_center_space(
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLS,
   KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS,  KC_TRNS
   ),
 
diff --git a/keyboards/nimrod/keymaps/default_left_space/keymap.c b/keyboards/nimrod/keymaps/default_left_space/keymap.c
index c03130b811..c1bbd129d9 100644
--- a/keyboards/nimrod/keymaps/default_left_space/keymap.c
+++ b/keyboards/nimrod/keymaps/default_left_space/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NUM_SYM] = LAYOUT_left_space(
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLS,
                     KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
   ),
 
diff --git a/keyboards/nimrod/keymaps/default_right_space/keymap.c b/keyboards/nimrod/keymaps/default_right_space/keymap.c
index b6d108ed07..4bcd41c57b 100644
--- a/keyboards/nimrod/keymaps/default_right_space/keymap.c
+++ b/keyboards/nimrod/keymaps/default_right_space/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NUM_SYM] = LAYOUT_right_space(
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS
   ),
 
diff --git a/keyboards/nimrod/keymaps/default_split_space/keymap.c b/keyboards/nimrod/keymaps/default_split_space/keymap.c
index 8b4fe2add0..e0667e4b5a 100644
--- a/keyboards/nimrod/keymaps/default_split_space/keymap.c
+++ b/keyboards/nimrod/keymaps/default_split_space/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NUM_SYM] = LAYOUT_split_space(
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLS,
                     KC_TRNS,                                     KC_TRNS
   ),
 
diff --git a/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
index 80b5292292..8fa74e8ab1 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_BSPC,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDOWN, KC_DOWN,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,   KC_DOWN,           KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
   ),
   [2] = LAYOUT_ansi(
diff --git a/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
index e0f621ae4c..8816af1a88 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_BSPC,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDOWN, KC_DOWN,           KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_tsangan(
diff --git a/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
index fa0a8ad324..194e5ff82a 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_BSPC,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDOWN, KC_DOWN,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,   KC_DOWN,           KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
   ),
   [2] = LAYOUT_ansi(
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
index f8b36dff03..ae7774b716 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_PGDOWN, KC_END, 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 
   ),
diff --git a/keyboards/org60/keymaps/default/keymap.c b/keyboards/org60/keymaps/default/keymap.c
index cf1fd5d56c..86a242f48d 100644
--- a/keyboards/org60/keymaps/default/keymap.c
+++ b/keyboards/org60/keymaps/default/keymap.c
@@ -16,6 +16,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  ,KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,KC_END),
 
 };
diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c
index 4c955fa2bb..52e3a79b17 100644
--- a/keyboards/orthodox/keymaps/shaymdev/keymap.c
+++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPACE, KC_DELETE);
+const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DELETE);
 
 // This globally defines all key overrides to be used
 const key_override_t **key_overrides = (const key_override_t *[]){
diff --git a/keyboards/pearl/keymaps/phil/keymap.c b/keyboards/pearl/keymaps/phil/keymap.c
index bca1278939..a84672c4b8 100755
--- a/keyboards/pearl/keymaps/phil/keymap.c
+++ b/keyboards/pearl/keymaps/phil/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
   [_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_PGDOWN, 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
       ),
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index f9b70764ff..d25501b5e2 100644
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SLCK,  KC_PAUS, KC_BSLS,  KC_SLCK, \
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,   \
       KC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSPC, KC_PGUP,  KC_TRNS,       \
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDOWN,KC_END)
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDN,  KC_END)
 
 };
 
diff --git a/keyboards/percent/canoe/keymaps/default/keymap.c b/keyboards/percent/canoe/keymaps/default/keymap.c
index e7a49f09c6..bdd48b928a 100644
--- a/keyboards/percent/canoe/keymaps/default/keymap.c
+++ b/keyboards/percent/canoe/keymaps/default/keymap.c
@@ -35,6 +35,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT,   KC_PSCR, KC_SLCK,  KC_PAUS, KC_BSLS,  KC_SLCK,
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,
       KC_LSFT,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSFT, KC_PGUP,  KC_END,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDOWN,KC_END)
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDN,  KC_END)
 
 };
diff --git a/keyboards/percent/canoe/keymaps/dhertz/keymap.c b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
index 7d855e8fa7..b6785f963c 100644
--- a/keyboards/percent/canoe/keymaps/dhertz/keymap.c
+++ b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CMD_SFT_L, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, CMD_ALT_C, 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_PGDOWN, KC_END
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
       ),
 };
 
diff --git a/keyboards/planck/keymaps/abishalom/keymap.c b/keyboards/planck/keymaps/abishalom/keymap.c
index 5844922775..02e9c1cfd2 100644
--- a/keyboards/planck/keymaps/abishalom/keymap.c
+++ b/keyboards/planck/keymaps/abishalom/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NAV] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, KC_PGDOWN, KC_UP,  KC_PGUP, _______ ,  _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_UP,  KC_PGUP, _______ ,  _______,
     _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN,  KC_RIGHT, _______, _______,
     _______, _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, _______, _______, KC_MPLY,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV,    KC_VOLD, KC_VOLU, KC_MNXT
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index 57f4ec2629..13c973d5f3 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -35,8 +35,8 @@ enum planck_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_planck_grid(
-    KC_TAB,      KC_Q,     KC_W,    KC_E,    KC_R,  KC_T,     KC_Y,  KC_U,  KC_I,     KC_O,    KC_P,      KC_BSPACE,
-    KC_ESCAPE,   KC_A,     KC_S,    KC_D,    KC_F,  KC_G,     KC_H,  KC_J,  KC_K,     KC_L,    KC_SCOLON, KC_QUOTE,
+    KC_TAB,      KC_Q,     KC_W,    KC_E,    KC_R,  KC_T,     KC_Y,  KC_U,  KC_I,     KC_O,    KC_P,      KC_BSPC,
+    KC_ESCAPE,   KC_A,     KC_S,    KC_D,    KC_F,  KC_G,     KC_H,  KC_J,  KC_K,     KC_L,    KC_SCLN,   KC_QUOTE,
     KC_LSHIFT,   KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,     KC_N,  KC_M,  KC_COMMA, KC_DOT,  KC_SLASH,  KC_ENTER,
     WEBUSB_PAIR, KC_LCTRL, KC_LALT, KC_LGUI, LOWER, KC_SPACE, KC_NO, RAISE, KC_LEFT,  KC_DOWN, KC_UP,     KC_RIGHT
   ),
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_planck_grid(
     KC_GRAVE,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,          KC_8,                KC_9,               KC_0,            _______,
-    KC_DELETE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,  KC_MINUS,      KC_EQUAL,            KC_LBRC,            KC_RBRC,         KC_BSLASH,
-    _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_NONUS_HASH, KC_NUBS,             KC_PGUP,            KC_PGDOWN,       _______,
+    KC_DELETE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,  KC_MINUS,      KC_EQUAL,            KC_LBRC,            KC_RBRC,         KC_BSLS,
+    _______,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_NONUS_HASH, KC_NUBS,             KC_PGUP,            KC_PGDN,         _______,
     _______,   _______, _______, _______, _______, _______, KC_NO,  _______,       KC_MEDIA_NEXT_TRACK, KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP, KC_MEDIA_PLAY_PAUSE
   ),
 
diff --git a/keyboards/planck/keymaps/dc/keymap.c b/keyboards/planck/keymaps/dc/keymap.c
index 7cbc9dfaf2..7a8cb7c099 100644
--- a/keyboards/planck/keymaps/dc/keymap.c
+++ b/keyboards/planck/keymaps/dc/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-----------------------------------------------------------------------------------'
     */
     [_DVORAK] = LAYOUT_planck_grid(
-        KC_TAB,        KC_QUOT,    KC_COMM,    KC_DOT,     KC_P,   KC_Y,      KC_F,        KC_G,   KC_C,    KC_R,    KC_L,  KC_BSPACE,
+        KC_TAB,        KC_QUOT,    KC_COMM,    KC_DOT,     KC_P,   KC_Y,      KC_F,        KC_G,   KC_C,    KC_R,    KC_L,  KC_BSPC,
         KC_ESC,        KC_A,       KC_O,       KC_E,       KC_U,   KC_I,      KC_D,        KC_H,   KC_T,    KC_N,    KC_S,  KC_SLASH,
         KC_LSFT,       TD(0),      TD(1),      TD(2),      KC_K,   KC_X,      KC_B,        KC_M,   TD(3),   TD(4),   TD(5), MT(MOD_RSFT, KC_ENT),
         MO(ACTIONS),   KC_LCTRL,   KC_LGUI,    KC_LALT,    NUMBERS,    KC_SPACE, KC_SPACE,         SYMBOLS,KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
diff --git a/keyboards/planck/keymaps/deft/keymap.c b/keyboards/planck/keymaps/deft/keymap.c
index 0d7611f371..e90f267029 100644
--- a/keyboards/planck/keymaps/deft/keymap.c
+++ b/keyboards/planck/keymaps/deft/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_DEL, A(KC_1), A(KC_2), A(KC_3), A(KC_4), S(KC_9), S(KC_0),   KC_P7,   KC_P8,   KC_P9,   KC_P0, _______,
     _______,  KC_GRV,KC_BSLS,KC_EQL, KC_MINS,S(KC_COMM),S(KC_DOT),   KC_P4,   KC_P5,   KC_P6, KC_PDOT, KC_NLCK,
     _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_LBRC, KC_RBRC,   KC_P1,   KC_P2,   KC_P3, KC_PGUP, KC_PEQL,
-    _______, _______, _______, C(KC_V), _______, _______, _______, _______, KC_PENT, KC_HOME,KC_PGDOWN, KC_END
+    _______, _______, _______, C(KC_V), _______, _______, _______, _______, KC_PENT, KC_HOME,KC_PGDN,  KC_END
 ),
 
 /* Raise
diff --git a/keyboards/planck/keymaps/dvorak2space/keymap.c b/keyboards/planck/keymaps/dvorak2space/keymap.c
index 9abdaf800a..8a347a37bb 100644
--- a/keyboards/planck/keymaps/dvorak2space/keymap.c
+++ b/keyboards/planck/keymaps/dvorak2space/keymap.c
@@ -196,9 +196,9 @@ int cur_dance(qk_tap_dance_state_t *state) {
   return press;
 }
 
-void back_tap(qk_tap_dance_state_t *state, void *user_data) { tap_code(KC_BSPACE); }
+void back_tap(qk_tap_dance_state_t *state, void *user_data) { tap_code(KC_BACKSPACE); }
 
-void back_finished(qk_tap_dance_state_t *state, void *user_data) { if(!(state->interrupted || !state->pressed)) tap_code16(LCTL(KC_BSPACE)); }
+void back_finished(qk_tap_dance_state_t *state, void *user_data) { if(!(state->interrupted || !state->pressed)) tap_code16(LCTL(KC_BACKSPACE)); }
 
 void slash_finished(qk_tap_dance_state_t *state, void *user_data) {
   int td_state = cur_dance(state);
diff --git a/keyboards/planck/keymaps/emiller/keymap.c b/keyboards/planck/keymaps/emiller/keymap.c
index e1c065d76c..05f2289ae5 100644
--- a/keyboards/planck/keymaps/emiller/keymap.c
+++ b/keyboards/planck/keymaps/emiller/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
   _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DEC, BL_INC, KC_PSCREEN
+  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DEC, BL_INC, KC_PSCR
 ),
 
 /* Raise
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index 3eb8881e18..ba36f2a5da 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -85,8 +85,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_PGDN, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, STICK,
   KC_L2_0, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_M,
                                 KC_R2_1, KC_R2_2,    KC_R2_3, KC_UP,   KC_R2_5,
-  KC_L3_0, KC_L3_1, KC_L3_2, KC_ESCAPE,  KC_BSPACE,  KC_ENTER,
-                       KC_R3_0, KC_R3_1, KC_PSCREEN, KC_LEFT, KC_DOWN, KC_RIGHT
+  KC_L3_0, KC_L3_1, KC_L3_2, KC_ESCAPE,  KC_BSPC,    KC_ENTER,
+                       KC_R3_0, KC_R3_1, KC_PSCR,    KC_LEFT, KC_DOWN, KC_RIGHT
 ),
 [LY_1000] = LAYOUT_gunp(
   XXXXXXX,   KC_PERC,   KC_QUES,   KC_EXLM,   KC_GRV,    XXXXXXX,
diff --git a/keyboards/planck/keymaps/impossible/keymap.c b/keyboards/planck/keymaps/impossible/keymap.c
index 914a61cb28..9553c23061 100644
--- a/keyboards/planck/keymaps/impossible/keymap.c
+++ b/keyboards/planck/keymaps/impossible/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EXLM, KC_AT,   KC_HASH,  KC_DLR,   KC_PERC,   KC_CIRC, KC_AMPR,   KC_ASTR, KC_F12,  KC_F7,  KC_F8,  KC_F9,
   KC_TAB,  KC_LBRC, KC_RBRC,  KC_MINUS, KC_DELETE, KC_QUOT, KC_LPRN,   KC_RPRN, KC_F11,  KC_F4,  KC_F5,  KC_F6,
   KC_MENU, _______, _______,  KC_EQUAL, KC_BSLS,   KC_SLSH, XXXXXXX,   XXXXXXX, KC_PGUP, KC_F1,  KC_F2,  KC_F3,
-  _______, KC_LGUI, KC_GRAVE, _______,  _______,   _______, KC_SCOLON, KC_HOME, KC_PGDN, KC_END, KC_F10, _______
+  _______, KC_LGUI, KC_GRAVE, _______,  _______,   _______, KC_SCLN,   KC_HOME, KC_PGDN, KC_END, KC_F10, _______
 ),
 
 /* Qwerty
diff --git a/keyboards/planck/keymaps/matrixman/keymap.c b/keyboards/planck/keymaps/matrixman/keymap.c
index 48219262fa..4d5d7db6fe 100644
--- a/keyboards/planck/keymaps/matrixman/keymap.c
+++ b/keyboards/planck/keymaps/matrixman/keymap.c
@@ -33,21 +33,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // accessed via the left nav-layer key, includes a F10 where the right nav-layer key was
 [_NAV_L] = LAYOUT_planck_grid(
    KC_TRNS,    KC_F2,    KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10
-  ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCREEN, KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
+  ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCR,    KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
   ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     KC_F12
   ,KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
 ),
     // accessed via the right nav-layer key, includes a F1 where the left nav-layer key was
 [_NAV_R] = LAYOUT_planck_grid(
    KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_TRNS
-  ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCREEN, KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
+  ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCR,    KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
   ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     KC_F12
   ,KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
 ),
     // accessed via the lower alt keys, moves tab and delete to make alt+tab and ctrl+alt+del feel more standard
 [_NAV_ALT] = LAYOUT_planck_grid(
    KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_DELETE
-  ,KC_TAB,   KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCREEN, KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
+  ,KC_TAB,   KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCR,    KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
   ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     KC_F12
   ,KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,       KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
 )
diff --git a/keyboards/planck/keymaps/narze/keymap.c b/keyboards/planck/keymaps/narze/keymap.c
index 84864db0ce..4ff3502a03 100644
--- a/keyboards/planck/keymaps/narze/keymap.c
+++ b/keyboards/planck/keymaps/narze/keymap.c
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DEV] = LAYOUT_planck_grid(
     _______, _______, _______, _______, _______, _______, _______, KC_MINS, S(KC_EQL), S(KC_9), S(KC_0), _______,
     _______, _______, _______, _______, _______, _______, S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), _______,
-    _______, _______, _______, _______, _______, _______,  KC_EQL, S(KC_BSLASH), S(KC_COMM), S(KC_DOT), S(KC_SLSH), _______,
+    _______, _______, _______, _______, _______, _______,  KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH), _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 9d9fa421d8..0d686e0882 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -34,8 +34,8 @@ enum planck_layers {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_planck_grid(
-    KC_TAB,         KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,           KC_O,           KC_P,           KC_BSPACE,
-    KC_ESCAPE,      KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_H,           KC_J,           KC_K,           KC_L,           KC_SCOLON,      KC_QUOTE,
+    KC_TAB,         KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,           KC_O,           KC_P,           KC_BSPC,
+    KC_ESCAPE,      KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_H,           KC_J,           KC_K,           KC_L,           KC_SCLN,        KC_QUOTE,
     KC_LSHIFT,      KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,           KC_N,           KC_M,           KC_COMMA,       KC_DOT,         KC_SLASH,       KC_ENTER,
     WEBUSB_PAIR,    KC_LCTRL,       KC_LALT,        KC_LGUI,        LOWER,          KC_SPACE,       KC_NO,          RAISE,          KC_LEFT,        KC_DOWN,        KC_UP,          KC_RIGHT
   ),
@@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_planck_grid(
     KC_GRAVE,KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,           KC_8,           KC_9,           KC_0,           _______,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINUS,       KC_EQUAL,       KC_LBRC,        KC_RBRC,        KC_BSLASH,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NONUS_HASH,  KC_NUBS,        KC_PGUP,        KC_PGDOWN,      _______,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINUS,       KC_EQUAL,       KC_LBRC,        KC_RBRC,        KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NONUS_HASH,  KC_NUBS,        KC_PGUP,        KC_PGDN,        _______,
     _______, _______, _______, _______, _______, _______, KC_NO,   _______, KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_MEDIA_PLAY_PAUSE
   ),
 
diff --git a/keyboards/planck/keymaps/piemod/keymap.c b/keyboards/planck/keymaps/piemod/keymap.c
index f331f911cf..fa3a7f99c2 100644
--- a/keyboards/planck/keymaps/piemod/keymap.c
+++ b/keyboards/planck/keymaps/piemod/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [DVORAK] = LAYOUT_planck_grid(
     KC_ESC,  KC_QUOTE,  LT_7COM,  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_DELETE,
     KC_TAB,  LT_1A,  LT_2O,  LT_3E,  LT_4U,  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_ENTER,
-    KC_LSHIFT,  KC_SCOLON,  LT_5Q,   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS,
-    C(KC_LALT), LT_6CTL,  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPACE,  KC_SPACE,  KC_RCTRL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT
+    KC_LSHIFT,  KC_SCLN,  LT_5Q,   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS,
+    C(KC_LALT), LT_6CTL,  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTRL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT
   ),
 
   [ARROW] = LAYOUT_planck_grid(
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [SYMBOL] = LAYOUT_planck_grid(
     KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRC,  KC_RBRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,
-    KC_NO,  KC_NO,  KC_TRNS,  KC_SCOLON,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH),
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLASH,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE,
+    KC_NO,  KC_NO,  KC_TRNS,  KC_SCLN,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH),
+    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLS,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE,
     KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,   KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL
   ),
 
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [FUNCTION] = LAYOUT_planck_grid(
-    KC_PSCREEN,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
+    KC_PSCR,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,  KC_NO,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,
      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, KC_NO,  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  KC_MEDIA_PLAY_PAUSE,
      QK_BOOT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
diff --git a/keyboards/planck/keymaps/roguepullrequest/keymap.c b/keyboards/planck/keymaps/roguepullrequest/keymap.c
index 47331af90c..612f2c9daa 100644
--- a/keyboards/planck/keymaps/roguepullrequest/keymap.c
+++ b/keyboards/planck/keymaps/roguepullrequest/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	/* Programmer Dvorak */
 	[_PDVORAK] = LAYOUT_planck_grid(
-		  KC_GESC, KC_SCOLON, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
+		  KC_GESC, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
    		KC_LAST, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, TD(TD_S), TD(SLASH),
    		TD(LSHIFT), KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, TD(RSHIFT),
     	TD(X_AT_FUN), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, ALT_TAB, KC_SPACE, KC_ENTER, MT(MOD_LCTL | MOD_LSFT, KC_LGUI), KC_PGUP, KC_PGDN, LT(_LOWER, KC_PLUS)
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	
 	[_UPPER] = LAYOUT_planck_grid(
 		KC_GRAVE, KC_AMPR, KC_PERC, KC_NO, KC_NO, KC_EQL, KC_ASTR, KC_NO, KC_NO, KC_EXLM, KC_HASH, KC_TRNS,
-		KC_PLUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLASH, 
+		KC_PLUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLS, 
 		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
 	),
@@ -247,7 +247,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 	[LSHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lshift_finished, lshift_reset),
 	[RSHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rshift_finished, rshift_reset),
 	[TD_S] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, s_finished, s_reset),
-	[SLASH] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_BSLASH),
+	[SLASH] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_BSLS),
 
 };
 
diff --git a/keyboards/planck/keymaps/samuel/README.org b/keyboards/planck/keymaps/samuel/README.org
index d38b8fc3b5..ab6ce42393 100644
--- a/keyboards/planck/keymaps/samuel/README.org
+++ b/keyboards/planck/keymaps/samuel/README.org
@@ -353,7 +353,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  } else {
      layer_off(_RISE);
      if (last_mod == 9 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-         tap_code16(KC_BSPACE);
+         tap_code16(KC_BACKSPACE);
          last_mod = 10;
      }
  }
diff --git a/keyboards/planck/keymaps/samuel/keymap.c b/keyboards/planck/keymaps/samuel/keymap.c
index 91748f5079..c6e4240916 100644
--- a/keyboards/planck/keymaps/samuel/keymap.c
+++ b/keyboards/planck/keymaps/samuel/keymap.c
@@ -57,7 +57,7 @@ KC_T_LGUI, KC_T_LALT, KC_UP, KC_DOWN, KC_SPC, KC_EQL, KC_GRAVE, KC_SPC, KC_LEFT,
 KC_TRANSPARENT, KC_EZUNDO, KC_EZCOPY, KC_EZCUT, KC_EZPSTE, KC_INS, KC_ASTR, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_TRANSPARENT,
 KC_EZSHFT, KC_ESC, KC_CAPS, KC_PGUP, KC_PGDN, KC_HOME, KC_AMPR, KC_4, KC_5, KC_6, KC_0, KC_EZSHFT,
 KC_EZCTRL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_1, KC_2, KC_3, KC_COM, KC_EZCTRL,
-KC_EZGUI, KC_EZALT, KC_EZUP, KC_EZDOWN, KC_SPC, KC_PIPE, KC_BSLASH, KC_END, KC_EZLEFT, KC_EZRGHT, KC_EZALT, KC_EZGUI
+KC_EZGUI, KC_EZALT, KC_EZUP, KC_EZDOWN, KC_SPC, KC_PIPE, KC_BSLS, KC_END, KC_EZLEFT, KC_EZRGHT, KC_EZALT, KC_EZGUI
 ),
 [_COMMAND] = LAYOUT_planck_grid(
 KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRANSPARENT,
@@ -207,7 +207,7 @@ if (record->event.pressed) {
 } else {
     layer_off(_RISE);
     if (last_mod == 9 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(KC_BSPACE);
+        tap_code16(KC_BACKSPACE);
         last_mod = 10;
     }
 }
diff --git a/keyboards/planck/keymaps/tehwalris/keymap.c b/keyboards/planck/keymaps/tehwalris/keymap.c
index f2a9fd909a..243748cfec 100644
--- a/keyboards/planck/keymaps/tehwalris/keymap.c
+++ b/keyboards/planck/keymaps/tehwalris/keymap.c
@@ -85,8 +85,8 @@ static bool is_right_shift_pressed = false;
 // This will only work on linux with xkbmap option "compose:prsc"
 void press_umlaut_of(uint16_t keycode) {
   bool is_shift_pressed = (is_left_shift_pressed || is_right_shift_pressed);
-  register_code(KC_PSCREEN);
-  unregister_code(KC_PSCREEN);
+  register_code(KC_PRINT_SCREEN);
+  unregister_code(KC_PRINT_SCREEN);
   if (!is_shift_pressed) {
     register_code(KC_LSFT);
   }
diff --git a/keyboards/planck/keymaps/tk/keymap.c b/keyboards/planck/keymaps/tk/keymap.c
index c471141baa..668099538e 100644
--- a/keyboards/planck/keymaps/tk/keymap.c
+++ b/keyboards/planck/keymaps/tk/keymap.c
@@ -408,7 +408,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     panic_del = true;
                 }
                 else {
-                    register_code(KC_BSPACE);
+                    register_code(KC_BACKSPACE);
                 }
             }
             else {
@@ -418,7 +418,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     panic_del = false;
                 }
                 else {
-                    unregister_code(KC_BSPACE);
+                    unregister_code(KC_BACKSPACE);
                 }
             }
             return false;
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index 8beefa16aa..71199b1a25 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              * `-----------------------------------------------------------------------------------'
              */
           KC_TAB,            KC_QUOTE,          KC_COMMA, KC_DOT,  KC_P,  KC_Y,             KC_F,  KC_G,  KC_C,    KC_R,    KC_L,    KC_SLASH,
-          LCTL_T(KC_ESCAPE), KC_A,              KC_O,     KC_E,    KC_U,  KC_I,             KC_D,  KC_H,  KC_T,    KC_N,    KC_S,    KC_BSPACE,
+          LCTL_T(KC_ESCAPE), KC_A,              KC_O,     KC_E,    KC_U,  KC_I,             KC_D,  KC_H,  KC_T,    KC_N,    KC_S,    KC_BSPC,
           _______,           TD(TD_SEMI_COLON), KC_Q,     KC_J,    KC_K,  KC_X,             KC_B,  KC_M,  KC_W,    KC_V,    KC_Z,    KC_ENTER,
           _______,           KC_LCTRL,          KC_LALT,  KC_LGUI, LOWER, LSFT_T(KC_SPACE), KC_NO, RAISE, _______, _______, _______, _______
           ),
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              * |      | Ctrl | Alt  | GUI  |LOWER | Shift/Space | RAISE|      |   [  |   ]  |      |
              * `-----------------------------------------------------------------------------------'
              */
-          KC_GRAVE, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,        KC_0,    KC_BSLASH,
+          KC_GRAVE, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,        KC_0,    KC_BSLS,
           KC_TILD,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,     KC_RPRN, KC_PIPE,
           _______,  _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR,     KC_RCBR, KC_DELETE,
           _______,  KC_LCTRL, KC_LALT, KC_LGUI, _______, _______, KC_NO,   _______, _______, KC_LBRC,     KC_RBRC, _______
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_F1,          KC_F2,           KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______,  _______,  _______, KC_RIGHT, _______,
           KC_F7,          KC_F8,           KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_LEFT,  _______,  _______, _______,  KC_DELETE,
           _______,        _______,         _______, KC_DOWN, KC_UP,   _______, _______, KC_MINUS, KC_EQUAL, _______, _______,  _______,
-          LALT(KC_SPACE), LGUI(KC_BSLASH), _______, _______, _______, _______, KC_NO,   _______,  _______,  _______, _______,  _______
+          LALT(KC_SPACE), LGUI(KC_BSLS),   _______, _______, _______, _______, KC_NO,   _______,  _______,  _______, _______,  _______
           ),
 
   [_ADJUST] = LAYOUT_planck_grid(
@@ -115,7 +115,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_QUOTE,
-          LCTL_T(KC_ESCAPE), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,             KC_H,  KC_J,  KC_K,     KC_L,    KC_SCOLON, KC_BSPACE,
+          LCTL_T(KC_ESCAPE), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,             KC_H,  KC_J,  KC_K,     KC_L,    KC_SCLN, KC_BSPC,
           _______,           KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,             KC_N,  KC_M,  KC_COMMA, KC_DOT,  KC_SLASH,  KC_ENTER,
           _______,           KC_LCTL, KC_LALT, KC_LGUI, LOWER, LSFT_T(KC_SPACE), KC_NO, RAISE, _______,  _______, _______,   _______
           ),
diff --git a/keyboards/planck/keymaps/vaire/keymap.c b/keyboards/planck/keymaps/vaire/keymap.c
index 0bd4d5893f..4efeec1b03 100644
--- a/keyboards/planck/keymaps/vaire/keymap.c
+++ b/keyboards/planck/keymaps/vaire/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TILD,    KC_EXLM,    	KC_AT,          KC_HASH,        KC_DLR,         KC_PERC,        KC_CIRC,    	KC_AMPR,    	KC_ASTR,    	KC_LPRN,    	KC_RPRN,        KC_DEL, 
     KC_CAPS,    KC_F1,      	KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,      	KC_UNDS,    	KC_EQL,     	KC_LT,        	KC_GT,       	KC_LPRN, 
     KC_LSFT,    KC_F7,      	KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,     	KC_MUTE,    	KC_MPLY,    	KC_MNXT,       	KC_PGUP,       	SFT_T(KC_VOLU), 
-    TO(0),      KC_LCTL,    	KC_LALT,        KC_LGUI,        KC_TRNS,      	KC_ENT,         KC_SPC,     	MO(3),      	KC_PSCR,    	KC_MPRV,        KC_PGDOWN,    	CTL_T(KC_VOLD)),
+    TO(0),      KC_LCTL,    	KC_LALT,        KC_LGUI,        KC_TRNS,      	KC_ENT,         KC_SPC,     	MO(3),      	KC_PSCR,    	KC_MPRV,        KC_PGDN,    	CTL_T(KC_VOLD)),
 
   LAYOUT_planck_grid(
     KC_TILD,    DESK_LEFT,  	WIN_LEFT,       KC_F4,          WIN_RIGHT,      DESK_RIGHT,     DOCS,       	SNAP_LEFT, 	SNAP_UP,     	SNAP_RIGHT,     SNAP_DOWN,      KC_DEL, 
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
index 30c9f088ff..445963c217 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
@@ -26,9 +26,9 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_DEF] = LAYOUT_all(
-    KC_CALC, KC_PAST, KC_PSLS, KC_BSPACE, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSLASH , KC_PSCR, KC_HOME,
-    KC_PMNS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,       KC_BSPACE,       KC_PGUP,
-    KC_PPLS,  KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE,        KC_ENTER,     KC_PGDN,
+    KC_CALC, KC_PAST, KC_PSLS, KC_BSPC, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSLS , KC_PSCR, KC_HOME,
+    KC_PMNS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_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_PPLS,  KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE,        KC_ENTER,     KC_PGDN,
     KC_EQL, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,     KC_RSHIFT,       KC_UP, KC_END,
     KC_PENT, KC_PDOT, KC_P0,  KC_P0, KC_COMMA ,       KC_LCTRL, KC_LGUI, KC_LALT,      KC_SPACE,    KC_SPACE,    KC_SPACE,    KC_RALT, MO(_FNC), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RIGHT
   ),
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
index f4a7056da2..6e925ebe8a 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
@@ -26,9 +26,9 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_DEF] = LAYOUT_ansi(
-    KC_PMNS, KC_PAST, KC_PSLS, KC_BSPACE, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,     KC_BSPACE,    KC_HOME,
-    KC_PPLS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,    KC_BSLASH,       KC_PGUP,
-             KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE,       KC_ENTER,     KC_PGDN,
+    KC_PMNS, KC_PAST, KC_PSLS, KC_BSPC, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,     KC_BSPC,    KC_HOME,
+    KC_PPLS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,    KC_BSLS,       KC_PGUP,
+             KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE,       KC_ENTER,     KC_PGDN,
     KC_PENT, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,   KC_RSHIFT,   KC_UP, KC_END,
              KC_PDOT,    KC_P0,      KC_COMMA ,       KC_LCTRL, KC_LGUI, KC_LALT,                KC_SPACE,              KC_RALT,   MO(_FNC),   KC_LEFT, KC_DOWN, KC_RIGHT
   ),
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
index 9f1ce0559c..142d3babb8 100644
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
@@ -116,10 +116,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_preonic_grid( \
-  KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LBRC, KC_RBRC, KC_MINUS, \
+  KC_PSCR, KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LBRC, KC_RBRC, KC_MINUS, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \
   KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLASH, KC_MENU, \
+  KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_MENU, \
   KC_RCTRL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 ),
 
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_preonic_grid( \
-  KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_UNDERSCORE, \
+  KC_PSCR, KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_UNDERSCORE, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \
   KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_MENU, \
diff --git a/keyboards/preonic/keymaps/egstad/keymap.c b/keyboards/preonic/keymaps/egstad/keymap.c
index f730d911cf..9706cf6651 100644
--- a/keyboards/preonic/keymaps/egstad/keymap.c
+++ b/keyboards/preonic/keymaps/egstad/keymap.c
@@ -48,7 +48,7 @@ enum {
 // Layers
 #define LT2_TAB LT(L_RAISE, KC_TAB)     // Tap for tab, hold for RAISE
 #define LT2_ENT LT(L_RAISE, KC_ENT)     // Tap for enter, hold for RAISE
-#define LT1_BSP LT(L_LOWER, KC_BSPACE)  // Tap for backspace, hold for LOWER
+#define LT1_BSP LT(L_LOWER, KC_BSPC)    // Tap for backspace, hold for LOWER
 #define LT1_SPC LT(L_LOWER, KC_SPC)     // Tap for space, hold for LOWER
 
 // Modifiers
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LT2_TAB,    KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       TD_BRAC,    \
   LT1_BSP,    KC_A,       KC_S,       KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT,    \
   KC_LSFT,    KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,       KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    MT_SHFT,    \
-  LG_ZMOT,    LG_ZMIN,    KC_LCTL,    KC_LALT,    KC_LGUI,    KC_BSPACE,  LT1_SPC,    LT2_ENT,    KC_LEFT,    KC_UP,      KC_DOWN,    KC_RGHT     \
+  LG_ZMOT,    LG_ZMIN,    KC_LCTL,    KC_LALT,    KC_LGUI,    KC_BSPC,    LT1_SPC,    LT2_ENT,    KC_LEFT,    KC_UP,      KC_DOWN,    KC_RGHT     \
 ),
 
 
@@ -113,10 +113,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [L_LOWER] = LAYOUT_preonic_grid(
 /*01          02          03          04          05          06          07          08          09          10          11          12         */
-  KC_ASTG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_BSPACE,  \
+  KC_ASTG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_BSPC,    \
   MT_UNTB,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MINUS,   KC_PLUS,    KC_PAST,    KC_PSLS,    _______,    \
   _______,    MT_HILF,    MT_HIRT,    _______,    _______,    _______,    _______,    KC_LEFT,    KC_UP,      KC_DOWN,    KC_RIGHT,   KC_ENTER,   \
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_LBRC,    KC_RBRC,    KC_LPRN,    KC_RPRN,    KC_BSLASH,  \
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_LBRC,    KC_RBRC,    KC_LPRN,    KC_RPRN,    KC_BSLS,    \
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_MRWD,    KC_VOLU,    KC_VOLD,    KC_MFFD     \
 ),
 
diff --git a/keyboards/preonic/keymaps/fig-r/keymap.c b/keyboards/preonic/keymaps/fig-r/keymap.c
index b031a4027e..8dcf7d318a 100644
--- a/keyboards/preonic/keymaps/fig-r/keymap.c
+++ b/keyboards/preonic/keymaps/fig-r/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILD, KC_EXLM, KC_AT,      KC_HASH,    KC_DLR,     KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,  \
   KC_GRV,  _______, LCTL(KC_S), LCTL(KC_Y), LCTL(KC_Z), _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
   _______, _______, LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______,    _______,    _______,    _______, _______, _______, KC_HOME, KC_PGDOWN, KC_PGUP, KC_END \
+  _______, _______, _______,    _______,    _______,    _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \
 ),
 
 /* Raise
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index 7377e04a08..d0152b8d74 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -57,7 +57,7 @@
             // Space into Shift
         #define LSHFSP SFT_T(KC_SPACE)
             // Backspace into Shift
-        #define LSHFBK SFT_T(KC_BSPACE)
+        #define LSHFBK SFT_T(KC_BSPC)
 
     // Switching layers
         #define LTO_BS TO(_QWERTY_MAC)          // Go to Base Layer
@@ -66,8 +66,8 @@
         #define LLY_A LT(_NAV, KC_A)            // From A
             // Go to _PUNC
         #define LLY_TB LT(_PUNC, KC_TAB)        // From Tab
-        #define LLY_BK LT(_PUNC, KC_BSPACE)     // From Backspace
-        #define LLY_BS LT(_PUNC, KC_BSLASH)     // From Backslash
+        #define LLY_BK LT(_PUNC, KC_BSPC)       // From Backspace
+        #define LLY_BS LT(_PUNC, KC_BSLS)       // From Backslash
             // Others
         #define LLY_GR LT(_ONEHD, KC_GRV)       // Go to _ONEHD from `
         #define LLY_ET LT(_EXTRA, KC_ENT)       // Go to _EXTRA from Enter
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_GAMING] = LAYOUT_preonic_grid( \
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINUS,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLASH,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    LLY_SC,  KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_EQUAL,
         KC_LCTL, KC_ESC,  KC_LALT, LOWER,   LLY_BK,  KC_SPC,  KC_SPC,  LLY_ET,  RAISE,   KC_LBRC, KC_RBRC, LLSWIT
@@ -386,7 +386,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,     LMW_L3,   LMW_FS,   LMW_R3,   LMW_TL,   LMW_TR,  XXXXXXX,
         _______,  KC_H,     KC_J,     KC_K,     KC_L,      KC_SCLN,  LMW_L1,   LMW_M1,   LMW_R1,   LMW_BL,   LMW_BR,  XXXXXXX,
         _______,  KC_N,     KC_M,     KC_COMM,  KC_DOT,    KC_SLSH,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,
-        __LYB__,  KC_ESC,  KC_DEL,    KC_ENT,   KC_BSPACE, KC_SPC,   KC_SPC,   LMW_LT,   LMW_BT,   LMW_TP,   LMW_RT,  LLSWIT
+        __LYB__,  KC_ESC,  KC_DEL,    KC_ENT,   KC_BSPC,   KC_SPC,   KC_SPC,   LMW_LT,   LMW_BT,   LMW_TP,   LMW_RT,  LLSWIT
     ),
 
     /* Layer Switcher
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index 223cc56058..e5f37b78c4 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -99,7 +99,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     /* Tap once for single quote, twice for double quote */
     [TD_QUOTE_DOUBLEQUOTE] = ACTION_TAP_DANCE_DOUBLE(KC_QUOTE, KC_DOUBLE_QUOTE),
     /* Tap once for semicolon, twice for colon */
-    [TD_SEMICOLON_COLON] = ACTION_TAP_DANCE_DOUBLE(KC_SCOLON, KC_COLON),
+    [TD_SEMICOLON_COLON] = ACTION_TAP_DANCE_DOUBLE(KC_SEMICOLON, KC_COLON),
     /* Tap once for slash, twice for question mark */
     [TD_SLASH_QUESTION] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_QUESTION),
     /* Tap once for underscore, twice for minus */
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index 9ffb47776f..f46ac5fe72 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -96,7 +96,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     /* Tap once for single quote, twice for double quote */
     [TD_QUOTE_DOUBLEQUOTE] = ACTION_TAP_DANCE_DOUBLE(KC_QUOTE, KC_DOUBLE_QUOTE),
     /* Tap once for semicolon, twice for colon */
-    [TD_SEMICOLON_COLON] = ACTION_TAP_DANCE_DOUBLE(KC_SCOLON, KC_COLON),
+    [TD_SEMICOLON_COLON] = ACTION_TAP_DANCE_DOUBLE(KC_SEMICOLON, KC_COLON),
     /* Tap once for slash, twice for question mark */
     [TD_SLASH_QUESTION] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_QUESTION),
     /* Tap once for underscore, twice for minus */
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
index 517b00003a..c5e4c0ddb1 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_rhnp(
-    KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_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_KP_4, KC_KP_5, KC_KP_6,                              KC_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,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
index 44179cd5c9..b45633c5b9 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_iso_rhnp(
-    KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,      KC_ENTER,     KC_END,
     KC_KP_4, KC_KP_5, KC_KP_6,                              KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,                KC_PGUP,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
index 7b0171e675..b895b04e0f 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_jis_rhnp(
-    KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC,     KC_HOME,
     KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC,      KC_ENTER,       KC_END,
     KC_KP_4, KC_KP_5, KC_KP_6,                              KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC,                KC_PGUP,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
index b73035e957..26018ea3dc 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_rhnp(
-    KC_INSERT, KC_PSCREEN, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_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_KP_4, KC_KP_5, KC_KP_6,                              KC_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,
diff --git a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
index adad7466d6..fe3d1bfd10 100644
--- a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
+++ b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
@@ -29,13 +29,13 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
-    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPACE,
-    KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER,
+    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+    KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
     KC_LSHIFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT, KC_FN,
     KC_LALT,  KC_LGUI, KC_NUMS, KC_SYMS, KC_RGUI, KC_RALT
   ),
   [_NUMS] = LAYOUT(
-    KC_TAB, 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_BSLASH,
+    KC_TAB, 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_BSLS,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______
diff --git a/keyboards/redox/keymaps/german/keymap.c b/keyboards/redox/keymaps/german/keymap.c
index c4325ea73e..2ccd4b1678 100644
--- a/keyboards/redox/keymaps/german/keymap.c
+++ b/keyboards/redox/keymaps/german/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 };
 
 // Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLASH
+#define KC_BKSL KC_BSLS
 #define SYM_L   MO(_SYMB)
 
 #define KC_ALAS LALT_T(KC_PAST)
diff --git a/keyboards/redox/keymaps/italian/keymap.c b/keyboards/redox/keymaps/italian/keymap.c
index 97f2f53294..6b3cdd5475 100644
--- a/keyboards/redox/keymaps/italian/keymap.c
+++ b/keyboards/redox/keymaps/italian/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 };
 
 // Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLASH
+#define KC_BKSL KC_BSLS
 #define SYM_L   MO(_SYMB)
 
 #define KC_ALAS LALT_T(KC_PAST)
diff --git a/keyboards/redox/keymaps/ptillemans/keymap.c b/keyboards/redox/keymaps/ptillemans/keymap.c
index eea5a32808..cbb00e2db8 100644
--- a/keyboards/redox/keymaps/ptillemans/keymap.c
+++ b/keyboards/redox/keymaps/ptillemans/keymap.c
@@ -19,7 +19,7 @@ enum custom_keycodes {
 };
 
 // Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLASH
+#define KC_BKSL KC_BSLS
 #define SYM_L   MO(_SYMB)
 
 #define KC_ALAS LALT_T(KC_PAST)
diff --git a/keyboards/redox_media/keymaps/default/keymap.c b/keyboards/redox_media/keymaps/default/keymap.c
index efd0ac2afb..c61b9ace70 100644
--- a/keyboards/redox_media/keymaps/default/keymap.c
+++ b/keyboards/redox_media/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ enum custom_keycodes {
 };
 
 // Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLASH
+#define KC_BKSL KC_BSLS
 #define SYM_L   MO(_SYMB)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/redox_w/keymaps/danielo515/keymap.c b/keyboards/redox_w/keymaps/danielo515/keymap.c
index 1ff59d36b7..32d2ce3910 100644
--- a/keyboards/redox_w/keymaps/danielo515/keymap.c
+++ b/keyboards/redox_w/keymaps/danielo515/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,UNDO    ,REDO    ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        XXXXXXX ,_______ ,XXXXXXX ,SHIFT_UP,SHIFT_DWN,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        KC_PGUP ,KC_PGDOWN ,  XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        KC_PGUP ,KC_PGDN ,  XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   ),
   [_D] = LAYOUT(
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,_______ ,KC_EQL  ,F_ARROW ,KC_GRAVE,XXXXXXX ,                          XXXXXXX ,KC_AMPR ,KC_LPRN ,KC_RPRN ,CLN_EQ  ,KC_PLUS ,KC_PIPE ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_CIRC ,KC_DLR  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,KC_EXLM ,KC_LBRC ,KC_RBRC ,ARROW  ,KC_BSLASH,IARROW  ,
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_CIRC ,KC_DLR  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,KC_EXLM ,KC_LBRC ,KC_RBRC ,ARROW  ,KC_BSLS,  IARROW  ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,_______ ,        XXXXXXX ,ENTRY ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
diff --git a/keyboards/redox_w/keymaps/italian/keymap.c b/keyboards/redox_w/keymaps/italian/keymap.c
index fd4dffeecb..6d345028b2 100644
--- a/keyboards/redox_w/keymaps/italian/keymap.c
+++ b/keyboards/redox_w/keymaps/italian/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 };
 
 // Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLASH
+#define KC_BKSL KC_BSLS
 #define SYM_L   MO(_SYMB)
 
 #define KC_ALAS LALT_T(KC_PAST)
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
index 36d643370a..dfbed3b466 100644
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
+++ b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
@@ -28,7 +28,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_reviung39(
-   KC_ESC, KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,             KC_Y,  KC_U,  KC_I, KC_O,   KC_P, KC_BSPACE,
+   KC_ESC, KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,             KC_Y,  KC_U,  KC_I, KC_O,   KC_P, KC_BSPC,
    KC_TAB, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,             KC_H,  KC_J,  KC_K, KC_L,   SFT_T(KC_SCLN), KC_RGUI,
    KC_SPC, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_N,  KC_M,  KC_RCTL, KC_DOT, KC_RALT, RGUI(KC_RSFT),
                                        LOWER,  KC_ENT,  RAISE
diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c
index 8c61059971..8148e57af8 100644
--- a/keyboards/rgbkb/mun/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_QWERTY] = LAYOUT(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLASH,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,   KC_RPRN,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
         KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_DEL,    KC_ENT,    KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_RCTL,
diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c
index 8c61059971..8148e57af8 100644
--- a/keyboards/rgbkb/mun/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_QWERTY] = LAYOUT(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLASH,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,   KC_RPRN,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
         KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_DEL,    KC_ENT,    KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_RCTL,
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
index f6cdcfd247..acf11a7828 100644
--- a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
+++ b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
@@ -117,7 +117,7 @@ void matrix_scan_user(void) {
 
             tap_code(KC_RIGHT);
 
-            tap_code(KC_BSPACE);
+            tap_code(KC_BACKSPACE);
 
             unregister_code(KC_LGUI);
         }
diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c
index 5729d80271..905c3ca85c 100644
--- a/keyboards/sofle/keymaps/default/keymap.c
+++ b/keyboards/sofle/keymaps/default/keymap.c
@@ -383,7 +383,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         }
     } else if (index == 1) {
         if (clockwise) {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         } else {
             tap_code(KC_PGUP);
         }
diff --git a/keyboards/sofle/keymaps/devdev/keymap.c b/keyboards/sofle/keymaps/devdev/keymap.c
index 7209c2d33b..b8a79de69d 100644
--- a/keyboards/sofle/keymaps/devdev/keymap.c
+++ b/keyboards/sofle/keymaps/devdev/keymap.c
@@ -545,7 +545,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 				case _QWERTY:
 				case _COLEMAKDH:
 					if (clockwise) {
-						tap_code(KC_PGDOWN);
+						tap_code(KC_PGDN);
 					} else {
 						tap_code(KC_PGUP);
 					}
diff --git a/keyboards/sofle/keymaps/flare576/keymap.c b/keyboards/sofle/keymaps/flare576/keymap.c
index 720232ad48..fb2c7e7a9e 100644
--- a/keyboards/sofle/keymaps/flare576/keymap.c
+++ b/keyboards/sofle/keymaps/flare576/keymap.c
@@ -185,7 +185,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         }
     } else if (index == 1) {
         if (clockwise) {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         } else {
             tap_code(KC_PGUP);
         }
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/encoder.c b/keyboards/sofle/keymaps/j4ckofalltrades/encoder.c
index bd328739ed..9faaccd38f 100644
--- a/keyboards/sofle/keymaps/j4ckofalltrades/encoder.c
+++ b/keyboards/sofle/keymaps/j4ckofalltrades/encoder.c
@@ -26,7 +26,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         }
     } else if (index == 1) {
         if (clockwise) {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         } else {
             tap_code(KC_PGUP);
         }
diff --git a/keyboards/sofle/keymaps/killmaster/keymap.c b/keyboards/sofle/keymaps/killmaster/keymap.c
index 5db76bbb72..f28f0aa466 100644
--- a/keyboards/sofle/keymaps/killmaster/keymap.c
+++ b/keyboards/sofle/keymaps/killmaster/keymap.c
@@ -385,7 +385,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 tap_code(KC_PGUP);
                 // tap_code(KC_MS_WH_UP);
             } else {
-                tap_code(KC_PGDOWN);
+                tap_code(KC_PGDN);
                 // tap_code(KC_MS_WH_DOWN);
             }
         } else if (index == 0) { /* Second encoder */
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index b6608b86a3..108d05a68a 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -545,7 +545,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 				case _QWERTY:
 				case _COLEMAKDH:
 					if (clockwise) {
-						tap_code(KC_PGDOWN);
+						tap_code(KC_PGDN);
 					} else {
 						tap_code(KC_PGUP);
 					}
diff --git a/keyboards/sofle/keymaps/via/encoder.c b/keyboards/sofle/keymaps/via/encoder.c
index f6e267e095..831b3b2f3c 100644
--- a/keyboards/sofle/keymaps/via/encoder.c
+++ b/keyboards/sofle/keymaps/via/encoder.c
@@ -28,7 +28,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         }
     } else if (index == 1) {
         if (clockwise) {
-            tap_code(KC_PGDOWN);
+            tap_code(KC_PGDN);
         } else {
             tap_code(KC_PGUP);
         }
diff --git a/keyboards/sparrow62/keymaps/74th/keymap.c b/keyboards/sparrow62/keymaps/74th/keymap.c
index 1aa33cb55e..1915dbd501 100644
--- a/keyboards/sparrow62/keymaps/74th/keymap.c
+++ b/keyboards/sparrow62/keymaps/74th/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,    KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,
     // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
     // |   ~   |   !   |   @   |   #   |   $   |   %   |   ^   | |   ^   |   &   |   *   |       | PrSC  | PrSC2 | PrSC3 |
-        KC_GRV, KC_EXLM, KC_AT, KC_HASH,KC_DLR, KC_PERC,KC_CIRC,  KC_CIRC,KC_AMPR,KC_ASTR,_______,KC_PSCREEN,LALT(KC_PSCREEN),LSFT(KC_PSCREEN),
+        KC_GRV, KC_EXLM, KC_AT, KC_HASH,KC_DLR, KC_PERC,KC_CIRC,  KC_CIRC,KC_AMPR,KC_ASTR,_______,KC_PSCR,LALT(KC_PSCR),LSFT(KC_PSCR),
     // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
     // |       |       |       |       |       |       |       | |       |   ←   |   ↓   |   ↑   |   →   | HOME  |  END  |
         _______,_______,_______,_______,_______,_______,_______,  _______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,
diff --git a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
index ac343a867d..be7bfe4c7a 100644
--- a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB   , KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,
         OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_D, LT(FSYM,KC_F), KC_G,
         TD(FRBK2)  , KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  TO(EDIT), KC_ESCAPE,
-                            TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPACE, TD(SHNTC),
+                            TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPC, TD(SHNTC),
 
                                 KC_Y,    KC_U,       KC_I, KC_O,      KC_P,        KC_BSLS,
                                 KC_H, LT(JSYM,KC_J), KC_K, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB   , KC_Q,   KC_W,   KC_D,   KC_R,   KC_K,
         OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_T, LT(FSYM,KC_F), KC_G,
         OSM(MOD_LSFT)  , KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  TO(EDIT), KC_ESCAPE,
-                                _______, TO(ADJUST), TD(SGCA), KC_BSPACE, TD(SHNTC),
+                                _______, TO(ADJUST), TD(SGCA), KC_BSPC, TD(SHNTC),
 
                                 KC_Y,    KC_U,       KC_I, KC_O,      KC_P,        KC_PIPE,
                                 KC_H, LT(JSYM,KC_J), KC_E, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LCTL(KC_LEFT), R_UNDO, R_CUT  , R_COPY , R_PASTE, R_REDO , TO(NUMPAD), FORM_GET,
                                             _______, _______, _______, DEL_WRD, _______,
 
-                                    NEW_TAB , KC_PGUP, KC_UP, KC_PGDOWN, KC_PSCREEN, _______,
+                                    NEW_TAB , KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
                                     R_HOME  , KC_LEFT, KC_DOWN, KC_RIGHT, R_END, _______,
                 FORM_PUT, TO(QWERTY), SEL_HOME, S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), SEL_END, _______,
                 _______, _______, _______, _______, _______
diff --git a/keyboards/tada68/keymaps/fezzant/keymap.c b/keyboards/tada68/keymaps/fezzant/keymap.c
index a096002433..d3c1b6e865 100644
--- a/keyboards/tada68/keymaps/fezzant/keymap.c
+++ b/keyboards/tada68/keymaps/fezzant/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * '----------------------------------------------------------------'
    */
 [_BL] = LAYOUT_ansi(
-  KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPACE, KC_GRAVE, \
+  KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_GRAVE, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DELETE, \
   LT(_BSPC,KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_HOME,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_END, \
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PAUSE ,  \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,BL_BRTG,BL_DEC,BL_TOGG, BL_INC, KC_MAIL,TG(_NUM), \
   XXXXXXX,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_APPLICATION,        _______,KC_PGUP, \
-  _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_BTN1, KC_MS_U, KC_PGDOWN, \
+  _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_BTN1, KC_MS_U, KC_PGDN, \
   MAGIC_UNNO_GUI,MAGIC_NO_GUI,_______,                 _______,               _______,_______,_______,KC_MPRV,KC_MSTP, KC_MNXT),
 
 
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_NUM] = LAYOUT_ansi(
   KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_P7,   KC_P8,   KC_P9,XXXXXXX,   KC_KP_MINUS, KC_KP_PLUS, KC_BSPC,KC_CALC, \
   KC_TAB,KC_NUM, KC_UP,XXXXXXX,XXXXXXX, XXXXXXX,KC_P4,KC_P5,KC_P6,XXXXXXX,XXXXXXX,KC_PSLS,KC_PAST, XXXXXXX,_______, \
-  TG(_NUM), KC_LEFT, KC_DOWN, KC_RIGHT,XXXXXXX,XXXXXXX,KC_P1,KC_P2,KC_P3,XXXXXXX,XXXXXXX,XXXXXXX, KC_KP_ENTER,KC_PSCREEN, \
+  TG(_NUM), KC_LEFT, KC_DOWN, KC_RIGHT,XXXXXXX,XXXXXXX,KC_P1,KC_P2,KC_P3,XXXXXXX,XXXXXXX,XXXXXXX, KC_KP_ENTER,KC_PSCR, \
   KC_LSFT, KC_Z, KC_X, KC_C, KC_V,XXXXXXX, KC_PDOT, KC_PDOT, KC_PDOT,XXXXXXX,XXXXXXX,XXXXXXX, KC_MS_U, KC_BTN2, \
   KC_LCTL, KC_LGUI, KC_LALT,KC_P0,EMAIL_ADD,_______,KC_BTN1,KC_MS_L,KC_MS_D, KC_MS_R),
 
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,_______,_______,_______,_______,_______,_______,_______,KC_UP,_______,_______,_______, _______, _______,_______, \
   _______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RIGHT,KC_END,_______,        _______,_______, \
   _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, _______, \
-  _______,_______,_______,                 KC_BSPACE,               _______,XXXXXXX,_______,_______,_______, _______)
+  _______,_______,_______,                 KC_BSPC,                 _______,XXXXXXX,_______,_______,_______, _______)
 
 
 };
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
index 629518bf6b..bcc24c75a0 100644
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
+++ b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_TAB  ,KC_NO,KC_UP,KC_NO,KC_NO,KC_NO,KC_NO,           KC_7,KC_8,KC_0,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
             KC_LCTRL ,KC_LEFT,KC_DOWN,KC_RIGHT,KC_NO,KC_NO,         KC_4,KC_5,KC_6,KC_NO,KC_NO,KC_NO,KC_NO,
             KC_LSFT   ,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,               KC_1,KC_2,KC_3,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
-            KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC,             KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDOWN,KC_END
+            KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC,             KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDN,KC_END
             ),
 };
 
diff --git a/keyboards/team0110/p1800fl/keymaps/default/keymap.c b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
index e0a3ad35c1..1125d2aa58 100644
--- a/keyboards/team0110/p1800fl/keymaps/default/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_GRV,           KC_F1,    KC_F2, KC_F3,     KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,           KC_PSCR, KC_SLCK, KC_PAUS, _______,
         _______,          RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,                   KC_INS, KC_HOME, KC_PGUP, _______,
-        _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDOWN, _______,
+        _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDN, _______,
         _______, _______, BL_TOGG,  BL_BRTG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
         _______,          _______,  _______,                   _______,             _______, _______, _______,                               _______, KC_VOLD, _______,   _______, _______, _______ 
     ),
diff --git a/keyboards/team0110/p1800fl/keymaps/via/keymap.c b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
index 9cd55ff54c..986a3905d9 100644
--- a/keyboards/team0110/p1800fl/keymaps/via/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_GRV,           KC_F1,    KC_F2, KC_F3,     KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,           KC_PSCR, KC_SLCK, KC_PAUS, _______,
         _______,          RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,                   KC_INS, KC_HOME, KC_PGUP, _______,
-        _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDOWN, _______,
+        _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDN, _______,
         _______, _______, BL_TOGG,  BL_BRTG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
         _______,          _______,  _______,                   _______,             _______, _______, _______,                               _______, KC_VOLD, _______,   _______, _______, _______ 
     ),
diff --git a/keyboards/vitamins_included/keymaps/numpad/keymap.c b/keyboards/vitamins_included/keymaps/numpad/keymap.c
index a3f3b8a35b..4108259df8 100644
--- a/keyboards/vitamins_included/keymaps/numpad/keymap.c
+++ b/keyboards/vitamins_included/keymaps/numpad/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUM_LOCK,    KC_LEFT,   KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUM_LOCK,    KC_LEFT,
   ADJUST,      KC_KP_2,    KC_KP_5,     KC_KP_8,    KC_KP_SLASH,    KC_DOWN,   ADJUST,      KC_KP_2,    KC_KP_5,     KC_KP_8,    KC_KP_SLASH,    KC_DOWN,
   KC_KP_DOT,   KC_KP_3,    KC_KP_6,     KC_KP_9,    KC_KP_ASTERISK, KC_UP,     KC_KP_DOT,   KC_KP_3,    KC_KP_6,     KC_KP_9,    KC_KP_ASTERISK, KC_UP,
-  KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPACE,      KC_RIGHT,  KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPACE,      KC_RIGHT
+  KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPC,        KC_RIGHT,  KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPC,        KC_RIGHT
 ),
 
 /* Adjust (Lower + Raise)
diff --git a/keyboards/westm/westm68/keymaps/default/keymap.c b/keyboards/westm/westm68/keymaps/default/keymap.c
index 0ed64abebd..7946201e8e 100755
--- a/keyboards/westm/westm68/keymaps/default/keymap.c
+++ b/keyboards/westm/westm68/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
 			KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, 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,
 			MO(1),   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGUP,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT, KC_UP,     KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
diff --git a/keyboards/westm/westm68/keymaps/via/keymap.c b/keyboards/westm/westm68/keymaps/via/keymap.c
index 604213140d..6615d6979b 100644
--- a/keyboards/westm/westm68/keymaps/via/keymap.c
+++ b/keyboards/westm/westm68/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
 			KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_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_BSLASH, 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_PGUP,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
diff --git a/keyboards/whale/sk/keymaps/default/keymap.c b/keyboards/whale/sk/keymaps/default/keymap.c
index 988cab313d..64b7f20cc6 100644
--- a/keyboards/whale/sk/keymaps/default/keymap.c
+++ b/keyboards/whale/sk/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
         KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME,      KC_END, 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_PGUP,               KC_PGDOWN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_PGUP,               KC_PGDN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
         KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL,               KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LEFT,              KC_RIGHT, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSHIFT,
         KC_LBRC, KC_LALT, KC_LWIN, KC_APP, KC_INT4, KC_MENU,              KC_MENU, KC_INT5, KC_APP, KC_RWIN, KC_RALT, KC_RBRC,
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
index 8e28156aa5..f6b3c259ca 100644
--- a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,    \
       KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT,  KC_MSTP,  KC_TRNS,   KC_NO,               KC_TRNS,    \
       KC_TRNS, TG(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,   KC_TRNS,  KC_PGUP,   KC_TRNS,    \
-      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS,  KC_TRNS,   KC_HOME,  KC_PGDOWN, KC_END),
+      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS,  KC_TRNS,   KC_HOME,  KC_PGDN,   KC_END),
                                                                                                                                            
   // 2: GUI/Function 2 Layer                                                                                                                   
   LAYOUT_all(                                                                                                                                  
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_TRNS, AC_G_W,  AC_G_E,  KC_TRNS, AC_G_T,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,              KC_TRNS,   \
       KC_TRNS, KC_TRNS, AC_G_S,  AC_G_D,  KC_TRNS, KC_TRNS, AC_G_H,  KC_TRNS, KC_TRNS, AC_G_L,   KC_TRNS,  KC_TRNS,   KC_NO,                KC_TRNS,   \
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_PGUP,    KC_TRNS,   \
-      KC_TRNS, KC_TRNS, KC_TRNS,                            AC_G_SPC,                            KC_TRNS,  KC_TRNS,   KC_HOME,  KC_PGDOWN,  KC_END),
+      KC_TRNS, KC_TRNS, KC_TRNS,                            AC_G_SPC,                            KC_TRNS,  KC_TRNS,   KC_HOME,  KC_PGDN,  KC_END),
                                                                                                                                            
   // 3: NumPad/Function 3 Toggle Layer                                                                                                                   
   LAYOUT_all(                                                                                                                                  
diff --git a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
index 1dfda06f2f..0c535f3871 100644
--- a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
@@ -28,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
         KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
         KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
-        KC_LCTL, KC_LGUI, KC_LALT,          KC_LSFT,                KC_SPC,         KC_ESC,  KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_LSFT,                KC_SPC,         KC_ESC,  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
     )
 };
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
index 1e0dcacc22..efa6874006 100644
--- a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,    \
     KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,    \
     KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),     \
-    KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END
+    KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
   ),
 
   // 2: Cool Layer
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,       \
     KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,       \
     KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),       \
-    KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END
+    KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
   )
 };
 
diff --git a/keyboards/xiudi/xd60/keymaps/default/keymap.c b/keyboards/xiudi/xd60/keymaps/default/keymap.c
index 93a83ff49d..f3e43067d7 100644
--- a/keyboards/xiudi/xd60/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/default/keymap.c
@@ -16,6 +16,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
 
 };
diff --git a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c b/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
index 38dfd2ca35..7717bd6ba9 100644
--- a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
@@ -20,6 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
 
 };
diff --git a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
index e658dbf5d3..8c72370f87 100644
--- a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,   RGB_MOD, RGB_VAI,  KC_TRNS,  KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPLY, KC_MRWD,  KC_MFFD,            KC_MSTP, \
       KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS, KC_TRNS,  KC_NO,              KC_ENT,    \
       KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,  KC_VOLU, KC_NO,   KC_MUTE,KC_PGUP,  QK_BOOT, \
-      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS, KC_TRNS,  KC_HOME,  KC_PGDOWN,KC_END
+      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS, KC_TRNS,  KC_HOME,  KC_PGDN,KC_END
       ),
 
 };
diff --git a/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c b/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
index 9958cbfc4c..b39a596fbf 100644
--- a/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, BL_TOGG, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS,            KC_DEL,    \
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,    \
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,   KC_TRNS,    \
-      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_HOME, KC_PGDOWN, KC_END),
+      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN,   KC_END),
 
 };
diff --git a/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c b/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
index d1417281ee..afd9c6ca55 100644
--- a/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_CAPS, KC_MPRV, KC_UP,   KC_MNXT, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_DEL,    \
       MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_ENT,    \
       KC_LSFT, KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_PGUP,  KC_INS,    \
-      KC_LCTL, KC_LALT, KC_LGUI,                          KC_MPLY,                         KC_RGUI, KC_RALT,  KC_HOME, KC_PGDOWN,KC_END),
+      KC_LCTL, KC_LALT, KC_LGUI,                          KC_MPLY,                         KC_RGUI, KC_RALT,  KC_HOME, KC_PGDN,  KC_END),
 
   // 2: RGB Layer
   LAYOUT_all(
diff --git a/keyboards/xiudi/xd60/keymaps/via/keymap.c b/keyboards/xiudi/xd60/keymaps/via/keymap.c
index 198418213b..6f55d466be 100644
--- a/keyboards/xiudi/xd60/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
         KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
         KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
-        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, _______,  KC_HOME, KC_PGDOWN,KC_END),
+        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, _______,  KC_HOME, KC_PGDN,  KC_END),
 
     [2] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c b/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
index 7e2fd7a0dd..19328bc68e 100644
--- a/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,   RGB_MOD, RGB_VAI,  RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_DEL,    \
       KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_NO,              KC_ENT,    \
       KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PGUP,  KC_TRNS,   \
-      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDOWN,KC_END
+      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDN,  KC_END
       ),
 
 };
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
index 3049141c27..ebd1bf35b4 100644
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
+++ b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
@@ -20,7 +20,7 @@
 
 /* Enable the space-cadet options */
 #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_PGUP
-#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDOWN
+#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDN
 #define LSPO_KEYS KC_LSFT, KC_TRNS, KC_HOME
 #define LCPO_KEYS KC_LCTL, KC_TRNS, KC_END
 
diff --git a/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c b/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
index d07e1f48a3..da24da9a34 100644
--- a/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   BP_DLR,    BP_DQUO,  BP_LCBR,    BP_RCBR, BP_LPRN, BP_RPRN,        KC_VOLD, KC_MUTE, KC_VOLU,   BP_PLUS,         BP_MINS, BP_SLSH, BP_ASTR,  BP_EQL,  BP_PERC,
   KC_TAB,    BP_B,     BP_EACU,    BP_P,    BP_O,    BP_EGRV,        KC_KP_7, KC_KP_8, KC_KP_9,   BP_DCIR,         BP_V,    BP_D,    BP_L,     BP_J,    BP_Z,
   KC_ESC,    BP_A,     BP_U,       BP_I,    BP_E,    BP_COMM,        KC_HOME, KC_KP_5, KC_END,    BP_C,            BP_T,    BP_S,    BP_R,     BP_N,    BP_M,
-  KC_LSFT,   BP_W,     BP_Y,       BP_X,    BP_DOT,  BP_K,           KC_PGUP, KC_END,  KC_PGDOWN, BP_QUOT,         BP_Q,    BP_G,    BP_H,     BP_F,    KC_RSFT,
+  KC_LSFT,   BP_W,     BP_Y,       BP_X,    BP_DOT,  BP_K,           KC_PGUP, KC_END,  KC_PGDN,   BP_QUOT,         BP_Q,    BP_G,    BP_H,     BP_F,    KC_RSFT,
   KC_LCTL,   KC_LGUI, KC_RALT,     KC_LGUI, BP_UNDS, LT(_FN,KC_ENT), KC_DEL,  KC_KP_0, KC_BSPC,   LT(_FN,KC_SPC),  BP_UNDS, KC_RALT, KC_RALT,  KC_RGUI, KC_LCTL
  ),
 
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index e0cc76a2bb..1cc570bdd5 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -265,14 +265,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             else {
               unregister_code(KC_RSHIFT);
             }
-          register_code(KC_BSLASH);
+          register_code(KC_BACKSLASH);
         }
         else {
           register_code(KC_SLSH);
         }
       }
       else {
-        unregister_code(KC_BSLASH);
+        unregister_code(KC_BACKSLASH);
         unregister_code (KC_SLSH);
       }
       return false;
diff --git a/keyboards/yampad/keymaps/traditional/keymap.c b/keyboards/yampad/keymaps/traditional/keymap.c
index 155a9e36a3..6bd18cfd29 100644
--- a/keyboards/yampad/keymaps/traditional/keymap.c
+++ b/keyboards/yampad/keymaps/traditional/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------'
  */
   [_NV] = LAYOUT(
-    KC_INS,   KC_BSPACE,  XXXXXXX,   TG(_NV),
+    KC_INS,   KC_BSPC, XXXXXXX,   TG(_NV),
     KC_HOME,  KC_UP,   KC_PGUP,
     KC_LEFT,  KC_DEL,  KC_RGHT,   XXXXXXX,
     KC_END,   KC_DOWN, KC_PGDN,
diff --git a/keyboards/ymdk/sp64/keymaps/daed/keymap.c b/keyboards/ymdk/sp64/keymaps/daed/keymap.c
index 990920e00f..723d3b1f88 100644
--- a/keyboards/ymdk/sp64/keymaps/daed/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/daed/keymap.c
@@ -25,9 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
  */
 [_BASE] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
+  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRC,     KC_RBRC,     KC_BSLS,
-  KC_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
+  KC_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       MO(_MODE),
   MO(_FN), KC_LGUI, KC_LALT, KC_SPACE,      MO(_RAISE),             KC_SPACE,           KC_RALT,      KC_RCTL,   KC_LEFT,     KC_DOWN,     KC_RIGHT
   ),
@@ -46,9 +46,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
  */
 [_GAMER] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
+  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRC,     KC_RBRC,     KC_BSLS,
-  KC_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
+  KC_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       MO(_MODE),
   MO(_FN), KC_F13,  KC_LALT, KC_SPACE,      MO(_GACROS),             KC_SPACE,           KC_RALT,      KC_RCTL,   KC_LEFT,     KC_DOWN,     KC_RIGHT
   ),
diff --git a/keyboards/ymdk/sp64/keymaps/default/keymap.c b/keyboards/ymdk/sp64/keymaps/default/keymap.c
index 3453da40cd..dbdd6f0cb2 100644
--- a/keyboards/ymdk/sp64/keymaps/default/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/default/keymap.c
@@ -22,9 +22,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
  */
 [BASE] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
+  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRC,     KC_RBRC,     KC_BSLS,
-  KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
+  KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       KC_F3,
   KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE,      MO(_FN),     KC_SPACE,                  KC_RALT, KC_RGUI,            KC_LEFT,     KC_DOWN,     KC_RIGHT
   ),
diff --git a/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c b/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
index 2c93d12b30..e384c2a9e9 100644
--- a/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT(
   KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4, KC_5,     KC_6,           KC_7, KC_8,    KC_9,     KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R, KC_T,           KC_Y,     KC_U, KC_I,    KC_O,     KC_P,      KC_LBRC,     KC_RBRC,     KC_BSLS,
-  KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F, KC_G,           KC_H,     KC_J, KC_K,    KC_L,     KC_SCOLON, KC_QUOTE,                 KC_ENT,
+  KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F, KC_G,           KC_H,     KC_J, KC_K,    KC_L,     KC_SCLN,   KC_QUOTE,                 KC_ENT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V, KC_B,           KC_N,     KC_M, KC_COMM, KC_DOT,   KC_SLSH,   KC_RSFT,     KC_UP,       KC_DEL,
   KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),        KC_SPACE,       KC_SPACE,       KC_RALT, TG(_NUM),            KC_LEFT,     KC_DOWN,     KC_RIGHT
   ),
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MIRROR] = LAYOUT(
   KC_BSPC, KC_EQUAL,  KC_MINUS, KC_0,    KC_9, KC_8,    KC_7,          _______, _______, _______, _______, _______, _______, _______,
   KC_BSLS, KC_P,      KC_O,     KC_I,    KC_U, KC_Y,          _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_ENT,  KC_SCOLON, KC_L,     KC_K,    KC_J, KC_H,          _______, _______, _______, _______, _______, _______,          _______,
+  KC_ENT,  KC_SCLN,   KC_L,     KC_K,    KC_J, KC_H,          _______, _______, _______, _______, _______, _______,          _______,
   _______, KC_SLSH,   KC_DOT,   KC_COMM, KC_M, KC_N,          _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______,   _______,  _______,       _______,       _______,          _______, KC_NO,            _______, _______, _______
   ),
diff --git a/keyboards/ymdk/sp64/keymaps/via/keymap.c b/keyboards/ymdk/sp64/keymaps/via/keymap.c
index c9fe16c47b..95ec582521 100644
--- a/keyboards/ymdk/sp64/keymaps/via/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/via/keymap.c
@@ -33,9 +33,9 @@ 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_MINUS,    KC_EQUAL,    KC_BSPACE,
+  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRC,     KC_RBRC,     KC_BSLS,
-  KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
+  KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                 KC_ENTER,
   KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,               KC_N,     KC_M, KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,       KC_DEL,
   KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE,          MO(1),            KC_SPACE,         KC_RALT, KC_RGUI,            KC_LEFT,     KC_DOWN,     KC_RIGHT
   ),
diff --git a/keyboards/ymdk/sp64/keymaps/walston/keymap.c b/keyboards/ymdk/sp64/keymaps/walston/keymap.c
index ef0cf18943..5f4af717f7 100644
--- a/keyboards/ymdk/sp64/keymaps/walston/keymap.c
+++ b/keyboards/ymdk/sp64/keymaps/walston/keymap.c
@@ -22,9 +22,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
  */
 [BASE] = LAYOUT(
-  MT(QK_BOOT, KC_GRAVE),   KC_1,      KC_2,    KC_3,    KC_4,    KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
+  MT(QK_BOOT, KC_GRAVE),   KC_1,      KC_2,    KC_3,    KC_4,    KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPC,
   KC_TAB,                KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC,      KC_RBRC,   KC_BSLS,
-  KC_LCTL,               KC_A,      KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,    KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                  KC_ENTER,
+  KC_LCTL,               KC_A,      KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                  KC_ENTER,
   KC_LSFT,               KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,     KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,     KC_UP,     OSL(_MEDIA),
   LT(_NUMPAD, KC_CAPS), TT(_MEDIA), KC_LALT, KC_LGUI, LT(_FUN, KC_SPACE),    KC_SPACE,          KC_RGUI, KC_RALT,        KC_LEFT,   KC_DOWN,        KC_RIGHT
   ),
diff --git a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
index effa594af2..0f2ed23bb2 100644
--- a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_all(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,      KC_EQL,  KC_GRV, KC_BSPACE,
+        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,      KC_EQL,  KC_GRV, KC_BSPC,
         KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,      KC_RBRC, KC_BSLS,
         LT(1,KC_CAPS), KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_NUHS, KC_ENT,
         KC_LSFT,    KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,      KC_RSFT, KC_UP,   KC_DEL,
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
index f87c294c4c..131601fa99 100644
--- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
+++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_60_ansi(
     KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,   \
-	KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLASH, \
+	KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,   \
     KC_CTCP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,             \
     KC_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_SPACE,             KC_FNX,  KC_RALT, KC_RGUI, KC_RCTL),
diff --git a/layouts/community/60_ansi/readme.md b/layouts/community/60_ansi/readme.md
index 9e81c96153..e4e59f1a64 100644
--- a/layouts/community/60_ansi/readme.md
+++ b/layouts/community/60_ansi/readme.md
@@ -50,7 +50,7 @@ This keymap must have a `LAYOUT_60_ansi` layout defined.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT_60_ansi(
     KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, \
-	KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLASH, \
+	KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, \
     KC_LCTL, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,  \
     KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
     KC_LCTL, KC_LALT, KC_LGUI,       KC_SPACE,             MO(1),   KC_RALT, KC_RGUI, KC_RCTL),
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index f48b53e303..794ff92c5d 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_60_ansi_split_bs_rshift(
     KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC, \
-	KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLASH,        \
+	KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,          \
     KC_CTCP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,                    \
     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(_AL),                   \
     KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
diff --git a/layouts/community/ergodox/adnw_p_u_q/keymap.c b/layouts/community/ergodox/adnw_p_u_q/keymap.c
index cf2ab93589..58be35bbaa 100644
--- a/layouts/community/ergodox/adnw_p_u_q/keymap.c
+++ b/layouts/community/ergodox/adnw_p_u_q/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// right thumb-cluster
         DE_QUES, DE_DLR,
         LCTL(DE_C),
-        KC_ESCAPE, KC_ENTER, KC_BSPACE
+        KC_ESCAPE, KC_ENTER, KC_BSPC
 ),
 
 
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDOWN,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                                            KC_HOME, KC_TRNS,
                                                     KC_TRNS,
diff --git a/layouts/community/ergodox/bepo_alt/keymap.c b/layouts/community/ergodox/bepo_alt/keymap.c
index edf9ba23d5..7793eef31d 100644
--- a/layouts/community/ergodox/bepo_alt/keymap.c
+++ b/layouts/community/ergodox/bepo_alt/keymap.c
@@ -35,7 +35,7 @@ KC_TAB, BP_B,   BP_EACU,    BP_P,   BP_O,   BP_EGRV, KC_BSPC,
 BP_W,   BP_A,   BP_U,   BP_I,   BP_E,   BP_COMM,
 KC_LSHIFT,  BP_ECIR,  BP_AGRV,   BP_Y,   BP_X,   BP_DOT,   BP_K,
 KC_LCTL,    KC_LGUI,    KC_LGUI,  KC_LGUI,  KC_LALT,
-                            KC_PGUP,  KC_PGDOWN,
+                            KC_PGUP,  KC_PGDN,
                                 KC_INS,
                         KC_SPC,   KC_LSHIFT,  DF(FNAV),
 
diff --git a/layouts/community/ergodox/berfarah/keymap.c b/layouts/community/ergodox/berfarah/keymap.c
index 7dc09e7543..b58829370e 100644
--- a/layouts/community/ergodox/berfarah/keymap.c
+++ b/layouts/community/ergodox/berfarah/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,VIM_W,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDOWN,KC_END,
+        KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDN,KC_END,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,VIM_B,  KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                         KC_TRNS,KC_TRNS,
diff --git a/layouts/community/ergodox/choromanski/keymap.c b/layouts/community/ergodox/choromanski/keymap.c
index 01786aab3c..8cd3f34dab 100644
--- a/layouts/community/ergodox/choromanski/keymap.c
+++ b/layouts/community/ergodox/choromanski/keymap.c
@@ -243,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 							KC_LEFT,	KC_DOWN,	KC_RGHT,	KC_COMM,	TO(0),
 	KC_LALT,	KC_LCTL,
 	KC_PGUP,
-	KC_PGDOWN,	KC_BSPC,	KC_DEL
+	KC_PGDN,	KC_BSPC,	KC_DEL
   ),
 };
 
diff --git a/layouts/community/ergodox/dave/keymap.c b/layouts/community/ergodox/dave/keymap.c
index c54e50ba98..054cbd3ed8 100644
--- a/layouts/community/ergodox/dave/keymap.c
+++ b/layouts/community/ergodox/dave/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTRL, KC_A,     KC_S,    KC_D,    KC_F,    KC_G,
         KC_LSFT,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,   KC_H,
         CTL_T(KC_GRV),KC_NUBS,KC_NO, KC_NO,   KC_LALT,
-                                                  KC_PSCREEN, KC_PSCREEN,
+                                                  KC_PSCR, KC_PSCR,
                                                       TO(PROG),
                                                KC_SPC, MO(NAVI), KC_LGUI,
         // right hand
diff --git a/layouts/community/ergodox/dvorak_emacs/keymap.c b/layouts/community/ergodox/dvorak_emacs/keymap.c
index 4494e4b976..5c310593be 100644
--- a/layouts/community/ergodox/dvorak_emacs/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     KC_RBRC,         KC_F,           KC_G,         KC_C,   KC_R,   KC_L,   KC_SLASH,
                                      LT(AUX, KC_D),  SFT_T(KC_H),  KC_T,   KC_N,   KC_S,   KC_MINUS,
                     KC_LGUI,         KC_B,           KC_M,         KC_W,   KC_V,   KC_Z,   SFT_T(KC_RBRC),
-                                                                 MO(AUX), KC_NO,   KC_NO,  KC_BSLASH, KC_NO,
+                                                                 MO(AUX), KC_NO,   KC_NO,  KC_BSLS, KC_NO,
         KC_LEFT, KC_RIGHT,
         KC_UP,
         KC_DOWN, ALT_T(KC_ENT), CTL_T(KC_SPC)
diff --git a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
index 2d3ec3806b..5d998a110b 100644
--- a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
+++ b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                           KC_D,   KC_H,   KC_T,   KC_N,   KC_S,             KC_MINS,
              MEH_T(KC_NO),KC_B,   KC_M,   KC_W,   KC_V,   CTL_T(KC_Z),      KC_RSFT,
                                   KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
-             TG(2),        KC_PSCREEN,
+             TG(2),        KC_PSCR,
              KC_PGUP,
              KC_PGDN,RALT(KC_RSFT), KC_ENT
     ),
diff --git a/layouts/community/ergodox/german-kinergo/keymap.c b/layouts/community/ergodox/german-kinergo/keymap.c
index eae02d8925..46caa986a6 100644
--- a/layouts/community/ergodox/german-kinergo/keymap.c
+++ b/layouts/community/ergodox/german-kinergo/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                               KC_HOME,
                                                KC_BSPC,KC_DEL,KC_END,
         // right hand
-        KC_PSCREEN,  KC_6,   KC_7,    KC_8,    KC_9,   KC_0,             KC_MINS,
+        KC_PSCR,     KC_6,   KC_7,    KC_8,    KC_9,   KC_0,             KC_MINS,
         MO(1),       DE_Z,   KC_U,    KC_I,    KC_O,   KC_P,             DE_UDIA,
                      KC_H,   KC_J,    KC_K,    KC_L,   DE_ODIA,          LT(MDIA,DE_ADIA),
         MO(2),       KC_N,   KC_M,    KC_COMM, KC_DOT, DE_MINS,          KC_RSFT,
diff --git a/layouts/community/ergodox/german-lukas/keymap.c b/layouts/community/ergodox/german-lukas/keymap.c
index a63a13c12d..ca7335cae2 100644
--- a/layouts/community/ergodox/german-lukas/keymap.c
+++ b/layouts/community/ergodox/german-lukas/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                               KC_HOME,
                                                KC_SPC ,KC_DEL,KC_END,
         // right hand
-        KC_PSCREEN,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,        KC_MINS,
+        KC_PSCR,      KC_6,   KC_7,    KC_8,    KC_9,    KC_0,        KC_MINS,
         TG(MDIA),     DE_Z,   KC_U,    KC_I,    KC_O,    KC_P,        LT(SHRT,DE_UDIA),
                       KC_H,   KC_J,    KC_K,    KC_L,    DE_ODIA,     LT(MDIA,DE_ADIA),
         MEH_T(KC_NO),     KC_N,   KC_M,    KC_COMM, KC_DOT,  DE_MINS,     KC_RSFT,
diff --git a/layouts/community/ergodox/issmirnov/keymap.c b/layouts/community/ergodox/issmirnov/keymap.c
index c5a7a29121..1322681d22 100644
--- a/layouts/community/ergodox/issmirnov/keymap.c
+++ b/layouts/community/ergodox/issmirnov/keymap.c
@@ -13,7 +13,7 @@ OSM(MOD_LSFT),  _________________QWERTY_L3_________________,   KC_SLASH,
 KC_LCTL, LSFT(KC_LGUI), LSFT(KC_LALT),  KC_LALT,   KC_LGUI,
                                         XXXXXXX,  XXXXXXX,
                                                 XXXXXXX,
-                        KC_SPACE,   KC_BSPACE,  KC_DEL,
+                        KC_SPACE,   KC_BSPC,  KC_DEL,
 
 KC_EQL    , KC_6    , KC_7    , KC_8    , KC_9          , KC_0    , KC_ESCAPE      ,
 KC_PLUS   , _________________QWERTY_R1_________________  , LGUI(KC_SPACE) ,
@@ -36,7 +36,7 @@ KC_LCTL   , LSFT(KC_LGUI) , LSFT(KC_LALT) , KC_LALT     , WKSP_LEFT  ,
 
                                               XXXXXXX,        XXXXXXX,
                                                             XXXXXXX,
-                                    WKSP_RIGHT, KC_BSPACE,    KC_DEL,
+                                    WKSP_RIGHT, KC_BSPC,    KC_DEL,
 
 KC_F7     , KC_F8    , KC_F9   , KC_F10    , KC_F11    , KC_F12  , XXXXXXX  ,
 KC_PLUS   , _________________SYMB_R1___________________ , MO(_NAVI)  ,
@@ -59,7 +59,7 @@ TO(0)   , XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
 
                                             XXXXXXX  ,  XXXXXXX  ,
                                                         XXXXXXX  ,
-                                            KC_SPACE , KC_BSPACE , KC_DEL ,
+                                            KC_SPACE , KC_BSPC , KC_DEL ,
 
 KC_EQL  , ___________________XXXXX___________________ , QK_BOOT   ,
 KC_PLUS , _________________NUMP_R1___________________ , XXXXXXX ,
diff --git a/layouts/community/ergodox/maz/keymap.c b/layouts/community/ergodox/maz/keymap.c
index 4073d79f54..fc0509e8a2 100644
--- a/layouts/community/ergodox/maz/keymap.c
+++ b/layouts/community/ergodox/maz/keymap.c
@@ -128,11 +128,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     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_PGDOWN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_LEFT, KC_DOWN,   KC_UP,   KC_RGHT, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_HOME,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_HOME, KC_END,  KC_TRNS, KC_TRNS, KC_TRNS,
+                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/layouts/community/ergodox/mclennon_osx/keymap.c b/layouts/community/ergodox/mclennon_osx/keymap.c
index ae67d8fb40..fc53581030 100644
--- a/layouts/community/ergodox/mclennon_osx/keymap.c
+++ b/layouts/community/ergodox/mclennon_osx/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         // right hand
         KC_7,       KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,
-        KC_DELETE,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSLASH,
+        KC_DELETE,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSLS,
                     KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_ENT,
         KC_RBRC,    KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_QUOT,
                          KC_TRNS,   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c
index 9d4eba205d..f04cd47c97 100644
--- a/layouts/community/ergodox/meagerfindings/keymap.c
+++ b/layouts/community/ergodox/meagerfindings/keymap.c
@@ -97,12 +97,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_GRAVE, ZENDESK, RUBYMINE,   LGUI(KC_S),   TODO,
                                                           KC_ESCAPE,    KC_HOME,
                                                                         KC_END,
-                                  OSM(MOD_LSFT), LT(NUM,KC_BSPACE),     LT(MKDWN,KC_DELETE),
+                                  OSM(MOD_LSFT), LT(NUM,KC_BSPC),     LT(MKDWN,KC_DELETE),
 
     //right hand
     KC_F7,           KC_F8,     KC_F9,    KC_F10,   KC_F11,        KC_F12,           KC_MINUS,
-    MD_LINK,          KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,             KC_BSLASH,
-                      KC_H,     KC_J, ALT_T(KC_K),  LGUI_T(KC_L),  LT(MEDIA,KC_SCOLON),  ALL_T(KC_QUOTE),
+    MD_LINK,          KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,             KC_BSLS,
+                      KC_H,     KC_J, ALT_T(KC_K),  LGUI_T(KC_L),  LT(MEDIA,KC_SCLN),  ALL_T(KC_QUOTE),
     TD(CT_RBP),       KC_N,     KC_M,     KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH),  SCMD_T(_______),
                 LSFT(KC_MINUS), _______,  DBLE_ZER0, DBLE_ZER0,   TO(OLD_BASE),
     L_ID_0,         KC_ESCAPE,
@@ -144,12 +144,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_GRAVE, ZENDESK, RUBYMINE, LGUI(KC_S), TODO,
                                                           KC_ESCAPE, KC_HOME,
                                                                      KC_END,
-                                    OSM(MOD_LSFT), LT(NUM,KC_BSPACE),  LT(MKDWN,KC_DELETE),
+                                    OSM(MOD_LSFT), LT(NUM,KC_BSPC),  LT(MKDWN,KC_DELETE),
 
       //right hand
       TD(TD_SNAGIT),    KC_6,     KC_7,     KC_8,     KC_9,          KC_0,             KC_MINUS,
-      MD_LINK,          KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,             KC_BSLASH,
-                        KC_H,     KC_J,     KC_K,     LGUI_T(KC_L),  LT(MEDIA,KC_SCOLON),  ALL_T(KC_QUOTE),
+      MD_LINK,          KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,             KC_BSLS,
+                        KC_H,     KC_J,     KC_K,     LGUI_T(KC_L),  LT(MEDIA,KC_SCLN),  ALL_T(KC_QUOTE),
       TD(CT_RBP),       KC_N,     KC_M,     KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH),  SCMD_T(_______),
                   LSFT(KC_MINUS), _______,  DBLE_ZER0, DBLE_ZER0,   TO(BASE),
       L_ID_0,         KC_ESCAPE,
diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index f13c4eb960..48fa117baf 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -59,7 +59,7 @@ enum custom_keycodes {
 #define US_OSX_SBQUO                LALT(LSFT(KC_0))            // ‚
 #define US_OSX_LEFT_SINGLE_QUOTE    LALT(KC_RBRC)               // ‘
 #define US_OSX_RIGHT_SINGLE_QUOTE   LALT(LSFT(KC_RBRC))         // ’
-#define US_OSX_ELLIPSIS             LALT(KC_SCOLON)             // …
+#define US_OSX_ELLIPSIS             LALT(KC_SCLN)               // …
 #define US_OSX_UNDERSCORE           LSFT(KC_MINUS)              // _
 #define US_OSX_LBRACKET             KC_LBRC                     // [
 #define US_OSX_RBRACKET             KC_RBRC                     // ]
@@ -70,7 +70,7 @@ enum custom_keycodes {
 #define US_OSX_EQUAL                KC_EQUAL                    // =
 #define US_OSX_AMPERSAND            LSFT(KC_7)                  // &
 #define US_OSX_SMALL_LONG_S         KC_NO                       // ſ
-#define US_OSX_BSLASH               KC_BSLASH
+#define US_OSX_BSLASH               KC_BACKSLASH
 #define US_OSX_SLASH                KC_SLASH                    // /
 #define US_OSX_CLBRACKET            LSFT(KC_LBRC)               // {
 #define US_OSX_CRBRACKET            LSFT(KC_RBRC)               // }
@@ -79,17 +79,17 @@ enum custom_keycodes {
 #define US_OSX_LPARENTHESES         LSFT(KC_9)                  // (
 #define US_OSX_RPARENTHESES         LSFT(KC_0)                  // )
 #define US_OSX_HYPHEN_MINUS         KC_MINUS                    // -
-#define US_OSX_COLON                LSFT(KC_SCOLON)             // :
+#define US_OSX_COLON                LSFT(KC_SCLN)               // :
 #define US_OSX_AT                   LSFT(KC_2)                  // @
 #define US_OSX_HASH                 LSFT(KC_3)                  // #
-#define US_OSX_PIPE                 LSFT(KC_BSLASH)             // |
+#define US_OSX_PIPE                 LSFT(KC_BACKSLASH)          // |
 #define US_OSX_TILDE                LSFT(KC_GRAVE)              // ~
 #define US_OSX_BACKTICK             KC_GRAVE                    // `
 #define US_OSX_PLUS                 LSFT(KC_EQUAL)              // +
 #define US_OSX_PERCENT              LSFT(KC_5)                  // %
 #define US_OSX_DOUBLE_QUOTE         LSFT(KC_QUOTE)              // "
 #define US_OSX_SINGLE_QUOTE         KC_QUOTE                    // '
-#define US_OSX_SEMICOLON            KC_SCOLON                   // ;
+#define US_OSX_SEMICOLON            KC_SCLN                     // ;
 
 // NEO_4 special characters
 #define US_OSX_FEMININE_ORDINAL     LALT(KC_9)                  // ª
@@ -135,8 +135,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // left hand side - thumb cluster
     /* --- */         MO(FKEYS),        KC_HOME,
-    /* KC_BSPACE */   /* KC_DELETE */   KC_END,
-    KC_BSPACE,        KC_DELETE,        NEO2_LMOD4,
+    /* KC_BSPC */     /* KC_DELETE */   KC_END,
+    KC_BSPC,          KC_DELETE,        NEO2_LMOD4,
 
     // right hand side - main
     TO(US_1),         NEO2_6,           NEO2_7,           NEO2_8,           NEO2_9,           NEO2_0,           NEO2_MINUS,
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // right hand side - thumb cluster
     KC_PGUP,          MO(FKEYS),        /* --- */
-    KC_PGDOWN,        /* --- */         /* --- */
+    KC_PGDN,          /* --- */         /* --- */
     NEO2_RMOD4,       KC_ENTER,         KC_SPACE
   ),
 
@@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [NEO_4] = LAYOUT_ergodox(
     // left hand side - main
     KC_NO /* NOOP */,   US_OSX_FEMININE_ORDINAL,  US_OSX_MASCULINE_ORDINAL, KC_NO /* NOOP */,     US_OSX_MIDDLE_DOT,  US_OSX_BRITISH_POUND, _______,
-    _______,            KC_PGUP,                  KC_BSPACE,                KC_UP,                KC_DELETE,          KC_PGDOWN,            _______,
+    _______,            KC_PGUP,                  KC_BSPC,                  KC_UP,                KC_DELETE,          KC_PGDN,              _______,
     _______,            KC_HOME,                  KC_LEFT,                  KC_DOWN,              KC_RIGHT,           KC_END,               /* --- */
     _______,            KC_ESCAPE,                KC_TAB,                   KC_INSERT,            KC_ENTER,           KC_NO /* NOOP */,     _______,
     _______,            _______,                  _______,                  _______,              _______,            /* --- */             /* --- */
@@ -363,7 +363,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [US_1] = LAYOUT_ergodox(
     // left hand side - main
     KC_EQUAL,         KC_1,         KC_2,       KC_3,       KC_4,       KC_5,       KC_ESCAPE,
-    KC_BSLASH,        KC_Q,         KC_W,       KC_E,       KC_R,       KC_T,       KC_NO /* NOOP */,
+    KC_BSLS,          KC_Q,         KC_W,       KC_E,       KC_R,       KC_T,       KC_NO /* NOOP */,
     KC_TAB,           KC_A,         KC_S,       KC_D,       KC_F,       KC_G,       /* --- */
     KC_LSHIFT,        KC_Z,         KC_X,       KC_C,       KC_V,       KC_B,       KC_NO /* NOOP */,
     KC_LGUI,          KC_GRAVE,     KC_NO,      KC_NO,      MO(FKEYS),  /* --- */   /* --- */
@@ -371,19 +371,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // left hand side - thumb cluster
     /* --- */         KC_LCTRL,     KC_LALT,
     /* --- */         /* --- */     KC_HOME,
-    KC_BSPACE,        KC_DELETE,    KC_END,
+    KC_BSPC,          KC_DELETE,    KC_END,
 
     // right hand side - main
     TO(NEO_1),        KC_6,         KC_7,       KC_8,       KC_9,       KC_0,       KC_MINUS,
     KC_LBRC,          KC_Y,         KC_U,       KC_I,       KC_O,       KC_P,       KC_RBRC,
-    /* --- */         KC_H,         KC_J,       KC_K,       KC_L,       KC_SCOLON,  KC_QUOTE,
+    /* --- */         KC_H,         KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOTE,
     KC_NO /* NOOP */, KC_N,         KC_M,       KC_COMMA,   KC_DOT,     KC_SLASH,   KC_RSHIFT,
     /* --- */         /* --- */     KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   KC_RGUI,
 
     // right hand side - thumb cluster
     KC_RALT,          KC_RCTRL,     /* --- */
     KC_PGUP,          /* --- */     /* --- */
-    KC_PGDOWN,        KC_ENTER,     KC_SPACE
+    KC_PGDN,          KC_ENTER,     KC_SPACE
   ),
 
   /* FKEYS: Function keys
@@ -486,7 +486,7 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
         if (command) {
           tap_code16(S(G(KC_4)));
         } else {
-          tap_code16(S(A(KC_BSLASH)));
+          tap_code16(S(A(KC_BACKSLASH)));
         }
         break;
       case NEO2_5:
@@ -494,7 +494,7 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
           tap_code16(S(G(KC_5)));
         } else {
           // left angled quote
-          tap_code16(A(KC_BSLASH));
+          tap_code16(A(KC_BACKSLASH));
         }
         break;
       case NEO2_6:
diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
index 552b97ff11..920850ebee 100644
--- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
@@ -31,20 +31,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	TG(1),     KC_1,       KC_2,       KC_3,       KC_4,  KC_5, LALT(KC_LSHIFT),
 	KC_TAB,    KC_QUOTE,   KC_COMMA,   KC_DOT,     KC_P,  KC_Y, TG(3),
 	KC_ESCAPE, KC_A,       KC_O,       KC_E,       KC_U,  KC_I,
-	KC_LSHIFT, KC_SCOLON,  KC_Q,       KC_J,       KC_K,  KC_X, TG(2),
+	KC_LSHIFT, KC_SCLN,    KC_Q,       KC_J,       KC_K,  KC_X, TG(2),
 	MO(3),     LCTL(KC_C), LCTL(KC_X), LCTL(KC_V), MO(2),
 	                                          KC_DELETE, KC_TRNS,
 	                                                     KC_LGUI,
-	                              KC_BSPACE,CTL_T(KC_NO),KC_LALT,
+	                                KC_BSPC,CTL_T(KC_NO),KC_LALT,
 
 	KC_TILD,   KC_6,    KC_7,        KC_8,        KC_9,      KC_0,     KC_EQUAL,
 	KC_TRNS,   KC_F,    KC_G,        KC_C,        KC_R,      KC_L,     KC_SLASH,
 	KC_D,      KC_H,    KC_T,        KC_N,        KC_S,      KC_MINUS,
 	KC_TRNS,   KC_B,    KC_M,        KC_W,        KC_V,      KC_Z,     KC_LSHIFT,
-	                    KC_LBRC,     KC_RBRC,     KC_BSLASH, KC_UNDO,  LCTL(KC_A),
+	                    KC_LBRC,     KC_RBRC,     KC_BSLS,   KC_UNDO,  LCTL(KC_A),
 	KC_END,    KC_HOME,
 	KC_PGUP,
-	KC_PGDOWN, KC_ENTER, KC_SPACE
+	KC_PGDN,   KC_ENTER, KC_SPACE
 ),
 
  /* Keymap 1: Hebrew layer
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
 	KC_TRNS, KC_Y,    KC_U,    KC_E,     KC_O,      KC_P,      KC_TRNS,
-	         KC_H,    KC_J,    KC_K,     KC_L,      KC_SCOLON, KC_TRNS,
+	         KC_H,    KC_J,    KC_K,     KC_L,      KC_SCLN,   KC_TRNS,
 	KC_TRNS, KC_N,    KC_M,    KC_COMMA, KC_DOT,    KC_I,      KC_TRNS,
                     KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
 	KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 500dea992c..411bdf8043 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNC] = LAYOUT_ortho_4x12(
   KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
   KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
-  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLASH,  KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
+  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
   _______,   _______, _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_ortho_4x12(
-  KC_GRV,     XXXXXXX, M_WORD_SEL, KC_LBRC,       KC_RBRC,       XXXXXXX,   XXXXXXX,       KC_PGUP,  KC_HOME,  KC_PGDOWN,  XXXXXXX,        KC_PSCREEN            ,
+  KC_GRV,     XXXXXXX, M_WORD_SEL, KC_LBRC,       KC_RBRC,       XXXXXXX,   XXXXXXX,       KC_PGUP,  KC_HOME,  KC_PGDN,    XXXXXXX,        KC_PSCR               ,
   KC_GRV,     XXXXXXX, XXXXXXX,    LSFT(KC_9),    LSFT(KC_0),    XXXXXXX,   XXXXXXX,       KC_HOME,  KC_UP,    KC_END,     XXXXXXX,        LCTL(LSFT(KC_EQL))    ,
   _______,    XXXXXXX, XXXXXXX,    LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX,   LCTL(KC_LEFT), KC_LEFT,  KC_DOWN,  KC_RIGHT,   LCTL(KC_RIGHT), LCTL(KC_MINS)         ,
   MO(_MOUSE), _______, _______,    _______,       _______,       KC_LALT,   KC_ENT,        _______,  XXXXXXX,  _______,    _______,        _______
diff --git a/layouts/community/ortho_5x12/333fred/keymap.c b/layouts/community/ortho_5x12/333fred/keymap.c
index e270b40893..4eaf35c47e 100644
--- a/layouts/community/ortho_5x12/333fred/keymap.c
+++ b/layouts/community/ortho_5x12/333fred/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = LAYOUT_ortho_5x12( \
     KC_GRV,        KC_1,         KC_2,  KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,   KC_0,            KC_MINUS, \
-    KC_TAB,        KC_Q,         KC_W,  KC_E,    KC_R,    KC_T,           KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,            KC_BSLASH, \
+    KC_TAB,        KC_Q,         KC_W,  KC_E,    KC_R,    KC_T,           KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,            KC_BSLS, \
     KC_ESC,        KC_A,         KC_S,  KC_D,    KC_F,    KC_G,           KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN,         KC_QUOT, \
     OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X,  KC_C,    KC_V,    KC_B,           KC_N,    KC_M,    KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \
     KC_LCTL,       KC_LALT,      KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC,  KC_ENT,  KC_LOCK, KC_EQL, KC_RALT,         KC_DEL \
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index f07b8cd196..ce01e15929 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -75,7 +75,7 @@
   "KC_ENT": "\u23ce",
   "KC_ESCAPE": "\u238b",
   "KC_ESC": "\u238b",
-  "KC_BSPACE": "\u232b",
+  "KC_BACKSPACE": "\u232b",
   "KC_BSPC": "\u232b",
   "KC_TAB": "\u21e5",
   "KC_SPACE": "",
@@ -89,8 +89,8 @@
   "KC_RIGHT_BRACKET": "}",
   "KC_RBRC": "]",
   "KC_BSLS": "\\",
-  "KC_BSLASH": "\\",
-  "KC_SCOLON": ":",
+  "KC_BACKSLASH": "\\",
+  "KC_SEMICOLON": ":",
   "KC_SCLN": ";",
   "KC_QUOTE": "\"",
   "KC_QUOT": "'",
@@ -126,7 +126,7 @@
   "KC_LSCR": "Locking Scroll Lock",
   "KC_INT4": "JIS Henkan",
   "KC_INT5": "JIS Muhenkan",
-  "KC_PSCREEN": "Print Screen",
+  "KC_PRINT_SCREEN": "Print Screen",
   "KC_PSCR": "Print Screen",
   "KC_SCROLL_LOCK": "Scroll Lock",
   "KC_SLCK": "Scroll Lock",
@@ -139,7 +139,7 @@
   "KC_DELETE": "\u2326",
   "KC_DEL": "\u2326",
   "KC_END": "End",
-  "KC_PGDOWN": "PgDn",
+  "KC_PAGE_DOWN": "PgDn",
   "KC_PGDN": "PgDn",
   "KC_RIGHT": "→",
   "KC_RGHT": "→",
diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h
index 2147b9370e..03dcfabc45 100644
--- a/quantum/keycode_legacy.h
+++ b/quantum/keycode_legacy.h
@@ -4,12 +4,6 @@
 
 // These keycode names have been deprecated
 
-#define KC_BSPACE         KC_BACKSPACE
-#define KC_BSLASH         KC_BACKSLASH
-#define KC_SCOLON         KC_SEMICOLON
-#define KC_PSCREEN        KC_PRINT_SCREEN
-#define KC_PGDOWN         KC_PAGE_DOWN
-
 #define KC_LCTRL          KC_LEFT_CTRL
 #define KC_LSHIFT         KC_LEFT_SHIFT
 #define KC_RCTRL          KC_RIGHT_CTRL
diff --git a/users/anderson/seq.c b/users/anderson/seq.c
index ff50648599..8e6edb35d3 100644
--- a/users/anderson/seq.c
+++ b/users/anderson/seq.c
@@ -11,7 +11,7 @@ void seq_start(void) {
 bool seq_feed(uint16_t keycode) {
     if (keycode == KC_ENTER) {
         for (int i = 0; i < buffer_size + 1; i++) {
-            tap_code(KC_BSPACE);
+            tap_code(KC_BACKSPACE);
         }
         for (int i = 0; i < seq_config_size; i++) {
             seq_t item = seq_config[i];
@@ -21,7 +21,7 @@ bool seq_feed(uint16_t keycode) {
         }
         buffer_size = 0;
         return false;
-    } else if (keycode == KC_BSPACE) {
+    } else if (keycode == KC_BACKSPACE) {
         if (buffer_size) {
             buffer_size--;
             tap_code(keycode);
diff --git a/users/arkag/arkag.c b/users/arkag/arkag.c
index 00abbf2ae3..fccae5ad6d 100644
--- a/users/arkag/arkag.c
+++ b/users/arkag/arkag.c
@@ -458,7 +458,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
 
-    case KC_BSPACE:
+    case KC_BACKSPACE:
       if (record->event.pressed) {
         state = active;
         velocikey_accelerate();
diff --git a/users/art/art.c b/users/art/art.c
index 151249ec3f..f96a5d6cfd 100644
--- a/users/art/art.c
+++ b/users/art/art.c
@@ -64,7 +64,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     //Checking all other non-backspace keys to clear the backspace buffer. This is to prevent the bug of deleting N chars sometime after using a macro
     switch (keycode) {
       case LT(COMBOS,KC_BSPC):
-      case KC_BSPACE:
+      case KC_BACKSPACE:
       case KC_DEL:
       case KC_LSFT:
       case KC_RSFT:
@@ -537,7 +537,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         bool shifted = get_mods() & MOD_MASK_SHIFT;
         clear_mods();
               
-        press_n_times(15, KC_BSPACE);
+        press_n_times(15, KC_BACKSPACE);
         send_string_with_translation("heckout ");
         char_to_bspace = 13;
         if (shifted) {
@@ -553,7 +553,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         bool shifted = get_mods() & MOD_MASK_SHIFT;
         clear_mods();
 
-        press_n_times(15, KC_BSPACE);
+        press_n_times(15, KC_BACKSPACE);
         send_string_with_translation("ommit ");
         char_to_bspace = 11;
         layer_off(GIT_C);
@@ -616,7 +616,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case G_RBASE:
       if (!record->event.pressed) {
-        press_n_times(18, KC_BSPACE);
+        press_n_times(18, KC_BACKSPACE);
         send_string_with_translation("base -i ");
         char_to_bspace = 14;
         layer_off(GIT_R);
@@ -624,7 +624,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case G_RVERT:
       if (!record->event.pressed) {
-        press_n_times(18, KC_BSPACE);
+        press_n_times(18, KC_BACKSPACE);
         send_string_with_translation("vert ");
         char_to_bspace = 11;
         layer_off(GIT_R);
@@ -635,7 +635,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         bool shifted = get_mods() & MOD_MASK_SHIFT;
         clear_mods();
 
-        press_n_times(18, KC_BSPACE);
+        press_n_times(18, KC_BACKSPACE);
         send_string_with_translation("set ");
         char_to_bspace = 10;
 
@@ -654,7 +654,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case G_SHOW:
       if (!record->event.pressed) {
-        press_n_times(16, KC_BSPACE);
+        press_n_times(16, KC_BACKSPACE);
         send_string_with_translation("how ");
         char_to_bspace = 9;
         layer_off(GIT_S);
@@ -665,7 +665,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         bool shifted = get_mods() & MOD_MASK_SHIFT;
         clear_mods();
 
-        press_n_times(16, KC_BSPACE);
+        press_n_times(16, KC_BACKSPACE);
         send_string_with_translation("tash ");
         char_to_bspace = 10;
 
@@ -681,7 +681,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;		
     case G_STAT:
       if (!record->event.pressed) {
-        press_n_times(16, KC_BSPACE);
+        press_n_times(16, KC_BACKSPACE);
         send_string_with_translation("tatus ");
         char_to_bspace = 11;
         layer_off(GIT_S);
diff --git a/users/art/funcs/string_funcs.c b/users/art/funcs/string_funcs.c
index d3a177a1b1..3cf35356e1 100644
--- a/users/art/funcs/string_funcs.c
+++ b/users/art/funcs/string_funcs.c
@@ -95,7 +95,7 @@ combo_t key_combos[] = {
   [ED_F10] = COMBO(combo_f10, KC_F10),
   [ED_F11] = COMBO(combo_f11, KC_F11),
   [ED_F12] = COMBO(combo_f12, KC_F12),
-  [ED_PSCREEN] = COMBO(combo_pscreen, KC_PSCREEN),
+  [ED_PSCREEN] = COMBO(combo_pscreen, KC_PRINT_SCREEN),
 
   [ED_CS_ENTER] = COMBO_ACTION(done_sm),
   #endif
@@ -169,7 +169,7 @@ bool handle_del_bspace(void) {
     layer_off(GIT_R);
     layer_off(GIT_S);
 
-    press_n_times(char_to_bspace, KC_BSPACE);
+    press_n_times(char_to_bspace, KC_BACKSPACE);
     char_to_bspace = 1;
     press_n_times(char_to_del, KC_DEL);
     char_to_del = 0;
diff --git a/users/danielo515/danielo515.c b/users/danielo515/danielo515.c
index f083650279..e7fb08f2eb 100644
--- a/users/danielo515/danielo515.c
+++ b/users/danielo515/danielo515.c
@@ -37,7 +37,7 @@ void matrix_scan_user(void) {
             }
         }
         // tripe delete!
-        SEQ_ONE_KEY(KC_BSPACE) { SEND_STRING(SS_TAP(X_BSPACE) SS_TAP(X_BSPACE) SS_TAP(X_BSPACE)); }
+        SEQ_ONE_KEY(KC_BACKSPACE) { SEND_STRING(SS_TAP(X_BSPACE) SS_TAP(X_BSPACE) SS_TAP(X_BSPACE)); }
         SEQ_TWO_KEYS(KC_P, KC_G) { SEND_STRING("ps -ef | grep "); }
         SEQ_TWO_KEYS(KC_J, KC_A) { SEND_STRING("() => {}" SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT)); }
         // this is a pain to type
diff --git a/users/danielo515/tap_dance.c b/users/danielo515/tap_dance.c
index 7ddb55c29d..0b7128ba81 100644
--- a/users/danielo515/tap_dance.c
+++ b/users/danielo515/tap_dance.c
@@ -75,7 +75,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     [_TD_F12] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_F12),
     [_TD_H_ENTER] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_ENT),
     [_TD_CLN] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLON),
-    [_TD_SLASH] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_BSLASH),
+    [_TD_SLASH] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_BACKSLASH),
     // OLD ONES
     [LEFT_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_LEFT, KC_HOME),
     [RGT_HOME] = ACTION_TAP_DANCE_DOUBLE_SAFE(KC_RGHT, KC_END),
diff --git a/users/dennytom/chording_engine/engine.part.1 b/users/dennytom/chording_engine/engine.part.1
index a2b39284f5..e4f1b260dc 100644
--- a/users/dennytom/chording_engine/engine.part.1
+++ b/users/dennytom/chording_engine/engine.part.1
@@ -91,10 +91,10 @@ bool handle_US_ANSI_shifted_keys(int16_t keycode, bool in) {
             regular_keycode = KC_RIGHT_BRACKET;
             break;
         case KC_PIPE:
-            regular_keycode = KC_BSLASH;
+            regular_keycode = KC_BACKSLASH;
             break;
         case KC_COLON:
-            regular_keycode = KC_SCOLON;
+            regular_keycode = KC_SEMICOLON;
             break;
         case KC_DOUBLE_QUOTE:
             regular_keycode = KC_QUOTE;
diff --git a/users/dennytom/chording_engine/tests/minunit.h b/users/dennytom/chording_engine/tests/minunit.h
index c7ddc9e444..d3f51bfb4f 100644
--- a/users/dennytom/chording_engine/tests/minunit.h
+++ b/users/dennytom/chording_engine/tests/minunit.h
@@ -117,9 +117,9 @@ enum keycodes {
     KC_RIGHT_CURLY_BRACE,
     KC_RIGHT_BRACKET,
     KC_PIPE,
-    KC_BSLASH,
+    KC_BACKSLASH,
     KC_COLON,
-    KC_SCOLON,
+    KC_SEMICOLON,
     KC_DOUBLE_QUOTE,
     KC_QUOTE,
     KC_LEFT_ANGLE_BRACKET,
diff --git a/users/edvorakjp/edvorakjp.h b/users/edvorakjp/edvorakjp.h
index 9d04eb744e..e3a94ca6a7 100644
--- a/users/edvorakjp/edvorakjp.h
+++ b/users/edvorakjp/edvorakjp.h
@@ -8,7 +8,7 @@
 // clang-format off
 #define __EDVORAKJP_BASE_L1__               KC_QUOTE,      KC_COMMA,               KC_DOT,           KC_Y,          KC_Q
 #define __EDVORAKJP_BASE_L2__                   KC_A,  LALT_T(KC_O),         LGUI_T(KC_E),   LCTL_T(KC_I),          KC_U
-#define __EDVORAKJP_BASE_L3__              KC_SCOLON,          KC_X,                 KC_C,           KC_V,          KC_Z
+#define __EDVORAKJP_BASE_L3__                KC_SCLN,          KC_X,                 KC_C,           KC_V,          KC_Z
 
 #define __EDVORAKJP_BASE_R1__                   KC_F,          KC_G,                 KC_R,           KC_W,          KC_P
 #define __EDVORAKJP_BASE_R2__                   KC_D,  RSFT_T(KC_T),         RGUI_T(KC_N),   RALT_T(KC_S),          KC_M
@@ -26,12 +26,12 @@
 #define __EDVORAKJP_BRACKET_L__  KC_LEFT_CURLY_BRACE,   KC_LBRC,            KC_LEFT_PAREN
 #define __EDVORAKJP_BRACKET_R__       KC_RIGHT_PAREN,   KC_RBRC, KC_RIGHT_CURLY_BRACE
 
-#define __EDVORAKJP_PAGE__                   KC_HOME,     KC_PGDOWN,              KC_PGUP,         KC_END
+#define __EDVORAKJP_PAGE__                   KC_HOME,       KC_PGDN,              KC_PGUP,         KC_END
 #define __EDVORAKJP_CURSOR__                 KC_LEFT,       KC_DOWN,                KC_UP,       KC_RIGHT
 
 #define LA_TAB  LALT_T(KC_TAB)
 #define LS_SPC  LSFT_T(KC_SPACE)
-#define RC_BSPC RCTL_T(KC_BSPACE)
+#define RC_BSPC RCTL_T(KC_BACKSPACE)
 #define RC_DEL  RCTL_T(KC_DELETE)
 #define RG_ENT  RGUI_T(KC_ENTER)
 
diff --git a/users/ericgebhart/edge_keys.h b/users/ericgebhart/edge_keys.h
index f37425322c..0b729fde6c 100644
--- a/users/ericgebhart/edge_keys.h
+++ b/users/ericgebhart/edge_keys.h
@@ -81,7 +81,7 @@
 #define LEFT0 KC_GRV
 #define LEFT1 KC_GRV
 #define LEFT2 KC_TAB
-#define LEFT3 KC_BSLASH
+#define LEFT3 KC_BSLS
 //#define LEFT3 KC_COLN
 
 #define LEFT0_BP DB_GRV
@@ -181,10 +181,10 @@
 // I do not use those pinky keys. I had useful things there but there
 // are better more useful ways than those pinkys.
 #define ___5_BOTTOM_LEFT___  ___X2___,  KC_INS,  KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLASH, ___X2___
+#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLS, ___X2___
 
 #define ___4_BOTTOM_LEFT___  LCTL(KC_V),  KC_INS,  KC_LEFT,   KC_RIGHT
-#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLASH, LCTL(KC_C)
+#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLS, LCTL(KC_C)
 
 // the bottom rows  for keyboards on bepo.
 // bepo on bepo - not enough space to go around....
diff --git a/users/gordon/gordon.h b/users/gordon/gordon.h
index 567e7343ec..c6bd6e10b5 100644
--- a/users/gordon/gordon.h
+++ b/users/gordon/gordon.h
@@ -16,7 +16,7 @@
 #define RSQUIGLY  KC_RBRC
 #define NUMLOCK   KC_NUM_LOCK
 #define CAPLOCK   KC_CAPS_LOCK
-#define BK_SLASH  KC_BSLASH
+#define BK_SLASH  KC_BACKSLASH
 #define ASTERSK   KC_KP_ASTERISK
 
 // Navigation
@@ -57,8 +57,8 @@
 #define NAV_E    LT(_NAV,KC_E)
 #define NUMPAD_D LT(_NUMPAD,KC_D)
 #define MOUSE_C  LT(_MOUSE,KC_C)
-#define SYMB_BSP LT(_SYMBOLS,KC_BSPACE)
-#define COL_MOUS LT(_MOUSE,KC_SCOLON)
+#define SYMB_BSP LT(_SYMBOLS,KC_BACKSPACE)
+#define COL_MOUS LT(_MOUSE,KC_SEMICOLON)
 #define SPAC_SYM LT(_SYMBOLS,KC_SPACE)
 #define SPAC_TXT LT(_TEXTNAV,KC_SPACE)
 
@@ -80,7 +80,7 @@
 #define ALT_SH_R MT(MOD_LSFT|MOD_LALT,KC_R)
 
 //MISC
-#define PRINTSCR KC_PSCREEN
+#define PRINTSCR KC_PRINT_SCREEN
 #define CALTDEL LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 
diff --git a/users/issmirnov/rows.h b/users/issmirnov/rows.h
index d15693f2b2..4774e0162c 100644
--- a/users/issmirnov/rows.h
+++ b/users/issmirnov/rows.h
@@ -26,7 +26,7 @@
 
 #define _________________SYMB_R1___________________        KC_ASTR , KC_EXLM , KC_PIPE     , KC_PERC     , KC_PLUS
 #define _________________SYMB_R2___________________        KC_HASH , KC_EQL  , KC_COLN     , KC_SCLN     , TAP_TOG_LAYER
-#define _________________SYMB_R3___________________        KC_AMPR , KC_QUES , KC_SLASH    , KC_BSLASH   , TG(_NUMP)
+#define _________________SYMB_R3___________________        KC_AMPR , KC_QUES , KC_SLASH    , KC_BSLS     , TG(_NUMP)
 
 
 #define _________________NUMP_L1___________________        KC_NO   , KC_NO         , LGUI(KC_UP)   , XXXXXXX             , XXXXXXX
@@ -42,7 +42,7 @@
 #define ______________OVERWATCH_L2_________________       KC_LCTL   , KC_A  , KC_S       , KC_D , KC_F , KC_P
 #define ______________OVERWATCH_L3_________________       KC_LSHIFT , KC_Z  , KC_X       , KC_C , KC_V , KC_GRAVE
 // Ergodox only has 5 keys on bottom row:
-#define ______________OVERWATCH_L4_________________       KC_LCTL   , KC_F9 , KC_PSCREEN , KC_H , KC_R
+#define ______________OVERWATCH_L4_________________       KC_LCTL   , KC_F9 , KC_PSCR , KC_H , KC_R
 
 
 
diff --git a/users/kuatsure/kuatsure.c b/users/kuatsure/kuatsure.c
index 88bf6790a4..84afcc9623 100644
--- a/users/kuatsure/kuatsure.c
+++ b/users/kuatsure/kuatsure.c
@@ -124,7 +124,7 @@ void matrix_scan_user(void) {
     }
 
     // TMUX - shift to last pane and zoom
-    SEQ_ONE_KEY(KC_SCOLON) {
+    SEQ_ONE_KEY(KC_SEMICOLON) {
       tmux_prefix();
       SEND_STRING(";");
       tmux_pane_zoom();
diff --git a/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h b/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
index 81bddca4cb..f5ab1631a7 100644
--- a/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
+++ b/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
@@ -44,7 +44,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_RPARN LSFT(KC_9) // )
 #define N_MINS KC_SLASH // -
 #define N_COLN LSFT(KC_DOT) // :
-#define N_HASH KC_BSLASH // #
+#define N_HASH KC_BACKSLASH // #
 #define N_DLR LSFT(KC_4) // $
 #define N_PIPE RALT(KC_NONUS_BACKSLASH) // |
 #define N_TILD RALT(KC_RBRC) // ~
@@ -52,14 +52,14 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_PLUS KC_RBRC // +
 #define N_PERC LSFT(KC_5) // %
 #define N_QUOT LSFT(KC_2) // "
-#define N_SING LSFT(KC_BSLASH) // '
+#define N_SING LSFT(KC_BACKSLASH) // '
 #define N_SEMI LSFT(KC_COMM) // ;
 #define N_EURO RALT(KC_E) // €
 #define N_AT RALT(KC_Q) // @
 #define N_Z KC_Y
 #define N_Y KC_Z
 #define N_AE KC_QUOTE // ä
-#define N_OE KC_SCOLON // ö
+#define N_OE KC_SCLN // ö
 #define N_UE KC_LBRC // ü
 #define N_MU RALT(KC_M) // µ
 #define N_SS KC_MINS // ß
diff --git a/users/rmw/rmw.h b/users/rmw/rmw.h
index 272a400c75..b4018d5570 100644
--- a/users/rmw/rmw.h
+++ b/users/rmw/rmw.h
@@ -48,7 +48,7 @@ enum user_custom_keycodes_universal {
 	   ,R_CUT     = LGUI(KC_X)
 	   ,R_COPY    = LGUI(KC_C)
 	   ,R_PASTE   = LGUI(KC_V)
-	   ,DEL_WRD   = LALT(KC_BSPACE)
+	   ,DEL_WRD   = LALT(KC_BACKSPACE)
 	   ,MVW_LEFT  = LALT(KC_LEFT) 
 	   ,MVW_RIGHT = LALT(KC_RIGHT)
 	   ,SELW_LEFT = LALT(S(KC_LEFT))
@@ -72,7 +72,7 @@ enum user_custom_keycodes_universal {
 	   ,R_CUT     = LCTL(KC_X)
 	   ,R_COPY    = LCTL(KC_C)
 	   ,R_PASTE   = LCTL(KC_V)
-	   ,DEL_WRD   = LALT(KC_BSPACE)
+	   ,DEL_WRD   = LALT(KC_BACKSPACE)
 	   ,MVW_LEFT  = LCTL(KC_LEFT) 
 	   ,MVW_RIGHT = LCTL(KC_RIGHT)
 	   ,SELW_LEFT = LCTL(S(KC_LEFT))
diff --git a/users/romus/romus.h b/users/romus/romus.h
index a72b78c138..05697034e4 100644
--- a/users/romus/romus.h
+++ b/users/romus/romus.h
@@ -183,7 +183,7 @@ enum {
  * |     |     |     |     |     |     ||     |     |     |     |     |     |
  * `------------------------------------------------------------------------' */
 #define ALTCHAR \
-    KC_GRV,	DBL_QUO,DBL_DQT,CUR_EUR,CUR_BPN,_______,_______,KC_HOME,KC_PGUP,KC_PSCREEN,		KC_BSLASH,	KC_SLSH, \
+    KC_GRV,	DBL_QUO,DBL_DQT,CUR_EUR,CUR_BPN,_______,_______,KC_HOME,KC_PGUP,KC_PSCR,		KC_BSLS,	KC_SLSH, \
     REDO,	DBL_ANG,DBL_PAR,DBL_SQR,DBL_BRC,KC_LALT,KC_INS,	KC_END, KC_PGDN,KC_SCRL,	CUR_BIT,	KC_MINUS, \
     UNDO,	CUT,    COPY,   PASTE,	EXIT,	KC_LSFT,_______,_______,_______,_______,		CUR_YEN,	KC_EQUAL,   \
     _______,_______,_______,_______,_______,_______,_______,DBL_SPC,_______,_______,		_______,	_______
diff --git a/users/scheiklp/koy_keys_on_quertz_de_latin1.h b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
index 0062803bd4..7c88eabd79 100644
--- a/users/scheiklp/koy_keys_on_quertz_de_latin1.h
+++ b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
@@ -37,7 +37,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_RPARN LSFT(KC_9) // )
 #define N_MINS KC_SLASH // -
 #define N_COLN LSFT(KC_DOT) // :
-#define N_HASH KC_BSLASH // #
+#define N_HASH KC_BACKSLASH // #
 #define N_DLR LSFT(KC_4) // $
 #define N_PIPE RALT(KC_NONUS_BACKSLASH) // |
 #define N_TILD RALT(KC_RBRC) // ~
@@ -45,14 +45,14 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_PLUS KC_RBRC // +
 #define N_PERC LSFT(KC_5) // %
 #define N_QUOT LSFT(KC_2) // "
-#define N_SING LSFT(KC_BSLASH) // '
+#define N_SING LSFT(KC_BACKSLASH) // '
 #define N_SEMI LSFT(KC_COMM) // ;
 #define N_EURO RALT(KC_E) // €
 #define N_AT RALT(KC_Q) // @
 #define N_Z KC_Y
 #define N_Y KC_Z
 #define N_AE KC_QUOTE // ä
-#define N_OE KC_SCOLON // ö
+#define N_OE KC_SCLN // ö
 #define N_UE KC_LBRC // ü
 #define N_MU RALT(KC_M) // µ
 #define N_SS KC_MINS // ß
diff --git a/users/txkyel/txkyel.c b/users/txkyel/txkyel.c
index b01a71bb81..6ae6f4f1f9 100644
--- a/users/txkyel/txkyel.c
+++ b/users/txkyel/txkyel.c
@@ -49,7 +49,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     [HC_LEFT]      = ACTION_TAP_HOLD_CTL(KC_LEFT),
     [HC_RGHT]      = ACTION_TAP_HOLD_CTL(KC_RGHT),
     [TH_ESC_TAB]   = ACTION_TAP_HOLD(KC_TAB, KC_ESC),
-    [TH_HOME_BSLS] = ACTION_TAP_HOLD(KC_BSLASH, KC_HOME),
+    [TH_HOME_BSLS] = ACTION_TAP_HOLD(KC_BACKSLASH, KC_HOME),
     [TH_HOME_BSLS] = ACTION_TAP_HOLD(KC_PIPE, KC_END),
     [TH_QUOT_GRV]  = ACTION_TAP_HOLD(KC_QUOT, KC_GRV),
 };
diff --git a/users/xulkal/custom_tap_dance.c b/users/xulkal/custom_tap_dance.c
index 2c5d145f1b..bcbfb577bb 100644
--- a/users/xulkal/custom_tap_dance.c
+++ b/users/xulkal/custom_tap_dance.c
@@ -6,7 +6,7 @@
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
   [COMM_QUOT]  = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_QUOT),
-  [BACKSPACE] = ACTION_TAP_DANCE_DOUBLE (KC_BSPACE, LCTL(KC_BSPACE)),
+  [BACKSPACE] = ACTION_TAP_DANCE_DOUBLE (KC_BACKSPACE, LCTL(KC_BACKSPACE)),
   [DELETE] = ACTION_TAP_DANCE_DOUBLE (KC_DELETE, LCTL(KC_DELETE))
 };
 
@@ -17,7 +17,7 @@ static uint16_t td_timer;
 
 const uint16_t PROGMEM td_keymaps[TD_MAX - TD_MIN][2] = {
     [TD_COMM - TD_MIN]  = { KC_COMM, KC_QUOT },
-    [TD_BSPC - TD_MIN]  = { KC_BSPACE, LCTL(KC_BSPACE) },
+    [TD_BSPC - TD_MIN]  = { KC_BACKSPACE, LCTL(KC_BACKSPACE) },
     [TD_DEL - TD_MIN]  = { KC_DELETE, LCTL(KC_DELETE) }
 };
 
diff --git a/users/zigotica/tapdances.c b/users/zigotica/tapdances.c
index 74bb1b605e..06015fc64d 100644
--- a/users/zigotica/tapdances.c
+++ b/users/zigotica/tapdances.c
@@ -27,7 +27,7 @@ void ios_media(qk_tap_dance_state_t *state, void *user_data) {
 
 qk_tap_dance_action_t tap_dance_actions[] = {
     [0] = ACTION_TAP_DANCE_FN(ios_media),
-    [1] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_SCOLON),
+    [1] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_SCLN),
     [2] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COLON),
     [3] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
     [4] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),

From 4a30ea6a18efcc122fd0b7b3626cc1602227e586 Mon Sep 17 00:00:00 2001
From: Duccio <ducciobreschi@gmail.com>
Date: Thu, 13 Oct 2022 20:43:03 +0200
Subject: [PATCH 631/959] Add Swoop keyboard (#18436)

---
 keyboards/bluebell/swoop/config.h             |  61 ++++++++++
 keyboards/bluebell/swoop/info.json            |  53 ++++++++
 .../bluebell/swoop/keymaps/default/keymap.c   |  42 +++++++
 .../bluebell/swoop/keymaps/kyek/config.h      |  18 +++
 .../bluebell/swoop/keymaps/kyek/keymap.c      | 114 ++++++++++++++++++
 .../bluebell/swoop/keymaps/kyek/rules.mk      |  15 +++
 keyboards/bluebell/swoop/readme.md            |  27 +++++
 keyboards/bluebell/swoop/rules.mk             |  18 +++
 keyboards/bluebell/swoop/swoop.c              |  16 +++
 keyboards/bluebell/swoop/swoop.h              |  36 ++++++
 10 files changed, 400 insertions(+)
 create mode 100644 keyboards/bluebell/swoop/config.h
 create mode 100644 keyboards/bluebell/swoop/info.json
 create mode 100644 keyboards/bluebell/swoop/keymaps/default/keymap.c
 create mode 100644 keyboards/bluebell/swoop/keymaps/kyek/config.h
 create mode 100644 keyboards/bluebell/swoop/keymaps/kyek/keymap.c
 create mode 100644 keyboards/bluebell/swoop/keymaps/kyek/rules.mk
 create mode 100644 keyboards/bluebell/swoop/readme.md
 create mode 100644 keyboards/bluebell/swoop/rules.mk
 create mode 100644 keyboards/bluebell/swoop/swoop.c
 create mode 100644 keyboards/bluebell/swoop/swoop.h

diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
new file mode 100644
index 0000000000..bc2ecfc651
--- /dev/null
+++ b/keyboards/bluebell/swoop/config.h
@@ -0,0 +1,61 @@
+/* Copyright 2022 James White <jamesmnw@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "config_common.h"
+
+
+// key matrix size (rows are doubled)
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 5
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
+#define MATRIX_COL_PINS { B1, F7, F6, F5, F4 }
+#define DIODE_DIRECTION COL2ROW
+
+// communication between sides
+#define SOFT_SERIAL_PIN D2
+#define EE_HANDS
+
+// encoders
+#define ENCODERS_PAD_A { B4 }
+#define ENCODERS_PAD_B { B5 }
+#define ENCODERS_PAD_A_RIGHT { B5 }
+#define ENCODERS_PAD_B_RIGHT { B4 }
+
+// OLED driver
+#ifdef OLED_DRIVER_ENABLE
+  #define OLED_DISPLAY_128X32
+  #define OLED_TIMEOUT 30000
+#endif
+
+// RGB underglow and per key
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+  #define RGBLIGHT_EFFECT_BREATHING
+  #define RGBLED_NUM 36
+  #define RGBLED_SPLIT \
+        { 18, 18 }
+  #define RGBLIGHT_SPLIT
+  #define RGBLIGHT_LIMIT_VAL 150
+  #define RGBLIGHT_HUE_STEP 10
+  #define RGBLIGHT_SAT_STEP 17
+  #define RGBLIGHT_VAL_STEP 17
+  #define RGBLIGHT_SLEEP
+#endif
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
new file mode 100644
index 0000000000..64a71e7cc1
--- /dev/null
+++ b/keyboards/bluebell/swoop/info.json
@@ -0,0 +1,53 @@
+{
+  "keyboard_name": "Swoop",
+  "url": "https://github.com/jimmerricks/swoop",
+  "maintainer": "jmnw",
+  "manufacturer": "jmnw",
+  "usb": {
+    "vid": "0x1804",
+    "pid": "0x3046",
+    "device_ver": "0x0001"
+  },
+  "layouts": {
+    "LAYOUT_split_3x5_3": {
+      "layout": [
+        {"label":"SW1",  "x":0, "y":0.375},
+        {"label":"SW2",  "x":1, "y":0.125},
+        {"label":"SW3",  "x":2, "y":0},
+        {"label":"SW4",  "x":3, "y":0.125},
+        {"label":"SW5",  "x":4, "y":0.25},
+        {"label":"SW19", "x":8, "y":0.25},
+        {"label":"SW20", "x":9, "y":0.125},
+        {"label":"SW21", "x":10, "y":0},
+        {"label":"SW22", "x":11, "y":0.125},
+        {"label":"SW23", "x":12, "y":0.375},
+        {"label":"SW6",  "x":0, "y":1.375},
+        {"label":"SW7",  "x":1, "y":1.125},
+        {"label":"SW8", "x":2, "y":1},
+        {"label":"SW9", "x":3, "y":1.125},
+        {"label":"SW10", "x":4, "y":1.25},
+        {"label":"SW24", "x":8, "y":1.25},
+        {"label":"SW25", "x":9,  "y":1.125},
+        {"label":"SW26", "x":10, "y":1},
+        {"label":"SW27", "x":11, "y":1.125},
+        {"label":"SW28", "x":12, "y":1.375},
+        {"label":"SW11", "x":0, "y":2.375},
+        {"label":"SW12", "x":1, "y":2.125},
+        {"label":"SW13", "x":2, "y":2},
+        {"label":"SW14", "x":3, "y":2.125},
+        {"label":"SW15", "x":4, "y":2.25},
+        {"label":"SW29", "x":8, "y":2.25},
+        {"label":"SW30", "x":9,  "y":2.125},
+        {"label":"SW31", "x":10, "y":2},
+        {"label":"SW32", "x":11, "y":2.125},
+        {"label":"SW33", "x":12, "y":2.375},
+        {"label":"SW16", "x":2.875, "y":3.25},
+        {"label":"SW17", "x":4, "y":3.375},
+        {"label":"SW28", "x":5.125, "y":3.625},
+        {"label":"SW34", "x":6.875, "y":3.625},
+        {"label":"SW35", "x":8, "y":3.375},
+        {"label":"SW36", "x":9.125, "y":3.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/bluebell/swoop/keymaps/default/keymap.c b/keyboards/bluebell/swoop/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6d66a749d5
--- /dev/null
+++ b/keyboards/bluebell/swoop/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2022 James White <jamesmnw@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a 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
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * QWERTY
+ * ,---------------------------------.     ,----------------------------------.
+ * |  Q  |   W  |   E  |   R  |   T  |     |   Y  |   U  |   I  |   O  |   P  |
+ * |-----+------+------+------+------|     |------+------+------+------+------|
+ * |  A  |   S  |   D  |   F  |   G  |     |   H  |   J  |   K  |   L  |   ;  |
+ * |-----+------+------+------+------|     ,------+------+------+------+------|
+ * |  Z  |   X  |   C  |   V  |   B  |     |   N  |   M  |   ,  |   .  |   /  |
+ * `------------+------+------+------|     |------+------+------+-------------'
+ *              | LCTL | BSpc | Esc  |     | Ent  | Spc  | LAlt |
+ *              `--------------------'     `--------------------'
+ */
+
+[_QWERTY] = LAYOUT_split_3x5_3(
+  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                   KC_LCTL, KC_BSPC, KC_ESC,      KC_ENT,  KC_SPC,  KC_LALT
+)
+};
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/config.h b/keyboards/bluebell/swoop/keymaps/kyek/config.h
new file mode 100644
index 0000000000..e48703e02d
--- /dev/null
+++ b/keyboards/bluebell/swoop/keymaps/kyek/config.h
@@ -0,0 +1,18 @@
+/* Copyright 2022 Duccio Breschi <ducciobreschi@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#define ONESHOT_TIMEOUT 1000
+#define COMBO_COUNT 2
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/keymap.c b/keyboards/bluebell/swoop/keymaps/kyek/keymap.c
new file mode 100644
index 0000000000..10fde34180
--- /dev/null
+++ b/keyboards/bluebell/swoop/keymaps/kyek/keymap.c
@@ -0,0 +1,114 @@
+/* Copyright 2022 Duccio Breschi <ducciobreschi@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap_italian.h"
+
+enum layers {
+    _BASE = 0,
+    _SYM1,
+    _EXT,
+    _FNC,
+    _SYM2,
+    _ACC,
+    _SET,
+};
+
+// Combo Layers
+enum combos {
+  ACC,
+  SET,
+};
+const uint16_t PROGMEM accent_combo[] = {KC_SPC, MO(_SYM1), COMBO_END};
+const uint16_t PROGMEM settings_combo[] = {MO(_EXT), SFT_T(KC_SPC), COMBO_END};
+combo_t key_combos[COMBO_COUNT] = {
+  [ACC] = COMBO(accent_combo, MO(_ACC)),
+  [SET] = COMBO(settings_combo, MO(_SET)),
+};
+// -----
+
+// Layer Aliases
+#define SYM1 MO(_SYM1)
+#define EXT MO(_EXT)
+#define FNC MO(_FNC)
+#define SYM2 MO(_SYM2)
+// #define ACC MO(_ACC)
+// #define SET MO(_SET)
+// Oneshot Aliases
+#define OS_CTL OSM(MOD_LCTL)
+#define OS_ALT OSM(MOD_LALT)
+#define OS_SFT OSM(MOD_LSFT)
+#define OS_GUI OSM(MOD_LGUI)
+#define OS_RALT OSM(MOD_RALT)
+// Other Aliases
+#define DEL_WORD LCTL(KC_BSPC)
+#define UNDO LCTL(KC_Z)
+#define COPY LCTL(KC_C)
+#define CUT LCTL(KC_X)
+#define PASTE LCTL(KC_V)
+#define BACKTICK RALT(KC_MINS)
+#define TILDE RALT(KC_EQL)
+#define CEGR RSA(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT_split_3x5_3(
+  IT_Q,   IT_W,    IT_E,    IT_R,    IT_T,        IT_Y,    IT_U,    IT_I,    IT_O,    IT_P,
+  IT_A,   IT_S,    IT_D,    IT_F,    IT_G,        IT_H,    IT_J,    IT_K,    IT_L,    IT_OGRV,
+  IT_Z,   IT_X,    IT_C,    IT_V,    IT_B,        IT_N,    IT_M,    IT_COMM, IT_DOT,  IT_UGRV,
+                   XXXXXXX, EXT, SFT_T(KC_SPC),      KC_SPC,  SYM1,  XXXXXXX
+),
+[_SYM1] = LAYOUT_split_3x5_3(
+  IT_1,   IT_2,    IT_3,    IT_4,    IT_5,        IT_6,    IT_7,    IT_8,    IT_9,    IT_0,
+  IT_LABK,   IT_PERC,    IT_LPRN,    IT_LCBR,    IT_LBRC,        IT_EQL,    IT_QUES,    IT_QUOT,    IT_PLUS,    IT_ASTR,
+  IT_RABK,   IT_DLR,    IT_RPRN,    IT_RCBR,    IT_RBRC,        IT_AT,    IT_EXLM,    IT_DQUO, IT_MINS,  IT_SLSH,
+                   XXXXXXX, FNC, SYM2,          _______,  _______,  XXXXXXX
+),
+[_EXT] = LAYOUT_split_3x5_3(
+  KC_ESC, _______, _______, _______, _______,        KC_PAGE_UP, KC_HOME, KC_UP, KC_END, KC_CAPS,
+  OS_ALT, OS_GUI, OS_SFT, OS_CTL, OS_RALT,        KC_PAGE_DOWN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DELETE,
+  UNDO, CUT, COPY, KC_TAB, PASTE,                 DEL_WORD, KC_BSPC, _______, _______, _______, 
+                    _______, _______, _______,        KC_ENT, FNC, _______
+),
+[_FNC] = LAYOUT_split_3x5_3(
+  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,        KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, 
+  OS_ALT, OS_GUI, OS_SFT, OS_CTL, OS_RALT,           KC_F11, KC_F12, KC_PSCR, _______, _______, 
+  _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,  
+                    _______, _______, _______,        _______, _______, _______
+),
+[_SYM2] = LAYOUT_split_3x5_3(
+  IT_CIRC, IT_UNDS, IT_PND, IT_EURO, IT_HASH,        _______, _______, _______, _______, _______, 
+  BACKTICK, TILDE, IT_BSLS, IT_PIPE, IT_AMPR,        _______, _______, _______, _______, _______, 
+  _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,  
+                    _______, _______, _______,        _______, _______, _______
+),
+[_ACC] = LAYOUT_split_3x5_3(
+  _______, _______, _______, CEGR, _______,        _______, _______, _______, _______, _______, 
+  IT_AGRV, IT_IGRV, IT_OGRV, IT_EGRV, IT_EACU,        _______, _______, _______, _______, _______, 
+  _______, _______, _______, IT_UGRV, _______,        _______, _______, _______, _______, _______,  
+                    _______, _______, _______,        _______, _______, _______
+),
+[_SET] = LAYOUT_split_3x5_3(
+  _______, _______, _______, RGB_RMOD, RGB_MOD,        RGB_VAI, RGB_VAD, _______, _______, _______, 
+  _______, _______, _______, RGB_M_B, RGB_M_P,        RGB_HUI, RGB_HUD, _______, _______, _______, 
+  QK_BOOT, _______, _______, RGB_M_R, RGB_TOG,        RGB_SAI, RGB_SAD, _______, _______, QK_BOOT,  
+                    _______, _______, _______,        _______, _______, _______
+),
+// [_TEMP] = LAYOUT_split_3x5_3(
+//   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, 
+//   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, 
+//   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,  
+//                     _______, _______, _______,        _______, _______, _______
+// ),
+};
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/rules.mk b/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
new file mode 100644
index 0000000000..6b5678dd27
--- /dev/null
+++ b/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
@@ -0,0 +1,15 @@
+# Enables Link Time Optimization (LTO) when compiling the keyboard. This makes the process take longer,
+# but it can significantly reduce the compiled size (and since the firmware is small, the added time is not noticeable).
+LTO_ENABLE = no
+
+# Audio control and System control
+EXTRAKEY_ENABLE = no
+
+# ENCODER_ENABLE = no
+# OLED_DRIVER_ENABLE = no
+# WPM_ENABLE = no
+
+# Enable keyboard underlight functionality
+RGBLIGHT_ENABLE = yes
+
+COMBO_ENABLE = yes
diff --git a/keyboards/bluebell/swoop/readme.md b/keyboards/bluebell/swoop/readme.md
new file mode 100644
index 0000000000..fa71156edc
--- /dev/null
+++ b/keyboards/bluebell/swoop/readme.md
@@ -0,0 +1,27 @@
+# Swoop
+
+![Swoop](https://i.imgur.com/mMlmEsdh.jpg)
+
+*The Swoop is an open source split keyboard based on the Ferris/Sweep.*
+
+* Keyboard Maintainer: [Jimmerricks](https://github.com/jimmerricks)
+* Hardware Supported: *Swoop MX, Swoop LP + Pro-micro or equivalent*
+* Hardware Availability: [*Swoop Repository*](https://github.com/jimmerricks/swoop)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bluebell/swoop:default
+
+Flashing example for this keyboard:
+
+    make bluebell/swoop:default:avrdude-split-right
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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
+
+Entering the bootloader:
+
+<!-- * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -->
+* **Physical reset button**: Briefly press the small button on the inner side of the PCB - you 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/bluebell/swoop/rules.mk b/keyboards/bluebell/swoop/rules.mk
new file mode 100644
index 0000000000..c39923dfab
--- /dev/null
+++ b/keyboards/bluebell/swoop/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+SPLIT_KEYBOARD = yes
+
+LAYOUTS = split_3x5_3
diff --git a/keyboards/bluebell/swoop/swoop.c b/keyboards/bluebell/swoop/swoop.c
new file mode 100644
index 0000000000..a373b48c47
--- /dev/null
+++ b/keyboards/bluebell/swoop/swoop.c
@@ -0,0 +1,16 @@
+/* Copyright 2022 James White <jamesmnw@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "swoop.h"
diff --git a/keyboards/bluebell/swoop/swoop.h b/keyboards/bluebell/swoop/swoop.h
new file mode 100644
index 0000000000..4160f3af8a
--- /dev/null
+++ b/keyboards/bluebell/swoop/swoop.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 James White <jamesmnw@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_split_3x5_3( \
+    L00, L01, L02, L03, L04,          R00, R01, R02, R03, R04, \
+    L10, L11, L12, L13, L14,          R10, R11, R12, R13, R14, \
+    L20, L21, L22, L23, L24,          R20, R21, R22, R23, R24, \
+              L30, L31, L32,          R30, R31, R32 \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04 }, \
+        { L10, L11, L12, L13, L14 }, \
+        { L20, L21, L22, L23, L24 }, \
+        { ___, ___, L30, L31, L32 }, \
+        { R04, R03, R02, R01, R00 }, \
+        { R14, R13, R12, R11, R10 }, \
+        { R24, R23, R22, R21, R20 }, \
+        { ___, ___, R32, R31, R30 } \
+    }

From 2762b458fc0eda29bdb4b583962956a4732855c7 Mon Sep 17 00:00:00 2001
From: Kevin Boss <kevin.boss@outlook.com>
Date: Thu, 13 Oct 2022 20:56:24 +0200
Subject: [PATCH 632/959] Add momoka ergo via support (#18678)

---
 keyboards/momoka_ergo/info.json             | 10 +--
 keyboards/momoka_ergo/keymaps/via/keymap.c  | 70 +++++++++++++++++++++
 keyboards/momoka_ergo/keymaps/via/readme.md |  1 +
 keyboards/momoka_ergo/keymaps/via/rules.mk  |  2 +
 4 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 keyboards/momoka_ergo/keymaps/via/keymap.c
 create mode 100644 keyboards/momoka_ergo/keymaps/via/readme.md
 create mode 100644 keyboards/momoka_ergo/keymaps/via/rules.mk

diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
index c4d6cf38d7..67603d505e 100644
--- a/keyboards/momoka_ergo/info.json
+++ b/keyboards/momoka_ergo/info.json
@@ -1,11 +1,11 @@
 {
-    "keyboard_name": "Momoka Ergo", 
+    "keyboard_name": "Momoka Ergo",
     "manufacturer": "StefanGrindelwald",
-    "url": "", 
-    "maintainer": "StefanGrindelwald", 
+    "url": "",
+    "maintainer": "StefanGrindelwald",
     "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
+        "vid": "0x4F4D",
+        "pid": "0x0001",
         "device_version": "0.0.1"
     },
     "layouts": {
diff --git a/keyboards/momoka_ergo/keymaps/via/keymap.c b/keyboards/momoka_ergo/keymaps/via/keymap.c
new file mode 100644
index 0000000000..707a2f1f49
--- /dev/null
+++ b/keyboards/momoka_ergo/keymaps/via/keymap.c
@@ -0,0 +1,70 @@
+/* Copyright 2022 Kevin Boss <kevin.boss@outlook.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_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,
+        MO(_FN1), KC_GRV,  KC_EQL,  KC_LEFT, KC_RGHT,                                                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, MO(_FN1),
+                                                               KC_LCTL, KC_LALT,    KC_RGUI, KC_RCTL,
+                                                                        KC_HOME,    KC_PGUP,
+                                                      KC_BSPC, KC_DEL,  KC_END,     KC_PGDN, KC_ENT,  KC_SPC
+    ),
+    [_FN1] = LAYOUT(
+        RESET,    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,
+        MO(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, MO(_FN2),
+        KC_TRNS,  KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,                                                          RGB_VAI, RGB_VAD,  RGB_SAI, RGB_SAD, KC_TRNS,
+                                                               KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS,
+                                                                        KC_TRNS,    RGB_HUI,
+                                                      KC_TRNS, KC_TRNS, KC_TRNS,    RGB_HUD, KC_TRNS, KC_TRNS
+    ),
+    [_FN2] = LAYOUT(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                          KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,
+        KC_TRNS, KC_TRNS, KC_TRNS, 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, QK_BOOT,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,                                                          RGB_VAI, RGB_VAD,  RGB_SAI, RGB_SAD, KC_TRNS,
+                                                              KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS,
+                                                                       KC_TRNS,    RGB_HUI,
+                                                     KC_TRNS, KC_TRNS, KC_TRNS,    RGB_HUD, KC_TRNS, KC_TRNS
+    ),
+    [_FN3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                                              KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS,
+                                                                       KC_TRNS,    KC_TRNS,
+                                                     KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
diff --git a/keyboards/momoka_ergo/keymaps/via/readme.md b/keyboards/momoka_ergo/keymaps/via/readme.md
new file mode 100644
index 0000000000..390149d6bb
--- /dev/null
+++ b/keyboards/momoka_ergo/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for momoka_ergo
diff --git a/keyboards/momoka_ergo/keymaps/via/rules.mk b/keyboards/momoka_ergo/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/momoka_ergo/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From a3f9992cc97a49944b92e02268db179266842125 Mon Sep 17 00:00:00 2001
From: Paula Isabel <102936794+paulaxisabel@users.noreply.github.com>
Date: Fri, 14 Oct 2022 03:02:15 +0800
Subject: [PATCH 633/959] docs: fix typos (#18671)

---
 docs/tap_hold.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/tap_hold.md b/docs/tap_hold.md
index 601aef0493..c8b708e2c9 100644
--- a/docs/tap_hold.md
+++ b/docs/tap_hold.md
@@ -16,7 +16,7 @@ You can set the global time for this by adding the following setting to your `co
 #define TAPPING_TERM 200
 ```
 
-This setting is defined in milliseconds, and does default to 200ms.  This is a good average for a majority of people.
+This setting is defined in milliseconds and defaults to 200ms.  This is a good average for the majority of people.
 
 For more granular control of this feature, you can add the following to your `config.h`:
 ```c
@@ -50,7 +50,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 
 Set the tapping term as usual with `#define TAPPING_TERM <value>` in `config.h` and add `DYNAMIC_TAPPING_TERM_ENABLE = yes` in `rules.mk`. Then, place the above three keys somewhere in your keymap and flash the new firmware onto your board.
 
-Now, you can try using your dual-role keys, such as layer-taps and mod-taps, and use `DT_DOWN` and `DT_UP` to adjust the tapping term immediately. If you find that you frequently trigger the modifier of your mod-tap(s) by accident for example, that's a sign that your tapping term may be too low so tap `DT_UP` a few times to increase the tapping term until that no longer happens. On the flip side, if you get superfluous characters when you actually intended to momentarily activate a layer, tap `DT_DOWN` to lower the tapping term. Do note that these keys affect the *global* tapping term, you cannot change the tapping term of a specific key on the fly.
+Now, you can try using your dual-role keys, such as layer-taps and mod-taps, and use `DT_DOWN` and `DT_UP` to adjust the tapping term immediately. If you find that you frequently trigger the modifier of your mod-tap(s) by accident, for example, that's a sign that your tapping term may be too low so tap `DT_UP` a few times to increase the tapping term until that no longer happens. On the flip side, if you get superfluous characters when you actually intended to momentarily activate a layer, tap `DT_DOWN` to lower the tapping term. Do note that these keys affect the *global* tapping term, you cannot change the tapping term of a specific key on the fly.
 
 Once you're satisfied with the current tapping term value, open `config.h` and replace whatever value you first wrote for the tapping term by the output of the `DT_PRNT` key.
 
@@ -97,7 +97,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 In order for this feature to be effective if you use per-key tapping terms, you need to make a few changes to the syntax of the `get_tapping_term` function. All you need to do is replace every occurrence of `TAPPING_TERM` in the `get_tapping_term` function by lowercase `g_tapping_term`. If you don't do that, you will still see the value typed by `DT_PRNT` go up and down as you configure the tapping term on the fly but you won't feel those changes as they don't get applied. If you can go as low as 10ms and still easily trigger the tap function of a dual-role key, that's a sign that you forgot to make the necessary changes to your `get_tapping_term` function.
 
-For instance, here's how the example `get_tapping_term` shown earlier should look like after the transformation:
+For instance, here's how the example `get_tapping_term` shown earlier should look after the transformation:
 
 ```c
 uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
@@ -112,7 +112,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
-The reason being that `TAPPING_TERM` is a macro that expands to a constant integer and thus cannot be changed at runtime whereas `g_tapping_term` is a variable whose value can be changed at runtime. If you want, you can temporarily enable `DYNAMIC_TAPPING_TERM_ENABLE` to find a suitable tapping term value and then disable that feature and revert back to using the classic syntax for per-key tapping term settings. In case you need to access the tapping term from elsewhere in your code, you can use the `GET_TAPPING_TERM(keycode, record)` macro. This macro will expand to whatever is the appropriate access pattern given the current configuration.
+The reason is that `TAPPING_TERM` is a macro that expands to a constant integer and thus cannot be changed at runtime whereas `g_tapping_term` is a variable whose value can be changed at runtime. If you want, you can temporarily enable `DYNAMIC_TAPPING_TERM_ENABLE` to find a suitable tapping term value and then disable that feature and revert back to using the classic syntax for per-key tapping term settings. In case you need to access the tapping term from elsewhere in your code, you can use the `GET_TAPPING_TERM(keycode, record)` macro. This macro will expand to whatever is the appropriate access pattern given the current configuration.
 
 ## Tap-Or-Hold Decision Modes
 
@@ -174,7 +174,7 @@ Example sequence 3 (Mod Tap):
   |       +--------------+    |        |
   +---------------------------|--------+
 ```
-Based previous examples, you might have expected the output of the above sequence to be `KC_A` `KC_X`
+Based on previous examples, you might have expected the output of the above sequence to be `KC_A` `KC_X`
 since `SFT_T(KC_A)` is NOT held longer than the `TAPPING_TERM`.
 However, the actual output would be capital `X` (`SHIFT` + `x`) due to reasons
 explained under [Ignore Mod Tap Interrupt](#ignore-mod-tap-interrupt).
@@ -193,7 +193,7 @@ This makes tap and hold keys (like Layer Tap) work better for fast typists, or f
 
 If you press a dual-role key, tap another key (press and release) and then release the dual-role key, all within the tapping term, by default the dual-role key will perform its tap action.  If the `PERMISSIVE_HOLD` option is enabled, the dual-role key will perform its hold action instead.
 
-An example of a sequence which is affected by the “permissive hold” mode:
+An example of a sequence that is affected by the “permissive hold” mode:
 
 - `LT(2, KC_A)` Down
 - `KC_L` Down (the `L` key is also mapped to `KC_RGHT` on layer 2)
@@ -270,7 +270,7 @@ This mode makes tap and hold keys (like Layer Tap) work better for fast typists,
 
 If you press a dual-role key, press another key, and then release the dual-role key, all within the tapping term, by default the dual-role key will perform its tap action.  If the `HOLD_ON_OTHER_KEY_PRESS` option is enabled, the dual-role key will perform its hold action instead.
 
-An example of a sequence which is affected by the “hold on other key press” mode, but not by the “permissive hold” mode:
+An example of a sequence that is affected by the “hold on other key press” mode, but not by the “permissive hold” mode:
 
 - `LT(2, KC_A)` Down
 - `KC_L` Down (the `L` key is also mapped to `KC_RGHT` on layer 2)
@@ -325,11 +325,11 @@ To enable this setting, add this to your `config.h`:
 
 ?> This option affects only the Mod Tap keys; it does not affect other dual-role keys such as Layer Tap.
 
-By default the tap-or-hold decision for Mod Tap keys strongly prefers the hold action.  If you press a Mod Tap key, then press another key while still holding the Mod Tap key down, the Mod Tap press will be handled as a modifier hold even if the Mod Tap key is then released within the tapping term, and irrespective of the order in which those keys are released.  Using options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` will not affect the functionality of Mod Tap keys in a major way (these options would still affect the delay until the common code for dual-role keys finishes its tap-or-hold decision, but then the special code for Mod Tap keys will override the result of that decision and choose the hold action if another key was pressed).  In fact, by default the tap-or-hold decision for Mod Tap keys is done in the same way as if the `HOLD_ON_OTHER_KEY_PRESS` option was enabled, but without the decreased delay provided by `HOLD_ON_OTHER_KEY_PRESS`.
+By default, the tap-or-hold decision for Mod Tap keys strongly prefers the hold action.  If you press a Mod Tap key, then press another key while still holding the Mod Tap key down, the Mod Tap press will be handled as a modifier hold even if the Mod Tap key is then released within the tapping term, and irrespective of the order in which those keys are released.  Using options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` will not affect the functionality of Mod Tap keys in a major way (these options would still affect the delay until the common code for dual-role keys finishes its tap-or-hold decision, but then the special code for Mod Tap keys will override the result of that decision and choose the hold action if another key was pressed).  In fact, by default, the tap-or-hold decision for Mod Tap keys is done in the same way as if the `HOLD_ON_OTHER_KEY_PRESS` option was enabled, but without the decreased delay provided by `HOLD_ON_OTHER_KEY_PRESS`.
 
 If the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, Mod Tap keys are no longer treated as a special case, and their behavior will match the behavior of other dual-role keys such as Layer Tap.  Then the behavior of Mod Tap keys can be further tuned using other options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS`.
 
-An example of a sequence which will be affected by the `IGNORE_MOD_TAP_INTERRUPT` option (assuming that options like `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` are not enabled):
+An example of a sequence that will be affected by the `IGNORE_MOD_TAP_INTERRUPT` option (assuming that options like `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` are not enabled):
 
 - `SFT_T(KC_A)` Down
 - `KC_X` Down
@@ -350,7 +350,7 @@ An example of a sequence which will be affected by the `IGNORE_MOD_TAP_INTERRUPT
 
 Normally, this would send a capital `X` (`SHIFT`+`x`), even if the sequence is performed faster than the `TAPPING_TERM`.  However, if the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, the `SFT_T(KC_A)` key must be held longer than the `TAPPING_TERM` to register the hold action.  A quick tap will output `ax` in this case, while a hold will still output a capital `X` (`SHIFT`+`x`).
 
-However, if the `HOLD_ON_OTHER_KEY_PRESS` option is enabled in addition to `IGNORE_MOD_TAP_INTERRUPT`, the above sequence will again send a capital `X` (`SHIFT`+`x`) even if performed faster that the `TAPPING_TERM`.  The difference from the default configuration is that by default the host will receive the key events only after the `SFT_T(KC_A)` key is released, but with the `HOLD_ON_OTHER_KEY_PRESS` option the host will start receiving key events when the `KC_X` key is pressed.
+However, if the `HOLD_ON_OTHER_KEY_PRESS` option is enabled in addition to `IGNORE_MOD_TAP_INTERRUPT`, the above sequence will again send a capital `X` (`SHIFT`+`x`) even if performed faster than the `TAPPING_TERM`.  The difference from the default configuration is that by default the host will receive the key events only after the `SFT_T(KC_A)` key is released, but with the `HOLD_ON_OTHER_KEY_PRESS` option, the host will start receiving key events when the `KC_X` key is pressed.
 
 For more granular control of this feature, you can add the following to your `config.h`:
 
@@ -393,7 +393,7 @@ Example:
 - wait until the tapping term expires...
 - `SFT_T(KC_A)` Up
 
-With default settings, `a` will be sent on the first release, then `a` will be sent on the second press allowing the computer to trigger its auto repeat function.
+With default settings, `a` will be sent on the first release, then `a` will be sent on the second press allowing the computer to trigger its auto-repeat function.
 
 With `TAPPING_FORCE_HOLD`, the second press will be interpreted as a Shift, allowing to use it as a modifier shortly after having used it as a tap.
 
@@ -426,7 +426,7 @@ To enable `retro tapping`, add the following to your `config.h`:
 #define RETRO_TAPPING
 ```
 
-Holding and releasing a dual function key without pressing another key will result in nothing happening. With retro tapping enabled, releasing the key without pressing another will send the original keycode even if it is outside the tapping term.
+Holding and releasing a dual-function key without pressing another key will result in nothing happening. With retro tapping enabled, releasing the key without pressing another will send the original keycode even if it is outside the tapping term.
 
 For instance, holding and releasing `LT(2, KC_SPC)` without hitting another key will result in nothing happening. With this enabled, it will send `KC_SPC` instead.
 
@@ -469,8 +469,8 @@ bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
 
 One thing that you may notice is that we include the key record for all of the "per key" functions, and may be wondering why we do that.
 
-Well, it's simple really: customization.  But specifically, it depends on how your keyboard is wired up.  For instance, if each row is actually using a row in the keyboard's matrix, then it may be simpler to use `if (record->event.row == 3)` instead of checking a whole bunch of keycodes.  Which is especially good for those people using the Tap Hold type keys on the home row. So you could fine tune those to not interfere with your normal typing.
+Well, it's simple really: customization.  But specifically, it depends on how your keyboard is wired up.  For instance, if each row is actually using a row in the keyboard's matrix, then it may be simpler to use `if (record->event.row == 3)` instead of checking a whole bunch of keycodes.  Which is especially good for those people using the Tap Hold type keys on the home row. So you could fine-tune those to not interfere with your normal typing.
 
-## Why is there no `*_kb` or `*_user` functions?!
+## Why are there no `*_kb` or `*_user` functions?!
 
-Unlike many of the other functions here, there isn't a need (or even reason) to have a quantum or keyboard level function. Only user level functions are useful here, so no need to mark them as such.
+Unlike many of the other functions here, there isn't a need (or even reason) to have a quantum or keyboard-level function. Only user-level functions are useful here, so no need to mark them as such.

From 17f679ea2a64f4eb21f1d53cd2d3103f55b3a0a3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 13 Oct 2022 20:31:58 +0100
Subject: [PATCH 634/959] Fix aurora/sweep (#18701)

---
 keyboards/splitkb/aurora/sweep/rev1/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index e7b603b575..98bdc4b14d 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -29,7 +29,7 @@
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define SPLIT_TRANSPORT_MIRROR
 #endif

From ca7cfff7c5ffd12a04ed0eaa3c0fc8151bcb8621 Mon Sep 17 00:00:00 2001
From: arnstadm <45672752+arnstadm@users.noreply.github.com>
Date: Thu, 13 Oct 2022 21:34:35 +0200
Subject: [PATCH 635/959] add akb/vero (#18652)

---
 keyboards/akb/vero/config.h                 | 23 +++++
 keyboards/akb/vero/info.json                | 98 +++++++++++++++++++++
 keyboards/akb/vero/keymaps/default/keymap.c | 47 ++++++++++
 keyboards/akb/vero/keymaps/via/keymap.c     | 47 ++++++++++
 keyboards/akb/vero/keymaps/via/rules.mk     |  1 +
 keyboards/akb/vero/mcuconf.h                | 20 +++++
 keyboards/akb/vero/readme.md                | 27 ++++++
 keyboards/akb/vero/rules.mk                 |  1 +
 8 files changed, 264 insertions(+)
 create mode 100644 keyboards/akb/vero/config.h
 create mode 100644 keyboards/akb/vero/info.json
 create mode 100644 keyboards/akb/vero/keymaps/default/keymap.c
 create mode 100644 keyboards/akb/vero/keymaps/via/keymap.c
 create mode 100644 keyboards/akb/vero/keymaps/via/rules.mk
 create mode 100644 keyboards/akb/vero/mcuconf.h
 create mode 100644 keyboards/akb/vero/readme.md
 create mode 100644 keyboards/akb/vero/rules.mk

diff --git a/keyboards/akb/vero/config.h b/keyboards/akb/vero/config.h
new file mode 100644
index 0000000000..bb6d15d92c
--- /dev/null
+++ b/keyboards/akb/vero/config.h
@@ -0,0 +1,23 @@
+// Copyright 2022 Martin Arnstad (@arnstadm)
+// 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
+
+/* Set HSE clock since it differs from F411 default */
+#define STM32_HSECLK 16000000
diff --git a/keyboards/akb/vero/info.json b/keyboards/akb/vero/info.json
new file mode 100644
index 0000000000..39f5422b53
--- /dev/null
+++ b/keyboards/akb/vero/info.json
@@ -0,0 +1,98 @@
+{
+    "manufacturer": "AKB",
+    "keyboard_name": "Vero",
+    "maintainer": "arnstadm",
+    "bootloader": "stm32-dfu",
+    "board": "GENERIC_STM32_F411XE",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A13", "B3", "A15", "A14", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "B7", "B6", "B5"],
+        "rows": ["B15", "B4", "A0", "B13", "B14"]
+    },
+    "indicators": {
+        "caps_lock": "B1"
+    },
+    "processor": "STM32F411",
+    "url": "https://www.antipode.no/products/akb-vero",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5645",
+        "vid": "0x4150"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+                { "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+                { "matrix": [4, 5], "w": 3.0, "x": 4.0, "y": 4.0 },
+                { "matrix": [4, 7], "w": 3.0, "x": 7.0, "y": 4.0 },
+                { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
+                { "matrix": [4, 11], "x": 11.5, "y": 4.0 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/akb/vero/keymaps/default/keymap.c b/keyboards/akb/vero/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d73d4085a7
--- /dev/null
+++ b/keyboards/akb/vero/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+// Copyright 2022 Martin Arnstad (@arnstadm)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Bspc│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Ctrl │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│MO1│
+     * └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
+     *       │Alt│ GUI │                           │ GUI │Alt│
+     *       └───┴─────┴───────────────────────────┴─────┴───┘
+     */
+    [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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                          KC_LALT, KC_LGUI,          KC_SPC,  KC_SPC,                             KC_RGUI, KC_RALT
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Pwr│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Ins│Del│
+     * ├───┴─┬─┴───┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴───┘
+     * │Caps │ Q │ W │ E │ R │ T │ Y │ U │PSc│Scr│Pse│ ↑ │ ] │ Bspc│
+     * └─────┘┌───┬───┬───┐──┴┬──┴┌───┬──┴┬──┴┬──┴┬──┴┬──┴┬────────┐
+     * │ Ctrl │Vl-│Vl+│Mut│ F │ G │ * │ / │Hom│PgU│ ← │ → │  Enter │
+     * ├──────└───┴───┴───┘─┬─┴─┬─└─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ + │ - │End│PgD│ ↓ │ Shift│MO1│
+     * └─────┬──┴┬──┴──┬┴───┴───┴───└───┴───┴───┴───┴───┘┬───┬─┴───┘
+     *       │Alt│ GUI │                           │ GUI │Alt│
+     *       └───┴─────┴───────────────────────────┴─────┴───┘
+     */
+    [1] = LAYOUT_all(
+        KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
+        _______, _______,_______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+                         _______, _______,          _______, _______,                            _______, _______
+    )
+};
diff --git a/keyboards/akb/vero/keymaps/via/keymap.c b/keyboards/akb/vero/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d73d4085a7
--- /dev/null
+++ b/keyboards/akb/vero/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+// Copyright 2022 Martin Arnstad (@arnstadm)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Bspc│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Ctrl │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│MO1│
+     * └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
+     *       │Alt│ GUI │                           │ GUI │Alt│
+     *       └───┴─────┴───────────────────────────┴─────┴───┘
+     */
+    [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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                          KC_LALT, KC_LGUI,          KC_SPC,  KC_SPC,                             KC_RGUI, KC_RALT
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Pwr│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Ins│Del│
+     * ├───┴─┬─┴───┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴───┘
+     * │Caps │ Q │ W │ E │ R │ T │ Y │ U │PSc│Scr│Pse│ ↑ │ ] │ Bspc│
+     * └─────┘┌───┬───┬───┐──┴┬──┴┌───┬──┴┬──┴┬──┴┬──┴┬──┴┬────────┐
+     * │ Ctrl │Vl-│Vl+│Mut│ F │ G │ * │ / │Hom│PgU│ ← │ → │  Enter │
+     * ├──────└───┴───┴───┘─┬─┴─┬─└─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┘
+     * │ Shift  │ Z │ X │ C │ V │ B │ + │ - │End│PgD│ ↓ │ Shift│MO1│
+     * └─────┬──┴┬──┴──┬┴───┴───┴───└───┴───┴───┴───┴───┘┬───┬─┴───┘
+     *       │Alt│ GUI │                           │ GUI │Alt│
+     *       └───┴─────┴───────────────────────────┴─────┴───┘
+     */
+    [1] = LAYOUT_all(
+        KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
+        _______, _______,_______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+                         _______, _______,          _______, _______,                            _______, _______
+    )
+};
diff --git a/keyboards/akb/vero/keymaps/via/rules.mk b/keyboards/akb/vero/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/akb/vero/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/akb/vero/mcuconf.h b/keyboards/akb/vero/mcuconf.h
new file mode 100644
index 0000000000..3439c90d52
--- /dev/null
+++ b/keyboards/akb/vero/mcuconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include_next "mcuconf.h"
+/* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE                    8
diff --git a/keyboards/akb/vero/readme.md b/keyboards/akb/vero/readme.md
new file mode 100644
index 0000000000..3afb7c2762
--- /dev/null
+++ b/keyboards/akb/vero/readme.md
@@ -0,0 +1,27 @@
+# antipode/vero
+
+![antipode/vero](https://i.imgur.com/znKP8XQh.jpeg)
+
+AKB Vero - Vero means true. This keyboard brings you a truly great typing experience in a true HHKB layout. With its 6U spacebar and asymmetrical blockers it brings the classic design of the HHKB to MX keyboards.
+
+* Keyboard Maintainer: [Antipode](https://antipode.no)
+* Hardware Supported: AKB Vero PCB
+* Hardware Availability: https://www.antipode.no/products/akb-vero
+
+Make example for this keyboard (after setting up your build environment):
+
+    make antipode/vero:default
+
+Flashing example for this keyboard:
+
+    make antipode/vero:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/akb/vero/rules.mk b/keyboards/akb/vero/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/akb/vero/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From dcc0c3f3504f59a03d1780f1359f15d1f33a5c73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 23:27:03 +0100
Subject: [PATCH 636/959] Bump JamesIves/github-pages-deploy-action from 4.4.0
 to 4.4.1 (#18702)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/v4.4.0...v4.4.1)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 691770a5af..1497739a0b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -34,7 +34,7 @@ jobs:
         qmk --verbose generate-docs
 
     - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4.4.0
+      uses: JamesIves/github-pages-deploy-action@v4.4.1
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BASE_BRANCH: master

From 78484449e29ec3a4e3e5bbb980591beccaf40d9e Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 13 Oct 2022 16:28:42 -0600
Subject: [PATCH 637/959] Fixup bluebell/swoop (#18703)

---
 keyboards/bluebell/swoop/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
index 64a71e7cc1..2e687e2ddb 100644
--- a/keyboards/bluebell/swoop/info.json
+++ b/keyboards/bluebell/swoop/info.json
@@ -6,7 +6,7 @@
   "usb": {
     "vid": "0x1804",
     "pid": "0x3046",
-    "device_ver": "0x0001"
+    "device_version": "1.0.0"
   },
   "layouts": {
     "LAYOUT_split_3x5_3": {

From 06a7a1c205f43c0c4c435d48de5ab3893398b19d Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 13 Oct 2022 17:07:07 -0600
Subject: [PATCH 638/959] Fixup momoka_ergo (#18704)

---
 keyboards/momoka_ergo/config.h                | 68 ++-----------------
 .../momoka_ergo/keymaps/default/readme.md     |  1 -
 keyboards/momoka_ergo/keymaps/via/keymap.c    |  2 +-
 keyboards/momoka_ergo/keymaps/via/readme.md   |  1 -
 4 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 keyboards/momoka_ergo/keymaps/default/readme.md
 delete mode 100644 keyboards/momoka_ergo/keymaps/via/readme.md

diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index e480581220..ccbbfe1cd8 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -23,30 +23,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 6
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 #define SELECT_SOFT_SERIAL_SPEED 5
+
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 #define SOFT_SERIAL_PIN D1  // or D1, D2, D3, E6
 
 #define RGB_DI_PIN C7
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 22
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_SPLIT { 11, 11 }
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -55,60 +51,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3	
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* 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
 
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * 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
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0	
-
-#define USE_SERIAL
 #define SPLIT_USB_DETECT
 #define EE_HANDS
diff --git a/keyboards/momoka_ergo/keymaps/default/readme.md b/keyboards/momoka_ergo/keymaps/default/readme.md
deleted file mode 100644
index 390149d6bb..0000000000
--- a/keyboards/momoka_ergo/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for momoka_ergo
diff --git a/keyboards/momoka_ergo/keymaps/via/keymap.c b/keyboards/momoka_ergo/keymaps/via/keymap.c
index 707a2f1f49..34b363841e 100644
--- a/keyboards/momoka_ergo/keymaps/via/keymap.c
+++ b/keyboards/momoka_ergo/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                       KC_BSPC, KC_DEL,  KC_END,     KC_PGDN, KC_ENT,  KC_SPC
     ),
     [_FN1] = LAYOUT(
-        RESET,    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_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,
         MO(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, MO(_FN2),
diff --git a/keyboards/momoka_ergo/keymaps/via/readme.md b/keyboards/momoka_ergo/keymaps/via/readme.md
deleted file mode 100644
index 390149d6bb..0000000000
--- a/keyboards/momoka_ergo/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for momoka_ergo

From 3fffa51554556edc9ca53bc04ef45abe87d3d3c9 Mon Sep 17 00:00:00 2001
From: JohSchneider <JohSchneider@googlemail.com>
Date: Fri, 14 Oct 2022 01:03:32 +0000
Subject: [PATCH 639/959] mcp23018: add return status to init (#18178)

---
 drivers/gpio/mcp23018.c | 14 ++++++++++----
 drivers/gpio/mcp23018.h |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/gpio/mcp23018.c b/drivers/gpio/mcp23018.c
index 41cbfe087e..b4fbf296f8 100644
--- a/drivers/gpio/mcp23018.c
+++ b/drivers/gpio/mcp23018.c
@@ -18,14 +18,20 @@ enum {
     CMD_GPIOB  = 0x13,
 };
 
-void mcp23018_init(uint8_t addr) {
+bool mcp23018_init(uint8_t slave_addr) {
     static uint8_t s_init = 0;
-    if (!s_init) {
+    uint8_t        addr   = SLAVE_TO_ADDR(slave_addr);
+    if (0 == s_init) {
         i2c_init();
-        wait_ms(1000);
+        wait_ms(100);
 
-        s_init = 1;
+        // probe that the expander is actually connected by reading from it
+        uint8_t data = 0;
+        if (I2C_STATUS_SUCCESS == i2c_readReg(addr, 0, &data, sizeof(data), 150)) {
+            s_init = 1;
+        }
     }
+    return (s_init > 0);
 }
 
 bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {
diff --git a/drivers/gpio/mcp23018.h b/drivers/gpio/mcp23018.h
index e7c2730dd1..081fdb24e3 100644
--- a/drivers/gpio/mcp23018.h
+++ b/drivers/gpio/mcp23018.h
@@ -33,7 +33,7 @@ enum {
 /**
  * Init expander and any other dependent drivers
  */
-void mcp23018_init(uint8_t slave_addr);
+bool mcp23018_init(uint8_t slave_addr);
 
 /**
  * Configure input/output to a given port

From 19aed5e999ef177a2ff0b2b705443bde9c70588c Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 15 Oct 2022 04:15:02 +1100
Subject: [PATCH 640/959] Make QP driver init functions weak. (#18717)

---
 drivers/painter/gc9a01/qp_gc9a01.c   | 2 +-
 drivers/painter/ili9xxx/qp_ili9163.c | 2 +-
 drivers/painter/ili9xxx/qp_ili9341.c | 2 +-
 drivers/painter/ili9xxx/qp_ili9488.c | 2 +-
 drivers/painter/ssd1351/qp_ssd1351.c | 2 +-
 drivers/painter/st77xx/qp_st7735.c   | 4 ++--
 drivers/painter/st77xx/qp_st7789.c   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/painter/gc9a01/qp_gc9a01.c b/drivers/painter/gc9a01/qp_gc9a01.c
index 37700a28a4..5bdab1e520 100644
--- a/drivers/painter/gc9a01/qp_gc9a01.c
+++ b/drivers/painter/gc9a01/qp_gc9a01.c
@@ -17,7 +17,7 @@ tft_panel_dc_reset_painter_device_t gc9a01_drivers[GC9A01_NUM_DEVICES] = {0};
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Initialization
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool qp_gc9a01_init(painter_device_t device, painter_rotation_t rotation) {
+__attribute__((weak)) bool qp_gc9a01_init(painter_device_t device, painter_rotation_t rotation) {
     // A lot of these "unknown" opcodes are sourced from other OSS projects and are seemingly required for this display to function.
     // clang-format off
     const uint8_t gc9a01_init_sequence[] = {
diff --git a/drivers/painter/ili9xxx/qp_ili9163.c b/drivers/painter/ili9xxx/qp_ili9163.c
index 14363c7d04..8bb01d12e0 100644
--- a/drivers/painter/ili9xxx/qp_ili9163.c
+++ b/drivers/painter/ili9xxx/qp_ili9163.c
@@ -20,7 +20,7 @@ tft_panel_dc_reset_painter_device_t ili9163_drivers[ILI9163_NUM_DEVICES] = {0};
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Initialization
 
-bool qp_ili9163_init(painter_device_t device, painter_rotation_t rotation) {
+__attribute__((weak)) bool qp_ili9163_init(painter_device_t device, painter_rotation_t rotation) {
     // clang-format off
     const uint8_t ili9163_init_sequence[] = {
         // Command,                 Delay,  N, Data[N]
diff --git a/drivers/painter/ili9xxx/qp_ili9341.c b/drivers/painter/ili9xxx/qp_ili9341.c
index 9608f109bd..2a97388316 100644
--- a/drivers/painter/ili9xxx/qp_ili9341.c
+++ b/drivers/painter/ili9xxx/qp_ili9341.c
@@ -20,7 +20,7 @@ tft_panel_dc_reset_painter_device_t ili9341_drivers[ILI9341_NUM_DEVICES] = {0};
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Initialization
 
-bool qp_ili9341_init(painter_device_t device, painter_rotation_t rotation) {
+__attribute__((weak)) bool qp_ili9341_init(painter_device_t device, painter_rotation_t rotation) {
     // clang-format off
     const uint8_t ili9341_init_sequence[] = {
         // Command,                 Delay,  N, Data[N]
diff --git a/drivers/painter/ili9xxx/qp_ili9488.c b/drivers/painter/ili9xxx/qp_ili9488.c
index 55cf9f896f..cda9a9be00 100644
--- a/drivers/painter/ili9xxx/qp_ili9488.c
+++ b/drivers/painter/ili9xxx/qp_ili9488.c
@@ -20,7 +20,7 @@ tft_panel_dc_reset_painter_device_t ili9488_drivers[ILI9488_NUM_DEVICES] = {0};
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Initialization
 
-bool qp_ili9488_init(painter_device_t device, painter_rotation_t rotation) {
+__attribute__((weak)) bool qp_ili9488_init(painter_device_t device, painter_rotation_t rotation) {
     // clang-format off
     const uint8_t ili9488_init_sequence[] = {
         // Command,                 Delay,  N, Data[N]
diff --git a/drivers/painter/ssd1351/qp_ssd1351.c b/drivers/painter/ssd1351/qp_ssd1351.c
index 7ce76bab6d..85146490a0 100644
--- a/drivers/painter/ssd1351/qp_ssd1351.c
+++ b/drivers/painter/ssd1351/qp_ssd1351.c
@@ -20,7 +20,7 @@ tft_panel_dc_reset_painter_device_t ssd1351_drivers[SSD1351_NUM_DEVICES] = {0};
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Initialization
 
-bool qp_ssd1351_init(painter_device_t device, painter_rotation_t rotation) {
+__attribute__((weak)) bool qp_ssd1351_init(painter_device_t device, painter_rotation_t rotation) {
     tft_panel_dc_reset_painter_device_t *driver = (tft_panel_dc_reset_painter_device_t *)device;
 
     // clang-format off
diff --git a/drivers/painter/st77xx/qp_st7735.c b/drivers/painter/st77xx/qp_st7735.c
index e434e31b92..74145e0e4e 100644
--- a/drivers/painter/st77xx/qp_st7735.c
+++ b/drivers/painter/st77xx/qp_st7735.c
@@ -49,7 +49,7 @@ static inline void st7735_automatic_viewport_offsets(painter_device_t device, pa
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Initialization
 
-bool qp_st7735_init(painter_device_t device, painter_rotation_t rotation) {
+__attribute__((weak)) bool qp_st7735_init(painter_device_t device, painter_rotation_t rotation) {
     // clang-format off
     const uint8_t st7735_init_sequence[] = {
         // Command,                 Delay, N, Data[N]
@@ -141,4 +141,4 @@ painter_device_t qp_st7735_make_spi_device(uint16_t panel_width, uint16_t panel_
 
 #endif // QUANTUM_PAINTER_ST7735_SPI_ENABLE
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/drivers/painter/st77xx/qp_st7789.c b/drivers/painter/st77xx/qp_st7789.c
index 49e8436c29..905f6bb270 100644
--- a/drivers/painter/st77xx/qp_st7789.c
+++ b/drivers/painter/st77xx/qp_st7789.c
@@ -48,7 +48,7 @@ static inline void st7789_automatic_viewport_offsets(painter_device_t device, pa
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Initialization
 
-bool qp_st7789_init(painter_device_t device, painter_rotation_t rotation) {
+__attribute__((weak)) bool qp_st7789_init(painter_device_t device, painter_rotation_t rotation) {
     // clang-format off
     const uint8_t st7789_init_sequence[] = {
         // Command,                 Delay, N, Data[N]

From f0b2bfd5ca5b416a9c7c9bef8c2850f1084bd106 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 15 Oct 2022 14:33:24 +1100
Subject: [PATCH 641/959] Programmable Button API refactor and improve docs
 (#18641)

---
 docs/feature_programmable_button.md           | 192 ++++++++++++------
 quantum/action.c                              |   1 -
 quantum/keyboard.c                            |   7 -
 .../process_programmable_button.c             |   4 +-
 quantum/programmable_button.c                 |  27 ++-
 quantum/programmable_button.h                 |  75 ++++++-
 6 files changed, 220 insertions(+), 86 deletions(-)

diff --git a/docs/feature_programmable_button.md b/docs/feature_programmable_button.md
index b1ef555d16..1982b8295e 100644
--- a/docs/feature_programmable_button.md
+++ b/docs/feature_programmable_button.md
@@ -1,74 +1,144 @@
-## Programmable Button
+# Programmable Button :id=programmable-button
 
-Programmable button is a feature that can be used to send keys that have no
-predefined meaning.
-This means they can be processed on the host side by custom software without
-colliding without the operating system trying to interpret these keys.
+Programmable Buttons are keys that have no predefined meaning. This means they can be processed on the host side by custom software without the operating system trying to interpret them.
 
-The keycodes are emitted according to the HID usage
-"Telephony Device Page" (0x0B), "Programmable button usage" (0x07).
-On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#`
-keycodes.
-(Up to `KEY_MACRO30`)
+The keycodes are emitted according to the HID Telephony Device page (`0x0B`), Programmable Button usage (`0x07`). On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#` keycodes (up to `KEY_MACRO30`).
 
-### Enabling Programmable Button support
+?> Currently there is no known support in Windows or macOS. It may be possible to write a custom HID driver to receive these usages, but this is out of the scope of the QMK documentation.
 
-To enable Programmable Button, add the following line to your keymap’s `rules.mk`:
+## Usage :id=usage
 
-```c
+Add the following to your `rules.mk`:
+
+```make
 PROGRAMMABLE_BUTTON_ENABLE = yes
 ```
 
-### Mapping
+## Keycodes :id=keycodes
 
-In your keymap you can use the following keycodes to map key presses to Programmable Buttons:
+|Key                     |Aliases|Description           |
+|------------------------|-------|----------------------|
+|`PROGRAMMABLE_BUTTON_1` |`PB_1` |Programmable button 1 |
+|`PROGRAMMABLE_BUTTON_2` |`PB_2` |Programmable button 2 |
+|`PROGRAMMABLE_BUTTON_3` |`PB_3` |Programmable button 3 |
+|`PROGRAMMABLE_BUTTON_4` |`PB_4` |Programmable button 4 |
+|`PROGRAMMABLE_BUTTON_5` |`PB_5` |Programmable button 5 |
+|`PROGRAMMABLE_BUTTON_6` |`PB_6` |Programmable button 6 |
+|`PROGRAMMABLE_BUTTON_7` |`PB_7` |Programmable button 7 |
+|`PROGRAMMABLE_BUTTON_8` |`PB_8` |Programmable button 8 |
+|`PROGRAMMABLE_BUTTON_9` |`PB_9` |Programmable button 9 |
+|`PROGRAMMABLE_BUTTON_10`|`PB_10`|Programmable button 10|
+|`PROGRAMMABLE_BUTTON_11`|`PB_11`|Programmable button 11|
+|`PROGRAMMABLE_BUTTON_12`|`PB_12`|Programmable button 12|
+|`PROGRAMMABLE_BUTTON_13`|`PB_13`|Programmable button 13|
+|`PROGRAMMABLE_BUTTON_14`|`PB_14`|Programmable button 14|
+|`PROGRAMMABLE_BUTTON_15`|`PB_15`|Programmable button 15|
+|`PROGRAMMABLE_BUTTON_16`|`PB_16`|Programmable button 16|
+|`PROGRAMMABLE_BUTTON_17`|`PB_17`|Programmable button 17|
+|`PROGRAMMABLE_BUTTON_18`|`PB_18`|Programmable button 18|
+|`PROGRAMMABLE_BUTTON_19`|`PB_19`|Programmable button 19|
+|`PROGRAMMABLE_BUTTON_20`|`PB_20`|Programmable button 20|
+|`PROGRAMMABLE_BUTTON_21`|`PB_21`|Programmable button 21|
+|`PROGRAMMABLE_BUTTON_22`|`PB_22`|Programmable button 22|
+|`PROGRAMMABLE_BUTTON_23`|`PB_23`|Programmable button 23|
+|`PROGRAMMABLE_BUTTON_24`|`PB_24`|Programmable button 24|
+|`PROGRAMMABLE_BUTTON_25`|`PB_25`|Programmable button 25|
+|`PROGRAMMABLE_BUTTON_26`|`PB_26`|Programmable button 26|
+|`PROGRAMMABLE_BUTTON_27`|`PB_27`|Programmable button 27|
+|`PROGRAMMABLE_BUTTON_28`|`PB_28`|Programmable button 28|
+|`PROGRAMMABLE_BUTTON_29`|`PB_29`|Programmable button 29|
+|`PROGRAMMABLE_BUTTON_30`|`PB_30`|Programmable button 30|
+|`PROGRAMMABLE_BUTTON_31`|`PB_31`|Programmable button 31|
+|`PROGRAMMABLE_BUTTON_32`|`PB_32`|Programmable button 32|
 
-|Key                     |Description                                                     |
-|------------------------|----------------------|
-|`PROGRAMMABLE_BUTTON_1` |Programmable button 1 |
-|`PROGRAMMABLE_BUTTON_2` |Programmable button 2 |
-|`PROGRAMMABLE_BUTTON_3` |Programmable button 3 |
-|`PROGRAMMABLE_BUTTON_4` |Programmable button 4 |
-|`PROGRAMMABLE_BUTTON_5` |Programmable button 5 |
-|`PROGRAMMABLE_BUTTON_6` |Programmable button 6 |
-|`PROGRAMMABLE_BUTTON_7` |Programmable button 7 |
-|`PROGRAMMABLE_BUTTON_8` |Programmable button 8 |
-|`PROGRAMMABLE_BUTTON_9` |Programmable button 9 |
-|`PROGRAMMABLE_BUTTON_10`|Programmable button 10|
-|`PROGRAMMABLE_BUTTON_11`|Programmable button 11|
-|`PROGRAMMABLE_BUTTON_12`|Programmable button 12|
-|`PROGRAMMABLE_BUTTON_13`|Programmable button 13|
-|`PROGRAMMABLE_BUTTON_14`|Programmable button 14|
-|`PROGRAMMABLE_BUTTON_15`|Programmable button 15|
-|`PROGRAMMABLE_BUTTON_16`|Programmable button 16|
-|`PROGRAMMABLE_BUTTON_17`|Programmable button 17|
-|`PROGRAMMABLE_BUTTON_18`|Programmable button 18|
-|`PROGRAMMABLE_BUTTON_19`|Programmable button 19|
-|`PROGRAMMABLE_BUTTON_20`|Programmable button 20|
-|`PROGRAMMABLE_BUTTON_21`|Programmable button 21|
-|`PROGRAMMABLE_BUTTON_22`|Programmable button 22|
-|`PROGRAMMABLE_BUTTON_23`|Programmable button 23|
-|`PROGRAMMABLE_BUTTON_24`|Programmable button 24|
-|`PROGRAMMABLE_BUTTON_25`|Programmable button 25|
-|`PROGRAMMABLE_BUTTON_26`|Programmable button 26|
-|`PROGRAMMABLE_BUTTON_27`|Programmable button 27|
-|`PROGRAMMABLE_BUTTON_28`|Programmable button 28|
-|`PROGRAMMABLE_BUTTON_29`|Programmable button 29|
-|`PROGRAMMABLE_BUTTON_30`|Programmable button 30|
-|`PROGRAMMABLE_BUTTON_31`|Programmable button 31|
-|`PROGRAMMABLE_BUTTON_32`|Programmable button 32|
-|`PB_1` to `PB_32`       |Aliases for keymaps   |
+## API :id=api
 
-### API
+### `void programmable_button_clear(void)` :id=api-programmable-button-clear
 
-You can also use a dedicated API defined in `programmable_button.h` to interact with this feature:
+Clear the programmable button report.
 
-```
-void programmable_button_clear(void);
-void programmable_button_send(void);
-void programmable_button_on(uint8_t code);
-void programmable_button_off(uint8_t code);
-bool programmable_button_is_on(uint8_t code);
-uint32_t programmable_button_get_report(void);
-void programmable_button_set_report(uint32_t report);
-```
+---
+
+### `void programmable_button_add(uint8_t index)` :id=api-programmable-button-add
+
+Set the state of a button.
+
+#### Arguments :id=api-programmable-button-add-arguments
+
+ - `uint8_t index`  
+   The index of the button to press, from 0 to 31.
+
+---
+
+### `void programmable_button_remove(uint8_t index)` :id=api-programmable-button-remove
+
+Reset the state of a button.
+
+#### Arguments :id=api-programmable-button-remove-arguments
+
+ - `uint8_t index`  
+   The index of the button to release, from 0 to 31.
+
+---
+
+### `void programmable_button_register(uint8_t index)` :id=api-programmable-button-register
+
+Set the state of a button, and flush the report.
+
+#### Arguments :id=api-programmable-button-register-arguments
+
+ - `uint8_t index`  
+   The index of the button to press, from 0 to 31.
+
+---
+
+### `void programmable_button_unregister(uint8_t index)` :id=api-programmable-button-unregister
+
+Reset the state of a button, and flush the report.
+
+#### Arguments :id=api-programmable-button-unregister-arguments
+
+ - `uint8_t index`  
+   The index of the button to release, from 0 to 31.
+
+---
+
+### `bool programmable_button_is_on(uint8_t index)` :id=api-programmable-button-is-on
+
+Get the state of a button.
+
+#### Arguments :id=api-programmable-button-is-on-arguments
+
+ - `uint8_t index`  
+   The index of the button to check, from 0 to 31.
+
+#### Return Value :id=api-programmable-button-is-on-return
+
+`true` if the button is pressed.
+
+---
+
+### `void programmable_button_flush(void)` :id=api-programmable-button-flush
+
+Send the programmable button report to the host.
+
+---
+
+### `uint32_t programmable_button_get_report(void)` :id=api-programmable-button-get-report
+
+Get the programmable button report.
+
+#### Return Value :id=api-programmable-button-get-report-return
+
+The bitmask of programmable button states.
+
+---
+
+### `void programmable_button_set_report(uint32_t report)` :id=api-programmable-button-set-report
+
+Set the programmable button report.
+
+#### Arguments :id=api-programmable-button-set-report-arguments
+
+ - `uint32_t report`  
+   A bitmask of programmable button states.
diff --git a/quantum/action.c b/quantum/action.c
index 78322e4a83..abf9834d2f 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -1081,7 +1081,6 @@ void clear_keyboard_but_mods_and_keys() {
 #endif
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
     programmable_button_clear();
-    programmable_button_send();
 #endif
 }
 
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 280532a5fd..eb5e4b583a 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -66,9 +66,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef JOYSTICK_ENABLE
 #    include "process_joystick.h"
 #endif
-#ifdef PROGRAMMABLE_BUTTON_ENABLE
-#    include "programmable_button.h"
-#endif
 #ifdef HD44780_ENABLE
 #    include "hd44780.h"
 #endif
@@ -669,10 +666,6 @@ void keyboard_task(void) {
     digitizer_task();
 #endif
 
-#ifdef PROGRAMMABLE_BUTTON_ENABLE
-    programmable_button_send();
-#endif
-
 #ifdef BLUETOOTH_ENABLE
     bluetooth_task();
 #endif
diff --git a/quantum/process_keycode/process_programmable_button.c b/quantum/process_keycode/process_programmable_button.c
index c6e77faacc..6379698848 100644
--- a/quantum/process_keycode/process_programmable_button.c
+++ b/quantum/process_keycode/process_programmable_button.c
@@ -22,9 +22,9 @@ bool process_programmable_button(uint16_t keycode, keyrecord_t *record) {
     if (keycode >= PROGRAMMABLE_BUTTON_MIN && keycode <= PROGRAMMABLE_BUTTON_MAX) {
         uint8_t button = keycode - PROGRAMMABLE_BUTTON_MIN + 1;
         if (record->event.pressed) {
-            programmable_button_on(button);
+            programmable_button_register(button);
         } else {
-            programmable_button_off(button);
+            programmable_button_unregister(button);
         }
     }
     return true;
diff --git a/quantum/programmable_button.c b/quantum/programmable_button.c
index a3ef42d82b..b6c9ad3189 100644
--- a/quantum/programmable_button.c
+++ b/quantum/programmable_button.c
@@ -24,27 +24,38 @@ static uint32_t programmable_button_report = 0;
 
 void programmable_button_clear(void) {
     programmable_button_report = 0;
+    programmable_button_flush();
 }
 
-void programmable_button_send(void) {
-    host_programmable_button_send(programmable_button_report);
-}
-
-void programmable_button_on(uint8_t index) {
+void programmable_button_add(uint8_t index) {
     programmable_button_report |= REPORT_BIT(index);
 }
 
-void programmable_button_off(uint8_t index) {
+void programmable_button_remove(uint8_t index) {
     programmable_button_report &= ~REPORT_BIT(index);
 }
 
+void programmable_button_register(uint8_t index) {
+    programmable_button_add(index);
+    programmable_button_flush();
+}
+
+void programmable_button_unregister(uint8_t index) {
+    programmable_button_remove(index);
+    programmable_button_flush();
+}
+
 bool programmable_button_is_on(uint8_t index) {
     return !!(programmable_button_report & REPORT_BIT(index));
-};
+}
+
+void programmable_button_flush(void) {
+    host_programmable_button_send(programmable_button_report);
+}
 
 uint32_t programmable_button_get_report(void) {
     return programmable_button_report;
-};
+}
 
 void programmable_button_set_report(uint32_t report) {
     programmable_button_report = report;
diff --git a/quantum/programmable_button.h b/quantum/programmable_button.h
index e89b8b9fd6..e8c916d75c 100644
--- a/quantum/programmable_button.h
+++ b/quantum/programmable_button.h
@@ -19,12 +19,73 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "report.h"
 
-void     programmable_button_clear(void);
-void     programmable_button_send(void);
-void     programmable_button_on(uint8_t index);
-void     programmable_button_off(uint8_t index);
-bool     programmable_button_is_on(uint8_t index);
+/**
+ * \defgroup programmable_button
+ *
+ * HID Programmable Buttons
+ * \{
+ */
+
+/**
+ * \brief Clear the programmable button report.
+ */
+void programmable_button_clear(void);
+
+/**
+ * \brief Set the state of a button.
+ *
+ * \param index The index of the button to press, from 0 to 31.
+ */
+void programmable_button_add(uint8_t index);
+
+/**
+ * \brief Reset the state of a button.
+ *
+ * \param index The index of the button to release, from 0 to 31.
+ */
+void programmable_button_remove(uint8_t index);
+
+/**
+ * \brief Set the state of a button, and flush the report.
+ *
+ * \param index The index of the button to press, from 0 to 31.
+ */
+void programmable_button_register(uint8_t index);
+
+/**
+ * \brief Reset the state of a button, and flush the report.
+ *
+ * \param index The index of the button to release, from 0 to 31.
+ */
+void programmable_button_unregister(uint8_t index);
+
+/**
+ * \brief Get the state of a button.
+ *
+ * \param index The index of the button to check, from 0 to 31.
+ *
+ * \return `true` if the button is pressed.
+ */
+bool programmable_button_is_on(uint8_t index);
+
+/**
+ * \brief Send the programmable button report to the host.
+ */
+void programmable_button_flush(void);
+
+/**
+ * \brief Get the programmable button report.
+ *
+ * \return The bitmask of programmable button states.
+ */
 uint32_t programmable_button_get_report(void);
-void     programmable_button_set_report(uint32_t report);
+
+/**
+ * \brief Set the programmable button report.
+ *
+ * \param report A bitmask of programmable button states.
+ */
+void programmable_button_set_report(uint32_t report);
+
+/** \} */

From 1e726a13d8a4f494f88aac6975b1b0e3be78242b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 15 Oct 2022 09:36:20 -0700
Subject: [PATCH 642/959] Xelus RS60 Layout Refactor (#18708)

* add matrix diagrams

* add LAYOUT_60_ansi

* add LAYOUT_60_ansi_tsangan

* add LAYOUT_60_tsangan_hhkb

* enable Community Layout support

* enable Community Layout support, phase 2

Remove the `LAYOUTS` rules from the `rules.mk` files, now that the data is in `info.json`.
---
 keyboards/xelus/rs60/info.json       | 208 +++++++++++++++++++++++++++
 keyboards/xelus/rs60/rev1/rev1.h     |  17 +++
 keyboards/xelus/rs60/rev1/rules.mk   |   2 -
 keyboards/xelus/rs60/rev2_0/rev2_0.h |  17 +++
 keyboards/xelus/rs60/rev2_0/rules.mk |   2 -
 keyboards/xelus/rs60/rev2_1/rev2_1.h |  17 +++
 keyboards/xelus/rs60/rev2_1/rules.mk |   2 -
 7 files changed, 259 insertions(+), 6 deletions(-)

diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json
index 241f1cbe44..f6adb3db42 100644
--- a/keyboards/xelus/rs60/info.json
+++ b/keyboards/xelus/rs60/info.json
@@ -7,6 +7,7 @@
         "vid": "0x5845",
         "pid": "0x5253"
     },
+    "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"],
     "layouts": {
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
@@ -74,6 +75,213 @@
                 {"label":"Fn", "x":12.5, "y":4, "w":1.25},
                 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
             ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"Esc", "matrix":[0, 0], "x":0, "y":0},
+                {"label":"1", "matrix":[0, 1], "x":1, "y":0},
+                {"label":"2", "matrix":[0, 2], "x":2, "y":0},
+                {"label":"3", "matrix":[0, 3], "x":3, "y":0},
+                {"label":"4", "matrix":[0, 4], "x":4, "y":0},
+                {"label":"5", "matrix":[0, 5], "x":5, "y":0},
+                {"label":"6", "matrix":[0, 6], "x":6, "y":0},
+                {"label":"7", "matrix":[0, 7], "x":7, "y":0},
+                {"label":"8", "matrix":[0, 8], "x":8, "y":0},
+                {"label":"9", "matrix":[0, 9], "x":9, "y":0},
+                {"label":"0", "matrix":[0, 10], "x":10, "y":0},
+                {"label":"-", "matrix":[0, 11], "x":11, "y":0},
+                {"label":"=", "matrix":[0, 12], "x":12, "y":0},
+                {"label":"Backspace", "matrix":[0, 13], "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "matrix":[1, 0], "x":0, "y":1, "w":1.5},
+                {"label":"Q", "matrix":[1, 1], "x":1.5, "y":1},
+                {"label":"W", "matrix":[1, 2], "x":2.5, "y":1},
+                {"label":"E", "matrix":[1, 3], "x":3.5, "y":1},
+                {"label":"R", "matrix":[1, 4], "x":4.5, "y":1},
+                {"label":"T", "matrix":[1, 5], "x":5.5, "y":1},
+                {"label":"Y", "matrix":[1, 6], "x":6.5, "y":1},
+                {"label":"U", "matrix":[1, 7], "x":7.5, "y":1},
+                {"label":"I", "matrix":[1, 8], "x":8.5, "y":1},
+                {"label":"O", "matrix":[1, 9], "x":9.5, "y":1},
+                {"label":"P", "matrix":[1, 10], "x":10.5, "y":1},
+                {"label":"[", "matrix":[1, 11], "x":11.5, "y":1},
+                {"label":"]", "matrix":[1, 12], "x":12.5, "y":1},
+                {"label":"\\", "matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "matrix":[2, 0], "x":0, "y":2, "w":1.75},
+                {"label":"A", "matrix":[2, 1], "x":1.75, "y":2},
+                {"label":"S", "matrix":[2, 2], "x":2.75, "y":2},
+                {"label":"D", "matrix":[2, 3], "x":3.75, "y":2},
+                {"label":"F", "matrix":[2, 4], "x":4.75, "y":2},
+                {"label":"G", "matrix":[2, 5], "x":5.75, "y":2},
+                {"label":"H", "matrix":[2, 6], "x":6.75, "y":2},
+                {"label":"J", "matrix":[2, 7], "x":7.75, "y":2},
+                {"label":"K", "matrix":[2, 8], "x":8.75, "y":2},
+                {"label":"L", "matrix":[2, 9], "x":9.75, "y":2},
+                {"label":";", "matrix":[2, 10], "x":10.75, "y":2},
+                {"label":"'", "matrix":[2, 11], "x":11.75, "y":2},
+                {"label":"Enter", "matrix":[2, 12], "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "matrix":[3, 0], "x":0, "y":3, "w":2.25},
+                {"label":"Z", "matrix":[3, 1], "x":2.25, "y":3},
+                {"label":"X", "matrix":[3, 2], "x":3.25, "y":3},
+                {"label":"C", "matrix":[3, 3], "x":4.25, "y":3},
+                {"label":"V", "matrix":[3, 4], "x":5.25, "y":3},
+                {"label":"B", "matrix":[3, 5], "x":6.25, "y":3},
+                {"label":"N", "matrix":[3, 6], "x":7.25, "y":3},
+                {"label":"M", "matrix":[3, 7], "x":8.25, "y":3},
+                {"label":",", "matrix":[3, 8], "x":9.25, "y":3},
+                {"label":".", "matrix":[3, 9], "x":10.25, "y":3},
+                {"label":"/", "matrix":[3, 11], "x":11.25, "y":3},
+                {"label":"Shift", "matrix":[3, 12], "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "matrix":[4, 0], "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "matrix":[4, 5], "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "matrix":[4, 9], "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "matrix":[4, 10], "x":11.25, "y":4, "w":1.25},
+                {"label":"Fn", "matrix":[4, 12], "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "matrix":[4, 13], "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "matrix":[0, 0], "x":0, "y":0},
+                {"label":"1", "matrix":[0, 1], "x":1, "y":0},
+                {"label":"2", "matrix":[0, 2], "x":2, "y":0},
+                {"label":"3", "matrix":[0, 3], "x":3, "y":0},
+                {"label":"4", "matrix":[0, 4], "x":4, "y":0},
+                {"label":"5", "matrix":[0, 5], "x":5, "y":0},
+                {"label":"6", "matrix":[0, 6], "x":6, "y":0},
+                {"label":"7", "matrix":[0, 7], "x":7, "y":0},
+                {"label":"8", "matrix":[0, 8], "x":8, "y":0},
+                {"label":"9", "matrix":[0, 9], "x":9, "y":0},
+                {"label":"0", "matrix":[0, 10], "x":10, "y":0},
+                {"label":"-", "matrix":[0, 11], "x":11, "y":0},
+                {"label":"=", "matrix":[0, 12], "x":12, "y":0},
+                {"label":"Backspace", "matrix":[0, 13], "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "matrix":[1, 0], "x":0, "y":1, "w":1.5},
+                {"label":"Q", "matrix":[1, 1], "x":1.5, "y":1},
+                {"label":"W", "matrix":[1, 2], "x":2.5, "y":1},
+                {"label":"E", "matrix":[1, 3], "x":3.5, "y":1},
+                {"label":"R", "matrix":[1, 4], "x":4.5, "y":1},
+                {"label":"T", "matrix":[1, 5], "x":5.5, "y":1},
+                {"label":"Y", "matrix":[1, 6], "x":6.5, "y":1},
+                {"label":"U", "matrix":[1, 7], "x":7.5, "y":1},
+                {"label":"I", "matrix":[1, 8], "x":8.5, "y":1},
+                {"label":"O", "matrix":[1, 9], "x":9.5, "y":1},
+                {"label":"P", "matrix":[1, 10], "x":10.5, "y":1},
+                {"label":"[", "matrix":[1, 11], "x":11.5, "y":1},
+                {"label":"]", "matrix":[1, 12], "x":12.5, "y":1},
+                {"label":"\\", "matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "matrix":[2, 0], "x":0, "y":2, "w":1.75},
+                {"label":"A", "matrix":[2, 1], "x":1.75, "y":2},
+                {"label":"S", "matrix":[2, 2], "x":2.75, "y":2},
+                {"label":"D", "matrix":[2, 3], "x":3.75, "y":2},
+                {"label":"F", "matrix":[2, 4], "x":4.75, "y":2},
+                {"label":"G", "matrix":[2, 5], "x":5.75, "y":2},
+                {"label":"H", "matrix":[2, 6], "x":6.75, "y":2},
+                {"label":"J", "matrix":[2, 7], "x":7.75, "y":2},
+                {"label":"K", "matrix":[2, 8], "x":8.75, "y":2},
+                {"label":"L", "matrix":[2, 9], "x":9.75, "y":2},
+                {"label":";", "matrix":[2, 10], "x":10.75, "y":2},
+                {"label":"'", "matrix":[2, 11], "x":11.75, "y":2},
+                {"label":"Enter", "matrix":[2, 12], "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "matrix":[3, 0], "x":0, "y":3, "w":2.25},
+                {"label":"Z", "matrix":[3, 1], "x":2.25, "y":3},
+                {"label":"X", "matrix":[3, 2], "x":3.25, "y":3},
+                {"label":"C", "matrix":[3, 3], "x":4.25, "y":3},
+                {"label":"V", "matrix":[3, 4], "x":5.25, "y":3},
+                {"label":"B", "matrix":[3, 5], "x":6.25, "y":3},
+                {"label":"N", "matrix":[3, 6], "x":7.25, "y":3},
+                {"label":"M", "matrix":[3, 7], "x":8.25, "y":3},
+                {"label":",", "matrix":[3, 8], "x":9.25, "y":3},
+                {"label":".", "matrix":[3, 9], "x":10.25, "y":3},
+                {"label":"/", "matrix":[3, 11], "x":11.25, "y":3},
+                {"label":"Shift", "matrix":[3, 12], "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "matrix":[4, 0], "x":0, "y":4, "w":1.5},
+                {"label":"GUI", "matrix":[4, 1], "x":1.5, "y":4},
+                {"label":"Alt", "matrix":[4, 2], "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "matrix":[4, 5], "x":4, "y":4, "w":7},
+                {"label":"Alt", "matrix":[4, 10], "x":11, "y":4, "w":1.5},
+                {"label":"Fn", "matrix":[4, 12], "x":12.5, "y":4},
+                {"label":"Ctrl", "matrix":[4, 13], "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "matrix":[0, 0], "x":0, "y":0},
+                {"label":"1", "matrix":[0, 1], "x":1, "y":0},
+                {"label":"2", "matrix":[0, 2], "x":2, "y":0},
+                {"label":"3", "matrix":[0, 3], "x":3, "y":0},
+                {"label":"4", "matrix":[0, 4], "x":4, "y":0},
+                {"label":"5", "matrix":[0, 5], "x":5, "y":0},
+                {"label":"6", "matrix":[0, 6], "x":6, "y":0},
+                {"label":"7", "matrix":[0, 7], "x":7, "y":0},
+                {"label":"8", "matrix":[0, 8], "x":8, "y":0},
+                {"label":"9", "matrix":[0, 9], "x":9, "y":0},
+                {"label":"0", "matrix":[0, 10], "x":10, "y":0},
+                {"label":"-", "matrix":[0, 11], "x":11, "y":0},
+                {"label":"=", "matrix":[0, 12], "x":12, "y":0},
+                {"label":"\\", "matrix":[0, 13], "x":13, "y":0},
+                {"label":"Delete", "matrix":[2, 13], "x":14, "y":0},
+
+                {"label":"Tab", "matrix":[1, 0], "x":0, "y":1, "w":1.5},
+                {"label":"Q", "matrix":[1, 1], "x":1.5, "y":1},
+                {"label":"W", "matrix":[1, 2], "x":2.5, "y":1},
+                {"label":"E", "matrix":[1, 3], "x":3.5, "y":1},
+                {"label":"R", "matrix":[1, 4], "x":4.5, "y":1},
+                {"label":"T", "matrix":[1, 5], "x":5.5, "y":1},
+                {"label":"Y", "matrix":[1, 6], "x":6.5, "y":1},
+                {"label":"U", "matrix":[1, 7], "x":7.5, "y":1},
+                {"label":"I", "matrix":[1, 8], "x":8.5, "y":1},
+                {"label":"O", "matrix":[1, 9], "x":9.5, "y":1},
+                {"label":"P", "matrix":[1, 10], "x":10.5, "y":1},
+                {"label":"[", "matrix":[1, 11], "x":11.5, "y":1},
+                {"label":"]", "matrix":[1, 12], "x":12.5, "y":1},
+                {"label":"Backspace", "matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "matrix":[2, 0], "x":0, "y":2, "w":1.75},
+                {"label":"A", "matrix":[2, 1], "x":1.75, "y":2},
+                {"label":"S", "matrix":[2, 2], "x":2.75, "y":2},
+                {"label":"D", "matrix":[2, 3], "x":3.75, "y":2},
+                {"label":"F", "matrix":[2, 4], "x":4.75, "y":2},
+                {"label":"G", "matrix":[2, 5], "x":5.75, "y":2},
+                {"label":"H", "matrix":[2, 6], "x":6.75, "y":2},
+                {"label":"J", "matrix":[2, 7], "x":7.75, "y":2},
+                {"label":"K", "matrix":[2, 8], "x":8.75, "y":2},
+                {"label":"L", "matrix":[2, 9], "x":9.75, "y":2},
+                {"label":";", "matrix":[2, 10], "x":10.75, "y":2},
+                {"label":"'", "matrix":[2, 11], "x":11.75, "y":2},
+                {"label":"Enter", "matrix":[2, 12], "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "matrix":[3, 0], "x":0, "y":3, "w":2.25},
+                {"label":"Z", "matrix":[3, 1], "x":2.25, "y":3},
+                {"label":"X", "matrix":[3, 2], "x":3.25, "y":3},
+                {"label":"C", "matrix":[3, 3], "x":4.25, "y":3},
+                {"label":"V", "matrix":[3, 4], "x":5.25, "y":3},
+                {"label":"B", "matrix":[3, 5], "x":6.25, "y":3},
+                {"label":"N", "matrix":[3, 6], "x":7.25, "y":3},
+                {"label":"M", "matrix":[3, 7], "x":8.25, "y":3},
+                {"label":",", "matrix":[3, 8], "x":9.25, "y":3},
+                {"label":".", "matrix":[3, 9], "x":10.25, "y":3},
+                {"label":"/", "matrix":[3, 11], "x":11.25, "y":3},
+                {"label":"Shift", "matrix":[3, 12], "x":12.25, "y":3, "w":1.75},
+                {"label":"Fn", "matrix":[3, 13], "x":14, "y":3},
+
+                {"label":"Ctrl", "matrix":[4, 0], "x":0, "y":4, "w":1.5},
+                {"label":"GUI", "matrix":[4, 1], "x":1.5, "y":4},
+                {"label":"Alt", "matrix":[4, 2], "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "matrix":[4, 5], "x":4, "y":4, "w":7},
+                {"label":"Alt", "matrix":[4, 10], "x":11, "y":4, "w":1.5},
+                {"label":"Fn", "matrix":[4, 12], "x":12.5, "y":4},
+                {"label":"Ctrl", "matrix":[4, 13], "x":13.5, "y":4, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/xelus/rs60/rev1/rev1.h b/keyboards/xelus/rs60/rev1/rev1.h
index 9b8e841de5..e5f6bf8797 100644
--- a/keyboards/xelus/rs60/rev1/rev1.h
+++ b/keyboards/xelus/rs60/rev1/rev1.h
@@ -19,6 +19,23 @@
 
 #define XXX KC_NO
 
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │   │0D     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
+ * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3B │3C    │3D │   │3C        │ 2.75u RShift
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
+ * │40  │41  │42  │45                      │49  │4A  │4C  │4D  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │40   │41 │42   │45                         │4A   │4C │4D   │ Tsangan/WKL/HHKB
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_60_ansi_split_bs_rshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
diff --git a/keyboards/xelus/rs60/rev1/rules.mk b/keyboards/xelus/rs60/rev1/rules.mk
index bcb2b171f5..cdac239154 100644
--- a/keyboards/xelus/rs60/rev1/rules.mk
+++ b/keyboards/xelus/rs60/rev1/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = 60_ansi_split_bs_rshift
diff --git a/keyboards/xelus/rs60/rev2_0/rev2_0.h b/keyboards/xelus/rs60/rev2_0/rev2_0.h
index dd43418964..5c9dba5a6c 100644
--- a/keyboards/xelus/rs60/rev2_0/rev2_0.h
+++ b/keyboards/xelus/rs60/rev2_0/rev2_0.h
@@ -19,6 +19,23 @@
 
 #define XXX KC_NO
 
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │   │0D     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
+ * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3B │3C    │3D │   │3C        │ 2.75u RShift
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
+ * │40  │41  │42  │45                      │49  │4A  │4C  │4D  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │40   │41 │42   │45                         │4A   │4C │4D   │ Tsangan/WKL/HHKB
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_60_ansi_split_bs_rshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk
index df66f7dd37..221b9d4c01 100644
--- a/keyboards/xelus/rs60/rev2_0/rules.mk
+++ b/keyboards/xelus/rs60/rev2_0/rules.mk
@@ -24,5 +24,3 @@ KEYBOARD_SHARED_EP = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-LAYOUTS = 60_ansi_split_bs_rshift
diff --git a/keyboards/xelus/rs60/rev2_1/rev2_1.h b/keyboards/xelus/rs60/rev2_1/rev2_1.h
index dd43418964..5c9dba5a6c 100644
--- a/keyboards/xelus/rs60/rev2_1/rev2_1.h
+++ b/keyboards/xelus/rs60/rev2_1/rev2_1.h
@@ -19,6 +19,23 @@
 
 #define XXX KC_NO
 
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │   │0D     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
+ * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3B │3C    │3D │   │3C        │ 2.75u RShift
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
+ * │40  │41  │42  │45                      │49  │4A  │4C  │4D  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │40   │41 │42   │45                         │4A   │4C │4D   │ Tsangan/WKL/HHKB
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_60_ansi_split_bs_rshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk
index da1f821141..86f893cb2f 100644
--- a/keyboards/xelus/rs60/rev2_1/rules.mk
+++ b/keyboards/xelus/rs60/rev2_1/rules.mk
@@ -25,5 +25,3 @@ KEYBOARD_SHARED_EP = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-LAYOUTS = 60_ansi_split_bs_rshift

From 19e2dd742b6c8e54c5751b39cf910e0f4fbb2a76 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 16 Oct 2022 03:53:57 +1100
Subject: [PATCH 643/959] LUFA: Consolidate report sending code (#18629)

---
 tmk_core/protocol/lufa/lufa.c | 161 +++++++++-------------------------
 1 file changed, 43 insertions(+), 118 deletions(-)

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index f27256a0e8..af49ed5909 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -87,6 +87,23 @@ static void    send_mouse(report_mouse_t *report);
 static void    send_extra(report_extra_t *report);
 host_driver_t  lufa_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
 
+void send_report(uint8_t endpoint, void *report, size_t size) {
+    uint8_t timeout = 255;
+
+    if (USB_DeviceState != DEVICE_STATE_Configured) return;
+
+    Endpoint_SelectEndpoint(endpoint);
+
+    /* Check if write ready for a polling interval around 10ms */
+    while (timeout-- && !Endpoint_IsReadWriteAllowed()) {
+        _delay_us(40);
+    }
+    if (!Endpoint_IsReadWriteAllowed()) return;
+
+    Endpoint_Write_Stream_LE(report, size, NULL);
+    Endpoint_ClearIN();
+}
+
 #ifdef VIRTSER_ENABLE
 // clang-format off
 
@@ -121,30 +138,8 @@ USB_ClassInfo_CDC_Device_t cdc_device = {
  * FIXME: Needs doc
  */
 void raw_hid_send(uint8_t *data, uint8_t length) {
-    // TODO: implement variable size packet
-    if (length != RAW_EPSIZE) {
-        return;
-    }
-
-    if (USB_DeviceState != DEVICE_STATE_Configured) {
-        return;
-    }
-
-    // TODO: decide if we allow calls to raw_hid_send() in the middle
-    // of other endpoint usage.
-    uint8_t ep = Endpoint_GetCurrentEndpoint();
-
-    Endpoint_SelectEndpoint(RAW_IN_EPNUM);
-
-    // Check to see if the host is ready to accept another packet
-    if (Endpoint_IsINReady()) {
-        // Write data
-        Endpoint_Write_Stream_LE(data, RAW_EPSIZE, NULL);
-        // Finalize the stream transfer to send the last packet
-        Endpoint_ClearIN();
-    }
-
-    Endpoint_SelectEndpoint(ep);
+    if (length != RAW_EPSIZE) return;
+    send_report(RAW_IN_EPNUM, data, RAW_EPSIZE);
 }
 
 /** \brief Raw HID Receive
@@ -249,29 +244,6 @@ static void Console_Task(void) {
 }
 #endif
 
-/*******************************************************************************
- * Joystick
- ******************************************************************************/
-void send_joystick(report_joystick_t *report) {
-#ifdef JOYSTICK_ENABLE
-    uint8_t timeout = 255;
-
-    /* Select the Joystick Report Endpoint */
-    Endpoint_SelectEndpoint(JOYSTICK_IN_EPNUM);
-
-    /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed())
-        _delay_us(40);
-    if (!Endpoint_IsReadWriteAllowed()) return;
-
-    /* Write Joystick Report Data */
-    Endpoint_Write_Stream_LE(report, sizeof(report_joystick_t), NULL);
-
-    /* Finalize the stream transfer to send the last packet */
-    Endpoint_ClearIN();
-#endif
-}
-
 /*******************************************************************************
  * USB Events
  ******************************************************************************/
@@ -587,32 +559,23 @@ static uint8_t keyboard_leds(void) {
  * FIXME: Needs doc
  */
 static void send_keyboard(report_keyboard_t *report) {
-    uint8_t timeout = 255;
-
     /* Select the Keyboard Report Endpoint */
     uint8_t ep   = KEYBOARD_IN_EPNUM;
     uint8_t size = KEYBOARD_REPORT_SIZE;
-#ifdef NKRO_ENABLE
-    if (keyboard_protocol && keymap_config.nkro) {
-        ep   = SHARED_IN_EPNUM;
-        size = sizeof(struct nkro_report);
-    }
-#endif
-    Endpoint_SelectEndpoint(ep);
-    /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed())
-        _delay_us(40);
-    if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* If we're in Boot Protocol, don't send any report ID or other funky fields */
     if (!keyboard_protocol) {
-        Endpoint_Write_Stream_LE(&report->mods, 8, NULL);
+        send_report(ep, &report->mods, 8);
     } else {
-        Endpoint_Write_Stream_LE(report, size, NULL);
-    }
+#ifdef NKRO_ENABLE
+        if (keymap_config.nkro) {
+            ep   = SHARED_IN_EPNUM;
+            size = sizeof(struct nkro_report);
+        }
+#endif
 
-    /* Finalize the stream transfer to send the last packet */
-    Endpoint_ClearIN();
+        send_report(ep, report, size);
+    }
 
     keyboard_report_sent = *report;
 }
@@ -623,55 +586,35 @@ static void send_keyboard(report_keyboard_t *report) {
  */
 static void send_mouse(report_mouse_t *report) {
 #ifdef MOUSE_ENABLE
-    uint8_t timeout = 255;
-
-    /* Select the Mouse Report Endpoint */
-    Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);
-
-    /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed())
-        _delay_us(40);
-    if (!Endpoint_IsReadWriteAllowed()) return;
-
-    /* Write Mouse Report Data */
-    Endpoint_Write_Stream_LE(report, sizeof(report_mouse_t), NULL);
-
-    /* Finalize the stream transfer to send the last packet */
-    Endpoint_ClearIN();
+    send_report(MOUSE_IN_EPNUM, report, sizeof(report_mouse_t));
 #endif
 }
 
-#if defined(EXTRAKEY_ENABLE) || defined(PROGRAMMABLE_BUTTON_ENABLE)
-static void send_report(void *report, size_t size) {
-    uint8_t timeout = 255;
-
-    if (USB_DeviceState != DEVICE_STATE_Configured) return;
-
-    Endpoint_SelectEndpoint(SHARED_IN_EPNUM);
-
-    /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed())
-        _delay_us(40);
-    if (!Endpoint_IsReadWriteAllowed()) return;
-
-    Endpoint_Write_Stream_LE(report, size, NULL);
-    Endpoint_ClearIN();
-}
-#endif
-
 /** \brief Send Extra
  *
  * FIXME: Needs doc
  */
 static void send_extra(report_extra_t *report) {
 #ifdef EXTRAKEY_ENABLE
-    send_report(report, sizeof(report_extra_t));
+    send_report(SHARED_IN_EPNUM, report, sizeof(report_extra_t));
+#endif
+}
+
+void send_joystick(report_joystick_t *report) {
+#ifdef JOYSTICK_ENABLE
+    send_report(JOYSTICK_IN_EPNUM, report, sizeof(report_joystick_t));
 #endif
 }
 
 void send_programmable_button(report_programmable_button_t *report) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-    send_report(report, sizeof(report_programmable_button_t));
+    send_report(SHARED_IN_EPNUM, report, sizeof(report_programmable_button_t));
+#endif
+}
+
+void send_digitizer(report_digitizer_t *report) {
+#ifdef DIGITIZER_ENABLE
+    send_report(DIGITIZER_IN_EPNUM, report, sizeof(report_digitizer_t));
 #endif
 }
 
@@ -844,24 +787,6 @@ void virtser_send(const uint8_t byte) {
 }
 #endif
 
-void send_digitizer(report_digitizer_t *report) {
-#ifdef DIGITIZER_ENABLE
-    uint8_t timeout = 255;
-
-    if (USB_DeviceState != DEVICE_STATE_Configured) return;
-
-    Endpoint_SelectEndpoint(DIGITIZER_IN_EPNUM);
-
-    /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed())
-        _delay_us(40);
-    if (!Endpoint_IsReadWriteAllowed()) return;
-
-    Endpoint_Write_Stream_LE(report, sizeof(report_digitizer_t), NULL);
-    Endpoint_ClearIN();
-#endif
-}
-
 /*******************************************************************************
  * main
  ******************************************************************************/

From be1c9af209c491c13331fa1da895ce196ba2fcda Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 15 Oct 2022 09:54:52 -0700
Subject: [PATCH 644/959] Update info.json configs to explicitly list RGBLIGHT
 animations (#18730)

---
 .../boardsource/holiday/spooky/info.json      | 11 ++++++++++-
 keyboards/boardsource/microdox/v1/info.json   | 11 ++++++++++-
 keyboards/boardsource/the_mark/info.json      | 11 ++++++++++-
 keyboards/capsunlocked/cu80/v2_ansi/info.json | 11 ++++++++++-
 keyboards/capsunlocked/cu80/v2_iso/info.json  | 11 ++++++++++-
 keyboards/clueboard/17/info.json              | 11 ++++++++++-
 keyboards/clueboard/2x1800/2018/info.json     | 11 ++++++++++-
 keyboards/clueboard/66/rev1/info.json         | 11 ++++++++++-
 keyboards/clueboard/66/rev2/info.json         | 11 ++++++++++-
 keyboards/clueboard/66/rev3/info.json         | 11 ++++++++++-
 keyboards/clueboard/66/rev4/info.json         | 11 ++++++++++-
 .../clueboard/66_hotswap/prototype/info.json  | 11 ++++++++++-
 keyboards/custommk/evo70/info.json            | 19 ++++++++++++++-----
 keyboards/dyz/dyz40/info.json                 | 11 ++++++++++-
 keyboards/dyz/dyz60/info.json                 | 11 ++++++++++-
 keyboards/dyz/dyz60_hs/info.json              | 11 ++++++++++-
 keyboards/dyz/dyz_tkl/info.json               | 11 ++++++++++-
 keyboards/dyz/selka40/info.json               | 11 ++++++++++-
 keyboards/dyz/synthesis60/info.json           | 11 ++++++++++-
 keyboards/jacky_studio/piggy60/info.json      | 11 ++++++++++-
 keyboards/keebio/sinc/rev1/info.json          | 11 ++++++++++-
 keyboards/keebio/sinc/rev2/info.json          | 11 ++++++++++-
 .../takashicompany/spreadwriter/info.json     | 13 +++++++++++--
 keyboards/work_louder/micro/info.json         | 11 ++++++++++-
 24 files changed, 245 insertions(+), 29 deletions(-)

diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json
index 56be9f7d26..393b4fd806 100644
--- a/keyboards/boardsource/holiday/spooky/info.json
+++ b/keyboards/boardsource/holiday/spooky/info.json
@@ -25,7 +25,16 @@
     "pin": "D3",
     "sleep": true,
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     }
   },
   "community_layouts": [
diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json
index 85f2e61457..ba8307221a 100644
--- a/keyboards/boardsource/microdox/v1/info.json
+++ b/keyboards/boardsource/microdox/v1/info.json
@@ -19,7 +19,16 @@
     "split_count": [6, 6],
     "max_brightness": 150,
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     }
   }
 }
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index 7518a39026..46f10affcd 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -28,7 +28,16 @@
     "sleep": true,
     "max_brightness": 200,
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     }
   },
   "rgb_matrix": {
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json
index 96234185f6..e477f3d587 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/info.json
+++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json
@@ -25,7 +25,16 @@
   "processor": "atmega32u4",
   "rgblight": {
     "animations": {
-      "all": false
+      "alternating": false,
+      "breathing": false,
+      "christmas": false,
+      "knight": false,
+      "rainbow_mood": false,
+      "rainbow_swirl": false,
+      "rgb_test": false,
+      "snake": false,
+      "static_gradient": false,
+      "twinkle": false
     },
     "brightness_steps": 8,
     "hue_steps": 8,
diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json
index 61e033c59f..55543ea4e5 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/info.json
+++ b/keyboards/capsunlocked/cu80/v2_iso/info.json
@@ -25,7 +25,16 @@
   "processor": "atmega32u4",
   "rgblight": {
     "animations": {
-      "all": false
+      "alternating": false,
+      "breathing": false,
+      "christmas": false,
+      "knight": false,
+      "rainbow_mood": false,
+      "rainbow_swirl": false,
+      "rgb_test": false,
+      "snake": false,
+      "static_gradient": false,
+      "twinkle": false
     },
     "brightness_steps": 8,
     "hue_steps": 8,
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index 5d87806703..33b888b059 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -23,7 +23,16 @@
   },
   "rgblight": {
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     },
     "brightness_steps": 17,
     "hue_steps": 10,
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
index 38e7421a14..e732f28855 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/keyboards/clueboard/2x1800/2018/info.json
@@ -29,7 +29,16 @@
   },
   "rgblight": {
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     },
     "brightness_steps": 8,
     "hue_steps": 8,
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json
index 76aa685768..24e995bcb4 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -29,7 +29,16 @@
   },
   "rgblight": {
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     },
     "brightness_steps": 17,
     "hue_steps": 10,
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index 7ee7a88df0..6f94caf7e5 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -29,7 +29,16 @@
   },
   "rgblight": {
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     },
     "brightness_steps": 17,
     "hue_steps": 32,
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json
index 0dc0097a52..a44e007225 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -29,7 +29,16 @@
   },
   "rgblight": {
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     },
     "brightness_steps": 17,
     "hue_steps": 32,
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index 8733216f05..41f5757c52 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -27,7 +27,16 @@
   },
   "rgblight": {
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     },
     "brightness_steps": 17,
     "hue_steps": 32,
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index 21db54513f..d29a4e7169 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -29,7 +29,16 @@
   },
   "rgblight": {
     "animations": {
-      "all": true
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
     },
     "brightness_steps": 17,
     "hue_steps": 32,
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index f3d132fd79..86345e21b7 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "EVO70", 
-    "url": "https://www.customMK.com", 
-    "maintainer": "customMK", 
+    "keyboard_name": "EVO70",
+    "url": "https://www.customMK.com",
+    "maintainer": "customMK",
     "manufacturer": "customMK",
     "tags": ["70%", "encoder", "underglow", "backlight"],
     "usb": {
@@ -24,7 +24,16 @@
         "saturation_steps": 8,
         "brightness_steps": 4,
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "layouts": {
@@ -108,4 +117,4 @@
                 {"label":"KC_RGHT", "x":17.5, "y":5.1}]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json
index e63b0d4f10..98b9aa5427 100644
--- a/keyboards/dyz/dyz40/info.json
+++ b/keyboards/dyz/dyz40/info.json
@@ -15,7 +15,16 @@
         "saturation_steps": 10,
         "brightness_steps": 10,
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "usb": {
diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json
index 2717dbb6a5..18f4d8f4f4 100644
--- a/keyboards/dyz/dyz60/info.json
+++ b/keyboards/dyz/dyz60/info.json
@@ -15,7 +15,16 @@
         "saturation_steps": 10,
         "brightness_steps": 10,
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "usb": {
diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json
index b40b0f0590..701f09a984 100644
--- a/keyboards/dyz/dyz60_hs/info.json
+++ b/keyboards/dyz/dyz60_hs/info.json
@@ -15,7 +15,16 @@
         "saturation_steps": 10,
         "brightness_steps": 10,
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "indicators": {
diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json
index 7628b43c94..696483d628 100644
--- a/keyboards/dyz/dyz_tkl/info.json
+++ b/keyboards/dyz/dyz_tkl/info.json
@@ -12,7 +12,16 @@
         "led_count": 25,
         "pin": "D1",
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "usb": {
diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json
index e8fae95b26..d1a1b54cfc 100644
--- a/keyboards/dyz/selka40/info.json
+++ b/keyboards/dyz/selka40/info.json
@@ -15,7 +15,16 @@
         "saturation_steps": 10,
         "brightness_steps": 10,
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "usb": {
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index 07f3e9a768..edf49806c3 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -30,7 +30,16 @@
         "saturation_steps": 10,
         "brightness_steps": 10,
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "usb": {
diff --git a/keyboards/jacky_studio/piggy60/info.json b/keyboards/jacky_studio/piggy60/info.json
index 2805209f47..a3c7f5eb41 100644
--- a/keyboards/jacky_studio/piggy60/info.json
+++ b/keyboards/jacky_studio/piggy60/info.json
@@ -36,7 +36,16 @@
         "led_count": 14,
         "pin": "E2",
         "animations": {
-               "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         },
         "sleep": true,
         "max_brightness": 255
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 3c8a90c206..b10bf99fad 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -51,7 +51,16 @@
         "led_count" : 16,
         "split_count": [8, 8],
         "animations": {
-            "all": true,
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     }
 }
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index c3dd1d80ed..77e7fe5690 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -51,7 +51,16 @@
         "led_count" : 16,
         "split_count": [8, 8],
         "animations": {
-            "all": true,
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     }
 }
diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json
index 2f802bab0b..86f250966a 100644
--- a/keyboards/takashicompany/spreadwriter/info.json
+++ b/keyboards/takashicompany/spreadwriter/info.json
@@ -47,7 +47,16 @@
         "saturation_steps": 17,
         "brightness_steps": 17,
         "animations": {
-            "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     },
     "layouts": {
@@ -504,4 +513,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index 3905f226f8..aee775e3d2 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -22,7 +22,16 @@
     "processor": "atmega32u4",
     "rgblight": {
         "animations": {
-          "all": true
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         },
         "brightness_steps": 8,
         "hue_steps": 8,

From d021bedf50801161a49812f63c425b372347055b Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 15 Oct 2022 09:55:12 -0700
Subject: [PATCH 645/959] Remove RGBLIGHT_ANIMTION and clean up effect defines
 for 0-F (#18725)

---
 keyboards/0xc7/61key/config.h                 |  4 +--
 keyboards/0xcb/1337/config.h                  | 16 ++++++----
 keyboards/10bleoledhub/config.h               | 11 ++++++-
 keyboards/1upkeyboards/1up60hse/config.h      | 11 ++++++-
 keyboards/1upkeyboards/1up60hte/config.h      | 11 ++++++-
 keyboards/1upkeyboards/1up60rgb/config.h      | 11 ++++++-
 keyboards/1upkeyboards/super16/config.h       | 22 +++++++-------
 keyboards/1upkeyboards/sweet16/v1/config.h    | 11 ++++++-
 keyboards/25keys/aleth42/rev0/config.h        | 23 +++++++-------
 keyboards/25keys/aleth42/rev1/config.h        | 24 +++++++--------
 keyboards/25keys/cassette42/config.h          | 11 ++++++-
 .../25keys/zinc/keymaps/default/rules.mk      |  2 --
 .../25keys/zinc/keymaps/ginjake/rules.mk      |  2 --
 keyboards/25keys/zinc/keymaps/monks/rules.mk  |  2 --
 .../25keys/zinc/keymaps/toshi0383/rules.mk    |  2 --
 keyboards/25keys/zinc/keymaps/via/config.h    | 20 ++++++-------
 keyboards/25keys/zinc/keymaps/via/rules.mk    |  2 --
 keyboards/25keys/zinc/rev1/post_config.h      |  2 +-
 keyboards/25keys/zinc/reva/post_config.h      |  2 +-
 keyboards/2key2crawl/config.h                 | 11 ++++++-
 keyboards/40percentclub/25/config.h           |  1 -
 keyboards/40percentclub/4pack/config.h        | 12 --------
 keyboards/40percentclub/5x5/config.h          |  1 -
 keyboards/40percentclub/6lit/config.h         |  1 -
 keyboards/40percentclub/foobar/config.h       |  1 -
 keyboards/40percentclub/gherkin/config.h      | 11 ++++++-
 .../gherkin/keymaps/itsaferbie/config.h       | 11 ++++++-
 .../gherkin/keymaps/michel/config.h           | 11 ++++++-
 keyboards/40percentclub/half_n_half/config.h  | 12 --------
 keyboards/40percentclub/luddite/config.h      | 11 ++++++-
 keyboards/40percentclub/mf68/config.h         | 12 --------
 keyboards/40percentclub/nano/config.h         | 11 ++++++-
 .../nano/keymaps/spooka/config.h              | 11 ++++++-
 keyboards/40percentclub/nein/config.h         | 12 --------
 keyboards/40percentclub/nori/config.h         | 11 ++++++-
 keyboards/40percentclub/sixpack/config.h      | 12 --------
 keyboards/40percentclub/tomato/config.h       | 11 ++++++-
 .../40percentclub/ut47/keymaps/rgb/config.h   | 11 ++++++-
 keyboards/4pplet/aekiso60/rev_a/config.h      | 11 ++++++-
 .../4pplet/eagle_viper_rep/rev_a/config.h     | 13 ++++++--
 keyboards/4pplet/steezy60/rev_a/config.h      | 11 ++++++-
 keyboards/8pack/config.h                      | 11 ++++++-
 .../ellipse/keymaps/abstractkb/config.h       | 11 ++++++-
 keyboards/abstract/ellipse/rev1/config.h      | 12 --------
 keyboards/acekeyboard/titan60/config.h        | 11 ++++++-
 keyboards/acheron/elongate/beta/config.h      | 30 +++++++++----------
 keyboards/acheron/shark/alpha/config.h        | 12 --------
 keyboards/acheron/shark/beta/config.h         | 11 ++++++-
 keyboards/adelheid/config.h                   | 12 --------
 keyboards/aeboards/ext65/rev2/config.h        | 11 ++++++-
 keyboards/ai03/equinox/config.h               | 12 --------
 keyboards/ai03/lunar/config.h                 | 12 --------
 keyboards/ai03/orbit/config.h                 | 12 --------
 keyboards/ai03/polaris/config.h               | 22 +++++++-------
 keyboards/ai03/quasar/config.h                | 12 --------
 keyboards/ai03/soyuz/config.h                 | 12 --------
 keyboards/ai03/voyager60_alps/config.h        | 12 --------
 keyboards/aleblazer/zodiark/config.h          | 11 ++++++-
 keyboards/alf/dc60/config.h                   | 11 ++++++-
 keyboards/alf/x11/config.h                    | 22 +++++++-------
 keyboards/alf/x2/config.h                     | 13 ++++++--
 keyboards/alfredslab/swift65/solder/config.h  | 22 +++++++-------
 keyboards/alpha/config.h                      | 11 ++++++-
 keyboards/alpine65/config.h                   | 11 ++++++-
 keyboards/amag23/config.h                     | 12 +++++++-
 keyboards/amjkeyboard/amj40/config.h          | 11 ++++++-
 keyboards/amjkeyboard/amj60/config.h          | 22 +++++++-------
 keyboards/amjkeyboard/amj96/config.h          | 22 +++++++-------
 keyboards/amjkeyboard/amjpad/config.h         | 12 +++++++-
 keyboards/anavi/macropad8/config.h            | 21 +++++++++----
 .../anavi/macropad8/keymaps/git/config.h      | 11 +++----
 keyboards/aos/tkl/config.h                    | 21 +++++++++----
 keyboards/aplyard/aplx6/rev1/config.h         |  1 -
 keyboards/arabica37/keymaps/default/config.h  | 11 ++++++-
 keyboards/ares/config.h                       | 11 ++++++-
 keyboards/arisu/config.h                      | 12 --------
 keyboards/ash1800/config.h                    | 12 --------
 keyboards/atlas_65/config.h                   | 12 --------
 keyboards/atxkb/1894/config.h                 | 22 +++++++-------
 keyboards/aves60/config.h                     |  2 --
 keyboards/aves65/config.h                     | 11 ++++++-
 keyboards/baguette/config.h                   |  1 -
 keyboards/bandominedoni/config.h              | 12 --------
 keyboards/barleycorn_smd/config.h             | 11 ++++++-
 keyboards/basekeys/slice/rev1_rgb/config.h    | 11 ++++++-
 keyboards/basekeys/trifecta/config.h          | 11 ++++++-
 keyboards/bastardkb/tbk/config.h              | 13 ++++++--
 keyboards/bfake/config.h                      | 11 ++++++-
 .../ergo42/keymaps/biacco-underglow/config.h  | 12 ++++++--
 .../ergo42/keymaps/default-underglow/config.h | 12 ++++++--
 .../biacco42/ergo42/keymaps/hdbx/config.h     | 12 ++++++--
 keyboards/biacco42/meishi2/config.h           | 12 --------
 keyboards/bioi/g60/config.h                   | 11 ++++++-
 keyboards/bioi/g60ble/config.h                | 11 ++++++-
 keyboards/bioi/main.c                         |  2 +-
 keyboards/bioi/morgan65/config.h              | 11 ++++++-
 keyboards/bioi/s65/config.h                   | 11 ++++++-
 keyboards/blackplum/config.h                  | 11 ++++++-
 keyboards/blank/blank01/config.h              | 12 --------
 keyboards/blockey/config.h                    | 11 ++++++-
 keyboards/boardrun/bizarre/config.h           | 11 ++++++-
 keyboards/boardrun/classic/config.h           | 11 ++++++-
 keyboards/boardwalk/config.h                  | 11 ++++++-
 keyboards/boston/config.h                     | 13 ++++++--
 keyboards/boston_meetup/2019/config.h         | 11 ++++++-
 keyboards/bpiphany/four_banger/config.h       | 11 ++++++-
 keyboards/bt66tech/bt66tech60/config.h        | 11 ++++++-
 keyboards/bthlabs/geekpad/config.h            |  1 -
 keyboards/buildakb/potato65/config.h          | 11 ++++++-
 keyboards/buildakb/potato65hs/config.h        | 11 ++++++-
 keyboards/cannonkeys/adelie/config.h          | 22 +++++++-------
 keyboards/cannonkeys/an_c/config.h            | 11 ++++++-
 keyboards/cannonkeys/atlas/config.h           | 11 ++++++-
 keyboards/cannonkeys/atlas_alps/config.h      | 11 ++++++-
 keyboards/cannonkeys/db60/config.h            | 11 ++++++-
 keyboards/cannonkeys/devastatingtkl/config.h  | 11 ++++++-
 keyboards/cannonkeys/instant60/config.h       | 11 ++++++-
 keyboards/cannonkeys/instant65/config.h       | 11 ++++++-
 keyboards/cannonkeys/obliterated75/config.h   | 11 ++++++-
 keyboards/cannonkeys/ortho48/config.h         | 11 ++++++-
 keyboards/cannonkeys/ortho60/config.h         | 12 +++++++-
 keyboards/cannonkeys/ortho75/config.h         | 12 +++++++-
 keyboards/cannonkeys/practice60/config.h      | 12 +++++++-
 keyboards/cannonkeys/practice65/config.h      | 12 +++++++-
 keyboards/cannonkeys/sagittarius/config.h     | 12 +++++++-
 keyboards/cannonkeys/savage65/config.h        | 12 +++++++-
 keyboards/cannonkeys/tmov2/config.h           | 12 +++++++-
 keyboards/cannonkeys/tsukuyomi/config.h       | 12 +++++++-
 keyboards/capsunlocked/cu24/config.h          | 12 +++++++-
 keyboards/capsunlocked/cu7/config.h           | 12 +++++++-
 keyboards/capsunlocked/cu75/config.h          | 12 +++++++-
 keyboards/capsunlocked/cu80/v1/config.h       | 11 ++++++-
 keyboards/capsunlocked/cu80/v2_ansi/config.h  | 11 ++++++-
 .../capsunlocked/cu80/v2_ansi/rgb/config.h    |  1 -
 keyboards/capsunlocked/cu80/v2_iso/config.h   | 11 ++++++-
 .../capsunlocked/cu80/v2_iso/rgb/config.h     |  1 -
 keyboards/catch22/config.h                    | 11 ++++++-
 keyboards/checkerboards/axon40/config.h       | 11 ++++++-
 .../checkerboards/candybar_ortho/config.h     | 11 ++++++-
 keyboards/checkerboards/nop60/config.h        | 11 ++++++-
 keyboards/checkerboards/plexus75/config.h     | 11 ++++++-
 keyboards/checkerboards/pursuit40/config.h    | 11 ++++++-
 keyboards/checkerboards/quark/config.h        | 11 ++++++-
 .../checkerboards/quark_squared/config.h      | 11 ++++++-
 .../checkerboards/ud40_ortho_alt/config.h     | 11 ++++++-
 keyboards/cherrybstudio/cb1800/config.h       | 13 ++++++--
 keyboards/cherrybstudio/cb87/config.h         | 11 ++++++-
 keyboards/cheshire/curiosity/config.h         | 11 ++++++-
 keyboards/chromatonemini/config.h             | 12 --------
 keyboards/ck60i/config.h                      | 11 ++++++-
 keyboards/ckeys/washington/config.h           | 12 --------
 .../card/keymaps/rgb_effects/config.h         | 11 ++++++-
 keyboards/contra/keymaps/maxr1998/config.h    | 11 ++++++-
 keyboards/cool836a/config.h                   | 12 --------
 .../copenhagen_click/click_pad_v1/config.h    | 12 --------
 keyboards/coseyfannitutti/discipad/config.h   | 13 --------
 keyboards/coseyfannitutti/discipline/config.h | 13 --------
 keyboards/coseyfannitutti/mullet/config.h     | 11 ++++++-
 keyboards/coseyfannitutti/mulletpad/config.h  |  1 -
 keyboards/coseyfannitutti/mysterium/config.h  | 12 --------
 keyboards/coseyfannitutti/romeo/config.h      | 12 --------
 keyboards/cozykeys/bloomer/config.h           | 12 ++++++--
 keyboards/cozykeys/speedo/v3/config.h         | 11 ++++++-
 keyboards/craftwalk/config.h                  |  2 --
 keyboards/crawlpad/config.h                   | 11 ++++++-
 keyboards/crazy_keyboard_68/config.h          | 22 +++++++-------
 keyboards/crkbd/keymaps/armand1m/config.h     | 11 ++++++-
 keyboards/crkbd/keymaps/crkqwes/config.h      | 11 ++++++-
 keyboards/crkbd/keymaps/devdev/config.h       |  1 -
 keyboards/crkbd/keymaps/hvp/config.h          | 11 ++++++-
 keyboards/crkbd/keymaps/jarred/config.h       | 11 ++++++-
 keyboards/crkbd/keymaps/kidbrazil/config.h    |  1 -
 keyboards/crkbd/keymaps/madhatter/config.h    | 11 ++++++-
 keyboards/crkbd/keymaps/oled_sample/config.h  | 11 ++++++-
 keyboards/crkbd/keymaps/rarick/config.h       | 11 ++++++-
 keyboards/crkbd/keymaps/rjhilgefort/config.h  | 12 ++++++--
 keyboards/crkbd/keymaps/rs/config.h           | 11 ++++++-
 keyboards/crkbd/keymaps/snowe/config.h        | 11 ++++++-
 keyboards/crkbd/keymaps/soundmonster/config.h | 11 ++++++-
 keyboards/crkbd/keymaps/sulrich/config.h      | 11 ++++++-
 keyboards/crkbd/keymaps/thumb_ctrl/config.h   | 11 ++++++-
 keyboards/crkbd/keymaps/vayashiko/config.h    | 11 ++++++-
 .../keymaps/vlukash_trackpad_left/config.h    | 11 ++++++-
 .../keymaps/vlukash_trackpad_right/config.h   | 11 ++++++-
 keyboards/crkbd/keymaps/vxid/config.h         | 11 ++++++-
 keyboards/crkbd/keymaps/xyverz/config.h       | 11 ++++++-
 keyboards/cutie_club/wraith/config.h          | 12 --------
 keyboards/cx60/config.h                       | 11 ++++++-
 keyboards/dailycraft/bat43/config.h           | 12 --------
 keyboards/dailycraft/owl8/config.h            | 12 --------
 keyboards/dailycraft/sandbox/rev1/config.h    | 12 --------
 keyboards/dailycraft/sandbox/rev2/config.h    | 12 --------
 keyboards/dailycraft/stickey4/config.h        | 12 --------
 keyboards/dailycraft/wings42/rev1/config.h    | 12 --------
 .../dailycraft/wings42/rev1_extkeys/config.h  | 12 --------
 keyboards/dailycraft/wings42/rev2/config.h    | 12 --------
 keyboards/db/db63/config.h                    | 11 ++++++-
 keyboards/delikeeb/flatbread60/config.h       | 13 ++++++--
 keyboards/delikeeb/vaguettelite/config.h      |  3 --
 keyboards/delikeeb/vanana/rev1/config.h       |  3 --
 keyboards/delikeeb/vanana/rev2/config.h       |  3 --
 keyboards/delikeeb/waaffle/rev3/config.h      |  3 --
 keyboards/deltapad/config.h                   | 12 --------
 .../deltasplit75/keymaps/itsaferbie/config.h  | 11 ++++++-
 keyboards/dk60/config.h                       | 12 --------
 keyboards/dm9records/plaid/config.h           | 12 --------
 keyboards/dm9records/tartan/config.h          | 12 --------
 .../dmqdesign/spin/keymaps/gorbachev/config.h | 11 ++++++-
 .../spin/keymaps/spidey3_pad/config.h         |  2 +-
 keyboards/do60/config.h                       | 11 ++++++-
 keyboards/donutcables/budget96/config.h       | 11 ++++++-
 .../budget96/keymaps/donut/config.h           | 11 +++----
 keyboards/donutcables/scrabblepad/config.h    | 12 --------
 keyboards/doppelganger/config.h               | 12 --------
 keyboards/dp60/config.h                       | 11 ++++++-
 keyboards/draytronics/daisy/config.h          | 11 ++++++-
 keyboards/draytronics/elise/config.h          | 11 ++++++-
 keyboards/duck/eagle_viper/v2/config.h        | 11 ++++++-
 keyboards/duck/jetfire/config.h               | 11 ++++++-
 keyboards/duck/lightsaver/config.h            | 11 ++++++-
 keyboards/duck/octagon/v1/config.h            | 11 ++++++-
 keyboards/duck/octagon/v2/config.h            | 11 ++++++-
 keyboards/duck/orion/v3/config.h              | 11 ++++++-
 keyboards/duck/tcv3/config.h                  | 11 ++++++-
 keyboards/dz60/config.h                       | 11 ++++++-
 keyboards/dz60/keymaps/chrisae9/config.h      |  8 ++---
 keyboards/dztech/bocc/config.h                | 11 ++++++-
 keyboards/ealdin/quadrant/config.h            | 22 +++++++-------
 keyboards/eco/keymaps/bcat/config.h           | 11 ++++++-
 keyboards/edi/hardlight/mk1/config.h          | 13 ++++++--
 keyboards/edi/hardlight/mk2/config.h          | 13 ++++++--
 keyboards/edi/standaside/config.h             | 12 +++++++-
 keyboards/eek/config.h                        | 22 +++++++-------
 keyboards/efreet/config.h                     | 12 --------
 keyboards/emi20/config.h                      | 11 ++++++-
 keyboards/eniigmakeyboards/ek65/config.h      | 12 --------
 keyboards/eniigmakeyboards/ek87/config.h      | 12 --------
 keyboards/ep/comsn/mollydooker/config.h       | 11 ++++++-
 keyboards/ergodox_ez/config.h                 | 11 ++++++-
 .../ergodox_ez/keymaps/danielo515/config.h    | 11 ++++++-
 keyboards/ergotravel/keymaps/default/config.h | 13 ++++++--
 keyboards/ergotravel/keymaps/ian/config.h     | 13 ++++++--
 keyboards/ergotravel/keymaps/rs/config.h      | 13 ++++++--
 keyboards/ergotravel/keymaps/via/config.h     |  3 --
 keyboards/ergotravel/keymaps/yanfali/config.h | 11 ++++++-
 .../ericrlau/numdiscipline/rev1/config.h      | 12 --------
 keyboards/esca/getawayvan/config.h            | 11 ++++++-
 keyboards/esca/getawayvan_f042/config.h       | 11 ++++++-
 keyboards/eternal_keypad/config.h             | 23 +++++++-------
 keyboards/evolv/config.h                      | 11 ++++++-
 keyboards/evyd13/atom47/rev3/config.h         | 11 ++++++-
 keyboards/evyd13/atom47/rev5/config.h         | 12 --------
 keyboards/evyd13/eon40/config.h               | 12 --------
 keyboards/evyd13/eon65/config.h               | 22 +++++++-------
 keyboards/evyd13/eon75/config.h               | 12 --------
 keyboards/evyd13/eon87/config.h               | 22 +++++++-------
 keyboards/evyd13/eon95/config.h               | 12 --------
 keyboards/evyd13/gh80_1800/config.h           | 12 --------
 keyboards/evyd13/gh80_3700/config.h           | 12 --------
 .../evyd13/gh80_3700/keymaps/rgb/config.h     | 13 ++++++--
 keyboards/evyd13/gud70/config.h               | 12 --------
 keyboards/evyd13/minitomic/config.h           | 12 --------
 keyboards/evyd13/mx5160/config.h              | 12 --------
 keyboards/evyd13/nt660/config.h               | 12 --------
 keyboards/evyd13/nt750/config.h               | 12 --------
 keyboards/evyd13/nt980/config.h               | 12 --------
 keyboards/evyd13/omrontkl/config.h            | 12 --------
 .../plain60/keymaps/kwerdenker/config.h       | 11 ++++++-
 keyboards/evyd13/plain60/keymaps/rgb/config.h | 11 ++++++-
 keyboards/evyd13/pockettype/config.h          | 12 --------
 keyboards/evyd13/quackfire/config.h           | 12 --------
 keyboards/evyd13/solheim68/config.h           | 12 --------
 keyboards/evyd13/ta65/config.h                | 11 ++++++-
 keyboards/evyd13/wasdat_code/config.h         | 12 --------
 keyboards/evyd13/wonderland/config.h          | 11 ++++++-
 keyboards/exclusive/e65/config.h              | 11 ++++++-
 keyboards/exclusive/e6_rgb/config.h           | 11 ++++++-
 keyboards/exclusive/e6v2/le/config.h          | 11 ++++++-
 keyboards/exclusive/e6v2/le_bmc/config.h      | 11 ++++++-
 keyboards/exclusive/e6v2/oe/config.h          | 11 ++++++-
 keyboards/exclusive/e6v2/oe_bmc/config.h      | 11 ++++++-
 keyboards/exclusive/e7v1/config.h             | 11 ++++++-
 keyboards/exclusive/e7v1se/config.h           | 22 +++++++-------
 keyboards/exclusive/e85/config.h              | 12 ++++++--
 keyboards/exent/config.h                      | 12 +++++++-
 keyboards/eyeohdesigns/babyv/config.h         | 12 ++++++--
 keyboards/facew/config.h                      | 11 ++++++-
 keyboards/fallacy/config.h                    | 11 ++++++-
 keyboards/fc660c/keymaps/default_rgb/config.h |  5 +---
 keyboards/fc660c/keymaps/via_rgb/config.h     |  5 +---
 keyboards/ferris/keymaps/default/config.h     | 17 ++++++++---
 keyboards/ferris/keymaps/pierrec83/config.h   | 17 ++++++++---
 keyboards/ferris/keymaps/test/config.h        | 18 ++++++++---
 keyboards/flehrad/bigswitch/config.h          | 11 ++++++-
 keyboards/flehrad/downbubble/config.h         | 12 --------
 keyboards/flehrad/numbrero/config.h           | 11 ++++++-
 keyboards/flehrad/snagpad/config.h            | 11 ++++++-
 keyboards/flehrad/tradestation/config.h       | 11 ++++++-
 keyboards/fleuron/config.h                    | 11 ++++++-
 keyboards/fluorite/config.h                   | 12 --------
 keyboards/flx/virgo/config.h                  |  3 --
 keyboards/flxlb/zplit/config.h                | 12 +++++++-
 keyboards/foostan/cornelius/config.h          | 12 --------
 keyboards/foxlab/key65/hotswap/config.h       | 11 ++++++-
 keyboards/foxlab/key65/universal/config.h     | 11 ++++++-
 keyboards/foxlab/leaf60/hotswap/config.h      | 13 ++++++--
 keyboards/foxlab/leaf60/universal/config.h    | 12 ++++++--
 keyboards/foxlab/time80/config.h              | 12 --------
 keyboards/foxlab/time_re/hotswap/config.h     | 11 ++++++-
 keyboards/foxlab/time_re/universal/config.h   | 11 ++++++-
 keyboards/fractal/config.h                    | 11 ++++++-
 keyboards/ft/mars80/config.h                  | 11 ++++++-
 312 files changed, 2164 insertions(+), 1362 deletions(-)

diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index 6eeb183379..37bbb9476b 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -62,9 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
+/*== choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 //#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 3b34af6580..6ee93887f7 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -46,12 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  #define RGBLIGHT_ANIMATIONS /* comment this and uncomment the lines below to save space */
-  // #define RGBLIGHT_EFFECT_BREATHING
-  // #define RGBLIGHT_EFFECT_SNAKE
-  // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-  // #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-  // #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   /* default setup after eeprom reset */
   #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
   #define RGBLIGHT_DEFAULT_HUE 152
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index 86d5b59348..83f83914d0 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -33,7 +33,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 
 #define OLED_FONT_H "./lib/glcdfont.c"
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 62d28fd6c9..05d5f82569 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index db8da3f6f5..f82a9b550d 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -51,7 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 02959ddafa..b26da08893 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -30,7 +30,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 9220655ac2..b74ebe2a2c 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -60,18 +60,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGBLIGHT_VAL_STEP 8
 #        define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #        define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#        define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#        define RGBLIGHT_EFFECT_BREATHING
+#        define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#        define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#        define RGBLIGHT_EFFECT_SNAKE
+#        define RGBLIGHT_EFFECT_KNIGHT
+#        define RGBLIGHT_EFFECT_CHRISTMAS
+#        define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#        define RGBLIGHT_EFFECT_RGB_TEST
+#        define RGBLIGHT_EFFECT_ALTERNATING
+#        define RGBLIGHT_EFFECT_TWINKLE
 #    elif defined RGB_MATRIX_ENABLE
 #        define RGB_MATRIX_KEYPRESSES   // reacts to keypresses
 #        define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index a107a1899a..b95287a7c2 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -21,7 +21,16 @@
 /* Underglow options */
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index c177990e99..16d92e2adc 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -41,18 +41,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index 14b5588ab4..cb51ca9769 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -45,18 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
@@ -71,4 +69,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 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
\ No newline at end of file
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index 44c17ea85a..c3811a62ee 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -37,7 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#    define RGBLIGHT_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
 
 #define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/25keys/zinc/keymaps/default/rules.mk b/keyboards/25keys/zinc/keymaps/default/rules.mk
index 09b121d26f..1b53ec4c16 100644
--- a/keyboards/25keys/zinc/keymaps/default/rules.mk
+++ b/keyboards/25keys/zinc/keymaps/default/rules.mk
@@ -106,9 +106,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
   OPT_DEFS += -DLED_ANIMATIONS
-
 endif
 
 ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/rules.mk b/keyboards/25keys/zinc/keymaps/ginjake/rules.mk
index f2cb3633c6..4bbd3e582c 100644
--- a/keyboards/25keys/zinc/keymaps/ginjake/rules.mk
+++ b/keyboards/25keys/zinc/keymaps/ginjake/rules.mk
@@ -99,9 +99,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
   OPT_DEFS += -DLED_ANIMATIONS
-
 endif
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/25keys/zinc/keymaps/monks/rules.mk b/keyboards/25keys/zinc/keymaps/monks/rules.mk
index 46646f919c..d37d2b6d1f 100644
--- a/keyboards/25keys/zinc/keymaps/monks/rules.mk
+++ b/keyboards/25keys/zinc/keymaps/monks/rules.mk
@@ -99,9 +99,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
   OPT_DEFS += -DLED_ANIMATIONS
-
 endif
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk b/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
index 9fef6963a1..8fe697932e 100644
--- a/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
+++ b/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
@@ -113,9 +113,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
   OPT_DEFS += -DLED_ANIMATIONS
-
 endif
 
 ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)
diff --git a/keyboards/25keys/zinc/keymaps/via/config.h b/keyboards/25keys/zinc/keymaps/via/config.h
index 233977feaf..58c1081559 100644
--- a/keyboards/25keys/zinc/keymaps/via/config.h
+++ b/keyboards/25keys/zinc/keymaps/via/config.h
@@ -28,14 +28,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //  place overrides here
 //  Selection of RGBLIGHT MODE to use.
 #if defined(LED_ANIMATIONS)
-    #define RGBLIGHT_ANIMATIONS
-//    #define RGBLIGHT_EFFECT_BREATHINGtt
-//    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//    #define RGBLIGHT_EFFECT_SNAKE
-//    #define RGBLIGHT_EFFECT_KNIGHT
-//    #define RGBLIGHT_EFFECT_CHRISTMAS
-//    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//    #define RGBLIGHT_EFFECT_RGB_TEST
-//    #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/25keys/zinc/keymaps/via/rules.mk b/keyboards/25keys/zinc/keymaps/via/rules.mk
index 0ea4be9c04..dfd1d5bfeb 100644
--- a/keyboards/25keys/zinc/keymaps/via/rules.mk
+++ b/keyboards/25keys/zinc/keymaps/via/rules.mk
@@ -98,9 +98,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
   OPT_DEFS += -DLED_ANIMATIONS
-
 endif
 
 ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)
diff --git a/keyboards/25keys/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h
index b0254f6bab..54608f8f67 100644
--- a/keyboards/25keys/zinc/rev1/post_config.h
+++ b/keyboards/25keys/zinc/rev1/post_config.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // RGB LED support
-//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
+// see ./rules.mk: LED_ANIMATIONS = yes or no
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #ifdef RGBLIGHT_ENABLE
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/25keys/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h
index b0254f6bab..54608f8f67 100644
--- a/keyboards/25keys/zinc/reva/post_config.h
+++ b/keyboards/25keys/zinc/reva/post_config.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // RGB LED support
-//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
+// see ./rules.mk: LED_ANIMATIONS = yes or no
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #ifdef RGBLIGHT_ENABLE
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index 4a0d7eb013..675f8817b5 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -30,6 +30,15 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN C6
-#define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 3
 #endif
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 06ace32eb5..4176a18b91 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -53,7 +53,6 @@
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
index 67a21d3c97..2f89089428 100644
--- a/keyboards/40percentclub/4pack/config.h
+++ b/keyboards/40percentclub/4pack/config.h
@@ -64,18 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index 60a5122830..a60019e379 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -30,7 +30,6 @@
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index 4b2b97fcba..aaded30145 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -53,7 +53,6 @@
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 502bbf38e3..3af2423614 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -53,7 +53,6 @@
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index db81033f9b..8d90684c5b 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -29,7 +29,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
index 6849bbdd2c..e1477fc069 100644
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
@@ -3,7 +3,16 @@
 #undef RGB_DI_PIN
 #undef RGBLED_NUM
 #define RGB_DI_PIN D2
-#define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/gherkin/keymaps/michel/config.h b/keyboards/40percentclub/gherkin/keymaps/michel/config.h
index 8696437a45..eadbb23ce2 100644
--- a/keyboards/40percentclub/gherkin/keymaps/michel/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/michel/config.h
@@ -3,7 +3,16 @@
 #undef RGB_DI_PIN
 #undef RGBLED_NUM
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 
 /* Make layout upside down = USB port on left side */
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index 2851b909f1..6ab475823d 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 9ea825e7d7..7ab91bc720 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -29,7 +29,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B4
-#define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8    // Number of LEDs
 // #define RGBLIGHT_HUE_STEP 10
 // #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 6853462585..65ec5496a3 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index e71f91a030..ea34651908 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -43,5 +43,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6    // Number of LEDs
diff --git a/keyboards/40percentclub/nano/keymaps/spooka/config.h b/keyboards/40percentclub/nano/keymaps/spooka/config.h
index 05900a215b..e00505cd8b 100644
--- a/keyboards/40percentclub/nano/keymaps/spooka/config.h
+++ b/keyboards/40percentclub/nano/keymaps/spooka/config.h
@@ -18,7 +18,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
index 48f7f949fb..5c45f213ca 100644
--- a/keyboards/40percentclub/nein/config.h
+++ b/keyboards/40percentclub/nein/config.h
@@ -46,18 +46,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 01d4f9b537..8059aa97c9 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -44,7 +44,16 @@
 
 // enable RGB underglow
 #define RGB_DI_PIN B4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h
index 9a03bc7974..b43f26e4f2 100644
--- a/keyboards/40percentclub/sixpack/config.h
+++ b/keyboards/40percentclub/sixpack/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index a29f22834e..ede471f958 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -24,7 +24,16 @@
 
 /* setup lighting */
 #define RGB_DI_PIN B5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 30
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
index 791147b5bf..8d721dc3b4 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/config.h
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
@@ -19,6 +19,15 @@
 #include "config_common.h"
 
 // place overrides here
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D3    // The pin the LED strip is connected to
 #define RGBLED_NUM 7     // Number of LEDs in your strip
diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h
index ed14a11435..8a8c990202 100644
--- a/keyboards/4pplet/aekiso60/rev_a/config.h
+++ b/keyboards/4pplet/aekiso60/rev_a/config.h
@@ -28,4 +28,13 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 951c943f1d..ae694237e1 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -38,8 +38,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN A5
 #define WS2812_SPI_SCK_PAL_MODE 0
-#define RGBLED_NUM  16
-#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 16
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h
index 2fa229bc44..716024d704 100644
--- a/keyboards/4pplet/steezy60/rev_a/config.h
+++ b/keyboards/4pplet/steezy60/rev_a/config.h
@@ -25,4 +25,13 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h
index b9b7abebe7..b50de5d82b 100644
--- a/keyboards/8pack/config.h
+++ b/keyboards/8pack/config.h
@@ -30,4 +30,13 @@
 // ws2812 options
 #define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to
 #define RGBLED_NUM 8 // number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/abstract/ellipse/keymaps/abstractkb/config.h b/keyboards/abstract/ellipse/keymaps/abstractkb/config.h
index 3bc66cd9bd..9aca0b31f5 100644
--- a/keyboards/abstract/ellipse/keymaps/abstractkb/config.h
+++ b/keyboards/abstract/ellipse/keymaps/abstractkb/config.h
@@ -18,6 +18,15 @@
 
 #define BACKLIGHT_BREATHING
 #define BREATHING_PERIOD 2
-#define RGBLIGHT_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
 
 // place overrides here
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index 2025739210..5e61aaa346 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 0daf1a90cd..ac64f02a9f 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -59,7 +59,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#    define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index 042da65f8e..d801d3f6d9 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -55,23 +55,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//  #define RGBLIGHT_EFFECT_BREATHING
-//  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//  #define RGBLIGHT_EFFECT_SNAKE
-//  #define RGBLIGHT_EFFECT_KNIGHT
-//  #define RGBLIGHT_EFFECT_CHRISTMAS
-//  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//  #define RGBLIGHT_EFFECT_RGB_TEST
-//  #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_SLEEP       /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
-  /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-  #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-  /*==== use exp() and sin() ====*/
+/*==== (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
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index 50e14aa258..ae05d76333 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -70,18 +70,6 @@ B0, which is unconnected on the PCB
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 77e98b329c..c0d4b66b13 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 24
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
index f3eecce72b..9bf85b3b6e 100644
--- a/keyboards/adelheid/config.h
+++ b/keyboards/adelheid/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 0ccbc6353a..7138582141 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -37,7 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 //RGB Underglow WS2812
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
 #define RGB_DI_PIN B15
 
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
index b6dd990e5f..ab7b14094f 100644
--- a/keyboards/ai03/equinox/config.h
+++ b/keyboards/ai03/equinox/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 230 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 //#endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
index 3cdec4d046..b3fcd13ee5 100644
--- a/keyboards/ai03/lunar/config.h
+++ b/keyboards/ai03/lunar/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 3cd0895788..9753143e89 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -64,18 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 8cf852cfab..41f0f9b714 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -51,18 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
index 462ffe1a8e..a73322a5de 100644
--- a/keyboards/ai03/quasar/config.h
+++ b/keyboards/ai03/quasar/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
index 9ffec17840..324a815580 100644
--- a/keyboards/ai03/soyuz/config.h
+++ b/keyboards/ai03/soyuz/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index c96be0030d..7d9302a8a5 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -41,18 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 25d6912db2..b681bbeab7 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 34, 34 }
 #define RGBLIGHT_LIMIT_VAL 170
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index f9d9c1363b..e9bfd4c5db 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 5e7275dd11..e7fc2a6911 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 9c0c0a527a..dc1ebcb539 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -51,8 +51,17 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM        4
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 4
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
index f0161bf616..ee6af9f74c 100644
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ b/keyboards/alfredslab/swift65/solder/config.h
@@ -46,16 +46,14 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index e98029fb82..f65e1c31ee 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -30,7 +30,16 @@
 
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
index a5180dc227..b571d00b7a 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 68
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_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
 
 /*
  * Feature disable options
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index a847c0ef7e..7c0710a7c2 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -28,7 +28,17 @@
 #define DIODE_DIRECTION ROW2COL
 
 #define RGBLED_NUM 7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index b5b9c2e4df..c0f41fb65e 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -55,7 +55,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 4     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 68994d2b2e..c0cf02c057 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -54,18 +54,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 17
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 12a01dc3e6..523775f8b2 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -49,18 +49,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index 647df951df..966962f240 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -55,7 +55,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 8     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h
index b15656fe83..92453494d5 100644
--- a/keyboards/anavi/macropad8/config.h
+++ b/keyboards/anavi/macropad8/config.h
@@ -48,12 +48,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812B RGB LED */
 #ifdef RGBLIGHT_ENABLE
 #   define RGB_DI_PIN F4
-#   define RGBLIGHT_ANIMATIONS
-#   define RGBLED_NUM 4
-#   define RGBLIGHT_HUE_STEP 10
-#   define RGBLIGHT_SAT_STEP 17
-#   define RGBLIGHT_VAL_STEP 17
-#   define RGBLIGHT_LIMIT_VAL 255
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 4
+#    define RGBLIGHT_HUE_STEP 10
+#    define RGBLIGHT_SAT_STEP 17
+#    define RGBLIGHT_VAL_STEP 17
+#    define RGBLIGHT_LIMIT_VAL 255
 #endif
 
 #ifdef OLED_ENABLE
diff --git a/keyboards/anavi/macropad8/keymaps/git/config.h b/keyboards/anavi/macropad8/keymaps/git/config.h
index 3fe0304ffc..370eb86ca8 100644
--- a/keyboards/anavi/macropad8/keymaps/git/config.h
+++ b/keyboards/anavi/macropad8/keymaps/git/config.h
@@ -16,8 +16,9 @@
 
 #pragma once
 
-#undef RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index 5ddec8cda0..8be892ea62 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -39,10 +39,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-    #define RGBLIGHT_ANIMATIONS
-    #define RGBLED_NUM 88
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 50
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 88
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 50
 #endif
diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h
index 6aadc3efb2..660ec9661f 100644
--- a/keyboards/aplyard/aplx6/rev1/config.h
+++ b/keyboards/aplyard/aplx6/rev1/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 //#define RGB_DI_PIN X
 
-//#define RGBLIGHT_ANIMATIONS
 //#define RGBLED_NUM X    // Number of LEDs
 
 
diff --git a/keyboards/arabica37/keymaps/default/config.h b/keyboards/arabica37/keymaps/default/config.h
index d3b1aef4c6..eed6b7221b 100644
--- a/keyboards/arabica37/keymaps/default/config.h
+++ b/keyboards/arabica37/keymaps/default/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 170
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 50
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index 6568cdf69d..6813da5b53 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_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
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 4
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
index f499c29de3..7836df06e9 100644
--- a/keyboards/arisu/config.h
+++ b/keyboards/arisu/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index cd74024125..67a04279d3 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
index 412b474193..037f96018e 100644
--- a/keyboards/atlas_65/config.h
+++ b/keyboards/atlas_65/config.h
@@ -50,18 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index 1cf30b258b..9254451569 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -51,18 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   // #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 8e59e88d83..5207a80c2a 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -48,8 +48,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
 /*== or choose animations ==*/
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 59b54ebc73..05db3a56fb 100644
--- a/keyboards/aves65/config.h
+++ b/keyboards/aves65/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Backlight configuration
  */
 #define RGB_DI_PIN B0
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 9
 
 #define QMK_ESC_OUTPUT D0 // usually COL
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
index c4cb1cc373..d34356c467 100644
--- a/keyboards/baguette/config.h
+++ b/keyboards/baguette/config.h
@@ -45,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index ba3a157ced..5992f004e6 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -68,18 +68,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 75db1ba447..bab979faff 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 15
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5 }
 
 #define LED_CAPS_LOCK_PIN B2
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index f839bfa5b3..e51fc5048c 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -51,7 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_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
 
 #define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index 014f59a219..1beb5ff192 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -45,7 +45,16 @@
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_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
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 9ce37939b5..b6bb634121 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,16 @@
 #define RGBLED_NUM 38
 #define RGBLED_SPLIT { 19, 19 }
 #define RGBLIGHT_SPLIT
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define DEBOUNCE 5
 #define SOFT_SERIAL_PIN D0
 #define MASTER_RIGHT
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 4980416017..2f92e6fcb7 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -35,4 +35,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
index ee8c84e1ee..a56bd0f2e7 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
@@ -29,6 +29,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Underglow
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
-
diff --git a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
index ee8c84e1ee..a56bd0f2e7 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
@@ -29,6 +29,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Underglow
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
-
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/config.h b/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
index 7a67860718..983305e255 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
@@ -29,10 +29,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Use RGB Underglow */
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
-
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
index a99aa088a9..532989e03a 100644
--- a/keyboards/biacco42/meishi2/config.h
+++ b/keyboards/biacco42/meishi2/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index a3831f8dd8..344df37fca 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -49,7 +49,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Underglow */
 #define RGB_DI_PIN B1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8  // Number of LEDs
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index e710c19b98..aa77a43587 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -31,7 +31,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN B1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 36
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/bioi/main.c b/keyboards/bioi/main.c
index 54caf6937b..bba54dfab1 100644
--- a/keyboards/bioi/main.c
+++ b/keyboards/bioi/main.c
@@ -377,7 +377,7 @@ int main(void)
         raw_hid_task();
 #endif
 
-#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
+#if defined(RGBLIGHT_ENABLE)
         rgblight_task();
 #endif
 
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 2ce3c7a56b..7109881593 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -49,7 +49,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Underglow */
 #define RGB_DI_PIN B1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8  // Number of LEDs
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index fabd6c84a2..a1aca31310 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -50,7 +50,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Underglow */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
index 999e655a94..60abcc9e69 100644
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@@ -24,7 +24,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN C7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
index 220d0852fe..abaf32d2ea 100644
--- a/keyboards/blank/blank01/config.h
+++ b/keyboards/blank/blank01/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index 661605480a..b65691bd19 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 
-#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index 5b9fb46286..4ed73b7829 100644
--- a/keyboards/boardrun/bizarre/config.h
+++ b/keyboards/boardrun/bizarre/config.h
@@ -66,7 +66,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // ws2812 options
 #define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 15 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index f65abc2ff4..9af3c98d86 100644
--- a/keyboards/boardrun/classic/config.h
+++ b/keyboards/boardrun/classic/config.h
@@ -66,7 +66,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // ws2812 options
 #define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
index 80ca48c995..b926a57de9 100644
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@@ -66,7 +66,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // ws2812 options
 #define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index ebaa7ae640..4e9ce710a4 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -48,10 +48,19 @@
 /* Define RGBLED */
 #define RGB_DI_PIN A5
 #define RGBLED_NUM 1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LAYERS
 
-//The 3D-printed version of Boston uses APA106 LEDs, which are reversed 
+//The 3D-printed version of Boston uses APA106 LEDs, which are reversed
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
 /* Define encoder */
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index f69e5f953f..296e84cf65 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -151,7 +151,16 @@
 #define ZC_DET_TIME 0
 #define AUTO_CAL_TIME 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 10
 #define RGB_DI_PIN B5
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index 9fe72d0788..b7118b0e59 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -24,7 +24,16 @@
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index 62b9f34a66..40dbf63028 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -43,7 +43,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
diff --git a/keyboards/bthlabs/geekpad/config.h b/keyboards/bthlabs/geekpad/config.h
index 5a29c90eab..c579773d0e 100644
--- a/keyboards/bthlabs/geekpad/config.h
+++ b/keyboards/bthlabs/geekpad/config.h
@@ -45,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 6e363d42ad..24afcd6712 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -98,7 +98,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index e102000fb5..4defcc2d48 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index e07fd65bbb..29358a2010 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -47,18 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index 43821c07f9..c0fe54cf3b 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index e072e183a1..4023b40bbf 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -36,7 +36,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index d88edb945c..b51b837654 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -43,7 +43,16 @@
 
 // ws2812 options
 #define RGB_DI_PIN D4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 36
 #define RGBLIGHT_LIMIT_VAL 230
 #define RGBLIGHT_HUE_STEP 12
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index 873ec24697..d2cbd7523d 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define WS2812_SPI SPID2
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index e4e87edcaa..aeaf30a461 100644
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index 7037c192d9..f04f63fb5a 100644
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index f19308a8b8..ad40a62e7f 100644
--- a/keyboards/cannonkeys/instant65/config.h
+++ b/keyboards/cannonkeys/instant65/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index 07acff7cc9..3069e751bd 100644
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index b11654dee9..e8cad24bf1 100644
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@@ -43,7 +43,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index e503e716fb..e1c2dfb409 100644
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@@ -43,7 +43,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index 1746da2b73..196c1d2f0d 100644
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@@ -46,7 +46,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index 179d1cafb5..c73eb7813c 100644
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@@ -43,7 +43,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index 1692998eaa..30baf12283 100644
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@@ -43,7 +43,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index 8ba5b58891..b9a10edf49 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -48,7 +48,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 8
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index 77efcc2db5..bdbe0535b5 100644
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@@ -44,7 +44,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index f7f867e013..715c35d2d9 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -44,7 +44,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 22
 #define WS2812_SPI SPID2
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index e26324180f..57b3b8053f 100644
--- a/keyboards/cannonkeys/tsukuyomi/config.h
+++ b/keyboards/cannonkeys/tsukuyomi/config.h
@@ -44,7 +44,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 552a991af8..a290f062e3 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -46,7 +46,17 @@
 /* RGB Glow */
 #define RGB_DI_PIN F4     // The pin the LED strip is connected to
 #define RGBLED_NUM 5     // Number of LEDs in your strip
-#define RGBLIGHT_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
+
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index 3f93aae5e8..7d51039cee 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -54,7 +54,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 // #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLED_NUM 6
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 27c1dd4e2f..1000c8eef5 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -27,7 +27,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
 #define RGBLED_NUM 24     // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h
index 949fca07df..d51e337a78 100644
--- a/keyboards/capsunlocked/cu80/v1/config.h
+++ b/keyboards/capsunlocked/cu80/v1/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 88
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/config.h b/keyboards/capsunlocked/cu80/v2_ansi/config.h
index ae8d1cc741..83477fff89 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/config.h
+++ b/keyboards/capsunlocked/cu80/v2_ansi/config.h
@@ -25,4 +25,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Define RGB */
 #define RGB_MATRIX_LED_COUNT 87
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h b/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h
index 5789266397..7e356e42df 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h
+++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h
@@ -72,7 +72,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 /* RGB firmware override */
-#undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_HUE_STEP
 #undef RGBLIGHT_SAT_STEP
 #undef RGBLIGHT_VAL_STEP
diff --git a/keyboards/capsunlocked/cu80/v2_iso/config.h b/keyboards/capsunlocked/cu80/v2_iso/config.h
index 2411039d93..72f24eaabe 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/config.h
+++ b/keyboards/capsunlocked/cu80/v2_iso/config.h
@@ -26,4 +26,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Define RGB */
 #define RGB_MATRIX_LED_COUNT 88
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
index 41dbede767..4d15aca40c 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
@@ -71,7 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 /* RGB firmware override */
-#undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_HUE_STEP
 #undef RGBLIGHT_SAT_STEP
 #undef RGBLIGHT_VAL_STEP
diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h
index 94be3c3451..9014e810c2 100644
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/config.h
@@ -39,6 +39,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6
 #endif
diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index 920206e565..fcd5497494 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -40,7 +40,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 29
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h
index fb0d209fdd..1105a5fb45 100644
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@@ -40,7 +40,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN B7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h
index 9cd70c1d7d..802ac15a56 100644
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@@ -39,7 +39,16 @@ Copyright 2021 Nathan Spears
 
 // ws2812 options
 #define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
index 3cee0be178..33945fc823 100644
--- a/keyboards/checkerboards/plexus75/config.h
+++ b/keyboards/checkerboards/plexus75/config.h
@@ -55,7 +55,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // ws2812 options
 #define RGB_DI_PIN D3 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index e794580789..4d62c5f832 100644
--- a/keyboards/checkerboards/pursuit40/config.h
+++ b/keyboards/checkerboards/pursuit40/config.h
@@ -56,7 +56,16 @@
 
 // ws2812 options
 #define RGB_DI_PIN F0 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index 295629f885..494cec7893 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -40,7 +40,16 @@
 
 // ws2812 options
 #define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h
index d9af2af4b3..13a337f65a 100644
--- a/keyboards/checkerboards/quark_squared/config.h
+++ b/keyboards/checkerboards/quark_squared/config.h
@@ -40,7 +40,16 @@
 
 // ws2812 options
 #define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h
index 9ba1df7d8a..5bc97be2a6 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/config.h
+++ b/keyboards/checkerboards/ud40_ortho_alt/config.h
@@ -40,7 +40,16 @@
 
 // ws2812 options
 #define RGB_DI_PIN D4 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index 7c10378e97..c815b3bcfe 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -47,8 +47,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 20 
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 20
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index fa9a752801..2384b81b40 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -49,7 +49,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 22 /* 16 Bottom 6 top*/
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h
index 3f6bdf4f0a..4d9a013b32 100644
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define DEBOUNCE 5
 
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h
index 5bb55f8797..119f9dac5d 100644
--- a/keyboards/chromatonemini/config.h
+++ b/keyboards/chromatonemini/config.h
@@ -43,18 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
index 49a530b1d3..7a9526dd41 100644
--- a/keyboards/ck60i/config.h
+++ b/keyboards/ck60i/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define ENCODERS_PAD_A { A5 }
 #define ENCODERS_PAD_B { A4 }
diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h
index 8849c4e834..2f68d3222a 100644
--- a/keyboards/ckeys/washington/config.h
+++ b/keyboards/ckeys/washington/config.h
@@ -57,18 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/config.h b/keyboards/clueboard/card/keymaps/rgb_effects/config.h
index 0b2a68f544..12af278cad 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/config.h
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/config.h
@@ -1,7 +1,16 @@
 #pragma once
 
 // place overrides here
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 2
diff --git a/keyboards/contra/keymaps/maxr1998/config.h b/keyboards/contra/keymaps/maxr1998/config.h
index b384a2fd34..1ab74676d4 100644
--- a/keyboards/contra/keymaps/maxr1998/config.h
+++ b/keyboards/contra/keymaps/maxr1998/config.h
@@ -6,7 +6,16 @@
 #define TAPPING_TOGGLE 2
 
 #define RGB_DI_PIN          F7 // pin the DI on the WS2812B is hooked-up to
-#define RGBLIGHT_ANIMATIONS    // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM          12 // number of LEDs
 #define RGBLIGHT_HUE_STEP   12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP   25 // units to step when in/decresing saturation
diff --git a/keyboards/cool836a/config.h b/keyboards/cool836a/config.h
index d2f134c778..394552ac6b 100644
--- a/keyboards/cool836a/config.h
+++ b/keyboards/cool836a/config.h
@@ -63,18 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h
index 88c1393fac..e412335eb6 100755
--- a/keyboards/copenhagen_click/click_pad_v1/config.h
+++ b/keyboards/copenhagen_click/click_pad_v1/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h
index a93d34f4fb..cf378225d4 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
@@ -132,4 +120,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
-
diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h
index 258efdb965..78b096e566 100644
--- a/keyboards/coseyfannitutti/discipline/config.h
+++ b/keyboards/coseyfannitutti/discipline/config.h
@@ -58,18 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
@@ -130,4 +118,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
-
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index 86294fa7c2..d35a40b590 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/coseyfannitutti/mulletpad/config.h b/keyboards/coseyfannitutti/mulletpad/config.h
index daa0cb91dc..06387cc2c2 100644
--- a/keyboards/coseyfannitutti/mulletpad/config.h
+++ b/keyboards/coseyfannitutti/mulletpad/config.h
@@ -45,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define RGB_DI_PIN D5
 //#ifdef RGB_DI_PIN
-//#define RGBLIGHT_ANIMATIONS
 //#define RGBLED_NUM 8
 //#define RGBLIGHT_HUE_STEP 8
 //#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/coseyfannitutti/mysterium/config.h b/keyboards/coseyfannitutti/mysterium/config.h
index d11a02c5f0..9d102ef019 100644
--- a/keyboards/coseyfannitutti/mysterium/config.h
+++ b/keyboards/coseyfannitutti/mysterium/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h
index e70b99984e..6727bd8d52 100644
--- a/keyboards/coseyfannitutti/romeo/config.h
+++ b/keyboards/coseyfannitutti/romeo/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h
index 461f289918..9ee485d0c7 100644
--- a/keyboards/cozykeys/bloomer/config.h
+++ b/keyboards/cozykeys/bloomer/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_BREATHE_TABLE_SIZE    256
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85
 #define RGBLIGHT_EFFECT_BREATHE_MAX    255
@@ -44,4 +53,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
 #define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index 8590a45efc..c295028d39 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_BREATHE_TABLE_SIZE    256
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85
 #define RGBLIGHT_EFFECT_BREATHE_MAX    255
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index ce953b43fe..8ef1d5aa1b 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -56,8 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
 // /*== or choose animations ==*/
   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h
index 06939422b0..04b7dc614e 100755
--- a/keyboards/crawlpad/config.h
+++ b/keyboards/crawlpad/config.h
@@ -32,6 +32,15 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 3
 #endif
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index d1fa1bb5d2..948da8caa1 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -59,18 +59,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 #    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h
index 27f01a445a..095879a190 100644
--- a/keyboards/crkbd/keymaps/armand1m/config.h
+++ b/keyboards/crkbd/keymaps/armand1m/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 27
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index a095f08760..878f9a74e1 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -40,7 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
     #define RGBLED_NUM 27
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLIGHT_SLEEP
     #define RGBLIGHT_SPLIT
     #define RGBLIGHT_LIMIT_VAL 120
diff --git a/keyboards/crkbd/keymaps/devdev/config.h b/keyboards/crkbd/keymaps/devdev/config.h
index 8261ef6268..0fe7e90385 100644
--- a/keyboards/crkbd/keymaps/devdev/config.h
+++ b/keyboards/crkbd/keymaps/devdev/config.h
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
 
-    //#define RGBLIGHT_ANIMATIONS
 	#define RGBLIGHT_EFFECT_BREATHING
 	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
 	#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h
index 2a161236eb..e569a59bc9 100644
--- a/keyboards/crkbd/keymaps/hvp/config.h
+++ b/keyboards/crkbd/keymaps/hvp/config.h
@@ -37,7 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #    undef RGBLED_NUM
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 27
 #    define RGBLIGHT_LIMIT_VAL 120
 #    define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/jarred/config.h b/keyboards/crkbd/keymaps/jarred/config.h
index a0b7c6ff30..c6c80469ed 100644
--- a/keyboards/crkbd/keymaps/jarred/config.h
+++ b/keyboards/crkbd/keymaps/jarred/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
index 03bdbf51ba..74f8a0823b 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ b/keyboards/crkbd/keymaps/kidbrazil/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     //#undef RGBLED_NUM
-    //#define RGBLIGHT_ANIMATIONS
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
     #define RGBLIGHT_EFFECT_KNIGHT
diff --git a/keyboards/crkbd/keymaps/madhatter/config.h b/keyboards/crkbd/keymaps/madhatter/config.h
index 086dd40925..599bbc27c3 100644
--- a/keyboards/crkbd/keymaps/madhatter/config.h
+++ b/keyboards/crkbd/keymaps/madhatter/config.h
@@ -33,7 +33,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 27
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/oled_sample/config.h b/keyboards/crkbd/keymaps/oled_sample/config.h
index 056eb32dd6..cd24f74744 100644
--- a/keyboards/crkbd/keymaps/oled_sample/config.h
+++ b/keyboards/crkbd/keymaps/oled_sample/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/rarick/config.h b/keyboards/crkbd/keymaps/rarick/config.h
index dca1af4caf..3dc4003f75 100644
--- a/keyboards/crkbd/keymaps/rarick/config.h
+++ b/keyboards/crkbd/keymaps/rarick/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 27
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/config.h b/keyboards/crkbd/keymaps/rjhilgefort/config.h
index 727167b5e2..41d709d3a5 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/config.h
+++ b/keyboards/crkbd/keymaps/rjhilgefort/config.h
@@ -33,7 +33,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 27
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
@@ -42,4 +51,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
-
diff --git a/keyboards/crkbd/keymaps/rs/config.h b/keyboards/crkbd/keymaps/rs/config.h
index f40e008034..85b9b95a23 100644
--- a/keyboards/crkbd/keymaps/rs/config.h
+++ b/keyboards/crkbd/keymaps/rs/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 300
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h
index 7826ab72ec..8bceb729d8 100644
--- a/keyboards/crkbd/keymaps/snowe/config.h
+++ b/keyboards/crkbd/keymaps/snowe/config.h
@@ -36,7 +36,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 27
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index 07b3a9db12..7cd9ecaed9 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -36,7 +36,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
     #define RGBLED_NUM 27
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLIGHT_SLEEP
     #define RGBLIGHT_SPLIT
     #define RGBLIGHT_LIMIT_VAL 120
diff --git a/keyboards/crkbd/keymaps/sulrich/config.h b/keyboards/crkbd/keymaps/sulrich/config.h
index 29b1f44191..616b2afd98 100644
--- a/keyboards/crkbd/keymaps/sulrich/config.h
+++ b/keyboards/crkbd/keymaps/sulrich/config.h
@@ -25,7 +25,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 27
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/config.h b/keyboards/crkbd/keymaps/thumb_ctrl/config.h
index 4916668244..6e54150c17 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/config.h
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 150
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/vayashiko/config.h b/keyboards/crkbd/keymaps/vayashiko/config.h
index dd6cca89e4..85a5412851 100644
--- a/keyboards/crkbd/keymaps/vayashiko/config.h
+++ b/keyboards/crkbd/keymaps/vayashiko/config.h
@@ -34,7 +34,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 42
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
index b6f4420056..4a370ef43c 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
@@ -9,7 +9,16 @@
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
index 1cd6ead191..257c9df97b 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
@@ -16,7 +16,16 @@
 #define TAPPING_TERM 300
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/vxid/config.h b/keyboards/crkbd/keymaps/vxid/config.h
index 79e4eadabb..5b18de236e 100644
--- a/keyboards/crkbd/keymaps/vxid/config.h
+++ b/keyboards/crkbd/keymaps/vxid/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h
index 5ac13a6646..47a18105bd 100644
--- a/keyboards/crkbd/keymaps/xyverz/config.h
+++ b/keyboards/crkbd/keymaps/xyverz/config.h
@@ -38,7 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 27
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h
index b020db7b93..bc6c0fa0bf 100644
--- a/keyboards/cutie_club/wraith/config.h
+++ b/keyboards/cutie_club/wraith/config.h
@@ -54,18 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h
index c396ff8b93..1331c53ab6 100644
--- a/keyboards/cx60/config.h
+++ b/keyboards/cx60/config.h
@@ -40,7 +40,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Underglow */
 #define RGB_DI_PIN B6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h
index 6204d1c82e..b80f39c89b 100644
--- a/keyboards/dailycraft/bat43/config.h
+++ b/keyboards/dailycraft/bat43/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h
index 4bae3460d0..9aab3a730e 100644
--- a/keyboards/dailycraft/owl8/config.h
+++ b/keyboards/dailycraft/owl8/config.h
@@ -63,18 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h
index 8d2007496f..e5186bb525 100644
--- a/keyboards/dailycraft/sandbox/rev1/config.h
+++ b/keyboards/dailycraft/sandbox/rev1/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h
index 11b49e086c..403f31d3f1 100644
--- a/keyboards/dailycraft/sandbox/rev2/config.h
+++ b/keyboards/dailycraft/sandbox/rev2/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h
index ede6d87792..02b230b1cb 100644
--- a/keyboards/dailycraft/stickey4/config.h
+++ b/keyboards/dailycraft/stickey4/config.h
@@ -63,18 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index 670531ddc5..e91fa1deae 100644
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index 841d2e9f5a..8abf46407d 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index 010d8ab896..0e7196f90f 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
index 2ee4fe23c1..2902447d60 100644
--- a/keyboards/db/db63/config.h
+++ b/keyboards/db/db63/config.h
@@ -26,7 +26,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGBLED_NUM 18
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 772ed61faf..4c9dfead04 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -51,8 +51,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #endif
 
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index ba956b1798..440a035d74 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -51,9 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 // #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 8ddb222440..1224029147 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -50,9 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index d6d04d47d1..36cccf4716 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -50,9 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index d9ffc232dd..739cda1145 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -53,9 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 // #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
index dffb30cf71..42e5f4564f 100644
--- a/keyboards/deltapad/config.h
+++ b/keyboards/deltapad/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/config.h b/keyboards/deltasplit75/keymaps/itsaferbie/config.h
index f837c90ad4..288b1acb8b 100644
--- a/keyboards/deltasplit75/keymaps/itsaferbie/config.h
+++ b/keyboards/deltasplit75/keymaps/itsaferbie/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h
index 5fc549ee02..57b6998a49 100644
--- a/keyboards/dk60/config.h
+++ b/keyboards/dk60/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index 1875566cf6..d59afdbf40 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -58,18 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
index a64d584d8e..8fa5635341 100644
--- a/keyboards/dm9records/tartan/config.h
+++ b/keyboards/dm9records/tartan/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h b/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h
index 10201015ee..72c5537141 100644
--- a/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h
+++ b/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h
@@ -16,7 +16,16 @@
 
 #pragma once
 
-#define RGBLIGHT_ANIMATIONS 
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 
 // Use one or the other, determines the orientation of
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
index b9a0b53fbf..81a9bd9529 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
@@ -26,13 +26,13 @@
 #define LAYER_STATE_8BIT
 #define MAX_LAYER 5
 
-#undef RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_KNIGHT
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 34a44066d4..596ba257e7 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -54,7 +54,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  * F5 PIN for DO60's pre-soldered WS2812 LEDs
  */
 #define RGB_DI_PIN F5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20    			// Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 15
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index 2f922435e6..a12b58ce39 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -36,4 +36,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/donutcables/budget96/keymaps/donut/config.h b/keyboards/donutcables/budget96/keymaps/donut/config.h
index da538e7b80..3da4a621c2 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/config.h
+++ b/keyboards/donutcables/budget96/keymaps/donut/config.h
@@ -19,10 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // place overrides here
 
-#undef RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define 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 UNICODE_KEY_WINC KC_RGUI
diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h
index 2d16e78457..ed761505d5 100644
--- a/keyboards/donutcables/scrabblepad/config.h
+++ b/keyboards/donutcables/scrabblepad/config.h
@@ -61,18 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index 5570cdf9bb..dec80c516e 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/config.h
@@ -64,18 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index d5198176b7..9105e1ffb9 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -39,7 +39,16 @@
 //rgb light setting
 #define RGBLED_NUM      18
 #define RGB_DI_PIN      D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index 3e0895cff3..b0db92620a 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -98,5 +98,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
   /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 309b68039f..36d1e7f481 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -58,5 +58,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
   /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index 122eeb4b4a..5da81a364a 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 16fbe3bda2..9fbfffc758 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -30,7 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D6
 // #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 23
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index 053e85428c..6b06edd008 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/keyboards/duck/lightsaver/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 1
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index 834554c45a..150436ffe4 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 1
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 57df912112..1509222458 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 1
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h
index 477243e495..43a5bdec7b 100644
--- a/keyboards/duck/orion/v3/config.h
+++ b/keyboards/duck/orion/v3/config.h
@@ -36,7 +36,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LED_COUNT 4
 #define BACKLIGHT_LEVELS 10
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 18
 
diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h
index a295d33614..29b389914e 100644
--- a/keyboards/duck/tcv3/config.h
+++ b/keyboards/duck/tcv3/config.h
@@ -28,7 +28,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index 64ef45437f..2630f46128 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -30,7 +30,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/dz60/keymaps/chrisae9/config.h b/keyboards/dz60/keymaps/chrisae9/config.h
index 047734e7d1..4daf8ee9b5 100644
--- a/keyboards/dz60/keymaps/chrisae9/config.h
+++ b/keyboards/dz60/keymaps/chrisae9/config.h
@@ -3,15 +3,14 @@
 
 /* Light Config */
 #undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 1 
+#define RGBLIGHT_HUE_STEP 1
 #undef RGBLIGHT_SAT_STEP
 #define RGBLIGHT_SAT_STEP 8
 #undef RGBLIGHT_VAL_STEP
 #define RGBLIGHT_VAL_STEP 16
-#undef RGBLIGHT_ANIMATIONS
 
-/* In order */ 
-#define RGBLIGHT_EFFECT_BREATHING	
+/* In order */
+#define RGBLIGHT_EFFECT_BREATHING
 #undef RGBLIGHT_EFFECT_RAINBOW_MOOD
 #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #undef RGBLIGHT_EFFECT_SNAKE
@@ -28,4 +27,3 @@
 #define MOUSEKEY_INTERVAL 15
 #define MOUSEKEY_TIME_TO_MAX 10
 #define MOUSEKEY_MAX_SPEED 2.5
-
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index d9f0224ae8..a23ae9576d 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/config.h
@@ -42,7 +42,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 20
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index ff217d933c..63a64217ab 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -41,18 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-    /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/eco/keymaps/bcat/config.h b/keyboards/eco/keymaps/bcat/config.h
index f2d51c324a..2a986f903b 100644
--- a/keyboards/eco/keymaps/bcat/config.h
+++ b/keyboards/eco/keymaps/bcat/config.h
@@ -21,4 +21,13 @@
 /* WS2812B RGB LED strip hand wired to Elite-C. */
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 15
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index fbcab5e8e5..56fe9e4624 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/config.h
@@ -1,6 +1,6 @@
 /*
 ©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
- 
+
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
@@ -61,7 +61,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 15
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 //#define RGBLIGHT_EFFECT_KNIGHT
 //#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 2cf9ab9af9..fe6d96b613 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -1,6 +1,6 @@
 /*
 ©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
- 
+
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB Underglow */
 #define RGB_DI_PIN A10
 #define RGBLED_NUM 32
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
 //#define RGBLIGHT_LIMIT_VAL 200
 
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index ebf0f6de9a..e3786a57fa 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -48,7 +48,17 @@
  */
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 12
-#define RGBLIGHT_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
+
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index a4c74fc794..d4fed5139b 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -38,18 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
index e937fe57c2..8827f89c6b 100644
--- a/keyboards/efreet/config.h
+++ b/keyboards/efreet/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h
index 6bd6981274..f3867aba82 100644
--- a/keyboards/emi20/config.h
+++ b/keyboards/emi20/config.h
@@ -41,7 +41,16 @@
 
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/eniigmakeyboards/ek65/config.h b/keyboards/eniigmakeyboards/ek65/config.h
index a3872f02f2..e6e2bcee73 100644
--- a/keyboards/eniigmakeyboards/ek65/config.h
+++ b/keyboards/eniigmakeyboards/ek65/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h
index 133738e460..d30df4bb9e 100644
--- a/keyboards/eniigmakeyboards/ek87/config.h
+++ b/keyboards/eniigmakeyboards/ek87/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
index 416f3b5477..6949f4a58f 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/config.h
@@ -59,7 +59,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // #define GRAVE_ESC_CTRL_OVERRIDE
 #define RGB_DI_PIN B0
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 84
 #define RGBLIGHT_LIMIT_VAL 35
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 0890127074..3e00932817 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -79,7 +79,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 255
 #define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/config.h b/keyboards/ergodox_ez/keymaps/danielo515/config.h
index ff201caa90..c69c0dfe57 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/config.h
+++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h
@@ -28,4 +28,13 @@
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-#undef RGBLIGHT_ANIMATIONS
+#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/ergotravel/keymaps/default/config.h b/keyboards/ergotravel/keymaps/default/config.h
index b827d9ef32..d047f718d6 100644
--- a/keyboards/ergotravel/keymaps/default/config.h
+++ b/keyboards/ergotravel/keymaps/default/config.h
@@ -24,10 +24,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-
-
diff --git a/keyboards/ergotravel/keymaps/ian/config.h b/keyboards/ergotravel/keymaps/ian/config.h
index 501919e057..fcec22e2d4 100644
--- a/keyboards/ergotravel/keymaps/ian/config.h
+++ b/keyboards/ergotravel/keymaps/ian/config.h
@@ -24,10 +24,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-
-
diff --git a/keyboards/ergotravel/keymaps/rs/config.h b/keyboards/ergotravel/keymaps/rs/config.h
index e50534e99d..53487d0f92 100644
--- a/keyboards/ergotravel/keymaps/rs/config.h
+++ b/keyboards/ergotravel/keymaps/rs/config.h
@@ -24,10 +24,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-
-
diff --git a/keyboards/ergotravel/keymaps/via/config.h b/keyboards/ergotravel/keymaps/via/config.h
index 6d9ccb8d6d..409e3efde4 100644
--- a/keyboards/ergotravel/keymaps/via/config.h
+++ b/keyboards/ergotravel/keymaps/via/config.h
@@ -24,10 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 // #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 14
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
 // #define RGBLIGHT_VAL_STEP 8
-
-
diff --git a/keyboards/ergotravel/keymaps/yanfali/config.h b/keyboards/ergotravel/keymaps/yanfali/config.h
index 52ab36f2db..9aa48a5a66 100644
--- a/keyboards/ergotravel/keymaps/yanfali/config.h
+++ b/keyboards/ergotravel/keymaps/yanfali/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
index 57c969ca79..71e904a879 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ b/keyboards/ericrlau/numdiscipline/rev1/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
index a3ccbc7f30..b22b72880c 100644
--- a/keyboards/esca/getawayvan/config.h
+++ b/keyboards/esca/getawayvan/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 //#define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 51
 #define RGBLIGHT_HUE_STEP 20
diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
index a3ccbc7f30..b22b72880c 100644
--- a/keyboards/esca/getawayvan_f042/config.h
+++ b/keyboards/esca/getawayvan_f042/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 //#define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 51
 #define RGBLIGHT_HUE_STEP 20
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 29933bcbb0..f7b8bd6162 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -57,7 +57,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 8
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 //#define RGB_DI_PIN E2
 //#ifdef RGB_DI_PIN
@@ -67,18 +76,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h
index babc1d88c1..969747fc2d 100644
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define ENCODERS_PAD_A { B3 }
 #define ENCODERS_PAD_B { A15 }
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index 4ca725705b..b670b014e5 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/config.h
@@ -49,7 +49,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F5    // The pin the LED strip is connected to
 #define RGBLED_NUM 6     // Number of LEDs in your strip
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define QMK_ESC_OUTPUT B7 // usually COL
 #define QMK_ESC_INPUT B0 // usually ROW
 #define QMK_LED E6
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index b9df73ce5e..9a751580db 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -57,18 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
index 3a3fdfccff..d52172b6fa 100644
--- a/keyboards/evyd13/eon40/config.h
+++ b/keyboards/evyd13/eon40/config.h
@@ -58,18 +58,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index c9796792aa..d5bf5b47fb 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/config.h
@@ -55,18 +55,16 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h
index c77a0c9be9..fa571a6bbb 100644
--- a/keyboards/evyd13/eon75/config.h
+++ b/keyboards/evyd13/eon75/config.h
@@ -60,18 +60,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h
index 4379f6106e..b23906c15b 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/config.h
@@ -55,18 +55,16 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index 4fb9906832..c75fa39f79 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -60,18 +60,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h
index c1e0a1533c..dd2f44a788 100644
--- a/keyboards/evyd13/gh80_1800/config.h
+++ b/keyboards/evyd13/gh80_1800/config.h
@@ -60,18 +60,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h
index a83c5563bf..087a75acf5 100644
--- a/keyboards/evyd13/gh80_3700/config.h
+++ b/keyboards/evyd13/gh80_3700/config.h
@@ -55,18 +55,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
index 1def6cc3f3..4c83b485f4 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
+++ b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
@@ -13,9 +13,18 @@
  * You should have 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_DI_PIN B2
 #define RGBLED_NUM 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h
index a6aeea3423..6c0482ca77 100644
--- a/keyboards/evyd13/gud70/config.h
+++ b/keyboards/evyd13/gud70/config.h
@@ -60,18 +60,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h
index f17184715f..1da4911b43 100644
--- a/keyboards/evyd13/minitomic/config.h
+++ b/keyboards/evyd13/minitomic/config.h
@@ -58,18 +58,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h
index eccfd287b7..b280c14149 100644
--- a/keyboards/evyd13/mx5160/config.h
+++ b/keyboards/evyd13/mx5160/config.h
@@ -64,18 +64,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
index be1b892280..430823bf63 100644
--- a/keyboards/evyd13/nt660/config.h
+++ b/keyboards/evyd13/nt660/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h
index 30f453ebd8..595c202f53 100644
--- a/keyboards/evyd13/nt750/config.h
+++ b/keyboards/evyd13/nt750/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h
index b4757a844d..c0502a6268 100644
--- a/keyboards/evyd13/nt980/config.h
+++ b/keyboards/evyd13/nt980/config.h
@@ -61,18 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h
index 9f51b63a9f..7505a5bbad 100644
--- a/keyboards/evyd13/omrontkl/config.h
+++ b/keyboards/evyd13/omrontkl/config.h
@@ -55,18 +55,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h b/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
index 5fadcf821a..af01276208 100644
--- a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
+++ b/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
@@ -19,7 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Underglow */
 #define RGB_DI_PIN B7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 30    			// Number of LEDs
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/evyd13/plain60/keymaps/rgb/config.h b/keyboards/evyd13/plain60/keymaps/rgb/config.h
index 8426938120..9b05207b42 100644
--- a/keyboards/evyd13/plain60/keymaps/rgb/config.h
+++ b/keyboards/evyd13/plain60/keymaps/rgb/config.h
@@ -1,7 +1,16 @@
 #pragma once
 
 #define RGB_DI_PIN B0
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20    			// limit to 20 otherwise brownouts
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
index 21e27d130e..ffb961e87e 100644
--- a/keyboards/evyd13/pockettype/config.h
+++ b/keyboards/evyd13/pockettype/config.h
@@ -55,18 +55,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index c2bf0598c3..68cea41604 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h
index d622cc1695..b7e782df01 100644
--- a/keyboards/evyd13/solheim68/config.h
+++ b/keyboards/evyd13/solheim68/config.h
@@ -55,18 +55,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h
index a65210e0ed..ed8e5fd3c6 100644
--- a/keyboards/evyd13/ta65/config.h
+++ b/keyboards/evyd13/ta65/config.h
@@ -51,7 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Backlight configuration
  */
 #define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 
 #define QMK_ESC_OUTPUT D2 // usually COL
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index ca79477e12..5449532862 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@@ -61,18 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index b0ac35cff8..fa56747867 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/config.h
@@ -43,7 +43,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Backlight configuration
  */
 #define RGB_DI_PIN B7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 
 #define QMK_ESC_OUTPUT F0 // usually COL
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index 6b65d5ea9b..a592b2207c 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -51,7 +51,16 @@
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 20
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index aea0dfc8f6..73b693c3d1 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -17,7 +17,16 @@
 //rgb light setting
 #define RGBLED_NUM      6
 #define RGB_DI_PIN      B7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 6f684a24e6..1e251917a2 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index 9e7b65d565..e7aa833a55 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -43,4 +43,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 
 #define RGBLED_NUM 6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index 6e82f4650b..45f5869c8c 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
index 9e7b65d565..e7aa833a55 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -43,4 +43,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 
 #define RGBLED_NUM 6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index ff985f4255..5496e0dc57 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -32,7 +32,16 @@
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 32e913bd12..bbd8cec6f5 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-  /* #define RGBLIGHT_EFFECT_BREATHING */
-  /* #define RGBLIGHT_EFFECT_RAINBOW_MOOD */
-  /* #define RGBLIGHT_EFFECT_RAINBOW_SWIRL */
-  /* #define RGBLIGHT_EFFECT_SNAKE */
-  /* #define RGBLIGHT_EFFECT_KNIGHT */
-  /* #define RGBLIGHT_EFFECT_CHRISTMAS */
-  /* #define RGBLIGHT_EFFECT_STATIC_GRADIENT */
-  /* #define RGBLIGHT_EFFECT_RGB_TEST */
-  /* #define RGBLIGHT_EFFECT_ALTERNATING */
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index f880b6d304..0e15e68c2f 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -58,8 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index ad7938f17c..b653036321 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -50,7 +50,17 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-#define RGBLIGHT_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
+
 
 /*
  * Feature disable options
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
index 00f609b282..632bc7fa9c 100644
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ b/keyboards/eyeohdesigns/babyv/config.h
@@ -40,8 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
index 1dc4236c51..627f274f5c 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -36,4 +36,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 80c2c986f3..b941af432c 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -51,5 +51,14 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN D2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
diff --git a/keyboards/fc660c/keymaps/default_rgb/config.h b/keyboards/fc660c/keymaps/default_rgb/config.h
index 13153dd8fa..8a9a444301 100644
--- a/keyboards/fc660c/keymaps/default_rgb/config.h
+++ b/keyboards/fc660c/keymaps/default_rgb/config.h
@@ -29,9 +29,6 @@
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   //#define RGBLIGHT_ANIMATIONS
- /*== or choose animations ==*/
    #define RGBLIGHT_EFFECT_PLAIN
    #define RGBLIGHT_EFFECT_BREATHING
    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -48,4 +45,4 @@
    /*==== 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
\ No newline at end of file
+ #endif
diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h
index 13153dd8fa..8a9a444301 100644
--- a/keyboards/fc660c/keymaps/via_rgb/config.h
+++ b/keyboards/fc660c/keymaps/via_rgb/config.h
@@ -29,9 +29,6 @@
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   //#define RGBLIGHT_ANIMATIONS
- /*== or choose animations ==*/
    #define RGBLIGHT_EFFECT_PLAIN
    #define RGBLIGHT_EFFECT_BREATHING
    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -48,4 +45,4 @@
    /*==== 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
\ No newline at end of file
+ #endif
diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h
index 5d13cc596b..1937b64ffa 100644
--- a/keyboards/ferris/keymaps/default/config.h
+++ b/keyboards/ferris/keymaps/default/config.h
@@ -40,8 +40,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Underglow configuration
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
 #endif
diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h
index 5d13cc596b..1937b64ffa 100644
--- a/keyboards/ferris/keymaps/pierrec83/config.h
+++ b/keyboards/ferris/keymaps/pierrec83/config.h
@@ -40,8 +40,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Underglow configuration
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
 #endif
diff --git a/keyboards/ferris/keymaps/test/config.h b/keyboards/ferris/keymaps/test/config.h
index 821bf7c03f..e22623e1d7 100644
--- a/keyboards/ferris/keymaps/test/config.h
+++ b/keyboards/ferris/keymaps/test/config.h
@@ -21,8 +21,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Underglow configuration
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
 #endif
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index 44229ae65c..9c9438f6d3 100644
--- a/keyboards/flehrad/bigswitch/config.h
+++ b/keyboards/flehrad/bigswitch/config.h
@@ -41,6 +41,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #endif
diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h
index aa5691dc32..0d4e106900 100644
--- a/keyboards/flehrad/downbubble/config.h
+++ b/keyboards/flehrad/downbubble/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
index 68216287d1..3ae143d026 100644
--- a/keyboards/flehrad/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
@@ -29,7 +29,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
index 0360aa7446..0d5930d57f 100644
--- a/keyboards/flehrad/snagpad/config.h
+++ b/keyboards/flehrad/snagpad/config.h
@@ -32,7 +32,16 @@
 //#define STRICT_LAYER_RELEASE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index 0b3a3c63f2..cf9b180f4c 100644
--- a/keyboards/flehrad/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
@@ -44,7 +44,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
  #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h
index d10f94bc00..03ff3a09cc 100644
--- a/keyboards/fleuron/config.h
+++ b/keyboards/fleuron/config.h
@@ -100,4 +100,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6     // The pin the LED strip is connected to
 #define RGBLED_NUM 18     // Number of LEDs in your strip
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/fluorite/config.h b/keyboards/fluorite/config.h
index f4e973d5d1..05aa2a9fde 100644
--- a/keyboards/fluorite/config.h
+++ b/keyboards/fluorite/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
index facc392358..078cdb31f7 100644
--- a/keyboards/flx/virgo/config.h
+++ b/keyboards/flx/virgo/config.h
@@ -50,9 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    // #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h
index c45931fd32..37529bb6d5 100644
--- a/keyboards/flxlb/zplit/config.h
+++ b/keyboards/flxlb/zplit/config.h
@@ -62,7 +62,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8}
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_SPLIT
-#define RGBLIGHT_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
+
 
 /*
  * Feature disable options
diff --git a/keyboards/foostan/cornelius/config.h b/keyboards/foostan/cornelius/config.h
index e3b7ed4f64..d90ebe2108 100644
--- a/keyboards/foostan/cornelius/config.h
+++ b/keyboards/foostan/cornelius/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index 6ffaa1b331..772fe2a237 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -53,7 +53,16 @@
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  #define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index b02b60698d..fb2d90b5ac 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -53,7 +53,16 @@
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  #define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index 725e3d7a79..eebcbec8ab 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -53,8 +53,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index eb702fc948..57cf24c548 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -53,8 +53,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h
index e0a1cbeaf8..677c53ecf3 100644
--- a/keyboards/foxlab/time80/config.h
+++ b/keyboards/foxlab/time80/config.h
@@ -40,18 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define RGBLIGHT_VAL_STEP 8
 //#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#define RGBLIGHT_EFFECT_BREATHING
-//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#define RGBLIGHT_EFFECT_SNAKE
-//#define RGBLIGHT_EFFECT_KNIGHT
-//#define RGBLIGHT_EFFECT_CHRISTMAS
-//#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#define RGBLIGHT_EFFECT_RGB_TEST
-//#define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h
index 1b3d814c66..c7d220255f 100644
--- a/keyboards/foxlab/time_re/hotswap/config.h
+++ b/keyboards/foxlab/time_re/hotswap/config.h
@@ -53,5 +53,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-    #define RGBLIGHT_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
diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h
index 1b3d814c66..c7d220255f 100644
--- a/keyboards/foxlab/time_re/universal/config.h
+++ b/keyboards/foxlab/time_re/universal/config.h
@@ -53,5 +53,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-    #define RGBLIGHT_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
diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h
index 8b40a62f42..6cae57605e 100755
--- a/keyboards/fractal/config.h
+++ b/keyboards/fractal/config.h
@@ -24,7 +24,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index d922620dde..10923bec04 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -36,4 +36,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_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

From 55b9a4d06e12df08564d3b6261f9ed81f75e07ec Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 15 Oct 2022 09:55:27 -0700
Subject: [PATCH 646/959] Remove RGBLIGHT_ANIMATION and clean up effect defines
 for G-K (#18726)

---
 keyboards/gami_studio/lex60/config.h          | 11 ++++++-
 keyboards/gh60/revc/keymaps/dbroqua/config.h  | 11 ++++++-
 keyboards/gh60/revc/keymaps/maxr1998/config.h | 13 +++++++--
 .../gh60/revc/keymaps/robotmaxtron/config.h   | 11 ++++++-
 keyboards/gh60/satan/config.h                 | 11 ++++++-
 .../gh60/satan/keymaps/gipsy-king/config.h    | 13 ++++++++-
 .../satan/keymaps/olligranlund_iso/config.h   | 11 ++++++-
 keyboards/gh60/v1p3/config.h                  | 22 +++++++-------
 keyboards/gh80_3000/config.h                  | 11 ++++++-
 keyboards/ghs/rar/config.h                    | 11 ++++++-
 keyboards/gkeyboard/gkb_m16/config.h          | 22 +++++++-------
 keyboards/gray_studio/cod67/config.h          | 12 ++++++--
 keyboards/gray_studio/hb85/config.h           | 11 ++++++-
 keyboards/gray_studio/space65/config.h        | 22 +++++++-------
 .../gray_studio/think65/hotswap/config.h      | 22 +++++++-------
 keyboards/gray_studio/think65/solder/config.h | 22 +++++++-------
 .../solder/keymaps/brandonschlack/config.h    | 11 ++++++-
 keyboards/grid600/press/config.h              | 11 ++++++-
 keyboards/h0oni/hotduck/config.h              | 12 ++++++--
 keyboards/hadron/ver2/config.h                | 13 +++++++--
 keyboards/hadron/ver3/config.h                | 11 ++++++-
 keyboards/han60/config.h                      | 12 --------
 keyboards/handwired/2x5keypad/config.h        | 11 ++++++-
 keyboards/handwired/6macro/config.h           |  3 --
 keyboards/handwired/aranck/config.h           | 12 --------
 keyboards/handwired/atreus50/config.h         | 11 ++++++-
 keyboards/handwired/bento/rev1/config.h       | 12 ++++++--
 keyboards/handwired/bento/rev1/rev1.c         |  2 +-
 keyboards/handwired/bolek/config.h            | 12 --------
 keyboards/handwired/bstk100/config.h          | 12 --------
 .../handwired/chiron/keymaps/default/config.h |  9 ++++--
 keyboards/handwired/co60/rev7/config.h        | 11 ++++++-
 .../handwired/consolekeyboard/18key/config.h  |  4 ---
 .../handwired/consolekeyboard/20key/config.h  |  4 ---
 .../handwired/consolekeyboard/27key/config.h  |  4 ---
 .../handwired/consolekeyboard/30key/config.h  |  6 +---
 keyboards/handwired/d48/config.h              | 11 ++++++-
 keyboards/handwired/dactyl_left/config.h      | 12 --------
 .../5x6/keymaps/rishka/config.h               | 11 ++++++-
 .../5x6/keymaps/squirrel/config.h             | 11 ++++++-
 keyboards/handwired/evk/v1_3/config.h         | 12 --------
 keyboards/handwired/floorboard/config.h       | 12 --------
 keyboards/handwired/frankie_macropad/config.h | 12 --------
 keyboards/handwired/freoduo/config.h          | 11 ++++++-
 keyboards/handwired/hacked_motospeed/config.h | 12 --------
 keyboards/handwired/heisenberg/config.h       | 22 +++++++-------
 keyboards/handwired/hexon38/config.h          | 11 ++++++-
 keyboards/handwired/hnah40/config.h           |  1 -
 keyboards/handwired/jopr/config.h             |  1 -
 .../handwired/jtallbean/split_65/config.h     | 12 --------
 keyboards/handwired/juliet/config.h           | 12 --------
 keyboards/handwired/lemonpad/config.h         | 12 --------
 keyboards/handwired/lovelive9/config.h        | 11 ++++++-
 keyboards/handwired/marauder/config.h         | 12 --------
 .../handwired/mechboards_micropad/config.h    | 12 --------
 .../handwired/minorca/keymaps/rgb/config.h    | 11 ++++++-
 .../handwired/oem_ansi_fullsize/config.h      | 12 --------
 .../handwired/onekey/keymaps/apa102/config.h  | 11 ++++++-
 .../handwired/onekey/keymaps/rgb/config.h     | 11 ++++++-
 keyboards/handwired/owlet60/config.h          | 22 +++++++-------
 keyboards/handwired/prime_exl_plus/config.h   | 11 ++++++-
 keyboards/handwired/prkl30/feather/config.h   | 11 ++++++-
 keyboards/handwired/prkl30/promicro/config.h  | 11 ++++++-
 keyboards/handwired/sick68/config.h           | 12 --------
 keyboards/handwired/snatchpad/config.h        | 12 --------
 keyboards/handwired/space_oddity/config.h     | 11 ++++++-
 keyboards/handwired/split89/config.h          | 12 --------
 keyboards/handwired/splittest/config.h        | 11 ++++++-
 keyboards/handwired/steamvan/rev1/config.h    | 11 ++++++-
 keyboards/handwired/sticc14/config.h          | 12 --------
 keyboards/handwired/swiftrax/walter/config.h  | 11 ++++++-
 .../symmetric70_proto/promicro/config.h       | 12 --------
 .../symmetric70_proto/proton_c/config.h       | 12 --------
 keyboards/handwired/symmetry60/config.h       | 11 ++++++-
 keyboards/handwired/tennie/config.h           | 22 +++++++-------
 keyboards/handwired/traveller/config.h        | 12 --------
 keyboards/handwired/twadlee/tp69/config.h     | 12 --------
 keyboards/handwired/uthol/rev2/config.h       |  1 -
 keyboards/handwired/uthol/rev3/config.h       | 11 ++++++-
 keyboards/handwired/woodpad/config.h          | 12 --------
 keyboards/helix/pico/config.h                 |  1 -
 keyboards/helix/rev2/config.h                 |  1 -
 keyboards/helix/rev2/keymaps/xulkal/rules.mk  |  2 --
 keyboards/helix/rev3_4rows/config.h           |  3 --
 keyboards/helix/rev3_5rows/config.h           |  3 --
 keyboards/hidtech/bastyl/config.h             | 13 +++++++--
 keyboards/hifumi/config.h                     | 11 ++++++-
 keyboards/hineybush/h10/config.h              | 12 --------
 keyboards/hineybush/h660s/config.h            |  3 --
 keyboards/hineybush/h75_singa/config.h        | 22 +++++++-------
 keyboards/hineybush/h87a/config.h             | 11 ++++++-
 keyboards/hineybush/h88/config.h              | 11 ++++++-
 keyboards/hineybush/hbcp/config.h             | 14 ++++++---
 keyboards/hineybush/hineyg80/config.h         | 11 ++++++-
 keyboards/hineybush/physix/config.h           | 22 +++++++-------
 keyboards/hineybush/sm68/config.h             |  3 --
 keyboards/hnahkb/freyr/config.h               | 12 --------
 keyboards/hnahkb/stella/config.h              | 12 --------
 keyboards/hnahkb/vn66/config.h                | 22 +++++++-------
 keyboards/hp69/config.h                       | 13 +++++++--
 keyboards/hub16/config.h                      | 22 +++++++-------
 .../hub16/keymaps/ahk_companion/config.h      | 12 --------
 keyboards/hub16/keymaps/peepeetee/config.h    | 12 --------
 keyboards/ianklug/grooveboard/config.h        | 12 --------
 keyboards/illuminati/is0/config.h             | 12 --------
 keyboards/inett_studio/sqx/hotswap/config.h   | 11 ++++++-
 keyboards/inett_studio/sqx/universal/config.h | 11 ++++++-
 keyboards/iriskeyboards/config.h              | 12 --------
 keyboards/jacky_studio/bear_65/config.h       | 22 +++++++-------
 .../jacky_studio/s7_elephant/rev1/config.h    | 11 ++++++-
 .../jacky_studio/s7_elephant/rev2/config.h    | 11 ++++++-
 keyboards/jc65/v32a/config.h                  | 11 ++++++-
 keyboards/jc65/v32u4/config.h                 | 11 ++++++-
 keyboards/jd40/config.h                       | 11 ++++++-
 keyboards/jian/nsrev2/config.h                | 11 ++++++-
 keyboards/jian/rev1/config.h                  | 12 +++++++-
 keyboards/jian/rev2/config.h                  | 11 ++++++-
 keyboards/jiran/rev2/config.h                 | 11 ++++++-
 keyboards/jm60/config.h                       | 12 --------
 keyboards/jones/v03/config.h                  |  3 --
 keyboards/jones/v03_1/config.h                |  3 --
 keyboards/kabedon/kabedon78s/config.h         | 19 ++++++++----
 keyboards/kabedon/kabedon980/config.h         | 12 ++++++--
 keyboards/kabedon/kabedon98e/config.h         | 11 ++++++-
 keyboards/kagizaraya/chidori/config.h         | 12 --------
 keyboards/kagizaraya/halberd/config.h         | 11 ++++++-
 keyboards/kagizaraya/scythe/config.h          | 11 ++++++-
 keyboards/kakunpc/angel17/alpha/config.h      | 12 --------
 keyboards/kakunpc/angel17/rev1/config.h       | 12 --------
 keyboards/kakunpc/angel64/alpha/config.h      | 22 +++++++-------
 keyboards/kakunpc/angel64/rev1/config.h       | 22 +++++++-------
 .../kakunpc/business_card/alpha/config.h      | 12 --------
 .../alpha/keymaps/default/config.h            | 11 ++++++-
 keyboards/kakunpc/business_card/beta/config.h | 12 --------
 .../beta/keymaps/default/config.h             | 13 +++++++--
 keyboards/kakunpc/choc_taro/config.h          | 12 --------
 .../kakunpc/rabbit_capture_plan/config.h      | 22 +++++++-------
 keyboards/kakunpc/suihankey/alpha/config.h    | 22 +++++++-------
 keyboards/kakunpc/suihankey/rev1/config.h     | 22 +++++++-------
 .../kakunpc/suihankey/split/alpha/config.h    | 12 --------
 .../kakunpc/suihankey/split/rev1/config.h     | 22 +++++++-------
 keyboards/kakunpc/thedogkeyboard/config.h     | 12 --------
 keyboards/kapcave/paladin64/config.h          | 11 ++++++-
 keyboards/kb58/config.h                       | 12 --------
 keyboards/kb_elmo/noah_avr/config.h           | 12 ++++++--
 keyboards/kbdclack/kaishi65/config.h          | 12 --------
 keyboards/kbdfans/kbd19x/config.h             | 11 ++++++-
 keyboards/kbdfans/kbd4x/config.h              | 11 ++++++-
 keyboards/kbdfans/kbd67/hotswap/config.h      | 21 +++++++-------
 keyboards/kbdfans/kbd67/rev1/config.h         | 22 +++++++-------
 keyboards/kbdfans/kbd67/rev2/config.h         | 11 ++++++-
 keyboards/kbdfans/kbd6x/config.h              | 11 ++++++-
 keyboards/kbdfans/kbd75/config.h              | 11 ++++++-
 keyboards/kbdfans/kbd8x/config.h              | 11 ++++++-
 keyboards/kbdfans/kbd8x_mk2/config.h          | 22 +++++++-------
 keyboards/kbdfans/kbdpad/mk1/config.h         | 11 ++++++-
 keyboards/kbdfans/kbdpad/mk2/config.h         | 22 +++++++-------
 keyboards/kbdfans/niu_mini/config.h           | 11 ++++++-
 keyboards/kbdfans/odin/soldered/config.h      | 15 ++++++----
 keyboards/kc60/config.h                       | 22 +++++++-------
 .../bdn9/keymaps/brandonschlack/config.h      | 11 ++++++-
 keyboards/keebio/bdn9/rev1/config.h           | 12 ++++++--
 keyboards/keebio/bdn9/rev1/rev1.c             |  2 +-
 keyboards/keebio/bdn9/rev2/config.h           | 12 ++++++--
 keyboards/keebio/bdn9/rev2/rev2.c             |  2 +-
 .../bfo9000/keymaps/abstractkb/config.h       | 11 ++++++-
 .../keymaps/insertsnideremarks/config.h       |  1 -
 .../bfo9000/keymaps/tuesdayjohn/config.h      |  1 -
 keyboards/keebio/chocopad/chocopad.c          |  2 +-
 keyboards/keebio/chocopad/config.h            | 11 ++++++-
 keyboards/keebio/dilly/config.h               | 11 ++++++-
 keyboards/keebio/dilly/dilly.c                |  2 +-
 keyboards/keebio/dsp40/rev1/config.h          | 12 ++++++--
 keyboards/keebio/ergodicity/config.h          | 12 ++++++--
 keyboards/keebio/ergodicity/ergodicity.c      |  2 +-
 keyboards/keebio/foldkb/rev1/config.h         | 11 ++++++-
 keyboards/keebio/fourier/config.h             | 11 ++++++-
 .../iris/keymaps/antonlindstrom/config.h      | 11 ++++++-
 keyboards/keebio/iris/keymaps/ave-63/config.h |  1 -
 keyboards/keebio/iris/keymaps/blucky/config.h | 12 +++++++-
 .../keebio/iris/keymaps/bmoorey/config.h      | 11 ++++++-
 keyboards/keebio/iris/keymaps/csc027/config.h | 11 ++++++-
 .../keebio/iris/keymaps/davidrambo/config.h   |  3 --
 keyboards/keebio/iris/keymaps/dvorak/config.h | 11 ++++++-
 keyboards/keebio/iris/keymaps/eosti/config.h  | 11 ++++++-
 keyboards/keebio/iris/keymaps/fsck/config.h   | 11 ++++++-
 .../keebio/iris/keymaps/hbbisenieks/config.h  | 11 ++++++-
 .../keebio/iris/keymaps/isolike/config.h      | 11 ++++++-
 .../keebio/iris/keymaps/jerryhcooke/config.h  | 11 ++++++-
 keyboards/keebio/iris/keymaps/khang/config.h  | 29 +++++++++----------
 keyboards/keebio/iris/keymaps/khord/config.h  | 11 ++++++-
 keyboards/keebio/iris/keymaps/krusli/config.h | 11 ++++++-
 keyboards/keebio/iris/keymaps/mattly/config.h | 11 ++++++-
 keyboards/keebio/iris/keymaps/mnil/config.h   | 11 ++++++-
 .../keebio/iris/keymaps/moonfall/config.h     | 11 ++++++-
 .../iris/keymaps/olligranlund_nordic/config.h |  1 -
 keyboards/keebio/iris/keymaps/omgvee/config.h | 11 ++++++-
 keyboards/keebio/iris/keymaps/osiris/config.h | 13 +++++++--
 .../keebio/iris/keymaps/radlinskii/config.h   |  1 -
 keyboards/keebio/iris/keymaps/xyverz/config.h | 11 ++++++-
 keyboards/keebio/iris/rev1/config.h           | 11 ++++++-
 keyboards/keebio/iris/rev1_led/config.h       | 11 ++++++-
 keyboards/keebio/iris/rev2/config.h           | 11 ++++++-
 keyboards/keebio/iris/rev2/rev2.c             |  2 +-
 keyboards/keebio/iris/rev3/config.h           | 11 ++++++-
 keyboards/keebio/iris/rev3/rev3.c             |  2 +-
 keyboards/keebio/iris/rev4/config.h           | 11 ++++++-
 keyboards/keebio/iris/rev4/rev4.c             |  2 +-
 keyboards/keebio/kbo5000/rev1/config.h        | 11 ++++++-
 keyboards/keebio/kbo5000/rev1/rev1.c          |  2 +-
 keyboards/keebio/laplace/config.h             | 11 ++++++-
 .../levinson/keymaps/issmirnov/config.h       | 12 +++++++-
 .../keebio/levinson/keymaps/jyh2/config.h     | 12 ++++++--
 .../levinson/keymaps/ksamborski/config.h      | 12 ++++++--
 .../keymaps/losinggeneration/config.h         | 11 ++++++-
 .../levinson/keymaps/mmacdougall/config.h     | 11 ++++++-
 .../levinson/keymaps/treadwell/config.h       |  1 -
 keyboards/keebio/levinson/rev2/rev2.c         |  2 +-
 keyboards/keebio/levinson/rev3/rev3.c         |  2 +-
 .../keebio/nyquist/keymaps/default/config.h   | 11 ++++++-
 .../keebio/nyquist/keymaps/jojiichan/config.h | 12 ++++++--
 .../keebio/nyquist/keymaps/kim-kim/config.h   | 11 ++++++-
 .../keebio/nyquist/keymaps/pipicanim/config.h | 11 ++++++-
 .../keebio/nyquist/keymaps/pjanx/config.h     | 11 ++++++-
 .../keebio/nyquist/keymaps/shovelpaw/config.h | 11 ++++++-
 .../keebio/nyquist/keymaps/skug/config.h      | 11 ++++++-
 .../nyquist/keymaps/winternebs/config.h       | 11 ++++++-
 .../keebio/nyquist/keymaps/yshrsmz/config.h   | 11 ++++++-
 keyboards/keebio/nyquist/rev2/rev2.c          |  2 +-
 keyboards/keebio/nyquist/rev3/config.h        | 11 ++++++-
 keyboards/keebio/nyquist/rev3/rev3.c          |  2 +-
 .../quefrency/keymaps/georgepetri/config.h    | 11 ++++++-
 keyboards/keebio/quefrency/rev1/config.h      | 11 ++++++-
 keyboards/keebio/quefrency/rev1/rev1.c        |  2 +-
 keyboards/keebio/quefrency/rev2/rev2.c        |  2 +-
 keyboards/keebio/quefrency/rev3/rev3.c        |  2 +-
 .../keymaps/insertsnideremarks/config.h       |  1 -
 .../rorschach/keymaps/tuesdayjohn/config.h    |  1 -
 keyboards/keebio/rorschach/rev1/config.h      | 11 ++++++-
 keyboards/keebio/stick/config.h               | 12 ++++++--
 keyboards/keebio/stick/stick.c                |  2 +-
 keyboards/keebio/tukey/config.h               | 13 +++++++--
 .../keebio/viterbi/keymaps/default/config.h   | 11 ++++++-
 .../viterbi/keymaps/ericgebhart/config.h      | 11 ++++++-
 .../keebio/viterbi/keymaps/vosechu/config.h   | 11 ++++++-
 keyboards/keebio/viterbi/rev2/rev2.c          |  2 +-
 keyboards/keebio/wtf60/config.h               | 12 ++++++--
 keyboards/keebwerk/nano_slider/config.h       | 21 +++++++-------
 keyboards/keebzdotnet/wazowski/config.h       | 12 --------
 keyboards/keybage/radpad/config.h             | 12 ++++++--
 .../keycapsss/kimiko/keymaps/default/config.h | 22 +++++++-------
 keyboards/keycapsss/o4l_5x12/config.h         | 22 +++++++-------
 keyboards/keyhive/absinthe/config.h           |  3 --
 keyboards/keyhive/ergosaurus/config.h         |  3 --
 keyboards/keyhive/maypad/config.h             | 12 --------
 keyboards/keyhive/smallice/config.h           | 22 +++++++-------
 keyboards/keyhive/southpole/config.h          | 11 ++++++-
 keyboards/keyhive/uno/rev1/config.h           | 13 ---------
 keyboards/keyhive/ut472/config.h              | 11 ++++++-
 keyboards/keyprez/bison/config.h              | 12 --------
 keyboards/keyprez/unicorn/config.h            | 12 --------
 keyboards/keysofkings/twokey/config.h         | 11 ++++++-
 keyboards/kindakeyboards/conone65/config.h    | 12 --------
 keyboards/kingly_keys/little_foot/config.h    | 11 ++++++-
 .../romac/keymaps/stanrc85/config.h           | 12 ++++++--
 keyboards/kingly_keys/romac_plus/config.h     | 11 ++++++-
 keyboards/kingly_keys/ropro/config.h          | 13 +++++++--
 keyboards/kingly_keys/smd_milk/config.h       | 14 +++++++--
 keyboards/kingly_keys/soap/config.h           | 15 ++++++++--
 keyboards/kira75/config.h                     | 11 ++++++-
 keyboards/kiwikey/kawii9/config.h             | 22 +++++++-------
 keyboards/kiwikey/wanderland/config.h         | 22 +++++++-------
 keyboards/kkatano/bakeneko80/config.h         | 12 --------
 keyboards/kkatano/wallaby/config.h            | 12 --------
 keyboards/kkatano/yurei/config.h              | 12 --------
 keyboards/kona_classic/config.h               | 11 ++++++-
 keyboards/kopibeng/mnk88/config.h             |  3 --
 keyboards/kopibeng/xt60/config.h              |  5 +---
 keyboards/kopibeng/xt60_singa/config.h        |  3 --
 keyboards/kopibeng/xt65/config.h              | 22 +++++++-------
 keyboards/kopibeng/xt8x/config.h              |  3 --
 keyboards/kprepublic/bm16a/config.h           | 23 +++++++--------
 keyboards/kprepublic/bm16s/config.h           | 11 ++++++-
 .../bm40hsrgb/keymaps/signynt/config.h        | 12 +++++++-
 .../bm40hsrgb/keymaps/signynt_2_loud/config.h | 12 +++++++-
 .../keymaps/signynt_2_quiet/config.h          | 12 +++++++-
 keyboards/kprepublic/bm43a/config.h           | 12 --------
 .../bm43hsrgb/keymaps/bitstarr/config.h       | 24 +++++++--------
 keyboards/kprepublic/bm60hsrgb/rev2/config.h  | 12 ++++++--
 .../kprepublic/bm60hsrgb_iso/rev1/config.h    | 12 --------
 .../kprepublic/bm60hsrgb_poker/rev1/config.h  | 22 +++++++-------
 .../bm68hsrgb/rev1/keymaps/peepeetee/config.h | 11 -------
 keyboards/kprepublic/cospad/config.h          | 22 +++++++-------
 keyboards/kprepublic/jj40/config.h            | 12 +++++++-
 keyboards/kprepublic/jj4x4/config.h           | 12 +++++++-
 keyboards/kprepublic/jj50/config.h            | 11 ++++++-
 keyboards/ktec/daisy/config.h                 | 22 +++++++-------
 keyboards/ktec/staryu/config.h                | 23 +++++++--------
 keyboards/kudox/columner/config.h             | 11 ++++++-
 keyboards/kudox/rev1/config.h                 | 11 ++++++-
 keyboards/kudox/rev2/config.h                 | 11 ++++++-
 keyboards/kudox/rev3/config.h                 | 11 ++++++-
 keyboards/kudox_game/rev1/config.h            | 11 ++++++-
 keyboards/kudox_game/rev2/config.h            | 11 ++++++-
 keyboards/kwub/bloop/config.h                 | 13 +++++++--
 keyboards/ky01/config.h                       | 12 --------
 306 files changed, 2036 insertions(+), 1432 deletions(-)

diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h
index 311f355589..31ce3bbc3c 100644
--- a/keyboards/gami_studio/lex60/config.h
+++ b/keyboards/gami_studio/lex60/config.h
@@ -42,4 +42,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D1
 #define RGBLED_NUM 12
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h
index 38e5bb0def..82775a83a4 100644
--- a/keyboards/gh60/revc/keymaps/dbroqua/config.h
+++ b/keyboards/gh60/revc/keymaps/dbroqua/config.h
@@ -19,7 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F4
 #define RGBLED_NUM 11
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gh60/revc/keymaps/maxr1998/config.h b/keyboards/gh60/revc/keymaps/maxr1998/config.h
index 8c3b9b2502..3013308bb2 100644
--- a/keyboards/gh60/revc/keymaps/maxr1998/config.h
+++ b/keyboards/gh60/revc/keymaps/maxr1998/config.h
@@ -21,10 +21,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "../../config.h"
 
 #define RGB_DI_PIN          F4 // pin the DI on the WS2812B is hooked-up to
-#define RGBLIGHT_ANIMATIONS    // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM          6  // number of LEDs
 #define RGBLIGHT_HUE_STEP   12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP   25 // units to step when in/decresing saturation
 #define RGBLIGHT_VAL_STEP   12 // units to step when in/decreasing value (brightness)
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
index 955ead1ba2..4ffa701ab8 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
@@ -19,7 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F4
 #define RGBLED_NUM 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index 3a094be74f..da5c2e82fc 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -54,7 +54,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underglow configuration
  */
 #define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/gh60/satan/keymaps/gipsy-king/config.h b/keyboards/gh60/satan/keymaps/gipsy-king/config.h
index 0368fa812c..62deb0dc5a 100644
--- a/keyboards/gh60/satan/keymaps/gipsy-king/config.h
+++ b/keyboards/gh60/satan/keymaps/gipsy-king/config.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #undef RGBLED_NUM
 #define RGBLED_NUM 17
 #undef RGBLIGHT_HUE_STEP
@@ -7,4 +9,13 @@
 #undef RGBLIGHT_VAL_STEP
 #define RGBLIGHT_VAL_STEP 5
 
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
index eab4c8e975..30269196f3 100644
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
@@ -14,4 +14,13 @@
 #undef RGBLIGHT_VAL_STEP
 #define RGBLIGHT_VAL_STEP 8
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h
index 6d5d56915b..96b1feaef5 100644
--- a/keyboards/gh60/v1p3/config.h
+++ b/keyboards/gh60/v1p3/config.h
@@ -50,16 +50,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h
index 1717a7806d..35979d8132 100644
--- a/keyboards/gh80_3000/config.h
+++ b/keyboards/gh80_3000/config.h
@@ -23,7 +23,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index 7b93dc2197..7c925df14a 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D0
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 17
-    #define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 9df13da954..a83fc17d0b 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -62,18 +62,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h
index 178cc3dc13..f5469c299d 100644
--- a/keyboards/gray_studio/cod67/config.h
+++ b/keyboards/gray_studio/cod67/config.h
@@ -53,7 +53,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255
   #define RGBLIGHT_SLEEP
-  #define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
@@ -63,4 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h
index d1240e6b9c..362513ae07 100644
--- a/keyboards/gray_studio/hb85/config.h
+++ b/keyboards/gray_studio/hb85/config.h
@@ -26,7 +26,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define RGBLED_NUM 5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define LED_NUM_LOCK_PIN D0
 #define LED_CAPS_LOCK_PIN D1
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index d8b67b3c50..b509e56138 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -54,18 +54,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h
index c9a8937436..0a5baa8a6a 100644
--- a/keyboards/gray_studio/think65/hotswap/config.h
+++ b/keyboards/gray_studio/think65/hotswap/config.h
@@ -51,18 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 // generated by KBFirmware JSON to QMK Parser
diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h
index e2fb811cf9..2de4d8c6a8 100644
--- a/keyboards/gray_studio/think65/solder/config.h
+++ b/keyboards/gray_studio/think65/solder/config.h
@@ -47,18 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 // generated by KBFirmware JSON to QMK Parser
diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h
index 157b55d76d..9b3ecffef1 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h
+++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h
@@ -16,5 +16,14 @@
 
 #pragma once
 
-#undef RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
+
+#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/grid600/press/config.h b/keyboards/grid600/press/config.h
index 9800c38402..6799b7743d 100644
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 17
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  #define RGBLIGHT_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
 /*== customize breathing effect ==*/
   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index 67cb2fdced..14eb2704e9 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -53,7 +53,16 @@
  * F4 PIN for pre-soldered WS2812 LEDs
  */
 #define RGB_DI_PIN F4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 15
@@ -63,4 +72,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index a19ae41ffc..6a4ca9073c 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -29,9 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED*/
 #define RGB_DI_PIN D4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
-
-
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index 0a06f3ec7c..03b31ece1e 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -162,7 +162,16 @@
 #define ZC_DET_TIME 0
 #define AUTO_CAL_TIME 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 10
 #define RGB_DI_PIN B5
diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h
index 1c65f6ba90..7f7c54ca0e 100644
--- a/keyboards/han60/config.h
+++ b/keyboards/han60/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index d038b0534a..aec6f6f5f6 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -26,7 +26,16 @@
 #define TAPPING_TERM 250
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index a117fc65aa..1ec5dfb6d6 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 17
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h
index 1b9a0b2419..cb05f9679d 100644
--- a/keyboards/handwired/aranck/config.h
+++ b/keyboards/handwired/aranck/config.h
@@ -58,18 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index f433427ab0..7a4840acfd 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -49,7 +49,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN C6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index 0eb7664878..870710a8c9 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -39,8 +39,16 @@
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/handwired/bento/rev1/rev1.c b/keyboards/handwired/bento/rev1/rev1.c
index 8f195d3ef8..4ab5dc2fd0 100644
--- a/keyboards/handwired/bento/rev1/rev1.c
+++ b/keyboards/handwired/bento/rev1/rev1.c
@@ -19,7 +19,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index b6cbea8f39..9eb853c137 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -57,18 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
index c51031b2b5..69389d057e 100644
--- a/keyboards/handwired/bstk100/config.h
+++ b/keyboards/handwired/bstk100/config.h
@@ -66,18 +66,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index e67664253c..06c5f586e4 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -43,9 +43,14 @@
 #define RGBLIGHT_VAL_STEP 8
 
 // Selectively enable animations to save on code size.
-#undef  RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define 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/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index deed36713b..9975901a6f 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -49,7 +49,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 5
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 16
 #define RGB_DI_PIN A7
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
index 98aa5895e4..e9b84c5828 100644
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -45,9 +45,6 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-   // #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
      #define RGBLIGHT_EFFECT_BREATHING
 //     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -58,4 +55,3 @@
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
-
diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index 1ed0e5743f..7b8e521cf9 100644
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -45,9 +45,6 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-   // #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
      #define RGBLIGHT_EFFECT_BREATHING
 //     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -58,4 +55,3 @@
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
-
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
index f2f97c5ddd..45159412c8 100644
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -45,9 +45,6 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-   // #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
      #define RGBLIGHT_EFFECT_BREATHING
 //     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -58,4 +55,3 @@
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
-
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index 6839a40dc3..5840aa4b26 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -45,10 +45,7 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-   // #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-     #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_BREATHING
 //     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 //     #define RGBLIGHT_EFFECT_SNAKE
@@ -58,4 +55,3 @@
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
-
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 47ae30a98f..0a1ad5a0d2 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -30,7 +30,16 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_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
 
 /* Audio */
diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h
index c10096e590..6769d445d8 100644
--- a/keyboards/handwired/dactyl_left/config.h
+++ b/keyboards/handwired/dactyl_left/config.h
@@ -58,18 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
index bcfea1f14f..fb01f969d3 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
@@ -34,6 +34,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define RGBLED_NUM 54
 #define RGBLIGHT_LIMIT_VAL 200
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // #define RGBLIGHT_LED_MAP { 11,10,9,8,7,6,5,4,3,2,1,0,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26 }
 #define RGBLIGHT_SPLIT 27
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
index 626fe3cbdc..44c4234c9b 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
@@ -35,6 +35,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 #undef RGBLED_NUM
 #define RGBLED_NUM 30
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 95
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h
index 9a2192ec44..e8e3ecb704 100644
--- a/keyboards/handwired/evk/v1_3/config.h
+++ b/keyboards/handwired/evk/v1_3/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h
index 2f071df7bd..70362f0f24 100644
--- a/keyboards/handwired/floorboard/config.h
+++ b/keyboards/handwired/floorboard/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index 883807239b..bd37acd361 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
index e4393a319d..45d4609abf 100644
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_LED_MAP { 8, 7, 6, 5, 4, 3, 2, 1, 0, 17, 16, 15, 14, 13, 12, 11, 10, 9}
 #    define RGBLIGHT_LAYERS
 #endif
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_HUE_STEP 16
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h
index 690e96365c..4ad84b0677 100644
--- a/keyboards/handwired/hacked_motospeed/config.h
+++ b/keyboards/handwired/hacked_motospeed/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 84224a4514..fb418acbdc 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-	#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h
index 292e0c8410..f5b4fd6d3a 100644
--- a/keyboards/handwired/hexon38/config.h
+++ b/keyboards/handwired/hexon38/config.h
@@ -19,7 +19,16 @@
 #define DEBOUNCE 5
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h
index 6d4e8f7d33..8f9ca21588 100644
--- a/keyboards/handwired/hnah40/config.h
+++ b/keyboards/handwired/hnah40/config.h
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index bf7d94d5f6..9acc8a4f4e 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -27,7 +27,6 @@
 
 /*#define RGB_DI_PIN F4*/
 #ifdef RGB_DI_PIN
-/*#define RGBLIGHT_ANIMATIONS*/
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 1
 #define RGBLIGHT_SAT_STEP 1
diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h
index e3c08722e2..26d49cecb1 100644
--- a/keyboards/handwired/jtallbean/split_65/config.h
+++ b/keyboards/handwired/jtallbean/split_65/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h
index 4b8cc99995..3dbf0ae715 100644
--- a/keyboards/handwired/juliet/config.h
+++ b/keyboards/handwired/juliet/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/handwired/lemonpad/config.h b/keyboards/handwired/lemonpad/config.h
index 7db499aba4..dfa1184a92 100644
--- a/keyboards/handwired/lemonpad/config.h
+++ b/keyboards/handwired/lemonpad/config.h
@@ -50,18 +50,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index 42974d48a5..771c26f3d7 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -19,7 +19,16 @@
 
 #define RGBLED_NUM 9    // Number of LEDs
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define BACKLIGHT_LEVELS 5
 #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4
 #define BREATHING_PERIOD 2
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index a3165c480d..3873048f7a 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -45,16 +45,4 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h
index 659bed03e2..066118bd2c 100644
--- a/keyboards/handwired/mechboards_micropad/config.h
+++ b/keyboards/handwired/mechboards_micropad/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h
index d3715d054b..6050bcf11d 100644
--- a/keyboards/handwired/minorca/keymaps/rgb/config.h
+++ b/keyboards/handwired/minorca/keymaps/rgb/config.h
@@ -2,7 +2,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 13     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h
index 0ba0cb3897..14e3683a5a 100644
--- a/keyboards/handwired/oem_ansi_fullsize/config.h
+++ b/keyboards/handwired/oem_ansi_fullsize/config.h
@@ -69,18 +69,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/onekey/keymaps/apa102/config.h b/keyboards/handwired/onekey/keymaps/apa102/config.h
index aeb22a261b..756ebb3593 100644
--- a/keyboards/handwired/onekey/keymaps/apa102/config.h
+++ b/keyboards/handwired/onekey/keymaps/apa102/config.h
@@ -2,4 +2,13 @@
 
 #define RGBLED_NUM 40
 #define APA102_DEFAULT_BRIGHTNESS 5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/handwired/onekey/keymaps/rgb/config.h b/keyboards/handwired/onekey/keymaps/rgb/config.h
index 89e76326b4..1e54383769 100644
--- a/keyboards/handwired/onekey/keymaps/rgb/config.h
+++ b/keyboards/handwired/onekey/keymaps/rgb/config.h
@@ -1,4 +1,13 @@
 #pragma once
 
 #define RGBLED_NUM 9
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h
index 3dfccbd218..be338d75ab 100644
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 128 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h
index 46b235f9ee..ba138eb42d 100644
--- a/keyboards/handwired/prime_exl_plus/config.h
+++ b/keyboards/handwired/prime_exl_plus/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D4
 #define RGBLED_NUM 10
-#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h
index bbed6c0b0b..0fbe096264 100644
--- a/keyboards/handwired/prkl30/feather/config.h
+++ b/keyboards/handwired/prkl30/feather/config.h
@@ -32,7 +32,16 @@
 /* RGB Light Configuration */
 
 #define RGB_DI_PIN D1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 13
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h
index 9f7c4f4f9a..9cb58298fd 100644
--- a/keyboards/handwired/prkl30/promicro/config.h
+++ b/keyboards/handwired/prkl30/promicro/config.h
@@ -32,7 +32,16 @@
 /* RGB Light Configuration */
 
 #define RGB_DI_PIN D1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 13
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h
index 79ce50ba8b..60fc1c30ed 100644
--- a/keyboards/handwired/sick68/config.h
+++ b/keyboards/handwired/sick68/config.h
@@ -58,18 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h
index 188135b4d6..2d4f9ca2b4 100644
--- a/keyboards/handwired/snatchpad/config.h
+++ b/keyboards/handwired/snatchpad/config.h
@@ -55,18 +55,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h
index ab0847e87a..caea1cb3a5 100644
--- a/keyboards/handwired/space_oddity/config.h
+++ b/keyboards/handwired/space_oddity/config.h
@@ -29,7 +29,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h
index b6e8157d2c..55a2287e60 100644
--- a/keyboards/handwired/split89/config.h
+++ b/keyboards/handwired/split89/config.h
@@ -73,18 +73,6 @@ COLS = number of cols per side which curently needs to be equal so there are bla
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/splittest/config.h b/keyboards/handwired/splittest/config.h
index eecffe3803..7eaab91e91 100644
--- a/keyboards/handwired/splittest/config.h
+++ b/keyboards/handwired/splittest/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 6, 6 }
 
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index 81c58c977e..342f1a02d2 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 5
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 16
 #define RGB_DI_PIN A7
diff --git a/keyboards/handwired/sticc14/config.h b/keyboards/handwired/sticc14/config.h
index 19ae8d1dbf..f8c3e2b50f 100644
--- a/keyboards/handwired/sticc14/config.h
+++ b/keyboards/handwired/sticc14/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h
index 9797563edd..cfe446ff8e 100644
--- a/keyboards/handwired/swiftrax/walter/config.h
+++ b/keyboards/handwired/swiftrax/walter/config.h
@@ -42,4 +42,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 24
-#define RGBLIGHT_ANIMATIONS
\ No newline at end of file
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/handwired/symmetric70_proto/promicro/config.h b/keyboards/handwired/symmetric70_proto/promicro/config.h
index 48ef0cbdb5..caba8ebf6d 100644
--- a/keyboards/handwired/symmetric70_proto/promicro/config.h
+++ b/keyboards/handwired/symmetric70_proto/promicro/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/symmetric70_proto/proton_c/config.h b/keyboards/handwired/symmetric70_proto/proton_c/config.h
index 040575ef55..2fe22de67f 100644
--- a/keyboards/handwired/symmetric70_proto/proton_c/config.h
+++ b/keyboards/handwired/symmetric70_proto/proton_c/config.h
@@ -70,18 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index 17ea91745b..740f5d05ef 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index e59f7efbe1..9998e313f5 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index 82de3bc0ba..ac4d8e3825 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 17
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h
index dd69394916..37f5dbae6e 100644
--- a/keyboards/handwired/twadlee/tp69/config.h
+++ b/keyboards/handwired/twadlee/tp69/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index 6fccc3047d..03263fbbcc 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -26,5 +26,4 @@
 //RGB Stuff
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 39
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index 14da0d8a60..943f9615ea 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -57,5 +57,14 @@
 // RGB Stuff
 #define RGB_DI_PIN B0
 #define RGBLED_NUM 39
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/woodpad/config.h b/keyboards/handwired/woodpad/config.h
index 16290df805..7113e15f39 100644
--- a/keyboards/handwired/woodpad/config.h
+++ b/keyboards/handwired/woodpad/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index b96c9c51cf..fadb3fe204 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -70,7 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define RGBLED_NUM 12    // Number of LEDs. see ./keymaps/default/config.h
 
 // Helix keyboard RGB LED support
-//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #ifdef RGBLED_BACK
   #define RGBLED_NUM 25
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index dcf88cc09c..f409d039c4 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -77,7 +77,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define RGBLED_NUM 12    // Number of LEDs. see ./keymaps/default/config.h
 
 // Helix keyboard RGB LED support
-//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #ifdef RGBLED_BACK
   #if MATRIX_ROWS == 8 // HELIX_ROWS == 4
diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
index bdf0479a40..5a9c1e2890 100644
--- a/keyboards/helix/rev2/keymaps/xulkal/rules.mk
+++ b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
@@ -1,6 +1,4 @@
 RGBLIGHT_ENABLE = yes
-# Enable RGBLIGHT Animations
-OPT_DEFS += -DRGBLIGHT_ANIMATIONS
 # Helix specific define for correct RGBLED_NUM
 OPT_DEFS += -DRGBLED_BACK
 
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 0dd1a50400..4cd96388b8 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -78,9 +78,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 68578c3947..a27fda7795 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -78,9 +78,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h
index 22bdc6c8bd..1feb25b84c 100644
--- a/keyboards/hidtech/bastyl/config.h
+++ b/keyboards/hidtech/bastyl/config.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
  * Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
  *
@@ -27,7 +27,16 @@
 #define RGB_DI_PIN D2
 #define RGBLED_NUM 38
 #define RGBLIGHT_SPLIT
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define DEBOUNCE 5
 #define SOFT_SERIAL_PIN D0
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h
index 3475843da2..43786161bb 100644
--- a/keyboards/hifumi/config.h
+++ b/keyboards/hifumi/config.h
@@ -44,4 +44,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 6
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_HUE_STEP 5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h
index 2f8fb70069..428e7c7905 100644
--- a/keyboards/hineybush/h10/config.h
+++ b/keyboards/hineybush/h10/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index 582c1b0958..ad2d13ded2 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/config.h
@@ -51,9 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index f1428d0b19..d1a75c77be 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/config.h
@@ -52,18 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index 1200dbd9fb..6a7920f7d3 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -58,7 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h
index 79481fbb0a..241df48ecf 100644
--- a/keyboards/hineybush/h88/config.h
+++ b/keyboards/hineybush/h88/config.h
@@ -58,7 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h
index a92ddc1aa8..8ed0f61528 100644
--- a/keyboards/hineybush/hbcp/config.h
+++ b/keyboards/hineybush/hbcp/config.h
@@ -51,8 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
@@ -73,5 +81,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
  */
 // #define GRAVE_ESC_CTRL_OVERRIDE
-
-
diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h
index 4014bc804f..3d9b59bc55 100644
--- a/keyboards/hineybush/hineyg80/config.h
+++ b/keyboards/hineybush/hineyg80/config.h
@@ -34,7 +34,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
index 6557696f89..4fde85fb5e 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index 62de4db381..a618257e18 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/config.h
@@ -48,9 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
- /*== or choose animations ==*/
    #define RGBLIGHT_EFFECT_BREATHING
    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h
index 57abe3e37e..81cd407d13 100644
--- a/keyboards/hnahkb/freyr/config.h
+++ b/keyboards/hnahkb/freyr/config.h
@@ -55,18 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index 043c9933da..46112a56cc 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/config.h
@@ -55,18 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 92fd3d456c..50c97ad6a8 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/hp69/config.h b/keyboards/hp69/config.h
index 3bb4793186..e77be95ecb 100644
--- a/keyboards/hp69/config.h
+++ b/keyboards/hp69/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN A3
 #define RGBLED_NUM 20
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 
 #define AUDIO_PIN A5
@@ -47,4 +56,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PIN_ALT_AS_NEGATIVE
 
 #define LED_CAPS_LOCK_PIN A6
-#define LED_SCROLL_LOCK_PIN A7
\ No newline at end of file
+#define LED_SCROLL_LOCK_PIN A7
diff --git a/keyboards/hub16/config.h b/keyboards/hub16/config.h
index e88fba018b..db1b1dafff 100755
--- a/keyboards/hub16/config.h
+++ b/keyboards/hub16/config.h
@@ -38,18 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-// #define RGBLIGHT_EFFECT_BREATHING
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-// #define RGBLIGHT_EFFECT_SNAKE
-// #define RGBLIGHT_EFFECT_KNIGHT
-// #define RGBLIGHT_EFFECT_CHRISTMAS
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-// #define RGBLIGHT_EFFECT_RGB_TEST
-// #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 20
diff --git a/keyboards/hub16/keymaps/ahk_companion/config.h b/keyboards/hub16/keymaps/ahk_companion/config.h
index aa9e081c75..62b0df937b 100644
--- a/keyboards/hub16/keymaps/ahk_companion/config.h
+++ b/keyboards/hub16/keymaps/ahk_companion/config.h
@@ -18,18 +18,6 @@ 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 */
-// /*== all animations enable ==*/
-// #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-// #define RGBLIGHT_EFFECT_BREATHING
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-// #define RGBLIGHT_EFFECT_SNAKE
-// #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/hub16/keymaps/peepeetee/config.h b/keyboards/hub16/keymaps/peepeetee/config.h
index aa9e081c75..62b0df937b 100644
--- a/keyboards/hub16/keymaps/peepeetee/config.h
+++ b/keyboards/hub16/keymaps/peepeetee/config.h
@@ -18,18 +18,6 @@ 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 */
-// /*== all animations enable ==*/
-// #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-// #define RGBLIGHT_EFFECT_BREATHING
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-// #define RGBLIGHT_EFFECT_SNAKE
-// #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index 1a42b95b41..77aff8614a 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/config.h
@@ -65,18 +65,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h
index f589733388..841f2d79b7 100644
--- a/keyboards/illuminati/is0/config.h
+++ b/keyboards/illuminati/is0/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index f55cf34eb5..7d00b57954 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -46,7 +46,16 @@
 #define RGBLIGHT_LIMIT_VAL 128
 #define RGBLED_NUM          18
 #define RGB_DI_PIN          D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index d9bbb1c9fc..d3b26e12a2 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -46,7 +46,16 @@
 #define RGBLIGHT_LIMIT_VAL 128
 #define RGBLED_NUM          18
 #define RGB_DI_PIN          D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h
index e761d76895..c3ff6341f4 100644
--- a/keyboards/iriskeyboards/config.h
+++ b/keyboards/iriskeyboards/config.h
@@ -64,18 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index dc7e9c6158..c2ff9c38c8 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -55,18 +55,16 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 139 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 /* RGB matrix support */
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index b4de22c83e..ccef8fb63d 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -37,7 +37,16 @@
 
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 41a8c77f9d..cbddf31674 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -48,7 +48,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index 01b73b34db..a8f6262fc8 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 
 #define RGBLED_NUM 16
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index d59d30a12e..a4d03beb76 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h
index 340123270e..c229548b6e 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/config.h
@@ -54,7 +54,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12         // Number of LEDs
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 6b36049f94..9e2e5e765e 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -49,7 +49,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D4
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 7    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS //not working with splits right now
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 9ac9ad9551..3e8f0eed02 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -97,7 +97,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D4
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 7    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS //not working with splits right now
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index d44a2b099a..c142100610 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -54,7 +54,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D4
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 7    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS //not working with splits right now
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/jiran/rev2/config.h b/keyboards/jiran/rev2/config.h
index bc216be495..0dd0f63195 100644
--- a/keyboards/jiran/rev2/config.h
+++ b/keyboards/jiran/rev2/config.h
@@ -18,7 +18,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_DI_PIN B6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 56
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 28, 28 }
diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h
index bee9ee0ac0..049e60cc0f 100644
--- a/keyboards/jm60/config.h
+++ b/keyboards/jm60/config.h
@@ -49,18 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index 2c44bbd6bd..8d62ac5b89 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -75,9 +75,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LAYERS
   // #define RGBLIGHT_MAX_LAYERS 2
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-  /*== all animations enable ==*/
-  // #define RGBLIGHT_ANIMATIONS
-  /*== or choose animations ==*/
   // #define RGBLIGHT_EFFECT_BREATHING
   // #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index 9359b0a51b..3dd38a4267 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -76,9 +76,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LAYERS
   // #define RGBLIGHT_MAX_LAYERS 2
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-  /*== all animations enable ==*/
-  // #define RGBLIGHT_ANIMATIONS
-  /*== or choose animations ==*/
   // #define RGBLIGHT_EFFECT_BREATHING
   // #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h
index fe34ddf67c..7c78c7229a 100644
--- a/keyboards/kabedon/kabedon78s/config.h
+++ b/keyboards/kabedon/kabedon78s/config.h
@@ -24,22 +24,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 18
 
 /* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6} 
-#define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0,C7,D7,B5,B2,E6}  
+#define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6}
+#define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0,C7,D7,B5,B2,E6}
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
 #define DEBOUNCE 5
 
-#define RGB_DI_PIN B7  
+#define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-  #define RGBLIGHT_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
-
-
diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h
index ad667ae252..7c9e79a3a8 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -37,9 +37,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-  #define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index e5cd98c40b..92ed89677a 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -32,7 +32,16 @@
 
 #define RGB_DI_PIN B4
 #define RGBLED_NUM 24
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
index cf9c38b64f..c0dde69621 100644
--- a/keyboards/kagizaraya/chidori/config.h
+++ b/keyboards/kagizaraya/chidori/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 932c8cac3a..14ba5ca3bd 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 40
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 8baa3816f5..ddb51b8114 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -47,7 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SPLIT 1
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 9
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h
index ae74b25e1a..5e2ddc5668 100644
--- a/keyboards/kakunpc/angel17/alpha/config.h
+++ b/keyboards/kakunpc/angel17/alpha/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index 0d5f8d597f..0817334599 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index 796bd9dc51..b3476e3839 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -47,18 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 25 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index 796bd9dc51..b3476e3839 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -47,18 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 25 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index 9673d0328e..afc05e4048 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
index 7c15789bdf..ff2381020a 100644
--- a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
@@ -18,5 +18,14 @@
 
 // place overrides here
 #ifdef RGB_DI_PIN
-   #define RGBLIGHT_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
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index 3f78333468..a9466074a8 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
index e04ba7e4d0..fb0c1ab3a3 100644
--- a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
@@ -19,5 +19,14 @@
 // place overrides here
 
 #ifdef RGB_DI_PIN
-   #define RGBLIGHT_ANIMATIONS
-#endif
\ No newline at end of file
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#endif
diff --git a/keyboards/kakunpc/choc_taro/config.h b/keyboards/kakunpc/choc_taro/config.h
index 5ccbbee0cd..d8c4d02e51 100644
--- a/keyboards/kakunpc/choc_taro/config.h
+++ b/keyboards/kakunpc/choc_taro/config.h
@@ -52,18 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index 89aaf90ee3..9298578293 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/config.h
@@ -57,18 +57,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index a0d75d4407..3a9e384d89 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -57,18 +57,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index 3757b6cad7..d24e9b7dbb 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -57,18 +57,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index 109eeee7eb..77a78982c6 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -58,18 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index 2667ed6bb6..78dbb3e8d1 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index a0cfbc6405..d6b027ff32 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -53,18 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 50 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index 7d913d8f15..dddc01dc94 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -105,7 +105,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
index b50f1021af..941b55f3f0 100644
--- a/keyboards/kb58/config.h
+++ b/keyboards/kb58/config.h
@@ -64,18 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index 6c462d7176..5fe4f96904 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB */
 #define RGB_DI_PIN B5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 7
 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_BGR // RGB on the Noah is different order
@@ -43,4 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
diff --git a/keyboards/kbdclack/kaishi65/config.h b/keyboards/kbdclack/kaishi65/config.h
index aa8c1e4dd0..fa3838a84c 100644
--- a/keyboards/kbdclack/kaishi65/config.h
+++ b/keyboards/kbdclack/kaishi65/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 675128d354..c9957cb7dc 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -50,7 +50,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index a2da25a983..ac639c527b 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index d22de44672..f73e04b70c 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -58,18 +58,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 // /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_SLEEP
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 145a928e22..55126fd6d5 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -55,19 +55,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
   // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
   #define RGBLIGHT_SLEEP
-/*== or choose animations ==*/
-  // #define RGBLIGHT_EFFECT_BREATHING
-  // #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-  // #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-  // #define RGBLIGHT_EFFECT_SNAKE
-  // #define RGBLIGHT_EFFECT_KNIGHT
-  // #define RGBLIGHT_EFFECT_CHRISTMAS
-  // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-  // #define RGBLIGHT_EFFECT_RGB_TEST
-  // #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index f156afd9b1..a06badeba2 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 7eb6019c74..bba1c147fa 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index a743691e70..19f84c6752 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -36,7 +36,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index e37124632b..7e5e6fd6fb 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -50,7 +50,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index 7a2b2aa3c8..b67616cd6a 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h
index 28ce21e88e..62cb0fe4cc 100644
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ b/keyboards/kbdfans/kbdpad/mk1/config.h
@@ -32,5 +32,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index c0f1632169..80313decb6 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -55,18 +55,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
index 945c932da9..5151be7232 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -50,7 +50,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 14
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index 57ad7e8533..5e1631ed67 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -31,14 +31,17 @@
 #define RGB_DI_PIN B15
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 4
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 8) 
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 8)
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index 8939dd2fbe..420670613b 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -51,18 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 #    define RGBLIGHT_BREATHE_TABLE_SIZE 256  // 256(default) or 128 or 64
diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h
index cde5051c8b..16d5bf6ea8 100644
--- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h
+++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h
@@ -17,8 +17,17 @@
 
 #define ENCODER_DIRECTION_FLIP
 
-#undef RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
+#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
+
 
 /* Mouse Keys Configuration */
 #define MK_3_SPEED
diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h
index a674477d99..b57958d35f 100644
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/rev1/config.h
@@ -45,8 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/keebio/bdn9/rev1/rev1.c b/keyboards/keebio/bdn9/rev1/rev1.c
index b1b0afc608..f064ca51df 100644
--- a/keyboards/keebio/bdn9/rev1/rev1.c
+++ b/keyboards/keebio/bdn9/rev1/rev1.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index 3af4f76725..cb9deda24e 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -43,8 +43,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
 #        define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/keebio/bdn9/rev2/rev2.c b/keyboards/keebio/bdn9/rev2/rev2.c
index 9c2f5169f3..14b556823f 100644
--- a/keyboards/keebio/bdn9/rev2/rev2.c
+++ b/keyboards/keebio/bdn9/rev2/rev2.c
@@ -25,7 +25,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable();             // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#    ifdef RGBLIGHT_ANIMATIONS
+#    ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2);  // set to RGB_RAINBOW_SWIRL by default
 #    endif
 #endif
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h b/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
index c44c64603d..2eb4543603 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
@@ -22,7 +22,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 //my block------------
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 
 /* Select hand configuration */
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
index 2e2f45ea1f..8290ffd799 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE 2
 
 // #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 12
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
index 2e2f45ea1f..8290ffd799 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE 2
 
 // #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 12
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/chocopad/chocopad.c b/keyboards/keebio/chocopad/chocopad.c
index db62f02cc5..523e0626a9 100644
--- a/keyboards/keebio/chocopad/chocopad.c
+++ b/keyboards/keebio/chocopad/chocopad.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_MODE_EFFECT_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h
index bbbc022849..a617e480c6 100644
--- a/keyboards/keebio/chocopad/config.h
+++ b/keyboards/keebio/chocopad/config.h
@@ -27,7 +27,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index 2dacb39e07..0a46adf813 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -29,7 +29,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/dilly/dilly.c b/keyboards/keebio/dilly/dilly.c
index da17277f69..558968542f 100644
--- a/keyboards/keebio/dilly/dilly.c
+++ b/keyboards/keebio/dilly/dilly.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h
index 88dec69f59..6a3b9eab7b 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -45,8 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index 80603481f1..ca0620abfd 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -56,8 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/keebio/ergodicity/ergodicity.c b/keyboards/keebio/ergodicity/ergodicity.c
index 790dc2f61e..acba8a6ed3 100644
--- a/keyboards/keebio/ergodicity/ergodicity.c
+++ b/keyboards/keebio/ergodicity/ergodicity.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h
index 7985c3eb42..16051592f3 100644
--- a/keyboards/keebio/foldkb/rev1/config.h
+++ b/keyboards/keebio/foldkb/rev1/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11 }
diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h
index ca55824404..840985da96 100644
--- a/keyboards/keebio/fourier/config.h
+++ b/keyboards/keebio/fourier/config.h
@@ -55,7 +55,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLED_SPLIT { 7, 7 }
 
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h b/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
index 36b3e42d7e..b23869f060 100644
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
+++ b/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_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
 
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_SLEEP // Turn off RGB light when host is asleep.
diff --git a/keyboards/keebio/iris/keymaps/ave-63/config.h b/keyboards/keebio/iris/keymaps/ave-63/config.h
index 0d0c4764bb..07ae5ff50d 100644
--- a/keyboards/keebio/iris/keymaps/ave-63/config.h
+++ b/keyboards/keebio/iris/keymaps/ave-63/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 /*#undef RGBLED_NUMvbvbvbvbvbvbvtesting
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/blucky/config.h b/keyboards/keebio/iris/keymaps/blucky/config.h
index f187addbd3..802e735a4e 100644
--- a/keyboards/keebio/iris/keymaps/blucky/config.h
+++ b/keyboards/keebio/iris/keymaps/blucky/config.h
@@ -24,7 +24,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP           8
 #define RGBLIGHT_SAT_STEP           8
 #define RGBLIGHT_VAL_STEP           8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 #define MOUSEKEY_DELAY              300
 #define MOUSEKEY_INTERVAL           50
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/config.h b/keyboards/keebio/iris/keymaps/bmoorey/config.h
index 8f173a128b..6871c27410 100644
--- a/keyboards/keebio/iris/keymaps/bmoorey/config.h
+++ b/keyboards/keebio/iris/keymaps/bmoorey/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/csc027/config.h b/keyboards/keebio/iris/keymaps/csc027/config.h
index 80a8c57cba..a32a595481 100644
--- a/keyboards/keebio/iris/keymaps/csc027/config.h
+++ b/keyboards/keebio/iris/keymaps/csc027/config.h
@@ -23,7 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_FUNCTION
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/config.h b/keyboards/keebio/iris/keymaps/davidrambo/config.h
index bfa48ce0ce..5ab7c3428a 100644
--- a/keyboards/keebio/iris/keymaps/davidrambo/config.h
+++ b/keyboards/keebio/iris/keymaps/davidrambo/config.h
@@ -24,12 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 /*
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 */
 #define TAPPING_TERM 200
-
-
diff --git a/keyboards/keebio/iris/keymaps/dvorak/config.h b/keyboards/keebio/iris/keymaps/dvorak/config.h
index 4576a6d639..1fe0765647 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/config.h
+++ b/keyboards/keebio/iris/keymaps/dvorak/config.h
@@ -22,7 +22,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/eosti/config.h b/keyboards/keebio/iris/keymaps/eosti/config.h
index a7e52bf229..b3dd92c749 100644
--- a/keyboards/keebio/iris/keymaps/eosti/config.h
+++ b/keyboards/keebio/iris/keymaps/eosti/config.h
@@ -21,7 +21,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/fsck/config.h b/keyboards/keebio/iris/keymaps/fsck/config.h
index 01bb31a6e1..1680f3d8f8 100644
--- a/keyboards/keebio/iris/keymaps/fsck/config.h
+++ b/keyboards/keebio/iris/keymaps/fsck/config.h
@@ -21,7 +21,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
index 20384f4582..7772d71905 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PERMISSIVE_HOLD
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/isolike/config.h b/keyboards/keebio/iris/keymaps/isolike/config.h
index 6d3194157e..ff1de19edc 100644
--- a/keyboards/keebio/iris/keymaps/isolike/config.h
+++ b/keyboards/keebio/iris/keymaps/isolike/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/config.h b/keyboards/keebio/iris/keymaps/jerryhcooke/config.h
index 58f33d3716..2efa4e4382 100644
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/config.h
+++ b/keyboards/keebio/iris/keymaps/jerryhcooke/config.h
@@ -21,7 +21,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 2
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/khang/config.h b/keyboards/keebio/iris/keymaps/khang/config.h
index 28a3d269c6..714c176899 100644
--- a/keyboards/keebio/iris/keymaps/khang/config.h
+++ b/keyboards/keebio/iris/keymaps/khang/config.h
@@ -1,25 +1,24 @@
 /* Copyright 2021 Nguyen Vu Khang <brew4k@gmail.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 
 #pragma once
 
 #define EE_HANDS
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_MAX_LAYERS 5
-#undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_ALTERNATING
 #undef RGBLIGHT_EFFECT_BREATHING
 #undef RGBLIGHT_EFFECT_CHRISTMAS
diff --git a/keyboards/keebio/iris/keymaps/khord/config.h b/keyboards/keebio/iris/keymaps/khord/config.h
index 22e11c8798..a0e8e87abb 100644
--- a/keyboards/keebio/iris/keymaps/khord/config.h
+++ b/keyboards/keebio/iris/keymaps/khord/config.h
@@ -26,7 +26,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 150
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/krusli/config.h b/keyboards/keebio/iris/keymaps/krusli/config.h
index ec8bdffe88..adfe26d7c2 100644
--- a/keyboards/keebio/iris/keymaps/krusli/config.h
+++ b/keyboards/keebio/iris/keymaps/krusli/config.h
@@ -27,7 +27,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/mattly/config.h b/keyboards/keebio/iris/keymaps/mattly/config.h
index 01bb31a6e1..1680f3d8f8 100644
--- a/keyboards/keebio/iris/keymaps/mattly/config.h
+++ b/keyboards/keebio/iris/keymaps/mattly/config.h
@@ -21,7 +21,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/mnil/config.h b/keyboards/keebio/iris/keymaps/mnil/config.h
index 091df08eff..e8118c1c4b 100644
--- a/keyboards/keebio/iris/keymaps/mnil/config.h
+++ b/keyboards/keebio/iris/keymaps/mnil/config.h
@@ -19,7 +19,16 @@
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/moonfall/config.h b/keyboards/keebio/iris/keymaps/moonfall/config.h
index 6d3194157e..ff1de19edc 100644
--- a/keyboards/keebio/iris/keymaps/moonfall/config.h
+++ b/keyboards/keebio/iris/keymaps/moonfall/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
index b78c52a460..490ca53f60 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 // #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 18
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/omgvee/config.h b/keyboards/keebio/iris/keymaps/omgvee/config.h
index c47ec74287..1dc32d2119 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/config.h
+++ b/keyboards/keebio/iris/keymaps/omgvee/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 15
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/osiris/config.h b/keyboards/keebio/iris/keymaps/osiris/config.h
index 45d92578c4..225a858131 100644
--- a/keyboards/keebio/iris/keymaps/osiris/config.h
+++ b/keyboards/keebio/iris/keymaps/osiris/config.h
@@ -21,7 +21,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -30,4 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #undef PERMISSIVE_HOLD
 //#define TAPPING_FORCE_HOLD
 //#define RETRO_TAPPING
-#define PERMISSIVE_HOLD
\ No newline at end of file
+#define PERMISSIVE_HOLD
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/config.h b/keyboards/keebio/iris/keymaps/radlinskii/config.h
index c3d6b34070..359dda7b61 100644
--- a/keyboards/keebio/iris/keymaps/radlinskii/config.h
+++ b/keyboards/keebio/iris/keymaps/radlinskii/config.h
@@ -18,7 +18,6 @@
 #undef RGBLIGHT_DEFAULT_MODE
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
 
-#undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING // fading in and out
 #undef RGBLIGHT_EFFECT_RAINBOW_MOOD // rainbow all keys at the same time
 #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL // rainbow top bottom
diff --git a/keyboards/keebio/iris/keymaps/xyverz/config.h b/keyboards/keebio/iris/keymaps/xyverz/config.h
index f6eb967943..c1c6d12ccc 100644
--- a/keyboards/keebio/iris/keymaps/xyverz/config.h
+++ b/keyboards/keebio/iris/keymaps/xyverz/config.h
@@ -9,7 +9,16 @@
 #define MANUFACTURER "Ian Sterling"
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 6e0e720175..96be096317 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -52,4 +52,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 2d88d72ac9..ccb617a0d3 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -52,4 +52,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 0c795940cd..fe4780dd69 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -53,4 +53,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/iris/rev2/rev2.c b/keyboards/keebio/iris/rev2/rev2.c
index e8c2a66c98..365d2c97b5 100644
--- a/keyboards/keebio/iris/rev2/rev2.c
+++ b/keyboards/keebio/iris/rev2/rev2.c
@@ -27,7 +27,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index e08660612d..552cc0cad5 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -61,4 +61,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN F7
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/iris/rev3/rev3.c b/keyboards/keebio/iris/rev3/rev3.c
index f644777b56..60add02883 100644
--- a/keyboards/keebio/iris/rev3/rev3.c
+++ b/keyboards/keebio/iris/rev3/rev3.c
@@ -30,7 +30,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index 0af962ac52..c865dea6f9 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -65,4 +65,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/iris/rev4/rev4.c b/keyboards/keebio/iris/rev4/rev4.c
index 112c86f413..db7bdd615b 100644
--- a/keyboards/keebio/iris/rev4/rev4.c
+++ b/keyboards/keebio/iris/rev4/rev4.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h
index 3d3253d2c3..9613f40588 100644
--- a/keyboards/keebio/kbo5000/rev1/config.h
+++ b/keyboards/keebio/kbo5000/rev1/config.h
@@ -51,7 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c
index 757a8be2a1..904c85242b 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.c
+++ b/keyboards/keebio/kbo5000/rev1/rev1.c
@@ -22,7 +22,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/laplace/config.h b/keyboards/keebio/laplace/config.h
index 1c7c9e4432..3779037ad2 100644
--- a/keyboards/keebio/laplace/config.h
+++ b/keyboards/keebio/laplace/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* WS2812 RGB LED */
 #define RGB_DI_PIN D4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/config.h b/keyboards/keebio/levinson/keymaps/issmirnov/config.h
index 6f6f362a8f..033f6dbfe0 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/config.h
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/config.h
@@ -2,7 +2,17 @@
 
 #ifdef RGBLIGHT_ENABLE
    // Enable animations. +5500 bytes
-   #define RGBLIGHT_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
+
 
    // Map my custom number of LED's
    #undef RGBLED_NUM
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/config.h b/keyboards/keebio/levinson/keymaps/jyh2/config.h
index f50674bb88..d4974fe0cf 100644
--- a/keyboards/keebio/levinson/keymaps/jyh2/config.h
+++ b/keyboards/keebio/levinson/keymaps/jyh2/config.h
@@ -28,6 +28,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Toggling layer requires # taps */
 #define TAPPING_TOGGLE 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
-
diff --git a/keyboards/keebio/levinson/keymaps/ksamborski/config.h b/keyboards/keebio/levinson/keymaps/ksamborski/config.h
index 7a21830f2d..2b3c433206 100644
--- a/keyboards/keebio/levinson/keymaps/ksamborski/config.h
+++ b/keyboards/keebio/levinson/keymaps/ksamborski/config.h
@@ -22,6 +22,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Select hand configuration */
 #define MASTER_LEFT
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
-
diff --git a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
index 41bfb4651f..5c8956ab69 100644
--- a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
+++ b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h
@@ -25,7 +25,16 @@ long with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* #define EE_HANDS */
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
index e3012bbe06..3cfb5587bd 100644
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
+++ b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
@@ -8,7 +8,16 @@
 
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/config.h b/keyboards/keebio/levinson/keymaps/treadwell/config.h
index 47f85f6dc3..757ce5dc73 100644
--- a/keyboards/keebio/levinson/keymaps/treadwell/config.h
+++ b/keyboards/keebio/levinson/keymaps/treadwell/config.h
@@ -18,7 +18,6 @@
                             }
 
 //#undef RGBLED_NUM
-//#define RGBLIGHT_ANIMATIONS
 //#define RGBLED_NUM 12
 //#define RGBLIGHT_HUE_STEP 8
 //#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c
index 8e65af7ade..b569fbd9fb 100644
--- a/keyboards/keebio/levinson/rev2/rev2.c
+++ b/keyboards/keebio/levinson/rev2/rev2.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c
index 8e65af7ade..b569fbd9fb 100644
--- a/keyboards/keebio/levinson/rev3/rev3.c
+++ b/keyboards/keebio/levinson/rev3/rev3.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/nyquist/keymaps/default/config.h b/keyboards/keebio/nyquist/keymaps/default/config.h
index ef1c4a51ab..81fc2cf5fe 100644
--- a/keyboards/keebio/nyquist/keymaps/default/config.h
+++ b/keyboards/keebio/nyquist/keymaps/default/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
index 544b7b7371..f5922f93bc 100644
--- a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
+++ b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
@@ -27,11 +27,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 
 #endif
-
diff --git a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
index f3d8ae0a40..a61b2b7b41 100644
--- a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
+++ b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
@@ -27,7 +27,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/pipicanim/config.h b/keyboards/keebio/nyquist/keymaps/pipicanim/config.h
index ef1c4a51ab..81fc2cf5fe 100644
--- a/keyboards/keebio/nyquist/keymaps/pipicanim/config.h
+++ b/keyboards/keebio/nyquist/keymaps/pipicanim/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/config.h b/keyboards/keebio/nyquist/keymaps/pjanx/config.h
index ef1c4a51ab..81fc2cf5fe 100644
--- a/keyboards/keebio/nyquist/keymaps/pjanx/config.h
+++ b/keyboards/keebio/nyquist/keymaps/pjanx/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
index 72e0e422d6..45494b60d2 100644
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/skug/config.h b/keyboards/keebio/nyquist/keymaps/skug/config.h
index 532cdafa97..6566a24761 100644
--- a/keyboards/keebio/nyquist/keymaps/skug/config.h
+++ b/keyboards/keebio/nyquist/keymaps/skug/config.h
@@ -33,7 +33,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/winternebs/config.h b/keyboards/keebio/nyquist/keymaps/winternebs/config.h
index 263af1de91..5f60296faf 100755
--- a/keyboards/keebio/nyquist/keymaps/winternebs/config.h
+++ b/keyboards/keebio/nyquist/keymaps/winternebs/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
index aafb73fa05..6d75a5898a 100644
--- a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
+++ b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
@@ -27,7 +27,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/nyquist/rev2/rev2.c b/keyboards/keebio/nyquist/rev2/rev2.c
index b5652e06d3..8fb49f97b3 100644
--- a/keyboards/keebio/nyquist/rev2/rev2.c
+++ b/keyboards/keebio/nyquist/rev2/rev2.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h
index 8d70316b55..e60772812b 100644
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 6, 6 }
 
diff --git a/keyboards/keebio/nyquist/rev3/rev3.c b/keyboards/keebio/nyquist/rev3/rev3.c
index 6d7dc3531d..c464270517 100644
--- a/keyboards/keebio/nyquist/rev3/rev3.c
+++ b/keyboards/keebio/nyquist/rev3/rev3.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/config.h b/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
index c3063d6da6..fac62b97d6 100644
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
+++ b/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
@@ -21,4 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h
index 872ca73ece..633ba8cf79 100644
--- a/keyboards/keebio/quefrency/rev1/config.h
+++ b/keyboards/keebio/quefrency/rev1/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 
diff --git a/keyboards/keebio/quefrency/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c
index 567730535d..6704b062f5 100644
--- a/keyboards/keebio/quefrency/rev1/rev1.c
+++ b/keyboards/keebio/quefrency/rev1/rev1.c
@@ -4,7 +4,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c
index d2badbeb25..4e3e75a21f 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.c
+++ b/keyboards/keebio/quefrency/rev2/rev2.c
@@ -22,7 +22,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c
index 8911dbd018..52ce977ac7 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.c
+++ b/keyboards/keebio/quefrency/rev3/rev3.c
@@ -38,7 +38,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
index 0915bbba18..0ac1cc4a6e 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
@@ -13,7 +13,6 @@
 #define TAPPING_TOGGLE 2
 
 // #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 12
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
index 3b95b3c4d7..3bb69ef31c 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
@@ -13,7 +13,6 @@
 #define TAPPING_TOGGLE 2
 
 // #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 12
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h
index 77db35cc9b..9d7accddd7 100644
--- a/keyboards/keebio/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/rev1/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* WS2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index 8539a6d49d..4b437a01e4 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -40,8 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
 #        define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/keebio/stick/stick.c b/keyboards/keebio/stick/stick.c
index c2d25f8860..8db839de3b 100644
--- a/keyboards/keebio/stick/stick.c
+++ b/keyboards/keebio/stick/stick.c
@@ -36,7 +36,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable();             // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#    ifdef RGBLIGHT_ANIMATIONS
+#    ifdef RGBLIGHT_EFFECT_RAINDOWN_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2);  // set to RGB_RAINBOW_SWIRL by default
 #    endif
 #endif
diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h
index aefc51d5f5..cde1cd13a6 100644
--- a/keyboards/keebio/tukey/config.h
+++ b/keyboards/keebio/tukey/config.h
@@ -36,7 +36,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-    #define RGBLIGHT_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
 
@@ -47,4 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/keebio/viterbi/keymaps/default/config.h b/keyboards/keebio/viterbi/keymaps/default/config.h
index a841066f4d..38c399ff2c 100644
--- a/keyboards/keebio/viterbi/keymaps/default/config.h
+++ b/keyboards/keebio/viterbi/keymaps/default/config.h
@@ -25,7 +25,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h
index 7ad7f5a4cf..c5f8fff090 100644
--- a/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h
+++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/config.h
@@ -8,7 +8,16 @@
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/viterbi/keymaps/vosechu/config.h b/keyboards/keebio/viterbi/keymaps/vosechu/config.h
index 0faddd17c2..a808f80f85 100644
--- a/keyboards/keebio/viterbi/keymaps/vosechu/config.h
+++ b/keyboards/keebio/viterbi/keymaps/vosechu/config.h
@@ -18,7 +18,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 3
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keebio/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev2/rev2.c
index dbf584f99e..a72cc44436 100644
--- a/keyboards/keebio/viterbi/rev2/rev2.c
+++ b/keyboards/keebio/viterbi/rev2/rev2.c
@@ -8,7 +8,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB by default
     rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_MODE_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 #endif
 #endif
diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h
index 1ae31980c1..843de0d144 100644
--- a/keyboards/keebio/wtf60/config.h
+++ b/keyboards/keebio/wtf60/config.h
@@ -47,8 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index 7d6a9a8330..eca9d160cb 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -47,17 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
                                    /*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keebzdotnet/wazowski/config.h b/keyboards/keebzdotnet/wazowski/config.h
index 9670585b45..36273e9114 100644
--- a/keyboards/keebzdotnet/wazowski/config.h
+++ b/keyboards/keebzdotnet/wazowski/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index 269f5a7967..13c6617ab9 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -37,8 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 16
     #define RGBLIGHT_SLEEP
-/*== all animations disable ==*/
-    #undef RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/config.h b/keyboards/keycapsss/kimiko/keymaps/default/config.h
index 877553689f..52faaf2b65 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/config.h
+++ b/keyboards/keycapsss/kimiko/keymaps/default/config.h
@@ -31,18 +31,16 @@
 #   define RGBLIGHT_SAT_STEP 8
 #   define RGBLIGHT_VAL_STEP 8
 #   define RGBLIGHT_SLEEP       /* the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#   define RGBLIGHT_ANIMATIONS
-/*== or choose animations to save space ==*/
-// #   define RGBLIGHT_EFFECT_BREATHING
-// #   define RGBLIGHT_EFFECT_RAINBOW_MOOD
-// #   define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-// #   define RGBLIGHT_EFFECT_SNAKE
-// #   define RGBLIGHT_EFFECT_KNIGHT
-// #   define RGBLIGHT_EFFECT_CHRISTMAS
-// #   define RGBLIGHT_EFFECT_STATIC_GRADIENT
-// #   define RGBLIGHT_EFFECT_RGB_TEST
-// #   define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_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
 
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index 84a262e874..cf37e2c397 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -34,18 +34,16 @@
 #    define RGBLIGHT_VAL_STEP 4
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 98ab67871c..fbcb0766a0 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -59,9 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index ddb9ef8bfe..52df423539 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -58,9 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
    #define RGBLIGHT_EFFECT_BREATHING
    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index 4a177fa93d..ef8db88700 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -53,18 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index ac2db030f1..ac1faede6d 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -47,18 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 1fe3134cab..57555fa95b 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -23,7 +23,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 6e9298e261..58d3a58ec2 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -18,7 +18,6 @@
 #include "config_common.h"
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-// #define RGBLIGHT_ANIMATIONS
 
 /* key matrix size */
 #define MATRIX_ROWS 1
@@ -42,18 +41,6 @@
 //   #define RGBLIGHT_VAL_STEP 32
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index a9d24c0c9e..dce99f3882 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -43,7 +43,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN C6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h
index 08a81a4a91..e6f73948f5 100644
--- a/keyboards/keyprez/bison/config.h
+++ b/keyboards/keyprez/bison/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h
index 739d5b525e..481c72eee5 100644
--- a/keyboards/keyprez/unicorn/config.h
+++ b/keyboards/keyprez/unicorn/config.h
@@ -51,18 +51,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/keysofkings/twokey/config.h b/keyboards/keysofkings/twokey/config.h
index f33537fabb..c45263fc37 100755
--- a/keyboards/keysofkings/twokey/config.h
+++ b/keyboards/keysofkings/twokey/config.h
@@ -45,7 +45,16 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 4
 #define RGBLIGHT_SAT_STEP 4
diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h
index 5e3dacdb0e..1dacdfb0ff 100644
--- a/keyboards/kindakeyboards/conone65/config.h
+++ b/keyboards/kindakeyboards/conone65/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
index 68954c6b70..e53f29561c 100644
--- a/keyboards/kingly_keys/little_foot/config.h
+++ b/keyboards/kingly_keys/little_foot/config.h
@@ -43,7 +43,16 @@
 #define RGB_DI_PIN F4
 #define RGBLED_NUM 10    // Number of LEDs
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 6
 #define RGBLIGHT_SAT_STEP 4
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
index 722fd7e9e9..41bba326c4 100644
--- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
+++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
@@ -6,6 +6,14 @@
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_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
-
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 0618521306..6ae18bfca9 100644
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ b/keyboards/kingly_keys/romac_plus/config.h
@@ -29,7 +29,16 @@
 #define RGB_DI_PIN F7
 #define RGBLED_NUM 4    // Number of LEDs
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 6
 #define RGBLIGHT_SAT_STEP 4
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
index 092349cbc6..8bb50cd7b4 100644
--- a/keyboards/kingly_keys/ropro/config.h
+++ b/keyboards/kingly_keys/ropro/config.h
@@ -46,6 +46,13 @@
 
 #define RGBLED_NUM 18
 
-#define RGBLIGHT_ANIMATIONS
-
-
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
index a1a308f088..81f332170d 100644
--- a/keyboards/kingly_keys/smd_milk/config.h
+++ b/keyboards/kingly_keys/smd_milk/config.h
@@ -41,7 +41,17 @@
 #define RGB_DI_PIN B3
 #define RGBLED_NUM 4  // Number of LEDs
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_HUE_STEP 6
 #define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 10
\ No newline at end of file
+#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index 503c77a04b..74e6667bb3 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -11,10 +11,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.#pragma once 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.#pragma once
  */
 
-#include "config_common.h" 
+#include "config_common.h"
 
  /* key matrix size */
 #define MATRIX_ROWS 2
@@ -41,5 +41,14 @@
 
 /* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */
 #define RGB_DI_PIN B6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 3
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
index 17c73df412..25c949f6bc 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira75/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 
 #define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 10ab8dfd5b..6da57ea422 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/config.h
@@ -47,18 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index fc42b5ff19..107054a089 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kkatano/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
index 89fd9070a0..87b6705a75 100644
--- a/keyboards/kkatano/bakeneko80/config.h
+++ b/keyboards/kkatano/bakeneko80/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
index fc380eecf6..784d867247 100644
--- a/keyboards/kkatano/wallaby/config.h
+++ b/keyboards/kkatano/wallaby/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kkatano/yurei/config.h b/keyboards/kkatano/yurei/config.h
index 95aa6b7ee3..6a13affb21 100644
--- a/keyboards/kkatano/yurei/config.h
+++ b/keyboards/kkatano/yurei/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
index f53944789e..3023a656a4 100644
--- a/keyboards/kona_classic/config.h
+++ b/keyboards/kona_classic/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underlight configuration
  */
 #define RGB_DI_PIN B2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 30     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 5
 #define RGBLIGHT_SAT_STEP 10
diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h
index e026367dd6..fc6f578dd1 100644
--- a/keyboards/kopibeng/mnk88/config.h
+++ b/keyboards/kopibeng/mnk88/config.h
@@ -49,9 +49,6 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
      #define RGBLIGHT_EFFECT_BREATHING
      #define RGBLIGHT_EFFECT_RAINBOW_MOOD
      #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
index 65ea5b0aa6..365e72c072 100644
--- a/keyboards/kopibeng/xt60/config.h
+++ b/keyboards/kopibeng/xt60/config.h
@@ -48,9 +48,6 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -71,4 +68,4 @@
 /* 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
\ No newline at end of file
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h
index ef20c3cdf1..365e72c072 100644
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ b/keyboards/kopibeng/xt60_singa/config.h
@@ -48,9 +48,6 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index 54195ef454..29398208f4 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/config.h
@@ -50,18 +50,16 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index 4086020397..b8a027c02b 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/config.h
@@ -50,9 +50,6 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
      #define RGBLIGHT_EFFECT_BREATHING
      #define RGBLIGHT_EFFECT_RAINBOW_MOOD
      #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm16a/config.h b/keyboards/kprepublic/bm16a/config.h
index 7e6289b793..e5cc440d25 100644
--- a/keyboards/kprepublic/bm16a/config.h
+++ b/keyboards/kprepublic/bm16a/config.h
@@ -49,7 +49,16 @@
 
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 4
-#define RGBLIGHT_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
 // #ifdef RGB_DI_PIN
 //   #define RGBLED_NUM 16
 //   #define RGBLIGHT_HUE_STEP 8
@@ -57,18 +66,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index 2de3ffe3d4..b876b60ffa 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/config.h
@@ -29,7 +29,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 16
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
index a88ae7f2e8..31a316da6d 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
@@ -20,7 +20,17 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 //#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
index cdfa67acb0..5879e4b08c 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
@@ -20,7 +20,17 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 //#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
index dbadc3da99..a7290df6b3 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
@@ -20,7 +20,17 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 //#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
index 23f1753fc7..2e725af6b5 100644
--- a/keyboards/kprepublic/bm43a/config.h
+++ b/keyboards/kprepublic/bm43a/config.h
@@ -50,18 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
index 496e9d2b2c..2de4c8f889 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
@@ -20,16 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define UNICODE_CYCLE_PERSIST false
 
 #ifdef RGB_DI_PIN
-/*== all animations enable ==*/
-    #undef RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-    // #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
\ No newline at end of file
+#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
+#endif
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index 7fdcb37ba9..b9e42c18f8 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -44,7 +44,16 @@
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
 #define RGB_DI_PIN          F0
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
 #define RGBLIGHT_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
@@ -123,4 +132,3 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #endif
-
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index 0fc5946f63..9b3b735508 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -50,18 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     // #define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
     // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-    /*== all animations enable ==*/
-        // #define RGBLIGHT_ANIMATIONS
-    // /*== or choose animations ==*/
-    //     #define RGBLIGHT_EFFECT_BREATHING
-    //     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    //     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    //     #define RGBLIGHT_EFFECT_SNAKE
-    //     #define RGBLIGHT_EFFECT_KNIGHT
-    //     #define RGBLIGHT_EFFECT_CHRISTMAS
-    //     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-    //     #define RGBLIGHT_EFFECT_RGB_TEST
-    //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index 66c2883029..93a481f6f2 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -48,18 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index eee7d2f9bf..183d226d8c 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -65,17 +65,6 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-// #define RGBLIGHT_ANIMATIONS             // Run RGB animations
-// #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
-// #define RGBLIGHT_EFFECT_ALTERNATING     // Enable alternating animation mode.
-// #define RGBLIGHT_EFFECT_BREATHING       // Enable breathing animation mode.
-// #define RGBLIGHT_EFFECT_CHRISTMAS       // Enable christmas animation mode.
-// #define RGBLIGHT_EFFECT_KNIGHT          // Enable knight animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD    // Enable rainbow mood animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL   // Enable rainbow swirl animation mode.
-// #define RGBLIGHT_EFFECT_RGB_TEST        // Enable RGB test animation mode.
-// #define RGBLIGHT_EFFECT_SNAKE           // Enable snake animation mode.
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT // Enable static gradient mode.
 
 // #define RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
 // #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index 895cc57a0d..de567ca0d1 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -60,18 +60,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/kprepublic/jj40/config.h b/keyboards/kprepublic/jj40/config.h
index d24ab5c5ff..8b305e4da0 100644
--- a/keyboards/kprepublic/jj40/config.h
+++ b/keyboards/kprepublic/jj40/config.h
@@ -32,7 +32,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB underglow */
 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
 #define RGBLED_NUM 5
-#define RGBLIGHT_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
+
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/kprepublic/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h
index d9691245a7..812cececea 100644
--- a/keyboards/kprepublic/jj4x4/config.h
+++ b/keyboards/kprepublic/jj4x4/config.h
@@ -35,7 +35,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB underglow */
 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
 #define RGBLED_NUM 4
-#define RGBLIGHT_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
+
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h
index 70ecf2f20c..9293bd2924 100644
--- a/keyboards/kprepublic/jj50/config.h
+++ b/keyboards/kprepublic/jj50/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 12
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 15
 #define RGBLIGHT_VAL_STEP 18
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index ec826ab1af..ae2f012676 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -59,18 +59,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 12
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
index 876d61223f..b8abd983c5 100755
--- a/keyboards/ktec/staryu/config.h
+++ b/keyboards/ktec/staryu/config.h
@@ -30,7 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN C6
 #define RGBLED_NUM 1     // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 200
 // #ifdef RGB_DI_PIN
 //   #define RGBLIGHT_HUE_STEP 8
@@ -38,18 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 #undef BACKLIGHT_PIN
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kudox/columner/config.h
index a97d03596c..e4cc9c1d2f 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kudox/columner/config.h
@@ -53,7 +53,16 @@
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kudox/rev1/config.h b/keyboards/kudox/rev1/config.h
index 36a933dc2e..f28a11b93b 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kudox/rev1/config.h
@@ -53,7 +53,16 @@
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kudox/rev2/config.h
index 36a933dc2e..f28a11b93b 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kudox/rev2/config.h
@@ -53,7 +53,16 @@
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kudox/rev3/config.h
index a97d03596c..e4cc9c1d2f 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kudox/rev3/config.h
@@ -53,7 +53,16 @@
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h
index 1fc6411359..020829ba5a 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kudox_game/rev1/config.h
@@ -53,7 +53,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 7    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h
index f61b42eb7f..0ff1850f65 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kudox_game/rev2/config.h
@@ -53,7 +53,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 7    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h
index 5abbd8d4f9..b02c616e89 100644
--- a/keyboards/kwub/bloop/config.h
+++ b/keyboards/kwub/bloop/config.h
@@ -47,8 +47,17 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM        0
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 0
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ky01/config.h b/keyboards/ky01/config.h
index 47edbd2605..2dd2144f09 100644
--- a/keyboards/ky01/config.h
+++ b/keyboards/ky01/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64

From c8e998ccaddc6157ee5d406e277e973dd4796f37 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 15 Oct 2022 09:55:40 -0700
Subject: [PATCH 647/959] Remove RGBLIGHT_ANIMATION and clean up effect defines
 for L-Q (#18727)

---
 keyboards/labyrinth75/config.h                | 24 ++++-----
 keyboards/latincompass/latin17rgb/config.h    | 11 +++-
 keyboards/latincompass/latin47ble/config.h    | 50 +++++++++----------
 keyboards/latincompass/latin64ble/config.h    | 13 +++--
 keyboards/latincompass/latin6rgb/config.h     |  1 -
 keyboards/latincompass/latinpadble/config.h   | 12 ++++-
 keyboards/lazydesigners/bolt/config.h         | 11 +++-
 keyboards/lazydesigners/dimple/config.h       | 12 ++++-
 keyboards/lazydesigners/dimpleplus/config.h   | 11 +++-
 keyboards/lazydesigners/the40/config.h        | 13 ++++-
 keyboards/lazydesigners/the60/rev2/config.h   | 14 ++++--
 keyboards/leafcutterlabs/bigknob/config.h     | 15 ++++--
 keyboards/lets_split/keymaps/adam/config.h    | 11 +++-
 .../lets_split/keymaps/cpeters1982/config.h   | 11 +++-
 keyboards/lets_split/keymaps/hvp/config.h     | 11 +++-
 keyboards/lets_split/keymaps/khord/config.h   | 12 ++++-
 .../lets_split/keymaps/mbsurfer/config.h      | 11 +++-
 keyboards/lets_split/keymaps/mjt/config.h     | 11 +++-
 keyboards/lets_split/keymaps/piemod/config.h  | 11 +++-
 keyboards/lets_split/keymaps/pitty/config.h   | 11 +++-
 keyboards/lets_split/keymaps/pyrol/config.h   | 11 +++-
 .../lets_split/keymaps/tylerwince/config.h    | 12 ++++-
 keyboards/lets_split/keymaps/via/config.h     | 11 +++-
 keyboards/lfkeyboards/lfk65_hs/config.h       | 11 +++-
 keyboards/lfkeyboards/lfk78/config.h          | 12 ++++-
 keyboards/lfkeyboards/lfk87/config.h          | 11 +++-
 keyboards/lfkeyboards/lfkpad/config.h         | 12 ++++-
 keyboards/lfkeyboards/mini1800/config.h       | 11 +++-
 keyboards/lfkeyboards/smk65/revb/config.h     | 11 +++-
 keyboards/lfkeyboards/smk65/revf/config.h     | 12 -----
 keyboards/lily58/keymaps/chuan/config.h       | 12 ++++-
 keyboards/lily58/keymaps/datadavd/config.h    | 12 ++++-
 keyboards/lily58/keymaps/default/config.h     | 12 ++++-
 keyboards/lily58/keymaps/drasbeck/config.h    | 12 ++++-
 keyboards/lily58/keymaps/hvp/config.h         | 12 ++++-
 keyboards/lily58/keymaps/jhelvy/config.h      | 12 ++++-
 keyboards/lily58/keymaps/lily58l/config.h     | 13 ++++-
 .../lily58/keymaps/mikefightsbears/config.h   | 12 ++++-
 keyboards/lily58/keymaps/narze/config.h       | 12 ++++-
 keyboards/lily58/keymaps/pttbx/config.h       | 12 ++++-
 keyboards/lily58/keymaps/via/config.h         |  1 -
 keyboards/lily58/keymaps/yshrsmz/config.h     | 12 ++++-
 .../lizard_trick/tenkey_plusplus/config.h     | 12 -----
 keyboards/lm_keyboard/lm60n/config.h          | 22 ++++----
 keyboards/lz/erghost/config.h                 |  3 --
 keyboards/machine_industries/m4_a/config.h    | 12 -----
 keyboards/makrosu/config.h                    | 41 +++++++++------
 keyboards/manta60/config.h                    | 22 ++++----
 keyboards/maple_computing/6ball/config.h      | 11 +++-
 .../launchpad/keymaps/default_rgb/config.h    | 13 ++++-
 .../launchpad/keymaps/drashna/config.h        | 11 +++-
 .../maple_computing/launchpad/rev1/config.h   | 11 +++-
 .../maple_computing/lets_split_eh/eh/config.h | 12 ++++-
 .../minidox/keymaps/alairock/config.h         | 11 +++-
 .../minidox/keymaps/that_canadian/config.h    | 11 +++-
 .../minidox/keymaps/xyverz/config.h           | 11 +++-
 keyboards/maple_computing/the_ruler/config.h  | 11 +++-
 keyboards/marksard/leftover30/config.h        | 22 ++++----
 keyboards/marksard/rhymestone/rev1/config.h   |  3 --
 .../treadstone32/keymaps/default/rules.mk     |  1 -
 .../treadstone32/keymaps/like_jis/rules.mk    |  1 -
 keyboards/marksard/treadstone32/lite/config.h |  3 --
 keyboards/marksard/treadstone32/rev1/config.h |  3 --
 keyboards/marksard/treadstone48/rev1/config.h |  3 --
 keyboards/marksard/treadstone48/rev2/config.h |  3 --
 .../massdrop/alt/keymaps/pregame/config.h     |  2 -
 .../massdrop/ctrl/keymaps/endgame/config.h    | 11 ----
 .../massdrop/ctrl/keymaps/foxx1337/config.h   | 11 ----
 .../ctrl/keymaps/matthewrobo/config.h         | 11 ----
 .../massdrop/ctrl/keymaps/xanimos/config.h    | 39 ++++++---------
 keyboards/massdrop/thekey_v2/config.h         | 11 +++-
 keyboards/matrix/abelx/config.h               | 12 ++++-
 keyboards/matrix/cain_re/config.h             | 12 ++++-
 keyboards/matrix/m12og/rev1/config.h          | 12 ++++-
 keyboards/matrix/m12og/rev2/config.h          | 11 +++-
 keyboards/matrix/m20add/config.h              | 12 ++++-
 keyboards/matrix/noah/config.h                | 12 ++++-
 keyboards/maxr1998/pulse4k/config.h           | 11 +++-
 keyboards/mechkeys/acr60/config.h             | 11 +++-
 keyboards/mechkeys/alu84/config.h             | 11 +++-
 keyboards/mechkeys/espectro/config.h          | 12 ++++-
 keyboards/mechkeys/mechmini/v1/config.h       | 11 +++-
 keyboards/mechkeys/mechmini/v2/config.h       | 11 +++-
 keyboards/mechkeys/mk60/config.h              | 22 ++++----
 .../mechlovin/adelais/rgb_led/rev2/config.h   | 13 ++++-
 .../adelais/standard_led/arm/config.h         | 12 ++++-
 .../mechlovin/delphine/mono_led/config.h      | 24 ++++-----
 keyboards/mechlovin/delphine/rgb_led/config.h | 22 ++++----
 keyboards/mechlovin/hannah60rgb/rev2/config.h | 11 +++-
 keyboards/mechlovin/hannah910/config.h        | 12 ++++-
 .../infinity87/rev1/standard/config.h         | 22 ++++----
 keyboards/mechlovin/infinity88/config.h       | 22 ++++----
 keyboards/mechlovin/infinityce/config.h       | 11 +++-
 keyboards/mechlovin/jay60/config.h            | 12 -----
 keyboards/mechlovin/kanu/config.h             | 11 +++-
 keyboards/mechlovin/kay60/config.h            |  3 --
 keyboards/mechlovin/kay65/config.h            |  3 --
 keyboards/mechlovin/pisces/config.h           | 22 ++++----
 keyboards/mechlovin/serratus/config.h         | 24 ++++-----
 keyboards/mechstudio/ud_40_ortho/config.h     | 12 ++++-
 keyboards/mechwild/murphpad/config.h          | 22 ++++----
 keyboards/mechwild/obe/config.h               | 22 ++++----
 keyboards/mehkee96/config.h                   | 11 +++-
 keyboards/melgeek/mj6xy/rev3/config.h         | 19 +++++--
 keyboards/meow65/config.h                     | 11 ----
 keyboards/merge/uc1/config.h                  | 39 +++++++++------
 keyboards/meson/config.h                      | 12 ++++-
 keyboards/mexsistor/ludmila/config.h          | 12 ++++-
 keyboards/miniaxe/config.h                    | 11 +++-
 keyboards/minimacro5/config.h                 | 11 +++-
 keyboards/mint60/config.h                     | 11 +++-
 keyboards/misonoworks/karina/config.h         | 13 ++++-
 keyboards/misterknife/knife66/config.h        | 11 +++-
 keyboards/misterknife/knife66_iso/config.h    | 11 +++-
 keyboards/miuni32/config.h                    | 11 +++-
 .../keymaps/cassdelacruzmunoz/config.h        |  1 -
 keyboards/mixi/config.h                       | 11 +++-
 keyboards/mixi/mixi.c                         |  2 +-
 keyboards/molecule/config.h                   | 13 -----
 keyboards/momokai/tap_trio/config.h           |  3 --
 .../monstargear/xo87/solderable/config.h      | 11 +++-
 keyboards/mt/blocked65/config.h               | 11 +++-
 keyboards/mt/mt40/config.h                    | 12 ++++-
 keyboards/mt/mt64rgb/config.h                 | 11 +++-
 keyboards/mt/mt84/config.h                    |  1 -
 keyboards/mt/mt980/config.h                   | 11 +++-
 keyboards/mt/split75/config.h                 | 13 ++++-
 keyboards/mt/split75/keymaps/art/config.h     | 13 ++++-
 keyboards/mxss/config.h                       | 11 +++-
 keyboards/nacly/ua62/config.h                 | 12 -----
 keyboards/neito/config.h                      | 11 +++-
 keyboards/neokeys/g67/hotswap/config.h        | 22 ++++----
 keyboards/neokeys/g67/soldered/config.h       | 22 ++++----
 keyboards/neson_design/n6/config.h            | 11 +++-
 keyboards/newgame40/config.h                  | 12 ++++-
 keyboards/nightly_boards/adellein/config.h    | 13 +++--
 keyboards/nightly_boards/alter/rev1/config.h  | 22 ++++----
 keyboards/nightly_boards/conde60/config.h     | 13 +++--
 keyboards/nightly_boards/n2/config.h          | 22 ++++----
 keyboards/nightly_boards/n40_o/config.h       | 11 +++-
 keyboards/nightly_boards/n87/config.h         | 22 ++++----
 keyboards/nightly_boards/n9/config.h          | 22 ++++----
 keyboards/nightly_boards/octopad/config.h     | 11 +++-
 keyboards/nightmare/config.h                  | 12 -----
 keyboards/nix_studio/oxalys80/config.h        | 11 +++-
 keyboards/novelkeys/novelpad/config.h         | 22 ++++----
 keyboards/noxary/260/config.h                 | 12 -----
 keyboards/noxary/268_2_rgb/config.h           | 11 +++-
 keyboards/noxary/x268/config.h                | 11 +++-
 keyboards/nullbitsco/nibble/config.h          | 13 ++++-
 keyboards/numatreus/config.h                  |  1 -
 .../obosob/arch_36/keymaps/obosob/config.h    |  1 -
 keyboards/oddforge/vea/config.h               | 11 +++-
 keyboards/ogre/ergo_single/config.h           | 12 ++++-
 keyboards/ogre/ergo_split/config.h            | 11 +++-
 keyboards/ok60/config.h                       | 11 +++-
 keyboards/omkbd/ergodash/mini/config.h        | 11 +++-
 keyboards/omkbd/ergodash/rev1/config.h        | 11 +++-
 keyboards/omkbd/runner3680/3x6/config.h       | 11 +++-
 keyboards/omkbd/runner3680/3x7/config.h       | 11 +++-
 keyboards/omkbd/runner3680/3x8/config.h       | 11 +++-
 keyboards/omkbd/runner3680/4x6/config.h       | 11 +++-
 keyboards/omkbd/runner3680/4x7/config.h       | 11 +++-
 keyboards/omkbd/runner3680/4x8/config.h       | 11 +++-
 keyboards/omkbd/runner3680/5x6/config.h       | 11 +++-
 keyboards/omkbd/runner3680/5x7/config.h       | 11 +++-
 keyboards/omkbd/runner3680/5x8/config.h       | 11 +++-
 keyboards/omnikeyish/config.h                 | 13 ++++-
 keyboards/org60/config.h                      | 11 +++-
 keyboards/orthocode/config.h                  |  3 --
 keyboards/orthodox/keymaps/shaymdev/config.h  |  2 -
 keyboards/panc40/config.h                     | 11 +++-
 keyboards/panc60/config.h                     | 11 +++-
 .../papercranekeyboards/gerald65/config.h     |  3 --
 keyboards/pdxkbc/config.h                     |  3 --
 keyboards/pearl/config.h                      | 11 +++-
 keyboards/peranekofactory/tone/rev1/config.h  |  5 +-
 keyboards/peranekofactory/tone/rev2/config.h  | 14 +-----
 keyboards/percent/booster/config.h            | 12 ++++-
 keyboards/percent/canoe/config.h              | 11 +++-
 keyboards/percent/skog/config.h               | 11 +++-
 keyboards/percent/skog_lite/config.h          | 11 +++-
 keyboards/phantom/config.h                    | 22 ++++----
 keyboards/pico/65keys/config.h                | 11 +++-
 keyboards/pico/70keys/config.h                | 11 +++-
 keyboards/picolab/frusta_fundamental/config.h | 16 ++++--
 keyboards/pimentoso/paddino02/rev1/config.h   | 11 +++-
 .../pimentoso/paddino02/rev2/left/config.h    | 11 +++-
 .../pimentoso/paddino02/rev2/right/config.h   | 11 +++-
 keyboards/pkb65/config.h                      | 11 +++-
 keyboards/planck/keymaps/dodger/config.h      | 13 ++++-
 keyboards/planck/keymaps/dvz/config.h         |  7 ++-
 .../planck/keymaps/experimental/config.h      | 11 +++-
 keyboards/planck/keymaps/myoung34/config.h    | 11 +++-
 keyboards/planck/keymaps/rootiest/config.h    | 21 +++++---
 keyboards/playkbtw/ca66/config.h              | 11 +++-
 keyboards/playkbtw/helen80/config.h           | 22 ++++----
 keyboards/playkbtw/pk60/config.h              | 11 +++-
 keyboards/plume/plume65/config.h              | 22 ++++----
 keyboards/pohjolaworks/louhi/config.h         | 12 -----
 keyboards/poker87c/config.h                   | 22 ++++----
 keyboards/poker87d/config.h                   | 22 ++++----
 keyboards/polycarbdiet/s20/config.h           | 11 +++-
 keyboards/pom_keyboards/tnln95/config.h       | 12 ++++-
 keyboards/preonic/keymaps/era1112/config.h    |  3 +-
 keyboards/preonic/keymaps/seph/config.h       | 11 +++-
 keyboards/preonic/rev3/config.h               | 11 +++-
 keyboards/preonic/rev3_drop/config.h          | 12 ++++-
 keyboards/primekb/prime_e/rgb/config.h        | 11 +++-
 keyboards/primekb/prime_r/config.h            | 11 +++-
 keyboards/program_yoink/config.h              |  3 --
 .../staggered/keymaps/via/config.h            | 11 +++-
 keyboards/projectcain/relic/config.h          | 12 -----
 keyboards/projectcain/vault35/config.h        | 12 -----
 keyboards/projectcain/vault45/config.h        | 12 -----
 keyboards/projectkb/alice/rev1/config.h       | 11 +++-
 keyboards/projectkb/alice/rev2/config.h       | 11 +++-
 keyboards/prototypist/allison/config.h        | 12 -----
 keyboards/prototypist/allison_numpad/config.h | 12 -----
 keyboards/pteron36/config.h                   | 12 -----
 keyboards/qpockets/wanten/config.h            | 12 -----
 keyboards/quad_h/lb75/config.h                | 22 ++++----
 keyboards/quantrik/kyuu/config.h              | 12 -----
 keyboards/qvex/lynepad/config.h               | 11 +++-
 keyboards/qwertyydox/config.h                 | 22 ++++----
 225 files changed, 1861 insertions(+), 924 deletions(-)

diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index c944d14ed5..b03920b95d 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/config.h
@@ -50,24 +50,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B0 //D5 could also be the other pin maybe
 //#ifdef RGB_DI_PIN
-#define RGBLED_NUM 6 
+#define RGBLED_NUM 6
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 68e9debf4e..3b7af18dd7 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -113,7 +113,16 @@
 #endif
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 5
 #define RGBLIGHT_SAT_STEP 5
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index 019e18751d..505ecf902a 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -1,18 +1,18 @@
  /* Copyright 2020 haierwangwei2005
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 
 #pragma once
 
@@ -46,18 +46,16 @@
      #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-     #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 #define TAPPING_TERM 250
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index 866bee31fa..6396c5156d 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -38,9 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define RGBLIGHT_VAL_STEP 25
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
-#define RGBLIGHT_ANIMATIONS             // Run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 
 #define VIA_HAS_BROKEN_KEYCODES
-
-
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 1b7a9b9035..bd1a67fa58 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -110,7 +110,6 @@
 #endif
 //#define RGB_DI_PIN B7
 //#ifdef RGB_DI_PIN
-//#define RGBLIGHT_ANIMATIONS
 //#define RGBLED_NUM 8
 //#define RGBLIGHT_HUE_STEP 5
 //#define RGBLIGHT_SAT_STEP 5
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index cefcbd6469..623fc0f5cd 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -43,7 +43,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define RGBLIGHT_VAL_STEP 25
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
-//#define RGBLIGHT_ANIMATIONS             // Run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
 #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #undef ENABLE_RGB_MATRIX_BREATHING
diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h
index 7139bca6ac..341abfbc53 100644
--- a/keyboards/lazydesigners/bolt/config.h
+++ b/keyboards/lazydesigners/bolt/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RBG underglow */
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
-	#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 	#define RGBLIGHT_SLEEP
 	#define RGBLED_NUM 13
 	/* #define RGBLIGHT_HUE_STEP 8 */
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index 4a8f7a1dce..87e9167712 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -42,11 +42,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RBG underglow */
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
-	#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 	#define RGBLIGHT_SLEEP
 	#define RGBLED_NUM 50
 	/* #define RGBLIGHT_HUE_STEP 8 */
 	/* #define RGBLIGHT_SAT_STEP 8 */
 	/* #define RGBLIGHT_VAL_STEP 8 */
 #endif
-
diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h
index b96be3b18f..61c2beb226 100644
--- a/keyboards/lazydesigners/dimpleplus/config.h
+++ b/keyboards/lazydesigners/dimpleplus/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RBG underglow */
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
-	#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 	#define RGBLIGHT_SLEEP
 	#define RGBLED_NUM 8
 	/* #define RGBLIGHT_HUE_STEP 8 */
diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h
index 0fe62548ea..0257d54727 100644
--- a/keyboards/lazydesigners/the40/config.h
+++ b/keyboards/lazydesigners/the40/config.h
@@ -38,6 +38,15 @@
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP 
-    #define RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_SLEEP
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h
index aa12abe6e5..916ef571f2 100755
--- a/keyboards/lazydesigners/the60/rev2/config.h
+++ b/keyboards/lazydesigners/the60/rev2/config.h
@@ -38,7 +38,15 @@
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  
-    #define RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_SLEEP
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
-
diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h
index 3034c0e2f4..961a477bfb 100644
--- a/keyboards/leafcutterlabs/bigknob/config.h
+++ b/keyboards/leafcutterlabs/bigknob/config.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
 */
 
-// Srating with closest to USB port 
+// Srating with closest to USB port
 #define DIRECT_PINS {   \
     { B7, D4, D6, F6, F7} \
 }
@@ -47,5 +47,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN C7 //D3 - underglow C7 - backlight
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 5    // Number of LEDs
\ No newline at end of file
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 5    // Number of LEDs
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
index 2819051c11..826c381b32 100644
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef SUBPROJECT_rev2
     /* RGB Underglow */
     #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 8
 #endif
 
diff --git a/keyboards/lets_split/keymaps/cpeters1982/config.h b/keyboards/lets_split/keymaps/cpeters1982/config.h
index bff85f1414..da37310158 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/config.h
+++ b/keyboards/lets_split/keymaps/cpeters1982/config.h
@@ -34,7 +34,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // // Enable LED strip
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 
 // Space Cadet
diff --git a/keyboards/lets_split/keymaps/hvp/config.h b/keyboards/lets_split/keymaps/hvp/config.h
index 43d8b0f597..9f705b0fb7 100644
--- a/keyboards/lets_split/keymaps/hvp/config.h
+++ b/keyboards/lets_split/keymaps/hvp/config.h
@@ -32,5 +32,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
diff --git a/keyboards/lets_split/keymaps/khord/config.h b/keyboards/lets_split/keymaps/khord/config.h
index 9d3cfca20d..489e76612a 100644
--- a/keyboards/lets_split/keymaps/khord/config.h
+++ b/keyboards/lets_split/keymaps/khord/config.h
@@ -31,6 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define RGBLIGHT_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
diff --git a/keyboards/lets_split/keymaps/mbsurfer/config.h b/keyboards/lets_split/keymaps/mbsurfer/config.h
index 666a2012bd..e9f43a72c6 100644
--- a/keyboards/lets_split/keymaps/mbsurfer/config.h
+++ b/keyboards/lets_split/keymaps/mbsurfer/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 
 #endif
diff --git a/keyboards/lets_split/keymaps/mjt/config.h b/keyboards/lets_split/keymaps/mjt/config.h
index b82efab6b0..94be36ef55 100644
--- a/keyboards/lets_split/keymaps/mjt/config.h
+++ b/keyboards/lets_split/keymaps/mjt/config.h
@@ -32,5 +32,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
diff --git a/keyboards/lets_split/keymaps/piemod/config.h b/keyboards/lets_split/keymaps/piemod/config.h
index b0ccdb0699..b6932e9a73 100644
--- a/keyboards/lets_split/keymaps/piemod/config.h
+++ b/keyboards/lets_split/keymaps/piemod/config.h
@@ -33,7 +33,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef RGBLED_NUM
 #define RGBLED_NUM 10
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_SNAKE_LENGTH 1
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 1
 
diff --git a/keyboards/lets_split/keymaps/pitty/config.h b/keyboards/lets_split/keymaps/pitty/config.h
index 9becb13968..029d2ead75 100644
--- a/keyboards/lets_split/keymaps/pitty/config.h
+++ b/keyboards/lets_split/keymaps/pitty/config.h
@@ -12,7 +12,16 @@
 #define TAPPING_TOGGLE 2
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/lets_split/keymaps/pyrol/config.h b/keyboards/lets_split/keymaps/pyrol/config.h
index bc0ee4be35..a87e67fe56 100644
--- a/keyboards/lets_split/keymaps/pyrol/config.h
+++ b/keyboards/lets_split/keymaps/pyrol/config.h
@@ -22,5 +22,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MASTER_LEFT
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
diff --git a/keyboards/lets_split/keymaps/tylerwince/config.h b/keyboards/lets_split/keymaps/tylerwince/config.h
index 1dc693d24b..eda4a1b8b2 100644
--- a/keyboards/lets_split/keymaps/tylerwince/config.h
+++ b/keyboards/lets_split/keymaps/tylerwince/config.h
@@ -28,8 +28,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 12
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-
diff --git a/keyboards/lets_split/keymaps/via/config.h b/keyboards/lets_split/keymaps/via/config.h
index 479470a93e..a676d6826d 100644
--- a/keyboards/lets_split/keymaps/via/config.h
+++ b/keyboards/lets_split/keymaps/via/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 
 #define NO_MUSIC_MODE
diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h
index 4ecf59006e..0a59249859 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -19,7 +19,16 @@
 
 #define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
 #define RGBLED_NUM 20     // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h
index 5c1a4da46b..b018902b88 100644
--- a/keyboards/lfkeyboards/lfk78/config.h
+++ b/keyboards/lfkeyboards/lfk78/config.h
@@ -40,7 +40,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
 #    define RGBLIGHT_VAL_STEP 17
-#    define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h
index a7b7415e02..8eaebd6830 100644
--- a/keyboards/lfkeyboards/lfk87/config.h
+++ b/keyboards/lfkeyboards/lfk87/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
 
 #define RGB_DI_PIN F4  // Have to set it to something to get the ws2812 code to compile
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h
index 84dfdad009..709d511b56 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/config.h
@@ -54,7 +54,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
 #    define RGBLIGHT_VAL_STEP 17
-#    define RGBLIGHT_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
 
 #define TAPPING_TERM 200
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index b304db7548..d1229ed416 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
 
 #define RGB_DI_PIN F4  // Have to set it to something to get the ws2812 code to compile
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h
index 13846be9a8..6d8dfc0c5b 100644
--- a/keyboards/lfkeyboards/smk65/revb/config.h
+++ b/keyboards/lfkeyboards/smk65/revb/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
 #define RGBLED_NUM 20     // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h
index 6281324c5c..da129cf897 100644
--- a/keyboards/lfkeyboards/smk65/revf/config.h
+++ b/keyboards/lfkeyboards/smk65/revf/config.h
@@ -44,18 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/lily58/keymaps/chuan/config.h b/keyboards/lily58/keymaps/chuan/config.h
index a6d1c04f57..7d989ba42e 100644
--- a/keyboards/lily58/keymaps/chuan/config.h
+++ b/keyboards/lily58/keymaps/chuan/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -57,6 +66,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/datadavd/config.h b/keyboards/lily58/keymaps/datadavd/config.h
index f0b7f6ee39..83bbfff11f 100644
--- a/keyboards/lily58/keymaps/datadavd/config.h
+++ b/keyboards/lily58/keymaps/datadavd/config.h
@@ -34,7 +34,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 50
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -48,6 +57,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/default/config.h b/keyboards/lily58/keymaps/default/config.h
index d843f5b1c4..79b1314456 100644
--- a/keyboards/lily58/keymaps/default/config.h
+++ b/keyboards/lily58/keymaps/default/config.h
@@ -30,7 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -41,6 +50,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/drasbeck/config.h b/keyboards/lily58/keymaps/drasbeck/config.h
index 21444216aa..f510f7f735 100644
--- a/keyboards/lily58/keymaps/drasbeck/config.h
+++ b/keyboards/lily58/keymaps/drasbeck/config.h
@@ -28,7 +28,16 @@ Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck
 #define TAPPING_TERM 180
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -39,6 +48,5 @@ Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h
index 3da6ad8efd..5699395f73 100644
--- a/keyboards/lily58/keymaps/hvp/config.h
+++ b/keyboards/lily58/keymaps/hvp/config.h
@@ -38,7 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IGNORE_MOD_TAP_INTERRUPT
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -49,6 +58,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/jhelvy/config.h b/keyboards/lily58/keymaps/jhelvy/config.h
index 2424011537..4d4df5b102 100644
--- a/keyboards/lily58/keymaps/jhelvy/config.h
+++ b/keyboards/lily58/keymaps/jhelvy/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 200
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -48,6 +57,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/lily58l/config.h b/keyboards/lily58/keymaps/lily58l/config.h
index efecbb8449..c61a32042b 100644
--- a/keyboards/lily58/keymaps/lily58l/config.h
+++ b/keyboards/lily58/keymaps/lily58l/config.h
@@ -27,11 +27,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLIGHT_HUE_STEP 6 // number of steps to cycle through the hue by
 #    define RGBLIGHT_SAT_STEP 6 // number of steps to increment the saturation by
 #    define RGBLIGHT_VAL_STEP 6 // number of steps to increment the brightness by
-#    define RGBLIGHT_SLEEP //  the RGB lighting will be switched off when the host goes to sleep
+#    define RGBLIGHT_SLEEP      //  the RGB lighting will be switched off when the host goes to sleep
 #endif
 
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
diff --git a/keyboards/lily58/keymaps/mikefightsbears/config.h b/keyboards/lily58/keymaps/mikefightsbears/config.h
index 67adc930dd..454f52c868 100644
--- a/keyboards/lily58/keymaps/mikefightsbears/config.h
+++ b/keyboards/lily58/keymaps/mikefightsbears/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -43,6 +52,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h
index 6466ab910d..e10c2bb380 100644
--- a/keyboards/lily58/keymaps/narze/config.h
+++ b/keyboards/lily58/keymaps/narze/config.h
@@ -38,7 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -51,6 +60,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/pttbx/config.h b/keyboards/lily58/keymaps/pttbx/config.h
index d843f5b1c4..79b1314456 100644
--- a/keyboards/lily58/keymaps/pttbx/config.h
+++ b/keyboards/lily58/keymaps/pttbx/config.h
@@ -30,7 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -41,6 +50,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/via/config.h b/keyboards/lily58/keymaps/via/config.h
index 38ede27f45..a5dfe7c8d3 100644
--- a/keyboards/lily58/keymaps/via/config.h
+++ b/keyboards/lily58/keymaps/via/config.h
@@ -35,6 +35,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/yshrsmz/config.h b/keyboards/lily58/keymaps/yshrsmz/config.h
index 67adc930dd..454f52c868 100644
--- a/keyboards/lily58/keymaps/yshrsmz/config.h
+++ b/keyboards/lily58/keymaps/yshrsmz/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
@@ -43,6 +52,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lizard_trick/tenkey_plusplus/config.h b/keyboards/lizard_trick/tenkey_plusplus/config.h
index 3e9e0d37dc..72f95750f2 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/config.h
+++ b/keyboards/lizard_trick/tenkey_plusplus/config.h
@@ -68,18 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index 813fc5b19c..2f376450ac 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -62,18 +62,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 2bc1c8b599..e700943a56 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -55,9 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 #    define RGBLIGHT_EFFECT_STATIC_LIGHT
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h
index 6922ab8a66..acb9a302d2 100644
--- a/keyboards/machine_industries/m4_a/config.h
+++ b/keyboards/machine_industries/m4_a/config.h
@@ -48,18 +48,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index 96fe08b87e..514ca87deb 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -1,17 +1,17 @@
-/* Copyright 2021 Valdydesu_ 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2021 Valdydesu_
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
 #pragma once
@@ -28,7 +28,7 @@
 
 #define ENCODERS_PAD_A { E6 }
 #define ENCODERS_PAD_B { D1 }
-#define TAP_CODE_DELAY 10 
+#define TAP_CODE_DELAY 10
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
@@ -47,7 +47,16 @@
 
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
index ce4120249c..518e355522 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/config.h
@@ -60,18 +60,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGBLIGHT_LIMIT_VAL 32 /* The maximum brightness level */
 #    endif
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 40fb44e7a7..326b5096c4 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -30,7 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6    // Number of LEDs
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
index cae1450c15..3ee1ec3013 100644
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
@@ -2,8 +2,17 @@
 
 /* Underlight Configuration */
 #define RGB_DI_PIN F4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 2  // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
\ No newline at end of file
+#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
index d801910568..7329440ee1 100644
--- a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
@@ -19,7 +19,16 @@
 /* Underlight Configuration */
 #undef RGB_DI_PIN
 #define RGB_DI_PIN F5
-#define RGBLIGHT_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
 #undef RGBLED_NUM
 #define RGBLED_NUM 8  // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
index 427e04618c..cd0ea962c2 100644
--- a/keyboards/maple_computing/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
@@ -27,4 +27,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 10
 #define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index b9e6da535d..c2f92b7274 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -35,7 +35,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B2
 #define RGBLED_NUM 12    // Number of LEDs (each hand)
 #define RGBLED_SPLIT { 6, 6 }
-#define RGBLIGHT_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
+
 
 /* Split Defines */
 #define SPLIT_HAND_PIN D3
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
index c8f5acdea7..e51d11b241 100644
--- a/keyboards/maple_computing/minidox/keymaps/alairock/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
@@ -30,7 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D7
 
 #define RGBLED_NUM 8   // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
index 12ff1d970e..91ef94841e 100644
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D7
 
 #define RGBLED_NUM 8   // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
index ee2a418183..ee5aaa8294 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D7
 
 #define RGBLED_NUM 8   // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index f7ccfab276..41cd985c1d 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
@@ -91,7 +91,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6     // The pin your RGB strip is wired to
 #define RGBLED_NUM 1      // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index 0e23869558..6d7b7b4485 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -52,18 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index de915827c4..05c2ec8a46 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -59,9 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone32/keymaps/default/rules.mk b/keyboards/marksard/treadstone32/keymaps/default/rules.mk
index 387a81d04b..45463c0308 100644
--- a/keyboards/marksard/treadstone32/keymaps/default/rules.mk
+++ b/keyboards/marksard/treadstone32/keymaps/default/rules.mk
@@ -4,7 +4,6 @@ RGBLIGHT_ENABLE = yes  # LED underglow (Enable WS2812 RGB underlight.)
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    # OPT_DEFS += -DRGBLIGHT_ANIMATIONS
     OPT_DEFS += -DLED_ANIMATIONS
 endif
 
diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone32/keymaps/like_jis/rules.mk
index 882ddd6977..876d4997a0 100644
--- a/keyboards/marksard/treadstone32/keymaps/like_jis/rules.mk
+++ b/keyboards/marksard/treadstone32/keymaps/like_jis/rules.mk
@@ -9,7 +9,6 @@ RGBLIGHT_ENABLE = yes  # LED underglow (Enable WS2812 RGB underlight.)
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    # OPT_DEFS += -DRGBLIGHT_ANIMATIONS
     OPT_DEFS += -DLED_ANIMATIONS
 endif
 
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index e640fdb3c1..6464585582 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -51,9 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index ae27cdaf9e..c6bc0293d3 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -52,9 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index 0666e18cad..7e58056922 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -62,9 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index b6d8269d88..d7ebff675f 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -56,9 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 220 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 1dd36d7013..0a3fa733e1 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -90,8 +90,6 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED 			// turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 					// limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-#define RGBLIGHT_ANIMATIONS             					// Run RGB animations
-// #define RGBLIGHT_ANIMATIONS             					// Enable all additional animation modes.
 #define RGBLIGHT_EFFECT_ALTERNATING     					// Enable alternating animation mode.
 #define RGBLIGHT_EFFECT_BREATHING       					// Enable breathing animation mode.
 // #define RGBLIGHT_EFFECT_CHRISTMAS       					// Enable christmas animation mode.
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 0b24562fce..7dd870bd2b 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -50,17 +50,6 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-// #define RGBLIGHT_ANIMATIONS             // Run RGB animations
-// #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
-// #define RGBLIGHT_EFFECT_ALTERNATING     // Enable alternating animation mode.
-// #define RGBLIGHT_EFFECT_BREATHING       // Enable breathing animation mode.
-// #define RGBLIGHT_EFFECT_CHRISTMAS       // Enable christmas animation mode.
-// #define RGBLIGHT_EFFECT_KNIGHT          // Enable knight animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD    // Enable rainbow mood animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL   // Enable rainbow swirl animation mode.
-// #define RGBLIGHT_EFFECT_RGB_TEST        // Enable RGB test animation mode.
-// #define RGBLIGHT_EFFECT_SNAKE           // Enable snake animation mode.
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT // Enable static gradient mode.
 
 // #define RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
 // #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
index f8e0e9fc7d..e4eddc0fff 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
@@ -35,17 +35,6 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-// #define RGBLIGHT_ANIMATIONS             // Run RGB animations
-// #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
-// #define RGBLIGHT_EFFECT_ALTERNATING     // Enable alternating animation mode.
-// #define RGBLIGHT_EFFECT_BREATHING       // Enable breathing animation mode.
-// #define RGBLIGHT_EFFECT_CHRISTMAS       // Enable christmas animation mode.
-// #define RGBLIGHT_EFFECT_KNIGHT          // Enable knight animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD    // Enable rainbow mood animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL   // Enable rainbow swirl animation mode.
-// #define RGBLIGHT_EFFECT_RGB_TEST        // Enable RGB test animation mode.
-// #define RGBLIGHT_EFFECT_SNAKE           // Enable snake animation mode.
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT // Enable static gradient mode.
 
 // #define RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
 // #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index 412c12e300..3050314bdd 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -68,17 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-// #define RGBLIGHT_ANIMATIONS             // Run RGB animations
-// #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
-// #define RGBLIGHT_EFFECT_ALTERNATING     // Enable alternating animation mode.
-// #define RGBLIGHT_EFFECT_BREATHING       // Enable breathing animation mode.
-// #define RGBLIGHT_EFFECT_CHRISTMAS       // Enable christmas animation mode.
-// #define RGBLIGHT_EFFECT_KNIGHT          // Enable knight animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD    // Enable rainbow mood animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL   // Enable rainbow swirl animation mode.
-// #define RGBLIGHT_EFFECT_RGB_TEST        // Enable RGB test animation mode.
-// #define RGBLIGHT_EFFECT_SNAKE           // Enable snake animation mode.
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT // Enable static gradient mode.
 
 // #define RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
 // #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index cd836ccc36..f36cd7b809 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -1,18 +1,18 @@
 /* Copyright 2022 Daniel Weeks (@xanimos)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
 
 #pragma once
 
@@ -66,17 +66,6 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-// #define RGBLIGHT_ANIMATIONS             // Run RGB animations
-// #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes.
-// #define RGBLIGHT_EFFECT_ALTERNATING     // Enable alternating animation mode.
-#define RGBLIGHT_EFFECT_BREATHING       // Enable breathing animation mode.
-// #define RGBLIGHT_EFFECT_CHRISTMAS       // Enable christmas animation mode.
-#define RGBLIGHT_EFFECT_KNIGHT          // Enable knight animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD    // Enable rainbow mood animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL   // Enable rainbow swirl animation mode.
-// #define RGBLIGHT_EFFECT_RGB_TEST        // Enable RGB test animation mode.
-#define RGBLIGHT_EFFECT_SNAKE           // Enable snake animation mode.
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT // Enable static gradient mode.
 
 // #define RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
 // #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
diff --git a/keyboards/massdrop/thekey_v2/config.h b/keyboards/massdrop/thekey_v2/config.h
index f7abf7bc82..a8ae914b65 100644
--- a/keyboards/massdrop/thekey_v2/config.h
+++ b/keyboards/massdrop/thekey_v2/config.h
@@ -33,7 +33,16 @@
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 5
 #define RGBLIGHT_LED_MAP {4, 0, 1, 2, 3}
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 15
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h
index 29241f1ff6..06f9d31860 100644
--- a/keyboards/matrix/abelx/config.h
+++ b/keyboards/matrix/abelx/config.h
@@ -93,7 +93,17 @@
 // rgb light setting
 #define RGBLED_NUM 9
 #define RGB_DI_PIN B4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 #define AW9523B_RGB_NUM 4
 
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index 830d3d8286..74acef9af3 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -35,7 +35,17 @@
 #define RGB_DI_PIN E6
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h
index b83c0eece2..ca4ee5b96c 100644
--- a/keyboards/matrix/m12og/rev1/config.h
+++ b/keyboards/matrix/m12og/rev1/config.h
@@ -37,7 +37,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB */
 #define RGB_DI_PIN B8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 #define RGBLED_NUM 16
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 6a4b003fbf..c63f92d151 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -20,7 +20,16 @@
 #define RGB_DI_PIN B3
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 95a83905a3..664dd3d0c1 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -82,7 +82,17 @@
 // rgb light setting
 #define RGB_DI_PIN B4  // reserved pin for future usage
 #define RGBLED_NUM 20
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_COUNT 1
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 081b5de373..9222c1cad9 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -83,7 +83,17 @@
 /* indicator rgb */
 #define RGBLED_NUM 7
 #define RGB_DI_PIN B1
-#define RGBLIGHT_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
+
 
 // tapping setting
 //#define TAPPING_TERM 200
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index 697fe10621..39d89eb5db 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -44,7 +44,16 @@
 
 /* RGB LED Setup */
 #define RGB_DI_PIN          F7 // pin the DI on the WS2812B is hooked-up to
-#define RGBLIGHT_ANIMATIONS    // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM          2  // number of LEDs
 
 /*
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index 8ef708931f..e62c3b2bf4 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -46,7 +46,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index 286c06f482..e1f30c86fb 100755
--- a/keyboards/mechkeys/alu84/config.h
+++ b/keyboards/mechkeys/alu84/config.h
@@ -48,7 +48,16 @@
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 10
 #    define RGBLIGHT_VAL_STEP 10
-#    define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index 48f3c3f95d..50c0f95184 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -54,6 +54,16 @@
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 
-#define RGBLIGHT_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
diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
index c4d1ecc528..c9e56e62e3 100644
--- a/keyboards/mechkeys/mechmini/v1/config.h
+++ b/keyboards/mechkeys/mechmini/v1/config.h
@@ -33,5 +33,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards.
 // The same pin is used on the JJ40, at least.
 #define RGBLED_NUM 16
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN E2
diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
index 9c7b74f4ef..c23786b9fa 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -47,7 +47,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index ff1b4367e4..0e1836c4a9 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -59,18 +59,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 0928e89213..f17e1f9303 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -5,7 +5,16 @@
 
 #define RGB_DI_PIN A15
 #define RGBLED_NUM      23
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -91,4 +100,4 @@
 
 #define LED_NUM_LOCK_PIN C15
 #define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
\ No newline at end of file
+#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index 72386fdc59..ef69fd27d1 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -31,8 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN A7
 #define RGBLED_NUM 23
 #define RGBLIGHT_LIMIT_VAL 255
-#define RGBLIGHT_ANIMATIONS
-
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define LED_NUM_LOCK_PIN C15
 #define LED_CAPS_LOCK_PIN B2
diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h
index 36923bb968..2a53447138 100644
--- a/keyboards/mechlovin/delphine/mono_led/config.h
+++ b/keyboards/mechlovin/delphine/mono_led/config.h
@@ -15,16 +15,14 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
\ No newline at end of file
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 155d526f3f..d314f17125 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -8,18 +8,16 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 //rgb matrix setting// This is a 7-bit address, that gets left-shifted and bit 0
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index 2dab887e4d..4f10622c85 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -3,7 +3,16 @@
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN A15
 #    define RGBLED_NUM      18
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index 3a222e8d87..9568c8d380 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/config.h
@@ -46,7 +46,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #define RGBLIGHT_LIMIT_VAL 255
-#define RGBLIGHT_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
+
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h
index c7e4f601e1..f154c344b3 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h
@@ -19,18 +19,16 @@
 #define RGB_DI_PIN A15
 #define RGBLED_NUM 26
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index c6eeb108f9..fce2ec4d9d 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -50,15 +50,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 26
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+/*== all animations enable ==*/#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h
index 1fbb5690d4..ecfd72c7ca 100644
--- a/keyboards/mechlovin/infinityce/config.h
+++ b/keyboards/mechlovin/infinityce/config.h
@@ -39,4 +39,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 31
 #define RGBLIGHT_LIMIT_VAL 255
-#define RGBLIGHT_ANIMATIONS
\ No newline at end of file
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h
index 5228f40751..9543f3cb01 100644
--- a/keyboards/mechlovin/jay60/config.h
+++ b/keyboards/mechlovin/jay60/config.h
@@ -57,18 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h
index d9028d0740..568f4fbb5e 100644
--- a/keyboards/mechlovin/kanu/config.h
+++ b/keyboards/mechlovin/kanu/config.h
@@ -46,4 +46,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index 2cae8a3b67..25147beb2d 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/config.h
@@ -58,9 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index 09e841804e..37f9b46474 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/config.h
@@ -61,9 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 217c63f7e4..44d71be9bc 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -52,16 +52,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index 4b497875da..f140a4ff85 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
- 
+
 
 /*
  * Keyboard Matrix Assignments
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h
index ad964a72f5..caaa043566 100644
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ b/keyboards/mechstudio/ud_40_ortho/config.h
@@ -38,8 +38,16 @@
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* set 0 if debouncing is not needed */
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index b52810b424..4a056f036a 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -48,18 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 1fef5fe001..fd10cf4cbe 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -60,18 +60,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h
index 8eba6e278e..d8ed8ffd98 100644
--- a/keyboards/mehkee96/config.h
+++ b/keyboards/mehkee96/config.h
@@ -16,5 +16,14 @@
 #define BACKLIGHT_LEVELS 3
 
 #define RGBLED_NUM 18
-#define RGBLIGHT_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
 /* key combination for command */
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index 3c07db143b..58b844c7aa 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -26,7 +26,7 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN C7  
+#define LED_CAPS_LOCK_PIN C7
 #define LED_PIN_ON_STATE  0
 
 #define BACKLIGHT_PIN B7
@@ -35,15 +35,24 @@
 
 #ifdef  BACKLIGHT_PIN
 #	define BACKLIGHT_LEVELS    10
-#	define BACKLIGHT_ON_STATE  1 
+#	define BACKLIGHT_ON_STATE  1
 #	define BACKLIGHT_LIMIT_VAL 255
 #endif
 
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
 #    define RGBLIGHT_DEFAULT_SPD 10
-#	 define RGBLED_NUM        16
+#    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h
index ecdf7311a4..eeb55f64e3 100644
--- a/keyboards/meow65/config.h
+++ b/keyboards/meow65/config.h
@@ -58,17 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 3d89ba0a57..0359ca2747 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -1,18 +1,18 @@
- /* Copyright 2021 duoshock 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
+ /* Copyright 2021 duoshock
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
+  */
 
 #include "config_common.h"
 
@@ -25,7 +25,16 @@
 
 #define RGB_DI_PIN B5
 #define RGBLED_NUM 12
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index 0206db4674..0d58a0c41d 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -42,8 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
  /*== customize breathing effect ==*/
    /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
    #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/mexsistor/ludmila/config.h b/keyboards/mexsistor/ludmila/config.h
index 324a1c4baa..87e5583209 100644
--- a/keyboards/mexsistor/ludmila/config.h
+++ b/keyboards/mexsistor/ludmila/config.h
@@ -42,7 +42,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D1
 #define RGBLED_NUM 4
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_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
+
 
 // Encoder
 #define ENCODERS_PAD_A { F6 }
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index a874688171..3446d5d9be 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -53,7 +53,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Uncomment below if use underglow */
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h
index 2dcc91f7ce..b4b891321b 100644
--- a/keyboards/minimacro5/config.h
+++ b/keyboards/minimacro5/config.h
@@ -50,5 +50,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5    // Number of LEDs
diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index fa13775f24..8fafd0758c 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@@ -96,7 +96,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 
-#define RGBLIGHT_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
 
 /*
  * Feature disable options
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index 9460bff0be..12c103bbbb 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // diode mode
 #define DIODE_DIRECTION COL2ROW
 
-// debouncing, NKRO, mouse keys speed 
+// debouncing, NKRO, mouse keys speed
 #define DEBOUNCE 5
 #define FORCE_NKRO
 #define MK_3_SPEED
@@ -47,5 +47,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D1
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 19
-#define RGBLIGHT_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
diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h
index 6f8fa4836d..fae9b56e1b 100644
--- a/keyboards/misterknife/knife66/config.h
+++ b/keyboards/misterknife/knife66/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN A9
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 #define RGBLED_NUM 6
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h
index 4b3b858075..e1bd919896 100644
--- a/keyboards/misterknife/knife66_iso/config.h
+++ b/keyboards/misterknife/knife66_iso/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN A9
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 #define RGBLED_NUM 6
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h
index 19e55934e6..71a0e68d2d 100644
--- a/keyboards/miuni32/config.h
+++ b/keyboards/miuni32/config.h
@@ -95,7 +95,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D0     // The pin your RGB strip is wired to
 #define RGBLED_NUM 17     // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h b/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h
index 1e64b6353f..d057ce4f34 100644
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h
+++ b/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 // place overrides here
-#define RGBLIGHT_ANIMATIONS_OFF
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_SLEEP
 #define MIDI_ADVANCED
diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h
index e833357945..b34a64a813 100644
--- a/keyboards/mixi/config.h
+++ b/keyboards/mixi/config.h
@@ -33,7 +33,16 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
 #endif
diff --git a/keyboards/mixi/mixi.c b/keyboards/mixi/mixi.c
index 43625bcd56..f99c942f2d 100644
--- a/keyboards/mixi/mixi.c
+++ b/keyboards/mixi/mixi.c
@@ -4,7 +4,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB underglow by default
     rgblight_sethsv(0, 255, 255);
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // Set to RGB_RAINBOW_SWIRL animation by default
 #endif
 #endif
diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h
index d7f218f74f..6a21df8614 100755
--- a/keyboards/molecule/config.h
+++ b/keyboards/molecule/config.h
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #ifdef RGBLIGHT_ENABLE
 // #   define RGBLED_NUM 10
 // #   define RGBLED_SPLIT { 5, 5 }
-// #   define RGBLIGHT_ANIMATIONS
 // #endif
 
 //#define RGB_DI_PIN E2
@@ -64,18 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h
index 7fde303ae9..74129762af 100644
--- a/keyboards/momokai/tap_trio/config.h
+++ b/keyboards/momokai/tap_trio/config.h
@@ -37,9 +37,6 @@
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
 
 
-/*== all animations enable ==*/
-//  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index bd8b4923c6..04167087b9 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -40,7 +40,16 @@
 #define RGB_MATRIX_LED_COUNT 21
 #define DRIVER_COUNT 2
 #define RGBLED_NUM 21
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define DEBOUNCE 5
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h
index 223b0fe0a1..ab352e787c 100644
--- a/keyboards/mt/blocked65/config.h
+++ b/keyboards/mt/blocked65/config.h
@@ -48,5 +48,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Backlight configuration
  */
 #define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h
index 7045dac8aa..8cc9f7efcc 100644
--- a/keyboards/mt/mt40/config.h
+++ b/keyboards/mt/mt40/config.h
@@ -25,7 +25,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN C0
 #define RGBLED_NUM 12
-#define RGBLIGHT_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
+
 
 /*
  * Keyboard Matrix Assignments
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index 86035dc6a3..dc03c26724 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -104,7 +104,16 @@
 
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 5
 #define RGBLIGHT_SAT_STEP 5
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index 04c14a27bb..043152d12a 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -107,7 +107,6 @@
 
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
- //    define RGBLIGHT_ANIMATIONS
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index c4b89fa7f7..8a39d34dce 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -35,7 +35,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mt/split75/config.h b/keyboards/mt/split75/config.h
index b146d03314..08b40f11ed 100644
--- a/keyboards/mt/split75/config.h
+++ b/keyboards/mt/split75/config.h
@@ -12,9 +12,18 @@
 #define LED_SCROLL_LOCK_PIN D6
 
 #define RGBLED_NUM 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 
 #define BACKLIGHT_PIN D4
 
-#define I2C_START_RETRY_COUNT 1
\ No newline at end of file
+#define I2C_START_RETRY_COUNT 1
diff --git a/keyboards/mt/split75/keymaps/art/config.h b/keyboards/mt/split75/keymaps/art/config.h
index 30d493075a..2f937491c7 100644
--- a/keyboards/mt/split75/keymaps/art/config.h
+++ b/keyboards/mt/split75/keymaps/art/config.h
@@ -3,8 +3,17 @@
 
 #pragma once
 
-#undef RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 
-// #define DYNAMIC_MACRO_SIZE 48
\ No newline at end of file
+
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
+// #define DYNAMIC_MACRO_SIZE 48
diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h
index 698fd4c6a9..1b0d6a097e 100644
--- a/keyboards/mxss/config.h
+++ b/keyboards/mxss/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Basic RGB configuration */
 #define RGB_DI_PIN C7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h
index 464939080c..63db2e2a25 100644
--- a/keyboards/nacly/ua62/config.h
+++ b/keyboards/nacly/ua62/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index 01f2545de9..7e61de81c8 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -37,7 +37,16 @@
 /* RGB Light Configuration */
 
 #define RGB_DI_PIN D5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 11
 #define RGBLIGHT_LED_MAP { 4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5 }
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/neokeys/g67/hotswap/config.h b/keyboards/neokeys/g67/hotswap/config.h
index 5c45f7ef94..f15552acda 100644
--- a/keyboards/neokeys/g67/hotswap/config.h
+++ b/keyboards/neokeys/g67/hotswap/config.h
@@ -45,16 +45,14 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h
index 9ea69bd3fe..c2ec4a1b07 100644
--- a/keyboards/neokeys/g67/soldered/config.h
+++ b/keyboards/neokeys/g67/soldered/config.h
@@ -49,16 +49,14 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index e06f9c8086..fe5bd7fc2a 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -54,7 +54,16 @@
 //rgb light setting
 #define RGBLED_NUM          65
 #define RGB_DI_PIN          B3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h
index a04ddf45cc..38d235b7df 100644
--- a/keyboards/newgame40/config.h
+++ b/keyboards/newgame40/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 25    // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
@@ -63,4 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define TAPPING_TERM 200
-
diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h
index 81d0f0cbfd..006a1031cd 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 14
-#define RGBLIGHT_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
 
@@ -66,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index fbfa65c2a0..b3b0c39feb 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -52,18 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//	 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h
index 16a21f20ef..88b55deedf 100644
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 12
-#define RGBLIGHT_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
 
@@ -56,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h
index a4f19c8a18..263305787b 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -48,18 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//	 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 4f2a5ff5a0..c74db49836 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B4
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 12
-#define RGBLIGHT_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
 
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index 64b14b0207..344779ce2b 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index 98c05d887f..dd4b85b6f7 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -48,18 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//	 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index a17eb502e1..0ab6c11b35 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 8
-#define RGBLIGHT_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
 
diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h
index 706cdbbf37..affebef0c8 100644
--- a/keyboards/nightmare/config.h
+++ b/keyboards/nightmare/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index 8a9403c9a5..6563e09067 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/config.h
@@ -57,7 +57,16 @@
 
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index 6980258e33..fcbcf322f7 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-     #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h
index 88c9214a90..bd3fc9f2af 100644
--- a/keyboards/noxary/260/config.h
+++ b/keyboards/noxary/260/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index 9856f6401e..347a63c4b4 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812b options */
 #define RGB_DI_PIN B5
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 16
 #define RGBLIGHT_SAT_STEP 16
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index 12f62c3ff0..0ebd52eee5 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -47,7 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812b options */
 #define RGB_DI_PIN B5
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 16
 #define RGBLIGHT_SAT_STEP 16
diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h
index c4461c5b20..16b069dae0 100644
--- a/keyboards/nullbitsco/nibble/config.h
+++ b/keyboards/nullbitsco/nibble/config.h
@@ -45,9 +45,18 @@
 /* Optional SMT LED pins */
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 10
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 
 /* Optional encoder pins */
 #define ENCODERS_PAD_A { B5 }
-#define ENCODERS_PAD_B { B4 }
\ No newline at end of file
+#define ENCODERS_PAD_B { B4 }
diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h
index 9f2daa585f..8683518123 100644
--- a/keyboards/numatreus/config.h
+++ b/keyboards/numatreus/config.h
@@ -47,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 
 // keyboard RGB LED support
-//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #define RGBLED_NUM 6
 
diff --git a/keyboards/obosob/arch_36/keymaps/obosob/config.h b/keyboards/obosob/arch_36/keymaps/obosob/config.h
index a60cafb5df..56f5576478 100644
--- a/keyboards/obosob/arch_36/keymaps/obosob/config.h
+++ b/keyboards/obosob/arch_36/keymaps/obosob/config.h
@@ -21,7 +21,6 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-//  #define RGBLIGHT_ANIMATIONS
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
index 43a75a7f03..0b2607d285 100644
--- a/keyboards/oddforge/vea/config.h
+++ b/keyboards/oddforge/vea/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
 #define RGBLED_NUM 18
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
 
diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h
index 788ace6f5c..eb57bab4c2 100644
--- a/keyboards/ogre/ergo_single/config.h
+++ b/keyboards/ogre/ergo_single/config.h
@@ -33,5 +33,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 14
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 7}
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define DEBOUNCE 5
diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h
index 43a9894f3d..f7e0ba93a6 100644
--- a/keyboards/ogre/ergo_split/config.h
+++ b/keyboards/ogre/ergo_split/config.h
@@ -40,5 +40,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_SPLIT { 7, 7 }
 #define RGBLED_NUM 14
 #define RGBLIGHT_LED_MAP { 6, 5, 4, 3, 2, 1, 0, 13, 12,11, 10, 9, 8, 7}
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define DEBOUNCE 5
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
index 96fff1b590..cfac86271d 100644
--- a/keyboards/ok60/config.h
+++ b/keyboards/ok60/config.h
@@ -57,7 +57,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
index 67fe7e1603..fbd73d0370 100644
--- a/keyboards/omkbd/ergodash/mini/config.h
+++ b/keyboards/omkbd/ergodash/mini/config.h
@@ -58,7 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 10, 10 }    // Number of LEDs
diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
index 56fe46f52a..9c91d94003 100644
--- a/keyboards/omkbd/ergodash/rev1/config.h
+++ b/keyboards/omkbd/ergodash/rev1/config.h
@@ -58,7 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 12, 12 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
index 33a4bcc8a2..f1611ef9cd 100644
--- a/keyboards/omkbd/runner3680/3x6/config.h
+++ b/keyboards/omkbd/runner3680/3x6/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 36
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 18, 18 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
index 44c54091e5..f4a23c5a07 100644
--- a/keyboards/omkbd/runner3680/3x7/config.h
+++ b/keyboards/omkbd/runner3680/3x7/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 42
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 21, 21 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
index 307916f645..6bcd2104b4 100644
--- a/keyboards/omkbd/runner3680/3x8/config.h
+++ b/keyboards/omkbd/runner3680/3x8/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 48
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 24, 24 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
index 9b9d7a578a..456d4d073f 100644
--- a/keyboards/omkbd/runner3680/4x6/config.h
+++ b/keyboards/omkbd/runner3680/4x6/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 48
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 24, 24 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
index 74541c0d3f..5bc958eed6 100644
--- a/keyboards/omkbd/runner3680/4x7/config.h
+++ b/keyboards/omkbd/runner3680/4x7/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 56
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 28, 28 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
index 401ad2ddb6..a4d1b530e8 100644
--- a/keyboards/omkbd/runner3680/4x8/config.h
+++ b/keyboards/omkbd/runner3680/4x8/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 64
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 32, 32 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
index 7c127c22e0..714fb82d3c 100644
--- a/keyboards/omkbd/runner3680/5x6/config.h
+++ b/keyboards/omkbd/runner3680/5x6/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 60
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 30, 30 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
index 9a1a0a4110..779c5c5c5f 100644
--- a/keyboards/omkbd/runner3680/5x7/config.h
+++ b/keyboards/omkbd/runner3680/5x7/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 70
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 35, 35 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
index c8a65dd171..4f60bf8678 100644
--- a/keyboards/omkbd/runner3680/5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x8/config.h
@@ -44,7 +44,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 80
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 40, 40 }    // Number of LEDs
diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h
index 4a969eb43f..429fcfa170 100644
--- a/keyboards/omnikeyish/config.h
+++ b/keyboards/omnikeyish/config.h
@@ -13,7 +13,7 @@
 #define MATRIX_ROW_PINS { D2, D3, D4, D5, D6, D7 }
 #else
 #define MATRIX_ROW_PINS { D2, D3, D4, D5, E6, D7 }
-#endif 
+#endif
 #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, C7, C6, C5, C4, C3, C2, C1, C0, B0, B1, B2, B3, B4, B5, B6 }
 
 #define LED_NUM_LOCK_PIN E0
@@ -36,7 +36,16 @@
 #define FORCE_NKRO
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
index a6a64476cd..1abc212790 100644
--- a/keyboards/org60/config.h
+++ b/keyboards/org60/config.h
@@ -51,7 +51,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  * F6 PIN for Org60 that has pre-soldered WS2812 LEDs
  */
 #define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20     			// Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index 644d7ba255..8abedb69df 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -54,9 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h
index 39f7c8accd..5f20923107 100644
--- a/keyboards/orthodox/keymaps/shaymdev/config.h
+++ b/keyboards/orthodox/keymaps/shaymdev/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 14
-// #define RGBLIGHT_ANIMATIONS
 
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -53,4 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 220
-
diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h
index cc941d56af..4058bb8a3d 100644
--- a/keyboards/panc40/config.h
+++ b/keyboards/panc40/config.h
@@ -24,7 +24,16 @@
 
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h
index 5bf4d4edcd..f80fc4d9ea 100644
--- a/keyboards/panc60/config.h
+++ b/keyboards/panc60/config.h
@@ -35,4 +35,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h
index 318671f298..237b224f62 100644
--- a/keyboards/papercranekeyboards/gerald65/config.h
+++ b/keyboards/papercranekeyboards/gerald65/config.h
@@ -48,9 +48,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 //#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/pdxkbc/config.h b/keyboards/pdxkbc/config.h
index b24592942f..ce407b4ff7 100644
--- a/keyboards/pdxkbc/config.h
+++ b/keyboards/pdxkbc/config.h
@@ -56,9 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
 //   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
index 8f17638549..b860d5bef1 100644
--- a/keyboards/pearl/config.h
+++ b/keyboards/pearl/config.h
@@ -23,7 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_CAPS_LOCK_PIN D1
 #define LED_SCROLL_LOCK_PIN D6
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 
 #define BACKLIGHT_PIN D4
diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h
index 03e4b3cae9..926a0e48b3 100644
--- a/keyboards/peranekofactory/tone/rev1/config.h
+++ b/keyboards/peranekofactory/tone/rev1/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * ROWS: AVR pins used for rows, top to bottom
  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- * 
+ *
  */
 
 #define DIRECT_PINS { \
@@ -69,9 +69,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 //#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h
index 03e4b3cae9..d77be1a0de 100644
--- a/keyboards/peranekofactory/tone/rev2/config.h
+++ b/keyboards/peranekofactory/tone/rev2/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * ROWS: AVR pins used for rows, top to bottom
  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- * 
+ *
  */
 
 #define DIRECT_PINS { \
@@ -69,18 +69,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
index c70d73d313..6ff8f9045c 100644
--- a/keyboards/percent/booster/config.h
+++ b/keyboards/percent/booster/config.h
@@ -39,6 +39,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255
     #define RGBLIGHT_SLEEP
-    #define RGBLIGHT_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
-
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index 8b0c8ad8da..9f5ca1aa8b 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -35,4 +35,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
index 65c9a65802..b8abcab227 100644
--- a/keyboards/percent/skog/config.h
+++ b/keyboards/percent/skog/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_SCROLL_LOCK_PIN D6
 
 #define RGBLED_NUM 2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index 0e61f5d2ff..e0c3a36671 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -37,4 +37,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index 2b1e6b1e5f..93c5d9832b 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -54,18 +54,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 17
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/pico/65keys/config.h b/keyboards/pico/65keys/config.h
index a97d03596c..e4cc9c1d2f 100644
--- a/keyboards/pico/65keys/config.h
+++ b/keyboards/pico/65keys/config.h
@@ -53,7 +53,16 @@
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pico/70keys/config.h b/keyboards/pico/70keys/config.h
index a97d03596c..e4cc9c1d2f 100644
--- a/keyboards/pico/70keys/config.h
+++ b/keyboards/pico/70keys/config.h
@@ -53,7 +53,16 @@
 
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h
index 6a3e76ba8c..6b81d2ffd6 100644
--- a/keyboards/picolab/frusta_fundamental/config.h
+++ b/keyboards/picolab/frusta_fundamental/config.h
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
-#pragma once 
+
+#pragma once
 
 #include "config_common.h"
 
@@ -38,10 +38,18 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 67
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h
index b9661afbaa..2836ed4d16 100755
--- a/keyboards/pimentoso/paddino02/rev1/config.h
+++ b/keyboards/pimentoso/paddino02/rev1/config.h
@@ -26,7 +26,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h
index 9de375d0b3..52f9e6655f 100755
--- a/keyboards/pimentoso/paddino02/rev2/left/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/left/config.h
@@ -26,7 +26,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h
index 38253bb4a2..9847bf2d43 100755
--- a/keyboards/pimentoso/paddino02/rev2/right/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/right/config.h
@@ -26,7 +26,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
index 6805d14be1..bd8a0bf484 100644
--- a/keyboards/pkb65/config.h
+++ b/keyboards/pkb65/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/planck/keymaps/dodger/config.h b/keyboards/planck/keymaps/dodger/config.h
index e9e778f85b..1fa9b4265e 100644
--- a/keyboards/planck/keymaps/dodger/config.h
+++ b/keyboards/planck/keymaps/dodger/config.h
@@ -20,6 +20,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef BACKLIGHT_LEVELS
 #define BACKLIGHT_LEVELS 15
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
\ No newline at end of file
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
diff --git a/keyboards/planck/keymaps/dvz/config.h b/keyboards/planck/keymaps/dvz/config.h
index 5535c3ca19..bcdc3e57d6 100644
--- a/keyboards/planck/keymaps/dvz/config.h
+++ b/keyboards/planck/keymaps/dvz/config.h
@@ -62,7 +62,6 @@
 #define RGBLIGHT_SLEEP
 #define RGBLED_NUM 9
 
-#undef RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_KNIGHT
@@ -70,4 +69,10 @@
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+
 #define RGBLIGHT_RAINBOW_SWIRL_RANGE 127
diff --git a/keyboards/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h
index 038dc6a8f2..450addbd99 100644
--- a/keyboards/planck/keymaps/experimental/config.h
+++ b/keyboards/planck/keymaps/experimental/config.h
@@ -8,7 +8,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/planck/keymaps/myoung34/config.h b/keyboards/planck/keymaps/myoung34/config.h
index 341c814faa..92ad42f0fa 100644
--- a/keyboards/planck/keymaps/myoung34/config.h
+++ b/keyboards/planck/keymaps/myoung34/config.h
@@ -41,6 +41,15 @@
 
 #define RGB_DI_PIN B2     // The pin the LED strip is connected to (PB2 by default)
 #define RGBLED_NUM 3      // Number of LEDs in your strip
-#define RGBLIGHT_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
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
index 5bb5a73a29..63275011db 100644
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ b/keyboards/planck/keymaps/rootiest/config.h
@@ -71,12 +71,21 @@
  * RGB options
  */
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_SLEEP                    // Allows rgb to sleep when the host/keyboard does
-#    define RGBLIGHT_ANIMATIONS               // Enable using rgb animations
-#    define RGBLIGHT_LAYERS                   // Enable indicating layers using layered rgb assignments
-#    define RGBLIGHT_LAYER_BLINK              // Allows rgb layers to be blinked (activate for a set amount of time)
-#    define RGBLIGHT_MAX_LAYERS 32            // Overides the default (8) max number of rgb layers
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF  // Allows rgb layers to work even when rgb is toggled off
+#    define RGBLIGHT_SLEEP // Allows rgb to sleep when the host/keyboard does
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_LAYERS                  // Enable indicating layers using layered rgb assignments
+#    define RGBLIGHT_LAYER_BLINK             // Allows rgb layers to be blinked (activate for a set amount of time)
+#    define RGBLIGHT_MAX_LAYERS 32           // Overides the default (8) max number of rgb layers
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Allows rgb layers to work even when rgb is toggled off
 #endif
 
 /*
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index af3f2b2dbb..cf55238214 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -31,7 +31,16 @@
 
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h
index 830b659c17..df4164926f 100644
--- a/keyboards/playkbtw/helen80/config.h
+++ b/keyboards/playkbtw/helen80/config.h
@@ -49,18 +49,16 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 #define LED_CAPS_LOCK_PIN B3
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index d3aaa893e0..dbc7d3dd38 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -33,7 +33,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h
index 0a9cf3ceca..d1bf997e7c 100644
--- a/keyboards/plume/plume65/config.h
+++ b/keyboards/plume/plume65/config.h
@@ -46,18 +46,16 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h
index e2ff5a06ac..d0fe80b44a 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 230 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
index 93352a2e95..c6385f174a 100644
--- a/keyboards/poker87c/config.h
+++ b/keyboards/poker87c/config.h
@@ -49,18 +49,16 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 #define LED_NUM_LOCK_PIN B1
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index ab28e84a06..813dbc54d8 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -49,18 +49,16 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 #define LED_NUM_LOCK_PIN B1
diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h
index 350f7dfff3..fd6e63830e 100644
--- a/keyboards/polycarbdiet/s20/config.h
+++ b/keyboards/polycarbdiet/s20/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define DEBOUNCE 5
 
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index f4dfa80a7e..943423d0eb 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -61,7 +61,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN C7
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 14
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/preonic/keymaps/era1112/config.h b/keyboards/preonic/keymaps/era1112/config.h
index 86cc6135e5..a30a7733c7 100644
--- a/keyboards/preonic/keymaps/era1112/config.h
+++ b/keyboards/preonic/keymaps/era1112/config.h
@@ -51,10 +51,9 @@
 
 // Firmware minimization
 
-// Commented to see if it helps stalls on clicky mode 
+// Commented to see if it helps stalls on clicky mode
 // #define NO_ACTION_ONESHOT
 // #undef LOCKING_SUPPORT_ENABLE
 // #undef LOCKING_RESYNC_ENABLE
 // #define NO_MUSIC_MODE
 // #define LAYER_STATE_8BIT        // Limits keymap to 8 layers
-// #undef RGBLIGHT_ANIMATIONS      // Removes rgb animations
diff --git a/keyboards/preonic/keymaps/seph/config.h b/keyboards/preonic/keymaps/seph/config.h
index 64a942e21c..fca4fb01db 100644
--- a/keyboards/preonic/keymaps/seph/config.h
+++ b/keyboards/preonic/keymaps/seph/config.h
@@ -11,7 +11,16 @@
 #undef RGB_DI_PIN
 #define RGB_DI_PIN B3
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 11     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 1c5dfe2e68..079ba2a0d1 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -90,7 +90,16 @@
  */
 #define RGB_DI_PIN A1
 #define RGBLED_NUM 9
-#define RGBLIGHT_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
 // RGB Matrix support
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 1c5dfe2e68..e136e01d64 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -90,7 +90,17 @@
  */
 #define RGB_DI_PIN A1
 #define RGBLED_NUM 9
-#define RGBLIGHT_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
+
 // RGB Matrix support
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h
index 89cf43902c..015ba8b5e9 100644
--- a/keyboards/primekb/prime_e/rgb/config.h
+++ b/keyboards/primekb/prime_e/rgb/config.h
@@ -21,4 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h
index a75d608e3c..5b971c7903 100644
--- a/keyboards/primekb/prime_r/config.h
+++ b/keyboards/primekb/prime_r/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
index efb27f7fb2..4adb0cf45e 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/config.h
@@ -52,9 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   //#define RGBLIGHT_ANIMATIONS
- /*== or choose animations ==*/
    //#define RGBLIGHT_EFFECT_BREATHING
    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/program_yoink/staggered/keymaps/via/config.h b/keyboards/program_yoink/staggered/keymaps/via/config.h
index 9cd0c4caee..76ca6b4411 100644
--- a/keyboards/program_yoink/staggered/keymaps/via/config.h
+++ b/keyboards/program_yoink/staggered/keymaps/via/config.h
@@ -19,4 +19,13 @@
 // place overrides here
 #define TAPPING_TERM 200
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/projectcain/relic/config.h b/keyboards/projectcain/relic/config.h
index 026e139fd1..aa40dad9a5 100644
--- a/keyboards/projectcain/relic/config.h
+++ b/keyboards/projectcain/relic/config.h
@@ -49,18 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
index f7fe8b17c7..b609d84837 100644
--- a/keyboards/projectcain/vault35/config.h
+++ b/keyboards/projectcain/vault35/config.h
@@ -63,18 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index 2ac39d277c..2fa67320f5 100644
--- a/keyboards/projectcain/vault45/config.h
+++ b/keyboards/projectcain/vault45/config.h
@@ -66,18 +66,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index c06f73a35b..ac753031ca 100644
--- a/keyboards/projectkb/alice/rev1/config.h
+++ b/keyboards/projectkb/alice/rev1/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 9e66d6a628..6461669889 100644
--- a/keyboards/projectkb/alice/rev2/config.h
+++ b/keyboards/projectkb/alice/rev2/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h
index 14124f7c99..c14ee1f450 100644
--- a/keyboards/prototypist/allison/config.h
+++ b/keyboards/prototypist/allison/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h
index 6a442689d1..7ffeb0bae0 100644
--- a/keyboards/prototypist/allison_numpad/config.h
+++ b/keyboards/prototypist/allison_numpad/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index 32c962dcc0..1ff309561f 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h
index feba6e742a..8e119e653c 100644
--- a/keyboards/qpockets/wanten/config.h
+++ b/keyboards/qpockets/wanten/config.h
@@ -59,18 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index 15041b1a8a..d353283838 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -52,18 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 220 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h
index f8da7ab014..395989e594 100644
--- a/keyboards/quantrik/kyuu/config.h
+++ b/keyboards/quantrik/kyuu/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index 31e0d8ded3..23fb1119ff 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -37,7 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LEDs */
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#undef RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 748999ac64..a839b763f0 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-    /*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-    // /*== or choose animations ==*/
-    //     #define RGBLIGHT_EFFECT_BREATHING
-    //     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    //     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    //     #define RGBLIGHT_EFFECT_SNAKE
-    //     #define RGBLIGHT_EFFECT_KNIGHT
-    //     #define RGBLIGHT_EFFECT_CHRISTMAS
-    //     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-    //     #define RGBLIGHT_EFFECT_RGB_TEST
-    //     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     // /*== customize breathing effect ==*/
     //     /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
     //     #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64

From f0da486fabdbe05023e03d89c000229410800713 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 15 Oct 2022 09:55:53 -0700
Subject: [PATCH 648/959] Remove RGBLIGHT_ANIMATION and clean up effect defines
 for R-Z (#18728)

---
 keyboards/rabbit/rabbit68/config.h            | 12 ------
 keyboards/rainkeebs/delilah/config.h          | 11 ++++-
 keyboards/rainkeebs/yasui/config.h            | 11 ++++-
 keyboards/ramonimbao/chevron/config.h         | 12 ------
 keyboards/ramonimbao/herringbone/v1/config.h  | 12 ------
 keyboards/ramonimbao/squishy65/config.h       | 11 ++++-
 keyboards/ramonimbao/squishyfrl/config.h      | 23 +++++------
 keyboards/ramonimbao/squishytkl/config.h      | 22 +++++-----
 keyboards/ramonimbao/tkl_ff/config.h          | 12 ------
 keyboards/ramonimbao/tkl_ff/v2/config.h       |  3 --
 keyboards/ramonimbao/wete/v1/config.h         | 11 ++++-
 keyboards/ramonimbao/wete/v2/config.h         |  3 --
 keyboards/rart/rart4x4/config.h               | 11 ++++-
 keyboards/rart/rart67/config.h                | 11 ++++-
 keyboards/rart/rartland/config.h              |  2 -
 keyboards/rart/rartlice/config.h              | 11 ++++-
 keyboards/rart/rartpad/config.h               | 11 ++++-
 keyboards/recompile_keys/mio/config.h         | 11 ++++-
 .../nomu30/keymaps/center_sprit/rules.mk      |  1 -
 .../nomu30/keymaps/like_jis/rules.mk          |  1 -
 keyboards/rect44/config.h                     | 11 ++++-
 keyboards/redox/keymaps/KL1RL/config.h        | 12 +++++-
 keyboards/redox/keymaps/cykedev/config.h      | 11 ++++-
 keyboards/redox/keymaps/default/config.h      | 11 ++++-
 .../redox/keymaps/eightbitraptor/config.h     | 11 ++++-
 keyboards/redox/keymaps/fculpo/config.h       | 11 ++++-
 keyboards/redox/keymaps/finex/config.h        | 11 ++++-
 keyboards/redox/keymaps/german/config.h       | 12 +++++-
 keyboards/redox/keymaps/italian/config.h      | 12 +++++-
 keyboards/redox/keymaps/jeherve/config.h      |  1 -
 keyboards/redox/keymaps/nrichers/config.h     | 12 +++++-
 keyboards/redox/keymaps/ptillemans/config.h   | 12 +++++-
 keyboards/redox/keymaps/tw1t611/config.h      | 12 +++++-
 keyboards/redox/keymaps/via/config.h          | 12 +++++-
 keyboards/redscarf_iiplus/verb/config.h       | 12 ------
 keyboards/redscarf_iiplus/verc/config.h       | 12 ------
 keyboards/redscarf_iiplus/verd/config.h       | 12 ------
 keyboards/retro_75/config.h                   | 22 +++++-----
 keyboards/reversestudio/decadepad/config.h    | 11 ++++-
 keyboards/reviung/reviung33/config.h          | 22 +++++-----
 keyboards/reviung/reviung34/config.h          | 12 ------
 .../reviung34/keymaps/default_rgb/config.h    | 13 +++++-
 .../reviung34/keymaps/default_rgb2u/config.h  | 13 +++++-
 keyboards/reviung/reviung39/config.h          | 12 ------
 .../reviung39/keymaps/default/config.h        | 24 +++++------
 .../reviung39/keymaps/default_s/config.h      | 24 +++++------
 .../reviung39/keymaps/toshi0383/config.h      | 22 +++++-----
 keyboards/reviung/reviung41/config.h          | 22 +++++-----
 .../reviung41/keymaps/ciutadellla/config.h    |  2 -
 keyboards/reviung/reviung5/config.h           | 22 +++++-----
 keyboards/reviung/reviung53/config.h          | 22 +++++-----
 .../reviung61/keymaps/default_rgb/config.h    | 12 +++++-
 keyboards/rgbkb/mun/config.h                  | 11 ++++-
 keyboards/rgbkb/pan/config.h                  | 11 ++++-
 keyboards/rgbkb/sol/config.h                  | 11 ++++-
 keyboards/rgbkb/sol/keymaps/default/readme.md |  1 -
 .../rgbkb/sol/keymaps/kageurufu/rules.mk      |  1 -
 keyboards/rgbkb/sol/keymaps/xulkal/rules.mk   |  2 -
 keyboards/rgbkb/sol/keymaps/xyverz/rules.mk   |  1 -
 keyboards/rgbkb/sol/rev1/rules.mk             |  1 -
 keyboards/rgbkb/sol/rev2/rules.mk             |  1 -
 .../rgbkb/zen/rev1/keymaps/333fred/config.h   | 11 ++++-
 .../rgbkb/zen/rev1/keymaps/default/config.h   | 11 ++++-
 .../zen/rev1/keymaps/jwlawrence/config.h      | 11 ++++-
 .../rev1/keymaps/starcalleramethyst/config.h  | 11 ++++-
 .../rgbkb/zen/rev1/keymaps/xyverz/config.h    | 11 ++++-
 keyboards/rgbkb/zen/rev2/config.h             | 11 ++++-
 .../rgbkb/zygomorph/keymaps/5x6pad/rules.mk   |  5 ---
 .../rgbkb/zygomorph/keymaps/default/readme.md |  1 -
 .../rgbkb/zygomorph/keymaps/default/rules.mk  |  4 --
 .../zygomorph/keymaps/default_oled/rules.mk   |  5 ---
 .../zygomorph/keymaps/kageurufu/rules.mk      |  5 ---
 .../rgbkb/zygomorph/keymaps/xulkal/rules.mk   |  5 ---
 keyboards/rgbkb/zygomorph/rev1/config.h       | 11 +++++
 keyboards/rmkeebs/rm_numpad/config.h          | 12 ------
 keyboards/rocketboard_16/config.h             | 11 ++++-
 keyboards/roseslite/config.h                  | 12 ------
 keyboards/ryloo_studio/m0110/config.h         | 11 ++++-
 keyboards/salicylic_acid3/7skb/rev1/config.h  | 11 ++++-
 keyboards/salicylic_acid3/7splus/config.h     | 11 ++++-
 keyboards/salicylic_acid3/ergoarrows/config.h | 11 ++++-
 .../salicylic_acid3/getta25/rev1/config.h     | 11 ++++-
 .../salicylic_acid3/jisplit89/rev1/config.h   | 11 ++++-
 keyboards/salicylic_acid3/nafuda/config.h     | 11 ++++-
 .../salicylic_acid3/naked48/rev1/config.h     | 12 +++++-
 keyboards/salicylic_acid3/nknl7en/config.h    | 11 ++++-
 keyboards/salicylic_acid3/nknl7jp/config.h    | 11 ++++-
 .../salicylic_acid3/setta21/rev1/config.h     | 11 ++++-
 keyboards/sam/s80/config.h                    | 12 ------
 keyboards/sam/sg81m/config.h                  | 22 +++++-----
 keyboards/sandwich/keeb68/config.h            | 12 ------
 keyboards/sawnsprojects/satxri6key/config.h   | 22 +++++-----
 keyboards/scatter42/config.h                  | 12 ------
 keyboards/sck/gtm/config.h                    | 11 ++++-
 keyboards/sck/m0116b/config.h                 | 22 +++++-----
 keyboards/sck/neiso/config.h                  | 12 ------
 keyboards/sck/osa/config.h                    | 12 ------
 keyboards/sekigon/grs_70ec/config.h           | 12 ------
 keyboards/sendyyeah/pix/config.h              | 11 ++++-
 keyboards/sendyyeah/pix/pix.c                 |  2 +-
 keyboards/senselessclay/ck65/config.h         | 17 ++++++--
 keyboards/senselessclay/gos65/config.h        | 19 ++++++---
 keyboards/sentraq/number_pad/config.h         | 22 +++++-----
 keyboards/sentraq/s60_x/rgb/config.h          | 11 ++++-
 keyboards/sentraq/s65_plus/config.h           | 11 ++++-
 keyboards/sentraq/s65_x/config.h              | 11 ++++-
 keyboards/shambles/config.h                   | 11 ++++-
 keyboards/shiro/config.h                      | 12 ------
 keyboards/silverbullet44/config.h             |  3 --
 keyboards/singa/config.h                      | 11 ++++-
 keyboards/skeletn87/hotswap/config.h          | 11 ++++-
 keyboards/skeletn87/soldered/config.h         | 11 ++++-
 keyboards/slz40/config.h                      | 12 ------
 keyboards/smallkeyboard/config.h              |  1 -
 keyboards/smk60/config.h                      | 11 ++++-
 keyboards/snampad/config.h                    | 12 ------
 keyboards/sneakbox/aliceclone/config.h        | 11 ++++-
 keyboards/sneakbox/disarray/ortho/config.h    | 11 ++++-
 .../sneakbox/disarray/staggered/config.h      | 11 ++++-
 keyboards/sofle/keymaps/devdev/config.h       |  1 -
 keyboards/sofle/keymaps/killmaster/config.h   |  3 --
 keyboards/sofle/keymaps/rgb_default/config.h  |  1 -
 keyboards/sofle/keymaps/via/config.h          | 17 ++++++--
 keyboards/soup10/config.h                     | 12 ------
 keyboards/soy20/config.h                      | 11 ++++-
 keyboards/spaceholdings/nebula12/config.h     | 11 ++++-
 keyboards/spaceholdings/nebula68/config.h     | 11 ++++-
 keyboards/spacetime/config.h                  | 12 ------
 keyboards/spacey/config.h                     | 12 ------
 keyboards/specskeys/config.h                  | 12 ------
 .../splitkb/kyria/keymaps/asapjockey/config.h | 11 ++++-
 .../splitkb/kyria/keymaps/benji/config.h      | 11 ++++-
 .../splitkb/kyria/keymaps/cjuniet/config.h    | 11 ++++-
 .../splitkb/kyria/keymaps/corodiak/config.h   | 11 ++++-
 .../splitkb/kyria/keymaps/cwebster2/config.h  |  1 -
 .../splitkb/kyria/keymaps/default/config.h    | 17 ++++++--
 .../splitkb/kyria/keymaps/ghidalgo93/config.h | 14 +++++--
 .../splitkb/kyria/keymaps/j-inc/rules.mk      |  1 -
 .../splitkb/kyria/keymaps/kejadlen/config.h   | 11 ++++-
 .../splitkb/kyria/keymaps/lms_ace01/config.h  | 12 +++++-
 .../splitkb/kyria/keymaps/mattir/config.h     | 11 ++++-
 .../splitkb/kyria/keymaps/pierrec83/config.h  | 12 +++++-
 .../splitkb/kyria/keymaps/plattfot/config.h   | 12 +++++-
 keyboards/splitkb/kyria/keymaps/rmw/config.h  | 13 ++++--
 .../splitkb/kyria/keymaps/shinze/config.h     | 11 ++++-
 .../splitkb/kyria/keymaps/tessachka/config.h  | 11 ++++-
 .../kyria/keymaps/thomasbaart/config.h        | 11 ++++-
 keyboards/splitkb/kyria/keymaps/uqs/config.h  |  1 -
 keyboards/stello65/beta/config.h              | 12 ------
 keyboards/stratos/config.h                    | 11 ++++-
 keyboards/studiokestra/cascade/config.h       | 22 +++++-----
 keyboards/swiftrax/retropad/config.h          | 11 ++++-
 keyboards/switchplate/southpaw_65/config.h    | 24 +++++------
 keyboards/tada68/keymaps/rgb/config.h         | 13 +++++-
 .../hecomi/keymaps/kakunpc/config.h           | 11 ++++-
 .../takashiski/namecard2x4/rev1/config.h      | 13 +++++-
 .../takashiski/namecard2x4/rev2/config.h      | 13 +++++-
 .../takashiski/otaku_split/rev0/config.h      | 14 +------
 .../takashiski/otaku_split/rev1/config.h      | 14 +------
 keyboards/taleguers/taleguers75/config.h      | 11 ++++-
 keyboards/tanuki/config.h                     | 11 ++++-
 keyboards/team0110/p1800fl/config.h           | 11 ++++-
 keyboards/technika/config.h                   | 12 +++++-
 keyboards/tenki/config.h                      | 11 ++++-
 keyboards/tetris/config.h                     | 11 ++++-
 keyboards/tg4x/config.h                       | 22 +++++-----
 keyboards/tgr/910/config.h                    | 11 ++++-
 keyboards/tgr/910ce/config.h                  | 11 ++++-
 keyboards/tgr/alice/config.h                  | 11 ++++-
 keyboards/tgr/tris/config.h                   | 11 ++++-
 keyboards/the_royal/schwann/config.h          | 11 ++++-
 keyboards/the_uni/rp_2040/config.h            |  1 -
 keyboards/themadnoodle/ncc1701kb/v2/config.h  | 11 ++++-
 keyboards/themadnoodle/noodlepad/config.h     | 11 ++++-
 keyboards/thevankeyboards/jetvan/config.h     | 11 ++++-
 .../minivan/keymaps/like_jis/rules.mk         |  1 -
 keyboards/tkc/godspeed75/config.h             | 11 ++++-
 keyboards/tkc/m0lly/config.h                  | 22 +++++-----
 keyboards/tkc/osav2/config.h                  | 22 +++++-----
 keyboards/tkc/tkc1800/config.h                | 11 ++++-
 keyboards/tkc/tkl_ab87/config.h               | 22 +++++-----
 keyboards/tkw/grandiceps/config.h             | 11 ++++-
 keyboards/tkw/stoutgat/v2/config.h            | 13 +++++-
 keyboards/tmo50/config.h                      | 22 +++++-----
 keyboards/toad/config.h                       | 11 ++++-
 keyboards/tokyokeyboard/alix40/config.h       | 11 ++++-
 keyboards/tokyokeyboard/tokyo60/config.h      | 11 ++++-
 keyboards/tominabox1/le_chiffre/config.h      | 11 ++++-
 keyboards/tominabox1/qaz/config.h             | 11 ++++-
 .../tominabox1/underscore33/rev2/config.h     | 12 +++++-
 keyboards/tr60w/config.h                      | 11 ++++-
 keyboards/trashman/ketch/config.h             | 13 +++++-
 keyboards/treasure/type9/config.h             |  1 -
 keyboards/tszaboo/ortho4exent/config.h        | 22 +++++-----
 keyboards/tunks/ergo33/config.h               | 39 +++++++++++-------
 .../tunks/ergo33/keymaps/default/config.h     | 41 +++++++++++--------
 keyboards/tunks/ergo33/keymaps/rgb/config.h   | 39 +++++++++++-------
 keyboards/tw40/config.h                       | 11 ++++-
 keyboards/uk78/config.h                       | 11 ++++-
 keyboards/unikeyboard/felix/config.h          | 12 ------
 keyboards/unikorn/config.h                    | 11 ++++-
 keyboards/unison/v04/config.h                 |  3 --
 keyboards/uranuma/config.h                    | 12 ------
 keyboards/utd80/config.h                      | 39 +++++++++++-------
 keyboards/v60_type_r/config.h                 | 11 ++++-
 keyboards/viktus/omnikey_bh/config.h          | 11 ++++-
 keyboards/viktus/z150_bh/config.h             | 11 ++++-
 keyboards/vitamins_included/rev1/config.h     | 11 ++++-
 keyboards/vitamins_included/rev2/config.h     | 11 ++++-
 keyboards/waldo/config.h                      | 11 ++++-
 keyboards/walletburner/cajal/config.h         | 11 ++++-
 keyboards/walletburner/neuron/config.h        | 11 ++++-
 keyboards/wekey/polaris/config.h              | 12 ------
 keyboards/wekey/we27/config.h                 | 12 ------
 keyboards/westfoxtrot/aanzee/config.h         | 22 +++++-----
 .../cypher/rev1/keymaps/kwer/readme.md        |  1 -
 keyboards/westfoxtrot/cypher/rev5/config.h    | 11 ++++-
 keyboards/wilba_tech/wt70_jb/config.h         | 11 ++++-
 .../zeal60/keymaps/tusing/README.md           |  3 +-
 .../wilba_tech/zeal60/keymaps/tusing/config.h | 11 ++++-
 keyboards/winkeyless/bface/config.h           | 11 ++++-
 keyboards/winkeyless/bmini/config.h           | 11 ++++-
 keyboards/winkeyless/bminiex/config.h         | 11 ++++-
 keyboards/wolfmarkclub/wm1/config.h           | 13 +++++-
 keyboards/woodkeys/bigseries/1key/config.h    | 11 ++++-
 keyboards/woodkeys/bigseries/2key/config.h    | 11 ++++-
 keyboards/woodkeys/bigseries/3key/config.h    | 11 ++++-
 keyboards/woodkeys/bigseries/4key/config.h    | 11 ++++-
 keyboards/woodkeys/scarletbandana/config.h    | 11 ++++-
 keyboards/wsk/alpha9/config.h                 | 11 ++++-
 keyboards/wsk/g4m3ralpha/config.h             | 11 ++++-
 keyboards/wsk/gothic50/config.h               | 17 ++++----
 keyboards/wsk/gothic70/config.h               | 12 +++++-
 keyboards/wsk/houndstooth/config.h            |  2 -
 keyboards/wsk/jerkin/config.h                 | 11 ++++-
 keyboards/wsk/kodachi50/config.h              | 12 +++++-
 keyboards/wsk/pain27/config.h                 | 12 +++++-
 keyboards/wsk/sl40/config.h                   | 12 +++++-
 keyboards/wsk/tkl30/config.h                  | 12 +++++-
 keyboards/wuque/ikki68/config.h               | 24 +++++------
 keyboards/wuque/ikki68_aurora/config.h        | 22 +++++-----
 keyboards/x16/config.h                        |  4 --
 keyboards/xelus/akis/config.h                 | 11 ++++-
 keyboards/xelus/ninjin/config.h               | 13 +++++-
 keyboards/xelus/valor/rev1/config.h           | 11 ++++-
 keyboards/xiudi/xd60/rev2/config.h            | 11 ++++-
 keyboards/xiudi/xd60/rev3/config.h            | 11 ++++-
 keyboards/xiudi/xd68/config.h                 | 11 ++++-
 keyboards/xiudi/xd75/config.h                 | 22 +++++-----
 keyboards/xiudi/xd75/keymaps/4sstylz/config.h | 11 ++++-
 .../xiudi/xd75/keymaps/ericgebhart/config.h   | 11 ++++-
 keyboards/xiudi/xd84/config.h                 | 23 +++++------
 keyboards/xiudi/xd84pro/config.h              | 22 +++++-----
 keyboards/xiudi/xd87/config.h                 | 11 ++++-
 keyboards/xiudi/xd96/config.h                 | 23 +++++------
 keyboards/xmmx/config.h                       | 11 ++++-
 keyboards/yampad/config.h                     | 11 ++++-
 keyboards/yandrstudio/tg67/config.h           |  1 -
 keyboards/ydkb/chili/config.h                 | 11 ++++-
 keyboards/ydkb/yd68/config.h                  | 11 ++++-
 keyboards/yeehaw/config.h                     | 12 +++++-
 keyboards/yiancardesigns/gingham/config.h     | 12 ------
 keyboards/ymdk/bface/config.h                 | 11 ++++-
 keyboards/ymdk/melody96/config.h              | 11 ++++-
 keyboards/ymdk/melody96/keymaps/dvz/config.h  |  5 ++-
 keyboards/ymdk/np21/config.h                  | 22 +++++-----
 keyboards/ymdk/np24/u4rgb6/config.h           | 11 ++++-
 keyboards/ymdk/sp64/config.h                  | 11 ++++-
 keyboards/ymdk/wings/config.h                 | 13 ++++--
 keyboards/ymdk/yd60mq/config.h                | 11 ++++-
 keyboards/ymdk/ym68/config.h                  | 22 +++++-----
 keyboards/ymdk/ymd09/config.h                 | 12 +++++-
 keyboards/ymdk/ymd21/v2/config.h              | 22 +++++-----
 keyboards/ymdk/ymd40/v2/config.h              | 22 +++++-----
 keyboards/ymdk/ymd67/config.h                 | 11 ++++-
 keyboards/ymdk/ymd75/config.h                 | 11 ++++-
 keyboards/ymdk/ymd96/config.h                 | 11 ++++-
 keyboards/yoichiro/lunakey_mini/config.h      | 22 +++++-----
 keyboards/yosino58/keymaps/default/config.h   | 11 ++++-
 keyboards/yosino58/keymaps/sakura/config.h    | 11 ++++-
 keyboards/yushakobo/navpad/10/config.h        |  3 --
 .../yushakobo/navpad/10_helix_r/config.h      |  3 --
 keyboards/yushakobo/quick17/config.h          |  3 --
 keyboards/yushakobo/quick7/config.h           |  3 --
 keyboards/yynmt/dozen0/config.h               | 11 ++++-
 keyboards/yynmt/kagamidget/config.h           | 11 ++++-
 keyboards/zfrontier/big_switch/config.h       | 11 ++++-
 keyboards/zj68/config.h                       | 11 ++++-
 keyboards/zlant/config.h                      | 11 ++++-
 keyboards/zoo/wampus/config.h                 | 11 ++++-
 keyboards/zvecr/split_blackpill/config.h      | 11 ++++-
 keyboards/zvecr/zv48/config.h                 | 11 ++++-
 292 files changed, 2282 insertions(+), 1174 deletions(-)

diff --git a/keyboards/rabbit/rabbit68/config.h b/keyboards/rabbit/rabbit68/config.h
index 9a5e4781a3..4fcee98722 100644
--- a/keyboards/rabbit/rabbit68/config.h
+++ b/keyboards/rabbit/rabbit68/config.h
@@ -52,18 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index 498596eccd..791a4cafd3 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -40,7 +40,16 @@
 
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index d595f6cbf0..9cd8332e01 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -40,7 +40,16 @@
 #define RGB_DI_PIN D1
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ramonimbao/chevron/config.h b/keyboards/ramonimbao/chevron/config.h
index 4a2f1fe008..3be1c4bf03 100644
--- a/keyboards/ramonimbao/chevron/config.h
+++ b/keyboards/ramonimbao/chevron/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ramonimbao/herringbone/v1/config.h b/keyboards/ramonimbao/herringbone/v1/config.h
index cbe83f71fc..7e07c6a3c5 100644
--- a/keyboards/ramonimbao/herringbone/v1/config.h
+++ b/keyboards/ramonimbao/herringbone/v1/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ramonimbao/squishy65/config.h b/keyboards/ramonimbao/squishy65/config.h
index 1f858ffee2..8282988950 100644
--- a/keyboards/ramonimbao/squishy65/config.h
+++ b/keyboards/ramonimbao/squishy65/config.h
@@ -28,7 +28,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // RGB B4
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 18
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
diff --git a/keyboards/ramonimbao/squishyfrl/config.h b/keyboards/ramonimbao/squishyfrl/config.h
index 04e9a6039d..f850964129 100644
--- a/keyboards/ramonimbao/squishyfrl/config.h
+++ b/keyboards/ramonimbao/squishyfrl/config.h
@@ -63,19 +63,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
-/*== customize breathing effect ==*/
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE/*== 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() ====*/
diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/ramonimbao/squishytkl/config.h
index c5843a2277..f7d99f73b7 100644
--- a/keyboards/ramonimbao/squishytkl/config.h
+++ b/keyboards/ramonimbao/squishytkl/config.h
@@ -63,18 +63,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/ramonimbao/tkl_ff/config.h
index 550b2ffee0..f87953f7f0 100644
--- a/keyboards/ramonimbao/tkl_ff/config.h
+++ b/keyboards/ramonimbao/tkl_ff/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ramonimbao/tkl_ff/v2/config.h b/keyboards/ramonimbao/tkl_ff/v2/config.h
index 906f38813a..35ceb61590 100644
--- a/keyboards/ramonimbao/tkl_ff/v2/config.h
+++ b/keyboards/ramonimbao/tkl_ff/v2/config.h
@@ -28,9 +28,6 @@
 #    define RGBLIGHT_VAL_STEP 32
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ramonimbao/wete/v1/config.h b/keyboards/ramonimbao/wete/v1/config.h
index 894980edf3..d6f112233e 100644
--- a/keyboards/ramonimbao/wete/v1/config.h
+++ b/keyboards/ramonimbao/wete/v1/config.h
@@ -37,7 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // RGB B4
 #define RGB_DI_PIN B4
 #define RGBLED_NUM 24
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define SLEEP_LED_GPT_DRIVER GPTD1
 
diff --git a/keyboards/ramonimbao/wete/v2/config.h b/keyboards/ramonimbao/wete/v2/config.h
index 8aec9abb3c..b112924495 100644
--- a/keyboards/ramonimbao/wete/v2/config.h
+++ b/keyboards/ramonimbao/wete/v2/config.h
@@ -69,9 +69,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 32
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index b859a2f552..6509066662 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -44,7 +44,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 7
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index 19011f347d..71c5c96d20 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -40,7 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 11
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h
index 5994219592..934d41e7b2 100644
--- a/keyboards/rart/rartland/config.h
+++ b/keyboards/rart/rartland/config.h
@@ -58,7 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* #define RGB_DI_PIN D7 */
 /* #ifdef RGB_DI_PIN */
-/* #define RGBLIGHT_ANIMATIONS */
 /* #define RGBLED_NUM 11 */
 /* #define RGBLIGHT_HUE_STEP 8 */
 /* #define RGBLIGHT_SAT_STEP 8 */
@@ -66,4 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* #define RGBLIGHT_LIMIT_VAL 240 */
 /* #define RGBLIGHT_SLEEP */
 /* #endif */
-
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index 2db1919529..b76abd75f9 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_SCROLL_LOCK_PIN A9
 #define LED_PIN_ON_STATE 0
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 11
 #define WS2812_SPI SPID2
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index 495f6f99ba..4aa90d0d3e 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
index 155228fef6..d55d831e47 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/config.h
@@ -47,7 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#    define RGBLIGHT_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
 
 /* Bootmagic Lite key configuration */
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/rules.mk b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/rules.mk
index 1b0d208ced..46ada17912 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/rules.mk
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/rules.mk
@@ -14,7 +14,6 @@ LED_ANIMATIONS = yes        # LED animations
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    # OPT_DEFS += -DRGBLIGHT_ANIMATIONS
     OPT_DEFS += -DLED_ANIMATIONS
 endif
 
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/rules.mk b/keyboards/recompile_keys/nomu30/keymaps/like_jis/rules.mk
index b1a6026c2a..206726700e 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/rules.mk
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/rules.mk
@@ -14,7 +14,6 @@ LED_ANIMATIONS = yes        # LED animations
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    # OPT_DEFS += -DRGBLIGHT_ANIMATIONS
     OPT_DEFS += -DLED_ANIMATIONS
 endif
 
diff --git a/keyboards/rect44/config.h b/keyboards/rect44/config.h
index 19343d16a8..60571c7665 100644
--- a/keyboards/rect44/config.h
+++ b/keyboards/rect44/config.h
@@ -31,7 +31,16 @@
 
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 12
-#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/redox/keymaps/KL1RL/config.h b/keyboards/redox/keymaps/KL1RL/config.h
index 5b9a8c161c..f3f993be5c 100644
--- a/keyboards/redox/keymaps/KL1RL/config.h
+++ b/keyboards/redox/keymaps/KL1RL/config.h
@@ -25,7 +25,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/cykedev/config.h b/keyboards/redox/keymaps/cykedev/config.h
index 47bc84bd67..d93389278b 100644
--- a/keyboards/redox/keymaps/cykedev/config.h
+++ b/keyboards/redox/keymaps/cykedev/config.h
@@ -17,7 +17,16 @@
 
 #define MASTER_LEFT
 #undef  RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/default/config.h b/keyboards/redox/keymaps/default/config.h
index 39972d3e82..2a1801a78f 100644
--- a/keyboards/redox/keymaps/default/config.h
+++ b/keyboards/redox/keymaps/default/config.h
@@ -23,7 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/eightbitraptor/config.h b/keyboards/redox/keymaps/eightbitraptor/config.h
index 1810a97c9f..9697f561da 100644
--- a/keyboards/redox/keymaps/eightbitraptor/config.h
+++ b/keyboards/redox/keymaps/eightbitraptor/config.h
@@ -23,7 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/fculpo/config.h b/keyboards/redox/keymaps/fculpo/config.h
index f14e8233f6..17260ccd20 100644
--- a/keyboards/redox/keymaps/fculpo/config.h
+++ b/keyboards/redox/keymaps/fculpo/config.h
@@ -23,7 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/finex/config.h b/keyboards/redox/keymaps/finex/config.h
index bfad3bc6bf..f155c6900c 100644
--- a/keyboards/redox/keymaps/finex/config.h
+++ b/keyboards/redox/keymaps/finex/config.h
@@ -23,7 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/german/config.h b/keyboards/redox/keymaps/german/config.h
index 39972d3e82..cfb2a9378a 100644
--- a/keyboards/redox/keymaps/german/config.h
+++ b/keyboards/redox/keymaps/german/config.h
@@ -23,7 +23,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/italian/config.h b/keyboards/redox/keymaps/italian/config.h
index 39972d3e82..cfb2a9378a 100644
--- a/keyboards/redox/keymaps/italian/config.h
+++ b/keyboards/redox/keymaps/italian/config.h
@@ -23,7 +23,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/jeherve/config.h b/keyboards/redox/keymaps/jeherve/config.h
index d467cc801e..7e334aee64 100644
--- a/keyboards/redox/keymaps/jeherve/config.h
+++ b/keyboards/redox/keymaps/jeherve/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-//#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/nrichers/config.h b/keyboards/redox/keymaps/nrichers/config.h
index 39972d3e82..cfb2a9378a 100755
--- a/keyboards/redox/keymaps/nrichers/config.h
+++ b/keyboards/redox/keymaps/nrichers/config.h
@@ -23,7 +23,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/ptillemans/config.h b/keyboards/redox/keymaps/ptillemans/config.h
index 39972d3e82..cfb2a9378a 100644
--- a/keyboards/redox/keymaps/ptillemans/config.h
+++ b/keyboards/redox/keymaps/ptillemans/config.h
@@ -23,7 +23,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/tw1t611/config.h b/keyboards/redox/keymaps/tw1t611/config.h
index 894d50238a..4f50e8507b 100644
--- a/keyboards/redox/keymaps/tw1t611/config.h
+++ b/keyboards/redox/keymaps/tw1t611/config.h
@@ -6,7 +6,17 @@
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redox/keymaps/via/config.h b/keyboards/redox/keymaps/via/config.h
index 39972d3e82..cfb2a9378a 100644
--- a/keyboards/redox/keymaps/via/config.h
+++ b/keyboards/redox/keymaps/via/config.h
@@ -23,7 +23,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/redscarf_iiplus/verb/config.h b/keyboards/redscarf_iiplus/verb/config.h
index 07d3979bef..86110cb8ec 100755
--- a/keyboards/redscarf_iiplus/verb/config.h
+++ b/keyboards/redscarf_iiplus/verb/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/redscarf_iiplus/verc/config.h b/keyboards/redscarf_iiplus/verc/config.h
index 07d3979bef..86110cb8ec 100755
--- a/keyboards/redscarf_iiplus/verc/config.h
+++ b/keyboards/redscarf_iiplus/verc/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h
index 44b08645b4..6249755853 100644
--- a/keyboards/redscarf_iiplus/verd/config.h
+++ b/keyboards/redscarf_iiplus/verd/config.h
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index f2621902bf..efd54d9e81 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index aa3e5b930b..5ac76aa699 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index 4a009b053c..f343ff128c 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/config.h
@@ -47,18 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 16
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reviung/reviung34/config.h b/keyboards/reviung/reviung34/config.h
index 5bc0cf98fc..553cd52dc1 100755
--- a/keyboards/reviung/reviung34/config.h
+++ b/keyboards/reviung/reviung34/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
index b68201231f..3ac57603a6 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
@@ -27,5 +27,14 @@
   #define RGBLIGHT_LIMIT_VAL 255
   #define RGBLIGHT_SLEEP
 // /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-#endif
\ No newline at end of file
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
index b68201231f..3ac57603a6 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
@@ -27,5 +27,14 @@
   #define RGBLIGHT_LIMIT_VAL 255
   #define RGBLIGHT_SLEEP
 // /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-#endif
\ No newline at end of file
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
diff --git a/keyboards/reviung/reviung39/config.h b/keyboards/reviung/reviung39/config.h
index f6b6403ffd..2c905f4de1 100644
--- a/keyboards/reviung/reviung39/config.h
+++ b/keyboards/reviung/reviung39/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h
index 70c641fca0..d27f9ee4a8 100644
--- a/keyboards/reviung/reviung39/keymaps/default/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default/config.h
@@ -26,22 +26,20 @@
   #define RGBLIGHT_VAL_STEP 16
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
 //   /*==== use exp() and sin() ====*/
 //   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
 //   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h
index 48be04a5b1..c1f4031e50 100644
--- a/keyboards/reviung/reviung39/keymaps/default_s/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h
@@ -26,22 +26,20 @@
   #define RGBLIGHT_VAL_STEP 16
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
 //   /*==== use exp() and sin() ====*/
 //   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
 //   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
index cd201ebfbb..d27f9ee4a8 100644
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
+++ b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
@@ -26,18 +26,16 @@
   #define RGBLIGHT_VAL_STEP 16
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 0ef09997bf..57fb0770eb 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 16
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
index 920c317e4b..7d4a356308 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
@@ -17,8 +17,6 @@
 #pragma once
 #define RGBLIGHT_LAYERS
 #ifdef RGB_DI_PIN
-    // /*== all animations enable ==*/
-    //#define RGBLIGHT_ANIMATIONS
     // /*== or choose animations ==*/
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index 2e28af7a65..e7d270a7a4 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/config.h
@@ -55,18 +55,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP  16
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index fcfbe8194d..5776998912 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -48,18 +48,16 @@
 #define RGBLIGHT_VAL_STEP 16
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
index 619060d0bc..280fd92954 100644
--- a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
@@ -27,5 +27,15 @@
   #define RGBLIGHT_VAL_STEP 16
   #define RGBLIGHT_LIMIT_VAL 255
   #define RGBLIGHT_SLEEP
-  #define RGBLIGHT_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
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index cd92c3893d..269b215786 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -69,7 +69,16 @@
 #define RGB_DI_PIN B5
 #define RGBLED_NUM 98
 #define RGBLED_SPLIT { 49, 49 }
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_SPLIT RGBLED_SPLIT
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 35699147db..bb856bc1f9 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODER_RESOLUTION 4
 #define RGBLED_NUM 64
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index 50cb5b82b7..f8c07b974e 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -99,7 +99,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LED_HITS_TO_REMEMBER 5
 
-#define RGBLIGHT_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
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for Helix keyboard
diff --git a/keyboards/rgbkb/sol/keymaps/default/readme.md b/keyboards/rgbkb/sol/keymaps/default/readme.md
index 6c3dfb05f5..e31d332868 100644
--- a/keyboards/rgbkb/sol/keymaps/default/readme.md
+++ b/keyboards/rgbkb/sol/keymaps/default/readme.md
@@ -84,7 +84,6 @@ CONSOLE_ENABLE = yes        # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no
 RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
 LED_MIRRORED = yes          # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight (+8500)
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy (+1500)
diff --git a/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
index 8846907559..0399e8427a 100644
--- a/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
+++ b/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
@@ -6,7 +6,6 @@ COMMAND_ENABLE          = yes       # Commands for debug and configuration
 
 # RGB Options
 RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS     = no        # LED animations
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 RGB_MATRIX_ENABLE       = yes       # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 
diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk b/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
index 4da351f251..9100034a72 100644
--- a/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
+++ b/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
@@ -2,7 +2,6 @@
 
 # RGB Options
 RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS     = no        # LED animations
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 RGB_MATRIX_ENABLE       = yes       # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 FULLHAND_ENABLE         = no        # Enables the additional 24 Full Hand LEDs
@@ -23,4 +22,3 @@ endif
 # Do not edit past here
 
 include keyboards/$(KEYBOARD)/post_rules.mk
-
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
index bb9d58e942..073cb668f0 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
@@ -10,7 +10,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
 LED_MIRRORED = yes          # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy
diff --git a/keyboards/rgbkb/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk
index bbf4bb54fc..cef623df1a 100644
--- a/keyboards/rgbkb/sol/rev1/rules.mk
+++ b/keyboards/rgbkb/sol/rev1/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE          = no        # Commands for debug and configuration
 
 # RGB Options
 RGBLIGHT_ENABLE         = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS     = yes       # LED animations
 LED_MIRRORED            = yes       # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 
 RGB_MATRIX_ENABLE       = no        # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk
index 995a8d7f16..681a3e0993 100644
--- a/keyboards/rgbkb/sol/rev2/rules.mk
+++ b/keyboards/rgbkb/sol/rev2/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE          = no        # Commands for debug and configuration
 
 # RGB Options
 RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS     = no        # LED animations
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 
 RGB_MATRIX_ENABLE = yes             # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h b/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
index 3d3186342f..1503eac564 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
@@ -29,7 +29,16 @@
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
index 76598a3ee5..cab1aa90d3 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
@@ -26,7 +26,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
index fa8d58e6c4..ca7d19afab 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
@@ -26,7 +26,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
index 91f63a55ba..d1fbe29c53 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
@@ -24,7 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
index f0ded5f66f..93956f54c6 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
@@ -22,7 +22,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 685577b6c7..ce69b22d16 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -52,7 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGBLED_NUM 34    // Number of LEDs
-#define RGBLIGHT_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
 
 /*
  * Feature disable options
diff --git a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk
index ebbb4a4c2d..6d58650cbc 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk
@@ -4,7 +4,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no
 RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
 RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
@@ -28,10 +27,6 @@ ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
     OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
 endif
 
-ifeq ($(strip $(RGBLIGHT_ANIMATIONS)), yes)
-    OPT_DEFS += -DRGBLIGHT_ANIMATIONS
-endif
-
 ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
     OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
 endif
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default/readme.md b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
index ef7831de4a..e3e663db5d 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
+++ b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
@@ -91,7 +91,6 @@ CONSOLE_ENABLE = yes        # Console for debug(+400)
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no
 RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
 RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight (+8500)
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy (+1500)
 RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/default/rules.mk
index 465585afe0..67d60d5908 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/default/rules.mk
@@ -4,7 +4,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no
 RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
 RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
@@ -27,9 +26,6 @@ ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
     OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
 endif
 
-ifeq ($(strip $(RGBLIGHT_ANIMATIONS)), yes)
-    OPT_DEFS += -DRGBLIGHT_ANIMATIONS
-endif
 
 ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
     OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
index f914dbb26a..2eb5fbab49 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
@@ -4,7 +4,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no
 RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
 RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
@@ -28,10 +27,6 @@ ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
     OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
 endif
 
-ifeq ($(strip $(RGBLIGHT_ANIMATIONS)), yes)
-    OPT_DEFS += -DRGBLIGHT_ANIMATIONS
-endif
-
 ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
     OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
 endif
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
index c5cc34d898..b95d2edaaa 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
@@ -9,7 +9,6 @@ CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
 RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
@@ -32,10 +31,6 @@ ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
     OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
 endif
 
-ifeq ($(strip $(RGBLIGHT_ANIMATIONS)), yes)
-    OPT_DEFS += -DRGBLIGHT_ANIMATIONS
-endif
-
 ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
     OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
 endif
diff --git a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
index 0041d60426..ca9d0bc9a5 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
@@ -9,7 +9,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE = no        # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = no    # LED animations
 RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 RGB_MATRIX_ENABLE = yes  	# Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 RGB_MATRIX_DRIVER = WS2812
@@ -35,10 +34,6 @@ ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
     OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
 endif
 
-ifeq ($(strip $(RGBLIGHT_ANIMATIONS)), yes)
-    OPT_DEFS += -DRGBLIGHT_ANIMATIONS
-endif
-
 ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
     OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
 endif
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 4c5801f4cf..96598e06c7 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -49,6 +49,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLED_SPLIT { 30, 30 }
 #endif
 
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGB_MATRIX_LED_COUNT 60
 #define RGB_MATRIX_SPLIT { 30, 30 }
 
diff --git a/keyboards/rmkeebs/rm_numpad/config.h b/keyboards/rmkeebs/rm_numpad/config.h
index 1c3a48cba5..f1f7357b6e 100644
--- a/keyboards/rmkeebs/rm_numpad/config.h
+++ b/keyboards/rmkeebs/rm_numpad/config.h
@@ -69,18 +69,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index ab5cd2399f..6e0f26f62b 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/config.h
@@ -35,7 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    5
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN A4
 #define RGBLED_NUM 16
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/roseslite/config.h b/keyboards/roseslite/config.h
index f499c29de3..7836df06e9 100644
--- a/keyboards/roseslite/config.h
+++ b/keyboards/roseslite/config.h
@@ -51,18 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index 92a35f9fdd..8ce361fe10 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/config.h
@@ -47,7 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 18
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
index e6cddb0a5b..0e884adfe7 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/config.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/config.h
@@ -49,7 +49,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_SPLIT { 6, 6 }
 #endif
 
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h
index 4bb41abe19..9fd18ad98d 100644
--- a/keyboards/salicylic_acid3/7splus/config.h
+++ b/keyboards/salicylic_acid3/7splus/config.h
@@ -50,7 +50,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_SPLIT { 11, 20 }
 #endif
 
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h
index ff2bb2d47c..ab8ea13282 100644
--- a/keyboards/salicylic_acid3/ergoarrows/config.h
+++ b/keyboards/salicylic_acid3/ergoarrows/config.h
@@ -50,7 +50,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_SPLIT { 43, 43 }
 #endif
 
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 90
diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
index a039848af9..6b42998684 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 
 #define RGBLED_NUM 9    // Number of LEDs
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
index 9b30c9a242..b8ca80184d 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_SPLIT { 11, 21 }
 #endif
 
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h
index d6f57e9d7b..24c06fcc25 100644
--- a/keyboards/salicylic_acid3/nafuda/config.h
+++ b/keyboards/salicylic_acid3/nafuda/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 
 #define RGBLED_NUM 7    // Number of LEDs
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index 2cc4a46674..9f59897b00 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -48,7 +48,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_NUM 48
 #endif
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_DEFAULT_VAL 50
 
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h
index 5258cdccdb..3fe824530b 100644
--- a/keyboards/salicylic_acid3/nknl7en/config.h
+++ b/keyboards/salicylic_acid3/nknl7en/config.h
@@ -50,7 +50,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_SPLIT { 9, 12 }
 #endif
 
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
index 317f546c85..284f69ac33 100644
--- a/keyboards/salicylic_acid3/nknl7jp/config.h
+++ b/keyboards/salicylic_acid3/nknl7jp/config.h
@@ -50,7 +50,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLED_SPLIT { 9, 11 }
 #endif
 
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index 697e7a7d49..ead666ca71 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/config.h
@@ -40,7 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 
 #define RGBLED_NUM 21    // Number of LEDs
-#define RGBLIGHT_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
 
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 55dff94e3f..2968ea1d20 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -49,18 +49,6 @@
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-// #    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index da483a7cf5..e1debea5e8 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -45,16 +45,14 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255/* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
index 2c506e8bc2..8e766ff3cc 100644
--- a/keyboards/sandwich/keeb68/config.h
+++ b/keyboards/sandwich/keeb68/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index b13fd918b8..7c118e2928 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -45,18 +45,16 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 #define RGB_MATRIX_LED_COUNT 6
diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h
index a2c5cc6ec6..337c078b66 100644
--- a/keyboards/scatter42/config.h
+++ b/keyboards/scatter42/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index fb0f5d3b4a..d69f447dad 100644
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -30,6 +30,15 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN B0
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 4
 #endif
diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h
index 95d9f66318..c7f009ca96 100644
--- a/keyboards/sck/m0116b/config.h
+++ b/keyboards/sck/m0116b/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h
index 254e0a6d11..af44338fb2 100644
--- a/keyboards/sck/neiso/config.h
+++ b/keyboards/sck/neiso/config.h
@@ -58,18 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index b83eee8dd5..c5d58e387a 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 17
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
- //  #define RGBLIGHT_ANIMATIONS
- /*== or choose animations ==*/
- //#define RGBLIGHT_EFFECT_BREATHING
- //  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
- //  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
- //  #define RGBLIGHT_EFFECT_SNAKE
- //  #define RGBLIGHT_EFFECT_KNIGHT
- //  #define RGBLIGHT_EFFECT_CHRISTMAS
- //  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
- //  #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
  /*== customize breathing effect ==*/
    /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
  //  #define RGBLIGHT_BREATHE_TABLE_SIZE 128      // 256(default) or 128 or 64
diff --git a/keyboards/sekigon/grs_70ec/config.h b/keyboards/sekigon/grs_70ec/config.h
index b2e1882574..2e1edf71de 100644
--- a/keyboards/sekigon/grs_70ec/config.h
+++ b/keyboards/sekigon/grs_70ec/config.h
@@ -64,18 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h
index 48fd375b07..3822f1c3ae 100644
--- a/keyboards/sendyyeah/pix/config.h
+++ b/keyboards/sendyyeah/pix/config.h
@@ -52,7 +52,16 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
 #endif
diff --git a/keyboards/sendyyeah/pix/pix.c b/keyboards/sendyyeah/pix/pix.c
index f8d1b1c4d1..07ef088cd1 100644
--- a/keyboards/sendyyeah/pix/pix.c
+++ b/keyboards/sendyyeah/pix/pix.c
@@ -20,7 +20,7 @@ void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB underglow by default
     rgblight_sethsv(0, 255, 255);
-#ifdef RGBLIGHT_ANIMATIONS
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
     rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // Set to RGB_RAINBOW_SWIRL animation by default
 #endif
 #endif
diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index 68571b63c7..df7159a1cf 100644
--- a/keyboards/senselessclay/ck65/config.h
+++ b/keyboards/senselessclay/ck65/config.h
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/  
+*/
 
 #pragma once
 
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-/* rev0 */ 
+/* rev0 */
 #define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 }
 #define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
 
@@ -98,10 +98,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-/* RGB Backlighting */ 
+/* RGB Backlighting */
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 69
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 122
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index 724e47e797..15930cca47 100644
--- a/keyboards/senselessclay/gos65/config.h
+++ b/keyboards/senselessclay/gos65/config.h
@@ -13,7 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/  
+*/
 
 #pragma once
 
@@ -33,12 +33,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-/* rev0 */ 
+/* rev0 */
 /*
 #define MATRIX_ROW_PINS { B1, B2, F6, F5, F4 }
 #define MATRIX_COL_PINS { F1, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
 */
-/* rev1 */ 
+/* rev1 */
 #define MATRIX_ROW_PINS { B1, B2, F1, F6, F5 }
 #define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
 
@@ -103,9 +103,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-/* RGB Backlighting */ 
+/* RGB Backlighting */
 #define RGB_DI_PIN B0
 #define RGBLED_NUM 68
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 125
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
index a3b13ac2f7..5969910391 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_pad/config.h
@@ -51,18 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-  #define RGBLIGHT_EFFECT_BREATHING
-  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-  #define RGBLIGHT_EFFECT_SNAKE
-  #define RGBLIGHT_EFFECT_KNIGHT
-  #define RGBLIGHT_EFFECT_CHRISTMAS
-  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-  #define RGBLIGHT_EFFECT_RGB_TEST
-  #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index 0ab4093862..5d9f96a7a5 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -31,7 +31,16 @@
 
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index cc7fd7e753..35c2d347b7 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -18,7 +18,16 @@
 #define BACKLIGHT_LEVELS 3
 
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index 2381a7c7d1..37e960139b 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -16,7 +16,16 @@
 #define BACKLIGHT_CAPS_LOCK
 
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h
index 52dc73121e..8fda62b5cc 100644
--- a/keyboards/shambles/config.h
+++ b/keyboards/shambles/config.h
@@ -26,7 +26,16 @@
 
 
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 0
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h
index c2bb97a1cc..360c6a1d3d 100644
--- a/keyboards/shiro/config.h
+++ b/keyboards/shiro/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 5e011267f1..da8fcef7f8 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -76,9 +76,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
   //#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
index e612ba93b2..dcdcd9a59d 100644
--- a/keyboards/singa/config.h
+++ b/keyboards/singa/config.h
@@ -35,4 +35,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index de3df5afbf..67e19fe6f4 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index db7c1ab7a4..74864088e3 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h
index 7b20cd14bb..ba5bc81ff7 100644
--- a/keyboards/slz40/config.h
+++ b/keyboards/slz40/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 41b43cf683..04fa427e69 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -105,7 +105,6 @@
 #endif
 //#define RGB_DI_PIN B7
 //#ifdef RGB_DI_PIN
-//#define RGBLIGHT_ANIMATIONS
 //#define RGBLED_NUM 8
 //#define RGBLIGHT_HUE_STEP 5
 //#define RGBLIGHT_SAT_STEP 5
diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h
index 7b764cb5a4..dee30db727 100644
--- a/keyboards/smk60/config.h
+++ b/keyboards/smk60/config.h
@@ -36,7 +36,16 @@
 //rgb light setting
 #define RGBLED_NUM      4
 #define RGB_DI_PIN      E6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h
index 5e776fe52c..911e7fb172 100644
--- a/keyboards/snampad/config.h
+++ b/keyboards/snampad/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index 4f2ecec285..f5f2b632c5 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -52,7 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 90dc75d195..0806d9913d 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -55,7 +55,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index 32c567f910..5388881d0f 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -53,7 +53,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_NUM_LOCK_PIN B1
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h
index a0341e5c6b..508e4e1eff 100644
--- a/keyboards/sofle/keymaps/devdev/config.h
+++ b/keyboards/sofle/keymaps/devdev/config.h
@@ -57,7 +57,6 @@
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
 
-    //#define RGBLIGHT_ANIMATIONS
 	//#define RGBLIGHT_EFFECT_BREATHING
 	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
 	//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h
index db44250c17..e4649cc5be 100644
--- a/keyboards/sofle/keymaps/killmaster/config.h
+++ b/keyboards/sofle/keymaps/killmaster/config.h
@@ -44,9 +44,6 @@ for more options.
 #define RGB_SPLIT {36,36}
 #define RGBLIGHT_LIMIT_VAL 120
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
    //#define RGBLIGHT_EFFECT_RAINBOW_MOOD
    //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index a0341e5c6b..508e4e1eff 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -57,7 +57,6 @@
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
 
-    //#define RGBLIGHT_ANIMATIONS
 	//#define RGBLIGHT_EFFECT_BREATHING
 	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
 	//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h
index 0fb2cbf36d..2806b70b0f 100644
--- a/keyboards/sofle/keymaps/via/config.h
+++ b/keyboards/sofle/keymaps/via/config.h
@@ -33,10 +33,19 @@ for more options.
 #        define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #        define SPLIT_TRANSPORT_MIRROR
 #    else
-#        define RGBLIGHT_ANIMATIONS
+#        define RGBLIGHT_EFFECT_BREATHING
+#        define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#        define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#        define RGBLIGHT_EFFECT_SNAKE
+#        define RGBLIGHT_EFFECT_KNIGHT
+#        define RGBLIGHT_EFFECT_CHRISTMAS
+#        define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#        define RGBLIGHT_EFFECT_RGB_TEST
+#        define RGBLIGHT_EFFECT_ALTERNATING
+#        define RGBLIGHT_EFFECT_TWINKLE
 #        define RGBLIGHT_LIMIT_VAL 120
-#        define RGBLIGHT_HUE_STEP  10
-#        define RGBLIGHT_SAT_STEP  17
-#        define RGBLIGHT_VAL_STEP  17
+#        define RGBLIGHT_HUE_STEP 10
+#        define RGBLIGHT_SAT_STEP 17
+#        define RGBLIGHT_VAL_STEP 17
 #    endif
 #endif
diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h
index 10f30a7283..9092c7b924 100644
--- a/keyboards/soup10/config.h
+++ b/keyboards/soup10/config.h
@@ -63,18 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h
index 9800b3f13e..8693848b3b 100644
--- a/keyboards/soy20/config.h
+++ b/keyboards/soy20/config.h
@@ -39,7 +39,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 07b2e9fc6c..73cc391726 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -103,7 +103,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-  #define RGBLIGHT_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
 
 /* Bootmagic Lite key configuration */
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index 0d2db2c824..8bae468783 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -87,7 +87,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 210 /* The maximum brightness level */
-  #define RGBLIGHT_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
 
 /* Bootmagic Lite key configuration */
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index 14e305f2ab..d0c1908a80 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/spacey/config.h b/keyboards/spacey/config.h
index 9e13e086ee..477a79f32a 100644
--- a/keyboards/spacey/config.h
+++ b/keyboards/spacey/config.h
@@ -67,18 +67,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h
index 7d10b50460..d31e9a788f 100644
--- a/keyboards/specskeys/config.h
+++ b/keyboards/specskeys/config.h
@@ -61,18 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/config.h b/keyboards/splitkb/kyria/keymaps/asapjockey/config.h
index acb0703590..32d8bb7611 100644
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/config.h
+++ b/keyboards/splitkb/kyria/keymaps/asapjockey/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/benji/config.h b/keyboards/splitkb/kyria/keymaps/benji/config.h
index 8b29f9e136..5481f82e5d 100644
--- a/keyboards/splitkb/kyria/keymaps/benji/config.h
+++ b/keyboards/splitkb/kyria/keymaps/benji/config.h
@@ -22,7 +22,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/config.h b/keyboards/splitkb/kyria/keymaps/cjuniet/config.h
index 8b63c1f583..0643536330 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/config.h
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/config.h
@@ -22,7 +22,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/config.h b/keyboards/splitkb/kyria/keymaps/corodiak/config.h
index 3f031b69ff..5738773f8d 100644
--- a/keyboards/splitkb/kyria/keymaps/corodiak/config.h
+++ b/keyboards/splitkb/kyria/keymaps/corodiak/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
index 59994e01fa..1fa51f23f1 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
@@ -21,7 +21,6 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  //#define RGBLIGHT_ANIMATIONS
   //#define RGBLIGHT_EFFECT_ALTERNATING
   #define RGBLIGHT_EFFECT_BREATHING
   //#define RGBLIGHT_EFFECT_CHRISTMAS
diff --git a/keyboards/splitkb/kyria/keymaps/default/config.h b/keyboards/splitkb/kyria/keymaps/default/config.h
index f989d67408..11c2acc40d 100644
--- a/keyboards/splitkb/kyria/keymaps/default/config.h
+++ b/keyboards/splitkb/kyria/keymaps/default/config.h
@@ -17,10 +17,19 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLIGHT_HUE_STEP  8
-#    define RGBLIGHT_SAT_STEP  8
-#    define RGBLIGHT_VAL_STEP  8
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 150
 #endif
 
diff --git a/keyboards/splitkb/kyria/keymaps/ghidalgo93/config.h b/keyboards/splitkb/kyria/keymaps/ghidalgo93/config.h
index 89ec73f0a6..4efed7cade 100644
--- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/config.h
+++ b/keyboards/splitkb/kyria/keymaps/ghidalgo93/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
@@ -36,6 +45,3 @@
 
 //allows for either side as the master.
 #define EE_HANDS
-
-
-
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
index ee07f52ff1..453d19ab3b 100644
--- a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
@@ -2,7 +2,6 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-RGBLIGHT_ANIMATIONS = yes
 WPM_ENABLE = yes
 MOUSEKEY_ENABLE = no
 
diff --git a/keyboards/splitkb/kyria/keymaps/kejadlen/config.h b/keyboards/splitkb/kyria/keymaps/kejadlen/config.h
index 673bcc778f..0e2fd449da 100644
--- a/keyboards/splitkb/kyria/keymaps/kejadlen/config.h
+++ b/keyboards/splitkb/kyria/keymaps/kejadlen/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h b/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
index a64a49b87d..003e21ca5c 100644
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
@@ -37,10 +37,18 @@
 
 // RGB settings -if applicable-
 #ifdef RGBLIGHT_ENABLE
-    #undef  RGBLIGHT_ANIMATIONS
-
     #define RGBLIGHT_EFFECT_BREATHING
 
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
     #define RGBLIGHT_HUE_STEP        2
     #define RGBLIGHT_SAT_STEP        2
     #define RGBLIGHT_VAL_STEP        2
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/config.h b/keyboards/splitkb/kyria/keymaps/mattir/config.h
index b65ceee403..40b6f4434e 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir/config.h
+++ b/keyboards/splitkb/kyria/keymaps/mattir/config.h
@@ -24,7 +24,16 @@
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLIGHT_LIMIT_VAL 150
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
index 8bd27105e6..816dd16312 100644
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
+++ b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
@@ -62,4 +71,3 @@
 #define MOUSEKEY_WHEEL_INTERVAL 50
 // The default is 40
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/config.h b/keyboards/splitkb/kyria/keymaps/plattfot/config.h
index bb13d365f1..96447d0c4c 100644
--- a/keyboards/splitkb/kyria/keymaps/plattfot/config.h
+++ b/keyboards/splitkb/kyria/keymaps/plattfot/config.h
@@ -22,7 +22,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
@@ -41,4 +50,3 @@
 // Remove the delay for the OSL keys. Not using any other tap keys.
 // Otherwise TAPPING_TERM_PER_KEY would be the way to go.
 #define TAPPING_TERM 0
-
diff --git a/keyboards/splitkb/kyria/keymaps/rmw/config.h b/keyboards/splitkb/kyria/keymaps/rmw/config.h
index 57f2522632..bb085106c6 100644
--- a/keyboards/splitkb/kyria/keymaps/rmw/config.h
+++ b/keyboards/splitkb/kyria/keymaps/rmw/config.h
@@ -23,7 +23,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
@@ -32,5 +41,3 @@
 // If you are using an Elite C rev3 on the follower side, uncomment the lines below:
 // #define SPLIT_USB_DETECT
 // #define NO_USB_STARTUP_CHECK
-
-
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/config.h b/keyboards/splitkb/kyria/keymaps/shinze/config.h
index 0d1e0b8371..f722e8b8e0 100644
--- a/keyboards/splitkb/kyria/keymaps/shinze/config.h
+++ b/keyboards/splitkb/kyria/keymaps/shinze/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/config.h b/keyboards/splitkb/kyria/keymaps/tessachka/config.h
index 3fc508542c..1309aec028 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/config.h
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/config.h b/keyboards/splitkb/kyria/keymaps/thomasbaart/config.h
index acb0703590..32d8bb7611 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/config.h
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/config.h
@@ -21,7 +21,16 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/config.h b/keyboards/splitkb/kyria/keymaps/uqs/config.h
index ae34b0e04d..05ba801df4 100644
--- a/keyboards/splitkb/kyria/keymaps/uqs/config.h
+++ b/keyboards/splitkb/kyria/keymaps/uqs/config.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-  //#define RGBLIGHT_ANIMATIONS
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h
index 555975b02d..28b8bd1ed6 100644
--- a/keyboards/stello65/beta/config.h
+++ b/keyboards/stello65/beta/config.h
@@ -60,18 +60,6 @@
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h
index 13e54db7bc..f7471ffa05 100644
--- a/keyboards/stratos/config.h
+++ b/keyboards/stratos/config.h
@@ -42,5 +42,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_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
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index beb88e69ab..6e02763997 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -37,18 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
    #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index 2031595fec..3ce1849bd8 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/config.h
@@ -36,7 +36,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B7
 #ifdef  RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index 5e3724c330..d993bf0132 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -44,25 +44,23 @@
 
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 9
-#define RGBLIGHT_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
+
 // #ifdef RGB_DI_PIN
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h
index 5dcdad12e5..2653ab0a49 100755
--- a/keyboards/tada68/keymaps/rgb/config.h
+++ b/keyboards/tada68/keymaps/rgb/config.h
@@ -2,8 +2,17 @@
 
 /* WS2812B RGB Underglow LED */
 #define RGB_DI_PIN F5   // See readme.md for wiring your led's
-#define RGBLIGHT_ANIMATIONS       
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 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
\ No newline at end of file
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h b/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
index faf175a8f3..326b121259 100644
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
+++ b/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
@@ -20,4 +20,13 @@
 #define MASTER_RIGHT
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_SPLIT { 8, 8 }
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index 22d86c3bfa..33d89616ca 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -41,12 +41,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F4
 #define RGBLED_NUM 4
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 
-//#define BACKLIGHT_PIN F4 
+//#define BACKLIGHT_PIN F4
 //#define BACKLIGHT_BREATHING
 //#define BACKLIGHT_LEVELS 1
 
diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index 8ba5a6a6bb..612d9a460e 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -41,12 +41,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D4
 #define RGBLED_NUM 8
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 
-//#define BACKLIGHT_PIN F4 
+//#define BACKLIGHT_PIN F4
 //#define BACKLIGHT_BREATHING
 //#define BACKLIGHT_LEVELS 1
 
diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
index 3eb84cc6b3..7064c690bb 100644
--- a/keyboards/takashiski/otaku_split/rev0/config.h
+++ b/keyboards/takashiski/otaku_split/rev0/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* key matrix size */
-#define MATRIX_ROWS 10 
+#define MATRIX_ROWS 10
 #define MATRIX_COLS 8
 
 /*
@@ -56,18 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
index 099f20f5d0..eb4b2d35dc 100644
--- a/keyboards/takashiski/otaku_split/rev1/config.h
+++ b/keyboards/takashiski/otaku_split/rev1/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* key matrix size */
-#define MATRIX_ROWS 10 
+#define MATRIX_ROWS 10
 #define MATRIX_COLS 8
 
 
@@ -60,18 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
index c3d229bfc7..36beeaefa6 100644
--- a/keyboards/taleguers/taleguers75/config.h
+++ b/keyboards/taleguers/taleguers75/config.h
@@ -50,7 +50,16 @@
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6
 #define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0 }
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index 52ecb78365..5953b90249 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index d021cdb21b..be163fb5cb 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB Lighting */
 #define RGB_DI_PIN C6
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 8
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
index 20357786eb..9dc2e462bd 100644
--- a/keyboards/technika/config.h
+++ b/keyboards/technika/config.h
@@ -40,7 +40,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
 
 #define LED_NUM_LOCK_PIN A15
 #define LED_CAPS_LOCK_PIN B3
diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h
index 3be9c91d2e..3fe8542ce8 100644
--- a/keyboards/tenki/config.h
+++ b/keyboards/tenki/config.h
@@ -24,7 +24,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 3   // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
index a9e539fb00..a2dd6ff652 100755
--- a/keyboards/tetris/config.h
+++ b/keyboards/tetris/config.h
@@ -32,7 +32,16 @@
 #define ENCODERS_PAD_B { D0,F0 }
 
 #define RGB_DI_PIN F5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 #define RGBLED_NUM 47
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 4fc734fb0f..1590c3f4e4 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h
index 9a12407b35..014d20c76b 100644
--- a/keyboards/tgr/910/config.h
+++ b/keyboards/tgr/910/config.h
@@ -38,7 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLIGHT_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
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
index a7b88609c3..fc4ea92733 100644
--- a/keyboards/tgr/910ce/config.h
+++ b/keyboards/tgr/910ce/config.h
@@ -35,4 +35,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h
index c5824fb12b..9373bb2b9c 100644
--- a/keyboards/tgr/alice/config.h
+++ b/keyboards/tgr/alice/config.h
@@ -33,4 +33,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 
 #define RGBLED_NUM 18
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h
index eed74f07e0..2b73b68d95 100644
--- a/keyboards/tgr/tris/config.h
+++ b/keyboards/tgr/tris/config.h
@@ -34,7 +34,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 
 #define RGBLED_NUM 6
-#define RGBLIGHT_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
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
index 20fbae923f..b2b5d77c83 100644
--- a/keyboards/the_royal/schwann/config.h
+++ b/keyboards/the_royal/schwann/config.h
@@ -24,7 +24,16 @@
 #define RGB_DI_PIN B3
 #define RGBLED_NUM 8    // Number of LEDs
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 6
 #define RGBLIGHT_SAT_STEP 4
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/the_uni/rp_2040/config.h b/keyboards/the_uni/rp_2040/config.h
index a083ee20b7..b14a6ea2d2 100644
--- a/keyboards/the_uni/rp_2040/config.h
+++ b/keyboards/the_uni/rp_2040/config.h
@@ -49,7 +49,6 @@
 
 
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 0
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
index 572d332a54..953f43d4e7 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/config.h
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 4
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_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
 /*Encoders */
 #define ENCODERS_PAD_A { D0 }
 #define ENCODERS_PAD_B { D1 }
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
index 572d332a54..953f43d4e7 100644
--- a/keyboards/themadnoodle/noodlepad/config.h
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -31,7 +31,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 4
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_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
 /*Encoders */
 #define ENCODERS_PAD_A { D0 }
 #define ENCODERS_PAD_B { D1 }
diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h
index c0f6ac5811..f2262b4c44 100644
--- a/keyboards/thevankeyboards/jetvan/config.h
+++ b/keyboards/thevankeyboards/jetvan/config.h
@@ -55,7 +55,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Define RGB Underglow */
 #define RGB_DI_PIN D0
 #define RGBLED_NUM 10
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk
index 14e9b00763..ee773b7e0a 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/rules.mk
@@ -20,6 +20,5 @@ TAP_DANCE_ENABLE = yes
 LED_ANIMATIONS = yes        # LED animations
 
 ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    # OPT_DEFS += -DRGBLIGHT_ANIMATIONS
     OPT_DEFS += -DLED_ANIMATIONS
 endif
diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h
index f2c124b7fe..0b2f63c028 100644
--- a/keyboards/tkc/godspeed75/config.h
+++ b/keyboards/tkc/godspeed75/config.h
@@ -73,4 +73,13 @@
 
 #define RGB_DI_PIN A13
 #define RGBLED_NUM 14
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index b8a60d8693..3f57b2089b 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 10
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index 199954527b..d8c6bc8e2e 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/config.h
@@ -56,18 +56,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 17
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
- /*== or choose animations ==*/
- //#define RGBLIGHT_EFFECT_BREATHING
- //  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
- //  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
- //  #define RGBLIGHT_EFFECT_SNAKE
- //  #define RGBLIGHT_EFFECT_KNIGHT
- //  #define RGBLIGHT_EFFECT_CHRISTMAS
- //  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
- //  #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
  /*== customize breathing effect ==*/
    /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
  //  #define RGBLIGHT_BREATHE_TABLE_SIZE 128      // 256(default) or 128 or 64
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index d88d390b8f..f76c87ec3e 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underlight configuration
  */
 #define RGB_DI_PIN D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 30     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 5
 #define RGBLIGHT_SAT_STEP 10
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 5d34276336..b8c603c043 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -58,18 +58,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index 76a3de1bab..bba77cfcd4 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -41,7 +41,16 @@
 #define RGBLED_NUM 16
 #define RGBLED_SPLIT { 8,8 }
 #define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 989cc1a76e..dd145ccf42 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 Thys de Wet 
+/* Copyright 2020 Thys de Wet
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,16 @@
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 13
 #define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index 115a652ac8..94e730b9cb 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/config.h
@@ -52,18 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-  // #define RGBLIGHT_EFFECT_BREATHING
-  // #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-  // #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-  // #define RGBLIGHT_EFFECT_SNAKE
-  // #define RGBLIGHT_EFFECT_KNIGHT
-  // #define RGBLIGHT_EFFECT_CHRISTMAS
-  // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-  // #define RGBLIGHT_EFFECT_RGB_TEST
-  // #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
index 92c2f06e59..4b8fa6ad46 100644
--- a/keyboards/toad/config.h
+++ b/keyboards/toad/config.h
@@ -27,7 +27,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h
index 9557f130c9..bd92e9ed3d 100644
--- a/keyboards/tokyokeyboard/alix40/config.h
+++ b/keyboards/tokyokeyboard/alix40/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index ab36ab7354..08d38edb46 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -33,7 +33,16 @@
 
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h
index f6fed063c5..f29502bcd4 100644
--- a/keyboards/tominabox1/le_chiffre/config.h
+++ b/keyboards/tominabox1/le_chiffre/config.h
@@ -41,7 +41,16 @@
 
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
-#define RGBLIGHT_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
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h
index 9dc105c867..06ea19374a 100644
--- a/keyboards/tominabox1/qaz/config.h
+++ b/keyboards/tominabox1/qaz/config.h
@@ -33,7 +33,16 @@
 #define RGB_DI_PIN F7
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 21
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
index c6031c86d4..999c882a71 100644
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ b/keyboards/tominabox1/underscore33/rev2/config.h
@@ -49,6 +49,14 @@
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D6
    #define RGBLED_NUM 12
-   #define RGBLIGHT_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
-
diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h
index d252e799a3..8558fb00a3 100644
--- a/keyboards/tr60w/config.h
+++ b/keyboards/tr60w/config.h
@@ -30,7 +30,16 @@
 
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h
index 20e79e5c1c..7bee062c77 100644
--- a/keyboards/trashman/ketch/config.h
+++ b/keyboards/trashman/ketch/config.h
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -33,6 +33,15 @@ SOFTWARE.
 #define USB_MAX_POWER_CONSUMPTION 100
 #define RGB_DI_PIN F4
 #define RGBLED_NUM 10
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
 #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h
index 31a5602c71..87f507ec3c 100644
--- a/keyboards/treasure/type9/config.h
+++ b/keyboards/treasure/type9/config.h
@@ -45,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
-// #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index ba3d30a6bb..9c0c61a72b 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -59,18 +59,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
- /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h
index 04d50fe24a..d5291300fc 100644
--- a/keyboards/tunks/ergo33/config.h
+++ b/keyboards/tunks/ergo33/config.h
@@ -1,17 +1,17 @@
-/* Copyright 2020 Mika Kuitunen 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Mika Kuitunen
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
 #pragma once
@@ -36,7 +36,16 @@
 
 /* Underglow + top RGB configuration */
 #define RGB_DI_PIN D4
-#define RGBLIGHT_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
 
 #if !defined(RGBLED_NUM)
 /* RGB LED count
diff --git a/keyboards/tunks/ergo33/keymaps/default/config.h b/keyboards/tunks/ergo33/keymaps/default/config.h
index 0fd2ef93a4..33edf0b03c 100644
--- a/keyboards/tunks/ergo33/keymaps/default/config.h
+++ b/keyboards/tunks/ergo33/keymaps/default/config.h
@@ -1,17 +1,17 @@
-/* Copyright 2020 Mika Kuitunen 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Mika Kuitunen
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
 #pragma once
@@ -21,6 +21,15 @@
  * External LED PCB: 14
  */
 #define RGBLED_NUM 14
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LAYERS
-#define RGBLIGHT_SLEEP
\ No newline at end of file
+#define RGBLIGHT_SLEEP
diff --git a/keyboards/tunks/ergo33/keymaps/rgb/config.h b/keyboards/tunks/ergo33/keymaps/rgb/config.h
index e2c8883ed4..60cee638d2 100644
--- a/keyboards/tunks/ergo33/keymaps/rgb/config.h
+++ b/keyboards/tunks/ergo33/keymaps/rgb/config.h
@@ -1,17 +1,17 @@
-/* Copyright 2020 Mika Kuitunen 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Mika Kuitunen
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
 #pragma once
@@ -24,4 +24,13 @@
 #    undef RGBLED_NUM
 #    define RGBLED_NUM 10
 #endif
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h
index c813f740d3..c95af8592d 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/tw40/config.h
@@ -29,7 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 15
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define DEBOUNCE 5
 
diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
index 7ff07ad42f..f8c7627715 100644
--- a/keyboards/uk78/config.h
+++ b/keyboards/uk78/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812b options */
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
index 1e59a0dcc3..006b8e8e9e 100644
--- a/keyboards/unikeyboard/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
@@ -39,18 +39,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h
index 8108713e11..7ee5c8001c 100644
--- a/keyboards/unikorn/config.h
+++ b/keyboards/unikorn/config.h
@@ -36,5 +36,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 17
-#define RGBLIGHT_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
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index bd9bba276d..07ce465b13 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -60,9 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LAYERS
   // #define RGBLIGHT_MAX_LAYERS 2
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-  /*== all animations enable ==*/
-  // #define RGBLIGHT_ANIMATIONS
-  /*== or choose animations ==*/
   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h
index f7a1ad9f03..b88cff7227 100644
--- a/keyboards/uranuma/config.h
+++ b/keyboards/uranuma/config.h
@@ -39,18 +39,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // /*== customize breathing effect ==*/
 //   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index 7e97b8542c..af44aaaa73 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -1,18 +1,18 @@
 /* Copyright 2021 UTDKeyboard & Dominic Gan
- * 
- * this program is free software: you can redistribute it and/or modify 
- * it under the terms of the gnu general public license as published by 
- * the free software foundation, either version 2 of the license, or 
- * (at your option) any later version. 
- * 
- * this program is distributed in the hope that it will be useful, 
- * but without any warranty; without even the implied warranty of 
- * merchantability or fitness for a particular purpose.  see the 
- * gnu general public license for more details. 
- * 
- * you should have received a copy of the gnu general public license 
- * along with this program.  if not, see <http://www.gnu.org/licenses/>. 
- */ 
+ *
+ * this program is free software: you can redistribute it and/or modify
+ * it under the terms of the gnu general public license as published by
+ * the free software foundation, either version 2 of the license, or
+ * (at your option) any later version.
+ *
+ * this program is distributed in the hope that it will be useful,
+ * but without any warranty; without even the implied warranty of
+ * merchantability or fitness for a particular purpose.  see the
+ * gnu general public license for more details.
+ *
+ * you should have received a copy of the gnu general public license
+ * along with this program.  if not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 
 #include "config_common.h"
@@ -52,7 +52,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index 7513eed22d..1246efe1c4 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define RGB_DI_PIN 0
 #define RGBLED_NUM 1
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_STEP 16
 
 #define RGB_RED_PIN PF6
diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
index fd0872f69e..7fe3563de8 100644
--- a/keyboards/viktus/omnikey_bh/config.h
+++ b/keyboards/viktus/omnikey_bh/config.h
@@ -26,7 +26,16 @@
 #define FORCE_NKRO
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
index 813079bd9f..b91b3b4199 100644
--- a/keyboards/viktus/z150_bh/config.h
+++ b/keyboards/viktus/z150_bh/config.h
@@ -30,7 +30,16 @@
 #define FORCE_NKRO
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index 0a32ba8c47..44622b28e7 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -54,7 +54,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN F0
 
 #define RGBLED_NUM 16    // Number of LEDs
-#define RGBLIGHT_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
 
 /* Audio settings */
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h
index fff3e9cccf..2a833f4e76 100644
--- a/keyboards/vitamins_included/rev2/config.h
+++ b/keyboards/vitamins_included/rev2/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN F0
 
 #define RGBLED_NUM 12
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_SPLIT { 6, 6 }
 
 /* Audio settings */
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index 965f9d1893..25b9af083b 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -61,7 +61,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // RGB LED
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index a162ff514c..a5f29868ca 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -43,7 +43,16 @@
 
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index a28b7c51c9..775dd4b257 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -32,7 +32,16 @@
 
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h
index 03e179bb32..70b4f1c16e 100644
--- a/keyboards/wekey/polaris/config.h
+++ b/keyboards/wekey/polaris/config.h
@@ -62,18 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index 67428d5dec..bdee171b25 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -141,18 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_VAL_STEP 8
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index a10c05a926..37946d27b3 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -46,18 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 12
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-   #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//  #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
 #define RGBW
 
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
index c1a132e713..065b8f5233 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
@@ -33,7 +33,6 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 [...]
 #define RGB_DI_PIN F7
 #define RGBLED_NUM 15        // Change this number to the amount of LEDs on the strip you soldered
-#define RGBLIGHT_ANIMATIONS
 [...]
 ```
 To control the RGB color, animation, etc. you need to add the appropriate keycodes to your keymap. Either see [my keymap](./keymap.c) or the [official QMK documentation](https://docs.qmk.fm/#/feature_rgblight?id=keycodes) for references.
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index 5041802a23..d042fa7740 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -68,5 +68,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 12
    #define RGBLIGHT_LIMIT_VAL 255
    #define RGBLIGHT_SLEEP
-   #define RGBLIGHT_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
diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h
index fbcfdc77ba..d75e258889 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/config.h
@@ -52,5 +52,14 @@
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_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
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
index edddf1c58f..8688892e59 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
@@ -37,7 +37,6 @@ You might find the [**full PCB image**](https://cdn.shopify.com/s/files/1/0490/7
     ```c
     // Set up RGB underglow.
     #define RGB_DI_PIN B0          // The pin your RGB strip is wired to
-    #define RGBLIGHT_ANIMATIONS    // Require for fancier stuff (not compatible with audio)
     #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
@@ -77,4 +76,4 @@ USB 2.0 ports on laptops provide up to 500mA max, but USB 3.0 ports can provide
 * [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)
\ No newline at end of file
+* [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
index 64aaece501..b106ebc181 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
@@ -21,7 +21,16 @@
 
 // Set up RGB underglow.
 #define RGB_DI_PIN B0          // The pin your RGB strip is wired to
-#define RGBLIGHT_ANIMATIONS    // Require for fancier stuff (not compatible with audio)
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define 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
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index 71c86f0534..9045a2bef0 100644
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -33,7 +33,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_SCROLL_LOCK_PIN D6
 
 #define RGBLED_NUM 16
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h
index 8c514fb8a2..f8901aedd7 100644
--- a/keyboards/winkeyless/bmini/config.h
+++ b/keyboards/winkeyless/bmini/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_CAPS_LOCK_PIN D1
 #define LED_SCROLL_LOCK_PIN D6
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
index 221aaa2bc7..1ad39401ca 100644
--- a/keyboards/winkeyless/bminiex/config.h
+++ b/keyboards/winkeyless/bminiex/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_CAPS_LOCK_PIN D1
 #define LED_SCROLL_LOCK_PIN D6
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index fe338a87ca..6b8a58f4cc 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-//                         0    1    2    3    4     5   6   7    8     9   A   B  C   D   E  
+//                         0    1    2    3    4     5   6   7    8     9   A   B  C   D   E
 #define MATRIX_ROW_PINS { C4,  A7,  A6,  A5,  A4 }
 #define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, C6, C10, C11, C12, D2, B5, B6, B7, B8 }
 
@@ -36,7 +36,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN A3
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 18
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index edb6b318b6..d8692711c4 100755
--- a/keyboards/woodkeys/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/config.h
@@ -40,7 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #ifdef RGBLIGHT_LIMIT_VAL
 #undef RGBLIGHT_LIMIT_VAL
diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index 6cbad09abf..af04a93d7c 100755
--- a/keyboards/woodkeys/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/config.h
@@ -40,7 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #ifdef RGBLIGHT_LIMIT_VAL
 #undef RGBLIGHT_LIMIT_VAL
diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index b6d6997a96..9b1eab3d17 100755
--- a/keyboards/woodkeys/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/config.h
@@ -40,7 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 11
 #ifdef RGBLIGHT_LIMIT_VAL
 #undef RGBLIGHT_LIMIT_VAL
diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index fa8ff3ff4a..9ee685fa1d 100755
--- a/keyboards/woodkeys/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/config.h
@@ -40,7 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #ifdef RGBLIGHT_LIMIT_VAL
 #undef RGBLIGHT_LIMIT_VAL
diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index 51b096d361..14b47a0567 100644
--- a/keyboards/woodkeys/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/config.h
@@ -28,7 +28,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8    // Number of LEDs
 #endif
 
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index 8957b1e6b3..61bba0f8d2 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -43,7 +43,16 @@
 
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 5
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index 993ddde53d..31b350758f 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -40,7 +40,16 @@
 
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h
index 61d2c33f79..dc47d04d45 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -17,7 +17,16 @@
 
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -41,9 +50,3 @@
  * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
  */
 #define GRAVE_ESC_CTRL_OVERRIDE
-
-
-
-
-
-
diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h
index fec6e57d03..229d1cccc8 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -16,7 +16,16 @@
 
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 7
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -34,4 +43,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h
index bb66f98017..9fde98cec6 100644
--- a/keyboards/wsk/houndstooth/config.h
+++ b/keyboards/wsk/houndstooth/config.h
@@ -24,10 +24,8 @@
 
 #define RGB_DI_PIN F1
 //#ifdef RGB_DI_PIN
-//#define RGBLIGHT_ANIMATIONS
 //#define RGBLED_NUM 0
 //#define RGBLIGHT_HUE_STEP 8
 //#define RGBLIGHT_SAT_STEP 8
 //#define RGBLIGHT_VAL_STEP 8
 //#endif
-
diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h
index 03f1517d6e..85b132bcd3 100644
--- a/keyboards/wsk/jerkin/config.h
+++ b/keyboards/wsk/jerkin/config.h
@@ -23,7 +23,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index c67c3424f9..59bafe4eb7 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -30,10 +30,18 @@
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h
index be0f58a7dc..bdb41e4fcb 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -30,10 +30,18 @@
 
 #define RGB_DI_PIN D1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index 85edfa3455..6da2f5998c 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -40,10 +40,18 @@
 
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index e75b49ce4d..c9cc70453b 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -30,10 +30,18 @@
 
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h
index 13ce461b04..6e0b4fc7f5 100644
--- a/keyboards/wuque/ikki68/config.h
+++ b/keyboards/wuque/ikki68/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
 #define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6,F7 }
 
-#define DIODE_DIRECTION COL2ROW 
+#define DIODE_DIRECTION COL2ROW
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
@@ -46,16 +46,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*======= RGB function=======*/
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index fccd5bd8ef..6671fbf754 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -50,16 +50,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*======= RGB function=======*/
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h
index d1545ced61..9c66ec4bc6 100644
--- a/keyboards/x16/config.h
+++ b/keyboards/x16/config.h
@@ -49,7 +49,6 @@
 
 // #define RGB_DI_PIN E2
 // #define RGBLED_NUM 4
-// #define RGBLIGHT_ANIMATIONS
 // #ifdef RGB_DI_PIN
 //   #define RGBLED_NUM 16
 //   #define RGBLIGHT_HUE_STEP 8
@@ -57,9 +56,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
 //   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index 9a1eddcd28..c4df7561c6 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -29,7 +29,16 @@
 /* RGB Lighting */
 #define RGB_DI_PIN B0
 #define RGBLED_NUM 23
-#define RGBLIGHT_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
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index 7f49c299af..999480ab75 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -27,7 +27,16 @@
 /* RGB Underglow */
 #define RGB_DI_PIN A10
 #define RGBLED_NUM 26
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 200
 
 // PWM RGB Underglow Defines
@@ -49,4 +58,4 @@
 
 #define LED_CAPS_LOCK_PIN A2
 #define LED_SCROLL_LOCK_PIN A13
-#define LED_PIN_ON_STATE 1
\ No newline at end of file
+#define LED_PIN_ON_STATE 1
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
index 96e4835996..d5ed8f0e66 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -29,7 +29,16 @@
 /* RGB Underglow */
 #define RGB_DI_PIN B0
 #define RGBLED_NUM 28
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 200
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index d5e8642e59..734099e168 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -51,7 +51,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  * F6 PIN for XD60v2 that has pre-soldered WS2812 LEDs
  */
 #define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index 243630c76b..9044a538f2 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -51,7 +51,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  * F6 PIN for XD60v3 that has pre-soldered LEDs
  */
 #define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index ef3cae310b..c88be46173 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -98,7 +98,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // ws2812 options
 #define RGB_DI_PIN F6 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12 // number of LEDs
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 7080a2ca8b..34876372b2 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -52,18 +52,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 12
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
index ebd1bf35b4..bb939188ca 100644
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
+++ b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
@@ -28,4 +28,13 @@
 #define TAPPING_TERM 175
 
 #define BACKLIGHT_BREATHING
-#undef  RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/xiudi/xd75/keymaps/ericgebhart/config.h b/keyboards/xiudi/xd75/keymaps/ericgebhart/config.h
index 77f83e83fd..68baabaf92 100644
--- a/keyboards/xiudi/xd75/keymaps/ericgebhart/config.h
+++ b/keyboards/xiudi/xd75/keymaps/ericgebhart/config.h
@@ -4,7 +4,16 @@
 #define RGBLED_NUM 6
 #define RGBLIGHT_LAYERS
 
-#undef RGBLIGHT_ANIMATIONS
+#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
 //#define RGBLIGHT_HUE_STEP 8
 //#define RGBLIGHT_SAT_STEP 8
 
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 0131e0dfa3..10f24bc977 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -48,25 +48,22 @@
 
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 7
-#define RGBLIGHT_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
 // #ifdef RGB_DI_PIN
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 3c43fb79ff..1ac67535ea 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -38,18 +38,16 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index c6b4a0a682..2b8885effe 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -51,7 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 8665cc5776..88de1c67c6 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -48,7 +48,16 @@
 
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 16
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 50
 // #ifdef RGB_DI_PIN
 //   #define RGBLIGHT_HUE_STEP 8
@@ -56,18 +65,6 @@
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index 9a94680889..2a0631b683 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -27,7 +27,16 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h
index 4ba5d76c53..c471d65024 100644
--- a/keyboards/yampad/config.h
+++ b/keyboards/yampad/config.h
@@ -42,7 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underlight configuration */
 #define RGB_DI_PIN F4
 #define RGBLED_NUM 9
-#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 2
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index d4ef221dee..b2431df36c 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -42,7 +42,6 @@
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGBLIGHT_ANIMATIONS
 
 #   define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #   define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index bb54f28e6e..ca237e8347 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underlight configuration
  */
 #define RGB_DI_PIN B3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 30     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 5
 #define RGBLIGHT_SAT_STEP 10
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index d1bd8bb1ca..ad42b363c2 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -48,7 +48,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h
index 08dd91c12c..7bbf6be429 100644
--- a/keyboards/yeehaw/config.h
+++ b/keyboards/yeehaw/config.h
@@ -37,6 +37,14 @@
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/yiancardesigns/gingham/config.h b/keyboards/yiancardesigns/gingham/config.h
index 34f8cb600e..beb7435732 100644
--- a/keyboards/yiancardesigns/gingham/config.h
+++ b/keyboards/yiancardesigns/gingham/config.h
@@ -61,18 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_VAL_STEP 8
 //   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
 // #endif
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h
index f43f5b5dc1..f93e8bce31 100644
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN       D4
 #define BACKLIGHT_LEVELS    6
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index 627a4850eb..d7bebae052 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -39,7 +39,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ymdk/melody96/keymaps/dvz/config.h b/keyboards/ymdk/melody96/keymaps/dvz/config.h
index be786464bc..78b95df64e 100644
--- a/keyboards/ymdk/melody96/keymaps/dvz/config.h
+++ b/keyboards/ymdk/melody96/keymaps/dvz/config.h
@@ -24,7 +24,6 @@
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
 
-#undef RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -32,3 +31,7 @@
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_TWINKLE
 
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h
index 619ec1ce60..e72d79dafc 100644
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -51,18 +51,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define RGBLIGHT_VAL_STEP 8
 //#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#define RGBLIGHT_EFFECT_BREATHING
-//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#define RGBLIGHT_EFFECT_SNAKE
-//#define RGBLIGHT_EFFECT_KNIGHT
-//#define RGBLIGHT_EFFECT_CHRISTMAS
-//#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#define RGBLIGHT_EFFECT_RGB_TEST
-//#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
index 862f8822ce..08df0fa144 100644
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ b/keyboards/ymdk/np24/u4rgb6/config.h
@@ -44,5 +44,14 @@
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 # define RGBLED_NUM 6
-# define RGBLIGHT_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
diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h
index 61772c6d04..19e416da8f 100644
--- a/keyboards/ymdk/sp64/config.h
+++ b/keyboards/ymdk/sp64/config.h
@@ -36,4 +36,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 250 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index 8c959b062e..b8aeb2448f 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -46,7 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 14
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -54,5 +63,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 
 #endif
-
-
diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h
index 3aa5415bd2..6a3211c97e 100644
--- a/keyboards/ymdk/yd60mq/config.h
+++ b/keyboards/ymdk/yd60mq/config.h
@@ -28,7 +28,16 @@
 /* prevent stuck modifiers */
 
 #define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h
index bf12e0d093..c0cb48e315 100644
--- a/keyboards/ymdk/ym68/config.h
+++ b/keyboards/ymdk/ym68/config.h
@@ -49,16 +49,14 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h
index 383a070c54..61c009bc02 100644
--- a/keyboards/ymdk/ymd09/config.h
+++ b/keyboards/ymdk/ymd09/config.h
@@ -38,8 +38,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #define RGBLIGHT_VAL_STEP 8
  #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations enable ==*/
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_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
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h
index d98d6005c0..f8041f1bc9 100644
--- a/keyboards/ymdk/ymd21/v2/config.h
+++ b/keyboards/ymdk/ymd21/v2/config.h
@@ -49,16 +49,14 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h
index ac7d5573e8..9ab6e9091e 100644
--- a/keyboards/ymdk/ymd40/v2/config.h
+++ b/keyboards/ymdk/ymd40/v2/config.h
@@ -49,16 +49,14 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif
diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h
index 5b1aa59e27..03314c7e30 100644
--- a/keyboards/ymdk/ymd67/config.h
+++ b/keyboards/ymdk/ymd67/config.h
@@ -29,7 +29,16 @@
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
index 5539dd6dee..e86902789e 100644
--- a/keyboards/ymdk/ymd75/config.h
+++ b/keyboards/ymdk/ymd75/config.h
@@ -27,7 +27,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 16
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 15
 #define RGBLIGHT_VAL_STEP 18
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
index ed692c63b4..73c176ab3f 100644
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -46,5 +46,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The same pin is used on the JJ40, at least.
 #define RGBLED_NUM 18
 #define RGB_DI_PIN E2 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*#define RGBLIGHT_VAL_STEP 20*/
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index 85217bdb2b..9e38924219 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_mini/config.h
@@ -60,18 +60,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
-//#    define RGBLIGHT_EFFECT_BREATHING
-//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//#    define RGBLIGHT_EFFECT_SNAKE
-//#    define RGBLIGHT_EFFECT_KNIGHT
-//#    define RGBLIGHT_EFFECT_CHRISTMAS
-//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//#    define RGBLIGHT_EFFECT_RGB_TEST
-//#    define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 //#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/yosino58/keymaps/default/config.h b/keyboards/yosino58/keymaps/default/config.h
index aa3caa3d06..89778175c7 100644
--- a/keyboards/yosino58/keymaps/default/config.h
+++ b/keyboards/yosino58/keymaps/default/config.h
@@ -30,7 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/yosino58/keymaps/sakura/config.h b/keyboards/yosino58/keymaps/sakura/config.h
index b80d37d457..001160d60e 100644
--- a/keyboards/yosino58/keymaps/sakura/config.h
+++ b/keyboards/yosino58/keymaps/sakura/config.h
@@ -32,7 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 100
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 29
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index 0dddfb4d02..6d631ac32d 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 //#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index 09809dada9..646cb59b63 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -73,9 +73,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 //#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 2a74e9e9f5..ea5a4b5739 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -84,9 +84,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h
index 8b801b1cc4..8548dc61e6 100644
--- a/keyboards/yushakobo/quick7/config.h
+++ b/keyboards/yushakobo/quick7/config.h
@@ -56,9 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-///*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-///*== or choose animations ==*/
 //#    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 //#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index 5a72cf2a54..55c9478f0a 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/config.h
@@ -45,7 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
index 0aa38ad350..57a82f7f03 100644
--- a/keyboards/yynmt/kagamidget/config.h
+++ b/keyboards/yynmt/kagamidget/config.h
@@ -41,7 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define RGB_DI_PIN D3
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index fc3e39664d..503e08331d 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/config.h
@@ -37,7 +37,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 4
 #define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 2.0
 #define RGBLIGHT_EFFECT_BREATHE_MAX 255
 
diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h
index 91ffe6dfb4..ea21e3e58e 100644
--- a/keyboards/zj68/config.h
+++ b/keyboards/zj68/config.h
@@ -47,7 +47,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index 31502e0ef6..886e25a5e8 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -24,7 +24,16 @@
 
 #define RGB_DI_PIN D6
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index fea1dbc212..bd378f415a 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -53,7 +53,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PAL_MODE      1
 
 // RGB Underglow WS2812 Matrix defines
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 // SPI RGB Driver
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index ec2bbf0f58..3a7873bb74 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -51,7 +51,16 @@
 #define RGB_DI_PIN B4
 #define RGBLED_NUM 24
 #define RGBLED_SPLIT { 12, 12 }
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 2a993fcd44..87ba0ff317 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -56,7 +56,16 @@
 #define RGBLED_NUM 48
 #define RGBLED_SPLIT {24, 24}
 #define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4

From ad8630bd7229937877aa9a29693bbb8942a27abe Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 15 Oct 2022 09:59:31 -0700
Subject: [PATCH 649/959] Remove RGBLIGHT_ANIMATION and clean up effect defines
 for layouts+users (#18729)

---
 layouts/community/60_iso/unxmaal/config.h     | 11 +++++++-
 .../community/ergodox/jackhumbert/config.h    | 11 +++++++-
 .../community/numpad_5x6/bjohnson/config.h    | 11 +++++++-
 .../community/ortho_4x12/bakingpy/config.h    | 11 +++++++-
 layouts/community/ortho_4x12/xyverz/config.h  | 11 +++++++-
 layouts/community/ortho_5x12/drashna/config.h | 13 +++++++--
 layouts/community/ortho_5x12/xyverz/config.h  | 11 +++++++-
 .../ortho_5x14/yet-another-developer/config.h | 13 +++++++--
 .../tkl_ansi/brandonschlack/config.h          | 11 +++++++-
 users/curry/config.h                          |  8 +++++-
 users/drashna/post_config.h                   | 11 +++++++-
 users/greatwizard/config.h                    | 11 +++++++-
 users/ishtob/config.h                         |  1 -
 users/kageurufu/rules.mk                      |  1 -
 users/konstantin/config.h                     | 11 +++++++-
 users/kuchosauronad0/config.h                 | 20 +++++++++-----
 users/mechmerlin/config.h                     | 11 +++++++-
 users/miles2go/config.h                       | 17 +++++++++---
 .../handwired/ms_sculpt_mobile/config.h       | 15 ++++++++---
 users/mtei/config.h                           |  2 +-
 users/muppetjones/config.h                    |  1 -
 users/muppetjones/readme/rgblayers.md         |  1 -
 users/rverst/config.h                         | 13 ++++++---
 users/sethBarberee/config.h                   | 27 ++++++++++++-------
 users/spidey3/config.h                        | 11 +++++++-
 users/tominabox1/config.h                     | 11 +++++++-
 users/uqs/config.h                            |  1 -
 users/yanfali/config.h                        | 11 +++++++-
 28 files changed, 236 insertions(+), 51 deletions(-)

diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
index 4a90186ee9..026f20dc8f 100644
--- a/layouts/community/60_iso/unxmaal/config.h
+++ b/layouts/community/60_iso/unxmaal/config.h
@@ -19,7 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef RGB_DI_PIN
     #define RGB_DI_PIN F4
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLED_NUM 8         // Number of LEDs
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/layouts/community/ergodox/jackhumbert/config.h b/layouts/community/ergodox/jackhumbert/config.h
index 0aca0d6917..5458a236ce 100644
--- a/layouts/community/ergodox/jackhumbert/config.h
+++ b/layouts/community/ergodox/jackhumbert/config.h
@@ -2,7 +2,16 @@
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 15     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 255
diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h
index 6f1c539700..566365d7b6 100644
--- a/layouts/community/numpad_5x6/bjohnson/config.h
+++ b/layouts/community/numpad_5x6/bjohnson/config.h
@@ -3,7 +3,16 @@
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 13     // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
diff --git a/layouts/community/ortho_4x12/bakingpy/config.h b/layouts/community/ortho_4x12/bakingpy/config.h
index f7d2c24252..fcfa2ca49c 100644
--- a/layouts/community/ortho_4x12/bakingpy/config.h
+++ b/layouts/community/ortho_4x12/bakingpy/config.h
@@ -8,7 +8,16 @@
 #define TAPPING_TERM 150
 
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_HUE_STEP 8
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 6486e0831c..44bac5bf18 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -19,7 +19,16 @@
   #define RGBLED_NUM 1
 #endif
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h
index 619b460a7b..61c95fed8f 100644
--- a/layouts/community/ortho_5x12/drashna/config.h
+++ b/layouts/community/ortho_5x12/drashna/config.h
@@ -20,8 +20,17 @@
 #if defined(KEYBOARD_fractal)
 #    define RGB_DI_PIN D2
 #    undef RGBLED_NUM
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 29  // Number of LEDs
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 29 // Number of LEDs
 #    undef RGBLIGHT_HUE_STEP
 #    define RGBLIGHT_HUE_STEP 8
 #    undef RGBLIGHT_SAT_STEP
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index 46175c2eb1..780fce389d 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -12,7 +12,16 @@
 #if defined(KEYBOARD_preonic_rev2)
   #define RGB_DI_PIN B3
   #undef RGBLED_NUM
-  #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLED_NUM 11     // Number of LEDs
   #undef RGBLIGHT_HUE_STEP
   #define RGBLIGHT_HUE_STEP 8
diff --git a/layouts/community/ortho_5x14/yet-another-developer/config.h b/layouts/community/ortho_5x14/yet-another-developer/config.h
index 3f8dbd3c5e..66959a6d42 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/config.h
+++ b/layouts/community/ortho_5x14/yet-another-developer/config.h
@@ -4,8 +4,17 @@
 #if defined(KEYBOARD_fractal)
 #    define RGB_DI_PIN D2
 #    undef RGBLED_NUM
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 29  // Number of LEDs
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 29 // Number of LEDs
 #    undef RGBLIGHT_HUE_STEP
 #    define RGBLIGHT_HUE_STEP 8
 #    undef RGBLIGHT_SAT_STEP
diff --git a/layouts/community/tkl_ansi/brandonschlack/config.h b/layouts/community/tkl_ansi/brandonschlack/config.h
index df29654049..f7a21c81b0 100644
--- a/layouts/community/tkl_ansi/brandonschlack/config.h
+++ b/layouts/community/tkl_ansi/brandonschlack/config.h
@@ -16,5 +16,14 @@
 #pragma once
 
 // Explicit RGB Animation Mode Include
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
diff --git a/users/curry/config.h b/users/curry/config.h
index 0c96293bd5..d5e1ba7bc5 100644
--- a/users/curry/config.h
+++ b/users/curry/config.h
@@ -7,7 +7,13 @@
 #define USB_POLLING_INTERVAL_MS 1
 
 #if defined(RGBLIGHT_ENABLE)
-#    undef RGBLIGHT_ANIMATIONS
+#    undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    undef RGBLIGHT_EFFECT_CHRISTMAS
+#    undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    undef RGBLIGHT_EFFECT_RGB_TEST
+#    undef RGBLIGHT_EFFECT_ALTERNATING
+#    undef RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLIGHT_SLEEP
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_SNAKE
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index ed80174819..029ffd65ad 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -5,7 +5,16 @@
 
 // because layouts seem to not be respecting config.h order atm
 #ifdef RGBLIGHT_ENABLE
-#    undef RGBLIGHT_ANIMATIONS
+#    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
 #    if defined(__AVR__) && (!defined(__AVR_AT90USB1286__) && !defined(RGBLIGHT_ALL_ANIMATIONS))
 #        define RGBLIGHT_EFFECT_BREATHING
 #        define RGBLIGHT_EFFECT_SNAKE
diff --git a/users/greatwizard/config.h b/users/greatwizard/config.h
index 2ee9e50900..8814fa6bdd 100644
--- a/users/greatwizard/config.h
+++ b/users/greatwizard/config.h
@@ -17,7 +17,16 @@
 
 #define TAP_CODE_DELAY 5
 
-#define RGBLIGHT_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
 
 #ifdef TAP_DANCE_ENABLE
 #    define TAPPING_TERM 175
diff --git a/users/ishtob/config.h b/users/ishtob/config.h
index 695077528c..af4f1ac5cd 100755
--- a/users/ishtob/config.h
+++ b/users/ishtob/config.h
@@ -25,7 +25,6 @@
 
 /* ws2812 RGB LED
 #define RGB_DI_PIN B5
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 8     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/users/kageurufu/rules.mk b/users/kageurufu/rules.mk
index df9ae559a6..4bff403a7b 100644
--- a/users/kageurufu/rules.mk
+++ b/users/kageurufu/rules.mk
@@ -12,4 +12,3 @@ EXTRAKEY_ENABLE = yes
 COMMAND_ENABLE = yes
 CONSOLE_ENABLE = yes
 RGBLIGHT_ENABLE = no
-RGBLIGHT_ANIMATIONS = yes
diff --git a/users/konstantin/config.h b/users/konstantin/config.h
index d429452363..f5247cf5a9 100644
--- a/users/konstantin/config.h
+++ b/users/konstantin/config.h
@@ -31,7 +31,16 @@
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 50
 
 // RGB lighting
-#undef  RGBLIGHT_ANIMATIONS
+#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
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h
index 8502031f02..9315f879ae 100644
--- a/users/kuchosauronad0/config.h
+++ b/users/kuchosauronad0/config.h
@@ -19,8 +19,17 @@
 #endif // !AUDIO_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
-#  define RGBLIGHT_SLEEP
-#  undef  RGBLIGHT_ANIMATIONS
+#  undef RGBLIGHT_SLEEP
+#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
 #  define RGBLIGHT_HUE_STEP 16
 #  define RGBLIGHT_SAT_STEP 16
 #  define RGBLIGHT_VAL_STEP 16
@@ -44,12 +53,12 @@
 #if defined(LEADER_ENABLE)
 #  define LEADER_PER_KEY_TIMING
 #  define LEADER_TIMEOUT 250
-#endif // !LEADER_ENABLE 
+#endif // !LEADER_ENABLE
 
 #if defined(COMBO_ENABLE)
 #  define COMBO_COUNT 4
 #  define COMBO_TERM 150
-#endif // !COMBO_ENABLE 
+#endif // !COMBO_ENABLE
 
 #if defined(NKRO_ENABLE)
 #  define FORCE_NKRO
@@ -82,5 +91,4 @@
 
 #define TAP_CODE_DELAY 5
 
-#define MACRO_TIMER 5 
-
+#define MACRO_TIMER 5
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index 459c181673..ec3b3e81e8 100644
--- a/users/mechmerlin/config.h
+++ b/users/mechmerlin/config.h
@@ -2,7 +2,16 @@
 
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SLEEP
-    #define RGBLIGHT_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 // RGBLIGHT_ENABLE
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/users/miles2go/config.h b/users/miles2go/config.h
index 2a1d6504d6..dad7acad10 100644
--- a/users/miles2go/config.h
+++ b/users/miles2go/config.h
@@ -2,7 +2,16 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_SLEEP
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_EFFECT_BREATHING
 #endif // RGBLIGHT_ENABLE
 
@@ -33,11 +42,11 @@
 #define BABL_MODSWAP
 #define BABL_MOVE // Uncomment to add basic cursor movement
 #define BABL_OSKEYS // This adds Cut, paste, window movement and common OS shortcuts
-#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default. 
-// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc. 
+#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default.
+// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc.
 #define BABL_APP // Application specific settings this has sub-options.
 #define BABL_APP_CELLS // spreadsheets and tables
-#define BABL_APP_EDITOR // Fancy editor commands 
+#define BABL_APP_EDITOR // Fancy editor commands
 #define BABL_APP_WINDOWSPLITTING // splitting frames & windows
 
 //All OSes
diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
index bedc08fc02..552e98ba2e 100644
--- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
+++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
@@ -14,7 +14,7 @@
 #define RGBLIGHT_COLOR_VI 0x00,0x90,0x00
 #define RGBLIGHT_COLOR_READMUX 0x33,0xFF,0x33 // green screen
 #define RGBLIGHT_COLOR_CHROMEOS 0xf4,0xc2,0xd // google yellows
-#endif 
+#endif
 
 #endif // bablpaste
 
@@ -29,8 +29,17 @@
 #define RGBLIGHT_COLOR_LAYER_2 0xFF, 0x00, 0x00  // symbol
 #define RGBLIGHT_COLOR_LAYER_3 0x00, 0xFF, 0xFF  // move
 #define RGBLIGHT_COLOR_LAYER_4 0xFF, 0x00, 0xFF  // delmove
-#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_LIGHT_EFFECT_BREATHE_MAX 200
 #define RGBLIGHT_RAINBOW_SWIRL_RANGE 127
 #endif // rgblight
diff --git a/users/mtei/config.h b/users/mtei/config.h
index b245d7cff2..77074357e8 100644
--- a/users/mtei/config.h
+++ b/users/mtei/config.h
@@ -6,7 +6,6 @@
 #pragma once
 
 // Selection of RGBLIGHT MODE to use.
-#undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING
 #undef RGBLIGHT_EFFECT_RAINBOW_MOOD
 #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -16,6 +15,7 @@
 #undef RGBLIGHT_EFFECT_STATIC_GRADIENT
 #undef RGBLIGHT_EFFECT_RGB_TEST
 #undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 
 #if defined(LED_ANIMATIONS)
 #    if LED_ANIMATIONS_LEVEL > 1
diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h
index e8afa9d8c5..3dd4d1b1b6 100644
--- a/users/muppetjones/config.h
+++ b/users/muppetjones/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-// #    define RGBLIGHT_ANIMATIONS
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 16
 #    define RGBLIGHT_VAL_STEP 16
diff --git a/users/muppetjones/readme/rgblayers.md b/users/muppetjones/readme/rgblayers.md
index fb69800177..862ba75941 100644
--- a/users/muppetjones/readme/rgblayers.md
+++ b/users/muppetjones/readme/rgblayers.md
@@ -14,7 +14,6 @@ This bit of code allows you to define layer lighting that respects your current
 
    ```
    #ifdef RGBLIGHT_ENABLE
-   // #    define RGBLIGHT_ANIMATIONS
    #    define RGBLIGHT_HUE_STEP 8
    #    define RGBLIGHT_SAT_STEP 16
    #    define RGBLIGHT_VAL_STEP 16
diff --git a/users/rverst/config.h b/users/rverst/config.h
index f5cb5c76fd..52e7c861ca 100644
--- a/users/rverst/config.h
+++ b/users/rverst/config.h
@@ -18,9 +18,16 @@
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLIGHT_SLEEP
-#    ifdef RGBLIGHT_ANIMATIONS
-#        undef RGBLIGHT_ANIMATIONS
-#    endif
+#    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
 #    define RGBLIGHT_SLEEP
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/users/sethBarberee/config.h b/users/sethBarberee/config.h
index c97d39151b..00cb96d3e0 100644
--- a/users/sethBarberee/config.h
+++ b/users/sethBarberee/config.h
@@ -26,16 +26,23 @@
 # ifndef RGBLIGHT_VAL_STEP
 #   define RGBLIGHT_VAL_STEP 8
 #endif
-// Trim animations I don't use/like
-#   ifdef RGBLIGHT_ANIMATIONS
-#       undef RGBLIGHT_ANIMATIONS
-#   endif
-#   define RGBLIGHT_EFFECT_BREATHING
-#   define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#   define RGBLIGHT_EFFECT_TWINKLE
-#   ifndef CAPS_LOCK_MODE
-#       define CAPS_LOCK_MODE RGBLIGHT_MODE_STATIC_LIGHT
-#   endif
+ // Trim animations I don't use/like
+#    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
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    ifndef CAPS_LOCK_MODE
+#        define CAPS_LOCK_MODE RGBLIGHT_MODE_STATIC_LIGHT
+#    endif
 #endif // RGBLIGHT_ENABLE
 
 #ifndef AUDIO_ENABLE
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index 36d59b6a5d..808de4d591 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -14,7 +14,16 @@
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_STARTUP_ANIMATION
 
-#    undef RGBLIGHT_ANIMATIONS
+#    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
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/users/tominabox1/config.h b/users/tominabox1/config.h
index 5fd8ba3a74..cf5d317fb7 100644
--- a/users/tominabox1/config.h
+++ b/users/tominabox1/config.h
@@ -15,7 +15,16 @@
   #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
     #define RGBLED_NUM 50
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLIGHT_SLEEP
   #endif // RGBLIGHT_ENABLE
 
diff --git a/users/uqs/config.h b/users/uqs/config.h
index b8a140fe87..5530417de1 100644
--- a/users/uqs/config.h
+++ b/users/uqs/config.h
@@ -4,7 +4,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLIGHT_SLEEP
-//#    define RGBLIGHT_ANIMATIONS      // disabled to save space
 #    define RGBLIGHT_LAYERS
 #    define RGBLIGHT_MAX_LAYERS 8      // default is 16
 #    define RGBLIGHT_DISABLE_KEYCODES  // RGB_foo keys no longer work, saves 600 bytes
diff --git a/users/yanfali/config.h b/users/yanfali/config.h
index a39e95c9dd..fa5ec42c09 100644
--- a/users/yanfali/config.h
+++ b/users/yanfali/config.h
@@ -14,7 +14,16 @@
 #undef RGBLED_NUM
 #define RGBLED_NUM 20
 
-#undef RGBLIGHT_ANIMATIONS
+#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
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 

From 2ee573fc5f9076d1773bd17c851cd581cc67582f Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Sat, 15 Oct 2022 21:09:03 +0200
Subject: [PATCH 650/959] led_update_kb -> led_update_ports where appropriate
 (#18716)

Following #14452, less boilerplate is needed to customize indicator led
control.
---
 keyboards/dk60/dk60.c                        | 14 +++++---------
 keyboards/dp60/keymaps/indicator/indicator.c | 12 ++++--------
 keyboards/fallacy/fallacy.c                  | 12 ++++--------
 keyboards/iron180/iron180.c                  |  4 +---
 keyboards/kc60/kc60.c                        | 14 +++++---------
 keyboards/metamechs/timberwolf/timberwolf.c  | 14 +++++---------
 keyboards/moonlander/moonlander.c            |  8 ++------
 keyboards/novelkeys/nk65/nk65.c              | 14 +++++---------
 keyboards/nullbitsco/nibble/nibble.c         |  8 ++------
 keyboards/nullbitsco/tidbit/tidbit.c         |  8 ++------
 keyboards/viendi8l/viendi8l.c                | 10 +++-------
 keyboards/weirdo/ls_60/ls_60.c               | 16 +++++-----------
 keyboards/yiancardesigns/seigaiha/seigaiha.c | 16 ++++++----------
 13 files changed, 49 insertions(+), 101 deletions(-)

diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c
index 7d9f793866..382404c032 100644
--- a/keyboards/dk60/dk60.c
+++ b/keyboards/dk60/dk60.c
@@ -44,14 +44,10 @@ void led_init_ports(void) {
     setPinOutput(F0);
 }
 
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        if (led_state.caps_lock) {
-            dk60_caps_led_on();
-        } else {
-            dk60_caps_led_off();
-        }
+void led_update_ports(led_t led_state) {
+    if (led_state.caps_lock) {
+        dk60_caps_led_on();
+    } else {
+        dk60_caps_led_off();
     }
-
-    return true;
 }
diff --git a/keyboards/dp60/keymaps/indicator/indicator.c b/keyboards/dp60/keymaps/indicator/indicator.c
index a3a826e8a0..999e0c3338 100644
--- a/keyboards/dp60/keymaps/indicator/indicator.c
+++ b/keyboards/dp60/keymaps/indicator/indicator.c
@@ -80,14 +80,10 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
     indicator_write(start_led + (RGBLED_NUM - RGB_INDICATOR_NUM), RGB_INDICATOR_NUM);
 }
 
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        rgblight_set_layer_state(0, led_state.caps_lock);
-        rgblight_set_layer_state(1, led_state.scroll_lock);
-        rgblight_set_layer_state(2, led_state.num_lock);
-    }
-    return res;
+void led_update_ports(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    rgblight_set_layer_state(1, led_state.scroll_lock);
+    rgblight_set_layer_state(2, led_state.num_lock);
 }
 
 layer_state_t layer_state_set_kb(layer_state_t state) {
diff --git a/keyboards/fallacy/fallacy.c b/keyboards/fallacy/fallacy.c
index 103860f0f8..486084098a 100755
--- a/keyboards/fallacy/fallacy.c
+++ b/keyboards/fallacy/fallacy.c
@@ -29,12 +29,8 @@ void matrix_scan_kb(void) {
  
 /* update LED driver with usb led_state
  */
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        set_fallacy_led(2, led_state.caps_lock);    /* caps */
-        set_fallacy_led(1, led_state.num_lock);     /* num lock */
-        set_fallacy_led(0, led_state.scroll_lock);  /* scroll lock */
-    }
-    return res;
+void led_update_ports(led_t led_state) {
+    set_fallacy_led(2, led_state.caps_lock);    /* caps */
+    set_fallacy_led(1, led_state.num_lock);     /* num lock */
+    set_fallacy_led(0, led_state.scroll_lock);  /* scroll lock */
 }
diff --git a/keyboards/iron180/iron180.c b/keyboards/iron180/iron180.c
index 546ff7fc8f..402ee23e1f 100644
--- a/keyboards/iron180/iron180.c
+++ b/keyboards/iron180/iron180.c
@@ -18,8 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "iron180.h"
 
 #ifdef CAPSLOCK_BACKLIGHT
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
+void led_update_ports(led_t led_state) {
     if (!led_state.caps_lock){
         if (is_backlight_breathing()) breathing_disable();
         backlight_disable();
@@ -28,6 +27,5 @@ bool led_update_kb(led_t led_state) {
 	if (is_backlight_breathing()) breathing_enable();
         backlight_enable();
     }
-    return res;
 }
 #endif
diff --git a/keyboards/kc60/kc60.c b/keyboards/kc60/kc60.c
index 52059a8c40..afba2da57e 100644
--- a/keyboards/kc60/kc60.c
+++ b/keyboards/kc60/kc60.c
@@ -1,13 +1,9 @@
 #include "kc60.h"
 
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        if (led_state.caps_lock) {
-            setPinOutput(B2);
-        } else {
-            setPinInput(B2);
-        }
+void led_update_ports(led_t led_state) {
+    if (led_state.caps_lock) {
+        setPinOutput(B2);
+    } else {
+        setPinInput(B2);
     }
-
-    return true;
 }
diff --git a/keyboards/metamechs/timberwolf/timberwolf.c b/keyboards/metamechs/timberwolf/timberwolf.c
index 16aea12594..ff50851247 100644
--- a/keyboards/metamechs/timberwolf/timberwolf.c
+++ b/keyboards/metamechs/timberwolf/timberwolf.c
@@ -16,16 +16,12 @@
 
 #include "timberwolf.h"
 
-bool led_update_kb(led_t led_state) {
-    bool runDefault = led_update_user(led_state);
-    if(runDefault) {
-        if (led_state.caps_lock) {
-            backlight_level_noeeprom(get_backlight_level());
-        } else {
-            backlight_set(0);
-        }
+void led_update_ports(led_t led_state) {
+    if (led_state.caps_lock) {
+        backlight_level_noeeprom(get_backlight_level());
+    } else {
+        backlight_set(0);
     }
-    return runDefault;
 }
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 0844f16661..1357539382 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -370,12 +370,8 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
 #endif
 
 #ifdef CAPS_LOCK_STATUS
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        ML_LED_6(led_state.caps_lock);
-    }
-    return res;
+void led_update_ports(led_t led_state) {
+    ML_LED_6(led_state.caps_lock);
 }
 #endif
 
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index 4ed18c114e..0e6fe08b5c 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -25,16 +25,12 @@
  * Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel
  * Bottom LED is red only LED driver 2 RGB 6 Green channel.
  */
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        if (led_state.caps_lock) {
-            IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
-        } else {
-            IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
-        }
+void led_update_ports(led_t led_state) {
+    if (led_state.caps_lock) {
+        IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
+    } else {
+        IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
     }
-    return res;
 }
 
 __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/nullbitsco/nibble/nibble.c b/keyboards/nullbitsco/nibble/nibble.c
index 43918c13e6..8f462080f0 100644
--- a/keyboards/nullbitsco/nibble/nibble.c
+++ b/keyboards/nullbitsco/nibble/nibble.c
@@ -16,10 +16,6 @@
 #include QMK_KEYBOARD_H
 
 // Use Bit-C LED to show CAPS LOCK status
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        set_bitc_LED(led_state.caps_lock ? LED_DIM : LED_OFF);
-    }
-    return res;
+void led_update_ports(led_t led_state) {
+    set_bitc_LED(led_state.caps_lock ? LED_DIM : LED_OFF);
 }
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index ac29777841..b8f900ff75 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -103,12 +103,8 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 }
 
 // Use Bit-C LED to show NUM LOCK status
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
-    }
-    return res;
+void led_update_ports(led_t led_state) {
+    set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/viendi8l/viendi8l.c b/keyboards/viendi8l/viendi8l.c
index ef720ce207..6d52993342 100644
--- a/keyboards/viendi8l/viendi8l.c
+++ b/keyboards/viendi8l/viendi8l.c
@@ -23,13 +23,9 @@ uint8_t caps_color[3] = {0xFF,0xFF,0xFF};
 uint8_t num_color[3] = {0xFF,0xFF,0xFF};
 uint8_t layer_color[3] = {0xFF,0xFF,0xFF};
 
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        led_state.caps_lock ? rgblight_setrgb_at(caps_color[0], caps_color[1], caps_color[2], 2) : rgblight_setrgb_at(0x00,0x00,0x00,2);
-        led_state.num_lock ? rgblight_setrgb_at(num_color[0], num_color[1], num_color[2], 3) : rgblight_setrgb_at(0x00,0x00,0x00,3);
-    }
-    return res;
+void led_update_ports(led_t led_state) {
+    led_state.caps_lock ? rgblight_setrgb_at(caps_color[0], caps_color[1], caps_color[2], 2) : rgblight_setrgb_at(0x00,0x00,0x00,2);
+    led_state.num_lock ? rgblight_setrgb_at(num_color[0], num_color[1], num_color[2], 3) : rgblight_setrgb_at(0x00,0x00,0x00,3);
 }
 
 layer_state_t layer_state_set_kb(layer_state_t state) {
diff --git a/keyboards/weirdo/ls_60/ls_60.c b/keyboards/weirdo/ls_60/ls_60.c
index ef29acf9a1..12950fdba5 100644
--- a/keyboards/weirdo/ls_60/ls_60.c
+++ b/keyboards/weirdo/ls_60/ls_60.c
@@ -16,16 +16,10 @@
 #include "ls_60.h"
 
 
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-
-    if (res) {
-        if(led_state.caps_lock){
-            rgblight_setrgb_at(192, 192, 192, 0);
-        } else {
-            rgblight_setrgb_at(0, 0, 0, 0);
-        }
+void led_update_ports(led_t led_state) {
+    if(led_state.caps_lock){
+        rgblight_setrgb_at(192, 192, 192, 0);
+    } else {
+        rgblight_setrgb_at(0, 0, 0, 0);
     }
-
-    return res;
 }
diff --git a/keyboards/yiancardesigns/seigaiha/seigaiha.c b/keyboards/yiancardesigns/seigaiha/seigaiha.c
index 911034eb56..02df70e2f7 100644
--- a/keyboards/yiancardesigns/seigaiha/seigaiha.c
+++ b/keyboards/yiancardesigns/seigaiha/seigaiha.c
@@ -20,17 +20,13 @@
 
 uint8_t send_data = 0x00;
 
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        if (led_state.caps_lock){
-            send_data |= 1 << 5;
-        } else {
-            send_data &= ~(1 << 5);
-        }
-        i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
+void led_update_ports(led_t led_state) {
+    if (led_state.caps_lock){
+        send_data |= 1 << 5;
+    } else {
+        send_data &= ~(1 << 5);
     }
-    return res;
+    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
 }
 
 __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {

From 2b24f16779b642d0a20f19a2767645a6ec0b1952 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sat, 15 Oct 2022 23:20:20 +0200
Subject: [PATCH 651/959] Update converter/usb_usb keymaps to use
 LAYOUT_fullsize (#18720)

---
 .../converter/usb_usb/keymaps/chriskopher/keymap.c   | 12 ++++++------
 .../converter/usb_usb/keymaps/coloneljesus/keymap.c  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
index 37ba674f03..d50908974c 100644
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |Meh/CapsL|Gui|Alt|     Space       |Alt|Adjust/Gui|App| Ctl| | ← | ↓ | → | |      0|  .|Ent|
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
-    [_CKO] = LAYOUT_ansi(
+    [_CKO] = LAYOUT_fullsize_ansi(
         KC_ESC,                           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,        KC_F10,   KC_F11,    KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,           KC_1,           KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,         KC_MINS,  KC_EQL,    KC_BSLS,    KC_INS,  KC_HOME, KC_PGUP,            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,           KC_Q,           KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,         KC_LBRC,  KC_RBRC,   KC_BSPC,    KC_DEL,  KC_END,  KC_PGDN,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |Ctl|Gui|Alt|           Space        |Alt|Adjust/Gui|App|Ctl| | ← | ↓ | → | |      0|  .|Ent|
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
-    [_QWERTY] = LAYOUT_ansi(
+    [_QWERTY] = LAYOUT_fullsize_ansi(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,   KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC,   KC_RBRC,  KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |   |   |   |             Shift             |   |   |   |   | |   |   |   | |       |   |   |
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
-    [_SUPERDUPER] = LAYOUT_ansi(
+    [_SUPERDUPER] = LAYOUT_fullsize_ansi(
         ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     ______,    ______,  ______,  ______,               ______,  ______,  ______,
         ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     ______,    ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
         ______,  ______,  ______,  ______,  ______,  ______,  ______,  C(KC_1), C(S(KC_TAB)), C(KC_TAB),  C(KC_9),   ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |   |   |   |                               |   |   |   |   | |   |   |   | |       |   |   |
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
-    [_DEV] = LAYOUT_ansi(
+    [_DEV] = LAYOUT_fullsize_ansi(
         ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                            ______,  ______,  ______,
         ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                        ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
         ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_MINS, S(KC_EQL), S(KC_9), S(KC_0),  ______,  ______,                     ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |   |   |   |                               |   |   |   |   | |   |   |   |    |       |   |   |
      * `-----------------------------------------------------------' `-----------'    `---------------'
     */
-    [_ADJUST] = LAYOUT_ansi(
+    [_ADJUST] = LAYOUT_fullsize_ansi(
         ______,                ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,               ______,  ______,  ______,
         ______,  ______,       ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      KC_MPLY, KC_MNXT, KC_VOLU,    ______,  ______,  ______,  ______,
         ______,  DF(_QWERTY),  ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      KC_MSTP, KC_MPRV, KC_VOLD,    ______,  ______,  ______,  ______,
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-----------------------------------------------------------' `-----------' `---------------'
  */
  /*
-  *  [_EMPTY] = LAYOUT_ansi(
+  *  [_EMPTY] = LAYOUT_fullsize_ansi(
   *      ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,               ______,  ______,  ______,
   *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
   *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
index a623d4cdfa..6ef3b3505a 100644
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -101,7 +101,7 @@ void led_set_user(uint8_t usb_led) {
      * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|Ent|
      * `-----------------------------------------------------------' `-----------' `---------------'
      */
-    LAYOUT_ansi(
+    LAYOUT_fullsize_ansi(
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,      PSCR,SLCK,BRK,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
     TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS,     DEL, END, PGDN,    P7,  P8,  P9,
@@ -126,7 +126,7 @@ void led_set_user(uint8_t usb_led) {
      * |Ctl|Gui|Alt|           Space       |HNK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
      * `-----------------------------------------------------------' `-----------' `---------------'
      */
-    LAYOUT_iso(
+    LAYOUT_fullsize_iso(
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,      PSCR,SLCK,BRK,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
     TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,ENT,      DEL, END, PGDN,    P7,  P8,  P9,  PPLS,

From ccdd28930a8f399f3dfd5e39a14e3972e5bc1872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reibl=20J=C3=A1nos=20D=C3=A1niel?=
 <janos.daniel.reibl@protonmail.com>
Date: Sat, 15 Oct 2022 23:22:59 +0200
Subject: [PATCH 652/959] fix: Remove OLED support (#18719)

* fix: Remove OLED support

* redundant files

Co-authored-by: zvecr <git@zvecr.com>
---
 keyboards/handwired/riblee_f411/config.h  |   2 -
 keyboards/handwired/riblee_f411/halconf.h |  27 ------
 keyboards/handwired/riblee_f411/mcuconf.h |  22 -----
 keyboards/handwired/riblee_f411/rules.mk  |   4 -
 users/riblee/riblee.c                     | 104 ----------------------
 5 files changed, 159 deletions(-)
 delete mode 100644 keyboards/handwired/riblee_f411/halconf.h
 delete mode 100644 keyboards/handwired/riblee_f411/mcuconf.h

diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h
index 6cf4b6370a..e855133713 100644
--- a/keyboards/handwired/riblee_f411/config.h
+++ b/keyboards/handwired/riblee_f411/config.h
@@ -29,5 +29,3 @@
 #define MOUSEKEY_INTERVAL 32
 
 #define TAPPING_TERM 175
-
-#define OLED_DISPLAY_128X64
diff --git a/keyboards/handwired/riblee_f411/halconf.h b/keyboards/handwired/riblee_f411/halconf.h
deleted file mode 100644
index 6084293ff1..0000000000
--- a/keyboards/handwired/riblee_f411/halconf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/riblee_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
-
-#pragma once
-
-#define HAL_USE_I2C TRUE
-
-#include_next <halconf.h>
-
diff --git a/keyboards/handwired/riblee_f411/mcuconf.h b/keyboards/handwired/riblee_f411/mcuconf.h
deleted file mode 100644
index 79a654f1a4..0000000000
--- a/keyboards/handwired/riblee_f411/mcuconf.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include_next "mcuconf.h"
-
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk
index ae4bc544a7..d3ca449aaf 100644
--- a/keyboards/handwired/riblee_f411/rules.mk
+++ b/keyboards/handwired/riblee_f411/rules.mk
@@ -20,7 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 LAYOUTS = ortho_5x12
-
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-RAW_ENABLE = yes
diff --git a/users/riblee/riblee.c b/users/riblee/riblee.c
index 02ba246f60..937e603b7a 100644
--- a/users/riblee/riblee.c
+++ b/users/riblee/riblee.c
@@ -15,7 +15,6 @@
  */
 
 #include "riblee.h"
-#include "raw_hid.h"
 #include <string.h>
 
 // Tap Dance functions
@@ -166,109 +165,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 };
 
-#ifdef OLED_ENABLE
-
-static char receive_buffer[128] = {};
-static uint8_t receive_buffer_length = 0;
-uint16_t startup_timer;
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    startup_timer = timer_read();
-    return rotation;
-}
-
-static void render_logo(void) {
-    static const char PROGMEM raw_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0, 96, 96, 96,240,248,255, 63, 56,255,255,248, 63, 63,248,255,255, 56, 63,255,248,240, 96, 96, 96,  0,  0,  0,  0,  0,252,254, 38, 54, 60,  8,240,152,152,248,240, 24,248,224,248,120,224,240,120, 96,248,248,248,248, 32,248,248, 24, 24,240,248,248,248,240,240,248,152,152,254,254,  0,  0,  0,254,254,152,248,240, 24,248,224,240,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,219,219,219,255,255,255,240,192,143,159, 63,  0,  0, 63,159,143,192,240,255,255,255,219,219,219,  0,  0,  0,  0,  0,192,225,112, 48, 48, 48,112,225,129,  1,240,240,240,193,  1,  0,  1,193,240,240,241,  1,  1,241,240,193,225,112, 48,  0,  1,  1,  1,  1,240,241, 49, 49, 49,  0,240,240,  0,129,193,129,193,192,  0,196,135,193,192,128,128,192,192,128,  0,  0,192,128,  0,128,192,128,  0,  0,192,192,128,128,192,192,192,128,  0,128,192,128,192,192,  0,128,192,192,192,128,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  6,  6,  6, 15, 31,255,255, 31,255,255, 31,252,252, 31,255,255, 31,255,255, 31, 15,  6,  6,  6,  0,  0,  0,  0,  0, 15, 31, 56, 48, 48, 48, 60,127,103, 96, 63, 63,  0,  7, 63, 56, 31,  7,  0, 63, 63,  0,  0, 63, 63,  7, 30, 60, 48,  0,  0,  0,  0,  0, 63, 31,  3,  3,  3,  0, 63, 63,  0, 31, 63,  1,  0,  0,  0, 63, 31,  0,  1, 63, 63,  0,  0, 63, 63,  0,  7, 63, 60, 63,  7, 31, 60, 63, 15,  0, 28, 60, 54, 54, 63, 63,  0, 63, 63,  1,  0,  0, 31, 63, 54, 54, 55, 55,  2,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128,128,128,128,  0,  0,192,192,192,  0,192,192,192,  0,  0,  0,  0,  0,  0,192,192,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255, 29,127,255,247,224,  0,254,254,254,  0,255,255,255,198,254,254,254,  0,  0,255,255,255,124,254,254,214,214,222,222, 92,124,254,254,214,214,222,222, 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    };
-
-    oled_write_raw_P(raw_logo, sizeof(raw_logo));
-}
-
-static void render_info(void) {
-    // Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            if (layer_state_cmp(default_layer_state, _QWERTY)) {
-                oled_write_P(PSTR("Qwerty\n"), false);
-            } else if (layer_state_cmp(default_layer_state, _COLEMAK)) {
-                oled_write_P(PSTR("Colmak\n"), false);
-            } else if (layer_state_cmp(default_layer_state, _DVORAK)) {
-                oled_write_P(PSTR("Dvorak\n"), false);
-            } else if (layer_state_cmp(default_layer_state, _WORKMAN)) {
-                oled_write_P(PSTR("Workman\n"), false);
-            } else if (layer_state_cmp(default_layer_state, _HUNGARIAN)) {
-                oled_write_P(PSTR("HUN Qwerty\n"), false);
-            } else {
-                oled_write_P(PSTR("Undefined\n"), false);
-            }
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise\n"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-    }
-
-    // Print string received via HID RAW
-    oled_write_ln(receive_buffer, false);}
-
-bool oled_task_user(void) {
-    static bool finished_timer = false;
-    if (!finished_timer && (timer_elapsed(startup_timer) < 1000)) {
-        render_logo();
-    } else {
-        if (!finished_timer) {
-            oled_clear();
-            finished_timer = true;
-        }
-        render_info();
-    }
-    return false;
-
-}
-
-#ifdef RAW_ENABLE
-
-void raw_hid_receive(uint8_t *data, uint8_t length) {
-
-    // Append data to receive_buffer, without the first byte
-    memcpy(receive_buffer + receive_buffer_length, data + 1, length - 1);
-    receive_buffer_length += (length - 1);
-
-    // First byte indicate if we will recive more package for the current string
-    // If it's 1 then this was the last package and we can reset the offset
-    if (data[0] == 1) {
-        // Reset the offset for memcpy to the begining of our buffer
-        receive_buffer_length = 0;
-    }
-
-    // Reset the offset to prevent overwriting memory outside of the buffer
-    if (receive_buffer_length + 32 >= 128) {
-        receive_buffer_length = 0;
-    }
-
-}
-
-#endif
-
-#endif
-
 void keyboard_pre_init_user(void) {
     // Set C13 pin as output
     setPinOutput(C13);

From 679cbb8426e9bfa78b045ce1edbb8bec9e04c597 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 15 Oct 2022 14:25:53 -0700
Subject: [PATCH 653/959] bbrfkr Dynamis Refactor (#18733)

* dynamis.h: use XXX for KC_NO

* dynamis.h: add matrix diagram

* info.json: apply friendly formatting

* refactor keymaps

- use four-space indent
- grid-align keycodes for readability

* info.json: fix LAYOUT_iso key sequence
---
 keyboards/bbrfkr/dynamis/dynamis.h            |  23 +-
 keyboards/bbrfkr/dynamis/info.json            | 864 +++---------------
 .../bbrfkr/dynamis/keymaps/default/keymap.c   |  56 +-
 keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c |  56 +-
 keyboards/bbrfkr/dynamis/keymaps/via/keymap.c |  56 +-
 5 files changed, 251 insertions(+), 804 deletions(-)

diff --git a/keyboards/bbrfkr/dynamis/dynamis.h b/keyboards/bbrfkr/dynamis/dynamis.h
index bd1f2088be..a88b81669c 100644
--- a/keyboards/bbrfkr/dynamis/dynamis.h
+++ b/keyboards/bbrfkr/dynamis/dynamis.h
@@ -18,6 +18,25 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐               ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │56 │55 │54 │53 │52 │51 │50 │90 │               │50     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤               └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │66 │65 │64 │63 │62 │61 │60   │                 │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤              ┌──┴┐70  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │76 │75 │74 │73 │72 │70      │              │71 │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌───┐       ┌─┴───┴────┤
+ * │31      │   │30  │31 │32 │33 │34 │35 │36 │86 │85 │84 │83 │82 │81    │80 ││91 │       │81        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴┬──┴┼───┼───┐   └──────────┘
+ *              │40  │41  │42  │43      │44  │45        │46  │96  │95  │ │94 │93 │92 │
+ *              └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌────┬────┬────┬────────────────────────┬────┬────┬────┐
+ *              │40  │41  │42  │43                      │46  │96  │95  │ 6.25u Spacebar
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┘
+ */
+
 #define LAYOUT_ansi( \
       C00, C01, C02, C03, C04, C05, C06, C56, C55, C54, C53, C52, C51, C50, C90, \
       C10, C11, C12, C13, C14, C15, C16, C66, C65, C64, C63, C62, C61, C60, \
@@ -33,7 +52,7 @@
         { C40, C41, C42, C43, C44, C45, C46 }, \
         { C50, C51, C52, C53, C54, C55, C56 }, \
         { C60, C61, C62, C63, C64, C65, C66 }, \
-        { C70, KC_NO, C72, C73, C74, C75, C76 }, \
+        { C70, XXX, C72, C73, C74, C75, C76 }, \
         { C80, C81, C82, C83, C84, C85, C86 }, \
         { C90, C91, C92, C93, C94, C95, C96 } \
     }
@@ -52,7 +71,7 @@
         { C30, C31, C32, C33, C34, C35, C36 }, \
         { C40, C41, C42, C43, C44, C45, C46 }, \
         { C50, C51, C52, C53, C54, C55, C56 }, \
-        { KC_NO, C61, C62, C63, C64, C65, C66 }, \
+        { XXX, C61, C62, C63, C64, C65, C66 }, \
         { C70, C71, C72, C73, C74, C75, C76 }, \
         { C80, C81, C82, C83, C84, C85, C86 }, \
         { C90, C91, C92, C93, C94, C95, C96 } \
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index b59fef9946..9087712556 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -11,728 +11,156 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "label": "`",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "=",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "Back space",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "Delete",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "[",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "]",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "\\",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "CapsLock",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "Enter",
-                    "x": 12.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "x": 0,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "Shift",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "Lower",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "Up",
-                    "x": 15.25,
-                    "y": 3
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Lower",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Space",
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 2.25
-                },
-                {
-                    "label": "Space",
-                    "x": 6,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Enter",
-                    "x": 7.25,
-                    "y": 4,
-                    "w": 2.75
-                },
-                {
-                    "label": "Raise",
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 11.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 12.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Left",
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "Down",
-                    "x": 15.25,
-                    "y": 4
-                },
-                {
-                    "label": "Right",
-                    "x": 16.25,
-                    "y": 4
-                }
+                {"label":"`", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+                {"label":"Back space", "x":13, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[", "x":11.5, "y":1},
+                {"label":"]", "x":12.5, "y":1},
+                {"label":"\\", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"CapsLock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";", "x":10.75, "y":2},
+                {"label":"'", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                {"label":"Shift", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",", "x":9.25, "y":3},
+                {"label":".", "x":10.25, "y":3},
+                {"label":"/", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Lower", "x":14, "y":3},
+                {"label":"Up", "x":15.25, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Alt", "x":1.25, "y":4, "w":1.25},
+                {"label":"Lower", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Enter", "x":7.25, "y":4, "w":2.75},
+                {"label":"Raise", "x":10, "y":4, "w":1.25},
+                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
+                {"label":"Left", "x":14.25, "y":4},
+                {"label":"Down", "x":15.25, "y":4},
+                {"label":"Right", "x":16.25, "y":4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "label": "`",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "=",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "Back space",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "Delete",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "[",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "]",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 13.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "CapsLock",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "#",
-                    "x": 12.75,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "Shift",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "Lower",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "Up",
-                    "x": 15.25,
-                    "y": 3
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Lower",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Space",
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 2.25
-                },
-                {
-                    "label": "Space",
-                    "x": 6,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Enter",
-                    "x": 7.25,
-                    "y": 4,
-                    "w": 2.75
-                },
-                {
-                    "label": "Raise",
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 11.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 12.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Left",
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "Down",
-                    "x": 15.25,
-                    "y": 4
-                },
-                {
-                    "label": "Right",
-                    "x": 16.25,
-                    "y": 4
-                }
+                {"label":"`", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+                {"label":"Back space", "x":13, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[", "x":11.5, "y":1},
+                {"label":"]", "x":12.5, "y":1},
+
+                {"label":"CapsLock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";", "x":10.75, "y":2},
+                {"label":"'", "x":11.75, "y":2},
+                {"label":"#", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                {"label":"Shift", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",", "x":9.25, "y":3},
+                {"label":".", "x":10.25, "y":3},
+                {"label":"/", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Lower", "x":14, "y":3},
+                {"label":"Up", "x":15.25, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Alt", "x":1.25, "y":4, "w":1.25},
+                {"label":"Lower", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Enter", "x":7.25, "y":4, "w":2.75},
+                {"label":"Raise", "x":10, "y":4, "w":1.25},
+                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
+                {"label":"Left", "x":14.25, "y":4},
+                {"label":"Down", "x":15.25, "y":4},
+                {"label":"Right", "x":16.25, "y":4}
             ]
         }
     }
diff --git a/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
index 686c016242..8689794c8c 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
@@ -25,35 +25,35 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = LAYOUT_ansi(
-      KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
-      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-      KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-      KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
-      KC_LCTL, KC_LALT, MO(1),   KC_SPC,      KC_SPC,     KC_ENT, MO(2), KC_RALT, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    [_QWERTY] = LAYOUT_ansi(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_TAB,  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,
+        KC_LCTL, KC_LALT, MO(1),                     KC_SPC,  KC_SPC,  KC_ENT,                    MO(2),   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  [_LOWER] = LAYOUT_ansi(
-      KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LGUI, KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS, MO(3), KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
-  ),
+    [_LOWER] = LAYOUT_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LGUI, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   MO(3),   KC_RGUI, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
+    ),
 
-  [_RAISE] = LAYOUT_ansi(
-      KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LGUI, MO(3),   KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
-  ),
+    [_RAISE] = LAYOUT_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LGUI, MO(3),                     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_RGUI, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
+    ),
 
-  [_SETTINGS] = LAYOUT_ansi(
-      QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO,   KC_NO,     KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,       KC_NO, KC_NO, KC_NO
-  ),
+    [_SETTINGS] = LAYOUT_ansi(
+        QK_BOOT, KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,
+        KC_NO,   KC_NO,   KC_NO,                      KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+    ),
 };
diff --git a/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
index c715dc3577..4e35af679d 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
@@ -25,35 +25,35 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = LAYOUT_iso(
-      KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
-      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
-      KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-      KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
-      KC_LCTL, KC_LALT, MO(1),   KC_SPC,      KC_SPC,     KC_ENT, MO(2), KC_RALT, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    [_QWERTY] = LAYOUT_iso(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_TAB,  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,
+        KC_LCTL, KC_LALT, MO(1),                     KC_SPC,  KC_SPC,  KC_ENT,                    MO(2),   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  [_LOWER] = LAYOUT_iso(
-      KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LGUI, KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS, MO(3), KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
-  ),
+    [_LOWER] = LAYOUT_iso(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LGUI, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   MO(3),   KC_RGUI, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
+    ),
 
-  [_RAISE] = LAYOUT_iso(
-      KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LGUI, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
-  ),
+    [_RAISE] = LAYOUT_iso(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LGUI, KC_TRNS,                   MO(3),   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_RGUI, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
+    ),
 
-  [_SETTINGS] = LAYOUT_iso(
-      QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO,   KC_NO,     KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,       KC_NO, KC_NO, KC_NO
-  ),
+    [_SETTINGS] = LAYOUT_iso(
+        QK_BOOT, KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,
+        KC_NO,   KC_NO,   KC_NO,                      KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+    ),
 };
diff --git a/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
index cef34da6b3..0d1ed9e01f 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
@@ -25,37 +25,37 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = LAYOUT_ansi(
-      KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
-      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-      KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-      KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
-      KC_LCTL, KC_LALT, MO(1),   KC_SPC,      KC_SPC,     KC_ENT, MO(2), KC_RALT, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    [_QWERTY] = LAYOUT_ansi(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_TAB,  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,
+        KC_LCTL, KC_LALT, MO(1),                     KC_SPC,  KC_SPC,  KC_ENT,                    MO(2),   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  [_LOWER] = LAYOUT_ansi(
-      KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LGUI, KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS, MO(3), KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
-  ),
+    [_LOWER] = LAYOUT_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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_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_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LGUI, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   MO(3),   KC_RGUI, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
+    ),
 
-  [_RAISE] = LAYOUT_ansi(
-      KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LGUI, MO(3),   KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS,       KC_TRNS, KC_TRNS, KC_MUTE
-  ),
+    [_RAISE] = LAYOUT_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_LGUI, MO(3),                     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_RGUI, KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
+    ),
 
-  [_SETTINGS] = LAYOUT_ansi(
-      QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO,   KC_NO,     KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,       KC_NO, KC_NO, KC_NO
-  ),
+    [_SETTINGS] = LAYOUT_ansi(
+        QK_BOOT, KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,
+        KC_NO,   KC_NO,   KC_NO,                      KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+    ),
 };
 
 #if defined(ENCODER_MAP_ENABLE)

From b5e26ccb9401c5d5393110620fde9d67b7787634 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 15 Oct 2022 14:26:56 -0700
Subject: [PATCH 654/959] Y&R Studio NZ67v2 Layout Refactor (#18724)

* info.json: apply friendly formatting

* nz67v2.h: use ____ for KC_NO

* nz67v2.h: add matrix diagram

* add LAYOUT_all

Same matrix as `LAYOUT`, but physically arranged to mimic the keyboard layout.

Rotary encoder positions move from the bottom row to the top row.

* refactor keymaps to use LAYOUT_all macro

* info.json: add LAYOUT_all data

* remove LAYOUT macro

Now unused.

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_space

* remove dead space from layouts

Remove empty space from `LAYOUT_65_ansi_blocker` and `LAYOUT_65_ansi_blocker_split_space` layouts.
---
 keyboards/yandrstudio/nz67v2/info.json        | 596 +++++++-----------
 .../nz67v2/keymaps/default/keymap.c           |  24 +-
 .../yandrstudio/nz67v2/keymaps/via/keymap.c   |  40 +-
 keyboards/yandrstudio/nz67v2/nz67v2.h         |  69 +-
 4 files changed, 318 insertions(+), 411 deletions(-)

diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index 3e5e2b4afa..033b05a3cb 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -7,375 +7,235 @@
         "device_version": "1.0.0"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {
-                    "label": "EC",
-                    "x": 16,
-                    "y": 0
-                },
-                {
-                    "label": "~",
-                    "x": 0,
-                    "y": 0.5
-                },
-                {
-                    "label": "!",
-                    "x": 1,
-                    "y": 0.5
-                },
-                {
-                    "label": "@",
-                    "x": 2,
-                    "y": 0.5
-                },
-                {
-                    "label": "#",
-                    "x": 3,
-                    "y": 0.5
-                },
-                {
-                    "label": "$",
-                    "x": 4,
-                    "y": 0.5
-                },
-                {
-                    "label": "%",
-                    "x": 5,
-                    "y": 0.5
-                },
-                {
-                    "label": "^",
-                    "x": 6,
-                    "y": 0.5
-                },
-                {
-                    "label": "&",
-                    "x": 7,
-                    "y": 0.5
-                },
-                {
-                    "label": "*",
-                    "x": 8,
-                    "y": 0.5
-                },
-                {
-                    "label": "(",
-                    "x": 9,
-                    "y": 0.5
-                },
-                {
-                    "label": ")",
-                    "x": 10,
-                    "y": 0.5
-                },
-                {
-                    "label": "_",
-                    "x": 11,
-                    "y": 0.5
-                },
-                {
-                    "label": "+",
-                    "x": 12,
-                    "y": 0.5
-                },
-                {
-                    "label": "Backspace",
-                    "x": 13,
-                    "y": 0.5,
-                    "w": 2
-                },
-                {
-                    "label": "Insert",
-                    "x": 15,
-                    "y": 0.5
-                },
-                {
-                    "label": "EC",
-                    "x": 16,
-                    "y": 1
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 1.5,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "{",
-                    "x": 11.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "}",
-                    "x": 12.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "|",
-                    "x": 13.5,
-                    "y": 1.5,
-                    "w": 1.5
-                },
-                {
-                    "label": "PgUp",
-                    "x": 15,
-                    "y": 1.5
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 2.5
-                },
-                {
-                    "label": ":",
-                    "x": 10.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "\"",
-                    "x": 11.75,
-                    "y": 2.5
-                },
-                {
-                    "label": "Enter",
-                    "x": 12.75,
-                    "y": 2.5,
-                    "w": 2.25
-                },
-                {
-                    "label": "PgDn",
-                    "x": 15,
-                    "y": 2.5
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "<",
-                    "x": 9.25,
-                    "y": 3.5
-                },
-                {
-                    "label": ">",
-                    "x": 10.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "?",
-                    "x": 11.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "label": "\u2191",
-                    "x": 14,
-                    "y": 3.5
-                },
-                {
-                    "label": "Delete",
-                    "x": 15,
-                    "y": 3.5
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 1.25,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 2.5,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "x": 3.75,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "x": 6,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "x": 7.75,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 10,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Fn",
-                    "x": 11.25,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "\u2190",
-                    "x": 13,
-                    "y": 4.5
-                },
-                {
-                    "label": "\u2193",
-                    "x": 14,
-                    "y": 4.5
-                },
-                {
-                    "label": "\u2192",
-                    "x": 15,
-                    "y": 4.5
-                }
+                {"label":"~", "x":0, "y":0.5},
+                {"label":"!", "x":1, "y":0.5},
+                {"label":"@", "x":2, "y":0.5},
+                {"label":"#", "x":3, "y":0.5},
+                {"label":"$", "x":4, "y":0.5},
+                {"label":"%", "x":5, "y":0.5},
+                {"label":"^", "x":6, "y":0.5},
+                {"label":"&", "x":7, "y":0.5},
+                {"label":"*", "x":8, "y":0.5},
+                {"label":"(", "x":9, "y":0.5},
+                {"label":")", "x":10, "y":0.5},
+                {"label":"_", "x":11, "y":0.5},
+                {"label":"+", "x":12, "y":0.5},
+                {"label":"Backspace", "x":13, "y":0.5, "w":2},
+                {"label":"EC CCW", "x":16, "y":0},
+                {"label":"Insert", "x":15, "y":0.5},
+                {"label":"EC CW", "x":16, "y":1},
+
+                {"label":"Tab", "x":0, "y":1.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.5},
+                {"label":"W", "x":2.5, "y":1.5},
+                {"label":"E", "x":3.5, "y":1.5},
+                {"label":"R", "x":4.5, "y":1.5},
+                {"label":"T", "x":5.5, "y":1.5},
+                {"label":"Y", "x":6.5, "y":1.5},
+                {"label":"U", "x":7.5, "y":1.5},
+                {"label":"I", "x":8.5, "y":1.5},
+                {"label":"O", "x":9.5, "y":1.5},
+                {"label":"P", "x":10.5, "y":1.5},
+                {"label":"{", "x":11.5, "y":1.5},
+                {"label":"}", "x":12.5, "y":1.5},
+                {"label":"|", "x":13.5, "y":1.5, "w":1.5},
+                {"label":"PgUp", "x":15, "y":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.5},
+                {"label":"S", "x":2.75, "y":2.5},
+                {"label":"D", "x":3.75, "y":2.5},
+                {"label":"F", "x":4.75, "y":2.5},
+                {"label":"G", "x":5.75, "y":2.5},
+                {"label":"H", "x":6.75, "y":2.5},
+                {"label":"J", "x":7.75, "y":2.5},
+                {"label":"K", "x":8.75, "y":2.5},
+                {"label":"L", "x":9.75, "y":2.5},
+                {"label":":", "x":10.75, "y":2.5},
+                {"label":"\"", "x":11.75, "y":2.5},
+                {"label":"Enter", "x":12.75, "y":2.5, "w":2.25},
+                {"label":"PgDn", "x":15, "y":2.5},
+
+                {"label":"Shift", "x":0, "y":3.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3.5},
+                {"label":"X", "x":3.25, "y":3.5},
+                {"label":"C", "x":4.25, "y":3.5},
+                {"label":"V", "x":5.25, "y":3.5},
+                {"label":"B", "x":6.25, "y":3.5},
+                {"label":"N", "x":7.25, "y":3.5},
+                {"label":"M", "x":8.25, "y":3.5},
+                {"label":"<", "x":9.25, "y":3.5},
+                {"label":">", "x":10.25, "y":3.5},
+                {"label":"?", "x":11.25, "y":3.5},
+                {"label":"Shift", "x":12.25, "y":3.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3.5},
+                {"label":"Delete", "x":15, "y":3.5},
+
+                {"label":"Ctrl", "x":0, "y":4.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.5, "w":2.25},
+                {"label":"Space", "x":6, "y":4.5, "w":1.75},
+                {"label":"Space", "x":7.75, "y":4.5, "w":2.25},
+                {"label":"Alt", "x":10, "y":4.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4.5},
+                {"label":"\u2193", "x":14, "y":4.5},
+                {"label":"\u2192", "x":15, "y":4.5}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Insert", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"PgUp", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgDn", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"Delete", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_space": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Insert", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"PgUp", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgDn", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"Delete", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.75},
+                {"label":"Space", "x":7.75, "y":4, "w":2.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
             ]
         }
     }
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
index 7416296d5d..69bf3e8898 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
@@ -17,17 +17,17 @@
 #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_HOME,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
-        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD,KC_SPC, KC_VOLU, KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
-    [1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_VOLD, KC_HOME, KC_VOLU,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,     KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
index c93b321727..93b3027c7a 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
@@ -17,30 +17,30 @@
 #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_HOME,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
-        KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD,KC_SPC, KC_VOLU, KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
-    [1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, 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,
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_VOLD, KC_HOME, KC_VOLU,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,     KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
 #ifdef ENCODER_ENABLE
 keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false};
diff --git a/keyboards/yandrstudio/nz67v2/nz67v2.h b/keyboards/yandrstudio/nz67v2/nz67v2.h
index d60abef4f1..af66280132 100644
--- a/keyboards/yandrstudio/nz67v2/nz67v2.h
+++ b/keyboards/yandrstudio/nz67v2/nz67v2.h
@@ -17,21 +17,68 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, K314, \
-	K400, K401, K402, K403, K404, K405, K406, K407,       K409, K410,       K412, K413, K414  \
+#define ____ KC_NO
+
+/*
+ *                                          optional encoder (404│406)
+ *                                                             \   /
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │000│001│002│003│004│005│006│007│008│009│010│011│012│013    │014│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │100  │101│102│103│104│105│106│107│108│109│110│111│112│113  │114│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │200   │201│202│203│204│205│206│207│208│209│210│211│213     │214│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │300     │301│302│303│304│305│306│307│308│309│310│312   │313│314│
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┴─┬─┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │400 │401 │402 │403     │405   │407     │409 │410 │ │412│413│414│
+ * └────┴────┴────┴────────┴──────┴────────┴────┴────┘ └───┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬────┬────┐
+ * │400 │401 │402 │405                     │409 │410 │ Standard
+ * └────┴────┴────┴────────────────────────┴────┴────┘
+ */
+
+#define LAYOUT_all( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,   K404, K014, K406, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
+    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
+    K400, K401, K402,             K403, K405, K407,       K409, K410,       K412, K413, K414  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO, K312,  K313,  K314 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  KC_NO, K409,  K410,  KC_NO, K412,  K413,  K414 }  \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
+    { K400, K401, K402, K403, K404, K405, K406, K407, ____, K409, K410, ____, K412, K413, K414 }  \
 }
 
+#define LAYOUT_65_ansi_blocker( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
+    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
+    K400, K401, K402,                   K405,             K409, K410,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
+    { K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414 }  \
+}
 
+#define LAYOUT_65_ansi_blocker_split_space( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
+    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
+    K400, K401, K402,             K403, K405, K407,       K409, K410,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
+    { K400, K401, K402, K403, ____, K405, ____, K407, ____, K409, K410, ____, K412, K413, K414 }  \
+}
 
 #ifdef RGB_MATRIX_ENABLE
 #   define URGB_K KC_F24

From 5e4b076af3c99d36632d6b92f3ddd046f38a01af Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 16 Oct 2022 08:29:43 +1100
Subject: [PATCH 655/959] Remove legacy keycodes, part 5 (#18710)

* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
---
 docs/api_docs.md                              |  2 +-
 keyboards/0xc7/61key/keymaps/default/keymap.c |  2 +-
 keyboards/0xc7/61key/keymaps/via/keymap.c     |  2 +-
 .../1up60hse/keymaps/default/keymap.c         |  2 +-
 .../1up60hse/keymaps/via/keymap.c             |  2 +-
 .../1up60hse/keymaps/vosechu/keymap.c         |  2 +-
 .../1up60hte/keymaps/default/keymap.c         |  2 +-
 .../1up60hte/keymaps/hhkb/keymap.c            |  2 +-
 .../1up60hte/keymaps/via/keymap.c             |  2 +-
 .../pi60_hse/keymaps/default/keymap.c         |  2 +-
 .../pi60_hse/keymaps/via/keymap.c             |  2 +-
 .../sweet16/keymaps/dlaroe/keymap.c           |  2 +-
 .../sweet16/keymaps/sebas/keymap.c            |  2 +-
 .../25keys/zinc/keymaps/default/keymap.c      |  2 +-
 .../25keys/zinc/keymaps/ginjake/keymap.c      |  2 +-
 keyboards/25keys/zinc/keymaps/monks/keymap.c  |  2 +-
 keyboards/25keys/zinc/keymaps/via/keymap.c    |  4 +-
 .../4x4/keymaps/default/keymap.c              |  2 +-
 .../40percentclub/4x4/keymaps/via/keymap.c    |  2 +-
 .../5x5/keymaps/default/keymap.c              |  2 +-
 .../40percentclub/5x5/keymaps/via/keymap.c    |  2 +-
 .../gherkin/keymaps/stevexyz/keymap.c         |  2 +-
 .../mf68/keymaps/andyjack/keymap.c            |  2 +-
 .../mf68/keymaps/emdarcher/keymap.c           |  2 +-
 .../4pplet/aekiso60/keymaps/default/keymap.c  |  2 +-
 .../4pplet/aekiso60/keymaps/via/keymap.c      |  2 +-
 .../4pplet/steezy60/keymaps/4pplet/keymap.c   |  2 +-
 .../4pplet/steezy60/keymaps/default/keymap.c  |  2 +-
 .../4pplet/steezy60/keymaps/via/keymap.c      |  2 +-
 .../waffling80/keymaps/default/keymap.c       |  2 +-
 .../4pplet/waffling80/keymaps/via/keymap.c    |  2 +-
 .../4pplet/yakiimo/keymaps/default/keymap.c   |  2 +-
 keyboards/4pplet/yakiimo/keymaps/via/keymap.c |  2 +-
 .../nayeon/keymaps/default/keymap.c           |  2 +-
 .../nayeon/keymaps/iso/keymap.c               |  2 +-
 .../nayeon/keymaps/via/keymap.c               |  2 +-
 .../titan60/keymaps/default/keymap.c          |  2 +-
 .../acekeyboard/titan60/keymaps/iso/keymap.c  |  2 +-
 .../titan60/keymaps/tsangan/keymap.c          |  2 +-
 .../titan60/keymaps/utilitarian/keymap.c      |  2 +-
 .../acheron/austin/keymaps/default/keymap.c   |  4 +-
 keyboards/acheron/austin/keymaps/via/keymap.c |  4 +-
 .../elongate/beta/keymaps/default/keymap.c    |  4 +-
 .../elongate/beta/keymaps/via/keymap.c        |  4 +-
 .../elongate/delta/keymaps/default/keymap.c   |  2 +-
 .../elongate/delta/keymaps/via/keymap.c       |  2 +-
 .../ada/ada1800mini/keymaps/default/keymap.c  |  2 +-
 .../constellation/keymaps/default/keymap.c    |  2 +-
 .../constellation/keymaps/via/keymap.c        |  2 +-
 .../aeboards/ext65/keymaps/default/keymap.c   |  2 +-
 keyboards/aeboards/ext65/keymaps/via/keymap.c |  2 +-
 .../ai03/andromeda/keymaps/default/keymap.c   |  2 +-
 keyboards/ai03/andromeda/keymaps/via/keymap.c |  2 +-
 keyboards/ai03/lunar/keymaps/default/keymap.c |  2 +-
 keyboards/ai03/lunar/keymaps/muzfuz/keymap.c  |  2 +-
 keyboards/ai03/lunar/keymaps/via/keymap.c     |  2 +-
 keyboards/ai03/lunar/keymaps/zyber/keymap.c   |  2 +-
 keyboards/ai03/orbit/keymaps/default/keymap.c |  2 +-
 keyboards/ai03/quasar/keymaps/ai03/keymap.c   |  2 +-
 .../ai03/quasar/keymaps/default/keymap.c      |  2 +-
 keyboards/ai03/soyuz/keymaps/1U/keymap.c      |  2 +-
 keyboards/ai03/soyuz/keymaps/default/keymap.c |  2 +-
 keyboards/ai03/soyuz/keymaps/via/keymap.c     |  2 +-
 keyboards/akb/ogr/keymaps/default/keymap.c    |  2 +-
 keyboards/akb/ogr/keymaps/via/keymap.c        |  2 +-
 keyboards/akb/raine/keymaps/default/keymap.c  |  4 +-
 .../akb/raine/keymaps/mehadviceguy/keymap.c   |  4 +-
 keyboards/al1/keymaps/default/keymap.c        |  2 +-
 keyboards/al1/keymaps/splitbs/keymap.c        |  2 +-
 keyboards/al1/keymaps/via/keymap.c            |  2 +-
 .../zodiark/keymaps/default/keymap.c          |  8 +--
 .../zodiark/keymaps/slimoled/keymap.c         |  8 +--
 .../aleblazer/zodiark/keymaps/via/keymap.c    |  8 +--
 keyboards/alf/x11/keymaps/default/keymap.c    |  2 +-
 keyboards/alf/x11/keymaps/via/keymap.c        |  2 +-
 keyboards/alf/x2/keymaps/default/keymap.c     |  2 +-
 keyboards/alf/x2/keymaps/hhkb_60/keymap.c     |  2 +-
 .../pianoforte/keymaps/default/keymap.c       |  2 +-
 .../aliceh66/pianoforte/keymaps/iso/keymap.c  |  2 +-
 .../aliceh66/pianoforte/keymaps/via/keymap.c  |  2 +-
 .../pianoforte_hs/keymaps/default/keymap.c    |  2 +-
 .../pianoforte_hs/keymaps/via/keymap.c        |  2 +-
 keyboards/alps64/keymaps/crd/keymap.c         |  2 +-
 keyboards/alps64/keymaps/dbroqua/keymap.c     |  2 +-
 keyboards/alps64/keymaps/zyber/keymap.c       |  2 +-
 .../amj84/keymaps/default/keymap.c            |  2 +-
 .../amj96/keymaps/default/keymap.c            |  2 +-
 .../amjpad/keymaps/default/keymap.c           |  4 +-
 .../amjkeyboard/amjpad/keymaps/max/keymap.c   |  2 +-
 keyboards/ano/keymaps/default/keymap.c        |  2 +-
 .../aos/tkl/keymaps/aholland909/keymap.c      |  2 +-
 keyboards/aos/tkl/keymaps/default/keymap.c    |  2 +-
 keyboards/aos/tkl/keymaps/via/keymap.c        |  2 +-
 keyboards/arisu/keymaps/fate/keymap.c         |  2 +-
 keyboards/ash1800/keymaps/default/keymap.c    |  4 +-
 keyboards/ash_xiix/keymaps/default/keymap.c   |  4 +-
 .../modelm_usbc/keymaps/ashpil/keymap.c       |  4 +-
 .../modelm_usbc/keymaps/default/keymap.c      |  4 +-
 keyboards/at_at/660m/keymaps/default/keymap.c |  2 +-
 keyboards/atomic/keymaps/default/keymap.c     |  4 +-
 keyboards/atomic/keymaps/twolayer/keymap.c    |  4 +-
 keyboards/atreus/keymaps/clash/keymap.c       |  2 +-
 keyboards/atreus/keymaps/default/keymap.c     |  2 +-
 keyboards/atreus/keymaps/erlandsona/keymap.c  |  2 +-
 keyboards/atreus/keymaps/henxing/keymap.c     |  2 +-
 keyboards/atreus/keymaps/nojjan/keymap.c      |  2 +-
 keyboards/atreus/keymaps/ptillemans/keymap.c  |  2 +-
 keyboards/atreus/keymaps/via/keymap.c         |  2 +-
 keyboards/atreus/keymaps/xyverz/keymap.c      |  2 +-
 keyboards/atreus/keymaps/yttyx/keymap.c       |  2 +-
 keyboards/atreus62/keymaps/xyverz/keymap.c    |  4 +-
 .../foundation_gamma/keymaps/default/keymap.c |  2 +-
 .../foundation_gamma/keymaps/via/keymap.c     |  2 +-
 .../bacca70/keymaps/debaccabean/keymap.c      |  2 +-
 .../bacca70/keymaps/dede-special/keymap.c     |  2 +-
 keyboards/bajjak/keymaps/5x6/keymap.c         |  2 +-
 keyboards/bajjak/keymaps/default/keymap.c     |  4 +-
 .../barleycorn_smd/keymaps/default/keymap.c   |  2 +-
 keyboards/barleycorn_smd/keymaps/iso/keymap.c |  2 +-
 keyboards/barleycorn_smd/keymaps/via/keymap.c |  2 +-
 .../basekeys/slice/keymaps/default/keymap.c   |  2 +-
 .../keymaps/default_split_left_space/keymap.c |  2 +-
 .../slice/rev1/keymaps/2moons/keymap.c        |  2 +-
 .../slice/rev1/keymaps/default_all/keymap.c   |  2 +-
 .../keymaps/default_split_backspace/keymap.c  |  2 +-
 .../basekeys/slice/rev1/keymaps/via/keymap.c  |  2 +-
 .../rev1_rgb/keymaps/2moons_rgb/keymap.c      |  4 +-
 .../slice/rev1_rgb/keymaps/via/keymap.c       |  2 +-
 .../charybdis/3x5/keymaps/bstiq/keymap.c      |  2 +-
 .../charybdis/3x5/keymaps/via/keymap.c        |  2 +-
 .../bastardkb/dilemma/keymaps/bstiq/keymap.c  |  2 +-
 .../bastardkb/scylla/keymaps/default/keymap.c |  2 +-
 .../scylla/keymaps/german_gaming/keymap.c     |  4 +-
 .../bastardkb/scylla/keymaps/xyverz/keymap.c  |  4 +-
 .../bastardkb/tbk/keymaps/default/keymap.c    |  2 +-
 .../tbk/keymaps/german_gaming/keymap.c        |  4 +-
 .../bastardkb/tbk/keymaps/xyverz/keymap.c     |  4 +-
 .../bear_face/v1/keymaps/default/keymap.c     |  2 +-
 .../bear_face/v2/keymaps/default/keymap.c     |  2 +-
 .../bear_face/v2/keymaps/default_iso/keymap.c |  2 +-
 .../bemeier/bmek/keymaps/default/keymap.c     |  2 +-
 .../biacco42/ergo42/keymaps/koba/keymap.c     |  2 +-
 keyboards/bioi/g60ble/keymaps/via/keymap.c    |  2 +-
 keyboards/bioi/s65/keymaps/default/keymap.c   |  2 +-
 keyboards/bioi/s65/keymaps/via/keymap.c       |  2 +-
 keyboards/blackplum/keymaps/default/keymap.c  |  2 +-
 keyboards/blackplum/keymaps/via/keymap.c      |  2 +-
 .../blank/blank01/keymaps/default/keymap.c    |  2 +-
 keyboards/blank/blank01/keymaps/via/keymap.c  |  2 +-
 .../manibus/keymaps/samurai/keymap.c          |  4 +-
 .../boardrun/bizarre/keymaps/default/keymap.c |  2 +-
 .../bizarre/keymaps/nopunin10did/keymap.c     |  2 +-
 .../boardrun/bizarre/keymaps/via/keymap.c     |  2 +-
 .../boardrun/classic/keymaps/default/keymap.c |  2 +-
 .../boardwalk/keymaps/mcallaster/keymap.c     |  6 +--
 keyboards/boardwalk/keymaps/niclake/keymap.c  |  2 +-
 keyboards/bop/keymaps/default/keymap.c        |  2 +-
 keyboards/bop/keymaps/via/keymap.c            |  6 +--
 keyboards/boston/keymaps/default/keymap.c     |  4 +-
 .../boston/keymaps/rgb-light-layers/keymap.c  |  4 +-
 .../2019/keymaps/default/keymap.c             |  4 +-
 .../frosty_flake/keymaps/default/keymap.c     |  4 +-
 .../frosty_flake/keymaps/tkl/keymap.c         |  2 +-
 .../frosty_flake/keymaps/via/keymap.c         |  2 +-
 .../ghost_squid/keymaps/default/keymap.c      |  4 +-
 .../hid_liber/keymaps/bakageta/keymap.c       |  4 +-
 .../hid_liber/keymaps/default/keymap.c        |  2 +-
 .../kitten_paw/keymaps/default/keymap.c       |  4 +-
 .../kitten_paw/keymaps/ickerwx/keymap.c       |  4 +-
 .../pegasushoof/keymaps/blowrak/keymap.c      |  4 +-
 .../pegasushoof/keymaps/citadel/keymap.c      |  4 +-
 .../pegasushoof/keymaps/default/keymap.c      |  2 +-
 .../pegasushoof/keymaps/default_jis/keymap.c  |  2 +-
 .../tiger_lily/keymaps/default/keymap.c       |  4 +-
 .../tiger_lily/keymaps/default_ansi/keymap.c  |  4 +-
 .../bpiphany/tiger_lily/keymaps/via/keymap.c  |  4 +-
 .../keymaps/default/keymap.json               |  2 +-
 .../keymaps/default_ansi/keymap.c             |  2 +-
 .../keymaps/default_iso/keymap.c              |  2 +-
 .../potato65hs/keymaps/default/keymap.c       |  2 +-
 .../buildakb/potato65hs/keymaps/via/keymap.c  |  2 +-
 .../potato65s/keymaps/default/keymap.c        |  2 +-
 .../buildakb/potato65s/keymaps/via/keymap.c   |  2 +-
 .../cypher/rev6/keymaps/default/keymap.c      |  2 +-
 .../cypher/rev6/keymaps/default_iso/keymap.c  |  2 +-
 .../cypher/rev6/keymaps/via/keymap.c          |  2 +-
 .../canary60rgb/keymaps/default/keymap.c      |  4 +-
 .../canary/canary60rgb/keymaps/via/keymap.c   |  4 +-
 .../balance/keymaps/default/keymap.c          |  2 +-
 .../cannonkeys/balance/keymaps/via/keymap.c   |  2 +-
 .../cloudline/keymaps/default/keymap.c        |  2 +-
 .../cannonkeys/cloudline/keymaps/via/keymap.c |  2 +-
 .../devastatingtkl/keymaps/default/keymap.c   |  2 +-
 .../devastatingtkl/keymaps/via/keymap.c       |  2 +-
 .../hoodrowg/keymaps/default/keymap.c         |  2 +-
 .../cannonkeys/hoodrowg/keymaps/via/keymap.c  |  2 +-
 .../ortho75/keymaps/default/keymap.c          |  4 +-
 .../rekt1800/keymaps/default/keymap.c         |  2 +-
 .../cannonkeys/rekt1800/keymaps/via/keymap.c  |  2 +-
 .../satisfaction75/keymaps/boy_314/keymap.c   |  2 +-
 .../cu80/v1/keymaps/default/keymap.c          |  2 +-
 .../cu80/v2_ansi/keymaps/default/keymap.c     |  2 +-
 .../cu80/v2_ansi/keymaps/via/keymap.c         |  2 +-
 .../cu80/v2_iso/keymaps/default/keymap.c      |  2 +-
 .../cu80/v2_iso/keymaps/via/keymap.c          |  2 +-
 keyboards/catch22/keymaps/default/keymap.c    |  2 +-
 keyboards/cest73/tkm/keymaps/default/keymap.c |  4 +-
 .../sunsetter/keymaps/peott-fr/keymap.c       |  2 +-
 .../candybar_ortho/keymaps/2x3u/keymap.c      |  2 +-
 .../candybar_ortho/keymaps/7u/keymap.c        |  2 +-
 .../candybar_ortho/keymaps/default/keymap.c   |  2 +-
 .../candybar_ortho/keymaps/via/keymap.c       |  2 +-
 .../quark/keymaps/ajp10304/keymap.c           |  2 +-
 .../cb1800/keymaps/default/keymap.c           |  4 +-
 .../cherrybstudio/cb1800/keymaps/via/keymap.c |  4 +-
 .../cb87/keymaps/default/keymap.c             |  2 +-
 .../cherrybstudio/cb87/keymaps/via/keymap.c   |  2 +-
 .../cb87rgb/keymaps/default/keymap.c          |  2 +-
 .../cb87rgb/keymaps/via/keymap.c              |  2 +-
 .../cb87v2/keymaps/default/keymap.c           |  2 +-
 .../cherrybstudio/cb87v2/keymaps/via/keymap.c |  2 +-
 .../cheshire/curiosity/keymaps/crd/keymap.c   |  2 +-
 keyboards/chlx/merro60/keymaps/hhkb/keymap.c  |  2 +-
 .../chlx/str_merro60/keymaps/hhkb/keymap.c    |  2 +-
 .../ckeys/nakey/keymaps/default/keymap.c      |  2 +-
 .../ckeys/obelus/keymaps/default/keymap.c     |  2 +-
 .../clawsome/coupe/keymaps/default/keymap.c   |  2 +-
 .../hatchback/keymaps/default/keymap.c        |  2 +-
 .../luggage_rack/keymaps/default/keymap.c     |  2 +-
 .../clawsome/numeros/keymaps/default/keymap.c |  2 +-
 .../clawsome/sedan/keymaps/default/keymap.c   |  2 +-
 .../sidekick/keymaps/default/keymap.c         |  2 +-
 .../clawsome/suv/keymaps/default/keymap.c     |  4 +-
 .../clueboard/17/keymaps/default/keymap.c     |  4 +-
 .../2x1800/2018/keymaps/default/keymap.json   |  2 +-
 .../2x1800/2018/keymaps/default_4u/keymap.c   |  4 +-
 .../2x1800/2018/keymaps/default_7u/keymap.c   |  4 +-
 .../2x1800/2018/keymaps/macroboard/keymap.c   |  4 +-
 .../2018/keymaps/mouseboard_left/keymap.c     |  4 +-
 .../2018/keymaps/mouseboard_right/keymap.c    |  4 +-
 .../2x1800/2019/keymaps/default/keymap.json   |  2 +-
 .../2019/keymaps/default_1u_ansi/keymap.c     |  4 +-
 .../2019/keymaps/default_1u_iso/keymap.c      |  4 +-
 .../2019/keymaps/default_2u_ansi/keymap.c     |  4 +-
 .../2019/keymaps/default_2u_iso/keymap.c      |  4 +-
 .../2019/keymaps/default_4u_ansi/keymap.c     |  4 +-
 .../2019/keymaps/default_4u_iso/keymap.c      |  4 +-
 .../2019/keymaps/default_7u_ansi/keymap.c     |  4 +-
 .../2019/keymaps/default_7u_iso/keymap.c      |  4 +-
 .../2x1800/2021/keymaps/default/keymap.json   |  4 +-
 .../2x1800/2021/keymaps/default_4u/keymap.c   |  4 +-
 .../2x1800/2021/keymaps/default_7u/keymap.c   |  4 +-
 .../2x1800/2021/keymaps/signboard/keymap.c    |  4 +-
 .../clueboard/66/keymaps/bloodlvst/keymap.c   |  2 +-
 .../clueboard/66/keymaps/caps_fn/keymap.c     |  2 +-
 .../clueboard/66/keymaps/jokrik/keymap.c      |  2 +-
 .../clueboard/66/keymaps/maximised/keymap.c   |  2 +-
 .../clueboard/66/keymaps/mouse_keys/keymap.c  |  2 +-
 .../clueboard/66/keymaps/serubin/keymap.c     |  4 +-
 keyboards/clueboard/66/keymaps/smt/keymap.c   |  2 +-
 .../clueboard/66/keymaps/tetris/keymap.c      |  2 +-
 .../66/keymaps/unix_optimized/keymap.c        |  2 +-
 .../66/keymaps/win_optimized/keymap.c         |  2 +-
 .../coarse/ixora/keymaps/default/keymap.c     |  2 +-
 keyboards/compound/keymaps/default/keymap.c   |  2 +-
 keyboards/compound/keymaps/via/keymap.c       |  2 +-
 keyboards/contender/keymaps/default/keymap.c  |  4 +-
 keyboards/contra/keymaps/ryanm101/keymap.c    |  2 +-
 .../converter/a1200/keymaps/default/keymap.c  |  2 +-
 .../converter/adb_usb/keymaps/13bit/keymap.c  |  4 +-
 .../adb_usb/keymaps/default/keymap.c          |  4 +-
 .../converter/adb_usb/keymaps/zyber/keymap.c  |  4 +-
 .../ibm_terminal/keymaps/default/keymap.c     |  8 +--
 .../keymaps/dsanchezseco/keymap.c             |  2 +-
 .../ibm_terminal/keymaps/priyadi/keymap.c     |  4 +-
 .../m0110_usb/keymaps/default/keymap.c        |  6 +--
 .../m0110_usb/keymaps/zyber/keymap.c          |  2 +-
 .../modelm101/keymaps/default/keymap.c        |  4 +-
 .../modelm101/keymaps/iw0rm3r/keymap.c        |  4 +-
 .../keymaps/default/keymap.c                  |  4 +-
 .../periboard_512/keymaps/default/keymap.c    |  4 +-
 .../sun_usb/type5/keymaps/default/keymap.c    |  4 +-
 .../sun_usb/type5/keymaps/sigma/keymap.c      |  4 +-
 .../converter/usb_usb/keymaps/ble/keymap.c    |  4 +-
 .../usb_usb/keymaps/chriskopher/keymap.c      |  8 +--
 .../usb_usb/keymaps/coloneljesus/keymap.c     |  4 +-
 .../usb_usb/keymaps/default/keymap.c          |  4 +-
 .../converter/usb_usb/keymaps/narze/keymap.c  | 12 ++---
 .../converter/xt_usb/keymaps/default/keymap.c |  6 +--
 .../discipad/keymaps/default/keymap.c         |  2 +-
 .../discipad/keymaps/via/keymap.c             |  2 +-
 .../discipline/keymaps/noroadsleft/keymap.c   |  2 +-
 .../mulletpad/keymaps/default/keymap.c        |  2 +-
 .../mysterium/keymaps/ansi_7u/keymap.c        |  2 +-
 .../mysterium/keymaps/default/keymap.c        |  2 +-
 .../mysterium/keymaps/iso/keymap.c            |  2 +-
 .../mysterium/keymaps/via/keymap.c            |  2 +-
 .../bloomer/v2/keymaps/default/keymap.c       |  2 +-
 .../bloomer/v3/keymaps/default/keymap.c       |  2 +-
 keyboards/crawlpad/keymaps/default/keymap.c   |  2 +-
 .../keymaps/default/keymap.c                  |  2 +-
 .../glacier/keymaps/default/keymap.c          |  2 +-
 .../creatkeebs/glacier/keymaps/via/keymap.c   |  2 +-
 keyboards/crin/keymaps/default/keymap.c       |  2 +-
 keyboards/crin/keymaps/via/keymap.c           |  2 +-
 keyboards/crkbd/keymaps/benrestech/keymap.c   |  2 +-
 keyboards/crkbd/keymaps/nimishgautam/keymap.c |  2 +-
 keyboards/crkbd/keymaps/rpbaptist/keymap.c    |  2 +-
 keyboards/crkbd/keymaps/toinux/keymap.c       |  2 +-
 keyboards/dc01/left/keymaps/default/keymap.c  |  2 +-
 keyboards/dc01/left/keymaps/via/keymap.c      |  2 +-
 keyboards/dc01/numpad/keymaps/via/keymap.c    |  2 +-
 keyboards/dc01/right/keymaps/default/keymap.c |  2 +-
 keyboards/dc01/right/keymaps/via/keymap.c     |  2 +-
 .../deltasplit75/keymaps/default/keymap.c     |  2 +-
 .../deltasplit75/keymaps/protosplit/keymap.c  |  2 +-
 keyboards/dk60/keymaps/default/keymap.c       |  2 +-
 .../ergoinu/keymaps/default/keymap.c          |  2 +-
 .../ergoinu/keymaps/default_jis/keymap.c      |  2 +-
 .../plaid/keymaps/thehalfdeafchef/keymap.c    |  2 +-
 .../tartan/keymaps/default/keymap.c           |  2 +-
 .../dm9records/tartan/keymaps/via/keymap.c    |  2 +-
 keyboards/do60/keymaps/crd/keymap.c           |  2 +-
 keyboards/do60/keymaps/default/keymap.c       |  2 +-
 keyboards/do60/keymaps/test/keymap.c          |  2 +-
 keyboards/do60/keymaps/via/keymap.c           |  2 +-
 .../budget96/keymaps/default/keymap.c         |  2 +-
 .../budget96/keymaps/donut/keymap.c           |  2 +-
 .../donutcables/budget96/keymaps/via/keymap.c |  2 +-
 .../doro67/multi/keymaps/konstantin/keymap.c  |  2 +-
 keyboards/dp60/keymaps/via/keymap.c           |  2 +-
 .../scarlet/keymaps/default/keymap.c          |  2 +-
 .../draytronics/scarlet/keymaps/via/keymap.c  |  2 +-
 .../dtisaac/cg108/keymaps/default/keymap.c    |  4 +-
 .../dtisaac01/keymaps/default/keymap.c        |  2 +-
 .../dtisaac/dtisaac01/keymaps/via/keymap.c    |  2 +-
 .../v2/keymaps/profanum429/keymap.c           |  2 +-
 .../duck/jetfire/keymaps/default/keymap.c     |  4 +-
 .../duck/lightsaver/keymaps/default/keymap.c  |  4 +-
 .../duck/orion/v3/keymaps/default/keymap.c    |  2 +-
 .../ducky/one2mini/keymaps/ansi/keymap.c      |  2 +-
 .../ducky/one2mini/keymaps/default/keymap.c   |  2 +-
 keyboards/ducky/one2mini/keymaps/iso/keymap.c |  2 +-
 .../dumbpad/v1x/keymaps/numpad_media/keymap.c |  2 +-
 .../dgk6x/galaxy/keymaps/default/keymap.json  |  2 +-
 .../dgk6x/galaxy/keymaps/via/keymap.json      |  2 +-
 .../dgk6x/hades/keymaps/default/keymap.json   |  2 +-
 .../dgk6x/hades/keymaps/via/keymap.json       |  2 +-
 .../durgod/k310/keymaps/chimera/keymap.c      |  6 +--
 .../durgod/k310/keymaps/default/keymap.json   |  4 +-
 .../k310/keymaps/default_mac/keymap.json      |  2 +-
 keyboards/durgod/k310/keymaps/typhon/keymap.c |  6 +--
 keyboards/durgod/k310/keymaps/via/keymap.c    |  4 +-
 .../durgod/k320/keymaps/default/keymap.json   |  2 +-
 .../durgod/k320/keymaps/kuenhlee/keymap.c     |  2 +-
 .../durgod/k320/keymaps/moults31/keymap.c     |  2 +-
 keyboards/durgod/k320/keymaps/via/keymap.c    |  2 +-
 .../dyz/dyz_tkl/keymaps/default/keymap.c      |  2 +-
 keyboards/dyz/dyz_tkl/keymaps/via/keymap.c    |  2 +-
 keyboards/dz60/keymaps/256k_HHKB/keymap.c     |  2 +-
 keyboards/dz60/keymaps/60_ansi/keymap.c       |  2 +-
 keyboards/dz60/keymaps/60_tsangan/keymap.c    |  2 +-
 .../keymaps/_bonfire/keymap-parts/layers.c    |  2 +-
 keyboards/dz60/keymaps/atlacat/keymap.c       |  2 +-
 keyboards/dz60/keymaps/coppertop/keymap.c     |  2 +-
 keyboards/dz60/keymaps/crd_ansi/keymap.c      |  2 +-
 keyboards/dz60/keymaps/crd_tsangan/keymap.c   |  2 +-
 keyboards/dz60/keymaps/dbroqua/keymap.c       |  2 +-
 keyboards/dz60/keymaps/gk64/keymap.c          |  2 +-
 keyboards/dz60/keymaps/iso_de_root/keymap.c   |  4 +-
 .../dz60/keymaps/iso_split-spacebar/keymap.c  |  4 +-
 keyboards/dz60/keymaps/itsaferbie/keymap.c    |  2 +-
 keyboards/dz60/keymaps/jdelkins/keymap.c      |  4 +-
 keyboards/dz60/keymaps/joooosh_hhkb/keymap.c  |  2 +-
 keyboards/dz60/keymaps/kream/keymap.c         |  2 +-
 keyboards/dz60/keymaps/krusli/keymap.c        |  2 +-
 keyboards/dz60/keymaps/macos_arrow/keymap.c   |  2 +-
 keyboards/dz60/keymaps/marianas/keymap.c      |  2 +-
 keyboards/dz60/keymaps/mpstewart/keymap.c     |  2 +-
 keyboards/dz60/keymaps/muralisc/keymap.c      |  4 +-
 keyboards/dz60/keymaps/pok3r/keymap.c         |  2 +-
 keyboards/dz60/keymaps/spotpuff/keymap.c      |  4 +-
 keyboards/dz60/keymaps/tailcall/keymap.c      |  2 +-
 keyboards/dz60/keymaps/tarnjotsingh/keymap.c  |  2 +-
 .../dz60/keymaps/tarnjotsingh/layers.json     |  2 +-
 .../dztech/dz60rgb/keymaps/default/keymap.c   |  4 +-
 .../dztech/dz60rgb/keymaps/didel/keymap.c     |  2 +-
 .../dztech/dz60rgb/keymaps/kgreulich/keymap.c |  2 +-
 .../dz60rgb/keymaps/matthewrobo/keymap.c      |  4 +-
 .../dztech/dz60rgb/keymaps/mekanist/keymap.c  |  6 +--
 .../dztech/dz60rgb/keymaps/perseid/keymap.c   |  2 +-
 .../dztech/dz60rgb/keymaps/piv3rt/keymap.c    |  2 +-
 keyboards/dztech/dz60rgb/keymaps/via/keymap.c |  4 +-
 .../dztech/dz60rgb/keymaps/xunz/keymap.c      |  2 +-
 .../dz60rgb_ansi/keymaps/default/keymap.c     |  2 +-
 .../dztech/dz60rgb_ansi/keymaps/kuru/keymap.c |  4 +-
 .../dz60rgb_ansi/keymaps/muralisc/keymap.c    |  4 +-
 .../dztech/dz60rgb_ansi/keymaps/via/keymap.c  |  2 +-
 .../dz60rgb_wkl/keymaps/default/keymap.c      |  2 +-
 .../dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c  |  2 +-
 .../dztech/dz60rgb_wkl/keymaps/via/keymap.c   |  2 +-
 .../dztech/dz64rgb/keymaps/default/keymap.c   |  4 +-
 keyboards/dztech/dz64rgb/keymaps/via/keymap.c |  4 +-
 keyboards/dztech/dz65rgb/keymaps/adi/keymap.c |  2 +-
 .../dz65rgb/keymaps/catrielmuller/keymap.c    |  2 +-
 .../dztech/dz65rgb/keymaps/default/keymap.c   |  2 +-
 .../dztech/dz65rgb/keymaps/jumper149/keymap.c |  2 +-
 .../dz65rgb/keymaps/matthewrobo/keymap.c      |  4 +-
 .../dztech/dz65rgb/keymaps/pagondel/keymap.c  |  2 +-
 .../dz65rgb/keymaps/sbennett13/keymap.c       |  2 +-
 keyboards/dztech/dz65rgb/keymaps/via/keymap.c |  2 +-
 .../dztech/dz96/keymaps/default/keymap.c      |  4 +-
 keyboards/dztech/dz96/keymaps/iso/keymap.c    |  2 +-
 keyboards/dztech/dz96/keymaps/via/keymap.c    |  4 +-
 .../dztech/endless80/keymaps/default/keymap.c |  2 +-
 .../dztech/endless80/keymaps/via/keymap.c     |  2 +-
 keyboards/e88/keymaps/default/keymap.c        |  2 +-
 keyboards/e88/keymaps/via/keymap.c            |  2 +-
 .../ealdin/quadrant/keymaps/default/keymap.c  |  2 +-
 .../ealdin/quadrant/keymaps/via/keymap.c      |  2 +-
 .../e80_1800/keymaps/ansi_6u/keymap.c         |  4 +-
 .../e80_1800/keymaps/ansi_7u/keymap.c         |  4 +-
 .../e80_1800/keymaps/default/keymap.c         |  4 +-
 .../ebastler/e80_1800/keymaps/iso_6u/keymap.c |  4 +-
 .../ebastler/e80_1800/keymaps/iso_7u/keymap.c |  4 +-
 .../ebastler/e80_1800/keymaps/via/keymap.c    |  4 +-
 keyboards/eco/keymaps/bcat/keymap.c           |  2 +-
 keyboards/eco/keymaps/fsck/keymap.c           |  2 +-
 .../hardlight/mk1/keymaps/default/keymap.c    |  2 +-
 .../hardlight/mk2/keymaps/default/keymap.c    |  2 +-
 .../edi/hardlight/mk2/keymaps/kate/keymap.c   |  2 +-
 .../edi/standaside/keymaps/default/keymap.c   |  2 +-
 keyboards/ein_60/keymaps/klackygears/keymap.c |  2 +-
 keyboards/ekow/akira/keymaps/default/keymap.c |  2 +-
 keyboards/ekow/akira/keymaps/via/keymap.c     |  4 +-
 keyboards/emi20/keymaps/default/keymap.c      |  2 +-
 .../ek87/keymaps/default/keymap.c             |  2 +-
 .../ek87/keymaps/via/keymap.c                 |  2 +-
 keyboards/ep/96/keymaps/default/keymap.c      |  2 +-
 .../mollydooker/keymaps/default/keymap.c      |  2 +-
 .../tf_longeboye/keymaps/default/keymap.c     |  2 +-
 keyboards/epoch80/keymaps/default/keymap.c    |  2 +-
 keyboards/epoch80/keymaps/iso/keymap.c        |  2 +-
 keyboards/epoch80/keymaps/tsangan/keymap.c    |  2 +-
 keyboards/epoch80/keymaps/via/keymap.c        |  2 +-
 keyboards/epoch80/keymaps/wkl/keymap.c        |  2 +-
 .../ergodox_ez/keymaps/bepo_tm_style/keymap.c |  4 +-
 .../keymaps/hacker_dvorak/hacker_dvorak.c     |  8 +--
 .../hacker_dvorak/user/process_record_user.c  |  4 +-
 keyboards/ergodox_ez/keymaps/kou/keymap.c     |  2 +-
 keyboards/ergodox_ez/keymaps/lukaus/keymap.c  |  2 +-
 keyboards/ergodox_ez/keymaps/rishka/keymap.c  |  2 +-
 keyboards/evil80/keymaps/default/keymap.c     |  4 +-
 .../evyd13/atom47/keymaps/LEdiodes/keymap.c   |  2 +-
 .../evyd13/atom47/keymaps/default/keymap.c    |  2 +-
 .../atom47/keymaps/junonum_a47/keymap.c       |  2 +-
 keyboards/evyd13/atom47/keymaps/via/keymap.c  |  2 +-
 .../evyd13/eon65/keymaps/mrsendyyk/keymap.c   |  4 +-
 .../evyd13/eon87/keymaps/default/keymap.c     |  2 +-
 keyboards/evyd13/eon87/keymaps/via/keymap.c   |  2 +-
 .../evyd13/eon95/keymaps/default/keymap.c     |  4 +-
 keyboards/evyd13/eon95/keymaps/via/keymap.c   |  4 +-
 .../evyd13/gh80_1800/keymaps/default/keymap.c |  4 +-
 .../evyd13/gh80_1800/keymaps/via/keymap.c     |  4 +-
 .../evyd13/gh80_3700/keymaps/default/keymap.c |  2 +-
 .../evyd13/gh80_3700/keymaps/ps2/keymap.c     |  2 +-
 .../evyd13/gh80_3700/keymaps/rgb/keymap.c     |  2 +-
 .../evyd13/gh80_3700/keymaps/via/keymap.c     |  2 +-
 .../evyd13/mx5160/keymaps/default/keymap.c    |  2 +-
 .../evyd13/nt750/keymaps/default/keymap.c     |  2 +-
 keyboards/evyd13/nt750/keymaps/via/keymap.c   |  2 +-
 .../evyd13/nt980/keymaps/default/keymap.c     |  4 +-
 keyboards/evyd13/nt980/keymaps/via/keymap.c   |  4 +-
 .../evyd13/omrontkl/keymaps/default/keymap.c  |  2 +-
 .../evyd13/quackfire/keymaps/default/keymap.c |  2 +-
 .../evyd13/quackfire/keymaps/via/keymap.c     |  2 +-
 .../evyd13/wasdat/keymaps/default/keymap.c    |  4 +-
 .../wasdat/keymaps/default_iso/keymap.c       |  4 +-
 .../evyd13/wasdat/keymaps/konstantin/keymap.c |  2 +-
 keyboards/evyd13/wasdat/keymaps/via/keymap.c  |  4 +-
 .../wasdat_code/keymaps/default/keymap.c      |  4 +-
 .../wasdat_code/keymaps/default_iso/keymap.c  |  4 +-
 .../evyd13/wasdat_code/keymaps/via/keymap.c   |  4 +-
 keyboards/exclusive/e65/keymaps/crd/keymap.c  |  2 +-
 .../exclusive/e6v2/le/keymaps/johu/keymap.c   |  2 +-
 .../e6v2/oe/keymaps/amnesia0287/keymap.c      |  4 +-
 .../e6v2/oe/keymaps/default/keymap.c          |  2 +-
 .../e85/hotswap/keymaps/default/keymap.c      |  2 +-
 .../e85/hotswap/keymaps/standard/keymap.c     |  2 +-
 .../e85/hotswap/keymaps/tsangan/keymap.c      |  2 +-
 .../e85/hotswap/keymaps/via/keymap.c          |  2 +-
 .../e85/soldered/keymaps/default/keymap.c     |  2 +-
 .../e85/soldered/keymaps/standard/keymap.c    |  2 +-
 .../e85/soldered/keymaps/via/keymap.c         |  2 +-
 .../babyv/keymaps/melonbred/keymap.c          |  2 +-
 keyboards/fc660c/keymaps/dbroqua/keymap.c     |  2 +-
 keyboards/fc660c/keymaps/default/keymap.c     |  2 +-
 keyboards/fc660c/keymaps/default_rgb/keymap.c |  2 +-
 .../fc660c/keymaps/mikefightsbears/keymap.c   |  2 +-
 keyboards/fc660c/keymaps/siroleo/keymap.c     |  2 +-
 keyboards/fc660c/keymaps/via/keymap.c         |  2 +-
 keyboards/fc660c/keymaps/via_rgb/keymap.c     |  2 +-
 keyboards/fc660c/keymaps/zyber/keymap.c       |  2 +-
 .../keymaps/actuation-point-example/keymap.c  |  4 +-
 .../fc980c/keymaps/coloneljesus/keymap.c      |  4 +-
 keyboards/fc980c/keymaps/default/keymap.c     |  4 +-
 keyboards/fc980c/keymaps/via/keymap.c         |  4 +-
 .../feels/feels65/keymaps/default/keymap.c    |  2 +-
 keyboards/feels/feels65/keymaps/via/keymap.c  |  2 +-
 .../fjlabs/ad65/keymaps/default/keymap.c      |  2 +-
 keyboards/fjlabs/ad65/keymaps/via/keymap.c    |  2 +-
 .../fjlabs/avalon/keymaps/default/keymap.c    |  2 +-
 keyboards/fjlabs/avalon/keymaps/via/keymap.c  |  2 +-
 .../fjlabs/bks65/keymaps/default/keymap.c     |  2 +-
 keyboards/fjlabs/bks65/keymaps/via/keymap.c   |  2 +-
 .../bks65solder/keymaps/default/keymap.c      |  2 +-
 .../fjlabs/bks65solder/keymaps/via/keymap.c   |  2 +-
 .../fjlabs/kf87/keymaps/default/keymap.c      |  2 +-
 keyboards/fjlabs/kf87/keymaps/via/keymap.c    |  2 +-
 .../fjlabs/kyuu/keymaps/default/keymap.c      |  2 +-
 keyboards/fjlabs/kyuu/keymaps/via/keymap.c    |  2 +-
 .../fjlabs/ldk65/keymaps/default/keymap.c     |  2 +-
 keyboards/fjlabs/ldk65/keymaps/via/keymap.c   |  2 +-
 .../fjlabs/midway60/keymaps/default/keymap.c  |  2 +-
 .../fjlabs/midway60/keymaps/via/keymap.c      |  2 +-
 .../mk61rgbansi/keymaps/default/keymap.c      |  2 +-
 .../fjlabs/mk61rgbansi/keymaps/via/keymap.c   |  2 +-
 .../fjlabs/polaris/keymaps/default/keymap.c   |  2 +-
 keyboards/fjlabs/polaris/keymaps/via/keymap.c |  2 +-
 .../fjlabs/ready100/keymaps/default/keymap.c  |  2 +-
 .../fjlabs/ready100/keymaps/via/keymap.c      |  2 +-
 .../fjlabs/sinanju/keymaps/default/keymap.c   |  2 +-
 .../sinanju/keymaps/default_ansi_wkl/keymap.c |  2 +-
 keyboards/fjlabs/sinanju/keymaps/via/keymap.c |  2 +-
 .../fjlabs/sinanjuwk/keymaps/default/keymap.c |  2 +-
 .../fjlabs/sinanjuwk/keymaps/via/keymap.c     |  2 +-
 .../fjlabs/solanis/keymaps/default/keymap.c   |  2 +-
 keyboards/fjlabs/solanis/keymaps/via/keymap.c |  2 +-
 .../fjlabs/tf60ansi/keymaps/default/keymap.c  |  2 +-
 .../fjlabs/tf60ansi/keymaps/via/keymap.c      |  2 +-
 .../fjlabs/tf60v2/keymaps/default/keymap.c    |  2 +-
 keyboards/fjlabs/tf60v2/keymaps/via/keymap.c  |  2 +-
 .../fjlabs/tf65rgbv2/keymaps/default/keymap.c |  2 +-
 .../fjlabs/tf65rgbv2/keymaps/via/keymap.c     |  2 +-
 .../downbubble/keymaps/default/keymap.c       | 10 ++--
 .../flehrad/numbrero/keymaps/default/keymap.c |  2 +-
 .../flehrad/snagpad/keymaps/default/keymap.c  |  4 +-
 .../flehrad/snagpad/keymaps/via/keymap.c      |  2 +-
 keyboards/fluorite/keymaps/default/keymap.c   | 10 ++--
 .../flx/lodestone/keymaps/default/keymap.c    |  2 +-
 .../lodestone/keymaps/default_ansi/keymap.c   |  2 +-
 .../lodestone/keymaps/default_iso/keymap.c    |  2 +-
 keyboards/flx/lodestone/keymaps/via/keymap.c  |  2 +-
 keyboards/flx/virgo/keymaps/default/keymap.c  |  2 +-
 keyboards/flx/virgo/keymaps/via/keymap.c      |  2 +-
 .../foostan/cornelius/keymaps/hvp/keymap.c    |  2 +-
 .../leaf60/hotswap/keymaps/crd/keymap.c       |  2 +-
 .../time_re/hotswap/keymaps/default/keymap.c  |  2 +-
 .../time_re/hotswap/keymaps/via/keymap.c      |  2 +-
 .../universal/keymaps/default/keymap.c        |  2 +-
 .../time_re/universal/keymaps/via/keymap.c    |  2 +-
 .../fr4/southpaw75/keymaps/default/keymap.c   |  2 +-
 keyboards/ft/mars65/keymaps/default/keymap.c  |  2 +-
 keyboards/ft/mars65/keymaps/via/keymap.c      |  2 +-
 keyboards/ft/mars80/keymaps/default/keymap.c  |  2 +-
 .../eclipse_65/keymaps/default/keymap.c       |  2 +-
 .../genone/eclipse_65/keymaps/via/keymap.c    |  2 +-
 .../genone/g1_65/keymaps/default/keymap.c     |  2 +-
 keyboards/genone/g1_65/keymaps/via/keymap.c   |  2 +-
 .../genesis/hotswap/keymaps/default/keymap.c  |  2 +-
 .../genesis/hotswap/keymaps/via/keymap.c      |  2 +-
 .../genesis/solder/keymaps/default/keymap.c   |  2 +-
 .../genesis/solder/keymaps/via/keymap.c       |  2 +-
 keyboards/gh60/revc/keymaps/dbroqua/keymap.c  |  2 +-
 .../gh60/revc/keymaps/dbroqua_7U/keymap.c     |  2 +-
 .../gh60/revc/keymaps/robotmaxtron/keymap.c   |  2 +-
 keyboards/gh60/satan/keymaps/ben_iso/keymap.c |  2 +-
 keyboards/gh60/satan/keymaps/dbroqua/keymap.c |  2 +-
 .../gh60/satan/keymaps/dkrieger/keymap.c      |  2 +-
 keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c |  2 +-
 .../satan/keymaps/olligranlund_iso/keymap.c   |  2 +-
 keyboards/gh60/satan/keymaps/poker/keymap.c   |  2 +-
 keyboards/gh60/satan/keymaps/sethbc/keymap.c  |  4 +-
 .../gh60/satan/keymaps/stanleylai/keymap.c    |  2 +-
 keyboards/gh60/v1p3/keymaps/default/keymap.c  |  2 +-
 .../gh60/v1p3/keymaps/default_ansi/keymap.c   |  2 +-
 .../gh60/v1p3/keymaps/factory_hhkb/keymap.c   |  2 +-
 .../v1p3/keymaps/factory_layout9/keymap.c     |  2 +-
 .../gh60/v1p3/keymaps/factory_minila/keymap.c |  2 +-
 .../gh60/v1p3/keymaps/factory_poker/keymap.c  |  2 +-
 keyboards/gh80_3000/keymaps/ansi_std/keymap.c |  4 +-
 keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c |  4 +-
 keyboards/gh80_3000/keymaps/default/keymap.c  |  4 +-
 .../gh80_3000/keymaps/iso_default/keymap.c    |  4 +-
 keyboards/gh80_3000/keymaps/iso_std/keymap.c  |  4 +-
 keyboards/gh80_3000/keymaps/iso_wkl/keymap.c  |  4 +-
 .../gmmk2/p96/ansi/keymaps/default/keymap.c   |  2 +-
 .../gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c  |  2 +-
 .../gmmk2/p96/iso/keymaps/default/keymap.c    |  2 +-
 .../gmmk/gmmk2/p96/iso/keymaps/via/keymap.c   |  2 +-
 .../pro/rev1/ansi/keymaps/cedrikl/keymap.c    |  2 +-
 .../pro/rev1/ansi/keymaps/gourdo1/keymap.c    |  8 +--
 .../pro/rev1/ansi/keymaps/jonavin/keymap.c    |  4 +-
 .../pro/rev1/ansi/keymaps/paddlegame/keymap.c |  2 +-
 .../rev1/ansi/keymaps/stickandgum/keymap.c    |  2 +-
 .../rev1/ansi/keymaps/wholesomeducky/keymap.c |  2 +-
 .../pro/rev1/iso/keymaps/gourdo1/keymap.c     |  8 +--
 .../pro/rev1/iso/keymaps/jonavin/keymap.c     |  4 +-
 keyboards/gon/nerd60/keymaps/default/keymap.c |  2 +-
 keyboards/gon/nerd60/keymaps/mauin/keymap.c   |  2 +-
 keyboards/gon/nerd60/keymaps/via/keymap.c     |  2 +-
 .../gon/nerdtkl/keymaps/default/keymap.c      |  2 +-
 .../gon/nerdtkl/keymaps/gam3cat/keymap.c      |  2 +-
 keyboards/gon/nerdtkl/keymaps/via/keymap.c    |  2 +-
 .../gopolar/gg86/keymaps/bongocat/keymap.c    |  2 +-
 .../gopolar/gg86/keymaps/default/keymap.c     |  2 +-
 .../gopolar/gg86/keymaps/horrortroll/keymap.c |  2 +-
 keyboards/gopolar/gg86/keymaps/via/keymap.c   |  2 +-
 .../gorthage_truck/keymaps/default/keymap.c   |  4 +-
 .../apollo80/keymaps/default/keymap.c         |  2 +-
 .../gray_studio/apollo80/keymaps/via/keymap.c |  2 +-
 .../space65/keymaps/default/keymap.c          |  2 +-
 keyboards/hadron/ver3/keymaps/ishtob/keymap.c |  2 +-
 keyboards/hand88/keymaps/default/keymap.c     |  2 +-
 keyboards/hand88/keymaps/via/keymap.c         |  2 +-
 .../keymaps/default/keymap.c                  |  4 +-
 .../108key_trackpoint/keymaps/dvorak/keymap.c |  4 +-
 .../keymaps/dvorak_media/keymap.c             |  4 +-
 .../arrow_pad/keymaps/default/keymap.c        |  2 +-
 .../arrow_pad/keymaps/pad_21/keymap.c         |  2 +-
 .../arrow_pad/keymaps/pad_24/keymap.c         |  2 +-
 .../atreus50/keymaps/ajp10304/keymap.c        |  2 +-
 .../baredev/rev1/keymaps/default/keymap.c     |  2 +-
 .../baredev/rev1/keymaps/via/keymap.c         |  2 +-
 .../redragon_vara/keymaps/default/keymap.c    |  4 +-
 .../redragon_vara/keymaps/via/keymap.c        |  4 +-
 .../bstk100/keymaps/default/keymap.c          |  2 +-
 .../handwired/bstk100/keymaps/via/keymap.c    |  2 +-
 .../handwired/cmd60/keymaps/default/keymap.c  |  4 +-
 .../handwired/d48/keymaps/anderson/keymap.c   |  4 +-
 .../handwired/d48/keymaps/default/keymap.c    |  4 +-
 .../4x5/keymaps/ibnuda/keymap.c               |  2 +-
 .../4x6/keymaps/default/keymap.c              |  2 +-
 .../4x6_5/keymaps/default/keymap.c            |  2 +-
 .../5x6/keymaps/default/keymap.c              |  2 +-
 .../5x6/keymaps/impstyle/keymap.c             |  2 +-
 .../5x6/keymaps/nabos/keymap.c                |  2 +-
 .../5x6/keymaps/rishka/keymap.c               |  2 +-
 .../dactyl_manuform/5x6/keymaps/uqs/keymap.c  |  2 +-
 .../5x6_5/keymaps/via/keymap.json             |  2 +-
 .../5x7/keymaps/default/keymap.c              |  2 +-
 .../dactyl_manuform/5x7/keymaps/via/keymap.c  |  4 +-
 .../6x6/keymaps/default/keymap.c              |  2 +-
 .../6x6/keymaps/default_5_thumb/keymap.c      |  2 +-
 .../6x6_4/keymaps/default/keymap.c            |  2 +-
 .../6x7/keymaps/default/keymap.c              |  2 +-
 .../dactyl_promicro/keymaps/impstyle/keymap.c |  2 +-
 .../handwired/daishi/keymaps/default/keymap.c |  4 +-
 .../datahand/keymaps/default/keymap.c         |  2 +-
 .../elrgo_s/keymaps/default/keymap.c          |  2 +-
 .../evk/v1_3/keymaps/default/keymap.c         |  2 +-
 .../fc200rt_qmk/keymaps/default/keymap.c      |  2 +-
 .../frenchdev/keymaps/default/keymap.c        |  6 +--
 .../hnah108/keymaps/default/keymap.c          |  4 +-
 .../handwired/hwpm87/keymaps/default/keymap.c |  2 +-
 .../ibm122m/keymaps/andresteare/keymap.c      |  2 +-
 .../ibm122m/keymaps/default/keymap.c          |  2 +-
 .../handwired/ibm122m/keymaps/lukaus/keymap.c | 12 ++---
 .../handwired/ibm122m/keymaps/via/keymap.c    |  2 +-
 .../handwired/jn68m/keymaps/default/keymap.c  |  2 +-
 .../handwired/jopr/keymaps/default/keymap.c   |  2 +-
 .../jopr/keymaps/modded_white/keymap.c        |  2 +-
 .../handwired/jot50/keymaps/default/keymap.c  |  2 +-
 .../jotanck/keymaps/default/keymap.c          |  2 +-
 .../k_numpad17/keymaps/default/keymap.c       |  2 +-
 .../leftynumpad/keymaps/default/keymap.c      |  2 +-
 .../marauder/keymaps/default/keymap.c         |  4 +-
 .../handwired/marauder/keymaps/orvia/keymap.c |  4 +-
 .../handwired/marauder/keymaps/via/keymap.c   | 16 +++---
 .../meck_tkl/keymaps/default/keymap.c         |  2 +-
 .../myskeeb/keymaps/default/keymap.c          |  4 +-
 .../spaget/keymaps/default/keymap.c           |  2 +-
 .../keymaps/default/keymap.c                  |  4 +-
 .../oem_iso_fullsize/keymaps/default/keymap.c |  4 +-
 .../oem_iso_fullsize/keymaps/via/keymap.c     |  4 +-
 .../handwired/ortho5x14/keymaps/2u/keymap.c   |  4 +-
 .../ortho5x14/keymaps/default/keymap.c        |  2 +-
 .../ortho5x14/keymaps/split1/keymap.c         |  2 +-
 .../handwired/p65rgb/keymaps/default/keymap.c |  2 +-
 .../prime_exl/keymaps/default/keymap.c        |  2 +-
 .../handwired/prime_exl/keymaps/via/keymap.c  |  2 +-
 .../prime_exl_plus/keymaps/default/keymap.c   |  2 +-
 .../prime_exl_plus/keymaps/via/keymap.c       |  2 +-
 .../promethium/keymaps/default/keymap.c       |  2 +-
 .../promethium/keymaps/priyadi/keymap.c       |  2 +-
 .../handwired/qc60/keymaps/wntrmln/keymap.c   |  2 +-
 .../retro_refit/keymaps/default/keymap.c      |  2 +-
 .../selene/keymaps/bpendragon/keymap.c        |  4 +-
 .../handwired/selene/keymaps/default/keymap.c |  4 +-
 .../sick_pad/keymaps/default/keymap.c         |  2 +-
 .../split89/keymaps/default/keymap.c          |  2 +-
 .../swiftrax/beegboy/keymaps/default/keymap.c |  2 +-
 .../swiftrax/beegboy/keymaps/via/keymap.c     |  2 +-
 .../swiftrax/cowfish/keymaps/default/keymap.c |  4 +-
 .../swiftrax/cowfish/keymaps/via/keymap.c     |  2 +-
 .../digicarp65/keymaps/default/keymap.c       |  2 +-
 .../swiftrax/digicarp65/keymaps/via/keymap.c  |  2 +-
 .../swiftrax/glacier/keymaps/default/keymap.c |  4 +-
 .../swiftrax/glacier/keymaps/via/keymap.c     |  4 +-
 .../swiftrax/joypad/keymaps/default/keymap.c  |  2 +-
 .../swiftrax/joypad/keymaps/via/keymap.c      |  2 +-
 .../pandamic/keymaps/default/keymap.c         |  2 +-
 .../swiftrax/pandamic/keymaps/via/keymap.c    |  2 +-
 .../the_galleon/keymaps/default/keymap.c      |  2 +-
 .../swiftrax/the_galleon/keymaps/via/keymap.c |  2 +-
 .../swiftrax/walter/keymaps/default/keymap.c  |  2 +-
 .../swiftrax/walter/keymaps/via/keymap.c      |  2 +-
 .../keymaps/default/keymap.c                  |  2 +-
 .../keymaps/default_mac/keymap.c              |  2 +-
 .../handwired/t111/keymaps/default/keymap.c   |  4 +-
 .../handwired/t111/keymaps/oleg/keymap.c      |  6 +--
 .../terminus_mini/keymaps/default/keymap.c    |  2 +-
 .../4x6_right/keymaps/default/keymap.c        |  2 +-
 .../5x6_right/keymaps/default/keymap.c        |  2 +-
 .../tritium_numpad/keymaps/blu/keymap.c       |  2 +-
 .../tritium_numpad/keymaps/blu/layers.json    |  2 +-
 .../tritium_numpad/keymaps/default/keymap.c   |  4 +-
 .../tritium_numpad/keymaps/max/keymap.c       |  2 +-
 .../unicomp_mini_m/keymaps/default/keymap.c   |  6 +--
 .../handwired/uthol/keymaps/default/keymap.c  |  2 +-
 .../handwired/uthol/keymaps/numswap/keymap.c  |  2 +-
 .../handwired/uthol/keymaps/oled/keymap.c     |  2 +-
 .../videowriter/keymaps/default/keymap.c      |  2 +-
 .../videowriter/keymaps/oleg/keymap.c         |  2 +-
 .../videowriter/keymaps/via/keymap.c          |  2 +-
 .../woodpad/keymaps/default/keymap.c          |  4 +-
 .../xealous/keymaps/default/keymap.c          |  4 +-
 .../handwired/z150/keymaps/default/keymap.c   |  2 +-
 .../handwired/z150/keymaps/zyxx/keymap.c      |  4 +-
 .../otd_plus/keymaps/default/keymap.c         |  2 +-
 keyboards/helix/pico/keymaps/mtei/keymap.c    |  4 +-
 .../helix/rev2/keymaps/five_rows/keymap.c     |  8 +--
 keyboards/helix/rev2/keymaps/froggy/keymap.c  |  2 +-
 .../helix/rev2/keymaps/froggy_106/keymap.c    |  4 +-
 .../rev3_5rows/keymaps/five_rows/keymap.c     |  8 +--
 keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c  |  2 +-
 keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c  |  2 +-
 keyboards/hhkb/ansi/keymaps/default/keymap.c  |  2 +-
 keyboards/hhkb/ansi/keymaps/krusli/keymap.c   |  2 +-
 keyboards/hhkb/ansi/keymaps/lxol/keymap.c     |  2 +-
 keyboards/hhkb/ansi/keymaps/mjt/keymap.c      |  4 +-
 .../hhkb/ansi/keymaps/schaeferdev/keymap.c    |  2 +-
 keyboards/hhkb/ansi/keymaps/shela/keymap.c    |  4 +-
 keyboards/hhkb/ansi/keymaps/smt/keymap.c      |  2 +-
 keyboards/hhkb/ansi/keymaps/via/keymap.c      |  2 +-
 keyboards/hhkb/ansi/keymaps/xyverz/keymap.c   |  2 +-
 keyboards/hhkb/jp/keymaps/bakingpy/keymap.c   |  2 +-
 keyboards/hhkb/jp/keymaps/default/keymap.c    |  2 +-
 .../hhkb/jp/keymaps/default_mac/keymap.c      |  2 +-
 keyboards/hhkb/jp/keymaps/dhertz/keymap.c     |  2 +-
 keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c   |  2 +-
 .../hhkb/jp/keymaps/halfqwerty_jp/keymap.c    |  2 +-
 keyboards/hhkb/jp/keymaps/sh_jp/keymap.c      |  2 +-
 keyboards/hhkb/jp/keymaps/via/keymap.c        |  2 +-
 keyboards/hhkb/yang/keymaps/default/keymap.c  |  2 +-
 keyboards/hhkb/yang/keymaps/kanru/keymap.c    |  2 +-
 .../hhkb_lite_2/keymaps/default/keymap.c      |  2 +-
 keyboards/hhkb_lite_2/keymaps/via/keymap.c    |  2 +-
 .../hidtech/bastyl/keymaps/default/keymap.c   |  2 +-
 .../bastyl/keymaps/german_gaming/keymap.c     |  4 +-
 .../hidtech/bastyl/keymaps/xyverz/keymap.c    |  4 +-
 .../hineybush/h10/keymaps/default/keymap.c    |  2 +-
 keyboards/hineybush/h10/keymaps/via/keymap.c  |  2 +-
 .../hineybush/h87a/keymaps/default/keymap.c   |  2 +-
 .../hineybush/h87a/keymaps/gam3cat/keymap.c   |  2 +-
 .../hineybush/h87a/keymaps/peott-fr/keymap.c  |  4 +-
 keyboards/hineybush/h87a/keymaps/via/keymap.c |  2 +-
 keyboards/hineybush/h87a/keymaps/wkl/keymap.c |  2 +-
 .../hineybush/h88/keymaps/default/keymap.c    |  2 +-
 keyboards/hineybush/h88/keymaps/via/keymap.c  |  2 +-
 keyboards/hineybush/h88/keymaps/wkl/keymap.c  |  2 +-
 .../hineybush/hbcp/keymaps/default/keymap.c   |  4 +-
 .../hineybush/hbcp/keymaps/hiney/keymap.c     |  2 +-
 keyboards/hineybush/hbcp/keymaps/via/keymap.c |  4 +-
 keyboards/hineybush/hbcp/keymaps/wkl/keymap.c |  4 +-
 .../hineyg80/keymaps/default/keymap.c         |  4 +-
 .../hineybush/hineyg80/keymaps/wkl/keymap.c   |  4 +-
 .../hineybush/ibis/keymaps/default/keymap.c   |  4 +-
 .../ibis/keymaps/default_ansi_all/keymap.c    |  4 +-
 .../ibis/keymaps/default_iso_all/keymap.c     |  4 +-
 keyboards/hineybush/ibis/keymaps/via/keymap.c |  4 +-
 .../hnahkb/freyr/keymaps/default/keymap.c     |  2 +-
 .../hnahkb/stella/keymaps/default/keymap.c    |  2 +-
 .../southpaw75/keymaps/default/keymap.c       |  2 +-
 .../southpaw75/keymaps/via/keymap.c           |  2 +-
 keyboards/horizon/keymaps/default/keymap.c    |  2 +-
 .../handwired_k552/keymaps/default/keymap.c   |  4 +-
 .../handwired_k552/keymaps/via/keymap.c       |  4 +-
 keyboards/hub16/keymaps/peepeetee/keymap.c    |  2 +-
 keyboards/hub20/keymaps/default/keymap.c      |  2 +-
 .../hub20/keymaps/left_hand_numpad/keymap.c   |  2 +-
 .../hub20/keymaps/right_hand_numpad/keymap.c  |  2 +-
 keyboards/hub20/keymaps/via/keymap.c          |  2 +-
 .../model_m_4th_gen/keymaps/default/keymap.c  |  4 +-
 .../ibnuda/squiggle/keymaps/default/keymap.c  |  2 +-
 .../squiggle/keymaps/default38/keymap.c       |  2 +-
 .../squiggle/keymaps/defaultfull/keymap.c     |  2 +-
 .../squiggle/keymaps/defaultminidox/keymap.c  |  2 +-
 .../keymaps/rick-complicated/keymap.c         |  2 +-
 .../ibnuda/squiggle/keymaps/rick/keymap.c     |  2 +-
 .../idobao/id42/keymaps/default/keymap.c      |  2 +-
 keyboards/idobao/id42/keymaps/idobao/keymap.c |  2 +-
 keyboards/idobao/id42/keymaps/via/keymap.c    |  2 +-
 .../idobao/id63/keymaps/default/keymap.c      |  2 +-
 keyboards/idobao/id63/keymaps/idobao/keymap.c |  2 +-
 keyboards/idobao/id63/keymaps/via/keymap.c    |  2 +-
 .../id67/keymaps/vinorodrigues/keymap.c       |  2 +-
 .../idobao/id75/keymaps/default75/keymap.c    |  4 +-
 keyboards/idobao/id75/keymaps/gkbd/keymap.c   |  2 +-
 .../idobao/id75/keymaps/gkbd_75/keymap.c      |  2 +-
 .../idobao/id75/keymaps/gkbd_orthon/keymap.c  |  2 +-
 .../idobao/id75/keymaps/pathnirvana/keymap.c  |  2 +-
 .../id75/keymaps/xaceofspaidsx/keymap.c       |  4 +-
 .../id80/v3/ansi/keymaps/default/keymap.c     |  2 +-
 .../id80/v3/ansi/keymaps/idobao/keymap.c      |  2 +-
 .../idobao/id80/v3/ansi/keymaps/via/keymap.c  |  2 +-
 .../idobao/id87/v1/keymaps/default/keymap.c   |  2 +-
 keyboards/idobao/id87/v1/keymaps/via/keymap.c |  2 +-
 .../idobao/id87/v2/keymaps/default/keymap.c   |  2 +-
 .../idobao/id87/v2/keymaps/idobao/keymap.c    |  2 +-
 keyboards/idobao/id87/v2/keymaps/via/keymap.c |  2 +-
 .../idobao/id96/keymaps/default/keymap.c      |  2 +-
 keyboards/idobao/id96/keymaps/via/keymap.c    |  2 +-
 .../idobao/montex/v1/keymaps/default/keymap.c |  2 +-
 .../idobao/montex/v1/keymaps/via/keymap.c     |  2 +-
 .../montex/v1rgb/keymaps/default/keymap.c     |  4 +-
 .../idobao/montex/v1rgb/keymaps/via/keymap.c  |  4 +-
 .../idobao/montex/v2/keymaps/default/keymap.c |  4 +-
 .../idobao/montex/v2/keymaps/via/keymap.c     |  4 +-
 .../ilumkb/simpler64/keymaps/default/keymap.c |  2 +-
 .../ilumkb/simpler64/keymaps/via/keymap.c     |  2 +-
 .../keymaps/nordic_ergo/keymap.c              |  2 +-
 .../infinity60/keymaps/default/keymap.c       |  2 +-
 .../infinity60/keymaps/depariel/keymap.c      |  2 +-
 .../infinity60/keymaps/hasu/keymap.c          |  2 +-
 .../infinity60/keymaps/jpetermans/keymap.c    |  2 +-
 .../k_type/keymaps/andrew-fahmy/keymap.c      |  2 +-
 .../input_club/k_type/keymaps/belak/keymap.c  |  2 +-
 .../k_type/keymaps/default/keymap.c           |  2 +-
 .../whitefox/keymaps/billypython/keymap.c     |  2 +-
 .../whitefox/keymaps/default/keymap.c         |  2 +-
 .../whitefox/keymaps/dhertz/keymap.c          |  2 +-
 .../whitefox/keymaps/jetpacktuxedo/keymap.c   |  2 +-
 .../whitefox/keymaps/konstantin/keymap.c      |  2 +-
 keyboards/io_mini1800/keymaps/2x3u/keymap.c   |  2 +-
 .../io_mini1800/keymaps/default/keymap.c      |  2 +-
 keyboards/iron180/keymaps/default/keymap.c    |  2 +-
 keyboards/iron180/keymaps/via/keymap.c        |  2 +-
 keyboards/j80/keymaps/default/keymap.c        |  2 +-
 keyboards/j80/keymaps/default_iso/keymap.c    |  2 +-
 .../s7_elephant/rev1/keymaps/default/keymap.c |  2 +-
 .../s7_elephant/rev2/keymaps/default/keymap.c |  2 +-
 keyboards/janus/keymaps/default/keymap.c      |  4 +-
 keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c |  2 +-
 .../jels/jels88/keymaps/default/keymap.c      |  2 +-
 keyboards/jels/jels88/keymaps/via/keymap.c    |  2 +-
 keyboards/jian/keymaps/advanced/keymap.c      |  2 +-
 keyboards/jian/keymaps/default/keymap.c       |  2 +-
 keyboards/jian/keymaps/left_hand/keymap.c     |  2 +-
 keyboards/jian/keymaps/via/keymap.c           |  2 +-
 keyboards/jm60/keymaps/poker3/keymap.c        |  2 +-
 keyboards/jones/v1/keymaps/default/keymap.c   |  2 +-
 keyboards/jones/v1/keymaps/via/keymap.c       |  2 +-
 keyboards/jorne/keymaps/default/keymap.c      |  2 +-
 keyboards/jorne/keymaps/via/keymap.c          |  2 +-
 .../kabedon78s/keymaps/default/keymap.c       |  2 +-
 .../kabedon/kabedon78s/keymaps/via/keymap.c   |  2 +-
 .../kabedon980/keymaps/default/keymap.c       |  2 +-
 .../kabedon/kabedon980/keymaps/via/keymap.c   |  2 +-
 .../kabedon98e/keymaps/default/keymap.c       |  2 +-
 .../kabedon/kabedon98e/keymaps/via/keymap.c   |  2 +-
 .../chidori/keymaps/default/keymap.c          |  2 +-
 .../chidori/keymaps/extended/keymap.c         | 14 ++---
 .../chidori/keymaps/oled_sample/keymap.c      |  2 +-
 .../scythe/keymaps/default/keymap.c           |  2 +-
 .../scythe/keymaps/forties/keymap.c           |  2 +-
 .../kakunpc/angel17/keymaps/default/keymap.c  |  2 +-
 .../thedogkeyboard/keymaps/default/keymap.c   |  2 +-
 .../thedogkeyboard/keymaps/kakunpc/keymap.c   |  4 +-
 .../gskt00/keymaps/default-poly/keymap.c      |  2 +-
 .../kapcave/gskt00/keymaps/default/keymap.c   |  2 +-
 .../kapcave/gskt00/keymaps/nachie/keymap.c    |  2 +-
 keyboards/kapcave/gskt00/keymaps/via/keymap.c |  2 +-
 .../paladin64/keymaps/default/keymap.c        |  2 +-
 .../kapcave/paladin64/keymaps/via/keymap.c    |  2 +-
 .../kapcave/paladinpad/keymaps/aek/keymap.c   |  2 +-
 .../paladinpad/keymaps/default/keymap.c       |  2 +-
 .../kapcave/paladinpad/keymaps/ortho/keymap.c |  2 +-
 .../kapcave/paladinpad/keymaps/via/keymap.c   |  2 +-
 .../karlb/kbic65/keymaps/default/keymap.c     |  2 +-
 .../karlb/kbic65/keymaps/default_iso/keymap.c |  2 +-
 .../keymaps/default_iso_split_bs/keymap.c     |  2 +-
 keyboards/karlb/kbic65/keymaps/via/keymap.c   |  2 +-
 .../kb_elmo/aek2_usb/keymaps/default/keymap.c |  4 +-
 .../kb_elmo/aek2_usb/keymaps/via/keymap.c     |  4 +-
 .../kb_elmo/elmopad/keymaps/default/keymap.c  |  2 +-
 .../baguette66/rgb/keymaps/default/keymap.c   |  6 +--
 .../baguette66/rgb/keymaps/via/keymap.c       |  6 +--
 .../soldered/keymaps/default/keymap.c         |  6 +--
 .../baguette66/soldered/keymaps/via/keymap.c  |  6 +--
 .../boop65/rgb/keymaps/default/keymap.c       |  2 +-
 .../kbdfans/boop65/rgb/keymaps/via/keymap.c   |  2 +-
 .../bounce/pad/keymaps/default/keymap.c       |  2 +-
 .../kbdfans/bounce/pad/keymaps/via/keymap.c   |  2 +-
 .../kbdfans/kbd19x/keymaps/default/keymap.c   |  4 +-
 .../kbd19x/keymaps/default_iso/keymap.c       |  4 +-
 keyboards/kbdfans/kbd19x/keymaps/via/keymap.c |  4 +-
 keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c |  2 +-
 .../kbdfans/kbd66/keymaps/default/keymap.c    |  2 +-
 keyboards/kbdfans/kbd66/keymaps/iso/keymap.c  |  2 +-
 .../hotswap/keymaps/stevanmilic/keymap.c      |  2 +-
 .../mkiirgb/keymaps/codecoffeecode/keymap.c   |  2 +-
 .../kbd67/mkiirgb/keymaps/default/keymap.c    |  2 +-
 .../kbd67/mkiirgb/keymaps/jonavin/keymap.c    |  4 +-
 .../kemmeldev-4-layered-layout.json           |  2 +-
 .../kbd67/mkiirgb/keymaps/kemmeldev/keymap.c  |  4 +-
 .../mkiirgb/keymaps/kemmeldev/layers.json     |  2 +-
 .../mkiirgb/keymaps/mikefightsbears/keymap.c  |  2 +-
 .../kbd67/mkiirgb/keymaps/via/keymap.c        |  2 +-
 .../mkiirgb_iso/keymaps/default/keymap.c      |  2 +-
 .../kbd67/mkiirgb_iso/keymaps/via/keymap.c    |  2 +-
 .../kbd67/rev1/keymaps/default/keymap.c       |  2 +-
 .../kbdfans/kbd67/rev1/keymaps/koba/keymap.c  |  2 +-
 .../kbd67/rev1/keymaps/martinffx/keymap.c     |  2 +-
 .../kbdfans/kbd67/rev1/keymaps/via/keymap.c   |  2 +-
 .../kbdfans/kbd67/rev2/keymaps/adi/keymap.c   |  2 +-
 .../kbd67/rev2/keymaps/ansi_blocker/keymap.c  |  2 +-
 .../keymaps/ansi_blocker_splitbs/keymap.c     |  2 +-
 .../rev2/keymaps/ansi_split_space/keymap.c    |  2 +-
 .../kbd67/rev2/keymaps/default/keymap.c       |  2 +-
 .../kbdfans/kbd67/rev2/keymaps/droxx/keymap.c |  2 +-
 .../kbd67/rev2/keymaps/jscatena88/keymap.c    |  2 +-
 .../kbdfans/kbd67/rev2/keymaps/koba/keymap.c  |  2 +-
 .../kbd67/rev2/keymaps/rouge8/keymap.c        |  2 +-
 .../kbd67/rev2/keymaps/tucznak/keymap.c       |  4 +-
 .../kbdfans/kbd67/rev2/keymaps/via/keymap.c   |  2 +-
 .../kbdfans/kbd6x/keymaps/dbroqua/keymap.c    |  2 +-
 .../keymaps/hhkb-default-improved/keymap.c    |  2 +-
 .../kbd6x/keymaps/hhkb-default/keymap.c       |  2 +-
 .../kbdfans/kbd6x/keymaps/peott-fr/keymap.c   |  2 +-
 keyboards/kbdfans/kbd6x/keymaps/via/keymap.c  |  2 +-
 .../kbd75/keymaps/aaronireland/keymap.c       |  2 +-
 keyboards/kbdfans/kbd75/keymaps/adit/keymap.c |  2 +-
 .../kbd75/keymaps/noroadsleft/keymap.c        |  2 +-
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |  2 +-
 .../kbdfans/kbd8x/keymaps/default/keymap.c    |  2 +-
 .../keymaps/default_backlighting/keymap.c     |  2 +-
 .../kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c   |  2 +-
 .../kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c |  2 +-
 .../kbd8x_mk2/keymaps/default/keymap.c        |  2 +-
 .../kbd8x_mk2/keymaps/default_ansi/keymap.c   |  2 +-
 .../kbd8x_mk2/keymaps/default_iso/keymap.c    |  2 +-
 .../kbd8x_mk2/keymaps/iso_625/keymap.c        |  2 +-
 .../kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c  |  2 +-
 .../kbdfans/kbd8x_mk2/keymaps/tester/keymap.c |  2 +-
 .../kbdfans/kbd8x_mk2/keymaps/via/keymap.c    |  2 +-
 .../kbdpad/mk1/keymaps/default/keymap.c       |  2 +-
 .../kbdpad/mk2/keymaps/default/keymap.c       |  2 +-
 .../kbdpad/mk2/keymaps/tester/keymap.c        |  2 +-
 .../kbdfans/kbdpad/mk2/keymaps/via/keymap.c   |  2 +-
 .../kbdfans/maja/keymaps/default/keymap.c     |  2 +-
 keyboards/kbdfans/maja/keymaps/via/keymap.c   |  2 +-
 .../maja_soldered/keymaps/default/keymap.c    |  2 +-
 .../maja_soldered/keymaps/via/keymap.c        |  2 +-
 .../niu_mini/keymaps/framtava/keymap.c        |  2 +-
 .../kbdfans/niu_mini/keymaps/mason/keymap.c   |  4 +-
 .../kbdfans/niu_mini/keymaps/tobias/keymap.c  | 32 +++++------
 .../kbdfans/niu_mini/keymaps/tucznak/keymap.c |  4 +-
 .../kbdfans/niu_mini/keymaps/yttyx/keymap.c   |  2 +-
 .../kbdfans/odin/rgb/keymaps/default/keymap.c |  8 +--
 .../kbdfans/odin/rgb/keymaps/via/keymap.c     |  8 +--
 .../odin/soldered/keymaps/default/keymap.c    |  6 +--
 .../odin/soldered/keymaps/via/keymap.c        |  6 +--
 .../kbdfans/phaseone/keymaps/default/keymap.c |  6 +--
 .../keymaps/default_ansi_blocker/keymap.c     |  2 +-
 .../default_ansi_blocker_split_bs/keymap.c    |  2 +-
 .../default_ansi_blocker_tsangan_wkl/keymap.c |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymaps/default_iso_blocker/keymap.c      |  2 +-
 .../default_iso_blocker_split_bs/keymap.c     |  2 +-
 .../default_iso_blocker_tsangan_wkl/keymap.c  |  2 +-
 .../keymap.c                                  |  2 +-
 .../kbdfans/phaseone/keymaps/via/keymap.c     |  6 +--
 .../kbdfans/tiger80/keymaps/default/keymap.c  |  2 +-
 .../kbdfans/tiger80/keymaps/via/keymap.c      |  2 +-
 keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c  |  2 +-
 keyboards/kc60/keymaps/default/keymap.c       |  2 +-
 keyboards/kc60/keymaps/noroadsleft/keymap.c   |  2 +-
 keyboards/kc60/keymaps/stanleylai/keymap.c    |  2 +-
 keyboards/kc60/keymaps/via/keymap.c           |  2 +-
 keyboards/kc60/keymaps/ws2812/keymap.c        |  2 +-
 keyboards/kc60se/keymaps/60_ansi/keymap.c     |  2 +-
 keyboards/kc60se/keymaps/default/keymap.c     |  2 +-
 .../bfo9000/keymaps/abstractkb/keymap.c       |  2 +-
 .../keymaps/insertsnideremarks/keymap.c       | 10 ++--
 .../bfo9000/keymaps/tuesdayjohn/keymap.c      |  6 +--
 .../keebio/choconum/keymaps/default/keymap.c  |  2 +-
 .../keebio/choconum/keymaps/via/keymap.c      |  2 +-
 keyboards/keebio/iris/keymaps/ave-63/keymap.c |  2 +-
 keyboards/keebio/iris/keymaps/blucky/keymap.c |  2 +-
 keyboards/keebio/iris/keymaps/csc027/keymap.c |  2 +-
 .../keebio/iris/keymaps/impstyle/keymap.c     |  2 +-
 .../keebio/iris/keymaps/isolike/keymap.c      |  2 +-
 .../keebio/iris/keymaps/jerryhcooke/keymap.c  |  2 +-
 .../keebio/iris/keymaps/khitsule/keymap.c     |  2 +-
 .../keebio/iris/keymaps/mojitas/keymap.c      |  2 +-
 keyboards/keebio/iris/keymaps/vyolle/keymap.c |  2 +-
 .../keebio/iris/keymaps/yoonbae81/keymap.c    |  2 +-
 .../keebio/kbo5000/keymaps/default/keymap.c   |  2 +-
 keyboards/keebio/kbo5000/keymaps/iso/keymap.c |  2 +-
 keyboards/keebio/kbo5000/keymaps/via/keymap.c |  2 +-
 .../keebio/levinson/keymaps/atreus/keymap.c   |  2 +-
 .../keebio/levinson/keymaps/jyh/keymap.c      |  2 +-
 .../keebio/levinson/keymaps/jyh2/keymap.c     |  2 +-
 .../keebio/levinson/keymaps/steno/keymap.c    |  2 +-
 .../nyquist/keymaps/losinggeneration/keymap.c |  2 +-
 .../keebio/nyquist/keymaps/peott-fr/keymap.c  |  2 +-
 .../keebio/nyquist/keymaps/pipicanim/keymap.c |  2 +-
 .../keebio/quefrency/keymaps/bcat/keymap.c    |  2 +-
 .../keebio/quefrency/keymaps/jonavin/keymap.c |  4 +-
 .../quefrency/keymaps/peott-fr/keymap.c       |  2 +-
 .../quefrency/rev2/keymaps/xeal/keymap.c      |  2 +-
 .../keymaps/insertsnideremarks/keymap.c       |  4 +-
 .../rorschach/keymaps/tuesdayjohn/keymap.c    |  4 +-
 .../tragicforce68/keymaps/default/keymap.c    |  2 +-
 .../keebio/viterbi/keymaps/drashna/keymap.c   |  2 +-
 .../keebio/viterbi/keymaps/vosechu/keymap.c   |  2 +-
 .../freebirdnp/lite/keymaps/via/keymap.c      |  2 +-
 .../freebirdnp/pro/keymaps/via/keymap.c       |  2 +-
 .../freebirdtkl/keymaps/default/keymap.c      |  2 +-
 .../freebirdtkl/keymaps/via/keymap.c          |  2 +-
 .../freebirdtkl/keymaps/wkl/keymap.c          |  2 +-
 .../keybage/radpad/keymaps/default/keymap.c   |  2 +-
 .../keybee/keybee65/keymaps/default/keymap.c  |  2 +-
 .../keybee/keybee65/keymaps/via/keymap.c      |  2 +-
 .../atreus/keymaps/default/keymap.c           |  2 +-
 .../keyboardio/atreus/keymaps/via/keymap.c    |  2 +-
 .../keyboardio/atreus/keymaps/xyverz/keymap.c |  2 +-
 .../keygem/kg60ansi/keymaps/default/keymap.c  |  2 +-
 .../keygem/kg60ansi/keymaps/via/keymap.c      |  2 +-
 .../keygem/kg65rgbv2/keymaps/default/keymap.c |  2 +-
 .../keygem/kg65rgbv2/keymaps/via/keymap.c     |  2 +-
 .../keyhive/absinthe/keymaps/ansi/keymap.c    |  2 +-
 .../keyhive/absinthe/keymaps/default/keymap.c |  2 +-
 .../keyhive/absinthe/keymaps/via/keymap.c     |  2 +-
 .../lattice60/keymaps/default/keymap.c        |  2 +-
 .../lattice60/keymaps/default_hhkb/keymap.c   |  2 +-
 .../lattice60/keymaps/emdarcher/keymap.c      |  4 +-
 .../keyhive/maypad/keymaps/default/keymap.c   |  2 +-
 keyboards/keyhive/maypad/keymaps/via/keymap.c |  2 +-
 .../keyhive/navi10/keymaps/default/keymap.c   |  2 +-
 .../keyhive/navi10/keymaps/emdarcher/keymap.c |  2 +-
 .../southpole/keymaps/default/keymap.c        |  2 +-
 .../southpole/keymaps/foobeard/keymap.c       |  2 +-
 .../keyhive/ut472/keymaps/gardego5/keymap.c   |  2 +-
 keyboards/keyhive/ut472/keymaps/hvp/keymap.c  |  2 +-
 .../ut472/keymaps/stefanopace/keymap.c        |  2 +-
 .../keyhive/ut472/keymaps/tucznak/keymap.c    |  4 +-
 keyboards/kin80/keymaps/andrew/keymap.c       |  2 +-
 keyboards/kin80/keymaps/default/keymap.c      |  2 +-
 keyboards/kin80/keymaps/maxim/keymap.c        |  2 +-
 keyboards/kin80/keymaps/quartz64/keymap.c     |  2 +-
 keyboards/kin80/keymaps/roman/keymap.c        |  2 +-
 keyboards/kinesis/keymaps/default/keymap.c    |  2 +-
 .../kinesis/keymaps/default_pretty/keymap.c   |  2 +-
 keyboards/kinesis/keymaps/dvorak/keymap.c     |  2 +-
 .../keymaps/dvorak_nguyenvietyen/keymap.c     |  2 +-
 keyboards/kinesis/keymaps/farmergreg/keymap.c |  2 +-
 keyboards/kinesis/keymaps/heatxsink/keymap.c  |  4 +-
 .../keymaps/insertsnideremarks/keymap.c       | 10 ++--
 keyboards/kinesis/keymaps/jwon/keymap.c       |  4 +-
 keyboards/kinesis/keymaps/peott-fr/keymap.c   |  4 +-
 keyboards/kinesis/keymaps/stapelberg/keymap.c |  2 +-
 .../kinesis/keymaps/tuesdayjohn/keymap.c      |  6 +--
 keyboards/kinesis/keymaps/tw1t611/keymap.c    |  2 +-
 keyboards/kinesis/keymaps/xyverz/keymap.c     |  8 +--
 .../kinesis/kint36/keymaps/kzar/keymap.c      |  4 +-
 .../emu/hotswap/keymaps/default/keymap.c      |  2 +-
 .../emu/hotswap/keymaps/via/keymap.c          |  2 +-
 .../emu/soldered/keymaps/default/keymap.c     |  2 +-
 .../emu/soldered/keymaps/via/keymap.c         |  2 +-
 .../emu/soldered/keymaps/wkl/keymap.c         |  2 +-
 .../ropro/keymaps/default/keymap.c            |  2 +-
 .../ropro/keymaps/jdayton3/keymap.c           |  4 +-
 keyboards/kira75/keymaps/default/keymap.c     |  2 +-
 keyboards/kira80/keymaps/ansi/keymap.c        |  2 +-
 keyboards/kira80/keymaps/ansi_wkl/keymap.c    |  2 +-
 keyboards/kira80/keymaps/default/keymap.c     |  2 +-
 keyboards/kira80/keymaps/iso/keymap.c         |  2 +-
 keyboards/kira80/keymaps/via/keymap.c         |  2 +-
 .../bakeneko65/rev3/keymaps/default/keymap.c  |  2 +-
 .../bakeneko65/rev3/keymaps/via/keymap.c      |  2 +-
 .../bakeneko80/keymaps/default/keymap.c       |  2 +-
 .../kkatano/wallaby/keymaps/default/keymap.c  |  2 +-
 .../kkatano/yurei/keymaps/default/keymap.c    |  2 +-
 keyboards/kmac/keymaps/default/keymap.c       |  2 +-
 .../kmac/keymaps/default_tkl_ansi/keymap.c    |  2 +-
 .../keymaps/default_tkl_ansi_wkl/keymap.c     |  2 +-
 keyboards/kmac/keymaps/via/keymap.c           |  2 +-
 keyboards/kmac_pad/keymaps/default/keymap.c   |  2 +-
 .../knobgoblin/keymaps/moults31/keymap.c      |  2 +-
 .../kopibeng/mnk88/keymaps/default/keymap.c   |  2 +-
 keyboards/kopibeng/mnk88/keymaps/via/keymap.c |  2 +-
 .../kopibeng/xt8x/keymaps/default/keymap.c    |  2 +-
 keyboards/kopibeng/xt8x/keymaps/via/keymap.c  |  2 +-
 .../kprepublic/bm40hsrgb/keymaps/dan/keymap.c |  2 +-
 .../bm40hsrgb/keymaps/gabustoledo/keymap.c    |  2 +-
 .../bm40hsrgb/keymaps/signynt/keymap.c        |  2 +-
 .../bm40hsrgb/keymaps/signynt_2_loud/keymap.c |  2 +-
 .../keymaps/signynt_2_quiet/keymap.c          |  2 +-
 .../bm43a/keymaps/stevexyz/keymap.c           |  2 +-
 .../rev1/keymaps/ipetepete/keymap.c           |  2 +-
 .../bm65hsrgb_iso/keymaps/p4yne/keymap.c      |  4 +-
 .../rev1/keymaps/deadolus/keymap.c            |  2 +-
 .../bm80hsrgb/keymaps/default/keymap.c        |  2 +-
 .../bm80hsrgb/keymaps/peepeetee/keymap.c      |  2 +-
 .../kprepublic/bm80hsrgb/keymaps/via/keymap.c |  2 +-
 .../bm80v2/keymaps/default/keymap.c           |  2 +-
 .../kprepublic/bm80v2/keymaps/via/keymap.c    |  2 +-
 .../bm80v2_iso/keymaps/default/keymap.c       |  2 +-
 .../bm80v2_iso/keymaps/via/keymap.c           |  2 +-
 .../bm980hsrgb/keymaps/default/keymap.c       |  4 +-
 .../bm980hsrgb/keymaps/peepeetee/keymap.c     |  2 +-
 .../bm980hsrgb/keymaps/via/keymap.c           |  4 +-
 .../cospad/keymaps/default/keymap.c           |  2 +-
 .../keymaps/split_plus_and_zero/keymap.c      |  2 +-
 .../cospad/keymaps/split_zero/keymap.c        |  2 +-
 .../kprepublic/cospad/keymaps/via/keymap.c    |  2 +-
 .../kprepublic/jj40/keymaps/brdlf/keymap.c    |  2 +-
 .../jj40/keymaps/skewwhiffy/keymap.c          |  6 +--
 .../kprepublic/jj40/keymaps/stevexyz/keymap.c |  4 +-
 .../jj50/keymaps/yoonbae81/keymap.c           |  2 +-
 keyboards/ktec/ergodone/keymaps/vega/keymap.c |  2 +-
 keyboards/kv/revt/keymaps/default/keymap.c    |  4 +-
 .../latin17rgb/keymaps/default/keymap.c       |  2 +-
 .../latin17rgb/keymaps/via/keymap.c           |  2 +-
 .../latin47ble/keymaps/default/keymap.c       |  2 +-
 .../latin47ble/keymaps/via/keymap.c           |  2 +-
 .../latin60rgb/keymaps/default/keymap.c       |  2 +-
 .../latin60rgb/keymaps/via/keymap.c           |  2 +-
 keyboards/lets_split/keymaps/henxing/keymap.c |  2 +-
 .../lets_split/keymaps/normacos/keymap.c      |  2 +-
 .../lets_split/keymaps/shaymdev/keymap.c      |  2 +-
 .../lets_split/keymaps/vim-mode/keymap.c      |  2 +-
 keyboards/lets_split/keymaps/zer09/keymap.c   |  4 +-
 .../lfk87/keymaps/ca178858/keymap.c           |  6 +--
 .../lfk87/keymaps/default/keymap.c            |  4 +-
 .../lfkeyboards/lfk87/keymaps/gbchk/keymap.c  |  4 +-
 .../lfkeyboards/lfk87/keymaps/iso/keymap.c    |  2 +-
 .../lfkpad/keymaps/pascalpfeil/keymap.c       |  2 +-
 .../mini1800/keymaps/ca178858/keymap.c        |  2 +-
 .../mini1800/keymaps/default/keymap.c         |  2 +-
 keyboards/lily58/keymaps/bcat/keymap.c        |  2 +-
 keyboards/lily58/keymaps/niolang/keymap.c     |  4 +-
 .../linworks/fave104/keymaps/default/keymap.c |  2 +-
 .../linworks/fave104/keymaps/via/keymap.c     |  2 +-
 .../linworks/fave84h/keymaps/default/keymap.c |  2 +-
 .../linworks/fave84h/keymaps/via/keymap.c     |  2 +-
 .../linworks/fave87/keymaps/default/keymap.c  |  2 +-
 .../linworks/fave87/keymaps/via/keymap.c      |  2 +-
 .../linworks/fave87h/keymaps/default/keymap.c |  2 +-
 .../linworks/fave87h/keymaps/via/keymap.c     |  2 +-
 .../tenkey_plusplus/keymaps/default/keymap.c  |  2 +-
 .../lm60n/keymaps/default/keymap.c            |  4 +-
 .../lm_keyboard/lm60n/keymaps/via/keymap.c    |  4 +-
 .../longnald/corin/keymaps/default/keymap.c   |  2 +-
 .../lucid/alexa/keymaps/default/keymap.c      |  2 +-
 keyboards/lucid/alexa/keymaps/via/keymap.c    |  2 +-
 .../alexa_solder/keymaps/default/keymap.c     |  2 +-
 .../lucid/alexa_solder/keymaps/via/keymap.c   |  2 +-
 .../lucid/kbd8x_hs/keymaps/default/keymap.c   |  2 +-
 .../kbd8x_hs/keymaps/default_7u/keymap.c      |  2 +-
 keyboards/lucid/kbd8x_hs/keymaps/via/keymap.c |  2 +-
 .../lucid/phantom_hs/keymaps/default/keymap.c |  2 +-
 .../lucid/phantom_hs/keymaps/via/keymap.c     |  2 +-
 .../phantom_solder/keymaps/default/keymap.c   |  2 +-
 .../lucid/phantom_solder/keymaps/via/keymap.c |  2 +-
 .../lucid/scarlet/keymaps/default/keymap.c    |  2 +-
 keyboards/lucid/scarlet/keymaps/via/keymap.c  |  2 +-
 keyboards/lz/erghost/keymaps/default/keymap.c |  2 +-
 keyboards/lz/erghost/keymaps/via/keymap.c     |  2 +-
 .../superlyra/keymaps/default/keymap.c        |  2 +-
 .../malevolti/superlyra/keymaps/via/keymap.c  |  2 +-
 .../minidox/keymaps/xyverz/keymap.c           |  2 +-
 .../leftover30/keymaps/default/keymap.c       |  2 +-
 .../rhymestone/keymaps/default/keymap.c       |  2 +-
 .../treadstone32/keymaps/default/keymap.c     |  2 +-
 .../treadstone32/keymaps/like_jis/keymap.c    |  2 +-
 .../rev1/keymaps/like_jis_rs/keymap.c         |  2 +-
 .../massdrop/alt/keymaps/abishalom/keymap.c   |  2 +-
 keyboards/massdrop/alt/keymaps/b_/keymap.c    |  2 +-
 keyboards/massdrop/alt/keymaps/bonta/keymap.c |  2 +-
 .../alt/keymaps/charlesrocket/keymap.c        |  2 +-
 .../massdrop/alt/keymaps/default/keymap.c     |  2 +-
 .../massdrop/alt/keymaps/default_md/keymap.c  |  2 +-
 .../massdrop/alt/keymaps/emptyflask/keymap.c  |  2 +-
 .../massdrop/alt/keymaps/ewersp/keymap.c      |  2 +-
 .../alt/keymaps/favorable-mutation/keymap.c   |  2 +-
 .../massdrop/alt/keymaps/hlmtre/keymap.c      |  2 +-
 .../massdrop/alt/keymaps/jdelkins/keymap.c    |  4 +-
 .../massdrop/alt/keymaps/jdelkins_ss/keymap.c |  2 +-
 keyboards/massdrop/alt/keymaps/mac/keymap.c   |  2 +-
 .../massdrop/alt/keymaps/mac_md/keymap.c      |  2 +-
 .../massdrop/alt/keymaps/pregame/keymap.c     |  2 +-
 .../massdrop/alt/keymaps/reywood/keymap.c     |  2 +-
 .../alt/keymaps/urbanvanilla/keymap.c         |  2 +-
 keyboards/massdrop/alt/keymaps/via/keymap.c   |  2 +-
 keyboards/massdrop/ctrl/config_led.c          |  4 +-
 keyboards/massdrop/ctrl/keymaps/R167/keymap.c |  2 +-
 .../massdrop/ctrl/keymaps/default/keymap.c    |  2 +-
 .../massdrop/ctrl/keymaps/default_md/keymap.c |  2 +-
 .../ctrl/keymaps/endgame/config_led.c         |  4 +-
 .../massdrop/ctrl/keymaps/endgame/keymap.c    |  6 +--
 .../massdrop/ctrl/keymaps/foxx1337/keymap.c   |  2 +-
 keyboards/massdrop/ctrl/keymaps/mac/keymap.c  |  2 +-
 .../massdrop/ctrl/keymaps/mac_md/keymap.c     |  2 +-
 .../ctrl/keymaps/matthewrobo/config_led.c     |  4 +-
 .../ctrl/keymaps/matthewrobo/keymap.c         |  4 +-
 .../massdrop/ctrl/keymaps/r-pufky/keymap.c    |  6 +--
 .../ctrl/keymaps/responsive_pattern/keymap.c  |  2 +-
 keyboards/massdrop/ctrl/keymaps/via/keymap.c  |  2 +-
 .../ctrl/keymaps/xanimos/config_led.c         |  4 +-
 .../massdrop/ctrl/keymaps/xanimos/keymap.c    |  2 +-
 .../massdrop/ctrl/keymaps/xanimos/readme.md   |  2 +-
 .../massdrop/ctrl/keymaps/xulkal/keymap.c     |  4 +-
 .../classy_tkl/keymaps/default/keymap.c       |  2 +-
 .../keymaps/default_tkl_ansi_wkl/keymap.c     |  2 +-
 .../keymaps/default_tkl_iso_wkl/keymap.c      |  2 +-
 .../classy_tkl/keymaps/via/keymap.c           |  2 +-
 .../southpad/keymaps/default/keymap.c         |  2 +-
 .../matrix/abelx/keymaps/default/keymap.c     |  4 +-
 keyboards/matrix/abelx/keymaps/iso/keymap.c   |  4 +-
 .../matrix/cain_re/keymaps/default/keymap.c   |  6 +--
 keyboards/matrix/falcon/keymaps/via/keymap.c  |  2 +-
 .../m12og/rev1/keymaps/default/keymap.c       |  2 +-
 .../m12og/rev2/keymaps/default/keymap.c       |  4 +-
 .../matrix/m12og/rev2/keymaps/iso/keymap.c    |  4 +-
 .../matrix/m12og/rev2/keymaps/via/keymap.c    |  4 +-
 .../matrix/m20add/keymaps/default/keymap.c    |  4 +-
 keyboards/matrix/m20add/keymaps/iso/keymap.c  |  4 +-
 keyboards/matrix/me/keymaps/default/keymap.c  |  2 +-
 keyboards/matrix/me/keymaps/via/keymap.c      |  2 +-
 .../matthewdias/txuu/keymaps/default/keymap.c |  2 +-
 .../matthewdias/txuu/keymaps/via/keymap.c     |  2 +-
 .../mb65h/keymaps/default/keymap.c            |  2 +-
 .../mechbrewery/mb65h/keymaps/via/keymap.c    |  2 +-
 .../mb65s/keymaps/ansi_blocker/keymap.c       |  2 +-
 .../keymaps/ansi_blocker_7u_spc/keymap.c      |  2 +-
 .../mb65s/keymaps/default/keymap.c            |  2 +-
 .../mb65s/keymaps/iso_blocker/keymap.c        |  2 +-
 .../keymaps/iso_blocker_tsangan/keymap.c      |  2 +-
 .../mechbrewery/mb65s/keymaps/via/keymap.c    |  2 +-
 .../espectro/keymaps/default/keymap.c         |  4 +-
 .../mechkeys/espectro/keymaps/iso/keymap.c    |  2 +-
 .../mechkeys/espectro/keymaps/mac/keymap.c    |  2 +-
 .../espectro/keymaps/mikethetiger/keymap.c    |  4 +-
 .../mechmini/v1/keymaps/default/keymap.c      |  2 +-
 .../mechmini/v2/keymaps/arkag/keymap.c        |  2 +-
 .../delphine/keymaps/default/keymap.c         |  2 +-
 .../mechlovin/delphine/keymaps/via/keymap.c   |  2 +-
 .../mechlovin/hex6c/keymaps/default/keymap.c  |  4 +-
 .../mechlovin/hex6c/keymaps/via/keymap.c      |  4 +-
 .../rev1/rogue87/keymaps/default/keymap.c     |  2 +-
 .../rev1/rogue87/keymaps/via/keymap.c         |  2 +-
 .../rev1/rouge87/keymaps/default/keymap.c     |  2 +-
 .../rev1/rouge87/keymaps/via/keymap.c         |  2 +-
 .../infinity87/rev2/keymaps/default/keymap.c  |  2 +-
 .../infinity87/rev2/keymaps/via/keymap.c      |  2 +-
 .../rgb_rev1/keymaps/default/keymap.c         |  2 +-
 .../infinity87/rgb_rev1/keymaps/via/keymap.c  |  2 +-
 .../infinity875/keymaps/default/keymap.c      |  2 +-
 .../infinity875/keymaps/via/keymap.c          |  2 +-
 .../infinity88/keymaps/default/keymap.c       |  2 +-
 .../mechlovin/infinity88/keymaps/via/keymap.c |  2 +-
 .../infinityce/keymaps/default/keymap.c       |  2 +-
 .../mechlovin/infinityce/keymaps/via/keymap.c |  2 +-
 .../olly/bb/keymaps/default/keymap.c          |  2 +-
 .../bb/keymaps/default_ansi_split_bs/keymap.c |  4 +-
 .../bb/keymaps/default_iso_split_bs/keymap.c  |  4 +-
 .../mechlovin/olly/bb/keymaps/via/keymap.c    |  2 +-
 .../olly/jf/keymaps/default/keymap.c          |  2 +-
 .../mechlovin/olly/jf/keymaps/via/keymap.c    |  2 +-
 .../serratus/keymaps/default/keymap.c         |  2 +-
 .../mechlovin/serratus/keymaps/via/keymap.c   |  2 +-
 .../mechlovin/th1800/keymaps/default/keymap.c |  4 +-
 .../mechlovin/th1800/keymaps/via/keymap.c     |  4 +-
 .../bde/rev2/keymaps/default/keymap.c         |  2 +-
 .../mechwild/bde/rev2/keymaps/via/keymap.c    |  2 +-
 .../mercutio/keymaps/jonavin/keymap.c         |  4 +-
 .../murphpad/keymaps/default/keymap.c         |  2 +-
 .../murphpad/keymaps/jonavin/keymap.c         |  6 +--
 .../murphpad/keymaps/jonavin/readme.md        |  2 +-
 .../mechwild/murphpad/keymaps/via/keymap.c    |  2 +-
 .../mechwild/obe/keymaps/jonavin/keymap.c     |  4 +-
 keyboards/mehkee96/keymaps/default/keymap.c   |  2 +-
 keyboards/mehkee96/keymaps/johann/keymap.c    |  2 +-
 .../meletrix/zoom87/keymaps/default/keymap.c  |  2 +-
 .../zoom87/keymaps/default_tkl_f13/keymap.c   |  2 +-
 .../keymaps/default_tkl_f13_split_bs/keymap.c |  2 +-
 .../default_tkl_f13_split_lshift/keymap.c     |  2 +-
 .../default_tkl_f13_split_rshift/keymap.c     |  2 +-
 .../default_tkl_f13_split_space/keymap.c      |  2 +-
 .../meletrix/zoom87/keymaps/via/keymap.c      |  2 +-
 .../melgeek/mach80/keymaps/default/keymap.c   |  2 +-
 keyboards/melgeek/mach80/keymaps/tkl/keymap.c |  2 +-
 keyboards/melgeek/mach80/keymaps/via/keymap.c |  2 +-
 keyboards/melgeek/mach80/keymaps/wkl/keymap.c |  2 +-
 .../melgeek/mj61/keymaps/default/keymap.c     |  2 +-
 keyboards/melgeek/mj61/keymaps/via/keymap.c   |  2 +-
 .../melgeek/mj63/keymaps/default/keymap.c     |  2 +-
 keyboards/melgeek/mj63/keymaps/via/keymap.c   |  2 +-
 .../melgeek/mj64/keymaps/default/keymap.c     |  2 +-
 keyboards/melgeek/mj64/keymaps/via/keymap.c   |  2 +-
 .../melgeek/mj65/keymaps/default/keymap.c     |  2 +-
 keyboards/melgeek/mj65/keymaps/via/keymap.c   |  2 +-
 .../melgeek/mj6xy/keymaps/60_ansi/keymap.c    |  2 +-
 .../mj6xy/keymaps/60_ansi_7u_spc/keymap.c     |  2 +-
 .../keymaps/60_ansi_7u_spc_split_bs/keymap.c  |  2 +-
 .../mj6xy/keymaps/60_ansi_arrow/keymap.c      |  2 +-
 .../keymaps/60_ansi_arrow_3u_spc/keymap.c     |  2 +-
 .../60_ansi_arrow_3u_spc_split_bs/keymap.c    |  2 +-
 .../keymaps/60_ansi_arrow_6u_spc/keymap.c     |  2 +-
 .../60_ansi_arrow_6u_spc_split_bs/keymap.c    |  2 +-
 .../60_ansi_arrow_split_3u_spc/keymap.c       |  2 +-
 .../keymaps/60_ansi_arrow_split_bs/keymap.c   |  2 +-
 .../60_ansi_arrow_split_bs_3u_spc/keymap.c    |  2 +-
 .../mj6xy/keymaps/60_ansi_split_bs/keymap.c   |  2 +-
 .../melgeek/mj6xy/keymaps/60_iso/keymap.c     |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../60_iso_1u_lshift_split_bs_rshift/keymap.c |  2 +-
 .../60_iso_1u_lshift_split_rshift/keymap.c    |  2 +-
 .../mj6xy/keymaps/60_iso_7u_spc/keymap.c      |  2 +-
 .../keymaps/60_iso_7u_spc_split_bs/keymap.c   |  2 +-
 .../60_iso_7u_spc_split_bs_rshift/keymap.c    |  2 +-
 .../60_iso_7u_spc_split_rshift/keymap.c       |  2 +-
 .../mj6xy/keymaps/60_iso_arrow/keymap.c       |  2 +-
 .../keymaps/60_iso_arrow_3u_spc/keymap.c      |  2 +-
 .../60_iso_arrow_3u_spc_split_bs/keymap.c     |  2 +-
 .../keymaps/60_iso_arrow_6u_spc/keymap.c      |  2 +-
 .../60_iso_arrow_6u_spc_split_bs/keymap.c     |  2 +-
 .../60_iso_arrow_split_3u_spc/keymap.c        |  2 +-
 .../keymaps/60_iso_arrow_split_bs/keymap.c    |  2 +-
 .../60_iso_arrow_split_bs_3u_spc/keymap.c     |  2 +-
 .../mj6xy/keymaps/60_iso_split_bs/keymap.c    |  2 +-
 .../keymaps/60_iso_split_bs_rshift/keymap.c   |  2 +-
 .../keymaps/60_iso_split_rshift/keymap.c      |  2 +-
 .../melgeek/mj6xy/keymaps/64_ansi/keymap.c    |  2 +-
 .../mj6xy/keymaps/64_ansi_3u_spc/keymap.c     |  2 +-
 .../keymaps/64_ansi_3u_spc_split_bs/keymap.c  |  2 +-
 .../mj6xy/keymaps/64_ansi_6u_spc/keymap.c     |  2 +-
 .../keymaps/64_ansi_6u_spc_split_bs/keymap.c  |  2 +-
 .../keymaps/64_ansi_split_3u_spc/keymap.c     |  2 +-
 .../mj6xy/keymaps/64_ansi_split_bs/keymap.c   |  2 +-
 .../keymaps/64_ansi_split_bs_3u_spc/keymap.c  |  2 +-
 .../melgeek/mj6xy/keymaps/64_iso/keymap.c     |  2 +-
 .../mj6xy/keymaps/64_iso_3u_spc/keymap.c      |  2 +-
 .../keymaps/64_iso_3u_spc_split_bs/keymap.c   |  2 +-
 .../mj6xy/keymaps/64_iso_6u_spc/keymap.c      |  2 +-
 .../keymaps/64_iso_6u_spc_split_bs/keymap.c   |  2 +-
 .../keymaps/64_iso_split_3u_spc/keymap.c      |  2 +-
 .../mj6xy/keymaps/64_iso_split_bs/keymap.c    |  2 +-
 .../keymaps/64_iso_split_bs_3u_spc/keymap.c   |  2 +-
 .../melgeek/mj6xy/keymaps/default/keymap.c    |  2 +-
 keyboards/melgeek/mj6xy/keymaps/via/keymap.c  |  2 +-
 .../melgeek/mojo68/keymaps/default/keymap.c   |  2 +-
 keyboards/melgeek/mojo68/keymaps/via/keymap.c |  2 +-
 .../melgeek/mojo75/keymaps/default/keymap.c   |  2 +-
 keyboards/melgeek/mojo75/keymaps/via/keymap.c |  2 +-
 .../melgeek/tegic/keymaps/default/keymap.c    |  2 +-
 keyboards/melgeek/tegic/keymaps/via/keymap.c  |  2 +-
 .../melgeek/z70ultra/keymaps/default/keymap.c |  2 +-
 .../melgeek/z70ultra/keymaps/via/keymap.c     |  2 +-
 keyboards/mesa/mesa_tkl/keymaps/ansi/keymap.c |  2 +-
 .../mesa/mesa_tkl/keymaps/default/keymap.c    |  2 +-
 keyboards/mesa/mesa_tkl/keymaps/iso/keymap.c  |  2 +-
 keyboards/mesa/mesa_tkl/keymaps/via/keymap.c  |  2 +-
 .../timberwolf/keymaps/b_ansi/keymap.c        |  2 +-
 .../timberwolf/keymaps/b_iso/keymap.c         |  2 +-
 .../timberwolf/keymaps/default/keymap.c       |  2 +-
 .../timberwolf/keymaps/prime_ansi/keymap.c    |  2 +-
 .../timberwolf/keymaps/prime_iso/keymap.c     |  2 +-
 .../miller/gm862/keymaps/default/keymap.c     |  2 +-
 keyboards/miller/gm862/keymaps/via/keymap.c   |  2 +-
 .../index_tab/keymaps/default/keymap.c        |  2 +-
 .../index_tab/keymaps/default_2x2u/keymap.c   |  2 +-
 .../keymaps/default_7u_space/keymap.c         |  2 +-
 .../chocolatebar/keymaps/default/keymap.c     |  4 +-
 .../chocolatebar/keymaps/via/keymap.c         |  4 +-
 .../karina/keymaps/default/keymap.c           |  2 +-
 keyboards/mitosis/keymaps/datagrok/keymap.c   |  4 +-
 keyboards/mitosis/keymaps/nzen/keymap.c       |  2 +-
 keyboards/mnk1800s/keymaps/default/keymap.c   |  4 +-
 keyboards/mnk1800s/keymaps/via/keymap.c       |  4 +-
 keyboards/mnk50/keymaps/default/keymap.c      |  2 +-
 keyboards/mnk50/keymaps/via/keymap.c          |  2 +-
 .../xo87/rgb/keymaps/default/keymap.c         |  2 +-
 .../monstargear/xo87/rgb/keymaps/via/keymap.c |  2 +-
 .../xo87/solderable/keymaps/default/keymap.c  |  2 +-
 .../xo87/solderable/keymaps/via/keymap.c      |  2 +-
 keyboards/moon/keymaps/default/keymap.c       |  2 +-
 .../moon/keymaps/default_tkl_ansi/keymap.c    |  2 +-
 .../keymaps/default_tkl_ansi_wkl/keymap.c     |  2 +-
 .../moon/keymaps/default_tkl_iso/keymap.c     |  2 +-
 .../moon/keymaps/default_tkl_iso_wkl/keymap.c |  2 +-
 keyboards/morizon/keymaps/default/keymap.c    |  2 +-
 keyboards/ms_sculpt/keymaps/default/keymap.c  |  2 +-
 .../modelm/keymaps/default/keymap.c           |  8 +--
 .../mt/blocked65/keymaps/default/keymap.c     |  2 +-
 keyboards/mt/blocked65/keymaps/via/keymap.c   |  2 +-
 keyboards/mt/mt980/keymaps/default/keymap.c   |  4 +-
 keyboards/mt/mt980/keymaps/walker/keymap.c    |  6 +--
 .../murcielago/rev1/keymaps/default/keymap.c  |  2 +-
 .../murcielago/rev1/keymaps/via/keymap.c      |  2 +-
 .../wyvern/keymaps/default/keymap.c           |  2 +-
 .../mysticworks/wyvern/keymaps/via/keymap.c   |  2 +-
 .../g67/element_hs/keymaps/default/keymap.c   |  2 +-
 .../g67/element_hs/keymaps/via/keymap.c       |  2 +-
 .../g67/hotswap/keymaps/default/keymap.c      |  2 +-
 .../neokeys/g67/hotswap/keymaps/via/keymap.c  |  2 +-
 .../g67/soldered/keymaps/default/keymap.c     |  2 +-
 .../neokeys/g67/soldered/keymaps/via/keymap.c |  2 +-
 .../n87/keymaps/default/keymap.c              |  2 +-
 .../n87/keymaps/symmetric_standard/keymap.c   |  2 +-
 .../n87/keymaps/tsangan/keymap.c              |  2 +-
 .../nightly_boards/n87/keymaps/via/keymap.c   |  2 +-
 .../oxalys80/keymaps/default/keymap.c         |  2 +-
 .../nix_studio/oxalys80/keymaps/via/keymap.c  |  2 +-
 .../jabberwocky/keymaps/default/keymap.c      |  4 +-
 .../jabberwocky/keymaps/nopunin10did/keymap.c |  4 +-
 .../jabberwocky/keymaps/via/keymap.c          |  4 +-
 .../kastenwagen1840/keymaps/default/keymap.c  |  6 +--
 .../kastenwagen1840/keymaps/via/keymap.c      |  6 +--
 .../kastenwagen48/keymaps/default/keymap.c    |  2 +-
 .../kastenwagen48/keymaps/jonavin/keymap.c    |  4 +-
 .../kastenwagen48/keymaps/via/keymap.c        |  2 +-
 .../railroad/rev0/keymaps/default/keymap.c    |  2 +-
 .../rev0/keymaps/nopunin10did/keymap.c        |  2 +-
 .../novelkeys/nk20/keymaps/default/keymap.c   |  2 +-
 keyboards/novelkeys/nk20/keymaps/via/keymap.c |  2 +-
 .../novelkeys/nk87/keymaps/default/keymap.c   |  2 +-
 keyboards/novelkeys/nk87/keymaps/via/keymap.c |  2 +-
 .../novelkeys/nk87b/keymaps/default/keymap.c  |  2 +-
 .../novelkeys/nk87b/keymaps/via/keymap.c      |  2 +-
 .../novelkeys/novelpad/keymaps/0xdec/keymap.c |  2 +-
 .../novelpad/keymaps/default/keymap.c         |  2 +-
 keyboards/noxary/220/keymaps/default/keymap.c |  2 +-
 keyboards/noxary/220/keymaps/via/keymap.c     |  2 +-
 keyboards/noxary/280/keymaps/default/keymap.c |  2 +-
 keyboards/noxary/280/keymaps/via/keymap.c     |  2 +-
 keyboards/nullbitsco/tidbit/tidbit.c          |  2 +-
 keyboards/numatreus/keymaps/hdbx/keymap.c     |  2 +-
 keyboards/numatreus/keymaps/like_jis/keymap.c |  6 +--
 .../nyhxis/nfr_70/keymaps/default/keymap.c    |  2 +-
 .../nyhxis/nfr_70/keymaps/tsangan/keymap.c    |  2 +-
 keyboards/nyhxis/nfr_70/keymaps/via/keymap.c  |  2 +-
 .../ocean/addon/keymaps/default/keymap.c      |  2 +-
 keyboards/ocean/addon/keymaps/via/keymap.c    |  2 +-
 .../rev1/keymaps/shadowprogr/keymap.c         |  2 +-
 .../5x6_5x8/keymaps/derekhsu/keymap.c         |  2 +-
 keyboards/omnikeyish/keymaps/default/keymap.c |  2 +-
 .../omnikeyish/keymaps/default_101/keymap.c   |  2 +-
 keyboards/org60/keymaps/default/keymap.c      |  2 +-
 keyboards/orthodox/keymaps/shaymdev/keymap.c  |  2 +-
 .../owlab/spring/keymaps/default/keymap.c     |  2 +-
 keyboards/owlab/spring/keymaps/via/keymap.c   |  2 +-
 .../suit80/ansi/keymaps/default/keymap.c      |  2 +-
 .../owlab/suit80/ansi/keymaps/via/keymap.c    |  2 +-
 .../owlab/suit80/iso/keymaps/default/keymap.c |  2 +-
 .../owlab/suit80/iso/keymaps/via/keymap.c     |  2 +-
 .../pabile/p20/ver1/keymaps/default/keymap.c  |  4 +-
 .../pabile/p20/ver2/keymaps/default/keymap.c  |  2 +-
 keyboards/pabile/p40/keymaps/default/keymap.c |  2 +-
 .../pabile/p40_ortho/keymaps/default/keymap.c |  2 +-
 keyboards/pabile/p42/keymaps/default/keymap.c |  2 +-
 .../paprikman/albacore/keymaps/pulp/keymap.c  |  2 +-
 .../zeuspad/keymaps/default/keymap.c          |  2 +-
 .../pearlboards/zeuspad/keymaps/via/keymap.c  |  2 +-
 .../peej/tripel/keymaps/default/keymap.c      |  2 +-
 keyboards/peej/tripel/keymaps/via/keymap.c    |  2 +-
 .../percent/booster/keymaps/default/keymap.c  |  2 +-
 .../percent/booster/keymaps/via/keymap.c      |  2 +-
 .../percent/canoe/keymaps/boy_314/keymap.c    |  2 +-
 .../percent/canoe/keymaps/default/keymap.c    |  2 +-
 keyboards/percent/canoe/keymaps/via/keymap.c  |  2 +-
 .../percent/skog/keymaps/default/keymap.c     |  2 +-
 .../skog_lite/keymaps/default/keymap.c        |  2 +-
 .../percent/skog_lite/keymaps/via/keymap.c    |  2 +-
 keyboards/phantom/keymaps/default/keymap.c    |  2 +-
 keyboards/phantom/keymaps/iso_uk/keymap.c     |  2 +-
 keyboards/phantom/keymaps/rgbmod/keymap.c     |  2 +-
 .../phrygian/ph100/keymaps/default/keymap.c   |  2 +-
 .../keymaps/ansi_blocker_doublebs/keymap.c    |  2 +-
 .../pizza65/keymaps/default/keymap.c          |  2 +-
 .../pizza65/keymaps/iso_blocker/keymap.c      |  2 +-
 .../keymaps/iso_blocker_doublebs/keymap.c     |  2 +-
 .../pizza65/keymaps/via/keymap.c              |  2 +-
 keyboards/pjb/eros/keymaps/default/keymap.c   |  2 +-
 keyboards/pjb/eros/keymaps/via/keymap.c       |  2 +-
 .../planck/keymaps/andylikescandy/keymap.c    |  2 +-
 keyboards/planck/keymaps/ariccb/keymap.c      |  2 +-
 keyboards/planck/keymaps/atreus/keymap.c      |  2 +-
 keyboards/planck/keymaps/bone2planck/keymap.c |  4 +-
 keyboards/planck/keymaps/buhearns/keymap.c    |  2 +-
 keyboards/planck/keymaps/deft/keymap.c        |  2 +-
 .../planck/keymaps/dr_notsokind/keymap.c      |  2 +-
 keyboards/planck/keymaps/dvz/keymap.c         |  2 +-
 keyboards/planck/keymaps/dzobert/keymap.c     |  2 +-
 keyboards/planck/keymaps/eshesh2/keymap.c     |  2 +-
 .../planck/keymaps/grahampheath/keymap.c      |  2 +-
 keyboards/planck/keymaps/gunp/keymap.c        |  4 +-
 keyboards/planck/keymaps/impossible/keymap.c  |  4 +-
 keyboards/planck/keymaps/ishtob/keymap.c      |  4 +-
 keyboards/planck/keymaps/jweickm/keymap.c     |  2 +-
 keyboards/planck/keymaps/lae3/keymap.c        |  2 +-
 keyboards/planck/keymaps/mason/keymap.c       |  4 +-
 keyboards/planck/keymaps/neo2planck/keymap.c  |  2 +-
 keyboards/planck/keymaps/orthodeluxe/keymap.c |  4 +-
 keyboards/planck/keymaps/paget/keymap.c       |  2 +-
 .../planck/keymaps/prog_qgmlwb/src/qgmlwb.h   |  2 +-
 keyboards/planck/keymaps/ptillemans/keymap.c  |  2 +-
 keyboards/planck/keymaps/sean/keymap.c        |  2 +-
 keyboards/planck/keymaps/tong92/keymap.c      |  2 +-
 keyboards/planck/keymaps/vaire/keymap.c       |  2 +-
 keyboards/planck/keymaps/vifon/keymap.c       |  2 +-
 keyboards/planck/keymaps/yttyx/keymap.c       |  2 +-
 keyboards/planck/keymaps/zach/keymap.c        |  2 +-
 .../playkbtw/ca66/keymaps/default/keymap.c    |  2 +-
 .../playkbtw/ca66/keymaps/olivia/keymap.c     |  2 +-
 .../playkbtw/ca66/keymaps/zyber/keymap.c      |  2 +-
 .../playkbtw/helen80/keymaps/default/keymap.c |  2 +-
 .../playkbtw/helen80/keymaps/via/keymap.c     |  2 +-
 .../playkbtw/pk60/keymaps/default/keymap.c    |  2 +-
 .../plywrks/ahgase/keymaps/default/keymap.c   |  2 +-
 keyboards/plywrks/ahgase/keymaps/iso/keymap.c |  2 +-
 keyboards/plywrks/ahgase/keymaps/via/keymap.c |  2 +-
 keyboards/poker87c/keymaps/default/keymap.c   |  2 +-
 keyboards/poker87c/keymaps/via/keymap.c       |  2 +-
 keyboards/poker87d/keymaps/default/keymap.c   |  2 +-
 keyboards/poker87d/keymaps/via/keymap.c       |  2 +-
 .../polilla/rev1/keymaps/default/keymap.c     |  2 +-
 keyboards/polilla/rev1/keymaps/via/keymap.c   |  2 +-
 .../polycarbdiet/s20/keymaps/default/keymap.c |  2 +-
 keyboards/preonic/keymaps/0xdec/keymap.c      |  4 +-
 keyboards/preonic/keymaps/arkag/keymap.c      |  2 +-
 .../preonic/keymaps/choromanski/keymap.c      |  2 +-
 keyboards/preonic/keymaps/elisiano/keymap.c   |  2 +-
 .../preonic/keymaps/laurentlaurent/keymap.c   |  6 +--
 keyboards/preonic/keymaps/pezhore/keymap.c    |  2 +-
 keyboards/preonic/keymaps/pvillano/keymap.c   |  2 +-
 keyboards/preonic/keymaps/senseored/keymap.c  | 24 ++++-----
 keyboards/preonic/keymaps/uqs/keymap.c        |  2 +-
 .../primekb/prime_e/keymaps/peott-fr/keymap.c |  2 +-
 .../primekb/prime_l/keymaps/default/keymap.c  |  2 +-
 .../primekb/prime_l/keymaps/via/keymap.c      |  2 +-
 .../primekb/prime_o/keymaps/default/keymap.c  |  2 +-
 .../keymaps/reasonsandreasons/keymap.c        |  4 +-
 .../prime_o/keymaps/spacebarracecar/keymap.c  |  2 +-
 .../signature87/keymaps/default/keymap.c      |  2 +-
 .../signature87/keymaps/via/keymap.c          |  2 +-
 .../allison_numpad/keymaps/default/keymap.c   |  4 +-
 .../allison_numpad/keymaps/via/keymap.c       |  4 +-
 .../protozoa/p01/keymaps/default/keymap.c     |  2 +-
 keyboards/protozoa/p01/keymaps/via/keymap.c   |  2 +-
 keyboards/punk75/keymaps/default/keymap.c     |  4 +-
 .../punk75/keymaps/dsanchezseco/keymap.c      |  2 +-
 keyboards/punk75/keymaps/via/keymap.c         |  4 +-
 .../lb75/keymaps/continuous_fnrow/keymap.c    |  2 +-
 .../quad_h/lb75/keymaps/default/keymap.c      |  2 +-
 keyboards/quad_h/lb75/keymaps/via/keymap.c    |  2 +-
 .../squishytkl/keymaps/default/keymap.c       |  2 +-
 .../squishytkl/keymaps/iso/keymap.c           |  2 +-
 .../squishytkl/keymaps/jis/keymap.c           |  2 +-
 .../squishytkl/keymaps/via/keymap.c           |  2 +-
 .../tkl_ff/keymaps/default/keymap.c           |  2 +-
 .../ramonimbao/tkl_ff/keymaps/iso/keymap.c    |  2 +-
 .../ramonimbao/tkl_ff/keymaps/via/keymap.c    |  2 +-
 .../wete/v1/keymaps/default/keymap.c          |  2 +-
 .../ramonimbao/wete/v1/keymaps/iso/keymap.c   |  2 +-
 .../ramonimbao/wete/v1/keymaps/jis/keymap.c   |  2 +-
 .../ramonimbao/wete/v1/keymaps/via/keymap.c   |  2 +-
 .../wete/v2/keymaps/default/keymap.c          |  4 +-
 .../ramonimbao/wete/v2/keymaps/iso/keymap.c   |  4 +-
 .../ramonimbao/wete/v2/keymaps/via/keymap.c   |  4 +-
 .../rart/rart4x4/keymaps/default/keymap.c     |  2 +-
 keyboards/rart/rart4x4/keymaps/via/keymap.c   |  2 +-
 .../rart/rart67/keymaps/default/keymap.c      |  2 +-
 keyboards/rart/rart67/keymaps/via/keymap.c    |  2 +-
 .../rart/rartlice/keymaps/default/keymap.c    |  4 +-
 keyboards/rart/rartlice/keymaps/via/keymap.c  |  4 +-
 .../rart/rartpad/keymaps/default/keymap.c     |  2 +-
 .../rart/rartpad/keymaps/numpad/keymap.c      |  2 +-
 keyboards/rart/rartpad/keymaps/via/keymap.c   |  2 +-
 .../pistachio_mp/keymaps/default/keymap.c     |  2 +-
 .../rate/pistachio_mp/keymaps/via/keymap.c    |  2 +-
 .../choco60/keymaps/default/keymap.c          |  2 +-
 .../choco60/keymaps/via/keymap.c              |  2 +-
 keyboards/rect44/keymaps/ansi_44key/keymap.c  |  2 +-
 keyboards/rect44/keymaps/ansi_47key/keymap.c  |  2 +-
 keyboards/rect44/keymaps/default/keymap.c     |  2 +-
 keyboards/rect44/keymaps/iso_48key/keymap.c   |  2 +-
 keyboards/redox/keymaps/finex/keymap.c        |  2 +-
 keyboards/redox_w/keymaps/dvorak/keymap.c     |  2 +-
 keyboards/redscarf_i/keymaps/default/keymap.c |  2 +-
 .../redscarf_i/keymaps/ortho_5x4/keymap.c     |  2 +-
 .../redscarf_i/keymaps/ortho_6x4/keymap.c     |  2 +-
 .../verd/keymaps/default/keymap.c             |  2 +-
 .../decadepad/keymaps/default/keymap.c        |  2 +-
 .../decadepad/keymaps/via/keymap.c            |  2 +-
 .../reviung53/keymaps/default/keymap.c        |  2 +-
 .../reviung/reviung53/keymaps/via/keymap.c    |  2 +-
 keyboards/rgbkb/mun/keymaps/default/keymap.c  |  2 +-
 keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c |  2 +-
 keyboards/rgbkb/mun/keymaps/via/keymap.c      |  2 +-
 keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c  |  4 +-
 keyboards/rgbkb/pan/keymaps/default/keymap.c  |  2 +-
 keyboards/rgbkb/sol/keymaps/default/keymap.c  |  6 +--
 keyboards/rgbkb/sol/keymaps/xyverz/keymap.c   |  2 +-
 keyboards/rgbkb/sol3/keymaps/default/keymap.c |  2 +-
 keyboards/rgbkb/sol3/keymaps/via/keymap.c     |  2 +-
 .../rgbkb/zen/rev1/keymaps/xyverz/keymap.c    |  4 +-
 keyboards/ristretto/keymaps/default/keymap.c  |  2 +-
 .../rm_numpad/keymaps/default/keymap.c        |  2 +-
 .../rmkeebs/rm_numpad/keymaps/ortho/keymap.c  |  2 +-
 .../rm_numpad/keymaps/split_plus/keymap.c     |  2 +-
 keyboards/rocketboard_16/keycode_lookup.c     |  4 +-
 .../rocketboard_16/keymaps/default/keymap.c   |  2 +-
 keyboards/rocketboard_16/keymaps/via/keymap.c |  2 +-
 keyboards/rubi/keymaps/default/keymap.c       |  2 +-
 keyboards/rubi/keymaps/via/keymap.c           |  2 +-
 .../runes/vaengr/keymaps/default/keymap.c     |  4 +-
 keyboards/runes/vaengr/keymaps/via/keymap.c   |  4 +-
 .../ryanbaekr/rb18/keymaps/default/keymap.c   |  2 +-
 keyboards/ryanbaekr/rb18/keymaps/via/keymap.c |  2 +-
 .../ryanbaekr/rb69/keymaps/default/keymap.c   |  2 +-
 keyboards/ryanbaekr/rb69/keymaps/via/keymap.c |  2 +-
 .../ryanbaekr/rb86/keymaps/default/keymap.c   |  2 +-
 keyboards/ryanbaekr/rb86/keymaps/via/keymap.c |  2 +-
 .../rskeys100/keymaps/default/keymap.c        |  4 +-
 .../saevus/cor_tkl/keymaps/default/keymap.c   |  2 +-
 keyboards/saevus/cor_tkl/keymaps/iso/keymap.c |  2 +-
 keyboards/saevus/cor_tkl/keymaps/via/keymap.c |  2 +-
 .../7skb/keymaps/default/keymap.c             |  2 +-
 .../7skb/keymaps/salicylic/keymap.c           |  2 +-
 .../salicylic_acid3/7skb/keymaps/via/keymap.c |  2 +-
 .../ajisai74/keymaps/default/keymap.c         |  2 +-
 .../ajisai74/keymaps/jis/keymap.c             |  2 +-
 .../ajisai74/keymaps/via/keymap.c             |  6 +--
 .../ergoarrows/keymaps/default/keymap.c       |  2 +-
 .../ergoarrows/keymaps/via/keymap.c           |  2 +-
 .../getta25/keymaps/default/keymap.c          |  2 +-
 .../getta25/keymaps/oled/keymap.c             |  2 +-
 .../keymaps/default_with_setta21/keymap.c     |  2 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |  2 +-
 .../keymaps/default_with_setta21/keymap.c     |  2 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |  2 +-
 .../keymaps/default_with_setta21/keymap.c     |  2 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |  2 +-
 .../setta21/keymaps/default/keymap.c          |  2 +-
 .../setta21/keymaps/salicylic/keymap.c        |  2 +-
 keyboards/sam/s80/keymaps/default/keymap.c    |  2 +-
 keyboards/sam/s80/keymaps/via/keymap.c        |  2 +-
 keyboards/sam/sg81m/keymaps/default/keymap.c  |  2 +-
 keyboards/sam/sg81m/keymaps/via/keymap.c      |  2 +-
 keyboards/sauce/mild/keymaps/default/keymap.c |  2 +-
 keyboards/sauce/mild/keymaps/via/keymap.c     |  2 +-
 .../amber80/solder/keymaps/default/keymap.c   |  2 +-
 .../amber80/solder/keymaps/via/keymap.c       |  2 +-
 .../krush60/solder/keymaps/60_ansi/keymap.c   |  2 +-
 .../solder/keymaps/60_ansi_arrow/keymap.c     |  2 +-
 .../keymaps/60_ansi_arrow_split_bs/keymap.c   |  2 +-
 .../60_ansi_arrow_split_bs_spc/keymap.c       |  2 +-
 .../keymaps/60_ansi_arrow_split_spc/keymap.c  |  2 +-
 .../keymaps/60_ansi_arrow_tsangan/keymap.c    |  2 +-
 .../60_ansi_arrow_tsangan_split_bs/keymap.c   |  2 +-
 .../solder/keymaps/60_ansi_split_bs/keymap.c  |  2 +-
 .../keymaps/60_ansi_split_bs_spc/keymap.c     |  2 +-
 .../solder/keymaps/60_ansi_split_spc/keymap.c |  2 +-
 .../solder/keymaps/60_ansi_tsangan/keymap.c   |  2 +-
 .../keymaps/60_ansi_tsangan_split_bs/keymap.c |  2 +-
 .../60_ansi_tsangan_split_rshift/keymap.c     |  2 +-
 .../keymaps/60_isoenter_split_bs/keymap.c     |  2 +-
 .../solder/keymaps/60_tsangan_hhkb/keymap.c   |  2 +-
 .../krush60/solder/keymaps/default/keymap.c   |  2 +-
 .../krush/krush60/solder/keymaps/via/keymap.c |  2 +-
 keyboards/sck/m0116b/keymaps/default/keymap.c |  2 +-
 keyboards/sck/m0116b/keymaps/m0116/keymap.c   |  2 +-
 keyboards/sck/m0116b/keymaps/m0118/keymap.c   |  2 +-
 keyboards/sck/osa/keymaps/all/keymap.c        |  4 +-
 .../75pixels/keymaps/default/keymap.c         |  2 +-
 .../sendyyeah/75pixels/keymaps/via/keymap.c   |  2 +-
 .../sendyyeah/bevi/keymaps/default/keymap.c   |  2 +-
 keyboards/sendyyeah/bevi/keymaps/via/keymap.c |  2 +-
 .../ck60/keymaps/default/keymap.c             |  2 +-
 .../senselessclay/ck60/keymaps/via/keymap.c   |  2 +-
 .../ck65/keymaps/default/keymap.c             |  2 +-
 .../senselessclay/ck65/keymaps/via/keymap.c   |  2 +-
 .../gos65/keymaps/default/keymap.c            |  2 +-
 .../senselessclay/gos65/keymaps/via/keymap.c  |  2 +-
 .../had60/keymaps/default/keymap.c            |  2 +-
 .../senselessclay/had60/keymaps/iso/keymap.c  |  2 +-
 .../senselessclay/had60/keymaps/via/keymap.c  |  2 +-
 .../number_pad/keymaps/default/keymap.c       |  2 +-
 .../s60_x/keymaps/amnesia0287/keymap.c        |  4 +-
 .../s60_x/keymaps/ansi_qwertz/keymap.c        |  2 +-
 .../sentraq/s60_x/keymaps/dbroqua/keymap.c    |  2 +-
 .../sentraq/s60_x/keymaps/default/keymap.c    |  2 +-
 .../s60_x/keymaps/default_rgb/keymap.c        |  2 +-
 .../sentraq/s60_x/keymaps/iso_rgb/keymap.c    |  2 +-
 .../sentraq/s65_x/keymaps/default/keymap.c    |  2 +-
 keyboards/sentraq/s65_x/keymaps/iso/keymap.c  |  2 +-
 .../sentraq/s65_x/keymaps/kelorean/keymap.c   |  2 +-
 keyboards/sentraq/s65_x/keymaps/nall/keymap.c |  2 +-
 keyboards/sentraq/s65_x/keymaps/smt/keymap.c  |  2 +-
 .../sets3n/kk980/keymaps/default/keymap.c     |  2 +-
 keyboards/sets3n/kk980/keymaps/via/keymap.c   |  2 +-
 .../signum/3_0/keymaps/default/layout.py      |  2 +-
 keyboards/singa/keymaps/amnesia0287/keymap.c  |  2 +-
 keyboards/singa/keymaps/default/keymap.c      |  2 +-
 keyboards/singa/keymaps/test/keymap.c         |  2 +-
 keyboards/singa/keymaps/via/keymap.c          |  2 +-
 .../unigo66/keymaps/danielhklein/keymap.c     |  2 +-
 .../sirius/unigo66/keymaps/default/keymap.c   |  2 +-
 .../hotswap/keymaps/default/keymap.c          |  2 +-
 .../skeletn87/hotswap/keymaps/via/keymap.c    |  2 +-
 .../soldered/keymaps/default/keymap.c         |  2 +-
 .../skeletn87/soldered/keymaps/iso/keymap.c   |  2 +-
 .../soldered/keymaps/tsangan/keymap.c         |  2 +-
 .../skeletn87/soldered/keymaps/via/keymap.c   |  2 +-
 .../skeletonnumpad/keymaps/default/keymap.c   |  2 +-
 .../skeletonnumpad/keymaps/via/keymap.c       |  2 +-
 .../rooboard65/keymaps/default/keymap.c       |  2 +-
 .../rooboard65/keymaps/via/keymap.c           |  2 +-
 .../roopad/keymaps/default/keymap.c           |  4 +-
 .../roopad/keymaps/via/keymap.c               |  4 +-
 .../iron180/keymaps/default/keymap.c          |  2 +-
 .../smithrune/iron180/keymaps/via/keymap.c    |  2 +-
 .../disarray/ortho/keymaps/default/keymap.c   |  2 +-
 .../disarray/ortho/keymaps/via/keymap.c       |  2 +-
 keyboards/sofle/keymaps/flare576/keymap.c     |  2 +-
 keyboards/sofle/keymaps/helltm/keymap.c       |  2 +-
 .../sofle/keymaps/j4ckofalltrades/keymap.c    |  2 +-
 keyboards/sofle/keymaps/rgb_default/keymap.c  |  2 +-
 .../sowbug/68keys/keymaps/default/keymap.c    |  2 +-
 .../sowbug/ansi_tkl/keymaps/default/keymap.c  |  2 +-
 .../sowbug/ansi_tkl/keymaps/sowbug/keymap.c   |  2 +-
 keyboards/soy20/keymaps/default/keymap.c      |  2 +-
 keyboards/soy20/keymaps/via/keymap.c          |  2 +-
 keyboards/specskeys/keymaps/default/keymap.c  |  2 +-
 .../split78/keymaps/default/keymap.c          |  4 +-
 .../kyria/keymaps/cjuniet/default.json        |  2 +-
 .../splitkb/kyria/keymaps/cjuniet/keymap.c    |  4 +-
 .../splitkb/kyria/keymaps/default/keymap.c    |  2 +-
 .../kyria/keymaps/jimmysjolund/keymap.c       |  2 +-
 .../splitkb/kyria/keymaps/lms_ace01/keymap.c  |  2 +-
 keyboards/splitkb/kyria/keymaps/lw/keymap.c   |  2 +-
 .../kyria/keymaps/maherma-adg/keymap.c        |  2 +-
 .../kyria/keymaps/muppetjones/keymap.c        |  2 +-
 .../splitkb/kyria/keymaps/plattfot/keymap.c   |  2 +-
 .../kyria/keymaps/thomasbaart/keymap.c        |  2 +-
 keyboards/splitkb/kyria/keymaps/uqs/keymap.c  |  2 +-
 keyboards/splitkb/kyria/keymaps/via/keymap.c  |  2 +-
 .../splitography/keymaps/default/keymap.c     |  4 +-
 .../keymap.c                                  |  4 +-
 .../splitography/keymaps/dvorak/keymap.c      |  4 +-
 .../splitography/keymaps/jeandeaual/keymap.c  |  4 +-
 keyboards/splitography/keymaps/multi/keymap.c |  4 +-
 .../banime40/keymaps/default/keymap.c         |  2 +-
 .../sporewoh/banime40/keymaps/via/keymap.c    |  2 +-
 .../galatea/keymaps/default/keymap.c          |  2 +-
 .../studiokestra/galatea/keymaps/via/keymap.c |  2 +-
 .../suavity/ehan/keymaps/default/keymap.c     |  2 +-
 .../suavity/ehan/keymaps/default_iso/keymap.c |  2 +-
 keyboards/suavity/ehan/keymaps/via/keymap.c   |  2 +-
 .../superuser/tkl/keymaps/default/keymap.c    |  2 +-
 keyboards/superuser/tkl/keymaps/via/keymap.c  |  2 +-
 .../southpaw_65/keymaps/default/keymap.c      |  2 +-
 .../southpaw_65/keymaps/default_ansi/keymap.c |  2 +-
 .../southpaw_65/keymaps/default_iso/keymap.c  |  2 +-
 .../keymaps/default/keymap.c                  |  4 +-
 .../keymaps/default_wkl/keymap.c              |  4 +-
 .../southpaw_fullsize/keymaps/via/keymap.c    |  4 +-
 keyboards/tada68/keymaps/amnesia0287/keymap.c |  4 +-
 keyboards/tada68/keymaps/bazooka/keymap.c     |  2 +-
 keyboards/tada68/keymaps/emdarcher/keymap.c   |  4 +-
 keyboards/tada68/keymaps/kbp-v60/keymap.c     |  2 +-
 keyboards/tada68/keymaps/mattgemmell/keymap.c |  2 +-
 .../compacx/keymaps/default/keymap.c          |  2 +-
 .../compacx/keymaps/via/keymap.c              |  2 +-
 .../heavy_left/keymaps/default/keymap.c       |  2 +-
 .../keymaps/takashicompany/keymap.c           |  4 +-
 .../heavy_left/keymaps/via/keymap.c           |  2 +-
 .../hecomi/keymaps/default/keymap.c           |  2 +-
 keyboards/tanuki/keymaps/tucznak/keymap.c     |  4 +-
 keyboards/tau4/keymaps/default/keymap.c       |  4 +-
 .../team0110/p1800fl/keymaps/default/keymap.c |  4 +-
 .../team0110/p1800fl/keymaps/via/keymap.c     |  4 +-
 .../teleport/numpad/keymaps/default/keymap.c  |  2 +-
 .../teleport/numpad/keymaps/via/keymap.c      |  2 +-
 keyboards/tenki/keymaps/default/keymap.c      |  2 +-
 keyboards/tenki/keymaps/via/keymap.c          |  2 +-
 .../tgr/jane/v2/keymaps/default/keymap.c      |  2 +-
 keyboards/tgr/jane/v2/keymaps/via/keymap.c    |  2 +-
 .../tgr/jane/v2ce/keymaps/default/keymap.c    |  2 +-
 keyboards/tgr/jane/v2ce/keymaps/via/keymap.c  |  2 +-
 keyboards/tgr/tris/keymaps/default/keymap.c   |  2 +-
 keyboards/tgr/tris/keymaps/via/keymap.c       |  2 +-
 .../bananasplit/keymaps/cijanzen/keymap.c     |  2 +-
 .../minivan/keymaps/josjoha/keymap.c          |  2 +-
 .../minivan/keymaps/lexworth/keymap.c         |  2 +-
 .../minivan/keymaps/tong92/keymap.c           |  2 +-
 .../tkc/california/keymaps/default/keymap.c   |  4 +-
 keyboards/tkc/california/keymaps/via/keymap.c |  4 +-
 .../candybar/lefty/keymaps/default/keymap.c   |  4 +-
 .../tkc/candybar/lefty/keymaps/via/keymap.c   | 12 ++---
 .../lefty_r3/keymaps/default/keymap.c         |  4 +-
 .../candybar/lefty_r3/keymaps/via/keymap.c    | 12 ++---
 .../candybar/righty/keymaps/default/keymap.c  |  4 +-
 .../tkc/candybar/righty/keymaps/via/keymap.c  | 12 ++---
 .../righty_r3/keymaps/default/keymap.c        |  4 +-
 .../candybar/righty_r3/keymaps/via/keymap.c   | 12 ++---
 .../tkc/godspeed75/keymaps/default/keymap.c   |  4 +-
 keyboards/tkc/godspeed75/keymaps/via/keymap.c |  8 +--
 keyboards/tkc/m0lly/keymaps/default/keymap.c  |  2 +-
 keyboards/tkc/m0lly/keymaps/via/keymap.c      |  2 +-
 .../tkc/portico/keymaps/default/keymap.c      |  4 +-
 keyboards/tkc/portico/keymaps/via/keymap.c    |  4 +-
 .../tkc/portico68v2/keymaps/default/keymap.c  |  2 +-
 .../tkc/portico68v2/keymaps/via/keymap.c      |  2 +-
 .../tkc/tkc1800/keymaps/default/keymap.c      |  4 +-
 keyboards/tkc/tkc1800/keymaps/smt/keymap.c    | 16 +++---
 keyboards/tkc/tkc1800/keymaps/via/keymap.c    |  4 +-
 keyboards/tkc/tkc1800/keymaps/wkl/keymap.c    |  4 +-
 .../tkc/tkc1800/keymaps/yanfali/keymap.c      |  4 +-
 .../tkc/tkl_ab87/keymaps/default/keymap.c     |  2 +-
 keyboards/tkc/tkl_ab87/keymaps/via/keymap.c   |  2 +-
 .../tokyo60/keymaps/default/keymap.c          |  2 +-
 .../tokyo60/keymaps/swappedBottomRow/keymap.c |  2 +-
 .../tokyo60/keymaps/via/keymap.c              |  2 +-
 .../m122_3270/keymaps/default/keymap.c        | 10 ++--
 .../tzarc/djinn/keymaps/default/keymap.c      |  2 +-
 keyboards/uk78/keymaps/default/keymap.c       |  4 +-
 keyboards/uk78/keymaps/rask/keymap.c          |  2 +-
 .../keymaps/default/keymap.c                  |  4 +-
 .../keymaps/default/keymap.c                  |  4 +-
 .../unicomp/pc122/keymaps/default/keymap.c    |  2 +-
 .../unicomp/pc122/keymaps/pc3270/keymap.c     |  4 +-
 .../unicomp/pc122/keymaps/ps2_5250/keymap.c   |  2 +-
 .../unicomp/pc122/keymaps/usb_5250/keymap.c   |  2 +-
 .../keymaps/default/keymap.c                  |  6 +--
 .../keymaps/default/keymap.c                  |  6 +--
 .../felix/keymaps/default/keymap.c            |  2 +-
 keyboards/unison/keymaps/default/keymap.c     |  2 +-
 keyboards/unison/keymaps/via/keymap.c         |  4 +-
 keyboards/utd80/keymaps/default/keymap.c      |  4 +-
 keyboards/utd80/keymaps/via/keymap.c          |  2 +-
 keyboards/v60_type_r/keymaps/default/keymap.c |  2 +-
 .../keymaps/followingghosts/keymap.c          |  2 +-
 keyboards/v60_type_r/keymaps/iso/keymap.c     |  2 +-
 keyboards/v60_type_r/keymaps/via/keymap.c     |  2 +-
 keyboards/v60_type_r/keymaps/vimouse/keymap.c |  2 +-
 .../v60_type_r/keymaps/xtonhasvim/keymap.c    |  2 +-
 .../vertex/angler2/keymaps/default/keymap.c   |  2 +-
 keyboards/vertex/angler2/keymaps/via/keymap.c |  2 +-
 .../viktus/at101_bh/keymaps/default/keymap.c  |  4 +-
 .../omnikey_bh/keymaps/default/keymap.c       |  4 +-
 .../viktus/sp111/keymaps/default/keymap.c     |  4 +-
 keyboards/viktus/sp111/keymaps/via/keymap.c   |  4 +-
 .../viktus/sp_mini/keymaps/peott-fr/keymap.c  |  2 +-
 .../viktus/z150_bh/keymaps/default/keymap.c   |  2 +-
 keyboards/w1_at/keymaps/default/keymap.c      |  2 +-
 keyboards/w1_at/keymaps/via/keymap.c          |  2 +-
 .../p01_ultra/keymaps/default/keymap.c        |  2 +-
 .../wavtype/p01_ultra/keymaps/via/keymap.c    |  2 +-
 keyboards/wekey/we27/keymaps/default/keymap.c |  2 +-
 keyboards/wekey/we27/keymaps/via/keymap.c     |  2 +-
 .../cypher/rev1/keymaps/default/keymap.c      |  2 +-
 .../cypher/rev1/keymaps/default_iso/keymap.c  |  2 +-
 .../cypher/rev1/keymaps/kwer/keymap.c         |  2 +-
 .../cypher/rev5/keymaps/default/keymap.c      |  2 +-
 .../cypher/rev5/keymaps/default_iso/keymap.c  |  2 +-
 .../cypher/rev5/keymaps/max/keymap.c          |  2 +-
 .../cypher/rev5/keymaps/via/keymap.c          |  2 +-
 .../prophet/keymaps/default/keymap.c          |  2 +-
 .../westfoxtrot/prophet/keymaps/via/keymap.c  |  2 +-
 .../rama_works_kara/keymaps/default/keymap.c  |  2 +-
 .../rama_works_koyu/keymaps/default/keymap.c  |  2 +-
 .../rama_works_koyu/keymaps/via/keymap.c      |  2 +-
 .../rama_works_m60_a/keymaps/default/keymap.c |  2 +-
 .../rama_works_m60_a/keymaps/mguterl/keymap.c |  2 +-
 .../rama_works_m60_a/keymaps/proto/keymap.c   |  2 +-
 .../rama_works_m60_a/keymaps/via/keymap.c     |  2 +-
 .../rama_works_m60_a/keymaps/zyber/keymap.c   |  2 +-
 .../rama_works_m65_b/keymaps/default/keymap.c |  2 +-
 .../rama_works_m65_b/keymaps/via/keymap.c     |  2 +-
 .../keymaps/default/keymap.c                  |  2 +-
 .../rama_works_m65_bx/keymaps/via/keymap.c    |  2 +-
 .../rama_works_u80_a/keymaps/default/keymap.c |  2 +-
 .../rama_works_u80_a/keymaps/via/keymap.c     |  2 +-
 .../keymaps/ansi_split_bs_rshift/keymap.c     |  2 +-
 .../wt60_a/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt60_a/keymaps/via/keymap.c    |  2 +-
 .../wt60_b/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt60_b/keymaps/via/keymap.c    |  2 +-
 .../wt60_bx/keymaps/default/keymap.c          |  2 +-
 .../wilba_tech/wt60_bx/keymaps/via/keymap.c   |  2 +-
 .../wt60_c/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt60_c/keymaps/via/keymap.c    |  2 +-
 .../wt60_d/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt60_d/keymaps/via/keymap.c    |  2 +-
 .../wt60_g/keymaps/default/keymap.c           |  2 +-
 .../wt60_g2/keymaps/default/keymap.c          |  2 +-
 .../wt60_h1/keymaps/default/keymap.c          |  2 +-
 .../wt60_h2/keymaps/default/keymap.c          |  2 +-
 .../wt60_h3/keymaps/default/keymap.c          |  2 +-
 .../wt60_xt/keymaps/default/keymap.c          |  2 +-
 .../wilba_tech/wt60_xt/keymaps/via/keymap.c   |  2 +-
 .../wt65_a/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt65_a/keymaps/via/keymap.c    |  2 +-
 .../wt65_b/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt65_b/keymaps/via/keymap.c    |  2 +-
 .../wt65_d/keymaps/default/keymap.c           |  2 +-
 .../wt65_f/keymaps/default/keymap.c           |  2 +-
 .../wt65_fx/keymaps/default/keymap.c          |  2 +-
 .../wt65_g/keymaps/default/keymap.c           |  2 +-
 .../wt65_g2/keymaps/default/keymap.c          |  2 +-
 .../wt65_h1/keymaps/default/keymap.c          |  2 +-
 .../wt65_xt/keymaps/default/keymap.c          |  2 +-
 .../wilba_tech/wt65_xt/keymaps/via/keymap.c   |  2 +-
 .../wt65_xtx/keymaps/default/keymap.c         |  2 +-
 .../wilba_tech/wt65_xtx/keymaps/via/keymap.c  |  2 +-
 .../wt69_a/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt69_a/keymaps/via/keymap.c    |  2 +-
 .../wt70_jb/keymaps/default/keymap.c          |  2 +-
 .../wt80_a/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/wt80_a/keymaps/via/keymap.c    |  2 +-
 .../wt80_bc/keymaps/default/keymap.c          |  2 +-
 .../wilba_tech/wt80_bc/keymaps/via/keymap.c   |  2 +-
 .../wt80_g/keymaps/default/keymap.c           |  2 +-
 .../keymaps/ansi_split_bs_rshift/keymap.c     |  2 +-
 .../wilba_tech/zeal60/keymaps/crd/keymap.c    |  2 +-
 .../zeal60/keymaps/default/keymap.c           |  2 +-
 .../wilba_tech/zeal60/keymaps/hhkb/keymap.c   |  2 +-
 .../wilba_tech/zeal60/keymaps/iso/keymap.c    |  2 +-
 .../zeal60/keymaps/sethBarberee/keymap.c      |  2 +-
 .../wilba_tech/zeal60/keymaps/tusing/keymap.c |  2 +-
 .../wilba_tech/zeal60/keymaps/via/keymap.c    |  2 +-
 .../zeal65/keymaps/default/keymap.c           |  2 +-
 .../zeal65/keymaps/split_bs/keymap.c          |  2 +-
 .../wilba_tech/zeal65/keymaps/via/keymap.c    |  2 +-
 .../wilba_tech/zeal65/keymaps/zyber/keymap.c  |  2 +-
 .../winkeyless/b87/keymaps/default/keymap.c   |  2 +-
 keyboards/winkeyless/b87/keymaps/via/keymap.c |  2 +-
 .../winkeyless/bminiex/keymaps/ansi/keymap.c  |  2 +-
 .../bminiex/keymaps/default/keymap.c          |  2 +-
 .../winkeyless/bminiex/keymaps/iso/keymap.c   |  2 +-
 .../winkeyless/bminiex/keymaps/via/keymap.c   |  2 +-
 .../winry/winry25tc/keymaps/default/keymap.c  |  2 +-
 .../winry315/keymaps/left_numpad/keymap.c     |  2 +-
 keyboards/wolf/sabre/keymaps/default/keymap.c |  2 +-
 keyboards/wolf/sabre/keymaps/via/keymap.c     |  2 +-
 .../meira/keymaps/grahampheath/keymap.c       |  2 +-
 keyboards/wren/keymaps/default/keymap.c       |  2 +-
 keyboards/wsk/alpha9/keymaps/default/keymap.c |  2 +-
 .../promise87/ansi/keymaps/default/keymap.c   |  2 +-
 .../keymaps/default_tkl_f13_ansi/keymap.c     |  2 +-
 .../default_tkl_f13_ansi_split_bs/keymap.c    |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../wuque/promise87/ansi/keymaps/via/keymap.c |  2 +-
 .../promise87/wkl/keymaps/default/keymap.c    |  2 +-
 .../keymaps/default_tkl_f13_ansi_wkl/keymap.c |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../wuque/promise87/wkl/keymaps/via/keymap.c  |  2 +-
 .../xbows/knight/keymaps/default/keymap.c     |  2 +-
 keyboards/xbows/knight/keymaps/via/keymap.c   |  2 +-
 .../knight_plus/keymaps/default/keymap.c      |  2 +-
 .../xbows/knight_plus/keymaps/via/keymap.c    |  2 +-
 .../xbows/nature/keymaps/default/keymap.c     |  2 +-
 keyboards/xbows/nature/keymaps/via/keymap.c   |  2 +-
 .../xbows/numpad/keymaps/default/keymap.c     |  2 +-
 keyboards/xbows/numpad/keymaps/via/keymap.c   |  2 +-
 .../xbows/ranger/keymaps/default/keymap.c     |  4 +-
 keyboards/xbows/ranger/keymaps/via/keymap.c   |  4 +-
 .../xbows/woody/keymaps/default/keymap.c      |  2 +-
 .../xelus/dharma/keymaps/default/keymap.c     |  2 +-
 keyboards/xelus/dharma/keymaps/via/keymap.c   |  2 +-
 .../xelus/kangaroo/keymaps/default/keymap.c   |  4 +-
 keyboards/xelus/kangaroo/keymaps/via/keymap.c |  4 +-
 .../xelus/la_plus/keymaps/default/keymap.c    |  2 +-
 keyboards/xelus/la_plus/keymaps/via/keymap.c  |  2 +-
 .../xelus/ninjin/keymaps/default/keymap.c     |  2 +-
 keyboards/xelus/ninjin/keymaps/via/keymap.c   |  2 +-
 .../pachi/mini_32u4/keymaps/default/keymap.c  |  2 +-
 .../pachi/mini_32u4/keymaps/via/keymap.c      |  2 +-
 .../xelus/pachi/rev1/keymaps/default/keymap.c |  2 +-
 .../xelus/pachi/rev1/keymaps/via/keymap.c     |  2 +-
 .../xelus/pachi/rgb/keymaps/default/keymap.c  |  2 +-
 .../xelus/pachi/rgb/keymaps/via/keymap.c      |  2 +-
 .../xelus/rs108/keymaps/default/keymap.c      |  4 +-
 keyboards/xelus/rs108/keymaps/via/keymap.c    |  4 +-
 .../xelus/snap96/keymaps/default/keymap.c     |  4 +-
 keyboards/xelus/snap96/keymaps/via/keymap.c   |  4 +-
 .../trinityxttkl/keymaps/default/keymap.c     |  2 +-
 .../xelus/trinityxttkl/keymaps/via/keymap.c   |  2 +-
 .../xiaomi/mk02/keymaps/default/keymap.c      |  2 +-
 .../ansi_split_bs_rshift_space/keymap.c       |  2 +-
 keyboards/xiudi/xd60/keymaps/birkir/keymap.c  |  4 +-
 keyboards/xiudi/xd60/keymaps/cheese/keymap.c  |  2 +-
 .../xiudi/xd60/keymaps/crd_ansi/keymap.c      |  2 +-
 keyboards/xiudi/xd60/keymaps/default/keymap.c |  2 +-
 .../xiudi/xd60/keymaps/edulpn64/keymap.c      |  2 +-
 keyboards/xiudi/xd60/keymaps/finnish/keymap.c |  2 +-
 keyboards/xiudi/xd60/keymaps/krusli/keymap.c  |  2 +-
 keyboards/xiudi/xd60/keymaps/melka/keymap.c   |  2 +-
 keyboards/xiudi/xd60/keymaps/via/keymap.c     |  2 +-
 keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c |  2 +-
 .../xd75/keymaps/atomic_style_jp/keymap.c     |  6 +--
 .../xiudi/xd75/keymaps/billypython/keymap.c   |  2 +-
 .../xiudi/xd75/keymaps/buzzlighter1/keymap.c  |  4 +-
 .../xiudi/xd75/keymaps/clanghans/keymap.c     |  2 +-
 keyboards/xiudi/xd75/keymaps/default/keymap.c |  4 +-
 .../xd75/keymaps/dyn_macro_tap_dance/keymap.c |  4 +-
 keyboards/xiudi/xd75/keymaps/hybrid/keymap.c  | 54 +++++++++----------
 keyboards/xiudi/xd75/keymaps/minna/keymap.c   |  2 +-
 .../xiudi/xd75/keymaps/neothefox/keymap.c     |  2 +-
 keyboards/xiudi/xd75/keymaps/odyssey/keymap.c |  2 +-
 .../xd75/keymaps/replicajunction/keymap.c     |  6 +--
 .../xiudi/xd75/keymaps/skewwhiffy/keymap.c    |  6 +--
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |  2 +-
 .../xiudi/xd75/keymaps/tomswartz07/keymap.c   |  4 +-
 keyboards/xiudi/xd75/keymaps/via/keymap.c     |  4 +-
 keyboards/xiudi/xd75/keymaps/xo/keymap.c      |  2 +-
 .../xiudi/xd84pro/keymaps/default/keymap.c    |  2 +-
 keyboards/xiudi/xd84pro/keymaps/via/keymap.c  |  2 +-
 keyboards/xiudi/xd87/keymaps/default/keymap.c |  2 +-
 .../xd87/keymaps/default_underglow/keymap.c   |  2 +-
 keyboards/xiudi/xd87/keymaps/via/keymap.c     |  2 +-
 keyboards/xiudi/xd96/keymaps/default/keymap.c |  2 +-
 .../xiudi/xd96/keymaps/default_iso/keymap.c   |  2 +-
 keyboards/xiudi/xd96/keymaps/uuupah/keymap.c  |  2 +-
 keyboards/xiudi/xd96/keymaps/via/keymap.c     |  2 +-
 keyboards/xmmx/keymaps/ansi_wk/keymap.c       |  2 +-
 keyboards/xmmx/keymaps/ansi_wkl/keymap.c      |  2 +-
 keyboards/xmmx/keymaps/default/keymap.c       |  2 +-
 keyboards/xmmx/keymaps/iso_wk/keymap.c        |  2 +-
 keyboards/xmmx/keymaps/iso_wkl/keymap.c       |  2 +-
 .../yanghu/unicorne/keymaps/bcat/keymap.c     |  2 +-
 keyboards/ydkb/chili/keymaps/default/keymap.c |  4 +-
 keyboards/ydkb/chili/keymaps/via/keymap.c     |  4 +-
 keyboards/ydkb/grape/keymaps/default/keymap.c |  4 +-
 keyboards/ydkb/grape/keymaps/via/keymap.c     |  4 +-
 .../barleycorn/keymaps/default/keymap.c       |  2 +-
 .../barleycorn/keymaps/iso/keymap.c           |  2 +-
 .../barleycorn/keymaps/via/keymap.c           |  2 +-
 keyboards/ymdk/bface/keymaps/default/keymap.c |  4 +-
 .../ymdk/bface/keymaps/emdarcher/keymap.c     |  4 +-
 keyboards/ymdk/bface/keymaps/minila/keymap.c  |  2 +-
 .../ymdk/melody96/keymaps/crilith/keymap.c    |  2 +-
 .../ymdk/melody96/keymaps/default/keymap.c    |  2 +-
 .../default_96_with60_split_num0/keymap.c     |  2 +-
 keyboards/ymdk/melody96/keymaps/dvz/keymap.c  |  2 +-
 .../ymdk/melody96/keymaps/konstantin/keymap.c |  4 +-
 keyboards/ymdk/melody96/keymaps/via/keymap.c  |  2 +-
 keyboards/ymdk/np21/keymaps/default/keymap.c  |  2 +-
 keyboards/ymdk/np21/keymaps/via/keymap.c      |  2 +-
 .../ymdk/np24/u4rgb6/keymaps/default/keymap.c |  2 +-
 keyboards/ymdk/yd60mq/keymaps/64key/keymap.c  |  2 +-
 keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c |  2 +-
 .../ymdk/ymd21/v2/keymaps/default/keymap.c    |  2 +-
 .../ymd96/keymaps/AnthonyWharton/keymap.c     |  2 +-
 keyboards/ymdk/ymd96/keymaps/default/keymap.c |  2 +-
 keyboards/ymdk/ymd96/keymaps/epx/keymap.c     |  4 +-
 keyboards/yosino58/keymaps/default/keymap.c   |  4 +-
 keyboards/yosino58/keymaps/sakura/keymap.c    |  4 +-
 .../keymaps/an_achronism_106/keymap.c         |  4 +-
 .../model_m_101/keymaps/default/keymap.c      |  4 +-
 .../yugo_m/model_m_101/keymaps/via/keymap.c   |  4 +-
 .../navpad/10/keymaps/default/keymap.c        |  6 +--
 .../navpad/10/keymaps/default/readme.md       |  6 +--
 .../yushakobo/navpad/10/keymaps/via/keymap.c  |  6 +--
 .../yushakobo/navpad/10/keymaps/via/readme.md |  6 +--
 .../10_helix_r/keymaps/default/keymap.c       |  6 +--
 .../10_helix_r/keymaps/default/readme.md      |  6 +--
 .../quick17/keymaps/default/keymap.c          |  2 +-
 .../yushakobo/quick17/keymaps/via/keymap.c    |  2 +-
 keyboards/zj68/keymaps/splitbs/keymap.c       |  2 +-
 layouts/community/60_ansi/xyverz/keymap.c     |  2 +-
 .../mrsendyyk/keymap.c                        |  4 +-
 .../60_ansi_split_bs_rshift/bcat/keymap.c     |  2 +-
 layouts/community/60_hhkb/yanfali/keymap.c    |  2 +-
 .../community/60_tsangan_hhkb/bcat/keymap.c   |  2 +-
 .../60_tsangan_hhkb/dohmain/keymap.c          |  2 +-
 .../65_ansi_blocker/spidey3/keymap.c          |  2 +-
 .../65_ansi_blocker_split_bs/bcat/keymap.c    |  2 +-
 layouts/community/66_ansi/xyverz/keymap.c     |  2 +-
 layouts/community/75_ansi/spidey3/keymap.c    |  2 +-
 .../community/ergodox/choromanski/keymap.c    |  2 +-
 .../ergodox/colemak_code_friendly/keymap.c    |  4 +-
 .../ergodox/colemak_programmer/keymap.c       |  4 +-
 layouts/community/ergodox/drashna/keymap.c    |  2 +-
 layouts/community/ergodox/guni/keymap.c       |  2 +-
 layouts/community/ergodox/guni/readme.txt     |  2 +-
 layouts/community/ergodox/kastyle/keymap.c    |  2 +-
 layouts/community/ergodox/kines-ish/keymap.c  |  2 +-
 layouts/community/ergodox/mpiechotka/keymap.c |  8 +--
 layouts/community/ergodox/ordinary/keymap.c   |  2 +-
 .../community/ergodox/ordinary_osx/keymap.c   |  2 +-
 .../keymap.c                                  |  2 +-
 .../ergodox/qwerty_code_friendly/keymap.c     |  2 +-
 .../ergodox/replicaJunction/keymap.c          |  8 +--
 layouts/community/ergodox/sethbc/keymap.c     |  2 +-
 layouts/community/ergodox/teckinesis/keymap.c |  2 +-
 layouts/community/ergodox/videck/keymap.c     |  2 +-
 layouts/community/ergodox/xyverz/keymap.c     |  2 +-
 .../ergodox/zweihander-macos/keymap.c         |  2 +-
 .../community/numpad_5x4/mrsendyyk/keymap.c   |  2 +-
 .../community/numpad_5x6/bjohnson/keymap.c    |  2 +-
 layouts/community/numpad_5x6/drashna/keymap.c |  2 +-
 .../community/ortho_4x12/ajp10304/keymap.c    |  2 +-
 .../ortho_4x12/grahampheath/keymap.c          |  2 +-
 layouts/community/ortho_4x12/jotix/keymap.c   |  4 +-
 layouts/community/ortho_4x4/jotix/keymap.c    |  2 +-
 layouts/community/ortho_5x12/xyverz/keymap.c  |  4 +-
 .../ortho_5x14/yet-another-developer/keymap.c |  2 +-
 layouts/community/ortho_5x15/wanleg/keymap.c  |  6 +--
 .../community/planck_mit/guidoism/keys.json   |  4 +-
 layouts/community/split_3x6_3/bcat/keymap.c   |  2 +-
 layouts/community/tkl_ansi/xyverz/keymap.c    |  6 +--
 layouts/community/tkl_ansi/yanfali/keymap.c   |  2 +-
 .../default/65_ansi/default_65_ansi/keymap.c  |  2 +-
 .../default_65_ansi_blocker/keymap.c          |  2 +-
 .../default_65_ansi_blocker_split_bs/keymap.c |  2 +-
 .../default_65_ansi_blocker_tsangan/keymap.c  |  2 +-
 .../keymap.c                                  |  2 +-
 .../default_65_ansi_split_bs/keymap.c         |  2 +-
 .../default/65_iso/default_65_iso/keymap.c    |  2 +-
 .../default_65_iso_blocker/keymap.c           |  2 +-
 .../default_65_iso_blocker_split_bs/keymap.c  |  2 +-
 .../default_65_iso_blocker_tsangan/keymap.c   |  2 +-
 .../keymap.c                                  |  2 +-
 .../default_65_iso_split_bs/keymap.c          |  2 +-
 quantum/keycode_legacy.h                      |  3 --
 users/alfrdmalr/alfrdmalr.h                   |  2 +-
 users/csc027/defines.h                        |  6 +--
 users/doogle999/doogle999.c                   |  4 +-
 users/ericgebhart/layers.h                    |  2 +-
 users/imchipwood/imchipwood.c                 |  2 +-
 users/konstantin/konstantin.c                 |  2 +-
 .../losinggeneration-keymap.h                 |  2 +-
 .../miryoku_babel/miryoku_alternatives.h      |  4 +-
 users/not-quite-neo/nqn-basic-layout.h        |  2 +-
 users/nstickney/nstickney.c                   |  8 +--
 users/romus/romus.h                           |  2 +-
 users/rupa/wrappers.h                         |  4 +-
 users/talljoe/talljoe.c                       |  2 +-
 users/xulkal/layouts.h                        |  4 +-
 2171 files changed, 2799 insertions(+), 2802 deletions(-)

diff --git a/docs/api_docs.md b/docs/api_docs.md
index 3ed87db2b2..2594821ab0 100644
--- a/docs/api_docs.md
+++ b/docs/api_docs.md
@@ -15,7 +15,7 @@ This service is an asynchronous API for compiling custom keymaps. You POST some
   "layout": "LAYOUT_all",
   "layers": [
     ["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_GRV","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_LSFT","KC_NUBS","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_INT1","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_INT5","KC_SPC","KC_SPC","KC_INT4","KC_RALT","KC_RCTL","MO(1)","KC_LEFT","KC_DOWN","KC_RIGHT"],
-    ["KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_TRNS","KC_DEL","BL_STEP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","_______","KC_TRNS","KC_PSCR","KC_SLCK","KC_PAUS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_LEFT","KC_PGDN","KC_RGHT"],
+    ["KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_TRNS","KC_DEL","BL_STEP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","_______","KC_TRNS","KC_PSCR","KC_SCRL","KC_PAUS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_LEFT","KC_PGDN","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","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","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
   ]
 }
diff --git a/keyboards/0xc7/61key/keymaps/default/keymap.c b/keyboards/0xc7/61key/keymaps/default/keymap.c
index a0a2d15df3..c6691a4c37 100644
--- a/keyboards/0xc7/61key/keymaps/default/keymap.c
+++ b/keyboards/0xc7/61key/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
diff --git a/keyboards/0xc7/61key/keymaps/via/keymap.c b/keyboards/0xc7/61key/keymaps/via/keymap.c
index 564d19fed2..38596c60d2 100644
--- a/keyboards/0xc7/61key/keymaps/via/keymap.c
+++ b/keyboards/0xc7/61key/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
index b169df09c0..e62f033d5f 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [1] = LAYOUT_60_ansi(
     KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
     KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
index 6ab29d2555..040fda4399 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [1] = LAYOUT_60_ansi(
     KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
     KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
index 1bdf6dfec3..bd8ded4dcd 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_60_ansi(
     KC_GRV  , KC_F1    , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F6    , KC_F7   , KC_F8   , KC_F9    , KC_F10  , KC_F11  , KC_F12  , KC_DEL  ,
-    KC_TRNS , KC_TRNS  , KC_UP   , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_PSCR , KC_SLCK , KC_PAUS , KC_TRNS ,
+    KC_TRNS , KC_TRNS  , KC_UP   , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_PSCR , KC_SCRL , KC_PAUS , KC_TRNS ,
     KC_TRNS , KC_LEFT  , KC_DOWN , KC_RGHT , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_INS   , KC_HOME , KC_PGUP , KC_TRNS ,
     KC_TRNS , KC_VOLU  , KC_VOLD , KC_MUTE , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_END   , KC_PGDN , KC_TRNS ,
     KC_TRNS , KC_TRNS  , KC_TRNS ,           KC_TRNS           , KC_TRNS  , MO(2)   , KC_TRNS , KC_TRNS
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
index fd9333213b..56804c6608 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_tsangan_hhkb(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_CLR,
+        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
index aff768048d..4bf0c20b12 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_hhkb(
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_CLR,
+        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
                  _______, _______,                            _______,                                     _______, _______
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
index 70927f8cbb..6fde5f40c7 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_tsangan_hhkb(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_CLR,
+        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
index 5548adb7ba..22e1a4c0d9 100644
--- a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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_TRNS,
-        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
         KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c
index 1f38a7c4c1..781ef455c3 100644
--- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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_TRNS,
-        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
         KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
index b42c34edb7..d3b6ef0378 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_PSLS,   KC_PAST,  KC_PMNS,  KC_TRNS,
         KC_BSPC,   KC_EXECUTE,  KC_DEL,
         KC_LPRN,   KC_RPRN,  KC_PEQL,  KC_PENT,
-             KC_TAB,      KC_NLCK
+             KC_TAB,      KC_NUM
     ),
 
 
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c
index a7e587426b..05cdc0cfb6 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [_FUNC]=LAYOUT_ortho_4x4(
   KC_MPRV, KC_MPLY, KC_MNXT, _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK,
+  XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,
   KC_INS,  KC_HOME, KC_PGUP, XXXXXXX,
   KC_DEL,  KC_END,  KC_PGDN, XXXXXXX
 )
diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c
index 5c3fcd53de..4673b8071b 100644
--- a/keyboards/25keys/zinc/keymaps/default/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/default/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [_ADJUST] =  LAYOUT_ortho_4x12(
       _______, QK_BOOT,   RGBRST,  _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,
-      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,
+      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
       RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, KC_PGUP, _______,
       _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KANA,    KC_HOME, KC_PGDN, KC_END
       )
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
index 7bf5974974..88ada9fc93 100644
--- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
@@ -170,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \
    */
     [_ADJUST] =  LAYOUT_ortho_4x12( \
       _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS, \
-       AQOURS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,\
+       AQOURS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,\
       _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, _______, _______,\
       _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KC_HOME, KC_PGDN, KC_PGUP, KC_END\
       )
diff --git a/keyboards/25keys/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c
index d0fae14177..d4c092595c 100644
--- a/keyboards/25keys/zinc/keymaps/monks/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/monks/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \
    */
     [_ADJUST] =  LAYOUT_ortho_4x12( \
       _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_INS, \
-      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,\
+      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,\
       _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, KC_PGUP, _______,\
       _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KANA,    KC_HOME, KC_PGDN, KC_END\
       )
diff --git a/keyboards/25keys/zinc/keymaps/via/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c
index 29a4bdc5bd..22e362c257 100644
--- a/keyboards/25keys/zinc/keymaps/via/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/via/keymap.c
@@ -135,14 +135,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [_ADJUST] =  LAYOUT_ortho_4x12(
         _______, QK_BOOT,   RGBRST,  _______, _______, _______,                   _______, QWERTY,  _______, _______,  _______, KC_INS,
-        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
         RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KANA,    KC_HOME, KC_PGDN, KC_END
         ),
 
     [_ADJUST2] =  LAYOUT_ortho_4x12(
         _______, QK_BOOT,   RGBRST,  _______, _______, _______,                   _______, QWERTY,  _______, _______,  _______, KC_INS,
-        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
         RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KANA,    KC_HOME, KC_PGDN, KC_END
         )
diff --git a/keyboards/40percentclub/4x4/keymaps/default/keymap.c b/keyboards/40percentclub/4x4/keymaps/default/keymap.c
index 4fe5a1d464..e1e897d05e 100644
--- a/keyboards/40percentclub/4x4/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/4x4/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [NUM] = LAYOUT_ortho_4x16(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS, _______,
   _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT, _______,
   _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______, _______
diff --git a/keyboards/40percentclub/4x4/keymaps/via/keymap.c b/keyboards/40percentclub/4x4/keymaps/via/keymap.c
index b7d3fc6308..1f216d3aca 100644
--- a/keyboards/40percentclub/4x4/keymaps/via/keymap.c
+++ b/keyboards/40percentclub/4x4/keymaps/via/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [NUM] = LAYOUT_ortho_4x16(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS, _______,
   _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT, _______,
   _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______, _______
diff --git a/keyboards/40percentclub/5x5/keymaps/default/keymap.c b/keyboards/40percentclub/5x5/keymaps/default/keymap.c
index ce4fc2677b..f5be1f9c66 100644
--- a/keyboards/40percentclub/5x5/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/5x5/keymaps/default/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [NUM] = LAYOUT_ortho_5x15(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS,
   _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT,
   _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______
diff --git a/keyboards/40percentclub/5x5/keymaps/via/keymap.c b/keyboards/40percentclub/5x5/keymaps/via/keymap.c
index b65db272a9..680630476e 100644
--- a/keyboards/40percentclub/5x5/keymaps/via/keymap.c
+++ b/keyboards/40percentclub/5x5/keymaps/via/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [NUM] = LAYOUT_ortho_5x15(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS,
   _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT,
   _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c b/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
index 861a1b568d..3516c7a0c3 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [LAYER_FUNC] = LAYOUT_ortho_3x10(
     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, LT(LAYER_SYST, KC_F7), MT(MOD_LALT, KC_F8), MT(MOD_RCTL,KC_F9), MT(MOD_RSFT, KC_F10),
     MT(MOD_LSFT, KC_ESC), KC_HOME, LT(LAYER_SYST, KC_PGDN), MT(MOD_RALT, KC_PGUP), MT(MOD_LGUI, KC_END), MT(MOD_RGUI, KC_LEFT), MT(MOD_RALT, KC_DOWN), KC_UP, LT(LAYER_SYST, KC_RGHT), MT(MOD_RSFT, KC_BSPC),
-    KC_DOWN, MT(KC_LCTL, KC_F11), MT(KC_LALT, KC_F12), KC_NO, LT(LAYER_SYST, KC_SPACE), MT(KC_LSFT, KC_PSCR), MT(KC_LALT, KC_SLCK), MT(KC_RCTL, KC_PAUS), MT(MOD_RSFT, KC_BSPC), KC_UP
+    KC_DOWN, MT(KC_LCTL, KC_F11), MT(KC_LALT, KC_F12), KC_NO, LT(LAYER_SYST, KC_SPACE), MT(KC_LSFT, KC_PSCR), MT(KC_LALT, KC_SCRL), MT(KC_RCTL, KC_PAUS), MT(MOD_RSFT, KC_BSPC), KC_UP
   ),
 
 /* Number and Symbols Layer
diff --git a/keyboards/40percentclub/mf68/keymaps/andyjack/keymap.c b/keyboards/40percentclub/mf68/keymaps/andyjack/keymap.c
index 0dc41dd82e..793fb336b0 100644
--- a/keyboards/40percentclub/mf68/keymaps/andyjack/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/andyjack/keymap.c
@@ -28,7 +28,7 @@ enum layers {
 #define MUT_IN LALT(KC_F10)
 #define MUT_OUT LALT(KC_F11)
 #define MUT_MIC LALT(KC_F12)
-#define SCN_LCK LCTL(KC_SLCK)
+#define SCN_LCK LCTL(KC_SCRL)
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
index eb281f5f18..ab9029e7a2 100644
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* FN Layer */
   [_FN1] = LAYOUT_68_ansi(
     KC_GRV , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,  KC_BSPC,     KC_VOLU,KC_HOME,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,       KC_VOLD,KC_END,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,       KC_VOLD,KC_END,
      X0    ,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MRWD,KC_MFFD,    _______,
    _______      ,_______,_______,KC_MSTP,KC_MPRV,KC_MNXT,KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,       _______,           _______,
    _______ ,_______ ,_______ ,             _______,                      _______,_______,_______,                  _______,_______,_______
diff --git a/keyboards/4pplet/aekiso60/keymaps/default/keymap.c b/keyboards/4pplet/aekiso60/keymaps/default/keymap.c
index b99f097bb9..8749569a9d 100644
--- a/keyboards/4pplet/aekiso60/keymaps/default/keymap.c
+++ b/keyboards/4pplet/aekiso60/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         KC_EXEC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, KC_BSPC, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,
+        _______, KC_BSPC, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
         KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_INS,  KC_PENT,
         _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         QK_BOOT,   _______, _______,          _______,          _______,          _______,                   KC_BRID, KC_BRIU, _______
diff --git a/keyboards/4pplet/aekiso60/keymaps/via/keymap.c b/keyboards/4pplet/aekiso60/keymaps/via/keymap.c
index 2e0244ce2e..d90c6d4ff1 100644
--- a/keyboards/4pplet/aekiso60/keymaps/via/keymap.c
+++ b/keyboards/4pplet/aekiso60/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         KC_EXEC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, KC_BSPC, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,
+        _______, KC_BSPC, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
         KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_INS,  KC_PENT,
         _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         QK_BOOT,   _______, _______,          _______,          _______,          _______,                   KC_BRID, KC_BRIU, _______
diff --git a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
index 5e0b36d499..27f6a04994 100644
--- a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [2] = LAYOUT_all(
   KC_EXEC, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_INS, _______, 
-  _______, KC_BSPC, KC_UP,   KC_ENT,   _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    _______, KC_DEL,          
+  _______, KC_BSPC, KC_UP,   KC_ENT,   _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    _______, KC_DEL,          
   KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, KC_PENT,         
   _______, _______, KC_MPRV, KC_MPLY,  KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
   DF(1),   DF(0),   _______, _______,  _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, QK_BOOT )
diff --git a/keyboards/4pplet/steezy60/keymaps/default/keymap.c b/keyboards/4pplet/steezy60/keymaps/default/keymap.c
index 924b6f7346..b926d436db 100644
--- a/keyboards/4pplet/steezy60/keymaps/default/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all(
   QK_BOOT,   KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  _______, KC_DEL, 
-  _______, KC_BSPC, KC_UP,   KC_ENT,   _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    _______, _______, 
+  _______, KC_BSPC, KC_UP,   KC_ENT,   _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    _______, _______, 
   KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______,
   _______, _______, KC_MPRV, KC_MPLY,  KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
   _______, _______, _______, _______,  _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ )
diff --git a/keyboards/4pplet/steezy60/keymaps/via/keymap.c b/keyboards/4pplet/steezy60/keymaps/via/keymap.c
index 0b998fc645..bcd170fe18 100644
--- a/keyboards/4pplet/steezy60/keymaps/via/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/via/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all(
   QK_BOOT,   KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  _______, KC_DEL, 
-  _______, KC_BSPC, KC_UP,   KC_ENT,   _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    _______, _______, 
+  _______, KC_BSPC, KC_UP,   KC_ENT,   _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    _______, _______, 
   KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______,
   _______, _______, KC_MPRV, KC_MPLY,  KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
   _______, _______, _______, _______,  _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______ ),
diff --git a/keyboards/4pplet/waffling80/keymaps/default/keymap.c b/keyboards/4pplet/waffling80/keymaps/default/keymap.c
index 4cb9643d27..f9426716de 100644
--- a/keyboards/4pplet/waffling80/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling80/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // main layer
   [0] = LAYOUT_all(
-      KC_ESC,     KC_F1,      KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_PSCR,    KC_SLCK,    KC_PAUS,
+      KC_ESC,     KC_F1,      KC_F1,  KC_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_GRV,     KC_BSPC,    KC_INS,     KC_HOME,    KC_PGUP,
       KC_TAB,     KC_Q,       KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,       KC_P,       KC_LBRC,    KC_RBRC,    KC_BSLS,                KC_DEL ,    KC_END,     KC_PGDN,
       KC_CAPS,    KC_A,       KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,       KC_SCLN,    KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/4pplet/waffling80/keymaps/via/keymap.c b/keyboards/4pplet/waffling80/keymaps/via/keymap.c
index f599868dfd..aead3550bd 100644
--- a/keyboards/4pplet/waffling80/keymaps/via/keymap.c
+++ b/keyboards/4pplet/waffling80/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // main layer
   [0] = LAYOUT_all(
-      KC_ESC,     KC_F1,      KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_PSCR,    KC_SLCK,    KC_PAUS,
+      KC_ESC,     KC_F1,      KC_F1,  KC_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_GRV,      KC_BSPC,   KC_INS,     KC_HOME,    KC_PGUP,
       KC_TAB,     KC_Q,       KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,       KC_P,       KC_LBRC,    KC_RBRC,    KC_BSLS,                KC_DEL ,    KC_END,     KC_PGDN,
       KC_CAPS,    KC_A,       KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,       KC_SCLN,    KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/4pplet/yakiimo/keymaps/default/keymap.c b/keyboards/4pplet/yakiimo/keymaps/default/keymap.c
index ae5e71715e..bf399dc60e 100644
--- a/keyboards/4pplet/yakiimo/keymaps/default/keymap.c
+++ b/keyboards/4pplet/yakiimo/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // main layer
   [0] = LAYOUT_all(
-      KC_ESC,     KC_F1,      KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_PSCR,   KC_SLCK,    KC_PAUS,
+      KC_ESC,     KC_F1,      KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_PSCR,   KC_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_BSPC,   KC_INS,     KC_HOME,    KC_PGUP,
       KC_TAB,     KC_Q,       KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,       KC_P,       KC_LBRC,    KC_RBRC,    KC_BSLS,                KC_DEL ,    KC_END,     KC_PGDN,
       KC_CAPS,    KC_A,       KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,       KC_SCLN,    KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/4pplet/yakiimo/keymaps/via/keymap.c b/keyboards/4pplet/yakiimo/keymaps/via/keymap.c
index 2646dba11a..df6b1118c6 100644
--- a/keyboards/4pplet/yakiimo/keymaps/via/keymap.c
+++ b/keyboards/4pplet/yakiimo/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // main layer
 [0] = LAYOUT_all(
-    KC_ESC,     KC_F1,      KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_PSCR,   KC_SLCK,    KC_PAUS,
+    KC_ESC,     KC_F1,      KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_PSCR,   KC_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_BSPC,   KC_INS,     KC_HOME,    KC_PGUP,
     KC_TAB,     KC_Q,       KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,       KC_P,       KC_LBRC,    KC_RBRC,    KC_BSLS,                KC_DEL ,    KC_END,     KC_PGDN,
     KC_CAPS,    KC_A,       KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,       KC_SCLN,    KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c b/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c
index 134fbd4972..a0ce36ef19 100644
--- a/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c
+++ b/keyboards/abatskeyboardclub/nayeon/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_ansi_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c b/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c
index 74e74207a3..a133520b56 100644
--- a/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c
+++ b/keyboards/abatskeyboardclub/nayeon/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_iso_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c b/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c
index 062b05ec49..069bc6d14c 100644
--- a/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c
+++ b/keyboards/abatskeyboardclub/nayeon/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
index 68f13497b1..a2548a7dc2 100644
--- a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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,
-        RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, BS_SWAP,
+        RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
         BL_TOGG, BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
         KC_TRNS, QK_BOOT,   KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
index dfeeea7547..4e27dc6492 100644
--- a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, BS_SWAP,
+        RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
         BL_TOGG, BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
         KC_TRNS, QK_BOOT,   KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
index 76609c465a..3c3a84d2d0 100644
--- a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_tsangan(
         KC_SLEP,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        RGB_TOG,  RGB_RMOD, RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_CLR,
+        RGB_TOG,  RGB_RMOD, RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_CLR,
         KC_TRNS,  KC_VOLD,  KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,         KC_TRNS,
         BL_TOGG,  BL_DEC,   BL_INC,  KC_CALC, KC_MPLY, KC_MNXT, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
         KC_TRNS,  QK_BOOT,    KC_TRNS,                            KC_TRNS,                                     KC_STOP, KC_TRNS, KC_TRNS
diff --git a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
index c7358d7170..525b4cbc0b 100644
--- a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_utilitarian(
         KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        RGB_TOG,  RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, BS_SWAP,
+        RGB_TOG,  RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
         KC_TRNS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
         BL_TOGG,  BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/acheron/austin/keymaps/default/keymap.c b/keyboards/acheron/austin/keymaps/default/keymap.c
index 0dd5531a20..95c59d9612 100755
--- a/keyboards/acheron/austin/keymaps/default/keymap.c
+++ b/keyboards/acheron/austin/keymaps/default/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR,            KC_SLCK,   KC_PAUS, KC_HOME, KC_END , KC_DEL ,
-        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC , KC_F1  , KC_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_HOME, KC_END , KC_DEL ,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   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_PGDN,   KC_P4  , KC_P5  , KC_P6  , 
         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,
diff --git a/keyboards/acheron/austin/keymaps/via/keymap.c b/keyboards/acheron/austin/keymaps/via/keymap.c
index f588185d54..fd47f936e8 100644
--- a/keyboards/acheron/austin/keymaps/via/keymap.c
+++ b/keyboards/acheron/austin/keymaps/via/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR,            KC_SLCK,   KC_PAUS, KC_HOME, KC_END , KC_DEL ,
-        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC , KC_F1  , KC_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_HOME, KC_END , KC_DEL ,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   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_PGDN,   KC_P4  , KC_P5  , KC_P6  , 
         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,
diff --git a/keyboards/acheron/elongate/beta/keymaps/default/keymap.c b/keyboards/acheron/elongate/beta/keymaps/default/keymap.c
index c2b809b744..67429c4816 100644
--- a/keyboards/acheron/elongate/beta/keymaps/default/keymap.c
+++ b/keyboards/acheron/elongate/beta/keymaps/default/keymap.c
@@ -18,11 +18,11 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT( /* Base */
     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_P7,    KC_P8,   KC_P9,
-    KC_SLCK,  KC_A,    KC_S,    KC_D,    KC_F,            KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER,   KC_P4,    KC_P5,   KC_P6,
+    KC_SCRL,  KC_A,    KC_S,    KC_D,    KC_F,            KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER,   KC_P4,    KC_P5,   KC_P6,
     KC_LSHIFT,         KC_Z,    KC_X,    KC_C,            KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,      KC_P1,    KC_P2,   KC_P3,
     KC_LCTRL, KC_LWIN, KC_LALT,          LT(2, KC_SPACE),                   KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,    KC_RIGHT, KC_P0,   KC_DOT),
 [1] = LAYOUT( /* Base */
-    KC_F1,    KC_F2,   KC_F2,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,    KC_NLCK, KC_SLCK, KC_CAPS,
+    KC_F1,    KC_F2,   KC_F2,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,    KC_NUM,  KC_SCRL, KC_CAPS,
     KC_1,     KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,              KC_RSHIFT, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP,   KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,                           KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN,   KC_END , KC_TRNS, KC_TRNS),
diff --git a/keyboards/acheron/elongate/beta/keymaps/via/keymap.c b/keyboards/acheron/elongate/beta/keymaps/via/keymap.c
index c2b809b744..67429c4816 100644
--- a/keyboards/acheron/elongate/beta/keymaps/via/keymap.c
+++ b/keyboards/acheron/elongate/beta/keymaps/via/keymap.c
@@ -18,11 +18,11 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT( /* Base */
     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_P7,    KC_P8,   KC_P9,
-    KC_SLCK,  KC_A,    KC_S,    KC_D,    KC_F,            KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER,   KC_P4,    KC_P5,   KC_P6,
+    KC_SCRL,  KC_A,    KC_S,    KC_D,    KC_F,            KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER,   KC_P4,    KC_P5,   KC_P6,
     KC_LSHIFT,         KC_Z,    KC_X,    KC_C,            KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,      KC_P1,    KC_P2,   KC_P3,
     KC_LCTRL, KC_LWIN, KC_LALT,          LT(2, KC_SPACE),                   KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,    KC_RIGHT, KC_P0,   KC_DOT),
 [1] = LAYOUT( /* Base */
-    KC_F1,    KC_F2,   KC_F2,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,    KC_NLCK, KC_SLCK, KC_CAPS,
+    KC_F1,    KC_F2,   KC_F2,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,    KC_NUM,  KC_SCRL, KC_CAPS,
     KC_1,     KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,              KC_RSHIFT, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP,   KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,                           KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN,   KC_END , KC_TRNS, KC_TRNS),
diff --git a/keyboards/acheron/elongate/delta/keymaps/default/keymap.c b/keyboards/acheron/elongate/delta/keymaps/default/keymap.c
index 9a9c2d6e73..26b0115644 100755
--- a/keyboards/acheron/elongate/delta/keymaps/default/keymap.c
+++ b/keyboards/acheron/elongate/delta/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LWIN, KC_LALT,          SPC_L2,                    KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,  KC_RIGHT, KC_KP_0, KC_DOT
 ),
 [1] = LAYOUT_all( /* Base */
-    KC_F1,   KC_F2,   KC_F2,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,  KC_NLCK, KC_SLCK, KC_CAPS,
+    KC_F1,   KC_F2,   KC_F2,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,  KC_NUM,  KC_SCRL, KC_CAPS,
     KC_CAPS, 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_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN, KC_END , KC_TRNS, KC_TRNS
diff --git a/keyboards/acheron/elongate/delta/keymaps/via/keymap.c b/keyboards/acheron/elongate/delta/keymaps/via/keymap.c
index 9a9c2d6e73..26b0115644 100755
--- a/keyboards/acheron/elongate/delta/keymaps/via/keymap.c
+++ b/keyboards/acheron/elongate/delta/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LWIN, KC_LALT,          SPC_L2,                    KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,  KC_RIGHT, KC_KP_0, KC_DOT
 ),
 [1] = LAYOUT_all( /* Base */
-    KC_F1,   KC_F2,   KC_F2,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,  KC_NLCK, KC_SLCK, KC_CAPS,
+    KC_F1,   KC_F2,   KC_F2,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,  KC_NUM,  KC_SCRL, KC_CAPS,
     KC_CAPS, 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_TRNS,
     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN, KC_END , KC_TRNS, KC_TRNS
diff --git a/keyboards/ada/ada1800mini/keymaps/default/keymap.c b/keyboards/ada/ada1800mini/keymaps/default/keymap.c
index 87fc4b6da2..30b6326ecd 100644
--- a/keyboards/ada/ada1800mini/keymaps/default/keymap.c
+++ b/keyboards/ada/ada1800mini/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_MINS, KC_EQL,  KC_NLCK,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_MINS, KC_EQL,  KC_NUM,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, KC_P7,   KC_P8,   KC_P9,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,  KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_LSFT, KC_P1,   KC_P2,   KC_P3,   KC_UP,
diff --git a/keyboards/aeboards/constellation/keymaps/default/keymap.c b/keyboards/aeboards/constellation/keymaps/default/keymap.c
index b9d847c136..53ebb108aa 100755
--- a/keyboards/aeboards/constellation/keymaps/default/keymap.c
+++ b/keyboards/aeboards/constellation/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  QK_BOOT,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/aeboards/constellation/keymaps/via/keymap.c b/keyboards/aeboards/constellation/keymaps/via/keymap.c
index 2836cf848d..0cdfddaa5f 100755
--- a/keyboards/aeboards/constellation/keymaps/via/keymap.c
+++ b/keyboards/aeboards/constellation/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/aeboards/ext65/keymaps/default/keymap.c b/keyboards/aeboards/ext65/keymaps/default/keymap.c
index e73a74bf1e..0a4276b130 100644
--- a/keyboards/aeboards/ext65/keymaps/default/keymap.c
+++ b/keyboards/aeboards/ext65/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------------------------------'
    */
   [0] = LAYOUT_ext65(
-    KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_ESC , KC_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_PMNS, KC_PAST, KC_PSLS, KC_NUM,  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
     KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
     KC_PPLS, KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                   KC_UP  , KC_PGDN,
diff --git a/keyboards/aeboards/ext65/keymaps/via/keymap.c b/keyboards/aeboards/ext65/keymaps/via/keymap.c
index e73a74bf1e..2ae1ac0a64 100644
--- a/keyboards/aeboards/ext65/keymaps/via/keymap.c
+++ b/keyboards/aeboards/ext65/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------------------------------'
    */
   [0] = LAYOUT_ext65(
-    KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_ESC , KC_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_PMNS, KC_PAST, KC_PSLS, KC_NUM , KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
     KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
     KC_PPLS, KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                   KC_UP  , KC_PGDN,
diff --git a/keyboards/ai03/andromeda/keymaps/default/keymap.c b/keyboards/ai03/andromeda/keymaps/default/keymap.c
index 41db12fc51..7227d2037d 100644
--- a/keyboards/ai03/andromeda/keymaps/default/keymap.c
+++ b/keyboards/ai03/andromeda/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_tkl_ansi_wkl(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                KC_PSCR, KC_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,
diff --git a/keyboards/ai03/andromeda/keymaps/via/keymap.c b/keyboards/ai03/andromeda/keymaps/via/keymap.c
index 967bfdf2bd..49b47920be 100644
--- a/keyboards/ai03/andromeda/keymaps/via/keymap.c
+++ b/keyboards/ai03/andromeda/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_tkl_ansi_wkl(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                KC_PSCR, KC_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,
diff --git a/keyboards/ai03/lunar/keymaps/default/keymap.c b/keyboards/ai03/lunar/keymaps/default/keymap.c
index bf04bbea85..f709e688c0 100644
--- a/keyboards/ai03/lunar/keymaps/default/keymap.c
+++ b/keyboards/ai03/lunar/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT( /* FN */
 		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  MANUAL, 
-		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, SWPLURL, 
+		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, SWPLURL, 
 		_______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______, _______, 
 		_______,          KC_RCTL, KC_RGUI, KC_RALT, _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______, _______,          KC_PGUP, _______, 
 		_______, _______, _______,          _______,          _______,          _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c b/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
index 4846a220e3..11c860af7f 100644
--- a/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
+++ b/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[2] = LAYOUT( /* FN */
 		QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
-		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
+		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
 		_______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______, _______,
 		_______,          KC_RCTL, KC_RGUI, KC_RALT, _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______, _______,          KC_PGUP, _______,
 		_______, _______, _______,          _______,          _______,          _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/ai03/lunar/keymaps/via/keymap.c b/keyboards/ai03/lunar/keymaps/via/keymap.c
index 87eb533be5..a200c56803 100644
--- a/keyboards/ai03/lunar/keymaps/via/keymap.c
+++ b/keyboards/ai03/lunar/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT( /* FN */
 		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______, 
-		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, 
+		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, 
 		_______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______, _______, 
 		_______,          KC_RCTL, KC_RGUI, KC_RALT, _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______, _______,          KC_PGUP, _______, 
 		_______, _______, _______,          _______,          _______,          _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/ai03/lunar/keymaps/zyber/keymap.c b/keyboards/ai03/lunar/keymaps/zyber/keymap.c
index 5ab7bde3e3..5e2c9f3178 100644
--- a/keyboards/ai03/lunar/keymaps/zyber/keymap.c
+++ b/keyboards/ai03/lunar/keymaps/zyber/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT( /* FN */
 		QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_DEL,  KC_DEL,  KC_PAUS,
-		C_BLK,            _______, KC_UP,   _______,  _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_MPRV,  KC_MPLY,  KC_MNXT, _______, KC_SLCK,
+		C_BLK,            _______, KC_UP,   _______,  _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_MPRV,  KC_MPLY,  KC_MNXT, _______, KC_SCRL,
 		_______,          KC_LEFT, KC_DOWN, KC_RGHT,  _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______,  _______,           _______, _______,
 		_______,          KC_RCTL, KC_RGUI, KC_RALT,  _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______,  _______,           KC_PGUP, _______,
 		_______, _______, _______,          _______,           _______,          _______,                   _______,  _______,  KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/ai03/orbit/keymaps/default/keymap.c b/keyboards/ai03/orbit/keymaps/default/keymap.c
index c9696ccde6..de737d4b9a 100644
--- a/keyboards/ai03/orbit/keymaps/default/keymap.c
+++ b/keyboards/ai03/orbit/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 	),
 	[2] = LAYOUT( /* Mousekeys and Numpad */
-		KC_NO,   _______, _______, _______, _______, _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______, _______,
+		KC_NO,   _______, _______, _______, _______, _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______, _______,
 		KC_NO,   _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______, _______,
 		TO(1),   _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______, _______,
 		TO(1),   _______, KC_ACL0, KC_ACL1, KC_ACL2, KC_BTN3, _______, DBLZERO, KC_P0,   KC_PDOT, KC_PENT, KC_PPLS, _______, MANUAL,
diff --git a/keyboards/ai03/quasar/keymaps/ai03/keymap.c b/keyboards/ai03/quasar/keymaps/ai03/keymap.c
index 95348ee113..d0a12839ca 100644
--- a/keyboards/ai03/quasar/keymaps/ai03/keymap.c
+++ b/keyboards/ai03/quasar/keymaps/ai03/keymap.c
@@ -27,7 +27,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS, 
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS, 
 	KC_LGUI, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP, 
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN, 
 	MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,                                
diff --git a/keyboards/ai03/quasar/keymaps/default/keymap.c b/keyboards/ai03/quasar/keymaps/default/keymap.c
index c7d2c2ca36..7f6563edf5 100644
--- a/keyboards/ai03/quasar/keymaps/default/keymap.c
+++ b/keyboards/ai03/quasar/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS, 
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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(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,                                
diff --git a/keyboards/ai03/soyuz/keymaps/1U/keymap.c b/keyboards/ai03/soyuz/keymaps/1U/keymap.c
index aa8683c8a4..18a9747329 100644
--- a/keyboards/ai03/soyuz/keymaps/1U/keymap.c
+++ b/keyboards/ai03/soyuz/keymaps/1U/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_5x4( /* Base */
-    KC_NLCK, KC_PSLS, KC_PAST, KC_BSPC, \
+    KC_NUM,  KC_PSLS, KC_PAST, KC_BSPC, \
 	KC_P7,   KC_P8,   KC_P9,   KC_MINS, \
 	KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
 	KC_P1,   KC_P2,   KC_P3,   KC_EQL,  \
diff --git a/keyboards/ai03/soyuz/keymaps/default/keymap.c b/keyboards/ai03/soyuz/keymaps/default/keymap.c
index 830d4ea3e3..7496b250bd 100644
--- a/keyboards/ai03/soyuz/keymaps/default/keymap.c
+++ b/keyboards/ai03/soyuz/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_5x4( /* Base */
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 	KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ai03/soyuz/keymaps/via/keymap.c b/keyboards/ai03/soyuz/keymaps/via/keymap.c
index c516d2b4d3..04f31d764a 100644
--- a/keyboards/ai03/soyuz/keymaps/via/keymap.c
+++ b/keyboards/ai03/soyuz/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Default Layer
     [_BASE] = LAYOUT_ortho_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/akb/ogr/keymaps/default/keymap.c b/keyboards/akb/ogr/keymaps/default/keymap.c
index fa95d127da..3dfefd2034 100644
--- a/keyboards/akb/ogr/keymaps/default/keymap.c
+++ b/keyboards/akb/ogr/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
        _______, _______,  _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
        _______, _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/akb/ogr/keymaps/via/keymap.c b/keyboards/akb/ogr/keymaps/via/keymap.c
index 844a454fce..da631b8312 100644
--- a/keyboards/akb/ogr/keymaps/via/keymap.c
+++ b/keyboards/akb/ogr/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______,    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______,    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/akb/raine/keymaps/default/keymap.c b/keyboards/akb/raine/keymaps/default/keymap.c
index b247c40592..cfd3ce767f 100644
--- a/keyboards/akb/raine/keymaps/default/keymap.c
+++ b/keyboards/akb/raine/keymaps/default/keymap.c
@@ -23,9 +23,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
 	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_BSPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
   [1] = LAYOUT( /* Second */
-  KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_DEL, KC_NLCK, KC_PSCR, KC_INS,
+  KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_DEL, KC_NUM, KC_PSCR, KC_INS,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_HOME, KC_UP, KC_PGUP,
-	_______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, _______, _______, KC_LEFT, KC_SLCK, KC_RGHT,
+	_______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, _______, _______, KC_LEFT, KC_SCRL, KC_RGHT,
 	_______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, _______, _______, _______, KC_END, KC_DOWN, KC_PGDN,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT),
 };
diff --git a/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c b/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
index c2de091fef..522651f1c6 100644
--- a/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
+++ b/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
@@ -66,9 +66,9 @@ KC_LCTL, _______, _______, _______, KC_SPC, _______, _______, KC_RALT, LT(1, KC_
  `------`    '------------------------------`    '-----'  |    |    |    | `---------'
                                                           `--------------'
   */
-KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 				KC_NLCK, KC_PSCR, KC_EQUAL,
+KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 				KC_NUM, KC_PSCR, KC_EQUAL,
 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, _______, KC_HOME, KC_UP,   KC_PGUP,
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_DEL, 	KC_LEFT, KC_SLCK, KC_RGHT,
+_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_DEL, 	KC_LEFT, KC_SCRL, KC_RGHT,
 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_END,  KC_DOWN, KC_PGDN,
 KC_LGUI, _______, _______, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, QK_BOOT),
 };
diff --git a/keyboards/al1/keymaps/default/keymap.c b/keyboards/al1/keymaps/default/keymap.c
index 52387c94af..ef0c0abf06 100644
--- a/keyboards/al1/keymaps/default/keymap.c
+++ b/keyboards/al1/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                             KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/al1/keymaps/splitbs/keymap.c b/keyboards/al1/keymaps/splitbs/keymap.c
index 5214e23646..db07e5ff25 100644
--- a/keyboards/al1/keymaps/splitbs/keymap.c
+++ b/keyboards/al1/keymaps/splitbs/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_split_bs(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,          KC_INS,           KC_NLCK, 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_GRV,  KC_BSPC,          KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                   KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                      KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                     KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/al1/keymaps/via/keymap.c b/keyboards/al1/keymaps/via/keymap.c
index eaa5273339..46c8b0ddce 100644
--- a/keyboards/al1/keymaps/via/keymap.c
+++ b/keyboards/al1/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        [0] = LAYOUT(
-       KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+       KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,
        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/aleblazer/zodiark/keymaps/default/keymap.c b/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
index c6a81c67f9..a6003deab2 100644
--- a/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
+++ b/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
@@ -47,16 +47,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_LOWER] = LAYOUT(
       _______, KC_F1, KC_F2, KC_F3, KC_F4,   KC_F5,                                KC_F6,   KC_F7,   KC_F8, KC_F9, KC_F10, KC_F11,
-      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NLCK, _______, _______,                   _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NLCK, _______, _______,                   _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NLCK,
+      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                   _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
+      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                   _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
       _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
       _______, KC_P0, KC_PDOT, KC_PENT, _______,     _______,  _______,   _______,    _______,   _______, KC_P0, KC_PDOT, KC_PENT, _______
       ),
 
 	[_RAISE] = LAYOUT(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                           KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NLCK, _______, _______,                    _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NLCK, _______, _______,                    _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NLCK,
+      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                    _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
+      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                    _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
       _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
       _______, KC_P0, KC_PDOT, KC_PENT, _______,    _______,   _______,  _______,    _______,    _______, KC_P0, KC_PDOT, KC_PENT, _______
       ),
diff --git a/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c b/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
index ca8f91f1df..f9062bef7d 100644
--- a/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
+++ b/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
@@ -50,16 +50,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_LOWER] = LAYOUT(
       _______, KC_F1, KC_F2, KC_F3, KC_F4,   KC_F5,                                KC_F6,   KC_F7,   KC_F8, KC_F9, KC_F10, KC_F11,
-      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NLCK, _______, _______,                   _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NLCK, _______, _______,                   _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NLCK,
+      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                   _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
+      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                   _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
       _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
       _______, KC_P0, KC_PDOT, KC_PENT, _______,     _______,  _______,   _______,    _______,   _______, KC_P0, KC_PDOT, KC_PENT, _______
       ),
 
 	[_RAISE] = LAYOUT(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                           KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NLCK, _______, _______,                    _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NLCK, _______, _______,                    _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NLCK,
+      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                    _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
+      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                    _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
       _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
       _______, KC_P0, KC_PDOT, KC_PENT, _______,    _______,   _______,  _______,    _______,    _______, KC_P0, KC_PDOT, KC_PENT, _______
       ),
diff --git a/keyboards/aleblazer/zodiark/keymaps/via/keymap.c b/keyboards/aleblazer/zodiark/keymaps/via/keymap.c
index 1159afb434..c6f06b6971 100644
--- a/keyboards/aleblazer/zodiark/keymaps/via/keymap.c
+++ b/keyboards/aleblazer/zodiark/keymaps/via/keymap.c
@@ -27,16 +27,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		
 	[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_PSLS, KC_P7, KC_P8, KC_P9, KC_NLCK, _______, _______,                   _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NLCK, _______, _______,                   _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NLCK,
+      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                   _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
+      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                   _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
       _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
       _______, KC_P0, KC_PDOT, KC_PENT, _______,     _______,  _______,   _______,    _______,   _______, KC_P0, KC_PDOT, KC_PENT, _______
       ),
 	  
 	[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_PSLS, KC_P7, KC_P8, KC_P9, KC_NLCK, _______, _______,                    _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NLCK, _______, _______,                    _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NLCK,
+      KC_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                    _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
+      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                    _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
       _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
       _______, KC_P0, KC_PDOT, KC_PENT, _______,    _______,   _______,  _______,    _______,    _______, KC_P0, KC_PDOT, KC_PENT, _______
       ),
diff --git a/keyboards/alf/x11/keymaps/default/keymap.c b/keyboards/alf/x11/keymaps/default/keymap.c
index 3058d3123f..4ba2d83a94 100644
--- a/keyboards/alf/x11/keymaps/default/keymap.c
+++ b/keyboards/alf/x11/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/alf/x11/keymaps/via/keymap.c b/keyboards/alf/x11/keymaps/via/keymap.c
index 93ca9df6cb..c744f07f59 100644
--- a/keyboards/alf/x11/keymaps/via/keymap.c
+++ b/keyboards/alf/x11/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/alf/x2/keymaps/default/keymap.c b/keyboards/alf/x2/keymaps/default/keymap.c
index fa7f2b51c9..2549543ee2 100644
--- a/keyboards/alf/x2/keymaps/default/keymap.c
+++ b/keyboards/alf/x2/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_all(
                  KC_MNXT, KC_MPRV,
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, QK_BOOT,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, KC_DOWN, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/alf/x2/keymaps/hhkb_60/keymap.c b/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
index f8820570d2..2e261d1a28 100644
--- a/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
+++ b/keyboards/alf/x2/keymaps/hhkb_60/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_all(
                  KC_MNXT, KC_MPRV,
         KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, QK_BOOT,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
index a63648bcf7..8762ce72d0 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LAYER0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
index 72892846f9..c6db463789 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
@@ -22,7 +22,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LAYER0] = LAYOUT_tkl_f13_iso(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC         ,          KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
index 234b1baf76..9c9dc9ffbd 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LAYER0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/aliceh66/pianoforte_hs/keymaps/default/keymap.c b/keyboards/aliceh66/pianoforte_hs/keymaps/default/keymap.c
index d39b7dda99..17aa2ae0e8 100644
--- a/keyboards/aliceh66/pianoforte_hs/keymaps/default/keymap.c
+++ b/keyboards/aliceh66/pianoforte_hs/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LAYER0] = LAYOUT_tkl_ansi(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                KC_ENT,
diff --git a/keyboards/aliceh66/pianoforte_hs/keymaps/via/keymap.c b/keyboards/aliceh66/pianoforte_hs/keymaps/via/keymap.c
index 3d69572d42..ddbaa3a8ef 100644
--- a/keyboards/aliceh66/pianoforte_hs/keymaps/via/keymap.c
+++ b/keyboards/aliceh66/pianoforte_hs/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LAYER0] = LAYOUT_tkl_ansi(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,    KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,    KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                KC_ENT,
diff --git a/keyboards/alps64/keymaps/crd/keymap.c b/keyboards/alps64/keymaps/crd/keymap.c
index 533a30b1bc..e68977d867 100644
--- a/keyboards/alps64/keymaps/crd/keymap.c
+++ b/keyboards/alps64/keymaps/crd/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT_aek_103(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______
   )
diff --git a/keyboards/alps64/keymaps/dbroqua/keymap.c b/keyboards/alps64/keymaps/dbroqua/keymap.c
index 164d76f89a..92fcf1a192 100644
--- a/keyboards/alps64/keymaps/dbroqua/keymap.c
+++ b/keyboards/alps64/keymaps/dbroqua/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
   [1] = LAYOUT_all(
     KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,
-    _______,  _______,  _______,  _______,  _______,  _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,
     _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_INS,   KC_DEL,   _______,
     _______,  _______,  KC_APP,   _______,  _______,  _______,  _______,  KC_END,   _______,  _______,  _______,  _______,  _______,  _______,
     _______,  _______,  _______,                      _______,                                          _______,  _______,  _______,  _______
diff --git a/keyboards/alps64/keymaps/zyber/keymap.c b/keyboards/alps64/keymaps/zyber/keymap.c
index 1110b64165..5d7cf1a64d 100644
--- a/keyboards/alps64/keymaps/zyber/keymap.c
+++ b/keyboards/alps64/keymaps/zyber/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT_aek_103(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, _______,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______,                            QK_BOOT,                            _______, _______, _______
   )
diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
index 3f83fc8236..bf5a8deb05 100644
--- a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_UP,  KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_UP,  KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,
         BL_BRTG,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_TRNS,KC_TRNS,KC_TRNS,
         BL_STEP,KC_NO,  KC_TRNS,KC_APP, KC_TRNS,KC_TRNS,KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_SLEP,KC_TRNS,KC_TRNS,          KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS)
diff --git a/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
index 95247ebfc8..c61b0bd9a3 100644
--- a/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_PAUS, KC_INS,  KC_DEL,  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, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
index c6d5f06b18..37918dcb06 100644
--- a/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BL] = LAYOUT_numpad_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_numpad_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,
     KC_P4,   KC_P5,   KC_P6,   QK_BOOT,
     KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
index 9579726594..a4f3b234e4 100644
--- a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_ortho_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, \
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, \
     KC_P7,   KC_P8,   KC_P9,   QK_BOOT, \
     KC_P4,   KC_P5,   KC_P6,   KC_PENT, \
     KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
diff --git a/keyboards/ano/keymaps/default/keymap.c b/keyboards/ano/keymaps/default/keymap.c
index 676724a8a7..35d04b83f1 100644
--- a/keyboards/ano/keymaps/default/keymap.c
+++ b/keyboards/ano/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
 	KC_ESC,	KC_F1,	KC_F2, 	KC_F3, 	KC_F4,	KC_F5,	KC_F6, 	KC_F7, 	KC_F8,	KC_F9, 	KC_F10, KC_F11, KC_F12, 	KC_DEL,         		        		 
-	KC_GRV,	KC_1,	KC_2,	KC_3, 	KC_4, 	KC_5, 	KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, 	KC_MINS,KC_EQL, 	KC_BSPC,		KC_NLCK,KC_PSLS,KC_PAST,KC_MEDIA_PLAY_PAUSE, 
+	KC_GRV,	KC_1,	KC_2,	KC_3, 	KC_4, 	KC_5, 	KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, 	KC_MINS,KC_EQL, 	KC_BSPC,		KC_NUM,KC_PSLS,KC_PAST,KC_MEDIA_PLAY_PAUSE, 
 	KC_TAB,	KC_Q, 	KC_W, 	KC_E, 	KC_R, 	KC_T, 	KC_Y, 	KC_U, 	KC_I, 	KC_O, 	KC_P, 	KC_LBRC,KC_RBRC,	KC_BSLS,		KC_P7, 	KC_P8, 	KC_P9, 	KC_B, 
 	KC_CAPS,KC_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,     
diff --git a/keyboards/aos/tkl/keymaps/aholland909/keymap.c b/keyboards/aos/tkl/keymaps/aholland909/keymap.c
index 511d1d44df..f876915a88 100644
--- a/keyboards/aos/tkl/keymaps/aholland909/keymap.c
+++ b/keyboards/aos/tkl/keymaps/aholland909/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso_wkl(
-    KC_GESC,       KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUSE,
+    KC_GESC,       KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUSE,
 
     KC_GRV,        KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,        KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/aos/tkl/keymaps/default/keymap.c b/keyboards/aos/tkl/keymaps/default/keymap.c
index 1df2220c7d..aa1a8dd1a4 100644
--- a/keyboards/aos/tkl/keymaps/default/keymap.c
+++ b/keyboards/aos/tkl/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso_wkl(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/aos/tkl/keymaps/via/keymap.c b/keyboards/aos/tkl/keymaps/via/keymap.c
index 80552e9e01..4d5d8fbad0 100644
--- a/keyboards/aos/tkl/keymaps/via/keymap.c
+++ b/keyboards/aos/tkl/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso_wkl(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/arisu/keymaps/fate/keymap.c b/keyboards/arisu/keymaps/fate/keymap.c
index 02f15febe1..55de2dc86f 100644
--- a/keyboards/arisu/keymaps/fate/keymap.c
+++ b/keyboards/arisu/keymaps/fate/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, KC_DEL,           _______,
+    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, KC_DEL,           _______,
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, _______, _______, _______, _______,                   _______,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, KC_APP,  _______,          _______,
     _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
diff --git a/keyboards/ash1800/keymaps/default/keymap.c b/keyboards/ash1800/keymaps/default/keymap.c
index ada869b16f..730ba768ca 100644
--- a/keyboards/ash1800/keymaps/default/keymap.c
+++ b/keyboards/ash1800/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all( /* Base */
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                       KC_DEL, KC_END, KC_PGDN, KC_SLCK,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,  KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+                                                                                                       KC_DEL, KC_END, KC_PGDN, KC_SCRL,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,  KC_NUM, KC_PSLS, KC_PAST, MO(1),
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,       KC_P4, KC_P5, KC_P6, KC_PPLS,
         KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/ash_xiix/keymaps/default/keymap.c b/keyboards/ash_xiix/keymaps/default/keymap.c
index 746ab986ef..5a6376c48f 100644
--- a/keyboards/ash_xiix/keymaps/default/keymap.c
+++ b/keyboards/ash_xiix/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all ( /* Base */
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                       KC_DEL, KC_END, KC_PGDN, KC_SLCK,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,  KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+                                                                                                       KC_DEL, KC_END, KC_PGDN, KC_SCRL,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,  KC_NUM, KC_PSLS, KC_PAST, MO(1),
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,       KC_P4, KC_P5, KC_P6, KC_PPLS,
         KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
index 30e6af7f6e..3556aac483 100644
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
+++ b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
@@ -17,8 +17,8 @@
 
 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_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_MEDIA_PLAY_PAUSE,  KC_AUDIO_MUTE, KC_AUDIO_VOL_UP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,  KC_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,
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c b/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c
index 5bf60cf558..d8f80a5c72 100644
--- a/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c
+++ b/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 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_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
     KC_LSFT,          KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/at_at/660m/keymaps/default/keymap.c b/keyboards/at_at/660m/keymaps/default/keymap.c
index 2006f1818e..fe788a286f 100644
--- a/keyboards/at_at/660m/keymaps/default/keymap.c
+++ b/keyboards/at_at/660m/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN1] = LAYOUT(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,          KC_VOLU,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_MPRV, KC_MNXT, KC_MPLY,          KC_VOLD,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_MPRV, KC_MNXT, KC_MPLY,          KC_VOLD,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______,          _______, KC_PGUP,
     _______, _______, _______,                            _______,                            _______, _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/atomic/keymaps/default/keymap.c b/keyboards/atomic/keymaps/default/keymap.c
index d4bdc18371..70feec1038 100644
--- a/keyboards/atomic/keymaps/default/keymap.c
+++ b/keyboards/atomic/keymaps/default/keymap.c
@@ -201,8 +201,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-     KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
-     KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
+     KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
+     KC_SCRL, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
      KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
      _______, _______, DF(_QW), DF(_CM), DF(_DV), _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D,
      _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/keyboards/atomic/keymaps/twolayer/keymap.c b/keyboards/atomic/keymaps/twolayer/keymap.c
index a38ddf358b..af235441ba 100644
--- a/keyboards/atomic/keymaps/twolayer/keymap.c
+++ b/keyboards/atomic/keymaps/twolayer/keymap.c
@@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_ortho_5x15( /* FUNCTION LAYER*/
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-        KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
+        KC_SCRL, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
         KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, KC_WH_U,
-        KC_NLCK, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_END,  KC_HOME, _______, _______, KC_MS_U, KC_WH_D,
+        KC_NUM,  _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_END,  KC_HOME, _______, _______, KC_MS_U, KC_WH_D,
         _______, _______, MO(1),   _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, MO(1),   KC_MS_L, KC_MS_D, KC_MS_R
     ),
 };
diff --git a/keyboards/atreus/keymaps/clash/keymap.c b/keyboards/atreus/keymaps/clash/keymap.c
index 9a1876ba74..6e65f360d1 100644
--- a/keyboards/atreus/keymaps/clash/keymap.c
+++ b/keyboards/atreus/keymaps/clash/keymap.c
@@ -37,5 +37,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,   KC_HOME, KC_MS_U, KC_END,  KC_PGUP,                   KC_BTN1, KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     OUT_USB,  KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN,                   KC_BTN2, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     OUT_BT,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_BTN3, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    OUT_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+    OUT_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
 };
diff --git a/keyboards/atreus/keymaps/default/keymap.c b/keyboards/atreus/keymaps/default/keymap.c
index 02509b6279..a2fdc75ac7 100644
--- a/keyboards/atreus/keymaps/default/keymap.c
+++ b/keyboards/atreus/keymaps/default/keymap.c
@@ -40,5 +40,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                     KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
 };
diff --git a/keyboards/atreus/keymaps/erlandsona/keymap.c b/keyboards/atreus/keymaps/erlandsona/keymap.c
index 75491e6869..64d2408040 100644
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ b/keyboards/atreus/keymaps/erlandsona/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [MOUS] = LAYOUT( /* Mouse and Media Keys */
-    KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9  ,                   KC_F8  , KC_F7  , KC_F6  , KC_F5  , KC_F4,
+    KC_SCRL, KC_PAUSE, KC_F11 , KC_F10 , KC_F9  ,                   KC_F8  , KC_F7  , KC_F6  , KC_F5  , KC_F4,
     KC_VOLD, KC_ACL0 , KC_ACL1, KC_ACL2, KC_VOLU,                   KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_F3,
     KC_MUTE, KC_MPRV , KC_MPLY, KC_MNXT, KC_MUTE,                   KC_WH_R, KC_WH_U, KC_WH_D, KC_WH_L, KC_F2,
     _______, _______ , _______, _______, _______, _______, _______, KC_BTN1, TO(BASE), QK_BOOT, KC_F12 , KC_F1
diff --git a/keyboards/atreus/keymaps/henxing/keymap.c b/keyboards/atreus/keymaps/henxing/keymap.c
index 8a792dbc42..21aaa24006 100644
--- a/keyboards/atreus/keymaps/henxing/keymap.c
+++ b/keyboards/atreus/keymaps/henxing/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,  KC_F8,   KC_F9,   KC_F10, \
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,  KC_F5,   KC_F6,   KC_F11, \
     KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, QK_BOOT,                   KC_TRNS, KC_F1,  KC_F2,   KC_F3,   KC_F12, \
-    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY, KC_PSCR, KC_SLCK, KC_PAUS \
+    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY, KC_PSCR, KC_SCRL, KC_PAUS \
   ),
 };
 
diff --git a/keyboards/atreus/keymaps/nojjan/keymap.c b/keyboards/atreus/keymaps/nojjan/keymap.c
index f7b8f0e51d..189a5c8e05 100644
--- a/keyboards/atreus/keymaps/nojjan/keymap.c
+++ b/keyboards/atreus/keymaps/nojjan/keymap.c
@@ -38,5 +38,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
   KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
   KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-  KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+  KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
 };
diff --git a/keyboards/atreus/keymaps/ptillemans/keymap.c b/keyboards/atreus/keymaps/ptillemans/keymap.c
index 9328d8ce53..0c9655f5b1 100644
--- a/keyboards/atreus/keymaps/ptillemans/keymap.c
+++ b/keyboards/atreus/keymaps/ptillemans/keymap.c
@@ -44,6 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    KC_NO,   KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______, TO(_QW), KC_PSCR, KC_SLCK, KC_MPLY
+    KC_NO,   KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______, TO(_QW), KC_PSCR, KC_SCRL, KC_MPLY
   )
 };
diff --git a/keyboards/atreus/keymaps/via/keymap.c b/keyboards/atreus/keymaps/via/keymap.c
index f4e274377b..355e08ac2f 100644
--- a/keyboards/atreus/keymaps/via/keymap.c
+++ b/keyboards/atreus/keymaps/via/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                     KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS ),
+    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS ),
 
   [_EM] = LAYOUT( /* [> EMPTY <] */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  ,
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
index 98dface93c..b6cc5a6890 100644
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	`----------------------------------'              `----------------------------------'*/
   [_ADJUST] = LAYOUT(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
-    KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
+    KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 ,
     _______, QWERTY,  COLEMAK, DVORAK,  DVORMAC,                   _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
   ),
diff --git a/keyboards/atreus/keymaps/yttyx/keymap.c b/keyboards/atreus/keymaps/yttyx/keymap.c
index ad34182212..ce19fc7da5 100644
--- a/keyboards/atreus/keymaps/yttyx/keymap.c
+++ b/keyboards/atreus/keymaps/yttyx/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
                             '-------'-------'-----'                 '-----'------'-------'
   */
   [P3] = LAYOUT(
-    KC_ESC,  XXXXXXX, KC_BRK,  KC_PSCR, KC_SLCK,                             KC_LABK, KC_RABK, KC_PLUS, KC_UNDS, KC_EQL,
+    KC_ESC,  XXXXXXX, KC_BRK,  KC_PSCR, KC_SCRL,                             KC_LABK, KC_RABK, KC_PLUS, KC_UNDS, KC_EQL,
     KC_TAB,  XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX,                             KC_LBRC, KC_RBRC, KC_ASTR, KC_MINS, KC_ENT,
     KC_LSFT, KC_LCTL, KC_LALT, KC_DEL,  XXXXXXX,                             KX_AT,   KC_LALT, KC_LCTL, KC_LSFT, _______,
     XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, XXXXXXX, _______,           XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/atreus62/keymaps/xyverz/keymap.c b/keyboards/atreus62/keymaps/xyverz/keymap.c
index 2bab2c2efc..11c7c33d67 100644
--- a/keyboards/atreus62/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus62/keymaps/xyverz/keymap.c
@@ -99,14 +99,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
     _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
     KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  MACLOCK, _______, KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
   ),
   [_RAISE] = LAYOUT (
     KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
     _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
     KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  MACLOCK, _______, KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
   ),
   [_ADJUST] = LAYOUT (
diff --git a/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c b/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c
index ba80d42d64..ac080e6165 100644
--- a/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c
+++ b/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_ansi_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,      KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,  
diff --git a/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c b/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c
index 7ea8e0e1ef..bc4d2c2e4d 100644
--- a/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c
+++ b/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,            KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,            KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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,  
diff --git a/keyboards/bacca70/keymaps/debaccabean/keymap.c b/keyboards/bacca70/keymaps/debaccabean/keymap.c
index da2ef7715b..1c40669fc8 100644
--- a/keyboards/bacca70/keymaps/debaccabean/keymap.c
+++ b/keyboards/bacca70/keymaps/debaccabean/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_debaccabean(
         QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
diff --git a/keyboards/bacca70/keymaps/dede-special/keymap.c b/keyboards/bacca70/keymaps/dede-special/keymap.c
index fc71850b6f..e213e79409 100644
--- a/keyboards/bacca70/keymaps/dede-special/keymap.c
+++ b/keyboards/bacca70/keymaps/dede-special/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [3] = LAYOUT_debaccabean(
         QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,TG(1),
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,
         KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
         KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,
         KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c
index 9076066f9f..f197c3a076 100644
--- a/keyboards/bajjak/keymaps/5x6/keymap.c
+++ b/keyboards/bajjak/keymaps/5x6/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  Left hand                                                                                       Right hand
     XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,
     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      XXXXXXX,        XXXXXXX,    KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,
-    _______,    KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    XXXXXXX,    XXXXXXX,        XXXXXXX,    KC_NLCK,    KC_P7 ,     KC_P8 ,     KC_P9,      KC_MINS,    KC_PSLS,
+    _______,    KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    XXXXXXX,    XXXXXXX,        XXXXXXX,    KC_NUM,     KC_P7 ,     KC_P8 ,     KC_P9,      KC_MINS,    KC_PSLS,
     XXXXXXX,    KC_HASH,    KC_DLR,     KC_LPRN,    KC_RPRN,    XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,    KC_P4 ,     KC_P5 ,     KC_P6,      KC_PLUS,    KC_PAST,
     _______,    KC_PERC,    KC_CIRC,    KC_LBRC,    KC_RBRC,    XXXXXXX,                                DF(MDIA),   KC_P1 ,     KC_P2 ,     KC_P3,      KC_PEQL,    _______,
     _______,    _______,    _______,    _______,    _______,                                                        _______,    _______,    KC_PDOT,    KC_P0,      DF(BASE),
diff --git a/keyboards/bajjak/keymaps/default/keymap.c b/keyboards/bajjak/keymaps/default/keymap.c
index 3bed2c52e7..1a2ea06d4f 100644
--- a/keyboards/bajjak/keymaps/default/keymap.c
+++ b/keyboards/bajjak/keymaps/default/keymap.c
@@ -91,8 +91,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = LAYOUT_6x7(
 //  Left hand                                                                                       Right hand
     KC_ESC,     KC_F1,      KC_F2,              KC_F3,      KC_F4,      KC_F5,      KC_F6,          KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_EJCT,
-    _______,    _______,    _______,            _______,    _______,    _______,    _______,        _______,    _______,    KC_NLCK,    KC_PEQL,    KC_PSLS,    KC_PAST,    KC_PSCR,
-    KC_TAB,     KC_EXLM,    KC_AT,              KC_LCBR,    KC_RCBR,    KC_PIPE,    _______,        _______,    _______,    KC_P7 ,     KC_P8 ,     KC_P9,      KC_MINS,    KC_SLCK,
+    _______,    _______,    _______,            _______,    _______,    _______,    _______,        _______,    _______,    KC_NUM,     KC_PEQL,    KC_PSLS,    KC_PAST,    KC_PSCR,
+    KC_TAB,     KC_EXLM,    KC_AT,              KC_LCBR,    KC_RCBR,    KC_PIPE,    _______,        _______,    _______,    KC_P7 ,     KC_P8 ,     KC_P9,      KC_MINS,    KC_SCRL,
     KC_CAPS,    KC_HASH,    KC_DLR,             KC_LPRN,    KC_RPRN,    KC_GRV,     _______,        _______,    _______,    KC_P4 ,     KC_P5 ,     KC_P6,      KC_PLUS,    KC_PAUS,
     KC_LSFT,    KC_PERC,    KC_CIRC,            KC_LBRC,    KC_RBRC,    KC_TILD,                                _______,    KC_P1 ,     KC_P2 ,     KC_P3,      KC_PENT,    KC_RSFT,
     KC_LCTRL,   KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                        KC_UP,      KC_DOWN,    KC_PDOT,    KC_P0,      _______,
diff --git a/keyboards/barleycorn_smd/keymaps/default/keymap.c b/keyboards/barleycorn_smd/keymaps/default/keymap.c
index 7a9c1c0478..a998994165 100644
--- a/keyboards/barleycorn_smd/keymaps/default/keymap.c
+++ b/keyboards/barleycorn_smd/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,                                    KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/barleycorn_smd/keymaps/iso/keymap.c b/keyboards/barleycorn_smd/keymaps/iso/keymap.c
index 11af1a44cd..29845c752a 100644
--- a/keyboards/barleycorn_smd/keymaps/iso/keymap.c
+++ b/keyboards/barleycorn_smd/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                                             KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,                                     KC_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_BSPC,
diff --git a/keyboards/barleycorn_smd/keymaps/via/keymap.c b/keyboards/barleycorn_smd/keymaps/via/keymap.c
index 7ba35fc9c1..21843996b1 100644
--- a/keyboards/barleycorn_smd/keymaps/via/keymap.c
+++ b/keyboards/barleycorn_smd/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,                                    KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/basekeys/slice/keymaps/default/keymap.c b/keyboards/basekeys/slice/keymaps/default/keymap.c
index 52c407630f..12532f7201 100644
--- a/keyboards/basekeys/slice/keymaps/default/keymap.c
+++ b/keyboards/basekeys/slice/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
        KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,      KC_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
-      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,       _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c b/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c
index c1174324f8..b899b2e53b 100644
--- a/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c
+++ b/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
       KC_ESC, TG(_ADJUST),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_DEL,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
-      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______,      _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
index 5038efffb6..ea7c329bd2 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
       KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPC, KC_DEL,
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,  _______,   _______, 
+      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,  _______,   _______, 
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
       _______,           _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______,   _______, 
   //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c
index 3702bc4b69..8fc93cdc98 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
        KC_ESC,TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPC,    KC_DEL,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
-      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       _______,           _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,              _______,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c
index 13ded633b8..6c3830630a 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
       KC_ESC,TG(_ADJUST),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS,    KC_DEL,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
-      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
index 46232c54da..4721a8bc3d 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,------------------------------------------------------------------------|   |--------------------------------------------------------------------------------------.
        KC_ESC, KC_GRAVE,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPC,    KC_DEL,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
-      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
       _______,           _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,              _______,
   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
index d3add93257..39ba3bb9c6 100644
--- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
+++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
        KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,      _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
-      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,       _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
        KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,      KC_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
-      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,       _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c
index 4e37d1146f..27b0881a50 100644
--- a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c
+++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
        KC_ESC,  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_BSPC,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
-      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP, _______,   _______,   _______,
+      _______,            _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,   _______,   _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
       _______,            _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,       _______,
   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
index ca67dd690c..a28c200b2d 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
@@ -133,7 +133,7 @@ enum charybdis_keymap_bstiq_layers {
 // Function keys.
 #define LAYOUT_LAYER_FUN                                                                      \
      KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, __________________RESET_R__________________, \
-     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \
+     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SCRL, ______________HOME_ROW_GASC_R______________, \
      KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
                        KC_APP,  KC_SPC,  KC_TAB,    U_NA,    U_NA
 
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
index 13d39ccaeb..caab0f96af 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -92,7 +92,7 @@ static uint16_t auto_pointer_layer_timer = 0;
  */
 #define LAYOUT_LAYER_FUNCTION                                                                 \
     _______________DEAD_HALF_ROW_______________, KC_PSCR,   KC_F7,   KC_F8,   KC_F9,  KC_F12, \
-    ______________HOME_ROW_GACS_L______________, KC_SLCK,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \
+    ______________HOME_ROW_GACS_L______________, KC_SCRL,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \
     _______________DEAD_HALF_ROW_______________, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,  KC_F10, \
                       XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX
 
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
index f8396cb1c2..5533bc40c6 100644
--- a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
+++ b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
@@ -133,7 +133,7 @@ enum bstiq_layers {
 // Function keys.
 #define LAYOUT_LAYER_FUN                                                                      \
      KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \
-     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \
+     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SCRL, ______________HOME_ROW_GASC_R______________, \
      KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
                                 KC_APP,  KC_TAB,    U_NA,    U_NA
 
diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.c b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
index 85781f6631..10adac4126 100644
--- a/keyboards/bastardkb/scylla/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [2] = LAYOUT_split_4x6_5(KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
                              //---------------------------------------------------------//--------------------------------------------------------------//
-                             _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC, KC_RBRC, _______, KC_NLCK, KC_INS, KC_SLCK, KC_MUTE,
+                             _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE,
                              //---------------------------------------------------------//--------------------------------------------------------------//
                              _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
                              //---------------------------------------------------------//--------------------------------------------------------------//
diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
index bc894df647..c5f563c90b 100644
--- a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
@@ -65,9 +65,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_split_4x6_5(
     KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCR   , KC_MUTE,
+    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NUM  ,  KC_CALC, KC_PSCR   , KC_MUTE,
     _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
-    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD,
+    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SCRL   , KC_VOLD,
 
                                   _______, _______, _______,    _______, KC_UP  , _______,
                                            _______, _______,    _______, KC_DOWN
diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c b/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
index b1f45951b7..2fb26dbf6f 100644
--- a/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
+++ b/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, QK_BOOT,
+  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, QK_BOOT,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
diff --git a/keyboards/bastardkb/tbk/keymaps/default/keymap.c b/keyboards/bastardkb/tbk/keymaps/default/keymap.c
index fe9a834fa2..f9a699f11f 100644
--- a/keyboards/bastardkb/tbk/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/tbk/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT_split_4x6_5(
     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,			    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,
 //---------------------------------------------------------//--------------------------------------------------------------//
-    _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC,			  KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK,  KC_MUTE,
+    _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC,			  KC_RBRC, _______, KC_NUM,  KC_INS,  KC_SCRL,  KC_MUTE,
 //---------------------------------------------------------//--------------------------------------------------------------//
     _______, KC_LEFT, KC_UP,    KC_DOWN, KC_RGHT, KC_LPRN,	      KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_VOLU,
 //---------------------------------------------------------//--------------------------------------------------------------//
diff --git a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
index bc894df647..c5f563c90b 100644
--- a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
+++ b/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
@@ -65,9 +65,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_split_4x6_5(
     KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCR   , KC_MUTE,
+    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NUM  ,  KC_CALC, KC_PSCR   , KC_MUTE,
     _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
-    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD,
+    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SCRL   , KC_VOLD,
 
                                   _______, _______, _______,    _______, KC_UP  , _______,
                                            _______, _______,    _______, KC_DOWN
diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c b/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
index b1f45951b7..2fb26dbf6f 100644
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
+++ b/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT_split_4x6_5(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, QK_BOOT,
+  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, QK_BOOT,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
diff --git a/keyboards/bear_face/v1/keymaps/default/keymap.c b/keyboards/bear_face/v1/keymaps/default/keymap.c
index 5f3ccc8729..ccebb7d083 100644
--- a/keyboards/bear_face/v1/keymaps/default/keymap.c
+++ b/keyboards/bear_face/v1/keymaps/default/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_83_ansi(
-        _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_INS,
+        _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, BASE_QWER,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, BASE_COLE,
         _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BASE_DVOR,
diff --git a/keyboards/bear_face/v2/keymaps/default/keymap.c b/keyboards/bear_face/v2/keymaps/default/keymap.c
index e5623d4f57..08df949b8c 100644
--- a/keyboards/bear_face/v2/keymaps/default/keymap.c
+++ b/keyboards/bear_face/v2/keymaps/default/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_83_ansi(
-        _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_INS,
+        _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, BASE_QWER,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, BASE_COLE,
         _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BASE_DVOR,
diff --git a/keyboards/bear_face/v2/keymaps/default_iso/keymap.c b/keyboards/bear_face/v2/keymaps/default_iso/keymap.c
index d6b7d6680d..347b84d2bd 100644
--- a/keyboards/bear_face/v2/keymaps/default_iso/keymap.c
+++ b/keyboards/bear_face/v2/keymaps/default_iso/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_84_iso(
-        _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_INS,
+        _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, BASE_QWER,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, 		  BASE_COLE,
         _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BASE_DVOR,
diff --git a/keyboards/bemeier/bmek/keymaps/default/keymap.c b/keyboards/bemeier/bmek/keymaps/default/keymap.c
index 8debfbe5f7..8526399379 100755
--- a/keyboards/bemeier/bmek/keymaps/default/keymap.c
+++ b/keyboards/bemeier/bmek/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   └─────┴──────┴────────────────┘     └────────────────┴──────┴─────┘
 */
  QK_BOOT,   KC_PWR,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
- _______, KC_CAPS,   _______, _______, _______, _______, _______,        _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, _______,  _______,
+ _______, KC_CAPS,   _______, _______, _______, _______, _______,        _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,   KC_UP, _______,  _______,
  _______, _______,    KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, _______,          KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,        KC_PENT,
  _______, _______, _______, _______, TG(2), _______, _______, _______,    KC_PPLS, KC_PMNS,  KC_END, KC_PGDN, KC_DOWN,       _______,    _______,
                      _______, _______,               _______,                 _______,          _______, _______
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
index d8a1a4a07c..0ed8534917 100644
--- a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------'   `------------------------------------------------'
    */
   [_FUNC] = LAYOUT( \
-    QK_BOOT, KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, _______, \
+    QK_BOOT, KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, _______, \
     _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, WIN,      JP_ASTR, KC_SLSH, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, _______, \
     KC_CAPS, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACOS,    JP_PLUS, KC_MINS, KC_END,  KC_PGDN, XXXXXXX, KC_VOLU, _______, \
     _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY  \
diff --git a/keyboards/bioi/g60ble/keymaps/via/keymap.c b/keyboards/bioi/g60ble/keymaps/via/keymap.c
index 491c1a20fd..860d1df616 100644
--- a/keyboards/bioi/g60ble/keymaps/via/keymap.c
+++ b/keyboards/bioi/g60ble/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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, QK_BOOT,   _______, _______, _______, _______, _______, _______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+    KC_CAPS, QK_BOOT,   _______, _______, _______, _______, _______, _______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
     _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, _______, KC_ASTR, KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
     RGB_MOD, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, KC_PLUS, KC_MINS, KC_END,  KC_PGDN, KC_DOWN, _______, BL_STEP, _______,
     RGB_TOG, RGB_VAD, RGB_VAI,                            _______,                   _______, _______, _______, _______, BL_TOGG
diff --git a/keyboards/bioi/s65/keymaps/default/keymap.c b/keyboards/bioi/s65/keymaps/default/keymap.c
index ad76a5eb87..0326a79ee8 100644
--- a/keyboards/bioi/s65/keymaps/default/keymap.c
+++ b/keyboards/bioi/s65/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 1: Function Layer
     [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_PSCR, KC_SLCK, KC_PAUS,
+        _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, KC_SCRL, KC_PAUS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/bioi/s65/keymaps/via/keymap.c b/keyboards/bioi/s65/keymaps/via/keymap.c
index 7911a4f6e3..e8e01661ec 100644
--- a/keyboards/bioi/s65/keymaps/via/keymap.c
+++ b/keyboards/bioi/s65/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 1: Function Layer
     [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_PSCR, KC_SLCK, KC_PAUS,
+        _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, KC_SCRL, KC_PAUS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/blackplum/keymaps/default/keymap.c b/keyboards/blackplum/keymaps/default/keymap.c
index cecd5545aa..a38cf80979 100644
--- a/keyboards/blackplum/keymaps/default/keymap.c
+++ b/keyboards/blackplum/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_68_ansi(
     KC_GRV, 	KC_F1,   	KC_F2,   	KC_F3,   KC_F4,   	KC_F5,   KC_F6,   KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  	KC_F11,  	KC_F12,  	_______,	KC_MPLY,	KC_HOME,
-    _______, 	RGB_MOD, 	RGB_HUI,   	RGB_SAI, RGB_VAI, 	_______, _______, _______, 	_______, 	_______, 	KC_PSCR, 	KC_SLCK, 	KC_PAUSE,  	_______,	KC_MUTE,	KC_END,
+    _______, 	RGB_MOD, 	RGB_HUI,   	RGB_SAI, RGB_VAI, 	_______, _______, _______, 	_______, 	_______, 	KC_PSCR, 	KC_SCRL, 	KC_PAUSE,  	_______,	KC_MUTE,	KC_END,
     _______,	RGB_TOG, 	RGB_HUD, 	RGB_SAD, RGB_VAD, 	_______, _______, _______, 	_______, 	_______, 	_______, 	_______, 				_______,
     _______,	_______, 	_______, 	_______, _______, 	_______, _______, _______,	_______, 				_______, 	_______, 				_______,	KC_VOLU,
     _______, 	TG_GUI,_______, 						QK_BOOT, 												_______,	_______,	_______,	KC_MPRV,    KC_VOLD, 	KC_MNXT
diff --git a/keyboards/blackplum/keymaps/via/keymap.c b/keyboards/blackplum/keymaps/via/keymap.c
index e078b962b7..241323ef1d 100644
--- a/keyboards/blackplum/keymaps/via/keymap.c
+++ b/keyboards/blackplum/keymaps/via/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_68_ansi(
     KC_GRV, 	KC_F1,   	KC_F2,   	KC_F3,   KC_F4,   	KC_F5,   KC_F6,   KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  	KC_F11,  	KC_F12,  	KC_TRNS,	KC_MPLY,	KC_HOME,
-    KC_TRNS, 	RGB_MOD, 	RGB_HUI,   	RGB_SAI, RGB_VAI, 	KC_TRNS, KC_TRNS, KC_TRNS, 	KC_TRNS, 	KC_TRNS, 	KC_PSCR, 	KC_SLCK, 	KC_PAUSE,  	KC_TRNS,	KC_MUTE,	KC_END,
+    KC_TRNS, 	RGB_MOD, 	RGB_HUI,   	RGB_SAI, RGB_VAI, 	KC_TRNS, KC_TRNS, KC_TRNS, 	KC_TRNS, 	KC_TRNS, 	KC_PSCR, 	KC_SCRL, 	KC_PAUSE,  	KC_TRNS,	KC_MUTE,	KC_END,
     KC_TRNS,	RGB_TOG, 	RGB_HUD, 	RGB_SAD, RGB_VAD, 	KC_TRNS, KC_TRNS, KC_TRNS, 	KC_TRNS, 	KC_TRNS, 	KC_TRNS, 	KC_TRNS, 				KC_TRNS,
     KC_TRNS,	KC_TRNS, 	KC_TRNS, 	KC_TRNS, KC_TRNS, 	KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS, 				KC_TRNS, 	KC_TRNS, 				KC_TRNS,	KC_VOLU,
     KC_TRNS, 	KC_TRNS,	KC_TRNS, 						QK_BOOT, 												KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_MPRV,    KC_VOLD, 	KC_MNXT
diff --git a/keyboards/blank/blank01/keymaps/default/keymap.c b/keyboards/blank/blank01/keymaps/default/keymap.c
index 500450e578..cf7f5583c8 100644
--- a/keyboards/blank/blank01/keymaps/default/keymap.c
+++ b/keyboards/blank/blank01/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Fn1 Layer
     [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_TRNS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/blank/blank01/keymaps/via/keymap.c b/keyboards/blank/blank01/keymaps/via/keymap.c
index fe4dcb47ac..88ab48b151 100644
--- a/keyboards/blank/blank01/keymaps/via/keymap.c
+++ b/keyboards/blank/blank01/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Fn1 Layer
     [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_TRNS, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c b/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
index 3e970b134e..db43291a3c 100644
--- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
+++ b/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //   ┌────────┬────────┬────────┬────────┬────────┬────────┐                       ┌────────┬────────┬────────┬────────┬────────┬────────┐
       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_NLCK, KC_P7,   KC_P8,   KC_P9,   _______, KC_F12,
+      _______, _______, _______, _______, _______, _______,                         KC_NUM,  KC_P7,   KC_P8,   KC_P9,   _______, KC_F12,
 //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
       _______, _______, _______, _______,  _______, _______,                        KC_PPLS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, _______,
 //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Automatically sets the numlock on at startup
 void led_set_keymap(uint8_t usb_led) {
   if (!(usb_led & (1<<USB_LED_NUM_LOCK))) {
-    tap_code(KC_NLCK);
+    tap_code(KC_NUM_LOCK);
   }
 }
 
diff --git a/keyboards/boardrun/bizarre/keymaps/default/keymap.c b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
index e7cb43ae3f..f27c7a2c30 100644
--- a/keyboards/boardrun/bizarre/keymaps/default/keymap.c
+++ b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FNBIZARRE] = LAYOUT_all(
        QK_BOOT,     _______,_______,KC_F1,     KC_F2,  KC_F3,  KC_F4,  KC_F5,                      KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10, KC_F11, KC_F12, KC_DEL, _______,
        _______,      _______,    _______,    _______,_______,QK_BOOT,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
-                 _______,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+                 _______,      _______,      KC_SCRL,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
            _______,  _______,_______,        _______,_______,_______,KC_PAUS,KC_RGUI,    _______,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
                  _______,                                _______,    _______,            KC_RALT,                                          _______,    KC_HOME,KC_PGDN,KC_END
     )
diff --git a/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c b/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
index 4b28cab796..c0817ed7c0 100644
--- a/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
+++ b/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_ansi(
        _MINMIZ,   _______,_______,   KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,                    KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10, KC_F11, KC_F12, _______,
        KC_CALC,      _______,    _______,    _______,_______,QK_BOOT,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
-                 KC_CAPS,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,
+                 KC_CAPS,      _______,      KC_SCRL,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,
            _LSNUBS,          _______,        _______,_______,_______,KC_PAUS,_______,    KC_RGUI,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
                  _______,                                _CTLALT,    KC_DEL,             _______,                                          _______,    _______,KC_PGDN,_______
     )
diff --git a/keyboards/boardrun/bizarre/keymaps/via/keymap.c b/keyboards/boardrun/bizarre/keymaps/via/keymap.c
index 2b699ec46e..878962f239 100644
--- a/keyboards/boardrun/bizarre/keymaps/via/keymap.c
+++ b/keyboards/boardrun/bizarre/keymaps/via/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_all(
        QK_BOOT,     _______,_______,KC_F1,     KC_F2,  KC_F3,  KC_F4,  KC_F5,                      KC_F6,  KC_F7,  KC_F8,  KC_F9,    KC_F10, KC_F11, KC_F12, KC_DEL, _______,
        _______,      _______,    _______,    _______,_______,QK_BOOT,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
-                 _______,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+                 _______,      _______,      KC_SCRL,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
            _______,  _______,_______,        _______,_______,_______,KC_PAUS,KC_RGUI,    _______,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
                  _______,                                _______,    _______,            KC_RALT,                                          _______,    KC_HOME,KC_PGDN,KC_END
     ),
diff --git a/keyboards/boardrun/classic/keymaps/default/keymap.c b/keyboards/boardrun/classic/keymaps/default/keymap.c
index c4dbb8d396..9b98128040 100644
--- a/keyboards/boardrun/classic/keymaps/default/keymap.c
+++ b/keyboards/boardrun/classic/keymaps/default/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FNCLASSIC] = LAYOUT_classic(
         QK_BOOT,    KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,           KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
         _______, _______, KC_APP,  _______, QK_BOOT,   _______, _______,          _______, _______, _______, KC_INS,  _______, KC_PSCR, _______,
-        KC_CAPS, _______, KC_SLCK, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, KC_RCTL,
+        KC_CAPS, _______, KC_SCRL, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, KC_RCTL,
         _LSNUBS, _______, _______, _______, _______, KC_PAUS, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                  KC_RGUI, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
diff --git a/keyboards/boardwalk/keymaps/mcallaster/keymap.c b/keyboards/boardwalk/keymaps/mcallaster/keymap.c
index e6cc7fbffc..d8a12610d7 100644
--- a/keyboards/boardwalk/keymaps/mcallaster/keymap.c
+++ b/keyboards/boardwalk/keymaps/mcallaster/keymap.c
@@ -17,7 +17,7 @@ enum layer {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_ortho_hhkb(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_SLCK, KC_PSCR, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  \
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_SCRL, KC_PSCR, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_HOME, KC_PGUP, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_END,  KC_PGDN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DEL,  KC_INS,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,  \
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_LOWER] = LAYOUT_ortho_hhkb(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_PAUS, KC_NLCK, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, \
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_PAUS, KC_NUM,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, \
   _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______, \
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_RAISE] = LAYOUT_ortho_hhkb(
-  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_PAUS, KC_NLCK, _______, _______, _______, _______, _______, _______, \
+  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_PAUS, KC_NUM,  _______, _______, _______, _______, _______, _______, \
   _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_TILD, KC_PIPE, _______, _______, _______, \
diff --git a/keyboards/boardwalk/keymaps/niclake/keymap.c b/keyboards/boardwalk/keymaps/niclake/keymap.c
index 986da6dd27..ecfc64d41f 100644
--- a/keyboards/boardwalk/keymaps/niclake/keymap.c
+++ b/keyboards/boardwalk/keymaps/niclake/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *          '-----------------------------------------------------------------------------------------------------------'
      */
     [_NUM] = LAYOUT_ortho_hhkb(
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_SLCK, KC_PAUS,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_SCRL, KC_PAUS,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, _______, _______,
         ADJ,     _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______,
diff --git a/keyboards/bop/keymaps/default/keymap.c b/keyboards/bop/keymaps/default/keymap.c
index bd97d092c0..ae10dc9722 100644
--- a/keyboards/bop/keymaps/default/keymap.c
+++ b/keyboards/bop/keymaps/default/keymap.c
@@ -41,6 +41,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F2, 		KC_F6, 		KC_F10, 	KC_ESC,  KC_1, 		KC_2, 	KC_3, 	KC_4, 	KC_5, 	KC_6, 		KC_7, 	KC_8, 	KC_9, 		KC_0, 	KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_END, KC_PGUP, 
 		KC_F3, 		KC_F7, 		KC_F11, 	KC_TAB,  KC_Q, 		KC_W, 	KC_E, 	KC_R, 	KC_T, 	KC_Y, 		KC_U, 	KC_I, 	KC_O, 		KC_P, 	KC_LBRC, KC_RBRC, KC_BSLS, KC_COLN, KC_DQUO, KC_PGDN, 
 		KC_F4,      KC_F8, 		KC_F12, 	KC_CAPS, KC_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_0,	KC_KP_7, KC_KP_8, KC_KP_9, 
-		KC_PSCR,    KC_SLCK, 	KC_PAUS, 	KC_LSFT, KC_Z, 		KC_X, 	KC_C, 	KC_V, 	KC_B, 	KC_N, 		KC_M, 	KC_LABK, KC_RABK, 	KC_QUES, KC_RSFT, KC_UP,  KC_KP_0, 	KC_KP_4, KC_KP_5, KC_KP_6, 
+		KC_PSCR,    KC_SCRL, 	KC_PAUS, 	KC_LSFT, KC_Z, 		KC_X, 	KC_C, 	KC_V, 	KC_B, 	KC_N, 		KC_M, 	KC_LABK, KC_RABK, 	KC_QUES, KC_RSFT, KC_UP,  KC_KP_0, 	KC_KP_4, KC_KP_5, KC_KP_6, 
 		LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_LCTL, KC_LGUI,	KC_LALT, KC_SPC, KC_SPC, KC_NO, KC_SPC,   KC_SPC, 	KC_COMM, KC_DOT,   KC_SLSH,  KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_1, KC_KP_2, KC_KP_3 )
 };
diff --git a/keyboards/bop/keymaps/via/keymap.c b/keyboards/bop/keymaps/via/keymap.c
index c554c4b19a..2879fb9654 100644
--- a/keyboards/bop/keymaps/via/keymap.c
+++ b/keyboards/bop/keymaps/via/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*	Notes: spaces and numpad 0 can be 1u instead of 2u also, this is already reflected in the keymap below
 	*/
 	/*																		SUDSACK KEYMAP
-		KC_PSCR, KC_SLCK, KC_PAUS, KC_INS , KC_CALC, KC_CUT , KC_ESC , KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_COPY, KC_PSTE, KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_UNDS, KC_BSLS, KC_PGUP,
+		KC_PSCR, KC_SCRL, KC_PAUS, KC_INS , KC_CALC, KC_CUT , KC_ESC , KC_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_NUM , KC_PSLS, KC_PAST, KC_PMNS, KC_COPY, KC_PSTE, KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_UNDS, KC_BSLS, KC_PGUP,
 		KC_P7  , KC_P8  , KC_P9  , KC_PPLS, KC_LBRC, KC_RBRC, KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC, KC_DEL , KC_PGDN,
 		KC_P4  , KC_P5  , KC_P6  , KC_PPLS, KC_VOLD, KC_VOLU, KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , LCTL(KC_TAB),
 		KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_MUTE, KC_MPLY, KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_RGUI ,
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F2, 	 KC_F6,   KC_F10,  KC_ESC,  KC_1, 	 KC_2,    KC_3,    KC_4,   KC_5, 	KC_6, 	 KC_7,    KC_8,    KC_9, 	KC_0, 	 KC_PMNS, KC_PEQL, KC_BSPC, KC_HOME, KC_END,  KC_PGUP,
 		KC_F3,   KC_F7,   KC_F11,  KC_TAB,  KC_Q, 	 KC_W,    KC_E,    KC_R,   KC_T, 	KC_Y, 	 KC_U,    KC_I,    KC_O, 	KC_P, 	 KC_LBRC, KC_RBRC, KC_BSLS, KC_COLN, KC_DQUO, KC_PGDN,
 		KC_F4,   KC_F8,   KC_F12,  KC_CAPS, KC_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_0, KC_KP_7, KC_KP_8, KC_KP_9,
-		KC_PSCR, KC_SLCK, KC_PAUS, KC_LSFT, KC_Z, 	 KC_X,    KC_C,    KC_V,   KC_B, 	KC_N, 	 KC_M,    KC_LABK, KC_RABK, KC_QUES, KC_RSFT, KC_UP,   KC_KP_0, KC_KP_4, KC_KP_5, KC_KP_6,
+		KC_PSCR, KC_SCRL, KC_PAUS, KC_LSFT, KC_Z, 	 KC_X,    KC_C,    KC_V,   KC_B, 	KC_N, 	 KC_M,    KC_LABK, KC_RABK, KC_QUES, KC_RSFT, KC_UP,   KC_KP_0, KC_KP_4, KC_KP_5, KC_KP_6,
         KC_CUT,  KC_COPY, KC_PSTE, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC, MO(1) ,  KC_SPC,  KC_SPC,  KC_PCMM, KC_PDOT, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_1, KC_KP_2, KC_KP_3),
     
     [1] = LAYOUT(
diff --git a/keyboards/boston/keymaps/default/keymap.c b/keyboards/boston/keymaps/default/keymap.c
index a1955216e6..f30d472bde 100644
--- a/keyboards/boston/keymaps/default/keymap.c
+++ b/keyboards/boston/keymaps/default/keymap.c
@@ -21,8 +21,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
 	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 ,                  KC_MPRV, KC_MPLY,  KC_MNXT ,          KC_INS , KC_HOME, KC_PGUP,
-    KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,                  KC_PSCR, KC_SLCK,  KC_PAUSE,          KC_DEL , KC_END , KC_PGDN,
-    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL ,  KC_BSPC, KC_BSPC,        KC_CALC,           KC_NLCK , KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,                  KC_PSCR, KC_SCRL,  KC_PAUSE,          KC_DEL , KC_END , KC_PGDN,
+    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL ,  KC_BSPC, KC_BSPC,        KC_CALC,           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,                 RGB_TOG,           KC_P7   , KC_P8  , KC_P9  , KC_PEQL,
     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,  KC_ENT ,                 KC_MSEL,           KC_P4   , KC_P5  , KC_P6  , KC_PPLS,
     KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                           KC_UP  ,           KC_P1   , KC_P2  , KC_P3  , KC_PENT,
diff --git a/keyboards/boston/keymaps/rgb-light-layers/keymap.c b/keyboards/boston/keymaps/rgb-light-layers/keymap.c
index 6e55632517..f8f1269c42 100644
--- a/keyboards/boston/keymaps/rgb-light-layers/keymap.c
+++ b/keyboards/boston/keymaps/rgb-light-layers/keymap.c
@@ -21,8 +21,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
 	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 ,                  KC_MPRV, KC_MPLY,  KC_MNXT ,          KC_INS , KC_HOME, KC_PGUP,
-    KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,                  KC_PSCR, KC_SLCK,  KC_PAUSE,          KC_DEL , KC_END , KC_PGDN,
-    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL ,  KC_BSPC, KC_BSPC,        KC_CALC,           KC_NLCK , KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,                  KC_PSCR, KC_SCRL,  KC_PAUSE,          KC_DEL , KC_END , KC_PGDN,
+    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL ,  KC_BSPC, KC_BSPC,        KC_CALC,           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,                 RGB_TOG,           KC_P7   , KC_P8  , KC_P9  , KC_PEQL,
     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,  KC_ENT ,                 KC_MSEL,           KC_P4   , KC_P5  , KC_P6  , KC_PPLS,
     KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                           KC_UP  ,           KC_P1   , KC_P2  , KC_P3  , KC_PENT,
diff --git a/keyboards/boston_meetup/2019/keymaps/default/keymap.c b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
index a7a874a0a8..87ca92f02f 100644
--- a/keyboards/boston_meetup/2019/keymaps/default/keymap.c
+++ b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------'
  */
 [_LOWER] = LAYOUT(
-  KC_NLCK,
+  KC_NUM,
   KC_COLN,  KC_PSLS, KC_PAST, KC_PMNS,
   _______,  XXXXXXX, KC_EQL,  KC_PPLS,
   _______,  KC_P0,   KC_PDOT, KC_PENT
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------'
  */
 [_RAISE] = LAYOUT(
-  KC_NLCK,
+  KC_NUM,
   RGB_TOG, RGB_MOD, RGB_RMOD, XXXXXXX,
   _______, RGB_HUI, RGB_SAI,  RGB_VAI,
   _______, RGB_HUD, RGB_SAD,  RGB_VAD
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c
index be1ca9adec..df16719644 100644
--- a/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c
@@ -2,8 +2,8 @@
 
 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_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c
index c5d232ccee..cf4426e7dc 100644
--- a/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = 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_SLCK, KC_PAUS,
+                 KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c
index b3ef6ecadb..12d9242387 100644
--- a/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = 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_SLCK, KC_PAUS,
+                 KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
index 4923272381..1889c7c27c 100644
--- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
@@ -43,8 +43,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Layer 0: Standard ISO layer */
 	[KM_QWERTY] = LAYOUT(
-KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_SLCK,KC_PAUS,
-KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,    KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_SCRL,KC_PAUS,
+KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,    KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,
 KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,  KC_DEL, KC_END, KC_PGDN,    KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
 KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,                               KC_P4,  KC_P5,  KC_P6,
 KC_LSFT, KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,          KC_UP,              KC_P1,  KC_P2,  KC_P3,  KC_PENT,
diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
index d7bab2b657..35e6bd989d 100755
--- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
+++ b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
@@ -30,7 +30,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT( \
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_BRK,  \
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_BRK,  \
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP, \
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN, \
         FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                  \
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FL] = LAYOUT( \
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, TO(_BL), TO(_GL), _______, _______, _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______,      KC_VOLD, KC_MSTP, KC_VOLU, \
+        _______, TO(_BL), TO(_GL), _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______,      KC_VOLD, KC_MSTP, KC_VOLU, \
         _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______, _______, _______,      KC_MNXT, KC_MPLY, KC_MNXT, \
         _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,          _______,                                 \
         _______, _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT,          _______,               _______,          \
diff --git a/keyboards/bpiphany/hid_liber/keymaps/default/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/default/keymap.c
index 60ff8d11b0..a9799c973e 100755
--- a/keyboards/bpiphany/hid_liber/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/hid_liber/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_BRK,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_BRK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
index df1305b965..2df691ffeb 100644
--- a/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
@@ -6,8 +6,8 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [DEFAULT] = LAYOUT(
-       KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_PSCR,KC_SLCK,KC_PAUS,
-       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+       KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_PSCR,KC_SCRL,KC_PAUS,
+       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NUM,KC_PSLS,KC_PAST,KC_PMNS,
        KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL, KC_END,KC_PGDN,    KC_P7,  KC_P8,  KC_P9,KC_PPLS,
       KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,                              KC_P4,  KC_P5,  KC_P6,
       KC_LSFT,KC_NUBS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,            KC_UP,            KC_P1,  KC_P2,  KC_P3,KC_PENT,
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
index 4d5cc922c6..3f858734c9 100644
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
@@ -29,8 +29,8 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [DEFAULT] = LAYOUT(\
-          KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_SLCK,KC_PAUS,                                   \
-          KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,    KC_INS,KC_HOME,KC_PGUP,  KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \
+          KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_SCRL,KC_PAUS,                                   \
+          KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,    KC_INS,KC_HOME,KC_PGUP,  KC_NUM,KC_PSLS,KC_PAST,KC_PMNS, \
           KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,    KC_DEL, KC_END,KC_PGDN,    KC_P7,  KC_P8,  KC_P9,KC_PPLS, \
         TT(MOUSE1), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,                               KC_P4,  KC_P5,  KC_P6,         \
             LSHFT_PAREN,KC_NUBS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,           RSHFT_PAREN,             KC_UP,            KC_P1,  KC_P2,  KC_P3,KC_PENT, \
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
index 68e412ceb9..80dae59bda 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Layer 0: Blowrak ISO layer, a Swedish take on Dvorak */
 	[KM_BLOWRAK] = LAYOUT( \
-		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SLCK,KC_PAUS, \
+		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SCRL,KC_PAUS, \
 		SE_HALF, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   SE_PLUS,SE_ACUT,KC_BSPC,   KC_INS, KC_HOME,KC_PGUP, \
 		KC_TAB,  SE_AO,  SE_ADIA,SE_ODIA,KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,   KC_COMM,SE_CIRC,SE_QUOT,   KC_DEL, KC_END, KC_PGDN, \
 		KC_LCTRL,KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_H,   KC_D,   KC_T,   KC_N,   KC_S,   SE_MINS,        KC_ENT,                             \
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		MO(KM_MEDIA),KC_LGUI,KC_LALT,                   KC_SPC,                          KC_RALT,KC_RGUI,KC_MENU,TG(KM_QWERTY), KC_LEFT,KC_DOWN,KC_RGHT),
 	/* Layer 1: Standard ISO layer */
 	[KM_QWERTY] = LAYOUT( \
-		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SLCK,KC_PAUS, \
+		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SCRL,KC_PAUS, \
 		SE_HALF, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   SE_PLUS,SE_ACUT,KC_BSPC,   KC_INS, KC_HOME,KC_PGUP, \
 		KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   SE_AO,  SE_CIRC,SE_QUOT,   KC_DEL, KC_END, KC_PGDN, \
 		KC_LCTRL,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SE_ODIA,SE_ADIA,        KC_ENT,                             \
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
index a9b9b6e8b9..552dbb5a11 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                                                                                  NUHS = true position of KC_NUHS
  */
 [DEF] = LAYOUT( \
-  KC_ESC,         KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_SLCK,TD(AF4), \
+  KC_ESC,         KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_SCRL,TD(AF4), \
   KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP, \
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_NUHS,  KC_DEL, KC_END, KC_PGDN, \
   MO(FUN),KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,/*NUHS*/KC_ENT,                            \
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *
  */
 [FUN] = LAYOUT( \
-  CTALDEL,        KC_MYCM,KC_WHOM,KC_CALC,KC_MSEL,KC_MPRV,KC_MNXT,KC_MPLY,KC_MSTP,KC_MUTE,KC_VOLD,KC_VOLU,MO(RES),  _______,KC_SLCK,KC_PAUS, \
+  CTALDEL,        KC_MYCM,KC_WHOM,KC_CALC,KC_MSEL,KC_MPRV,KC_MNXT,KC_MPLY,KC_MSTP,KC_MUTE,KC_VOLD,KC_VOLU,MO(RES),  _______,KC_SCRL,KC_PAUS, \
   _______,_______,_______,_______,_______,_______,_______,G(7),   G(8),   G(9),   G(0),   G(MINS),_______,_______,  _______,_______,KC_WH_U, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,G(RBRC),_______,  _______,_______,KC_WH_D, \
   KC_CAPS,KC_ACL2,KC_ACL0,_______,_______,_______,_______,_______,_______,_______,_______,_______,/*NUHS*/_______,                           \
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
index 35afe96e17..eb19a16d94 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Layer 0: Standard ISO layer */
   [KM_QWERTY] = LAYOUT(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c
index ffdb52de04..7e41a666f8 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/default_jis/keymap.c
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
   {
    /* Layer 0: Standard JIS layer */
-   [KM_JIS] = LAYOUT_tkl_jis(KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,            KC_PSCR,KC_SLCK,KC_PAUS,
+   [KM_JIS] = LAYOUT_tkl_jis(KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,            KC_PSCR,KC_SCRL,KC_PAUS,
                              KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_INT3, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,
                              KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,                   KC_DEL, KC_END, KC_PGDN,
                              KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_BSLS,KC_ENT,
diff --git a/keyboards/bpiphany/tiger_lily/keymaps/default/keymap.c b/keyboards/bpiphany/tiger_lily/keymaps/default/keymap.c
index 5c9ac83695..11cbff86bd 100644
--- a/keyboards/bpiphany/tiger_lily/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/tiger_lily/keymaps/default/keymap.c
@@ -2,8 +2,8 @@
 
 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_SLCK,KC_PAUS,
-       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+       KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_PSCR,KC_SCRL,KC_PAUS,
+       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NUM,KC_PSLS,KC_PAST,KC_PMNS,
        KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL, KC_END,KC_PGDN,    KC_P7,  KC_P8,  KC_P9,KC_PPLS,
       KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,                              KC_P4,  KC_P5,  KC_P6,
       KC_LSFT,KC_NUBS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,            KC_UP,            KC_P1,  KC_P2,  KC_P3,KC_PENT,
diff --git a/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/keymap.c b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/keymap.c
index 186a826f13..095568a355 100644
--- a/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/keymap.c
+++ b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/keymap.c
@@ -2,8 +2,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_fullsize_ansi(
-       KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_PSCR,KC_SLCK,KC_PAUS,
-       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+       KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_PSCR,KC_SCRL,KC_PAUS,
+       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NUM,KC_PSLS,KC_PAST,KC_PMNS,
        KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL, KC_END,KC_PGDN,    KC_P7,  KC_P8,  KC_P9,KC_PPLS,
       KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,                              KC_P4,  KC_P5,  KC_P6,
       KC_LSFT,           KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,            KC_UP,            KC_P1,  KC_P2,  KC_P3,KC_PENT,
diff --git a/keyboards/bpiphany/tiger_lily/keymaps/via/keymap.c b/keyboards/bpiphany/tiger_lily/keymaps/via/keymap.c
index 0765160522..016965a2f4 100644
--- a/keyboards/bpiphany/tiger_lily/keymaps/via/keymap.c
+++ b/keyboards/bpiphany/tiger_lily/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 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_SLCK,KC_PAUS,
-       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+       KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_PSCR,KC_SCRL,KC_PAUS,
+       KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS,KC_HOME,KC_PGUP,  KC_NUM,KC_PSLS,KC_PAST,KC_PMNS,
        KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL, KC_END,KC_PGDN,    KC_P7,  KC_P8,  KC_P9,KC_PPLS,
       KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,                              KC_P4,  KC_P5,  KC_P6,
       KC_LSFT,KC_NUBS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,            KC_UP,            KC_P1,  KC_P2,  KC_P3,KC_PENT,
diff --git a/keyboards/bpiphany/unloved_bastard/keymaps/default/keymap.json b/keyboards/bpiphany/unloved_bastard/keymaps/default/keymap.json
index 6f9332c9a4..1ed95d8881 100644
--- a/keyboards/bpiphany/unloved_bastard/keymaps/default/keymap.json
+++ b/keyboards/bpiphany/unloved_bastard/keymaps/default/keymap.json
@@ -1 +1 @@
-{"keyboard": "bpiphany/unloved_bastard", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_INS", "KC_HOME", "KC_PGUP", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "KC_END", "KC_PGDN", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_APP", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"]]}
+{"keyboard": "bpiphany/unloved_bastard", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_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_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_APP", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"]]}
diff --git a/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
index 59cc6b1492..7555bb7b9b 100644
--- a/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
+++ b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+                 KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c b/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c
index 0b7dfb4050..1c42704bbf 100644
--- a/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c
+++ b/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_tkl_iso(
-                 KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+                 KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
                  KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
                  KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,            KC_DEL,  KC_END,  KC_PGDN,
                  KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/buildakb/potato65hs/keymaps/default/keymap.c b/keyboards/buildakb/potato65hs/keymaps/default/keymap.c
index 98e4e19260..33e6d14837 100644
--- a/keyboards/buildakb/potato65hs/keymaps/default/keymap.c
+++ b/keyboards/buildakb/potato65hs/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FN] = LAYOUT_65_ansi_blocker(
 		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, 
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_TRNS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_VOLU, KC_MUTE, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/buildakb/potato65hs/keymaps/via/keymap.c b/keyboards/buildakb/potato65hs/keymaps/via/keymap.c
index 4365a6615c..298723785c 100644
--- a/keyboards/buildakb/potato65hs/keymaps/via/keymap.c
+++ b/keyboards/buildakb/potato65hs/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FN1] = LAYOUT_65_ansi_blocker(
 		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, 
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_TRNS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_VOLU, KC_MUTE, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/buildakb/potato65s/keymaps/default/keymap.c b/keyboards/buildakb/potato65s/keymaps/default/keymap.c
index 00f9d43a6d..d0bb4481c1 100644
--- a/keyboards/buildakb/potato65s/keymaps/default/keymap.c
+++ b/keyboards/buildakb/potato65s/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FN] = LAYOUT_all(
 		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_TRNS,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_VOLU, KC_MUTE,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/buildakb/potato65s/keymaps/via/keymap.c b/keyboards/buildakb/potato65s/keymaps/via/keymap.c
index e0f107154a..e3ddcf6770 100644
--- a/keyboards/buildakb/potato65s/keymaps/via/keymap.c
+++ b/keyboards/buildakb/potato65s/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FN1] = LAYOUT_all(
 		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_TRNS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_VOLU, KC_MUTE, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
index bb8c73b37c..992bfcb32d 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_all( /* Base */
-  KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_NO, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_NO, 	 	KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
   KC_TAB,    RGB_TOG,   RGB_MODE_RGBTEST,   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_NO,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NO ,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
index 92dd124606..38cc9964b3 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
@@ -44,7 +44,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_all( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
index 7361196ef0..380a305abc 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_all(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL, 	     	  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL, 	     	  KC_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_NUHS,     KC_ENT,  	          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT, KC_BSLS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,         KC_RSFT,    KC_UP,    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/canary/canary60rgb/keymaps/default/keymap.c b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
index a448934d01..6d4a2313ef 100644
--- a/keyboards/canary/canary60rgb/keymaps/default/keymap.c
+++ b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, TO(3),                              _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
         _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
         _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
         _______,          KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
diff --git a/keyboards/canary/canary60rgb/keymaps/via/keymap.c b/keyboards/canary/canary60rgb/keymaps/via/keymap.c
index 3de300bd93..ad60ca15a8 100644
--- a/keyboards/canary/canary60rgb/keymaps/via/keymap.c
+++ b/keyboards/canary/canary60rgb/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, TO(3),                              _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
         _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
         _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
         _______,          KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
diff --git a/keyboards/cannonkeys/balance/keymaps/default/keymap.c b/keyboards/cannonkeys/balance/keymaps/default/keymap.c
index ac8c14c2b9..aadc855e0f 100644
--- a/keyboards/cannonkeys/balance/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/balance/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_all(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MPLY, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MPLY, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_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_NUBS, KC_ENT, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PPLS,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/cannonkeys/balance/keymaps/via/keymap.c b/keyboards/cannonkeys/balance/keymaps/via/keymap.c
index 99735423ee..3da1449c38 100644
--- a/keyboards/cannonkeys/balance/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/balance/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_all(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MPLY, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MPLY, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_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_NUBS, KC_ENT, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PPLS,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c b/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c
index d92b7fba15..77c2c683b0 100644
--- a/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_MPLY,                    KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_MPLY,                    KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c b/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c
index e7e4ad1ec9..c3dc6905a7 100644
--- a/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPLY,               KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPLY,               KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c b/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c
index a1becb148e..b5ed3f0baf 100644
--- a/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_MPLY,                    KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_MPLY,                    KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c b/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c
index 701e9b7693..9f29ef880b 100644
--- a/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPLY,               KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPLY,               KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c b/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
index d5cd7efc5b..70ec6500df 100644
--- a/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,                              KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,                              KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c b/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
index 77aea233e7..8e7b42bb7a 100644
--- a/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,                              KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,                              KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c
index 97896d65ea..211c783043 100644
--- a/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c
@@ -63,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+    KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
     KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT,   _______, _______, _______,
     KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
     _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
diff --git a/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c b/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c
index f53159ccd4..3a20ea911f 100644
--- a/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_all(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_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_NUBS, KC_ENT, KC_P4,   KC_P5,   KC_P6, KC_PPLS,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/cannonkeys/rekt1800/keymaps/via/keymap.c b/keyboards/cannonkeys/rekt1800/keymaps/via/keymap.c
index dce2f7276c..d8dc4ecb56 100644
--- a/keyboards/cannonkeys/rekt1800/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/rekt1800/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_all(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_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_NUBS, KC_ENT, KC_P4,   KC_P5,   KC_P6, KC_PPLS,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
index 38fdb8880e..256cdecd6a 100644
--- a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
+++ b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
@@ -28,7 +28,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_2x2(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, OLED_TOGG,
+    NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, OLED_TOGG,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, QK_BOOT, CLOCK_SET,
     KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, _______,
diff --git a/keyboards/capsunlocked/cu80/v1/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v1/keymaps/default/keymap.c
index befdb527db..66de9650ab 100644
--- a/keyboards/capsunlocked/cu80/v1/keymaps/default/keymap.c
+++ b/keyboards/capsunlocked/cu80/v1/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/keymap.c
index 7ee9ef880f..ee81be6561 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/keymap.c
+++ b/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/keymap.c
index dbdb197e8e..5ee09fadac 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/keymap.c
+++ b/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
index 185466c954..d42f3533a4 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
+++ b/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
index 51eacfd9d2..a72f451b3f 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
+++ b/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/catch22/keymaps/default/keymap.c b/keyboards/catch22/keymaps/default/keymap.c
index 9985ef5838..b17edcedbe 100644
--- a/keyboards/catch22/keymaps/default/keymap.c
+++ b/keyboards/catch22/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BASE] = LAYOUT( /* Base */
-           KC_NLCK, KC_PSLS,  KC_PAST,  KC_BSPC,
+           KC_NUM,  KC_PSLS,  KC_PAST,  KC_BSPC,
            KC_P7,   KC_P8,    KC_P9,    KC_PEQL,
   MO(_FN), KC_P4,   KC_P5,    KC_P6,    KC_PPLS,
   KC_PENT, KC_P1,   KC_P2,    KC_P3,    KC_PMNS,
diff --git a/keyboards/cest73/tkm/keymaps/default/keymap.c b/keyboards/cest73/tkm/keymaps/default/keymap.c
index 75f134619f..a0f2692fa8 100644
--- a/keyboards/cest73/tkm/keymaps/default/keymap.c
+++ b/keyboards/cest73/tkm/keymaps/default/keymap.c
@@ -61,8 +61,8 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_BASE] = LAYOUT_all(
-	MO(1),   KC_PSCR, KC_SLCK, KC_PAUS, KC_ESC,      KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_HOME, KC_PGUP,
-	KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_GRV,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,     KC_INS,
+	MO(1),   KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC,      KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_HOME, KC_PGUP,
+	KC_PMNS, KC_PAST, KC_PSLS, 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_MINS, KC_EQL,  KC_BSLS, KC_BSPC,     KC_INS,
 	KC_PPLS, KC_P9,   KC_P8,   KC_P7,   KC_TAB,      KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC,   KC_BSLS,    KC_DEL,
 	KC_PEQL, KC_P6,   KC_P5,   KC_P4,   KC_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_TAB,  KC_P3,   KC_P2,   KC_P1,   KC_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,
diff --git a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
index 02b56ac4b0..d0dd3f5928 100644
--- a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
+++ b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
         ),
         [3] = LAYOUT_all(
-        KC_NO, KC_NO, KC_NO, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_NO, 
         KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, 
         KC_NO, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, 
         KC_NO, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
index 2416b443f4..eecb593810 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '----------------------------------------------------------------------------------------------------------------------'
  */
 [0] = LAYOUT_2x3u(
-  KC_HOME, KC_TAB,          KC_Q,      KC_W,     KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_NLCK,  KC_Y,     KC_U,   KC_I,     KC_O,     KC_P,      KC_BSPC,
+  KC_HOME, KC_TAB,          KC_Q,      KC_W,     KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_NUM,   KC_Y,     KC_U,   KC_I,     KC_O,     KC_P,      KC_BSPC,
   KC_PGUP, CTL_T(KC_ESC),   KC_A,      KC_S,     KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,  KC_H,     KC_J,   KC_K,     KC_L,     KC_SCLN,   KC_QUOT,
   KC_PGDN, KC_LSFT,         KC_Z,      KC_X,     KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_PMNS,  KC_N,     KC_M,   KC_COMM,  KC_DOT,   KC_SLSH,   KC_ENT,
   KC_GRV,  KC_LGUI,         KC_LALT,   RGB_TOG,           TT(1),            KC_P0,   KC_PDOT, KC_BSLS,        LT(2, KC_SPC),       KC_RALT,  KC_RCTRL, CALTDEL,   KC_CAPS
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
index 3a5e856561..85c87313f2 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * '----------------------------------------------------------------------------------------------------------------------'
 */
 [0] = LAYOUT_7u(
-  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,            KC_T, KC_NLCK,   KC_P7,    KC_P8,   KC_P9,  KC_HOME,    KC_Y,    KC_U,    KC_I,     KC_O,  KC_P,    KC_BSPC,
+  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,            KC_T, KC_NUM,    KC_P7,    KC_P8,   KC_P9,  KC_HOME,    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_INS,   KC_P4,    KC_P5,   KC_P6,  KC_PGUP,    KC_H,    KC_J,    KC_K,     KC_L,  KC_SCLN, KC_QUOT,
   KC_LSFT,       KC_Z,       KC_X,    KC_C,    KC_V,            KC_B,  KC_DEL,   KC_P1,    KC_P2,   KC_P3,  KC_PGDN,    KC_N,    KC_M, KC_COMM,   KC_DOT,  KC_SLSH,  KC_ENT,
   KC_LCTRL,      KC_LGUI, KC_LALT, KC_BSLS,    KC_GRV, LT(2, KC_SPC),  KC_EQL, KC_RALT, KC_RCTRL, KC_CAPS, QK_BOOT
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
index 4dfc4a3e2a..c7e8707603 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * '-----------------------------------------------------------------------------------------------------------------------'
 */
 [0] = LAYOUT_grid(
-  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NLCK, KC_P7,   KC_P8,   KC_P9,         KC_HOME,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSPC,
+  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NUM,  KC_P7,   KC_P8,   KC_P9,         KC_HOME,    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_INS,  KC_P4,   KC_P5,   KC_P6,         KC_PGUP,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
   KC_LSFT,       KC_Z,       KC_X,    KC_C,    KC_V,   KC_B,    KC_DEL,  KC_P1,   KC_P2,   KC_P3,         KC_PGDN,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_ENT,
   KC_LCTRL,      KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTRL, KC_CAPS, QK_BOOT
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
index 4dfc4a3e2a..c7e8707603 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * '-----------------------------------------------------------------------------------------------------------------------'
 */
 [0] = LAYOUT_grid(
-  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NLCK, KC_P7,   KC_P8,   KC_P9,         KC_HOME,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSPC,
+  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NUM,  KC_P7,   KC_P8,   KC_P9,         KC_HOME,    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_INS,  KC_P4,   KC_P5,   KC_P6,         KC_PGUP,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
   KC_LSFT,       KC_Z,       KC_X,    KC_C,    KC_V,   KC_B,    KC_DEL,  KC_P1,   KC_P2,   KC_P3,         KC_PGDN,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_ENT,
   KC_LCTRL,      KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTRL, KC_CAPS, QK_BOOT
diff --git a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
index 2f1273cf63..69782a4db0 100644
--- a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, KC_NLCK, KC_KP_7, KC_KP_8,   KC_KP_9,     KC_KP_SLASH,    _______,
+    _______, _______, _______, _______, _______, _______, KC_NUM,  KC_KP_7, KC_KP_8,   KC_KP_9,     KC_KP_SLASH,    _______,
     _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5,   KC_KP_6,     KC_KP_ASTERISK, _______,
     _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2,   KC_KP_3,     KC_KP_PLUS,     _______,
     _______, _______, _______, _______, _______, _______, _______, KC_KP_0, KC_KP_DOT, KC_COMM,     KC_KP_MINUS,    _______
diff --git a/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c
index 8facd977e3..36702762d7 100644
--- a/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c
+++ b/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c
@@ -16,8 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
          KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,    QK_BOOT,     KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                      KC_DEL, KC_END,  KC_PGDN, KC_SLCK,
-         KC_GRV, KC_1, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PAUS,   
+                                                                                                                      KC_DEL, KC_END,  KC_PGDN, KC_SCRL,
+         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,       KC_NUM, KC_PSLS, KC_PAST, KC_PAUS,   
          KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PMNS,    
          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,   KC_ENT,        KC_P4, KC_P5, KC_P6, KC_PPLS,
          KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c
index ba4bcf8607..b915018842 100644
--- a/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c
+++ b/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
          KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,    QK_BOOT,     KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                      KC_DEL, KC_END,  KC_PGDN, KC_SLCK,
-         KC_GRV, KC_1, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                      KC_DEL, KC_END,  KC_PGDN, KC_SCRL,
+         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,       KC_NUM, KC_PSLS, KC_PAST, KC_PAUS,
          KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PMNS,
          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,   KC_ENT,        KC_P4, KC_P5, KC_P6, KC_PPLS,
          KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/cherrybstudio/cb87/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb87/keymaps/default/keymap.c
index d95c56dc8d..b2a0013c07 100644
--- a/keyboards/cherrybstudio/cb87/keymaps/default/keymap.c
+++ b/keyboards/cherrybstudio/cb87/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/cherrybstudio/cb87/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb87/keymaps/via/keymap.c
index 3cd72b6670..3673b13341 100644
--- a/keyboards/cherrybstudio/cb87/keymaps/via/keymap.c
+++ b/keyboards/cherrybstudio/cb87/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c
index 84660c5704..fab5685c21 100644
--- a/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c
+++ b/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-         KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT,  KC_PSCR, KC_SCRL, KC_PAUS,
          KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
          KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c
index 56646b57c3..7ae523636e 100644
--- a/keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c
+++ b/keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-         KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_ESC,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_ESC,  KC_PSCR, KC_SCRL, KC_PAUS,
          KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
          KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
diff --git a/keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c
index 0833509794..a1b335e88d 100644
--- a/keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c
+++ b/keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-         KC_ESC,    KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_ESC,    KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
          KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
          KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
diff --git a/keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c
index 8c08f10a01..cc912193a7 100644
--- a/keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c
+++ b/keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-         KC_ESC,    KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_ESC,    KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
          KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
          KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
diff --git a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
index e21f840265..138b195b8c 100644
--- a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_FL] = LAYOUT_default(
     KC_PGUP, KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-    KC_PGDN, KC_CAPS, _______, _______, EEP_RST, QK_BOOT, _______,          _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+    KC_PGDN, KC_CAPS, _______, _______, EEP_RST, QK_BOOT, _______,          _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
     KC_ESC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
              _______, _______, _______, _______, _______, _______,          _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
              _______,          _______, _______, _______,                            _______,          _______,          _______
diff --git a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
index 1dba574063..e88e2d9b33 100644
--- a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, QK_BOOT,
   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
            _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
            _______, _______,                   _______,                                              _______, _______),
diff --git a/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
index 7fea015564..cb323febe3 100644
--- a/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, QK_BOOT,
   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
            _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
            _______,                   _______, _______,                                     _______, _______),
diff --git a/keyboards/ckeys/nakey/keymaps/default/keymap.c b/keyboards/ckeys/nakey/keymaps/default/keymap.c
index c17cd35cb8..427c5e5d9d 100644
--- a/keyboards/ckeys/nakey/keymaps/default/keymap.c
+++ b/keyboards/ckeys/nakey/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_5x4( /* Base */
-    KC_NLCK,  KC_PSLS,  KC_PAST, KC_PMNS,
+    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,
diff --git a/keyboards/ckeys/obelus/keymaps/default/keymap.c b/keyboards/ckeys/obelus/keymaps/default/keymap.c
index 6ddd0593f3..aca0966855 100644
--- a/keyboards/ckeys/obelus/keymaps/default/keymap.c
+++ b/keyboards/ckeys/obelus/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `---------------------- '
    */
   [5] = LAYOUT_ortho_4x4( /* NUMPAD SUPPLEMENT */
-    KC_NLCK, _______, _______, TO(0),
+    KC_NUM,  _______, _______, TO(0),
     _______, _______, _______, _______,
     _______, _______, _______, _______,
     _______, _______, _______, _______
diff --git a/keyboards/clawsome/coupe/keymaps/default/keymap.c b/keyboards/clawsome/coupe/keymaps/default/keymap.c
index d5af879bd7..c03d35f074 100644
--- a/keyboards/clawsome/coupe/keymaps/default/keymap.c
+++ b/keyboards/clawsome/coupe/keymaps/default/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [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_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,   _______,
+        _______,     _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,   _______,
         _______,        KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______, _______,       _______,
         _______,            _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,            _______,
         QK_BOOT,     _______,   _______,                       _______,                             _______,  _______,  _______,   _______
diff --git a/keyboards/clawsome/hatchback/keymaps/default/keymap.c b/keyboards/clawsome/hatchback/keymaps/default/keymap.c
index 279666e06c..4efe03934d 100644
--- a/keyboards/clawsome/hatchback/keymaps/default/keymap.c
+++ b/keyboards/clawsome/hatchback/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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,
diff --git a/keyboards/clawsome/luggage_rack/keymaps/default/keymap.c b/keyboards/clawsome/luggage_rack/keymaps/default/keymap.c
index 5d7871730d..6158ed9477 100644
--- a/keyboards/clawsome/luggage_rack/keymaps/default/keymap.c
+++ b/keyboards/clawsome/luggage_rack/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_PSCR, KC_SCRL, KC_PAUS,
         KC_INS,  KC_HOME, KC_PGUP,
         KC_DEL,  KC_END,  KC_PGDN,
         
diff --git a/keyboards/clawsome/numeros/keymaps/default/keymap.c b/keyboards/clawsome/numeros/keymaps/default/keymap.c
index 6862913ca0..7bf976005b 100644
--- a/keyboards/clawsome/numeros/keymaps/default/keymap.c
+++ b/keyboards/clawsome/numeros/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * ---------------------
     */
     [0] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/clawsome/sedan/keymaps/default/keymap.c b/keyboards/clawsome/sedan/keymaps/default/keymap.c
index 97fac36e52..165b6ceb4a 100644
--- a/keyboards/clawsome/sedan/keymaps/default/keymap.c
+++ b/keyboards/clawsome/sedan/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,      _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
         QK_BOOT,   _______, _______,                           _______,                             _______, _______, _______, _______, _______, _______
diff --git a/keyboards/clawsome/sidekick/keymaps/default/keymap.c b/keyboards/clawsome/sidekick/keymaps/default/keymap.c
index e445a02f87..482ad11cae 100644
--- a/keyboards/clawsome/sidekick/keymaps/default/keymap.c
+++ b/keyboards/clawsome/sidekick/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * ------------------------------------
     */
     [0] = LAYOUT(
-        KC_INS,  KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_INS,  KC_HOME, KC_PGUP, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_DEL,  KC_END,  KC_PGDN, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
                                    KC_P4,   KC_P5,   KC_P6,
                  KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/clawsome/suv/keymaps/default/keymap.c b/keyboards/clawsome/suv/keymaps/default/keymap.c
index b09cf08ddc..90ae51ec03 100644
--- a/keyboards/clawsome/suv/keymaps/default/keymap.c
+++ b/keyboards/clawsome/suv/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 
 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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                                             KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,                            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/clueboard/17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
index 155eb6e6e3..a0223bce13 100644
--- a/keyboards/clueboard/17/keymaps/default/keymap.c
+++ b/keyboards/clueboard/17/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * '-------------------'
    */
   [_BL] = LAYOUT_numpad_5x4(
-    LT(_FL, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS,
+    LT(_FL, 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,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * '-------------------'
    */
   [_FL] = LAYOUT_numpad_5x4(
-    LT(_FL, KC_NLCK), _______, _______, RGB_TOG,
+    LT(_FL, KC_NUM),  _______, _______, RGB_TOG,
     _______,          RGB_SAI, _______,
     RGB_HUD,          BL_STEP, RGB_HUI, RGB_VAI,
     _______,          RGB_SAD, _______,
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json
index f7316001c3..1898ec419f 100644
--- a/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json
+++ b/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json
@@ -3,7 +3,7 @@
     "keymap":"default",
     "layout":"LAYOUT",
     "layers":[
-        ["KC_HOME","KC_END","KC_PGUP","KC_PGDN","KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_PSCR","KC_SLCK","KC_PAUS","KC_INS","KC_PMNS","KC_NLCK","KC_PSLS","KC_PAST","KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_NLCK","KC_PSLS","KC_PAST","KC_PMNS","KC_PPLS","KC_P7","KC_P8","KC_P9","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_P7","KC_P8","KC_P9","KC_PSLS","KC_P4","KC_P5","KC_P6","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_P4","KC_P5","KC_P6","KC_PENT","KC_P1","KC_P2","KC_P3","KC_UP","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_SLSH","KC_COMM","KC_DOT","KC_RSFT","KC_UP","KC_P1","KC_P2","KC_P3","KC_PENT","KC_P0","KC_PDOT","KC_LEFT","KC_DOWN","KC_RGHT","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","KC_APP","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT","KC_P0","KC_PDOT"]
+        ["KC_HOME","KC_END","KC_PGUP","KC_PGDN","KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_PSCR","KC_SCRL","KC_PAUS","KC_INS","KC_PMNS","KC_NUM","KC_PSLS","KC_PAST","KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_NUM","KC_PSLS","KC_PAST","KC_PMNS","KC_PPLS","KC_P7","KC_P8","KC_P9","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_P7","KC_P8","KC_P9","KC_PSLS","KC_P4","KC_P5","KC_P6","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_P4","KC_P5","KC_P6","KC_PENT","KC_P1","KC_P2","KC_P3","KC_UP","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_SLSH","KC_COMM","KC_DOT","KC_RSFT","KC_UP","KC_P1","KC_P2","KC_P3","KC_PENT","KC_P0","KC_PDOT","KC_LEFT","KC_DOWN","KC_RGHT","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","KC_APP","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT","KC_P0","KC_PDOT"]
     ],
     "author":"skullydazed",
     "notes":"",
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c
index 71c5226eca..3969e1058b 100644
--- a/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c
+++ b/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c
@@ -17,9 +17,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_4u_space(
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
 
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c
index 5a1a00c194..12995faee7 100644
--- a/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c
+++ b/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c
@@ -17,9 +17,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_7u_space(
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
 
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,     KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c
index 8a1e4ac5c6..bc54d9da4a 100644
--- a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c
+++ b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c
@@ -41,9 +41,9 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
-      MACRO01, MACRO02, MACRO03, MACRO04,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+      MACRO01, MACRO02, MACRO03, MACRO04,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
 
-      MACRO05, MACRO06, MACRO07, MACRO08,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      MACRO05, MACRO06, MACRO07, MACRO08,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       MACRO09, MACRO10, MACRO11, MACRO12,      KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                MACRO13, MACRO14, MACRO15,      KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       MACRO16, MACRO17, MACRO18, MACRO19,   KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c
index 02d1421324..7764087b0f 100644
--- a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c
+++ b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c
@@ -17,9 +17,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
-      KC_NO,   KC_ACL0, KC_ACL1, KC_ACL2,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+      KC_NO,   KC_ACL0, KC_ACL1, KC_ACL2,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
 
-      KC_NO,   KC_NO,   KC_BTN4, KC_BTN5,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_NO,   KC_NO,   KC_BTN4, KC_BTN5,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_WH_U, KC_NO,   KC_MS_U, KC_NO,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_MS_L, KC_BTN3, KC_MS_R,      KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       KC_WH_D, KC_BTN1, KC_MS_D, KC_BTN2,   KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c
index 1640229f97..dc55c59287 100644
--- a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c
+++ b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c
@@ -17,9 +17,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
 
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NO,   KC_ACL0, KC_ACL1, KC_ACL2,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NO,   KC_ACL0, KC_ACL1, KC_ACL2,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_NO,   KC_MS_U, KC_NO,   KC_WH_U,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_MS_L, KC_BTN3, KC_MS_R,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_BTN1, KC_MS_D, KC_BTN2, KC_WH_D,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json
index 3a60ce9c82..51cd59fcb3 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json
@@ -3,7 +3,7 @@
     "keymap":"default",
     "layout":"LAYOUT_all",
     "layers":[
-        ["ENC_BTN1","ENC_BTN2","ENC_BTN3","ENC_BTN4","KC_HOME","KC_END","KC_PGUP","KC_PGDN","KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_PSCR","KC_SLCK","KC_PAUS","KC_INS","KC_PMNS","KC_NLCK","KC_PSLS","KC_PAST","KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_NLCK","KC_PSLS","KC_PAST","KC_PMNS","KC_PPLS","KC_P7","KC_P8","KC_P9","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_P7","KC_P8","KC_P9","KC_PSLS","KC_P4","KC_P5","KC_P6","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_P4","KC_P5","KC_P6","KC_PENT","KC_P1","KC_P2","KC_P3","KC_UP","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_SLSH","KC_COMM","KC_DOT","KC_RSFT","KC_UP","KC_P1","KC_P2","KC_P3","KC_PENT","KC_P0","KC_PDOT","KC_LEFT","KC_DOWN","KC_RGHT","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","KC_APP","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT","KC_P0","KC_PDOT"]
+        ["ENC_BTN1","ENC_BTN2","ENC_BTN3","ENC_BTN4","KC_HOME","KC_END","KC_PGUP","KC_PGDN","KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_PSCR","KC_SCRL","KC_PAUS","KC_INS","KC_PMNS","KC_NUM","KC_PSLS","KC_PAST","KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_NUM","KC_PSLS","KC_PAST","KC_PMNS","KC_PPLS","KC_P7","KC_P8","KC_P9","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_P7","KC_P8","KC_P9","KC_PSLS","KC_P4","KC_P5","KC_P6","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_P4","KC_P5","KC_P6","KC_PENT","KC_P1","KC_P2","KC_P3","KC_UP","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_SLSH","KC_COMM","KC_DOT","KC_RSFT","KC_UP","KC_P1","KC_P2","KC_P3","KC_PENT","KC_P0","KC_PDOT","KC_LEFT","KC_DOWN","KC_RGHT","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","KC_APP","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT","KC_P0","KC_PDOT"]
     ],
     "author":"skullydazed",
     "notes":"",
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c
index 3c504930da..b2456225f1 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_1u_ansi(
                                  KC_BTN1, KC_BTN2,                                                                                                                 KC_BTN3, KC_BTN4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,   KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c
index 17cb57abe7..70e38efcba 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_1u_iso(
                                  KC_BTN1, KC_BTN2,                                                                                                                 KC_BTN3, KC_BTN4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,                KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,   KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c
index 2bd91000b6..cb41bf9a7d 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_2u_ansi(
                                  KC_BTN1, KC_BTN2,                                                                                                                 KC_BTN3, KC_BTN4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,   KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c
index 5e1c96d144..af3e7f96c7 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_2u_iso(
                                  KC_BTN1, KC_BTN2,                                                                                                                 KC_BTN3, KC_BTN4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,                KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,   KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c
index 9e1c211a84..19a33f9280 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_4u_ansi(
                                  KC_1, KC_2,                                                                                                                 KC_3, KC_4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c
index 261f578cdf..fd7723d3de 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_4u_iso(
                                  KC_BTN1, KC_BTN2,                                                                                                                 KC_BTN3, KC_BTN4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,                KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_NUHS, KC_ENT,  KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c
index f8f9d820df..761423bfc4 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_7u_ansi(
                                  KC_BTN1, KC_BTN2,                                                                                                                 KC_BTN3, KC_BTN4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,     KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c
index 88ea3fb850..b499999954 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_7u_iso(
                                  KC_BTN1, KC_BTN2,                                                                                                                 KC_BTN3, KC_BTN4,
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL,
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,                KC_P7, KC_P8, KC_P9, KC_PSLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,   KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,     KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
index 7122f42d4f..1227020b29 100644
--- a/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
+++ b/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
@@ -7,8 +7,8 @@
     "layout": "LAYOUT_all",
     "layers": [
                 [
-                        "KC_HOME", "KC_END", "KC_PGUP", "KC_PGDN", "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_INS",
-                        "KC_PMNS", "KC_NLCK", "KC_PSLS", "KC_PAST", "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_NLCK", "KC_PSLS", "KC_PAST", "KC_PMNS",
+                        "KC_HOME", "KC_END", "KC_PGUP", "KC_PGDN", "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_INS",
+                        "KC_PMNS", "KC_NUM", "KC_PSLS", "KC_PAST", "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_NUM", "KC_PSLS", "KC_PAST", "KC_PMNS",
                         "KC_PPLS", "KC_P7", "KC_P8", "KC_P9", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_P7", "KC_P8", "KC_P9", "KC_PPLS",
                         "KC_P4", "KC_P5", "KC_P6", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_P4", "KC_P5", "KC_P6",
                         "KC_PENT", "KC_P1", "KC_P2", "KC_P3", "KC_UP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_P1", "KC_P2", "KC_P3", "KC_PENT",
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/default_4u/keymap.c b/keyboards/clueboard/2x1800/2021/keymaps/default_4u/keymap.c
index f29feccc62..613b1f8198 100644
--- a/keyboards/clueboard/2x1800/2021/keymaps/default_4u/keymap.c
+++ b/keyboards/clueboard/2x1800/2021/keymaps/default_4u/keymap.c
@@ -17,9 +17,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_4u_space(
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
 
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PPLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,      KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/default_7u/keymap.c b/keyboards/clueboard/2x1800/2021/keymaps/default_7u/keymap.c
index 395956cec7..619e2cb115 100644
--- a/keyboards/clueboard/2x1800/2021/keymaps/default_7u/keymap.c
+++ b/keyboards/clueboard/2x1800/2021/keymaps/default_7u/keymap.c
@@ -17,9 +17,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_7u_space(
-      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL,
+      KC_HOME, KC_END,  KC_PGUP, KC_PGDN,       KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,   KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
 
-      KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,     KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
       KC_PPLS, KC_P7,   KC_P8,   KC_P9,        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,       KC_P7, KC_P8, KC_P9, KC_PPLS,
                KC_P4,   KC_P5,   KC_P6,        KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,    KC_QUOT, KC_ENT,         KC_P4, KC_P5, KC_P6,
       KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,     KC_UP,      KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/signboard/keymap.c b/keyboards/clueboard/2x1800/2021/keymaps/signboard/keymap.c
index 3559455b66..35da16664e 100644
--- a/keyboards/clueboard/2x1800/2021/keymaps/signboard/keymap.c
+++ b/keyboards/clueboard/2x1800/2021/keymaps/signboard/keymap.c
@@ -13,8 +13,8 @@ uint8_t custom_message[5][6] = {CHR_M, CHR_y, CHR_SPACE, CHR_2, CHR_CENT};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_all(
-        MSG_CB,  MSG_QMK, MSG_KMI, MSG_CS,    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
-        KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        MSG_CB,  MSG_QMK, MSG_KMI, MSG_CS,    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
+        KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_PPLS, KC_P7,   KC_P8,   KC_P9,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9, KC_PPLS,
                  KC_P4,   KC_P5,   KC_P6,     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,              KC_P4,   KC_P5,   KC_P6,
         KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,       KC_RSFT,    KC_UP,   KC_P1, KC_P2, KC_P3, KC_PENT,
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
index e8ef282a67..26529d1f2f 100644
--- a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_HOME, KC_END,           KC_VOLU,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,KC_SLCK, KC_PAUS,  _______,  _______,  KC_MUTE,                   KC_VOLD,
+  _______, _______, _______,_______,_______,_______,_______,_______,_______,KC_SCRL, KC_PAUS,  _______,  _______,  KC_MUTE,                   KC_VOLD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  KC_PSCR,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_MPLY,
   _______, KC_MYCM, MO(_FL), _______,        _______,_______,                        _______,  KC_CALC,  MO(_FL),  _______, KC_MPRV, KC_MSTP, KC_MNXT),
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
index 2e85c8bb8c..0ffa72643a 100644
--- a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
index f2050a0235..832493e579 100644
--- a/keyboards/clueboard/66/keymaps/jokrik/keymap.c
+++ b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_INS,  KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  MO(_FL),  _______, KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
index 7bedd16d82..256c7a76db 100644
--- a/keyboards/clueboard/66/keymaps/maximised/keymap.c
+++ b/keyboards/clueboard/66/keymaps/maximised/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,_______,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          KC_PGUP,
   _______, _______, _______,_______,        _______,_______,                         _______,  _______,  _______,  _______, KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
index 2b8b15a500..43e31b6796 100644
--- a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
index 8c95e17d49..80c550b56b 100644
--- a/keyboards/clueboard/66/keymaps/serubin/keymap.c
+++ b/keyboards/clueboard/66/keymaps/serubin/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_ESC,     KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,  _______, KC_DEL,           KC_HOME,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  KC_PSCR,                KC_END,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  KC_PSCR,                KC_END,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  MO(_FL),  MO(_ME), KC_HOME, KC_PGDN, KC_END),
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_ME] = LAYOUT(
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______, _______,  _______,  KC_MUTE,          KC_VOLU,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   KC_VOLD,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   KC_VOLD,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______, _______ ,  _______,          _______,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  MO(_FL),  MO(_ME), KC_MPRV, KC_MPLY, KC_MNXT),
diff --git a/keyboards/clueboard/66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
index fb696fd75c..f52a74238c 100644
--- a/keyboards/clueboard/66/keymaps/smt/keymap.c
+++ b/keyboards/clueboard/66/keymaps/smt/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, _______,          BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  KC_DEL,                    _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  KC_DEL,                    _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  _______, KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
index a702cc9a24..80061b3a51 100644
--- a/keyboards/clueboard/66/keymaps/tetris/keymap.c
+++ b/keyboards/clueboard/66/keymaps/tetris/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
index d706ae2895..7271d1c08b 100644
--- a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           KC_INS,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   KC_DEL,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   KC_DEL,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,       _______,_______,                         _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
index b184bdd88f..f41bd5f64d 100644
--- a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______,
+  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
   _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
   _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
   _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/coarse/ixora/keymaps/default/keymap.c b/keyboards/coarse/ixora/keymaps/default/keymap.c
index 86c9c195e3..38e16af41f 100644
--- a/keyboards/coarse/ixora/keymaps/default/keymap.c
+++ b/keyboards/coarse/ixora/keymaps/default/keymap.c
@@ -26,5 +26,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [0] = LAYOUT_full(
   QK_BOOT,    KC_2,    KC_3,
-  KC_CAPS, KC_NLCK, KC_SLCK)
+  KC_CAPS, KC_NUM, KC_SCRL)
 };
diff --git a/keyboards/compound/keymaps/default/keymap.c b/keyboards/compound/keymaps/default/keymap.c
index 2fcdc4c1d9..a41410412f 100644
--- a/keyboards/compound/keymaps/default/keymap.c
+++ b/keyboards/compound/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FN] = 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_DEL,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
   _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
   _______, _______, _______,                            _______,                            _______, _______, _______)
diff --git a/keyboards/compound/keymaps/via/keymap.c b/keyboards/compound/keymaps/via/keymap.c
index 04055df528..fbf244df7a 100644
--- a/keyboards/compound/keymaps/via/keymap.c
+++ b/keyboards/compound/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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_DEL,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
   _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
   _______, _______, _______,                            _______,                            _______, _______, _______),
diff --git a/keyboards/contender/keymaps/default/keymap.c b/keyboards/contender/keymaps/default/keymap.c
index 016c9c36d5..a7f9d7049d 100644
--- a/keyboards/contender/keymaps/default/keymap.c
+++ b/keyboards/contender/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
                            KC_ESCAPE,   KC_LSFT,      KC_TAB,          KC_BSPC,
-                           KC_NLCK,     KC_KP_SLASH,  KC_KP_ASTERISK,  KC_EQUAL,
+                           KC_NUM,      KC_KP_SLASH,  KC_KP_ASTERISK,  KC_EQUAL,
                            KC_KP_7,     KC_KP_8,      KC_KP_9,         KC_KP_MINUS,
       MO(_FUNCTION),       KC_KP_4,     KC_KP_5,      KC_KP_6,         KC_KP_PLUS,
       RGB_TOG,             KC_KP_1,     KC_KP_2,      KC_KP_3,         KC_KP_ENTER,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Lightning */
     [_UNRULY] = LAYOUT(
                            KC_ESCAPE,   KC_LSFT,      KC_TAB,          KC_BSPC,
-                           KC_NLCK,     KC_KP_SLASH,  KC_KP_ASTERISK,  KC_EQUAL,
+                           KC_NUM,      KC_KP_SLASH,  KC_KP_ASTERISK,  KC_EQUAL,
                            KC_KP_7,     KC_KP_8,      KC_KP_9,         KC_KP_MINUS,
       KC_TRNS,             KC_KP_4,     KC_KP_5,      KC_KP_6,         KC_KP_PLUS,
       KC_TRNS,             KC_KP_1,     KC_KP_2,      KC_KP_3,         KC_KP_ENTER,
diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c
index 854ba78e66..f60cde36b2 100644
--- a/keyboards/contra/keymaps/ryanm101/keymap.c
+++ b/keyboards/contra/keymaps/ryanm101/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_L2] = LAYOUT_ortho_4x12(
-    KC_SYRQ, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_NLCK, KC_P7,   KC_P8,    KC_P9,   KC_PAST, KC_BSPC,
+    KC_SYRQ, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_NUM,  KC_P7,   KC_P8,    KC_P9,   KC_PAST, KC_BSPC,
     XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_P4,   KC_P5,    KC_P6,   KC_PSLS, _______,
     XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX, KC_P1,   KC_P2,    KC_P3,   KC_PPLS, KC_PENT,
     _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, KC_P0,    KC_PDOT, KC_PMNS, _______
diff --git a/keyboards/converter/a1200/keymaps/default/keymap.c b/keyboards/converter/a1200/keymaps/default/keymap.c
index 98982db147..70a846e2ee 100644
--- a/keyboards/converter/a1200/keymaps/default/keymap.c
+++ b/keyboards/converter/a1200/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
      _______,    _______, _______, _______, _______, _______,      _______, _______, _______, KC_F11, KC_F12, 
 	
-	 _______,  _______,    _______,  _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, _______, _______,      _______, _______,               KC_NLCK, KC_SLCK, _______, KC_PSCR, 
+	 _______,  _______,    _______,  _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, _______, _______,      _______, _______,               KC_NUM, KC_SCRL, _______, KC_PSCR, 
 	 _______,           _______,  _______, _______, QK_BOOT,_______, _______, _______, _______,    _______,   _______,    _______, _______,                                                  _______, _______, _______, _______, 
 	 _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, KC_NO, _______,                  _______,                  _______, _______, _______, _______, 
      _______, KC_NO,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,                        _______, _______, _______,         _______, _______, _______, _______, 
diff --git a/keyboards/converter/adb_usb/keymaps/13bit/keymap.c b/keyboards/converter/adb_usb/keymaps/13bit/keymap.c
index 3b36a20c25..c5dd8aa49b 100644
--- a/keyboards/converter/adb_usb/keymaps/13bit/keymap.c
+++ b/keyboards/converter/adb_usb/keymaps/13bit/keymap.c
@@ -16,8 +16,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_ext_ansi(
-    KC_ESC,  APP1,    APP2,   APP3,   APP4,   APP5,   APP6,   APP7,   APP8,    MCTL,   KC_MUTE, KC_VOLD, KC_VOLU,                SCST,   KC_SLCK, KC_PAUS,                               SLP,
-    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS, KC_HOME, KC_PGUP,     KC_NLCK, KC_EQL, KC_PSLS, KC_PAST,
+    KC_ESC,  APP1,    APP2,   APP3,   APP4,   APP5,   APP6,   APP7,   APP8,    MCTL,   KC_MUTE, KC_VOLD, KC_VOLU,                SCST,   KC_SCRL, KC_PAUS,                               SLP,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS, KC_HOME, KC_PGUP,     KC_NUM,  KC_EQL, KC_PSLS, KC_PAST,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_DEL, KC_END,  KC_PGDN,     KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
     KC_LCAP, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,          KC_ENT,                                      KC_P4,   KC_P5,  KC_P6,   KC_PPLS,
     KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,                   KC_RSFT,                KC_UP,               KC_P1,   KC_P2,  KC_P3,
diff --git a/keyboards/converter/adb_usb/keymaps/default/keymap.c b/keyboards/converter/adb_usb/keymaps/default/keymap.c
index 6b63c1a3c1..e7daa2580b 100644
--- a/keyboards/converter/adb_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/adb_usb/keymaps/default/keymap.c
@@ -3,8 +3,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_ext_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_SLCK,KC_PAUS,                                KC_EJCT,
-    KC_GRV,  KC_1,    KC_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_NLCK, KC_EQL, KC_PSLS, KC_PAST,
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,                 KC_PSCR,KC_SCRL,KC_PAUS,                                KC_EJCT,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS, KC_HOME, KC_PGUP,     KC_NUM,  KC_EQL, KC_PSLS, KC_PAST,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_DEL, KC_END,  KC_PGDN,     KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
     KC_LCAP, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,          KC_ENT,                                      KC_P4,   KC_P5,  KC_P6,   KC_PPLS,
     KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,                   KC_RSFT,                KC_UP,               KC_P1,   KC_P2,  KC_P3,
diff --git a/keyboards/converter/adb_usb/keymaps/zyber/keymap.c b/keyboards/converter/adb_usb/keymaps/zyber/keymap.c
index c725a4853b..a34b46d6de 100644
--- a/keyboards/converter/adb_usb/keymaps/zyber/keymap.c
+++ b/keyboards/converter/adb_usb/keymaps/zyber/keymap.c
@@ -5,8 +5,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_ext_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_SLCK,KC_PAUS,                                KC_EJCT,
-    KC_GRV,  KC_1,    KC_2,   KC_3,   TD(SSHT), 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_NLCK, KC_EQL, KC_PSLS, KC_PAST,
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,    KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,   KC_F11,   KC_F12,                 KC_PSCR,KC_SCRL,KC_PAUS,                                KC_EJCT,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   TD(SSHT), KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,       KC_INS, KC_HOME, KC_PGUP,     KC_NUM,  KC_EQL, KC_PSLS, KC_PAST,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,     KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,     TD(LBRC), KC_RBRC, KC_BSLS,       KC_DEL, KC_END,  KC_PGDN,     KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
     KC_LCAP, KC_A,    KC_S,   KC_D,   KC_F,     KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   TD(SCLN), TD(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,
diff --git a/keyboards/converter/ibm_terminal/keymaps/default/keymap.c b/keyboards/converter/ibm_terminal/keymaps/default/keymap.c
index 59187ef339..16c8769049 100644
--- a/keyboards/converter/ibm_terminal/keymaps/default/keymap.c
+++ b/keyboards/converter/ibm_terminal/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         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_PSCR,KC_ESC,     KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_NO,  KC_BSPC,    KC_INS, KC_HOME,KC_PGUP,    KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
-    KC_SLCK,KC_INT4,    KC_TAB, KC_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_DEL, KC_END, KC_PGDN,    KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
+    KC_PSCR,KC_ESC,     KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_NO,  KC_BSPC,    KC_INS, KC_HOME,KC_PGUP,    KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,
+    KC_SCRL,KC_INT4,    KC_TAB, KC_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_DEL, KC_END, KC_PGDN,    KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
     KC_PAUS,KC_INT5,    KC_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_UP,              KC_P4,  KC_P5,  KC_P6,  KC_PCMM,
     KC_APP, KC_INT6,    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_NO,  KC_RSFT,    KC_LEFT,KC_INT2,KC_RGHT,    KC_P1,  KC_P2,  KC_P3,  KC_PENT,
     KC_RGUI,KC_LGUI,    KC_LCTL,        KC_LALT,                        KC_SPC,                                         KC_LGUI,        KC_GRV,             KC_DOWN,            KC_NO,  KC_P0,  KC_PDOT,KC_NO
@@ -51,9 +51,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 /*
     LAYOUT_101(
-     KC_ESC,       KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,        KC_PSCR,KC_SLCK, KC_BRK,
+     KC_ESC,       KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,        KC_PSCR,KC_SCRL, KC_BRK,
 
-     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,      KC_INS,KC_HOME,KC_PGUP,     KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,      KC_INS,KC_HOME,KC_PGUP,     KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,
      KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,      KC_DEL, KC_END,KC_PGDN,       KC_P7,  KC_P8,  KC_P9,
     KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,                                    KC_P4,  KC_P5,  KC_P6,KC_PPLS,
     KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,               KC_UP,               KC_P1,  KC_P2,  KC_P3,
diff --git a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c b/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
index f91c6cfb5b..5497bfe87a 100644
--- a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
                                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,     _______, _______, _______,     KC_NLCK, _______, _______, _______,
+    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,     _______, _______, _______,     KC_NUM,  _______, _______, _______,
     _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          XXXXXXX,     _______, _______, _______,     _______, _______, _______, _______,
     _______, _______,     _______, _______, _______, _______, _______, _______, TO(DVO), _______, _______, _______, _______, _______,          _______, _______,              _______,              _______, _______, _______, _______,
     _______, _______,     _______, _______, _______, TO(QWE), _______, _______, _______, _______, _______, _______, _______, _______,          XXXXXXX, _______,     _______, _______, _______,     _______, _______, _______, _______,
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
index a530a4b83a..ab92ad2112 100644
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
+++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
@@ -150,10 +150,10 @@ const uint32_t PROGMEM unicode_map[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* qwerty */
     [QWE] = LAYOUT(
-                                   KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_PSCR, KC_SLCK, KC_PAUS,
+                                   KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_PSCR, KC_SCRL, KC_PAUS,
                                    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
 
-    MO(EMO), MO(SYS),     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    MO(EMO), MO(SYS),     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_MNXT, KC_VOLU,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          XXXXXXX,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_MPLY, KC_MUTE,     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_BSLS, KC_ENT,               KC_UP,                KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
     KC_MPRV, KC_VOLD,     KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          XXXXXXX, KC_RSFT,     KC_LEFT, TG(MOU), KC_RGHT,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/converter/m0110_usb/keymaps/default/keymap.c b/keyboards/converter/m0110_usb/keymaps/default/keymap.c
index a02bab923b..b65774d421 100644
--- a/keyboards/converter/m0110_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/m0110_usb/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 */
 
 	[0] = LAYOUT_ansi(
-	       KC_GRV,  KC_1,    KC_2, KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,   KC_0,             KC_MINS, KC_EQL,  KC_BSPC,  KC_NLCK, KC_EQL, KC_PSLS, KC_PAST,
+	       KC_GRV,  KC_1,    KC_2, KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,   KC_0,             KC_MINS, KC_EQL,  KC_BSPC,  KC_NUM,  KC_EQL, KC_PSLS, KC_PAST,
 	       KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,   KC_P,             KC_LBRC, KC_RBRC,           KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
 	       KC_LCAP, KC_A,    KC_S, KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,   KC_SCLN,          KC_QUOT,          KC_ENT,   KC_P4,   KC_P5,  KC_P6,   KC_PPLS,
 	       KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,                            KC_UP,    KC_P1,   KC_P2,  KC_P3,   KC_PENT,
@@ -83,8 +83,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 */
 	
 	[1] = LAYOUT_ansi(
-	       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_DEL,   KC_NLCK, KC_EQL, KC_PSLS, KC_PAST,
-		   KC_TAB,  KC_HOME, KC_UP,   KC_PGUP, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_INS,           KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
+	       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_DEL,   KC_NUM, KC_EQL, KC_PSLS, KC_PAST,
+		   KC_TAB,  KC_HOME, KC_UP,   KC_PGUP, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_INS,           KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
 		   KC_LCAP, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,         KC_ENT,   KC_P4,   KC_P5,  KC_P6,   KC_PPLS,
 		   KC_LCTL, KC_END,  KC_NO,   KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_END,  KC_PGDN, KC_DOWN,                  KC_PGUP,  KC_P1,   KC_P2,  KC_P3,   KC_PENT,
 	       KC_LALT, KC_LGUI,                          KC_SPC,                       KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN,  KC_P0,           KC_PDOT),
diff --git a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
index 3b683e1c95..d08787fe30 100644
--- a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
+++ b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 */
 
 	[0] = LAYOUT_iso(
-	       KC_GESC,   KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,             KC_MINS, KC_EQL,  KC_BSPC,     KC_NLCK, KC_EQL, KC_PSLS, KC_PAST, \
+	       KC_GESC,   KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,             KC_MINS, KC_EQL,  KC_BSPC,     KC_NUM,  KC_EQL, KC_PSLS, KC_PAST, \
 	       KC_TAB,    KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,             KC_LBRC, KC_RBRC, KC_ENT,      KC_P7,   KC_P8,  KC_P9,   KC_PMNS, \
 	       CTRL_C_UP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN,          KC_QUOT, KC_NUHS,              KC_P4,   KC_P5,  KC_P6,   KC_PPLS, \
 	       KC_LSFT,   KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,                                KC_P1,   KC_P2,  KC_P3,   KC_PENT, \
diff --git a/keyboards/converter/modelm101/keymaps/default/keymap.c b/keyboards/converter/modelm101/keymaps/default/keymap.c
index 3f01f2c65c..fa8621e2e1 100644
--- a/keyboards/converter/modelm101/keymaps/default/keymap.c
+++ b/keyboards/converter/modelm101/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 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_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/converter/modelm101/keymaps/iw0rm3r/keymap.c b/keyboards/converter/modelm101/keymaps/iw0rm3r/keymap.c
index 26ced801e5..f4a1acb0ce 100644
--- a/keyboards/converter/modelm101/keymaps/iw0rm3r/keymap.c
+++ b/keyboards/converter/modelm101/keymaps/iw0rm3r/keymap.c
@@ -17,8 +17,8 @@
 
 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_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,  KC_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,
diff --git a/keyboards/converter/modelm101_teensy2/keymaps/default/keymap.c b/keyboards/converter/modelm101_teensy2/keymaps/default/keymap.c
index 3f01f2c65c..fa8621e2e1 100644
--- a/keyboards/converter/modelm101_teensy2/keymaps/default/keymap.c
+++ b/keyboards/converter/modelm101_teensy2/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 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_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/converter/periboard_512/keymaps/default/keymap.c b/keyboards/converter/periboard_512/keymaps/default/keymap.c
index 1c975a24e4..45286a8d7e 100644
--- a/keyboards/converter/periboard_512/keymaps/default/keymap.c
+++ b/keyboards/converter/periboard_512/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 
 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_SLCK, KC_PAUS,
-    KC_GRV,         KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,   KC_7,  KC_8,  KC_9,  KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,         KC_F1,   KC_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,
     LALT_T(KC_TAB), KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,   KC_U,  KC_I,  KC_O,  KC_P,    KC_LBRC, KC_RBRC, RALT_T(KC_BSLS),  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     LCTL_T(KC_ESC), KC_A,    KC_S,    KC_D,  KC_F,  KC_G,          KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT, RCTL_T(KC_BSPC),                              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,
diff --git a/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c b/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c
index 73af9ce02e..d1681624cb 100644
--- a/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c
+++ b/keyboards/converter/sun_usb/type5/keymaps/default/keymap.c
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* LAYOUT_jp_unix is a superset of the other layouts, hence the default */
   LAYOUT_jp_unix(
-      KC_HELP,              KC_NO,   KC_F1,KC_F2,KC_F3,KC_F4, KC_F5,KC_F6,KC_F7,KC_F8, KC_F9,KC_F10,KC_F11,KC_F12,   KC_PSCR,KC_SLCK,KC_PAUS,  KC_MUTE,KC_VOLD,KC_VOLU,KC_PWR,
-      KC_STOP,   KC_AGAIN,  KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,  KC_INS, KC_HOME,KC_PGUP,  KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+      KC_HELP,              KC_NO,   KC_F1,KC_F2,KC_F3,KC_F4, KC_F5,KC_F6,KC_F7,KC_F8, KC_F9,KC_F10,KC_F11,KC_F12,   KC_PSCR,KC_SCRL,KC_PAUS,  KC_MUTE,KC_VOLD,KC_VOLU,KC_PWR,
+      KC_STOP,   KC_AGAIN,  KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,  KC_INS, KC_HOME,KC_PGUP,  KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,
       KC_MENU,   KC_UNDO,   KC_TAB,  KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,  KC_BSPC,    KC_DEL, KC_END, KC_PGDN,  KC_P7,  KC_P8, KC_P9,  KC_PPLS,
       KC_SELECT, KC_COPY,   KC_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_EXECUTE,KC_PASTE,  KC_LSFT,     KC_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,
diff --git a/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c b/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c
index 1c7ea3efc2..9e5f6ebb9d 100644
--- a/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c
+++ b/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c
@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
   {
    [_QWERTY] = LAYOUT_us_unix(
-      KC_LEAD,                 KC_SCRT, KC_F1,KC_F2,KC_F3,KC_F4, KC_F5,KC_F6,KC_F7,KC_F8, KC_F9,KC_F10,KC_F11,KC_F12,   KC_PSCR,KC_SLCK,KC_PAUS,  KC_MUTE,KC_VOLD,KC_VOLU,KC_OS_LOCK,
-      KC_STOP,   KC_OS_REDO,   KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,  KC_INS, KC_HOME,KC_PGUP,  KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+      KC_LEAD,                 KC_SCRT, KC_F1,KC_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_VOLD,KC_VOLU,KC_OS_LOCK,
+      KC_STOP,   KC_OS_REDO,   KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,  KC_INS, KC_HOME,KC_PGUP,  KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,
       VRSN,      KC_OS_UNDO,   KC_TAB,  KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,  KC_BSPC,    KC_DEL, KC_END, KC_PGDN,  KC_P7,  KC_P8, KC_P9,  KC_PPLS,
       KC_MAKE,   KC_OS_COPY,   KC_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_EXECUTE,KC_OS_PASTE,  KC_LSFT,     KC_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,
diff --git a/keyboards/converter/usb_usb/keymaps/ble/keymap.c b/keyboards/converter/usb_usb/keymaps/ble/keymap.c
index 710cb90b99..7cac65e785 100644
--- a/keyboards/converter/usb_usb/keymaps/ble/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/ble/keymap.c
@@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
index d50908974c..4113cdc67c 100644
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
     [_CKO] = LAYOUT_fullsize_ansi(
-        KC_ESC,                           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,        KC_F10,   KC_F11,    KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,           KC_1,           KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,         KC_MINS,  KC_EQL,    KC_BSLS,    KC_INS,  KC_HOME, KC_PGUP,            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,                           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,        KC_F10,   KC_F11,    KC_F12,              KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,           KC_1,           KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,         KC_MINS,  KC_EQL,    KC_BSLS,    KC_INS,  KC_HOME, KC_PGUP,            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,           KC_Q,           KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,         KC_LBRC,  KC_RBRC,   KC_BSPC,    KC_DEL,  KC_END,  KC_PGDN,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         LCTL_T(KC_ESC),   KC_A,           KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    TD(SCLN_CLN), KC_QUOT,             KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,
         TD(ESPC_L),       LT(_DEV,KC_Z),  KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,                           TD(ESPC_R),          KC_UP,                       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -62,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
     [_QWERTY] = LAYOUT_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,   KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,   KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC,   KC_RBRC,  KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,             KC_ENT,                                  KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,                      KC_RSFT,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
index 6ef3b3505a..fc9ebfa15d 100644
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -47,8 +47,8 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     // ),
     LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
diff --git a/keyboards/converter/usb_usb/keymaps/default/keymap.c b/keyboards/converter/usb_usb/keymaps/default/keymap.c
index ccb6ee8462..51a7a179af 100644
--- a/keyboards/converter/usb_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/default/keymap.c
@@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
diff --git a/keyboards/converter/usb_usb/keymaps/narze/keymap.c b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
index 117b6fc00a..78faa7975e 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
@@ -50,8 +50,8 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
      */
     [_QWERTY] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     HPR_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_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
@@ -59,8 +59,8 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     ),
     [_COLEMAK] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     HPR_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_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
@@ -68,8 +68,8 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     ),
     [_QWOC] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     HPR_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_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     LSFT_LPRN,KC_NUBS,KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_INT1, RSFT_RPRN,            KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
diff --git a/keyboards/converter/xt_usb/keymaps/default/keymap.c b/keyboards/converter/xt_usb/keymaps/default/keymap.c
index f1410ee450..c6acc58c22 100644
--- a/keyboards/converter/xt_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/xt_usb/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------'  `--------------------------------------------------------------------------'
      */
     LAYOUT_xt(
-        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_NLCK,          KC_SLCK,
+        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_NUM,           KC_SCRL,
         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_P7,   KC_P8,   KC_P9,   KC_PMNS,
         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_GRV,  KC_ENT,  KC_P4,   KC_P5,   KC_P6,
         KC_F7,   KC_F8,     KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_PAST, KC_P1,   KC_P2,   KC_P3,   KC_PPLS,
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Try this if your keyboad has exotic keys.
     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_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,            KC_VOLD, KC_VOLU, KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,            KC_VOLD, KC_VOLU, KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
diff --git a/keyboards/coseyfannitutti/discipad/keymaps/default/keymap.c b/keyboards/coseyfannitutti/discipad/keymaps/default/keymap.c
index ffdc1044df..f20ea611b9 100644
--- a/keyboards/coseyfannitutti/discipad/keymaps/default/keymap.c
+++ b/keyboards/coseyfannitutti/discipad/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL] = LAYOUT_numpad_5x4(
-      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+      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,            
diff --git a/keyboards/coseyfannitutti/discipad/keymaps/via/keymap.c b/keyboards/coseyfannitutti/discipad/keymaps/via/keymap.c
index d47c2ce75c..10c8aa3475 100644
--- a/keyboards/coseyfannitutti/discipad/keymaps/via/keymap.c
+++ b/keyboards/coseyfannitutti/discipad/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_5x4(
-      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      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,
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/noroadsleft/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/noroadsleft/keymap.c
index 4460d6f9bb..1c7f42f210 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/noroadsleft/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/noroadsleft/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  DM_REC1,
-        _______, KC_CALC, KC_APP,  _______, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS, DM_REC2,
+        _______, KC_CALC, KC_APP,  _______, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, DM_REC2,
         _______, M_SALL,  _______, _______, G_PWD,   _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,          DM_RSTP, DM_PLY1,
         _______,          M_UNDO,  M_CUT,   M_COPY,  M_PASTE, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, TO(_SY), _______, _______, DM_PLY2,
         _______, _______, _______,                            TG(_NP),                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/coseyfannitutti/mulletpad/keymaps/default/keymap.c b/keyboards/coseyfannitutti/mulletpad/keymaps/default/keymap.c
index ffdc1044df..f20ea611b9 100644
--- a/keyboards/coseyfannitutti/mulletpad/keymaps/default/keymap.c
+++ b/keyboards/coseyfannitutti/mulletpad/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL] = LAYOUT_numpad_5x4(
-      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+      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,            
diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c
index 9a851bec56..3f7b20fbd9 100644
--- a/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c
+++ b/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_ansi_7u(
-      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SLCK, KC_PAUS,
+      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_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,
diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c
index 2c34d15040..42dd964529 100644
--- a/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c
+++ b/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_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,
diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c
index 90269323e9..6d8b25e36d 100644
--- a/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c
+++ b/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso(
-      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SLCK, KC_PAUS,
+      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_INS,   KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_DEL,   KC_END,  KC_PGDN,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c
index 151a209284..b13d33794d 100644
--- a/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c
+++ b/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso(
-      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SLCK, KC_PAUS,
+      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_INS,   KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_DEL,   KC_END,  KC_PGDN,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT, KC_BSLS,
diff --git a/keyboards/cozykeys/bloomer/v2/keymaps/default/keymap.c b/keyboards/cozykeys/bloomer/v2/keymaps/default/keymap.c
index b9e0a1c239..5f1e9a1323 100644
--- a/keyboards/cozykeys/bloomer/v2/keymaps/default/keymap.c
+++ b/keyboards/cozykeys/bloomer/v2/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum bloomer_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [DEFAULT] = LAYOUT(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR, KC_SLCK, KC_PAUS,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR, KC_SCRL, KC_PAUS,   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_INS,  KC_HOME, KC_PGUP,   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_CAPS, KC_END,  KC_PGDN,   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,
diff --git a/keyboards/cozykeys/bloomer/v3/keymaps/default/keymap.c b/keyboards/cozykeys/bloomer/v3/keymaps/default/keymap.c
index ded61b2071..4bf587f50a 100644
--- a/keyboards/cozykeys/bloomer/v3/keymaps/default/keymap.c
+++ b/keyboards/cozykeys/bloomer/v3/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                 KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_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_LBRC,     KC_PSCR, KC_PAUS,      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_PGUP,     KC_SLCK, KC_NLCK,      KC_HOME, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_PGUP,     KC_SCRL, KC_NUM,       KC_HOME, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_PGDN, KC_CAPS, KC_UP,   KC_INS,  KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
     KC_LCTL, KC_LGUI, KC_LALT, KC_GRV,  MO(FN),  KC_BSPC,  KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT,  KC_SPC,  KC_LBRC, KC_RBRC, KC_RALT, KC_RGUI, KC_RCTL
 ),
diff --git a/keyboards/crawlpad/keymaps/default/keymap.c b/keyboards/crawlpad/keymaps/default/keymap.c
index e633e741df..547132bb7d 100755
--- a/keyboards/crawlpad/keymaps/default/keymap.c
+++ b/keyboards/crawlpad/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT_ortho_4x4(
-    KC_NLCK, BL1,     KC_TRNS, KC_PSLS,
+    KC_NUM,  BL1,     KC_TRNS, KC_PSLS,
     QK_BOOT,   BL2,     KC_TRNS, KC_TRNS,
     KC_TRNS, BL3,     KC_TRNS, KC_TRNS,
     KC_TRNS, BL4,     KC_TRNS, KC_TRNS
diff --git a/keyboards/crazy_keyboard_68/keymaps/default/keymap.c b/keyboards/crazy_keyboard_68/keymaps/default/keymap.c
index 60ea5c38f9..970d67e2f1 100644
--- a/keyboards/crazy_keyboard_68/keymaps/default/keymap.c
+++ b/keyboards/crazy_keyboard_68/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FN] = LAYOUT_65_ansi(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, _______,          _______, KC_INS,
         _______,          RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         QK_BOOT,   _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
index 209b89d1c9..90e72274c6 100644
--- a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
+++ b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_f13_ansi_tsangan(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  
diff --git a/keyboards/creatkeebs/glacier/keymaps/via/keymap.c b/keyboards/creatkeebs/glacier/keymaps/via/keymap.c
index 67c39fe327..a78795af15 100644
--- a/keyboards/creatkeebs/glacier/keymaps/via/keymap.c
+++ b/keyboards/creatkeebs/glacier/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_f13_ansi_tsangan(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  
diff --git a/keyboards/crin/keymaps/default/keymap.c b/keyboards/crin/keymaps/default/keymap.c
index bf754b0554..96cad77e76 100644
--- a/keyboards/crin/keymaps/default/keymap.c
+++ b/keyboards/crin/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_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_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_F1,   KC_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,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,
diff --git a/keyboards/crin/keymaps/via/keymap.c b/keyboards/crin/keymaps/via/keymap.c
index bf754b0554..96cad77e76 100644
--- a/keyboards/crin/keymaps/via/keymap.c
+++ b/keyboards/crin/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_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_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_F1,   KC_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,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,
diff --git a/keyboards/crkbd/keymaps/benrestech/keymap.c b/keyboards/crkbd/keymaps/benrestech/keymap.c
index 8cea92be06..a79a3cc8c9 100644
--- a/keyboards/crkbd/keymaps/benrestech/keymap.c
+++ b/keyboards/crkbd/keymaps/benrestech/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [FUNL] = LAYOUT_split_3x6_3(
     TO(NSSL),  KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR, KC_NA,   KC_NA,   KC_NA,   KC_NA,    QK_BOOT,   TO(MOUR),
-    TO(NSL),   KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SLCK, KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI,  TO(NAVR),
+    TO(NSL),   KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SCRL, KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI,  TO(NAVR),
     TO(BASE),  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_PAUS, KC_NA,   KC_NA,   KC_NA,   KC_ALGR,  KC_NA,    TO(MEDR),
                                 KC_APP,  KC_SPC,  KC_TAB,  KC_NA,   KC_NA,   KC_NA
   ),
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
index 7705aef429..c47043e712 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c
+++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       TO(_BASE), KC_TRANSPARENT, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRANSPARENT,         KC_TRANSPARENT, KC_4,  KC_5,  KC_6, KC_TRANSPARENT, KC_TRANSPARENT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3,KC_TRANSPARENT, KC_NLCK,
+     KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3,KC_TRANSPARENT, KC_NUM,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_TRANSPARENT, KC_0
                                       //`--------------------------'  `--------------------------'
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index b54a778373..92a6e0dd5b 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PPLS,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK,                       KC_EQL,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PAST,\
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,                        KC_EQL,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PAST,\
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,    _______,   KC_P0,  KC_DOT \
                                       //`--------------------------'  `--------------------------'
diff --git a/keyboards/crkbd/keymaps/toinux/keymap.c b/keyboards/crkbd/keymaps/toinux/keymap.c
index 5095ae6ebd..bbc917c24a 100644
--- a/keyboards/crkbd/keymaps/toinux/keymap.c
+++ b/keyboards/crkbd/keymaps/toinux/keymap.c
@@ -212,7 +212,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //                                      |        |        |        |  |        |        |        |
 //                                      `--------------------------'  `--------------------------'
   [_ADJUST] = LAYOUT_split_3x6_3(
-        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,                      KC_NLCK, KC_CAPS, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX,
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,                      KC_NUM, KC_CAPS, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX,
       RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                           _______, _______, _______,    _______, _______, _______
diff --git a/keyboards/dc01/left/keymaps/default/keymap.c b/keyboards/dc01/left/keymaps/default/keymap.c
index 884e734d23..6f0b320c3c 100644
--- a/keyboards/dc01/left/keymaps/default/keymap.c
+++ b/keyboards/dc01/left/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ansi( /* Base */
-    KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5, KC_6,       KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,   KC_INS,  KC_HOME,  KC_PGUP,    KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+    KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5, KC_6,       KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,   KC_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_NO,
     KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,       KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, KC_RSFT,                    KC_UP,                KC_P1,    KC_P2,    KC_P3,    KC_NO,
diff --git a/keyboards/dc01/left/keymaps/via/keymap.c b/keyboards/dc01/left/keymaps/via/keymap.c
index 43d29ef6dc..7aecc668cc 100644
--- a/keyboards/dc01/left/keymaps/via/keymap.c
+++ b/keyboards/dc01/left/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,    KC_1,     KC_2,   KC_3,   KC_4,   KC_5, KC_6,             KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,   KC_INS,  KC_HOME,  KC_PGUP,    KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+    KC_ESC,    KC_1,     KC_2,   KC_3,   KC_4,   KC_5, KC_6,             KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,   KC_INS,  KC_HOME,  KC_PGUP,    KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
     KC_TAB,    KC_Q,     KC_W,   KC_E,   KC_R,   KC_T,             KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,           KC_DEL,  KC_END,   KC_PGDN,    KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
     KC_CAPS,   KC_A,     KC_S,   KC_D,   KC_F,   KC_G,             KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                           KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
     KC_LSFT,   KC_NUBS,  KC_Z,   KC_X,   KC_C,   KC_V, KC_B,       KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, KC_RSFT,                    KC_UP,                KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/dc01/numpad/keymaps/via/keymap.c b/keyboards/dc01/numpad/keymaps/via/keymap.c
index bb4c17c3fa..25a39575ec 100644
--- a/keyboards/dc01/numpad/keymaps/via/keymap.c
+++ b/keyboards/dc01/numpad/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_5x4( /* Base */
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/dc01/right/keymaps/default/keymap.c b/keyboards/dc01/right/keymaps/default/keymap.c
index 1bf026f3da..19f829f823 100644
--- a/keyboards/dc01/right/keymaps/default/keymap.c
+++ b/keyboards/dc01/right/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_ansi( /* Empty for Dynamic keymap */
               KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-    KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    KC_TRNS,  KC_BSPC,
+    KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    KC_TRNS,  KC_BSPC,
     KC_PAST,  KC_PSLS,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            KC_PENT,
     KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  KC_DOWN,            KC_TRNS,  KC_TRNS,
     KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,     KC_TRNS,             KC_TRNS)
diff --git a/keyboards/dc01/right/keymaps/via/keymap.c b/keyboards/dc01/right/keymaps/via/keymap.c
index 92495e6d22..c685a59f32 100644
--- a/keyboards/dc01/right/keymaps/via/keymap.c
+++ b/keyboards/dc01/right/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all( /* FN */
               KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-    KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    KC_TRNS,  KC_BSPC,
+    KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    KC_TRNS,  KC_BSPC,
     KC_PAST,  KC_PSLS,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  KC_TRNS,  KC_PENT,
     KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  KC_DOWN,            KC_TRNS,  KC_TRNS,
     KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,     KC_TRNS,             KC_TRNS),
diff --git a/keyboards/deltasplit75/keymaps/default/keymap.c b/keyboards/deltasplit75/keymaps/default/keymap.c
index 3d5169304d..36031d57ae 100644
--- a/keyboards/deltasplit75/keymaps/default/keymap.c
+++ b/keyboards/deltasplit75/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_v2(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_HOME, KC_PGUP,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_END,  KC_PGDN,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_SLCK,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_SCRL,
     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT,           KC_PAUS,  //modify KC_TRNS to enable ISO Support
     KC_LSFT, KC_TRNS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PSCR,  //modify KC_TRNS to enable ISO Support
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/deltasplit75/keymaps/protosplit/keymap.c b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
index 31b764393e..760a81f8fc 100644
--- a/keyboards/deltasplit75/keymaps/protosplit/keymap.c
+++ b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_protosplit(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_HOME, KC_PGUP,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_END,  KC_PGDN,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_SLCK,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_SCRL,
     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PAUS,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   KC_PSCR,
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/dk60/keymaps/default/keymap.c b/keyboards/dk60/keymaps/default/keymap.c
index 7ebc3952b6..4f02d30e75 100644
--- a/keyboards/dk60/keymaps/default/keymap.c
+++ b/keyboards/dk60/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FN] = LAYOUT( /* Layer 1 */
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
                  _______, _______,                            _______,                            KC_MSTP, _______
diff --git a/keyboards/dm9records/ergoinu/keymaps/default/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
index 862b538829..96a83e0fd3 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
+++ b/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [META] = LAYOUT(
     MO(CONF),KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,
-    _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PSCR, KC_HOME, KC_END,
+    _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL, KC_PSCR, KC_HOME, KC_END,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PGUP, KC_UP,   KC_PGDN,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
index b33c0e9648..e3f46772a8 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
+++ b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [META] = LAYOUT(
     MO(CONF),KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,
-    _______, KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PSCR, KC_HOME, KC_END,
+    _______, KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, _______, KC_SCRL, KC_PSCR, KC_HOME, KC_END,
     _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_PAUS, KC_PGUP, KC_UP,   KC_PGDN,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,
                       _______, _______, KC_RGUI, KC_DEL,  KC_ENT,  _______, KC_DEL,  KC_INT4, KC_LGUI, _______
diff --git a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
index 9567c60bff..3149bec5de 100644
--- a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `--------------------------------------------------------------------------------'
      */
 
-    [_RAISE] = LAYOUT_planck_mit(KC_NLCK, KC_P1, KC_P2, KC_P3, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_EXLM, KC_HASH, KC_DLR, KC_PLUS, KC_PSLS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_PERC, KC_ASTR, KC_AMPR, KC_EQL, KC_PAST, KC_P7, KC_P8, KC_P9, KC_PCMM, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_MINS, KC_AT, KC_TILDE, KC_NO, KC_P0, KC_PDOT, KC_PENT, KC_PEQL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV),
+    [_RAISE] = LAYOUT_planck_mit(KC_NUM, KC_P1, KC_P2, KC_P3, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_EXLM, KC_HASH, KC_DLR, KC_PLUS, KC_PSLS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_PERC, KC_ASTR, KC_AMPR, KC_EQL, KC_PAST, KC_P7, KC_P8, KC_P9, KC_PCMM, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_MINS, KC_AT, KC_TILDE, KC_NO, KC_P0, KC_PDOT, KC_PENT, KC_PEQL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV),
 
     /* Function (Lower + Raise)
      * ,-----------------------------------------------------------------------------------------------------------------------.
diff --git a/keyboards/dm9records/tartan/keymaps/default/keymap.c b/keyboards/dm9records/tartan/keymaps/default/keymap.c
index 6224b4e615..451a6e7237 100644
--- a/keyboards/dm9records/tartan/keymaps/default/keymap.c
+++ b/keyboards/dm9records/tartan/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [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_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_INS, _______,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_INS, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
     _______, _______, _______,                   _______,                            _______, _______, _______, _______
diff --git a/keyboards/dm9records/tartan/keymaps/via/keymap.c b/keyboards/dm9records/tartan/keymaps/via/keymap.c
index 8c90d92776..e98b8385c9 100644
--- a/keyboards/dm9records/tartan/keymaps/via/keymap.c
+++ b/keyboards/dm9records/tartan/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_60_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_INS, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_INS, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______
diff --git a/keyboards/do60/keymaps/crd/keymap.c b/keyboards/do60/keymaps/crd/keymap.c
index aaec5c2f78..d1108ea2cf 100644
--- a/keyboards/do60/keymaps/crd/keymap.c
+++ b/keyboards/do60/keymaps/crd/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FL] = LAYOUT_60_ansi_split_bs_rshift(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
 		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
 		_______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
 		_______, _______, _______,                            _______,                            _______, _______, _______, _______
 	),
diff --git a/keyboards/do60/keymaps/default/keymap.c b/keyboards/do60/keymaps/default/keymap.c
index 50f086b8b6..671d6d29a3 100644
--- a/keyboards/do60/keymaps/default/keymap.c
+++ b/keyboards/do60/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   [1] = LAYOUT_all(
       QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_NO,    KC_NO,
-      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,          KC_DEL,
+      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,          KC_DEL,
       KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DEC, KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
diff --git a/keyboards/do60/keymaps/test/keymap.c b/keyboards/do60/keymaps/test/keymap.c
index dd4f76ac8e..6cb1e97083 100644
--- a/keyboards/do60/keymaps/test/keymap.c
+++ b/keyboards/do60/keymaps/test/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   [1] = LAYOUT_all(
       QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_NO,    KC_NO,
-      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,          KC_DEL,
+      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,          KC_DEL,
       KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
diff --git a/keyboards/do60/keymaps/via/keymap.c b/keyboards/do60/keymaps/via/keymap.c
index 1c21cdba33..28cf374ee7 100644
--- a/keyboards/do60/keymaps/via/keymap.c
+++ b/keyboards/do60/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   [1] = LAYOUT_all(
       QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_NO,    KC_NO,
-      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,          KC_DEL,
+      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,          KC_DEL,
       KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DEC, KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
diff --git a/keyboards/donutcables/budget96/keymaps/default/keymap.c b/keyboards/donutcables/budget96/keymaps/default/keymap.c
index f48d8f9be4..5fa73defa3 100644
--- a/keyboards/donutcables/budget96/keymaps/default/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_PSCR, KC_NLCK, KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
+      KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
       KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_END,  KC_PGDN, KC_PSLS, KC_PAST,
       KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
       KC_CAPS,  KC_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,
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
index cc31110f56..ed69b5e562 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* (2) Fn 1 */
     [_FN1] = LAYOUT_96_ansi(
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, TG(1), KC_PGUP, KC_VOLD, KC_MUTE, KC_VOLU, 
-	ALT0, KC_TRNS, KC_TRNS, ALT1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ALT2, KC_TRNS, KC_TRNS, KC_NLCK, KC_TRNS, KC_TRNS, 
+	ALT0, KC_TRNS, KC_TRNS, ALT1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ALT2, KC_TRNS, KC_TRNS, KC_NUM, KC_TRNS, KC_TRNS, 
 	KC_TRNS, CD, KC_TRNS, KC_TRNS, KC_TRNS, ALT3, KC_TRNS, KC_TRNS, KC_TRNS, ALT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 	KC_TRNS, AES, xkcd, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 	KC_CAPS, KC_TRNS, X, KC_TRNS, img, B, KC_TRNS, ALT7, ALT5, ALT6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/donutcables/budget96/keymaps/via/keymap.c b/keyboards/donutcables/budget96/keymaps/via/keymap.c
index 79bb438e73..4761131459 100644
--- a/keyboards/donutcables/budget96/keymaps/via/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_PSCR, KC_NLCK, KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
+      KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
       KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_END,  KC_PGDN, KC_PSLS, KC_PAST,
       KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
       KC_CAPS,  KC_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,
diff --git a/keyboards/doro67/multi/keymaps/konstantin/keymap.c b/keyboards/doro67/multi/keymaps/konstantin/keymap.c
index 2b1f06d0fb..54f5ba09e6 100644
--- a/keyboards/doro67/multi/keymaps/konstantin/keymap.c
+++ b/keyboards/doro67/multi/keymaps/konstantin/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴──────────┴────┴────────┴────┴────┘ └───┴───┴───┘
      */
     [L_FN] = LAYOUT_multi(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  NUMPAD,  KC_SLCK, KC_PAUS,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  NUMPAD,  KC_SCRL, KC_PAUS,
         KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            KC_INS,
         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______,          _______,          TOP,
         _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, BOTTOM,
diff --git a/keyboards/dp60/keymaps/via/keymap.c b/keyboards/dp60/keymaps/via/keymap.c
index f1cb53e9f7..538a27886f 100644
--- a/keyboards/dp60/keymaps/via/keymap.c
+++ b/keyboards/dp60/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
       KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_DEL,
-      QK_BOOT,   _______,KC_UP,_______,_______,_______,_______,_______,KC_PAUS,KC_SLCK,KC_PSCR,KC_PGUP,_______,KC_INS,
+      QK_BOOT,   _______,KC_UP,_______,_______,_______,_______,_______,KC_PAUS,KC_SCRL,KC_PSCR,KC_PGUP,_______,KC_INS,
       _______,        KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______, _______,_______,KC_HOME,KC_END,_______, _______,
       _______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN,_______,_______,
       _______,_______,_______,                        _______,                        _______,MO(2),TG(0),_______),
diff --git a/keyboards/draytronics/scarlet/keymaps/default/keymap.c b/keyboards/draytronics/scarlet/keymaps/default/keymap.c
index 950ec61729..0020b286ef 100644
--- a/keyboards/draytronics/scarlet/keymaps/default/keymap.c
+++ b/keyboards/draytronics/scarlet/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_5x4(
-      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      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,
diff --git a/keyboards/draytronics/scarlet/keymaps/via/keymap.c b/keyboards/draytronics/scarlet/keymaps/via/keymap.c
index 86169ff30b..0b5cee6b3a 100644
--- a/keyboards/draytronics/scarlet/keymaps/via/keymap.c
+++ b/keyboards/draytronics/scarlet/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_5x4(
-      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      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,
diff --git a/keyboards/dtisaac/cg108/keymaps/default/keymap.c b/keyboards/dtisaac/cg108/keymaps/default/keymap.c
index b7658315c5..dbd9b3e4eb 100644
--- a/keyboards/dtisaac/cg108/keymaps/default/keymap.c
+++ b/keyboards/dtisaac/cg108/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 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_SLCK, KC_PAUS,     KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,     KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 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_PPLS,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                       KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/dtisaac/dtisaac01/keymaps/default/keymap.c b/keyboards/dtisaac/dtisaac01/keymaps/default/keymap.c
index 56004946d5..52cf6ef97c 100644
--- a/keyboards/dtisaac/dtisaac01/keymaps/default/keymap.c
+++ b/keyboards/dtisaac/dtisaac01/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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,
diff --git a/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c b/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
index c2f637fa7b..c8996b7bf1 100644
--- a/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
+++ b/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
index dfd733357d..251a95f8db 100644
--- a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
+++ b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_viper( \
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  \
-    KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          KC_BSPC, \
+    KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,          KC_BSPC, \
     _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,                   KC_ENT,  \
     _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN,          KC_DOWN, _______, _______, \
              _______, _______,                                     _______,                                     _______, _______           \
diff --git a/keyboards/duck/jetfire/keymaps/default/keymap.c b/keyboards/duck/jetfire/keymaps/default/keymap.c
index 05ffa7a930..0ea1d2256f 100644
--- a/keyboards/duck/jetfire/keymaps/default/keymap.c
+++ b/keyboards/duck/jetfire/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // layer 0: qwerty
   [0] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4, KC_F5, KC_F6,  KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,  KC_5,  KC_6,   KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4, KC_F5, KC_F6,  KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_PGUP,
+    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,  KC_5,  KC_6,   KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,  KC_T,  KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,  KC_G,  KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/duck/lightsaver/keymaps/default/keymap.c b/keyboards/duck/lightsaver/keymaps/default/keymap.c
index 61a90fe603..7831aae5a1 100644
--- a/keyboards/duck/lightsaver/keymaps/default/keymap.c
+++ b/keyboards/duck/lightsaver/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum custom_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT(
-      KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
+      KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
       KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_DEL,  KC_END,  KC_PGDN, KC_PAST,
       KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
       MO(FN),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL,  KC_LGUI, KC_LALT,                                              KC_SPC,                    KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT),
 
 [FN] = LAYOUT(
-      _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_SLCK, RGB_TOG, RGB_MOD, _______, _______,
+      _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_SCRL, RGB_TOG, RGB_MOD, _______, _______,
       _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_CAPS, BL_TOGG, _______, _______, _______,
       _______,  _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, _______,          _______, _______, _______, _______, _______,
       _______,  _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,                   _______, _______, _______, _______, _______,
diff --git a/keyboards/duck/orion/v3/keymaps/default/keymap.c b/keyboards/duck/orion/v3/keymaps/default/keymap.c
index 34ce1aaf9f..0e1279d473 100644
--- a/keyboards/duck/orion/v3/keymaps/default/keymap.c
+++ b/keyboards/duck/orion/v3/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK,KC_PAUS, 
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_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,                          
diff --git a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
index 3f03525e17..2b43b42fad 100644
--- a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //       2        3        4        5        6        7        8        9        10       11       12       13       14
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,           KC_ENT,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,           KC_ENT,
     _______,          _______, KC_APP,  _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______,
     _______, KC_APP,  MO(_CLR),                           _______,                            _______, KC_APP,  _______, _______
   ),
diff --git a/keyboards/ducky/one2mini/keymaps/default/keymap.c b/keyboards/ducky/one2mini/keymaps/default/keymap.c
index d8bc5bbe24..be11dbc456 100644
--- a/keyboards/ducky/one2mini/keymaps/default/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //       2        3        4        5        6        7        8        9        10       11       12       13       14
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,  _______, KC_ENT,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,  _______, KC_ENT,
     _______, _______, _______, KC_APP,  _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______,
     _______, _______, MO(_CLR),                           KC_MPLY,                            _______, KC_APP,  _______, _______
   ),
diff --git a/keyboards/ducky/one2mini/keymaps/iso/keymap.c b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
index 1929b86c1e..e34178283b 100644
--- a/keyboards/ducky/one2mini/keymaps/iso/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //       2        3        4        5        6        7        8        9        10       11       12       13       14
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,  _______, KC_ENT,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,  _______, KC_ENT,
     _______, _______, _______, KC_APP,  _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______,
     _______, KC_APP,  MO(_CLR),                           _______,                            _______, KC_APP,  _______, _______
   ),
diff --git a/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c b/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
index 2806a31740..334c72596a 100644
--- a/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
+++ b/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     \-----------------------------------------------------'
     */
     [1] = LAYOUT(
-                    _______,     _______,     _______,      KC_NLCK,
+                    _______,     _______,     _______,      KC_NUM,
                     _______,     _______,     _______,      KC_KP_MINUS,
                     _______,     _______,     _______,      KC_KP_SLASH,
         KC_MUTE,    _______,     _______,     _______,      KC_KP_EQUAL
diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
index 70e31cc5d0..6c986333fc 100644
--- a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT_75_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_SLCK", "KC_DEL",
+      "KC_ESC",   "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_PSCR", "KC_SCRL", "KC_DEL",
       "KC_GRV",   "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",             "KC_BSPC", "KC_HOME", 
       "KC_TAB",   "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC",            "KC_BSLS", "KC_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", 
diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
index 5e472baad1..b90b858e0a 100644
--- a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT_75_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_SLCK", "KC_DEL",
+      "KC_ESC",   "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_PSCR", "KC_SCRL", "KC_DEL",
       "KC_GRV",   "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",             "KC_BSPC", "KC_HOME", 
       "KC_TAB",   "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC",            "KC_BSLS", "KC_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", 
diff --git a/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
index 4794aa7d9f..81edb22343 100644
--- a/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
@@ -12,7 +12,7 @@
     ],
     [
       "KC_GRV",  "KC_F1",   "KC_F2",   "KC_F3",    "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SLCK", "KC_PAUS", "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_PSCR", "KC_SCRL", "KC_PAUS", "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_INS",  "KC_END",             "KC_TRNS", "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TGUI", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
diff --git a/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
index f1ed0ecef6..44c56568a8 100644
--- a/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
@@ -12,7 +12,7 @@
     ],
     [
       "KC_GRV",  "KC_F1",   "KC_F2",   "KC_F3",    "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SLCK", "KC_PAUS", "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_PSCR", "KC_SCRL", "KC_PAUS", "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_INS",  "KC_END",             "KC_TRNS", "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TGUI", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
diff --git a/keyboards/durgod/k310/keymaps/chimera/keymap.c b/keyboards/durgod/k310/keymaps/chimera/keymap.c
index 5fa0d5eb4c..9a1a5eb766 100644
--- a/keyboards/durgod/k310/keymaps/chimera/keymap.c
+++ b/keyboards/durgod/k310/keymaps/chimera/keymap.c
@@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
    */
     [_WBL] = LAYOUT_all( /* Windows Base Layer */
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [_MBL] = LAYOUT_all( /* Mac Base Layer */
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_F13,  KC_F14,  KC_F15,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/durgod/k310/keymaps/default/keymap.json b/keyboards/durgod/k310/keymaps/default/keymap.json
index bd017f0e9d..41cf2f7bf4 100644
--- a/keyboards/durgod/k310/keymaps/default/keymap.json
+++ b/keyboards/durgod/k310/keymaps/default/keymap.json
@@ -4,8 +4,8 @@
   "layout": "LAYOUT_all",
   "layers": [
     [
-      "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",     "KC_PSCR", "KC_SLCK", "KC_PAUS",
-      "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",    "KC_NLCK", "KC_PSLS", "KC_PAST", "KC_PMNS",
+      "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",     "KC_PSCR", "KC_SCRL", "KC_PAUS",
+      "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",    "KC_NUM",  "KC_PSLS", "KC_PAST", "KC_PMNS",
       "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS",    "KC_DEL",  "KC_END",  "KC_PGDN",    "KC_P7",   "KC_P8",   "KC_P9",   "KC_PPLS",
       "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",                                         "KC_P4",   "KC_P5",   "KC_P6",
       "KC_LSFT", "KC_NUBS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",               "KC_UP",                 "KC_P1",   "KC_P2",   "KC_P3",   "KC_PENT",
diff --git a/keyboards/durgod/k310/keymaps/default_mac/keymap.json b/keyboards/durgod/k310/keymaps/default_mac/keymap.json
index 26f8aea7f1..46566af9eb 100644
--- a/keyboards/durgod/k310/keymaps/default_mac/keymap.json
+++ b/keyboards/durgod/k310/keymaps/default_mac/keymap.json
@@ -5,7 +5,7 @@
   "layers": [
     [
       "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",     "KC_F13",  "KC_F14",  "KC_F15",
-      "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",    "KC_NLCK", "KC_PSLS", "KC_PAST", "KC_PMNS",
+      "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",    "KC_NUM",  "KC_PSLS", "KC_PAST", "KC_PMNS",
       "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS",    "KC_DEL",  "KC_END",  "KC_PGDN",    "KC_P7",   "KC_P8",   "KC_P9",   "KC_PPLS",
       "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",                                         "KC_P4",   "KC_P5",   "KC_P6",
       "KC_LSFT", "KC_NUBS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",               "KC_UP",                 "KC_P1",   "KC_P2",   "KC_P3",   "KC_PENT",
diff --git a/keyboards/durgod/k310/keymaps/typhon/keymap.c b/keyboards/durgod/k310/keymaps/typhon/keymap.c
index 21daf5687a..865f6c5412 100644
--- a/keyboards/durgod/k310/keymaps/typhon/keymap.c
+++ b/keyboards/durgod/k310/keymaps/typhon/keymap.c
@@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
    */
     [_WBL] = LAYOUT_all( /* Windows Base Layer */
-        KC_ESC,           KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4,    KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4,    KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [_MBL] = LAYOUT_all( /* Mac Base Layer */
         KC_ESC,           KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4,    KC_F13,  KC_F14,  KC_F15,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/durgod/k310/keymaps/via/keymap.c b/keyboards/durgod/k310/keymaps/via/keymap.c
index 169ee2b586..ad7b61dfe4 100644
--- a/keyboards/durgod/k310/keymaps/via/keymap.c
+++ b/keyboards/durgod/k310/keymaps/via/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
    */
   [_BASE] = LAYOUT_all( /* Base Layer */
-      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
-      KC_GRV,  KC_1,    KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
       KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/durgod/k320/keymaps/default/keymap.json b/keyboards/durgod/k320/keymaps/default/keymap.json
index 3dab704bcd..697e7ceaba 100644
--- a/keyboards/durgod/k320/keymaps/default/keymap.json
+++ b/keyboards/durgod/k320/keymaps/default/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT_all",
   "layers": [
     [
-      "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",     "KC_PSCR", "KC_SLCK", "KC_PAUS",
+      "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",     "KC_PSCR", "KC_SCRL", "KC_PAUS",
       "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",
       "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS",    "KC_DEL",  "KC_END",  "KC_PGDN",
       "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
index 866e522fc9..ff339dcb54 100644
--- a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
+++ b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
@@ -104,7 +104,7 @@ const uint32_t PROGMEM unicode_map[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL] = LAYOUT_tkl_ansi( /* Base Layer */
-      KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_SLCK,  KC_PAUS,
+      KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_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,
diff --git a/keyboards/durgod/k320/keymaps/moults31/keymap.c b/keyboards/durgod/k320/keymaps/moults31/keymap.c
index c44fe15855..cdda3964e8 100644
--- a/keyboards/durgod/k320/keymaps/moults31/keymap.c
+++ b/keyboards/durgod/k320/keymaps/moults31/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'   `-------------'
    */
   [_BASE] = LAYOUT_tkl_ansi( /* Base Layer */
-      KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_SLCK,  KC_PAUS,
+      KC_ESC,   KC_F1,    KC_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,
diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c
index 993cbd8c22..5035e8f6fd 100644
--- a/keyboards/durgod/k320/keymaps/via/keymap.c
+++ b/keyboards/durgod/k320/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
    */
   [_BASE] = LAYOUT_all( /* Base Layer */
-      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/dyz/dyz_tkl/keymaps/default/keymap.c b/keyboards/dyz/dyz_tkl/keymaps/default/keymap.c
index 56aae4be16..8ca1de5699 100644
--- a/keyboards/dyz/dyz_tkl/keymaps/default/keymap.c
+++ b/keyboards/dyz/dyz_tkl/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR,   KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR,   KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSLS,    KC_INSERT, KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_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_ENT,
diff --git a/keyboards/dyz/dyz_tkl/keymaps/via/keymap.c b/keyboards/dyz/dyz_tkl/keymaps/via/keymap.c
index 56aae4be16..8ca1de5699 100644
--- a/keyboards/dyz/dyz_tkl/keymaps/via/keymap.c
+++ b/keyboards/dyz/dyz_tkl/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR,   KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR,   KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSLS,    KC_INSERT, KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_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_ENT,
diff --git a/keyboards/dz60/keymaps/256k_HHKB/keymap.c b/keyboards/dz60/keymaps/256k_HHKB/keymap.c
index c670e06c6f..051437792e 100644
--- a/keyboards/dz60/keymaps/256k_HHKB/keymap.c
+++ b/keyboards/dz60/keymaps/256k_HHKB/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_FN] = LAYOUT_60_hhkb(
 		______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_INS,  ______,
-		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS,  KC_UP,   ______,  KC_DEL,
+		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS,  KC_UP,   ______,  KC_DEL,
 		______,           KC_VOLD, KC_VOLU, KC_MUTE, ______,  ______,  KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT,  KC_RGHT, ______,
 		______,           KC_MPRV, KC_MPLY, KC_MNXT, ______,  ______,  KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,           ______,  ______,
 		         ______,           ______,                    ______,                                      ______,            ______),
diff --git a/keyboards/dz60/keymaps/60_ansi/keymap.c b/keyboards/dz60/keymaps/60_ansi/keymap.c
index b4ba50c034..89286bd6b2 100644
--- a/keyboards/dz60/keymaps/60_ansi/keymap.c
+++ b/keyboards/dz60/keymaps/60_ansi/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
diff --git a/keyboards/dz60/keymaps/60_tsangan/keymap.c b/keyboards/dz60/keymaps/60_tsangan/keymap.c
index e03123e5c9..113e1007dd 100644
--- a/keyboards/dz60/keymaps/60_tsangan/keymap.c
+++ b/keyboards/dz60/keymaps/60_tsangan/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_FL] = LAYOUT_60_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_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		_______,          _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		_______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
 		_______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______, _______,
 		_______, _______,          _______,                   _______,                                     _______,          MO(_CL), _______
diff --git a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c b/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
index 763fed6d26..6111166eea 100644
--- a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
+++ b/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [FCTN] = LAYOUT_bonfire(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-        _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
         _______, KC_SLEP, KC_WAKE, _______, _______, _______,  _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______, _______, _______, MO(KEYB), _______, _______
diff --git a/keyboards/dz60/keymaps/atlacat/keymap.c b/keyboards/dz60/keymaps/atlacat/keymap.c
index 1141a002cb..fd596570fe 100644
--- a/keyboards/dz60/keymaps/atlacat/keymap.c
+++ b/keyboards/dz60/keymaps/atlacat/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     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_SLCK, KC_PAUSE,_______, _______, _______,
+        _______,          _______,  KC_UP,  _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE,_______, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_INS , KC_HOME, KC_PGUP, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,  KC_END, KC_PGDN, _______,          _______,
         _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
diff --git a/keyboards/dz60/keymaps/coppertop/keymap.c b/keyboards/dz60/keymaps/coppertop/keymap.c
index e3895b28de..85336e4f9d 100644
--- a/keyboards/dz60/keymaps/coppertop/keymap.c
+++ b/keyboards/dz60/keymaps/coppertop/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_directional(
         XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_INS,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAD,
-        KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLCK, KC_PAUS, KC_PSCR,
+        KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PAUS, KC_PSCR,
         _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, KC_PGUP, BL_INC,  KC_PGDN,
         _______, _______, _______, XXXXXXX, _______,  XXXXXXX,  XXXXXXX, XXXXXXX, BL_TOGG, BL_DEC,  BL_STEP
         ),
diff --git a/keyboards/dz60/keymaps/crd_ansi/keymap.c b/keyboards/dz60/keymaps/crd_ansi/keymap.c
index cc2864d700..7bf564eecb 100644
--- a/keyboards/dz60/keymaps/crd_ansi/keymap.c
+++ b/keyboards/dz60/keymaps/crd_ansi/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FL] = LAYOUT_60_ansi(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
 		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______,          _______,                   _______,                            _______, _______, _______, _______
 	)
diff --git a/keyboards/dz60/keymaps/crd_tsangan/keymap.c b/keyboards/dz60/keymaps/crd_tsangan/keymap.c
index 7703a139c3..7f0c9f4425 100644
--- a/keyboards/dz60/keymaps/crd_tsangan/keymap.c
+++ b/keyboards/dz60/keymaps/crd_tsangan/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FL] = LAYOUT_60_tsangan_hhkb(
 		_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT,
 		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, KC_DEL,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______,                            _______,                            _______, _______, _______
 	)
diff --git a/keyboards/dz60/keymaps/dbroqua/keymap.c b/keyboards/dz60/keymaps/dbroqua/keymap.c
index 0b4deae51e..5cb1e46ad5 100644
--- a/keyboards/dz60/keymaps/dbroqua/keymap.c
+++ b/keyboards/dz60/keymaps/dbroqua/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT_true_hhkb( /* Layer 1 */
       TG(_SFX),KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL, \
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  ______, ______,  \
+      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,  \
       ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,   \
       ______,  ______,  KC_MPRV, KC_MPLY, KC_MNXT,______, ______, KC_PPLS,  KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,______, ______,  \
                ______,  ______,                   ______,                            KC_MSTP, ______ \
diff --git a/keyboards/dz60/keymaps/gk64/keymap.c b/keyboards/dz60/keymaps/gk64/keymap.c
index 0d732f3784..9d16714cb7 100644
--- a/keyboards/dz60/keymaps/gk64/keymap.c
+++ b/keyboards/dz60/keymaps/gk64/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/dz60/keymaps/iso_de_root/keymap.c b/keyboards/dz60/keymaps/iso_de_root/keymap.c
index c7e78bf876..961c1be428 100644
--- a/keyboards/dz60/keymaps/iso_de_root/keymap.c
+++ b/keyboards/dz60/keymaps/iso_de_root/keymap.c
@@ -102,8 +102,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [FN1] = LAYOUT_60_iso_5x1u_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,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(NUM), XXXXXXX, XXXXXXX, KC_INS,  KC_DEL,  KC_NLCK, XXXXXXX,
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS,
+    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(NUM), XXXXXXX, XXXXXXX, KC_INS,  KC_DEL,  KC_NUM,  XXXXXXX,
     _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_RSFT, XXXXXXX,
     _______, _______, _______,                            KC_LCTL,                   _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
   ),
diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
index 89cc8354c0..a790f6d3ad 100644
--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -156,12 +156,12 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
     case NL:
         if (!host_keyboard_led_state().num_lock) {
-             tap_code16(KC_NLCK);
+             tap_code16(KC_NUM_LOCK);
         }
         break;
     default: //  for any other layers, or the default layer
         if (host_keyboard_led_state().num_lock) {
-             tap_code16(KC_NLCK);
+             tap_code16(KC_NUM_LOCK);
         }
         break;
     }
diff --git a/keyboards/dz60/keymaps/itsaferbie/keymap.c b/keyboards/dz60/keymaps/itsaferbie/keymap.c
index 500d7a6221..94c42ddac3 100644
--- a/keyboards/dz60/keymaps/itsaferbie/keymap.c
+++ b/keyboards/dz60/keymaps/itsaferbie/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_FN] = LAYOUT_60_hhkb(
 		______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_INS,  KC_DEL,
-		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS,  KC_UP,   ______,  QK_BOOT,
+		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS,  KC_UP,   ______,  QK_BOOT,
 		______,           KC_VOLD, KC_VOLU, KC_MUTE, ______,  ______,  KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT,  KC_RGHT, ______,
 		______,           KC_MPRV, KC_MPLY, KC_MNXT, ______,  ______,  KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,           ______,  ______,
 		         ______,           ______,                    ______,                                      ______,            ______),
diff --git a/keyboards/dz60/keymaps/jdelkins/keymap.c b/keyboards/dz60/keymaps/jdelkins/keymap.c
index d934804d98..4e80724159 100644
--- a/keyboards/dz60/keymaps/jdelkins/keymap.c
+++ b/keyboards/dz60/keymaps/jdelkins/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_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, KC_F13,
-            _______, _______, FW_WRD,  KB_EOL,  TG(_RPT), _______,  KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______,        MY_CALC,
+            _______, _______, FW_WRD,  KB_EOL,  TG(_RPT), _______,  KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SCRL, _______,        MY_CALC,
             KC_RCTL, KB_BOL,  _______, KC_PGDN, _______,  TD(TD_G), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,  _______,                 _______,
             _______, _______, KC_DEL,  _______, _______,  BK_WRD,   _______, _______, _______, _______, _______,  _______,                 KC_NO,
             KC_RCTL, MY_RGUI, MY_RALT,     _______,      _______,     _______,                         _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
             _______, _______, _______,  _______,     _______,     KC_KP_0,                                     KC_KP_DOT,   _______, _______, _______, _______
     ),
     [_ADJUST] = 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_SLCK, KC_F13,
+            KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_SCRL, KC_F13,
             _______, RGB_SPD,  RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_BRID, KC_BRIU,         KC_MUTE,
             KC_RCTL, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______,                  KC_MPLY,
             _______, RGB_TOG,  KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS,  _______, _______, _______, _______,                  _______,
diff --git a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c b/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
index f7daafbfce..7dfe7f4338 100644
--- a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
+++ b/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 	LAYOUT_60_hhkb(
 		KC_GRV, KC_F1,   KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,    KC_INS,   QK_BOOT,
-		RGB_TOG,         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR, KC_SLCK, KC_PAUS,  KC_UP,     _______,   KC_CLR,
+		RGB_TOG,         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR, KC_SCRL, KC_PAUS,  KC_UP,     _______,   KC_CLR,
 		KC_CAPS,         KC_VOLD, KC_VOLU,   KC_MUTE,  _______,  _______,  KC_PAST,  KC_PSLS,  KC_HOME, KC_PGUP, KC_LEFT,  KC_RIGHT,  KC_RETURN,
 		_______,         _______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,  KC_PGDN, KC_DOWN,  _______,   _______,
 		        _______,           _______,                    _______,                             KC_APP,            _______),
diff --git a/keyboards/dz60/keymaps/kream/keymap.c b/keyboards/dz60/keymaps/kream/keymap.c
index 2c74de482c..c2bb517115 100644
--- a/keyboards/dz60/keymaps/kream/keymap.c
+++ b/keyboards/dz60/keymaps/kream/keymap.c
@@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_PSCR, KC_GRV,  KC_TILD, _______,
         _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
-        _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
 };
diff --git a/keyboards/dz60/keymaps/krusli/keymap.c b/keyboards/dz60/keymaps/krusli/keymap.c
index e31f9a9f30..8c83836923 100644
--- a/keyboards/dz60/keymaps/krusli/keymap.c
+++ b/keyboards/dz60/keymaps/krusli/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		KC_GRV,  KC_F1,   KC_F2, 	 KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS, KC_DEL,
-		KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  _______, QK_BOOT,
+		KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  _______, QK_BOOT,
 		_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
 		_______, KC_NO, 	_______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/dz60/keymaps/macos_arrow/keymap.c b/keyboards/dz60/keymaps/macos_arrow/keymap.c
index 89feb20045..2b2ccee567 100644
--- a/keyboards/dz60/keymaps/macos_arrow/keymap.c
+++ b/keyboards/dz60/keymaps/macos_arrow/keymap.c
@@ -78,7 +78,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case BR_UP:
       // Clear the RGUI modifier placed by LM for _ML layer as brightness don't
       // work with modifiers.
-      key = (keycode == BR_DOWN) ? KC_SLCK : KC_PAUS;
+      key = (keycode == BR_DOWN) ? KC_SCRL : KC_PAUS;
       if (record->event.pressed) {
           unregister_mods(MOD_RGUI);
           add_key(key);
diff --git a/keyboards/dz60/keymaps/marianas/keymap.c b/keyboards/dz60/keymaps/marianas/keymap.c
index e1dc4c9901..8474ab1be3 100644
--- a/keyboards/dz60/keymaps/marianas/keymap.c
+++ b/keyboards/dz60/keymaps/marianas/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [FN_LAYER]=
     LAYOUT_60_ansi(
       KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-      KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, LWIN(KC_R), ____, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_BRK, ____,
+      KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, LWIN(KC_R), ____, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_BRK, ____,
       ____, KC_VOLD, KC_MUTE, KC_VOLU, ____, ____, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, KC_DEL, ____,
       ____, RGB_HUI, RGB_SAI, RGB_SAD, ____,  ____, KC_END, QWRTY, GAME, NAVS, ____, ____,
       ____, ____, ____, _________________, ____, KC_HYPR, KC_MEH, QK_BOOT)
diff --git a/keyboards/dz60/keymaps/mpstewart/keymap.c b/keyboards/dz60/keymaps/mpstewart/keymap.c
index 3a84f51830..95bd226187 100644
--- a/keyboards/dz60/keymaps/mpstewart/keymap.c
+++ b/keyboards/dz60/keymaps/mpstewart/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FN] = LAYOUT_60_ansi_split_bs_rshift(
  //    _0       _1       _2       _3       _4        _5       _6       _7       _8       _9       _A       _B       _C       _D         _E
 /*0_*/ KC_SLEP, KC_F1,   KC_F2  , KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,    KC_DEL,
-/*1_*/ KC_CAPS,          KC_BRID,  KC_BRIU,  KC_NO,    QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_NO,     KC_NO,
+/*1_*/ KC_CAPS,          KC_BRID,  KC_BRIU,  KC_NO,    QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_NO,     KC_NO,
 /*2_*/ KC_NO,            KC_VOLD,  KC_VOLU,  KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_RGHT, KC_RETURN,
 /*3_*/ KC_LSPO,          KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_PGDN, KC_DOWN,          KC_RSPC,   KC_TRNS,
 /*4_*/ KC_LCTL, KC_LALT,          KC_LGUI,                    KC_SPC,                             KC_RGUI, KC_RALT,          KC_APP,    AG_TOGG
diff --git a/keyboards/dz60/keymaps/muralisc/keymap.c b/keyboards/dz60/keymaps/muralisc/keymap.c
index 2cd9df89a5..a000195be3 100644
--- a/keyboards/dz60/keymaps/muralisc/keymap.c
+++ b/keyboards/dz60/keymaps/muralisc/keymap.c
@@ -58,14 +58,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_END , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_END , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_HOME, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS),
 
 	LAYOUT_60_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
diff --git a/keyboards/dz60/keymaps/pok3r/keymap.c b/keyboards/dz60/keymaps/pok3r/keymap.c
index bd627a9bbb..2db8318003 100644
--- a/keyboards/dz60/keymaps/pok3r/keymap.c
+++ b/keyboards/dz60/keymaps/pok3r/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-		_______, KC_MPRV, KC_MPLY, KC_MNXT, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+		_______, KC_MPRV, KC_MPLY, KC_MNXT, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
 		KC_CAPS, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_DEL, _______,
 		_______, KC_APP, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/dz60/keymaps/spotpuff/keymap.c b/keyboards/dz60/keymaps/spotpuff/keymap.c
index 6a921b8307..0042965085 100644
--- a/keyboards/dz60/keymaps/spotpuff/keymap.c
+++ b/keyboards/dz60/keymaps/spotpuff/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_directional( 
         XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_INS,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAD,
-        KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLCK, KC_PAUS, KC_PSCR,
+        KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PAUS, KC_PSCR,
         _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, XXXXXXX, BL_INC,  XXXXXXX,
         _______, _______, _______, XXXXXXX, _______,  XXXXXXX,  XXXXXXX, XXXXXXX, BL_TOGG, BL_DEC,  BL_STEP
         ),
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_MEDIA] = LAYOUT_directional(
-		XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXXX, _______, _______,
+		XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,  XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXXX, _______, _______,
 		XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX, QK_BOOT,
 		_______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, XXXXXXX, _______,
 		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/dz60/keymaps/tailcall/keymap.c b/keyboards/dz60/keymaps/tailcall/keymap.c
index cc71a604c7..e95c520cc5 100644
--- a/keyboards/dz60/keymaps/tailcall/keymap.c
+++ b/keyboards/dz60/keymaps/tailcall/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT(
         KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_DEL ,
-        _______,          KC_HOME, KC_UP  , KC_END , KC_PGUP, KC_INS , KC_PSCR, KC_SLCK, RGB_VAD, _______, _______, _______, _______, _______,
+        _______,          KC_HOME, KC_UP  , KC_END , KC_PGUP, KC_INS , KC_PSCR, KC_SCRL, RGB_VAD, _______, _______, _______, _______, _______,
         KC_CAPS,          KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DEL , _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          _______,
         _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
diff --git a/keyboards/dz60/keymaps/tarnjotsingh/keymap.c b/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
index a6de97fdba..b679de8dd3 100644
--- a/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
+++ b/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
@@ -2,6 +2,6 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_iso(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LALT, KC_RCTL),
-	[1] = LAYOUT_60_iso(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_MUTE, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS),
+	[1] = LAYOUT_60_iso(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_MUTE, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS),
 	[2] = LAYOUT_60_iso(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/dz60/keymaps/tarnjotsingh/layers.json b/keyboards/dz60/keymaps/tarnjotsingh/layers.json
index 7fec50a1d0..3599fc570c 100644
--- a/keyboards/dz60/keymaps/tarnjotsingh/layers.json
+++ b/keyboards/dz60/keymaps/tarnjotsingh/layers.json
@@ -1 +1 @@
-[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "MO(1)", "KC_RGUI", "KC_LALT", "KC_RCTL"], ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_TRNS", "KC_MUTE", "KC_VOLU", "KC_MPLY", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MRWD", "KC_MFFD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGDN", "KC_HOME", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(2)", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUI", "RGB_HUD", "RGB_SAI", "RGB_SAD", "RGB_VAI", "RGB_VAD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DEC", "BL_TOGG", "BL_INC", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]]
\ No newline at end of file
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "MO(1)", "KC_RGUI", "KC_LALT", "KC_RCTL"], ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_TRNS", "KC_MUTE", "KC_VOLU", "KC_MPLY", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MRWD", "KC_MFFD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGDN", "KC_HOME", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(2)", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUI", "RGB_HUD", "RGB_SAI", "RGB_SAD", "RGB_VAI", "RGB_VAD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DEC", "BL_TOGG", "BL_INC", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]]
\ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
index 0e95592234..1df1b35804 100644
--- a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
         _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
         _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
         _______,          KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
index 233e031282..a86db3ea65 100644
--- a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_MEDIA] = LAYOUT(
         TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PWR,
-        _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
index 713251af85..9497129104 100644
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRAVE,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, _______,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            KC_SPC,                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
index 3552864e8c..1ebbad37d7 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
@@ -46,8 +46,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _V_V_V_,                   _______,                   _______, _______,          _______, _______, _______  \
 	),
 	[_NAV] = LAYOUT(
-		KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PMNS, KC_PPLS, KC_DEL,  \
-		_______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS, KC_PSCR, KC_SLCK, KC_INS,  \
+		KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PMNS, KC_PPLS, KC_DEL,  \
+		_______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS, KC_PSCR, KC_SCRL, KC_INS,  \
 		_V_V_V_, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, KC_PENT,          \
 		_______, _______, _______, _______, _______, _______, KC_P0,   KC_P0,   KC_P0,   KC_PDOT, _______,          _______, _______, \
 		_______, _______, _______,                   _______,                   _______, _______,          _______, _______, _______  \
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index ff140341cb..2d77c87fb3 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                KC_RGUI,  MO(1)  , KC_LEFT,         KC_DOWN,           KC_RGHT),
 	[_LAYER1] = LAYOUT( /* FN */
 		TO(3),    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LGUI(LSFT(KC_5)),   KC_SLCK,  KC_PAUS,  _______,  _______,   QK_BOOT,
+		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LGUI(LSFT(KC_5)),   KC_SCRL,  KC_PAUS,  _______,  _______,   QK_BOOT,
 		_______,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_EJCT,  _______,  KC_ASTR,  KC_PSLS,  KC_HOME,  KC_PGUP,  _______,  _______,  _______,  _______,
 		_______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  MO(5),              KC_MPLY,            _______,
 		_______,  _______,  _______,                      TO(4),                        _______,  _______, KC_MPRV,   KC_MSTP,            KC_MFFD),
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,    RGB_VAD,  RGB_VAI,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    RGB_MOD,                _______,
 		_______,    _______,  _______,                          _______,                            _______,    _______,    RGB_SPD,    RGB_RMOD,               RGB_SPI),
 	[_LAYER3] = LAYOUT( /* NUMPAD */
-		KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,      _______,    _______,    _______,    _______,    KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,  _______,
+		KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,      _______,    _______,    _______,    _______,    KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,  _______,
 		_______,    KC_P7,    KC_P8,    KC_P9,    _______,    _______,    _______,    _______,    KC_P7,    KC_P8,    KC_P9,    _______,    _______,    TO(0),
 		_______,    KC_P4,    KC_P5,    KC_P6,    _______,    _______,    _______,    _______,    KC_P4,    KC_P5,    KC_P6,    _______,              KC_PENT,
 		_______,    KC_P1,    KC_P2,    KC_P3,    _______,    _______,    _______,    _______,    KC_P1,    KC_P2,    KC_P3,    _______,              _______,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,  MO(5)  , KC_LEFT,         KC_DOWN,           KC_RIGHT),
 	[_LAYER5] = LAYOUT( /* FN */
 		_______,  KC_BRID,  KC_BRIU, LCTL(KC_UP), LSFT(KC_F12),     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
-		_______,  _______,  KC_UP,    _______,  _______,  _______,  KC_CALC,  _______,  KC_INS,   _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT,
+		_______,  _______,  KC_UP,    _______,  _______,  _______,  KC_CALC,  _______,  KC_INS,   _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
 		_______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,            _______,
 		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN, KC_VOLU,           KC_MUTE,
 		_______,  _______,  _______,                      TO(0),                        _______,  _______,  KC_MPRV,  KC_VOLD,            KC_MNXT),
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
index 841617e2c9..6727e4de49 100644
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                FNM,     KC_RALT,  KC_LEFT,    KC_DOWN,           KC_RIGHT),
 	[_FNM] = LAYOUT( /* FN */
 		KC_TRNS,  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,    KC_F6,    KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,
-		KC_TRNS,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI,  RGB_SAD,  RGB_VAI, RGB_VAD,  KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,
+		KC_TRNS,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI,  RGB_SAD,  RGB_VAI, RGB_VAD,  KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,
 		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, RGB_SPI,  RGB_SPD, KC_HOME, KC_PGUP,    EEP_RST,
 		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_END,  KC_PGDN, KC_VOLU,    KC_MUTE,
 		KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,                     KC_TRNS,  KC_TRNS, KC_MPRV, KC_VOLD,    KC_MNXT)
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
index 4b4a4e2877..dc0d318172 100644
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______,  _______,                            RGB_RST,                   _______, _______,  KC_PWR,   AMDREC,  AMDREP
     ),
     [_NUM] = LAYOUT(
-        KC_NLCK, _______,  _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,    _______,  _______, _______,
+        KC_NUM,  _______,  _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,    _______,  _______, _______,
         _______, _______,  _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,    _______,  _______, _______,
         _______, _______,  _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,    KC_PENT,           KC_PENT,
         _______,           _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT,  TG(_NUM), _______, _______,
diff --git a/keyboards/dztech/dz60rgb/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
index cd58713fae..fe037ce955 100644
--- a/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
         _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
         _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
         _______,          KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
index 25b6e4f472..d62ff6240d 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 							KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2,KC_DEL),
 							KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 	[_LAYER1] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 							 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST,
 							 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
index f38b6aa0fc..5bef7af7da 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi(
         KC_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_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
index 7c6dd50447..7f3b24de74 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
         _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [4] = LAYOUT_60_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
         _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            TO(0)  ,                            _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
index 2c0300fe52..af2d9fa3dc 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [1] = LAYOUT_60_ansi(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
         _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [3] = LAYOUT_60_ansi(
         _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, TO(0),
+        _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, TO(0),
         _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______,
         _______,          _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______,          KC_UP,
         _______, _______, _______,                            _______,                            _______, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
index 39cebac9fc..cd4129d5bb 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi(
         KC_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_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
index 7edfc1bdbf..e2856101b9 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
index 8fe1c06792..0549320f44 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_tsangan_hhkb(
         KC_PWR,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,       KC_PENT,
         KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,  KC_END, KC_PGDN, KC_DOWN,       KC_TRNS, KC_TRNS,
         _______,    KC_TRNS, KC_TRNS,                   KC_TRNS,                         KC_TRNS, KC_TRNS, _______
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c
index a4406b3819..58cf36f786 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/dztech/dz64rgb/keymaps/default/keymap.c b/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
index 94b3664f25..22bd186281 100644
--- a/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_64_ansi(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT_64_ansi(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
         _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
         _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
         _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
diff --git a/keyboards/dztech/dz64rgb/keymaps/via/keymap.c b/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
index 94b3664f25..22bd186281 100644
--- a/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_64_ansi(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT_64_ansi(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
         _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
         _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
         _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
diff --git a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
index 2dd25c170c..fde62bee3d 100644
--- a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS,         RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
         LCTL_T(KC_CAPS), RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_PGDN,
-        KC_LSFT,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_VOLU, KC_MUTE,
+        KC_LSFT,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_VOLU, KC_MUTE,
         KC_TRNS,         KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
     )
 
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 2b45528208..3c3dd87adc 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_65_ansi(
         KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR,
-        KC_TAB, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_INS, KC_SLCK,
+        KC_TAB, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_INS, KC_SCRL,
         KC_APP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PAUS,
         KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2,
         KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, TO(_INDEX), KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
index 38c6b578a3..64c23f19c1 100644
--- a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
         CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______,        _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c b/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
index 4980bad134..f41d871a59 100644
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_65_ansi(
         XXXXXXX,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-        XXXXXXX,        KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, KC_PSTE,
+        XXXXXXX,        KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, KC_PSTE,
         CTL_T(KC_CAPS), KC_BRID, KC_VOLD, KC_BRIU, XXXXXXX, XXXXXXX, TG(_AD), TG(_VI), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, KC_COPY,
         KC_LSFT,                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, KC_MSTP, KC_CUT,
         KC_LCTL,        KC_LGUI, KC_LALT,                            XXXXXXX,                   MO(_KB), XXXXXXX, KC_RCTL, KC_MPRV, KC_MPLY, KC_MNXT
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index c6d42c777e..95a08eb560 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______,  _V_V_V_,                   _______,                            _______, _______,  _______,  _______, _______, _______  \
 	),
 	[_NAV]    = LAYOUT_65_ansi(
-		KC_NLCK, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,   KC_PAST,  KC_PMNS,  KC_PPLS, _______, _______, \
-		_______, KC_PGUP,  KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS,  KC_PSCR,  KC_SLCK, KC_INS,  KC_PMNS, \
+		KC_NUM,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,   KC_PAST,  KC_PMNS,  KC_PPLS, _______, _______, \
+		_______, KC_PGUP,  KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS,  KC_PSCR,  KC_SCRL, KC_INS,  KC_PMNS, \
 		_V_V_V_, KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______,  _______,           KC_PENT, KC_PPLS, \
 		_______, _______,  _______, _______, _______, _______, KC_P0,   KC_P0,   KC_P0,   KC_PDOT, KC_PSLS,  _______,           _______, _______, \
 		_______, _______,  _______,                   _______,                            _______, _______,  _______,  _______, _______, _______  \
diff --git a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
index 2e24c370f1..1f641efd10 100644
--- a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FL] = LAYOUT_65_ansi(
         KC_ESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SLCK, KC_PAUS, QK_BOOT, _______,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SCRL, KC_PAUS, QK_BOOT, _______,
         _______,        RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
         _______,        _______, _______,                            KC_MPLY,                   _______, _______, _______, KC_HOME, KC_VOLD, KC_END
diff --git a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c b/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
index 511193e2b6..07337b2a58 100644
--- a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GRV,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SLCK, KC_PAUS, QK_BOOT, KC_PGUP,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP,
         CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______,        _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
index fff65fa824..cf985c22c2 100644
--- a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
         CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______,        _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/dztech/dz96/keymaps/default/keymap.c b/keyboards/dztech/dz96/keymaps/default/keymap.c
index 7596614456..76cf9b07e9 100644
--- a/keyboards/dztech/dz96/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz96/keymaps/default/keymap.c
@@ -20,8 +20,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_default(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SCRL, KC_PAUS, KC_PGUP, KC_PGDN,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,     KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,          KC_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,
diff --git a/keyboards/dztech/dz96/keymaps/iso/keymap.c b/keyboards/dztech/dz96/keymaps/iso/keymap.c
index b74e7033aa..6e48367574 100644
--- a/keyboards/dztech/dz96/keymaps/iso/keymap.c
+++ b/keyboards/dztech/dz96/keymaps/iso/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_iso(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_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_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/dztech/dz96/keymaps/via/keymap.c b/keyboards/dztech/dz96/keymaps/via/keymap.c
index ab2c89b599..75bc8fa208 100644
--- a/keyboards/dztech/dz96/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz96/keymaps/via/keymap.c
@@ -20,8 +20,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_default(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SCRL, KC_PAUS, KC_PGUP, KC_PGDN,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,     KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,          KC_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,
diff --git a/keyboards/dztech/endless80/keymaps/default/keymap.c b/keyboards/dztech/endless80/keymaps/default/keymap.c
index e3a5258665..8b962b6b83 100644
--- a/keyboards/dztech/endless80/keymaps/default/keymap.c
+++ b/keyboards/dztech/endless80/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all( /* Layer Zero */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS, 
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS, 
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP, 
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_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,                                      
diff --git a/keyboards/dztech/endless80/keymaps/via/keymap.c b/keyboards/dztech/endless80/keymaps/via/keymap.c
index 8140d7c1fb..90e787b6bd 100644
--- a/keyboards/dztech/endless80/keymaps/via/keymap.c
+++ b/keyboards/dztech/endless80/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all( /* Layer Zero */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS, 
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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,                                      
diff --git a/keyboards/e88/keymaps/default/keymap.c b/keyboards/e88/keymaps/default/keymap.c
index 1d62bb96d5..3a4a82f4a5 100644
--- a/keyboards/e88/keymaps/default/keymap.c
+++ b/keyboards/e88/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = 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_LGUI,    KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_LGUI,    KC_PSCR,  KC_SCRL,  KC_PAUS,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,    KC_DEL,   KC_END,   KC_PGDN,
     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_BSLS,            KC_ENT,
diff --git a/keyboards/e88/keymaps/via/keymap.c b/keyboards/e88/keymaps/via/keymap.c
index 572c616792..499335d48c 100644
--- a/keyboards/e88/keymaps/via/keymap.c
+++ b/keyboards/e88/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
-    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_LGUI,    KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_LGUI,    KC_PSCR,  KC_SCRL,  KC_PAUS,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,    KC_DEL,   KC_END,   KC_PGDN,
     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_BSLS,            KC_ENT,
diff --git a/keyboards/ealdin/quadrant/keymaps/default/keymap.c b/keyboards/ealdin/quadrant/keymaps/default/keymap.c
index 8461e31981..dfa9732b17 100644
--- a/keyboards/ealdin/quadrant/keymaps/default/keymap.c
+++ b/keyboards/ealdin/quadrant/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
-    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK
+    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL
   ),
 
   [2] = LAYOUT_ortho_5x14(
diff --git a/keyboards/ealdin/quadrant/keymaps/via/keymap.c b/keyboards/ealdin/quadrant/keymaps/via/keymap.c
index 97c2ab36d0..915e934568 100644
--- a/keyboards/ealdin/quadrant/keymaps/via/keymap.c
+++ b/keyboards/ealdin/quadrant/keymaps/via/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,
-    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_SLCK
+    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_SCRL
     ),
 
   [2] = LAYOUT_ortho_5x14(
diff --git a/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
index 04296c7489..ce7a84f90e 100644
--- a/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_1800_ansi_6u(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
diff --git a/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
index 8ef51f7ff7..18d3bc8dfb 100644
--- a/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_1800_ansi_7u(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
diff --git a/keyboards/ebastler/e80_1800/keymaps/default/keymap.c b/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
index dc048713b8..47fe2310e0 100644
--- a/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_1800_all(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
diff --git a/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
index 89a55648b7..5412c4c874 100644
--- a/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_1800_iso_6u(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                                   KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
diff --git a/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
index c08cb590f4..3e854d59f6 100644
--- a/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_1800_iso_7u(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                                   KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
diff --git a/keyboards/ebastler/e80_1800/keymaps/via/keymap.c b/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
index 8e52573b66..d1e922206b 100644
--- a/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_1800_all(    /* keymap for layer 0 */
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                               KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                          KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                          KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                           KC_KP_4, KC_KP_5, KC_KP_6, 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_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
diff --git a/keyboards/eco/keymaps/bcat/keymap.c b/keyboards/eco/keymaps/bcat/keymap.c
index e3345a677a..b4344e3bb0 100644
--- a/keyboards/eco/keymaps/bcat/keymap.c
+++ b/keyboards/eco/keymaps/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER_LOWER] = LAYOUT(
         MC_ALTT,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
         KY_CSPC,  KY_ZMRST, KY_ZMOUT, KY_ZMIN,  KC_WBAK,  KC_WFWD,  _______,  _______,  KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_TILD,
-        _______,  KC_APP,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_LGUI,  _______,  _______,  KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
+        _______,  KC_APP,   KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_LGUI,  _______,  _______,  KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
     /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/308a8be75e0b85902dc18db1b2546862 */
diff --git a/keyboards/eco/keymaps/fsck/keymap.c b/keyboards/eco/keymaps/fsck/keymap.c
index 8d7cb89c17..52b5c2d3b0 100644
--- a/keyboards/eco/keymaps/fsck/keymap.c
+++ b/keyboards/eco/keymaps/fsck/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT(
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
   _______, _______, KC_UP,   _______, _______, _______, _______, KC_PSCR, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______,
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS
 )
 };
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
index adbbbb772c..57cee64884 100644
--- a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
+++ b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_SET] = LAYOUT_ortho_4x16(
-  _______,   KC_CAPS,   KC_SLCK,   KC_NLCK,   _______,   _______,   _______,   RGB_TOG,   RGB_MOD,   RGB_RMOD,  RGB_M_P,   _______,   _______,   _______, _______,  _______,
+  _______,   KC_CAPS,   KC_SCRL,   KC_NUM,    _______,   _______,   _______,   RGB_TOG,   RGB_MOD,   RGB_RMOD,  RGB_M_P,   _______,   _______,   _______, _______,  _______,
   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_HUI,   RGB_SAI,   RGB_VAI,   RGB_M_SW,  _______,   _______,   _______, _______,  _______,
   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_HUD,   RGB_SAD,   RGB_VAD,   RGB_M_K,   _______,   QK_BOOT,     _______, _______,  _______, 
   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______, _______,  _______
diff --git a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
index fc14d26cdb..d52275fec2 100644
--- a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
+++ b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_SET] = LAYOUT_ortho_4x16(
-  _______, KC_CAPS, KC_SLCK, KC_NLCK, VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
+  _______, KC_CAPS, KC_SCRL, KC_NUM,  VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, QK_BOOT,   _______, _______, _______, 
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
index 6bf375c47c..84760dd219 100644
--- a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
+++ b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_SET] = LAYOUT_ortho_4x16(
-  _______, KC_CAPS, KC_SLCK, KC_NLCK, VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
+  _______, KC_CAPS, KC_SCRL, KC_NUM,  VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, QK_BOOT, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, _______, _______, _______, _______, 
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/edi/standaside/keymaps/default/keymap.c b/keyboards/edi/standaside/keymaps/default/keymap.c
index 575994e055..d18606b94b 100644
--- a/keyboards/edi/standaside/keymaps/default/keymap.c
+++ b/keyboards/edi/standaside/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, KC_INS,  _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_END,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_NLCK, _______, _______, _______
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_NUM,  _______, _______, _______
   ),
 
 /* LOWER
diff --git a/keyboards/ein_60/keymaps/klackygears/keymap.c b/keyboards/ein_60/keymaps/klackygears/keymap.c
index be3c30b97d..345b420c6f 100644
--- a/keyboards/ein_60/keymaps/klackygears/keymap.c
+++ b/keyboards/ein_60/keymaps/klackygears/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _________________PUNC_L1_ALT_______________,    _______,  _________________PUNC_R1___________________, _______,
       _______, _________________PUNC_L3___________________,              _________________PUNC_R2___________________, _______,
       RGB_MOD, _________________PUNC_L3_ALT_______________,              _________________PUNC_R3___________________, _______,
-      _______, _______, KC_NLCK, KC_SLCK, KC_DEL,  _______,    _______,  _______, KC_CAPS, _______, _______, _______, _______
+      _______, _______, KC_NUM, KC_SCRL, KC_DEL,  _______,    _______,  _______, KC_CAPS, _______, _______, _______, _______
     ),
 
     [_FUNC] = LAYOUT_wrapper(
diff --git a/keyboards/ekow/akira/keymaps/default/keymap.c b/keyboards/ekow/akira/keymaps/default/keymap.c
index 672516840d..168efa2e3e 100644
--- a/keyboards/ekow/akira/keymaps/default/keymap.c
+++ b/keyboards/ekow/akira/keymaps/default/keymap.c
@@ -21,5 +21,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_hhkb(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, KC_RALT),
 
     // Fn1 Layer
-    [1] = LAYOUT_60_hhkb(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [1] = LAYOUT_60_hhkb(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/ekow/akira/keymaps/via/keymap.c b/keyboards/ekow/akira/keymaps/via/keymap.c
index e7c70a6f9e..77dc6b44ae 100644
--- a/keyboards/ekow/akira/keymaps/via/keymap.c
+++ b/keyboards/ekow/akira/keymaps/via/keymap.c
@@ -21,6 +21,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_hhkb(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, KC_RALT),
 
     // Fn1 Layer
-    [1] = LAYOUT_60_hhkb(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-    [2] = LAYOUT_60_hhkb(XXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+    [1] = LAYOUT_60_hhkb(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [2] = LAYOUT_60_hhkb(XXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/emi20/keymaps/default/keymap.c b/keyboards/emi20/keymaps/default/keymap.c
index e92bd61cb7..d22d37d703 100644
--- a/keyboards/emi20/keymaps/default/keymap.c
+++ b/keyboards/emi20/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_TRNS,    KC_NLCK,    KC_NO,      KC_NO),
+		KC_TRNS,    KC_NUM,     KC_NO,      KC_NO),
 		//Copy any layer and edit it for more layers, be sure to add a key to go to that layer
 };
 
diff --git a/keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c b/keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c
index 563bb818a8..d313005f5c 100644
--- a/keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c
+++ b/keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c b/keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c
index 1a69d05023..3433a5077f 100644
--- a/keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c
+++ b/keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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_TRNS, 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,
diff --git a/keyboards/ep/96/keymaps/default/keymap.c b/keyboards/ep/96/keymaps/default/keymap.c
index 8794fb9f51..c5d35ac70f 100644
--- a/keyboards/ep/96/keymaps/default/keymap.c
+++ b/keyboards/ep/96/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
     KC_ESC,  KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10, KC_F11,  KC_F12, KC_PSCR, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,   KC_MINS, KC_EQL,          KC_BSPC,   KC_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_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, KC_UP,    KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/ep/comsn/mollydooker/keymaps/default/keymap.c b/keyboards/ep/comsn/mollydooker/keymaps/default/keymap.c
index 1858cedf77..8b41d62fe6 100644
--- a/keyboards/ep/comsn/mollydooker/keymaps/default/keymap.c
+++ b/keyboards/ep/comsn/mollydooker/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ extern rgblight_config_t rgblight_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */                                                                                                                                      
-    KC_NLCK, KC_PSLS, KC_PMNS, RGB_MOD, KC_ESC,   KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
+    KC_NUM,  KC_PSLS, KC_PMNS, RGB_MOD, KC_ESC,   KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
     KC_P4,   KC_P5,   KC_P6,            KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN, 
     KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LSFT,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, KC_UP,   KC_F5,  
diff --git a/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c b/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c
index 2e9da9b04a..1fdcc9d4db 100644
--- a/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c
+++ b/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
 
-    KC_ESC,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,   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, MO(1),      KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/epoch80/keymaps/default/keymap.c b/keyboards/epoch80/keymaps/default/keymap.c
index af1fb4600b..f718be0673 100644
--- a/keyboards/epoch80/keymaps/default/keymap.c
+++ b/keyboards/epoch80/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,  
diff --git a/keyboards/epoch80/keymaps/iso/keymap.c b/keyboards/epoch80/keymaps/iso/keymap.c
index 842551ac8d..77d71cbaf6 100644
--- a/keyboards/epoch80/keymaps/iso/keymap.c
+++ b/keyboards/epoch80/keymaps/iso/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  
diff --git a/keyboards/epoch80/keymaps/tsangan/keymap.c b/keyboards/epoch80/keymaps/tsangan/keymap.c
index f062e087ee..946474ea24 100644
--- a/keyboards/epoch80/keymaps/tsangan/keymap.c
+++ b/keyboards/epoch80/keymaps/tsangan/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_ansi_tsangan(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,  
diff --git a/keyboards/epoch80/keymaps/via/keymap.c b/keyboards/epoch80/keymaps/via/keymap.c
index 29876b585f..032ee3aaac 100644
--- a/keyboards/epoch80/keymaps/via/keymap.c
+++ b/keyboards/epoch80/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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,  
diff --git a/keyboards/epoch80/keymaps/wkl/keymap.c b/keyboards/epoch80/keymaps/wkl/keymap.c
index 7b9ee77f6d..d6c8cf19f7 100644
--- a/keyboards/epoch80/keymaps/wkl/keymap.c
+++ b/keyboards/epoch80/keymaps/wkl/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,  
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
index 91798ab188..86da382848 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
@@ -128,8 +128,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                    ___,
                                          ___, ___, ___,
     /* right hand */
-         ___,     ___,     ___,   ___,   ___,     ___,     KC_NLCK,
-         ___,     KC_PEQL, KC_P7, KC_P8, KC_P9,   KC_PMNS, KC_SLCK,
+         ___,     ___,     ___,   ___,   ___,     ___,     KC_NUM,
+         ___,     KC_PEQL, KC_P7, KC_P8, KC_P9,   KC_PMNS, KC_SCRL,
                   KC_PCMM, KC_P4, KC_P5, KC_P6,   KC_PPLS, ___,
          KC_PENT, KC_P0,   KC_P1, KC_P2, KC_P3,   KC_PAST, ___,
                            ___,   ___,   ___,     KC_PSLS, ___,
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
index 40e67140ff..73532bb437 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
         //         LAYERS SWITCHER | APPLICATION MENU        |                         |                         |                        //
         //                         |                         |                         |                         |                  SCROLL //
-                 TG(LAYERS),                 KC_APP,                  KC_NLCK,                  KC_SLCK,                   KC_CAPS,        //
+                 TG(LAYERS),                 KC_APP,                  KC_NUM,                   KC_SCRL,                   KC_CAPS,        //
         //                         |                         |                         |                         |                  NUM    //
         //            LAYER TOGGLE |                         |                         |                         |       TAP DANCE: CAPS   //
          //------------------------+-------------------------+-------------------------+-------------------------+------------------------//
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX,           TG(LAYERS),  KC_COMM, KC_DOT, KC_LBRC,
 
         // left thumb
-                   MO(MEDIA_FN), KC_NLCK,
+                   MO(MEDIA_FN), KC_NUM,
                                  KC_SCLN,
          KC_SPACE, KC_ENTER,     KC_BSPC,
 
@@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LGUI(KC_C), XXXXXXX,       LCTL(KC_C), KC_UP,         SCTL(KC_C),    LCTL(KC_Z),     LGUI(KC_Z),
                     KC_MS_WH_LEFT, KC_LEFT,    KC_DOWN,       KC_RIGHT,      KC_MS_WH_RIGHT, KC_APPLICATION,
         LGUI(KC_V), XXXXXXX,       LCTL(KC_V), KC_MS_WH_DOWN, SCTL(KC_V),    LCTL(KC_Y),     SGUI(KC_Z),
-        XXXXXXX,    XXXXXXX,       XXXXXXX,    XXXXXXX,       KC_SLCK,
+        XXXXXXX,    XXXXXXX,       XXXXXXX,    XXXXXXX,       KC_SCRL,
 
         // right thumb
         XXXXXXX,   XXXXXXX,
@@ -200,7 +200,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LGUI(KC_Z),    LCTL(KC_Z),    SCTL(KC_C), KC_MS_UP,      LCTL(KC_C),  KC_MS_BTN4,     LGUI(KC_C),
         KC_MS_BTN3,    KC_MS_WH_LEFT, KC_MS_LEFT, KC_MS_DOWN,    KC_MS_RIGHT, KC_MS_WH_RIGHT,
         LGUI(KC_Z),    LCTL(KC_Y),    SCTL(KC_V), KC_MS_WH_DOWN, LCTL(KC_V),  KC_MS_BTN5,     LGUI(KC_V),
-        KC_SLCK,       XXXXXXX,       XXXXXXX,    XXXXXXX,       XXXXXXX,
+        KC_SCRL,       XXXXXXX,       XXXXXXX,    XXXXXXX,       XXXXXXX,
 
         // left thumb
                     XXXXXXX,    XXXXXXX,
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
index adff967ba6..0244ac0959 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
@@ -22,7 +22,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
             return true;
 
-        case KC_NLCK:
+        case KC_NUM_LOCK:
             if (record->event.pressed) {
                 if (!(NUM_LOCK)) {
                     ergodox_right_led_2_on();
@@ -35,7 +35,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
             return true;
 
-        case KC_SLCK:
+        case KC_SCROLL_LOCK:
             if (record->event.pressed) {
                 if (!(SCROLL_LOCK)) {
                     ergodox_right_led_3_on();
diff --git a/keyboards/ergodox_ez/keymaps/kou/keymap.c b/keyboards/ergodox_ez/keymaps/kou/keymap.c
index 01427c2d2d..b938b5f168 100644
--- a/keyboards/ergodox_ez/keymaps/kou/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/kou/keymap.c
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     KC_TRNS,
                                   KC_TRNS, KC_TRNS, KC_TRNS,
        // right hand
-       KC_TRNS,  KC_TRNS, KC_NLCK, KC_PAST, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_NUM,  KC_PAST, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_PPLS,  KC_TRNS,  KC_P7,   KC_P8,   KC_P9,   KC_TRNS, KC_TRNS,
                  KC_TRNS,  KC_P4,   KC_P5,   KC_P6,   KC_TRNS, KC_TRNS,
        KC_PMNS,  KC_TRNS,  KC_P1,   KC_P2,   KC_P3,   KC_PSLS, KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
index 26574313f6..1d1957ae90 100644
--- a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_PSCR,    KC_PGUP,  KC_PGDN,  KC_SPACE, KC_LSHIFT,  KC_INSERT,
 
     KC_F6,          KC_F7,            KC_F8,              KC_F9,              KC_F10,             KC_F11,         KC_F12,
-    KC_NO,          KC_HOME,          KC_TRANSPARENT,     KC_PSCR,            KC_SLCK,            KC_TRANSPARENT, KC_TRANSPARENT,
+    KC_NO,          KC_HOME,          KC_TRANSPARENT,     KC_PSCR,            KC_SCRL,            KC_TRANSPARENT, KC_TRANSPARENT,
                     KC_LEFT,          KC_DOWN,            KC_UP,              KC_RIGHT,           KC_TRANSPARENT, KC_TRANSPARENT,
     MEH_T(KC_NO),   KC_CALCULATOR,    KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT, KC_RSHIFT,
                                       KC_DELETE,          KC_INSERT,          KC_TRANSPARENT,     KC_F19,         KC_RCTL,
diff --git a/keyboards/ergodox_ez/keymaps/rishka/keymap.c b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
index c39c0c476b..e689ae80b8 100644
--- a/keyboards/ergodox_ez/keymaps/rishka/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [SYMB] = LAYOUT_ergodox_pretty_wrapper(
-VRSN,    ______________________F_L__________________, KC_F11,       KC_F12 , ______________________F_R__________________, KC_NLCK,
+VRSN,    ______________________F_L__________________, KC_F11,       KC_F12 , ______________________F_R__________________, KC_NUM,
 _______, _________________SYMBOL_L1_________________, _______,      _______, _________________SYMBOL_R1_________________, _______,
 _______, _________________SYMBOL_L2_________________,                        _________________SYMBOL_R2_________________, _______,
 _______, _________________SYMBOL_L3_________________, _______,      _______, _________________SYMBOL_R3_________________, _______,
diff --git a/keyboards/evil80/keymaps/default/keymap.c b/keyboards/evil80/keymaps/default/keymap.c
index 8deb3d4a7e..23ed2badac 100644
--- a/keyboards/evil80/keymaps/default/keymap.c
+++ b/keyboards/evil80/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: Winkey */
     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_SLCK,KC_PAUS,
+        KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,     KC_PSCR,KC_SCRL,KC_PAUS,
         KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,      KC_INS,KC_HOME,KC_PGUP,
         KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,      KC_DEL, KC_END,KC_PGDN,
        KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,KC_NUHS, KC_ENT,
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	   ),
     /* 1: Winkeyless */
     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_SLCK,KC_PAUS,
+        KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,     KC_PSCR,KC_SCRL,KC_PAUS,
         KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,      KC_INS,KC_HOME,KC_PGUP,
         KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,      KC_DEL, KC_END,KC_PGDN,
        KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,KC_NUHS, KC_ENT,
diff --git a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
index 06203112c0..528b868196 100644
--- a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL,		KC_LGUI,	KC_LALT,	TG(_L3),	KC_SPC, 				KC_SPC,					MO(_L2),	KC_RALT,	KC_APP,					KC_RCTRL),
  
 [_L2] = LAYOUT_split_space(
-  _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	QK_BOOT,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SLCK,	KC_PAUS,
+  _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	QK_BOOT,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SCRL,	KC_PAUS,
   KC_CAPS,		KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	_______,	KC_HOME,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_INS,					_______,
   _______,		_______,	_______,	_______,	_______,	_______,	_______,	BL_TOGG,	BL_DEC,		BL_INC,		_______,				_______,
   _______,		_______,	_______,	_______,	_______, 				_______,				_______,	_______,	_______,				_______),
diff --git a/keyboards/evyd13/atom47/keymaps/default/keymap.c b/keyboards/evyd13/atom47/keymaps/default/keymap.c
index 28107106b5..b642d12610 100644
--- a/keyboards/evyd13/atom47/keymaps/default/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL,  KC_LGUI,  KC_LALT,  MO(_PN),            KC_SPC,             KC_SPC,             MO(_FN),  KC_RALT,  KC_APP,   KC_RCTRL),
  
 [_FN] = LAYOUT_split_space(
-  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SLCK,  KC_PAUS,
+  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,
   KC_CAPS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,  _______,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_INS,             _______,
   _______,            _______,  _______,  _______,  _______,  _______,  _______,  BL_TOGG,  BL_DEC,   BL_INC,   _______,  _______,
   _______,  _______,  _______,  _______,            _______,            _______,            _______,  _______,  _______,  _______),
diff --git a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c b/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
index 6ccf1ba9e8..4be4776f15 100644
--- a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Secondary symbol layer, also Lower
 	[_LOWER] = LAYOUT_split_space(
-	  KC_TILD, 		_______,	_______,	_______,	_______,	_______,	_______, 	KC_AMPR, 	KC_ASTR, 	KC_LPRN, 	KC_RPRN,	KC_SLCK,	KC_PAUS,	
+	  KC_TILD, 		_______,	_______,	_______,	_______,	_______,	_______, 	KC_AMPR, 	KC_ASTR, 	KC_LPRN, 	KC_RPRN,	KC_SCRL,	KC_PAUS,	
 	  KC_CAPS,		KC_F1,   	KC_F2,   	KC_F3,   	KC_F4,   	KC_F5,   	KC_F6,		KC_DLR,  	KC_PERC, 	KC_CIRC, 	KC_UNDS, 				KC_PIPE,	
 	  _______,					KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  	KC_F11,  	KC_F12,		KC_EXLM, 	KC_AT,   	KC_HASH, 	KC_PLUS,	_______,	
 	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	KC_VOLD, 	KC_VOLU, 	KC_MPLY
diff --git a/keyboards/evyd13/atom47/keymaps/via/keymap.c b/keyboards/evyd13/atom47/keymaps/via/keymap.c
index 19d1f8f9c5..fbf9ea68df 100644
--- a/keyboards/evyd13/atom47/keymaps/via/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL,  KC_LGUI,  KC_LALT,  MO(3),              KC_SPC,             KC_SPC,             MO(1),    KC_RALT,  KC_APP,   KC_RCTRL),
  
 [1] = LAYOUT_split_space(
-  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SLCK,  KC_PAUS,
+  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,
   KC_CAPS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,  _______,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_INS,             _______,
   _______,            _______,  _______,  _______,  _______,  _______,  _______,  BL_TOGG,  BL_DEC,   BL_INC,   _______,  _______,
   _______,  _______,  _______,  _______,            _______,            _______,            _______,  _______,  _______,  _______),
diff --git a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c b/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
index 091b0749a9..0cd82063d6 100644
--- a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
+++ b/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */ 
      [1] = LAYOUT_65_ansi_blocker(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
                                   KC_BRIU, KC_TRNS, KC_TRNS, KC_END, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_EJCT, KC_TRNS,
-							      KC_BRID, KC_TRNS, KC_SLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS,
-							      KC_VOLU, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_NLCK, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS,
+							      KC_BRID, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS,
+							      KC_VOLU, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_NUM, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS,
 							      KC_VOLD, KC_MRWD, KC_MFFD, KC_MPLY, KC_MSTP, KC_NO, KC_MPRV, KC_NO, KC_MNXT
      )
 };
diff --git a/keyboards/evyd13/eon87/keymaps/default/keymap.c b/keyboards/evyd13/eon87/keymaps/default/keymap.c
index c4ba5a86bb..d3b14b88a2 100644
--- a/keyboards/evyd13/eon87/keymaps/default/keymap.c
+++ b/keyboards/evyd13/eon87/keymaps/default/keymap.c
@@ -25,7 +25,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = 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_SLCK,  KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,               KC_PSCR,  KC_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_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_BSLS,            KC_ENT,
diff --git a/keyboards/evyd13/eon87/keymaps/via/keymap.c b/keyboards/evyd13/eon87/keymaps/via/keymap.c
index 1a6839fb98..e170cb7eda 100644
--- a/keyboards/evyd13/eon87/keymaps/via/keymap.c
+++ b/keyboards/evyd13/eon87/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
-    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,               KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,               KC_PSCR,  KC_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_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_BSLS,            KC_ENT,
diff --git a/keyboards/evyd13/eon95/keymaps/default/keymap.c b/keyboards/evyd13/eon95/keymaps/default/keymap.c
index 1ed71b0d7d..2ac385027e 100644
--- a/keyboards/evyd13/eon95/keymaps/default/keymap.c
+++ b/keyboards/evyd13/eon95/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,         KC_DEL,  KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,       KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,         KC_DEL,  KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,       KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,             KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/evyd13/eon95/keymaps/via/keymap.c b/keyboards/evyd13/eon95/keymaps/via/keymap.c
index fce29ecf7d..f46e33399f 100644
--- a/keyboards/evyd13/eon95/keymaps/via/keymap.c
+++ b/keyboards/evyd13/eon95/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,         KC_DEL,  KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,       KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,         KC_DEL,  KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,       KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,             KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/evyd13/gh80_1800/keymaps/default/keymap.c b/keyboards/evyd13/gh80_1800/keymaps/default/keymap.c
index bbd8784137..cd22f7bf56 100644
--- a/keyboards/evyd13/gh80_1800/keymaps/default/keymap.c
+++ b/keyboards/evyd13/gh80_1800/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,                       KC_INS,  KC_HOME,  KC_PGUP, KC_PSCR,
-                                                                                                                                                KC_DEL,  KC_END,   KC_PGDN, KC_SLCK,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,     KC_NLCK, KC_PSLS,  KC_PAST, KC_PAUS,
+                                                                                                                                                KC_DEL,  KC_END,   KC_PGDN, KC_SCRL,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,     KC_NUM,  KC_PSLS,  KC_PAST, KC_PAUS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_P7,   KC_P8,    KC_P9,   KC_PMNS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT, KC_BSLS, 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_PPLS,
diff --git a/keyboards/evyd13/gh80_1800/keymaps/via/keymap.c b/keyboards/evyd13/gh80_1800/keymaps/via/keymap.c
index 41795e1e05..d0cb349aa1 100644
--- a/keyboards/evyd13/gh80_1800/keymaps/via/keymap.c
+++ b/keyboards/evyd13/gh80_1800/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,                       KC_INS,  KC_HOME,  KC_PGUP, KC_PSCR,
-                                                                                                                                                KC_DEL,  KC_END,   KC_PGDN, KC_SLCK,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,     KC_NLCK, KC_PSLS,  KC_PAST, KC_PAUS,
+                                                                                                                                                KC_DEL,  KC_END,   KC_PGDN, KC_SCRL,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,     KC_NUM,  KC_PSLS,  KC_PAST, KC_PAUS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_P7,   KC_P8,    KC_P9,   KC_PMNS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT, KC_BSLS, 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_PPLS,
diff --git a/keyboards/evyd13/gh80_3700/keymaps/default/keymap.c b/keyboards/evyd13/gh80_3700/keymaps/default/keymap.c
index 52dc482157..47fa582114 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/default/keymap.c
+++ b/keyboards/evyd13/gh80_3700/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_6x4(
   KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
-  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
   KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c b/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c
index 52dc482157..47fa582114 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c
+++ b/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_6x4(
   KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
-  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
   KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/keymap.c b/keyboards/evyd13/gh80_3700/keymaps/rgb/keymap.c
index 52dc482157..47fa582114 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/rgb/keymap.c
+++ b/keyboards/evyd13/gh80_3700/keymaps/rgb/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_6x4(
   KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
-  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
   KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/evyd13/gh80_3700/keymaps/via/keymap.c b/keyboards/evyd13/gh80_3700/keymaps/via/keymap.c
index aaf461e794..699b3498dc 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/via/keymap.c
+++ b/keyboards/evyd13/gh80_3700/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_6x4(
   KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
-  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
   KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/evyd13/mx5160/keymaps/default/keymap.c b/keyboards/evyd13/mx5160/keymaps/default/keymap.c
index f10f673b68..e7a2895008 100644
--- a/keyboards/evyd13/mx5160/keymaps/default/keymap.c
+++ b/keyboards/evyd13/mx5160/keymaps/default/keymap.c
@@ -25,7 +25,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = LAYOUT_all(
-    KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_8,     KC_9,      KC_0,      KC_MINS, KC_EQL,  _______, KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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_NUM,  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_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,     KC_L,      KC_SCLN,   KC_QUOT, _______,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     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_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/evyd13/nt750/keymaps/default/keymap.c b/keyboards/evyd13/nt750/keymaps/default/keymap.c
index 160b269651..b8091a6f8b 100644
--- a/keyboards/evyd13/nt750/keymaps/default/keymap.c
+++ b/keyboards/evyd13/nt750/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/evyd13/nt750/keymaps/via/keymap.c b/keyboards/evyd13/nt750/keymaps/via/keymap.c
index c42cc1e3fa..243056385b 100644
--- a/keyboards/evyd13/nt750/keymaps/via/keymap.c
+++ b/keyboards/evyd13/nt750/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/evyd13/nt980/keymaps/default/keymap.c b/keyboards/evyd13/nt980/keymaps/default/keymap.c
index 1aae16b7c6..b475ff8407 100644
--- a/keyboards/evyd13/nt980/keymaps/default/keymap.c
+++ b/keyboards/evyd13/nt980/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_INS,  KC_DEL,  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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_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_NUHS, KC_ENT,      KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,   KC_UP,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_all(
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,     _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, KC_APP,  _______,   _______, _______, _______,   _______, _______
diff --git a/keyboards/evyd13/nt980/keymaps/via/keymap.c b/keyboards/evyd13/nt980/keymaps/via/keymap.c
index 4000be9d04..80f5991116 100644
--- a/keyboards/evyd13/nt980/keymaps/via/keymap.c
+++ b/keyboards/evyd13/nt980/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_INS,  KC_DEL,  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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_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_NUHS, KC_ENT,      KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,   KC_UP,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT_all(
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,     _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, KC_APP,  _______,   _______, _______, _______,   _______, _______
diff --git a/keyboards/evyd13/omrontkl/keymaps/default/keymap.c b/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
index c532d60ae6..9612f973c6 100644
--- a/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
+++ b/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
@@ -25,7 +25,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = 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_SLCK,  KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,               KC_PSCR,  KC_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_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_BSLS,            KC_ENT,
diff --git a/keyboards/evyd13/quackfire/keymaps/default/keymap.c b/keyboards/evyd13/quackfire/keymaps/default/keymap.c
index e625ab99e3..f144ffdb5b 100644
--- a/keyboards/evyd13/quackfire/keymaps/default/keymap.c
+++ b/keyboards/evyd13/quackfire/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
      */
     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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/evyd13/quackfire/keymaps/via/keymap.c b/keyboards/evyd13/quackfire/keymaps/via/keymap.c
index a1c541b69b..04528cc963 100644
--- a/keyboards/evyd13/quackfire/keymaps/via/keymap.c
+++ b/keyboards/evyd13/quackfire/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/evyd13/wasdat/keymaps/default/keymap.c b/keyboards/evyd13/wasdat/keymaps/default/keymap.c
index f1b11e201f..cf85699a57 100644
--- a/keyboards/evyd13/wasdat/keymaps/default/keymap.c
+++ b/keyboards/evyd13/wasdat/keymaps/default/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
      */
     LAYOUT_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_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,
diff --git a/keyboards/evyd13/wasdat/keymaps/default_iso/keymap.c b/keyboards/evyd13/wasdat/keymaps/default_iso/keymap.c
index 6a470295bd..58b54142b6 100644
--- a/keyboards/evyd13/wasdat/keymaps/default_iso/keymap.c
+++ b/keyboards/evyd13/wasdat/keymaps/default_iso/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
      */
     LAYOUT_fullsize_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,              KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c b/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
index 481c5fd1fa..2c18d9c447 100644
--- a/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
+++ b/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
      */
     [L_BASE] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
         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_BSLS, KC_ENT,
diff --git a/keyboards/evyd13/wasdat/keymaps/via/keymap.c b/keyboards/evyd13/wasdat/keymaps/via/keymap.c
index f052de7d39..366747ab0c 100644
--- a/keyboards/evyd13/wasdat/keymaps/via/keymap.c
+++ b/keyboards/evyd13/wasdat/keymaps/via/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
      */
     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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,        KC_F12,      KC_PSCR, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,        KC_BSPC,     KC_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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                KC_RSFT,              KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c b/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c
index 4c95da563c..e10116f9a5 100644
--- a/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c
+++ b/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
      */
     LAYOUT_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_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,
diff --git a/keyboards/evyd13/wasdat_code/keymaps/default_iso/keymap.c b/keyboards/evyd13/wasdat_code/keymaps/default_iso/keymap.c
index 6a470295bd..58b54142b6 100644
--- a/keyboards/evyd13/wasdat_code/keymaps/default_iso/keymap.c
+++ b/keyboards/evyd13/wasdat_code/keymaps/default_iso/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
      */
     LAYOUT_fullsize_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,              KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c b/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c
index f632ab7fce..c39ab38008 100644
--- a/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c
+++ b/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c
@@ -17,9 +17,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,              KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/exclusive/e65/keymaps/crd/keymap.c b/keyboards/exclusive/e65/keymaps/crd/keymap.c
index 18b0920667..28fa2e79f1 100644
--- a/keyboards/exclusive/e65/keymaps/crd/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/crd/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FL] = LAYOUT_65_ansi_7u_wk_splitbs(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  _______,
-        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______,                   _______,                                     _______, _______, _______, _______),
diff --git a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
index bb2f2a030c..df98572daf 100644
--- a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
+++ b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FL] = LAYOUT_60_hhkb(
       TG(_CL),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_DEL,
+       _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_DEL,
        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          _______, _______,
                 _______, _______,                       _______,                        KC_MSTP, MO(_CL)
diff --git a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
index 274e7395f2..b206d52029 100644
--- a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
+++ b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
@@ -25,14 +25,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [_HLa] = LAYOUT_hhkb(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_CAPS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,    KC_LEFT,   KC_RGHT,      KC_TRNS,
         KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,   KC_PGDN, KC_DOWN, KC_TRNS,    KC_TRNS,
                  KC_TRNS, KC_TRNS,               KC_MPLY,                               KC_TRNS,  KC_TRNS
         ),
     [_HLb] = LAYOUT_hhkb(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_CAPS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,    KC_LEFT,   KC_RGHT,      KC_TRNS,
         KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,   KC_PGDN, KC_DOWN, KC_TRNS,    KC_TRNS,
                  KC_TRNS, KC_TRNS,               KC_MPLY,                               KC_TRNS,  KC_TRNS
diff --git a/keyboards/exclusive/e6v2/oe/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/oe/keymaps/default/keymap.c
index 016c3737d2..2818b692fb 100644
--- a/keyboards/exclusive/e6v2/oe/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e6v2/oe/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
   [1] = LAYOUT_60_ansi(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-      QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,   KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+      QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,   KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME,   KC_PGUP, KC_LEFT, KC_RGHT,      KC_TRNS,
       KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,   KC_END,  KC_PGDN, KC_DOWN, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY,                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/exclusive/e85/hotswap/keymaps/default/keymap.c b/keyboards/exclusive/e85/hotswap/keymaps/default/keymap.c
index 642c381138..0f6cc5273b 100644
--- a/keyboards/exclusive/e85/hotswap/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e85/hotswap/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     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,
diff --git a/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c b/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c
index fe17ab3292..da35823df2 100644
--- a/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c
+++ b/keyboards/exclusive/e85/hotswap/keymaps/standard/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi_standard(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     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,
diff --git a/keyboards/exclusive/e85/hotswap/keymaps/tsangan/keymap.c b/keyboards/exclusive/e85/hotswap/keymaps/tsangan/keymap.c
index 642c381138..0f6cc5273b 100644
--- a/keyboards/exclusive/e85/hotswap/keymaps/tsangan/keymap.c
+++ b/keyboards/exclusive/e85/hotswap/keymaps/tsangan/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     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,
diff --git a/keyboards/exclusive/e85/hotswap/keymaps/via/keymap.c b/keyboards/exclusive/e85/hotswap/keymaps/via/keymap.c
index 9892fc1c03..4b7cac0acb 100644
--- a/keyboards/exclusive/e85/hotswap/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e85/hotswap/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     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,
diff --git a/keyboards/exclusive/e85/soldered/keymaps/default/keymap.c b/keyboards/exclusive/e85/soldered/keymaps/default/keymap.c
index 642c381138..0f6cc5273b 100644
--- a/keyboards/exclusive/e85/soldered/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e85/soldered/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     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,
diff --git a/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c b/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c
index fe17ab3292..da35823df2 100644
--- a/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c
+++ b/keyboards/exclusive/e85/soldered/keymaps/standard/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi_standard(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     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,
diff --git a/keyboards/exclusive/e85/soldered/keymaps/via/keymap.c b/keyboards/exclusive/e85/soldered/keymaps/via/keymap.c
index 9892fc1c03..4b7cac0acb 100644
--- a/keyboards/exclusive/e85/soldered/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e85/soldered/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     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,
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
index 909c40ba5a..e550aed864 100644
--- a/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
+++ b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
@@ -57,6 +57,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
         KC_VOLD, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,  XXXXXXX, 
-        _______,                   KC_NLCK, XXXXXXX,                   XXXXXXX, XXXXXXX,                   XXXXXXX
+        _______,                   KC_NUM,  XXXXXXX,                   XXXXXXX, XXXXXXX,                   XXXXXXX
     ),
 };
diff --git a/keyboards/fc660c/keymaps/dbroqua/keymap.c b/keyboards/fc660c/keymaps/dbroqua/keymap.c
index 0c6931a3f2..c35b297eaa 100644
--- a/keyboards/fc660c/keymaps/dbroqua/keymap.c
+++ b/keyboards/fc660c/keymaps/dbroqua/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [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_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,     _______,
         _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     _______,
         _______,_______,_______,                _______,                _______,_______,MO(1),       _______,_______,_______
diff --git a/keyboards/fc660c/keymaps/default/keymap.c b/keyboards/fc660c/keymaps/default/keymap.c
index bf890c2c1d..d2d0893251 100644
--- a/keyboards/fc660c/keymaps/default/keymap.c
+++ b/keyboards/fc660c/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
   [1] = LAYOUT(
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     _______,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     _______,
         _______,_______,_______,                _______,                _______,_______,MO(1),       _______,_______,_______
diff --git a/keyboards/fc660c/keymaps/default_rgb/keymap.c b/keyboards/fc660c/keymaps/default_rgb/keymap.c
index 446c092c87..869a2eee48 100644
--- a/keyboards/fc660c/keymaps/default_rgb/keymap.c
+++ b/keyboards/fc660c/keymaps/default_rgb/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
   [1] = LAYOUT(
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     _______,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     KC_PGUP,
         _______,_______,_______,                _______,                _______,MO(2),  _______,     KC_HOME,KC_PGDN,KC_END
diff --git a/keyboards/fc660c/keymaps/mikefightsbears/keymap.c b/keyboards/fc660c/keymaps/mikefightsbears/keymap.c
index 2c4f0aa83c..23f650a11e 100644
--- a/keyboards/fc660c/keymaps/mikefightsbears/keymap.c
+++ b/keyboards/fc660c/keymaps/mikefightsbears/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
   [1] = LAYOUT(
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     _______,
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,KC_MUTE,KC_MPRV,KC_MNXT,KC_MPLY,_______,     KC_PGUP,
         _______,_______,_______,                _______,                _______,_______,_______,     KC_HOME,KC_PGDN,KC_END
diff --git a/keyboards/fc660c/keymaps/siroleo/keymap.c b/keyboards/fc660c/keymaps/siroleo/keymap.c
index 82b7f7b473..dd677e7c7d 100644
--- a/keyboards/fc660c/keymaps/siroleo/keymap.c
+++ b/keyboards/fc660c/keymaps/siroleo/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FNM] = LAYOUT(
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_MUTE,     KC_VOLU,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,  QK_BOOT,   KC_VOLD,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,  QK_BOOT,   KC_VOLD,
         _______,_______,_______, QWERTY,COLEMAK,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,KC_BTN1,     KC_MS_U,
         _______,_______,_______,                _______,               _______,_______,_______,       KC_MS_L,KC_MS_D,KC_MS_R
diff --git a/keyboards/fc660c/keymaps/via/keymap.c b/keyboards/fc660c/keymaps/via/keymap.c
index 6de89329e3..25ca316daa 100644
--- a/keyboards/fc660c/keymaps/via/keymap.c
+++ b/keyboards/fc660c/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
   [1] = LAYOUT(
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     _______,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     _______,
         _______,_______,_______,                _______,                _______,_______,_______,     _______,_______,_______
diff --git a/keyboards/fc660c/keymaps/via_rgb/keymap.c b/keyboards/fc660c/keymaps/via_rgb/keymap.c
index 50bf58ffcb..b12574384d 100644
--- a/keyboards/fc660c/keymaps/via_rgb/keymap.c
+++ b/keyboards/fc660c/keymaps/via_rgb/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
   [1] = LAYOUT(
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     _______,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     KC_PGUP,
         _______,_______,_______,                _______,                _______,MO(2),  _______,     KC_HOME,KC_PGDN,KC_END
diff --git a/keyboards/fc660c/keymaps/zyber/keymap.c b/keyboards/fc660c/keymaps/zyber/keymap.c
index 257a714d8c..60178359ef 100644
--- a/keyboards/fc660c/keymaps/zyber/keymap.c
+++ b/keyboards/fc660c/keymaps/zyber/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [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, _______,     C_BLK,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,     _______,
         _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
         _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     _______,
         _______,_______,_______,                _______,                _______,_______,MO(1),       _______,_______,_______
diff --git a/keyboards/fc980c/keymaps/actuation-point-example/keymap.c b/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
index 96393a4d76..85e782d625 100644
--- a/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
+++ b/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
@@ -28,7 +28,7 @@ enum custom_keycodes
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
         MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, AP_READ_RDAC, AP_READ_EEPROM, AP_DN, AP_UP, _______, _______, KC_HOME, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______,
+        KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______,
         _______, KC_MUTE, KC_VOLD, KC_MPLY, KC_PGDN, KC_DEL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, LCTL(KC_BSPC), LCTL(KC_DEL), _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
diff --git a/keyboards/fc980c/keymaps/coloneljesus/keymap.c b/keyboards/fc980c/keymaps/coloneljesus/keymap.c
index 664d146fa7..7299bdae41 100644
--- a/keyboards/fc980c/keymaps/coloneljesus/keymap.c
+++ b/keyboards/fc980c/keymaps/coloneljesus/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
         MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______,
+        KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______,
         _______, KC_MUTE, KC_VOLD, KC_MPLY, KC_PGDN, KC_DEL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, LCTL(KC_BSPC), LCTL(KC_DEL), _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
diff --git a/keyboards/fc980c/keymaps/default/keymap.c b/keyboards/fc980c/keymaps/default/keymap.c
index b3d86192d3..310e91b291 100644
--- a/keyboards/fc980c/keymaps/default/keymap.c
+++ b/keyboards/fc980c/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
diff --git a/keyboards/fc980c/keymaps/via/keymap.c b/keyboards/fc980c/keymaps/via/keymap.c
index f498cd43a0..193c5be394 100644
--- a/keyboards/fc980c/keymaps/via/keymap.c
+++ b/keyboards/fc980c/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
diff --git a/keyboards/feels/feels65/keymaps/default/keymap.c b/keyboards/feels/feels65/keymaps/default/keymap.c
index a54e904dde..4f79e8184b 100644
--- a/keyboards/feels/feels65/keymaps/default/keymap.c
+++ b/keyboards/feels/feels65/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL, KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
         QK_BOOT,   _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/feels/feels65/keymaps/via/keymap.c b/keyboards/feels/feels65/keymaps/via/keymap.c
index b740afb9c5..33ccabd099 100644
--- a/keyboards/feels/feels65/keymaps/via/keymap.c
+++ b/keyboards/feels/feels65/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
         QK_BOOT,   _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/fjlabs/ad65/keymaps/default/keymap.c b/keyboards/fjlabs/ad65/keymaps/default/keymap.c
index 48d86d3edf..c950e1480b 100644
--- a/keyboards/fjlabs/ad65/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/ad65/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                   KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/fjlabs/ad65/keymaps/via/keymap.c b/keyboards/fjlabs/ad65/keymaps/via/keymap.c
index d3385a81ce..11741e67bd 100644
--- a/keyboards/fjlabs/ad65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/ad65/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                   KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/fjlabs/avalon/keymaps/default/keymap.c b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
index b5e2b84480..5c3a765f85 100644
--- a/keyboards/fjlabs/avalon/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_TRNS, KC_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_DEL,  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_SLCK, KC_PAUS, QK_BOOT,   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_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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/fjlabs/avalon/keymaps/via/keymap.c b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
index 61aa6f155c..3b5d13ab4a 100644
--- a/keyboards/fjlabs/avalon/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_TRNS, KC_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_DEL,  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_SLCK, KC_PAUS, QK_BOOT,   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_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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/fjlabs/bks65/keymaps/default/keymap.c b/keyboards/fjlabs/bks65/keymaps/default/keymap.c
index 76cdcca6db..dfb0ca691e 100644
--- a/keyboards/fjlabs/bks65/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/bks65/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/fjlabs/bks65/keymaps/via/keymap.c b/keyboards/fjlabs/bks65/keymaps/via/keymap.c
index 39ac00f72e..f3cb7c9125 100644
--- a/keyboards/fjlabs/bks65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/bks65/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c b/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c
index f343c13238..a63001feea 100644
--- a/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, KC_HOME,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,            KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,            KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c b/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c
index 0dfc29af57..9dfa768c98 100644
--- a/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, KC_HOME,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,            KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,            KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/kf87/keymaps/default/keymap.c b/keyboards/fjlabs/kf87/keymaps/default/keymap.c
index 096b2452ed..f21f754a61 100644
--- a/keyboards/fjlabs/kf87/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/kf87/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_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_SLCK, KC_PAUS, 
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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, 
diff --git a/keyboards/fjlabs/kf87/keymaps/via/keymap.c b/keyboards/fjlabs/kf87/keymaps/via/keymap.c
index 70acb644a2..a7ca0666eb 100644
--- a/keyboards/fjlabs/kf87/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/kf87/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_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_SLCK, KC_PAUS, 
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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, 
diff --git a/keyboards/fjlabs/kyuu/keymaps/default/keymap.c b/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
index 6a992d7079..4f51adbd8e 100644
--- a/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
         KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/fjlabs/kyuu/keymaps/via/keymap.c b/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
index 93595800a6..3cd7a637bc 100644
--- a/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
         KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/fjlabs/ldk65/keymaps/default/keymap.c b/keyboards/fjlabs/ldk65/keymaps/default/keymap.c
index 76cdcca6db..dfb0ca691e 100644
--- a/keyboards/fjlabs/ldk65/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/ldk65/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/fjlabs/ldk65/keymaps/via/keymap.c b/keyboards/fjlabs/ldk65/keymaps/via/keymap.c
index 39ac00f72e..f3cb7c9125 100644
--- a/keyboards/fjlabs/ldk65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/ldk65/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/fjlabs/midway60/keymaps/default/keymap.c b/keyboards/fjlabs/midway60/keymaps/default/keymap.c
index b815b7b52c..bf4dd394a1 100644
--- a/keyboards/fjlabs/midway60/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/midway60/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/midway60/keymaps/via/keymap.c b/keyboards/fjlabs/midway60/keymaps/via/keymap.c
index 58be322b02..a5f19db973 100644
--- a/keyboards/fjlabs/midway60/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/midway60/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
index 17efef452e..20baf8306b 100644
--- a/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
index d067dacf88..07203d55f1 100644
--- a/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/polaris/keymaps/default/keymap.c b/keyboards/fjlabs/polaris/keymaps/default/keymap.c
index 1631d8e611..24c4fc6480 100644
--- a/keyboards/fjlabs/polaris/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/polaris/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/polaris/keymaps/via/keymap.c b/keyboards/fjlabs/polaris/keymaps/via/keymap.c
index 16f362f4ab..7317f14a57 100644
--- a/keyboards/fjlabs/polaris/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/polaris/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/ready100/keymaps/default/keymap.c b/keyboards/fjlabs/ready100/keymaps/default/keymap.c
index 0c2f091639..6ac8a367c9 100644
--- a/keyboards/fjlabs/ready100/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/ready100/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_64_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          QK_BOOT,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/ready100/keymaps/via/keymap.c b/keyboards/fjlabs/ready100/keymaps/via/keymap.c
index 10a837e678..1e24d683be 100644
--- a/keyboards/fjlabs/ready100/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/ready100/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_64_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          QK_BOOT,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/sinanju/keymaps/default/keymap.c b/keyboards/fjlabs/sinanju/keymaps/default/keymap.c
index 996b5d48d5..dbe096e494 100644
--- a/keyboards/fjlabs/sinanju/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/sinanju/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi_wkl_split_bs_rshift(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS
diff --git a/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c b/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c
index 192bda366f..c36445ca98 100644
--- a/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c
+++ b/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi_wkl(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS
diff --git a/keyboards/fjlabs/sinanju/keymaps/via/keymap.c b/keyboards/fjlabs/sinanju/keymaps/via/keymap.c
index 2fcaab747e..7cf05996ae 100644
--- a/keyboards/fjlabs/sinanju/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/sinanju/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi_wkl_split_bs_rshift(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
index 1dd28d8d13..ad8439a760 100644
--- a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
index dc1fd0d4f5..3a39be888d 100644
--- a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/solanis/keymaps/default/keymap.c b/keyboards/fjlabs/solanis/keymaps/default/keymap.c
index 418aa87150..6c0e5609d2 100644
--- a/keyboards/fjlabs/solanis/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/solanis/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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,
diff --git a/keyboards/fjlabs/solanis/keymaps/via/keymap.c b/keyboards/fjlabs/solanis/keymaps/via/keymap.c
index 4e17594aab..3064ef770b 100644
--- a/keyboards/fjlabs/solanis/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/solanis/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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,
diff --git a/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c b/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
index 17efef452e..20baf8306b 100644
--- a/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c b/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
index d067dacf88..07203d55f1 100644
--- a/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c b/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c
index ce1ac29257..d27df75120 100644
--- a/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi_arrow(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c b/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c
index a41cbc2093..cda333a255 100644
--- a/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi_arrow(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c b/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c
index 08a6086139..94c2f9ddb2 100644
--- a/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c b/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c
index 89576787ff..dee3d04ae8 100644
--- a/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/flehrad/downbubble/keymaps/default/keymap.c b/keyboards/flehrad/downbubble/keymaps/default/keymap.c
index b6e340a008..2b02e9d7f6 100644
--- a/keyboards/flehrad/downbubble/keymaps/default/keymap.c
+++ b/keyboards/flehrad/downbubble/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_standard(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,                    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   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_NLCK, KC_HOME, KC_TRNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_TRNS, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,                    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   LAYOUT_split_rshift(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,                    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   LAYOUT_split_numpad(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,   KC_PPLS,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_P4,   KC_P5,   KC_P6,   KC_TRNS,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   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_NLCK, KC_HOME, KC_TRNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NUM,  KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_TRNS, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,   KC_PPLS,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_P4,   KC_P5,   KC_P6,   KC_TRNS,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/flehrad/numbrero/keymaps/default/keymap.c b/keyboards/flehrad/numbrero/keymaps/default/keymap.c
index 35bc8cdc37..018839f779 100644
--- a/keyboards/flehrad/numbrero/keymaps/default/keymap.c
+++ b/keyboards/flehrad/numbrero/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_numbrero_numpad(
-		KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 		KC_TRNS, KC_P7,   KC_P8,   KC_P9,
 		KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 		KC_TRNS, KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/flehrad/snagpad/keymaps/default/keymap.c b/keyboards/flehrad/snagpad/keymaps/default/keymap.c
index 28c980a440..bceccbdc9f 100644
--- a/keyboards/flehrad/snagpad/keymaps/default/keymap.c
+++ b/keyboards/flehrad/snagpad/keymaps/default/keymap.c
@@ -3,14 +3,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_ortho_5x4(
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_P4, KC_P5, KC_P6, KC_PPLS, 
 		KC_P1, KC_P2, KC_P3, KC_PENT, 
 		KC_P0, KC_P0, KC_PDOT, KC_PENT),
 
   LAYOUT_numpad_5x4(
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		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,  
diff --git a/keyboards/flehrad/snagpad/keymaps/via/keymap.c b/keyboards/flehrad/snagpad/keymaps/via/keymap.c
index c657f49be8..b97442f6cc 100644
--- a/keyboards/flehrad/snagpad/keymaps/via/keymap.c
+++ b/keyboards/flehrad/snagpad/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_ortho_5x4(
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 		KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 		KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 		KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/fluorite/keymaps/default/keymap.c b/keyboards/fluorite/keymaps/default/keymap.c
index 567b191f3c..f239158a38 100644
--- a/keyboards/fluorite/keymaps/default/keymap.c
+++ b/keyboards/fluorite/keymaps/default/keymap.c
@@ -54,7 +54,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT( /* Base */
             //,-------------------------------------------------------------------------------.  ,-------------------------------------------------------------------------------.
-                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PAST,  KC_PSLS,    KC_P0,     KC_NLCK,  KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
+                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PAST,  KC_PSLS,    KC_P0,     KC_NUM,   KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
             //|---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------|
                    KC_F5,    KC_F6,    KC_F7,    KC_F8,  KC_PMNS,    KC_P7,    KC_P8,    KC_P9,       KC_P7,    KC_P8,    KC_P9,  KC_PMNS,    KC_F5,    KC_F6,    KC_F7,    KC_F8,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT( /* Base */
             //,-------------------------------------------------------------------------------.  ,-------------------------------------------------------------------------------.
-                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PAST,  KC_PSLS,    KC_P0,     KC_NLCK,  KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
+                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PAST,  KC_PSLS,    KC_P0,     KC_NUM,   KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
             //|---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------|
                    KC_F5,    KC_F6,    KC_F7,    KC_F8,  KC_PMNS,    KC_P7,    KC_P8,    KC_P9,       KC_P7,    KC_P8,    KC_P9,  KC_PMNS,    KC_F5,    KC_F6,    KC_F7,    KC_F8,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT( /* Base */
             //,-------------------------------------------------------------------------------.  ,-------------------------------------------------------------------------------.
-                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PAST,  KC_PSLS,    KC_P0,     KC_NLCK,  KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
+                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PAST,  KC_PSLS,    KC_P0,     KC_NUM,   KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
             //|---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------|
                    KC_F5,    KC_F6,    KC_F7,    KC_F8,  KC_PMNS,    KC_P7,    KC_P8,    KC_P9,       KC_P7,    KC_P8,    KC_P9,  KC_PMNS,    KC_F5,    KC_F6,    KC_F7,    KC_F8,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CUSTOM1] = LAYOUT( /* Base */
             //,-------------------------------------------------------------------------------.  ,-------------------------------------------------------------------------------.
-                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PPLS,  KC_PMNS,    KC_P0,     KC_NLCK,  KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
+                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PPLS,  KC_PMNS,    KC_P0,     KC_NUM,   KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
             //|---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------|
                    KC_F5,    KC_F6,    KC_F7,    KC_F8,  KC_PMNS,    KC_P7,    KC_P8,    KC_P9,       KC_P7,    KC_P8,    KC_P9,  KC_PMNS,    KC_F5,    KC_F6,    KC_F7,    KC_F8,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CUSTOM2] = LAYOUT( /* Base */
             //,-------------------------------------------------------------------------------.  ,-------------------------------------------------------------------------------.
-                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PPLS,  KC_PMNS,    KC_P0,     KC_NLCK,  KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
+                   KC_F1,    KC_F2,    KC_F3,    KC_F4,  KC_PSCR,  KC_PPLS,  KC_PMNS,    KC_P0,     KC_NUM,   KC_PSLS,  KC_PAST,  KC_BSPC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,
             //|---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------|
                    KC_F5,    KC_F6,    KC_F7,    KC_F8,  KC_PMNS,    KC_P7,    KC_P8,    KC_P9,       KC_P7,    KC_P8,    KC_P9,  KC_PMNS,    KC_F5,    KC_F6,    KC_F7,    KC_F8,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/flx/lodestone/keymaps/default/keymap.c b/keyboards/flx/lodestone/keymaps/default/keymap.c
index 7ddaceaa7d..38671320a7 100644
--- a/keyboards/flx/lodestone/keymaps/default/keymap.c
+++ b/keyboards/flx/lodestone/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/flx/lodestone/keymaps/default_ansi/keymap.c b/keyboards/flx/lodestone/keymaps/default_ansi/keymap.c
index 0526591e17..3dc4a642be 100644
--- a/keyboards/flx/lodestone/keymaps/default_ansi/keymap.c
+++ b/keyboards/flx/lodestone/keymaps/default_ansi/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Fn1 Layer
     [1] = LAYOUT_65_ansi_blocker_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_DEL,  KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,          KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP,          KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/flx/lodestone/keymaps/default_iso/keymap.c b/keyboards/flx/lodestone/keymaps/default_iso/keymap.c
index d25a2a9ffb..f13b5d2692 100644
--- a/keyboards/flx/lodestone/keymaps/default_iso/keymap.c
+++ b/keyboards/flx/lodestone/keymaps/default_iso/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Fn1 Layer
     [1] = LAYOUT_65_iso_blocker_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_DEL,  KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,                   KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,                   KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/flx/lodestone/keymaps/via/keymap.c b/keyboards/flx/lodestone/keymaps/via/keymap.c
index 669d7fc44e..b45448c4fd 100644
--- a/keyboards/flx/lodestone/keymaps/via/keymap.c
+++ b/keyboards/flx/lodestone/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/flx/virgo/keymaps/default/keymap.c b/keyboards/flx/virgo/keymaps/default/keymap.c
index 4b7cfe60d1..57d13f5f0c 100644
--- a/keyboards/flx/virgo/keymaps/default/keymap.c
+++ b/keyboards/flx/virgo/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                      KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/flx/virgo/keymaps/via/keymap.c b/keyboards/flx/virgo/keymaps/via/keymap.c
index 3599952579..c9b2e0406c 100644
--- a/keyboards/flx/virgo/keymaps/via/keymap.c
+++ b/keyboards/flx/virgo/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                      KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/foostan/cornelius/keymaps/hvp/keymap.c b/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
index c740017540..e514e0c68e 100644
--- a/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
+++ b/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
@@ -61,6 +61,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______,  G(S(KC_1)), G(S(KC_2)), G(S(KC_3)), G(S(KC_4)), G(S(KC_5)), G(S(KC_6)), G(S(KC_7)), G(S(KC_8)), G(S(KC_9)), G(S(KC_0)), _______,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
      KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS,
-     QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK
+     QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM
   ),
 };
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
index 4f5a60d91c..7850061d40 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 	[_FL] = LAYOUT_60_tsangan_hhkb(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-    _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+    _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
     _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
     _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
     _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c b/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c
index c1f960d6e8..073053198f 100644
--- a/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c
+++ b/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK,  KC_PAUS,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_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,
diff --git a/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c b/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c
index ddeedb234d..ba8940f7c2 100644
--- a/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c
+++ b/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK,  KC_PAUS,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_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,
diff --git a/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c b/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c
index bc047ccaaa..242d359b83 100644
--- a/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c
+++ b/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK,  KC_PAUS,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_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,
diff --git a/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c b/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c
index 1d49695e5a..b00798abcf 100644
--- a/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c
+++ b/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK,  KC_PAUS,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_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,
diff --git a/keyboards/fr4/southpaw75/keymaps/default/keymap.c b/keyboards/fr4/southpaw75/keymaps/default/keymap.c
index 8d3edfd967..a2b9d746ca 100644
--- a/keyboards/fr4/southpaw75/keymaps/default/keymap.c
+++ b/keyboards/fr4/southpaw75/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_P4,   KC_P5,   KC_P6,               KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT,
diff --git a/keyboards/ft/mars65/keymaps/default/keymap.c b/keyboards/ft/mars65/keymaps/default/keymap.c
index c3fbf9cc3f..0db47042e5 100644
--- a/keyboards/ft/mars65/keymaps/default/keymap.c
+++ b/keyboards/ft/mars65/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_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_NLCK, KC_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_LSFT, KC_NUM,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
     ),
 
diff --git a/keyboards/ft/mars65/keymaps/via/keymap.c b/keyboards/ft/mars65/keymaps/via/keymap.c
index c3fbf9cc3f..0db47042e5 100644
--- a/keyboards/ft/mars65/keymaps/via/keymap.c
+++ b/keyboards/ft/mars65/keymaps/via/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_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_NLCK, KC_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_LSFT, KC_NUM,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
     ),
 
diff --git a/keyboards/ft/mars80/keymaps/default/keymap.c b/keyboards/ft/mars80/keymaps/default/keymap.c
index 5df02136fc..d489aefb57 100644
--- a/keyboards/ft/mars80/keymaps/default/keymap.c
+++ b/keyboards/ft/mars80/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 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_SLCK, KC_BRK,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_BRK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/genone/eclipse_65/keymaps/default/keymap.c b/keyboards/genone/eclipse_65/keymaps/default/keymap.c
index abc2480803..98d95988c0 100644
--- a/keyboards/genone/eclipse_65/keymaps/default/keymap.c
+++ b/keyboards/genone/eclipse_65/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[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_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_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/genone/eclipse_65/keymaps/via/keymap.c b/keyboards/genone/eclipse_65/keymaps/via/keymap.c
index 94361dd14f..6039a28215 100644
--- a/keyboards/genone/eclipse_65/keymaps/via/keymap.c
+++ b/keyboards/genone/eclipse_65/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[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_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_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/genone/g1_65/keymaps/default/keymap.c b/keyboards/genone/g1_65/keymaps/default/keymap.c
index a72cc1d23b..a307e43949 100644
--- a/keyboards/genone/g1_65/keymaps/default/keymap.c
+++ b/keyboards/genone/g1_65/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[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_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_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/genone/g1_65/keymaps/via/keymap.c b/keyboards/genone/g1_65/keymaps/via/keymap.c
index 94361dd14f..6039a28215 100644
--- a/keyboards/genone/g1_65/keymaps/via/keymap.c
+++ b/keyboards/genone/g1_65/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[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_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_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/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
index dec4b81893..19d601e787 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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,
diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
index 96be07d7a9..889db30ebe 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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,
diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
index 5b5a39c8e3..d1af823046 100644
--- a/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
+++ b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_SPC,  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,
diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
index a64435a162..d62ff83fa9 100644
--- a/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
+++ b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_SPC,  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,
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
index ffb87ef009..3242ab4eac 100644
--- a/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
       TG(_SFX),KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL, \
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  ______, ______,  \
+      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,  \
       ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,   \
       ______,  KC_MPRV, KC_MPLY, KC_MNXT, ______, ______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, ______, ______,  \
       ______,  ______,  ______,                   TG(_WASD),                   KC_MSTP, ______,  ______,  ______ \
diff --git a/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
index a79b89e9c2..b23c5a30fb 100644
--- a/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
+++ b/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
       LED_TOGGLE,KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL, \
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  ______, ______,  \
+      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,  \
       ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,   \
       ______,  KC_MPRV, KC_MPLY, KC_MNXT, ______, ______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, ______, ______,  \
       ______,  ______,  ______,                   ______,                   ______,  KC_MSTP, ______,  ______ \
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
index 2b4e179c53..708bb61ebd 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT(
         KC_GRAVE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_DELETE, \
-        KC_TRNS,TG(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS, \
+        KC_TRNS,TG(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS, \
         KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU,KC_TRNS,KC_TRNS,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,TG(3),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_END,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
index 5dfb2ae703..587695fdfa 100644
--- a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
@@ -47,7 +47,7 @@
 #define HOME KC_HOME  // Go to beginning of line
 #define ENDI  KC_END  // go to end of line
 #define PSCR  KC_PSCR   // Print Screen
-#define SLCK  KC_SLCK   // go to end of line
+#define SLCK  KC_SCRL   // go to end of line
 #define PGDN  KC_PGDN   // go to end of line
 #define PGUP  KC_PGUP   // go to end of line
 #define PLPS KC_MPLY  // Play/Pause
diff --git a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
index ca6838d2aa..082e4bff28 100644
--- a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
       TG(_SFX), KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,  KC_DEL, \
-      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   ______, ______,  \
+      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   ______, ______,  \
       ______,   KC_VOLD,KC_VOLU,KC_MUTE,______, ______, KC_PAST,KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______,   \
       ______,   KC_MPRV,KC_MPLY,KC_MNXT,______, ______, KC_PPLS,KC_PMNS,KC_END,  KC_PGDN, KC_DOWN, ______,  ______,  \
       ______,   ______, ______,                 ______,                 KC_MSTP, ______,  ______,  ______ \
diff --git a/keyboards/gh60/satan/keymaps/dkrieger/keymap.c b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
index 05df3ff194..4848def85d 100644
--- a/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
       ______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,  KC_DEL, \
-      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   ______, ______,  \
+      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   ______, ______,  \
       ______,   KC_VOLD,KC_VOLU,KC_MUTE,______, ______, KC_PAST,KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______,   \
       ______,   KC_MPRV,KC_MPLY,KC_MNXT,______, ______, KC_PPLS,KC_PMNS,KC_END,  KC_PGDN, KC_DOWN, ______,  ______,  \
       ______,   ______, ______,                 ______,                 KC_MSTP, ______,  ______,  ______ \
diff --git a/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
index 68e362b59c..4ccce44a1d 100644
--- a/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
+++ b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT_60_hhkb( /* Layer 1 */
       _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \
-      KC_CAPS, _______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,KC_UP,  _______,_______,\
+      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,_______,\
       _______,   BL_DEC, BL_INC, BL_TOGG,_______, _______, KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,_______,_______,\
             _______,_______,                   _______,                     _______,_______\
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
index 8a43b7c6c6..a7efd791e2 100644
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
@@ -32,7 +32,7 @@
 #define HOME KC_HOME  // Go to beginning of line
 #define ENDI  KC_END  // go to end of line
 #define PSCR  KC_PSCR   // Print Screen
-#define SLCK  KC_SLCK   // go to end of line
+#define SLCK  KC_SCRL   // go to end of line
 #define PGDN  KC_PGDN   // go to end of line
 #define PGUP  KC_PGUP   // go to end of line
 #define PLPS KC_MPLY  // Play/Pause
diff --git a/keyboards/gh60/satan/keymaps/poker/keymap.c b/keyboards/gh60/satan/keymaps/poker/keymap.c
index 18207f7c36..04b65e4588 100644
--- a/keyboards/gh60/satan/keymaps/poker/keymap.c
+++ b/keyboards/gh60/satan/keymaps/poker/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = 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_UP,   _______, _______, _______, KC_CALC, _______,  KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+    _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______,  KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______,  _______, _______, KC_HOME, KC_PGUP,          _______, \
     _______, _______, KC_APP,  _______, _______, _______, KC_VOLD, KC_VOLU,  KC_MUTE, KC_END,  KC_PGDN,                   _______, \
     _______, _______, _______,                            _______,                             _______, _______, _______, _______
diff --git a/keyboards/gh60/satan/keymaps/sethbc/keymap.c b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
index ad0a6a9948..d81efd3b36 100644
--- a/keyboards/gh60/satan/keymaps/sethbc/keymap.c
+++ b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
@@ -32,13 +32,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT_60_ansi_split_bs_rshift(
   #ifdef RGBLIGHT_ENABLE
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT, \
-    KC_CAPS, _______, RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_DEL,  \
+    KC_CAPS, _______, RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_DEL,  \
     _______, KC_VOLD, RGB_HUD, RGB_SAI, RGB_SAD, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT, \
     _______,          RGB_VAI, RGB_VAD, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, \
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
   #else
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT, \
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_DEL,  \
+    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_DEL,  \
     _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT, \
     _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, \
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
diff --git a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
index 49c65ac446..43a41c5bf4 100644
--- a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
+++ b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Function layer
   [_FL] = LAYOUT_60_ansi_split_bs_rshift(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_DEL,  XXXXXXX, \
-    XXXXXXX, KC_MPRV, KC_UP,   KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS,            KC_INS,  \
+    XXXXXXX, KC_MPRV, KC_UP,   KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS,            KC_INS,  \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     XXXXXXX, \
     _______,          KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LT(_RGBL, KC_PGUP), _______, \
     _______, _______, _______,                   KC_MPLY,                                     _______, KC_HOME, KC_PGDN,            KC_END
diff --git a/keyboards/gh60/v1p3/keymaps/default/keymap.c b/keyboards/gh60/v1p3/keymaps/default/keymap.c
index 2c22b489b8..b1b8d7c687 100644
--- a/keyboards/gh60/v1p3/keymaps/default/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,
-        KC_NO,       RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_SPI, RGB_SPD, KC_PSCR, KC_SLCK, KC_PAUS,        KC_NO,
+        KC_NO,       RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_SPI, RGB_SPD, KC_PSCR, KC_SCRL, KC_PAUS,        KC_NO,
         KC_NO,         KC_LEFT, KC_DOWN, KC_RGHT, RGB_VAI, RGB_SAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_PGUP, KC_NO,
         KC_NO,   KC_NO,   QK_BOOT,   BL_DEC,  BL_ON,   BL_INC,  KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, KC_NO,   KC_NO,   KC_NO,   KC_NO,
         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
diff --git a/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c b/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c
index 60c8c11656..d1ca8bf0a1 100644
--- a/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______, _______, QK_BOOT,   _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, _______, _______, _______, QK_BOOT,   _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         _______, _______, _______, _______, _______, _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
index 784a26ff93..13ef5e494b 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_BSPC,
-        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        KC_BSPC,
+        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        KC_BSPC,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_TILD, _______,
         _______, _______, QK_BOOT, KC_APP,  BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
index 13e807f319..a8d34d22d4 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_DEL,  _______,
-        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        _______,
+        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
         _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
index 9f24f9b8e5..1d8d0e7d35 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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,  _______, _______, _______,
-        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        _______,
+        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
         _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
index c5cfce195c..3983d88b0b 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_DEL,  KC_DEL,
-        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS,        _______,
+        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
         _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
index 99f5b6bb06..f33767ca64 100644
--- a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
+++ b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_fullsize_ansi(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                       KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
index 39d783d01b..28a34c4269 100644
--- a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_fullsize_ansi_wkl(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                                              KC_P4,   KC_P5,   KC_P6,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                       KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/gh80_3000/keymaps/default/keymap.c b/keyboards/gh80_3000/keymaps/default/keymap.c
index 0221ffbc32..264f20fbca 100644
--- a/keyboards/gh80_3000/keymaps/default/keymap.c
+++ b/keyboards/gh80_3000/keymaps/default/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,     KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SCRL, KC_PAUS,     KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 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_PPLS,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                       KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/gh80_3000/keymaps/iso_default/keymap.c b/keyboards/gh80_3000/keymaps/iso_default/keymap.c
index 6add4c03be..137a6513b6 100644
--- a/keyboards/gh80_3000/keymaps/iso_default/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_default/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_iso(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,     KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,     KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                       KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,          KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_RSFT,              KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/gh80_3000/keymaps/iso_std/keymap.c b/keyboards/gh80_3000/keymaps/iso_std/keymap.c
index 4e9b8e8653..434abf68f5 100644
--- a/keyboards/gh80_3000/keymaps/iso_std/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_std/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_fullsize_iso(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                       KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
index 4d822dfb68..f275a3e789 100644
--- a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_fullsize_iso_wkl(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                       KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
index f03eda7e37..37ca812e21 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_BL] = LAYOUT(
   KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
   KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
index 19f01f53b6..5db6cd1945 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_BL] = LAYOUT(
   KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
   KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
index d9b0dce016..3c13fb8337 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_BL] = LAYOUT(
   KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,            KC_P4,    KC_P5,    KC_P6,
   KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
index 6d33fdcccc..83dc1f21d3 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_BL] = LAYOUT(
   KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,            KC_P4,    KC_P5,    KC_P6,
   KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index 1ff0a28e4d..52a4a06e02 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         EEP_RST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,          KC_MUTE,
-        KC_NLCK, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, KC_BSPC,          KC_PSCR,
+        KC_NUM,  KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, KC_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_PSLS, KC_PAST, KC_BSLS,          KC_PGUP,
         KC_CAPS, RGB_VAD, RGB_TOG, RGB_VAI, KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_PENT,          KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_PDOT, KC_SLSH,          KC_RSFT, KC_UP,   KC_INS,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
index 5a45e4e353..800fe02d7d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
@@ -75,11 +75,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     #ifdef GAME_ENABLE
     [_FN1] = LAYOUT(
-        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SLCK, KC_PAUS,           KC_SLEP,
+        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS,           KC_SLEP,
         PRNCONF, TG_CAPS, TG_PAD,  TG_ESC,  TG_DEL,  TG_TDCAP,TG_ENC,  TG_INS,TG_SPCMOD,TG_AUTOCR, _______, RGB_TOD, RGB_TOI, _______,           RGB_TOG,
         _______, RGB_SAD, RGB_VAI, RGB_SAI, NK_TOGG, _______, YAHOO,   _______, _______, OUTLOOK, TG(_GAME),SWAP_L, SWAP_R,  QK_BOOT,           KC_HOME,
         KC_CAPS, RGB_HUD, RGB_VAD, RGB_HUI, _______, GMAIL,   HOTMAIL, _______, _______, LOCKPC,  _______, _______,          _______,           KC_END,
-        _______,          RGB_NITE,_______, _______, _______, QK_BOOT, KC_NLCK, _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
+        _______,          RGB_NITE,_______, _______, _______, QK_BOOT, KC_NUM,  _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
         _______, WINLOCK, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
     ),
 
@@ -94,11 +94,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     #else
     [_FN1] = LAYOUT(
-        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SLCK, KC_PAUS,           KC_SLEP,
+        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS,           KC_SLEP,
         PRNCONF, TG_CAPS, TG_PAD,  TG_ESC,  TG_DEL,  TG_TDCAP,TG_ENC,  TG_INS,TG_SPCMOD,TG_AUTOCR, _______, RGB_TOD, RGB_TOI, _______,           RGB_TOG,
         _______, RGB_SAD, RGB_VAI, RGB_SAI, NK_TOGG, _______, YAHOO,   _______, _______, OUTLOOK, KC_PAUS, SWAP_L,  SWAP_R,  QK_BOOT,           KC_HOME,
         KC_CAPS, RGB_HUD, RGB_VAD, RGB_HUI, _______, GMAIL,   HOTMAIL, _______, _______, LOCKPC,  _______, _______,          _______,           KC_END,
-        _______,          RGB_NITE,_______, _______, _______, QK_BOOT, KC_NLCK, _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
+        _______,          RGB_NITE,_______, _______, _______, QK_BOOT, KC_NUM,  _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
         _______, WINLOCK, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
     ),
     #endif  //GAME_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
index c7947a66f6..4c87822b8a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
@@ -42,9 +42,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CALC,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, QK_BOOT,          KC_HOME,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, QK_BOOT,          KC_HOME,
         KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
-        _______,          RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
+        _______,          RGB_NITE,RGB_HUI, _______, _______, _______, KC_NUM,  _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
         _______, KC_WINLCK, _______,                            _______,                          _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
     ),
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
index 61f99e491b..c1815a2e28 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT(
-        KC_SLEP,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MNXT,  KC_MPLY,  KC_MSTP,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  KC_INS,             _______,
+        KC_SLEP,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MNXT,  KC_MPLY,  KC_MSTP,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  KC_INS,             _______,
         RGB_TOG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUD,  RGB_HUI,  _______,            RGB_M_P,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  TO(_MO2), RGB_SAD,  RGB_SAI,  QK_BOOT,            RGB_M_B,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_RMOD, RGB_MOD,            _______,            RGB_M_R,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
index d4ed360246..6ba850b3e5 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         _______, KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,  KC_WHOM, _______, _______, _______, _______, _______, KC_WAKE, KC_SLEP, KC_PAUS,         _______,
-      LED_TILDE, LED_1,  LED_2,   LED_3,   LED_4,    LED_5,   LED_6,   LED_7,   LED_8,   LED_9,   LED_0,   LED_MINS, LED_EQL,  KC_INS,         KC_SLCK,
+      LED_TILDE, LED_1,  LED_2,   LED_3,   LED_4,    LED_5,   LED_6,   LED_7,   LED_8,   LED_9,   LED_0,   LED_MINS, LED_EQL,  KC_INS,         KC_SCRL,
         _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,         KC_BRIU,
        _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_SPI, _______,  _______, _______, _______, QMKBEST, _______, _______,         _______,          KC_BRID,
         _______,          _______, _______, _______, _______,  _______, NK_TOGG, _______, _______, _______, _______,         _______, KC_MPLY, KC_PWR,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
index e558d84527..13c58d0392 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS,
         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_INS,
-        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_PSCR,   KC_SLCK,   KC_PAUS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_HOME,
+        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_PSCR,   KC_SCRL,   KC_PAUS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_HOME,
         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_MPLY,  KC_TRNS,           KC_TRNS,          KC_END,
         KC_TRNS,             KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_MPRV,   KC_MNXT,  QK_BOOT,           KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS,   KC_TRNS,                                    KC_TRNS,                                    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_HOME, KC_TRNS, KC_END
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
index ef4dcc6a05..0811f1a33a 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c
@@ -76,11 +76,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     #ifdef GAME_ENABLE
     [_FN1] = LAYOUT(
-        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SLCK, KC_PAUS,           KC_SLEP,
+        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS,           KC_SLEP,
         PRNCONF, TG_CAPS, TG_PAD,  TG_ESC,  TG_DEL,  TG_TDCAP,TG_ENC,  TG_INS,TG_SPCMOD,TG_AUTOCR,TG_ENGCAP,RGB_TOD,RGB_TOI, _______,           RGB_TOG,
         _______, RGB_SAD, RGB_VAI, RGB_SAI, NK_TOGG, _______, YAHOO,   _______, _______, OUTLOOK, TG(_GAME),SWAP_L, SWAP_R,                     KC_HOME,
         KC_CAPS, RGB_HUD, RGB_VAD, RGB_HUI, _______, GMAIL,   HOTMAIL, _______, _______, LOCKPC,  _______, _______, _______, _______,           KC_END,
-        _______, QK_BOOT, RGB_NITE,_______, _______, _______, QK_BOOT, KC_NLCK, _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
+        _______, QK_BOOT, RGB_NITE,_______, _______, _______, QK_BOOT, KC_NUM,  _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
         _______, WINLOCK, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
     ),
 
@@ -95,11 +95,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     #else
     [_FN1] = LAYOUT(
-        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SLCK, KC_PAUS,           KC_SLEP,
+        EE_CLR,  KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS,           KC_SLEP,
         PRNCONF, TG_CAPS, TG_PAD,  TG_ESC,  TG_DEL,  TG_TDCAP,TG_ENC,  TG_INS,TG_SPCMOD,TG_AUTOCR,TG_ENGCAP,RGB_TOD,RGB_TOI, _______,           RGB_TOG,
         _______, RGB_SAD, RGB_VAI, RGB_SAI, NK_TOGG, _______, YAHOO,   _______, _______, OUTLOOK, KC_PAUS, SWAP_L,  SWAP_R,                     KC_HOME,
         KC_CAPS, RGB_HUD, RGB_VAD, RGB_HUI, _______, GMAIL,   HOTMAIL, _______, _______, LOCKPC,  _______, _______, _______, _______,           KC_END,
-        _______, QK_BOOT, RGB_NITE,_______, _______, _______, QK_BOOT, KC_NLCK, _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
+        _______, QK_BOOT, RGB_NITE,_______, _______, _______, QK_BOOT, KC_NUM,  _______, _______, DOTCOM,  KC_CAD,           _______, RGB_MOD,  _______,
         _______, WINLOCK, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
     ),
     #endif  //GAME_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
index 27ce76970a..068ded84fb 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
@@ -41,9 +41,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CALC,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,                   KC_HOME,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,                   KC_HOME,
         KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_END,
-        _______, QK_BOOT, RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
+        _______, QK_BOOT, RGB_NITE,RGB_HUI, _______, _______, _______, KC_NUM,  _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
         _______, KC_WINLCK, _______,                            _______,                          _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
     ),
 
diff --git a/keyboards/gon/nerd60/keymaps/default/keymap.c b/keyboards/gon/nerd60/keymaps/default/keymap.c
index 50e337f77a..3d616269f5 100644
--- a/keyboards/gon/nerd60/keymaps/default/keymap.c
+++ b/keyboards/gon/nerd60/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all( /* System layer to have access to QK_BOOT button */
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
-        _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,           _______,
         _______, _______, KC_APP,  _______, _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______,
         QK_BOOT,   _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/gon/nerd60/keymaps/mauin/keymap.c b/keyboards/gon/nerd60/keymaps/mauin/keymap.c
index 314b55199a..e410d6c0cf 100644
--- a/keyboards/gon/nerd60/keymaps/mauin/keymap.c
+++ b/keyboards/gon/nerd60/keymaps/mauin/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_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_SLCK, KC_PAUS, XXXXXXX,
+      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
diff --git a/keyboards/gon/nerd60/keymaps/via/keymap.c b/keyboards/gon/nerd60/keymaps/via/keymap.c
index 073c741b17..1fdbf5c3a3 100644
--- a/keyboards/gon/nerd60/keymaps/via/keymap.c
+++ b/keyboards/gon/nerd60/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all( /* System layer to have access to QK_BOOT button */
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
-        _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,           _______,
         _______, _______, KC_APP,  _______, _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______,
         QK_BOOT,   _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/gon/nerdtkl/keymaps/default/keymap.c b/keyboards/gon/nerdtkl/keymaps/default/keymap.c
index 9168b36aaf..ed92ea81a8 100644
--- a/keyboards/gon/nerdtkl/keymaps/default/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
index 39dcb175ab..dc50958c57 100644
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *    *-----------------------------------------------------------------------*
     */
     [_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_SLCK, KC_PAUS, \
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,                             \
diff --git a/keyboards/gon/nerdtkl/keymaps/via/keymap.c b/keyboards/gon/nerdtkl/keymaps/via/keymap.c
index 297c6a091a..53af190458 100644
--- a/keyboards/gon/nerdtkl/keymaps/via/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/via/keymap.c
@@ -20,7 +20,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
index 9f23371831..033f66a8b6 100644
--- a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3      4      5       6      7      8      9        10       11       12       13       14       15       16      */
 	[_BASE] = LAYOUT_all(
-                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, 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,
diff --git a/keyboards/gopolar/gg86/keymaps/default/keymap.c b/keyboards/gopolar/gg86/keymaps/default/keymap.c
index 3b0a6aa66c..81be2daae6 100644
--- a/keyboards/gopolar/gg86/keymaps/default/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/default/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3      4      5       6      7      8      9        10       11       12       13       14       15       16      */
 	[0] = LAYOUT_all(
-                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, 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,
diff --git a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
index f5e398ecbe..65d473639d 100644
--- a/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/horrortroll/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3      4      5       6      7      8      9        10       11       12       13       14       15       16      */
 	[_BASE] = LAYOUT_all(
-                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, 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,
diff --git a/keyboards/gopolar/gg86/keymaps/via/keymap.c b/keyboards/gopolar/gg86/keymaps/via/keymap.c
index 3b0a6aa66c..81be2daae6 100644
--- a/keyboards/gopolar/gg86/keymaps/via/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/via/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3      4      5       6      7      8      9        10       11       12       13       14       15       16      */
 	[0] = LAYOUT_all(
-                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5,  KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, 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,
diff --git a/keyboards/gorthage_truck/keymaps/default/keymap.c b/keyboards/gorthage_truck/keymaps/default/keymap.c
index 380a46d589..aec0814c87 100644
--- a/keyboards/gorthage_truck/keymaps/default/keymap.c
+++ b/keyboards/gorthage_truck/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_3u(
         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_MINS, KC_MPLY, KC_1,    KC_2,    KC_3,
-        KC_SLCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_EQL,           KC_4,    KC_5,    KC_6,
-        KC_NLCK, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENT,  KC_SLSH, KC_GRV,  KC_UP,   KC_7,    KC_8,    KC_9,
+        KC_SCRL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_EQL,           KC_4,    KC_5,    KC_6,
+        KC_NUM,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENT,  KC_SLSH, KC_GRV,  KC_UP,   KC_7,    KC_8,    KC_9,
         KC_CAPS, KC_LCTL, KC_LSFT,          KC_SPC,           KC_RSFT,                   KC_RCTL, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT, KC_DOT,  KC_0
     )
 };
diff --git a/keyboards/gray_studio/apollo80/keymaps/default/keymap.c b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c
index ba0fd63110..de69d21712 100644
--- a/keyboards/gray_studio/apollo80/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/gray_studio/apollo80/keymaps/via/keymap.c b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c
index bb2870f189..94786cf30c 100644
--- a/keyboards/gray_studio/apollo80/keymaps/via/keymap.c
+++ b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/gray_studio/space65/keymaps/default/keymap.c b/keyboards/gray_studio/space65/keymaps/default/keymap.c
index bf747d58b1..8d51b3e4db 100644
--- a/keyboards/gray_studio/space65/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [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_MUTE,
-      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_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_TRNS,                   KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index de93500aa3..fff16e2020 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ________________NUMBER_LEFT________________, KC_6,    _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_0,  KC_PLUS,  KC_BSLS, \
   KC_DEL,  KC_A,    KC_UP,   KC_D,    KC_PSCR,  KC_VOLU, _______, _______, _______, KC_4,  KC_5,  KC_6,  KC_PAST, KC_COLN, KC_QUOT, \
   _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_MUTE,  KC_VOLD, _______, _______, _______, KC_1,    KC_2,  KC_3,  KC_UP, KC_SLSH,   _______, \
-  _______, _______, _______, _______,  _______, KC_SPC, _______, _______, KC_SPC,  KC_0,   _______,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_NLCK   \
+  _______, _______, _______, _______,  _______, KC_SPC, _______, _______, KC_SPC,  KC_0,   _______,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_NUM   \
 ),
 
 /* FN layer on Esc key
diff --git a/keyboards/hand88/keymaps/default/keymap.c b/keyboards/hand88/keymaps/default/keymap.c
index 95068e13f9..9d39611008 100644
--- a/keyboards/hand88/keymaps/default/keymap.c
+++ b/keyboards/hand88/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/hand88/keymaps/via/keymap.c b/keyboards/hand88/keymaps/via/keymap.c
index 16c139fd64..c18e5ad66b 100644
--- a/keyboards/hand88/keymaps/via/keymap.c
+++ b/keyboards/hand88/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SCRL, KC_PAUS,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c b/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c
index 3345aca169..3dcd4b3f6c 100644
--- a/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c
+++ b/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c
@@ -2,9 +2,9 @@
 
 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_SLCK, KC_PAUS, KC_MUTE, KC_MPRV, KC_MNXT, 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_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9,
     KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3,
diff --git a/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c b/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c
index 0181ad9f77..b22f797273 100644
--- a/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c
@@ -2,9 +2,9 @@
 
 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_SLCK, KC_PAUS, KC_MUTE, KC_MPRV, KC_MNXT, 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_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_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9,
     KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
     KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3,
diff --git a/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c b/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c
index d6223c496e..89e36d9fdc 100644
--- a/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c
+++ b/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c
@@ -2,9 +2,9 @@
 
 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_SLCK, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT,
+    KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT,
 
-    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9,
     KC_MPLY, 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_P4, KC_P5, KC_P6, KC_PPLS,
     KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3,
diff --git a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
index df1e550ea2..9c9c3cbad6 100644
--- a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [LAYER_BASE] = LAYOUT(
   KC_ESC,  KC_TAB,  KC_BSLS, MO(2),
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
   KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
index e2ec848b59..7fb667b026 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [LAYER_BASE] = LAYOUT_pad21(
   KC_ESC,  KC_TAB,  KC_BSLS, MO(2),
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  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,
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
index 0126aa49fb..378edc7081 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [LAYER_BASE] = LAYOUT(
   KC_ESC,  KC_TAB,  KC_BSLS, MO(2),
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
   KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 44d105078b..019fd11c48 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                   KC_NLCK, KC_KP_7, KC_KP_8,   KC_KP_9,     KC_KP_SLASH,    _______,
+    _______, _______, _______, _______, _______, _______,                   KC_NUM,  KC_KP_7, KC_KP_8,   KC_KP_9,     KC_KP_SLASH,    _______,
     _______, _______, _______, _______, _______, _______,                   _______, KC_KP_4, KC_KP_5,   KC_KP_6,     KC_KP_ASTERISK, _______,
     _______, _______, _______, _______, _______, _______,                   _______, KC_KP_1, KC_KP_2,   KC_KP_3,     KC_KP_PLUS,     _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, KC_KP_DOT, KC_COMM,     KC_KP_MINUS,    _______
diff --git a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
index 496b449824..3bdae41a24 100644
--- a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
+++ b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [LAYER_FUNCTIONS] = LAYOUT(
         /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-              QK_BOOT,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  KC_PSCR,  KC_SLCK,  KC_PAUS, 
+              QK_BOOT,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  KC_PSCR,  KC_SCRL,  KC_PAUS, 
         /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
diff --git a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
index 00243484b9..cd8c970800 100644
--- a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
+++ b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [LAYER_FUNCTIONS] = LAYOUT(
         /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-              QK_BOOT,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  KC_PSCR,  KC_SLCK,  KC_PAUS, 
+              QK_BOOT,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  KC_PSCR,  KC_SCRL,  KC_PAUS, 
         /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
diff --git a/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c b/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c
index a77645712e..d480cd5667 100644
--- a/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c
+++ b/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_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,
         XXXXXXX,       KC_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,
diff --git a/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c b/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c
index da3c0b37e3..291a4d5b33 100644
--- a/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c
+++ b/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_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,
         XXXXXXX,       KC_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,
diff --git a/keyboards/handwired/bstk100/keymaps/default/keymap.c b/keyboards/handwired/bstk100/keymaps/default/keymap.c
index 474921eeab..6e4ec377ed 100644
--- a/keyboards/handwired/bstk100/keymaps/default/keymap.c
+++ b/keyboards/handwired/bstk100/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_NLCK,
+        KC_NUM,
         KC_TAB, KC_PSLS, KC_PAST, KC_BSPC,
         KC_P7,  KC_P8,   KC_P9,   KC_PMNS,
         KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
diff --git a/keyboards/handwired/bstk100/keymaps/via/keymap.c b/keyboards/handwired/bstk100/keymaps/via/keymap.c
index 474921eeab..6e4ec377ed 100644
--- a/keyboards/handwired/bstk100/keymaps/via/keymap.c
+++ b/keyboards/handwired/bstk100/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_NLCK,
+        KC_NUM,
         KC_TAB, KC_PSLS, KC_PAST, KC_BSPC,
         KC_P7,  KC_P8,   KC_P9,   KC_PMNS,
         KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
diff --git a/keyboards/handwired/cmd60/keymaps/default/keymap.c b/keyboards/handwired/cmd60/keymaps/default/keymap.c
index aa6a74f084..15084365fe 100644
--- a/keyboards/handwired/cmd60/keymaps/default/keymap.c
+++ b/keyboards/handwired/cmd60/keymaps/default/keymap.c
@@ -17,14 +17,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [2] = LAYOUT( /* CMD60 - Arrows */
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-      _______, KC_BSPC, KC_UP,   KC_DEL,  _______, _______, _______, KC_BSPC, KC_UP,   KC_DEL,  KC_PSCR, KC_SLCK, KC_PAUS, _______,
+      _______, KC_BSPC, KC_UP,   KC_DEL,  _______, _______, _______, KC_BSPC, KC_UP,   KC_DEL,  KC_PSCR, KC_SCRL, KC_PAUS, _______,
       _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
       _______, _______, _______, _______, KC_SPC,  _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______,                            _______,                            _______, _______, _______, _______
   ),
   [3] = LAYOUT( /* CMD60 - Functions */
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-      KC_MUTE, KC_BSPC, KC_PGUP, KC_DEL,  _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, _______, KC_PAUS, KC_SLCK, KC_PSCR,
+      KC_MUTE, KC_BSPC, KC_PGUP, KC_DEL,  _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, _______, KC_PAUS, KC_SCRL, KC_PSCR,
       _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_INS,           _______,
       _______, _______, _______, _______, _______, _______, KC_END,  _______, _______, _______, _______,                   _______,
       _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/handwired/d48/keymaps/anderson/keymap.c b/keyboards/handwired/d48/keymaps/anderson/keymap.c
index 786a854ae0..48f3c00679 100644
--- a/keyboards/handwired/d48/keymaps/anderson/keymap.c
+++ b/keyboards/handwired/d48/keymaps/anderson/keymap.c
@@ -85,9 +85,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        */
     [_ALPHA] = LAYOUT( \
                                                                                 _______,                   _______, \
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NLCK, KC_MINS, KC_PGUP, KC_UP,   KC_PGDN, KC_TILD, KC_DEL,  \
+        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NUM,  KC_MINS, KC_PGUP, KC_UP,   KC_PGDN, KC_TILD, KC_DEL,  \
         _______, _______, KC_VOLD, KC_VOLU, _______, KC_CAPS, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT,KC_GRV,  KC_BSLS, \
-        _______, _______, _______, _______, _______, KC_SLCK, KC_END,  KC_EQL,  KC_LBRC, KC_RBRC, KC_LPRN ,KC_RPRN, \
+        _______, _______, _______, _______, _______, KC_SCRL, KC_END,  KC_EQL,  KC_LBRC, KC_RBRC, KC_LPRN ,KC_RPRN, \
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
     ),
 
diff --git a/keyboards/handwired/d48/keymaps/default/keymap.c b/keyboards/handwired/d48/keymaps/default/keymap.c
index c18bbf460e..9b83a26216 100644
--- a/keyboards/handwired/d48/keymaps/default/keymap.c
+++ b/keyboards/handwired/d48/keymaps/default/keymap.c
@@ -69,9 +69,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        */
     [_ALPHA] = LAYOUT(
                                                                                 _______,                   _______,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NLCK, KC_MINS, KC_PGUP, KC_UP,   KC_PGDN, KC_TILD, KC_DEL,
+        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NUM,  KC_MINS, KC_PGUP, KC_UP,   KC_PGDN, KC_TILD, KC_DEL,
         _______, _______, KC_VOLD, KC_VOLU, _______, KC_CAPS, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT,KC_GRV,  KC_BSLS,
-        _______, _______, _______, _______, _______, KC_SLCK, KC_END,  KC_EQL,  KC_LBRC, KC_RBRC, KC_LPRN ,KC_RPRN,
+        _______, _______, _______, _______, _______, KC_SCRL, KC_END,  KC_EQL,  KC_LBRC, KC_RBRC, KC_LPRN ,KC_RPRN,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
index 1d20045489..3d0975bd6b 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_dm_base_wrapper(
     KC_ESC, KC_QUES,KC_UNDS,KC_F1,  KC_F2,      KC_F3,  KC_F4,  KC_MINS,KC_SLSH,KC_BSPC ,
     KC_LSFT,KC_PSCR,KC_PGUP,KC_F5,  KC_F6,      KC_F7,  KC_F8,  KC_HOME,KC_LALT,KC_ENT  ,
-    KC_CAPS,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                     _______,_______,_______,    _______,ADDDD,  _______
 ),
 [_ADJUST] = LAYOUT_dm_base_wrapper(
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
index 4f2de11ce2..b447b5c18c 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_RAISE] = LAYOUT(
-        _______, QK_BOOT,   _______, _______, _______, KC_LBRC,             KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK, KC_MUTE,
+        _______, QK_BOOT,   _______, _______, _______, KC_LBRC,             KC_RBRC, _______, KC_NUM, KC_INS,  KC_SCRL, KC_MUTE,
         _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN,             KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
         _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, KC_VOLD,
                           _______, _______,                                                 KC_EQL,  _______,
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c
index 3549f93248..0518e5dd5a 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_RAISE] = LAYOUT(
-        _______, QK_BOOT,   _______, _______, _______, KC_LBRC,             KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK, KC_MUTE,
+        _______, QK_BOOT,   _______, _______, _______, KC_LBRC,             KC_RBRC, _______, KC_NUM, KC_INS,  KC_SCRL, KC_MUTE,
         _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN,             KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
         _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, KC_VOLD,
                           _______, _______,                                                 KC_EQL,  _______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
index 16dbb9dd42..9c220be47f 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RAISE] = LAYOUT_5x6(
           KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-          _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+          _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
           _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
           _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
                                                   _______,_______,            KC_EQL ,_______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
index 3c5f875009..3f3ae25848 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_5x6(
      KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-     _______,_______,_______,_______,_______,KC_LBRC,                         KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+     _______,_______,_______,_______,_______,KC_LBRC,                         KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
      _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                         KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
      _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,KC_VOLD,
                                      _______,_______,                         KC_EQL ,_______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
index 4a83a5e73a..0872edcc05 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NUMPAD] = LAYOUT_5x6(
-     _______,_______,_______,_______,_______,_______,         _______,KC_NLCK,_______,_______,KC_MINS,KC_EQL ,
+     _______,_______,_______,_______,_______,_______,         _______,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,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
index 54ecf8101d..83b47f3ca9 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [SYMB] = LAYOUT_5x6_wrapper(
        KC_F12 , ______________________F_L__________________,                      ______________________F_R__________________, KC_F11,
-       _______, _________________SYMBOL_L1_________________,                      _________________SYMBOL_R1_________________, KC_NLCK,
+       _______, _________________SYMBOL_L1_________________,                      _________________SYMBOL_R1_________________, KC_NUM,
        _______, _________________SYMBOL_L2_________________,                      _________________SYMBOL_R2_________________, _______,
        _______, _________________SYMBOL_L3_________________,                      _________________SYMBOL_R3_________________, _______,
                                                _______, _______,            KC_P0 , KC_PDOT,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
index 5d9fd3e66e..7928153f9e 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                /* ^^^^ use these */
      KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
      KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
-     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_SCRL,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
      KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
                          KC_NO,    KC_NO,
      /*thumb*/ _______,  _______,  _______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/keymap.json b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/keymap.json
index 90aa13a260..af6392567d 100755
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/keymap.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/keymap.json
@@ -184,7 +184,7 @@
       "KC_TRNS",
       "KC_TRNS",
       "KC_PSCR",
-      "KC_SLCK",
+      "KC_SCRL",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c
index 0b399d81b7..1000e5c01f 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                     _______, _______,
                                     _______, _______,
         // right hand
-                          _______,   _______,   KC_NLCK,   _______,   KC_PMNS,   KC_PPLS,   _______,
+                          _______,   _______,   KC_NUM,    _______,   KC_PMNS,   KC_PPLS,   _______,
                           _______,   _______,   KC_P7,     KC_P8,     KC_P9,     _______,   _______,
                           _______,   _______,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   _______,
                                      _______,   KC_P1,     KC_P2,     KC_P3,     KC_PSLS,   _______,
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/keymap.c
index 37a788bea0..9e5b98a8e6 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                     _______, _______,
                                     _______, _______,
         // right hand
-                          _______,   _______,   KC_NLCK,   _______,   KC_PMNS,   KC_PPLS,   _______,
+                          _______,   _______,   KC_NUM,    _______,   KC_PMNS,   KC_PPLS,   _______,
                           _______,   _______,   KC_P7,     KC_P8,     KC_P9,     _______,   _______,
                           _______,   _______,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   _______,
                                      _______,   KC_P1,     KC_P2,     KC_P3,     KC_PSLS,   _______,
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                     _______, _______,
                                     _______, _______,
         // right hand
-                          _______,   _______,   KC_NLCK,   _______,   KC_PMNS,   KC_PPLS,   _______,
+                          _______,   _______,   KC_NUM,    _______,   KC_PMNS,   KC_PPLS,   _______,
                           _______,   _______,   KC_P7,     KC_P8,     KC_P9,     _______,   _______,
                           _______,   _______,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   _______,
                                      _______,   KC_P1,     KC_P2,     KC_P3,     KC_PSLS,   _______,
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
index 7835e7043f..562f3ebf8b 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RAISE] = LAYOUT_6x6(
         KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
         _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
         _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
         _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______,
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
index c7bc0a97e8..d9e7148004 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RAISE] = LAYOUT_6x6_5_thumb(
         KC_F12 ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,                        KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,
-        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
         _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
         _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
         _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______,
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
index 4524124291..4d3e861dae 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RAISE] = LAYOUT_6x6_4(
         KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
         _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
         _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
         _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______,
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
index b5b63a8537..83fab9409d 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RAISE] = LAYOUT_6x7(
         _______,KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 , _______,
-        _______,_______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE, _______,
+        _______,_______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, _______,
         _______,_______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______,
         _______,_______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD, _______,
         _______,_______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______, _______,
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
index 38a8bf04ff..7a579aef07 100644
--- a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
+++ b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_6x6(
      KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-     _______,_______,_______,_______,_______,KC_LBRC,         KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+     _______,_______,_______,_______,_______,KC_LBRC,         KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
      _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,         KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
      _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,KC_VOLD,
      _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
diff --git a/keyboards/handwired/daishi/keymaps/default/keymap.c b/keyboards/handwired/daishi/keymaps/default/keymap.c
index a75ba88c83..1b32e7d693 100644
--- a/keyboards/handwired/daishi/keymaps/default/keymap.c
+++ b/keyboards/handwired/daishi/keymaps/default/keymap.c
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
  [_QW] = LAYOUT( /* QWERTY */
-  KC_ESC , _______, _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, DM_RSTP, KC_PSCR, KC_SLCK, KC_PAUS, MO(_FN), KC_MUTE,
-  KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL , KC_HOME, KC_PGUP, KC_END , KC_INS , KC_NLCK,
+  KC_ESC , _______, _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, DM_RSTP, KC_PSCR, KC_SCRL, KC_PAUS, MO(_FN), KC_MUTE,
+  KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL , KC_HOME, KC_PGUP, KC_END , KC_INS , 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_MINS, KC_EQL , KC_BSPC, KC_PGDN, 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_EQL ,
diff --git a/keyboards/handwired/datahand/keymaps/default/keymap.c b/keyboards/handwired/datahand/keymaps/default/keymap.c
index fda9cc50a4..1ca6cf8b1f 100644
--- a/keyboards/handwired/datahand/keymaps/default/keymap.c
+++ b/keyboards/handwired/datahand/keymaps/default/keymap.c
@@ -86,7 +86,7 @@ _______, _______, _______,  _______, _______, _______,  _______, _______, ______
 
 [FUNCTION_MOUSE] = LAYOUT(
          KC_F2,                     KC_F4,                  KC_F6,                   KC_MS_U,                      KC_MS_U,                    KC_F8,                   KC_F10,                  KC_PGUP,
-_______, KC_NO, KC_SLCK,   _______, KC_BTN3, NLK,  KC_BTN1, MS, KC_BTN2,    KC_MS_L, KC_BTN1, KC_MS_R,    KC_MS_L, KC_BTN2, KC_MS_R,   KC_END, AR,  KC_LSFT,    KC_INS, KC_9,  KC_ENT,   KC_F11, KC_0,   KC_F12,
+_______, KC_NO, KC_SCRL,   _______, KC_BTN3, NLK,  KC_BTN1, MS, KC_BTN2,    KC_MS_L, KC_BTN1, KC_MS_R,    KC_MS_L, KC_BTN2, KC_MS_R,   KC_END, AR,  KC_LSFT,    KC_INS, KC_9,  KC_ENT,   KC_F11, KC_0,   KC_F12,
          KC_F1,                     KC_F3,                  KC_F5,                   KC_MS_D,                      KC_MS_D,                    KC_F7,                   KC_F9,                   KC_PGDN,
                                                                                              _______,   _______,   _______,   _______,
                                                                                                   _______,              _______,
diff --git a/keyboards/handwired/elrgo_s/keymaps/default/keymap.c b/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
index 8049050f5c..b43c75cf2d 100644
--- a/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
+++ b/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
      [_ADJUST] = LAYOUT_split_3x6_5(
-        KC_NO   , KC_SLEP , KC_VOLU , KC_BRIU , KC_NO   , KC_NO  ,                  KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NLCK ,
+        KC_NO   , KC_SLEP , KC_VOLU , KC_BRIU , KC_NO   , KC_NO  ,                  KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NUM ,
         KC_NO   , KC_WAKE , KC_VOLD , KC_BRID , KC_NO   , KC_NO  ,                  KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   ,
         KC_NO   , KC_NO   , KC_NO   , KC_F13  , KC_F14  , KC_F15 ,                  KC_F16  , KC_F17  , KC_F18  , KC_NO   , KC_NO   , MO(_ADJUST),
                   QK_BOOT, KC_NO   , KC_NO   , KC_TRNS , KC_NO  ,                  KC_NO   , KC_TRNS , KC_TRNS , KC_NO   , KC_NO
diff --git a/keyboards/handwired/evk/v1_3/keymaps/default/keymap.c b/keyboards/handwired/evk/v1_3/keymaps/default/keymap.c
index 1e85f90153..01bf217c61 100644
--- a/keyboards/handwired/evk/v1_3/keymaps/default/keymap.c
+++ b/keyboards/handwired/evk/v1_3/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                       KC_LSFT,  KC_DEL,              KC_SPC,   KC_LGUI,      KC_LEFT,  KC_DOWN,   KC_RGHT,  KC_PGDN,       KC_RGUI,  KC_SPC,              KC_BSPC,  KC_RSFT
 				 ),                                                                                                            
     [1] = LAYOUT(/* 1st Layer - Numpad Keys */                                                                                 
-                 _______,  _______,  _______,  _______,  _______,  _______,       _______,  KC_SLCK,   KC_PAUS,  _______,        _______,  _______,  _______,  _______,  _______,  _______,
+                 _______,  _______,  _______,  _______,  _______,  _______,       _______,  KC_SCRL,   KC_PAUS,  _______,        _______,  _______,  _______,  _______,  _______,  _______,
                  _______,  _______,  _______,  _______,  _______,  _______,       _______,  KC_PSLS,   KC_PAST,  KC_PMNS,        _______,  _______,  _______,  _______,  _______,  _______,
                  _______,  _______,  _______,  _______,  _______,  _______,       KC_P7,    KC_P8,     KC_P9,    KC_PPLS,        _______,  _______,  _______,  _______,  _______,  _______,
                  _______,  _______,  _______,  _______,  _______,                 KC_P4,    KC_P5,     KC_P6,    KC_PPLS,                  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/handwired/fc200rt_qmk/keymaps/default/keymap.c b/keyboards/handwired/fc200rt_qmk/keymaps/default/keymap.c
index eb72c08d62..bcdd1818de 100644
--- a/keyboards/handwired/fc200rt_qmk/keymaps/default/keymap.c
+++ b/keyboards/handwired/fc200rt_qmk/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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,
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index 11463a0162..19d4a8b0b9 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   *
   */
 [_MEDIA] = LAYOUT(
-           QK_BOOT,   KC_SLCK, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU,                                     KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_CALC, KC_NLCK,
+           QK_BOOT,   KC_SCRL, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU,                                     KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_CALC, KC_NUM,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_MPRV, KC_MNXT, KC_MPLY,                                     KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_TRNS, KC_PMNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS, KC_BTN4, KC_BTN5,                                     KC_BTN4, KC_BTN5, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_BTN3, KC_BTN2, KC_BTN1,                                     KC_BTN1, KC_BTN2, KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST, KC_TRNS,
@@ -235,13 +235,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case M_LP: //left pedal
       if (record->event.pressed) {
         layer_on(1);
-        register_code (KC_SLCK);
+        register_code (KC_SCRL);
         key_timer_left_pedal = timer_read(); // if the key is being pressed, we start the timer.
       } else {
         if (timer_elapsed(key_timer_left_pedal) < KEY_DELAY) {
            tap_code (KC_BTN2);
         }
-        unregister_code (KC_SLCK);
+        unregister_code (KC_SCRL);
         layer_off(1);
       }
       break;
diff --git a/keyboards/handwired/hnah108/keymaps/default/keymap.c b/keyboards/handwired/hnah108/keymaps/default/keymap.c
index 44d1e1bceb..53315f8169 100644
--- a/keyboards/handwired/hnah108/keymaps/default/keymap.c
+++ b/keyboards/handwired/hnah108/keymaps/default/keymap.c
@@ -26,9 +26,9 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = 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_SLCK, KC_PAUS,   KC_MYCM, KC_CALC, KC_MPLY, LOWER,
+        KC_ESC,           KC_F1,   KC_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_MYCM, KC_CALC, KC_MPLY, LOWER,
 
-        KC_GRV,  KC_1,    KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_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_SLSH,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSLS,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/handwired/hwpm87/keymaps/default/keymap.c b/keyboards/handwired/hwpm87/keymaps/default/keymap.c
index 850acd2025..93d4f9b71d 100644
--- a/keyboards/handwired/hwpm87/keymaps/default/keymap.c
+++ b/keyboards/handwired/hwpm87/keymaps/default/keymap.c
@@ -6,7 +6,7 @@
 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_SLCK, KC_PAUS, 
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,  
diff --git a/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c b/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c
index cfa6043540..6d6d09a0a5 100644
--- a/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
                      KC_F13,  KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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,
diff --git a/keyboards/handwired/ibm122m/keymaps/default/keymap.c b/keyboards/handwired/ibm122m/keymaps/default/keymap.c
index 53cdcc1c19..5a0754a655 100644
--- a/keyboards/handwired/ibm122m/keymaps/default/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
                      KC_F13,  KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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,
diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
index 56c74b12f6..5707d769de 100644
--- a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
                             KC_F13,   KC_F14,   KC_F15,       KC_F16,   KC_F17,   KC_F18,   KC_F19,   KC_F20,       KC_F21,   KC_F22,   KC_F23,       KC_F24,
                             KC_F1,    KC_F2,    KC_F3,        KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,        KC_F9,    KC_F10,   KC_F11,       KC_F12,
-    KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,      KC_NO,      MO(3),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_P4,   KC_P5,   KC_P6,   MO(4),
     LCTL(KC_F), KC_LALT,    KC_LSHIFT,KC_ESC,   KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
                     KC_F13,   KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22,   KC_F23,    KC_F24,
                     KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_F11,    KC_F12,
-    KC_ESC, TO(0),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC, TO(0),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  KC_NO,  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,  KC_NO,  MO(3),    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
     KC_NO,  KC_NO,  KC_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT(
                     KC_F13,   KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22,   KC_F23,    KC_F24,
                     KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_F11,    KC_F12,
-    KC_ESC, TO(1),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC, TO(1),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  TO(0),  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,  KC_NO,  KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
     KC_NO,  KC_NO,  KC_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [3] = LAYOUT(
                       KC_F1,    KC_F2,  KC_F3,                KC_F4,                KC_F5,                KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,
                       KC_F13,   KC_F14, KC_F15,               KC_F16,               KC_F17,               KC_F18,   KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,     KC_F24,
-    MU_TOG, KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK,    KC_PSLS,    KC_PAST,    KC_PMNS,
+    MU_TOG, KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
     MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,  KC_NO,    KC_NO,    KC_PGUP,  KC_DEL,   KC_NO,    KC_NO,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,      KC_AUDIO_MUTE,        KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_SCLN,    KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
     KC_NO,  KC_LALT,  KC_LSHIFT,KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [4] = LAYOUT(
                       KC_F13,   KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22,   KC_F23, KC_F24,
                       KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_F11, KC_F12,
-    MU_TOG, TO(0),    KC_DLR,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK,    KC_PSLS,    KC_PAST,    KC_PMNS,
+    MU_TOG, TO(0),    KC_DLR,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
     MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
     KC_NO,  KC_LALT,  KC_LSHIFT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_COMMA, KC_DOT, KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT(
      KC_LCTRL,    KC_LALT,  KC_C,     KC_RALT,    KC_E,       KC_F, KC_G, KC_G, KC_H, KC_J, TO(0),  TO(1),  KC_M,     KC_N,   KC_QUOT,    KC_DOWN,  KC_UP,  KC_R,     KC_S,       KC_ENTER,
      KC_PPLS,     KC_B,     KC_C,     KC_D,       KC_A,       KC_S, KC_D, KC_F, KC_J, KC_J, KC_K,   KC_NO,  KC_K,     KC_L,   KC_SCLN,    KC_P4,    KC_DEL, KC_P5,    KC_P6,      KC_RIGHT,
-     KC_PMNS,     KC_1,     KC_C,    KC_D,       KC_1,       KC_2, KC_3, KC_4, KC_7, KC_J, KC_K,   KC_L,   KC_8,     KC_9,   KC_0,       KC_NLCK,  KC_PGUP,KC_PSLS,  KC_PAST,    KC_T,
+     KC_PMNS,     KC_1,     KC_C,    KC_D,       KC_1,       KC_2, KC_3, KC_4, KC_7, KC_J, KC_K,   KC_L,   KC_8,     KC_9,   KC_0,       KC_NUM,   KC_PGUP,KC_PSLS,  KC_PAST,    KC_T,
      KC_A,        KC_ESC,   TO(0),KC_D,     KC_GRV,     KC_F, KC_G, KC_5, KC_6, KC_J, KC_K,   KC_L,   KC_EQL,   KC_N,   KC_MINUS,   KC_BSPC,  KC_INS, KC_HOME,  KC_S,       KC_T,
      KC_PPLS,     KC_NO,    KC_TAB,   KC_D,       KC_Q,       KC_W, KC_E, KC_R, KC_U, KC_J, KC_K,   KC_L,   KC_I,     KC_O,   KC_P,       KC_P7,    KC_PGDN,KC_P8,    KC_P9,      KC_T,
      KC_A,        KC_B,     KC_C,     KC_D,       KC_E,       KC_F, KC_G, KC_T, KC_Y, KC_J, KC_K,   KC_L,   KC_RBRC,  KC_N,   KC_LBRC,    KC_P,     KC_END, KC_R,     KC_S,       KC_T,
diff --git a/keyboards/handwired/ibm122m/keymaps/via/keymap.c b/keyboards/handwired/ibm122m/keymaps/via/keymap.c
index b6cdfbc0d9..7f491def14 100644
--- a/keyboards/handwired/ibm122m/keymaps/via/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
                      KC_F13,  KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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,
diff --git a/keyboards/handwired/jn68m/keymaps/default/keymap.c b/keyboards/handwired/jn68m/keymaps/default/keymap.c
index 8cd1ae4b4c..f0ed52340c 100644
--- a/keyboards/handwired/jn68m/keymaps/default/keymap.c
+++ b/keyboards/handwired/jn68m/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_PSCR, KC_HOME,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_END,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,
   	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END,  KC_TRNS,          KC_TRNS,                   KC_TRNS,
   	QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_APP,                    KC_TRNS, KC_TRNS, KC_TRNS
   ),
diff --git a/keyboards/handwired/jopr/keymaps/default/keymap.c b/keyboards/handwired/jopr/keymaps/default/keymap.c
index 6ba6d88955..1dc0f3a59e 100644
--- a/keyboards/handwired/jopr/keymaps/default/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BL] = LAYOUT(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_DEL,    KC_NO,   KC_CAPS, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_DEL,    KC_NO,   KC_CAPS, 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_PSCR, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_INT5,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,              KC_P4,   KC_P5,   KC_P6,              KC_PGUP, KC_INS,  KC_PGDN,
diff --git a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
index 98c3da616a..edaabe78e6 100644
--- a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
@@ -5,7 +5,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BL] = LAYOUT(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_DEL,    KC_NO,   KC_CAPS, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_DEL,    KC_NO,   KC_CAPS, KC_SCRL, KC_PAUS,
         KC_NUHS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NUBS, KC_SLSH, KC_BSPC,           KC_PSCR, KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_V,    KC_Y,    KC_D,    KC_COMM, KC_QUOT, KC_INT1, KC_J,    KC_M,    KC_L,    KC_U,    KC_LBRC, KC_RBRC, KC_ENT,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_INT5,       KC_A,    KC_T,    KC_H,    KC_E,    KC_B,    KC_MINS, KC_C,    KC_S,    KC_N,    KC_O,    KC_I,    KC_EQL,               KC_P4,   KC_P5,   KC_P6,              KC_PGUP, KC_INS,  KC_PGDN,
diff --git a/keyboards/handwired/jot50/keymaps/default/keymap.c b/keyboards/handwired/jot50/keymaps/default/keymap.c
index a2d76dd9a2..c1981aa4a2 100644
--- a/keyboards/handwired/jot50/keymaps/default/keymap.c
+++ b/keyboards/handwired/jot50/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_ortho_5x12 (
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, BL_STEP, BL_BRTG, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/handwired/jotanck/keymaps/default/keymap.c b/keyboards/handwired/jotanck/keymaps/default/keymap.c
index f9be53c674..6c94b667e2 100644
--- a/keyboards/handwired/jotanck/keymaps/default/keymap.c
+++ b/keyboards/handwired/jotanck/keymaps/default/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_ortho_4x12 (
-    _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/handwired/k_numpad17/keymaps/default/keymap.c b/keyboards/handwired/k_numpad17/keymaps/default/keymap.c
index 2f383eea91..d8b6bb1a02 100644
--- a/keyboards/handwired/k_numpad17/keymaps/default/keymap.c
+++ b/keyboards/handwired/k_numpad17/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   [0] = LAYOUT_numpad_5x4(
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+    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,   
diff --git a/keyboards/handwired/leftynumpad/keymaps/default/keymap.c b/keyboards/handwired/leftynumpad/keymaps/default/keymap.c
index 9a21d9a509..3d3df0b3b7 100644
--- a/keyboards/handwired/leftynumpad/keymaps/default/keymap.c
+++ b/keyboards/handwired/leftynumpad/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     `---------------------------------------'
 */
     [_NP] = LAYOUT(
-        KC_BSPC,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_BSPC,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,    KC_7,    KC_8,   KC_9,
         TG(_NP),   KC_4,    KC_5,   KC_6,    KC_PPLS,
         KC_PGUP,   KC_1,    KC_2,   KC_3,
diff --git a/keyboards/handwired/marauder/keymaps/default/keymap.c b/keyboards/handwired/marauder/keymaps/default/keymap.c
index 932138e27c..73c211fe8f 100644
--- a/keyboards/handwired/marauder/keymaps/default/keymap.c
+++ b/keyboards/handwired/marauder/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 
 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_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_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_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/handwired/marauder/keymaps/orvia/keymap.c b/keyboards/handwired/marauder/keymaps/orvia/keymap.c
index 987e748128..53463fa002 100644
--- a/keyboards/handwired/marauder/keymaps/orvia/keymap.c
+++ b/keyboards/handwired/marauder/keymaps/orvia/keymap.c
@@ -22,8 +22,8 @@ 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_SLCK, 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_NLCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
+        KC_ESC,           KC_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,
diff --git a/keyboards/handwired/marauder/keymaps/via/keymap.c b/keyboards/handwired/marauder/keymaps/via/keymap.c
index c0adf6bd46..05db824298 100644
--- a/keyboards/handwired/marauder/keymaps/via/keymap.c
+++ b/keyboards/handwired/marauder/keymaps/via/keymap.c
@@ -18,32 +18,32 @@
 
 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_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_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_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_P0,            KC_PDOT
     ),
     [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_PAUS, KC_PSCR, KC_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_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_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_P0,            KC_PDOT
     ),
     [2] = LAYOUT(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PAUS, KC_PSCR, KC_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_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_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_P0,            KC_PDOT
     ),
     [3] = LAYOUT(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PAUS, KC_PSCR, KC_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_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_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/handwired/meck_tkl/keymaps/default/keymap.c b/keyboards/handwired/meck_tkl/keymaps/default/keymap.c
index 1df1318db5..8463be46f1 100644
--- a/keyboards/handwired/meck_tkl/keymaps/default/keymap.c
+++ b/keyboards/handwired/meck_tkl/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = 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_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/handwired/myskeeb/keymaps/default/keymap.c b/keyboards/handwired/myskeeb/keymaps/default/keymap.c
index ccaa9f5d28..a1fa77566b 100644
--- a/keyboards/handwired/myskeeb/keymaps/default/keymap.c
+++ b/keyboards/handwired/myskeeb/keymaps/default/keymap.c
@@ -75,8 +75,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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_BSPC,
         KC_CAPS, KC_PDOT, KC_PPLS, KC_PMNS, KC_PAST, KC_PSLS, KC_MSEL,          KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PWR,  QK_BOOT,
-        KC_TAB,  KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                              KC_SLCK, NK_ON,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_LSFT, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_MUTE,          KC_MPLY, KC_NLCK, NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TAB,  KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                              KC_SCRL, NK_ON,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_LSFT, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_MUTE,          KC_MPLY, KC_NUM,  NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC, KC_TRNS, KC_VOLD, KC_VOLU,          KC_MPRV, KC_MNXT, TO(2),   KC_HOME, KC_PGDN, KC_PGUP, KC_END
     ),
     [2] = LAYOUT(
diff --git a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
index 7c8d2211bb..8ed2443441 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
+++ b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   *      `---------------'
   */
   [BASE] = LAYOUT(
-    KC_NLCK,                   KC_MPLY,
+    KC_NUM,                    KC_MPLY,
     KC_CALC, TO(ONE), KC_MPRV, KC_MNXT,
     KC_EQL,  KC_PSLS, KC_PAST, KC_MINS,
     KC_P7,   KC_P8,   KC_P9,
diff --git a/keyboards/handwired/oem_ansi_fullsize/keymaps/default/keymap.c b/keyboards/handwired/oem_ansi_fullsize/keymaps/default/keymap.c
index 48290896fc..7cd63eeaac 100644
--- a/keyboards/handwired/oem_ansi_fullsize/keymaps/default/keymap.c
+++ b/keyboards/handwired/oem_ansi_fullsize/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_LBRC, KC_RBRC,   KC_BSLS,       KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,                             KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/handwired/oem_iso_fullsize/keymaps/default/keymap.c b/keyboards/handwired/oem_iso_fullsize/keymaps/default/keymap.c
index d09eaee768..7364dabd08 100644
--- a/keyboards/handwired/oem_iso_fullsize/keymaps/default/keymap.c
+++ b/keyboards/handwired/oem_iso_fullsize/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 
 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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_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_ENT,       KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,                                            KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/handwired/oem_iso_fullsize/keymaps/via/keymap.c b/keyboards/handwired/oem_iso_fullsize/keymaps/via/keymap.c
index 9b31f963f8..a5339ab7cc 100644
--- a/keyboards/handwired/oem_iso_fullsize/keymaps/via/keymap.c
+++ b/keyboards/handwired/oem_iso_fullsize/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 
 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_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_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_ENT,       KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,                                            KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
index 61516bc611..b19b1d7a27 100644
--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -490,7 +490,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
 KC_INS
 KC_PSCR
-KC_SLCK
+KC_SCRL
 KC_PAUS
 
 */
@@ -498,7 +498,7 @@ KC_PAUS
 [_RAISE] = LAYOUT(
   KC_INS            , XXXXXXX  , KC_BRIU, KC_BRID, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_7 , KC_8   , KC_9     , KC_SLASH , KC_MINUS, KC_EQUAL,
   KC_HOME           , KC_PSCR  , XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX,  KC_4 , KC_5   , KC_6     , KC_ASTR  , XXXXXXX , XXXXXXX,
-  KC_END            , KC_SLCK  , XXXXXXX, XXXXXXX, DEBUG  , XXXXXXX, XXXXXXX, XXXXXXX,  KC_1 , KC_2   , KC_3     , KC_MINUS , XXXXXXX , XXXXXXX,
+  KC_END            , KC_SCRL  , XXXXXXX, XXXXXXX, DEBUG  , XXXXXXX, XXXXXXX, XXXXXXX,  KC_1 , KC_2   , KC_3     , KC_MINUS , XXXXXXX , XXXXXXX,
   XXXXXXX           , KC_PAUSE , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_0 , KC_DOT , KC_COMMA , KC_PLUS  , XXXXXXX , XXXXXXX,
   LALT(LCTL(KC_DEL)), _______  , _______, _______, _______,     _______     ,   KC_KP_ENTER  , _______, _______  , _______  , _______ , _______
 ),
diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
index 9103858300..cc5c58e905 100644
--- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
@@ -178,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT(
   KC_INS,  KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_7,  KC_8,   KC_9,  _______, _______, _______,
   KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_4,  KC_5,   KC_6,  KC_MINS, KC_SLSH, XXXXXXX,
-  KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_1,  KC_2,   KC_3,  KC_PLUS, KC_ASTR, KC_ENT,
+  KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_1,  KC_2,   KC_3,  KC_PLUS, KC_ASTR, KC_ENT,
   KC_PAUS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_NUHS, KC_NUBS,XXXXXXX,  KC_0,  KC_COMM, KC_DOT,KC_EQL, XXXXXXX, _______,
   LALT(LCTL(KC_DEL)), _______, _______, _______, _______,     _______,           _______,     _______,_______,XXXXXXX, XXXXXXX, XXXXXXX
 ),
diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
index adb6c46145..728f4540b8 100644
--- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
@@ -425,7 +425,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
 KC_INS
 KC_PSCR
-KC_SLCK
+KC_SCRL
 KC_PAUS
 
 */
diff --git a/keyboards/handwired/p65rgb/keymaps/default/keymap.c b/keyboards/handwired/p65rgb/keymaps/default/keymap.c
index 6e958eedee..f1cf1db547 100644
--- a/keyboards/handwired/p65rgb/keymaps/default/keymap.c
+++ b/keyboards/handwired/p65rgb/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,        KC_LGUI,    KC_LALT,                            KC_SPC,         MO(1),      KC_APP,             KC_LEFT,    KC_DOWN,    KC_RIGHT),
     [1] = LAYOUT( /* FN */
         KC_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_TRNS, KC_TRNS,   KC_INS,
-        KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_HOME,
+        KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_HOME,
         CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, EEP_RST,  KC_END,
         KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
         KC_TRNS,       KC_TRNS,  KC_TRNS,                               KC_TRNS,                   KC_TRNS, KC_TRNS,  KC_MPRV,      KC_VOLD,  KC_MNXT),
diff --git a/keyboards/handwired/prime_exl/keymaps/default/keymap.c b/keyboards/handwired/prime_exl/keymaps/default/keymap.c
index 324d600149..7cd3b6969e 100644
--- a/keyboards/handwired/prime_exl/keymaps/default/keymap.c
+++ b/keyboards/handwired/prime_exl/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-		KC_NLCK, 	KC_LPRN, 	KC_RPRN, 	KC_PSLS, 	KC_PAST, 	KC_BSPC, 				KC_ESC, 		KC_Q, 			KC_W, 		KC_E, 			KC_R, 		KC_T,				 		KC_Y, 			KC_U, 			KC_I, 			KC_O, 				KC_P, 			KC_BSPC,
+		KC_NUM, 	KC_LPRN, 	KC_RPRN, 	KC_PSLS, 	KC_PAST, 	KC_BSPC, 				KC_ESC, 		KC_Q, 			KC_W, 		KC_E, 			KC_R, 		KC_T,				 		KC_Y, 			KC_U, 			KC_I, 			KC_O, 				KC_P, 			KC_BSPC,
 		KC_F1, 		KC_F2, 		KC_P7, 		KC_P8, 		KC_P9, 		KC_DEL,					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_F3,		KC_F4,		KC_P4,		KC_P5,		KC_P6,		KC_PMNS,				KC_LSFT, 	KC_Z, 			KC_X, 			KC_C, 			KC_V, 		KC_B,				 		MO(3), 		KC_N, 			KC_M, 		KC_COMM,	KC_DOT, 	KC_SLSH, 	KC_LSFT,
 		KC_F5,		KC_F6,		KC_P1,		KC_P2,		KC_P3,		KC_PPLS,				KC_LCTL, 	KC_LALT, 	KC_LBRC, 	KC_RBRC, 			MO(1),									KC_SPC, 					KC_MINS, 	KC_EQL, 			KC_LGUI, 	MO(4),
diff --git a/keyboards/handwired/prime_exl/keymaps/via/keymap.c b/keyboards/handwired/prime_exl/keymaps/via/keymap.c
index b5b616d55b..1ff3241029 100644
--- a/keyboards/handwired/prime_exl/keymaps/via/keymap.c
+++ b/keyboards/handwired/prime_exl/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
-		KC_NLCK, 	KC_LPRN, 	KC_RPRN, 	KC_PSLS, 	KC_PAST, 	KC_BSPC, 				KC_ESC, 		KC_Q, 			KC_W, 		KC_E, 			KC_R, 		KC_T,				 		KC_Y, 			KC_U, 			KC_I, 			KC_O, 				KC_P, 			KC_BSPC,
+		KC_NUM, 	KC_LPRN, 	KC_RPRN, 	KC_PSLS, 	KC_PAST, 	KC_BSPC, 				KC_ESC, 		KC_Q, 			KC_W, 		KC_E, 			KC_R, 		KC_T,				 		KC_Y, 			KC_U, 			KC_I, 			KC_O, 				KC_P, 			KC_BSPC,
 		KC_F1, 		KC_F2, 		KC_P7, 		KC_P8, 		KC_P9, 		KC_DEL,					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_F3,		KC_F4,		KC_P4,		KC_P5,		KC_P6,		KC_PMNS,				KC_LSFT, 	KC_Z, 			KC_X, 			KC_C, 			KC_V, 		KC_B,				 		MO(3), 		KC_N, 			KC_M, 		KC_COMM,	KC_DOT, 	KC_SLSH, 	KC_LSFT,
 		KC_F5,		KC_F6,		KC_P1,		KC_P2,		KC_P3,		KC_PPLS,				KC_LCTL, 	KC_LALT, 	KC_LBRC, 	KC_RBRC, 			MO(2),									KC_SPC, 					KC_MINS, 	KC_EQL, 			KC_LGUI, 	MO(3),
diff --git a/keyboards/handwired/prime_exl_plus/keymaps/default/keymap.c b/keyboards/handwired/prime_exl_plus/keymaps/default/keymap.c
index 8f9fa84f7b..892c15d6f8 100644
--- a/keyboards/handwired/prime_exl_plus/keymaps/default/keymap.c
+++ b/keyboards/handwired/prime_exl_plus/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     LAYOUT(
-        KC_NLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_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_DEL,
         RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_SCLN, KC_BSLS, KC_TRNS,
         RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,          KC_TRNS,
         RGB_M_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/handwired/prime_exl_plus/keymaps/via/keymap.c b/keyboards/handwired/prime_exl_plus/keymaps/via/keymap.c
index 8f9fa84f7b..892c15d6f8 100644
--- a/keyboards/handwired/prime_exl_plus/keymaps/via/keymap.c
+++ b/keyboards/handwired/prime_exl_plus/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     LAYOUT(
-        KC_NLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_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_DEL,
         RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_SCLN, KC_BSLS, KC_TRNS,
         RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,          KC_TRNS,
         RGB_M_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 7a6f7f09f2..1002524e0a 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KC_WWWF KC_WWW_FORWARD
 
 // hybrid right-alt & scroll lock (mapped to Compose in OS)
-#define C_RALT MT(MOD_RALT, KC_SLCK)
+#define C_RALT MT(MOD_RALT, KC_SCRL)
 
 // dual use right-shift & del key
 // #define C_RSFT MT(MOD_RSFT, KC_DEL)
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 17fd7a8419..f88959a1cb 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KC_WWWF KC_WWW_FORWARD
 
 // hybrid right-alt & scroll lock (mapped to Compose in OS)
-#define C_RALT MT(MOD_RALT, KC_SLCK)
+#define C_RALT MT(MOD_RALT, KC_SCRL)
 
 // dual use right-shift & del key
 // #define C_RSFT MT(MOD_RSFT, KC_DEL)
diff --git a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c b/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
index d904dfe85b..58b70d79dc 100644
--- a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
+++ b/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, KC_UP,   _______, _______, _______,                 _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                 _______, _______, _______, _______, _______, _______,     _______,      \
     _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,     _______,      _______, \
-                      _______, _______,     _______,      KC_NLCK,        _______,      _______,     _______, _______
+                      _______, _______,     _______,      KC_NUM,         _______,      _______,     _______, _______
   ),
 
 };
diff --git a/keyboards/handwired/retro_refit/keymaps/default/keymap.c b/keyboards/handwired/retro_refit/keymaps/default/keymap.c
index e2bea57df4..c347d1810f 100644
--- a/keyboards/handwired/retro_refit/keymaps/default/keymap.c
+++ b/keyboards/handwired/retro_refit/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 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_NLCK, KC_SLCK, KC_PSCR, KC_PAUS,
+    KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_NUM,  KC_SCRL, KC_PSCR, KC_PAUS,
     KC_GRV,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
     KC_TAB,     KC_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_BSLS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT, KC_PGDN,
diff --git a/keyboards/handwired/selene/keymaps/bpendragon/keymap.c b/keyboards/handwired/selene/keymaps/bpendragon/keymap.c
index cdafc003e1..4723250e35 100644
--- a/keyboards/handwired/selene/keymaps/bpendragon/keymap.c
+++ b/keyboards/handwired/selene/keymaps/bpendragon/keymap.c
@@ -33,8 +33,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 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_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC, KC_F1, KC_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,
diff --git a/keyboards/handwired/selene/keymaps/default/keymap.c b/keyboards/handwired/selene/keymaps/default/keymap.c
index cdafc003e1..4723250e35 100644
--- a/keyboards/handwired/selene/keymaps/default/keymap.c
+++ b/keyboards/handwired/selene/keymaps/default/keymap.c
@@ -33,8 +33,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 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_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC, KC_F1, KC_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,
diff --git a/keyboards/handwired/sick_pad/keymaps/default/keymap.c b/keyboards/handwired/sick_pad/keymaps/default/keymap.c
index 62e599faa3..de2ccb7897 100644
--- a/keyboards/handwired/sick_pad/keymaps/default/keymap.c
+++ b/keyboards/handwired/sick_pad/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/handwired/split89/keymaps/default/keymap.c b/keyboards/handwired/split89/keymaps/default/keymap.c
index 5b2ed1740d..2d2d6038a0 100644
--- a/keyboards/handwired/split89/keymaps/default/keymap.c
+++ b/keyboards/handwired/split89/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [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_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,  KC_F2,        KC_F3,  KC_F4,  KC_F5,     KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_F11,     KC_F12,    KC_PSCR, KC_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_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_Y,   KC_J,   KC_K,   KC_L,    KC_SCLN,KC_QUOT,    KC_ENT,
diff --git a/keyboards/handwired/swiftrax/beegboy/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/beegboy/keymaps/default/keymap.c
index 1bdad95ff0..d49da88cd9 100644
--- a/keyboards/handwired/swiftrax/beegboy/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/beegboy/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum _layer {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = LAYOUT(
     KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,   KC_F13,      KC_HOME, KC_PGUP, KC_PGDN, KC_END, 
-    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC,   KC_RBRC,  KC_BSLS,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS, 
     KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,   KC_ENT,                KC_P4,   KC_P5,   KC_P6,      
     KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,           KC_UP,         KC_P1,   KC_P2,   KC_P3,   KC_PENT, 
diff --git a/keyboards/handwired/swiftrax/beegboy/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/beegboy/keymaps/via/keymap.c
index 262a03bffa..b9d7259afd 100644
--- a/keyboards/handwired/swiftrax/beegboy/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/beegboy/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT(
     KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,   KC_F13,      KC_HOME, KC_PGUP, KC_PGDN, KC_END, 
-    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC,   KC_RBRC,  KC_BSLS,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS, 
     KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,   KC_ENT,                KC_P4,   KC_P5,   KC_P6,      
     KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,           KC_UP,         KC_P1,   KC_P2,   KC_P3,   KC_PENT, 
diff --git a/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
index 7df7c1a62a..72b4369af8 100644
--- a/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum _layer {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_P1, KC_SLCK, KC_PAUS,
+  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_P1, 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_BSLS, KC_INS,  KC_HOME, KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, KC_MENU,  KC_RCTRL,        KC_LEFT, KC_DOWN, KC_RGHT),
 
 [_FN] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSLS, KC_INS,  KC_HOME, KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
index 74a8e0cef1..fc0af9770f 100644
--- a/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_all(
-  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSLS, KC_INS,  KC_HOME, KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
index a531a24f7d..d2b9a6eb5a 100644
--- a/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
index 01d3241482..e95b64988d 100644
--- a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c
index 2c4c5b3ddf..bedb08f33f 100644
--- a/keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR,            KC_SLCK,   KC_PAUS, KC_HOME, KC_END , KC_DEL ,
-      KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_ESC , KC_F1  , KC_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_HOME, KC_END , KC_DEL ,
+      KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NUM , KC_PSLS, KC_PAST, KC_PMNS,
       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   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,
diff --git a/keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c
index 50ea5443d0..5d507877ee 100644
--- a/keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR,            KC_SLCK,   KC_PAUS, KC_HOME, KC_END , KC_DEL ,
-      KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_ESC , KC_F1  , KC_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_HOME, KC_END , KC_DEL ,
+      KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NUM , KC_PSLS, KC_PAST, KC_PMNS,
       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   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,
diff --git a/keyboards/handwired/swiftrax/joypad/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/joypad/keymaps/default/keymap.c
index 9ba0b61098..f6386bda58 100644
--- a/keyboards/handwired/swiftrax/joypad/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/joypad/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_ortho_6x4(
   KC_MUTE, KC_F13 , KC_F14 , KC_F15 ,
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_NUM , KC_PSLS, KC_PAST, KC_PMNS,
   KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
   KC_P4  , KC_P5  , KC_P6  , KC_PPLS,
   KC_P1  , KC_P2  , KC_P3  , KC_PENT,
diff --git a/keyboards/handwired/swiftrax/joypad/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/joypad/keymaps/via/keymap.c
index 254da6ac8b..aca23e9d93 100644
--- a/keyboards/handwired/swiftrax/joypad/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/joypad/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_ortho_6x4(
   KC_MUTE, KC_F13 , KC_F14 , KC_F15 ,
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_NUM , KC_PSLS, KC_PAST, KC_PMNS,
   KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
   KC_P4  , KC_P5  , KC_P6  , KC_PPLS,
   KC_P1  , KC_P2  , KC_P3  , KC_PENT,
diff --git a/keyboards/handwired/swiftrax/pandamic/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/pandamic/keymaps/default/keymap.c
index 3dd8992279..bcce281b52 100644
--- a/keyboards/handwired/swiftrax/pandamic/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/pandamic/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum _layer {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT(
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,          KC_MUTE,
+  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,          KC_MUTE,
   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                  KC_DEL,
   KC_P4,   KC_P5,   KC_P6,              KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                            KC_END,
   KC_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_LSFT, MO(_FN), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_UP,         KC_HOME,
diff --git a/keyboards/handwired/swiftrax/pandamic/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/pandamic/keymaps/via/keymap.c
index 877411206e..f20a2addc4 100644
--- a/keyboards/handwired/swiftrax/pandamic/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/pandamic/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT(
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,          KC_MUTE,
+  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,          KC_MUTE,
   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                  KC_DEL,
   KC_P4,   KC_P5,   KC_P6,              KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                            KC_END,
   KC_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_LSFT, MO(1),   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_UP,         KC_HOME,
diff --git a/keyboards/handwired/swiftrax/the_galleon/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/the_galleon/keymaps/default/keymap.c
index 46bd189da1..9435888bb9 100644
--- a/keyboards/handwired/swiftrax/the_galleon/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/the_galleon/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
     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,                         KC_MPRV, KC_VOLU, KC_VOLD, KC_MNXT,
     KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,                         KC_HOME, KC_PGUP, KC_PGDN, KC_END,
-    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,  KC_DEL,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,  KC_DEL,     KC_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_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,
diff --git a/keyboards/handwired/swiftrax/the_galleon/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/the_galleon/keymaps/via/keymap.c
index 46bd189da1..9435888bb9 100644
--- a/keyboards/handwired/swiftrax/the_galleon/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/the_galleon/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
     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,                         KC_MPRV, KC_VOLU, KC_VOLD, KC_MNXT,
     KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,                         KC_HOME, KC_PGUP, KC_PGDN, KC_END,
-    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,  KC_DEL,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,  KC_DEL,     KC_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_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,
diff --git a/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c
index b21f56c40e..9c0475ac56 100644
--- a/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c
index bc68fca2e3..240bf085d2 100644
--- a/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/handwired/symmetric70_proto/keymaps/default/keymap.c b/keyboards/handwired/symmetric70_proto/keymaps/default/keymap.c
index d396907146..f3c6075885 100644
--- a/keyboards/handwired/symmetric70_proto/keymaps/default/keymap.c
+++ b/keyboards/handwired/symmetric70_proto/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      //_TRNS_END_LEFT_DOWN_RGHT_PGDN_DEL_TRNS  _TRNS_DEL_PGDN_LEFT_DOWN_RGHT_END_TRNS
      //_TRNS_PSCR_TRNS_TRNS_NO_NO              _NO_NO_TRNS_TRNS_PSCR_TRNS
        KC_NO, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,               KC_NO,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_NO, KC_NO,   KC_PAUS, KC_SLCK, KC_NO,   KC_NO,   KC_NO,               KC_NO,  KC_NO,   KC_NO,   KC_SLCK, KC_PAUS, KC_NO,   KC_F12,
+       KC_NO, KC_NO,   KC_PAUS, KC_SCRL, KC_NO,   KC_NO,   KC_NO,               KC_NO,  KC_NO,   KC_NO,   KC_SCRL, KC_PAUS, KC_NO,   KC_F12,
      _______, KC_HOME, KC_NO,   KC_UP,   KC_NO,   KC_PGUP, KC_INS,              KC_INS, KC_PGUP, KC_NO,   KC_UP,   KC_NO,   KC_HOME, _______,
      _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DEL, KC_NO,KC_NO, KC_DEL, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,
      _______,          KC_PSCR, _______, _______, KC_NO,           KC_NO,KC_NO,         KC_NO,   _______, _______, KC_PSCR,          _______
diff --git a/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c b/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
index 9701e7e928..7654b6a6b8 100644
--- a/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
+++ b/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      //_TRNS_END_LEFT_DOWN_RGHT_PGDN_DEL_TRNS  _TRNS_DEL_PGDN_LEFT_DOWN_RGHT_END_TRNS
      //_TRNS_PSCR_TRNS_TRNS_NO_NO              _NO_NO_TRNS_TRNS_PSCR_TRNS
        KC_NO, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,               KC_NO,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_NO, KC_NO,   KC_PAUS, KC_SLCK, KC_NO,   KC_NO,   KC_NO,               KC_NO,  KC_NO,   KC_NO,   KC_SLCK, KC_PAUS, KC_NO,   KC_F12,
+       KC_NO, KC_NO,   KC_PAUS, KC_SCRL, KC_NO,   KC_NO,   KC_NO,               KC_NO,  KC_NO,   KC_NO,   KC_SCRL, KC_PAUS, KC_NO,   KC_F12,
      _______, KC_HOME, KC_NO,   KC_UP,   KC_NO,   KC_PGUP, KC_INS,              KC_INS, KC_PGUP, KC_NO,   KC_UP,   KC_NO,   KC_HOME, _______,
      _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DEL, KC_NO,KC_NO, KC_DEL, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,
      _______,          KC_PSCR, _______, _______, KC_NO,           KC_NO,KC_NO,         KC_NO,   _______, _______, KC_PSCR,          _______
diff --git a/keyboards/handwired/t111/keymaps/default/keymap.c b/keyboards/handwired/t111/keymaps/default/keymap.c
index e76a837db2..f765dfac84 100644
--- a/keyboards/handwired/t111/keymaps/default/keymap.c
+++ b/keyboards/handwired/t111/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------------------------------------------'
 */
     [0] = LAYOUT(
-    KC_NO,            KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_ESC,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_INS,  KC_DEL,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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_PSCR, KC_SCRL, KC_PAUS,
+    KC_ESC,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_INS,  KC_DEL,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP, KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_EQL,
     KC_LCTRL, KC_A,   KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,        KC_ENT,    KC_HOME, KC_END,   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_RCTRL,       KC_RSFT,   KC_UP,   KC_DOWN,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/handwired/t111/keymaps/oleg/keymap.c b/keyboards/handwired/t111/keymaps/oleg/keymap.c
index c3cafe5368..aa73788fb3 100644
--- a/keyboards/handwired/t111/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/t111/keymaps/oleg/keymap.c
@@ -94,9 +94,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     [0] = LAYOUT(
     KC_LGUI,          KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_VOLD,   KC_VOLU, KC_MUTE,  KC_PSCR,
-    KC_ESC,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_PGUP, KC_HOME,  KC_NLCK, 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_GRV, KC_BSPC,   KC_PGUP, KC_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,        KC_ENT,    KC_PGDN, KC_END,   KC_P7,   KC_P8,   KC_P9,   KC_EQL,
-    KC_LCTRL, KC_A,   KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,                   KC_DEL,  KC_NLCK,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_LCTRL, KC_A,   KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,                   KC_DEL,  KC_NUM,   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, MC1,            KC_RSFT,   KC_UP,   KC_DOWN,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
                    KC_CAPS, KC_LALT,                                KC_SPC,                                    MO(1),                   KC_LEFT, KC_RGHT,     KC_P0,   KC_PDOT
     ),
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
     VRSN,             KC_SLEP, _______, UC_MOD,  _______, _______, _______, _______, _______, _______,        _______,        _______, _______, _______, _______, _______, _______,
     _______, _______, X(UAT),  X(UHSH), X(UDLR), X(USCT), X(UCFX), X(UAMP), X(UAST), _______, _______,        _______,               _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
-    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SLCK, KC_PAUS,        XP(ULSB, ULCB), XP(URSB, URCB),        _______,   _______, _______, _______, _______, _______, _______,
+    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SCRL, KC_PAUS,        XP(ULSB, ULCB), XP(URSB, URCB),        _______,   _______, _______, _______, _______, _______, _______,
     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______, _______, XP(USCO, UCLN), XP(UAPO, UQOT),        _______,                          _______, _______, _______, _______, _______, _______,
     _______,          _______, _______, KC_BTN4, _______, _______, _______, _______, XP(UCOM, ULTH), XP(UDOT, UGTH), XP(USLS, UQUE),        KC_APP,               _______,    _______, _______, _______, _______, _______, _______,
                    _______, _______,                               _______,                                   _______,                                   _______, _______,    _______,   _______
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index 413314e836..fe871b67a0 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNCTION] = LAYOUT(
   _______, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_INS,
   KC_CAPS, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_PSCR,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_SLCK,
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_SCRL,
   _______, _______, XXXXXXX, _______,     _______,          _______,      _______, XXXXXXX, XXXXXXX, KC_PAUS
   ),
 
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c
index 00ab669d99..4e943bb40c 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_RAISE] = LAYOUT_4x6_right(
-    _______,QK_BOOT,  _______,_______,_______,KC_LBRC,            KC_RBRC,_______,KC_NLCK,KC_INS, KC_SLCK,KC_MUTE,
+    _______,QK_BOOT,  _______,_______,_______,KC_LBRC,            KC_RBRC,_______,KC_NUM,KC_INS, KC_SCRL,KC_MUTE,
     _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,            KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
     _______,_______,_______,_______,_______,_______,            _______,_______,_______,_______,_______,KC_VOLD,
                     _______,_______,                                            KC_EQL ,_______,
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c
index 488f6e4b92..651ea03461 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_5x6_right(
        KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-       _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+       _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
        _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
                        _______,_______,                                                        KC_EQL ,_______,
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
index 50bbf232b5..ce4066dca2 100644
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
+++ b/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
@@ -22,7 +22,7 @@ layer_state_t layer_state_set_user(layer_state_t state)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ortho_6x4(
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		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,
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json b/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json
index 5335c651fa..fca4d01591 100644
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json
+++ b/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json
@@ -1 +1 @@
-[["KC_NLCK", "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
+[["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/default/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/default/keymap.c
index 0ca7d512f4..afe5a930a3 100644
--- a/keyboards/handwired/tritium_numpad/keymaps/default/keymap.c
+++ b/keyboards/handwired/tritium_numpad/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BL] = LAYOUT_numpad_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, 
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+    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,   
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_numpad_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, 
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
     KC_P7,   KC_P8,   KC_P9,   
     KC_P4,   KC_P5,   KC_P6,   QK_BOOT,   
     KC_P1,   KC_P2,   KC_P3,   
diff --git a/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
index 9f1f8b014b..540cbe8c59 100644
--- a/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
+++ b/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_ortho_6x4(
     KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, 
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
     KC_P7,   KC_P8,   KC_P9,   QK_BOOT, 
     KC_P4,   KC_P5,   KC_P6,   KC_PENT, 
     KC_P1,   KC_P2,   KC_P3,   KC_PENT, 
diff --git a/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c b/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
index f01f9788f3..c760b0b24d 100644
--- a/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
+++ b/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
@@ -55,12 +55,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case NUMSLCK: {
             if (record->event.pressed) {
                 if (keyboard_report->mods & MODS_SHIFT_MASK) {
-                    tap_code(KC_NLCK);
+                    tap_code(KC_NUM);
                 } else {
-                    register_code(KC_SLCK);
+                    register_code(KC_SCRL);
                 }
             } else {
-                unregister_code(KC_SLCK);
+                unregister_code(KC_SCRL);
             }
             break;
         }
diff --git a/keyboards/handwired/uthol/keymaps/default/keymap.c b/keyboards/handwired/uthol/keymaps/default/keymap.c
index 118ea6872f..9ad1251f76 100644
--- a/keyboards/handwired/uthol/keymaps/default/keymap.c
+++ b/keyboards/handwired/uthol/keymaps/default/keymap.c
@@ -30,5 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_COLEMAK]  = LAYOUT_uthol(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
   [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
   [_RAISE]    = LAYOUT_uthol(KC_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_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
-  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
+  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SCRL, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NUM, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
 };
diff --git a/keyboards/handwired/uthol/keymaps/numswap/keymap.c b/keyboards/handwired/uthol/keymaps/numswap/keymap.c
index 7e06ee4da1..8bcac56cba 100644
--- a/keyboards/handwired/uthol/keymaps/numswap/keymap.c
+++ b/keyboards/handwired/uthol/keymaps/numswap/keymap.c
@@ -30,5 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_COLEMAK]  = LAYOUT_uthol(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
   [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
   [_RAISE]    = LAYOUT_uthol(KC_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_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
-  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_NO, KC_NLCK, KC_CAPS, 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_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
+  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SCRL, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_NO, KC_NUM, KC_CAPS, 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_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/handwired/uthol/keymaps/oled/keymap.c b/keyboards/handwired/uthol/keymaps/oled/keymap.c
index 6c25db3b6f..ed087413d7 100644
--- a/keyboards/handwired/uthol/keymaps/oled/keymap.c
+++ b/keyboards/handwired/uthol/keymaps/oled/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_COLEMAK]  = LAYOUT_uthol(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
     [_RAISE]    = LAYOUT_uthol(KC_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_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
-    [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
+    [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SCRL, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NUM, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
 };
 
 #define ANIM_SIZE 1024           // number of bytes in array, minimize for adequate firmware size, max is 1024
diff --git a/keyboards/handwired/videowriter/keymaps/default/keymap.c b/keyboards/handwired/videowriter/keymaps/default/keymap.c
index 49c706cef9..4e8c161c80 100644
--- a/keyboards/handwired/videowriter/keymaps/default/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *        `------------------------------------------------------------------'
  */
   [_BASE] = LAYOUT(
-		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SLCK, KC_INS,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SCRL, KC_INS,      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_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_LCAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,           RCTL_T(KC_BSLS),
diff --git a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
index 9ae6e04054..c71d8ea050 100644
--- a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
   [_BASE] = LAYOUT(
-		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SLCK, KC_INS,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SCRL, KC_INS,      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_MINS, KC_EQL,  KC_BSPC, MO(_FN1),
 		LT(_FN1, KC_TAB),  KC_Q, KC_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_RGUI,
diff --git a/keyboards/handwired/videowriter/keymaps/via/keymap.c b/keyboards/handwired/videowriter/keymaps/via/keymap.c
index 1988587ff3..8b46e60a34 100644
--- a/keyboards/handwired/videowriter/keymaps/via/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
   [0] = LAYOUT(
-		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SLCK, KC_INS,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SCRL, KC_INS,      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_MINS, KC_EQL,  KC_BSPC, MO(1),
 		LT(1, KC_TAB),  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC,   KC_BSLS,
 		KC_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_RGUI,
diff --git a/keyboards/handwired/woodpad/keymaps/default/keymap.c b/keyboards/handwired/woodpad/keymaps/default/keymap.c
index d57efd8c11..5d230c7309 100644
--- a/keyboards/handwired/woodpad/keymaps/default/keymap.c
+++ b/keyboards/handwired/woodpad/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NUMLOCK] = LAYOUT_ortho_5x4( /* Base */
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
         KC_P1,   KC_P2,   KC_P3,   KC_COMM,
@@ -58,7 +58,7 @@ static bool numlock_down = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case KC_NLCK:
+        case KC_NUM:
             if (record->event.pressed) {
                 numlock_down = true;
                 if (IS_LAYER_ON(_ALT)) {
diff --git a/keyboards/handwired/xealous/keymaps/default/keymap.c b/keyboards/handwired/xealous/keymaps/default/keymap.c
index c0ce72214d..debf43e1a2 100644
--- a/keyboards/handwired/xealous/keymaps/default/keymap.c
+++ b/keyboards/handwired/xealous/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Layer 1: Numpad */
   [_NUMPAD] = LAYOUT(
-    _______,  _______,  _______, _______,  _______,  _______,  _______,   KC_NLCK,  KC_PSLS,  KC_PAST,    KC_MINUS,  _______, _______,  KC_BSPC,
+    _______,  _______,  _______, _______,  _______,  _______,  _______,   KC_NUM,   KC_PSLS,  KC_PAST,    KC_MINUS,  _______, _______,  KC_BSPC,
     _______,  _______,  _______, _______,  _______,  _______,  _______,     KC_P7,  KC_P8,        KC_P9,    KC_PLUS,  _______, _______,   KC_BSLS,
     _______,  _______,  _______, _______,  _______,  _______,  _______,     KC_P4,  KC_P5,        KC_P6,    KC_BSPC, _______,          _______,
     _______,  _______,  _______, _______,  _______,  _______,  _______,     KC_P1,  KC_P2,        KC_P3,    KC_DOT,                   _______,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Layer 2: RAISE */
   [_FN] = LAYOUT(
      KC_GRV,    KC_F1,    KC_F2,   KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,   KC_F12,   KC_DEL,
-    KC_CAPS,  KC_PGUP,    KC_UP, KC_PGDN,  _______,  _______,  _______,  KC_PGUP,    KC_UP,  KC_PGDN,    KC_PSCR, KC_SLCK,  KC_PAUS,  _______,
+    KC_CAPS,  KC_PGUP,    KC_UP, KC_PGDN,  _______,  _______,  _______,  KC_PGUP,    KC_UP,  KC_PGDN,    KC_PSCR, KC_SCRL,  KC_PAUS,  _______,
     _______,  KC_LEFT,  KC_DOWN,KC_RIGHT,  _______,  KC_HOME,  KC_HOME,  KC_LEFT,  KC_DOWN, KC_RIGHT,    KC_INS,  KC_DEL,             _______,
     _______,  _______,  _______, _______,  _______,  KC_END,   KC_END,   AU_TOG,  KC_VOLD,  KC_VOLU,    KC_MUTE,                     _______,
     _______,  _______,  _______, _______,           _______,             _______,  _______,              _______, _______,  _______
diff --git a/keyboards/handwired/z150/keymaps/default/keymap.c b/keyboards/handwired/z150/keymaps/default/keymap.c
index 4df6761859..2784300db5 100644
--- a/keyboards/handwired/z150/keymaps/default/keymap.c
+++ b/keyboards/handwired/z150/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------------------------------------------------------------------------------------------------------'
 */
     [0] = LAYOUT(
-    KC_F1,  KC_F2, KC_ESC,   KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_NLCK,    KC_SLCK,       KC_PAUS,
+    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_NUM,     KC_SCRL,       KC_PAUS,
     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_P7,   KC_P8,   KC_P9,   KC_PSCR,
     KC_F5,  KC_F6, KC_LCTRL, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,    KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
     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_P1,   KC_P2,   KC_P3,   KC_PPLS,
diff --git a/keyboards/handwired/z150/keymaps/zyxx/keymap.c b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
index b342b66be2..68269b7bba 100644
--- a/keyboards/handwired/z150/keymaps/zyxx/keymap.c
+++ b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------------------------------------------------------------------------------------------------------'
 */
     [_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_SLCK,       MO(_FN1),
+    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_LCTRL, KC_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,
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `---------------------------------------------------------------------------------------------------------------------------'
 */
     [_FN1] = LAYOUT(
-    QK_BOOT, _______, _______,  KC_F11,  KC_F12,  AU_ON,   AU_OFF,  CK_TOGG, CK_UP,   CK_DOWN, CK_RST,  _______, _______, _______, _______, KC_DEL,    KC_NLCK,    KC_PSLS,       _______,
+    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,
diff --git a/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c b/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c
index 22fe42b3ab..f1a4b2eaea 100644
--- a/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c
+++ b/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_tkl_ansi_wkl(
-    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_PAUS,
     KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_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,
diff --git a/keyboards/helix/pico/keymaps/mtei/keymap.c b/keyboards/helix/pico/keymaps/mtei/keymap.c
index 905f29a294..a93617b599 100644
--- a/keyboards/helix/pico/keymaps/mtei/keymap.c
+++ b/keyboards/helix/pico/keymaps/mtei/keymap.c
@@ -162,8 +162,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, ____z_____z_____z_____z,KC_SPC, ____z_____z_____z,____z_____z_____z_____z, _______
    ),
   /* Lower */
-#define XXXX__PAUS__SLCK___INS__XXXX   XXXXXXX, KC_PAUS, KC_SLCK, KC_INS,  XXXXXXX
-#define XXXX___INS__SLCK__PAUS__XXXX   XXXXXXX, KC_INS,  KC_SLCK, KC_PAUS, XXXXXXX
+#define XXXX__PAUS__SLCK___INS__XXXX   XXXXXXX, KC_PAUS, KC_SCRL, KC_INS,  XXXXXXX
+#define XXXX___INS__SLCK__PAUS__XXXX   XXXXXXX, KC_INS,  KC_SCRL, KC_PAUS, XXXXXXX
 #define HOME__XXXX____UP___DEL__PGUP   KC_HOME, XXXXXXX, KC_UP,   KC_DEL,  KC_PGUP
 #define PGUP___DEL____UP__XXXX__HOME   KC_PGUP, KC_DEL,  KC_UP,   XXXXXXX, KC_HOME
 #define END___LEFT__DOWN__RGHT__PGDN   kc5( END,  LEFT,  DOWN,    RGHT,    PGDN )
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index 6877fe7fa4..09c7ab127b 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -245,8 +245,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 
   /*  Keypad function layer */
-#define PAUS__SLCK__PSCR              KC_PAUS, KC_SLCK, KC_PSCR
-#define PSCR__SLCK__PAUS              KC_PSCR, KC_SLCK, KC_PAUS
+#define PAUS__SLCK__PSCR              KC_PAUS, KC_SCRL, KC_PSCR
+#define PSCR__SLCK__PAUS              KC_PSCR, KC_SCRL, KC_PAUS
 #define HOME___UP___PGUP              KC_HOME, KC_UP,   KC_PGUP
 #define PGUP___UP___HOME              KC_PGUP, KC_UP,   KC_HOME
 #define DEL____INS__LEFT__DOWN__RGHT  KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
@@ -273,8 +273,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 
   /* Lower */
-#define XXXX__PAUS__SLCK___INS         XXXX, KC_PAUS, KC_SLCK, KC_INS
-#define XXXX___INS__SLCK__PAUS__XXXX   XXXX, KC_INS,  KC_SLCK, KC_PAUS, XXXX
+#define XXXX__PAUS__SLCK___INS         XXXX, KC_PAUS, KC_SCRL, KC_INS
+#define XXXX___INS__SLCK__PAUS__XXXX   XXXX, KC_INS,  KC_SCRL, KC_PAUS, XXXX
 #define ADJ___ADJ                      KC_ADJ,  KC_ADJ
 #define HOME__XXXX___UP____DEL__PGUP   KC_HOME, XXXX, KC_UP, KC_DEL, KC_PGUP
 #define PGUP___DEL___UP___XXXX__HOME   KC_PGUP, KC_DEL,  KC_UP, XXXX, KC_HOME
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
index f9ca3a4b4a..70bd84067c 100644
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy/keymap.c
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  _______, 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_NLCK,  KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______, \
+      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______, \
       _______,  _______, KC_PDOT,    KC_COMM, _______, _______,        _______  \
       )
 };
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
index 63d00cd486..fe375154f8 100644
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
@@ -200,14 +200,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  _______, 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_NLCK,  KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______, \
+      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_NLCK,  KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______, \
+      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______, \
       _______,  _______, KC_PDOT,    JP_COMM, _______, _______,        _______  \
       ),
   
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
index 6877fe7fa4..09c7ab127b 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
@@ -245,8 +245,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 
   /*  Keypad function layer */
-#define PAUS__SLCK__PSCR              KC_PAUS, KC_SLCK, KC_PSCR
-#define PSCR__SLCK__PAUS              KC_PSCR, KC_SLCK, KC_PAUS
+#define PAUS__SLCK__PSCR              KC_PAUS, KC_SCRL, KC_PSCR
+#define PSCR__SLCK__PAUS              KC_PSCR, KC_SCRL, KC_PAUS
 #define HOME___UP___PGUP              KC_HOME, KC_UP,   KC_PGUP
 #define PGUP___UP___HOME              KC_PGUP, KC_UP,   KC_HOME
 #define DEL____INS__LEFT__DOWN__RGHT  KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
@@ -273,8 +273,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 
   /* Lower */
-#define XXXX__PAUS__SLCK___INS         XXXX, KC_PAUS, KC_SLCK, KC_INS
-#define XXXX___INS__SLCK__PAUS__XXXX   XXXX, KC_INS,  KC_SLCK, KC_PAUS, XXXX
+#define XXXX__PAUS__SLCK___INS         XXXX, KC_PAUS, KC_SCRL, KC_INS
+#define XXXX___INS__SLCK__PAUS__XXXX   XXXX, KC_INS,  KC_SCRL, KC_PAUS, XXXX
 #define ADJ___ADJ                      KC_ADJ,  KC_ADJ
 #define HOME__XXXX___UP____DEL__PGUP   KC_HOME, XXXX, KC_UP, KC_DEL, KC_PGUP
 #define PGUP___DEL___UP___XXXX__HOME   KC_PGUP, KC_DEL,  KC_UP, XXXX, KC_HOME
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
index d57d3ccdc7..ba847730c7 100644
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_MPLY, KC_MPRV, KC_MNXT, ____, ____, ____, ____, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ____, KC_BSPC,
+        KC_CAPS, KC_MPLY, KC_MPRV, KC_MNXT, ____, ____, ____, ____, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, ____, KC_BSPC,
         ____, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, ____, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         ____, ____, ____, ____, ____, ____, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, ____, ____,
         ____, ____, ____, KC_MSTP, ____),
diff --git a/keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c b/keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c
index 04ff804861..3a8d2ed2a3 100644
--- a/keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FN] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
         KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         DF(_DEFAULT), DF(_ALTERNATE), KC_TRNS, KC_MSTP, KC_TRNS)};
diff --git a/keyboards/hhkb/ansi/keymaps/default/keymap.c b/keyboards/hhkb/ansi/keymaps/default/keymap.c
index c63ef6a579..461a1b73b9 100644
--- a/keyboards/hhkb/ansi/keymaps/default/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
diff --git a/keyboards/hhkb/ansi/keymaps/krusli/keymap.c b/keyboards/hhkb/ansi/keymaps/krusli/keymap.c
index c63ef6a579..461a1b73b9 100644
--- a/keyboards/hhkb/ansi/keymaps/krusli/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/krusli/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
diff --git a/keyboards/hhkb/ansi/keymaps/lxol/keymap.c b/keyboards/hhkb/ansi/keymaps/lxol/keymap.c
index 7496c542eb..25e75c8f99 100644
--- a/keyboards/hhkb/ansi/keymaps/lxol/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/lxol/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
index 60945b9414..71a24fa2a5 100644
--- a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [HHKB] = LAYOUT(
   KC_PWR,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL, \
-  KC_CAPS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    KC_TRNS,  KC_BSPC,          \
+  KC_CAPS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    KC_TRNS,  KC_BSPC,          \
   KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  KC_PAST,  KC_PSLS,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  KC_PENT,                    \
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  KC_DOWN,  KC_TRNS,  KC_TRNS,                    \
                      KC_TRNS, KC_TRNS,           KC_TRNS,                KC_TRNS, KC_TRNS),
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
     [FUNK] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c b/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c
index ea6da450cf..d1f56e0362 100644
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap.c b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
index 613e096a7f..bc901472f6 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_HHKB] = LAYOUT(
         KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, QWERTY,  DVORAK,  COLEMAK, PSEUDO,  TENKEY,  MOUSE,   XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   XXXXXXX, KC_NLCK,
+        KC_CAPS, QWERTY,  DVORAK,  COLEMAK, PSEUDO,  TENKEY,  MOUSE,   XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   XXXXXXX, KC_NUM,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, XXXXXXX, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         _______, DM_STA1, DM_PLY1, XXXXXXX, MACMODE, XXXXXXX, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         _______, _______, KC_SPC,  _______, _______
@@ -241,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_SPACE_FN] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_DEL,
-        _______, KC_HOME, KC_UP,   KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END,  XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+        _______, KC_HOME, KC_UP,   KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END,  XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______,
         _______, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, KC_SPC,  XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, _______, XXXXXXX,
         _______, _______, _______, _______, _______
diff --git a/keyboards/hhkb/ansi/keymaps/smt/keymap.c b/keyboards/hhkb/ansi/keymaps/smt/keymap.c
index 317a8faf5c..81314e01b7 100644
--- a/keyboards/hhkb/ansi/keymaps/smt/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/smt/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_HHKB] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_BSPC,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, KC_BSPC,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______,
         _______, _______, _______, _______, _______)};
diff --git a/keyboards/hhkb/ansi/keymaps/via/keymap.c b/keyboards/hhkb/ansi/keymaps/via/keymap.c
index bdbd32898a..7a9e15b101 100644
--- a/keyboards/hhkb/ansi/keymaps/via/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/via/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c b/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
index 9bc5d59302..d14e2fdd33 100644
--- a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Layer 3: Functions */
   [_FL] = LAYOUT(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT,
-    _______, _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     KC_CAPS, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
     _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END,  _______, _______, _______, _______,          _______, _______,
              _______, _______,                   _______,                                     _______, _______
diff --git a/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c b/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
index cea713dbf2..cfcd571405 100644
--- a/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/default/keymap.c b/keyboards/hhkb/jp/keymaps/default/keymap.c
index 5eef20c5e6..8c3f6d6778 100644
--- a/keyboards/hhkb/jp/keymaps/default/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/default_mac/keymap.c b/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
index 366c05a617..c474a95c2d 100644
--- a/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/default_mac/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/dhertz/keymap.c b/keyboards/hhkb/jp/keymaps/dhertz/keymap.c
index 4c01457464..5c2511df64 100644
--- a/keyboards/hhkb/jp/keymaps/dhertz/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/dhertz/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [2] = LAYOUT_jp(
             KC_PWR,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_INS,KC_DEL,
-            KC_CAPS,  DF(0),  DF(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,KC_TRNS,
+            KC_CAPS,  DF(0),  DF(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,KC_TRNS,
             KC_TRNS,   KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_TRNS,KC_BSPC, KC_DEL,CMD_SFT_L,KC_LEFT,KC_RGHT,KC_TRNS,KC_PENT,
             KC_TRNS,    KC_TRNS,KC_TRNS,CMD_ALT_C,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DOWN,KC_TRNS,KC_PGUP,KC_TRNS,
             KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,      KC_TRNS      ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_HOME,KC_PGDN, KC_END
diff --git a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
index b2135b9f0e..1b8e41de0e 100644
--- a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_jp(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+        KC_CAPS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
index 0e050c25df..7fc59c84c6 100644
--- a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c b/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
index 268c43f2a0..3ba9ac5d90 100644
--- a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FUNC] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/via/keymap.c b/keyboards/hhkb/jp/keymaps/via/keymap.c
index 171dad81af..65f7dcf791 100644
--- a/keyboards/hhkb/jp/keymaps/via/keymap.c
+++ b/keyboards/hhkb/jp/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_jp(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/hhkb/yang/keymaps/default/keymap.c b/keyboards/hhkb/yang/keymaps/default/keymap.c
index f91e1fc243..18ba2d5fed 100644
--- a/keyboards/hhkb/yang/keymaps/default/keymap.c
+++ b/keyboards/hhkb/yang/keymaps/default/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT_60_hhkb(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
diff --git a/keyboards/hhkb/yang/keymaps/kanru/keymap.c b/keyboards/hhkb/yang/keymaps/kanru/keymap.c
index c5d57c4cb3..ea020de126 100644
--- a/keyboards/hhkb/yang/keymaps/kanru/keymap.c
+++ b/keyboards/hhkb/yang/keymaps/kanru/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [HHKB] = LAYOUT_60_hhkb(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_VBAT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_VBAT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/hhkb_lite_2/keymaps/default/keymap.c b/keyboards/hhkb_lite_2/keymaps/default/keymap.c
index e69dacc791..3ac980333b 100644
--- a/keyboards/hhkb_lite_2/keymaps/default/keymap.c
+++ b/keyboards/hhkb_lite_2/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            ),
 	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_DEL,
-        KC_CAPS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  KC_NO,        KC_TRNS,
+        KC_CAPS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  KC_NO,        KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,         KC_TRNS,
         KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN,          KC_TRNS,
                  KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS,                   KC_TRNS, KC_TRNS,
diff --git a/keyboards/hhkb_lite_2/keymaps/via/keymap.c b/keyboards/hhkb_lite_2/keymaps/via/keymap.c
index 953bed291e..80822d3dfd 100644
--- a/keyboards/hhkb_lite_2/keymaps/via/keymap.c
+++ b/keyboards/hhkb_lite_2/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     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_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  KC_NO,  KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  KC_NO,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS,
                 KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,
diff --git a/keyboards/hidtech/bastyl/keymaps/default/keymap.c b/keyboards/hidtech/bastyl/keymaps/default/keymap.c
index 15127838ce..056287263d 100644
--- a/keyboards/hidtech/bastyl/keymaps/default/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = 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_RMOD, RGB_TOG, RGB_MOD, KC_LBRC,			  KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK,  KC_MUTE,
+    _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC,			  KC_RBRC, _______, KC_NUM, KC_INS,  KC_SCRL,  KC_MUTE,
 //---------------------------------------------------------//--------------------------------------------------------------//
     _______, KC_LEFT, KC_UP,    KC_DOWN, KC_RGHT, KC_LPRN,	      KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_VOLU,
 //---------------------------------------------------------//--------------------------------------------------------------//
diff --git a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
index 9846c9af2f..257f43e610 100644
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
@@ -65,9 +65,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT(
     KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCR   , KC_MUTE,
+    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NUM  ,  KC_CALC, KC_PSCR   , KC_MUTE,
     _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
-    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD,
+    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SCRL   , KC_VOLD,
 
                                   _______, _______, _______,    _______, KC_UP  , _______,
                                            _______, _______,    _______, KC_DOWN
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c b/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
index cb575caf88..0e8ce2dc83 100644
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT(
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, QK_BOOT,
+  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, QK_BOOT,
   KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                              _______, KC_DEL,  _______,     _______, _______, _______,
diff --git a/keyboards/hineybush/h10/keymaps/default/keymap.c b/keyboards/hineybush/h10/keymaps/default/keymap.c
index 806f2918a5..02369522be 100644
--- a/keyboards/hineybush/h10/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h10/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_numpad_6x4(
         KC_ESC,   KC_PEQL,   KC_BSPC,  MO(1),
-        KC_NLCK,  KC_PSLS,   KC_PAST,  KC_PMNS,
+        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,
diff --git a/keyboards/hineybush/h10/keymaps/via/keymap.c b/keyboards/hineybush/h10/keymaps/via/keymap.c
index d5b386f2f2..04b6209b4b 100644
--- a/keyboards/hineybush/h10/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h10/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_numpad_6x4(
         KC_ESC,   KC_PEQL,   KC_BSPC,  MO(1),
-        KC_NLCK,  KC_PSLS,   KC_PAST,  KC_PMNS,
+        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,
diff --git a/keyboards/hineybush/h87a/keymaps/default/keymap.c b/keyboards/hineybush/h87a/keymaps/default/keymap.c
index 199e18aa77..4a580c4a8c 100644
--- a/keyboards/hineybush/h87a/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
index 8a0013b55e..5ce963e4bf 100644
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *    *-----------------------------------------------------------------------*
     */
     [_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_SLCK, KC_PAUS, \
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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,                                      \
diff --git a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
index 8e3c1efcb7..ba4ae519a3 100644
--- a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
@@ -21,7 +21,7 @@
 */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [0] = LAYOUT_all(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_LSPO, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, LT(2,KC_HOME), KC_UP, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_APP, RCTL_T(KC_END), KC_LEFT, KC_DOWN, KC_RGHT),
-        [1] = LAYOUT_all(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        [0] = LAYOUT_all(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_LSPO, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, LT(2,KC_HOME), KC_UP, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_APP, RCTL_T(KC_END), KC_LEFT, KC_DOWN, KC_RGHT),
+        [1] = LAYOUT_all(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
         [2] = LAYOUT_all(KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_VAI, RGB_SPI, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
\ No newline at end of file
diff --git a/keyboards/hineybush/h87a/keymaps/via/keymap.c b/keyboards/hineybush/h87a/keymaps/via/keymap.c
index e49b800db6..89f0b53ccb 100644
--- a/keyboards/hineybush/h87a/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c
index 6fb0f2bf0d..458ff91885 100644
--- a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_tkl_ansi_wkl(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_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,
diff --git a/keyboards/hineybush/h88/keymaps/default/keymap.c b/keyboards/hineybush/h88/keymaps/default/keymap.c
index f131666c7c..e8a3ec9bec 100644
--- a/keyboards/hineybush/h88/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h88/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_0,                    KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_0,                    KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/hineybush/h88/keymaps/via/keymap.c b/keyboards/hineybush/h88/keymaps/via/keymap.c
index 99ae4fa784..353ef3f754 100644
--- a/keyboards/hineybush/h88/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h88/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_0,                    KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_0,                    KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
diff --git a/keyboards/hineybush/h88/keymaps/wkl/keymap.c b/keyboards/hineybush/h88/keymaps/wkl/keymap.c
index 0ee79ddf45..f0d3e54851 100644
--- a/keyboards/hineybush/h88/keymaps/wkl/keymap.c
+++ b/keyboards/hineybush/h88/keymaps/wkl/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_tkl_ansi_wkl(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_0,                    KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_0,                    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,
diff --git a/keyboards/hineybush/hbcp/keymaps/default/keymap.c b/keyboards/hineybush/hbcp/keymaps/default/keymap.c
index b430db909e..c1240a3f12 100644
--- a/keyboards/hineybush/hbcp/keymaps/default/keymap.c
+++ b/keyboards/hineybush/hbcp/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all( /* Base */
     KC_ESC,   KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,                                KC_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_GRV, KC_BSPC,              KC_NLCK, KC_PSLS, KC_PAST, 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_GRV, KC_BSPC,              KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,   KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,                      KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS,  KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT, KC_NUHS, KC_ENT,                       KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT,  KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_LSFT,                KC_UP,         KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [1] = LAYOUT_all(
-    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                               KC_PSCR, KC_SLCK,KC_HOME, KC_END,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                               KC_PSCR, KC_SCRL,KC_HOME, KC_END,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             RGB_HUD, RGB_HUI,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,                      RGB_SAD, RGB_SAI,KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                      RGB_VAD, RGB_VAI,KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
index aff976549d..018d1eea14 100644
--- a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
+++ b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [1] = LAYOUT_wkl(
-    KC_TRNS,  KC_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_SLCK,KC_HOME, KC_END,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,           KC_PSCR, KC_SCRL,KC_HOME, KC_END,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  RGB_HUD, RGB_HUI,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,  RGB_SAD, RGB_SAI,KC_TRNS, KC_TRNS,
     KC_CAPS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS,  RGB_VAD, RGB_VAI,KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/hbcp/keymaps/via/keymap.c b/keyboards/hineybush/hbcp/keymaps/via/keymap.c
index d6b481bda2..fd8596e2bf 100644
--- a/keyboards/hineybush/hbcp/keymaps/via/keymap.c
+++ b/keyboards/hineybush/hbcp/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
 
     KC_ESC,   KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,                                KC_DEL,  KC_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_GRV, KC_BSPC,              KC_NLCK, KC_PSLS, KC_PAST, 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_GRV, KC_BSPC,              KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,   KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,                      KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS,  KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT, KC_NUHS, KC_ENT,                       KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT,  KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_LSFT,                KC_UP,         KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [1] = LAYOUT_all(
-    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                               KC_PSCR, KC_SLCK,KC_HOME, KC_END,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                               KC_PSCR, KC_SCRL,KC_HOME, KC_END,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             RGB_HUD, RGB_HUI,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,                      RGB_SAD, RGB_SAI,KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                      RGB_VAD, RGB_VAI,KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c b/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c
index b0166f9bea..7015080edb 100644
--- a/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c
+++ b/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_wkl( /* Base */
     KC_ESC,   KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,           KC_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_NLCK, KC_PSLS, KC_PAST, 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_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,   KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS,  KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,          KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT,           KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_LSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [1] = LAYOUT_wkl(
-    KC_TRNS,  KC_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_SLCK,KC_HOME, KC_END,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,           KC_PSCR, KC_SCRL,KC_HOME, KC_END,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  RGB_HUD, RGB_HUI,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,  RGB_SAD, RGB_SAI,KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS,  RGB_VAD, RGB_VAI,KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/hineyg80/keymaps/default/keymap.c b/keyboards/hineybush/hineyg80/keymaps/default/keymap.c
index d172364f8f..cd43aaf9cc 100644
--- a/keyboards/hineybush/hineyg80/keymaps/default/keymap.c
+++ b/keyboards/hineybush/hineyg80/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_100u_mods( /* 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_INS,   KC_HOME,   KC_PGUP,   KC_PSCR, 
-                                                                                   KC_DEL,   KC_END,    KC_PGDN,   KC_SLCK, 
-    KC_GRV,  KC_1,     KC_2,    KC_3,   KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NLCK,  KC_PSLS,   KC_PAST,   KC_PAUS, 
+                                                                                   KC_DEL,   KC_END,    KC_PGDN,   KC_SCRL, 
+    KC_GRV,  KC_1,     KC_2,    KC_3,   KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,   KC_PAST,   KC_PAUS, 
     KC_TAB,  KC_Q,     KC_W,    KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_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_ENT,   KC_P4,    KC_P5,     KC_P6,     KC_PPLS, 
     KC_LSFT,           KC_Z,    KC_X,   KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,     KC_P3,     KC_PENT, 
diff --git a/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
index 3d879d4ad8..ab5836fc2d 100644
--- a/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
+++ b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
@@ -26,8 +26,8 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_150u_mods( /* 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_INS,   KC_HOME,   KC_PGUP,   KC_PSCR, 
-                                                                                   KC_DEL,   KC_END,    KC_PGDN,   KC_SLCK, 
-    KC_GRV,  KC_1,     KC_2,    KC_3,   KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NLCK,  KC_PSLS,   KC_PAST,   KC_PAUS, 
+                                                                                   KC_DEL,   KC_END,    KC_PGDN,   KC_SCRL, 
+    KC_GRV,  KC_1,     KC_2,    KC_3,   KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,   KC_PAST,   KC_PAUS, 
     KC_TAB,  KC_Q,     KC_W,    KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_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_ENT,   KC_P4,    KC_P5,     KC_P6,     KC_PPLS, 
     KC_LSFT,    KC_Z,    KC_X,   KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,     KC_P3,     KC_PENT, 
diff --git a/keyboards/hineybush/ibis/keymaps/default/keymap.c b/keyboards/hineybush/ibis/keymaps/default/keymap.c
index 12860c0c04..697acf5392 100644
--- a/keyboards/hineybush/ibis/keymaps/default/keymap.c
+++ b/keyboards/hineybush/ibis/keymaps/default/keymap.c
@@ -12,14 +12,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     k80, k90, k81,                k83,                k85, k95, k86,        k96, k97, k88,     k98, k89, k99  \ */
 
     [0] = LAYOUT_all(
-    KC_ESC,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_ESC,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,    KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,   KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS,  KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT, KC_NUHS, KC_ENT,                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT,  KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_LSFT, KC_TRNS,            KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
     KC_LCTL,  KC_LGUI, KC_LALT,                KC_SPC,                         KC_LALT, MO(1),    KC_RGUI,                   KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT_all(
-    KC_GRV,   KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_GRV,   KC_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_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     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_PGDN,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_VOLU,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c b/keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c
index 9b332ccbad..fcfd4d79d3 100644
--- a/keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c
+++ b/keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c
@@ -12,14 +12,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     k80, k90, k81,                k83,                k85, k95, k86,        k96, k97, k88,     k98, k89, k99  \ */
 
     [0] = LAYOUT_ansi_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,    KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,    KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_TRNS,             KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_LALT, MO(1),   KC_RGUI,                      KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT_ansi_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_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_GRV,  KC_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_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         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_PGDN,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_VOLU,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c b/keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c
index 2767f73fff..6cefad6fa3 100644
--- a/keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c
+++ b/keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c
@@ -12,14 +12,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     k80, k90, k81,                k83,                k85, k95, k86,        k96, k97, k88,     k98, k89, k99  \ */
 
     [0] = LAYOUT_iso_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,    KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,    KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                      KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_TRNS,             KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_LALT, MO(1),   KC_RGUI,                      KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT_iso_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_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_GRV,  KC_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_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         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_PGDN,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUHS, KC_TRNS,                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_VOLU,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/ibis/keymaps/via/keymap.c b/keyboards/hineybush/ibis/keymaps/via/keymap.c
index 84a0e44150..d790bf4f2d 100644
--- a/keyboards/hineybush/ibis/keymaps/via/keymap.c
+++ b/keyboards/hineybush/ibis/keymaps/via/keymap.c
@@ -12,14 +12,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     k80, k90, k81,                k83,                k85, k95, k86,        k96, k97, k88,     k98, k89, k99  \ */
 
     [0] = LAYOUT_all(
-    KC_ESC,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_ESC,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,    KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,   KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS,  KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT, KC_NUHS, KC_ENT,                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT,  KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_LSFT, KC_TRNS,            KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
     KC_LCTL,  KC_LGUI, KC_LALT,                KC_SPC,                         KC_LALT, MO(1),    KC_RGUI,                   KC_LEFT, KC_DOWN, KC_RGHT,       KC_P0,   KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT_all(
-    KC_GRV,   KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_GRV,   KC_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_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     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_PGDN,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_VOLU,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hnahkb/freyr/keymaps/default/keymap.c b/keyboards/hnahkb/freyr/keymaps/default/keymap.c
index eb6ca981e3..b0163db413 100644
--- a/keyboards/hnahkb/freyr/keymaps/default/keymap.c
+++ b/keyboards/hnahkb/freyr/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,            KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/hnahkb/stella/keymaps/default/keymap.c b/keyboards/hnahkb/stella/keymaps/default/keymap.c
index c4808bcef1..31b878f282 100644
--- a/keyboards/hnahkb/stella/keymaps/default/keymap.c
+++ b/keyboards/hnahkb/stella/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/holyswitch/southpaw75/keymaps/default/keymap.c b/keyboards/holyswitch/southpaw75/keymaps/default/keymap.c
index e405f61d90..be7ebfcb79 100644
--- a/keyboards/holyswitch/southpaw75/keymaps/default/keymap.c
+++ b/keyboards/holyswitch/southpaw75/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_P4,   KC_P5,   KC_P6,            KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
diff --git a/keyboards/holyswitch/southpaw75/keymaps/via/keymap.c b/keyboards/holyswitch/southpaw75/keymaps/via/keymap.c
index 450e55bf8d..d5cf96dcbe 100644
--- a/keyboards/holyswitch/southpaw75/keymaps/via/keymap.c
+++ b/keyboards/holyswitch/southpaw75/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_P4,   KC_P5,   KC_P6,            KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
diff --git a/keyboards/horizon/keymaps/default/keymap.c b/keyboards/horizon/keymaps/default/keymap.c
index 18a876c403..bdb03bd081 100644
--- a/keyboards/horizon/keymaps/default/keymap.c
+++ b/keyboards/horizon/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
     [_FUNCTION] = LAYOUT(
-        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SLCK, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
+        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SCRL, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
         _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS ,                   KC_CAPS, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
         _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c
index 80bdeacc2b..6e06466d22 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16      */
     [_BASE] = 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_SLCK,  KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL,  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,
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16     */
     [_WAVE] = 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_SLCK,  KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL,  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,
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c
index 80bdeacc2b..6e06466d22 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16      */
     [_BASE] = 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_SLCK,  KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL,  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,
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16     */
     [_WAVE] = 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_SLCK,  KC_PAUSE,
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL,  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,
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c
index ba4fe59235..7c1f7c5178 100644
--- a/keyboards/hub16/keymaps/peepeetee/keymap.c
+++ b/keyboards/hub16/keymaps/peepeetee/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [0] = LAYOUT(
                         KC_MPLY, KC_MUTE,
                 TG(3), TG(2), TG(1), TG(0),
-                KC_PSCR, KC_SLCK, KC_PAUS, A(KC_F4),
+                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
 
diff --git a/keyboards/hub20/keymaps/default/keymap.c b/keyboards/hub20/keymaps/default/keymap.c
index 26a3a5b5fa..e943780258 100644
--- a/keyboards/hub20/keymaps/default/keymap.c
+++ b/keyboards/hub20/keymaps/default/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MO_NLCK LT(1, KC_NLCK) // Numlock on tap, layer change on hold
+#define MO_NLCK LT(1, KC_NUM) // Numlock on tap, layer change on hold
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
diff --git a/keyboards/hub20/keymaps/left_hand_numpad/keymap.c b/keyboards/hub20/keymaps/left_hand_numpad/keymap.c
index 2b522a9975..fe848d7c33 100644
--- a/keyboards/hub20/keymaps/left_hand_numpad/keymap.c
+++ b/keyboards/hub20/keymaps/left_hand_numpad/keymap.c
@@ -19,7 +19,7 @@
 // #define LED_MERGE_NUMPAD_LEFT_HANDED_ENTER TRUE
 // #define LED_MERGE_NUMPAD_LEFT_HANDED_ZERO TRUE
 
-#define MO_NLCK LT(1, KC_NLCK)  // Numlock on tap, layer change on hold
+#define MO_NLCK LT(1, KC_NUM)  // Numlock on tap, layer change on hold
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/hub20/keymaps/right_hand_numpad/keymap.c b/keyboards/hub20/keymaps/right_hand_numpad/keymap.c
index d6244d652c..71168069fb 100644
--- a/keyboards/hub20/keymaps/right_hand_numpad/keymap.c
+++ b/keyboards/hub20/keymaps/right_hand_numpad/keymap.c
@@ -19,7 +19,7 @@
 // #define LED_MERGE_NUMPAD_RIGHT_HANDED_ENTER TRUE
 // #define LED_MERGE_NUMPAD_RIGHT_HANDED_ZERO TRUE
 
-#define MO_NLCK LT(1, KC_NLCK)  // Numlock on tap, layer change on hold
+#define MO_NLCK LT(1, KC_NUM)  // Numlock on tap, layer change on hold
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/hub20/keymaps/via/keymap.c b/keyboards/hub20/keymaps/via/keymap.c
index bf36d42ab7..b8d7e6fdc8 100644
--- a/keyboards/hub20/keymaps/via/keymap.c
+++ b/keyboards/hub20/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MO_NLCK LT(1, KC_NLCK)
+#define MO_NLCK LT(1, KC_NUM)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
diff --git a/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c b/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c
index b396343861..3c728c9341 100644
--- a/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c
+++ b/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c
@@ -23,8 +23,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-        KC_ESC,        KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,      KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,        KC_F1, KC_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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_NUBS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
index b99b213e37..5b486fddb2 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                             ADDDD,  _______,    KC_DELT,ADDDD
 ),
 [_ADJUST] = LAYOUT(
diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
index 6a3098df90..2793f36ba4 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_thumbrow(
     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_SLCK,KC_PGDN,KC_F9,  KC_F10,                 KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,                 KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                     LOWER,  ADDDD,  _______,KC_ESC, KC_ENT, ALT_ENT,ADDDD, RAISE
 ),
 [_ADJUST] = LAYOUT_thumbrow(
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
index ea6a1840d8..f8b7de0e4c 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_full(
     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_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
     _______,_______,_______,ADDDD,  _______,    KC_DELT,ADDDD,  _______,_______,_______
 ),
 [_ADJUST] = LAYOUT_full(
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
index 19da390a58..3b14fe9136 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_split_3x5_3(
     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_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                     LOWER,  _______,_______,    _______,ADDDD,  RAISE
 ),
 [_ADJUST] = LAYOUT_split_3x5_3(
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
index fbe4c323aa..86cb3f747d 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, _______ ,
+    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, _______ ,
                             _______,_______,    _______,ADDDD,
                             _______,_______,    _______,ADDDD
 ),
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
index 88120dfbc1..e49d99ed0e 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
                             _______,_______,    _______,ADDDD
 ),
 [_ADJUST] = LAYOUT(
diff --git a/keyboards/idobao/id42/keymaps/default/keymap.c b/keyboards/idobao/id42/keymaps/default/keymap.c
index bce2096ea5..080ab21ac5 100644
--- a/keyboards/idobao/id42/keymaps/default/keymap.c
+++ b/keyboards/idobao/id42/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [2] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,          _______,
         _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  KC_VOLU, KC_MUTE,
         KC_RCTL, KC_RGUI, KC_RALT,          _______,          _______,                   KC_MSTP, KC_VOLD, KC_MPLY
     ),
diff --git a/keyboards/idobao/id42/keymaps/idobao/keymap.c b/keyboards/idobao/id42/keymaps/idobao/keymap.c
index 6a52c476ca..27f8384d75 100644
--- a/keyboards/idobao/id42/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id42/keymaps/idobao/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [2] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,          _______,
         _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  KC_VOLU, KC_MUTE,
         KC_RCTL, KC_RGUI, KC_RALT,          _______,          _______,                   KC_MSTP, KC_VOLD, KC_MPLY
     ),
diff --git a/keyboards/idobao/id42/keymaps/via/keymap.c b/keyboards/idobao/id42/keymaps/via/keymap.c
index 590b8b54a3..61e79622d3 100644
--- a/keyboards/idobao/id42/keymaps/via/keymap.c
+++ b/keyboards/idobao/id42/keymaps/via/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [2] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,          _______,
         _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  KC_VOLU, KC_MUTE,
         KC_RCTL, KC_RGUI, KC_RALT,          _______,          _______,                   KC_MSTP, KC_VOLD, KC_MPLY
     ),
diff --git a/keyboards/idobao/id63/keymaps/default/keymap.c b/keyboards/idobao/id63/keymaps/default/keymap.c
index 617a876b80..5824ecc995 100644
--- a/keyboards/idobao/id63/keymaps/default/keymap.c
+++ b/keyboards/idobao/id63/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
         _______,          _______, _______, _______, _______, QK_BOOT, NK_TOGG, _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______,          _______,                   _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index 5d18efeba1..77a42f25ae 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] = {
      */
     [_FN1] = LAYOUT_60_ansi_arrow(
         KC_GRV,  KC_F1,   KC_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,   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR,  KC_SLCK, KC_PAUS, KC_INS,
+        _______, _______, KC_UP,   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR,  KC_SCRL, KC_PAUS, KC_INS,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______,  _______,          _______,
         _______,          _______, _______, _______, KB_VRSN, QK_BOOT, NK_TOGG, _______, _______, _______,  _______, KC_PGUP, _______,
         _______, _______,          _______,                    _______,                   _______, MO(_FN3), KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/idobao/id63/keymaps/via/keymap.c b/keyboards/idobao/id63/keymaps/via/keymap.c
index e8ad0eb82a..5024df62a8 100644
--- a/keyboards/idobao/id63/keymaps/via/keymap.c
+++ b/keyboards/idobao/id63/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
         _______,          _______, _______, _______, _______, QK_BOOT, NK_TOGG, _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______,          _______,                   _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index bb393530b5..6114639bee 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_SLCK, \
+        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),
 
diff --git a/keyboards/idobao/id75/keymaps/default75/keymap.c b/keyboards/idobao/id75/keymaps/default75/keymap.c
index 705af7ba0e..d87e7e49e2 100644
--- a/keyboards/idobao/id75/keymaps/default75/keymap.c
+++ b/keyboards/idobao/id75/keymaps/default75/keymap.c
@@ -58,8 +58,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+    KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
     KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT,   _______, _______, _______,
     KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
     _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
diff --git a/keyboards/idobao/id75/keymaps/gkbd/keymap.c b/keyboards/idobao/id75/keymaps/gkbd/keymap.c
index b4dec42cad..3b59e8ee2b 100644
--- a/keyboards/idobao/id75/keymaps/gkbd/keymap.c
+++ b/keyboards/idobao/id75/keymaps/gkbd/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[2] = LAYOUT_ortho_5x15(/* Function keys */
 		QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG,
 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-		KC_SLCK, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_PAUS,
+		KC_SCRL, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_PAUS,
 		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_F11, KC_NO, KC_NO, KC_NO, KC_F12, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 	)
diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
index b7f7477904..33df46a947 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
+++ b/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_ortho_5x15(
 			QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG,
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-			KC_NO, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_SLCK, KC_NO, KC_NO, KC_PAUS, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_NO, KC_NO,
+			KC_NO, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_SCRL, KC_NO, KC_NO, KC_PAUS, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_NO, KC_NO,
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 			KC_WAKE, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_GRV, KC_TRNS, KC_TRNS, KC_TILD, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_APP
 		)
diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
index 8fa10b0ac2..4e44819125 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
+++ b/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_ortho_5x15(/* Function keys */
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-			KC_SLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS,
+			KC_SCRL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS,
 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 			QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG
 		)
diff --git a/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c b/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
index e622660d96..1ba1e071ec 100644
--- a/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
+++ b/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_F2), KC_SPC, LSFT_T(KC_SPC), KC_LEFT, KC_DOWN, KC_RGHT, LT(3,KC_DEL), RSFT_T(KC_BSPC), LALT(KC_LSFT), KC_NO, DF(0), KC_ENT),
 	[2] = LAYOUT_ortho_5x15(
 		KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MUTE, KC_VOLD, KC_VOLU, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-		KC_MSEL, BL_BRTG, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_UP), LSFT(KC_RGHT), KC_NO, KC_NO, 
+		KC_MSEL, BL_BRTG, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_UP), LSFT(KC_RGHT), KC_NO, KC_NO, 
 		KC_SLEP, BL_STEP, RGB_SAD, RGB_SAI, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, QK_BOOT, 
 		KC_NO, BL_TOGG, RGB_VAD, RGB_VAI, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NO, LCTL(KC_LEFT), LCTL(KC_DOWN), LCTL(KC_UP), LCTL(KC_RGHT), KC_NO, KC_NO, 
 		KC_NO, RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO, KC_NO, KC_WBAK, KC_NO, KC_WFWD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
diff --git a/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c b/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
index fee0df2b4b..8e5ea99880 100644
--- a/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
+++ b/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
@@ -58,8 +58,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-   KC_MSEL, KC_CALC, KC_UP  , _______, _______, KC_MNXT, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, \
+   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
+   KC_MSEL, KC_CALC, KC_UP  , _______, _______, KC_MNXT, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, \
    KC_MPRV, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_MPLY, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______, \
    KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  _______, KC_MSTP, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______, \
    _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______  \
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c
index 127647c664..92248393de 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                                      └───┴───┴───┘
      */
     [1] = LAYOUT_80_ansi(
-        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MUTE,
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_MUTE,
         _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, KC_VOLD,
         _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
index 947863653c..faa483d88b 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                                      └───┴───┴───┘
      */
     [_FN1] = LAYOUT_80_ansi(
-        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MUTE,
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_MUTE,
         _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, KC_VOLD,
         _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c
index 9ca5d285fa..f199bba8fe 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/via/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                                      └───┴───┴───┘
      */
     [1] = LAYOUT_80_ansi(
-        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MUTE,
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_MUTE,
         _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, KC_VOLD,
         _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/idobao/id87/v1/keymaps/default/keymap.c b/keyboards/idobao/id87/v1/keymaps/default/keymap.c
index 9465dca531..0c9f2f5282 100644
--- a/keyboards/idobao/id87/v1/keymaps/default/keymap.c
+++ b/keyboards/idobao/id87/v1/keymaps/default/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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,
diff --git a/keyboards/idobao/id87/v1/keymaps/via/keymap.c b/keyboards/idobao/id87/v1/keymaps/via/keymap.c
index e71a924bfd..fbb12c1c32 100644
--- a/keyboards/idobao/id87/v1/keymaps/via/keymap.c
+++ b/keyboards/idobao/id87/v1/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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,
diff --git a/keyboards/idobao/id87/v2/keymaps/default/keymap.c b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
index 53690899c1..3910ac76bc 100644
--- a/keyboards/idobao/id87/v2/keymaps/default/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
index 31787a2e42..387ee85ca5 100644
--- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
@@ -59,7 +59,7 @@ 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/idobao/id87/v2/keymaps/via/keymap.c b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
index 15e909c7e7..2d4ea973f8 100644
--- a/keyboards/idobao/id87/v2/keymaps/via/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/idobao/id96/keymaps/default/keymap.c b/keyboards/idobao/id96/keymaps/default/keymap.c
index e2d774c182..896acf3982 100644
--- a/keyboards/idobao/id96/keymaps/default/keymap.c
+++ b/keyboards/idobao/id96/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [LAYER_0] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/idobao/id96/keymaps/via/keymap.c b/keyboards/idobao/id96/keymaps/via/keymap.c
index 3aff55a115..f25ceff504 100644
--- a/keyboards/idobao/id96/keymaps/via/keymap.c
+++ b/keyboards/idobao/id96/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [LAYER_0] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/idobao/montex/v1/keymaps/default/keymap.c b/keyboards/idobao/montex/v1/keymaps/default/keymap.c
index 940bc481b8..db4593657a 100644
--- a/keyboards/idobao/montex/v1/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v1/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_numpad_6x5(
         KC_GRAVE,  KC_ESC,  KC_TAB,  MO(1),   KC_BSPC,
-        KC_COMMA,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_COMMA,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,   KC_P8,   KC_P9,
         KC_LALT,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSHIFT, KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/idobao/montex/v1/keymaps/via/keymap.c b/keyboards/idobao/montex/v1/keymaps/via/keymap.c
index 3f9800f85d..8399a390ed 100644
--- a/keyboards/idobao/montex/v1/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v1/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_6x5(
         KC_GRAVE,  KC_ESC,  KC_TAB,  MO(1),   KC_BSPC,
-        KC_COMMA,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_COMMA,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,   KC_P8,   KC_P9,
         KC_LALT,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSHIFT, KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
index e4b9b2b180..600c5e6e18 100755
--- a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NLCK,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
         KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┴───┘
      */
     [1] = LAYOUT_numpad_6x5(
-        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK,
+        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SCRL,
         RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD,
         RGB_HUD, KC_HOME, KC_UP,   KC_PGUP, RGB_VAI,
         RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT,
diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
index 7a48d6faee..d11acedb64 100755
--- a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BASE] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NLCK,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
         KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┴───┘
      */
     [_FN] = LAYOUT_numpad_6x5(
-        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK,
+        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SCRL,
         RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD,
         RGB_HUD, KC_HOME, KC_UP,   KC_PGUP, RGB_VAI,
         RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT,
diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c
index b51de4317b..b4ef7f7970 100755
--- a/keyboards/idobao/montex/v2/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NLCK,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
         KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┘───┘
      */
     [1] = LAYOUT_numpad_6x5(
-        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK,
+        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SCRL,
         RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD,
         RGB_HUD, KC_HOME, KC_UP,   KC_PGUP, RGB_VAI,
         RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT,
diff --git a/keyboards/idobao/montex/v2/keymaps/via/keymap.c b/keyboards/idobao/montex/v2/keymaps/via/keymap.c
index 7f336b7d50..e8281d4eac 100755
--- a/keyboards/idobao/montex/v2/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v2/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BASE] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NLCK,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
         KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┴───┘
      */
     [_FN] = LAYOUT_numpad_6x5(
-        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SLCK,
+        QK_BOOT, RGB_TOG, RGB_MOD, KC_PSCR, KC_SCRL,
         RGB_HUI, XXXXXXX, RGB_SPD, RGB_SPI, RGB_VAD,
         RGB_HUD, KC_HOME, KC_UP,   KC_PGUP, RGB_VAI,
         RGB_SAI, KC_LEFT, XXXXXXX, KC_RGHT,
diff --git a/keyboards/ilumkb/simpler64/keymaps/default/keymap.c b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
index 766ef1aed9..11f165ecd1 100644
--- a/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
+++ b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_64_ansi(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EEP_RST,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
diff --git a/keyboards/ilumkb/simpler64/keymaps/via/keymap.c b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
index f10930f84a..2d6ebdfcf6 100644
--- a/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
+++ b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_64_ansi(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EEP_RST,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index 05142f2212..b732469cfa 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LCTRL, MO(3),  KC_EQL, KC_LGUI, KC_LALT,
-                                            KC_NLCK,  KC_SLCK,
+                                            KC_NUM,   KC_SCRL,
                                             KC_HOME,
                                             KC_SPC,   KC_DEL, KC_END,
 
diff --git a/keyboards/input_club/infinity60/keymaps/default/keymap.c b/keyboards/input_club/infinity60/keymaps/default/keymap.c
index 334c24e29e..8f571a2b9e 100644
--- a/keyboards/input_club/infinity60/keymaps/default/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_60_ansi_split_bs_rshift(
         KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
         _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
index 22d74b866b..72a834212b 100755
--- a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */ 
     [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_SLCK, KC_UP,   KC_NO,   KC_LPRN, KC_RPRN, KC_DEL,      \
+        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),
diff --git a/keyboards/input_club/infinity60/keymaps/hasu/keymap.c b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
index be14c1b977..4200eaf1c2 100644
--- a/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
@@ -37,7 +37,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */ 
     [1] = LAYOUT_60_ansi_split_bs_rshift(
         KC_PWR, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP,  KC_TRNS,KC_BSPC,
+        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS, KC_UP,  KC_TRNS,KC_BSPC,
         KC_LCTL,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_ENT,
         KC_LSFT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS,
         KC_TRNS,KC_LGUI,KC_LALT,          KC_TRNS,                      KC_RALT,KC_RGUI,KC_TRNS,KC_TRNS
diff --git a/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
index a19be6664c..67d92143ca 100644
--- a/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
@@ -77,7 +77,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,_______,_______,KC_DEL,  \
         _______,_______,KC_BTN2,_______,_______,_______,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,_______,_______,     \
         _______,KC_APP,KC_BTN1,KC_CALC,_______,_______,KC_END,_______,_______,_______,_______,_______,KC_NO,         \
-        _______,_______,_______,               _______,         C(A(KC_DEL)),KC_NLCK,_______,_______   \
+        _______,_______,_______,               _______,         C(A(KC_DEL)),KC_NUM,_______,_______   \
     ),
 
     /* media */
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
index 96325514c9..87a6404326 100644
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/input_club/k_type/keymaps/belak/keymap.c b/keyboards/input_club/k_type/keymaps/belak/keymap.c
index e920579317..1d47acb129 100644
--- a/keyboards/input_club/k_type/keymaps/belak/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/belak/keymap.c
@@ -7,7 +7,7 @@ enum layer_names {
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QW] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/input_club/k_type/keymaps/default/keymap.c b/keyboards/input_club/k_type/keymaps/default/keymap.c
index ef069af650..790bd93290 100644
--- a/keyboards/input_club/k_type/keymaps/default/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/input_club/whitefox/keymaps/billypython/keymap.c b/keyboards/input_club/whitefox/keymaps/billypython/keymap.c
index 79758de807..fc585e081b 100644
--- a/keyboards/input_club/whitefox/keymaps/billypython/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/billypython/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
    */
   [L_FN] = 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_NLCK, KC_SLCK, KC_PAUS, \
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUM,  KC_SCRL, KC_PAUS, \
     KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            KC_INS,  \
     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,          _______,          TOP,     \
     _______,          KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_APP,           KC_PGUP, BOTTOM,  \
diff --git a/keyboards/input_club/whitefox/keymaps/default/keymap.c b/keyboards/input_club/whitefox/keymaps/default/keymap.c
index 353e282f2d..5ec2ec53ed 100644
--- a/keyboards/input_club/whitefox/keymaps/default/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_VOLD,
         _______, _______, _______,                            _______,                   _______, _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
index 1d3bd224de..6fd5f43239 100644
--- a/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
@@ -50,7 +50,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_iso( \
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, KC_BSPC,    KC_INS, \
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_INC, KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_TRNS,KC_PAUS,  KC_UP,             KC_DEL, \
+        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_INC, KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_TRNS,KC_PAUS,  KC_UP,             KC_DEL, \
         KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,BL_TOGG,KC_TRNS,KC_BSPC,KC_DEL, CMD_SFT_L,KC_LEFT,KC_RGHT,KC_NUBS,   KC_PENT,KC_PGUP,\
         KC_TRNS,KC_NUBS,KC_TRNS,KC_TRNS,CMD_ALT_C, BL_DEC, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DOWN,KC_TRNS,KC_TRNS,  KC_PGUP,KC_PGDN,\
         KC_TRNS,KC_TRNS,KC_TRNS,                        KC_TRNS,                KC_TRNS,KC_TRNS,KC_TRNS,     KC_HOME,KC_PGDN,KC_END  \
diff --git a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
index 8a93f03188..27010793d9 100644
--- a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
@@ -52,7 +52,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT( \
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS,KC_TRNS,KC_MUTE,\
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_TOGG,KC_TRNS,KC_TRNS,BL_INC, KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,        KC_TRNS,\
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_TOGG,KC_TRNS,KC_TRNS,BL_INC, KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,        KC_TRNS,\
         KC_TRNS,KC_TRNS,KC_TRNS,BL_DEC, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_VOLU,\
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_PGUP,KC_VOLD,\
         KC_TRNS,KC_TRNS,KC_TRNS,                        KC_TRNS,                KC_TRNS,KC_TRNS,KC_TRNS,        KC_HOME,KC_PGDN,KC_END  \
diff --git a/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
index 4c587dd272..a7273b6902 100644
--- a/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [L_FN] = 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,  NUMPAD,  KC_SLCK, KC_PAUS,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  NUMPAD,  KC_SCRL, KC_PAUS,
         KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            KC_INS,
         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______,          _______,          TOP,
         _______,          KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, BOTTOM,
diff --git a/keyboards/io_mini1800/keymaps/2x3u/keymap.c b/keyboards/io_mini1800/keymaps/2x3u/keymap.c
index 75e4145207..031b6f1c7c 100644
--- a/keyboards/io_mini1800/keymaps/2x3u/keymap.c
+++ b/keyboards/io_mini1800/keymaps/2x3u/keymap.c
@@ -11,7 +11,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
 [_BASE] = LAYOUT_2x3u(
-        KC_ESC,  KC_1,    KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_HOME, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END, KC_DEL,  KC_P7,   KC_P8,   KC_P9,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                       KC_UP,       KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/io_mini1800/keymaps/default/keymap.c b/keyboards/io_mini1800/keymaps/default/keymap.c
index 1a3573fe5f..3b91831922 100644
--- a/keyboards/io_mini1800/keymaps/default/keymap.c
+++ b/keyboards/io_mini1800/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_625u(
-        KC_ESC,  KC_1,    KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_HOME, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END, KC_DEL,  KC_P7,   KC_P8,   KC_P9,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                       KC_UP,       KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/iron180/keymaps/default/keymap.c b/keyboards/iron180/keymaps/default/keymap.c
index 8684b0bb73..b8aded679e 100755
--- a/keyboards/iron180/keymaps/default/keymap.c
+++ b/keyboards/iron180/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
diff --git a/keyboards/iron180/keymaps/via/keymap.c b/keyboards/iron180/keymaps/via/keymap.c
index 8684b0bb73..b8aded679e 100755
--- a/keyboards/iron180/keymaps/via/keymap.c
+++ b/keyboards/iron180/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
diff --git a/keyboards/j80/keymaps/default/keymap.c b/keyboards/j80/keymaps/default/keymap.c
index 4fa93835f1..cbaf2ae481 100644
--- a/keyboards/j80/keymaps/default/keymap.c
+++ b/keyboards/j80/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BASE] = LAYOUT_tkl_ansi_split_rshift(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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,
diff --git a/keyboards/j80/keymaps/default_iso/keymap.c b/keyboards/j80/keymaps/default_iso/keymap.c
index 8435953611..8be1261291 100644
--- a/keyboards/j80/keymaps/default_iso/keymap.c
+++ b/keyboards/j80/keymaps/default_iso/keymap.c
@@ -28,7 +28,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BASE] = LAYOUT_tkl_iso_split_rshift(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
index 38ae215e1f..86a8b44474 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ KC_F5, KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,
  */
 
 [_FN] = LAYOUT_ansi(
-QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,          KC_PGUP,
 _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
index 40b18ef53f..856bf998c9 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
     [_FN] = LAYOUT_ansi_1u(
-        QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,          KC_PGUP,
         _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
diff --git a/keyboards/janus/keymaps/default/keymap.c b/keyboards/janus/keymaps/default/keymap.c
index 0386396cc7..351e3a3db0 100644
--- a/keyboards/janus/keymaps/default/keymap.c
+++ b/keyboards/janus/keymaps/default/keymap.c
@@ -42,9 +42,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    _______, _______, _______, MO_FUN
     ),
     [_FUNCTION] = LAYOUT_split_3x5_2(
-        KC_F1  , KC_F2  , KC_F3  , KC_F4  , QK_BOOT, KC_SLCK, KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
+        KC_F1  , KC_F2  , KC_F3  , KC_F4  , QK_BOOT, KC_SCRL, KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
         KC_F5  , KC_F6  , KC_F7  , KC_F8  , XXXXXXX, KC_CAPS, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS,
-        OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, XXXXXXX, KC_NLCK, OS_RCTL, OS_RSFT, OS_RALT, OS_RGUI,
+        OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, XXXXXXX, KC_NUM,  OS_RCTL, OS_RSFT, OS_RALT, OS_RGUI,
                                    _______, _______, _______, _______
     ),
 };
\ No newline at end of file
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
index 7d0902b967..d3b3055b0f 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *  *---------------------------------------------------------------*
     */
     [_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_SLCK, KC_PSCR,
+        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,
diff --git a/keyboards/jels/jels88/keymaps/default/keymap.c b/keyboards/jels/jels88/keymaps/default/keymap.c
index f8ee717537..ffca0d4a78 100644
--- a/keyboards/jels/jels88/keymaps/default/keymap.c
+++ b/keyboards/jels/jels88/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 //base layer
 [0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,            KC_PSCR, KC_SLCK, KC_PAUS, 
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,            KC_PSCR, KC_SCRL, KC_PAUS, 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,   KC_INS,  KC_HOME, KC_PGUP, 
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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, 
diff --git a/keyboards/jels/jels88/keymaps/via/keymap.c b/keyboards/jels/jels88/keymaps/via/keymap.c
index f8ee717537..ffca0d4a78 100644
--- a/keyboards/jels/jels88/keymaps/via/keymap.c
+++ b/keyboards/jels/jels88/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 //base layer
 [0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,            KC_PSCR, KC_SLCK, KC_PAUS, 
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,            KC_PSCR, KC_SCRL, KC_PAUS, 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,   KC_INS,  KC_HOME, KC_PGUP, 
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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, 
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 721adaaee7..da88562098 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -205,7 +205,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_RAISE] = LAYOUT(
-  _______, KC_NLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______,
+  _______, KC_NUM,  KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS, _______,
            EQL_LCT, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,      KC_MUTE, KC_LEFT, KC_UP,   KC_RGHT, KC_INS,  APP_RCT,
            _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      KC_VOLD, KC_END,  KC_DOWN, KC_PGDN, KC_PAUS, _______,
                                       _______, _______, _______,      _______, _______, _______
diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
index 3850ea3d10..fae9f4f218 100644
--- a/keyboards/jian/keymaps/default/keymap.c
+++ b/keyboards/jian/keymaps/default/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_RAISE] = LAYOUT(
-  _______, KC_NLCK,         KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS,        _______,
+  _______, KC_NUM,          KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS,        _______,
            LCTL_T(KC_EQL),  KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,      KC_MUTE, KC_LEFT, KC_UP,   KC_RGHT, KC_INS,  RCTL_T(KC_APP),
            _______,         KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      KC_VOLD, KC_END,  KC_DOWN, KC_PGDN, KC_PAUS, _______,
                                               _______, _______, _______,      _______, _______, _______
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index ab24c63ed4..d93e7843f2 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
 ),
 [_RAIS_L] = LAYOUT_symmetric_left(
-  _______, LGUI_T(KC_CAPS), KC_SLCK, KC_HOME, KC_PSCR, KC_PGUP,              KC_VOLU,
+  _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP,              KC_VOLU,
            LCTL_T(KC_APP),  KC_INS,  KC_LEFT, KC_UP,   KC_RGHT,              KC_MUTE,
            _______,         KC_PAUS, KC_END,  KC_DOWN, KC_PGDN,              KC_VOLD,
                                               _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC)
diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c
index ac9586587b..68a0909a9a 100644
--- a/keyboards/jian/keymaps/via/keymap.c
+++ b/keyboards/jian/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       LT(3, KC_TAB), _______, _______,      _______, _______, LT(3, KC_DEL)
 ),
 [2] = LAYOUT(
-  _______, KC_NLCK,         KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS,        _______,
+  _______, KC_NUM,          KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS,        _______,
            LCTL_T(KC_EQL),  KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,      KC_MUTE, KC_LEFT, KC_UP,   KC_RGHT, KC_INS,  RCTL_T(KC_APP),
            _______,         KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      KC_VOLD, KC_END,  KC_DOWN, KC_PGDN, KC_PAUS, _______,
                                         _______, _______, LT(3, KC_ENT),      LT(3, KC_ESC), _______, _______
diff --git a/keyboards/jm60/keymaps/poker3/keymap.c b/keyboards/jm60/keymaps/poker3/keymap.c
index 72e64bbcc5..fcd4854396 100644
--- a/keyboards/jm60/keymaps/poker3/keymap.c
+++ b/keyboards/jm60/keymaps/poker3/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FL] = 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_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         KC_CAPS, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,           _______,
         _______,          KC_APP,  _______, _______, _______, _______, KC_END,  _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/jones/v1/keymaps/default/keymap.c b/keyboards/jones/v1/keymaps/default/keymap.c
index d9c6846f86..32dfd00180 100644
--- a/keyboards/jones/v1/keymaps/default/keymap.c
+++ b/keyboards/jones/v1/keymaps/default/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,                                                                                                                _______,  _______
     ),
     [_ADJUST] = LAYOUT(
-        _______,   RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,
+        _______,   RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,
             _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
             _______,    AU_TOG,   CK_TOGG,  MU_TOG,   MU_MOD,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
         KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    MUV_DE,   MUV_IN,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
index a326a78233..68abc04e3d 100644
--- a/keyboards/jones/v1/keymaps/via/keymap.c
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,                                                                                                                _______,  _______
     ),
     [_ADJUST] = LAYOUT(
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,
             _______,    DF(_BASE1),DF(_BASE2),DF(_BASE3),_______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
             _______,    AU_TOG,   CK_TOGG,  MU_TOG,   MU_MOD,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
         KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/jorne/keymaps/default/keymap.c b/keyboards/jorne/keymaps/default/keymap.c
index 5db74e266e..23696f4650 100644
--- a/keyboards/jorne/keymaps/default/keymap.c
+++ b/keyboards/jorne/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_RAISE] = LAYOUT(
-  _______, KC_NLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______,
+  _______, KC_NUM,  KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS, _______,
            EQL_LCT, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,      KC_MUTE, KC_LEFT, KC_UP,   KC_RGHT, KC_INS,  APP_RCT,
            _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      KC_VOLD, KC_END,  KC_DOWN, KC_PGDN, KC_PAUS, _______,
                                       _______, _______, _______,      _______, _______, _______
diff --git a/keyboards/jorne/keymaps/via/keymap.c b/keyboards/jorne/keymaps/via/keymap.c
index 5db74e266e..23696f4650 100644
--- a/keyboards/jorne/keymaps/via/keymap.c
+++ b/keyboards/jorne/keymaps/via/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_RAISE] = LAYOUT(
-  _______, KC_NLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______,
+  _______, KC_NUM,  KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS, _______,
            EQL_LCT, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,      KC_MUTE, KC_LEFT, KC_UP,   KC_RGHT, KC_INS,  APP_RCT,
            _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      KC_VOLD, KC_END,  KC_DOWN, KC_PGDN, KC_PAUS, _______,
                                       _______, _______, _______,      _______, _______, _______
diff --git a/keyboards/kabedon/kabedon78s/keymaps/default/keymap.c b/keyboards/kabedon/kabedon78s/keymaps/default/keymap.c
index 0861eabb00..72f6a8ae46 100644
--- a/keyboards/kabedon/kabedon78s/keymaps/default/keymap.c
+++ b/keyboards/kabedon/kabedon78s/keymaps/default/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
                KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,         KC_F6, KC_F7, KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_DEL,  KC_HOME, KC_PGUP, KC_PGDN,
-    KC_TRNS,   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5, KC_6,    KC_7,  KC_8,   KC_9,   KC_0,  KC_MINS, KC_EQL,  KC_BSPC,      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_TRNS,   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5, KC_6,    KC_7,  KC_8,   KC_9,   KC_0,  KC_MINS, KC_EQL,  KC_BSPC,      KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TRNS,   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,    KC_Y, KC_U,  KC_I,   KC_O,   KC_P,  KC_LBRC, KC_RBRC, KC_BSLS,      KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_TRNS,   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,          KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT, KC_ENT,       KC_P4,   KC_P5,   KC_P6,    
     KC_TRNS,   KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,          KC_N,  KC_M,  KC_COMM,KC_DOT, KC_RSFT, KC_UP,   KC_SLSH,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kabedon/kabedon78s/keymaps/via/keymap.c b/keyboards/kabedon/kabedon78s/keymaps/via/keymap.c
index e7ceb58bf5..39a34f9981 100644
--- a/keyboards/kabedon/kabedon78s/keymaps/via/keymap.c
+++ b/keyboards/kabedon/kabedon78s/keymaps/via/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
                KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,         KC_F6, KC_F7, KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_DEL,  KC_HOME, KC_PGUP, KC_PGDN,
-    KC_TRNS,   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5, KC_6,    KC_7,  KC_8,   KC_9,   KC_0,  KC_MINS, KC_EQL,  KC_BSPC,      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_TRNS,   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5, KC_6,    KC_7,  KC_8,   KC_9,   KC_0,  KC_MINS, KC_EQL,  KC_BSPC,      KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TRNS,   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,    KC_Y, KC_U,  KC_I,   KC_O,   KC_P,  KC_LBRC, KC_RBRC, KC_BSLS,      KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_TRNS,   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,          KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT, KC_ENT,       KC_P4,   KC_P5,   KC_P6,    
     KC_TRNS,   KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,          KC_N,  KC_M,  KC_COMM,KC_DOT, KC_RSFT, KC_UP,   KC_SLSH,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kabedon/kabedon980/keymaps/default/keymap.c b/keyboards/kabedon/kabedon980/keymaps/default/keymap.c
index a5b660daf6..cda021d21e 100644
--- a/keyboards/kabedon/kabedon980/keymaps/default/keymap.c
+++ b/keyboards/kabedon/kabedon980/keymaps/default/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
     KC_ESC,           KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,   KC_F12,      KC_DEL,  KC_HOME, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,     KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,     KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,     KC_L,    KC_SCLN,  KC_QUOT,      KC_ENT,            KC_P4,   KC_P5,   KC_P6,    
     KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,            KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kabedon/kabedon980/keymaps/via/keymap.c b/keyboards/kabedon/kabedon980/keymaps/via/keymap.c
index 76eaa3968a..fdaebd27ea 100644
--- a/keyboards/kabedon/kabedon980/keymaps/via/keymap.c
+++ b/keyboards/kabedon/kabedon980/keymaps/via/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
     KC_ESC,           KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,   KC_F12,      KC_DEL,  KC_HOME, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,     KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,     KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,     KC_L,    KC_SCLN,  KC_QUOT,      KC_ENT,            KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,            KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c b/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c
index 608110417e..f730ee95b2 100644
--- a/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c
+++ b/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_BASE] = LAYOUT(
     KC_ESC,     KC_F1,   KC_F2,   KC_F3,   KC_F4,      KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,  KC_HOME, KC_INS,  KC_END,  KC_PGUP, KC_MUTE, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_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,
diff --git a/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c b/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c
index 608110417e..f730ee95b2 100644
--- a/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c
+++ b/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_BASE] = LAYOUT(
     KC_ESC,     KC_F1,   KC_F2,   KC_F3,   KC_F4,      KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,  KC_HOME, KC_INS,  KC_END,  KC_PGUP, KC_MUTE, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_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,
diff --git a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
index 09f851bd1c..ac9055c634 100644
--- a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [_ADJUST] = LAYOUT(
       _______, QK_BOOT,   _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,
-      KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
       _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______,           _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
     )
diff --git a/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
index 33fa31c261..a1f0f6d082 100644
--- a/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
+++ b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'             `-----------------------------------------'
    */
     [_QWERTY] = LAYOUT_extended(
-      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_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, 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_BSPC,         KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NUM,  KC_ESC,
       KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,         KC_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,              KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,         KC_P1,   KC_P2,   KC_P3,  KC_PENT, KC_PAST, KC_PEQL,
       ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,            KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,      KC_P0,   _______, KC_PDOT,_______, KC_PMNS, KC_BSPC
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'             `-----------------------------------------'
    */
     [_COLEMAK] = LAYOUT_extended(
-      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_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, KC_ESC,
+      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_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NUM,  KC_ESC,
       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_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
       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_P1,   KC_P2,   KC_P3,  KC_PENT, KC_PAST, KC_PEQL,
       ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,            KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,       KC_P0,   _______, KC_PDOT,_______, KC_PMNS, KC_BSPC
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'             `-----------------------------------------'
    */
     [_DVORAK] = LAYOUT_extended(
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,              KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,        KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, KC_ESC,
+      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,              KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,        KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NUM,  KC_ESC,
       KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,              KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,       KC_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
       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_P1,   KC_P2,   KC_P3,  KC_PENT, KC_PAST, KC_PEQL,
       ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,            KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,       KC_P0,   _______, KC_PDOT,_______, KC_PMNS, KC_BSPC
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'             `-----------------------------------------'
    */
     [_LOWER] = LAYOUT_extended(
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,           KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,       KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, KC_ESC,
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,           KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,       KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NUM,  KC_ESC,
       _______, _______, _______, _______, _______, _______,           KC_MINS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,       KC_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
       _______, _______, _______, _______, _______, _______,           _______, _______, _______, KC_HOME, KC_END,  _______,       KC_P1,   KC_P2,   KC_P3,  KC_PENT, KC_PAST, KC_PEQL,
       _______, _______, _______, _______, _______, _______,           _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,       KC_P0,   _______, KC_PDOT,_______, KC_PMNS, KC_BSPC
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'             `-----------------------------------------'
    */
     [_RAISE] = LAYOUT_extended(
-      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_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, 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_DEL,        KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NUM,  KC_ESC,
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,             KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,       KC_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
       _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,            KC_F12,  _______, _______, _______, _______, _______,       KC_P1,   KC_P2,   KC_P3,  KC_PENT, KC_PAST, KC_PEQL,
       _______, _______, _______, _______, _______, _______,           _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,       KC_P0,   _______, KC_PDOT,_______, KC_PMNS, KC_BSPC
@@ -129,8 +129,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------'             `-----------------------------------------'             `-----------------------------------------'
    */
     [_ADJUST] = LAYOUT_extended(
-      _______, QK_BOOT, _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,        KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NLCK, KC_ESC,
-      KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,       KC_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
+      _______, QK_BOOT, _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,        KC_P7,   KC_P8,   KC_P9,  KC_PPLS, KC_NUM,  KC_ESC,
+      KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,       KC_P4,   KC_P5,   KC_P6,  _______, KC_PSLS, KC_TAB,
       _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,       KC_P1,   KC_P2,   KC_P3,  KC_PENT, KC_PAST, KC_PEQL,
       _______, _______, _______, _______, _______, _______,           _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,        KC_P0,   _______, KC_PDOT,_______, KC_PMNS, KC_BSPC
     )
diff --git a/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c b/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
index ee96358e81..856a32a8eb 100644
--- a/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
+++ b/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     [_ADJUST] = LAYOUT(
       _______, QK_BOOT, _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,
-      KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
       _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______,           _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
     )
diff --git a/keyboards/kagizaraya/scythe/keymaps/default/keymap.c b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
index 56b6b32c8c..80411dee49 100644
--- a/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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_INC , BL_DEC ,      _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_INS,
+  KC_CAPS, KC_F10,  KC_F12,  BL_TOGG, _______, BL_INC , BL_DEC ,      _______, _______, 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,  _______, _______, _______,
                              _______, _______, _______, _______,      _______, _______, _______, _______
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
index ba1c970cf7..9a564d2c9d 100644
--- a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
+++ b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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_INC , BL_DEC ,      _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_INS,
+  KC_CAPS, KC_F10,  KC_F12,  BL_TOGG, _______, BL_INC , BL_DEC ,      _______, _______, 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,  _______, _______, _______,
                              _______, _______, _______, _______,      _______, _______, _______, _______
diff --git a/keyboards/kakunpc/angel17/keymaps/default/keymap.c b/keyboards/kakunpc/angel17/keymaps/default/keymap.c
index 1b9f52846d..ca17c770d1 100644
--- a/keyboards/kakunpc/angel17/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/angel17/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_numpad_5x4( /* Base */
-    LT(COMMAND,KC_NLCK),  KC_PSLS,  KC_PAST, KC_PMNS,
+    LT(COMMAND,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,
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
index 6e78184236..732b09e113 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all( /* Base */
         KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
         KC_LCAP, KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT    ,KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,   KC_NO,
         KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
index bcd8cdd8c4..13dee5c345 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_all( /* BASE */
         KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCR,KC_SCRL,KC_PAUSE,
 
-        KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
         KC_LCTL, KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT    ,KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,   KC_NO,
         KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [COMMAND] = LAYOUT_all( /* COMMAND */
         KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCR,KC_SCRL,KC_PAUSE,
 
-        KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
         KC_LCAP, KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT    ,KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,   KC_NO,
         KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/keymap.c b/keyboards/kapcave/gskt00/keymaps/default-poly/keymap.c
index 066459e196..77670ee060 100755
--- a/keyboards/kapcave/gskt00/keymaps/default-poly/keymap.c
+++ b/keyboards/kapcave/gskt00/keymaps/default-poly/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 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_SLCK, KC_PAUS, KC_BSPC,
+		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/gskt00/keymaps/default/keymap.c b/keyboards/kapcave/gskt00/keymaps/default/keymap.c
index 0d8d6dad6b..0df9320a32 100755
--- a/keyboards/kapcave/gskt00/keymaps/default/keymap.c
+++ b/keyboards/kapcave/gskt00/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 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_INS, KC_DEL,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLCK, KC_PAUS, KC_UP, KC_PAUS, KC_DEL,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS, KC_UP, KC_PAUS, KC_DEL,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG)
diff --git a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
index d1b02d00bf..105fd75a92 100755
--- a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
+++ b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 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_SLCK, KC_PAUS, KC_BSPC,
+		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/gskt00/keymaps/via/keymap.c b/keyboards/kapcave/gskt00/keymaps/via/keymap.c
index 95bc131422..54d4841324 100755
--- a/keyboards/kapcave/gskt00/keymaps/via/keymap.c
+++ b/keyboards/kapcave/gskt00/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* FUNCTION */
 	[_FN] = LAYOUT_all(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLCK, KC_PAUS, KC_UP, KC_PAUS, KC_DEL,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS, KC_UP, KC_PAUS, KC_DEL,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/kapcave/paladin64/keymaps/default/keymap.c b/keyboards/kapcave/paladin64/keymaps/default/keymap.c
index 7c730f14b9..0e61c74b1e 100755
--- a/keyboards/kapcave/paladin64/keymaps/default/keymap.c
+++ b/keyboards/kapcave/paladin64/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 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_SLCK, KC_PAUS, KC_BSPC,
+		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, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG),
diff --git a/keyboards/kapcave/paladin64/keymaps/via/keymap.c b/keyboards/kapcave/paladin64/keymaps/via/keymap.c
index ccf0622e31..473f5e4166 100644
--- a/keyboards/kapcave/paladin64/keymaps/via/keymap.c
+++ b/keyboards/kapcave/paladin64/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* FUNCTION */
 	[_FN] = LAYOUT_all(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_SLCK, KC_PAUS, KC_BSPC,
+		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, 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
index bb4ca32cf0..26168f7d2b 100644
--- a/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
+++ b/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
@@ -33,6 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_NLCK)
+		         KC_TRNS, QK_BOOT, KC_NUM)
 };
 
diff --git a/keyboards/kapcave/paladinpad/keymaps/default/keymap.c b/keyboards/kapcave/paladinpad/keymaps/default/keymap.c
index 390b474fdb..8b433d785d 100644
--- a/keyboards/kapcave/paladinpad/keymaps/default/keymap.c
+++ b/keyboards/kapcave/paladinpad/keymaps/default/keymap.c
@@ -33,6 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_HUI, RGB_SAI, RGB_VAI,
         RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,
-		         KC_TRNS, QK_BOOT, KC_NLCK)
+		         KC_TRNS, QK_BOOT, KC_NUM)
 };
 
diff --git a/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c b/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
index e2a43886ec..e965450016 100644
--- a/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
+++ b/keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,
         RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, QK_BOOT, KC_NLCK)
+		KC_TRNS, KC_TRNS, QK_BOOT, KC_NUM)
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/kapcave/paladinpad/keymaps/via/keymap.c b/keyboards/kapcave/paladinpad/keymaps/via/keymap.c
index b19b8608fb..95686f8a94 100644
--- a/keyboards/kapcave/paladinpad/keymaps/via/keymap.c
+++ b/keyboards/kapcave/paladinpad/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,
         RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, QK_BOOT,   KC_NLCK),
+		KC_TRNS, KC_TRNS, QK_BOOT,   KC_NUM),
     
     /* FUNCTION */
     [_FN2] = LAYOUT_ortho_5x4(
diff --git a/keyboards/karlb/kbic65/keymaps/default/keymap.c b/keyboards/karlb/kbic65/keymaps/default/keymap.c
index 6a9e96e384..dd5346e2bc 100644
--- a/keyboards/karlb/kbic65/keymaps/default/keymap.c
+++ b/keyboards/karlb/kbic65/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,
 
 [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_INS,
-_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
+_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
 _______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,                      _______,
 _______,   _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,            KC_PGUP,  _______,
 _______,   _______,  _______,                                _______,                                _______,  _______,  _______, KC_HOME,   KC_PGDN,  KC_END)
diff --git a/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c b/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c
index 59902f6ba6..111b66ff4b 100644
--- a/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c
+++ b/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_65_iso(
     KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-    _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,            _______,
+    _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,            _______,
     _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,  KC_PGUP,  _______,
     _______,  _______,  _______,                                _______,                      _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_END)
diff --git a/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c b/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c
index 3067a00b0c..a80fd50f9d 100644
--- a/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c
+++ b/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_65_iso_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_INS,
-    _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,                      _______,
+    _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,                      _______,
     _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,            KC_PGUP,  _______,
     _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_END)
diff --git a/keyboards/karlb/kbic65/keymaps/via/keymap.c b/keyboards/karlb/kbic65/keymaps/via/keymap.c
index 6a9e96e384..dd5346e2bc 100644
--- a/keyboards/karlb/kbic65/keymaps/via/keymap.c
+++ b/keyboards/karlb/kbic65/keymaps/via/keymap.c
@@ -15,7 +15,7 @@ KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,
 
 [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_INS,
-_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
+_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
 _______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,                      _______,
 _______,   _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,            KC_PGUP,  _______,
 _______,   _______,  _______,                                _______,                                _______,  _______,  _______, KC_HOME,   KC_PGDN,  KC_END)
diff --git a/keyboards/kb_elmo/aek2_usb/keymaps/default/keymap.c b/keyboards/kb_elmo/aek2_usb/keymaps/default/keymap.c
index c5ff48e23e..214e1a575d 100644
--- a/keyboards/kb_elmo/aek2_usb/keymaps/default/keymap.c
+++ b/keyboards/kb_elmo/aek2_usb/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [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_SLCK, KC_PAUS,                               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_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,                               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_PEQL, KC_PSLS, KC_PAST,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/kb_elmo/aek2_usb/keymaps/via/keymap.c b/keyboards/kb_elmo/aek2_usb/keymaps/via/keymap.c
index 86b69ceebd..bf5da917ed 100644
--- a/keyboards/kb_elmo/aek2_usb/keymaps/via/keymap.c
+++ b/keyboards/kb_elmo/aek2_usb/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [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_SLCK, KC_PAUS,                               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_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,                               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_PEQL, KC_PSLS, KC_PAST,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/kb_elmo/elmopad/keymaps/default/keymap.c b/keyboards/kb_elmo/elmopad/keymaps/default/keymap.c
index 9e672de69d..157f7cefeb 100644
--- a/keyboards/kb_elmo/elmopad/keymaps/default/keymap.c
+++ b/keyboards/kb_elmo/elmopad/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_numpad_6x4(
         KC_ESC,  KC_TAB,  KC_DEL,  KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
index 53aef4a6bc..d1a61e570a 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
@@ -25,19 +25,19 @@ 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_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
index 75317159ec..b20c80a504 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
@@ -25,19 +25,19 @@ 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_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
         [2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
         [3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
index 2c65df1b93..018fe03795 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
@@ -25,19 +25,19 @@ 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_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
index 2c65df1b93..018fe03795 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
@@ -25,19 +25,19 @@ 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_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
-                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGDN,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
index 2e6476c24e..e26b135477 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
index 7a2732a10e..43ee4cc944 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/bounce/pad/keymaps/default/keymap.c b/keyboards/kbdfans/bounce/pad/keymaps/default/keymap.c
index 118c74debb..70648d0ae9 100644
--- a/keyboards/kbdfans/bounce/pad/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/bounce/pad/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_6x4( /* Base */
     KC_ESC,  KC_LCTL, KC_LALT, KC_BSPC,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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, 
diff --git a/keyboards/kbdfans/bounce/pad/keymaps/via/keymap.c b/keyboards/kbdfans/bounce/pad/keymaps/via/keymap.c
index 12916db402..1c418fb790 100644
--- a/keyboards/kbdfans/bounce/pad/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/bounce/pad/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_6x4( /* Base */
     KC_ESC,  KC_LCTL, KC_LALT, KC_BSPC,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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, 
diff --git a/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
index 927d682d56..6e4dfa6054 100644
--- a/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_STEP,          KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_STEP,          KC_PSCR, KC_SCRL, KC_PAUS, KC_PGDN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_P4,   KC_P5,   KC_P6,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT,   KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c
index 3d0d442f45..d48c30447e 100644
--- a/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c
+++ b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_iso( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_STEP,          KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_STEP,          KC_PSCR, KC_SCRL, KC_PAUS, KC_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_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,     KC_UP,        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c
index b6bd2b7160..a77170d008 100644
--- a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_STEP,          KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_STEP,          KC_PSCR, KC_SCRL, KC_PAUS, KC_PGDN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_P4,   KC_P5,   KC_P6,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT,   KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
index fccb0aa24e..a79781da8b 100644
--- a/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _____,  _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,       KC_END,
   QK_BOOT,  _____, _____, _____, _____, _____, _____, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _____, _____,
   _____, _____, _____, _____, _____, _____, _____, _____, _____, BL_BRTG, BL_STEP, KC_SLEP, _____, _____, KC_PGUP,
-  _____, _____, _____,                     _____, _____,                      _____, _____, _____, _____, KC_PGDN, KC_SLCK
+  _____, _____, _____,                     _____, _____,                      _____, _____, _____, _____, KC_PGDN, KC_SCRL
 )
 
 };
diff --git a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
index b4c4067c3c..10a907bf01 100644
--- a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _____,  _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,    KC_END,
   QK_BOOT,  _____, _____, _____, _____, _____, _____, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _____, _____,
   _____, _____, _____, _____, _____, _____, _____, _____, _____, BL_BRTG, BL_STEP, KC_SLEP, _____, _____, KC_PGUP,
-  _____, _____, _____,                     _____, _____,                   _____, _____, _____, _____, KC_PGDN, KC_SLCK
+  _____, _____, _____,                     _____, _____,                   _____, _____, _____, _____, KC_PGDN, KC_SCRL
 )
 
 };
diff --git a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
index b00dd01873..14705cb6ae 100644
--- a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _____,  _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, KC_VOLD, KC_VOLU, KC_MUTE,    KC_END,
   QK_BOOT,  _____, _____, _____, _____, _____, _____, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _____, _____,
   _____, _____, _____, _____, _____, _____, _____, _____, _____, BL_BRTG, BL_STEP, KC_SLEP, _____, _____, KC_PGUP,
-  _____, _____, _____,                     _____, _____,                   _____, _____, _____, _____, KC_PGDN, KC_SLCK
+  _____, _____, _____,                     _____, _____,                   _____, _____, _____, _____, KC_PGDN, KC_SCRL
 )
 
 };
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
index 7e36eb783d..62c5993c7f 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [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_NLCK, KC_SLCK, KC_PAUS, \
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  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,  \
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
index 39f5ae90ad..4a1a1dab31 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_65_ansi_blocker( /* MO(1) - Fn */
         KC_GRV,        KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-        _______,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR,  KC_SLCK, KC_PAUS, QK_BOOT,  KC_PGUP,
+        _______,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,  KC_PGUP,
         CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          EEP_RST,  KC_PGDN,
         KC_LSFT,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          KC_VOLU,  KC_MUTE,
         _______,       _______,  _______,                  _______,                   _______,          _______,  KC_MPRV,          KC_VOLD,  KC_MNXT
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
index 2d6296d6c7..75115feed0 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,       KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[_LAYER1] = LAYOUT_65_ansi_blocker( /* FN */
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
index a5e06eaa2a..e634f73f58 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@@ -29,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT_65_ansi_blocker(
         KC_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_CALC,
-        _______,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_PSCR, KC_SLCK, KC_PAUS, _______,  _______,  _______, QK_BOOT,   KC_HOME,
+        _______,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_PSCR, KC_SCRL, KC_PAUS, _______,  _______,  _______, QK_BOOT,   KC_HOME,
         KC_CAPS,  RGB_SPI,  RGB_SPD, RGB_VAD,  RGB_VAI, _______, _______, _______, _______, _______, _______,  _______,           EEP_RST,   KC_END,
-        KC_LSFT,  RGB_NITE, _______, _______,  _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, KC_MPLY,  _______,           KC_VOLU,   KC_MUTE,
+        KC_LSFT,  RGB_NITE, _______, _______,  _______, _______, KC_NUM,  _______, RGB_TOD, RGB_TOI, KC_MPLY,  _______,           KC_VOLU,   KC_MUTE,
         _______,  KC_WINLCK, _______,                   _______,                            _______, _______,            KC_MPRV, KC_VOLD,   KC_MNXT
     ),
     [_LOWER] = LAYOUT_65_ansi_blocker(
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
index e8df1d05bb..8727c47ac5 100644
--- 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
@@ -1 +1 @@
-{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_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_SLCK","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","EEP_RST","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"],["KC_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_SLCK","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","EEP_RST","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
+{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_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","EEP_RST","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"],["KC_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","EEP_RST","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
index 8c74707f26..8c92c73985 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi_blocker(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_SLCK, 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, EEP_RST, 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),
+	[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, EEP_RST, 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(KC_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_SLCK, 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, EEP_RST, 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)
+	[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, EEP_RST, 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
index e6351271ea..030b604dbc 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
@@ -1 +1 @@
-[["KC_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_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_SLCK", "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", "EEP_RST", "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"], ["KC_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_SLCK", "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", "EEP_RST", "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
+[["KC_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_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", "EEP_RST", "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"], ["KC_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", "EEP_RST", "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/mikefightsbears/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
index 426c729789..3df8b766ed 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_65_ansi_blocker(
 		KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  
-		_______, _______,  RGB_VAI, _______, _______, RGB_SAI, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,  
+		_______, _______,  RGB_VAI, _______, _______, RGB_SAI, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  
 		_______, RGB_SPD,  RGB_VAD, RGB_SPI, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, 	       KC_VOLU, 
 		_______, RGB_RMOD, RGB_TOG, RGB_MOD, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, _______, 	      KC_PGUP, KC_VOLD, 
 		_______, _______,  _______, _______, 						  _______, _______,	     KC_HOME, KC_PGDN, KC_END   
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
index 3cad9b2ba2..a2b17a41c5 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
index b94ae599df..b2f043b6d1 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_iso_blocker(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, QK_BOOT,   KC_PGDN,
         KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
index 4d71ba0523..6b74ac44b2 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_iso_blocker(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          KC_PGUP,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, QK_BOOT,   KC_PGDN,
         KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
index 635e1d0ddc..21ff6843b3 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [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_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______,
+   _______,_______,  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/koba/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
index 925ae51b38..f40216eb02 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [1] = LAYOUT_all(
    QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
-   _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
+   _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
    _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
    _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
index 839e28fae1..9def8e26ad 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [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_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______,   \
+   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/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
index 48c9cd9804..755da6e5cf 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [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_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______,
+   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/rev2/keymaps/adi/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
index d5d07e1312..202ca95e9e 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_PGDN,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_MPLY, KC_VOLU, KC_MUTE,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_MPLY, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_VOLD, KC_MFFD
     )
 };
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/keymap.c
index 73fd4583a1..6c203b6938 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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_INS,  \
-  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS, \
   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/keymap.c
index 38a90560dc..d95bd97c33 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_65_ansi_blocker_splitbs(
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,  KC_INS,  \
-  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, \
+  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, \
   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_PGUP, KC_TRNS, \
   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                   KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c
index 551e04cbf9..0e44c6eac1 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [1] = LAYOUT_65_ansi_split_space(
    KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_DEL,KC_INS,
-   _______,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______,
+   _______,_______,  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/rev2/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c
index 635e1d0ddc..21ff6843b3 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [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_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______,
+   _______,_______,  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/rev2/keymaps/droxx/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
index 1c6e2b982d..de845d163c 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DRXXFN] = LAYOUT_65_ansi(
   KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
   DRXX  ,   RGB_RMOD, RGB_VAI,  RGB_MOD,  DRXX,     RGB_TOG,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     KC_PAUS,
-  DRXX,     RGB_SPD,  RGB_VAD,  RGB_SPI,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_SLCK,
+  DRXX,     RGB_SPD,  RGB_VAD,  RGB_SPI,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_SCRL,
   DRXX,     DRXX,     GUI_OFF,  GUI_ON,   DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_PSCR,
   DRXX,     DRXX,     DRXX,                         DRXX,                         DRXX,          DRXX,          DRXX,     DRXX,     DRXX,     DRXX),
 };
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
index 625b768e66..56c554ae5b 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_65_ansi(
   KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_VOLU,
-  KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_VOLD,
+  KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_VOLD,
   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_MUTE,
   KC_TRNS, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_PGUP, KC_MPLY,
   LCTL(KC_LALT), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
index 925ae51b38..f40216eb02 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [1] = LAYOUT_all(
    QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
-   _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
+   _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
    _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
    _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/keymap.c
index 023646acac..1f15b54f70 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [1] = LAYOUT_65_ansi_split_bs_2_right_mods(
   KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,  KC_DEL,KC_INS, \
-   _______,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______,   \
+   _______,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,   \
       _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,KC_VOLU, \
            _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,_______,KC_VOLD, \
     _______,  _______,  _______,                     _______,                     _______,_______,KC_MPRV,KC_MPLY,KC_MNXT),
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
index 0a4648d41e..33f4ef3f72 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FUNC] = LAYOUT_all(
          KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,_______,KC_INS, 
-         _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,      KC_HOME, 
+         _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,      KC_HOME, 
          _______,     VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,_______,_______,_______,_______,_______,      _______,      KC_END, 
          _______,_______,BL_TOGG, BL_DEC, BL_INC, BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,_______, 
          KC_SLEP,QK_BOOT,_______,      LCA(KC_DEL),     LCA(KC_DEL),    LCA(KC_DEL),  LCA(KC_INS),KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_KP_SLASH, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_MINUS, _______, _______,             _______, 
-        _______, _______, KC_NLCK, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, KC_KP_PLUS, _______,   _______, _______, 
+        _______, _______, KC_NUM,  _______, _______, _______, _______, _______, KC_KP_0, _______, _______, KC_KP_PLUS, _______,   _______, _______, 
         _______, _______, _______,       _______,        _______,         _______,          _______, _______, XXXXXXX, _______, _______, _______),
     };
 
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
index c8705dfa4b..729c4f5f23 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [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_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+  _______, _______, 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/kbd6x/keymaps/dbroqua/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
index ef5533a59e..9966a28d73 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       */
     [_FN] = LAYOUT(
         KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
+        KC_CAPS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
         KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, DF(_RGB), KC_TRNS,
         KC_TRNS, DF(_DEFAULT), DF(_ALTERNATE), KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS),
diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
index 0e2d450496..99c65a6ab3 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [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, QK_BOOT,
-      KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_DEL,
+      KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_DEL,
       KC_RCTL, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_MSTP, KC_ASTR, KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_PLUS, KC_UNDS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
index f59fa64ef2..4e021993a8 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, QK_BOOT,
+      KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, QK_BOOT,
       KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MSTP, KC_TRNS, KC_ASTR, KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_PLUS, KC_UNDS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
index 2e52bacd21..5455402dbc 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
@@ -19,5 +19,5 @@
 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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, LT(2,KC_HOME), LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), RALT_T(KC_DEL), KC_APP, RCTL_T(KC_END)),
         [1] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_UP, KC_RBRC, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC, KC_TRNS, KC_WREF, KC_WBAK, KC_WFWD, KC_WHOM, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_PGDN),
-        [2] = LAYOUT(RGB_TOG, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_UP, KC_TRNS, KC_TRNS, KC_CAPS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS)
+        [2] = LAYOUT(RGB_TOG, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_UP, KC_TRNS, KC_TRNS, KC_CAPS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
index 497df43cf2..39132fbfcb 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [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_GRV,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK,   KC_PAUS, KC_UP,    KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL,   KC_PAUS, KC_UP,    KC_TRNS, KC_TRNS,
       KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,   KC_LEFT, KC_RIGHT, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN,   KC_DOWN, KC_TRNS,  KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   MO(2),                     KC_STOP, KC_TRNS,   KC_TRNS
diff --git a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c b/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
index 32f59cfb10..aaca0a06ee 100644
--- a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
@@ -182,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB , QWERTY , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_SNU ,
     KC_CAPS, _______, _______, DVORAK , _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_SND ,
     _______,          _______, _______, COLEMAK, BL_DEC , BL_TOGG, BL_INC , BL_STEP, _______, _______, _______, _______,          KC_PAUS, KC_MUTE,
-    KC_LGUI, KC_LALT, KC_LCTL,                   KC_SPC ,                                     KC_MNXT, KC_MPLY, _______, KC_VOLD, KC_SLCK, KC_VOLU
+    KC_LGUI, KC_LALT, KC_LCTL,                   KC_SPC ,                                     KC_MNXT, KC_MPLY, _______, KC_VOLD, KC_SCRL, KC_VOLU
   ),
 };
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
index c9f201ac60..e4570d5320 100644
--- a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
@@ -3,7 +3,7 @@
 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_SLCK,  KC_DEL,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_DEL,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   _______,  KC_BSPC,  KC_HOME,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_PGUP,
     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,                      KC_ENT,   KC_PGDN,
diff --git a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
index de656357f9..59548ea417 100644
--- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_75_ansi_wkl(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DEL,  DM_REC1,
-        _______, KC_CALC, KC_APP,  G_PUSH,  _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,          DM_REC2,
+        _______, KC_CALC, KC_APP,  G_PUSH,  _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,          DM_REC2,
         _______, M_SALL,  _______, G_FTCH,  G_PWD,   _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,          DM_RSTP,          DM_PLY1,
         _______,          M_UNDO,  M_CUT,   M_COPY,  M_PASTE, G_BRCH,  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, _______, DM_PLY2,
         _______, _______,                                     _______,                                     _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index d06d1f8e0a..4dbdadbc18 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FUNC] = LAYOUT_ansi_1u(
-        QK_BOOT, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLCK, KC_PAUS,
+        QK_BOOT, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS,
         KC_TRNS, MACRO1, MACRO2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         MACROTAB, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS,
         KC_TRNS, VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DYN_REC_START2, DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS,
diff --git a/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
index 48974bc401..565f791349 100644
--- a/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-      KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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_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,
diff --git a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
index a979005ba7..804acbfeb9 100644
--- a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
+++ b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-      KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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_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,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
index f651f2f0b2..498b4362bf 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS, \
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS, \
 	KC_LGUI, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP, \
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN, \
 	MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,                                      \
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c
index d9a5cd5d18..f227e38eba 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_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,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c
index d55a2a9890..16066cf70f 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_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,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/keymap.c
index 63b29f5fd0..69a44a2e9d 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_ansi( /* Base */
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/keymap.c
index 61053da874..061606e7c2 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_iso( /* Base */
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c
index c3352509ca..c100ad2d1d 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_NUHS,          KC_DEL,  KC_END,  KC_PGDN,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c
index f9b75e4dda..e6a394ffdd 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_NUHS,          KC_DEL,  KC_END,  KC_PGDN,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c
index 4e210af0c4..1793aa7cea 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
     
-	KC_ESC,           KC_CAPS, KC_SLCK, BL_TOGG, BL_STEP,      RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,          KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_CAPS, KC_SCRL, BL_TOGG, BL_STEP,      RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,          KC_PSCR, KC_SCRL, KC_PAUS,
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_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,
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/via/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/via/keymap.c
index 054ef04954..3f785ba666 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Layer Zero */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS, 
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS, 
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP, 
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_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,                                      
diff --git a/keyboards/kbdfans/kbdpad/mk1/keymaps/default/keymap.c b/keyboards/kbdfans/kbdpad/mk1/keymaps/default/keymap.c
index 58f2c597e7..fbf782e68d 100644
--- a/keyboards/kbdfans/kbdpad/mk1/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk1/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
                           KC_DEL,  KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
index 3213eca482..442f61c77b 100644
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_6x4( /* Base */
     KC_ESC,  KC_LCTL, KC_LALT, KC_BSPC,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c
index e0c56c167d..ebc49db5df 100644
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_6x4( /* Base */
     BL_TOGG, BL_STEP, RGB_TOG, RGB_MOD,
-	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 	KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
index 20c048c111..4fcd03bcef 100644
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_6x4( /* Base */
     KC_ESC,  KC_LCTL, KC_LALT, KC_BSPC,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kbdfans/maja/keymaps/default/keymap.c b/keyboards/kbdfans/maja/keymaps/default/keymap.c
index eecc43601e..13c5f77b65 100755
--- a/keyboards/kbdfans/maja/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
 			KC_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,  QK_BOOT,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/maja/keymaps/via/keymap.c b/keyboards/kbdfans/maja/keymaps/via/keymap.c
index da6363f636..4c0b41a81d 100755
--- a/keyboards/kbdfans/maja/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
 			KC_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,  QK_BOOT,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
index e10b2aa3be..d206c955f7 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
 			KC_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,  QK_BOOT,KC_TRNS,KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
index 2daf51946e..35b2325230 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
 			KC_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,  QK_BOOT,KC_TRNS,KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, QK_BOOT,    KC_PGUP,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
index b3edc0859f..6b5e24e166 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_planck_mit(
-  KC_NLCK, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,          KC_BSPC,
+  KC_NUM,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,          KC_BSPC,
   KC_DEL,  KC_4,    KC_5,    KC_6,    _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,  KC_GRV,
   _______, KC_7,    KC_8,    KC_9,    _______, _______, _______, _______, KC_PSCR, _______, KC_BSLS, _______,
   _______, _______, _______, KC_0,    _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
diff --git a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
index 2deadbf80f..146cbc7148 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
@@ -63,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_RAISE] = LAYOUT_planck_mit(
     _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    _______, KC_DEL,  KC_END,  KC_PGDN, KC_NLCK, _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______,
+    _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+    _______, KC_DEL,  KC_END,  KC_PGDN, KC_NUM,  _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
   ),
 
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
index 67f0111112..d100d8e0d2 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FNL1] = LAYOUT_ortho_4x12(
   TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  TT(_FNL1), _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NLCK, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
+  TT(_FNL1), _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
   KC_LSFT,    CTLZ,    CTLX,    CTLC,    CTLV, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
   _______, _______, CTALDEL, _______, _______, _______, _______, TO(_MOUSE), _______, _______, LSFT(KC_1), _______
 ),
@@ -136,8 +136,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_FNL2] = LAYOUT_ortho_4x12(
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS, _______, KC_PSCR,  KC_INS, KC_HOME, KC_PGUP, KC_SLCK,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NLCK, _______, _______,  KC_DEL,  KC_END, KC_PGDN, KC_PAUS,
+  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS, _______, KC_PSCR,  KC_INS, KC_HOME, KC_PGUP, KC_SCRL,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  _______, _______,  KC_DEL,  KC_END, KC_PGDN, KC_PAUS,
   _______,    CTLZ,    CTLX,    CTLC,    CTLV, _______, _______, _______, _______,   KC_UP, _______, KC_ENT,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TO(_QWERTY)
 ),
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FNL3] = LAYOUT_ortho_4x12(
   TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NLCK, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
   KC_LSFT, _______, _______, _______, _______, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LSFT(KC_1), _______
 ),
@@ -242,9 +242,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 return false;
             case DGRMCRO:
                 if(!bnumlock) {
-                    //register_code(KC_NLCK);
-                    //unregister_code(KC_NLCK);
-                    tap_code(KC_NLCK);
+                    //register_code(KC_NUM);
+                    //unregister_code(KC_NUM);
+                    tap_code(KC_NUM);
                     bnumlock = true;
                 }
                 //SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P0) SS_TAP(X_P1) SS_TAP(X_P7) SS_TAP(X_P6) SS_UP(X_LALT));
@@ -303,13 +303,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             rgbflag(0x00,  0x00, 0x00);
         }
         if(bnumlock) {
-            tap_code(KC_NLCK);
+            tap_code(KC_NUM);
         }
         break;
     case _LOWER:
             rgblight_mode(1);
         if(!bnumlock) {
-            tap_code(KC_NLCK);
+            tap_code(KC_NUM);
         }
         rgbflag(0xFF,  0x00, 0x00);
 
@@ -318,21 +318,21 @@ layer_state_t layer_state_set_user(layer_state_t state) {
         rgblight_mode(1);
         rgbflag(0xFF,  0xFF, 0xFF);
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM);
         }
         break;
     case _RAISE:
         rgblight_mode(1);
         rgbflag(0x00,  0xFF, 0x00);
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM);
         }
         break;
     case _FNL1:
         rgblight_mode(1);
         rgbflag(0x00,  0x00, 0xFF);
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM);
         }
         break;
     case _GAMEMODE:
@@ -343,13 +343,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
         rgblight_mode(1);
         rgbflag(0x00,  0xFF, 0xFF);
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM);
         }
         break;
     default: //  for any other layers, or the default layer
         rgblight_mode(1);
         if(bnumlock) {
-            tap_code(KC_NLCK);
+            tap_code(KC_NUM);
         }
         rgbflag(0xFF,  0xFF, 0xFF);
         break;
@@ -368,8 +368,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     if (layer & (1<<2)) {
         if(!bnumlock) {
             numlock_changed = true;
-            register_code(KC_NLCK);
-            unregister_code(KC_NLCK);
+            register_code(KC_NUM);
+            unregister_code(KC_NUM);
             bnumlock = true;
         }
     }
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
index 47adafeffa..299db67831 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LOWER] = LAYOUT_ortho_4x12(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
-        _______, KC_CAPS, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, KC_PGUP, _______,
+        _______, KC_CAPS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_APP,  KC_HOME, KC_PGDN, KC_END
     ),
     
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NUM] = LAYOUT_ortho_4x12(
         _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PSLS, _______,
-        _______, KC_NLCK, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PAST, _______,
+        _______, KC_NUM,  _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PAST, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_DOT,  KC_KP_0, KC_PPLS, KC_PMNS, _______
     ),
     
diff --git a/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
index 79fda2be00..c7db9d5023 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FC] = LAYOUT(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX, XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX,
     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX,
-    _______, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_PSCR, KC_BRK,  KC_SLCK, KC_CAPS, XXXXXXX,
+    _______, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_PSCR, KC_BRK,  KC_SCRL, KC_CAPS, XXXXXXX,
     _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, XXXXXXX
   ),
 
diff --git a/keyboards/kbdfans/odin/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/odin/rgb/keymaps/default/keymap.c
index 79541a8cf9..e53ae39e96 100644
--- a/keyboards/kbdfans/odin/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/odin/rgb/keymaps/default/keymap.c
@@ -19,16 +19,16 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] =LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN,  		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_ESC, KC_F1, KC_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_PGUP, KC_PGDN,  		
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, 
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
                         ),
 	[1]   =LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN,  		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_ESC, KC_F1, KC_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_PGUP, KC_PGDN,  		
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, 
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
diff --git a/keyboards/kbdfans/odin/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/odin/rgb/keymaps/via/keymap.c
index 79f14fee6b..85dd0ff264 100644
--- a/keyboards/kbdfans/odin/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/odin/rgb/keymaps/via/keymap.c
@@ -19,16 +19,16 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] =LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN,  		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_ESC, KC_F1, KC_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_PGUP, KC_PGDN,  		
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, 
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
                         ),
 	[1]   =LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN,  		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_ESC, KC_F1, KC_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_PGUP, KC_PGDN,  		
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, 
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
diff --git a/keyboards/kbdfans/odin/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/odin/soldered/keymaps/default/keymap.c
index ec202aea25..dc3397df08 100644
--- a/keyboards/kbdfans/odin/soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/odin/soldered/keymaps/default/keymap.c
@@ -19,8 +19,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] =LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN, 		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,KC_BSPC,  KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_ESC, KC_F1, KC_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_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_DEL,KC_BSPC,  KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, KC_PPLS,
 		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,KC_END, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         ),
 	[1]   =LAYOUT_all(
 		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, KC_PAUS, KC_SPC, KC_SPC, KC_SPC, 		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, KC_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_INS, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
diff --git a/keyboards/kbdfans/odin/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/odin/soldered/keymaps/via/keymap.c
index ec202aea25..dc3397df08 100644
--- a/keyboards/kbdfans/odin/soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/odin/soldered/keymaps/via/keymap.c
@@ -19,8 +19,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] =LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN, 		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,KC_BSPC,  KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_ESC, KC_F1, KC_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_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_DEL,KC_BSPC,  KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, KC_PPLS,
 		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,KC_END, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         ),
 	[1]   =LAYOUT_all(
 		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, KC_PAUS, KC_SPC, KC_SPC, KC_SPC, 		
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, 
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,  KC_P4, KC_P5, KC_P6, KC_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_INS, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 
diff --git a/keyboards/kbdfans/phaseone/keymaps/default/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default/keymap.c
index a74be0ce50..3a909bc3a0 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default/keymap.c
@@ -25,21 +25,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [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_MUTE, KC_INS,
-  _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+  _______, _______, 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_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_MUTE, KC_INS,
-  _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+  _______, _______, 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
 ),
 [3] = 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_MUTE, KC_INS,
-  _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+  _______, _______, 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/phaseone/keymaps/default_ansi_blocker/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker/keymap.c
index 0d0a91c0e7..553abc8f50 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, 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/phaseone/keymaps/default_ansi_blocker_split_bs/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_split_bs/keymap.c
index f460d9f1d0..025b4a5ba3 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_split_bs/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_split_bs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker_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_MUTE, KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, 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/phaseone/keymaps/default_ansi_blocker_tsangan_wkl/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_tsangan_wkl/keymap.c
index 082e5f224c..1147b0b87a 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_tsangan_wkl/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_tsangan_wkl/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker_tsangan_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_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, 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/phaseone/keymaps/default_ansi_blocker_tsangan_wkl_split_bs/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_tsangan_wkl_split_bs/keymap.c
index 342c14b715..620a54cd4a 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_tsangan_wkl_split_bs/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_ansi_blocker_tsangan_wkl_split_bs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker_tsangan_wkl_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_MUTE, KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, 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/phaseone/keymaps/default_iso_blocker/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker/keymap.c
index 597e1a4006..eda625872b 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = 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,  KC_DEL,  KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          _______,
+        _______, _______, 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/phaseone/keymaps/default_iso_blocker_split_bs/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_split_bs/keymap.c
index 22fe3fb068..4aea4f4dd1 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_split_bs/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_split_bs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_iso_blocker_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_MUTE, KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, 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/phaseone/keymaps/default_iso_blocker_tsangan_wkl/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_tsangan_wkl/keymap.c
index 5e40a31ae0..16f8724864 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_tsangan_wkl/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_tsangan_wkl/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_iso_blocker_tsangan_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_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, 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/phaseone/keymaps/default_iso_blocker_tsangan_wkl_split_bs/keymap.c b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_tsangan_wkl_split_bs/keymap.c
index eb10f35f36..c60fd4ecfc 100644
--- a/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_tsangan_wkl_split_bs/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/default_iso_blocker_tsangan_wkl_split_bs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_iso_blocker_tsangan_wkl_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_MUTE, KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, _______, 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/phaseone/keymaps/via/keymap.c b/keyboards/kbdfans/phaseone/keymaps/via/keymap.c
index a74be0ce50..3a909bc3a0 100644
--- a/keyboards/kbdfans/phaseone/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/phaseone/keymaps/via/keymap.c
@@ -25,21 +25,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [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_MUTE, KC_INS,
-  _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+  _______, _______, 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_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_MUTE, KC_INS,
-  _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+  _______, _______, 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
 ),
 [3] = 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_MUTE, KC_INS,
-  _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+  _______, _______, 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/tiger80/keymaps/default/keymap.c b/keyboards/kbdfans/tiger80/keymaps/default/keymap.c
index 919489727c..b06db5541c 100644
--- a/keyboards/kbdfans/tiger80/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/tiger80/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_f13_ansi_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kbdfans/tiger80/keymaps/via/keymap.c b/keyboards/kbdfans/tiger80/keymaps/via/keymap.c
index b14f716ae8..1862bf5d94 100644
--- a/keyboards/kbdfans/tiger80/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/tiger80/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_f13_ansi_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
index 35ea6386ed..f6abed793d 100644
--- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
+++ b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT( /* 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_CAPS, BL_TOGG, BL_INC, BL_DEC, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______,  \
+      KC_CAPS, BL_TOGG, BL_INC, BL_DEC, ______, ______, ______, ______, 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_DEL,         KC_MSTP, ______,    ______,    ______ \
diff --git a/keyboards/kc60/keymaps/default/keymap.c b/keyboards/kc60/keymaps/default/keymap.c
index 0955c65d30..1ff95ab90c 100644
--- a/keyboards/kc60/keymaps/default/keymap.c
+++ b/keyboards/kc60/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
+        XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
         _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
         _______, _______, _______,                            XXXXXXX,                            _______, _______, _______, _______
diff --git a/keyboards/kc60/keymaps/noroadsleft/keymap.c b/keyboards/kc60/keymaps/noroadsleft/keymap.c
index 37091fccdd..aa0f7ae965 100644
--- a/keyboards/kc60/keymaps/noroadsleft/keymap.c
+++ b/keyboards/kc60/keymaps/noroadsleft/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN] = LAYOUT_60_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, KC_CALC, KC_APP,  _______, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, KC_CALC, KC_APP,  _______, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         _______, M_SALL,  _______, _______, _______, _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,          KC_PENT,
         _______,          M_UNDO,  M_CUT,   M_COPY,  M_PASTE, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, TG(_SY),          _______,
         _______, _______, _______,                            TG(_NP),                            _______, _______, _______, _______
diff --git a/keyboards/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c
index ccc2644d6a..b6bbff7c89 100644
--- a/keyboards/kc60/keymaps/stanleylai/keymap.c
+++ b/keyboards/kc60/keymaps/stanleylai/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Function layer
 [_FL] = LAYOUT(
   KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,   KC_F12,   KC_DEL, \
-  KC_NO,  KC_MPRV,KC_UP,  KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_PSCR,KC_SLCK,  KC_PAUS,  KC_INS, \
+  KC_NO,  KC_MPRV,KC_UP,  KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_PSCR,KC_SCRL,  KC_PAUS,  KC_INS, \
   KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO,  \
   KC_TRNS,KC_NO,  KC_MUTE,KC_VOLD,KC_VOLU,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_TRNS,  LT(_RGBL, KC_PGUP),\
   KC_TRNS,KC_TRNS,KC_TRNS,                KC_MPLY,                        KC_NO,  KC_TRNS,KC_HOME,  KC_PGDN,  KC_END),
diff --git a/keyboards/kc60/keymaps/via/keymap.c b/keyboards/kc60/keymaps/via/keymap.c
index 26805e3041..0144b1d031 100644
--- a/keyboards/kc60/keymaps/via/keymap.c
+++ b/keyboards/kc60/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
+        XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
         _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
         _______, _______, _______,                            XXXXXXX,                            _______, _______, _______, _______
diff --git a/keyboards/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c
index aca89bf9a0..98f2c27aa4 100644
--- a/keyboards/kc60/keymaps/ws2812/keymap.c
+++ b/keyboards/kc60/keymaps/ws2812/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
-        XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
+        XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
         _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
         _______, _______, _______,                            XXXXXXX,                            _______, _______, _______, _______
diff --git a/keyboards/kc60se/keymaps/60_ansi/keymap.c b/keyboards/kc60se/keymaps/60_ansi/keymap.c
index d59a8b95d2..184e24697b 100644
--- a/keyboards/kc60se/keymaps/60_ansi/keymap.c
+++ b/keyboards/kc60se/keymaps/60_ansi/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FL] = 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,
-        _______, _______, _______, _______, _______, _______, BL_ON,   BL_STEP, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_INS,
+        _______, _______, _______, _______, _______, _______, BL_ON,   BL_STEP, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
         _______, _______, _______,                   _______,                                     _______, _______, _______, _______
diff --git a/keyboards/kc60se/keymaps/default/keymap.c b/keyboards/kc60se/keymaps/default/keymap.c
index 77ac63aee9..429e76e769 100644
--- a/keyboards/kc60se/keymaps/default/keymap.c
+++ b/keyboards/kc60se/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FL] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,
-        KC_CAPS,  BL_ON,   BL_STEP, _______, _______, NK_TOGG, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_DEL,
+        KC_CAPS,  BL_ON,   BL_STEP, _______, _______, NK_TOGG, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_DEL,
         _______,  KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
         _______,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         _______,  _______,  _______,                  _______,                                     _______, KC_MSTP, _______, _______
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
index 2ae6bae7a7..1f843f38b1 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_P7,		KC_P8,		KC_P9,		KC_TAB,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,			KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_LBRC,	KC_RBRC,	KC_BSLS,	KC_HOME, \
 	KC_P4,		KC_P5,		KC_P6,		KC_BSPC,	KC_A,		KC_S,		KC_D,		KC_F,		KC_G,			KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,	KC_QUOT,	KC_ENT,		XXXXXXX,	KC_PSCR, \
 	KC_P1,		KC_P2,		KC_P3,		KC_LSFT,	KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,	KC_RSFT,	KC_UP,		KC_CAPS,	KC_INS, \
-	KC_P0,		KC_PDOT,	KC_PENT,	KC_LCTL,	TO(_LIST),	KC_LGUI,	KC_LALT,	XXXXXXX,	KC_SPC,			KC_SPC,		XXXXXXX,	KC_RALT,	KC_RGUI,	KC_RCTL,	KC_LEFT,	KC_DOWN,	KC_RGHT,	KC_NLCK \
+	KC_P0,		KC_PDOT,	KC_PENT,	KC_LCTL,	TO(_LIST),	KC_LGUI,	KC_LALT,	XXXXXXX,	KC_SPC,			KC_SPC,		XXXXXXX,	KC_RALT,	KC_RGUI,	KC_RCTL,	KC_LEFT,	KC_DOWN,	KC_RGHT,	KC_NUM \
 ),
 
 [_LIST] = LAYOUT( \
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
index 60bbbbdebe..1d312cac95 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -210,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_NUMPAD] = LAYOUT( \
   _______, _______, _______,  _______,   _______,   _______,   _______, _______, _______,     _______, _______,  _______,  _______, _______, _______, _______, _______, _______,
-  _______, KC_NLCK, _______,  _______,   _______,   _______,   _______, _______, _______,     _______, _______,  _______,  KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_NUM,  _______,  _______,   _______,   _______,   _______, _______, _______,     _______, _______,  _______,  KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   _______, KC_P6,   KC_P7,   KC_P8,      KC_P9,     KC_P0,     _______, _______, _______,     _______, _______,  _______,  _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
   _______, KC_P1,   KC_P2,   KC_P3,      KC_P4,     KC_P5,     _______, _______, _______,     _______, _______,  _______,  _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
   _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ), _______, _______, _______,     _______, _______,  _______,  _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
@@ -237,7 +237,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,  KC_LALT, KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, KC_LALT, KC_SPC,  KC_ENT,  KC_BSPC, KC_END,      _______, ENTNS,   DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -262,7 +262,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,  KC_LALT, KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, KC_LALT, KC_SPC,  KC_ENT,  KC_BSPC, KC_END,      _______, ENTNS,   DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
index 604717b0c5..34c63e96fd 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
@@ -115,7 +115,7 @@ Colemak
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -141,7 +141,7 @@ QWERTY
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SLCK, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -234,7 +234,7 @@ Numpad layer
 */
 [_NUMPAD] = LAYOUT( \
   _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NLCK, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_NUM,  _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______,     _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
   _______, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   _______, _______, _______,     _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
   _______, _______, KC_PDOT, TD_PSPA, TD_PMUN, TD_PPEQ, _______, _______, _______,     _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
diff --git a/keyboards/keebio/choconum/keymaps/default/keymap.c b/keyboards/keebio/choconum/keymaps/default/keymap.c
index d6f0af3c8c..e21964fe54 100644
--- a/keyboards/keebio/choconum/keymaps/default/keymap.c
+++ b/keyboards/keebio/choconum/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/keebio/choconum/keymaps/via/keymap.c b/keyboards/keebio/choconum/keymaps/via/keymap.c
index fec5e59e70..8fd16ea283 100644
--- a/keyboards/keebio/choconum/keymaps/via/keymap.c
+++ b/keyboards/keebio/choconum/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_ortho_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/keebio/iris/keymaps/ave-63/keymap.c b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
index a3919c413c..115a27d7e8 100644
--- a/keyboards/keebio/iris/keymaps/ave-63/keymap.c
+++ b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [_COMMAND] = LAYOUT(
     KC_APP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-   KC_TRNS, KC_PGUP, KC_HOME,   KC_UP,  KC_END, KC_VOLU,                    KC_SLCK,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_TRNS, 
+   KC_TRNS, KC_PGUP, KC_HOME,   KC_UP,  KC_END, KC_VOLU,                    KC_SCRL,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_TRNS, 
    KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD,                    KC_CAPS,   KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_TRNS, 
    KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_MUTE, KC_TRNS,  KC_TRNS, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_TRNS, 
                                  KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS,  KC_TRNS 
diff --git a/keyboards/keebio/iris/keymaps/blucky/keymap.c b/keyboards/keebio/iris/keymaps/blucky/keymap.c
index f7ede3f220..040eb23b2a 100644
--- a/keyboards/keebio/iris/keymaps/blucky/keymap.c
+++ b/keyboards/keebio/iris/keymaps/blucky/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_CAPS,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_MINS,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_SLCK,  KC_PSCR, KC_NO,   KC_NO,   KC_NO,    KC_NO,                             KC_PGUP, KC_PGDN, KC_HOME, KC_END,  KC_NO,   KC_DEL,
+     KC_SCRL,  KC_PSCR, KC_NO,   KC_NO,   KC_NO,    KC_NO,                             KC_PGUP, KC_PGDN, KC_HOME, KC_END,  KC_NO,   KC_DEL,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_NO,    KC_NO, C(KC_LEFT), KC_NO, C(KC_RGHT), KC_NO,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_NO,   KC_INS,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/csc027/keymap.c b/keyboards/keebio/iris/keymaps/csc027/keymap.c
index 1682f012a0..b9bc4c272e 100644
--- a/keyboards/keebio/iris/keymaps/csc027/keymap.c
+++ b/keyboards/keebio/iris/keymaps/csc027/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_CS] = LAYOUT(
         XXXXXXX, KC_5,    KC_1,    KC_2,    KC_3,    KC_4,                               KC_6,    KC_P7,   KC_P8,   KC_P9,   KC_0,    KC_BSPC,
-        XXXXXXX, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,                               KC_Y,    KC_P4,   KC_P5,   KC_P6,   XXXXXXX, KC_NLCK,
+        XXXXXXX, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,                               KC_Y,    KC_P4,   KC_P5,   KC_P6,   XXXXXXX, KC_NUM,
         KC_G,    KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,                               KC_H,    KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_ESC,
         XXXXXXX, KC_LCTL, XXXXXXX, KC_X,    XXXXXXX, XXXXXXX, KC_SPC,           _______, KC_N,    KC_P0,   KC_P0,   KC_PDOT, TO(_QW), TO(_QW),
                                    KC_B,     KC_SPC,   KC_SPC,                    _______,  KC_N,     KC_P0
diff --git a/keyboards/keebio/iris/keymaps/impstyle/keymap.c b/keyboards/keebio/iris/keymaps/impstyle/keymap.c
index bb371faa3f..0d3d6b640a 100644
--- a/keyboards/keebio/iris/keymaps/impstyle/keymap.c
+++ b/keyboards/keebio/iris/keymaps/impstyle/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT(
        KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-       _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+       _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
        _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
        _______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,KC_VOLD,
                                       _______ ,_______,_______,        KC_EQL ,_______,_______
diff --git a/keyboards/keebio/iris/keymaps/isolike/keymap.c b/keyboards/keebio/iris/keymaps/isolike/keymap.c
index 912be5e390..0161ee23de 100644
--- a/keyboards/keebio/iris/keymaps/isolike/keymap.c
+++ b/keyboards/keebio/iris/keymaps/isolike/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_PGDN,                            KC_WH_D, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_NUHS,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,          _______, KC_LCTL, KC_LALT, KC_RALT, KC_RGUI, KC_RCTL, KC_GRV,
+     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,          _______, KC_LCTL, KC_LALT, KC_RALT, KC_RGUI, KC_RCTL, KC_GRV,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     KC_LGUI, _______, _______,                   _______, _______, KC_APP
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
index 5fe88a2289..414743e30f 100644
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
@@ -5,7 +5,7 @@
 #define _RAISE 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, LCTL_T(KC_LGUI), KC_Z, KC_X, KC_C, KC_D, KC_V, LGUI(KC_L), MEH_T(KC_MINS), KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LGUI, LT(1, KC_QUOT), KC_SFTENT, KC_SPC, LT(2, KC_BSLS), LALT_T(KC_APP)),
-                                                              [1] = LAYOUT(KC_MPLY, KC_NO, KC_DQUO, KC_NO, LALT(KC_F4), KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, QK_BOOT, KC_MPRV, KC_END, KC_UP, KC_HOME, KC_PGUP, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_SAI, RGB_SAD, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P1, KC_P2, KC_P3, KC_PAST, RGB_HUI, RGB_HUD, KC_NO, KC_WBAK, KC_WFWD, KC_WSTP, KC_WREF, KC_NO, LCA(KC_DEL), KC_NLCK, KC_P0, KC_P0, KC_PDOT, KC_PENT, RGB_SPI, RGB_SPD, KC_PSCR, KC_NO, KC_LGUI, RGB_TOG, RGB_VAI, RGB_VAD),
+                                                              [1] = LAYOUT(KC_MPLY, KC_NO, KC_DQUO, KC_NO, LALT(KC_F4), KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, QK_BOOT, KC_MPRV, KC_END, KC_UP, KC_HOME, KC_PGUP, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_SAI, RGB_SAD, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P1, KC_P2, KC_P3, KC_PAST, RGB_HUI, RGB_HUD, KC_NO, KC_WBAK, KC_WFWD, KC_WSTP, KC_WREF, KC_NO, LCA(KC_DEL), KC_NUM, KC_P0, KC_P0, KC_PDOT, KC_PENT, RGB_SPI, RGB_SPD, KC_PSCR, KC_NO, KC_LGUI, RGB_TOG, RGB_VAI, RGB_VAD),
                                                               [2] = LAYOUT(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_K, KC_NO, KC_WH_D, KC_MS_U, KC_WH_U, KC_NO, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)};
 
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/keebio/iris/keymaps/khitsule/keymap.c b/keyboards/keebio/iris/keymaps/khitsule/keymap.c
index 1ba89962c6..c7247b1a4f 100644
--- a/keyboards/keebio/iris/keymaps/khitsule/keymap.c
+++ b/keyboards/keebio/iris/keymaps/khitsule/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      LALT(KC_F4), KC_F6, KC_F7,  KC_F8,   KC_F9,   KC_F10,                            _______, _______, _______, KC_LPRN, KC_RPRN, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_HOME,  KC_UP,   KC_END, KC_PGUP, _______,                            _______, _______, KC_NLCK, KC_LBRC, KC_RBRC, _______,
+     KC_MUTE, KC_HOME,  KC_UP,   KC_END, KC_PGUP, _______,                            _______, _______, KC_NUM , KC_LBRC, KC_RBRC, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,   _______,                           _______, _______, _______, KC_LCBR, KC_RCBR, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/mojitas/keymap.c b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
index 959abd1a00..1a13a8a208 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
       _______, KC_MEH5, KC_ACL0, KC_ACL1, KC_ACL2, KC_MEH3, _______,         KC_PENT , KC_DOT , KC_P1  , KC_P2  , KC_P3  , KC_P0  , _______,
   //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                     KC_LALT , LOWER, KC_BSPC,                  _______, RAISE, KC_NLCK
+                                     KC_LALT , LOWER, KC_BSPC,                  _______, RAISE, KC_NUM
   //                                `--------+--------+--------'                `--------+--------+--------'
   ),
 
diff --git a/keyboards/keebio/iris/keymaps/vyolle/keymap.c b/keyboards/keebio/iris/keymaps/vyolle/keymap.c
index da9fb70a66..703efe423c 100644
--- a/keyboards/keebio/iris/keymaps/vyolle/keymap.c
+++ b/keyboards/keebio/iris/keymaps/vyolle/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______,  _______,  _______, _______, _______, KC_PAUS,                            _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______,  KC_SLCK,                            _______, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______,  KC_SCRL,                            _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c b/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
index 07cd2cb094..e8ef651188 100644
--- a/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
+++ b/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     TO(0),   KC_1,    KC_2,    KC_SLCK, KC_PAUS, KC_PSCR,                            KC_CALC, KC_ESC,  KC_PMNS, KC_PERC, KC_PSLS, MO(3),
+     TO(0),   KC_1,    KC_2,    KC_SCRL, KC_PAUS, KC_PSCR,                            KC_CALC, KC_ESC,  KC_PMNS, KC_PERC, KC_PSLS, MO(3),
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, KC_NO,   KC_WH_U, KC_MS_U, KC_NO,   KC_NO,                              KC_F2,   KC_7,    KC_8,    KC_9,    KC_PAST, KC_NO,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/kbo5000/keymaps/default/keymap.c b/keyboards/keebio/kbo5000/keymaps/default/keymap.c
index d2881206d6..f72681e19f 100644
--- a/keyboards/keebio/kbo5000/keymaps/default/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ enum encoder_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_F13,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_INS,  KC_PGUP,
     KC_F14,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
     KC_F15,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_HOME, KC_END,
diff --git a/keyboards/keebio/kbo5000/keymaps/iso/keymap.c b/keyboards/keebio/kbo5000/keymaps/iso/keymap.c
index 93c44e69a7..4aaa9ebe52 100644
--- a/keyboards/keebio/kbo5000/keymaps/iso/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/iso/keymap.c
@@ -8,7 +8,7 @@ enum encoder_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_iso(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_F13,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_INS,  KC_PGUP,
     KC_F14,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_PGDN,
     KC_F15,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_HOME, KC_END,
diff --git a/keyboards/keebio/kbo5000/keymaps/via/keymap.c b/keyboards/keebio/kbo5000/keymaps/via/keymap.c
index a7fd62dddb..fe491cfea8 100644
--- a/keyboards/keebio/kbo5000/keymaps/via/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/via/keymap.c
@@ -8,7 +8,7 @@ enum encoder_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_F13,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_INS,  KC_PGUP,
     KC_F14,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
     KC_F15,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_HOME, KC_END,
diff --git a/keyboards/keebio/levinson/keymaps/atreus/keymap.c b/keyboards/keebio/levinson/keymaps/atreus/keymap.c
index fc8d45b21a..9989c9bf25 100644
--- a/keyboards/keebio/levinson/keymaps/atreus/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/atreus/keymap.c
@@ -37,5 +37,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_NO,   KC_NO,   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
 	KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_NO,   KC_NO,   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
 	KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-	KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+	KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
 };
diff --git a/keyboards/keebio/levinson/keymaps/jyh/keymap.c b/keyboards/keebio/levinson/keymaps/jyh/keymap.c
index 452bda619c..15a9b489a2 100644
--- a/keyboards/keebio/levinson/keymaps/jyh/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/jyh/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NUMS] = LAYOUT_ortho_4x12(
         _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,    KC_6   , KC_7   , KC_8   , KC_9   , KC_SLSH, _______,
         _______, KC_CAPS, KC_INS , KC_HOME, KC_PGUP, KC_LPRN,    KC_RPRN, KC_4   , KC_5   , KC_6   , KC_ASTR, _______,
-        _______, KC_NLCK, KC_DEL , KC_END , KC_PGDN, KC_SCLN,    KC_COMM, KC_1   , KC_2   , KC_3   , KC_MINS, _______,
+        _______, KC_NUM , KC_DEL , KC_END , KC_PGDN, KC_SCLN,    KC_COMM, KC_1   , KC_2   , KC_3   , KC_MINS, _______,
         _______, _______, _______, _______, _______, _______,    _______, KC_0   , KC_DOT , KC_EQL , KC_PLUS, _______
         ),
 
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
index b82ad24602..544a9f4f0b 100644
--- a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------'    `-----------------------------------------'
  */
     [_NM] = LAYOUT_ortho_4x12(
-        XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX,    XXXXXXX, KC_7   , KC_8   , KC_9   , KC_0   , TO(_NM),
+        XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX,    XXXXXXX, KC_7   , KC_8   , KC_9   , KC_0   , TO(_NM),
         XXXXXXX, XXXXXXX, KC_INS , KC_HOME, KC_PGUP, XXXXXXX,    XXXXXXX, KC_4   , KC_5   , KC_6   , KC_SLSH, XXXXXXX,
         XXXXXXX, XXXXXXX, KC_DEL , KC_END , KC_PGDN, XXXXXXX,    XXXXXXX, KC_1   , KC_2   , KC_3   , KC_ASTR, KC_EQL ,
         _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,    _______, KC_0   , KC_DOT , KC_PLUS, KC_MINS, _______
diff --git a/keyboards/keebio/levinson/keymaps/steno/keymap.c b/keyboards/keebio/levinson/keymaps/steno/keymap.c
index 0ea24980d7..33b80ca194 100644
--- a/keyboards/keebio/levinson/keymaps/steno/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/steno/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______,  _______,_______, _______, _______, KC_PAUS,                            _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______,  KC_SLCK,                           _______, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______,  KC_SCRL,                           _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼                          ┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴                          ┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
diff --git a/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
index 852b856c6a..c4c09be155 100644
--- a/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK]  = CATMAP( NUMBER_ROW, DVORAK_LAYER  ),
 [_GAME]    = CATMAP( NUMBER_ROW, GAME_LAYER    ),
 [_NUMPAD]  = CATMAP( \
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_PAST, KC_PSLS, KC_BSPC, KC_BSPC, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, KC_PAST, KC_PSLS, KC_BSPC, KC_BSPC, \
   NUMPAD_LAYER \
 ),
 
diff --git a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c b/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
index 221e45a199..8f5b0e3cfe 100644
--- a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */	
 
 	[_LEFTHAND] = LAYOUT(
-		KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_BSLS, 
+		KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_BSLS, 
 		KC_TRNS, KC_TRNS, KC_LBRC, KC_UP, KC_RBRC, KC_TRNS,   KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_RBRC, 
 		KC_LCTL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_ENT, 
 		KC_LSFT, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC,  KC_P1, KC_P2, KC_P3, KC_PEQL, KC_PGUP, KC_HOME, 
diff --git a/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c b/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
index f8b3b5240d..813fde36ce 100644
--- a/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
    ),
 	[2] = LAYOUT_ortho_4x12(
-     KC_CAPS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,KC_F1,KC_F2,KC_F3,KC_F4,KC_DEL,
+     KC_CAPS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,KC_F1,KC_F2,KC_F3,KC_F4,KC_DEL,
      KC_TRNS,KC_TRNS,KC_INS,KC_HOME,KC_PGUP,KC_TRNS,KC_TRNS,KC_F5,KC_F6,KC_F7,KC_F8,KC_TRNS,
      KC_TRNS,KC_TRNS,KC_DEL,KC_END,KC_PGDN,KC_TRNS,KC_TRNS,KC_F9,KC_F10,KC_F11,KC_F12,KC_TRNS,
      KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
index cfa70f4cff..bd2c5e79fd 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
     [LAYER_FUNCTION_1] = LAYOUT_65(
         _______,  KC_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,   RGB_HUI,
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_TOG,            RGB_SAD,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      RGB_VAI,  RGB_HUD,
         _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,            RGB_RMOD, RGB_VAD,  RGB_MOD
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
index 81b8497ca2..32fad3a2cd 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT, LT(_FN1, KC_SPC), KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
     [_FN1] = LAYOUT_65(
       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_F13, KC_CALC, KC_NO,
-      RGB_TOG, RGB_MOD, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL,
+      RGB_TOG, RGB_MOD, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL,
       KC_CAPS, KC_NO, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_HOME,
       KC_TRNS, KC_NO, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_END,
       KC_TRNS, KC_WINLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_APP, RGB_SPD, RGB_RMOD, RGB_SPI),
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS,   KC_PSLS, KC_PEQL, KC_TRNS,
       KC_TAB, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO,   KC_TRNS, KC_TRNS,
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO,   KC_TAB,  KC_P1,   KC_P2,   KC_P3,   KC_NO,   KC_PAST, KC_PENT, KC_HOME,
-      KC_TRNS, KC_NO,   KC_DEL,  KC_INS,  KC_NO,   KC_NO,   KC_NLCK, KC_P0,   KC_00,   KC_PDOT, KC_PSLS, KC_TRNS, RCTL(KC_PGUP), KC_END,
+      KC_TRNS, KC_NO,   KC_DEL,  KC_INS,  KC_NO,   KC_NO,   KC_NUM,  KC_P0,   KC_00,   KC_PDOT, KC_PSLS, KC_TRNS, RCTL(KC_PGUP), KC_END,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_LEFT), RCTL(KC_PGDN), RCTL(KC_RIGHT)),
     [_RAISE] = LAYOUT_65(
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
index 6708d7a0ee..4b11eef55c 100644
--- a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_RALT, KC_HOME, KC_PGDN, KC_PGUP, KC_END
     ),
     [_NUM] = LAYOUT_60_with_macro(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P4,   KC_P5,   KC_P6,   KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c b/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
index 8d61a0fd9a..530ea8527f 100644
--- a/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
+++ b/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_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_SLCK, KC_PAUS, KC_TRNS,
+    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
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
index d8cc5b0989..946c465487 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
@@ -203,9 +203,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                          `---------------'  `---------------'
 */
 [_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,    KC_P8,      KC_P9,     KC_P0,                      KC_NLCK, KC_P7, KC_P8,  KC_P9,   KC_PSLS, _______,
+  _______, 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_NLCK, KC_PDOT,  TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                  _______, KC_P1, KC_P2,  KC_P3,   KC_PMNS, _______,
+  _______, 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, _______
 ),
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
index 9621fb9ba0..7d7a350e64 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
@@ -230,9 +230,9 @@ Numpad layer
                                               `-----------------'  `-----------------'
 */
 [_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                        KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______,
+  _______, 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_NLCK, KC_PDOT, TD_PSPA, TD_PMUN, TD_PPEQ,                      _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______,
+  _______, 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, _______
 ),
diff --git a/keyboards/keebio/tragicforce68/keymaps/default/keymap.c b/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
index 12d738b3ad..cb0adbdc4c 100644
--- a/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       _______,      _______, KC_HOME,
   //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     _______,     _______, KC_UP,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, BL_STEP,    KC_BSLS,    _______, KC_END,
+     _______,     _______, KC_UP,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, BL_STEP,    KC_BSLS,    _______, KC_END,
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
      _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_QUOT,       KC_ENTER,
   //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
index ffde33c851..a34d28ee47 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
@@ -27,7 +27,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NUMLOCK] = LAYOUT_ortho_5x7(
-      KC_NO,   TG_DBLO, TG_GAME, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS,
+      KC_NO,   TG_DBLO, TG_GAME, KC_NUM,  KC_SCRL, KC_COLN, KC_PSLS,
       TT_MDIA, KC_CALC, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PAST,
       KC_HOME, KC_DEL,  KC_PGUP, KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
       KC_END,  KC_UP,   KC_PGDN, KC_P1,   KC_P2,   KC_P3,   KC_PPLS,
diff --git a/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c b/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c
index 32172690e5..0d2677d22b 100644
--- a/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/vosechu/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______   , QK_BOOT, _______ , _______ , _LAYER_ , KC_DEL  , KC_ENT
 ),
 [LFT] = LAYOUT_ortho_half_5x7( // Media
-  _______ , KC_F10  , KC_F11  , KC_F12  , KC_PSCR , KC_SLCK , KC_PAUS ,
+  _______ , KC_F10  , KC_F11  , KC_F12  , KC_PSCR , KC_SCRL , KC_PAUS ,
   _______ , KC_F7   , KC_F8   , KC_F9   , KC_INS  , KC_HOME , KC_PGUP ,
   RGB_TOG , KC_F4   , KC_F5   , KC_F6   , KC_DEL  , KC_END  , KC_PGDN ,
   _______ , KC_F1   , KC_F2   , KC_F3   , KC_VOLU , KC_VOLD , KC_MUTE ,
diff --git a/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
index 712b01dcfa..4f10939dc9 100644
--- a/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
+++ b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_5x4( /* Base */
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
index e08edb6182..ea751898f2 100644
--- a/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
+++ b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_6x4( /* Base */
     KC_F1,   KC_F2,   KC_F3,   KC_MUTE,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
index 16c3b4cdc9..9ab0bcfc41 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_f13_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
index e96540e3ef..29c47ece51 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
index 90f343f8d7..1605851bd3 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/keybage/radpad/keymaps/default/keymap.c b/keyboards/keybage/radpad/keymaps/default/keymap.c
index 1d1e15e798..24fab56076 100644
--- a/keyboards/keybage/radpad/keymaps/default/keymap.c
+++ b/keyboards/keybage/radpad/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,                   _______,
         KC_PSLS, KC_F21,  KC_F22,  KC_F23,
         KC_PAST, KC_F18,  KC_F19,  KC_F20,
-        KC_NLCK, KC_F15,  KC_F16,  KC_F17,
+        KC_NUM,  KC_F15,  KC_F16,  KC_F17,
         QK_BOOT,   _______, KC_F13,  KC_F14
     )
 };
diff --git a/keyboards/keybee/keybee65/keymaps/default/keymap.c b/keyboards/keybee/keybee65/keymaps/default/keymap.c
index 030b38884c..9ecb16c4ea 100644
--- a/keyboards/keybee/keybee65/keymaps/default/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/keybee/keybee65/keymaps/via/keymap.c b/keyboards/keybee/keybee65/keymaps/via/keymap.c
index 3ffeaf28ba..961c46c3c3 100644
--- a/keyboards/keybee/keybee65/keymaps/via/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/keyboardio/atreus/keymaps/default/keymap.c b/keyboards/keyboardio/atreus/keymaps/default/keymap.c
index 6971edc332..f24cc7595d 100644
--- a/keyboards/keyboardio/atreus/keymaps/default/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/default/keymap.c
@@ -39,5 +39,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,   _______, _______, KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
 };
diff --git a/keyboards/keyboardio/atreus/keymaps/via/keymap.c b/keyboards/keyboardio/atreus/keymaps/via/keymap.c
index dee94fc57e..87d6102bc3 100644
--- a/keyboards/keyboardio/atreus/keymaps/via/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,   KC_TRNS, KC_TRNS, KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    TO(0),   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(0),   KC_PSCR, KC_SLCK, KC_PAUS ),
+    TO(0),   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(0),   KC_PSCR, KC_SCRL, KC_PAUS ),
 
   [3] = LAYOUT( /* blank */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
index 9d7dc826fb..3a3fbd6d71 100644
--- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	`-----------------------------------------'`-----------------------------------------'*/
   [_ADJUST] = LAYOUT(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
-    KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
+    KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 ,
     _______, QWERTY,  COLEMAK, DVORAK,  DVORMAC, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
   ),
diff --git a/keyboards/keygem/kg60ansi/keymaps/default/keymap.c b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
index 86c7512943..b0ad2a1acd 100644
--- a/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
+++ b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/keygem/kg60ansi/keymaps/via/keymap.c b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
index cc1cac96e9..7a16465bbb 100644
--- a/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
+++ b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_60_ansi(
         KC_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c b/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
index 9d7c31fea2..8f77c2df68 100644
--- a/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
+++ b/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c b/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
index 21824528c1..0617657778 100644
--- a/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
+++ b/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
index a0a73eb783..02d1fcaf27 100644
--- a/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
@@ -24,7 +24,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_ansi(
-      KC_TRNS, KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_TRNS,       KC_PSCR,  KC_SLCK, KC_PAUS,
+      KC_TRNS, KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_TRNS,       KC_PSCR,  KC_SCRL, KC_PAUS,
       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, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD,RGB_HUI,RGB_SAD,RGB_SAI,RGB_VAD,RGB_VAI, KC_TRNS, KC_TRNS,  KC_TRNS,
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_VOLU,
diff --git a/keyboards/keyhive/absinthe/keymaps/default/keymap.c b/keyboards/keyhive/absinthe/keymaps/default/keymap.c
index 7f74137037..51ab1ceeb7 100644
--- a/keyboards/keyhive/absinthe/keymaps/default/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                           KC_RALT, KC_RGUI,  KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RIGHT),
 
   [1] = LAYOUT_default(
-      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_PSCR,  KC_SLCK, KC_PAUS,
+      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_PSCR,  KC_SCRL, KC_PAUS,
       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, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD,RGB_HUI,RGB_SAD,RGB_SAI,RGB_VAD,RGB_VAI, KC_TRNS, KC_TRNS,  KC_TRNS,
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                    KC_VOLU,
diff --git a/keyboards/keyhive/absinthe/keymaps/via/keymap.c b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
index 797d14226d..27b474d8ab 100644
--- a/keyboards/keyhive/absinthe/keymaps/via/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT,                             KC_SPC,                                     KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT),
 
   [1] = LAYOUT_default(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+      _______, KC_F1,   KC_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,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
diff --git a/keyboards/keyhive/lattice60/keymaps/default/keymap.c b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
index a5102070ea..54b809e984 100644
--- a/keyboards/keyhive/lattice60/keymaps/default/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_all(
         KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS,  KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,    KC_PENT,
         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
                 KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS
diff --git a/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
index ccdc10ab32..ff3656666b 100644
--- a/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_60_hhkb(
         KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS,  KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,    KC_PENT,
         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
                 KC_TRNS, KC_TRNS,           KC_TRNS,                    KC_TRNS, KC_TRNS
diff --git a/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
index 099e8e9203..82712bd816 100644
--- a/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
@@ -33,14 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN0] = LAYOUT_60_hhkb(
         KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
         KC_TRNS,  KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,    KC_PENT,
         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLD, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
                 KC_TRNS, KC_TRNS,           KC_TRNS,                    KC_TRNS, KC_TRNS
     ),
     [_FN1] = LAYOUT_60_hhkb(
         KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_BSPC,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSPC,
         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD,    KC_TRNS,
         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,
                 KC_TRNS, KC_TRNS,           KC_TRNS,                    KC_TRNS, KC_TRNS
diff --git a/keyboards/keyhive/maypad/keymaps/default/keymap.c b/keyboards/keyhive/maypad/keymaps/default/keymap.c
index f4689c0127..55252efa13 100644
--- a/keyboards/keyhive/maypad/keymaps/default/keymap.c
+++ b/keyboards/keyhive/maypad/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_numpad_5x4(
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+		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,            
diff --git a/keyboards/keyhive/maypad/keymaps/via/keymap.c b/keyboards/keyhive/maypad/keymaps/via/keymap.c
index 04ad4501b2..899d9129b4 100644
--- a/keyboards/keyhive/maypad/keymaps/via/keymap.c
+++ b/keyboards/keyhive/maypad/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_ortho_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/keyhive/navi10/keymaps/default/keymap.c b/keyboards/keyhive/navi10/keymaps/default/keymap.c
index c4295b1553..248e4d50ce 100644
--- a/keyboards/keyhive/navi10/keymaps/default/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/default/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LEFT,   KC_DOWN,    KC_RIGHT),
     [_FN0] = LAYOUT(/* function layer */
                  KC_TRNS,   KC_PAUS,    KC_VOLU,
-                 KC_ENTER,  KC_SLCK,    KC_VOLD,
+                 KC_ENTER,  KC_SCRL,    KC_VOLD,
                  
                             KC_TRNS,
                  KC_TRNS,   KC_TRNS,    KC_TRNS),
diff --git a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
index 37850e28f3..11ac082392 100644
--- a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LEFT,   KC_DOWN,    KC_RIGHT),
     [_FN0] = LAYOUT(/* function layer */
                  KC_TRNS,   KC_PAUS,    KC_VOLU,
-                 KC_ENTER,  KC_SLCK,    KC_VOLD,
+                 KC_ENTER,  KC_SCRL,    KC_VOLD,
                  
                             KC_TRNS,
                  KC_TRNS,   KC_TRNS,    KC_TRNS),
diff --git a/keyboards/keyhive/southpole/keymaps/default/keymap.c b/keyboards/keyhive/southpole/keymaps/default/keymap.c
index c8782b9699..451b44ecbb 100644
--- a/keyboards/keyhive/southpole/keymaps/default/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT( 
-		KC_NLCK, KC_SLSH, KC_ASTR, KC_MINS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_HOME,
+		KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_HOME,
 		KC_7, KC_8, KC_9, KC_PLUS, KC_TAB, KC_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_4, KC_5, KC_6, 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_ENT, KC_PGDN,
 		KC_1, KC_2, KC_3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END,
diff --git a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
index 76ff1f5637..356938cac6 100644
--- a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*  `------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------'
 	*/
     [_QWERTY] = LAYOUT( 
-		KC_NLCK, 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_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, \
diff --git a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c b/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
index d72d4aa364..60a2f99bc7 100644
--- a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
@@ -108,7 +108,7 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS     , KC_TRNS, KC_MS_L,
    */
 
 LAYOUT( /* 3 */
-KC_ESC , RGB_TOG, RGB_MOD, KC_NO  , KC_NO  , KC_NO  , KC_NLCK, KC_P7  , KC_P8  , KC_P9  , KC_NO  , KC_BSPC,
+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/hvp/keymap.c b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
index e39bb46b8d..d890f33266 100644
--- a/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
@@ -62,6 +62,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  G(S(KC_1)), G(S(KC_2)), G(S(KC_3)), G(S(KC_4)), G(S(KC_5)), G(S(KC_6)), G(S(KC_7)), G(S(KC_8)), G(S(KC_9)), G(S(KC_0)), _______,
   RGB_TOG, RGB_MOD, RGB_M_P, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
   KC_PSCR, _______, RGB_RMOD, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, KC_CAPS,
-  QK_BOOT, _______, RGB_VAD, RGB_VAI, _______,     _______,      _______, _______, _______, _______, KC_NLCK
+  QK_BOOT, _______, RGB_VAD, RGB_VAI, _______,     _______,      _______, _______, _______, _______, KC_NUM
 ),
 };
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
index 25bb8cd984..fbaf592d22 100644
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_SLCK,  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_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/tucznak/keymap.c b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
index 44ef2ee2ef..0b7fe1edc8 100644
--- a/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LEFT] = LAYOUT(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
-        _______, KC_CAPS, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, KC_PGUP, KC_DEL,
+        _______, KC_CAPS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, KC_PGUP, KC_DEL,
         _______, _______, _______, _______, _______,     _______,      _______, KC_APP,  KC_HOME, KC_PGDN, KC_END
     ),
 
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NUM] = LAYOUT(
         _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PSLS, _______,
-        _______, KC_NLCK, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PAST, _______,
+        _______, KC_NUM,  _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PAST, _______,
         _______, _______, _______, _______, _______,     _______,      KC_KP_0, KC_DOT,  KC_PPLS, KC_PMNS, _______
     ),
 	
diff --git a/keyboards/kin80/keymaps/andrew/keymap.c b/keyboards/kin80/keymaps/andrew/keymap.c
index 8c63a6edc6..c0d88579da 100644
--- a/keyboards/kin80/keymaps/andrew/keymap.c
+++ b/keyboards/kin80/keymaps/andrew/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'         `--------------------'
 */
 [_L2] = LAYOUT(
-    KC_F1,   _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+    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, _______,   _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kin80/keymaps/default/keymap.c b/keyboards/kin80/keymaps/default/keymap.c
index 769dc65e08..a167f1ca00 100644
--- a/keyboards/kin80/keymaps/default/keymap.c
+++ b/keyboards/kin80/keymaps/default/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_NM] = LAYOUT(
     KC_F1,   _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______,  KC_F12,
-    _______, _______, _______, _______, _______, _______,   KC_SLCK, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
+    _______, _______, _______, _______, _______, _______,   KC_SCRL, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, _______,
     _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______,   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, _______,
diff --git a/keyboards/kin80/keymaps/maxim/keymap.c b/keyboards/kin80/keymaps/maxim/keymap.c
index 090a3bb6b6..cbb5bef4f4 100644
--- a/keyboards/kin80/keymaps/maxim/keymap.c
+++ b/keyboards/kin80/keymaps/maxim/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_NM] = LAYOUT(
     KC_F1,   _______, _______,  _______, _______, _______,  _______, _______, _______, _______,  KC_F11,  KC_F12,
-    _______, _______, _______, _______, _______, _______,   KC_SLCK, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
+    _______, _______, _______, _______, _______, _______,   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, _______,
diff --git a/keyboards/kin80/keymaps/quartz64/keymap.c b/keyboards/kin80/keymaps/quartz64/keymap.c
index 3bb2cdb4b8..dca26a6924 100644
--- a/keyboards/kin80/keymaps/quartz64/keymap.c
+++ b/keyboards/kin80/keymaps/quartz64/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_NM] = LAYOUT_all(
     KC_F1,   AU_ON,   AU_OFF,  _______, _______, _______,   CK_TOGG, CK_UP,   CK_DOWN, CK_RST,  KC_F11,  KC_F12,
-    _______, _______, _______, _______, _______, _______,   KC_SLCK, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
+    _______, _______, _______, _______, _______, _______,   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, _______,
diff --git a/keyboards/kin80/keymaps/roman/keymap.c b/keyboards/kin80/keymaps/roman/keymap.c
index 9242a2ef9e..65cf63b42e 100644
--- a/keyboards/kin80/keymaps/roman/keymap.c
+++ b/keyboards/kin80/keymaps/roman/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'         `--------------------'
 */
 [_L2] = LAYOUT(
-    KC_F1,   _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+    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, _______,   _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c
index 9c2f3bcc6b..e0f114902c 100644
--- a/keyboards/kinesis/keymaps/default/keymap.c
+++ b/keyboards/kinesis/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			   KC_LCTL,KC_LALT,
                                     KC_HOME,
                            KC_BSPC,KC_DEL ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_NO, QK_BOOT,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,KC_PAUS, KC_NO, QK_BOOT,
 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
 	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,
 	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c
index 913f5dbf84..c790e08945 100644
--- a/keyboards/kinesis/keymaps/default_pretty/keymap.c
+++ b/keyboards/kinesis/keymaps/default_pretty/keymap.c
@@ -32,7 +32,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [QWERTY] = LAYOUT_pretty(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,         KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_NO,    QK_BOOT,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,         KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_NO,    QK_BOOT,
     KC_EQL,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                                                                      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                                                                      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                                                                      KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index 79257e9961..9ebb088cf7 100644
--- a/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      KC_HOME,
                    KC_BSPC, KC_DEL,  KC_END,
         // right hand
-        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, QK_BOOT,
+        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
         KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH,
         KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS,
diff --git a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
index 4343b5fe52..b6a4fa2d10 100644
--- a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      KC_HOME,
                    KC_BSPC, KC_DEL,  KC_END,
         // right hand
-        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NLCK, KC_PWR,
+        KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NUM, KC_PWR,
         KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH,
         KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS,
diff --git a/keyboards/kinesis/keymaps/farmergreg/keymap.c b/keyboards/kinesis/keymaps/farmergreg/keymap.c
index 1b6442cac5..393b7c074b 100644
--- a/keyboards/kinesis/keymaps/farmergreg/keymap.c
+++ b/keyboards/kinesis/keymaps/farmergreg/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[_LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
 				KC_HOME,
 			KC_BSPC,KC_DEL ,KC_END,
 
-	KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, TG(_KEYPAD), MO(_PROGM),	// I would prefer OSL(_PROGM) but MO emulates what Kinesis does in their firmware.
+	KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,KC_PAUS, TG(_KEYPAD), MO(_PROGM),	// I would prefer OSL(_PROGM) but MO emulates what Kinesis does in their firmware.
 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
 	KC_J   ,KC_L   ,KC_U   ,KC_Y   ,KC_SCLN,KC_BSLS,
 	KC_H   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
index dd02def8c2..5be1b60654 100644
--- a/keyboards/kinesis/keymaps/heatxsink/keymap.c
+++ b/keyboards/kinesis/keymaps/heatxsink/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_HOME,
         KC_BSPC,KC_DEL ,KC_END ,
         // RHAND
-        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KEYPAD ,QK_BOOT,
+        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KEYPAD ,QK_BOOT,
         KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
         _______,_______,_______,_______,_______,KC_BSLS,
         _______,_______,_______,_______,_______,KC_QUOT,
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         // RHAND
         _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,KC_NLCK,KC_PEQL,KC_PSLS,KC_PAST,_______,
+        _______,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,_______,
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 7d39da8397..9bf94d6869 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  `-----------------------'                   `-----------------------'
 */
 [_COLEMAK] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  `-----------------------'                   `-----------------------'
 */
 [_QWERTY] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -268,7 +268,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_NUMPAD] = LAYOUT_pretty(
   _______, _______, _______, _______,    _______,   _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NLCK, _______, _______,    _______,   _______,                                                         KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_NUM,  _______, _______,    _______,   _______,                                                         KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   _______, KC_P6,   KC_P7,   KC_P8,      KC_P9,     KC_P0,                                                           _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
   _______, KC_P1,   KC_P2,   KC_P3,      KC_P4,     KC_P5,                                                           _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
   _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                                                       _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
@@ -303,7 +303,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  `-----------------------'                   `-----------------------'
 */
 [_COLEMAKGM] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
@@ -339,7 +339,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  `-----------------------'                   `-----------------------'
 */
 [_QWERTYGM] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/jwon/keymap.c b/keyboards/kinesis/keymaps/jwon/keymap.c
index fa75f95865..fe335e68ac 100644
--- a/keyboards/kinesis/keymaps/jwon/keymap.c
+++ b/keyboards/kinesis/keymaps/jwon/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_SPC,  MACCOPY,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, QWERTY,  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, QWERTY,  QK_BOOT,
            KC_EQL,  KC_RPRN, KC_RCBR, KC_RBRC, KC_ASTR, KC_EXLM,
            KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSLS,
            KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
            // Right Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
+           _______, 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, _______,
diff --git a/keyboards/kinesis/keymaps/peott-fr/keymap.c b/keyboards/kinesis/keymaps/peott-fr/keymap.c
index c56d3426f1..b0ba1b55ea 100644
--- a/keyboards/kinesis/keymaps/peott-fr/keymap.c
+++ b/keyboards/kinesis/keymaps/peott-fr/keymap.c
@@ -21,8 +21,8 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
+	[0] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
 	[1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
+	[3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c
index 9518c017bc..7757846390 100644
--- a/keyboards/kinesis/keymaps/stapelberg/keymap.c
+++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			   KC_LCTL,KC_LALT,
                                     KC_LGUI,
                            KC_BSPC,KC_ESC ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, MO(1), QK_BOOT,
+    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,KC_PAUS, MO(1), QK_BOOT,
 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
 	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,
 	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
index 89a39c08b4..e8946ad325 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
@@ -120,7 +120,7 @@ Colemak
 	                                          `--------------------------'                 `--------------------------'
 */
 [_COLEMAK] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
@@ -157,7 +157,7 @@ QWERTY
 	                                          `--------------------------'                 `--------------------------'
 */
 [_QWERTY] = LAYOUT_pretty(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST,
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -292,7 +292,7 @@ Numpad layer
 */
 [_NUMPAD] = LAYOUT_pretty(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NLCK, _______, _______, _______, _______,                                                       KC_TAB,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_NUM,  _______, _______, _______, _______,                                                       KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
   _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                                                         _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
   _______, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,                                                         _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
   _______, _______, KC_PDOT, TD_PSPA, TD_MNUN, TD_PPEQ,                                                       _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
index bfa8027352..0a812aef35 100644
--- a/keyboards/kinesis/keymaps/tw1t611/keymap.c
+++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    KC_RCTL,KC_LALT,
                    KC_HOME,
                    KC_SPC ,KC_LSFT,KC_BSPC ,
-           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_NO ,QK_BOOT,
+           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KC_NO ,QK_BOOT,
            KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,DE_SS  ,
            KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,DE_ADIA,
            KC_H   ,KC_J   ,KC_K   ,KC_L   ,DE_SLSH,DE_ODIA,
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index 286d7ca7a7..5e4f7c1e88 100644
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  GUI_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
            KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
            KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS ,
            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
+           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
            KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
            KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
@@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
            // Right Hand
            _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
+           _______, 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, _______,
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
index 9e51cb274f..3685e0fe57 100644
--- a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
+++ b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
@@ -200,7 +200,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_BSPC, KC_DEL,  KC_END,
 
            // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD),  MO(_PROGRAM),
+           KC_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,
@@ -305,7 +305,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
            // Right Hand
            _______,    _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-           _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,  _______,
+           _______, 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,  _______,
diff --git a/keyboards/kineticlabs/emu/hotswap/keymaps/default/keymap.c b/keyboards/kineticlabs/emu/hotswap/keymaps/default/keymap.c
index 01a14010e6..682b2f3e1f 100644
--- a/keyboards/kineticlabs/emu/hotswap/keymaps/default/keymap.c
+++ b/keyboards/kineticlabs/emu/hotswap/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/kineticlabs/emu/hotswap/keymaps/via/keymap.c b/keyboards/kineticlabs/emu/hotswap/keymaps/via/keymap.c
index f5702905ca..b8ca0aa771 100644
--- a/keyboards/kineticlabs/emu/hotswap/keymaps/via/keymap.c
+++ b/keyboards/kineticlabs/emu/hotswap/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/kineticlabs/emu/soldered/keymaps/default/keymap.c b/keyboards/kineticlabs/emu/soldered/keymaps/default/keymap.c
index 01a14010e6..682b2f3e1f 100644
--- a/keyboards/kineticlabs/emu/soldered/keymaps/default/keymap.c
+++ b/keyboards/kineticlabs/emu/soldered/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/kineticlabs/emu/soldered/keymaps/via/keymap.c b/keyboards/kineticlabs/emu/soldered/keymaps/via/keymap.c
index 874779d115..1aa960c11b 100644
--- a/keyboards/kineticlabs/emu/soldered/keymaps/via/keymap.c
+++ b/keyboards/kineticlabs/emu/soldered/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/kineticlabs/emu/soldered/keymaps/wkl/keymap.c b/keyboards/kineticlabs/emu/soldered/keymaps/wkl/keymap.c
index 1d6e49b3cd..a77dd23d60 100644
--- a/keyboards/kineticlabs/emu/soldered/keymaps/wkl/keymap.c
+++ b/keyboards/kineticlabs/emu/soldered/keymaps/wkl/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
index 91ecbb421e..7ab31d9622 100644
--- a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_NLCK,  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LBRC,  KC_RBRC,  KC_BSLS,
+    KC_NUM,   KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LBRC,  KC_RBRC,  KC_BSLS,
     KC_HOME,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
     KC_END,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
index 51403378d1..7b13bb3c41 100644
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_NLCK,  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_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
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_NLCK,  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
+    KC_NUM,   KC_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
diff --git a/keyboards/kira75/keymaps/default/keymap.c b/keyboards/kira75/keymaps/default/keymap.c
index b8458ab463..e0f5cbe0b7 100644
--- a/keyboards/kira75/keymaps/default/keymap.c
+++ b/keyboards/kira75/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT( /* Base */
-  KC_ESC,  KC_F1,  KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_INS,
+  KC_ESC,  KC_F1,  KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_INS,
   KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
   KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
   KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
diff --git a/keyboards/kira80/keymaps/ansi/keymap.c b/keyboards/kira80/keymaps/ansi/keymap.c
index 29d8d5d7f2..3cad1b277e 100644
--- a/keyboards/kira80/keymaps/ansi/keymap.c
+++ b/keyboards/kira80/keymaps/ansi/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_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,  
diff --git a/keyboards/kira80/keymaps/ansi_wkl/keymap.c b/keyboards/kira80/keymaps/ansi_wkl/keymap.c
index b2c2d96557..69df61eeb5 100644
--- a/keyboards/kira80/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/kira80/keymaps/ansi_wkl/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_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,  
diff --git a/keyboards/kira80/keymaps/default/keymap.c b/keyboards/kira80/keymaps/default/keymap.c
index 8b1a75cb84..187c723372 100644
--- a/keyboards/kira80/keymaps/default/keymap.c
+++ b/keyboards/kira80/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  
diff --git a/keyboards/kira80/keymaps/iso/keymap.c b/keyboards/kira80/keymaps/iso/keymap.c
index c617dc4334..2f49971d69 100644
--- a/keyboards/kira80/keymaps/iso/keymap.c
+++ b/keyboards/kira80/keymaps/iso/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,               KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                        KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  
diff --git a/keyboards/kira80/keymaps/via/keymap.c b/keyboards/kira80/keymaps/via/keymap.c
index 78353c9d60..f74b6cf83c 100644
--- a/keyboards/kira80/keymaps/via/keymap.c
+++ b/keyboards/kira80/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  
diff --git a/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c
index c9d1dd3052..52bd642794 100644
--- a/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c
+++ b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_all(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,          KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,          KC_DEL,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
diff --git a/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c
index 267904a42e..fded769584 100644
--- a/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c
+++ b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_L1] = LAYOUT_all(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,          KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,          KC_DEL,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
diff --git a/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c
index a1cc957f0c..f7003c796f 100644
--- a/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c
+++ b/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,          KC_F12,   KC_PSCR, KC_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,
diff --git a/keyboards/kkatano/wallaby/keymaps/default/keymap.c b/keyboards/kkatano/wallaby/keymaps/default/keymap.c
index be9457589b..b9177f3e97 100644
--- a/keyboards/kkatano/wallaby/keymaps/default/keymap.c
+++ b/keyboards/kkatano/wallaby/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/kkatano/yurei/keymaps/default/keymap.c b/keyboards/kkatano/yurei/keymaps/default/keymap.c
index 45f955fb0f..03d9b254f9 100644
--- a/keyboards/kkatano/yurei/keymaps/default/keymap.c
+++ b/keyboards/kkatano/yurei/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_SLCK, KC_PAUS,
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,      KC_PSCR, KC_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,
diff --git a/keyboards/kmac/keymaps/default/keymap.c b/keyboards/kmac/keymaps/default/keymap.c
index 70f3a5a368..f3e4385052 100644
--- a/keyboards/kmac/keymaps/default/keymap.c
+++ b/keyboards/kmac/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ enum custom_keycodes {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QW] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_BRK,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_BRK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c b/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
index 70f3a5a368..f3e4385052 100644
--- a/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
+++ b/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
@@ -38,7 +38,7 @@ enum custom_keycodes {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QW] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_BRK,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_BRK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
index 316fc7c0fd..8c018383b1 100644
--- a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
+++ b/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
@@ -38,7 +38,7 @@ enum custom_keycodes {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QW] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_BRK,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_BRK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kmac/keymaps/via/keymap.c b/keyboards/kmac/keymaps/via/keymap.c
index ebae4a7eca..507840e462 100644
--- a/keyboards/kmac/keymaps/via/keymap.c
+++ b/keyboards/kmac/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 // clang-format off
 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_SLCK, KC_BRK,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_BRK,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kmac_pad/keymaps/default/keymap.c b/keyboards/kmac_pad/keymaps/default/keymap.c
index b9b9f823fb..e6afa53346 100644
--- a/keyboards/kmac_pad/keymaps/default/keymap.c
+++ b/keyboards/kmac_pad/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ enum kmac_pad_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT( /* Base */
                                TG(1),
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/knobgoblin/keymaps/moults31/keymap.c b/keyboards/knobgoblin/keymaps/moults31/keymap.c
index 775f9d1b5d..af3ffea8b6 100644
--- a/keyboards/knobgoblin/keymaps/moults31/keymap.c
+++ b/keyboards/knobgoblin/keymaps/moults31/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_ortho(
-                  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+                  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
                   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
                   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
          KC_MPLY, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/kopibeng/mnk88/keymaps/default/keymap.c b/keyboards/kopibeng/mnk88/keymaps/default/keymap.c
index 6dce963838..7973f1de79 100644
--- a/keyboards/kopibeng/mnk88/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/mnk88/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Default layer
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kopibeng/mnk88/keymaps/via/keymap.c b/keyboards/kopibeng/mnk88/keymaps/via/keymap.c
index 6dce963838..7973f1de79 100644
--- a/keyboards/kopibeng/mnk88/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/mnk88/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Default layer
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/kopibeng/xt8x/keymaps/default/keymap.c b/keyboards/kopibeng/xt8x/keymaps/default/keymap.c
index 52cd88d9cd..b3f3f1b8d0 100644
--- a/keyboards/kopibeng/xt8x/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/xt8x/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SLCK, KC_PAUS,
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,         
diff --git a/keyboards/kopibeng/xt8x/keymaps/via/keymap.c b/keyboards/kopibeng/xt8x/keymaps/via/keymap.c
index 52cd88d9cd..b3f3f1b8d0 100644
--- a/keyboards/kopibeng/xt8x/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/xt8x/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SLCK, KC_PAUS,
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,          KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,         
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
index 2ec9a5f9b3..e4802241fb 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_planck_mit(
-    KC_ASTR, KC_P7,   KC_P8,   KC_P9,   KC_NLCK, KC_NO, KC_NO, KC_NO,  KC_NO, KC_NO,     KC_NO,     KC_BSPC,
+    KC_ASTR, 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_NO, KC_NO,     KC_LCTL,   KC_ENT,
     KC_TRNS, KC_COMM, KC_PPLS, KC_PDOT, KC_0,       KC_SPC,    LEAGUE, PUBG,  OVERWATCH, STARCRAFT, TETRIS
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
index 71cd9f074e..b911176274 100755
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[FUN] = LAYOUT_planck_mit(
 		KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    QK_BOOT,
-		KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SLCK,   KC_NO,    KC_NO,    KC_NO,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
+		KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SCRL,   KC_NO,    KC_NO,    KC_NO,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
 		KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_PAUS,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_ALGR,  KC_NO,
 		KC_NO,   KC_NO,   KC_APP,  KC_SPC,  KC_TAB,         KC_NO,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
 	)
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
index 0140fbe82f..413f12621b 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
@@ -211,7 +211,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [FUNL] = LAYOUT_planck_mit(
     KC_LALT,              KC_F12,            KC_F7,             KC_F8,              KC_F9,            KC_PSCR,           KC_F15,            KC_NO,             KC_NO,             KC_NO,             KC_RST,            KC_LALT,
-    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SLCK,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
+    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SCRL,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
     KC_LCTL,              KC_F10,            KC_F1,             KC_F2,              KC_F3,            KC_PAUS,           KC_F13,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LCTL,
     KC_NO,                KC_NO,             KC_TAB,            KC_APP,             KC_SPC,                    KC_UNDS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
   ),
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
index 01490bd2dc..2cdf244cdc 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/keymap.c
@@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [FUNL] = LAYOUT_planck_mit(
     KC_LALT,              KC_F12,            KC_F7,             KC_F8,              KC_F9,            KC_PSCR,           KC_F15,            KC_NO,             KC_NO,             KC_NO,             KC_RST,            KC_LALT,
-    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SLCK,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
+    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SCRL,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
     KC_LCTL,              KC_F10,            KC_F1,             KC_F2,              KC_F3,            KC_PAUS,           KC_F13,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LCTL,
     KC_NO,                KC_NO,             KC_TAB,            KC_APP,             KC_SPC,                    KC_UNDS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
   ),
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
index 1f2dc0e141..065f65c78a 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/keymap.c
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [FUNL] = LAYOUT_planck_mit(
     KC_LALT,              KC_F12,            KC_F7,             KC_F8,              KC_F9,            KC_PSCR,           KC_F15,            KC_NO,             KC_NO,             KC_NO,             KC_RST,            KC_LALT,
-    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SLCK,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
+    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SCRL,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
     KC_LCTL,              KC_F10,            KC_F1,             KC_F2,              KC_F3,            KC_PAUS,           KC_F13,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LCTL,
     KC_NO,                KC_NO,             KC_TAB,            KC_APP,             KC_SPC,                    KC_UNDS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
   ),
diff --git a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
index 7c7324f555..483d444377 100644
--- a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 12+11+11+9
     KC_LSFT, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_PGUP, KC_SLSH,
     KC_LCTL, LT(2,KC_APP), KC_LALT, KC_SPC, MT(MOD_RSFT,KC_SPC), LT(2,KC_INS), KC_HOME, KC_PGDN, KC_END ),
   [2] = LAYOUT(
-    DF(0), KC_PSCR, KC_SLCK, KC_PAUS, KC_PSLS, KC_PAST, KC_7, KC_8, KC_9, KC_PMNS, KC_PEQL, KC_BSPC,
+    DF(0), KC_PSCR, KC_SCRL, KC_PAUS, KC_PSLS, KC_PAST, KC_7, KC_8, KC_9, KC_PMNS, KC_PEQL, KC_BSPC,
     KC_CAPS, KC_MPLY, KC_STOP, KC_MPRV, KC_MNXT, XXXXXXX, KC_4, KC_5, KC_6, KC_PPLS, KC_PENT,
     DF(2), KC_MUTE, KC_VOLD, KC_VOLU, KC_COMM, KC_1, KC_2, KC_3, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2,
     DF(3), XXXXXXX, XXXXXXX, KC_SPC, KC_0, KC_DOT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT ),
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
index 9979b7baa3..fa58841cc6 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_fn] = LAYOUT_60_ansi(
         KC_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_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, 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,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
index 557be513ad..585f2e25b7 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef DYNAMIC_MACRO_ENABLE
   /* 3: Dynamic macro, NUMPAD and settings */
   [_LVL3_] = LAYOUT_65_iso_blocker(
-      _______, DM_PLY1, DM_PLY2, _______, _______,  _______, _______, _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,    _______,
+      _______, 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, _______,    _______,
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #else
   /* 3: NUMPAD and settings */
   [_LVL3_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,    _______,
+      _______, _______, _______, _______, _______,  _______, _______, _______, _______, 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, _______,    _______,
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
index 5563816ff3..baa41693d6 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
   [_BLUE_] = LAYOUT_65_iso_blocker(
-      _______, DM_PLY1, DM_PLY2, _______, _______, _______, _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______,
+      _______, 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, _______, _______,
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
index e84b2b5d53..69b3540a3a 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
index 38024a0911..70c8a5f3af 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
index 40354e785b..f97d6838a1 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c
index 11cf4e1137..96850f6995 100644
--- a/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,        
diff --git a/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c
index 11cf4e1137..96850f6995 100644
--- a/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c
@@ -5,7 +5,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,        
diff --git a/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c
index 5e6f21f0d4..d4f4151c4c 100644
--- a/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c b/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c
index 5e6f21f0d4..d4f4151c4c 100644
--- a/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c
@@ -5,7 +5,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
index 9ec3d9968a..084ae6e11f 100644
--- a/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
@@ -19,8 +19,8 @@
 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_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_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_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,              KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                  KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_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,
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
index 5d9de5173c..f5705ac6ad 100644
--- a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
@@ -19,7 +19,7 @@ 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_NLCK,  KC_HOME,  KC_END,  KC_PGUP,
+	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_NUM,   KC_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,
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
index 41bd790804..4036bfbe43 100644
--- a/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
@@ -19,8 +19,8 @@
 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_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_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_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,              KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                  KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,            KC_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,
diff --git a/keyboards/kprepublic/cospad/keymaps/default/keymap.c b/keyboards/kprepublic/cospad/keymaps/default/keymap.c
index c9d323480b..4f8c8b2bbc 100644
--- a/keyboards/kprepublic/cospad/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BL] = LAYOUT_numpad_6x4(
         KC_ESC,  KC_TAB,  MO(_FL), KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c b/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
index d780a583e1..83402d71e7 100644
--- a/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/split_plus_and_zero/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BL] = LAYOUT_numpad_6x4_split_plus_zero(
         KC_ESC,  KC_TAB,  MO(_FL), KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_TILD,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c b/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
index cd64e0c9ec..1c1893a7fd 100644
--- a/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/split_zero/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BL] = LAYOUT_numpad_6x4_split_zero(
         KC_ESC,  KC_TAB,  MO(_FL), KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/kprepublic/cospad/keymaps/via/keymap.c b/keyboards/kprepublic/cospad/keymaps/via/keymap.c
index f436f85a2f..2c9008c575 100644
--- a/keyboards/kprepublic/cospad/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_numpad_6x4(
         KC_ESC,  KC_TAB,  MO(1),   KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c b/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
index 4a7b39d26d..eeef5393ab 100644
--- a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, KC_NLCK, KC_7, KC_8,      KC_9,    KC_KP_SLASH,    _______        ,
+    _______, _______, _______, _______, _______, _______, KC_NUM,  KC_7, KC_8,      KC_9,    KC_KP_SLASH,    _______        ,
     _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5,      KC_6,    KC_KP_ASTERISK, _______        ,
     _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2,      KC_3,    KC_KP_PLUS,     KC_KP_MINUS    ,
     _______, _______, _______, _______, _______, _______, _______, KC_0, KC_KP_DOT, KC_COMM, _______,        _______
diff --git a/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c b/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
index e6eef65d50..d291e47072 100644
--- a/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
@@ -194,13 +194,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '-----------------------------------------------------------------------------------------------------------'
  */
  [nal] = LAYOUT_ortho_4x12( \
-   KC_ESC,  _C_LEFT, KC_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, KC_PSCR, KC_SLCK, KC_PAUS, DF(dv), \
+   KC_ESC,  _C_LEFT, KC_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, KC_PSCR, KC_SCRL, KC_PAUS, DF(dv), \
    KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_SAD, RGB_SAI, DF(cm),  KC_INS,  KC_HOME, KC_PGUP, _TERM, \
-   _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, KC_SLCK, KC_END,  KC_PGDN, DF(qw), \
+   _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, KC_SCRL, KC_END,  KC_PGDN, DF(qw), \
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
  ),
  [nar] = LAYOUT_ortho_4x12( \
-   KC_ESC,  _C_LEFT, KC_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, KC_PSCR, KC_SLCK, KC_PAUS, DF(dv), \
+   KC_ESC,  _C_LEFT, KC_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, KC_PSCR, KC_SCRL, KC_PAUS, DF(dv), \
    KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_SAD, RGB_SAI, DF(cm),  KC_INS,  KC_HOME, KC_PGUP, _TERM, \
    _S_TAB,  _A_LEFT, IJ_OMN,  _A_RGHT, _______, RGB_VAD, RGB_VAI, _______, __NAR,   KC_END,  KC_PGDN, DF(qw), \
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
index 06fc50f482..c8ec314d9d 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
          XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_PWR, KC_SYRQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX,
          XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_APP, MT(MOD_RSFT, KC_INS), XXXXXXX,
-         XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
+         XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
 
 /* Numeric Keypad
  * ,-----------------------------------------------------------------------------------.
@@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [LAYER_NUMONLY] = LAYOUT_ortho_4x12(
          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_NLCK, KC_NO, TG(LAYER_NUMONLY), KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_P7, KC_P8, KC_P9, KC_BSPC, XXXXXXX,
+         XXXXXXX, KC_NUM, KC_NO, TG(LAYER_NUMONLY), KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_P7, KC_P8, KC_P9, KC_BSPC, XXXXXXX,
          XXXXXXX, MT(MOD_LSFT, KC_TAB), KC_LPRN, KC_RPRN, KC_EQUAL, KC_KP_COMMA, KC_KP_PLUS, KC_P4, KC_P5, KC_P6, MT(MOD_LSFT, KC_KP_ENTER), XXXXXXX,
          XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, CK_TRIPLEZERO, KC_KP_DOT, KC_P0, KC_P1, KC_P2, MT(MOD_LSFT, KC_P3), XXXXXXX, XXXXXXX ),
 
diff --git a/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c b/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
index adb3b727d2..c939ea91a9 100644
--- a/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN2] = LAYOUT(
-     TO(0),   KC_1,    KC_2,    KC_SLCK, KC_PAUS, KC_PSCR, KC_CALC, KC_ESC,  KC_PMNS, KC_PERC, KC_PSLS, MO(3), 
+     TO(0),   KC_1,    KC_2,    KC_SCRL, KC_PAUS, KC_PSCR, KC_CALC, KC_ESC,  KC_PMNS, KC_PERC, KC_PSLS, MO(3), 
      _______, KC_NO,   KC_WH_U, KC_MS_U, KC_NO,   KC_NO,   KC_F2,   KC_7,    KC_8,    KC_9,    KC_PAST, KC_NO, 
      _______, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,   KC_ENT,  KC_4,    KC_5,    KC_6,    KC_MINS, KC_EQL,
      _______, KC_NO,   KC_NO,   KC_NO,   KC_WH_D, KC_NO,   KC_NO,   KC_1,    KC_2,    KC_3,    KC_PPLS, KC_BSPC,
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
index 89e98f1ea6..c32469dae9 100644
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
@@ -652,7 +652,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        UC_M_LN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,
        UC_M_WC,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_SLCK,KC_NO,KC_NO,KC_NO,
+       TO(FULL),KC_PAUSE,KC_PSCR,KC_SCRL,KC_NO,KC_NO,KC_NO,
           EEP_RST,TO(BASE),TO(BASE),TO(BASE),TO(BASE),
                                        KC_NO,KC_NO,
                                                KC_NO,
diff --git a/keyboards/kv/revt/keymaps/default/keymap.c b/keyboards/kv/revt/keymaps/default/keymap.c
index dbbd4a9ed0..2b4867add5 100644
--- a/keyboards/kv/revt/keymaps/default/keymap.c
+++ b/keyboards/kv/revt/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *`----------------------------------------------------------------------------------------------------------------'
    */
 [0] = LAYOUT_default(
-                                        KC_ESC,           KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
+                                        KC_ESC,           KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
+  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
   KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS,   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
   KC_KP_4, KC_KP_5, KC_KP_6,            KC_CAPS, KC_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_1, KC_KP_2, KC_KP_3, KC_PENT,   KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,            KC_UP,
diff --git a/keyboards/latincompass/latin17rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin17rgb/keymaps/default/keymap.c
index 58e01b1a2b..237f4a6d65 100644
--- a/keyboards/latincompass/latin17rgb/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin17rgb/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_5x4( 
-	    KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+	    KC_NUM,  KC_PSLS, KC_PAST, MO(1),
 	    KC_P7,   KC_P8,   KC_P9,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/latincompass/latin17rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin17rgb/keymaps/via/keymap.c
index a73da5eb89..b222f74836 100644
--- a/keyboards/latincompass/latin17rgb/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin17rgb/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_5x4( 
-	    KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+	    KC_NUM,  KC_PSLS, KC_PAST, MO(1),
 	    KC_P7,   KC_P8,   KC_P9,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/latincompass/latin47ble/keymaps/default/keymap.c b/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
index 3827c61fd7..69507401bd 100644
--- a/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
     ),
     [_FN2] = LAYOUT_planck_mit(
-        KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
+        KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
         KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
         KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
diff --git a/keyboards/latincompass/latin47ble/keymaps/via/keymap.c b/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
index 6dd3a7231c..831f11cf2c 100644
--- a/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ enum layers {
         KC_LCTL,  KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
     ),
     [_FN2] = LAYOUT_planck_mit(
-        KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
+        KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
         KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
         KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
diff --git a/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
index 7c4291efbb..6fb2971fab 100644
--- a/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_latin_hhkb(
         RGB_TOG,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_LEFT,  KC_DOWN, KC_RIGHT, _______,_______,
                  KC_LALT, _______,                            _______,                                     _______,  _______
diff --git a/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
index 7c4291efbb..6fb2971fab 100644
--- a/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_latin_hhkb(
         RGB_TOG,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP,          _______,
         KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_LEFT,  KC_DOWN, KC_RIGHT, _______,_______,
                  KC_LALT, _______,                            _______,                                     _______,  _______
diff --git a/keyboards/lets_split/keymaps/henxing/keymap.c b/keyboards/lets_split/keymaps/henxing/keymap.c
index 7b28259f3b..976b9e509a 100644
--- a/keyboards/lets_split/keymaps/henxing/keymap.c
+++ b/keyboards/lets_split/keymaps/henxing/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_NO,   KC_NO,   KC_UP,   KC_F7,    KC_F8,   KC_F9,   KC_F10, \
             KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO,   KC_NO,   KC_DOWN, KC_F4,    KC_F5,   KC_F6,   KC_F11, \
             KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, QK_BOOT, KC_NO,   KC_NO,   KC_TRNS, KC_F1,    KC_F2,   KC_F3,   KC_F12, \
-            KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY,   KC_PSCR, KC_SLCK, KC_PAUS \
+            KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY,   KC_PSCR, KC_SCRL, KC_PAUS \
             )
 
 };
diff --git a/keyboards/lets_split/keymaps/normacos/keymap.c b/keyboards/lets_split/keymaps/normacos/keymap.c
index f43e72b682..19a31e3d06 100644
--- a/keyboards/lets_split/keymaps/normacos/keymap.c
+++ b/keyboards/lets_split/keymaps/normacos/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------' `-----------------------------------------'
  */
 [_LOWER] = LAYOUT_ortho_4x12( \
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_NLCK, KC_P7,   KC_P8, KC_P9, KC_PEQL, _______, \
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_NUM,  KC_P7,   KC_P8, KC_P9, KC_PEQL, _______, \
   _______, KC_F5,   KC_F6,   KC_F8,   KC_F9,   XXXXXXX, KC_PAST, KC_P4,   KC_P5, KC_P6, KC_PPLS, KC_DEL,  \
   _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_PSLS, KC_P1,   KC_P2, KC_P3, KC_PMNS, _______, \
   _______, _______, _______, _______, _______, _______, KC_PDOT, _______, KC_P0, SPOT,  CHROME,  XXXXXXX
diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c
index b9878314eb..2d6a352acf 100644
--- a/keyboards/lets_split/keymaps/shaymdev/keymap.c
+++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT( 
   _______, KC_PSCR, KC_HOME, KC_UP,   KC_END,  KC_PGUP,  		KC_VOLU, KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,
   KC_CAPS, KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  	 	KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,  XXXXXXX,
-  _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  	 	KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,  XXXXXXX,
+  _______, KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  	 	KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,  XXXXXXX,
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/lets_split/keymaps/vim-mode/keymap.c b/keyboards/lets_split/keymaps/vim-mode/keymap.c
index a33d8c11f7..9765a14c7c 100644
--- a/keyboards/lets_split/keymaps/vim-mode/keymap.c
+++ b/keyboards/lets_split/keymaps/vim-mode/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_ortho_4x12( \
   KC_GRAVE,_______, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, KC_7,    KC_8,    KC_9,    KC_ASTR, _______, \
   KC_DEL,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, KC_4,    KC_5,    KC_6,    KC_MINS, KC_BSLS, \
-  KC_NLCK, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, _______, KC_1,    KC_2,    KC_3,    KC_PLUS, _______, \
+  KC_NUM,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, _______, KC_1,    KC_2,    KC_3,    KC_PLUS, _______, \
   _______, _______, _______, KC_LALT, _______, _______, _______, _______, KC_0,    KC_DOT,  KC_ENT,  _______  \
 ),
 
diff --git a/keyboards/lets_split/keymaps/zer09/keymap.c b/keyboards/lets_split/keymaps/zer09/keymap.c
index 4bca2d7484..4adc40e9c6 100644
--- a/keyboards/lets_split/keymaps/zer09/keymap.c
+++ b/keyboards/lets_split/keymaps/zer09/keymap.c
@@ -27,11 +27,11 @@ extern keymap_config_t keymap_config;
   KC_F4,         KC_F5,         KC_F6,         KC_F12,   _______,/**/ _______,  KC_RPRN,  _______,  _______,  _______,  \
   LCTL_T(KC_F1), LSFT_T(KC_F2), LALT_T(KC_F3), KC_F11,   _______,/**/ KC_LPRN,  KC_EQUAL, KC_LEFT,  KC_UP,    KC_RIGHT, \
   KC_F7,         KC_F8,         KC_F9,         KC_F10,   _______,/**/ KC_MINUS, _______,  _______,  KC_DOWN,  _______,  \
-  _______,       _______,       _______,       _______,  _______,/**/ KC_PSCR,  KC_SLCK,  KC_PAUSE, _______,  _______,  \
+  _______,       _______,       _______,       _______,  _______,/**/ KC_PSCR,  KC_SCRL,  KC_PAUSE, _______,  _______,  \
   _______,       _______,       _______,       _______,  _______,/**/ _______,  _______,  _______,  _______,  _______)
 
 #define _astdLayer LAYOUT( \
-  KC_MPRV,     KC_MUTE,      _______,      _______,      _______,/**/KC_PSCR,   KC_SLCK,  KC_PAUSE, _______, KC_RGUP,  \
+  KC_MPRV,     KC_MUTE,      _______,      _______,      _______,/**/KC_PSCR,   KC_SCRL,  KC_PAUSE, _______, KC_RGUP,  \
   KC_MPLY,     KC_VOLD,      _______,      _______,      _______,/**/_______,   _______,  _______,  _______, KC_RGDWN, \
   KC_MNXT,     KC_VOLU,      QK_BOOT,      _______,      _______,/**/_______,   _______,  QK_BOOT,  _______, _______,  \
   _______,     _______,      _______,      _______,      _______,/**/_______,   _______,  _______,  _______, _______,  \
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
index 4e919da84f..1b9d0ff6a5 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,        KC_PSCR, KC_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,
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [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_SLCK, KC_PAUS, LALT(KC_F5),
+        KC_ESC,                   KC_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,
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `------------------------------------------------------'          `-------------'
      */
     [FUNC] = LAYOUT_tkl_ansi(
-        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR,   KC_SLCK, KC_PAUS,
+        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,
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
index 73f62d36bf..24fcc07dd4 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [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_F10,  KC_F11,   KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,       KC_PSCR, KC_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,
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `------------------------------------------------------'          `-------------'
      */
     [FUNC] = LAYOUT_tkl_ansi(
-        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
+        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,
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
index b53fb19e1c..0288ffae82 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [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_SLCK, KC_PAUS,
+        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,
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `------------------------------------------------------'          `-------------'
      */
     [FUNC] = LAYOUT_tkl_ansi(
-        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
+        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,
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
index 74a7d1cfa3..8016af1f4b 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------------------------------------------------------------'   `-------------'
      */
     [FUNC] = LAYOUT_tkl_iso(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SCRL, KC_PAUS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
         XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    _______, _______, _______,
         _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
index 38eb656892..7afbb8cd08 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_6x4(
         KC_ESC,  KC_TAB,  KC_BSPC, MO(1),
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
index 88e60c89af..615ca2e4eb 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [VANILLA] = LAYOUT(
-        KC_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                  KC_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,
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index 3ec324ebe5..feb093e828 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [VANILLA] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                   KC_NLCK, KC_PSLS, KC_PAST, KC_PEQL,
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                   KC_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_BSLS,                   KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_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,
diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c
index eced2f2655..b919ad034d 100644
--- a/keyboards/lily58/keymaps/bcat/keymap.c
+++ b/keyboards/lily58/keymaps/bcat/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
         MC_ALTT,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
         KY_CSPC,  KY_ZMRST, KY_ZMOUT, KY_ZMIN,  KC_WBAK,  KC_WFWD,                      KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_TILD,
-        _______,  KC_APP,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_LGUI,  _______,  _______,  KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
+        _______,  KC_APP,   KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_LGUI,  _______,  _______,  KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
     /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823 */
diff --git a/keyboards/lily58/keymaps/niolang/keymap.c b/keyboards/lily58/keymaps/niolang/keymap.c
index e2f37f678c..a742d7822a 100644
--- a/keyboards/lily58/keymaps/niolang/keymap.c
+++ b/keyboards/lily58/keymaps/niolang/keymap.c
@@ -104,8 +104,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   `----------------------------'           '------''--------------------'
  */
   [_ADJUST] = LAYOUT(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_SLCK, KC_INS,  KC_PAUSE, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_SCRL, KC_INS,  KC_PAUSE, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
                              _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/linworks/fave104/keymaps/default/keymap.c b/keyboards/linworks/fave104/keymaps/default/keymap.c
index 84587ef99e..3bab501be9 100644
--- a/keyboards/linworks/fave104/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave104/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,             KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,             KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_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_TRNS,
     KC_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,
diff --git a/keyboards/linworks/fave104/keymaps/via/keymap.c b/keyboards/linworks/fave104/keymaps/via/keymap.c
index abe6d6ecd9..1630e6a79b 100644
--- a/keyboards/linworks/fave104/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave104/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,             KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,             KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_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_TRNS,
     KC_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,
diff --git a/keyboards/linworks/fave84h/keymaps/default/keymap.c b/keyboards/linworks/fave84h/keymaps/default/keymap.c
index 539da9a9de..a1be9d6e40 100644
--- a/keyboards/linworks/fave84h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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_DEL,  KC_ENT,
diff --git a/keyboards/linworks/fave84h/keymaps/via/keymap.c b/keyboards/linworks/fave84h/keymaps/via/keymap.c
index f741ad4b77..d797749d18 100644
--- a/keyboards/linworks/fave84h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_ansi_tsangan_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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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_DEL,  KC_ENT,
diff --git a/keyboards/linworks/fave87/keymaps/default/keymap.c b/keyboards/linworks/fave87/keymaps/default/keymap.c
index 1aaa50f22f..f6fdc475ef 100644
--- a/keyboards/linworks/fave87/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave87/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,                 KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,                 KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
diff --git a/keyboards/linworks/fave87/keymaps/via/keymap.c b/keyboards/linworks/fave87/keymaps/via/keymap.c
index 1aaa50f22f..f6fdc475ef 100644
--- a/keyboards/linworks/fave87/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave87/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,                 KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,                 KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
diff --git a/keyboards/linworks/fave87h/keymaps/default/keymap.c b/keyboards/linworks/fave87h/keymaps/default/keymap.c
index e8f4da2c1e..84125d219d 100644
--- a/keyboards/linworks/fave87h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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_DEL,  KC_ENT,
diff --git a/keyboards/linworks/fave87h/keymaps/via/keymap.c b/keyboards/linworks/fave87h/keymaps/via/keymap.c
index fc00ec1725..1e2b45b41c 100644
--- a/keyboards/linworks/fave87h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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_DEL,  KC_ENT,
diff --git a/keyboards/lizard_trick/tenkey_plusplus/keymaps/default/keymap.c b/keyboards/lizard_trick/tenkey_plusplus/keymaps/default/keymap.c
index 14037cb597..b685dda782 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/keymaps/default/keymap.c
+++ b/keyboards/lizard_trick/tenkey_plusplus/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BASE] = LAYOUT(
         KC_MUTE,    KC_MPLY,    KC_MNXT,
-        KC_NLCK,    KC_PSLS,    KC_PAST,    KC_PMNS,
+        KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
         KC_P7,      KC_P8,      KC_P9,      KC_PPLS,
         KC_P4,      KC_P5,      KC_P6,
         KC_P1,      KC_P2,      KC_P3,      KC_PENT,
diff --git a/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c b/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c
index 09faf755c2..6c4bf06821 100644
--- a/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c
+++ b/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_ansi(  /* Base */
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS, KC_EQL,          KC_BSPC,     KC_NLCK, KC_PSLS,  KC_PAST, KC_PMNS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS, KC_EQL,          KC_BSPC,     KC_NUM,  KC_PSLS,  KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_P7,   KC_P8,    KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,          KC_ENT,              KC_P4,   KC_P5,    KC_P6,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,          KC_RSFT,             KC_P1,   KC_P2,    KC_P3,   KC_PENT,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_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_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS,   KC_HOME, KC_PGUP,          KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS,
         KC_TRNS,          KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_VAD,  RGB_VAI,  KC_END,  KC_PGDN,          KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,           KC_TRNS
diff --git a/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c b/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c
index de80a1e4d2..0adcda16a2 100644
--- a/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c
+++ b/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all_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_DEL, KC_BSPC,     KC_NLCK, 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_DEL, 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_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_RSFT,             KC_P1,   KC_P2,    KC_P3,   KC_PENT,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,     KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS,   KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,           KC_TRNS
diff --git a/keyboards/longnald/corin/keymaps/default/keymap.c b/keyboards/longnald/corin/keymaps/default/keymap.c
index eddc652cdc..a16bfde7c2 100644
--- a/keyboards/longnald/corin/keymaps/default/keymap.c
+++ b/keyboards/longnald/corin/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_64_ansi(
         KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_NO, KC_PGDN,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
diff --git a/keyboards/lucid/alexa/keymaps/default/keymap.c b/keyboards/lucid/alexa/keymaps/default/keymap.c
index 6f7cd1772b..85b03cdb60 100644
--- a/keyboards/lucid/alexa/keymaps/default/keymap.c
+++ b/keyboards/lucid/alexa/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
         KC_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_TRNS, KC_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_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/lucid/alexa/keymaps/via/keymap.c b/keyboards/lucid/alexa/keymaps/via/keymap.c
index 7977c826c2..0ab9bcf764 100644
--- a/keyboards/lucid/alexa/keymaps/via/keymap.c
+++ b/keyboards/lucid/alexa/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
         KC_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_TRNS, KC_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_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/lucid/alexa_solder/keymaps/default/keymap.c b/keyboards/lucid/alexa_solder/keymaps/default/keymap.c
index eb8178fa56..160e3d240d 100644
--- a/keyboards/lucid/alexa_solder/keymaps/default/keymap.c
+++ b/keyboards/lucid/alexa_solder/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/lucid/alexa_solder/keymaps/via/keymap.c b/keyboards/lucid/alexa_solder/keymaps/via/keymap.c
index 7bdbbbe9cc..050862d91a 100644
--- a/keyboards/lucid/alexa_solder/keymaps/via/keymap.c
+++ b/keyboards/lucid/alexa_solder/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,QK_BOOT,   KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/lucid/kbd8x_hs/keymaps/default/keymap.c b/keyboards/lucid/kbd8x_hs/keymaps/default/keymap.c
index 30ff6137cd..d312e21918 100644
--- a/keyboards/lucid/kbd8x_hs/keymaps/default/keymap.c
+++ b/keyboards/lucid/kbd8x_hs/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = 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_SLCK, KC_PAUS, 
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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, 
diff --git a/keyboards/lucid/kbd8x_hs/keymaps/default_7u/keymap.c b/keyboards/lucid/kbd8x_hs/keymaps/default_7u/keymap.c
index 0c6a1d9710..dcbab037d9 100644
--- a/keyboards/lucid/kbd8x_hs/keymaps/default_7u/keymap.c
+++ b/keyboards/lucid/kbd8x_hs/keymaps/default_7u/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_ansi_7u(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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, 
diff --git a/keyboards/lucid/kbd8x_hs/keymaps/via/keymap.c b/keyboards/lucid/kbd8x_hs/keymaps/via/keymap.c
index 70acb644a2..a7ca0666eb 100644
--- a/keyboards/lucid/kbd8x_hs/keymaps/via/keymap.c
+++ b/keyboards/lucid/kbd8x_hs/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_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_SLCK, KC_PAUS, 
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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, 
diff --git a/keyboards/lucid/phantom_hs/keymaps/default/keymap.c b/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
index 843ee30305..ccbf70421c 100644
--- a/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
+++ b/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi_blocker(
         KC_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_DEL, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/lucid/phantom_hs/keymaps/via/keymap.c b/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
index 3f98bda83c..edc876f6f2 100644
--- a/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
+++ b/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi_blocker(
         KC_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_DEL, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
diff --git a/keyboards/lucid/phantom_solder/keymaps/default/keymap.c b/keyboards/lucid/phantom_solder/keymaps/default/keymap.c
index cd74f03a15..8a5897eea9 100644
--- a/keyboards/lucid/phantom_solder/keymaps/default/keymap.c
+++ b/keyboards/lucid/phantom_solder/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/lucid/phantom_solder/keymaps/via/keymap.c b/keyboards/lucid/phantom_solder/keymaps/via/keymap.c
index 04103653a9..d08bc138f3 100644
--- a/keyboards/lucid/phantom_solder/keymaps/via/keymap.c
+++ b/keyboards/lucid/phantom_solder/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_all(
         KC_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_TRNS, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,QK_BOOT,   KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/lucid/scarlet/keymaps/default/keymap.c b/keyboards/lucid/scarlet/keymaps/default/keymap.c
index 7843f354a0..2fc56f900a 100644
--- a/keyboards/lucid/scarlet/keymaps/default/keymap.c
+++ b/keyboards/lucid/scarlet/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_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_SLCK, KC_PAUS, 
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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, 
diff --git a/keyboards/lucid/scarlet/keymaps/via/keymap.c b/keyboards/lucid/scarlet/keymaps/via/keymap.c
index 70acb644a2..a7ca0666eb 100644
--- a/keyboards/lucid/scarlet/keymaps/via/keymap.c
+++ b/keyboards/lucid/scarlet/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_tkl_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_SLCK, KC_PAUS, 
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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, 
diff --git a/keyboards/lz/erghost/keymaps/default/keymap.c b/keyboards/lz/erghost/keymaps/default/keymap.c
index d19e909ce6..f41375dc03 100644
--- a/keyboards/lz/erghost/keymaps/default/keymap.c
+++ b/keyboards/lz/erghost/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/lz/erghost/keymaps/via/keymap.c b/keyboards/lz/erghost/keymaps/via/keymap.c
index eb8bac8eb5..fa02a4913d 100644
--- a/keyboards/lz/erghost/keymaps/via/keymap.c
+++ b/keyboards/lz/erghost/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/malevolti/superlyra/keymaps/default/keymap.c b/keyboards/malevolti/superlyra/keymaps/default/keymap.c
index d4536d897d..5dff53e1bc 100644
--- a/keyboards/malevolti/superlyra/keymaps/default/keymap.c
+++ b/keyboards/malevolti/superlyra/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Layer 0
     [0] = LAYOUT(
-    KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NLCK,	KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
+    KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NUM,		KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
     KC_TAB,		KC_LBRC,	KC_Q,		KC_W,	KC_E,		KC_R,		KC_T,			KC_P7,		KC_P8,		KC_P9,		KC_PAST,			KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
     KC_CAPS,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			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_P1,		KC_P2,		KC_P3,		KC_PPLS,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
diff --git a/keyboards/malevolti/superlyra/keymaps/via/keymap.c b/keyboards/malevolti/superlyra/keymaps/via/keymap.c
index 39b35280f6..69daf68793 100644
--- a/keyboards/malevolti/superlyra/keymaps/via/keymap.c
+++ b/keyboards/malevolti/superlyra/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Layer 0
     [0] = LAYOUT(
-    KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NLCK,	KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
+    KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NUM,	KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
     KC_TAB,		KC_LBRC,	KC_Q,		KC_W,	KC_E,		KC_R,		KC_T,			KC_P7,		KC_P8,		KC_P9,		KC_PAST,			KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
     KC_CAPS,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			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_P1,		KC_P2,		KC_P3,		KC_PPLS,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
index e1d1d2644c..4bd875b139 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] =  LAYOUT ( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_UP,   KC_F9,   KC_F10,  \
-  KC_F11,  QK_BOOT, _______, _______, _______,    _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12,  \
+  KC_F11,  QK_BOOT, _______, _______, _______,    _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12,  \
   _______, QWERTY,  COLEMAK, DVORAK,  _______,    QK_BOOT, _______, _______, _______, _______, \
                     _______, _______, _______,    _______, _______, _______                    \
   )
diff --git a/keyboards/marksard/leftover30/keymaps/default/keymap.c b/keyboards/marksard/leftover30/keymaps/default/keymap.c
index fe3a671982..13c36a248d 100644
--- a/keyboards/marksard/leftover30/keymaps/default/keymap.c
+++ b/keyboards/marksard/leftover30/keymaps/default/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------------------------------------------------------------.
                  QK_BOOT,  RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP,  KC_END,  KC_INS, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-               RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,     KC_NLCK,
+               RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,     KC_NUM,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
                RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX,     KC_CAPS,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/marksard/rhymestone/keymaps/default/keymap.c b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
index 1cab0d1d2a..0827c18593 100644
--- a/keyboards/marksard/rhymestone/keymaps/default/keymap.c
+++ b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,---------------------------------------------------------------------------------------------------.
          QK_BOOT,   RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   KC_INS,  KC_PSCR,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_NLCK,
+       RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_NUM,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  XXXXXXX,  KC_BTN1,  KC_BTN2,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
diff --git a/keyboards/marksard/treadstone32/keymaps/default/keymap.c b/keyboards/marksard/treadstone32/keymaps/default/keymap.c
index 202aa67d4c..d0cef28353 100644
--- a/keyboards/marksard/treadstone32/keymaps/default/keymap.c
+++ b/keyboards/marksard/treadstone32/keymaps/default/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,---------------------------------------------------------------------------------------------------.
         QK_BOOT,    RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   KC_INS,  KC_PSCR,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_NLCK,
+       RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_NUM,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  XXXXXXX,  KC_BTN1,  KC_BTN2,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
index 9efa9f8a58..701d6ed688 100644
--- a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
+++ b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,---------------------------------------------------------------------------------------------------.
          QK_BOOT, RGBRST,  AG_NORM,  AG_SWAP,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   KC_INS,  KC_PSCR,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-       RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_NLCK,
+       RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  XXXXXXX,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_NUM,
   //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
        RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  XXXXXXX,  KC_BTN1,  KC_BTN2,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
index 705944f246..5f8ac248da 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_rs( \
   // Treadstone48                                                                                                           Rhymestone
   //,--------------------------------------------------------------------------------------------------------------------.  --------------------------------------------.
-       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_P7,   KC_P8,   KC_P9, KC_PSLS, KC_NLCK,\
+       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_P7,   KC_P8,   KC_P9, KC_PSLS, KC_NUM,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|  --------+--------+--------+--------+--------|
       KC_TBSF,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,           KC_ENT,     KC_P4,   KC_P5,   KC_P6, KC_PAST,  KC_TAB,\
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|  --------+--------+--------+--------+--------|
diff --git a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
index a08123b0f5..41c82b8cc7 100644
--- a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE, \
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, \
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, \
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, TG_NKRO, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD, \
         _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END  \
diff --git a/keyboards/massdrop/alt/keymaps/b_/keymap.c b/keyboards/massdrop/alt/keymaps/b_/keymap.c
index 7fe909c0df..8eb1c32509 100644
--- a/keyboards/massdrop/alt/keymaps/b_/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/b_/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
 	[1] = LAYOUT_65_ansi_blocker( /* hold tab */
       KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_MUTE, 
-      KC_TRNS, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, BL_INC, BL_DEC, BL_BRTG, BL_STEP, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_END, 
+      KC_TRNS, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, BL_INC, BL_DEC, BL_BRTG, BL_STEP, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_END, 
       MO(3), RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 
       KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, MO(4), NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD, 
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END // fn layer. f keys, media keys, backlight control, nkro-toggle, etc.
diff --git a/keyboards/massdrop/alt/keymaps/bonta/keymap.c b/keyboards/massdrop/alt/keymaps/bonta/keymap.c
index 9ac27f57e3..a2bd8094d5 100644
--- a/keyboards/massdrop/alt/keymaps/bonta/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/bonta/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_MUTE, \
-        _______, RGB_SPD, RGB_BRU, RGB_SPI, _______, _______, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,  \
+        _______, RGB_SPD, RGB_BRU, RGB_SPI, _______, _______, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  \
         _______, RGB_RMOD,RGB_BRD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, \
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, TG_NKRO, _______, _______, _______, _______, _______,          KC_VOLU, KC_VOLD, \
         _______, _______, _______,                            KC_MPLY,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT  \
diff --git a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
index 51799ed089..05dfc5bb34 100644
--- a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         L_T_PTD, L_PTP,   L_BRD,   L_PTN,   L_EDG_D, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
         _______, L_T_MD,  L_T_ONF, _______, L_EDG_M, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
         MO(2),   _______, _______,                            DBG_FAC,                            KC_APP,  _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c
index b847b39f33..d328e7189e 100644
--- a/keyboards/massdrop/alt/keymaps/default/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
         _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/massdrop/alt/keymaps/default_md/keymap.c b/keyboards/massdrop/alt/keymaps/default_md/keymap.c
index 7a6d2bd4e0..f05f332354 100644
--- a/keyboards/massdrop/alt/keymaps/default_md/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default_md/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         L_T_PTD, L_PTP,   L_BRD,   L_PTN,   L_EDG_D, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
         _______, L_T_MD,  L_T_ONF, _______, L_EDG_M, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
         _______, _______, _______,                            DBG_FAC,                            _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/massdrop/alt/keymaps/emptyflask/keymap.c b/keyboards/massdrop/alt/keymaps/emptyflask/keymap.c
index 6ef6e2aa5e..508eac744c 100644
--- a/keyboards/massdrop/alt/keymaps/emptyflask/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/emptyflask/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FUNCTION] = LAYOUT_65_ansi_blocker(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_END,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, TG_NUMP, KC_MUTE,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, TG_NUMP, KC_MUTE,
         KC_CAPS, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, MD_LOCK, _______, _______,          _______, KC_VOLU,
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, OSL_LAY, _______,          KC_PGUP, KC_VOLD,
         _______, _______, _______,                            HK_COSL,                            _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c b/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
index d4f05b9f32..1bbfe02d9c 100644
--- a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [FUNC] = LAYOUT_65_ansi_blocker(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
         _______, RGB_TOG, _______, _______, EEP_RST, MD_BOOT, NK_TOGG, DBG_TOG, _______, TG(ALT), _______, _______,          KC_PGUP, KC_VOLD,
         _______, _______, KC_LALT,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c b/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c
index 4c079a6aaf..370734d06d 100644
--- a/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_HOME,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_HOME,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, KC_MRWD, KC_MFFD, _______, _______, _______,          _______, KC_PGUP,
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, TG_NKRO, DBG_TOG, _______, _______, _______, _______,          KC_UP,   KC_PGDN,
         _______, _______, _______,                            HK_COSL,                            _______, TG(1),   KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c b/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
index 5c2111ccd2..3ba0d09920 100644
--- a/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE, \
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, \
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, \
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_VOLU, KC_VOLD, \
         _______, _______, _______,                            KC_MPLY,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT  \
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
index ccf0bbc72d..1d1f8014bb 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_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,  KC_INS,
-        _______, _______, FW_WRD,  KC_END,  _______, _______,  C(KC_INS),KC_PGUP, _______, _______, S(KC_INS),KC_SLCK, KC_PAUS, KC_CALC, KC_END,
+        _______, _______, FW_WRD,  KC_END,  _______, _______,  C(KC_INS),KC_PGUP, _______, _______, S(KC_INS),KC_SCRL, KC_PAUS, KC_CALC, KC_END,
         _______, KC_HOME, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT,  KC_DOWN, KC_UP,   KC_RGHT, _______,  _______, _______,          _______,
         _______, _______, KC_DEL,  _______, _______, BK_WRD,   _______,  _______, _______, _______, _______,  _______,          KC_PGUP, _______,
         _______, _______, _______,                             _______,                             _______,  _______, KC_HOME, KC_PGDN, KC_END
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJUST] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,        KC_F10,        KC_F11,  KC_F12,  KC_F13,  KC_INS,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______,      KC_PSCR,       KC_SLCK, KC_PAUS, KC_CALC, KC_END,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______,      KC_PSCR,       KC_SCRL, KC_PAUS, KC_CALC, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), OSL(_LAYERS), OSL(_SECRETS), _______, _______,          KC_MPLY,
         _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, NK_TOGG, DBG_TOG, _______, _______,      _______,       _______,          KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                                 _______,       _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
index c98d3fd77f..4c28e35ef4 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJUST] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_INS,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_CALC, KC_END,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_CALC, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY,
         _______, RGB_TOG, _______, _______, _______, KB_BOOT, _______, _______, _______, _______, _______, _______,          KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/massdrop/alt/keymaps/mac/keymap.c b/keyboards/massdrop/alt/keymaps/mac/keymap.c
index 70ce6198b4..1c78d4bf30 100644
--- a/keyboards/massdrop/alt/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/mac/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE, \
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, \
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, \
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD, \
         _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END  \
diff --git a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c b/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
index bfcadf8900..648a18b126 100644
--- a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE, \
-        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \
+        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, \
         L_T_PTD, L_PTP,   L_BRD,   L_PTN,   L_EDG_D, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, \
         _______, L_T_MD,  L_T_ONF, _______, L_EDG_M, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          KC_PGUP, KC_VOLD, \
         _______, _______, _______,                            DBG_FAC,                            _______, _______, KC_HOME, KC_PGDN, KC_END  \
diff --git a/keyboards/massdrop/alt/keymaps/pregame/keymap.c b/keyboards/massdrop/alt/keymaps/pregame/keymap.c
index c91e557b50..fcc73825dd 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/pregame/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [1] = LAYOUT_65_ansi_blocker(
         KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,   KC_CALC,
-        RGB_M_P, RGB_SPD,  RGB_HUI, RGB_SPI, RGB_SAI, RGB_VAI, _______, U_T_AUTO, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MYCM,
+        RGB_M_P, RGB_SPD,  RGB_HUI, RGB_SPI, RGB_SAI, RGB_VAI, _______, U_T_AUTO, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_MYCM,
         RGB_TOG, RGB_RMOD, RGB_HUD, RGB_MOD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_MUTE,  KC_VOLU,
         _______, _______,  _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_VOLU,  KC_VOLD,
         _______, _______,  _______,                            KC_MPLY,                            _______, _______, KC_HOME, KC_VOLD,  KC_END
diff --git a/keyboards/massdrop/alt/keymaps/reywood/keymap.c b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
index 6279b509b4..91d93b1496 100644
--- a/keyboards/massdrop/alt/keymaps/reywood/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE, \
-    _______, _______, _______,  KC_UP,  _______, _______, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \
+    _______, _______, _______,  KC_UP,  _______, _______, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, \
     _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
     _______, _______, _______, _______, _______, MD_BOOT, TG_NKRO, _______, _______, _______, _______, _______,          KC_VOLU, _______, \
     _______, _______, _______,                            KC_MPLY,                              MO(2), _______, KC_MRWD, KC_VOLD, KC_MFFD  \
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
index aa1d337d10..40ea919da4 100644
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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,  VLK_TOG, KC_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
         _______, _______, RGB_TOG, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
         _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/massdrop/alt/keymaps/via/keymap.c b/keyboards/massdrop/alt/keymaps/via/keymap.c
index f08e3715dd..43146d5a09 100644
--- a/keyboards/massdrop/alt/keymaps/via/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
         _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
         _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/massdrop/ctrl/config_led.c b/keyboards/massdrop/ctrl/config_led.c
index 50daa68e75..6cc8601bb5 100644
--- a/keyboards/massdrop/ctrl/config_led.c
+++ b/keyboards/massdrop/ctrl/config_led.c
@@ -18,7 +18,7 @@ led_config_t g_led_config = { {
     {  58,  59,  60,  61,  62,  75,  49,  32 },
     {  71,  72,  73,  74,  84,  85,  86, NO_LED }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     {   7,   5 }, {  31,   5 }, {  43,   5 }, {  55,   5 }, {  67,   5 }, {  85,   5 }, {  97,   5 }, { 109,   5 },
     { 121,   5 }, { 139,   5 }, { 151,   5 }, { 163,   5 }, { 175,   5 }, { 193,   5 }, { 205,   5 }, { 217,   5 },
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
@@ -44,7 +44,7 @@ led_config_t g_led_config = { {
     {   0,   0 }, {  20,   0 }, {  38,   0 }, {  57,   0 }, {  75,   0 }, {  94,   0 }, { 112,   0 }, { 130,   0 },
     { 149,   0 }, { 167,   0 }, { 186,   0 }, { 204,   0 }, { 224,   0 }, { 224,  17 }, { 224,  32 }, { 224,  47 }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     1, 4, 4, 4, 4, 1, 1, 1,
     1, 4, 4, 4, 4, 1, 9, 1,
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
diff --git a/keyboards/massdrop/ctrl/keymaps/R167/keymap.c b/keyboards/massdrop/ctrl/keymaps/R167/keymap.c
index 942a002d95..2f40aa7066 100644
--- a/keyboards/massdrop/ctrl/keymaps/R167/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/R167/keymap.c
@@ -22,7 +22,7 @@ enum r167_layers {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_EJCT, KC_HOME, KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_VOLD,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
index 9d10a70c2e..37fc1b85d8 100644
--- a/keyboards/massdrop/ctrl/keymaps/default/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum ctrl_keycodes {
 
 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_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
index 9dd2032d25..373e6d6094 100644
--- a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
@@ -29,7 +29,7 @@ enum ctrl_keycodes {
 
 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_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c b/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
index 72446506d9..b58227a1fd 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
@@ -18,7 +18,7 @@ led_config_t g_led_config = { {
     {  58,  59,  60,  61,  62,  75,  49,  32 },
     {  71,  72,  73,  74,  84,  85,  86, NO_LED }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     {   7,   5 }, {  31,   5 }, {  43,   5 }, {  55,   5 }, {  67,   5 }, {  85,   5 }, {  97,   5 }, { 109,   5 },
     { 121,   5 }, { 139,   5 }, { 151,   5 }, { 163,   5 }, { 175,   5 }, { 193,   5 }, { 205,   5 }, { 217,   5 },
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
@@ -44,7 +44,7 @@ led_config_t g_led_config = { {
     {   0,   0 }, {  20,   0 }, {  38,   0 }, {  57,   0 }, {  75,   0 }, {  94,   0 }, { 112,   0 }, { 130,   0 },
     { 149,   0 }, { 167,   0 }, { 186,   0 }, { 204,   0 }, { 224,   0 }, { 224,  17 }, { 224,  32 }, { 224,  47 }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     1, 4, 4, 4, 4, 1, 1, 1,
     1, 4, 4, 4, 4, 1, 1, 1,
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
index 846fc7070c..b58b20c6c4 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
@@ -34,7 +34,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*
     [DEFAULT] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     */
     [_KL] = LAYOUT(
-        KC_ESC,            KC_F1,          KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,        KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,            KC_F1,          KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,        KC_F12,           KC_PSCR, KC_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,
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // This layout doesn't have custom keycodes for now, just custom LED config
     [_VL] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,    KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,    KC_F12,           KC_PSCR, KC_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,
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c b/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
index ad265f0ead..adebdc022f 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
@@ -38,7 +38,7 @@ keymap_config_t keymap_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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, \
diff --git a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
index 90181d46bf..1f68996fc6 100644
--- a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
@@ -12,7 +12,7 @@ enum ctrl_keycodes {
 
 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_SLCK, KC_PAUS, \
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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, \
diff --git a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
index 4a85b375b3..f6c4318c16 100644
--- a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
@@ -29,7 +29,7 @@ enum ctrl_keycodes {
 
 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_SLCK, KC_PAUS, \
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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, \
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
index 732a60a6c5..80018356c7 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
@@ -36,7 +36,7 @@ led_config_t g_led_config = { {
     {  58,  59,  60,  61,  62,  75,  49,  32 },
     {  71,  72,  73,  74,  84,  85,  86, NO_LED }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     {   7,   5 }, {  31,   5 }, {  43,   5 }, {  55,   5 }, {  67,   5 }, {  85,   5 }, {  97,   5 }, { 109,   5 },
     { 121,   5 }, { 139,   5 }, { 151,   5 }, { 163,   5 }, { 175,   5 }, { 193,   5 }, { 205,   5 }, { 217,   5 },
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
@@ -62,7 +62,7 @@ led_config_t g_led_config = { {
     {   0,   0 }, {  20,   0 }, {  38,   0 }, {  57,   0 }, {  75,   0 }, {  94,   0 }, { 112,   0 }, { 130,   0 },
     { 149,   0 }, { 167,   0 }, { 186,   0 }, { 204,   0 }, { 224,   0 }, { 224,  17 }, { 224,  32 }, { 224,  47 }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     1, 4, 4, 4, 4, 1, 1, 1,
     1, 4, 4, 4, 4, 1, 1, 1,
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
index 0ea23ccb4c..f09cda42fd 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_KL] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
         LT_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /*
     [DEFAULT] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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,
diff --git a/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c b/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
index 824725756b..232b3e8dd4 100644
--- a/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
@@ -47,15 +47,15 @@ enum ctrl_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT(
-        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,  KC_ENT,
         KC_LSFT, KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,                              KC_UP,
-        KC_NLCK, KC_LGUI,  KC_LALT,                   KC_SPC,                             KC_RALT, MO(CTRL), KC_F24,   KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT
+        KC_NUM,  KC_LGUI,  KC_LALT,                   KC_SPC,                             KC_RALT, MO(CTRL), KC_F24,   KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [GAME] = LAYOUT(
-        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,  KC_ENT,
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
index eee2eaf628..38d1af2e78 100644
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
@@ -46,7 +46,7 @@ enum ctrl_keycodes {
 
 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_SLCK, KC_PAUS, \
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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, \
diff --git a/keyboards/massdrop/ctrl/keymaps/via/keymap.c b/keyboards/massdrop/ctrl/keymaps/via/keymap.c
index 294ce2e772..6cca86cfac 100644
--- a/keyboards/massdrop/ctrl/keymaps/via/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ enum ctrl_keycodes {
 
 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_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c b/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
index d83318de83..6d6338073d 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
@@ -34,7 +34,7 @@ led_config_t g_led_config = { {
     {  58,  59,  60,  61,  62,  75,  49,  32 },
     {  71,  72,  73,  74,  84,  85,  86, NO_LED }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     {   7,   5 }, {  31,   5 }, {  43,   5 }, {  55,   5 }, {  67,   5 }, {  85,   5 }, {  97,   5 }, { 109,   5 },
     { 121,   5 }, { 139,   5 }, { 151,   5 }, { 163,   5 }, { 175,   5 }, { 193,   5 }, { 205,   5 }, { 217,   5 },
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
@@ -60,7 +60,7 @@ led_config_t g_led_config = { {
     {   0,   0 }, {  20,   0 }, {  38,   0 }, {  57,   0 }, {  75,   0 }, {  94,   0 }, { 112,   0 }, { 130,   0 },
     { 149,   0 }, { 167,   0 }, { 186,   0 }, { 204,   0 }, { 224,   0 }, { 224,  17 }, { 224,  32 }, { 224,  47 }
 }, {
-  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
+  // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS
     1, 4, 4, 4, 4, 1, 1, 1,
     1, 4, 4, 4, 4, 1, 1, 1,
   // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
index 561171a04a..c765fda220 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
@@ -44,7 +44,7 @@ static const char * sendstring_commands[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_KL] = LAYOUT(
     //    ESC       F1       F2       F3       F4       F5       F6       F7       F8       F9       F10     F11      F12              PRINT    SCLCK    PAUSE
-        KC_ESC ,  KC_F1 ,  KC_F2 ,  KC_F3 ,  KC_F4 ,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 ,  KC_F9 ,  KC_F10,  KC_F11,  KC_F12,          KC_PSCR, KC_SLCK,RCS(KC_M),
+        KC_ESC ,  KC_F1 ,  KC_F2 ,  KC_F3 ,  KC_F4 ,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 ,  KC_F9 ,  KC_F10,  KC_F11,  KC_F12,          KC_PSCR, KC_SCRL,RCS(KC_M),
     //     ~        1        2        3        4        5        6        7        8        9        0        -        =      BCKSP     INS      HOME     PGUP
         KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  , KC_MINS,  KC_EQL, KC_BSPC, KC_INS , KC_HOME, KC_PGUP,
     //    TAB       Q        W        E        R        T        Y        U        I        O        P        [        ]        \       DEL      END      PGDN
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md b/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
index 1ba87a97bc..d58cd5b9c0 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
@@ -15,7 +15,7 @@ _I physically switched around my RALT and Menu keys as my personal preference. T
    __________            ___________________________________________      ___________________________________________       ___________________________________________      ________________________________ 
   |    ESC   |          |    F1    |    F2    |    F3    |    F4    |    |    F5    |    F6    |    F7    |    F8    |     |    F9    |    F10   |   F11    |   F12    |    |  PRINT   |  SCLCK   |  PAUSE   |
   |  ------  |          |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |  ------  |     |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |
-  |  KC_ESC  |          |  KC_F1   |  KC_F2   |  KC_F3   |  KC_F4   |    |  KC_F5   |  KC_F6   |  KC_F7   |  KC_F8   |     |  KC_F9   |  KC_F10  |  KC_F11  |  KC_F12  |    |  KC_PSCR |  KC_SLCK |  RCS(M)  |
+  |  KC_ESC  |          |  KC_F1   |  KC_F2   |  KC_F3   |  KC_F4   |    |  KC_F5   |  KC_F6   |  KC_F7   |  KC_F8   |     |  KC_F9   |  KC_F10  |  KC_F11  |  KC_F12  |    |  KC_PSCR |  KC_SCRL |  RCS(M)  |
   |__________|          |__________|__________|__________|__________|    |__________|__________|__________|__________|     |__________|__________|__________|__________|    |__________|__________|__________|
    ____________________________________________________________________________________________________________________________________________________________________      ________________________________
   |    ~     |    1     |     2    |     3    |     4    |     5    |     6    |     7    |     8    |     9    |     0    |     -    |     =    |        BCKSP        |    |   INS    |   HOME   |   PGUP   |
diff --git a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
index 9de2947cc9..b4e36ea5bd 100644
--- a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
@@ -16,7 +16,7 @@ enum ctrl_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
+        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_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,  TD_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,   TD_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, \
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifndef GAMELAYER_DISABLE
     [_GAME] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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, \
diff --git a/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c
index a87656059c..93d8e9faa8 100644
--- a/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c
+++ b/keyboards/masterworks/classy_tkl/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_NO,   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,
diff --git a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c
index bb7b256fda..4dc8538c09 100644
--- a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c
+++ b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c
index 1456ee02a2..a7b74da344 100644
--- a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c
+++ b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_iso_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS , KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL , KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c b/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c
index c26f147eac..485a263ea8 100644
--- a/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c
+++ b/keyboards/masterworks/classy_tkl/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_NO,   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,
diff --git a/keyboards/matchstickworks/southpad/keymaps/default/keymap.c b/keyboards/matchstickworks/southpad/keymaps/default/keymap.c
index 5ffd3ef21a..6d0f1252d4 100644
--- a/keyboards/matchstickworks/southpad/keymaps/default/keymap.c
+++ b/keyboards/matchstickworks/southpad/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_6x4_southpaw( /* Base */
         KC_BSPC, KC_EQL,  KC_LPRN, KC_RPRN,
-        KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK,
+        KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,
                  KC_P9,   KC_P8,   KC_P7,
         KC_PPLS, KC_P6,   KC_P5,   KC_P4,
                  KC_P3,   KC_P2,   KC_P1,
diff --git a/keyboards/matrix/abelx/keymaps/default/keymap.c b/keyboards/matrix/abelx/keymaps/default/keymap.c
index 98d132dc19..e4d2cd41f5 100644
--- a/keyboards/matrix/abelx/keymaps/default/keymap.c
+++ b/keyboards/matrix/abelx/keymaps/default/keymap.c
@@ -22,7 +22,7 @@
 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_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,   KC_PSCR, KC_SCRL, LT(1,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,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
 		QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   KC_VOLU,
 		_______, _______, _______,                            KC_MPLY,                            _______, _______, _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/abelx/keymaps/iso/keymap.c b/keyboards/matrix/abelx/keymaps/iso/keymap.c
index d0b0f637e3..e006109905 100644
--- a/keyboards/matrix/abelx/keymaps/iso/keymap.c
+++ b/keyboards/matrix/abelx/keymaps/iso/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0]=LAYOUT_tkl_iso(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,    KC_F12,        KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,    KC_F12,        KC_PSCR, KC_SCRL, LT(1,KC_PAUS),
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,     KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,                    KC_DEL,  KC_END, KC_PGDN,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______,
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______,
 		QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              KC_VOLU,
 		_______, _______, _______,                                     KC_MPLY,                   _______, _______, _______, _______,     KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/cain_re/keymaps/default/keymap.c b/keyboards/matrix/cain_re/keymaps/default/keymap.c
index d3b01c84b2..8df1dabe61 100644
--- a/keyboards/matrix/cain_re/keymaps/default/keymap.c
+++ b/keyboards/matrix/cain_re/keymaps/default/keymap.c
@@ -21,9 +21,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0]=LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                                     KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                                     KC_PSCR, KC_SCRL, LT(1,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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,  KC_INS, KC_HOME, KC_PGUP,
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,  KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,  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_P7,   KC_P8,   KC_P9, KC_PPLS,  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_P4,   KC_P5,   KC_P6, KC_PPLS,
 		KC_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,   KC_P1,   KC_P2,   KC_P3, KC_PENT,            KC_UP,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                         _______, _______, _______,
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, _______, _______,
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, _______, _______,
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, _______, _______,
 		QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,_______,_______,_______,
 		_______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______,_______,_______,_______,        KC_VOLU,
 		_______, _______, _______,                           KC_MPLY,                                      _______, _______, _______, _______,_______,_______,_______, KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/falcon/keymaps/via/keymap.c b/keyboards/matrix/falcon/keymaps/via/keymap.c
index e720cb0b4b..469a875c5b 100644
--- a/keyboards/matrix/falcon/keymaps/via/keymap.c
+++ b/keyboards/matrix/falcon/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
       KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_DEL,
-      QK_BOOT,   _______,KC_UP,_______,_______,_______,_______,_______,KC_PAUS,KC_SLCK,KC_PSCR,KC_PGUP,_______,KC_INS,
+      QK_BOOT,   _______,KC_UP,_______,_______,_______,_______,_______,KC_PAUS,KC_SCRL,KC_PSCR,KC_PGUP,_______,KC_INS,
       _______,        KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______, _______,_______,KC_HOME,KC_END,_______, _______,
       _______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN,_______,_______,
       _______,_______,                        _______,                        _______,MO(2)),
diff --git a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
index 355827c9c6..287e85f924 100644
--- a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
+++ b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_ESC,       KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,       KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_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,
diff --git a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c
index 186758c122..71436fddd0 100644
--- a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c
+++ b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c
@@ -6,7 +6,7 @@
 
 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_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,   KC_PSCR, KC_SCRL, LT(1,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,
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, 
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
 		QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______,                   KC_VOLU,
 		_______, _______, _______,                           KC_MPLY,                                       _______, _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c
index 76c1e16d8d..4c3b86ec4b 100644
--- a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c
+++ b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c
@@ -6,7 +6,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0]=LAYOUT_tkl_iso(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,    KC_F12,        KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,    KC_F12,        KC_PSCR, KC_SCRL, LT(1,KC_PAUS),
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,     KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,                    KC_DEL,  KC_END, KC_PGDN,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, 
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______, 
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______, 
 		QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              KC_VOLU,
 		_______, _______, _______,                                    KC_MPLY,                             _______, _______, _______,     KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c
index 1f715eb4b2..2f0bbe2c69 100644
--- a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c
+++ b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0]=LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS,
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_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,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, 
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,            _______, _______, _______,
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,            _______, _______, _______,
 		QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     KC_VOLU,
 		_______, _______, _______,                           KC_MPLY,                                      _______, _______, _______,            KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/matrix/m20add/keymaps/default/keymap.c b/keyboards/matrix/m20add/keymaps/default/keymap.c
index e6462c8b1c..0cd0e23916 100644
--- a/keyboards/matrix/m20add/keymaps/default/keymap.c
+++ b/keyboards/matrix/m20add/keymaps/default/keymap.c
@@ -7,7 +7,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0]=LAYOUT_tkl_ansi_tsangan(
 
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,   KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,   KC_PSCR, KC_SCRL, LT(1,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,
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
 		QK_BOOT,   _______, _______, KC_F24, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______,                   KC_VOLU,
 		_______, _______, _______,                           KC_MPLY,                                       _______, _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/m20add/keymaps/iso/keymap.c b/keyboards/matrix/m20add/keymaps/iso/keymap.c
index 48b6fddc86..85bfbaa660 100644
--- a/keyboards/matrix/m20add/keymaps/iso/keymap.c
+++ b/keyboards/matrix/m20add/keymaps/iso/keymap.c
@@ -6,7 +6,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0]=LAYOUT_tkl_iso_tsangan(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,    KC_F12,        KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,    KC_F12,        KC_PSCR, KC_SCRL, LT(1,KC_PAUS),
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,     KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,                    KC_DEL,  KC_END, KC_PGDN,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, 
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
-		KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______, 
+		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______, 
 		QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              KC_VOLU,
 		_______, _______, _______,                                    KC_MPLY,                             _______, _______, _______,     KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/me/keymaps/default/keymap.c b/keyboards/matrix/me/keymaps/default/keymap.c
index 1727d0ae25..f26d0b5294 100644
--- a/keyboards/matrix/me/keymaps/default/keymap.c
+++ b/keyboards/matrix/me/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0]=LAYOUT_tkl_ansi_tsangan(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 			  KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 			  KC_PSCR, KC_SCRL, LT(1,KC_PAUS),
 
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,  KC_BSPC,            KC_INS, KC_HOME, KC_PGUP,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END, KC_PGDN,
diff --git a/keyboards/matrix/me/keymaps/via/keymap.c b/keyboards/matrix/me/keymaps/via/keymap.c
index 60fbc32966..532646504b 100644
--- a/keyboards/matrix/me/keymaps/via/keymap.c
+++ b/keyboards/matrix/me/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0]=LAYOUT_all(
 
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR, KC_SCRL, LT(1,KC_PAUS),
 
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,  KC_BSPC,           KC_INS, KC_HOME, KC_PGUP,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,           KC_DEL, KC_END, KC_PGDN,
diff --git a/keyboards/matthewdias/txuu/keymaps/default/keymap.c b/keyboards/matthewdias/txuu/keymaps/default/keymap.c
index 2e0ed852b1..2353485c12 100644
--- a/keyboards/matthewdias/txuu/keymaps/default/keymap.c
+++ b/keyboards/matthewdias/txuu/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/matthewdias/txuu/keymaps/via/keymap.c b/keyboards/matthewdias/txuu/keymaps/via/keymap.c
index b4318cd5dd..5c382e5fa5 100644
--- a/keyboards/matthewdias/txuu/keymaps/via/keymap.c
+++ b/keyboards/matthewdias/txuu/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/mechbrewery/mb65h/keymaps/default/keymap.c b/keyboards/mechbrewery/mb65h/keymaps/default/keymap.c
index 3905a3053d..ea786fbefd 100644
--- a/keyboards/mechbrewery/mb65h/keymaps/default/keymap.c
+++ b/keyboards/mechbrewery/mb65h/keymaps/default/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/mechbrewery/mb65h/keymaps/via/keymap.c b/keyboards/mechbrewery/mb65h/keymaps/via/keymap.c
index cf736eeac4..6bf1ff8f33 100644
--- a/keyboards/mechbrewery/mb65h/keymaps/via/keymap.c
+++ b/keyboards/mechbrewery/mb65h/keymaps/via/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker/keymap.c
index fce4b5cd3b..a94297221e 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi_blocker_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_DEL,  _______,
-        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c
index eb9fc329f3..c25e3cc224 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi_blocker_tsangan(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
-        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
         _______, _______, _______,                            _______,                                     _______,          _______, _______, _______
diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
index 755b3a4b0e..ff6a61faf3 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
-        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c
index c76a62feaa..5f884d95f6 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_iso_blocker_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_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS,                   _______,
+        KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS,                   _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, _______,          _______, _______,
         _______, _______, _______,                   _______,                            _______, _______,          _______,          _______, _______
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
index 4eed1f0e8c..d0c1b6675a 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_iso_blocker_7u_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, _______,
-        KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS,                   _______,
+        KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS,                   _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, _______,          _______, _______,
         _______, _______, _______,                   _______,                                     _______,          _______,          _______, _______
diff --git a/keyboards/mechbrewery/mb65s/keymaps/via/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/via/keymap.c
index 94046b8833..319267f7ed 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/via/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/via/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
-        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/mechkeys/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
index 25d07843a5..aac3afdb25 100755
--- a/keyboards/mechkeys/espectro/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
@@ -45,8 +45,8 @@ ________________________________________________________________________________
  */
 
   [_BL] = LAYOUT_default(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SCRL, KC_PAUS, KC_PGUP, KC_PGDN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,     KC_P4,   KC_P5,   KC_P6,
     KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechkeys/espectro/keymaps/iso/keymap.c b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
index a8a5950b87..a6c4d2257e 100755
--- a/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
@@ -46,7 +46,7 @@ ________________________________________________________________________________
 
   [_BL] = LAYOUT_iso(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_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_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
index 8469d2619b..f5cad11f90 100644
--- a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
@@ -123,7 +123,7 @@ ________________________________________________________________________________
 
 	[_WINDOWS] = LAYOUT_default(
     KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_MENU,
-    KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,       KC_BSPC,      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,       KC_BSPC,      KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,   KC_QUOT,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,
         KC_LSPO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,      KC_RSPC,        KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
index cc8d0c2cad..a4ba5717e0 100644
--- a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
@@ -45,8 +45,8 @@ ________________________________________________________________________________
  */
 
   [_BL] = LAYOUT_default(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN, \
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,    KC_SCRL, KC_PAUS, KC_PGUP, KC_PGDN, \
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, \
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS, \
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,     KC_P4,   KC_P5,   KC_P6,            \
     KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
diff --git a/keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
index e0b746df9f..892b968c94 100644
--- a/keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(_NV), MO(_FN)
     ),
     [_NV] = LAYOUT(
-        KC_GRV,  _______, KC_UP,   KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_SLCK, KC_PAUS, KC_DEL,
+        KC_GRV,  _______, KC_UP,   KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_SCRL, KC_PAUS, KC_DEL,
         KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
         _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
index 8de45ea5c4..64d7603144 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_SYMBOL] = LAYOUT_2u_space_ortho(
     KC_GRV,  KC_LPRN, KC_RPRN, KC_PLUS, KC_UNDS, KC_CIRC, KC_AMPR, KC_7,    KC_8,    KC_9,    _______, _______,
-    KC_LCBR, KC_LBRC, KC_RBRC, KC_EQL,  KC_MINS, KC_ASTR, KC_PIPE, KC_4,    KC_5,    KC_6,    _______, KC_NLCK,
+    KC_LCBR, KC_LBRC, KC_RBRC, KC_EQL,  KC_MINS, KC_ASTR, KC_PIPE, KC_4,    KC_5,    KC_6,    _______, KC_NUM,
     KC_RCBR, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_PDOT, KC_1,    KC_2,    KC_3,    KC_BSLS, KC_PENT,
     M_DASH,  KC_TILD, _______, KEEB,    _______,      _______,     KC_0,    KC_PSLS, KC_PMNS, KC_PPLS, KC_PAST),
 
diff --git a/keyboards/mechlovin/delphine/keymaps/default/keymap.c b/keyboards/mechlovin/delphine/keymaps/default/keymap.c
index 584d0b223a..81bd4ffdf7 100644
--- a/keyboards/mechlovin/delphine/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/delphine/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_6x4(
         KC_ESC,  BL_STEP, RGB_TOG, RGB_MOD,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechlovin/delphine/keymaps/via/keymap.c b/keyboards/mechlovin/delphine/keymaps/via/keymap.c
index 18c30fdba0..2733aabfe3 100644
--- a/keyboards/mechlovin/delphine/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/delphine/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_6x4(
         KC_ESC,  BL_STEP, RGB_TOG, RGB_MOD,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechlovin/hex6c/keymaps/default/keymap.c b/keyboards/mechlovin/hex6c/keymaps/default/keymap.c
index fb1f82247c..9fff97b5e6 100644
--- a/keyboards/mechlovin/hex6c/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/hex6c/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_CALC, KC_MAIL, KC_MYCM, KC_MUTE,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,   KC_INS,  KC_HOME, KC_PGUP,
+        KC_CALC, KC_MAIL, KC_MYCM, KC_MUTE,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,   KC_INS,  KC_HOME, KC_PGUP,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_SPC,                      KC_UP,
diff --git a/keyboards/mechlovin/hex6c/keymaps/via/keymap.c b/keyboards/mechlovin/hex6c/keymaps/via/keymap.c
index eece4752b6..3c6f629e5e 100644
--- a/keyboards/mechlovin/hex6c/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/hex6c/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_CALC, KC_MAIL, KC_MYCM, KC_MUTE,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,   KC_INS,  KC_HOME, KC_PGUP,
+        KC_CALC, KC_MAIL, KC_MYCM, KC_MUTE,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,   KC_INS,  KC_HOME, KC_PGUP,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_SPC,                      KC_UP,
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c
index 7e0bcb49d3..037b22e1c0 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c
index 0c1aa67f4f..57f974a3df 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c
index 79658b2050..e1f5113669 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c
index 201ee4e4ba..151de57029 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity87/rev2/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev2/keymaps/default/keymap.c
index a98abef90c..7ba60515f7 100644
--- a/keyboards/mechlovin/infinity87/rev2/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/infinity87/rev2/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity87/rev2/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev2/keymaps/via/keymap.c
index 22250ad0e6..17d6d745c7 100644
--- a/keyboards/mechlovin/infinity87/rev2/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/infinity87/rev2/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c
index a98abef90c..7ba60515f7 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c
index 22250ad0e6..17d6d745c7 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity875/keymaps/default/keymap.c b/keyboards/mechlovin/infinity875/keymaps/default/keymap.c
index 93073a1722..750a94dab5 100644
--- a/keyboards/mechlovin/infinity875/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/infinity875/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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,
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/keymap.c b/keyboards/mechlovin/infinity875/keymaps/via/keymap.c
index 283104b5b2..90f39f8698 100644
--- a/keyboards/mechlovin/infinity875/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/infinity875/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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,
diff --git a/keyboards/mechlovin/infinity88/keymaps/default/keymap.c b/keyboards/mechlovin/infinity88/keymaps/default/keymap.c
index 5c5696e7db..7f1cd5c5dc 100644
--- a/keyboards/mechlovin/infinity88/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/infinity88/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinity88/keymaps/via/keymap.c b/keyboards/mechlovin/infinity88/keymaps/via/keymap.c
index 12980b80e8..6427adf4ad 100644
--- a/keyboards/mechlovin/infinity88/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/infinity88/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/infinityce/keymaps/default/keymap.c b/keyboards/mechlovin/infinityce/keymaps/default/keymap.c
index 5b3747b6ee..1fae94914a 100644
--- a/keyboards/mechlovin/infinityce/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/infinityce/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [0] = LAYOUT_all(
-        KC_ESC,     KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,   KC_F11,      KC_F12,    RGB_MOD,                 KC_PSCR,     KC_SLCK,     KC_PAUS,
+        KC_ESC,     KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,   KC_F11,      KC_F12,    RGB_MOD,                 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_SLSH,                 KC_DEL,      KC_END,      KC_PGDN,
         KC_CAPS,    KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,  KC_QUOT,     KC_NUHS,   KC_ENT,
diff --git a/keyboards/mechlovin/infinityce/keymaps/via/keymap.c b/keyboards/mechlovin/infinityce/keymaps/via/keymap.c
index 310529e0ea..d1db3db623 100644
--- a/keyboards/mechlovin/infinityce/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/infinityce/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [0] = LAYOUT_all(
-        KC_ESC,     KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,   KC_F11,      KC_F12,    RGB_MOD,                 KC_PSCR,     KC_SLCK,     KC_PAUS,
+        KC_ESC,     KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,   KC_F11,      KC_F12,    RGB_MOD,                 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_SLSH,                 KC_DEL,      KC_END,      KC_PGDN,
         KC_CAPS,    KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,  KC_QUOT,     KC_NUHS,   KC_ENT,
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
index d1bcb7cb29..fa2fc47549 100644
--- a/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,                             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,          KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c
index 652cf85c98..5b0a2fdf5b 100644
--- a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c
+++ b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_ansi_split_bs(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_ansi_split_bs(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,          _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,          _______,          _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP,          _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______,          KC_HOME, KC_PGDN, KC_END,           _______, _______, _______
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c
index e0abc90c4e..041a86f498 100644
--- a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c
+++ b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_iso_split_bs(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_iso_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_PSCR, KC_SLCK,                   _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL,                   _______,          _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______,                            _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP,          _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______,          KC_HOME, KC_PGDN, KC_END,           _______, _______, _______
diff --git a/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
index d1bcb7cb29..fa2fc47549 100644
--- a/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,                             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,          KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
index e87d665a2b..6209811cf2 100644
--- a/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_F13,           KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,                             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,          KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
index 947b3b0d35..15f626d7ab 100644
--- a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_F13,           KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,                             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,          KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechlovin/serratus/keymaps/default/keymap.c b/keyboards/mechlovin/serratus/keymaps/default/keymap.c
index a98abef90c..7ba60515f7 100644
--- a/keyboards/mechlovin/serratus/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/serratus/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/serratus/keymaps/via/keymap.c b/keyboards/mechlovin/serratus/keymaps/via/keymap.c
index 22250ad0e6..17d6d745c7 100644
--- a/keyboards/mechlovin/serratus/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/serratus/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_HASH, KC_ENT,
diff --git a/keyboards/mechlovin/th1800/keymaps/default/keymap.c b/keyboards/mechlovin/th1800/keymaps/default/keymap.c
index a04a6f246d..801241c065 100644
--- a/keyboards/mechlovin/th1800/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/th1800/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 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_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                   KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_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_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                   KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,      KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,   KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechlovin/th1800/keymaps/via/keymap.c b/keyboards/mechlovin/th1800/keymaps/via/keymap.c
index 86bc278593..be30400d62 100644
--- a/keyboards/mechlovin/th1800/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/th1800/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 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_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                                   KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-        KC_GRV,  KC_1,    KC_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_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                                   KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,      KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,              KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,               KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,            KC_UP,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
index beda5f649d..71c71ed7d6 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
+++ b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN1_BSPC, FN2_SPC, FN3_B,    ALT_N,   CTL_M,   SFT_ENT, KC_P1,   KC_P2,   KC_P3,   KC_MINS
   ),
   [_FN1] = LAYOUT(
-    _______, _______, _______, QK_BOOT, _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,
+    _______, _______, _______, QK_BOOT, _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NUM,
     _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0,
     _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
   ),
diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
index 9d275dcca3..82427caea9 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
+++ b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN1_BSPC, FN2_SPC, FN3_B,    ALT_N,   CTL_M,   SFT_ENT, KC_P1,   KC_P2,   KC_P3,   KC_MINS
   ),
   [_FN1] = LAYOUT(
-    _______, _______, _______, QK_BOOT, _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,
+    _______, _______, _______, QK_BOOT, _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NUM,
     _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0,
     _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
   ),
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
index a8f1d488d4..e76c171478 100755
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FN1] = LAYOUT_all(
                                                                                                                 ENCFUNC,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    KC_CAPS,          KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,   KC_NO,
-    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NLCK, KC_NO,   KC_NO,   KC_NO,            KC_SFTENT,
+    KC_CAPS,          KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,   KC_NO,
+    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NUM,  KC_NO,   KC_NO,   KC_NO,            KC_SFTENT,
     KC_TRNS, KC_WINLCK, KC_TRNS,        KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS ),
 
   [_LOWER] = LAYOUT_all(
diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
index b818ed4eb2..9d51f29158 100644
--- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
                   KC_F1,   KC_F2,   KC_F3,   KC_F4,
-                  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+                  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
                   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_MUTE,  KC_P4,   KC_P5,   KC_P6,   _______,
         MO(_FN1), KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
index 61e98c2df8..070b572507 100644
--- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_landscape(
         TT(_FN1), TT(_FN2), KC_MUTE,
 
-        KC_NLCK,  KC_PSLS,  KC_PAST, KC_PMNS, KC_PPLS,      KC_BSPC,
+        KC_NUM,   KC_PSLS,  KC_PAST, KC_PMNS, KC_PPLS,      KC_BSPC,
         KC_TAB,   KC_P7,    KC_P8,   KC_P9,   KC_PDOT,      KC_RGUI,
         KC_RSFT,  KC_P4,    KC_P5,   KC_P6,   KC_COMMA,     KC_RCTL,
         KC_P0,    KC_P1,    KC_P2,   KC_P3,   KC_PENT,      KC_RALT,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______, ENCFUNC,
 
         _______,  KC_F10,   KC_F11,  KC_F12,  KC_PSCR,      _______,
-        _______,  KC_F7,    KC_F8,   KC_F9,   KC_SLCK,      _______,
+        _______,  KC_F7,    KC_F8,   KC_F9,   KC_SCRL,      _______,
         _______,  KC_F4,    KC_F5,   KC_F6,   KC_PAUS,      _______,
         _______,  KC_F1,    KC_F2,   KC_F3,   _______,      _______,
 
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
                   TT(_FN2),TT(_FN3),TT(_FN4),LT(_RGB,KC_PSCR),
-				  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+				  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
                   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_MUTE,  KC_P4,   KC_P5,   KC_P6,   _______,
         TT(_FN1), KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md b/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md
index ec76f0a415..95835343e1 100644
--- a/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md
+++ b/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md
@@ -8,7 +8,7 @@ This allows you to use Murphpad in a horizontal/landscape orientation with extra
         [_BASE] = LAYOUT_landscape(
             TT(_FN1), TT(_FN2), KC_MUTE,
 
-            KC_NLCK,  KC_PSLS,  KC_PAST, KC_PMNS, KC_PPLS,      KC_BSPC,
+            KC_NUM,   KC_PSLS,  KC_PAST, KC_PMNS, KC_PPLS,      KC_BSPC,
             KC_TAB,   KC_P7,    KC_P8,   KC_P9,   KC_PDOT,      KC_RGUI,
             KC_RSFT,  KC_P4,    KC_P5,   KC_P6,   KC_COMMA,     KC_RCTL,
             KC_P0,    KC_P1,    KC_P2,   KC_P3,   KC_PENT,      KC_RALT,
diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
index 8117a0fd6a..717ff430c9 100644
--- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
                   KC_F1,   KC_F2,   KC_F3,   KC_F4,
-                  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+                  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
                   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_MUTE,  KC_P4,   KC_P5,   KC_P6,   _______,
         MO(_FN1), KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
index 5d68d9213d..5a5ab5a8d6 100644
--- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
     KC_MUTE, KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_INS,
-    KC_HOME, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
+    KC_HOME, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
     KC_END,  KC_CAPS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_TRNS,
-             KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_NLCK, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PGUP, KC_TRNS,
+             KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_NUM,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PGUP, KC_TRNS,
              KC_TRNS,KC_WINLCK,KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_NO,   KC_NO,   KC_HOME, KC_PGDN, KC_END
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/mehkee96/keymaps/default/keymap.c b/keyboards/mehkee96/keymaps/default/keymap.c
index 8f9a1cee37..45f4168cc4 100644
--- a/keyboards/mehkee96/keymaps/default/keymap.c
+++ b/keyboards/mehkee96/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ ________________________________________________________________________________
 
 	LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_DEL,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_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_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,
diff --git a/keyboards/mehkee96/keymaps/johann/keymap.c b/keyboards/mehkee96/keymaps/johann/keymap.c
index 0aea5a8203..692a3f0d27 100644
--- a/keyboards/mehkee96/keymaps/johann/keymap.c
+++ b/keyboards/mehkee96/keymaps/johann/keymap.c
@@ -28,7 +28,7 @@ ________________________________________________________________________________
 
 	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_NLCK, KC_PSLS, KC_PAST, 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_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,
diff --git a/keyboards/meletrix/zoom87/keymaps/default/keymap.c b/keyboards/meletrix/zoom87/keymaps/default/keymap.c
index d5b57b7feb..a5de0f05db 100644
--- a/keyboards/meletrix/zoom87/keymaps/default/keymap.c
+++ b/keyboards/meletrix/zoom87/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13/keymap.c b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13/keymap.c
index a1bf486437..dc9c15a2ec 100644
--- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13/keymap.c
+++ b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/keymap.c b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/keymap.c
index 0b47c2befd..61add8c361 100644
--- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/keymap.c
+++ b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_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_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/keymap.c b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/keymap.c
index b711cadf0a..5496941406 100644
--- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/keymap.c
+++ b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_split_lshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/keymap.c b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/keymap.c
index 1b9a9eed92..0c18fcde32 100644
--- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/keymap.c
+++ b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_split_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/keymap.c b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/keymap.c
index ff5a8a3903..5d0f86d5b5 100644
--- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/keymap.c
+++ b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_split_space(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/meletrix/zoom87/keymaps/via/keymap.c b/keyboards/meletrix/zoom87/keymaps/via/keymap.c
index c5ff23eeda..0c85dc853d 100644
--- a/keyboards/meletrix/zoom87/keymaps/via/keymap.c
+++ b/keyboards/meletrix/zoom87/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/melgeek/mach80/keymaps/default/keymap.c b/keyboards/melgeek/mach80/keymaps/default/keymap.c
index 0d426f7de3..3942e37ec8 100755
--- a/keyboards/melgeek/mach80/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,
+        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,  
diff --git a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
index a7c481baa7..220240a5a6 100755
--- a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS, 
+        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,  
diff --git a/keyboards/melgeek/mach80/keymaps/via/keymap.c b/keyboards/melgeek/mach80/keymaps/via/keymap.c
index e90f8f0653..0501940cb5 100755
--- a/keyboards/melgeek/mach80/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,    
+        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,   
diff --git a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
index 093a7f33f7..217c191433 100755
--- a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi_wkl( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,
+        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,       
diff --git a/keyboards/melgeek/mj61/keymaps/default/keymap.c b/keyboards/melgeek/mj61/keymaps/default/keymap.c
index ee0e82580b..ef55edde48 100644
--- a/keyboards/melgeek/mj61/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj61/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_60_ansi(
         KC_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_SLCK, KC_PAUS, QK_BOOT,
+		_______,    _______, KC_UP,    _______,  _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		_______,    KC_LEFT, KC_DOWN,  KC_RGHT,  _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
 		KC_MPRV,             KC_VOLD,  KC_VOLU,  KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, 
 		_______,    _______,           _______,           _______,                            _______, _______, _______, _______
diff --git a/keyboards/melgeek/mj61/keymaps/via/keymap.c b/keyboards/melgeek/mj61/keymaps/via/keymap.c
index 01b48fb585..f8f690fbf1 100644
--- a/keyboards/melgeek/mj61/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj61/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_60_ansi(
         KC_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_SLCK, KC_PAUS, QK_BOOT,
+		_______,    _______, KC_UP,    _______,  _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		_______,    KC_LEFT, KC_DOWN,  KC_RGHT,  _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
 		KC_MPRV,             KC_VOLD,  KC_VOLU,  KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, 
 		_______,    _______,           _______,           _______,                            _______, _______, _______, _______
diff --git a/keyboards/melgeek/mj63/keymaps/default/keymap.c b/keyboards/melgeek/mj63/keymaps/default/keymap.c
index 85252dbe48..e4e8abc124 100644
--- a/keyboards/melgeek/mj63/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj63/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,    KC_F1,    KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______,   _______,  _______,  _______, _______, _______, KC_CALC, _______, KC_INS,   _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______,   _______,  _______,  _______, _______, _______, KC_CALC, _______, KC_INS,   _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______,   _______,  _______,  _______, _______, _______, _______, _______, _______,  _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,             _______,  _______, _______, _______, _______, NK_TOGG, _______,  _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______,   _______,  _______,                    _______,                             _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/melgeek/mj63/keymaps/via/keymap.c b/keyboards/melgeek/mj63/keymaps/via/keymap.c
index c0248664e0..54a608efea 100644
--- a/keyboards/melgeek/mj63/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj63/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,    KC_F1,    KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______,   _______,  _______,  _______, _______, _______, KC_CALC, _______, KC_INS,   _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+        _______,   _______,  _______,  _______, _______, _______, KC_CALC, _______, KC_INS,   _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______,   _______,  _______,  _______, _______, _______, _______, _______, _______,  _______, KC_HOME, KC_PGUP,          EEP_RST,
         _______,             _______,  _______, _______, _______, _______, NK_TOGG, _______,  _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______,   _______,  _______,                    _______,                             _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/melgeek/mj64/keymaps/default/keymap.c b/keyboards/melgeek/mj64/keymaps/default/keymap.c
index 25a47d369b..3744a5ae69 100644
--- a/keyboards/melgeek/mj64/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_64_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT,
+			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EEP_RST,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   KC_PGDN,  KC_VOLU,  KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/melgeek/mj64/keymaps/via/keymap.c b/keyboards/melgeek/mj64/keymaps/via/keymap.c
index d33e2f7562..8f5348facf 100644
--- a/keyboards/melgeek/mj64/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_64_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT,
+			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EEP_RST,
 		    _______,   _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  KC_INS,   KC_END,   KC_PGDN,  KC_VOLU,  KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/melgeek/mj65/keymaps/default/keymap.c b/keyboards/melgeek/mj65/keymaps/default/keymap.c
index ef9fe71e4c..781fcde206 100644
--- a/keyboards/melgeek/mj65/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT,    _______,
+			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,    _______,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EEP_RST,            _______,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/melgeek/mj65/keymaps/via/keymap.c b/keyboards/melgeek/mj65/keymaps/via/keymap.c
index 121a1c3830..9131bc5228 100644
--- a/keyboards/melgeek/mj65/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT,    _______,
+			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,    _______,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EEP_RST,            _______,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
index 77e9d940d1..e5269628cd 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
index a9509e96dc..951ba0c1c3 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_7u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
index b4cd656ec2..a0f7967ff9 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT_60_ansi_7u_spc_split_bs( 
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
index 1b0e576ac8..cac6c3fb10 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	           KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
index f9e7afa8dc..609428242c 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
index 791337744d..4fe3ff1857 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_3u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
index c15b740e32..a100ee806f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_6u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
index 56ac6faf20..8faac8acd8 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_6u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
index 357d93214d..79448fe924 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_split_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
index 9c0ecdd405..b83da5c06a 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
index c7369ebcbc..14f4029eec 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_split_bs_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
index 568eb96235..3e42e23307 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
index 0d72a78e6c..ba91dedc45 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
index 0f213e6ff6..3da18b6055 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
index 3394ab81ab..5c479a241c 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_7u_spc_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
index eb82f33d04..1e0cb52153 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_split_bs_rshift(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
index 68d60791bd..aeaea17d39 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
index e379a5e638..b6d2472399 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
index 18e6734fbe..aa4071991f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
index 96b317b78f..201bed7cda 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc_split_bs_rshift(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
index 149cd4de57..653e420ed5 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
index 2713820c12..e56402af8f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
index f3ee53674a..52f06e0c1f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
index c0ed6ad606..4c853a9088 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_3u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
index 8879490b7b..8874df85b4 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_6u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
index 78a2f441de..62b56d5b35 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_6u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
index 2a4669a049..23cbf2d69b 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_split_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
index 327e456f37..cd8b6c01ea 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
index 46a08e64d0..4bd2c525d2 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_split_bs_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
index 098e5af8cb..b547098f03 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
index af57d434c6..412b8af80e 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_split_bs_rshift(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
index 8e78d4082c..2f39f15b53 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
index 65aad57130..cdfe295b48 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
index 5e0a5bf1df..ce80e1a9fc 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
index a33215e624..c94a605a1e 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_3u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
index 939ff02ff0..126b52d132 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_6u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
index a2f027ae71..f707a7c718 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_6u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
index f08a899541..4340106755 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_split_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
index 6a2bccc0d1..7562b2ed7f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
index 2d13f48a83..4a878c5f29 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_split_bs_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
index 52cfd611ee..e8223d3b87 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
index 39eb0817d5..5892b4eeb8 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
index ba0be5ec7a..40d3b0e016 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_3u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
index f93e2a4f8c..e8aaa89906 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_6u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
index 9b68fb00b6..9101767eae 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_6u_spc_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
index 2ae9f1c477..08ad8d8ab9 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_split_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
index 42312c6693..de538456a5 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_split_bs(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
index 68d3f84daa..77f55b3cf8 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_split_bs_3u_spc(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
index 77e9d940d1..e5269628cd 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
diff --git a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
index ee1bc38e7c..85e9ddd183 100755
--- a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS),
diff --git a/keyboards/melgeek/mojo68/keymaps/default/keymap.c b/keyboards/melgeek/mojo68/keymaps/default/keymap.c
index 16559a3dfc..7b5ef2b2ed 100755
--- a/keyboards/melgeek/mojo68/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mojo68/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_68_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR, 
-		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   _______,
+		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, _______, EEP_RST,		  _______,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_INS,  KC_END,  KC_MPLY, KC_VOLU,          KC_MUTE,
 		_______, _______, _______,                   _______,                            _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT  
diff --git a/keyboards/melgeek/mojo68/keymaps/via/keymap.c b/keyboards/melgeek/mojo68/keymaps/via/keymap.c
index a8aab4eb34..452a0314f1 100755
--- a/keyboards/melgeek/mojo68/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mojo68/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_68_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR, 
-		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   _______,
+		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, _______, EEP_RST,		  _______,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_INS,  KC_END,  KC_MPLY, KC_VOLU,          KC_MUTE,
 		_______, _______, _______,                   _______,                            _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT  
diff --git a/keyboards/melgeek/mojo75/keymaps/default/keymap.c b/keyboards/melgeek/mojo75/keymaps/default/keymap.c
index fe967d09c9..1e159c3a08 100644
--- a/keyboards/melgeek/mojo75/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mojo75/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_75_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,          KC_HOME,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,           KC_PGUP,
diff --git a/keyboards/melgeek/mojo75/keymaps/via/keymap.c b/keyboards/melgeek/mojo75/keymaps/via/keymap.c
index f59ecb1177..0827aa31af 100644
--- a/keyboards/melgeek/mojo75/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mojo75/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_75_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,          KC_HOME,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,           KC_PGUP,
diff --git a/keyboards/melgeek/tegic/keymaps/default/keymap.c b/keyboards/melgeek/tegic/keymaps/default/keymap.c
index 8b03c11c19..db399d8114 100755
--- a/keyboards/melgeek/tegic/keymaps/default/keymap.c
+++ b/keyboards/melgeek/tegic/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tegic_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,    
+        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,    
         KC_GRV,   KC_1,     KC_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,   
diff --git a/keyboards/melgeek/tegic/keymaps/via/keymap.c b/keyboards/melgeek/tegic/keymaps/via/keymap.c
index fa60a3c181..decc08b093 100755
--- a/keyboards/melgeek/tegic/keymaps/via/keymap.c
+++ b/keyboards/melgeek/tegic/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tegic_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,    
+        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,    
         KC_GRV,   KC_1,     KC_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,   
diff --git a/keyboards/melgeek/z70ultra/keymaps/default/keymap.c b/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
index 5dc65ef020..f20895975c 100644
--- a/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
+++ b/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker( /* 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,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
         _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/melgeek/z70ultra/keymaps/via/keymap.c b/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
index 15d0d34444..f827ff71d5 100644
--- a/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
+++ b/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker( /* 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,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
         _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/mesa/mesa_tkl/keymaps/ansi/keymap.c b/keyboards/mesa/mesa_tkl/keymaps/ansi/keymap.c
index 2baaa52993..e0cb9e433e 100644
--- a/keyboards/mesa/mesa_tkl/keymaps/ansi/keymap.c
+++ b/keyboards/mesa/mesa_tkl/keymaps/ansi/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi(
-            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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,
diff --git a/keyboards/mesa/mesa_tkl/keymaps/default/keymap.c b/keyboards/mesa/mesa_tkl/keymaps/default/keymap.c
index 6f7d9f897a..68f8feb14f 100644
--- a/keyboards/mesa/mesa_tkl/keymaps/default/keymap.c
+++ b/keyboards/mesa/mesa_tkl/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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,
diff --git a/keyboards/mesa/mesa_tkl/keymaps/iso/keymap.c b/keyboards/mesa/mesa_tkl/keymaps/iso/keymap.c
index 67002e9d2b..e3d68efe30 100644
--- a/keyboards/mesa/mesa_tkl/keymaps/iso/keymap.c
+++ b/keyboards/mesa/mesa_tkl/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_iso(
-            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SCRL, KC_PAUS,
             KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
             KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,           KC_DEL,  KC_END,  KC_PGDN,
             KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
diff --git a/keyboards/mesa/mesa_tkl/keymaps/via/keymap.c b/keyboards/mesa/mesa_tkl/keymaps/via/keymap.c
index 195d6b4634..240ab7a907 100644
--- a/keyboards/mesa/mesa_tkl/keymaps/via/keymap.c
+++ b/keyboards/mesa/mesa_tkl/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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,
diff --git a/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
index 5155eb2487..84b6b83ebf 100644
--- a/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_b_ansi(
-		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_PSCR,KC_SLCK,KC_PAUS, 
+		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_PSCR,KC_SCRL,KC_PAUS, 
 		BL_INC ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_DEL ,KC_HOME,KC_PGUP, 
 		BL_DEC ,KC_TAB ,KC_Q   ,KC_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_PGDN, 
 		KC_F13 ,KC_CAPS,KC_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_INS , 
diff --git a/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
index 19de0b7b61..8109a6e1d9 100644
--- a/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_b_iso(
-		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_PSCR,KC_SLCK,KC_PAUS, 
+		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_PSCR,KC_SCRL,KC_PAUS, 
 		BL_INC ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_DEL ,KC_HOME,KC_PGUP, 
 		BL_DEC ,KC_TAB ,KC_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_PGDN, 
 		KC_F13 ,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL ,KC_INS , 
diff --git a/keyboards/metamechs/timberwolf/keymaps/default/keymap.c b/keyboards/metamechs/timberwolf/keymaps/default/keymap.c
index 33529318da..00995915ca 100644
--- a/keyboards/metamechs/timberwolf/keymaps/default/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_INS ,KC_HOME,KC_PGUP, 
 		QK_BOOT  ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_DEL ,KC_END ,KC_PGDN, 
-		BL_INC ,KC_TAB ,KC_Q   ,KC_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_SLCK, 
+		BL_INC ,KC_TAB ,KC_Q   ,KC_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_SCRL, 
 		BL_DEC ,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL ,KC_INS , 
 		KC_F13 ,KC_LSFT,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP  ,KC_UP  ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL,KC_LEFT,KC_LEFT,KC_DOWN,KC_RGHT,KC_PENT 
diff --git a/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
index bef8809f37..44ea7da5af 100644
--- a/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_prime_ansi(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_INS ,KC_HOME,KC_PGUP, 
 		BL_INC ,KC_GRV ,KC_1   ,KC_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_END ,KC_PGDN, 
-		BL_DEC ,KC_TAB ,KC_Q   ,KC_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_SLCK, 
+		BL_DEC ,KC_TAB ,KC_Q   ,KC_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_SCRL, 
 		KC_F13 ,KC_CAPS,KC_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_INS , 
 		KC_F14 ,KC_LSFT        ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP          ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
diff --git a/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
index f65bc3bae4..54f9f0a4fa 100644
--- a/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_prime_iso(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_INS ,KC_HOME,KC_PGUP, 
 		BL_INC ,KC_GRV ,KC_1   ,KC_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_END ,KC_PGDN, 
-		BL_DEC ,KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC                ,KC_PSCR,KC_SLCK, 
+		BL_DEC ,KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC                ,KC_PSCR,KC_SCRL, 
 		KC_F13 ,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL ,KC_INS , 
 		KC_F14 ,KC_LSFT,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP          ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
diff --git a/keyboards/miller/gm862/keymaps/default/keymap.c b/keyboards/miller/gm862/keymaps/default/keymap.c
index ec777cacf8..6a7cf0a9f7 100644
--- a/keyboards/miller/gm862/keymaps/default/keymap.c
+++ b/keyboards/miller/gm862/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,         KC_LGUI,  KC_LALT,                KC_SPC,                         KC_RALT,  MO(1),     KC_RGUI,             KC_RCTL),
 		[_LAYER1] = LAYOUT_60_ansi( /* FN */
 				KC_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_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT  ,
+			    KC_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
 				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
diff --git a/keyboards/miller/gm862/keymaps/via/keymap.c b/keyboards/miller/gm862/keymaps/via/keymap.c
index ec777cacf8..6a7cf0a9f7 100644
--- a/keyboards/miller/gm862/keymaps/via/keymap.c
+++ b/keyboards/miller/gm862/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,         KC_LGUI,  KC_LALT,                KC_SPC,                         KC_RALT,  MO(1),     KC_RGUI,             KC_RCTL),
 		[_LAYER1] = LAYOUT_60_ansi( /* FN */
 				KC_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_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  QK_BOOT  ,
+			    KC_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
 				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c
index 95e2f3427e..0cf8e3a52e 100644
--- a/keyboards/minimon/index_tab/keymaps/default/keymap.c
+++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_ortho_6x13(
        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
diff --git a/keyboards/minimon/index_tab/keymaps/default_2x2u/keymap.c b/keyboards/minimon/index_tab/keymaps/default_2x2u/keymap.c
index 999e19fb69..e35c6d7e61 100644
--- a/keyboards/minimon/index_tab/keymaps/default_2x2u/keymap.c
+++ b/keyboards/minimon/index_tab/keymaps/default_2x2u/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_2x2u(
        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
diff --git a/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c b/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
index ea9e88568f..17bffb0518 100644
--- a/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
+++ b/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_7u_space(
        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
diff --git a/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c b/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c
index 76082c5307..e3a068042b 100644
--- a/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c
+++ b/keyboards/misonoworks/chocolatebar/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELETE, 		            KC_7, KC_8, KC_9, 
 		KC_TAB, KC_GRAVE, KC_MINUS, KC_EQUAL, KC_F, KC_G, KC_H, KC_J, KC_K, KC_QUOT, KC_SCLN, 		        KC_4, KC_5, KC_6, 
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLASH, KC_BSLS,		  KC_PGUP,				KC_1, KC_2, KC_3, 
-		KC_LCTL, KC_LALT, KC_TRNS, KC_SPC, KC_BSPC, KC_TRNS, KC_LCTL,		 KC_WBAK, KC_PGDN, KC_WFWD,		KC_0, KC_NLCK),
+		KC_LCTL, KC_LALT, KC_TRNS, KC_SPC, KC_BSPC, KC_TRNS, KC_LCTL,		 KC_WBAK, KC_PGDN, KC_WFWD,		KC_0, KC_NUM),
 		
 	[SUPER] = LAYOUT(
 		KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 			    RGB_MOD, RGB_RMOD, RGB_SAI, 
@@ -48,6 +48,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,			    KC_PSLS, KC_PAST, KC_PMNS, 
 		KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, 				  	 			KC_KP_DOT, KC_NO, KC_PPLS, 
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_DOT,     	      KC_UP, 			    KC_BSPC, KC_NO, KC_PENT, 
-		KC_LCTL, KC_LALT, KC_TRNS, KC_SPC, KC_BSPC, KC_TRNS, KC_LCTL,		 KC_LEFT, KC_DOWN, KC_RGHT, 		     KC_NLCK, KC_TRNS),
+		KC_LCTL, KC_LALT, KC_TRNS, KC_SPC, KC_BSPC, KC_TRNS, KC_LCTL,		 KC_LEFT, KC_DOWN, KC_RGHT, 		     KC_NUM, KC_TRNS),
 		
 };
diff --git a/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c b/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c
index 60dc14baac..d07b547ebc 100644
--- a/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c
+++ b/keyboards/misonoworks/chocolatebar/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELETE, 		            KC_7, KC_8, KC_9, 
 		KC_TRNS, KC_GRAVE, KC_MINUS, KC_EQUAL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		        KC_4, KC_5, KC_6, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLASH, KC_BSLS,		  KC_PGUP,				KC_1, KC_2, KC_3, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,		 KC_WBAK, KC_PGDN, KC_WFWD,		KC_0, KC_NLCK),
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,		 KC_WBAK, KC_PGDN, KC_WFWD,		KC_0, KC_NUM),
 		
 	[SUPER] = LAYOUT(
 		KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 			    RGB_MOD, RGB_RMOD, RGB_SAI, 
@@ -48,6 +48,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,			    KC_PSLS, KC_PAST, 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_KP_DOT, KC_NO, 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_UP, 			    KC_BSPC, KC_NO, KC_PENT, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,		 KC_LEFT, KC_DOWN, KC_RGHT, 		     KC_NLCK),
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,		 KC_LEFT, KC_DOWN, KC_RGHT, 		     KC_NUM),
 		
 };
diff --git a/keyboards/misonoworks/karina/keymaps/default/keymap.c b/keyboards/misonoworks/karina/keymaps/default/keymap.c
index 470c7ceaf0..b1fce8cae7 100644
--- a/keyboards/misonoworks/karina/keymaps/default/keymap.c
+++ b/keyboards/misonoworks/karina/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [META] = LAYOUT(
-        KC_NLCK,                                                                                  KC_TRNS,
+        KC_NUM,                                                                                   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_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,
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index 0e2111ba8b..304eb2b3b5 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -77,13 +77,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       /*,      */ _______, _______, TT(_xF), _______,        _______, TT(_xF), _______, _______),
   [_xN] = LAYOUT(
       KC_PSCR, KC_F7,      KC_F8,   KC_F9,   KC_F10,         KC_PPLS, KC_7,    KC_8,    KC_9,     KC_PMNS,
-      KC_SLCK, KC_F4,      KC_F5,   KC_F6,   KC_F11,         KC_NLCK, KC_4,    KC_5,    KC_6,     KC_PENT,
+      KC_SCRL, KC_F4,      KC_F5,   KC_F6,   KC_F11,         KC_NUM,  KC_4,    KC_5,    KC_6,     KC_PENT,
       KC_PAUS, KC_F1,      KC_F2,   KC_F3,   KC_F12,         KC_PAST, KC_1,    KC_2,    KC_3,     KC_PSLS,
       /*,      */ _______, _______, TT(_xF), _______,        _______, TT(_xF), KC_0,    KC_DOT,
       /*,      */ _______, _______, _______, _______,        _______, _______, _______, _______),
   [_xF] = LAYOUT(
       QK_BOOT, KC_INS,     KC_PGUP, DEBUG,   KC_VOLU,        KC_PPLS, KC_P7,   KC_P8,   KC_P9,    KC_PMNS,
-      CK_TOGG, KC_HOME,    KC_PGDN, KC_END,  KC_VOLD,        KC_NLCK, KC_P4,   KC_P5,   KC_P6,    KC_PENT,
+      CK_TOGG, KC_HOME,    KC_PGDN, KC_END,  KC_VOLD,        KC_NUM,  KC_P4,   KC_P5,   KC_P6,    KC_PENT,
       KC_LAYO, KC_MPRV,    KC_MPLY, KC_MNXT, KC_MUTE,        KC_PAST, KC_P1,   KC_P2,   KC_P3,    KC_PSLS,
       /*,      */ CK_UP,   MU_TOG,  _______, _______,        _______, _______, KC_P0,   KC_PDOT,
       /*,      */ CK_DOWN, MU_MOD,  _______, _______,        _______, _______, _______, _______),
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
index 0b91d9f0c3..cad13f0e01 100644
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ b/keyboards/mitosis/keymaps/nzen/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_SLCK,    KC_MS_WH_LEFT, KC_MS_WH_RIGHT, KC_MS_BTN3,
+    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,     _______,  _______,   _______,    _______,    _______,       _______
   ),
diff --git a/keyboards/mnk1800s/keymaps/default/keymap.c b/keyboards/mnk1800s/keymaps/default/keymap.c
index 24aa49ba84..43791360b5 100644
--- a/keyboards/mnk1800s/keymaps/default/keymap.c
+++ b/keyboards/mnk1800s/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,          KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,          KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PENT,          KC_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_P1,   KC_P2,   KC_P3,   KC_PENT, KC_UP,            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all( /* FN */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS)
diff --git a/keyboards/mnk1800s/keymaps/via/keymap.c b/keyboards/mnk1800s/keymaps/via/keymap.c
index dba005494b..51df5e7a46 100644
--- a/keyboards/mnk1800s/keymaps/via/keymap.c
+++ b/keyboards/mnk1800s/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,          KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,          KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PENT,          KC_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_P1,   KC_P2,   KC_P3,   KC_PENT, KC_UP,            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all( /* FN */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS),
diff --git a/keyboards/mnk50/keymaps/default/keymap.c b/keyboards/mnk50/keymaps/default/keymap.c
index 9c35dc689b..3a0b6e2f2f 100644
--- a/keyboards/mnk50/keymaps/default/keymap.c
+++ b/keyboards/mnk50/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all( /* FN */
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_TRNS,
     KC_TRNS,          KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
              KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_END,  KC_PGDN)
 };
diff --git a/keyboards/mnk50/keymaps/via/keymap.c b/keyboards/mnk50/keymaps/via/keymap.c
index 7e8f4f138c..964010d535 100644
--- a/keyboards/mnk50/keymaps/via/keymap.c
+++ b/keyboards/mnk50/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all( /* FN */
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_TRNS,
     KC_TRNS,          KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
              KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_END,  KC_PGDN),
 
diff --git a/keyboards/monstargear/xo87/rgb/keymaps/default/keymap.c b/keyboards/monstargear/xo87/rgb/keymaps/default/keymap.c
index fdee305775..8e5ab5b617 100644
--- a/keyboards/monstargear/xo87/rgb/keymaps/default/keymap.c
+++ b/keyboards/monstargear/xo87/rgb/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/monstargear/xo87/rgb/keymaps/via/keymap.c b/keyboards/monstargear/xo87/rgb/keymaps/via/keymap.c
index fdee305775..8e5ab5b617 100644
--- a/keyboards/monstargear/xo87/rgb/keymaps/via/keymap.c
+++ b/keyboards/monstargear/xo87/rgb/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c b/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c
index 4c5aa8f4e3..e717031b43 100644
--- a/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c
+++ b/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c b/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c
index fa2f604797..0a2533b322 100644
--- a/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c
+++ b/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/moon/keymaps/default/keymap.c b/keyboards/moon/keymaps/default/keymap.c
index 7ab5a25f33..fd1956a4dc 100644
--- a/keyboards/moon/keymaps/default/keymap.c
+++ b/keyboards/moon/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/moon/keymaps/default_tkl_ansi/keymap.c b/keyboards/moon/keymaps/default_tkl_ansi/keymap.c
index 2eb006f6a1..b0244eccee 100644
--- a/keyboards/moon/keymaps/default_tkl_ansi/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_ansi/keymap.c
@@ -3,7 +3,7 @@
 // clang-format off
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c
index ce3bcd713c..7fd641a93f 100644
--- a/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c
@@ -3,7 +3,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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,
diff --git a/keyboards/moon/keymaps/default_tkl_iso/keymap.c b/keyboards/moon/keymaps/default_tkl_iso/keymap.c
index 868f68b1ad..b4d9a9b60c 100644
--- a/keyboards/moon/keymaps/default_tkl_iso/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_iso/keymap.c
@@ -3,7 +3,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS , KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL , KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c b/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c
index 6e1e1d5705..1224d9f02e 100644
--- a/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c
@@ -3,7 +3,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_iso_wkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS , KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL , KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/morizon/keymaps/default/keymap.c b/keyboards/morizon/keymaps/default/keymap.c
index dbf9d04412..c84ddeaeb3 100644
--- a/keyboards/morizon/keymaps/default/keymap.c
+++ b/keyboards/morizon/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FUNCTION] = LAYOUT(
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SLCK, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
+        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SCRL, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
         _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS , _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
         _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/ms_sculpt/keymaps/default/keymap.c b/keyboards/ms_sculpt/keymaps/default/keymap.c
index ceb684d609..e96052e98e 100644
--- a/keyboards/ms_sculpt/keymaps/default/keymap.c
+++ b/keyboards/ms_sculpt/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
   [_BASE] = LAYOUT_iso( \
     /*  0      1        2        3        4        5         6        7       8        9         10      11          12         13         14        15       16  */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,     KC_F12,  KC_PSCR, KC_SLCK, KC_PAUSE, KC_CALC, \
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,     KC_F12,  KC_PSCR, KC_SCRL, KC_PAUSE, KC_CALC, \
     KC_GRV,  KC_1,    KC_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_END, \
     KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_NUHS, KC_ENT,  KC_INS,  KC_PGUP, \
diff --git a/keyboards/mschwingen/modelm/keymaps/default/keymap.c b/keyboards/mschwingen/modelm/keymaps/default/keymap.c
index 7f43746db9..97b154fb53 100644
--- a/keyboards/mschwingen/modelm/keymaps/default/keymap.c
+++ b/keyboards/mschwingen/modelm/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL0] = LAYOUT( /* Base layer - Windows key instead of CapsLock, hold ESC for special functions */
-    LT(_FL,KC_ESC),   KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10,  KC_F11 , KC_F12 , KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV , KC_1,    KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_INS , KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    LT(_FL,KC_ESC),   KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10,  KC_F11 , KC_F12 , KC_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_LWIN, KC_A,    KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,                            KC_P4,   KC_P5  , KC_P6  ,
     KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          KC_RSFT,          KC_UP  ,          KC_P1,   KC_P2  , KC_P3  , KC_PENT,
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_BL1] = LAYOUT( /* Base layer - standard layout without any special functions */
-    KC_ESC ,          KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_INS , KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC ,          KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_INS , KC_HOME, KC_PGUP, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN, KC_P7,   KC_P8  , KC_P9  , KC_PPLS,
     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,                            KC_P4,   KC_P5  , KC_P6  ,
     KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          KC_RSFT,          KC_UP  ,          KC_P1,   KC_P2  , KC_P3  , KC_PENT,
diff --git a/keyboards/mt/blocked65/keymaps/default/keymap.c b/keyboards/mt/blocked65/keymaps/default/keymap.c
index 219dd2647e..9838fb80dd 100644
--- a/keyboards/mt/blocked65/keymaps/default/keymap.c
+++ b/keyboards/mt/blocked65/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FL] = 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_PSCR,
-        KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS,  QK_BOOT,   KC_PSCR, KC_SLCK, KC_PAUS, KC_BSLS, KC_SLCK,
+        KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS,  QK_BOOT,   KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, KC_NO,   KC_NO,   KC_F14,  KC_F15,           KC_INS,  KC_HOME,
         KC_LSFT,          KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   BL_TOGG, KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_RSFT, RGB_MOD, KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                            QK_BOOT,                              KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END
diff --git a/keyboards/mt/blocked65/keymaps/via/keymap.c b/keyboards/mt/blocked65/keymaps/via/keymap.c
index c7afb9f7b0..58cd2291dd 100644
--- a/keyboards/mt/blocked65/keymaps/via/keymap.c
+++ b/keyboards/mt/blocked65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FL] = 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_PSCR,
-        KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS,  QK_BOOT,   KC_PSCR, KC_SLCK, KC_PAUS, KC_BSLS, KC_SLCK,
+        KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS,  QK_BOOT,   KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, KC_NO,   KC_NO,   KC_F14,  KC_F15,           KC_INS,  KC_HOME,
         KC_LSFT,          KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   BL_TOGG, KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_RSFT, RGB_MOD, KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                            QK_BOOT,                              KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END
diff --git a/keyboards/mt/mt980/keymaps/default/keymap.c b/keyboards/mt/mt980/keymaps/default/keymap.c
index 97a3de64fd..ee49cc522e 100644
--- a/keyboards/mt/mt980/keymaps/default/keymap.c
+++ b/keyboards/mt/mt980/keymaps/default/keymap.c
@@ -4,14 +4,14 @@ 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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_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,  KC_LALT,                      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_SLCK,  KC_HOME,  KC_END,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_PAUSE, KC_SCRL,  KC_HOME,  KC_END,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  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,
diff --git a/keyboards/mt/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c
index f3f028aeba..87e0998687 100644
--- a/keyboards/mt/mt980/keymaps/walker/keymap.c
+++ b/keyboards/mt/mt980/keymaps/walker/keymap.c
@@ -28,14 +28,14 @@ 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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_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_SLCK,  KC_HOME,  KC_END,   
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_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,   
@@ -150,7 +150,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
         return false;
       }
       return true;
-    case KC_NLCK:
+    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) {
diff --git a/keyboards/murcielago/rev1/keymaps/default/keymap.c b/keyboards/murcielago/rev1/keymaps/default/keymap.c
index b9a4e9f481..7470fef2b4 100644
--- a/keyboards/murcielago/rev1/keymaps/default/keymap.c
+++ b/keyboards/murcielago/rev1/keymaps/default/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX,                   XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, XXXXXXX,
     KC_CAPS, XXXXXXX, KC_TILD, KC_LCBR, KC_RCBR, XXXXXXX,                   KC_PPLS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, XXXXXXX,
     XXXXXXX, XXXXXXX, KC_GRV,  KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PENT, KC_PAST, KC_P1,   KC_P2,   KC_P3,   KC_PSLS, XXXXXXX,
-             XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_P0,   XXXXXXX, XXXXXXX, KC_NLCK
+             XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_P0,   XXXXXXX, XXXXXXX, KC_NUM
   ),
 
   /* FN - one-shot access to F-keys with modifiers
diff --git a/keyboards/murcielago/rev1/keymaps/via/keymap.c b/keyboards/murcielago/rev1/keymaps/via/keymap.c
index b9a4e9f481..7470fef2b4 100644
--- a/keyboards/murcielago/rev1/keymaps/via/keymap.c
+++ b/keyboards/murcielago/rev1/keymaps/via/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX,                   XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, XXXXXXX,
     KC_CAPS, XXXXXXX, KC_TILD, KC_LCBR, KC_RCBR, XXXXXXX,                   KC_PPLS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, XXXXXXX,
     XXXXXXX, XXXXXXX, KC_GRV,  KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PENT, KC_PAST, KC_P1,   KC_P2,   KC_P3,   KC_PSLS, XXXXXXX,
-             XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_P0,   XXXXXXX, XXXXXXX, KC_NLCK
+             XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_P0,   XXXXXXX, XXXXXXX, KC_NUM
   ),
 
   /* FN - one-shot access to F-keys with modifiers
diff --git a/keyboards/mysticworks/wyvern/keymaps/default/keymap.c b/keyboards/mysticworks/wyvern/keymaps/default/keymap.c
index 5de61e0424..59f366b9be 100644
--- a/keyboards/mysticworks/wyvern/keymaps/default/keymap.c
+++ b/keyboards/mysticworks/wyvern/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP,
     KC_P4,   KC_P5,   KC_P6,   KC_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_NUBS, KC_ENT,  KC_PGDN,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_LSFT, KC_NUHS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(1),
diff --git a/keyboards/mysticworks/wyvern/keymaps/via/keymap.c b/keyboards/mysticworks/wyvern/keymaps/via/keymap.c
index 5cf059dda3..c58862f222 100644
--- a/keyboards/mysticworks/wyvern/keymaps/via/keymap.c
+++ b/keyboards/mysticworks/wyvern/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP,
     KC_P4,   KC_P5,   KC_P6,   KC_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_NUBS, KC_ENT,  KC_PGDN,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_LSFT, KC_NUHS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(1),
diff --git a/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c b/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c
index d11f634cf8..81f4f1d315 100644
--- a/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c
+++ b/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_HOME,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
         _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c b/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c
index 907800f682..3dc5b9f093 100644
--- a/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c
+++ b/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_HOME,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
         _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c b/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c
index e72206d78c..314bf000a8 100644
--- a/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c
+++ b/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_HOME,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
         _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c b/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c
index dab2c9cc62..7d8a947e96 100644
--- a/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c
+++ b/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_HOME,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
         _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c b/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c
index 0bdab86fc6..d2d102f460 100644
--- a/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c
+++ b/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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,  _______, _______, _______,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______,
         _______, _______, QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c b/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c
index a9d17ce841..762ca83022 100644
--- a/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c
+++ b/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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,  _______, _______, _______,
-        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______,
         _______, _______, QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/nightly_boards/n87/keymaps/default/keymap.c b/keyboards/nightly_boards/n87/keymaps/default/keymap.c
index b779871c76..d6826782cc 100644
--- a/keyboards/nightly_boards/n87/keymaps/default/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_ansi_split_bs_rshift(
-		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c b/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
index a3527ac500..fb8a1d14fc 100644
--- a/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_ansi_split_bs_rshift_symmetric(
-		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c b/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c
index ddb67c4bc0..9047d6e2f3 100644
--- a/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_ansi_split_bs_rshift_tsangan(
-		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/nightly_boards/n87/keymaps/via/keymap.c b/keyboards/nightly_boards/n87/keymaps/via/keymap.c
index ab944adf57..e5450c84de 100644
--- a/keyboards/nightly_boards/n87/keymaps/via/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_ansi_split_bs_rshift(
-		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+		KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
index b1af091365..5cb767a94a 100644
--- a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
+++ b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_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_GRV,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
index 39adfc359d..145bef0a1e 100644
--- a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
+++ b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_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_GRV,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/default/keymap.c b/keyboards/nopunin10did/jabberwocky/keymaps/default/keymap.c
index 0fa6955d27..32226b4cbb 100644
--- a/keyboards/nopunin10did/jabberwocky/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/jabberwocky/keymaps/default/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_rh_any(
 
-KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_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_BSPC,        KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,    
+KC_ESC ,KC_F1  ,KC_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_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_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_ENT ,                KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,     
 KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,MO(1),  MO(1),  KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                KC_P1  ,KC_P2  ,KC_P3  ,KC_PENT,     
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
index 91876ab1a1..878b87efba 100644
--- a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
+++ b/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
@@ -41,9 +41,9 @@ KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,LSA_DEL,FN_CALC,KC_N   ,
     
 [1] = LAYOUT_rh_any(
 QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NLCK,XXXXXXX,XXXXXXX,XXXXXXX,    
+        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NUM ,XXXXXXX,XXXXXXX,XXXXXXX,    
         XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_INT3,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
-        KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SLCK,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
+        KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SCRL,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
 LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,_______,     
         _______,_______,        _______,_______,XXXXXXX,                _______,        _______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,KC_PCMM,_______)
 };
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c b/keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
index bf727c9b1f..e6ed01cf18 100644
--- a/keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
+++ b/keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_rh_any(
 
-KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_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_INT3,KC_BSPC,        KC_NLCK,KC_PSLS,KC_PAST,KC_PAUS,
+KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_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_INT3,KC_BSPC,        KC_NUM ,KC_PSLS,KC_PAST,KC_PAUS,
         KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS,                KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
         KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT ,                KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
 KC_LSFT,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,MO(1),  MO(1),  KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_INT1,KC_RSFT,KC_UP  ,                KC_P1  ,KC_P2  ,KC_P3  ,KC_PENT,
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
index f9d34ad070..0f642c81f7 100644
--- a/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [1] = LAYOUT_all(
     QK_BOOT  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_HOME,XXXXXXX,KC_PGUP,XXXXXXX,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , XXXXXXX,XXXXXXX,XXXXXXX,KC_PAST,
-    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END ,KC_INS ,KC_DEL ,KC_EQL   
     ),
 [2] = LAYOUT_all(
@@ -48,8 +48,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX  
     ),
 [3] = LAYOUT_all(
-    KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , KC_NLCK,KC_PSLS,KC_PAST,XXXXXXX,
-    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,
+    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_NUM ,KC_PSLS,KC_PAST,XXXXXXX,
+    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,
     _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______  
     )
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
index f9d34ad070..0f642c81f7 100644
--- a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [1] = LAYOUT_all(
     QK_BOOT  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_HOME,XXXXXXX,KC_PGUP,XXXXXXX,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , XXXXXXX,XXXXXXX,XXXXXXX,KC_PAST,
-    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END ,KC_INS ,KC_DEL ,KC_EQL   
     ),
 [2] = LAYOUT_all(
@@ -48,8 +48,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX  
     ),
 [3] = LAYOUT_all(
-    KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , KC_NLCK,KC_PSLS,KC_PAST,XXXXXXX,
-    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,
+    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_NUM ,KC_PSLS,KC_PAST,XXXXXXX,
+    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,
     _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______  
     )
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
index 3ec11064f9..251caa8b14 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [1] = LAYOUT_all(
     QK_BOOT  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
-    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END  
     ),
 [2] = LAYOUT_all(
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
index d364a0b2bf..f8a04ca2c7 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
@@ -35,8 +35,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 [_FN1] = LAYOUT_48(
     KC_GRV  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
-    KC_CAPS ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_PSCR, KC_SLCK, KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
-    _______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_NLCK ,XXXXXXX ,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,KC_PGUP,    KC_END ,
+    KC_CAPS ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_PSCR, KC_SCRL, KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
+    _______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_NUM  ,XXXXXXX ,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,KC_PGUP,    KC_END ,
     _______  ,_______  ,KC_WINLCK,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END
     ),
 [_LOWER] = LAYOUT_48(
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
index 3ec11064f9..251caa8b14 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [1] = LAYOUT_all(
     QK_BOOT  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
-    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END  
     ),
 [2] = LAYOUT_all(
diff --git a/keyboards/nopunin10did/railroad/rev0/keymaps/default/keymap.c b/keyboards/nopunin10did/railroad/rev0/keymaps/default/keymap.c
index 8ffcc7f5b6..a5ba77d438 100644
--- a/keyboards/nopunin10did/railroad/rev0/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/railroad/rev0/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT(
 /* Left Block */
-   KC_SLCK,KC_PAUS,KC_ESC ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_MINS,  
+   KC_SCRL,KC_PAUS,KC_ESC ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_MINS,  
    KC_PSCR,KC_BSPC,        KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_LBRC,
    KC_CAPS,                KC_LCTL,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_PGUP,
    CUT    ,                KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_PGDN,
diff --git a/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c
index 466cd735d1..41253ed1b3 100644
--- a/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c
+++ b/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
 /* Left Block */
    KC_ESC ,KC_PAUS,KC_ESC, KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,  
-   KC_SLCK,KC_BSPC,    KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_6,
+   KC_SCRL,KC_BSPC,    KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_6,
    CTLCAPS,      KC_LCTL,          KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_PGUP,
    CUT,      KC_LSFT,              KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_PGDN,
    COPY,   PASTE,    KC_LCTL,    KC_LGUI,  KC_LALT,    KC_GRV,   KC_SPC,     LSHFDEL,
diff --git a/keyboards/novelkeys/nk20/keymaps/default/keymap.c b/keyboards/novelkeys/nk20/keymaps/default/keymap.c
index 63b6e6ac26..26a066f150 100644
--- a/keyboards/novelkeys/nk20/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk20/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P0,            KC_PDOT),
 
 [1] = LAYOUT( /* FN */
-    KC_NLCK, KC_TRNS, KC_TRNS,
+    KC_NUM,  KC_TRNS, KC_TRNS,
     KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS,
     RGB_SAD, RGB_SAI, RGB_HUI,
diff --git a/keyboards/novelkeys/nk20/keymaps/via/keymap.c b/keyboards/novelkeys/nk20/keymaps/via/keymap.c
index 71158863c4..de92d38566 100644
--- a/keyboards/novelkeys/nk20/keymaps/via/keymap.c
+++ b/keyboards/novelkeys/nk20/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P0,            KC_PDOT),
 
 [1] = LAYOUT( /* FN */
-    KC_NLCK, KC_TRNS, KC_TRNS,
+    KC_NUM,  KC_TRNS, KC_TRNS,
     KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS,
     RGB_SAD, RGB_SAI, RGB_HUI,
diff --git a/keyboards/novelkeys/nk87/keymaps/default/keymap.c b/keyboards/novelkeys/nk87/keymaps/default/keymap.c
index f7f63e9ea7..6767c04241 100755
--- a/keyboards/novelkeys/nk87/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk87/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/novelkeys/nk87/keymaps/via/keymap.c b/keyboards/novelkeys/nk87/keymaps/via/keymap.c
index 3c7e4a90f7..5ae0b0223d 100755
--- a/keyboards/novelkeys/nk87/keymaps/via/keymap.c
+++ b/keyboards/novelkeys/nk87/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/novelkeys/nk87b/keymaps/default/keymap.c b/keyboards/novelkeys/nk87b/keymaps/default/keymap.c
index 37c7feb4fd..d7192a97e1 100644
--- a/keyboards/novelkeys/nk87b/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk87b/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/novelkeys/nk87b/keymaps/via/keymap.c b/keyboards/novelkeys/nk87b/keymaps/via/keymap.c
index d4f4a0fa9d..03aa4dfbb7 100644
--- a/keyboards/novelkeys/nk87b/keymaps/via/keymap.c
+++ b/keyboards/novelkeys/nk87b/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
index 3131fb008c..5380de9648 100755
--- a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
+++ b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
-    LT(1, KC_NLCK), KC_PSLS,  KC_PAST,  KC_PMNS,
+    LT(1, KC_NUM),  KC_PSLS,  KC_PAST,  KC_PMNS,
     KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
     KC_P4,          KC_P5,    KC_P6,    KC_PEQL,
     KC_P1,          KC_P2,    KC_P3,    KC_TAB,
diff --git a/keyboards/novelkeys/novelpad/keymaps/default/keymap.c b/keyboards/novelkeys/novelpad/keymaps/default/keymap.c
index 6aa3312040..e2bd5c755f 100755
--- a/keyboards/novelkeys/novelpad/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/novelpad/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_ESC,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_ESC,
         KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_TAB,
diff --git a/keyboards/noxary/220/keymaps/default/keymap.c b/keyboards/noxary/220/keymaps/default/keymap.c
index ec49ea160d..0179cb7918 100644
--- a/keyboards/noxary/220/keymaps/default/keymap.c
+++ b/keyboards/noxary/220/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 	[_BL] = LAYOUT_ortho_6x4(
 	  KC_ESC,   BL_TOGG, BL_DEC,   BL_INC, 
-		KC_NLCK,  KC_PSLS, KC_PAST,  KC_PEQL, 
+		KC_NUM,   KC_PSLS, KC_PAST,  KC_PEQL, 
 		KC_P7,    KC_P8,   KC_P9,    KC_PMNS, 
 		KC_P4,    KC_P5,   KC_P6,    KC_PPLS, 
 		KC_P1,    KC_P2,   KC_P3,    KC_PENT, 
diff --git a/keyboards/noxary/220/keymaps/via/keymap.c b/keyboards/noxary/220/keymaps/via/keymap.c
index 1bfc7a8d04..c92e3931ea 100644
--- a/keyboards/noxary/220/keymaps/via/keymap.c
+++ b/keyboards/noxary/220/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 	[_BL] = LAYOUT_ortho_6x4(
 	  KC_ESC,   BL_TOGG, BL_DEC,   BL_INC, 
-		KC_NLCK,  KC_PSLS, KC_PAST,  KC_PEQL, 
+		KC_NUM,   KC_PSLS, KC_PAST,  KC_PEQL, 
 		KC_P7,    KC_P8,   KC_P9,    KC_PMNS, 
 		KC_P4,    KC_P5,   KC_P6,    KC_PPLS, 
 		KC_P1,    KC_P2,   KC_P3,    KC_PENT, 
diff --git a/keyboards/noxary/280/keymaps/default/keymap.c b/keyboards/noxary/280/keymaps/default/keymap.c
index 7ffb6e85ea..bd279d50d9 100644
--- a/keyboards/noxary/280/keymaps/default/keymap.c
+++ b/keyboards/noxary/280/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
     */
     [_BL] = LAYOUT(
-        KC_ESC,           KC_F1,   KC_F2,  KC_F3,   KC_F4, KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,   KC_F11,  KC_F12,    KC_PSCR,  KC_SLCK,  KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,  KC_F3,   KC_F4, KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,   KC_F11,  KC_F12,    KC_PSCR,  KC_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_BSPC,   KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSLS,   KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,           KC_ENT,
diff --git a/keyboards/noxary/280/keymaps/via/keymap.c b/keyboards/noxary/280/keymaps/via/keymap.c
index 7ffb6e85ea..bd279d50d9 100644
--- a/keyboards/noxary/280/keymaps/via/keymap.c
+++ b/keyboards/noxary/280/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
     */
     [_BL] = LAYOUT(
-        KC_ESC,           KC_F1,   KC_F2,  KC_F3,   KC_F4, KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,   KC_F11,  KC_F12,    KC_PSCR,  KC_SLCK,  KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,  KC_F3,   KC_F4, KC_F5,   KC_F6,   KC_F7,   KC_F8,            KC_F9,   KC_F10,   KC_F11,  KC_F12,    KC_PSCR,  KC_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_BSPC,   KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSLS,   KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,           KC_ENT,
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index b8f900ff75..fdfffaa933 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -117,7 +117,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!numlock_set && record->event.pressed) {
         led_t led_state = host_keyboard_led_state();
         if (!led_state.num_lock) {
-            register_code(KC_NLCK);
+            register_code(KC_NUM_LOCK);
         }
         numlock_set = true;
     }
diff --git a/keyboards/numatreus/keymaps/hdbx/keymap.c b/keyboards/numatreus/keymaps/hdbx/keymap.c
index 628567ad0c..dc68453961 100644
--- a/keyboards/numatreus/keymaps/hdbx/keymap.c
+++ b/keyboards/numatreus/keymaps/hdbx/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT( 
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_7,    KC_8,    KC_9,    KC_DOT,  KC_BSPC,
       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                      KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PAST,
-      JP_ZKHK, KC_SLCK, KC_PAUS, KC_F11,  KC_F12,                      KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
+      JP_ZKHK, KC_SCRL, KC_PAUS, KC_F11,  KC_F12,                      KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
       KC_LALT, KC_LGUI, JP_GRV,  SFT_DEL, _______, KC_LCTL,  SFT_SPC,  _______, KC_0,    KC_COMM, JP_EQL,  KC_ENT
       ),
 
diff --git a/keyboards/numatreus/keymaps/like_jis/keymap.c b/keyboards/numatreus/keymaps/like_jis/keymap.c
index dfddcd0d9f..fbcbea84c2 100644
--- a/keyboards/numatreus/keymaps/like_jis/keymap.c
+++ b/keyboards/numatreus/keymaps/like_jis/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NUMPAD] = LAYOUT(
   //,----------------------------------.             ,----------------------------------.
-    KC_P7,  KC_P8,  KC_P9, KC_PAST, KC_NLCK,          KC_P7, KC_P8, KC_P9, KC_PAST, KC_NLCK,
+    KC_P7,  KC_P8,  KC_P9, KC_PAST, KC_NUM,           KC_P7, KC_P8, KC_P9, KC_PAST, KC_NUM,
   //|------+------+------+------+------|             |------+------+------+------+------|
     KC_P4,  KC_P5,  KC_P6, KC_PMNS, KC_PSLS,          KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PSLS,
   //|------+------+------+------+------|             |------+------+------+------+------|
@@ -114,9 +114,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,----------------------------------.             ,----------------------------------.
    QK_BOOT,  RGBRST, AG_NORM, AG_SWAP, KC_CAPS,        XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,
   //|------+------+------+------+------|             |------+------+------+------+------|
-   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_SLCK,      XXXXXXX, KC_WH_R, KC_WH_D,  KC_END, KC_PGDN,
+   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_SCRL,      XXXXXXX, KC_WH_R, KC_WH_D,  KC_END, KC_PGDN,
   //|------+------+------+------+------|             |------+------+------+------+------|
-   RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NLCK,      XXXXXXX, KC_BTN1, KC_BTN2, KC_MS_U, XXXXXXX,
+   RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NUM,       XXXXXXX, KC_BTN1, KC_BTN2, KC_MS_U, XXXXXXX,
   //|------+------+------+------+------|------+------+------+------+------+------+------|
    KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R
   //|------+------+------+------+-------------+------+------+------+------+------+------|
diff --git a/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
index 8fa74e8ab1..0df4be83d1 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_ansi(
     MO(2),   KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,    KC_F24,   KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_BSPC,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDN,   KC_DOWN,           KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
diff --git a/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
index 8816af1a88..1fdd3bc747 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/tsangan/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_tsangan(
     MO(2),   KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,    KC_F24,   KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_BSPC,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDN,   KC_DOWN,           KC_TRNS,  KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                       KC_TRNS,  KC_TRNS, KC_TRNS
diff --git a/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
index 194e5ff82a..25a116d769 100644
--- a/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
+++ b/keyboards/nyhxis/nfr_70/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_ansi(
     MO(2),   KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,    KC_F24,   KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_BSPC,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP,    KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, 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_END,  KC_PGDN,   KC_DOWN,           KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS
diff --git a/keyboards/ocean/addon/keymaps/default/keymap.c b/keyboards/ocean/addon/keymaps/default/keymap.c
index b20eac7d1d..39cd839486 100644
--- a/keyboards/ocean/addon/keymaps/default/keymap.c
+++ b/keyboards/ocean/addon/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_TRNS, KC_TRNS, KC_TRNS,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_TRNS, KC_UP,   KC_TRNS,    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ocean/addon/keymaps/via/keymap.c b/keyboards/ocean/addon/keymaps/via/keymap.c
index b20eac7d1d..39cd839486 100644
--- a/keyboards/ocean/addon/keymaps/via/keymap.c
+++ b/keyboards/ocean/addon/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_TRNS, KC_TRNS, KC_TRNS,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_TRNS, KC_UP,   KC_TRNS,    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
index 8f58643840..919e8c81b0 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * .---------------------------------------------------------------------------------------------------------------------------------------.
    */
   [_NUMPAD] = LAYOUT( \
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_BSPC, \
+    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, \
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
index 2f8aed176c..e23ba19d7a 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
+++ b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_MEDIA] = LAYOUT(
-    KC_NO,   KC_SLCK,  KC_PAUS, KC_NO,    KC_NO,   RGB_VAD,         RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,
+    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,
diff --git a/keyboards/omnikeyish/keymaps/default/keymap.c b/keyboards/omnikeyish/keymaps/default/keymap.c
index 83dfef6015..6b21d9d03c 100644
--- a/keyboards/omnikeyish/keymaps/default/keymap.c
+++ b/keyboards/omnikeyish/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 /*    COL1             COL2                  COL3     COL4     COL5     COL6     COL7     COL8     COL9     COL10    COL11    COL12    COL13    COL14    COL15    COL16        COL17    COL18    COL19        COL20    COL21    COL22    COL23 */
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_all(
-  	  DYN_MACRO_KEY11, DYN_MACRO_KEY12,      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  	  DYN_MACRO_KEY11, DYN_MACRO_KEY12,      KC_ESC,           KC_F1,   KC_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,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   	  DYN_MACRO_KEY1,  DYN_MACRO_KEY2,       KC_GRV,  KC_1,    KC_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,     M_PROG,  KC_PSLS, KC_PAST, KC_PMNS,
   	  DYN_MACRO_KEY3,  DYN_MACRO_KEY4,       KC_TAB,  KC_Q,    KC_W,    KC_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,
   	  DYN_MACRO_KEY5,  DYN_MACRO_KEY6,       KC_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_MPRV, KC_MPLY, KC_MNXT,     KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
diff --git a/keyboards/omnikeyish/keymaps/default_101/keymap.c b/keyboards/omnikeyish/keymaps/default_101/keymap.c
index 6e5e41cd11..f0b5da62b7 100644
--- a/keyboards/omnikeyish/keymaps/default_101/keymap.c
+++ b/keyboards/omnikeyish/keymaps/default_101/keymap.c
@@ -4,7 +4,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_101(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_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,     M_PROG,  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,
diff --git a/keyboards/org60/keymaps/default/keymap.c b/keyboards/org60/keymaps/default/keymap.c
index 86a242f48d..91f21d2d6b 100644
--- a/keyboards/org60/keymaps/default/keymap.c
+++ b/keyboards/org60/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   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_NO,   KC_NO,
-      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
+      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  ,KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,KC_END),
diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c
index 52e3a79b17..978d637730 100644
--- a/keyboards/orthodox/keymaps/shaymdev/keymap.c
+++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT( 
   _______, KC_PSCR, KC_HOME, KC_UP,   KC_END,  KC_PGUP,                                                                KC_VOLU, KC_F7, KC_F8,  KC_F9,  KC_F10,  XXXXXXX,
   KC_CAPS, KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  _______,          _______,         _______,          _______, KC_VOLD, KC_F4, KC_F5,  KC_F6,  KC_F11,  XXXXXXX,
-  _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______, _______, _______,         _______, _______, _______, KC_MUTE, KC_F1, KC_F2,  KC_F3,  KC_F12,  XXXXXXX
+  _______, KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______, _______, _______,         _______, _______, _______, KC_MUTE, KC_F1, KC_F2,  KC_F3,  KC_F12,  XXXXXXX
 ),
 
 [_ADJUST] =  LAYOUT( 
diff --git a/keyboards/owlab/spring/keymaps/default/keymap.c b/keyboards/owlab/spring/keymaps/default/keymap.c
index c41c3e33c4..a04f77a260 100644
--- a/keyboards/owlab/spring/keymaps/default/keymap.c
+++ b/keyboards/owlab/spring/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[1] = LAYOUT_spring(
 		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,  QK_BOOT, 
-		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS,  KC_HOME, KC_TRNS, 
 		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_DEL,  KC_END,  KC_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/owlab/spring/keymaps/via/keymap.c b/keyboards/owlab/spring/keymaps/via/keymap.c
index 326b897b8e..6e6e25e94a 100644
--- a/keyboards/owlab/spring/keymaps/via/keymap.c
+++ b/keyboards/owlab/spring/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[1] = LAYOUT_spring(
 		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,  QK_BOOT, 
-		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS,  KC_HOME, KC_TRNS, 
 		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_DEL,  KC_END,  KC_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/owlab/suit80/ansi/keymaps/default/keymap.c b/keyboards/owlab/suit80/ansi/keymaps/default/keymap.c
index 5baa8961ea..3eec26dcde 100644
--- a/keyboards/owlab/suit80/ansi/keymaps/default/keymap.c
+++ b/keyboards/owlab/suit80/ansi/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 	[0] = LAYOUT_ansi(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,     KC_ENT,  
diff --git a/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c b/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c
index cde44a98b2..dea1ce8966 100644
--- a/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c
+++ b/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 	[0] = LAYOUT_ansi(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,     KC_ENT,  
diff --git a/keyboards/owlab/suit80/iso/keymaps/default/keymap.c b/keyboards/owlab/suit80/iso/keymaps/default/keymap.c
index 8e498d1b57..4e4dab8a1c 100644
--- a/keyboards/owlab/suit80/iso/keymaps/default/keymap.c
+++ b/keyboards/owlab/suit80/iso/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_iso(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  
diff --git a/keyboards/owlab/suit80/iso/keymaps/via/keymap.c b/keyboards/owlab/suit80/iso/keymaps/via/keymap.c
index 0faf6e6d11..d74ae95b92 100644
--- a/keyboards/owlab/suit80/iso/keymaps/via/keymap.c
+++ b/keyboards/owlab/suit80/iso/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_all(
-		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  
diff --git a/keyboards/pabile/p20/ver1/keymaps/default/keymap.c b/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
index 48b537b564..a844e2c8a1 100644
--- a/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
+++ b/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
@@ -8,13 +8,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P1,   KC_P2,   KC_P3,   KC_TAB,
         LT(2,KC_P0), KC_PCMM, KC_PDOT, LT(1,KC_PENT)),
     [1] = LAYOUT_ortho_5x4(
-        KC_NLCK, KC_UNDS, KC_NO,   KC_NO,
+        KC_NUM,  KC_UNDS, KC_NO,   KC_NO,
         KC_AMPR, KC_ASTR, KC_LPRN, KC_EQL,
         KC_DLR,  KC_PERC, KC_CIRC, KC_NO,
         KC_EXLM, KC_AT,   KC_HASH, KC_NO,
         KC_RPRN, KC_NO,   KC_PSLS, KC_NO),
     [2] = LAYOUT_ortho_5x4(
-        KC_NLCK, KC_NO,   KC_NO,   KC_NO,
+        KC_NUM,  KC_NO,   KC_NO,   KC_NO,
         KC_BTN1, KC_MS_U, KC_BTN2, KC_NO,
         KC_MS_L, KC_MS_D, KC_MS_R, KC_TAB,
         KC_WH_U, KC_NO,   KC_WH_D, KC_NO,
diff --git a/keyboards/pabile/p20/ver2/keymaps/default/keymap.c b/keyboards/pabile/p20/ver2/keymaps/default/keymap.c
index 2c2af0da8a..7f4f71b85f 100644
--- a/keyboards/pabile/p20/ver2/keymaps/default/keymap.c
+++ b/keyboards/pabile/p20/ver2/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
         KC_P7,   KC_P8,   KC_P9,   KC_TAB, 
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
         KC_P1,   KC_P2,   KC_P3,   KC_DEL, 
diff --git a/keyboards/pabile/p40/keymaps/default/keymap.c b/keyboards/pabile/p40/keymaps/default/keymap.c
index 80035fa07d..d607deb73c 100644
--- a/keyboards/pabile/p40/keymaps/default/keymap.c
+++ b/keyboards/pabile/p40/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT_ortho_4x10(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
     KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
-    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_CAPS, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NUM,  KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
   [3] = LAYOUT_ortho_4x10(
     KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
diff --git a/keyboards/pabile/p40_ortho/keymaps/default/keymap.c b/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
index ac41acf2da..891d2b5735 100644
--- a/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
+++ b/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT_ortho_4x10(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
     KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
-    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_CAPS, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NUM,  KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
   [3] = LAYOUT_ortho_4x10(
     KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
diff --git a/keyboards/pabile/p42/keymaps/default/keymap.c b/keyboards/pabile/p42/keymaps/default/keymap.c
index 39c9e639e4..ef4bad015b 100644
--- a/keyboards/pabile/p42/keymaps/default/keymap.c
+++ b/keyboards/pabile/p42/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[2] = LAYOUT(
 		KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10, 
 		KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO, 
-		KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,   KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS,
+		KC_CAPS, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,   KC_NUM,  KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_TRNS),
 	[3] = LAYOUT(
 		KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL, 
diff --git a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
index 006b396adf..0bf0d42d5a 100644
--- a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
+++ b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG_LAYER, KC_F4, KC_F5, KC_F6
   ),
   [3] = LAYOUT(
-      LCTL(KC_PSCR), KC_NLCK, KC_SLCK,
+      LCTL(KC_PSCR), KC_NUM, KC_SCRL,
     KC_NO, _______, _______, _______
   ),
 };
diff --git a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
index ec31e2a98c..3294d0bf8b 100644
--- a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
 		LT(1, KC_ESC),  KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
-		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
+		KC_NUM,         KC_PSLS,  KC_PAST,  KC_PMNS,
 		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
 		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
 		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
index 0b23972e3c..8907a07cd4 100644
--- a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
 		LT(1, KC_ESC),  RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
-		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
+		KC_NUM,         KC_PSLS,  KC_PAST,  KC_PMNS,
 		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
 		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
 		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/peej/tripel/keymaps/default/keymap.c b/keyboards/peej/tripel/keymaps/default/keymap.c
index 2b08adf773..fa52bbce36 100644
--- a/keyboards/peej/tripel/keymaps/default/keymap.c
+++ b/keyboards/peej/tripel/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------------------------------'
  */
  [_BASE] = LAYOUT_ortho_7u(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NLCK, KC_EQL,  KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NUM,  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_P7,   KC_P8,   KC_P9,   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_P4,   KC_P5,   KC_P6,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
diff --git a/keyboards/peej/tripel/keymaps/via/keymap.c b/keyboards/peej/tripel/keymaps/via/keymap.c
index 7c2664ee05..6b0bb776c6 100644
--- a/keyboards/peej/tripel/keymaps/via/keymap.c
+++ b/keyboards/peej/tripel/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_ortho_7u(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NLCK, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NUM,  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_P7,   KC_P8,   KC_P9,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
diff --git a/keyboards/percent/booster/keymaps/default/keymap.c b/keyboards/percent/booster/keymaps/default/keymap.c
index 919774bcad..a3fb1fca5b 100644
--- a/keyboards/percent/booster/keymaps/default/keymap.c
+++ b/keyboards/percent/booster/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/percent/booster/keymaps/via/keymap.c b/keyboards/percent/booster/keymaps/via/keymap.c
index cc2efa322d..764cf0a3d3 100644
--- a/keyboards/percent/booster/keymaps/via/keymap.c
+++ b/keyboards/percent/booster/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index d25501b5e2..68af832d7c 100644
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  
   [_F2] = LAYOUT(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PAUS,    \
-      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SLCK,  KC_PAUS, KC_BSLS,  KC_SLCK, \
+      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SCRL,  KC_PAUS, KC_BSLS,  KC_SCRL, \
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,   \
       KC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSPC, KC_PGUP,  KC_TRNS,       \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDN,  KC_END)
diff --git a/keyboards/percent/canoe/keymaps/default/keymap.c b/keyboards/percent/canoe/keymaps/default/keymap.c
index bdd48b928a..669527698a 100644
--- a/keyboards/percent/canoe/keymaps/default/keymap.c
+++ b/keyboards/percent/canoe/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = 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_PAUS,
-      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT,   KC_PSCR, KC_SLCK,  KC_PAUS, KC_BSLS,  KC_SLCK,
+      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT,   KC_PSCR, KC_SCRL,  KC_PAUS, KC_BSLS,  KC_SCRL,
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,
       KC_LSFT,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSFT, KC_PGUP,  KC_END,
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDN,  KC_END)
diff --git a/keyboards/percent/canoe/keymaps/via/keymap.c b/keyboards/percent/canoe/keymaps/via/keymap.c
index dbc1b88641..8b8f09c0f8 100644
--- a/keyboards/percent/canoe/keymaps/via/keymap.c
+++ b/keyboards/percent/canoe/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [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_PAUS,
-      KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS,  QK_BOOT,   KC_PSCR, KC_SLCK, KC_PAUS, KC_BSLS, KC_SLCK,
+      KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS,  QK_BOOT,   KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL,
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, KC_TRNS, KC_TRNS, KC_F14,  KC_F15,  KC_INS,           KC_HOME,
       KC_LSFT,          KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_END,
       KC_LCTL, KC_LGUI, KC_LALT,                            KC_TRNS,                   KC_RALT, KC_TRNS,          KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/percent/skog/keymaps/default/keymap.c b/keyboards/percent/skog/keymaps/default/keymap.c
index 282ce39a50..6f5f6d36cb 100644
--- a/keyboards/percent/skog/keymaps/default/keymap.c
+++ b/keyboards/percent/skog/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_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,
diff --git a/keyboards/percent/skog_lite/keymaps/default/keymap.c b/keyboards/percent/skog_lite/keymaps/default/keymap.c
index 10519dbc01..a0856a037f 100644
--- a/keyboards/percent/skog_lite/keymaps/default/keymap.c
+++ b/keyboards/percent/skog_lite/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK,KC_PAUS,
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_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,
diff --git a/keyboards/percent/skog_lite/keymaps/via/keymap.c b/keyboards/percent/skog_lite/keymaps/via/keymap.c
index cfb3b61dfd..194296cc59 100644
--- a/keyboards/percent/skog_lite/keymaps/via/keymap.c
+++ b/keyboards/percent/skog_lite/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK,KC_PAUS, 
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_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,                          
diff --git a/keyboards/phantom/keymaps/default/keymap.c b/keyboards/phantom/keymaps/default/keymap.c
index 0871827b2f..71a92cd8db 100644
--- a/keyboards/phantom/keymaps/default/keymap.c
+++ b/keyboards/phantom/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/phantom/keymaps/iso_uk/keymap.c b/keyboards/phantom/keymaps/iso_uk/keymap.c
index 0230ccb783..d99bb18946 100644
--- a/keyboards/phantom/keymaps/iso_uk/keymap.c
+++ b/keyboards/phantom/keymaps/iso_uk/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,               KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/phantom/keymaps/rgbmod/keymap.c b/keyboards/phantom/keymaps/rgbmod/keymap.c
index cbddcebeb3..5cbb4942d2 100644
--- a/keyboards/phantom/keymaps/rgbmod/keymap.c
+++ b/keyboards/phantom/keymaps/rgbmod/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/phrygian/ph100/keymaps/default/keymap.c b/keyboards/phrygian/ph100/keymaps/default/keymap.c
index 0350aec538..75b93783d1 100644
--- a/keyboards/phrygian/ph100/keymaps/default/keymap.c
+++ b/keyboards/phrygian/ph100/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 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_PGUP, 
-    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,      KC_BSPC,   KC_DEL, KC_PGDN,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,      KC_BSPC,   KC_DEL, KC_PGDN,     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_HOME, KC_END,     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, 
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
index b020ba61f9..06ea26ca3f 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker_doublebs(
         KC_GRV,  KC_F1,   KC_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_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
         QK_BOOT, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c
index adac40fe59..c241f4a3ee 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_INS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c
index a373967e9f..21e51c0726 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = 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,  KC_DEL,  KC_INS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
index 41d5587ac1..707ede3d68 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_iso_blocker_doublebs(
         KC_GRV,  KC_F1,   KC_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_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUHS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c
index e12366b5e0..bedc9fb5da 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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_INS,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
         QK_BOOT,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/pjb/eros/keymaps/default/keymap.c b/keyboards/pjb/eros/keymaps/default/keymap.c
index fbc43c1d36..2529e0b5c9 100644
--- a/keyboards/pjb/eros/keymaps/default/keymap.c
+++ b/keyboards/pjb/eros/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
-  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_F13,   KC_PSCR,KC_SLCK,KC_PAUS,
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_F13,   KC_PSCR,KC_SCRL,KC_PAUS,
   KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS ,KC_HOME,KC_PGUP,
   KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL ,KC_END ,KC_PGDN,
   KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT, KC_BSLS, KC_ENT,
diff --git a/keyboards/pjb/eros/keymaps/via/keymap.c b/keyboards/pjb/eros/keymaps/via/keymap.c
index a06488d179..39633d7e54 100644
--- a/keyboards/pjb/eros/keymaps/via/keymap.c
+++ b/keyboards/pjb/eros/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
-  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_F13,   KC_PSCR,KC_SLCK,KC_PAUS,
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_F13,   KC_PSCR,KC_SCRL,KC_PAUS,
   KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS ,KC_HOME,KC_PGUP,
   KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL ,KC_END ,KC_PGDN,
   KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT, KC_BSLS, KC_ENT,
diff --git a/keyboards/planck/keymaps/andylikescandy/keymap.c b/keyboards/planck/keymaps/andylikescandy/keymap.c
index 2430ee4ac6..367287423c 100644
--- a/keyboards/planck/keymaps/andylikescandy/keymap.c
+++ b/keyboards/planck/keymaps/andylikescandy/keymap.c
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   QK_BOOT,             XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
   LALT(LCTL(KC_DEL)),  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,
-  KC_CAPS,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX,
+  KC_CAPS,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX,
   _______,             _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK, XXXXXXX  //PLOVER
 ),
 /* Navigation
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index 2647880705..c93286cad0 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -227,7 +227,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT_planck_grid( /* FUNCTION */
   KC_TRNS, MTLCTL_F9, MTLSFT_F10, MTLALT_F11, KC_F12,  KC_MYCM, KC_CALC, KC_HOME, KC_UP,        KC_END,  KC_PSCR,   KC_DEL,
-  KC_TRNS, KC_F5,     KC_F6,      KC_F7,      KC_F8,   DESKTL,  DESKTR,  KC_LEFT, KC_DOWN,      KC_RGHT, KC_SLCK,   KC_CAPS,
+  KC_TRNS, KC_F5,     KC_F6,      KC_F7,      KC_F8,   DESKTL,  DESKTR,  KC_LEFT, KC_DOWN,      KC_RGHT, KC_SCRL,   KC_CAPS,
   KC_TRNS, KC_F1,     KC_F2,      KC_F3,      KC_F4,   ALT_TAB, MICMUTE, KC_PGUP, LCA(KC_DOWN), KC_PGDN, KC_PAUSE, KC_INS,
   KC_NO,   KC_NO,     KC_NO,      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MTLALT_NXT,   KC_NO,   KC_NO,    KC_NO
 ),
diff --git a/keyboards/planck/keymaps/atreus/keymap.c b/keyboards/planck/keymaps/atreus/keymap.c
index f89b6fecde..6fd8c39804 100644
--- a/keyboards/planck/keymaps/atreus/keymap.c
+++ b/keyboards/planck/keymaps/atreus/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [2] = LAYOUT_ortho_4x12(
-    KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_NO, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11, KC_NO, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12, KC_NO, KC_VOLD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), KC_PSCR, KC_SLCK, KC_MPLY)
+    KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_NO, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11, KC_NO, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12, KC_NO, KC_VOLD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), KC_PSCR, KC_SCRL, KC_MPLY)
 };
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/bone2planck/keymap.c b/keyboards/planck/keymaps/bone2planck/keymap.c
index 22bd50b297..6e84ca796a 100644
--- a/keyboards/planck/keymaps/bone2planck/keymap.c
+++ b/keyboards/planck/keymaps/bone2planck/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-----------------------------------------------------------------------------------'
 */
 [4] = LAYOUT_planck_grid(
-     XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8,   KC_F9,   KC_F12,  XXXXXXX ,
+     XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8,   KC_F9,   KC_F12,  XXXXXXX ,
      KC_TAB,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, DE_SUP3, KC_F4, KC_F5,   KC_F6,   KC_F11,  KC_ENT  ,
      _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, DE_SUP2, KC_F1, KC_F2,   KC_F3,   KC_F10,  _______ ,
      _______, _______, _______, _______, MO(5),   _______, _______, MO(5), _______, _______, _______, _______
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-----------------------------------------------------------------------------------'
 */
 [5] = LAYOUT_planck_grid(
-     XXXXXXX, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F12,  XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX ,
+     XXXXXXX, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F12,  XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX ,
      _______, DE_SUP3, KC_F4,   KC_F5,   KC_F6,   KC_F11,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______ ,
      _______, DE_SUP2, KC_F1,   KC_F2,   KC_F3,   KC_F10,  XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, _______ ,
      _______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
index 074c33e453..366aff6e1c 100644
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ b/keyboards/planck/keymaps/buhearns/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [3] = LAYOUT_planck_grid(
-  KC_TRNS, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS,  KC_DEL,
+  KC_TRNS, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS,  KC_DEL,
   KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_PGUP, KC_MS_U, KC_PGDN,  KC_TRNS,
   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R,  KC_HOME,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_BTN3,  KC_END
diff --git a/keyboards/planck/keymaps/deft/keymap.c b/keyboards/planck/keymaps/deft/keymap.c
index e90f267029..b3f670a336 100644
--- a/keyboards/planck/keymaps/deft/keymap.c
+++ b/keyboards/planck/keymaps/deft/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT_planck_grid(
      KC_DEL, A(KC_1), A(KC_2), A(KC_3), A(KC_4), S(KC_9), S(KC_0),   KC_P7,   KC_P8,   KC_P9,   KC_P0, _______,
-    _______,  KC_GRV,KC_BSLS,KC_EQL, KC_MINS,S(KC_COMM),S(KC_DOT),   KC_P4,   KC_P5,   KC_P6, KC_PDOT, KC_NLCK,
+    _______,  KC_GRV,KC_BSLS,KC_EQL, KC_MINS,S(KC_COMM),S(KC_DOT),   KC_P4,   KC_P5,   KC_P6, KC_PDOT, KC_NUM,
     _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_LBRC, KC_RBRC,   KC_P1,   KC_P2,   KC_P3, KC_PGUP, KC_PEQL,
     _______, _______, _______, C(KC_V), _______, _______, _______, _______, KC_PENT, KC_HOME,KC_PGDN,  KC_END
 ),
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
index 70da39e82c..15562a537a 100644
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_NUMPAD] = LAYOUT_planck_grid(
     QWERTY,  XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS,  KC_P7,  KC_P8,   KC_P9,   KC_PMNS,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST,  KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
-    _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC,  KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+    _______, KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC,  KC_P1,  KC_P2,   KC_P3,   KC_PENT,
     _______, _______, _______, _______, _______, _______, _______, _______,  KC_P0,  KC_PDOT, KC_PCMM, KC_PEQL
 ),
 
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index 558d820cfd..ee5233c5d0 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -93,7 +93,7 @@ LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,
  */
 [_NUMPD] = LAYOUT_planck_grid(
  SFT_T(KC_PASTE),KC_P7,   KC_P8, KC_P9,  DE_SLSH, _______, _______, _______, _______, _______, _______,  _______,
-    KC_NLCK,    KC_P4,   KC_P5, KC_P6,  DE_MINS, _______, _______, _______, _______, _______, _______,  _______,
+    KC_NUM,     KC_P4,   KC_P5, KC_P6,  DE_MINS, _______, _______, _______, _______, _______, _______,  _______,
     _______,    KC_P1,   KC_P2, KC_P3,  DE_PLUS, _______, _______, _______, _______, _______, _______,  _______,
  CTL_T(KC_COPY),KC_DOT,  KC_P0, KC_COMM, NUMPD,  KC_ENT,  KC_ENT,  _______, _______, _______, _______,  _______
 ),
diff --git a/keyboards/planck/keymaps/dzobert/keymap.c b/keyboards/planck/keymaps/dzobert/keymap.c
index b27476ff09..2ae760244a 100644
--- a/keyboards/planck/keymaps/dzobert/keymap.c
+++ b/keyboards/planck/keymaps/dzobert/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_HOME, KC_PGUP, KC_PGDN, KC_END
 ),
 [3] = LAYOUT_planck_grid( /* LOWER */
-  KC_PWR,  KC_PSCR, KC_SLCK, KC_PAUSE, KC_NLCK, KC_EXECUTE, KC_MENU,   KC_APP,  KC_7,  KC_8, KC_9, KC_KP_SLASH,
+  KC_PWR,  KC_PSCR, KC_SCRL, KC_PAUSE, KC_NUM, KC_EXECUTE, KC_MENU,   KC_APP,  KC_7,  KC_8, KC_9, KC_KP_SLASH,
   KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_CAPS, KC_CANCEL, KC_UNDO, KC_AGAIN, KC_4,  KC_5, KC_6, KC_KP_ASTERISK,
   KC_TRNS, KC_INSERT,KC_CUT,   KC_COPY,   KC_PASTE,   KC_BSLS,   KC_9,   KC_0,   KC_1,   KC_2,   KC_3,  KC_KP_MINUS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_0, KC_KP_DOT, KC_KP_ENTER, KC_KP_PLUS
diff --git a/keyboards/planck/keymaps/eshesh2/keymap.c b/keyboards/planck/keymaps/eshesh2/keymap.c
index 1e958ca4e7..55c20236d3 100644
--- a/keyboards/planck/keymaps/eshesh2/keymap.c
+++ b/keyboards/planck/keymaps/eshesh2/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX, XXXXXXX,    KC_NLCK, KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_BSPC,
+    XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX, XXXXXXX,    KC_NUM,  KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_BSPC,
     XXXXXXX, KC_LEFT, KC_DOWN,  KC_UP,     KC_RIGHT,   XXXXXXX, XXXXXXX,    XXXXXXX, KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_ENTER,
     XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_TAB,
     EXT_NUM, XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, KC_KP_DOT,  KC_KP_0,    XXXXXXX,    XXXXXXX
diff --git a/keyboards/planck/keymaps/grahampheath/keymap.c b/keyboards/planck/keymaps/grahampheath/keymap.c
index d4c7c76deb..02b082a74a 100644
--- a/keyboards/planck/keymaps/grahampheath/keymap.c
+++ b/keyboards/planck/keymaps/grahampheath/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   HYPR_0,  _______, WINK,    _______, _______,  TOUNGE,  _______, _______, CRY,     FLIP,    _______, _______,
   HYPR_1,  ABOVE,   SHRUG,   _______, FROWN,    _______, HEART,   JOY,     _______, LLAP,    _______, _______,
   HYPR_2,  _______, _______, _______, CONFUSED, _______, _______, GRIN,    SHIT,    _______, _______, _______,
-  _______, _______, _______, _______, KC_SLCK,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT
+  _______, _______, _______, _______, KC_SCRL,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT
 ),
 
 
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index ba36f2a5da..ce09feb141 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -130,8 +130,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [LY_1101] = LAYOUT_gunp(
   SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT,
   KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DEBUG,
-  KC_SLEP,   KC_NLCK,    DM_REC1,      DM_PLY1,    XXXXXXX,       EEP_RST,
-  KC_PWR,    KC_SLCK,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
+  KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EEP_RST,
+  KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
 ),
 [LY_1111] = LAYOUT_gunp(
   KC_ACL1,   KC_ACL0,    KC_WH_L,      KC_MS_U,    KC_WH_R,       KC_WH_U,
diff --git a/keyboards/planck/keymaps/impossible/keymap.c b/keyboards/planck/keymaps/impossible/keymap.c
index 9553c23061..72c4da3791 100644
--- a/keyboards/planck/keymaps/impossible/keymap.c
+++ b/keyboards/planck/keymaps/impossible/keymap.c
@@ -133,8 +133,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJ] = LAYOUT_planck_grid(
   _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_PSCR, KC_PAUSE, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, KC_CAPS, MUV_IN,  AU_TOG,  MI_OFF,   _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_SLCK, MUV_DE,  MU_TOG,  MI_ON,    _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_NLCK, WORKMAN, QWERTY,  PLOVER,   _______
+  _______, _______, _______, _______, _______, _______, _______, KC_SCRL, MUV_DE,  MU_TOG,  MI_ON,    _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_NUM,  WORKMAN, QWERTY,  PLOVER,   _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c
index 2a01b57520..ef642c8e5a 100644
--- a/keyboards/planck/keymaps/ishtob/keymap.c
+++ b/keyboards/planck/keymaps/ishtob/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,    KC_PLUS,  KC_BSLS,
   _______, KC_A,    KC_UP,   KC_D,    KC_PSCR,  KC_VOLU, KC_4,    KC_5,    KC_6,    KC_PAST, KC_COLN, KC_QUOT,
   _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_MUTE, KC_VOLD, KC_1,    KC_2,    KC_3,    KC_UP, KC_SLSH,   _______,
-  _______, _______, _______, _______, _______, KC_SPC,  KC_0,   _______,  KC_LEFT, KC_DOWN, KC_RIGHT,   KC_NLCK
+  _______, _______, _______, _______, _______, KC_SPC,  KC_0,   _______,  KC_LEFT, KC_DOWN, KC_RIGHT,   KC_NUM
 ),
  
 /* Plover layer (http://opensteno.org)
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_Q,    KC_UP,   KC_H,     XXXXXXX, XXXXXXX,  KC_P7,   KC_P8,  KC_P9,   KC_MINS,   KC_PLUS,  KC_BSPC,
   _______, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX,  KC_P4,  KC_P5,  KC_P6,   KC_PAST, KC_COLN,  KC_ENT,
   _______, KC_Z,    KC_X,    KC_C,     KC_V,    XXXXXXX,  KC_P1,  KC_P2,  KC_P3,   KC_PDOT, KC_PSLS,  _______,
-  _______, _______, _______, _______, _______, _______,   KC_P0,  KC_PDOT, _______, _______, KC_NLCK, KC_MPLY
+  _______, _______, _______, _______, _______, _______,   KC_P0,  KC_PDOT, _______, _______, KC_NUM,  KC_MPLY
 ),
  
 /* Mouse Layer (semi-col)
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
index 1825cec36f..375405b7b6 100644
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ b/keyboards/planck/keymaps/jweickm/keymap.c
@@ -263,7 +263,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_NUM] = LAYOUT_planck_grid(
-        KC_F1, KC_F2,  KC_F3,  KC_F4, KC_MPRV, KC_NLCK, KC_MNXT, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, 
+        KC_F1, KC_F2,  KC_F3,  KC_F4, KC_MPRV, KC_NUM,  KC_MNXT, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, 
         KC_F5, KC_F6,  KC_F7,  KC_F8, KC_VOLU, KC_MPLY, KC_ASTR, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_DOT, 
         KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLD, KC_MUTE, KC_EQL, KC_P1, KC_P2, KC_P3, KC_SLSH, KC_COMM, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_DOT, KC_COMM, KC_EQL, KC_TRNS
diff --git a/keyboards/planck/keymaps/lae3/keymap.c b/keyboards/planck/keymaps/lae3/keymap.c
index 1b5bbfd10e..87845b0f32 100644
--- a/keyboards/planck/keymaps/lae3/keymap.c
+++ b/keyboards/planck/keymaps/lae3/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_NUMPAD] = LAYOUT_planck_grid(
-        _______, _______, _______, _______, _______, _______, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______,
+        _______, _______, _______, _______, _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______,
         _______, _______, _______, _______, _______, _______, KC_PENT, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______,
         _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PPLS, _______
diff --git a/keyboards/planck/keymaps/mason/keymap.c b/keyboards/planck/keymaps/mason/keymap.c
index 2baa863706..82ddaa650e 100644
--- a/keyboards/planck/keymaps/mason/keymap.c
+++ b/keyboards/planck/keymaps/mason/keymap.c
@@ -63,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_RAISE] = LAYOUT_planck_grid(
     _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    _______, KC_DEL,  KC_END,  KC_PGDN, KC_NLCK, _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______,
+    _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+    _______, KC_DEL,  KC_END,  KC_PGDN, KC_NUM,  _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
   ),
 
diff --git a/keyboards/planck/keymaps/neo2planck/keymap.c b/keyboards/planck/keymaps/neo2planck/keymap.c
index 9684dd19d0..3650152033 100644
--- a/keyboards/planck/keymaps/neo2planck/keymap.c
+++ b/keyboards/planck/keymaps/neo2planck/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-----------------------------------------------------------------------------------'
 */
 [3] = LAYOUT_planck_grid(
-     XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8,    KC_F9,   KC_F12,  XXXXXXX ,
+     XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8,    KC_F9,   KC_F12,  XXXXXXX ,
      KC_TAB,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, DE_SUP3, KC_F4, KC_F5,    KC_F6,   KC_F11,  KC_ENT  ,
      _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, DE_SUP2,  KC_F1, KC_F2,    KC_F3,   KC_F10,  _______ ,
      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/orthodeluxe/keymap.c b/keyboards/planck/keymaps/orthodeluxe/keymap.c
index c1da44e970..eac939531a 100644
--- a/keyboards/planck/keymaps/orthodeluxe/keymap.c
+++ b/keyboards/planck/keymaps/orthodeluxe/keymap.c
@@ -215,8 +215,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_UTILSLAYER] = LAYOUT_planck_grid(
     _______, XXXXXXX, WINDOWS, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PAUS, _______,
-    _______, XXXXXXX, KC_SLCK, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    _______, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, XXXXXXX, KC_NLCK, MACOS,   XXXXXXX, XXXXXXX, XXXXXXX, _______,
+    _______, XXXXXXX, KC_SCRL, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+    _______, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, XXXXXXX, KC_NUM,  MACOS,   XXXXXXX, XXXXXXX, XXXXXXX, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
diff --git a/keyboards/planck/keymaps/paget/keymap.c b/keyboards/planck/keymaps/paget/keymap.c
index 599380ea37..3e5c39ce01 100755
--- a/keyboards/planck/keymaps/paget/keymap.c
+++ b/keyboards/planck/keymaps/paget/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT_planck_grid(
     KC_F1,   KC_F2, KC_F3, KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_CAPS, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,
+    KC_CAPS, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,
     KC_TRNS, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
     KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_NO
 )
diff --git a/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h b/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h
index bad7a11615..431083fa08 100644
--- a/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h
+++ b/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h
@@ -40,7 +40,7 @@
 #define qgmlwb_lower_map LAYOUT_ortho_4x12(\
     KC_EXLM, KC_PERC, KC_LBRC, KC_LCBR, KC_LPRN, KC_LT,   KC_GT,   KC_RPRN, KC_RCBR, KC_RBRC, KC_AMPR, _______,\
     KC_DEL,  KC_MUTE, XXXXXXX, KC_WREF, XXXXXXX, XXXXXXX, XXXXXXX, KC_EQL,  KC_PLUS, KC_ASTR, KC_SLSH, KC_TILD,\
-    _______, KC_SLEP, KC_SLCK, KC_CAPS, KC_NLCK, KC_PSCR, KC_INS,  KC_END,  KC_HOME, KC_AE,   KC_OE,   KC_AA,\
+    _______, KC_SLEP, KC_SCRL, KC_CAPS, KC_NUM,  KC_PSCR, KC_INS,  KC_END,  KC_HOME, KC_AE,   KC_OE,   KC_AA,\
     _______, _______, _______, _______, _______, _______, _______, adjust,  KC_BRID, KC_VOLD, KC_VOLU, KC_BRIU\
 )
 
diff --git a/keyboards/planck/keymaps/ptillemans/keymap.c b/keyboards/planck/keymaps/ptillemans/keymap.c
index 025dbc5e55..abfecfe0ce 100644
--- a/keyboards/planck/keymaps/ptillemans/keymap.c
+++ b/keyboards/planck/keymaps/ptillemans/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS, KC_HOME,    KC_UP,  KC_END, KC_PGUP, KC_PERC, KC_CIRC, KC_AMPR,   KC_F7,   KC_F8,   KC_F9,  KC_F10,
     KC_DEL, KC_LEFT,  KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______,   KC_F4,   KC_F5,   KC_F6,  KC_F11,
     _______, KC_VOLU, _______, _______, _______, _______, _______, KC_TILD,   KC_F1,   KC_F2,   KC_F3,  KC_F12,
-    _______, KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______,  TO(_QWERTY), KC_PSCR, KC_SLCK, KC_MPLY
+    _______, KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______,  TO(_QWERTY), KC_PSCR, KC_SCRL, KC_MPLY
 ),
 
 /* Raise
diff --git a/keyboards/planck/keymaps/sean/keymap.c b/keyboards/planck/keymaps/sean/keymap.c
index 4225ebb528..42847b646c 100644
--- a/keyboards/planck/keymaps/sean/keymap.c
+++ b/keyboards/planck/keymaps/sean/keymap.c
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NMPD] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PENT, KC_P4,   KC_P5,   KC_P6,   KC_PAST,
     TO(_DVRK),TO(_NMPD),TO(_MVMT),SDRK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PPLS
diff --git a/keyboards/planck/keymaps/tong92/keymap.c b/keyboards/planck/keymaps/tong92/keymap.c
index cf535d6c8c..5254985441 100644
--- a/keyboards/planck/keymaps/tong92/keymap.c
+++ b/keyboards/planck/keymaps/tong92/keymap.c
@@ -109,7 +109,7 @@ XXXXXXX,_______,_______,_______,_______,KC_SPC, KC_SPC, _______,KC_END, KC_LEFT,
 [_WINDOW_SHORTCUT] = LAYOUT_planck_grid(
 KC_ESC ,LALT(KC_F4)        ,LGUI(KC_UP)         ,XXXXXXX          ,XXXXXXX    ,S(KC_CAPS)   ,XXXXXXX,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_DEL,
 _______,LGUI(KC_LEFT)      ,LGUI(KC_DOWN)       ,LGUI(KC_RIGHT)   ,XXXXXXX    ,LALT(KC_CAPS),KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX,
-_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX          ,XXXXXXX    ,LCTL(KC_CAPS),KC_SLCK,KC_HOME,XXXXXXX,KC_END,XXXXXXX,XXXXXXX,
+_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX          ,XXXXXXX    ,LCTL(KC_CAPS),KC_SCRL,KC_HOME,XXXXXXX,KC_END,XXXXXXX,XXXXXXX,
 KC_TRNS,LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)),LGUI(LCTL(KC_F4)),LCTL(LALT(KC_DEL)),LGUI(KC_SPC),LGUI(KC_SPC),XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,BACKLIT
 ),
 /* Mac Shortcut
diff --git a/keyboards/planck/keymaps/vaire/keymap.c b/keyboards/planck/keymaps/vaire/keymap.c
index 4efeec1b03..fb2f3c1770 100644
--- a/keyboards/planck/keymaps/vaire/keymap.c
+++ b/keyboards/planck/keymaps/vaire/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MO(1),      KC_LCTL,    	KC_LALT,        KC_LGUI,        MO(2),          LT(5,KC_ENT),   LT(4,KC_SPC), 	MO(3),      	KC_SLSH,    	KC_LEFT,        KC_DOWN,        CTL_T(KC_RGHT)),
 
   LAYOUT_planck_grid(
-    KC_ESC,     KC_NLCK,    	LCTL(KC_SPC),   KC_UP,          LSFT(KC_SPC),   KC_DLR,         KC_EQL,     	KC_P7,      	KC_P8,      	KC_P9,          KC_PPLS,        LCTL(KC_BSPC), 
+    KC_ESC,     KC_NUM,     	LCTL(KC_SPC),   KC_UP,          LSFT(KC_SPC),   KC_DLR,         KC_EQL,     	KC_P7,      	KC_P8,      	KC_P9,          KC_PPLS,        LCTL(KC_BSPC), 
     KC_TAB,     FIND,       	KC_LEFT,        KC_DOWN,        KC_RGHT,        KC_PERC,        KC_CIRC,    	KC_P4,      	KC_P5,      	KC_P6,          KC_PMNS,        KC_BSLS, 
     KC_LSFT,    UNDO,       	CUT,            COPY,           PASTE,          EXCEL_HOME,     KC_PSCR,    	KC_P1,      	KC_P2,      	KC_P3,          KC_PSLS,        KC_LSFT, 
     KC_TRNS, 	KC_LCTL,    	KC_LALT,        KC_LGUI,        TO(1),          KC_ENT,         KC_SPC,     	KC_PENT,    	KC_P0,      	KC_PDOT,        KC_PAST,        KC_LCTL),
diff --git a/keyboards/planck/keymaps/vifon/keymap.c b/keyboards/planck/keymaps/vifon/keymap.c
index 9f4ee9d213..6d6d11020d 100644
--- a/keyboards/planck/keymaps/vifon/keymap.c
+++ b/keyboards/planck/keymaps/vifon/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [_DYN] = LAYOUT_planck_mit( /* special */
         KM_HOLD,  DYN_REC_START1, DYN_MACRO_PLAY1, _______, _______,    _______, _______, KC_APP,  KC_INS,  _______, KC_PSCR, KC_PAUS,
-        KC_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SLCK, KC_NLCK,
+        KC_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
         KM_SHLK,  _______,        _______,         _______, _______,    _______, _______, _______, _______, _______, _______, _______,
         _______,  _______,        _______,         _______, KM_PP_GAME,      DF(_QW),     DF(_PP), _______, _______, _______, _______
         ),
diff --git a/keyboards/planck/keymaps/yttyx/keymap.c b/keyboards/planck/keymaps/yttyx/keymap.c
index fa2a95a89e..8c989da8a8 100644
--- a/keyboards/planck/keymaps/yttyx/keymap.c
+++ b/keyboards/planck/keymaps/yttyx/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FC] = LAYOUT_planck_grid(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX, XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX,
     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX,
-    _______, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_PSCR, KC_BRK,  KC_SLCK, KC_CAPS, XXXXXXX,
+    _______, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_PSCR, KC_BRK,  KC_SCRL, KC_CAPS, XXXXXXX,
     _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, XXXXXXX
   ),
 
diff --git a/keyboards/planck/keymaps/zach/keymap.c b/keyboards/planck/keymaps/zach/keymap.c
index f4a79e0108..50da3e3b2a 100644
--- a/keyboards/planck/keymaps/zach/keymap.c
+++ b/keyboards/planck/keymaps/zach/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_planck_grid( /* ADJUST - Macros, Layer Switching, Function Keys */
-  UNIWIN,  XXXXXXX, XXXXXXX, PENGY,   DUCK,    KC_INS,  KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX,
+  UNIWIN,  XXXXXXX, XXXXXXX, PENGY,   DUCK,    KC_INS,  KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX,
   UNILIN,  XXXXXXX, XXXXXXX, RANDIG,  RANDIG,  SWCOLE,  COLEMAK, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX,
   _______, CADKEY,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
   _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/playkbtw/ca66/keymaps/default/keymap.c b/keyboards/playkbtw/ca66/keymaps/default/keymap.c
index f0a39239c1..a723e2fb4d 100644
--- a/keyboards/playkbtw/ca66/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
     KC_GRV,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL, RGB_TOG,
-    KC_CAPS,          KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,         RGB_MOD, 
+    KC_CAPS,          KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,         RGB_MOD, 
     KC_TRNS,          KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI,          KC_INS,          KC_HOME, 
     KC_LSFT, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_HUI,                  KC_END,  
     KC_LCTL,          KC_LGUI, KC_LALT,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI),
diff --git a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
index 5dcd0f8a1b..9b441a8892 100644
--- a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
 	KC_PWR,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, QK_BOOT,
-    KC_CAPS,          RGB_RMOD,RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_TOG, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,         KC_TRNS,
+    KC_CAPS,          RGB_RMOD,RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_TOG, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,         KC_TRNS,
     KC_TRNS,          KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_TRNS,         KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,                  KC_TRNS,
 	KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
index f4db24f90f..d759357b84 100644
--- a/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
     KC_GRV,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_DEL,  KC_DEL, RGB_TOG,
-    KC_CAPS,          KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PSCR,  KC_SLCK,  KC_PAUS, KC_TRNS,         RGB_MOD,
+    KC_CAPS,          KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PSCR,  KC_SCRL,  KC_PAUS, KC_TRNS,         RGB_MOD,
     KC_TRNS,          KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD,  RGB_VAI,           KC_INS,          KC_HOME,
     KC_LSFT, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,  KC_TRNS,  RGB_HUI,                  KC_END,
     KC_NO,            KC_TRNS, KC_TRNS,          KC_NO,            KC_TRNS,          KC_NO,   KC_TRNS, KC_TRNS,  RGB_SAD,  RGB_HUD, RGB_SAI),
diff --git a/keyboards/playkbtw/helen80/keymaps/default/keymap.c b/keyboards/playkbtw/helen80/keymaps/default/keymap.c
index 6be85c14b2..345943c1e4 100644
--- a/keyboards/playkbtw/helen80/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/helen80/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum _layer {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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,
diff --git a/keyboards/playkbtw/helen80/keymaps/via/keymap.c b/keyboards/playkbtw/helen80/keymaps/via/keymap.c
index 6be85c14b2..345943c1e4 100644
--- a/keyboards/playkbtw/helen80/keymaps/via/keymap.c
+++ b/keyboards/playkbtw/helen80/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum _layer {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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,
diff --git a/keyboards/playkbtw/pk60/keymaps/default/keymap.c b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
index fc9379977d..65d3996a85 100644
--- a/keyboards/playkbtw/pk60/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_all(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
     QK_BOOT,   _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PSCR, KC_CALC,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_SLCK, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_SCRL, _______,
     _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______
   ),
diff --git a/keyboards/plywrks/ahgase/keymaps/default/keymap.c b/keyboards/plywrks/ahgase/keymaps/default/keymap.c
index 7cc1e671e7..2be0a037a6 100644
--- a/keyboards/plywrks/ahgase/keymaps/default/keymap.c
+++ b/keyboards/plywrks/ahgase/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/plywrks/ahgase/keymaps/iso/keymap.c b/keyboards/plywrks/ahgase/keymaps/iso/keymap.c
index dde342a7e2..ae8ee3c20d 100644
--- a/keyboards/plywrks/ahgase/keymaps/iso/keymap.c
+++ b/keyboards/plywrks/ahgase/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_iso(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/plywrks/ahgase/keymaps/via/keymap.c b/keyboards/plywrks/ahgase/keymaps/via/keymap.c
index c12bec59a6..787c431ae5 100644
--- a/keyboards/plywrks/ahgase/keymaps/via/keymap.c
+++ b/keyboards/plywrks/ahgase/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/poker87c/keymaps/default/keymap.c b/keyboards/poker87c/keymaps/default/keymap.c
index c46dd4c6af..f6a888d713 100644
--- a/keyboards/poker87c/keymaps/default/keymap.c
+++ b/keyboards/poker87c/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_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,
diff --git a/keyboards/poker87c/keymaps/via/keymap.c b/keyboards/poker87c/keymaps/via/keymap.c
index 26bcbf1353..65a4f15263 100644
--- a/keyboards/poker87c/keymaps/via/keymap.c
+++ b/keyboards/poker87c/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_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,
diff --git a/keyboards/poker87d/keymaps/default/keymap.c b/keyboards/poker87d/keymaps/default/keymap.c
index 2ecb85bbca..3e94fff821 100644
--- a/keyboards/poker87d/keymaps/default/keymap.c
+++ b/keyboards/poker87d/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  _______, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                      KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/poker87d/keymaps/via/keymap.c b/keyboards/poker87d/keymaps/via/keymap.c
index 2afb2be404..8e96efee49 100644
--- a/keyboards/poker87d/keymaps/via/keymap.c
+++ b/keyboards/poker87d/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  _______, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                      KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/polilla/rev1/keymaps/default/keymap.c b/keyboards/polilla/rev1/keymaps/default/keymap.c
index de0385e765..307c3552e8 100644
--- a/keyboards/polilla/rev1/keymaps/default/keymap.c
+++ b/keyboards/polilla/rev1/keymaps/default/keymap.c
@@ -97,6 +97,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX, KC_PGUP, PRE_WRD, KC_UP,   NXT_WRD, XXXXXXX,                   XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, KC_F12,
     KC_DEL,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,                    KC_PPLS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, XXXXXXX,  
     _______, KC_PGDN, PRE_WDL, KC_INS,  NXT_WDL, XXXXXXX, _______, KC_PENT, KC_PAST, KC_P1,   KC_P2,   KC_P3,   KC_PSLS, _______,
-             _______, _______, _______, _______, _______,                   _______, KC_P0,   _______, _______, KC_NLCK
+             _______, _______, _______, _______, _______,                   _______, KC_P0,   _______, _______, KC_NUM
   )
 };
diff --git a/keyboards/polilla/rev1/keymaps/via/keymap.c b/keyboards/polilla/rev1/keymaps/via/keymap.c
index 8f4558b333..3725107354 100644
--- a/keyboards/polilla/rev1/keymaps/via/keymap.c
+++ b/keyboards/polilla/rev1/keymaps/via/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX, KC_PGUP, PRE_WRD, KC_UP,   NXT_WRD, XXXXXXX,                   XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, KC_F12,
     KC_DEL,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,                    KC_PPLS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, XXXXXXX,  
     _______, KC_PGDN, PRE_WDL, KC_INS,  NXT_WDL, XXXXXXX, _______, KC_PENT, KC_PAST, KC_P1,   KC_P2,   KC_P3,   KC_PSLS, _______,
-             _______, _______, _______, _______, _______,                   _______, KC_P0,   _______, _______, KC_NLCK
+             _______, _______, _______, _______, _______,                   _______, KC_P0,   _______, _______, KC_NUM
   ),
   
   /* F3
diff --git a/keyboards/polycarbdiet/s20/keymaps/default/keymap.c b/keyboards/polycarbdiet/s20/keymaps/default/keymap.c
index 330e65b722..8abfa30438 100644
--- a/keyboards/polycarbdiet/s20/keymaps/default/keymap.c
+++ b/keyboards/polycarbdiet/s20/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P0,   KC_PDOT, MO(1),   RGB_TOG
     ),
     [1] = LAYOUT_ortho_5x4(
-        KC_NLCK, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_NUM,  KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS,
         KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS,
diff --git a/keyboards/preonic/keymaps/0xdec/keymap.c b/keyboards/preonic/keymaps/0xdec/keymap.c
index 4393ab9f69..1ceffdc1b5 100644
--- a/keyboards/preonic/keymaps/0xdec/keymap.c
+++ b/keyboards/preonic/keymaps/0xdec/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_GAME] = LAYOUT_preonic_grid( \
-  KC_ESC ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \
+  KC_ESC ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_NUM ,KC_PSLS,KC_PAST,KC_PMNS, \
   KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_P1  ,KC_P2  ,KC_P3  ,KC_PPLS, \
   KC_LCTL,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_P4  ,KC_P5  ,KC_P6  ,KC_PEQL, \
   KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_P7  ,KC_P8  ,KC_P9  ,KC_PENT, \
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_RAISE] = LAYOUT_preonic_grid( \
   KC_SLEP,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_PSCR, \
-  XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_INC ,COLEMAK,GAME   ,MU_TOG ,KC_MENU,KC_SLCK, \
+  XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_INC ,COLEMAK,GAME   ,MU_TOG ,KC_MENU,KC_SCRL, \
   KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DEC ,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_PAUS, \
   XXXXXXX,KC_WBAK,KC_WSTP,KC_WREF,KC_WFWD,KC_MUTE,BL_TOGG,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_INS,  \
   QK_BOOT,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______  \
diff --git a/keyboards/preonic/keymaps/arkag/keymap.c b/keyboards/preonic/keymaps/arkag/keymap.c
index c2a32277ed..188269298a 100644
--- a/keyboards/preonic/keymaps/arkag/keymap.c
+++ b/keyboards/preonic/keymaps/arkag/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_SYMBOL] = LAYOUT_preonic_grid(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_GRV,  KC_LPRN, KC_RPRN, KC_PLUS, KC_UNDS, KC_CIRC, KC_AMPR, KC_7,    KC_8,    KC_9,    _______, _______,
-    KC_LCBR, KC_LBRC, KC_RBRC, KC_EQL,  KC_MINS, KC_ASTR, KC_PIPE, KC_4,    KC_5,    KC_6,    _______, KC_NLCK,
+    KC_LCBR, KC_LBRC, KC_RBRC, KC_EQL,  KC_MINS, KC_ASTR, KC_PIPE, KC_4,    KC_5,    KC_6,    _______, KC_NUM,
     KC_RCBR, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_PDOT, KC_1,    KC_2,    KC_3,    KC_BSLS, KC_PENT,
     M_DASH,  KC_TILD, _______, KEEB,    _______, _______, _______, KC_0,    KC_PSLS, KC_PMNS, KC_PPLS, KC_PAST),
 
diff --git a/keyboards/preonic/keymaps/choromanski/keymap.c b/keyboards/preonic/keymaps/choromanski/keymap.c
index 5f11a9febb..0f8339662a 100644
--- a/keyboards/preonic/keymaps/choromanski/keymap.c
+++ b/keyboards/preonic/keymaps/choromanski/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_preonic_grid( \
-	KC_GRV,		_______,	_______,	KC_BTN3,	_______,	_______,	_______,	KC_NLCK,	KC_SLSH,	KC_ASTR,	KC_MINS,	KC_BSLS, \
+	KC_GRV,		_______,	_______,	KC_BTN3,	_______,	_______,	_______,	KC_NUM,	KC_SLSH,	KC_ASTR,	KC_MINS,	KC_BSLS, \
 	_______,		KC_ACL0,	KC_BTN1,	KC_MS_U,	KC_BTN2,	KC_WH_U,	_______,	KC_7,		KC_8,		KC_9,		KC_PLUS,	KC_RBRC, \
 	_______,		KC_ACL1,	KC_MS_L,	KC_MS_D,	KC_MS_R,	KC_WH_D,	_______,	KC_4,		KC_5,		KC_6,		KC_PLUS,	_______, \
 	_______,		KC_ACL2,	KC_VOLU,	KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	KC_1,		KC_2,		KC_3,		KC_ENT,		_______, \
diff --git a/keyboards/preonic/keymaps/elisiano/keymap.c b/keyboards/preonic/keymaps/elisiano/keymap.c
index 3f0a528247..6534b31d21 100644
--- a/keyboards/preonic/keymaps/elisiano/keymap.c
+++ b/keyboards/preonic/keymaps/elisiano/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_6,    KC_7,    KC_SLCK, KC_UP,   KC_PAUS,  KC_PGUP,
+  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_6,    KC_7,    KC_SCRL, KC_UP,   KC_PAUS,  KC_PGUP,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN,
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,  KC_BSLS,
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN,  _______,
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index d0152b8d74..fd0f250ec8 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -255,7 +255,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_RAISE] = LAYOUT_preonic_grid( \
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_SLCK,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_SCRL,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
         KC_TAB,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, XXXXXXX,  KC_AMPR, KC_ASTR, KC_LCBR, KC_RCBR, KC_DEL,
         KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15, XXXXXXX,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, XXXXXXX,
         _______, KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, XXXXXXX,  KC_NUHS, KC_NUBS, DYN_REC_START1,   DYN_REC_START2, DYN_REC_STOP,
@@ -319,7 +319,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_EXTRA] = LAYOUT_preonic_grid( \
-        KC_ESC,   _______,  _______,  _______,  _______,  KC_SLCK,  _______,  _______,  _______,  _______,  _______,  _______,
+        KC_ESC,   _______,  _______,  _______,  _______,  KC_SCRL,  _______,  _______,  _______,  _______,  _______,  _______,
         KC_TAB,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  DYN_REC_START1, DYN_REC_START2, DYN_REC_STOP,
@@ -340,7 +340,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_NUM] = LAYOUT_preonic_grid( \
-        KC_ESC ,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,  XXXXXXX,
+        KC_ESC ,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,  XXXXXXX,
         _______,  KC_HOME,  KC_UP,    KC_END,   KC_PGUP,  XXXXXXX,  XXXXXXX,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  XXXXXXX,
         KC_DQUO,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_PGDN,  XXXXXXX,  XXXXXXX,  KC_P4,    KC_P5,    KC_P6,    KC_PPLS,  XXXXXXX,
         _______,  KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_P1,    KC_P2,    KC_P3,    KC_PENT,  KC_BSPC,
diff --git a/keyboards/preonic/keymaps/pezhore/keymap.c b/keyboards/preonic/keymaps/pezhore/keymap.c
index 4754ad760c..059ec0e942 100644
--- a/keyboards/preonic/keymaps/pezhore/keymap.c
+++ b/keyboards/preonic/keymaps/pezhore/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_preonic_grid(
-  _______,  _______,  _______,  _______,  _______,  _______,  KC_NLCK,   KC_P7,   KC_P8,    KC_P9,    KC_PSLS,  KC_BSPC,
+  _______,  _______,  _______,  _______,  _______,  _______,  KC_NUM,    KC_P7,   KC_P8,    KC_P9,    KC_PSLS,  KC_BSPC,
   KC_ESC,   _______,  _______,  _______,  _______,  _______,  _______,   KC_P4,   KC_P5,    KC_P6,    KC_PAST,  KC_DEL,
   KC_TAB,   _______,  _______,  _______,  _______,  _______,  _______,   KC_P1,   KC_P2,    KC_P3,    KC_PMNS,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,   KC_P0,   KC_PDOT,  KC_PEQL,  KC_PPLS,  _______,
diff --git a/keyboards/preonic/keymaps/pvillano/keymap.c b/keyboards/preonic/keymaps/pvillano/keymap.c
index 5800a9490b..ff5124b076 100644
--- a/keyboards/preonic/keymaps/pvillano/keymap.c
+++ b/keyboards/preonic/keymaps/pvillano/keymap.c
@@ -94,7 +94,7 @@
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, _______, _______, KC_DEL,
       _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______, _______, _______, QK_BOOT, _______,
       _______, KC_F9,   KC_F10,  KC_F11,  KC_F12, TG(_GAME),_______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, KC_NLCK, MU_TOG,  _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, KC_NUM,  MU_TOG,  _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
   };
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
index 73c8391185..e5ea2e4655 100644
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ b/keyboards/preonic/keymaps/senseored/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FNL1] = LAYOUT_preonic_grid( \
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  TT(_FNL1), _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NLCK, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
+  TT(_FNL1), _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
   KC_LSFT,    CTLZ,    CTLX,    CTLC,    CTLV, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
   _______, _______, CTALDEL, _______, _______, _______, _______, _______, _______, _______, LSFT(KC_1), _______
 ),
@@ -143,8 +143,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FNL2] = LAYOUT_preonic_grid( \
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS, _______, KC_PSCR,  KC_INS, KC_HOME, KC_PGUP, KC_SLCK,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NLCK, _______, _______,  KC_DEL,  KC_END, KC_PGDN, KC_PAUS,
+  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS, _______, KC_PSCR,  KC_INS, KC_HOME, KC_PGUP, KC_SCRL,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  _______, _______,  KC_DEL,  KC_END, KC_PGDN, KC_PAUS,
   _______,    CTLZ,    CTLX,    CTLC,    CTLV, _______, _______, _______, _______,   KC_UP, _______, KC_ENT,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TO(_QWERTY)
 ),
@@ -207,7 +207,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FNL3] = LAYOUT_preonic_grid( \
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NLCK, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
   KC_LSFT, _______, _______, _______, _______, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LSFT(KC_1), _______
 ),
@@ -265,7 +265,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 return false;
             case DGRMCRO:
                 if(!bnumlock) {
-                    tap_code(KC_NLCK);
+                    tap_code(KC_NUM_LOCK);
                     bnumlock = true;
                 }
                 //SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P0) SS_TAP(X_P1) SS_TAP(X_P7) SS_TAP(X_P6) SS_UP(X_LALT));
@@ -273,7 +273,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 return false;
 
             if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM_LOCK);
                 bnumlock = false;
                 }
             case WRKMOD:
@@ -370,35 +370,35 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
     case _QWERTY:
         if(bnumlock) {
-            tap_code(KC_NLCK);
+            tap_code(KC_NUM_LOCK);
         }
         break;
     case _LOWER:
         if(!bnumlock) {
-            tap_code(KC_NLCK);
+            tap_code(KC_NUM_LOCK);
         }
 
         break;
     case _ADJUST:
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM_LOCK);
         }
         break;
     case _RAISE:
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM_LOCK);
         }
         break;
     case _FNL1:
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM_LOCK);
         }
         break;
     case _GAMEMODE:
         break;
     default: //  for any other layers, or the default layer
         if(bnumlock) {
-                tap_code(KC_NLCK);
+                tap_code(KC_NUM_LOCK);
         }
 
         break;
diff --git a/keyboards/preonic/keymaps/uqs/keymap.c b/keyboards/preonic/keymaps/uqs/keymap.c
index ec22890388..c94e8995ee 100644
--- a/keyboards/preonic/keymaps/uqs/keymap.c
+++ b/keyboards/preonic/keymaps/uqs/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                /* ^^^^ use these */
      KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
      KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
-     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_SCRL,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
      KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
      /*thumb*/ _______,  _______,
       /*aux*/  _______,  _______,  _______
diff --git a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
index 3ad641179a..74bde8ea64 100644
--- a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		),
 	[_FUNC] = LAYOUT(
 		QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,    KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS, KC_TRNS, KC_TRNS, 
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_TRNS, KC_TRNS, 
 		KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_RSFT, 
 		KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS,          KC_TRNS, KC_RGUI, KC_RALT, KC_RCTL
 		)
diff --git a/keyboards/primekb/prime_l/keymaps/default/keymap.c b/keyboards/primekb/prime_l/keymaps/default/keymap.c
index eb175a8444..71c654bc73 100644
--- a/keyboards/primekb/prime_l/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_l/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
 		KC_ESC, KC_HOME, KC_END, KC_PSCR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PGUP, KC_BSPC, 
-		KC_P7, KC_P8, KC_P9, KC_NLCK, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PGDN, KC_BSLS, 
+		KC_P7, KC_P8, KC_P9, KC_NUM, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PGDN, KC_BSLS, 
 		KC_P4, KC_P5, KC_P6, 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_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_ENT, KC_PDOT, KC_P0, KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC, MO(1), KC_SPC, KC_MINS, KC_EQL, KC_RGUI, KC_RCTL
diff --git a/keyboards/primekb/prime_l/keymaps/via/keymap.c b/keyboards/primekb/prime_l/keymaps/via/keymap.c
index f0b162087b..420bbb78d7 100644
--- a/keyboards/primekb/prime_l/keymaps/via/keymap.c
+++ b/keyboards/primekb/prime_l/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
 		KC_ESC, KC_HOME, KC_END, KC_PSCR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PGUP, KC_BSPC, 
-		KC_P7, KC_P8, KC_P9, KC_NLCK, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PGDN, KC_BSLS, 
+		KC_P7, KC_P8, KC_P9, KC_NUM, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PGDN, KC_BSLS, 
 		KC_P4, KC_P5, KC_P6, 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_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_ENT, KC_PDOT, KC_P0, KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC, MO(1), KC_SPC, KC_MINS, KC_EQL, KC_RGUI, KC_RCTL
diff --git a/keyboards/primekb/prime_o/keymaps/default/keymap.c b/keyboards/primekb/prime_o/keymaps/default/keymap.c
index b3ca2b15f8..64326b0f13 100644
--- a/keyboards/primekb/prime_o/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_ESC,   KC_PMNS,  KC_PSLS,  KC_PAST,  KC_NLCK,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_9,   KC_DEL,
+    KC_ESC,   KC_PMNS,  KC_PSLS,  KC_PAST,  KC_NUM,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_9,   KC_DEL,
     KC_PPLS,  KC_P7,    KC_P8,    KC_P9,    KC_PSCR,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSLS,
     KC_PPLS,  KC_P4,    KC_P5,    KC_P6,    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_ENT,   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_LSFT,
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
index 4847f27a6a..be3ee52f39 100644
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [0] = LAYOUT(
-    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,  KC_5,  KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     KC_DEL,   KC_NLCK,   KC_PSLS,  KC_PAST,  KC_PMNS,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,  KC_5,  KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     KC_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,
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [1] = LAYOUT(
-    KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,     KC_8,     KC_9,    KC_0,     KC_DEL,   KC_NLCK,   KC_PSLS,  KC_PAST,  KC_PMNS,
+    KC_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,
diff --git a/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c b/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c
index 040827308b..50607d8127 100644
--- a/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/spacebarracecar/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 
 [_NAV] = LAYOUT(
-  _______,  _______,  _______,  KC_NLCK,  KC_ESC,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+  _______,  _______,  _______,  KC_NUM,   KC_ESC,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   CU_EQL,   _______,  _______,  _______,  _______,  KC_PGDN,  KC_UP,    KC_PGUP,  KC_HOME,  XXXXXXX,  XXXXXXX,  XXXXXXX,  GUIU,     XXXXXXX,  XXXXXXX,  KC_DEL,
   CU_EQL,   _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_END,   XXXXXXX,  XXXXXXX,  GUIL,     GUID,     GUIR,     EMOJI,    KC_ENT,
   _______,  _______,  _______,  _______,  _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
diff --git a/keyboards/projectkb/signature87/keymaps/default/keymap.c b/keyboards/projectkb/signature87/keymaps/default/keymap.c
index a58d077f60..100fd6f1ed 100644
--- a/keyboards/projectkb/signature87/keymaps/default/keymap.c
+++ b/keyboards/projectkb/signature87/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
diff --git a/keyboards/projectkb/signature87/keymaps/via/keymap.c b/keyboards/projectkb/signature87/keymaps/via/keymap.c
index 87e9a2af74..ad52cdd56e 100644
--- a/keyboards/projectkb/signature87/keymaps/via/keymap.c
+++ b/keyboards/projectkb/signature87/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
diff --git a/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c b/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
index 74310885c5..d2682b2f78 100644
--- a/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
+++ b/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_6x4( /* Base */
-    KC_PSCR, KC_SLCK, KC_PAUS, TG(1),
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_PSCR, KC_SCRL, KC_PAUS, TG(1),
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c b/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
index 74310885c5..d2682b2f78 100644
--- a/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
+++ b/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_6x4( /* Base */
-    KC_PSCR, KC_SLCK, KC_PAUS, TG(1),
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_PSCR, KC_SCRL, KC_PAUS, TG(1),
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/protozoa/p01/keymaps/default/keymap.c b/keyboards/protozoa/p01/keymaps/default/keymap.c
index a72840aa2c..424b070570 100644
--- a/keyboards/protozoa/p01/keymaps/default/keymap.c
+++ b/keyboards/protozoa/p01/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_MUTE,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_MUTE,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/protozoa/p01/keymaps/via/keymap.c b/keyboards/protozoa/p01/keymaps/via/keymap.c
index 1cb2a0f9b6..5b5cead8d2 100644
--- a/keyboards/protozoa/p01/keymaps/via/keymap.c
+++ b/keyboards/protozoa/p01/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_MUTE,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_MUTE,
 
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/punk75/keymaps/default/keymap.c b/keyboards/punk75/keymaps/default/keymap.c
index c330612cf4..9ceaef9397 100644
--- a/keyboards/punk75/keymaps/default/keymap.c
+++ b/keyboards/punk75/keymaps/default/keymap.c
@@ -59,8 +59,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
     [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT,   _______, _______, _______,
         KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
         _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
diff --git a/keyboards/punk75/keymaps/dsanchezseco/keymap.c b/keyboards/punk75/keymaps/dsanchezseco/keymap.c
index 034af79a08..af4b7053e6 100644
--- a/keyboards/punk75/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/punk75/keymaps/dsanchezseco/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RIGHT, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, _______, _______, _______,
         _______, _______, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, MO(_FN), _______, _______, KC_NLCK, KC_DEL,  KC_DEL,  MO(_FN), _______, _______, _______, _______
+        _______, _______, _______, _______, MO(_FN), _______, _______, KC_NUM,  KC_DEL,  KC_DEL,  MO(_FN), _______, _______, _______, _______
     )
 
 };
diff --git a/keyboards/punk75/keymaps/via/keymap.c b/keyboards/punk75/keymaps/via/keymap.c
index fce000d5ed..6cbc33a6a0 100644
--- a/keyboards/punk75/keymaps/via/keymap.c
+++ b/keyboards/punk75/keymaps/via/keymap.c
@@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
     [1] = LAYOUT_ortho_5x15( /* FUNCTION */
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT,   _______, _______, _______,
         KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
         _______, _______, RGB_TOG, MO(1), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(1), _______, _______, _______
diff --git a/keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c b/keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c
index 817b3cbddb..657f8925df 100644
--- a/keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c
+++ b/keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_continuous_fnrow( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_END,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
diff --git a/keyboards/quad_h/lb75/keymaps/default/keymap.c b/keyboards/quad_h/lb75/keymaps/default/keymap.c
index 817b3cbddb..657f8925df 100644
--- a/keyboards/quad_h/lb75/keymaps/default/keymap.c
+++ b/keyboards/quad_h/lb75/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_continuous_fnrow( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_END,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
diff --git a/keyboards/quad_h/lb75/keymaps/via/keymap.c b/keyboards/quad_h/lb75/keymaps/via/keymap.c
index 9df605dbb6..5ec86a45f2 100644
--- a/keyboards/quad_h/lb75/keymaps/via/keymap.c
+++ b/keyboards/quad_h/lb75/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_continuous_fnrow( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_END,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c
index 4abf503ddf..2a6754c4af 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c
index cfa6240f54..0f2502dc3d 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_iso(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c
index 7396c2b9d7..280de324a6 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_jis(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,          KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,          KC_PSCR, KC_SCRL, KC_PAUS,
         JP_ZHTG, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   JP_LBRC,                   KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    JP_SCLN, JP_COLN, JP_RBRC, KC_ENT,
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c
index f671d45c58..7bd524f9d9 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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,
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
index 1f7c9c6388..d49d9d0b77 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
index dcd383794d..90319d52e6 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_iso(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c
index 298b7a1fa2..c7e5cd786a 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
index c5e4c0ddb1..23cdd9c3b2 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_rhnp(
-    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_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_KP_4, KC_KP_5, KC_KP_6,                              KC_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,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
index b45633c5b9..33c71a7242 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_iso_rhnp(
-    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,      KC_ENTER,     KC_END,
     KC_KP_4, KC_KP_5, KC_KP_6,                              KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,                KC_PGUP,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
index b895b04e0f..61f57ec09e 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_jis_rhnp(
-    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC,     KC_HOME,
     KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC,      KC_ENTER,       KC_END,
     KC_KP_4, KC_KP_5, KC_KP_6,                              KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC,                KC_PGUP,
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
index 26018ea3dc..64fc4f462f 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi_rhnp(
-    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SLCK,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
+    KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL,               KC_ESC,     KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_DEL,
     KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,   KC_GRV, KC_1, KC_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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,                  KC_TAB,    KC_Q, KC_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_KP_4, KC_KP_5, KC_KP_6,                              KC_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,
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c b/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c
index 3fb3d02b3c..3916d18366 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c
@@ -16,8 +16,8 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi(
-        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
         KC_P4,   KC_P5,   KC_P6,            KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LSFT, KC_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,
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c b/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c
index a90c1869fd..12933c4b57 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c
@@ -16,8 +16,8 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_iso(
-        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         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_END,
         KC_P4,   KC_P5,   KC_P6,            KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT,  KC_PGUP,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c b/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c
index d9d5f8e8dc..8afc6f9c25 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c
@@ -16,8 +16,8 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO, KC_HOME,
+        KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO, KC_HOME,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
         KC_P4,   KC_P5,   KC_P6,   KC_NO,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/rart/rart4x4/keymaps/default/keymap.c b/keyboards/rart/rart4x4/keymaps/default/keymap.c
index 02dfc0a148..ecd5a588f2 100644
--- a/keyboards/rart/rart4x4/keymaps/default/keymap.c
+++ b/keyboards/rart/rart4x4/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_ortho_4x4(
-        KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+        KC_NUM,  KC_PSLS, KC_PAST, MO(1),
         KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT
diff --git a/keyboards/rart/rart4x4/keymaps/via/keymap.c b/keyboards/rart/rart4x4/keymaps/via/keymap.c
index dd6c81d768..ed36da9781 100644
--- a/keyboards/rart/rart4x4/keymaps/via/keymap.c
+++ b/keyboards/rart/rart4x4/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_ortho_4x4(
-    KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+    KC_NUM,  KC_PSLS, KC_PAST, MO(1),
     KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PMNS
diff --git a/keyboards/rart/rart67/keymaps/default/keymap.c b/keyboards/rart/rart67/keymaps/default/keymap.c
index b8f3e851cb..e572ccb210 100644
--- a/keyboards/rart/rart67/keymaps/default/keymap.c
+++ b/keyboards/rart/rart67/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_all(
     KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  KC_DEL,   _______,
     QK_BOOT,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_P7,    KC_P8,    KC_P9,    _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P4,    KC_P5,    KC_P6,                        KC_NLCK,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P4,    KC_P5,    KC_P6,                        KC_NUM,   _______,
     _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  KC_P1,    KC_P2,    KC_P3,                        KC_VOLU,  _______,
     _______,  _______,  _______,                      _______,                                _______,  KC_P0,    KC_MPRV,                      KC_VOLD,  KC_MNXT
   ), 
diff --git a/keyboards/rart/rart67/keymaps/via/keymap.c b/keyboards/rart/rart67/keymaps/via/keymap.c
index 8c179885fc..4a2598e99c 100644
--- a/keyboards/rart/rart67/keymaps/via/keymap.c
+++ b/keyboards/rart/rart67/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_all(
     KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  KC_DEL,   _______,
     QK_BOOT,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_P7,    KC_P8,    KC_P9,    _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P4,    KC_P5,    KC_P6,                        KC_NLCK,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P4,    KC_P5,    KC_P6,                        KC_NUM,   _______,
     _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  KC_P1,    KC_P2,    KC_P3,                        KC_VOLU,  _______,
     _______,  _______,  _______,                      _______,                                _______,  KC_P0,    KC_MPRV,                      KC_VOLD,  KC_MNXT
   ), 
diff --git a/keyboards/rart/rartlice/keymaps/default/keymap.c b/keyboards/rart/rartlice/keymaps/default/keymap.c
index 372a856bc2..739382a750 100644
--- a/keyboards/rart/rartlice/keymaps/default/keymap.c
+++ b/keyboards/rart/rartlice/keymaps/default/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
   [1] = LAYOUT_all(
-        KC_NLCK, RGB_TOG, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-        KC_SLCK, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______, _______,
+        KC_NUM,  RGB_TOG, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        KC_SCRL, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______, _______,
         _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______,
                  _______, _______,  _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______,          _______,
                  _______,           _______,          _______, _______,          _______,          _______,          _______, _______, _______
diff --git a/keyboards/rart/rartlice/keymaps/via/keymap.c b/keyboards/rart/rartlice/keymaps/via/keymap.c
index 90b11ff7eb..5bb3627e76 100644
--- a/keyboards/rart/rartlice/keymaps/via/keymap.c
+++ b/keyboards/rart/rartlice/keymaps/via/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
   [1] = LAYOUT_all(
-        KC_NLCK, RGB_TOG, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,   _______,
-        KC_SLCK, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______, _______,
+        KC_NUM,  RGB_TOG, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,   _______,
+        KC_SCRL, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______, _______,
         _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______,
                  _______, _______,  _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______,          _______,
                  _______,           _______,          _______, _______,          _______,          _______,          _______, _______, _______
diff --git a/keyboards/rart/rartpad/keymaps/default/keymap.c b/keyboards/rart/rartpad/keymaps/default/keymap.c
index 2b8a1035c3..673f97ab74 100644
--- a/keyboards/rart/rartpad/keymaps/default/keymap.c
+++ b/keyboards/rart/rartpad/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_ortho_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_INS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_INS,
         KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
diff --git a/keyboards/rart/rartpad/keymaps/numpad/keymap.c b/keyboards/rart/rartpad/keymaps/numpad/keymap.c
index a576f9df9d..e3d8384dab 100644
--- a/keyboards/rart/rartpad/keymaps/numpad/keymap.c
+++ b/keyboards/rart/rartpad/keymaps/numpad/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/rart/rartpad/keymaps/via/keymap.c b/keyboards/rart/rartpad/keymaps/via/keymap.c
index 84aaca1ec6..bf2dd13458 100644
--- a/keyboards/rart/rartpad/keymaps/via/keymap.c
+++ b/keyboards/rart/rartpad/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_ortho_5x4(
-    KC_NLCK, KC_PSLS, KC_PAST, KC_INS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_INS,
     KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
diff --git a/keyboards/rate/pistachio_mp/keymaps/default/keymap.c b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
index c206f30617..86f88d9143 100644
--- a/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
                                            KC_MPLY,
-    LT(_FN, KC_NLCK),  KC_PSLS,  KC_PAST,  KC_PMNS,
+    LT(_FN, 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,
diff --git a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
index 241b501d1d..293da4f569 100644
--- a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_via(
                            KC_VOLU,KC_VOLD,KC_MPLY,
-    LT(_FN, KC_NLCK),  KC_PSLS,  KC_PAST,  KC_PMNS,
+    LT(_FN, 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,
diff --git a/keyboards/recompile_keys/choco60/keymaps/default/keymap.c b/keyboards/recompile_keys/choco60/keymaps/default/keymap.c
index ec40e84fa8..7cb0fbbdc1 100644
--- a/keyboards/recompile_keys/choco60/keymaps/default/keymap.c
+++ b/keyboards/recompile_keys/choco60/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_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_INS,  KC_DEL,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
     _______, _______, _______, _______, _______, KC_STOP, QK_BOOT
diff --git a/keyboards/recompile_keys/choco60/keymaps/via/keymap.c b/keyboards/recompile_keys/choco60/keymaps/via/keymap.c
index aad421903c..34b4a74343 100644
--- a/keyboards/recompile_keys/choco60/keymaps/via/keymap.c
+++ b/keyboards/recompile_keys/choco60/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
     _______, _______, _______, _______, _______, KC_STOP, QK_BOOT
diff --git a/keyboards/rect44/keymaps/ansi_44key/keymap.c b/keyboards/rect44/keymaps/ansi_44key/keymap.c
index a9dd9aab7e..c136339ec1 100644
--- a/keyboards/rect44/keymaps/ansi_44key/keymap.c
+++ b/keyboards/rect44/keymaps/ansi_44key/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_INS,   KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
     ),
     [_FN2] = LAYOUT_ansi_44key(
-        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_NO,
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_NO,
         KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,              KC_NO,
         KC_TRNS,            KC_NO,    KC_TRNS,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,              KC_NO,
         KC_LCTL,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_NO,    KC_NO,    KC_NO,    KC_NO
diff --git a/keyboards/rect44/keymaps/ansi_47key/keymap.c b/keyboards/rect44/keymaps/ansi_47key/keymap.c
index 9d11c2b7fe..d6078280bb 100644
--- a/keyboards/rect44/keymaps/ansi_47key/keymap.c
+++ b/keyboards/rect44/keymaps/ansi_47key/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_INS,   KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS, KC_NO,     KC_HOME,  KC_PGDN,  KC_END
     ),
     [_FN2] = LAYOUT_ansi_47key(
-        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_PSCR,   KC_SLCK,  KC_PAUS,  KC_NO,
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_PSCR,   KC_SCRL,  KC_PAUS,  KC_NO,
         KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,              KC_NO,
         KC_TRNS,            KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,
         KC_LCTL,  KC_TRNS,  KC_TRNS,  KC_NO,                        KC_TRNS,            KC_TRNS, KC_TRNS,   KC_NO,    KC_NO,    KC_NO
diff --git a/keyboards/rect44/keymaps/default/keymap.c b/keyboards/rect44/keymaps/default/keymap.c
index cc7afe7772..c6d2827237 100644
--- a/keyboards/rect44/keymaps/default/keymap.c
+++ b/keyboards/rect44/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_INS,   KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
     ),
     [_FN2] = LAYOUT_all(
-        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_PSCR,  KC_SLCK,  KC_PAUS, KC_NO,
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_PSCR,  KC_SCRL,  KC_PAUS, KC_NO,
         KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,
         KC_TRNS,  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_LCTL,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
diff --git a/keyboards/rect44/keymaps/iso_48key/keymap.c b/keyboards/rect44/keymaps/iso_48key/keymap.c
index 7d034af9fe..04fee15d12 100644
--- a/keyboards/rect44/keymaps/iso_48key/keymap.c
+++ b/keyboards/rect44/keymaps/iso_48key/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_INS,   KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS, KC_TRNS,   KC_HOME,  KC_PGDN,  KC_END
     ),
     [_FN2] = LAYOUT_iso_48key(
-        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_PSCR,   KC_SLCK,  KC_PAUS,
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_PSCR,   KC_SCRL,  KC_PAUS,
         KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,
         KC_TRNS,  KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,
         KC_LCTL,  KC_TRNS,  KC_TRNS,  KC_NO,                        KC_TRNS,            KC_TRNS, KC_TRNS,   KC_NO,    KC_NO,    KC_NO
diff --git a/keyboards/redox/keymaps/finex/keymap.c b/keyboards/redox/keymaps/finex/keymap.c
index 724bf564f6..6bc41bc0b3 100644
--- a/keyboards/redox/keymaps/finex/keymap.c
+++ b/keyboards/redox/keymaps/finex/keymap.c
@@ -331,7 +331,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
        _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,KC_F4   ,KC_F5   ,KC_F6   ,KC_F11  ,_______ ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,KC_PSCR ,KC_NLCK ,KC_INS  ,KC_CAPS ,KC_APP  ,_______ ,_______ ,        _______ ,_______ ,_______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F10  ,_______ ,
+       _______ ,KC_PSCR ,KC_NUM  ,KC_INS  ,KC_CAPS ,KC_APP  ,_______ ,_______ ,        _______ ,_______ ,_______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F10  ,_______ ,
     //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
        _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______
     //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
diff --git a/keyboards/redox_w/keymaps/dvorak/keymap.c b/keyboards/redox_w/keymaps/dvorak/keymap.c
index f2c2d85f04..25c33e6345 100644
--- a/keyboards/redox_w/keymaps/dvorak/keymap.c
+++ b/keyboards/redox_w/keymaps/dvorak/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_LCTL ,KC_MS_L ,KC_MS_D  ,KC_MS_R ,KC_WH_D ,KC_CUT  ,KC_VOLD ,                          KC_VOLU ,KC_CUT ,KC_P4 	,KC_P5   ,KC_P6   ,KC_MNXT ,KC_PMNS ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LSFT ,KC_WH_L ,KC_UP   ,KC_WH_R ,KC_LGUI ,KC_PSTE ,KC_WH_U ,KC_SLCK ,        KC_NLCK ,KC_WH_D ,KC_PSTE ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PEQL ,KC_PAST ,
+    KC_LSFT ,KC_WH_L ,KC_UP   ,KC_WH_R ,KC_LGUI ,KC_PSTE ,KC_WH_U ,KC_SCRL ,        KC_NUM  ,KC_WH_D ,KC_PSTE ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PEQL ,KC_PAST ,
 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
     KC_CAPS ,KC_LEFT ,KC_DOWN ,KC_RGHT, LT(3,KC_MUTE)     ,KC_SPC  ,KC_ESC ,        KC_DEL  ,KC_ENT ,    KC_APP   ,     KC_P0   ,KC_PDOT ,KC_PENT ,KC_PSLS 
 //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
diff --git a/keyboards/redscarf_i/keymaps/default/keymap.c b/keyboards/redscarf_i/keymaps/default/keymap.c
index 9a693fabb6..278ed164df 100644
--- a/keyboards/redscarf_i/keymaps/default/keymap.c
+++ b/keyboards/redscarf_i/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_6x4( // Base
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
     KC_P1,   KC_P2,   KC_P3,   KC_ENT,
diff --git a/keyboards/redscarf_i/keymaps/ortho_5x4/keymap.c b/keyboards/redscarf_i/keymaps/ortho_5x4/keymap.c
index 57df878580..47ea1c5d19 100644
--- a/keyboards/redscarf_i/keymaps/ortho_5x4/keymap.c
+++ b/keyboards/redscarf_i/keymaps/ortho_5x4/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_5x4( // Base
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
     KC_P1,   KC_P2,   KC_P3,   KC_ENT,
diff --git a/keyboards/redscarf_i/keymaps/ortho_6x4/keymap.c b/keyboards/redscarf_i/keymaps/ortho_6x4/keymap.c
index 54bf68ce4e..adeeba7c38 100644
--- a/keyboards/redscarf_i/keymaps/ortho_6x4/keymap.c
+++ b/keyboards/redscarf_i/keymaps/ortho_6x4/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_6x4( // Base
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
     KC_P1,   KC_P2,   KC_P3,   KC_ENT,
diff --git a/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c b/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c
index 7bf7eb7c66..5e72b5ffe1 100644
--- a/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c
+++ b/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_numpad(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_P1, KC_P2, KC_P3, 
diff --git a/keyboards/reversestudio/decadepad/keymaps/default/keymap.c b/keyboards/reversestudio/decadepad/keymaps/default/keymap.c
index 695ceac301..df936be4c7 100644
--- a/keyboards/reversestudio/decadepad/keymaps/default/keymap.c
+++ b/keyboards/reversestudio/decadepad/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_6x4(
       RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_M_R,
-      KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+      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,    
diff --git a/keyboards/reversestudio/decadepad/keymaps/via/keymap.c b/keyboards/reversestudio/decadepad/keymaps/via/keymap.c
index a9ca419185..da3bf11280 100644
--- a/keyboards/reversestudio/decadepad/keymaps/via/keymap.c
+++ b/keyboards/reversestudio/decadepad/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_numpad_6x4(
       RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_M_R,
-      KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+      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,    
diff --git a/keyboards/reviung/reviung53/keymaps/default/keymap.c b/keyboards/reviung/reviung53/keymaps/default/keymap.c
index 6b47aad35a..2fabf74fb9 100644
--- a/keyboards/reviung/reviung53/keymaps/default/keymap.c
+++ b/keyboards/reviung/reviung53/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,               SP_LO,                   SP_RA,                KC_LALT,  KC_RGUI,  KC_RCTL
 	),
 	[_LOWER] = LAYOUT_reviung53(
-                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SLCK,  KC_PSCR,  _______,
+                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SCRL,  KC_PSCR,  _______,
     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
     _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  KC_QUOT,
     _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,            KC_SLSH,
diff --git a/keyboards/reviung/reviung53/keymaps/via/keymap.c b/keyboards/reviung/reviung53/keymaps/via/keymap.c
index 6b47aad35a..2fabf74fb9 100644
--- a/keyboards/reviung/reviung53/keymaps/via/keymap.c
+++ b/keyboards/reviung/reviung53/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,               SP_LO,                   SP_RA,                KC_LALT,  KC_RGUI,  KC_RCTL
 	),
 	[_LOWER] = LAYOUT_reviung53(
-                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SLCK,  KC_PSCR,  _______,
+                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SCRL,  KC_PSCR,  _______,
     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
     _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  KC_QUOT,
     _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,            KC_SLSH,
diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c
index 8148e57af8..458ce164ae 100644
--- a/keyboards/rgbkb/mun/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
         _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
-        _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, QWERTY, COLEMAK,
+        _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY, COLEMAK,
 
         _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
index ff763394b4..226d6a8c97 100644
--- a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			),
     [_LHAND] = LAYOUT(
 			QK_BOOT,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,		KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, 
 			KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_PGUP, 		KC_PGDN, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
 			KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT,  KC_BSPC, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_RSFT, 
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c
index 8148e57af8..458ce164ae 100644
--- a/keyboards/rgbkb/mun/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
         _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
-        _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, QWERTY, COLEMAK,
+        _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY, COLEMAK,
 
         _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
index 11149bbe0d..6be0aecff3 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_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_SLCK, KC_PAUS, _______,
+        _______, 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,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
      */
     [_ADJUST] = LAYOUT(
-        KC_GRV,  _______, _______, _______, _______, _______, _______,    _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL,
+        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, _______,
         _______, _______, _______, _______, _______, EEP_RST, _______,    _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
diff --git a/keyboards/rgbkb/pan/keymaps/default/keymap.c b/keyboards/rgbkb/pan/keymaps/default/keymap.c
index dcafeec765..214348122b 100644
--- a/keyboards/rgbkb/pan/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/pan/keymaps/default/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT,   _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
         _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______,
-        _______, _______, _______, RGB_MOD, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, _QWERTY, _COLEMAK
+        _______, _______, _______, RGB_MOD, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  _QWERTY, _COLEMAK
     )
 };
 
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index 87241521ae..341ea00bce 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -96,8 +96,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FN] = LAYOUT(
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, _______, KC_PSCR,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-    _______, KC_PGDN,   KC_UP, KC_PGUP, _______, _______, _______, KC_SLCK, _______, KC_PGDN,   KC_UP, KC_PGUP, KC_PSCR, KC_HOME,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_NLCK, _______, KC_LEFT, KC_DOWN, KC_RGHT,  KC_INS,  KC_END,
+    _______, KC_PGDN,   KC_UP, KC_PGUP, _______, _______, _______, KC_SCRL, _______, KC_PGDN,   KC_UP, KC_PGUP, KC_PSCR, KC_HOME,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_NUM,  _______, KC_LEFT, KC_DOWN, KC_RGHT,  KC_INS,  KC_END,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
                                                  _______, _______, _______, _______
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, RGB_SAD, RGB_VAI, RGB_SAI,   QK_BOOT, _______, _______, _______, _______,   KC_P7,   KC_P8,  KC_P9,  _______, _______,
     _______, RGB_HUD, RGB_VAD, RGB_HUI,  RGBRST, _______, _______, _______, _______,   KC_P4,   KC_P5,  KC_P6, _______, _______,
     _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______,   KC_P1,   KC_P2,  KC_P3, _______, _______,
-    _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______,   KC_P0, KC_PDOT, KC_NLCK,  QWERTY, COLEMAK,
+    _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______,   KC_P0, KC_PDOT, KC_NUM,  QWERTY, COLEMAK,
                                                  _______, _______, _______, _______
   )
 };
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
index d042a4fe27..b3d0f5860d 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] =  LAYOUT( \
       _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_NLCK, _______, _______, \
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_NUM,  _______, _______, \
       KC_CAPS, _______, QWERTY,  COLEMAK, DVORAK,  DESTINY, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, \
       _______, _______, _______, RGB_SPI, RGB_SPD, _______, XXXXXXX, XXXXXXX, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/rgbkb/sol3/keymaps/default/keymap.c b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
index f619c624cd..6f97b626f9 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT,   _______, _______,                   _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
         _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_RST, _______, DM_REC1,                   _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP,                   _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
-        _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, QWERTY,  COLEMAK,
+        _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY,  COLEMAK,
 
         _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
diff --git a/keyboards/rgbkb/sol3/keymaps/via/keymap.c b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
index ae0560036f..2bd54eb96e 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT,   _______, _______,                   _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
         _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_RST, _______, DM_REC1,                   _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP,                   _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
-        _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, QWERTY,  COLEMAK,
+        _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY,  COLEMAK,
 
         _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
index e98bab84eb..aa017eda9e 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 , \
     KC_TILD, KC_GRV,  _______, _______, _______, _______,                   _______, _______, _______, _______, _______, KC_PIPE, \
     KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
     _______, _______, _______, KC_HOME, KC_END,  KC_DEL,  _______, _______, KC_INS,  KC_PGUP, KC_PGDN, _______, _______, _______ \
   ),
 
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 , \
     KC_TILD, KC_GRV,  _______, _______, _______, _______,                   _______, _______, _______, _______, _______, KC_PIPE, \
     KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______, \
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
     _______, _______, _______, KC_HOME, KC_END,  KC_DEL,  _______, _______, KC_INS,  KC_PGUP, KC_PGDN, _______, _______, _______ \
   ),
 
diff --git a/keyboards/ristretto/keymaps/default/keymap.c b/keyboards/ristretto/keymaps/default/keymap.c
index e02c6ea246..064ae759eb 100644
--- a/keyboards/ristretto/keymaps/default/keymap.c
+++ b/keyboards/ristretto/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[_ADJUST] = LAYOUT(
 		XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX           , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,
-		XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_CAPS           , KC_NLCK , KC_SLCK , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , 
+		XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_CAPS           , KC_NUM  , KC_SCRL , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , 
 		XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX           , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , 
 		KC_TRNS , KC_TRNS , KC_TRNS , XXXXXXX , XXXXXXX , XXXXXXX , KC_MUTE , XXXXXXX , XXXXXXX , XXXXXXX , KC_TRNS , KC_TRNS , KC_TRNS
 	),
diff --git a/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c b/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c
index fef4324f19..47f0241f32 100644
--- a/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c
+++ b/keyboards/rmkeebs/rm_numpad/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     LAYOUT_numpad_6x4(
         KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+        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,
diff --git a/keyboards/rmkeebs/rm_numpad/keymaps/ortho/keymap.c b/keyboards/rmkeebs/rm_numpad/keymaps/ortho/keymap.c
index c3dc76f5ab..40ce7c06f4 100644
--- a/keyboards/rmkeebs/rm_numpad/keymaps/ortho/keymap.c
+++ b/keyboards/rmkeebs/rm_numpad/keymaps/ortho/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     LAYOUT_ortho_6x4(
         KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
         KC_P7,   KC_P8,   KC_P9,   KC_EQL,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/rmkeebs/rm_numpad/keymaps/split_plus/keymap.c b/keyboards/rmkeebs/rm_numpad/keymaps/split_plus/keymap.c
index 9c6939e4d6..832e693574 100644
--- a/keyboards/rmkeebs/rm_numpad/keymaps/split_plus/keymap.c
+++ b/keyboards/rmkeebs/rm_numpad/keymaps/split_plus/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     LAYOUT_split_plus_6x4(
         KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
         KC_P7,   KC_P8,   KC_P9,   KC_EQL,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
         KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 5305b74cc5..0d73b7a606 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -126,7 +126,7 @@ lookup_table_t lookup_table[333] =
  {"KC_F11", KC_F11},
  {"KC_F12", KC_F12},
  {"KC_PSCR", KC_PSCR},
- {"KC_SLCK", KC_SLCK},
+ {"KC_SCRL", KC_SCRL},
  {"KC_PAUS", KC_PAUS},
  {"KC_INS", KC_INS},
  {"KC_HOME", KC_HOME},
@@ -138,7 +138,7 @@ lookup_table_t lookup_table[333] =
  {"KC_LEFT", KC_LEFT},
  {"KC_DOWN", KC_DOWN},
  {"KC_UP", KC_UP},
- {"KC_NLCK", KC_NLCK},
+ {"KC_NUM", KC_NUM},
  {"KC_PSLS", KC_PSLS},
  {"KC_PAST", KC_PAST},
  {"KC_PMNS", KC_PMNS},
diff --git a/keyboards/rocketboard_16/keymaps/default/keymap.c b/keyboards/rocketboard_16/keymaps/default/keymap.c
index dc83cbd62b..eb31d2f25a 100644
--- a/keyboards/rocketboard_16/keymaps/default/keymap.c
+++ b/keyboards/rocketboard_16/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        RGB_MOD,                   KC_NLCK,
+        RGB_MOD,                   KC_NUM,
         KC_P7,   KC_P8,   KC_P9,   KC_DEL,
         KC_P4,   KC_P5,   KC_P6,   KC_END,
         KC_P1,   KC_P2,   KC_P3,   KC_F13,
diff --git a/keyboards/rocketboard_16/keymaps/via/keymap.c b/keyboards/rocketboard_16/keymaps/via/keymap.c
index 08b8e65b4f..58da55abeb 100644
--- a/keyboards/rocketboard_16/keymaps/via/keymap.c
+++ b/keyboards/rocketboard_16/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        RGB_MOD,                   KC_NLCK,
+        RGB_MOD,                   KC_NUM,
         KC_P7,   KC_P8,   KC_P9,   KC_DEL,
         KC_P4,   KC_P5,   KC_P6,   KC_END,
         KC_P1,   KC_P2,   KC_P3,   KC_F13,
diff --git a/keyboards/rubi/keymaps/default/keymap.c b/keyboards/rubi/keymaps/default/keymap.c
index d2eaf0bb07..8f1af93c58 100644
--- a/keyboards/rubi/keymaps/default/keymap.c
+++ b/keyboards/rubi/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT(
                                        ENC_PRESS,
-            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+            KC_NUM , KC_PSLS, KC_PAST, KC_PMNS,
             KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
             KC_P4  , KC_P5  , KC_P6  ,
             KC_P1  , KC_P2  , KC_P3  , KC_PENT,
diff --git a/keyboards/rubi/keymaps/via/keymap.c b/keyboards/rubi/keymaps/via/keymap.c
index f9657a99cc..eb1102921c 100644
--- a/keyboards/rubi/keymaps/via/keymap.c
+++ b/keyboards/rubi/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT(
                                        ENC_PRESS,
-            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+            KC_NUM , KC_PSLS, KC_PAST, KC_PMNS,
             KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
             KC_P4  , KC_P5  , KC_P6  ,
             KC_P1  , KC_P2  , KC_P3  , KC_PENT,
diff --git a/keyboards/runes/vaengr/keymaps/default/keymap.c b/keyboards/runes/vaengr/keymaps/default/keymap.c
index e0ae22effc..451cefae5f 100644
--- a/keyboards/runes/vaengr/keymaps/default/keymap.c
+++ b/keyboards/runes/vaengr/keymaps/default/keymap.c
@@ -35,11 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F1, 	 KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, 
 		KC_TRNS, KC_PGUP, KC_HOME, KC_DEL,  KC_BSPC, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_BSLS, 
 		KC_TRNS, KC_PGDN, KC_END,  KC_ENT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_PIPE, 
-		KC_TRNS, KC_PSCR, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_SLCK, KC_PAUS, KC_TRNS, 
+		KC_TRNS, KC_PSCR, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_SCRL, KC_PAUS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[_RAISE] = LAYOUT(
-		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NLCK, KC_P7, KC_P8, KC_P9,KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NUM, KC_P7, KC_P8, KC_P9,KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PMNS, KC_P4, KC_P5, KC_P6,KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_PAST, KC_P1, KC_P2, KC_P3,KC_TRNS, KC_PPLS, 
 		KC_TRNS, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_PSLS, KC_P0, KC_PDOT, KC_PEQL,KC_TRNS, KC_PENT, 
diff --git a/keyboards/runes/vaengr/keymaps/via/keymap.c b/keyboards/runes/vaengr/keymaps/via/keymap.c
index e0ae22effc..451cefae5f 100644
--- a/keyboards/runes/vaengr/keymaps/via/keymap.c
+++ b/keyboards/runes/vaengr/keymaps/via/keymap.c
@@ -35,11 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F1, 	 KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, 
 		KC_TRNS, KC_PGUP, KC_HOME, KC_DEL,  KC_BSPC, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_BSLS, 
 		KC_TRNS, KC_PGDN, KC_END,  KC_ENT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_PIPE, 
-		KC_TRNS, KC_PSCR, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_SLCK, KC_PAUS, KC_TRNS, 
+		KC_TRNS, KC_PSCR, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_SCRL, KC_PAUS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[_RAISE] = LAYOUT(
-		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NLCK, KC_P7, KC_P8, KC_P9,KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NUM, KC_P7, KC_P8, KC_P9,KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PMNS, KC_P4, KC_P5, KC_P6,KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_PAST, KC_P1, KC_P2, KC_P3,KC_TRNS, KC_PPLS, 
 		KC_TRNS, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_PSLS, KC_P0, KC_PDOT, KC_PEQL,KC_TRNS, KC_PENT, 
diff --git a/keyboards/ryanbaekr/rb18/keymaps/default/keymap.c b/keyboards/ryanbaekr/rb18/keymaps/default/keymap.c
index 28b4cb0da5..df6f1f8d03 100644
--- a/keyboards/ryanbaekr/rb18/keymaps/default/keymap.c
+++ b/keyboards/ryanbaekr/rb18/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/ryanbaekr/rb18/keymaps/via/keymap.c b/keyboards/ryanbaekr/rb18/keymaps/via/keymap.c
index 455b2a99f5..3015f122b0 100644
--- a/keyboards/ryanbaekr/rb18/keymaps/via/keymap.c
+++ b/keyboards/ryanbaekr/rb18/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/ryanbaekr/rb69/keymaps/default/keymap.c b/keyboards/ryanbaekr/rb69/keymaps/default/keymap.c
index c3ed407b70..0679410524 100644
--- a/keyboards/ryanbaekr/rb69/keymaps/default/keymap.c
+++ b/keyboards/ryanbaekr/rb69/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______,          _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______,          _______, _______,                            _______,                   _______,          _______, _______, _______, _______
     )
diff --git a/keyboards/ryanbaekr/rb69/keymaps/via/keymap.c b/keyboards/ryanbaekr/rb69/keymaps/via/keymap.c
index eb7ba1aeeb..6ee344927e 100644
--- a/keyboards/ryanbaekr/rb69/keymaps/via/keymap.c
+++ b/keyboards/ryanbaekr/rb69/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______,          _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______,          _______, _______,                            _______,                   _______,          _______, _______, _______, _______
     ),
diff --git a/keyboards/ryanbaekr/rb86/keymaps/default/keymap.c b/keyboards/ryanbaekr/rb86/keymaps/default/keymap.c
index 41b1b88469..ba5ddc445e 100644
--- a/keyboards/ryanbaekr/rb86/keymaps/default/keymap.c
+++ b/keyboards/ryanbaekr/rb86/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______, _______, _______, _______,                            _______,                   _______,          _______, _______, _______, _______, _______
     )
diff --git a/keyboards/ryanbaekr/rb86/keymaps/via/keymap.c b/keyboards/ryanbaekr/rb86/keymaps/via/keymap.c
index e28bfa5e6d..5c541dad68 100644
--- a/keyboards/ryanbaekr/rb86/keymaps/via/keymap.c
+++ b/keyboards/ryanbaekr/rb86/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______, _______, _______, _______,                            _______,                   _______,          _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c b/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
index 1459d66ed9..8b88f90dae 100644
--- a/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
+++ b/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
@@ -22,9 +22,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     /* Default Layer */
     [0] = LAYOUT_fullsize_iso(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  LT(1, KC_F12),       KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  LT(1, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/saevus/cor_tkl/keymaps/default/keymap.c b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
index 5d351a1578..affb5e5715 100644
--- a/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
+++ b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c b/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
index 4bc1c41809..8b6de5f386 100644
--- a/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
+++ b/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_f13_iso_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/saevus/cor_tkl/keymaps/via/keymap.c b/keyboards/saevus/cor_tkl/keymaps/via/keymap.c
index d7e1cabc67..6d4dac94ec 100644
--- a/keyboards/saevus/cor_tkl/keymaps/via/keymap.c
+++ b/keyboards/saevus/cor_tkl/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
index 5943139720..7294a8cbed 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
   TG(_ADJUST),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, KC_PSCR, KC_SLCK,KC_PAUSE,   KC_UP, _______, KC_BSPC,
+      _______, _______, _______, _______, _______, _______,     _______, _______, KC_PSCR, KC_SCRL,KC_PAUSE,   KC_UP, _______, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
index ad1e1ab67c..700de6e6a6 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
       _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, KC_PSCR, KC_SLCK,KC_PAUSE,   KC_UP, _______, KC_BSPC,
+      _______, _______, _______, _______, _______, _______,     _______, _______, KC_PSCR, KC_SCRL,KC_PAUSE,   KC_UP, _______, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
index 5ce939f97d..a9a4599ddb 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
   TG(_L2),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, KC_PSCR, KC_SLCK,KC_PAUSE,   KC_UP, _______, KC_BSPC,
+      _______, _______, _______, _______, _______, _______,     _______, _______, KC_PSCR, KC_SCRL,KC_PAUSE,   KC_UP, _______, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
index 4bd68878aa..7b4e811655 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_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_STOP, KC_SLCK,KC_PAUSE,
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_STOP, KC_SCRL,KC_PAUSE,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
index 8ba34de6fa..8f02641f0f 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_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_STOP, KC_SLCK,KC_PAUSE,
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_STOP, KC_SCRL,KC_PAUSE,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
index 79bd7541c5..76c614c9c2 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_L1] = 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_STOP, KC_SLCK,KC_PAUSE,
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_STOP, KC_SCRL,KC_PAUSE,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_L2] = 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_STOP, KC_SLCK,KC_PAUSE,
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_STOP, KC_SCRL,KC_PAUSE,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_L3] = 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_STOP, KC_SLCK,KC_PAUSE,
+      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_STOP, KC_SCRL,KC_PAUSE,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
index eda419d72c..4990ace769 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,--------------------------------------------------------------|   |--------------------------------------------------------------.
        KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_PSCR, KC_SLCK, KC_LBRC, KC_RBRC,
+      _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_PSCR, KC_SCRL, KC_LBRC, KC_RBRC,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_HOME, KC_PGUP, KC_QUOT, _______,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
index 6bc8ec95ef..d321bf7709 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,--------------------------------------------------------------|   |--------------------------------------------------------------.
        KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_PSCR, KC_SLCK, KC_LBRC, KC_RBRC,
+      _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_PSCR, KC_SCRL, KC_LBRC, KC_RBRC,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_HOME, KC_PGUP, KC_QUOT, _______,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c b/keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c
index a70df01c18..946245768b 100644
--- a/keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       //,-----------------------------------|
 LT(_ADJUST,KC_ESC),  KC_F2,  KC_EQL,  KC_DEL,
       //|--------+--------+--------+--------|
-          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       //|--------+--------+--------+--------+--------|
             KC_P7,   KC_P8,   KC_P9,           KC_ESC,
       //|--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c b/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c
index 0ee669ce84..e41add80bb 100644
--- a/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c
+++ b/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       //,-----------------------------------|
            KC_ESC,   KC_F2,  JP_EQL,  KC_DEL,
       //|--------+--------+--------+--------|
-          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       //|--------+--------+--------+--------+--------|
             KC_P7,   KC_P8,   KC_P9,    LCTL(JP_LBRC),
       //|--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
index 9ede4553a8..4f6a65dfa1 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
@@ -32,7 +32,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_with_setta21(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, 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_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NUM,  KC_ESC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
        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_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
index 01248b4d14..6ca778e691 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
@@ -33,7 +33,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_with_setta21(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC,
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NUM,  KC_ESC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
      KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
index cc1cd38ff6..450d166228 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
@@ -28,7 +28,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_with_setta21(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC,
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NUM,  KC_ESC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
index 8f4dd91f12..dd26f82f34 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
@@ -39,7 +39,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_with_setta21(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,LT(_LOWER, KC_P0),KC_P1,  KC_P4,  KC_P7,KC_NLCK, KC_ESC,
+  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,LT(_LOWER, KC_P0),KC_P1,  KC_P4,  KC_P7,KC_NUM,  KC_ESC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c
index 1748f00036..eb155ec15e 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_QWERTY] = LAYOUT_with_setta21(
         KC_PGUP,    KC_ESC , KC_1   , KC_2   , KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC,    KC_ESC,  KC_F2,   KC_EQL,  KC_DEL,
-        KC_PGDN,    KC_TAB , KC_Q   , KC_W   , KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LCBR, KC_RCBR,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_PGDN,    KC_TAB , KC_Q   , KC_W   , KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LCBR, KC_RCBR,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
                     KC_LCTL, KC_A   , KC_S   , KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,     KC_P7,   KC_P8,   KC_P9,
                     KC_LSFT, KC_Z   , KC_X   , KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
                     ADJUST ,          KC_LALT,          KC_SPC,  LOWER,      RAISE,   KC_SPC,           KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT,    KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
index 44be3c1c32..ef16e583cb 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,-----------------------------------.
      TG(_MOUSE),TD(TD_ESFL), KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                  KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, KC_BSPC,              KC_ESC,   KC_F2,   KC_EQL,  KC_DEL,
     //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-   TG(_BROWSER),  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC,              KC_NLCK,  KC_PSLS, KC_PAST, KC_PMNS,
+   TG(_BROWSER),  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC,              KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
     //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
                 KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,              KC_P7,    KC_P8,   KC_P9,
     //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c
index fa33c08f26..37a92a8afc 100644
--- a/keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       //,-----------------------------------|
 LT(_ADJUST,KC_ESC),  KC_F2,  KC_EQL,  KC_DEL,
       //|--------+--------+--------+--------|
-          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       //|--------+--------+--------+--------|
             KC_P7,   KC_P8,   KC_P9,         
       //|--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
index 3dc7faa394..e117d26eee 100644
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       //,-----------------------------------|
            KC_ESC,   KC_F2,  JP_EQL,  KC_DEL,
       //|--------+--------+--------+--------|
-          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       //|--------+--------+--------+--------|
             KC_P7,   KC_P8,   KC_P9,
       //|--------+--------+--------+--------|
diff --git a/keyboards/sam/s80/keymaps/default/keymap.c b/keyboards/sam/s80/keymaps/default/keymap.c
index a4f3ee1fd9..08444745c4 100644
--- a/keyboards/sam/s80/keymaps/default/keymap.c
+++ b/keyboards/sam/s80/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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_SPC,  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,
diff --git a/keyboards/sam/s80/keymaps/via/keymap.c b/keyboards/sam/s80/keymaps/via/keymap.c
index fc5852bb61..ca8d290356 100644
--- a/keyboards/sam/s80/keymaps/via/keymap.c
+++ b/keyboards/sam/s80/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_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_SPC,  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,
diff --git a/keyboards/sam/sg81m/keymaps/default/keymap.c b/keyboards/sam/sg81m/keymaps/default/keymap.c
index 5518b9a8aa..9d69cd98f4 100644
--- a/keyboards/sam/sg81m/keymaps/default/keymap.c
+++ b/keyboards/sam/sg81m/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_NLCK, KC_END,  KC_PGDN,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_NUM,  KC_END,  KC_PGDN,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_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_LSFT,          KC_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,
diff --git a/keyboards/sam/sg81m/keymaps/via/keymap.c b/keyboards/sam/sg81m/keymaps/via/keymap.c
index f69d1f4c32..0d0da2774d 100644
--- a/keyboards/sam/sg81m/keymaps/via/keymap.c
+++ b/keyboards/sam/sg81m/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_NLCK, KC_END,  KC_PGDN,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_NUM,  KC_END,  KC_PGDN,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_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_LSFT,          KC_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,
diff --git a/keyboards/sauce/mild/keymaps/default/keymap.c b/keyboards/sauce/mild/keymaps/default/keymap.c
index 7553b11206..edf06d6cf0 100644
--- a/keyboards/sauce/mild/keymaps/default/keymap.c
+++ b/keyboards/sauce/mild/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/sauce/mild/keymaps/via/keymap.c b/keyboards/sauce/mild/keymaps/via/keymap.c
index 3d816d127e..d7ebaa0e9b 100644
--- a/keyboards/sauce/mild/keymaps/via/keymap.c
+++ b/keyboards/sauce/mild/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
index 2282e13efc..9ab41b57f4 100644
--- a/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,                KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,                KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
index 65df189e3a..ea9a1ba411 100644
--- a/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,                KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,                KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c
index 922ed190f6..57fdc45407 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c
index b198c248bb..312639a799 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c
index 7d31b685d3..646a1b323d 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_arrow_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,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c
index ff75a4903f..1cf688c363 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_arrow_split_bs_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c
index 95ad0386a5..bc9dfe116b 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_arrow_split_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c
index 9e3ad13073..3baee21b63 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_arrow_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,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c
index e5723c0807..48cc456955 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_arrow_tsangan_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,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
index 1e9d26d20d..c41ae1701f 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_split_bs(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
index 88a87b3f0d..ce4f9f25ad 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_split_bs_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______)
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
index f180ac68b1..d3e8e025fe 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_split_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______)
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c
index 17a06223eb..09343067e0 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
index e749252274..4fe88fceda 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_tsangan_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,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______,_______,  _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c
index 71bec072c6..311be307f1 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_tsangan_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,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c
index 3a4e0d4ab9..273f243f20 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_isoenter_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,  _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c
index e557c078aa..226bd07e5c 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c
index 6e194461c4..a034621495 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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,  _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,                   _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
index f9a62db7d3..39a6ee1be6 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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,  _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,                   _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/sck/m0116b/keymaps/default/keymap.c b/keyboards/sck/m0116b/keymaps/default/keymap.c
index 56bb777f7a..ec4cdde141 100644
--- a/keyboards/sck/m0116b/keymaps/default/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [0] = LAYOUT_m0116_ansi( /* Base */
 															 CALTDEL,
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 		KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_P4,   KC_P5,   KC_P6,	KC_PMNS,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/sck/m0116b/keymaps/m0116/keymap.c b/keyboards/sck/m0116b/keymaps/m0116/keymap.c
index 56bb777f7a..ec4cdde141 100644
--- a/keyboards/sck/m0116b/keymaps/m0116/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/m0116/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [0] = LAYOUT_m0116_ansi( /* Base */
 															 CALTDEL,
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 		KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_P4,   KC_P5,   KC_P6,	KC_PMNS,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/sck/m0116b/keymaps/m0118/keymap.c b/keyboards/sck/m0116b/keymaps/m0118/keymap.c
index 7a54952f97..351e1d57db 100644
--- a/keyboards/sck/m0116b/keymaps/m0118/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/m0118/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [0] = LAYOUT_m0118_iso( /* Base */
 															 CALTDEL,
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 		KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HASH,          KC_P4,   KC_P5,   KC_P6,	KC_PMNS,
 		KC_LSFT, KC_LABK, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/sck/osa/keymaps/all/keymap.c b/keyboards/sck/osa/keymaps/all/keymap.c
index 193d34906f..e20bd65a5b 100644
--- a/keyboards/sck/osa/keymaps/all/keymap.c
+++ b/keyboards/sck/osa/keymaps/all/keymap.c
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       `----------------------------------------------------------------------'
    */
 [1] = LAYOUT_alice_split_bs( /* OSA Layer 1 */
-	KC_SLCK,   KC_ESC,  KC_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_NLCK,  KC_TAB,  KC_Q,    KC_UP,   KC_E,    KC_R,   KC_T,    					 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+	KC_SCRL,   KC_ESC,  KC_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_NUM,   KC_TAB,  KC_Q,    KC_UP,   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_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F,   KC_G,    					 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,          KC_ENT,
 	          KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,	                     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_HOME,
 	          KC_LCTL,          KC_LALT,          KC_SPC, _______,                   KC_SPC,                    KC_RALT,                            KC_RCTL
diff --git a/keyboards/sendyyeah/75pixels/keymaps/default/keymap.c b/keyboards/sendyyeah/75pixels/keymaps/default/keymap.c
index d18f4f4c25..be7d980ed0 100644
--- a/keyboards/sendyyeah/75pixels/keymaps/default/keymap.c
+++ b/keyboards/sendyyeah/75pixels/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [QW] = LAYOUT_ortho_5x15(
-        KC_ESC , KC_1   , KC_2   , KC_3  , KC_4   , KC_5  , KC_6  , KC_7  , KC_8   , KC_9   , KC_0   , KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST,
+        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_NUM , KC_PSLS, KC_PAST,
         KC_TAB , KC_Q   , KC_W   , KC_E  , KC_R   , KC_T  , KC_Y  , KC_U  , KC_I   , KC_O   , KC_P   , KC_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_ENT , KC_P4  , KC_P5  , KC_P6  ,
         KC_LSFT, KC_Z   , KC_X   , KC_C  , KC_V   , KC_B  , KC_N  , KC_M  , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_P1  , KC_P2  , KC_P3  ,
diff --git a/keyboards/sendyyeah/75pixels/keymaps/via/keymap.c b/keyboards/sendyyeah/75pixels/keymaps/via/keymap.c
index d18f4f4c25..be7d980ed0 100644
--- a/keyboards/sendyyeah/75pixels/keymaps/via/keymap.c
+++ b/keyboards/sendyyeah/75pixels/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [QW] = LAYOUT_ortho_5x15(
-        KC_ESC , KC_1   , KC_2   , KC_3  , KC_4   , KC_5  , KC_6  , KC_7  , KC_8   , KC_9   , KC_0   , KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST,
+        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_NUM , KC_PSLS, KC_PAST,
         KC_TAB , KC_Q   , KC_W   , KC_E  , KC_R   , KC_T  , KC_Y  , KC_U  , KC_I   , KC_O   , KC_P   , KC_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_ENT , KC_P4  , KC_P5  , KC_P6  ,
         KC_LSFT, KC_Z   , KC_X   , KC_C  , KC_V   , KC_B  , KC_N  , KC_M  , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_P1  , KC_P2  , KC_P3  ,
diff --git a/keyboards/sendyyeah/bevi/keymaps/default/keymap.c b/keyboards/sendyyeah/bevi/keymaps/default/keymap.c
index d3fda60ae7..09221b71c3 100644
--- a/keyboards/sendyyeah/bevi/keymaps/default/keymap.c
+++ b/keyboards/sendyyeah/bevi/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC , KC_1   , KC_2   , KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_NUM , KC_PSLS, KC_PAST, KC_PMNS, KC_ESC , KC_1   , KC_2   , KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_PPLS, KC_P7  , KC_P8  , KC_P9  , KC_TAB , KC_Q   , KC_W   , KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,     KC_BSLS,
                  KC_P4  , KC_P5  , KC_P6  , KC_CAPS  , KC_A   , KC_S   , KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_PENT, 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,
diff --git a/keyboards/sendyyeah/bevi/keymaps/via/keymap.c b/keyboards/sendyyeah/bevi/keymaps/via/keymap.c
index d3fda60ae7..09221b71c3 100644
--- a/keyboards/sendyyeah/bevi/keymaps/via/keymap.c
+++ b/keyboards/sendyyeah/bevi/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC , KC_1   , KC_2   , KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_NUM , KC_PSLS, KC_PAST, KC_PMNS, KC_ESC , KC_1   , KC_2   , KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_PPLS, KC_P7  , KC_P8  , KC_P9  , KC_TAB , KC_Q   , KC_W   , KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,     KC_BSLS,
                  KC_P4  , KC_P5  , KC_P6  , KC_CAPS  , KC_A   , KC_S   , KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_PENT, 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,
diff --git a/keyboards/senselessclay/ck60/keymaps/default/keymap.c b/keyboards/senselessclay/ck60/keymaps/default/keymap.c
index d88f9e303c..c125e9b553 100644
--- a/keyboards/senselessclay/ck60/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/ck60/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_1] = LAYOUT_60_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
         KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/senselessclay/ck60/keymaps/via/keymap.c b/keyboards/senselessclay/ck60/keymaps/via/keymap.c
index d88f9e303c..c125e9b553 100644
--- a/keyboards/senselessclay/ck60/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/ck60/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_1] = LAYOUT_60_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
         KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/senselessclay/ck65/keymaps/default/keymap.c b/keyboards/senselessclay/ck65/keymaps/default/keymap.c
index 2767c9c776..6f8de0bf9d 100644
--- a/keyboards/senselessclay/ck65/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/ck65/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_1] = LAYOUT_65_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,          _______,
         KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/senselessclay/ck65/keymaps/via/keymap.c b/keyboards/senselessclay/ck65/keymaps/via/keymap.c
index 2767c9c776..6f8de0bf9d 100644
--- a/keyboards/senselessclay/ck65/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/ck65/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_1] = LAYOUT_65_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,          _______,
         KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/senselessclay/gos65/keymaps/default/keymap.c b/keyboards/senselessclay/gos65/keymaps/default/keymap.c
index c35af25888..9419266d2d 100644
--- a/keyboards/senselessclay/gos65/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/gos65/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
     [1] = LAYOUT(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, RGB_VAI,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, RGB_VAD,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, RGB_VAD,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MODE_FORWARD,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_MUTE, KC_VOLU, KC_MPLY, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/senselessclay/gos65/keymaps/via/keymap.c b/keyboards/senselessclay/gos65/keymaps/via/keymap.c
index 74ebce7df5..dc43c0f31d 100644
--- a/keyboards/senselessclay/gos65/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/gos65/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
     [_1] = LAYOUT(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, RGB_VAI,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, RGB_VAD,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, RGB_VAD,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MODE_FORWARD,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_MUTE, KC_VOLU, KC_MPLY, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/senselessclay/had60/keymaps/default/keymap.c b/keyboards/senselessclay/had60/keymaps/default/keymap.c
index 358d75be4d..5f9d524766 100644
--- a/keyboards/senselessclay/had60/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/had60/keymaps/default/keymap.c
@@ -25,7 +25,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),
     [1] = LAYOUT_all(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/senselessclay/had60/keymaps/iso/keymap.c b/keyboards/senselessclay/had60/keymaps/iso/keymap.c
index b46a6e2c6d..3c1323050e 100644
--- a/keyboards/senselessclay/had60/keymaps/iso/keymap.c
+++ b/keyboards/senselessclay/had60/keymaps/iso/keymap.c
@@ -25,7 +25,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),
     [1] = LAYOUT_all(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/senselessclay/had60/keymaps/via/keymap.c b/keyboards/senselessclay/had60/keymaps/via/keymap.c
index b8e85c81d7..ed21d8bad5 100644
--- a/keyboards/senselessclay/had60/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/had60/keymaps/via/keymap.c
@@ -32,7 +32,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),
     [_1] = LAYOUT_all(
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/sentraq/number_pad/keymaps/default/keymap.c b/keyboards/sentraq/number_pad/keymaps/default/keymap.c
index 3e722eb59b..621370ab15 100644
--- a/keyboards/sentraq/number_pad/keymaps/default/keymap.c
+++ b/keyboards/sentraq/number_pad/keymaps/default/keymap.c
@@ -57,6 +57,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,   RGB_HUD, RGB_HUI,
     KC_NO,   RGB_SAD, RGB_SAI, KC_NO,
     KC_NO,   RGB_VAD, RGB_VAI,
-    KC_NO,            KC_NO,   KC_NLCK
+    KC_NO,            KC_NO,   KC_NUM
   ),
 };
diff --git a/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
index 238c744ee3..1f28648d8a 100644
--- a/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
@@ -26,14 +26,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [_HLa] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,  KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,   KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                            KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS
         ),
     [_HLb] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
index e0644f0a21..c99c710adc 100644
--- a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [FUNCTION] = 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,   QK_BOOT, \
-        _______, _______, KC_CM_W, KC_CM_E, KC_MPRV, KC_MPLY, KC_MNXT, KC_CM_U, KC_CM_I, KC_CM_O, KC_CM_P, KC_PSCR, KC_SLCK, KC_PAUS, \
+        _______, _______, KC_CM_W, KC_CM_E, KC_MPRV, KC_MPLY, KC_MNXT, KC_CM_U, KC_CM_I, KC_CM_O, KC_CM_P, KC_PSCR, KC_SCRL, KC_PAUS, \
         _______, KC_CM_A, KC_CM_S, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_CM_K, KC_CM_L, _______, _______, _______, KC_PENT,          \
         _______, _______, KC_CM_Y, _______, KC_CM_C, MICMUTE, KC_CALC, KC_CM_N, KC_CM_M, _______, _______, _______,          KC_PGUP, KC_GMLK, \
         _______, _______, _______,                            _______,                                     _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c b/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
index 3d4969aa1e..0860b79e28 100644
--- a/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT( /* Layer 1 */
       TG(_SFX),KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL, \
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  ______, ______,  \
+      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,  \
       ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______, ______,   \
       ______,  ______,  KC_MPRV, KC_MPLY, KC_MNXT,______, ______, KC_PPLS,  KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,        ______, ______,  \
       ______,  ______,  ______,                           ______,                          KC_MSTP, ______, ______, ______ \
diff --git a/keyboards/sentraq/s60_x/keymaps/default/keymap.c b/keyboards/sentraq/s60_x/keymaps/default/keymap.c
index 7903159576..9b694e0920 100644
--- a/keyboards/sentraq/s60_x/keymaps/default/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [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,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c b/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
index 794b6d1b32..885b0d9831 100644
--- a/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [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,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, BL_DEC,  BL_TOGG, BL_INC,           _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c b/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
index 7b0f12c8cd..2ecc183633 100644
--- a/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
@@ -39,7 +39,7 @@ BL = Backlighting = In-Switch LED
 */
     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_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,           KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/sentraq/s65_x/keymaps/default/keymap.c b/keyboards/sentraq/s65_x/keymaps/default/keymap.c
index 9354e6e40a..66caedb7ba 100644
--- a/keyboards/sentraq/s65_x/keymaps/default/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/default/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = LAYOUT_65_ansi(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-    _______, TG(_AL), KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+    _______, TG(_AL), KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______, _______,
     _______,          TG(_UL), _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  _______, _______, KC_VOLU, _______,
     _______, _______, _______,                   _______,                            _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY
diff --git a/keyboards/sentraq/s65_x/keymaps/iso/keymap.c b/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
index d1023415f3..004b43a076 100644
--- a/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = 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,  _______, _______,
-    _______, TG(_AL), KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+    _______, TG(_AL), KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS,          _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______, _______, _______,
     _______, _______, TG(_UL), _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  _______, _______, KC_VOLU, _______,
     _______, _______, _______,                   _______,                            _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY
diff --git a/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c b/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
index 8e1496bc9c..3721bf2a25 100644
--- a/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = LAYOUT_65_ansi(
       KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, \
-      _______, TG(_AL), KC_UP, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, \
+      _______, TG(_AL), KC_UP, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, \
       _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, \
       _______,    TG(_UL), _______, TG(_CM), TG(_DV), _______, _______, _______, KC_HOME, KC_END, _______, _______, KC_VOLU, _______, \
       _______, _______, _______,               _______,                _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY),
diff --git a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
index 8589a797fe..c37f390865 100644
--- a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = LAYOUT_65_ansi(
       KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, \
-      KC_TRNS, TG(_AL), KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, \
+      KC_TRNS, TG(_AL), KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, \
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
       KC_TRNS,    TG(_UL), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, \
       KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_MPLY),
diff --git a/keyboards/sentraq/s65_x/keymaps/smt/keymap.c b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
index ab5eb8d820..0d5be02fc3 100644
--- a/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* 3: ANSI Fn layer */
   [_FL] = LAYOUT_65_ansi(
     KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_F13,   _______, \
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,  _______, \
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,  _______, \
     _______,  _______,  MO(_CL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______, \
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PGUP,  _______, \
     _______,  _______,  _______,                      _______,                                _______,  MO(_FL),  _______,  KC_HOME,  KC_PGDN,  KC_END),
diff --git a/keyboards/sets3n/kk980/keymaps/default/keymap.c b/keyboards/sets3n/kk980/keymaps/default/keymap.c
index 8118ce639c..b138247283 100644
--- a/keyboards/sets3n/kk980/keymaps/default/keymap.c
+++ b/keyboards/sets3n/kk980/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,          KC_DEL,  KC_INS,  KC_PGDN, KC_PGUP,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,         KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,         KC_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,
diff --git a/keyboards/sets3n/kk980/keymaps/via/keymap.c b/keyboards/sets3n/kk980/keymaps/via/keymap.c
index 8118ce639c..b138247283 100644
--- a/keyboards/sets3n/kk980/keymaps/via/keymap.c
+++ b/keyboards/sets3n/kk980/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,          KC_DEL,  KC_INS,  KC_PGDN, KC_PGUP,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,         KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,         KC_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,
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index c7baacc4a0..b8c7c19ea0 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -349,7 +349,7 @@ qmk_dict = {
     ":": "S(KC_SCLN)", "'": "KC_QUOT", "\"": "S(KC_QUOT)", "`": "KC_GRV",
     "~": "S(KC_GRV)", ",": "KC_COMM", "<": "S(KC_COMM)", ".": "KC_DOT",
     ">": "S(KC_DOT)", "/": "KC_SLSH", "?": "S(KC_SLSH)", "Caps": "KC_CAPS",
-    "Pr Scr": "KC_PSCR", "Scr Lck": "KC_SLCK", "Pause": "KC_BRK", "Insert": "KC_INS", "SInsert": "LSFT(KC_INS)",
+    "Pr Scr": "KC_PSCR", "Scr Lck": "KC_SCRL", "Pause": "KC_BRK", "Insert": "KC_INS", "SInsert": "LSFT(KC_INS)",
     "Home": "KC_HOME", "Pg Up": "KC_PGUP", "Del": "KC_DEL", "End": "KC_END",
     "Pg Down": "KC_PGDN", "> Arrow": "KC_RGHT", "< Arrow": "KC_LEFT",
     "v Arrow": "KC_DOWN", "^ Arrow": "KC_UP",
diff --git a/keyboards/singa/keymaps/amnesia0287/keymap.c b/keyboards/singa/keymaps/amnesia0287/keymap.c
index c42b73fdce..2c6015808e 100644
--- a/keyboards/singa/keymaps/amnesia0287/keymap.c
+++ b/keyboards/singa/keymaps/amnesia0287/keymap.c
@@ -22,7 +22,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BL] = LAYOUT_wkl( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_DEL,  \
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_DEL,  \
     KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, \
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, \
     KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, \
diff --git a/keyboards/singa/keymaps/default/keymap.c b/keyboards/singa/keymaps/default/keymap.c
index 558a1e4db6..f1152b170e 100644
--- a/keyboards/singa/keymaps/default/keymap.c
+++ b/keyboards/singa/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_wkl( /* Base */
-    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_DEL,
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_DEL,
     KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
     KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN,
diff --git a/keyboards/singa/keymaps/test/keymap.c b/keyboards/singa/keymaps/test/keymap.c
index d31c277198..ac653bd732 100644
--- a/keyboards/singa/keymaps/test/keymap.c
+++ b/keyboards/singa/keymaps/test/keymap.c
@@ -27,7 +27,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT( /* Base */
-    KC_ESC,  QK_BOOT, KC_F2,   KC_F3,  KC_F4, KC_F5,  KC_F6, KC_F7,   KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_DEL,
+    KC_ESC,  QK_BOOT, KC_F2,   KC_F3,  KC_F4, KC_F5,  KC_F6, KC_F7,   KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_DEL,
     KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,  KC_5,   KC_6,  KC_7,    KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,   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_NO,   KC_ENT,  KC_PGDN,
diff --git a/keyboards/singa/keymaps/via/keymap.c b/keyboards/singa/keymaps/via/keymap.c
index f3312a1a92..c23e470c83 100644
--- a/keyboards/singa/keymaps/via/keymap.c
+++ b/keyboards/singa/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK, KC_DEL,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_DEL,
     KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_NUHS, KC_ENT,  KC_PGDN,
diff --git a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c b/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
index e511cd5089..f63da310fd 100644
--- a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
+++ b/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
@@ -120,7 +120,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
  *                                        `-------------'       `--------------'
  */
     [_ADJ] = LAYOUT(
-  KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX,
+  KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX,
   KC_F7,   KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_P4,   KC_P5,   KC_P6,   KC_PENT, XXXXXXX, XXXXXXX, 
   XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_SPC,  XXXXXXX, XXXXXXX,
diff --git a/keyboards/sirius/unigo66/keymaps/default/keymap.c b/keyboards/sirius/unigo66/keymaps/default/keymap.c
index 63b4c2f065..e23d12f107 100644
--- a/keyboards/sirius/unigo66/keymaps/default/keymap.c
+++ b/keyboards/sirius/unigo66/keymaps/default/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                        `-------------'       `---------------'
  */
     [3] = LAYOUT(
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  KC_CALC,  KC_NLCK, KC_PSLS,KC_PAST,KC_PMNS, 
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  KC_CALC,  KC_NUM,  KC_PSLS,KC_PAST,KC_PMNS, 
   _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  KC_P7,   KC_P8,  KC_P9,  KC_PPLS, 
   _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  KC_P4,   KC_P5,  KC_P6,  KC_PEQL, 
   _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  KC_P1,   KC_P2,  KC_P3,  KC_PENT, 
diff --git a/keyboards/skeletn87/hotswap/keymaps/default/keymap.c b/keyboards/skeletn87/hotswap/keymaps/default/keymap.c
index 13f9e58e87..5c99732840 100644
--- a/keyboards/skeletn87/hotswap/keymaps/default/keymap.c
+++ b/keyboards/skeletn87/hotswap/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/skeletn87/hotswap/keymaps/via/keymap.c b/keyboards/skeletn87/hotswap/keymaps/via/keymap.c
index a4cd0e7e44..f87fa84b16 100644
--- a/keyboards/skeletn87/hotswap/keymaps/via/keymap.c
+++ b/keyboards/skeletn87/hotswap/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/skeletn87/soldered/keymaps/default/keymap.c b/keyboards/skeletn87/soldered/keymaps/default/keymap.c
index 13f9e58e87..5c99732840 100644
--- a/keyboards/skeletn87/soldered/keymaps/default/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/skeletn87/soldered/keymaps/iso/keymap.c b/keyboards/skeletn87/soldered/keymaps/iso/keymap.c
index e83eab8117..41e28dcd48 100644
--- a/keyboards/skeletn87/soldered/keymaps/iso/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_iso(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c b/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c
index 907f06dab9..85c4b9f8b3 100644
--- a/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_ansi_tsangan(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/skeletn87/soldered/keymaps/via/keymap.c b/keyboards/skeletn87/soldered/keymaps/via/keymap.c
index f9941a0f74..70a65e14d7 100644
--- a/keyboards/skeletn87/soldered/keymaps/via/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/skeletonkbd/skeletonnumpad/keymaps/default/keymap.c b/keyboards/skeletonkbd/skeletonnumpad/keymaps/default/keymap.c
index 0f6bd59563..417f903253 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/keymaps/default/keymap.c
+++ b/keyboards/skeletonkbd/skeletonnumpad/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_numpad_5x4(
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		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,
diff --git a/keyboards/skeletonkbd/skeletonnumpad/keymaps/via/keymap.c b/keyboards/skeletonkbd/skeletonnumpad/keymaps/via/keymap.c
index d6add70ce1..69ef63846e 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/keymaps/via/keymap.c
+++ b/keyboards/skeletonkbd/skeletonnumpad/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_numpad_5x4(
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		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,
diff --git a/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c b/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c
index 08a6086139..94c2f9ddb2 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c
+++ b/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c b/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c
index 89576787ff..dee3d04ae8 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c
+++ b/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER1] = LAYOUT_65_ansi(
         KC_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_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, QK_BOOT, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/skippys_custom_pcs/roopad/keymaps/default/keymap.c b/keyboards/skippys_custom_pcs/roopad/keymaps/default/keymap.c
index 2d8f5dce9e..50a848148f 100644
--- a/keyboards/skippys_custom_pcs/roopad/keymaps/default/keymap.c
+++ b/keyboards/skippys_custom_pcs/roopad/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER0] = LAYOUT(
-                 KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+                 KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_CALC, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_WSCH, KC_P4,   KC_P5,   KC_P6,
         KC_MAIL, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER1] = LAYOUT(
-                 KC_NLCK, KC_PSLS, KC_PAST, RGB_VAD,
+                 KC_NUM,  KC_PSLS, KC_PAST, RGB_VAD,
         KC_TRNS, KC_F7,   KC_F8,   KC_F9,   RGB_VAI,
         KC_TRNS, KC_F4,   KC_F5,   KC_F6,
         KC_TRNS, KC_F1,   KC_F2,   KC_F3,   RGB_MOD,
diff --git a/keyboards/skippys_custom_pcs/roopad/keymaps/via/keymap.c b/keyboards/skippys_custom_pcs/roopad/keymaps/via/keymap.c
index d4dedc9a0c..582100451c 100644
--- a/keyboards/skippys_custom_pcs/roopad/keymaps/via/keymap.c
+++ b/keyboards/skippys_custom_pcs/roopad/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER0] = LAYOUT(
-                 KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+                 KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_CALC, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_WSCH, KC_P4,   KC_P5,   KC_P6,
         KC_MAIL, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER1] = LAYOUT(
-                 KC_NLCK, KC_PSLS, KC_PAST, RGB_VAD,
+                 KC_NUM,  KC_PSLS, KC_PAST, RGB_VAD,
         KC_TRNS, KC_F7,   KC_F8,   KC_F9,   RGB_VAI,
         KC_TRNS, KC_F4,   KC_F5,   KC_F6,
         KC_TRNS, KC_F1,   KC_F2,   KC_F3,   RGB_MOD,
diff --git a/keyboards/smithrune/iron180/keymaps/default/keymap.c b/keyboards/smithrune/iron180/keymaps/default/keymap.c
index d78f60e118..f1a0c5ee47 100755
--- a/keyboards/smithrune/iron180/keymaps/default/keymap.c
+++ b/keyboards/smithrune/iron180/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
diff --git a/keyboards/smithrune/iron180/keymaps/via/keymap.c b/keyboards/smithrune/iron180/keymaps/via/keymap.c
index d78f60e118..f1a0c5ee47 100755
--- a/keyboards/smithrune/iron180/keymaps/via/keymap.c
+++ b/keyboards/smithrune/iron180/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
diff --git a/keyboards/sneakbox/disarray/ortho/keymaps/default/keymap.c b/keyboards/sneakbox/disarray/ortho/keymaps/default/keymap.c
index b978f78468..3c431ce97d 100644
--- a/keyboards/sneakbox/disarray/ortho/keymaps/default/keymap.c
+++ b/keyboards/sneakbox/disarray/ortho/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BASE] = LAYOUT(
         KC_AUDIO_MUTE,
-        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,          KC_5,    KC_6,    KC_7,          KC_8,    KC_9,    KC_0,     KC_BSPC,    KC_NLCK,    KC_SLSH,    KC_PAST,    KC_MINS,
+        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_NUM,     KC_SLSH,    KC_PAST,    KC_MINS,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,          KC_T,    KC_Y,    KC_U,          KC_I,    KC_O,    KC_P,     KC_DEL,     KC_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_P4,      KC_P5,      KC_P6,      KC_EQL,
 	KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,          KC_B,    KC_N,    KC_M,          KC_COMM, KC_DOT,  KC_SLSH,  KC_ENT,     KC_P1,      KC_P2,      KC_P3,      KC_PENT,
diff --git a/keyboards/sneakbox/disarray/ortho/keymaps/via/keymap.c b/keyboards/sneakbox/disarray/ortho/keymaps/via/keymap.c
index 51e2615fdf..c0bb786bea 100644
--- a/keyboards/sneakbox/disarray/ortho/keymaps/via/keymap.c
+++ b/keyboards/sneakbox/disarray/ortho/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BASE] = LAYOUT(
         KC_AUDIO_MUTE,
-        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,          KC_5,    KC_6,    KC_7,          KC_8,    KC_9,    KC_0,     KC_BSPC,    KC_NLCK,    KC_SLSH,    KC_PAST,    KC_MINS,
+        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_NUM,     KC_SLSH,    KC_PAST,    KC_MINS,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,          KC_T,    KC_Y,    KC_U,          KC_I,    KC_O,    KC_P,     KC_DEL,     KC_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_P4,      KC_P5,      KC_P6,      KC_EQL,
 	KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,          KC_B,    KC_N,    KC_M,          KC_COMM, KC_DOT,  KC_SLSH,  KC_ENT,     KC_P1,      KC_P2,      KC_P3,      KC_PENT,
diff --git a/keyboards/sofle/keymaps/flare576/keymap.c b/keyboards/sofle/keymaps/flare576/keymap.c
index fb2c7e7a9e..e9e34edb9c 100644
--- a/keyboards/sofle/keymaps/flare576/keymap.c
+++ b/keyboards/sofle/keymaps/flare576/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MOUS] = LAYOUT(
   LCTL(KC_W), LALT(KC_A), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
   _______,    KC_PSCR,    XXXXXXX, KC_MS_U, KC_HOME, KC_PGUP,                   KC_WH_U, KC_WH_D, KC_WH_L, KC_WH_R,  XXXXXXX, _COMP1,
-  _______,    KC_SLCK,    KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, XXXXXXX, _COMP2,
+  _______,    KC_SCRL,    KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, XXXXXXX, _COMP2,
   _______,    KC_PAUS,    XXXXXXX, XXXXXXX, KC_END,  KC_PGDN, _______, _______, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
                           XXXXXXX, _______, _______, _______, _______, _______, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX
 ),
diff --git a/keyboards/sofle/keymaps/helltm/keymap.c b/keyboards/sofle/keymaps/helltm/keymap.c
index 4624bc4700..d2a212b989 100644
--- a/keyboards/sofle/keymaps/helltm/keymap.c
+++ b/keyboards/sofle/keymaps/helltm/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT(
   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-  _______, XXXXXXX,   KC_UP, XXXXXXX,   QK_BOOT, XXXXXXX,                       KC_PRVWD, KC_NXTWD, KC_PSCR,  KC_SLCK, KC_PAUS,  KC_F12,
+  _______, XXXXXXX,   KC_UP, XXXXXXX,   QK_BOOT, XXXXXXX,                       KC_PRVWD, KC_NXTWD, KC_PSCR,  KC_SCRL, KC_PAUS,  KC_F12,
   _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,                       XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGUP, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,       _______, XXXXXXX, KC_APP, KC_DEL, KC_END, KC_PGDN, XXXXXXX,
                     CG_TOGG, KC_RALT, _______, KC_RCTL, _______,       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c b/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
index e7d03161c3..1b50ca727b 100644
--- a/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
+++ b/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            `----------------------------------'            '------''---------------------------'
  */
 [2] = LAYOUT(
-  _______, KC_PSCR, KC_SLCK, KC_PAUSE, _______,  _______,                       _______, _______, _______, _______,  _______, _______,
+  _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______,  _______,                       _______, _______, _______, _______,  _______, _______,
   _______, KC_INS,  KC_HOME, KC_PGUP,  XXXXXXX,  XXXXXXX,                       _______, _______, _______, _______,  _______, _______,
   _______, KC_DEL,  KC_END,  KC_PGDN,  XXXXXXX,  XXXXXXX,                       KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, XXXXXXX, XXXXXXX,
   _______, KC_UNDO, KC_CUT,  KC_COPY,  KC_PASTE, XXXXXXX, _______,     _______, XXXXXXX, _______, XXXXXXX, _______,  XXXXXXX, _______,
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index 108d05a68a..67d7c5cee8 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -270,7 +270,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_NUMPAD] = LAYOUT(
   //,------------------------------------------------.                    ,---------------------------------------------------.
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   _______, KC_NLCK, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   _______, KC_NUM,  XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_CIRC, KC_P7,  KC_P8,   KC_P9,   KC_ASTR, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
diff --git a/keyboards/sowbug/68keys/keymaps/default/keymap.c b/keyboards/sowbug/68keys/keymaps/default/keymap.c
index 73ec6c38ef..74261ca235 100644
--- a/keyboards/sowbug/68keys/keymaps/default/keymap.c
+++ b/keyboards/sowbug/68keys/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       _______,      _______, KC_HOME,
   //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     BL_TOGG,     BL_STEP, KC_UP,   _______, _______, _______, _______, _______, RGB_SPI, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_BSLS,       _______, KC_END,
+     BL_TOGG,     BL_STEP, KC_UP,   _______, _______, _______, _______, _______, RGB_SPI, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_BSLS,       _______, KC_END,
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
      _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_QUOT,       KC_ENTER,
   //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
diff --git a/keyboards/sowbug/ansi_tkl/keymaps/default/keymap.c b/keyboards/sowbug/ansi_tkl/keymaps/default/keymap.c
index 7fc1aaef00..0015ae8c34 100644
--- a/keyboards/sowbug/ansi_tkl/keymaps/default/keymap.c
+++ b/keyboards/sowbug/ansi_tkl/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
 
 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_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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,
diff --git a/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c b/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
index 5a32dcc016..cd899e6f31 100644
--- a/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
+++ b/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
@@ -20,7 +20,7 @@
 
 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_SLCK, KC_PAUS, \
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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, \
diff --git a/keyboards/soy20/keymaps/default/keymap.c b/keyboards/soy20/keymaps/default/keymap.c
index e9e31ad1ef..f8d7295a49 100644
--- a/keyboards/soy20/keymaps/default/keymap.c
+++ b/keyboards/soy20/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_DEL, KC_SCLN, KC_PDOT, KC_P0),
 
 	[1] = LAYOUT_ortho_5x4(
-		KC_NLCK, KC_PSCR, KC_TRNS, KC_TRNS,
+		KC_NUM,  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,
diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c
index 1678fcd34a..0e3cae3628 100644
--- a/keyboards/soy20/keymaps/via/keymap.c
+++ b/keyboards/soy20/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_DEL, KC_SCLN, KC_PDOT, KC_P0),
 
 	[1] = LAYOUT_ortho_5x4(
-		KC_NLCK, KC_PSCR, KC_TRNS, KC_TRNS,
+		KC_NUM,  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,
diff --git a/keyboards/specskeys/keymaps/default/keymap.c b/keyboards/specskeys/keymaps/default/keymap.c
index 595d4939aa..4356692e64 100644
--- a/keyboards/specskeys/keymaps/default/keymap.c
+++ b/keyboards/specskeys/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: Winkey */
     LAYOUT_tkl_iso_tsangan(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,              KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/spiderisland/split78/keymaps/default/keymap.c b/keyboards/spiderisland/split78/keymaps/default/keymap.c
index 7841d41e1d..834017e537 100644
--- a/keyboards/spiderisland/split78/keymaps/default/keymap.c
+++ b/keyboards/spiderisland/split78/keymaps/default/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT(
         QK_BOOT,            KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  KC_DEL,
-        KC_NLCK, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        KC_NUM,  XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-        KC_SLCK,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_SLSH, KC_PGUP, XXXXXXX,
+        KC_SCRL,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_SLSH, KC_PGUP, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_P0,            KC_PDOT, KC_PENT, KC_HOME, KC_PGDN, KC_END
     )
 };
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
index 8cc7adfe70..da56f81fc4 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
@@ -22,7 +22,7 @@
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_P0", "KC_PDOT"
     ],
     [
-      "KC_TRNS", "KC_NLCK", "KC_CAPS", "KC_SLCK", "KC_LNG1", "KC_LNG2", "KC_TRNS", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_NUM", "KC_CAPS", "KC_SCRL", "KC_LNG1", "KC_LNG2", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "RGB_TOG", "RGB_SAI", "RGB_HUI", "RGB_VAI", "RGB_MOD", "KC_TRNS", "KC_INS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_NO", "RGB_SAD", "RGB_HUD", "RGB_VAD", "RGB_RMOD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_DEL", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
index 359e50df71..6037a2e96d 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_MPRV, KC_F1, KC_F2, KC_F3, KC_F12, KC_LPRN, KC_LT, KC_GT, KC_RPRN, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_EQL, KC_PENT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT),
     [_SPECIALS] = LAYOUT(
-        KC_TRNS, KC_NLCK, KC_CAPS, KC_SLCK, KC_LNG1, KC_LNG2, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_NUM, KC_CAPS, KC_SCRL, KC_LNG1, KC_LNG2, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_NO, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
@@ -36,7 +36,7 @@ LEADER_EXTERNS();
 void keyboard_post_init_user(void) {
     led_t led_state = host_keyboard_led_state();
     if (!led_state.num_lock) {
-        tap_code(KC_NLCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/keyboards/splitkb/kyria/keymaps/default/keymap.c b/keyboards/splitkb/kyria/keymaps/default/keymap.c
index 20cb279ff6..dacbc423b2 100644
--- a/keyboards/splitkb/kyria/keymaps/default/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/default/keymap.c
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NAV] = LAYOUT(
       _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
       _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
-      _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
+      _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c b/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
index 9e5224b28d..5c217ae65b 100644
--- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NAV] = LAYOUT(
       _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
       _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
-      _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
+      _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c b/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
index 20d4c809b6..b2ba6b71eb 100644
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
@@ -311,7 +311,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NAVIGATION] = LAYOUT(
       _______, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,                                     KC_PGUP, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______,
       _______,  KC_APP, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, _______,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, _______,
                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 /*
diff --git a/keyboards/splitkb/kyria/keymaps/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
index 411295e86c..a67b82b172 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [_NAV] = LAYOUT(
  _______, KC_BRIU, KC_MNXT, KC_MFFD, KC_MPLY, KC_VOLU,                                     KC_HOME, KC_PGUP,   KC_UP, KC_PGDN, _______,  KC_DEL,
- _______, KC_BRID, KC_MPRV, KC_MRWD, KC_MSTP, KC_VOLD,                                      KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_SLCK, KC_BSPC,
+ _______, KC_BRID, KC_MPRV, KC_MRWD, KC_MSTP, KC_VOLD,                                      KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_SCRL, KC_BSPC,
  KC_LSFT, US_ACUT, US_DGRV, US_DCIR, US_DIAE, KC_MUTE, _______,  UC_MOD, KC_RSFT,  KC_APP, KC_PSCR, XP(CEDIL,CEDIL_MAJ), XP(SECTION,DEGREE), _______, LCTL(KC_S),  KC_INS,
                             KC_LCTL, KC_LGUI, KC_LALT, _______,   MO(1),   MO(2), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V)
     ),
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
index 56f998e24f..c35b209ff6 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NAV] = LAYOUT(
       _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
       _______, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
-      _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
+      _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
index ec0b7a1a31..cbe65ba53a 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                        `----------------------------------'  `----------------------------------'
  */
     [_NAV] = LAYOUT_wrapper(
-      _______, __VIM_L1___________________________________,                                     __NAV_R1___________________________________, KC_SLCK,
+      _______, __VIM_L1___________________________________,                                     __NAV_R1___________________________________, KC_SCRL,
       _______, __BLANK_W_GACS_____________________________,                                     __NAV_R2___________________________________, KC_CAPS,
       _______, __BLANK____________________________________, _______, _______, _______, _______, __NAV_R3___________________________________, _______,
                                  __BLANK____________________________________, __BLANK____________________________________
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
index 222759d60d..39ef640e39 100644
--- a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_ESC,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
       KC_TAB,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
       KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,    KC_LEAD,  L_RAISE, L_LOWER, KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                               KC_MPLY,KC_LGUI,KC_LCTL, KC_SPACE, KC_LALT, KC_RCTL,  KC_ENT, L_NAV,   KC_RALT, KC_SLCK
+                               KC_MPLY,KC_LGUI,KC_LCTL, KC_SPACE, KC_LALT, KC_RCTL,  KC_ENT, L_NAV,   KC_RALT, KC_SCRL
     ),
 
 /*
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
index 3cd9df27fb..27db686b66 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                        `----------------------------------'  `----------------------------------'
  */
     [NAV] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, KC_SLCK,
+      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, KC_SCRL,
       _______, _______, _______, _______, _______, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_CAPS,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
index 53b6ee77b1..965b306bb7 100644
--- a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                /* ^^^^ use these */
 
      KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
-     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_SCRL,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
      KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
                          KC_NO,    KC_NO,
      /*thumb*/ _______,  _______,  _______,
diff --git a/keyboards/splitkb/kyria/keymaps/via/keymap.c b/keyboards/splitkb/kyria/keymaps/via/keymap.c
index 6835652a70..9bbf127790 100644
--- a/keyboards/splitkb/kyria/keymaps/via/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/via/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NAV] = LAYOUT_via(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
       _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
-      _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
+      _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/splitography/keymaps/default/keymap.c b/keyboards/splitography/keymaps/default/keymap.c
index 91304c5507..8fbd541810 100644
--- a/keyboards/splitography/keymaps/default/keymap.c
+++ b/keyboards/splitography/keymaps/default/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_ORANGE] = LAYOUT(
-        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX,
+        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
         KC_LALT, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX,
         KC_LSFT, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, KC_BSLS, KC_LGUI,
                                             _______, BLUE,    KC_TAB,  KC_LCTL
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_GREEN] = LAYOUT(
-        GEMINI,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
+        GEMINI,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
         KC_LALT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_CAPS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
         KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TG_NUM,  KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
                                             _______, _______, XXXXXXX, KC_LCTL
diff --git a/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c b/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c
index 5297af4c76..83874f7760 100644
--- a/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c
+++ b/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_ORANGE] = LAYOUT(
-        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX,
+        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
         KC_LCTL, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX,
         KC_LALT, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, KC_BSLS, KC_LGUI,
                                             _______, BLUE,    KC_TAB,  KC_LSFT
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_GREEN] = LAYOUT(
-        TXBOLT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
+        TXBOLT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
         KC_LCTL, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_CAPS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
         KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TG_NUM,  KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
                                             _______, _______, XXXXXXX, KC_LSFT
diff --git a/keyboards/splitography/keymaps/dvorak/keymap.c b/keyboards/splitography/keymaps/dvorak/keymap.c
index d8cd6ae8f3..1d9ff41dd1 100644
--- a/keyboards/splitography/keymaps/dvorak/keymap.c
+++ b/keyboards/splitography/keymaps/dvorak/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_ORANGE] = LAYOUT(
-        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX,
+        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
         KC_LALT, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX,
         KC_LSFT, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, KC_BSLS, KC_LGUI,
                                             _______, BLUE,    KC_TAB,  KC_LCTL
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_GREEN] = LAYOUT(
-        TXBOLT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
+        TXBOLT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
         KC_LALT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_CAPS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
         KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TG_NUM,  KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
                                             _______, _______, XXXXXXX, KC_LCTL
diff --git a/keyboards/splitography/keymaps/jeandeaual/keymap.c b/keyboards/splitography/keymaps/jeandeaual/keymap.c
index 87c4159443..9b5c3d554d 100644
--- a/keyboards/splitography/keymaps/jeandeaual/keymap.c
+++ b/keyboards/splitography/keymaps/jeandeaual/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_ORANGE] = LAYOUT(
-        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX,
+        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
         KC_LCTL, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX,
         KC_LSFT, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, KC_BSLS, KC_LGUI,
                                             _______, BLUE,    KC_TAB,  KC_LALT
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_GREEN] = LAYOUT(
-        GEMINI,  QWERTY,  DVORAK,  XXXXXXX, XXXXXXX, KC_SLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
+        GEMINI,  QWERTY,  DVORAK,  XXXXXXX, XXXXXXX, KC_SCRL, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
         KC_LCTL, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_CAPS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
         KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TG_NUM,  KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
                                             _______, _______, XXXXXXX, KC_LALT
diff --git a/keyboards/splitography/keymaps/multi/keymap.c b/keyboards/splitography/keymaps/multi/keymap.c
index 7d847e40b6..f1a083e03f 100644
--- a/keyboards/splitography/keymaps/multi/keymap.c
+++ b/keyboards/splitography/keymaps/multi/keymap.c
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_ORANGE] = LAYOUT(
-        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX,
+        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
         KC_LALT, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX,
         KC_LSFT, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, KC_BSLS, KC_LGUI,
                                             _______, BLUE,    KC_TAB,  KC_LCTL
@@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                             └──────┴──────┴──────┴──────┘
 
     [_GREEN] = LAYOUT(
-        TXBOLT,  QWERTY,  DVORAK,  COLEMAK, WORKMAN, KC_SLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
+        TXBOLT,  QWERTY,  DVORAK,  COLEMAK, WORKMAN, KC_SCRL, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
         KC_LALT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_CAPS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
         KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TG_NUM,  KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
                                             _______, _______, XXXXXXX, KC_LCTL
diff --git a/keyboards/sporewoh/banime40/keymaps/default/keymap.c b/keyboards/sporewoh/banime40/keymaps/default/keymap.c
index 7c6f5073f7..7b5e492686 100644
--- a/keyboards/sporewoh/banime40/keymaps/default/keymap.c
+++ b/keyboards/sporewoh/banime40/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT_ortho_4x10(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
     KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
-    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_CAPS, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NUM,  KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
   [3] = LAYOUT_ortho_4x10(
     KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
diff --git a/keyboards/sporewoh/banime40/keymaps/via/keymap.c b/keyboards/sporewoh/banime40/keymaps/via/keymap.c
index 064b2f13c7..d075deb44b 100644
--- a/keyboards/sporewoh/banime40/keymaps/via/keymap.c
+++ b/keyboards/sporewoh/banime40/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT_ortho_4x10(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
     KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
-    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_CAPS, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NUM,  KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
   [3] = LAYOUT_ortho_4x10(
     KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
diff --git a/keyboards/studiokestra/galatea/keymaps/default/keymap.c b/keyboards/studiokestra/galatea/keymaps/default/keymap.c
index 974f59607c..29693ca8c7 100644
--- a/keyboards/studiokestra/galatea/keymaps/default/keymap.c
+++ b/keyboards/studiokestra/galatea/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 
 
     [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,     KC_F13,                KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,     KC_F13,                KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,  KC_ENT,     
diff --git a/keyboards/studiokestra/galatea/keymaps/via/keymap.c b/keyboards/studiokestra/galatea/keymaps/via/keymap.c
index 7733e59737..9803d0dc07 100644
--- a/keyboards/studiokestra/galatea/keymaps/via/keymap.c
+++ b/keyboards/studiokestra/galatea/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BASE] = LAYOUT_all(
-       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,     KC_F13,                KC_PSCR, KC_SLCK, KC_PAUS,
+       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,     KC_F13,                KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,  KC_ENT,     
diff --git a/keyboards/suavity/ehan/keymaps/default/keymap.c b/keyboards/suavity/ehan/keymaps/default/keymap.c
index ae18a22f9e..7e84ba614c 100755
--- a/keyboards/suavity/ehan/keymaps/default/keymap.c
+++ b/keyboards/suavity/ehan/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi_split_bs_rshift_lspace(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, 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,
diff --git a/keyboards/suavity/ehan/keymaps/default_iso/keymap.c b/keyboards/suavity/ehan/keymaps/default_iso/keymap.c
index bcab38f589..238c11bde4 100644
--- a/keyboards/suavity/ehan/keymaps/default_iso/keymap.c
+++ b/keyboards/suavity/ehan/keymaps/default_iso/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_iso_split_bs_rshift_lspace(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                      KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/suavity/ehan/keymaps/via/keymap.c b/keyboards/suavity/ehan/keymaps/via/keymap.c
index c0c887b95c..db28158752 100644
--- a/keyboards/suavity/ehan/keymaps/via/keymap.c
+++ b/keyboards/suavity/ehan/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi_split_bs_rshift_lspace(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, 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,
diff --git a/keyboards/superuser/tkl/keymaps/default/keymap.c b/keyboards/superuser/tkl/keymaps/default/keymap.c
index b0ab538247..e93f9b3889 100644
--- a/keyboards/superuser/tkl/keymaps/default/keymap.c
+++ b/keyboards/superuser/tkl/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                KC_ENT,
diff --git a/keyboards/superuser/tkl/keymaps/via/keymap.c b/keyboards/superuser/tkl/keymaps/via/keymap.c
index a2bea4e6e1..e1175edc59 100644
--- a/keyboards/superuser/tkl/keymaps/via/keymap.c
+++ b/keyboards/superuser/tkl/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,                  KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                KC_ENT,
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
index 57fe92b1d7..bedf6ea8fc 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_HOME,
+    KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_HOME,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴─────────┼─────────┤ */
     KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_TAB,        KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,       KC_END,
 /* ├─────────┼─────────┼─────────┼─────────┼──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬───────────┼─────────┤ */
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
index ac049cbc40..0a014ed027 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi(
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-	  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_HOME,
+	  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_HOME,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
 	  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_TAB, 	     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,       KC_END,
 /* ├─────────┼─────────┼─────────┤         ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
index 75059041f4..1c58377218 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_iso(
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────────────────┬─────────┐ */
-	  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_HOME,
+	  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_HOME,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
 	  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_PGUP,
 /* ├─────────┼─────────┼─────────┤         ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c b/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c
index e2496202df..aae7e1c8c1 100644
--- a/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c
+++ b/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all (
-		BL_STEP, BL_TOGG, MO(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_PSCR, KC_SLCK, KC_PAUS, 
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP, 
+		BL_STEP, BL_TOGG, MO(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_PSCR, KC_SCRL, KC_PAUS, 
+		KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP, 
 		KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN, 
 		KC_P4,   KC_P5,   KC_P6,   KC_PPLS,     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_ENT, 
 		KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT, KC_LSFT,              KC_UP, 
diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c b/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c
index 39238e1286..5012f11d0d 100644
--- a/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c
+++ b/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c
@@ -24,8 +24,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_ansi_wkl (
-		BL_STEP, BL_TOGG, MO(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_PSCR, KC_SLCK, KC_PAUS, 
-		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP, 
+		BL_STEP, BL_TOGG, MO(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_PSCR, KC_SCRL, KC_PAUS, 
+		KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP, 
 		KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN, 
 		KC_P4,   KC_P5,   KC_P6,   KC_PPLS,     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                    KC_ENT, 
 		KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT, KC_LSFT,              KC_UP, 
diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/via/keymap.c b/keyboards/switchplate/southpaw_fullsize/keymaps/via/keymap.c
index f8f8a1ce92..93e3053cda 100644
--- a/keyboards/switchplate/southpaw_fullsize/keymaps/via/keymap.c
+++ b/keyboards/switchplate/southpaw_fullsize/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all (
-        BL_STEP, BL_TOGG, MO(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_PSCR, KC_SLCK, KC_PAUS, 
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP, 
+        BL_STEP, BL_TOGG, MO(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_PSCR, KC_SCRL, KC_PAUS, 
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP, 
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN, 
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_ENT, 
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT, KC_LSFT,              KC_UP, 
diff --git a/keyboards/tada68/keymaps/amnesia0287/keymap.c b/keyboards/tada68/keymaps/amnesia0287/keymap.c
index bf84462de5..667b8fbcfe 100644
--- a/keyboards/tada68/keymaps/amnesia0287/keymap.c
+++ b/keyboards/tada68/keymaps/amnesia0287/keymap.c
@@ -51,14 +51,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_HLa] = LAYOUT_ansi(
    KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_DEL,KC_INS,  \
-     KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______, \
+     KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______, \
       _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______, \
            _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______, \
     _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
 
 [_HLb] = LAYOUT_ansi(
    KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_DEL,KC_INS,  \
-     KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,  KC_UP,_______,     _______,_______, \
+     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/tada68/keymaps/bazooka/keymap.c b/keyboards/tada68/keymaps/bazooka/keymap.c
index dfe0feb12f..18da58607b 100644
--- a/keyboards/tada68/keymaps/bazooka/keymap.c
+++ b/keyboards/tada68/keymaps/bazooka/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FUNC] = LAYOUT_ansi(
   _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,KC_WHOM, \
-  _______,_______,_______,_______,_______,_______,_______,_______,MAC_TOG,_______,KC_PSCR,KC_SLCK,KC_PAUS,KC_CALC, KC_INS,  \
+  _______,_______,_______,_______,_______,_______,_______,_______,MAC_TOG,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_CALC, KC_INS,  \
   _______,_______,_______,_______,_______,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,        _______,KC_HOME, \
           _______,BL_TOGG, BL_DEC, BL_INC,_______,_______,_______,MOU_TOG,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_PGUP,KC_END , \
   _______,WIN_LCK,_______,                        _______,                _______,_______,_______,KC_HOME,KC_PGDN,KC_END),
diff --git a/keyboards/tada68/keymaps/emdarcher/keymap.c b/keyboards/tada68/keymaps/emdarcher/keymap.c
index d6ac2f7bc1..4fa518e1c5 100755
--- a/keyboards/tada68/keymaps/emdarcher/keymap.c
+++ b/keyboards/tada68/keymaps/emdarcher/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_ansi(
   KC_GRV,  KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,
-  _______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS, _______,KC_HOME,
+  _______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS, _______,KC_HOME,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MRWD,KC_MFFD,        _______, KC_END,
   _______,        _______,BL_BRTG,BL_DEC, BL_TOGG,BL_INC, KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
   _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_CL] = LAYOUT_ansi(
   KC_GRV,  KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS, _______,KC_HOME,
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS, _______,KC_HOME,
   _______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,_______,_______,         _______, KC_END,
   _______,        _______,_______,_______,_______,_______,KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
   _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
diff --git a/keyboards/tada68/keymaps/kbp-v60/keymap.c b/keyboards/tada68/keymaps/kbp-v60/keymap.c
index e7eef90197..6e25107b80 100755
--- a/keyboards/tada68/keymaps/kbp-v60/keymap.c
+++ b/keyboards/tada68/keymaps/kbp-v60/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FL] = LAYOUT_ansi(
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS, \
   KC_CAPS, _______, KC_UP,   _______, KC_BSPC, KC_PSCR, KC_PGUP, KC_HOME, KC_END,  KC_PAUS, KC_UP,   _______, _______, _______, KC_END, \
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  KC_SLCK, KC_PGDN, KC_TLDE, KC_INS,  KC_LEFT, KC_DOWN, KC_RIGHT,         _______, KC_PSCR,\
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  KC_SCRL, KC_PGDN, KC_TLDE, KC_INS,  KC_LEFT, KC_DOWN, KC_RIGHT,         _______, KC_PSCR,\
   _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,\
   _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
 };
diff --git a/keyboards/tada68/keymaps/mattgemmell/keymap.c b/keyboards/tada68/keymaps/mattgemmell/keymap.c
index f2afd3cd48..93b2ebc1c7 100644
--- a/keyboards/tada68/keymaps/mattgemmell/keymap.c
+++ b/keyboards/tada68/keymaps/mattgemmell/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_iso(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_BRMU, \
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          KC_BRMD, \
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,          KC_BRMD, \
     _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, KC_HOME, \
     _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_MS_U, KC_END,  \
     _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/keyboards/takashicompany/compacx/keymaps/default/keymap.c b/keyboards/takashicompany/compacx/keymaps/default/keymap.c
index 8e8f20f54e..9ed4a4a83a 100644
--- a/keyboards/takashicompany/compacx/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/compacx/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     
     LAYOUT(
-        KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
         KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/takashicompany/compacx/keymaps/via/keymap.c b/keyboards/takashicompany/compacx/keymaps/via/keymap.c
index 8e8f20f54e..9ed4a4a83a 100644
--- a/keyboards/takashicompany/compacx/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/compacx/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     
     LAYOUT(
-        KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
         KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
index 58e7a168bc..e88fc04c9b 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     LAYOUT(
-        KC_NLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_NUM,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
index 4088a593dc..c8391bff21 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
@@ -24,7 +24,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_DEL,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_DEL,
         KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
         KC_P4, KC_P5, KC_P6, KC_PCMM,KC_LCTL, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END,
         KC_P1, KC_P2, KC_P3, KC_PEQL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, KC_PGUP,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
       LAYOUT(
-        KC_NLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_NUM,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS,
diff --git a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
index 77e18659ff..ef86c4b0b7 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     LAYOUT(
-        KC_NLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_NUM,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/takashiski/hecomi/keymaps/default/keymap.c b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
index b59577a0d5..30f053d34f 100644
--- a/keyboards/takashiski/hecomi/keymaps/default/keymap.c
+++ b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			),
 	[FN]=LAYOUT(
 			KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,                  KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_INS,KC_DEL,
-			KC_TAB  ,KC_9,KC_7,KC_5,KC_3,KC_1,KC_Y,                 KC_Y,KC_U,KC_PSCR,KC_SLCK,KC_PAUSE,KC_UP,KC_RBRC,KC_BSPC,
+			KC_TAB  ,KC_9,KC_7,KC_5,KC_3,KC_1,KC_Y,                 KC_Y,KC_U,KC_PSCR,KC_SCRL,KC_PAUSE,KC_UP,KC_RBRC,KC_BSPC,
 			KC_CAPS ,KC_8,KC_6,KC_4,KC_2,KC_0,                     KC_SFT(KC_8),KC_SLSH,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,KC_ENT,
 			KC_LSFT   ,KC_Z,KC_X,KC_C,KC_V,KC_B,               KC_B,KC_SFT(KC_EQL),KC_MINS,KC_END,KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS,
 			KC_LCTRL,KC_LGUI,KC_LALT,KC_INT5,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_INT4,KC_RALT,KC_RGUI,KC_RCTRL
diff --git a/keyboards/tanuki/keymaps/tucznak/keymap.c b/keyboards/tanuki/keymaps/tucznak/keymap.c
index 35272e641c..a2b8a05001 100644
--- a/keyboards/tanuki/keymaps/tucznak/keymap.c
+++ b/keyboards/tanuki/keymaps/tucznak/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DN] = LAYOUT(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, _______,
-        _______, KC_NLCK, _______, _______, KC_PPLS, KC_PMNS, KC_PAST, KC_PSLS, KC_COMM, KC_DOT,  _______, 
+        _______, KC_NUM,  _______, _______, KC_PPLS, KC_PMNS, KC_PAST, KC_PSLS, KC_COMM, KC_DOT,  _______, 
                  MO(_FN), _______, _______, LCA(KC_DEL),      LCA(KC_INS),      _______, _______
     ),
 	
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NAV] = LAYOUT(
         _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, KC_UP,   KC_INS,  KC_DEL, 
         _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, 
-        _______, KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, 
+        _______, KC_CAPS, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, 
                  _______, _______, _______, _______,          _______,          _______, KC_APP
     ),
 	
diff --git a/keyboards/tau4/keymaps/default/keymap.c b/keyboards/tau4/keymaps/default/keymap.c
index 9421a6cce5..775ec3a8f4 100755
--- a/keyboards/tau4/keymaps/default/keymap.c
+++ b/keyboards/tau4/keymaps/default/keymap.c
@@ -41,14 +41,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LOWER] = LAYOUT_ortho_4x12(
         KC_VOLD, KC_EXLM,       KC_AT,    KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,      KC_RPRN,       KC_INS,
-        KC_NLCK, KC_F7,         KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_LCBR, KC_RCBR, KC_UNDS,      KC_PLUS,       LSFT(KC_NUHS),
+        KC_NUM,  KC_F7,         KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_LCBR, KC_RCBR, KC_UNDS,      KC_PLUS,       LSFT(KC_NUHS),
         KC_TRNS, LSFT(KC_NUBS), KC_GRAVE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_GRV), LSFT(KC_NUBS), 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),
 
     [_RAISE] = LAYOUT_ortho_4x12(
         KC_VOLU, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
         KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_NUHS,
-        KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV,  KC_NUBS, KC_TRNS,
+        KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV,  KC_NUBS, KC_TRNS,
         KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT),
 
     [_ADJUST] = LAYOUT_ortho_4x12(
diff --git a/keyboards/team0110/p1800fl/keymaps/default/keymap.c b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
index 1125d2aa58..e486e8d339 100644
--- a/keyboards/team0110/p1800fl/keymaps/default/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT(
-        KC_GESC,          KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,        KC_NLCK, KC_PSLS, KC_PAST, KC_PEQL,
+        KC_GESC,          KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,        KC_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_BSLS,                 KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,          KC_A,     KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_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,  KC_LALT,                   KC_SPC,             MO(1), KC_RALT, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT 
     ),
     [1] = LAYOUT(
-        KC_GRV,           KC_F1,    KC_F2, KC_F3,     KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,           KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        KC_GRV,           KC_F1,    KC_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_PSCR, KC_SCRL, KC_PAUS, _______,
         _______,          RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,                   KC_INS, KC_HOME, KC_PGUP, _______,
         _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDN, _______,
         _______, _______, BL_TOGG,  BL_BRTG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
diff --git a/keyboards/team0110/p1800fl/keymaps/via/keymap.c b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
index 986a3905d9..50eadcbbd7 100644
--- a/keyboards/team0110/p1800fl/keymaps/via/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
@@ -18,14 +18,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT(
-        KC_GESC,          KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,        KC_NLCK, KC_PSLS, KC_PAST, KC_PEQL,
+        KC_GESC,          KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,        KC_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_BSLS,                 KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,          KC_A,     KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_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,  KC_LALT,                   KC_SPC,             MO(1), KC_RALT, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT 
     ),
     [1] = LAYOUT(
-        KC_GRV,           KC_F1,    KC_F2, KC_F3,     KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,           KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        KC_GRV,           KC_F1,    KC_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_PSCR, KC_SCRL, KC_PAUS, _______,
         _______,          RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,                   KC_INS, KC_HOME, KC_PGUP, _______,
         _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDN, _______,
         _______, _______, BL_TOGG,  BL_BRTG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
diff --git a/keyboards/teleport/numpad/keymaps/default/keymap.c b/keyboards/teleport/numpad/keymaps/default/keymap.c
index d9bb2248da..caf1287473 100644
--- a/keyboards/teleport/numpad/keymaps/default/keymap.c
+++ b/keyboards/teleport/numpad/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_numpad_5x4(
-    LT(1, KC_NLCK), KC_PSLS,  KC_PAST, KC_PMNS,
+    LT(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,
diff --git a/keyboards/teleport/numpad/keymaps/via/keymap.c b/keyboards/teleport/numpad/keymaps/via/keymap.c
index 932287c27b..58a2a150bd 100644
--- a/keyboards/teleport/numpad/keymaps/via/keymap.c
+++ b/keyboards/teleport/numpad/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_numpad_5x4(
-    LT(1, KC_NLCK), KC_PSLS,  KC_PAST, KC_PMNS,
+    LT(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,
diff --git a/keyboards/tenki/keymaps/default/keymap.c b/keyboards/tenki/keymaps/default/keymap.c
index 6ce06f3dfc..8c08efe1bc 100644
--- a/keyboards/tenki/keymaps/default/keymap.c
+++ b/keyboards/tenki/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_5x4(
-    KC_NLCK, 	KC_PSLS,    KC_PAST,    	KC_PMNS,
+    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_PEQL,
diff --git a/keyboards/tenki/keymaps/via/keymap.c b/keyboards/tenki/keymaps/via/keymap.c
index 8e144133c5..3c29e49d31 100644
--- a/keyboards/tenki/keymaps/via/keymap.c
+++ b/keyboards/tenki/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_5x4(
-    KC_NLCK, 	KC_PSLS,    KC_PAST,    	KC_PMNS,
+    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_PEQL,
diff --git a/keyboards/tgr/jane/v2/keymaps/default/keymap.c b/keyboards/tgr/jane/v2/keymaps/default/keymap.c
index 0e3c1d4e7b..2b847cc1ca 100644
--- a/keyboards/tgr/jane/v2/keymaps/default/keymap.c
+++ b/keyboards/tgr/jane/v2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK,KC_PAUS,
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_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,
diff --git a/keyboards/tgr/jane/v2/keymaps/via/keymap.c b/keyboards/tgr/jane/v2/keymaps/via/keymap.c
index 521a78f604..a74f472c30 100644
--- a/keyboards/tgr/jane/v2/keymaps/via/keymap.c
+++ b/keyboards/tgr/jane/v2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 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_SLCK,KC_PAUS,
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_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,
diff --git a/keyboards/tgr/jane/v2ce/keymaps/default/keymap.c b/keyboards/tgr/jane/v2ce/keymaps/default/keymap.c
index bace43c6fd..1e01bd2af5 100644
--- a/keyboards/tgr/jane/v2ce/keymaps/default/keymap.c
+++ b/keyboards/tgr/jane/v2ce/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_tkl_f13_ansi(
-  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,   KC_F13, KC_PSCR,KC_SLCK,KC_PAUS,
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,   KC_F13, KC_PSCR,KC_SCRL,KC_PAUS,
   KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS ,KC_HOME,KC_PGUP,
   KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL ,KC_END ,KC_PGDN,
   KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,
diff --git a/keyboards/tgr/jane/v2ce/keymaps/via/keymap.c b/keyboards/tgr/jane/v2ce/keymaps/via/keymap.c
index 1bf4a8c72d..b5df997945 100644
--- a/keyboards/tgr/jane/v2ce/keymaps/via/keymap.c
+++ b/keyboards/tgr/jane/v2ce/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_tkl_f13_ansi(
-  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_F13,   KC_PSCR,KC_SLCK,KC_PAUS,
+  KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_F13,   KC_PSCR,KC_SCRL,KC_PAUS,
   KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,   KC_INS ,KC_HOME,KC_PGUP,
   KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,   KC_DEL ,KC_END ,KC_PGDN,
   KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,
diff --git a/keyboards/tgr/tris/keymaps/default/keymap.c b/keyboards/tgr/tris/keymaps/default/keymap.c
index 656d51b686..7d983a0636 100644
--- a/keyboards/tgr/tris/keymaps/default/keymap.c
+++ b/keyboards/tgr/tris/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_numpad_6x4(
         KC_ESC,  KC_TAB,  MO(1),   KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/tgr/tris/keymaps/via/keymap.c b/keyboards/tgr/tris/keymaps/via/keymap.c
index 8cfd43c685..4ad7ebf693 100644
--- a/keyboards/tgr/tris/keymaps/via/keymap.c
+++ b/keyboards/tgr/tris/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_numpad_6x4(
         KC_ESC,  KC_TAB,  MO(1),   KC_BSPC,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
index 45c433fe2b..a8a61c9efb 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [HHKB_NAV_LAYER] = LAYOUT_hhkb_arrow(
     QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-    _______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_UP, _______, KC_DEL,
+    _______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_PSCR,   KC_SCRL,   KC_PAUS,   KC_UP, _______, KC_DEL,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_HOME,   KC_PGUP, KC_LEFT,  KC_RGHT, KC_ENT,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_END,  KC_PGDN,  KC_DOWN,  _______, _______,
     _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
index b0c8981a5f..04ba28912d 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
@@ -1191,7 +1191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      <pink2    , <pinky           , <ring            , <middl           , <index           , <indx2           |, indx2>        , index>  , middl>           , ring>              , pinky>  , pink2>        ,
 //                ,                  ,                  ,                  , -*-              ,                 <|,>              ,         ,                  ,                    ,         ,               ,
         CTO_BASE  , COUNT_TOG        , COUNT_NULL       , COUNT_WORDMIN    , COUNT_REPORT     , SPEED_TOG         , SPEED_REPORT  , KC_MPLY , KC_MNXT          , KC_MPRV            , KC_MSTP , KC_RSFT       ,
-        KC_CAPS   , C_KC_PWR         , C_KC_WAKE        , C_KC_SLEP        , C_KC_PAUS        , KC_SLCK           , KC_PSCR       , XXXXXXX , KC_VOLU          , KC_VOLD            , KC_MUTE , KC_INS        ,
+        KC_CAPS   , C_KC_PWR         , C_KC_WAKE        , C_KC_SLEP        , C_KC_PAUS        , KC_SCRL           , KC_PSCR       , XXXXXXX , KC_VOLU          , KC_VOLD            , KC_MUTE , KC_INS        ,
         XP_DRA_CG , UNICODE_MODE_LNX , UNICODE_MODE_BSD , UNICODE_MODE_OSX , UNICODE_MODE_WIN , UNICODE_MODE_WINC , XXXXXXX       , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP        ,
 //      -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         LEDS_ON  
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
index 98d0f63858..6ab2aacfcb 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT
 	(KC_CAPS,  KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, KC_UNDS, KC_P7, KC_P8, KC_P9, KC_EQL,       KC_TRNS, 
 	KC_TRNS,    KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS,    KC_TRNS, 
-	KC_MUTE,     KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_NLCK, 
+	KC_MUTE,     KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_NUM, 
 	KC_TRNS,   KC_TRNS,   KC_MSTP,    KC_PENT,     KC_P0,          KC_PDOT,     KC_APP,              KC_TRNS),
 	
 	[2] = LAYOUT
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
index efba49e1ea..47545da435 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
@@ -114,7 +114,7 @@ XXXXXXX,_______,_______,                _______,_______,        KC_END, KC_LEFT,
 [_WINDOW_SHORTCUT] = LAYOUT_arrow(
 KC_ESC ,LALT(KC_F4)        ,LGUI(KC_UP)         ,XXXXXXX       ,XXXXXXX,S(KC_CAPS)         ,XXXXXXX          ,KC_PGUP,KC_UP  ,KC_PGDN ,KC_PSCR,KC_DEL,
 _______,LGUI(KC_LEFT)      ,LGUI(KC_DOWN)       ,LGUI(KC_RIGHT),XXXXXXX,LALT(KC_CAPS)      ,KC_CAPS          ,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX,
-_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX       ,XXXXXXX,LCTL(KC_CAPS)      ,KC_SLCK          ,KC_HOME,XXXXXXX,KC_END  ,XXXXXXX,KC_RCTL,
+_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX       ,XXXXXXX,LCTL(KC_CAPS)      ,KC_SCRL          ,KC_HOME,XXXXXXX,KC_END  ,XXXXXXX,KC_RCTL,
 _______,LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)),                       LCTL(LALT(KC_DEL)) ,LGUI(LCTL(KC_F4)),        MOUSE  ,XXXXXXX ,XXXXXXX,BACKLIT
 ),
 /* Mac Shortcut
diff --git a/keyboards/tkc/california/keymaps/default/keymap.c b/keyboards/tkc/california/keymaps/default/keymap.c
index 747ed11e00..0c78d6eeed 100644
--- a/keyboards/tkc/california/keymaps/default/keymap.c
+++ b/keyboards/tkc/california/keymaps/default/keymap.c
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all( /* Base */
     
-	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SLCK,KC_PAUS,
-    KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_PGUP,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SCRL,KC_PAUS,
+    KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_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_PGDN,KC_P7,KC_P8,KC_P9,KC_PMNS,
     KC_CAPS,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,    KC_SCLN, KC_QUOT, KC_ENT,KC_P4,   KC_P5,   KC_P6,KC_PPLS,
     KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_NO,KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/tkc/california/keymaps/via/keymap.c b/keyboards/tkc/california/keymaps/via/keymap.c
index b84fdd4a2e..33d16dfc51 100644
--- a/keyboards/tkc/california/keymaps/via/keymap.c
+++ b/keyboards/tkc/california/keymaps/via/keymap.c
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all( /* Base */
     
-	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SLCK,KC_PAUS,
-    KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_PGUP,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SCRL,KC_PAUS,
+    KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_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_PGDN,KC_P7,KC_P8,KC_P9,KC_PMNS,
     KC_CAPS,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,    KC_SCLN, KC_QUOT, KC_ENT,KC_P4,   KC_P5,   KC_P6,KC_PPLS,
     KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,MO(1),KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/tkc/candybar/lefty/keymaps/default/keymap.c b/keyboards/tkc/candybar/lefty/keymaps/default/keymap.c
index bc834aff3f..5be28ab240 100644
--- a/keyboards/tkc/candybar/lefty/keymaps/default/keymap.c
+++ b/keyboards/tkc/candybar/lefty/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [_FL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC ,
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
 };
diff --git a/keyboards/tkc/candybar/lefty/keymaps/via/keymap.c b/keyboards/tkc/candybar/lefty/keymaps/via/keymap.c
index 8aa4935d5c..1df8776381 100644
--- a/keyboards/tkc/candybar/lefty/keymaps/via/keymap.c
+++ b/keyboards/tkc/candybar/lefty/keymaps/via/keymap.c
@@ -34,19 +34,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [_FL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC ,
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
   
   [_AL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC ,
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
   
   [_LL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC ,
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS ,
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP ,
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
 };
diff --git a/keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c b/keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c
index 765529a18f..24ed684f8e 100644
--- a/keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c
+++ b/keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [_FL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
 };
diff --git a/keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c b/keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c
index 1ff05328a8..70aca6eced 100644
--- a/keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c
+++ b/keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c
@@ -36,19 +36,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [_FL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
   
   [_AL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
   
   [_LL] = LAYOUT(
   KC_P7 , KC_P8, KC_P9  , KC_VOLU, QK_BOOT  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
-  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
-  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SCRL, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NUM , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
   KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
 };
diff --git a/keyboards/tkc/candybar/righty/keymaps/default/keymap.c b/keyboards/tkc/candybar/righty/keymaps/default/keymap.c
index 489cccf8df..03b9e3e942 100644
--- a/keyboards/tkc/candybar/righty/keymaps/default/keymap.c
+++ b/keyboards/tkc/candybar/righty/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU,
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
 };
diff --git a/keyboards/tkc/candybar/righty/keymaps/via/keymap.c b/keyboards/tkc/candybar/righty/keymaps/via/keymap.c
index 560cf56f3b..87960d3776 100644
--- a/keyboards/tkc/candybar/righty/keymaps/via/keymap.c
+++ b/keyboards/tkc/candybar/righty/keymaps/via/keymap.c
@@ -34,19 +34,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU,
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
   
   [_AL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU,
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
   
   [_LL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU,
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD,
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL,
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
 };
diff --git a/keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c b/keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c
index d144bb8183..966f67ea90 100644
--- a/keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c
+++ b/keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
 };
diff --git a/keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c b/keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c
index dd9119702b..c49d939196 100644
--- a/keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c
+++ b/keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c
@@ -36,19 +36,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
   
   [_AL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
   
   [_LL] = LAYOUT(
   QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
-  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
-  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_TAB,KC_A,KC_SCRL,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NUM,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
 };
diff --git a/keyboards/tkc/godspeed75/keymaps/default/keymap.c b/keyboards/tkc/godspeed75/keymaps/default/keymap.c
index 8961f3eaa4..c40b714bf0 100644
--- a/keyboards/tkc/godspeed75/keymaps/default/keymap.c
+++ b/keyboards/tkc/godspeed75/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_NO,    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_INS,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_NO,    QK_BOOT,    KC_PGUP,
     KC_TAB,   KC_Q,     KC_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_INS,
diff --git a/keyboards/tkc/godspeed75/keymaps/via/keymap.c b/keyboards/tkc/godspeed75/keymaps/via/keymap.c
index 81c214906f..b5b32c7db2 100644
--- a/keyboards/tkc/godspeed75/keymaps/via/keymap.c
+++ b/keyboards/tkc/godspeed75/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_BL] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_NO,    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_INS,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LALT,                                KC_SPC,                                 MO(1),    KC_RCTL,                      KC_LEFT,  KC_DOWN,  KC_RGHT),
 
 [_FL] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SLCK,  KC_PAUS,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_NO,    QK_BOOT,    KC_PGUP,
     KC_TAB,   KC_Q,     KC_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_INS,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LALT,                                KC_SPC,                                 KC_TRNS,  KC_RCTL,                      KC_LEFT,  KC_DOWN,  KC_RGHT),
   
 [_AL] = 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_SLCK,  KC_PAUS,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_NO,    QK_BOOT,    KC_PGUP,
     KC_TAB,   KC_Q,     KC_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_INS,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LALT,                                KC_SPC,                                 KC_TRNS,  KC_RCTL,                      KC_LEFT,  KC_DOWN,  KC_RGHT),
   
 [_LL] = 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_SLCK,  KC_PAUS,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_NO,    QK_BOOT,    KC_PGUP,
     KC_TAB,   KC_Q,     KC_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_INS,
diff --git a/keyboards/tkc/m0lly/keymaps/default/keymap.c b/keyboards/tkc/m0lly/keymaps/default/keymap.c
index 2b79849f44..84b53a5440 100644
--- a/keyboards/tkc/m0lly/keymaps/default/keymap.c
+++ b/keyboards/tkc/m0lly/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' '-------------------'
      */
     [_BASE] = LAYOUT_all(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,    KC_BSPC, XXXXXXX,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,    KC_BSPC, XXXXXXX,     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,   XXXXXXX,
         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_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,   XXXXXXX,              KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
diff --git a/keyboards/tkc/m0lly/keymaps/via/keymap.c b/keyboards/tkc/m0lly/keymaps/via/keymap.c
index d52a30c6a7..b872324fbf 100644
--- a/keyboards/tkc/m0lly/keymaps/via/keymap.c
+++ b/keyboards/tkc/m0lly/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' '-------------------'
      */
     [_BASE] = LAYOUT_all(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,     KC_BSPC, XXXXXXX,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,     KC_BSPC, XXXXXXX,     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,   XXXXXXX,
         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_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,    XXXXXXX,              KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
diff --git a/keyboards/tkc/portico/keymaps/default/keymap.c b/keyboards/tkc/portico/keymaps/default/keymap.c
index c75a4550ad..3d8dc77765 100644
--- a/keyboards/tkc/portico/keymaps/default/keymap.c
+++ b/keyboards/tkc/portico/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef RGB_BACKLIGHT_PORTICO
     [1] = LAYOUT_65_ansi_blocker(
         KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
-        _______,  EF_INC,  EF_DEC,  BR_INC,  BR_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC, _______, KC_PSCR, KC_SLCK, KC_PAUS,   QK_BOOT, KC_PGUP,
+        _______,  EF_INC,  EF_DEC,  BR_INC,  BR_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, _______, _______, _______, _______,  H2_INC,  H2_DEC,  S2_INC,  S2_DEC, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #else
     [1] = LAYOUT_65_ansi_blocker(
         KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   QK_BOOT, KC_PGUP,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/tkc/portico/keymaps/via/keymap.c b/keyboards/tkc/portico/keymaps/via/keymap.c
index c75a4550ad..3d8dc77765 100644
--- a/keyboards/tkc/portico/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef RGB_BACKLIGHT_PORTICO
     [1] = LAYOUT_65_ansi_blocker(
         KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
-        _______,  EF_INC,  EF_DEC,  BR_INC,  BR_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC, _______, KC_PSCR, KC_SLCK, KC_PAUS,   QK_BOOT, KC_PGUP,
+        _______,  EF_INC,  EF_DEC,  BR_INC,  BR_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, _______, _______, _______, _______,  H2_INC,  H2_DEC,  S2_INC,  S2_DEC, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #else
     [1] = LAYOUT_65_ansi_blocker(
         KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   QK_BOOT, KC_PGUP,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/tkc/portico68v2/keymaps/default/keymap.c b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
index 2d4897bfb0..a79ef5a430 100644
--- a/keyboards/tkc/portico68v2/keymaps/default/keymap.c
+++ b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker(
         KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   QK_BOOT, KC_PGUP,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/tkc/portico68v2/keymaps/via/keymap.c b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
index be6845391a..cc50f4170d 100644
--- a/keyboards/tkc/portico68v2/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker(
         KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   QK_BOOT, KC_PGUP,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/tkc/tkc1800/keymaps/default/keymap.c b/keyboards/tkc/tkc1800/keymaps/default/keymap.c
index dcc4749c9d..268679c9d2 100644
--- a/keyboards/tkc/tkc1800/keymaps/default/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/default/keymap.c
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [BASE] = LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
diff --git a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
index 6d90018fe8..f000ba172e 100644
--- a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [QWERTY] = LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, \
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SLCK, \
-    KC_GRV,  KC_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_NLCK, KC_PSLS, KC_PAST, KC_PAUS, \
+                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL, \
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS, \
     HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS, \
     CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
     KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX, \
@@ -76,8 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [COLEMAK] = LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, \
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SLCK, \
-    KC_GRV,  KC_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_NLCK, KC_PSLS, KC_PAST, KC_PAUS, \
+                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL, \
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS, \
     HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS, \
     CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
     KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX, \
@@ -102,8 +102,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [DVORAK] = LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, \
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SLCK, \
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,  KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, \
+                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL, \
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,  KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS, \
     HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS, \
     CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
     KC_LSFT, XXXXXXX, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX, \
@@ -111,8 +111,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [FUNCTION] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, \
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SLCK, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, \
+                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS, \
     _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______, _______,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
     _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX, \
diff --git a/keyboards/tkc/tkc1800/keymaps/via/keymap.c b/keyboards/tkc/tkc1800/keymaps/via/keymap.c
index 9fde46a875..6e6998a360 100644
--- a/keyboards/tkc/tkc1800/keymaps/via/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/via/keymap.c
@@ -44,8 +44,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [BASE] = LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
diff --git a/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c
index 144943e372..5b0afccb4b 100644
--- a/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [BASE] = LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
diff --git a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
index ec657be274..7006bda071 100644
--- a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 	[BASE] = LAYOUT(
     KC_ESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, \
-                                                                                                                                                  KC_DEL,  KC_END,  KC_PGDN, KC_SLCK, \
-    KC_GRV,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, \
+                                                                                                                                                  KC_DEL,  KC_END,  KC_PGDN, KC_SCRL, \
+    KC_GRV,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS, \
     KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS, \
     LCTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
     KC_LSFT,        XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX, \
diff --git a/keyboards/tkc/tkl_ab87/keymaps/default/keymap.c b/keyboards/tkc/tkl_ab87/keymaps/default/keymap.c
index 0213499e34..103b5e2f73 100644
--- a/keyboards/tkc/tkl_ab87/keymaps/default/keymap.c
+++ b/keyboards/tkc/tkl_ab87/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all( /* Base */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,           KC_INS,  KC_HOME, KC_PGUP,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,          KC_ENT,
diff --git a/keyboards/tkc/tkl_ab87/keymaps/via/keymap.c b/keyboards/tkc/tkl_ab87/keymaps/via/keymap.c
index f3b011f05b..ead62a8c05 100644
--- a/keyboards/tkc/tkl_ab87/keymaps/via/keymap.c
+++ b/keyboards/tkc/tkl_ab87/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_all( /* Base */
     
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
 	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,           KC_INS,  KC_HOME, KC_PGUP,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,          KC_ENT,
diff --git a/keyboards/tokyokeyboard/tokyo60/keymaps/default/keymap.c b/keyboards/tokyokeyboard/tokyo60/keymaps/default/keymap.c
index 595ddacde4..6fb2a261a4 100644
--- a/keyboards/tokyokeyboard/tokyo60/keymaps/default/keymap.c
+++ b/keyboards/tokyokeyboard/tokyo60/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 [FN]= LAYOUT_60_hhkb(
        KC_PWR,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-       KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,
+       KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,       KC_PENT,
        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,  KC_END, KC_PGDN, KC_DOWN,       KC_TRNS, KC_TRNS,
              KC_TRNS, KC_TRNS,                   KC_TRNS,                         KC_TRNS, KC_TRNS ),
diff --git a/keyboards/tokyokeyboard/tokyo60/keymaps/swappedBottomRow/keymap.c b/keyboards/tokyokeyboard/tokyo60/keymaps/swappedBottomRow/keymap.c
index 54b68f5825..d8798b39d7 100644
--- a/keyboards/tokyokeyboard/tokyo60/keymaps/swappedBottomRow/keymap.c
+++ b/keyboards/tokyokeyboard/tokyo60/keymaps/swappedBottomRow/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 [FN]= LAYOUT_60_hhkb(
        KC_TRNS,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, \
-       KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,  \
+       KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,  \
        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,       KC_PENT,       \
        KC_TRNS,       KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,  KC_END, KC_PGDN, KC_DOWN,       KC_TRNS, KC_TRNS, \
              KC_TRNS, KC_TRNS,                   KC_TRNS,                         KC_TRNS, KC_TRNS ),
diff --git a/keyboards/tokyokeyboard/tokyo60/keymaps/via/keymap.c b/keyboards/tokyokeyboard/tokyo60/keymaps/via/keymap.c
index b18c76ba2a..5756e727df 100644
--- a/keyboards/tokyokeyboard/tokyo60/keymaps/via/keymap.c
+++ b/keyboards/tokyokeyboard/tokyo60/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [FN]= LAYOUT_60_hhkb(
        KC_PWR,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-       KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,
+       KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,       KC_PENT,
        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,  KC_END, KC_PGDN, KC_DOWN,       KC_TRNS, KC_TRNS,
              KC_TRNS, KC_TRNS,                   KC_TRNS,                         KC_TRNS, KC_TRNS ),
diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
index 04866e35ef..812b6406ee 100644
--- a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
+++ b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
@@ -126,7 +126,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             } else {    // This assumes that the Linux Compose has been set to Scroll Lock
                 if (record->event.pressed) {
-                    tap_code16(KC_SLCK);
+                    tap_code16(KC_SCRL);
                     SEND_STRING("c/");
                 }
             }
@@ -194,17 +194,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case JM_NSLC:
             if (left_shift_down || right_shift_down) {
                 if (record->event.pressed) {
-                    register_code(KC_NLCK);
+                    register_code(KC_NUM_LOCK);
                 }
                 else {
-                    unregister_code(KC_NLCK);
+                    unregister_code(KC_NUM_LOCK);
                 }
             } else {
                 if (record->event.pressed) {
-                    register_code(KC_SLCK);
+                    register_code(KC_SCRL);
                 }
                 else {
-                    unregister_code(KC_SLCK);
+                    unregister_code(KC_SCRL);
                 }
             }
             return false;
diff --git a/keyboards/tzarc/djinn/keymaps/default/keymap.c b/keyboards/tzarc/djinn/keymaps/default/keymap.c
index a5aa07e127..14239dc45a 100644
--- a/keyboards/tzarc/djinn/keymaps/default/keymap.c
+++ b/keyboards/tzarc/djinn/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______,                                               _______
     ),
     [_ADJUST] = LAYOUT_all(
-        _______, KC_CAPS, KC_NLCK, KC_SLCK, _______,   _______, _______,                             _______, _______, _______, _______, DEBUG,   EEP_RST, QK_BOOT,
+        _______, KC_CAPS, KC_NUM,  KC_SCRL, _______,   _______, _______,                             _______, _______, _______, _______, DEBUG,   EEP_RST, QK_BOOT,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/uk78/keymaps/default/keymap.c b/keyboards/uk78/keymaps/default/keymap.c
index 3a83fd1672..fa0af29bfb 100644
--- a/keyboards/uk78/keymaps/default/keymap.c
+++ b/keyboards/uk78/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_BSPC, KC_DEL,  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_PEQL,
     KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,           KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_SLCK,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_SCRL,
     KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, KC_RCTL, MO(_FL1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
   ),
 
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-------------------------------------------------------------------------------'
   */
   [_FL1] = 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_PSCR, KC_INS,  KC_NLCK, _______, _______, _______,
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_INS,  KC_NUM,  _______, _______, _______,
     _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  BL_INC,  _______, KC_MUTE, KC_MUTE, KC_VOLU, _______, _______, _______, _______,
diff --git a/keyboards/uk78/keymaps/rask/keymap.c b/keyboards/uk78/keymaps/rask/keymap.c
index f29177fa0c..aada1f1da7 100644
--- a/keyboards/uk78/keymaps/rask/keymap.c
+++ b/keyboards/uk78/keymaps/rask/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------------'
    */
   [_BL] = LAYOUT_all(
-    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_DEL,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_DEL,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSPC, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     MO(_FL1),KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,           KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, KC_LSFT, KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_FL2),MO(_FL2), KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c b/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c
index 4ef39ed7b4..d3e9a6e688 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c
@@ -23,8 +23,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-        KC_ESC,        KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,      KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,        KC_F1, KC_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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_NUBS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c b/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c
index 6755ee3684..32aba6928d 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c
@@ -23,8 +23,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-        KC_ESC,        KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,      KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,        KC_F1, KC_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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_NUBS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unicomp/pc122/keymaps/default/keymap.c b/keyboards/unicomp/pc122/keymaps/default/keymap.c
index 8df8de9529..f01f6c8faf 100644
--- a/keyboards/unicomp/pc122/keymaps/default/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
                                        KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
                                        KC_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_SLCK,    KC_GRV, KC_1,  KC_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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,   KC_SCRL,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_PSCR,  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_PSCR,  KC_F1,      KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_RGUI,  KC_MPLY,    KC_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_LEFT, KC_ENT,  KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c b/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
index 706249ca1d..9a8b41503f 100644
--- a/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
@@ -25,10 +25,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
                                        S(KC_F1), S(KC_F2), S(KC_F3), S(KC_F4), S(KC_F5), S(KC_F6), S(KC_F7), S(KC_F8), S(KC_F9), S(KC_F10), S(KC_F11), S(KC_F12),
                                        KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-        S(KC_ESC), C(KC_F9),   KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  C(KC_F8),  KC_PGUP, KC_PGDN,  KC_ESC,  KC_NLCK, KC_PAST, KC_PSLS,
+        S(KC_ESC), C(KC_F9),   KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  C(KC_F8),  KC_PGUP, KC_PGDN,  KC_ESC,  KC_NUM,  KC_PAST, KC_PSLS,
         C(KC_F1),  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_END,    KC_INS,  KC_DEL,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         C(KC_F2),  C(KC_F5),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
         KC_PSCR,   C(KC_F6),   KC_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_LEFT,   KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_SLCK,   C(KC_F7),   KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,             KC_DOWN,           KC_P0,            KC_PDOT
+        KC_SCRL,   C(KC_F7),   KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,             KC_DOWN,           KC_P0,            KC_PDOT
     )
 };
diff --git a/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c b/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
index f1ff9ea18a..eda87c3969 100644
--- a/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
                                         S(KC_F1), S(KC_F2), S(KC_F3), S(KC_F4), S(KC_F5), S(KC_F6), S(KC_F7), S(KC_F8), S(KC_F9), S(KC_F10), S(KC_F11), S(KC_F12),
                                         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-        KC_ESC,     KC_SLCK,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  S(KC_TAB),   KC_INS,  KC_PGUP,  KC_END,  KC_NLCK, KC_PSLS, KC_PAST,
+        KC_ESC,     KC_SCRL,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  S(KC_TAB),   KC_INS,  KC_PGUP,  KC_END,  KC_NUM,  KC_PSLS, KC_PAST,
         KC_PSCR,    KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  S(KC_RCTRL), KC_DEL,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         C(KC_PAUS), A(KC_F1),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         S(C(KC_4)), S(C(KC_3)), KC_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_LEFT,     KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c b/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
index 34ac826f6c..0af0a6d2d4 100644
--- a/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
                                        S(KC_F1), S(KC_F2), S(KC_F3), S(KC_F4), S(KC_F5), S(KC_F6), S(KC_F7), S(KC_F8), S(KC_F9), S(KC_F10), S(KC_F11), S(KC_F12),
                                        KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-        KC_ESC,   KC_SLCK,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  S(KC_TAB), KC_INS,  KC_PGUP,  KC_END,  KC_NLCK, KC_PSLS, KC_PAST,
+        KC_ESC,   KC_SCRL,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  S(KC_TAB), KC_INS,  KC_PGUP,  KC_END,  KC_NUM,  KC_PSLS, KC_PAST,
         KC_PSCR,  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  C(KC_F6),  KC_DEL,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         C(KC_F3), C(KC_F1),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         C(KC_F5), C(KC_F2),   KC_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_LEFT,   KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
index 53a198107b..0ffb0e9007 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
@@ -25,15 +25,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
         KC_ESC,      KC_F14,KC_F15,LCTL(KC_UP),KC_F9,  KC_F5, KC_F6,KC_MPRV,KC_MPLY,  KC_MNXT,KC_MUTE,KC_VOLD,KC_VOLU,  KC_F13,  KC_F14,  KC_F15,
-        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_EJCT, KC_HOME, KC_PGUP,  KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_EJCT, KC_HOME, KC_PGUP,  KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST,
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTRL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),     KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     ),
     [_FN] = 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_SLCK, KC_PAUS,
-        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_EQL,  KC_PSLS, KC_PAST,
+        KC_ESC,        KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,      KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_EQL,  KC_PSLS, KC_PAST,
         KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,DEBUG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
index 53a198107b..0ffb0e9007 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
@@ -25,15 +25,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
         KC_ESC,      KC_F14,KC_F15,LCTL(KC_UP),KC_F9,  KC_F5, KC_F6,KC_MPRV,KC_MPLY,  KC_MNXT,KC_MUTE,KC_VOLD,KC_VOLU,  KC_F13,  KC_F14,  KC_F15,
-        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_EJCT, KC_HOME, KC_PGUP,  KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_EJCT, KC_HOME, KC_PGUP,  KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST,
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTRL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),     KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     ),
     [_FN] = 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_SLCK, KC_PAUS,
-        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_EQL,  KC_PSLS, KC_PAST,
+        KC_ESC,        KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,      KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_EQL,  KC_PSLS, KC_PAST,
         KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,DEBUG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/unikeyboard/felix/keymaps/default/keymap.c b/keyboards/unikeyboard/felix/keymaps/default/keymap.c
index 630a46c086..00878ea670 100644
--- a/keyboards/unikeyboard/felix/keymaps/default/keymap.c
+++ b/keyboards/unikeyboard/felix/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_ortho_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_HOME,
         KC_P1,   KC_P2,   KC_P3,   KC_END,
diff --git a/keyboards/unison/keymaps/default/keymap.c b/keyboards/unison/keymaps/default/keymap.c
index a147855c38..fbfff5b93d 100644
--- a/keyboards/unison/keymaps/default/keymap.c
+++ b/keyboards/unison/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_NLCK,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_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_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_BSPC,
         KC_P4,  KC_P5,  KC_P6,  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_ENT,
         KC_P1,  KC_P2,  KC_P3,  KC_PENT,KC_LSFT,KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_UP,
diff --git a/keyboards/unison/keymaps/via/keymap.c b/keyboards/unison/keymaps/via/keymap.c
index 2e3a6ad71a..4e14bb59ce 100644
--- a/keyboards/unison/keymaps/via/keymap.c
+++ b/keyboards/unison/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layer_number {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
-        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,
+        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,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_P7,  KC_P8,  KC_P9,  KC_PPLS,KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,       KC_BSPC,
         KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_P4,  KC_P5,  KC_P6,  KC_PPLS,KC_H,   KC_J,   KC_K,   KC_L,   KC_MINS,    KC_ENT,
         KC_LSFT,KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_P1,  KC_P2,  KC_P3,  KC_PENT,KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_UP,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LOW] = LAYOUT_all(
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
         KC_TILD,    KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,_______,_______,_______,_______,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,    KC_DEL,
-        _______,    KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,_______,_______,_______,KC_GRV, KC_MINS,KC_EQL, KC_LBRC,KC_RBRC,    KC_BSLS,
+        _______,    KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,_______,_______,_______,KC_GRV, KC_MINS,KC_EQL, KC_LBRC,KC_RBRC,    KC_BSLS,
         _______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______,_______,_______,_______,_______,KC_TILD,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP,KC_END
     ),
diff --git a/keyboards/utd80/keymaps/default/keymap.c b/keyboards/utd80/keymaps/default/keymap.c
index 8d8bfc6159..a024838da6 100644
--- a/keyboards/utd80/keymaps/default/keymap.c
+++ b/keyboards/utd80/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,             KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,             KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_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,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LALT,                             KC_SPC,                                       MO(2),          KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT 
     ),
     [1] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,             KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,             KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_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,
diff --git a/keyboards/utd80/keymaps/via/keymap.c b/keyboards/utd80/keymaps/via/keymap.c
index 0f5d573844..5340814211 100644
--- a/keyboards/utd80/keymaps/via/keymap.c
+++ b/keyboards/utd80/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_ansi_wkl(
-        KC_ESC,             KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,             KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_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,
diff --git a/keyboards/v60_type_r/keymaps/default/keymap.c b/keyboards/v60_type_r/keymaps/default/keymap.c
index 106c2d1833..b8fd97509d 100644
--- a/keyboards/v60_type_r/keymaps/default/keymap.c
+++ b/keyboards/v60_type_r/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [1] = LAYOUT_60_ansi(
 	       KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,
-	       KC_TRNS,   KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS,
+	       KC_TRNS,   KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS,
 	       KC_TRNS,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          KC_TRNS,
 	       KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           KC_TRNS,
 	       KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
index dffa9a1fd2..2142ca58c0 100644
--- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
+++ b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_60_ansi(
 	       KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL, \
-	       KC_TRNS,   KC_TRNS,  KC_UP,    RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS, \
+	       KC_TRNS,   KC_TRNS,  KC_UP,    RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS, \
 	       KC_TRNS,   KC_LEFT,  KC_DOWN,  KC_RIGHT, RGB_HUD, RGB_SAD, RGB_VAD,   KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          KC_TRNS,          \
 	       KC_TRNS,   BL_INC,  BL_STEP,  BL_DEC,  KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           QK_BOOT,  \
 	       KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  AG_SWAP, KC_TRNS, KC_TRNS),
diff --git a/keyboards/v60_type_r/keymaps/iso/keymap.c b/keyboards/v60_type_r/keymaps/iso/keymap.c
index 8c7b98bfd2..c445150338 100644
--- a/keyboards/v60_type_r/keymaps/iso/keymap.c
+++ b/keyboards/v60_type_r/keymaps/iso/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [1] = LAYOUT_60_iso(
       KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-      KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS,
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_DOWN, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/v60_type_r/keymaps/via/keymap.c b/keyboards/v60_type_r/keymaps/via/keymap.c
index 5a494588ee..d6bd7df57b 100644
--- a/keyboards/v60_type_r/keymaps/via/keymap.c
+++ b/keyboards/v60_type_r/keymaps/via/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [1] = LAYOUT_60_ansi(
       KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,
-      KC_TRNS,   KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS,
+      KC_TRNS,   KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS,
       KC_TRNS,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          KC_TRNS,
       KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           KC_TRNS,
       KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/v60_type_r/keymaps/vimouse/keymap.c b/keyboards/v60_type_r/keymaps/vimouse/keymap.c
index 74e4b1309c..61dca95d07 100644
--- a/keyboards/v60_type_r/keymaps/vimouse/keymap.c
+++ b/keyboards/v60_type_r/keymaps/vimouse/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _____,  KC_DEL, \
-        _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____, KC_PSCR, KC_SLCK, KC_PAUS,          KC_INS, \
+        _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____, KC_PSCR, KC_SCRL, KC_PAUS,          KC_INS, \
         _____,   _____,   _____,   _____,   _____,   _____, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, KC_HOME, KC_PGUP,           _____,          \
         _____,   _____,   _____,   _____,   _____,   _____,   _____, KC_MUTE, KC_VOLD, KC_VOLU,  KC_END, KC_PGDN,           _____,  _____,  \
         _____,   _____,   _____,               _____,                                                      _____,   _____,  _____,  _____),
diff --git a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
index 8927a8ee0a..d8a236221c 100644
--- a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FUN] = 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,  X_____X, KC_DEL, \
-	       X_____X,   X_____X,  KC_UP,    RGB_TOG,  IND_BRI,  X_____X,  X_____X,   X_____X, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    X_____X,          KC_INS, \
+	       X_____X,   X_____X,  KC_UP,    RGB_TOG,  IND_BRI,  X_____X,  X_____X,   X_____X, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    X_____X,          KC_INS, \
 	       X_____X,   KC_LEFT,  KC_DOWN,  KC_RIGHT, IND_DIM,  X_____X,  X_____X,   X_____X, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          FIREY_RETURN,          \
 	       _______,   X_____X,  BL_INC,   BL_STEP,  BL_DEC,   X_____X,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN, _______, X_____X,  \
 	       _______,   _______,  _______,            X_____X,                                                           _______,  _______, X_____X, _______
diff --git a/keyboards/vertex/angler2/keymaps/default/keymap.c b/keyboards/vertex/angler2/keymaps/default/keymap.c
index b5127472ef..38af5efb27 100644
--- a/keyboards/vertex/angler2/keymaps/default/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,     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_NO,   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_BSLS, KC_ENT,
diff --git a/keyboards/vertex/angler2/keymaps/via/keymap.c b/keyboards/vertex/angler2/keymaps/via/keymap.c
index ec171be29b..6fac6ccaca 100644
--- a/keyboards/vertex/angler2/keymaps/via/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,     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_NO,   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_BSLS, KC_ENT,
diff --git a/keyboards/viktus/at101_bh/keymaps/default/keymap.c b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
index a87660ce73..692c30ac61 100644
--- a/keyboards/viktus/at101_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 				KC_PSCR,KC_SLCK, KC_PAUS,
-		KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,   KC_MINS,KC_EQL, KC_BSPC,		KC_INS, KC_HOME, KC_PGUP, 		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 				KC_PSCR,KC_SCRL, KC_PAUS,
+		KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,   KC_MINS,KC_EQL, KC_BSPC,		KC_INS, KC_HOME, KC_PGUP, 		KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 		KC_TAB, KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,   KC_LBRC,KC_RBRC,KC_BSLS, 	KC_DEL, KC_END,  KC_PGDN, 		KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 		KC_CAPS,KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K, 	KC_L,  KC_SCLN,KC_QUOT,KC_ENT, 												KC_P4, 	 KC_P5,   KC_P6,   KC_PEQL,
 		KC_LSFT,KC_BSLS,KC_Z, KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_LSFT,MO(1), 				KC_UP, 					KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
index b3ace4c7b7..96976ba2a3 100644
--- a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
@@ -3,8 +3,8 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
-    KC_F11,  KC_F12,      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_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_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_F11,  KC_F12,      KC_ESC,  KC_F1,   KC_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_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_INS,  KC_HOME, KC_PGUP,     KC_NUM,  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_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_F5,   KC_F6,       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,               XXXXXXX, XXXXXXX, XXXXXXX,     KC_P4,   KC_P5,   KC_P6,   KC_EQL,
     KC_F7,   KC_F8,       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                XXXXXXX, KC_UP,   XXXXXXX,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/viktus/sp111/keymaps/default/keymap.c b/keyboards/viktus/sp111/keymaps/default/keymap.c
index 844b1c793c..ba10ed9762 100644
--- a/keyboards/viktus/sp111/keymaps/default/keymap.c
+++ b/keyboards/viktus/sp111/keymaps/default/keymap.c
@@ -28,8 +28,8 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
-    KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_INS,
+    KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_INS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,  KC_DEL,
     KC_P4,   KC_P5,   KC_P6,   KC_PEQL,      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGUP, KC_PGDN,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),          KC_UP,
diff --git a/keyboards/viktus/sp111/keymaps/via/keymap.c b/keyboards/viktus/sp111/keymaps/via/keymap.c
index 4ae50062ca..89b2ecc8c5 100644
--- a/keyboards/viktus/sp111/keymaps/via/keymap.c
+++ b/keyboards/viktus/sp111/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_all(
-    KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_INS,
+    KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,      KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_INS,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,  KC_DEL,
     KC_P4,   KC_P5,   KC_P6,   KC_PEQL,      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGUP, KC_PGDN,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,
diff --git a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c b/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
index 6d0727be2c..11cb334084 100644
--- a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
+++ b/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,               KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
     ),
     [_NUM] = LAYOUT_all(
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_F13,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_F13,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_NO, KC_NO, KC_NO, NUM,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_P4,   KC_P5,   KC_P6,   KC_PCMM, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_NO, KC_NO,
diff --git a/keyboards/viktus/z150_bh/keymaps/default/keymap.c b/keyboards/viktus/z150_bh/keymaps/default/keymap.c
index 3ff40f7e83..8610ad1d66 100644
--- a/keyboards/viktus/z150_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/z150_bh/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
-        KC_F1,   KC_F2,     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_NLCK,     KC_SLCK, MO(1),
+        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_NUM,      KC_SCRL, MO(1),
         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_ENT,    KC_P7,   KC_P8,   KC_P9,   KC_PAST,
         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_P4,   KC_P5,   KC_P6,   KC_PMNS,
         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_P1,   KC_P2,   KC_P3,   KC_PPLS,
diff --git a/keyboards/w1_at/keymaps/default/keymap.c b/keyboards/w1_at/keymaps/default/keymap.c
index dd21f572c0..dbc238eec7 100644
--- a/keyboards/w1_at/keymaps/default/keymap.c
+++ b/keyboards/w1_at/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_F1, KC_F2,     KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NLCK, KC_PMNS, KC_PSLS, KC_PAST,
+    KC_F1, KC_F2,     KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
     KC_F3, KC_F4,     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_F5, KC_F6,     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,             KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
     KC_F7, KC_F8,     KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),              KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
diff --git a/keyboards/w1_at/keymaps/via/keymap.c b/keyboards/w1_at/keymaps/via/keymap.c
index 9dbea08191..e4f51eef6c 100644
--- a/keyboards/w1_at/keymaps/via/keymap.c
+++ b/keyboards/w1_at/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_F1, KC_F2,     KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NLCK, KC_PMNS, KC_PSLS, KC_PAST,
+    KC_F1, KC_F2,     KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
     KC_F3, KC_F4,     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_F5, KC_F6,     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,             KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
     KC_F7, KC_F8,     KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),              KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
diff --git a/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
index 0fc1a1d9e6..5dc0bff12d 100644
--- a/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
+++ b/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = 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_SLCK, KC_PAUS,
+      KC_ESC,          KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_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,
diff --git a/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
index 746e06c8e8..f08e6dd7fd 100644
--- a/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
+++ b/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
@@ -6,7 +6,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_tkl_iso(
-      KC_ESC,           KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SLCK, KC_PAUS,
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SCRL, KC_PAUS,
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_INS,   KC_HOME, KC_PGUP,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,   		 KC_DEL,   KC_END,  KC_PGDN,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS, KC_ENT,
diff --git a/keyboards/wekey/we27/keymaps/default/keymap.c b/keyboards/wekey/we27/keymaps/default/keymap.c
index 53f5c5dc77..741b25e3e7 100644
--- a/keyboards/wekey/we27/keymaps/default/keymap.c
+++ b/keyboards/wekey/we27/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Base */
 	[0] = LAYOUT_numpad_6x5_encoder(
 		KC_ESC , KC_PWR , KC_SLEP, KC_F11 , KC_MUTE, KC_VOLD, KC_VOLU,
-		KC_NLCK, KC_BSPC, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_NUM,  KC_BSPC, KC_PSLS, KC_PAST, KC_PMNS,
 		RGB_MOD, KC_P7  , KC_P8  , KC_P9  ,
 		RGB_RMOD, KC_P4  , KC_P5  , KC_P6  , KC_PPLS,
 		RGB_TOG, KC_P1  , KC_P2  , KC_P3  ,
diff --git a/keyboards/wekey/we27/keymaps/via/keymap.c b/keyboards/wekey/we27/keymaps/via/keymap.c
index 53f5c5dc77..741b25e3e7 100644
--- a/keyboards/wekey/we27/keymaps/via/keymap.c
+++ b/keyboards/wekey/we27/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Base */
 	[0] = LAYOUT_numpad_6x5_encoder(
 		KC_ESC , KC_PWR , KC_SLEP, KC_F11 , KC_MUTE, KC_VOLD, KC_VOLU,
-		KC_NLCK, KC_BSPC, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_NUM,  KC_BSPC, KC_PSLS, KC_PAST, KC_PMNS,
 		RGB_MOD, KC_P7  , KC_P8  , KC_P9  ,
 		RGB_RMOD, KC_P4  , KC_P5  , KC_P6  , KC_PPLS,
 		RGB_TOG, KC_P1  , KC_P2  , KC_P3  ,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
index bd79fe5d0b..db5432a9c0 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_ansi( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,	    KC_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_PEQL,
   KC_LSFT,      KC_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,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
index 2ce4282661..62ccae63dc 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_iso( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,              	 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
index 4a937cf394..eed5e664a8 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
@@ -27,7 +27,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_DL] = LAYOUT_iso (
-      KC_ESC,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,   DE_SS,   DE_ACUT, KC_BSPC, _______,     KC_NLCK, KC_PSCR,KC_PSLS,KC_PAST,
+      KC_ESC,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,   DE_SS,   DE_ACUT, KC_BSPC, _______,     KC_NUM,  KC_PSCR,KC_PSLS,KC_PAST,
       KC_TAB,  KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  DE_Z,  KC_U,  KC_I,  KC_O,    KC_P,   DE_UDIA, DE_PLUS,                       KC_P7,   KC_P8,  KC_P9,  KC_PMNS,
       SPECIAL, KC_A,    KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    DE_ODIA,DE_ADIA, DE_HASH, KC_ENT,               KC_P4,   KC_P5,  KC_P6,  KC_PPLS,
       KC_LSFT, DE_LABK, DE_Y,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, DE_MINS, KC_RSFT,        KC_UP,         KC_P1,   KC_P2,  KC_P3,  KC_PENT,
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c
index b1001450e5..bf8baab4c8 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_all( /* Base */
-  KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_NO, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_NO, 	 	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_NO,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NO ,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
index 65c01ef9d5..721578f90a 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_all( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
index 6d6da28ee7..0ae4c5710a 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_all( /* Base */
-  KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_DEL, 	 	KC_NLCK, 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_GRV, KC_DEL, 	 	KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,	    KC_BSPC, 	 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NO,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_BSLS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c
index 47e4ad4017..03e01ba0c9 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c
@@ -5,7 +5,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_all(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL, 	     	  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL, 	     	  KC_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_NUHS,     KC_ENT,  	          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT, KC_BSLS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,         KC_RSFT,    KC_UP,    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c b/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c
index 5fef7d1e53..b0073bba77 100644
--- a/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_F1] = 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_INS,KC_DEL,
-    KC_CAPS,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,KC_UP,_______,KC_DEL,
+    KC_CAPS,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_UP,_______,KC_DEL,
     _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,        _______,
     _______,_______,_______,_______,_______,_______,_______,KC_PPLS,KC_PMNS,KC_END,KC_PGDN,KC_DOWN,_______,_______,
     _______,_______,_______,                _______,                        KC_STOP,_______,_______)
diff --git a/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c b/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c
index 39b80cde46..e15f34611f 100644
--- a/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c
+++ b/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_F1] = 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_INS,KC_DEL,
-    KC_CAPS,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,KC_UP,_______,KC_DEL,
+    KC_CAPS,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_UP,_______,KC_DEL,
     _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,        _______,
     _______,_______,_______,_______,_______,_______,_______,KC_PPLS,KC_PMNS,KC_END,KC_PGDN,KC_DOWN,_______,_______,
     _______,_______,_______,                _______,                        KC_STOP,_______,_______),
diff --git a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
index 15f654de0c..27dc90f721 100644
--- a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_60_hhkb(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 				KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c
index f6bc94fbd6..cec0cf4b76 100644
--- a/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c
index f6bc94fbd6..cec0cf4b76 100644
--- a/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
index 7b6d9b756c..c3ff625388 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
index b1ed28b001..03f0eaad2f 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [HHKB] = 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_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
 	_______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
 	_______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
 	         _______, _______,                            _______,                            _______, _______),
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
index 7b6d9b756c..c3ff625388 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
index 7b6d9b756c..c3ff625388 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
index 36d2d6efcd..2973f2eced 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	         KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c
index 6af46ab132..3705a733bf 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m65_b/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_m65_b/keymaps/via/keymap.c
index f6bc94fbd6..cec0cf4b76 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m65_b/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m65_bx/keymaps/default/keymap.c
index 6af46ab132..3705a733bf 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m65_bx/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_m65_bx/keymaps/via/keymap.c
index f6bc94fbd6..cec0cf4b76 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m65_bx/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/rama_works_u80_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_u80_a/keymaps/default/keymap.c
index 548843427c..3917130162 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_u80_a/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	  [0] = LAYOUT_all(
-	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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,
diff --git a/keyboards/wilba_tech/rama_works_u80_a/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_u80_a/keymaps/via/keymap.c
index 548843427c..3917130162 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/rama_works_u80_a/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	  [0] = LAYOUT_all(
-	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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,
diff --git a/keyboards/wilba_tech/wt60_a/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/wilba_tech/wt60_a/keymaps/ansi_split_bs_rshift/keymap.c
index 95e01fc2ca..68af17a41d 100644
--- a/keyboards/wilba_tech/wt60_a/keymaps/ansi_split_bs_rshift/keymap.c
+++ b/keyboards/wilba_tech/wt60_a/keymaps/ansi_split_bs_rshift/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [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_INS, KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_a/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_a/keymaps/default/keymap.c
index 566736f5e3..08ad8f661c 100644
--- a/keyboards/wilba_tech/wt60_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_a/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [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_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_a/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_a/keymaps/via/keymap.c
index 566736f5e3..08ad8f661c 100644
--- a/keyboards/wilba_tech/wt60_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_a/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [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_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
index 710fa4da16..53f63edd6c 100644
--- a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
index 710fa4da16..53f63edd6c 100644
--- a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
index 3e08d4eda1..7d43075b34 100644
--- a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
index 3e08d4eda1..7d43075b34 100644
--- a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
index cba25bb8fa..c1fdd18f35 100644
--- a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
index cba25bb8fa..c1fdd18f35 100644
--- a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_d/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_d/keymaps/default/keymap.c
index 94977c160a..e0e6fa47b1 100644
--- a/keyboards/wilba_tech/wt60_d/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_d/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_d/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_d/keymaps/via/keymap.c
index 94977c160a..e0e6fa47b1 100644
--- a/keyboards/wilba_tech/wt60_d/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_d/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c
index 82d1720016..12c17135b0 100644
--- a/keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_g2/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_g2/keymaps/default/keymap.c
index 8ea701f74d..e96345501f 100644
--- a/keyboards/wilba_tech/wt60_g2/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_g2/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
index e701e417f5..5635a1b3e9 100644
--- a/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[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_INS,  KC_DEL,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_h2/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_h2/keymaps/default/keymap.c
index 762db000f2..deba514c98 100644
--- a/keyboards/wilba_tech/wt60_h2/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_h2/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
index a4f24c12e9..19236e0a45 100644
--- a/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_xt/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_xt/keymaps/default/keymap.c
index 7373f42773..e91602c106 100644
--- a/keyboards/wilba_tech/wt60_xt/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_xt/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_TRNS, KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt60_xt/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_xt/keymaps/via/keymap.c
index 7373f42773..e91602c106 100644
--- a/keyboards/wilba_tech/wt60_xt/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_xt/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_all(
 	KC_TRNS, KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_a/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_a/keymaps/default/keymap.c
index c5ae811680..f27515d21b 100644
--- a/keyboards/wilba_tech/wt65_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_a/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_a/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_a/keymaps/via/keymap.c
index c5ae811680..f27515d21b 100644
--- a/keyboards/wilba_tech/wt65_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt65_a/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, 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_HOME, KC_PGUP, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_b/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_b/keymaps/default/keymap.c
index 41e5cb8be3..8f97b0a8a1 100644
--- a/keyboards/wilba_tech/wt65_b/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_b/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_b/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_b/keymaps/via/keymap.c
index 41e5cb8be3..8f97b0a8a1 100644
--- a/keyboards/wilba_tech/wt65_b/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt65_b/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_d/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_d/keymaps/default/keymap.c
index 3572bf9032..ca0093926d 100644
--- a/keyboards/wilba_tech/wt65_d/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_d/keymaps/default/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_f/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_f/keymaps/default/keymap.c
index bc5e3084e1..486048d279 100644
--- a/keyboards/wilba_tech/wt65_f/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_f/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_fx/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_fx/keymaps/default/keymap.c
index 83dc126f4e..8dbe539769 100644
--- a/keyboards/wilba_tech/wt65_fx/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_fx/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c
index 9670dd4c1f..b837b0f8be 100644
--- a/keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_g2/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_g2/keymaps/default/keymap.c
index 181b1d57a8..3e0523b90c 100644
--- a/keyboards/wilba_tech/wt65_g2/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_g2/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
 		KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c
index b24e61a9a4..1486f6a3e4 100644
--- a/keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_65_ansi_blocker_tsangan(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c
index 82767283df..49cd2cc769 100644
--- a/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS,    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_TRNS,
-		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c
index 8e57b6b4d8..10586938d3 100644
--- a/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS,    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_TRNS,
-		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_xtx/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_xtx/keymaps/default/keymap.c
index 69f8286867..7522bbda23 100644
--- a/keyboards/wilba_tech/wt65_xtx/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt65_xtx/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS,    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt65_xtx/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_xtx/keymaps/via/keymap.c
index 6bf9c09f09..6a0d1e5f5d 100644
--- a/keyboards/wilba_tech/wt65_xtx/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt65_xtx/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS,    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt69_a/keymaps/default/keymap.c b/keyboards/wilba_tech/wt69_a/keymaps/default/keymap.c
index c9fc5dd071..17c2f7d536 100644
--- a/keyboards/wilba_tech/wt69_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt69_a/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS,    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  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_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt69_a/keymaps/via/keymap.c b/keyboards/wilba_tech/wt69_a/keymaps/via/keymap.c
index c9fc5dd071..17c2f7d536 100644
--- a/keyboards/wilba_tech/wt69_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt69_a/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS,    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  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_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/wt70_jb/keymaps/default/keymap.c b/keyboards/wilba_tech/wt70_jb/keymaps/default/keymap.c
index 725b95551a..f7bd8032c1 100644
--- a/keyboards/wilba_tech/wt70_jb/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt70_jb/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Fn1 Layer
 [1] = LAYOUT_all(
-	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_GRV,  KC_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_PSCR, KC_SCRL, KC_PAUS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
diff --git a/keyboards/wilba_tech/wt80_a/keymaps/default/keymap.c b/keyboards/wilba_tech/wt80_a/keymaps/default/keymap.c
index 9cbe7ff624..b9c291dfbf 100644
--- a/keyboards/wilba_tech/wt80_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt80_a/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	  [0] = LAYOUT_all(
-	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SCRL, KC_PAUS,
 	    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 	    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
 	    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/wilba_tech/wt80_a/keymaps/via/keymap.c b/keyboards/wilba_tech/wt80_a/keymaps/via/keymap.c
index 9cbe7ff624..b9c291dfbf 100644
--- a/keyboards/wilba_tech/wt80_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt80_a/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	  [0] = LAYOUT_all(
-	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SCRL, KC_PAUS,
 	    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 	    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
 	    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/wilba_tech/wt80_bc/keymaps/default/keymap.c b/keyboards/wilba_tech/wt80_bc/keymaps/default/keymap.c
index 3e6b4546db..edae8e2f92 100644
--- a/keyboards/wilba_tech/wt80_bc/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt80_bc/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	  [0] = LAYOUT_all(
-	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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,
diff --git a/keyboards/wilba_tech/wt80_bc/keymaps/via/keymap.c b/keyboards/wilba_tech/wt80_bc/keymaps/via/keymap.c
index 3e6b4546db..edae8e2f92 100644
--- a/keyboards/wilba_tech/wt80_bc/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt80_bc/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	  [0] = LAYOUT_all(
-	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_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,
diff --git a/keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c b/keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c
index 08fa11b385..00a8036fc7 100644
--- a/keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	  [0] = LAYOUT_all(
-	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SCRL, KC_PAUS,
 	    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 	    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
 	    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
index edb4f256b5..6c290fcdeb 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [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_INS, KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
index d612582d84..dfbe6a972e 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FL] = LAYOUT_60_ansi_split_bs_rshift(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
 		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, _______,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______,                            _______,                            _______, _______, _______, _______
 	),
diff --git a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
index 3a13cf4d5a..f75fb4a57a 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [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_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
index 5cedc6e5ec..0bfc63911e 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
 	KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 			 KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
index 55120f05e5..9c4faeae48 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_60_iso(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL ,
-	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
index 046654c6af..4232225310 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [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_INS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PSCR, KC_SLCK,   KC_PAUS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PSCR, KC_SCRL,   KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_INS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
index e9f5056343..21cb2cd73f 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // 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_SLCK, KC_PAUS, KC_INS,  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}
diff --git a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
index 395790d290..889f94ebe1 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_60_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
 	KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c
index dd1a715d0a..9a91b12f28 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_65_normie(
 	KC_GRV,  KC_F1,   KC_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_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 	KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS,                                              KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c
index 2c6d24e8fa..35698065dc 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_65_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 	KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS,                                              KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c
index 2c6d24e8fa..35698065dc 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Fn1 Layer
 [1] = LAYOUT_65_all(
 	KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 	KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS,                                              KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
index 4129317289..848056bee9 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_65_normie(
 		KC_GRV,  KC_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_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_LALT,                                              KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/winkeyless/b87/keymaps/default/keymap.c b/keyboards/winkeyless/b87/keymaps/default/keymap.c
index 4b48b09fe8..8fe5a3f0d2 100644
--- a/keyboards/winkeyless/b87/keymaps/default/keymap.c
+++ b/keyboards/winkeyless/b87/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 //base layer
 [0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                     KC_PSCR, KC_SLCK, KC_PAUS, 
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                     KC_PSCR, KC_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_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_BSLS, KC_ENT, 
diff --git a/keyboards/winkeyless/b87/keymaps/via/keymap.c b/keyboards/winkeyless/b87/keymaps/via/keymap.c
index 2dc2890180..4ac0069c37 100644
--- a/keyboards/winkeyless/b87/keymaps/via/keymap.c
+++ b/keyboards/winkeyless/b87/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 //base layer
 [0] = LAYOUT_all(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                     KC_PSCR, KC_SLCK, KC_PAUS, 
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                     KC_PSCR, KC_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_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_BSLS, KC_ENT, 
diff --git a/keyboards/winkeyless/bminiex/keymaps/ansi/keymap.c b/keyboards/winkeyless/bminiex/keymaps/ansi/keymap.c
index 658377fa82..a86a381817 100644
--- a/keyboards/winkeyless/bminiex/keymaps/ansi/keymap.c
+++ b/keyboards/winkeyless/bminiex/keymaps/ansi/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ansi(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,     KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,     KC_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_INS,     KC_P7,   KC_P8,   KC_P9,
     KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,    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_PGDN,    KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/winkeyless/bminiex/keymaps/default/keymap.c b/keyboards/winkeyless/bminiex/keymaps/default/keymap.c
index ed949d74fb..de36e11019 100644
--- a/keyboards/winkeyless/bminiex/keymaps/default/keymap.c
+++ b/keyboards/winkeyless/bminiex/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_PSCR,KC_HOME,KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,        KC_DEL,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,        KC_DEL,  KC_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_NO,          KC_INS,  KC_P7,   KC_P8,   KC_P9,
         KC_LCAP,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,    KC_PGUP, 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_PGDN, KC_P1,   KC_P2,   KC_P3,   
diff --git a/keyboards/winkeyless/bminiex/keymaps/iso/keymap.c b/keyboards/winkeyless/bminiex/keymaps/iso/keymap.c
index c83c0ec137..f7a1aed426 100644
--- a/keyboards/winkeyless/bminiex/keymaps/iso/keymap.c
+++ b/keyboards/winkeyless/bminiex/keymaps/iso/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_iso(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,     KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,     KC_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_INS,     KC_P7,   KC_P8,   KC_P9,
     KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGUP,    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_PGDN,    KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/winkeyless/bminiex/keymaps/via/keymap.c b/keyboards/winkeyless/bminiex/keymaps/via/keymap.c
index d612843f81..14ad739c46 100644
--- a/keyboards/winkeyless/bminiex/keymaps/via/keymap.c
+++ b/keyboards/winkeyless/bminiex/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_PSCR,KC_HOME,KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,        KC_DEL,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,        KC_DEL,  KC_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_NO,          KC_INS,  KC_P7,   KC_P8,   KC_P9,
         KC_LCAP,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,    KC_PGUP, 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_PGDN, KC_P1,   KC_P2,   KC_P3,   
diff --git a/keyboards/winry/winry25tc/keymaps/default/keymap.c b/keyboards/winry/winry25tc/keymaps/default/keymap.c
index ec1d0f42ed..7e741c604c 100644
--- a/keyboards/winry/winry25tc/keymaps/default/keymap.c
+++ b/keyboards/winry/winry25tc/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum my_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FIRST_LAYER] = LAYOUT(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_ESC,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, RGB_TOG,
         KC_P4,   KC_P5,   KC_P6,   KC_PENT, RGB_MOD,
         KC_P1,   KC_P2,   KC_P3,   KC_UP,   MO(_SECOND_LAYER),
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/keymap.c b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
index 8864b1b45a..caa8811a5d 100644
--- a/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
+++ b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     RGB_TOG, RGB_HUD, RGB_HUI,
         RGB_M_B,    RGB_M_P, RGB_SAD, RGB_SAI,
                     KC_NO,   RGB_VAD, RGB_VAI,
-        RGB_M_P,    KC_NLCK, RGB_RMOD,RGB_MOD
+        RGB_M_P,    KC_NUM,  RGB_RMOD,RGB_MOD
     ),
 };
 // clang-format on
diff --git a/keyboards/wolf/sabre/keymaps/default/keymap.c b/keyboards/wolf/sabre/keymaps/default/keymap.c
index dc8312a7ea..943ac3f168 100644
--- a/keyboards/wolf/sabre/keymaps/default/keymap.c
+++ b/keyboards/wolf/sabre/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wolf/sabre/keymaps/via/keymap.c b/keyboards/wolf/sabre/keymaps/via/keymap.c
index e3d01e7424..e709840913 100644
--- a/keyboards/wolf/sabre/keymaps/via/keymap.c
+++ b/keyboards/wolf/sabre/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = 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_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
index bd6a7d3434..09d2a3403e 100644
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     HYPR_0,  _______, WINK,    _______, _______,  TOUNGE,  _______, _______, CRY,     FLIP,    _______, _______, \
     HYPR_1,  ABOVE,   SHRUG,   _______, FROWN,    _______, HEART,   JOY,     _______, LLAP,    _______, _______, \
     HYPR_2,  _______, _______, _______, CONFUSED, _______, _______, GRIN,    SHIT,    _______, _______, _______, \
-    _______, _______, _______, _______, KC_SLCK,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT \
+    _______, _______, _______, _______, KC_SCRL,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT \
   ),
 
 
diff --git a/keyboards/wren/keymaps/default/keymap.c b/keyboards/wren/keymaps/default/keymap.c
index 637e0e08b8..8f7f0bae06 100644
--- a/keyboards/wren/keymaps/default/keymap.c
+++ b/keyboards/wren/keymaps/default/keymap.c
@@ -31,6 +31,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      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,    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NO,   KC_UP,   KC_NO,   KC_NO,
      KC_PPLS, KC_0,    KC_DOT,  KC_ENT,  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-                                                           KC_NLCK, KC_LALT, KC_LGUI, KC_BSPC, KC_ENT,  KC_SPC,  KC_DEL,  KC_RGUI, KC_RALT, KC_MUTE
+                                                           KC_NUM,  KC_LALT, KC_LGUI, KC_BSPC, KC_ENT,  KC_SPC,  KC_DEL,  KC_RGUI, KC_RALT, KC_MUTE
     )
 };
diff --git a/keyboards/wsk/alpha9/keymaps/default/keymap.c b/keyboards/wsk/alpha9/keymaps/default/keymap.c
index ba0da415d3..0e480675d3 100644
--- a/keyboards/wsk/alpha9/keymaps/default/keymap.c
+++ b/keyboards/wsk/alpha9/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FNCHAR] = LAYOUT(
-        KC_NLCK, KC_NO,   KC_NO,   KC_1,    KC_2,    KC_3,       KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_NUM,  KC_NO,   KC_NO,   KC_1,    KC_2,    KC_3,       KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
         KC_NO,   KC_NO,   KC_NO,   KC_GRV,  KC_NO,   KC_MINS,    KC_EQL, KC_BSLS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSPC,
         KC_NO,   KC_NO,   KC_NO,   KC_LCTL, KC_LALT, MO(_FKEYS), KC_TRNS,         LSFT_T(KC_SPC),   KC_COMM, KC_DOT,  KC_SLSH
     ),
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
index 1ba2583670..c17772e150 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c
index a27c3c5969..8061b1d733 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c
index 31055a6a0a..4f1400483d 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_split_bs(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/keymap.c
index 36b48cebb8..eb47eaeb43 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/keymap.c
index 181ee17c64..49c592ba71 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_split_lshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/keymap.c
index 91ddaa8d0e..e8de765b80 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_split_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c
index 110e3f4639..2f8aa8f940 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c
index d56749b9cb..f6e72121b0 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c
index 842da351e5..722ae7a1d5 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c
index ccd8e35487..6809eab847 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_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_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
index a751bdea30..9b5958f7a6 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c
index 1b5806b2cf..75fbe88df4 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_split_lshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c
index 28834dcb03..9980f8d60c 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_split_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c
index 6ae4f5398b..61b92c70b2 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/xbows/knight/keymaps/default/keymap.c b/keyboards/xbows/knight/keymaps/default/keymap.c
index ab5329199b..444eb1dd3e 100644
--- a/keyboards/xbows/knight/keymaps/default/keymap.c
+++ b/keyboards/xbows/knight/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
     QK_BOOT,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD, RGB_VAI, RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD, RGB_VAD, RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
diff --git a/keyboards/xbows/knight/keymaps/via/keymap.c b/keyboards/xbows/knight/keymaps/via/keymap.c
index 662b68f81b..737ea8d9ac 100644
--- a/keyboards/xbows/knight/keymaps/via/keymap.c
+++ b/keyboards/xbows/knight/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
     QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
-    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
diff --git a/keyboards/xbows/knight_plus/keymaps/default/keymap.c b/keyboards/xbows/knight_plus/keymaps/default/keymap.c
index 6316f66a9d..429f6bc9c7 100644
--- a/keyboards/xbows/knight_plus/keymaps/default/keymap.c
+++ b/keyboards/xbows/knight_plus/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
     QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
-    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
diff --git a/keyboards/xbows/knight_plus/keymaps/via/keymap.c b/keyboards/xbows/knight_plus/keymaps/via/keymap.c
index 31a359266d..a080c2d864 100644
--- a/keyboards/xbows/knight_plus/keymaps/via/keymap.c
+++ b/keyboards/xbows/knight_plus/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
     QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
-    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
diff --git a/keyboards/xbows/nature/keymaps/default/keymap.c b/keyboards/xbows/nature/keymaps/default/keymap.c
index 331889ffe4..af1eb99553 100644
--- a/keyboards/xbows/nature/keymaps/default/keymap.c
+++ b/keyboards/xbows/nature/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
     QK_BOOT,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD, RGB_VAI, RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD, RGB_VAD, RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
diff --git a/keyboards/xbows/nature/keymaps/via/keymap.c b/keyboards/xbows/nature/keymaps/via/keymap.c
index 662b68f81b..737ea8d9ac 100644
--- a/keyboards/xbows/nature/keymaps/via/keymap.c
+++ b/keyboards/xbows/nature/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
     QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
-    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
diff --git a/keyboards/xbows/numpad/keymaps/default/keymap.c b/keyboards/xbows/numpad/keymaps/default/keymap.c
index 9d657a33cc..dc70e84e6e 100644
--- a/keyboards/xbows/numpad/keymaps/default/keymap.c
+++ b/keyboards/xbows/numpad/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [0] = LAYOUT(
     KC_ESC ,  KC_TAB,   KC_BSPC,  MO(1),
-    KC_NLCK,  KC_PSLS,  KC_PAST,  KC_EQL,
+    KC_NUM,   KC_PSLS,  KC_PAST,  KC_EQL,
     KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
     KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
     KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/xbows/numpad/keymaps/via/keymap.c b/keyboards/xbows/numpad/keymaps/via/keymap.c
index 36b91961c8..83e8d90d0e 100644
--- a/keyboards/xbows/numpad/keymaps/via/keymap.c
+++ b/keyboards/xbows/numpad/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [0] = LAYOUT(
     KC_ESC ,  KC_TAB,   KC_BSPC,  MO(1),
-    KC_NLCK,  KC_PSLS,  KC_PAST,  KC_EQL,
+    KC_NUM,   KC_PSLS,  KC_PAST,  KC_EQL,
     KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
     KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
     KC_P1,    KC_P2,    KC_P3,    KC_PENT,
diff --git a/keyboards/xbows/ranger/keymaps/default/keymap.c b/keyboards/xbows/ranger/keymaps/default/keymap.c
index 519014af06..e952482bee 100644
--- a/keyboards/xbows/ranger/keymaps/default/keymap.c
+++ b/keyboards/xbows/ranger/keymaps/default/keymap.c
@@ -33,14 +33,14 @@ 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_SLCK,  KC_PAUS,
+		KC_ESC,         KC_F1, KC_F2, KC_F3, KC_F4,    KC_F5, KC_F6, KC_F7, KC_F8,    KC_F9,KC_F10,KC_F11,KC_F12,      KC_PSCR,  KC_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,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EEP_RST,  KC_NLCK,
+    QK_BOOT,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EEP_RST,  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,
     RGB_TOG,     RGB_MOD, RGB_VAI, 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,  KC_TRNS,
     KC_TRNS,        RGB_SPD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
diff --git a/keyboards/xbows/ranger/keymaps/via/keymap.c b/keyboards/xbows/ranger/keymaps/via/keymap.c
index 61632edbf4..05e6220a18 100644
--- a/keyboards/xbows/ranger/keymaps/via/keymap.c
+++ b/keyboards/xbows/ranger/keymaps/via/keymap.c
@@ -33,14 +33,14 @@ 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_SLCK,  KC_PAUS,
+		KC_ESC,         KC_F1, KC_F2, KC_F3, KC_F4,    KC_F5, KC_F6, KC_F7, KC_F8,    KC_F9,KC_F10,KC_F11,KC_F12,      KC_PSCR,  KC_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,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EEP_RST,  KC_NLCK,
+    QK_BOOT,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EEP_RST,  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,
     RGB_TOG,     RGB_MOD, RGB_VAI, 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,  KC_TRNS,
     KC_TRNS,        RGB_SPD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
diff --git a/keyboards/xbows/woody/keymaps/default/keymap.c b/keyboards/xbows/woody/keymaps/default/keymap.c
index 820b5315ef..c0bdab97c7 100644
--- a/keyboards/xbows/woody/keymaps/default/keymap.c
+++ b/keyboards/xbows/woody/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
     [1] = LAYOUT( /* FN */
         KC_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_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,   KC_HOME,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_HOME,
         KC_CAPS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_END,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT)
diff --git a/keyboards/xelus/dharma/keymaps/default/keymap.c b/keyboards/xelus/dharma/keymaps/default/keymap.c
index 9a3337dc77..610e0f284f 100644
--- a/keyboards/xelus/dharma/keymaps/default/keymap.c
+++ b/keyboards/xelus/dharma/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Default layer
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_NLCK, 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_DEL,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, 		   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,					   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/xelus/dharma/keymaps/via/keymap.c b/keyboards/xelus/dharma/keymaps/via/keymap.c
index 9d45c281a0..d1df38a33a 100644
--- a/keyboards/xelus/dharma/keymaps/via/keymap.c
+++ b/keyboards/xelus/dharma/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // Default layer
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_NLCK, 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_DEL,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, 		   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,					   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/xelus/kangaroo/keymaps/default/keymap.c b/keyboards/xelus/kangaroo/keymaps/default/keymap.c
index 9150ceffc8..a84cf0a305 100644
--- a/keyboards/xelus/kangaroo/keymaps/default/keymap.c
+++ b/keyboards/xelus/kangaroo/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  [0] = LAYOUT_all(
-	    KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,   KC_PSCR, KC_SLCK, KC_PAUS,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-	    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_INS,  KC_HOME, KC_PGUP,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+	    KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,   KC_PSCR, KC_SCRL, KC_PAUS,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+	    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,   KC_INS,  KC_HOME, KC_PGUP,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
 	    KC_PPLS, KC_P7,   KC_P8,   KC_P9,     KC_DEL,  KC_END,  KC_PGDN,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 	    KC_PPLS, KC_P4,   KC_P5,   KC_P6,                                  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	    KC_PENT, KC_P1,   KC_P2,   KC_P3,              KC_UP,              KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/xelus/kangaroo/keymaps/via/keymap.c b/keyboards/xelus/kangaroo/keymaps/via/keymap.c
index ca29e19952..4884b501ce 100644
--- a/keyboards/xelus/kangaroo/keymaps/via/keymap.c
+++ b/keyboards/xelus/kangaroo/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  [0] = LAYOUT_all(
-	    KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,   KC_PSCR, KC_SLCK, KC_PAUS,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-	    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_INS,  KC_HOME, KC_PGUP,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+	    KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,   KC_PSCR, KC_SCRL, KC_PAUS,   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+	    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,   KC_INS,  KC_HOME, KC_PGUP,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
 	    KC_PPLS, KC_P7,   KC_P8,   KC_P9,     KC_DEL,  KC_END,  KC_PGDN,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 	    KC_PPLS, KC_P4,   KC_P5,   KC_P6,                                  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	    KC_PENT, KC_P1,   KC_P2,   KC_P3,              KC_UP,              KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/xelus/la_plus/keymaps/default/keymap.c b/keyboards/xelus/la_plus/keymaps/default/keymap.c
index 4b4fac030d..228fccb389 100755
--- a/keyboards/xelus/la_plus/keymaps/default/keymap.c
+++ b/keyboards/xelus/la_plus/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KB_SUAC,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT,            KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT,            KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/xelus/la_plus/keymaps/via/keymap.c b/keyboards/xelus/la_plus/keymaps/via/keymap.c
index 4b4fac030d..228fccb389 100755
--- a/keyboards/xelus/la_plus/keymaps/via/keymap.c
+++ b/keyboards/xelus/la_plus/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KB_SUAC,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT,            KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT,            KC_TRNS,
 		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/xelus/ninjin/keymaps/default/keymap.c b/keyboards/xelus/ninjin/keymaps/default/keymap.c
index 338d5ada59..3a62fc0ad0 100644
--- a/keyboards/xelus/ninjin/keymaps/default/keymap.c
+++ b/keyboards/xelus/ninjin/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  [0] = LAYOUT_tkl_ansi_tsangan(
-	    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/xelus/ninjin/keymaps/via/keymap.c b/keyboards/xelus/ninjin/keymaps/via/keymap.c
index 331214cbf8..23c65adece 100644
--- a/keyboards/xelus/ninjin/keymaps/via/keymap.c
+++ b/keyboards/xelus/ninjin/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  [0] = LAYOUT_tkl_ansi_tsangan(
-	    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_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,
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c b/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c
index 0459e1f2dd..1ab90656a5 100644
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c
+++ b/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT_all(
-        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c b/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c
index d46bdc103f..cbb9048510 100644
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c
+++ b/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT_all(
-        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c b/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c
index 0459e1f2dd..1ab90656a5 100644
--- a/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c
+++ b/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT_all(
-        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c b/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c
index d46bdc103f..cbb9048510 100644
--- a/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c
+++ b/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT_all(
-        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F13,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c b/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c
index 7c1499668d..3f41f8ca40 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c
+++ b/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT_tkl_ansi_tsangan(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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(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,
diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c b/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c
index 641a3cfa7d..70904faaba 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c
+++ b/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT_tkl_ansi_tsangan(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_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(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,
diff --git a/keyboards/xelus/rs108/keymaps/default/keymap.c b/keyboards/xelus/rs108/keymaps/default/keymap.c
index 24f2ae7668..26ac68ffdc 100644
--- a/keyboards/xelus/rs108/keymaps/default/keymap.c
+++ b/keyboards/xelus/rs108/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_108_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                               KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                             KC_UP,             KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/xelus/rs108/keymaps/via/keymap.c b/keyboards/xelus/rs108/keymaps/via/keymap.c
index 359c9aef3f..3484e44689 100644
--- a/keyboards/xelus/rs108/keymaps/via/keymap.c
+++ b/keyboards/xelus/rs108/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_108_fullsize_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                               KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                             KC_UP,             KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/xelus/snap96/keymaps/default/keymap.c b/keyboards/xelus/snap96/keymaps/default/keymap.c
index 31c7a2ff28..79ab8b2856 100644
--- a/keyboards/xelus/snap96/keymaps/default/keymap.c
+++ b/keyboards/xelus/snap96/keymaps/default/keymap.c
@@ -3,8 +3,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_PSCR, KC_SLCK, KC_HOME, KC_END,
-		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,   KC_5,  KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_PSCR, KC_SCRL, KC_HOME, KC_END,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,   KC_5,  KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,  KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,  KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,   KC_V,  KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/xelus/snap96/keymaps/via/keymap.c b/keyboards/xelus/snap96/keymaps/via/keymap.c
index 03547d5fd1..72c10b66f6 100644
--- a/keyboards/xelus/snap96/keymaps/via/keymap.c
+++ b/keyboards/xelus/snap96/keymaps/via/keymap.c
@@ -3,8 +3,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_PSCR, KC_SLCK, KC_HOME, KC_END,
-		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,   KC_5,  KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_PSCR, KC_SCRL, KC_HOME, KC_END,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,   KC_5,  KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,  KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,  KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,   KC_V,  KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c b/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c
index 84469b6ac6..881c0f9039 100644
--- a/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c
+++ b/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  [0] = LAYOUT_all(
-	    KC_F13, KC_F14, KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_F13, KC_F14, KC_ESC,  KC_F1,   KC_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_F15, KC_F16, KC_GRV,  KC_1,    KC_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_F17, KC_F18, KC_TAB,  KC_Q,    KC_W,    KC_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_F19, KC_F20, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/xelus/trinityxttkl/keymaps/via/keymap.c b/keyboards/xelus/trinityxttkl/keymaps/via/keymap.c
index e1c3d660b0..cdcaf65ab5 100644
--- a/keyboards/xelus/trinityxttkl/keymaps/via/keymap.c
+++ b/keyboards/xelus/trinityxttkl/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  [0] = LAYOUT_all(
-	    KC_F13, KC_F14, KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_PSCR, KC_SLCK, KC_PAUS,
+	    KC_F13, KC_F14, KC_ESC,  KC_F1,   KC_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_F15, KC_F16, KC_GRV,  KC_1,    KC_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_F17, KC_F18, KC_TAB,  KC_Q,    KC_W,    KC_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_F19, KC_F20, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/xiaomi/mk02/keymaps/default/keymap.c b/keyboards/xiaomi/mk02/keymaps/default/keymap.c
index e51076e7f4..9653a67a37 100644
--- a/keyboards/xiaomi/mk02/keymaps/default/keymap.c
+++ b/keyboards/xiaomi/mk02/keymaps/default/keymap.c
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_ansi( /* Base */
-	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_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,
diff --git a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
index 0c535f3871..ad54ef0c86 100644
--- a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_60_ansi_split_bs_rshift_space(
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
-        KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
+        KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
         KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
         KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
         KC_LCTL, KC_LGUI, KC_LALT,          KC_LSFT,                KC_SPC,         KC_ESC,  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
index efa6874006..506d979793 100644
--- a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   LAYOUT_all(
     KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  BL_DEC,   BL_INC,  KC_F13,   KC_F14,    \
-    KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,    \
+    KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,    \
     KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,    \
     KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),     \
     KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 2: Cool Layer
   LAYOUT_all(
     QK_BOOT, BL_DEC,   BL_INC,  BL_ON,   BL_OFF, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_MODE_PLAIN, KC_TRNS,    \
-    KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,       \
+    KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,       \
     KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,       \
     KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),       \
     KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
diff --git a/keyboards/xiudi/xd60/keymaps/cheese/keymap.c b/keyboards/xiudi/xd60/keymaps/cheese/keymap.c
index 2ffd3bb5c3..7c7c2afe2b 100644
--- a/keyboards/xiudi/xd60/keymaps/cheese/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/cheese/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Function Layer
   [_FL] = LAYOUT_all(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  \
-      KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_CALC, KC_INS,  KC_PGUP,  KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, \
+      KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_CALC, KC_INS,  KC_PGUP,  KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, \
       KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU,  KC_TRNS,  KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, \
       KC_TRNS, KC_TRNS, KC_APP,  KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_TRNS, KC_TRNS, KC_TRNS, \
       KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                        KC_TRNS, KC_HOME, KC_PGUP, KC_PGDN, KC_END),
diff --git a/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c b/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
index 584611c53c..a5be75c180 100644
--- a/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/crd_ansi/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FL] = LAYOUT_60_ansi(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
 		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SLCK, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, RGB_TOG,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, RGB_TOG,
 		_______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, RGB_MOD, _______,
 		_______, _______,          _______,                   _______,                            _______, _______, _______, _______
 	)
diff --git a/keyboards/xiudi/xd60/keymaps/default/keymap.c b/keyboards/xiudi/xd60/keymaps/default/keymap.c
index f3e43067d7..fc95035bd2 100644
--- a/keyboards/xiudi/xd60/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   LAYOUT_all(
       QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
-      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
+      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c b/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
index 189fcde176..2cfdc35ffa 100644
--- a/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   LAYOUT_all(
       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_BSPC,  KC_BSPC,   \
-      KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_PSCR,KC_SLCK,KC_PAUS, RGB_RMOD,RGB_MOD,  RGB_VAD,           RGB_VAI,   \
+      KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_PSCR,KC_SCRL,KC_PAUS, RGB_RMOD,RGB_MOD,  RGB_VAD,           RGB_VAI,   \
       KC_CAPS, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_INS, KC_HOME,KC_PGUP, RGB_HUD, RGB_HUI,  KC_NO,             KC_ENT,    \
       KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_END,  KC_PGDN, KC_NO,    KC_RSFT, KC_UP,    KC_DEL,    \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_RCTRL, KC_LEFT, KC_DOWN,  KC_RIGHT),
diff --git a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c b/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
index 7717bd6ba9..67e852eb20 100644
--- a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   LAYOUT_all(
       QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
-      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
+      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
diff --git a/keyboards/xiudi/xd60/keymaps/krusli/keymap.c b/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
index 92591567d3..8b377bc561 100644
--- a/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_all(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   _______,      \
-      QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_INS,                 \
+      QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_INS,                 \
       _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_NO,        _______,           \
       _______, KC_NO,   _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,  _______,      \
       _______, _______, _______,                          _______,                              _______, _______, _______, _______, _______),
diff --git a/keyboards/xiudi/xd60/keymaps/melka/keymap.c b/keyboards/xiudi/xd60/keymaps/melka/keymap.c
index b80a8da5ae..0a1f5d4e49 100644
--- a/keyboards/xiudi/xd60/keymaps/melka/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/melka/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 3: Keypad Layer
   LAYOUT_melka(
-      KC_ESC,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_NLCK,    KC_PEQL,    KC_PSLS,    KC_PAST,    _______,    _______,
+      KC_ESC,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_NUM,     KC_PEQL,    KC_PSLS,    KC_PAST,    _______,    _______,
       _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P7,      KC_P8,      KC_P9,      KC_PMNS,    _______,
       _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P4,      KC_P5,      KC_P6,      KC_PPLS,
       TO(0),    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P1,      KC_P2,      KC_P3,      KC_PENT,    TO(0),
diff --git a/keyboards/xiudi/xd60/keymaps/via/keymap.c b/keyboards/xiudi/xd60/keymaps/via/keymap.c
index 6f55d466be..6d1ce4ed04 100644
--- a/keyboards/xiudi/xd60/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // 1: Function Layer
     [1] = LAYOUT_all(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
-        KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
+        KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
         KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
         KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
         KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, _______,  KC_HOME, KC_PGDN,  KC_END),
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
index b37e25500b..da48d080af 100644
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    LALT(KC_F4), KC_F1  , KC_F2       , KC_F3       , KC_F4       , KC_F5  , BL_TOGG, KC_F6  , KC_F7  , KC_F8      , KC_F9      , KC_F10    , KC_F11  , KC_F12 , KC_NLCK,
+    LALT(KC_F4), KC_F1  , KC_F2       , KC_F3       , KC_F4       , KC_F5  , BL_TOGG, KC_F6  , KC_F7  , KC_F8      , KC_F9      , KC_F10    , KC_F11  , KC_F12 , KC_NUM,
     _______    , _______, SLC_ALL     , SLC_ROW     , SLC_WRD     , KC_BRIU, BL_STEP, _______, _______, LSFT(KC_7) , LSFT(KC_8) , LSFT(KC_9), KC_8    , _______, _______,
     _______    , _______, LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), KC_BRID, BL_BRTG, _______, _______, LSFT(KC_4) , LSFT(KC_5) , LSFT(KC_6), KC_7    , _______, QK_BOOT,
     _______    , _______, KC_MUTE     , KC_VOLD     , KC_VOLU     , KC_MPLY, RGB_TOG, _______, _______, LSFT(KC_1) , LSFT(KC_2) , LSFT(KC_3), KC_ENT  , _______, _______,
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
index 3ea87056ef..097294e3cc 100644
--- a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
@@ -58,14 +58,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR,
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, KC_INS ,
   KC_CAPS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, _______, _______, _______,
-  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, KC_PGUP, KC_SLCK,
+  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, KC_PGUP, KC_SCRL,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
  ),
 
 //RAISE
  [_RS] = LAYOUT(
-   KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-   KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
+   KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+   KC_SCRL, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
    KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______,
    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   _______,KC_WH_U, KC_MS_U, KC_WH_D,
    QK_BOOT, DF(_QW), DF(_EASY_QW), _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
index 8a06074ca5..b04f2c64b6 100644
--- a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
@@ -43,7 +43,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       layer_invert(L_NUMPAD);
       bool num_lock = host_keyboard_leds() & 1<<USB_LED_NUM_LOCK;
       if (num_lock != (bool)IS_LAYER_ON(L_NUMPAD)) {
-        tap_code(KC_NLCK); // Toggle Num Lock to match layer state.
+        tap_code(KC_NUM_LOCK); // Toggle Num Lock to match layer state.
       }
     }
     return false;
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
index 25040fe342..f54ccc7644 100644
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
@@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
     XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-    _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PAST, XXXXXXX, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI,
-    _______, KC_P4,   KC_P5,   KC_P6,   KC_NLCK, KC_CALC, XXXXXXX, KC_PWR,  XXXXXXX, QK_BOOT, XXXXXXX, BL_BRTG, BL_STEP, RGB_SAD, RGB_SAI,
+    _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PAST, XXXXXXX, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI,
+    _______, KC_P4,   KC_P5,   KC_P6,   KC_NUM,  KC_CALC, XXXXXXX, KC_PWR,  XXXXXXX, QK_BOOT, XXXXXXX, BL_BRTG, BL_STEP, RGB_SAD, RGB_SAI,
     _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, KC_PSLS, XXXXXXX, KC_LWIN, KC_MPLY, KC_MPRV, KC_MNXT, BL_OFF,  BL_ON,   RGB_VAD, RGB_VAI,
     _______, KC_P0,   KC_PDOT, KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD
   )
diff --git a/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c b/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
index 62f420d264..b4ddd80f09 100755
--- a/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
      */
      [_FN] = LAYOUT(
-        LALT(KC_F4), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NLCK,
+        LALT(KC_F4), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUM,
         _______,     _______, _______, _______, RGB_HUI, RGB_TOG, _______, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______, _______, _______, _______,
         _______,     _______, _______, _______, RGB_SAI, RGB_MOD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______, _______, _______, QK_BOOT,
         _______,     _______, _______, _______, RGB_VAI, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______, _______, _______, _______,
diff --git a/keyboards/xiudi/xd75/keymaps/default/keymap.c b/keyboards/xiudi/xd75/keymaps/default/keymap.c
index 0b1126b93b..cc193c9749 100644
--- a/keyboards/xiudi/xd75/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/default/keymap.c
@@ -57,8 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------------------------------------------------------------------------------------------------------------------------------------'
      */
     [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT,   _______, _______, _______,
         KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
         _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
diff --git a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
index 705efb1b8b..4c9a61dcb4 100644
--- a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
@@ -106,8 +106,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+  KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
   KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______,
   KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
   _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
index 337b75c190..43331b1d0a 100644
--- a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
@@ -60,14 +60,14 @@ void dance_e_accent (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_i_accent (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P2);
     tap_code (KC_P3);
     tap_code (KC_P8);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
     tap_code (KC_I);
@@ -76,14 +76,14 @@ void dance_i_accent (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_o_accent (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P2);
     tap_code (KC_P4);
     tap_code (KC_P4);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
     tap_code (KC_O);
@@ -91,14 +91,14 @@ void dance_o_accent (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_u_accent (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P2);
     tap_code (KC_P4);
     tap_code (KC_P9);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
     tap_code (KC_U);
@@ -107,13 +107,13 @@ void dance_u_accent (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_slash (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P9);
     tap_code (KC_P2);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
     tap_code (KC_PSLS);
@@ -121,13 +121,13 @@ void dance_slash (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_under (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P9);
     tap_code (KC_P5);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
     tap_code (KC_6);
@@ -135,23 +135,23 @@ void dance_under (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_open_accol (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P1);
     tap_code (KC_P2);
     tap_code (KC_P3);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else if (state->count == 3) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P9);
     tap_code (KC_P1);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
     tap_code (KC_5);
@@ -159,24 +159,24 @@ void dance_open_accol (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_close_accol (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P1);
     tap_code (KC_P2);
     tap_code (KC_P5);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
 
   }
   else if (state->count == 3) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P9);
     tap_code (KC_P3);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
     tap_code (KC_MINS);
@@ -184,25 +184,25 @@ void dance_close_accol (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_question (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P0);
     tap_code (KC_P3);
     tap_code (KC_P3);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
 
   }
   else {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P0);
     tap_code (KC_P6);
     tap_code (KC_P3);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
 
   }
 }
@@ -216,22 +216,22 @@ void dance_cedille (qk_tap_dance_state_t *state, void *user_data) {
 }
 void dance_dot (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 2) {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P4);
     tap_code (KC_P4);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
   else {
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
     register_code (KC_LALT);
     tap_code (KC_P0);
     tap_code (KC_P4);
     tap_code (KC_P6);
     unregister_code (KC_LALT);
-    tap_code (KC_NLCK);
+    tap_code (KC_NUM_LOCK);
   }
 }
 qk_tap_dance_action_t tap_dance_actions[] = {
@@ -263,7 +263,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // green led layout
   [_LY1] = LAYOUT_ortho_5x15(
     KC_ESC, RGB_TOG, RGB_RMOD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_K, RGB_M_G, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_LY2), DF(_MAIN),
-    DEBUG, KC_PSCR, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    DEBUG, KC_PSCR, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
     QK_BOOT, KC_NO, KC_S, KC_D, KC_F, KC_G, KC_Z, KC_J, KC_K, KC_L, KC_M, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_LSFT,
     KC_NO, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_SCLN, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PEQL, KC_LCBR,
     KC_NO, KC_NO, KC_NO, KC_SPC, KC_SPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS, KC_P0,  KC_P1, KC_P2, KC_P3, KC_TRNS
diff --git a/keyboards/xiudi/xd75/keymaps/minna/keymap.c b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
index 615762fa75..26c9c07b27 100644
--- a/keyboards/xiudi/xd75/keymaps/minna/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[1] = LAYOUT_ortho_5x15(
     KC_MUTE, QMKBEST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-    KC_MSEL, KC_NO,   KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_CALC, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_MSEL, KC_NO,   KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_CALC, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
     KC_MPRV, KC_NO,   KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_MPLY, KC_P4, KC_P5, KC_P6, KC_PLUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, MO(1),   RGB_TOG, KC_NO,   RGB_RMOD,RGB_MOD, KC_NO, KC_P0, KC_NO, KC_PDOT, KC_PENT, KC_PENT, MO(1), UC_RMOD, UC_MOD)
diff --git a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
index a08449c605..64e014ae90 100644
--- a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_SYSTEM] = LAYOUT_ortho_5x15( /* FUNCTION */
     QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, _______, _______, MPASTE,  KC_PSCR, KC_SLCK, KC_PAUSE,
+    _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, _______, _______, MPASTE,  KC_PSCR, KC_SCRL, KC_PAUSE,
     _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
index 651a80a585..e1cda81cd5 100644
--- a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
@@ -138,7 +138,7 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______,
 KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,  KC_F7,   KC_F8,   KC_F9,   KC_F10,        KC_F11,        KC_F12,
 QK_BOOT, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_WH_U, KC_P4,   KC_P5,   KC_P6,  _______, _______, _______, RSFT(KC_MINS), LSFT(KC_MINS), _______,
 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_MINS, KC_WH_D, KC_P1,   KC_P2,   KC_P3,  _______, KC_PPLS, KC_ACL0, KC_ACL1,       KC_ACL2,       _______,
-_______, KC_ACL0, KC_ACL1, KC_ACL2, KC_WH_L, KC_WH_R, KC_NLCK, KC_PGUP, KC_P0,  _______, _______, _______, _______,       _______,       _______,
+_______, KC_ACL0, KC_ACL1, KC_ACL2, KC_WH_L, KC_WH_R, KC_NUM,  KC_PGUP, KC_P0,  _______, _______, _______, _______,       _______,       _______,
 RGB_TOG, _______, _______, _______, KC_BSPC, KC_BSPC, KC_HOME, KC_PGDN, KC_END, KC_BSPC, KC_BSPC, _______, _______,       _______,       _______
   )
 };
diff --git a/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c b/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c
index 41a7da189a..06e048e9f9 100644
--- a/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     [L_NUMBERS] = LAYOUT_ortho_5x15(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HASH, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, SFT_TAB,
         _______, KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL, _______, _______, _______, _______, KC_PPLS, KC_P4,   KC_P5,   KC_P6,   KC_PAST, KC_TAB,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PMNS, KC_P1,   KC_P2,   KC_P3,   KC_BSLS, KC_EQL,
@@ -116,8 +116,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 
     // [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    //     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-    //     KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_F12,
+    //     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    //     KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_F12,
     //     KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______,
     //     KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
     //     _______, _______, RGB_TOG, ooooooo, RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, ooooooo, _______, _______, _______
diff --git a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
index b668f23a57..f068e7126c 100644
--- a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
@@ -207,14 +207,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [nal] = LAYOUT_ortho_5x15( \
     QK_BOOT, DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+    KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
     KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM  , \
-    _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_SLCK, KC_END,  KC_PGDN, _______, \
+    _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_SCRL, KC_END,  KC_PGDN, _______, \
     _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______ \
   ),
   [nar] = LAYOUT_ortho_5x15( \
     QK_BOOT, DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+    KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
     KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM  , \
     _S_TAB,  _A_LEFT, IJ_OMN,  _A_RGHT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, __NAR,   KC_END,  KC_PGDN, _______, \
     _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index 1cc570bdd5..8510a2d3ca 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -126,7 +126,7 @@ LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,_______
  LAYOUT_ortho_5x15(
    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
    KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_HOME ,KC_UP   ,KC_PGUP ,KC_PSCR ,________,
-   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_LEFT ,KC_F5   ,KC_RIGHT,KC_SLCK ,___XX___,
+   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_LEFT ,KC_F5   ,KC_RIGHT,KC_SCRL ,___XX___,
    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_END  ,KC_DOWN ,KC_PGDN ,KC_PAUS ,___XX___,
    ________,________,________,________,________,________,________,________,________,________,________,KC_INS  ,KC_DEL  ,___XX___,___XX___
  ),
diff --git a/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c b/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
index 54913b29b4..f7872e7f94 100644
--- a/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
@@ -112,8 +112,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_ADJUST] = LAYOUT_ortho_5x15( /* ADJUST */
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NLCK, KC_SLSH,
-    _______, QK_BOOT, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_INS,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUM,  KC_SLSH,
+    _______, QK_BOOT, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_INS,
     KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_SAD, RGB_SAI, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, QK_BOOT, _______, _______, _______,
     KC_VOLD, KC_MUTE, KC_VOLU, RGB_RMOD,RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/xiudi/xd75/keymaps/via/keymap.c b/keyboards/xiudi/xd75/keymaps/via/keymap.c
index aa4961b934..a156f60317 100644
--- a/keyboards/xiudi/xd75/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/via/keymap.c
@@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------------------------------------------------------------------------------------------------------------------------------------'
      */
     [1] = LAYOUT_ortho_5x15(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT,   _______, _______, _______,
         KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
         _______, _______, RGB_TOG, _______, RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, _______, _______, _______, _______
diff --git a/keyboards/xiudi/xd75/keymaps/xo/keymap.c b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
index 2954204529..29fe0a3703 100644
--- a/keyboards/xiudi/xd75/keymaps/xo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LCTL(KC_GRV), KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P4, KC_P5, KC_P6, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
     KC_CAPS, KC_TRNS, KC_TRNS, KC_MSTP, RGB_SAD, RGB_SAI, KC_P1, KC_P2, KC_P3, KC_PLUS, KC_TRNS, QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU,
     MO(2), KC_PSCR, KC_PAUS, KC_APP, RGB_VAD, RGB_VAI, KC_P0, KC_SLSH, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,
-    TG(1), KC_TRNS, RGB_TOG, KC_SLCK, RGB_RMOD, RGB_MOD, KC_NLCK, KC_TRNS, KC_ASTR, KC_PENT, KC_PENT, MO(1), KC_TRNS, KC_TRNS, TG(1)),
+    TG(1), KC_TRNS, RGB_TOG, KC_SCRL, RGB_RMOD, RGB_MOD, KC_NUM, KC_TRNS, KC_ASTR, KC_PENT, KC_PENT, MO(1), KC_TRNS, KC_TRNS, TG(1)),
   [2] = LAYOUT_ortho_5x15(
     QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/xiudi/xd84pro/keymaps/default/keymap.c b/keyboards/xiudi/xd84pro/keymaps/default/keymap.c
index be5fcd31fe..e13e3ed484 100644
--- a/keyboards/xiudi/xd84pro/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd84pro/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_75_ansi(
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_SLCK,  KC_PAUS,  KC_DEL,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_SCRL,  KC_PAUS,  KC_DEL,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
 	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_HOME,
 /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
diff --git a/keyboards/xiudi/xd84pro/keymaps/via/keymap.c b/keyboards/xiudi/xd84pro/keymaps/via/keymap.c
index 137b0ad9af..a9e9281615 100644
--- a/keyboards/xiudi/xd84pro/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd84pro/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_SLCK,  KC_PAUS,  KC_DEL,
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_SCRL,  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_BSPC,   KC_HOME,
 /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
diff --git a/keyboards/xiudi/xd87/keymaps/default/keymap.c b/keyboards/xiudi/xd87/keymaps/default/keymap.c
index dc8548a921..ed7da85890 100644
--- a/keyboards/xiudi/xd87/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso(
-      KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
       KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,            KC_DEL,  KC_END,  KC_PGDN,
       KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
index 47dd4dfe88..fc8fa313ef 100755
--- a/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
@@ -24,7 +24,7 @@ enum custom_keycodes {
 
 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_SLCK, KC_PAUS,
+      KC_ESC,  KC_F1,  KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,                      KC_PSCR, KC_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,                                       
diff --git a/keyboards/xiudi/xd87/keymaps/via/keymap.c b/keyboards/xiudi/xd87/keymaps/via/keymap.c
index 35d8da4797..c8502c04f2 100644
--- a/keyboards/xiudi/xd87/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 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_SLCK, KC_PAUS,
+      KC_ESC,  KC_F1,  KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,                      KC_PSCR, KC_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,
diff --git a/keyboards/xiudi/xd96/keymaps/default/keymap.c b/keyboards/xiudi/xd96/keymaps/default/keymap.c
index 45588f18c4..3d904759ca 100644
--- a/keyboards/xiudi/xd96/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
     KC_ESC,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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,
 /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────├         ┤ */
diff --git a/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
index cdd1f49679..7c26664b0e 100644
--- a/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
     KC_ESC,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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,
 /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────├─────────├─────────├         ┤ */
diff --git a/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c b/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
index 39ca291a8d..5fb6ed2b59 100644
--- a/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_all(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_CALC, KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
-	  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_NLCK, _______, KC_PMNS, KC_PSLS,
+	  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_NUM,  _______, KC_PMNS, KC_PSLS,
 	  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PAST,
 	  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, _______, LT_ENT2,          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 	  KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_P1,   KC_P2,   KC_P3,   KC_EQL,
diff --git a/keyboards/xiudi/xd96/keymaps/via/keymap.c b/keyboards/xiudi/xd96/keymaps/via/keymap.c
index 092fc9dfea..8fdb8efe21 100644
--- a/keyboards/xiudi/xd96/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/via/keymap.c
@@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
     KC_ESC,   KC_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_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+      KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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,
 /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────├         ┤ */
diff --git a/keyboards/xmmx/keymaps/ansi_wk/keymap.c b/keyboards/xmmx/keymaps/ansi_wk/keymap.c
index 19ea361a15..8069273665 100644
--- a/keyboards/xmmx/keymaps/ansi_wk/keymap.c
+++ b/keyboards/xmmx/keymaps/ansi_wk/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   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_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_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,
diff --git a/keyboards/xmmx/keymaps/ansi_wkl/keymap.c b/keyboards/xmmx/keymaps/ansi_wkl/keymap.c
index 34182ca66d..76d6c98aba 100644
--- a/keyboards/xmmx/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/xmmx/keymaps/ansi_wkl/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_tkl_ansi_wkl(
-    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_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,
diff --git a/keyboards/xmmx/keymaps/default/keymap.c b/keyboards/xmmx/keymaps/default/keymap.c
index 80838ea8fb..94478f6eb4 100644
--- a/keyboards/xmmx/keymaps/default/keymap.c
+++ b/keyboards/xmmx/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   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_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,  KC_INS,KC_HOME, KC_PGUP,
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC, KC_BSLS,           KC_DEL, KC_END, KC_PGDN,
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,         KC_NO,  KC_NO, KC_NO,
diff --git a/keyboards/xmmx/keymaps/iso_wk/keymap.c b/keyboards/xmmx/keymaps/iso_wk/keymap.c
index f48098c219..d153183ec4 100644
--- a/keyboards/xmmx/keymaps/iso_wk/keymap.c
+++ b/keyboards/xmmx/keymaps/iso_wk/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_tkl_iso(
-    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,           KC_INS,KC_HOME, KC_PGUP,
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC,                    KC_DEL, KC_END, KC_PGDN,
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/xmmx/keymaps/iso_wkl/keymap.c b/keyboards/xmmx/keymaps/iso_wkl/keymap.c
index 8a60aea92d..c825657658 100644
--- a/keyboards/xmmx/keymaps/iso_wkl/keymap.c
+++ b/keyboards/xmmx/keymaps/iso_wkl/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_tkl_iso_wkl(
-    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,           KC_INS,KC_HOME, KC_PGUP,
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC,                    KC_DEL, KC_END, KC_PGDN,
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
index af1e92a984..da61d8abf3 100644
--- a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER_LOWER] = LAYOUT(
         MC_ALTT,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
         KY_CSPC,  KY_ZMRST, KY_ZMOUT, KY_ZMIN,  KC_WBAK,  KC_WFWD,                      KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_TILD,
-        _______,  KC_APP,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_LGUI,                      KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
+        _______,  KC_APP,   KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_LGUI,                      KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
     /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/cf9e899867763dc45b65917ce4cf93ff */
diff --git a/keyboards/ydkb/chili/keymaps/default/keymap.c b/keyboards/ydkb/chili/keymaps/default/keymap.c
index 32ac9a066d..7097b371fb 100644
--- a/keyboards/ydkb/chili/keymaps/default/keymap.c
+++ b/keyboards/ydkb/chili/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ enum {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,              KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_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_NO,              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_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_NO, KC_RSFT,                     KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ydkb/chili/keymaps/via/keymap.c b/keyboards/ydkb/chili/keymaps/via/keymap.c
index 9d5cdd303f..d1337fbec3 100644
--- a/keyboards/ydkb/chili/keymaps/via/keymap.c
+++ b/keyboards/ydkb/chili/keymaps/via/keymap.c
@@ -27,8 +27,8 @@ enum {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_all(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,              KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_ESC,           KC_F1,   KC_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_NO,              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_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_NO, KC_RSFT,                     KC_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ydkb/grape/keymaps/default/keymap.c b/keyboards/ydkb/grape/keymaps/default/keymap.c
index 2704820ad9..62a9e55433 100644
--- a/keyboards/ydkb/grape/keymaps/default/keymap.c
+++ b/keyboards/ydkb/grape/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 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_INS,  KC_HOME, KC_PGUP, KC_PSCR,          KC_PAUS,              KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-                          KC_F7,   KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,                                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_ESC,           KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,          KC_PAUS,              KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+                          KC_F7,   KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,                                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
                                                                                                                                               KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_GRV,  KC_1,    KC_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_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,              KC_P0,   KC_P0,   KC_PDOT, KC_PENT,
diff --git a/keyboards/ydkb/grape/keymaps/via/keymap.c b/keyboards/ydkb/grape/keymaps/via/keymap.c
index f01f63bcad..b53f10232a 100644
--- a/keyboards/ydkb/grape/keymaps/via/keymap.c
+++ b/keyboards/ydkb/grape/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 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_INS,  KC_HOME, KC_PGUP, KC_PSCR,          KC_PAUS,              KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-                          KC_F7,   KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,  KC_END,  KC_PGDN, KC_SLCK,                                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_ESC,           KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,          KC_PAUS,              KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+                          KC_F7,   KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,                                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
                                                                                                                                               KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_GRV,  KC_1,    KC_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_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,              KC_P0,   KC_P0,   KC_PDOT, KC_PENT,
diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
index ce13f31c9c..aedbeee630 100644
--- a/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
+++ b/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,                                    KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
index 42e8f1f7c3..363bee633b 100644
--- a/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
+++ b/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                                             KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,                                     KC_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_BSPC,
diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
index 990e93f7ab..bca0c57e7c 100644
--- a/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
+++ b/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,                                    KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/ymdk/bface/keymaps/default/keymap.c b/keyboards/ymdk/bface/keymaps/default/keymap.c
index 9d2a2c9a0e..e17eb79116 100644
--- a/keyboards/ymdk/bface/keymaps/default/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //FN Layer
     [_FL] = LAYOUT_60_ansi(
         KC_GRV,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PGUP,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PGUP,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGDN, KC_END,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS, BL_DEC,BL_TOGG, BL_INC,KC_MPLY,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
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //CAPS LOCK layer
     [_CL] = LAYOUT_60_ansi(
         KC_GRV,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,  KC_UP,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,  KC_UP,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RIGHT,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
diff --git a/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c b/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
index 86cacfce50..3ba35bb3ba 100644
--- a/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //FN Layer
     [_FL] = LAYOUT_60_ansi_split_rshift(
         KC_GRV,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MRWD,KC_MFFD,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,        KC_TRNS,KC_PGUP,
         KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,        KC_PGDN
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //CAPS LOCK Layer
     [_CL] = LAYOUT_60_ansi_split_rshift(
         KC_GRV,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_HOME,
         KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,         KC_END
diff --git a/keyboards/ymdk/bface/keymaps/minila/keymap.c b/keyboards/ymdk/bface/keymaps/minila/keymap.c
index 5505dfcff7..91bcbad6a2 100644
--- a/keyboards/ymdk/bface/keymaps/minila/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/minila/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //FN Layer
     [_FL] = LAYOUT_all(
 		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, 
-		_______, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, NK_TOGG, KC_PSCR, KC_SLCK, KC_PAUS, _______, BL_STEP, BL_TOGG, 
+		_______, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, NK_TOGG, KC_PSCR, KC_SCRL, KC_PAUS, _______, BL_STEP, BL_TOGG, 
 		_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_INS, KC_HOME, KC_PGUP, KC_BSPC, _______, _______, _______, 
 		_______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, 
 		_______, _______, _______, _______, KC_ENT, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
index d11be1679b..4786b7c125 100644
--- a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/melody96/keymaps/default/keymap.c b/keyboards/ymdk/melody96/keymaps/default/keymap.c
index 959b2cf5a6..5149a6fb00 100644
--- a/keyboards/ymdk/melody96/keymaps/default/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
index 96e892af13..55cbcf333a 100644
--- a/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
@@ -7,7 +7,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_96_with60_split_num0(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_P4,   KC_P5,   KC_P6,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
index 9a6994ae72..ff19e2c393 100644
--- a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
index cc6cbd90c2..473f89704c 100644
--- a/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [L_BASE] = LAYOUT(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_INS,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   XXXXXXX,
         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_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, RAL_RGU, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSF_RCT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
      */
     [L_FN] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, SYSRQ,   KC_SLCK, KC_PAUS, BREAK,   TOP,     BOTTOM,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, SYSRQ,   KC_SCRL, KC_PAUS, BREAK,   TOP,     BOTTOM,
         _______, 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, DIVIDE,  TIMES,   MINUS,
         KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, RGB_SET,
diff --git a/keyboards/ymdk/melody96/keymaps/via/keymap.c b/keyboards/ymdk/melody96/keymaps/via/keymap.c
index b448c62426..b31473f1a7 100644
--- a/keyboards/ymdk/melody96/keymaps/via/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/np21/keymaps/default/keymap.c b/keyboards/ymdk/np21/keymaps/default/keymap.c
index e15fb1d6eb..926bd22d84 100644
--- a/keyboards/ymdk/np21/keymaps/default/keymap.c
+++ b/keyboards/ymdk/np21/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NP] = LAYOUT_ortho_6x4(
         KC_ESC,  KC_TAB,  KC_BSPC, MO(_BL),
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/np21/keymaps/via/keymap.c b/keyboards/ymdk/np21/keymaps/via/keymap.c
index b361414023..207d6ad83e 100644
--- a/keyboards/ymdk/np21/keymaps/via/keymap.c
+++ b/keyboards/ymdk/np21/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ortho_6x4(
         KC_ESC,  KC_TAB,  KC_BSPC, MO(1),
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c b/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c
index 48ec3599d7..90168720ad 100644
--- a/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c
+++ b/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [L_NUM] = LAYOUT_ortho_6x4(
         KC_ESC,  KC_CALC, MO(L_BL),MO(L_RGB),
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
index 0f2ed23bb2..784f7cd317 100644
--- a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[1] = LAYOUT_all(
         QK_BOOT, KC_F1,   KC_F2,     KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, KC_DEL,
-        _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_PSCR, KC_SLCK, KC_PAUS,  KC_GRV,
+        _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_PSCR, KC_SCRL, KC_PAUS,  KC_GRV,
         _______, BL_TOGG, BL_DEC,   BL_INC, BL_BRTG, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, MO(2),   _______, KC_PGUP, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______,  KC_END, KC_PGDN, KC_HOME
diff --git a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
index ede3573384..7afe4ed067 100644
--- a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, QK_BOOT,
+        KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, QK_BOOT,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
         _______, KC_NO,	  _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c b/keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c
index d19d342f14..fb02df370a 100644
--- a/keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c
+++ b/keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_ortho_6x4(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,   KC_SPC,
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
index 2b3e2e2c7c..e970c1b695 100644
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	/* Layer 1, raise layer */ 
 	[_RAISE] = LAYOUT_iso(
-		_______,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,   KC_F24,  _______, KC_PAUS, KC_SLCK, _______, _______, _______,  \
+		_______,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,   KC_F24,  _______, KC_PAUS, KC_SCRL, _______, _______, _______,  \
 		_______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, BL_OFF,  BL_ON,   BL_DEC,   BL_INC,       _______,     _______, _______, _______, _______,  \
 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,  RGB_VAI,      KC_MUTE,     _______, KC_VOLU, _______, _______,  \
 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,  BL_TOGG,                   KC_MPRV, KC_MPLY, KC_MNXT, _______,  \
diff --git a/keyboards/ymdk/ymd96/keymaps/default/keymap.c b/keyboards/ymdk/ymd96/keymaps/default/keymap.c
index 0b8b98157d..e5dfe7e137 100644
--- a/keyboards/ymdk/ymd96/keymaps/default/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_DEFAULT] = LAYOUT_default(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_INS,  KC_DEL,  KC_PGUP,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, 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_PGDN,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                            KC_RSFT, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/ymdk/ymd96/keymaps/epx/keymap.c b/keyboards/ymdk/ymd96/keymaps/epx/keymap.c
index cb353a08b7..8d3f571825 100644
--- a/keyboards/ymdk/ymd96/keymaps/epx/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/epx/keymap.c
@@ -76,8 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *  |       |       |       |                                             | Win Menu  |      |        |      |             |      |       |
    */ 
   [_RAISE] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_PAUS,  KC_SLCK, KC_MUTE, KC_MSTP, KC_DEL, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            KC_NLCK, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_PAUS,  KC_SCRL, KC_MUTE, KC_MSTP, KC_DEL, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            KC_NUM,  _______, _______, _______, \
     _______, RGB_TOG, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, \
     KC_CAPS, RGB_MOD, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______,  _______, _______,                   _______, _______, _______, _______, \
     _______, RGB_RMOD,RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______,                             _______, _______, _______, _______, \
diff --git a/keyboards/yosino58/keymaps/default/keymap.c b/keyboards/yosino58/keymaps/default/keymap.c
index 0ea1ce0ddc..fbe5d6343c 100644
--- a/keyboards/yosino58/keymaps/default/keymap.c
+++ b/keyboards/yosino58/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_PSLS, KC_PMNS, KC_P7, KC_P8,   KC_P9,                                        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_F12,
   _______, KC_PAST, KC_PPLS, KC_P4, KC_P5,   KC_P6,                                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
   _______, KC_PDOT, KC_P0,   KC_P1, KC_P2,   KC_P3,   _______,  _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-                                    _______, KC_LGUI, _______,                    XXXXXXX, KC_CAPS, KC_NLCK
+                                    _______, KC_LGUI, _______,                    XXXXXXX, KC_CAPS, KC_NUM
 
   ),
 
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  [_ADJUST] = LAYOUT(
   QK_BOOT,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     KC_MUTE, KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS,                                     KC_MPRV, KC_VOLD, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS,                                     KC_MPRV, KC_VOLD, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP,                                     XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
   XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, RGBRST,  RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
                                       XXXXXXX, _______, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/yosino58/keymaps/sakura/keymap.c b/keyboards/yosino58/keymaps/sakura/keymap.c
index f0b0666a8a..f0dbc75740 100644
--- a/keyboards/yosino58/keymaps/sakura/keymap.c
+++ b/keyboards/yosino58/keymaps/sakura/keymap.c
@@ -60,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  [_LOWER] = LAYOUT( \
   KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, \
-  _______, KC_PSLS, KC_PMNS, KC_P7, KC_P8,   KC_P9,                                       KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, KC_UP,   XXXXXXX, \
+  _______, KC_PSLS, KC_PMNS, KC_P7, KC_P8,   KC_P9,                                       KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, KC_UP,   XXXXXXX, \
   _______, KC_PAST, KC_PPLS, KC_P4, KC_P5,   KC_P6,                                       KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, KC_DOWN, KC_RGHT, \
-  _______, KC_PDOT, KC_P0,   KC_P1, KC_P2,   KC_P3,   KC_F11,  _______, _______, KC_F12,  KC_DEL,  KC_END,  KC_PGDN, KC_LEFT, KC_NLCK, KC_CAPS, \
+  _______, KC_PDOT, KC_P0,   KC_P1, KC_P2,   KC_P3,   KC_F11,  _______, _______, KC_F12,  KC_DEL,  KC_END,  KC_PGDN, KC_LEFT, KC_NUM,  KC_CAPS, \
                                     _______, _______, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX\
   ),
 
diff --git a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c b/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
index 4b9646f9ea..a92c877814 100644
--- a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
+++ b/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------------------------------------------------------------------------------------------------'
      */
     [_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_SLCK, 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_NLCK, KC_PSLS, KC_PAST, KC_PEQL,
+      KC_ESC,           KC_F1,   KC_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,
diff --git a/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c b/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c
index d8615cb6e5..2759790e4f 100644
--- a/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c
+++ b/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------------------------------------------------------------------------------------------------'
      */
     [_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_SLCK, KC_PAUS,
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
       KC_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,
diff --git a/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c b/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
index ee3de82e3b..b245c4f7f4 100644
--- a/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
+++ b/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------------------------------------------------------------------------------------------------'
      */
     [_L0] = 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_SLCK, KC_PAUS,
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
       KC_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,
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
index 80580da9f1..e7a2dba62b 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] =LAYOUT (
-    KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_MUTE,
+    KC_PSCR,   KC_SCRL,   KC_PAUS,   KC_MUTE,
     KC_INS,    KC_HOME,   KC_PGUP,   KC_ESC,    KC_PSLS,    KC_PAST,   KC_PMNS,
     KC_DEL,    KC_END,    KC_PGDN,   KC_P7,     KC_P8,      KC_P9,     KC_PPLS,
                                      KC_P4,     KC_P5,      KC_P6,     KC_PPLS,
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN1] =LAYOUT (
     QK_BOOT,     EEP_RST,   KC_NO,     KC_NO,
-    KC_NO,     KC_NO,     KC_NO,     KC_NLCK,   KC_QUOT,   KC_PEQL,    KC_NO,
-    KC_CAPS,   KC_NLCK,   KC_SLCK,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
+    KC_NO,     KC_NO,     KC_NO,     KC_NUM,    KC_QUOT,   KC_PEQL,    KC_NO,
+    KC_CAPS,   KC_NUM,    KC_SCRL,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
                                      KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),
     KC_TRNS,   S(KC_ENT), KC_TRNS,   KC_BSPC,   KC_DOWN,   KC_DEL,     KC_TRNS,
     KC_BTN1,   KC_ENT,    S(KC_SPC),LT(2,KC_SPC),KC_SPC,   KC_COMM,    KC_TRNS
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
index 698d3ce950..ffcaa99395 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
@@ -3,7 +3,7 @@
 ### Base layer
 ```
    ,-------------------------------. ,-------.
-   | KC_PSCR  | KC_SLCK  | KC_PAUS | |KC_MUTE|
+   | KC_PSCR  | KC_SCRL  | KC_PAUS | |KC_MUTE|
    |----------+----------+----------+-------------------------------------------------.
    | KC_INS   | KC_HOME  | KC_PGUP  | KC_ESC   | KC_PSLS   | KC_PAST  | KC_PMNS       |
    |----------+----------+----------+----------+-----------+----------+---------------|
@@ -21,9 +21,9 @@
    ,-------------------------------. ,-------.
    | QK_BOOT    | EEP_RST  | KC_NO   | | KC_NO |
    |----------+----------+----------+-------------------------------------------------.
-   | KC_NO    | KC_NO    | KC_NO    | KC_NLCK  | KC_QUOT   | KC_PEQL  | KC_NO         |
+   | KC_NO    | KC_NO    | KC_NO    | KC_NUM   | KC_QUOT   | KC_PEQL  | KC_NO         |
    |----------+----------+----------+----------+-----------+----------+---------------|
-   | KC_CAPS  | KC_NLCK  | KC_SLCK  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |
+   | KC_CAPS  | KC_NUM   | KC_SCRL  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |
    `--------------------------------+----------+-----------+----------+---------------|
                                     | KC_LEFT  | KC_BTN3   | KC_RGHT  | S(KC_SPC)     |
    ,--------------------------------+----------+-----------+----------+---------------|
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
index 63a116662d..7d55038ac8 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] =LAYOUT (
-    KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_MUTE,
+    KC_PSCR,   KC_SCRL,   KC_PAUS,   KC_MUTE,
     KC_INS,    KC_HOME,   KC_PGUP,   KC_ESC,    KC_PSLS,    KC_PAST,   KC_PMNS,
     KC_DEL,    KC_END,    KC_PGDN,   KC_P7,     KC_P8,      KC_P9,     KC_PPLS,
                                      KC_P4,     KC_P5,      KC_P6,     KC_PPLS,
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN1] =LAYOUT (
     QK_BOOT,     EEP_RST,   KC_NO,     KC_NO,
-    KC_NO,     KC_NO,     KC_NO,     KC_NLCK,   KC_QUOT,   KC_PEQL,    KC_NO,
-    KC_CAPS,   KC_NLCK,   KC_SLCK,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
+    KC_NO,     KC_NO,     KC_NO,     KC_NUM,    KC_QUOT,   KC_PEQL,    KC_NO,
+    KC_CAPS,   KC_NUM,    KC_SCRL,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
                                      KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),
     KC_TRNS,   S(KC_ENT), KC_TRNS,   KC_BSPC,   KC_DOWN,   KC_DEL,     KC_TRNS,
     KC_BTN1,   KC_ENT,    S(KC_SPC),LT(2,KC_SPC),KC_SPC,   KC_COMM,    KC_TRNS
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/readme.md b/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
index c4758d0e4d..98d5984fda 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
@@ -3,7 +3,7 @@
 ### Base layer
 ```
    ,-------------------------------. ,-------.
-   | KC_PSCR  | KC_SLCK  | KC_PAUS | |KC_MUTE|
+   | KC_PSCR  | KC_SCRL  | KC_PAUS | |KC_MUTE|
    |----------+----------+----------+-------------------------------------------------.
    | KC_INS   | KC_HOME  | KC_PGUP  | KC_ESC   | KC_PSLS   | KC_PAST  | KC_PMNS       |
    |----------+----------+----------+----------+-----------+----------+---------------|
@@ -21,9 +21,9 @@
    ,-------------------------------. ,-------.
    | QK_BOOT    | EEP_RST  | KC_NO   | | KC_NO |
    |----------+----------+----------+-------------------------------------------------.
-   | KC_NO    | KC_NO    | KC_NO    | KC_NLCK  | KC_QUOT   | KC_PEQL  | KC_NO         |
+   | KC_NO    | KC_NO    | KC_NO    | KC_NUM   | KC_QUOT   | KC_PEQL  | KC_NO         |
    |----------+----------+----------+----------+-----------+----------+---------------|
-   | KC_CAPS  | KC_NLCK  | KC_SLCK  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |
+   | KC_CAPS  | KC_NUM   | KC_SCRL  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |
    `--------------------------------+----------+-----------+----------+---------------|
                                     | KC_LEFT  | KC_BTN3   | KC_RGHT  | S(KC_SPC)     |
    ,--------------------------------+----------+-----------+----------+---------------|
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
index 09ad518e94..cd09ebd994 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] =LAYOUT (
-    KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_MUTE,
+    KC_PSCR,   KC_SCRL,   KC_PAUS,   KC_MUTE,
     KC_INS,    KC_HOME,   KC_PGUP,   KC_ESC,    KC_PSLS,    KC_PAST,   KC_PMNS,                     KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_DEL,
     KC_DEL,    KC_END,    KC_PGDN,   KC_P7,     KC_P8,      KC_P9,     KC_PPLS,                     KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_BSPC,
                                      KC_P4,     KC_P5,      KC_P6,     KC_PPLS,                     KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT,
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN1] =LAYOUT (
     QK_BOOT,     EEP_RST,   KC_NO,     KC_NO,
-    KC_NO,     KC_NO,     KC_NO,     KC_NLCK,   KC_QUOT,   KC_PEQL,    KC_NO,                       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_DEL,
-    KC_CAPS,   KC_NLCK,   KC_SLCK,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),                   KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_BSPC,
+    KC_NO,     KC_NO,     KC_NO,     KC_NUM,    KC_QUOT,   KC_PEQL,    KC_NO,                       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_DEL,
+    KC_CAPS,   KC_NUM,    KC_SCRL,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),                   KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_BSPC,
                                      KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),                   KC_A,       KC_S,       KC_D,       KC_F,       KC_G,       KC_QUOT,
     KC_TRNS,   S(KC_ENT), KC_TRNS,   KC_BSPC,   KC_DOWN,   KC_DEL,     KC_TRNS,       KC_RBRC,      KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,       KC_ENT,
     KC_BTN1,   KC_ENT,    S(KC_SPC),LT(2,KC_SPC),KC_SPC,   KC_COMM,    KC_TRNS,       KC_TRNS,      KC_TRNS,    KC_NO,      KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
index f06bb2d9e3..b8f3784d29 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
@@ -3,7 +3,7 @@
 ### Base layer
 ```
    ,-------------------------------. ,-------.
-   | KC_PSCR  | KC_SLCK  | KC_PAUS | |KC_MUTE|
+   | KC_PSCR  | KC_SCRL  | KC_PAUS | |KC_MUTE|
    |----------+----------+----------+-------------------------------------------------.                ,-----------------------------------------------------------------------.
    | KC_INS   | KC_HOME  | KC_PGUP  | KC_ESC   | KC_PSLS   | KC_PAST  | KC_PMNS       |                | KC_6       | KC_7     | KC_8      | KC_9      | KC_0      | KC_DEL    |
    |----------+----------+----------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
@@ -21,9 +21,9 @@
    ,-------------------------------. ,-------.
    | QK_BOOT    | EEP_RST  | KC_NO   | | KC_NO |
    |----------+----------+----------+-------------------------------------------------.                ,-----------------------------------------------------------------------.
-   | KC_NO    | KC_NO    | KC_NO    | KC_NLCK  | KC_QUOT   | KC_PEQL  | KC_NO         |                | KC_1       | KC_2     | KC_3      | KC_4      | KC_5      | KC_DEL    |
+   | KC_NO    | KC_NO    | KC_NO    | KC_NUM   | KC_QUOT   | KC_PEQL  | KC_NO         |                | KC_1       | KC_2     | KC_3      | KC_4      | KC_5      | KC_DEL    |
    `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
-   | KC_CAPS  | KC_NLCK  | KC_SLCK  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |                | KC_Q       | KC_W     | KC_E      | KC_R      | KC_T      | KC_BSPC   |
+   | KC_CAPS  | KC_NUM   | KC_SCRL  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |                | KC_Q       | KC_W     | KC_E      | KC_R      | KC_T      | KC_BSPC   |
    `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
                                     | KC_LEFT  | KC_BTN3   | KC_RGHT  | S(KC_SPC)     |                | KC_A       | KC_S     | KC_D      | KC_F      | KC_G      | KC_QUOT   |
    ,--------------------------------+----------+-----------+----------+---------------|  ,-------------+------------+----------+-----------+-----------+-----------+-----------|
diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
index 07a28ce7c6..98f40d6b8a 100644
--- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
         [_FN] = LAYOUT(
         KC_ESC, KC_LANG,KC_NO,  RGB_TOG,KC_MNXT,KC_VOLU,
-        KC_CAPS,KC_NLCK,KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
+        KC_CAPS,KC_NUM, KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
         CG_NORM,LCG_SWP,EEP_RST,QK_BOOT,  TO(0),  KC_MUTE
     )
 };
diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
index 07a28ce7c6..98f40d6b8a 100644
--- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
         [_FN] = LAYOUT(
         KC_ESC, KC_LANG,KC_NO,  RGB_TOG,KC_MNXT,KC_VOLU,
-        KC_CAPS,KC_NLCK,KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
+        KC_CAPS,KC_NUM, KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
         CG_NORM,LCG_SWP,EEP_RST,QK_BOOT,  TO(0),  KC_MUTE
     )
 };
diff --git a/keyboards/zj68/keymaps/splitbs/keymap.c b/keyboards/zj68/keymaps/splitbs/keymap.c
index 260025b449..24c8b35dcb 100644
--- a/keyboards/zj68/keymaps/splitbs/keymap.c
+++ b/keyboards/zj68/keymaps/splitbs/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MO(1),   KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     LAYOUT_65_ansi_split_bs(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
diff --git a/layouts/community/60_ansi/xyverz/keymap.c b/layouts/community/60_ansi/xyverz/keymap.c
index 61176ef2b6..c975c8b24d 100644
--- a/layouts/community/60_ansi/xyverz/keymap.c
+++ b/layouts/community/60_ansi/xyverz/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Layer 3: Functions */
   [_FL] = LAYOUT_60_ansi(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL ,
-    _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
     KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END,  _______, _______, _______, _______,                   _______,
     QWERTY,  DVORAK,  COLEMAK,                   _______,                                     _______, _______, _______, _______
diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
index 07cc46ac77..3368e01b72 100644
--- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
+++ b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
@@ -65,8 +65,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     _______, KC_EJCT,
         _______,          _______, _______, KC_END,  RGB_TOG, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______,    _______, KC_MUTE,
-        _______,          _______, KC_SLCK, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______,    KC_PAUS,
-        KC_VOLU,          _______, _______, KC_CALC, _______, BL_TOGG, KC_NLCK, KC_MAIL, _______, _______,          MO(_RESET), KC_PGUP, KC_MSTP,
+        _______,          _______, KC_SCRL, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______,    KC_PAUS,
+        KC_VOLU,          _______, _______, KC_CALC, _______, BL_TOGG, KC_NUM,  KC_MAIL, _______, _______,          MO(_RESET), KC_PGUP, KC_MSTP,
         KC_VOLD, KC_MRWD,          KC_MFFD,                   KC_MPLY,                                     _______, KC_MPRV,    KC_PGDN, KC_MNXT
     ),
     /*
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
index acf16f41d9..adc7158186 100644
--- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 1 layer: http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915 */
     [LAYER_FUNCTION_1] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
         _______,  KC_APP,   _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,  _______,  _______
diff --git a/layouts/community/60_hhkb/yanfali/keymap.c b/layouts/community/60_hhkb/yanfali/keymap.c
index 7e56d5b5ac..8dd74edb7e 100644
--- a/layouts/community/60_hhkb/yanfali/keymap.c
+++ b/layouts/community/60_hhkb/yanfali/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 [FN]= LAYOUT_60_hhkb(
        KC_PWR,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, \
-       _______,  RGB_TOG, KC_UP,   RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,   KC_UP, KC_TRNS, QK_BOOT,  \
+       _______,  RGB_TOG, KC_UP,   RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,   KC_UP, KC_TRNS, QK_BOOT,  \
        KC_CAPS,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,       KC_PENT,       \
        KC_TRNS,  RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,  KC_MUTE, KC_VOLD, KC_VOLU,       KC_TRNS, KC_TRNS, \
                  KC_TRNS, KC_TRNS,                   KC_TRNS,                         KC_TRNS, KC_TRNS ),
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
index ae35f947e8..03fdd181f5 100644
--- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 1 layer: http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551 */
     [LAYER_FUNCTION_1] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
         _______,  KC_APP,   _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,            _______
diff --git a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
index d6c0d9ec30..9dcb34ea39 100644
--- a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FUNCTION] = LAYOUT_60_tsangan_hhkb(
         XXXXXXX,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   XXXXXXX, XXXXXXX,
-        XXXXXXX,  XXXXXXX,  KC_MPLY,  KC_MPRV,  KC_MNXT,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_UP,    KC_END,   KC_PSCR,  KC_SLCK,  KC_PAUS,  XXXXXXX,
+        XXXXXXX,  XXXXXXX,  KC_MPLY,  KC_MPRV,  KC_MNXT,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_UP,    KC_END,   KC_PSCR,  KC_SCRL,  KC_PAUS,  XXXXXXX,
         _______,            XXXXXXX,  KC_MUTE,  KC_VOLD,  KC_VOLU,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_DEL,   KC_INS,   _______,
         _______,            KC_UNDO,  KC_CUT,   KC_COPY,  KC_PSTE,  KC_AGIN,  XXXXXXX,  XXXXXXX,  KC_WBAK,  KC_WFWD,  KC_WREF,  _______,  KC_WHOM,
         _______,  _______,  _______,                                          _______,                                          _______,  KC_APP,  _______
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index 20dd00564d..dde2425dda 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // FN
     [_FN] = LAYOUT_65_ansi_blocker(
-        KC_GRV,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_INS,     KC_SLCK,
+        KC_GRV,     KC_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_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
         MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            KC_CPNL,    KC_BRID,
         _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    XXXXXXX,    XXXXXXX,    DEBUG,                              _______,    KC_VOLU,    KC_MUTE,
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
index 37111c9508..aed21859e0 100644
--- a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
     [LAYER_FUNCTION_1] = LAYOUT_65_ansi_blocker_split_bs(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   _______,
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            _______,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
         _______,  _______,  _______,                      _______,                                _______,  _______,                      _______,  _______,  _______
diff --git a/layouts/community/66_ansi/xyverz/keymap.c b/layouts/community/66_ansi/xyverz/keymap.c
index 3f9594f78a..1b95c9ab17 100644
--- a/layouts/community/66_ansi/xyverz/keymap.c
+++ b/layouts/community/66_ansi/xyverz/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_66_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,                    BL_STEP, \
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,                   _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,                   _______, \
   _______, _______, MO(_CL), _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,                                     \
   _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,          KC_PGUP,                            \
   _______, _______, _______,                   _______,                            _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index e728d13bc8..a4d307536c 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // FN
     [_FN] = LAYOUT_75_ansi(
         QK_BOOT,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
-        EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SLCK,
+        EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
         _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DEBUG,      _______,                            KC_VOLU,    KC_MUTE,
diff --git a/layouts/community/ergodox/choromanski/keymap.c b/layouts/community/ergodox/choromanski/keymap.c
index 8cd3f34dab..a84935d392 100644
--- a/layouts/community/ergodox/choromanski/keymap.c
+++ b/layouts/community/ergodox/choromanski/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 																			KC_MUTE,
 													KC_TRNS,	KC_TRNS,	KC_MYCM,
 
-	QK_BOOT,		KC_SLCK,	KC_NLCK,	KC_SLSH,	KC_ASTR,	KC_MINS,	KC_TRNS,
+	QK_BOOT,	KC_SCRL,	KC_NUM,		KC_SLSH,	KC_ASTR,	KC_MINS,	KC_TRNS,
 	KC_TRNS,	KC_TRNS,	KC_7,		KC_8,		KC_9,		KC_PLUS,	KC_ACL2,
 				KC_TRNS,	KC_4,		KC_5,		KC_6,		KC_PLUS,	KC_ACL1,
 	KC_TRNS,	KC_TRNS,	KC_1,		KC_2,		KC_3,		KC_ENT,		KC_ACL0,
diff --git a/layouts/community/ergodox/colemak_code_friendly/keymap.c b/layouts/community/ergodox/colemak_code_friendly/keymap.c
index 6350bd9ee2..1d537b331f 100644
--- a/layouts/community/ergodox/colemak_code_friendly/keymap.c
+++ b/layouts/community/ergodox/colemak_code_friendly/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   KC_H,          KC_N,          KC_E,     KC_I,            KC_O,             KC_QUOT,
   KC_RCBR,        RALT_T(KC_K),  KC_M,          KC_COMM,  LGUI_T(KC_DOT),  RCTL_T(KC_SLSH),  KC_RSFT,
                                  KC_LEFT,       KC_DOWN,  KC_UP,           KC_RGHT,          KC_DEL,
-  KC_INS,  KC_SLCK,
+  KC_INS,  KC_SCRL,
   KC_PGUP,
   KC_PGDN, KC_SPC, MO(LAYER_RNUM)
 ),
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   S(KC_H),       S(KC_N),       S(KC_E),    S(KC_I),    S(KC_O),     S(KC_QUOT),
   KC_RCBR,        S(KC_K),       S(KC_M),       S(KC_COMM), S(KC_DOT),  S(KC_SLSH),  KC_RSFT,
                                  S(KC_LEFT),    S(KC_DOWN), S(KC_UP),   S(KC_RGHT),  S(KC_DEL),
-  S(KC_INS),  S(KC_SLCK),
+  S(KC_INS),  S(KC_SCRL),
   S(KC_PGUP),
   S(KC_PGDN), S(KC_SPC), KC_CAPS
 ),
diff --git a/layouts/community/ergodox/colemak_programmer/keymap.c b/layouts/community/ergodox/colemak_programmer/keymap.c
index 70a3521782..2f053f9b7a 100644
--- a/layouts/community/ergodox/colemak_programmer/keymap.c
+++ b/layouts/community/ergodox/colemak_programmer/keymap.c
@@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 [4] = LAYOUT_ergodox(
-       QK_BOOT,        KC_LSFT,    KC_LSFT,    KC_SYRQ,    KC_PSCR,    KC_SLCK,    KC_PAUSE,
+       QK_BOOT,        KC_LSFT,    KC_LSFT,    KC_SYRQ,    KC_PSCR,    KC_SCRL,    KC_PAUSE,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_HYPR,
@@ -213,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,        KC_TRNS,    KC_TRNS,
 
        // right hand
-       KC_NLCK,        KC_CALC,    KC_PEQL,    KC_PSLS,    KC_PAST,    KC_LSFT,    KC_TRNS,
+       KC_NUM,         KC_CALC,    KC_PEQL,    KC_PSLS,    KC_PAST,    KC_LSFT,    KC_TRNS,
        KC_TRNS,        KC_VOLU,    KC_P7,      KC_P8,      KC_P9,      KC_PMNS,    KC_TRNS,
                        KC_VOLD,    KC_P4,      KC_P5,      KC_P6,      KC_PPLS,    KC_TRNS,
        KC_HYPR,        KC_MUTE,    KC_P1,      KC_P2,      KC_P3,      KC_PENT,    KC_TRNS,
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 1f07d1b6c7..c9c63168f6 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_GRV,  _________________RAISE_L1__________________, _______,                 _______, _________________RAISE_R1__________________, KC_BSLS,
              _______, _________________RAISE_L2__________________,                                   _________________RAISE_R2__________________, KC_QUOT,
              _______, _________________RAISE_L3__________________, _______,                 _______, _________________RAISE_R3__________________, KC_PSCR,
-             _______, _______, _______, _______, _______,                                                     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_SLCK,
+             _______, _______, _______, _______, _______,                                                     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_SCRL,
                                                           _______, _______,                 _______, _______,
                                                                    _______,                 _______,
                                                  _______, _______, _______,                 _______, _______, _______
diff --git a/layouts/community/ergodox/guni/keymap.c b/layouts/community/ergodox/guni/keymap.c
index d39599a1b1..570a45b127 100644
--- a/layouts/community/ergodox/guni/keymap.c
+++ b/layouts/community/ergodox/guni/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                            KC_TRNS,
                                  KC_TRNS,KC_TRNS,KC_TRNS,
         // right hand
-             KC_TRNS,KC_NLCK,KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
+             KC_TRNS,KC_NUM, KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
              KC_TRNS,KC_NO,  KC_P7,  KC_P8,  KC_P9,  KC_PMNS,KC_BSPC,
                   KC_NO,  KC_P4,  KC_P5,  KC_P6,  KC_PPLS,KC_PENT,
              KC_TRNS,KC_NO,  KC_P1,  KC_P2,  KC_P3,  KC_PPLS,KC_PENT,
diff --git a/layouts/community/ergodox/guni/readme.txt b/layouts/community/ergodox/guni/readme.txt
index 679a08e31d..b39018feb4 100644
--- a/layouts/community/ergodox/guni/readme.txt
+++ b/layouts/community/ergodox/guni/readme.txt
@@ -118,7 +118,7 @@ echo 'xkbcomp $HOME/.xkbmap $DISPLAY' >> ~/.xinitrc
                                            KC_TRNS,
                                  KC_TRNS,KC_TRNS,KC_TRNS,
         // right hand
-             KC_TRNS,KC_NLCK,KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
+             KC_TRNS,KC_NUM, KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
              KC_TRNS,KC_NO,  KC_P7,  KC_P8,  KC_P9,  KC_PMNS,KC_BSPC,
                   KC_NO,  KC_P4,  KC_P5,  KC_P6,  KC_PPLS,KC_PENT,
              KC_TRNS,KC_NO,  KC_P1,  KC_P2,  KC_P3,  KC_PPLS,KC_PENT,
diff --git a/layouts/community/ergodox/kastyle/keymap.c b/layouts/community/ergodox/kastyle/keymap.c
index 268080c7dc..20f08cb44c 100644
--- a/layouts/community/ergodox/kastyle/keymap.c
+++ b/layouts/community/ergodox/kastyle/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = LAYOUT_ergodox(
        // left hand
        KC_PSCR, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
-       KC_SLCK, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
+       KC_SCRL, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
        KC_PAUS, 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,
diff --git a/layouts/community/ergodox/kines-ish/keymap.c b/layouts/community/ergodox/kines-ish/keymap.c
index 718bf6cee1..132b65845e 100644
--- a/layouts/community/ergodox/kines-ish/keymap.c
+++ b/layouts/community/ergodox/kines-ish/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = LAYOUT_ergodox(
        // left hand
        KC_PSCR,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_SLCK,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
+       KC_SCRL,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
        KC_PAUS,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,
diff --git a/layouts/community/ergodox/mpiechotka/keymap.c b/layouts/community/ergodox/mpiechotka/keymap.c
index a83725519b..b13ff0796b 100644
--- a/layouts/community/ergodox/mpiechotka/keymap.c
+++ b/layouts/community/ergodox/mpiechotka/keymap.c
@@ -203,7 +203,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case KC_PC1:
             if (record->event.pressed) {
-                tap_code_delay(KC_SLCK, 50);
+                tap_code_delay(KC_SCRL, 50);
                 wait_ms(50);
                 tap_code_delay(KC_1, 50);
                 tap_code(KC_ENT);
@@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case KC_PC2:
             if (record->event.pressed) {
-                tap_code_delay(KC_SLCK, 50);
+                tap_code_delay(KC_SCRL, 50);
                 wait_ms(50);
                 tap_code_delay(KC_2, 50);
                 tap_code(KC_ENT);
@@ -219,7 +219,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case KC_PC3:
             if (record->event.pressed) {
-                tap_code_delay(KC_SLCK, 50);
+                tap_code_delay(KC_SCRL, 50);
                 wait_ms(50);
                 tap_code_delay(KC_3, 50);
                 tap_code(KC_ENT);
@@ -227,7 +227,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case KC_PC4:
             if (record->event.pressed) {
-                tap_code_delay(KC_SLCK, 50);
+                tap_code_delay(KC_SCRL, 50);
                 wait_ms(50);
                 tap_code_delay(KC_4, 50);
                 tap_code(KC_ENT);
diff --git a/layouts/community/ergodox/ordinary/keymap.c b/layouts/community/ergodox/ordinary/keymap.c
index 61506abf75..6c7586034c 100644
--- a/layouts/community/ergodox/ordinary/keymap.c
+++ b/layouts/community/ergodox/ordinary/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                      // right hand
                                                                      ,KC_NO    ,KC_F16  ,KC_F17       ,KC_F18       ,KC_F19  ,KC_F20  ,KC_TRNS
                                                                      ,KC_WH_U  ,KC_PSCR ,KC_HOME      ,KC_UP        ,KC_PGUP ,KC_MAIL ,KC_TRNS
-                                                                               ,KC_NLCK ,KC_LEFT      ,KC_DOWN      ,KC_RIGHT,KC_MYCM ,KC_TRNS
+                                                                               ,KC_NUM  ,KC_LEFT      ,KC_DOWN      ,KC_RIGHT,KC_MYCM ,KC_TRNS
                                                                      ,KC_WH_D  ,KC_NO   ,KC_END       ,KC_DOWN      ,KC_PGDN ,KC_NO   ,KC_TRNS
                                                                                         ,KC_INS       ,KC_DEL       ,KC_NO   ,KC_NO   ,KC_NO
                                                                      ,KC_MPRV  ,KC_MNXT
diff --git a/layouts/community/ergodox/ordinary_osx/keymap.c b/layouts/community/ergodox/ordinary_osx/keymap.c
index f7edbc4af0..f67a6d6da0 100644
--- a/layouts/community/ergodox/ordinary_osx/keymap.c
+++ b/layouts/community/ergodox/ordinary_osx/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                      // right hand
                                                                      ,KC_NO    ,KC_F16  ,KC_F17       ,KC_F18       ,KC_F19  ,KC_F20  ,KC_TRNS
                                                                      ,KC_WH_U  ,KC_PSCR ,KC_HOME      ,KC_UP        ,KC_PGUP ,KC_MAIL ,KC_TRNS
-                                                                               ,KC_NLCK ,KC_LEFT      ,KC_DOWN      ,KC_RIGHT,KC_MYCM ,KC_TRNS
+                                                                               ,KC_NUM  ,KC_LEFT      ,KC_DOWN      ,KC_RIGHT,KC_MYCM ,KC_TRNS
                                                                      ,KC_WH_D  ,KC_NO   ,KC_END       ,KC_DOWN      ,KC_PGDN ,KC_NO   ,KC_TRNS
                                                                                         ,KC_INS       ,KC_DEL       ,KC_NO   ,KC_NO   ,KC_NO
                                                                      ,KC_MPRV  ,KC_MNXT
diff --git a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
index 2285aa4a94..592a70238a 100644
--- a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
+++ b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                              KC_TRNS,
                                            KC_TRNS, KC_TRNS, KC_TRNS,
        // right hand
-       KC_NO,   KC_NO,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_NO,
+       KC_NO,   KC_NO,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_NO,
        KC_NO,   KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_NO,
                 KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_NO,
        KC_NO,   KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_NO,
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index ed06446907..ee97eb7bc5 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -395,7 +395,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                               K80(L1K0),       K80(L1K1),        DYN_MACRO_PLAY1,
                               DYN_REC_STOP,    KC_TRNS,          DYN_MACRO_PLAY2,
   /* right hand */
-  M_BRACKET_OUT_CBR, KC_TRNS,           KC_NLCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,  KC_TRNS,
+  M_BRACKET_OUT_CBR, KC_TRNS,           KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,  KC_TRNS,
   M_BRACKET_OUT_PRN, M_ARROW_LEQL,      KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
                      M_ARROW_LMINUS,    KC_KP_4, KC_KP_5,     KC_KP_6,        KC_KP_PLUS,  KC_TRNS,
   M_BRACKET_OUT_BRC, M_BRACKET_OUT_ANG, KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, KC_TRNS,
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index 8bd24a1233..f5c7f32688 100644
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -91,8 +91,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     _______,
                                     _______,_______,_______,
 
-    _______,KC_NLCK,_______,_______,_______,_______,_______,
-    KC_NLCK,KC_HASH,KC_P7,  KC_P8,  KC_P9,  KC_PSLS,SFT_TAB,
+    _______,KC_NUM, _______,_______,_______,_______,_______,
+    KC_NUM, KC_HASH,KC_P7,  KC_P8,  KC_P9,  KC_PSLS,SFT_TAB,
             KC_PPLS,KC_P4,  KC_P5,  KC_P6,  KC_PAST,KC_TAB,
     _______,KC_PMNS,KC_P1,  KC_P2,  KC_P3,  KC_BSLS,KC_EQL,
                     KC_P0,  KC_P0,  KC_PDOT,KC_PENT,_______,
@@ -197,10 +197,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     _______,
                                     _______,_______,_______,
 
-    KC_NLCK,_______,_______,_______,_______,_______,_______,
+    KC_NUM, _______,_______,_______,_______,_______,_______,
     KC_CAPS,_______,_______,_______,_______,_______,_______,
             _______,_______,_______,_______,_______,_______,
-    KC_SLCK,_______,_______,_______,_______,_______,_______,
+    KC_SCRL,_______,_______,_______,_______,_______,_______,
                     _______,_______,_______,_______,ooooooo,
     _______,_______,
     _______,
diff --git a/layouts/community/ergodox/sethbc/keymap.c b/layouts/community/ergodox/sethbc/keymap.c
index ea6fc465ef..1d21471688 100644
--- a/layouts/community/ergodox/sethbc/keymap.c
+++ b/layouts/community/ergodox/sethbc/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                              KC_TRNS,
                                            KC_TRNS, KC_TRNS, KC_TRNS,
     // right hand
-       KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PAST, KC_PMNS, KC_BSPC,
+       KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PAST, KC_PMNS, KC_BSPC,
        KC_TRNS, KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_BSPC,
                 KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_PENT,
        KC_TRNS, KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PENT,
diff --git a/layouts/community/ergodox/teckinesis/keymap.c b/layouts/community/ergodox/teckinesis/keymap.c
index 509b91af90..adfc935c28 100644
--- a/layouts/community/ergodox/teckinesis/keymap.c
+++ b/layouts/community/ergodox/teckinesis/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                      // right hand
                                                                      ,KC_NO    ,KC_F16  ,KC_F17       ,KC_F18       ,KC_F19  ,KC_F20  ,KC_TRNS
                                                                      ,KC_WH_U  ,KC_PSCR ,KC_HOME      ,KC_UP        ,KC_PGUP ,KC_NO   ,KC_TRNS
-                                                                               ,KC_NLCK ,KC_LEFT      ,KC_DOWN      ,KC_RIGHT,KC_NO   ,KC_TRNS
+                                                                               ,KC_NUM  ,KC_LEFT      ,KC_DOWN      ,KC_RIGHT,KC_NO   ,KC_TRNS
                                                                      ,KC_WH_D  ,KC_NO   ,KC_END       ,KC_DOWN      ,KC_PGDN ,KC_NO   ,KC_TRNS
                                                                                         ,GUI_T(KC_INS),ALT_T(KC_DEL),KC_HYPR ,KC_MEH  ,KC_RCTL
                                                                      ,KC_MPRV  ,KC_MNXT
diff --git a/layouts/community/ergodox/videck/keymap.c b/layouts/community/ergodox/videck/keymap.c
index 7058d93447..1a17657da1 100644
--- a/layouts/community/ergodox/videck/keymap.c
+++ b/layouts/community/ergodox/videck/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                      KC_LBRC, KC_RBRC, KC_EQL, KC_RALT, KC_RCTL,
     KC_APP,  KC_ESC,
     KC_INS,
-    KC_SLCK, KC_ENT, KC_SPC
+    KC_SCRL, KC_ENT, KC_SPC
   ),
   [ARROWS] = LAYOUT_ergodox(
     // left hand
diff --git a/layouts/community/ergodox/xyverz/keymap.c b/layouts/community/ergodox/xyverz/keymap.c
index cb23782330..88a8ad2cc3 100644
--- a/layouts/community/ergodox/xyverz/keymap.c
+++ b/layouts/community/ergodox/xyverz/keymap.c
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    _______, _______, _______,
         // right hand
         _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-        _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
                  _______, DVORAK,  QWERTY,  COLEMAK, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,
                           _______, _______, _______, _______, _______,
diff --git a/layouts/community/ergodox/zweihander-macos/keymap.c b/layouts/community/ergodox/zweihander-macos/keymap.c
index c8dc8e446a..d1c444f48d 100644
--- a/layouts/community/ergodox/zweihander-macos/keymap.c
+++ b/layouts/community/ergodox/zweihander-macos/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,  /* F14 dims screen, F15 brightens */
+       KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,  /* F14 dims screen, F15 brightens */
        KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/numpad_5x4/mrsendyyk/keymap.c b/layouts/community/numpad_5x4/mrsendyyk/keymap.c
index 2b013b6c74..874e4e8c97 100644
--- a/layouts/community/numpad_5x4/mrsendyyk/keymap.c
+++ b/layouts/community/numpad_5x4/mrsendyyk/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_numpad_5x4(
-        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/layouts/community/numpad_5x6/bjohnson/keymap.c b/layouts/community/numpad_5x6/bjohnson/keymap.c
index 45b339f7ff..dc6b939e5f 100644
--- a/layouts/community/numpad_5x6/bjohnson/keymap.c
+++ b/layouts/community/numpad_5x6/bjohnson/keymap.c
@@ -4,7 +4,7 @@ extern rgblight_config_t rgblight_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_numpad_5x6(
-		KC_F1,   LT(1,KC_F2),    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_F1,   LT(1,KC_F2),    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 		KC_F3,   KC_F4,    KC_P7,   KC_P8,   KC_P9,
 		KC_F5,   KC_F6,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 		KC_F7,   KC_F8,    KC_P1,   KC_P2,   KC_P3,
diff --git a/layouts/community/numpad_5x6/drashna/keymap.c b/layouts/community/numpad_5x6/drashna/keymap.c
index e2d0b01eec..014da361f6 100644
--- a/layouts/community/numpad_5x6/drashna/keymap.c
+++ b/layouts/community/numpad_5x6/drashna/keymap.c
@@ -21,7 +21,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_NUMLOCK] = LAYOUT_numpad_5x6(
-		KC_F1,   F2_MCRO,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_F1,   F2_MCRO,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 		KC_F3,   KC_F4,    KC_P7,   KC_P8,   KC_P9,
 		KC_F5,   KC_F6,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
 		KC_F7,   KC_F8,    KC_P1,   KC_P2,   KC_P3,
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 411bdf8043..724c80c644 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, KC_NLCK, KC_KP_7, KC_KP_8,   KC_KP_9,     KC_KP_SLASH,    _______,
+    _______, _______, _______, _______, _______, _______, KC_NUM,  KC_KP_7, KC_KP_8,   KC_KP_9,     KC_KP_SLASH,    _______,
     _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5,   KC_KP_6,     KC_KP_ASTERISK, _______,
     _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2,   KC_KP_3,     KC_KP_PLUS,     _______,
     _______, _______, _______, _______, _______, _______, _______, KC_KP_0, KC_KP_DOT, KC_COMM,     KC_KP_MINUS,    _______
diff --git a/layouts/community/ortho_4x12/grahampheath/keymap.c b/layouts/community/ortho_4x12/grahampheath/keymap.c
index 7b35c52e71..a4fa168c5c 100644
--- a/layouts/community/ortho_4x12/grahampheath/keymap.c
+++ b/layouts/community/ortho_4x12/grahampheath/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   HYPR_0,  _______, WINK,    _______, ROFL,     TOUNGE,  THANKS,  _______, CRY,     FLIP,    _______, _______ ,
   HYPR_1,  ABOVE,   SHRUG,   GRIN,    FROWN,    _______, HEART,   JOY,     _______, LLAP,    _______, _______ ,
   HYPR_2,  SING,    THINK,   CLAP,    CONFUSED, BUG,     _______, _______, SHIT,    ELIP,    _______, _______ ,
-  _______, _______, _______, _______, KC_SLCK,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT
+  _______, _______, _______, _______, KC_SCRL,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT
 ),
 };
 
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index 17f5c9f614..92e697ded3 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
     KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   _______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,KC_VOLD,KC_MUTE,KC_VOLU,DM_PLY1,DM_REC1,DM_RSTP,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,
+    _______,KC_VOLD,KC_MUTE,KC_VOLU,DM_PLY1,DM_REC1,DM_RSTP,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
     _______,KC_MPRV,KC_MPLY,KC_MNXT,DM_PLY2,DM_REC2,KC_INS, KC_APP, _______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
     _______,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_D,_______,_______,KC_P4,  KC_P5,  KC_P6,  KC_PPLS,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,KC_NLCK,KC_P1,  KC_P2,  KC_P3,  KC_PSLS,KC_PENT,
+    _______,_______,_______,_______,_______,_______,KC_NUM, KC_P1,  KC_P2,  KC_P3,  KC_PSLS,KC_PENT,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
     _______,_______,_______,_______,_______,_______,_______,_______,KC_P0,  KC_PDOT,KC_PAST,_______
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
diff --git a/layouts/community/ortho_4x4/jotix/keymap.c b/layouts/community/ortho_4x4/jotix/keymap.c
index 7ee3aa9cc9..ec975d6db2 100644
--- a/layouts/community/ortho_4x4/jotix/keymap.c
+++ b/layouts/community/ortho_4x4/jotix/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,
   KC_EXLM,KC_AT,  KC_HASH,KC_DLR,
   KC_Z,   KC_X,   KC_C,   _______,
-  KC_NLCK,_______,_______,TGGAME
+  KC_NUM, _______,_______,TGGAME
 )
 };
 
diff --git a/layouts/community/ortho_5x12/xyverz/keymap.c b/layouts/community/ortho_5x12/xyverz/keymap.c
index fe2287918b..fe6055f1ad 100644
--- a/layouts/community/ortho_5x12/xyverz/keymap.c
+++ b/layouts/community/ortho_5x12/xyverz/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
   BL_STEP, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______ \
   ),
 
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______, \
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
   BL_STEP, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______ \
   ),
 
diff --git a/layouts/community/ortho_5x14/yet-another-developer/keymap.c b/layouts/community/ortho_5x14/yet-another-developer/keymap.c
index aea50508d3..d884081d7e 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/keymap.c
+++ b/layouts/community/ortho_5x14/yet-another-developer/keymap.c
@@ -188,7 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_GRV,  _________________RAISE_L1__________________, _______,                 _______, _________________RAISE_R1__________________, KC_BSLS,
              _______, _________________RAISE_L2__________________,                                   _________________RAISE_R2__________________, KC_QUOT,
              _______, _________________RAISE_L3__________________, _______,                 _______, _________________RAISE_R3__________________, KC_PSCR,
-             _______, _______, _______, _______, _______,                                                     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_SLCK,
+             _______, _______, _______, _______, _______,                                                     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_SCRL,
                                                           _______, _______,                 _______, _______,
                                                  _______, _______, _______,                 _______, _______, _______
             ),
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c
index ea4521d3d9..7f238010d0 100644
--- a/layouts/community/ortho_5x15/wanleg/keymap.c
+++ b/layouts/community/ortho_5x15/wanleg/keymap.c
@@ -11,7 +11,7 @@
 	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e  \
   ) \
    LAYOUT_ortho_5x15_wrapper( \
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    QWERTY, GHERKIN, FUNCTION,	KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK,  \
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    QWERTY, GHERKIN, FUNCTION,	KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NUM,  \
      K00, K01, K02, K03, K04, K05, 		K0c,  K0d,  K0e,		K06, K07, K08, K09, K0a, K0b, \
      K10, K11, K12, K13, K14, K15, 		K1c,  K1d,  K1e,		K16, K17, K18, K19, K1a, K1b, \
      K20, K21, K22, K23, K24, K25, 		K2c,  K2d,  K2e,		K26, K27, K28, K29, K2a, K2b, \
@@ -26,7 +26,7 @@
 	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e  \
   ) \
    LAYOUT_ortho_5x15_wrapper( \
-     QWERTY, GHERKIN, FUNCTION,	KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK,  \
+     QWERTY, GHERKIN, FUNCTION,	KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NUM,  \
      K0c,  K0d,  K0e,		K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
      K1c,  K1d,  K1e, 		K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
      K2c,  K2d,  K2e, 		K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
@@ -41,7 +41,7 @@
 	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e  \
   ) \
    LAYOUT_ortho_5x15_wrapper( \
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK,  QWERTY, GHERKIN, FUNCTION, \
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NUM,  QWERTY, GHERKIN, FUNCTION, \
      K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, 		K0c,  K0d,  K0e, \
      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, 		K1c,  K1d,  K1e, \
      K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, 		K2c,  K2d,  K2e, \
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index ce01e15929..58b7e73f69 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -129,7 +129,7 @@
   "KC_PRINT_SCREEN": "Print Screen",
   "KC_PSCR": "Print Screen",
   "KC_SCROLL_LOCK": "Scroll Lock",
-  "KC_SLCK": "Scroll Lock",
+  "KC_SCRL": "Scroll Lock",
   "KC_PAUSE": "Pause",
   "KC_PAUS": "Pause",
   "KC_INSERT": "Insert",
@@ -200,7 +200,7 @@
   "KC_MEDIA_PLAY_PAUSE": "play",
   "KC_MPLY": "play",
   "KC_NUM_LOCK": "Keypad Num Lock and Clear",
-  "KC_NLCK": "Keypad Num Lock and Clear",
+  "KC_NUM": "Keypad Num Lock and Clear",
   "KC_SLSH": "/",
   "KC_KP_SLASH": "/",
   "KC_PSLS": "/",
diff --git a/layouts/community/split_3x6_3/bcat/keymap.c b/layouts/community/split_3x6_3/bcat/keymap.c
index b7cbfa1bfd..46105ef253 100644
--- a/layouts/community/split_3x6_3/bcat/keymap.c
+++ b/layouts/community/split_3x6_3/bcat/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER_LOWER] = LAYOUT_split_3x6_3(
         MC_ALTT,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
         KY_CSPC,  KY_ZMRST, KY_ZMOUT, KY_ZMIN,  KC_WBAK,  KC_WFWD,                      KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_TILD,
-        _______,  KC_APP,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_LGUI,                      KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
+        _______,  KC_APP,   KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_LGUI,                      KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
                                                 _______,  _______,  _______,  _______,  _______,  _______
     ),
     /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/08b44355d4ca85d294bad9e2821f91d7 */
diff --git a/layouts/community/tkl_ansi/xyverz/keymap.c b/layouts/community/tkl_ansi/xyverz/keymap.c
index aec179bc12..9e08884f8c 100644
--- a/layouts/community/tkl_ansi/xyverz/keymap.c
+++ b/layouts/community/tkl_ansi/xyverz/keymap.c
@@ -13,7 +13,7 @@ enum planck_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QW] = LAYOUT_tkl_ansi( /* Layer 0: Qwerty */ \
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS, \
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_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,                                  \
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_DV] = LAYOUT_tkl_ansi( /* Layer 1: Dvorak */ \
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS, \
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_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_LBRC, KC_RBRC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP, \
     KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN, \
     KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_ENT,                                  \
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_CM] = LAYOUT_tkl_ansi( /* Layer 2: Colemak */ \
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS, \
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_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_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN, \
     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,                                  \
diff --git a/layouts/community/tkl_ansi/yanfali/keymap.c b/layouts/community/tkl_ansi/yanfali/keymap.c
index 9cdc0c4149..715ed13461 100644
--- a/layouts/community/tkl_ansi/yanfali/keymap.c
+++ b/layouts/community/tkl_ansi/yanfali/keymap.c
@@ -8,7 +8,7 @@ enum _layer {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[BASE] = 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_SLCK,KC_PAUS, \
+		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_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, \
 		MT(MOD_LCTL, KC_ESC),    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_ENT,          \
diff --git a/layouts/default/65_ansi/default_65_ansi/keymap.c b/layouts/default/65_ansi/default_65_ansi/keymap.c
index e206bd7851..6c9199c1e8 100644
--- a/layouts/default/65_ansi/default_65_ansi/keymap.c
+++ b/layouts/default/65_ansi/default_65_ansi/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c b/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c
index 7036e7295f..b134a5e6c7 100644
--- a/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c
+++ b/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c b/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c
index 6bca761830..099e714395 100644
--- a/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c
+++ b/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi_blocker_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_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c b/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c
index f899242ed4..b5935888d4 100644
--- a/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c
+++ b/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi_blocker_tsangan(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______,          _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c b/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c
index 446d2c72ab..eef519f090 100644
--- a/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c
+++ b/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi_blocker_tsangan_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_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______,          _______, _______, _______
diff --git a/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c b/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
index be974060e7..e1dacf6067 100644
--- a/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
+++ b/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi_split_bs(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso/default_65_iso/keymap.c b/layouts/default/65_iso/default_65_iso/keymap.c
index 833945bebf..245b542c13 100644
--- a/layouts/default/65_iso/default_65_iso/keymap.c
+++ b/layouts/default/65_iso/default_65_iso/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK,          _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c b/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c
index 9e1f99afaa..1b1cbce8c4 100644
--- a/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c
+++ b/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = 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,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK,          _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c b/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c
index a816c3746a..33ebc159ad 100644
--- a/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c
+++ b/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_iso_blocker_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_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK,          _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c b/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c
index 7a0197df19..4dbd379f89 100644
--- a/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c
+++ b/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_iso_blocker_tsangan(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK,          _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______,          _______, _______, _______
diff --git a/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c b/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c
index c5b5dad8a1..fa21d951bd 100644
--- a/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c
+++ b/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_iso_blocker_tsangan_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_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK,          _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______,          _______, _______, _______
diff --git a/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
index 70c91a43b2..4cd8ddd53b 100644
--- a/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
+++ b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_iso_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_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK,          _______,
+        _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h
index 03dcfabc45..d69d141291 100644
--- a/quantum/keycode_legacy.h
+++ b/quantum/keycode_legacy.h
@@ -8,6 +8,3 @@
 #define KC_LSHIFT         KC_LEFT_SHIFT
 #define KC_RCTRL          KC_RIGHT_CTRL
 #define KC_RSHIFT         KC_RIGHT_SHIFT
-
-#define KC_SLCK KC_SCROLL_LOCK
-#define KC_NLCK KC_NUM_LOCK
diff --git a/users/alfrdmalr/alfrdmalr.h b/users/alfrdmalr/alfrdmalr.h
index c779a353d9..828001b582 100644
--- a/users/alfrdmalr/alfrdmalr.h
+++ b/users/alfrdmalr/alfrdmalr.h
@@ -148,7 +148,7 @@ enum alfrdmalr_keycodes {
 
 // RIGHT
 // - CORE
-#define ____NUMPAD_R1____    KC_NLCK,  KC_7,  KC_8,  KC_9,  KC_MINS
+#define ____NUMPAD_R1____    KC_NUM,   KC_7,  KC_8,  KC_9,  KC_MINS
 #define ____NUMPAD_R2____    KC_SPC,   KC_4,  KC_5,  KC_6,  KC_PLUS
 #define ____NUMPAD_R3____    KC_NO,    KC_1,  KC_2,  KC_3,  KC_SLSH
 
diff --git a/users/csc027/defines.h b/users/csc027/defines.h
index 85d7d065b7..1086973ba2 100644
--- a/users/csc027/defines.h
+++ b/users/csc027/defines.h
@@ -189,8 +189,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * `-----------------------------------'  `-----------------------------------'
  */
 
-#define ___________________CONVENIENCE_L1__________________  XXXXXXX,  XXXXXXX,  KC_INS,   KC_SLCK,  KC_PSCR,  XXXXXXX
-#define ___________________CONVENIENCE_L2__________________  _______,  XXXXXXX,  KC_APP,   MC_lcad,  MC_rdcc,  KC_NLCK
+#define ___________________CONVENIENCE_L1__________________  XXXXXXX,  XXXXXXX,  KC_INS,   KC_SCRL,  KC_PSCR,  XXXXXXX
+#define ___________________CONVENIENCE_L2__________________  _______,  XXXXXXX,  KC_APP,   MC_lcad,  MC_rdcc,  KC_NUM
 #define ___________________CONVENIENCE_L3__________________  _______,  XXXXXXX,  KC_MSTP,  KC_MPRV,  KC_MPLY,  KC_MNXT
 #define ___________________CONVENIENCE_L4__________________  _______,  _______,  _______,  _______,  _______,  _______
 
@@ -266,7 +266,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ___________________CSGO_4x12_L4____________________  KC_LCTL, KC_Z,   KC_LALT,  KC_X,     KC_B,     KC_SPC
 
 #define ___________________CSGO_4x12_R1____________________  KC_6,    KC_P7,  KC_P8,    KC_P9,    KC_0,     KC_BSPC
-#define ___________________CSGO_4x12_R2____________________  KC_Y,    KC_P4,  KC_P5,    KC_P6,    XXXXXXX,  KC_NLCK
+#define ___________________CSGO_4x12_R2____________________  KC_Y,    KC_P4,  KC_P5,    KC_P6,    XXXXXXX,  KC_NUM
 #define ___________________CSGO_4x12_R3____________________  KC_H,    KC_P1,  KC_P2,    KC_P3,    KC_PENT,  KC_ESC
 #define ___________________CSGO_4x12_R4____________________  KC_SPC,  KC_P0,  KC_P0,    KC_PDOT,  TO(_QW),  TO(_QW)
 
diff --git a/users/doogle999/doogle999.c b/users/doogle999/doogle999.c
index c9ee125741..5d71599687 100644
--- a/users/doogle999/doogle999.c
+++ b/users/doogle999/doogle999.c
@@ -391,9 +391,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
 
 		if(numpadKeyPressed && !(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK)))
 		{
-			add_key(KC_NLCK);
+			add_key(KC_NUM_LOCK);
 			send_keyboard_report();
-			del_key(KC_NLCK);
+			del_key(KC_NUM_LOCK);
 		}
 	}
 
diff --git a/users/ericgebhart/layers.h b/users/ericgebhart/layers.h
index 5faaf01736..aff401d65e 100755
--- a/users/ericgebhart/layers.h
+++ b/users/ericgebhart/layers.h
@@ -122,7 +122,7 @@
 
 // Kinesis function key row. I don't use them. but might as well define them.
 #define ___KINTFUNC_L___ KC_ESC, ___FUNC_1_6___, KC_F7, KC_F8
-// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET
+// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_FN0, RESET
 #define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, RESET
 
 // A TOPROWS Layer.
diff --git a/users/imchipwood/imchipwood.c b/users/imchipwood/imchipwood.c
index e319c00ce7..b019012a71 100644
--- a/users/imchipwood/imchipwood.c
+++ b/users/imchipwood/imchipwood.c
@@ -131,7 +131,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     [ALT_F2]   = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altf2_finished, altf2_reset),
     [CTL_F5]   = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctlf5_finished, ctlf5_reset),
     [ALT_F7]   = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altf7_finished, altf7_reset),
-    [DEL_NLCK] = ACTION_TAP_DANCE_DOUBLE(KC_DEL, KC_NLCK),
+    [DEL_NLCK] = ACTION_TAP_DANCE_DOUBLE(KC_DEL, KC_NUM),
     // Double tap right -> END
     [TD_REND] = ACTION_TAP_DANCE_DOUBLE(KC_RIGHT, KC_END),
     // Double tap left -> HOME
diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index 5d80877f0e..f083839630 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -49,7 +49,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     bool numpad = IS_LAYER_ON_STATE(state, L_NUMPAD);
     bool num_lock = IS_HOST_LED_ON(USB_LED_NUM_LOCK);
     if (numpad != num_lock) {
-        tap_code(KC_NLCK);  // Toggle Num Lock to match Numpad layer state
+        tap_code(KC_NUM_LOCK);  // Toggle Num Lock to match Numpad layer state
     }
 #endif
 
diff --git a/users/losinggeneration/losinggeneration-keymap.h b/users/losinggeneration/losinggeneration-keymap.h
index 74170dc312..bb1c6cf697 100644
--- a/users/losinggeneration/losinggeneration-keymap.h
+++ b/users/losinggeneration/losinggeneration-keymap.h
@@ -248,7 +248,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
  * `-----------------------------------------''-----------------------------------------'
  */
 #define NUMPAD_LAYER \
-  KC_TAB , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_P7  , KC_P8  , KC_P9  , KC_PMNS, KC_BSPC, \
+  KC_TAB , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,  KC_P7  , KC_P8  , KC_P9  , KC_PMNS, KC_BSPC, \
   KC_ESC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_P4  , KC_P5  , KC_P6  , KC_PPLS, KC_BSPC, \
   KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_P1  , KC_P2  , KC_P3  , KC_PENT, XXXXXXX, \
   TD_ADJ , TD_CTL , TD_ALT , TD_GUI , XXXXXXX, KC_SPC , KC_SPC , KC_P0  , KC_P0  , KC_PDOT, KC_PENT, XXXXXXX
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
index 8a0e70a6b5..8aa779edb0 100644
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
@@ -249,13 +249,13 @@ U_NP,              U_NP,              KC_LPRN,           KC_RPRN,           KC_U
 
 #define MIRYOKU_ALTERNATIVES_FUN_FLIP \
 RESET,             U_NA,              U_NA,              U_NA,              U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SLCK,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SCRL,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_PAUS,           KC_F1,             KC_F2,             KC_F3,             KC_F10,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_TAB,            KC_SPC,            KC_APP,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_FUN \
 KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
-KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SLCK,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SCRL,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 KC_F10,            KC_F1,             KC_F2,             KC_F3,             KC_PAUS,           U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_APP,            KC_SPC,            KC_TAB,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
diff --git a/users/not-quite-neo/nqn-basic-layout.h b/users/not-quite-neo/nqn-basic-layout.h
index d1b9a1c477..71db9d379b 100644
--- a/users/not-quite-neo/nqn-basic-layout.h
+++ b/users/not-quite-neo/nqn-basic-layout.h
@@ -118,7 +118,7 @@ The naming convention for these blocks is
 #define L06_LEFT_03  KC_F9,   KC_F10,  KC_F11,  KC_F12,         _______
 #define L06_RIGHT_01 KC_MAIL, KC_MSEL, KC_MY_COMPUTER, KC_CALCULATOR, N_PASTE
 #define L06_RIGHT_02 KC_MPRV, KC_MPLY, KC_MNXT,        KC_MSTP,       N_COPY
-#define L06_RIGHT_03 KC_PSCR, KC_SLCK, KC_PAUS,        KC_NLCK,       N_CUT
+#define L06_RIGHT_03 KC_PSCR, KC_SCRL, KC_PAUS,        KC_NUM,        N_CUT
 
 
 #endif
diff --git a/users/nstickney/nstickney.c b/users/nstickney/nstickney.c
index 8222e7289d..94453ec340 100644
--- a/users/nstickney/nstickney.c
+++ b/users/nstickney/nstickney.c
@@ -38,13 +38,13 @@ void dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) {
             register_code(KC_LGUI);
             break;
         case 2:
-            register_code(KC_NLCK);
+            register_code(KC_NUM);
             break;
         case 3:
             register_code(KC_CAPS);
             break;
         case 4:
-            register_code(KC_SLCK);
+            register_code(KC_SCRL);
             break;
         default:
             break;
@@ -57,13 +57,13 @@ void dance_lock_reset(qk_tap_dance_state_t *state, void *user_data) {
             unregister_code(KC_LGUI);
             break;
         case 2:
-            register_code(KC_NLCK);
+            register_code(KC_NUM);
             break;
         case 3:
             register_code(KC_CAPS);
             break;
         case 4:
-            register_code(KC_SLCK);
+            register_code(KC_SCRL);
             break;
         default:
             break;
diff --git a/users/romus/romus.h b/users/romus/romus.h
index 05697034e4..f79777d91b 100644
--- a/users/romus/romus.h
+++ b/users/romus/romus.h
@@ -199,7 +199,7 @@ enum {
  * | Ctrl| Alt |  /  |  `  | SYM | Spc ||  F5 | Ent |  0  |  <  |  v  |  >  |
  * `------------------------------------------------------------------------' */
 #define GAME \
-    K_GAMES,KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_ESC, KC_P7,  KC_P8,  KC_P9,  KC_NLCK,KC_BSPC, \
+    K_GAMES,KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_ESC, KC_P7,  KC_P8,  KC_P9,  KC_NUM, KC_BSPC, \
     KC_TAB, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_F1,  KC_P4,  KC_P5,  KC_P6,  KC_BSLS,KC_ENT , \
     KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_F2,  KC_P1,  KC_P2,  KC_P3,  KC_UP,K_MOUSE, \
     KC_LCTL,KC_LALT,KC_SLSH,KC_GRV,	K_NUMBR,KC_SPC, KC_F5, 	KC_ENT, KC_P0,  KC_LEFT,KC_DOWN,KC_RGHT
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h
index c5cae464b8..938ec2db99 100644
--- a/users/rupa/wrappers.h
+++ b/users/rupa/wrappers.h
@@ -91,8 +91,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define ____65_LOWER_______________ROW1    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ZZZZZ,   _______, _______
 #define ____65_LOWER_______________ROW2    _______, U_FRACT, U_ITALI, U_MONOS, U_NORML, U_SANSI, U_SANSN, U_SCRPT, _______, _______, KC_PSCR, _______, _______, _______, _______
-#define ____65_LOWER_______________ROW3    _______, _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______
-#define ____65_LOWER_______________ROW4    _______,          ZALGO  , _______, KC_CAPS, VRSN,    _______, KC_NLCK, _______, _______, _______, _______, _______, _______, _______
+#define ____65_LOWER_______________ROW3    _______, _______, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______
+#define ____65_LOWER_______________ROW4    _______,          ZALGO  , _______, KC_CAPS, VRSN,    _______, KC_NUM,  _______, _______, _______, _______, _______, _______, _______
 #define ____65_LOWER_______________ROW5    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
 
 /* _ADJUST
diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c
index 6655170d4a..5e58bc9e3f 100644
--- a/users/talljoe/talljoe.c
+++ b/users/talljoe/talljoe.c
@@ -39,7 +39,7 @@ const char layer_names[32][16] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = TEMPLATE_TKL(
-      US_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_PSCR, KC_SLCK, MO_ADJ ,
+      US_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_PSCR, KC_SCRL, MO_ADJ ,
       US_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , US_BSLS, KC_INS , KC_HOME, KC_PGUP,
       US_TAB , KC_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,
       CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G   , KC_H,    KC_J,    KC_K,    KC_L,    US_SCLN, KC_QUOT,          US_ENT ,
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index e30427b3cd..41861a5958 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -62,7 +62,7 @@
 
 #define __________________RAISE_R1_________________           KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11
 #define __________________RAISE_R2_________________           _______,  KC_INS,   KC_HOME,  KC_PGUP,  KC_PSCR,  _______
-#define __________________RAISE_R3_________________           _______,  KC_DEL,   KC_END,   KC_PGDN,  KC_SLCK,  _______
+#define __________________RAISE_R3_________________           _______,  KC_DEL,   KC_END,   KC_PGDN,  KC_SCRL,  _______
 #define __________________RAISE_R4_________________           _______,  _______,  _______,  _______,  _______,  _______
 #define __________________RAISE_R5_________________           _______,  KC_MPRV,  KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY
 
@@ -86,7 +86,7 @@
 #define __________________LOWER_L4_________________ _______,  _______,  _______,  _______,  _______,  _______
 #define __________________LOWER_L5_________________ _______,  _______,  _______,  _______,  _______,  _______
 
-#define __________________LOWER_R1_________________           _______,  _______,  _______,  KC_SLCK,  KC_NLCK,  KC_DEL
+#define __________________LOWER_R1_________________           _______,  _______,  _______,  KC_SCRL,  KC_NUM,   KC_DEL
 #define __________________LOWER_R2_________________           _______,  _______,  KC_KP_7,  KC_KP_8,  KC_KP_9,  _______
 #define __________________LOWER_R3_________________           _______,  _______,  KC_KP_4,  KC_KP_5,  KC_KP_6,  _______
 #define __________________LOWER_R4_________________           _______,  _______,  KC_KP_1,  KC_KP_2,  KC_KP_3,  _______

From 4b5ebb7248bfe8cd860fe952d6ad24c42b74ca69 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sat, 15 Oct 2022 16:24:26 -0600
Subject: [PATCH 656/959] Fixup latinpadble (#18736)

---
 keyboards/latincompass/latinpadble/config.h   | 43 +-----------
 .../latinpadble/keymaps/default/keymap.c      | 19 +-----
 .../latinpadble/keymaps/via/keymap.c          | 68 ++++++-------------
 .../latinpadble/keymaps/via/rules.mk          |  1 -
 .../latincompass/latinpadble/latinpadble.c    |  9 +++
 keyboards/latincompass/latinpadble/rules.mk   |  1 +
 6 files changed, 36 insertions(+), 105 deletions(-)

diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index 09198df612..a9a8dc7f1a 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -30,56 +30,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #define DIODE_DIRECTION ROW2COL
 
-#define SSD1306OLED
 #define RGB_DI_PIN B7
 
 #define RGBLED_NUM 4
-#define DRIVER_LED_TOTAL RGBLED_NUM
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-
 #define RGBLIGHT_VAL_STEP 25
-#define RGBLIGHT_LIMIT_VAL 255
+#define RGBLIGHT_EFFECT_KNIGHT
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
-//#define RGBLIGHT_ANIMATIONS             // Run RGB animations
-#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-#undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
 
 #define OLED_FONT_H "./lib/glcdfont.c"
 
diff --git a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
index 3fed6c0cb4..5bdbe6db10 100644
--- a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
@@ -14,16 +14,17 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 #include QMK_KEYBOARD_H
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_pad(
         KC_PGUP,
-	    KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
+        KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
         KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
         KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
     [1] = LAYOUT_pad(
         KC_NUMLOCK,
-		RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
+        RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
         RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
         RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
         RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS),
@@ -40,17 +41,3 @@ bool oled_task_user(void) {
     return false;
 }
 #endif
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-
-
-void matrix_init_user(void) { render_logo(); }
diff --git a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
index 2c4cc5f409..a9b1bd920f 100644
--- a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
@@ -13,49 +13,37 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
-/* Keymap _0: (Base Layer) Default Layer
-
-   * .----.
-   * |PGUP|
-   * |-----------------------.
-   * |  7  |  8  |  9  | MO1 |
-   * |-----|-----|-----|-----|
-   * |  4  |  5  |  6  |  +  |
-   * |-----|-----|-----|-----|
-   * |  1  |  2  |  3  |  —  |
-   * |-----|-----|-----|-----|
-   * |  0  |  .  | DEL |Enter|
-   * .-----------------------.
-   */
-     /* Keymap _1: (Second Layer) second Layer
-
-   * .--------.
-   * |NUMLOCK|
-   * |--------------------------------.
-   * |RGB_TOG|RGB_MOD|RGB_M_K|RGB_M_X |
-   * |-------|-------|-------|--------|
-   * |RGB_SAI|RGB_SAD|RGB_HUI|RGB_HUD |
-   * |-------|-------|-------|--------|
-   * |RGB_VAI|RGB_VAD|RGB_SPI|RGB_SPD |
-   * |-------|-------|-------|--------|
-   * |RGB_SPI|RGB_SPD|RGB_TOG|KC_TRNS |
-   * .--------------------------------.
-*/
-
 #include QMK_KEYBOARD_H
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_pad(
         KC_PGUP,
-	    KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
+        KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
         KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
         KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
-        KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
+        KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER
+    ),
     [1] = LAYOUT_pad(
         KC_NUMLOCK,
-		RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
+        RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
         RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
         RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
-        RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS),
+        RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS
+    ),
+    [2] = LAYOUT_pad(
+        _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_pad(
+        _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    )
 };
 
 static void render_logo(void) {
@@ -69,17 +57,3 @@ bool oled_task_user(void) {
     return false;
 }
 #endif
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-
-
-void matrix_init_user(void) { render_logo(); }
diff --git a/keyboards/latincompass/latinpadble/keymaps/via/rules.mk b/keyboards/latincompass/latinpadble/keymaps/via/rules.mk
index 36b7ba9cbc..1e5b99807c 100644
--- a/keyboards/latincompass/latinpadble/keymaps/via/rules.mk
+++ b/keyboards/latincompass/latinpadble/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/latincompass/latinpadble/latinpadble.c b/keyboards/latincompass/latinpadble/latinpadble.c
index c40c3ff734..cce96241b6 100644
--- a/keyboards/latincompass/latinpadble/latinpadble.c
+++ b/keyboards/latincompass/latinpadble/latinpadble.c
@@ -15,3 +15,12 @@
  */
 #include "latinpadble.h"
 
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (clockwise) {
+        tap_code(KC_PGDN);
+    } else {
+        tap_code(KC_PGUP);
+    }
+    return true;
+}
diff --git a/keyboards/latincompass/latinpadble/rules.mk b/keyboards/latincompass/latinpadble/rules.mk
index 06816c2ef8..2afef0b777 100644
--- a/keyboards/latincompass/latinpadble/rules.mk
+++ b/keyboards/latincompass/latinpadble/rules.mk
@@ -19,6 +19,7 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
 
 BLUETOOTH_ENABLE = yes
 BLUETOOTH_DRIVER = BluefruitLE

From 8464bb91e2a5eb3b1c467810be1cc55748211232 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sat, 15 Oct 2022 17:16:17 -0600
Subject: [PATCH 657/959] Fixup work_louder/micro VIA keymap (#18738)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/work_louder/micro/keymaps/via/config.h | 5 +++++
 keyboards/work_louder/micro/keymaps/via/rules.mk | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/work_louder/micro/keymaps/via/config.h

diff --git a/keyboards/work_louder/micro/keymaps/via/config.h b/keyboards/work_louder/micro/keymaps/via/config.h
new file mode 100644
index 0000000000..4a39333883
--- /dev/null
+++ b/keyboards/work_louder/micro/keymaps/via/config.h
@@ -0,0 +1,5 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/work_louder/micro/keymaps/via/rules.mk b/keyboards/work_louder/micro/keymaps/via/rules.mk
index 70cf4224c0..f1adcab005 100644
--- a/keyboards/work_louder/micro/keymaps/via/rules.mk
+++ b/keyboards/work_louder/micro/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
-LTO_ENABLE = yes

From d089af87030821e7bdd12c7187c5a583a8bf813d Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Sun, 16 Oct 2022 04:31:51 +0200
Subject: [PATCH 658/959] Mark the moonlander keyboard default music map as
 weak (#18715)

This allows user keymaps to set a different music map.
---
 keyboards/moonlander/moonlander.c | 1 +
 keyboards/moonlander/moonlander.h | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 1357539382..80e1d04772 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -358,6 +358,7 @@ void keyboard_post_init_kb(void) {
 
 #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
 // clang-format off
+__attribute__ ((weak))
 const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
     58, 59, 60, 61, 62, 63, 64,    65, 66, 67, 68, 69, 70, 71,
     44, 45, 46, 47, 48, 49, 50,    51, 52, 53, 54, 55, 56, 57,
diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h
index 90ce84b3e3..19618a9e2a 100644
--- a/keyboards/moonlander/moonlander.h
+++ b/keyboards/moonlander/moonlander.h
@@ -55,9 +55,9 @@ extern bool mcp23018_leds[];
     { k60, k61, k62, k63, k64, k65, k66 }, \
     { k70, k71, k72, k73, k74, k75, k76 }, \
     { k80, k81, k82, k83, k84, k85, k86 }, \
-    { KC_NO,k91, k92, k93, k94, k95, k96 }, \
+    { KC_NO, k91, k92, k93, k94, k95, k96 }, \
     { KC_NO, KC_NO, ka2, ka3, ka4, ka5, ka6 }, \
-    { KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6  } \
+    { KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6 } \
 }
 // clang-format on
 
@@ -83,4 +83,4 @@ typedef union {
 
 extern keyboard_config_t keyboard_config;
 
-bool is_transport_connected(void);
\ No newline at end of file
+bool is_transport_connected(void);

From 81988cc0326d4983bc9167dedfd1aed303a816e8 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 16 Oct 2022 15:58:42 +1100
Subject: [PATCH 659/959] Slipped through the cracks. (#18742)

---
 keyboards/sofle/keymaps/keyhive_via/readme.md | 4 ++--
 keyboards/wavtype/p01_ultra/readme.md         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/sofle/keymaps/keyhive_via/readme.md b/keyboards/sofle/keymaps/keyhive_via/readme.md
index e7a2beebcf..f50b12fdd9 100644
--- a/keyboards/sofle/keymaps/keyhive_via/readme.md
+++ b/keyboards/sofle/keymaps/keyhive_via/readme.md
@@ -2,7 +2,7 @@
 
 ![SofleKeyboard version 2.1 RGB Keyhive](https://i.imgur.com/Oa6spvZ.png)
 
-# Configuring VIA / Vial App
+# Configuring VIA
 
 This firmware will not auto-recognize until [PR #1060](https://github.com/the-via/keyboards/pull/1060) is accepted to the VIA keyboard database. For now you must install the new layout:
 
@@ -10,7 +10,7 @@ This firmware will not auto-recognize until [PR #1060](https://github.com/the-vi
 2. In the VIA app, select `File > Import Keymap` from the menu.
 3. Open the file you just downloaded.
 
-**You'll have to do this every time you use VIA or Vial until the PR is accepted.**
+**You'll have to do this every time you use VIA until the PR is accepted.**
 
 # Using with VIA
 * The default layouts should be loaded automatically.
diff --git a/keyboards/wavtype/p01_ultra/readme.md b/keyboards/wavtype/p01_ultra/readme.md
index bb90389227..9d8f3201e8 100644
--- a/keyboards/wavtype/p01_ultra/readme.md
+++ b/keyboards/wavtype/p01_ultra/readme.md
@@ -20,4 +20,4 @@ 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 (this can be set in vial!)
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

From 74223c34a969c0877bde035c721c21a1f25890fa Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 17 Oct 2022 00:14:40 +1100
Subject: [PATCH 660/959] Remove legacy keycodes, part 6 (#18740)

* `KC_RSHIFT` -> `KC_RSFT`

* `KC_RCTRL` -> `KC_RCTL`

* `KC_LSHIFT` -> `KC_LSFT`

* `KC_LCTRL` -> `KC_LCTL`
---
 .../1up60rgb/keymaps/mdyevimnav/keymap.c      |   2 +-
 .../1up60rgb/keymaps/raffle/keymap.c          |   4 +-
 .../super16/keymaps/ahk_companion/keymap.c    |   2 +-
 keyboards/3w6/keymaps/helltm/keymap.c         |   2 +-
 .../4pplet/bootleg/keymaps/default/keymap.c   |   2 +-
 keyboards/4pplet/bootleg/keymaps/via/keymap.c |   2 +-
 .../eagle_viper_rep/keymaps/default/keymap.c  |   2 +-
 .../eagle_viper_rep/keymaps/via/keymap.c      |   2 +-
 .../4pplet/steezy60/keymaps/4pplet/keymap.c   |   6 +-
 .../4pplet/steezy60/keymaps/default/keymap.c  |   2 +-
 .../4pplet/steezy60/keymaps/via/keymap.c      |   2 +-
 keyboards/abacus/keymaps/default/keymap.json  |   2 +-
 keyboards/abacus/keymaps/unicodemap/keymap.c  |   4 +-
 .../titan60/keymaps/default/keymap.c          |   2 +-
 .../acekeyboard/titan60/keymaps/iso/keymap.c  |   2 +-
 .../titan60/keymaps/tsangan/keymap.c          |   2 +-
 .../titan60/keymaps/utilitarian/keymap.c      |   2 +-
 .../acekeyboard/titan60/keymaps/via/keymap.c  |   2 +-
 .../elongate/beta/keymaps/default/keymap.c    |   6 +-
 .../elongate/beta/keymaps/via/keymap.c        |   6 +-
 .../amjpad/keymaps/ortho_left/keymap.c        |   2 +-
 .../1x4p1/keymaps/default/keymap.c            |   2 +-
 .../1x4p1/keymaps/via/keymap.c                |   2 +-
 keyboards/atreyu/keymaps/default/keymap.c     |   2 +-
 keyboards/bajjak/keymaps/5x6/keymap.c         |   2 +-
 keyboards/bajjak/keymaps/default/keymap.c     |   6 +-
 keyboards/beatervan/keymaps/via/keymap.c      |   2 +-
 .../ergo42/keymaps/biacco-biacco/keymap.c     |   6 +-
 .../ergo42/keymaps/biacco-macOS/keymap.c      |   4 +-
 .../ergo42/keymaps/biacco-underglow/keymap.c  |   4 +-
 .../ergo42/keymaps/biacco-winjp/keymap.c      |   4 +-
 .../biacco42/ergo42/keymaps/biacco/keymap.c   |   4 +-
 .../keymaps/default-illustrator/keymap.c      |   6 +-
 .../biacco42/ergo42/keymaps/yshrsmz/keymap.c  |   4 +-
 keyboards/bioi/g60/keymaps/default/keymap.c   |   2 +-
 keyboards/bioi/g60/keymaps/via/keymap.c       |   2 +-
 .../boardsource/lulu/keymaps/via/keymap.c     |   2 +-
 .../technik_s/keymaps/default/keymap.c        |   2 +-
 .../technik_s/keymaps/via/keymap.c            |   2 +-
 .../pegasushoof/keymaps/blowrak/keymap.c      |   4 +-
 .../cypher/rev6/keymaps/default_iso/keymap.c  |   2 +-
 .../charue/charon/keymaps/debug/keymap.c      |   4 +-
 .../charue/charon/keymaps/default/keymap.c    |   4 +-
 keyboards/charue/charon/keymaps/via/keymap.c  |   2 +-
 .../sunsetter_r2/keymaps/debug/keymap.c       |   4 +-
 .../sunsetter_r2/keymaps/default/keymap.c     |   4 +-
 .../charue/sunsetter_r2/keymaps/via/keymap.c  |   8 +-
 .../chavdai40/keymaps/42keys-dvorak/keymap.c  |   2 +-
 .../chavdai40/keymaps/42keys-eucalyn/keymap.c |   2 +-
 .../chavdai40/keymaps/42keys-qwerty/keymap.c  |   4 +-
 .../chavdai40/keymaps/44keys-dvorak/keymap.c  |   2 +-
 .../chavdai40/keymaps/44keys-eucalyn/keymap.c |   2 +-
 .../chavdai40/keymaps/44keys-qwerty/keymap.c  |   4 +-
 keyboards/chavdai40/keymaps/default/keymap.c  |   4 +-
 .../candybar_ortho/keymaps/2x3u/keymap.c      |   2 +-
 .../candybar_ortho/keymaps/7u/keymap.c        |   2 +-
 .../candybar_ortho/keymaps/default/keymap.c   |   2 +-
 .../candybar_ortho/keymaps/via/keymap.c       |   2 +-
 .../quark/keymaps/ajp10304/keymap.c           |  10 +-
 keyboards/contra/keymaps/ryanm101/keymap.c    |  16 +-
 keyboards/converter/ibm_terminal/config.h     |   2 +-
 keyboards/converter/m0110_usb/config.h        |   4 +-
 keyboards/converter/palm_usb/config.h         |   2 +-
 keyboards/converter/sun_usb/config.h          |   2 +-
 keyboards/converter/xt_usb/config.h           |   4 +-
 keyboards/crkbd/keymaps/nimishgautam/keymap.c |   2 +-
 keyboards/crkbd/keymaps/rarick/keymap.c       |   2 +-
 keyboards/crkbd/keymaps/rpbaptist/keymap.c    |   2 +-
 keyboards/crkbd/keymaps/vayashiko/keymap.c    |   4 +-
 .../keymaps/vlukash_trackpad_left/keymap.c    |   4 +-
 .../keymaps/vlukash_trackpad_right/keymap.c   |   4 +-
 .../keebcats/denis/keymaps/default/keymap.c   |   2 +-
 .../keebcats/denis/keymaps/via/keymap.c       |   2 +-
 .../keebcats/dougal/keymaps/default/keymap.c  |   2 +-
 .../keebcats/dougal/keymaps/via/keymap.c      |   2 +-
 .../scrabblepad/keymaps/random/keymap.c       |   4 +-
 .../drewkeys/iskar/keymaps/default/keymap.c   |   2 +-
 keyboards/drewkeys/iskar/keymaps/via/keymap.c |   2 +-
 keyboards/dz60/keymaps/boris_burger/keymap.c  |   4 +-
 keyboards/dz60/keymaps/model42/keymap.c       |   4 +-
 keyboards/dz60/keymaps/muzfuz/keymap.c        |   2 +-
 .../dz60/keymaps/split_space_arrows/keymap.c  |   4 +-
 .../dz60/keymaps/twschum_b_4_10/keymap.c      |   8 +-
 .../dz60rgb/keymaps/mechmaster48/keymap.c     |   2 +-
 .../dztech/dz65rgb/keymaps/yuannan/keymap.c   |  14 +-
 keyboards/e88/keymaps/default/keymap.c        |   2 +-
 keyboards/e88/keymaps/via/keymap.c            |   2 +-
 .../ergodox_ez/keymaps/bepo_tm_style/keymap.c |   6 +-
 .../ergodox_ez/keymaps/danielo515/keymap.c    |   2 +-
 .../keymaps/hacker_dvorak/hacker_dvorak.c     |  10 +-
 keyboards/ergodox_ez/keymaps/lukaus/config.h  |   2 +-
 keyboards/ergodox_ez/keymaps/lukaus/keymap.c  | 176 +++++++++---------
 .../ergodox_ez/keymaps/matrixman/keymap.c     |   8 +-
 .../keymaps/nathanvercaemert/keymap.c         |  38 ++--
 keyboards/ergodox_ez/keymaps/nfriend/keymap.c |  16 +-
 keyboards/ergodox_ez/keymaps/rishka/keymap.c  |   6 +-
 keyboards/ergodox_ez/keymaps/saha/keymap.c    |  12 +-
 .../ergodox_ez/keymaps/smurmann/keymap.c      |   4 +-
 keyboards/ergodox_ez/keymaps/testing/keymap.c |   2 +-
 keyboards/ergodox_ez/keymaps/vim/vim.h        |  18 +-
 .../util/keymap_beautifier/README.md          |  16 +-
 .../ergodox_stm32/keymaps/default/keymap.c    |   2 +-
 keyboards/ergotravel/keymaps/yanfali/config.h |   2 +-
 keyboards/eve/meteor/keymaps/via/keymap.c     |   2 +-
 .../evyd13/atom47/keymaps/LEdiodes/keymap.c   |   2 +-
 .../evyd13/atom47/keymaps/default/keymap.c    |   2 +-
 .../evyd13/atom47/keymaps/evyd13/keymap.c     |   2 +-
 .../atom47/keymaps/junonum_a47/keymap.c       |   2 +-
 keyboards/evyd13/atom47/keymaps/via/keymap.c  |   2 +-
 .../evyd13/eon87/keymaps/default/keymap.c     |   2 +-
 keyboards/evyd13/eon87/keymaps/via/keymap.c   |   2 +-
 .../evyd13/minitomic/keymaps/default/keymap.c |   2 +-
 .../evyd13/nt660/keymaps/default/keymap.c     |   2 +-
 .../evyd13/nt660/keymaps/evyd13/keymap.c      |   2 +-
 keyboards/evyd13/nt660/keymaps/via/keymap.c   |   2 +-
 .../evyd13/omrontkl/keymaps/default/keymap.c  |   2 +-
 .../evyd13/plain60/keymaps/audio/keymap.c     |   2 +-
 .../evyd13/plain60/keymaps/default/keymap.c   |   2 +-
 keyboards/evyd13/plain60/keymaps/rgb/keymap.c |   2 +-
 keyboards/evyd13/plain60/keymaps/via/keymap.c |   2 +-
 .../evyd13/ta65/keymaps/default/keymap.c      |   2 +-
 keyboards/evyd13/ta65/keymaps/evyd13/keymap.c |   2 +-
 keyboards/evyd13/ta65/keymaps/via/keymap.c    |   2 +-
 .../wonderland/keymaps/default/keymap.c       |   2 +-
 .../evyd13/wonderland/keymaps/keebs/keymap.c  |   2 +-
 .../evyd13/wonderland/keymaps/rys/keymap.c    |   2 +-
 .../exclusive/e65/keymaps/masterzen/keymap.c  |   2 +-
 .../exclusive/e7v1/keymaps/masterzen/keymap.c |   2 +-
 .../mk61rgbansi/keymaps/default/keymap.c      |   2 +-
 .../fjlabs/mk61rgbansi/keymaps/via/keymap.c   |   2 +-
 .../fjlabs/tf60ansi/keymaps/default/keymap.c  |   2 +-
 .../fjlabs/tf60ansi/keymaps/via/keymap.c      |   2 +-
 .../flygone60/rev3/keymaps/default/keymap.c   |   4 +-
 keyboards/flygone60/rev3/keymaps/via/keymap.c |   4 +-
 keyboards/forever65/keymaps/default/keymap.c  |   2 +-
 keyboards/forever65/keymaps/via/keymap.c      |   2 +-
 keyboards/fungo/keymaps/default/keymap.c      |   8 +-
 .../lex60/keymaps/default/keymap.c            |   6 +-
 keyboards/gh60/satan/keymaps/chaser/keymap.c  |   2 +-
 keyboards/gh60/satan/keymaps/colemak/keymap.c |   2 +-
 keyboards/gh60/satan/keymaps/isoHHKB/keymap.c |   2 +-
 keyboards/gh60/satan/keymaps/poker/keymap.c   |   2 +-
 keyboards/gh60/satan/keymaps/smt/keymap.c     |   2 +-
 keyboards/giabalanai/keymaps/default/keymap.c |   2 +-
 .../keymaps/default_giabarinaix2/keymap.c     |   2 +-
 .../keymaps/giabarinaix2led/keymap.c          |   2 +-
 keyboards/giabalanai/keymaps/via/keymap.c     |   2 +-
 .../keymaps/via_giabarinaix2/keymap.c         |   2 +-
 .../gvalchca/ga150/keymaps/default/keymap.c   |   2 +-
 keyboards/gvalchca/ga150/keymaps/via/keymap.c |   2 +-
 .../spaccboard/keymaps/default/keymap.c       |   2 +-
 .../gvalchca/spaccboard/keymaps/via/keymap.c  |   2 +-
 .../h0oni/deskpad/keymaps/default/keymap.c    |   4 +-
 keyboards/h0oni/deskpad/keymaps/via/keymap.c  |   4 +-
 .../hadron/ver2/keymaps/default/keymap.c      |   8 +-
 .../hadron/ver3/keymaps/default/keymap.c      |   6 +-
 keyboards/hadron/ver3/keymaps/ishtob/keymap.c |   4 +-
 .../atreus50/keymaps/ajp10304/keymap.c        |  10 +-
 .../keymaps/jmdaly_hhkb_split_space/keymap.c  |  16 +-
 .../handwired/d48/keymaps/anderson/keymap.c   |  12 +-
 .../handwired/d48/keymaps/default/keymap.c    |  12 +-
 .../dactyl/keymaps/erincalling/keymap.c       |   2 +-
 .../4x5_5/keymaps/default/keymap.c            |   4 +-
 .../4x5_5/keymaps/ssedrick/keymap.c           |   4 +-
 .../5x6/keymaps/squirrel/keymap.c             |   4 +-
 .../frenchdev/keymaps/default/keymap.c        |  16 +-
 .../hacked_motospeed/keymaps/default/keymap.c |   2 +-
 .../hexon38/keymaps/default/keymap.c          |   4 +-
 .../handwired/ibm122m/keymaps/lukaus/keymap.c | 132 ++++++-------
 .../handwired/k8split/keymaps/left/keymap.c   |   6 +-
 .../handwired/k8split/keymaps/right/keymap.c  |   4 +-
 .../ortho5x14/keymaps/default/keymap.c        |   2 +-
 .../owlet60/keymaps/default/keymap.c          |   2 +-
 .../owlet60/keymaps/oled_testing/keymap.c     |   2 +-
 keyboards/handwired/promethium/config.h       |   2 +-
 .../handwired/pteron/keymaps/FSund/keymap.c   |   2 +-
 .../split89/keymaps/default/keymap.c          |   2 +-
 .../swiftrax/cowfish/keymaps/default/keymap.c |   4 +-
 .../swiftrax/cowfish/keymaps/via/keymap.c     |   2 +-
 .../handwired/t111/keymaps/default/keymap.c   |   4 +-
 .../handwired/t111/keymaps/oleg/keymap.c      |   2 +-
 .../keymaps/ortho_left/keymap.c               |   2 +-
 .../unicomp_mini_m/keymaps/default/keymap.c   |   2 +-
 .../videowriter/keymaps/oleg/keymap.c         |   2 +-
 .../videowriter/keymaps/via/keymap.c          |   2 +-
 .../handwired/z150/keymaps/default/keymap.c   |   2 +-
 .../handwired/z150/keymaps/zyxx/keymap.c      |   2 +-
 keyboards/helix/pico/keymaps/biacco/keymap.c  |   2 +-
 keyboards/hhkb/ansi/keymaps/brett/config.h    |   4 +-
 keyboards/hhkb/rn42/rn42_task.c               |   2 +-
 keyboards/hotdox/keymaps/imchipwood/keymap.c  |   4 +-
 .../hub16/keymaps/ahk_companion/keymap.c      |   2 +-
 keyboards/hub16/keymaps/peepeetee/keymap.c    |   2 +-
 .../model_m_4th_gen/keymaps/default/keymap.c  |   2 +-
 .../idobao/montex/v1/keymaps/default/keymap.c |   4 +-
 .../idobao/montex/v1/keymaps/via/keymap.c     |   4 +-
 .../montex/v1rgb/keymaps/default/keymap.c     |   4 +-
 .../idobao/montex/v1rgb/keymaps/via/keymap.c  |   4 +-
 .../idobao/montex/v2/keymaps/default/keymap.c |   4 +-
 .../idobao/montex/v2/keymaps/via/keymap.c     |   4 +-
 .../ergodox_infinity/keymaps/gordon/keymap.c  |   4 +-
 .../keymaps/halfkeyboard/keymap.c             |  16 +-
 .../keymaps/nordic_ergo/keymap.c              |   2 +-
 .../keymaps/not-quite-neo/keymap.c            |  12 +-
 .../keymaps/rjhilgefort/keymap.c              |   2 +-
 .../whitefox/keymaps/kim-kim/keymap.c         |   2 +-
 .../keymaps/default/keymap.c                  |   2 +-
 .../rabbit_capture_plan/keymaps/via/keymap.c  |   2 +-
 .../suihankey/alpha/keymaps/default/keymap.c  |   2 +-
 .../suihankey/rev1/keymaps/default/keymap.c   |   2 +-
 .../suihankey/split/keymaps/default/keymap.c  |   2 +-
 .../thedogkeyboard/keymaps/default/keymap.c   |   2 +-
 .../thedogkeyboard/keymaps/kakunpc/keymap.c   |   4 +-
 .../kbd67/hotswap/keymaps/zunger/keymap.c     |   2 +-
 .../kbd67/mkiirgb/keymaps/spx01/keymap.c      |   2 +-
 .../kbdfans/kbd6x/keymaps/konstantin/keymap.c |   4 +-
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |   2 +-
 keyboards/keebio/iris/keymaps/ave-63/keymap.c |   2 +-
 keyboards/keebio/iris/keymaps/sq5rix/keymap.c |   4 +-
 .../levinson/keymaps/rossman360/keymap.c      |   2 +-
 .../tragicforce68/keymaps/rossman360/keymap.c |   2 +-
 .../atreus/keymaps/ardumont/keymap.c          |   8 +-
 .../keycapsss/kimiko/keymaps/default/keymap.c |   2 +-
 .../keycapsss/kimiko/keymaps/oriaj3/keymap.c  |   2 +-
 .../keygem/kg60ansi/keymaps/default/keymap.c  |   2 +-
 .../keygem/kg60ansi/keymaps/via/keymap.c      |   2 +-
 .../keyhive/smallice/keymaps/default/keymap.c |   2 +-
 .../keyhive/smallice/keymaps/via/keymap.c     |   2 +-
 keyboards/kin80/keymaps/andrew/keymap.c       |   2 +-
 keyboards/kin80/keymaps/maxim/keymap.c        |   2 +-
 keyboards/kin80/keymaps/quartz64/keymap.c     |   2 +-
 keyboards/kin80/keymaps/roman/keymap.c        |   4 +-
 .../little_foot/keymaps/default/keymap.c      |   4 +-
 .../ropro/keymaps/default/keymap.c            |   4 +-
 .../ropro/keymaps/jdayton3/keymap.c           |   6 +-
 .../wanderland/keymaps/default/keymap.c       |   2 +-
 .../kiwikey/wanderland/keymaps/via/keymap.c   |   2 +-
 keyboards/kona_classic/keymaps/ansi/keymap.c  |   2 +-
 .../kona_classic/keymaps/ansi_arrows/keymap.c |   2 +-
 .../keymaps/ansi_arrows_lcap/keymap.c         |   2 +-
 .../kona_classic/keymaps/ansi_split/keymap.c  |   2 +-
 .../keymaps/ansi_split_arrows/keymap.c        |   2 +-
 .../kona_classic/keymaps/default/keymap.c     |   2 +-
 keyboards/kona_classic/keymaps/iso/keymap.c   |   2 +-
 .../kona_classic/keymaps/iso_arrows/keymap.c  |   2 +-
 .../kona_classic/keymaps/iso_split/keymap.c   |   2 +-
 .../keymaps/iso_split_arrows/keymap.c         |   2 +-
 .../bm68hsrgb/rev1/keymaps/default/keymap.c   |   2 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/keymap.c |   2 +-
 .../bm68hsrgb/rev1/keymaps/via/keymap.c       |   2 +-
 .../kprepublic/cospad/keymaps/detrus/keymap.c |   8 +-
 .../kprepublic/jj40/keymaps/brdlf/keymap.c    |   4 +-
 keyboards/ktec/ergodone/keymaps/art/keymap.c  |   4 +-
 .../labyrinth75/keymaps/default/keymap.c      |   2 +-
 keyboards/labyrinth75/keymaps/via/keymap.c    |   2 +-
 .../latin60rgb/keymaps/default/keymap.c       |   2 +-
 .../latin60rgb/keymaps/via/keymap.c           |   2 +-
 .../lets_split/keymaps/cpeters1982/keymap.c   |   2 +-
 keyboards/lets_split/keymaps/kris/keymap.c    |   6 +-
 keyboards/lets_split/keymaps/piemod/keymap.c  |   4 +-
 keyboards/lets_split/keymaps/pyrol/keymap.c   |   4 +-
 .../lets_split/keymaps/vim-mode/keymap.c      |   2 +-
 keyboards/lily58/keymaps/barabas/keymap.c     |   2 +-
 .../keymaps/bongocat_wpm_responsive/keymap.c  |   2 +-
 keyboards/lily58/keymaps/chuan/keymap.c       |   2 +-
 keyboards/lily58/keymaps/cykedev/keymap.c     |   2 +-
 keyboards/lily58/keymaps/datadavd/keymap.c    |   4 +-
 keyboards/lily58/keymaps/default/keymap.c     |   2 +-
 keyboards/lily58/keymaps/domnantas/keymap.c   |   2 +-
 keyboards/lily58/keymaps/druotoni/keymap.c    |   2 +-
 keyboards/lily58/keymaps/gaston/keymap.c      |   2 +-
 keyboards/lily58/keymaps/hvp/keymap.c         |   2 +-
 keyboards/lily58/keymaps/lily58l/keymap.c     |   2 +-
 .../lily58/keymaps/mikefightsbears/keymap.c   |   2 +-
 keyboards/lily58/keymaps/niolang/keymap.c     |   2 +-
 keyboards/lily58/keymaps/pttbx/keymap.c       |   2 +-
 keyboards/lily58/keymaps/via/keymap.c         |   2 +-
 keyboards/lily58/keymaps/yshrsmz/keymap.c     |   2 +-
 keyboards/lily58/keymaps/yuchi/keymap.c       |   2 +-
 keyboards/lime/keymaps/default/keymap.c       |   4 +-
 .../c39/keymaps/kuchosauronad0/config.h       |   2 +-
 .../minidox/keymaps/alairock/keymap.c         |   2 +-
 .../minidox/keymaps/tw1t611/keymap.c          |   2 +-
 .../massdrop/alt/keymaps/abishalom/keymap.c   |   4 +-
 keyboards/massdrop/alt/keymaps/bonta/keymap.c |   4 +-
 .../alt/keymaps/charlesrocket/keymap.c        |   4 +-
 .../massdrop/alt/keymaps/default/keymap.c     |   4 +-
 .../massdrop/alt/keymaps/default_md/keymap.c  |   4 +-
 .../massdrop/alt/keymaps/ewersp/keymap.c      |   6 +-
 .../massdrop/alt/keymaps/hlmtre/keymap.c      |   4 +-
 keyboards/massdrop/alt/keymaps/mac/keymap.c   |   4 +-
 .../massdrop/alt/keymaps/mac_md/keymap.c      |   4 +-
 .../massdrop/alt/keymaps/reywood/keymap.c     |   4 +-
 .../alt/keymaps/urbanvanilla/keymap.c         |   4 +-
 keyboards/massdrop/alt/keymaps/via/keymap.c   |   4 +-
 .../massdrop/alt/keymaps/xulkal/keymap.c      |   4 +-
 .../massdrop/ctrl/keymaps/default_md/keymap.c |   4 +-
 .../massdrop/ctrl/keymaps/endgame/keymap.c    |   2 +-
 keyboards/massdrop/ctrl/keymaps/mac/keymap.c  |   4 +-
 .../massdrop/ctrl/keymaps/mac_md/keymap.c     |   4 +-
 .../ctrl/keymaps/responsive_pattern/keymap.c  |   4 +-
 .../massdrop/ctrl/keymaps/xanimos/keymap.c    |   2 +-
 .../massdrop/ctrl/keymaps/xanimos/readme.md   |   2 +-
 .../massdrop/ctrl/keymaps/xulkal/keymap.c     |   4 +-
 .../matrix/noah/keymaps/blockader/keymap.c    |  16 +-
 .../matrix/noah/keymaps/default/keymap.c      |   2 +-
 keyboards/matrix/noah/keymaps/iso/keymap.c    |   2 +-
 .../matrix/noah/keymaps/splitspace/keymap.c   |   2 +-
 keyboards/matrix/noah/keymaps/wkl/keymap.c    |   2 +-
 .../mechmini/v2/keymaps/default/keymap.c      |   2 +-
 .../v2/keymaps/lbibass_split_space/keymap.c   |   6 +-
 .../ud_40_ortho/keymaps/default/keymap.c      |   2 +-
 .../ud_40_ortho/keymaps/via/keymap.c          |   2 +-
 keyboards/mino/keymaps/default/keymap.c       |   4 +-
 keyboards/mino/keymaps/via/keymap.c           |   4 +-
 keyboards/mitosis/keymaps/datagrok/keymap.c   |   4 +-
 keyboards/mitosis/keymaps/nzen/keymap.c       |   4 +-
 keyboards/mntre/keymaps/default/keymap.c      |   6 +-
 .../rebound/rev2/keymaps/rossman360/keymap.c  |   2 +-
 .../rebound/rev3/keymaps/rossman360/keymap.c  |   2 +-
 .../rebound/rev4/keymaps/rossman360/keymap.c  |   2 +-
 .../rewind/keymaps/rossman360/keymap.c        |   2 +-
 keyboards/nacly/ua62/keymaps/default/keymap.c |  10 +-
 keyboards/nek_type_a/keymaps/default/keymap.c |   4 +-
 .../hailey/keymaps/default/keymap.c           |   2 +-
 .../hailey/keymaps/via/keymap.c               |   2 +-
 keyboards/noxary/280/keymaps/default/keymap.c |   2 +-
 keyboards/noxary/280/keymaps/via/keymap.c     |   2 +-
 .../ocean/gin_v2/keymaps/default/keymap.c     |   2 +-
 keyboards/ocean/gin_v2/keymaps/via/keymap.c   |   2 +-
 .../ocean/slamz/keymaps/default/keymap.c      |   2 +-
 keyboards/ocean/slamz/keymaps/via/keymap.c    |   2 +-
 keyboards/ocean/yuri/keymaps/default/keymap.c |   2 +-
 keyboards/ocean/yuri/keymaps/via/keymap.c     |   2 +-
 keyboards/om60/keymaps/default/keymap.c       |   2 +-
 keyboards/om60/keymaps/via/keymap.c           |   2 +-
 keyboards/orthodox/keymaps/drashna/config.h   |   2 +-
 keyboards/orthodox/rev1/config.h              |   2 +-
 keyboards/orthodox/rev3/config.h              |   2 +-
 keyboards/orthodox/rev3_teensy/config.h       |   2 +-
 .../palette1202/keymaps/default/keymap.c      |   4 +-
 .../planck/keymaps/charlesrocket/keymap.c     |   4 +-
 keyboards/planck/keymaps/dc/keymap.c          |   2 +-
 keyboards/planck/keymaps/gitdrik/keymap.c     |   2 +-
 keyboards/planck/keymaps/johannes/keymap.c    |   4 +-
 keyboards/planck/keymaps/matrixman/keymap.c   |   2 +-
 keyboards/planck/keymaps/myoung34/keymap.c    |   2 +-
 keyboards/planck/keymaps/navi/keymap.c        |   4 +-
 .../planck/keymaps/not-quite-neo/keymap.c     |   4 +-
 keyboards/planck/keymaps/orthodeluxe/keymap.c |   6 +-
 keyboards/planck/keymaps/oryx/keymap.c        |   4 +-
 keyboards/planck/keymaps/pickle_jr/keymap.c   |   2 +-
 keyboards/planck/keymaps/piemod/keymap.c      |   4 +-
 .../planck/keymaps/prog_qgmlwb/src/normal.h   |   2 +-
 .../planck/keymaps/roguepullrequest/keymap.c  |   4 +-
 keyboards/planck/keymaps/rootiest/keymap.c    |   2 +-
 keyboards/planck/keymaps/tylerwince/keymap.c  |   4 +-
 keyboards/planck/keymaps/xjtian/keymap.c      |   6 +-
 .../keymaps/zach/zach_common_functions.c      |   4 +-
 .../tnln95/keymaps/default/keymap.c           |   4 +-
 .../tnln95/keymaps/default_ansi/keymap.c      |   4 +-
 keyboards/preonic/keymaps/AlexDaigre/keymap.c |   8 +-
 keyboards/preonic/keymaps/mverteuil/keymap.c  |   4 +-
 .../preonic/keymaps/mverteuil_2x2u/keymap.c   |   2 +-
 .../keymaps/zach/zach_common_functions.c      |   4 +-
 .../relic/keymaps/default/keymap.c            |   6 +-
 .../vault45/keymaps/default/keymap.c          |   2 +-
 .../qpockets/wanten/keymaps/2u_bars/keymap.c  |   2 +-
 .../qpockets/wanten/keymaps/625_bar/keymap.c  |   2 +-
 .../qpockets/wanten/keymaps/default/keymap.c  |   2 +-
 .../rate/pistachio/keymaps/rate/keymap.c      |   2 +-
 keyboards/rate/pistachio/keymaps/via/keymap.c |   2 +-
 .../pistachio_pro/keymaps/default/keymap.c    |   2 +-
 .../rate/pistachio_pro/keymaps/rate/keymap.c  |   2 +-
 .../rate/pistachio_pro/keymaps/via/keymap.c   |   2 +-
 .../cocoa40/keymaps/default/keymap.c          |   4 +-
 keyboards/redox_w/keymaps/danielo515/keymap.c |   2 +-
 .../rgbkb/sol/keymaps/danielhklein/keymap.c   |   4 +-
 .../rgbkb/zygomorph/keymaps/5x6pad/keymap.c   |   2 +-
 keyboards/ristretto/keymaps/default/keymap.c  |   2 +-
 .../7skb/keymaps/default/keymap.c             |   2 +-
 .../7skb/keymaps/salicylic/keymap.c           |   2 +-
 .../salicylic_acid3/7skb/keymaps/via/keymap.c |   2 +-
 .../7splus/keymaps/default/keymap.c           |   2 +-
 .../7splus/keymaps/salicylic/keymap.c         |   2 +-
 .../7splus/keymaps/via/keymap.c               |   2 +-
 .../ajisai74/keymaps/default/keymap.c         |   2 +-
 .../ajisai74/keymaps/jis/keymap.c             |   2 +-
 .../ajisai74/keymaps/salicylic/keymap.c       |   2 +-
 .../ajisai74/keymaps/via/keymap.c             |   2 +-
 .../ergoarrows/keymaps/default/keymap.c       |   2 +-
 .../ergoarrows/keymaps/salicylic/keymap.c     |   2 +-
 .../ergoarrows/keymaps/via/keymap.c           |   2 +-
 .../jisplit89/keymaps/default/keymap.c        |   2 +-
 .../jisplit89/keymaps/salicylic/keymap.c      |   2 +-
 .../jisplit89/keymaps/via/keymap.c            |   2 +-
 .../naked48/keymaps/default/keymap.c          |   2 +-
 .../keymaps/default_with_nafuda/keymap.c      |   6 +-
 .../keymaps/default_with_setta21/keymap.c     |   2 +-
 .../naked48/keymaps/salicylic/keymap.c        |   4 +-
 .../keymaps/salicylic_with_nafuda/keymap.c    |   8 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |   4 +-
 .../naked48/keymaps/scheiklp/keymap.c         |   8 +-
 .../naked48/keymaps/via/keymap.c              |   2 +-
 .../naked48/keymaps/via_rgb_matrix/keymap.c   |   2 +-
 .../naked60/keymaps/default/keymap.c          |   4 +-
 .../keymaps/default_with_nafuda/keymap.c      |   4 +-
 .../keymaps/default_with_setta21/keymap.c     |   4 +-
 .../naked60/keymaps/salicylic/keymap.c        |   4 +-
 .../keymaps/salicylic_with_nafuda/keymap.c    |   4 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |   4 +-
 .../naked60/keymaps/via/keymap.c              |   4 +-
 .../naked64/keymaps/default/keymap.c          |   2 +-
 .../naked64/keymaps/salicylic/keymap.c        |   2 +-
 .../keymaps/salicylic_with_setta21/keymap.c   |   2 +-
 .../nknl7en/keymaps/default/keymap.c          |   2 +-
 .../nknl7en/keymaps/salicylic/keymap.c        |   2 +-
 .../nknl7en/keymaps/via/keymap.c              |   2 +-
 .../nknl7jp/keymaps/default/keymap.c          |   2 +-
 .../nknl7jp/keymaps/salicylic/keymap.c        |   2 +-
 .../nknl7jp/keymaps/via/keymap.c              |   2 +-
 keyboards/satt/comet46/config.h               |   4 +-
 .../signum/3_0/keymaps/sgurenkov/keymap.c     |   2 +-
 .../silverbullet44/keymaps/default/keymap.c   |   2 +-
 .../keymaps/60_ansi_split_bs_shift/keymap.c   |   2 +-
 keyboards/smk60/keymaps/60_hhkb/keymap.c      |   2 +-
 keyboards/smk60/keymaps/60_wkl/keymap.c       |   2 +-
 .../smk60/keymaps/60_wkl_split_bs/keymap.c    |   2 +-
 keyboards/sofle/keymaps/default/keymap.c      |   4 +-
 keyboards/sofle/keymaps/devdev/keymap.c       |   4 +-
 keyboards/sofle/keymaps/flare576/keymap.c     |   4 +-
 keyboards/sofle/keymaps/foureight84/keymap.c  |   6 +-
 keyboards/sofle/keymaps/helltm/keymap.c       |   4 +-
 .../sofle/keymaps/j4ckofalltrades/keymap.c    |   2 +-
 keyboards/sofle/keymaps/keyhive_via/keymap.c  |   6 +-
 keyboards/sofle/keymaps/killmaster/keymap.c   |   2 +-
 keyboards/sofle/keymaps/michal/keymap.c       |   4 +-
 keyboards/sofle/keymaps/noqmk/keymap.c        |   8 +-
 keyboards/sofle/keymaps/rgb_default/keymap.c  |   4 +-
 keyboards/sofle/keymaps/via/keymap.c          |   4 +-
 .../sowbug/68keys/keymaps/default/keymap.c    |   2 +-
 keyboards/sparrow62/keymaps/default/keymap.c  |   2 +-
 keyboards/sparrow62/keymaps/via/keymap.c      |   2 +-
 .../splitkb/kyria/keymaps/mattir2/keymap.c    |   2 +-
 .../galatea/keymaps/default/keymap.c          |   2 +-
 .../studiokestra/galatea/keymaps/via/keymap.c |   2 +-
 keyboards/tada68/keymaps/abishalom/keymap.c   |   2 +-
 keyboards/tada68/keymaps/cheese/keymap.c      |   2 +-
 keyboards/tada68/keymaps/devinceble/keymap.c  |   2 +-
 keyboards/tada68/keymaps/dlg/keymap.c         |   2 +-
 keyboards/tada68/keymaps/emdarcher/keymap.c   |   2 +-
 keyboards/tada68/keymaps/fezzant/keymap.c     |   2 +-
 keyboards/tada68/keymaps/laas/keymap.c        |   2 +-
 keyboards/tada68/keymaps/pascamel/keymap.c    |   2 +-
 keyboards/tada68/keymaps/raylas/keymap.c      |   2 +-
 keyboards/tada68/keymaps/rbong/keymap.c       |   2 +-
 keyboards/tada68/keymaps/rgb/keymap.c         |   2 +-
 keyboards/tada68/keymaps/shalzz/keymap.c      |   2 +-
 .../tada68/keymaps/stephengrier/keymap.c      |   2 +-
 keyboards/tada68/keymaps/trashcat/keymap.c    |   6 +-
 keyboards/tada68/keymaps/tshack/keymap.c      |   2 +-
 keyboards/tada68/keymaps/unix/keymap.c        |   2 +-
 .../hecomi/keymaps/default/keymap.c           |   6 +-
 .../hecomi/keymaps/kakunpc/keymap.c           |   4 +-
 .../otaku_split/rev0/keymaps/default/keymap.c |   4 +-
 .../otaku_split/rev0/keymaps/sample/keymap.c  |   4 +-
 .../otaku_split/rev1/keymaps/default/keymap.c |   8 +-
 .../otaku_split/rev1/keymaps/sample/keymap.c  |   4 +-
 .../schwann/keymaps/default/keymap.c          |   2 +-
 .../bananasplit/keymaps/rask/keymap.c         |   2 +-
 .../minivan/keymaps/josjoha/unicode_macros.c  |   2 +-
 .../minivan/keymaps/tong92/keymap.c           |   2 +-
 .../tkw/grandiceps/keymaps/default/keymap.c   |   4 +-
 keyboards/tmo50/keymaps/pyrol/keymap.c        |   4 +-
 .../m122_3270/keymaps/default/keymap.c        |   4 +-
 .../launch_pad/keymaps/warzone/keymap.c       |   2 +-
 .../keymaps/default/keymap.c                  |   2 +-
 .../keymaps/default/keymap.c                  |   2 +-
 .../unicomp/pc122/keymaps/default/keymap.c    |   2 +-
 .../unicomp/pc122/keymaps/pc3270/keymap.c     |   2 +-
 .../unicomp/pc122/keymaps/ps2_5250/keymap.c   |   4 +-
 .../unicomp/pc122/keymaps/usb_5250/keymap.c   |   2 +-
 .../keymaps/default/keymap.c                  |   4 +-
 .../keymaps/default/keymap.c                  |   4 +-
 .../keymaps/default/keymap.c                  |   2 +-
 .../vitamins_included/keymaps/via/keymap.c    |   2 +-
 .../aanzee/keymaps/default/keymap.c           |   2 +-
 .../aanzee/keymaps/iso-default/keymap.c       |   2 +-
 .../westfoxtrot/aanzee/keymaps/via/keymap.c   |   2 +-
 .../cypher/rev1/keymaps/default/keymap.c      |   2 +-
 .../cypher/rev1/keymaps/default_iso/keymap.c  |   2 +-
 .../cypher/rev5/keymaps/default_iso/keymap.c  |   2 +-
 .../prophet/keymaps/default/keymap.c          |   2 +-
 .../westfoxtrot/prophet/keymaps/via/keymap.c  |   2 +-
 keyboards/whale/sk/keymaps/default/keymap.c   |   4 +-
 keyboards/wolf/sabre/keymaps/default/keymap.c |   2 +-
 keyboards/wolf/sabre/keymaps/via/keymap.c     |   2 +-
 .../scarletbandana/keymaps/default/keymap.c   |   2 +-
 .../ikki68_aurora/keymaps/ewersp/keymap.c     |   2 +-
 keyboards/xiudi/xd60/keymaps/Jos/keymap.c     |   6 +-
 keyboards/xiudi/xd60/keymaps/edulpn/keymap.c  |   2 +-
 .../xiudi/xd60/keymaps/edulpn64/keymap.c      |   2 +-
 .../xiudi/xd60/keymaps/supercoffee/keymap.c   |   2 +-
 keyboards/xiudi/xd75/keymaps/raoeus/keymap.c  |   2 +-
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |   8 +-
 keyboards/ydkb/yd68/keymaps/default/keymap.c  |   2 +-
 .../ymdk/melody96/keymaps/zunger/keymap.c     |   4 +-
 keyboards/yosino58/keymaps/default/keymap.c   |   2 +-
 keyboards/yosino58/keymaps/sakura/keymap.c    |   2 +-
 layouts/community/66_ansi/xyverz/keymap.c     |   2 +-
 layouts/community/ergodox/adnw_p_u_q/keymap.c |   4 +-
 layouts/community/ergodox/belak/keymap.c      |   4 +-
 layouts/community/ergodox/bepo_alt/keymap.c   |   8 +-
 layouts/community/ergodox/dave/keymap.c       |   2 +-
 .../ergodox/dvorak_svorak_a5/keymap.c         |   6 +-
 .../community/ergodox/emacs_osx_dk/keymap.c   |   4 +-
 .../community/ergodox/german-kinergo/keymap.c |   4 +-
 .../community/ergodox/german-lukas/keymap.c   |   4 +-
 layouts/community/ergodox/haegin/keymap.c     |   4 +-
 layouts/community/ergodox/issmirnov/keymap.c  |   2 +-
 layouts/community/ergodox/jacobono/keymap.c   |   4 +-
 .../community/ergodox/mclennon_osx/keymap.c   |   6 +-
 layouts/community/ergodox/osx_neo2/keymap.c   |  34 ++--
 .../ergodox/qwerty_code_friendly/keymap.c     |   4 +-
 .../romanzolotarev-norman-osx/keymap.c        |   2 +-
 layouts/community/ergodox/siroken3/keymap.c   |   2 +-
 .../community/ergodox/swedish-lindhe/keymap.c |   2 +-
 .../twentylives_dvorak_with_hebrew/keymap.c   |   6 +-
 .../community/ortho_4x12/ajp10304/keymap.c    |  10 +-
 .../community/ortho_4x12/bredfield/keymap.c   |   2 +-
 .../community/planck_mit/guidoism/keys.json   |   8 +-
 quantum/keycode.h                             |   2 -
 quantum/keycode_legacy.h                      |  10 -
 users/alfrdmalr/alfrdmalr.h                   |   2 +-
 users/art/funcs/string_funcs.c                |   6 +-
 users/brandonschlack/process_records.c        |   4 +-
 users/d4mation/tap-dance.c                    |   2 +-
 users/datagrok/feature_cdeq.c                 |   2 +-
 .../feature_default_layers_selector.c         |   2 +-
 users/doogle999/doogle999.h                   |   2 +-
 users/drashna/oled/oled_stuff.c               |   4 +-
 users/gordon/gordon.c                         |  12 +-
 users/issmirnov/rows.h                        |   2 +-
 users/miles2go/milestogo.h                    |   4 +-
 users/moults31/obs.c                          |   4 +-
 users/pcoves/tapDance.c                       |   4 +-
 users/sethBarberee/tap_dance.c                |   4 +-
 users/sigul/sigul.c                           |  10 +-
 users/twschum/twschum.c                       |   2 +-
 users/twschum/xtonhasvim.c                    |  42 ++---
 users/wanleg/tapdances.c                      |   4 +-
 users/xtonhasvim/xtonhasvim.c                 |  50 ++---
 users/zer09/tap_dance.c                       |   8 +-
 553 files changed, 1139 insertions(+), 1151 deletions(-)
 delete mode 100644 quantum/keycode_legacy.h

diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c
index bb0d10405c..f78af99bf6 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
     KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT,
-    KC_LSHIFT, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT, KC_RSHIFT,
+    KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,
     KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
 
 /*
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
index f3ccfb2ef7..b8d3b5ed96 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
@@ -20,8 +20,8 @@ enum layers {
 #define RGB MO(_rgb)
 
 // define mod masks for making multi-key macros
-#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))
+#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL))
 #define MODS_ALT_MASK  (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT))
 
 //********************************** Layers **********************************//
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
index 1bfe4e9b2a..05ec42835a 100644
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [5] = LAYOUT_ortho_4x4(
                 RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
                 RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSHIFT,
+                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSFT,
                 KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/3w6/keymaps/helltm/keymap.c b/keyboards/3w6/keymaps/helltm/keymap.c
index 83ac6f02de..a87c7c75a9 100644
--- a/keyboards/3w6/keymaps/helltm/keymap.c
+++ b/keyboards/3w6/keymaps/helltm/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_Q,         KC_W   , KC_E   , KC_R   , KC_T   ,                                    KC_Y   , KC_U   , KC_I   , KC_O   , KC_P           ,
         KC_A,         KC_S   , KC_D   , KC_F   , KC_G   ,                                    KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN        ,
         LSFT_T(KC_Z), KC_X   , KC_C   , KC_V   , KC_B   ,                                    KC_N   , KC_M   , KC_COMM, KC_DOT , RSFT_T(KC_SLSH),
-                                LT(_NUM, KC_LGUI), KC_LCTRL, KC_ENT,       KC_SPC, LT(_NAV, KC_BSPC), LT(_SYM, KC_DEL)
+                                LT(_NUM, KC_LGUI), KC_LCTL,  KC_ENT,       KC_SPC, LT(_NAV, KC_BSPC), LT(_SYM, KC_DEL)
     ),
 
     /*
diff --git a/keyboards/4pplet/bootleg/keymaps/default/keymap.c b/keyboards/4pplet/bootleg/keymaps/default/keymap.c
index 69f433eb67..2e19443054 100644
--- a/keyboards/4pplet/bootleg/keymaps/default/keymap.c
+++ b/keyboards/4pplet/bootleg/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ 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_NO, KC_BSPC,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-  KC_LCTRL, KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,          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_ENT,  
   KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,
   KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
 // basic function layer
diff --git a/keyboards/4pplet/bootleg/keymaps/via/keymap.c b/keyboards/4pplet/bootleg/keymaps/via/keymap.c
index b225beb190..3a095c1d10 100644
--- a/keyboards/4pplet/bootleg/keymaps/via/keymap.c
+++ b/keyboards/4pplet/bootleg/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ 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_NO, KC_BSPC,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-  KC_LCTRL, KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,          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_ENT,  
   KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,
   KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
 // basic function layer
diff --git a/keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c b/keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c
index d7d2cbc2d2..bafdeed53e 100644
--- a/keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c
+++ b/keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ 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_LCTRL, 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_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, MO(1),
   KC_LCTL,  KC_LGUI,  KC_LALT,                           KC_SPC,                                 KC_NO,      KC_RALT, KC_RGUI, MO(1)),
   // basic function layer
diff --git a/keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c b/keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c
index 88e58b5588..ebd478053a 100644
--- a/keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c
+++ b/keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ 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_LCTRL, 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_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, MO(1),
   KC_LCTL,  KC_LGUI,  KC_LALT,                           KC_SPC,                                 KC_NO,      KC_RALT, KC_RGUI, MO(1)),
 // basic function layer
diff --git a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
index 27f6a04994..98ec3860a0 100644
--- a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
@@ -7,14 +7,14 @@ 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_BSPC,   
   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_LSPO, 	KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_RSPC, MO(2), 
-  KC_LCTL, 	KC_LGUI, KC_NO,  KC_LALT, KC_RALT, MO(2),  KC_SPC, KC_RALT, KC_RGUI, KC_NO,   KC_APP,  KC_RCTRL),
+  KC_LCTL, 	KC_LGUI, KC_NO,  KC_LALT, KC_RALT, MO(2),  KC_SPC, KC_RALT, KC_RGUI, KC_NO,   KC_APP,  KC_RCTL),
 
 [1] = LAYOUT_all(
   KC_GESC, KC_1,    KC_2,   KC_3,     KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_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_LCTRL, 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_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_LSPO, KC_NO, 	KC_Z,   KC_X,     KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_RSPC, MO(2), 
-  KC_LCTL, KC_LGUI, KC_NO,  KC_LALT,	KC_RALT, MO(2),  KC_SPC, KC_RALT,	KC_RGUI, KC_NO,   KC_APP,  KC_RCTRL),
+  KC_LCTL, KC_LGUI, KC_NO,  KC_LALT,	KC_RALT, MO(2),  KC_SPC, KC_RALT,	KC_RGUI, KC_NO,   KC_APP,  KC_RCTL),
 
 [2] = LAYOUT_all(
   KC_EXEC, KC_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, _______, 
diff --git a/keyboards/4pplet/steezy60/keymaps/default/keymap.c b/keyboards/4pplet/steezy60/keymaps/default/keymap.c
index b926d436db..530728c225 100644
--- a/keyboards/4pplet/steezy60/keymaps/default/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/default/keymap.c
@@ -5,7 +5,7 @@ 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_NO,  KC_BSPC,
   KC_TAB,  	KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-  KC_LCTRL, 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_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_NO, KC_RSFT,  KC_NO,
   KC_LCTL, 	KC_LGUI, KC_NO,  KC_LALT, KC_NO,   KC_SPC, KC_NO, 			    KC_RALT, KC_RGUI, KC_NO,   KC_APP,  MO(1)),
 
diff --git a/keyboards/4pplet/steezy60/keymaps/via/keymap.c b/keyboards/4pplet/steezy60/keymaps/via/keymap.c
index bcd170fe18..6a0e760582 100644
--- a/keyboards/4pplet/steezy60/keymaps/via/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/via/keymap.c
@@ -5,7 +5,7 @@ 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_NO,  KC_BSPC,
   KC_TAB,  	KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-  KC_LCTRL, 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_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_NO, KC_RSFT,  KC_NO,
   KC_LCTL, 	KC_LGUI, KC_NO,  KC_LALT, KC_NO,   KC_SPC, KC_NO, 			    KC_RALT, KC_RGUI, KC_NO,   KC_APP,  MO(1)),
 
diff --git a/keyboards/abacus/keymaps/default/keymap.json b/keyboards/abacus/keymaps/default/keymap.json
index 3409843c8f..87cb8831dd 100644
--- a/keyboards/abacus/keymaps/default/keymap.json
+++ b/keyboards/abacus/keymaps/default/keymap.json
@@ -3,7 +3,7 @@
   "keymap": "default",
   "layout": "LAYOUT",
   "layers": [
-    ["KC_ESCAPE", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC", "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_BSLS", "KC_LSHIFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_UP", "KC_DELETE", "KC_LCTRL", "KC_LGUI", "MO(1)", "KC_SPACE", "KC_ENTER", "MO(2)", "KC_LEFT", "KC_DOWN", "KC_RIGHT"],
+    ["KC_ESCAPE", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC", "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_BSLS", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_UP", "KC_DELETE", "KC_LCTL", "KC_LGUI", "MO(1)", "KC_SPACE", "KC_ENTER", "MO(2)", "KC_LEFT", "KC_DOWN", "KC_RIGHT"],
     ["KC_GRAVE", "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_LBRC", "KC_RBRC", "KC_QUOTE", "KC_SLASH", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MINUS", "KC_EQUAL", "KC_TRNS", "KC_TRNS", "KC_LALT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_END"],
     ["KC_GRV", "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", "RGB_MODE_PLAIN", "RGB_MODE_BREATHE", "RGB_MODE_RAINBOW", "RGB_MODE_SWIRL", "RGB_MODE_SNAKE", "RGB_MODE_KNIGHT", "RGB_MODE_GRADIENT", "KC_NO", "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUI", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]
   ]
diff --git a/keyboards/abacus/keymaps/unicodemap/keymap.c b/keyboards/abacus/keymaps/unicodemap/keymap.c
index fc8d4032ad..95f343b33c 100644
--- a/keyboards/abacus/keymaps/unicodemap/keymap.c
+++ b/keyboards/abacus/keymaps/unicodemap/keymap.c
@@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
         KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_BSLS,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE,
-        KC_LCTRL, KC_LGUI, MO(_UPPER), KC_SPACE, KC_ENTER, MO(_LOWER), KC_LEFT, KC_DOWN, KC_RIGHT
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE,
+        KC_LCTL, KC_LGUI, MO(_UPPER), KC_SPACE, KC_ENTER, MO(_LOWER), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_UPPER] = LAYOUT(
         KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
diff --git a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
index a2548a7dc2..2070908b8d 100644
--- a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_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_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL
     ),
 
     [1] = LAYOUT_60_ansi(
diff --git a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
index 4e27dc6492..e8433ab6ca 100644
--- a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
@@ -22,7 +22,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_ENT,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL
     ),
 
     [1] = LAYOUT_60_iso(
diff --git a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
index 3c3a84d2d0..f9ae5253cc 100644
--- a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
@@ -22,7 +22,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_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_CAPS,  KC_LGUI,  KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTRL
+        KC_CAPS,  KC_LGUI,  KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
     ),
 
     [1] = LAYOUT_60_tsangan(
diff --git a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
index 525b4cbc0b..c9b7b95306 100644
--- a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
-        KC_LCTL,  KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RCTRL,KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL,  KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_60_utilitarian(
diff --git a/keyboards/acekeyboard/titan60/keymaps/via/keymap.c b/keyboards/acekeyboard/titan60/keymaps/via/keymap.c
index f6296cc823..687e5f4ea8 100644
--- a/keyboards/acekeyboard/titan60/keymaps/via/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
          KC_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_RCTRL
+         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL
      ),
 
      [1] = LAYOUT_60_ansi(
diff --git a/keyboards/acheron/elongate/beta/keymaps/default/keymap.c b/keyboards/acheron/elongate/beta/keymaps/default/keymap.c
index 67429c4816..c1c6dad6b6 100644
--- a/keyboards/acheron/elongate/beta/keymaps/default/keymap.c
+++ b/keyboards/acheron/elongate/beta/keymaps/default/keymap.c
@@ -19,11 +19,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT( /* Base */
     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_P7,    KC_P8,   KC_P9,
     KC_SCRL,  KC_A,    KC_S,    KC_D,    KC_F,            KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER,   KC_P4,    KC_P5,   KC_P6,
-    KC_LSHIFT,         KC_Z,    KC_X,    KC_C,            KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,      KC_P1,    KC_P2,   KC_P3,
-    KC_LCTRL, KC_LWIN, KC_LALT,          LT(2, KC_SPACE),                   KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,    KC_RIGHT, KC_P0,   KC_DOT),
+    KC_LSFT,           KC_Z,    KC_X,    KC_C,            KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,      KC_P1,    KC_P2,   KC_P3,
+    KC_LCTL,  KC_LWIN, KC_LALT,          LT(2, KC_SPACE),                   KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,    KC_RIGHT, KC_P0,   KC_DOT),
 [1] = LAYOUT( /* Base */
     KC_F1,    KC_F2,   KC_F2,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,    KC_NUM,  KC_SCRL, KC_CAPS,
-    KC_1,     KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,              KC_RSHIFT, 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_RSFT,   KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP,   KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,                           KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN,   KC_END , KC_TRNS, KC_TRNS),
 [2] = LAYOUT( /* Base */                                    
diff --git a/keyboards/acheron/elongate/beta/keymaps/via/keymap.c b/keyboards/acheron/elongate/beta/keymaps/via/keymap.c
index 67429c4816..c1c6dad6b6 100644
--- a/keyboards/acheron/elongate/beta/keymaps/via/keymap.c
+++ b/keyboards/acheron/elongate/beta/keymaps/via/keymap.c
@@ -19,11 +19,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT( /* Base */
     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_P7,    KC_P8,   KC_P9,
     KC_SCRL,  KC_A,    KC_S,    KC_D,    KC_F,            KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER,   KC_P4,    KC_P5,   KC_P6,
-    KC_LSHIFT,         KC_Z,    KC_X,    KC_C,            KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,      KC_P1,    KC_P2,   KC_P3,
-    KC_LCTRL, KC_LWIN, KC_LALT,          LT(2, KC_SPACE),                   KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,    KC_RIGHT, KC_P0,   KC_DOT),
+    KC_LSFT,           KC_Z,    KC_X,    KC_C,            KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,      KC_P1,    KC_P2,   KC_P3,
+    KC_LCTL,  KC_LWIN, KC_LALT,          LT(2, KC_SPACE),                   KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,    KC_RIGHT, KC_P0,   KC_DOT),
 [1] = LAYOUT( /* Base */
     KC_F1,    KC_F2,   KC_F2,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,    KC_NUM,  KC_SCRL, KC_CAPS,
-    KC_1,     KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,              KC_RSHIFT, 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_RSFT,   KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP,   KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,                           KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN,   KC_END , KC_TRNS, KC_TRNS),
 [2] = LAYOUT( /* Base */                                    
diff --git a/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
index 815ac2a681..9f82b49558 100644
--- a/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_E,   KC_D,   KC_C,      KC_LGUI, \
     KC_W,   KC_S,   KC_X,      KC_LALT, \
     KC_Q,   KC_A,   KC_Z,      KC_LCTL, \
-    KC_TAB, KC_ESC, KC_LSHIFT, MO(1)
+    KC_TAB, KC_ESC, KC_LSFT,   MO(1)
   ),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c b/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c
index 6a48a3102f..5318b16df5 100644
--- a/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c
+++ b/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 //
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //button closest to usb is first
   [0] = LAYOUT_ortho_1x5(
-     KC_ESC, KC_TAB, KC_LSHIFT, KC_LCTRL, TG(1)
+     KC_ESC, KC_TAB, KC_LSFT, KC_LCTL, TG(1)
    ),
 
   [1] = LAYOUT_ortho_1x5(
diff --git a/keyboards/arrayperipherals/1x4p1/keymaps/via/keymap.c b/keyboards/arrayperipherals/1x4p1/keymaps/via/keymap.c
index 87739b377e..816b17844c 100644
--- a/keyboards/arrayperipherals/1x4p1/keymaps/via/keymap.c
+++ b/keyboards/arrayperipherals/1x4p1/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 //
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //button closest to usb is first
   [0] = LAYOUT_ortho_1x5(
-     KC_ESC, KC_TAB, KC_LSHIFT, KC_LCTRL, TG(1)
+     KC_ESC, KC_TAB, KC_LSFT, KC_LCTL, TG(1)
    ),
 
   [1] = LAYOUT_ortho_1x5(
diff --git a/keyboards/atreyu/keymaps/default/keymap.c b/keyboards/atreyu/keymaps/default/keymap.c
index f6e15d26cb..70da748859 100644
--- a/keyboards/atreyu/keymaps/default/keymap.c
+++ b/keyboards/atreyu/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
      KC_ESC  , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0    ,KC_GRV  ,
      KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                   KC_Y   , KC_U   , KC_I   , KC_O   , KC_P    ,KC_BSPC ,
-     KC_LCTRL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                   KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN ,KC_QUOT ,
+     KC_LCTL , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                   KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN ,KC_QUOT ,
      KC_LSFT , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,                   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH ,KC_RSFT ,
      KC_LCTL,           LWR    , KC_LALT, KC_LGUI, KC_ENT , KC_LBRC, KC_RBRC, KC_SPC , RSE    , KC_NO  ,  KC_NO ,          KC_RCTL 
                 
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c
index f197c3a076..b700976dc9 100644
--- a/keyboards/bajjak/keymaps/5x6/keymap.c
+++ b/keyboards/bajjak/keymaps/5x6/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,     KC_Q,           KC_W,               KC_E,       KC_R,       KC_T,       XXXXXXX,        XXXXXXX,  KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_BSLS,
     KC_CAPS,    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_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_RSFT,
-    KC_LCTRL,   GUI_T(KC_GRV),  ALT_T(KC_BSLS),     KC_LEFT,    KC_RGHT,                                                      KC_UP,      KC_DOWN,    KC_LBRC,    KC_RBRC,    DF(SYMB),
+    KC_LCTL,    GUI_T(KC_GRV),  ALT_T(KC_BSLS),     KC_LEFT,    KC_RGHT,                                                      KC_UP,      KC_DOWN,    KC_LBRC,    KC_RBRC,    DF(SYMB),
                                                                          CTL_T(KC_ESC), KC_LALT,        KC_RGUI, CTL_T(KC_LNG1),
                                                                                         KC_HOME,        KC_PGUP,
                                                                         KC_BSPC, KC_DEL, KC_END,        KC_PGDN, KC_ENT, KC_SPC
diff --git a/keyboards/bajjak/keymaps/default/keymap.c b/keyboards/bajjak/keymaps/default/keymap.c
index 1a2ea06d4f..4e2a7e055c 100644
--- a/keyboards/bajjak/keymaps/default/keymap.c
+++ b/keyboards/bajjak/keymaps/default/keymap.c
@@ -59,7 +59,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_BSLS,
     KC_CAPS,    KC_A,              KC_S,              KC_D,       KC_F,       KC_G,       TG(MDIA),       TG(SYMB),   KC_H,       KC_J,       KC_K,       KC_L,       KC_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_LCTRL,   GUI_T(KC_GRV),     ALT_T(KC_BSLS),    KC_LEFT,    KC_RGHT,                                                        KC_UP,      KC_DOWN,    KC_LBRC,    KC_RBRC,    TT(SYMB),
+    KC_LCTL,    GUI_T(KC_GRV),     ALT_T(KC_BSLS),    KC_LEFT,    KC_RGHT,                                                        KC_UP,      KC_DOWN,    KC_LBRC,    KC_RBRC,    TT(SYMB),
                                                                              CTL_T(KC_ESC), KC_LALT,      KC_RGUI, CTL_T(KC_RALT),
                                                                                             KC_HOME,      KC_PGUP,
                                                                             KC_BSPC, KC_DEL, KC_END,      KC_PGDN, KC_ENT, KC_SPC
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,     KC_EXLM,    KC_AT,              KC_LCBR,    KC_RCBR,    KC_PIPE,    _______,        _______,    _______,    KC_P7 ,     KC_P8 ,     KC_P9,      KC_MINS,    KC_SCRL,
     KC_CAPS,    KC_HASH,    KC_DLR,             KC_LPRN,    KC_RPRN,    KC_GRV,     _______,        _______,    _______,    KC_P4 ,     KC_P5 ,     KC_P6,      KC_PLUS,    KC_PAUS,
     KC_LSFT,    KC_PERC,    KC_CIRC,            KC_LBRC,    KC_RBRC,    KC_TILD,                                _______,    KC_P1 ,     KC_P2 ,     KC_P3,      KC_PENT,    KC_RSFT,
-    KC_LCTRL,   KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                        KC_UP,      KC_DOWN,    KC_PDOT,    KC_P0,      _______,
+    KC_LCTL,    KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                        KC_UP,      KC_DOWN,    KC_PDOT,    KC_P0,      _______,
                                                                      CTL_T(KC_ESC), KC_LALT,       KC_RGUI, CTL_T(KC_RALT),
                                                                                     KC_HOME,       KC_PGUP,
                                                                     KC_BSPC, KC_DEL, KC_END,       KC_PGDN, KC_ENT, KC_SPC
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,     _______,    KC_BTN1,            KC_MS_U,    KC_BTN2,      KC_WH_U,      _______,       _______,     _______,      _______,      _______,    _______,    _______,    _______,
     KC_CAPS,    _______,    KC_MS_L,            KC_MS_D,    KC_MS_R,      KC_WH_D,      _______,       _______,     _______,      _______,      _______,    _______,    _______,    _______,
     KC_LSFT,    _______,    KC_WH_L,            _______,    KC_WH_R,      _______,                                  _______,      _______,      _______,    _______,    _______,    _______,
-    KC_LCTRL,   KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                              KC_UP,        KC_DOWN,    _______,    _______,    QK_BOOT,
+    KC_LCTL,    KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                              KC_UP,        KC_DOWN,    _______,    _______,    QK_BOOT,
                                                                  CTL_T(KC_ESC), KC_LALT,       KC_RGUI, CTL_T(KC_RALT),
                                                                                 KC_HOME,       KC_PGUP,
                                                                 KC_BSPC, KC_DEL, KC_END,       KC_PGDN, KC_ENT, KC_SPC
diff --git a/keyboards/beatervan/keymaps/via/keymap.c b/keyboards/beatervan/keymaps/via/keymap.c
index 938f903076..99b2f17507 100644
--- a/keyboards/beatervan/keymaps/via/keymap.c
+++ b/keyboards/beatervan/keymaps/via/keymap.c
@@ -22,7 +22,7 @@
          KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
          KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENTER,
          KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-         KC_LCTRL, KC_LGUI, KC_LALT,      KC_SPC, KC_TAB,            KC_RALT, KC_RGUI, KC_RCTL
+         KC_LCTL, KC_LGUI, KC_LALT,      KC_SPC, KC_TAB,            KC_RALT, KC_RGUI, KC_RCTL
      ),
      /* Num Layer */
      [1] = LAYOUT(
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
index be24bce099..1009cf9cd0 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
   KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
   KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
-  KC_LCTRL, KC_LGUI, KC_APP, TG(BIAC),LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
+  KC_LCTL,  KC_LGUI, KC_APP, TG(BIAC),LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
 ),
 
 /* META
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
   KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
-  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
+  KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
 ),
 
 /* BIAC
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_SCLN,KC_COMM, KC_DOT,  KC_P,             KC_Q,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_G,    KC_D,     KC_M,     KC_F,     KC_LBRC, \
   KC_LALT,  KC_A,    KC_O,   KC_E,    KC_I,             KC_U,          S(KC_8),       S(KC_9),    KC_B,             KC_N,    KC_T,     KC_R,     KC_S,     KC_QUOT, \
   KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_W,          S(KC_RBRC),    S(KC_BSLS), KC_H,             KC_J,    KC_K,     KC_L,     KC_SLSH,  SFT_T(KC_INT1), \
-  KC_LCTRL, KC_LGUI, KC_APP, _______, LT(BSYMB, KC_ESC),RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(BMETA, KC_ENT),KC_DEL,  KC_PSCR,  XXXXXXX,  XXXXXXX,  KC_INT3 \
+  KC_LCTL,  KC_LGUI, KC_APP, _______, LT(BSYMB, KC_ESC),RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(BMETA, KC_ENT),KC_DEL,  KC_PSCR,  XXXXXXX,  XXXXXXX,  KC_INT3 \
 ),
 
 /* META
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
index 8210fd8ed9..6f76a2be48 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), GUI_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), GUI_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
   ),
 
   /* META
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   )
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
index 40a85fa0f2..e8051355e4 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(RGB),  KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(RGB),  KC_INT3 \
   ),
 
   /* META
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   ),
 
   /* RGB
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
index 8672f0d2d0..146335180b 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(JP_BSLS), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), JP_YEN \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), JP_YEN \
   ),
 
   /* META
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(JP_BSLS), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, JP_YEN \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, JP_YEN \
   )
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
index b0ad50e77c..8c3365d786 100644
--- a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3 \
   ),
 
   /* META
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   )
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
index b04c88f804..9b100497f3 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,       KC_R,             KC_T,           KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,       KC_F,             KC_G,           S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,       KC_V,             KC_B,           S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, TG(ILLUST), LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(ILLUST), KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, TG(ILLUST), LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(ILLUST), KC_INT3 \
   ),
 
   /* META
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
     KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, XXXXXXX, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, XXXXXXX, KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, XXXXXXX, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, XXXXXXX, KC_INT3 \
   ),
 
   /* ILLUST
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_H,    KC_G,   KC_I,    KC_P,   LCTL(KC_J), LCTL(KC_BSLS), _______, _______, _______, _______,    _______,   _______,    _______, \
     KC_LALT,  KC_R,    KC_S,   KC_A,    KC_V,   S(KC_W),    LCTL(KC_RBRC), _______, _______, _______, _______,    _______,   _______,    _______, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,       KC_F,          _______, _______, _______, _______,    _______,   _______,    _______, \
-    KC_LCTRL, KC_LGUI, KC_APP, _______, KC_ESC, KC_RCTL,    KC_DEL,        _______, _______, _______, _______,    XXXXXXX,   _______,    _______ \
+    KC_LCTL,  KC_LGUI, KC_APP, _______, KC_ESC, KC_RCTL,    KC_DEL,        _______, _______, _______, _______,    XXXXXXX,   _______,    _______ \
   )
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
index 470f4a1c95..9543d1caac 100644
--- a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EQL,  KC_Q,     KC_W,    KC_E,    KC_R,             KC_T,     KC_LBRC,  KC_RBRC,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_MINS, \
   KC_TAB,  KC_A,     KC_S,    KC_D,    KC_F,             KC_G,     KC_LPRN,  KC_RPRN,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
   KC_LSFT, KC_Z,     KC_X,    KC_C,    KC_V,             KC_B,     KC_LCBR,  KC_RCBR,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS, \
-  EISU,    KC_LCTRL, KC_LALT, KC_LGUI, LT(_SYMB, KC_ESC),KC_DEL,   KC_BSPC,     KC_ENT,    KC_SPC,  META,    KC_LGUI,  TG(_GAME), TG(_SYMB), KANA \
+  EISU,    KC_LCTL,  KC_LALT, KC_LGUI, LT(_SYMB, KC_ESC),KC_DEL,   KC_BSPC,     KC_ENT,    KC_SPC,  META,    KC_LGUI,  TG(_GAME), TG(_SYMB), KANA \
 ),
 
 /* META
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
   KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
-  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
+  KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
 )
 
 };
diff --git a/keyboards/bioi/g60/keymaps/default/keymap.c b/keyboards/bioi/g60/keymaps/default/keymap.c
index f7fb671072..e021ebe6b6 100644
--- a/keyboards/bioi/g60/keymaps/default/keymap.c
+++ b/keyboards/bioi/g60/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_APP, KC_RCTRL),
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_APP, KC_RCTL),
 
     // 1: Function Layer
     LAYOUT_all(
diff --git a/keyboards/bioi/g60/keymaps/via/keymap.c b/keyboards/bioi/g60/keymaps/via/keymap.c
index 7796741100..a5589f6b03 100644
--- a/keyboards/bioi/g60/keymaps/via/keymap.c
+++ b/keyboards/bioi/g60/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NONUS_HASH, KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, MO(1),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_APP, KC_RCTRL),
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_APP, KC_RCTL),
 
     // 1: Function Layer
     [1] = LAYOUT_all(
diff --git a/keyboards/boardsource/lulu/keymaps/via/keymap.c b/keyboards/boardsource/lulu/keymaps/via/keymap.c
index de635a6128..ac9efbfac1 100644
--- a/keyboards/boardsource/lulu/keymaps/via/keymap.c
+++ b/keyboards/boardsource/lulu/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
                           KC_LALT,    KC_LGUI, LOWER, KC_SPC,  KC_ENT,   RAISE,   KC_BSPC, KC_RGUI
 ),
diff --git a/keyboards/boardsource/technik_s/keymaps/default/keymap.c b/keyboards/boardsource/technik_s/keymaps/default/keymap.c
index 00e17b15f0..d79470e4d1 100644
--- a/keyboards/boardsource/technik_s/keymaps/default/keymap.c
+++ b/keyboards/boardsource/technik_s/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MAIN] = LAYOUT(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-    KC_LSHIFT,KC_LSHIFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_UP, KC_ENT ,
+    KC_LSFT,KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_UP, KC_ENT ,
     RGB_TOG, KC_LCTL, KC_LALT,   LOWER,   KC_SPC,   KC_SPC, RAISE,  KC_LEFT,   KC_DOWN, KC_RIGHT
   ),
   [_RAISE] = LAYOUT(
diff --git a/keyboards/boardsource/technik_s/keymaps/via/keymap.c b/keyboards/boardsource/technik_s/keymaps/via/keymap.c
index f85b1ff186..bf02f130e8 100644
--- a/keyboards/boardsource/technik_s/keymaps/via/keymap.c
+++ b/keyboards/boardsource/technik_s/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MAIN] = LAYOUT(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-    KC_LSHIFT,KC_LSHIFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_UP, KC_ENT ,
+    KC_LSFT,KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_UP, KC_ENT ,
     RGB_TOG, KC_LCTL, KC_LALT,   LOWER,   KC_SPC,   KC_SPC, RAISE,  KC_LEFT,   KC_DOWN, KC_RIGHT
   ),
   [_RAISE] = LAYOUT(
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
index 80dae59bda..e12d79ee01 100644
--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
+++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SCRL,KC_PAUS, \
 		SE_HALF, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   SE_PLUS,SE_ACUT,KC_BSPC,   KC_INS, KC_HOME,KC_PGUP, \
 		KC_TAB,  SE_AO,  SE_ADIA,SE_ODIA,KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,   KC_COMM,SE_CIRC,SE_QUOT,   KC_DEL, KC_END, KC_PGDN, \
-		KC_LCTRL,KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_H,   KC_D,   KC_T,   KC_N,   KC_S,   SE_MINS,        KC_ENT,                             \
+		KC_LCTL, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_H,   KC_D,   KC_T,   KC_N,   KC_S,   SE_MINS,        KC_ENT,                             \
 		KC_LSFT, SE_LTGT,KC_DOT, KC_Q,   KC_J,   KC_K,   KC_B,   KC_X,   KC_M,   KC_W,   KC_V,   KC_Z,           KC_RSFT,           KC_UP,           \
 		MO(KM_MEDIA),KC_LGUI,KC_LALT,                   KC_SPC,                          KC_RALT,KC_RGUI,KC_MENU,TG(KM_QWERTY), KC_LEFT,KC_DOWN,KC_RGHT),
 	/* Layer 1: Standard ISO layer */
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SCRL,KC_PAUS, \
 		SE_HALF, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   SE_PLUS,SE_ACUT,KC_BSPC,   KC_INS, KC_HOME,KC_PGUP, \
 		KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   SE_AO,  SE_CIRC,SE_QUOT,   KC_DEL, KC_END, KC_PGDN, \
-		KC_LCTRL,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SE_ODIA,SE_ADIA,        KC_ENT,                             \
+		KC_LCTL, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SE_ODIA,SE_ADIA,        KC_ENT,                             \
 		KC_LSFT, SE_LTGT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, SE_MINS,        KC_RSFT,           KC_UP,           \
 		MO(KM_MEDIA),KC_LGUI,KC_LALT,                   KC_SPC,                          KC_RALT,KC_RGUI,KC_MENU,TG(KM_QWERTY), KC_LEFT,KC_DOWN,KC_RGHT),
 	/* Layer 2: Media layer */
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
index 38cc9964b3..3693dba220 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
@@ -48,7 +48,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_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-  KC_LCTRL, KC_LGUI,KC_LALT,          KC_NO,KC_SPC,KC_NO,                  KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+  KC_LCTL, KC_LGUI,KC_LALT,          KC_NO,KC_SPC,KC_NO,                  KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
 
 [_F1] = LAYOUT_all( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
diff --git a/keyboards/charue/charon/keymaps/debug/keymap.c b/keyboards/charue/charon/keymaps/debug/keymap.c
index 51c19ee6f2..9d1d2371c1 100644
--- a/keyboards/charue/charon/keymaps/debug/keymap.c
+++ b/keyboards/charue/charon/keymaps/debug/keymap.c
@@ -34,14 +34,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
-      KC_LCTRL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_LCTL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT_all(
       QK_BOOT,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
-      KC_LCTRL, KC_LGUI, KC_LALT, QMKURL,      KC_SPC,        KC_SPC,     QMKBEST,     KC_TRNS,              KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_LCTL, KC_LGUI, KC_LALT, QMKURL,      KC_SPC,        KC_SPC,     QMKBEST,     KC_TRNS,              KC_LEFT, KC_DOWN, KC_RIGHT
     )
 };
 
diff --git a/keyboards/charue/charon/keymaps/default/keymap.c b/keyboards/charue/charon/keymaps/default/keymap.c
index fd64b2be02..26203f089b 100644
--- a/keyboards/charue/charon/keymaps/default/keymap.c
+++ b/keyboards/charue/charon/keymaps/default/keymap.c
@@ -28,13 +28,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
-      KC_LCTRL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_LCTL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT_all(
       QK_BOOT,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
-      KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC,      KC_SPC,        KC_SPC,     KC_SPC,     KC_TRNS,              KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,      KC_SPC,        KC_SPC,     KC_SPC,     KC_TRNS,              KC_LEFT, KC_DOWN, KC_RIGHT
     )
 };
diff --git a/keyboards/charue/charon/keymaps/via/keymap.c b/keyboards/charue/charon/keymaps/via/keymap.c
index 8d4e8a90fb..bbb72cc736 100644
--- a/keyboards/charue/charon/keymaps/via/keymap.c
+++ b/keyboards/charue/charon/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
-      KC_LCTRL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(1),                KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_LCTL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(1),                KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [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,
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
index 61dbc54e95..3be1681378 100644
--- a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
+++ b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
@@ -16,14 +16,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_F3, KC_F4,     KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F5, KC_F6,      KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F7, KC_F8,   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
-      KC_F9, KC_F10,  KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_F9, KC_F10,  KC_LCTL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT_all(
       KC_F11, KC_F12,  QK_BOOT, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
       KC_F13, KC_F14,   KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F15, KC_F16,    KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F17, KC_F18, KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
-      RGB_MOD, KC_F20, KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     KC_TRNS,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+      RGB_MOD, KC_F20, KC_LCTL,   KC_LGUI,   KC_LALT,      KC_SPC,     KC_TRNS,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
     )
 };
 
diff --git a/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
index 6fadba5f72..031b6f9fcb 100644
--- a/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
+++ b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
@@ -16,13 +16,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_F3, KC_F4,     KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F5, KC_F6,      KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F7, KC_F8,   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
-      KC_F9, KC_F10,  KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_F9, KC_F10,  KC_LCTL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT_all(
       KC_F11, KC_F12,  QK_BOOT,   KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
       KC_F13, KC_F14,   KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F15, KC_F16,    KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F17, KC_F18, KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
-      RGB_MOD, KC_F20, KC_LCTRL,   KC_LGUI,   KC_LALT,      KC_SPC,     KC_TRNS,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+      RGB_MOD, KC_F20, KC_LCTL,   KC_LGUI,   KC_LALT,      KC_SPC,     KC_TRNS,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
     )
 };
diff --git a/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
index 6a805426ca..0081481001 100644
--- a/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
+++ b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
@@ -18,27 +18,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_F3, KC_F4,     KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F5, KC_F6,      KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F7, KC_F8,   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
-      KC_F9, KC_F10,  KC_LCTRL,   KC_LGUI,   KC_LALT,     MO(_FN0),     KC_SPC,        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_F9, KC_F10,  KC_LCTL,   KC_LGUI,   KC_LALT,     MO(_FN0),     KC_SPC,        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN0] = LAYOUT_all(
       KC_F11, KC_F12,  QK_BOOT,   KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
       KC_F13, KC_F14,   KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F15, KC_F16,    KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F17, KC_F18, KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
-      KC_F19, KC_F20, KC_LCTRL,   KC_LGUI,   KC_LALT,     KC_TRNS,       KC_SPC,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
+      KC_F19, KC_F20, KC_LCTL,   KC_LGUI,   KC_LALT,     KC_TRNS,       KC_SPC,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN1] = LAYOUT_all(
       KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,     KC_TRNS,     KC_TRNS,
       KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,        KC_TRNS,          KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,        KC_TRNS,           KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_LCTRL,   KC_TRNS,   KC_TRNS,         KC_TRNS,         KC_TRNS,          KC_TRNS,         KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS
+      KC_TRNS, KC_TRNS, KC_LCTL,   KC_TRNS,   KC_TRNS,         KC_TRNS,         KC_TRNS,          KC_TRNS,         KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_FN2] = LAYOUT_all(
       KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,     KC_TRNS,     KC_TRNS,
       KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,        KC_TRNS,          KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,        KC_TRNS,           KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_LCTRL,   KC_TRNS,   KC_TRNS,         KC_TRNS,         KC_TRNS,          KC_TRNS,         KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS
+      KC_TRNS, KC_TRNS, KC_LCTL,   KC_TRNS,   KC_TRNS,         KC_TRNS,         KC_TRNS,          KC_TRNS,         KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c b/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
index 81b0741436..6274ea3205 100644
--- a/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-dvorak/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     LAYOUT_42key( /* Base */
         KC_TAB, KC_SLASH, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_MINUS, KC_BSPC,
-        KC_LCTRL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER,
+        KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER,
         KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
diff --git a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
index 81635076c2..0f42dd25da 100644
--- a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     LAYOUT_42key( /* Base */
         KC_TAB, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPC,
-        KC_LCTRL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
+        KC_LCTL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
diff --git a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
index d89fa5fd22..1d547b5093 100644
--- a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
+++ b/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     LAYOUT_42key( /* Base */
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, MO(1),
+        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, MO(1),
         KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
     LAYOUT_42key( /* layer 1 */
         KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
diff --git a/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c b/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
index 61705f51cf..84bc473823 100644
--- a/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-dvorak/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     LAYOUT_44key( /* Base */
         KC_TAB, KC_SLASH, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_MINUS, KC_BSPC,
-        KC_LCTRL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER,
+        KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER,
         KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
diff --git a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
index 07cf5031c3..b2992dc393 100644
--- a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     LAYOUT_44key( /* Base */
         KC_TAB, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPC,
-        KC_LCTRL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
+        KC_LCTL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
diff --git a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
index db8ac6da81..86b65977de 100644
--- a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
+++ b/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     LAYOUT_44key( /* Base */
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, 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_ENTER,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
         KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
diff --git a/keyboards/chavdai40/keymaps/default/keymap.c b/keyboards/chavdai40/keymaps/default/keymap.c
index db8ac6da81..86b65977de 100644
--- a/keyboards/chavdai40/keymaps/default/keymap.c
+++ b/keyboards/chavdai40/keymaps/default/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
     LAYOUT_44key( /* Base */
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, 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_ENTER,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_DELETE,
         KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
     LAYOUT_44key( /* layer 1 */
         KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
index eecb593810..628d9bbf32 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_HOME, KC_TAB,          KC_Q,      KC_W,     KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_NUM,   KC_Y,     KC_U,   KC_I,     KC_O,     KC_P,      KC_BSPC,
   KC_PGUP, CTL_T(KC_ESC),   KC_A,      KC_S,     KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,  KC_H,     KC_J,   KC_K,     KC_L,     KC_SCLN,   KC_QUOT,
   KC_PGDN, KC_LSFT,         KC_Z,      KC_X,     KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_PMNS,  KC_N,     KC_M,   KC_COMM,  KC_DOT,   KC_SLSH,   KC_ENT,
-  KC_GRV,  KC_LGUI,         KC_LALT,   RGB_TOG,           TT(1),            KC_P0,   KC_PDOT, KC_BSLS,        LT(2, KC_SPC),       KC_RALT,  KC_RCTRL, CALTDEL,   KC_CAPS
+  KC_GRV,  KC_LGUI,         KC_LALT,   RGB_TOG,           TT(1),            KC_P0,   KC_PDOT, KC_BSLS,        LT(2, KC_SPC),       KC_RALT,  KC_RCTL,  CALTDEL,   KC_CAPS
 ),
 
 /* 1
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
index 85c87313f2..0642face9d 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,            KC_T, KC_NUM,    KC_P7,    KC_P8,   KC_P9,  KC_HOME,    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_INS,   KC_P4,    KC_P5,   KC_P6,  KC_PGUP,    KC_H,    KC_J,    KC_K,     KC_L,  KC_SCLN, KC_QUOT,
   KC_LSFT,       KC_Z,       KC_X,    KC_C,    KC_V,            KC_B,  KC_DEL,   KC_P1,    KC_P2,   KC_P3,  KC_PGDN,    KC_N,    KC_M, KC_COMM,   KC_DOT,  KC_SLSH,  KC_ENT,
-  KC_LCTRL,      KC_LGUI, KC_LALT, KC_BSLS,    KC_GRV, LT(2, KC_SPC),  KC_EQL, KC_RALT, KC_RCTRL, KC_CAPS, QK_BOOT
+  KC_LCTL,       KC_LGUI, KC_LALT, KC_BSLS,    KC_GRV, LT(2, KC_SPC),  KC_EQL, KC_RALT, KC_RCTL,  KC_CAPS, QK_BOOT
 ),
 
 /* 1
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
index c7e8707603..0f2c6bd867 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NUM,  KC_P7,   KC_P8,   KC_P9,         KC_HOME,    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_INS,  KC_P4,   KC_P5,   KC_P6,         KC_PGUP,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
   KC_LSFT,       KC_Z,       KC_X,    KC_C,    KC_V,   KC_B,    KC_DEL,  KC_P1,   KC_P2,   KC_P3,         KC_PGDN,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_ENT,
-  KC_LCTRL,      KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTRL, KC_CAPS, QK_BOOT
+  KC_LCTL,       KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTL,  KC_CAPS, QK_BOOT
 ),
 
 /* 1
diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c b/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
index c7e8707603..0f2c6bd867 100644
--- a/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NUM,  KC_P7,   KC_P8,   KC_P9,         KC_HOME,    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_INS,  KC_P4,   KC_P5,   KC_P6,         KC_PGUP,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
   KC_LSFT,       KC_Z,       KC_X,    KC_C,    KC_V,   KC_B,    KC_DEL,  KC_P1,   KC_P2,   KC_P3,         KC_PGDN,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_ENT,
-  KC_LCTRL,      KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTRL, KC_CAPS, QK_BOOT
+  KC_LCTL,       KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTL,  KC_CAPS, QK_BOOT
 ),
 
 /* 1
diff --git a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
index 69782a4db0..a3e69f6051 100644
--- a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ortho_4x12(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_E,      KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,      KC_P,       KC_BSPC                 ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_S,        KC_D,      KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,      KC_SCLN,    MT(MOD_RSFT, KC_ENT)    ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT               ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
+  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(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
 /* Colemak-DHm
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT_ortho_4x12(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_F,      KC_P,    KC_B,    KC_J,    KC_L,    KC_U,      KC_Y,      KC_SCLN,   KC_BSPC                 ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_R,        KC_S,      KC_T,    KC_G,    KC_M,    KC_N,    KC_E,      KC_I,      KC_O,      MT(MOD_RSFT, KC_ENT)    ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSHIFT               ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,   MO(_FUNC2)
+  KC_LSFT,               KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT                 ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,   MO(_FUNC2)
 ),
 
 /* Function
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNC] = LAYOUT_ortho_4x12(
   KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
   KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
-  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
+  KC_LSFT,   KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
   _______,   _______, _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c
index f60cde36b2..27c12bfa44 100644
--- a/keyboards/contra/keymaps/ryanm101/keymap.c
+++ b/keyboards/contra/keymaps/ryanm101/keymap.c
@@ -185,21 +185,21 @@ void tmux_dance (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     SEND_STRING("tmux"); register_code(KC_ENT); unregister_code(KC_ENT);
   } else if (state->count == 2) {
-    register_mods(MOD_BIT(KC_LCTRL));
+    register_mods(MOD_BIT(KC_LCTL));
     register_code(KC_B); unregister_code(KC_B);
-    unregister_mods(MOD_BIT(KC_LCTRL));
-    register_mods(MOD_BIT(KC_LSHIFT));
+    unregister_mods(MOD_BIT(KC_LCTL));
+    register_mods(MOD_BIT(KC_LSFT));
     register_code(KC_5); unregister_code(KC_5);
-    unregister_mods(MOD_BIT(KC_LSHIFT));
+    unregister_mods(MOD_BIT(KC_LSFT));
   }
 }
 
 void cmd_dance (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
-    register_mods(MOD_BIT(KC_LCTRL));
+    register_mods(MOD_BIT(KC_LCTL));
     register_mods(MOD_BIT(KC_LALT));
     register_code(KC_DELETE);
-    unregister_mods(MOD_BIT(KC_LCTRL));
+    unregister_mods(MOD_BIT(KC_LCTL));
     unregister_mods(MOD_BIT(KC_LALT));
     unregister_code(KC_DELETE);
   } else if (state->count == 2) {
@@ -211,10 +211,10 @@ void cmd_dance (qk_tap_dance_state_t *state, void *user_data) {
     unregister_code(KC_ESC);
   } else if (state->count == 3) {
     register_mods(MOD_BIT(KC_LGUI));
-    register_mods(MOD_BIT(KC_LSHIFT));
+    register_mods(MOD_BIT(KC_LSFT));
     register_code(KC_4);
     unregister_mods(MOD_BIT(KC_LGUI));
-    unregister_mods(MOD_BIT(KC_LSHIFT));
+    unregister_mods(MOD_BIT(KC_LSFT));
     unregister_code(KC_4);
   }
 }
diff --git a/keyboards/converter/ibm_terminal/config.h b/keyboards/converter/ibm_terminal/config.h
index 9b44bfa3ea..b3593e8ab4 100644
--- a/keyboards/converter/ibm_terminal/config.h
+++ b/keyboards/converter/ibm_terminal/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_RALT) | MOD_BIT(KC_RCTL)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT) | MOD_BIT(KC_RALT) | MOD_BIT(KC_RCTL)) \
 )
 
 
diff --git a/keyboards/converter/m0110_usb/config.h b/keyboards/converter/m0110_usb/config.h
index 0260bc6fb4..62fdaf0869 100644
--- a/keyboards/converter/m0110_usb/config.h
+++ b/keyboards/converter/m0110_usb/config.h
@@ -32,8 +32,8 @@ Ported to QMK by Techsock <info@techsock.com>
 
 /* magic key */
 #define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LCTL)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LCTL)) \
 )
 
 /* ports */
diff --git a/keyboards/converter/palm_usb/config.h b/keyboards/converter/palm_usb/config.h
index f6e933ad2c..84394b9f71 100644
--- a/keyboards/converter/palm_usb/config.h
+++ b/keyboards/converter/palm_usb/config.h
@@ -52,5 +52,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) || \
     get_mods() == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
diff --git a/keyboards/converter/sun_usb/config.h b/keyboards/converter/sun_usb/config.h
index 9d948b4cbd..18e4b1618e 100644
--- a/keyboards/converter/sun_usb/config.h
+++ b/keyboards/converter/sun_usb/config.h
@@ -25,5 +25,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) || \
     get_mods() == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
diff --git a/keyboards/converter/xt_usb/config.h b/keyboards/converter/xt_usb/config.h
index 8aaf920578..1618dfaee6 100644
--- a/keyboards/converter/xt_usb/config.h
+++ b/keyboards/converter/xt_usb/config.h
@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
-    get_mods() == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) || \
+    get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RSFT)) \
 )
 
 #define XT_CLOCK_PIN D1
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
index c47043e712..576d25e7fa 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c
+++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
       LOCK_SCREEN, KC_PSCR, SELECT_LEFT_LINE, KC_UP, SELECT_RIGHT_LINE, TD(TD_MOVE_BEGIN_LINE),                    TD(TD_MOVE_END_LINE), KC_MS_WH_UP, EMOJI_KBD, KC_TRANSPARENT, KC_TRANSPARENT, RESET,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TO(_BASE), SELECT_LEFT_WD, KC_LEFT, KC_DOWN, KC_RIGHT,SELECT_RIGHT_WD,              KC_MS_WH_LEFT, KC_RGUI, KC_RSFT, KC_RALT,KC_RCTRL, KC_CAPS,
+      TO(_BASE), SELECT_LEFT_WD, KC_LEFT, KC_DOWN, KC_RIGHT,SELECT_RIGHT_WD,              KC_MS_WH_LEFT, KC_RGUI, KC_RSFT, KC_RALT,KC_RCTL, KC_CAPS,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_INSERT, KC_TRANSPARENT, MOVE_LEFT_WD,KC_PAGE_DOWN,MOVE_RIGHT_WD, KC_PAGE_UP,                    KC_MS_WH_RIGHT, KC_MS_WH_DOWN, KC_HOME, KC_END,KC_TRANSPARENT, TO(_ADJUST),
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/rarick/keymap.c b/keyboards/crkbd/keymaps/rarick/keymap.c
index 72be5d3c36..00bf3d900e 100644
--- a/keyboards/crkbd/keymaps/rarick/keymap.c
+++ b/keyboards/crkbd/keymaps/rarick/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
      KC_SFTTB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    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_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           KC_LALT,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RGUI
                                       //`--------------------------'  `--------------------------'
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 92a6e0dd5b..09a30761b8 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -59,7 +59,7 @@ user_config_t user_config;
 #define NAV_0 LT(_NAV, KC_0)
 #define TAB_NUM LT(_NUMPAD, KC_TAB)
 
-#define EXT_SF LT(_GAMING_EXT, KC_LSHIFT)
+#define EXT_SF LT(_GAMING_EXT, KC_LSFT)
 
 // Tap/mod keys
 #define RCTL_BR RCTL_T(KC_RBRC)
diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c
index f8b01f32ba..41160cb6d2 100644
--- a/keyboards/crkbd/keymaps/vayashiko/keymap.c
+++ b/keyboards/crkbd/keymaps/vayashiko/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        KC_LCTRL,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RALT
+                                        KC_LCTL,    MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RALT
                                       //`--------------------------'  `--------------------------'
 
   ),
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LSFT,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,                         KC_0,    KC_1,    KC_2,    KC_3,  KC_DOT, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        KC_LCTRL, _______,  KC_SPC,     KC_ENT,   MO(3), KC_RALT
+                                        KC_LCTL,  _______,  KC_SPC,     KC_ENT,   MO(3), KC_RALT
                                       //`--------------------------'  `--------------------------'
   ),
 
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
index 6072c66c71..8ee3841efc 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------.                ,-----------------------------------------.
         KC_ESC, XXXXXXX,  KC_PGDN,  KC_PSCR,  KC_PGUP,  KC_LBRC,                   KC_RBRC,     KC_7,     KC_8,     KC_9, XXXXXXX, XXXXXXX,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXXXX, KC_LCTRL,  KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTRL, XXXXXXX,
+      XXXXXXX, KC_LCTL,   KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTL, XXXXXXX,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       XXXXXXX,  KC_LSFT,  KC_HOME, XXXXXXX,   KC_END,  KC_LCBR,                   KC_RCBR,     KC_1,     KC_2,     KC_3,  KC_RSFT, XXXXXXX,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------.                ,-----------------------------------------.
         KC_ESC, XXXXXXX,    KC_F7,    KC_F8,    KC_F9,   KC_F10,                   KC_BTN2,  KC_BTN2,  KC_MNXT,  KC_MPRV,  KC_MPLY,  KC_MSTP,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXXXX, KC_LCTRL,    KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTRL, XXXXXXX,
+      XXXXXXX, KC_LCTL,     KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTL, XXXXXXX,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       XXXXXXX,  KC_LSFT,    KC_F1,    KC_F2,    KC_F3,   KC_F12,                  XXXXXXX, XXXXXXX,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_RSFT,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
index a90b589e83..2d2535cda9 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------.                ,-----------------------------------------.
         KC_ESC, KC_XXXXX,  KC_PGDN,  KC_PSCR,  KC_PGUP,  KC_LBRC,                   KC_RBRC,     KC_7,     KC_8,     KC_9, KC_XXXXX, KC_XXXXX,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_XXXXX, KC_LCTRL,  KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTRL, KC_XXXXX,
+      KC_XXXXX, KC_LCTL,   KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTL,  KC_XXXXX,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       KC_XXXXX,  KC_LSFT,  KC_HOME, KC_XXXXX,   KC_END,  KC_LCBR,                   KC_RCBR,     KC_1,     KC_2,     KC_3,  KC_RSFT, KC_XXXXX,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------.                ,-----------------------------------------.
         KC_ESC, KC_XXXXX,    KC_F7,    KC_F8,    KC_F9,   KC_F10,                   KC_BTN2,  KC_BTN2,  KC_MNXT,  KC_MPRV,  KC_MPLY,  KC_MSTP,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_XXXXX, KC_LCTRL,    KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTRL, KC_XXXXX,
+      KC_XXXXX, KC_LCTL,     KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTL,  KC_XXXXX,
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       KC_XXXXX,  KC_LSFT,    KC_F1,    KC_F2,    KC_F3,   KC_F12,                  KC_XXXXX, KC_XXXXX,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_RSFT,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
diff --git a/keyboards/cutie_club/keebcats/denis/keymaps/default/keymap.c b/keyboards/cutie_club/keebcats/denis/keymaps/default/keymap.c
index 3dbf5dc5b5..7ecfa825f0 100644
--- a/keyboards/cutie_club/keebcats/denis/keymaps/default/keymap.c
+++ b/keyboards/cutie_club/keebcats/denis/keymaps/default/keymap.c
@@ -23,6 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,    KC_BSLS,
         KC_CAPS,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,      KC_NUHS,    KC_ENT,
         KC_LSFT,    KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,      KC_RSFT,    KC_RSFT,
-        KC_LCTL,    KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_APP,     KC_RCTRL
+        KC_LCTL,    KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_APP,     KC_RCTL
     )
 };
diff --git a/keyboards/cutie_club/keebcats/denis/keymaps/via/keymap.c b/keyboards/cutie_club/keebcats/denis/keymaps/via/keymap.c
index b7fa4f154f..cceea53fc6 100644
--- a/keyboards/cutie_club/keebcats/denis/keymaps/via/keymap.c
+++ b/keyboards/cutie_club/keebcats/denis/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,    KC_BSLS,
         KC_CAPS,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,      KC_NUHS,    KC_ENT,
         KC_LSFT,    KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,      KC_RSFT,    KC_RSFT,
-        KC_LCTL,    KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_APP,     KC_RCTRL
+        KC_LCTL,    KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_APP,     KC_RCTL
     ),
     [1] = LAYOUT_all(
         KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,      KC_TRNS,    KC_TRNS, KC_TRNS,
diff --git a/keyboards/cutie_club/keebcats/dougal/keymaps/default/keymap.c b/keyboards/cutie_club/keebcats/dougal/keymaps/default/keymap.c
index ec3e1c21f7..a2bbef68ba 100644
--- a/keyboards/cutie_club/keebcats/dougal/keymaps/default/keymap.c
+++ b/keyboards/cutie_club/keebcats/dougal/keymaps/default/keymap.c
@@ -23,6 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,    KC_BSLS,          KC_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_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_RCTRL,   KC_LEFT, KC_DOWN, KC_RIGHT
+        KC_LCTL,    KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT
     )
 };
diff --git a/keyboards/cutie_club/keebcats/dougal/keymaps/via/keymap.c b/keyboards/cutie_club/keebcats/dougal/keymaps/via/keymap.c
index 58d184a064..a1b30ab7a0 100644
--- a/keyboards/cutie_club/keebcats/dougal/keymaps/via/keymap.c
+++ b/keyboards/cutie_club/keebcats/dougal/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,    KC_BSLS,          KC_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_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_RCTRL,   KC_LEFT, KC_DOWN, KC_RIGHT
+        KC_LCTL,    KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  KC_RGUI,      KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT_all(
         KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
index 025a506188..efa6f6e717 100644
--- a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
+++ b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
@@ -22,12 +22,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         keystroke = random_keycode();
         if (rand() % 2 > 0) {
           shift_pressed = 1;
-          register_code(KC_LSHIFT);
+          register_code(KC_LSFT);
         }
         register_code(keystroke);
       } else {
         if (shift_pressed > 0) {
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LSFT);
         }
         unregister_code(keystroke);
       }
diff --git a/keyboards/drewkeys/iskar/keymaps/default/keymap.c b/keyboards/drewkeys/iskar/keymaps/default/keymap.c
index d97403dfd5..59b62196c4 100644
--- a/keyboards/drewkeys/iskar/keymaps/default/keymap.c
+++ b/keyboards/drewkeys/iskar/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,             KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_INS,
         KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,             KC_SCLN, KC_QUOT, KC_ENT,           KC_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_LCTRL, KC_LGUI, KC_LALT,        KC_SPC,                    MO(1), KC_RCTRL,                   KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,                    MO(1), KC_RCTL,                    KC_LEFT, KC_DOWN, KC_RGHT
     ),
     LAYOUT(
         KC_GRAVE,    KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9,   KC_F10,     KC_F11,  KC_F12,   KC_TRNS,   KC_TRNS,  KC_TRNS,
diff --git a/keyboards/drewkeys/iskar/keymaps/via/keymap.c b/keyboards/drewkeys/iskar/keymaps/via/keymap.c
index cfa5149e3e..df0d3a5e16 100644
--- a/keyboards/drewkeys/iskar/keymaps/via/keymap.c
+++ b/keyboards/drewkeys/iskar/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,             KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_INS,
       KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,             KC_SCLN, KC_QUOT, KC_ENT,           KC_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_LCTRL, KC_LGUI, KC_LALT,        KC_SPC,                    MO(1), KC_RCTRL,                   KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,                    MO(1), KC_RCTL,                    KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] LAYOUT(
       KC_GRAVE,    KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9,   KC_F10,     KC_F11,  KC_F12,   KC_TRNS,   QK_BOOT,  KC_TRNS,
diff --git a/keyboards/dz60/keymaps/boris_burger/keymap.c b/keyboards/dz60/keymaps/boris_burger/keymap.c
index af9ced3877..683591179a 100644
--- a/keyboards/dz60/keymaps/boris_burger/keymap.c
+++ b/keyboards/dz60/keymaps/boris_burger/keymap.c
@@ -56,7 +56,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case KC_BSPC: {
             if (record->event.pressed) {
                 const uint8_t current_mods = get_mods();
-                const uint8_t shift = current_mods & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+                const uint8_t shift = current_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
                 const uint8_t ctrl = current_mods & (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL));
                 bspc_mods = current_mods;
                 if(shift || ctrl) {
@@ -68,7 +68,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             else {
-                if(bspc_mods & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL))) {
+                if(bspc_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL))) {
                     // if Shift or Ctrl was pressed with Backspace, than that was intepreted as Del, so we need
                     // to unregister the Del key 
                     del_key(KC_DEL);
diff --git a/keyboards/dz60/keymaps/model42/keymap.c b/keyboards/dz60/keymaps/model42/keymap.c
index 9c760f2f52..f8d647d7ab 100644
--- a/keyboards/dz60/keymaps/model42/keymap.c
+++ b/keyboards/dz60/keymaps/model42/keymap.c
@@ -52,10 +52,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 			layer_off(1);
 			if (timer_elapsed(custom_lt_timer) < 200) {
 				register_code(KC_LGUI);
-				register_code(KC_RSHIFT);
+				register_code(KC_RSFT);
 				register_code(KC_R);
 				unregister_code(KC_R);
-				unregister_code(KC_RSHIFT);
+				unregister_code(KC_RSFT);
 				unregister_code(KC_LGUI);
 			}
 		}
diff --git a/keyboards/dz60/keymaps/muzfuz/keymap.c b/keyboards/dz60/keymaps/muzfuz/keymap.c
index 695f012fad..6556eaa358 100644
--- a/keyboards/dz60/keymaps/muzfuz/keymap.c
+++ b/keyboards/dz60/keymaps/muzfuz/keymap.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
 
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_CTRL_MASK  (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 #define ESC_CTL     CTL_T(KC_ESCAPE)            // Tap for Esc, hold for Ctrl
 
 enum custom_keycodes {
diff --git a/keyboards/dz60/keymaps/split_space_arrows/keymap.c b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
index 361c5b60a4..f256d25c14 100644
--- a/keyboards/dz60/keymaps/split_space_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // |--------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------------||
        //
        // |------2.25--------|--------|--------|--------|--------|--------|--------|--------|--------|--------||----1.75------|--------|--------||
-               KC_LSHIFT,      KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,   SFT_T(KC_SLSH), KC_UP,  KC_HYPR,
+               KC_LSFT,        KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,   SFT_T(KC_SLSH), KC_UP,  KC_HYPR,
        // |------------------|--------|--------|--------|--------|--------|--------|--------|--------|--------||--------------|--------|--------||
        //
        // |---1.25---|---1.25---||---1.25---||--------2.75----------||---1.25---|------2.25--------||--------|--------|--------|--------|--------|
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_b_4_10(
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,            KC_NO,     TO(5),
         KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,            KC_NO,     RGB_HUD,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   RGB_MODE_PLAIN, RGB_MODE_FORWARD, KC_RSHIFT,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   RGB_MODE_PLAIN, RGB_MODE_FORWARD, KC_RSFT,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   RGB_TOG,        RGB_VAI,          RGB_HUI,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_SAD, RGB_VAD, RGB_SAI
     ),
diff --git a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
index e355499704..ecbfd8ed84 100644
--- a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
+++ b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // |--------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------------||
     //
     // |------2.25--------|---Z----|---X----|---C----|---V----|---B----|---N----|---M----|---,----|---.----||----1.75------|--------|--------||
-          KC_LSHIFT,        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM,  KC_DOT,  /*SFT_T*/KC_SLSH, KC_UP,  VIM_START,
+          KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM,  KC_DOT,  /*SFT_T*/KC_SLSH, KC_UP,  VIM_START,
     // |------------------|--------|--------|--------|--------|--------|--------|--------|--------|--------||--------------|--------|--------||
     //
     // |---1.25---|---1.25---||---1.25---||--------2.75----------||---1.25---|------2.25--------||--------|--------|--------|--------|--------|
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // |--------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------------||
     //
     // |------2.25--------|---Z----|---X----|---C----|---V----|---B----|---N----|---M----|---,----|---.----||----1.75------|--------|--------||
-          KC_LSHIFT,       KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     KC_LOCK,     KC_PGUP,  KC_INS,
+          KC_LSFT,         KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     KC_LOCK,     KC_PGUP,  KC_INS,
     // |------------------|--------|--------|--------|--------|--------|--------|--------|--------|--------||--------------|--------|--------||
     //
     // |---1.25---|---1.25---||---1.25---||--------2.75----------||---1.25---|------2.25--------||--------|--------|--------|--------|--------|
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TO(_Base), KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, XXXXXXX,     XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,     XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX,   XXXXXXX,      KC_MS_BTN2,   KC_MS_UP,     KC_MS_BTN1,  XXXXXXX, XXXXXXX,       KC_SLEP,       KC_PGDN,     KC_PGUP,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_LCTL,   KC_MS_BTN3,   KC_MS_LEFT,   KC_MS_DOWN,   KC_MS_RIGHT, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSHIFT, XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,     XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,     XXXXXXX,        XXXXXXX, _______, XXXXXXX,
+    KC_LSFT,   XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,     XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,     XXXXXXX,        XXXXXXX, _______, XXXXXXX,
     XXXXXXX,   XXXXXXX,      XXXXXXX,      KC_MS_BTN1,   _______,     _______, _______,       _______,       _______,     _______,        _______
   ),
 
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_b_4_10(
     _______,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      TG_L0_RGB,      XXXXXXX,          XXXXXXX,   TO(_None),
     XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,        XXXXXXX,          XXXXXXX,   RGB_HUD,
-    EN_CTRL_SHORTCUTS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LAYER_RGB, RGB_MODE_PLAIN, RGB_MODE_FORWARD, KC_RSHIFT,
+    EN_CTRL_SHORTCUTS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LAYER_RGB, RGB_MODE_PLAIN, RGB_MODE_FORWARD, KC_RSFT,
     XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MAKE, XXXXXXX, XXXXXXX,      RGB_TOG,        RGB_VAI,          RGB_HUI,
     XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_VAD,      RGB_SAI
   ),
diff --git a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
index 3a4aad1b6c..b3c0933c75 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,            KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,            KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
-        KC_LCTL,        KC_LGUI, KC_LALT,                           KC_SPC,                    OSL(1), KC_RCTRL,          KC_LEFT,         KC_DOWN, KC_RGHT
+        KC_LCTL,        KC_LGUI, KC_LALT,                           KC_SPC,                    OSL(1), KC_RCTL,           KC_LEFT,         KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
         TO(2),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
index 64b64c6694..bfe1c04894 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
@@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_ALPHA_LAYER] = LAYOUT_65_ansi(
 		KC_GESC,	KC_1,	KC_2,	KC_3,   KC_4,	KC_5,	KC_6,	KC_7,	KC_8,		KC_9,	KC_0,		KC_MINUS,	KC_EQUAL,		KC_BSPC,	KC_HOME,
 		KC_TAB,		KC_Q,	KC_W,	KC_E,	KC_R,	KC_T,	KC_Y,	KC_U,	KC_I,		KC_O,	KC_P,		KC_LBRC,KC_RBRC,	KC_BSLS,	KC_PGUP,
-		KC_LCTRL,	KC_A,   KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,		KC_L,	KC_SCLN,	KC_QUOTE,	        KC_ENTER,	        KC_PGDN,
-		KC_LSHIFT,	KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMMA,	KC_DOT,	KC_SLASH,           KC_RSHIFT,          KC_UP,		KC_END,
-		KC_CAPS,KC_LGUI,FN_MO13,				KC_SPACE,                       FN_MO23,	KC_LALT,    KC_RCTRL,       KC_LEFT,	KC_DOWN,	KC_RIGHT
+		KC_LCTL,	KC_A,   KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,		KC_L,	KC_SCLN,	KC_QUOTE,	        KC_ENTER,	        KC_PGDN,
+		KC_LSFT,	KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMMA,	KC_DOT,	KC_SLASH,           KC_RSFT,          KC_UP,		KC_END,
+		KC_CAPS,KC_LGUI,FN_MO13,				KC_SPACE,                       FN_MO23,	KC_LALT,    KC_RCTL,        KC_LEFT,	KC_DOWN,	KC_RIGHT
     ),
     [_VIM_EDITING_LAYER] = LAYOUT_65_ansi(
 		KC_GRAVE,	    KC_F1,		        KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_F11,		KC_F12,		KC_DELETE,	KC_INSERT,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		DYN_REC_STOP,	DYN_REC_START1,		DYN_REC_START2,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
 		KC_NO,			DYN_MACRO_PLAY1,	DYN_MACRO_PLAY2,	KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
 		KC_NO,			KC_NO,				KC_NO,				KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
-		KC_LSHIFT,		KC_NO,				KC_NO,				RGB_HUI,	RGB_SAI,	RGB_VAI,	RGB_SPI,	RGB_MOD,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
+		KC_LSFT,		KC_NO,				KC_NO,				RGB_HUI,	RGB_SAI,	RGB_VAI,	RGB_SPI,	RGB_MOD,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
 		KC_TRNS,		KC_TRNS,			KC_TRNS,									RGB_TOG,							KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS
 	)
 };
@@ -126,7 +126,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record){
             break;
         case INC_CLICK_SPEED:
             if (record->event.pressed){
-				if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+				if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
 					decrement_click_speed();
 				} else{
 					increment_click_speed();
@@ -135,7 +135,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record){
             break;
         case DEC_CLICK_SPEED:
             if (record->event.pressed){
-				if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+				if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
 					increment_click_speed();
 				} else{
 					decrement_click_speed();
@@ -159,7 +159,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record){
             break;
 		case RGB_TOG:
 			if(record->event.pressed){
-				if (!(get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))){
+				if (!(get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))){
 					if(rgb_matrix_get_val() < 128){
 						rgb_matrix_sethsv(rgb_matrix_get_hue(), rgb_matrix_get_sat(), 255);
 					} else{
diff --git a/keyboards/e88/keymaps/default/keymap.c b/keyboards/e88/keymaps/default/keymap.c
index 3a4a82f4a5..88617762ae 100644
--- a/keyboards/e88/keymaps/default/keymap.c
+++ b/keyboards/e88/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,    KC_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_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,  MO(_FN),              KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_RALT,  KC_RALT,  QK_BOOT,   KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_RALT,  KC_RALT,  QK_BOOT,   KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT),
 [_FN] = LAYOUT_all(
     QK_BOOT,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,   _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,    KC_VOLD,   KC_MUTE,  KC_VOLU,
diff --git a/keyboards/e88/keymaps/via/keymap.c b/keyboards/e88/keymaps/via/keymap.c
index 499335d48c..305690e40f 100644
--- a/keyboards/e88/keymaps/via/keymap.c
+++ b/keyboards/e88/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,    KC_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_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,  MO(1),              KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_TRNS,  KC_RALT,  QK_BOOT,  KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT
+    KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_TRNS,  KC_RALT,  QK_BOOT,  KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
 
 [1] = LAYOUT_all(
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
index 86da382848..85a81bce9c 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     BP_DLR,   BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN, KC_DEL,
     KC_TAB,   BP_B,    BP_EACU, BP_P,    BP_O,    BP_EGRV, KC_BSPC,
     KC_LSFT,  BP_A,    BP_U,    BP_I,    BP_E,    BP_COMM,
-    KC_LCTRL, BP_AGRV, BP_Y,    BP_X,    BP_DOT,  BP_K,    KC_ENT,
+    KC_LCTL,  BP_AGRV, BP_Y,    BP_X,    BP_DOT,  BP_K,    KC_ENT,
     ESC_FN,   BP_ECIR, KC_LGUI, KC_LALT, SPC_RALT,
                                                           TT(SWAP), KC_MNXT,
                                                                     KC_MPLY,
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_SLEP, KC_F1, KC_F2,  KC_F3,   KC_F4,    KC_F5,    ___,
     ___,     ___,   ___,    ___,     ___,      ___,      ___,
     ___,     ___,   ___,    ___,     ___,      KC_LSFT,
-    ___,     ___,   MK_CUT, MK_COPY, MK_PASTE, KC_LCTRL, ___,
+    ___,     ___,   MK_CUT, MK_COPY, MK_PASTE, KC_LCTL,  ___,
     ___,     ___,   ___,    ___,     ___,
                                                      ___, KC_VOLU,
                                                           KC_VOLD,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_SLEP, KC_F1, KC_F2,   KC_F3,   KC_F4,    KC_F5,    ___,
     ___,     ___,   KC_BTN4, KC_MS_U, KC_BTN5,  ___,      ___,
     ___,     ___,   KC_MS_L, KC_MS_D, KC_MS_R,  KC_LSFT,
-    ___,     ___,   MK_CUT,  MK_COPY, MK_PASTE, KC_LCTRL, ___,
+    ___,     ___,   MK_CUT,  MK_COPY, MK_PASTE, KC_LCTL,  ___,
     ___,     ___,   ___,     ___,     ___,
                                                   ___, KC_VOLU,
                                                        KC_VOLD,
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
index e8ebc69525..14530cafd1 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
@@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
     KC_TRANSPARENT,KC_TRANSPARENT,
     KC_TRANSPARENT,
-    KC_SPACE      ,KC_LSHIFT     ,KC_TRANSPARENT,
+    KC_SPACE      ,KC_LSFT       ,KC_TRANSPARENT,
 
     TO(0)         ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
     KC_PGDN       ,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
index 73532bb437..b05a71fac4 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
@@ -146,8 +146,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
         KC_ESCAPE,            GUI_T(KC_MINS), KC_I,     KC_O,   KC_P,   ALGR_T(KC_EQL), KC_T,
         KC_TAB,               KC_LALT,        KC_Q,     KC_W,   KC_E,   ALL_T(KC_R),    KC_G,
-        LT(MOUSE, KC_GRV), KC_LCTRL,       KC_A,     KC_S,   KC_D,   MEH_T(KC_F),
-        KC_BSLS,              KC_LSHIFT,      KC_Z,     KC_X,   KC_C,   SCMD_T(KC_V),   KC_M,
+        LT(MOUSE, KC_GRV), KC_LCTL,        KC_A,     KC_S,   KC_D,   MEH_T(KC_F),
+        KC_BSLS,              KC_LSFT,      KC_Z,     KC_X,   KC_C,   SCMD_T(KC_V),   KC_M,
         XXXXXXX,           TG(LAYERS),  KC_COMM, KC_DOT, KC_LBRC,
 
         // left thumb
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
         XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,    XXXXXXX, XXXXXXX,
         XXXXXXX, SCMD_T(KC_NO), MEH_T(KC_NO), ALL_T(KC_NO), XXXXXXX,    XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_LCTRL,      KC_LSHIFT,    XXXXXXX,      _______,    XXXXXXX,
+        XXXXXXX, KC_LCTL,       KC_LSFT,      XXXXXXX,      _______,    XXXXXXX,
         XXXXXXX, KC_RALT,       KC_LALT,      GUI_T(KC_NO), XXXXXXX,    XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,
 
@@ -210,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // right hand
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, ALL_T(KC_NO), MEH_T(KC_NO), SCMD_T(KC_NO), XXXXXXX,
-                 XXXXXXX, _______, KC_MS_ACCEL1, KC_LSHIFT,    KC_LCTRL,      KC_MS_ACCEL2,
+                 XXXXXXX, _______, KC_MS_ACCEL1, KC_LSFT,      KC_LCTL,       KC_MS_ACCEL2,
         XXXXXXX, XXXXXXX, XXXXXXX, GUI_T(KC_NO), KC_LALT,      KC_RALT,       XXXXXXX,
                           XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
 
@@ -224,7 +224,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
         XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX,  GUI_T(KC_NO), XXXXXXX, ALL_T(KC_NO),  XXXXXXX, XXXXXXX,
-        _______, KC_LCTRL, KC_LSHIFT,    _______, MEH_T(KC_NO),  XXXXXXX,
+        _______, KC_LCTL,  KC_LSFT,      _______, MEH_T(KC_NO),  XXXXXXX,
         XXXXXXX, KC_RALT,  KC_LALT,      XXXXXXX, SCMD_T(KC_NO), XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,
 
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/config.h b/keyboards/ergodox_ez/keymaps/lukaus/config.h
index 2b93445378..95d5fc46e1 100644
--- a/keyboards/ergodox_ez/keymaps/lukaus/config.h
+++ b/keyboards/ergodox_ez/keymaps/lukaus/config.h
@@ -13,4 +13,4 @@
 
 #define FORCE_NKRO
 
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
index 1d1957ae90..5529abbb6b 100644
--- a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     DVP_ESC,      DVP_AMPR,         DVP_LBRACKET, DVP_LCBR,         DVP_RCBR,     DVP_LPRN,   DVP_AT,
     KC_TAB,       KC_SCLN,          KC_COMMA,     KC_DOT,           KC_P,         KC_Y,       MO(4),
     MO(3),        KC_A,             KC_O,         KC_E,             KC_U,         KC_I,
-    KC_LSHIFT,    KC_QUOTE,         KC_Q,         KC_J,             KC_K,         KC_X,       KC_HYPR,
+    KC_LSFT,      KC_QUOTE,         KC_Q,         KC_J,             KC_K,         KC_X,       KC_HYPR,
     KC_LCTL,      KC_LALT,          KC_LGUI,      LCTL(KC_C),       LCTL(KC_V),
 
       KC_MS_BTN3, TO(1),    KC_HOME,  KC_SPACE,   MO(4),  KC_END,
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESCAPE,  KC_1,   KC_2,     KC_3,         KC_4,       KC_5,         KC_F14,
     KC_TAB,     KC_Q,   KC_W,     KC_E,         KC_R,       KC_T,         KC_F23,
     MO(3),      KC_A,   KC_S,     KC_D,         KC_F,       KC_G,
-    KC_LSHIFT,  KC_Z,   KC_X,     KC_C,         KC_V,       KC_B,         KC_F24,
+    KC_LSFT,    KC_Z,   KC_X,     KC_C,         KC_V,       KC_B,         KC_F24,
     KC_LCTL,    KC_F8,  KC_LALT,  KC_F14,      KC_F13,
 
       KC_HOME,  TO(0),  KC_F15,  KC_SPACE, KC_LCTL,  KC_LALT,
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_6,       KC_7,   KC_8,     KC_9,         KC_0,       KC_MINUS,   KC_EQUAL,
     KC_F24,     KC_Y,   KC_U,     KC_I,         KC_O,       KC_P,       KC_BSLS,
                 KC_H,   KC_J,     KC_K,         KC_L,       KC_SCLN,    KC_QUOTE,
-    KC_F17,     KC_N,   KC_M,     KC_COMMA,     KC_DOT,     KC_SLASH,   KC_RSHIFT,
+    KC_F17,     KC_N,   KC_M,     KC_COMMA,     KC_DOT,     KC_SLASH,   KC_RSFT,
             KC_DELETE,  KC_F19,   KC_LGUI,       KC_F21,     KC_F22,
 
       KC_F17,   KC_F18, KC_PGUP,  KC_PGDN,    KC_ENTER,   KC_BSPC
@@ -87,10 +87,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESCAPE,  KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_C,
     KC_TAB,     KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      TO(0),
     MO(3),      KC_1,      KC_2,      KC_3,      KC_4,      KC_5,
-    KC_LSHIFT,  KC_6,      KC_7,      KC_8,      KC_9,      KC_0,     KC_NO,
+    KC_LSFT,    KC_6,      KC_7,      KC_8,      KC_9,      KC_0,     KC_NO,
     KC_LCTL,    KC_F8,     KC_LALT,   KC_I,      KC_S,
 
-    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSHIFT,  KC_END,
+    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSFT,  KC_END,
 
     KC_NO,     KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_KP_MINUS,     KC_NO,   KC_NO,
     TO(0),     KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_PLUS,      KC_NO,   KC_NO,
@@ -105,15 +105,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_DLR,         KC_F1,            KC_F2,              KC_F3,              KC_F4,              KC_F5,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT,   KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_NO,          TT(4),
     KC_TRANSPARENT, KC_TRANSPARENT,   KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,    KC_AUDIO_MUTE,      KC_TRANSPARENT,
-    KC_LSHIFT,      LALT(KC_Z),       KC_TRANSPARENT,     KC_TRANSPARENT,     KC_F12,             KC_TRANSPARENT, ALL_T(KC_NO),
+    KC_LSFT,        LALT(KC_Z),       KC_TRANSPARENT,     KC_TRANSPARENT,     KC_F12,             KC_TRANSPARENT, ALL_T(KC_NO),
     KC_LCTL,        KC_LALT,          KC_LGUI,            KC_CAPS,            LSFT(KC_F12),
 
-     KC_PSCR,    KC_PGUP,  KC_PGDN,  KC_SPACE, KC_LSHIFT,  KC_INSERT,
+     KC_PSCR,    KC_PGUP,  KC_PGDN,  KC_SPACE, KC_LSFT,   KC_INSERT,
 
     KC_F6,          KC_F7,            KC_F8,              KC_F9,              KC_F10,             KC_F11,         KC_F12,
     KC_NO,          KC_HOME,          KC_TRANSPARENT,     KC_PSCR,            KC_SCRL,            KC_TRANSPARENT, KC_TRANSPARENT,
                     KC_LEFT,          KC_DOWN,            KC_UP,              KC_RIGHT,           KC_TRANSPARENT, KC_TRANSPARENT,
-    MEH_T(KC_NO),   KC_CALCULATOR,    KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT, KC_RSHIFT,
+    MEH_T(KC_NO),   KC_CALCULATOR,    KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT, KC_RSFT,
                                       KC_DELETE,          KC_INSERT,          KC_TRANSPARENT,     KC_F19,         KC_RCTL,
 
      TO(2),KC_TRANSPARENT,KC_TRANSPARENT,LALT(KC_F10),KC_ENTER,KC_BSPC
@@ -124,10 +124,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESCAPE,  KC_NO,      KC_NO,        KC_MS_BTN3, KC_NO,        KC_NO,          KC_NO,
     KC_TAB,     KC_NO,      KC_MS_BTN2,   KC_MS_UP,   KC_MS_BTN1,   KC_MS_WH_UP,    TO(0),
     KC_NO,      KC_NO,      KC_MS_LEFT,   KC_MS_DOWN, KC_MS_RIGHT,  KC_MS_WH_DOWN,
-    KC_LSHIFT,  KC_NO,      KC_NO,        KC_UP,      KC_NO,        KC_NO,          TO(5),
+    KC_LSFT,    KC_NO,      KC_NO,        KC_UP,      KC_NO,        KC_NO,          TO(5),
     KC_LCTL,    KC_NO,      KC_LEFT,      KC_DOWN,    KC_RIGHT,
 
-    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSHIFT,  KC_END,
+    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSFT,  KC_END,
 
     KC_NO,          KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,    KC_NO,      RGB_VAI,
     TO(0),          KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_MINUS,      KC_NO,      RGB_VAD,
@@ -144,10 +144,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESCAPE,  KC_NO,      KC_NO,        KC_MS_BTN3, KC_NO,        KC_NO,          KC_NO,
     KC_TAB,     KC_NO,      KC_MS_BTN2,   KC_MS_UP,   KC_MS_BTN1,   KC_MS_WH_UP,    TO(0),
     KC_NO,      KC_NO,      KC_MS_LEFT,   KC_MS_DOWN, KC_MS_RIGHT,  KC_MS_WH_DOWN,
-    KC_LSHIFT,  KC_NO,      KC_NO,        KC_UP,      KC_NO,        KC_NO,          TO(5),
+    KC_LSFT,   KC_NO,      KC_NO,        KC_UP,      KC_NO,        KC_NO,          TO(5),
     KC_LCTL,    KC_NO,      KC_LEFT,      KC_DOWN,    KC_RIGHT,
 
-    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSHIFT,  KC_END,
+    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSFT,  KC_END,
 
     KC_NO,    KC_I,       KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,  RGB_VAI,
     TO(0),    KC_G,       KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_MINUS,    RGB_VAD,
@@ -178,7 +178,7 @@ bool numlock = false;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   switch (keycode) {
-    case KC_LSHIFT:
+    case KC_LEFT_SHIFT:
     if (record->event.pressed)
       {
         left_shift_down = true;
@@ -190,7 +190,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return true;
       }
     break;
-    case KC_RSHIFT:
+    case KC_RIGHT_SHIFT:
 
       if (record->event.pressed)
       {
@@ -262,17 +262,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
         {
           if(left_shift_down)
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            unregister_code(KC_RSHIFT);
+            unregister_code(KC_RIGHT_SHIFT);
 
           register_code(KC_7);
           unregister_code(KC_7);
 
           if(left_shift_down)
-            register_code(KC_LSHIFT);
+            register_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            register_code(KC_RSHIFT);
+            register_code(KC_RIGHT_SHIFT);
         }
     }
     else
@@ -291,17 +291,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
        {
           if(left_shift_down)
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            unregister_code(KC_RSHIFT);
+            unregister_code(KC_RIGHT_SHIFT);
 
           register_code(KC_5);
           unregister_code(KC_5);
 
           if(left_shift_down)
-            register_code(KC_LSHIFT);
+            register_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            register_code(KC_RSHIFT);
+            register_code(KC_RIGHT_SHIFT);
         }
     }
     else
@@ -318,17 +318,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_3);
         unregister_code(KC_3);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -345,17 +345,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_1);
         unregister_code(KC_1);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -372,19 +372,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
-        register_code(KC_LSHIFT);
+        register_code(KC_LEFT_SHIFT);
         register_code(KC_6);
         unregister_code(KC_6);
-        unregister_code(KC_LSHIFT);
+        unregister_code(KC_LEFT_SHIFT);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -402,17 +402,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_9);
         unregister_code(KC_9);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -429,17 +429,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_0);
         unregister_code(KC_0);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -456,17 +456,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_2);
         unregister_code(KC_2);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -483,17 +483,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_4);
         unregister_code(KC_4);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -510,17 +510,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_6);
         unregister_code(KC_6);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -537,17 +537,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_8);
         unregister_code(KC_8);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -564,17 +564,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -592,17 +592,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -618,17 +618,17 @@ case RU_3:
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -644,17 +644,17 @@ case RU_4:
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -670,17 +670,17 @@ case RU_6:
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -696,17 +696,17 @@ case RU_7:
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -723,17 +723,17 @@ case RU_7:
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
diff --git a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c b/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
index 2ef62f7276..ab1fd0e889 100644
--- a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
@@ -40,11 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
    LT(NAV,KC_ESC),  KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_DELETE,
         KC_TAB,     KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   CTL_T(KC_ESC),
-        KC_LCTRL,   KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+        KC_LCTL,    KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,    KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   ALT_T(KC_TAB),
-        KC_LCTRL,   KC_LGUI,      KC_LALT,KC_NO,  MO(NAV),
+        KC_LCTL,    KC_LGUI,      KC_LALT,KC_NO,  MO(NAV),
 
-                                           KC_LCTRL,  KC_LALT,
+                                           KC_LCTL,   KC_LALT,
                                                       MO(NAV),
                        KC_TAB,    LT(SYMB_L,KC_ESC),  KC_LSFT,
                   // right hand
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                  KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,   KC_QUOT,
                   ALT_T(KC_INS), KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,
                                          MO(NAV),KC_NO,  KC_RALT,KC_RGUI,   CTL_T(KC_ENT),
-                  KC_RALT,   KC_RCTRL,
+                  KC_RALT,   KC_RCTL,
                   MO(NAV),
                   KC_RSFT, LT(SYMB_R,KC_SPACE), KC_BSPC
     ),
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
index 0f5fd4223a..a568ce30fc 100644
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_7,           KC_8,           KC_9,           KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_TRANSPARENT, KC_NO,                                                                          KC_NO,          KC_4,           KC_5,           KC_6,           KC_0,           KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_TRANSPARENT, KC_NO,                                                                          KC_NO,          KC_4,           KC_5,           KC_6,           KC_0,           KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_1,           KC_2,           KC_3,           KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [2] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_HYPR,        KC_RGUI,        KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LPRN,        KC_RPRN,        KC_ASTR,        KC_SLASH,       KC_NO,                                                                          KC_NO,          KC_TRANSPARENT, KC_RALT,        KC_RCTRL,       KC_RSHIFT,      KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LPRN,        KC_RPRN,        KC_ASTR,        KC_SLASH,       KC_NO,                                                                          KC_NO,          KC_TRANSPARENT, KC_RALT,        KC_RCTL,        KC_RSFT,        KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          MT(MOD_RGUI | MOD_RCTL, KC_NO), KC_NO, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [3] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_F5,          KC_F6,          KC_F7,          KC_F8,          KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_F5,          KC_F6,          KC_F7,          KC_F8,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO,          KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [4] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_HYPR,        KC_RGUI,        KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LBRC,        KC_RBRC,        KC_QUES,        KC_EXLM,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTRL,       KC_RSHIFT,      KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LBRC,        KC_RBRC,        KC_QUES,        KC_EXLM,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTL,        KC_RSFT,        KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT, KC_NO,          MT(MOD_RGUI | MOD_RCTL, KC_NO), KC_NO, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [5] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_HASH,        KC_BSLS,        KC_GRAVE,       KC_TILD,        KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_HASH,        KC_BSLS,        KC_GRAVE,       KC_TILD,        KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [6] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT, KC_HYPR,        KC_RGUI,        KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_UNDS,        KC_EQUAL,       KC_MINUS,       KC_PLUS,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTRL,       KC_RSHIFT,      KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_UNDS,        KC_EQUAL,       KC_MINUS,       KC_PLUS,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTL,        KC_RSFT,        KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          MT(MOD_RGUI | MOD_RCTL, KC_NO), KC_NO, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -178,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [11] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_UP,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_NO,          KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -188,7 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [12] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_ACL2,        KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_MS_WH_UP,    KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_MS_WH_LEFT,  KC_MS_WH_DOWN,  KC_MS_WH_RIGHT, KC_NO,          KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_MS_WH_LEFT,  KC_MS_WH_DOWN,  KC_MS_WH_RIGHT, KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  MO(14), KC_NO,  KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [13] = LAYOUT_ergodox_pretty(
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_PGUP,        KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSHIFT,      KC_LCTRL,       KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_NO,          KC_PGDN,      KC_NO,          KC_NO,          KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_NO,          KC_PGDN,      KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
                                                                                                     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
@@ -266,8 +266,8 @@ int cur_dance (qk_tap_dance_state_t *state) {
     else if (state->interrupted || !state->pressed) {
         // if (state->interrupted) {
         //     print("interrupted\n");
-        //     uprintf("Shift: %u\n", KC_LSHIFT);
-        //     uprintf("Control: %u\n", KC_LCTRL);
+        //     uprintf("Shift: %u\n", KC_LSFT);
+        //     uprintf("Control: %u\n", KC_LCTL);
         //     uprintf("%u\n",state->interrupting_keycode);
         // }
         return SINGLE_TAP;
@@ -293,10 +293,10 @@ void ctrlto12_finished (qk_tap_dance_state_t *state, void *user_data) {
       break;
     case SINGLE_HOLD:
       if (state->interrupted && (state->interrupting_keycode == 22273 || state->interrupting_keycode == 43)) {
-        register_mods(MOD_BIT(KC_LCTRL));
+        register_mods(MOD_BIT(KC_LCTL));
         break;
       }
-      register_mods(MOD_BIT(KC_LCTRL)); // for a layer-tap key, use `layer_on(_MY_LAYER)` here
+      register_mods(MOD_BIT(KC_LCTL)); // for a layer-tap key, use `layer_on(_MY_LAYER)` here
       if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
         register_code16(LCTL(KC_MS_BTN1));
       }
@@ -310,10 +310,10 @@ void ctrlto12_reset (qk_tap_dance_state_t *state, void *user_data) {
       break;
     case SINGLE_HOLD:
       if (state->interrupted && (state->interrupting_keycode == 22273 || state->interrupting_keycode == 43) ) {
-        unregister_mods(MOD_BIT(KC_LCTRL));
+        unregister_mods(MOD_BIT(KC_LCTL));
         break;
       }
-      unregister_mods(MOD_BIT(KC_LCTRL)); // for a layer-tap key, use `layer_off(_MY_LAYER)` here
+      unregister_mods(MOD_BIT(KC_LCTL)); // for a layer-tap key, use `layer_off(_MY_LAYER)` here
       if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
         unregister_code16(LCTL(KC_MS_BTN1));
       }
@@ -329,10 +329,10 @@ void shiftto13_finished (qk_tap_dance_state_t *state, void *user_data) {
       break;
     case SINGLE_HOLD:
       if (state->interrupted && (state->interrupting_keycode == 22272 || state->interrupting_keycode == 43) ) {
-        register_mods(MOD_BIT(KC_LSHIFT));
+        register_mods(MOD_BIT(KC_LSFT));
         break;
       }
-      register_mods(MOD_BIT(KC_LSHIFT)); // for a layer-tap key, use `layer_on(_MY_LAYER)` here
+      register_mods(MOD_BIT(KC_LSFT)); // for a layer-tap key, use `layer_on(_MY_LAYER)` here
       if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
         register_code16(LSFT(KC_MS_BTN1));
       }
@@ -346,10 +346,10 @@ void shiftto13_reset (qk_tap_dance_state_t *state, void *user_data) {
       break;
     case SINGLE_HOLD:
       if (state->interrupted && (state->interrupting_keycode == 22272 || state->interrupting_keycode == 43) ) {
-        unregister_mods(MOD_BIT(KC_LSHIFT));
+        unregister_mods(MOD_BIT(KC_LSFT));
         break;
       }
-      unregister_mods(MOD_BIT(KC_LSHIFT)); // for a layer-tap key, use `layer_off(_MY_LAYER)` here
+      unregister_mods(MOD_BIT(KC_LSFT)); // for a layer-tap key, use `layer_off(_MY_LAYER)` here
       if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
         unregister_code16(LSFT(KC_MS_BTN1));
       }
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
index af1cdc2514..13df4c3ff4 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
@@ -322,7 +322,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/KC_LSHIFT, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LT(_NUMPAD,KC_TAB),
+        /**/KC_LSFT,   /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LT(_NUMPAD,KC_TAB),
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
@@ -359,7 +359,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /**/           /*==========================================================================================*/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/  KC_MEH,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/KC_RSHIFT, /**/
+                    /**/  KC_MEH,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/KC_RSFT,   /**/
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                                                   /**/           /**/           /**/           /**/           /**/       /**/
@@ -402,7 +402,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
-              KC_LCTRL,/**/ KC_LGUI,  /**/  KC_LALT, /**/MO(_WM_MAC),   MO(_ARROWS_MAC),
+              KC_LCTL, /**/ KC_LGUI,  /**/  KC_LALT, /**/MO(_WM_MAC),   MO(_ARROWS_MAC),
             /**/       /**/           /**/           /**/           /**/           /**/
             /*=======================================================================*/
                                                                                                /*==============================*/
@@ -478,7 +478,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
-              KC_LGUI, /**/ KC_LCTRL, /**/  KC_LALT,   MO(_WM_WINDOWS), MO(_ARROWS_WINDOWS),
+              KC_LGUI, /**/ KC_LCTL,  /**/  KC_LALT,   MO(_WM_WINDOWS), MO(_ARROWS_WINDOWS),
             /**/       /**/           /**/           /**/           /**/           /**/
             /*=======================================================================*/
                                                                                                /*==============================*/
@@ -491,7 +491,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /**/           /**/           /*===============*/
                                                                                 /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ KC_LCTRL, /**/ _______,  /**/
+                                                                                /**/ _______,  /**/ KC_LCTL,  /**/ _______,  /**/
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /*=============================================*/
 
@@ -515,7 +515,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
                     /*=========================================================================================================*/
                                                   /**/           /**/           /**/           /**/           /**/       /**/
-                                              MO(_ARROWS_WINDOWS), MO(_WM_WINDOWS),  KC_RALT,  /**/ KC_RCTRL, /**/  ___, /**/
+                                              MO(_ARROWS_WINDOWS), MO(_WM_WINDOWS),  KC_RALT,  /**/ KC_RCTL,  /**/  ___, /**/
                                                   /**/           /**/           /**/           /**/           /**/       /**/
                                                   /*=======================================================================*/
         /*==============================*/
@@ -774,7 +774,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_LCTRL, /**/ KC_LGUI,  /**/ KC_LSHIFT,/**/ KC_LALT,  /**/LGUI(KC_D),/*===============*/
+        /**/ _______,  /**/ KC_LCTL,  /**/ KC_LGUI,  /**/ KC_LSFT,  /**/ KC_LALT,  /**/LGUI(KC_D),/*===============*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
@@ -850,7 +850,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_LGUI,  /**/ KC_HYPR,  /**/ KC_LSHIFT,/**/ KC_LCTRL, /**/LCTL(KC_D),/*===============*/
+        /**/ _______,  /**/ KC_LGUI,  /**/ KC_HYPR,  /**/ KC_LSFT,  /**/ KC_LCTL,  /**/LCTL(KC_D),/*===============*/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*==========================================================================================*/           /**/
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
diff --git a/keyboards/ergodox_ez/keymaps/rishka/keymap.c b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
index e689ae80b8..5a343d9c1a 100644
--- a/keyboards/ergodox_ez/keymaps/rishka/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
@@ -75,12 +75,12 @@ _______, _______, _______, _______, _______,
   // left hand
   KC_ESCAPE, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5,
   KC_F1, KC_Y, KC_Q, KC_W, KC_E, KC_R, KC_T,
-  KC_TAB, KC_LSHIFT, KC_A, KC_S, KC_D, KC_F,
-  KC_LCTRL, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_G,
+  KC_TAB, KC_LSFT, KC_A, KC_S, KC_D, KC_F,
+  KC_LCTL, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_G,
   LT(BASE, KC_L), KC_J, KC_I, KC_O, KC_M,
                                                KC_ESCAPE, _______,
                                                         KC_ENTER,
-                                      KC_SPACE, KC_LCTRL, KC_LALT,
+                                      KC_SPACE, KC_LCTL, KC_LALT,
  // right hand
   KC_RGHT,      KC_6,    KC_7,    KC_8,    KC_9,              KC_0,           KC_MINS,
   TG(SYMB),     KC_Y,    KC_U,    KC_I,    KC_O,              KC_P,           KC_BSLS,
diff --git a/keyboards/ergodox_ez/keymaps/saha/keymap.c b/keyboards/ergodox_ez/keymaps/saha/keymap.c
index 83aaf13e33..4aaf326587 100644
--- a/keyboards/ergodox_ez/keymaps/saha/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/saha/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_RALT, /**/ KC_LCTRL, /**/
+            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_RALT, /**/ KC_LCTL,  /**/
             /**/       /**/           /**/           /**/           /**/           /**/
             /*=======================================================================*/
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /**/           /**/           /*===============*/
                                                                                 /**/           /**/           /**/           /**/
-                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTRL, /**/
+                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTL,  /**/
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /*=============================================*/
 
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_LALT, /**/ KC_LCTRL, /**/
+            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_LALT, /**/ KC_LCTL,  /**/
             /**/       /**/           /**/           /**/           /**/           /**/
             /*=======================================================================*/
 
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /**/           /**/           /*===============*/
                                                                                 /**/           /**/           /**/           /**/
-                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTRL, /**/
+                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTL,  /**/
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /*=============================================*/
 
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
         /*=========================================================================================================*/
             /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_LALT, /**/ KC_LCTRL, /**/
+            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_LALT, /**/ KC_LCTL,  /**/
             /**/       /**/           /**/           /**/           /**/           /**/
             /*=======================================================================*/
 
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /**/           /**/           /*===============*/
                                                                                 /**/           /**/           /**/           /**/
-                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTRL, /**/
+                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTL,  /**/
                                                                                 /**/           /**/           /**/           /**/
                                                                                 /*=============================================*/
 
diff --git a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
index 13ae246e85..0d60e46bfc 100644
--- a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LCBR,
         ALL_T(KC_CAPS), KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        LT(MDIA,KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_LALT,
-        KC_LCTRL,       KC_LBRC,      KC_RBRC,        KC_GRV, KC_QUOT,
+        KC_LCTL,        KC_LBRC,      KC_RBRC,        KC_GRV, KC_QUOT,
                                                      KC_PSCR, KC_LGUI,
                                                               KC_INS,
                                                KC_SPC,KC_BSPC,KC_DEL,
@@ -181,7 +181,7 @@ void matrix_scan_user(void) {
      }
   }
 
-  if(keyboard_report->mods & MOD_BIT(KC_LCTRL))
+  if(keyboard_report->mods & MOD_BIT(KC_LCTL))
   {
       ergodox_right_led_3_set (LED_BRIGHTNESS_HI);
       ergodox_right_led_3_on ();
diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c
index cd8733a21f..016bec72f4 100644
--- a/keyboards/ergodox_ez/keymaps/testing/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c
@@ -20,7 +20,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
+  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
 
   [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCLN,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI),
 
diff --git a/keyboards/ergodox_ez/keymaps/vim/vim.h b/keyboards/ergodox_ez/keymaps/vim/vim.h
index 7565c6e3e6..2f3b859943 100644
--- a/keyboards/ergodox_ez/keymaps/vim/vim.h
+++ b/keyboards/ergodox_ez/keymaps/vim/vim.h
@@ -94,15 +94,15 @@ void CMD(uint16_t keycode) {
 }
 
 void CTRL(uint16_t keycode) {
-  PRESS(KC_LCTRL);
+  PRESS(KC_LCTL);
     TAP(keycode);
-  RELEASE(KC_LCTRL);
+  RELEASE(KC_LCTL);
 }
 
 void SHIFT(uint16_t keycode) {
-  PRESS(KC_LSHIFT);
+  PRESS(KC_LSFT);
     TAP(keycode);
-  RELEASE(KC_LSHIFT);
+  RELEASE(KC_LSFT);
 }
 
 void ALT(uint16_t keycode) {
@@ -309,9 +309,9 @@ void VIM_YANK_LINE(void) {
   print("\e[31mY\e[0m");
   VIM_LEADER(KC_NO);
   CMD(KC_LEFT);
-  PRESS(KC_LSHIFT);
+  PRESS(KC_LSFT);
     CMD(KC_RIGHT);
-  RELEASE(KC_LSHIFT);
+  RELEASE(KC_LSFT);
   CMD(KC_C);
 }
 
@@ -432,9 +432,9 @@ void VIM_DELETE_WHOLE_LINE(void) {
   print("\e[31md\e[0m");
   VIM_LEADER(KC_NO);
   CMD(KC_LEFT);
-  PRESS(KC_LSHIFT);
+  PRESS(KC_LSFT);
     CMD(KC_RIGHT);
-  RELEASE(KC_LSHIFT);
+  RELEASE(KC_LSFT);
   CMD(KC_X);
 }
 
@@ -464,7 +464,7 @@ void VIM_DELETE_BACK(void) {
   PRESS(KC_LALT);
     SHIFT(KC_LEFT); // select to start of word
     SHIFT(KC_DEL); // delete selection
-  RELEASE(KC_LSHIFT);
+  RELEASE(KC_LSFT);
 }
 
 /**
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/README.md b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
index 0402b68e08..33d485590f 100644
--- a/keyboards/ergodox_ez/util/keymap_beautifier/README.md
+++ b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
@@ -7,7 +7,7 @@ This Python 3 script, by [Tsan-Kuang Lee](https://github.com/tsankuanglee) takes
 For example, the original `keymap.c` looks like
 
 ```
-[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
+[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
 ```
 
 The beautifier parses it and outputs:
@@ -20,7 +20,7 @@ KC_EQUAL      , KC_1       , KC_2           , KC_3   , KC_4    , KC_5, LCTL(KC_M
 KC_DELETE     , KC_Q       , KC_W           , KC_E   , KC_R    , KC_T, KC_LBRC   ,
 KC_BSPC       , KC_A       , KC_S           , KC_D   , KC_F    , KC_G,
 KC_LSPO       , CTL_T(KC_Z), KC_X           , KC_C   , KC_V    , KC_B, ALL_T(KC_NO)  ,
-LT(1,KC_GRAVE), KC_QUOTE   , LALT(KC_LSHIFT), KC_LEFT, KC_RIGHT,
+LT(1,KC_GRAVE), KC_QUOTE   , LALT(KC_LSFT)  , KC_LEFT, KC_RIGHT,
 
 // left thumb
 
@@ -49,9 +49,9 @@ Optionally, it can also render [LAYOUT_ergodox_pretty](https://github.com/qmk/qm
 [0] = LAYOUT_ergodox_pretty(
   KC_ESCAPE,        KC_1,     KC_2,    KC_3,     KC_4,           KC_5,          KC_LEAD,      KC_LEAD, 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_HYPR,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLS             ,
-   KC_LCTRL,        KC_A,     KC_S,    KC_D,     KC_F,           KC_G,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
-  KC_LSHIFT,        KC_Z,     KC_X,    KC_C,     KC_V,           KC_B,           SH_MON,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSHIFT           ,
-LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI,  KC_LALT,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
+   KC_LCTL,         KC_A,     KC_S,    KC_D,     KC_F,           KC_G,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
+  KC_LSFT,          KC_Z,     KC_X,    KC_C,     KC_V,           KC_B,           SH_MON,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSFT             ,
+LT(6,KC_NO), LT(7,KC_NO), KC_LCTL,  KC_LGUI,  KC_LALT,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
 
                                                        LT(6,KC_GRAVE),     MEH_T(KC_NO),      KC_LEFT, KC_RIGHT      ,
                                                                        LT(10,KC_DELETE),      KC_UP  ,
@@ -64,9 +64,9 @@ We can also align everythng t othe left (easier editing in my opinon):
 [0] = LAYOUT_ergodox_pretty(
 KC_ESCAPE  , KC_1       , KC_2    , KC_3   , KC_4    , KC_5          , KC_LEAD         ,      KC_LEAD, 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_HYPR         ,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLS             ,
-KC_LCTRL   , KC_A       , KC_S    , KC_D   , KC_F    , KC_G          ,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
-KC_LSHIFT  , KC_Z       , KC_X    , KC_C   , KC_V    , KC_B          , SH_MON          ,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSHIFT           ,
-LT(6,KC_NO), LT(7,KC_NO), KC_LCTRL, KC_LGUI, KC_LALT ,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
+KC_LCTL    , KC_A       , KC_S    , KC_D   , KC_F    , KC_G          ,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
+KC_LSFT    , KC_Z       , KC_X    , KC_C   , KC_V    , KC_B          , SH_MON          ,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSFT             ,
+LT(6,KC_NO), LT(7,KC_NO), KC_LCTL , KC_LGUI, KC_LALT ,                                                                 ALGR_T(KC_MINUS), RGUI_T(KC_EQUAL), RCTL_T(KC_LBRC),     LT(10,KC_RBRC),     LT(6,KC_APPLICATION),
 
                                                        LT(6,KC_GRAVE), MEH_T(KC_NO)    ,      KC_LEFT, KC_RIGHT      ,
                                                                        LT(10,KC_DELETE),      KC_UP  ,
diff --git a/keyboards/ergodox_stm32/keymaps/default/keymap.c b/keyboards/ergodox_stm32/keymaps/default/keymap.c
index d35adf46c8..001d74b18d 100644
--- a/keyboards/ergodox_stm32/keymaps/default/keymap.c
+++ b/keyboards/ergodox_stm32/keymaps/default/keymap.c
@@ -1,7 +1,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ergodox(KC_GRAVE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LPRN,KC_ESCAPE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSHIFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_RPRN,KC_LCTRL,KC_LGUI,KC_LALT,KC_LGUI,KC_LALT,KC_INSERT,MO(1),KC_HOME,KC_SPACE,KC_DELETE,KC_END,KC_EQUAL,KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPC,KC_LBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOTE,KC_RBRC,KC_N,KC_M,KC_COMMA,KC_DOT,KC_SLASH,KC_RSHIFT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_RCTRL,MO(1),TG(2),KC_PGUP,KC_PGDN,KC_BSPC,KC_ENTER),
+  [0] = LAYOUT_ergodox(KC_GRAVE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LPRN,KC_ESCAPE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_RPRN,KC_LCTL,KC_LGUI,KC_LALT,KC_LGUI,KC_LALT,KC_INSERT,MO(1),KC_HOME,KC_SPACE,KC_DELETE,KC_END,KC_EQUAL,KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPC,KC_LBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOTE,KC_RBRC,KC_N,KC_M,KC_COMMA,KC_DOT,KC_SLASH,KC_RSFT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_RCTL,MO(1),TG(2),KC_PGUP,KC_PGDN,KC_BSPC,KC_ENTER),
 
   [1] = LAYOUT_ergodox(KC_TILD,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_GRAVE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_CAPS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_BSPC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(LGUI(KC_Q)),KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP),
 
diff --git a/keyboards/ergotravel/keymaps/yanfali/config.h b/keyboards/ergotravel/keymaps/yanfali/config.h
index 9aa48a5a66..194503df2d 100644
--- a/keyboards/ergotravel/keymaps/yanfali/config.h
+++ b/keyboards/ergotravel/keymaps/yanfali/config.h
@@ -39,4 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 
-#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)))
+#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)))
diff --git a/keyboards/eve/meteor/keymaps/via/keymap.c b/keyboards/eve/meteor/keymaps/via/keymap.c
index aefb5b7a96..72a5072336 100644
--- a/keyboards/eve/meteor/keymaps/via/keymap.c
+++ b/keyboards/eve/meteor/keymaps/via/keymap.c
@@ -24,7 +24,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_BSPC,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,  MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                                   KC_NO,   KC_RALT, KC_NO  , KC_RGUI, KC_RCTRL
+    KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                                   KC_NO,   KC_RALT, KC_NO  , KC_RGUI, KC_RCTL
   ),
 
   [1] = LAYOUT_all(
diff --git a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
index 528b868196..a7b96530d9 100644
--- a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,
   KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				KC_ENT,
   KC_LSFT,		KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,		KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_RSFT,				MO(_L1),
-  KC_LCTL,		KC_LGUI,	KC_LALT,	TG(_L3),	KC_SPC, 				KC_SPC,					MO(_L2),	KC_RALT,	KC_APP,					KC_RCTRL),
+  KC_LCTL,		KC_LGUI,	KC_LALT,	TG(_L3),	KC_SPC, 				KC_SPC,					MO(_L2),	KC_RALT,	KC_APP,					KC_RCTL),
  
 [_L2] = LAYOUT_split_space(
   _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	QK_BOOT,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SCRL,	KC_PAUS,
diff --git a/keyboards/evyd13/atom47/keymaps/default/keymap.c b/keyboards/evyd13/atom47/keymaps/default/keymap.c
index b642d12610..ba547b5c2a 100644
--- a/keyboards/evyd13/atom47/keymaps/default/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,   KC_BSPC,
   KC_TAB,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,            KC_ENT,
   KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_RSFT,  MO(_FN1),
-  KC_LCTL,  KC_LGUI,  KC_LALT,  MO(_PN),            KC_SPC,             KC_SPC,             MO(_FN),  KC_RALT,  KC_APP,   KC_RCTRL),
+  KC_LCTL,  KC_LGUI,  KC_LALT,  MO(_PN),            KC_SPC,             KC_SPC,             MO(_FN),  KC_RALT,  KC_APP,   KC_RCTL),
  
 [_FN] = LAYOUT_split_space(
   _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,
diff --git a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c b/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
index cb1eb4cf45..2f3cb33d94 100644
--- a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC,  KC_Q,     KC_W,       KC_E,      KC_R,        KC_T,       KC_Y,    KC_U,      KC_I,     KC_O,      KC_P,     KC_DEL,   KC_BSPC,
   KC_TAB,   KC_A,     KC_S,       KC_D,      KC_F,        KC_G,       KC_H,    KC_J,      KC_K,     KC_L,      KC_SCLN,            KC_ENT,
   KC_LSFT,            KC_Z,       KC_X,      KC_C,        KC_V,       KC_B,    KC_N,      KC_M,     KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,
-  KC_LCTL,  KC_LGUI,  KC_LALT,    MO(_LO),                KC_SPC,              KC_SPC,              MO(_RA),   KC_RALT,  KC_APP,   KC_RCTRL),
+  KC_LCTL,  KC_LGUI,  KC_LALT,    MO(_LO),                KC_SPC,              KC_SPC,              MO(_RA),   KC_RALT,  KC_APP,   KC_RCTL),
 
 [_LO] = LAYOUT_split_space(
   KC_GRV,   KC_F1,    KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,    KC_F7,    KC_F8,    KC_F9,     KC_F10,   KC_F11,   KC_F12,
diff --git a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c b/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
index 4be4776f15..da90eae9d3 100644
--- a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,
 	  KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				KC_QUOT,
 	  KC_LSFT,					KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,		KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,	SHIFTEN,
-	  KC_LCTL,		KC_LGUI,	KC_LALT,	LOWER,					SPACFNL, 				SPACFNR,				RAISE,		KC_RALT,	KC_APP,		KC_RCTRL
+	  KC_LCTL,		KC_LGUI,	KC_LALT,	LOWER,					SPACFNL, 				SPACFNR,				RAISE,		KC_RALT,	KC_APP,		KC_RCTL
 	),
 
 	// Main Fn navigation layer
diff --git a/keyboards/evyd13/atom47/keymaps/via/keymap.c b/keyboards/evyd13/atom47/keymaps/via/keymap.c
index fbf9ea68df..93788cf18c 100644
--- a/keyboards/evyd13/atom47/keymaps/via/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,   KC_BSPC,
   KC_TAB,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,            KC_ENT,
   KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_RSFT,  MO(2),
-  KC_LCTL,  KC_LGUI,  KC_LALT,  MO(3),              KC_SPC,             KC_SPC,             MO(1),    KC_RALT,  KC_APP,   KC_RCTRL),
+  KC_LCTL,  KC_LGUI,  KC_LALT,  MO(3),              KC_SPC,             KC_SPC,             MO(1),    KC_RALT,  KC_APP,   KC_RCTL),
  
 [1] = LAYOUT_split_space(
   _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,
diff --git a/keyboards/evyd13/eon87/keymaps/default/keymap.c b/keyboards/evyd13/eon87/keymaps/default/keymap.c
index d3b14b88a2..2f66cc5ebd 100644
--- a/keyboards/evyd13/eon87/keymaps/default/keymap.c
+++ b/keyboards/evyd13/eon87/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,    KC_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_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,  MO(_FN),              KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,                       KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,                       KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT),
 [_FN] = LAYOUT_all(
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,    KC_VOLD,   KC_MUTE,  KC_VOLU,
diff --git a/keyboards/evyd13/eon87/keymaps/via/keymap.c b/keyboards/evyd13/eon87/keymaps/via/keymap.c
index e170cb7eda..2a4a1ed49e 100644
--- a/keyboards/evyd13/eon87/keymaps/via/keymap.c
+++ b/keyboards/evyd13/eon87/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,    KC_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_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,  MO(1),                KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,                       KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,                       KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT),
 [1] = LAYOUT_all(
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,    KC_VOLD,   KC_MUTE,  KC_VOLU,
diff --git a/keyboards/evyd13/minitomic/keymaps/default/keymap.c b/keyboards/evyd13/minitomic/keymaps/default/keymap.c
index fd5f55a96c..f29a16b5e1 100644
--- a/keyboards/evyd13/minitomic/keymaps/default/keymap.c
+++ b/keyboards/evyd13/minitomic/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GESC,  KC_Q,     KC_W,        KC_E,        KC_R,        KC_T,        KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,    KC_BSPC,
   KC_TAB,   KC_A,     KC_S,        KC_D,        KC_F,        KC_G,        KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,             KC_ENT,
   KC_LSFT,            KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,
-  KC_LCTL,  KC_LGUI,  KC_LALT,     MO(_LO),                  KC_SPC,                KC_SPC,             MO(_HI),  KC_RALT,  KC_APP,    KC_RCTRL),
+  KC_LCTL,  KC_LGUI,  KC_LALT,     MO(_LO),                  KC_SPC,                KC_SPC,             MO(_HI),  KC_RALT,  KC_APP,    KC_RCTL),
 
 [_LO] = LAYOUT_split_space(
   KC_GRV,   KC_F1,    KC_F2,       KC_F3,       KC_F4,       KC_F5,       KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,
diff --git a/keyboards/evyd13/nt660/keymaps/default/keymap.c b/keyboards/evyd13/nt660/keymaps/default/keymap.c
index 5c9e1b22f0..4ff46b9cf8 100644
--- a/keyboards/evyd13/nt660/keymaps/default/keymap.c
+++ b/keyboards/evyd13/nt660/keymaps/default/keymap.c
@@ -22,5 +22,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_APP,  KC_RCTRL,KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 };
diff --git a/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c b/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
index 86528ebfaf..96e2f3bef3 100644
--- a/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  _______, KC_ENT,
   KC_LSFT, _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,                   SPACE,                              KC_RALT, KC_RCTRL,MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LGUI, KC_LALT,                   SPACE,                              KC_RALT, KC_RCTL, MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
   
 [_GA] = LAYOUT_all(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
diff --git a/keyboards/evyd13/nt660/keymaps/via/keymap.c b/keyboards/evyd13/nt660/keymaps/via/keymap.c
index 39d37390f5..43e89fb6b5 100644
--- a/keyboards/evyd13/nt660/keymaps/via/keymap.c
+++ b/keyboards/evyd13/nt660/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_RCTRL,KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 [1] = LAYOUT_all(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/evyd13/omrontkl/keymaps/default/keymap.c b/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
index 9612f973c6..d0e930b4b3 100644
--- a/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
+++ b/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,    KC_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_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,  MO(_FN),              KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                                          KC_SPC,                                           KC_RALT,  KC_RGUI,  KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                                          KC_SPC,                                           KC_RALT,  KC_RGUI,  KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT),
 [_FN] = LAYOUT_all(
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_VOLD,   KC_MUTE,  KC_VOLU,
diff --git a/keyboards/evyd13/plain60/keymaps/audio/keymap.c b/keyboards/evyd13/plain60/keymaps/audio/keymap.c
index 6512cb3645..f6d71f63de 100644
--- a/keyboards/evyd13/plain60/keymaps/audio/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/audio/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          \
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,           \
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, LT(_FN, KC_UP),   \
-  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTRL),
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTL),
 
 [_FN] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/evyd13/plain60/keymaps/default/keymap.c b/keyboards/evyd13/plain60/keymaps/default/keymap.c
index 6bb33da661..aa0b17894b 100644
--- a/keyboards/evyd13/plain60/keymaps/default/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/default/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, LT(_FN, KC_UP),
-  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTRL),
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTL),
 
 [_FN] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/evyd13/plain60/keymaps/rgb/keymap.c b/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
index fa6aaa7f99..0c4970aac0 100644
--- a/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          \
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,           \
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, LT(_FN, KC_UP),            \
-  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTRL),
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTL),
 
 [_FN] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/evyd13/plain60/keymaps/via/keymap.c b/keyboards/evyd13/plain60/keymaps/via/keymap.c
index a500f23896..f10d73e576 100644
--- a/keyboards/evyd13/plain60/keymaps/via/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/via/keymap.c
@@ -7,7 +7,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTRL),
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
   
 [1] = LAYOUT(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
diff --git a/keyboards/evyd13/ta65/keymaps/default/keymap.c b/keyboards/evyd13/ta65/keymaps/default/keymap.c
index 8a1e6542df..60128039b1 100644
--- a/keyboards/evyd13/ta65/keymaps/default/keymap.c
+++ b/keyboards/evyd13/ta65/keymaps/default/keymap.c
@@ -7,7 +7,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,   KC_O,     KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,          KC_DEL,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,   KC_L,     KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,           KC_PGUP,
   KC_LSFT, KC_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_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
 
 [1] = LAYOUT_all(
   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
diff --git a/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c b/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
index 04dba9da75..2881f9923c 100644
--- a/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL,
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,  KC_PGUP,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,   KC_PGDN,
-  KC_CAPS, KC_LGUI, KC_LALT,                   SPACE,                              KC_RALT, KC_RCTRL,MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_CAPS, KC_LGUI, KC_LALT,                   SPACE,                              KC_RALT, KC_RCTL, MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
 
 [_GA] = LAYOUT_65_ansi(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
diff --git a/keyboards/evyd13/ta65/keymaps/via/keymap.c b/keyboards/evyd13/ta65/keymaps/via/keymap.c
index e2d96eb9c0..24287086f1 100644
--- a/keyboards/evyd13/ta65/keymaps/via/keymap.c
+++ b/keyboards/evyd13/ta65/keymaps/via/keymap.c
@@ -7,7 +7,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,          KC_DEL,
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS, KC_ENT,           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_CAPS, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTRL,MO(2),    KC_LEFT, KC_DOWN,          KC_RGHT),
+  KC_CAPS, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL, MO(2),    KC_LEFT, KC_DOWN,          KC_RGHT),
 
 [1] = LAYOUT_all(
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  _______, _______, KC_PSCR,
diff --git a/keyboards/evyd13/wonderland/keymaps/default/keymap.c b/keyboards/evyd13/wonderland/keymaps/default/keymap.c
index 5bdd7892c0..2b2a457ec1 100644
--- a/keyboards/evyd13/wonderland/keymaps/default/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_PGUP, KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
  KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
           KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-          KC_LCTL,    KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   KC_RCTRL
+          KC_LCTL,    KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   KC_RCTL
    ),
 [_FUNC] = LAYOUT(
  RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
diff --git a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
index 4781f3d63f..15f45eb8e8 100644
--- a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F10, KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
   KC_F11, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, \
           KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), \
-          KC_LCTL,    KC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, KC_RAPC,                   KC_RCTRL \
+          KC_LCTL,    KC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, KC_RAPC,                   KC_RCTL \
    ),
 [_FUNC] = LAYOUT(
  RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT, \
diff --git a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c b/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
index 998b53c012..617999da74 100644
--- a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_PGUP, KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,  KC_RBRC, KC_DEL,
  KC_PGDN, KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,   KC_ENT,
           KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT, MO(1),
-          KC_LCTL,          KC_LGUI, KC_NUBS, KC_LALT,           KC_SPC,                   KC_NUHS,                            KC_RCTRL
+          KC_LCTL,          KC_LGUI, KC_NUBS, KC_LALT,           KC_SPC,                   KC_NUHS,                            KC_RCTL
    ),
 [_FUNC] = LAYOUT(
  RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12, XXXXXXX, QK_BOOT,
diff --git a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
index f39a3b056d..3aa5a95f96 100644
--- a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         KC_LCTL, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  KC_QUOT,        KC_ENT, KC_PGDN,
         KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT,KC_SLSH,         KC_RSFT, KC_UP, KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                      KC_RALT, KC_RCTRL, KC_LEFT, KC_DOWN,KC_RGHT),
+        KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                      KC_RALT, KC_RCTL,  KC_LEFT, KC_DOWN,KC_RGHT),
 
     [OSX] = LAYOUT_65_ansi_blocker_splitbs(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
index 08899cd6bf..f30432cdb8 100644
--- a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
@@ -36,7 +36,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_BSPC, KC_PGDN,
 		KC_LCTL, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  KC_QUOT,        KC_ENT,
 		KC_LSFT, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT,KC_SLSH,         KC_RSFT, KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                      KC_RALT, KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT),
+		KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                      KC_RALT, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
 
   [OSX] = LAYOUT_75_ansi_splitbs(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
index 20baf8306b..43d018547e 100644
--- a/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_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_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
diff --git a/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
index 07203d55f1..0331ab69a9 100644
--- a/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_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_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
diff --git a/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c b/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
index 20baf8306b..43d018547e 100644
--- a/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_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_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
diff --git a/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c b/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
index 07203d55f1..0331ab69a9 100644
--- a/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_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_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
diff --git a/keyboards/flygone60/rev3/keymaps/default/keymap.c b/keyboards/flygone60/rev3/keymaps/default/keymap.c
index b78c795b45..20bcc64f80 100644
--- a/keyboards/flygone60/rev3/keymaps/default/keymap.c
+++ b/keyboards/flygone60/rev3/keymaps/default/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSHIFT, KC_UP, KC_SLASH,
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RIGHT
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSFT, KC_UP, KC_SLASH,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT_60_ansi_arrow(
         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,
diff --git a/keyboards/flygone60/rev3/keymaps/via/keymap.c b/keyboards/flygone60/rev3/keymaps/via/keymap.c
index c966a5e14a..0f00248839 100644
--- a/keyboards/flygone60/rev3/keymaps/via/keymap.c
+++ b/keyboards/flygone60/rev3/keymaps/via/keymap.c
@@ -36,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSHIFT, KC_UP, KC_SLASH,
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_1), KC_LEFT, KC_DOWN, KC_RIGHT
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_RSFT, KC_UP, KC_SLASH,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(_1), KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_1] = LAYOUT_60_ansi_arrow(
         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,
diff --git a/keyboards/forever65/keymaps/default/keymap.c b/keyboards/forever65/keymaps/default/keymap.c
index 0cb7fcb821..9015da00ec 100644
--- a/keyboards/forever65/keymaps/default/keymap.c
+++ b/keyboards/forever65/keymaps/default/keymap.c
@@ -22,6 +22,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
-    KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTRL,                  KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
   ),
 };
diff --git a/keyboards/forever65/keymaps/via/keymap.c b/keyboards/forever65/keymaps/via/keymap.c
index ee4b57e664..20e2f55b63 100644
--- a/keyboards/forever65/keymaps/via/keymap.c
+++ b/keyboards/forever65/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_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_LWIN, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTRL,                  KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_all(
     QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/fungo/keymaps/default/keymap.c b/keyboards/fungo/keymaps/default/keymap.c
index 4c48b6467f..a0d2058ed0 100644
--- a/keyboards/fungo/keymaps/default/keymap.c
+++ b/keyboards/fungo/keymaps/default/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_TAB,
     KC_NO,      KC_A,     SFCT_S,  CT_D,    SF_F,     KC_G,    KC_LBRC,                                                             KC_RBRC,  KC_H,  MTC_J,  MTC_K,   KC_L,    KC_SCLN, KC_NO,
     KC_LCTL,    KC_Z,     KC_X,    KC_C,    KC_V,     KC_B,    KC_BSLS,  LM(F3LAY, MOD_LSFT), KC_NO,   KC_NO,  LM(F3LAY, MOD_RSFT), KC_QUOT,  KC_N,  KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
-    KC_NO,      TT(SAM1), KC_NO,   KC_LALT,    KC_LSHIFT,      KC_SPC,   MO(F3LAY),           KC_ENT,  KC_ENT, TT(F3LAY),           KC_SPC,     KC_RSHIFT,   KC_RALT, KC_NO,   TT(SAM1),TG(F4LAY)
+    KC_NO,      TT(SAM1), KC_NO,   KC_LALT,    KC_LSFT,        KC_SPC,   MO(F3LAY),           KC_ENT,  KC_ENT, TT(F3LAY),           KC_SPC,     KC_RSFT,     KC_RALT, KC_NO,   TT(SAM1),TG(F4LAY)
   ),
 
   /* BASE
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,     KC_1,       KC_2,        KC_3,         KC_4,         KC_5,    KC_CAPS,                                                             KC_CAPS, KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_TAB,
     KC_NO,      KC_NO,      SFCTLNO,     KC_LCTL,      KC_LSFT,      KC_PAUS, KC_PSCR,                                                             KC_BSPC, KC_DEL,  KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_NO,
     KC_LCTL,    LCTL(KC_Z), LCTL(KC_X),  LCTL(KC_C),   LCTL(KC_V),   KC_NO,   KC_NO,    LM(F3LAY, MOD_LSFT), KC_NO,   KC_NO,  LM(F3LAY, MOD_RSFT), KC_NO,   KC_INS,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_RCTL,
-    KC_NO,      KC_NO,      KC_NO,       KC_LALT,           KC_LSHIFT,        KC_SPC,   MO(F3LAY),           KC_ENT,  KC_ENT, TT(F3LAY),           KC_SPC,     KC_RSHIFT,     KC_RALT, KC_NO,    KC_NO,   TG(F4LAY)
+    KC_NO,      KC_NO,      KC_NO,       KC_LALT,           KC_LSFT,          KC_SPC,   MO(F3LAY),           KC_ENT,  KC_ENT, TT(F3LAY),           KC_SPC,     KC_RSFT,       KC_RALT, KC_NO,    KC_NO,   TG(F4LAY)
   ),
 
 
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,     KC_NO,      KC_NO,       KC_NO,        KC_NO,        KC_NO,   KC_CAPS,                                                             KC_CAPS, KC_DEL,  KC_HOME, KC_UP,   KC_END,   KC_NO,   KC_TAB,
     KC_NO,      KC_NO,      SFCTLNO,     KC_LCTL,      KC_LSFT,      KC_PAUS, KC_PSCR,                                                             KC_BSPC, KC_INS,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO,   KC_NO,
     KC_LCTL,    LCTL(KC_Z), LCTL(KC_X),  LCTL(KC_C),   LCTL(KC_V),   KC_NO,   KC_NO,    LM(F3LAY, MOD_LSFT), KC_NO,   KC_NO,  LM(F3LAY, MOD_RSFT), KC_NO,   KC_INS,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_RCTL,
-    KC_NO,      KC_NO,      KC_NO,       KC_LALT,           KC_LSHIFT,        KC_SPC,   MO(F3LAY),           KC_ENT,  KC_ENT, TT(F3LAY),           KC_SPC,     KC_RSHIFT,     KC_RALT, KC_NO,    KC_NO,   TG(F4LAY)
+    KC_NO,      KC_NO,      KC_NO,       KC_LALT,           KC_LSFT,          KC_SPC,   MO(F3LAY),           KC_ENT,  KC_ENT, TT(F3LAY),           KC_SPC,     KC_RSFT,       KC_RALT, KC_NO,    KC_NO,   TG(F4LAY)
   ),
   
   /*
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_TAB,
     KC_LSFT,    KC_A,   KC_S,    KC_D,    KC_F,     KC_G,    KC_LBRC,                                               KC_RBRC,  KC_H,    KC_J,    KC_K,      KC_L,   KC_SCLN, KC_RSFT,
     KC_LCTL,    KC_Z,   KC_X,    KC_C,    KC_V,     KC_B,    KC_BSLS,  KC_LCTL,        KC_NO,   KC_NO,  TG(F4LAY),  KC_QUOT,  KC_N,    KC_M,    KC_COMM,   KC_DOT, KC_SLSH, KC_RCTL,
-    KC_NO,      KC_NO,  KC_NO,   KC_LALT,    KC_LSHIFT,      KC_SPC,   MO(F3LAY),      KC_ENT,  KC_ENT, TT(F3LAY),  KC_SPC,      KC_RSHIFT,     KC_RALT,   KC_NO,  KC_NO,   KC_NO
+    KC_NO,      KC_NO,  KC_NO,   KC_LALT,    KC_LSFT,        KC_SPC,   MO(F3LAY),      KC_ENT,  KC_ENT, TT(F3LAY),  KC_SPC,      KC_RSFT,       KC_RALT,   KC_NO,  KC_NO,   KC_NO
   ),
   */
   
diff --git a/keyboards/gami_studio/lex60/keymaps/default/keymap.c b/keyboards/gami_studio/lex60/keymaps/default/keymap.c
index 308c93aacf..b989ec5481 100644
--- a/keyboards/gami_studio/lex60/keymaps/default/keymap.c
+++ b/keyboards/gami_studio/lex60/keymaps/default/keymap.c
@@ -17,21 +17,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,               KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,          KC_I,    KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
       MT(MOD_LCTL, KC_ESC), KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_H,    KC_J,          KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_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_UP,
-      KC_LCTL,              KC_LGUI, KC_LALT,                    KC_SPC,           LT(2, KC_ENT),                    KC_RGUI, KC_RALT, KC_APP,  KC_RCTRL),
+      KC_LCTL,              KC_LGUI, KC_LALT,                    KC_SPC,           LT(2, KC_ENT),                    KC_RGUI, KC_RALT, KC_APP,  KC_RCTL),
 
   [_GAMING] = LAYOUT(
       KC_ESC,               KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_6,    KC_7,          KC_8,    KC_9,     KC_0,    KC_MINS, KC_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_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_NUBS, KC_Z,    KC_X,     KC_C,    KC_V,    KC_B,    KC_N,          KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
-      KC_LCTL,              KC_LGUI, KC_LALT,                    KC_SPC,           XXXXXXX,                          KC_RGUI, KC_RALT, KC_APP,  KC_RCTRL),
+      KC_LCTL,              KC_LGUI, KC_LALT,                    KC_SPC,           XXXXXXX,                          KC_RGUI, KC_RALT, KC_APP,  KC_RCTL),
 
   [_FUNCTION] = LAYOUT(
       KC_ESC,               KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,         KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_BSLS,   KC_DEL,
       KC_TAB,               XXXXXXX, KC_UP,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       KC_LCTL,              KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,       KC_UP,   KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       KC_LSFT,              XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      KC_LCTL,              KC_LGUI, KC_LALT,                    KC_SPC,           LT(2, KC_ENT),                    KC_RGUI, KC_RALT, KC_APP,  KC_RCTRL),
+      KC_LCTL,              KC_LGUI, KC_LALT,                    KC_SPC,           LT(2, KC_ENT),                    KC_RGUI, KC_RALT, KC_APP,  KC_RCTL),
 
   [_FIRMWARE] = LAYOUT(
       QK_BOOT,                RGB_TOG,  RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD,       RGB_VAI, BL_DEC,   BL_TOGG, BL_INC,  XXXXXXX, XXXXXXX,   TG(1),
diff --git a/keyboards/gh60/satan/keymaps/chaser/keymap.c b/keyboards/gh60/satan/keymaps/chaser/keymap.c
index 4ec33acf7b..f438b84d39 100644
--- a/keyboards/gh60/satan/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/satan/keymaps/chaser/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GESC     ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC    , _______,  \
     KC_TAB      ,KC_Q   ,KC_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_LSHIFT   ,_______,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_UP  ,MO(_FL)    ,           \
+    KC_LSFT     ,_______,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_UP  ,MO(_FL)    ,           \
     KC_LCTL     ,KC_LGUI,KC_LALT,                        KC_SPC                 ,KC_RALT,KC_LEFT,KC_DOWN,KC_RIGHT),
   /* Keymap _FL: Function Layer
    * ,-----------------------------------------------------------.
diff --git a/keyboards/gh60/satan/keymaps/colemak/keymap.c b/keyboards/gh60/satan/keymaps/colemak/keymap.c
index d55bbb9213..34cfdb9441 100644
--- a/keyboards/gh60/satan/keymaps/colemak/keymap.c
+++ b/keyboards/gh60/satan/keymaps/colemak/keymap.c
@@ -3,7 +3,7 @@
 
 
 // Used for SHIFT_ESC
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
index 3db6231353..65df547f2a 100644
--- a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL] = LAYOUT_60_iso_split_rshift( \
     KC_GESC,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,        KC_BSPC,
     KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-    KC_LCTRL,      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENYE, KC_SCLN, KC_QUOT,       KC_ENT,
+    KC_LCTL,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENYE, KC_SCLN, KC_QUOT,       KC_ENT,
     OSM(MOD_LSFT), _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT), MO(_FL),
     _______,       KC_LGUI, KC_LALT,                   KC_SPC,                                      _______, KC_RALT, KC_RGUI,       _______
   ),
diff --git a/keyboards/gh60/satan/keymaps/poker/keymap.c b/keyboards/gh60/satan/keymaps/poker/keymap.c
index 04b65e4588..dc20686569 100644
--- a/keyboards/gh60/satan/keymaps/poker/keymap.c
+++ b/keyboards/gh60/satan/keymaps/poker/keymap.c
@@ -2,7 +2,7 @@
 
 
 // Used for SHIFT_ESC
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/gh60/satan/keymaps/smt/keymap.c b/keyboards/gh60/satan/keymaps/smt/keymap.c
index 7cbdf07766..06a3307bc4 100644
--- a/keyboards/gh60/satan/keymaps/smt/keymap.c
+++ b/keyboards/gh60/satan/keymaps/smt/keymap.c
@@ -3,7 +3,7 @@
 
 
 // Used for SHIFT_ESC
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_CTRL_MASK  (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/giabalanai/keymaps/default/keymap.c b/keyboards/giabalanai/keymaps/default/keymap.c
index bc90e6c386..5b582d1d65 100644
--- a/keyboards/giabalanai/keymaps/default/keymap.c
+++ b/keyboards/giabalanai/keymaps/default/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
     _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
index 674b6a62d5..506e0cb811 100644
--- a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
     KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
index 8317e94cf1..32fc77f1cb 100644
--- a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
@@ -227,7 +227,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
     KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c
index 7e87a0e71c..5bd2ebf5b8 100644
--- a/keyboards/giabalanai/keymaps/via/keymap.c
+++ b/keyboards/giabalanai/keymaps/via/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
     KC_GESC,
       _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_MINS, KC_BSPC,   _______,
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
index 444d9fa6c2..f7dc18a4c8 100644
--- a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTRL,
+            KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
     KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
diff --git a/keyboards/gvalchca/ga150/keymaps/default/keymap.c b/keyboards/gvalchca/ga150/keymaps/default/keymap.c
index 1f19a80850..929c98d2eb 100644
--- a/keyboards/gvalchca/ga150/keymaps/default/keymap.c
+++ b/keyboards/gvalchca/ga150/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, KC_RCTRL, KC_RCTRL),
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, KC_RCTL,  KC_RCTL),
 
 [_FUNC] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/gvalchca/ga150/keymaps/via/keymap.c b/keyboards/gvalchca/ga150/keymaps/via/keymap.c
index 3b4c4ae84b..a95c06222f 100644
--- a/keyboards/gvalchca/ga150/keymaps/via/keymap.c
+++ b/keyboards/gvalchca/ga150/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTRL),
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
   
 [1] = LAYOUT(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
diff --git a/keyboards/gvalchca/spaccboard/keymaps/default/keymap.c b/keyboards/gvalchca/spaccboard/keymaps/default/keymap.c
index e700e25fbf..66ad10e8bd 100644
--- a/keyboards/gvalchca/spaccboard/keymaps/default/keymap.c
+++ b/keyboards/gvalchca/spaccboard/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
   KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
   KC_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_RCTRL),
+  KC_LCTL,       KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
 
 [_FUNC] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/gvalchca/spaccboard/keymaps/via/keymap.c b/keyboards/gvalchca/spaccboard/keymaps/via/keymap.c
index ba289f7ed0..290bdefeb6 100644
--- a/keyboards/gvalchca/spaccboard/keymaps/via/keymap.c
+++ b/keyboards/gvalchca/spaccboard/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, _______,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
   KC_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_RGUI, MO(1),   KC_RCTRL),
+  KC_LCTL,       KC_LGUI, KC_LALT,                             KC_SPC,                               KC_RGUI, MO(1),   KC_RCTL),
   
 [1] = LAYOUT(
   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, KC_DEL,
diff --git a/keyboards/h0oni/deskpad/keymaps/default/keymap.c b/keyboards/h0oni/deskpad/keymaps/default/keymap.c
index 993200f18c..54172f2986 100644
--- a/keyboards/h0oni/deskpad/keymaps/default/keymap.c
+++ b/keyboards/h0oni/deskpad/keymaps/default/keymap.c
@@ -97,7 +97,7 @@ void layer_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 void cvxa_finished(qk_tap_dance_state_t *state, void *user_data) {
     cvxa_state.state = cur_dance(state);
-    register_mods(MOD_BIT(KC_LCTRL));
+    register_mods(MOD_BIT(KC_LCTL));
     switch (cvxa_state.state) {
         case TD_SINGLE_TAP: tap_code(KC_V); break;
         case TD_SINGLE_HOLD: tap_code(KC_A); break;
@@ -105,7 +105,7 @@ void cvxa_finished(qk_tap_dance_state_t *state, void *user_data) {
         case TD_DOUBLE_HOLD: tap_code(KC_X); break;
         default: tap_code(KC_V);
     }
-    unregister_mods(MOD_BIT(KC_LCTRL));
+    unregister_mods(MOD_BIT(KC_LCTL));
 }
 
 void cvxa_reset(qk_tap_dance_state_t *state, void *user_data) {
diff --git a/keyboards/h0oni/deskpad/keymaps/via/keymap.c b/keyboards/h0oni/deskpad/keymaps/via/keymap.c
index 993200f18c..54172f2986 100644
--- a/keyboards/h0oni/deskpad/keymaps/via/keymap.c
+++ b/keyboards/h0oni/deskpad/keymaps/via/keymap.c
@@ -97,7 +97,7 @@ void layer_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 void cvxa_finished(qk_tap_dance_state_t *state, void *user_data) {
     cvxa_state.state = cur_dance(state);
-    register_mods(MOD_BIT(KC_LCTRL));
+    register_mods(MOD_BIT(KC_LCTL));
     switch (cvxa_state.state) {
         case TD_SINGLE_TAP: tap_code(KC_V); break;
         case TD_SINGLE_HOLD: tap_code(KC_A); break;
@@ -105,7 +105,7 @@ void cvxa_finished(qk_tap_dance_state_t *state, void *user_data) {
         case TD_DOUBLE_HOLD: tap_code(KC_X); break;
         default: tap_code(KC_V);
     }
-    unregister_mods(MOD_BIT(KC_LCTRL));
+    unregister_mods(MOD_BIT(KC_LCTL));
 }
 
 void cvxa_reset(qk_tap_dance_state_t *state, void *user_data) {
diff --git a/keyboards/hadron/ver2/keymaps/default/keymap.c b/keyboards/hadron/ver2/keymaps/default/keymap.c
index cf8ca10a0a..5aec1550bc 100644
--- a/keyboards/hadron/ver2/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,    KC_Y,    KC_U,    KC_I,   KC_O,    KC_P,     KC_BSPC,
   KC_CAPS,  KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,    KC_H,    KC_J,    KC_K,   KC_L,LT_MC(KC_SCLN), KC_QUOT,
   KC_LSFT,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,    KC_N,    KC_M,    KC_COMM,KC_DOT,  KC_SLSH,  CTL_ENT,
-  KC_GRV,   KC_LCTRL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,  KC_SPC,   RAISE,   KC_LEFT,KC_DOWN, KC_UP,    KC_RGHT
+  KC_GRV,   KC_LCTL,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,  KC_SPC,   RAISE,   KC_LEFT,KC_DOWN, KC_UP,    KC_RGHT
 ),
 
 /* Colemak
@@ -82,9 +82,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT(
   KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10, KC_DEL,
   KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_P7,   KC_P8,   KC_P9,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  KC_BSPC,
-  KC_LCTRL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_P4,   KC_P5,   KC_P6,    KC_H,    KC_N,    KC_E,    KC_I, LT_MC(KC_O), KC_QUOT,
+  KC_LCTL,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_P4,   KC_P5,   KC_P6,    KC_H,    KC_N,    KC_E,    KC_I, LT_MC(KC_O), KC_QUOT,
   KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  CTL_ENT,
-  KC_GRV,   KC_LCTRL, KC_LGUI, KC_LALT, LOWER,  KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT
+  KC_GRV,   KC_LCTL, KC_LGUI, KC_LALT, LOWER,  KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT
   ),
 
 /* Dvorak
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_QUOT,  KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_P7,   KC_P8,   KC_P9,    KC_F,    KC_G,   KC_C,    KC_R,    KC_L,     KC_BSPC,
   KC_LCTL,  KC_A,     KC_O,    KC_E,    KC_U,    KC_I,    KC_P4,   KC_P5,   KC_P6,    KC_D,    KC_H,   KC_T,    KC_N, LT_MC(KC_S), KC_SLSH,
   KC_LSFT,  KC_SCLN,  KC_Q,    KC_J,    KC_K,    KC_X,    KC_P1,   KC_P2,   KC_P3,    KC_B,    KC_M,   KC_W,    KC_V,    KC_Z,     CTL_ENT,
-  KC_GRV,   KC_LCTRL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE,  KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT
+  KC_GRV,   KC_LCTL,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE,  KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c
index 3eb0e59fc5..5af59227b1 100644
--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,    KC_Y,    KC_U,    KC_I,   KC_O,    KC_P,     KC_BSPC,
   KC_CAPS,  KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,    KC_H,    KC_J,    KC_K,   KC_L,LT_MC(KC_SCLN), KC_QUOT,
   KC_LSFT,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,    KC_N,    KC_M,    KC_COMM,KC_DOT,  KC_SLSH,  CTL_ENT,
-  KC_GRV,   KC_LCTRL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,  KC_SPC,   RAISE,   KC_LEFT,KC_DOWN, KC_UP,    KC_RGHT
+  KC_GRV,   KC_LCTL,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,  KC_SPC,   RAISE,   KC_LEFT,KC_DOWN, KC_UP,    KC_RGHT
 ),
 
 /* Colemak
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT(
   KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10, KC_DEL,
   KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_P7,   KC_P8,   KC_P9,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  KC_BSPC,
-  KC_LCTRL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_P4,   KC_P5,   KC_P6,    KC_H,    KC_N,    KC_E,    KC_I, LT_MC(KC_O), KC_QUOT,
+  KC_LCTL,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_P4,   KC_P5,   KC_P6,    KC_H,    KC_N,    KC_E,    KC_I, LT_MC(KC_O), KC_QUOT,
   KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  CTL_ENT,
   KC_GRV,   KC_CAPS, KC_LGUI, KC_LALT, LOWER,  KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT
   ),
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_QUOT,  KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_P7,   KC_P8,   KC_P9,    KC_F,    KC_G,   KC_C,    KC_R,    KC_L,     KC_BSPC,
   KC_LCTL,  KC_A,     KC_O,    KC_E,    KC_U,    KC_I,    KC_P4,   KC_P5,   KC_P6,    KC_D,    KC_H,   KC_T,    KC_N, LT_MC(KC_S), KC_SLSH,
   KC_LSFT,  KC_SCLN,  KC_Q,    KC_J,    KC_K,    KC_X,    KC_P1,   KC_P2,   KC_P3,    KC_B,    KC_M,   KC_W,    KC_V,    KC_Z,     CTL_ENT,
-  KC_GRV,   KC_LCTRL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE,  KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT
+  KC_GRV,   KC_LCTL,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE,  KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index fff16e2020..53351357ea 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LT_FN(KC_TAB),   _________________QWERTY_L1_________________,    KC_P7,   KC_P8,   KC_P9,    _________________QWERTY_R1_________________, KC_BSPC, \
   KC_CAPS,  _________________QWERTY_L2_________________,    KC_P4,   KC_P5,   KC_P6,    _________________QWERTY_R2_________________, CTL_ENT, \
   KC_LSFT,  _________________QWERTY_L3_________________,    KC_P1,   KC_P2,   KC_P3,    _________________QWERTY_R3_________________, LT_RAI(KC_MINS), \
-  KC_ESC,   KC_LCTRL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,    KC_P0,   KC_DOT,  KC_EQL,  KC_SPC,   RAISE, KC_RALT, KC_RGUI, KC_APP,  KC_DEL  \
+  KC_ESC,   KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,    KC_P0,   KC_DOT,  KC_EQL,  KC_SPC,   RAISE, KC_RALT, KC_RGUI, KC_APP,  KC_DEL  \
 ),
 
 /* Colemak
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT_wrapper(
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PSCR, \
   LT_FN(KC_TAB),   _________________COLEMAK_L1________________, KC_P7,   KC_P8,   KC_P9,    _________________COLEMAK_R1________________, KC_BSPC, \
-  KC_LCTRL, _________________COLEMAK_L2________________, KC_P4,   KC_P5,   KC_P6,    _________________COLEMAK_R2________________, CTL_ENT, \
+  KC_LCTL,  _________________COLEMAK_L2________________, KC_P4,   KC_P5,   KC_P6,    _________________COLEMAK_R2________________, CTL_ENT, \
   KC_LSFT,  _________________COLEMAK_L3________________, KC_P1,   KC_P2,   KC_P3,    _________________COLEMAK_R3________________, LT_RAI(KC_MINS), \
   KC_ESC,   KC_CAPS, KC_LGUI, KC_LALT,  LOWER,   KC_SPC, KC_P0,   KC_DOT,  KC_EQL,   KC_SPC,  RAISE, KC_RALT, KC_RGUI, KC_APP,  KC_DEL  \
   ),
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 019fd11c48..f158e3bc01 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_E,      KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,      KC_O,      KC_P,       KC_BSPC              ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_S,        KC_D,      KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,      KC_L,      KC_SCLN,    MT(MOD_RSFT, KC_ENT) ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT            ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
+  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(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
 /* Colemak-DHm
@@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_F,      KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,      KC_Y,      KC_SCLN,    KC_BSPC              ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_R,        KC_S,      KC_T,    KC_G,                      KC_M,    KC_N,    KC_E,      KC_I,      KC_O,       MT(MOD_RSFT, KC_ENT) ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,                      KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT            ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
+  KC_LSFT,               KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,                      KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSFT              ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
 /* Function
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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               ,
   KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,                      KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT            ,
-  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
+  KC_LSFT,   KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
   _______,   _______, _______,  _______,       _______, _______, _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
diff --git a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
index d9634786a8..5f53092aef 100644
--- a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
+++ b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
@@ -64,37 +64,37 @@ void matrix_scan_user(void) {
     // Close a program in i3wm
     SEQ_ONE_KEY(KC_Q) {
       register_code(KC_LGUI);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_Q);
       unregister_code(KC_Q);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LGUI);
     }
     // Exit i3wm
     SEQ_ONE_KEY(KC_E) {
       register_code(KC_LGUI);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_E);
       unregister_code(KC_E);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LGUI);
     }
     // Copy selected text in suckless terminal
     SEQ_ONE_KEY(KC_C) {
       register_code(KC_LCTL);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_C);
       unregister_code(KC_C);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LCTL);
     }
     // Paste text in suckless terminal
     SEQ_ONE_KEY(KC_V) {
       register_code(KC_LCTL);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_V);
       unregister_code(KC_V);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LCTL);
     }
     // FZF shortcut to fuzzy switch directories
diff --git a/keyboards/handwired/d48/keymaps/anderson/keymap.c b/keyboards/handwired/d48/keymaps/anderson/keymap.c
index 48f3c00679..63d480a72c 100644
--- a/keyboards/handwired/d48/keymaps/anderson/keymap.c
+++ b/keyboards/handwired/d48/keymaps/anderson/keymap.c
@@ -29,7 +29,7 @@ enum custom_keycodes {
 taphold_t taphold_config[TAPHOLD_CONFIG_SIZE] = {
     {.key=KC_ALPHA, .mode=TAPHOLD_LAYER, .shortAction=KC_ESC, .longAction=_ALPHA},
     {.key=KC_BETA, .mode=TAPHOLD_LAYER, .shortAction=KC_EQL, .longAction=_BETA},
-    {.key=KC_RCTRL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTRL},
+    {.key=KC_RCTL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTL},
 };
 uint16_t taphold_config_size = TAPHOLD_CONFIG_SIZE;
 uint32_t taphold_timeout = 90;
@@ -67,8 +67,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 KC_MUTE,                   LCTL(KC_D),
         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_ALPHA,KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,  \
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTRL,\
-        KC_LCTRL,_______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, 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, KC_RCTL, \
+        KC_LCTL, _______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, KC_QUOT, _______, _______, KC_BSLS  \
     ),
 
     /* Alpha layer (𝛼)
@@ -191,7 +191,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         }
     }
 
-    if (keycode == KC_LCTRL || keycode == KC_RCTRL) {
+    if (keycode == KC_LCTL || keycode == KC_RCTL) {
         ctrl_pressed = record->event.pressed;
     } else if (keycode == KC_LALT) {
         alt_pressed = record->event.pressed;
@@ -213,9 +213,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         next_light_mode(layer_colors[_MAIN]);
     }
 #endif
-    if (keycode == KC_LCTRL) {
+    if (keycode == KC_LCTL) {
         /* Some Overlay1_Enable fuckery! */
-        (record->event.pressed ? register_code : unregister_code)(KC_LCTRL);
+        (record->event.pressed ? register_code : unregister_code)(KC_LCTL);
         return false;
     }
     return taphold_process(keycode, record);
diff --git a/keyboards/handwired/d48/keymaps/default/keymap.c b/keyboards/handwired/d48/keymaps/default/keymap.c
index 9b83a26216..45da0e0765 100644
--- a/keyboards/handwired/d48/keymaps/default/keymap.c
+++ b/keyboards/handwired/d48/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 taphold_t taphold_config[TAPHOLD_CONFIG_SIZE] = {
     {.key=KC_ALPHA, .mode=TAPHOLD_LAYER, .shortAction=KC_ESC, .longAction=_ALPHA},
     {.key=KC_BETA, .mode=TAPHOLD_LAYER, .shortAction=KC_EQL, .longAction=_BETA},
-    {.key=KC_RCTRL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTRL},
+    {.key=KC_RCTL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTL},
 };
 uint16_t taphold_config_size = TAPHOLD_CONFIG_SIZE;
 uint32_t taphold_timeout = 90;
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 KC_MUTE,                   _______,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
         KC_ALPHA,KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTRL,
-        KC_LCTRL,_______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, 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, KC_RCTL,
+        KC_LCTL, _______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, KC_QUOT, _______, _______, KC_BSLS
     ),
 
     /* Alpha layer (𝛼)
@@ -149,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         }
     }
 
-    if (keycode == KC_LCTRL || keycode == KC_RCTRL) {
+    if (keycode == KC_LCTL || keycode == KC_RCTL) {
         ctrl_pressed = record->event.pressed;
     } else if (keycode == KC_LALT) {
         alt_pressed = record->event.pressed;
@@ -166,9 +166,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (keycode == QK_BOOT) {
         rgblight_setrgb(255, 255, 0);
     }
-    if (keycode == KC_LCTRL) {
+    if (keycode == KC_LCTL) {
         /* Some Overlay1_Enable fuckery! */
-        (record->event.pressed ? register_code : unregister_code)(KC_LCTRL);
+        (record->event.pressed ? register_code : unregister_code)(KC_LCTL);
         return false;
     }
     return taphold_process(keycode, record);
diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
index e54d31c184..1c4bdfd5ee 100644
--- a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   COLON_EQ,     KC_A,     KC_O,     KC_E,     KC_U,      KC_I,
    KC_LSFT,  KC_SCLN,     KC_Q,     KC_J,     KC_K,      KC_X,
    KC_HOME,   KC_GRV,   KC_EQL,  KC_LEFT,  KC_RGHT,
-                                                    KC_LCTRL,   KC_LALT,
+                                                    KC_LCTL,    KC_LALT,
                                                                MO(CONT),
                                           KC_BSPC,    KC_DEL,   KC_LGUI,
         // right hand
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
index 7362505f0f..cb78c9fb56 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LBRC, KC_RBRC,                                              KC_QUOT, KC_GRV,
                                     SH_ESC,                            KC_BSPC,
                                     KC_LGUI, KC_TAB,          KC_RSFT, KC_SPC,
-                                    RAISE,   KC_LCTRL,        LOWER,  KC_ENT
+                                    RAISE,   KC_LCTL,         LOWER,  KC_ENT
     ),
    
     /* Colemak
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LBRC, KC_RBRC,                                              KC_QUOT, KC_GRV,
                                     KC_ESC,                            KC_BSPC,
                                     KC_LGUI, KC_TAB,          KC_RSFT, KC_SPC,
-                                    RAISE,   KC_LCTRL,        LOWER,  KC_ENT
+                                    RAISE,   KC_LCTL,         LOWER,  KC_ENT
     ),
     /*  RAISE
      * ,----------------------------------,                  ,----------------------------------,
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
index cf6d7d7120..0e96202315 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCBR, KC_RCBR,                                              KC_QUOT, KC_GRV,
                                    SH_ESC,                             KC_ENT,
                                    KC_LGUI, KC_TAB,           KC_RSFT, KC_SPC,
-                                   RAISE,   KC_LCTRL,         KC_BSPC, LOWER
+                                   RAISE,   KC_LCTL,          KC_BSPC, LOWER
     ),
    
     /* Colemak
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCBR, KC_RCBR,                                              KC_QUOT, KC_GRV,
                                    SH_ESC,                             KC_ENT,
                                    KC_LGUI, KC_TAB,           KC_RSFT, KC_SPC,
-                                   RAISE,   KC_LCTRL,         KC_BSPC, LOWER
+                                   RAISE,   KC_LCTL,          KC_BSPC, LOWER
     ),
     /*  RAISE
      * ,----------------------------------,                  ,----------------------------------,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
index 2c33aa3e57..c4887a3dbb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
@@ -22,7 +22,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_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_LCTRL,                                                       KC_DEL, KC_PMNS,
+                      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
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______,_______,_______,_______,_______,_______,                        _______, _______ , _______ , _______ ,_______ ,_______,
                           KC_LCMD,KC_LALT,                                                       _______, _______,
                                              _______,_______,            _______,_______,
-                                             KC_LCTRL,_______,            _______,_______,
+                                             KC_LCTL,_______,            _______,_______,
                                              _______,_______,            _______,_______
 
   ),
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index 19d4a8b0b9..e5a5dcc6c1 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -176,33 +176,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void hold_shift(void) {
   shift_count = shift_count + 1;
-  register_code(KC_LSHIFT);
+  register_code(KC_LSFT);
 }
 
 void release_shift(void) {
   shift_count = shift_count - 1;
   if(shift_count <= 0){
-    unregister_code(KC_LSHIFT);
+    unregister_code(KC_LSFT);
     shift_count = 0;
   }
 }
 
 void press_space(void) {
-  if(shift_count > 0) unregister_code (KC_LSHIFT);
+  if(shift_count > 0) unregister_code (KC_LSFT);
   tap_code(KC_SPACE);
-  if(shift_count > 0) register_code (KC_LSHIFT);
+  if(shift_count > 0) register_code (KC_LSFT);
 }
 
 void press_enter(void) {
-  if(shift_count > 0) unregister_code (KC_LSHIFT);
+  if(shift_count > 0) unregister_code (KC_LSFT);
   tap_code (KC_ENT);
-  if(shift_count > 0) register_code (KC_LSHIFT);
+  if(shift_count > 0) register_code (KC_LSFT);
 }
 
 void press_underscore(void) {
-  if(shift_count > 0) unregister_code (KC_LSHIFT);
+  if(shift_count > 0) unregister_code (KC_LSFT);
   tap_code ((unsigned char) BP_UNDS);
-  if(shift_count > 0) register_code (KC_LSHIFT);
+  if(shift_count > 0) register_code (KC_LSFT);
 }
 
 // Bleah globals need to be initialized.
diff --git a/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
index 05f1dc51dc..28721c6b7d 100644
--- a/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
+++ b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
                   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,      KC_H,     KC_J,     KC_K,     KC_L,     KC_LPRN,  KC_RPRN,
         KC_PEQL,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,      KC_N,     KC_M,     KC_COMMA, KC_DOT,   KC_QUES,
-                  XXXXXXX,  XXXXXXX,  KC_BSPC,  KC_ENT,   KC_SPC,    KC_LSFT,  KC_LCTRL, KC_LALT,  KC_ALGR,  KC_LWIN,  XXXXXXX
+                  XXXXXXX,  XXXXXXX,  KC_BSPC,  KC_ENT,   KC_SPC,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_ALGR,  KC_LWIN,  XXXXXXX
   ),
 };
 
diff --git a/keyboards/handwired/hexon38/keymaps/default/keymap.c b/keyboards/handwired/hexon38/keymaps/default/keymap.c
index 38ae903ec8..90e2d47cf5 100644
--- a/keyboards/handwired/hexon38/keymaps/default/keymap.c
+++ b/keyboards/handwired/hexon38/keymaps/default/keymap.c
@@ -40,8 +40,8 @@
 #define COLN_CTL CTL_T(KC_SCLN)
 
 #define ______ KC_TRNS
-#define LSHIFT KC_LSHIFT
-#define RSHIFT KC_RSHIFT
+#define LSHIFT KC_LSFT
+#define RSHIFT KC_RSFT
 #define COMMA KC_COMM
 #define SLASH KC_SLSH
 #define SPACE KC_SPC
diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
index 5707d769de..714491d305 100644
--- a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
@@ -44,8 +44,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,      KC_NO,      MO(3),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_P4,   KC_P5,   KC_P6,   MO(4),
-    LCTL(KC_F), KC_LALT,    KC_LSHIFT,KC_ESC,   KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    LCTL(KC_C), LCTL(KC_V), KC_LCTRL, KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTRL,                      KC_DOWN,             KC_P0,            KC_PDOT
+    LCTL(KC_F), KC_LALT,    KC_LSFT,  KC_ESC,   KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    LCTL(KC_C), LCTL(KC_V), KC_LCTL,  KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTL,                       KC_DOWN,             KC_P0,            KC_PDOT
   ),
 
   // Qwerty layer + function
@@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC, TO(0),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  KC_NO,  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,  KC_NO,  MO(3),    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,  KC_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_LALT,KC_LCTRL, KC_LGUI,                                      KC_SPC,                                KC_RALT,  KC_RCTRL,                    KC_DOWN,             KC_P0,            KC_PDOT
+    KC_NO,  KC_NO,  KC_LSFT,  KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_NO,  KC_LALT,KC_LCTL,  KC_LGUI,                                      KC_SPC,                                KC_RALT,  KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
   ),
 
   // Orirginal Layer
@@ -66,8 +66,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC, TO(1),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  TO(0),  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,  KC_NO,  KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,  KC_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_LALT,KC_LCTRL, KC_LGUI,                                        KC_SPC,                              KC_RALT,  KC_RCTRL,                    KC_DOWN,             KC_P0,            KC_PDOT
+    KC_NO,  KC_NO,  KC_LSFT,  KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_NO,  KC_LALT,KC_LCTL,  KC_LGUI,                                        KC_SPC,                              KC_RALT,  KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
   ),
 
   // Function Layer
@@ -77,8 +77,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MU_TOG, KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
     MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,  KC_NO,    KC_NO,    KC_PGUP,  KC_DEL,   KC_NO,    KC_NO,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,      KC_AUDIO_MUTE,        KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_SCLN,    KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
-    KC_NO,  KC_LALT,  KC_LSHIFT,KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
-    KC_NO,  KC_NO,    KC_LCTRL, KC_LGUI,                                                                            KC_SPC,                                 KC_RALT,    KC_CAPS,                               KC_DOWN,             LSFT(KC_A),             KC_PDOT
+    KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
+    KC_NO,  KC_NO,    KC_LCTL,  KC_LGUI,                                                                            KC_SPC,                                 KC_RALT,    KC_CAPS,                               KC_DOWN,             LSFT(KC_A),             KC_PDOT
   ),
 
   // Literally just the numpad is different
@@ -88,8 +88,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
   KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_BTN1,  KC_MS_U,  KC_BTN2,  KC_NO,
   KC_NO,      KC_NO,      TO(0),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_MS_L,  KC_NO,    KC_MS_R,  KC_TRNS,
-  LCTL(KC_F), KC_LALT,    KC_LSHIFT,KC_NO,    KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_GT,    KC_MS_D,  KC_GT,    KC_PENT,
-  LCTL(KC_C), LCTL(KC_V), KC_LCTRL, KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTRL,                      KC_DOWN,             KC_BTN1,            KC_PDOT
+  LCTL(KC_F), KC_LALT,    KC_LSFT,  KC_NO,    KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_GT,    KC_MS_D,  KC_GT,    KC_PENT,
+  LCTL(KC_C), LCTL(KC_V), KC_LCTL,  KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTL,                       KC_DOWN,             KC_BTN1,            KC_PDOT
 
   ),
 
@@ -100,8 +100,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MU_TOG, TO(0),    KC_DLR,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
     MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
-    KC_NO,  KC_LALT,  KC_LSHIFT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_COMMA, KC_DOT, KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
-    KC_NO,  KC_LGUI,  KC_LCTRL, KC_LALT,                                                  KC_SPC,                 KC_RALT,  KC_RCTRL,                    KC_DOWN,             LSFT(KC_A),             KC_PDOT
+    KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_COMMA, KC_DOT, KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
+    KC_NO,  KC_LGUI,  KC_LCTL,  KC_LALT,                                                  KC_SPC,                 KC_RALT,  KC_RCTL,                     KC_DOWN,             LSFT(KC_A),             KC_PDOT
 
   ),*/
   /*[0] = LAYOUT(
@@ -126,14 +126,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_A, KC_SPC,KC_C,KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, TO(0)
   ),
   [2] = LAYOUT(
-     KC_LCTRL,    KC_LALT,  KC_C,     KC_RALT,    KC_E,       KC_F, KC_G, KC_G, KC_H, KC_J, TO(0),  TO(1),  KC_M,     KC_N,   KC_QUOT,    KC_DOWN,  KC_UP,  KC_R,     KC_S,       KC_ENTER,
+     KC_LCTL,     KC_LALT,  KC_C,     KC_RALT,    KC_E,       KC_F, KC_G, KC_G, KC_H, KC_J, TO(0),  TO(1),  KC_M,     KC_N,   KC_QUOT,    KC_DOWN,  KC_UP,  KC_R,     KC_S,       KC_ENTER,
      KC_PPLS,     KC_B,     KC_C,     KC_D,       KC_A,       KC_S, KC_D, KC_F, KC_J, KC_J, KC_K,   KC_NO,  KC_K,     KC_L,   KC_SCLN,    KC_P4,    KC_DEL, KC_P5,    KC_P6,      KC_RIGHT,
      KC_PMNS,     KC_1,     KC_C,    KC_D,       KC_1,       KC_2, KC_3, KC_4, KC_7, KC_J, KC_K,   KC_L,   KC_8,     KC_9,   KC_0,       KC_NUM,   KC_PGUP,KC_PSLS,  KC_PAST,    KC_T,
      KC_A,        KC_ESC,   TO(0),KC_D,     KC_GRV,     KC_F, KC_G, KC_5, KC_6, KC_J, KC_K,   KC_L,   KC_EQL,   KC_N,   KC_MINUS,   KC_BSPC,  KC_INS, KC_HOME,  KC_S,       KC_T,
      KC_PPLS,     KC_NO,    KC_TAB,   KC_D,       KC_Q,       KC_W, KC_E, KC_R, KC_U, KC_J, KC_K,   KC_L,   KC_I,     KC_O,   KC_P,       KC_P7,    KC_PGDN,KC_P8,    KC_P9,      KC_T,
      KC_A,        KC_B,     KC_C,     KC_D,       KC_E,       KC_F, KC_G, KC_T, KC_Y, KC_J, KC_K,   KC_L,   KC_RBRC,  KC_N,   KC_LBRC,    KC_P,     KC_END, KC_R,     KC_S,       KC_T,
      KC_LEFT,     KC_P1,    KC_CAPS,  KC_RSFT,    KC_Z,       KC_X, KC_C, KC_V, KC_M, KC_J, KC_K,   KC_L,   KC_COMMA, KC_DOT, KC_BSLS,    KC_PENT,  KC_Q,   KC_P2,    KC_P3,      KC_T,
-     KC_LGUI,     KC_SPACE, KC_RCTRL, KC_LSHIFT,  KC_E,       KC_F, KC_G, KC_B, KC_N, KC_J, KC_K,   KC_L,   KC_M,     KC_N,   KC_SLSH,    KC_P,     KC_Q,   KC_P0,    KC_PDOT,    KC_KP_ENTER
+     KC_LGUI,     KC_SPACE, KC_RCTL,  KC_LSFT,    KC_E,       KC_F, KC_G, KC_B, KC_N, KC_J, KC_K,   KC_L,   KC_M,     KC_N,   KC_SLSH,    KC_P,     KC_Q,   KC_P0,    KC_PDOT,    KC_KP_ENTER
     ),*/
 };
 
@@ -142,7 +142,7 @@ bool right_shift_down = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      switch (keycode) {
-    case KC_LSHIFT:
+    case KC_LEFT_SHIFT:
     if (record->event.pressed)
       {
         left_shift_down = true;
@@ -154,7 +154,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return true;
       }
     break;
-    case KC_RSHIFT:
+    case KC_RIGHT_SHIFT:
 
       if (record->event.pressed)
       {
@@ -207,17 +207,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
         {
           if(left_shift_down)
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            unregister_code(KC_RSHIFT);
+            unregister_code(KC_RIGHT_SHIFT);
 
           register_code(KC_7);
           unregister_code(KC_7);
 
           if(left_shift_down)
-            register_code(KC_LSHIFT);
+            register_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            register_code(KC_RSHIFT);
+            register_code(KC_RIGHT_SHIFT);
         }
       return false;
     }
@@ -235,17 +235,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
        {
           if(left_shift_down)
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            unregister_code(KC_RSHIFT);
+            unregister_code(KC_RIGHT_SHIFT);
 
           register_code(KC_5);
           unregister_code(KC_5);
 
           if(left_shift_down)
-            register_code(KC_LSHIFT);
+            register_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            register_code(KC_RSHIFT);
+            register_code(KC_RIGHT_SHIFT);
         }
       return false;
     }
@@ -263,17 +263,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_3);
         unregister_code(KC_3);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
       return false;
     }
@@ -292,17 +292,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_1);
         unregister_code(KC_1);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     return false;
     }
@@ -320,19 +320,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
-        register_code(KC_LSHIFT);
+        register_code(KC_LEFT_SHIFT);
         register_code(KC_6);
         unregister_code(KC_6);
-        unregister_code(KC_LSHIFT);
+        unregister_code(KC_LEFT_SHIFT);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     return false;
     }
@@ -351,17 +351,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_9);
         unregister_code(KC_9);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     return false;
     }
@@ -379,17 +379,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_0);
         unregister_code(KC_0);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     return false;
     }
@@ -407,17 +407,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_2);
         unregister_code(KC_2);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     return false;
     }
@@ -435,17 +435,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_4);
         unregister_code(KC_4);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -462,17 +462,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_6);
         unregister_code(KC_6);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -489,17 +489,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_8);
         unregister_code(KC_8);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
@@ -516,17 +516,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
       {
         if(left_shift_down)
-          unregister_code(KC_LSHIFT);
+          unregister_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          unregister_code(KC_RSHIFT);
+          unregister_code(KC_RIGHT_SHIFT);
 
         register_code(KC_GRAVE);
         unregister_code(KC_GRAVE);
 
         if(left_shift_down)
-          register_code(KC_LSHIFT);
+          register_code(KC_LEFT_SHIFT);
         if(right_shift_down)
-          register_code(KC_RSHIFT);
+          register_code(KC_RIGHT_SHIFT);
       }
     }
     else
diff --git a/keyboards/handwired/k8split/keymaps/left/keymap.c b/keyboards/handwired/k8split/keymaps/left/keymap.c
index a1f565d565..8d7559065a 100644
--- a/keyboards/handwired/k8split/keymaps/left/keymap.c
+++ b/keyboards/handwired/k8split/keymaps/left/keymap.c
@@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_AUDIO_MUTE,
         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_AUDIO_MMUTE,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_INT5, KC_MS_WH_UP,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_COMP, KC_MS_WH_DOWN,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F13, KC_F14,
-        KC_LCTRL, KC_CAPS, KC_LWIN, KC_LALT, KC_SPC, KC_F15, KC_F16, KC_F17
+        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_COMP, KC_MS_WH_DOWN,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F13, KC_F14,
+        KC_LCTL, KC_CAPS, KC_LWIN, KC_LALT, KC_SPC, KC_F15, KC_F16, KC_F17
     )
 };
diff --git a/keyboards/handwired/k8split/keymaps/right/keymap.c b/keyboards/handwired/k8split/keymaps/right/keymap.c
index 3c804f2cae..f2e60e338c 100644
--- a/keyboards/handwired/k8split/keymaps/right/keymap.c
+++ b/keyboards/handwired/k8split/keymaps/right/keymap.c
@@ -35,8 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* /!\: rows are reversed in this half because I did all pcb design drunk */
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_END, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_RCTRL,
-        KC_HOME, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT,
+        KC_END, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_RCTL,
+        KC_HOME, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
         KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER,
         KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_DEL, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
index cc5c58e905..73ac314853 100644
--- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
      KC_PGDN        ,TD(TD_SHIFT_CAPS),KC_Z   ,KC_X   ,KC_C      ,KC_V  ,KC_B,KC_N,KC_M  ,TD(TD_COMM_LABK),TD(TD_DOT_RABK),TD(TD_SLSH_QUES),TD(TD_BSLS_PIPE),KC_RSFT         ,
   //|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
-     KC_END         , KC_LCTRL        ,KC_LGUI,KC_LALT, KC_L1    ,  KC_SPACE ,  KC_SPACE , KC_L2          ,KC_RALT        ,KC_BTN2         ,KC_RCTRL        ,TD(TD_ESC_GRAVE)
+     KC_END         , KC_LCTL         ,KC_LGUI,KC_LALT, KC_L1    ,  KC_SPACE ,  KC_SPACE , KC_L2          ,KC_RALT        ,KC_BTN2         ,KC_RCTL         ,TD(TD_ESC_GRAVE)
   //`---------------+-----------------+-------+-------+----------+------+----+-----------+----------------+---------------+----------------+----------------+----------------'
   ),
 
diff --git a/keyboards/handwired/owlet60/keymaps/default/keymap.c b/keyboards/handwired/owlet60/keymaps/default/keymap.c
index d4f57452f9..5df0b9fbd9 100644
--- a/keyboards/handwired/owlet60/keymaps/default/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_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_PGDN,
     KC_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,                KC_HOME,
             KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,    KC_RSFT,    KC_UP,     KC_END,
-            KC_LCTRL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT
+            KC_LCTL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT
   ),
 
   [1] = LAYOUT_owlet60_full_bsp(
diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
index f6388df54d..2a89c1c0a0 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_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_PGDN, \
     KC_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,                KC_HOME, \
             KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,    KC_RSFT,    KC_UP,     KC_END, \
-            KC_LCTRL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT \
+            KC_LCTL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT \
   ),
 
   [1] = LAYOUT_owlet60_full_bsp(
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index 9ebcc0bf53..b5f0465980 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -94,7 +94,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* key combination for command */
-#define IS_COMMAND()         (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RCTRL)))
+#define IS_COMMAND()         (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT) | MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)))
 
 
 /*
diff --git a/keyboards/handwired/pteron/keymaps/FSund/keymap.c b/keyboards/handwired/pteron/keymaps/FSund/keymap.c
index 0bcd44f65d..14ad23cd43 100644
--- a/keyboards/handwired/pteron/keymaps/FSund/keymap.c
+++ b/keyboards/handwired/pteron/keymaps/FSund/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_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_RSHIFT,
+        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
     ),
 
diff --git a/keyboards/handwired/split89/keymaps/default/keymap.c b/keyboards/handwired/split89/keymaps/default/keymap.c
index 2d2d6038a0..393bfc6758 100644
--- a/keyboards/handwired/split89/keymaps/default/keymap.c
+++ b/keyboards/handwired/split89/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,KC_1,    KC_2,   KC_3,         KC_4,   KC_5,   KC_6,      KC_7,   KC_8,   KC_9,   KC_0,    KC_MINS, KC_EQL,    KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,KC_Q,   KC_W,         KC_E,   KC_R,   KC_T,      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_Y,   KC_J,   KC_K,   KC_L,    KC_SCLN,KC_QUOT,    KC_ENT,
-        KC_LSFT, KC_Z,   KC_X,         KC_C,   KC_V,   KC_B,      KC_H,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH, KC_RSHIFT, KC_UP,
+        KC_LSFT, KC_Z,   KC_X,         KC_C,   KC_V,   KC_B,      KC_H,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
          KC_LCTL,MO(1),KC_LGUI,KC_LALT,KC_SPACE,    KC_N,   KC_SPACE, KC_RALT,KC_RGUI, KC_APP,  KC_RCTL,   KC_LEFT,   KC_DOWN, KC_RGHT
         ),
     /* Volume */
diff --git a/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
index 72b4369af8..4f0b98ab9d 100644
--- a/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_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_MENU,  KC_RCTRL,        KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, KC_MENU,  KC_RCTL,         KC_LEFT, KC_DOWN, KC_RGHT),
 
 [_FN] = LAYOUT(
   KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
@@ -25,5 +25,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
   KC_LSFT, KC_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_MENU,  KC_RCTRL,        KC_LEFT, KC_DOWN, KC_RGHT)
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, KC_MENU,  KC_RCTL,         KC_LEFT, KC_DOWN, KC_RGHT)
 };
diff --git a/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
index fc0af9770f..1e116563fe 100644
--- a/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_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_RCTRL,          KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT),
 
 [1] = LAYOUT_all(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
diff --git a/keyboards/handwired/t111/keymaps/default/keymap.c b/keyboards/handwired/t111/keymaps/default/keymap.c
index f765dfac84..b6ec9356e9 100644
--- a/keyboards/handwired/t111/keymaps/default/keymap.c
+++ b/keyboards/handwired/t111/keymaps/default/keymap.c
@@ -35,8 +35,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_PSCR, KC_SCRL, KC_PAUS,
     KC_ESC,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_INS,  KC_DEL,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP, KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_EQL,
-    KC_LCTRL, KC_A,   KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,        KC_ENT,    KC_HOME, KC_END,   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_RCTRL,       KC_RSFT,   KC_UP,   KC_DOWN,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_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_HOME, KC_END,   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_RCTL,        KC_RSFT,   KC_UP,   KC_DOWN,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
                    KC_LGUI, KC_LALT,                                KC_SPC,                                    KC_RALT,                   KC_LEFT, KC_RGHT,     KC_P0,   KC_PDOT
     )
 };
diff --git a/keyboards/handwired/t111/keymaps/oleg/keymap.c b/keyboards/handwired/t111/keymaps/oleg/keymap.c
index aa73788fb3..9d66ded502 100644
--- a/keyboards/handwired/t111/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/t111/keymaps/oleg/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LGUI,          KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_VOLD,   KC_VOLU, KC_MUTE,  KC_PSCR,
     KC_ESC,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_PGUP, KC_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,        KC_ENT,    KC_PGDN, KC_END,   KC_P7,   KC_P8,   KC_P9,   KC_EQL,
-    KC_LCTRL, KC_A,   KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,                   KC_DEL,  KC_NUM,   KC_P4,   KC_P5,   KC_P6,   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_BSLS,                   KC_DEL,  KC_NUM,   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, MC1,            KC_RSFT,   KC_UP,   KC_DOWN,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
                    KC_CAPS, KC_LALT,                                KC_SPC,                                    MO(1),                   KC_LEFT, KC_RGHT,     KC_P0,   KC_PDOT
     ),
diff --git a/keyboards/handwired/tritium_numpad/keymaps/ortho_left/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/ortho_left/keymap.c
index 9d569f18a5..2545390509 100644
--- a/keyboards/handwired/tritium_numpad/keymaps/ortho_left/keymap.c
+++ b/keyboards/handwired/tritium_numpad/keymaps/ortho_left/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_E,   KC_D,   KC_C,      KC_LGUI, 
     KC_W,   KC_S,   KC_X,      KC_LALT,
     KC_Q,   KC_A,   KC_Z,      KC_LCTL, 
-    KC_TAB, KC_ESC, KC_LSHIFT, MO(1)
+    KC_TAB, KC_ESC, KC_LSFT,   MO(1)
   ),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c b/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
index c760b0b24d..4f729448c3 100644
--- a/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
+++ b/keyboards/handwired/unicomp_mini_m/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ enum custom_keycodes {
 };
 
 // Mod key detection
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 #define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
index c71d8ea050..1568b2f61b 100644
--- a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FN1] = LAYOUT(
 		      	_______, _______, _______,      _______, _______, _______, _______,    _______, QK_BOOT,  KC_PAUS,    KC_HOME, KC_PGDN, KC_PGUP, KC_END,
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RCTRL,
+		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RCTL,
 		_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		  _______,                                _______,                                          _______
diff --git a/keyboards/handwired/videowriter/keymaps/via/keymap.c b/keyboards/handwired/videowriter/keymaps/via/keymap.c
index 8b46e60a34..d052b76a1b 100644
--- a/keyboards/handwired/videowriter/keymaps/via/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/via/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
 		      	_______, _______, _______,      _______, _______, _______, _______,    _______, QK_BOOT,  KC_PAUS,    KC_HOME, KC_PGDN, KC_PGUP, KC_END,
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RCTRL,
+		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RCTL,
 		_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		  _______,                                _______,                                          _______
diff --git a/keyboards/handwired/z150/keymaps/default/keymap.c b/keyboards/handwired/z150/keymaps/default/keymap.c
index 2784300db5..8ebc68f37a 100644
--- a/keyboards/handwired/z150/keymaps/default/keymap.c
+++ b/keyboards/handwired/z150/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
     KC_F1,  KC_F2, KC_ESC,   KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_NUM,     KC_SCRL,       KC_PAUS,
     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_P7,   KC_P8,   KC_P9,   KC_PSCR,
-    KC_F5,  KC_F6, KC_LCTRL, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,    KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
+    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_P4,   KC_P5,   KC_P6,   KC_PMNS,
     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_P1,   KC_P2,   KC_P3,   KC_PPLS,
     KC_F9,  KC_F10,KC_LALT,         KC_GRV,                                 KC_SPC,                                            KC_CAPS,       KC_P0,            KC_PDOT
     )
diff --git a/keyboards/handwired/z150/keymaps/zyxx/keymap.c b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
index 68269b7bba..76ee90d9dc 100644
--- a/keyboards/handwired/z150/keymaps/zyxx/keymap.c
+++ b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_LCTRL, KC_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_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
     ),
diff --git a/keyboards/helix/pico/keymaps/biacco/keymap.c b/keyboards/helix/pico/keymaps/biacco/keymap.c
index 3063a85bfc..42e3c5424e 100644
--- a/keyboards/helix/pico/keymaps/biacco/keymap.c
+++ b/keyboards/helix/pico/keymaps/biacco/keymap.c
@@ -104,7 +104,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_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,                           KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
     KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,                           KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1), \
-    KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
+    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3 \
   )
 
 };
diff --git a/keyboards/hhkb/ansi/keymaps/brett/config.h b/keyboards/hhkb/ansi/keymaps/brett/config.h
index b9a61e10a7..8f769d603f 100644
--- a/keyboards/hhkb/ansi/keymaps/brett/config.h
+++ b/keyboards/hhkb/ansi/keymaps/brett/config.h
@@ -9,8 +9,8 @@
 
 #define LSPO_KEY KC_9
 #define RSPC_KEY KC_0
-#define LSPO_MOD KC_LSHIFT
-#define RSPC_MOD KC_RSHIFT
+#define LSPO_MOD KC_LSFT
+#define RSPC_MOD KC_RSFT
 
 // This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
 // you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
diff --git a/keyboards/hhkb/rn42/rn42_task.c b/keyboards/hhkb/rn42/rn42_task.c
index 26dacbd650..0e21eb9a79 100644
--- a/keyboards/hhkb/rn42/rn42_task.c
+++ b/keyboards/hhkb/rn42/rn42_task.c
@@ -406,7 +406,7 @@ bool command_console_extra(uint8_t code)
 // convert keycode into ascii charactor
 static uint8_t code2asc(uint8_t code)
 {
-    bool shifted = (get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))) ? true : false;
+    bool shifted = (get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))) ? true : false;
     switch (code) {
         case KC_A: return (shifted ? 'A' : 'a');
         case KC_B: return (shifted ? 'B' : 'b');
diff --git a/keyboards/hotdox/keymaps/imchipwood/keymap.c b/keyboards/hotdox/keymaps/imchipwood/keymap.c
index 6dda884fa6..497a038ad3 100644
--- a/keyboards/hotdox/keymaps/imchipwood/keymap.c
+++ b/keyboards/hotdox/keymaps/imchipwood/keymap.c
@@ -54,9 +54,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //    |------------+------------+------------+------------+------------+------------+            |   |            +------------+------------+------------+------------+------------+------------|
         KC_BSLS,     KC_A,        KC_S,        KC_D,        KC_F,        KC_G,                                      KC_H,        KC_J,        KC_K,        KC_L,        KC_SCLN,     KC_QUOT,
 //    |------------+------------+------------+------------+------------+------------+------------|   |------------+------------+------------+------------+------------+------------+------------|
-        KC_LSHIFT,   KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        MO(_MED),        MO(_MED),    KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     TD(TD_RSFT_CAPS),
+        KC_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        MO(_MED),        MO(_MED),    KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     TD(TD_RSFT_CAPS),
 //    |------------+------------+------------+------------+------------+------------+------------|   |------------+------------+------------+------------+------------+------------+------------|
-        KC_LCTRL,    KC_LALT,     KC_LGUI,     TD(TD_LOME), TD(TD_REND),                                                         KC_UP,       KC_DOWN,     KC_LEFT,     KC_RGHT,     KC_PSCR,
+        KC_LCTL,     KC_LALT,     KC_LGUI,     TD(TD_LOME), TD(TD_REND),                                                         KC_UP,       KC_DOWN,     KC_LEFT,     KC_RGHT,     KC_PSCR,
 //     `---------------------------------------------------------------'                                                       `----------------------------------------------------------------'
 //                                                                     ,-------------------------.   ,-------------------------.
                                                                          KC_DEL,      KC_INS,          KC_TRNS,     KC_TRNS,
diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c
index 39d94b340b..838ac56133 100644
--- a/keyboards/hub16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/hub16/keymaps/ahk_companion/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_MPLY, KC_MUTE,
                 RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
                 RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSHIFT,
+                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSFT,
                 KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c
index 7c1f7c5178..9342193ef2 100644
--- a/keyboards/hub16/keymaps/peepeetee/keymap.c
+++ b/keyboards/hub16/keymaps/peepeetee/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //                 KC_MPLY, KC_MUTE,
         //         RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
         //         RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-        //         RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSHIFT,
+        //         RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSFT,
         //         KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         // ),
 };
diff --git a/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c b/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c
index 3c728c9341..1e9ca44373 100644
--- a/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c
+++ b/keyboards/ibm/model_m_4th_gen/keymaps/default/keymap.c
@@ -28,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_NUBS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTRL,          KC_LALT, KC_NO,             KC_SPC,                             KC_RALT,          KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+        KC_LCTL,          KC_LALT, KC_NO,             KC_SPC,                             KC_RALT,           KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     )
 };
diff --git a/keyboards/idobao/montex/v1/keymaps/default/keymap.c b/keyboards/idobao/montex/v1/keymaps/default/keymap.c
index db4593657a..a3a7a54d86 100644
--- a/keyboards/idobao/montex/v1/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v1/keymaps/default/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_COMMA,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,   KC_P8,   KC_P9,
         KC_LALT,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-        KC_LSHIFT, KC_P1,   KC_P2,   KC_P3,
-        KC_LCTRL,  KC_P0,            KC_PDOT, KC_PENT
+        KC_LSFT,   KC_P1,   KC_P2,   KC_P3,
+        KC_LCTL,   KC_P0,            KC_PDOT, KC_PENT
     ),
 
     /*
diff --git a/keyboards/idobao/montex/v1/keymaps/via/keymap.c b/keyboards/idobao/montex/v1/keymaps/via/keymap.c
index 8399a390ed..d17656fca2 100644
--- a/keyboards/idobao/montex/v1/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v1/keymaps/via/keymap.c
@@ -22,8 +22,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_COMMA,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,   KC_P8,   KC_P9,
         KC_LALT,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-        KC_LSHIFT, KC_P1,   KC_P2,   KC_P3,
-        KC_LCTRL,  KC_P0,            KC_PDOT, KC_PENT
+        KC_LSFT,   KC_P1,   KC_P2,   KC_P3,
+        KC_LCTL,   KC_P0,            KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT_numpad_6x5(
         QK_BOOT,   _______, _______, _______, _______,
diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
index 600c5e6e18..5fb6b4fcca 100755
--- a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
@@ -21,10 +21,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
-        KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   KC_P1,    KC_P2,   KC_P3,   KC_PENT,
         MO(1),     KC_P0,             KC_PDOT
     ),
 
diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
index d11acedb64..cf2799591b 100755
--- a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
@@ -28,10 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BASE] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
-        KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   KC_P1,    KC_P2,   KC_P3,   KC_PENT,
         MO(1),     KC_P0,             KC_PDOT
     ),
 
diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c
index b4ef7f7970..b5740daedc 100755
--- a/keyboards/idobao/montex/v2/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c
@@ -21,10 +21,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
-        KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   KC_P1,    KC_P2,   KC_P3,   KC_PENT,
         MO(1),     KC_P0,             KC_PDOT
     ),
 
diff --git a/keyboards/idobao/montex/v2/keymaps/via/keymap.c b/keyboards/idobao/montex/v2/keymaps/via/keymap.c
index e8281d4eac..fab29e31a7 100755
--- a/keyboards/idobao/montex/v2/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v2/keymaps/via/keymap.c
@@ -30,10 +30,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BASE] = LAYOUT_numpad_6x5(
         KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
-        KC_LCTRL,  KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
-        KC_LSHIFT, KC_P1,    KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   KC_P1,    KC_P2,   KC_P3,   KC_PENT,
         MO(1),     KC_P0,             KC_PDOT
     ),
 
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
index 18c2fafa7f..2ee7c9bde9 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
                                               LSFT(KC_INSERT),  TT(_QWERTY_KIDS),
                                                           ________ ,
-                                    KC_LSHIFT, SYMB_BSP,  KC_INSERT   ,
+                                    KC_LSFT,   SYMB_BSP,  KC_INSERT   ,
 
                  F12_RUN,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10, TD(CALCCOMP),
                 CALTDEL ,    KC_Y,      KC_U,     KC_I,     KC_O,      KC_P,  MODRESET,
@@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
                                                 KC_NO ,    TT(_QWERTY_KIDS) ,
                                                             KC_NO  ,
-                                    KC_LSHIFT, KC_BSPC,      KC_NO    ,
+                                    KC_LSFT,   KC_BSPC,      KC_NO    ,
 
                    KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,   KC_NO ,
                   KC_NO  ,    KC_Y,      KC_U, KC_I,     KC_O,      KC_P,    KC_NO ,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index 0498cb48bb..ca0442103d 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_EQL,
         KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        KC_Z,  		  KC_X,   KC_C,   KC_V,   KC_B,   KC_MINUS,
-        KC_LCTRL, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  MO(SHORTCUTS),
+        KC_LCTL, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  MO(SHORTCUTS),
                                               KC_LGUI,  KC_BTN1,
                                                               MU_ON,
                                          KC_SPACE,KC_DEL,KC_END,
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_RBRC,    KC_Y,   KC_U,  KC_I,   KC_O,   KC_P,             KC_SLASH,
                           KC_H,   KC_J,  KC_K,   KC_L,   KC_SCLN,		   KC_ENT,
              KC_EQL,KC_N,   KC_M,  KC_COMM,KC_DOT, KC_SLASH,   	   KC_RSFT,
-                                  MO(SHORTCUTS), KC_UP,KC_DOWN,KC_RALT,           KC_RCTRL,
+                                  MO(SHORTCUTS), KC_UP,KC_DOWN,KC_RALT,           KC_RCTL,
              KC_BTN1,        KC_RGUI,
              MU_OFF,
              KC_PGDN,KC_TAB, LT(HALFQWERTY, KC_ENT)
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_BSLS,         KC_P,         KC_O,   KC_I,   KC_U,   KC_Y,   KC_LBRC,
         KC_ENT,        KC_SCLN,      KC_L,   KC_K,   KC_J,   KC_H,
         KC_LSFT,        KC_SLASH,  	  KC_DOT, KC_COMM,KC_M,   KC_N,   KC_RBRC,
-        KC_LCTRL, 		KC_LALT,	   LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRNS,
+        KC_LCTL, 		KC_LALT,	   LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRNS,
                                               KC_TRNS,  KC_TRNS,
                                                               KC_TRNS,
                                          KC_TRANSPARENT,KC_DEL,KC_END,
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_MINUS,    KC_T,   KC_R,  KC_E,   KC_W,   KC_Q,             KC_BSLS,
                           KC_G,   KC_F,  KC_D,   KC_S,   KC_A,  		   KC_ENT,
              KC_EQL,KC_B,   KC_V,  KC_C,   KC_X,   KC_Z,		   	   KC_RSFT,
-                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           KC_RCTRL,
+                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           KC_RCTL,
              KC_TRANSPARENT,        KC_TRNS,
              KC_TRNS,
              KC_PGDN,KC_TAB, KC_TRANSPARENT
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,         KC_QUOTE,	  KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_MINUS,
         KC_BSPC,        KC_A,         KC_O,   KC_E,   KC_U,   KC_I,
         KC_LSFT,        KC_SCLN,	  KC_Q,   KC_J,   KC_K,   KC_X,   KC_EQL,
-        KC_LCTRL, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRNS,
+        KC_LCTL, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRNS,
                                               KC_TRNS,  KC_TRANSPARENT,
                                                               KC_UP,
                               LT(HALFDVORAK, KC_SPACE),KC_DEL,KC_DOWN,
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_LBRC,    KC_F,   KC_G,  KC_C,   KC_R,   KC_L,             KC_SLASH,
                           KC_D,   KC_H,  KC_T,   KC_N,   KC_S,		   KC_ENT,
              KC_RBRC,KC_B,   KC_M,  KC_W,	 KC_V,	 KC_Z,		   	   KC_RSFT,
-                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           KC_RCTRL,
+                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           KC_RCTL,
              KC_TRANSPARENT,        KC_TRANSPARENT,
              KC_PGUP,
              KC_PGDN,KC_TAB, LT(HALFDVORAK, KC_ENT)
@@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_SLASH,         KC_L,         KC_R,   KC_C,   KC_G,   KC_F,   KC_LBRC,
         KC_ENT,        KC_S,         KC_N,   KC_T,   KC_H,   KC_D,
         KC_LSFT,        KC_Z,  		  KC_V,   KC_W,   KC_M,   KC_B,   KC_RBRC,
-        KC_LCTRL, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRNS,
+        KC_LCTL, 		KC_LALT,	  LCTL(LSFT(KC_TAB)),LCTL(KC_TAB),  KC_TRNS,
                                               KC_TRANSPARENT,  KC_TRANSPARENT,
                                                               KC_TRNS,
                                          KC_TRANSPARENT,KC_ENT,KC_TRNS,
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_MINUS,    KC_Y,   KC_P,  KC_DOT, KC_COMM,KC_P,             KC_TAB,
                           KC_I,   KC_U,  KC_E,   KC_O,   KC_A,		 	   KC_BSPC,
              KC_EQL,KC_X,   KC_K,  KC_J,	 KC_Q,   KC_SCLN,	   	   KC_RSFT,
-                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           KC_RCTRL,
+                                  KC_TRNS, KC_UP,KC_DOWN,KC_RALT,           KC_RCTL,
              KC_TRANSPARENT,        KC_TRNS,
              KC_TRNS,
              KC_TRNS,KC_TAB, KC_TRANSPARENT
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index b732469cfa..0933e37eb5 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LCTRL, MO(3),  KC_EQL, KC_LGUI, KC_LALT,
+    KC_LCTL,  MO(3),  KC_EQL, KC_LGUI, KC_LALT,
                                             KC_NUM,   KC_SCRL,
                                             KC_HOME,
                                             KC_SPC,   KC_DEL, KC_END,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
index 7b1191805d..9538824722 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
@@ -64,20 +64,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX,
   KC_ESC,                 L01_LEFT_01,                 KC_LEAD,
   MO(L03),                L01_LEFT_02,
-  KC_LSHIFT,              L01_LEFT_03,                 MO(LFN),
-  KC_LCTRL,KC_LGUI,KC_LALT, MO(L05), MO(L04),
+  KC_LSFT,                L01_LEFT_03,                 MO(LFN),
+  KC_LCTL, KC_LGUI,KC_LALT, MO(L05), MO(L04),
                                               XXXXXXX, XXXXXXX,
                                                        KC_PGUP,
-                                     KC_SPACE,KC_LSHIFT,KC_PGDN,
+                                     KC_SPACE,KC_LSFT, KC_PGDN,
   //--
   XXXXXXX,  KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_LEAD,                L01_RIGHT_01,                 KC_ENTER,
                           L01_RIGHT_02,                 MO(L03),
-  MO(LFN),                L01_RIGHT_03,                 KC_RSHIFT,
-                    MO(L04), MO(L05), KC_RALT, MO(LFN), KC_RCTRL,
+  MO(LFN),                L01_RIGHT_03,                 KC_RSFT,
+                    MO(L04), MO(L05), KC_RALT, MO(LFN), KC_RCTL,
   KC_LEFT, KC_RIGHT,
   KC_UP,
-  KC_DOWN, KC_RSHIFT, KC_SPACE
+  KC_DOWN, KC_RSFT, KC_SPACE
 ),
 
 
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
index c322222baf..0fb88de421 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_LSFT, KC_TAB,  MO(MANLNX), GUI_ESC,
                                                     _______, _______,
                                                              _______,
-                                          KC_LCTRL, KC_BSPC, _______,
+                                          KC_LCTL,  KC_BSPC, _______,
     // right hand
     _______, _______, _______,  _______, _______, _______,        _______,
     _______, KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,           KC_BSPC,
diff --git a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
index eab5ad85d7..5509c05260 100644
--- a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
@@ -39,7 +39,7 @@ const uint16_t 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_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_LCTRL, 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_LCTL, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,      KC_PGUP,\
         KC_LSFT,XXXXXXX,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,     KC_UP,  KC_PGDN,\
         KC_LALT,MO(1), KC_LGUI,               KC_SPC,           KC_RGUI,KC_RALT, XXXXXXX,     KC_LEFT,KC_DOWN,KC_RGHT \
     ),
diff --git a/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c b/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c
index 9e54eb26ba..649ea50c42 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c
@@ -27,7 +27,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_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,  KC_RBRC,  KC_BSLS,
         KC_LCAP, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,                KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  KC_QUOT,  KC_ENT,
         KC_LSFT,   KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,                   KC_B,  KC_N,  KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,  KC_DEL,    KC_UP,   
-        KC_LCTRL,   KC_LGUI, KC_LALT, KC_SPC, KC_SPC,                KC_SPC,  KC_SPC,                                              KC_LEFT,  KC_DOWN,  KC_RIGHT
+        KC_LCTL,   KC_LGUI, KC_LALT, KC_SPC, KC_SPC,                KC_SPC,  KC_SPC,                                              KC_LEFT,  KC_DOWN,  KC_RIGHT
     ),
     [_FN] = LAYOUT_all(
         QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,                    KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
diff --git a/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c
index e6a88ed923..27ec9b8f3d 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c
+++ b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c
@@ -22,7 +22,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_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,  KC_RBRC,  KC_BSLS,
         KC_LCAP, KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,                KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  KC_QUOT,  KC_ENT,
         KC_LSFT,   KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,                   KC_B,  KC_N,  KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,  KC_DEL,    KC_UP,   
-        KC_LCTRL,   KC_LGUI, KC_LALT, KC_SPC, KC_SPC,                KC_SPC,  KC_SPC,                                              KC_LEFT,  KC_DOWN,  KC_RIGHT
+        KC_LCTL,   KC_LGUI, KC_LALT, KC_SPC, KC_SPC,                KC_SPC,  KC_SPC,                                              KC_LEFT,  KC_DOWN,  KC_RIGHT
     ),
     [1] = LAYOUT_all(
         QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,                    KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
diff --git a/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
index d937b68813..b581c54a08 100644
--- a/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 #define KC_CMD_ET    LT(COMMAND,KC_ENTER)
 #define KC_NUM_ALT   LT(NUMBER,KC_LALT)
 #define KC_NUM_BS    LT(NUMBER,KC_BSPC)
-#define KC_SET_CTRL  LT(FUNCTION,KC_LCTRL)
+#define KC_SET_CTRL  LT(FUNCTION,KC_LCTL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT( /* Base */
diff --git a/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
index d937b68813..b581c54a08 100644
--- a/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 #define KC_CMD_ET    LT(COMMAND,KC_ENTER)
 #define KC_NUM_ALT   LT(NUMBER,KC_LALT)
 #define KC_NUM_BS    LT(NUMBER,KC_BSPC)
-#define KC_SET_CTRL  LT(FUNCTION,KC_LCTRL)
+#define KC_SET_CTRL  LT(FUNCTION,KC_LCTL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT( /* Base */
diff --git a/keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c
index a48072d9f2..e4b71eaef5 100644
--- a/keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 #define KC_CMD_ET    LT(COMMAND,KC_ENTER)
 #define KC_NUM_ALT   LT(NUMBER,KC_LALT)
 #define KC_NUM_BS    LT(NUMBER,KC_BSPC)
-#define KC_SET_CTRL  LT(SETTING,KC_LCTRL)
+#define KC_SET_CTRL  LT(SETTING,KC_LCTL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_split_3x5_3( /* Base */
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
index 732b09e113..4f7a9aa9a2 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
         KC_LCAP, KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT    ,KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,   KC_NO,
-        KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
+        KC_LSFT, KC_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_NO,KC_NO,KC_SPC,KC_NO,KC_NO,KC_RALT,KC_RGUI,KC_SPC,KC_RCTL,   KC_LEFT,KC_DOWN,KC_RIGHT,           KC_P0,   KC_NO, KC_PDOT,   KC_NO
     )
 };
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
index 13dee5c345..6c0f83240d 100644
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
+++ b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
         KC_LCTL, KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT    ,KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,   KC_NO,
-        KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
+        KC_LSFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSFT,                   KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
         KC_LCTL,KC_LGUI,KC_LALT,KC_COMMAND,KC_SPC,KC_SPC,KC_SPC,KC_F14,KC_RALT,KC_NO,KC_NO,KC_COMMAND,   KC_LEFT,KC_DOWN,KC_RIGHT,           KC_P0,   KC_NO, KC_PDOT,   KC_NO ),
     [COMMAND] = LAYOUT_all( /* COMMAND */
         KC_ESC,   KC_F1,KC_F2,KC_F3,KC_F4,  KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,KC_F10,KC_F11,KC_F12,  KC_PSCR,KC_SCRL,KC_PAUSE,
@@ -38,6 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
         KC_LCAP, KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT    ,KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,   KC_NO,
-        KC_LSHIFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSHIFT,                 KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
+        KC_LSFT, KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,  KC_RSFT,                   KC_UP,                    KC_P1,   KC_P2,   KC_P3, KC_PENT,
         KC_LCTL,KC_LGUI,KC_LALT,_______,KC_SPC,KC_SPC,KC_SPC,KC_F14,KC_RALT,KC_NO,KC_NO,_______,   KC_LEFT,KC_DOWN,KC_RIGHT,           KC_P0,   KC_NO, KC_PDOT,   KC_NO ),
 };
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index a72e306990..f0c6c0d188 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -137,7 +137,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   static bool shifted = false;
   static bool magic = false;
 
-  if (keycode == KC_LSHIFT || keycode == KC_RSHIFT) {
+  if (keycode == KC_LSFT || keycode == KC_RSFT) {
     shifted = record->event.pressed;
   } else if (keycode == MAGIC) {
     magic = record->event.pressed;
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
index e01bb62ab3..8c814b86bb 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
@@ -144,7 +144,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case CK_ESCG:
             /* if pressed, inject key, otherwise delete it */
             if (record->event.pressed) {
-                bool shifted = get_mods() & MOD_BIT(KC_LSHIFT);
+                bool shifted = get_mods() & MOD_BIT(KC_LSFT);
                 add_key(shifted ? KC_ESC : KC_GRV);
                 ck_escg_last_shifted = shifted;
             } else {
diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
index 43bd06da9b..b5c8d52d7a 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
@@ -103,10 +103,10 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     // Cannot use LM(L_RCTRL, MOD_RCTL) because it sends LCtrl instead of RCtrl
     case RCTRL:
         if (record->event.pressed) {
-            register_code(KC_RCTRL);
+            register_code(KC_RCTL);
             layer_on(L_RCTRL);
         } else {
-            unregister_code(KC_RCTRL);
+            unregister_code(KC_RCTL);
             layer_off(L_RCTRL);
         }
         break;
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index 4dbdadbc18..ea743a41ef 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FUNC] = LAYOUT_ansi_1u(
         QK_BOOT, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS,
diff --git a/keyboards/keebio/iris/keymaps/ave-63/keymap.c b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
index 115a27d7e8..81e2170372 100644
--- a/keyboards/keebio/iris/keymaps/ave-63/keymap.c
+++ b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
@@ -13,7 +13,7 @@ Will require heavy modification for most people.
 
 extern keymap_config_t keymap_config;
 
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 
 enum my_layers {
   _QWERTY,
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
index a479f9fe52..92f4294a40 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
+++ b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
@@ -94,7 +94,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 bool sh_key(keyrecord_t *record, uint8_t sk, uint8_t nk){
       if (record->event.pressed) {
-        if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
            unregister_code(KC_LSFT);
            unregister_code(KC_RSFT);
            register_code(sk);
@@ -111,7 +111,7 @@ bool sh_key(keyrecord_t *record, uint8_t sk, uint8_t nk){
 
 bool sh_key8(keyrecord_t *record, uint8_t sk, uint8_t nk){
       if (record->event.pressed) {
-        if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
            register_code(sk);
         } else {
            register_code(nk);
diff --git a/keyboards/keebio/levinson/keymaps/rossman360/keymap.c b/keyboards/keebio/levinson/keymaps/rossman360/keymap.c
index efb5f9cfa4..4c9cac0fb8 100644
--- a/keyboards/keebio/levinson/keymaps/rossman360/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/rossman360/keymap.c
@@ -5,7 +5,7 @@
 #define SPCMOD LT(_FN1, KC_SPACE)
 #define ENTMOD LT(_FN2, KC_ENTER)
 #define ESCMOD LT(_NUM, KC_ESC)
-#define RSMOD LT(_FN1, KC_RSHIFT)
+#define RSMOD LT(_FN1, KC_RSFT)
 #define CMDBSP MT(MOD_LGUI, KC_BSPC)
 #define ALTDEL MT(MOD_LALT, KC_DEL)
 #define CTRLSP MT(MOD_LCTL, KC_SPACE)
diff --git a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
index 0b7b76101e..68dd9ef7d3 100755
--- a/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/rossman360/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
      KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,           KC_UP,
   //├──────────┬───────┴──┬─────┴────┬───┴────────┴─────┬───┴────────┴───┬─────┴────────┴┬────────┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     CMDBSP,    ALTDEL,   KC_LCTRL,        KC_SPACE,      SPCMOD,          SPCMOD,        MO(_DEL),         KC_LCTL,    KC_RCTRL,      KC_LEFT, KC_DOWN, KC_RGHT
+     CMDBSP,    ALTDEL,   KC_LCTL,         KC_SPACE,      SPCMOD,          SPCMOD,        MO(_DEL),         KC_LCTL,    KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT
   //└──────────┴──────────┴──────────┴──────────────────┴────────────────┴───────────────┴─────────────────┴──────────┴──────────┘    └────────┴────────┴────────┘
   ),
 
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
index 373438e4b4..b630b6f698 100644
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_Q,    KC_W,   KC_E,     KC_R,    KC_T,                      KC_Y,   KC_U,    KC_I,    KC_O,    KC_P    ,
     KC_A,    KC_S,   KC_D,     KC_F,    KC_G,                      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN ,
     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_LCTRL, KC_ESC, KC_LGUI,  KC_LALT, KC_SPC, FN0,      FN0,     KC_SPC, KC_LALT, KC_MINS, KC_QUOT, KC_LCTRL
+    KC_LCTL, KC_ESC, KC_LGUI,  KC_LALT, KC_SPC, FN0,      FN0,     KC_SPC, KC_LALT, KC_MINS, KC_QUOT, KC_LCTL
   ),
 
   /*
@@ -83,10 +83,10 @@ bool substitute_keycode(uint16_t keycode, keyrecord_t *record, uint8_t mod_state
     // of the delete key status: registered or not?
     static bool key_registered;
     // ctrl activated?
-    if ((mod_state & MOD_BIT(KC_LCTRL)) == MOD_BIT(KC_LCTRL)) {
+    if ((mod_state & MOD_BIT(KC_LCTL)) == MOD_BIT(KC_LCTL)) {
         if (record->event.pressed) {
-            // No need to register KC_LCTRL because it's already active.
-            unregister_code(KC_LCTRL);
+            // 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
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
index 613041e858..25265379a5 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
     KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
     KC_LSFT, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LCTRL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+    KC_LCTL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
                       KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,   KC_ENT,   RAISE,   KC_BSPC, KC_RGUI, KC_RALT
 ),
 /* LOWER
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c b/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
index fa90c8cce8..243a7d013d 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
     KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
     KC_LSFT, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LCTRL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+    KC_LCTL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
                       KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,   KC_ENT,   RAISE,   KC_BSPC, KC_RGUI, KC_RALT
 ),
 /* LOWER
diff --git a/keyboards/keygem/kg60ansi/keymaps/default/keymap.c b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
index b0ad2a1acd..dfa6d6ee8c 100644
--- a/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
+++ b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_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_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
diff --git a/keyboards/keygem/kg60ansi/keymaps/via/keymap.c b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
index 7a16465bbb..9d43b63541 100644
--- a/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
+++ b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_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_RCTRL
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
diff --git a/keyboards/keyhive/smallice/keymaps/default/keymap.c b/keyboards/keyhive/smallice/keymaps/default/keymap.c
index d4a5fad42b..12ac4bae9e 100644
--- a/keyboards/keyhive/smallice/keymaps/default/keymap.c
+++ b/keyboards/keyhive/smallice/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,   KC_LBRC, KC_RBRC, KC_BSPC,
         KC_VOLU, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,KC_QUOT,          KC_ENT,
         KC_VOLD, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT, KC_RSFT, KC_UP,   KC_SLSH,
-                 KC_LCTRL,         KC_LALT,          KC_SPC,  KC_LWIN,          KC_SPC,           MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT
+                 KC_LCTL,          KC_LALT,          KC_SPC,  KC_LWIN,          KC_SPC,           MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keyhive/smallice/keymaps/via/keymap.c b/keyboards/keyhive/smallice/keymaps/via/keymap.c
index d9f5d58d65..068a31a5aa 100644
--- a/keyboards/keyhive/smallice/keymaps/via/keymap.c
+++ b/keyboards/keyhive/smallice/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,   KC_LBRC, KC_RBRC, KC_BSPC,
         KC_VOLU, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,KC_QUOT,          KC_ENT,
         KC_VOLD, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT, KC_RSFT, KC_UP,   KC_SLSH,
-                 KC_LCTRL,         KC_LALT,          KC_SPC,  KC_LWIN,          KC_SPC,           MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT
+                 KC_LCTL,          KC_LALT,          KC_SPC,  KC_LWIN,          KC_SPC,           MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kin80/keymaps/andrew/keymap.c b/keyboards/kin80/keymaps/andrew/keymap.c
index c0d88579da..1031396880 100644
--- a/keyboards/kin80/keymaps/andrew/keymap.c
+++ b/keyboards/kin80/keymaps/andrew/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LSHIFT,  KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,      KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSHIFT,
+    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,
diff --git a/keyboards/kin80/keymaps/maxim/keymap.c b/keyboards/kin80/keymaps/maxim/keymap.c
index cbb5bef4f4..1e1897f399 100644
--- a/keyboards/kin80/keymaps/maxim/keymap.c
+++ b/keyboards/kin80/keymaps/maxim/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_RCTRL,
+			                              MO(_NM),  KC_ENTER,                KC_RGUI,KC_RCTL,
                                               KC_HOME,                 KC_PGUP,
                              KC_SPC, KC_BSPC, KC_END,                  KC_PGDN,KC_DEL, KC_ENTER
     ),
diff --git a/keyboards/kin80/keymaps/quartz64/keymap.c b/keyboards/kin80/keymaps/quartz64/keymap.c
index dca26a6924..2b676539c4 100644
--- a/keyboards/kin80/keymaps/quartz64/keymap.c
+++ b/keyboards/kin80/keymaps/quartz64/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LSPO,    LCTL_T(KC_Z), KC_X,          KC_C,    KC_V,    KC_B,      KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
     KC_MPLY,         MO(_MC), LCTL(KC_LSFT), KC_LBRC, KC_RBRC, KC_NO,     KC_NO,  KC_LEFT,KC_DOWN, KC_UP,  KC_RGHT,KC_NO,
-			                                        MO(_NM),  KC_ENTER,            KC_RGUI,KC_RCTRL,
+			                                        MO(_NM),  KC_ENTER,            KC_RGUI,KC_RCTL,
                                                         KC_HOME,             KC_PGUP,
                                        KC_SPC, KC_BSPC, KC_END,              KC_PGDN,KC_DEL, KC_ENTER
     ),
diff --git a/keyboards/kin80/keymaps/roman/keymap.c b/keyboards/kin80/keymaps/roman/keymap.c
index 65cf63b42e..34620da97a 100644
--- a/keyboards/kin80/keymaps/roman/keymap.c
+++ b/keyboards/kin80/keymaps/roman/keymap.c
@@ -59,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LSHIFT,  KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,      KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSHIFT,
+    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_LCTRL, KC_LALT,                    KC_RGUI, KC_RSHIFT,
+			                           KC_LCTL,  KC_LALT,                    KC_RGUI, KC_RSFT,
                                            KC_HOME,                    KC_PGUP,
                         KC_BSPC, KC_DEL,   KC_END,                     KC_PGDN, KC_ENTER, KC_SPC
     ),
diff --git a/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c b/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c
index 76cac53e2e..e6ae740946 100644
--- a/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,             KC_P,
     KC_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,          KC_SCLN,
     KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,         KC_ENT,
-                MO(_FN),          KC_LSHIFT,          KC_SPACE,                 RGB_MOD
+                MO(_FN),          KC_LSFT,            KC_SPACE,                 RGB_MOD
   ),
 
   [_FN] = LAYOUT_split_space_base(
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_MINS),    KC_BSLS,
     KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,          KC_QUOT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS,          KC_TRNS,
-                  KC_TRNS,            KC_LALT,        KC_TRNS,              KC_LCTRL
+                  KC_TRNS,            KC_LALT,        KC_TRNS,              KC_LCTL
   ), 
 
   [_LN] = LAYOUT_split_space_base(
diff --git a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
index 7ab31d9622..ab5f4fc6b2 100644
--- a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
@@ -44,9 +44,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_F1,     KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_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_LCTRL,  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_LCTL,   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,  KC_DEL,    KC_RCTRL, KC_LGUI,  KC_LALT,  LOWER,    KC_SPC,   KC_SPC,   KC_END,   KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
+    KC_PGDN,  KC_DEL,    KC_RCTL, KC_LGUI,  KC_LALT,  LOWER,    KC_SPC,   KC_SPC,   KC_END,   KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
   ),
 
   /* LOWER
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
index 7b13bb3c41..4887a06510 100644
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_RCTRL, KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
+    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
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_RCTRL, KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
+    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
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_RCTRL, KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
+    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
diff --git a/keyboards/kiwikey/wanderland/keymaps/default/keymap.c b/keyboards/kiwikey/wanderland/keymaps/default/keymap.c
index 62cefd77ff..5d9166d603 100644
--- a/keyboards/kiwikey/wanderland/keymaps/default/keymap.c
+++ b/keyboards/kiwikey/wanderland/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MUTE,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_VOLD,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_VOLU,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
-                   KC_LCTL,          KC_LALT,      KC_SPC,      MO(_FN),                      KC_SPC,           KC_MENU,                   KC_RCTRL
+                   KC_LCTL,          KC_LALT,      KC_SPC,      MO(_FN),                      KC_SPC,           KC_MENU,                   KC_RCTL
     ),
     [_FN] = LAYOUT_alice_split_bs(
         _______,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,      KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
diff --git a/keyboards/kiwikey/wanderland/keymaps/via/keymap.c b/keyboards/kiwikey/wanderland/keymaps/via/keymap.c
index 79f96d8b3a..d358047771 100644
--- a/keyboards/kiwikey/wanderland/keymaps/via/keymap.c
+++ b/keyboards/kiwikey/wanderland/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MUTE,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_VOLD,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_VOLU,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
-                   KC_LCTL,          KC_LALT,      KC_SPC,      MO(1),                        KC_SPC,           KC_MENU,                   KC_RCTRL
+                   KC_LCTL,          KC_LALT,      KC_SPC,      MO(1),                        KC_SPC,           KC_MENU,                   KC_RCTL
     ),
     [1] = LAYOUT_alice_split_bs(
         _______,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,      KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
diff --git a/keyboards/kona_classic/keymaps/ansi/keymap.c b/keyboards/kona_classic/keymaps/ansi/keymap.c
index a99fbe34cc..a9895c5239 100644
--- a/keyboards/kona_classic/keymaps/ansi/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 enum custom_keycodes {
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
index dc60f24dc3..d081dd0b73 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 enum custom_keycodes {
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
index ac52ba3585..798efc074a 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 enum custom_keycodes {
diff --git a/keyboards/kona_classic/keymaps/ansi_split/keymap.c b/keyboards/kona_classic/keymaps/ansi_split/keymap.c
index 3c331e1735..19de8e4c18 100644
--- a/keyboards/kona_classic/keymaps/ansi_split/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_split/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 #define _DEFAULT 0
diff --git a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
index 7eaea8b4f2..eae03c8900 100644
--- a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 #define _DEFAULT 0
diff --git a/keyboards/kona_classic/keymaps/default/keymap.c b/keyboards/kona_classic/keymaps/default/keymap.c
index e9eaacd5ce..6d71ea03ce 100644
--- a/keyboards/kona_classic/keymaps/default/keymap.c
+++ b/keyboards/kona_classic/keymaps/default/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 enum custom_keycodes {
diff --git a/keyboards/kona_classic/keymaps/iso/keymap.c b/keyboards/kona_classic/keymaps/iso/keymap.c
index 29347ae647..7d2d3c3658 100644
--- a/keyboards/kona_classic/keymaps/iso/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 #define _DEFAULT 0
diff --git a/keyboards/kona_classic/keymaps/iso_arrows/keymap.c b/keyboards/kona_classic/keymaps/iso_arrows/keymap.c
index 5130cb390f..1b0a6ffb9d 100644
--- a/keyboards/kona_classic/keymaps/iso_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso_arrows/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 #define _DEFAULT 0
diff --git a/keyboards/kona_classic/keymaps/iso_split/keymap.c b/keyboards/kona_classic/keymaps/iso_split/keymap.c
index d2f7d85882..5b0b6438c8 100644
--- a/keyboards/kona_classic/keymaps/iso_split/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso_split/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 #define _DEFAULT 0
diff --git a/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c b/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c
index af0bafad40..6ab6081ab9 100644
--- a/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 #define MODS_GUI_MASK   (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
 #define _DEFAULT 0
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
index feea65f84c..27812c7bbe 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_TAB,    KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,  KC_BSLS, KC_HOME,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,        KC_ENT,    KC_PGUP,
         KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,     KC_RSFT,     KC_UP,  KC_PGDN,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                     KC_SPC,                         KC_RALT,   MO(1),KC_RCTRL, KC_LEFT, KC_DOWN,  KC_RGHT
+        KC_LCTL,   KC_LGUI,   KC_LALT,                     KC_SPC,                         KC_RALT,   MO(1),KC_RCTL, KC_LEFT, KC_DOWN,  KC_RGHT
     ),
     [1] = LAYOUT_65_ansi(
         KC_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,  _______,   _______,
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
index bf9cc1d419..fdfe740688 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_TAB,    KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,  KC_BSLS, KC_PGUP,
         KC_CAPS,       KC_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_RCTRL, KC_LEFT, KC_DOWN,  KC_RGHT
+        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,
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
index 09df21f267..dbf041bb6e 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_TAB,    KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,  KC_BSLS, KC_HOME,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,        KC_ENT,    KC_PGUP,
         KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,     KC_LSFT,     KC_UP,  KC_PGDN,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                     KC_SPC,                         KC_RALT,   MO(1),KC_RCTRL, KC_LEFT, KC_DOWN,  KC_RGHT
+        KC_LCTL,   KC_LGUI,   KC_LALT,                     KC_SPC,                         KC_RALT,   MO(1),KC_RCTL, KC_LEFT, KC_DOWN,  KC_RGHT
     ),
     [1] = LAYOUT_65_ansi(
         KC_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,  _______,   _______,
diff --git a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
index 77c6ea8424..45fbb6470b 100644
--- a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_E,    KC_D,    KC_C,              \
 			KC_W,    KC_S,    KC_X,    KC_SPACE, \
 			KC_Q,    KC_A,    KC_Z,    MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,  KC_LSFT, KC_LCTRL),
+			KC_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,  _______,  \
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_E,    KC_D,    KC_C,              \
 			KC_W,    KC_S,    KC_X,    KC_SPACE, \
 			KC_Q,    KC_A,    KC_Y,    MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,  KC_LSFT, KC_LCTRL),
+			KC_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,  _______,  \
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_E,    KC_S,     KC_C,              \
 			KC_W,    KC_R,     KC_X,    KC_SPACE, \
 			KC_Q,    KC_A,     KC_Z,    MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,   KC_LSFT, KC_LCTRL),
+			KC_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,  _______,  \
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_DOT,  KC_E,    KC_J,               \
 			KC_COMM, KC_O,    KC_A,    KC_SPACE,  \
 			KC_QUOT, KC_A,    KC_SCLN, MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,  KC_LSFT, KC_LCTRL),
+			KC_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,    _______, \
diff --git a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c b/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
index eeef5393ab..a320a6ab2a 100644
--- a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ortho_4x12(
   LT(_NUMPAD, KC_ESC), KC_Q,    KC_W,    KC_E,  KC_R,   KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,        KC_ENT    ,
   KC_TAB,              KC_A,    KC_S,    KC_D,  KC_F,   KC_G,   KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN,     KC_QUOT   ,
-  KC_LSHIFT,           KC_Z,    KC_X,    KC_C,  KC_V,   KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH,     KC_RSHIFT ,
+  KC_LSFT,             KC_Z,    KC_X,    KC_C,  KC_V,   KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT   ,
   KC_LCTL,             KC_LALT, KC_LGUI, FUN,   LOWER,  KC_SPC, KC_BSPC, RAISE, KC_DEL,  KC_BSLS, TG(_NUMPAD), KC_RCTL
 ),
 
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNC] = LAYOUT_ortho_4x12(
   KC_F1,     KC_F2,        KC_F3,    KC_F4,         KC_F5,   KC_F6,        KC_F7,  KC_F8,    KC_F9,   KC_F10,  KC_F11,       KC_F12    ,
   KC_1,      KC_2,         KC_3,     KC_4,          KC_5,    KC_6,         KC_7,   KC_8,     KC_9,    KC_0,    LSFT(KC_GRV), KC_INSERT ,
-  KC_LSHIFT, KC_NO,        KC_NO,    LSFT(KC_MINS), KC_MINS, LSFT(KC_EQL), KC_EQL, KC_BSLS,  KC_LBRC, KC_RBRC, KC_NO,        KC_RSHIFT ,
+  KC_LSFT,   KC_NO,        KC_NO,    LSFT(KC_MINS), KC_MINS, LSFT(KC_EQL), KC_EQL, KC_BSLS,  KC_LBRC, KC_RBRC, KC_NO,        KC_RSFT   ,
   _______,   _______,      _______,  _______,       _______, _______,      _______, _______, _______, _______, _______,      _______
 ),
 
diff --git a/keyboards/ktec/ergodone/keymaps/art/keymap.c b/keyboards/ktec/ergodone/keymaps/art/keymap.c
index 2acfc84aec..9942b7b307 100644
--- a/keyboards/ktec/ergodone/keymaps/art/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/art/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,           KC_Q,         KC_W,       KC_E,       KC_R,              KC_T,      KC_BSLS,
   KC_CAPS,          KC_A,         KC_S,       KC_D,       KC_F,              KC_G,
   KC_LSFT,          KC_Z,         KC_X,       KC_C,       KC_V,              KC_B,      TT(FKEYS),
-  KC_LEFT,         KC_RIGHT,      KC_LWIN,    KC_LALT,    KC_LCTRL,
+  KC_LEFT,         KC_RIGHT,      KC_LWIN,    KC_LALT,    KC_LCTL,
 
                                            KC_INS,    KC_PGUP,
                                                       LT(MEDIA,KC_PGDN),
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EQL,           KC_Y,         KC_U,       KC_I,       KC_O,              KC_P,      KC_LBRC,
                     KC_H,         KC_J,       KC_K,       KC_L,              KC_SCLN,   KC_QUOT,
   TT(FKEYS),        KC_N,         KC_M,       KC_COMM,    KC_DOT,        LT(GIT,KC_SLSH), KC_RSFT,
-                                  KC_HOME,    KC_END,     TO(WORKMAN),       KC_RALT,   KC_RCTRL,
+                                  KC_HOME,    KC_END,     TO(WORKMAN),       KC_RALT,   KC_RCTL,
 
     KC_LEFT,                KC_RIGHT,
     LT(SHIFT_NAV, KC_UP),
diff --git a/keyboards/labyrinth75/keymaps/default/keymap.c b/keyboards/labyrinth75/keymaps/default/keymap.c
index 33138f0f27..245fb16e4e 100644
--- a/keyboards/labyrinth75/keymaps/default/keymap.c
+++ b/keyboards/labyrinth75/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPC,  KC_DEL,
         KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP,
         KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,   KC_PGDN,
-        KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSHIFT,   KC_UP, KC_END,
+        KC_LSFT,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,     KC_UP, KC_END,
         KC_LCTL,  KC_LWIN,  KC_LALT,               KC_SPACE,              KC_RALT,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT
     ),
 };
diff --git a/keyboards/labyrinth75/keymaps/via/keymap.c b/keyboards/labyrinth75/keymaps/via/keymap.c
index 148d37593b..6b19500af8 100644
--- a/keyboards/labyrinth75/keymaps/via/keymap.c
+++ b/keyboards/labyrinth75/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPC,  KC_DEL, 
         KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP, 
         KC_CAPS,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,   KC_PGDN, 
-        KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSHIFT,   KC_UP, KC_END, 
+        KC_LSFT,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSFT,     KC_UP, KC_END, 
         KC_LCTL,  KC_LWIN,  KC_LALT,               KC_SPACE,              KC_RALT,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT  
     ),
     [1] = LAYOUT(
diff --git a/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
index 6fb2971fab..763f54c00a 100644
--- a/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
@@ -21,7 +21,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_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         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),   MO(2),
-                       KC_LCTRL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDN
+                       KC_LCTL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDN
     ),
     [1] = LAYOUT_60_latin_hhkb(
         RGB_TOG,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
diff --git a/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
index 6fb2971fab..763f54c00a 100644
--- a/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
@@ -21,7 +21,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_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         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),   MO(2),
-                       KC_LCTRL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDN
+                       KC_LCTL, KC_LGUI,                            KC_SPC,                                      KC_PGUP, KC_PGDN
     ),
     [1] = LAYOUT_60_latin_hhkb(
         RGB_TOG,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
diff --git a/keyboards/lets_split/keymaps/cpeters1982/keymap.c b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
index 0dceef3675..c87114855d 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/keymap.c
+++ b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, \
-  KC_LCTRL,KC_LALT, KC_LGUI, KC_ESC, TG(_LOWER),  LT(_ADJUST, KC_SPC),  KC_ENT,  TG(_RAISE),   MT(MOD_RGUI, KC_LBRC), MT(MOD_RALT, KC_RBRC), MT(MOD_HYPR, KC_EQL), KC_MINS \
+  KC_LCTL, KC_LALT, KC_LGUI, KC_ESC, TG(_LOWER),  LT(_ADJUST, KC_SPC),  KC_ENT,  TG(_RAISE),   MT(MOD_RGUI, KC_LBRC), MT(MOD_RALT, KC_RBRC), MT(MOD_HYPR, KC_EQL), KC_MINS \
 ),
 
 /* Lower
diff --git a/keyboards/lets_split/keymaps/kris/keymap.c b/keyboards/lets_split/keymaps/kris/keymap.c
index f54807758b..9243c23707 100644
--- a/keyboards/lets_split/keymaps/kris/keymap.c
+++ b/keyboards/lets_split/keymaps/kris/keymap.c
@@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT( \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_LCTRL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, 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_ENT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT , \
-  ADJUST, KC_LALT,  KC_LGUI, KC_CAPS,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LBRC, KC_RBRC, KC_MINS,   KC_RCTRL \
+  ADJUST, KC_LALT,  KC_LGUI, KC_CAPS,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LBRC, KC_RBRC, KC_MINS,   KC_RCTL \
 ),
 
 /* Colemak
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
   KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-  ADJUST, KC_LALT,  KC_LGUI, KC_CAPS,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LBRC, KC_RBRC, KC_MINS,   KC_RCTRL \
+  ADJUST, KC_LALT,  KC_LGUI, KC_CAPS,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LBRC, KC_RBRC, KC_MINS,   KC_RCTL \
 ),
 
 /* Dvorak
diff --git a/keyboards/lets_split/keymaps/piemod/keymap.c b/keyboards/lets_split/keymaps/piemod/keymap.c
index 7cbbf1e8d8..eb98516e8f 100644
--- a/keyboards/lets_split/keymaps/piemod/keymap.c
+++ b/keyboards/lets_split/keymaps/piemod/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT( \
   KC_ESC,  KC_QUOTE,  LT(7, KC_COMMA),  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_DELETE, \
   KC_TAB,  LT(1, KC_A),  LT(2, KC_O),  LT(3, KC_E),  LT(4, KC_U),  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_ENTER, \
-  KC_LSHIFT,  KC_SCLN,  LT(5, KC_Q),   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS, \
-  C(KC_LALT), LT(6, KC_LCTRL),  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTRL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT \
+  KC_LSFT,  KC_SCLN,  LT(5, KC_Q),   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS, \
+  C(KC_LALT), LT(6, KC_LCTL),  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT \
 ),
 
 [_ARROW] = LAYOUT( \
diff --git a/keyboards/lets_split/keymaps/pyrol/keymap.c b/keyboards/lets_split/keymaps/pyrol/keymap.c
index 9bf82e6812..b5d35d3091 100644
--- a/keyboards/lets_split/keymaps/pyrol/keymap.c
+++ b/keyboards/lets_split/keymaps/pyrol/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT , \
-  ADJUST,KC_LCTRL, KC_LGUI, KC_LALT,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+  ADJUST,KC_LCTL,  KC_LGUI, KC_LALT,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
 ),
 
 /* Colemak
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP, KC_SLSH , \
-  KC_LCTRL,KC_LCTRL, KC_LGUI, KC_LALT,  RAISE,   KC_SPC,  KC_SPC,  LOWER,   KC_QUOT, KC_LEFT, KC_DOWN,   KC_RGHT \
+  KC_LCTL, KC_LCTL, KC_LGUI, KC_LALT,  RAISE,   KC_SPC,  KC_SPC,  LOWER,   KC_QUOT, KC_LEFT, KC_DOWN,   KC_RGHT \
 ),
 
 
diff --git a/keyboards/lets_split/keymaps/vim-mode/keymap.c b/keyboards/lets_split/keymaps/vim-mode/keymap.c
index 9765a14c7c..1fd14ff03d 100644
--- a/keyboards/lets_split/keymaps/vim-mode/keymap.c
+++ b/keyboards/lets_split/keymaps/vim-mode/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_ortho_4x12 ( \
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
-  KC_LCTRL,KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
   ADJUST,  KC_PSCR, KC_LGUI, KC_LALT, LOWER,   KC_TAB,  KC_SPC,  RAISE,   KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT  \
 ),
diff --git a/keyboards/lily58/keymaps/barabas/keymap.c b/keyboards/lily58/keymaps/barabas/keymap.c
index 64ef3cfffc..443958c3b7 100644
--- a/keyboards/lily58/keymaps/barabas/keymap.c
+++ b/keyboards/lily58/keymaps/barabas/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
     KC_ESC,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV,
     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-    KC_LCTRL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,  KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
                            KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC,   KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI
 ),
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c b/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
index f93e9050c4..e4b9ad269d 100644
--- a/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
+++ b/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
@@ -54,7 +54,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_MINS,
   KC_DEL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
-                             KC_LCTRL, KC_LALT, KC_LGUI, KC_SPC,   KC_ENT,  KC_BSPC, RAISE, LOWER
+                             KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,   KC_ENT,  KC_BSPC, RAISE, LOWER
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/lily58/keymaps/chuan/keymap.c b/keyboards/lily58/keymaps/chuan/keymap.c
index 1e0923a3c5..6054fa80ff 100644
--- a/keyboards/lily58/keymaps/chuan/keymap.c
+++ b/keyboards/lily58/keymaps/chuan/keymap.c
@@ -42,7 +42,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_BSLS, \
   ALL_T(KC_GRV), KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENTER, \
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MINS,  MEH_T(KC_EQL),  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, \
-                             KC_LCTRL, KC_LGUI, KC_LALT,LT(_LOWER, KC_SPC),        KC_SPC, LT(2,KC_QUOT),   KC_LBRC, KC_RBRC \
+                             KC_LCTL, KC_LGUI, KC_LALT,LT(_LOWER, KC_SPC),        KC_SPC, LT(2,KC_QUOT),   KC_LBRC, KC_RBRC \
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/lily58/keymaps/cykedev/keymap.c b/keyboards/lily58/keymaps/cykedev/keymap.c
index 75cdc04feb..0c1d8d1138 100644
--- a/keyboards/lily58/keymaps/cykedev/keymap.c
+++ b/keyboards/lily58/keymaps/cykedev/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   SY_PLS,    SY_MIN,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
                              ADJ,     KC_LALT, G_COMM, KC_SFTENT, SY_SPC,  A_DOT,   KC_HOME, KC_END
 ),
diff --git a/keyboards/lily58/keymaps/datadavd/keymap.c b/keyboards/lily58/keymaps/datadavd/keymap.c
index 0f0c63c8e9..d0c34ef21e 100644
--- a/keyboards/lily58/keymaps/datadavd/keymap.c
+++ b/keyboards/lily58/keymaps/datadavd/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   KC_LSFT,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LCTRL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   KC_GRV, KC_ENT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
+  KC_LCTL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   KC_GRV, KC_ENT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
                         KC_LBRC, KC_LALT, KC_LGUI, MO(_SUPER), KC_SPC, MO(_RAISE), KC_RGUI, KC_RBRC
 ),
 /* SUPER
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_SUPER] = LAYOUT(
   KC_PWR,    KC_PWR,   KC_SLEP,  KC_WAKE,  KC_NO,     KC_NO,                         KC_BSLS,  KC_GRV,   KC_RCBR,  KC_MINS,  KC_EQL,  KC_BSPC,
-  KC_TAB,    KC_TAB,   KC_ESC,   KC_ENT,   KC_LCTRL,  KC_LCBR,                       KC_RPRN,  KC_TAB,   KC_UP,    KC_LBRC,  KC_RBRC, KC_TRNS,
+  KC_TAB,    KC_TAB,   KC_ESC,   KC_ENT,   KC_LCTL,   KC_LCBR,                       KC_RPRN,  KC_TAB,   KC_UP,    KC_LBRC,  KC_RBRC, KC_TRNS,
   KC_LSFT,   KC_LSFT,  KC_LGUI,  KC_LALT,  KC_UNDS,   KC_LPRN,                       KC_BSPC,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_EQL,  KC_ENT,
   KC_LCTL,   KC_LCTL,  KC_HOME,  KC_PGUP,  KC_PGDN,   KC_END,   KC_CAPS,  KC_GRV,    KC_B,     KC_V,     KC_C,     KC_X,     KC_Z,    KC_RSFT,
                                    KC_TRNS, KC_LALT, KC_LGUI, KC_TRNS,      KC_SPC, KC_DEL, KC_RGUI, KC_TRNS
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c
index 185b8ac692..44288d39d0 100644
--- a/keyboards/lily58/keymaps/default/keymap.c
+++ b/keyboards/lily58/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
                         KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI
 ),
diff --git a/keyboards/lily58/keymaps/domnantas/keymap.c b/keyboards/lily58/keymaps/domnantas/keymap.c
index ef2a89c470..56812e6901 100644
--- a/keyboards/lily58/keymaps/domnantas/keymap.c
+++ b/keyboards/lily58/keymaps/domnantas/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   LT_A_OG, LT_C_CA, LT_E_OG, LT_E_DO, LT_I_OG,                  LT_S_CA, LT_U_OG, LT_U_MA, KC_9,    KC_0,    LT_Z_CA,
         KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
         KC_LSFT,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LCTRL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_LBRC, KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RALT,
+        KC_LCTL,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_LBRC, KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RALT,
                                 KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC,  KC_ENT,  KC_BSPC, MO(_RAISE), KC_DEL
     ),
 
diff --git a/keyboards/lily58/keymaps/druotoni/keymap.c b/keyboards/lily58/keymaps/druotoni/keymap.c
index 2ab26bbd24..69b36928ab 100644
--- a/keyboards/lily58/keymaps/druotoni/keymap.c
+++ b/keyboards/lily58/keymaps/druotoni/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,   KC_1,   KC_2,    KC_3,          KC_4,    KC_5,                              KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELETE, 
     KC_TAB,   KC_Q,   KC_W,    KC_E,          KC_R,    KC_T,                              KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    FR_CIRC, 
     KC_LSFT,  KC_A,   KC_S,    KC_D,          KC_F,    KC_G,                              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT, 
-    KC_LCTRL, KC_Z,   KC_X,    KC_C,          KC_V,    KC_B,    S(KC_Z),   FR_RPRN,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_QUOT, 
+    KC_LCTL,  KC_Z,   KC_X,    KC_C,          KC_V,    KC_B,    S(KC_Z),   FR_RPRN,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_QUOT, 
     KC_LALT, TT(_RAISE),    KC_SPC, TT(_LOWER),                                           KC_ENT,  KC_BSPC, KC_RBRC, KC_RGUI 
     ),
 
diff --git a/keyboards/lily58/keymaps/gaston/keymap.c b/keyboards/lily58/keymaps/gaston/keymap.c
index 321b225c02..b7129b71e0 100644
--- a/keyboards/lily58/keymaps/gaston/keymap.c
+++ b/keyboards/lily58/keymaps/gaston/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-    KC_LCTRL,KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_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,    EN_MOUSE,KC_EQL,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
                                KC_RALT, KC_LALT, KC_LGUI, EN_LOWER,EN_LOWER, KC_LBRC, KC_RBRC, KC_BSLS
 ),
diff --git a/keyboards/lily58/keymaps/hvp/keymap.c b/keyboards/lily58/keymaps/hvp/keymap.c
index 91f3590757..5ca0b73653 100644
--- a/keyboards/lily58/keymaps/hvp/keymap.c
+++ b/keyboards/lily58/keymaps/hvp/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LT(3,KC_ESC),   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, 
   LT(_NAVI,KC_TAB),   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS, 
   KC_LSFT, KC_A,   KC_S,    KC_D,    LT(4,KC_F),    LT(3,KC_G),                     KC_H,    KC_J,    KC_K,    KC_L,     TD(TD1), TD(TD2),
-  KC_LCTRL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, MT(MOD_LSFT,KC_BSPC),  MT(MOD_LSFT,KC_ENTER),  KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3),  MT(MOD_RSFT,KC_ENT),
+  KC_LCTL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, MT(MOD_LSFT,KC_BSPC),  MT(MOD_LSFT,KC_ENTER),  KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3),  MT(MOD_RSFT,KC_ENT),
                              KC_LALT, KC_LGUI, LOWER,LT(1,KC_SPC),   LT(2,KC_SPC),   RAISE,   KC_RALT, KC_RGUI
 ),
 [_RAISE] = LAYOUT( /* Right */
diff --git a/keyboards/lily58/keymaps/lily58l/keymap.c b/keyboards/lily58/keymaps/lily58l/keymap.c
index 10794b8695..4b6f32ed10 100644
--- a/keyboards/lily58/keymaps/lily58l/keymap.c
+++ b/keyboards/lily58/keymaps/lily58l/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
                              KC_LALT, KC_LGUI,LOWER, KC_SPC,   KC_ENT,   RAISE,   KC_BSPC, KC_RGUI
 ),
diff --git a/keyboards/lily58/keymaps/mikefightsbears/keymap.c b/keyboards/lily58/keymaps/mikefightsbears/keymap.c
index 2b9855f190..a17ff07049 100644
--- a/keyboards/lily58/keymaps/mikefightsbears/keymap.c
+++ b/keyboards/lily58/keymaps/mikefightsbears/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT( \
   KC_GESC,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  KC_LBRC,  KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
                              KC_LGUI, KC_LALT, LOWER, KC_SPC,   KC_ENT,  RAISE,   KC_MINS, KC_EQL \
 ),
diff --git a/keyboards/lily58/keymaps/niolang/keymap.c b/keyboards/lily58/keymaps/niolang/keymap.c
index a742d7822a..9a4b03668a 100644
--- a/keyboards/lily58/keymaps/niolang/keymap.c
+++ b/keyboards/lily58/keymaps/niolang/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_BEPO] = LAYOUT(
   MT(KC_CAPS, KC_ESC), BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN,                                 BP_AT,    BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_W,
   KC_TAB,              BP_B,    BP_EACU, BP_P,    BP_O,    BP_EGRV,                                 BP_DCIR,  BP_V,    BP_D,    BP_L,    BP_J,    BP_Z,
-  KC_LCTRL,            BP_A,    BP_U,    BP_I,    BP_E,    BP_COMM,                        MT(BP_CCED, BP_C), BP_T,    BP_S,    BP_R,    BP_N,    BP_M,
+  KC_LCTL,             BP_A,    BP_U,    BP_I,    BP_E,    BP_COMM,                        MT(BP_CCED, BP_C), BP_T,    BP_S,    BP_R,    BP_N,    BP_M,
   KC_LSFT,             BP_AGRV, BP_Y,    BP_X,  BP_DOT,    BP_K, LSFT(KC_PSCR),     KC_DEL,  BP_QUOT,  BP_Q,    BP_G,    BP_H,    BP_F,    KC_RSFT,
                                         KC_LALT, KC_LGUI, LOWER, KC_SPC,                    KC_ENT,  RAISE, KC_BSPC, KC_RALT
 ),
diff --git a/keyboards/lily58/keymaps/pttbx/keymap.c b/keyboards/lily58/keymaps/pttbx/keymap.c
index 944794141a..a4977663b3 100644
--- a/keyboards/lily58/keymaps/pttbx/keymap.c
+++ b/keyboards/lily58/keymaps/pttbx/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
                         MO(_LOWER), KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_BSPC, KC_RGUI, MO(_RAISE)
 ),
diff --git a/keyboards/lily58/keymaps/via/keymap.c b/keyboards/lily58/keymaps/via/keymap.c
index 4cae267338..dff7d3d55d 100644
--- a/keyboards/lily58/keymaps/via/keymap.c
+++ b/keyboards/lily58/keymaps/via/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
                       LOWER, KC_LGUI,  KC_LALT, KC_SPC,   KC_ENT,   KC_BSPC,  KC_RGUI, RAISE
 ),
diff --git a/keyboards/lily58/keymaps/yshrsmz/keymap.c b/keyboards/lily58/keymaps/yshrsmz/keymap.c
index 6b31663239..03269aa6a9 100644
--- a/keyboards/lily58/keymaps/yshrsmz/keymap.c
+++ b/keyboards/lily58/keymaps/yshrsmz/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
                              KC_LALT, KC_LGUI,LOWER, KC_BSPC,   KC_ENT,  KC_SPC,  RAISE,  KC_RGUI
 ),
diff --git a/keyboards/lily58/keymaps/yuchi/keymap.c b/keyboards/lily58/keymaps/yuchi/keymap.c
index 2cab439c3b..b48d2511b5 100644
--- a/keyboards/lily58/keymaps/yuchi/keymap.c
+++ b/keyboards/lily58/keymaps/yuchi/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT( \
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV, \
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS, \
-  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, \
               MO(_LOWER),KC_LGUI, KC_LALT, LT(_LOWER,KC_SPC),  LT(_RAISE,KC_ENT),  KC_BSPC, KC_RGUI, MO(_RAISE) \
 ),
diff --git a/keyboards/lime/keymaps/default/keymap.c b/keyboards/lime/keymaps/default/keymap.c
index 3969514513..5760bd9359 100644
--- a/keyboards/lime/keymaps/default/keymap.c
+++ b/keyboards/lime/keymaps/default/keymap.c
@@ -69,7 +69,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_GRV,
   KC_CAPS,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  XXXXXXX,        KC_MUTE,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_BSLS,
-        KC_LOWER, KC_LGUI,KC_LALT,KC_DEL, KC_LCTRL, KC_THUMB_LEFT,       KC_THUMB_RIGHT,  KC_RAISE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
+        KC_LOWER, KC_LGUI,KC_LALT,KC_DEL, KC_LCTL,  KC_THUMB_LEFT,       KC_THUMB_RIGHT,  KC_RAISE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
 ),
 
 /*
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                            KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  KC_GRV,
   KC_CAPS,  KC_A,   KC_R,    KC_S,    KC_T,    KC_D,                            KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  XXXXXXX,        KC_MUTE,  KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_BSLS,
-        KC_LOWER, KC_LGUI,KC_LALT,KC_DEL, KC_LCTRL, KC_THUMB_LEFT,       KC_THUMB_RIGHT,  KC_RAISE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
+        KC_LOWER, KC_LGUI,KC_LALT,KC_DEL, KC_LCTL,  KC_THUMB_LEFT,       KC_THUMB_RIGHT,  KC_RAISE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
 ),
 
 /* RAISE
diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
index d67935a9fd..33bb381a4e 100644
--- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key combination for magic key command */
 #undef IS_COMMAND
 #define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT)) \
 )
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
index c25c0b00d0..2bcad47722 100644
--- a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    \
   KC_TAB,  KC_VOLD, KC_VOLU, KC_MPLY, KC_MFFD,      KC_MUTE, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, \
   _______, KC_GRV,  KC_LGUI, KC_LALT, KC_MRWD,          _______, _______, _______, KC_BSLS,  KC_QUOT, \
-                    KC_LCTRL, KC_BSPC, KC_ENT,      _______, _______, _______                    \
+                    KC_LCTL, KC_BSPC, KC_ENT,      _______, _______, _______                    \
 ),
 
 /* Lower
diff --git a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
index 8686d6e877..7683ffc287 100644
--- a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,                       DE_Z,    DE_U,    DE_I,    DE_O,    DE_P, \
   DE_A,    DE_S,    DE_D,    DE_F,    DE_G,                       DE_H,    DE_J,    DE_K,    DE_L,    KC_SPC,  \
   DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,                       DE_N,    DE_M,    DE_COMM, DE_DOT,  DE_MINS,  \
-                     KC_LCTRL, MO(_LOWER), MO(_RAISE),		      KC_LGUI, KC_LSFT, KC_LALT \
+                     KC_LCTL, MO(_LOWER), MO(_RAISE),		      KC_LGUI, KC_LSFT, KC_LALT \
 ),
 
 [_RAISE] = LAYOUT( \
diff --git a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
index 41c82b8cc7..93b4b90f3b 100644
--- a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
@@ -46,8 +46,8 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/bonta/keymap.c b/keyboards/massdrop/alt/keymaps/bonta/keymap.c
index a2bd8094d5..75828e16b7 100644
--- a/keyboards/massdrop/alt/keymaps/bonta/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/bonta/keymap.c
@@ -39,8 +39,8 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL   (get_mods() & MOD_BIT(KC_LCTL)   || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL   (get_mods() & MOD_BIT(KC_LCTL)   || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT    (get_mods() & MOD_BIT(KC_LALT)   || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
index 05dfc5bb34..ead73732ba 100644
--- a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
@@ -72,8 +72,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______,   _______,   _______,   _______, TG(3),     _______,   _______,   _______
     ),
 };
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static uint32_t key_timer;
diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c
index d328e7189e..91882e04da 100644
--- a/keyboards/massdrop/alt/keymaps/default/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -36,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/default_md/keymap.c b/keyboards/massdrop/alt/keymaps/default_md/keymap.c
index f05f332354..2c468ff918 100644
--- a/keyboards/massdrop/alt/keymaps/default_md/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default_md/keymap.c
@@ -53,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c b/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
index 1bbfe02d9c..e8735fc57d 100644
--- a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
@@ -91,8 +91,8 @@ void keyboard_post_init_kb(void) {
     }
 }
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 // If the super alt layer is the active layer
@@ -142,7 +142,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true;
         case KC_F4:
             // Map alt+shift+4 to alt+f4
-            if (super_alt_layer_active && (get_mods() & MOD_BIT(KC_LSHIFT))) {
+            if (super_alt_layer_active && (get_mods() & MOD_BIT(KC_LSFT))) {
                 if (record->event.pressed) {
                     register_code(KC_LALT);
                 } else {
diff --git a/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c b/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
index 3ba0d09920..95173e0656 100644
--- a/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
@@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/mac/keymap.c b/keyboards/massdrop/alt/keymaps/mac/keymap.c
index 1c78d4bf30..cad8973609 100644
--- a/keyboards/massdrop/alt/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/mac/keymap.c
@@ -36,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c b/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
index 648a18b126..a91c26bdd1 100644
--- a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
@@ -53,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/reywood/keymap.c b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
index 91d93b1496..ffb2ea6f8b 100644
--- a/keyboards/massdrop/alt/keymaps/reywood/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
@@ -58,8 +58,8 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
index 40ea919da4..33f3b88b02 100644
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
@@ -36,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 #define IDLE_TIMER_DURATION 20000 //how many milliseconds before RGB turns off
 
diff --git a/keyboards/massdrop/alt/keymaps/via/keymap.c b/keyboards/massdrop/alt/keymaps/via/keymap.c
index 43146d5a09..3781f2227b 100644
--- a/keyboards/massdrop/alt/keymaps/via/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/via/keymap.c
@@ -57,8 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
index 3863086150..50f06d655d 100644
--- a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
diff --git a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
index 373e6d6094..5fcfd71589 100644
--- a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
@@ -56,8 +56,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
index b58b20c6c4..fa60fc2268 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
@@ -28,7 +28,7 @@ static const char * sendstring_commands[] = {
 qk_tap_dance_action_t tap_dance_actions[] = {
     [TD_LGUI_ML] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_LGUI, _ML),
     [TD_APP_YL] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_APP, _YL),
-    [TD_CTRL_TERM] = ACTION_TAP_DANCE_DOUBLE(KC_LCTRL, LCA(KC_T)),
+    [TD_CTRL_TERM] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, LCA(KC_T)),
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
index 1f68996fc6..34edb50860 100644
--- a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
@@ -47,8 +47,8 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
index f6c4318c16..b148334cde 100644
--- a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
@@ -64,8 +64,8 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
index 38d1af2e78..ccaf7a2ba5 100644
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
@@ -383,8 +383,8 @@ void matrix_scan_user(void) {
 };
 
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 void register_keystroke(uint16_t keycode){
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
index c765fda220..a79d577826 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //   SHIFT      Z        X        C        V        B        N        M        ,        .        /      RSHIFT                               UP
         KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,  KC_N  ,  KC_M  , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC,                             KC_UP ,
     //   CTRL      GUI      ALT                       SPACE                               RALT     MENU     RGUI     RCTRL             LEFT     DOWN     RIGHT
-       KC_LCTRL, KC_LGUI, KC_LALT,                    KC_SPC,                   TD(TD_FN_SWITCH), KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+       KC_LCTL,  KC_LGUI, KC_LALT,                    KC_SPC,                   TD(TD_FN_SWITCH), KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FL] = LAYOUT(
     //    ESC       F1       F2       F3       F4       F5       F6       F7       F8       F9       F10     F11      F12              PRINT    SCLCK    PAUSE
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md b/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
index d58cd5b9c0..a4e9aa77d5 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
@@ -36,7 +36,7 @@ _I physically switched around my RALT and Menu keys as my personal preference. T
   |____________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________________|     __________|__________|__________
   |    CTRL     |    GUI      |    ALT      |                       SPACE                                     |    RALT      |   MENU      |   RGUI      |    RCTRL    |    |   LEFT   |   DOWN   |  RIGHT   |
   |   ------    |   ------    |   ------    |                       ------                                    |    ------    |   ------    |   ------    |    ------   |    |  ------  |  ------  |  ------  |
-  |  KC_LCTRL   |   KC_LGUI   |   KC_LALT   |                       KC_SPC                                    |   FN_SWTCH   |   KC_RALT   |   KC_RGUI   |    KC_RCTL  |    |  KC_LEFT |  KC_DOWN |  KC_RGHT |
+  |  KC_LCTL    |   KC_LGUI   |   KC_LALT   |                       KC_SPC                                    |   FN_SWTCH   |   KC_RALT   |   KC_RGUI   |    KC_RCTL  |    |  KC_LEFT |  KC_DOWN |  KC_RGHT |
   |_____________|_____________|_____________|_________________________________________________________________|______________|_____________|_____________|_____________|    |__________|__________|__________|
 
   ```
diff --git a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
index b4e36ea5bd..d12f2d64ac 100644
--- a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
@@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
diff --git a/keyboards/matrix/noah/keymaps/blockader/keymap.c b/keyboards/matrix/noah/keymaps/blockader/keymap.c
index e64821d33e..b6d9a9acc3 100644
--- a/keyboards/matrix/noah/keymaps/blockader/keymap.c
+++ b/keyboards/matrix/noah/keymaps/blockader/keymap.c
@@ -296,9 +296,9 @@ bool handle_layer_key(uint16_t key, keyrecord_t* record) {
                 case KC_BSPC:
                     if (record->event.pressed) {
                         if (get_mods() & MOD_MASK_SHIFT) {
-                            unregister_code(KC_LSHIFT);
+                            unregister_code(KC_LSFT);
                             tap_code16(LGUI(KC_X));
-                            register_code(KC_LSHIFT);
+                            register_code(KC_LSFT);
                             layer_control_data.multiplier = 0;
                             layer_control_data.operator   = - 1;
                         } else if (layer_control_data.operator== - 1)
@@ -403,9 +403,9 @@ bool handle_layer_key(uint16_t key, keyrecord_t* record) {
                 case LGUI(KC_C):
                     if (record->event.pressed) {
                         if (get_mods() & MOD_MASK_SHIFT) {
-                            unregister_code(KC_LSHIFT);
+                            unregister_code(KC_LSFT);
                             tap_code16(LGUI(KC_C));
-                            register_code(KC_LSHIFT);
+                            register_code(KC_LSFT);
                             layer_control_data.multiplier = 0;
                             layer_control_data.operator   = - 1;
                         } else if (layer_control_data.operator== - 1)
@@ -425,9 +425,9 @@ bool handle_layer_key(uint16_t key, keyrecord_t* record) {
                 case LGUI(KC_V):
                     if (record->event.pressed) {
                         if (get_mods() & MOD_MASK_SHIFT) {
-                            unregister_code(KC_LSHIFT);
+                            unregister_code(KC_LSFT);
                             for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LGUI(KC_V));
-                            register_code(KC_LSHIFT);
+                            register_code(KC_LSFT);
                             layer_control_data.multiplier = 0;
                             layer_control_data.operator   = - 1;
                         } else {
@@ -628,9 +628,9 @@ bool handle_common_key(uint16_t key, keyrecord_t* record) {
         case KEY_CUT_SELECTION:
             if (record->event.pressed) {
                 if (get_mods() & MOD_MASK_SHIFT) {
-                    unregister_code(KC_LSHIFT);
+                    unregister_code(KC_LSFT);
                     tap_code16(LGUI(KC_X));
-                    register_code(KC_LSHIFT);
+                    register_code(KC_LSFT);
                 } else
                     tap_code16(LGUI(KC_X));
             }
diff --git a/keyboards/matrix/noah/keymaps/default/keymap.c b/keyboards/matrix/noah/keymaps/default/keymap.c
index c30b3456c2..daa4ae833a 100644
--- a/keyboards/matrix/noah/keymaps/default/keymap.c
+++ b/keyboards/matrix/noah/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_default(
         KC_ESC,     KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,    KC_8,   KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSLS, KC_GRV, KC_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_LCTRL,   KC_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_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_CAPS, KC_LGUI,  KC_LALT,                 KC_SPC,                 KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
     [1] = LAYOUT_default(
diff --git a/keyboards/matrix/noah/keymaps/iso/keymap.c b/keyboards/matrix/noah/keymaps/iso/keymap.c
index 066ebe4471..fad13f3026 100644
--- a/keyboards/matrix/noah/keymaps/iso/keymap.c
+++ b/keyboards/matrix/noah/keymaps/iso/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_iso(
         KC_ESC,     KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,    KC_8,   KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_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_PGUP,
-        KC_LCTRL,   KC_A,     KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,    KC_K,   KC_L, KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT, 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_BSLS,  KC_ENT, KC_PGDN,
         KC_LSFT, KC_LGUI,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N,    KC_M,KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,  KC_END,
         KC_CAPS, KC_LGUI,  KC_LALT,                       KC_SPC,                    MO(1),          KC_LEFT, KC_DOWN,KC_RIGHT),
     [1] = LAYOUT_iso(
diff --git a/keyboards/matrix/noah/keymaps/splitspace/keymap.c b/keyboards/matrix/noah/keymaps/splitspace/keymap.c
index dd7b5f0c11..fe231abb50 100644
--- a/keyboards/matrix/noah/keymaps/splitspace/keymap.c
+++ b/keyboards/matrix/noah/keymaps/splitspace/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_default_splitspace(
         KC_ESC,     KC_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_LCTRL,   KC_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_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_CAPS, KC_LGUI,  KC_LALT, KC_SPC,     KC_SPC, KC_SPC,           KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
     [1] = LAYOUT_default_splitspace(
diff --git a/keyboards/matrix/noah/keymaps/wkl/keymap.c b/keyboards/matrix/noah/keymaps/wkl/keymap.c
index 5ff6aed261..dec76f1b37 100644
--- a/keyboards/matrix/noah/keymaps/wkl/keymap.c
+++ b/keyboards/matrix/noah/keymaps/wkl/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_wkl(
         KC_ESC,     KC_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_LCTRL,   KC_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_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_CAPS, KC_LGUI,  KC_LALT,                 KC_SPC,                         MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
     [1] = LAYOUT_wkl(
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
index ab6f0012b4..61173298ba 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ enum custom_keycodes {
 	SFT_ESC
 };
 
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BL] = LAYOUT_split_space(
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
index 91e2f8e739..c9d9de82c0 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
@@ -10,17 +10,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_split_space(
         LT(2, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         GUI_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(2), KC_RSHIFT,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(2), KC_RSFT,
         KC_ESC, KC_LALT, KC_LCTL, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, RGB_TOG),
     [_WIN] = LAYOUT_split_space(
         LT(2, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(2), KC_RSHIFT,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(2), KC_RSFT,
         KC_ESC, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_LCTL, RGB_TOG),
     [_FN1] = LAYOUT_split_space(
         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
         KC_TRNS, KC_PGUP, KC_VOLU, KC_TRNS, KC_TRNS, KC_BSLS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_TRNS,
-        KC_LSFT, KC_PGDN, KC_VOLD, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_DOT, KC_RSHIFT, KC_HOME,
+        KC_LSFT, KC_PGDN, KC_VOLD, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_DOT, KC_RSFT, KC_HOME,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN2] = LAYOUT_split_space(
diff --git a/keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c b/keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c
index 70fb425b3b..2d62c53cbe 100644
--- a/keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c
+++ b/keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
   KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_ENT,
-  _______,  KC_LCTRL,    KC_LALT,     KC_LGUI,     MO(_LO),     KC_SPC,   KC_SPC,   MO(_HI),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
+  _______,  KC_LCTL,     KC_LALT,     KC_LGUI,     MO(_LO),     KC_SPC,   KC_SPC,   MO(_HI),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
 
 [_LO] = LAYOUT_ortho_4x12(
   KC_GRV,   KC_1,        KC_2,        KC_3,        KC_4,        KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
diff --git a/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c b/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c
index affc42c7bb..f35f940da1 100644
--- a/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c
+++ b/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
   KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_ENT,
-  _______,  KC_LCTRL,    KC_LALT,     KC_LGUI,     KC_NO,       KC_SPC,   KC_SPC,   KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
+  _______,  KC_LCTL,     KC_LALT,     KC_LGUI,     KC_NO,       KC_SPC,   KC_SPC,   KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
 
 [1] = LAYOUT_ortho_4x12(
   KC_GRV,   KC_1,        KC_2,        KC_3,        KC_4,        KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
diff --git a/keyboards/mino/keymaps/default/keymap.c b/keyboards/mino/keymaps/default/keymap.c
index d55d97a039..94ef51e0e3 100644
--- a/keyboards/mino/keymaps/default/keymap.c
+++ b/keyboards/mino/keymaps/default/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_default(
         KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV, 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_ENTER,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_DEL, KC_SPACE, MO(_1), MO(_2), KC_RCTRL
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_DEL, KC_SPACE, MO(_1), MO(_2), KC_RCTL
     ),
     [_1] = LAYOUT_default(
         XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, KC_DEL,
diff --git a/keyboards/mino/keymaps/via/keymap.c b/keyboards/mino/keymaps/via/keymap.c
index 7dbda932b6..f481b07d34 100644
--- a/keyboards/mino/keymaps/via/keymap.c
+++ b/keyboards/mino/keymaps/via/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_0] = LAYOUT_default(
         KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV, 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_ENTER,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_SPACE, KC_DEL, KC_SPACE, MO(_1), MO(_2), KC_RCTRL
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_DEL, KC_SPACE, MO(_1), MO(_2), KC_RCTL
     ),
     [_1] = LAYOUT_default(
         XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, KC_DEL,
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index 304eb2b3b5..aeb67849f7 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -112,7 +112,7 @@ bool process_record_layout(uint16_t keycode, keyrecord_t *record) {
     return true;
   }
 
-  if (get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))) { // shift pressed
+  if (get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))) { // shift pressed
     // save default layer. whatever the current default layer is, store that
     eeconfig_update_default_layer(default_layer_state);
     #if defined(AUDIO_ENABLE)
@@ -167,7 +167,7 @@ bool process_record_cdeq(uint16_t keycode, keyrecord_t *record) {
     return true;
   }
 
-  shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+  shifted = get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
 
   // Keydown. If shift is currently pressed, register its alternate keycode.
   if (record->event.pressed && shifted) {
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
index cad13f0e01..4fed93f67c 100644
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ b/keyboards/mitosis/keymaps/nzen/keymap.c
@@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,     KC_Y,      KC_U,        KC_I,        KC_O,   KC_P,
     KC_A,      KC_S,      KC_D,      KC_F,      KC_G,     KC_H,      KC_J,        KC_K,        KC_L,   KC_SCLN,
     KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,     KC_N,      KC_M,        KC_COMM,     KC_DOT, KC_QUOTE,
-               KC_BSPC,   KC_DELETE, KC_LCTRL,  TG( 2 ),  TG( 3 ),   KC_RCTRL,    KC_ENTER,    KC_BSPC,
-               KC_LALT,   KC_0,      KC_LSHIFT, KC_SPACE, KC_SPACE,  KC_RSHIFT,   KC_CAPS,     KC_RALT
+               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', '; :' ],
diff --git a/keyboards/mntre/keymaps/default/keymap.c b/keyboards/mntre/keymaps/default/keymap.c
index eb367b2f8d..33b9442e38 100644
--- a/keyboards/mntre/keymaps/default/keymap.c
+++ b/keyboards/mntre/keymaps/default/keymap.c
@@ -15,9 +15,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,     KC_F9,    KC_F10,  KC_F11,      KC_F12,      MO(_FN),
         KC_GRAVE,  KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,    KC_8,      KC_9,     KC_0,    KC_MINUS,    KC_EQUAL,    KC_BSPC,
         KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,      KC_O,     KC_P,    KC_LBRC,     KC_RBRC,     KC_BSLS,
-        KC_LCTRL,  KC_APP,  KC_A,     KC_S,     KC_D,    KC_F,    KC_G,     KC_H,    KC_J,      KC_K,     KC_L,    KC_SCLN,     KC_QUOTE,    KC_ENTER,
-        KC_LSHIFT, KC_DEL,  KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,     KC_N,    KC_M,      KC_COMMA, KC_DOT,  KC_SLASH,    KC_UP,       KC_RSHIFT,
-        KC_RGUI,   KC_LGUI, KC_RCTRL, KC_SPACE, KC_LALT, KC_RALT, KC_SPACE, KC_PGUP, KC_PGDN,   KC_LEFT,  KC_DOWN, KC_RIGHT
+        KC_LCTL,   KC_APP,  KC_A,     KC_S,     KC_D,    KC_F,    KC_G,     KC_H,    KC_J,      KC_K,     KC_L,    KC_SCLN,     KC_QUOTE,    KC_ENTER,
+        KC_LSFT,   KC_DEL,  KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,     KC_N,    KC_M,      KC_COMMA, KC_DOT,  KC_SLASH,    KC_UP,       KC_RSFT,
+        KC_RGUI,   KC_LGUI, KC_RCTL,  KC_SPACE, KC_LALT, KC_RALT, KC_SPACE, KC_PGUP, KC_PGDN,   KC_LEFT,  KC_DOWN, KC_RIGHT
     ),
 
     [_FN] = LAYOUT(
diff --git a/keyboards/montsinger/rebound/rev2/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev2/keymaps/rossman360/keymap.c
index 10681eba6b..eeb20b5c76 100644
--- a/keyboards/montsinger/rebound/rev2/keymaps/rossman360/keymap.c
+++ b/keyboards/montsinger/rebound/rev2/keymaps/rossman360/keymap.c
@@ -6,7 +6,7 @@
 #define SPCMOD LT(_FN1, KC_SPACE)
 #define ENTMOD LT(_FN2, KC_ENTER)
 #define ESCMOD LT(_NUM, KC_ESC)
-#define RSMOD LT(_FN1, KC_RSHIFT)
+#define RSMOD LT(_FN1, KC_RSFT)
 
 enum layer_names {
   _BASE,
diff --git a/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
index 6d9c31ba80..f82aa822d1 100644
--- a/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
+++ b/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
@@ -6,7 +6,7 @@
 #define SPCMOD LT(_FN1, KC_SPACE)
 #define ENTMOD LT(_FN2, KC_ENTER)
 #define ESCMOD LT(_NUM, KC_ESC)
-#define RSMOD LT(_FN1, KC_RSHIFT)
+#define RSMOD LT(_FN1, KC_RSFT)
 
 enum layer_names {
   _BASE,
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
index 00ae6c6981..16cc4393d0 100644
--- a/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
+++ b/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
@@ -6,7 +6,7 @@
 #define SPCMOD LT(_FN1, KC_SPACE)
 #define ENTMOD LT(_FN2, KC_ENTER)
 #define ESCMOD LT(_NUM, KC_ESC)
-#define RSMOD LT(_FN1, KC_RSHIFT)
+#define RSMOD LT(_FN1, KC_RSFT)
 #
 
 enum layer_names {
diff --git a/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c b/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c
index ef27d37596..106443b739 100644
--- a/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c
+++ b/keyboards/montsinger/rewind/keymaps/rossman360/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,
    ZSHIFT,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-   KC_BSPC, ALTDEL,  KC_LCTRL,TABMOD,  PGMOD ,  KC_ENTER,SPCMOD, MO(_DEL), KC_BSPC, KC_DEL
+   KC_BSPC, ALTDEL,  KC_LCTL, TABMOD,  PGMOD ,  KC_ENTER,SPCMOD, MO(_DEL), KC_BSPC, KC_DEL
 ),
 
 [_FN1] = LAYOUT_ortho_5x10(
diff --git a/keyboards/nacly/ua62/keymaps/default/keymap.c b/keyboards/nacly/ua62/keymaps/default/keymap.c
index 5488fdfdc1..25198a23a3 100644
--- a/keyboards/nacly/ua62/keymaps/default/keymap.c
+++ b/keyboards/nacly/ua62/keymaps/default/keymap.c
@@ -19,17 +19,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,                          KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,                          KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
-        KC_LCTRL, KC_A, KC_S, KC_D, LT(1, KC_F), KC_G,                        KC_H, LT(2, KC_J), KC_K, KC_L, KC_SCLN, KC_QUOT,
+        KC_LCTL, KC_A, KC_S, KC_D, LT(1, KC_F), KC_G,                        KC_H, LT(2, KC_J), KC_K, KC_L, KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,                         KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, 
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_GRV, KC_EQL, KC_BSPC, KC_DEL,      KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, KC_ESC
+        KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, KC_EQL, KC_BSPC, KC_DEL,      KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, KC_ESC
     ),
     //Holding F
     [1] = LAYOUT(
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,                          KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_LCTRL, KC_NO, KC_NO, KC_NO, _______, KC_NO,                        KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
+        KC_LCTL, KC_NO, KC_NO, KC_NO, _______, KC_NO,                        KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
         KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, 
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO,      KC_HOME, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+        KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO,      KC_HOME, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
     ),
     //Holding J
     [2] = LAYOUT(
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO,                         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                      KC_NO, _______, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO,      KC_ENT, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+        KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO,      KC_ENT, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
     )
 };
 
diff --git a/keyboards/nek_type_a/keymaps/default/keymap.c b/keyboards/nek_type_a/keymaps/default/keymap.c
index cf76231c4b..14b9029634 100644
--- a/keyboards/nek_type_a/keymaps/default/keymap.c
+++ b/keyboards/nek_type_a/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC, KC_INSERT, KC_HOME, KC_PGUP,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DELETE, KC_END, KC_PGDN,
     KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
-    KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT, KC_UP,
-    KC_LCTRL, KC_LALT, KC_LCMD, KC_SPC, KC_SPC, KC_RCMD, KC_RALT, KC_RCTRL, KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, KC_UP,
+    KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_SPC, KC_RCMD, KC_RALT, KC_RCTL, KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 };
diff --git a/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c b/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c
index 5d3177af39..88997699a1 100644
--- a/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c
+++ b/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c
@@ -24,7 +24,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_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,   MO(1),
     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTRL,                     KC_LEFT,  KC_DOWN,  KC_RGHT
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTL,                      KC_LEFT,  KC_DOWN,  KC_RGHT
   ),
 
   [1] = LAYOUT_ansi(
diff --git a/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c b/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c
index a208f5df2a..8836cf5278 100644
--- a/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c
+++ b/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c
@@ -24,7 +24,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_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,   MO(1),
     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTRL,                     KC_LEFT,  KC_DOWN,  KC_RGHT
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTL,                      KC_LEFT,  KC_DOWN,  KC_RGHT
   ),
 
   [1] = LAYOUT_all(
diff --git a/keyboards/noxary/280/keymaps/default/keymap.c b/keyboards/noxary/280/keymaps/default/keymap.c
index bd279d50d9..c547b407d3 100644
--- a/keyboards/noxary/280/keymaps/default/keymap.c
+++ b/keyboards/noxary/280/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSLS,   KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,           KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           MO(_FL1),            KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL1),          KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL1),          KC_RCTL,   KC_LEFT,  KC_DOWN,  KC_RGHT
         ),
     /* Function Layer 1 - For ISO enter use ANSI enter
     * ┌───┐ ┌───┬───┬───┬───┐  ┌───┬───┬───┬───┐  ┌───┬───┬───┬───┐┌───┬───┬───┐
diff --git a/keyboards/noxary/280/keymaps/via/keymap.c b/keyboards/noxary/280/keymaps/via/keymap.c
index bd279d50d9..c547b407d3 100644
--- a/keyboards/noxary/280/keymaps/via/keymap.c
+++ b/keyboards/noxary/280/keymaps/via/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSLS,   KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,           KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           MO(_FL1),            KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL1),          KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL1),          KC_RCTL,   KC_LEFT,  KC_DOWN,  KC_RGHT
         ),
     /* Function Layer 1 - For ISO enter use ANSI enter
     * ┌───┐ ┌───┬───┬───┬───┐  ┌───┬───┬───┬───┐  ┌───┬───┬───┬───┐┌───┬───┬───┐
diff --git a/keyboards/ocean/gin_v2/keymaps/default/keymap.c b/keyboards/ocean/gin_v2/keymaps/default/keymap.c
index 5e99449694..edf6646874 100644
--- a/keyboards/ocean/gin_v2/keymaps/default/keymap.c
+++ b/keyboards/ocean/gin_v2/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P7, KC_P8, KC_P9,      KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC,
     KC_P4, KC_P5, KC_P6,      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_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_P0, KC_PDOT, KC_PENT,  KC_LCTRL, KC_LGUI, KC_LALT,   KC_SPC,     KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTRL
+    KC_P0, KC_PDOT, KC_PENT,  KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC,     KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTL
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/ocean/gin_v2/keymaps/via/keymap.c b/keyboards/ocean/gin_v2/keymaps/via/keymap.c
index dbfdd23911..ffdfddbd29 100644
--- a/keyboards/ocean/gin_v2/keymaps/via/keymap.c
+++ b/keyboards/ocean/gin_v2/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P7, KC_P8, KC_P9,      KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC,
     KC_P4, KC_P5, KC_P6,      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_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_P0, KC_PDOT, KC_PENT,  KC_LCTRL, KC_LGUI, KC_LALT,   KC_SPC,     KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTRL
+    KC_P0, KC_PDOT, KC_PENT,  KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC,     KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTL
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/ocean/slamz/keymaps/default/keymap.c b/keyboards/ocean/slamz/keymaps/default/keymap.c
index 2e4d592fca..2d540d1c76 100644
--- a/keyboards/ocean/slamz/keymaps/default/keymap.c
+++ b/keyboards/ocean/slamz/keymaps/default/keymap.c
@@ -20,6 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
     KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT,
     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-    KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTRL
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
   ),
 };
diff --git a/keyboards/ocean/slamz/keymaps/via/keymap.c b/keyboards/ocean/slamz/keymaps/via/keymap.c
index 1149e3305d..5a33161a93 100644
--- a/keyboards/ocean/slamz/keymaps/via/keymap.c
+++ b/keyboards/ocean/slamz/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
     KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT,
     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-    KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTRL
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/ocean/yuri/keymaps/default/keymap.c b/keyboards/ocean/yuri/keymaps/default/keymap.c
index 24c2830d14..3ccadfe0c0 100644
--- a/keyboards/ocean/yuri/keymaps/default/keymap.c
+++ b/keyboards/ocean/yuri/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_PSCR, KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, KC_BSPC,
     KC_PGUP, KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
     KC_PGDN, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,  KC_RSFT,
-             KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT,          MO(1),  KC_RCTRL
+             KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT,          MO(1),  KC_RCTL
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/ocean/yuri/keymaps/via/keymap.c b/keyboards/ocean/yuri/keymaps/via/keymap.c
index 24c2830d14..3ccadfe0c0 100644
--- a/keyboards/ocean/yuri/keymaps/via/keymap.c
+++ b/keyboards/ocean/yuri/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_PSCR, KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, KC_BSPC,
     KC_PGUP, KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
     KC_PGDN, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,  KC_RSFT,
-             KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT,          MO(1),  KC_RCTRL
+             KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT,          MO(1),  KC_RCTL
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/om60/keymaps/default/keymap.c b/keyboards/om60/keymaps/default/keymap.c
index 336b98d3bf..4ade0c80a9 100644
--- a/keyboards/om60/keymaps/default/keymap.c
+++ b/keyboards/om60/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
         TO(1), KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-        TO(2),KC_LCTRL, KC_LGUI, KC_LALT,  KC_DEL, KC_LBRC,  KC_SPC,  KC_SPC, KC_RBRC, KC_RALT, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT
+        TO(2),KC_LCTL,  KC_LGUI, KC_LALT,  KC_DEL, KC_LBRC,  KC_SPC,  KC_SPC, KC_RBRC, KC_RALT, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT
   //|-----------------------------------------------------------------------------------------------------------------------------'
   ),
   [1] = LAYOUT(
diff --git a/keyboards/om60/keymaps/via/keymap.c b/keyboards/om60/keymaps/via/keymap.c
index beb4ab962b..b79b6353f8 100644
--- a/keyboards/om60/keymaps/via/keymap.c
+++ b/keyboards/om60/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
         TO(1), KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-        TO(2),KC_LCTRL, KC_LGUI, KC_LALT,  KC_DEL, KC_LBRC,  KC_SPC,  KC_SPC, KC_RBRC, KC_RALT, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT
+        TO(2),KC_LCTL,  KC_LGUI, KC_LALT,  KC_DEL, KC_LBRC,  KC_SPC,  KC_SPC, KC_RBRC, KC_RALT, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT
   //|-----------------------------------------------------------------------------------------------------------------------------'
   ),
   [1] = LAYOUT(
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index f82d427c05..ca6a91f42d 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for magic key command */
 #undef IS_COMMAND
-#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT)))
+#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT)))
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN D3
diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h
index 1f536aa6f6..7c06ef70fe 100644
--- a/keyboards/orthodox/rev1/config.h
+++ b/keyboards/orthodox/rev1/config.h
@@ -58,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
 )
 
 /* ws2812 RGB LED */
diff --git a/keyboards/orthodox/rev3/config.h b/keyboards/orthodox/rev3/config.h
index b69aa4b109..2b7e86a104 100644
--- a/keyboards/orthodox/rev3/config.h
+++ b/keyboards/orthodox/rev3/config.h
@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
 )
 
 /* ws2812 RGB LED */
diff --git a/keyboards/orthodox/rev3_teensy/config.h b/keyboards/orthodox/rev3_teensy/config.h
index 5cd92b005c..2da0336d13 100644
--- a/keyboards/orthodox/rev3_teensy/config.h
+++ b/keyboards/orthodox/rev3_teensy/config.h
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LGUI)) \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
 )
 
 /* ws2812 RGB LED */
diff --git a/keyboards/palette1202/keymaps/default/keymap.c b/keyboards/palette1202/keymaps/default/keymap.c
index a1faa8558f..70f2ba311c 100644
--- a/keyboards/palette1202/keymaps/default/keymap.c
+++ b/keyboards/palette1202/keymaps/default/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [WIN_CS_1] = LAYOUT(
       KC_TAB,       LCTL(KC_A), KC_E,         KC_P,          LCTL(KC_0),
       MO(WIN_CS_2), KC_M,       KC_BSPC,      KC_B,          KC_HYPR,
-                    KC_LSFT,    KC_LCTRL,     LCTL(KC_Z),    KC_SPC
+                    KC_LSFT,    KC_LCTL,      LCTL(KC_Z),    KC_SPC
     ),
     [WIN_CS_2] = LAYOUT(
       MO(SETTING),  KC_ESC,     KC_G,         KC_R,          LCTL(KC_GRV),
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [WIN_PS_1] = LAYOUT(
       KC_TAB,       LCTL(KC_A), KC_E,         KC_B,          LCTL(KC_1),
       MO(WIN_PS_2), KC_L,       LCTL(KC_DEL), LCTL(KC_QUOT), KC_MEH,
-                    KC_LSFT,    KC_LCTRL,     LCTL(KC_Z),    KC_SPC
+                    KC_LSFT,    KC_LCTL,      LCTL(KC_Z),    KC_SPC
     ),
     [WIN_PS_2] = LAYOUT(
       MO(SETTING),  KC_ESC,     KC_G,         KC_R,          KC_ESC,
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index 13c973d5f3..aa507abe5a 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_planck_grid(
     KC_TAB,      KC_Q,     KC_W,    KC_E,    KC_R,  KC_T,     KC_Y,  KC_U,  KC_I,     KC_O,    KC_P,      KC_BSPC,
     KC_ESCAPE,   KC_A,     KC_S,    KC_D,    KC_F,  KC_G,     KC_H,  KC_J,  KC_K,     KC_L,    KC_SCLN,   KC_QUOTE,
-    KC_LSHIFT,   KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,     KC_N,  KC_M,  KC_COMMA, KC_DOT,  KC_SLASH,  KC_ENTER,
-    WEBUSB_PAIR, KC_LCTRL, KC_LALT, KC_LGUI, LOWER, KC_SPACE, KC_NO, RAISE, KC_LEFT,  KC_DOWN, KC_UP,     KC_RIGHT
+    KC_LSFT,     KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,     KC_N,  KC_M,  KC_COMMA, KC_DOT,  KC_SLASH,  KC_ENTER,
+    WEBUSB_PAIR, KC_LCTL,  KC_LALT, KC_LGUI, LOWER, KC_SPACE, KC_NO, RAISE, KC_LEFT,  KC_DOWN, KC_UP,     KC_RIGHT
   ),
 
   [_LOWER] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/dc/keymap.c b/keyboards/planck/keymaps/dc/keymap.c
index 7a8cb7c099..83b6f9eaad 100644
--- a/keyboards/planck/keymaps/dc/keymap.c
+++ b/keyboards/planck/keymaps/dc/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,        KC_QUOT,    KC_COMM,    KC_DOT,     KC_P,   KC_Y,      KC_F,        KC_G,   KC_C,    KC_R,    KC_L,  KC_BSPC,
         KC_ESC,        KC_A,       KC_O,       KC_E,       KC_U,   KC_I,      KC_D,        KC_H,   KC_T,    KC_N,    KC_S,  KC_SLASH,
         KC_LSFT,       TD(0),      TD(1),      TD(2),      KC_K,   KC_X,      KC_B,        KC_M,   TD(3),   TD(4),   TD(5), MT(MOD_RSFT, KC_ENT),
-        MO(ACTIONS),   KC_LCTRL,   KC_LGUI,    KC_LALT,    NUMBERS,    KC_SPACE, KC_SPACE,         SYMBOLS,KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
+        MO(ACTIONS),   KC_LCTL,    KC_LGUI,    KC_LALT,    NUMBERS,    KC_SPACE, KC_SPACE,         SYMBOLS,KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
     ),
 
     /* Numbers
diff --git a/keyboards/planck/keymaps/gitdrik/keymap.c b/keyboards/planck/keymaps/gitdrik/keymap.c
index d9f1e5a4fc..9f193e21c1 100644
--- a/keyboards/planck/keymaps/gitdrik/keymap.c
+++ b/keyboards/planck/keymaps/gitdrik/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_RIGHT] = LAYOUT_planck_grid(
     KC_TRNS,          RALT(LSFT(KC_RBRC)), KC_RBRC,          KC_EQL ,          LSFT(KC_EQL),     RALT(KC_RBRC), RALT(KC_NUHS), KC_HOME, KC_UP,   KC_END , KC_INS , KC_PGUP,
     KC_TRNS,          RALT(KC_2),          RALT(KC_4),       RALT(LSFT(KC_0)), LSFT(KC_6),       LSFT(KC_3),    LSFT(KC_5),    KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_PGDN,
-    KC_RCTRL,         KC_TRNS,             RALT(LSFT(KC_2)), RALT(LSFT(KC_4)), RALT(LSFT(KC_3)), RALT(KC_6),    RALT(KC_5),    KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
+    KC_RCTL,          KC_TRNS,             RALT(LSFT(KC_2)), RALT(LSFT(KC_4)), RALT(LSFT(KC_3)), RALT(KC_6),    RALT(KC_5),    KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
     RALT(LSFT(KC_5)), KC_TRNS,             KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,       KC_TRNS,       KC_TRNS, KC_TRNS,  KC_VOLD, KC_VOLU, KC_MUTE
 ),
 
diff --git a/keyboards/planck/keymaps/johannes/keymap.c b/keyboards/planck/keymaps/johannes/keymap.c
index 294bfd85ae..c1fdd11244 100644
--- a/keyboards/planck/keymaps/johannes/keymap.c
+++ b/keyboards/planck/keymaps/johannes/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [QWERTY] = LAYOUT_planck_grid(
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_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_LCTRL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  _______, KC_LALT, LT(FUNCTION, KC_MPLY), KC_LGUI, KC_LSHIFT,    KC_SPC,  MO(RAISE),   MO(LOWER),   KC_LALT, KC_RALT, XXXXXXX,   MO(FUNCTION)
+  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+  _______, KC_LALT, LT(FUNCTION, KC_MPLY), KC_LGUI, KC_LSFT,      KC_SPC,  MO(RAISE),   MO(LOWER),   KC_LALT, KC_RALT, XXXXXXX,   MO(FUNCTION)
 ),
 
 /* Lower
diff --git a/keyboards/planck/keymaps/matrixman/keymap.c b/keyboards/planck/keymaps/matrixman/keymap.c
index 4d5d7db6fe..ad4844116e 100644
--- a/keyboards/planck/keymaps/matrixman/keymap.c
+++ b/keyboards/planck/keymaps/matrixman/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LT(_NAV_L,KC_Q), KC_W,  KC_E,      KC_R,        KC_T,         KC_DELETE, KC_BSPC,          KC_Y,       KC_U,    KC_I,     KC_O, LT(_NAV_R,KC_P)
   ,KC_A,            KC_S,  KC_D,      KC_F,        KC_G,     CTL_T(KC_ESC), CTL_T(KC_SCLN),   KC_H,       KC_J,    KC_K,     KC_L,     KC_QUOT
   ,SFT_T(KC_Z),     KC_X,  KC_C,      KC_V,        KC_B,     ALT_T(KC_TAB), ALT_T(KC_INS),    KC_N,       KC_M,    KC_COMM,  KC_DOT,   SFT_T(KC_SLSH)
-  ,KC_LCTRL,     KC_LGUI,  LM(_NAV_ALT, MOD_LALT), KC_TAB, LT(_SYMB_L, KC_ESC), KC_LSFT,  KC_LSFT,  LT(_SYMB_R,KC_SPC), KC_BSPC, LM(_NAV_ALT, MOD_LALT), KC_RCTRL, KC_ENT
+  ,KC_LCTL,      KC_LGUI,  LM(_NAV_ALT, MOD_LALT), KC_TAB, LT(_SYMB_L, KC_ESC), KC_LSFT,  KC_LSFT,  LT(_SYMB_R,KC_SPC), KC_BSPC, LM(_NAV_ALT, MOD_LALT), KC_RCTL, KC_ENT
 ),
     // accessed via the left symb-layer key, includes a semicolon where the right symb-layer key was
 [_SYMB_L] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/myoung34/keymap.c b/keyboards/planck/keymaps/myoung34/keymap.c
index b58688c393..f276b45e45 100644
--- a/keyboards/planck/keymaps/myoung34/keymap.c
+++ b/keyboards/planck/keymaps/myoung34/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_QWERTY] = LAYOUT_planck_grid(
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC       ,
-    KC_LCTRL,KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RSFT_T(KC_ENT),
+    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RSFT_T(KC_ENT),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT       ,
     _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
diff --git a/keyboards/planck/keymaps/navi/keymap.c b/keyboards/planck/keymaps/navi/keymap.c
index 18568958a4..95f1dea79a 100644
--- a/keyboards/planck/keymaps/navi/keymap.c
+++ b/keyboards/planck/keymaps/navi/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_planck_grid(
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_LSHIFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_END, KC_HOME,  _______,
+  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_END, KC_HOME,  _______,
   _______, _______, _______, _______, _______, _______, _______, _______,    _______, KC_PGDN  , KC_PGUP, _______
 ),
 
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT_planck_grid(
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_DEL,
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_LSHIFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_END, KC_HOME,  _______,
+  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_END, KC_HOME,  _______,
   _______, _______, _______, _______, _______, _______, _______, _______,    _______, KC_PGDN  , KC_PGUP, _______
 ),
 
diff --git a/keyboards/planck/keymaps/not-quite-neo/keymap.c b/keyboards/planck/keymaps/not-quite-neo/keymap.c
index 4d18f9d32a..20a0e07e10 100644
--- a/keyboards/planck/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/planck/keymaps/not-quite-neo/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [L01] = LAYOUT_planck_grid(
   KC_ESC,                 L01_LEFT_01,                                 L01_RIGHT_01,                 KC_ENTER,
   MO(L03),                L01_LEFT_02,                                 L01_RIGHT_02,                 MO(L03),
-  KC_LSHIFT,              L01_LEFT_03,                                 L01_RIGHT_03,                 KC_RSFT,
-  KC_LCTRL,KC_LGUI, KC_LALT, MO(L05), MO(L04), KC_SPC,  KC_SPC,  MO(L04), MO(L05), KC_RALT, MO(LFN), KC_RCTRL
+  KC_LSFT,                L01_LEFT_03,                                 L01_RIGHT_03,                 KC_RSFT,
+  KC_LCTL, KC_LGUI, KC_LALT, MO(L05), MO(L04), KC_SPC,  KC_SPC,  MO(L04), MO(L05), KC_RALT, MO(LFN), KC_RCTL
 ),
 
 
diff --git a/keyboards/planck/keymaps/orthodeluxe/keymap.c b/keyboards/planck/keymaps/orthodeluxe/keymap.c
index eac939531a..e615ab97ea 100644
--- a/keyboards/planck/keymaps/orthodeluxe/keymap.c
+++ b/keyboards/planck/keymaps/orthodeluxe/keymap.c
@@ -101,13 +101,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_BSPC, KC_Q,     KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,     KC_DEL,
     KC_ESC,  KC_A,     KC_S,    KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,    KC_SCLN,  KC_ENT,
     _______, KC_Z,     KC_X,    KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_TAB,
-    KC_LSFT, KC_LCTRL, KC_LALT, KC_LGUI,  L_NUM_M, KC_SPC,  KC_SPC,  L_NAV_M, RCMDCTRL, KC_RALT, KC_RCTRL, KC_RSFT
+    KC_LSFT, KC_LCTL,  KC_LALT, KC_LGUI,  L_NUM_M, KC_SPC,  KC_SPC,  L_NAV_M, RCMDCTRL, KC_RALT, KC_RCTL,  KC_RSFT
 ),
 [_BASELAYER_WINDOWS] = LAYOUT_planck_grid(
     KC_BSPC, KC_Q,     KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,     KC_DEL,
     KC_ESC,  KC_A,     KC_S,    KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,    KC_SCLN,  KC_ENT,
     _______, KC_Z,     KC_X,    KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_TAB,
-    KC_LSFT, KC_LGUI,  KC_LALT, KC_LCTRL, L_NUM_W, KC_SPC,  KC_SPC,  L_NAV_W, RCMDCTRL, KC_RALT, KC_APP,   KC_RSFT
+    KC_LSFT, KC_LGUI,  KC_LALT, KC_LCTL,  L_NUM_W, KC_SPC,  KC_SPC,  L_NAV_W, RCMDCTRL, KC_RALT, KC_APP,   KC_RSFT
 ),
 
 /* Lefty layer:
@@ -331,7 +331,7 @@ void set_keycodes_for_os(int os) {
         keycode_rightcommand = KC_RGUI;
         keycode_appswitch = KC_LGUI;
     } else {
-        keycode_rightcommand = KC_RCTRL;
+        keycode_rightcommand = KC_RCTL;
         keycode_appswitch = KC_LALT;
     }
 }
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 0d686e0882..0cdd3bbb83 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -36,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_planck_grid(
     KC_TAB,         KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,           KC_O,           KC_P,           KC_BSPC,
     KC_ESCAPE,      KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_H,           KC_J,           KC_K,           KC_L,           KC_SCLN,        KC_QUOTE,
-    KC_LSHIFT,      KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,           KC_N,           KC_M,           KC_COMMA,       KC_DOT,         KC_SLASH,       KC_ENTER,
-    WEBUSB_PAIR,    KC_LCTRL,       KC_LALT,        KC_LGUI,        LOWER,          KC_SPACE,       KC_NO,          RAISE,          KC_LEFT,        KC_DOWN,        KC_UP,          KC_RIGHT
+    KC_LSFT,        KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,           KC_N,           KC_M,           KC_COMMA,       KC_DOT,         KC_SLASH,       KC_ENTER,
+    WEBUSB_PAIR,    KC_LCTL,        KC_LALT,        KC_LGUI,        LOWER,          KC_SPACE,       KC_NO,          RAISE,          KC_LEFT,        KC_DOWN,        KC_UP,          KC_RIGHT
   ),
 
   [_LOWER] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/pickle_jr/keymap.c b/keyboards/planck/keymaps/pickle_jr/keymap.c
index 0d2e772955..1b4b4a254b 100644
--- a/keyboards/planck/keymaps/pickle_jr/keymap.c
+++ b/keyboards/planck/keymaps/pickle_jr/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT_planck_grid(
   _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,
   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,  KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  KC_PLUS, _______,
-  _______, _______, KC_TILD, KC_GRV,  KC_LCTRL, _______, KC_PIPE, _______, KC_UNDS, _______, _______, _______,
+  _______, _______, KC_TILD, KC_GRV,  KC_LCTL,  _______, KC_PIPE, _______, KC_UNDS, _______, _______, _______,
   _______, _______, _______, _______, _______,  _______, KC_TRNS, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/piemod/keymap.c b/keyboards/planck/keymaps/piemod/keymap.c
index fa3a7f99c2..60fb2bbf12 100644
--- a/keyboards/planck/keymaps/piemod/keymap.c
+++ b/keyboards/planck/keymaps/piemod/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [DVORAK] = LAYOUT_planck_grid(
     KC_ESC,  KC_QUOTE,  LT_7COM,  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_DELETE,
     KC_TAB,  LT_1A,  LT_2O,  LT_3E,  LT_4U,  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_ENTER,
-    KC_LSHIFT,  KC_SCLN,  LT_5Q,   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS,
-    C(KC_LALT), LT_6CTL,  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTRL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT
+    KC_LSFT,  KC_SCLN,  LT_5Q,   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS,
+    C(KC_LALT), LT_6CTL,  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT
   ),
 
   [ARROW] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/prog_qgmlwb/src/normal.h b/keyboards/planck/keymaps/prog_qgmlwb/src/normal.h
index fa5c84d217..985b9fe471 100644
--- a/keyboards/planck/keymaps/prog_qgmlwb/src/normal.h
+++ b/keyboards/planck/keymaps/prog_qgmlwb/src/normal.h
@@ -19,7 +19,7 @@
 #define qwerty_map LAYOUT_ortho_4x12(\
     KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,\
     KC_ESC,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_ENT,\
-    KC_LSFT, KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSHIFT,\
+    KC_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, numpad, KC_LGUI, lower,  KC_SPC, KC_SPC, raise,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT\
 )
 
diff --git a/keyboards/planck/keymaps/roguepullrequest/keymap.c b/keyboards/planck/keymaps/roguepullrequest/keymap.c
index 612f2c9daa..848ececd1a 100644
--- a/keyboards/planck/keymaps/roguepullrequest/keymap.c
+++ b/keyboards/planck/keymaps/roguepullrequest/keymap.c
@@ -81,9 +81,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KC_LAST:
       if(record->event.pressed){
         macro_timer = timer_read();
-        register_mods(MOD_BIT(KC_LCTRL));
+        register_mods(MOD_BIT(KC_LCTL));
       } else {
-        unregister_mods(MOD_BIT(KC_LCTRL));
+        unregister_mods(MOD_BIT(KC_LCTL));
         if (timer_elapsed(macro_timer) < 150) {
           SEND_STRING("!$");
         }
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index ea9a85dba1..8e80f8208d 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -1470,7 +1470,7 @@ void scap_finished(qk_tap_dance_state_t* state, void* user_data) {
 
 // Left-Shift->Sticky-Caps tap-dance reset
 void scap_reset(qk_tap_dance_state_t* state, void* user_data) {
-    unregister_code(KC_LSHIFT);
+    unregister_code(KC_LSFT);
     scap_state.state = TD_NONE;
 }
 
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index 71199b1a25..ae9211f5a5 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_TAB,            KC_QUOTE,          KC_COMMA, KC_DOT,  KC_P,  KC_Y,             KC_F,  KC_G,  KC_C,    KC_R,    KC_L,    KC_SLASH,
           LCTL_T(KC_ESCAPE), KC_A,              KC_O,     KC_E,    KC_U,  KC_I,             KC_D,  KC_H,  KC_T,    KC_N,    KC_S,    KC_BSPC,
           _______,           TD(TD_SEMI_COLON), KC_Q,     KC_J,    KC_K,  KC_X,             KC_B,  KC_M,  KC_W,    KC_V,    KC_Z,    KC_ENTER,
-          _______,           KC_LCTRL,          KC_LALT,  KC_LGUI, LOWER, LSFT_T(KC_SPACE), KC_NO, RAISE, _______, _______, _______, _______
+          _______,           KC_LCTL,           KC_LALT,  KC_LGUI, LOWER, LSFT_T(KC_SPACE), KC_NO, RAISE, _______, _______, _______, _______
           ),
 
   [_LOWER] = LAYOUT_planck_grid(
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_GRAVE, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,        KC_0,    KC_BSLS,
           KC_TILD,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,     KC_RPRN, KC_PIPE,
           _______,  _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR,     KC_RCBR, KC_DELETE,
-          _______,  KC_LCTRL, KC_LALT, KC_LGUI, _______, _______, KC_NO,   _______, _______, KC_LBRC,     KC_RBRC, _______
+          _______,  KC_LCTL,  KC_LALT, KC_LGUI, _______, _______, KC_NO,   _______, _______, KC_LBRC,     KC_RBRC, _______
           ),
 
   [_RAISE] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/xjtian/keymap.c b/keyboards/planck/keymaps/xjtian/keymap.c
index b338ddee0e..c05b6261be 100644
--- a/keyboards/planck/keymaps/xjtian/keymap.c
+++ b/keyboards/planck/keymaps/xjtian/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_EQUAL, KC_MINUS, KC_PAST, KC_SLSH,  KC_BSPC,
     _______, KC_1,    KC_2,    KC_3,    KC_4,  KC_5,    KC_6,    KC_7,     KC_8,     KC_9,    KC_0,     KC_NO,
     _______, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,    KC_COMM,  KC_DOT,  KC_NO,    _______,
-    _______, _______, _______, _______, MOA,   _______, _______, _______,  KC_RGUI,  KC_RALT, KC_RCTRL, KC_NO
+    _______, _______, _______, _______, MOA,   _______, _______, _______,  KC_RGUI,  KC_RALT, KC_RCTL,  KC_NO
 ),
 
 /* Symbols
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,   KC_BSPC,
     _______, KC_NO,   KC_PIPE, KC_LCBR, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_RCBR, KC_BSLS, KC_QUOT,  KC_NO,
     _______, KC_TILD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UNDS, KC_PLUS,  _______,
-    _______, _______, _______, _______, _______, _______, _______, MOA,     KC_RGUI, KC_RALT, KC_RCTRL, KC_NO
+    _______, _______, _______, _______, _______, _______, _______, MOA,     KC_RGUI, KC_RALT, KC_RCTL,  KC_NO
 ),
 
 /* Function keys
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,
     _______, KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_NO,   KC_NO,   KC_END,  KC_NO,   KC_NO,   KC_NO,    KC_NO,
     _______, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTRL, KC_NO
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTL,  KC_NO
 ),
 
 /* Adjust (Num + Symbol)
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
index 5de64de955..13034897cf 100644
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ b/keyboards/planck/keymaps/zach/zach_common_functions.c
@@ -237,7 +237,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case SHFT_CAP:
         if(record->event.pressed){
             key_timer = timer_read();               // if the key is being pressed, we start the timer.
-            register_code(KC_LSHIFT);
+            register_code(KC_LSFT);
         } else {                                    // this means the key was just released (tap or "held down")
             if(timer_elapsed(key_timer) < 152){     // Time in ms, the threshold we pick for counting something as a tap.
                 tap(KC_CAPS);
@@ -253,7 +253,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     #endif
                 }
             }
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LSFT);
         }
         return false;
         break;
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
index 445963c217..411c27a4ee 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CALC, KC_PAST, KC_PSLS, KC_BSPC, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSLS , KC_PSCR, KC_HOME,
     KC_PMNS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_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_PPLS,  KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE,        KC_ENTER,     KC_PGDN,
-    KC_EQL, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,     KC_RSHIFT,       KC_UP, KC_END,
-    KC_PENT, KC_PDOT, KC_P0,  KC_P0, KC_COMMA ,       KC_LCTRL, KC_LGUI, KC_LALT,      KC_SPACE,    KC_SPACE,    KC_SPACE,    KC_RALT, MO(_FNC), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RIGHT
+    KC_EQL, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,     KC_RSFT,         KC_UP, KC_END,
+    KC_PENT, KC_PDOT, KC_P0,  KC_P0, KC_COMMA ,       KC_LCTL, KC_LGUI, KC_LALT,      KC_SPACE,    KC_SPACE,    KC_SPACE,    KC_RALT, MO(_FNC), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
   ),
   [_FNC] = 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,   _______,
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
index 6e925ebe8a..a4eac9f881 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_PMNS, KC_PAST, KC_PSLS, KC_BSPC, KC_ESC,    KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,     KC_BSPC,    KC_HOME,
     KC_PPLS, KC_P7,   KC_P8,   KC_P9, KC_NUM,          KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,    KC_BSLS,       KC_PGUP,
              KC_P4,   KC_P5,   KC_P6, CMD_COPY,          KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE,       KC_ENTER,     KC_PGDN,
-    KC_PENT, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,   KC_RSHIFT,   KC_UP, KC_END,
-             KC_PDOT,    KC_P0,      KC_COMMA ,       KC_LCTRL, KC_LGUI, KC_LALT,                KC_SPACE,              KC_RALT,   MO(_FNC),   KC_LEFT, KC_DOWN, KC_RIGHT
+    KC_PENT, KC_P1,   KC_P2,   KC_P3, CMD_PASTE,           KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,   KC_RSFT,     KC_UP, KC_END,
+             KC_PDOT,    KC_P0,      KC_COMMA ,       KC_LCTL, KC_LGUI, KC_LALT,                KC_SPACE,              KC_RALT,   MO(_FNC),   KC_LEFT, KC_DOWN, KC_RIGHT
   ),
   [_FNC] = LAYOUT_ansi(
     _______, _______,   _______,   _______, _______,   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,        KC_DEL,    KC_PSCR,
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
index 142d3babb8..91812966fd 100644
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
@@ -119,8 +119,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_PSCR, KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LBRC, KC_RBRC, KC_MINUS, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \
   KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_MENU, \
-  KC_RCTRL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+  KC_RSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_MENU, \
+  KC_RCTL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 ),
 
 /* Raise
@@ -140,8 +140,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_PSCR, KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_UNDERSCORE, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \
   KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_MENU, \
-  KC_RCTRL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+  KC_RSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_MENU, \
+  KC_RCTL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 ),
 
 /* Adjust (Lower + Raise)
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index e5f37b78c4..15bd9d9e80 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -91,7 +91,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     /* Tap once for right parenthesis, twice for right bracket, thrice for right brace */
     [TD_BRACKETS_RIGHT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_brackets_right_finished, td_brackets_right_reset),
     /* Tap once for control, twice for escape */
-    [TD_CONTROL_ESCAPE] = ACTION_TAP_DANCE_DOUBLE(KC_LCTRL, KC_ESCAPE),
+    [TD_CONTROL_ESCAPE] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_ESCAPE),
     /* Tap once for plus, twice for equals */
     [TD_PLUS_EQUALS] = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQUAL),
     /* Hold for numpad, tap twice to toggle function row, double hold for temporary function row */
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
-  MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSHIFT,
+  MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_TOG,     _______, XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
 )
 
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index f46ac5fe72..48cb4b8c34 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -207,7 +207,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
-  MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSHIFT,
+  MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     _______,          _______,      XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
 )
 
diff --git a/keyboards/preonic/keymaps/zach/zach_common_functions.c b/keyboards/preonic/keymaps/zach/zach_common_functions.c
index 5de64de955..13034897cf 100644
--- a/keyboards/preonic/keymaps/zach/zach_common_functions.c
+++ b/keyboards/preonic/keymaps/zach/zach_common_functions.c
@@ -237,7 +237,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case SHFT_CAP:
         if(record->event.pressed){
             key_timer = timer_read();               // if the key is being pressed, we start the timer.
-            register_code(KC_LSHIFT);
+            register_code(KC_LSFT);
         } else {                                    // this means the key was just released (tap or "held down")
             if(timer_elapsed(key_timer) < 152){     // Time in ms, the threshold we pick for counting something as a tap.
                 tap(KC_CAPS);
@@ -253,7 +253,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     #endif
                 }
             }
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LSFT);
         }
         return false;
         break;
diff --git a/keyboards/projectcain/relic/keymaps/default/keymap.c b/keyboards/projectcain/relic/keymaps/default/keymap.c
index 6b6c740603..60561f4c15 100644
--- a/keyboards/projectcain/relic/keymaps/default/keymap.c
+++ b/keyboards/projectcain/relic/keymaps/default/keymap.c
@@ -27,21 +27,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOTE,   
      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  
-      MO(1), KC_LCTRL,       MO(1), SFT_T(KC_BSPC), KC_SPACE, KC_SPACE, MO(2),      KC_LALT, MO(2)
+      MO(1), KC_LCTL,       MO(1), SFT_T(KC_BSPC), KC_SPACE, KC_SPACE, MO(2),      KC_LALT, MO(2)
   ),
 
   [NUM] = LAYOUT_all(
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_KP_SLASH,    KC_7,    KC_8,    KC_9,    KC_MINUS,    KC_BSPC,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_KP_ASTERISK,    KC_4,    KC_5,    KC_6,    KC_PLUS,   
      KC_LCPO,    KC_X,    KC_C,    KC_V,    KC_B,    KC_0,    KC_1,    KC_2, KC_3,  KC_RCPC,  
-         MO(1), KC_LCTRL,       KC_TRNS,  SFT_T(KC_BSPC), KC_TRNS,  KC_SPACE,  KC_TRNS,       KC_LALT, MO(2)
+         MO(1), KC_LCTL,       KC_TRNS,  SFT_T(KC_BSPC), KC_TRNS,  KC_SPACE,  KC_TRNS,       KC_LALT, MO(2)
   ),
   
   [SYM] = LAYOUT_all(
     S(KC_GRV),    KC_GRV,    KC_TRNS,    S(KC_BSLS),    KC_BSLS,    KC_TRNS,    S(KC_MINS),    KC_EQL,    KC_TRNS,    C(KC_W),    QK_BOOT,
     S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    KC_SCLN,    S(KC_SCLN),   
      S(KC_LBRC),    KC_LBRC,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_RBRC,    S(KC_RBRC),  
-         MO(1), KC_LCTRL,    KC_TRNS,  SFT_T(KC_BSPC),  KC_TRNS, KC_SPACE,  KC_TRNS,         KC_LALT, MO(2)
+         MO(1), KC_LCTL,    KC_TRNS,  SFT_T(KC_BSPC),  KC_TRNS, KC_SPACE,  KC_TRNS,         KC_LALT, MO(2)
   ),
 
 };
diff --git a/keyboards/projectcain/vault45/keymaps/default/keymap.c b/keyboards/projectcain/vault45/keymaps/default/keymap.c
index d143c3b2c1..ec8de8b604 100644
--- a/keyboards/projectcain/vault45/keymaps/default/keymap.c
+++ b/keyboards/projectcain/vault45/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,    KC_PGUP,    KC_HOME,    KC_UP,    KC_END,    KC_WBAK,    KC_PSLS,    KC_7,    KC_8,    KC_9,    KC_PMNS,    KC_DEL,    QK_BOOT,
     KC_TRNS,    KC_PGDN,    KC_LEFT,    KC_DOWN,    KC_RGHT,    KC_WFWD,    KC_PAST,    KC_4,    KC_5,    KC_6,    KC_PPLS,             KC_TRNS,
     KC_LBRC,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_0,    KC_1,    KC_2,    KC_3,    KC_PDOT,             KC_RBRC,
-        KC_PSCR,     KC_TRNS,            KC_TRNS,  KC_TRNS,       KC_TRNS,  S(KC_RCTRL),        RALT(KC_F4), RALT(KC_F4)
+        KC_PSCR,     KC_TRNS,            KC_TRNS,  KC_TRNS,       KC_TRNS,  S(KC_RCTL),        RALT(KC_F4), RALT(KC_F4)
   ),
   
   [SYM] = LAYOUT_split_4space(
diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
index 8283ea9608..d8c75895bf 100644
--- a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_Q,   KC_W,   KC_E,  KC_R,   KC_T,   KC_ESC,  KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
     KC_TAB,  KC_A,   KC_S,   KC_D,  KC_F,   KC_G,   KC_LSFT, KC_H,   KC_SJ,  KC_K,    KC_L,   KC_QUOT,
     KC_LSFT, KC_Z,   KC_X,   KC_C,  KC_V,   KC_B,   KC_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-    KC_LCTRL,  KC_LGUI,  KC_LALT, KC_ESC,	 KC_SPC,   	 KC_GUP_BSPC, 		 KC_RALT, KC_TRNS, KC_BSPC
+    KC_LCTL,  KC_LGUI,  KC_LALT, KC_ESC,	 KC_SPC,   	 KC_GUP_BSPC, 		 KC_RALT, KC_TRNS, KC_BSPC
   ),
   
  [_SYM] = LAYOUT_2u_bars(
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
index 37a5c3fb37..c9dcfd4af5 100644
--- a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_Q,   KC_W,   KC_E,  KC_R,   KC_T,   KC_ESC,  KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
     KC_TAB,  KC_A,   KC_S,   KC_D,  KC_F,   KC_G,   KC_LSFT, KC_H,   KC_SJ,  KC_K,    KC_L,   KC_QUOT,
     KC_LSFT, KC_Z,   KC_X,   KC_C,  KC_V,   KC_B,   KC_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-    KC_LCTRL,  KC_LGUI,  KC_LALT,    		 KC_SPC,   	  		 KC_RALT, KC_TRNS
+    KC_LCTL,  KC_LGUI,  KC_LALT,    		 KC_SPC,   	  		 KC_RALT, KC_TRNS
   ),
   
  [_SYM] = LAYOUT_625_bar(
diff --git a/keyboards/qpockets/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c
index b0e61490d8..cafcd61d31 100644
--- a/keyboards/qpockets/wanten/keymaps/default/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_Q,   KC_W,   KC_E,  KC_R,   KC_T,   KC_ESC,  KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
     KC_TAB,  KC_A,   KC_S,   KC_D,  KC_F,   KC_G,   KC_LSFT, KC_H,   KC_SJ,  KC_K,    KC_L,   KC_QUOT,
     KC_LSFT, KC_Z,   KC_X,   KC_C,  KC_V,   KC_B,   KC_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-    KC_LCTRL,  KC_LGUI,  KC_LALT,    		 KC_SPC,   	 KC_GUP_BSPC, 		 KC_RALT, KC_TRNS, KC_BSPC
+    KC_LCTL,  KC_LGUI,  KC_LALT,    		 KC_SPC,   	 KC_GUP_BSPC, 		 KC_RALT, KC_TRNS, KC_BSPC
   ),
   
  [_SYM] = LAYOUT_default(
diff --git a/keyboards/rate/pistachio/keymaps/rate/keymap.c b/keyboards/rate/pistachio/keymaps/rate/keymap.c
index e6f3003054..b9e93bce39 100644
--- a/keyboards/rate/pistachio/keymaps/rate/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/rate/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_H,    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,              KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    JP_AT,    JP_LBRC,           KC_HOME,
       KC_U,    KC_ENT,   KC_A,    KC_S,    KC_D,    KC_F,  KC_G,              KC_H,   KC_J,    KC_K,    KC_L,   JP_SCLN, JP_COLN,  JP_RBRC, KC_ENT,   KC_END,
       KC_VOLU, KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,              KC_N,   KC_M,    JP_COMM, JP_DOT, JP_SLSH, JP_BSLS,           KC_RSFT,  KC_PGUP,
-      KC_VOLD, KC_LCTRL, KC_LGUI, KC_LALT, KC_LALT, LT(_NUM, KC_M),  KC_SPC,  LT(_FN, KC_SPC), KC_MPLY, JP_KANA, KC_UP,  KC_DOWN,  KC_INS,  KC_RCTRL, KC_PGDN
+      KC_VOLD, KC_LCTL,  KC_LGUI, KC_LALT, KC_LALT, LT(_NUM, KC_M),  KC_SPC,  LT(_FN, KC_SPC), KC_MPLY, JP_KANA, KC_UP,  KC_DOWN,  KC_INS,  KC_RCTL,  KC_PGDN
     ),
      [_FN] = LAYOUT(
                 _______, _______, _______, _______, _______,  _______,                _______, _______, _______, _______,  _______, _______, _______, _______,
diff --git a/keyboards/rate/pistachio/keymaps/via/keymap.c b/keyboards/rate/pistachio/keymaps/via/keymap.c
index 6e36fe118d..d48711f495 100644
--- a/keyboards/rate/pistachio/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_H,    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,                   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,    JP_LBRC,           KC_HOME,
       KC_U,    KC_ENT,   KC_A,    KC_S,    KC_D,    KC_F,     KC_G,                   KC_H,   KC_J,    KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC, KC_ENT,   KC_END,
       KC_VOLU, KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,                   KC_N,   KC_M,    JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,           KC_RSFT,  KC_PGUP,
-      KC_VOLD, KC_LCTRL, KC_LGUI, KC_LALT, KC_LALT, LT(_NUM, KC_M),  KC_SPC,          LT(_FN, KC_SPC), KC_MPLY, JP_KANA, KC_UP,  KC_DOWN,  KC_INS,  KC_RCTRL,  KC_PGDN
+      KC_VOLD, KC_LCTL,  KC_LGUI, KC_LALT, KC_LALT, LT(_NUM, KC_M),  KC_SPC,          LT(_FN, KC_SPC), KC_MPLY, JP_KANA, KC_UP,  KC_DOWN,  KC_INS,   KC_RCTL,  KC_PGDN
     ),
      [_FN] = LAYOUT(
                 _______, _______, _______, _______, _______,  _______,                _______, _______, _______, _______,  _______, _______, _______, _______,
diff --git a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
index c8018a8a2c..5a543ef11c 100644
--- a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
@@ -32,7 +32,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,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       JP_EISU,       KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       KC_LSFT,         KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,               KC_RSFT,              KC_UP,
-      KC_LCTRL,  KC_LGUI,  KC_LALT,   JP_MHEN,    KC_SPC,      KC_SPC,      LT(_FN, JP_HENK),    JP_KANA,   KC_RALT,     KC_APP,    KC_RCTRL,    KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL,  KC_LGUI,  KC_LALT,   JP_MHEN,    KC_SPC,      KC_SPC,      LT(_FN, JP_HENK),    JP_KANA,   KC_RALT,     KC_APP,    KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT(
       KC_TRNS, KC_TRNS,  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/rate/pistachio_pro/keymaps/rate/keymap.c b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
index f78f9c00c2..2c216587ef 100644
--- a/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
@@ -32,7 +32,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,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       KC_ENT,        KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       KC_LSFT,         KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,               KC_RSFT,                KC_UP,
-      KC_LCTRL,  KC_LGUI,  KC_LALT,   KC_DEL,    KC_SPC,      KC_SPC,      LT(_FN, KC_ESC),     JP_KANA,   KC_RALT,     KC_APP,     KC_RCTRL,    KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL,  KC_LGUI,  KC_LALT,   KC_DEL,    KC_SPC,      KC_SPC,      LT(_FN, KC_ESC),     JP_KANA,   KC_RALT,     KC_APP,     KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT(
       KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_TRNS,
diff --git a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
index 5f9c3e6036..3e390d442f 100644
--- a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
@@ -54,7 +54,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,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       JP_EISU,       KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       KC_LSFT,         KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,               KC_RSFT,              KC_UP,
-      KC_LCTRL,  KC_LGUI,  KC_LALT,   JP_MHEN,    KC_SPC,      KC_SPC,      LT(_FN, JP_HENK),    JP_KANA,   KC_RALT,     KC_APP,    KC_RCTRL,    KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL,  KC_LGUI,  KC_LALT,   JP_MHEN,    KC_SPC,      KC_SPC,      LT(_FN, JP_HENK),    JP_KANA,   KC_RALT,     KC_APP,    KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT_via(
       KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,       KC_VOLU,KC_VOLD,KC_MPLY,
diff --git a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
index fe3d1bfd10..c29076e5e1 100644
--- a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
+++ b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
@@ -30,8 +30,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
     KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
-    KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
-    KC_LSHIFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT, KC_FN,
+    KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
+    KC_LSFT,  KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, KC_FN,
     KC_LALT,  KC_LGUI, KC_NUMS, KC_SYMS, KC_RGUI, KC_RALT
   ),
   [_NUMS] = LAYOUT(
diff --git a/keyboards/redox_w/keymaps/danielo515/keymap.c b/keyboards/redox_w/keymaps/danielo515/keymap.c
index 32d2ce3910..d500fec640 100644
--- a/keyboards/redox_w/keymaps/danielo515/keymap.c
+++ b/keyboards/redox_w/keymaps/danielo515/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,KC_BSPC ,_______ ,        _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     KC_ENTER,   KC_LSHIFT,KC_SPACE,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______
+     _______ ,_______ ,_______ ,_______ ,     KC_ENTER,   KC_LSFT  ,KC_SPACE,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   ),
 [_F] = LAYOUT(
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
index c63356b3e5..40c31c0ec4 100644
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
@@ -61,7 +61,7 @@ LAYOUT( \
       KC_TAB,  _00,     _01,      _02,     _03,     _04,     KC_LBRC,  KC_RBRC, _05,     _06,     _07,     _08,      _09,     KC_ENT,   \
       KC_CAPS, _10,     _11,      _12,     _13,     _14,     KC_LCBR,  KC_RCBR, _15,     _16,     _17,     _18,      _19,     KC_QUOT,  \
       KC_LSFT, _20,     _21,      _22,     _23,     _24,     KC_GRV,   KC_BSLS, _25,     _26,     _27,     _28,      _29,     KC_RSFT,  \
-      KC_LEFT, KC_DOWN, KC_LCTRL, KC_LALT, KC_LGUI, KC_BSPC, FN,       ADJ,     KC_SPC,  KC_RGUI, KC_RALT, KC_RCTRL, KC_UP,   KC_RIGHT, \
+      KC_LEFT, KC_DOWN, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, FN,       ADJ,     KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL,  KC_UP,   KC_RIGHT, \
                                                     KC_BSPC, FN,       ADJ,     KC_SPC \
 )
 
@@ -195,7 +195,7 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
+  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
 
   switch (keycode) {
     case QWERTY:
diff --git a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
index dde27eae24..ed94b50ea1 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
@@ -109,7 +109,7 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
+  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
 
   switch (keycode) {
     case QWERTY:
diff --git a/keyboards/ristretto/keymaps/default/keymap.c b/keyboards/ristretto/keymaps/default/keymap.c
index 064ae759eb..ccb165bf29 100644
--- a/keyboards/ristretto/keymaps/default/keymap.c
+++ b/keyboards/ristretto/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC  , KC_Q    , KC_W    , KC_E    , KC_R    , KC_T              , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_BSPC ,
 		KC_TAB  , KC_A    , KC_S    , KC_D    , KC_F    , KC_G              , KC_H    , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_QUOT ,
 		KC_LSFT , KC_Z    , KC_X    , KC_C    , KC_V    , KC_B              , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_ENT  ,
-		KC_LCTL , KC_LGUI , KC_LALT ,MO(_LOWER),KC_ENT  , KC_SPC  , KC_MUTE , KC_SPC  , KC_RSFT ,MO(_RAISE),KC_RALT , KC_RGUI , KC_RCTRL
+		KC_LCTL , KC_LGUI , KC_LALT ,MO(_LOWER),KC_ENT  , KC_SPC  , KC_MUTE , KC_SPC  , KC_RSFT ,MO(_RAISE),KC_RALT , KC_RGUI , KC_RCTL
 	),
 	[_RAISE] = LAYOUT(
 		KC_GRV	, KC_1	  , KC_2    , KC_3    , KC_4	, KC_5              , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_DEL  ,
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
index 7294a8cbed..e5610f2382 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
@@ -29,7 +29,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_BSPC,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_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_ENT,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT, MO(_FN),
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
index 700de6e6a6..690476e1ef 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
@@ -43,7 +43,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, JP_LBRC, JP_RBRC,KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT, MO(_FN),
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
index a9a4599ddb..e72e7da040 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
@@ -17,7 +17,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_BSPC,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_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_ENT,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT, MO(_L1),
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c
index 282bfaf661..d6e2fa7ffc 100644
--- a/keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ LT(_ADJUST,KC_GRV),KC_1,   KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_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_LCTRL, KC_LGUI, KC_LALT,           KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC,          KC_RALT,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTL,  KC_LGUI, KC_LALT,           KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC,          KC_RALT,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
   [_ADJUST] = LAYOUT( /* Base */
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
index d81005324a..23728e8000 100644
--- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
@@ -52,7 +52,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, JP_LBRC, JP_RBRC, JP_BSLS, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_QUOT,           KC_ENT, KC_PGDN,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_QUOT,           KC_ENT, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,   KC_UP,  KC_END,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c
index c17e1ce450..bbdff616c6 100644
--- a/keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,   KC_UP,  KC_END,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT,           KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC,          KC_RALT,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTL,  KC_LGUI, KC_LALT,           KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC,          KC_RALT,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
   [1] = LAYOUT( /* Base */
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
index 7b4e811655..af64c432a2 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
   KC_LSFT,KC_LSFT,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RGUI, MO(_FN),           KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTL,  KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RGUI, MO(_FN),           KC_LEFT, KC_DOWN,KC_RIGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
index 8f02641f0f..aaeffc6d22 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
   KC_LSFT,JP_BSLS,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,               KC_SPC, JP_HENK, JP_KANA,  KC_APP, MO(_FN),          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTL,  KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,               KC_SPC, JP_HENK, JP_KANA,  KC_APP, MO(_FN),          KC_LEFT, KC_DOWN,KC_RIGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
index 2bc17e668e..5cb816448d 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
@@ -42,7 +42,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, JP_LBRC, JP_RBRC, KC_BSPC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,TD(TD_ENT),TD(TD_ENT),KC_PGUP,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,TD(TD_ENT),TD(TD_ENT),KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
   KC_LSFT,KC_LSFT,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
index 76c614c9c2..3861780fe3 100644
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
   KC_LSFT,KC_LSFT,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RGUI, MO(_L1),           KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTL,  KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RGUI, MO(_L1),           KC_LEFT, KC_DOWN,KC_RIGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
index 4990ace769..174839796c 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,        KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI,   KC_UP, KC_LALT,  KC_SPC, KC_BSPC,  KC_DEL,     KC_BSPC,  KC_DEL,  KC_SPC, KC_RALT,   KC_UP,  KC_APP, MO(_FN),
+     KC_LCTL,  KC_LGUI,   KC_UP, KC_LALT,  KC_SPC, KC_BSPC,  KC_DEL,     KC_BSPC,  KC_DEL,  KC_SPC, KC_RALT,   KC_UP,  KC_APP, MO(_FN),
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
                KC_LEFT, KC_DOWN, KC_RGHT,                                                           KC_LEFT, KC_DOWN, KC_RGHT    
   //|--------------------------------------------------------------|   |--------------------------------------------------------------'
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
index aa82b3c628..bb8a503d57 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
@@ -36,7 +36,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_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,          KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_MINS,  KC_ENT,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,          KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_MINS,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,          KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
index d321bf7709..e38ce41c7f 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,        KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI,   KC_UP, KC_LALT,  KC_SPC, KC_BSPC,  KC_DEL,     KC_BSPC,  KC_DEL,  KC_SPC, KC_RALT,   KC_UP,  KC_APP, MO(1),
+     KC_LCTL,  KC_LGUI,   KC_UP, KC_LALT,  KC_SPC, KC_BSPC,  KC_DEL,     KC_BSPC,  KC_DEL,  KC_SPC, KC_RALT,   KC_UP,  KC_APP, MO(1),
   //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
                KC_LEFT, KC_DOWN, KC_RGHT,                                                           KC_LEFT, KC_DOWN, KC_RGHT    
   //|--------------------------------------------------------------|   |--------------------------------------------------------------'
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
index bd70552265..f98978cedc 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ LT(_ADJUST,JP_ZKHK),KC_1,  KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTL,  KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
   [_ADJUST] = LAYOUT( /* Base */
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
index b57b3da543..3f73bd8ebb 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
@@ -52,7 +52,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,   JP_AT, JP_LBRC,  KC_ENT, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_QUOT, JP_RBRC,           KC_END,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_QUOT, JP_RBRC,           KC_END,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
index bbead12487..58b3a2e64c 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ LT(1,JP_ZKHK),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
+     KC_LCTL,  KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN,KC_RIGHT
   //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
   [1] = LAYOUT( /* Base */
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c
index 9501d9709c..7d65b17d6a 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
index 4804025eb8..4b32066e77 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,        KC_MS_L, KC_MS_D, KC_MS_R,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
index 4f6a65dfa1..7764ddfdf6 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
           //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
   ),
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
index 1cdeb5a008..e2a9f9ac4d 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
@@ -31,7 +31,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, JP_LBRC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -69,7 +69,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //,-----------------------------------------------------|                 |-----------------------------------------------------.
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,
+     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
index c5707ff503..e4653b03e1 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
@@ -32,7 +32,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, JP_LBRC,              TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -44,7 +44,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, JP_LBRC,              TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_BTN1, KC_MS_U, KC_BTN2,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_BTN1, KC_MS_U, KC_BTN2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_MS_L, KC_MS_D, KC_MS_R,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -56,7 +56,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, JP_LBRC,              LCTL(KC_W),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LCTL(LSFT(KC_T)),KC_WH_U,TG(_BROWSER),
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LCTL(LSFT(KC_T)),KC_WH_U,TG(_BROWSER),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -92,7 +92,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                 RGB_VAD,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
+     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,        RGB_MOD, RGB_TOG, RGB_SAI,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
index 6ca778e691..b1ff76d017 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
@@ -35,7 +35,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, JP_LBRC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NUM,  KC_ESC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
@@ -71,7 +71,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,        RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______,
+     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,        RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,       _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
index cff7873804..9aa079804f 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
@@ -27,28 +27,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  KC_K,     KC_DOT,  KC_O,    KC_COMM,  N_Y,                      KC_V,     KC_G,    KC_C,    KC_L,    N_SS,    N_Z,
     MO(_3),  KC_H,     KC_A,    KC_E,    KC_I,     KC_U,                     KC_D,     KC_T,    KC_R,    KC_N,    KC_S,    KC_F,
     KC_LSFT, KC_X,     KC_Q,    N_AE,    N_UE,     N_OE,                     KC_B,     KC_P,    KC_W,    KC_M,    KC_J,    KC_RSFT,
-             KC_LCTRL, MO(_4),  KC_HOME, KC_LALT,  KC_ENTER,  N_COPY, N_PASTE, KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, MO(_7)
+             KC_LCTL,  MO(_4),  KC_HOME, KC_LALT,  KC_ENTER,  N_COPY, N_PASTE, KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, MO(_7)
   ),
 
   [_3] = LAYOUT( /* Layer 3 */
     KC_ESC,  N_DOTS,   N_USC,   N_LSQBR, N_RSQBR, N_CIRC,                   N_EXKL,   N_LT,    N_GT,    N_EQ,    N_AMP,   KC_TRNS,
     KC_TRNS, N_BSLS,   N_SLSH,  N_LCUBR, N_RCUBR, N_ASTR,                   N_QUES,   N_LPARN, N_RPARN, N_MINS,  N_COLN,  N_AT,
     KC_LSFT, N_HASH,   N_DLR,   N_PIPE,  N_TILD,  N_GRAVE,                  N_PLUS,   N_PERC,  N_QUOT,  N_SING,  N_SEMI,  KC_RSFT,
-             KC_LCTRL, KC_TRNS, KC_HOME, KC_LALT, KC_ENTER,  N_COPY, N_PASTE, KC_SPC, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS
+             KC_LCTL,  KC_TRNS, KC_HOME, KC_LALT, KC_ENTER,  N_COPY, N_PASTE, KC_SPC, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS
   ),
 
   [_4] = LAYOUT( /* Layer 4 */
     KC_ESC,  KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,   KC_PGDN,                    KC_KP_SLASH,    KC_7,    KC_8,    KC_9,    KC_KP_MINUS, KC_TRNS,
     KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END,                     KC_KP_ASTERISK, KC_4,    KC_5,    KC_6,    KC_KP_PLUS,  KC_TRNS,
     KC_LSFT, KC_ESC,  KC_TAB,  KC_INS,  KC_SPC,   N_UNDO,                     KC_KP_ENTER,    KC_1,    KC_2,    KC_3,    KC_KP_DOT,   KC_RSFT,
-             KC_LCTRL, KC_TRNS, KC_HOME, KC_LALT, KC_ENTER,  N_COPY, N_PASTE, KC_0,           KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS
+             KC_LCTL, KC_TRNS, KC_HOME, KC_LALT, KC_ENTER,  N_COPY, N_PASTE, KC_0,           KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
   [_7] = LAYOUT( /* Layer 7 */
     KC_ESC,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
     KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                           RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
-             KC_LCTRL,     KC_TRNS,    KC_HOME,    KC_LALT,     KC_ENTER,  N_COPY, N_PASTE, KC_SPC, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS
+             KC_LCTL,      KC_TRNS,    KC_HOME,    KC_LALT,     KC_ENTER,  N_COPY, N_PASTE, KC_SPC, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS
   )
 
 };
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c
index a84e7f1173..6fa06a4901 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-                 MO(3),KC_LCTRL, KC_LALT, KC_LGUI,   MO(1),  KC_SPC,  KC_SPC,   MO(2), KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
+                 MO(3),KC_LCTL,  KC_LALT, KC_LGUI,   MO(1),  KC_SPC,  KC_SPC,   MO(2), KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
index 0c663e1b4d..726bb6e8b5 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-                 MO(3),KC_LCTRL, KC_LALT, KC_LGUI,   MO(1),  KC_SPC,  KC_SPC,   MO(2), KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
+                 MO(3),KC_LCTL,  KC_LALT, KC_LGUI,   MO(1),  KC_SPC,  KC_SPC,   MO(2), KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
index 8b1f5e9362..41d8d147d8 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
@@ -24,9 +24,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    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_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC, KC_SPC,MO(_RAISE),KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC, KC_SPC,MO(_RAISE),KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
index 58f8d269c1..9d6021e844 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
@@ -31,9 +31,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LCTRL,    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_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
index 450d166228..960ad2b763 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-     KC_LCTRL,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL,
+     KC_LCTL,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE),KC_LEFT,KC_DOWN,   KC_UP,KC_RIGHT
+           MO(_ADJUST),KC_LCTL,  KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE),KC_LEFT,KC_DOWN,   KC_UP,KC_RIGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
index eef869f641..a845ebe57e 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
@@ -34,7 +34,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, JP_LBRC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -93,7 +93,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,
+     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
index a5221cb8f2..ff3a787576 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
@@ -45,7 +45,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, JP_LBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_LEFT, KC_DOWN,KC_RIGHT,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -129,7 +129,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),   _ADJUST, RGB_SAD, RGB_VAI,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,        RGB_MOD, RGB_TOG, RGB_SAI,
+     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,        RGB_MOD, RGB_TOG, RGB_SAI,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
index dd26f82f34..c7d783fe8b 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
@@ -43,7 +43,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, JP_LBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
@@ -99,7 +99,7 @@ SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XX
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),          RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,       _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
+     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,       _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),            RGB_MOD,        RGB_TOG,_______,_______,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c
index 9921858717..abf68eab65 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    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_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               KC_TILD,KC_LCTRL, KC_LALT, KC_LGUI,   MO(1),  KC_SPC,  KC_SPC,   MO(2), KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
+               KC_TILD,KC_LCTL,  KC_LALT, KC_LGUI,   MO(1),  KC_SPC,  KC_SPC,   MO(2), KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c
index 799a6c30db..1b947ac4a9 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
       KC_PGDN,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LCBR, KC_RCBR,
   //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-              KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_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_ENT,
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
                KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
index 80e916f14d..5ccb02ee8a 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
  TG(_BROWSER),  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC, \
   //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-              KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT, \
+              KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT, \
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
                KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT, \
   //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
index ef16e583cb..1272a2fe2d 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
    TG(_BROWSER),  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC,              KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
     //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,              KC_P7,    KC_P8,   KC_P9,
+                KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,              KC_P7,    KC_P8,   KC_P9,
     //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
                  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT,              KC_P4,    KC_P5,   KC_P6,   KC_PPLS,
     //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c
index 54bfb6277b..42581c5979 100644
--- a/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,          KC_RALT, KC_RGUI, MO(_FN),           KC_LEFT,KC_DOWN, KC_RGHT
+     KC_LCTL,  KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,          KC_RALT, KC_RGUI, MO(_FN),           KC_LEFT,KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
index 4ccd67bf04..1853c1b58e 100644
--- a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
@@ -44,7 +44,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, JP_LBRC, JP_RBRC, KC_BSLS,  KC_END,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,           KC_ENT, KC_PGUP,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,           KC_ENT, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c
index 79ec55ef45..32a493c79d 100644
--- a/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,          KC_RALT, KC_RGUI, MO(_L1),           KC_LEFT,KC_DOWN, KC_RGHT
+     KC_LCTL,  KC_LGUI, KC_LALT,  KC_SPC,  KC_SPC,               KC_SPC,          KC_RALT, KC_RGUI, MO(_L1),           KC_LEFT,KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
index fe73a67ff0..d5e4eeb533 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ LT(_FN,KC_CAPS),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT,   KC_UP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
+     KC_LCTL,  KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
index 530bbe2683..314889c2b2 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
@@ -42,7 +42,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,   JP_AT, JP_LBRC,  KC_ENT, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS, JP_RBRC,          KC_PGDN,
+     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS, JP_RBRC,          KC_PGDN,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT,   KC_UP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
index fba5941c72..9e9249c21f 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ LT(1,KC_CAPS),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT,   KC_UP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTRL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
+     KC_LCTL,  KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,      KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
   //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
   ),
 
diff --git a/keyboards/satt/comet46/config.h b/keyboards/satt/comet46/config.h
index f14a389382..f67dcc1761 100644
--- a/keyboards/satt/comet46/config.h
+++ b/keyboards/satt/comet46/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // Define masks for modifiers
-#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
+#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL))
 #define MODS_ALT_MASK  (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
 #define MODS_GUI_MASK  (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
index acf11a7828..577aa09f8a 100644
--- a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
+++ b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // L_LEFT
     LAYOUT(
     _______, XXXXXXX,   XXXXXXX, KC_EQL,  KC_PERC, KC_AT,        COPY,     KC_UNDS, KC_HASH, RALT(KC_SPC), KC_PLUS,  _______,
-    _______, KC_LSHIFT, KC_LALT, KC_LCTL, KC_LGUI, KC_HYPR,      KC_LEFT,  KC_DOWN, KC_UP,   KC_RIGHT,     KC_LBRC,  KC_RBRC,
+    _______, KC_LSFT,   KC_LALT, KC_LCTL, KC_LGUI, KC_HYPR,      KC_LEFT,  KC_DOWN, KC_UP,   KC_RIGHT,     KC_LBRC,  KC_RBRC,
     _______, XXXXXXX,   KC_EXLM, KC_CIRC, XXXXXXX, KC_HOME,      KC_END,   KC_MINS, KC_LPRN, KC_RPRN,      PASTE,    XXXXXXX,
     _______, KC_BRID,   KC_BRIU, _______, _______,  _______,     _______, _______, _______,  KC_VOLD,      KC_VOLU,  _______),
 
diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c
index ceaee389c7..56aabe54d7 100644
--- a/keyboards/silverbullet44/keymaps/default/keymap.c
+++ b/keyboards/silverbullet44/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
     KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T,                KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_EQL,
     KC_LSFT,   KC_A, KC_S, KC_D, KC_F, KC_G,                KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-    KC_LCTRL,  KC_Z, KC_X, KC_C, KC_V, KC_B,                KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
+    KC_LCTL,   KC_Z, KC_X, KC_C, KC_V, KC_B,                KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
      LALT_T(KC_F5), KC_BSPC, LSFT_T(KC_SPC), CALC,    CUSL, LCTL_T(KC_ENT), KC_DEL, GUI_T(KC_F12)
   ),
 
diff --git a/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c b/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c
index 4f48a595f5..e8ee531ed3 100644
--- a/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c
+++ b/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi_split_bs_shift(
       KC_ESC,      KC_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_LCTRL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        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_ENT,
       KC_LSFT,     KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,  KC_RSFT,   KC_END,
       KC_CAPS,  KC_LGUI,  KC_LALT,                        LT(1,KC_SPC),                   KC_RALT,  KC_RGUI, TG(1),   KC_RCTL),
     [1] = LAYOUT_60_ansi_split_bs_shift(
diff --git a/keyboards/smk60/keymaps/60_hhkb/keymap.c b/keyboards/smk60/keymaps/60_hhkb/keymap.c
index e4742f5b18..eb42faecc8 100644
--- a/keyboards/smk60/keymaps/60_hhkb/keymap.c
+++ b/keyboards/smk60/keymaps/60_hhkb/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_60_hhkb(
       KC_ESC,      KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS, KC_GRV,
       KC_TAB,      KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSPC,
-      KC_LCTRL,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        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_ENT,
       KC_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_LGUI,  KC_LALT,                        KC_SPC,                          KC_RALT,  MO(1)),
     [1] = LAYOUT_60_hhkb(
diff --git a/keyboards/smk60/keymaps/60_wkl/keymap.c b/keyboards/smk60/keymaps/60_wkl/keymap.c
index 4345998a9c..8b16d29898 100644
--- a/keyboards/smk60/keymaps/60_wkl/keymap.c
+++ b/keyboards/smk60/keymaps/60_wkl/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_60_wkl(
       KC_GRV,      KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,  KC_EQL, KC_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_LCTRL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        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_ENT,
       KC_LSFT,     KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,  KC_DEL,
       KC_CAPS,  KC_LGUI,  KC_LALT,                        LT(1,KC_SPC),                   KC_RALT,  TG(1),   KC_RCTL),
     [1] = LAYOUT_60_wkl(
diff --git a/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c b/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c
index 12c4b8ce41..ef48f3a4bb 100644
--- a/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c
+++ b/keyboards/smk60/keymaps/60_wkl_split_bs/keymap.c
@@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_60_wkl_split_bs(
       KC_ESC,      KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_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_LCTRL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        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_ENT,
       KC_LSFT,     KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,  KC_RSFT,   KC_END,
       KC_CAPS,  KC_LGUI,  KC_LALT,                        LT(1,KC_SPC),                   KC_RALT,  TG(1),   KC_RCTL),
     [1] = LAYOUT_60_wkl_split_bs(
diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c
index 905c3ca85c..2fc27b816d 100644
--- a/keyboards/sofle/keymaps/default/keymap.c
+++ b/keyboards/sofle/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
   KC_TAB,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     XXXXXXX,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL, KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL, KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /*
  * COLEMAK
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,  KC_BSPC,
   KC_TAB,   KC_A,   KC_R,    KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,      XXXXXXX,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/sofle/keymaps/devdev/keymap.c b/keyboards/sofle/keymaps/devdev/keymap.c
index b8a79de69d..310f5f2785 100644
--- a/keyboards/sofle/keymaps/devdev/keymap.c
+++ b/keyboards/sofle/keymaps/devdev/keymap.c
@@ -109,9 +109,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   KC_LSFT,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
-  KC_LCTRL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  KC_MUTE,  KC_D_MUTE,KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,
+  KC_LCTL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  KC_MUTE,  KC_D_MUTE,KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
-                 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC,  KC_ENT   ,     KC_SPC, KC_ENT ,  KC_RAISE, KC_RCTRL, KC_RALT
+                 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC,  KC_ENT   ,     KC_SPC, KC_ENT ,  KC_RAISE, KC_RCTL, KC_RALT
   //            \--------+--------+--------+---------+-------|   |--------+---------+--------+---------+-------/
 ),
 
diff --git a/keyboards/sofle/keymaps/flare576/keymap.c b/keyboards/sofle/keymaps/flare576/keymap.c
index e9e34edb9c..b4d1257896 100644
--- a/keyboards/sofle/keymaps/flare576/keymap.c
+++ b/keyboards/sofle/keymaps/flare576/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,         KC_1, KC_2,      KC_3,    KC_4,             KC_5,                                KC_6,    KC_7,          KC_8,    KC_9,     KC_0,    KC_MINS,
   RALT_T(KC_TAB), KC_Q, KC_W,      KC_E,    KC_R,             KC_T,                                KC_Y,    KC_U,          KC_I,    KC_O,     KC_P,    KC_BSLS,
   KC_LSFT,        KC_A, KC_S,      KC_D,    KC_F,             KC_G,                                KC_H,    KC_J,          KC_K,    KC_L,     KC_SCLN, KC_QUOT,
-  KC_LCTRL,       KC_Z, KC_X,      KC_C,    KC_V,             KC_B,    KC_TPLY, KC_THME,           KC_N,    KC_M,          KC_COMM, KC_DOT,   KC_SLSH, RSFT_T(KC_PLUS),
+  KC_LCTL,        KC_Z, KC_X,      KC_C,    KC_V,             KC_B,    KC_TPLY, KC_THME,           KC_N,    KC_M,          KC_COMM, KC_DOT,   KC_SLSH, RSFT_T(KC_PLUS),
                         TG(_ESDF), KC_LALT, LT(_SYMS,KC_ESC), KC_LGUI, KC_SPC,  LT(_MOUS, KC_ENT), KC_BSPC, RSFT(KC_RALT), KC_DEL,  TG(_FF14)
 ),
 
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,       KC_7,       KC_8,          KC_9,         KC_0,          KC_EQL,
   KC_T,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,                      RCTL(KC_Y), RCTL(KC_U), RCTL(KC_I),    RCTL(KC_O),   RCTL(KC_P),    KC_PGUP,
   KC_G,   KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,                      RCTL(KC_H), RCTL(KC_J), RCTL(KC_K),    RCTL(KC_L),   RCTL(KC_SCLN), KC_PGDN,
-  KC_LCTRL, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, RCTL(KC_N), RCTL(KC_M), RCTL(KC_COMM), RCTL(KC_DOT), RCTL(KC_SLSH), KC_M,
+  KC_LCTL, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, RCTL(KC_N), RCTL(KC_M), RCTL(KC_COMM), RCTL(KC_DOT), RCTL(KC_SLSH), KC_M,
                    _______, XXXXXXX, _______, _______, _______, _______, _______,    KC_PSCR,    _______,       TO(_FF14)
 )
 };
diff --git a/keyboards/sofle/keymaps/foureight84/keymap.c b/keyboards/sofle/keymaps/foureight84/keymap.c
index b2dd6a3cd6..bd0c50ffa4 100644
--- a/keyboards/sofle/keymaps/foureight84/keymap.c
+++ b/keyboards/sofle/keymaps/foureight84/keymap.c
@@ -63,9 +63,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT( \
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_BSPC, \
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSLS, \
-  KC_LCTRL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT, \
+  KC_LCTL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT, \
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     XXXXXXX,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT, \
-                 KC_LBRC ,KC_LGUI, KC_LALT, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RBRC \
+                 KC_LBRC ,KC_LGUI, KC_LALT, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RBRC \
 ),
 /*
  * COLEMAK
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,  KC_BSPC, \
   KC_TAB,   KC_A,   KC_R,    KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT, \
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,      XXXXXXX,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT, \
-                 KC_LGUI,KC_LALT,KC_LCTRL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \
+                 KC_LGUI,KC_LALT,KC_LCTL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI \
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/sofle/keymaps/helltm/keymap.c b/keyboards/sofle/keymaps/helltm/keymap.c
index d2a212b989..7ea73b6339 100644
--- a/keyboards/sofle/keymaps/helltm/keymap.c
+++ b/keyboards/sofle/keymaps/helltm/keymap.c
@@ -63,7 +63,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_GRV,
   KC_CAPS,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_GAMING,     KC_QWERTY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_BSLS,
-                 KC_LGUI,KC_LALT,KC_LAYER, KC_LCTRL, KC_ENT,      KC_SPC,  KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
+                 KC_LGUI,KC_LALT,KC_LAYER, KC_LCTL, KC_ENT,      KC_SPC,  KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
 ),
 
 /*
@@ -87,7 +87,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_GRV,
   KC_CAPS,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_UP,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MPLY,     KC_MUTE,KC_N,    KC_M, KC_COMM,  KC_LEFT, KC_DOWN,  KC_RIGHT,
-                 KC_LGUI,KC_LALT,KC_LAYER, KC_LCTRL, KC_SPC,      KC_ENT,  KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
+                 KC_LGUI,KC_LALT,KC_LAYER, KC_LCTL, KC_SPC,      KC_ENT,  KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
 ),
 
 /* LOWER
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c b/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
index 1b50ca727b..87677c78af 100644
--- a/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
+++ b/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
@@ -38,7 +38,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_BSPC,
   MT(MOD_LCTL, KC_ESC), KC_A,    KC_S,    KC_D,     KC_F,  KC_G,                   KC_H,    KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,              KC_Z,    KC_X,    KC_C,     KC_V,  KC_B, TO(2),     TO(1), KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT,
-                        KC_LGUI, KC_LALT, KC_LCTRL, MO(2), KC_ENT,                 KC_SPC,  MO(1),   KC_RCTRL, KC_RALT, KC_RGUI
+                        KC_LGUI, KC_LALT, KC_LCTL,  MO(2), KC_ENT,                 KC_SPC,  MO(1),   KC_RCTL,  KC_RALT, KC_RGUI
 ),
 /* RAISE
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/sofle/keymaps/keyhive_via/keymap.c b/keyboards/sofle/keymaps/keyhive_via/keymap.c
index 878638e1a2..032c834f44 100644
--- a/keyboards/sofle/keymaps/keyhive_via/keymap.c
+++ b/keyboards/sofle/keymaps/keyhive_via/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_ESC, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_VOLU,       KC_PGUP, KC_Y    , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
    KC_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_MUTE,       KC_NO  , KC_H    , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_VOLD,       KC_PGDN, KC_N    , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-                  KC_LGUI,KC_LALT ,KC_LCTRL,MO(_LOWER), KC_ENT ,           KC_SPC  ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
+                  KC_LGUI,KC_LALT ,KC_LCTL,MO(_LOWER), KC_ENT ,           KC_SPC  ,MO(_RAISE),KC_RCTL, KC_RALT, KC_RGUI
 ),
 /*
  * COLEMAK - Vanilla
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_VOLU,       KC_PGUP,  KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
   KC_TAB , KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_MUTE,       KC_NO  ,  KC_H    , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_VOLD,       KC_PGDN,  KC_N    , KC_M   , KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-                  KC_LGUI, KC_LALT,KC_LCTRL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
+                  KC_LGUI, KC_LALT,KC_LCTL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTL, KC_RALT, KC_RGUI
 ),
 */
 
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC , KC_Q   , KC_W   , KC_F   , KC_P   , KC_B   , KC_VOLU,       KC_PGUP,  KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
   KC_TAB , KC_A   , KC_R   , KC_S   , KC_T   , KC_G   , KC_MUTE,       KC_NO  ,  KC_M    , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_D   , KC_V   , KC_VOLD,       KC_PGDN,  KC_K    , KC_H   , KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-                  KC_LGUI, KC_LALT,KC_LCTRL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
+                  KC_LGUI, KC_LALT,KC_LCTL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTL, KC_RALT, KC_RGUI
 ),
 
 /* LOWER
diff --git a/keyboards/sofle/keymaps/killmaster/keymap.c b/keyboards/sofle/keymaps/killmaster/keymap.c
index f28f0aa466..c601edd727 100644
--- a/keyboards/sofle/keymaps/killmaster/keymap.c
+++ b/keyboards/sofle/keymaps/killmaster/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
   KC_TAB,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSPO,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSPC,
-                 KC_LGUI,KC_LALT,KC_LCTRL, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/sofle/keymaps/michal/keymap.c b/keyboards/sofle/keymaps/michal/keymap.c
index 1e0d16eab9..24ed97dcbe 100644
--- a/keyboards/sofle/keymaps/michal/keymap.c
+++ b/keyboards/sofle/keymaps/michal/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,   KC_D,    KC_R,    KC_W,     KC_B,                            KC_J,     KC_F,     KC_U,    KC_P,   KC_SCLN, KC_BSPC,
   KC_TAB,  KC_A,   KC_S,    KC_H,    KC_T,     KC_G,                            KC_Y,     KC_N,     KC_E,    KC_O,   KC_I,    KC_QUOT,
   KC_LSFT, KC_Z,   KC_X,    KC_M,    KC_C,     KC_V,     XXXXXXX,      KC_MUTE, KC_K,     KC_L,     KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-                   KC_LGUI, KC_LALT, KC_LCTRL, KC_LOWER, KC_ENT,       KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                   KC_LGUI, KC_LALT, KC_LCTL,  KC_LOWER, KC_ENT,       KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 
 /*
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,   KC_W,    KC_E,    KC_R,     KC_T,                           KC_Y,       KC_U,     KC_I,    KC_O,   KC_P,    KC_BSPC,
   KC_TAB,  KC_A,   KC_S,    KC_D,    KC_F,     KC_G,                           KC_H,       KC_J,     KC_K,    KC_L,   KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,   KC_X,    KC_C,    KC_V,     KC_B,     XXXXXXX,     KC_MUTE, KC_N,       KC_M,     KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-                   KC_LGUI, KC_LALT, KC_LCTRL, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                   KC_LGUI, KC_LALT, KC_LCTL,  KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 
 /* MIDI
diff --git a/keyboards/sofle/keymaps/noqmk/keymap.c b/keyboards/sofle/keymaps/noqmk/keymap.c
index 29afbcb842..209118b4c9 100644
--- a/keyboards/sofle/keymaps/noqmk/keymap.c
+++ b/keyboards/sofle/keymaps/noqmk/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,  KC_BSPC,
   KC_TAB,   KC_A,   KC_R,    KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,      KC_CAPS ,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_PSCR
+                 KC_LGUI,KC_LALT,KC_LCTL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_PSCR
 ),
 /*
  * QWERTY
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
   KC_TAB,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,       KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-  KC_LGUI,KC_LALT,KC_LCTRL, KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_PSCR
+  KC_LGUI,KC_LALT,KC_LCTL, KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_PSCR
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
@@ -137,9 +137,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_GAME] = LAYOUT(
   KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_GRV,
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
-  KC_LCTRL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
+  KC_LCTL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,       KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-  KC_LGUI,KC_LALT,KC_SPC, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTRL, KC_RALT, KC_PSCR
+  KC_LGUI,KC_LALT,KC_SPC, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_PSCR
 ),
 /* ADJUST
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index 67d7c5cee8..6e0e209e04 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -109,9 +109,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   KC_LSFT,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
-  KC_LCTRL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  KC_MUTE,  KC_D_MUTE,KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,
+  KC_LCTL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  KC_MUTE,  KC_D_MUTE,KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
-                 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC,  KC_ENT   ,     KC_SPC, KC_ENT ,  KC_RAISE, KC_RCTRL, KC_RALT
+                 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC,  KC_ENT   ,     KC_SPC, KC_ENT ,  KC_RAISE, KC_RCTL, KC_RALT
   //            \--------+--------+--------+---------+-------|   |--------+---------+--------+---------+-------/
 ),
 
diff --git a/keyboards/sofle/keymaps/via/keymap.c b/keyboards/sofle/keymaps/via/keymap.c
index b8bbe195fe..4c83e58f7d 100644
--- a/keyboards/sofle/keymaps/via/keymap.c
+++ b/keyboards/sofle/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
   KC_TAB,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     XXXXXXX,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL, MO(2), KC_ENT,      KC_SPC,  MO(3), KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL, MO(2), KC_ENT,      KC_SPC,  MO(3), KC_RCTL, KC_RALT, KC_RGUI
 ),
 /*
  * COLEMAK
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,  KC_BSPC,
   KC_TAB,   KC_A,   KC_R,    KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,      XXXXXXX,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL,KC_TRNS, KC_ENT,      KC_SPC,  KC_TRNS, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL,KC_TRNS, KC_ENT,      KC_SPC,  KC_TRNS, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/sowbug/68keys/keymaps/default/keymap.c b/keyboards/sowbug/68keys/keymaps/default/keymap.c
index 74261ca235..b8c34f9525 100644
--- a/keyboards/sowbug/68keys/keymaps/default/keymap.c
+++ b/keyboards/sowbug/68keys/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN,
     KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-    KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RALT, KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
   [_FN1] = LAYOUT(
diff --git a/keyboards/sparrow62/keymaps/default/keymap.c b/keyboards/sparrow62/keymaps/default/keymap.c
index af3deee490..0d116a970a 100644
--- a/keyboards/sparrow62/keymaps/default/keymap.c
+++ b/keyboards/sparrow62/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // |-------+-------+-------+-------+-------+-------+-------\ /-------+-------+-------+-------+-------+-------+-------|
         KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_6,     KC_6,   KC_U,   KC_I,   KC_O,   KC_P,  KC_LBRC,KC_RBRC,
     // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-       KC_LCTRL, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_Y,     KC_Y,   KC_H,   KC_J,   KC_K,   KC_L,  KC_SCLN,KC_QUOT,
+       KC_LCTL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_Y,     KC_Y,   KC_H,   KC_J,   KC_K,   KC_L,  KC_SCLN,KC_QUOT,
     // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
         KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  KC_LBRC,  KC_RBRC, KC_N,   KC_M,  KC_COMM, KC_DOT,KC_SLSH,KC_BSLS,
     // \-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------/
diff --git a/keyboards/sparrow62/keymaps/via/keymap.c b/keyboards/sparrow62/keymaps/via/keymap.c
index ca39ada243..4cc18a3ae0 100644
--- a/keyboards/sparrow62/keymaps/via/keymap.c
+++ b/keyboards/sparrow62/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // |-------+-------+-------+-------+-------+-------+-------\ /-------+-------+-------+-------+-------+-------+-------|
         KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_6,     KC_6,   KC_U,   KC_I,   KC_O,   KC_P,  KC_LBRC,KC_RBRC,
     // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-       KC_LCTRL, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_Y,     KC_Y,   KC_H,   KC_J,   KC_K,   KC_L,  KC_SCLN,KC_QUOT,
+       KC_LCTL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_Y,     KC_Y,   KC_H,   KC_J,   KC_K,   KC_L,  KC_SCLN,KC_QUOT,
     // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
         KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  KC_LBRC,  KC_RBRC, KC_N,   KC_M,  KC_COMM, KC_DOT,KC_SLSH,KC_BSLS,
     // \-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------/
diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
index 6201eeebd3..d6bb026d26 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
       KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
       KC_LEAD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, KC_GRV, TT(FUNCS), KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
-      KC_LSFT, KC_LALT, KC_LGUI, LT(LOWER, KC_SPC), LT(RAISE, KC_ENT), LT(RAISE, KC_ENT), LT(LOWER, KC_SPC), KC_BSPC, KC_LCTRL, KC_RSFT
+      KC_LSFT, KC_LALT, KC_LGUI, LT(LOWER, KC_SPC), LT(RAISE, KC_ENT), LT(RAISE, KC_ENT), LT(LOWER, KC_SPC), KC_BSPC, KC_LCTL, KC_RSFT
       ),
   [LOWER] = LAYOUT(
       _______, KC_EXLM, KC_AT, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/studiokestra/galatea/keymaps/default/keymap.c b/keyboards/studiokestra/galatea/keymaps/default/keymap.c
index 29693ca8c7..e2b187ef9c 100644
--- a/keyboards/studiokestra/galatea/keymaps/default/keymap.c
+++ b/keyboards/studiokestra/galatea/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,               KC_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,    MO(1),                          KC_UP,          
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,           KC_RALT,          KC_RGUI,  KC_APP,   KC_RCTRL,                          KC_LEFT, KC_DOWN, KC_RIGHT ),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,           KC_RALT,          KC_RGUI,  KC_APP,   KC_RCTL,                           KC_LEFT, KC_DOWN, KC_RIGHT ),
 
     [_FN] = LAYOUT_all(
     QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/studiokestra/galatea/keymaps/via/keymap.c b/keyboards/studiokestra/galatea/keymaps/via/keymap.c
index 9803d0dc07..504f5b90b0 100644
--- a/keyboards/studiokestra/galatea/keymaps/via/keymap.c
+++ b/keyboards/studiokestra/galatea/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,               KC_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,    MO(1),                          KC_UP,          
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,           KC_RALT,          KC_RGUI,  KC_APP,   KC_RCTRL,                          KC_LEFT, KC_DOWN, KC_RIGHT ),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,           KC_RALT,          KC_RGUI,  KC_APP,   KC_RCTL,                           KC_LEFT, KC_DOWN, KC_RIGHT ),
 
     [_FN1] = LAYOUT_all(
     QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/tada68/keymaps/abishalom/keymap.c b/keyboards/tada68/keymaps/abishalom/keymap.c
index 010d506791..92088eb9ee 100644
--- a/keyboards/tada68/keymaps/abishalom/keymap.c
+++ b/keyboards/tada68/keymaps/abishalom/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   LT(_FL, KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SEMI_FN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/cheese/keymap.c b/keyboards/tada68/keymaps/cheese/keymap.c
index b2395282c3..a026f82a3d 100755
--- a/keyboards/tada68/keymaps/cheese/keymap.c
+++ b/keyboards/tada68/keymaps/cheese/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,    KC_PGUP, \
   MO(_CL),  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,  KC_ENT,           KC_PGDN,  \
   KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,        KC_UP,  KC_DEL, \
-  KC_LCTL, KC_LALT,LM(_AL,0x08),                KC_SPC,                       LM(_AL,0x18),MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LALT,LM(_AL,0x08),                KC_SPC,                       LM(_AL,0x18),MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/devinceble/keymap.c b/keyboards/tada68/keymaps/devinceble/keymap.c
index 0fddd0ada3..d0a1bf9ca3 100755
--- a/keyboards/tada68/keymaps/devinceble/keymap.c
+++ b/keyboards/tada68/keymaps/devinceble/keymap.c
@@ -22,7 +22,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_BSPC,KC_DEL, \
     KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
     KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,MO(1),KC_PGDN, \
-    MO(2), KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RCTRL, KC_LEFT,KC_DOWN,KC_UP,KC_RGHT),
+    MO(2), KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_UP,KC_RGHT),
 
     [1] = LAYOUT_ansi(
     _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
diff --git a/keyboards/tada68/keymaps/dlg/keymap.c b/keyboards/tada68/keymaps/dlg/keymap.c
index 32532e0f3f..275b5a48d8 100755
--- a/keyboards/tada68/keymaps/dlg/keymap.c
+++ b/keyboards/tada68/keymaps/dlg/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL , \
   KC_LCTL, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,      KC_PGUP, \
   KC_LSFT,          KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,  KC_PGDN, \
-  KC_LCTL, KC_LGUI, LM(_LA, MOD_LALT),      KC_SPC,                          KC_RALT, MO(_FL), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT),
+  KC_LCTL, KC_LGUI, LM(_LA, MOD_LALT),      KC_SPC,                          KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/emdarcher/keymap.c b/keyboards/tada68/keymaps/emdarcher/keymap.c
index 4fa518e1c5..6c459c2db0 100755
--- a/keyboards/tada68/keymaps/emdarcher/keymap.c
+++ b/keyboards/tada68/keymaps/emdarcher/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL,
   KC_X0,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN,
-  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer for FN key
    */
diff --git a/keyboards/tada68/keymaps/fezzant/keymap.c b/keyboards/tada68/keymaps/fezzant/keymap.c
index d3c1b6e865..2ca9178530 100644
--- a/keyboards/tada68/keymaps/fezzant/keymap.c
+++ b/keyboards/tada68/keymaps/fezzant/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DELETE, \
   LT(_BSPC,KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_HOME,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_END, \
-  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/tada68/keymaps/laas/keymap.c b/keyboards/tada68/keymaps/laas/keymap.c
index 1a8cd6f0c1..ea02d794af 100755
--- a/keyboards/tada68/keymaps/laas/keymap.c
+++ b/keyboards/tada68/keymaps/laas/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
   * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/pascamel/keymap.c b/keyboards/tada68/keymaps/pascamel/keymap.c
index 1e7499f66b..8bc118279c 100755
--- a/keyboards/tada68/keymaps/pascamel/keymap.c
+++ b/keyboards/tada68/keymaps/pascamel/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        MO(_FL),KC_RCTRL,KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        MO(_FL),KC_RCTL, KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/raylas/keymap.c b/keyboards/tada68/keymaps/raylas/keymap.c
index 2845163a2f..12ecaed31d 100755
--- a/keyboards/tada68/keymaps/raylas/keymap.c
+++ b/keyboards/tada68/keymaps/raylas/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        MO(_FL),KC_RCTRL,KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        MO(_FL),KC_RCTL, KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/rbong/keymap.c b/keyboards/tada68/keymaps/rbong/keymap.c
index 03c4d78392..dc7d0cbf70 100644
--- a/keyboards/tada68/keymaps/rbong/keymap.c
+++ b/keyboards/tada68/keymaps/rbong/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   CAPSDUAL, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  TRMEXIT,  KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  TRMEXIT,  KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/rgb/keymap.c b/keyboards/tada68/keymaps/rgb/keymap.c
index dde3521f19..572ec36009 100755
--- a/keyboards/tada68/keymaps/rgb/keymap.c
+++ b/keyboards/tada68/keymaps/rgb/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/shalzz/keymap.c b/keyboards/tada68/keymaps/shalzz/keymap.c
index e2b4c170e5..8839b4feac 100644
--- a/keyboards/tada68/keymaps/shalzz/keymap.c
+++ b/keyboards/tada68/keymaps/shalzz/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_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_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LGUI,KC_LALT,            LT(_BL, KC_SPC),                    MO(_FL),KC_RALT,KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LGUI,KC_LALT,            LT(_BL, KC_SPC),                    MO(_FL),KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/stephengrier/keymap.c b/keyboards/tada68/keymaps/stephengrier/keymap.c
index 96f6b2bf22..b3bf7875ef 100755
--- a/keyboards/tada68/keymaps/stephengrier/keymap.c
+++ b/keyboards/tada68/keymaps/stephengrier/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   MO(_FL), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/trashcat/keymap.c b/keyboards/tada68/keymaps/trashcat/keymap.c
index 5c7019731d..473df9770a 100644
--- a/keyboards/tada68/keymaps/trashcat/keymap.c
+++ b/keyboards/tada68/keymaps/trashcat/keymap.c
@@ -45,9 +45,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_ansi(
   KC_ESC, TD(TD_F1), TD(TD_F2), TD(TD_F3), TD(TD_F4), TD(TD_F5), TD(TD_F6), TD(TD_F7), TD(TD_F8), TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), KC_BSLS,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSPC,KC_DEL, \
-  KC_LCTRL, KC_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_LCTL, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        MO(_FL),KC_RALT,KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        MO(_FL),KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
@@ -87,7 +87,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_BSPC,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LGUI,KC_LALT,                _______,                        MO(_FL),KC_RALT,KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LGUI,KC_LALT,                _______,                        MO(_FL),KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
 };
 
diff --git a/keyboards/tada68/keymaps/tshack/keymap.c b/keyboards/tada68/keymaps/tshack/keymap.c
index 3bffa36dc4..0246acad36 100755
--- a/keyboards/tada68/keymaps/tshack/keymap.c
+++ b/keyboards/tada68/keymaps/tshack/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL , \
   KC_LCTL, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,      KC_PGUP, \
   KC_LSFT,          KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,  KC_PGDN, \
-  MO(_FL), KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(_FL), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT),
+  MO(_FL), KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(_FL), KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/tada68/keymaps/unix/keymap.c b/keyboards/tada68/keymaps/unix/keymap.c
index c7073fa694..d3362854f9 100644
--- a/keyboards/tada68/keymaps/unix/keymap.c
+++ b/keyboards/tada68/keymaps/unix/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_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_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,KC_PGDN, \
-  KC_LCTL, KC_LGUI,KC_LALT,            LT(_FL, KC_SPC),                    KC_RALT,MO(_FL),KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+  KC_LCTL, KC_LGUI,KC_LALT,            LT(_FL, KC_SPC),                    KC_RALT,MO(_FL),KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
diff --git a/keyboards/takashiski/hecomi/keymaps/default/keymap.c b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
index 30f053d34f..e56529f3d8 100644
--- a/keyboards/takashiski/hecomi/keymaps/default/keymap.c
+++ b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
@@ -40,16 +40,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[DF]=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_NUHS,KC_GRV,
 			KC_TAB  ,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,                 KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSPC,
-			KC_LCTRL ,KC_A,KC_S,KC_D,KC_F,KC_G,                     KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_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_ENT,
 			KC_LSFT   ,KC_Z,KC_X,KC_C,KC_V,KC_B,               KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_FN,
-			KC_LCTRL,KC_LGUI,KC_LALT,KC_INT5,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_INT4,KC_RALT,KC_RGUI,KC_RCTRL
+			KC_LCTL,KC_LGUI,KC_LALT,KC_INT5,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_INT4,KC_RALT,KC_RGUI,KC_RCTL
 			),
 	[FN]=LAYOUT(
 			KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,                  KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_INS,KC_DEL,
 			KC_TAB  ,KC_9,KC_7,KC_5,KC_3,KC_1,KC_Y,                 KC_Y,KC_U,KC_PSCR,KC_SCRL,KC_PAUSE,KC_UP,KC_RBRC,KC_BSPC,
 			KC_CAPS ,KC_8,KC_6,KC_4,KC_2,KC_0,                     KC_SFT(KC_8),KC_SLSH,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,KC_ENT,
 			KC_LSFT   ,KC_Z,KC_X,KC_C,KC_V,KC_B,               KC_B,KC_SFT(KC_EQL),KC_MINS,KC_END,KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS,
-			KC_LCTRL,KC_LGUI,KC_LALT,KC_INT5,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_INT4,KC_RALT,KC_RGUI,KC_RCTRL
+			KC_LCTL,KC_LGUI,KC_LALT,KC_INT5,KC_BSPC,KC_SPC,  KC_ENT,KC_ESC,KC_INT4,KC_RALT,KC_RGUI,KC_RCTL
 			),
 };
 
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
index bcc24c75a0..a42a87c65f 100644
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
+++ b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [DF]=LAYOUT(\
             KC_ESC,KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,                 KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,
             KC_TAB  ,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,                 KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,
-            KC_LCTRL ,KC_A,KC_S,KC_D,KC_F,KC_G,                     KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,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_ENT,
             KC_LSFT   ,KC_Z,KC_X,KC_C,KC_V,KC_B,                    KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_DEL,
             KC_LGUI,KC_NO,KC_LALT,KC_LW,LT_F13,KC_SPC,               KC_SPC,LT_F14,KC_LEFT,KC_UP,KC_DOWN,KC_RIGHT
             ),
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [FN]=LAYOUT(\
             KC_ESC,KC_GRV,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,            KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_BSPC,
             KC_TAB  ,KC_NO,KC_UP,KC_NO,KC_NO,KC_NO,KC_NO,           KC_7,KC_8,KC_0,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
-            KC_LCTRL ,KC_LEFT,KC_DOWN,KC_RIGHT,KC_NO,KC_NO,         KC_4,KC_5,KC_6,KC_NO,KC_NO,KC_NO,KC_NO,
+            KC_LCTL ,KC_LEFT,KC_DOWN,KC_RIGHT,KC_NO,KC_NO,         KC_4,KC_5,KC_6,KC_NO,KC_NO,KC_NO,KC_NO,
             KC_LSFT   ,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,               KC_1,KC_2,KC_3,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
             KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC,             KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDN,KC_END
             ),
diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
index ebdd31f304..4af573107d 100644
--- a/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,      KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,KC_RBRC,KC_ENT,
 			KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,                    KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  KC_QUOT,KC_NUHS,
-			KC_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_INT1,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_RGUI,KC_APP,KC_RCTRL
+			KC_LSFT,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_INT1,KC_RSFT,
+			KC_LCTL,  KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_RGUI,KC_APP,KC_RCTL
   ),
 };
diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
index a0ac14e102..0ab6cc9891 100644
--- a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   _________________QWERTY_L1_________________,KC_Y,    _________________QWERTY_R1_________________,KC_LBRC,KC_RBRC,KC_ENT,
 			KC_CAPS,  _________________QWERTY_L2_________________,         _________________QWERTY_R2_________________,KC_QUOT,KC_NUHS,
-			KC_LSHIFT,_________________QWERTY_L3_________________,    KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_RGUI,KC_APP,KC_RCTRL
+			KC_LSFT,  _________________QWERTY_L3_________________,    KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSFT,
+			KC_LCTL,  KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_RGUI,KC_APP,KC_RCTL
   ),
 };
 
diff --git a/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
index 32e8d91057..d4bdcb7864 100644
--- a/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
@@ -26,14 +26,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_6, KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,      KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,KC_RBRC,KC_ENT,
 			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_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_INT1,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,LT(CURSOR,KC_TAB),KC_SPC,KC_SPC,        LT(CURSOR,KC_SPC),KC_ENT,KC_BSPC,KC_INT4,LT(CURSOR,KC_INT2),KC_RALT,KC_APP,KC_RCTRL
+			KC_LSFT,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH,KC_INT1,KC_RSFT,
+			KC_LCTL, KC_LGUI,KC_LALT,KC_INT5,LT(CURSOR,KC_TAB),KC_SPC,KC_SPC,        LT(CURSOR,KC_SPC),KC_ENT,KC_BSPC,KC_INT4,LT(CURSOR,KC_INT2),KC_RALT,KC_APP,KC_RCTL
   ),
   [CURSOR] = LAYOUT(
 			KC_GRAVE, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,             KC_F6, KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INT3,KC_DEL,
 			KC_TAB,   KC_Q,  KC_UP,  KC_E,  KC_R,  KC_T,  KC_Y,      KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,KC_RBRC,KC_PSCR,
 			KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_F,  KC_G,                    KC_LEFT,  KC_DOWN,  KC_UP,  KC_RIGHT,  KC_SCLN,  KC_QUOT,KC_NUHS,
-			KC_LSHIFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_END,KC_UP,KC_HOME,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TRNS,KC_SPC,KC_SPC,        KC_TRNS,KC_ENT,KC_BSPC,KC_INT4,KC_TRNS,KC_LEFT,KC_DOWN,KC_RIGHT
+			KC_LSFT,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_END,KC_UP,KC_HOME,
+			KC_LCTL, KC_LGUI,KC_LALT,KC_INT5,KC_TRNS,KC_SPC,KC_SPC,        KC_TRNS,KC_ENT,KC_BSPC,KC_INT4,KC_TRNS,KC_LEFT,KC_DOWN,KC_RIGHT
   )
 };
diff --git a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
index 570453dc4a..c98b7bed8b 100644
--- a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
+++ b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
@@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_6, KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
 			KC_TAB,   _________________QWERTY_L1_________________,KC_Y,    _________________QWERTY_R1_________________,KC_LBRC,KC_RBRC,KC_ENT,
 			KC_CAPS,  _________________QWERTY_L2_________________,         _________________QWERTY_R2_________________,KC_QUOT,KC_NUHS,
-			KC_LSHIFT,_________________QWERTY_L3_________________,         KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSHIFT,
-			KC_LCTRL, KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,KC_SPC,        KC_SPC,KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_APP,KC_RCTRL
+			KC_LSFT,  _________________QWERTY_L3_________________,         KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSFT,
+			KC_LCTL,  KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,KC_SPC,        KC_SPC,KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_APP,KC_RCTL
   )
 };
 
diff --git a/keyboards/the_royal/schwann/keymaps/default/keymap.c b/keyboards/the_royal/schwann/keymaps/default/keymap.c
index 0422f2d685..1535e3dc1f 100644
--- a/keyboards/the_royal/schwann/keymaps/default/keymap.c
+++ b/keyboards/the_royal/schwann/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_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_LCTRL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
+    KC_LCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_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_DEL,  KC_LGUI, KC_LALT, LOWER,     KC_SPACE,       RAISE,   KC_RALT,  KC_MENU,  KC_RCTL
   ),
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
index 6c7544cc8b..c33d004216 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
@@ -34,7 +34,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_BSPC,    \
         MO(L_ONE),  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,       KC_L,       KC_SCLN,    KC_QUOT,                            KC_ENT,     \
         KC_LSFT,            KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,       KC_COMM,    KC_DOT,     MT(MOD_RSFT, KC_SLSH),  KC_UP,      MO(L_TWO),  \
-        KC_LCTRL,   KC_LGUI,    KC_LALT,    KC_BSPC,        MO(L_BASE_ALT), KC_SPACE,   KC_RALT,    MO(L_LOCK),             KC_LEFT,    KC_DOWN,    KC_RIGHT    \
+        KC_LCTL,    KC_LGUI,    KC_LALT,    KC_BSPC,        MO(L_BASE_ALT), KC_SPACE,   KC_RALT,    MO(L_LOCK),             KC_LEFT,    KC_DOWN,    KC_RIGHT    \
     ),
 
     [L_BASE_ALT] = LAYOUT_hhkb_arrow( \
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
index cfcf765a08..09b8e24df2 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
@@ -652,7 +652,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     // Shift detection system.
                                                   // Disused because it turned out 'one shot' like Unicode input. Shift detection copied from.
                                                   // https://github.com/kyleterry/qmk_firmware/blob/master/quantum/quantum.c
-                                                  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+                                                  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
 
         // Crude but self contained in this source file shift detection.
         // ... right shift
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
index 47545da435..dc15779a17 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
@@ -64,7 +64,7 @@ WINDOW_SHORTCUT,    KC_LGUI,KC_LALT,              LOWER,  RAISE,        KC_QUOT,
 KC_TAB, KC_Q,   KC_W,   KC_E, KC_R,   KC_T,   KC_Y,   KC_U, KC_I,   KC_O,   KC_P,   KC_BSPC,
 KC_LGUI,KC_A,   KC_S,   KC_D, KC_F,   KC_G,   KC_H,   KC_J, KC_K,   KC_L,   KC_SCLN,KC_ENT,
 KC_LSFT,KC_Z,   KC_X,   KC_C, KC_V,   KC_B,   KC_N,   KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-MAC_SHORTCUT,    KC_LALT, KC_LCTRL,              LOWER,  RAISE,        KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT
+MAC_SHORTCUT,    KC_LALT, KC_LCTL,              LOWER,  RAISE,        KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT
 ),
 /* LOWER
  * ,--------------------------------------------------------------------------.
diff --git a/keyboards/tkw/grandiceps/keymaps/default/keymap.c b/keyboards/tkw/grandiceps/keymaps/default/keymap.c
index a55dd5a5c5..437b32a457 100644
--- a/keyboards/tkw/grandiceps/keymaps/default/keymap.c
+++ b/keyboards/tkw/grandiceps/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_DEL,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
   KC_TAB,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     KC_TEAMS,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /*
  * COLEMAK
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,  KC_BSPC,
   KC_TAB,   KC_A,   KC_R,    KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,      XXXXXXX,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/tmo50/keymaps/pyrol/keymap.c b/keyboards/tmo50/keymaps/pyrol/keymap.c
index 53534f56e3..b45f5250e1 100644
--- a/keyboards/tmo50/keymaps/pyrol/keymap.c
+++ b/keyboards/tmo50/keymaps/pyrol/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Default layer
   [0] = LAYOUT_all(
 		KC_VOLU, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_EQL, KC_BSPC,
-		KC_VOLD, KC_LCTRL, KC_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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 		KC_MPLY, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(3),
 		KC_MUTE, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_RALT, MO(4)
   ),
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Game layer!
   [5] = LAYOUT_all(
 		KC_VOLU, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_EQL, KC_BSPC,
-		KC_VOLD, KC_LCTRL, KC_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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 		KC_MPLY, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(3),
 		KC_F12, KC_F13, KC_LALT, KC_SPC, LT(2, KC_SPC), KC_RALT, TO(0)
   ),
diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
index 812b6406ee..1507e21056 100644
--- a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
+++ b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
@@ -85,10 +85,10 @@ bool right_alt_down = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case KC_LSHIFT:
+        case KC_LSFT:
             left_shift_down = record->event.pressed;
             break;
-        case KC_RSHIFT:
+        case KC_RSFT:
             right_shift_down = record->event.pressed;
             break;
         case KC_LALT:
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
index e5239a0438..ea7b50c129 100644
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
+++ b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LCTRL,  KC_LSHIFT,   KC_M
+    TD(TD_ESC_TAB),    KC_LCTL,  KC_LSFT,   KC_M
   ),
   /* Keymap _FN: RGB Function Layer
    * ,-------------------.
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c b/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c
index d3e9a6e688..1878e5ff31 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/keymap.c
@@ -28,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_NUBS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, KC_APP,      KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+        KC_LCTL, KC_LGUI, KC_LALT, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, KC_APP,       KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     )
 };
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c b/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c
index 32aba6928d..c1b0e774c2 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/keymap.c
@@ -28,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_NUBS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTRL, KC_LGUI, KC_LALT, KC_NO,       KC_SPC,                      KC_RALT, KC_RGUI, KC_APP,      KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+        KC_LCTL, KC_LGUI, KC_LALT, KC_NO,       KC_SPC,                      KC_RALT, KC_RGUI, KC_APP,       KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     )
 };
diff --git a/keyboards/unicomp/pc122/keymaps/default/keymap.c b/keyboards/unicomp/pc122/keymaps/default/keymap.c
index f01f6c8faf..987bc71f07 100644
--- a/keyboards/unicomp/pc122/keymaps/default/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/default/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_PSCR,  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         KC_PSCR,  KC_F1,      KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_RGUI,  KC_MPLY,    KC_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_LEFT, KC_ENT,  KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LGUI,  KC_APP,     KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,           KC_DOWN,           KC_P0,            KC_PDOT
+        KC_LGUI,  KC_APP,     KC_LCTL,           KC_LALT,                         KC_SPC,                        KC_RALT,          KC_RCTL,           KC_DOWN,           KC_P0,            KC_PDOT
     )
 };
diff --git a/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c b/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
index 9a8b41503f..da85b632b1 100644
--- a/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/pc3270/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         C(KC_F1),  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_END,    KC_INS,  KC_DEL,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
         C(KC_F2),  C(KC_F5),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
         KC_PSCR,   C(KC_F6),   KC_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_LEFT,   KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_SCRL,   C(KC_F7),   KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,             KC_DOWN,           KC_P0,            KC_PDOT
+        KC_SCRL,   C(KC_F7),   KC_LCTL,           KC_LALT,                         KC_SPC,                        KC_RALT,          KC_RCTL,             KC_DOWN,           KC_P0,            KC_PDOT
     )
 };
diff --git a/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c b/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
index eda87c3969..4cbbb8220f 100644
--- a/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/ps2_5250/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                         S(KC_F1), S(KC_F2), S(KC_F3), S(KC_F4), S(KC_F5), S(KC_F6), S(KC_F7), S(KC_F8), S(KC_F9), S(KC_F10), S(KC_F11), S(KC_F12),
                                         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
         KC_ESC,     KC_SCRL,    KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,        KC_BSPC,  S(KC_TAB),   KC_INS,  KC_PGUP,  KC_END,  KC_NUM,  KC_PSLS, KC_PAST,
-        KC_PSCR,    KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  S(KC_RCTRL), KC_DEL,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        KC_PSCR,    KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  S(KC_RCTL),  KC_DEL,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         C(KC_PAUS), A(KC_F1),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         S(C(KC_4)), S(C(KC_3)), KC_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_LEFT,     KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LGUI,    KC_APP,     KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,               KC_DOWN,           KC_P0,            KC_PDOT
+        KC_LGUI,    KC_APP,     KC_LCTL,           KC_LALT,                         KC_SPC,                        KC_RALT,          KC_RCTL,               KC_DOWN,           KC_P0,            KC_PDOT
     )
 };
diff --git a/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c b/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
index 0af0a6d2d4..fec3ab5c1b 100644
--- a/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
+++ b/keyboards/unicomp/pc122/keymaps/usb_5250/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_PSCR,  KC_PAUS,    KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  C(KC_F6),  KC_DEL,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         C(KC_F3), C(KC_F1),   KC_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_UP,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         C(KC_F5), C(KC_F2),   KC_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_LEFT,   KC_HOME, KC_RGHT,  KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LGUI,  KC_APP,     KC_LCTRL,           KC_LALT,                         KC_SPC,                        KC_RALT,         KC_RCTRL,             KC_DOWN,           KC_P0,            KC_PDOT
+        KC_LGUI,  KC_APP,     KC_LCTL,           KC_LALT,                         KC_SPC,                        KC_RALT,          KC_RCTL,             KC_DOWN,           KC_P0,            KC_PDOT
     )
 };
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
index 0ffb0e9007..1a5fb80177 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTRL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),     KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+        KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     ),
     [_FN] = 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,
@@ -37,6 +37,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,DEBUG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTRL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),     KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+        KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     )
 };
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
index 0ffb0e9007..1a5fb80177 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN, KC_QUOT,KC_NUHS, KC_ENT,                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,KC_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTRL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),     KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+        KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     ),
     [_FN] = 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,
@@ -37,6 +37,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,DEBUG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTRL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),     KC_RCTRL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+        KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     )
 };
diff --git a/keyboards/vitamins_included/keymaps/default/keymap.c b/keyboards/vitamins_included/keymaps/default/keymap.c
index ce287fca9a..59903b1a6f 100644
--- a/keyboards/vitamins_included/keymaps/default/keymap.c
+++ b/keyboards/vitamins_included/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LCTRL,KC_LGUI, KC_LALT, ADJUST,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  KC_LCTL, KC_LGUI, KC_LALT, ADJUST,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Colemak
diff --git a/keyboards/vitamins_included/keymaps/via/keymap.c b/keyboards/vitamins_included/keymaps/via/keymap.c
index 08968d0b52..f2a3918e25 100644
--- a/keyboards/vitamins_included/keymaps/via/keymap.c
+++ b/keyboards/vitamins_included/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LCTRL,KC_LGUI, KC_LALT,MO(_ADJUST),MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE),KC_LEFT,KC_DOWN, KC_UP,   KC_RGHT
+  KC_LCTL, KC_LGUI, KC_LALT,MO(_ADJUST),MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE),KC_LEFT,KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
index 2ba8596bc5..8bbc76a977 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,         KC_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_LCTRL,KC_LGUI,KC_LALT,                 KC_SPC,                        KC_RALT,MO(_F1),                KC_LEFT,KC_DOWN,KC_RGHT),
+    KC_LCTL, KC_LGUI,KC_LALT,                 KC_SPC,                        KC_RALT,MO(_F1),                KC_LEFT,KC_DOWN,KC_RGHT),
 
   [_F1] = LAYOUT_ansi(
     QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,_______,_______,_______,
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
index 877b042361..ebb3c7a9aa 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
@@ -25,7 +25,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_END,
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,KC_NUHS, KC_ENT, KC_PGUP,
     KC_LSFT,  KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT,  KC_UP, KC_PGDN,
-    KC_LCTRL,KC_LGUI,KC_LALT,               KC_SPC,                        KC_RALT,MO(_F1),     KC_LEFT,KC_DOWN, KC_RGHT),
+    KC_LCTL, KC_LGUI,KC_LALT,               KC_SPC,                        KC_RALT,MO(_F1),     KC_LEFT,KC_DOWN, KC_RGHT),
 
   [_F1] = LAYOUT_iso(
     QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,_______,_______,
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
index 4e648fdeff..daad60a1f4 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,         KC_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_LCTRL,KC_LGUI,KC_LALT,                 KC_SPC,                        KC_RALT,MO(_F1)      ,KC_LEFT,KC_DOWN,       KC_RGHT),
+    KC_LCTL, KC_LGUI,KC_LALT,                 KC_SPC,                        KC_RALT,MO(_F1)      ,KC_LEFT,KC_DOWN,       KC_RGHT),
 
   [_F1] = LAYOUT_ansi(
     QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,_______,_______,_______,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
index db5432a9c0..f5bf18267d 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,	    KC_BSLS, 	 	KC_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_PEQL,
   KC_LSFT,      KC_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_LCTRL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
 
 [_F1] = LAYOUT_ansi( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,       _______, _______, _______, _______,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
index 62ccae63dc..1ab68865fc 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
@@ -25,7 +25,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_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-  KC_LCTRL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
 
 [_F1] = LAYOUT_iso( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
index 721578f90a..8f92eb9ae0 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
@@ -25,7 +25,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_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-  KC_LCTRL, KC_LGUI,KC_LALT,          KC_NO,KC_SPC,KC_NO,                  KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+  KC_LCTL, KC_LGUI,KC_LALT,          KC_NO,KC_SPC,KC_NO,                  KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
 
 [_F1] = LAYOUT_all( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
diff --git a/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c b/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c
index b0073bba77..c7db32f2dd 100644
--- a/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MA] = LAYOUT_all(
     KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_GRV, KC_DEL,
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSPC,
-    KC_LCTRL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         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_ENT,
     KC_LSFT,  KC_BSLS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT, MO(_F1),
     KC_LGUI,KC_LGUI,KC_LALT,                 KC_SPC,                        KC_RALT,KC_RGUI,KC_RCTL),
 
diff --git a/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c b/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c
index e15f34611f..d7ec7d2d67 100644
--- a/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c
+++ b/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MA] = LAYOUT_all(
     KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_GRV, KC_DEL,
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSPC,
-    KC_LCTRL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         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_ENT,
     KC_LSFT,  KC_BSLS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT, MO(_F1),
     KC_LGUI,KC_LGUI,KC_LALT,                 KC_SPC,                        KC_RALT,KC_RGUI,KC_RCTL),
 
diff --git a/keyboards/whale/sk/keymaps/default/keymap.c b/keyboards/whale/sk/keymaps/default/keymap.c
index 64b7f20cc6..37cfda5cc3 100644
--- a/keyboards/whale/sk/keymaps/default/keymap.c
+++ b/keyboards/whale/sk/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
         KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME,      KC_END, 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_PGUP,               KC_PGDN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
-        KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL,               KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
-        KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LEFT,              KC_RIGHT, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSHIFT,
+        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL,               KC_BSPC, 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_LEFT,              KC_RIGHT, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT,
         KC_LBRC, KC_LALT, KC_LWIN, KC_APP, KC_INT4, KC_MENU,              KC_MENU, KC_INT5, KC_APP, KC_RWIN, KC_RALT, KC_RBRC,
                                             KC_F1, KC_F2,       KC_F7, KC_F8,
                                     KC_SPC, KC_F3, KC_F4,       KC_F9, KC_F10, KC_SPC,
diff --git a/keyboards/wolf/sabre/keymaps/default/keymap.c b/keyboards/wolf/sabre/keymaps/default/keymap.c
index 943ac3f168..b9f378097c 100644
--- a/keyboards/wolf/sabre/keymaps/default/keymap.c
+++ b/keyboards/wolf/sabre/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                     KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTRL,                  KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT(
diff --git a/keyboards/wolf/sabre/keymaps/via/keymap.c b/keyboards/wolf/sabre/keymaps/via/keymap.c
index e709840913..bc134b7c46 100644
--- a/keyboards/wolf/sabre/keymaps/via/keymap.c
+++ b/keyboards/wolf/sabre/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                     KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTRL,                  KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT(
diff --git a/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
index b9cf12cd7e..f8eb11b3ee 100644
--- a/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_PGDN,
         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_HOME,
         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_SLASH,KC_RSFT,KC_UP,KC_END,
-        KC_F9, KC_F10,  KC_LCTL,KC_LGUI,KC_LALT, RAISE, KC_SPACE, LOWER, KC_RALT,KC_APP,KC_RCTRL,KC_LEFT,KC_DOWN,KC_RIGHT),
+        KC_F9, KC_F10,  KC_LCTL,KC_LGUI,KC_LALT, RAISE, KC_SPACE, LOWER, KC_RALT,KC_APP,KC_RCTL,KC_LEFT,KC_DOWN,KC_RIGHT),
 
         [_RAISE] = LAYOUT_all(
         RGB_MOD, _______,   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
index 5d8fd4a0a9..363fc8cf3f 100644
--- a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
+++ b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
@@ -169,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true;
         case KC_F4:
             // Map alt+shift+4 to alt+f4
-            if (super_alt_layer_active && (get_mods() & MOD_BIT(KC_LSHIFT))) {
+            if (super_alt_layer_active && (get_mods() & MOD_BIT(KC_LSFT))) {
                 if (record->event.pressed) {
                     register_code(KC_LALT);
                 } else {
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
index f6b3c259ca..b41b77edd7 100644
--- a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,     KC_LBRC,   KC_RBRC,             KC_BSLS,   \
       KC_ESC,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,   KC_NO,               KC_ENT,    \
       KC_LSFT,  KC_LGUI, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  KC_UP,     MO(1),     \
-      KC_LCTL,  TD(0),   KC_LALT,                            KC_SPC ,                             KC_RALT,  KC_RCTRL,  KC_LEFT,  KC_DOWN,   KC_RIGHT),
+      KC_LCTL,  TD(0),   KC_LALT,                            KC_SPC ,                             KC_RALT,  KC_RCTL,   KC_LEFT,  KC_DOWN,   KC_RIGHT),
                                                                                                                                            
   // 1: Function 1 Layers                                                                                                                  
   LAYOUT_all(                                                                                                                                  
@@ -163,8 +163,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KC_RSFT:   return special_mods(KC_CAPS, record, KC_LSFT);  // Both shifts together -> Caps Lock    // LSFT  pressed first case
     #endif
     #ifdef APP_IS_RALT_RCTRL
-    case KC_RCTRL:  return special_mods(KC_APP,  record, KC_RALT);  // RALT + RCTRL -> APP                  // RCTRL pressed first case
-    case KC_RALT:   return special_mods(KC_APP,  record, KC_RCTRL); // RALT + RCTRL -> APP                  // RALT  pressed first case
+    case KC_RCTL:   return special_mods(KC_APP,  record, KC_RALT);  // RALT + RCTRL -> APP                  // RCTRL pressed first case
+    case KC_RALT:   return special_mods(KC_APP,  record, KC_RCTL);  // RALT + RCTRL -> APP                  // RALT  pressed first case
     #endif
     #ifdef ALT_MINSEQL_IS_ALT_78
     case KC_MINS:  return special_mods(KC_7,  record, KC_RALT); // RALT + MINS -> RALT+7                  // {} in CAN Mult. softawre layout
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn/keymap.c b/keyboards/xiudi/xd60/keymaps/edulpn/keymap.c
index e064dfb68d..2b3ef533ae 100644
--- a/keyboards/xiudi/xd60/keymaps/edulpn/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/edulpn/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_NO,    \
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_BSLS,   \
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,             KC_ENT,    \
-      KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO, KC_RSHIFT,  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_NO, KC_RSFT,    KC_NO,      \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RALT,    MO(1), KC_NO, KC_RGUI,    KC_RCTL),
 
   // 1: Function Layer
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c b/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
index 2cfdc35ffa..7ad09e81b7 100644
--- a/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
@@ -17,6 +17,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_PSCR,KC_SCRL,KC_PAUS, RGB_RMOD,RGB_MOD,  RGB_VAD,           RGB_VAI,   \
       KC_CAPS, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_INS, KC_HOME,KC_PGUP, RGB_HUD, RGB_HUI,  KC_NO,             KC_ENT,    \
       KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_END,  KC_PGDN, KC_NO,    KC_RSFT, KC_UP,    KC_DEL,    \
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_RCTRL, KC_LEFT, KC_DOWN,  KC_RIGHT),
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_RCTL,  KC_LEFT, KC_DOWN,  KC_RIGHT),
 
 };
diff --git a/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c b/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c
index c31a948a82..3618ed0343 100644
--- a/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_NO,    \
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_BSLS,   \
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,             KC_ENT,    \
-      KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO, KC_RSHIFT,  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_NO, KC_RSFT,    KC_NO,      \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_RALT,  KC_NO, KC_RGUI,    KC_RCTL),
 
   // 1: Function Layer
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
index 194eac9d89..1ba69788ac 100644
--- a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
@@ -45,7 +45,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_DEL,  KC_P7,  KC_P8,   KC_P9, 
 	KC_ESC,   KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_P4,  KC_P5,   KC_P6, 
 	KC_LSFT,  KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,  KC_P1,  KC_P2,   KC_P3, 
-	KC_LCTRL, KC_LALT, KC_LGUI, STENO, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_P0,  KC_PDOT, KC_PENT),
+	KC_LCTL,  KC_LALT, KC_LGUI, STENO, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_P0,  KC_PDOT, KC_PENT),
 
     /* STENO
      * .--------------------------------------------------------------------------------------------------------------------------------------.
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index 8510a2d3ca..55f554f86b 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -239,10 +239,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
         if (keyboard_report->mods & shift) {
           if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LEFT_SHIFT);
           }
           else {
-            unregister_code(KC_RSHIFT);
+            unregister_code(KC_RIGHT_SHIFT);
           }
           register_code(KC_DEL);
         }
@@ -260,10 +260,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
         if (keyboard_report->mods & shift) {
             if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-              unregister_code(KC_LSHIFT);
+              unregister_code(KC_LEFT_SHIFT);
             }
             else {
-              unregister_code(KC_RSHIFT);
+              unregister_code(KC_RIGHT_SHIFT);
             }
           register_code(KC_BACKSLASH);
         }
diff --git a/keyboards/ydkb/yd68/keymaps/default/keymap.c b/keyboards/ydkb/yd68/keymaps/default/keymap.c
index c8b49c76a3..45b3144b9c 100644
--- a/keyboards/ydkb/yd68/keymaps/default/keymap.c
+++ b/keyboards/ydkb/yd68/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_END,
 	KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT, KC_PGUP,
 	KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,KC_UP,  KC_PGDN,
-	KC_LCTL, KC_LGUI,KC_LALT,                        KC_SPC,                 KC_RALT,KC_RGUI,KC_RCTRL,KC_LEFT,KC_DOWN,KC_RGHT
+	KC_LCTL, KC_LGUI,KC_LALT,                        KC_SPC,                 KC_RALT,KC_RGUI,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT
 	),
 };
 
diff --git a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
index 624797c5c3..d533089f2e 100644
--- a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
@@ -379,13 +379,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   bool ignore_accent_change = !record->event.pressed;
 
   // Step 1: Process any modifier key state changes, so we can maintain that state.
-  if (keycode == KC_LSHIFT || keycode == KC_RSHIFT) {
+  if (keycode == KC_LSFT || keycode == KC_RSFT) {
     shift_held = record->event.pressed;
     ignore_accent_change = true;
   } else if (keycode == KC_LALT || keycode == KC_RALT) {
     alt_held = record->event.pressed;
     ignore_accent_change = true;
-  } else if (keycode == KC_LCTRL || keycode == KC_RCTRL) {
+  } else if (keycode == KC_LCTL || keycode == KC_RCTL) {
     ctrl_held = record->event.pressed;
     ignore_accent_change = true;
   } else if (keycode == KC_LGUI || keycode == KC_RGUI) {
diff --git a/keyboards/yosino58/keymaps/default/keymap.c b/keyboards/yosino58/keymaps/default/keymap.c
index fbe5d6343c..45ee46f7ce 100644
--- a/keyboards/yosino58/keymaps/default/keymap.c
+++ b/keyboards/yosino58/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,   KC_1, KC_2, KC_3, KC_4,    KC_5,                                       KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS,
   KC_TAB,   KC_Q, KC_W, KC_E, KC_R,    KC_T,                                       KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_EQL,
   KC_LSFT,  KC_A, KC_S, KC_D, KC_F,    KC_G,                                       KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-  KC_LCTRL, KC_Z, KC_X, KC_C, KC_V,    KC_B,   KC_DEL, KC_SPC, KC_ENT, KC_BSPC,    KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
+  KC_LCTL,  KC_Z, KC_X, KC_C, KC_V,    KC_B,   KC_DEL, KC_SPC, KC_ENT, KC_BSPC,    KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
                               KC_LALT, ADJUST, LOWER,                  RAISE,      KC_LBRC, KC_RBRC
   ),
 
diff --git a/keyboards/yosino58/keymaps/sakura/keymap.c b/keyboards/yosino58/keymaps/sakura/keymap.c
index f0dbc75740..ac2711e32a 100644
--- a/keyboards/yosino58/keymaps/sakura/keymap.c
+++ b/keyboards/yosino58/keymaps/sakura/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,   KC_1, KC_2, KC_3, KC_4,    KC_5,                                           KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, \
   KC_TAB,   KC_Q, KC_W, KC_E, KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_EQL,  \
   KC_LSFT,  KC_A, KC_S, KC_D, KC_F,    KC_G,                                           KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, \
-  KC_LCTRL, KC_Z, KC_X, KC_C, KC_V,    KC_B,    KC_DEL,    KC_SPC, KC_ENT, KC_BSPC,    KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, \
+  KC_LCTL,  KC_Z, KC_X, KC_C, KC_V,    KC_B,    KC_DEL,    KC_SPC, KC_ENT, KC_BSPC,    KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, \
                               KC_LALT, KC_LGUI, LOWER,                     RAISE,      KC_LBRC, KC_RBRC\
   ),
 
diff --git a/layouts/community/66_ansi/xyverz/keymap.c b/layouts/community/66_ansi/xyverz/keymap.c
index 1b95c9ab17..92a388d31d 100644
--- a/layouts/community/66_ansi/xyverz/keymap.c
+++ b/layouts/community/66_ansi/xyverz/keymap.c
@@ -18,7 +18,7 @@ enum planck_keycodes {
 };
 
 // Useful defines
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_CTRL_MASK  (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 #define FN_CAPS     LT(_FL, KC_CAPS)            // Tap for Caps Lock, Hold for Function Layer
 
 // clang-format off
diff --git a/layouts/community/ergodox/adnw_p_u_q/keymap.c b/layouts/community/ergodox/adnw_p_u_q/keymap.c
index 58be35bbaa..e5856f4894 100644
--- a/layouts/community/ergodox/adnw_p_u_q/keymap.c
+++ b/layouts/community/ergodox/adnw_p_u_q/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         TG(SYMBOLS), DE_P, DE_U, OSL(DIAK), DE_COMM, DE_Q, LSFT(DE_G),
         OSL(SYMBOLS), DE_H, DE_I, DE_E, DE_A, DE_O,
      	SFT_T(KC_TAB), DE_K, DE_Y, DE_DOT, DE_QUOT, DE_X, LCTL(DE_D),
-        KC_LCTRL, KC_LALT, KC_NO, KC_NO, KC_NO,
+        KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_NO,
         
 
 	// left hand thumb-cluster
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         DE_G, DE_V, DE_C, DE_L, DE_M, DE_B, KC_NO,
                   DE_D, DE_T, DE_R, DE_N, DE_S, TG(ARW),
         LCTL(DE_U), DE_J, DE_G, DE_Z, DE_W, DE_F, KC_RSFT,
-                         KC_H, KC_J, KC_K, KC_L, KC_RCTRL,
+                         KC_H, KC_J, KC_K, KC_L, KC_RCTL,
 
 	// right thumb-cluster
         DE_QUES, DE_DLR,
diff --git a/layouts/community/ergodox/belak/keymap.c b/layouts/community/ergodox/belak/keymap.c
index de0fe1b1ae..95255be683 100644
--- a/layouts/community/ergodox/belak/keymap.c
+++ b/layouts/community/ergodox/belak/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,
         CTL_T(KC_BSLS), KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LGUI,
-        LTOGGLE,        KC_LCTRL,     KC_LEFT,KC_RGHT,KC_LALT,
+        LTOGGLE,        KC_LCTL,      KC_LEFT,KC_RGHT,KC_LALT,
                                                      MO(NUMP),KC_INS,
                                                               KC_HOME,
                                  CTL_T(KC_BSPC),GUI_T(KC_DEL),KC_END,
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_RBRC,     KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_MINS,
                      KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,          KC_QUOT,
         KC_RGUI,     KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,
-                             KC_RALT,KC_UP,  KC_DOWN,KC_RCTRL,         LTOGGLE,
+                             KC_RALT,KC_UP,  KC_DOWN,KC_RCTL,          LTOGGLE,
         KC_GRV,      MO(SYMB),
         KC_PGUP,
         KC_PGDN,     GUI_T(KC_ENT), CTL_T(KC_SPC)
diff --git a/layouts/community/ergodox/bepo_alt/keymap.c b/layouts/community/ergodox/bepo_alt/keymap.c
index 7793eef31d..e379df030f 100644
--- a/layouts/community/ergodox/bepo_alt/keymap.c
+++ b/layouts/community/ergodox/bepo_alt/keymap.c
@@ -33,11 +33,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 BP_DLR,  BP_DQUO,  BP_LDAQ,  BP_RDAQ,  BP_LPRN,  BP_RPRN,  BP_AT,
 KC_TAB, BP_B,   BP_EACU,    BP_P,   BP_O,   BP_EGRV, KC_BSPC,
 BP_W,   BP_A,   BP_U,   BP_I,   BP_E,   BP_COMM,
-KC_LSHIFT,  BP_ECIR,  BP_AGRV,   BP_Y,   BP_X,   BP_DOT,   BP_K,
+KC_LSFT,    BP_ECIR,  BP_AGRV,   BP_Y,   BP_X,   BP_DOT,   BP_K,
 KC_LCTL,    KC_LGUI,    KC_LGUI,  KC_LGUI,  KC_LALT,
                             KC_PGUP,  KC_PGDN,
                                 KC_INS,
-                        KC_SPC,   KC_LSHIFT,  DF(FNAV),
+                        KC_SPC,   KC_LSFT,  DF(FNAV),
 
 /* Right hand */
                 BP_PLUS, BP_MINS,    BP_MINS, BP_SLSH, BP_ASTR,  BP_EQL, BP_PERC,
@@ -47,7 +47,7 @@ KC_LCTL,    KC_LGUI,    KC_LGUI,  KC_LGUI,  KC_LALT,
                 KC_ALGR,  KC_RGUI,  KC_RGUI,  KC_RCTL,  KC_ENTER,
 DF(BEPO), KC_DEL,
 DF(FNAV),
-MO(FNAV), KC_RSHIFT,  KC_ENTER),
+MO(FNAV), KC_RSFT,  KC_ENTER),
 
 /* Keymap 1: function / navigation / mouse layer
  *
@@ -73,7 +73,7 @@ MO(FNAV), KC_RSHIFT,  KC_ENTER),
 KC_NO,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,
 KC_NO,    KC_MS_BTN5, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_MS_WH_UP,  KC_BSPC,
 KC_NO,    KC_MS_BTN4, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT,  KC_MS_WH_DOWN,
-KC_LSHIFT,    KC_UNDO,  KC_CUT,   KC_COPY,  KC_PASTE, KC_NO,    KC_VOLD,
+KC_LSFT,    KC_UNDO,  KC_CUT,   KC_COPY,  KC_PASTE, KC_NO,    KC_VOLD,
 KC_LCTL,    KC_INS,   KC_LGUI,  KC_LGUI,  KC_LALT,
                             KC_HOME,  KC_END,
                                 KC_TRNS,
diff --git a/layouts/community/ergodox/dave/keymap.c b/layouts/community/ergodox/dave/keymap.c
index 054cbd3ed8..19ab66545c 100644
--- a/layouts/community/ergodox/dave/keymap.c
+++ b/layouts/community/ergodox/dave/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
         KC_ESC,   KC_1,     KC_2,    KC_3,    KC_4,    KC_5,   KC_6,
         KC_TAB,   KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,
-        KC_LCTRL, KC_A,     KC_S,    KC_D,    KC_F,    KC_G,
+        KC_LCTL,  KC_A,     KC_S,    KC_D,    KC_F,    KC_G,
         KC_LSFT,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,   KC_H,
         CTL_T(KC_GRV),KC_NUBS,KC_NO, KC_NO,   KC_LALT,
                                                   KC_PSCR, KC_PSCR,
diff --git a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
index 6729dbeeb6..e35739c07e 100644
--- a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
+++ b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   SE_ARNG,SE_ADIA,  SE_ODIA, KC_P,    KC_Y,      KC_NO,
         KC_ESC,   KC_A,   KC_O,     KC_E,    KC_U,    KC_I,
         KC_LSFT,  KC_DOT, KC_Q,     KC_J,    KC_K,    KC_X,      KC_NO,
-        KC_LCTRL, KC_NO,  KC_NO,    KC_LALT, KC_LCMD,
+        KC_LCTL,  KC_NO,  KC_NO,    KC_LALT, KC_LCMD,
                                                       KC_INSERT, KC_DEL,
                                                                  KC_NO,
                                              KC_BSPC, KC_TAB,    KC_NO,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         TG(QWRT), KC_6,   KC_7,     KC_8,    KC_9,    KC_0,      SE_PLUS,
         KC_DEL,   KC_F,   KC_G,     KC_C,    KC_R,    KC_L,      KC_COMM,
                   KC_D,   KC_H,     KC_T,    KC_N,    KC_S,      SE_MINS,
-        KC_RCTRL, KC_B,   KC_M,     KC_W,    KC_V,    KC_Z,      KC_RSFT,
+        KC_RCTL,  KC_B,   KC_M,     KC_W,    KC_V,    KC_Z,      KC_RSFT,
                           MO(SYMB), KC_LEFT, KC_DOWN, KC_UP,     KC_RGHT,
         KC_HOME,  KC_END,
         KC_PGUP,
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CAPS,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
     KC_LSFT,        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     SE_ACUT,
     CTL_T(SE_QUOT), SE_CIRC, SE_ASTR, KC_LALT, KC_LGUI,
-                                                        KC_LCTRL, KC_LALT,
+                                                        KC_LCTL,  KC_LALT,
                                                                   SE_TILD,
                                                KC_BSPC, KC_TAB,   KC_ESC,
     // right hand
diff --git a/layouts/community/ergodox/emacs_osx_dk/keymap.c b/layouts/community/ergodox/emacs_osx_dk/keymap.c
index 2c3430c236..ccffc74d30 100644
--- a/layouts/community/ergodox/emacs_osx_dk/keymap.c
+++ b/layouts/community/ergodox/emacs_osx_dk/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,
         CTL_T(KC_BSLS), KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_RALT,
-        MO(SYMB),       KC_LCTRL,     KC_LEFT,KC_RGHT,KC_LALT,
+        MO(SYMB),       KC_LCTL,      KC_LEFT,KC_RGHT,KC_LALT,
                                                       KC_DEL, KC_INS,
                                                               KC_HOME,
                                                KC_SPC,KC_BSPC,KC_END,
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_RBRC,     KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_MINS,
                           KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,          CTL_T(KC_QUOT),
              KC_RALT,     KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,
-                                  KC_LALT,KC_UP,  KC_DOWN,KC_RCTRL,         MO(MDIA),
+                                  KC_LALT,KC_UP,  KC_DOWN,KC_RCTL,          MO(MDIA),
              KC_ESC,      KC_APP,
              KC_PGUP,
              KC_PGDN,     KC_LGUI, KC_ENT
diff --git a/layouts/community/ergodox/german-kinergo/keymap.c b/layouts/community/ergodox/german-kinergo/keymap.c
index 46caa986a6..e48452274a 100644
--- a/layouts/community/ergodox/german-kinergo/keymap.c
+++ b/layouts/community/ergodox/german-kinergo/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS,         KC_A,           KC_S,     KC_D,     KC_F,     KC_G,
         KC_LSFT,         DE_Y,           KC_X,     KC_C,     KC_V,     KC_B,   MO(2),
         KC_LGUI,      DE_CIRC, DE_LABK,  KC_LEFT,  KC_RIGHT,
-                                               KC_LCTRL, KC_LALT,
+                                               KC_LCTL, KC_LALT,
                                                               KC_HOME,
                                                KC_BSPC,KC_DEL,KC_END,
         // right hand
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                      KC_H,   KC_J,    KC_K,    KC_L,   DE_ODIA,          LT(MDIA,DE_ADIA),
         MO(2),       KC_N,   KC_M,    KC_COMM, KC_DOT, DE_MINS,          KC_RSFT,
                              KC_DOWN, KC_UP,   DE_HASH,  DE_PLUS,          KC_RGUI,
-        KC_RALT, KC_RCTRL,
+        KC_RALT, KC_RCTL,
         KC_PGUP,
         KC_PGDN, KC_ENT, KC_SPC
     ),
diff --git a/layouts/community/ergodox/german-lukas/keymap.c b/layouts/community/ergodox/german-lukas/keymap.c
index ca7335cae2..891bf0474b 100644
--- a/layouts/community/ergodox/german-lukas/keymap.c
+++ b/layouts/community/ergodox/german-lukas/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,          KC_A,           KC_S,     KC_D,     KC_F,     KC_G,
         KC_LSFT,         DE_Y,           KC_X,     KC_C,     KC_V,     KC_B,   ALL_T(KC_NO),
         KC_LGUI,      DE_CIRC, DE_LABK,  KC_LEFT,  KC_RIGHT,
-                                               KC_LCTRL, KC_LALT,
+                                               KC_LCTL, KC_LALT,
                                                               KC_HOME,
                                                KC_SPC ,KC_DEL,KC_END,
         // right hand
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       KC_H,   KC_J,    KC_K,    KC_L,    DE_ODIA,     LT(MDIA,DE_ADIA),
         MEH_T(KC_NO),     KC_N,   KC_M,    KC_COMM, KC_DOT,  DE_MINS,     KC_RSFT,
                               KC_UP,   KC_DOWN, DE_HASH, DE_PLUS,     LCA_T(KC_NO),
-        KC_RALT, KC_RCTRL,
+        KC_RALT, KC_RCTL,
         KC_PGUP,
         KC_PGDN, KC_BSPC, KC_ENT
     ),
diff --git a/layouts/community/ergodox/haegin/keymap.c b/layouts/community/ergodox/haegin/keymap.c
index cf5db6333b..7b0e1b6c0e 100644
--- a/layouts/community/ergodox/haegin/keymap.c
+++ b/layouts/community/ergodox/haegin/keymap.c
@@ -201,7 +201,7 @@ void dance_backspace_ended (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     if (state->pressed) {
       fib_bspc.state = HOLD_CTRL;
-      register_code(KC_LCTRL);
+      register_code(KC_LCTL);
     } else {
       register_code(KC_BSPC);
     }
@@ -210,7 +210,7 @@ void dance_backspace_ended (qk_tap_dance_state_t *state, void *user_data) {
 
 void dance_backspace_reset (qk_tap_dance_state_t *state, void *user_data) {
   switch (fib_bspc.state) {
-    case HOLD_CTRL: unregister_code(KC_LCTRL); break;
+    case HOLD_CTRL: unregister_code(KC_LCTL); break;
     case BSPC_WORD: unregister_code(KC_BSPC); unregister_code(KC_LALT); break;
     case BSPC_LETTER: unregister_code(KC_BSPC); break;
   }
diff --git a/layouts/community/ergodox/issmirnov/keymap.c b/layouts/community/ergodox/issmirnov/keymap.c
index 1322681d22..91c349a5d3 100644
--- a/layouts/community/ergodox/issmirnov/keymap.c
+++ b/layouts/community/ergodox/issmirnov/keymap.c
@@ -31,7 +31,7 @@ KC_DOWN,  KC_TAB, KC_ENTER
 KC_ESCAPE , KC_F1         , KC_F2         , KC_F3       , KC_F4            , KC_F5    , KC_F6    ,
 XXXXXXX   , _________________SYMB_L1___________________ ,KC_ASTR  ,
 KC_TAB    ,  _________________SYMB_L2___________________,
-KC_LSHIFT ,  _________________SYMB_L3___________________, KC_SLASH ,
+KC_LSFT   ,  _________________SYMB_L3___________________, KC_SLASH ,
 KC_LCTL   , LSFT(KC_LGUI) , LSFT(KC_LALT) , KC_LALT     , WKSP_LEFT  ,
 
                                               XXXXXXX,        XXXXXXX,
diff --git a/layouts/community/ergodox/jacobono/keymap.c b/layouts/community/ergodox/jacobono/keymap.c
index 7c5b914872..2e9d6f2006 100644
--- a/layouts/community/ergodox/jacobono/keymap.c
+++ b/layouts/community/ergodox/jacobono/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	    // left hand
 	    KC_BSPC,           KC_1,         KC_2,   KC_3,   KC_4,    KC_5,   KC_LEFT,
 	    KC_TAB,            KC_Q,         KC_W,   KC_E,   KC_R,    KC_T,   KC_TRNS,
-	    KC_LCTRL,          KC_A,         KC_S,   KC_D,   KC_F,    KC_G,
+	    KC_LCTL,           KC_A,         KC_S,   KC_D,   KC_F,    KC_G,
 	    KC_LSFT,           CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,    KC_B,   KC_LALT,
 	    KC_TRNS, KC_QUOT,  LALT(KC_LSFT),  KC_LEFT, MO(SYMB),
 	    KC_TAB,  KC_DEL,
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	    // right hand
 	    KC_RGHT,      KC_6,    KC_7,    KC_8,    KC_9,              KC_0,           KC_DEL,
 	    KC_TRNS,      KC_Y,    KC_U,    KC_I,    KC_O,              KC_P,           KC_BSLS,
-	    KC_H,         KC_J,    KC_K,    KC_L,    LT(MDIA, KC_SCLN), KC_RCTRL,
+	    KC_H,         KC_J,    KC_K,    KC_L,    LT(MDIA, KC_SCLN), KC_RCTL,
 	    KC_RALT,      KC_N,    KC_M,    KC_COMM, KC_DOT,            CTL_T(KC_SLSH), KC_RSFT,
 	    MO(SYMB),     KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB),
 	    KC_LALT, CTL_T(KC_ESC),
diff --git a/layouts/community/ergodox/mclennon_osx/keymap.c b/layouts/community/ergodox/mclennon_osx/keymap.c
index fc53581030..aba1e3e7dc 100644
--- a/layouts/community/ergodox/mclennon_osx/keymap.c
+++ b/layouts/community/ergodox/mclennon_osx/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
         KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   MO(1),
         MO(1),      KC_A,   KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSHIFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
+        KC_LSFT,    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
         KC_LCTL,    KC_TRNS,KC_TRNS,KC_TRNS,KC_ESC,
                                                     KC_TRNS,KC_TRNS,
                                                             KC_TRNS,
@@ -77,8 +77,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // left hand
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_LSHIFT,KC_LCTL, KC_TRNS, KC_TRNS,
-       KC_LSHIFT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS,
+       KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                                            KC_TRNS, KC_TRNS,
                                                     KC_TRNS,
diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index 48fa117baf..5b279073cc 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -128,10 +128,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [NEO_1] = LAYOUT_ergodox(
     // left hand side - main
     KC_NO /* NOOP */, NEO2_1,                   NEO2_2,                   NEO2_3,                   NEO2_4,           NEO2_5,           KC_ESCAPE,
-    KC_TAB,           KC_X,                     KC_V,                     KC_L,                     KC_C,             KC_W,             KC_LCTRL,
+    KC_TAB,           KC_X,                     KC_V,                     KC_L,                     KC_C,             KC_W,             KC_LCTL,
     NEO2_LMOD3,       KC_U,                     KC_I,                     KC_A,                     KC_E,             KC_O,             /* --- */
-    KC_LSHIFT,        NEO2_UE,                  NEO2_OE,                  NEO2_AE,                  KC_P,             KC_Z,             KC_LALT,
-    KC_NO /* NOOP */, KC_NO /* NOOP */,         KC_LCTRL,                 KC_LALT,                  KC_LGUI,          /* --- */         /* --- */
+    KC_LSFT,          NEO2_UE,                  NEO2_OE,                  NEO2_AE,                  KC_P,             KC_Z,             KC_LALT,
+    KC_NO /* NOOP */, KC_NO /* NOOP */,         KC_LCTL,                  KC_LALT,                  KC_LGUI,          /* --- */         /* --- */
 
     // left hand side - thumb cluster
     /* --- */         MO(FKEYS),        KC_HOME,
@@ -140,9 +140,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // right hand side - main
     TO(US_1),         NEO2_6,           NEO2_7,           NEO2_8,           NEO2_9,           NEO2_0,           NEO2_MINUS,
-    KC_RCTRL,         KC_K,             KC_H,             KC_G,             KC_F,             KC_Q,             NEO2_SHARP_S,
+    KC_RCTL,          KC_K,             KC_H,             KC_G,             KC_F,             KC_Q,             NEO2_SHARP_S,
     /* --- */         KC_S,             KC_N,             KC_R,             KC_T,             KC_D,             NEO2_RMOD3,
-    KC_RALT,          KC_B,             KC_M,             NEO2_COMMA,       NEO2_DOT,         KC_J,             KC_RSHIFT,
+    KC_RALT,          KC_B,             KC_M,             NEO2_COMMA,       NEO2_DOT,         KC_J,             KC_RSFT,
     /* --- */         /* --- */         KC_RGUI,          KC_LEFT,          KC_DOWN,          KC_UP,            KC_RIGHT,
 
     // right hand side - thumb cluster
@@ -365,11 +365,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_EQUAL,         KC_1,         KC_2,       KC_3,       KC_4,       KC_5,       KC_ESCAPE,
     KC_BSLS,          KC_Q,         KC_W,       KC_E,       KC_R,       KC_T,       KC_NO /* NOOP */,
     KC_TAB,           KC_A,         KC_S,       KC_D,       KC_F,       KC_G,       /* --- */
-    KC_LSHIFT,        KC_Z,         KC_X,       KC_C,       KC_V,       KC_B,       KC_NO /* NOOP */,
+    KC_LSFT,          KC_Z,         KC_X,       KC_C,       KC_V,       KC_B,       KC_NO /* NOOP */,
     KC_LGUI,          KC_GRAVE,     KC_NO,      KC_NO,      MO(FKEYS),  /* --- */   /* --- */
 
     // left hand side - thumb cluster
-    /* --- */         KC_LCTRL,     KC_LALT,
+    /* --- */         KC_LCTL,      KC_LALT,
     /* --- */         /* --- */     KC_HOME,
     KC_BSPC,          KC_DELETE,    KC_END,
 
@@ -377,11 +377,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TO(NEO_1),        KC_6,         KC_7,       KC_8,       KC_9,       KC_0,       KC_MINUS,
     KC_LBRC,          KC_Y,         KC_U,       KC_I,       KC_O,       KC_P,       KC_RBRC,
     /* --- */         KC_H,         KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOTE,
-    KC_NO /* NOOP */, KC_N,         KC_M,       KC_COMMA,   KC_DOT,     KC_SLASH,   KC_RSHIFT,
+    KC_NO /* NOOP */, KC_N,         KC_M,       KC_COMMA,   KC_DOT,     KC_SLASH,   KC_RSFT,
     /* --- */         /* --- */     KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   KC_RGUI,
 
     // right hand side - thumb cluster
-    KC_RALT,          KC_RCTRL,     /* --- */
+    KC_RALT,          KC_RCTL,      /* --- */
     KC_PGUP,          /* --- */     /* --- */
     KC_PGDN,          KC_ENTER,     KC_SPACE
   ),
@@ -439,7 +439,7 @@ void tap_with_modifiers(uint16_t keycode, uint8_t force_modifiers) {
   uint8_t active_modifiers = get_mods();
 
   if ((force_modifiers & MOD_MASK_SHIFT) && !(active_modifiers & MOD_MASK_SHIFT)) register_code(KC_LSFT);
-  if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) register_code(KC_LCTRL);
+  if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) register_code(KC_LCTL);
   if ((force_modifiers & MOD_MASK_ALT) && !(active_modifiers & MOD_MASK_ALT)) register_code(KC_LALT);
   if ((force_modifiers & MOD_MASK_GUI) && !(active_modifiers & MOD_MASK_GUI)) register_code(KC_LGUI);
 
@@ -447,7 +447,7 @@ void tap_with_modifiers(uint16_t keycode, uint8_t force_modifiers) {
   unregister_code(keycode);
 
   if ((force_modifiers & MOD_MASK_SHIFT) && !(active_modifiers & MOD_MASK_SHIFT)) unregister_code(KC_LSFT);
-  if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) unregister_code(KC_LCTRL);
+  if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) unregister_code(KC_LCTL);
   if ((force_modifiers & MOD_MASK_ALT) && !(active_modifiers & MOD_MASK_ALT)) unregister_code(KC_LALT);
   if ((force_modifiers & MOD_MASK_GUI) && !(active_modifiers & MOD_MASK_GUI)) unregister_code(KC_LGUI);
 }
@@ -620,18 +620,18 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
 // Runs for each key down or up event.
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case KC_LSHIFT:
+    case KC_LSFT:
       if (record->event.pressed) {
-        capslock_state |= (MOD_BIT(KC_LSHIFT));
+        capslock_state |= (MOD_BIT(KC_LSFT));
       } else {
-        capslock_state &= ~(MOD_BIT(KC_LSHIFT));
+        capslock_state &= ~(MOD_BIT(KC_LSFT));
       }
       break;
-    case KC_RSHIFT:
+    case KC_RIGHT_SHIFT:
       if (record->event.pressed) {
-        capslock_state |= MOD_BIT(KC_RSHIFT);
+        capslock_state |= MOD_BIT(KC_RSFT);
       } else {
-        capslock_state &= ~(MOD_BIT(KC_RSHIFT));
+        capslock_state &= ~(MOD_BIT(KC_RSFT));
       }
       break;
     case NEO2_LMOD3:
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index ee97eb7bc5..262f6f0524 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -593,7 +593,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       break;
 #ifdef CFQ_USE_SHIFT_QUOTES
-    case KC_LSHIFT:  /* '' */
+    case KC_LEFT_SHIFT:  /* '' */
       if (record->event.pressed && (keyboard_report->mods & (MOD_BIT(KC_RSFT)))) {
         WITHOUT_MODS({
             SEND_STRING("''" SS_TAP(X_LEFT) SS_DOWN(X_RSHIFT) SS_DOWN(X_LSHIFT));
@@ -601,7 +601,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return false;
       }
       break;
-    case KC_RSHIFT:  /* "" */
+    case KC_RIGHT_SHIFT:  /* "" */
       if (record->event.pressed && (keyboard_report->mods & (MOD_BIT(KC_LSFT)))) {
         WITHOUT_MODS({
             SEND_STRING("\x22\x22" SS_TAP(X_LEFT) SS_DOWN(X_LSHIFT) SS_DOWN(X_RSHIFT));
diff --git a/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
index c8ee21990b..971e764ee2 100644
--- a/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_ergodox(
     KC_GRV,   KC_1,    KC_2,  KC_3,    KC_4,    KC_5,    KC_F5,
     KC_TAB,   KC_Q,    KC_W,  KC_D,    KC_F,    KC_K,    KC_BSLS,
-    KC_LCTRL, KC_A,    KC_S,  KC_E,    KC_T,    KC_G,
+    KC_LCTL,  KC_A,    KC_S,  KC_E,    KC_T,    KC_G,
     KC_LSFT,  KC_Z,    KC_X,  KC_C,    KC_V,    KC_B,    KC_LBRC,
     KC_F1,    KC_F2,   KC_F3, KC_F4,   KC_LGUI,
     /*-*/     /*-*/    /*-*/  /*-*/    /*-*/    KC_VOLD, KC_MUTE,
diff --git a/layouts/community/ergodox/siroken3/keymap.c b/layouts/community/ergodox/siroken3/keymap.c
index 5016ec4159..50695fd695 100644
--- a/layouts/community/ergodox/siroken3/keymap.c
+++ b/layouts/community/ergodox/siroken3/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
-        KC_LCTRL,       KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+        KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_BSPC,
         LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
                                                     KC_BSPC,  KC_LGUI,
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index 6b8ff9d9c8..1644512de7 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CAPS,         KC_A,     KC_S,     KC_D,    KC_F,    KC_G,
     KC_LSFT,         KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,   SE_ACUT,
     CTL_T(SE_QUOT),  SE_CIRC,  SE_ASTR,  KC_LALT, KC_LGUI,
-                                               KC_LCTRL,  KC_LALT,
+                                                 KC_LCTL, KC_LALT,
                                                           SE_TILD,
                                          KC_SPC, KC_BSPC, KC_ESC,
     // right hand
diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
index 920850ebee..cc18259d40 100644
--- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
@@ -28,10 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `----------------------'
  */
 [0] = LAYOUT_ergodox(
-	TG(1),     KC_1,       KC_2,       KC_3,       KC_4,  KC_5, LALT(KC_LSHIFT),
+	TG(1),     KC_1,       KC_2,       KC_3,       KC_4,  KC_5, LALT(KC_LSFT),
 	KC_TAB,    KC_QUOTE,   KC_COMMA,   KC_DOT,     KC_P,  KC_Y, TG(3),
 	KC_ESCAPE, KC_A,       KC_O,       KC_E,       KC_U,  KC_I,
-	KC_LSHIFT, KC_SCLN,    KC_Q,       KC_J,       KC_K,  KC_X, TG(2),
+	KC_LSFT,   KC_SCLN,    KC_Q,       KC_J,       KC_K,  KC_X, TG(2),
 	MO(3),     LCTL(KC_C), LCTL(KC_X), LCTL(KC_V), MO(2),
 	                                          KC_DELETE, KC_TRNS,
 	                                                     KC_LGUI,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TILD,   KC_6,    KC_7,        KC_8,        KC_9,      KC_0,     KC_EQUAL,
 	KC_TRNS,   KC_F,    KC_G,        KC_C,        KC_R,      KC_L,     KC_SLASH,
 	KC_D,      KC_H,    KC_T,        KC_N,        KC_S,      KC_MINUS,
-	KC_TRNS,   KC_B,    KC_M,        KC_W,        KC_V,      KC_Z,     KC_LSHIFT,
+	KC_TRNS,   KC_B,    KC_M,        KC_W,        KC_V,      KC_Z,     KC_LSFT,
 	                    KC_LBRC,     KC_RBRC,     KC_BSLS,   KC_UNDO,  LCTL(KC_A),
 	KC_END,    KC_HOME,
 	KC_PGUP,
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 724c80c644..8267c66730 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ortho_4x12(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_E,      KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,      KC_P,       KC_BSPC                 ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_S,        KC_D,      KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,      KC_SCLN,    MT(MOD_RSFT, KC_ENT)    ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT               ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
+  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(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
 /* Colemak-DHm
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT_ortho_4x12(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_F,      KC_P,    KC_B,    KC_J,    KC_L,    KC_U,      KC_Y,      KC_SCLN,   KC_BSPC                 ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_R,        KC_S,      KC_T,    KC_G,    KC_M,    KC_N,    KC_E,      KC_I,      KC_O,      MT(MOD_RSFT, KC_ENT)    ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSHIFT               ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,   MO(_FUNC2)
+  KC_LSFT,               KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT                 ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,   MO(_FUNC2)
 ),
 
 /* Function
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNC] = LAYOUT_ortho_4x12(
   KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12                 ,
   KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,    KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT              ,
-  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
+  KC_LSFT,   KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT)   ,
   _______,   _______, _______,  _______,       _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
diff --git a/layouts/community/ortho_4x12/bredfield/keymap.c b/layouts/community/ortho_4x12/bredfield/keymap.c
index af704ca398..64b72bd338 100644
--- a/layouts/community/ortho_4x12/bredfield/keymap.c
+++ b/layouts/community/ortho_4x12/bredfield/keymap.c
@@ -62,7 +62,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_MINS,
     GUI_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    SCL_NAV, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-    L_NUMPAD,KC_LCTL, KC_LALT, KC_LGUI, L_LOWER, KC_BSPC, KC_SPACE,L_RAISE, KC_RCTRL,KC_RALT, L_UI,    L_KEYBD
+    L_NUMPAD,KC_LCTL, KC_LALT, KC_LGUI, L_LOWER, KC_BSPC, KC_SPACE,L_RAISE, KC_RCTL, KC_RALT, L_UI,    L_KEYBD
 ),
 
 /* Lower
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index 58b7e73f69..31cecd5638 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -104,16 +104,16 @@
   "KC_NUHS": "#",
   "KC_CAPS_LOCK": "Caps",
   "KC_CAPS": "Caps",
-  "KC_LCTRL": "Ctrl",
+  "KC_LEFT_CTRL": "Ctrl",
   "KC_LCTL": "Ctrl",
-  "KC_LSHIFT": "\u21e7",
+  "KC_LEFT_SHIFT": "\u21e7",
   "KC_LSFT": "\u21e7",
   "KC_LALT": "\u2325",
   "KC_LGUI": "\u2318",
   "KC_LCMD": "\u2318",
-  "KC_RCTRL": "Right Control",
+  "KC_RIGHT_CTRL": "Right Control",
   "KC_RCTL": "Right Control",
-  "KC_RSHIFT": "\u21e7",
+  "KC_RIGHT_SHIFT": "\u21e7",
   "KC_RSFT": "\u21e7",
   "KC_RALT": "\u2325",
   "KC_RGUI": "\u2318",
diff --git a/quantum/keycode.h b/quantum/keycode.h
index b492e4292a..2e9a85ee66 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -545,5 +545,3 @@ enum mouse_keys {
     KC_MS_ACCEL1,
     KC_MS_ACCEL2 // 0xDF, or 0xFF if via enabled
 };
-
-#include "keycode_legacy.h"
diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h
deleted file mode 100644
index d69d141291..0000000000
--- a/quantum/keycode_legacy.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-// clang-format off
-
-// These keycode names have been deprecated
-
-#define KC_LCTRL          KC_LEFT_CTRL
-#define KC_LSHIFT         KC_LEFT_SHIFT
-#define KC_RCTRL          KC_RIGHT_CTRL
-#define KC_RSHIFT         KC_RIGHT_SHIFT
diff --git a/users/alfrdmalr/alfrdmalr.h b/users/alfrdmalr/alfrdmalr.h
index 828001b582..6d6e5dfcfc 100644
--- a/users/alfrdmalr/alfrdmalr.h
+++ b/users/alfrdmalr/alfrdmalr.h
@@ -219,7 +219,7 @@ enum alfrdmalr_keycodes {
 // LEFT
 // - CORE
 #define __NAVIGATION_L1__    KC_NO,    KC_NO,     KC_SPC,   KC_F5,     KC_NO
-#define __NAVIGATION_L2__    KC_LSFT,  KC_LCTRL,  KC_LALT,  KC_LGUI,   KC_NO
+#define __NAVIGATION_L2__    KC_LSFT,  KC_LCTL,   KC_LALT,  KC_LGUI,   KC_NO
 #define __NAVIGATION_L3__    WINUNDO,  WINCUT,    WINCOPY,  WINPASTE,  KC_NO
 
 // - MODS
diff --git a/users/art/funcs/string_funcs.c b/users/art/funcs/string_funcs.c
index 3cf35356e1..319b1310e4 100644
--- a/users/art/funcs/string_funcs.c
+++ b/users/art/funcs/string_funcs.c
@@ -46,8 +46,8 @@ const uint16_t PROGMEM combo_up[] = {KC_W, KC_R, COMBO_END};
 const uint16_t PROGMEM combo_left[] = {KC_S, KC_E, COMBO_END};
 const uint16_t PROGMEM combo_right[] = {KC_F, KC_E, COMBO_END};
 const uint16_t PROGMEM combo_down[] = {KC_S, KC_F, COMBO_END};
-const uint16_t PROGMEM combo_prev_word[] = {KC_S, KC_LCTRL, COMBO_END};
-const uint16_t PROGMEM combo_next_word[] = {KC_F, KC_LCTRL, COMBO_END};
+const uint16_t PROGMEM combo_prev_word[] = {KC_S, KC_LCTL, COMBO_END};
+const uint16_t PROGMEM combo_next_word[] = {KC_F, KC_LCTL, COMBO_END};
 const uint16_t PROGMEM combo_end[] = {KC_W, KC_E, COMBO_END};
 const uint16_t PROGMEM combo_home[] = {KC_E, KC_R, COMBO_END};
 
@@ -64,7 +64,7 @@ const uint16_t PROGMEM combo_f8[] = {KC_8, KC_I, COMBO_END};
 const uint16_t PROGMEM combo_f9[] = {KC_9, KC_O, COMBO_END};
 const uint16_t PROGMEM combo_f10[] = {KC_0, KC_P, COMBO_END};
 const uint16_t PROGMEM combo_f11[] = {LT(GIT,KC_SLSH), KC_RSFT, COMBO_END};
-const uint16_t PROGMEM combo_f12[] = {KC_RALT, KC_RCTRL, COMBO_END};
+const uint16_t PROGMEM combo_f12[] = {KC_RALT, KC_RCTL, COMBO_END};
 const uint16_t PROGMEM combo_pscreen[] = {TO(WORKMAN), KC_RALT, COMBO_END};
 
 const uint16_t PROGMEM done_sm[] = {KC_LEFT, KC_RIGHT, COMBO_END};
diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c
index dfd427bdc1..892bc7e062 100644
--- a/users/brandonschlack/process_records.c
+++ b/users/brandonschlack/process_records.c
@@ -101,7 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
         case RGB_THEME_FORWARD:
             if (record->event.pressed) {
-                uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+                uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
                 if(shifted) {
                     rgb_theme_step_reverse();
                 } else {
@@ -112,7 +112,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
         case RGB_THEME_REVERSE:
             if (record->event.pressed) {
-                uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+                uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
                 if(shifted) {
                     rgb_theme_step();
                 } else {
diff --git a/users/d4mation/tap-dance.c b/users/d4mation/tap-dance.c
index 46f2274f5f..77d09962d6 100644
--- a/users/d4mation/tap-dance.c
+++ b/users/d4mation/tap-dance.c
@@ -2,5 +2,5 @@
 
 qk_tap_dance_action_t tap_dance_actions[] = {
   /* Tap once/hold for Shift, tap twice for Caps Lock */
-  [SHIFT_CAPS] = ACTION_TAP_DANCE_DOUBLE( KC_LSHIFT, KC_CAPS )
+  [SHIFT_CAPS] = ACTION_TAP_DANCE_DOUBLE( KC_LSFT, KC_CAPS )
 };
\ No newline at end of file
diff --git a/users/datagrok/feature_cdeq.c b/users/datagrok/feature_cdeq.c
index c1796ab227..50f784b2dd 100644
--- a/users/datagrok/feature_cdeq.c
+++ b/users/datagrok/feature_cdeq.c
@@ -27,7 +27,7 @@ bool process_record_cdeq(uint16_t keycode, keyrecord_t *record) {
     return true;
   }
 
-  shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+  shifted = get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
 
   // Keydown. If shift is currently pressed, register its alternate keycode.
   if (record->event.pressed && shifted) {
diff --git a/users/datagrok/feature_default_layers_selector.c b/users/datagrok/feature_default_layers_selector.c
index c83c773f83..0ae1a894a0 100644
--- a/users/datagrok/feature_default_layers_selector.c
+++ b/users/datagrok/feature_default_layers_selector.c
@@ -15,7 +15,7 @@ bool process_record_save_default_layer(uint16_t keycode, keyrecord_t *record) {
 
     if (!(keycode == KF_LAYO
           && record->event.pressed
-          && get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)))) {
+          && get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)))) {
         return true;
     }
 
diff --git a/users/doogle999/doogle999.h b/users/doogle999/doogle999.h
index 7ed38fbcc8..44c7c19fd9 100644
--- a/users/doogle999/doogle999.h
+++ b/users/doogle999/doogle999.h
@@ -6,7 +6,7 @@
 #define NO_ACTION_ONESHOT
 #define NO_ACTION_MACRO
 
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
 
 // Layer the calculator is on
 #define CALC_LAYER 2
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 7aee350baf..85a66eec7e 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -375,14 +375,14 @@ void render_mod_status(uint8_t modifiers, uint8_t col, uint8_t line) {
 #endif
     oled_write_P(PSTR(OLED_RENDER_MODS_NAME), false);
 #if defined(OLED_DISPLAY_VERBOSE)
-    oled_write_P(mod_status[0], (modifiers & MOD_BIT(KC_LSHIFT)));
+    oled_write_P(mod_status[0], (modifiers & MOD_BIT(KC_LSFT)));
     oled_write_P(mod_status[!keymap_config.swap_lctl_lgui ? 3 : 4], (modifiers & MOD_BIT(KC_LGUI)));
     oled_write_P(mod_status[2], (modifiers & MOD_BIT(KC_LALT)));
     oled_write_P(mod_status[1], (modifiers & MOD_BIT(KC_LCTL)));
     oled_write_P(mod_status[1], (modifiers & MOD_BIT(KC_RCTL)));
     oled_write_P(mod_status[2], (modifiers & MOD_BIT(KC_RALT)));
     oled_write_P(mod_status[!keymap_config.swap_lctl_lgui ? 3 : 4], (modifiers & MOD_BIT(KC_RGUI)));
-    oled_write_P(mod_status[0], (modifiers & MOD_BIT(KC_RSHIFT)));
+    oled_write_P(mod_status[0], (modifiers & MOD_BIT(KC_RSFT)));
 #else
     oled_write_P(mod_status[0], (modifiers & MOD_MASK_SHIFT));
     oled_write_P(mod_status[!keymap_config.swap_lctl_lgui ? 3 : 4], (modifiers & MOD_MASK_GUI));
diff --git a/users/gordon/gordon.c b/users/gordon/gordon.c
index 3115e1c328..cc9f3a2599 100644
--- a/users/gordon/gordon.c
+++ b/users/gordon/gordon.c
@@ -60,12 +60,12 @@ void unregister_shift_f6 (void) {
 
 void register_ctrl_shift (void) {
   register_code (KC_LSFT);
-  register_code (KC_LCTRL);
+  register_code (KC_LCTL);
 }
 
 void unregister_ctrl_shift (void) {
   unregister_code (KC_LSFT);
-  unregister_code (KC_LCTRL);
+  unregister_code (KC_LCTL);
 }
 
 void register_alt_shift (void) {
@@ -177,8 +177,8 @@ void tab_finished (qk_tap_dance_state_t *state, void *user_data) {
     case SINGLE_HOLD: register_ctrl_shift(); break;
     case DOUBLE_HOLD: register_alt_shift(); break; //alt shift on single hold
     case DOUBLE_TAP: register_code(KC_TAB); unregister_code(KC_TAB); register_code(KC_TAB); break; //tab tab
-    case TRIPLE_TAP: register_code(KC_LSHIFT) ;register_code(KC_ESC); break;
-    case TRIPLE_HOLD: register_code(KC_LSHIFT); register_code(KC_LGUI); break;
+    case TRIPLE_TAP: register_code(KC_LSFT) ;register_code(KC_ESC); break;
+    case TRIPLE_HOLD: register_code(KC_LSFT); register_code(KC_LGUI); break;
   }
 }
 
@@ -188,8 +188,8 @@ void tab_reset (qk_tap_dance_state_t *state, void *user_data) {
     case DOUBLE_HOLD: unregister_alt_shift(); break; //let go of alt shift
     case DOUBLE_TAP: unregister_code(KC_TAB); break;
     case SINGLE_HOLD: unregister_ctrl_shift(); break;
-    case TRIPLE_TAP: unregister_code(KC_LSHIFT); unregister_code(KC_ESC); break;
-    case TRIPLE_HOLD: unregister_code(KC_LSHIFT); unregister_code(KC_LGUI); break;
+    case TRIPLE_TAP: unregister_code(KC_LSFT); unregister_code(KC_ESC); break;
+    case TRIPLE_HOLD: unregister_code(KC_LSFT); unregister_code(KC_LGUI); break;
   }
   tab_state.state = 0;
 }
diff --git a/users/issmirnov/rows.h b/users/issmirnov/rows.h
index 4774e0162c..bac91d641b 100644
--- a/users/issmirnov/rows.h
+++ b/users/issmirnov/rows.h
@@ -40,7 +40,7 @@
 // Note: These are 6x1 blocks, since modifiers are also adjusted.
 #define ______________OVERWATCH_L1_________________       KC_TAB    , KC_Q  , KC_W       , KC_E , KC_R , KC_T
 #define ______________OVERWATCH_L2_________________       KC_LCTL   , KC_A  , KC_S       , KC_D , KC_F , KC_P
-#define ______________OVERWATCH_L3_________________       KC_LSHIFT , KC_Z  , KC_X       , KC_C , KC_V , KC_GRAVE
+#define ______________OVERWATCH_L3_________________       KC_LSFT   , KC_Z  , KC_X       , KC_C , KC_V , KC_GRAVE
 // Ergodox only has 5 keys on bottom row:
 #define ______________OVERWATCH_L4_________________       KC_LCTL   , KC_F9 , KC_PSCR , KC_H , KC_R
 
diff --git a/users/miles2go/milestogo.h b/users/miles2go/milestogo.h
index 3a99f6d2a8..81fc02ded1 100644
--- a/users/miles2go/milestogo.h
+++ b/users/miles2go/milestogo.h
@@ -36,8 +36,8 @@ enum userspace_layers { _QWERTY = 0, _CDH, _SYM, _MOV, _DMOV, _NUM };
 /*
 define modifiers here, since MOD_* doesn't seem to work for these
  */
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))
+#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL))
 #define MODS_ALT_MASK (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT))
 #define MODS_GUI_MASK (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI))
 
diff --git a/users/moults31/obs.c b/users/moults31/obs.c
index 0ae5f3deb4..a0d2ee5496 100644
--- a/users/moults31/obs.c
+++ b/users/moults31/obs.c
@@ -17,7 +17,7 @@
 
 bool process_record_obs(uint16_t keycode, keyrecord_t *record) {
     // Apply all 4 mods for custom OBS macros
-    register_code(KC_LSHIFT);
+    register_code(KC_LSFT);
     register_code(KC_LCTL);
     register_code(KC_LALT);
     register_code(KC_LGUI);
@@ -71,7 +71,7 @@ bool process_record_obs(uint16_t keycode, keyrecord_t *record) {
     }
 
     // Unpress all 4 mods for custom OBS macros
-    unregister_code(KC_LSHIFT);
+    unregister_code(KC_LSFT);
     unregister_code(KC_LCTL);
     unregister_code(KC_LALT);
     unregister_code(KC_LGUI);
diff --git a/users/pcoves/tapDance.c b/users/pcoves/tapDance.c
index 548ed35274..05b451f02e 100644
--- a/users/pcoves/tapDance.c
+++ b/users/pcoves/tapDance.c
@@ -60,7 +60,7 @@ void       altFinish(qk_tap_dance_state_t* state, void* user_data) {
         case 3:
             if (state->pressed) {
                 register_code(KC_RALT);
-                register_code(KC_RSHIFT);
+                register_code(KC_RSFT);
                 Alt = HOLD3;
             }
             break;
@@ -78,7 +78,7 @@ void altReset(qk_tap_dance_state_t* state, void* user_data) {
             unregister_code(KC_RALT);
             break;
         case HOLD3:
-            unregister_code(KC_RSHIFT);
+            unregister_code(KC_RSFT);
             unregister_code(KC_RALT);
             break;
     }
diff --git a/users/sethBarberee/tap_dance.c b/users/sethBarberee/tap_dance.c
index 588ac9be66..9461e5ad60 100644
--- a/users/sethBarberee/tap_dance.c
+++ b/users/sethBarberee/tap_dance.c
@@ -51,7 +51,7 @@ void dance_ecap_finished (qk_tap_dance_state_t *state, void *user_data){
             tap_code(KC_ESC);
             break;
         case SINGLE_HOLD:
-            register_code(KC_LCTRL);
+            register_code(KC_LCTL);
             break;
         case DOUBLE_TAP:
             tap_code(KC_CAPS);
@@ -76,7 +76,7 @@ void dance_ecap_finished (qk_tap_dance_state_t *state, void *user_data){
 
 void dance_ecap_reset (qk_tap_dance_state_t *state, void *user_data){
     if(caps_status.state == SINGLE_HOLD){
-        unregister_code(KC_LCTRL);
+        unregister_code(KC_LCTL);
     }
     caps_status.state = 0;
 }
diff --git a/users/sigul/sigul.c b/users/sigul/sigul.c
index 725881ad8a..c9793ebb1f 100644
--- a/users/sigul/sigul.c
+++ b/users/sigul/sigul.c
@@ -25,7 +25,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case IT_SCCL:
       if (record->event.pressed){
-        if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RIGHT_SHIFT)){
           register_code16(IT_COLN);
         } else {
           register_code16(IT_SCLN);
@@ -39,7 +39,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case IT_APDQ:
       if (record->event.pressed){
-        if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RIGHT_SHIFT)){
           register_code16(IT_DQUO);
         } else {
           register_code16(IT_QUOT);
@@ -53,7 +53,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case IT_CMLS:
       if (record->event.pressed){
-        if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RIGHT_SHIFT)){
           unregister_code16(KC_LSFT);
           register_code16(IT_LABK);
 	  register_code16(KC_LSFT);
@@ -69,7 +69,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case IT_DTMR:
       if (record->event.pressed){
-        if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RIGHT_SHIFT)){
           register_code16(IT_RABK);
         } else {
           register_code16(IT_DOT);
@@ -83,7 +83,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case IT_SLQS:
       if (record->event.pressed){
-        if (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)){
+        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RIGHT_SHIFT)){
           register_code16(IT_QUES);
         } else {
           register_code16(IT_SLSH);
diff --git a/users/twschum/twschum.c b/users/twschum/twschum.c
index 2d34f95718..7f1cb3de78 100644
--- a/users/twschum/twschum.c
+++ b/users/twschum/twschum.c
@@ -79,7 +79,7 @@ static inline bool tap_ctrl_other_pressed(void) {
                 // need to send the plain keycode plus potential mods
                 if (get_mods() & MOD_MASK_CTRL) {
                     // make sure to send a shift if prssed
-                    repeat_send_keys(key->count, KC_RSHIFT, key->keycode);
+                    repeat_send_keys(key->count, KC_RSFT, key->keycode);
                 }
                 else {
                     repeat_send_keys(key->count, key->keycode);
diff --git a/users/twschum/xtonhasvim.c b/users/twschum/xtonhasvim.c
index 15d1b0d940..b3f410bc26 100644
--- a/users/twschum/xtonhasvim.c
+++ b/users/twschum/xtonhasvim.c
@@ -144,9 +144,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
               break;
             case VIM_C:
               if(SHIFTED) {
-                register_code(KC_LSHIFT);
+                register_code(KC_LSFT);
                   tap_code16(LGUI(KC_RIGHT));
-                unregister_code(KC_LSHIFT);
+                unregister_code(KC_LSFT);
                 tap_code16(LGUI(KC_X));
                 yank_was_lines = false;
                 EDIT;
@@ -225,9 +225,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
               // s for substitute?
               if(SHIFTED) {
                 tap_code16(LGUI(KC_LEFT));
-                register_code(KC_LSHIFT);
+                register_code(KC_LSFT);
                   tap_code16(LGUI(KC_RIGHT));
-                unregister_code(KC_LSHIFT);
+                unregister_code(KC_LSFT);
                 tap_code16(LGUI(KC_X));
                 yank_was_lines = false;
                 EDIT;
@@ -242,7 +242,7 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
               if(SHIFTED) {
                 register_code(KC_LSFT);
                   tap_code16(LGUI(KC_Z));
-                unregister_code(KC_LSHIFT);
+                unregister_code(KC_LSFT);
               } else {
                 tap_code16(LGUI(KC_Z));
               }
@@ -305,9 +305,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
 
           case VIM_C:
             tap_code16(LGUI(KC_LEFT));
-            register_code(KC_LSHIFT);
+            register_code(KC_LSFT);
               tap_code16(LGUI(KC_RIGHT));
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LSFT);
             tap_code16(LGUI(KC_X));
             yank_was_lines = false;
             EDIT;
@@ -327,9 +327,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
           switch(keycode) {
             case VIM_W:
               tap_code16(LALT(KC_LEFT));
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
                 tap_code16(LALT(KC_RIGHT));
-              unregister_code(KC_LSHIFT);
+              unregister_code(KC_LSFT);
               tap_code16(LGUI(KC_X));
               yank_was_lines = false;
               EDIT;
@@ -377,9 +377,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
           switch(keycode) {
             case VIM_W:
               tap_code16(LALT(KC_LEFT));
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
                 tap_code16(LALT(KC_RIGHT));
-              unregister_code(KC_LSHIFT);
+              unregister_code(KC_LSFT);
               tap_code16(LGUI(KC_X));
               yank_was_lines = false;
               vstate = VIM_START;
@@ -401,33 +401,33 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
               break;
             case VIM_B:
               register_code(KC_LALT);
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_LEFT);
               // leave open for key repeat
               break;
             case VIM_E:
               register_code(KC_LALT);
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_RIGHT);
               // leave open for key repeat
               break;
             case VIM_H:
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_LEFT);
               break;
             case VIM_I:
               vstate = VIM_VI;
               break;
             case VIM_J:
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_DOWN);
               break;
             case VIM_K:
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_UP);
               break;
             case VIM_L:
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_RIGHT);
               break;
             case VIM_W:
@@ -468,9 +468,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
           switch(keycode) {
             case VIM_W:
               tap_code16(LALT(KC_LEFT));
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
                 tap_code16(LALT(KC_RIGHT));
-              unregister_code(KC_LSHIFT);
+              unregister_code(KC_LSFT);
               vstate = VIM_V;
             default:
               // ignore
@@ -490,11 +490,11 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) {
               vstate = VIM_START;
               break;
             case VIM_J:
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_DOWN);
               break;
             case VIM_K:
-              register_code(KC_LSHIFT);
+              register_code(KC_LSFT);
               register_code(KC_UP);
               break;
             case VIM_Y:
diff --git a/users/wanleg/tapdances.c b/users/wanleg/tapdances.c
index 1be5636dc7..8f87af720e 100644
--- a/users/wanleg/tapdances.c
+++ b/users/wanleg/tapdances.c
@@ -224,7 +224,7 @@ void BSW_finished (qk_tap_dance_state_t *state, void *user_data) {
       #endif
       break;
     case DOUBLE_TAP:
-	  register_code(KC_LCTRL);
+	  register_code(KC_LCTL);
       register_code(KC_C);
 	  break;
 	case DOUBLE_HOLD:
@@ -237,7 +237,7 @@ void BSW_reset (qk_tap_dance_state_t *state, void *user_data) {
   switch (BSWtap_state.state) {
     case SINGLE_TAP: unregister_code(KC_ENTER); break;
     case DOUBLE_TAP:
-	  unregister_code(KC_LCTRL);
+	  unregister_code(KC_LCTL);
 	  unregister_code(KC_C);
 	  break;
   }
diff --git a/users/xtonhasvim/xtonhasvim.c b/users/xtonhasvim/xtonhasvim.c
index 1bb5781c47..2d59cf2c62 100644
--- a/users/xtonhasvim/xtonhasvim.c
+++ b/users/xtonhasvim/xtonhasvim.c
@@ -36,15 +36,15 @@ static void CMD(uint16_t keycode) {
 }
 
 static void CTRL(uint16_t keycode) {
-  PRESS(KC_LCTRL);
+  PRESS(KC_LCTL);
     TAP(keycode);
-  RELEASE(KC_LCTRL);
+  RELEASE(KC_LCTL);
 }
 
 static void SHIFT(uint16_t keycode) {
-  PRESS(KC_LSHIFT);
+  PRESS(KC_LSFT);
     TAP(keycode);
-  RELEASE(KC_LSHIFT);
+  RELEASE(KC_LSFT);
 }
 
 static void ALT(uint16_t keycode) {
@@ -194,9 +194,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
               break;
             case VIM_C:
               if(SHIFTED) {
-                PRESS(KC_LSHIFT);
+                PRESS(KC_LSFT);
                   CMD(KC_RIGHT);
-                RELEASE(KC_LSHIFT);
+                RELEASE(KC_LSFT);
                 CMD(KC_X);
                 yank_was_lines = false;
                 EDIT;
@@ -275,9 +275,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
               // s for substitute?
               if(SHIFTED) {
                 CMD(KC_LEFT);
-                PRESS(KC_LSHIFT);
+                PRESS(KC_LSFT);
                   CMD(KC_RIGHT);
-                RELEASE(KC_LSHIFT);
+                RELEASE(KC_LSFT);
                 CMD(KC_X);
                 yank_was_lines = false;
                 EDIT;
@@ -292,7 +292,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
               if(SHIFTED) {
                 PRESS(KC_LSFT);
                   CMD(KC_Z);
-                RELEASE(KC_LSHIFT);
+                RELEASE(KC_LSFT);
               } else {
                 CMD(KC_Z);
               }
@@ -355,9 +355,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
           case VIM_C:
             CMD(KC_LEFT);
-            PRESS(KC_LSHIFT);
+            PRESS(KC_LSFT);
               CMD(KC_RIGHT);
-            RELEASE(KC_LSHIFT);
+            RELEASE(KC_LSFT);
             CMD(KC_X);
             yank_was_lines = false;
             EDIT;
@@ -377,9 +377,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           switch(keycode) {
             case VIM_W:
               ALT(KC_LEFT);
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
                 ALT(KC_RIGHT);
-              RELEASE(KC_LSHIFT);
+              RELEASE(KC_LSFT);
               CMD(KC_X);
               yank_was_lines = false;
               EDIT;
@@ -427,9 +427,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           switch(keycode) {
             case VIM_W:
               ALT(KC_LEFT);
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
                 ALT(KC_RIGHT);
-              RELEASE(KC_LSHIFT);
+              RELEASE(KC_LSFT);
               CMD(KC_X);
               yank_was_lines = false;
               vstate = VIM_START;
@@ -451,33 +451,33 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
               break;
             case VIM_B:
               PRESS(KC_LALT);
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_LEFT);
               // leave open for key repeat
               break;
             case VIM_E:
               PRESS(KC_LALT);
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_RIGHT);
               // leave open for key repeat
               break;
             case VIM_H:
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_LEFT);
               break;
             case VIM_I:
               vstate = VIM_VI;
               break;
             case VIM_J:
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_DOWN);
               break;
             case VIM_K:
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_UP);
               break;
             case VIM_L:
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_RIGHT);
               break;
             case VIM_W:
@@ -518,9 +518,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           switch(keycode) {
             case VIM_W:
               ALT(KC_LEFT);
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
                 ALT(KC_RIGHT);
-              RELEASE(KC_LSHIFT);
+              RELEASE(KC_LSFT);
               vstate = VIM_V;
             default:
               // ignore
@@ -540,11 +540,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
               vstate = VIM_START;
               break;
             case VIM_J:
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_DOWN);
               break;
             case VIM_K:
-              PRESS(KC_LSHIFT);
+              PRESS(KC_LSFT);
               PRESS(KC_UP);
               break;
             case VIM_Y:
diff --git a/users/zer09/tap_dance.c b/users/zer09/tap_dance.c
index e99b26cca0..4c7d182d8a 100644
--- a/users/zer09/tap_dance.c
+++ b/users/zer09/tap_dance.c
@@ -55,11 +55,11 @@ int cur_dance(qk_tap_dance_state_t *state) {
 
 void dance_lctl_finished(qk_tap_dance_state_t *state, void *user_data) {
   rbw_led_keys[RBW_LCTL].status = ENABLED;
-  register_code(KC_LCTRL);
+  register_code(KC_LCTL);
 };
 
 void dance_lctl_reset(qk_tap_dance_state_t *state, void *user_data) {
-  unregister_code(KC_LCTRL);
+  unregister_code(KC_LCTL);
   rbw_led_keys[RBW_LCTL].status = DISABLED;
 };
 
@@ -91,11 +91,11 @@ void dance_lspr_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 void dance_rctl_finished(qk_tap_dance_state_t *state, void *user_data) {
   rbw_led_keys[RBW_RCTL].status = ENABLED;
-  register_code(KC_RCTRL);
+  register_code(KC_RCTL);
 };
 
 void dance_rctl_reset(qk_tap_dance_state_t *state, void *user_data) {
-  unregister_code(KC_RCTRL);
+  unregister_code(KC_RCTL);
   rbw_led_keys[RBW_RCTL].status = DISABLED;
 };
 

From f731e2789fdd225be1c5b0322c6ba882adf47c8d Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 17 Oct 2022 07:30:49 +1100
Subject: [PATCH 661/959] Allow Fedora to update ChibiOS configs. (#18698)

---
 .../GENERIC_STM32_F401XC/configs/mcuconf.h    |  4 +--
 .../chibios/boards/STEMCELL/configs/mcuconf.h | 25 +++++++++++++++++--
 util/chibios_conf_updater.sh                  | 12 ++++++---
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/mcuconf.h
index 24cec7137d..1208563aa1 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/mcuconf.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/mcuconf.h
@@ -53,8 +53,8 @@
 #define STM32_PLLP_VALUE                    4
 #define STM32_PLLQ_VALUE                    7
 #define STM32_HPRE                          STM32_HPRE_DIV1
-#define STM32_PPRE1                         STM32_PPRE1_DIV2  
-#define STM32_PPRE2                         STM32_PPRE2_DIV1 
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV1
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI
 #define STM32_RTCPRE_VALUE                  8
 #define STM32_MCO1SEL                       STM32_MCO1SEL_HSI
diff --git a/platforms/chibios/boards/STEMCELL/configs/mcuconf.h b/platforms/chibios/boards/STEMCELL/configs/mcuconf.h
index 621d3fcace..db239854aa 100644
--- a/platforms/chibios/boards/STEMCELL/configs/mcuconf.h
+++ b/platforms/chibios/boards/STEMCELL/configs/mcuconf.h
@@ -1,5 +1,18 @@
-// Copyright 2022 Mega Mind (@megamind4089)
-// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+    ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
 
 #ifndef MCUCONF_H
 #define MCUCONF_H
@@ -165,6 +178,14 @@
 #define STM32_PWM_USE_TIM10                 FALSE
 #define STM32_PWM_USE_TIM11                 FALSE
 
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
+
 /*
  * SERIAL driver system settings.
  */
diff --git a/util/chibios_conf_updater.sh b/util/chibios_conf_updater.sh
index a5699ca3cb..3c400ab63c 100755
--- a/util/chibios_conf_updater.sh
+++ b/util/chibios_conf_updater.sh
@@ -12,11 +12,14 @@ umask 022
 #   wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
 #   sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
 #   sudo apt-get update && sudo apt-get install adoptopenjdk-8-hotspot
-
+#
+# For Fedora 36-ish distros:
+#  # Prep yum repository from https://adoptium.net/installation/linux/
+#  sudo dnf install -y ant temurin-8-jdk
+#  export JAVA_HOME=/usr/lib/jvm/temurin-8-jdk
 
 sinfo() { echo "$@" >&2 ; }
 shead() { sinfo "" ; sinfo "---------------------------------" ; sinfo "-- $@" ; sinfo "---------------------------------" ; }
-havecmd()  { command command type "${1}" >/dev/null 2>&1 || return 1 ; }
 
 this_script="$(realpath "${BASH_SOURCE[0]}")"
 script_dir="$(realpath "$(dirname "$this_script")")"
@@ -31,7 +34,7 @@ build_fmpp() {
         || { mkdir "$script_dir/fmpp" && tar xf "$script_dir/fmpp.tar.gz" -C "$script_dir/fmpp" --strip-components=1 ; }
     pushd "$script_dir/fmpp" >/dev/null 2>&1
     sed -e "s#bootclasspath.path=.*#bootclasspath.path=$(find /usr/lib/jvm -name 'rt.jar' | sort | tail -n1)#g" \
-        -e "s#ant.jar.path=.*#ant.jar.path=$(find /usr/share/java -name 'ant-1*.jar' | sort | tail -n1)#g" \
+        -e "s#ant.jar.path=.*#ant.jar.path=$(find /usr/share/java -name 'ant-1*.jar' -or -name 'ant.jar' | sort | tail -n1)#g" \
         build.properties.sample > build.properties
     sed -e 's#source="1.5"#source="1.8"#g' \
         -e 's#target="1.5"#target="1.8"#g' \
@@ -98,7 +101,8 @@ upgrade_mcuconf_files() {
     popd >/dev/null 2>&1
 }
 
-havecmd fmpp || build_fmpp
+hash -r
+[[ -n "$(which fmpp 2>/dev/null)" ]] || build_fmpp
 
 upgrade_mcuconf_files
 upgrade_chconf_files

From bad8c5992bf68b6f2218b9b7a0b31c6ee7a03796 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 17 Oct 2022 23:45:23 +1100
Subject: [PATCH 662/959] Remove legacy sendstring keycodes (#18749)

---
 .../gherkin/keymaps/itsaferbie/keymap.c       |   2 +-
 .../half_n_half/keymaps/Boy_314/keymap.c      |   6 +-
 keyboards/atreus/keymaps/workman/keymap.c     |   4 +-
 keyboards/crkbd/keymaps/nimishgautam/keymap.c |   2 +-
 keyboards/dichotomy/keymaps/default/keymap.c  |   6 +-
 .../dztech/dz65rgb/keymaps/drootz/keymap.c    |   2 +-
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c |   8 +-
 .../hacker_dvorak/user/process_record_user.c  |   2 +-
 .../bigswitch/keymaps/333fred/keymap.c        |   2 +-
 .../datahand/keymaps/default/keymap.c         |   4 +-
 .../lagrange/keymaps/dpapavas/keymap.c        |   8 +-
 .../hotswap/keymaps/stevanmilic/keymap.c      |   2 +-
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |   2 +-
 .../kbdfans/niu_mini/keymaps/tobias/keymap.c  |   2 +-
 .../keebio/bdn9/keymaps/hbbisenieks/keymap.c  |   4 +-
 keyboards/keebio/iris/keymaps/eosti/keymap.c  |   4 +-
 .../levinson/keymaps/rossman360/keymap.c      |  18 +-
 .../keebio/nyquist/keymaps/bramver/keymap.c   |   8 +-
 keyboards/keebio/viterbi/keymaps/met/keymap.c |  18 +-
 keyboards/keyhive/uno/keymaps/demo/keymap.c   |   2 +-
 .../jj40/keymaps/skewwhiffy/keymap.c          |   2 +-
 .../kprepublic/jj40/keymaps/stevexyz/keymap.c |   2 +-
 keyboards/ktec/staryu/keymaps/krusli/keymap.c |   2 +-
 keyboards/m10a/keymaps/gam3cat/keymap.c       |   2 +-
 .../massdrop/ctrl/keymaps/endgame/keymap.c    |   2 +-
 .../massdrop/ctrl/keymaps/xanimos/keymap.c    |   2 +-
 .../mechkeys/espectro/keymaps/mac/keymap.c    |   6 +-
 .../ergodash/rev1/keymaps/m47ch4n/keymap.c    |  10 +-
 .../planck/keymaps/dvorak2space/keymap.c      |   4 +-
 keyboards/planck/keymaps/eosti/keymap.c       |   4 +-
 keyboards/planck/keymaps/pickle_jr/keymap.c   |   2 +-
 keyboards/preonic/keymaps/senseored/keymap.c  |   2 +-
 keyboards/redox/keymaps/jeherve/keymap.c      |   2 +-
 keyboards/sofle/keymaps/flare576/keymap.c     |   4 +-
 .../kyria/keymaps/thomasbaart/keymap.c        |   2 +-
 keyboards/tada68/keymaps/rbong/keymap.c       |   2 +-
 .../bananasplit/keymaps/coloneljesus/keymap.c |   2 +-
 .../minivan/keymaps/budi/keymap.c             |   4 +-
 .../minivan/keymaps/josjoha/unicode_macros.c  |   2 +-
 .../diverge3/keymaps/workman/keymap.c         |   2 +-
 .../rama_works_m6_a/keymaps/krusli/keymap.c   |   2 +-
 .../xiudi/xd75/keymaps/billypython/keymap.c   |   2 +-
 .../xiudi/xd75/keymaps/skewwhiffy/keymap.c    |   2 +-
 layouts/community/ergodox/berfarah/keymap.c   |   2 +-
 .../community/ergodox/meagerfindings/keymap.c |   2 +-
 .../ergodox/qwerty_code_friendly/keymap.c     |   4 +-
 quantum/send_string/send_string_keycodes.h    | 574 +++++++++---------
 users/333fred/333fred.c                       |   8 +-
 users/billypython/billypython.c               |   2 +-
 users/danielo515/danielo515.c                 |  14 +-
 users/danielo515/process_records.c            |  16 +-
 users/danielo515/tap_dance.c                  |   8 +-
 users/dhertz/dhertz.c                         |   4 +-
 users/edvorakjp/edvorakjp_status.c            |   4 +-
 users/gordon/gordon.c                         |   4 +-
 users/miles2go/babblePaste.h                  |   8 +-
 users/miles2go/babl_chromeos.c                |  40 +-
 users/miles2go/babl_emacs.c                   |  60 +-
 users/miles2go/babl_kitty.c                   |   4 +-
 users/miles2go/babl_linux.c                   |   8 +-
 users/miles2go/babl_mac.c                     |  20 +-
 users/miles2go/babl_nano.c                    |  34 +-
 users/miles2go/babl_readmux.c                 |   4 +-
 users/miles2go/babl_vi.c                      |  20 +-
 users/miles2go/babl_windows.c                 |  40 +-
 users/moults31/gdb.c                          |   2 +-
 users/moults31/vscode.c                       |  26 +-
 users/rossman360/rossman360.c                 |  20 +-
 users/sigma/sigma.c                           |  12 +-
 users/stanrc85/stanrc85.c                     |   4 +-
 users/talljoe/macros.c                        |   4 +-
 users/uqs/uqs.c                               |  12 +-
 users/wanleg/tapdances.c                      |   6 +-
 73 files changed, 581 insertions(+), 557 deletions(-)

diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
index 32c074c88f..3eeb5694f7 100644
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
@@ -137,7 +137,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 		switch(keycode) {
 			case MACRO_0:
         // Save for Web Macro.
-				SEND_STRING(SS_LSFT(SS_LALT(SS_LCTRL("s"))));
+				SEND_STRING(SS_LSFT(SS_LALT(SS_LCTL("s"))));
 				return false;
 		}
 	}
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
index b7c31f9bd7..61b1884f4e 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
@@ -147,7 +147,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 		// Control + T
 		case NEWTAB:
 			if (record->event.pressed) {
-				SEND_STRING(SS_LCTRL("t"));
+				SEND_STRING(SS_LCTL("t"));
 			}
 			break;
 		// Alt + F4
@@ -159,13 +159,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 		// Control + W
 		case CLSTAB:
 			if (record->event.pressed) {
-				SEND_STRING(SS_LCTRL("w"));
+				SEND_STRING(SS_LCTL("w"));
 			}
 			break;
 		// Control + Shift + N
 		case PRVWIN:
 			if (record->event.pressed) {
-				SEND_STRING(SS_LCTRL(SS_LSFT("n")));
+				SEND_STRING(SS_LCTL(SS_LSFT("n")));
 			}
 			break;
 	}
diff --git a/keyboards/atreus/keymaps/workman/keymap.c b/keyboards/atreus/keymaps/workman/keymap.c
index 3ca07c325a..b7540e6739 100644
--- a/keyboards/atreus/keymaps/workman/keymap.c
+++ b/keyboards/atreus/keymaps/workman/keymap.c
@@ -64,11 +64,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         switch(keycode) {
 		case DIAERESIS:
 			// assuming KC_CAPS is your Multi Key
-			SEND_STRING(SS_TAP(X_CAPSLOCK)"\"");
+			SEND_STRING(SS_TAP(X_CAPS_LOCK)"\"");
 			return false;
 		case EN_DASH:
 			// assuming KC_CAPS is your Multi Key
-			SEND_STRING(SS_TAP(X_CAPSLOCK)"--.");
+			SEND_STRING(SS_TAP(X_CAPS_LOCK)"--.");
 			return false;
         }
     }
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
index 576d25e7fa..508388d442 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c
+++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
@@ -40,7 +40,7 @@ enum {
 #define FINDER          LGUI(LALT(KC_SPACE)) //open the search bar for finding apps, docs in-computer, etc
 #define COMPOSE_KEY    KC_SCRL //manually set on linux, to create chars via .Xcompose ()
 #define COMPOSE_MAC     KC_F13 //manually set on mac using some tricks
-#define X_COMPOSE_KEY    X_SCROLLLOCK //for use with macros
+#define X_COMPOSE_KEY    X_SCROLL_LOCK //for use with macros
 #define SHOW_WINDOWS    LCTL(KC_UP) //'Expose' on Mac, overview on linux. Just all the windows
 #define WINDOW_LEFT LCTL(LGUI(LSFT(KC_LEFT))) //custom shortcut for this feature -- make window take up 50% left screen (using gui and ctl to make it os agnostic)
 #define WINDOW_RIGHT LCTL(LGUI(LSFT(KC_RIGHT))) //custom shortcut for this feature -- make window take up 50% right screen (using gui and ctl to make it os agnostic)/fully custom shortcut, using ctl and gui keys so will need them both irrespective of os
diff --git a/keyboards/dichotomy/keymaps/default/keymap.c b/keyboards/dichotomy/keymaps/default/keymap.c
index 80fc4d89bc..b83f7b82e9 100755
--- a/keyboards/dichotomy/keymaps/default/keymap.c
+++ b/keyboards/dichotomy/keymaps/default/keymap.c
@@ -146,7 +146,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 				shiftLED = false;
 				if (timer_elapsed(shift_timer) < CUSTOM_TOGGLE_TIME && shift_singular_key) {
 					//this was basically a toggle, so activate/deactivate caps lock.
-					SEND_STRING(SS_TAP(X_CAPSLOCK));
+					SEND_STRING(SS_TAP(X_CAPS_LOCK));
 					capsLED = !capsLED;
 				}
 				layer_off(_SF);
@@ -216,7 +216,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 				} else {
 					if (special_key_pressed[CK_BSPE-SAFE_RANGE]){
 						//key was not activated, return macro activating proper, pre-long-tap key
-						SEND_STRING(SS_TAP(X_BSLASH));
+						SEND_STRING(SS_TAP(X_BACKSLASH));
 						special_key_pressed[CK_BSPE-SAFE_RANGE] = 0;
 					} else {
 						//the short key was already sent, because another key was pressed.
@@ -416,7 +416,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 								SEND_STRING(SS_TAP(X_1));
 							break;
 							case CK_BSPE:
-								SEND_STRING(SS_TAP(X_BSLASH));
+								SEND_STRING(SS_TAP(X_BACKSLASH));
 							break;
 							case CK_QE:
 								SEND_STRING(SS_TAP(X_QUOTE));
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index 8b9002f521..29b73f063d 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -347,7 +347,7 @@ void send_french_accent(uint8_t letter, uint8_t accent) {
 
     if (onMac) {
         if (isCaps) {
-            SEND_STRING(SS_TAP(X_CAPSLOCK));
+            SEND_STRING(SS_TAP(X_CAPS_LOCK));
             register_code(KC_LALT);
             tap_code(osx_mod_key_map[accent]);
             unregister_code(KC_LALT);
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index bfe8af5c34..89eb3119ed 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -592,21 +592,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true;
             break;
         case SHELL_EXPAND_OE_LOGPATTERN:
-                SEND_STRING(SS_TAP(X_LEFT)"*CQW_HKEX"SS_TAP(X_END)"*.log"SS_LCTRL("x")SS_LSFT("8"));
+                SEND_STRING(SS_TAP(X_LEFT)"*CQW_HKEX"SS_TAP(X_END)"*.log"SS_LCTL("x")SS_LSFT("8"));
             break;
         case SHELL_EXPAND_OE_TRANPATTERN:
-                SEND_STRING(SS_TAP(X_LEFT)"*CQW_HKEX"SS_TAP(X_END)"*.tran"SS_LCTRL("x")SS_LSFT("8"));
+                SEND_STRING(SS_TAP(X_LEFT)"*CQW_HKEX"SS_TAP(X_END)"*.tran"SS_LCTL("x")SS_LSFT("8"));
             break;
             case SHELL_DUMPTLOG:
                 SEND_STRING(" | dumptlog - ");
                 return true;
                 break;
             case WINDOWS10_WORKSPACE_LEFT:
-                SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_LEFT))));
+                SEND_STRING(SS_LGUI(SS_LCTL(SS_TAP(X_LEFT))));
                 return true;
                 break;
             case WINDOWS10_WORKSPACE_RIGHT:
-                SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_RIGHT))));
+                SEND_STRING(SS_LGUI(SS_LCTL(SS_TAP(X_RIGHT))));
                 break;
             case WINDOWS10_TASK_VIEW:
                 SEND_STRING(SS_LGUI(SS_TAP(X_TAB)));
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
index 0244ac0959..967d554081 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
@@ -65,7 +65,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         case MY_OTHER_MACRO:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("ac")); // selects all and copies
+                SEND_STRING(SS_LCTL("ac")); // selects all and copies
                 return false;
             }
 
diff --git a/keyboards/flehrad/bigswitch/keymaps/333fred/keymap.c b/keyboards/flehrad/bigswitch/keymaps/333fred/keymap.c
index ef1717c6af..c2de6318dd 100644
--- a/keyboards/flehrad/bigswitch/keymaps/333fred/keymap.c
+++ b/keyboards/flehrad/bigswitch/keymaps/333fred/keymap.c
@@ -101,7 +101,7 @@ void dance_finished(qk_tap_dance_state_t *state, void* user_data) {
     case SINGLE_TAP:
     {
       // VS Build: CTRL+SHIFT+B
-      send_string_with_delay_P(PSTR(SS_DOWN(X_LCTRL) SS_DOWN(X_LSHIFT) "b" SS_UP(X_LSHIFT) SS_UP(X_LCTRL)), 10);
+      send_string_with_delay_P(PSTR(SS_DOWN(X_LCTL) SS_DOWN(X_LSFT) "b" SS_UP(X_LSFT) SS_UP(X_LCTL)), 10);
       tap_dance_active = false;
       break;
     }
diff --git a/keyboards/handwired/datahand/keymaps/default/keymap.c b/keyboards/handwired/datahand/keymaps/default/keymap.c
index 1ca6cf8b1f..7ebcff366f 100644
--- a/keyboards/handwired/datahand/keymaps/default/keymap.c
+++ b/keyboards/handwired/datahand/keymaps/default/keymap.c
@@ -250,9 +250,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case NLK:
     if (pressed) {
       toggle_numlock();
-      SEND_STRING(SS_DOWN(X_NUMLOCK));
+      SEND_STRING(SS_DOWN(X_NUM_LOCK));
     } else {
-      SEND_STRING(SS_UP(X_NUMLOCK));
+      SEND_STRING(SS_UP(X_NUM_LOCK));
     }
     break;
     
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
index bc5b025b48..5f221904e9 100644
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
+++ b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
@@ -125,7 +125,7 @@ CHOREOGRAPH(TD_RGHT,
             /* 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_LCTRL) SS_TAP(X_X) SS_TAP(X_S) SS_UP(X_LCTRL)
+            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));
 
@@ -134,9 +134,9 @@ CHOREOGRAPH(TD_RGHT,
  * just sends C-x. */
 
 CHOREOGRAPH(TD_C_X,
-            SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_X)),
-            SEND_STRING(SS_UP(X_LCTRL)),
-            SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_X) SS_UP(X_LCTRL)),);
+            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)),);
 
 qk_tap_dance_action_t tap_dance_actions[] = {
     STEPS(TD_LEFT), STEPS(TD_RGHT), STEPS(TD_C_X)
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
index 62c5993c7f..1b5a6586f4 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
@@ -25,7 +25,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
     case CLEAR:
         if (record->event.pressed) {
-            SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE));
+            SEND_STRING(SS_LCTL("a") SS_TAP(X_DELETE));
         }
         return false;
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index ea743a41ef..6537afa49d 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -53,7 +53,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case MACRO1:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("c") SS_DOWN(X_LALT) SS_TAP(X_TAB) SS_UP(X_LALT) SS_LCTRL("v") SS_TAP(X_TAB));
+                SEND_STRING(SS_LCTL("c") SS_DOWN(X_LALT) SS_TAP(X_TAB) SS_UP(X_LALT) SS_LCTL("v") SS_TAP(X_TAB));
                 _delay_ms(50);
                 SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_TAB) SS_UP(X_LALT) SS_TAP(X_TAB));
             } else {
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
index d100d8e0d2..01d2624d02 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
@@ -238,7 +238,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch(keycode) {
             case TBMACRO:
-                SEND_STRING(SS_TAP(X_TAB) SS_DOWN(X_LSHIFT) SS_TAP(X_HOME) SS_UP(X_LSHIFT) SS_TAP(X_DELETE));
+                SEND_STRING(SS_TAP(X_TAB) SS_DOWN(X_LSFT) SS_TAP(X_HOME) SS_UP(X_LSFT) SS_TAP(X_DELETE));
                 return false;
             case DGRMCRO:
                 if(!bnumlock) {
diff --git a/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
index 1b44e88ccf..a7bb707635 100644
--- a/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
@@ -77,9 +77,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     }
     else if (index == 1) {
         if (clockwise) {
-	    SEND_STRING(SS_LCTRL("1")); // audacity zoom in
+	    SEND_STRING(SS_LCTL("1")); // audacity zoom in
         } else {
-	    SEND_STRING(SS_LCTRL("3")); // audacity zoom out
+	    SEND_STRING(SS_LCTL("3")); // audacity zoom out
         }
     }
     return true;
diff --git a/keyboards/keebio/iris/keymaps/eosti/keymap.c b/keyboards/keebio/iris/keymaps/eosti/keymap.c
index c30e5c9867..f615921199 100644
--- a/keyboards/keebio/iris/keymaps/eosti/keymap.c
+++ b/keyboards/keebio/iris/keymaps/eosti/keymap.c
@@ -33,13 +33,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case TMUX_WN:                       // Switches to next window in tmux
       if (record->event.pressed) {
-        SEND_STRING(SS_LCTRL("a") "n"); // Requires a leader of ctrl-a
+        SEND_STRING(SS_LCTL("a") "n"); // Requires a leader of ctrl-a
       }
       break;
 
     case TMUX_WL:                       // Switches to last window in tmux
       if (record->event.pressed) {
-          SEND_STRING(SS_LCTRL("a") "l");
+          SEND_STRING(SS_LCTL("a") "l");
       }
       break;
 
diff --git a/keyboards/keebio/levinson/keymaps/rossman360/keymap.c b/keyboards/keebio/levinson/keymaps/rossman360/keymap.c
index 4c9cac0fb8..aeb501bf1b 100644
--- a/keyboards/keebio/levinson/keymaps/rossman360/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/rossman360/keymap.c
@@ -49,47 +49,47 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 switch (keycode) {
 	case CSPEAK:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN));
+		SEND_STRING(SS_TAP(X_PAGEDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGEDOWN));
 	}
 	break;
 	case SPEAK1:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_1)));
+		SEND_STRING(SS_TAP(X_PAGEDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGEDOWN) SS_LCTL(SS_TAP(X_1)));
 	}
 	break;
 	case SPEAK2:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_2)));
+		SEND_STRING(SS_TAP(X_PAGEDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGEDOWN) SS_LCTL(SS_TAP(X_2)));
 	 }
 	break;
 	case SPEAK3:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_3)));
+		SEND_STRING(SS_TAP(X_PAGEDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGEDOWN) SS_LCTL(SS_TAP(X_3)));
 	}
 	break;
 	case SPEAK4:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_4)));
+		SEND_STRING(SS_TAP(X_PAGEDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGEDOWN) SS_LCTL(SS_TAP(X_4)));
 	}
 	break;
 	case PARADOWN:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN));
+		SEND_STRING(SS_TAP(X_PAGEDOWN) SS_TAP(X_ENTER) SS_TAP(X_PAGEDOWN));
 	}
 	break;
 	case PMERGE:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_HOME) SS_TAP(X_BSPACE) SS_TAP(X_SPACE) SS_LCTRL(SS_TAP(X_BSPACE)) SS_TAP(X_SPACE));
+		SEND_STRING(SS_TAP(X_HOME) SS_TAP(X_BACKSPACE) SS_TAP(X_SPACE) SS_LCTL(SS_TAP(X_BACKSPACE)) SS_TAP(X_SPACE));
 	}
 	break;
 	case WREFRESH:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_SPACE) SS_TAP(X_BSPACE));
+		SEND_STRING(SS_TAP(X_SPACE) SS_TAP(X_BACKSPACE));
 	}
 	break;
 	case REMCAPS:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_LCTRL(SS_TAP(X_LEFT)) SS_TAP(X_DELETE));
+		SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_LEFT)) SS_TAP(X_DELETE));
 	}
 	break;
 };
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
index 108f910400..fc39554475 100644
--- a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
@@ -250,16 +250,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
     switch(keycode) {
       case CTRL_Z:
-        SEND_STRING(SS_LCTRL("z"));
+        SEND_STRING(SS_LCTL("z"));
         return false;
       case CTRL_X:
-        SEND_STRING(SS_LCTRL("x"));
+        SEND_STRING(SS_LCTL("x"));
         return false;
       case CTRL_C:
-        SEND_STRING(SS_LCTRL("c"));
+        SEND_STRING(SS_LCTL("c"));
         return false;
       case CTRL_V:
-        SEND_STRING(SS_LCTRL("v"));
+        SEND_STRING(SS_LCTL("v"));
         return false;
     }
   }
diff --git a/keyboards/keebio/viterbi/keymaps/met/keymap.c b/keyboards/keebio/viterbi/keymaps/met/keymap.c
index 45427018a7..b81c5ce314 100644
--- a/keyboards/keebio/viterbi/keymaps/met/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/met/keymap.c
@@ -87,14 +87,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   layer_off(_ALPHA);
   SEND_STRING(SS_TAP(X_N));
   SEND_STRING(SS_TAP(X_N));
-  SEND_STRING(SS_LCTRL(SS_TAP(X_C)));
+  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
 }
   break;
   case RESUME:
   if (record->event.pressed) {
   layer_off(_PLAYED);
   layer_on(_PLAYING);
-  SEND_STRING(SS_LCTRL(SS_TAP(X_C)));
+  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
   SEND_STRING(SS_TAP(X_UP));
   SEND_STRING(SS_TAP(X_ENTER));
 }
@@ -116,14 +116,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   break;
   case SHUTDOWN:
   if (record->event.pressed) {
-  SEND_STRING(SS_LCTRL(SS_TAP(X_C)));
+  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_LCTRL(SS_TAP(X_C)));
+  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
   SEND_STRING("reboot");
   SEND_STRING(SS_TAP(X_ENTER));
   }
@@ -155,7 +155,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   layer_off(_ALPHA);
   layer_off(_PLAYED);
   layer_on(_PLAYING);
-  SEND_STRING(SS_LCTRL(SS_TAP(X_C)));
+  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));
@@ -200,18 +200,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   case PMERGE:
   if (record->event.pressed) {
   SEND_STRING(SS_TAP(X_HOME));
-  SEND_STRING(SS_TAP(X_BSPACE));
+  SEND_STRING(SS_TAP(X_BACKSPACE));
   SEND_STRING(SS_TAP(X_SPACE));
-  SEND_STRING(SS_LCTRL(SS_TAP(X_BSPACE)));
+  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_PGDOWN));
+  SEND_STRING(SS_TAP(X_PAGE_DOWN));
   SEND_STRING(SS_TAP(X_ENTER));
   SEND_STRING(SS_TAP(X_ENTER));
-  SEND_STRING(SS_TAP(X_PGDOWN));
+  SEND_STRING(SS_TAP(X_PAGE_DOWN));
 }
  break;
 };
diff --git a/keyboards/keyhive/uno/keymaps/demo/keymap.c b/keyboards/keyhive/uno/keymaps/demo/keymap.c
index cd3c3dadef..7ebc4dcd99 100644
--- a/keyboards/keyhive/uno/keymaps/demo/keymap.c
+++ b/keyboards/keyhive/uno/keymaps/demo/keymap.c
@@ -73,7 +73,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     default:
                         if (timeElapsed < CUSTOM_LONGPRESS) {
                             // Normal press.  We're going to send the current letter and increment the counter.
-                            SEND_STRING(SS_TAP(X_BSPACE));
+                            SEND_STRING(SS_TAP(X_BACKSPACE));
                             send_string(stringToSend);
                             stringToSend[0]++;
                             if (stringToSend[0] > maxLetter) {
diff --git a/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c b/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
index d291e47072..68755e6c74 100644
--- a/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
@@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
     switch(keycode) {
       case IJ_OMN:
-        SEND_STRING(SS_TAP(X_LSHIFT)SS_TAP(X_LSHIFT));
+        SEND_STRING(SS_TAP(X_LSFT)SS_TAP(X_LSFT));
         return false;
     }
   }
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
index c8ec314d9d..0e4b98c427 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
@@ -263,7 +263,7 @@ void matrix_init_user(void) {
   // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values
   // set num lock on at start (for numonly layer to work)
   if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) {
-      SEND_STRING(SS_TAP(X_NUMLOCK)); //register_code(KC_NUM_LOCK); unregister_code(KC_NUM_LOCK);
+      SEND_STRING(SS_TAP(X_NUM_LOCK)); //register_code(KC_NUM_LOCK); unregister_code(KC_NUM_LOCK);
   }
 }
 
diff --git a/keyboards/ktec/staryu/keymaps/krusli/keymap.c b/keyboards/ktec/staryu/keymaps/krusli/keymap.c
index 9cd1cf829f..1db6857348 100644
--- a/keyboards/ktec/staryu/keymaps/krusli/keymap.c
+++ b/keyboards/ktec/staryu/keymaps/krusli/keymap.c
@@ -41,7 +41,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 				SEND_STRING("git add ."SS_TAP(X_ENTER));
         break;
       case GIT_COMMIT:
-        SEND_STRING("git commit -m "SS_DOWN(X_LSHIFT)SS_TAP(X_QUOTE)SS_UP(X_LSHIFT));
+        SEND_STRING("git commit -m "SS_DOWN(X_LSFT)SS_TAP(X_QUOTE)SS_UP(X_LSFT));
         break;
       case GIT_PUSH:
         SEND_STRING("git push"SS_TAP(X_ENTER));
diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c
index c5ca7df2e8..345b03945d 100644
--- a/keyboards/m10a/keymaps/gam3cat/keymap.c
+++ b/keyboards/m10a/keymaps/gam3cat/keymap.c
@@ -84,7 +84,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
         case KC_WCLS:
             if (record->event.pressed) {
-                SEND_STRING (SS_LCTRL("w"));
+                SEND_STRING (SS_LCTL("w"));
             }
             return false;
             break;
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
index fa60fc2268..1422769a8a 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
@@ -306,7 +306,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             // ======================================================== CUSTOM KEYCOADS BELOW ========================================================
             case COPY_ALL:
                 // Selects all and text and copy
-                SEND_STRING(SS_LCTRL("ac"));
+                SEND_STRING(SS_LCTL("ac"));
                 return false;
             case SEL_CPY:
                 // Select word under cursor and copy. Double mouse click then ctrl+c
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
index a79d577826..8fd0002b45 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
@@ -274,7 +274,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             // ======================================================== CUSTOM KEYCOADS BELOW ========================================================
             case COPY_ALL:
                 // Selects all and text and copy
-                SEND_STRING(SS_LCTRL("ac"));
+                SEND_STRING(SS_LCTL("ac"));
                 return false;
             case ROUT_TG:
                 // Toggle idle LED timeout on or off
diff --git a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
index f5cad11f90..266deb755d 100644
--- a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
@@ -137,16 +137,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
     // dynamically generate these.
       case EXPOSE:
-        SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_UP) SS_UP(X_LCTRL));
+        SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_UP) SS_UP(X_LCTL));
         return false;
       case LAUNCH:
-        SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_L) SS_UP(X_LCTRL));
+        SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_L) SS_UP(X_LCTL));
         return false;
       case DOCK:
         SEND_STRING(SS_DOWN(X_LALT) SS_DOWN(X_LGUI) SS_TAP(X_D) SS_UP(X_LGUI) SS_UP(X_LALT));
         return false;
       case SCRCAP:  //screen capture
-        SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_S) SS_UP(X_LCTRL));
+        SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_S) SS_UP(X_LCTL));
         return false;
       case CS1:  //custom shortcut 1
         SEND_STRING(SS_DOWN(X_LALT) SS_DOWN(X_LGUI) SS_TAP(X_1) SS_UP(X_LGUI) SS_UP(X_LALT));
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
index c5f4172f3a..d164f15946 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
@@ -115,13 +115,13 @@ void persistent_default_layer_set(uint16_t default_layer) {
     default_layer_set(default_layer);
 }
 
-#define SEND_STRING_RESTORE(STR) (SHIFT_PRESSED ? SEND_STRING(STR SS_DOWN(X_LSHIFT)) : SEND_STRING(STR SS_UP(X_LSHIFT)))
+#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_LSHIFT) 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_LSHIFT) 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)                   \
@@ -180,10 +180,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
         case SHIFT:
             if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LSHIFT));
+                SEND_STRING(SS_DOWN(X_LSFT));
                 SHIFT_PRESSED = true;
             } else {
-                SEND_STRING(SS_UP(X_LSHIFT));
+                SEND_STRING(SS_UP(X_LSFT));
                 SHIFT_PRESSED = false;
             }
             return false;
diff --git a/keyboards/planck/keymaps/dvorak2space/keymap.c b/keyboards/planck/keymaps/dvorak2space/keymap.c
index 8a347a37bb..08d56dd97a 100644
--- a/keyboards/planck/keymaps/dvorak2space/keymap.c
+++ b/keyboards/planck/keymaps/dvorak2space/keymap.c
@@ -137,8 +137,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { //X_KEY doesn'
       if(record->event.pressed) {
         (IS_LAYER_ON(SHFT_L)) //if shifted release correct shift, send, and press same shift, else send shift enter
           ? (get_mods() & MOD_BIT(KC_LSFT))
-            ? SEND_STRING(SS_UP(X_LSHIFT) SS_TAP(X_ENTER) SS_DOWN(X_LSHIFT))
-            : SEND_STRING(SS_UP(X_RSHIFT) SS_TAP(X_ENTER) SS_DOWN(X_RSHIFT))
+            ? SEND_STRING(SS_UP(X_LSFT) SS_TAP(X_ENTER) SS_DOWN(X_LSFT))
+            : SEND_STRING(SS_UP(X_RSFT) SS_TAP(X_ENTER) SS_DOWN(X_RSFT))
           : SEND_STRING(SS_LSFT(SS_TAP(X_ENTER)));
       }
       return false;
diff --git a/keyboards/planck/keymaps/eosti/keymap.c b/keyboards/planck/keymaps/eosti/keymap.c
index 54e1c7f4c7..f1d66d2a91 100644
--- a/keyboards/planck/keymaps/eosti/keymap.c
+++ b/keyboards/planck/keymaps/eosti/keymap.c
@@ -34,13 +34,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case TMUX_WN:                   // Moves to the next tmux window
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("a") "n");
+                SEND_STRING(SS_LCTL("a") "n");
             }
             break;
 
         case TMUX_WL:                   // Moves to the last tmux window
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("a") "n");
+                SEND_STRING(SS_LCTL("a") "n");
             }
             break;
     }
diff --git a/keyboards/planck/keymaps/pickle_jr/keymap.c b/keyboards/planck/keymaps/pickle_jr/keymap.c
index 1b4b4a254b..2cd471c909 100644
--- a/keyboards/planck/keymaps/pickle_jr/keymap.c
+++ b/keyboards/planck/keymaps/pickle_jr/keymap.c
@@ -35,7 +35,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if(record->event.pressed) {
     switch(keycode) {
       case CTLALTD:
-        SEND_STRING(SS_DOWN(X_LCTRL)SS_DOWN(X_LALT)SS_DOWN(X_DELETE)SS_UP(X_DELETE)SS_UP(X_LALT)SS_UP(X_LCTRL));
+        SEND_STRING(SS_DOWN(X_LCTL)SS_DOWN(X_LALT)SS_DOWN(X_DELETE)SS_UP(X_DELETE)SS_UP(X_LALT)SS_UP(X_LCTL));
         return false;
       case VIMSAVE:
         SEND_STRING(":w");
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
index e5ea2e4655..509cd3fddf 100644
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ b/keyboards/preonic/keymaps/senseored/keymap.c
@@ -261,7 +261,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch(keycode) {
             case TBMACRO:
-                SEND_STRING(SS_TAP(X_TAB) SS_DOWN(X_LSHIFT) SS_TAP(X_HOME) SS_UP(X_LSHIFT) SS_TAP(X_DELETE));
+                SEND_STRING(SS_TAP(X_TAB) SS_DOWN(X_LSFT) SS_TAP(X_HOME) SS_UP(X_LSFT) SS_TAP(X_DELETE));
                 return false;
             case DGRMCRO:
                 if(!bnumlock) {
diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c
index cd1dbdce3e..0192ba38a7 100644
--- a/keyboards/redox/keymaps/jeherve/keymap.c
+++ b/keyboards/redox/keymaps/jeherve/keymap.c
@@ -62,7 +62,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
         case INV_1P:
             if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LGUI) SS_DOWN(X_LALT) SS_TAP(X_BSLASH) SS_UP(X_LGUI) SS_UP(X_LALT));
+                SEND_STRING(SS_DOWN(X_LGUI) SS_DOWN(X_LALT) SS_TAP(X_BACKSLASH) SS_UP(X_LGUI) SS_UP(X_LALT));
             }
             return false;
             break;
diff --git a/keyboards/sofle/keymaps/flare576/keymap.c b/keyboards/sofle/keymaps/flare576/keymap.c
index b4d1257896..997fab9f3d 100644
--- a/keyboards/sofle/keymaps/flare576/keymap.c
+++ b/keyboards/sofle/keymaps/flare576/keymap.c
@@ -147,13 +147,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case _COMP1:
             if (record->event.pressed) {
-                // SEND_STRING(SS_TAP(X_RCTRL) SS_DELAY(100) SS_TAP(X_RCTRL) SS_DELAY(100) "1" SS_TAP(X_ENTER));
+                // SEND_STRING(SS_TAP(X_RCTL) SS_DELAY(100) SS_TAP(X_RCTL) SS_DELAY(100) "1" SS_TAP(X_ENTER));
                 keymap_config.swap_lalt_lgui = false;
             }
             return false;
         case _COMP2:
             if (record->event.pressed) {
-                // SEND_STRING(SS_TAP(X_RCTRL) SS_DELAY(100) SS_TAP(X_RCTRL) SS_DELAY(100) "2" SS_TAP(X_ENTER));
+                // SEND_STRING(SS_TAP(X_RCTL) SS_DELAY(100) SS_TAP(X_RCTL) SS_DELAY(100) "2" SS_TAP(X_ENTER));
                 keymap_config.swap_lalt_lgui = true;
             }
             return false;
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
index 27db686b66..b5d561897f 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
@@ -195,7 +195,7 @@ void matrix_scan_user(void) {
             SEND_STRING("`` " SS_TAP(X_LEFT) SS_TAP(X_LEFT));
         }
         SEQ_ONE_KEY(KC_P) { // Invoke Password Manager
-            SEND_STRING(SS_LCTRL(SS_LALT("\\")));
+            SEND_STRING(SS_LCTL(SS_LALT("\\")));
         }
         SEQ_ONE_KEY(KC_S) { // Windows screenshot
             SEND_STRING(SS_LGUI("\nS"));
diff --git a/keyboards/tada68/keymaps/rbong/keymap.c b/keyboards/tada68/keymaps/rbong/keymap.c
index dc7d0cbf70..03b27fd594 100644
--- a/keyboards/tada68/keymaps/rbong/keymap.c
+++ b/keyboards/tada68/keymaps/rbong/keymap.c
@@ -18,7 +18,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
     switch(keycode) {
       case TRMEXIT:
-        SEND_STRING(SS_LCTRL("\\")SS_LCTRL("n"));
+        SEND_STRING(SS_LCTL("\\")SS_LCTL("n"));
         return false;
     }
   }
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
index dc64295bd8..9678864d85 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
@@ -78,7 +78,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       // Designed to switch between two keyboard layouts on Windows using a locking switch.
       // Does nothing if right shift is pressed for easy resync.
       if (!(get_mods() & MOD_BIT(KC_RSFT)))
-        SEND_STRING(SS_DOWN(X_LALT)SS_TAP(X_LSHIFT)SS_UP(X_LALT));
+        SEND_STRING(SS_DOWN(X_LALT)SS_TAP(X_LSFT)SS_UP(X_LALT));
       return false;
     }
 
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
index bc820230e3..fb86bda7a9 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
@@ -214,9 +214,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
       case SWTCH:
         SEND_STRING(SS_DOWN(X_LGUI));
-        SEND_STRING(SS_DOWN(X_LSHIFT));
+        SEND_STRING(SS_DOWN(X_LSFT));
         SEND_STRING(SS_TAP(X_ENTER));
-        SEND_STRING(SS_UP(X_LSHIFT));
+        SEND_STRING(SS_UP(X_LSFT));
         SEND_STRING(SS_UP(X_LGUI));
         return false;
     }
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
index 09b8e24df2..8372ae4cd1 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
@@ -90,7 +90,7 @@ void unicode_hex2output (long unsigned int unshifted, long unsigned int shifted)
             bitmove *= 0x10; // next digit
         }
     
-        SEND_STRING ( SS_DOWN(X_LCTRL) SS_DOWN(X_LSHIFT) "f" SS_UP(X_LSHIFT) SS_UP(X_LCTRL) ); // lead-in for Unicode on Linux, 'descramble' mode
+        SEND_STRING ( SS_DOWN(X_LCTL) SS_DOWN(X_LSFT) "f" SS_UP(X_LSFT) SS_UP(X_LCTL) ); // lead-in for Unicode on Linux, 'descramble' mode
         send_string (output + index); // pointer to argument with formatted string
         SEND_STRING ( " " ); // Ends the Unicode numerical input mode
     }
diff --git a/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
index d3cecbff8b..eca781b060 100644
--- a/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
@@ -55,7 +55,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
                         SEND_STRING(SS_TAP(X_DELETE));
                         set_mods(current_mods);
                     } else {
-                        SEND_STRING(SS_TAP(X_BSPACE));
+                        SEND_STRING(SS_TAP(X_BACKSPACE));
                     }
                 }
                 return false;
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/keymap.c b/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/keymap.c
index 410229ae47..f12e489b34 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/keymap.c
@@ -35,7 +35,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
             SEND_STRING("git add ." SS_TAP(X_ENTER));
             break;
         case GIT_COMMIT:
-            SEND_STRING("git commit -m " SS_DOWN(X_LSHIFT) SS_TAP(X_QUOTE) SS_UP(X_LSHIFT));
+            SEND_STRING("git commit -m " SS_DOWN(X_LSFT) SS_TAP(X_QUOTE) SS_UP(X_LSFT));
             break;
         case GIT_PUSH:
             SEND_STRING("git push" SS_TAP(X_ENTER));
diff --git a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
index b04f2c64b6..9f4b7d1942 100644
--- a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
@@ -34,7 +34,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
   case CLEAR:
     if (record->event.pressed) {
-      SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE));
+      SEND_STRING(SS_LCTL("a") SS_TAP(X_DELETE));
     }
     return false;
 
diff --git a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
index f068e7126c..9accb2819c 100644
--- a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
@@ -225,7 +225,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
     switch(keycode) {
       case IJ_OMN:
-        SEND_STRING(SS_TAP(X_LSHIFT)SS_TAP(X_LSHIFT));
+        SEND_STRING(SS_TAP(X_LSFT)SS_TAP(X_LSFT));
         return false;
     }
   }
diff --git a/layouts/community/ergodox/berfarah/keymap.c b/layouts/community/ergodox/berfarah/keymap.c
index b58829370e..3ef58b6025 100644
--- a/layouts/community/ergodox/berfarah/keymap.c
+++ b/layouts/community/ergodox/berfarah/keymap.c
@@ -233,7 +233,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case BF_AFK:
       if (record->event.pressed) {
         layer_on(AFK);
-        SEND_STRING(SS_DOWN(X_LCTRL)SS_DOWN(X_LSHIFT)SS_TAP(X_POWER)SS_UP(X_LSHIFT)SS_UP(X_LCTRL));
+        SEND_STRING(SS_DOWN(X_LCTL)SS_DOWN(X_LSFT)SS_TAP(X_PWR)SS_UP(X_LSFT)SS_UP(X_LCTL));
       }
       return false; break;
     case BF_WAKE:
diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c
index f04cd47c97..3035572a77 100644
--- a/layouts/community/ergodox/meagerfindings/keymap.c
+++ b/layouts/community/ergodox/meagerfindings/keymap.c
@@ -473,7 +473,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           SEND_STRING ("Todoist");
           SEND_STRING (SS_TAP(X_ENTER));
         } else {
-          SEND_STRING (SS_LGUI(SS_LCTRL("a"))); //macro to open Todoist new task dialog
+          SEND_STRING (SS_LGUI(SS_LCTL("a"))); //macro to open Todoist new task dialog
         }
       }
       break;
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index 262f6f0524..19c00e1b03 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -596,7 +596,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KC_LEFT_SHIFT:  /* '' */
       if (record->event.pressed && (keyboard_report->mods & (MOD_BIT(KC_RSFT)))) {
         WITHOUT_MODS({
-            SEND_STRING("''" SS_TAP(X_LEFT) SS_DOWN(X_RSHIFT) SS_DOWN(X_LSHIFT));
+            SEND_STRING("''" SS_TAP(X_LEFT) SS_DOWN(X_RSFT) SS_DOWN(X_LSFT));
           });
         return false;
       }
@@ -604,7 +604,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     case KC_RIGHT_SHIFT:  /* "" */
       if (record->event.pressed && (keyboard_report->mods & (MOD_BIT(KC_LSFT)))) {
         WITHOUT_MODS({
-            SEND_STRING("\x22\x22" SS_TAP(X_LEFT) SS_DOWN(X_LSHIFT) SS_DOWN(X_RSHIFT));
+            SEND_STRING("\x22\x22" SS_TAP(X_LEFT) SS_DOWN(X_LSFT) SS_DOWN(X_RSFT));
           });
         return false;
       }
diff --git a/quantum/send_string/send_string_keycodes.h b/quantum/send_string/send_string_keycodes.h
index 12e4cf83d2..f9e1c101ff 100644
--- a/quantum/send_string/send_string_keycodes.h
+++ b/quantum/send_string/send_string_keycodes.h
@@ -21,45 +21,53 @@
 /* Punctuation */
 #define X_ENT  X_ENTER
 #define X_ESC  X_ESCAPE
-#define X_BSPC X_BSPACE
+#define X_BSPC X_BACKSPACE
 #define X_SPC  X_SPACE
 #define X_MINS X_MINUS
 #define X_EQL  X_EQUAL
-#define X_LBRC X_LBRACKET
-#define X_RBRC X_RBRACKET
-#define X_BSLS X_BSLASH
+#define X_LBRC X_LEFT_BRACKET
+#define X_RBRC X_RIGHT_BRACKET
+#define X_BSLS X_BACKSLASH
 #define X_NUHS X_NONUS_HASH
-#define X_SCLN X_SCOLON
+#define X_SCLN X_SEMICOLON
 #define X_QUOT X_QUOTE
 #define X_GRV  X_GRAVE
 #define X_COMM X_COMMA
 #define X_SLSH X_SLASH
-#define X_NUBS X_NONUS_BSLASH
+#define X_NUBS X_NONUS_BACKSLASH
 
 /* Lock Keys */
-#define X_CLCK X_CAPSLOCK
-#define X_CAPS X_CAPSLOCK
-#define X_SLCK X_SCROLLLOCK
-#define X_NLCK X_NUMLOCK
-#define X_LCAP X_LOCKING_CAPS
-#define X_LNUM X_LOCKING_NUM
-#define X_LSCR X_LOCKING_SCROLL
+#define X_CAPS X_CAPS_LOCK
+#define X_SCRL X_SCROLL_LOCK
+#define X_NUM  X_NUM_LOCK
+#define X_LCAP X_LOCKING_CAPS_LOCK
+#define X_LNUM X_LOCKING_NUM_LOCK
+#define X_LSCR X_LOCKING_SCROLL_LOCK
 
 /* Commands */
-#define X_PSCR X_PSCREEN
+#define X_PSCR X_PRINT_SCREEN
 #define X_PAUS X_PAUSE
 #define X_BRK  X_PAUSE
 #define X_INS  X_INSERT
+#define X_PGUP X_PAGE_UP
 #define X_DEL  X_DELETE
-#define X_PGDN X_PGDOWN
+#define X_PGDN X_PAGE_DOWN
 #define X_RGHT X_RIGHT
 #define X_APP  X_APPLICATION
 #define X_EXEC X_EXECUTE
 #define X_SLCT X_SELECT
 #define X_AGIN X_AGAIN
 #define X_PSTE X_PASTE
-#define X_ERAS X_ALT_ERASE
+#define X_ERAS X_ALTERNATE_ERASE
+#define X_SYRQ X_SYSTEM_REQUEST
+#define X_CNCL X_CANCEL
 #define X_CLR  X_CLEAR
+#define X_PRIR X_PRIOR
+#define X_RETN X_RETURN
+#define X_SEPR X_SEPARATOR
+#define X_CLAG X_CLEAR_AGAIN
+#define X_CRSL X_CRSEL
+#define X_EXSL X_EXSEL
 
 /* Keypad */
 #define X_PSLS X_KP_SLASH
@@ -81,30 +89,42 @@
 #define X_PEQL X_KP_EQUAL
 #define X_PCMM X_KP_COMMA
 
-/* Japanese specific */
-#define X_ZKHK X_GRAVE
-#define X_RO   X_INT1
-#define X_KANA X_INT2
-#define X_JYEN X_INT3
-#define X_HENK X_INT4
-#define X_MHEN X_INT5
-
-/* Korean specific */
-#define X_HAEN X_LANG1
-#define X_HANJ X_LANG2
+/* Language Specific */
+#define X_INT1 X_INTERNATIONAL_1
+#define X_INT2 X_INTERNATIONAL_2
+#define X_INT3 X_INTERNATIONAL_3
+#define X_INT4 X_INTERNATIONAL_4
+#define X_INT5 X_INTERNATIONAL_5
+#define X_INT6 X_INTERNATIONAL_6
+#define X_INT7 X_INTERNATIONAL_7
+#define X_INT8 X_INTERNATIONAL_8
+#define X_INT9 X_INTERNATIONAL_9
+#define X_LNG1 X_LANGUAGE_1
+#define X_LNG2 X_LANGUAGE_2
+#define X_LNG3 X_LANGUAGE_3
+#define X_LNG4 X_LANGUAGE_4
+#define X_LNG5 X_LANGUAGE_5
+#define X_LNG6 X_LANGUAGE_6
+#define X_LNG7 X_LANGUAGE_7
+#define X_LNG8 X_LANGUAGE_8
+#define X_LNG9 X_LANGUAGE_9
 
 /* Modifiers */
-#define X_LCTL X_LCTRL
-#define X_LSFT X_LSHIFT
-#define X_LOPT X_LALT
-#define X_LCMD X_LGUI
-#define X_LWIN X_LGUI
-#define X_RCTL X_RCTRL
-#define X_RSFT X_RSHIFT
-#define X_ALGR X_RALT
-#define X_ROPT X_RALT
-#define X_RCMD X_RGUI
-#define X_RWIN X_RGUI
+#define X_LCTL X_LEFT_CTRL
+#define X_LSFT X_LEFT_SHIFT
+#define X_LALT X_LEFT_ALT
+#define X_LOPT X_LEFT_ALT
+#define X_LGUI X_LEFT_GUI
+#define X_LCMD X_LEFT_GUI
+#define X_LWIN X_LEFT_GUI
+#define X_RCTL X_RIGHT_CTRL
+#define X_RSFT X_RIGHT_SHIFT
+#define X_RALT X_RIGHT_ALT
+#define X_ALGR X_RIGHT_ALT
+#define X_ROPT X_RIGHT_ALT
+#define X_RGUI X_RIGHT_GUI
+#define X_RCMD X_RIGHT_GUI
+#define X_RWIN X_RIGHT_GUI
 
 /* Generic Desktop Page (0x01) */
 #define X_PWR  X_SYSTEM_POWER
@@ -134,10 +154,12 @@
 #define X_MRWD X_MEDIA_REWIND
 #define X_BRIU X_BRIGHTNESS_UP
 #define X_BRID X_BRIGHTNESS_DOWN
+#define X_CPNL X_CONTROL_PANEL
+#define X_ASST X_ASSISTANT
 
 /* System Specific */
 #define X_BRMU X_PAUSE
-#define X_BRMD X_SCROLLLOCK
+#define X_BRMD X_SCROLL_LOCK
 
 /* Mouse Keys */
 #define X_MS_U X_MS_UP
@@ -149,6 +171,9 @@
 #define X_BTN3 X_MS_BTN3
 #define X_BTN4 X_MS_BTN4
 #define X_BTN5 X_MS_BTN5
+#define X_BTN6 X_MS_BTN6
+#define X_BTN7 X_MS_BTN7
+#define X_BTN8 X_MS_BTN8
 #define X_WH_U X_MS_WH_UP
 #define X_WH_D X_MS_WH_DOWN
 #define X_WH_L X_MS_WH_LEFT
@@ -158,250 +183,252 @@
 #define X_ACL2 X_MS_ACCEL2
 
 /* Keyboard/Keypad Page (0x07) */
-#define X_A                  04
-#define X_B                  05
-#define X_C                  06
-#define X_D                  07
-#define X_E                  08
-#define X_F                  09
-#define X_G                  0a
-#define X_H                  0b
-#define X_I                  0c
-#define X_J                  0d
-#define X_K                  0e
-#define X_L                  0f
-#define X_M                  10
-#define X_N                  11
-#define X_O                  12
-#define X_P                  13
-#define X_Q                  14
-#define X_R                  15
-#define X_S                  16
-#define X_T                  17
-#define X_U                  18
-#define X_V                  19
-#define X_W                  1a
-#define X_X                  1b
-#define X_Y                  1c
-#define X_Z                  1d
-#define X_1                  1e
-#define X_2                  1f
-#define X_3                  20
-#define X_4                  21
-#define X_5                  22
-#define X_6                  23
-#define X_7                  24
-#define X_8                  25
-#define X_9                  26
-#define X_0                  27
-#define X_ENTER              28
-#define X_ESCAPE             29
-#define X_BSPACE             2a
-#define X_TAB                2b
-#define X_SPACE              2c
-#define X_MINUS              2d
-#define X_EQUAL              2e
-#define X_LBRACKET           2f
-#define X_RBRACKET           30
-#define X_BSLASH             31
-#define X_NONUS_HASH         32
-#define X_SCOLON             33
-#define X_QUOTE              34
-#define X_GRAVE              35
-#define X_COMMA              36
-#define X_DOT                37
-#define X_SLASH              38
-#define X_CAPSLOCK           39
-#define X_F1                 3a
-#define X_F2                 3b
-#define X_F3                 3c
-#define X_F4                 3d
-#define X_F5                 3e
-#define X_F6                 3f
-#define X_F7                 40
-#define X_F8                 41
-#define X_F9                 42
-#define X_F10                43
-#define X_F11                44
-#define X_F12                45
-#define X_PSCREEN            46
-#define X_SCROLLLOCK         47
-#define X_PAUSE              48
-#define X_INSERT             49
-#define X_HOME               4a
-#define X_PGUP               4b
-#define X_DELETE             4c
-#define X_END                4d
-#define X_PGDOWN             4e
-#define X_RIGHT              4f
-#define X_LEFT               50
-#define X_DOWN               51
-#define X_UP                 52
-#define X_NUMLOCK            53
-#define X_KP_SLASH           54
-#define X_KP_ASTERISK        55
-#define X_KP_MINUS           56
-#define X_KP_PLUS            57
-#define X_KP_ENTER           58
-#define X_KP_1               59
-#define X_KP_2               5a
-#define X_KP_3               5b
-#define X_KP_4               5c
-#define X_KP_5               5d
-#define X_KP_6               5e
-#define X_KP_7               5f
-#define X_KP_8               60
-#define X_KP_9               61
-#define X_KP_0               62
-#define X_KP_DOT             63
-#define X_NONUS_BSLASH       64
-#define X_APPLICATION        65
-#define X_POWER              66
-#define X_KP_EQUAL           67
-#define X_F13                68
-#define X_F14                69
-#define X_F15                6a
-#define X_F16                6b
-#define X_F17                6c
-#define X_F18                6d
-#define X_F19                6e
-#define X_F20                6f
-#define X_F21                70
-#define X_F22                71
-#define X_F23                72
-#define X_F24                73
-#define X_EXECUTE            74
-#define X_HELP               75
-#define X_MENU               76
-#define X_SELECT             77
-#define X_STOP               78
-#define X_AGAIN              79
-#define X_UNDO               7a
-#define X_CUT                7b
-#define X_COPY               7c
-#define X_PASTE              7d
-#define X_FIND               7e
-#define X__MUTE              7f
-#define X__VOLUP             80
-#define X__VOLDOWN           81
-#define X_LOCKING_CAPS       82
-#define X_LOCKING_NUM        83
-#define X_LOCKING_SCROLL     84
-#define X_KP_COMMA           85
-#define X_KP_EQUAL_AS400     86
-#define X_INT1               87
-#define X_INT2               88
-#define X_INT3               89
-#define X_INT4               8a
-#define X_INT5               8b
-#define X_INT6               8c
-#define X_INT7               8d
-#define X_INT8               8e
-#define X_INT9               8f
-#define X_LANG1              90
-#define X_LANG2              91
-#define X_LANG3              92
-#define X_LANG4              93
-#define X_LANG5              94
-#define X_LANG6              95
-#define X_LANG7              96
-#define X_LANG8              97
-#define X_LANG9              98
-#define X_ALT_ERASE          99
-#define X_SYSREQ             9a
-#define X_CANCEL             9b
-#define X_CLEAR              9c
-#define X_PRIOR              9d
-#define X_RETURN             9e
-#define X_SEPARATOR          9f
-#define X_OUT                a0
-#define X_OPER               a1
-#define X_CLEAR_AGAIN        a2
-#define X_CRSEL              a3
-#define X_EXSEL              a4
+#define X_A                   04
+#define X_B                   05
+#define X_C                   06
+#define X_D                   07
+#define X_E                   08
+#define X_F                   09
+#define X_G                   0a
+#define X_H                   0b
+#define X_I                   0c
+#define X_J                   0d
+#define X_K                   0e
+#define X_L                   0f
+#define X_M                   10
+#define X_N                   11
+#define X_O                   12
+#define X_P                   13
+#define X_Q                   14
+#define X_R                   15
+#define X_S                   16
+#define X_T                   17
+#define X_U                   18
+#define X_V                   19
+#define X_W                   1a
+#define X_X                   1b
+#define X_Y                   1c
+#define X_Z                   1d
+#define X_1                   1e
+#define X_2                   1f
+#define X_3                   20
+#define X_4                   21
+#define X_5                   22
+#define X_6                   23
+#define X_7                   24
+#define X_8                   25
+#define X_9                   26
+#define X_0                   27
+#define X_ENTER               28
+#define X_ESCAPE              29
+#define X_BACKSPACE           2a
+#define X_TAB                 2b
+#define X_SPACE               2c
+#define X_MINUS               2d
+#define X_EQUAL               2e
+#define X_LEFT_BRACKET        2f
+#define X_RIGHT_BRACKET       30
+#define X_BACKSLASH           31
+#define X_NONUS_HASH          32
+#define X_SEMICOLON           33
+#define X_QUOTE               34
+#define X_GRAVE               35
+#define X_COMMA               36
+#define X_DOT                 37
+#define X_SLASH               38
+#define X_CAPS_LOCK           39
+#define X_F1                  3a
+#define X_F2                  3b
+#define X_F3                  3c
+#define X_F4                  3d
+#define X_F5                  3e
+#define X_F6                  3f
+#define X_F7                  40
+#define X_F8                  41
+#define X_F9                  42
+#define X_F10                 43
+#define X_F11                 44
+#define X_F12                 45
+#define X_PRINT_SCREEN        46
+#define X_SCROLL_LOCK         47
+#define X_PAUSE               48
+#define X_INSERT              49
+#define X_HOME                4a
+#define X_PAGE_UP             4b
+#define X_DELETE              4c
+#define X_END                 4d
+#define X_PAGE_DOWN           4e
+#define X_RIGHT               4f
+#define X_LEFT                50
+#define X_DOWN                51
+#define X_UP                  52
+#define X_NUM_LOCK            53
+#define X_KP_SLASH            54
+#define X_KP_ASTERISK         55
+#define X_KP_MINUS            56
+#define X_KP_PLUS             57
+#define X_KP_ENTER            58
+#define X_KP_1                59
+#define X_KP_2                5a
+#define X_KP_3                5b
+#define X_KP_4                5c
+#define X_KP_5                5d
+#define X_KP_6                5e
+#define X_KP_7                5f
+#define X_KP_8                60
+#define X_KP_9                61
+#define X_KP_0                62
+#define X_KP_DOT              63
+#define X_NONUS_BACKSLASH     64
+#define X_APPLICATION         65
+#define X_KB_POWER            66
+#define X_KP_EQUAL            67
+#define X_F13                 68
+#define X_F14                 69
+#define X_F15                 6a
+#define X_F16                 6b
+#define X_F17                 6c
+#define X_F18                 6d
+#define X_F19                 6e
+#define X_F20                 6f
+#define X_F21                 70
+#define X_F22                 71
+#define X_F23                 72
+#define X_F24                 73
+#define X_EXECUTE             74
+#define X_HELP                75
+#define X_MENU                76
+#define X_SELECT              77
+#define X_STOP                78
+#define X_AGAIN               79
+#define X_UNDO                7a
+#define X_CUT                 7b
+#define X_COPY                7c
+#define X_PASTE               7d
+#define X_FIND                7e
+#define X_KB_MUTE             7f
+#define X_KB_VOLUME_UP        80
+#define X_KB_VOLUME_DOWN      81
+#define X_LOCKING_CAPS_LOCK   82
+#define X_LOCKING_NUM_LOCK    83
+#define X_LOCKING_SCROLL_LOCK 84
+#define X_KP_COMMA            85
+#define X_KP_EQUAL_AS400      86
+#define X_INTERNATIONAL_1     87
+#define X_INTERNATIONAL_2     88
+#define X_INTERNATIONAL_3     89
+#define X_INTERNATIONAL_4     8a
+#define X_INTERNATIONAL_5     8b
+#define X_INTERNATIONAL_6     8c
+#define X_INTERNATIONAL_7     8d
+#define X_INTERNATIONAL_8     8e
+#define X_INTERNATIONAL_9     8f
+#define X_LANGUAGE_1          90
+#define X_LANGUAGE_2          91
+#define X_LANGUAGE_3          92
+#define X_LANGUAGE_4          93
+#define X_LANGUAGE_5          94
+#define X_LANGUAGE_6          95
+#define X_LANGUAGE_7          96
+#define X_LANGUAGE_8          97
+#define X_LANGUAGE_9          98
+#define X_ALTERNATE_ERASE     99
+#define X_SYSTEM_REQUEST      9a
+#define X_CANCEL              9b
+#define X_CLEAR               9c
+#define X_PRIOR               9d
+#define X_RETURN              9e
+#define X_SEPARATOR           9f
+#define X_OUT                 a0
+#define X_OPER                a1
+#define X_CLEAR_AGAIN         a2
+#define X_CRSEL               a3
+#define X_EXSEL               a4
 
 /* Modifiers */
-#define X_LCTRL              e0
-#define X_LSHIFT             e1
-#define X_LALT               e2
-#define X_LGUI               e3
-#define X_RCTRL              e4
-#define X_RSHIFT             e5
-#define X_RALT               e6
-#define X_RGUI               e7
+#define X_LEFT_CTRL           e0
+#define X_LEFT_SHIFT          e1
+#define X_LEFT_ALT            e2
+#define X_LEFT_GUI            e3
+#define X_RIGHT_CTRL          e4
+#define X_RIGHT_SHIFT         e5
+#define X_RIGHT_ALT           e6
+#define X_RIGHT_GUI           e7
 
 /* Media and Function keys */
 /* Generic Desktop Page (0x01) */
-#define X_SYSTEM_POWER       a5
-#define X_SYSTEM_SLEEP       a6
-#define X_SYSTEM_WAKE        a7
+#define X_SYSTEM_POWER        a5
+#define X_SYSTEM_SLEEP        a6
+#define X_SYSTEM_WAKE         a7
 
 /* Consumer Page (0x0C) */
-#define X_AUDIO_MUTE         a8
-#define X_AUDIO_VOL_UP       a9
-#define X_AUDIO_VOL_DOWN     aa
-#define X_MEDIA_NEXT_TRACK   ab
-#define X_MEDIA_PREV_TRACK   ac
-#define X_MEDIA_STOP         ad
-#define X_MEDIA_PLAY_PAUSE   ae
-#define X_MEDIA_SELECT       af
-#define X_MEDIA_EJECT        b0
-#define X_MAIL               b1
-#define X_CALCULATOR         b2
-#define X_MY_COMPUTER        b3
-#define X_WWW_SEARCH         b4
-#define X_WWW_HOME           b5
-#define X_WWW_BACK           b6
-#define X_WWW_FORWARD        b7
-#define X_WWW_STOP           b8
-#define X_WWW_REFRESH        b9
-#define X_WWW_FAVORITES      ba
-#define X_MEDIA_FAST_FORWARD bb
-#define X_MEDIA_REWIND       bc
-#define X_BRIGHTNESS_UP      bd
-#define X_BRIGHTNESS_DOWN    be
+#define X_AUDIO_MUTE          a8
+#define X_AUDIO_VOL_UP        a9
+#define X_AUDIO_VOL_DOWN      aa
+#define X_MEDIA_NEXT_TRACK    ab
+#define X_MEDIA_PREV_TRACK    ac
+#define X_MEDIA_STOP          ad
+#define X_MEDIA_PLAY_PAUSE    ae
+#define X_MEDIA_SELECT        af
+#define X_MEDIA_EJECT         b0
+#define X_MAIL                b1
+#define X_CALCULATOR          b2
+#define X_MY_COMPUTER         b3
+#define X_WWW_SEARCH          b4
+#define X_WWW_HOME            b5
+#define X_WWW_BACK            b6
+#define X_WWW_FORWARD         b7
+#define X_WWW_STOP            b8
+#define X_WWW_REFRESH         b9
+#define X_WWW_FAVORITES       ba
+#define X_MEDIA_FAST_FORWARD  bb
+#define X_MEDIA_REWIND        bc
+#define X_BRIGHTNESS_UP       bd
+#define X_BRIGHTNESS_DOWN     be
+#define X_CONTROL_PANEL       bf
+#define X_ASSISTANT           c0
 
 /* Mouse Buttons (unallocated range in HID spec) */
 #ifdef VIA_ENABLE
-#define X_MS_UP              f0
-#define X_MS_DOWN            f1
-#define X_MS_LEFT            f2
-#define X_MS_RIGHT           f3
-#define X_MS_BTN1            f4
-#define X_MS_BTN2            f5
-#define X_MS_BTN3            f6
-#define X_MS_BTN4            f7
-#define X_MS_BTN5            f8
-#define X_MS_BTN6            f8
-#define X_MS_BTN7            f8
-#define X_MS_BTN8            f8
-#define X_MS_WH_UP           f9
-#define X_MS_WH_DOWN         fa
-#define X_MS_WH_LEFT         fb
-#define X_MS_WH_RIGHT        fc
-#define X_MS_ACCEL0          fd
-#define X_MS_ACCEL1          fe
-#define X_MS_ACCEL2          ff
+#define X_MS_UP               f0
+#define X_MS_DOWN             f1
+#define X_MS_LEFT             f2
+#define X_MS_RIGHT            f3
+#define X_MS_BTN1             f4
+#define X_MS_BTN2             f5
+#define X_MS_BTN3             f6
+#define X_MS_BTN4             f7
+#define X_MS_BTN5             f8
+#define X_MS_BTN6             f8
+#define X_MS_BTN7             f8
+#define X_MS_BTN8             f8
+#define X_MS_WH_UP            f9
+#define X_MS_WH_DOWN          fa
+#define X_MS_WH_LEFT          fb
+#define X_MS_WH_RIGHT         fc
+#define X_MS_ACCEL0           fd
+#define X_MS_ACCEL1           fe
+#define X_MS_ACCEL2           ff
 #else
-#define X_MS_UP              cd
-#define X_MS_DOWN            ce
-#define X_MS_LEFT            cf
-#define X_MS_RIGHT           d0
-#define X_MS_BTN1            d1
-#define X_MS_BTN2            d2
-#define X_MS_BTN3            d3
-#define X_MS_BTN4            d4
-#define X_MS_BTN5            d5
-#define X_MS_BTN6            d6
-#define X_MS_BTN7            d7
-#define X_MS_BTN8            d8
-#define X_MS_WH_UP           d9
-#define X_MS_WH_DOWN         da
-#define X_MS_WH_LEFT         db
-#define X_MS_WH_RIGHT        dc
-#define X_MS_ACCEL0          dd
-#define X_MS_ACCEL1          de
-#define X_MS_ACCEL2          df
+#define X_MS_UP               cd
+#define X_MS_DOWN             ce
+#define X_MS_LEFT             cf
+#define X_MS_RIGHT            d0
+#define X_MS_BTN1             d1
+#define X_MS_BTN2             d2
+#define X_MS_BTN3             d3
+#define X_MS_BTN4             d4
+#define X_MS_BTN5             d5
+#define X_MS_BTN6             d6
+#define X_MS_BTN7             d7
+#define X_MS_BTN8             d8
+#define X_MS_WH_UP            d9
+#define X_MS_WH_DOWN          da
+#define X_MS_WH_LEFT          db
+#define X_MS_WH_RIGHT         dc
+#define X_MS_ACCEL0           dd
+#define X_MS_ACCEL1           de
+#define X_MS_ACCEL2           df
 #endif
 
 
@@ -439,6 +466,3 @@
 #define SS_ROPT(string) SS_RALT(string)
 #define SS_RCMD(string) SS_RGUI(string)
 #define SS_RWIN(string) SS_RGUI(string)
-
-// DEPRECATED
-#define SS_LCTRL(string) SS_LCTL(string)
diff --git a/users/333fred/333fred.c b/users/333fred/333fred.c
index ea7b904403..c035493e37 100644
--- a/users/333fred/333fred.c
+++ b/users/333fred/333fred.c
@@ -92,13 +92,13 @@ void tap_dance_copy_paste_finished(qk_tap_dance_state_t *state, void *user_data)
         if (is_shift) {
             SEND_STRING(SS_LSFT(SS_TAP(X_INSERT)));
         } else {
-            SEND_STRING(SS_LCTRL("v"));
+            SEND_STRING(SS_LCTL("v"));
         }
     } else {
         if (is_shift) {
-            SEND_STRING(SS_LCTRL(SS_TAP(X_INSERT)));
+            SEND_STRING(SS_LCTL(SS_TAP(X_INSERT)));
         } else {
-            SEND_STRING(SS_LCTRL("c"));
+            SEND_STRING(SS_LCTL("c"));
         }
     }
 }
@@ -135,7 +135,7 @@ bool try_handle_macro(uint16_t keycode, keyrecord_t *record) {
             return true;
         case PSCREEN_APP:
             if (record->event.pressed)
-                SEND_STRING(SS_LALT(SS_TAP(X_PSCREEN)));
+                SEND_STRING(SS_LALT(SS_TAP(X_PRINT_SCREEN)));
             return true;
 
         default:
diff --git a/users/billypython/billypython.c b/users/billypython/billypython.c
index f165d2e260..19744b9956 100644
--- a/users/billypython/billypython.c
+++ b/users/billypython/billypython.c
@@ -13,7 +13,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
   case CLEAR:
     if (record->event.pressed) {
-      SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE));
+      SEND_STRING(SS_LCTL("a") SS_TAP(X_DELETE));
     }
     return false;
 
diff --git a/users/danielo515/danielo515.c b/users/danielo515/danielo515.c
index e7fb08f2eb..9b09aed9d7 100644
--- a/users/danielo515/danielo515.c
+++ b/users/danielo515/danielo515.c
@@ -27,17 +27,17 @@ void matrix_scan_user(void) {
         SEQ_ONE_KEY(KC_N) { SEND_STRING(SS_LALT("n") "n"); }
         // ==== MACROS ===
         SEQ_ONE_KEY(KC_G) { SEND_STRING(" | grep "); }
-        SEQ_ONE_KEY(KC_K) { onMac ? SEND_STRING(SS_LCTRL(" ")) : SEND_STRING(SS_LCTRL("f")); }
+        SEQ_ONE_KEY(KC_K) { onMac ? SEND_STRING(SS_LCTL(" ")) : SEND_STRING(SS_LCTL("f")); }
         // vim delete all
         SEQ_TWO_KEYS(KC_D, KC_G) {
             if (onMac) {
                 SEND_STRING(SS_LGUI("a") SS_TAP(X_D));
             } else {
-                SEND_STRING(SS_LCTRL("a") SS_TAP(X_D));
+                SEND_STRING(SS_LCTL("a") SS_TAP(X_D));
             }
         }
         // tripe delete!
-        SEQ_ONE_KEY(KC_BACKSPACE) { SEND_STRING(SS_TAP(X_BSPACE) SS_TAP(X_BSPACE) SS_TAP(X_BSPACE)); }
+        SEQ_ONE_KEY(KC_BACKSPACE) { SEND_STRING(SS_TAP(X_BACKSPACE) SS_TAP(X_BACKSPACE) SS_TAP(X_BACKSPACE)); }
         SEQ_TWO_KEYS(KC_P, KC_G) { SEND_STRING("ps -ef | grep "); }
         SEQ_TWO_KEYS(KC_J, KC_A) { SEND_STRING("() => {}" SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT)); }
         // this is a pain to type
@@ -46,13 +46,13 @@ void matrix_scan_user(void) {
         // ### LAYER CHANGE
         SEQ_ONE_KEY(KC_1) { layer_on(1); }
         // control enter, because yes
-        SEQ_ONE_KEY(KC_H) { SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_ENTER) SS_UP(X_LCTRL)); }
+        SEQ_ONE_KEY(KC_H) { SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_ENTER) SS_UP(X_LCTL)); }
         // paste all
         SEQ_ONE_KEY(KC_P) {
             if (onMac) {
                 SEND_STRING(SS_LGUI("a") SS_LGUI("v"));
             } else {
-                SEND_STRING(SS_LCTRL("a") SS_LCTRL("v"));
+                SEND_STRING(SS_LCTL("a") SS_LCTL("v"));
             }
         }
         SEQ_THREE_KEYS(KC_M, KC_A, KC_C) {
@@ -72,11 +72,11 @@ void matrix_scan_user(void) {
             if (onMac) {
                 SEND_STRING(SS_LGUI("a") SS_LGUI("c"));
             } else {
-                SEND_STRING(SS_LCTRL("a") SS_LCTRL("c"));
+                SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
             }
         }
         // emoji bar
-        SEQ_TWO_KEYS(KC_E, KC_E) { SEND_STRING(SS_DOWN(X_LGUI) SS_LCTRL(" ") SS_UP(X_LGUI)); }
+        SEQ_TWO_KEYS(KC_E, KC_E) { SEND_STRING(SS_DOWN(X_LGUI) SS_LCTL(" ") SS_UP(X_LGUI)); }
 
         SEQ_TWO_KEYS(KC_F, KC_F) { SEND_STRING("ps -ef | grep "); }
         SEQ_TWO_KEYS(KC_H, KC_T) { SEND_STRING("https://"); }
diff --git a/users/danielo515/process_records.c b/users/danielo515/process_records.c
index 1f4b94a5ad..e75526af44 100644
--- a/users/danielo515/process_records.c
+++ b/users/danielo515/process_records.c
@@ -114,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             // == Multi Os START ===
         case KC_HOME:  // make the home behave the same on OSX
             if (record->event.pressed && onMac) {
-                SEND_STRING(SS_LCTRL("a"));
+                SEND_STRING(SS_LCTL("a"));
                 return false;
             }
         case KC_END:  // make the end behave the same on OSX
@@ -138,32 +138,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) return CMD(KC_X);
         case COPY:
             if (record->event.pressed) {
-                onMac ? SEND_STRING(SS_LGUI("c")) : SEND_STRING(SS_LCTRL("c"));
+                onMac ? SEND_STRING(SS_LGUI("c")) : SEND_STRING(SS_LCTL("c"));
             }
             return false;
         case PASTE:
             if (record->event.pressed) {
-                onMac ? SEND_STRING(SS_LGUI("v")) : SEND_STRING(SS_LCTRL("v"));
+                onMac ? SEND_STRING(SS_LGUI("v")) : SEND_STRING(SS_LCTL("v"));
             }
             return false;
         case SAVE:
             if (record->event.pressed) {
-                onMac ? SEND_STRING(SS_LGUI("s")) : SEND_STRING(SS_LCTRL("s"));
+                onMac ? SEND_STRING(SS_LGUI("s")) : SEND_STRING(SS_LCTL("s"));
             }
             return false;
         case UNDO:
             if (record->event.pressed) {
-                onMac ? SEND_STRING(SS_LGUI("z")) : SEND_STRING(SS_LCTRL("z"));
+                onMac ? SEND_STRING(SS_LGUI("z")) : SEND_STRING(SS_LCTL("z"));
             }
             return false;
         case REDO:
             if (record->event.pressed) {
-                onMac ? SEND_STRING(SS_LGUI(SS_LSFT("z"))) : SEND_STRING(SS_LCTRL("y"));
+                onMac ? SEND_STRING(SS_LGUI(SS_LSFT("z"))) : SEND_STRING(SS_LCTL("y"));
             }
             return false;
         case FIND:
             if (record->event.pressed) {
-                onMac ? SEND_STRING(SS_LGUI("f")) : SEND_STRING(SS_LCTRL("f"));
+                onMac ? SEND_STRING(SS_LGUI("f")) : SEND_STRING(SS_LCTL("f"));
             }
             return false;
         case WIN_TO_RIGHT:
@@ -178,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case CHG_LAYOUT:
             if (record->event.pressed) {
-                onMac ? SEND_STRING(SS_LCTRL(" ")) : SEND_STRING(SS_LCTRL("f"));
+                onMac ? SEND_STRING(SS_LCTL(" ")) : SEND_STRING(SS_LCTL("f"));
             }
             return false;
             // == Multi Os END ===
diff --git a/users/danielo515/tap_dance.c b/users/danielo515/tap_dance.c
index 0b7128ba81..a07b4c792f 100644
--- a/users/danielo515/tap_dance.c
+++ b/users/danielo515/tap_dance.c
@@ -90,11 +90,11 @@ void td_copy_cut(qk_tap_dance_state_t *state, void *user_data)
 {
   if (state->count == 2)
   {
-    onMac ?  SEND_STRING(SS_LGUI("x")) :   SEND_STRING(SS_LCTRL("x"));
+    onMac ?  SEND_STRING(SS_LGUI("x")) :   SEND_STRING(SS_LCTL("x"));
   }
   else
   {
-    onMac ?  SEND_STRING(SS_LGUI("c")) : SEND_STRING(SS_LCTRL("c"));
+    onMac ?  SEND_STRING(SS_LGUI("c")) : SEND_STRING(SS_LCTL("c"));
   }
   reset_tap_dance(state);
 };
@@ -103,11 +103,11 @@ void td_paste(qk_tap_dance_state_t *state, void *user_data)
 {
   if (state->count == 2)
   {
-    onMac ?  SEND_STRING(SS_DOWN(X_RSHIFT) SS_LGUI("v") SS_UP(X_RSHIFT)) :   SEND_STRING(SS_DOWN(X_RSHIFT) SS_LCTRL("v") SS_UP(X_RSHIFT));
+    onMac ?  SEND_STRING(SS_DOWN(X_RSFT) SS_LGUI("v") SS_UP(X_RSFT)) :   SEND_STRING(SS_DOWN(X_RSFT) SS_LCTL("v") SS_UP(X_RSFT));
   }
   else
   {
-    onMac ?  SEND_STRING(SS_LGUI("v")) : SEND_STRING(SS_LCTRL("v"));
+    onMac ?  SEND_STRING(SS_LGUI("v")) : SEND_STRING(SS_LCTL("v"));
   }
   reset_tap_dance(state);
 };
diff --git a/users/dhertz/dhertz.c b/users/dhertz/dhertz.c
index 1a2b6e38f1..a4e3da6362 100644
--- a/users/dhertz/dhertz.c
+++ b/users/dhertz/dhertz.c
@@ -52,13 +52,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         switch(keycode) {
             case HSH_TLD:
                 if (get_mods()&(MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))) {
-                    SEND_STRING(SS_TAP(X_NONUS_BSLASH));
+                    SEND_STRING(SS_TAP(X_NONUS_BACKSLASH));
                 } else {
                     SEND_STRING(SS_LALT("3"));
                 }
                 break;
             case CTRL_A:
-                SEND_STRING(SS_LCTRL("a"));
+                SEND_STRING(SS_LCTL("a"));
                 break;
             case CMD_ALT_C:
                 SEND_STRING(SS_LGUI(SS_LALT("c")));
diff --git a/users/edvorakjp/edvorakjp_status.c b/users/edvorakjp/edvorakjp_status.c
index c8a06c2255..851422ede5 100644
--- a/users/edvorakjp/edvorakjp_status.c
+++ b/users/edvorakjp/edvorakjp_status.c
@@ -42,13 +42,13 @@ void set_japanese_mode(bool new_state) {
     edvorakjp_state.japanese_mode = new_state;
     if (edvorakjp_state.japanese_mode) {
         if (edvorakjp_config.enable_kc_lang) {
-            SEND_STRING(SS_TAP(X_LANG1));
+            SEND_STRING(SS_TAP(X_LNG1));
         } else {
             SEND_STRING(SS_LALT("`"));
         }
     } else {
         if (edvorakjp_config.enable_kc_lang) {
-            SEND_STRING(SS_TAP(X_LANG2));
+            SEND_STRING(SS_TAP(X_LNG2));
         } else {
             SEND_STRING(SS_LALT("`"));
         }
diff --git a/users/gordon/gordon.c b/users/gordon/gordon.c
index cc9f3a2599..c31418b526 100644
--- a/users/gordon/gordon.c
+++ b/users/gordon/gordon.c
@@ -387,8 +387,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
       case SPRK_TCK:
           SEND_STRING ("```");
-          SEND_STRING (SS_DOWN(X_LSHIFT) SS_TAP(X_ENTER) SS_UP(X_LSHIFT));
-          SEND_STRING (SS_DOWN(X_LSHIFT) SS_TAP(X_ENTER) SS_UP(X_LSHIFT));
+          SEND_STRING (SS_DOWN(X_LSFT) SS_TAP(X_ENTER) SS_UP(X_LSFT));
+          SEND_STRING (SS_DOWN(X_LSFT) SS_TAP(X_ENTER) SS_UP(X_LSFT));
           SEND_STRING ("```");
           SEND_STRING (SS_TAP(X_UP));
           return false; break;
diff --git a/users/miles2go/babblePaste.h b/users/miles2go/babblePaste.h
index 8fc233e8d4..c3073423c2 100644
--- a/users/miles2go/babblePaste.h
+++ b/users/miles2go/babblePaste.h
@@ -55,15 +55,15 @@ enum babble_modes {
 /// Hacks to make it easier to create sendstring macros
 
 //"outer" versions wrap text
-#    define OMCTL(arg) SS_DOWN(X_LCTRL) arg SS_UP(X_LCTRL)
+#    define OMCTL(arg) SS_DOWN(X_LCTL) arg SS_UP(X_LCTL)
 #    define OMGUI(arg) SS_DOWN(X_LGUI) arg SS_UP(X_LGUI)
 #    define OMALT(arg) SS_DOWN(X_LALT) arg SS_UP(X_LALT)
-#    define OMSFT(...) SS_DOWN(X_LSHIFT) __VA_ARGS__ SS_UP(X_LSHIFT)
+#    define OMSFT(...) SS_DOWN(X_LSFT) __VA_ARGS__ SS_UP(X_LSFT)
 //"inner" versions wrap a key tap
-#    define IMCTL(arg) SS_DOWN(X_LCTRL) SS_TAP(arg) SS_UP(X_LCTRL)
+#    define IMCTL(arg) SS_DOWN(X_LCTL) SS_TAP(arg) SS_UP(X_LCTL)
 #    define IMGUI(arg) SS_DOWN(X_LGUI) SS_TAP(arg) SS_UP(X_LGUI)
 #    define IMALT(arg) SS_DOWN(X_LALT) SS_TAP(arg) SS_UP(X_LALT)
-#    define IMSFT(arg) SS_DOWN(X_LSHIFT) SS_TAP(arg) SS_UP(X_LSHIFT)
+#    define IMSFT(arg) SS_DOWN(X_LSFT) SS_TAP(arg) SS_UP(X_LSFT)
 
 #    define BABLM(ent, ...)           \
         if (ent == keycode) {         \
diff --git a/users/miles2go/babl_chromeos.c b/users/miles2go/babl_chromeos.c
index fd644fc5c5..5e95e1424a 100644
--- a/users/miles2go/babl_chromeos.c
+++ b/users/miles2go/babl_chromeos.c
@@ -30,22 +30,22 @@ bool babblePaste_chromeos(uint16_t keycode) {
     BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN));  // untested
     BABLM(BABL_PGDN, IMGUI(X_DOWN));
     BABLM(BABL_PGUP, IMGUI(X_UP));
-    BABLM(BABL_DEL_RIGHT_1C, IMALT(X_BSPACE));
-    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
-    BABLM(BABL_DEL_RIGHT_WORD, OMSFT(IMCTL(X_RIGHT)) SS_TAP(X_BSPACE));
-    BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BSPACE));
-    BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BSPACE));
+    BABLM(BABL_DEL_RIGHT_1C, IMALT(X_BACKSPACE));
+    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
+    BABLM(BABL_DEL_RIGHT_WORD, OMSFT(IMCTL(X_RIGHT)) SS_TAP(X_BACKSPACE));
+    BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BACKSPACE));
+    BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BACKSPACE));
     BABLM(BABL_MODE, ("ChromeOS "));
 #        endif
 #        ifdef BABL_OSKEYS
-    BABLM(BABL_UNDO, SS_LCTRL("z"));
+    BABLM(BABL_UNDO, SS_LCTL("z"));
     BABLM(BABL_REDO, OMSFT(IMCTL(X_Z)));
-    BABLM(BABL_CUT, SS_LCTRL("x"));
-    BABLM(BABL_COPY, SS_LCTRL("c"));
-    BABLM(BABL_PASTE, SS_LCTRL("v"));
-    BABLM(BABL_SELECT_ALL, SS_LCTRL("a"));
-    BABLM(BABL_FIND, SS_LCTRL("f"));
-    BABLM(BABL_FIND_NEXT, SS_LCTRL("g"));
+    BABLM(BABL_CUT, SS_LCTL("x"));
+    BABLM(BABL_COPY, SS_LCTL("c"));
+    BABLM(BABL_PASTE, SS_LCTL("v"));
+    BABLM(BABL_SELECT_ALL, SS_LCTL("a"));
+    BABLM(BABL_FIND, SS_LCTL("f"));
+    BABLM(BABL_FIND_NEXT, SS_LCTL("g"));
     BABLM(BABL_FIND_PREV, OMSFT(IMCTL(X_G)));
     BABLM(BABL_WINDOW_NEW, IMCTL(X_N));
     //	BABLM( BABL_FIND_REPLACE,		() ); // not part of Chrome
@@ -60,33 +60,33 @@ bool babblePaste_chromeos(uint16_t keycode) {
     BABLM(BABL_SWITCH_KEYBOARD_LAYOUT, IMCTL(X_SPACE));
 #        endif
 #        ifdef BABL_BROWSER
-    BABLM(BABL_BROWSER_NEW_TAB, SS_LCTRL("t"));
-    BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTRL("w"));
+    BABLM(BABL_BROWSER_NEW_TAB, SS_LCTL("t"));
+    BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTL("w"));
     BABLM(BABL_BROWSER_REOPEN_LAST_TAB, OMSFT(IMCTL(X_T)));
     BABLM(BABL_BROWSER_NEXT_TAB, IMCTL(X_TAB));
     BABLM(BABL_BROWSER_PREV_TAB, OMSFT(IMCTL(X_TAB)));
-    BABLM(BABL_BROWSER_URL_BAR, SS_LCTRL("l"));
+    BABLM(BABL_BROWSER_URL_BAR, SS_LCTL("l"));
     BABLM(BABL_BROWSER_FORWARD, IMALT(X_RIGHT));
     BABLM(BABL_BROWSER_BACK, IMALT(X_LEFT));
     ;
-    BABLM(BABL_BROWSER_FIND, SS_LCTRL("f"));
-    BABLM(BABL_BROWSER_BOOKMARK, SS_LCTRL("d"));
+    BABLM(BABL_BROWSER_FIND, SS_LCTL("f"));
+    BABLM(BABL_BROWSER_BOOKMARK, SS_LCTL("d"));
     BABLM(BABL_BROWSER_DEV_TOOLS, OMSFT(IMCTL(X_I)));
     BABLM(BABL_BROWSER_RELOAD, OMSFT(IMCTL(X_R)));       // hard reload w/o cache
     BABLM(BABL_BROWSER_FULLSCREEN, SS_TAP(X_F4));        // untested
     BABLM(BABL_BROWSER_ZOOM_IN, OMSFT(IMCTL(X_EQUAL)));  // ctr+ +
     BABLM(BABL_BROWSER_ZOOM_OUT, IMCTL(X_MINUS));
-    BABLM(BABL_BROWSER_VIEWSRC, SS_LCTRL("u"));  // Chrome or firefox
+    BABLM(BABL_BROWSER_VIEWSRC, SS_LCTL("u"));  // Chrome or firefox
 #        endif
 
 #        ifdef BABL_APP
     BABLM(BABL_APP_SAVE, SS_LCTL("s"));
     //#ifdef BABL_APP_GOOGLE  -- we're going to make an assumption.
     BABLM(BABL_APP_CENTER_ALIGN, OMSFT(IMCTL(X_E)));
-    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
     BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
     BABLM(BABL_INSERT_COMMENT, OMALT(IMCTL(X_M)));
-    BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BSLASH));
+    BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BACKSLASH));
     BABLM(BABL_DELETE_ROW, IMALT(X_E) "d");
     BABLM(BABL_INSERT_COL_LEFT, IMALT(X_I) "c");  // o for to the right.
     BABLM(BABL_INSERT_ROW, IMALT(X_I) "w");       // r for above.
diff --git a/users/miles2go/babl_emacs.c b/users/miles2go/babl_emacs.c
index 87560b6eb8..aa6e03a5ad 100644
--- a/users/miles2go/babl_emacs.c
+++ b/users/miles2go/babl_emacs.c
@@ -24,41 +24,41 @@ bool babblePaste_emacs(uint16_t keycode) {
     BABLM(BABL_GO_RIGHT_1C, SS_TAP(X_RIGHT));
     BABLM(BABL_GO_LEFT_WORD, IMALT(X_B));
     BABLM(BABL_GO_RIGHT_WORD, IMALT(X_F));
-    BABLM(BABL_GO_START_LINE, SS_LCTRL("a"));
-    BABLM(BABL_GO_END_LINE, SS_LCTRL("e"));
+    BABLM(BABL_GO_START_LINE, SS_LCTL("a"));
+    BABLM(BABL_GO_END_LINE, SS_LCTL("e"));
     BABLM(BABL_GO_START_DOC, OMALT(IMSFT(X_COMMA)));
     BABLM(BABL_GO_END_DOC, OMALT(IMSFT(X_DOT)));
-    BABLM(BABL_GO_NEXT_LINE, SS_LCTRL("n"));
-    BABLM(BABL_GO_PREV_LINE, SS_LCTRL("p"));
-    BABLM(BABL_GO_PARA_START, OMALT(IMSFT(X_LBRACKET)));
-    BABLM(BABL_GO_PARA_END, OMALT(IMSFT(X_RBRACKET)));
-    BABLM(BABL_PGDN, SS_LCTRL("v"));
+    BABLM(BABL_GO_NEXT_LINE, SS_LCTL("n"));
+    BABLM(BABL_GO_PREV_LINE, SS_LCTL("p"));
+    BABLM(BABL_GO_PARA_START, OMALT(IMSFT(X_LEFT_BRACKET)));
+    BABLM(BABL_GO_PARA_END, OMALT(IMSFT(X_RIGHT_BRACKET)));
+    BABLM(BABL_PGDN, SS_LCTL("v"));
     BABLM(BABL_PGUP, IMALT(X_V));
-    BABLM(BABL_DEL_RIGHT_1C, SS_LCTRL("d"));
-    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
+    BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
+    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
     BABLM(BABL_DEL_RIGHT_WORD, IMALT(X_D));
-    BABLM(BABL_DEL_TO_LINE_END, SS_LCTRL("k"));
-    BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTRL("k"));
+    BABLM(BABL_DEL_TO_LINE_END, SS_LCTL("k"));
+    BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTL("k"));
     BABLM(BABL_MODE, "Emacs ");
 #        endif
 #        ifdef BABL_OSKEYS
-    BABLM(BABL_UNDO, SS_LCTRL("x") "c");
-    BABLM(BABL_REDO, SS_LCTRL("x") "c");  // arguably
-    BABLM(BABL_CUT, SS_LCTRL("w"));
+    BABLM(BABL_UNDO, SS_LCTL("x") "c");
+    BABLM(BABL_REDO, SS_LCTL("x") "c");  // arguably
+    BABLM(BABL_CUT, SS_LCTL("w"));
     BABLM(BABL_COPY, SS_LALT("w"));  // really?
-    BABLM(BABL_PASTE, SS_LCTRL("y"));
-    BABLM(BABL_SELECT_ALL, SS_LCTRL("x") "h");
-    BABLM(BABL_FIND, SS_LCTRL("s"));
-    BABLM(BABL_FIND_NEXT, SS_LCTRL("s"));
-    BABLM(BABL_FIND_PREV, SS_LCTRL("r"));
+    BABLM(BABL_PASTE, SS_LCTL("y"));
+    BABLM(BABL_SELECT_ALL, SS_LCTL("x") "h");
+    BABLM(BABL_FIND, SS_LCTL("s"));
+    BABLM(BABL_FIND_NEXT, SS_LCTL("s"));
+    BABLM(BABL_FIND_PREV, SS_LCTL("r"));
     BABLM(BABL_FIND_REPLACE, OMALT(IMSFT(X_5)));
     // BABLM( BABL_RUNAPP , 			//(SS_LALT("x") "shell")	 );// arguably
     BABLM(BABL_RUNAPP, IMALT(X_X) "split-window" SS_TAP(X_ENTER));  // arguably
-    BABLM(BABL_WINDOW_NEXT, SS_LCTRL("x") "o");
-    BABLM(BABL_WINDOW_PREV, SS_LCTRL("x") "o");  // arguably
+    BABLM(BABL_WINDOW_NEXT, SS_LCTL("x") "o");
+    BABLM(BABL_WINDOW_PREV, SS_LCTL("x") "o");  // arguably
     //	BABLM( BABL_WINDOW_NEW,		IMCTL(X_X)"n" ); //
-    BABLM(BABL_CLOSE_APP, SS_LCTRL("x") "c");
-    BABLM(BABL_HELP, SS_LCTRL("h") "a");  // start search in help
+    BABLM(BABL_CLOSE_APP, SS_LCTL("x") "c");
+    BABLM(BABL_HELP, SS_LCTL("h") "a");  // start search in help
                                           // BABLM( BABL_LOCK,		()	); // lock buffer? Too many options.
     // BABLM( BABL_SCREENCAPTURE,		()	); // requires plugin?
 
@@ -70,13 +70,13 @@ bool babblePaste_emacs(uint16_t keycode) {
 #        ifdef BABL_APP
     BABLM(BABL_APP_SAVE, SS_LCTL("x") SS_LCTL("s"));
     BABLM(BABL_APP_SET_MARK, IMCTL(X_SPACE));
-    /// BABLM( BABL_APP_MULTI_SELECT, 	SS_LCTRL("x") "rt" ); // arguably
-    BABLM(BABL_SPLIT_FRAME_VERT, SS_LCTRL("x") "3");
-    BABLM(BABL_UNSPLIT_FRAME_VERT, SS_LCTRL("u") SS_LCTRL("x") "0");
-    BABLM(BABL_SPLIT_FRAME_HORIZONTAL, SS_LCTRL("x") "2");
-    BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_LCTRL("u") SS_LCTRL("x") "0");
-    BABLM(BABL_NEXT_FRAME, SS_LCTRL("x") "o");
-    BABLM(BABL_PREV_FRAME, SS_LCTRL("u") "-1" SS_LCTRL("x") "o");
+    /// BABLM( BABL_APP_MULTI_SELECT, 	SS_LCTL("x") "rt" ); // arguably
+    BABLM(BABL_SPLIT_FRAME_VERT, SS_LCTL("x") "3");
+    BABLM(BABL_UNSPLIT_FRAME_VERT, SS_LCTL("u") SS_LCTL("x") "0");
+    BABLM(BABL_SPLIT_FRAME_HORIZONTAL, SS_LCTL("x") "2");
+    BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_LCTL("u") SS_LCTL("x") "0");
+    BABLM(BABL_NEXT_FRAME, SS_LCTL("x") "o");
+    BABLM(BABL_PREV_FRAME, SS_LCTL("u") "-1" SS_LCTL("x") "o");
 #        endif
 
     // Todo, ring bell, flash light, show user this isn't supported
diff --git a/users/miles2go/babl_kitty.c b/users/miles2go/babl_kitty.c
index 44fd87e5ed..2a4e0d2df4 100644
--- a/users/miles2go/babl_kitty.c
+++ b/users/miles2go/babl_kitty.c
@@ -42,7 +42,7 @@ bool babblePaste_kitty(uint16_t keycode) {
     // BABLM(BABL_GO_NEXT_LINE, OMSFT(IMCTL(X_DOWN)));
     // BABLM(BABL_GO_PREV_LINE, OMSFT(IMCTL(X_UP)));
     // passthrough
-    BABLM(BABL_PGDN, OMSFT(IMCTL(X_PGDOWN)));  // kitty pagedown
+    BABLM(BABL_PGDN, OMSFT(IMCTL(X_PGDN)));  // kitty pagedown
     BABLM(BABL_PGUP, OMSFT(IMCTL(X_PGUP)));    // kitty pageup
                                                // passthrough to commanrd line/shell.
     BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
@@ -84,7 +84,7 @@ bool babblePaste_kitty(uint16_t keycode) {
                                                     // KITTY - missing close window.
     // BABLM( BABL_HELP,		(SS_TAP(X_F1))	); // NA?
     // BABLM(BABL_LOCK, OMCTL(IMALT(X_L))); // NA passthrough
-    // BABLM(BABL_SCREENCAPTURE, IMSFT(X_PSCREEN)); // NA passthrough
+    // BABLM(BABL_SCREENCAPTURE, IMSFT(X_PRINT_SCREEN)); // NA passthrough
 #        endif
 #        ifdef BABL_BROWSER
 
diff --git a/users/miles2go/babl_linux.c b/users/miles2go/babl_linux.c
index aa822d9ba1..4d8e340b01 100644
--- a/users/miles2go/babl_linux.c
+++ b/users/miles2go/babl_linux.c
@@ -29,10 +29,10 @@ bool babblePaste_linux(uint16_t keycode) {
     BABLM(BABL_GO_PREV_LINE, SS_TAP(X_UP));
     BABLM(BABL_GO_PARA_START, IMCTL(X_UP));
     BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN));
-    BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+    BABLM(BABL_PGDN, SS_TAP(X_PGDN));
     BABLM(BABL_PGUP, SS_TAP(X_PGUP));
     BABLM(BABL_DEL_RIGHT_1C, SS_TAP(X_DELETE));
-    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
+    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
     BABLM(BABL_DEL_RIGHT_WORD, IMCTL(X_DELETE));
     BABLM(BABL_DEL_TO_LINE_END, IMSFT(X_HOME) SS_TAP(X_DELETE));
     BABLM(BABL_DEL_TO_LINE_START, IMSFT(X_END) SS_TAP(X_DELETE));
@@ -57,11 +57,11 @@ bool babblePaste_linux(uint16_t keycode) {
     BABLM(BABL_SWITCH_APP_NEXT, IMALT(X_TAB));
     BABLM(BABL_SWITCH_APP_LAST, OMSFT(IMALT(X_TAB)));
     BABLM(BABL_WINDOW_NEXT, OMCTL(IMALT(X_PGUP)));  // Gnome, sometimes
-    BABLM(BABL_WINDOW_PREV, OMCTL(IMALT(X_PGDOWN)));
+    BABLM(BABL_WINDOW_PREV, OMCTL(IMALT(X_PGDN)));
     BABLM(BABL_WINDOW_NEW, IMCTL(X_N));
     // BABLM( BABL_HELP,		(SS_TAP(X_F1))	); // NA?
     BABLM(BABL_LOCK, OMCTL(IMALT(X_L)));
-    BABLM(BABL_SCREENCAPTURE, IMSFT(X_PSCREEN));
+    BABLM(BABL_SCREENCAPTURE, IMSFT(X_PRINT_SCREEN));
 #        endif
 #        ifdef BABL_BROWSER
     BABLM(BABL_BROWSER_NEW_TAB, SS_LCTL("t"));
diff --git a/users/miles2go/babl_mac.c b/users/miles2go/babl_mac.c
index 9f769c582d..fd67172cc8 100644
--- a/users/miles2go/babl_mac.c
+++ b/users/miles2go/babl_mac.c
@@ -29,12 +29,12 @@ bool babblePaste_mac(uint16_t keycode) {
     BABLM(BABL_GO_PARA_START, IMALT(X_UP));
     BABLM(BABL_DEL_RIGHT_1C, SS_TAP(X_DELETE));
     BABLM(BABL_GO_PARA_END, IMALT(X_DOWN));
-    BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+    BABLM(BABL_PGDN, SS_TAP(X_PGDN));
     BABLM(BABL_PGUP, SS_TAP(X_PGUP));
-    BABLM(BABL_DEL_LEFT_WORD, IMALT(X_BSPACE));
+    BABLM(BABL_DEL_LEFT_WORD, IMALT(X_BACKSPACE));
     BABLM(BABL_DEL_RIGHT_WORD, IMALT(X_DELETE));
-    BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BSPACE));  // this is more app agnostic than ctrl-k
-    BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BSPACE));
+    BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BACKSPACE));  // this is more app agnostic than ctrl-k
+    BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BACKSPACE));
     BABLM(BABL_MODE, "Mac ");
 #        endif
 #        ifdef BABL_OSKEYS
@@ -55,8 +55,8 @@ bool babblePaste_mac(uint16_t keycode) {
     BABLM(BABL_SWITCH_APP_LAST, OMSFT(IMGUI(X_TAB)));
     // Apps vary, but this is  usually tab movement, same as B_NXTB
     /*
-    BABLM( BABL_WINDOW_NEXT, OMSFT(IMGUI(X_RBRACKET)) ); // GUI Grav isn't everywhere
-    BABLM( BABL_WINDOW_PREV, OMSFT(IMGUI(X_LBRACKET)) );
+    BABLM( BABL_WINDOW_NEXT, OMSFT(IMGUI(X_RIGHT_BRACKET)) ); // GUI Grav isn't everywhere
+    BABLM( BABL_WINDOW_PREV, OMSFT(IMGUI(X_LEFT_BRACKET)) );
     */
     BABLM(BABL_WINDOW_NEXT, IMGUI(X_GRAVE));
     BABLM(BABL_WINDOW_PREV, OMSFT(IMGUI(X_GRAVE)));
@@ -80,7 +80,7 @@ bool babblePaste_mac(uint16_t keycode) {
     BABLM(BABL_BROWSER_FIND, SS_LGUI("f"));
     BABLM(BABL_BROWSER_BOOKMARK, SS_LGUI("d"));
     BABLM(BABL_BROWSER_RELOAD, OMGUI(SS_LSFT("r")));  // hard reload w/o cache
-    BABLM(BABL_BROWSER_FULLSCREEN, OMGUI(SS_LCTRL("p")));
+    BABLM(BABL_BROWSER_FULLSCREEN, OMGUI(SS_LCTL("p")));
     BABLM(BABL_BROWSER_ZOOM_IN, IMGUI(X_KP_PLUS));  // ctr+ +
     BABLM(BABL_BROWSER_ZOOM_OUT, IMGUI(X_KP_MINUS));
 #            ifdef BABL_BROWSER_CHROME
@@ -106,7 +106,7 @@ bool babblePaste_mac(uint16_t keycode) {
 #                ifdef BABL_APP_MSOFFICE
     BABLM(BABL_APP_CENTER_ALIGN, IMGUI(X_E));
     // BABLM( BABL_APP_CLEAR_FORMATTING, 	OMCTL(IMGUI(X_G)) ); // this isn't native. https://support.office.com/en-us/article/Clear-all-text-formatting-C094C4DA-7F09-4CEA-9A8D-C166949C9C80#OfficeVersion=macOS
-    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
     BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
     BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
     BABLM(BABL_INSERT_COL_LEFT, IMCTL(X_I));
@@ -118,10 +118,10 @@ bool babblePaste_mac(uint16_t keycode) {
 
 #                ifdef BABL_APP_GOOGLE
     BABLM(BABL_APP_CENTER_ALIGN, OMSFT(IMGUI(X_E)));
-    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
     BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
     BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
-    BABLM(BABL_APP_CLEAR_FORMATTING, IMGUI(X_BSLASH));
+    BABLM(BABL_APP_CLEAR_FORMATTING, IMGUI(X_BACKSLASH));
     BABLM(BABL_DELETE_ROW, OMCTL(IMGUI(X_G)));
     BABLM(BABL_INSERT_COL_LEFT, OMALT(IMCTL(X_I)) "c");  // o for to the right.
     BABLM(BABL_INSERT_ROW, OMALT(IMCTL(X_I)) "b");       // r for above.
diff --git a/users/miles2go/babl_nano.c b/users/miles2go/babl_nano.c
index ebbe9b2bc5..7b10f0d3cb 100644
--- a/users/miles2go/babl_nano.c
+++ b/users/miles2go/babl_nano.c
@@ -21,35 +21,35 @@ https://www.nano-editor.org/dist/latest/cheatsheet.html
 
 bool babblePaste_nano(uint16_t keycode) {
 #        ifdef BABL_MOVE
-    BABLM(BABL_GO_LEFT_1C, SS_LCTRL("b"));
+    BABLM(BABL_GO_LEFT_1C, SS_LCTL("b"));
     BABLM(BABL_GO_RIGHT_1C, SS_LCTL("f"));
     BABLM(BABL_GO_LEFT_WORD, IMCTL(X_LEFT));
     BABLM(BABL_GO_RIGHT_WORD, IMCTL(X_RIGHT));
-    BABLM(BABL_GO_START_LINE, SS_LCTRL("a"));
-    BABLM(BABL_GO_END_LINE, SS_LCTRL("e"));
+    BABLM(BABL_GO_START_LINE, SS_LCTL("a"));
+    BABLM(BABL_GO_END_LINE, SS_LCTL("e"));
     BABLM(BABL_GO_START_DOC, IMALT(X_BSLS));
     BABLM(BABL_GO_END_DOC, IMALT(X_SLASH));
-    BABLM(BABL_GO_NEXT_LINE, SS_LCTRL("n"));
-    BABLM(BABL_GO_PREV_LINE, SS_LCTRL("p"));
+    BABLM(BABL_GO_NEXT_LINE, SS_LCTL("n"));
+    BABLM(BABL_GO_PREV_LINE, SS_LCTL("p"));
     BABLM(BABL_GO_PARA_START, IMCTL(X_UP));
     BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN));
-    BABLM(BABL_PGDN, SS_LCTRL("v"));
-    BABLM(BABL_PGUP, SS_LCTRL("y"));
-    BABLM(BABL_DEL_RIGHT_1C, SS_LCTRL("d"));
+    BABLM(BABL_PGDN, SS_LCTL("v"));
+    BABLM(BABL_PGUP, SS_LCTL("y"));
+    BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
     BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPC));
     BABLM(BABL_DEL_RIGHT_WORD, IMCTL(X_DEL));
-    //   BABLM(BABL_DEL_TO_LINE_END, SS_LCTRL("k"));
-    //   BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTRL("k"));
+    //   BABLM(BABL_DEL_TO_LINE_END, SS_LCTL("k"));
+    //   BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTL("k"));
     BABLM(BABL_MODE, "Nano ");
 #        endif
 #        ifdef BABL_OSKEYS
     BABLM(BABL_UNDO, SS_LALT("u"));
     BABLM(BABL_REDO, SS_LALT("e"));
-    BABLM(BABL_CUT, SS_LCTRL("k"));  // arguably b/c line based, not selection
+    BABLM(BABL_CUT, SS_LCTL("k"));  // arguably b/c line based, not selection
     BABLM(BABL_COPY, SS_LALT("6"));  // arguably
-    BABLM(BABL_PASTE, SS_LCTRL("u"));
-    //  BABLM(BABL_SELECT_ALL, SS_LCTRL("x") "h");
-    BABLM(BABL_FIND, SS_LCTRL("w"));
+    BABLM(BABL_PASTE, SS_LCTL("u"));
+    //  BABLM(BABL_SELECT_ALL, SS_LCTL("x") "h");
+    BABLM(BABL_FIND, SS_LCTL("w"));
     BABLM(BABL_FIND_NEXT, SS_LALT("w"));
     BABLM(BABL_FIND_PREV, SS_LALT("q"));
     BABLM(BABL_FIND_REPLACE, SS_LALT("r"));
@@ -57,8 +57,8 @@ bool babblePaste_nano(uint16_t keycode) {
     BABLM(BABL_WINDOW_NEXT, OMALT(IMSFT(X_DOT)));
     BABLM(BABL_WINDOW_PREV, OMALT(IMSFT(X_COMMA)));
     BABLM(BABL_WINDOW_NEW, IMCTL(X_R) IMALT(X_F));  //
-    BABLM(BABL_CLOSE_APP, SS_LCTRL("x"));
-    BABLM(BABL_HELP, SS_LCTRL("g"));
+    BABLM(BABL_CLOSE_APP, SS_LCTL("x"));
+    BABLM(BABL_HELP, SS_LCTL("g"));
 
     // BABLM( BABL_LOCK,		()	); // lock buffer? Too many options.
     // BABLM( BABL_SCREENCAPTURE,		()	); // requires plugin?
@@ -66,7 +66,7 @@ bool babblePaste_nano(uint16_t keycode) {
 #        endif
 
 #        ifdef BABL_APP
-    BABLM(BABL_APP_SAVE, SS_LCTRL("s"));  // save file blurs app & os. Move?
+    BABLM(BABL_APP_SAVE, SS_LCTL("s"));  // save file blurs app & os. Move?
     BABLM(BABL_APP_SET_MARK, SS_LALT("a"));
 #        endif
 
diff --git a/users/miles2go/babl_readmux.c b/users/miles2go/babl_readmux.c
index 8887d523bb..c303912c91 100644
--- a/users/miles2go/babl_readmux.c
+++ b/users/miles2go/babl_readmux.c
@@ -29,7 +29,7 @@ bool babblePaste_readmux(uint16_t keycode) {
     // BABLM( BABL_GO_PARA_END,	 	// undefinedBABLM( BABL_PGDN ,
 
     BABLM(BABL_PGUP, SS_TAP(X_PGUP));
-    BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+    BABLM(BABL_PGDN, SS_TAP(X_PGDN));
     BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
     BABLM(BABL_DEL_LEFT_WORD, SS_LCTL("w"));  // meta-DEL instead?
     BABLM(BABL_DEL_RIGHT_WORD, SS_LALT("d"));
@@ -76,7 +76,7 @@ bool babblePaste_readmux(uint16_t keycode) {
     // This one closes the current pane.
     BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_LCTL("b") "x");
     BABLM(BABL_NEXT_FRAME, SS_LCTL("b") "o");
-    BABLM(BABL_PREV_FRAME, SS_LCTL("w") SS_TAP(X_SCOLON));
+    BABLM(BABL_PREV_FRAME, SS_LCTL("w") SS_TAP(X_SEMICOLON));
 #        endif
 
     // Todo, ring bell, flash light, show user this isn't supported
diff --git a/users/miles2go/babl_vi.c b/users/miles2go/babl_vi.c
index f4b1d39d99..3209525af0 100644
--- a/users/miles2go/babl_vi.c
+++ b/users/miles2go/babl_vi.c
@@ -22,10 +22,10 @@ bool babblePaste_vi(uint16_t keycode) {
     BABLM(BABL_GO_END_DOC, IMSFT(X_G));
     BABLM(BABL_GO_NEXT_LINE, "j");
     BABLM(BABL_GO_PREV_LINE, "k");
-    BABLM(BABL_GO_PARA_START, IMSFT(X_LBRACKET));
-    BABLM(BABL_GO_PARA_END, IMSFT(X_RBRACKET));
-    BABLM(BABL_PGDN, SS_LCTRL("f"));
-    BABLM(BABL_PGUP, SS_LCTRL("b"));
+    BABLM(BABL_GO_PARA_START, IMSFT(X_LEFT_BRACKET));
+    BABLM(BABL_GO_PARA_END, IMSFT(X_RIGHT_BRACKET));
+    BABLM(BABL_PGDN, SS_LCTL("f"));
+    BABLM(BABL_PGUP, SS_LCTL("b"));
     BABLM(BABL_DEL_RIGHT_1C, "x");
     BABLM(BABL_DEL_LEFT_WORD, "dge");
     BABLM(BABL_DEL_RIGHT_WORD, "dw");
@@ -35,11 +35,11 @@ bool babblePaste_vi(uint16_t keycode) {
 #        endif
 #        ifdef BABL_OSKEYS
     BABLM(BABL_UNDO, "h");
-    BABLM(BABL_REDO, SS_LCTRL("r"));
+    BABLM(BABL_REDO, SS_LCTL("r"));
     BABLM(BABL_CUT, "x");
     BABLM(BABL_COPY, "y");
     BABLM(BABL_PASTE, "p");
-    BABLM(BABL_SELECT_ALL, IMSFT(X_SCOLON) SS_TAP(X_5) "y");  // wrong but helpful?
+    BABLM(BABL_SELECT_ALL, IMSFT(X_SEMICOLON) SS_TAP(X_5) "y");  // wrong but helpful?
     BABLM(BABL_FIND, SS_TAP(X_SLASH));
     BABLM(BABL_FIND_NEXT, "n");
     BABLM(BABL_FIND_PREV, IMSFT(X_N));
@@ -47,8 +47,8 @@ bool babblePaste_vi(uint16_t keycode) {
     BABLM(BABL_RUNAPP, ":split");                // requires VIM, is vsplit better?
     BABLM(BABL_SWITCH_APP_NEXT, IMCTL(X_DOWN));  // Or Right?
     BABLM(BABL_SWITCH_APP_NEXT, IMCTL(X_UP));    // or Left?
-    BABLM(BABL_CLOSE_APP, IMCTL(X_SCOLON) "q");
-    BABLM(BABL_HELP, SS_LSFT(SS_TAP(X_SCOLON)) "h");  // start search in help
+    BABLM(BABL_CLOSE_APP, IMCTL(X_SEMICOLON) "q");
+    BABLM(BABL_HELP, SS_LSFT(SS_TAP(X_SEMICOLON)) "h");  // start search in help
                                                       // BABLM( BABL_LOCK,		()	); Perhaps VI is not an OS?
                                                       // BABLM( BABL_SCREENCAPTURE,		()	); // capture a buffer?
 #        endif
@@ -65,8 +65,8 @@ bool babblePaste_vi(uint16_t keycode) {
     BABLM(BABL_UNSPLIT_FRAME_VERT, SS_TAP(X_ESCAPE) ":hide");  // debatable.
     BABLM(BABL_SPLIT_FRAME_HORIZONTAL, SS_TAP(X_ESCAPE) ":vsplit");
     BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_TAP(X_ESCAPE) ":hide");
-    BABLM(BABL_NEXT_FRAME, SS_LCTRL("w") "w");
-    BABLM(BABL_PREV_FRAME, SS_LCTRL("w") SS_LSFT("w"));
+    BABLM(BABL_NEXT_FRAME, SS_LCTL("w") "w");
+    BABLM(BABL_PREV_FRAME, SS_LCTL("w") SS_LSFT("w"));
 #            endif
 #        endif  // app
     // Todo, ring bell, flash light, show user this isn't supported
diff --git a/users/miles2go/babl_windows.c b/users/miles2go/babl_windows.c
index e9d8c23dac..e435d1a3af 100644
--- a/users/miles2go/babl_windows.c
+++ b/users/miles2go/babl_windows.c
@@ -31,10 +31,10 @@ bool babblePaste_win(uint16_t keycode) {
     BABLM(BABL_GO_PREV_LINE, SS_TAP(X_UP));
     BABLM(BABL_GO_PARA_START, IMCTL(X_UP));
     BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN));
-    BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+    BABLM(BABL_PGDN, SS_TAP(X_PGDN));
     BABLM(BABL_PGUP, SS_TAP(X_PGUP));
     BABLM(BABL_DEL_RIGHT_1C, SS_TAP(X_DELETE));
-    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
+    BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
     BABLM(BABL_DEL_RIGHT_WORD, IMCTL(X_DELETE));
     BABLM(BABL_DEL_TO_LINE_END, IMSFT(X_HOME) SS_TAP(X_DELETE));
     BABLM(BABL_DEL_TO_LINE_START, IMSFT(X_END) SS_TAP(X_DELETE));
@@ -42,16 +42,16 @@ bool babblePaste_win(uint16_t keycode) {
 #        endif
 
 #        ifdef BABL_OSKEYS
-    BABLM(BABL_UNDO, SS_LCTRL("z"));
-    BABLM(BABL_REDO, SS_LCTRL("y"));
-    BABLM(BABL_CUT, SS_LCTRL("x"));
-    BABLM(BABL_COPY, SS_LCTRL("c"));
-    BABLM(BABL_PASTE, SS_LCTRL("v"));
-    BABLM(BABL_SELECT_ALL, SS_LCTRL("a"));
-    BABLM(BABL_FIND, SS_LCTRL("f"));
+    BABLM(BABL_UNDO, SS_LCTL("z"));
+    BABLM(BABL_REDO, SS_LCTL("y"));
+    BABLM(BABL_CUT, SS_LCTL("x"));
+    BABLM(BABL_COPY, SS_LCTL("c"));
+    BABLM(BABL_PASTE, SS_LCTL("v"));
+    BABLM(BABL_SELECT_ALL, SS_LCTL("a"));
+    BABLM(BABL_FIND, SS_LCTL("f"));
     BABLM(BABL_FIND_NEXT, SS_TAP(X_F3));
     // BABLM( BABL_FIND_PREV, 	SS_TAP(X_F3) ); // doesn't have a standard one?
-    BABLM(BABL_FIND_REPLACE, SS_LCTRL("h"));
+    BABLM(BABL_FIND_REPLACE, SS_LCTL("h"));
     BABLM(BABL_RUNAPP, SS_LGUI("r"));
     BABLM(BABL_SWITCH_APP_NEXT, IMALT(X_TAB));
     BABLM(BABL_SWITCH_APP_LAST, OMSFT(IMALT(X_TAB)));
@@ -67,22 +67,22 @@ bool babblePaste_win(uint16_t keycode) {
 #        endif
 
 #        ifdef BABL_BROWSER
-    BABLM(BABL_BROWSER_NEW_TAB, SS_LCTRL("t"));
-    BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTRL("w"));
+    BABLM(BABL_BROWSER_NEW_TAB, SS_LCTL("t"));
+    BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTL("w"));
     BABLM(BABL_BROWSER_REOPEN_LAST_TAB, OMSFT(IMCTL(X_T)));
     BABLM(BABL_BROWSER_NEXT_TAB, IMCTL(X_TAB));
     BABLM(BABL_BROWSER_PREV_TAB, OMSFT(IMCTL(X_TAB)));
-    BABLM(BABL_BROWSER_URL_BAR, SS_LCTRL("l"));
+    BABLM(BABL_BROWSER_URL_BAR, SS_LCTL("l"));
     BABLM(BABL_BROWSER_FORWARD, IMALT(X_RIGHT));
     BABLM(BABL_BROWSER_BACK, OMSFT(IMALT(X_LEFT)));
     ;
-    BABLM(BABL_BROWSER_FIND, SS_LCTRL("f"));
-    BABLM(BABL_BROWSER_BOOKMARK, SS_LCTRL("d"));
+    BABLM(BABL_BROWSER_FIND, SS_LCTL("f"));
+    BABLM(BABL_BROWSER_BOOKMARK, SS_LCTL("d"));
 #            ifdef BABL_BROWSER_MS
     BABLM(BABL_BROWSER_DEV_TOOLS, IMCTL(X_F12));  // EDGE
 #            else
-    BABLM(BABL_BROWSER_DEV_TOOLS, SS_LCTRL("t"));  // Chrome
-    BABLM(BABL_BROWSER_VIEWSRC, SS_LCTRL("u"));    // Chrome or firefox
+    BABLM(BABL_BROWSER_DEV_TOOLS, SS_LCTL("t"));  // Chrome
+    BABLM(BABL_BROWSER_VIEWSRC, SS_LCTL("u"));    // Chrome or firefox
 #            endif
     // chrome
     BABLM(BABL_BROWSER_RELOAD, IMCTL(X_F5));             // hard reload w/o cache
@@ -109,7 +109,7 @@ bool babblePaste_win(uint16_t keycode) {
 #                    endif
     BABLM(BABL_APP_CENTER_ALIGN, IMALT(X_H) "ac");
     // BABLM( BABL_APP_CLEAR_FORMATTING, 	OMCTL(IMGUI(X_G)) ); // this isn't native. https://support.office.com/en-us/article/Clear-all-text-formatting-C094C4DA-7F09-4CEA-9A8D-C166949C9C80#OfficeVersion=macOS
-    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
     BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
     BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
     BABLM(BABL_INSERT_COL_LEFT, OMCTL(IMSFT(X_KP_PLUS)));
@@ -121,10 +121,10 @@ bool babblePaste_win(uint16_t keycode) {
 
 #                ifdef BABL_APP_GOOGLE
     BABLM(BABL_APP_CENTER_ALIGN, OMSFT(IMCTL(X_E)));
-    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+    BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
     BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
     BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
-    BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BSLASH));
+    BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BACKSLASH));
     BABLM(BABL_DELETE_ROW, IMALT(X_E) "d");
     BABLM(BABL_INSERT_COL_LEFT, OMALT(IMCTL(X_I)) "c");  // o for to the right.
     BABLM(BABL_INSERT_ROW, IMALT(IMCTL(X_I)) "w");       // r for above.
diff --git a/users/moults31/gdb.c b/users/moults31/gdb.c
index 42f5513eca..3b31d94159 100644
--- a/users/moults31/gdb.c
+++ b/users/moults31/gdb.c
@@ -45,7 +45,7 @@ bool process_record_gdb(uint16_t keycode, keyrecord_t *record) {
             break;
         case M_GDB_RESTART:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LSFT(SS_TAP(X_F5))));
+                SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_F5))));
             }
             break;
         case M_GDB_STOP:
diff --git a/users/moults31/vscode.c b/users/moults31/vscode.c
index a2fcf062dc..7900e20431 100644
--- a/users/moults31/vscode.c
+++ b/users/moults31/vscode.c
@@ -21,67 +21,67 @@ bool process_record_vsc(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case M_VSC_TERMFOCUS:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("`"));
+                SEND_STRING(SS_LCTL("`"));
             }
             break;
         case M_VSC_SIDEBARFOCUS:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("0"));
+                SEND_STRING(SS_LCTL("0"));
             }
             break;
         case M_VSC_SIDEBARCLOSE:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("b"));
+                SEND_STRING(SS_LCTL("b"));
             }
             break;
         case M_VSC_FILECLOSE:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL("w"));
+                SEND_STRING(SS_LCTL("w"));
             }
             break;
         case M_VSC_FILENXT:
             if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_K) SS_TAP(X_PGDOWN) SS_UP(X_LCTRL));
+                SEND_STRING(SS_DOWN(X_LEFT_CTRL) SS_TAP(X_K) SS_TAP(X_PAGE_DOWN) SS_UP(X_LEFT_CTRL));
             }
             break;
         case M_VSC_FILEPRV:
             if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_K) SS_TAP(X_PGUP) SS_UP(X_LCTRL));
+                SEND_STRING(SS_DOWN(X_LEFT_CTRL) SS_TAP(X_K) SS_TAP(X_PGUP) SS_UP(X_LEFT_CTRL));
             }
             break;
         case M_VSC_DBGCNSLFOCUS:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_D))));
+                SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_D))));
             }
             break;
         case M_VSC_MVEDTRNXTGRP:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_RIGHT))));
+                SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_RIGHT))));
             }
             break;
         case M_VSC_MVEDTRPRVGRP:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_LEFT))));
+                SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_LEFT))));
             }
             break;
         case M_VSC_EDGRPNXT:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_L))));
+                SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_L))));
             }
             break;
         case M_VSC_EDGRPPRV:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_K))));
+                SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_K))));
             }
             break;
         case M_VSC_VIEWSIZEINC:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_P))));
+                SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_P))));
             }
             break;
         case M_VSC_VIEWSIZEDEC:
             if (record->event.pressed) {
-                SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_O))));
+                SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_O))));
             }
             break;
     }
diff --git a/users/rossman360/rossman360.c b/users/rossman360/rossman360.c
index dc7d766390..10911bddec 100644
--- a/users/rossman360/rossman360.c
+++ b/users/rossman360/rossman360.c
@@ -32,52 +32,52 @@ switch (keycode) {
     break;
 	case CSPEAK:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN));
+		SEND_STRING(SS_TAP(X_PAGE_DOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGE_DOWN));
 	}
 	break;
 	case SPEAK1:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_1)));
+		SEND_STRING(SS_TAP(X_PAGE_DOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGE_DOWN) SS_LCTL(SS_TAP(X_1)));
 	}
 	break;
 	case SPEAK2:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_2)));
+		SEND_STRING(SS_TAP(X_PAGE_DOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGE_DOWN) SS_LCTL(SS_TAP(X_2)));
 	 }
 	break;
 	case SPEAK3:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_3)));
+		SEND_STRING(SS_TAP(X_PAGE_DOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGE_DOWN) SS_LCTL(SS_TAP(X_3)));
 	}
 	break;
 	case SPEAK4:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN) SS_LCTRL(SS_TAP(X_4)));
+		SEND_STRING(SS_TAP(X_PAGE_DOWN) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_PAGE_DOWN) SS_LCTL(SS_TAP(X_4)));
 	}
 	break;
 	case PARADOWN:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_PGDOWN) SS_TAP(X_ENTER) SS_TAP(X_PGDOWN));
+		SEND_STRING(SS_TAP(X_PAGE_DOWN) SS_TAP(X_ENTER) SS_TAP(X_PAGE_DOWN));
 	}
 	break;
 	case PMERGE:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_HOME) SS_TAP(X_BSPACE) SS_TAP(X_SPACE) SS_LCTRL(SS_TAP(X_BSPACE)) SS_TAP(X_SPACE));
+		SEND_STRING(SS_TAP(X_HOME) SS_TAP(X_BACKSPACE) SS_TAP(X_SPACE) SS_LCTL(SS_TAP(X_BACKSPACE)) SS_TAP(X_SPACE));
 	}
 	break;
 	case WREFRESH:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_SPACE) SS_TAP(X_BSPACE));
+		SEND_STRING(SS_TAP(X_SPACE) SS_TAP(X_BACKSPACE));
 	}
 	break;
 	case REMCAPS:
 	if (record->event.pressed) {
-		SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_LCTRL(SS_TAP(X_LEFT)) SS_TAP(X_DELETE));
+		SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_LEFT)) SS_TAP(X_DELETE));
 	}
 	break;
 	case EMDASH:
 	if (record->event.pressed) {
-		SEND_STRING(SS_LCTRL(SS_LSFT(SS_TAP(X_U))) SS_TAP(X_2) SS_TAP(X_0) SS_TAP(X_1) SS_TAP(X_4) SS_TAP(X_SPACE) SS_TAP(X_SPACE));
+		SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_U))) SS_TAP(X_2) SS_TAP(X_0) SS_TAP(X_1) SS_TAP(X_4) SS_TAP(X_SPACE) SS_TAP(X_SPACE));
 	}
 	break;
 };
diff --git a/users/sigma/sigma.c b/users/sigma/sigma.c
index 64fa68228b..70a76d4c01 100644
--- a/users/sigma/sigma.c
+++ b/users/sigma/sigma.c
@@ -172,7 +172,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     default:
       if (pressed)
-        SEND_STRING(SS_LCTRL("x"));
+        SEND_STRING(SS_LCTL("x"));
       break;
     }
     break;
@@ -190,7 +190,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     default:
       if (pressed)
-        SEND_STRING(SS_LCTRL("c"));
+        SEND_STRING(SS_LCTL("c"));
       break;
     }
     break;
@@ -208,7 +208,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     default:
       if (pressed)
-        SEND_STRING(SS_LCTRL("v"));
+        SEND_STRING(SS_LCTL("v"));
       break;
     }
     break;
@@ -226,7 +226,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     default:
       if (pressed)
-        SEND_STRING(SS_LCTRL("z"));
+        SEND_STRING(SS_LCTL("z"));
       break;
     }
     break;
@@ -244,7 +244,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     default:
       if (pressed)
-        SEND_STRING(SS_LCTRL(SS_LSFT("z")));
+        SEND_STRING(SS_LCTL(SS_LSFT("z")));
       break;
     }
     break;
@@ -253,7 +253,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (os_target) {
     case _OS_MACOS:
       if (pressed)
-        SEND_STRING(SS_LGUI(SS_LCTRL("q")));
+        SEND_STRING(SS_LGUI(SS_LCTL("q")));
       break;
     case _OS_LINUX:
       pressed ?
diff --git a/users/stanrc85/stanrc85.c b/users/stanrc85/stanrc85.c
index 56e67e52b1..5f74612848 100644
--- a/users/stanrc85/stanrc85.c
+++ b/users/stanrc85/stanrc85.c
@@ -22,13 +22,13 @@ void ctl_copy_finished (qk_tap_dance_state_t *state, void *user_data) {
   td_state = cur_dance(state);
   switch (td_state) {
     case SINGLE_TAP:
-      SEND_STRING(SS_LCTRL("c"));
+      SEND_STRING(SS_LCTL("c"));
       break;
     case SINGLE_HOLD:
       register_mods(MOD_BIT(KC_RCTL));
       break;
     case DOUBLE_TAP:
-      SEND_STRING(SS_LCTRL("v"));
+      SEND_STRING(SS_LCTL("v"));
   }
 }
 
diff --git a/users/talljoe/macros.c b/users/talljoe/macros.c
index db8d28d4ce..e9c9b521b7 100644
--- a/users/talljoe/macros.c
+++ b/users/talljoe/macros.c
@@ -27,13 +27,13 @@ ostype_t get_os() {
 
 #define IS_OSX() (get_os() == MACOSX)
 
-#define MOD_SEND(KEY) (IS_OSX() ? SEND_STRING(SS_LCMD(KEY)) : SEND_STRING(SS_LCTRL(KEY)))
+#define MOD_SEND(KEY) (IS_OSX() ? SEND_STRING(SS_LCMD(KEY)) : SEND_STRING(SS_LCTL(KEY)))
 
 void macro_copy() { MOD_SEND("c"); }
 void macro_paste() { MOD_SEND("v"); }
 void macro_lock() {
   if (IS_OSX()) {
-    SEND_STRING(SS_LCTRL(SS_LCMD("q")));
+    SEND_STRING(SS_LCTL(SS_LCMD("q")));
   } else {
     SEND_STRING(SS_LGUI("l"));
   }
diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c
index 7e2d09e0f6..ede34d4556 100644
--- a/users/uqs/uqs.c
+++ b/users/uqs/uqs.c
@@ -502,10 +502,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 /*
  * Obsoleted by making tmux understand Ctrl-(Shift)-Tab natively.
     case TM_NEXT:
-        if (record->event.pressed) SEND_STRING(SS_LCTRL("a") "n");
+        if (record->event.pressed) SEND_STRING(SS_LCTL("a") "n");
         break;
     case TM_PREV:
-        if (record->event.pressed) SEND_STRING(SS_LCTRL("a") "p");
+        if (record->event.pressed) SEND_STRING(SS_LCTL("a") "p");
         break;
 */
         // TODO: use key overrides to turn, e.g. Win+Ctrl-Tab into VIM_NEXT.
@@ -517,16 +517,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         if (record->event.pressed) SEND_STRING(SS_TAP(X_ESC) SS_TAP(X_G) SS_LSFT("t"));
         break;
     case WIN_LEFT:
-        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_H));
+        if (record->event.pressed) SEND_STRING(SS_LCTL("w") SS_TAP(X_H));
         break;
     case WIN_DN:
-        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_J));
+        if (record->event.pressed) SEND_STRING(SS_LCTL("w") SS_TAP(X_J));
         break;
     case WIN_UP:
-        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_K));
+        if (record->event.pressed) SEND_STRING(SS_LCTL("w") SS_TAP(X_K));
         break;
     case WIN_RGHT:
-        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_L));
+        if (record->event.pressed) SEND_STRING(SS_LCTL("w") SS_TAP(X_L));
         break;
     }
 
diff --git a/users/wanleg/tapdances.c b/users/wanleg/tapdances.c
index 8f87af720e..cfd84a2644 100644
--- a/users/wanleg/tapdances.c
+++ b/users/wanleg/tapdances.c
@@ -72,15 +72,15 @@ void CAD_finished (qk_tap_dance_state_t *state, void *user_data) {
     case SINGLE_HOLD:
 		//register_code(KC_NO);
 		//take a screenshot of a single window, open Paint and paste
-		SEND_STRING(SS_LALT(SS_TAP(X_PSCREEN)) SS_LGUI("r"));
+		SEND_STRING(SS_LALT(SS_TAP(X_PRINT_SCREEN)) SS_LGUI("r"));
         wait_ms(500);
         SEND_STRING("mspaint" SS_TAP(X_ENTER));
         wait_ms(700);
-        SEND_STRING(SS_LCTRL("v"));
+        SEND_STRING(SS_LCTL("v"));
 		break; //register this keycode when button is held
     case DOUBLE_TAP:
 		//register_code(KC_ENT);
-		SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_DELETE))));
+		SEND_STRING(SS_LCTL(SS_LALT(SS_TAP(X_DELETE))));
 		#ifdef BACKLIGHT_ENABLE
     backlight_level(0);
 		#endif

From 5fdb49b5dbf11025e0425950a1e32b88e21d596f Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 17 Oct 2022 10:13:40 -0600
Subject: [PATCH 663/959] Fixup handwired/kbod (#18754)

---
 keyboards/handwired/kbod/config.h             | 42 +------------------
 .../handwired/kbod/keymaps/default/keymap.c   | 24 ++++-------
 .../handwired/kbod/keymaps/default/readme.md  |  5 ---
 .../handwired/kbod/keymaps/default/rules.mk   |  9 ----
 4 files changed, 9 insertions(+), 71 deletions(-)
 delete mode 100644 keyboards/handwired/kbod/keymaps/default/readme.md
 delete mode 100644 keyboards/handwired/kbod/keymaps/default/rules.mk

diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index 44046dcfa1..6a9ea21270 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -23,60 +23,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 }
 #define MATRIX_COL_PINS { D0, D1, F0, F1, F4, F5, F6, F7 }
 
-/* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
+#define LED_CAPS_LOCK_PIN B0
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -93,5 +54,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#undef TAPPING_TOGGLE
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c
index 0ffc3e9d97..856f0eda60 100644
--- a/keyboards/handwired/kbod/keymaps/default/keymap.c
+++ b/keyboards/handwired/kbod/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case SFT_ESC:
-      SET_WHETHER(MODS_PRESSED(SHIFT), KC_ESC, KC_GRAVE);
+      SET_WHETHER(MODS_PRESSED(SFT), KC_ESC, KC_GRAVE);
 
       return false;
 
@@ -75,24 +75,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & _BV(USB_LED_CAPS_LOCK)) {
-    PORTB |= _BV(PB0);
-  } else {
-    PORTB &= ~_BV(PB0);
-  }
-}
-
 void matrix_init_user(void) {
-  DDRB |= _BV(PB0);
-  DDRC |= _BV(PC7);
+  setPinOutput(C7);
+  writePinLow(C7);
 }
 
-void matrix_scan_user(void) {
-  uint8_t layer = get_highest_layer(layer_state);
-  if (layer) {
-    PORTC |= _BV(PC7);
+layer_state_t layer_state_set_user(layer_state_t state) {
+  if (get_highest_layer(state)) {
+    writePinHigh(C7);
   } else {
-    PORTC &= ~_BV(PC7);
+    writePinLow(C7);
   }
+  return state;
 }
diff --git a/keyboards/handwired/kbod/keymaps/default/readme.md b/keyboards/handwired/kbod/keymaps/default/readme.md
deleted file mode 100644
index 35c22ec007..0000000000
--- a/keyboards/handwired/kbod/keymaps/default/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The default keymap for kbod
-
-This is the default keymap for kbod,
-
-it consists of a base layer with QWERTY layout, a momentary cursor-layer, and mouse-keys and multimedia layers.
\ No newline at end of file
diff --git a/keyboards/handwired/kbod/keymaps/default/rules.mk b/keyboards/handwired/kbod/keymaps/default/rules.mk
deleted file mode 100644
index 0db36fdd09..0000000000
--- a/keyboards/handwired/kbod/keymaps/default/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 

From 9d4c4ceee13bfa229de6be2255e83c9c324259d6 Mon Sep 17 00:00:00 2001
From: Jamal Bouajjaj <develop@electro707.com>
Date: Mon, 17 Oct 2022 17:26:58 -0400
Subject: [PATCH 664/959] 4 Driver support for IS31FL3737 (#18750)

* Added 4 driver support for the IS31FL3737 LED driver

* Updated docs for IS31FL3737 to support 4 drivers
---
 docs/feature_rgb_matrix.md              |  6 ++++--
 quantum/rgb_matrix/rgb_matrix_drivers.c | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index e0c46f60e2..a7ef55b4bc 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -164,7 +164,7 @@ There is basic support for addressable RGB matrix lighting with the I2C IS31FL37
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = IS31FL3737
 ```
-You can use between 1 and 2 IS31FL3737 IC's. Do not specify `DRIVER_ADDR_2` define for second IC if not present on your keyboard.
+You can use between 1 and 4 IS31FL3737 IC's. Do not specify `DRIVER_ADDR_<N>` defines for IC's that are not present on your keyboard.
 
 Configure the hardware via your `config.h`:
 
@@ -180,6 +180,8 @@ Configure the hardware via your `config.h`:
 | `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
 | `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
 | `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
+| `DRIVER_ADDR_3` | (Optional) Address for the third RGB driver | |
+| `DRIVER_ADDR_4` | (Optional) Address for the fourth RGB driver | |
 
 The IS31FL3737 IC's have on-chip resistors that can be enabled to allow for de-ghosting of the RGB matrix. By default these resistors are not enabled (`ISSI_SWPULLUP`/`ISSI_CSPULLUP` are given the value of`PUR_0R`), the values that can be set to enable de-ghosting are as follows:
 
@@ -233,7 +235,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 }
 ```
 
-Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3737.pdf) and the header file `drivers/led/issi/is31fl3737.h`. The `driver` is the index of the driver you defined in your `config.h` (Only `0`, `1` for now).
+Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3737.pdf) and the header file `drivers/led/issi/is31fl3737.h`. The `driver` is the index of the driver you defined in your `config.h` (Only `0`, `1`, `2`, or `3` for now).
 
 ---
 ### IS31FLCOMMON :id=is31flcommon
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index e75b2c6c9d..b4d23f8201 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -76,6 +76,12 @@ static void init(void) {
     IS31FL3737_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
     IS31FL3737_init(DRIVER_ADDR_2);
+#           if defined(DRIVER_ADDR_3)
+    IS31FL3737_init(DRIVER_ADDR_3);
+#               if defined(DRIVER_ADDR_4)
+    IS31FL3737_init(DRIVER_ADDR_4);
+#               endif
+#           endif
 #        endif
 
 #    elif defined(IS31FL3741)
@@ -154,6 +160,12 @@ static void init(void) {
     IS31FL3737_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
     IS31FL3737_update_led_control_registers(DRIVER_ADDR_2, 1);
+#           if defined(DRIVER_ADDR_3)
+    IS31FL3737_update_led_control_registers(DRIVER_ADDR_3, 2);
+#               if defined(DRIVER_ADDR_4)
+    IS31FL3737_update_led_control_registers(DRIVER_ADDR_4, 3);
+#               endif
+#           endif
 #        endif
 
 #    elif defined(IS31FL3741)
@@ -235,6 +247,12 @@ static void flush(void) {
     IS31FL3737_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
     IS31FL3737_update_pwm_buffers(DRIVER_ADDR_2, 1);
+#           if defined(DRIVER_ADDR_3)
+    IS31FL3737_update_pwm_buffers(DRIVER_ADDR_3, 2);
+#               if defined(DRIVER_ADDR_4)
+    IS31FL3737_update_pwm_buffers(DRIVER_ADDR_4, 3);
+#               endif
+#           endif
 #        endif
 }
 

From e59cb51be01cf0428524596490eb1bff91e566bd Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Mon, 17 Oct 2022 14:29:19 -0700
Subject: [PATCH 665/959] [CI] Format code according to conventions (#18756)

---
 quantum/rgb_matrix/rgb_matrix_drivers.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index b4d23f8201..5b81915845 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -76,12 +76,12 @@ static void init(void) {
     IS31FL3737_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
     IS31FL3737_init(DRIVER_ADDR_2);
-#           if defined(DRIVER_ADDR_3)
+#            if defined(DRIVER_ADDR_3)
     IS31FL3737_init(DRIVER_ADDR_3);
-#               if defined(DRIVER_ADDR_4)
+#                if defined(DRIVER_ADDR_4)
     IS31FL3737_init(DRIVER_ADDR_4);
-#               endif
-#           endif
+#                endif
+#            endif
 #        endif
 
 #    elif defined(IS31FL3741)
@@ -160,12 +160,12 @@ static void init(void) {
     IS31FL3737_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
     IS31FL3737_update_led_control_registers(DRIVER_ADDR_2, 1);
-#           if defined(DRIVER_ADDR_3)
+#            if defined(DRIVER_ADDR_3)
     IS31FL3737_update_led_control_registers(DRIVER_ADDR_3, 2);
-#               if defined(DRIVER_ADDR_4)
+#                if defined(DRIVER_ADDR_4)
     IS31FL3737_update_led_control_registers(DRIVER_ADDR_4, 3);
-#               endif
-#           endif
+#                endif
+#            endif
 #        endif
 
 #    elif defined(IS31FL3741)
@@ -247,12 +247,12 @@ static void flush(void) {
     IS31FL3737_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
     IS31FL3737_update_pwm_buffers(DRIVER_ADDR_2, 1);
-#           if defined(DRIVER_ADDR_3)
+#            if defined(DRIVER_ADDR_3)
     IS31FL3737_update_pwm_buffers(DRIVER_ADDR_3, 2);
-#               if defined(DRIVER_ADDR_4)
+#                if defined(DRIVER_ADDR_4)
     IS31FL3737_update_pwm_buffers(DRIVER_ADDR_4, 3);
-#               endif
-#           endif
+#                endif
+#            endif
 #        endif
 }
 

From 89dbc181617e69a5b4d91d9d772724daa2d387bb Mon Sep 17 00:00:00 2001
From: mmccoyd <mmccoyd@users.noreply.github.com>
Date: Mon, 17 Oct 2022 19:23:21 -0700
Subject: [PATCH 666/959] [Keymap] manna-harbour_miryoku RESET to QK_BOOT
 (#18755)

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
---
 .../miryoku_babel/miryoku_alternatives.h      | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
index 8a0e70a6b5..914a81bb79 100644
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
@@ -129,132 +129,132 @@ U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(M
 
 
 #define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \
-KC_PGUP,           KC_HOME,           KC_UP,             KC_END,            KC_INS,            U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+KC_PGUP,           KC_HOME,           KC_UP,             KC_END,            KC_INS,            U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_PGDN,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV_FLIP \
-KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              KC_INS,            KC_HOME,           KC_UP,             KC_END,            KC_PGUP,           \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_INS,            KC_HOME,           KC_UP,             KC_END,            KC_PGUP,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_PGDN,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV_VI \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP \
-KC_WH_U,           KC_WH_L,           KC_MS_U,           KC_WH_R,           U_NU,              U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+KC_WH_U,           KC_WH_L,           KC_MS_U,           KC_WH_R,           U_NU,              U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_WH_D,           KC_MS_L,           KC_MS_D,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_BTN2,           KC_BTN3,           KC_BTN1,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \
-KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_BTN2,           KC_BTN3,           KC_BTN1,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              U_NU,              KC_WH_L,           KC_MS_U,           KC_WH_R,           KC_WH_U,           \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_NU,              KC_WH_L,           KC_MS_U,           KC_WH_R,           KC_WH_U,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_R,           KC_WH_D,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN1,           KC_BTN3,           KC_BTN2,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_VI \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN1,           KC_BTN3,           KC_BTN2,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN1,           KC_BTN3,           KC_BTN2,           U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \
-RGB_SAI,           RGB_HUI,           KC_VOLU,           RGB_MOD,           RGB_TOG,           U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+RGB_SAI,           RGB_HUI,           KC_VOLU,           RGB_MOD,           RGB_TOG,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 RGB_VAI,           KC_MPRV,           KC_VOLD,           KC_MNXT,           OUT_AUTO,          U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_FLIP \
-RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           OUT_AUTO,          U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           KC_VOLU,           RGB_HUI,           RGB_SAI,           \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           KC_VOLU,           RGB_HUI,           RGB_SAI,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              OUT_AUTO,          KC_MPRV,           KC_VOLD,           KC_MNXT,           RGB_VAI,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_VI \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           OUT_AUTO,          \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              OUT_AUTO,          KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_NUM_FLIP \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_EQL,            KC_4,              KC_5,              KC_6,              KC_SCLN,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_BSLS,           KC_1,              KC_2,              KC_3,              KC_GRV,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MINS,           KC_0,              KC_DOT,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NUM \
-KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_SCLN,           KC_4,              KC_5,              KC_6,              KC_EQL,            U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 KC_GRV,            KC_1,              KC_2,              KC_3,              KC_BSLS,           U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_DOT,            KC_0,              KC_MINS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_SYM_FLIP \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_PLUS,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_COLN,           \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_PIPE,           KC_EXLM,           KC_AT,             KC_HASH,           KC_TILD,           \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_UNDS,           KC_LPRN,           KC_RPRN,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_SYM \
-KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_COLN,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_PLUS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 KC_TILD,           KC_EXLM,           KC_AT,             KC_HASH,           KC_PIPE,           U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_LPRN,           KC_RPRN,           KC_UNDS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_FUN_FLIP \
-RESET,             U_NA,              U_NA,              U_NA,              U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
+QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SLCK,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
 U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_PAUS,           KC_F1,             KC_F2,             KC_F3,             KC_F10,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_TAB,            KC_SPC,            KC_APP,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_FUN \
-KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              U_NA,              U_NA,              U_NA,              RESET,             \
+KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
 KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SLCK,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 KC_F10,            KC_F1,             KC_F2,             KC_F3,             KC_PAUS,           U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_APP,            KC_SPC,            KC_TAB,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP

From 80fdbfce5f92c552a2ec0bae72cdfc1639ffb9dc Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Tue, 18 Oct 2022 19:28:19 -0400
Subject: [PATCH 667/959] A little personal cleanup after #18726 and #18729
 (#18734)

* A little cleanup after #18726

* Re-instate RGBLIGHT_EFFECT_STATIC_GRADIENT

* Extend to spin
---
 .../dmqdesign/spin/keymaps/spidey3_pad/config.h   |  1 -
 keyboards/kbdfans/kbd75/config.h                  |  2 +-
 users/spidey3/config.h                            | 15 ---------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
index 81a9bd9529..5aabd5e3ff 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
@@ -32,7 +32,6 @@
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_KNIGHT
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 19f84c6752..1bd79242d0 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -50,7 +50,7 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
 /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #define RGBLIGHT_SLEEP
+
 #endif
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index 808de4d591..15f46a1f4a 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -14,23 +14,8 @@
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_STARTUP_ANIMATION
 
-#    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
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_TWINKLE
 
 #    define RGBLIGHT_DEFAULT_HUE 213
 #    define RGBLIGHT_DEFAULT_SAT UINT8_MAX

From 0b8fbff1cbb510e922a6c3a23793b7d0ddf9e3b9 Mon Sep 17 00:00:00 2001
From: Tyler Thrailkill <tylerbthrailkill@gmail.com>
Date: Tue, 18 Oct 2022 18:40:26 -0600
Subject: [PATCH 668/959] Adjust oled gen to fix flashing on timeout (#18747)

Fixes an issue in Ocean Dream that causes flashing after the oled screen
times out and turns off.

This occurs because writing to an OLED screen turns it on as well and we
are both writing then immediately turning the screen off, but only if
the timeout has occurred (no WPM, 30 seconds has passed).
---
 users/snowe/ocean_dream.c | 123 +++++++++++++++++++-------------------
 1 file changed, 62 insertions(+), 61 deletions(-)

diff --git a/users/snowe/ocean_dream.c b/users/snowe/ocean_dream.c
index 2f372628da..bd95ea16f8 100644
--- a/users/snowe/ocean_dream.c
+++ b/users/snowe/ocean_dream.c
@@ -20,13 +20,13 @@
 #include "print.h"
 
 // Calculated Parameters
-#define TWINKLE_PROBABILITY_MODULATOR 100 / TWINKLE_PROBABILITY                             // CALCULATED: Don't Touch
-#define TOTAL_STARS STARS_PER_LINE *NUMBER_OF_STAR_LINES                                    // CALCULATED: Don't Touch
-#define OCEAN_ANIMATION_MODULATOR NUMBER_OF_FRAMES / OCEAN_ANIMATION_SPEED                  // CALCULATED: Don't Touch
-#define SHOOTING_STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / SHOOTING_STAR_ANIMATION_SPEED  // CALCULATED: Don't Touch
-#define STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / STAR_ANIMATION_SPEED                    // CALCULATED: Don't Touch
+#define TWINKLE_PROBABILITY_MODULATOR 100 / TWINKLE_PROBABILITY                            // CALCULATED: Don't Touch
+#define TOTAL_STARS STARS_PER_LINE *NUMBER_OF_STAR_LINES                                   // CALCULATED: Don't Touch
+#define OCEAN_ANIMATION_MODULATOR NUMBER_OF_FRAMES / OCEAN_ANIMATION_SPEED                 // CALCULATED: Don't Touch
+#define SHOOTING_STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / SHOOTING_STAR_ANIMATION_SPEED // CALCULATED: Don't Touch
+#define STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / STAR_ANIMATION_SPEED                   // CALCULATED: Don't Touch
 
-uint8_t    animation_counter       = 0;  // global animation counter.
+uint8_t    animation_counter       = 0; // global animation counter.
 bool       is_calm                 = false;
 uint32_t   starry_night_anim_timer = 0;
 uint32_t   starry_night_anim_sleep = 0;
@@ -52,10 +52,10 @@ static uint8_t decrement_counter(uint8_t counter, uint8_t max) {
 }
 #endif
 
-#ifdef ENABLE_MOON  // region
+#ifdef ENABLE_MOON // region
 #    ifndef STATIC_MOON
-uint8_t  moon_animation_frame   = 0;  // keeps track of current moon frame
-uint16_t moon_animation_counter = 0;  // counts how many frames to wait before animating moon to next frame
+uint8_t  moon_animation_frame   = 0; // keeps track of current moon frame
+uint16_t moon_animation_counter = 0; // counts how many frames to wait before animating moon to next frame
 #    endif
 
 #    ifdef STATIC_MOON
@@ -99,9 +99,9 @@ static void draw_moon(void) {
     }
 #    endif
 }
-#endif  // endregion
+#endif // endregion
 
-#ifdef ENABLE_WAVE  // region
+#ifdef ENABLE_WAVE // region
 uint8_t starry_night_wave_frame_width_counter = 31;
 uint8_t rough_waves_frame_counter             = 0;
 
@@ -193,8 +193,8 @@ static const char PROGMEM ocean_bottom[8][32] = {
 // clang-format on
 
 static void animate_waves(void) {
-    starry_night_wave_frame_width_counter = decrement_counter(starry_night_wave_frame_width_counter, WIDTH - 1);  // only 3 frames for last wave type
-    rough_waves_frame_counter             = increment_counter(rough_waves_frame_counter, 3);                      // only 3 frames for last wave type
+    starry_night_wave_frame_width_counter = decrement_counter(starry_night_wave_frame_width_counter, WIDTH - 1); // only 3 frames for last wave type
+    rough_waves_frame_counter             = increment_counter(rough_waves_frame_counter, 3);                     // only 3 frames for last wave type
 
     void draw_ocean(uint8_t frame, uint16_t offset, uint8_t byte_index) {
         oled_write_raw_byte(pgm_read_byte(ocean_top[frame] + byte_index), offset);
@@ -218,9 +218,9 @@ static void animate_waves(void) {
         }
     }
 }
-#endif  // endregion
+#endif // endregion
 
-#ifdef ENABLE_ISLAND  // region
+#ifdef ENABLE_ISLAND // region
 uint8_t island_frame_1 = 0;
 
 // clang-format off
@@ -276,17 +276,17 @@ static void animate_island(void) {
         draw_island_parts(island_frame_1 + 4);
     }
 }
-#endif  // endregion
+#endif // endregion
 
-#ifdef ENABLE_STARS  // region
-bool stars_setup = false;  // only setup stars once, then we just twinkle them
+#ifdef ENABLE_STARS       // region
+bool stars_setup = false; // only setup stars once, then we just twinkle them
 struct Coordinate {
     int  x;
     int  y;
     bool exists;
 };
 
-struct Coordinate stars[TOTAL_STARS];  // tracks all stars/coordinates
+struct Coordinate stars[TOTAL_STARS]; // tracks all stars/coordinates
 
 /**
  * Setup all the initial stars on the screen
@@ -334,18 +334,18 @@ static void twinkle_stars(void) {
                 continue;
             }
             if (rand() % TWINKLE_PROBABILITY_MODULATOR == 0) {
-                oled_write_pixel(star.x, star.y, false);  // black out pixel
+                oled_write_pixel(star.x, star.y, false); // black out pixel
 
                 // don't allow stars to leave their own region
-                if (star.x == (column_group * 8)) {                     // star is the farthest left it can go in its region
-                    star.x++;                                           // move it right immediately
-                } else if (star.x == (((column_group + 1) * 8) - 1)) {  // star is farthest right it can go in its region
-                    star.x--;                                           // move it left immediately
+                if (star.x == (column_group * 8)) {                    // star is the farthest left it can go in its region
+                    star.x++;                                          // move it right immediately
+                } else if (star.x == (((column_group + 1) * 8) - 1)) { // star is farthest right it can go in its region
+                    star.x--;                                          // move it left immediately
                 }
-                if (star.y == (line * 8)) {                     // star is the farthest up it can go in its region
-                    star.y++;                                   // move it down immediately
-                } else if (star.y == (((line + 1) * 8) - 1)) {  // star is farthest down it can go in its region
-                    star.y--;                                   // move it up immediately
+                if (star.y == (line * 8)) {                    // star is the farthest up it can go in its region
+                    star.y++;                                  // move it down immediately
+                } else if (star.y == (((line + 1) * 8) - 1)) { // star is farthest down it can go in its region
+                    star.y--;                                  // move it up immediately
                 }
 
                 // now decide direction
@@ -389,10 +389,10 @@ static void animate_stars(void) {
         twinkle_stars();
     }
 }
-#endif  // endregion
+#endif // endregion
 
-#ifdef ENABLE_SHOOTING_STARS  // region
-bool shooting_stars_setup = false;  // only setup shooting stars array once with defaults
+#ifdef ENABLE_SHOOTING_STARS       // region
+bool shooting_stars_setup = false; // only setup shooting stars array once with defaults
 
 struct ShootingStar {
     int  x_1;
@@ -404,11 +404,11 @@ struct ShootingStar {
     int  delay;
 };
 
-struct ShootingStar shooting_stars[MAX_NUMBER_OF_SHOOTING_STARS];  // tracks all the shooting stars
+struct ShootingStar shooting_stars[MAX_NUMBER_OF_SHOOTING_STARS]; // tracks all the shooting stars
 
 static void setup_shooting_star(struct ShootingStar *shooting_star) {
     int column_to_start = rand() % (WIDTH / 2);
-    int row_to_start    = rand() % (HEIGHT - 48);  // shooting_stars travel diagonally 1 down, 1 across. So the lowest a shooting_star can start and not 'hit' the ocean is 32 above the ocean.
+    int row_to_start    = rand() % (HEIGHT - 48); // shooting_stars travel diagonally 1 down, 1 across. So the lowest a shooting_star can start and not 'hit' the ocean is 32 above the ocean.
 
     shooting_star->x_1     = column_to_start;
     shooting_star->y_1     = row_to_start;
@@ -494,7 +494,7 @@ static void animate_shooting_stars(void) {
         end_extra_stars(number_of_shooting_stars);
     }
 }
-#endif  // endregion
+#endif // endregion
 
 /**
  * Main rendering function
@@ -502,52 +502,53 @@ static void animate_shooting_stars(void) {
  * Calls all different animations at different rates
  */
 void render_stars(void) {
-    //    // animation timer
-    if (timer_elapsed32(starry_night_anim_timer) > STARRY_NIGHT_ANIM_FRAME_DURATION) {
-        starry_night_anim_timer = timer_read32();
-        current_wpm             = get_current_wpm();
+    current_wpm             = get_current_wpm();
 
+    void render_stars_anim(void) {
 #ifdef ENABLE_ISLAND
-        animate_island();
+            animate_island();
 #endif
 
 #ifdef ENABLE_SHOOTING_STARS
-        if (animation_counter % SHOOTING_STAR_ANIMATION_MODULATOR == 0) {
-            animate_shooting_stars();
-        }
+            if (animation_counter % SHOOTING_STAR_ANIMATION_MODULATOR == 0) {
+                animate_shooting_stars();
+            }
 #endif
 
 #ifdef ENABLE_STARS
-        // TODO offsetting the star animation from the wave animation would look better,
-        // but if I do that, then the stars appear in the water because
-        // the ocean animation has to wait a bunch of frames to overwrite it.
-        // Possible solutions:
-        // 1. Only draw stars to the top of the island/ocean.
-        // 2. Draw ocean every frame, only move ocean on frames matching modulus
-        // Problems:
-        // 1. What if someone wants to move the island up a bit, or they want to have the stars reflect in the water?
-        // 2. More cpu intensive. And I'm already running out of cpu as it is...
-        if (animation_counter % STAR_ANIMATION_MODULATOR == 0) {
-            animate_stars();
-        }
+            // TODO offsetting the star animation from the wave animation would look better,
+            // but if I do that, then the stars appear in the water because
+            // the ocean animation has to wait a bunch of frames to overwrite it.
+            // Possible solutions:
+            // 1. Only draw stars to the top of the island/ocean.
+            // 2. Draw ocean every frame, only move ocean on frames matching modulus
+            // Problems:
+            // 1. What if someone wants to move the island up a bit, or they want to have the stars reflect in the water?
+            // 2. More cpu intensive. And I'm already running out of cpu as it is...
+            if (animation_counter % STAR_ANIMATION_MODULATOR == 0) {
+                animate_stars();
+            }
 #endif
 
 #ifdef ENABLE_WAVE
-        if (animation_counter % OCEAN_ANIMATION_MODULATOR == 0) {
-            animate_waves();
-        }
+            if (animation_counter % OCEAN_ANIMATION_MODULATOR == 0) {
+                animate_waves();
+            }
 #endif
 
 #ifdef ENABLE_MOON
-        draw_moon();
+            draw_moon();
 #endif
 
-        animation_counter = increment_counter(animation_counter, NUMBER_OF_FRAMES);
+            animation_counter = increment_counter(animation_counter, NUMBER_OF_FRAMES);
     }
 
-    // this fixes the screen on and off bug
-    if (current_wpm > 0) {
+
+    // Turn screen on/off based on typing and timeout
+    if (current_wpm > 0 && timer_elapsed32(starry_night_anim_timer) > STARRY_NIGHT_ANIM_FRAME_DURATION) {
+        starry_night_anim_timer = timer_read32();
         oled_on();
+        render_stars_anim();
         starry_night_anim_sleep = timer_read32();
     } else if (timer_elapsed32(starry_night_anim_sleep) > OLED_TIMEOUT) {
         oled_off();

From f99b9ba2708ebf5ecbdd62f0c16846789287b24c Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 19 Oct 2022 17:17:49 +1100
Subject: [PATCH 669/959] Widen the ARM Cortex-M family support. Allow USB
 peripheral change. (#18767)

---
 data/schemas/keyboard.jsonschema     | 53 +++++++++++++++++++++++++++-
 tmk_core/protocol/chibios/usb_main.h |  4 ++-
 tmk_core/protocol/chibios/usb_util.c |  7 ++--
 3 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 10eb288350..06ccccc160 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -42,7 +42,58 @@
         },
         "processor": {
             "type": "string",
-            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK64FX512", "MK66FX1M0", "RP2040", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "WB32FQ95", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
+            "enum": [
+                "cortex-m0",
+                "cortex-m0plus",
+                "cortex-m3",
+                "cortex-m4",
+                "cortex-m7",
+                "cortex-m23",
+                "cortex-m33",
+                "cortex-m35p",
+                "cortex-m55",
+                "cortex-m85",
+                "MKL26Z64",
+                "MK20DX128",
+                "MK20DX256",
+                "MK64FX512",
+                "MK66FX1M0",
+                "RP2040",
+                "STM32F042",
+                "STM32F072",
+                "STM32F103",
+                "STM32F303",
+                "STM32F401",
+                "STM32F405",
+                "STM32F407",
+                "STM32F411",
+                "STM32F446",
+                "STM32G431",
+                "STM32G474",
+                "STM32L412",
+                "STM32L422",
+                "STM32L432",
+                "STM32L433",
+                "STM32L442",
+                "STM32L443",
+                "GD32VF103",
+                "WB32F3G71",
+                "WB32FQ95",
+                "atmega16u2",
+                "atmega32u2",
+                "atmega16u4",
+                "atmega32u4",
+                "at90usb162",
+                "at90usb646",
+                "at90usb647",
+                "at90usb1286",
+                "at90usb1287",
+                "atmega32a",
+                "atmega328p",
+                "atmega328",
+                "attiny85",
+                "unknown"
+            ]
         },
         "audio": {
             "type": "object",
diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index dd105e7b5e..07186f76b8 100644
--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -26,7 +26,9 @@
  */
 
 /* The USB driver to use */
-#define USB_DRIVER USBD1
+#ifndef USB_DRIVER
+#    define USB_DRIVER USBD1
+#endif // USB_DRIVER
 
 /* Initialize the USB driver and bus */
 void init_usb_driver(USBDriver *usbp);
diff --git a/tmk_core/protocol/chibios/usb_util.c b/tmk_core/protocol/chibios/usb_util.c
index a8c7d9a228..9d8b2c4007 100644
--- a/tmk_core/protocol/chibios/usb_util.c
+++ b/tmk_core/protocol/chibios/usb_util.c
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <hal.h>
+#include "usb_main.h"
 #include "usb_util.h"
 
 void usb_disconnect(void) {
-    usbDisconnectBus(&USBD1);
-    usbStop(&USBD1);
+    usbDisconnectBus(&USB_DRIVER);
+    usbStop(&USB_DRIVER);
 }
 
 bool usb_connected_state(void) {
-    return usbGetDriverStateI(&USBD1) == USB_ACTIVE;
+    return usbGetDriverStateI(&USB_DRIVER) == USB_ACTIVE;
 }

From fc0330a54a180c6e0d9de93277f23421ea143c03 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 19 Oct 2022 11:29:44 +0100
Subject: [PATCH 670/959] Correctly build keymap.json containing additional
 config (#18766)

---
 lib/python/qmk/commands.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 9c0a5dce56..2ab506c710 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -2,13 +2,13 @@
 """
 import os
 import sys
+import json
 import shutil
 from pathlib import Path
 
 from milc import cli
 import jsonschema
 
-import qmk.keymap
 from qmk.constants import KEYBOARD_OUTPUT_PREFIX
 from qmk.json_schema import json_load, validate
 
@@ -134,12 +134,11 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
     target = f'{keyboard_filesafe}_{user_keymap["keymap"]}'
     keyboard_output = Path(f'{KEYBOARD_OUTPUT_PREFIX}{keyboard_filesafe}')
     keymap_output = Path(f'{keyboard_output}_{user_keymap["keymap"]}')
-    c_text = qmk.keymap.generate_c(user_keymap)
     keymap_dir = keymap_output / 'src'
-    keymap_c = keymap_dir / 'keymap.c'
+    keymap_json = keymap_dir / 'keymap.json'
 
     keymap_dir.mkdir(exist_ok=True, parents=True)
-    keymap_c.write_text(c_text)
+    keymap_json.write_text(json.dumps(user_keymap), encoding='utf-8')
 
     # Return a command that can be run to make the keymap and flash if given
     verbose = 'true' if cli.config.general.verbose else 'false'
@@ -175,7 +174,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
         f'MAIN_KEYMAP_PATH_3={keymap_output}',
         f'MAIN_KEYMAP_PATH_4={keymap_output}',
         f'MAIN_KEYMAP_PATH_5={keymap_output}',
-        f'KEYMAP_C={keymap_c}',
+        f'KEYMAP_JSON={keymap_json}',
         f'KEYMAP_PATH={keymap_dir}',
         f'VERBOSE={verbose}',
         f'COLOR={color}',

From 18dc851e37a203b32db0261c365dd300488e1c71 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 19 Oct 2022 21:33:05 +1100
Subject: [PATCH 671/959] Remove legacy Debug keycode (#18769)

* `DEBUG` -> `DB_TOGG`, default-ish keymaps

* `DEBUG` -> `DB_TOGG`, user keymaps

* `DEBUG` -> `DB_TOGG`, community layouts

* `DEBUG` -> `DB_TOGG`, userspace

* `DEBUG` -> `DB_TOGG`, docs & core
---
 docs/faq_debug.md                                           | 2 +-
 docs/feature_rgblight.md                                    | 6 +++---
 keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c     | 2 +-
 keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c     | 2 +-
 keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c     | 2 +-
 keyboards/1upkeyboards/pi40/keymaps/default/keymap.c        | 2 +-
 keyboards/1upkeyboards/pi40/keymaps/via/keymap.c            | 2 +-
 keyboards/7c8/framework/keymaps/default/keymap.c            | 2 +-
 keyboards/7c8/framework/keymaps/steven/keymap.c             | 2 +-
 keyboards/7c8/framework/keymaps/via/keymap.c                | 2 +-
 keyboards/a_dux/keymaps/daliusd/keymap.c                    | 2 +-
 keyboards/aeboards/ext65/keymaps/default/keymap.c           | 2 +-
 keyboards/aeboards/ext65/keymaps/via/keymap.c               | 2 +-
 keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c             | 4 ++--
 keyboards/biacco42/ergo42/keymaps/hdbx/readme.md            | 2 +-
 keyboards/checkerboards/quark/keymaps/pezhore/keymap.c      | 2 +-
 keyboards/clueboard/66/keymaps/badger/keymap.c              | 2 +-
 keyboards/contra/keymaps/alper/keymap.c                     | 2 +-
 keyboards/contra/keymaps/default/keymap.c                   | 2 +-
 keyboards/contra/keymaps/via/keymap.c                       | 2 +-
 keyboards/delikeeb/flatbread60/keymaps/default/keymap.c     | 2 +-
 keyboards/delikeeb/flatbread60/keymaps/via/keymap.c         | 2 +-
 keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c    | 2 +-
 .../vaguettelite/keymaps/default_625u_universal/keymap.c    | 2 +-
 keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c     | 2 +-
 keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c        | 2 +-
 keyboards/delikeeb/vanana/keymaps/default/keymap.c          | 2 +-
 keyboards/delikeeb/vanana/keymaps/via/keymap.c              | 2 +-
 keyboards/delikeeb/vaneela/keymaps/default/keymap.c         | 2 +-
 keyboards/delikeeb/vaneela/keymaps/via/keymap.c             | 2 +-
 keyboards/delikeeb/waaffle/keymaps/default/keymap.c         | 2 +-
 keyboards/delikeeb/waaffle/keymaps/via/keymap.c             | 2 +-
 keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c       | 6 +++---
 keyboards/dumbo/keymaps/default/keymap.c                    | 4 ++--
 keyboards/dumbo/keymaps/trip-trap/keymap.c                  | 6 +++---
 keyboards/durgod/k310/keymaps/chimera/keymap.c              | 4 ++--
 keyboards/durgod/k310/keymaps/typhon/keymap.c               | 4 ++--
 keyboards/dz60/keymaps/crd_2u_lshift/keymap.c               | 2 +-
 keyboards/dz60/keymaps/drewsky/keymap.c                     | 2 +-
 keyboards/dz60/keymaps/olivierko/keymap.c                   | 2 +-
 keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c       | 2 +-
 keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c     | 2 +-
 keyboards/ferris/keymaps/test/keymap.c                      | 2 +-
 keyboards/fractal/keymaps/default/keymap.c                  | 2 +-
 keyboards/gh60/satan/keymaps/lepa/keymap.c                  | 2 +-
 keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c       | 2 +-
 keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c       | 2 +-
 keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c    | 2 +-
 keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c    | 2 +-
 keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c      | 2 +-
 keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md     | 2 +-
 .../handwired/battleship_gamepad/keymaps/default/keymap.c   | 2 +-
 keyboards/handwired/battleship_gamepad/keymaps/via/keymap.c | 2 +-
 keyboards/handwired/d48/keymaps/anderson/keymap.c           | 4 ++--
 keyboards/handwired/d48/keymaps/default/keymap.c            | 4 ++--
 .../dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c      | 2 +-
 keyboards/handwired/daishi/keymaps/default/keymap.c         | 4 ++--
 keyboards/handwired/hexon38/keymaps/default/keymap.c        | 4 ++--
 keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c   | 2 +-
 keyboards/handwired/ortho5x14/keymaps/2u/keymap.c           | 2 +-
 keyboards/handwired/ortho_brass/keymaps/default/keymap.c    | 2 +-
 keyboards/handwired/promethium/keymaps/default/keymap.c     | 2 +-
 keyboards/handwired/promethium/keymaps/priyadi/keymap.c     | 2 +-
 keyboards/handwired/pteron/keymaps/alzafacon/keymap.c       | 2 +-
 keyboards/handwired/pteron/keymaps/default/keymap.c         | 2 +-
 keyboards/handwired/pteron44/keymaps/default/keymap.c       | 2 +-
 keyboards/handwired/riblee_f401/keymaps/default/keymap.c    | 2 +-
 keyboards/handwired/riblee_f411/keymaps/default/keymap.c    | 2 +-
 keyboards/handwired/rs60/keymaps/default/keymap.c           | 2 +-
 keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c                | 2 +-
 keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c        | 2 +-
 keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c       | 2 +-
 .../ergodox_infinity/keymaps/dudeofawesome/keymap.c         | 2 +-
 keyboards/jian/keymaps/advanced/keymap.c                    | 2 +-
 keyboards/jian/keymaps/default/keymap.c                     | 2 +-
 keyboards/jian/keymaps/left_hand/keymap.c                   | 2 +-
 keyboards/jian/keymaps/via/keymap.c                         | 2 +-
 keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c     | 2 +-
 keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c         | 2 +-
 keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c        | 2 +-
 keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c           | 2 +-
 keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c          | 2 +-
 keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c          | 2 +-
 keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c      | 2 +-
 keyboards/kc60/keymaps/sgoodwin/keymap.c                    | 2 +-
 keyboards/keebio/dilly/keymaps/default/keymap.c             | 2 +-
 keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c          | 2 +-
 keyboards/keebio/iris/keymaps/mattly/keymap.c               | 2 +-
 keyboards/keebio/iris/keymaps/mojitas/keymap.c              | 2 +-
 keyboards/keebio/iris/keymaps/omgvee/keymap.c               | 2 +-
 keyboards/keebio/iris/keymaps/osiris/keymap.c               | 2 +-
 keyboards/keebio/levinson/keymaps/via/keymap.c              | 2 +-
 keyboards/keebio/nyquist/keymaps/losinggeneration/README.md | 2 +-
 keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c  | 4 ++--
 keyboards/keebio/nyquist/keymaps/pjanx/keymap.c             | 2 +-
 keyboards/keebio/nyquist/keymaps/via/keymap.c               | 2 +-
 keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c       | 2 +-
 keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c       | 2 +-
 .../UT472_Annihilator6000_Configurator_file.json            | 2 +-
 keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c    | 2 +-
 keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c       | 2 +-
 keyboards/kprepublic/bm40hsrgb/keymaps/default/keymap.c     | 2 +-
 keyboards/kprepublic/bm40hsrgb/keymaps/via/keymap.c         | 2 +-
 keyboards/lets_split/keymaps/poker/keymap.c                 | 2 +-
 keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c       | 2 +-
 .../maple_computing/c39/keymaps/kuchosauronad0/keymap.c     | 2 +-
 .../maple_computing/minidox/keymaps/dustypomerleau/keymap.c | 4 ++--
 keyboards/mitosis/keymaps/datagrok/keymap.c                 | 2 +-
 keyboards/mixi/keymaps/default/keymap.c                     | 4 ++--
 keyboards/mixi/keymaps/via/keymap.c                         | 4 ++--
 keyboards/mlego/m48/keymaps/default/keymap.c                | 2 +-
 keyboards/mlego/m48/keymaps/via/keymap.c                    | 2 +-
 keyboards/omnikeyish/keymaps/default/keymap.c               | 2 +-
 keyboards/ortho5by12/keymaps/default/keymap.c               | 2 +-
 keyboards/planck/keymaps/abhixec/keymap.c                   | 2 +-
 keyboards/planck/keymaps/abishalom/keymap.c                 | 2 +-
 keyboards/planck/keymaps/adamtabrams/keymap.c               | 2 +-
 keyboards/planck/keymaps/antosha417/keymap.c                | 2 +-
 keyboards/planck/keymaps/ariccb/keymap.c                    | 6 +++---
 keyboards/planck/keymaps/ariccb/readme.md                   | 2 +-
 keyboards/planck/keymaps/aviator/keymap.c                   | 2 +-
 keyboards/planck/keymaps/badger/keymap.c                    | 2 +-
 keyboards/planck/keymaps/buhearns/keymap.c                  | 2 +-
 keyboards/planck/keymaps/corvec/keymap.c                    | 2 +-
 keyboards/planck/keymaps/dear_vehicle_owner/keymap.c        | 2 +-
 keyboards/planck/keymaps/default/keymap.c                   | 2 +-
 keyboards/planck/keymaps/dodger/keymap.c                    | 2 +-
 keyboards/planck/keymaps/dr0ck/keymap.c                     | 2 +-
 keyboards/planck/keymaps/dudeofawesome/keymap.c             | 2 +-
 keyboards/planck/keymaps/dvz/keymap.c                       | 2 +-
 keyboards/planck/keymaps/emiller/keymap.c                   | 2 +-
 keyboards/planck/keymaps/eshesh2/keymap.c                   | 2 +-
 keyboards/planck/keymaps/fabian/keymap.c                    | 2 +-
 keyboards/planck/keymaps/foreveranapple/keymap.c            | 2 +-
 keyboards/planck/keymaps/fsck/keymap.c                      | 2 +-
 keyboards/planck/keymaps/gitdrik/keymap.c                   | 2 +-
 keyboards/planck/keymaps/grahampheath/keymap.c              | 2 +-
 keyboards/planck/keymaps/gunp/keymap.c                      | 2 +-
 keyboards/planck/keymaps/hvp/keymap.c                       | 2 +-
 keyboards/planck/keymaps/inkwell/keymap.c                   | 2 +-
 keyboards/planck/keymaps/jasperla/keymap.c                  | 2 +-
 keyboards/planck/keymaps/jdelkins/keymap.c                  | 4 ++--
 keyboards/planck/keymaps/jimmysjolund/keymap.c              | 2 +-
 keyboards/planck/keymaps/jirgn/keymap.c                     | 2 +-
 keyboards/planck/keymaps/jweickm/keymap.c                   | 4 ++--
 keyboards/planck/keymaps/jweickm/readme.md                  | 2 +-
 keyboards/planck/keymaps/kanbara/keymap.c                   | 2 +-
 keyboards/planck/keymaps/kelorean/keymap.c                  | 2 +-
 keyboards/planck/keymaps/kifinnsson/keymap.c                | 2 +-
 keyboards/planck/keymaps/kloki/keymap.c                     | 2 +-
 keyboards/planck/keymaps/kmontag42/keymap.c                 | 2 +-
 keyboards/planck/keymaps/kuatsure/keymap.c                  | 4 ++--
 keyboards/planck/keymaps/lja83/keymap.c                     | 2 +-
 keyboards/planck/keymaps/mason/keymap.c                     | 2 +-
 keyboards/planck/keymaps/mattly/keymap.c                    | 2 +-
 keyboards/planck/keymaps/mgalisa/keymap.c                   | 2 +-
 keyboards/planck/keymaps/mikethetiger/keymap.c              | 2 +-
 keyboards/planck/keymaps/mjuma/keymap.c                     | 4 ++--
 keyboards/planck/keymaps/mjuma/readme.md                    | 4 ++--
 keyboards/planck/keymaps/motform/keymap.c                   | 2 +-
 keyboards/planck/keymaps/msiu/keymap.c                      | 2 +-
 keyboards/planck/keymaps/muzfuz/keymap.c                    | 2 +-
 keyboards/planck/keymaps/myoung34/keymap.c                  | 2 +-
 keyboards/planck/keymaps/orthodeluxe/keymap.c               | 2 +-
 keyboards/planck/keymaps/palleiko/keymap.c                  | 2 +-
 keyboards/planck/keymaps/pascamel/keymap.c                  | 2 +-
 keyboards/planck/keymaps/pevecyan/keymap.c                  | 2 +-
 keyboards/planck/keymaps/pjanx/keymap.c                     | 2 +-
 keyboards/planck/keymaps/pok3r/keymap.c                     | 2 +-
 keyboards/planck/keymaps/ptillemans/keymap.c                | 2 +-
 keyboards/planck/keymaps/raffle/keymap.c                    | 2 +-
 keyboards/planck/keymaps/rennerom/keymap.c                  | 2 +-
 keyboards/planck/keymaps/rodhaene/keymap.c                  | 2 +-
 keyboards/planck/keymaps/rootiest/keymap.c                  | 4 ++--
 keyboards/planck/keymaps/scottzach1/keymap.c                | 4 ++--
 keyboards/planck/keymaps/sigul/keymap.c                     | 2 +-
 keyboards/planck/keymaps/stuartfong1/keymap.c               | 2 +-
 keyboards/planck/keymaps/synth_sample/keymap.c              | 2 +-
 keyboards/planck/keymaps/synth_wavetable/keymap.c           | 2 +-
 keyboards/planck/keymaps/tom/keymap.c                       | 2 +-
 keyboards/planck/keymaps/tomkonidas/keymap.c                | 2 +-
 keyboards/planck/keymaps/unagi/keymap.c                     | 2 +-
 keyboards/planck/keymaps/via/keymap.c                       | 4 ++--
 keyboards/planck/keymaps/via/readme.md                      | 2 +-
 keyboards/planck/keymaps/vxid/keymap.c                      | 2 +-
 keyboards/planck/keymaps/winternebs/keymap.c                | 4 ++--
 keyboards/planck/keymaps/yhaliaw/keymap.c                   | 2 +-
 keyboards/planck/thk/keymaps/thk/keymap.c                   | 2 +-
 keyboards/preonic/keymaps/AlexDaigre/keymap.c               | 2 +-
 keyboards/preonic/keymaps/badger/keymap.c                   | 2 +-
 keyboards/preonic/keymaps/blake-newman/keymap.c             | 2 +-
 keyboards/preonic/keymaps/boy314/keymap.c                   | 2 +-
 keyboards/preonic/keymaps/codecoffeecode/keymap.c           | 2 +-
 keyboards/preonic/keymaps/cranium/keymap.c                  | 2 +-
 keyboards/preonic/keymaps/default/keymap.c                  | 2 +-
 keyboards/preonic/keymaps/drasbeck/keymap.c                 | 2 +-
 keyboards/preonic/keymaps/dudeofawesome/keymap.c            | 2 +-
 keyboards/preonic/keymaps/ekis_isa/keymap.c                 | 2 +-
 keyboards/preonic/keymaps/elisiano/keymap.c                 | 2 +-
 keyboards/preonic/keymaps/fig-r/keymap.c                    | 2 +-
 keyboards/preonic/keymaps/fsck/keymap.c                     | 2 +-
 keyboards/preonic/keymaps/keelhauler/keymap.c               | 2 +-
 keyboards/preonic/keymaps/kuatsure/keymap.c                 | 4 ++--
 keyboards/preonic/keymaps/laurentlaurent/keymap.c           | 2 +-
 keyboards/preonic/keymaps/mechmaster48/keymap.c             | 2 +-
 keyboards/preonic/keymaps/mguterl/keymap.c                  | 2 +-
 keyboards/preonic/keymaps/mikethetiger/keymap.c             | 2 +-
 keyboards/preonic/keymaps/muzfuz/keymap.c                   | 2 +-
 keyboards/preonic/keymaps/mverteuil/keymap.c                | 2 +-
 keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c           | 2 +-
 keyboards/preonic/keymaps/pezhore/keymap.c                  | 2 +-
 keyboards/preonic/keymaps/pitty/keymap.c                    | 2 +-
 keyboards/preonic/keymaps/senseored/keymap.c                | 2 +-
 keyboards/preonic/keymaps/via/keymap.c                      | 2 +-
 keyboards/preonic/keymaps/yhaliaw/keymap.c                  | 2 +-
 keyboards/redox/keymaps/jeherve/keymap.c                    | 2 +-
 keyboards/rocketboard_16/keycode_lookup.c                   | 2 +-
 keyboards/signum/3_0/keymaps/default/layout.py              | 2 +-
 keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c         | 2 +-
 keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c        | 6 +++---
 keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c        | 2 +-
 keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c    | 2 +-
 keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c    | 2 +-
 keyboards/tzarc/djinn/keymaps/default/keymap.c              | 2 +-
 keyboards/tzarc/ghoul/keymaps/default/keymap.c              | 2 +-
 .../unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c | 2 +-
 .../unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c  | 2 +-
 keyboards/xiudi/xd75/keymaps/hybrid/keymap.c                | 2 +-
 keyboards/xiudi/xd75/keymaps/neothefox/keymap.c             | 4 ++--
 keyboards/xiudi/xd75/keymaps/raoeus/keymap.c                | 2 +-
 keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c         | 2 +-
 keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c            | 2 +-
 keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c                | 2 +-
 keyboards/yynmt/kagamidget/keymaps/default/keymap.c         | 2 +-
 layouts/community/65_ansi_blocker/spidey3/keymap.c          | 2 +-
 layouts/community/75_ansi/spidey3/keymap.c                  | 2 +-
 layouts/community/ortho_4x12/brandonschlack/keymap.c        | 2 +-
 layouts/community/ortho_4x12/bredfield/keymap.c             | 6 +++---
 layouts/community/ortho_4x12/bredfield/readme.md            | 2 +-
 layouts/community/ortho_4x12/buswerks/keymap.c              | 2 +-
 layouts/community/ortho_4x12/jackhumbert/keymap.c           | 2 +-
 layouts/community/ortho_4x12/juno/keymap.c                  | 2 +-
 layouts/community/ortho_4x12/junonum/keymap.c               | 2 +-
 layouts/community/ortho_4x12/mguterl/keymap.c               | 2 +-
 layouts/community/ortho_5x12/brandonschlack/keymap.c        | 2 +-
 layouts/community/ortho_5x12/riblee/keymap.c                | 2 +-
 layouts/community/planck_mit/guidoism/guidoism.json         | 2 +-
 layouts/community/planck_mit/guidoism/keymap.c              | 2 +-
 quantum/quantum_keycodes_legacy.h                           | 1 -
 users/jjerrell/wrappers.h                                   | 2 +-
 users/muppetjones/wrappers.h                                | 2 +-
 users/pdl/pdl.h                                             | 2 +-
 users/ridingqwerty/wrappers.h                               | 2 +-
 users/spidey3/layer_rgb.c                                   | 2 +-
 users/spidey3/spidey3.c                                     | 2 +-
 users/xulkal/layouts.h                                      | 4 ++--
 256 files changed, 291 insertions(+), 292 deletions(-)

diff --git a/docs/faq_debug.md b/docs/faq_debug.md
index b639b7ea04..cad98bc331 100644
--- a/docs/faq_debug.md
+++ b/docs/faq_debug.md
@@ -4,7 +4,7 @@ This page details various common questions people have about troubleshooting the
 
 ## Debugging :id=debugging
 
-Your keyboard will output debug information if you have `CONSOLE_ENABLE = yes` in your `rules.mk`. By default the output is very limited, but you can turn on debug mode to increase the amount of debug output. Use the `DEBUG` keycode in your keymap, use the [Command](feature_command.md) feature to enable debug mode, or add the following code to your keymap.
+Your keyboard will output debug information if you have `CONSOLE_ENABLE = yes` in your `rules.mk`. By default the output is very limited, but you can turn on debug mode to increase the amount of debug output. Use the `DB_TOGG` keycode in your keymap, use the [Command](feature_command.md) feature to enable debug mode, or add the following code to your keymap.
 
 ```c
 void keyboard_post_init_user(void) {
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 7e7699c5b7..1159347112 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -302,7 +302,7 @@ void keyboard_post_init_user(void) {
 // after the flag has been flipped...
 void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case DEBUG:
+        case QK_DEBUG_TOGGLE:
             rgblight_blink_layer(debug_enable ? 0 : 1, 500);
             break;
 
@@ -319,13 +319,13 @@ You can also use `rgblight_blink_layer_repeat` to specify the amount of times th
 ```c
 void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case DEBUG:
+        case QK_DEBUG_TOGGLE:
             rgblight_blink_layer_repeat(debug_enable ? 0 : 1, 200, 3);
             break;
     }
 }
 ```
-would turn the layer 0 (or 1) on and off again three times when `DEBUG` is pressed.
+would turn the layer 0 (or 1) on and off again three times when `DB_TOGG` is pressed.
 
 Blinking accumulates layers so if multiple layers are set blinking at the same time they will all blink for the duration and repeat times of the last layer to be blinked.
 To stop these other layers from blinking use `rgblight_unblink_layer` or `rgblight_unblink_all_but_layer`:
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
index 6708922899..da0a50479d 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_CONFIG]     = LAYOUT_tsangan(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______, _______, \
      _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
-     _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
+     _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   DF_1,     DF_2,     _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,  \
      _______,   _______,  _______,  _______,  _______,   _______,  _______)
 };
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
index 2b8c539971..884b9b87d2 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_CONFIG]     = LAYOUT_60_ansi_tsangan_split_rshift(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
      _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
-     _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
+     _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______, \
      _______,   _______,  _______,  _______,  _______,   _______,  _______)
 };
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
index b8d3b5ed96..0d860f495e 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // adjust to handle firmware debug + reset mode
   [_adjust] = LAYOUT_all
   (
-   QK_BOOT, DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+   QK_BOOT, DB_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
index e417828f72..16c1dcadb4 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_FOUR] = LAYOUT (
                                                                                                            KC_MUTE,
-        _______, QK_BOOT,   DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
diff --git a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
index 48c201f0a3..f8302db749 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_FOUR] = LAYOUT (
                                                                                                            KC_MUTE,
-        _______, QK_BOOT,   DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,       _______,    _______, _______, _______, _______, _______
diff --git a/keyboards/7c8/framework/keymaps/default/keymap.c b/keyboards/7c8/framework/keymaps/default/keymap.c
index 592cd02195..5f8214eb13 100644
--- a/keyboards/7c8/framework/keymaps/default/keymap.c
+++ b/keyboards/7c8/framework/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, LALT(KC_F4), _______, KC_MYCM, LGUI(KC_R), _______, _______, _______, _______, _______, _______, _______,
     _______, _______,     _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
     _______, _______,     _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______,    _______, _______, _______, _______, _______, _______, DEBUG
+    _______, _______,     _______, _______, _______,    _______, _______, _______, _______, _______, _______, DB_TOGG
 ),
 
 [_FN] = LAYOUT_ortho_5x12(
diff --git a/keyboards/7c8/framework/keymaps/steven/keymap.c b/keyboards/7c8/framework/keymaps/steven/keymap.c
index 77134db5bc..ef1bf2431a 100644
--- a/keyboards/7c8/framework/keymaps/steven/keymap.c
+++ b/keyboards/7c8/framework/keymaps/steven/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, DEBUG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, DB_TOGG,
     C(KC_Z), C(KC_Y)
 ),
 
diff --git a/keyboards/7c8/framework/keymaps/via/keymap.c b/keyboards/7c8/framework/keymaps/via/keymap.c
index 2fc572b4df..c73e83b01d 100644
--- a/keyboards/7c8/framework/keymaps/via/keymap.c
+++ b/keyboards/7c8/framework/keymaps/via/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, DEBUG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, DB_TOGG,
     C(KC_Z), C(KC_Y)
 ),
 
diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c
index aa45d10449..71e8f3e88e 100644
--- a/keyboards/a_dux/keymaps/daliusd/keymap.c
+++ b/keyboards/a_dux/keymaps/daliusd/keymap.c
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
      QK_BOOT,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,XXXXXXX ,KC_PSCR ,K_PRINT ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,DEBUG   ,XXXXXXX ,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,XXXXXXX ,KC_MNXT ,XXXXXXX ,
+     XXXXXXX ,XXXXXXX ,DB_TOGG ,XXXXXXX ,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,XXXXXXX ,KC_MNXT ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_VOLD ,KC_VOLU ,XXXXXXX ,XXXXXXX ,UC_MOD  ,
   //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
diff --git a/keyboards/aeboards/ext65/keymaps/default/keymap.c b/keyboards/aeboards/ext65/keymaps/default/keymap.c
index 0a4276b130..050e19c54d 100644
--- a/keyboards/aeboards/ext65/keymaps/default/keymap.c
+++ b/keyboards/aeboards/ext65/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_ext65(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DEBUG,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
     KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
   ),
diff --git a/keyboards/aeboards/ext65/keymaps/via/keymap.c b/keyboards/aeboards/ext65/keymaps/via/keymap.c
index 2ae1ac0a64..d18369148b 100644
--- a/keyboards/aeboards/ext65/keymaps/via/keymap.c
+++ b/keyboards/aeboards/ext65/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_ext65(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DEBUG,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
     KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
   ),
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
index b7a8d64c27..161543806f 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
@@ -121,14 +121,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
    * | Shift |       |       |       |       |       |       |   |XXXXXXX| M-PLAY|M-MUTE |VOL_DWN|VOL_UP |PREV_TR|NEXT_TR|
    * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | DEBUG |XXXXXXX|XXXXXXX|       |       |XXXXXXX|XXXXXXX|   |XXXXXXX|XXXXXXX|       | Left  | Down  |   Up  | Right |
+   * | Debug |XXXXXXX|XXXXXXX|       |       |XXXXXXX|XXXXXXX|   |XXXXXXX|XXXXXXX|       | Left  | Down  |   Up  | Right |
    * `-------------------------------------------------------'   `-------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT( \
     RGB_TOG,  MCR1,    MCR2,    MCR3,    XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, DYN_REC_START1, DYN_REC_START2, DYN_REC_STOP, KC_BSPC, \
     QK_BOOT,  RGB_MOD, RGB_M_P, RGB_M_B, RGB_HUI, RGB_SAI, RGB_VAI,   XXXXXXX, XXXXXXX, QWERTY,  GAME,   XXXXXXX, XXXXXXX, XXXXXXX, \
     KC_LSFT,  RGB_M_R, RGB_M_SN,RGB_M_G, RGB_HUD, RGB_SAD, RGB_VAD,   XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, \
-    DEBUG,    XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+    DB_TOGG,  XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
   ),
 
 };
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md b/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
index aa05362e99..3f3ca3e5ce 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
@@ -47,7 +47,7 @@ ADJUST
   |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
   | Shift |       |       |       |       |       |       |   |XXXXXXX| M-PLAY|M-MUTE |VOL_DWN|VOL_UP |PREV_TR|NEXT_TR|
   |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | DEBUG |XXXXXXX|XXXXXXX|       |       |XXXXXXX|XXXXXXX|   |XXXXXXX|XXXXXXX|       | Left  | Down  |   Up  | Right |
+  | Debug |XXXXXXX|XXXXXXX|       |       |XXXXXXX|XXXXXXX|   |XXXXXXX|XXXXXXX|       | Left  | Down  |   Up  | Right |
   `-------------------------------------------------------'   `-------------------------------------------------------'
 
 GAME
diff --git a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
index 67ec80f304..4c96169830 100644
--- a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
+  _______,  QK_BOOT,  DB_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/clueboard/66/keymaps/badger/keymap.c b/keyboards/clueboard/66/keymaps/badger/keymap.c
index f7d35f4a3e..ec0135e406 100644
--- a/keyboards/clueboard/66/keymaps/badger/keymap.c
+++ b/keyboards/clueboard/66/keymaps/badger/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST]      = LAYOUT_66_ansi(\
       KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,   KC_VOLU, \
       _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   KC_MSTP, KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  AG_SWAP,   AG_NORM,  KC_INS,   KC_VOLD, \
-      _______,   GE_SWAP,  GE_NORM,  DEBUG,    AG_SWAP,   AG_NORM, KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,   _______, \
+      _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,   AG_NORM, KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,   _______, \
       _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV, KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   KC_BRIU, \
       _______,   _______,  _______,  _______,  _______,   _______, _______,  KC_HOME,  KC_BRID,  KC_END)
 };
diff --git a/keyboards/contra/keymaps/alper/keymap.c b/keyboards/contra/keymaps/alper/keymap.c
index 7b61fd468a..6cfe83ffe6 100644
--- a/keyboards/contra/keymaps/alper/keymap.c
+++ b/keyboards/contra/keymaps/alper/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c
index 1a365c9a6d..60fbe4ba8b 100644
--- a/keyboards/contra/keymaps/default/keymap.c
+++ b/keyboards/contra/keymaps/default/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
diff --git a/keyboards/contra/keymaps/via/keymap.c b/keyboards/contra/keymaps/via/keymap.c
index 88c9d470b2..aac25422d6 100644
--- a/keyboards/contra/keymaps/via/keymap.c
+++ b/keyboards/contra/keymaps/via/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
index e4327c00a3..e76cb2332d 100644
--- a/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAI, RGB_VAD, RGB_SAI, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
index 345c5616ff..b551b4e24f 100644
--- a/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAI, RGB_VAD, RGB_SAI, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c
index 59ff7ae898..dc019742c7 100644
--- a/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_all(
-    QK_BOOT  ,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   DEBUG,
+    QK_BOOT  ,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  DB_TOGG,
     _______,                RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
     KC_CAPS,                _______,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,                _______,
diff --git a/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c
index c6de6dd88c..371baafcad 100644
--- a/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_625u_universal(
-    QK_BOOT  ,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   DEBUG,
+    QK_BOOT  ,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  DB_TOGG,
     _______,                RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,            _______,        _______,    _______,
     KC_CAPS,                _______,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    _______,    _______,    _______,            _______,                    _______,
                 _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,            _______,
diff --git a/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
index c8d1aa0846..ec6a996900 100644
--- a/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_all(
-    QK_BOOT,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   DEBUG,
+    QK_BOOT,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DB_TOGG,
     _______,                RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
     KC_CAPS,                RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    TG(_GAME),  _______,    _______,    _______,        _______,            _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    TG(_MAC),   _______,    _______,    _______,                _______,                _______,
diff --git a/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c
index d1a86d9338..a8db2313a0 100644
--- a/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_all(
-    QK_BOOT  ,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   DEBUG,
+    QK_BOOT  ,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  DB_TOGG,
     _______,                RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
     KC_CAPS,                _______,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,                _______,
diff --git a/keyboards/delikeeb/vanana/keymaps/default/keymap.c b/keyboards/delikeeb/vanana/keymaps/default/keymap.c
index 352c85f463..a2d77e7979 100644
--- a/keyboards/delikeeb/vanana/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/vanana/keymaps/default/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT(
-    QK_BOOT  ,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,    _______,    DEBUG  ,
+    QK_BOOT  ,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,    _______,  DB_TOGG,
     _______,    RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,                _______,    _______,    _______,    _______,    _______,    _______,
     KC_CAPS,    _______,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    KC_VOLU,    _______,    _______,    _______,    _______,    _______,    _______,
     _______,    AU_ON  ,    AU_OFF ,    _______,    _______,    _______,    KC_VOLD,    _______,    _______,    _______,    _______,    _______,    _______,
diff --git a/keyboards/delikeeb/vanana/keymaps/via/keymap.c b/keyboards/delikeeb/vanana/keymaps/via/keymap.c
index 7aa604d82a..e843a23ff9 100644
--- a/keyboards/delikeeb/vanana/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/vanana/keymaps/via/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT(
-    QK_BOOT  ,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,    _______,    DEBUG  ,
+    QK_BOOT  ,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,    _______,  DB_TOGG,
     _______,    RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,                _______,    _______,    _______,    _______,    _______,    _______,
     KC_CAPS,    _______,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    KC_VOLU,    _______,    _______,    _______,    _______,    _______,    _______,
     _______,    AU_ON  ,    AU_OFF ,    _______,    _______,    _______,    KC_VOLD,    _______,    _______,    _______,    _______,    _______,    _______,
diff --git a/keyboards/delikeeb/vaneela/keymaps/default/keymap.c b/keyboards/delikeeb/vaneela/keymaps/default/keymap.c
index 57df91cd4d..9c3c202a3a 100644
--- a/keyboards/delikeeb/vaneela/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/vaneela/keymaps/default/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT_ortho_5x12(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
index 4bfee3daf5..808cc9d1ef 100644
--- a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT_ortho_5x12(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/delikeeb/waaffle/keymaps/default/keymap.c b/keyboards/delikeeb/waaffle/keymaps/default/keymap.c
index d87ac6068f..ee2a8b9906 100644
--- a/keyboards/delikeeb/waaffle/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/waaffle/keymaps/default/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_ortho_5x16(
-    _______,    _______,    _______,    _______,    QK_BOOT,      _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DEBUG  ,
+    _______,    _______,    _______,    _______,    QK_BOOT,      _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  DB_TOGG,
     _______,    _______,    _______,    _______,    _______,    RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,    _______,
     _______,    _______,    _______,    _______,    KC_CAPS,    _______,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    _______,    _______,    _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
diff --git a/keyboards/delikeeb/waaffle/keymaps/via/keymap.c b/keyboards/delikeeb/waaffle/keymaps/via/keymap.c
index a1bc93974e..0d8566db80 100644
--- a/keyboards/delikeeb/waaffle/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/waaffle/keymaps/via/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_ortho_5x16(
-    _______,    _______,    _______,    _______,    QK_BOOT,      _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DEBUG  ,
+    _______,    _______,    _______,    _______,    QK_BOOT,      _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  DB_TOGG,
     _______,    _______,    _______,    _______,    _______,    RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,    _______,
     _______,    _______,    _______,    _______,    KC_CAPS,    _______,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    _______,    _______,    _______,    _______,
     _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
index 4722e41d07..5ae28bb101 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_RMOD,  RGB_TOG,   RGB_MOD),
 
     [_FN] = LAYOUT(
-        KC_NO,     DEBUG,     QK_BOOT,   KC_TRNS,
+        KC_NO,     DB_TOGG,   QK_BOOT,   KC_TRNS,
         KC_NO,     KC_NO,     EEP_RST,   KC_TRNS,
         KC_NO,     KC_NO,     KC_NO,     KC_TRNS,
         KC_TRNS,   KC_NO,     KC_NO),
@@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
             // Re-implement this here, but fix the persistence!
-            case DEBUG:
+            case QK_DEBUG_TOGGLE:
                 if (!debug_enable) {
                     debug_enable = 1;
                 } else if (!debug_keyboard) {
@@ -210,7 +210,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         // Acks follow...
-        case DEBUG:
+        case QK_DEBUG_TOGGLE:
             rgb_layer_ack_yn(debug_enable);
             break;
         case RGB_TOG:
diff --git a/keyboards/dumbo/keymaps/default/keymap.c b/keyboards/dumbo/keymaps/default/keymap.c
index c6266c9c59..1562a6b0c0 100644
--- a/keyboards/dumbo/keymaps/default/keymap.c
+++ b/keyboards/dumbo/keymaps/default/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *     ,-------------------------------------------.                            ,-------------------------------------------.
  *     |   TAB  |      |      |      | QK_BOOT|      |                            |      |      |      |      |      |  ESC   |
  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |   CTRL |      |      | DEBUG|      |      |                            |      |      |      |      |      |        |
+ *     |   CTRL |      |      |DB_TOGG|      |      |                            |      |      |      |      |      |        |
  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
  *     | LShift |      |      |      |      |      |                            |      |      |      |      |      |  SHIFT |
  *     `------------------------⫟------⫟------⫟------⫟------.         ,-----⫟------⫟------⫟------⫟-------------------------'
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    //,-----------------------------------------------------.                            ,-----------------------------------------------------.
         KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC,
    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-       KC_LCTL, XXXXXXX, XXXXXXX,   DEBUG, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       KC_LCTL, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
    //|--------+--------+-----------⫟--------⫟--------⫟--------⫟--------.   .--------⫟--------⫟--------⫟--------⫟-----------+--------+--------|
diff --git a/keyboards/dumbo/keymaps/trip-trap/keymap.c b/keyboards/dumbo/keymaps/trip-trap/keymap.c
index 56d27e3fbd..6e6a909e7e 100644
--- a/keyboards/dumbo/keymaps/trip-trap/keymap.c
+++ b/keyboards/dumbo/keymaps/trip-trap/keymap.c
@@ -181,7 +181,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *     ,-------------------------------------------.                            ,-------------------------------------------.
  *     |        |QWERTY|      |      | QK_BOOT|      |                            |      |      |      |      |      |        |
  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |        |      |      | DEBUG|      |      |                            |      |      |      |      |      |        |
+ *     |        |      |      | Debug|      |      |                            |      |      |      |      |      |        |
  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
  *     |        |      |      |COLEMK|      |      |                            |      |      |      |      |      |        |
  *     `------------------------⫟------⫟------⫟------⫟------.         ,-----⫟------⫟------⫟------⫟-------------------------'
@@ -191,9 +191,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  [_SP] = LAYOUT_split_3x6_4(
    //,-----------------------------------------------------.                            ,-----------------------------------------------------.
-       XXXXXXX,   QWERT, XXXXXXX, XXXXXXX,   QK_BOOT, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       XXXXXXX,   QWERT, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-       XXXXXXX, XXXXXXX, XXXXXXX,   DEBUG, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
        XXXXXXX, XXXXXXX, XXXXXXX,   COLEM, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
    //|--------+--------+-----------⫟--------⫟--------⫟--------⫟--------.   .--------⫟--------⫟--------⫟--------⫟-----------+--------+--------|
diff --git a/keyboards/durgod/k310/keymaps/chimera/keymap.c b/keyboards/durgod/k310/keymaps/chimera/keymap.c
index 9a1a5eb766..9caf407813 100644
--- a/keyboards/durgod/k310/keymaps/chimera/keymap.c
+++ b/keyboards/durgod/k310/keymaps/chimera/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,          KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
     ),
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
     )
diff --git a/keyboards/durgod/k310/keymaps/typhon/keymap.c b/keyboards/durgod/k310/keymaps/typhon/keymap.c
index 865f6c5412..14f60c73e6 100644
--- a/keyboards/durgod/k310/keymaps/typhon/keymap.c
+++ b/keyboards/durgod/k310/keymaps/typhon/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,          KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
     ),
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
     )
diff --git a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
index 520d6d74a3..523f65b2ea 100644
--- a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
+++ b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_directional(
       KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, QK_BOOT,
       _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_MUTE, KC_VOLD,  KC_VOLU, _______,
-      _______, _______, _______, DEBUG,   _______, _______, _______, _______, _______, _______, KC_SCRL, KC_PAUSE, _______, 
+      _______, _______, _______, DB_TOGG, _______, _______, _______, _______, _______, _______, KC_SCRL, KC_PAUSE, _______, 
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,  KC_VOLU, KC_MUTE,
       _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
       ),
diff --git a/keyboards/dz60/keymaps/drewsky/keymap.c b/keyboards/dz60/keymaps/drewsky/keymap.c
index da636b190d..d67c1a0299 100755
--- a/keyboards/dz60/keymaps/drewsky/keymap.c
+++ b/keyboards/dz60/keymaps/drewsky/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_NO,   RGB_HUD,  RGB_HUI,  KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
             KC_NO,    RGB_SAD,  RGB_SAI,  KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, 
             KC_NO,     RGB_VAD,  RGB_VAI,  KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   RGB_SPD, RGB_SPI, KC_NO, 
-            KC_NO,    KC_NO,    KC_NO,                             RGB_TOG,                           KC_TRNS, KC_NO, KC_NO, DEBUG)
+            KC_NO,    KC_NO,    KC_NO,                             RGB_TOG,                           KC_TRNS, KC_NO, KC_NO, DB_TOGG)
 };
 
 
diff --git a/keyboards/dz60/keymaps/olivierko/keymap.c b/keyboards/dz60/keymaps/olivierko/keymap.c
index 2622fafa69..7d49d1b51d 100644
--- a/keyboards/dz60/keymaps/olivierko/keymap.c
+++ b/keyboards/dz60/keymaps/olivierko/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_CL] = LAYOUT_olivierko(								
 		RGB_TOG,	RGB_MOD,	RGB_HUI,	RGB_HUD,	RGB_SAI,	RGB_SAD,	RGB_VAI,	RGB_VAD,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,			KC_NO,
 		KC_NO,		KC_NO,		KC_NO,		KC_NO,		QK_BOOT,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
-		KC_NO,		KC_NO,		KC_NO,		DEBUG,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,	
+		KC_NO,		KC_NO,		KC_NO,		DB_TOGG,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,	
 		KC_LSFT,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_RSFT,	
 		KC_NO,		KC_NO,		KC_NO,											KC_NO,											KC_NO,		KC_NO,		KC_NO,		KC_NO),
 };
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
index e4387eacfd..b1b07586f7 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_CONFIG]     = LAYOUT_60_ansi(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
      _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
-     _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
+     _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   \
      _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______)
 };
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 3c3dd87adc..660d310b11 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -223,7 +223,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_CONFIG] = LAYOUT_65_ansi(
         TO(_MAIN), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL2,
-        KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, DEBUG, EEP_RST, KC_NO, KC_ACL1,
+        KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, DB_TOGG, EEP_RST, KC_NO, KC_ACL1,
         KC_NO, UC_RMOD, UC_MOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL0,
         KC_NO, MAGIC_TOGGLE_NKRO, MAGIC_UNHOST_NKRO, MAGIC_HOST_NKRO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
diff --git a/keyboards/ferris/keymaps/test/keymap.c b/keyboards/ferris/keymaps/test/keymap.c
index 30e2e9cff1..3706886a24 100644
--- a/keyboards/ferris/keymaps/test/keymap.c
+++ b/keyboards/ferris/keymaps/test/keymap.c
@@ -8,6 +8,6 @@ void matrix_init_user(void) {
 }
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_P0, DEBUG, KC_P2, KC_P3)
+	[0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_P0, DB_TOGG, KC_P2, KC_P3)
 };
 
diff --git a/keyboards/fractal/keymaps/default/keymap.c b/keyboards/fractal/keymaps/default/keymap.c
index ded4890d8c..d720f85509 100644
--- a/keyboards/fractal/keymaps/default/keymap.c
+++ b/keyboards/fractal/keymaps/default/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/gh60/satan/keymaps/lepa/keymap.c b/keyboards/gh60/satan/keymaps/lepa/keymap.c
index 249df2c371..90a0236cd1 100644
--- a/keyboards/gh60/satan/keymaps/lepa/keymap.c
+++ b/keyboards/gh60/satan/keymaps/lepa/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_60_ansi(
             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-            KC_TRNS, KC_TRNS, KC_TRNS, DEBUG,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+            KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
             KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
             KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
index 1239a6a049..374152b945 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
-  DEBUG,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  DB_TOGG, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
 /* Lower
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
index 09b69b907a..d1eba4e568 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
-  DEBUG,   _______,  _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+  DB_TOGG, _______,  _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 ),
 
 /* Lower
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
index 8b7832ba9f..84624ff032 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
-  DEBUG,   _______,  _______, _______,    _______,          _______,       _______, _______, _______, KC_RALT
+  DB_TOGG, _______,  _______, _______,    _______,          _______,       _______, _______, _______, KC_RALT
 ),
 
 /* Lower
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
index 52f2011712..b0d75a378a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         _______, KC_BRID, KC_BRIU, KC_CALC, KC_MSEL, RGB_VAD, RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______,
-        _______, KC_SEC1, KC_SEC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG,            _______,
+        _______, KC_SEC1, KC_SEC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DB_TOGG,          _______,
         _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
         _______, _______, _______, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, RGB_HUI, RGB_HUD, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
index b94c380e60..b595c1b843 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      _______,
                       _______, _______, _______,                   _______,                   _______, _______, _______,          _______, _______, _______),
 
-  [_DFUMODE] = LAYOUT(QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MG_F19,       DEBUG,
+  [_DFUMODE] = LAYOUT(QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MG_F19,       DB_TOGG,
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
                       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md
index f388a3fbf1..94e268a0e3 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md
@@ -49,4 +49,4 @@
  - Shutdown: `HYPER(F19)`
    - `MG_F17` → `MG_F19`
  - Encoder press, triggers debug output.
-   - `KC_MUTE` → `DEBUG`
+   - `KC_MUTE` → `DB_TOGG`
diff --git a/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c b/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
index e4d110de42..4f950a5d62 100644
--- a/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
+++ b/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F9, KC_F10, LT(1, KC_NO), KC_LCTL, KC_LALT, KC_NO, LT(1, KC_NO), KC_SPC),
 
 	[1] = LAYOUT(
-		QK_BOOT, DEBUG, KC_TILD, KC_6, KC_7, KC_8, KC_9, KC_0, 
+		QK_BOOT, DB_TOGG, KC_TILD, 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_TRNS, KC_TRNS, 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/handwired/battleship_gamepad/keymaps/via/keymap.c b/keyboards/handwired/battleship_gamepad/keymaps/via/keymap.c
index 6c0cf5b4f1..ac2c064f73 100644
--- a/keyboards/handwired/battleship_gamepad/keymaps/via/keymap.c
+++ b/keyboards/handwired/battleship_gamepad/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F9, KC_F10, LT(1, KC_NO), KC_LCTL, KC_LALT, LT(2, KC_NO), LT(1, KC_NO), KC_SPC),
 
 	[1] = LAYOUT(
-		QK_BOOT, DEBUG, KC_TILD, KC_6, KC_7, KC_8, KC_9, KC_0, 
+		QK_BOOT, DB_TOGG, KC_TILD, 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_TRNS, KC_TRNS, 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/handwired/d48/keymaps/anderson/keymap.c b/keyboards/handwired/d48/keymaps/anderson/keymap.c
index 63d480a72c..adead97505 100644
--- a/keyboards/handwired/d48/keymaps/anderson/keymap.c
+++ b/keyboards/handwired/d48/keymaps/anderson/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
        ┃L_MOD┃ F1  │ F2  │ F3  │ F4  │ F5  ┃ F6  │ F7  │ F8  │ F9  │ F10 ┃ F11 ┃
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
-       ┃     ┃QK_BOOT│DEBUG│     │     │TIME ┃SLEEP│ SEQ │  {  │  }  │PTSCR┃     ┃
+       ┃     ┃Boot │Debug│     │     │TIME ┃SLEEP│ SEQ │  {  │  }  │PTSCR┃     ┃
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
        ┃     ┃     │     │     │     │     ┃     │     │     │     │     ┃     ┃
        ┗━━━━━┻━━━━━┷━━━━━┷━━━━━┷━━━━━┷━━━━━┻━━━━━┷━━━━━┷━━━━━┷━━━━━┷━━━━━┻━━━━━┛
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,
 #endif
                  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  \
-        _______, QK_BOOT, DEBUG,   _______, _______, KC_SET_TIME,KC_SLEP,KC_SEQ,KC_LCBR, KC_RCBR, KC_PSCR, _______, \
+        _______, QK_BOOT, DB_TOGG, _______, _______, KC_SET_TIME,KC_SLEP,KC_SEQ,KC_LCBR, KC_RCBR, KC_PSCR, _______, \
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
     )
 };
diff --git a/keyboards/handwired/d48/keymaps/default/keymap.c b/keyboards/handwired/d48/keymaps/default/keymap.c
index 45da0e0765..5dbd66a71b 100644
--- a/keyboards/handwired/d48/keymaps/default/keymap.c
+++ b/keyboards/handwired/d48/keymaps/default/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
        ┃L_MOD┃ F1  │ F2  │ F3  │ F4  │ F5  ┃ F6  │ F7  │ F8  │ F9  │ F10 ┃ F11 ┃
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
-       ┃     ┃QK_BOOT│DEBUG│     │     │TIME ┃SLEEP│     │  {  │  }  │PTSCR┃     ┃
+       ┃     ┃QK_BOOT│DB_TOGG│     │     │TIME ┃SLEEP│     │  {  │  }  │PTSCR┃     ┃
        ┣━━━━━╉─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╊━━━━━┫
        ┃     ┃     │     │     │     │     ┃     │     │     │     │     ┃     ┃
        ┗━━━━━┻━━━━━┷━━━━━┷━━━━━┷━━━━━┷━━━━━┻━━━━━┷━━━━━┷━━━━━┷━━━━━┷━━━━━┻━━━━━┛
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 _______,                   _______,
         RGB_TOG, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_F12,
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-        _______, QK_BOOT,   DEBUG,   _______, _______, KC_SET_TIME,KC_SLEP,_______,KC_LCBR,KC_RCBR, KC_PSCR, _______,
+        _______, QK_BOOT, DB_TOGG, _______, _______, KC_SET_TIME,KC_SLEP,_______,KC_LCBR,KC_RCBR, KC_PSCR, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
index 055df1b87d..05920d16e8 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ┌────────┼────────┼────────┼────────┼────────┼────────┤
      _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,XXXXXXX,                            XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PDOT, _______,
   //└────────┴────────┼────────┼────────┼────────┼────────┘                          └────────┴────────┼────────┼────────┼────────┼────────┘
-                       KC_PGUP, KC_PGDN,                                                                KC_P0,   DEBUG,
+                       KC_PGUP, KC_PGDN,                                                                KC_P0,   Debug,
   //                  └────────┴────────┘        ┌────────┬────────┐        ┌────────┬────────┐        └────────┴────────┘
                                                   _______, _______,          _______,  _______,
   //                                             ├────────┼────────┤        ├────────┼────────┤
diff --git a/keyboards/handwired/daishi/keymaps/default/keymap.c b/keyboards/handwired/daishi/keymaps/default/keymap.c
index 1b32e7d693..0607f75a30 100644
--- a/keyboards/handwired/daishi/keymaps/default/keymap.c
+++ b/keyboards/handwired/daishi/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* FN
  * .-----------------------------------------------------------------------------------------------------------------------------------------------------------------.
- * | QK_BOOT  | F13    | F14    | F15    | f16    | f17    | f18    | F19    | F20    | F21    | DM1 R  | DM2 R  | DMSTOP |        |        |        | FN     | DEBUG  |
+ * | QK_BOOT  | F13    | F14    | F15    | f16    | f17    | f18    | F19    | F20    | F21    | DM1 R  | DM2 R  | DMSTOP |        |        |        | FN     | Debug  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------------------------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------------------------|
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
  [_FN] = LAYOUT( /* Function */
-  QK_BOOT  , KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_F21 , DM_REC1, DM_REC2, DM_RSTP, _______, _______, _______, MO(_FN), DEBUG,
+  QK_BOOT  , KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_F21 , DM_REC1, DM_REC2, DM_RSTP, _______, _______, _______, MO(_FN), DB_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/handwired/hexon38/keymaps/default/keymap.c b/keyboards/handwired/hexon38/keymaps/default/keymap.c
index 90e2d47cf5..194239d989 100644
--- a/keyboards/handwired/hexon38/keymaps/default/keymap.c
+++ b/keyboards/handwired/hexon38/keymaps/default/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //`--------+--------+--------+--------+--------'                      `--------+--------+--------+--------+--------'
 
 //                  ,--------+--------+--------+--------.    ,--------+--------+--------+--------.
-                      LSHIFT ,  SPACE ,   TAB  ,  DEBUG ,       SPACE ,  BKSPC ,  ENTER , RSHIFT
+                      LSHIFT ,  SPACE ,   TAB  ,DB_TOGG ,       SPACE ,  BKSPC ,  ENTER , RSHIFT
 //                  `--------+--------+--------+--------'    `--------+--------+--------+--------'
 ),
 
@@ -378,7 +378,7 @@ bool parse_next(kring_t *pending) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == DEBUG) {
+    if (keycode == QK_DEBUG_TOGGLE) {
         return true;
     }
 
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
index eac0802e33..ec4503c67c 100644
--- a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
         {QK_BOOT, _______, _______, _______, SECRET0, SECRET1, _______, _______, _______, _______, VERSION, _______ },
       //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-        {_______, SECRET4, SECRET8, DEBUG,   _______, _______, _______, _______, _______, SECRET7, XXXXXXX, MAKE    },
+        {_______, SECRET4, SECRET8, DB_TOGG, _______, _______, _______, _______, _______, SECRET7, XXXXXXX, MAKE    },
       //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
         {_______, XXXXXXX, SECRET6, _______, SECRET2, SECRET5, _______, _______, SECRET3, _______, _______, _______ },
       //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
index b19b1d7a27..092422f065 100644
--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -498,7 +498,7 @@ KC_PAUS
 [_RAISE] = LAYOUT(
   KC_INS            , XXXXXXX  , KC_BRIU, KC_BRID, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_7 , KC_8   , KC_9     , KC_SLASH , KC_MINUS, KC_EQUAL,
   KC_HOME           , KC_PSCR  , XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX,  KC_4 , KC_5   , KC_6     , KC_ASTR  , XXXXXXX , XXXXXXX,
-  KC_END            , KC_SCRL  , XXXXXXX, XXXXXXX, DEBUG  , XXXXXXX, XXXXXXX, XXXXXXX,  KC_1 , KC_2   , KC_3     , KC_MINUS , XXXXXXX , XXXXXXX,
+  KC_END            , KC_SCRL  , XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,  KC_1 , KC_2   , KC_3     , KC_MINUS , XXXXXXX , XXXXXXX,
   XXXXXXX           , KC_PAUSE , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_0 , KC_DOT , KC_COMMA , KC_PLUS  , XXXXXXX , XXXXXXX,
   LALT(LCTL(KC_DEL)), _______  , _______, _______, _______,     _______     ,   KC_KP_ENTER  , _______, _______  , _______  , _______ , _______
 ),
diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
index 93d4082305..a79aa62902 100644
--- a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12_1x2uC(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 1002524e0a..00ba10b769 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -940,7 +940,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_SYS] = LAYOUT(
-  DEBUG,   QWERTY,  WIN,     XXXXXXX, QK_BOOT,   XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
+  DB_TOGG, QWERTY,  WIN,     XXXXXXX, QK_BOOT,   XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
   XXXXXXX, FC_TOG,  XXXXXXX, DVORAK,  XXXXXXX, GLOW,    XXXXXXX, XXXXXXX, WORKMAN, LINUX,   XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT,  NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index f88959a1cb..3bfcd61a1a 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -943,7 +943,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_SYS] = LAYOUT(
-  DEBUG,   QWERTY,  WIN,     XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
+  DB_TOGG, QWERTY,  WIN,     XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
   XXXXXXX, FC_TOG,  XXXXXXX, DVORAK,  XXXXXXX, GLOW,    XXXXXXX, XXXXXXX, WORKMAN, LINUX,   XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT,  NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c b/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
index ea217fcc3e..1d030599fd 100644
--- a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
+++ b/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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, DEBUG,   _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
                     _______, _______, _______, _______,         _______, _______, _______, _______
diff --git a/keyboards/handwired/pteron/keymaps/default/keymap.c b/keyboards/handwired/pteron/keymaps/default/keymap.c
index b47ac46124..13194becff 100644
--- a/keyboards/handwired/pteron/keymaps/default/keymap.c
+++ b/keyboards/handwired/pteron/keymaps/default/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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,   DEBUG,   _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
                     _______, _______, _______, _______,         _______, _______, _______, _______
diff --git a/keyboards/handwired/pteron44/keymaps/default/keymap.c b/keyboards/handwired/pteron44/keymaps/default/keymap.c
index a4adc1ca9c..41d18c4a7d 100644
--- a/keyboards/handwired/pteron44/keymaps/default/keymap.c
+++ b/keyboards/handwired/pteron44/keymaps/default/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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,
   _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, DEBUG,   QK_BOOT,           _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, DB_TOGG, QK_BOOT,           _______, _______, _______, _______, _______, _______,
                     _______, _______, _______, _______,         _______, _______, _______, _______
 )
 
diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
index bee4de5ede..5bb4b4a666 100644
--- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-    _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
     _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
index ff7e1117b8..4a298fb480 100644
--- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-    _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
     _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
diff --git a/keyboards/handwired/rs60/keymaps/default/keymap.c b/keyboards/handwired/rs60/keymaps/default/keymap.c
index 6d5dc4a32a..5dae734be6 100644
--- a/keyboards/handwired/rs60/keymaps/default/keymap.c
+++ b/keyboards/handwired/rs60/keymaps/default/keymap.c
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
index ba847730c7..520bcb35d0 100644
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [UTIL] = LAYOUT(
-        QK_BOOT, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DEBUG,
+        QK_BOOT, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DB_TOGG,
         ____, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, ____, KC_HOME, KC_PGDN, KC_PGUP, KC_END, ____, ____, ____, ____,
         ____, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ____, ____, ____,
         ____, ____, ____, ____, ____, KC_SPC, ____, ____, ____, ____, ____, ____, ____,
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index 6114639bee..48745856b7 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN3] = LAYOUT_65_ansi_blocker(
         QK_BOOT,  MACRO01,  MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11,   MACRO12, 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,            DEBUG,     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, MACRO00,   XXXXXXX, \
         XXXXXXX,  XXXXXXX,           XXXXXXX,                   KC_WAKE,                            XXXXXXX, XXXXXXX,   MACRO13, MACRO14,   MACRO15)
 };
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c
index 1e751e751d..595e76cbb3 100644
--- a/keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_RGUI,          KC_MPRV, KC_MPLY, KC_MNXT
     ),
 	[4] = LAYOUT_ansi(
-        DEBUG  , RV_SM0 , RV_SM1 , RV_SM2 , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , DF(0)  , DF(2)  , KC_TRNS, MO(5)  ,
+        DB_TOGG, RV_SM0 , RV_SM1 , RV_SM2 , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , DF(0)  , DF(2)  , KC_TRNS, MO(5)  ,
         RV_SAYM, RV_SM3 , RV_SM4 , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
         KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
         KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  ,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
index dfed69f8a5..ebdedcbe6b 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
@@ -311,7 +311,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ergodox(
   // left hand
   VRSN,    _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, DEBUG,   BL_TOGG, BL_STEP, _______, _______,
+  _______, QK_BOOT, DB_TOGG, BL_TOGG, BL_STEP, _______, _______,
   KC_CAPS, _______, _______, _______, _______, AG_NORM,
   _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index da88562098..55e34de931 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -212,7 +212,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_symmetric(
-  QK_BOOT, DEBUG,   KC_ASUP, CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,
+  QK_BOOT, DB_TOGG, KC_ASUP, CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,
            KC_ASRP, KC_ASTG, XXXXXXX, XXXXXXX, QWERTY,  PLOVER,
            BL_ADJ,  KC_ASDN, XXXXXXX, XXXXXXX, ISO,     THUMB_ALT,
                                       _______, SW_TG,   _______
diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
index fae9f4f218..3ef40f4dae 100644
--- a/keyboards/jian/keymaps/default/keymap.c
+++ b/keyboards/jian/keymaps/default/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_symmetric(
-  QK_BOOT,   DEBUG,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  QK_BOOT, DB_TOGG,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
            XXXXXXX,        WORKMAN, COLEMAK, DVORAK,  QWERTY,  XXXXXXX,
            TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                              _______, SW_TG,   _______
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index d93e7843f2..aa65af0915 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      _______, _______, LT(_ADJUST, KC_ESC)
 ),
 [_ADJUST] = LAYOUT_symmetric_left(
-  QK_BOOT, DEBUG,   XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
+  QK_BOOT, DB_TOGG, XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
            XXXXXXX, XXXXXXX, BL_DEC,  RGB_VAD, RGB_SAD, RGB_SAI,
            XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
                                       _______, _______, _______
diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c
index 68a0909a9a..dd99f26e97 100644
--- a/keyboards/jian/keymaps/via/keymap.c
+++ b/keyboards/jian/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                         _______, _______, LT(3, KC_ENT),      LT(3, KC_ESC), _______, _______
 ),
 [3] = LAYOUT_symmetric(
-  QK_BOOT,   DEBUG,   XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
+  QK_BOOT, DB_TOGG, XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
            XXXXXXX, XXXXXXX, BL_DEC,  RGB_VAD, RGB_SAD, RGB_SAI,
            XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
                                       _______, SH_TG,   _______
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index f0c6c0d188..441ce2a079 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FUNCTION] = LAYOUT(
    QK_BOOT, KC_F1,   KC_F2,       KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR,  KC_MPLY, \
-   DEBUG,   KC_NO,   KC_NO,       KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,            _______,   \
+   DB_TOGG, KC_NO,   KC_NO,       KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,            _______,   \
    _______, KC_NO,   KC_VOLU,     KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,          KC_NO,            KC_NO,   \
    _______, KC_MRWD, KC_VOLD,     KC_MFFD, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,                  KC_BTN1, KC_MS_U, KC_BTN2, \
    _______, _______, _______,                      KC_NO,                          _______, _______,                KC_MS_L, KC_MS_D, KC_MS_R),
diff --git a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
index 143329bc2d..d54737f47c 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______,  _______, _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______,  _______,
   _______, _______, _______,  _______, _______, _______,   _______,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
index 6b5e24e166..ed43442307 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
index 146cbc7148..9b8405b2af 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
index c889b6316c..f8bb3388fd 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
index 01d2624d02..0631ceb185 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  TO(_GAMEMODE), QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, WRKMOD,
+  TO(_GAMEMODE), QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, WRKMOD,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_MODE_FORWARD,
   _______, _______, _______, _______, _______, _______, _______, _______,  _______, RGB_M_P,  RGB_M_R, TO(_QWERTY)
diff --git a/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
index 639d3b69e8..78fdb0713c 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    RGB_MODE_PLAIN,   QK_BOOT,     DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______,     KC_DEL,
+    RGB_MODE_PLAIN,   QK_BOOT,     DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,     KC_DEL,
     RGB_MODE_REVERSE, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,     RGB_VAI,
     RGB_MODE_FORWARD, _______,     _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,     RGB_VAD,
     RGB_TOG,          TO(_QWERTY), _______, _______, _______,     _______,      _______, _______, _______, TO(_QWERTY), X_____X
diff --git a/keyboards/kc60/keymaps/sgoodwin/keymap.c b/keyboards/kc60/keymaps/sgoodwin/keymap.c
index be439c365e..1dc6e702f4 100644
--- a/keyboards/kc60/keymaps/sgoodwin/keymap.c
+++ b/keyboards/kc60/keymaps/sgoodwin/keymap.c
@@ -25,6 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    BL_INC,    BL_DEC,  BL_STEP,  \
       KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_NO,   KC_TRNS,  \
       KC_TRNS,  KC_NO,    KC_MPRV,  KC_MPLY,   KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_NO,   KC_TRNS,  \
-      KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_SPC,                                 KC_NO,    DEBUG,    QK_BOOT,   KC_TRNS, KC_NO     \
+      KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_SPC,                                 KC_NO,    DB_TOGG,  QK_BOOT,   KC_TRNS, KC_NO     \
       ),
 };
diff --git a/keyboards/keebio/dilly/keymaps/default/keymap.c b/keyboards/keebio/dilly/keymaps/default/keymap.c
index 163d31a01b..9eaec582f1 100644
--- a/keyboards/keebio/dilly/keymaps/default/keymap.c
+++ b/keyboards/keebio/dilly/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN5] = LAYOUT_ortho_3x10(
     RGB_TOG, RGB_MOD, _______, QK_BOOT,   RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
-    _______, _______, DEBUG,   _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
+    _______, _______, DB_TOGG, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
     BL_STEP, _______, KC_GUIC, _______, _______, _______, _______, _______, _______, _______
   )
 
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
index ef98331ca7..abbccdc4d9 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      QK_BOOT, DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
+      QK_BOOT, DB_TOGG, RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
   //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
diff --git a/keyboards/keebio/iris/keymaps/mattly/keymap.c b/keyboards/keebio/iris/keymaps/mattly/keymap.c
index a499d021a1..f592b4f25a 100644
--- a/keyboards/keebio/iris/keymaps/mattly/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mattly/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FUNCT] = 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,
     QK_BOOT, XXXXXXX, XXXXXXX, M_NXWIN, XXXXXXX, XXXXXXX,                            XXXXXXX, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_K, QK_BOOT,
-    DEBUG,   XXXXXXX, M_PVTAB, M_PVWIN, M_NXTAB, XXXXXXX,                            XXXXXXX, TOG_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    DB_TOGG, XXXXXXX, M_PVTAB, M_PVWIN, M_NXTAB, XXXXXXX,                            XXXXXXX, TOG_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD, KC_MPLY, _______,          _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                    _______, _______, _______,                   _______, _______, _______
   ),
diff --git a/keyboards/keebio/iris/keymaps/mojitas/keymap.c b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
index 1a13a8a208..ab79e09fa9 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
       _______, _______, _______,LGUI(KC_UP),_______,LALT(KC_F4),                       _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,
   //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______,LGUI(KC_LEFT),LGUI(KC_DOWN),LGUI(KC_RGHT),_______,             _______,  DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP,
+      _______, _______,LGUI(KC_LEFT),LGUI(KC_DOWN),LGUI(KC_RGHT),_______,             _______,  DB_TOGG, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP,
   //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
       _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
   //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index 7434a8d19e..40ec3a8fdf 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     BL_BRTG, _______, _______, _______, DEBUG,   QK_BOOT,                            QK_BOOT, DEBUG,   _______, RGB_HUI, RGB_SAI, RGB_VAI,
+     BL_BRTG, _______, _______, _______, DB_TOGG, QK_BOOT,                            QK_BOOT, DB_TOGG, _______, RGB_HUI, RGB_SAI, RGB_VAI,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
       BL_INC, _______, _______, _______, _______, EEP_RST,                            EEP_RST, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/osiris/keymap.c b/keyboards/keebio/iris/keymaps/osiris/keymap.c
index 3df073dbdf..1356fb8323 100644
--- a/keyboards/keebio/iris/keymaps/osiris/keymap.c
+++ b/keyboards/keebio/iris/keymaps/osiris/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|-------+-------+-------+-------+-------+-------|                          |-------+-------+-------+-------+-------+-------|
      _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_SAI,RGB_VAI,                           _______,_______,_______,_______,_______,_______,
   //|-------+-------+-------+-------+-------+-------|                          |-------+-------+-------+-------+-------+-------|
-     QK_BOOT,DEBUG  ,_______,RGB_HUD,RGB_SAD,RGB_VAD,                           _______,_______,_______,_______,_______,_______,
+     QK_BOOT,DB_TOGG,_______,RGB_HUD,RGB_SAD,RGB_VAD,                           _______,_______,_______,_______,_______,_______,
   //|-------+-------+-------+-------+-------+-------+-------.        ,-------|-------+-------+-------+-------+-------+-------|
      BL_STEP,_______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,_______,
   //`--------+-------+-------+----+--+-------+-------+-------/        \-------+-------+-------+---+---+-------+-------+-------'
diff --git a/keyboards/keebio/levinson/keymaps/via/keymap.c b/keyboards/keebio/levinson/keymaps/via/keymap.c
index b2ca57c8ab..da90c73a4a 100644
--- a/keyboards/keebio/levinson/keymaps/via/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [3] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keebio/nyquist/keymaps/losinggeneration/README.md b/keyboards/keebio/nyquist/keymaps/losinggeneration/README.md
index a51b94e407..b03f81583d 100644
--- a/keyboards/keebio/nyquist/keymaps/losinggeneration/README.md
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/README.md
@@ -16,7 +16,7 @@ See description of the layout in the common folder
 
 ```
  ,-----------------------------------------..-----------------------------------------.
- | RESET|DEBUG |      |      |      |      ||      |      |      |      |      |      |
+ | RESET|Debug |      |      |      |      ||      |      |      |      |      |      |
  |------+------+------+------+------+------||------+------+------+------+------+------|
  |      |  F1  |  F2  |  F3  |  F4  |      ||      | Game |Numpad| Mouse|      |Sleep |
  |------+------+------+------+------+------||------+------+------+------+------+------|
diff --git a/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
index c4c09be155..f60070b60c 100644
--- a/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------..-----------------------------------------.
- * | QK_BOOT|DEBUG |      |      |      |      ||      |      |      |      |      |      |
+ * | Boot |Debug |      |      |      |      ||      |      |      |      |      |      |
  * |------+------+------+------+------+------||------+------+------+------+------+------|
  * |      |  F1  |  F2  |  F3  |  F4  |      ||      | Game |Numpad| Mouse|      |Sleep |
  * |------+------+------+------+------+------||------+------+------+------+------+------|
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------''-----------------------------------------'
  */
 [_ADJUST] = CATMAP( \
-   QK_BOOT , DEBUG  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, KC_F1  ,  KC_F2 , KC_F3  , KC_F4  , _______, _______, TO_GAME, TO_NUM , TO_MS  , _______, KC_SLEP, \
   _______, KC_F5  ,  KC_F6 , KC_F7  , KC_F8  , _______, _______, QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
   KC_CAPS, KC_F9  ,  KC_F10, KC_F11 , KC_F12 , _______, _______, _______, _______, _______, KC_UP  , _______, \
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
index 176e53988c..78ccf0b6ed 100644
--- a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
diff --git a/keyboards/keebio/nyquist/keymaps/via/keymap.c b/keyboards/keebio/nyquist/keymaps/via/keymap.c
index f77ba03eb4..f5bf204c2a 100644
--- a/keyboards/keebio/nyquist/keymaps/via/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
     ),
     [3] = LAYOUT_ortho_5x12(
-        _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
index b630b6f698..5e466630e0 100644
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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,   DEBUG,   QK_BOOT, EEP_RST, _______, KC_NO,   KC_NO,   KC_NO, KC_NO,  KC_NO ,
+    KC_NO,   KC_NO,   KC_NO,   DB_TOGG, QK_BOOT, EEP_RST, _______, KC_NO,   KC_NO,   KC_NO, KC_NO,  KC_NO ,
     _______, _______, _______, _______, _______, FN2,     FN2,     _______, _______, KC_NO, KC_ESC, _______
   )
 };
diff --git a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
index 2f64a56e9a..0b09ba64ee 100644
--- a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_ortho_5x12(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
+        _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
         _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
index 68e5272045..6629ca30b1 100755
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
@@ -1 +1 @@
-{"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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","DEBUG","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
+{"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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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
index 8575da1901..698caacdfd 100644
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
@@ -204,7 +204,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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,  _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  DEBUG,   _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+  DB_TOGG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 )
 /* QWERTY    = H
    WORKMAN   = J
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
index 4887a06510..318cc7f9e2 100644
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
@@ -204,7 +204,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   	[_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,  DEBUG,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_DEL ,
+    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_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,    PLOVER,   _______,
     KC_HOME,  _______,   MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,   _______,  _______,
     KC_PGDN,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/default/keymap.c
index 37378b6085..838561269a 100755
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/default/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/via/keymap.c
index 37378b6085..838561269a 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/via/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/lets_split/keymaps/poker/keymap.c b/keyboards/lets_split/keymaps/poker/keymap.c
index 9bfb951001..3d07c473e3 100644
--- a/keyboards/lets_split/keymaps/poker/keymap.c
+++ b/keyboards/lets_split/keymaps/poker/keymap.c
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
  [_ADJUST] = LAYOUT( \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______,  _______, \
   KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
index a55e5ab18b..6e52d3f0a9 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [SETTINGS] = LAYOUT_split_rshift(
         XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,       BL_TOGG,            RGB_TOG,     RGB_VAI,
-        XXXXXXX, XXXXXXX, DEBUG,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            RGB_MOD,     RGB_VAD,
+        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
diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
index 231e3cf44d..c16b676b38 100644
--- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_wrapper(\
     KC_MAKE, _________________ADJUST_L1_________________, _______,  _________________ADJUST_R1_________________, KC_RESET,
     VRSN,    _________________ADJUST_L2_________________, _______,  _________________ADJUST_R2_________________, EEP_RST,
-    DEBUG,   _________________ADJUST_L3_________________, _______,  _________________ADJUST_R3_________________, _______
+    DB_TOGG, _________________ADJUST_L3_________________, _______,  _________________ADJUST_R3_________________, _______
   )
 
 };
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
index e2643d4e06..aec8c56b18 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * If you use QWERTY + the Vanilla numbers primarily, change NUMLK_E to NUMLK_N here.
  *
  * ,----------------------------------.           ,----------------------------------.
- * | QK_BOOT|DEBUG |QWERTY|CMKDHM|      |           |      | VOL--| VOL++|BRITE-|BRITE+|
+ * | Boot |Debug |QWERTY|CMKDHM|      |           |      | VOL--| VOL++|BRITE-|BRITE+|
  * |------+------+------+------+------|           |------+------+------+------+------|
  * | SHIFT| CTRL |  ALT |  GUI |NAV LK|           | POWER| VOL- | VOL+ | MUTE | MPLY |
  * |------+------+------+------+------|           |------+------+------+------+------|
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                `------'    `------'
  */
 [_SYS] = LAYOUT( \
-  QK_BOOT, DEBUG,   QWERTY,  CMK_DHM, _______,       _______,  KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \
+  QK_BOOT, DB_TOGG, QWERTY,  CMK_DHM, _______,       _______,  KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \
   KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK,        KC_PWR,   VOL_DN,  VOL_UP,  KC_MUTE, KC_MPLY, \
   _______, _______, AU_OFF,  AU_ON,   _______,       _______,  NUMLK_E, KC_MRWD, KC_MFFD, _______, \
                     _______, _______, _______,       _______,  _______, _______                    \
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index aeb67849f7..54b2da42b0 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       /*,      */ _______, _______, TT(_xF), _______,        _______, TT(_xF), KC_0,    KC_DOT,
       /*,      */ _______, _______, _______, _______,        _______, _______, _______, _______),
   [_xF] = LAYOUT(
-      QK_BOOT, KC_INS,     KC_PGUP, DEBUG,   KC_VOLU,        KC_PPLS, KC_P7,   KC_P8,   KC_P9,    KC_PMNS,
+      QK_BOOT, KC_INS,     KC_PGUP, DB_TOGG, KC_VOLU,        KC_PPLS, KC_P7,   KC_P8,   KC_P9,    KC_PMNS,
       CK_TOGG, KC_HOME,    KC_PGDN, KC_END,  KC_VOLD,        KC_NUM,  KC_P4,   KC_P5,   KC_P6,    KC_PENT,
       KC_LAYO, KC_MPRV,    KC_MPLY, KC_MNXT, KC_MUTE,        KC_PAST, KC_P1,   KC_P2,   KC_P3,    KC_PSLS,
       /*,      */ CK_UP,   MU_TOG,  _______, _______,        _______, _______, KC_P0,   KC_PDOT,
diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c
index 22877c1101..8886ca638f 100644
--- a/keyboards/mixi/keymaps/default/keymap.c
+++ b/keyboards/mixi/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * .--------------------------------------.
      * | N/A          | N/A   | Hold: Layer 2 |
      * |--------------|-------|---------------|
-     * | QK_BOOT EEPROM | QK_BOOT | DEBUG MODE    |
+     * | Clear EEPROM | Bootloader | Debug    |
      * |--------------|-------|---------------|
      * | N/A          | N/A   | N/A           |
      * '--------------------------------------'
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [2] =
         LAYOUT(
                 KC_NO  , KC_NO, KC_TRNS,
-                EEP_RST, QK_BOOT, DEBUG  ,
+                EEP_RST, QK_BOOT, DB_TOGG  ,
                 KC_NO  , KC_NO, KC_NO
               )
 
diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c
index 927e16659c..edba648df8 100644
--- a/keyboards/mixi/keymaps/via/keymap.c
+++ b/keyboards/mixi/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * .--------------------------------------.
      * | N/A          | N/A   | Hold: Layer 2 |
      * |--------------|-------|---------------|
-     * | QK_BOOT EEPROM | QK_BOOT | DEBUG MODE    |
+     * | Clear EEPROM | Bootloader | Debug    |
      * |--------------|-------|---------------|
      * | N/A          | N/A   | N/A           |
      * '--------------------------------------'
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [2] =
         LAYOUT(
                 KC_NO  , KC_NO, KC_TRNS,
-                EEP_RST, QK_BOOT, DEBUG  ,
+                EEP_RST, QK_BOOT, DB_TOGG  ,
                 KC_NO  , KC_NO, KC_NO
               ),
 
diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c
index ca872bbe34..3b901190c2 100644
--- a/keyboards/mlego/m48/keymaps/default/keymap.c
+++ b/keyboards/mlego/m48/keymaps/default/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJ] =  LAYOUT_ortho_4x12(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/mlego/m48/keymaps/via/keymap.c b/keyboards/mlego/m48/keymaps/via/keymap.c
index c6916a7fb6..9f3c846f97 100644
--- a/keyboards/mlego/m48/keymaps/via/keymap.c
+++ b/keyboards/mlego/m48/keymaps/via/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJ] =  LAYOUT_ortho_4x12(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/omnikeyish/keymaps/default/keymap.c b/keyboards/omnikeyish/keymaps/default/keymap.c
index 6b21d9d03c..553c77758c 100644
--- a/keyboards/omnikeyish/keymaps/default/keymap.c
+++ b/keyboards/omnikeyish/keymaps/default/keymap.c
@@ -9,6 +9,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   	  DYN_MACRO_KEY1,  DYN_MACRO_KEY2,       KC_GRV,  KC_1,    KC_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,     M_PROG,  KC_PSLS, KC_PAST, KC_PMNS,
   	  DYN_MACRO_KEY3,  DYN_MACRO_KEY4,       KC_TAB,  KC_Q,    KC_W,    KC_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,
   	  DYN_MACRO_KEY5,  DYN_MACRO_KEY6,       KC_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_MPRV, KC_MPLY, KC_MNXT,     KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
-  	  DYN_MACRO_KEY7,  DYN_MACRO_KEY8,       KC_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_BSLS,     DEBUG,   KC_UP,   QK_BOOT,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+  	  DYN_MACRO_KEY7,  DYN_MACRO_KEY8,       KC_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_BSLS,     DB_TOGG, KC_UP,   QK_BOOT,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
   	  DYN_MACRO_KEY9,  DYN_MACRO_KEY10,      KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPACE,                  KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,            KC_PDOT)
 };
diff --git a/keyboards/ortho5by12/keymaps/default/keymap.c b/keyboards/ortho5by12/keymaps/default/keymap.c
index 00be853e9c..f3fcb85d14 100644
--- a/keyboards/ortho5by12/keymaps/default/keymap.c
+++ b/keyboards/ortho5by12/keymaps/default/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/abhixec/keymap.c b/keyboards/planck/keymaps/abhixec/keymap.c
index ae310120a2..9b5256e3a9 100644
--- a/keyboards/planck/keymaps/abhixec/keymap.c
+++ b/keyboards/planck/keymaps/abhixec/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/abishalom/keymap.c b/keyboards/planck/keymaps/abishalom/keymap.c
index 02e9c1cfd2..2d5d33389f 100644
--- a/keyboards/planck/keymaps/abishalom/keymap.c
+++ b/keyboards/planck/keymaps/abishalom/keymap.c
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______,  _______,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c
index f1f5e6379a..ba306a0d8f 100644
--- a/keyboards/planck/keymaps/adamtabrams/keymap.c
+++ b/keyboards/planck/keymaps/adamtabrams/keymap.c
@@ -201,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FMWARE] = LAYOUT_planck_grid(
     XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, QK_BOOT, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______
 )
diff --git a/keyboards/planck/keymaps/antosha417/keymap.c b/keyboards/planck/keymaps/antosha417/keymap.c
index b034221e3e..2a6caca201 100644
--- a/keyboards/planck/keymaps/antosha417/keymap.c
+++ b/keyboards/planck/keymaps/antosha417/keymap.c
@@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______, _______, BRUDERSCHAFT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index c93286cad0..fca84bd461 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -235,9 +235,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* MIT Layout (ADJUST)
  *
  * ,-----------------------------------------------------------------------------.
- * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | QK_BOOT|
+ * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | Boot |
  * |-----------------------------------------------------------------------------|
- * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| DEBUG|
+ * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| Debug|
  * |-----------------------------------------------------------------------------|
  * |     |MWLft|MWUp |NWDn |NWRght|QWERTY|CMK_VCP|MI_ON|MI_OF |     |     |MU_Mod|
  * |-----------------------------------------------------------------------------|
@@ -246,7 +246,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid( /* ADJUST LAYER */
   RGB_TOG, KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QK_BOOT,
-  RGB_MOD, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, GAMING,  KC_NO,       AU_ON,   AU_OFF,  MU_ON,   MU_OFF,  DEBUG,
+  RGB_MOD, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, GAMING,  KC_NO,       AU_ON,   AU_OFF,  MU_ON,   MU_OFF,  DB_TOGG,
   KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, QWERTY,  COLEMAK_VCP, MI_ON,   MI_OFF,  KC_TRNS, KC_TRNS, MU_MOD,
   KC_NO,   KC_NO,   KC_NO,   KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO
 )
diff --git a/keyboards/planck/keymaps/ariccb/readme.md b/keyboards/planck/keymaps/ariccb/readme.md
index 500373ea1a..3472ce09ec 100644
--- a/keyboards/planck/keymaps/ariccb/readme.md
+++ b/keyboards/planck/keymaps/ariccb/readme.md
@@ -69,7 +69,7 @@ GAMING LAYER
  * ,-----------------------------------------------------------------------------.
  * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | RESET|
  * |-----------------------------------------------------------------------------|
- * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| DEBUG|
+ * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| Debug|
  * |-----------------------------------------------------------------------------|
  * |     |MWLft|MWUp |NWDn |NWRght|QWERTY|CMK_VCP|MI_ON|MI_OF |     |     |MU_Mod|
  * |-----------------------------------------------------------------------------|
diff --git a/keyboards/planck/keymaps/aviator/keymap.c b/keyboards/planck/keymaps/aviator/keymap.c
index 143c1bc926..e318a6db16 100644
--- a/keyboards/planck/keymaps/aviator/keymap.c
+++ b/keyboards/planck/keymaps/aviator/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  KC_ESC,  QK_BOOT, DEBUG,   ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_DEL,
+  KC_ESC,  QK_BOOT, DB_TOGG, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_DEL,
   _______, ___x___, ___x___, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DATA,    ___x___, ___x___, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  ___x___, ___x___, ___x___, ___x___, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/badger/keymap.c b/keyboards/planck/keymaps/badger/keymap.c
index 6bbe034382..50d3441854 100644
--- a/keyboards/planck/keymaps/badger/keymap.c
+++ b/keyboards/planck/keymaps/badger/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST]   = LAYOUT_ortho_4x12(
       _______,  NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
-      _______,  GE_SWAP,  GE_NORM,  DEBUG,    AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
+      _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
       _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______)
 };
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
index 366aff6e1c..d457087659 100644
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ b/keyboards/planck/keymaps/buhearns/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [4] = LAYOUT_planck_grid(
-  KC_TRNS, QK_BOOT, DEBUG,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_MOD,  MUV_IN,  MU_ON,   AU_ON,    KC_EJCT,
+  KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_MOD,  MUV_IN,  MU_ON,   AU_ON,    KC_EJCT,
   KC_TRNS, EEP_RST, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MUV_DE,  MU_OFF,  AU_OFF,   KC_TRNS,
   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MUTE, KC_MPRV, KC_MNXT,  KC_NO,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_VOLU,  KC_MPLY
diff --git a/keyboards/planck/keymaps/corvec/keymap.c b/keyboards/planck/keymaps/corvec/keymap.c
index c3029adc7b..1c94ef5448 100644
--- a/keyboards/planck/keymaps/corvec/keymap.c
+++ b/keyboards/planck/keymaps/corvec/keymap.c
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT_planck_grid(
-  COLEMAK, _______,   DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QWERTY ,
+  COLEMAK, _______, DB_TOGG,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QWERTY ,
   _______, _______, MU_MOD,   AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, KC_ASON, KC_ASUP,
   _______, MUV_DE,  MUV_IN,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, KC_ASRP, KC_ASOFF,KC_ASDN,
   _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
index 31a273be51..bcf84e3365 100644
--- a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 63817e3d48..9d3dbccfe6 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/dodger/keymap.c b/keyboards/planck/keymaps/dodger/keymap.c
index a0fede5fa0..0fef760a8b 100644
--- a/keyboards/planck/keymaps/dodger/keymap.c
+++ b/keyboards/planck/keymaps/dodger/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  EEP_RST, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  EEP_RST, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dr0ck/keymap.c b/keyboards/planck/keymaps/dr0ck/keymap.c
index 0449477fae..1060d6dbd0 100644
--- a/keyboards/planck/keymaps/dr0ck/keymap.c
+++ b/keyboards/planck/keymaps/dr0ck/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dudeofawesome/keymap.c b/keyboards/planck/keymaps/dudeofawesome/keymap.c
index 951cb45692..ab4f4ccf50 100644
--- a/keyboards/planck/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/planck/keymaps/dudeofawesome/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
     KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index ee5233c5d0..f409a8555a 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -147,7 +147,7 @@ LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     KC_PWR,  _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/emiller/keymap.c b/keyboards/planck/keymaps/emiller/keymap.c
index 05f2289ae5..c257866f29 100644
--- a/keyboards/planck/keymaps/emiller/keymap.c
+++ b/keyboards/planck/keymaps/emiller/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/eshesh2/keymap.c b/keyboards/planck/keymaps/eshesh2/keymap.c
index 55c20236d3..8cb553f4e7 100644
--- a/keyboards/planck/keymaps/eshesh2/keymap.c
+++ b/keyboards/planck/keymaps/eshesh2/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, NUMPAD,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/fabian/keymap.c b/keyboards/planck/keymaps/fabian/keymap.c
index 2244703410..af7be74672 100644
--- a/keyboards/planck/keymaps/fabian/keymap.c
+++ b/keyboards/planck/keymaps/fabian/keymap.c
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/foreveranapple/keymap.c b/keyboards/planck/keymaps/foreveranapple/keymap.c
index 1b8ad9e3ea..f91b71837e 100644
--- a/keyboards/planck/keymaps/foreveranapple/keymap.c
+++ b/keyboards/planck/keymaps/foreveranapple/keymap.c
@@ -203,7 +203,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NIXQWERTY, OSX,     PLOVER,  COLEMAK,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,   DVORAK,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______
diff --git a/keyboards/planck/keymaps/fsck/keymap.c b/keyboards/planck/keymaps/fsck/keymap.c
index 1aee2b7daa..b18e943891 100644
--- a/keyboards/planck/keymaps/fsck/keymap.c
+++ b/keyboards/planck/keymaps/fsck/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/gitdrik/keymap.c b/keyboards/planck/keymaps/gitdrik/keymap.c
index 9f193e21c1..68e1e5da83 100644
--- a/keyboards/planck/keymaps/gitdrik/keymap.c
+++ b/keyboards/planck/keymaps/gitdrik/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
  [_RIGHTER] = LAYOUT_planck_grid(
-    KC_TRNS, QK_BOOT, DEBUG,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, KC_WH_U,
+    KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO, KC_NO, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, KC_WH_U,
     KC_TRNS, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_WH_D,
     KC_TRNS, KC_TRNS, MU_MOD,  MU_ON,   MU_OFF,  KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_BTN3, KC_TRNS, KC_TRNS,
     KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_NO
diff --git a/keyboards/planck/keymaps/grahampheath/keymap.c b/keyboards/planck/keymaps/grahampheath/keymap.c
index 02b082a74a..91e239270c 100644
--- a/keyboards/planck/keymaps/grahampheath/keymap.c
+++ b/keyboards/planck/keymaps/grahampheath/keymap.c
@@ -213,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index ce09feb141..5cf7c3d0fb 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [LY_1101] = LAYOUT_gunp(
   SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT,
-  KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DEBUG,
+  KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DB_TOGG,
   KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EEP_RST,
   KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
 ),
diff --git a/keyboards/planck/keymaps/hvp/keymap.c b/keyboards/planck/keymaps/hvp/keymap.c
index fe17924f2b..984b9624af 100644
--- a/keyboards/planck/keymaps/hvp/keymap.c
+++ b/keyboards/planck/keymaps/hvp/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  AG_NORM, AG_SWAP, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______,
   _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, KC_4, KC_5, KC_6, _______, _______,
   KC_PSCR, MUV_DE, MUV_IN, MU_ON, MU_OFF, _______, _______,  KC_0, KC_1, KC_2, KC_3, _______,
-  QK_BOOT, _______, _______, _______, MI_ON, MI_OFF, _______, _______, _______, _______, _______, DEBUG
+  QK_BOOT, _______, _______, _______, MI_ON, MI_OFF, _______, _______, _______, _______, _______, DB_TOGG
 )};
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/inkwell/keymap.c b/keyboards/planck/keymaps/inkwell/keymap.c
index 92599713db..9ff91f84c1 100644
--- a/keyboards/planck/keymaps/inkwell/keymap.c
+++ b/keyboards/planck/keymaps/inkwell/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     QK_BOOT, _______,  _______,  _______,  _______, _______, _______, KC_BTN1, KC_MS_BTN2, KC_ACL1, KC_ACL2,  KC_BSPC ,
-    _______, KC_CALC,  KC_MAIL,  KC_MSEL,  DEBUG,   _______, _______, KC_MS_L, KC_MS_D,    KC_MS_U, KC_MS_R,  RGB_TOG,
+    _______, KC_CALC,  KC_MAIL,  KC_MSEL,  DB_TOGG, _______, _______, KC_MS_L, KC_MS_D,    KC_MS_U, KC_MS_R,  RGB_TOG,
     KC_LSFT, _______,  _______,  _______,  _______, _______, _______, _______, _______,    _______, _______,  KC_ENT,
     RSFT_T(KC_MPLY),   KC_LCTL,  KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,     KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
 )
diff --git a/keyboards/planck/keymaps/jasperla/keymap.c b/keyboards/planck/keymaps/jasperla/keymap.c
index 151b32cf18..6bad2d530c 100644
--- a/keyboards/planck/keymaps/jasperla/keymap.c
+++ b/keyboards/planck/keymaps/jasperla/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, _______, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, _______, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/jdelkins/keymap.c b/keyboards/planck/keymaps/jdelkins/keymap.c
index bf0d60c5f9..48f25e895f 100644
--- a/keyboards/planck/keymaps/jdelkins/keymap.c
+++ b/keyboards/planck/keymaps/jdelkins/keymap.c
@@ -159,14 +159,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
     KC_RCTL, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, TG(_KP), KC_BRID, KC_BRIU, KC_MUTE,
     _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS,  _______, _______, _______, KC_MPLY,
     KC_RCTL, _______, _______, _______,      _______,          _______,     KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
 )
 
 /* [_ADJUST] = LAYOUT( */
-/*     _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL , */
+/*     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL , */
 /*     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______, */
 /*     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, */
 /*     _______, _______, _______, _______,      _______,          _______,     _______, _______, _______,  _______ */
diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
index 91aaa0fa00..426f264b92 100644
--- a/keyboards/planck/keymaps/jimmysjolund/keymap.c
+++ b/keyboards/planck/keymaps/jimmysjolund/keymap.c
@@ -188,7 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/jirgn/keymap.c b/keyboards/planck/keymaps/jirgn/keymap.c
index 6a180a7239..38108f8eef 100644
--- a/keyboards/planck/keymaps/jirgn/keymap.c
+++ b/keyboards/planck/keymaps/jirgn/keymap.c
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *              `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  PLOVER,  _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
index 375405b7b6..9e841cd3f2 100644
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ b/keyboards/planck/keymaps/jweickm/keymap.c
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* _ADJUST
      * ,-----------------------------------------------------------------------------------.
-     * | A-SFT| QK_BOOT| DEBUG|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
+     * | A-SFT| Boot | Debug|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * | A-GRV|EEPRST|MU_MOD| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
      * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -209,7 +209,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        LALT(KC_LSFT), QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DE_SWITCH, 
+        LALT(KC_LSFT), QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DE_SWITCH, 
         LALT(KC_GRV), EEP_RST, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, HRWIDECOLEMAK, WIDECOLEMAK, LALT(KC_GRV), LANG_SWITCH, GAMING, 
         KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_SVD_BD, KC_MPLY, KC_SVU_BU, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEPROM_RESET
diff --git a/keyboards/planck/keymaps/jweickm/readme.md b/keyboards/planck/keymaps/jweickm/readme.md
index 6628dfbdbf..c3373bbfb5 100644
--- a/keyboards/planck/keymaps/jweickm/readme.md
+++ b/keyboards/planck/keymaps/jweickm/readme.md
@@ -99,7 +99,7 @@ Navigation layer on space.
 */
 /* _ADJUST
 * ,-----------------------------------------------------------------------------------.
-* | A-SFT| RESET| DEBUG|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
+* | A-SFT| RESET| Debug|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * | A-GRV|EEPRST|MU_MOD| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/keyboards/planck/keymaps/kanbara/keymap.c b/keyboards/planck/keymaps/kanbara/keymap.c
index 383069bd43..c3574ca457 100644
--- a/keyboards/planck/keymaps/kanbara/keymap.c
+++ b/keyboards/planck/keymaps/kanbara/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,
+    QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, COLEMAK,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LEAGUE,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kelorean/keymap.c b/keyboards/planck/keymaps/kelorean/keymap.c
index fe31f1f1fa..9f0553fce1 100644
--- a/keyboards/planck/keymaps/kelorean/keymap.c
+++ b/keyboards/planck/keymaps/kelorean/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kifinnsson/keymap.c b/keyboards/planck/keymaps/kifinnsson/keymap.c
index 450d860022..5f6ff88731 100644
--- a/keyboards/planck/keymaps/kifinnsson/keymap.c
+++ b/keyboards/planck/keymaps/kifinnsson/keymap.c
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kloki/keymap.c b/keyboards/planck/keymaps/kloki/keymap.c
index 9df9edbde7..15e688a6c6 100644
--- a/keyboards/planck/keymaps/kloki/keymap.c
+++ b/keyboards/planck/keymaps/kloki/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, _______, QWERTY,  WORKMAN, _______, _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kmontag42/keymap.c b/keyboards/planck/keymaps/kmontag42/keymap.c
index 548c30b803..5f42099a6d 100644
--- a/keyboards/planck/keymaps/kmontag42/keymap.c
+++ b/keyboards/planck/keymaps/kmontag42/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  PLOVER,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/kuatsure/keymap.c b/keyboards/planck/keymaps/kuatsure/keymap.c
index 6609683c1e..98ace0e34a 100644
--- a/keyboards/planck/keymaps/kuatsure/keymap.c
+++ b/keyboards/planck/keymaps/kuatsure/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |      | MAKE | FLSH |      |      |      |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | QK_BOOT| DEBUG|      |      |Aud on|AudOff| Game |Mouse |      |      |      |
+ * |      | Boot | Debug|      |      |Aud on|AudOff| Game |Mouse |      |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      | VRSN |      |      |MusMod|Mus on|MusOff|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid_wrapper(
     _______, KB_MAKE, KB_FLSH, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-    _______, QK_BOOT, DEBUG,   _______, _______, AU_ON,   AU_OFF,  GAME,    MOUSE,   _______, _______, _______,
+    _______, QK_BOOT, DB_TOGG, _______, _______, AU_ON,   AU_OFF,  GAME,    MOUSE,   _______, _______, _______,
     _______, KB_VRSN, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
diff --git a/keyboards/planck/keymaps/lja83/keymap.c b/keyboards/planck/keymaps/lja83/keymap.c
index 6169196817..d05c3713cc 100644
--- a/keyboards/planck/keymaps/lja83/keymap.c
+++ b/keyboards/planck/keymaps/lja83/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/mason/keymap.c b/keyboards/planck/keymaps/mason/keymap.c
index 82ddaa650e..59966451aa 100644
--- a/keyboards/planck/keymaps/mason/keymap.c
+++ b/keyboards/planck/keymaps/mason/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
     _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/mattly/keymap.c b/keyboards/planck/keymaps/mattly/keymap.c
index c9e0a1c3af..7d6245a1e6 100644
--- a/keyboards/planck/keymaps/mattly/keymap.c
+++ b/keyboards/planck/keymaps/mattly/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FUNCT] = LAYOUT_planck_grid(
     QK_BOOT, XALLWIN, XPRVSPC, NWIN,    XNXTSPC, XDESKTP, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F13,
-    DEBUG,   XNOTIFY, PTAB,    PWIN,    NTAB,    NAVBACK, NAVFWD,  KC_F4,   KC_F5,   KC_F6,   KC_F11,  KC_F14,
+    DB_TOGG, XNOTIFY, PTAB,    PWIN,    NTAB,    NAVBACK, NAVFWD,  KC_F4,   KC_F5,   KC_F6,   KC_F11,  KC_F14,
     KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD, KC_MPLY, XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F12,  KC_F15,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/planck/keymaps/mgalisa/keymap.c b/keyboards/planck/keymaps/mgalisa/keymap.c
index 64a1759ba9..250845083b 100644
--- a/keyboards/planck/keymaps/mgalisa/keymap.c
+++ b/keyboards/planck/keymaps/mgalisa/keymap.c
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/mikethetiger/keymap.c b/keyboards/planck/keymaps/mikethetiger/keymap.c
index 5fa664bea2..3ea2633552 100644
--- a/keyboards/planck/keymaps/mikethetiger/keymap.c
+++ b/keyboards/planck/keymaps/mikethetiger/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/mjuma/keymap.c b/keyboards/planck/keymaps/mjuma/keymap.c
index db9b46b9bf..825e3d681b 100644
--- a/keyboards/planck/keymaps/mjuma/keymap.c
+++ b/keyboards/planck/keymaps/mjuma/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------.
- * |      |QK_BOOT |DEBUG |      |      |      |      |DMREC1|DMREC2|      |      |      |
+ * |      | Boot |Debug |      |      |      |      |DMREC1|DMREC2|      |      |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |GAMING|      |      |      |      |      |DMPLY1|DMPLY2|Audoff|Aud on|      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,     _______,   _______,  _______, _______, DM_REC1, DM_REC2,   _______,   _______,   _______,
+    _______, QK_BOOT, DB_TOGG,   _______,   _______,  _______, _______, DM_REC1, DM_REC2,   _______,   _______,   _______,
     _______, TG(_GAMING), ___,   _______,   _______,  _______, _______, DM_PLY1, DM_PLY2,   AU_OFF,    AU_ON,     _______,
     _______, _______, _______,   _______,   _______,  _______, _______, DM_RSTP, _______,   MU_OFF,    MU_ON,     MU_MOD,
     _______, _______, _______,   AG_TOGG,   _______,  _______, _______, _______, _______,   MUV_DE,    MUV_IN,    _______
diff --git a/keyboards/planck/keymaps/mjuma/readme.md b/keyboards/planck/keymaps/mjuma/readme.md
index bc5d0c77f0..f462737783 100644
--- a/keyboards/planck/keymaps/mjuma/readme.md
+++ b/keyboards/planck/keymaps/mjuma/readme.md
@@ -119,7 +119,7 @@ stack of layers                     array_of_action_code[row][column]
 
 ```ascii
 ,-----------------------------------------------------------------------------------.
-|      |RESET |DEBUG |      |      |      |      |DMREC1|DMREC2|      |      |      |
+|      |RESET |Debug |      |      |      |      |DMREC1|DMREC2|      |      |      |
 |------+------+------+------+------+-------------+------+------+------+------+------|
 |      |GAMING|      |      |      |      |      |DMPLY1|DMPLY2|Audoff|Aud on|      |
 |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -133,7 +133,7 @@ stack of layers                     array_of_action_code[row][column]
 
 ```text
 RESET:       Put the keyboard into bootloader mode for flashing
-DEBUG:       Toggle debug mode
+Debug:       Toggle debug mode
 EEP_RST:     Reinitializes the keyboard’s EEPROM (persistent memory)
 
 AG_TOG:      Toggle Alt and GUI swap on both sides (Mac)
diff --git a/keyboards/planck/keymaps/motform/keymap.c b/keyboards/planck/keymaps/motform/keymap.c
index 3e38e9fa63..7238df3e47 100644
--- a/keyboards/planck/keymaps/motform/keymap.c
+++ b/keyboards/planck/keymaps/motform/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid
 (
- _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+ _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/planck/keymaps/msiu/keymap.c b/keyboards/planck/keymaps/msiu/keymap.c
index b2576f3bdd..ba154582c0 100644
--- a/keyboards/planck/keymaps/msiu/keymap.c
+++ b/keyboards/planck/keymaps/msiu/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, _______, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
diff --git a/keyboards/planck/keymaps/muzfuz/keymap.c b/keyboards/planck/keymaps/muzfuz/keymap.c
index 10120dece4..b02ce149f4 100644
--- a/keyboards/planck/keymaps/muzfuz/keymap.c
+++ b/keyboards/planck/keymaps/muzfuz/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
     [_ADJUST] = LAYOUT_planck_grid(
-        _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
         _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
         _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/planck/keymaps/myoung34/keymap.c b/keyboards/planck/keymaps/myoung34/keymap.c
index f276b45e45..e529113745 100644
--- a/keyboards/planck/keymaps/myoung34/keymap.c
+++ b/keyboards/planck/keymaps/myoung34/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/orthodeluxe/keymap.c b/keyboards/planck/keymaps/orthodeluxe/keymap.c
index e615ab97ea..7e5ee3139b 100644
--- a/keyboards/planck/keymaps/orthodeluxe/keymap.c
+++ b/keyboards/planck/keymaps/orthodeluxe/keymap.c
@@ -215,7 +215,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_UTILSLAYER] = LAYOUT_planck_grid(
     _______, XXXXXXX, WINDOWS, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PAUS, _______,
-    _______, XXXXXXX, KC_SCRL, DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+    _______, XXXXXXX, KC_SCRL, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
     _______, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, XXXXXXX, KC_NUM,  MACOS,   XXXXXXX, XXXXXXX, XXXXXXX, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/planck/keymaps/palleiko/keymap.c b/keyboards/planck/keymaps/palleiko/keymap.c
index a86cb698ff..f6258be5bf 100644
--- a/keyboards/planck/keymaps/palleiko/keymap.c
+++ b/keyboards/planck/keymaps/palleiko/keymap.c
@@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, _______, _______, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/pascamel/keymap.c b/keyboards/planck/keymaps/pascamel/keymap.c
index bc03824452..392651d97b 100644
--- a/keyboards/planck/keymaps/pascamel/keymap.c
+++ b/keyboards/planck/keymaps/pascamel/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/pevecyan/keymap.c b/keyboards/planck/keymaps/pevecyan/keymap.c
index eb5ed928bd..0569ec9535 100644
--- a/keyboards/planck/keymaps/pevecyan/keymap.c
+++ b/keyboards/planck/keymaps/pevecyan/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/pjanx/keymap.c b/keyboards/planck/keymaps/pjanx/keymap.c
index 9444cf13d4..6ee7f98695 100644
--- a/keyboards/planck/keymaps/pjanx/keymap.c
+++ b/keyboards/planck/keymaps/pjanx/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
diff --git a/keyboards/planck/keymaps/pok3r/keymap.c b/keyboards/planck/keymaps/pok3r/keymap.c
index c3a52d2e4e..d012d3045d 100644
--- a/keyboards/planck/keymaps/pok3r/keymap.c
+++ b/keyboards/planck/keymaps/pok3r/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
   KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/ptillemans/keymap.c b/keyboards/planck/keymaps/ptillemans/keymap.c
index abfecfe0ce..4ea17cd247 100644
--- a/keyboards/planck/keymaps/ptillemans/keymap.c
+++ b/keyboards/planck/keymaps/ptillemans/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  QWERTY, DVORAK,  PLOVER,  _______,
     BACKLIT, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/raffle/keymap.c b/keyboards/planck/keymaps/raffle/keymap.c
index 6ebce40f72..ec07a1d3fc 100644
--- a/keyboards/planck/keymaps/raffle/keymap.c
+++ b/keyboards/planck/keymaps/raffle/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/rennerom/keymap.c b/keyboards/planck/keymaps/rennerom/keymap.c
index 0d98aac9c1..b9d7f2dd5d 100644
--- a/keyboards/planck/keymaps/rennerom/keymap.c
+++ b/keyboards/planck/keymaps/rennerom/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT_planck_grid(
-    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DEBUG,    RESET,
+    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DB_TOGG,  RESET,
     _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    RGB_RMOD, RGB_MOD,  RGB_SAD,  RGB_SAI,  _______,  _______,  _______,
     _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   RGB_SPD,  RGB_SPI,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/planck/keymaps/rodhaene/keymap.c b/keyboards/planck/keymaps/rodhaene/keymap.c
index 8441ee5a64..b2c40a57c6 100644
--- a/keyboards/planck/keymaps/rodhaene/keymap.c
+++ b/keyboards/planck/keymaps/rodhaene/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NUMPAD, _______, _______,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 8e80f8208d..a6f75f4fc7 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -378,7 +378,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [_FEATURS] = LAYOUT_planck_mit(                                                                                                         //
-        LCTL(LALT(KC_DEL)), DO_RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, TD(TD_DEG_DEGF), TD(TD_SMILEY), KC_DEL,  //
+        LCTL(LALT(KC_DEL)), DO_RESET, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, TD(TD_DEG_DEGF), TD(TD_SMILEY), KC_DEL,  //
         RGB_VAI, RGB_VAD, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DF(_BASE), DF(_COLEMAK), DF(_DVORAK), TO(_PLOVER), MY_RGBCON,            //
         KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_TRNS, KC_TRNS, CK_ON, CK_OFF, KC_ENTER,                                  //
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(_MOUSY), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
@@ -1169,7 +1169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
 // Runs *after* a key is pressed
 void post_process_record_user(uint16_t keycode, keyrecord_t* record) {
     switch (keycode) {
-        case DEBUG:
+        case QK_DEBUG_TOGGLE:
             // Blink the warning layer when the debug key is pressed
             rgblight_blink_layer_repeat(debug_enable ? 11 : 12, 1500, 3);
 
diff --git a/keyboards/planck/keymaps/scottzach1/keymap.c b/keyboards/planck/keymaps/scottzach1/keymap.c
index ce1c70d318..6fd5c4cec6 100755
--- a/keyboards/planck/keymaps/scottzach1/keymap.c
+++ b/keyboards/planck/keymaps/scottzach1/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  xxxxxxx, KC_MPRV, KC_MPLY, KC_MNXT, xxxxxxx, xxxxxxx, KC_F7,   KC_F8,   KC_F9,   KC_F10,  xxxxxxx,
     _______, xxxxxxx, KC_VOLD, KC_VOLU, KC_MUTE, xxxxxxx, xxxxxxx, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______,
     _______, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, KC_F1,   KC_F2,   KC_F3,   KC_F12,  _______,
-    _______, _______, _______, _______, _______, DEBUG,   DEBUG,   _______, _______, _______, _______, _______
+    _______, _______, _______, _______, _______, DB_TOGG, DB_TOGG, _______, _______, _______, _______, _______
 ),
 
 /* Debug
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------------------'
  */
 [_DEBUG] = LAYOUT_ortho_4x12(
-    QK_BOOT, DEBUG,   xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, EEP_RST,
+    QK_BOOT, DB_TOGG, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, EEP_RST,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx
diff --git a/keyboards/planck/keymaps/sigul/keymap.c b/keyboards/planck/keymaps/sigul/keymap.c
index 6c5da45224..0f0210d1e8 100644
--- a/keyboards/planck/keymaps/sigul/keymap.c
+++ b/keyboards/planck/keymaps/sigul/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
     _______, DF(QWERTY), _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______,    _______, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______,    _______, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______,    _______, _______, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______,
     _______, _______,    _______, _______, _______, _______, _______, _______, MUV_DE,  AU_ON,   AU_OFF,  MUV_IN
 ),
diff --git a/keyboards/planck/keymaps/stuartfong1/keymap.c b/keyboards/planck/keymaps/stuartfong1/keymap.c
index 721ffcdc05..f9081ab0a8 100644
--- a/keyboards/planck/keymaps/stuartfong1/keymap.c
+++ b/keyboards/planck/keymaps/stuartfong1/keymap.c
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        XXXXXXX, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, 
+        XXXXXXX, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, 
         XXXXXXX, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,  XXXXXXX, XXXXXXX, XXXXXXX, 
         XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/planck/keymaps/synth_sample/keymap.c b/keyboards/planck/keymaps/synth_sample/keymap.c
index 397e64bbb3..9d0a4b40f2 100644
--- a/keyboards/planck/keymaps/synth_sample/keymap.c
+++ b/keyboards/planck/keymaps/synth_sample/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/synth_wavetable/keymap.c b/keyboards/planck/keymaps/synth_wavetable/keymap.c
index c8c243ee20..6da82ec2f7 100644
--- a/keyboards/planck/keymaps/synth_wavetable/keymap.c
+++ b/keyboards/planck/keymaps/synth_wavetable/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
index d2608ff41f..cdbddf4b55 100644
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ b/keyboards/planck/keymaps/tom/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    C(G(S(KC_4))), QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+    C(G(S(KC_4))), QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/tomkonidas/keymap.c b/keyboards/planck/keymaps/tomkonidas/keymap.c
index c0d4860e12..2cbd93d791 100644
--- a/keyboards/planck/keymaps/tomkonidas/keymap.c
+++ b/keyboards/planck/keymaps/tomkonidas/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/unagi/keymap.c b/keyboards/planck/keymaps/unagi/keymap.c
index 1ab53ba02e..ba3a49b03f 100644
--- a/keyboards/planck/keymaps/unagi/keymap.c
+++ b/keyboards/planck/keymaps/unagi/keymap.c
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/via/keymap.c b/keyboards/planck/keymaps/via/keymap.c
index b82efcf82e..09b9cee192 100644
--- a/keyboards/planck/keymaps/via/keymap.c
+++ b/keyboards/planck/keymaps/via/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Utility
     * ,-----------------------------------------------------------------------------------.
-    * |      |QK_BOOT |DEBUG |      |      |      |      |      |      |      |      |Del   |
+    * |      |Boot  |Debug |      |      |      |      |      |      |      |      |Del   |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |      |      |      |      |      |      |      |      |      |      |      |      |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-----------------------------------------------------------------------------------'
     */
     [3] = LAYOUT_ortho_4x12 (
-        KC_TRNS, QK_BOOT,   DEBUG,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
+        KC_TRNS, QK_BOOT, DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/planck/keymaps/via/readme.md b/keyboards/planck/keymaps/via/readme.md
index 4e074ce39e..d859cbf95b 100644
--- a/keyboards/planck/keymaps/via/readme.md
+++ b/keyboards/planck/keymaps/via/readme.md
@@ -5,4 +5,4 @@ Predefined Layers:
 - 0 - Default Planck QWERTY keymap (minus lighting control, plus SHIFT ENTER)
 - 1 - Default Planck LOWER keymap
 - 2 - Default Planck RAISE keymap
-- 3 - UTILITY keymap (QK_BOOT, DEBUG)
+- 3 - UTILITY keymap (QK_BOOT, DB_TOGG)
diff --git a/keyboards/planck/keymaps/vxid/keymap.c b/keyboards/planck/keymaps/vxid/keymap.c
index 397befcdda..82f28667fa 100644
--- a/keyboards/planck/keymaps/vxid/keymap.c
+++ b/keyboards/planck/keymaps/vxid/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_planck_grid(
-    QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/winternebs/keymap.c b/keyboards/planck/keymaps/winternebs/keymap.c
index 614d1c1e92..8b2bb65034 100755
--- a/keyboards/planck/keymaps/winternebs/keymap.c
+++ b/keyboards/planck/keymaps/winternebs/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------
- * |QK_BOOT |DEBUG|       |Aud on|Audoff|      |      |      |      |      |      |Reset |
+ * | Boot |Debug |       |Aud on|Audoff|      |      |      |      |      |      |Reset |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |QWERTY|WORKMAN|      |      | Help |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    QK_BOOT, DEBUG,   _______, _______, AU_ON,    AU_OFF, _______, _______, _______, _______, _______, _______ ,
+    QK_BOOT, DB_TOGG, _______, _______, AU_ON,    AU_OFF, _______, _______, _______, _______, _______, _______ ,
     _______, _______, _______, QWERTY, WORKMAN , _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  KC_VOLU, KC_MPLY,
     MAGIC_TOGGLE_NKRO, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/planck/keymaps/yhaliaw/keymap.c b/keyboards/planck/keymaps/yhaliaw/keymap.c
index 8b7851cee6..ec76a55c37 100644
--- a/keyboards/planck/keymaps/yhaliaw/keymap.c
+++ b/keyboards/planck/keymaps/yhaliaw/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        _______, L_RESET, DEBUG,   EEP_RST, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+        _______, L_RESET, DB_TOGG, EEP_RST, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
         _______, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_SWAP, AG_NORM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, XXXXXXX, XXXXXXX, MU_ON,   MU_OFF,  NK_ON,   NK_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/thk/keymaps/thk/keymap.c b/keyboards/planck/thk/keymaps/thk/keymap.c
index effac4d90d..8df45e8733 100644
--- a/keyboards/planck/thk/keymaps/thk/keymap.c
+++ b/keyboards/planck/thk/keymaps/thk/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
   _______, _______, _______,  _______,   _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
   _______, _______,  _______,  _______,   _______,  _______,   _______,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
index 91812966fd..24d02f1edd 100644
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c
index edf96db2e9..872040f023 100644
--- a/keyboards/preonic/keymaps/badger/keymap.c
+++ b/keyboards/preonic/keymaps/badger/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST_ORTHO]   = LAYOUT_preonic_2x2u(
       KC_ESC,   AU_ON,    AU_OFF,   CK_TOGG,  CK_UP,    CK_DOWN,  CK_RST,   MU_ON,    MU_OFF,   MU_TOG,   MU_MOD,   KC_DEL,  \
       _______,  NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
-      _______,  GE_SWAP,  GE_NORM,  DEBUG,    AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
+      _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
       _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
       _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______)
 };
diff --git a/keyboards/preonic/keymaps/blake-newman/keymap.c b/keyboards/preonic/keymaps/blake-newman/keymap.c
index 311a96f15e..9c6db3777e 100644
--- a/keyboards/preonic/keymaps/blake-newman/keymap.c
+++ b/keyboards/preonic/keymaps/blake-newman/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
   [_ADJUST] = LAYOUT_preonic_1x2uC( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,  \
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,  \
     KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  NUMPAD,  KC_INS,  \
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
diff --git a/keyboards/preonic/keymaps/boy314/keymap.c b/keyboards/preonic/keymaps/boy314/keymap.c
index 85d3ecb9fe..a19c69ab6f 100644
--- a/keyboards/preonic/keymaps/boy314/keymap.c
+++ b/keyboards/preonic/keymaps/boy314/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  DVORAK,  _______, _______, _______, _______, \
   _______, ARROWS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/codecoffeecode/keymap.c b/keyboards/preonic/keymaps/codecoffeecode/keymap.c
index c41c9757cf..8b1da584b4 100644
--- a/keyboards/preonic/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/preonic/keymaps/codecoffeecode/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [2] = LAYOUT_preonic_1x2uC(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, KC_F12,  _______,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_F12,  _______,
   _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/cranium/keymap.c b/keyboards/preonic/keymaps/cranium/keymap.c
index c423d8dac4..347b1f6431 100644
--- a/keyboards/preonic/keymaps/cranium/keymap.c
+++ b/keyboards/preonic/keymaps/cranium/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, KC_PSCR
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c
index 0d886ba451..0d4e193b6b 100644
--- a/keyboards/preonic/keymaps/default/keymap.c
+++ b/keyboards/preonic/keymaps/default/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/drasbeck/keymap.c b/keyboards/preonic/keymaps/drasbeck/keymap.c
index b1ea59905e..f938918e33 100644
--- a/keyboards/preonic/keymaps/drasbeck/keymap.c
+++ b/keyboards/preonic/keymaps/drasbeck/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/dudeofawesome/keymap.c b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
index b5c308d2fd..f6f190e282 100644
--- a/keyboards/preonic/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/ekis_isa/keymap.c b/keyboards/preonic/keymaps/ekis_isa/keymap.c
index 04051a865e..c196d3607f 100644
--- a/keyboards/preonic/keymaps/ekis_isa/keymap.c
+++ b/keyboards/preonic/keymaps/ekis_isa/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/elisiano/keymap.c b/keyboards/preonic/keymaps/elisiano/keymap.c
index 6534b31d21..72757e9214 100644
--- a/keyboards/preonic/keymaps/elisiano/keymap.c
+++ b/keyboards/preonic/keymaps/elisiano/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______,    _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______,    _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,     COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TG(_MOUSE), _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/fig-r/keymap.c b/keyboards/preonic/keymaps/fig-r/keymap.c
index 8dcf7d318a..4232adc68d 100644
--- a/keyboards/preonic/keymaps/fig-r/keymap.c
+++ b/keyboards/preonic/keymaps/fig-r/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/fsck/keymap.c b/keyboards/preonic/keymaps/fsck/keymap.c
index cb73083249..09cc5b6a96 100644
--- a/keyboards/preonic/keymaps/fsck/keymap.c
+++ b/keyboards/preonic/keymaps/fsck/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/keelhauler/keymap.c b/keyboards/preonic/keymaps/keelhauler/keymap.c
index 8a1c01617c..c542abf2c5 100644
--- a/keyboards/preonic/keymaps/keelhauler/keymap.c
+++ b/keyboards/preonic/keymaps/keelhauler/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/kuatsure/keymap.c b/keyboards/preonic/keymaps/kuatsure/keymap.c
index becb8dc559..19860945ed 100644
--- a/keyboards/preonic/keymaps/kuatsure/keymap.c
+++ b/keyboards/preonic/keymaps/kuatsure/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      | MAKE | FLSH |      |      |      |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | QK_BOOT| DEBUG|      |      |Aud on|AudOff|      |      |      |      |      |
+ * |      | Boot | Debug|      |      |Aud on|AudOff|      |      |      |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      | VRSN |      |      |MusMod|Mus on|MusOff|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid_wrapper( \
   ____________FUNCTION_1____________, ____________FUNCTION_2____________, ____________FUNCTION_3____________, \
   _______, KB_MAKE, KB_FLSH, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, \
+  _______, QK_BOOT, DB_TOGG, _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, \
   _______, KB_VRSN, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,  GAME,    _______, _______  \
 ),
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index fd0f250ec8..a64469051a 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -277,7 +277,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_preonic_grid( \
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,
-        KC_TAB,  QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
+        KC_TAB,  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
     /*_______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,	 QWERTY,  COLEMAK, DVORAK,  _______, _______, \ Remove this if adding Colemak and Dvorak*/
         _______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,   QWERTY,  QWWIN,   _______, _______, KC_F12,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
diff --git a/keyboards/preonic/keymaps/mechmaster48/keymap.c b/keyboards/preonic/keymaps/mechmaster48/keymap.c
index 3d89d25d35..b7959a170a 100644
--- a/keyboards/preonic/keymaps/mechmaster48/keymap.c
+++ b/keyboards/preonic/keymaps/mechmaster48/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/mguterl/keymap.c b/keyboards/preonic/keymaps/mguterl/keymap.c
index dcbb16d612..4493a959f7 100644
--- a/keyboards/preonic/keymaps/mguterl/keymap.c
+++ b/keyboards/preonic/keymaps/mguterl/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  TG_GAME, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  TG_GAME, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/mikethetiger/keymap.c b/keyboards/preonic/keymaps/mikethetiger/keymap.c
index a927793a4f..347e982612 100644
--- a/keyboards/preonic/keymaps/mikethetiger/keymap.c
+++ b/keyboards/preonic/keymaps/mikethetiger/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
diff --git a/keyboards/preonic/keymaps/muzfuz/keymap.c b/keyboards/preonic/keymaps/muzfuz/keymap.c
index 1b32c2143e..fb8a908b17 100644
--- a/keyboards/preonic/keymaps/muzfuz/keymap.c
+++ b/keyboards/preonic/keymaps/muzfuz/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [_ADJUST] = LAYOUT_preonic_grid(
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
-        _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
         _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
         _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index 15bd9d9e80..7ec473985a 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -228,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC (
-  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
+  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index 48cb4b8c34..3b6202b01d 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -204,7 +204,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_2x2u (
-  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,   QK_BOOT,
+  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
diff --git a/keyboards/preonic/keymaps/pezhore/keymap.c b/keyboards/preonic/keymaps/pezhore/keymap.c
index 059ec0e942..722f68bcd0 100644
--- a/keyboards/preonic/keymaps/pezhore/keymap.c
+++ b/keyboards/preonic/keymaps/pezhore/keymap.c
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-  _______,  QK_BOOT,  DEBUG,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
+  _______,  QK_BOOT,  DB_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
   _______,  _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  _______,  _______,  _______,  _______,  _______,
   _______,  MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/preonic/keymaps/pitty/keymap.c b/keyboards/preonic/keymaps/pitty/keymap.c
index 03b1fdd806..5705ae97b8 100644
--- a/keyboards/preonic/keymaps/pitty/keymap.c
+++ b/keyboards/preonic/keymaps/pitty/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
index 509cd3fddf..8e0d5c330a 100644
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ b/keyboards/preonic/keymaps/senseored/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  TO(_GAMEMODE), QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
+  TO(_GAMEMODE), QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______, _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
diff --git a/keyboards/preonic/keymaps/via/keymap.c b/keyboards/preonic/keymaps/via/keymap.c
index 40d5340d9a..0074373d08 100644
--- a/keyboards/preonic/keymaps/via/keymap.c
+++ b/keyboards/preonic/keymaps/via/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT,   DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/yhaliaw/keymap.c b/keyboards/preonic/keymaps/yhaliaw/keymap.c
index 2528061898..122c24bc26 100644
--- a/keyboards/preonic/keymaps/yhaliaw/keymap.c
+++ b/keyboards/preonic/keymaps/yhaliaw/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_preonic_grid(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, L_RESET, DEBUG,   EEP_RST, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+        _______, L_RESET, DB_TOGG, EEP_RST, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
         _______, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_SWAP, AG_NORM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, XXXXXXX, XXXXXXX, MU_ON,   MU_OFF,  NK_ON,   NK_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c
index 0192ba38a7..ac590116ab 100644
--- a/keyboards/redox/keymaps/jeherve/keymap.c
+++ b/keyboards/redox/keymaps/jeherve/keymap.c
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,QK_BOOT,DEBUG   ,AU_TOG  ,XXXXXXX ,_______ ,
+     _______ ,XXXXXXX ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,QK_BOOT ,DB_TOGG ,AU_TOG  ,XXXXXXX ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 0d73b7a606..7e56c68605 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -288,7 +288,7 @@ lookup_table_t lookup_table[333] =
  {"KC_GT", KC_GT},
  {"KC_QUES", KC_QUES},
  {"RESET", QK_BOOT},
- {"DEBUG", DEBUG},
+ {"DB_TOGG", DB_TOGG},
  {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},
  {"KC_GESC", KC_GESC},
  {"AU_ON", AU_ON},
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index b8c7c19ea0..c0381f116e 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -370,7 +370,7 @@ qmk_dict = {
     ">>|": "KC_MNXT", "|<<": "KC_MPRV", "play/ps": "KC_MPLY",
     "Bri +": "KC_BRIU", "Bri -": "KC_BRID",
     # Quantum Keycodes
-    "_reset": "QK_BOOT", "_debug": "DEBUG", "_eep_re": "EEP_RST",
+    "_reset": "QK_BOOT", "_debug": "DB_TOGG", "_eep_re": "EEP_RST",
     # Audio Keys missing
     # Backlighting
     "Led 0": "BL_TOGG", "Led +": "BL_INC", "Led -": "BL_DEC", "Led ~": "BL_BRTG",
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
index 9794a557f4..c98219a755 100644
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______,                                     _______, _______, KC_UP,   _______, _______, RGB_TOG,
       _______, _______, _______, _______, _______, _______,                                     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_HUI,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
-                                 _______, _______, _______, _______, _______, _______, _______, QK_BOOT, DEBUG,   _______
+                                 _______, _______, _______, _______, _______, _______, _______, QK_BOOT, DB_TOGG, _______
     ),
 // /*
 //  * Layer template
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
index c35b209ff6..49833c0436 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
@@ -218,9 +218,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Adjust Layer: Default layer settings, RGB
  *
  * ,-------------------------------------------.                              ,-------------------------------------------.
- * | NumPad |      |      |QWERTY|      |      |                              |      |      |      |      |      | QK_BOOT  |
+ * | NumPad |      |      |QWERTY|      |      |                              |      |      |      |      |      |  Boot  |
  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * | Mouse  |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  | DEBUG  |
+ * | Mouse  |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  | Debug  |
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
  * |Nav Perm|      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD | EEP_RST|
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [_ADJUST] = LAYOUT(
       NUMPAD , _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, QK_BOOT,
-      MOUSE  , _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, DEBUG  ,
+      MOUSE  , _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, DB_TOGG  ,
       DNAV   , _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, EEPROM_RESET,
                                  _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
index cbe65ba53a..13dc8bd476 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * Adjust Layer: Function keys, RGB
      *
      * ,-------------------------------------------.                              ,-------------------------------------------.
-     * | QK_BOOT  |QK_BOOT |DEBUG |      |      |      |                              |      | F1   |  F2  | F3   | F4   |        |
+     * |  Boot  | Boot |Debug |      |      |      |                              |      | F1   |  F2  | F3   | F4   |        |
      * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
      * |        | TOG  | SAI  | HUI  | VAI  | MOD  |                              |      | F5   |  F6  | F7   | F8   |        |
      * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
index 606648cf16..c9bc442a67 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
+++ b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT(
-      QK_BOOT,  _______,  AG_NORM,  AG_SWAP,  DEBUG, KC_TRNS,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+      QK_BOOT,  _______,  AG_NORM,  AG_SWAP,  DB_TOGG, KC_TRNS,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,           KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
     RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,           KC_MINS,    KC_INT1,  KC_COMM,   KC_DOT,  KC_BSLS,
                                   KC_TRNS,KC_TRNS,           KC_TRNS,  KC_TRNS
diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
index 1507e21056..b43cdab8da 100644
--- a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
+++ b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
         _______, _______,   _______, _______, _______, EEP_RST, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
-        _______, _______,   _______, _______, _______, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            _______, _______, _______, _______,
+        _______, _______,   _______, _______, _______, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            _______, _______, _______, _______,
         _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
         _______, _______,   _______, _______,                                              _______,                            _______, _______,                     _______,            _______,          _______
     )
diff --git a/keyboards/tzarc/djinn/keymaps/default/keymap.c b/keyboards/tzarc/djinn/keymaps/default/keymap.c
index 14239dc45a..3523c9ab6b 100644
--- a/keyboards/tzarc/djinn/keymaps/default/keymap.c
+++ b/keyboards/tzarc/djinn/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______,                                               _______
     ),
     [_ADJUST] = LAYOUT_all(
-        _______, KC_CAPS, KC_NUM,  KC_SCRL, _______,   _______, _______,                             _______, _______, _______, _______, DEBUG,   EEP_RST, QK_BOOT,
+        _______, KC_CAPS, KC_NUM,  KC_SCRL, _______,   _______, _______,                             _______, _______, _______, _______, DB_TOGG, EEP_RST, QK_BOOT,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/tzarc/ghoul/keymaps/default/keymap.c b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
index e64270fe4f..201f204964 100644
--- a/keyboards/tzarc/ghoul/keymaps/default/keymap.c
+++ b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_ADJUST] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, DEBUG,   EEP_RST, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, DB_TOGG, EEP_RST, 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
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
index 1a5fb80177..b17dc4b204 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,        KC_F1, KC_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_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_EQL,  KC_PSLS, KC_PAST,
         KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-        KC_CAPS,      KC_A,  KC_S,DEBUG,  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_CAPS,      KC_A,  KC_S,DB_TOGG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     )
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
index 1a5fb80177..b17dc4b204 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,        KC_F1, KC_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_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_EQL,  KC_PSLS, KC_PAST,
         KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-        KC_CAPS,      KC_A,  KC_S,DEBUG,  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_CAPS,      KC_A,  KC_S,DB_TOGG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
     )
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
index 43331b1d0a..2ef38e25b5 100644
--- a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
@@ -263,7 +263,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // green led layout
   [_LY1] = LAYOUT_ortho_5x15(
     KC_ESC, RGB_TOG, RGB_RMOD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_K, RGB_M_G, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_LY2), DF(_MAIN),
-    DEBUG, KC_PSCR, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+    DB_TOGG, KC_PSCR, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
     QK_BOOT, KC_NO, KC_S, KC_D, KC_F, KC_G, KC_Z, KC_J, KC_K, KC_L, KC_M, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_LSFT,
     KC_NO, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_SCLN, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PEQL, KC_LCBR,
     KC_NO, KC_NO, KC_NO, KC_SPC, KC_SPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS, KC_P0,  KC_P1, KC_P2, KC_P3, KC_TRNS
diff --git a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
index 64e014ae90..2abcb3bfb0 100644
--- a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* SYSTEM
  * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | QK_BOOT  | DEBUG  |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * |  Boot  | Debug  |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        |        |        |        |        |        |RGB_TOG |RGB_VAI |RGB VAD |        |        | PASTE  | PR SCR | SCR LK | PAUSE  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_SYSTEM] = LAYOUT_ortho_5x15( /* FUNCTION */
-    QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, _______, _______, MPASTE,  KC_PSCR, KC_SCRL, KC_PAUSE,
     _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
index 1ba69788ac..22578350c1 100644
--- a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BOTH] = LAYOUT_ortho_5x15(
 	KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, 
-	_______,  QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  _______, _______, _______, 
+	_______,  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  _______, _______, _______, 
 	_______,  _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  STENO,   _______, _______, RGB_M_P, _______, _______, _______, 
 	RGB_MOD,  _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, 
 	RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______)
diff --git a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
index 5ea4bb5a9a..86ca493812 100755
--- a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [1] = LAYOUT_tkl_ansi(
-      QK_BOOT,          EEP_RST, DEBUG, KC_TRNS, 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,          EEP_RST, DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_TOGG, BL_INC,
       KC_TRNS, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DEC,
       KC_TRNS, KC_TRNS, RGB_VAD, RGB_RMOD,RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
diff --git a/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c b/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c
index 6208edcb82..e0f8c00026 100644
--- a/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c
+++ b/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
     ),
     [_ADJUST] = LAYOUT_ortho_4x12(
-        QK_BOOT,   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DEBUG,
+        QK_BOOT,   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG,
         _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
         _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c b/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c
index ec59d43f0a..82daae4080 100644
--- a/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c
+++ b/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, MO(3),   _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
     ),
     [3] = LAYOUT_ortho_4x12(
-        QK_BOOT,   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DEBUG,
+        QK_BOOT,   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG,
         _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
         _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/yynmt/kagamidget/keymaps/default/keymap.c b/keyboards/yynmt/kagamidget/keymaps/default/keymap.c
index 0b480251fe..bb3ded6fa2 100644
--- a/keyboards/yynmt/kagamidget/keymaps/default/keymap.c
+++ b/keyboards/yynmt/kagamidget/keymaps/default/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
   [_ADJUST] = LAYOUT(
-    _______, QK_BOOT,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index dde2425dda..3e83d0626f 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,     KC_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_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
         MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            KC_CPNL,    KC_BRID,
-        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    XXXXXXX,    XXXXXXX,    DEBUG,                              _______,    KC_VOLU,    KC_MUTE,
+        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    XXXXXXX,    XXXXXXX,    DB_TOGG,                            _______,    KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,                KC_MPRV,    KC_VOLD,    KC_MNXT
     ),
     // Glyph Transformation
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index a4d307536c..3f423eedd2 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
-        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DEBUG,      _______,                            KC_VOLU,    KC_MUTE,
+        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DB_TOGG,    _______,                            KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,    KC_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
     )
 };
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index 07ba5e167c..593f8e44b4 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Adjust (Lower + Raise) */
 [_ADJUST] = LAYOUT_ortho_4x12( \
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    QM_MAKE, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \
+    QM_MAKE, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
     QM_FLSH, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/layouts/community/ortho_4x12/bredfield/keymap.c b/layouts/community/ortho_4x12/bredfield/keymap.c
index 64b72bd338..6621cc2483 100644
--- a/layouts/community/ortho_4x12/bredfield/keymap.c
+++ b/layouts/community/ortho_4x12/bredfield/keymap.c
@@ -157,9 +157,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Keyboard
  * ,--------------------------------------------------------------------------------+--------+-----------------.
- * |        |        |        |        |        |        |        |        |        |        |        | QK_BOOT  |
+ * |        |        |        |        |        |        |        |        |        |        |        |  Boot  |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        | DEBUG  |
+ * |        |        |        |        |        |        |        |        |        |        |        | Debug  |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------------------------+--------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_KEYBOARD_LAYER] = LAYOUT_ortho_4x12(
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______
 ),
diff --git a/layouts/community/ortho_4x12/bredfield/readme.md b/layouts/community/ortho_4x12/bredfield/readme.md
index e0f6e3f55e..f43b809167 100644
--- a/layouts/community/ortho_4x12/bredfield/readme.md
+++ b/layouts/community/ortho_4x12/bredfield/readme.md
@@ -95,7 +95,7 @@ This is the layout that I use for all 4x12 boards, for writing and programming.
  * ,--------------------------------------------------------------------------------+--------+-----------------.
  * |        |        |        |        |        |        |        |        |        |        |        | RESET  |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        | DEBUG  |
+ * |        |        |        |        |        |        |        |        |        |        |        | Debug  |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------------------------+--------|
  * |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
index df0f2c6a0f..0f8d380a0d 100644
--- a/layouts/community/ortho_4x12/buswerks/keymap.c
+++ b/layouts/community/ortho_4x12/buswerks/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             ),
 
     [_ADJUST] = LAYOUT_ortho_4x12(
-            _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
+            _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
             _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  GAME,    _______,
             _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
             _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
diff --git a/layouts/community/ortho_4x12/jackhumbert/keymap.c b/layouts/community/ortho_4x12/jackhumbert/keymap.c
index c297a63b37..8941342aa6 100644
--- a/layouts/community/ortho_4x12/jackhumbert/keymap.c
+++ b/layouts/community/ortho_4x12/jackhumbert/keymap.c
@@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
     _______, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_4x12/juno/keymap.c b/layouts/community/ortho_4x12/juno/keymap.c
index 5961b62d28..91499cc298 100644
--- a/layouts/community/ortho_4x12/juno/keymap.c
+++ b/layouts/community/ortho_4x12/juno/keymap.c
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 * `-----------------------------------------------------------------------------------'
 	 */
 	[_ADJUST] = LAYOUT_ortho_4x12(
-		_______, QK_BOOT, DEBUG,    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+		_______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
 		_______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
 		_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_4x12/junonum/keymap.c b/layouts/community/ortho_4x12/junonum/keymap.c
index 45de5a9b74..416949aecc 100644
--- a/layouts/community/ortho_4x12/junonum/keymap.c
+++ b/layouts/community/ortho_4x12/junonum/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_ortho_4x12(
-        _______, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
         _______, AG_NORM, MU_MOD,  AU_ON,   AU_OFF,  CG_NORM, CG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
         _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_4x12/mguterl/keymap.c b/layouts/community/ortho_4x12/mguterl/keymap.c
index ed089d6e6d..7fb99fcd70 100644
--- a/layouts/community/ortho_4x12/mguterl/keymap.c
+++ b/layouts/community/ortho_4x12/mguterl/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    TG_GAME, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    TG_GAME, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c
index 1b66886e6b..4f389240cf 100644
--- a/layouts/community/ortho_5x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
     KC_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    QM_MAKE, QK_BOOT, DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \
+    QM_MAKE, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     QM_FLSH, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index 8ccdf41da6..1ce3a8dd3e 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,    KC_F12,
-    _______, QK_BOOT, DEBUG,   _______, _______, _______, _______, _______, _______,  KC_INS,  KC_PSCR,   KC_DEL,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,  KC_INS,  KC_PSCR,   KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  HUNGARIAN, WORKMAN,
     _______, _______, _______, _______, UC_MOD,  UC_RMOD, NK_TOGG, CG_NORM, CG_SWAP,  _______, _______,   _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______
diff --git a/layouts/community/planck_mit/guidoism/guidoism.json b/layouts/community/planck_mit/guidoism/guidoism.json
index 123bd74182..9c2083bbe8 100644
--- a/layouts/community/planck_mit/guidoism/guidoism.json
+++ b/layouts/community/planck_mit/guidoism/guidoism.json
@@ -1 +1 @@
-{"keyboard":"planck/rev4","keymap":"guidoism","layout":"LAYOUT_planck_mit","layers":[["KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSPC","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_COLN","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_NO","MO(3)","KC_ESC","KC_LALT","KC_LGUI","MO(1)","LSFT_T(KC_SPC)","MO(2)","KC_RGUI","KC_RALT","KC_SCLN","MO(5)"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_NO","KC_NO","KC_UNDO","KC_TRNS","KC_NO","KC_CUT","KC_COPY","KC_PSTE","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_DQUO","KC_QUOT","KC_PIPE","KC_CAPS","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_TRNS","KC_MNXT","KC_VOLD","KC_VOLU","KC_MPLY"],["KC_GRV","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_LBRC","KC_RBRC","KC_LPRN","KC_RPRN","KC_NO","KC_NO","KC_PMNS","KC_PEQL","KC_NO","KC_NO","KC_BSLS","KC_TRNS","KC_LT","KC_GT","KC_LCBR","KC_RCBR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["QK_BOOT","DEBUG","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_UP","KC_PGDN","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LEFT","KC_DOWN","KC_RGHT","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_HOME","KC_NO","KC_END","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PERC","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_DLR","KC_P4","KC_P5","KC_P6","KC_PDOT","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_P0","KC_P1","KC_P2","KC_P3","KC_PCMM","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_P0","KC_NO","KC_NO","KC_TRNS"],["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_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_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"]]}
\ No newline at end of file
+{"keyboard":"planck/rev4","keymap":"guidoism","layout":"LAYOUT_planck_mit","layers":[["KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSPC","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_COLN","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_NO","MO(3)","KC_ESC","KC_LALT","KC_LGUI","MO(1)","LSFT_T(KC_SPC)","MO(2)","KC_RGUI","KC_RALT","KC_SCLN","MO(5)"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_NO","KC_NO","KC_UNDO","KC_TRNS","KC_NO","KC_CUT","KC_COPY","KC_PSTE","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_DQUO","KC_QUOT","KC_PIPE","KC_CAPS","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_TRNS","KC_MNXT","KC_VOLD","KC_VOLU","KC_MPLY"],["KC_GRV","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_LBRC","KC_RBRC","KC_LPRN","KC_RPRN","KC_NO","KC_NO","KC_PMNS","KC_PEQL","KC_NO","KC_NO","KC_BSLS","KC_TRNS","KC_LT","KC_GT","KC_LCBR","KC_RCBR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["QK_BOOT","DB_TOGG","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_UP","KC_PGDN","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LEFT","KC_DOWN","KC_RGHT","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_HOME","KC_NO","KC_END","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PERC","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_DLR","KC_P4","KC_P5","KC_P6","KC_PDOT","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_P0","KC_P1","KC_P2","KC_P3","KC_PCMM","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_P0","KC_NO","KC_NO","KC_TRNS"],["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_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_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"]]}
\ No newline at end of file
diff --git a/layouts/community/planck_mit/guidoism/keymap.c b/layouts/community/planck_mit/guidoism/keymap.c
index 57c1042dbe..df8a64c203 100644
--- a/layouts/community/planck_mit/guidoism/keymap.c
+++ b/layouts/community/planck_mit/guidoism/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
 */
 [_MOVEMENT] = LAYOUT_planck_mit(
-    QK_BOOT, DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_NO, KC_TRNS,
+    QK_BOOT, DB_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_NO, KC_TRNS,
     KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS,
     KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_END, KC_NO, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 1de81b4c0f..4a47b92847 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -4,7 +4,6 @@
 
 // Deprecated Quantum keycodes
 
-#define DEBUG        QK_DEBUG_TOGGLE
 #define GRAVE_ESC    QK_GRAVE_ESCAPE
 #define EEPROM_RESET QK_CLEAR_EEPROM
 
diff --git a/users/jjerrell/wrappers.h b/users/jjerrell/wrappers.h
index ac150a794f..0f10e98249 100644
--- a/users/jjerrell/wrappers.h
+++ b/users/jjerrell/wrappers.h
@@ -319,7 +319,7 @@
 #define __________________RAISE_R3___________________   KC_AT,   KC_QUOT, KC_DQUO, KC_PLUS, KC_CIRC
 
 // Adjust
-#define __________________ADJUST_L1__________________   KC_MAKE, DEBUG,   RESET,   XXXXXXX, XXXXXXX
+#define __________________ADJUST_L1__________________   KC_MAKE, DB_TOGG, RESET,   XXXXXXX, XXXXXXX
 #define __________________ADJUST_L2__________________   KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT
 #define __________________ADJUST_L3__________________   KC_VRSN, AU_ON,   AU_OFF,  CG_SWAP, CG_NORM
 
diff --git a/users/muppetjones/wrappers.h b/users/muppetjones/wrappers.h
index ba94d0eda4..be17f121a1 100644
--- a/users/muppetjones/wrappers.h
+++ b/users/muppetjones/wrappers.h
@@ -65,7 +65,7 @@
  * `----------------------------------' `----------------------------------'
  */
  // NOTE: The "BACKLIT" keycode is planck specific
-#define __ADJUST_L1________________________________ RESET,   DEBUG,   XXXXXXX, XXXXXXX, XXXXXXX
+#define __ADJUST_L1________________________________ RESET,   DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX
 #define __ADJUST_L2________________________________ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD
 #define __ADJUST_L3________________________________ XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX
 
diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h
index a976c71474..394f79f2f3 100644
--- a/users/pdl/pdl.h
+++ b/users/pdl/pdl.h
@@ -132,4 +132,4 @@ enum userspace_layers {
 
 #define _________________FUNCTN_R1_________________  KC_VOLU, KC_F10,  KC_F11,  KC_F12,  KC_INS
 #define _________________FUNCTN_R2_________________  KC_VOLD, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT
-#define _________________FUNCTN_R3_________________  KC_MUTE, KC_PAUS, QWERTY,  PROXIM,  DEBUG
+#define _________________FUNCTN_R3_________________  KC_MUTE, KC_PAUS, QWERTY,  PROXIM,  DB_TOGG
diff --git a/users/ridingqwerty/wrappers.h b/users/ridingqwerty/wrappers.h
index f78219a56c..4bd9182323 100644
--- a/users/ridingqwerty/wrappers.h
+++ b/users/ridingqwerty/wrappers.h
@@ -93,7 +93,7 @@
 #define ________________EDITOR_R3__________________        KC_PGDN, _______, _______, _______, KC_BSLS
 
 
-#define ________________DEBUG_L1___________________        DEBUG,   _______, _______, RNGWORD, SARCASM
+#define ________________DEBUG_L1___________________        DB_TOGG, _______, _______, RNGWORD, SARCASM
 #define ________________DEBUG_L2___________________        GREEK,   RUSSIAN, HIRAGAN, RUNES,   _______
 #define ________________DEBUG_L3___________________        _______, _______, _______, VERSION, _______
 
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index bdf4584ef1..835a79186b 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -444,7 +444,7 @@ bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
 void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         // Acks follow...
-        case DEBUG:
+        case QK_DEBUG_TOGGLE:
             if (debug_matrix || debug_keyboard)
                 rgb_layer_ack(ACK_HUH);
             else if (debug_enable)
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index b4c261ce1d..0955bef3c3 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -172,7 +172,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         switch (keycode) {
 #ifndef NO_DEBUG
             // Re-implement this here, but fix the persistence!
-            case DEBUG:
+            case QK_DEBUG_TOGGLE:
                 if (get_mods() & MOD_MASK_SHIFT) {
                     debug_enable   = 0;
                     debug_keyboard = 0;
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index 41861a5958..24f6bde468 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -96,7 +96,7 @@
   * ,-----------------------------------------.  ,-----------------------------------------.
   * |      |      |      |      |      |      |  |      |      |      |      |      |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-  * |      | RESET| DEBUG|      |      |      |  |      |      |      |   |      |      |
+  * |      | RESET| Debug|      |      |      |  |      |      |      |   |      |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
   * |      |      |MusMod|Aud on|AudOff|AGnorm|  |AGswap|ClkUp |ClkDwn|      |      |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
@@ -107,7 +107,7 @@
   */
 
 #define _________________ADJUST_L1_________________ _______,  _______,  _______,  _______,  _______,  _______
-#define _________________ADJUST_L2_________________ _______,  RESET,    DEBUG,    _______,  _______,  _______
+#define _________________ADJUST_L2_________________ _______,  RESET,    DB_TOGG,  _______,  _______,  _______
 #define _________________ADJUST_L3_________________ _______,  _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM
 #define _________________ADJUST_L4_________________ _______,  MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON
 #define _________________ADJUST_L5_________________ _______,  _______,  _______,  _______,  _______,  _______

From aa8e0a3e7aa9268136fea31d5fd5832e91c0ccc4 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 19 Oct 2022 17:43:25 +0100
Subject: [PATCH 672/959] Build correctly when out of tree (#18775)

---
 builddefs/build_keyboard.mk             |  4 ++--
 lib/python/qmk/cli/generate/config_h.py | 24 +++++++++++++++---------
 lib/python/qmk/cli/generate/rules_mk.py | 24 +++++++++++++++---------
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index c137639eac..cfec9cdebe 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -162,7 +162,7 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
     -include $(KEYMAP_PATH)/rules.mk
 
     # Load any rules.mk content from keymap.json
-    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/src/rules.mk)
+    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(KEYMAP_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
     include $(INFO_RULES_MK)
 
 # Add rules to generate the keymap files - indentation here is important
@@ -173,7 +173,7 @@ $(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
 
 $(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H))
+	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
 generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 3752174841..fa7c43788d 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -1,15 +1,16 @@
 """Used by the make system to generate info_config.h from info.json.
 """
 from pathlib import Path
-
 from dotty_dict import dotty
+
+from argcomplete.completers import FilesCompleter
 from milc import cli
 
-from qmk.info import info_json, keymap_json_config
+from qmk.info import info_json
 from qmk.json_schema import json_load
 from qmk.keyboard import keyboard_completer, keyboard_folder
-from qmk.commands import dump_lines
-from qmk.path import normpath
+from qmk.commands import dump_lines, parse_configurator_json
+from qmk.path import normpath, FileType
 from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
@@ -162,19 +163,24 @@ def generate_led_animations_config(led_feature_json, config_h_lines, prefix):
             config_h_lines.append(generate_define(f'{prefix}{animation.upper()}'))
 
 
+@cli.argument('filename', nargs='?', arg_only=True, type=FileType('r'), completer=FilesCompleter('.json'), help='A configurator export JSON to be compiled and flashed or a pre-compiled binary firmware file (bin/hex) to be flashed.')
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
-@cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, required=True, help='Keyboard to generate config.h for.')
-@cli.argument('-km', '--keymap', arg_only=True, help='Keymap to generate config.h for.')
+@cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, help='Keyboard to generate config.h for.')
 @cli.subcommand('Used by the make system to generate info_config.h from info.json', hidden=True)
 def generate_config_h(cli):
     """Generates the info_config.h file.
     """
     # Determine our keyboard/keymap
-    if cli.args.keymap:
-        kb_info_json = dotty(keymap_json_config(cli.args.keyboard, cli.args.keymap))
-    else:
+    if cli.args.filename:
+        user_keymap = parse_configurator_json(cli.args.filename)
+        kb_info_json = user_keymap.get('config', {})
+    elif cli.args.keyboard:
         kb_info_json = dotty(info_json(cli.args.keyboard))
+    else:
+        cli.log.error('You must supply a configurator export or `--keyboard`.')
+        cli.subcommands['generate-config-h'].print_help()
+        return False
 
     # Build the info_config.h file.
     config_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 9623d00fb5..361d3c758a 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -1,15 +1,16 @@
 """Used by the make system to generate a rules.mk
 """
 from pathlib import Path
-
 from dotty_dict import dotty
+
+from argcomplete.completers import FilesCompleter
 from milc import cli
 
-from qmk.info import info_json, keymap_json_config
+from qmk.info import info_json
 from qmk.json_schema import json_load
 from qmk.keyboard import keyboard_completer, keyboard_folder
-from qmk.commands import dump_lines
-from qmk.path import normpath
+from qmk.commands import dump_lines, parse_configurator_json
+from qmk.path import normpath, FileType
 from qmk.constants import GPL2_HEADER_SH_LIKE, GENERATED_HEADER_SH_LIKE
 
 
@@ -39,20 +40,25 @@ def process_mapping_rule(kb_info_json, rules_key, info_dict):
     return f'{rules_key} ?= {rules_value}'
 
 
+@cli.argument('filename', nargs='?', arg_only=True, type=FileType('r'), completer=FilesCompleter('.json'), help='A configurator export JSON to be compiled and flashed or a pre-compiled binary firmware file (bin/hex) to be flashed.')
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
 @cli.argument('-e', '--escape', arg_only=True, action='store_true', help="Escape spaces in quiet mode")
-@cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, required=True, help='Keyboard to generate rules.mk for.')
-@cli.argument('-km', '--keymap', arg_only=True, help='Keymap to generate rules.mk for.')
+@cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, help='Keyboard to generate rules.mk for.')
 @cli.subcommand('Used by the make system to generate rules.mk from info.json', hidden=True)
 def generate_rules_mk(cli):
     """Generates a rules.mk file from info.json.
     """
     # Determine our keyboard/keymap
-    if cli.args.keymap:
-        kb_info_json = dotty(keymap_json_config(cli.args.keyboard, cli.args.keymap))
-    else:
+    if cli.args.filename:
+        user_keymap = parse_configurator_json(cli.args.filename)
+        kb_info_json = user_keymap.get('config', {})
+    elif cli.args.keyboard:
         kb_info_json = dotty(info_json(cli.args.keyboard))
+    else:
+        cli.log.error('You must supply a configurator export or `--keyboard`.')
+        cli.subcommands['generate-rules-mk'].print_help()
+        return False
 
     info_rules_map = json_load(Path('data/mappings/info_rules.json'))
     rules_mk_lines = [GPL2_HEADER_SH_LIKE, GENERATED_HEADER_SH_LIKE]

From 04e51d7aa8ce0e9aa394b878177aecf4e9e70b59 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 19 Oct 2022 13:58:47 -0700
Subject: [PATCH 673/959] Delikeeb Vaneela Configurator Fix (#18777)

* info.json: fix layout reference

`LAYOUT` -> `LAYOUT_ortho_5x12`

* info.json: apply friendly formatting

* info.json: correct maintainer value
---
 keyboards/delikeeb/vaneela/info.json | 368 +++++----------------------
 1 file changed, 66 insertions(+), 302 deletions(-)

diff --git a/keyboards/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json
index 8f114b1778..6b4ca022f7 100644
--- a/keyboards/delikeeb/vaneela/info.json
+++ b/keyboards/delikeeb/vaneela/info.json
@@ -2,315 +2,79 @@
     "keyboard_name": "Vaneela",
     "manufacturer": "noclew",
     "url": "http://www.keyboard-layout-editor.com/#/gists/be89ff3a761a44280296994d459bd0a9",
-    "maintainer": "qmk",
+    "maintainer": "noclew",
     "usb": {
         "vid": "0x9906",
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_5x12": {
             "layout": [
-                {
-                    "label": "`",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": ":)",
-                    "x": 11,
-                    "y": 0,
-                    "w": 1.5
-                },
-                {
-                    "label": "TAB",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 6,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 7,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "label": "BS",
-                    "x": 11,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "ESC",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 1.25,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.25,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.25,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.25,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.25,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 6.25,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 7.25,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 8.25,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 9.25,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 10.25,
-                    "y": 2
-                },
-                {
-                    "label": "ENTER",
-                    "x": 11.25,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "SHIFT",
-                    "x": 0,
-                    "y": 3,
-                    "w": 1.5
-                },
-                {
-                    "label": "Z",
-                    "x": 1.5,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 2.5,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 3.5,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 4.5,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 5.5,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 6.5,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 7.5,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 8.5,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 9.5,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 10.5,
-                    "y": 3
-                },
-                {
-                    "label": "SHIFT",
-                    "x": 11.5,
-                    "y": 3
-                },
-                {
-                    "label": "CTRL",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "GUI",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "label": "ALT",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "label": "LOWER",
-                    "x": 4,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "x": 6.25,
-                    "y": 4
-                },
-                {
-                    "label": "RAISE",
-                    "x": 7.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 8.5,
-                    "y": 4
-                },
-                {
-                    "x": 9.5,
-                    "y": 4
-                },
-                {
-                    "x": 10.5,
-                    "y": 4
-                },
-                {
-                    "x": 11.5,
-                    "y": 4
-                }
+                {"label":"`", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":":)", "x":11, "y":0, "w":1.5},
+
+                {"label":"TAB", "x":0, "y":1},
+                {"label":"Q", "x":1, "y":1},
+                {"label":"W", "x":2, "y":1},
+                {"label":"E", "x":3, "y":1},
+                {"label":"R", "x":4, "y":1},
+                {"label":"T", "x":5, "y":1},
+                {"label":"Y", "x":6, "y":1},
+                {"label":"U", "x":7, "y":1},
+                {"label":"I", "x":8, "y":1},
+                {"label":"O", "x":9, "y":1},
+                {"label":"P", "x":10, "y":1},
+                {"label":"BS", "x":11, "y":1, "w":1.5},
+
+                {"label":"ESC", "x":0, "y":2, "w":1.25},
+                {"label":"A", "x":1.25, "y":2},
+                {"label":"S", "x":2.25, "y":2},
+                {"label":"D", "x":3.25, "y":2},
+                {"label":"F", "x":4.25, "y":2},
+                {"label":"G", "x":5.25, "y":2},
+                {"label":"H", "x":6.25, "y":2},
+                {"label":"J", "x":7.25, "y":2},
+                {"label":"K", "x":8.25, "y":2},
+                {"label":"L", "x":9.25, "y":2},
+                {"label":";", "x":10.25, "y":2},
+                {"label":"ENTER", "x":11.25, "y":2, "w":1.25},
+
+                {"label":"SHIFT", "x":0, "y":3, "w":1.5},
+                {"label":"Z", "x":1.5, "y":3},
+                {"label":"X", "x":2.5, "y":3},
+                {"label":"C", "x":3.5, "y":3},
+                {"label":"V", "x":4.5, "y":3},
+                {"label":"B", "x":5.5, "y":3},
+                {"label":"N", "x":6.5, "y":3},
+                {"label":"M", "x":7.5, "y":3},
+                {"label":",", "x":8.5, "y":3},
+                {"label":".", "x":9.5, "y":3},
+                {"label":"/", "x":10.5, "y":3},
+                {"label":"SHIFT", "x":11.5, "y":3},
+
+                {"label":"CTRL", "x":0, "y":4},
+                {"label":"CTRL", "x":1, "y":4},
+                {"label":"GUI", "x":2, "y":4},
+                {"label":"ALT", "x":3, "y":4},
+                {"label":"LOWER", "x":4, "y":4, "w":1.25},
+                {"label":"SPACE", "x":5.25, "y":4},
+                {"label":"SPACE", "x":6.25, "y":4},
+                {"label":"RAISE", "x":7.25, "y":4, "w":1.25},
+                {"label":"LEFT", "x":8.5, "y":4},
+                {"label":"DOWN", "x":9.5, "y":4},
+                {"label":"UP", "x":10.5, "y":4},
+                {"label":"RIGHT", "x":11.5, "y":4}
             ]
         }
     }

From ada77ac291f864e87f119f5c20d5fbcc489c3700 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 19 Oct 2022 17:49:37 -0700
Subject: [PATCH 674/959] Ano Layout Refactor (#18778)

* info.json: apply friendly formatting

* info.json: remove dead space in Configurator rendering

* physically arrange layout macro

* info.json: correct Configurator key sequence
---
 keyboards/ano/ano.h                    |  14 ++--
 keyboards/ano/info.json                | 110 ++++++++++++++++++++++++-
 keyboards/ano/keymaps/default/keymap.c |  36 ++++----
 3 files changed, 131 insertions(+), 29 deletions(-)

diff --git a/keyboards/ano/ano.h b/keyboards/ano/ano.h
index ecbebec4c8..46719ab5b3 100644
--- a/keyboards/ano/ano.h
+++ b/keyboards/ano/ano.h
@@ -13,18 +13,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #pragma once
 
 #include "quantum.h"
 
 #define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,                   		\
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, K316, K317, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, \
-	K500, K501, K502,                   K506,                   K510, K511, K512, K513, K514, K515, K516, K517  \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,                   K117, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K217, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K317, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, K316, K417, \
+    K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416,       \
+    K500, K501, K502,                   K506,                   K510, K511, K512, K513, K514, K515, K516, K517  \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, KC_NO, KC_NO, KC_NO }, \
 	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117 }, \
diff --git a/keyboards/ano/info.json b/keyboards/ano/info.json
index 63c994c173..d5ac34a1bc 100644
--- a/keyboards/ano/info.json
+++ b/keyboards/ano/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "Ano", 
+    "keyboard_name": "Ano",
     "manufacturer": "Sebastien Sauve-Hoover",
-    "url": "https://github.com/sauvehoo", 
-    "maintainer": "sauvehoo", 
+    "url": "https://github.com/sauvehoo",
+    "maintainer": "sauvehoo",
     "usb": {
         "vid": "0x8372",
         "pid": "0x0651",
@@ -10,7 +10,109 @@
     },
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0.25, "y":0.25}, {"label":"F1", "x":1.5, "y":0.25}, {"label":"F2", "x":2.5, "y":0.25}, {"label":"F3", "x":3.5, "y":0.25}, {"label":"F4", "x":4.5, "y":0.25}, {"label":"F5", "x":5.75, "y":0.25}, {"label":"F6", "x":6.75, "y":0.25}, {"label":"F7", "x":7.75, "y":0.25}, {"label":"F8", "x":8.75, "y":0.25}, {"label":"F9", "x":10, "y":0.25}, {"label":"F10", "x":11, "y":0.25}, {"label":"F11", "x":12, "y":0.25}, {"label":"F12", "x":13, "y":0.25}, {"label":"Delete", "x":14.25, "y":0.25}, {"label":"Encoder", "x":18.25, "y":0.25}, {"label":"~", "x":0.25, "y":1.5}, {"label":"!", "x":1.25, "y":1.5}, {"label":"@", "x":2.25, "y":1.5}, {"label":"#", "x":3.25, "y":1.5}, {"label":"$", "x":4.25, "y":1.5}, {"label":"%", "x":5.25, "y":1.5}, {"label":"^", "x":6.25, "y":1.5}, {"label":"&", "x":7.25, "y":1.5}, {"label":"*", "x":8.25, "y":1.5}, {"label":"(", "x":9.25, "y":1.5}, {"label":")", "x":10.25, "y":1.5}, {"label":"_", "x":11.25, "y":1.5}, {"label":"+", "x":12.25, "y":1.5}, {"label":"Backspace", "x":13.25, "y":1.5, "w":2}, {"label":"Num Lock", "x":15.25, "y":1.5}, {"label":"/", "x":16.25, "y":1.5}, {"label":"*", "x":17.25, "y":1.5}, {"label":"*", "x":18.25, "y":1.5}, {"label":"Tab", "x":0.25, "y":2.5, "w":1.5}, {"label":"Q", "x":1.75, "y":2.5}, {"label":"W", "x":2.75, "y":2.5}, {"label":"E", "x":3.75, "y":2.5}, {"label":"R", "x":4.75, "y":2.5}, {"label":"T", "x":5.75, "y":2.5}, {"label":"Y", "x":6.75, "y":2.5}, {"label":"U", "x":7.75, "y":2.5}, {"label":"I", "x":8.75, "y":2.5}, {"label":"O", "x":9.75, "y":2.5}, {"label":"P", "x":10.75, "y":2.5}, {"label":"{", "x":11.75, "y":2.5}, {"label":"}", "x":12.75, "y":2.5}, {"label":"|", "x":13.75, "y":2.5, "w":1.5}, {"label":"7", "x":15.25, "y":2.5}, {"label":"8", "x":16.25, "y":2.5}, {"label":"9", "x":17.25, "y":2.5}, {"label":"-", "x":18.25, "y":2.5}, {"label":"Caps Lock", "x":0.25, "y":3.5, "w":1.75}, {"label":"A", "x":2, "y":3.5}, {"label":"S", "x":3, "y":3.5}, {"label":"D", "x":4, "y":3.5}, {"label":"F", "x":5, "y":3.5}, {"label":"G", "x":6, "y":3.5}, {"label":"H", "x":7, "y":3.5}, {"label":"J", "x":8, "y":3.5}, {"label":"K", "x":9, "y":3.5}, {"label":"L", "x":10, "y":3.5}, {"label":":", "x":11, "y":3.5}, {"label":"\"", "x":12, "y":3.5}, {"label":"Enter", "x":13, "y":3.5, "w":2.25}, {"label":"4", "x":15.25, "y":3.5}, {"label":"5", "x":16.25, "y":3.5}, {"label":"6", "x":17.25, "y":3.5}, {"label":"+", "x":18.25, "y":3.5}, {"label":"Shift", "x":0.25, "y":4.5, "w":2.25}, {"label":"Z", "x":2.5, "y":4.5}, {"label":"X", "x":3.5, "y":4.5}, {"label":"C", "x":4.5, "y":4.5}, {"label":"V", "x":5.5, "y":4.5}, {"label":"B", "x":6.5, "y":4.5}, {"label":"N", "x":7.5, "y":4.5}, {"label":"M", "x":8.5, "y":4.5}, {"label":"<", "x":9.5, "y":4.5}, {"label":">", "x":10.5, "y":4.5}, {"label":"?", "x":11.5, "y":4.5}, {"label":"Shift", "x":12.5, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.5}, {"label":"1", "x":15.25, "y":4.5}, {"label":"2", "x":16.25, "y":4.5}, {"label":"3", "x":17.25, "y":4.5}, {"label":"Enter", "x":18.25, "y":4.5, "h":2}, {"label":"Ctrl", "x":0.25, "y":5.5, "w":1.25}, {"label":"Win", "x":1.5, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.75, "y":5.5, "w":1.25}, {"x":4, "y":5.5, "w":6.25}, {"label":"Alt", "x":10.25, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":11.75, "y":5.5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}, {"label":"0", "x":16.25, "y":5.5}, {"label":".", "x":17.25, "y":5.5}]
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"Encoder", "x":18, "y":0},
+
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1.25},
+                {"label":"+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Num Lock", "x":15, "y":1.25},
+                {"label":"/", "x":16, "y":1.25},
+                {"label":"*", "x":17, "y":1.25},
+                {"label":"*", "x":18, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"7", "x":15, "y":2.25},
+                {"label":"8", "x":16, "y":2.25},
+                {"label":"9", "x":17, "y":2.25},
+                {"label":"-", "x":18, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":":", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"4", "x":15, "y":3.25},
+                {"label":"5", "x":16, "y":3.25},
+                {"label":"6", "x":17, "y":3.25},
+                {"label":"+", "x":18, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.25},
+                {"label":"1", "x":15, "y":4.25},
+                {"label":"2", "x":16, "y":4.25},
+                {"label":"3", "x":17, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
+                {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":13, "y":5.25},
+                {"label":"\u2193", "x":14, "y":5.25},
+                {"label":"\u2192", "x":15, "y":5.25},
+                {"label":"0", "x":16, "y":5.25},
+                {"label":".", "x":17, "y":5.25},
+                {"label":"Enter", "x":18, "y":4.25, "h":2}
+            ]
         }
     }
 }
diff --git a/keyboards/ano/keymaps/default/keymap.c b/keyboards/ano/keymaps/default/keymap.c
index 676724a8a7..9c366571b0 100644
--- a/keyboards/ano/keymaps/default/keymap.c
+++ b/keyboards/ano/keymaps/default/keymap.c
@@ -16,23 +16,23 @@
  
  #include QMK_KEYBOARD_H
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_all(
-	KC_ESC,	KC_F1,	KC_F2, 	KC_F3, 	KC_F4,	KC_F5,	KC_F6, 	KC_F7, 	KC_F8,	KC_F9, 	KC_F10, KC_F11, KC_F12, 	KC_DEL,         		        		 
-	KC_GRV,	KC_1,	KC_2,	KC_3, 	KC_4, 	KC_5, 	KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, 	KC_MINS,KC_EQL, 	KC_BSPC,		KC_NLCK,KC_PSLS,KC_PAST,KC_MEDIA_PLAY_PAUSE, 
-	KC_TAB,	KC_Q, 	KC_W, 	KC_E, 	KC_R, 	KC_T, 	KC_Y, 	KC_U, 	KC_I, 	KC_O, 	KC_P, 	KC_LBRC,KC_RBRC,	KC_BSLS,		KC_P7, 	KC_P8, 	KC_P9, 	KC_B, 
-	KC_CAPS,KC_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,         		        MO(1),	KC_RCTL,KC_LEFT,	KC_DOWN,		KC_RGHT,KC_P0, 	KC_PDOT,KC_PENT
-   ),
-	
-  [1] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         		        		 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,		KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,			 KC_TRNS,		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	KC_TRNS,				KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     
-	KC_TRNS, KC_TRNS, KC_TRNS,   		                  KC_TRNS,         		        	  KC_TRNS, KC_TRNS,	KC_TRNS, KC_TRNS,		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-   ),
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                                KC_MEDIA_PLAY_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_B,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT,          KC_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_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                               QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
 };

From 1b107baf5666973f6e76e73347d0c45bf245db58 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 20 Oct 2022 00:41:40 -0700
Subject: [PATCH 675/959] Wilba Tech WT65-D Layout Additions (#18779)

---
 keyboards/wilba_tech/wt65_d/info.json | 693 +++++++++++++++++++++++++-
 keyboards/wilba_tech/wt65_d/wt65_d.h  | 128 +++++
 2 files changed, 816 insertions(+), 5 deletions(-)

diff --git a/keyboards/wilba_tech/wt65_d/info.json b/keyboards/wilba_tech/wt65_d/info.json
index 761aefe8be..37d5dfba54 100644
--- a/keyboards/wilba_tech/wt65_d/info.json
+++ b/keyboards/wilba_tech/wt65_d/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "WT65-D", 
+    "keyboard_name": "WT65-D",
     "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech", 
-    "maintainer": "Wilba", 
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
     "usb": {
         "vid": "0x6582",
         "pid": "0x0031",
@@ -10,7 +10,690 @@
     },
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,3", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,1", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,12", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"2,13", "x":14, "y":0}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4}, {"label":"4,2", "x":2.25, "y":4, "w":1.25}, {"label":"4,3", "x":3.5, "y":4, "w":6}, {"label":"4,9", "x":9.5, "y":4, "w":1.25}, {"label":"4,10", "x":10.75, "y":4}, {"label":"4,11", "x":11.75, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"2,13", "x":14, "y":0},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4},
+                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
+                {"label":"4,3", "x":3.5, "y":4, "w":6},
+                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":10.75, "y":4},
+                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4},
+                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
+                {"label":"4,3", "x":3.5, "y":4, "w":6},
+                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":10.75, "y":4},
+                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"2,13", "x":14, "y":0},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4},
+                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
+                {"label":"4,3", "x":3.5, "y":4, "w":6},
+                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":10.75, "y":4},
+                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_wkl": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.5},
+                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
+                {"label":"4,3", "x":3, "y":4, "w":7},
+                {"label":"4,9", "x":10, "y":4, "w":1.5},
+                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_wkl_split_bs": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"2,13", "x":14, "y":0},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.5},
+                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
+                {"label":"4,3", "x":3, "y":4, "w":7},
+                {"label":"4,9", "x":10, "y":4, "w":1.5},
+                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4},
+                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
+                {"label":"4,3", "x":3.5, "y":4, "w":6},
+                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":10.75, "y":4},
+                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_split_bs": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"2,13", "x":14, "y":0},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4},
+                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
+                {"label":"4,3", "x":3.5, "y":4, "w":6},
+                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
+                {"label":"4,10", "x":10.75, "y":4},
+                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_wkl": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.5},
+                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
+                {"label":"4,3", "x":3, "y":4, "w":7},
+                {"label":"4,9", "x":10, "y":4, "w":1.5},
+                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_wkl_split_bs": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,3", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,1", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"0,7", "x":7, "y":0},
+                {"label":"0,8", "x":8, "y":0},
+                {"label":"0,9", "x":9, "y":0},
+                {"label":"0,12", "x":10, "y":0},
+                {"label":"0,11", "x":11, "y":0},
+                {"label":"0,10", "x":12, "y":0},
+                {"label":"0,13", "x":13, "y":0},
+                {"label":"2,13", "x":14, "y":0},
+                {"label":"0,14", "x":15, "y":0},
+
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"1,7", "x":7.5, "y":1},
+                {"label":"1,8", "x":8.5, "y":1},
+                {"label":"1,9", "x":9.5, "y":1},
+                {"label":"1,10", "x":10.5, "y":1},
+                {"label":"1,11", "x":11.5, "y":1},
+                {"label":"1,12", "x":12.5, "y":1},
+                {"label":"1,14", "x":15, "y":1},
+
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"2,7", "x":7.75, "y":2},
+                {"label":"2,8", "x":8.75, "y":2},
+                {"label":"2,9", "x":9.75, "y":2},
+                {"label":"2,10", "x":10.75, "y":2},
+                {"label":"2,11", "x":11.75, "y":2},
+                {"label":"2,12", "x":12.75, "y":2},
+                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"2,14", "x":15, "y":2},
+
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3},
+                {"label":"3,2", "x":2.25, "y":3},
+                {"label":"3,3", "x":3.25, "y":3},
+                {"label":"3,4", "x":4.25, "y":3},
+                {"label":"3,5", "x":5.25, "y":3},
+                {"label":"3,6", "x":6.25, "y":3},
+                {"label":"3,7", "x":7.25, "y":3},
+                {"label":"3,8", "x":8.25, "y":3},
+                {"label":"3,9", "x":9.25, "y":3},
+                {"label":"3,10", "x":10.25, "y":3},
+                {"label":"3,11", "x":11.25, "y":3},
+                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
+                {"label":"3,13", "x":14, "y":3},
+                {"label":"3,14", "x":15, "y":3},
+
+                {"label":"4,0", "x":0, "y":4, "w":1.5},
+                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
+                {"label":"4,3", "x":3, "y":4, "w":7},
+                {"label":"4,9", "x":10, "y":4, "w":1.5},
+                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
+                {"label":"4,12", "x":13, "y":4},
+                {"label":"4,13", "x":14, "y":4},
+                {"label":"4,14", "x":15, "y":4}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/wilba_tech/wt65_d/wt65_d.h b/keyboards/wilba_tech/wt65_d/wt65_d.h
index 4f0b36d075..7ab39e81e7 100644
--- a/keyboards/wilba_tech/wt65_d/wt65_d.h
+++ b/keyboards/wilba_tech/wt65_d/wt65_d.h
@@ -7,6 +7,23 @@
 
 #define ____ KC_NO
 
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ *              │000│003│002│001│004│005│006│007│008│009│012│011│010│013│213│014│    │013    │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ *              │100  │101│102│103│104│105│106│107│108│109│110│111│112│113  │114│      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐113 │ ISO Enter
+ *  LShift      │200   │201│202│203│204│205│206│207│208│209│210│211│212     │214│   │212│    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │300     │   │300 │301│302│303│304│305│306│307│308│309│310│311│312   │313│314│
+ * └────────┘   ├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬─┴──┬───┼───┼───┤
+ *              │400 │401│402 │403                    │409 │410│411 │412│413│414│
+ *              └────┴───┴────┴───────────────────────┴────┴───┴────┴───┴───┴───┘
+ *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐
+ *              │400  │402  │403                        │409  │411  │ WKL
+ *              └─────┴─────┴───────────────────────────┴─────┴─────┘
+ */
+
 #define LAYOUT_all( \
     K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
     K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
@@ -21,3 +38,114 @@
     { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
 }
 
+#define LAYOUT_65_ansi( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+    K400, K401, K402,                   K403,             K409, K410, K411, K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
+    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
+}
+
+#define LAYOUT_65_ansi_split_bs( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
+    K400, K401, K402,                   K403,             K409, K410, K411,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
+}
+
+#define LAYOUT_65_ansi_wkl( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+    K400,       K402,                   K403,             K409,       K411, K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
+    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
+}
+
+#define LAYOUT_65_ansi_wkl_split_bs( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
+    K400,       K402,                   K403,             K409,       K411,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
+}
+
+#define LAYOUT_65_iso( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113, K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+    K400, K401, K402,                   K403,             K409, K410, K411, K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
+}
+
+#define LAYOUT_65_iso_split_bs( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113,       K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
+    K400, K401, K402,                   K403,             K409, K410, K411,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
+}
+
+#define LAYOUT_65_iso_wkl( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113, K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+    K400,       K402,                   K403,             K409,       K411, K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
+}
+
+#define LAYOUT_65_iso_wkl_split_bs( \
+    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113,       K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
+    K400,       K402,                   K403,             K409,       K411,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
+}

From d13f5f0d662175a2d7b4fc93941dc996bfa92ff2 Mon Sep 17 00:00:00 2001
From: Wolf Van Herreweghe <wolfvanh@gmail.com>
Date: Thu, 20 Oct 2022 09:52:38 +0200
Subject: [PATCH 676/959] [Keyboard] Fix LEDs being inverted on Sabre (#18762)

---
 keyboards/wolf/sabre/config.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h
index 57319a134d..ad8461f2b7 100644
--- a/keyboards/wolf/sabre/config.h
+++ b/keyboards/wolf/sabre/config.h
@@ -46,5 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN B7
 
+#define LED_PIN_ON_STATE 0
 #define LED_CAPS_LOCK_PIN B3
 #define LED_SCROLL_LOCK_PIN B0

From c347e732be6b50500c1651b3fb8c0753b0c9c40d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 20 Oct 2022 22:20:07 +1100
Subject: [PATCH 677/959] Remove legacy EEPROM clear keycodes (#18782)

* `EEP_RST` -> `EE_CLR`, default-ish keymaps

* `EEP_RST` -> `EE_CLR`, user keymaps

* `EEP_RST` -> `EE_CLR`, community layouts

* `EEP_RST` -> `EE_CLR`, userspace

* `EEP_RST` -> `EE_CLR`, docs & core
---
 docs/feature_eeprom.md                                      | 2 +-
 docs/feature_split_keyboard.md                              | 4 ++--
 docs/ref_functions.md                                       | 2 +-
 keyboards/0xcb/static/keymaps/bongocat/keymap.c             | 2 +-
 keyboards/0xcb/static/keymaps/default/keymap.c              | 2 +-
 keyboards/0xcb/static/keymaps/via/keymap.c                  | 2 +-
 keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c     | 2 +-
 keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c     | 2 +-
 .../1upkeyboards/super16/keymaps/ahk_companion/keymap.c     | 4 ++--
 keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c  | 2 +-
 .../40percentclub/gherkin/keymaps/pierrec83/keymap.json     | 2 +-
 keyboards/7c8/framework/keymaps/steven/keymap.c             | 2 +-
 keyboards/7c8/framework/keymaps/via/keymap.c                | 2 +-
 keyboards/9key/keymaps/bcat/keymap.c                        | 2 +-
 keyboards/adm42/rev4/keymaps/default/keymap.c               | 2 +-
 keyboards/aeboards/ext65/keymaps/default/keymap.c           | 2 +-
 keyboards/aeboards/ext65/keymaps/via/keymap.c               | 2 +-
 keyboards/aleblazer/zodiark/keymaps/default/keymap.c        | 2 +-
 keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c       | 2 +-
 keyboards/aleblazer/zodiark/keymaps/via/keymap.c            | 2 +-
 keyboards/bandominedoni/keymaps/led/keymap.c                | 4 ++--
 keyboards/bandominedoni/keymaps/lednotg/keymap.c            | 4 ++--
 keyboards/bandominedoni/keymaps/via/keymap.c                | 4 ++--
 keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c  | 4 ++--
 keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c      | 4 ++--
 keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c  | 4 ++--
 keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c      | 6 +++---
 keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c  | 4 ++--
 keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c      | 2 +-
 keyboards/bastardkb/dilemma/keymaps/default/keymap.c        | 2 +-
 keyboards/canary/canary60rgb/keymaps/default/keymap.c       | 4 ++--
 keyboards/canary/canary60rgb/keymaps/via/keymap.c           | 4 ++--
 keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c  | 2 +-
 keyboards/cheshire/curiosity/keymaps/crd/keymap.c           | 2 +-
 keyboards/cheshire/curiosity/keymaps/default/keymap.c       | 2 +-
 keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c     | 2 +-
 keyboards/chromatonemini/keymaps/default/keymap.c           | 2 +-
 keyboards/chromatonemini/keymaps/led/keymap.c               | 2 +-
 keyboards/chromatonemini/keymaps/party/keymap.c             | 2 +-
 keyboards/chromatonemini/keymaps/via/keymap.c               | 2 +-
 keyboards/clueboard/66/keymaps/badger/keymap.c              | 2 +-
 .../coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c   | 2 +-
 keyboards/crkbd/keymaps/ardakilic/keymap.c                  | 2 +-
 keyboards/crkbd/keymaps/curry/keymap.c                      | 2 +-
 keyboards/crkbd/keymaps/devdev/keymap.c                     | 2 +-
 keyboards/crkbd/keymaps/kidbrazil/keymap.c                  | 2 +-
 keyboards/crkbd/keymaps/mcrown/mcrown.h                     | 2 +-
 keyboards/crkbd/keymaps/ninjonas/README.md                  | 2 +-
 keyboards/crkbd/keymaps/rpbaptist/keymap.c                  | 4 ++--
 keyboards/crkbd/keymaps/snowe/keymap.c                      | 2 +-
 keyboards/crkbd/keymaps/thunderbird2086/layers_block.h      | 4 ++--
 keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c       | 2 +-
 keyboards/donutcables/budget96/keymaps/default/keymap.c     | 2 +-
 keyboards/donutcables/budget96/keymaps/donut/keymap.c       | 2 +-
 keyboards/donutcables/budget96/keymaps/via/keymap.c         | 2 +-
 keyboards/draculad/keymaps/default/keymap.c                 | 4 ++--
 keyboards/draculad/keymaps/pimoroni/keymap.c                | 2 +-
 keyboards/dztech/dz60rgb/keymaps/default/keymap.c           | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/didel/keymap.c             | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c         | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c      | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c          | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c           | 2 +-
 keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c            | 2 +-
 keyboards/dztech/dz60rgb/keymaps/via/keymap.c               | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c              | 4 ++--
 keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c       | 2 +-
 keyboards/dztech/dz64rgb/keymaps/default/keymap.c           | 4 ++--
 keyboards/dztech/dz64rgb/keymaps/via/keymap.c               | 4 ++--
 keyboards/dztech/dz65rgb/keymaps/adi/keymap.c               | 2 +-
 keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c     | 2 +-
 keyboards/dztech/dz65rgb/keymaps/default/keymap.c           | 4 ++--
 keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c         | 2 +-
 keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c       | 2 +-
 keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c          | 2 +-
 keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c        | 2 +-
 keyboards/dztech/dz65rgb/keymaps/via/keymap.c               | 2 +-
 keyboards/eco/keymaps/bcat/keymap.c                         | 2 +-
 keyboards/ergodox_ez/keymaps/default/keymap.c               | 2 +-
 keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c  | 2 +-
 keyboards/ergodox_ez/keymaps/nfriend/keymap.c               | 2 +-
 keyboards/ergodox_ez/keymaps/rishka/keymap.c                | 2 +-
 keyboards/exclusive/e65/keymaps/madhatter/keymap.c          | 2 +-
 keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c    | 2 +-
 keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c        | 2 +-
 keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c    | 2 +-
 keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c        | 2 +-
 keyboards/fc660c/keymaps/default_rgb/keymap.c               | 2 +-
 keyboards/fc660c/keymaps/via_rgb/keymap.c                   | 2 +-
 keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c        | 2 +-
 keyboards/giabalanai/keymaps/2firmware/keymap.c             | 4 ++--
 keyboards/giabalanai/keymaps/3araht/keymap.c                | 4 ++--
 keyboards/giabalanai/keymaps/party/keymap.c                 | 6 +++---
 keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c       | 2 +-
 keyboards/gopolar/gg86/keymaps/bongocat/keymap.c            | 2 +-
 keyboards/gopolar/gg86/keymaps/default/keymap.c             | 2 +-
 keyboards/gopolar/gg86/keymaps/via/keymap.c                 | 2 +-
 keyboards/gray_studio/hb85/keymaps/stt/keymap.c             | 2 +-
 keyboards/hadron/ver3/keymaps/default/keymap.c              | 2 +-
 keyboards/hadron/ver3/keymaps/ishtob/keymap.c               | 2 +-
 keyboards/handwired/aranck/keymaps/default/keymap.c         | 2 +-
 keyboards/handwired/aranck/keymaps/turkishish/keymap.c      | 2 +-
 keyboards/handwired/chiron/keymaps/default/keymap.c         | 6 +++---
 .../handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c | 2 +-
 keyboards/handwired/fruity60/keymaps/default/keymap.c       | 2 +-
 keyboards/handwired/heisenberg/keymaps/default/keymap.c     | 2 +-
 keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c  | 2 +-
 keyboards/handwired/myskeeb/keymaps/default/keymap.c        | 2 +-
 keyboards/handwired/onekey/keymaps/eep_rst/keymap.c         | 2 +-
 keyboards/handwired/p65rgb/keymaps/default/keymap.c         | 2 +-
 keyboards/helix/rev3_4rows/keymaps/default/keymap.c         | 2 +-
 keyboards/helix/rev3_5rows/keymaps/default/keymap.c         | 2 +-
 keyboards/hotdox/keymaps/default/keymap.c                   | 4 ++--
 keyboards/hotdox/keymaps/eozaki/keymap.c                    | 4 ++--
 keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c            | 2 +-
 keyboards/hub16/keymaps/ahk_companion/keymap.c              | 2 +-
 keyboards/hub16/keymaps/peepeetee/keymap.c                  | 6 +++---
 keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c     | 2 +-
 keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json    | 2 +-
 keyboards/ilumkb/simpler61/keymaps/default/keymap.c         | 2 +-
 keyboards/ilumkb/simpler61/keymaps/via/keymap.c             | 2 +-
 keyboards/ilumkb/simpler64/keymaps/default/keymap.c         | 2 +-
 keyboards/ilumkb/simpler64/keymaps/via/keymap.c             | 2 +-
 .../input_club/ergodox_infinity/keymaps/default/keymap.c    | 4 ++--
 .../jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c  | 2 +-
 .../jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c  | 2 +-
 keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c   | 6 +++---
 keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c       | 6 +++---
 .../kbdfans/baguette66/soldered/keymaps/default/keymap.c    | 6 +++---
 keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c  | 6 +++---
 keyboards/kbdfans/bella/rgb/keymaps/default/keymap.c        | 2 +-
 keyboards/kbdfans/bella/rgb/keymaps/via/keymap.c            | 2 +-
 keyboards/kbdfans/bella/rgb_iso/keymaps/default/keymap.c    | 2 +-
 keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c        | 2 +-
 keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c       | 4 ++--
 keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c           | 4 ++--
 .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c   | 2 +-
 .../kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c   | 2 +-
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c    | 2 +-
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c    | 4 ++--
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c     | 2 +-
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c    | 2 +-
 .../kemmeldev-4-layered-layout.json                         | 2 +-
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c  | 4 ++--
 .../kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json     | 2 +-
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c        | 4 ++--
 .../kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c      | 2 +-
 keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c    | 2 +-
 keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c           | 2 +-
 .../kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c      | 2 +-
 keyboards/kbdfans/maja/keymaps/default/keymap.c             | 6 +++---
 keyboards/kbdfans/maja/keymaps/via/keymap.c                 | 6 +++---
 keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c    | 6 +++---
 keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c        | 6 +++---
 keyboards/keebio/bdn9/keymaps/bcat/keymap.c                 | 2 +-
 keyboards/keebio/iris/keymaps/compilation-error/keymap.c    | 2 +-
 keyboards/keebio/iris/keymaps/omgvee/keymap.c               | 2 +-
 keyboards/keebio/levinson/keymaps/issmirnov/keymap.c        | 2 +-
 keyboards/keebio/quefrency/keymaps/bcat/keymap.c            | 2 +-
 keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c      | 2 +-
 keyboards/keybee/keybee65/keymaps/default/keymap.c          | 2 +-
 keyboards/keybee/keybee65/keymaps/via/keymap.c              | 2 +-
 keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c       | 2 +-
 keyboards/keyboardio/atreus/keymaps/dshields/keymap.c       | 2 +-
 keyboards/keyboardio/model01/keymaps/dshields/keymap.c      | 2 +-
 keyboards/keysofkings/twokey/keymaps/default/keymap.c       | 2 +-
 keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c | 2 +-
 keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c         | 2 +-
 keyboards/ktec/ergodone/keymaps/vega/keymap.c               | 2 +-
 keyboards/ktec/ergodone/keymaps/via/keymap.c                | 4 ++--
 .../lazydesigners/dimple/staggered/keymaps/default/keymap.c | 2 +-
 .../lazydesigners/dimple/staggered/keymaps/erovia/keymap.c  | 4 ++--
 keyboards/lazydesigners/the30/keymaps/default/keymap.c      | 2 +-
 keyboards/lazydesigners/the50/keymaps/default/keymap.c      | 4 ++--
 keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c | 2 +-
 keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c | 4 ++--
 keyboards/leeku/finger65/keymaps/madhatter/keymap.c         | 2 +-
 keyboards/lets_split/keymaps/geripgeri/keymap.c             | 2 +-
 keyboards/lets_split/keymaps/mekberg/keymap.c               | 2 +-
 keyboards/lily58/keymaps/bcat/keymap.c                      | 2 +-
 keyboards/lily58/keymaps/curry/keymap.c                     | 2 +-
 keyboards/lily58/keymaps/cykedev/keymap.c                   | 2 +-
 keyboards/lily58/keymaps/ninjonas/README.md                 | 2 +-
 keyboards/linworks/fave84h/keymaps/default/keymap.c         | 2 +-
 keyboards/linworks/fave84h/keymaps/via/keymap.c             | 2 +-
 keyboards/linworks/fave87h/keymaps/default/keymap.c         | 2 +-
 keyboards/linworks/fave87h/keymaps/via/keymap.c             | 2 +-
 .../maple_computing/c39/keymaps/kuchosauronad0/keymap.c     | 2 +-
 keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c       | 2 +-
 keyboards/massdrop/alt/keymaps/ewersp/keymap.c              | 4 ++--
 keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c   | 2 +-
 keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c | 2 +-
 keyboards/mechwild/obe/keymaps/jonavin/keymap.c             | 2 +-
 keyboards/melgeek/mach80/keymaps/default/keymap.c           | 2 +-
 keyboards/melgeek/mach80/keymaps/tkl/keymap.c               | 2 +-
 keyboards/melgeek/mach80/keymaps/via/keymap.c               | 2 +-
 keyboards/melgeek/mach80/keymaps/wkl/keymap.c               | 2 +-
 keyboards/melgeek/mj61/keymaps/default/keymap.c             | 2 +-
 keyboards/melgeek/mj61/keymaps/via/keymap.c                 | 2 +-
 keyboards/melgeek/mj63/keymaps/default/keymap.c             | 2 +-
 keyboards/melgeek/mj63/keymaps/via/keymap.c                 | 2 +-
 keyboards/melgeek/mj64/keymaps/default/keymap.c             | 2 +-
 keyboards/melgeek/mj64/keymaps/via/keymap.c                 | 2 +-
 keyboards/melgeek/mj65/keymaps/default/keymap.c             | 4 ++--
 keyboards/melgeek/mj65/keymaps/via/keymap.c                 | 4 ++--
 keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c     | 2 +-
 keyboards/melgeek/mojo68/keymaps/default/keymap.c           | 4 ++--
 keyboards/melgeek/mojo68/keymaps/via/keymap.c               | 4 ++--
 keyboards/melgeek/mojo75/keymaps/default/keymap.c           | 4 ++--
 keyboards/melgeek/mojo75/keymaps/via/keymap.c               | 4 ++--
 keyboards/melgeek/tegic/keymaps/default/keymap.c            | 4 ++--
 keyboards/melgeek/tegic/keymaps/via/keymap.c                | 4 ++--
 keyboards/melgeek/z70ultra/keymaps/default/keymap.c         | 4 ++--
 keyboards/melgeek/z70ultra/keymaps/via/keymap.c             | 4 ++--
 keyboards/mixi/keymaps/default/keymap.c                     | 2 +-
 keyboards/mixi/keymaps/via/keymap.c                         | 2 +-
 keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c    | 2 +-
 keyboards/moonlander/keymaps/default/keymap.c               | 2 +-
 keyboards/moonlander/keymaps/via/keymap.c                   | 2 +-
 keyboards/moonlander/moonlander.c                           | 2 +-
 keyboards/nightmare/keymaps/brandonschlack/keymap.c         | 2 +-
 keyboards/obosob/arch_36/keymaps/obosob/keymap.c            | 2 +-
 .../omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c   | 4 ++--
 .../ergodash/rev1/keymaps/yet-another-developer/keymap.c    | 2 +-
 keyboards/pinky/3/keymaps/ninjonas/README.md                | 2 +-
 keyboards/planck/ez/ez.c                                    | 2 +-
 keyboards/planck/keymaps/adamtabrams/keymap.c               | 2 +-
 keyboards/planck/keymaps/badger/keymap.c                    | 2 +-
 keyboards/planck/keymaps/buhearns/keymap.c                  | 2 +-
 keyboards/planck/keymaps/dodger/keymap.c                    | 2 +-
 keyboards/planck/keymaps/dshields/keymap.c                  | 2 +-
 keyboards/planck/keymaps/gunp/keymap.c                      | 2 +-
 keyboards/planck/keymaps/jweickm/keymap.c                   | 4 ++--
 keyboards/planck/keymaps/mjuma/readme.md                    | 2 +-
 keyboards/planck/keymaps/scottzach1/keymap.c                | 2 +-
 keyboards/planck/keymaps/sigul/keymap.c                     | 2 +-
 keyboards/planck/keymaps/yhaliaw/keymap.c                   | 2 +-
 keyboards/preonic/keymaps/badger/keymap.c                   | 2 +-
 keyboards/preonic/keymaps/yhaliaw/keymap.c                  | 2 +-
 keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c   | 2 +-
 keyboards/projectkb/alice/keymaps/madhatter/keymap.c        | 2 +-
 keyboards/redox/keymaps/cykedev/keymap.c                    | 2 +-
 keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c                | 2 +-
 keyboards/signum/3_0/keymaps/default/layout.py              | 2 +-
 keyboards/sofle/keymaps/devdev/keymap.c                     | 4 ++--
 keyboards/sofle/keymaps/rgb_default/keymap.c                | 6 +++---
 keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c        | 6 +++---
 keyboards/splitkb/kyria/keymaps/ninjonas/README.md          | 2 +-
 keyboards/splitkb/kyria/keymaps/tessachka/keymap.c          | 2 +-
 keyboards/switchplate/southpaw_65/keymaps/default/keymap.c  | 2 +-
 .../switchplate/southpaw_65/keymaps/default_ansi/keymap.c   | 2 +-
 .../switchplate/southpaw_65/keymaps/default_iso/keymap.c    | 2 +-
 .../minizone/keymaps/pimoroni_trackball/keymap.c            | 2 +-
 keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c | 2 +-
 keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c         | 2 +-
 keyboards/tmo50/keymaps/ottodokto/keymap.c                  | 2 +-
 keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c    | 2 +-
 keyboards/tzarc/djinn/keymaps/default/keymap.c              | 2 +-
 keyboards/tzarc/ghoul/keymaps/default/keymap.c              | 2 +-
 .../unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c | 2 +-
 .../unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c  | 2 +-
 .../walletburner/neuron/keymaps/brandonschlack/keymap.c     | 2 +-
 .../wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c      | 2 +-
 keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c          | 2 +-
 keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c       | 4 ++--
 keyboards/xbows/knight/keymaps/default/keymap.c             | 2 +-
 keyboards/xbows/knight/keymaps/via/keymap.c                 | 2 +-
 keyboards/xbows/knight_plus/keymaps/default/keymap.c        | 2 +-
 keyboards/xbows/knight_plus/keymaps/via/keymap.c            | 2 +-
 keyboards/xbows/nature/keymaps/default/keymap.c             | 2 +-
 keyboards/xbows/nature/keymaps/via/keymap.c                 | 2 +-
 keyboards/xbows/numpad/keymaps/default/keymap.c             | 2 +-
 keyboards/xbows/numpad/keymaps/via/keymap.c                 | 2 +-
 keyboards/xbows/ranger/keymaps/default/keymap.c             | 2 +-
 keyboards/xbows/ranger/keymaps/via/keymap.c                 | 2 +-
 keyboards/xbows/woody/keymaps/default/keymap.c              | 4 ++--
 keyboards/xelus/trinityxttkl/keymaps/default/keymap.c       | 2 +-
 keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c         | 2 +-
 keyboards/yanghu/unicorne/keymaps/bcat/keymap.c             | 2 +-
 keyboards/ydkb/just60/keymaps/default/keymap.c              | 2 +-
 keyboards/ydkb/just60/keymaps/thinxer/keymap.c              | 2 +-
 keyboards/yushakobo/navpad/10/keymaps/default/keymap.c      | 2 +-
 keyboards/yushakobo/navpad/10/keymaps/default/readme.md     | 2 +-
 keyboards/yushakobo/navpad/10/keymaps/via/keymap.c          | 2 +-
 keyboards/yushakobo/navpad/10/keymaps/via/readme.md         | 2 +-
 .../yushakobo/navpad/10_helix_r/keymaps/default/keymap.c    | 2 +-
 .../yushakobo/navpad/10_helix_r/keymaps/default/readme.md   | 2 +-
 keyboards/yushakobo/quick17/keymaps/default/keymap.c        | 2 +-
 keyboards/yushakobo/quick17/keymaps/default/readme.md       | 2 +-
 keyboards/yushakobo/quick17/keymaps/via/keymap.c            | 2 +-
 keyboards/yushakobo/quick17/keymaps/via/readme.md           | 2 +-
 layouts/community/60_ansi/mechmerlin-ansi/keymap.c          | 2 +-
 layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c     | 2 +-
 .../60_ansi_split_bs_rshift/mechmerlin-split/keymap.c       | 2 +-
 layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c  | 2 +-
 layouts/community/60_tsangan_hhkb/bcat/keymap.c             | 2 +-
 layouts/community/60_tsangan_hhkb/yanfali/keymap.c          | 2 +-
 layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c      | 2 +-
 layouts/community/65_ansi/mechmerlin/keymap.c               | 2 +-
 layouts/community/65_ansi_blocker/mechmerlin/keymap.c       | 2 +-
 layouts/community/65_ansi_blocker/spidey3/keymap.c          | 2 +-
 layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c    | 2 +-
 layouts/community/66_ansi/mechmerlin/keymap.c               | 2 +-
 layouts/community/68_ansi/mechmerlin/keymap.c               | 2 +-
 layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c       | 2 +-
 layouts/community/75_ansi/spidey3/keymap.c                  | 2 +-
 layouts/community/75_ansi/yanfali/keymap.c                  | 2 +-
 layouts/community/ergodox/deadcyclo/keymap.c                | 2 +-
 layouts/community/ortho_3x10/bbaserdem/keymap.c             | 2 +-
 layouts/community/ortho_4x12/brandonschlack/keymap.c        | 2 +-
 layouts/community/ortho_4x12/greatwizard/keymap.c           | 2 +-
 layouts/community/ortho_5x12/brandonschlack/keymap.c        | 2 +-
 layouts/community/ortho_5x12/greatwizard/keymap.c           | 2 +-
 layouts/community/ortho_5x14/yet-another-developer/keymap.c | 2 +-
 layouts/community/split_3x6_3/bcat/keymap.c                 | 2 +-
 layouts/community/tkl_ansi/yanfali/keymap.c                 | 2 +-
 quantum/quantum_keycodes_legacy.h                           | 2 --
 users/bbaserdem/bbaserdem.h                                 | 2 +-
 users/ericgebhart/layers.h                                  | 2 +-
 users/mechmerlin/changelog.md                               | 2 +-
 users/mechmerlin/readme.md                                  | 2 +-
 users/ninjonas/ninjonas.h                                   | 2 +-
 users/ridingqwerty/wrappers.h                               | 2 +-
 users/rupa/wrappers.h                                       | 4 ++--
 324 files changed, 406 insertions(+), 408 deletions(-)

diff --git a/docs/feature_eeprom.md b/docs/feature_eeprom.md
index e261c455cb..3a4119eab7 100644
--- a/docs/feature_eeprom.md
+++ b/docs/feature_eeprom.md
@@ -109,7 +109,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
 }
 ```
-And lastly, you want to add the `eeconfig_init_user` function, so that when the EEPROM is reset, you can specify default values, and even custom actions. To force an EEPROM reset, use the `EEP_RST` keycode or [Bootmagic Lite](feature_bootmagic.md) functionallity. For example, if you want to set rgb layer indication by default, and save the default valued.
+And lastly, you want to add the `eeconfig_init_user` function, so that when the EEPROM is reset, you can specify default values, and even custom actions. To force an EEPROM reset, use the `EE_CLR` keycode or [Bootmagic Lite](feature_bootmagic.md) functionallity. For example, if you want to set rgb layer indication by default, and save the default valued.
 
 ```c
 void eeconfig_init_user(void) {  // EEPROM is getting reset!
diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index 7d194284d6..0b475cc63d 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -153,11 +153,11 @@ Example:
 make crkbd:default:avrdude-split-left
 ```
 
-?> ARM controllers using `dfu-util` will require an EEPROM reset after setting handedness. This can be done using the `EEP_RST` keycode or [Bootmagic Lite](feature_bootmagic.md). Controllers using emulated EEPROM will always require handedness parameter when flashing the firmware.
+?> ARM controllers using `dfu-util` will require an EEPROM reset after setting handedness. This can be done using the `EE_CLR` keycode or [Bootmagic Lite](feature_bootmagic.md). Controllers using emulated EEPROM will always require handedness parameter when flashing the firmware.
 
 ?> [QMK Toolbox]() can also be used to flash EEPROM handedness files. Place the controller in bootloader mode and select menu option Tools -> EEPROM -> Set Left/Right Hand
 
-This setting is not changed when re-initializing the EEPROM using the `EEP_RST` key, or using the `eeconfig_init()` function.  However, if you reset the EEPROM outside of the firmware's built in options (such as flashing a file that overwrites the `EEPROM`, like how the [QMK Toolbox]()'s "Reset EEPROM" button works), you'll need to re-flash the controller with the `EEPROM` files. 
+This setting is not changed when re-initializing the EEPROM using the `EE_CLR` key, or using the `eeconfig_init()` function.  However, if you reset the EEPROM outside of the firmware's built in options (such as flashing a file that overwrites the `EEPROM`, like how the [QMK Toolbox]()'s "Reset EEPROM" button works), you'll need to re-flash the controller with the `EEPROM` files. 
 
 You can find the `EEPROM` files in the QMK firmware repo, [here](https://github.com/qmk/qmk_firmware/tree/master/quantum/split_common).
 
diff --git a/docs/ref_functions.md b/docs/ref_functions.md
index c375ecd057..c82c5747c2 100644
--- a/docs/ref_functions.md
+++ b/docs/ref_functions.md
@@ -97,7 +97,7 @@ To reset to the bootloader use `QK_BOOTLOADER` or `QK_BOOT` keycode or `reset_ke
 
 ## Wiping the EEPROM (Persistent Storage)
 
-If you're having issues with Audio, RGB Underglow, backlighting or keys acting weird, then you can reset the EEPROM (persistent setting storage). To force an EEPROM reset, use the [`EEP_RST` keycode](quantum_keycodes.md) or [Bootmagic Lite](feature_bootmagic.md) functionality. If neither of those are an option, then you can use a custom macro to do so.
+If you're having issues with Audio, RGB Underglow, backlighting or keys acting weird, then you can reset the EEPROM (persistent setting storage). To force an EEPROM reset, use the [`EE_CLR` keycode](quantum_keycodes.md) or [Bootmagic Lite](feature_bootmagic.md) functionality. If neither of those are an option, then you can use a custom macro to do so.
 
 To wipe the EEPROM, run `eeconfig_init()` from your function or macro to reset most of the settings to default.
 
diff --git a/keyboards/0xcb/static/keymaps/bongocat/keymap.c b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
index 6d0fc05d3a..034547e07e 100644
--- a/keyboards/0xcb/static/keymaps/bongocat/keymap.c
+++ b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______,          _______,                   _______, _______, _______, _______
 ),
 [_FN3] = LAYOUT_all(
-                                                                                                       EEP_RST,
+                                                                                                       EE_CLR,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT,          _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH,
diff --git a/keyboards/0xcb/static/keymaps/default/keymap.c b/keyboards/0xcb/static/keymaps/default/keymap.c
index d652ab35fb..9184a43fb3 100644
--- a/keyboards/0xcb/static/keymaps/default/keymap.c
+++ b/keyboards/0xcb/static/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______,          _______,                   _______, _______, _______, _______
 ),
 [_FN3] = LAYOUT_all(
-                                                                                                       EEP_RST,
+                                                                                                       EE_CLR,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT,          _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH,
diff --git a/keyboards/0xcb/static/keymaps/via/keymap.c b/keyboards/0xcb/static/keymaps/via/keymap.c
index 6b5f8a683c..7ea6b4f0b1 100644
--- a/keyboards/0xcb/static/keymaps/via/keymap.c
+++ b/keyboards/0xcb/static/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______,          _______,                   _______, _______, _______, _______
 ),
 [_FN3] = LAYOUT_all(
-                                                                                                       EEP_RST,
+                                                                                                       EE_CLR,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT,          _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH,
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
index da0a50479d..eb1111e68d 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG]     = LAYOUT_tsangan(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______, _______, \
-     _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
      _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   DF_1,     DF_2,     _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,  \
      _______,   _______,  _______,  _______,  _______,   _______,  _______)
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
index 884b9b87d2..cd0a4bfe19 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG]     = LAYOUT_60_ansi_tsangan_split_rshift(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
-     _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
      _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______, \
      _______,   _______,  _______,  _______,  _______,   _______,  _______)
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
index 05ec42835a..292aa927d2 100644
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [4] = LAYOUT_ortho_4x4(
                 KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
                 KC_NO,   KC_NO,   KC_NO,     KC_MUTE,
-                KC_NO,   QK_BOOT, EEP_RST,   KC_VOLD,
+                KC_NO,   QK_BOOT, EE_CLR,    KC_VOLD,
                 TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [5] = LAYOUT_ortho_4x4(
                 RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
                 RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSFT,
+                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
                 KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
index 3261058a9b..514b8b7a73 100644
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [4] = LAYOUT_ortho_4x4(
                 KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
                 RGB_TOG, RGB_MOD, RGB_RMOD,  KC_MUTE,
-                TO(0),   QK_BOOT, EEP_RST, KC_VOLD,
+                TO(0),   QK_BOOT, EE_CLR,    KC_VOLD,
                 KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
index 21c84488dc..fbbb5a2b85 100644
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
+++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
@@ -1 +1 @@
-{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"40percentclub/gherkin","keymap":"pierrec83","layout":"LAYOUT_ortho_3x10","layers":[["KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_BSPC","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_Z","KC_X","KC_M","KC_C","KC_V","LT(7,KC_SPC)","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_K"],["KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","KC_TRNS","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","KC_TRNS","KC_MPRV","KC_WH_D","KC_MNXT","TG(1)"],["KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","BL_BRTG","BL_INC","KC_WH_U","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","BL_TOGG","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","BL_STEP","BL_DEC","KC_WH_D","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS"],["KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_LCTL","KC_NO","KC_LALT","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12"],["KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["LT(8,KC_TRNS)","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","RALT(KC_TRNS)","RCTL(KC_TRNS)","TG(1)"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","EEP_RST","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Anonymous"}
\ No newline at end of file
+{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"40percentclub/gherkin","keymap":"pierrec83","layout":"LAYOUT_ortho_3x10","layers":[["KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_BSPC","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_Z","KC_X","KC_M","KC_C","KC_V","LT(7,KC_SPC)","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_K"],["KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","KC_TRNS","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","KC_TRNS","KC_MPRV","KC_WH_D","KC_MNXT","TG(1)"],["KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","BL_BRTG","BL_INC","KC_WH_U","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","BL_TOGG","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","BL_STEP","BL_DEC","KC_WH_D","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS"],["KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_LCTL","KC_NO","KC_LALT","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12"],["KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["LT(8,KC_TRNS)","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","RALT(KC_TRNS)","RCTL(KC_TRNS)","TG(1)"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","EE_CLR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Anonymous"}
\ No newline at end of file
diff --git a/keyboards/7c8/framework/keymaps/steven/keymap.c b/keyboards/7c8/framework/keymaps/steven/keymap.c
index ef1bf2431a..c027cfc9bc 100644
--- a/keyboards/7c8/framework/keymaps/steven/keymap.c
+++ b/keyboards/7c8/framework/keymaps/steven/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, DB_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  DB_TOGG,
     C(KC_Z), C(KC_Y)
 ),
 
diff --git a/keyboards/7c8/framework/keymaps/via/keymap.c b/keyboards/7c8/framework/keymaps/via/keymap.c
index c73e83b01d..ccc8955d26 100644
--- a/keyboards/7c8/framework/keymaps/via/keymap.c
+++ b/keyboards/7c8/framework/keymaps/via/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, DB_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  DB_TOGG,
     C(KC_Z), C(KC_Y)
 ),
 
diff --git a/keyboards/9key/keymaps/bcat/keymap.c b/keyboards/9key/keymaps/bcat/keymap.c
index c445a19406..5a9ba1a88e 100644
--- a/keyboards/9key/keymaps/bcat/keymap.c
+++ b/keyboards/9key/keymaps/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LY_FN1,   KC_MUTE,  KY_MICM
     ),
     [LAYER_FUNCTION_1] = LAYOUT(
-        EEP_RST,  _______,  QK_BOOT,
+        EE_CLR,   _______,  QK_BOOT,
         _______,  _______,  _______,
         _______,  _______,  _______
     ),
diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c
index 36b64cad3e..109796f7ae 100644
--- a/keyboards/adm42/rev4/keymaps/default/keymap.c
+++ b/keyboards/adm42/rev4/keymaps/default/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_SETUP] = LAYOUT_adm42_3x12_6(
         REFLASH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, DF_QWER, DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,
                                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
     ),
 };
diff --git a/keyboards/aeboards/ext65/keymaps/default/keymap.c b/keyboards/aeboards/ext65/keymaps/default/keymap.c
index 050e19c54d..01a78b3f52 100644
--- a/keyboards/aeboards/ext65/keymaps/default/keymap.c
+++ b/keyboards/aeboards/ext65/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_ext65(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
+    KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,
     KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
     KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/aeboards/ext65/keymaps/via/keymap.c b/keyboards/aeboards/ext65/keymaps/via/keymap.c
index d18369148b..c9545c80d7 100644
--- a/keyboards/aeboards/ext65/keymaps/via/keymap.c
+++ b/keyboards/aeboards/ext65/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_ext65(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
+    KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,
     KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
     KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/aleblazer/zodiark/keymaps/default/keymap.c b/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
index a6003deab2..755a218e04 100644
--- a/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
+++ b/keyboards/aleblazer/zodiark/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_ADJUST] = LAYOUT(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, EEP_RST, _______, _______, _______, KC_F12,
+      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, EE_CLR,  _______, _______, _______, KC_F12,
       _______, _______, _______, _______, _______, _______, _______,                   _______, _______, RGB_TOG, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,
       _______, _______, _______, _______, _______,      _______,     _______, _______,     _______,      RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD
diff --git a/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c b/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
index f9062bef7d..690fe6c71a 100644
--- a/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
+++ b/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_ADJUST] = LAYOUT(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, EEP_RST, _______, _______, _______, KC_F12,
+      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, EE_CLR,  _______, _______, _______, KC_F12,
       _______, _______, _______, _______, _______, _______, _______,                   _______, _______, RGB_TOG, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,
       _______, _______, _______, _______, _______,      _______,     _______, _______,     _______,      RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD
diff --git a/keyboards/aleblazer/zodiark/keymaps/via/keymap.c b/keyboards/aleblazer/zodiark/keymaps/via/keymap.c
index c6f06b6971..3829bcc968 100644
--- a/keyboards/aleblazer/zodiark/keymaps/via/keymap.c
+++ b/keyboards/aleblazer/zodiark/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[3] = LAYOUT(
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, EEP_RST, _______, _______, _______, KC_F12,
+      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, EE_CLR,  _______, _______, _______, KC_F12,
       _______, _______, _______, _______, _______, _______, _______,                   _______, _______, RGB_TOG, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,
       _______, _______, _______, _______, _______,      _______,     _______, _______,     _______,      RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 7f43d65d22..9120ed525c 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
-          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EEP_RST, RGB_TOG
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EE_CLR, RGB_TOG
     )
 };
 
@@ -243,7 +243,7 @@ bool rgb_matrix_indicators_user(void) {
 
                 rgb_matrix_set_color(31, RGB_DARKBLUE);        //  RGB_RMOD
                 rgb_matrix_set_color(37, RGB_DARKBLUE);        //  RGB_MOD
-                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EEP_RST
+                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EE_CLR
                 rgb_matrix_set_color(40, RGB_DARKRED);         //  RGB_TOG
 
                 rgb_matrix_set_color(41, RGB_DARKORANGE);      //  _FN
diff --git a/keyboards/bandominedoni/keymaps/lednotg/keymap.c b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
index 43ad28040f..784d14e645 100644
--- a/keyboards/bandominedoni/keymaps/lednotg/keymap.c
+++ b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
-          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EEP_RST, RGB_TOG
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EE_CLR, RGB_TOG
     )
 };
 
@@ -243,7 +243,7 @@ bool rgb_matrix_indicators_user(void) {
 
                 rgb_matrix_set_color(31, RGB_DARKBLUE);        //  RGB_RMOD
                 rgb_matrix_set_color(37, RGB_DARKBLUE);        //  RGB_MOD
-                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EEP_RST
+                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EE_CLR
                 rgb_matrix_set_color(40, RGB_DARKRED);         //  RGB_TOG
 
                 rgb_matrix_set_color(41, RGB_DARKORANGE);      //  _FN
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index 2fd2f9092c..8273140e4c 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
-          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EEP_RST, RGB_TOG
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EE_CLR, RGB_TOG
     )
 };
 
@@ -170,7 +170,7 @@ bool rgb_matrix_indicators_user(void) {
 
                 rgb_matrix_set_color(31, RGB_DARKBLUE);        //  RGB_RMOD
                 rgb_matrix_set_color(37, RGB_DARKBLUE);        //  RGB_MOD
-                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EEP_RST
+                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EE_CLR
                 rgb_matrix_set_color(40, RGB_DARKRED);         //  RGB_TOG
 
                 rgb_matrix_set_color(41, RGB_DARKORANGE);      //  _FN
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
index 148f026740..5ce93fe070 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
        KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,    KC_4,    KC_5,    KC_6, KC_PMNS,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS,
+       XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
                          XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______
   //                   ╰───────────────────────────╯ ╰──────────────────╯
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
        KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX,
+       KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
                          _______, _______, XXXXXXX,    _______, XXXXXXX
   //                   ╰───────────────────────────╯ ╰──────────────────╯
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
index caab0f96af..417220a38e 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -105,14 +105,14 @@ static uint16_t auto_pointer_layer_timer = 0;
 #define LAYOUT_LAYER_MEDIA                                                                    \
     XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, \
     KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, \
-    XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, \
+    XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT, QK_BOOT, EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, \
                       _______, KC_MPLY, KC_MSTP, KC_MSTP, KC_MPLY
 
 /** \brief Mouse emulation and pointer functions. */
 #define LAYOUT_LAYER_POINTER                                                                  \
     XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, \
     ______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
-    _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, \
+    _______, DRGSCRL, SNIPING, EE_CLR,  QK_BOOT, QK_BOOT, EE_CLR,  SNIPING, DRGSCRL, _______, \
                       KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1
 
 /**
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
index fee8d87ad6..8632ab7258 100644
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,    KC_4,    KC_5,    KC_6, KC_PMNS, XXXXXXX,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS, XXXXXXX,
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS, XXXXXXX,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______
   //                            ╰───────────────────────────╯ ╰──────────────────╯
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        XXXXXXX, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   _______, _______, XXXXXXX,    _______, XXXXXXX
   //                            ╰───────────────────────────╯ ╰──────────────────╯
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
index edfce673fb..9a6eb5f236 100644
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,    KC_4,    KC_5,    KC_6, KC_PMNS, XXXXXXX,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS, XXXXXXX,
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS, XXXXXXX,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______
   //                            ╰───────────────────────────╯ ╰──────────────────╯
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        XXXXXXX, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   _______, _______, XXXXXXX,    _______, XXXXXXX
   //                            ╰───────────────────────────╯ ╰──────────────────╯
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT,    QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
+       XXXXXXX, _______, DRGSCRL, SNIPING, EE_CLR,  QK_BOOT,    QK_BOOT, EE_CLR,  SNIPING, DRGSCRL, _______, XXXXXXX,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   KC_BTN2, KC_BTN1, KC_BTN3,    KC_BTN3, KC_BTN1
   //                            ╰───────────────────────────╯ ╰──────────────────╯
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
index e0cee41221..98edad47d9 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PEQL,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
+      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______,
                                            XXXXXXX, XXXXXXX,      KC_P0
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        KC_MPLY, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   _______, _______, XXXXXXX,    _______, XXXXXXX,
                                            _______, _______,    XXXXXXX
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
index 8c55855af1..0ab7b78cc4 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
        XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
   // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
-       XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT,    QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
+       XXXXXXX, _______, DRGSCRL, SNIPING, EE_CLR,  QK_BOOT,    QK_BOOT, EE_CLR,  SNIPING, DRGSCRL, _______, XXXXXXX,
   // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
                                   KC_BTN2, KC_BTN1, KC_BTN3,    KC_BTN3, KC_BTN1,
                                            XXXXXXX, KC_BTN2,    KC_BTN2
diff --git a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
index 3f77ebcabb..a0c8394fe3 100644
--- a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
        KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD,    XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       QK_BOOT, EEP_RST, KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
+       QK_BOOT, EE_CLR,  KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
                                   _______, KC_LSFT,     KC_SPC, _______
   //                            ╰──────────────────╯ ╰──────────────────╯
diff --git a/keyboards/canary/canary60rgb/keymaps/default/keymap.c b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
index 6d4a2313ef..fb4205fb4c 100644
--- a/keyboards/canary/canary60rgb/keymaps/default/keymap.c
+++ b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
@@ -26,14 +26,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, TO(3),                              _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/canary/canary60rgb/keymaps/via/keymap.c b/keyboards/canary/canary60rgb/keymaps/via/keymap.c
index ad60ca15a8..ab58867ca2 100644
--- a/keyboards/canary/canary60rgb/keymaps/via/keymap.c
+++ b/keyboards/canary/canary60rgb/keymaps/via/keymap.c
@@ -26,14 +26,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, TO(3),                              _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
index ff635b2d80..724463ebe8 100644
--- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
      */
     [_ADJUST] = LAYOUT_default( \
-        TG_BASE,   QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        TG_BASE,   QM_MAKE, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
         TG_REDR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
         TG_NAV,    _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
         TG_MOUS,                     _______, _______,                   _______, _______,                            _______, _______  \
diff --git a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
index 138b195b8c..e2084a5129 100644
--- a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_FL] = LAYOUT_default(
     KC_PGUP, KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-    KC_PGDN, KC_CAPS, _______, _______, EEP_RST, QK_BOOT, _______,          _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
+    KC_PGDN, KC_CAPS, _______, _______, EE_CLR,  QK_BOOT, _______,          _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
     KC_ESC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
              _______, _______, _______, _______, _______, _______,          _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
              _______,          _______, _______, _______,                            _______,          _______,          _______
diff --git a/keyboards/cheshire/curiosity/keymaps/default/keymap.c b/keyboards/cheshire/curiosity/keymaps/default/keymap.c
index 3af35a81f3..4e03c8a1d8 100644
--- a/keyboards/cheshire/curiosity/keymaps/default/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAVMED] = LAYOUT_default(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______,   KC_UP, _______, _______, _______, _______, QK_BOOT,
-    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,         EEP_RST,
+    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,         EE_CLR,
              _______, _______, _______, _______, _______, KC_VOLD,        KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
              _______,                   _______,  _______, _______,        _______,          _______,                        _______
   )
diff --git a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
index efb962f978..ddfbadd72f 100644
--- a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAVMED] = LAYOUT_default(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______,   KC_UP, _______, _______, _______, _______, QK_BOOT,
-    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,         EEP_RST,
+    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,         EE_CLR,
              _______, _______, _______, _______, _______, KC_VOLD,        KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
              _______,                   _______,  _______, _______,        _______,          _______,                        _______
   )
diff --git a/keyboards/chromatonemini/keymaps/default/keymap.c b/keyboards/chromatonemini/keymaps/default/keymap.c
index 4527065c3b..0316ebc247 100644
--- a/keyboards/chromatonemini/keymaps/default/keymap.c
+++ b/keyboards/chromatonemini/keymaps/default/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     L_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, XXXXXXX,
-            MI_VELD,               L_RESERVE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, XXXXXXX, XXXXXXX
+            MI_VELD,               L_RESERVE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, XXXXXXX, XXXXXXX
     )
 };
 
diff --git a/keyboards/chromatonemini/keymaps/led/keymap.c b/keyboards/chromatonemini/keymaps/led/keymap.c
index 6d7d07cdaf..bd24306271 100644
--- a/keyboards/chromatonemini/keymaps/led/keymap.c
+++ b/keyboards/chromatonemini/keymaps/led/keymap.c
@@ -273,7 +273,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     B_BASE,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, B_LEFT, XXXXXXX, XXXXXXX, B_CENTER, XXXXXXX, XXXXXXX, B_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, B_FLIP,
-            MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EEP_RST, TGLINDI, RGB_TOG
+            MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EE_CLR, TGLINDI, RGB_TOG
     )
 };
 
diff --git a/keyboards/chromatonemini/keymaps/party/keymap.c b/keyboards/chromatonemini/keymaps/party/keymap.c
index c92ed2494c..b5ae0244df 100644
--- a/keyboards/chromatonemini/keymaps/party/keymap.c
+++ b/keyboards/chromatonemini/keymaps/party/keymap.c
@@ -273,7 +273,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     B_BASE,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, B_LEFT, XXXXXXX, XXXXXXX, B_CENTER, XXXXXXX, XXXXXXX, B_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, B_FLIP,
-            MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EEP_RST, TGLINDI, RGB_TOG
+            MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EE_CLR, TGLINDI, RGB_TOG
     )
 };
 
diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c
index e477e1b8a5..3a3a5f415e 100644
--- a/keyboards/chromatonemini/keymaps/via/keymap.c
+++ b/keyboards/chromatonemini/keymaps/via/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             _______,          XXXXXXX,
             MI_VELU,
         MI_OCTD, MI_OCTU,     B_BASE, DF(_RESERVE), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, XXXXXXX,
-            MI_VELD,              TGLINTR,    TGLTRNS, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EEP_RST, TGLINDI, RGB_TOG
+            MI_VELD,              TGLINTR,    TGLTRNS, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EE_CLR, TGLINDI, RGB_TOG
     )
 };
 
diff --git a/keyboards/clueboard/66/keymaps/badger/keymap.c b/keyboards/clueboard/66/keymaps/badger/keymap.c
index ec0135e406..e404029849 100644
--- a/keyboards/clueboard/66/keymaps/badger/keymap.c
+++ b/keyboards/clueboard/66/keymaps/badger/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST]      = LAYOUT_66_ansi(\
       KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,   KC_VOLU, \
-      _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   KC_MSTP, KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  AG_SWAP,   AG_NORM,  KC_INS,   KC_VOLD, \
+      _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   KC_MSTP, KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  AG_SWAP,   AG_NORM,  KC_INS,   KC_VOLD, \
       _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,   AG_NORM, KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,   _______, \
       _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV, KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   KC_BRIU, \
       _______,   _______,  _______,  _______,  _______,   _______, _______,  KC_HOME,  KC_BRID,  KC_END)
diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
index fae2a144a0..5999b3dea1 100644
--- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
+++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * └────┴───┴───┴────────────────────────┴────┴───┴────┘
 */
 [_ADJUST] = LAYOUT_ansi_40( \
-    QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
+    QM_MAKE, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______,                            _______,                   _______, _______, _______  \
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
index 75c7bc9b5e..6de8a5495c 100644
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@@ -241,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 */
   [_ADJUST] = LAYOUT_split_3x6_3(
-    QK_BOOT, EEP_RST, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+    QK_BOOT, EE_CLR,  _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
     RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                    _______, _______, _______, _______, _______, _______,
     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                    _______, _______, _______, _______, _______, _______,
                                           KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
diff --git a/keyboards/crkbd/keymaps/curry/keymap.c b/keyboards/crkbd/keymaps/curry/keymap.c
index 43a3147619..b2cffcdfd3 100644
--- a/keyboards/crkbd/keymaps/curry/keymap.c
+++ b/keyboards/crkbd/keymaps/curry/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] = LAYOUT_wrapper( \
         KC_MAKE, _________________ADJUST_L1_________________,       _________________ADJUST_R1_________________, KC_RST,
-        VRSN,    _________________ADJUST_L2_________________,       _________________ADJUST_R2_________________, EEP_RST,
+        VRSN,    _________________ADJUST_L2_________________,       _________________ADJUST_R2_________________, EE_CLR,
         MG_NKRO, _________________ADJUST_L3_________________,       _________________ADJUST_R3_________________, RGB_IDL,
                                    _______, _______, _______,       _______, TG_MODS, _______
     )
diff --git a/keyboards/crkbd/keymaps/devdev/keymap.c b/keyboards/crkbd/keymaps/devdev/keymap.c
index cbaa7c16e9..0327101157 100644
--- a/keyboards/crkbd/keymaps/devdev/keymap.c
+++ b/keyboards/crkbd/keymaps/devdev/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	//,-----------------------------------------------------.                    ,-----------------------------------------------------.
 	      TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5), 					     KC_NO,   TO(7),   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-	      KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO, 						 KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EEP_RST,
+	      KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO, 						 KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EE_CLR,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 		KC_SYSTEM_SLEEP,   KC_NO, KC_BRID,   KC_NO,   KC_NO,   KC_NO, 						 KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 	//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/kidbrazil/keymap.c b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
index 6a1e2e0cde..d5966033f1 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/keymap.c
+++ b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  [_WEAPON] = LAYOUT_split_3x6_3(
       KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_LSFT, KC_A, KC_S, KC_D, KC_F,                               KC_6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LCTL, KC_Z, KC_X, KC_C, KC_V,                               KC_7, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+      KC_TRNS, KC_LCTL, KC_Z, KC_X, KC_C, KC_V,                               KC_7, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
                                 KC_TRNS, KC_TAB, KC_TRNS,             KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/crkbd/keymaps/mcrown/mcrown.h b/keyboards/crkbd/keymaps/mcrown/mcrown.h
index 22a58dd0ea..b60f759469 100644
--- a/keyboards/crkbd/keymaps/mcrown/mcrown.h
+++ b/keyboards/crkbd/keymaps/mcrown/mcrown.h
@@ -69,7 +69,7 @@
 #define   _____________________LOWER_R3_______________________ KC_F6,    KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11
 
 /* ------------------------------------------------------------COL1------COL2-----COL3-----COL4-----COL5-----COL6--------- */
-#define   _____________________ADJUST_L1______________________ XXXXXXX,  EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+#define   _____________________ADJUST_L1______________________ XXXXXXX,  EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
   #define _____________________ADJUST_L2______________________ XXXXXXX,  XXXXXXX, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI
   #define _____________________ADJUST_L3______________________ XXXXXXX,  XXXXXXX, RGB_SPD, RGB_SAD, RGB_HUD, RGB_VAD
diff --git a/keyboards/crkbd/keymaps/ninjonas/README.md b/keyboards/crkbd/keymaps/ninjonas/README.md
index 08d694521d..84b55906f8 100644
--- a/keyboards/crkbd/keymaps/ninjonas/README.md
+++ b/keyboards/crkbd/keymaps/ninjonas/README.md
@@ -73,7 +73,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar
 ### ADJUST
 ```c
   //,----------------------------------------------------.      ,----------------------------------------------------.
-  //   M_MAKE, EEP_RST,        ,        ,        ,        ,       RGB_TOG,        ,        , COLEMAK,  DVORAK, QWERTY,
+  //   M_MAKE, EE_CLR ,        ,        ,        ,        ,       RGB_TOG,        ,        , COLEMAK,  DVORAK, QWERTY,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
   //   M_VRSN,  M_MALL,        , RGB_SAI, RGB_HUI, RGB_VAI,              ,        ,        ,        ,        ,        ,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 09a30761b8..b0059705a0 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -157,11 +157,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_UTIL] = LAYOUT_split_3x6_3( \
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        QK_BOOT, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK,                      RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI,\
+      QK_BOOT, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK,                      RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_RST, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY,  GAMING,                      RGB_UND, RGB_DUO, RGB_SCR, RGB_SPI, RGB_SAD, RGB_SAI,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      EEP_RST, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX,                      RGB_TOG, RGB_SOL, RGB_CYC, RGB_SPD, RGB_VAD, RGB_VAI,\
+       EE_CLR, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX,                      RGB_TOG, RGB_SOL, RGB_CYC, RGB_SPD, RGB_VAD, RGB_VAI,\
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,    _______, _______, _______ \
                                       //`--------------------------'  `--------------------------'
diff --git a/keyboards/crkbd/keymaps/snowe/keymap.c b/keyboards/crkbd/keymaps/snowe/keymap.c
index f5972d62db..685491903e 100644
--- a/keyboards/crkbd/keymaps/snowe/keymap.c
+++ b/keyboards/crkbd/keymaps/snowe/keymap.c
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] = LAYOUT_wrapper( \
         _______, _________________ADJUST_L1_________________,                         _________________ADJUST_R1_________________, KC_RESET,
-        _______, _________________ADJUST_L2_________________,                         _________________ADJUST_R2_________________, EEP_RST,
+        _______, _________________ADJUST_L2_________________,                         _________________ADJUST_R2_________________, EE_CLR,
         _______, _________________ADJUST_L3_________________,                         _________________ADJUST_R3_________________, KC_MPLY,
                                             _______, _______, _______,        _______, _______, _______
     )
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h b/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
index 03d438306e..f182a1a6d8 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
+++ b/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
@@ -48,10 +48,10 @@
 
 #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
 #   define ________________________ADJUST_L2________________________ RGBRST  , XXXXXXX , RGB_SPI , RGB_SAI , RGB_HUI , RGB_VAI
-#   define ________________________ADJUST_L3________________________ EEP_RST , XXXXXXX , RGB_SPD , RGB_SAD , RGB_HUD , RGB_VAD
+#   define ________________________ADJUST_L3________________________ EE_CLR  , XXXXXXX , RGB_SPD , RGB_SAD , RGB_HUD , RGB_VAD
 #else                                                                                                                
 #   define ________________________ADJUST_L2________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-#   define ________________________ADJUST_L3________________________ EEP_RST , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
+#   define ________________________ADJUST_L3________________________ EE_CLR  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
 #endif
 
 #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
index 5ae28bb101..00b144a2f4 100644
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN] = LAYOUT(
         KC_NO,     DB_TOGG,   QK_BOOT,   KC_TRNS,
-        KC_NO,     KC_NO,     EEP_RST,   KC_TRNS,
+        KC_NO,     KC_NO,     EE_CLR,    KC_TRNS,
         KC_NO,     KC_NO,     KC_NO,     KC_TRNS,
         KC_TRNS,   KC_NO,     KC_NO),
 };
diff --git a/keyboards/donutcables/budget96/keymaps/default/keymap.c b/keyboards/donutcables/budget96/keymaps/default/keymap.c
index 5fa73defa3..e3870a7fb5 100644
--- a/keyboards/donutcables/budget96/keymaps/default/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL,  KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0,   KC_PDOT, KC_PENT),
 
 [1] = LAYOUT_96_ansi(
-      QK_BOOT,   EEP_RST,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+      QK_BOOT, EE_CLR,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
       BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
index ed69b5e562..d3a60f6e93 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* (3) Fn 2 */
     [_FN2] = LAYOUT_96_ansi(
-	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC_M_WC, EEP_RST, 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, UC_M_WC, EE_CLR, QK_BOOT, 
 	VLK_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
diff --git a/keyboards/donutcables/budget96/keymaps/via/keymap.c b/keyboards/donutcables/budget96/keymaps/via/keymap.c
index 4761131459..65bceae47d 100644
--- a/keyboards/donutcables/budget96/keymaps/via/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL,  KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0,   KC_PDOT, KC_PENT),
 
 [1] = LAYOUT_96_ansi(
-      QK_BOOT,   EEP_RST,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+      QK_BOOT, EE_CLR,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
       BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/draculad/keymaps/default/keymap.c b/keyboards/draculad/keymaps/default/keymap.c
index d9468068ba..e83811df73 100644
--- a/keyboards/draculad/keymaps/default/keymap.c
+++ b/keyboards/draculad/keymaps/default/keymap.c
@@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX
     ),
     [_ADJ] = LAYOUT(
-        QK_BOOT,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG,
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,
                                             XXXXXXX,                      _______,
                                    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/draculad/keymaps/pimoroni/keymap.c b/keyboards/draculad/keymaps/pimoroni/keymap.c
index a98c47fd39..f074a9d353 100644
--- a/keyboards/draculad/keymaps/pimoroni/keymap.c
+++ b/keyboards/draculad/keymaps/pimoroni/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJ] = LAYOUT(
         QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      BALL_HUI, BALL_WHT, BALL_DEC, XXXXXXX, XXXXXXX,
-        EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI, RGB_TOG,
+        EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI, RGB_TOG,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_VAD, _______,
                                             XXXXXXX,                      _______,
                                    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,  XXXXXXX
diff --git a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
index 1df1b35804..e1f7285b44 100644
--- a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
@@ -11,14 +11,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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,          EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
index a86db3ea65..98d797bf6b 100644
--- a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MEDIA] = LAYOUT(
         TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PWR,
         _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EE_CLR,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_RGB] = LAYOUT(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
         _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EE_CLR,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
index 9497129104..711d8687ba 100644
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
@@ -11,14 +11,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_GRAVE,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, _______,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            KC_SPC,                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     )
diff --git a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
index b3c0933c75..e6cf400da3 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
@@ -65,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         TO(2),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, KC_GRV, _______, _______, _______, _______, _______, KC_PSCR, _______,  _______, _______, KC_MPLY, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, KC_VOLU, KC_MUTE,
         KC_LCTL, _______, KC_LALT,                            TO(0),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
         _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            TO(0),                   _______, _______, _______, _______, _______
     )
diff --git a/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c b/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
index 8ca92d1012..bd396b8ead 100644
--- a/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
@@ -28,13 +28,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_HOME, KC_END,  QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN,          EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         RGB_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,  KC_DEL,
-        _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT,
+        _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT,
         _______, RGB_SAD, RGB_HUD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, _______,
         _______, _______, _______,                            _______,                   _______, _______, RGB_SPI, RGB_VAD, RGB_SPD
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
index 6727e4de49..4912fb6210 100644
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FNM] = LAYOUT( /* FN */
 		KC_TRNS,  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,    KC_F6,    KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,
 		KC_TRNS,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI,  RGB_SAD,  RGB_VAI, RGB_VAD,  KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, RGB_SPI,  RGB_SPD, KC_HOME, KC_PGUP,    EEP_RST,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, RGB_SPI,  RGB_SPD, KC_HOME, KC_PGUP,    EE_CLR,
 		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_END,  KC_PGDN, KC_VOLU,    KC_MUTE,
 		KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,                     KC_TRNS,  KC_TRNS, KC_MPRV, KC_VOLD,    KC_MNXT)
 };
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
index dc0d318172..8c42797d20 100644
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_RGB] = LAYOUT(
         _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_DEL,
         _______, RGB_TOG,  _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______,  _______,  _______, QK_BOOT,
-        _______, _______,  _______, _______, _______, RGB_PCY, _______, _______, RGB_SPI, RGB_SPD, _______,  _______,           EEP_RST,
+        _______, _______,  _______, _______, _______, RGB_PCY, _______, _______, RGB_SPI, RGB_SPD, _______,  _______,           EE_CLR,
         _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  RGB_000, _______,
         _______, _______,  _______,                            RGB_RST,                   _______, _______,  KC_PWR,   AMDREC,  AMDREP
     ),
diff --git a/keyboards/dztech/dz60rgb/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
index fe037ce955..3697f38d6c 100644
--- a/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
@@ -11,14 +11,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_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,          EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
index d62ff6240d..0cf6ab644d 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
@@ -11,12 +11,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 							KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 	[_LAYER1] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
 							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-							 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST,
+							 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EE_CLR,
 							 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
 	[_LAYER2] = LAYOUT(KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_DEL,
 								KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_PSLS, KC_PAST, QK_BOOT,
-								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, EEP_RST,
+								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, EE_CLR,
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS,
 								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
index b1b07586f7..0791f9e665 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG]     = LAYOUT_60_ansi(\
      _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
-     _______,   NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
      _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
      _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   \
      _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______)
diff --git a/keyboards/dztech/dz64rgb/keymaps/default/keymap.c b/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
index 22bd186281..032473f88f 100644
--- a/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
@@ -27,14 +27,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_64_ansi(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT_64_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, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/dztech/dz64rgb/keymaps/via/keymap.c b/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
index 22bd186281..032473f88f 100644
--- a/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
@@ -27,14 +27,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_64_ansi(
         TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT_64_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, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
         _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
     ),
diff --git a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
index fde62bee3d..c6c542c630 100644
--- a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_ansi(
         KC_GESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS,         RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
-        LCTL_T(KC_CAPS), RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_PGDN,
+        LCTL_T(KC_CAPS), RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,  KC_PGDN,
         KC_LSFT,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_VOLU, KC_MUTE,
         KC_TRNS,         KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
     )
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 660d310b11..b8e66c729a 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -223,7 +223,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_CONFIG] = LAYOUT_65_ansi(
         TO(_MAIN), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL2,
-        KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, DB_TOGG, EEP_RST, KC_NO, KC_ACL1,
+        KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, DB_TOGG, EE_CLR, KC_NO, KC_ACL1,
         KC_NO, UC_RMOD, UC_MOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL0,
         KC_NO, MAGIC_TOGGLE_NKRO, MAGIC_UNHOST_NKRO, MAGIC_HOST_NKRO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
diff --git a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
index 64c23f19c1..35b556d3c3 100644
--- a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
@@ -10,8 +10,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
-        CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP,
+        CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______,        _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     )
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c b/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
index f41d871a59..ec63d53bd7 100644
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_KB] = LAYOUT_65_ansi(
         XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,
         XXXXXXX,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX,        XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, _BASEEF, _KITTEF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          EEP_RST, XXXXXXX,
+        XXXXXXX,        XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, _BASEEF, _KITTEF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          EE_CLR,  XXXXXXX,
         KC_LSFT,                 RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, XXXXXXX, XXXXXXX,
         XXXXXXX,        XXXXXXX, XXXXXXX,                            XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
     )
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index 95a08eb560..cf2117232c 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_FNC]    = LAYOUT_65_ansi(
 		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  _______, KC_ASTG, \
 		_______, RGB_MOD,  RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT,  RGB_RMOD, RGB_MOD, _______, KC_MPRV, \
-		_______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP,  _______,           EEP_RST, KC_MNXT, \
+		_______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP,  _______,           EE_CLR,  KC_MNXT, \
 		_______, RGB_TOG,  _______, _______, REEPROM, REBOOT,  TG_NKRO, MAS_YEL, MAS_GRN, MAS_CRM, _______,  _______,           KC_VOLU, KC_MUTE, \
 		_______, _______,  _______,                  _______,                             _______, _V_V_V_,  _______,  RGB_SPD, KC_VOLD, RGB_SPI  \
 	),
diff --git a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
index 1f641efd10..ae7e29c837 100644
--- a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FL] = LAYOUT_65_ansi(
         KC_ESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
         _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SCRL, KC_PAUS, QK_BOOT, _______,
-        _______,        RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
+        _______,        RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
         _______,        _______, _______,                            KC_MPLY,                   _______, _______, _______, KC_HOME, KC_VOLD, KC_END
     )
diff --git a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c b/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
index 07337b2a58..83a947d70f 100644
--- a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_ansi(
         KC_GRV,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
         _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP,
-        CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
+        CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______,        _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     )
diff --git a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
index cf985c22c2..919a81d746 100644
--- a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_ansi(
         KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
-        CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, KC_PGDN,
+        CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
         _______,        _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
diff --git a/keyboards/eco/keymaps/bcat/keymap.c b/keyboards/eco/keymaps/bcat/keymap.c
index b4344e3bb0..610610f5a5 100644
--- a/keyboards/eco/keymaps/bcat/keymap.c
+++ b/keyboards/eco/keymaps/bcat/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/b18aafa0327d7e83eaf485546c067a21 */
     [LAYER_ADJUST] = LAYOUT(
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c
index 3c0ef320a4..ede7d0e9fb 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,     KC_TRNS, KC_UP,   KC_7,    KC_8,    KC_9,    KC_ASTR, KC_F12,
   KC_TRNS, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,               KC_DOWN, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_TRNS,
   KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS,     KC_TRNS, KC_AMPR, KC_1,    KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-  EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                         KC_TRNS, KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
+  EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                         KC_TRNS, KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
                                                RGB_MOD, KC_TRNS,     RGB_TOG, RGB_M_P,
                                                         KC_TRNS,     KC_TRNS,
                                       RGB_VAD, RGB_VAI, KC_TRNS,     KC_TRNS, RGB_HUD, RGB_HUI
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
index b05a71fac4..6224e8baa8 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
@@ -348,6 +348,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // right thumb
         XXXXXXX, XXXXXXX,
         XXXXXXX,
-        XXXXXXX, XXXXXXX, EEP_RST
+        XXXXXXX, XXXXXXX, EE_CLR
     )
 };
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
index 13df4c3ff4..13a06f6065 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
@@ -996,7 +996,7 @@ bool suspended = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case EEP_RST:
+        case QK_CLEAR_EEPROM:
             if (record->event.pressed) {
                 eeconfig_init();
             }
diff --git a/keyboards/ergodox_ez/keymaps/rishka/keymap.c b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
index 5a343d9c1a..0146196eee 100644
--- a/keyboards/ergodox_ez/keymaps/rishka/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
@@ -110,7 +110,7 @@ _______, _______, _______, _______, _______,
                     _______, _______, _______, _______, _______,
   _______, _______,
   _______,
-  _______, _______, EEP_RST
+  _______, _______, EE_CLR
 ),
 };
 
diff --git a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c b/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
index bc2c3d7a62..fa2043f4a0 100644
--- a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FNM] = LAYOUT_65_ansi_7u_wk_splitbs(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, KC_DEL, KC_MPLY,
     _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          QK_BOOT, KC_VOLU,
-    AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        EEP_RST,          KC_VOLD,
+    AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        EE_CLR,           KC_VOLD,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 KC_BTN1, KC_MS_U, KC_MNXT,
     _______, _______, _______,                   _______,                                     _______,                 KC_MS_L, KC_MS_D, KC_MS_R
   ),
diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
index 2029abbcee..41c6da296a 100644
--- a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c b/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
index 5307b030e6..31675a3d37 100644
--- a/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
index 2029abbcee..41c6da296a 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
index 08bf9d7f83..c7414d83b8 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/fc660c/keymaps/default_rgb/keymap.c b/keyboards/fc660c/keymaps/default_rgb/keymap.c
index 869a2eee48..a67d4d3c40 100644
--- a/keyboards/fc660c/keymaps/default_rgb/keymap.c
+++ b/keyboards/fc660c/keymaps/default_rgb/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,_______,_______,                _______,                _______,MO(2),  _______,     KC_HOME,KC_PGDN,KC_END
     ),
   [2] = LAYOUT(
-        QK_BOOT,  EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_TOG,
+        QK_BOOT,EE_CLR, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_TOG,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_MOD,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_VAI,
diff --git a/keyboards/fc660c/keymaps/via_rgb/keymap.c b/keyboards/fc660c/keymaps/via_rgb/keymap.c
index b12574384d..a7b96a48a3 100644
--- a/keyboards/fc660c/keymaps/via_rgb/keymap.c
+++ b/keyboards/fc660c/keymaps/via_rgb/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,_______,_______,                _______,                _______,MO(2),  _______,     KC_HOME,KC_PGDN,KC_END
     ),
   [2] = LAYOUT(
-        QK_BOOT,  EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,
+        QK_BOOT,EE_CLR, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_MOD,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_VAI,
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
index 7850061d40..2d57dd71bb 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 	[_FL] = LAYOUT_60_tsangan_hhkb(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-    _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
+    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
     _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
     _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
     _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/giabalanai/keymaps/2firmware/keymap.c b/keyboards/giabalanai/keymaps/2firmware/keymap.c
index 3f0012ace4..790bb76619 100644
--- a/keyboards/giabalanai/keymaps/2firmware/keymap.c
+++ b/keyboards/giabalanai/keymaps/2firmware/keymap.c
@@ -332,7 +332,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
     XXXXXXX,
-      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EEP_RST,   _______,
+      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
     CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, XXXXXXX, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
       XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
@@ -401,7 +401,7 @@ const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(
                                                                          {87,  1, HSV_SPRINGGREEN}, //  MIDI Oct
                                                                          {88,  1, HSV_GREEN},       //  MIDI Oct
                                                                          {89,  1, HSV_CHARTREUSE},  //  MIDI Oct
-                                                                         {96,  1, HSV_PINK},        //  EEP_RST
+                                                                         {96,  1, HSV_PINK},        //  EE_CLR
                                                                          {98,  6, HSV_ORANGE},      //  MIDI layouts
                                                                          {107, 1, HSV_YELLOW},      //  MI_VELD
                                                                          {108, 1, HSV_GREEN},       //  MI_VELU
diff --git a/keyboards/giabalanai/keymaps/3araht/keymap.c b/keyboards/giabalanai/keymaps/3araht/keymap.c
index 3a2ed8c0be..220acae078 100644
--- a/keyboards/giabalanai/keymaps/3araht/keymap.c
+++ b/keyboards/giabalanai/keymaps/3araht/keymap.c
@@ -347,7 +347,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
     XXXXXXX,
-      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EEP_RST,   _______,
+      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
     CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
       XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
@@ -417,7 +417,7 @@ const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(
                                                                          {87,  1, HSV_SPRINGGREEN}, //  MIDI Oct
                                                                          {88,  1, HSV_GREEN},       //  MIDI Oct
                                                                          {89,  1, HSV_CHARTREUSE},  //  MIDI Oct
-                                                                         {96,  1, HSV_PINK},        //  EEP_RST
+                                                                         {96,  1, HSV_PINK},        //  EE_CLR
                                                                          {98,  7, HSV_ORANGE},      //  MIDI layouts
                                                                          {107, 1, HSV_YELLOW},      //  MI_VELD
                                                                          {108, 1, HSV_GREEN},       //  MI_VELU
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
index 47ca0894ee..8d2853e5c2 100644
--- a/keyboards/giabalanai/keymaps/party/keymap.c
+++ b/keyboards/giabalanai/keymaps/party/keymap.c
@@ -347,7 +347,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
     XXXXXXX,
-      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EEP_RST,   _______,
+      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
     CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, RGB_MOD, RGB_TOG,
       XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
@@ -417,7 +417,7 @@ const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(
                                                                          {87,  1, HSV_SPRINGGREEN}, //  MIDI Oct
                                                                          {88,  1, HSV_GREEN},       //  MIDI Oct
                                                                          {89,  1, HSV_CHARTREUSE},  //  MIDI Oct
-                                                                         {96,  1, HSV_PINK},        //  EEP_RST
+                                                                         {96,  1, HSV_PINK},        //  EE_CLR
                                                                          {98,  7, HSV_ORANGE},      //  MIDI layouts
                                                                          {107, 1, HSV_YELLOW},      //  MI_VELD
                                                                          {108, 1, HSV_GREEN},       //  MI_VELU
@@ -512,7 +512,7 @@ bool rgb_matrix_indicators_user(void) {
                 rgb_matrix_set_color(28, RGB_DARKSPRINGGREEN); //  MIDI Oct
                 rgb_matrix_set_color(29, RGB_DARKGREEN);       //  MIDI Oct
                 rgb_matrix_set_color(30, RGB_DARKCHARTREUSE);  //  MIDI Oct
-                rgb_matrix_set_color(37, RGB_DARKPINK);        //  EEP_RST
+                rgb_matrix_set_color(37, RGB_DARKPINK);        //  EE_CLR
                 rgb_matrix_set_color(41, RGB_DARKYELLOW);      //  MI_VELD
                 rgb_matrix_set_color(40, RGB_DARKGREEN);       //  MI_VELU
                 rgb_matrix_set_color(39, RGB_DARKBLUE);        //  RGB_MOD
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index 52a4a06e02..c00ba602f7 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT(
-        EEP_RST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,          KC_MUTE,
+        EE_CLR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,          KC_MUTE,
         KC_NUM,  KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, KC_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_PSLS, KC_PAST, KC_BSLS,          KC_PGUP,
         KC_CAPS, RGB_VAD, RGB_TOG, RGB_VAI, KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_PENT,          KC_PGDN,
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
index 033f66a8b6..454d346f18 100644
--- a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */
 	[_FN] = LAYOUT_all(
-                KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EEP_RST,          _______,  KC_VOLD, KC_VOLU,
+                KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EE_CLR,           _______,  KC_VOLD, KC_VOLU,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,  RGB_SAI, RGB_SPI,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_SPD,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
diff --git a/keyboards/gopolar/gg86/keymaps/default/keymap.c b/keyboards/gopolar/gg86/keymaps/default/keymap.c
index 81be2daae6..1d043a95d8 100644
--- a/keyboards/gopolar/gg86/keymaps/default/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/default/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */
 	[1] = LAYOUT_all(
-                KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EEP_RST,          _______,  KC_VOLD, KC_VOLU,
+                KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EE_CLR,           _______,  KC_VOLD, KC_VOLU,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,  RGB_SAI, RGB_SPI,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_SPD,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
diff --git a/keyboards/gopolar/gg86/keymaps/via/keymap.c b/keyboards/gopolar/gg86/keymaps/via/keymap.c
index 81be2daae6..1d043a95d8 100644
--- a/keyboards/gopolar/gg86/keymaps/via/keymap.c
+++ b/keyboards/gopolar/gg86/keymaps/via/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */
 	[1] = LAYOUT_all(
-                KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EEP_RST,          _______,  KC_VOLD, KC_VOLU,
+                KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EE_CLR,           _______,  KC_VOLD, KC_VOLU,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,  RGB_SAI, RGB_SPI,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_SPD,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
diff --git a/keyboards/gray_studio/hb85/keymaps/stt/keymap.c b/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
index 9a173d7885..6b05a1ca45 100644
--- a/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
+++ b/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_stt(
         QK_BOOT, RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_M_X,  RGB_M_G,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                            \
-        EEP_RST, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+        EE_CLR,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
         BL_TOGG, BL_STEP,  BL_INC,   BL_DEC,   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, \
         RGB_TOG, RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
         KC_TRNS, RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
diff --git a/keyboards/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c
index 5af59227b1..0ca19e4a5b 100644
--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
@@ -182,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-  QK_BOOT,   HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST , _______, _______, _______, _______, _______, EEP_RST,
+  QK_BOOT,   HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST , _______, _______, _______, _______, _______, EE_CLR,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG,
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index 53351357ea..3114accd6b 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_wrapper(
-  _______, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST, _______, _______, _______, _______, _______, EEP_RST, \
+  _______, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST, _______, _______, _______, _______, _______, EE_CLR, \
   QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
   _______, MAGIC_TOGGLE_NKRO, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG, \
diff --git a/keyboards/handwired/aranck/keymaps/default/keymap.c b/keyboards/handwired/aranck/keymaps/default/keymap.c
index 016c246fc5..db11a2182a 100644
--- a/keyboards/handwired/aranck/keymaps/default/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/default/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT,   EEP_RST, _______, _______, _______, _______, _______, _______,  _______, _______,  KC_DEL,
+    _______, QK_BOOT, EE_CLR,  _______, _______, _______, _______, _______, _______,  _______, _______,  KC_DEL,
     _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
     _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
index 9b8ddce806..a9c99f726d 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+    _______, QK_BOOT, EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
     _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
     _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
diff --git a/keyboards/handwired/chiron/keymaps/default/keymap.c b/keyboards/handwired/chiron/keymaps/default/keymap.c
index 969cf420c6..93e9644508 100644
--- a/keyboards/handwired/chiron/keymaps/default/keymap.c
+++ b/keyboards/handwired/chiron/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			),
 	[1] = LAYOUT(
 			XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_WH_U,  XXXXXXX,  XXXXXXX,  QK_BOOT,
-			XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_VOLU,  KC_WH_L,  KC_MS_U,  KC_WH_R,  XXXXXXX,  EEP_RST,
+			XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_VOLU,  KC_WH_L,  KC_MS_U,  KC_WH_R,  XXXXXXX,  EE_CLR,
 			XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  _______,  _______,  KC_MUTE,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_BTN1,  KC_BTN2,
 			_______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  _______,  KC_VOLD,  XXXXXXX,  KC_WH_D,  XXXXXXX,  KC_BTN3,  KC_BTN4,
 			XXXXXXX,  XXXXXXX,  XXXXXXX,            _______,  _______,  _______,  _______,  _______,  _______,            XXXXXXX,  XXXXXXX,  XXXXXXX
@@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			XXXXXXX,  XXXXXXX,  XXXXXXX,            _______,  _______,  _______,  _______,  _______,  _______,            XXXXXXX,  XXXXXXX,  XXXXXXX
 			),
 	[4] = LAYOUT(
-			QK_BOOT,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-			EEP_RST,  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,
+			EE_CLR,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
 			XXXXXXX,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_MOD,   RGB_TOG,  _______,  _______,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,
 			_______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_RMOD,  XXXXXXX,  _______,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
 			XXXXXXX,  XXXXXXX,  XXXXXXX,            _______,   _______,  _______,  _______,  _______,  _______,            XXXXXXX,  XXXXXXX,  XXXXXXX
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
index 98dba608c5..b5a8c82c4a 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
@@ -367,7 +367,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
            LGUI_GRV,KC_LALT,LCTL_LBRC,LSFT_RBRC,KC_LPRN,                     KC_RPRN,RSFT_MINS,RCTL_EQL,RALT_BSLS,RGUI_QUOT,
         //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-            KC_TILD, KC_CAPS, KC_LCBR, KC_RCBR,TG(_MOUSE),                    EEP_RST, KC_UNDS, KC_PLUS, KC_PIPE, KC_DQUO,
+            KC_TILD, KC_CAPS, KC_LCBR, KC_RCBR,TG(_MOUSE),                     EE_CLR, KC_UNDS, KC_PLUS, KC_PIPE, KC_DQUO,
         //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
                                         VVV,     VVV,     VVV,        VVV,    TG(4),    VVV
         //                           |--------+--------+--------|  |--------+--------+--------|
diff --git a/keyboards/handwired/fruity60/keymaps/default/keymap.c b/keyboards/handwired/fruity60/keymaps/default/keymap.c
index da31827093..ba748ac23b 100644
--- a/keyboards/handwired/fruity60/keymaps/default/keymap.c
+++ b/keyboards/handwired/fruity60/keymaps/default/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FN] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,  QK_BOOT,
+        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,   QK_BOOT,
         KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/handwired/heisenberg/keymaps/default/keymap.c b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
index 494239fe3c..3332a99553 100644
--- a/keyboards/handwired/heisenberg/keymaps/default/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT,   EEP_RST, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, QK_BOOT, EE_CLR,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
     _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
     _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
index 18e4b55685..e66db86667 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, EEP_RST, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
+    _______, QK_BOOT, EE_CLR,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
     _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
     _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
diff --git a/keyboards/handwired/myskeeb/keymaps/default/keymap.c b/keyboards/handwired/myskeeb/keymaps/default/keymap.c
index a1fa77566b..ee0ead3664 100644
--- a/keyboards/handwired/myskeeb/keymaps/default/keymap.c
+++ b/keyboards/handwired/myskeeb/keymaps/default/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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_BSPC,
         KC_CAPS, KC_PDOT, KC_PPLS, KC_PMNS, KC_PAST, KC_PSLS, KC_MSEL,          KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PWR,  QK_BOOT,
-        KC_TAB,  KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                              KC_SCRL, NK_ON,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TAB,  KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                              KC_SCRL, NK_ON,   EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS,
         KC_LSFT, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_MUTE,          KC_MPLY, KC_NUM,  NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC, KC_TRNS, KC_VOLD, KC_VOLU,          KC_MPRV, KC_MNXT, TO(2),   KC_HOME, KC_PGDN, KC_PGUP, KC_END
     ),
diff --git a/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c b/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
index 3f7a6b8502..e206b6b39f 100644
--- a/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ortho_1x1(EEP_RST)
+    LAYOUT_ortho_1x1(EE_CLR)
 };
diff --git a/keyboards/handwired/p65rgb/keymaps/default/keymap.c b/keyboards/handwired/p65rgb/keymaps/default/keymap.c
index f1cf1db547..bfb62edd8e 100644
--- a/keyboards/handwired/p65rgb/keymaps/default/keymap.c
+++ b/keyboards/handwired/p65rgb/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT( /* FN */
         KC_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_TRNS, KC_TRNS,   KC_INS,
         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_HOME,
-        CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, EEP_RST,  KC_END,
+        CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, EE_CLR,   KC_END,
         KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
         KC_TRNS,       KC_TRNS,  KC_TRNS,                               KC_TRNS,                   KC_TRNS, KC_TRNS,  KC_MPRV,      KC_VOLD,  KC_MNXT),
 
diff --git a/keyboards/helix/rev3_4rows/keymaps/default/keymap.c b/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
index 30cf377ac9..bdda908d7a 100644
--- a/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
+++ b/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] =  LAYOUT(
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-      _______, QK_BOOT,   RGBRST,  EEP_RST, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL,
+      _______, QK_BOOT, RGBRST,  EE_CLR,  _______, _______,                   _______, _______, _______, _______, _______, KC_DEL,
       _______, _______, _______, _______, _______, AG_NORM,                   AG_SWAP, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
       )
diff --git a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
index 31e323f4a1..5ca944914a 100644
--- a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] =  LAYOUT(
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-      _______, QK_BOOT,   RGBRST,  EEP_RST, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL,
+      _______, QK_BOOT, RGBRST,  EE_CLR,  _______, _______,                   _______, _______, _______, _______, _______, KC_DEL,
       _______, _______, _______, _______, _______, AG_NORM,                   AG_SWAP, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
diff --git a/keyboards/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c
index eb4692a4c2..5a52c05586 100644
--- a/keyboards/hotdox/keymaps/default/keymap.c
+++ b/keyboards/hotdox/keymaps/default/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
  * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- * | EEP_RST  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ * | EE_CLR  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
  *   `-----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |Animat|      |       |Toggle|Solid |
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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,
-       EEP_RST,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+       EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                        RGB_MOD,KC_TRNS,
                                                KC_TRNS,
                                RGB_VAD,RGB_VAI,KC_TRNS,
diff --git a/keyboards/hotdox/keymaps/eozaki/keymap.c b/keyboards/hotdox/keymaps/eozaki/keymap.c
index d4b8f491fd..d30308fa28 100644
--- a/keyboards/hotdox/keymaps/eozaki/keymap.c
+++ b/keyboards/hotdox/keymaps/eozaki/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
  * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- * | EEP_RST |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ * | EE_CLR  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
  *   `-----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |Animat|      |       |Toggle|Solid |
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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,
-       EEP_RST,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+       EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                        RGB_MOD,KC_TRNS,
                                                KC_TRNS,
                                RGB_VAD,RGB_VAI,KC_TRNS,
diff --git a/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
index b691b115fb..5c2fd1f273 100644
--- a/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	_______, _______, _______,                   _______,                   _______, _______, _______, _______),
 
   [_FN2_60] = LAYOUT_60_ansi(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,
 	_______, EF_INC,  ES_INC,  S1_INC,  H1_INC,  S2_INC,  H2_INC,  BR_INC,  _______, _______, _______, _______, _______, QK_BOOT,
 	_______, EF_DEC,  ES_DEC,  S1_DEC,  H1_DEC,  S2_DEC,  H2_DEC,  BR_DEC,  _______, _______, _______, _______, KC_MAKE,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c
index 838ac56133..6523e1aaf1 100644
--- a/keyboards/hub16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/hub16/keymaps/ahk_companion/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_MPLY, KC_MUTE,
                 RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
                 RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSFT,
+                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
                 KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         ),
 };
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c
index 9342193ef2..1e07e2b690 100644
--- a/keyboards/hub16/keymaps/peepeetee/keymap.c
+++ b/keyboards/hub16/keymaps/peepeetee/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 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,  EEP_RST, QK_BOOT,   KC_TRNS
+                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_TRNS
         ),
 
         [3] = LAYOUT(
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 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,  EEP_RST, QK_BOOT,   KC_TRNS
+                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_TRNS
         )
 
 
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         //                 KC_MPLY, KC_MUTE,
         //         RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
         //         RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-        //         RGB_TOG,  EEP_RST, QK_BOOT,   KC_LSFT,
+        //         RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
         //         KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
         // ),
 };
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
index ffe2c6053b..f6fd7fc48b 100644
--- a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
+++ b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_INC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-  EEP_RST, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+  EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
 ),
 
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
index 07a7b16229..d37aef89aa 100644
--- a/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/rverst/rverst.json
@@ -332,7 +332,7 @@
       "KC_MNXT"
     ],
     [
-      "EEP_RST",
+      "EE_CLR",
       "RV_SM0",
       "RV_SM1",
       "RV_SM2",
diff --git a/keyboards/ilumkb/simpler61/keymaps/default/keymap.c b/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
index 472cb65a28..916b7b8168 100644
--- a/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
+++ b/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_61_ansi(
         KC_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,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, QK_BOOT,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, _______,          _______,
 		_______, _______, _______,                   _______,                                     _______, _______,          _______
 	)
diff --git a/keyboards/ilumkb/simpler61/keymaps/via/keymap.c b/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
index 984af3101d..05dee2143b 100644
--- a/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
+++ b/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_61_ansi(
         KC_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,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, QK_BOOT,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, _______,          _______,
 		_______, _______, _______,                   _______,                                     _______, _______,          _______
 	),
diff --git a/keyboards/ilumkb/simpler64/keymaps/default/keymap.c b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
index 11f165ecd1..a81cd58927 100644
--- a/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
+++ b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_64_ansi(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EE_CLR,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
 	)
diff --git a/keyboards/ilumkb/simpler64/keymaps/via/keymap.c b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
index 2d6ebdfcf6..1affb8c3c0 100644
--- a/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
+++ b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_64_ansi(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EE_CLR,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
 	),
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
index 6f9967b46e..b84f83c3ad 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
  * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |EEP_RST|      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   |EE_CLR |      |      |      |      |                                       |      |    . |   0  |   =  |      |
  *   `-----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |Animat|      |       |Toggle|Solid |
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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,
-       EEP_RST,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+       EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                        RGB_MOD,KC_TRNS,
                                                KC_TRNS,
                                RGB_VAD,RGB_VAI,KC_TRNS,
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
index 86a8b44474..55afa96a52 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
@@ -64,7 +64,7 @@ QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,          KC_PGUP,
 _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
-EEP_RST, _______, _______, _______,                        _______,                       _______, _______,          _______, _______, _______
+EE_CLR,  _______, _______, _______,                        _______,                       _______, _______,          _______, _______, _______
 ),
 };
 
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
index 856bf998c9..31a664304c 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,          KC_PGUP,
         _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
-        EEP_RST, _______, _______, _______,                        _______,              _______, _______, _______,          _______, _______, _______
+        EE_CLR,  _______, _______, _______,                        _______,              _______, _______, _______,          _______, _______, _______
     ),
 };
 
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
index d1a61e570a..74f68e73ac 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
@@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[1] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
-                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
+                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
-                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
+                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
-                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
+                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 };
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
index b20c80a504..0fa9788f91 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
@@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [1] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
-                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
+                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
         [2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
-                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
+                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
         [3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
-                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,
+                         KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 };
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
index 018fe03795..e9c1ce494b 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
@@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[1] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 };
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
index 018fe03795..e9c1ce494b 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
@@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[1] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
                          KC_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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EEP_RST,
+                         KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 };
diff --git a/keyboards/kbdfans/bella/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/bella/rgb/keymaps/default/keymap.c
index aaba70dc33..bc7955c1a8 100644
--- a/keyboards/kbdfans/bella/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/bella/rgb/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,  KC_TRNS, 
 		KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
diff --git a/keyboards/kbdfans/bella/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/bella/rgb/keymaps/via/keymap.c
index fa9b82f87b..642107492a 100644
--- a/keyboards/kbdfans/bella/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/bella/rgb/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,  KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     
diff --git a/keyboards/kbdfans/bella/rgb_iso/keymaps/default/keymap.c b/keyboards/kbdfans/bella/rgb_iso/keymaps/default/keymap.c
index 4cd28782f5..5391c17755 100644
--- a/keyboards/kbdfans/bella/rgb_iso/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/bella/rgb_iso/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, EEP_RST, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, EE_CLR,  KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
diff --git a/keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c b/keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c
index 1ab5dccd38..215746cfc3 100644
--- a/keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   EEP_RST, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, EE_CLR,  KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
index e26b135477..bd5ae02a0c 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
 		[2] = LAYOUT_65_ansi_blocker( 
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
index 43ee4cc944..dc762d9e40 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
 		[2] = LAYOUT_65_ansi_blocker( 
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
index 5f2deda04b..1066882321 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT(
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          TG_ADJT,          XXXXXXX, \
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                   XXXXXXX, XXXXXXX, \
   _______, _______, _______,                   XXXXXXX,                            _______, _______,                   XXXXXXX, XXXXXXX, XXXXXXX),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
index 4a1a1dab31..72afb69f0b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_ansi_blocker( /* MO(1) - Fn */
         KC_GRV,        KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
         _______,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,  KC_PGUP,
-        CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          EEP_RST,  KC_PGDN,
+        CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          EE_CLR,   KC_PGDN,
         KC_LSFT,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          KC_VOLU,  KC_MUTE,
         _______,       _______,  _______,                  _______,                   _______,          _______,  KC_MPRV,          KC_VOLD,  KC_MNXT
     ),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
index aeba99b928..20921aff80 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-------------------------------------------------------------------------┘   └-------------+------´
   */
 	[_FN2] = LAYOUT_65_ansi_blocker(
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   QK_BOOT,   EEP_RST,
+		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   QK_BOOT,   EE_CLR,
 		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_RMOD,  RGB_MOD,   _______,   RGB_M_P,
 		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_SPD,   RGB_SPI,              _______,   RGB_VAI,
 		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              RGB_SAI,   RGB_VAD,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
index 75115feed0..ecf58746a5 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
@@ -10,8 +10,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL,       KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[_LAYER1] = LAYOUT_65_ansi_blocker( /* FN */
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
 };
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
index dacdadce79..2f70136295 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                        _______,  _______,  _______,                   _______,                   _______,          _______,          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, _______,
-                                       _______,  _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
+                                       _______,  _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
                                        _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, _______,
                                        _______,  _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,  _______,          _______, _______, _______,
                                        _______,  _______, _______,                   _______,                   _______,           _______,          _______, _______, _______)
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
index e634f73f58..9d6e08074c 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT_65_ansi_blocker(
         KC_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_CALC,
         _______,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_PSCR, KC_SCRL, KC_PAUS, _______,  _______,  _______, QK_BOOT,   KC_HOME,
-        KC_CAPS,  RGB_SPI,  RGB_SPD, RGB_VAD,  RGB_VAI, _______, _______, _______, _______, _______, _______,  _______,           EEP_RST,   KC_END,
+        KC_CAPS,  RGB_SPI,  RGB_SPD, RGB_VAD,  RGB_VAI, _______, _______, _______, _______, _______, _______,  _______,           EE_CLR,    KC_END,
         KC_LSFT,  RGB_NITE, _______, _______,  _______, _______, KC_NUM,  _______, RGB_TOD, RGB_TOI, KC_MPLY,  _______,           KC_VOLU,   KC_MUTE,
         _______,  KC_WINLCK, _______,                   _______,                            _______, _______,            KC_MPRV, KC_VOLD,   KC_MNXT
     ),
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
index 8727c47ac5..167d65f09b 100644
--- 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
@@ -1 +1 @@
-{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_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","EEP_RST","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"],["KC_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","EEP_RST","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
+{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_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"],["KC_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
index 8c92c73985..1087573b30 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi_blocker(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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, EEP_RST, 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),
+	[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(KC_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, EEP_RST, 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)
+	[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
index 030b604dbc..487ae91385 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
@@ -1 +1 @@
-[["KC_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_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", "EEP_RST", "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"], ["KC_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", "EEP_RST", "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
+[["KC_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_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"], ["KC_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/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
index a2b17a41c5..9f852a5569 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
@@ -9,8 +9,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
 			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
 		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
 		[2] = LAYOUT_65_ansi_blocker( 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
index b2f043b6d1..a970636c41 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_iso_blocker(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_PGUP,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, QK_BOOT,   KC_PGDN,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,  QK_BOOT, KC_PGDN,
         KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
     ),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
index 6b74ac44b2..b8e5d6567f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_iso_blocker(
         KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_PGUP,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, QK_BOOT,   KC_PGDN,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,  QK_BOOT, KC_PGDN,
         KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
     ),
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
index 202ca95e9e..79033db590 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
-        KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_PGDN,
+        KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,  KC_PGDN,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_MPLY, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_VOLD, KC_MFFD
     )
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
index 94b94a8212..95475c08d9 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_all(
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          TG_ADJT,          XXXXXXX, \
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX, XXXXXXX, \
   _______, _______, _______,                   XXXXXXX, XXXXXXX, XXXXXXX,                   _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
diff --git a/keyboards/kbdfans/maja/keymaps/default/keymap.c b/keyboards/kbdfans/maja/keymaps/default/keymap.c
index 13c5f77b65..ca392c92c1 100755
--- a/keyboards/kbdfans/maja/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/default/keymap.c
@@ -9,9 +9,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   KC_N,  KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+			KC_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,  QK_BOOT,  KC_HOME,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
  };
diff --git a/keyboards/kbdfans/maja/keymaps/via/keymap.c b/keyboards/kbdfans/maja/keymaps/via/keymap.c
index 4c0b41a81d..9edfe39fff 100755
--- a/keyboards/kbdfans/maja/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/via/keymap.c
@@ -9,9 +9,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   KC_N,  KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP, 
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+			KC_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,  QK_BOOT,  KC_HOME,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
 		[2] = LAYOUT(
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
index d206c955f7..e56dc4dfd8 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
@@ -23,9 +23,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   KC_N,  KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,KC_TRNS,KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+			KC_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,  QK_BOOT,  KC_TRNS,KC_HOME,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
  		[2] = LAYOUT( /* FN */
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
index 35b2325230..ba6e64c125 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
@@ -23,9 +23,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   KC_N,  KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
 		    KC_LCTL,                 KC_LGUI,  KC_LALT,      KC_SPC,         KC_RALT,        KC_RCTL,                      KC_LEFT, KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,KC_TRNS,KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_PGUP,
-			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+			KC_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,  QK_BOOT,  KC_TRNS,KC_HOME,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
+			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
 		    KC_TRNS,                 KC_TRNS, KC_TRNS,         KC_TRNS,           KC_TRNS,         KC_TRNS,                    KC_MPRV, KC_VOLD,  KC_MNXT),
  		[2] = LAYOUT(
diff --git a/keyboards/keebio/bdn9/keymaps/bcat/keymap.c b/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
index 2313dec9d3..9d4c26f8cb 100644
--- a/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F1,    KC_F2,    KC_F3
     ),
     [LAYER_FUNCTION_1] = LAYOUT(
-        EEP_RST,  _______,  QK_BOOT,
+        EE_CLR,   _______,  QK_BOOT,
         KC_F10,   KC_F11,   KC_F12,
         KC_F7,    KC_F8,    KC_F9
     ),
diff --git a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c b/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
index c549b0dde0..93888665d1 100644
--- a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
+++ b/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, QK_BOOT,        EEP_RST, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
+     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, QK_BOOT,          EE_CLR,  KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     _______, _______, _______,                   _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index 40ec3a8fdf..e0be37892d 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      BL_BRTG, _______, _______, _______, DB_TOGG, QK_BOOT,                            QK_BOOT, DB_TOGG, _______, RGB_HUI, RGB_SAI, RGB_VAI,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_INC, _______, _______, _______, _______, EEP_RST,                            EEP_RST, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
+      BL_INC, _______, _______, _______, _______, EE_CLR,                             EE_CLR,  _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
       BL_DEC, KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
index abdb91192a..f5fbe16c9d 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/keymap.c
@@ -38,7 +38,7 @@ _______ , ___________________BLANK___________________ , _______ , _______ , ____
 
 // Run `./qmk show levinson` from parent dir to see this layer.
 [_OVERWATCH] = LAYOUT_ortho_4x12_wrapper(
-______________OVERWATCH_L1_________________ , TO(0)            , XXXXXXX          , XXXXXXX          , XXXXXXX        , XXXXXXX          , EEP_RST           ,
+______________OVERWATCH_L1_________________ , TO(0)            , XXXXXXX          , XXXXXXX          , XXXXXXX        , XXXXXXX          , EE_CLR            ,
 ______________OVERWATCH_L2_________________ , RGB_MODE_FORWARD , RGB_MODE_REVERSE , RGB_VAI          , RGB_VAD        , XXXXXXX          , RGB_TOG           ,
 ______________OVERWATCH_L3_________________ , RGB_MODE_PLAIN   , RGB_MODE_BREATHE , RGB_MODE_RAINBOW , RGB_MODE_SWIRL , RGB_MODE_SNAKE   , RGB_MODE_XMAS     ,
 ______________OVERWATCH_L4_________________ , KC_SPACE, RGB_HUI          , RGB_HUD          , RGB_SAI          , RGB_SAD        , RGB_MODE_RGBTEST , RGB_MODE_GRADIENT
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
index bd2c5e79fd..a11bfc4eb0 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
     [LAYER_FUNCTION_1] = LAYOUT_65(
         _______,  KC_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,   RGB_HUI,
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EE_CLR,   QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_TOG,            RGB_SAD,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      RGB_VAI,  RGB_HUD,
         _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,            RGB_RMOD, RGB_VAD,  RGB_MOD
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
index f679130130..3bd3ea330f 100644
--- a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN1] = LAYOUT_65_with_macro(
     _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, QK_BOOT, \
-    _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, \
+    _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, KC_TILD, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keybee/keybee65/keymaps/default/keymap.c b/keyboards/keybee/keybee65/keymaps/default/keymap.c
index 9ecb16c4ea..bd6609fb92 100644
--- a/keyboards/keybee/keybee65/keymaps/default/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER1] = LAYOUT_65_ansi(
         KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_TRNS,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     )
diff --git a/keyboards/keybee/keybee65/keymaps/via/keymap.c b/keyboards/keybee/keybee65/keymaps/via/keymap.c
index 961c46c3c3..52ae89abee 100644
--- a/keyboards/keybee/keybee65/keymaps/via/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER1] = LAYOUT_65_ansi(
         KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_TRNS,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
index 5e466630e0..92296cbc55 100644
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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, EEP_RST, _______, KC_NO,   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, _______
   )
 };
diff --git a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
index 0077c4d836..a173e8003c 100644
--- a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [FUN] = LAYOUT(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
         KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,                    _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,
-        _______, _______, _______, _______, _______, QK_BOOT, EEP_RST, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3,
+        _______, _______, _______, _______, _______, QK_BOOT, EE_CLR,  _______, _______, KC_BTN1, KC_BTN2, KC_BTN3,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
     )
 };
diff --git a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
index 2d257fe371..9b861b702f 100644
--- a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                         OSL_FUN,                                        OSL_FUN
     ),
 [FUN] = LAYOUT(
-    EEP_RST, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
+    EE_CLR,  KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
     KC_TAB , _______, KC_MS_U, _______, KC_BTN3, _______, RGB_MOD,    DM_REC2, _______, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_F12 ,
     KC_HOME, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, _______, RGB_HUI,    DM_RSTP, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
     KC_END , KC_PSCR, KC_INS , _______, KC_BTN2, _______, RGB_HUD,    DM_PLY2, _______, _______, _______, _______, KC_BSLS, KC_PIPE,
diff --git a/keyboards/keysofkings/twokey/keymaps/default/keymap.c b/keyboards/keysofkings/twokey/keymaps/default/keymap.c
index b611436b8c..b01d1798b2 100644
--- a/keyboards/keysofkings/twokey/keymaps/default/keymap.c
+++ b/keyboards/keysofkings/twokey/keymaps/default/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		TO(0),
-		QK_BOOT, EEPROM_RESET),
+		QK_BOOT, EE_CLR),
 };
 
 void matrix_init_user(void) {
diff --git a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
index b0e4d52143..d7ded8f415 100644
--- a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
+++ b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 
     [_ADJUST] = LAYOUT(
-		QM_MAKE, EEP_RST, XXXXXXX, \
+		QM_MAKE, EE_CLR,  XXXXXXX, \
 		XXXXXXX, XXXXXXX, XXXXXXX, \
 		DF_NMPD, DF_NMLK, DF_KBNR, \
 		KC_TRNS, XXXXXXX, XXXXXXX  \
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
index 0e4b98c427..72136a5d96 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
@@ -44,7 +44,7 @@ enum custom_keycodes {
   CK_TRIPLEZERO = SAFE_RANGE,
 };
 
-#define CK_CONFIGINIT EEPROM_RESET
+#define CK_CONFIGINIT EE_CLR
 
 enum {
   TD_P_BSPC = 0,
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
index c32469dae9..e7ce38eac2 100644
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
@@ -653,7 +653,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        UC_M_WC,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,
-          EEP_RST,TO(BASE),TO(BASE),TO(BASE),TO(BASE),
+          EE_CLR,TO(BASE),TO(BASE),TO(BASE),TO(BASE),
                                        KC_NO,KC_NO,
                                                KC_NO,
                                KC_NO,KC_NO,KC_NO,
diff --git a/keyboards/ktec/ergodone/keymaps/via/keymap.c b/keyboards/ktec/ergodone/keymaps/via/keymap.c
index f155a4b51d..f475ef009c 100644
--- a/keyboards/ktec/ergodone/keymaps/via/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/via/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
  * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | EEP_RST   |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   | EE_CLR|      |      |      |      |                                       |      |    . |   0  |   =  |      |
  *   `-----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |Animat|      |       |Toggle|Solid |
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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,
-          EEP_RST ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+          EE_CLR ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                        RGB_MOD,KC_TRNS,
                                                KC_TRNS,
                                RGB_VAD,RGB_VAI,KC_TRNS,
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
index 168a62b3d4..03d34fef2b 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 	[_ADJUST] = LAYOUT(
-		EEP_RST, QK_BOOT,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
index ed8a25166c..e6e1ab8638 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 	[_ADJUST] = LAYOUT(
-		EEP_RST, QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_LEAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QWERTY,  COLEMAK, KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 	[_VIM] = LAYOUT(
-		EEP_RST, QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,
 		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/lazydesigners/the30/keymaps/default/keymap.c b/keyboards/lazydesigners/the30/keymaps/default/keymap.c
index a3115dddec..c69b3710a3 100644
--- a/keyboards/lazydesigners/the30/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/the30/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_ortho_3x10(
         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        QK_BOOT,   EEP_RST, _______, _______, KC_SPC,  _______, _______, _______, _______, _______
+        QK_BOOT, EE_CLR,  _______, _______, KC_SPC,  _______, _______, _______, _______, _______
     ),
 
 };
diff --git a/keyboards/lazydesigners/the50/keymaps/default/keymap.c b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
index c8ab42d811..b0b01106c0 100644
--- a/keyboards/lazydesigners/the50/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
@@ -42,10 +42,10 @@ KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,            KC_SPC,
  */
 
 [_FN] = LAYOUT(
-QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_DEL,     KC_HOME, KC_PGUP, _______,
+QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_DEL,     KC_HOME, KC_PGUP, _______,
 _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU,          _______,     KC_END,  KC_PGDN, _______,
 _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,     _______, _______, _______,
-EEP_RST, _______, _______,          _______,            _______,                 _______, _______, _______,     _______, _______, _______
+EE_CLR,  _______, _______,          _______,            _______,                 _______, _______, _______,     _______, _______, _______
 )
 };
 
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
index 531374a2c9..1b3978dc86 100644
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
@@ -65,7 +65,7 @@ _______, _______, _______,          _______,            _______,
 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_DEL,     KC_HOME, KC_PGUP, _______,
 _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU,          _______,     KC_END,  KC_PGDN, _______,
 _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,     _______,   KC_UP, _______,
-EEP_RST, _______, _______,          _______,            _______,                 _______, _______, _______,     KC_LEFT, KC_DOWN, KC_RIGHT
+EE_CLR,  _______, _______,          _______,            _______,                 _______, _______, _______,     KC_LEFT, KC_DOWN, KC_RIGHT
 )
 };
 
diff --git a/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c b/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c
index 71bab883c1..97f70cf219 100755
--- a/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c
@@ -44,11 +44,11 @@ KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,              KC_SPACE,
  */
 
 [_FN] = LAYOUT_split_spc_split_bspc(
-QK_BOOT,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_END,  KC_INS,
+QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_END,  KC_INS,
 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_PGUP, KC_PGDN,
 XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,
 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,
-EEP_RST, XXXXXXX, XXXXXXX,       XXXXXXX,              XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+EE_CLR,  XXXXXXX, XXXXXXX,       XXXXXXX,              XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 )
 };
 
diff --git a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
index 03bee2dcc7..95a0200683 100644
--- a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
+++ b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FNMS] = LAYOUT_65_ansi_split_bs(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, KC_DEL,  KC_MPLY,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         QK_BOOT, KC_VOLU,
-    AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST,         KC_VOLD,
+    AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,          KC_VOLD,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_BTN1, KC_MS_U,KC_MNXT,
     _______, _______, _______,                            _______,                   _______,          _______,          KC_MS_L,KC_MS_D, KC_MS_R
   ),
diff --git a/keyboards/lets_split/keymaps/geripgeri/keymap.c b/keyboards/lets_split/keymaps/geripgeri/keymap.c
index 427467f17a..d72d7b6085 100644
--- a/keyboards/lets_split/keymaps/geripgeri/keymap.c
+++ b/keyboards/lets_split/keymaps/geripgeri/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------'                `-----------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-  QK_BOOT, EEP_RST, _______, RALT(KC_SCLN), _______, _______,       _______, TD(U),  RALT(KC_Z),      TD(O),   _______, _______,
+  QK_BOOT, EE_CLR,  _______, RALT(KC_SCLN), _______, _______,       _______, TD(U),  RALT(KC_Z),      TD(O),   _______, _______,
   _______, RALT(KC_QUOT), _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______
diff --git a/keyboards/lets_split/keymaps/mekberg/keymap.c b/keyboards/lets_split/keymaps/mekberg/keymap.c
index ddde0c4bd4..bb88e8a756 100644
--- a/keyboards/lets_split/keymaps/mekberg/keymap.c
+++ b/keyboards/lets_split/keymaps/mekberg/keymap.c
@@ -220,7 +220,7 @@ SPECIAL
 */
 [_SPECIAL] = LAYOUT_ortho_4x12(
     QK_BOOT, _______, TO_WIN,  KC_VOLU, _______, _______,     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_DEL,
-    EEP_RST, _______, MY_PREV, KC_VOLD, MY_NEXT, _______,     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
+    EE_CLR,  _______, MY_PREV, KC_VOLD, MY_NEXT, _______,     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
     _______, _______, _______, KC_MUTE, _______, _______,     MY_LOCK, TO_MAC,  _______, _______, _______, _______,
     _______, _______, _______, _______, _______, MY_PLAY,     _______, _______, _______, _______, _______, KC_SLEP
 )
diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c
index b919ad034d..09b6a3969b 100644
--- a/keyboards/lily58/keymaps/bcat/keymap.c
+++ b/keyboards/lily58/keymaps/bcat/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */
     [LAYER_ADJUST] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/lily58/keymaps/curry/keymap.c b/keyboards/lily58/keymaps/curry/keymap.c
index 12dde22578..f28b54edcc 100644
--- a/keyboards/lily58/keymaps/curry/keymap.c
+++ b/keyboards/lily58/keymaps/curry/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_wrapper( \
         _______, ___________________BLANK___________________,                    ___________________BLANK___________________, _______,
         KC_MAKE, _________________ADJUST_L1_________________,                    _________________ADJUST_R1_________________, KC_RST,
-        VRSN,    _________________ADJUST_L2_________________,                    _________________ADJUST_R2_________________, EEP_RST,
+        VRSN,    _________________ADJUST_L2_________________,                    _________________ADJUST_R2_________________, EE_CLR,
         MG_NKRO, _________________ADJUST_L3_________________, _______,  _______, _________________ADJUST_R3_________________, RGB_IDL,
                                    _______, _______, _______, _______,  _______, _______, _______, _______
     ),
diff --git a/keyboards/lily58/keymaps/cykedev/keymap.c b/keyboards/lily58/keymaps/cykedev/keymap.c
index 0c1d8d1138..96ed2c5e0f 100644
--- a/keyboards/lily58/keymaps/cykedev/keymap.c
+++ b/keyboards/lily58/keymaps/cykedev/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   `----------------------------'           '------''--------------------'
  */
 [_ADJUST] = LAYOUT(
-  EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,
+  EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,                   KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,                   KC_BRID, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md
index 6ef9361f60..8a51b17862 100644
--- a/keyboards/lily58/keymaps/ninjonas/README.md
+++ b/keyboards/lily58/keymaps/ninjonas/README.md
@@ -99,7 +99,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
 ```c
 /* ADJUST
  * ,------------------------------------------.                    ,-----------------------------------------.
- * |EEP_RST|      |      |      |      |      |                    |      |      |      |COLMAK|DVORAK|QWERTY|
+ * |EE_CLR |      |      |      |      |      |                    |      |      |      |COLMAK|DVORAK|QWERTY|
  * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |M_MAKE |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
diff --git a/keyboards/linworks/fave84h/keymaps/default/keymap.c b/keyboards/linworks/fave84h/keymaps/default/keymap.c
index a1be9d6e40..145b0dad26 100644
--- a/keyboards/linworks/fave84h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
         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_AUDIO_VOL_UP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     )
diff --git a/keyboards/linworks/fave84h/keymaps/via/keymap.c b/keyboards/linworks/fave84h/keymaps/via/keymap.c
index d797749d18..3e29fba9f2 100644
--- a/keyboards/linworks/fave84h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
         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_AUDIO_VOL_UP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
diff --git a/keyboards/linworks/fave87h/keymaps/default/keymap.c b/keyboards/linworks/fave87h/keymaps/default/keymap.c
index 84125d219d..639f382cde 100644
--- a/keyboards/linworks/fave87h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
         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_AUDIO_VOL_UP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     )
diff --git a/keyboards/linworks/fave87h/keymaps/via/keymap.c b/keyboards/linworks/fave87h/keymaps/via/keymap.c
index 1e2b45b41c..fe366829a7 100644
--- a/keyboards/linworks/fave87h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
         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_AUDIO_VOL_UP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
index c16b676b38..f122b8395f 100644
--- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_wrapper(\
     KC_MAKE, _________________ADJUST_L1_________________, _______,  _________________ADJUST_R1_________________, KC_RESET,
-    VRSN,    _________________ADJUST_L2_________________, _______,  _________________ADJUST_R2_________________, EEP_RST,
+    VRSN,    _________________ADJUST_L2_________________, _______,  _________________ADJUST_R2_________________, EE_CLR,
     DB_TOGG, _________________ADJUST_L3_________________, _______,  _________________ADJUST_R3_________________, _______
   )
 
diff --git a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
index ead73732ba..cfc3629714 100644
--- a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [2] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, UC_RMOD, UC_MOD,  _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, LAG_SWP, LAG_NRM,                            _______,                            _______, TG(3),   _______, _______, _______
diff --git a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c b/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
index e8735fc57d..dd9177d8a9 100644
--- a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
         _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, RGB_TOG, _______, _______, EEP_RST, MD_BOOT, NK_TOGG, DBG_TOG, _______, TG(ALT), _______, _______,          KC_PGUP, KC_VOLD,
+        _______, RGB_TOG, _______, _______, EE_CLR,  MD_BOOT, NK_TOGG, DBG_TOG, _______, TG(ALT), _______, _______,          KC_PGUP, KC_VOLD,
         _______, _______, KC_LALT,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
     ),
     [SUPR] = LAYOUT_65_ansi_blocker(
@@ -196,7 +196,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             return false;
-        case EEP_RST:
+        case QK_CLEAR_EEPROM:
             if (record->event.pressed) {
                 key_timer = timer_read32();
             } else {
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
index 90020fd3f5..7a6b640d18 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DEL,
 		_______,    _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_QUOT,  _______,
 		_______,    KC_HOME,  KC_END,   _______,  _______,  _______,  _______,  _______,  KC_LBRC,  KC_RBRC,  _______,  _______,
-		_______,    _______,  _______,  _______,  _______,      _______,        _______,  KC_MPRV,  _______,  KC_MNXT,  EEP_RST),
+		_______,    _______,  _______,  _______,  _______,      _______,        _______,  KC_MPRV,  _______,  KC_MNXT,  EE_CLR),
 
 	[lower] = LAYOUT_2u_space_ortho(
 		_______,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
index 7c2b259063..f683358f4e 100644
--- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, \
-             _______, RGB_LYR, RGB_THM, _______, EEP_RST, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
+             _______, RGB_LYR, RGB_THM, _______, EE_CLR,  QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
              _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
 
 )
diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
index 5a5ab5a8d6..750ab013ae 100644
--- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_TRNS,KC_WINLCK,KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_NO,   KC_NO,   KC_HOME, KC_PGDN, KC_END
     ),
     [_LOWER] = LAYOUT(
-    EEP_RST, KC_TILD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_VAD, RGB_VAI, KC_TRNS, KC_DEL,
+    EE_CLR,  KC_TILD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_VAD, RGB_VAI, KC_TRNS, KC_DEL,
     RGB_HUI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EMO_TEARS, EMO_SAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_TOG,
     RGB_HUD, KC_NO,   KC_NO,   EMO_SHRUG,KC_NO,  KC_NO,   KC_NO,   KC_NO,   EMO_JOY, KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_TRNS,
              KC_NO,   KC_NO,   KC_NO,   EMO_CONFUSE,KC_NO,KC_NO,KC_TRNS,EMO_NERVOUS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_MOD, KC_TRNS,
diff --git a/keyboards/melgeek/mach80/keymaps/default/keymap.c b/keyboards/melgeek/mach80/keymaps/default/keymap.c
index 3942e37ec8..a3ba924718 100755
--- a/keyboards/melgeek/mach80/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                MO(1),    KC_RALT,	 KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
 	),
 	[1] = LAYOUT_tkl_ansi( /* FN */
-	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
 	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,    _______,  KC_INS,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,  
diff --git a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
index 220240a5a6..9ac911af2e 100755
--- a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                MO(1),    KC_RALT,	 KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
 	),
 	[1] = LAYOUT_tkl_ansi( /* FN */
-	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
 	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,  _______,  KC_INS,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,   
diff --git a/keyboards/melgeek/mach80/keymaps/via/keymap.c b/keyboards/melgeek/mach80/keymaps/via/keymap.c
index 0501940cb5..6a448300d3 100755
--- a/keyboards/melgeek/mach80/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                MO(1),    KC_RALT,	 KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
 	),
 	[1] = LAYOUT_tkl_ansi( /* FN */
-	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
 	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,    _______,  KC_INS,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,      
diff --git a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
index 217c191433..e40950d9ca 100755
--- a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,            KC_LALT,                      KC_SPC,                                MO(1),                        KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
 	),
 	[1] = LAYOUT_tkl_ansi_wkl( /* FN */
-	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______, 
 	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,    _______,  KC_INS,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,     
diff --git a/keyboards/melgeek/mj61/keymaps/default/keymap.c b/keyboards/melgeek/mj61/keymaps/default/keymap.c
index ef55edde48..3ed0e8bf56 100644
--- a/keyboards/melgeek/mj61/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj61/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_60_ansi(
         KC_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,          EEP_RST,
+		_______,    KC_LEFT, KC_DOWN,  KC_RGHT,  _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
 		KC_MPRV,             KC_VOLD,  KC_VOLU,  KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, 
 		_______,    _______,           _______,           _______,                            _______, _______, _______, _______
 	),
diff --git a/keyboards/melgeek/mj61/keymaps/via/keymap.c b/keyboards/melgeek/mj61/keymaps/via/keymap.c
index f8f690fbf1..8351165eb0 100644
--- a/keyboards/melgeek/mj61/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj61/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_60_ansi(
         KC_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,          EEP_RST,
+		_______,    KC_LEFT, KC_DOWN,  KC_RGHT,  _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
 		KC_MPRV,             KC_VOLD,  KC_VOLU,  KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, 
 		_______,    _______,           _______,           _______,                            _______, _______, _______, _______
 	),
diff --git a/keyboards/melgeek/mj63/keymaps/default/keymap.c b/keyboards/melgeek/mj63/keymaps/default/keymap.c
index e4e8abc124..18a0b95ab4 100644
--- a/keyboards/melgeek/mj63/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj63/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,    KC_F1,    KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______,   _______,  _______,  _______, _______, _______, KC_CALC, _______, KC_INS,   _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______,   _______,  _______,  _______, _______, _______, _______, _______, _______,  _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______,   _______,  _______,  _______, _______, _______, _______, _______, _______,  _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______,             _______,  _______, _______, _______, _______, NK_TOGG, _______,  _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______,   _______,  _______,                    _______,                             _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
diff --git a/keyboards/melgeek/mj63/keymaps/via/keymap.c b/keyboards/melgeek/mj63/keymaps/via/keymap.c
index 54a608efea..ebaa726f28 100644
--- a/keyboards/melgeek/mj63/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj63/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,    KC_F1,    KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______,   _______,  _______,  _______, _______, _______, KC_CALC, _______, KC_INS,   _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______,   _______,  _______,  _______, _______, _______, _______, _______, _______,  _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______,   _______,  _______,  _______, _______, _______, _______, _______, _______,  _______, KC_HOME, KC_PGUP,          EE_CLR,
         _______,             _______,  _______, _______, _______, _______, NK_TOGG, _______,  _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
         _______,   _______,  _______,                    _______,                             _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
diff --git a/keyboards/melgeek/mj64/keymaps/default/keymap.c b/keyboards/melgeek/mj64/keymaps/default/keymap.c
index 3744a5ae69..c91d248d1d 100644
--- a/keyboards/melgeek/mj64/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_64_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
 			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EEP_RST,
+            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EE_CLR,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   KC_PGDN,  KC_VOLU,  KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
 	)
diff --git a/keyboards/melgeek/mj64/keymaps/via/keymap.c b/keyboards/melgeek/mj64/keymaps/via/keymap.c
index 8f5348facf..87de497cfd 100644
--- a/keyboards/melgeek/mj64/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_64_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
 			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EEP_RST,
+            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EE_CLR,
 		    _______,   _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  KC_INS,   KC_END,   KC_PGDN,  KC_VOLU,  KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
 	),
diff --git a/keyboards/melgeek/mj65/keymaps/default/keymap.c b/keyboards/melgeek/mj65/keymaps/default/keymap.c
index 781fcde206..d82446840a 100644
--- a/keyboards/melgeek/mj65/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,    _______,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EEP_RST,            _______,
+			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,  _______,
+            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EE_CLR,             _______,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
 	)
diff --git a/keyboards/melgeek/mj65/keymaps/via/keymap.c b/keyboards/melgeek/mj65/keymaps/via/keymap.c
index 9131bc5228..5653f1a3fc 100644
--- a/keyboards/melgeek/mj65/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
 			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,    _______,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EEP_RST,            _______,
+			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,  _______,
+            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EE_CLR,             _______,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
 	),
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
index 126b52d132..e466c59f36 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_6u_spc(
 		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  EEP_RST,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_TAB,  EE_CLR,  KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
 		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
diff --git a/keyboards/melgeek/mojo68/keymaps/default/keymap.c b/keyboards/melgeek/mojo68/keymaps/default/keymap.c
index 7b5ef2b2ed..4b919ca05a 100755
--- a/keyboards/melgeek/mojo68/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mojo68/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_68_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR, 
-		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, _______, EEP_RST,		  _______,
+		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, _______, EE_CLR,	          _______,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_INS,  KC_END,  KC_MPLY, KC_VOLU,          KC_MUTE,
 		_______, _______, _______,                   _______,                            _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT  
 	)
diff --git a/keyboards/melgeek/mojo68/keymaps/via/keymap.c b/keyboards/melgeek/mojo68/keymaps/via/keymap.c
index 452a0314f1..3fe69ac05e 100755
--- a/keyboards/melgeek/mojo68/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mojo68/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_68_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR, 
-		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, _______, EEP_RST,		  _______,
+		_______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, _______, EE_CLR,           _______,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_INS,  KC_END,  KC_MPLY, KC_VOLU,          KC_MUTE,
 		_______, _______, _______,                   _______,                            _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT  
 	),
diff --git a/keyboards/melgeek/mojo75/keymaps/default/keymap.c b/keyboards/melgeek/mojo75/keymaps/default/keymap.c
index 1e159c3a08..00394f86b1 100644
--- a/keyboards/melgeek/mojo75/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mojo75/keymaps/default/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_75_ansi( /* FN */
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,           KC_END,
-	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,            KC_INS,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,            EEP_RST,          _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,          KC_INS,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,            EE_CLR,           _______,
 	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,            _______,           KC_VOLU, KC_MUTE,
 	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,            KC_MPRV, KC_VOLD, KC_MNXT
 	)
diff --git a/keyboards/melgeek/mojo75/keymaps/via/keymap.c b/keyboards/melgeek/mojo75/keymaps/via/keymap.c
index 0827aa31af..73b7902b93 100644
--- a/keyboards/melgeek/mojo75/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mojo75/keymaps/via/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_75_ansi( /* FN */
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,           KC_END,
-	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,            KC_INS,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,            EEP_RST,          _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  QK_BOOT,          KC_INS,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,            EE_CLR,           _______,
 	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,            _______,           KC_VOLU, KC_MUTE,
 	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,            KC_MPRV, KC_VOLD, KC_MNXT
 	),
diff --git a/keyboards/melgeek/tegic/keymaps/default/keymap.c b/keyboards/melgeek/tegic/keymaps/default/keymap.c
index db399d8114..fbf0287c8f 100755
--- a/keyboards/melgeek/tegic/keymaps/default/keymap.c
+++ b/keyboards/melgeek/tegic/keymaps/default/keymap.c
@@ -28,9 +28,9 @@ 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_RGHT
 	), 
 	[1] = LAYOUT_tegic_ansi( /* FN */
-	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
-	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  QK_BOOT,    _______,  KC_INS,   _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  QK_BOOT,  _______,  KC_INS,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,      
 	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,	 _______,			 KC_VOLU,  
 	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/melgeek/tegic/keymaps/via/keymap.c b/keyboards/melgeek/tegic/keymaps/via/keymap.c
index decc08b093..3b73859bb5 100755
--- a/keyboards/melgeek/tegic/keymaps/via/keymap.c
+++ b/keyboards/melgeek/tegic/keymaps/via/keymap.c
@@ -27,9 +27,9 @@ 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_RGHT
 	), 
 	[1] = LAYOUT_tegic_ansi( /* FN */
-	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,
 	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
-	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  QK_BOOT,    _______,  KC_INS,   _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  QK_BOOT,  _______,  KC_INS,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,      
 	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,	 _______,			 KC_VOLU,  
 	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/melgeek/z70ultra/keymaps/default/keymap.c b/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
index f20895975c..3e3f2f9250 100644
--- a/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
+++ b/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker( /* 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,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
-        _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
+        _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
diff --git a/keyboards/melgeek/z70ultra/keymaps/via/keymap.c b/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
index f827ff71d5..551b51c74f 100644
--- a/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
+++ b/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi_blocker( /* 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,  _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   _______,
-        _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
+        _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______,
         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
         _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c
index 8886ca638f..d14a692a89 100644
--- a/keyboards/mixi/keymaps/default/keymap.c
+++ b/keyboards/mixi/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [2] =
         LAYOUT(
                 KC_NO  , KC_NO, KC_TRNS,
-                EEP_RST, QK_BOOT, DB_TOGG  ,
+                EE_CLR,  QK_BOOT, DB_TOGG,
                 KC_NO  , KC_NO, KC_NO
               )
 
diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c
index edba648df8..ef5aace888 100644
--- a/keyboards/mixi/keymaps/via/keymap.c
+++ b/keyboards/mixi/keymaps/via/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [2] =
         LAYOUT(
                 KC_NO  , KC_NO, KC_TRNS,
-                EEP_RST, QK_BOOT, DB_TOGG  ,
+                EE_CLR,  QK_BOOT, DB_TOGG,
                 KC_NO  , KC_NO, KC_NO
               ),
 
diff --git a/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c b/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
index 49b328271d..c1068a4d2b 100644
--- a/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
+++ b/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] =  LAYOUT_ortho_4x12_wrapper(
         KC_MAKE, ___________________BLANK___________________, _________________ADJUST_R1_________________, KC_RST,
-        VRSN,    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
+        VRSN,    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR,
         MG_NKRO, ___________________BLANK___________________, _________________ADJUST_R3_________________, _______,
         _______, ___________________BLANK___________________, ___________________BLANK___________________, _______
     )
diff --git a/keyboards/moonlander/keymaps/default/keymap.c b/keyboards/moonlander/keymaps/default/keymap.c
index c0c2820307..d747e9eaf2 100644
--- a/keyboards/moonlander/keymaps/default/keymap.c
+++ b/keyboards/moonlander/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, _______,           _______, KC_UP,   KC_7,    KC_8,    KC_9,    KC_ASTR, KC_F12,
         _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,  _______,           _______, KC_DOWN, KC_4,    KC_5,    KC_6,    KC_PLUS, _______,
         _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                             KC_AMPR, KC_1,    KC_2,    KC_3,    KC_BSLS, _______,
-        EEP_RST, _______, _______, _______, _______,          RGB_VAI,           RGB_TOG,          _______, KC_DOT,  KC_0,    KC_EQL,  _______,
+        EE_CLR,  _______, _______, _______, _______,          RGB_VAI,           RGB_TOG,          _______, KC_DOT,  KC_0,    KC_EQL,  _______,
                                             RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,_______, _______
     ),
 
diff --git a/keyboards/moonlander/keymaps/via/keymap.c b/keyboards/moonlander/keymaps/via/keymap.c
index ab36b4fc33..70264c240b 100644
--- a/keyboards/moonlander/keymaps/via/keymap.c
+++ b/keyboards/moonlander/keymaps/via/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [MDIA] = LAYOUT_moonlander(
         USER01,  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, KC_MS_U, _______, _______, _______,           _______, _______, _______, _______, _______, _______, EEP_RST,
+        _______, _______, _______, KC_MS_U, _______, _______, _______,           _______, _______, _______, _______, _______, _______, EE_CLR,
         _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,           _______, _______, _______, _______, _______, _______, KC_MPLY,
         _______, _______, _______, _______, _______, _______,                             _______, _______, KC_MPRV, KC_MNXT, _______, _______,
         _______, _______, _______, KC_BTN1, KC_BTN2,         _______,            _______,          KC_VOLU, KC_VOLD, KC_MUTE, _______, _______,
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 80e1d04772..8bde17b79e 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -321,7 +321,7 @@ bool music_mask_kb(uint16_t keycode) {
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
         case AU_ON ... MUV_DE:
         case QK_BOOT:
-        case EEP_RST:
+        case QK_CLEAR_EEPROM:
             return false;
         default:
             return music_mask_user(keycode);
diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c
index 0fa93ac357..4d5f6ba257 100644
--- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c
+++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
  */
 [_ADJUST] = LAYOUT_default( \
-    TG_BASE,   QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_BASE,   QM_MAKE, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_REDR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     TG_NAV,             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_MOUS,                     _______, _______,                            _______,                            _______, _______  \
diff --git a/keyboards/obosob/arch_36/keymaps/obosob/keymap.c b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
index 552e5cb045..27654b07b2 100644
--- a/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
+++ b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
@@ -219,7 +219,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //                                      |________|        |  |        |________|
 //                                               |________|  |________|
     [_ADJUST] = LAYOUT_split_3x5_3(
-        XXXXXXX, WOKE,    EEP_RST, QK_BOOT, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, WOKE,    EE_CLR,  QK_BOOT, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,                     XXXXXXX, QWERTY,  COLEMAK, XXXXXXX, XXXXXXX,
         XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                    XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
index ae7774b716..e080fa5183 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
    * | Raise|      |rgbhui|rgbsai|rgbvai|bl_inc|      |                    |      |      |      |      |      |      |      |
    * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   *|EEP_RST|      |rgbhud|rgbdec|rgbvad|bl_dec||||||||      |      |      ||||||||      |      |      |      |      | Shift|
+   * |EE_CLR|      |rgbhud|rgbdec|rgbvad|bl_dec||||||||      |      |      ||||||||      |      |      |      |      | Shift|
    * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
    * |      |      |      |      |||||||| Lower| Space|      ||||||||      | Space| Raise||||||||      |      |      |      |
    * ,----------------------------------------------------------------------------------------------------------------------.
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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_INC, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    EEP_RST, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
+    EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC,           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
   )
 }; 
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/keymap.c
index 1d51227ccf..4a94ab4bb1 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/keymap.c
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_ergodash_pretty_wrapper(
     KC_MAKE, _______, _______, _______, _______, _______, _______,         KC_NUKE, _______, _______, _______, _______, _______, KC_RST,
-    VRSN,    _________________ADJUST_L1_________________, _______,         _______, _________________ADJUST_R1_________________, EEP_RST,
+    VRSN,    _________________ADJUST_L1_________________, _______,         _______, _________________ADJUST_R1_________________, EE_CLR,
     _______, _________________ADJUST_L2_________________, _______,         _______, _________________ADJUST_R2_________________, _______,
     _______, _________________ADJUST_L3_________________,                           _________________ADJUST_R3_________________, _______,
     _______, _______, _______, _______,                                                               _______, _______, _______, _______,
diff --git a/keyboards/pinky/3/keymaps/ninjonas/README.md b/keyboards/pinky/3/keymaps/ninjonas/README.md
index 67314fa715..7059d51b6d 100644
--- a/keyboards/pinky/3/keymaps/ninjonas/README.md
+++ b/keyboards/pinky/3/keymaps/ninjonas/README.md
@@ -84,7 +84,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co
 ```c
 /*
 ,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-|   M_MAKE|  EEP_RST|         |         |         |         |         |  |         |         |         |         |  COLEMAK|   DVORAK|   QWERTY|
+|   M_MAKE|  EE_CLR |         |         |         |         |         |  |         |         |         |         |  COLEMAK|   DVORAK|   QWERTY|
 |---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
 |   M_VRSN|         |         |         |         |         |         |  |         |         |         |         |         |         |         |
 |---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 77ae20ba5a..01157e106b 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -323,7 +323,7 @@ bool music_mask_kb(uint16_t keycode) {
     case QK_MOD_TAP ... QK_MOD_TAP_MAX:
     case AU_ON ... MUV_DE:
     case QK_BOOT:
-    case EEP_RST:
+    case QK_CLEAR_EEPROM:
         return false;
     default:
         return music_mask_user(keycode);
diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c
index ba306a0d8f..3d4aa46963 100644
--- a/keyboards/planck/keymaps/adamtabrams/keymap.c
+++ b/keyboards/planck/keymaps/adamtabrams/keymap.c
@@ -200,7 +200,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_FMWARE] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______
diff --git a/keyboards/planck/keymaps/badger/keymap.c b/keyboards/planck/keymaps/badger/keymap.c
index 50d3441854..00d056547f 100644
--- a/keyboards/planck/keymaps/badger/keymap.c
+++ b/keyboards/planck/keymaps/badger/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  KC_0,     KC_DOT,   KC_ENT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______),
 
   [_ADJUST]   = LAYOUT_ortho_4x12(
-      _______,  NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
+      _______,  NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
       _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
       _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______)
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
index d457087659..0ffe391a7d 100644
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ b/keyboards/planck/keymaps/buhearns/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [4] = LAYOUT_planck_grid(
   KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_MOD,  MUV_IN,  MU_ON,   AU_ON,    KC_EJCT,
-  KC_TRNS, EEP_RST, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MUV_DE,  MU_OFF,  AU_OFF,   KC_TRNS,
+  KC_TRNS, EE_CLR,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MUV_DE,  MU_OFF,  AU_OFF,   KC_TRNS,
   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MUTE, KC_MPRV, KC_MNXT,  KC_NO,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_VOLU,  KC_MPLY
 ),
diff --git a/keyboards/planck/keymaps/dodger/keymap.c b/keyboards/planck/keymaps/dodger/keymap.c
index 0fef760a8b..a47f94f2c7 100644
--- a/keyboards/planck/keymaps/dodger/keymap.c
+++ b/keyboards/planck/keymaps/dodger/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  EEP_RST, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+  EE_CLR,  QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______,  _______,
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/planck/keymaps/dshields/keymap.c b/keyboards/planck/keymaps/dshields/keymap.c
index 538c41922a..770bae99a5 100644
--- a/keyboards/planck/keymaps/dshields/keymap.c
+++ b/keyboards/planck/keymaps/dshields/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
     ),
     [FUN] = LAYOUT_planck_grid(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   QK_BOOT, EEP_RST, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   QK_BOOT, EE_CLR,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
         KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  _______, DM_RSTP, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,
         LGT_TOG, LGT_MOD, LGT_BRT, LGT_INC, LGT_DEC, DM_REC1, DM_REC2, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index 5cf7c3d0fb..e745acf498 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [LY_1101] = LAYOUT_gunp(
   SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT,
   KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DB_TOGG,
-  KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EEP_RST,
+  KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EE_CLR,
   KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
 ),
 [LY_1111] = LAYOUT_gunp(
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
index 9e841cd3f2..204c4ddc45 100644
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ b/keyboards/planck/keymaps/jweickm/keymap.c
@@ -210,9 +210,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_planck_grid(
         LALT(KC_LSFT), QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DE_SWITCH, 
-        LALT(KC_GRV), EEP_RST, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, HRWIDECOLEMAK, WIDECOLEMAK, LALT(KC_GRV), LANG_SWITCH, GAMING, 
+        LALT(KC_GRV), EE_CLR, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, HRWIDECOLEMAK, WIDECOLEMAK, LALT(KC_GRV), LANG_SWITCH, GAMING, 
         KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_SVD_BD, KC_MPLY, KC_SVU_BU, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEPROM_RESET
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR
     ),
 
     /* _NAV
diff --git a/keyboards/planck/keymaps/mjuma/readme.md b/keyboards/planck/keymaps/mjuma/readme.md
index f462737783..b30ea4e4de 100644
--- a/keyboards/planck/keymaps/mjuma/readme.md
+++ b/keyboards/planck/keymaps/mjuma/readme.md
@@ -134,7 +134,7 @@ stack of layers                     array_of_action_code[row][column]
 ```text
 RESET:       Put the keyboard into bootloader mode for flashing
 Debug:       Toggle debug mode
-EEP_RST:     Reinitializes the keyboard’s EEPROM (persistent memory)
+EE_CLR:      Reinitializes the keyboard’s EEPROM (persistent memory)
 
 AG_TOG:      Toggle Alt and GUI swap on both sides (Mac)
 
diff --git a/keyboards/planck/keymaps/scottzach1/keymap.c b/keyboards/planck/keymaps/scottzach1/keymap.c
index 6fd5c4cec6..ea3cd134c0 100755
--- a/keyboards/planck/keymaps/scottzach1/keymap.c
+++ b/keyboards/planck/keymaps/scottzach1/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------------------'
  */
 [_DEBUG] = LAYOUT_ortho_4x12(
-    QK_BOOT, DB_TOGG, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, EEP_RST,
+    QK_BOOT, DB_TOGG, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, EE_CLR,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx
diff --git a/keyboards/planck/keymaps/sigul/keymap.c b/keyboards/planck/keymaps/sigul/keymap.c
index 0f0210d1e8..111e8e49c9 100644
--- a/keyboards/planck/keymaps/sigul/keymap.c
+++ b/keyboards/planck/keymaps/sigul/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, DF(QWERTY), _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
+    _______, DF(QWERTY), _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
     _______, _______,    _______, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______,    _______, _______, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______,
     _______, _______,    _______, _______, _______, _______, _______, _______, MUV_DE,  AU_ON,   AU_OFF,  MUV_IN
diff --git a/keyboards/planck/keymaps/yhaliaw/keymap.c b/keyboards/planck/keymaps/yhaliaw/keymap.c
index ec76a55c37..b239e44b1c 100644
--- a/keyboards/planck/keymaps/yhaliaw/keymap.c
+++ b/keyboards/planck/keymaps/yhaliaw/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
-        _______, L_RESET, DB_TOGG, EEP_RST, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+        _______, L_RESET, DB_TOGG, EE_CLR,  RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
         _______, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_SWAP, AG_NORM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, XXXXXXX, XXXXXXX, MU_ON,   MU_OFF,  NK_ON,   NK_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c
index 872040f023..662ff030eb 100644
--- a/keyboards/preonic/keymaps/badger/keymap.c
+++ b/keyboards/preonic/keymaps/badger/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST_ORTHO]   = LAYOUT_preonic_2x2u(
       KC_ESC,   AU_ON,    AU_OFF,   CK_TOGG,  CK_UP,    CK_DOWN,  CK_RST,   MU_ON,    MU_OFF,   MU_TOG,   MU_MOD,   KC_DEL,  \
-      _______,  NK_ON,    NK_OFF,   EEP_RST,  QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
+      _______,  NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
       _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
       _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
       _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______)
diff --git a/keyboards/preonic/keymaps/yhaliaw/keymap.c b/keyboards/preonic/keymaps/yhaliaw/keymap.c
index 122c24bc26..251d410a0f 100644
--- a/keyboards/preonic/keymaps/yhaliaw/keymap.c
+++ b/keyboards/preonic/keymaps/yhaliaw/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_preonic_grid(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, L_RESET, DB_TOGG, EEP_RST, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+        _______, L_RESET, DB_TOGG, EE_CLR,  RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
         _______, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_SWAP, AG_NORM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, XXXXXXX, XXXXXXX, MU_ON,   MU_OFF,  NK_ON,   NK_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
index 29b2f3214b..d513ca8636 100644
--- a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT( \
-        QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______,         _______, _______, _______, _______, _______, _______, _______, \
+        QM_MAKE, _______, _______, EE_CLR,  QK_BOOT, _______,         _______, _______, _______, _______, _______, _______, _______, \
         _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______,          _______, \
         _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, \
         _______, _______,                   _______, _______,         _______,          _______,                   _______, _______  \
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
index c61619e32e..a2660b8bd1 100644
--- a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAVMED] = LAYOUT_default(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,         EEP_RST,
+    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,         EE_CLR,
              _______, _______, _______, _______, _______, KC_VOLD,        KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
              _______,                   _______,  _______, _______,        _______,          _______,                        _______
   ),
diff --git a/keyboards/redox/keymaps/cykedev/keymap.c b/keyboards/redox/keymaps/cykedev/keymap.c
index 20a79c0d8f..ffff8ad0a6 100644
--- a/keyboards/redox/keymaps/cykedev/keymap.c
+++ b/keyboards/redox/keymaps/cykedev/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `---------------------------'  '-------/       /       /          \       \       \-------'  '---------------------------'
    *                                        '--------------'            '--------------'
    */
-     EEP_RST , XXXXXXX  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,                                         XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , EEP_RST ,
+     EE_CLR  , XXXXXXX  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,                                         XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , EE_CLR  ,
      XXXXXXX , RGB_MOD  , RGB_HUI , RGB_SAI , RGB_VAI , KC_VOLU , XXXXXXX ,                     XXXXXXX , KC_BRIU , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,
      XXXXXXX , RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , KC_VOLD , RGB_TOG ,                     XXXXXXX , KC_BRID , KC_MRWD , KC_MPLY , KC_MFFD , XXXXXXX , XXXXXXX ,
      XXXXXXX , XXXXXXX  , XXXXXXX , XXXXXXX , XXXXXXX , KC_MUTE , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
index 6be0aecff3..91ae64fd1b 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, _______,
-        _______, _______, _______, _______, _______, EEP_RST, _______,    _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
+        _______, _______, _______, _______, _______, EE_CLR,  _______,    _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
         _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, KC_KP_0, KC_PDOT, KC_PENT, _______,
 
         _______, _______, _______, _______,                                                          _______, _______, _______, _______,
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index c0381f116e..1dd483212d 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -370,7 +370,7 @@ qmk_dict = {
     ">>|": "KC_MNXT", "|<<": "KC_MPRV", "play/ps": "KC_MPLY",
     "Bri +": "KC_BRIU", "Bri -": "KC_BRID",
     # Quantum Keycodes
-    "_reset": "QK_BOOT", "_debug": "DB_TOGG", "_eep_re": "EEP_RST",
+    "_reset": "QK_BOOT", "_debug": "DB_TOGG", "_eep_re": "EE_CLR",
     # Audio Keys missing
     # Backlighting
     "Led 0": "BL_TOGG", "Led +": "BL_INC", "Led -": "BL_DEC", "Led ~": "BL_BRTG",
diff --git a/keyboards/sofle/keymaps/devdev/keymap.c b/keyboards/sofle/keymaps/devdev/keymap.c
index 310f5f2785..9453c54614 100644
--- a/keyboards/sofle/keymaps/devdev/keymap.c
+++ b/keyboards/sofle/keymaps/devdev/keymap.c
@@ -243,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_ADJUST] = LAYOUT(
   //,------------------------------------------------.                    ,---------------------------------------------------.
-  EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   QK_BOOT, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
@@ -303,7 +303,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5), 					          KC_NO,   TO(7),   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
-  KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO, 					         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EEP_RST,
+  KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO, 					         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EE_CLR,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
   KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO,   KC_NO, KC_NO,	     KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index 6e0e209e04..7d63464835 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -243,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_ADJUST] = LAYOUT(
   //,------------------------------------------------.                    ,---------------------------------------------------.
-  EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   QK_BOOT, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
@@ -288,7 +288,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * | qwer | cole |col_dh| low  | raise| adj  |                    |numpad|      |      |      |      |QK_BOOT |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |EEP_RST|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |EE_CLR|
  * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
  * | SLEEP|      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
  * `-----------------------------------------/       /     \      \-----------------------------------------'
@@ -303,7 +303,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
   TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5),                      TO(6),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,
   //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
-  KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO,                      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   EEP_RST,
+  KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO,                      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   EE_CLR,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
   KC_SYSTEM_SLEEP,KC_NO,KC_NO,KC_NO,  KC_NO,   KC_NO, KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
   //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
index 49833c0436..eb5a38d099 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
@@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
  * | Mouse  |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  | Debug  |
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |Nav Perm|      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD | EEP_RST|
+ * |Nav Perm|      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD | EE_CLR |
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
  *                        |      |      |      |      |      |  |      |      |      |      |      |
  *                        |      |      |      |      |      |  |      |      |      |      |      |
@@ -230,8 +230,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [_ADJUST] = LAYOUT(
       NUMPAD , _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, QK_BOOT,
-      MOUSE  , _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, DB_TOGG  ,
-      DNAV   , _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, EEPROM_RESET,
+      MOUSE  , _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, DB_TOGG,
+      DNAV   , _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, EE_CLR,
                                  _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/splitkb/kyria/keymaps/ninjonas/README.md b/keyboards/splitkb/kyria/keymaps/ninjonas/README.md
index 5c86786594..08d2f4e198 100644
--- a/keyboards/splitkb/kyria/keymaps/ninjonas/README.md
+++ b/keyboards/splitkb/kyria/keymaps/ninjonas/README.md
@@ -73,7 +73,7 @@ More information about the Kyria keyboard can be found [here](https://blog.split
 ### ADJUST
 ```c
 //  ,------—————————-------------------------------------.                                ,--------—————————-----------------------------------.
-//     M_MAKE, EEP_RST,        ,        ,        ,       ,                                 RGB_TOG,        ,        , COLEMAK,  DVORAK, QWERTY,
+//     M_MAKE,  EE_CLR,        ,        ,        ,       ,                                 RGB_TOG,        ,        , COLEMAK,  DVORAK, QWERTY,
 //  |--------+-----——-+——------+-——-----+——------+——-----|                                |------—+——------+——------+——------+——------+--------|
 //     M_VRSN,  M_MALL,        , RGB_SAI, RGB_HUI,RGB_VAI,              
 //  |--------+-----——-+——------+-——-----+——------+——-----+———-----------.  ,——————————————+------—+——------+——------+——------+——------+--------|
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
index 2f1b56effe..6720a6b35c 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [RAISE] = LAYOUT(
       KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-      KC_NO,   KC_NO,   EEP_RST, KC_NO,   KC_NO,   KC_NO,                                       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F12,
+      KC_NO,   KC_NO,   EE_CLR,  KC_NO,   KC_NO,   KC_NO,                                       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F12,
       KC_LSFT, KC_TAB,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   _______, _______, _______, _______, KC_MPLY, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
                                  _______, _______, _______, _______, KC_SPC , KC_MPRV, KC_MNXT, _______, _______, _______
     ),
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
index bedf6ea8fc..63421b79f4 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴─────────┼─────────┤ */
     _______,  _______,  _______,  _______,  QK_BOOT,         BL_TOGG,  BL_INC,    BL_DEC,  BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
 /* ├─────────┼─────────┼─────────┼─────────┼──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬───────────┼─────────┤ */
-    _______,  _______,  _______,  _______,  _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,    _______,
+    _______,  _______,  _______,  _______,  _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,     _______,
 /* ├─────────┼─────────┼─────────┼─────────┼───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
     _______,  _______,  _______,  _______,  KC_LSFT,    _______,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  KC_RSFT,          _______,  _______,
 /* ├─────────┼─────────┼─────────┼─────────┼───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
index 0a014ed027..de02d67667 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
     _______,  _______,  _______,  _______,  QK_BOOT,         BL_TOGG,  BL_INC,    BL_DEC,  BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
 /* ├─────────┼─────────┼─────────┤         ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
-    _______,  _______,  _______,            _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,              _______,
+    _______,  _______,  _______,            _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,               _______,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */
     _______,  _______,  _______,  _______,  KC_LSFT,              RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  KC_RSFT,          _______,  _______,
 /* ├─────────┴─────────┬─────────┤         ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
index 1c58377218..cbbf9e7222 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
 	  _______,  _______,  _______,  _______,  QK_BOOT, 	       BL_TOGG,  BL_INC,   BL_DEC,   BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,
 /* ├─────────┼─────────┼─────────┤         ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
-	  _______,  _______,  _______,            _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,    _______,
+	  _______,  _______,  _______,            _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,     _______,
 /* ├─────────┼─────────┼─────────┼─────────┼───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
 	  _______,  _______,  _______,  _______,  KC_LSFT,    _______,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  KC_RSFT,          _______,  _______,
 /* ├─────────┴─────────┼─────────┤         ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
diff --git a/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c b/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c
index ceca01cb85..1227a4c858 100644
--- a/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c
+++ b/keyboards/takashicompany/minizone/keymaps/pimoroni_trackball/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     LAYOUT(
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TB_RAT_INC, KC_TB_RAT_DEC, KC_TB_MODE, DF(0), DF(3), 
-        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, EEP_RST, KC_NO, KC_NO, KC_NO, KC_NO, 
+        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, EE_CLR, KC_NO, KC_NO, KC_NO, KC_NO, 
         RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ), 
diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
index 6394460c41..cc8280492b 100644
--- a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
+++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
  */
 [_ADJUST] = LAYOUT_base_kit_all( \
-    _______, QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, QM_MAKE, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \
     _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
index cdb06d7bc5..10c20638ed 100755
--- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, \
-             _______, RGB_LYR, RGB_THM, _______, EEP_RST, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
+             _______, RGB_LYR, RGB_THM, _______, EE_CLR,  QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
              _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
 
 )
diff --git a/keyboards/tmo50/keymaps/ottodokto/keymap.c b/keyboards/tmo50/keymaps/ottodokto/keymap.c
index a14c9541de..795d59c852 100644
--- a/keyboards/tmo50/keymaps/ottodokto/keymap.c
+++ b/keyboards/tmo50/keymaps/ottodokto/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [3] = LAYOUT_all(
 		RGB_SPI, RGB_TOG, RGB_HUD, RGB_VAI, RGB_HUI, _______, _______, _______, _______, _______,    _______,   _______,    _______, _______, QK_BOOT,
 		RGB_SPD, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______, _______, _______, _______,    _______,   _______, _______, _______,
-		_______, _______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VLK_TOG, _______, _______, _______, EEP_RST,
+		_______, _______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VLK_TOG, _______, _______, _______, EE_CLR,
 		_______, _______, _______, _______, _______, _______, _______
   )
 };
diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
index b43cdab8da..4ade8fe6ee 100644
--- a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
+++ b/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
         _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
-        _______, _______,   _______, _______, _______, EEP_RST, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______,   _______, _______, _______, EE_CLR,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
         _______, _______,   _______, _______, _______, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            _______, _______, _______, _______,
         _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
         _______, _______,   _______, _______,                                              _______,                            _______, _______,                     _______,            _______,          _______
diff --git a/keyboards/tzarc/djinn/keymaps/default/keymap.c b/keyboards/tzarc/djinn/keymaps/default/keymap.c
index 3523c9ab6b..926c728b2d 100644
--- a/keyboards/tzarc/djinn/keymaps/default/keymap.c
+++ b/keyboards/tzarc/djinn/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______,                                               _______
     ),
     [_ADJUST] = LAYOUT_all(
-        _______, KC_CAPS, KC_NUM,  KC_SCRL, _______,   _______, _______,                             _______, _______, _______, _______, DB_TOGG, EEP_RST, QK_BOOT,
+        _______, KC_CAPS, KC_NUM,  KC_SCRL, _______,   _______, _______,                             _______, _______, _______, _______, DB_TOGG, EE_CLR,  QK_BOOT,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/tzarc/ghoul/keymaps/default/keymap.c b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
index 201f204964..01814b0a84 100644
--- a/keyboards/tzarc/ghoul/keymaps/default/keymap.c
+++ b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_ADJUST] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, DB_TOGG, EEP_RST, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, DB_TOGG, EE_CLR,  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
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
index b17dc4b204..5acab998ea 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = 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_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_EQL,  KC_PSLS, KC_PAST,
-        KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        KC_TAB,    KC_Q,  KC_W,EE_CLR,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,DB_TOGG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
index b17dc4b204..5acab998ea 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = 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_NUBS,KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS, KC_EQL,KC_BSPC,KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,  KC_NUM,  KC_EQL,  KC_PSLS, KC_PAST,
-        KC_TAB,    KC_Q,  KC_W,EEPROM_RESET,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        KC_TAB,    KC_Q,  KC_W,EE_CLR,QK_BOOT,KC_T,KC_Y, KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC, KC_RBRC,    KC_BSLS,  KC_DEL,  KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,      KC_A,  KC_S,DB_TOGG,  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_GRV,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,  KC_RSFT,           KC_UP,             KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL, KC_LALT, KC_LGUI, KC_NO,       KC_SPC,                      KC_RGUI, KC_RALT, MO(_FN),      KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0,   KC_P0,   KC_PDOT, KC_PENT
diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
index b7ab190862..35ae5ca5b9 100644
--- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
+++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT( \
-    QM_MAKE, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
+    QM_MAKE, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
              _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
index 2973f2eced..c3a0886d8b 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Fn3 Layer (zeal60 Configuration)
 [3] = LAYOUT_60_hhkb(
-	QK_BOOT, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  KC_TRNS, EEP_RST,
+	QK_BOOT, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  KC_TRNS, EE_CLR,
 	KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ES_DEC,  ES_INC,  KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
index 848056bee9..a8e9dbb2ab 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Fn3 Layer (zeal60 Configuration)
 	[3] = LAYOUT_65_normie(
-		QK_BOOT, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  EEP_RST, KC_TRNS,
+		QK_BOOT, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC,  BR_INC,  EE_CLR,  KC_TRNS,
 		C_BLK,   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, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS,          KC_TRNS, 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/wuque/ikki68_aurora/keymaps/ewersp/keymap.c b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
index 363fc8cf3f..ac47e5888c 100644
--- a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
+++ b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,    KC_END,  KC_VOLU,
         _______, RGB_HUD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_M_P, _______, _______, _______, KC_BRIU, KC_PAUS, KC_PSCR, _______, _______,             KC_MUTE, KC_VOLD,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_SAD, RGB_M_B, _______, _______, _______, KC_BRID, _______, _______,          _______,
-        _______, _______, RGB_TOG, LED_TOG, _______, EEP_RST, QK_BOOT, _______, _______, TG(MAC), TG(ALT), _______, _______, _______,             KC_PGUP,
+        _______, _______, RGB_TOG, LED_TOG, _______, EE_CLR,  QK_BOOT, _______, _______, TG(MAC), TG(ALT), _______, _______, _______,             KC_PGUP,
         _______, _______, KC_LALT,          _______,          _______,          _______,          _______, _______, _______,             KC_HOME, KC_PGDN, KC_END
     ),
     [SUPR] = LAYOUT_all(
@@ -200,7 +200,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             return false;
-        case EEP_RST:
+        case QK_CLEAR_EEPROM:
             if (record->event.pressed) {
                 key_timer = timer_read32();
             } else {
diff --git a/keyboards/xbows/knight/keymaps/default/keymap.c b/keyboards/xbows/knight/keymaps/default/keymap.c
index 444eb1dd3e..45f8afa8ff 100644
--- a/keyboards/xbows/knight/keymaps/default/keymap.c
+++ b/keyboards/xbows/knight/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
-    QK_BOOT,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EE_CLR,
     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD, RGB_VAI, RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD, RGB_VAD, RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
diff --git a/keyboards/xbows/knight/keymaps/via/keymap.c b/keyboards/xbows/knight/keymaps/via/keymap.c
index 737ea8d9ac..6c0770cc44 100644
--- a/keyboards/xbows/knight/keymaps/via/keymap.c
+++ b/keyboards/xbows/knight/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
-    QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    QK_BOOT,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EE_CLR,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
diff --git a/keyboards/xbows/knight_plus/keymaps/default/keymap.c b/keyboards/xbows/knight_plus/keymaps/default/keymap.c
index 429f6bc9c7..d7b3a65672 100644
--- a/keyboards/xbows/knight_plus/keymaps/default/keymap.c
+++ b/keyboards/xbows/knight_plus/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,  KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
-    QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    QK_BOOT,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EE_CLR,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
diff --git a/keyboards/xbows/knight_plus/keymaps/via/keymap.c b/keyboards/xbows/knight_plus/keymaps/via/keymap.c
index a080c2d864..1f7f72df62 100644
--- a/keyboards/xbows/knight_plus/keymaps/via/keymap.c
+++ b/keyboards/xbows/knight_plus/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,  KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
-    QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    QK_BOOT,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EE_CLR,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
diff --git a/keyboards/xbows/nature/keymaps/default/keymap.c b/keyboards/xbows/nature/keymaps/default/keymap.c
index af1eb99553..4ce9eaa964 100644
--- a/keyboards/xbows/nature/keymaps/default/keymap.c
+++ b/keyboards/xbows/nature/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,  KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
-    QK_BOOT,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EE_CLR,
     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD, RGB_VAI, RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD, RGB_VAD, RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
diff --git a/keyboards/xbows/nature/keymaps/via/keymap.c b/keyboards/xbows/nature/keymaps/via/keymap.c
index 737ea8d9ac..6c0770cc44 100644
--- a/keyboards/xbows/nature/keymaps/via/keymap.c
+++ b/keyboards/xbows/nature/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = LAYOUT(
-    QK_BOOT,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    QK_BOOT,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EE_CLR,
     KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NUM,
     RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
     KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
diff --git a/keyboards/xbows/numpad/keymaps/default/keymap.c b/keyboards/xbows/numpad/keymaps/default/keymap.c
index dc70e84e6e..177478ef9f 100644
--- a/keyboards/xbows/numpad/keymaps/default/keymap.c
+++ b/keyboards/xbows/numpad/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P1,    KC_P2,    KC_P3,    KC_PENT,
          KC_P0,       KC_PDOT),
   [1] = LAYOUT(
-    QK_BOOT,     EEP_RST,   KC_TRNS,   KC_TRNS,
+    QK_BOOT,   EE_CLR,    KC_TRNS,   KC_TRNS,
     KC_CALC,   KC_MYCM,   KC_MSEL,   KC_MAIL,
     RGB_MOD,   RGB_VAI,   RGB_HUI,   KC_VOLD,
     RGB_SPD,   RGB_TOG,   RGB_SPI,   KC_VOLU,
diff --git a/keyboards/xbows/numpad/keymaps/via/keymap.c b/keyboards/xbows/numpad/keymaps/via/keymap.c
index 83e8d90d0e..3fa5b77674 100644
--- a/keyboards/xbows/numpad/keymaps/via/keymap.c
+++ b/keyboards/xbows/numpad/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P1,    KC_P2,    KC_P3,    KC_PENT,
          KC_P0,       KC_PDOT),
   [1] = LAYOUT(
-    QK_BOOT,     EEP_RST,   KC_TRNS,   KC_TRNS,
+    QK_BOOT,   EE_CLR,    KC_TRNS,   KC_TRNS,
     KC_CALC,   KC_MYCM,   KC_MSEL,   KC_MAIL,
     RGB_MOD,   RGB_VAI,   RGB_HUI,   KC_VOLD,
     RGB_SPD,   RGB_TOG,   RGB_SPI,   KC_VOLU,
diff --git a/keyboards/xbows/ranger/keymaps/default/keymap.c b/keyboards/xbows/ranger/keymaps/default/keymap.c
index e952482bee..1cce103f8d 100644
--- a/keyboards/xbows/ranger/keymaps/default/keymap.c
+++ b/keyboards/xbows/ranger/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT,     KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH,     KC_RSFT     ,                KC_UP,
 		KC_LCTL, KC_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,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EEP_RST,  KC_NUM,
+    QK_BOOT,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EE_CLR,   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,
     RGB_TOG,     RGB_MOD, RGB_VAI, 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,  KC_TRNS,
     KC_TRNS,        RGB_SPD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
diff --git a/keyboards/xbows/ranger/keymaps/via/keymap.c b/keyboards/xbows/ranger/keymaps/via/keymap.c
index 05e6220a18..4169f3307b 100644
--- a/keyboards/xbows/ranger/keymaps/via/keymap.c
+++ b/keyboards/xbows/ranger/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT,     KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLSH,     KC_RSFT     ,                KC_UP,
 		KC_LCTL, KC_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,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EEP_RST,  KC_NUM,
+    QK_BOOT,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,      NK_TOGG,  EE_CLR,   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,
     RGB_TOG,     RGB_MOD, RGB_VAI, 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,  KC_TRNS,
     KC_TRNS,        RGB_SPD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
diff --git a/keyboards/xbows/woody/keymaps/default/keymap.c b/keyboards/xbows/woody/keymaps/default/keymap.c
index c0bdab97c7..65ce7b939b 100644
--- a/keyboards/xbows/woody/keymaps/default/keymap.c
+++ b/keyboards/xbows/woody/keymaps/default/keymap.c
@@ -9,8 +9,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
     [1] = LAYOUT( /* FN */
         KC_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_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_HOME,
-        KC_CAPS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST, KC_END,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_HOME,
+        KC_CAPS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,  KC_END,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_VOLU, KC_MUTE,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT)
 };
diff --git a/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c b/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c
index 881c0f9039..cdf68f0f42 100644
--- a/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c
+++ b/keyboards/xelus/trinityxttkl/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	    KC_F23, KC_F24, KC_LCTL,          KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                             KC_RALT,          KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
 
 	  [1] = LAYOUT_all(
-	    QK_BOOT  , EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
+	    QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
 	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
 	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
index 86ca493812..c940a8c4b9 100755
--- a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [1] = LAYOUT_tkl_ansi(
-      QK_BOOT,          EEP_RST, DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+      QK_BOOT,          EE_CLR,  DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_TOGG, BL_INC,
       KC_TRNS, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DEC,
       KC_TRNS, KC_TRNS, RGB_VAD, RGB_RMOD,RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
index da61d8abf3..b60e438327 100644
--- a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/7eb0f1c437169f30cc18eac271ad2302 */
     [LAYER_ADJUST] = LAYOUT(
-        _______,  MU_TOG,   KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
+        _______,  MU_TOG,   KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  MU_MOD,   KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
                                       _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______
diff --git a/keyboards/ydkb/just60/keymaps/default/keymap.c b/keyboards/ydkb/just60/keymaps/default/keymap.c
index b23cb57ce9..9bc7e9668b 100644
--- a/keyboards/ydkb/just60/keymaps/default/keymap.c
+++ b/keyboards/ydkb/just60/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_PGUP,  KC_END
      ),
     [_COMMAND] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST,   QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
index b23cb57ce9..9bc7e9668b 100644
--- a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
+++ b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_PGUP,  KC_END
      ),
     [_COMMAND] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST,   QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
index e7a2dba62b..026b12903d 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] =LAYOUT (
-    QK_BOOT,     EEP_RST,   KC_NO,     KC_NO,
+    QK_BOOT,   EE_CLR,    KC_NO,     KC_NO,
     KC_NO,     KC_NO,     KC_NO,     KC_NUM,    KC_QUOT,   KC_PEQL,    KC_NO,
     KC_CAPS,   KC_NUM,    KC_SCRL,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
                                      KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
index ffcaa99395..f51b171604 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
@@ -19,7 +19,7 @@
 ### FN1 layer
 ```
    ,-------------------------------. ,-------.
-   | QK_BOOT    | EEP_RST  | KC_NO   | | KC_NO |
+   | QK_BOOT  | EE_CLR   | KC_NO   | | KC_NO |
    |----------+----------+----------+-------------------------------------------------.
    | KC_NO    | KC_NO    | KC_NO    | KC_NUM   | KC_QUOT   | KC_PEQL  | KC_NO         |
    |----------+----------+----------+----------+-----------+----------+---------------|
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
index 7d55038ac8..790ac9dd83 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] =LAYOUT (
-    QK_BOOT,     EEP_RST,   KC_NO,     KC_NO,
+    QK_BOOT,   EE_CLR,    KC_NO,     KC_NO,
     KC_NO,     KC_NO,     KC_NO,     KC_NUM,    KC_QUOT,   KC_PEQL,    KC_NO,
     KC_CAPS,   KC_NUM,    KC_SCRL,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
                                      KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/readme.md b/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
index 98d5984fda..35367af4e6 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
@@ -19,7 +19,7 @@
 ### FN1 layer
 ```
    ,-------------------------------. ,-------.
-   | QK_BOOT    | EEP_RST  | KC_NO   | | KC_NO |
+   | QK_BOOT  | EE_CLR   | KC_NO   | | KC_NO |
    |----------+----------+----------+-------------------------------------------------.
    | KC_NO    | KC_NO    | KC_NO    | KC_NUM   | KC_QUOT   | KC_PEQL  | KC_NO         |
    |----------+----------+----------+----------+-----------+----------+---------------|
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
index cd09ebd994..58286f73ce 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] =LAYOUT (
-    QK_BOOT,     EEP_RST,   KC_NO,     KC_NO,
+    QK_BOOT,   EE_CLR,    KC_NO,     KC_NO,
     KC_NO,     KC_NO,     KC_NO,     KC_NUM,    KC_QUOT,   KC_PEQL,    KC_NO,                       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_DEL,
     KC_CAPS,   KC_NUM,    KC_SCRL,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),                   KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_BSPC,
                                      KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),                   KC_A,       KC_S,       KC_D,       KC_F,       KC_G,       KC_QUOT,
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
index b8f3784d29..e00cefc740 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
@@ -19,7 +19,7 @@
 ### FN1 layer
 ```
    ,-------------------------------. ,-------.
-   | QK_BOOT    | EEP_RST  | KC_NO   | | KC_NO |
+   | QK_BOOT  | EE_CLR   | KC_NO   | | KC_NO |
    |----------+----------+----------+-------------------------------------------------.                ,-----------------------------------------------------------------------.
    | KC_NO    | KC_NO    | KC_NO    | KC_NUM   | KC_QUOT   | KC_PEQL  | KC_NO         |                | KC_1       | KC_2     | KC_3      | KC_4      | KC_5      | KC_DEL    |
    `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
index 98f40d6b8a..d1b27cd94e 100644
--- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [_FN] = LAYOUT(
         KC_ESC, KC_LANG,KC_NO,  RGB_TOG,KC_MNXT,KC_VOLU,
         KC_CAPS,KC_NUM, KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
-        CG_NORM,LCG_SWP,EEP_RST,QK_BOOT,  TO(0),  KC_MUTE
+        CG_NORM,LCG_SWP,EE_CLR, QK_BOOT,  TO(0),  KC_MUTE
     )
 };
 
diff --git a/keyboards/yushakobo/quick17/keymaps/default/readme.md b/keyboards/yushakobo/quick17/keymaps/default/readme.md
index 8e2f3cd3c0..cd68e12646 100644
--- a/keyboards/yushakobo/quick17/keymaps/default/readme.md
+++ b/keyboards/yushakobo/quick17/keymaps/default/readme.md
@@ -40,7 +40,7 @@
     |-------+-------+--------+-------+---------+--------|
     | Caps  | Numlk | (NONE) |RGB_MOD| Media < | Vol-   |
     |-------+-------+--------+-------+---------+--------|
-    | Win   | mac   | EEP_RST| QK_BOOT | CONTROL | Mute   |
+    | Win   | mac   | EE_CLR | QK_BOOT | CONTROL | Mute   |
     `---------------------------------------------------'
 ```
 ### difference between mac-Mode and Win-Mode
diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
index 98f40d6b8a..d1b27cd94e 100644
--- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [_FN] = LAYOUT(
         KC_ESC, KC_LANG,KC_NO,  RGB_TOG,KC_MNXT,KC_VOLU,
         KC_CAPS,KC_NUM, KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
-        CG_NORM,LCG_SWP,EEP_RST,QK_BOOT,  TO(0),  KC_MUTE
+        CG_NORM,LCG_SWP,EE_CLR, QK_BOOT,  TO(0),  KC_MUTE
     )
 };
 
diff --git a/keyboards/yushakobo/quick17/keymaps/via/readme.md b/keyboards/yushakobo/quick17/keymaps/via/readme.md
index 1923764c8c..4e43989a0e 100644
--- a/keyboards/yushakobo/quick17/keymaps/via/readme.md
+++ b/keyboards/yushakobo/quick17/keymaps/via/readme.md
@@ -40,7 +40,7 @@
     |-------+-------+--------+-------+---------+--------|
     | Caps  | Numlk | (NONE) |RGB_MOD| Media < | Vol-   |
     |-------+-------+--------+-------+---------+--------|
-    | Win   | mac   | EEP_RST| QK_BOOT | CONTROL | Mute   |
+    | Win   | mac   | EE_CLR | QK_BOOT | CONTROL | Mute   |
     `---------------------------------------------------'
 ```
 ### difference between mac-Mode and Win-Mode
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
index 131601fa99..957d1bb74a 100644
--- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
+++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_CL] = LAYOUT_60_ansi(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-	_______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+	_______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
     _______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______,                   \
     _______, _______, _______,       _______,                               _______, _______, _______, _______),
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
index adc7158186..e3f06e03be 100644
--- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
     [LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
         _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,  _______,  _______
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index 794ff92c5d..a0bbaf03c7 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_CL] = LAYOUT_60_ansi_split_bs_rshift(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-	_______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
+	_______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   \
     _______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______,   _______,                 \
     _______, _______, _______,       _______,                               _______, _______, _______, _______)
diff --git a/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
index 77921f9b1a..0cf20af5c6 100644
--- a/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [YFL] = LAYOUT_60_ansi_split_bs_rshift(
     _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______,  KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT,        \
+    _______, _______,  KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT,        \
     KC_CAPS, KC_LEFT,  KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 \
     _______, _______,  _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,                 \
     _______, _______,  _______,             _______,                               _______, _______, _______, _______),
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
index 03fdd181f5..96bb4ef205 100644
--- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */
     [LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
         _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,            _______
diff --git a/layouts/community/60_tsangan_hhkb/yanfali/keymap.c b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
index 1af9eebf5b..a6b0154211 100644
--- a/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FN] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,  QK_BOOT,
+        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,   QK_BOOT,
         KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c b/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
index 19d14eb374..7dd7aeffea 100644
--- a/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FN] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,  QK_BOOT,
+        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,   QK_BOOT,
         KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/layouts/community/65_ansi/mechmerlin/keymap.c b/layouts/community/65_ansi/mechmerlin/keymap.c
index 9e3e0752b5..e2bc67df00 100644
--- a/layouts/community/65_ansi/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi/mechmerlin/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_CL] = LAYOUT_65_ansi(
         _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______,  _______, EEP_RST,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, EE_CLR,   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,           _______, _______,  _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______,                            _______,                    _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
index 6371153066..3e21544539 100644
--- a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_CL] = LAYOUT_65_ansi_blocker(
         _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,  _______, _______, EEP_RST,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,  _______, _______, EE_CLR,   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,           _______, _______, _______,  KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______,  _______,           _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index 3e83d0626f..ffd26e50fc 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Glyph Transformation
     [_GLYPH] = LAYOUT_65_ansi_blocker(
         QK_BOOT,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     SPI_GFLOCK,             XXXXXXX,    XXXXXXX,
-        EEP_RST,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    XXXXXXX,                XXXXXXX,    XXXXXXX,
+        EE_CLR,     SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    XXXXXXX,                XXXXXXX,    XXXXXXX,
         _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    XXXXXXX,
         XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    X(LARR),    X(RARR),    XXXXXXX,                            XXXXXXX,    XXXXXXX,    XXXXXXX,
         XXXXXXX,    XXXXXXX,    XXXXXXX,                                    XXXXXXX,                                            XXXXXXX,    _______,                XXXXXXX,    XXXXXXX,    XXXXXXX
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
index aed21859e0..d9e88a7b55 100644
--- a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
     [LAYER_FUNCTION_1] = LAYOUT_65_ansi_blocker_split_bs(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   _______,
-        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            _______,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EE_CLR,   QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
         _______,  _______,  _______,                      _______,                                _______,  _______,                      _______,  _______,  _______
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
index 050c93a57e..666e34c514 100644
--- a/layouts/community/66_ansi/mechmerlin/keymap.c
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_CL] = LAYOUT_66_ansi(
   BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   _______,           RGB_VAI, \
-  _______,_______,_______,EEP_RST,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______,                 RGB_VAD, \
+  _______,_______,_______,EE_CLR, QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,                 RGB_VAD, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,                             \
   VLK_TOG,        _______,_______,_______,KC_VER,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,         \
   CK_TOGG,_______,_______,                       _______,                                _______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/layouts/community/68_ansi/mechmerlin/keymap.c b/layouts/community/68_ansi/mechmerlin/keymap.c
index 63bdb6f69e..d9c6b5d367 100644
--- a/layouts/community/68_ansi/mechmerlin/keymap.c
+++ b/layouts/community/68_ansi/mechmerlin/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_CL] = LAYOUT_68_ansi(\
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, 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, EE_CLR,  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_VER, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
index 57d4517acf..b1258b2985 100644
--- a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
+++ b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CL] = LAYOUT_75_ansi(\
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______,  _______, EEP_RST, QK_BOOT,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, EE_CLR,  QK_BOOT,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, KC_VER,  _______,  _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______,          _______,            _______, _______, _______, _______, _______, _______),
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index 3f423eedd2..d92a83251e 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // FN
     [_FN] = LAYOUT_75_ansi(
         QK_BOOT,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
-        EEP_RST,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
+        EE_CLR,     X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
         _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DB_TOGG,    _______,                            KC_VOLU,    KC_MUTE,
diff --git a/layouts/community/75_ansi/yanfali/keymap.c b/layouts/community/75_ansi/yanfali/keymap.c
index 66ff76555c..1b3ebbbbf5 100644
--- a/layouts/community/75_ansi/yanfali/keymap.c
+++ b/layouts/community/75_ansi/yanfali/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [FN] = LAYOUT_75_ansi(\
         _______,   RGB_M_P,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT, _______,
+        BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT, _______,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI,  _______, _______, _______, _______, _______, _______, _______, _______,
         VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PGUP, _______,
         _______, _______,  _______,          _______,            _______, _______, _______, KC_HOME, KC_PGDN, KC_END)
diff --git a/layouts/community/ergodox/deadcyclo/keymap.c b/layouts/community/ergodox/deadcyclo/keymap.c
index 76f5279257..ab0e4c4f92 100644
--- a/layouts/community/ergodox/deadcyclo/keymap.c
+++ b/layouts/community/ergodox/deadcyclo/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                          KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
        RGB_HUD, RGB_HUI,
        KC_TRNS,
-       EEP_RST, KC_DEL, KC_TRNS
+       EE_CLR,  KC_DEL, KC_TRNS
 ),
 /* Keymap 2: Media, mouse and navigation
  *
diff --git a/layouts/community/ortho_3x10/bbaserdem/keymap.c b/layouts/community/ortho_3x10/bbaserdem/keymap.c
index 4cc1a25caf..06228cc37a 100644
--- a/layouts/community/ortho_3x10/bbaserdem/keymap.c
+++ b/layouts/community/ortho_3x10/bbaserdem/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MEDI] = LAYOUT_ortho_3x10(
         CK_TOGG,RGB_TOG,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,RGB_MOD,RGB_RMOD,
         _______,BL_TOGG,BL_BRTG,BL_INC, BL_DEC, XXXXXXX,XXXXXXX,VLK_TOG,RGB_SPI,RGB_SPD,
-        AU_TOG, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EEP_RST,QK_BOOT
+        AU_TOG, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EE_CLR,QK_BOOT
     ),
     [_MUSI] = LAYOUT_ortho_3x10_wrapper(
         MU_FAST,_MU_08_,MU_REC,
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index 593f8e44b4..33094f9ca5 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_RTHM,RGB_THM, _______, _______, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
-    EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+    EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
 )
 
diff --git a/layouts/community/ortho_4x12/greatwizard/keymap.c b/layouts/community/ortho_4x12/greatwizard/keymap.c
index 1796254c16..b63afe4424 100644
--- a/layouts/community/ortho_4x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_4x12/greatwizard/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_ortho_4x12_wrapper(
         KC_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, QK_BOOT, EEP_RST, _______, _______, _______, GAME,    QWERTY,  WORKMAN, COLEMAK, DVORAK,  _______,
+        KC_CAPS, QK_BOOT, EE_CLR,  _______, _______, _______, GAME,    QWERTY,  WORKMAN, COLEMAK, DVORAK,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c
index 4f389240cf..0e415fe3bf 100644
--- a/layouts/community/ortho_5x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_RTHM,RGB_THM, _______, _______, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
-    EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+    EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
 )
 
diff --git a/layouts/community/ortho_5x12/greatwizard/keymap.c b/layouts/community/ortho_5x12/greatwizard/keymap.c
index 30e7ca6676..1125f5e316 100644
--- a/layouts/community/ortho_5x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_5x12/greatwizard/keymap.c
@@ -292,7 +292,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_ortho_5x12_wrapper(
         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, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, QK_BOOT, EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         KC_CAPS, _______, _______, _______, _______, _______, GAME,    QWERTY,  WORKMAN, COLEMAK, DVORAK,  _______,
         _______, _______, _______, _______, _______, _______, _______, QWERTYP, WORKMNP, COLEMKP, DVORAKP, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_5x14/yet-another-developer/keymap.c b/layouts/community/ortho_5x14/yet-another-developer/keymap.c
index d884081d7e..ea4252b6d7 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/keymap.c
+++ b/layouts/community/ortho_5x14/yet-another-developer/keymap.c
@@ -195,7 +195,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_ergodash_pretty_wrapper(
              KC_MAKE, _______, _______, _______, _______, _______, _______,                 KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
-             VRSN,    _________________ADJUST_L1_________________, _______,                 _______, _______, _______, _______, _______, _______, EEP_RST,
+             VRSN,    _________________ADJUST_L1_________________, _______,                 _______, _______, _______, _______, _______, _______, EE_CLR,
              _______, _________________ADJUST_L2_________________,                                   _________________ADJUST_R2_________________, RGB_IDL,
              _______, _________________ADJUST_L3_________________, _______,                 _______, _________________ADJUST_R3_________________, TG(_MODS),
              _______, _______, _______, _______, _______,                                                     _______, _______, _______, _______, _______,
diff --git a/layouts/community/split_3x6_3/bcat/keymap.c b/layouts/community/split_3x6_3/bcat/keymap.c
index 46105ef253..535950da53 100644
--- a/layouts/community/split_3x6_3/bcat/keymap.c
+++ b/layouts/community/split_3x6_3/bcat/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */
     [LAYER_ADJUST] = LAYOUT_split_3x6_3(
-        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  QK_BOOT,  _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
                                                 _______,  _______,  _______,  RGB_TOG,  _______,  _______
diff --git a/layouts/community/tkl_ansi/yanfali/keymap.c b/layouts/community/tkl_ansi/yanfali/keymap.c
index 715ed13461..a63f7e10f4 100644
--- a/layouts/community/tkl_ansi/yanfali/keymap.c
+++ b/layouts/community/tkl_ansi/yanfali/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LALT,KC_LGUI,                       KC_SPC,                          KC_RGUI,KC_RGUI,MO(FN) ,KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
 	[FN] = LAYOUT_tkl_ansi( \
 		_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   KC_WAKE,KC_PWR, KC_SLEP, \
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,EEP_RST,   _______,_______,KC_VOLU, \
+		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,EE_CLR,    _______,_______,KC_VOLU, \
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,   _______,_______,KC_VOLD, \
 		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,                            \
 		_______,_______,_______,_______,_______,_______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______,                _______,           KC_MPLY,         \
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 4a47b92847..21a90a35f0 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -5,10 +5,8 @@
 // Deprecated Quantum keycodes
 
 #define GRAVE_ESC    QK_GRAVE_ESCAPE
-#define EEPROM_RESET QK_CLEAR_EEPROM
 
 #define KC_GESC QK_GRAVE_ESCAPE
-#define EEP_RST QK_CLEAR_EEPROM
 
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
diff --git a/users/bbaserdem/bbaserdem.h b/users/bbaserdem/bbaserdem.h
index 4792d5c2d7..bfa083b870 100644
--- a/users/bbaserdem/bbaserdem.h
+++ b/users/bbaserdem/bbaserdem.h
@@ -531,7 +531,7 @@ enum userspace_layers {
  *                   └─────┴─────┴─────┘
  */
 #define _FU1_5_ KC_F1,  KC_F2,  KC_F3,  KC_F4,  RESET
-#define _FU2_5_ KC_F5,  KC_F6,  KC_F7,  KC_F8,  EEP_RST
+#define _FU2_5_ KC_F5,  KC_F6,  KC_F7,  KC_F8,  EE_CLR
 #define _FU3_5_ KC_F9,  KC_F10, KC_F11, KC_F12, BB_GAME
 #define _FU4_3_ KC_DEL, KC_TAB, KC_SPC
 
diff --git a/users/ericgebhart/layers.h b/users/ericgebhart/layers.h
index aff401d65e..d4eb62d0a2 100755
--- a/users/ericgebhart/layers.h
+++ b/users/ericgebhart/layers.h
@@ -630,7 +630,7 @@
 #define ___6_ADJUST_L3___ MG_NKRO,  ___RGB_HUE_SAT_INT_DN___,        KC_RGB_T
 
 #define ___6_ADJUST_R1___  ___5___,                          KC_RESET
-#define ___6_ADJUST_R2___  ___,     ___PRV_PLAY_NXT_STOP___, EEP_RST
+#define ___6_ADJUST_R2___  ___,     ___PRV_PLAY_NXT_STOP___, EE_CLR
 #define ___6_ADJUST_R3___  MG_NKRO, ___VDN_MUTE_VUP___, ___, RGB_IDL
 
 /********************************************************************************/
diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md
index 733c65a979..aea46beee6 100644
--- a/users/mechmerlin/changelog.md
+++ b/users/mechmerlin/changelog.md
@@ -16,7 +16,7 @@ All notable changes to my userspace will be documented in this file.
 
 ## [0.3.0] - 2020-02-02
 ### Changed
-- Added the `_CL` layer to all the boards for access to `EEP_RST` and `RESET` keycodes. This was done primarily to avoid triggering `RESET` accidentally. 
+- Added the `_CL` layer to all the boards for access to `EE_CLR` and `RESET` keycodes. This was done primarily to avoid triggering `RESET` accidentally. 
 - Added a placeholder text macro under the custom keycode `KC_MAC`. Currently set to "meow", but will change as needed in the future. 
 
 ## [0.2.2] - 2019-04-22
diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md
index 1070953111..7aa606dba8 100644
--- a/users/mechmerlin/readme.md
+++ b/users/mechmerlin/readme.md
@@ -17,7 +17,7 @@ This layer is commonly accessed via `MO(_FL)` on the base layer. It consists of
 This layer is only present on my 60% boards. I habitually use the bottom right modifiers as arrows. 
 
 ### _CL (Control Layer)
-This layer is used for the `RESET` and `EEP_RST` keycodes. 
+This layer is used for the `RESET` and `EE_CLR` keycodes. 
 
 ## Custom Keycodes
 ----
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h
index 99a31db056..01df7c6b12 100644
--- a/users/ninjonas/ninjonas.h
+++ b/users/ninjonas/ninjonas.h
@@ -97,7 +97,7 @@ uint16_t encoder_rotated_timer;
 #define _____________________LOWER_R2_______________________ _______________NAV_2______________, K_LOCK, XXXXXXX
 #define _____________________LOWER_R3_______________________ T_RBRC, KC_M, M_TERM, M_CODE, M_XXX1, M_PYNV
 
-#define _____________________ADJUST_L1______________________ M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+#define _____________________ADJUST_L1______________________ M_MAKE, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 
 #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
   #define _____________________ADJUST_L2______________________ M_VRSN, M_MALL, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI
diff --git a/users/ridingqwerty/wrappers.h b/users/ridingqwerty/wrappers.h
index 4bd9182323..392ca12012 100644
--- a/users/ridingqwerty/wrappers.h
+++ b/users/ridingqwerty/wrappers.h
@@ -98,7 +98,7 @@
 #define ________________DEBUG_L3___________________        _______, _______, _______, VERSION, _______
 
 #define ________________DEBUG_R1___________________        VPRWAVE, STRAYA,  _______, TESTING, _______
-#define ________________DEBUG_R2___________________        _______, _______, EEP_RST, RESET,   MAKE
+#define ________________DEBUG_R2___________________        _______, _______, EE_CLR,  RESET,   MAKE
 #define ________________DEBUG_R3___________________        QWERTY,  DVORAK,  COLEMAK, _______, _______
 
 
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h
index 938ec2db99..d04541d200 100644
--- a/users/rupa/wrappers.h
+++ b/users/rupa/wrappers.h
@@ -110,12 +110,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define ____65_ADJUST______________ROW1    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______
 #define ____65_ADJUST______________ROW2    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______
-#define ____65_ADJUST______________ROW3    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______
+#define ____65_ADJUST______________ROW3    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______
 #define ____65_ADJUST______________ROW4    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_MOD,  _______, _______
 #define ____65_ADJUST______________ROW5    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
 
 #define ____65_ADJUST__________RGB_ROW2    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, RESET,   _______
-#define ____65_ADJUST__________RGB_ROW3    _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______
+#define ____65_ADJUST__________RGB_ROW3    _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______
 
 #define ____65_ADJUST___________BL_ROW2    _______, BL_TOGG, BL_BRTG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______
 

From 0b41c13509b5547028f141d869e10199566a1228 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 20 Oct 2022 14:35:27 +0100
Subject: [PATCH 678/959] [CLI] Ensure consistent clean behaviour (#18781)

---
 lib/python/qmk/cli/compile.py | 57 +++++++++--------------
 lib/python/qmk/cli/flash.py   | 85 +++++++++++++----------------------
 lib/python/qmk/commands.py    | 35 +++++++++++++--
 3 files changed, 84 insertions(+), 93 deletions(-)

diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py
index 95118e6687..9e7629906f 100755
--- a/lib/python/qmk/cli/compile.py
+++ b/lib/python/qmk/cli/compile.py
@@ -2,14 +2,13 @@
 
 You can compile a keymap already in the repo or using a QMK Configurator export.
 """
-from subprocess import DEVNULL
-
 from argcomplete.completers import FilesCompleter
+
 from milc import cli
 
 import qmk.path
 from qmk.decorators import automagic_keyboard, automagic_keymap
-from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json
+from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json, build_environment
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.keymap import keymap_completer
 
@@ -31,48 +30,32 @@ def compile(cli):
 
     If a keyboard and keymap are provided this command will build a firmware based on that.
     """
-    if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
-        if cli.config.compile.keyboard and cli.config.compile.keymap:
-            command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, 'clean')
-            cli.run(command, capture_output=False, stdin=DEVNULL)
-
     # Build the environment vars
-    envs = {}
-    for env in cli.args.env:
-        if '=' in env:
-            key, value = env.split('=', 1)
-            envs[key] = value
-        else:
-            cli.log.warning('Invalid environment variable: %s', env)
+    envs = build_environment(cli.args.env)
 
     # Determine the compile command
-    command = None
+    commands = []
 
     if cli.args.filename:
         # If a configurator JSON was provided generate a keymap and compile it
         user_keymap = parse_configurator_json(cli.args.filename)
-        command = compile_configurator_json(user_keymap, parallel=cli.config.compile.parallel, **envs)
+        commands = [compile_configurator_json(user_keymap, parallel=cli.config.compile.parallel, clean=cli.args.clean, **envs)]
 
-    else:
-        if cli.config.compile.keyboard and cli.config.compile.keymap:
-            # Generate the make command for a specific keyboard/keymap.
-            command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, parallel=cli.config.compile.parallel, **envs)
+    elif cli.config.compile.keyboard and cli.config.compile.keymap:
+        # Generate the make command for a specific keyboard/keymap.
+        if cli.args.clean:
+            commands.append(create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, 'clean', **envs))
+        commands.append(create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, parallel=cli.config.compile.parallel, **envs))
 
-        elif not cli.config.compile.keyboard:
-            cli.log.error('Could not determine keyboard!')
-        elif not cli.config.compile.keymap:
-            cli.log.error('Could not determine keymap!')
-
-    # Compile the firmware, if we're able to
-    if command:
-        cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
-        if not cli.args.dry_run:
-            cli.echo('\n')
-            # FIXME(skullydazed/anyone): Remove text=False once milc 1.0.11 has had enough time to be installed everywhere.
-            compile = cli.run(command, capture_output=False, text=False)
-            return compile.returncode
-
-    else:
+    if not commands:
         cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
-        cli.echo('usage: qmk compile [-h] [-b] [-kb KEYBOARD] [-km KEYMAP] [filename]')
+        cli.print_help()
         return False
+
+    cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(commands[-1]))
+    if not cli.args.dry_run:
+        cli.echo('\n')
+        for command in commands:
+            ret = cli.run(command, capture_output=False)
+            if ret.returncode:
+                return ret.returncode
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py
index c39f4b36d4..40bfbdab56 100644
--- a/lib/python/qmk/cli/flash.py
+++ b/lib/python/qmk/cli/flash.py
@@ -3,15 +3,13 @@
 You can compile a keymap already in the repo or using a QMK Configurator export.
 A bootloader must be specified.
 """
-from subprocess import DEVNULL
-import sys
-
 from argcomplete.completers import FilesCompleter
+
 from milc import cli
 
 import qmk.path
 from qmk.decorators import automagic_keyboard, automagic_keymap
-from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json
+from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json, build_environment
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.flashers import flasher
 
@@ -75,59 +73,40 @@ def flash(cli):
                 return False
         except KeyboardInterrupt:
             cli.log.info('Ctrl-C was pressed, exiting...')
-            sys.exit(0)
+        return True
 
-    else:
-        if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
-            if cli.config.flash.keyboard and cli.config.flash.keymap:
-                command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean')
-                cli.run(command, capture_output=False, stdin=DEVNULL)
+    if cli.args.bootloaders:
+        # Provide usage and list bootloaders
+        cli.print_help()
+        print_bootloader_help()
+        return False
 
-        # Build the environment vars
-        envs = {}
-        for env in cli.args.env:
-            if '=' in env:
-                key, value = env.split('=', 1)
-                envs[key] = value
-            else:
-                cli.log.warning('Invalid environment variable: %s', env)
+    # Build the environment vars
+    envs = build_environment(cli.args.env)
 
-        # Determine the compile command
-        command = ''
+    # Determine the compile command
+    commands = []
 
-        if cli.args.bootloaders:
-            # Provide usage and list bootloaders
-            cli.echo('usage: qmk flash [-h] [-b] [-n] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
-            print_bootloader_help()
-            return False
+    if cli.args.filename:
+        # If a configurator JSON was provided generate a keymap and compile it
+        user_keymap = parse_configurator_json(cli.args.filename)
+        commands = [compile_configurator_json(user_keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, clean=cli.args.clean, **envs)]
 
-        if cli.args.filename:
-            # Handle compiling a configurator JSON
-            user_keymap = parse_configurator_json(cli.args.filename)
-            keymap_path = qmk.path.keymap(user_keymap['keyboard'])
-            command = compile_configurator_json(user_keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)
+    elif cli.config.flash.keyboard and cli.config.flash.keymap:
+        # Generate the make command for a specific keyboard/keymap.
+        if cli.args.clean:
+            commands.append(create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean', **envs))
+        commands.append(create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs))
 
-            cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
+    if not commands:
+        cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
+        cli.print_help()
+        return False
 
-        else:
-            if cli.config.flash.keyboard and cli.config.flash.keymap:
-                # Generate the make command for a specific keyboard/keymap.
-                command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)
-
-            elif not cli.config.flash.keyboard:
-                cli.log.error('Could not determine keyboard!')
-            elif not cli.config.flash.keymap:
-                cli.log.error('Could not determine keymap!')
-
-        # Compile the firmware, if we're able to
-        if command:
-            cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
-            if not cli.args.dry_run:
-                cli.echo('\n')
-                compile = cli.run(command, capture_output=False, stdin=DEVNULL)
-                return compile.returncode
-
-        else:
-            cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
-            cli.echo('usage: qmk flash [-h] [-b] [-n] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
-            return False
+    cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(commands[-1]))
+    if not cli.args.dry_run:
+        cli.echo('\n')
+        for command in commands:
+            ret = cli.run(command, capture_output=False)
+            if ret.returncode:
+                return ret.returncode
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 2ab506c710..07826a4866 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -107,7 +107,7 @@ def get_make_parallel_args(parallel=1):
     return parallel_args
 
 
-def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_vars):
+def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=False, **env_vars):
     """Convert a configurator export JSON file into a C file and then compile it.
 
     Args:
@@ -129,7 +129,6 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
     # e.g.: qmk compile - < keyboards/clueboard/california/keymaps/default/keymap.json
     user_keymap["keymap"] = user_keymap.get("keymap", "default_json")
 
-    # Write the keymap.c file
     keyboard_filesafe = user_keymap['keyboard'].replace('/', '_')
     target = f'{keyboard_filesafe}_{user_keymap["keymap"]}'
     keyboard_output = Path(f'{KEYBOARD_OUTPUT_PREFIX}{keyboard_filesafe}')
@@ -137,8 +136,25 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
     keymap_dir = keymap_output / 'src'
     keymap_json = keymap_dir / 'keymap.json'
 
+    if clean:
+        if keyboard_output.exists():
+            shutil.rmtree(keyboard_output)
+        if keymap_output.exists():
+            shutil.rmtree(keymap_output)
+
+    # begin with making the deepest folder in the tree
     keymap_dir.mkdir(exist_ok=True, parents=True)
-    keymap_json.write_text(json.dumps(user_keymap), encoding='utf-8')
+
+    # Compare minified to ensure consistent comparison
+    new_content = json.dumps(user_keymap, separators=(',', ':'))
+    if keymap_json.exists():
+        old_content = json.dumps(json.loads(keymap_json.read_text(encoding='utf-8')), separators=(',', ':'))
+        if old_content == new_content:
+            new_content = None
+
+    # Write the keymap.json file if different
+    if new_content:
+        keymap_json.write_text(new_content, encoding='utf-8')
 
     # Return a command that can be run to make the keymap and flash if given
     verbose = 'true' if cli.config.general.verbose else 'false'
@@ -210,6 +226,19 @@ def parse_configurator_json(configurator_file):
     return user_keymap
 
 
+def build_environment(args):
+    """Common processing for cli.args.env
+    """
+    envs = {}
+    for env in args:
+        if '=' in env:
+            key, value = env.split('=', 1)
+            envs[key] = value
+        else:
+            cli.log.warning('Invalid environment variable: %s', env)
+    return envs
+
+
 def in_virtualenv():
     """Check if running inside a virtualenv.
     Based on https://stackoverflow.com/a/1883251

From af678521c1d786fe5578f82c2f671f5553b08dfe Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 21 Oct 2022 00:41:45 +1100
Subject: [PATCH 679/959] Remove quantum/audio from global VPATH (#18753)

---
 builddefs/common_features.mk        | 1 +
 keyboards/lfkeyboards/lfk78/lfk78.c | 5 ++++-
 keyboards/lfkeyboards/lighting.c    | 1 -
 paths.mk                            | 1 -
 quantum/config_common.h             | 4 +++-
 quantum/unicode/unicode.c           | 5 ++++-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 7f07be5144..8814d8b0f9 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -64,6 +64,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
         OPT_DEFS += -DAUDIO_DRIVER_PWM
     endif
     OPT_DEFS += -DAUDIO_ENABLE
+    COMMON_VPATH += $(QUANTUM_PATH)/audio
     MUSIC_ENABLE = yes
     SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 54a2b45840..6f61d6e2e2 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -2,11 +2,14 @@
 
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
-#include "audio.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"
 
+#ifdef AUDIO_ENABLE
+#    include "audio.h"
+#endif
+
 uint16_t click_hz = CLICK_HZ;
 uint16_t click_time = CLICK_MS;
 uint8_t click_toggle = CLICK_ENABLED;
diff --git a/keyboards/lfkeyboards/lighting.c b/keyboards/lfkeyboards/lighting.c
index dcc5c40234..f4940ec079 100644
--- a/keyboards/lfkeyboards/lighting.c
+++ b/keyboards/lfkeyboards/lighting.c
@@ -11,7 +11,6 @@
 #include "lighting.h"
 #include "debug.h"
 #include "rgblight.h"
-#include "audio.h"
 
 
 extern rgblight_config_t rgblight_config; // Declared in rgblight.c
diff --git a/paths.mk b/paths.mk
index 85ccfa0796..99df2e9d6e 100644
--- a/paths.mk
+++ b/paths.mk
@@ -27,7 +27,6 @@ COMMON_VPATH := $(TOP_DIR)
 COMMON_VPATH += $(TMK_PATH)
 COMMON_VPATH += $(QUANTUM_PATH)
 COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
-COMMON_VPATH += $(QUANTUM_PATH)/audio
 COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
 COMMON_VPATH += $(QUANTUM_PATH)/sequencer
 COMMON_VPATH += $(DRIVER_PATH)
diff --git a/quantum/config_common.h b/quantum/config_common.h
index d93477b27e..6ab8a2aa7d 100644
--- a/quantum/config_common.h
+++ b/quantum/config_common.h
@@ -24,4 +24,6 @@
 #define COL2ROW 0
 #define ROW2COL 1
 
-#include "song_list.h"
+#ifdef AUDIO_ENABLE
+#    include "song_list.h"
+#endif
diff --git a/quantum/unicode/unicode.c b/quantum/unicode/unicode.c
index 3f934c9277..e2bfd68a3a 100644
--- a/quantum/unicode/unicode.c
+++ b/quantum/unicode/unicode.c
@@ -23,10 +23,13 @@
 #include "host.h"
 #include "keycode.h"
 #include "wait.h"
-#include "audio.h"
 #include "send_string.h"
 #include "utf8.h"
 
+#if defined(AUDIO_ENABLE)
+#    include "audio.h"
+#endif
+
 #if defined(UNICODE_ENABLE) + defined(UNICODEMAP_ENABLE) + defined(UCIS_ENABLE) > 1
 #    error "Cannot enable more than one Unicode method (UNICODE, UNICODEMAP, UCIS) at the same time"
 #endif

From a7d6643e3d230f4eceb9ee0e644c25b317b354b4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 21 Oct 2022 07:28:18 +1100
Subject: [PATCH 680/959] Fix build failures uncovered by #18753 (#18789)

---
 keyboards/ano/keymaps/default/keymap.c      | 2 +-
 keyboards/handwired/promethium/promethium.c | 5 -----
 keyboards/planck/keymaps/default/keymap.c   | 4 +++-
 keyboards/planck/keymaps/default/rules.mk   | 4 +++-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/keyboards/ano/keymaps/default/keymap.c b/keyboards/ano/keymaps/default/keymap.c
index 6ed7911b97..3e9907fa91 100644
--- a/keyboards/ano/keymaps/default/keymap.c
+++ b/keyboards/ano/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                                KC_MEDIA_PLAY_PAUSE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_B,
+        KC_GRV,  KC_1,    KC_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_B,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT,          KC_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,
diff --git a/keyboards/handwired/promethium/promethium.c b/keyboards/handwired/promethium/promethium.c
index 0df6c28e9b..e9df7dfe87 100644
--- a/keyboards/handwired/promethium/promethium.c
+++ b/keyboards/handwired/promethium/promethium.c
@@ -2,13 +2,8 @@
 #include "analog.h"
 #include "timer.h"
 #include "matrix.h"
-#include "musical_notes.h"
 #include "bluefruit_le.h"
 
-float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A4, 0.0625);
-float fauxclicky_released_note[2] = MUSICAL_NOTE(_A4, 0.0625);
-float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C6, 0.25);
-
 // cubic fit {3.3, 0}, {3.5, 2.9}, {3.6, 5}, {3.7, 8.6}, {3.8, 36},  {3.9, 62}, {4.0, 73}, {4.05, 83}, {4.1, 89}, {4.15, 94}, {4.2, 100}
 
 uint8_t battery_level(void) {
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 9d3dbccfe6..39a3315b56 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -15,8 +15,10 @@
  */
 
 #include QMK_KEYBOARD_H
-#include "muse.h"
 
+#ifdef AUDIO_ENABLE
+#    include "muse.h"
+#endif
 
 enum planck_layers {
   _QWERTY,
diff --git a/keyboards/planck/keymaps/default/rules.mk b/keyboards/planck/keymaps/default/rules.mk
index dcf16bef39..10751dc952 100644
--- a/keyboards/planck/keymaps/default/rules.mk
+++ b/keyboards/planck/keymaps/default/rules.mk
@@ -1 +1,3 @@
-SRC += muse.c
+ifeq ($(strip $(AUDIO_ENABLE)), yes)
+    SRC += muse.c
+endif

From c4f99f06ab4f260ad9ee8c4281073c5d82431e57 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date: Thu, 20 Oct 2022 23:17:51 +0200
Subject: [PATCH 681/959] ws2812: replace RGBLED_NUM with driver-owned constant
 to decouple driver from RGBLEDs/RGBMATRIX defines (#18036)

---
 drivers/ws2812.h                              |  6 +++++
 .../drivers/vendor/RP/RP2040/ws2812_vendor.c  | 12 +++++-----
 platforms/chibios/drivers/ws2812_pwm.c        | 24 +++++++++----------
 platforms/chibios/drivers/ws2812_spi.c        |  2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/drivers/ws2812.h b/drivers/ws2812.h
index 5985b5340c..8750b0110e 100644
--- a/drivers/ws2812.h
+++ b/drivers/ws2812.h
@@ -56,6 +56,12 @@
 #    define WS2812_TRST_US 280
 #endif
 
+#if defined(RGBLED_NUM)
+#    define WS2812_LED_COUNT RGBLED_NUM
+#elif defined(RGB_MATRIX_LED_COUNT)
+#    define WS2812_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
 /* User Interface
  *
  * Input:
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
index bc34eded14..4470e2c826 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -36,10 +36,10 @@ static int state_machine = -1;
 // clang-format off
 static const uint16_t ws2812_program_instructions[] = {
             //     .wrap_target
-    0x7221, //  0: out    x, 1            side 1 [2] 
-    0x0123, //  1: jmp    !x, 3           side 0 [1] 
-    0x0400, //  2: jmp    0               side 0 [4] 
-    0xb442, //  3: nop                    side 1 [4] 
+    0x7221, //  0: out    x, 1            side 1 [2]
+    0x0123, //  1: jmp    !x, 3           side 0 [1]
+    0x0400, //  2: jmp    0               side 0 [4]
+    0xb442, //  3: nop                    side 1 [4]
             //     .wrap
 };
 
@@ -62,7 +62,7 @@ static const pio_program_t ws2812_program = {
     .origin       = -1,
 };
 
-static uint32_t                WS2812_BUFFER[RGBLED_NUM];
+static uint32_t                WS2812_BUFFER[WS2812_LED_COUNT];
 static const rp_dma_channel_t* WS2812_DMA_CHANNEL;
 
 bool ws2812_init(void) {
@@ -154,7 +154,7 @@ static inline void sync_ws2812_transfer(void) {
             // Abort the synchronization if we have to wait longer than the total
             // count of LEDs in millisecounds. This is safely much longer than it
             // would take to push all the data out.
-            if (unlikely(timer_elapsed_fast(start) > RGBLED_NUM)) {
+            if (unlikely(timer_elapsed_fast(start) > WS2812_LED_COUNT)) {
                 dprintln("ERROR: WS2812 DMA transfer has stalled, aborting!");
                 dmaChannelDisableX(WS2812_DMA_CHANNEL);
                 return;
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 792de85ce9..c4a591c10b 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -88,8 +88,8 @@
  */
 #define WS2812_COLOR_BITS (WS2812_CHANNELS * 8)
 #define WS2812_RESET_BIT_N (1000 * WS2812_TRST_US / WS2812_TIMING)
-#define WS2812_COLOR_BIT_N (RGBLED_NUM * WS2812_COLOR_BITS)    /**< Number of data bits */
-#define WS2812_BIT_N (WS2812_COLOR_BIT_N + WS2812_RESET_BIT_N) /**< Total number of bits in a frame */
+#define WS2812_COLOR_BIT_N (WS2812_LED_COUNT * WS2812_COLOR_BITS) /**< Number of data bits */
+#define WS2812_BIT_N (WS2812_COLOR_BIT_N + WS2812_RESET_BIT_N)    /**< Total number of bits in a frame */
 
 /**
  * @brief   High period for a zero, in ticks
@@ -133,7 +133,7 @@
 /**
  * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given bit
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] byte:                 The byte number [0, 2]
  * @param[in] bit:                  The bit number [0, 7]
  *
@@ -147,7 +147,7 @@
  *
  * @note    The red byte is the middle byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit number [0, 7]
  *
  * @return                          The bit index
@@ -159,7 +159,7 @@
  *
  * @note    The red byte is the first byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit number [0, 7]
  *
  * @return                          The bit index
@@ -171,7 +171,7 @@
  *
  * @note    The red byte is the last byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit index [0, 7]
  *
  * @return                          The bit index
@@ -184,7 +184,7 @@
  *
  * @note    The red byte is the middle byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit number [0, 7]
  *
  * @return                          The bit index
@@ -196,7 +196,7 @@
  *
  * @note    The red byte is the first byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit number [0, 7]
  *
  * @return                          The bit index
@@ -208,7 +208,7 @@
  *
  * @note    The red byte is the last byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit index [0, 7]
  *
  * @return                          The bit index
@@ -221,7 +221,7 @@
  *
  * @note    The red byte is the middle byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit number [0, 7]
  *
  * @return                          The bit index
@@ -233,7 +233,7 @@
  *
  * @note    The red byte is the first byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit number [0, 7]
  *
  * @return                          The bit index
@@ -245,7 +245,7 @@
  *
  * @note    The red byte is the last byte in the color packet
  *
- * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] led:                  The led index [0, @ref WS2812_LED_COUNT)
  * @param[in] bit:                  The bit index [0, 7]
  *
  * @return                          The bit index
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index 390884a2a4..03ffbd7f82 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -80,7 +80,7 @@
 #    define WS2812_CHANNELS 3
 #endif
 #define BYTES_FOR_LED (BYTES_FOR_LED_BYTE * WS2812_CHANNELS)
-#define DATA_SIZE (BYTES_FOR_LED * RGBLED_NUM)
+#define DATA_SIZE (BYTES_FOR_LED * WS2812_LED_COUNT)
 #define RESET_SIZE (1000 * WS2812_TRST_US / (2 * WS2812_TIMING))
 #define PREAMBLE_SIZE 4
 

From dbce41cb6be91005c529bd906dfe22ac55da192f Mon Sep 17 00:00:00 2001
From: Markus Fritsche <37203914+marfrit@users.noreply.github.com>
Date: Thu, 20 Oct 2022 23:29:57 +0200
Subject: [PATCH 682/959] [Docs] Update platformdev_blackpill_f411.md (#18666)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/_summary.md                                            | 2 +-
 ...mdev_blackpill_f411.md => platformdev_blackpill_f4x1.md} | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename docs/{platformdev_blackpill_f411.md => platformdev_blackpill_f4x1.md} (95%)

diff --git a/docs/_summary.md b/docs/_summary.md
index a0d2b2a949..7dc4ddb0e4 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -171,7 +171,7 @@
       * [Early initialization](platformdev_chibios_earlyinit.md)
       * [Raspberry Pi RP2040](platformdev_rp2040.md)
       * [Proton C](platformdev_proton_c.md)
-      * [WeAct Blackpill F411](platformdev_blackpill_f411.md)
+      * [WeAct Blackpill F4x1](platformdev_blackpill_f4x1.md)
 
   * QMK Reference
     * [Contributing to QMK](contributing.md)
diff --git a/docs/platformdev_blackpill_f411.md b/docs/platformdev_blackpill_f4x1.md
similarity index 95%
rename from docs/platformdev_blackpill_f411.md
rename to docs/platformdev_blackpill_f4x1.md
index 9026768a01..d5537a4535 100644
--- a/docs/platformdev_blackpill_f411.md
+++ b/docs/platformdev_blackpill_f4x1.md
@@ -1,8 +1,10 @@
-# WeAct Blackpill (STM32F411)
+# WeAct Blackpill (STM32F4x1)
+
+This document applies to the F401- and F411-based Blackpills.
 
 The WeAct Blackpill is a popular choice for handwired boards, as it offers a powerful micro controller, USB Type C, a good number of pins to use, and a large amount of firmware space.  All for a ~$6 USD price tag. 
 
-* [WeAct GitHub for F411 Blackpill](https://github.com/WeActTC/MiniSTM32F4x1)
+* [WeAct GitHub for F4x1 Blackpill](https://github.com/WeActTC/MiniSTM32F4x1)
   * Unfortunately, due to supply issues official WeAct F411 based blackpills may not be available.
 
 ![Blackpill F411](https://i.imgur.com/nCgeolTh.png)

From 08e111758d1828f206a75f2083fc026a494365b5 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 20 Oct 2022 23:15:15 +0100
Subject: [PATCH 683/959] Remove stale userspace/keymaps (#18700)

---
 .../ergodox_infinity/keymaps/gordon/config.h  |  29 --
 .../ergodox_infinity/keymaps/gordon/keymap.c  | 394 -----------------
 .../ergodox_infinity/keymaps/gordon/rules.mk  |   2 -
 keyboards/knops/mini/keymaps/knops/keymap.c   | 142 ------
 keyboards/knops/mini/keymaps/knops/readme.md  |  11 -
 .../prime_e/keymaps/milestogo/config.h        |  40 --
 .../prime_e/keymaps/milestogo/keymap.c        | 150 -------
 .../prime_e/keymaps/milestogo/readme.md       |   2 -
 .../prime_e/keymaps/milestogo/rules.mk        |   1 -
 .../rama_works_m10_b/keymaps/knops/config.h   |  26 --
 .../rama_works_m10_b/keymaps/knops/keymap.c   |  58 ---
 .../rama_works_m10_b/keymaps/knops/readme.md  |   7 -
 .../rama_works_m6_a/keymaps/knops/keymap.c    | 129 ------
 .../rama_works_m6_a/keymaps/knops/readme.md   |  11 -
 users/gordon/gordon.c                         | 410 ------------------
 users/gordon/gordon.h                         | 247 -----------
 users/gordon/readme.md                        |  14 -
 users/gordon/rules.mk                         |   3 -
 users/pcoves/.gitignore                       |   2 -
 users/pcoves/combo.c                          |  44 --
 users/pcoves/config.h                         |   2 -
 users/pcoves/pcoves.c                         |  44 --
 users/pcoves/pcoves.h                         |  32 --
 users/pcoves/rainbowUnicorn.c                 |  42 --
 users/pcoves/rainbowUnicorn.h                 |   5 -
 users/pcoves/readme.md                        |  14 -
 users/pcoves/rules.mk                         |  30 --
 users/pcoves/tapDance.c                       | 127 ------
 users/pcoves/tapDance.h                       |   8 -
 users/pcoves/unicode.c                        |  20 -
 users/pcoves/unicode.h                        |   5 -
 users/txkyel/config.h                         |  18 -
 users/txkyel/readme.md                        |  20 -
 users/txkyel/rules.mk                         |   5 -
 users/txkyel/tap_dance.c                      |  51 ---
 users/txkyel/tap_dance.h                      |  33 --
 users/txkyel/tap_dance.md                     | 173 --------
 users/txkyel/txkyel.c                         |  56 ---
 users/txkyel/txkyel.h                         |  58 ---
 39 files changed, 2465 deletions(-)
 delete mode 100644 keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
 delete mode 100644 keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
 delete mode 100644 keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
 delete mode 100644 keyboards/knops/mini/keymaps/knops/keymap.c
 delete mode 100644 keyboards/knops/mini/keymaps/knops/readme.md
 delete mode 100644 keyboards/primekb/prime_e/keymaps/milestogo/config.h
 delete mode 100644 keyboards/primekb/prime_e/keymaps/milestogo/keymap.c
 delete mode 100644 keyboards/primekb/prime_e/keymaps/milestogo/readme.md
 delete mode 100644 keyboards/primekb/prime_e/keymaps/milestogo/rules.mk
 delete mode 100644 keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/config.h
 delete mode 100644 keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/keymap.c
 delete mode 100644 keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/readme.md
 delete mode 100644 keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/keymap.c
 delete mode 100644 keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/readme.md
 delete mode 100644 users/gordon/gordon.c
 delete mode 100644 users/gordon/gordon.h
 delete mode 100644 users/gordon/readme.md
 delete mode 100644 users/gordon/rules.mk
 delete mode 100644 users/pcoves/.gitignore
 delete mode 100644 users/pcoves/combo.c
 delete mode 100644 users/pcoves/config.h
 delete mode 100644 users/pcoves/pcoves.c
 delete mode 100644 users/pcoves/pcoves.h
 delete mode 100644 users/pcoves/rainbowUnicorn.c
 delete mode 100644 users/pcoves/rainbowUnicorn.h
 delete mode 100644 users/pcoves/readme.md
 delete mode 100644 users/pcoves/rules.mk
 delete mode 100644 users/pcoves/tapDance.c
 delete mode 100644 users/pcoves/tapDance.h
 delete mode 100644 users/pcoves/unicode.c
 delete mode 100644 users/pcoves/unicode.h
 delete mode 100644 users/txkyel/config.h
 delete mode 100644 users/txkyel/readme.md
 delete mode 100644 users/txkyel/rules.mk
 delete mode 100644 users/txkyel/tap_dance.c
 delete mode 100644 users/txkyel/tap_dance.h
 delete mode 100644 users/txkyel/tap_dance.md
 delete mode 100644 users/txkyel/txkyel.c
 delete mode 100644 users/txkyel/txkyel.h

diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h b/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
deleted file mode 100644
index 772ce0bac9..0000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2018 Daniel Gordon <Dgordon8765@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#undef  IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT
-
-#undef  PERMISSIVE_HOLD
-// #define PERMISSIVE_HOLD
-
-#define ONESHOT_TAP_TOGGLE       2
-
-#undef  TAPPING_TERM
-#define TAPPING_TERM             200
-
-#define FORCE_NKRO
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
deleted file mode 100644
index 2ee7c9bde9..0000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
+++ /dev/null
@@ -1,394 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "process_keycode/process_tap_dance.h"
-#include "gordon.h"
-
-#include "keymap_german.h"
-
-#include "keymap_nordic.h"
-
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD,
-};
-
-
-// Custom tapping terms for each key.
-// Requires changes to action_taping.c
-// uint16_t get_tapping_term(keyevent_t* event) {
-//     uint16_t keycode = keymap_key_to_keycode(layer_switch_get_layer(event->key), event->key);
-//     if (keycode == NAV_E ) {
-//         return TAPPING_TERM + 50;
-//     }
-//     return TAPPING_TERM;
-// }
-
-
-// _XXXXXX_ is a symbol that means, "DO NOT ASSIGN THIS KEY TO ANTYING", because the key
-//        underneath this layer is the key that sends you to/from this layer.
-//        Meaning, if you were to put something here - then you will be stuck in this layer.
-//        It is simply a visual reminder not to use that key for this layer.
-//        Example: On the numpad layer, under the letter `D` is `_XXXXXXX_`, because pressing and holding
-//          `D` sends you to the numpad layer
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-//**************************FIRST LAYER - LAYER ZERO **************************************
-  [_QWERTY] = LAYOUT_ergodox(
-
-    SHF6_AF7, F1_F13  ,    F2_F14,   TD(F3D), F4_ALTF4,    F5_F15,   KC_F11,
-    SPRK_TCK  , Q_ESC   ,  CTR_SH_W,     NAV_E, ALT_SH_R,      KC_T, PRINTSCR,
-    KC_TAB  , KC_A    ,     MEH_S,  NUMPAD_D,   CTRL_F,     WIN_G,
-    OSL(_ONESHOT), CTRL_Z  ,   HYPER_X,   MOUSE_C,    ALT_V,      KC_B, OSL(_MOUSE),
-    KC_MINUS, KC_GRAVE, KC_DELETE,   KC_LEFT, KC_RIGHT,
-
-                                              LSFT(KC_INSERT),  TT(_QWERTY_KIDS),
-                                                          ________ ,
-                                    KC_LSFT,   SYMB_BSP,  KC_INSERT   ,
-
-                 F12_RUN,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10, TD(CALCCOMP),
-                CALTDEL ,    KC_Y,      KC_U,     KC_I,     KC_O,      KC_P,  MODRESET,
-                             WIN_H,   CTRL_J, APP_SW_K,    MEH_L,  COL_MOUS, END_HOME,
-             OSL(_ONESHOT),     KC_N,  ALT_M, COMMA_TD, HYPE_DOT,  KC_SLASH, ID_MAN_IP,
-                                       KC_UP,  KC_DOWN,KC_DELETE,    KC_TILD,    KC_UNDS,
-
-  TT(_STREET_FIGHTER),  ________,
-         KC_PGUP,
-  KC_PGDN, LT(_NAV,KC_ENTER), SPAC_TXT),
-
-
-  //**************************SYMBOLS LAYER**************************
-  [_SYMBOLS] = LAYOUT_ergodox(
-    ________, ________, ________, ________, ________, ________,  ________,
-    ________, DEREF   ,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_CIRC,  ________,
-    ________,  KC_EXLM,  KC_HASH,  KC_LPRN,  KC_RPRN,  ________,
-    ________,KC_DOLLAR,  KC_PERC, LSQUIGLY, RSQUIGLY, ________,  ________,
-    ________,TICK3    ,  ________,  ________,  ________,
-
-                                    ________,________,
-                                             ________,
-                           ________,_XXXXXX_,________,
-
-
-                  ________, ________, ________, ________, ________, ________, NUMLOCK,
-                  ________,TIL_SLASH,  KC_PIPE,  KC_PLUS,  KC_AMPR, ________, CAPLOCK,
-                             EQRIGHT,  KC_DQUO, KC_EQUAL, KC_QUOTE,KC_SCLN, ________,
-                  ________, KC_M, BK_SLASH,  ASTERSK,   KC_DOT, KC_SLASH, ________,
-                  ________,________ ,________,TILD3,________,
-                                                              ________,________,
-                                                                       ________,
-                                                     ________,________,_XXXXXX_),
-
-  //**************************MOUSE MOVEMENT LAYER**************************
-  [_MOUSE] = LAYOUT_ergodox(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
-                    QK_BOOT,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________,
-                    ________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN,
-                    KC_SECRET_5,KC_SECRET_4,KC_SECRET_3,_XXXXXX_,KC_SECRET_2,KC_SECRET_1,_XXXXXX_,
-                    ________,________,HYPR(KC_F15),KC_MS_WH_LEFT,KC_MS_WH_RIGHT,
-
-                                                       ________,________,
-                                                                ________,
-                                          KC_MS_BTN1,KC_MS_BTN2,________,
-
-
-                    ________,________,________,________,________,________,________,
-                    ________,________,________,KC_UP,________,KC_MEDIA_PLAY_PAUSE,________,
-                    ________,KC_LEFT,KC_DOWN,KC_RIGHT,_XXXXXX_,________,
-                    ________,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_MUTE,________,________,
-                    KC_MS_WH_UP,KC_MS_WH_DOWN,________,________,________,
-                    ________,________,
-                    ________,
-                    ________,KC_WWW_BACK,KC_WWW_FORWARD),
-
-
-
-
-  //**************************WINDOWS NAVIGATION LAYER**************************
-
-  [_NAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
-                  ________,________,SNAPLEFT,_XXXXXX_,SNAPRGHT,________,________,
-                  ________,KC_WWW_BACK,PREVTAB,________,NEXTTAB,SNAPUP,
-                  ________,________,WORKLEFT,________,WORKRIGHT,SNAPDOWN,________,
-                  ________,________,________,________,________,
-
-                  ________,________,
-                           ________,
-         ________,________,________,
-
-
-         ________,________,________,________,________,________,________,
-         ________,________,SNAPUP  ,KC_UP   ,SNAPDOWN,________,________,
-                  ________,KC_LEFT ,KC_DOWN ,KC_RIGHT,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,
-
-
-         ________,________,
-         ________,
-         ________,________,________),
-
-  //****************************NUMPAD LAYER****************************
-  [_NUMPAD] = LAYOUT_ergodox(________,________,________,________,________,________,________,
-                     ________,________,________,________,________,________,________,
-                     ________,KC_DOT  ,KC_SPACE,_XXXXXX_, KC_ESC ,________,
-                     ________,DBMS_OUT,________,________,________,________,________,
-                     ________,________,________,________,________,
-
-                     ________,________,
-                     ________,
-                     KC_PLUS,KC_MINUS,________,
-
-                     BL_TOGG ,BL_STEP ,________,________,________,________,________,
-                     ________,________,KC_7    ,KC_8    ,KC_9    ,________,________,
-                              ________,KC_4    ,KC_5    ,KC_6    ,________,________,
-                     ________,KC_DOT,  KC_1    ,KC_2    ,KC_3    ,________,________,
-                                       KC_0    ,KC_DOT ,  KC_DOT   ,________,________,
-
-                                       ________,________,
-                                       ________,
-                                       ________,________,KC_0),
-
-  //****************************APP SWITCH LAYER****************************
-  [_APPSWITCH] = LAYOUT_ergodox(________,________,________,________,________,________,________,
-                        ________,________   ,  ________ , ________  ,________   ,________,________,
-                        ________,APP_5,APP_6,APP_7,APP_8,________,
-                        ________,DBMS_OUT,________,________,________,________,________,
-                        ________,________,________,________,________,
-
-                                                                  ________,________,
-                                                                           ________,
-                                                         KC_PLUS,________,________,
-
-                     ________,________,________,________,________,________,________,
-                     ________,________,APP_3   ,________,APP_4   ,________,________,
-                              ________,APP_1   ,_XXXXXX_,APP_2   ,________,________,
-                     ________,________,________,________,________,________,________,
-                                       ________,________,________,________,________,
-
-                    ________,________,
-                    ________,
-                    ________,________,________),
-
-
-  [_ONESHOT] = LAYOUT_ergodox(  UP_ENTER_RESET , ________, ________, ________, ________, ________, ________,
-                        ________, ________, ________, KC_UP   , ________, ________, ________,
-                        ________, ________, KC_LEFT , KC_DOWN , KC_RIGHT, ________,
-                        MAGIC_TOGGLE_NKRO, ________, ________, ________, ________, ________, ________,
-                        ________, ________, ________, ________, ________,
-
-                        ________, ________,
-                        ________,
-                        ________, ________, ________,
-
-                        ________, ________, ________, ________, ________, ________, ________,
-                        ________, ________, KC_7, KC_8, KC_9, KC_PLUS, ________,
-                                  ________, KC_4, KC_5, KC_6, KC_EQUAL, ________,
-                        ________, ________, KC_1, KC_2, KC_3, KC_ASTR, ________,
-                        ________, ________, KC_0, ________, ________,
-
-                        ________, ________,
-                        ________,
-                        ________, ________, ________),
-  //****************************TEXT/INTELLIJ NAVIGATION LAYER****************************
-  [_TEXTNAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
-                      ________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________,
-                      ________,________,LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)),
-                      ________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________,
-                      ________,________,________,________,________,
-
-                      ________,________,________,________,________,________,
-
-                      LALT(LSFT(KC_F9)),________,________,________,________,________,________,________,MEH(KC_5),LALT(LSFT(KC_Z)),
-                      ________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)),
-                      LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________,
-                      ________,________,________,________,________,________,________,________,________,_XXXXXX_),
-  [_QWERTY_KIDS] = LAYOUT_ergodox(
-
-      KC_NO ,   KC_NO  , KC_NO ,     KC_NO ,   KC_NO ,      KC_NO ,     KC_NO ,
-      KC_NO ,   KC_Q   , KC_W,     KC_E, KC_R,      KC_T,   KC_NO ,
-      KC_NO ,   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_MINUS, KC_GRAVE, KC_DELETE,   KC_LEFT, KC_RIGHT,
-
-                                                KC_NO ,    TT(_QWERTY_KIDS) ,
-                                                            KC_NO  ,
-                                    KC_LSFT,   KC_BSPC,      KC_NO    ,
-
-                   KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,      KC_NO ,   KC_NO ,
-                  KC_NO  ,    KC_Y,      KC_U, KC_I,     KC_O,      KC_P,    KC_NO ,
-                             KC_H,   KC_J,     KC_K,    KC_L,    KC_SCLN , KC_NO,
-               KC_NO ,     KC_N,    KC_M,   KC_COMMA ,   KC_DOT ,  KC_SLASH,   KC_NO ,
-                                       KC_UP,  KC_DOWN,   KC_DELETE,    KC_TILD,    KC_UNDS,
-
-    KC_NO ,    KC_NO ,
-         KC_NO,
-  KC_NO, KC_ENTER, KC_SPACE),
-
-  [_STREET_FIGHTER] = LAYOUT_ergodox(
-
-      KC_NO ,   KC_NO  , KC_NO ,     KC_NO ,   KC_NO ,      KC_NO ,     KC_NO ,
-      KC_NO ,   KC_NO   , DIE_1000X_LEFT,     KC_UP, DIE_1000X_RIGHT,      KC_NO,   KC_NO ,
-      KC_NO ,   KC_NO   , KC_LEFT,  KC_DOWN,   KC_RIGHT,       KC_NO ,
-      KC_NO ,   KC_NO   ,   KC_NO,   KC_NO,    KC_NO,      KC_NO,   KC_NO ,
-    KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO,
-
-                                                ________ ,    ________ ,
-                                                            ________  ,
-                                    ________, ________,    ________    ,
-
-                   KC_NO,  KC_NO ,      KC_NO ,      KC_NO , KC_NO ,   KC_NO , KC_NO ,
-                  KC_NO  , KC_NO,      KC_G, KC_H,     KC_J,      KC_NO,    KC_NO ,
-                             KC_NO,   KC_B,     KC_N,    KC_M,    KC_K , KC_NO,
-               KC_NO ,     KC_NO,    KC_NO,   KC_NO ,   KC_NO ,  KC_NO,   KC_NO ,
-                                       KC_NO,  KC_NO,   KC_NO,    KC_NO,    KC_NO,
-
-    TT(_STREET_FIGHTER) ,    ________ ,
-         ________,
-  ________, ________, ________),
-
-
-  //************************Windows navigation to directories*************************
-  [_DIRNAV] = LAYOUT_ergodox(
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,KC_A,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,
-
-                  ________,________,
-                           ________,
-         ________,________,________,
-
-
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-                  ________,________,_______,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,
-
-
-         ________,________,
-         ________,
-         ________,________,________),
-
-
-  [_TEXT_MACROS] = LAYOUT_ergodox(
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,KC_A,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,
-
-                  ________,________,
-                           ________,
-         ________,________,________,
-
-
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-                  ________,________,_______,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,
-
-
-         ________,________,
-         ________,
-         ________,________,________)
-
-
-/* FOR FORMATTING FUTURE LAYERS
-   NO KEY CODES SHOULD BE MORE THAN 8 CHARACTERS
-   GOES LEFT HAND THEN RIGHT HAND
-  [_DIRNAV] = LAYOUT_ergodox(
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,
-
-                  ________,________,
-                           ________,
-         ________,________,________,
-
-
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-                  ________,________,________,________,________,________,
-         ________,________,________,________,________,________,________,
-         ________,________,________,________,________,
-
-
-         ________,________,
-         ________,
-         ________,________,________), */
-
-
-
-
-};
-
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_on();
-    ergodox_led_all_on();
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-   //    _delay_ms(45);
-
-    switch (layer)
-    {
-    case _SYMBOLS:
-      ergodox_right_led_1_on();
-      break;
-    case _MOUSE:
-      ergodox_right_led_2_on();
-      break;
-    case _NUMPAD:
-      ergodox_right_led_3_on();
-      break;
-    case _NAV:
-      ergodox_right_led_1_on();
-      ergodox_right_led_2_on();
-      break;
-    case _MACROS:
-      //layer unused right now
-      break;
-    case _FUNCTION:
-      //layer unused right nowex
-      break;
-    case _APPSWITCH:
-      ergodox_right_led_2_on();
-      ergodox_right_led_3_on();
-      break;
-    case _ONESHOT:
-      ergodox_right_led_1_on();
-      ergodox_right_led_2_on();
-      ergodox_right_led_3_on();
-      break;
-    case _TEXTNAV:
-      ergodox_right_led_1_on();
-      ergodox_right_led_3_on();
-      break;
-    case _QWERTY_KIDS:
-      ergodox_right_led_1_on();
-      ergodox_right_led_2_on();
-      ergodox_right_led_3_on();
-      break;
-    case _STREET_FIGHTER:
-      ergodox_right_led_2_on();
-      ergodox_right_led_3_on();
-    default:
-      break;
-    }
-};
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
deleted file mode 100644
index 9a56408f8e..0000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/knops/mini/keymaps/knops/keymap.c b/keyboards/knops/mini/keymaps/knops/keymap.c
deleted file mode 100644
index 15d9e5bc11..0000000000
--- a/keyboards/knops/mini/keymaps/knops/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "mini.h"
-
-/*KNOPS_MISC*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	/*KNOPS_KEYMAP*/
-
-};
-
-void set_led_state(int ledId, bool state) {
-	if(state) {
-		switch(ledId) {
-			/* LED 0 to 5 are the leds of each keyswitch. From left to right, top to bottom. These are equal to the numbers in the legends of the default keycaps. */
-			case 0:
-				PORTD |= (1<<7);
-				break;
-			case 1:
-				if((PINB & (1 << 7)) != 0) {
-					PORTC |= (1<<6);
-				} else {
-					PORTC |= (1<<7);
-				}
-				break;
-			case 2:
-				PORTD |= (1<<4);
-				break;
-			case 3:
-				PORTE |= (1<<6);
-				break;
-			case 4:
-				PORTB |= (1<<4);
-				break;
-			case 5:
-				PORTD |= (1<<6);
-				break;
-				/* LED 6 to 8 are the three layer leds in front of the device from left to right. */
-			case 6:
-				PORTD &= ~(1<<5);
-				break;
-			case 7:
-				PORTB |= (1<<6);
-				break;
-			case 8:
-				PORTB &= ~(1<<0);
-				break;
-		}
-	} else {
-		switch(ledId) {
-			case 0:
-				PORTD &= ~(1<<7);
-				break;
-			case 1:
-				if((PINB & (1 << 7)) != 0) {
-					PORTC &= ~(1<<6);
-				} else {
-					PORTC &= ~(1<<7);
-				}
-				break;
-			case 2:
-				PORTD &= ~(1<<4);
-				break;
-			case 3:
-				PORTE &= ~(1<<6);
-				break;
-			case 4:
-				PORTB &= ~(1<<4);
-				break;
-			case 5:
-				PORTD &= ~(1<<6);
-				break;
-			case 6:
-				PORTD |= (1<<5);
-				break;
-			case 7:
-				PORTB &= ~(1<<6);
-				break;
-			case 8:
-				PORTB |= (1<<0);
-				break;
-		}
-	}
-}
-
-void led_init_ports_user(void) {
-	PORTB |= (1 << 7);
-	DDRB &= ~(1<<7);
-
-	DDRD |= (1<<7);
-	DDRC |= (1<<6);
-	DDRC |= (1<<7);
-	DDRD |= (1<<4);
-	DDRE |= (1<<6);
-	DDRB |= (1<<4);
-	DDRD |= (1<<6);
-
-	DDRD |= (1<<5);
-	DDRB |= (1<<6);
-	DDRB |= (1<<0);
-}
-
-void led_set_layer(int layer) {
-
-	/*KNOPS_SIMPLELED_STATES*/
-
-}
-
-void matrix_init_user(void) {
-	led_init_ports_user();
-
-	led_set_layer(1);
-
-	/*KNOPS_INIT*/
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-	//keyevent_t event = record->event;
-
-	/*KNOPS_MACRO*/
-	return NULL;
-}
-
-
-void matrix_scan_user(void) {
-	/*KNOPS_SCAN*/
-}
-
-void led_set_user(uint8_t usb_led) {
-
-	/*KNOPS_FUNCTIONALLED_STATES*/
-
-}
-
-bool process_record_user (uint16_t keycode, keyrecord_t *record) {
-
-	/*KNOPS_PROCESS_STATE*/
-
-	return NULL;
-
-}
-
-
diff --git a/keyboards/knops/mini/keymaps/knops/readme.md b/keyboards/knops/mini/keymaps/knops/readme.md
deleted file mode 100644
index 58696974ed..0000000000
--- a/keyboards/knops/mini/keymaps/knops/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default Knops Mini Layout
-
-![Knops logo](http://knops.io/img/Knops_logo.jpg)
-
-![Knops Mini Layout Image](https://i.imgur.com/WQBQctm.png)
-
-This is the keymap that our configurator uses to compile new keymaps and features. Here is a screenshot:
-
-![Knops Mini Layout Image](https://i.imgur.com/afH1NOt.png)
-
-As of 12th of february 2018, this tool has not yet been released to the public. You may have a look at our older tool, KBFlasher: [our (almost outdated) configurator tool](http://knops.io/configurator.html) for this.
\ No newline at end of file
diff --git a/keyboards/primekb/prime_e/keymaps/milestogo/config.h b/keyboards/primekb/prime_e/keymaps/milestogo/config.h
deleted file mode 100644
index c3f9e43415..0000000000
--- a/keyboards/primekb/prime_e/keymaps/milestogo/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2019 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#undef MATRIX_ROWS 
-#undef MATRIX_COLS 
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-/* key matrix size */
-#define MATRIX_ROWS 5 
-#define MATRIX_COLS 15
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { E6, C7, B5, B4, C6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4, D5, D3, D2, D1, D0, B6, D7} 
-
-// Babble config
-#define USE_BABBLEPASTE
-#define BABL_MODSWAP
-#define BABL_READMUX
-#define BABL_KITTY
-#define BABL_MAC
-#define BABL_LINUX
diff --git a/keyboards/primekb/prime_e/keymaps/milestogo/keymap.c b/keyboards/primekb/prime_e/keymaps/milestogo/keymap.c
deleted file mode 100644
index ced250e51f..0000000000
--- a/keyboards/primekb/prime_e/keymaps/milestogo/keymap.c
+++ /dev/null
@@ -1,150 +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
-#include "milestogo.h"
-
-/* customized matrix needs to be updated in local config.h
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-#define MATRIX_ROW_PINS { E6, C7, B5, B4, C6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4, D5, D3, D2, D1, D0, B6, D7}
-*/
-
-#define LAYOUT_wrap_m2primee(...) LAYOUT_m2primee(__VA_ARGS__)
-#define LAYOUT_wrap_m2primee_trns(...) LAYOUT_m2primee_trns(__VA_ARGS__)
-
-// clang-format off
-#define LAYOUT_m2primee(\
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K112,\
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-    K300, K301, K303, K304, K306, K308, K311, K312, \
-    K413, K414 )\
-    {\
-        {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, KC_NO},\
-        {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, KC_NO, K112, KC_NO, KC_NO},\
-        {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, KC_NO}, \
-        {K300, K301, KC_NO, K303, K304, KC_NO, K306, KC_NO, K308, KC_NO, KC_NO, K311, K312, KC_NO, KC_NO}, \
-        {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K413, K414 } \
-    }
-
-#define LAYOUT_m2primee_trns(\
-    K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K112, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211) \
-    {\
-        {KC_TRNS, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, KC_NO}, \
-        {KC_TRNS, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, KC_NO, K112, KC_NO, KC_NO}, \
-        {KC_LSFT, K201, K202, K203, K204, K205, KC_TRNS, K207, K208, K209, K210, K211, KC_TRNS, KC_NO, KC_NO}, \
-        {KC_LALT, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_RSFT, KC_NO, KC_NO}, \
-        {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, B_1ME, KC_ENTER } \
-    }
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_wrap_m2primee(\
-KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_MINS, KC_EQL,
-LT(_MOV,KC_ESC), _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, 
-KC_LSFT, _________________QWERTY_L3_________________, MO(_SYM), _________________QWERTY_R3_________________, KC_RSFT, 
-B_2ME, KC_LALT, LT(_NUM, KC_DEL), KC_BSPC, KC_SPC, LT(_NUM, KC_ESC), B_2ME, KC_RALT, 
-B_1ME, KC_ENTER),
-
-    [_NUM] = LAYOUT_wrap_m2primee(\
-KC_TRNS, __________40_______NUM_L1__________________, __________40_______NUM_R1__________________, KC_VOLD, KC_VOLU, 
-KC_TRNS, __________40_______NUM_L2__________________, __________40_______NUM_R2__________________, KC_ENT, 
-KC_TRNS, __________40_______NUM_L3__________________, KC_TRNS, __________40_______NUM_R3__________________, KC_TRNS, 
-KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-KC_TRNS, KC_TRNS),
-
-    [_CDH] = LAYOUT_wrap_m2primee_trns(\
-______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________, KC_TRNS, KC_TRNS,
-______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________, KC_QUOT, 
-______________COLEMAK_MOD_DH_L3____________, KC_TRNS, ______________COLEMAK_MOD_DH_R3____________),
-
-    [_SYM] = LAYOUT_wrap_m2primee_trns(\
-___________________SYM_L1__________________, ___________________SYM_R1__________________, KC_TRNS, KC_TRNS, 
-___________________SYM_L2__________________, ___________________SYM_R2__________________, KC_TRNS,
-___________________SYM_L3__________________, KC_TRNS, ___________________SYM_R3__________________),
-
-    [_MOV] = LAYOUT_wrap_m2primee_trns(\
-__________40_______MOV_L1__________________, __________40_______MOV_R1__________________, KC_TRNS, KC_CDH,
-__________40_______MOV_L2__________________, __________40_______MOV_R2__________________, KC_TRNS, 
-__________40_______MOV_L3__________________, KC_TRNS, __________40_______MOV_R3__________________),
-
-     [_DMOV] = LAYOUT_wrap_m2primee_trns(\
-____________40__DELMOV_L1__________________,  ____________40__DELMOV_R1__________________ , KC_TRNS, KC_CDH,
-____________40__DELMOV_L2__________________,  ____________40__DELMOV_R2__________________ , KC_TRNS, 
-____________40__DELMOV_L3__________________,  KC_TRNS, ____________40__DELMOV_R3__________________ ),
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-    // set CapsLock LED to output and high by default, drop low when on.
-    setPinOutput(B1);
-    writePinHigh(B1);
-    // set NumLock LED to output and low
-    setPinOutput(B2);
-    writePinLow(B2);
-    // set ScrollLock LED to output and low
-    setPinOutput(B3);
-    writePinLow(B3);
-
-    backlight_enable();
-    backlight_level(2);
-}
-
-bool led_update_kb(led_t led_state) {
-#ifndef USE_BABBLEPASTE
-    // if we aren't using the LEDs to show bablepaste options, use them to show standard keyboard stuff
-    writePin(B1, led_state.caps_lock);
-    writePin(B2, led_state.num_lock);
-    writePin(B3, led_state.scroll_lock);
-#endif
-    return true;
-}
-
-void babble_modeswitch_kb(uint8_t mode) {
-#ifdef USE_BABBLEPASTE
-    switch (mode) {
-        case (BABL_READMUX_MODE):
-            writePinHigh(B3);
-            writePinLow(B2);
-            backlight_level(1);
-            break;
-        case (BABL_LINUX_MODE):
-            writePinHigh(B2);
-            writePinLow(B3);
-            backlight_level(2);
-            break;
-        case (BABL_MAC_MODE):  // backlight on, indicator leds off
-            writePinLow(B3);
-            writePinLow(B2);
-            backlight_level(4);
-            break;
-    }
-
-    // call the user function
-    babble_modeswitch_user(mode);
-#endif
-}
-
-// function for layer indicator LED
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Turn on top LED if we are in colemak, off for qwerty.
-    writePin(B1, layer_state_cmp(state, _CDH));
-    return state;
-}
diff --git a/keyboards/primekb/prime_e/keymaps/milestogo/readme.md b/keyboards/primekb/prime_e/keymaps/milestogo/readme.md
deleted file mode 100644
index c74eda3ea3..0000000000
--- a/keyboards/primekb/prime_e/keymaps/milestogo/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Modified keymap for Prime_E
-My PrimeE has two added thumb switches, so it uses a slightly different keymap. 
\ No newline at end of file
diff --git a/keyboards/primekb/prime_e/keymaps/milestogo/rules.mk b/keyboards/primekb/prime_e/keymaps/milestogo/rules.mk
deleted file mode 100644
index 81d9ace791..0000000000
--- a/keyboards/primekb/prime_e/keymaps/milestogo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-USER_NAME := miles2go
diff --git a/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/config.h b/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/config.h
deleted file mode 100644
index 511dc9537e..0000000000
--- a/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2018 Wilba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#undef VIA_ENABLE
-#undef RAW_ENABLE
-#undef DYNAMIC_KEYMAP_ENABLE
-
-#endif
diff --git a/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/keymap.c b/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/keymap.c
deleted file mode 100644
index d586064954..0000000000
--- a/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/*KNOPS_MISC*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*KNOPS_LAYOUT*/
-
-};
-
-// M10-B LEDs are all in parallel and controlled by the QMK backlight
-// functionality. LED functions here are for possible future use
-// as layer indicators, etc. and not implemented yet.
-//
-// To implement LED functions here, QMK backlight functionality
-// will need to be disabled either via rules.mk or config.h
-// or overriding the backlight functions to do nothing.
-//
-// LEDs are driven by a transistor connected to pin C6.
-//
-
-void set_led_state(int ledId, bool state)
-{
-}
-
-void led_set_layer(int layer)
-{
-    led_set_layer(0);
-
-    /*KNOPS_SIMPLELED_STATES*/
-}
-
-void matrix_init_user(void)
-{
-    /*KNOPS_INIT*/
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    /*KNOPS_MACRO*/
-    return NULL;
-}
-
-void matrix_scan_user(void)
-{
-    /*KNOPS_SCAN*/
-}
-
-void led_set_user(uint8_t usb_led)
-{
-    /*KNOPS_FUNCTIONALLED_STATES*/
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    /*KNOPS_PROCESS_STATE*/
-    return NULL;
-}
diff --git a/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/readme.md b/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/readme.md
deleted file mode 100644
index 3b3d6c3970..0000000000
--- a/keyboards/wilba_tech/rama_works_m10_b/keymaps/knops/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![RAMA M10-B Layout Image](https://static1.squarespace.com/static/563c788ae4b099120ae219e2/5b4997390e2e72d65f7a8e83/5b49993d6d2a732ab3595146/1531550014142/M10-Layout.jpg)
-
-# Default RAMA M10-B Layout
-
-This is an example layout.
-
-
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/keymap.c b/keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/keymap.c
deleted file mode 100644
index bb2d104ee4..0000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/keymap.c
+++ /dev/null
@@ -1,129 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/*KNOPS_MISC*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*KNOPS_LAYOUT*/
-
-};
-
-void set_led_state(int ledId, bool state)
-{
-    if (state)
-    {
-        switch (ledId)
-        {
-        case 0:
-            PORTD |= (1 << 6);
-            break;
-        case 1:
-            PORTB |= (1 << 6);
-            break;
-        case 2:
-            PORTF |= (1 << 5);
-            break;
-        case 3:
-            PORTB |= (1 << 4);
-            break;
-        case 4:
-            PORTC |= (1 << 7);
-            break;
-        case 5:
-            PORTF |= (1 << 7);
-            break;
-        }
-    }
-    else
-    {
-        switch (ledId)
-        {
-        case 0:
-            PORTD &= ~(1 << 6);
-            break;
-        case 1:
-            PORTB &= ~(1 << 6);
-            break;
-        case 2:
-            PORTF &= ~(1 << 5);
-            break;
-        case 3:
-            PORTB &= ~(1 << 4);
-            break;
-        case 4:
-            PORTC &= ~(1 << 7);
-            break;
-        case 5:
-            PORTF &= ~(1 << 7);
-            break;
-        }
-    }
-}
-
-void led_init_ports_user(void)
-{
-    // Switch #1
-    DDRD |= (1 << 6);
-    PORTD &= ~(1 << 6);
-
-    // Switch #2
-    DDRB |= (1 << 6);
-    PORTB &= ~(1 << 6);
-
-    // Switch #3
-    DDRF |= (1 << 5);
-    PORTF &= ~(1 << 5);
-
-    // Switch #4
-    DDRB |= (1 << 4);
-    PORTB &= ~(1 << 4);
-
-    // Switch #5
-    DDRC |= (1 << 7);
-    PORTC &= ~(1 << 7);
-
-    // Switch #6
-    DDRF |= (1 << 7);
-    PORTF &= ~(1 << 7);
-}
-
-void led_set_layer(int layer)
-{
-
-    /*KNOPS_SIMPLELED_STATES*/
-}
-
-void matrix_init_user(void)
-{
-    led_init_ports_user();
-
-    led_set_layer(0);
-
-    /*KNOPS_INIT*/
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    //keyevent_t event = record->event;
-
-    /*KNOPS_MACRO*/
-    return NULL;
-}
-
-void matrix_scan_user(void)
-{
-    /*KNOPS_SCAN*/
-}
-
-void led_set_user(uint8_t usb_led)
-{
-
-    /*KNOPS_FUNCTIONALLED_STATES*/
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-
-    /*KNOPS_PROCESS_STATE*/
-    return NULL;
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/readme.md b/keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/readme.md
deleted file mode 100644
index 58696974ed..0000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/keymaps/knops/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default Knops Mini Layout
-
-![Knops logo](http://knops.io/img/Knops_logo.jpg)
-
-![Knops Mini Layout Image](https://i.imgur.com/WQBQctm.png)
-
-This is the keymap that our configurator uses to compile new keymaps and features. Here is a screenshot:
-
-![Knops Mini Layout Image](https://i.imgur.com/afH1NOt.png)
-
-As of 12th of february 2018, this tool has not yet been released to the public. You may have a look at our older tool, KBFlasher: [our (almost outdated) configurator tool](http://knops.io/configurator.html) for this.
\ No newline at end of file
diff --git a/users/gordon/gordon.c b/users/gordon/gordon.c
deleted file mode 100644
index c31418b526..0000000000
--- a/users/gordon/gordon.c
+++ /dev/null
@@ -1,410 +0,0 @@
-#include "gordon.h"
-#include "quantum.h"
-#include "action.h"
-#include "process_keycode/process_tap_dance.h"
-
-#if (__has_include("secret.h"))
-#include "secret.h"
-#else
-const char secret[][64] = {
-  "test1",
-  "test2",
-  "test3",
-  "test4",
-  "test5"
-};
-#endif
-
-void register_hyper (void) { //Helper function to invoke Hyper
-  register_code (KC_LSFT);
-  register_code (KC_LCTL);
-  register_code (KC_LALT);
-  register_code (KC_LGUI);
-}
-void unregister_hyper (void) { //Helper function to invoke Hyper
-  unregister_code (KC_LSFT);
-  unregister_code (KC_LCTL);
-  unregister_code (KC_LALT);
-  unregister_code (KC_LGUI);
-}
-
-void register_ctrl_a (void) {
-  register_code(KC_LCTL);
-  register_code(KC_A);
-}
-
-void unregister_ctrl_a (void) {
-  unregister_code(KC_LCTL);
-  unregister_code(KC_A);
-}
-
-void register_alt_f7 (void) {
-  register_code (KC_LALT);
-  register_code (KC_F7);
-}
-
-void unregister_alt_f7 (void) {
-  unregister_code (KC_LALT);
-  unregister_code (KC_F7);
-}
-
-void register_shift_f6 (void) {
-  register_code (KC_LSFT);
-  register_code (KC_F6);
-}
-
-void unregister_shift_f6 (void) {
-  unregister_code (KC_LSFT);
-  unregister_code (KC_F6);
-}
-
-void register_ctrl_shift (void) {
-  register_code (KC_LSFT);
-  register_code (KC_LCTL);
-}
-
-void unregister_ctrl_shift (void) {
-  unregister_code (KC_LSFT);
-  unregister_code (KC_LCTL);
-}
-
-void register_alt_shift (void) {
-  register_code (KC_LSFT);
-  register_code (KC_LALT);
-}
-
-void unregister_alt_shift (void) {
-  unregister_code (KC_LSFT);
-  unregister_code (KC_LALT);
-}
-
-// To activate SINGLE_HOLD, you will need to hold for 200ms first.
-// This tap dance favors keys that are used frequently in typing like 'f'
-int cur_dance (qk_tap_dance_state_t *state) {
-  if (state->count == 1) {
-    //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP
-    if (state->interrupted) {
-      //     if (!state->pressed) return SINGLE_TAP;
-      //need "permissive hold" here.
-      //     else return SINsGLE_HOLD;
-      //If the interrupting key is released before the tap-dance key, then it is a single HOLD
-      //However, if the tap-dance key is released first, then it is a single TAP
-      //But how to get access to the state of the interrupting key????
-      return SINGLE_TAP;
-    }
-    else {
-      if (!state->pressed) return SINGLE_TAP;
-      else return SINGLE_HOLD;
-    }
-  }
-  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
-  //with single tap.
-  else if (state->count == 2) {
-    if (state->interrupted) return DOUBLE_SINGLE_TAP;
-    else if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-  else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
-  else if (state->count == 3) return TRIPLE_HOLD;
-  else return 8; //magic number. At some point this method will expand to work for more presses
-}
-
-//This works well if you want this key to work as a "fast modifier". It favors being held over being tapped.
-int hold_cur_dance (qk_tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted) {
-      if (!state->pressed) return SINGLE_TAP;
-      else return SINGLE_HOLD;
-    }
-    else {
-      if (!state->pressed) return SINGLE_TAP;
-      else return SINGLE_HOLD;
-    }
-  }
-  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
-  //with single tap.
-  else if (state->count == 2) {
-    if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-  else if (state->count == 3) {
-    if (!state->pressed) return TRIPLE_TAP;
-    else return TRIPLE_HOLD;
-  }
-  else return 8; //magic number. At some point this method will expand to work for more presses
-}
-
-
-static xtap htap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void h_finished (qk_tap_dance_state_t *state, void *user_data) {
-  htap_state.state = cur_dance(state);
-  switch (htap_state.state) {
-    case SINGLE_TAP: register_code(KC_H); break;
-    case SINGLE_HOLD: layer_on(8); register_code(KC_LALT); break;
-    case DOUBLE_TAP: layer_invert(8); register_code(KC_LALT); break;
-    // case DOUBLE_HOLD: register_code(KC_LALT);
-    case DOUBLE_SINGLE_TAP: register_code(KC_H);unregister_code(KC_H);register_code(KC_H);
-  }
-}
-
-void h_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (htap_state.state) {
-    case SINGLE_TAP: unregister_code(KC_H); break;
-    case SINGLE_HOLD: layer_off(8); unregister_code(KC_LALT); break;
-    case DOUBLE_TAP: unregister_code(KC_LALT);break;
-    // case DOUBLE_HOLD: unregister_code(KC_LALT);
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_H);
-  }
-  htap_state.state = 0;
-}
-
-
-/**************** QUAD FUNCTION FOR TAB ****************/
-// TAB, ALT + SHIFT, TAB TAB, CTRL + SHIFT
-static xtap tab_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void tab_finished (qk_tap_dance_state_t *state, void *user_data) {
-  tab_state.state = cur_dance(state);
-  switch (tab_state.state) {
-    case SINGLE_TAP: register_code(KC_TAB); break;  //send tab on single press
-    case SINGLE_HOLD: register_ctrl_shift(); break;
-    case DOUBLE_HOLD: register_alt_shift(); break; //alt shift on single hold
-    case DOUBLE_TAP: register_code(KC_TAB); unregister_code(KC_TAB); register_code(KC_TAB); break; //tab tab
-    case TRIPLE_TAP: register_code(KC_LSFT) ;register_code(KC_ESC); break;
-    case TRIPLE_HOLD: register_code(KC_LSFT); register_code(KC_LGUI); break;
-  }
-}
-
-void tab_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (tab_state.state) {
-    case SINGLE_TAP: unregister_code(KC_TAB); break; //unregister tab
-    case DOUBLE_HOLD: unregister_alt_shift(); break; //let go of alt shift
-    case DOUBLE_TAP: unregister_code(KC_TAB); break;
-    case SINGLE_HOLD: unregister_ctrl_shift(); break;
-    case TRIPLE_TAP: unregister_code(KC_LSFT); unregister_code(KC_ESC); break;
-    case TRIPLE_HOLD: unregister_code(KC_LSFT); unregister_code(KC_LGUI); break;
-  }
-  tab_state.state = 0;
-}
-/**************** QUAD FUNCTION FOR TAB ****************/
-
-//*************** SUPER COMMA *******************//
-// Assumption: we don't care about trying to hit ,, quickly
-//*************** SUPER COMMA *******************//
-static xtap comma_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void comma_finished (qk_tap_dance_state_t *state, void *user_data) {
-  comma_state.state = hold_cur_dance(state); //Use the dance that favors being held
-  switch (comma_state.state) {
-    case SINGLE_TAP: register_code(KC_COMMA); break;
-    case SINGLE_HOLD: layer_on(1); break; //turn on symbols layer
-    case DOUBLE_TAP: layer_invert(4); break; //toggle numbers layer
-    case DOUBLE_HOLD: layer_on(2); break;
-    case TRIPLE_TAP: register_code(KC_CALCULATOR); break;
-    case TRIPLE_HOLD: layer_on(3);
-  }
-}
-
-void comma_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (comma_state.state) {
-    case SINGLE_TAP: unregister_code(KC_COMMA); break; //unregister comma
-    case SINGLE_HOLD: layer_off(1); break;
-    case DOUBLE_TAP: ;break;
-    case DOUBLE_HOLD: layer_off(2); break;
-    case TRIPLE_TAP: unregister_code(KC_CALCULATOR); break;
-    case TRIPLE_HOLD: layer_off(3);
-  }
-  comma_state.state = 0;
-}
-//*************** SUPER COMMA *******************//
-//*************** SUPER COMMA *******************//
-
-
-//*************** F3 TAP DANCE *******************//
-//Good example for accessing multiple layers from the same key.
-static xtap S1_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void bt_finished (qk_tap_dance_state_t *state, void *user_data) {
-  S1_state.state = cur_dance(state);
-  switch (S1_state.state) {
-    case SINGLE_TAP: register_code(KC_F3); break;
-    case SINGLE_HOLD: layer_on(_MACROS); break;
-    case DOUBLE_TAP: layer_invert(_MACROS); break;
-    case DOUBLE_HOLD: layer_on(5); break;
-    case DOUBLE_SINGLE_TAP: layer_invert(_MACROS); break;
-  }
-}
-
-void bt_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (S1_state.state) {
-    case SINGLE_TAP: unregister_code(KC_F3); break;
-    case SINGLE_HOLD: layer_off(_MACROS); break;
-    case DOUBLE_TAP: break; //already inverted. Don't do anything.
-    case DOUBLE_HOLD: layer_off(5); break;
-    case DOUBLE_SINGLE_TAP: break;
-  }
-  S1_state.state = 0;
-}
-
-// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  // simple tap dance
-  [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),
-  [REFRESH]  = ACTION_TAP_DANCE_DOUBLE(KC_R,LCTL(KC_R)),
-  [ENDESC]   = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_ESC),
-  [Q_ESCAPE] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC),
-  [ENDHOME]  = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_HOME),
-  [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER),
-  [ALTF4]    = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)),
-  [F6F7]     = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F6), LALT(KC_F7)),
-  [F1F13]    = ACTION_TAP_DANCE_DOUBLE(KC_F1, KC_F13),
-  [F2F14]    = ACTION_TAP_DANCE_DOUBLE(KC_F2, KC_F14),
-  [F5F15]    = ACTION_TAP_DANCE_DOUBLE(KC_F5, KC_F15),
-  [TABCOMBO] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tab_finished, tab_reset),
-  [F3D]      = ACTION_TAP_DANCE_FN_ADVANCED(NULL, bt_finished, bt_reset),
-  [COMMA]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, comma_finished, comma_reset),
-  [HTAB]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL,h_finished, h_reset)
-};
-
-// bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//   if (!record->event.pressed) {
-//     switch (keycode) {
-
-//       case KC_SECRET_1 ... KC_SECRET_5:
-//           send_string(secret[keycode - KC_SECRET_1]);
-//           // clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-//           return true; break;
-
-//       case UP_ENTER_RESET:
-//           register_code(KC_UP);
-//           unregister_code(KC_UP);
-//           register_code(KC_ENTER);
-//           unregister_code(KC_ENTER);
-//           reset_keyboard();
-//           return false; break;
-
-//       case TIL_SLASH:
-//           SEND_STRING ("~/.");
-//           return false; break;
-
-//       case DBMS_OUT:
-//           SEND_STRING ("dbms_output.put_line('');");
-//           SEND_STRING (SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT));
-//           return false; break;
-
-//       case ID_MAN_IP:
-//           SEND_STRING ("http://dev-1967110238.us-east-1.elb.amazonaws.com");
-//           return false; break;
-
-//       case MODRESET:
-//           clear_mods();
-//           return false; break;
-
-//       case DEREF:
-//           SEND_STRING ("->");
-//           return false; break;
-
-//       case EQRIGHT:
-//           SEND_STRING ("=>");
-//           return false; break;
-
-//       case TICK3:
-//           SEND_STRING ("```");
-//           return false; break;
-
-//       case TILD3:
-//           SEND_STRING ("~~~");
-//           return false; break;
-//     }
-//   }
-//   return true;
-// };
-
-
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (!record->event.pressed) {
-    switch (keycode) {
-      case KC_SECRET_1 ... KC_SECRET_5:
-          send_string(secret[keycode - KC_SECRET_1]);
-          // clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-          return true; break;
-      case UP_ENTER_RESET:
-          SEND_STRING("make ergodox_infinity:gordon:dfu-util");
-          register_code(KC_ENTER);
-          unregister_code(KC_ENTER);
-          reset_keyboard();
-          return false; break;
-
-      case TIL_SLASH:
-          SEND_STRING ("~/.");
-          return false; break;
-
-      case DBMS_OUT:
-          SEND_STRING ("dbms_output.put_line('');");
-          SEND_STRING (SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT));
-          return false; break;
-      case DIE_1000X_RIGHT:
-          SEND_STRING (SS_TAP(X_G) SS_TAP(X_G) SS_TAP(X_RIGHT) SS_TAP(X_B) SS_TAP(X_J));
-          return false; break;
-      case DIE_1000X_LEFT:
-          SEND_STRING (SS_TAP(X_GRAVE) SS_TAP(X_G) SS_TAP(X_LEFT) SS_TAP(X_B) SS_TAP(X_J));
-          return false; break;
-      case ID_MAN_IP:
-          SEND_STRING ("http://dev-1967110238.us-east-1.elb.amazonaws.com");
-          return false; break;
-
-      case MODRESET:
-          clear_mods();
-          return false; break;
-
-      case DEREF:
-          SEND_STRING ("->");
-          return false; break;
-
-      case EQRIGHT:
-          SEND_STRING ("=>");
-          return false; break;
-
-      case TICK3:
-          SEND_STRING ("```");
-
-          return false; break;
-
-      case SPRK_TCK:
-          SEND_STRING ("```");
-          SEND_STRING (SS_DOWN(X_LSFT) SS_TAP(X_ENTER) SS_UP(X_LSFT));
-          SEND_STRING (SS_DOWN(X_LSFT) SS_TAP(X_ENTER) SS_UP(X_LSFT));
-          SEND_STRING ("```");
-          SEND_STRING (SS_TAP(X_UP));
-          return false; break;
-
-      case TILD3:
-          SEND_STRING ("~~~");
-          return false; break;
-    }
-  }
-  else { //On key being pressed
-    switch (keycode) {
-      case KC_SECRET_1 ... KC_SECRET_5:
-          clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-          return false; break;
-    }
-  }
-  return true;
-};
-
diff --git a/users/gordon/gordon.h b/users/gordon/gordon.h
deleted file mode 100644
index c6bd6e10b5..0000000000
--- a/users/gordon/gordon.h
+++ /dev/null
@@ -1,247 +0,0 @@
-#ifndef GORDON
-#define GORDON
-
-#include "quantum.h"
-#include "process_keycode/process_tap_dance.h"
-
-
-// Fillers to make layering more clear
-#define ________  KC_TRNS
-#define _________ KC_TRNS
-#define _XXXXXX_  KC_TRNS
-
-// KC codes that are too long
-#define DOLLAR    KC_DOLLAR
-#define LSQUIGLY  KC_LBRC
-#define RSQUIGLY  KC_RBRC
-#define NUMLOCK   KC_NUM_LOCK
-#define CAPLOCK   KC_CAPS_LOCK
-#define BK_SLASH  KC_BACKSLASH
-#define ASTERSK   KC_KP_ASTERISK
-
-// Navigation
-#define SNAPLEFT  LGUI(KC_LEFT)
-#define SNAPRGHT  LGUI(KC_RIGHT)
-#define SNAPUP    LGUI(KC_UP)
-#define SNAPDOWN  LGUI(KC_DOWN)
-#define PREVTAB   LCTL(LSFT(KC_TAB))
-#define NEXTTAB   LCTL(KC_TAB)
-#define WORKRIGHT LCTL(LGUI(KC_RIGHT))
-#define WORKLEFT  LCTL(LGUI(KC_LEFT))
-
-#define APP_1     LCTL(LGUI(KC_1))
-#define APP_2     LCTL(LGUI(KC_2))
-#define APP_3     LCTL(LGUI(KC_3))
-#define APP_4     LCTL(LGUI(KC_4))
-#define APP_5     LCTL(LGUI(KC_5))
-#define APP_6     LCTL(LGUI(KC_6))
-#define APP_7     LCTL(LGUI(KC_7))
-#define APP_8     LCTL(LGUI(KC_8))
-
-// KC/modifier hold
-#define CTRL_F    CTL_T(KC_F)
-#define CTRL_J    CTL_T(KC_J)
-#define CTRL_Z    CTL_T(KC_Z)
-#define ALT_V     ALT_T(KC_V)
-#define ALT_M     ALT_T(KC_M)
-#define WIN_G     GUI_T(KC_G)
-#define WIN_H     GUI_T(KC_H)
-#define HYPER_X   ALL_T(KC_X)
-#define HYPE_DOT  ALL_T(KC_DOT)
-#define MEH_S     MEH_T(KC_S)
-#define MEH_L     MEH_T(KC_L)
-#define ALT_HOME  ALT_T(KC_HOME)
-
-
-// KC/Layer Hold
-#define NAV_E    LT(_NAV,KC_E)
-#define NUMPAD_D LT(_NUMPAD,KC_D)
-#define MOUSE_C  LT(_MOUSE,KC_C)
-#define SYMB_BSP LT(_SYMBOLS,KC_BACKSPACE)
-#define COL_MOUS LT(_MOUSE,KC_SEMICOLON)
-#define SPAC_SYM LT(_SYMBOLS,KC_SPACE)
-#define SPAC_TXT LT(_TEXTNAV,KC_SPACE)
-
-#define APP_SW_I LT(_APPSWITCH,KC_I)
-#define APP_SW_K LT(_APPSWITCH,KC_K)
-
-// #define TLSLSH   TIL_SLASH
-// #define TILDA_3x TILD3
-// #define _RESET_  UP_ENTER_RESET
-
-
-// Double Modifier ONLY hold
-#define ALT_SHFT LSFT(KC_LALT)
-#define CTR_SHFT LSFT(KC_LCTL)
-
-// KC/Double modifier Hold
-#define CTR_SH_W MT(MOD_LCTL|MOD_LSFT,KC_W)
-#define CTR_AL_R MT(MOD_LCTL|MOD_LALT,KC_R)
-#define ALT_SH_R MT(MOD_LSFT|MOD_LALT,KC_R)
-
-//MISC
-#define PRINTSCR KC_PRINT_SCREEN
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} xtap;
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  DOUBLE_SINGLE_TAP = 5, //send two single taps
-  TRIPLE_TAP = 6,
-  TRIPLE_HOLD = 7
-};
-
-//Tap dance enums
-enum
-{
-  F12TAP = 0,
-  F12ETAPS,
-  CALCCOMP,
-  REFRESH, //send R, or Control+R if double tapped.
-  ENDESC,
-  XESC, //'quad function'. x, control, escape, alt
-  ALY2, //'quad function': a, Hyper, ctrl+a, layer 2
-  PRLOCK,
-  F6F7, // Shift F6 or Alt F7
-  TABCOMBO,
-  FCTRL,
-  F3D,
-  ALTF4,
-  COMMA,
-  AT,
-  HTAB,
-  F1F13,
-  F2F14,
-  F5F15,
-  ENDHOME,
-  Q_ESCAPE
-};
-
-#ifdef TAP_DANCE_ENABLE
-#define F1_F13      TD(F1F13)
-#define F2_F14      TD(F2F14)
-#define F5_F15      TD(F5F15)
-#define F4_ALTF4    TD(ALTF4)
-#define END_ESC     TD(ENDESC)
-#define Q_ESC       TD(Q_ESCAPE)
-#define END_HOME    TD(ENDHOME)
-#define SHF6_AF7    TD(F6F7)
-#define F12_RUN     TD(F12ETAPS)
-#define COMMA_TD    TD(COMMA)
-#define CALC_COM    TD(CALCCOMP)
-#else //just to make things compile
-#define F1_F13      KC_1
-#define F2_F14      KC_1
-#define F5_F15      KC_1
-#define F4_ALTF4    KC_1
-#define END_ESC     KC_1
-#define END_HOME    KC_1
-#define SHF6_AF7    KC_1
-#define F12_RUN     KC_1
-#define COMMA_TD    KC_1
-#define CALC_COM    KC_1
-#endif
-
-enum gordon_layers
-{
-  _QWERTY = 0,
-  _SYMBOLS,         // Programming and all other commonlye used symbols
-  _MOUSE,           // Mouse movement and also a few macros
-  _NUMPAD,          // For getting a numpad under the right hand, and a few helpful things under the left
-  _NAV,             // Windows navigation. Windows snapping, changing workspaces, and ARROWS
-  _MACROS,          // Non-text related Macros.
-  _FUNCTION,        // Not sure what I had in mind for this one
-  _APPSWITCH,       // For switching between apps using the `ctrl + Win + [num]` shortcut.
-                    // This allows for toggling windows of the same app with one button.
-                    // Example: Press and hold `I`, then tap `j` multiple times to cycle through all
-                    // Intellij windows (and only Intellij). This requires the app to be pinned to the Windows bar
-  _ONESHOT,         // A layer I use for shortcuts that require multiple modifiers and a button not on my home layer
-                    // Example: If I need to hit `alt + shift + 5`
-  _TEXTNAV,         // Navigate through text
-  _QWERTY_KIDS,     // So my kids can do nothing but type. Could also be a `speed typing` layer with no LT or MTs
-  _STREET_FIGHTER,  // For Street Fighter 5. Die 1000x Deaths!!!!
-  _DIRNAV,          // For navigating to different directories.
-  _TEXT_MACROS      // For text-manipulation macros. Passwords, saved strings, pre-formatting
-};
-
-
-
-void register_hyper (void);
-void unregister_hyper (void);
-
-void register_ctrl_a (void);
-void unregister_ctrl_a (void);
-
-void register_alt_f7 (void);
-void unregister_alt_f7 (void);
-
-void register_shift_f6 (void);
-void unregister_shift_f6 (void);
-
-void register_ctrl_shift (void);
-void unregister_ctrl_shift (void);
-
-void register_alt_shift (void);
-void unregister_alt_shift (void);
-
-int cur_dance (qk_tap_dance_state_t *state);
-int hold_cur_dance (qk_tap_dance_state_t *state);
-
-void x_finished (qk_tap_dance_state_t *state, void *user_data);
-void x_reset (qk_tap_dance_state_t *state, void *user_data);
-
-void h_finished (qk_tap_dance_state_t *state, void *user_data);
-void h_reset (qk_tap_dance_state_t *state, void *user_data);
-
-void tab_finished (qk_tap_dance_state_t *state, void *user_data);
-void tab_reset (qk_tap_dance_state_t *state, void *user_data);
-
-void comma_finished (qk_tap_dance_state_t *state, void *user_data);
-void comma_reset (qk_tap_dance_state_t *state, void *user_data);
-
-void bt_finished (qk_tap_dance_state_t *state, void *user_data);
-void bt_reset (qk_tap_dance_state_t *state, void *user_data);
-
-enum secret_strings {
-  KC_SECRET_1 = SAFE_RANGE,
-  KC_SECRET_2,
-  KC_SECRET_3,
-  KC_SECRET_4,
-  KC_SECRET_5,
-  END_SECRET_SAFE_RANGE
-};
-
-
-// Macro Declarations
-enum {
-  INFOQM = END_SECRET_SAFE_RANGE,
-  MODRESET,
-  TIL_SLASH,
-  DEREF,
-  EQRIGHT,
-  TILD3,
-  TICK3,
-  SPRK_TCK,
-  ALTTAB_START,
-  ALTTAB_END,
-  UP_ENTER_RESET,
-  DBMS_OUT,
-  DIE_1000X_RIGHT,
-  DIE_1000X_LEFT,
-  ID_MAN_IP
-};
-
-
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
-
-#endif
diff --git a/users/gordon/readme.md b/users/gordon/readme.md
deleted file mode 100644
index fdea33b67a..0000000000
--- a/users/gordon/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright <year> <name> <email> @<github_username>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/users/gordon/rules.mk b/users/gordon/rules.mk
deleted file mode 100644
index c282f00284..0000000000
--- a/users/gordon/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE = yes
-SRC += gordon.c
-
diff --git a/users/pcoves/.gitignore b/users/pcoves/.gitignore
deleted file mode 100644
index c0579ed329..0000000000
--- a/users/pcoves/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-secret.h
-secret.c
diff --git a/users/pcoves/combo.c b/users/pcoves/combo.c
deleted file mode 100644
index a9a1ffe988..0000000000
--- a/users/pcoves/combo.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "quantum.h"
-
-enum {
-    MIN,
-    EQL,
-
-    ESC,
-    BSP,
-    DEL,
-
-    TAB,
-    BSL,
-
-    CUT,
-    GRA,
-};
-
-const uint16_t PROGMEM min[] = {KC_C, KC_V, COMBO_END};
-const uint16_t PROGMEM eql[] = {KC_M, KC_COMM, COMBO_END};
-
-const uint16_t PROGMEM esc[] = {KC_D, KC_F, COMBO_END};
-const uint16_t PROGMEM bsp[] = {KC_J, KC_K, COMBO_END};
-const uint16_t PROGMEM del[] = {KC_DOWN, KC_UP, COMBO_END};
-
-const uint16_t PROGMEM tab[] = {KC_S, KC_F, COMBO_END};
-const uint16_t PROGMEM bsl[] = {KC_J, KC_L, COMBO_END};
-
-const uint16_t PROGMEM cut[] = {KC_K, KC_L, COMBO_END};
-const uint16_t PROGMEM gra[] = {KC_S, KC_D, COMBO_END};
-
-combo_t key_combos[COMBO_COUNT] = {
-    [MIN] = COMBO(min, KC_MINS),
-    [EQL] = COMBO(eql, KC_EQL),
-
-    [ESC] = COMBO(esc, KC_ESC),
-    [BSP] = COMBO(bsp, KC_BSPC),
-    [DEL] = COMBO(del, KC_DEL),
-
-    [TAB] = COMBO(tab, KC_TAB),
-    [BSL] = COMBO(bsl, KC_BSLS),
-
-    [CUT] = COMBO(cut, KC_QUOT),
-    [GRA] = COMBO(gra, KC_GRAVE),
-};
diff --git a/users/pcoves/config.h b/users/pcoves/config.h
deleted file mode 100644
index 645dcbbf4c..0000000000
--- a/users/pcoves/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define COMBO_TERM 200
-#define COMBO_COUNT 9
diff --git a/users/pcoves/pcoves.c b/users/pcoves/pcoves.c
deleted file mode 100644
index af5b987a6f..0000000000
--- a/users/pcoves/pcoves.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "pcoves.h"
-
-#ifdef RAINBOW_UNICORN_ENABLE
-#include "rainbowUnicorn.h"
-#endif
-
-#ifdef UNICODE_ENABLE
-#include "unicode.h"
-#endif
-
-#if SECRET_ENABLE
-#include "secret.h"
-#endif
-
-__attribute__((weak)) void eeconfig_init_keymap(void) {}
-
-void eeconfig_init_user(void) {
-#ifdef UNICODE_ENABLE
-    set_unicode_input_mode(UC_LNX);
-#endif
-    eeconfig_init_keymap();
-}
-
-__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case AUTRUCHE:
-            if (record->event.pressed) SEND_STRING("Autruche");
-            return true;
-    }
-
-    return process_record_keymap(keycode, record)
-#ifdef RAINBOW_UNICORN_ENABLE
-        && process_record_rainbowUnicorn(keycode, record)
-#endif
-#ifdef UNICODE_ENABLE
-        && process_record_unicode(keycode, record)
-#endif
-#if SECRET_ENABLE
-        && process_record_secret(keycode, record)
-#endif
-        ;
-}
diff --git a/users/pcoves/pcoves.h b/users/pcoves/pcoves.h
deleted file mode 100644
index 10dfc56bd3..0000000000
--- a/users/pcoves/pcoves.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define SECRET_ENABLE (__has_include("secret.h") && !defined(NO_SECRET))
-
-enum {
-    AUTRUCHE = SAFE_RANGE,
-#ifdef RAINBOW_UNICORN_ENABLE
-    RAINBOW_UNICORN_TOGGLE,
-#endif
-#ifdef UNICODE_ENABLE
-    EMOTE0,
-    EMOTE1,
-    EMOTE2,
-    EMOTE3,
-#endif
-#if SECRET_ENABLE
-    SECRET0,
-    SECRET1,
-    SECRET2,
-    SECRET3,
-    SECRET4,
-#endif
-    PCOVES_SAFE_RANGE,
-};
-
-__attribute__((weak)) void eeconfig_init_keymap(void);
-void eeconfig_init_user(void);
-
-__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
-bool process_record_user(uint16_t keycode, keyrecord_t *record);
diff --git a/users/pcoves/rainbowUnicorn.c b/users/pcoves/rainbowUnicorn.c
deleted file mode 100644
index 9520415051..0000000000
--- a/users/pcoves/rainbowUnicorn.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "rainbowUnicorn.h"
-#include "pcoves.h"
-
-static struct {
-    bool    enabled;
-    uint8_t color;
-    char    string[2];
-    uint8_t mods;
-} state = {false, 0};
-
-bool process_record_rainbowUnicorn(uint16_t keycode, keyrecord_t* record) {
-    if (keycode == RAINBOW_UNICORN_TOGGLE) {
-        state.enabled ^= true;
-        return false;
-    }
-
-    if (!state.enabled) return true;
-
-    switch (keycode) {
-        case KC_A ... KC_Z:
-        case KC_1 ... KC_0:
-        case ALT_T(KC_A)... ALT_T(KC_Z):
-        case CTL_T(KC_A)... CTL_T(KC_Z):
-        case GUI_T(KC_A)... GUI_T(KC_Z):
-        case SFT_T(KC_A)... SFT_T(KC_Z):
-            if (record->event.pressed) {
-                state.mods = get_mods();
-                clear_mods();
-
-                tap_code16(C(KC_C));
-
-                itoa(state.color + 3, state.string, 10);
-                send_string(state.string);
-
-                set_mods(state.mods);
-            } else {
-                state.color = (state.color + 1) % 11;
-            }
-    }
-
-    return true;
-}
diff --git a/users/pcoves/rainbowUnicorn.h b/users/pcoves/rainbowUnicorn.h
deleted file mode 100644
index 0c709b4b7a..0000000000
--- a/users/pcoves/rainbowUnicorn.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-__attribute__((weak)) bool process_record_rainbowUnicorn(uint16_t keycode, keyrecord_t* keyrecord);
diff --git a/users/pcoves/readme.md b/users/pcoves/readme.md
deleted file mode 100644
index 1d076d92f6..0000000000
--- a/users/pcoves/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright 2020 @pcoves
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/users/pcoves/rules.mk b/users/pcoves/rules.mk
deleted file mode 100644
index 400497b151..0000000000
--- a/users/pcoves/rules.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-SRC += pcoves.c
-
-RAINBOW_UNICORN_ENABLE ?= no
-ifneq ($(strip $(RAINBOW_UNICORN_ENABLE)), no)
-	SRC += rainbowUnicorn.c
-	OPT_DEFS += -DRAINBOW_UNICORN_ENABLE
-endif
-
-ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-    SRC += tapDance.c
-endif
-
-ifeq ($(strip $(COMBO_ENABLE)), yes)
-    SRC += combo.c
-endif
-
-ifeq ($(strip $(UNICODE_ENABLE)), yes)
-    SRC += unicode.c
-	OPT_DEFS += -DUNICODE_ENABLE
-endif
-
-ifneq ($(strip $(NO_SECRET)), yes)
-    ifneq ("$(wildcard $(USER_PATH)/secret.c)","")
-        SRC += secret.c
-	else
-		OPT_DEFS += -DNO_SECRET
-    endif
-else
-	OPT_DEFS += -DNO_SECRET
-endif
diff --git a/users/pcoves/tapDance.c b/users/pcoves/tapDance.c
deleted file mode 100644
index 05b451f02e..0000000000
--- a/users/pcoves/tapDance.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "tapDance.h"
-
-#include "quantum.h"
-
-void left(qk_tap_dance_state_t* state, void* user_data) {
-    switch (state->count) {
-        case 1:
-            if (state->pressed)
-                tap_code16(S(KC_LEFT_BRACKET));
-            else
-                tap_code16(S(KC_9));
-            break;
-        case 2:
-            if (state->pressed)
-                tap_code16(S(KC_COMM));
-            else
-                tap_code(KC_LEFT_BRACKET);
-            break;
-        default:
-            reset_tap_dance(state);
-    }
-}
-
-void right(qk_tap_dance_state_t* state, void* user_data) {
-    switch (state->count) {
-        case 1:
-            if (state->pressed)
-                tap_code16(S(KC_RIGHT_BRACKET));
-            else
-                tap_code16(S(KC_0));
-            break;
-        case 2:
-            if (state->pressed)
-                tap_code16(S(KC_DOT));
-            else
-                tap_code(KC_RIGHT_BRACKET);
-            break;
-        default:
-            reset_tap_dance(state);
-    }
-}
-
-enum { REST, HOLD1, HOLD2, HOLD3 };
-
-static int Alt = REST;
-void       altFinish(qk_tap_dance_state_t* state, void* user_data) {
-    switch (state->count) {
-        case 1:
-            if (state->pressed) {
-                register_code(KC_LALT);
-                Alt = HOLD1;
-            }
-            break;
-        case 2:
-            if (state->pressed) {
-                register_code(KC_RALT);
-                Alt = HOLD2;
-            }
-            break;
-        case 3:
-            if (state->pressed) {
-                register_code(KC_RALT);
-                register_code(KC_RSFT);
-                Alt = HOLD3;
-            }
-            break;
-        default:
-            reset_tap_dance(state);
-    }
-}
-
-void altReset(qk_tap_dance_state_t* state, void* user_data) {
-    switch (Alt) {
-        case HOLD1:
-            unregister_code(KC_LALT);
-            break;
-        case HOLD2:
-            unregister_code(KC_RALT);
-            break;
-        case HOLD3:
-            unregister_code(KC_RSFT);
-            unregister_code(KC_RALT);
-            break;
-    }
-    Alt = REST;
-}
-
-static int Ctrl = REST;
-void       ctrlFinish(qk_tap_dance_state_t* state, void* user_data) {
-    switch (state->count) {
-        case 1:
-            if (state->pressed) {
-                register_code(KC_LCTL);
-                Ctrl = HOLD1;
-            } else {
-                tap_code(KC_ESC);
-            }
-            break;
-        case 2:
-            if (state->pressed) {
-                register_code(KC_LGUI);
-                Ctrl = HOLD2;
-            }
-            break;
-        default:
-            reset_tap_dance(state);
-    }
-}
-
-void ctrlReset(qk_tap_dance_state_t* state, void* user_data) {
-    switch (Ctrl) {
-        case HOLD1:
-            unregister_code(KC_LCTL);
-            break;
-        case HOLD2:
-            unregister_code(KC_LGUI);
-            break;
-    }
-    Ctrl = REST;
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-    [ALT]   = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altFinish, altReset),
-    [CTRL]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctrlFinish, ctrlReset),
-    [LEFT]  = ACTION_TAP_DANCE_FN(left),
-    [RIGHT] = ACTION_TAP_DANCE_FN(right),
-};
diff --git a/users/pcoves/tapDance.h b/users/pcoves/tapDance.h
deleted file mode 100644
index 98fd8ae2c7..0000000000
--- a/users/pcoves/tapDance.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-enum {
-    ALT,
-    CTRL,
-    LEFT,
-    RIGHT,
-};
diff --git a/users/pcoves/unicode.c b/users/pcoves/unicode.c
deleted file mode 100644
index 966a9d3852..0000000000
--- a/users/pcoves/unicode.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "unicode.h"
-#include "pcoves.h"
-
-bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case EMOTE0:
-            if (record->event.pressed) send_unicode_string("(╯°□°）╯︵┻━┻");
-            return false;
-        case EMOTE1:
-            if (record->event.pressed) send_unicode_string("(ヘ･_･)ヘ┳━┳");
-            return false;
-        case EMOTE2:
-            if (record->event.pressed) send_unicode_string("¯\\_(ツ)_/¯");
-            return false;
-        case EMOTE3:
-            if (record->event.pressed) send_unicode_string("ಠ_ಠ");
-            return false;
-    }
-    return true;
-}
diff --git a/users/pcoves/unicode.h b/users/pcoves/unicode.h
deleted file mode 100644
index ba8a881787..0000000000
--- a/users/pcoves/unicode.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-__attribute__((weak)) bool process_record_unicode(uint16_t keycode, keyrecord_t *record);
diff --git a/users/txkyel/config.h b/users/txkyel/config.h
deleted file mode 100644
index beb0a287a9..0000000000
--- a/users/txkyel/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Kyle Xiao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define TAPPING_TERM 200
diff --git a/users/txkyel/readme.md b/users/txkyel/readme.md
deleted file mode 100644
index 6f86fe28f8..0000000000
--- a/users/txkyel/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# txkyel's Userspace
-
-Read up on my implementation of tap dancing journey in learning QMK thus far in [tap_dance.md](tap_dance.md).
-
-## Licensing
-
-Copyright 2021 Kyle Xiao kylexiao20@gmail.com @txkyel
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/users/txkyel/rules.mk b/users/txkyel/rules.mk
deleted file mode 100644
index f7b729c83c..0000000000
--- a/users/txkyel/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-SRC += txkyel.c
-
-ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-	SRC += tap_dance.c
-endif
diff --git a/users/txkyel/tap_dance.c b/users/txkyel/tap_dance.c
deleted file mode 100644
index 9c1d27e8d8..0000000000
--- a/users/txkyel/tap_dance.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 Kyle Xiao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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.h"
-
-#ifdef TAP_DANCE_ENABLE
-void qk_tap_dance_tap_hold_on_each_tap(qk_tap_dance_state_t *state, void *user_data) {
-    qk_tap_dance_tap_hold_t *kc = (qk_tap_dance_tap_hold_t *)user_data;
-
-    // second tap within term, pseudo reset tap dance
-    if (state->count == 2) {
-        tap_code16(kc->t);
-        state->count = 1;
-        state->timer = timer_read();
-    }
-}
-
-void qk_tap_dance_tap_hold_on_finish(qk_tap_dance_state_t *state, void *user_data) {
-    qk_tap_dance_tap_hold_t *kc = (qk_tap_dance_tap_hold_t *)user_data;
-
-    kc->tapped = state->interrupted || !state->pressed;
-    if (kc->tapped) {
-        register_code16(kc->t);
-    } else {
-        register_code16(kc->h);
-    }
-}
-
-void qk_tap_dance_tap_hold_on_reset(qk_tap_dance_state_t *state, void *user_data) {
-    qk_tap_dance_tap_hold_t *kc = (qk_tap_dance_tap_hold_t *)user_data;
-
-    if (kc->tapped) {
-        unregister_code16(kc->t);
-    } else {
-        unregister_code16(kc->h);
-    }
-    kc->tapped = true;
-}
-#endif
diff --git a/users/txkyel/tap_dance.h b/users/txkyel/tap_dance.h
deleted file mode 100644
index af56a9863b..0000000000
--- a/users/txkyel/tap_dance.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Kyle Xiao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "txkyel.h"
-
-#ifdef TAP_DANCE_ENABLE
-typedef struct {
-    uint16_t t;
-    uint16_t h;
-    bool     tapped;
-} qk_tap_dance_tap_hold_t;
-
-#    define ACTION_TAP_HOLD(t, h) \
-        { .fn = {qk_tap_dance_tap_hold_on_each_tap, qk_tap_dance_tap_hold_on_finish, qk_tap_dance_tap_hold_on_reset}, .user_data = (void *)&((qk_tap_dance_tap_hold_t){t, h, true}), }
-#    define ACTION_TAP_HOLD_CTL(t) ACTION_TAP_HOLD(t, C(t))
-
-void qk_tap_dance_tap_hold_on_each_tap(qk_tap_dance_state_t *state, void *user_data);
-void qk_tap_dance_tap_hold_on_finish(qk_tap_dance_state_t *state, void *user_data);
-void qk_tap_dance_tap_hold_on_reset(qk_tap_dance_state_t *state, void *user_data);
-#endif
diff --git a/users/txkyel/tap_dance.md b/users/txkyel/tap_dance.md
deleted file mode 100644
index e36001f129..0000000000
--- a/users/txkyel/tap_dance.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Tap Hold Custom Tap Dance
-
-This custom tap dance functions similarly to the single tap and hold functionality of '[Quad Function Tap-Dance](https://docs.qmk.fm/#/feature_tap_dance?id=example-4)' by [DanielGGordon](https://github.com/danielggordon) with a reduced size per tap dance declared.
-
-## Motivation
-
-I first discovered tap dancing through [Ben Vallack](https://www.youtube.com/c/BenVallack) and was interested in the functionality of tap dancing demonstrated in his [tap dancing video](https://www.youtube.com/watch?v=pTMbzmf2sz8). And so I set off to implement my own tap dances emulating this functionality.
-
-## Custom Tap Dance Action
-
-Similar to the the action definitions in [`process_tap_dance.h`](../../quantum/process_keycode/process_tap_dance.h); I have created a custom macro and data structure used to declare tap dance actions:
-
-```c
-typedef struct {
-    uint16_t t;
-    uint16_t h;
-    bool     tapped;
-} qk_tap_dance_tap_hold_t;
-
-#define ACTION_TAP_HOLD(t, h) \
-    { .fn = {qk_tap_dance_tap_hold_on_each_tap, qk_tap_dance_tap_hold_on_finish, qk_tap_dance_tap_hold_on_reset}, .user_data = (void *)&((qk_tap_dance_tap_hold_t){t, h, true}), }
-```
-
-This allows the user to set the keycode registered when tapping `t`, the keycode registered when holding `h`, as well as prepares a boolean storing logic allowing the the reset function to determine whether a tap or hold was registered `tapped`.
-
-## Custom Tap Dance Functions
-
-The three handlers backing Tap Hold are really simple.
-
-The `on_each_tap` handler triggers a tap if a second tap is made within the tapping term. Following that it performs a pseudo reset, setting the count back to 1 and resetting the timer.
-
-```c
-void qk_tap_dance_tap_hold_on_each_tap(qk_tap_dance_state_t *state, void *user_data) {
-    qk_tap_dance_tap_hold_t *kc = (qk_tap_dance_tap_hold_t *)user_data;
-
-    if (state->count == 2) {
-        tap_code16(kc->t);
-        state->count = 1;
-        state->timer = timer_read();
-    }
-}
-```
-
-The `on_finished` handler determines whether the dance was a tap or a hold, saving the result in `kc->tapped` for `on_reset` later. After, the handler registers the respctive keycode. 
-
-```c
-void qk_tap_dance_tap_hold_on_finish(qk_tap_dance_state_t *state, void *user_data) {
-    qk_tap_dance_tap_hold_t *kc = (qk_tap_dance_tap_hold_t *)user_data;
-
-    kc->tapped = state->interrupted || !state->pressed;
-    if (kc->tapped) {
-        register_code16(kc->t);
-    } else {
-        register_code16(kc->h);
-    }
-}
-```
-
-Finally, the `on_reset` handler unregisters the corresponding keycode, and resets `kc->tapped` for subsequent tap dances.
-
-```c
-void qk_tap_dance_tap_hold_on_reset(qk_tap_dance_state_t *state, void *user_data) {
-    qk_tap_dance_tap_hold_t *kc = (qk_tap_dance_tap_hold_t *)user_data;
-
-    if (kc->tapped) {
-        unregister_code16(kc->t);
-    } else {
-        unregister_code16(kc->h);
-    }
-    kc->tapped = true;
-}
-```
-
-## Tap: keycode; Hold: control + keycode (or any modifier + keycode)
-
-The macro `ACTION_TAP_HOLD` allows a user to select the keycode for both the tap and hold action of the tap dance. It goes without saying that you can also send keycodes with modifiers so instead of having to write out `ACTION_TAP_HOLD(kc, C(kc))` for each keycode, we can use more macros:
-
-```c
-#define ACTION_TAP_HOLD_CTL(t) ACTION_TAP_HOLD(t, LCTL(t))
-```
-
-Macros are rock.
-
-# The Journey to Lower Sized Tap Dancing
-
-As I said earlier, I had set out to create my own tap dancing functions with little knowledge of how QMK works. Just as a bonus, I thought I'd share my journey through making my own custom tap dance.
-
-## Research
-
-When looking through the [tap dance documentation](https://beta.docs.qmk.fm/using-qmk/software-features/feature_tap_dance), it was apparent to me that [complex example 4](https://docs.qmk.fm/#/feature_tap_dance?id=example-4) by [DanielGGordon](https://github.com/danielggordon), had the functionality I so desired, I would have to do at least three things. 
-
-However, in order to make all the tap dances for at least all of the alpha keys I would have to do the following three things:
-
-1. Write a `on_dance_finished` function
-2. Write a `on_reset` function
-3. And create a static struct instance storing a `boolean` and `td_state_t`
-
-The most outrageous part was that I would have to repeat these three steps for **each and every tap dance!**
-
-Unable to see how I could reduce the number of functions and data structures. I decided to follow through with making functions for each keycode.
-
-## Naive Implementation 1: Macros with `ACTION_TAP_DANCE_FN_ADVANCED`
-
-For my initial implementation, I set out to make use of macros to reduce the amount of apparent duplicate code in my keymap files.
-
-Copying the functions by DanielGGordon, reducing its functionality to single tap and single hold, and converting them into macros, I was able to create all the necessary functions for each tap dance without having to write out the same functions dozens of times.
-
-My issues with this implementation were that, when compiling, this was no different from me writing the same function dozens of time. This meant that the resulting firmware was **HUGE** decreasing the amount of additional features the user is able to enable.
-
-## Naive Implementation 2: Custom Quantum Keycode
-
-Searching for another solution I searched through the files in the qmk repository and stumbled across the implementation of several quantum keycode processing files in [`process_keycode`](../../quantum/process_keycode), namely the files [`process_unicode.h`](../../quantum/process_keycode/process_unicode.h), [`process_unicode.c`](../../quantum/process_keycode/process_unicode.c), and [`process_unicode_common.h`](../../quantum/process_keycode/process_unicode_common.h).
-
-And so I set off to implement my own **custom quantum keycodes** overriding Unicode keycode ranges and [implementing `process_record_user()`](https://docs.qmk.fm/#/custom_quantum_functions?id=custom-keycodes).
-
-Upon initial testing with a single key, it appeared functional save for the fact that keys would only register when releasing the key. Additionally it saved plenty of space due to reuse of functions when processing input.
-
-I was really proud of my implementation and had even shown it off to several of my friends.
-
-Unfortunately, when testing it out on all alpha, everything started to come apart. Because keystrokes would only register when releasing the switch, faster typists would actually actuate some keystrokes in the incorrect order; particularly with space appearing before the final letter of most words.
-
-## Current Implementation: Custom Tap Dance Actions
-
-Upset that I would have to go back to naive implementation 1, I went back to digging for answers. Maybe there was something I was missing, some extra details on how tap dancing gets processed.
-
-Looking again in [`process_keycode`](../../quantum/process_keycode), I found [`process_tap_dance.h`](../../quantum/process_keycode/process_tap_dance.h) and [`process_tap_dance.c`](../../quantum/process_keycode/process_tap_dance.c). And in those files, I found the miracle working struct `qk_tap_dance_action_t`.
-
-Looking more closely, each tap dance action a user defines constructs a `qk_tap_dance_action_t` with the following:
-
--   Three handler functions
-    -   An `on_each_tap` function that runs when the tap dance key is pressed within the `TAPPING_TERM`
-    -   An `on_dance_finished` function that runs when the `TAPPING_TERM` is complete
-    -   An `on_reset` function that runs after finishing the dance
--   A `custom_tapping_term` for the tap dance action
--   Last but not least, the my saving grace: `void *user_data`. A user defined struct that gets passed to each of the handler functions.
-
-With this discovery, I set out to implement my own custom tap dance action in my [personal userspace](.) as seen [`tap_dance.c`](tap_dance.c) and [`tap_dance.h`](tap_dance.h) which I named ACTION_TAP_HOLD.
-
-## Updates and Thoughts
-
-### 08/08/2021
-
-Initially, I thought of allowing the user to hold the hold tap dance action (`KC_LCTL` + `KC_<keycode>`). Unfortunately, I ran into several issues (likely due to my lack of understanding on the runtime flow) causing control to be held indefinitely until the computer is restarted. This is why, I had handler functions perform `tap_code16` opposed to `register_code16` and `unregister_code16`.
-
-When handling a double tap within the `TAPPING_TERM`, the tap keycode gets sent with `tap_code16`, the status timer gets reset, and the counter gets set back to 1 in case the user wishes to tap again or to hold the second tap.
-
-### 09/08/2021
-
-Generalized tap and hold `user_data` struct to store two keycodes; one for the tap action, the other for the hold action. 
-
-This way the user can define the tap and hold functionality separately.
-
-### 09/08/2021
-
-Reworked utilizing, `register_code16` and `unregister_code16`. The issues previously experienced were due to my ignorance of the runtime flow for tap dancing.
-
-Previously in both the `on_dance_finished` and `on_reset` functions, I checked if the key was being tapped or held using this statement:
-
-```
-state->interrupted || !state->pressed
-```
-
-In the case of a hold, when accessing the `on_dance_finished` function, `state->interrupted` would be false and `state->pressed` would be true making the above statement false making the statement work as intended.
-
-However, when it comes to `on_reset` the statement no longer works.
-
-In the runtime flow for tap dancing, `on_reset` gets called in the function [`reset_tap_dance`](../../quantum/process_keycode/process_tap_dance.c#L186). In order for the `on_reset` function to be called, **state->pressed must be false**.
-
-This means that the above statement is no longer reliable in determining if a key has been held in this function. In fact, the function will always act as though a tap occured, meaning the hold reset will never be reached.
-
-There were signs of this in [complex examples](https://docs.qmk.fm/#/feature_tap_dance?id=complex-examples) that I hadn't taken into mind when designing this custom tap dance action (mainly through the static variables used to store the state instead of using `state` in both functions).
-
-As such, the fix was as simple as adding a boolean to the `user_data` struct that stores the state of the tap dance, thus allowing us to now be able to properly hold the hold key without any worry of the hold action of a key being stuck on.
diff --git a/users/txkyel/txkyel.c b/users/txkyel/txkyel.c
deleted file mode 100644
index 6ae6f4f1f9..0000000000
--- a/users/txkyel/txkyel.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2021 Kyle Xiao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "txkyel.h"
-
-#ifdef TAP_DANCE_ENABLE
-// Default Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-    [HC_A]         = ACTION_TAP_HOLD_CTL(KC_A),
-    [HC_B]         = ACTION_TAP_HOLD_CTL(KC_B),
-    [HC_C]         = ACTION_TAP_HOLD_CTL(KC_C),
-    [HC_D]         = ACTION_TAP_HOLD_CTL(KC_D),
-    [HC_E]         = ACTION_TAP_HOLD_CTL(KC_E),
-    [HC_F]         = ACTION_TAP_HOLD_CTL(KC_F),
-    [HC_G]         = ACTION_TAP_HOLD_CTL(KC_G),
-    [HC_H]         = ACTION_TAP_HOLD_CTL(KC_H),
-    [HC_I]         = ACTION_TAP_HOLD_CTL(KC_I),
-    [HC_J]         = ACTION_TAP_HOLD_CTL(KC_J),
-    [HC_K]         = ACTION_TAP_HOLD_CTL(KC_K),
-    [HC_L]         = ACTION_TAP_HOLD_CTL(KC_L),
-    [HC_M]         = ACTION_TAP_HOLD_CTL(KC_M),
-    [HC_N]         = ACTION_TAP_HOLD_CTL(KC_N),
-    [HC_O]         = ACTION_TAP_HOLD_CTL(KC_O),
-    [HC_P]         = ACTION_TAP_HOLD_CTL(KC_P),
-    [HC_Q]         = ACTION_TAP_HOLD_CTL(KC_Q),
-    [HC_R]         = ACTION_TAP_HOLD_CTL(KC_R),
-    [HC_S]         = ACTION_TAP_HOLD_CTL(KC_S),
-    [HC_T]         = ACTION_TAP_HOLD_CTL(KC_T),
-    [HC_U]         = ACTION_TAP_HOLD_CTL(KC_U),
-    [HC_V]         = ACTION_TAP_HOLD_CTL(KC_V),
-    [HC_W]         = ACTION_TAP_HOLD_CTL(KC_W),
-    [HC_X]         = ACTION_TAP_HOLD_CTL(KC_X),
-    [HC_Y]         = ACTION_TAP_HOLD_CTL(KC_Y),
-    [HC_Z]         = ACTION_TAP_HOLD_CTL(KC_Z),
-    [HC_BSPC]      = ACTION_TAP_HOLD_CTL(KC_BSPC),
-    [HC_DEL]       = ACTION_TAP_HOLD_CTL(KC_DEL),
-    [HC_LEFT]      = ACTION_TAP_HOLD_CTL(KC_LEFT),
-    [HC_RGHT]      = ACTION_TAP_HOLD_CTL(KC_RGHT),
-    [TH_ESC_TAB]   = ACTION_TAP_HOLD(KC_TAB, KC_ESC),
-    [TH_HOME_BSLS] = ACTION_TAP_HOLD(KC_BACKSLASH, KC_HOME),
-    [TH_HOME_BSLS] = ACTION_TAP_HOLD(KC_PIPE, KC_END),
-    [TH_QUOT_GRV]  = ACTION_TAP_HOLD(KC_QUOT, KC_GRV),
-};
-#endif
diff --git a/users/txkyel/txkyel.h b/users/txkyel/txkyel.h
deleted file mode 100644
index 0b725961a4..0000000000
--- a/users/txkyel/txkyel.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 Kyle Xiao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#include "tap_dance.h"
-
-#ifdef TAP_DANCE_ENABLE
-// Tap Dance declarations for use in keymaps
-enum hold_ctl_enum {
-    HC_A = 1,
-    HC_B,
-    HC_C,
-    HC_D,
-    HC_E,
-    HC_F,
-    HC_G,
-    HC_H,
-    HC_I,
-    HC_J,
-    HC_K,
-    HC_L,
-    HC_M,
-    HC_N,
-    HC_O,
-    HC_P,
-    HC_Q,
-    HC_R,
-    HC_S,
-    HC_T,
-    HC_U,
-    HC_V,
-    HC_W,
-    HC_X,
-    HC_Y,
-    HC_Z,
-    HC_BSPC,
-    HC_DEL,
-    HC_LEFT,
-    HC_RGHT,
-    TH_ESC_TAB,
-    TH_HOME_BSLS,
-    TH_END_PIPE,
-    TH_QUOT_GRV,
-};
-#endif

From d192d70327db7e91f0798e63e61472f1117e7ae5 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Fri, 21 Oct 2022 02:42:44 +0200
Subject: [PATCH 684/959] Update keyboards readme (#18714)

---
 keyboards/readme.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/keyboards/readme.md b/keyboards/readme.md
index 856be49093..95a68792a2 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -14,16 +14,17 @@ What makes OLKB keyboards shine is a combo of lean aesthetics, compact size, and
 
 ### Clueboard - Zach White
 
-Designed and built in Felton, CA, Clueboards keyboard emphasize quality and locally sourced components, available on [clueboard.co](http://clueboard.co)
+Designed and built in Felton, CA, Clueboards keyboard emphasize quality and locally sourced components.
 
 * [Clueboard](/keyboards/clueboard/66/) &mdash; The 66% custom keyboard.
 * [Cluecard](/keyboards/clueboard/card/) &mdash; A small board to help you hack on QMK.
 * [Cluepad](/keyboards/clueboard/17/) &mdash; A mechanical numpad with QMK superpowers.
 
-### ErgoDox EZ and Planck EZ - ZSA Technology Labs
+### Moonlander, ErgoDox EZ and Planck EZ - ZSA Technology Labs
 
-[ZSA Technology Labs](https://ergodox-ez.com) maintains its own [fork of QMK](https://github.com/zsa/qmk_firmware) which feeds its [configurator](https://configure.ergodox-ez.com), for stability and legal purposes. The ZSA boards are:
+[ZSA Technology Labs](https://zsa.io) maintains its own [fork of QMK](https://github.com/zsa/qmk_firmware) which feeds its [configurator](https://configure.zsa.io), for stability and legal purposes. The ZSA boards are:
 
+* [Moonlander Mark I](/keyboards/moonlander/) &mdash; A next-gen split, ergonomic keyboard with an active left side, USB type C, integrated wrist rest, and a thumb cluster that can move.
 * [ErgoDox EZ](/keyboards/ergodox_ez/) &mdash; A powerful split mechanical keyboard.
 * [Planck EZ](/keyboards/planck/ez) &mdash; A 40% DIY powerhouse of customizability and modification capability. It's a lean, mean, typing machine, which ships fully assembled with a two-year warranty.
 

From 1cb1a5a3744dc569fbe25c44004d860241fd26b1 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 21 Oct 2022 12:04:11 +1100
Subject: [PATCH 685/959] Remove legacy Grave Escape keycodes (#18787)

---
 keyboards/0xc7/61key/keymaps/default/keymap.c             | 2 +-
 keyboards/0xc7/61key/keymaps/via/keymap.c                 | 2 +-
 keyboards/0xcb/static/keymaps/bongocat/keymap.c           | 2 +-
 keyboards/0xcb/static/keymaps/default/keymap.c            | 2 +-
 keyboards/0xcb/static/keymaps/via/keymap.c                | 2 +-
 keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c   | 2 +-
 .../40percentclub/half_n_half/keymaps/Boy_314/keymap.c    | 2 +-
 .../40percentclub/half_n_half/keymaps/default/keymap.c    | 2 +-
 keyboards/40percentclub/luddite/keymaps/default/keymap.c  | 4 ++--
 keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c  | 2 +-
 keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c   | 2 +-
 keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c         | 4 ++--
 keyboards/acheron/arctic/keymaps/default/keymap.c         | 2 +-
 keyboards/acheron/keebspcb/keymaps/default/keymap.c       | 2 +-
 keyboards/acheron/lasgweloth/keymaps/default/keymap.c     | 2 +-
 keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c     | 2 +-
 keyboards/ai03/polaris/keymaps/mekberg/keymap.c           | 2 +-
 keyboards/akb/eb46/keymaps/default/keymap.c               | 2 +-
 .../device_one/keymaps/ansi_arrow_keys/keymap.c           | 4 ++--
 .../device_one/keymaps/ansi_split_backspace/keymap.c      | 4 ++--
 .../akegata_denki/device_one/keymaps/default/keymap.c     | 4 ++--
 keyboards/akegata_denki/device_one/keymaps/iso/keymap.c   | 4 ++--
 keyboards/al1/keymaps/via/keymap.c                        | 2 +-
 keyboards/alpine65/keymaps/default/keymap.c               | 2 +-
 keyboards/alpine65/keymaps/via/keymap.c                   | 2 +-
 keyboards/alps64/keymaps/mechmerlin/keymap.c              | 2 +-
 .../amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c      | 2 +-
 keyboards/aos/tkl/keymaps/aholland909/keymap.c            | 2 +-
 keyboards/arisu/keymaps/default/keymap.c                  | 2 +-
 keyboards/arisu/keymaps/stanrc85/keymap.c                 | 2 +-
 keyboards/arisu/keymaps/via/keymap.c                      | 2 +-
 keyboards/at_at/660m/keymaps/default/keymap.c             | 2 +-
 keyboards/atlas_65/keymaps/default/keymap.c               | 2 +-
 keyboards/atlas_65/keymaps/via/keymap.c                   | 2 +-
 keyboards/aurora65/keymaps/default/keymap.c               | 2 +-
 keyboards/aurora65/keymaps/via/keymap.c                   | 2 +-
 keyboards/baguette/keymaps/default/keymap.c               | 2 +-
 keyboards/baguette/keymaps/iso/keymap.c                   | 2 +-
 keyboards/bandominedoni/keymaps/led/keymap.c              | 4 ++--
 keyboards/bandominedoni/keymaps/lednotg/keymap.c          | 4 ++--
 keyboards/barleycorn_smd/keymaps/default/keymap.c         | 2 +-
 keyboards/barleycorn_smd/keymaps/iso/keymap.c             | 2 +-
 keyboards/barleycorn_smd/keymaps/via/keymap.c             | 2 +-
 keyboards/basketweave/keymaps/default/keymap.c            | 2 +-
 keyboards/basketweave/keymaps/via/keymap.c                | 2 +-
 keyboards/bfake/keymaps/default/keymap.c                  | 2 +-
 keyboards/bfake/keymaps/mechmerlin/keymap.c               | 2 +-
 keyboards/blackplum/keymaps/default/keymap.c              | 2 +-
 keyboards/blackplum/keymaps/via/keymap.c                  | 2 +-
 keyboards/boardwalk/keymaps/nchristus/keymap.c            | 2 +-
 keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c    | 2 +-
 keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c        | 2 +-
 .../cypher/rev6/keymaps/default_iso/keymap.c              | 2 +-
 keyboards/canary/canary60rgb/keymaps/default/keymap.c     | 4 ++--
 keyboards/canary/canary60rgb/keymaps/via/keymap.c         | 4 ++--
 keyboards/cannonkeys/adelie/keymaps/default/keymap.c      | 2 +-
 keyboards/cannonkeys/adelie/keymaps/via/keymap.c          | 2 +-
 keyboards/cannonkeys/aella/keymaps/default/keymap.c       | 2 +-
 keyboards/cannonkeys/aella/keymaps/via/keymap.c           | 2 +-
 keyboards/cannonkeys/an_c/keymaps/default/keymap.c        | 4 ++--
 keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c        | 2 +-
 keyboards/cannonkeys/an_c/keymaps/via/keymap.c            | 2 +-
 keyboards/cannonkeys/chimera65/keymaps/default/keymap.c   | 4 ++--
 keyboards/cannonkeys/chimera65/keymaps/via/keymap.c       | 4 ++--
 keyboards/cannonkeys/db60/keymaps/default/keymap.c        | 4 ++--
 keyboards/cannonkeys/db60/keymaps/iso/keymap.c            | 4 ++--
 keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c        | 2 +-
 keyboards/cannonkeys/db60/keymaps/via/keymap.c            | 2 +-
 keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c   | 4 ++--
 keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c       | 4 ++--
 keyboards/cannonkeys/instant60/keymaps/default/keymap.c   | 4 ++--
 keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c   | 2 +-
 keyboards/cannonkeys/instant60/keymaps/via/keymap.c       | 2 +-
 .../cannonkeys/instant60/keymaps/via_standard/keymap.c    | 2 +-
 keyboards/cannonkeys/instant65/keymaps/default/keymap.c   | 4 ++--
 keyboards/cannonkeys/instant65/keymaps/via/keymap.c       | 4 ++--
 keyboards/cannonkeys/iron165/keymaps/default/keymap.c     | 4 ++--
 keyboards/cannonkeys/iron165/keymaps/via/keymap.c         | 4 ++--
 keyboards/cannonkeys/moment/keymaps/default/keymap.c      | 2 +-
 keyboards/cannonkeys/moment/keymaps/via/keymap.c          | 2 +-
 keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c   | 2 +-
 keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c       | 2 +-
 .../cannonkeys/obliterated75/keymaps/default/keymap.c     | 2 +-
 keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c   | 2 +-
 keyboards/cannonkeys/practice60/keymaps/default/keymap.c  | 4 ++--
 keyboards/cannonkeys/practice65/keymaps/default/keymap.c  | 4 ++--
 keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c | 2 +-
 keyboards/cannonkeys/sagittarius/keymaps/via/keymap.c     | 2 +-
 keyboards/cannonkeys/savage65/keymaps/default/keymap.c    | 4 ++--
 keyboards/cannonkeys/savage65/keymaps/via/keymap.c        | 4 ++--
 keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c   | 2 +-
 keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c       | 2 +-
 keyboards/cannonkeys/vector/keymaps/default/keymap.c      | 2 +-
 keyboards/cannonkeys/vector/keymaps/via/keymap.c          | 2 +-
 keyboards/cannonkeys/vicious40/keymaps/default/keymap.c   | 2 +-
 keyboards/cannonkeys/vicious40/keymaps/via/keymap.c       | 2 +-
 keyboards/capsunlocked/cu65/keymaps/default/keymap.c      | 2 +-
 keyboards/capsunlocked/cu65/keymaps/iso/keymap.c          | 2 +-
 keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c | 2 +-
 keyboards/carbo65/keymaps/default/keymap.c                | 2 +-
 keyboards/carbo65/keymaps/via/keymap.c                    | 2 +-
 keyboards/charue/charon/keymaps/debug/keymap.c            | 2 +-
 keyboards/charue/charon/keymaps/default/keymap.c          | 2 +-
 keyboards/charue/charon/keymaps/via/keymap.c              | 2 +-
 keyboards/charue/sunsetter/keymaps/default/keymap.c       | 2 +-
 keyboards/charue/sunsetter/keymaps/default_all/keymap.c   | 2 +-
 keyboards/charue/sunsetter/keymaps/default_iso/keymap.c   | 2 +-
 keyboards/charue/sunsetter/keymaps/via/keymap.c           | 8 ++++----
 keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c      | 2 +-
 keyboards/charue/sunsetter_r2/keymaps/default/keymap.c    | 2 +-
 keyboards/charue/sunsetter_r2/keymaps/via/keymap.c        | 2 +-
 keyboards/checkerboards/g_idb60/keymaps/default/keymap.c  | 2 +-
 keyboards/checkerboards/g_idb60/keymaps/via/keymap.c      | 2 +-
 keyboards/checkerboards/nop60/keymaps/7u/keymap.c         | 2 +-
 keyboards/checkerboards/nop60/keymaps/default/keymap.c    | 2 +-
 keyboards/checkerboards/nop60/keymaps/via/keymap.c        | 2 +-
 keyboards/checkerboards/snop60/keymaps/7u/keymap.c        | 2 +-
 keyboards/checkerboards/snop60/keymaps/default/keymap.c   | 2 +-
 keyboards/checkerboards/snop60/keymaps/via/keymap.c       | 2 +-
 keyboards/cheshire/curiosity/keymaps/crd/keymap.c         | 2 +-
 keyboards/cheshire/curiosity/keymaps/default/keymap.c     | 2 +-
 keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c   | 2 +-
 keyboards/chlx/merro60/keymaps/ansi/keymap.c              | 2 +-
 keyboards/chlx/merro60/keymaps/hhkb/keymap.c              | 2 +-
 keyboards/chlx/merro60/keymaps/tsangan/keymap.c           | 2 +-
 keyboards/chlx/str_merro60/keymaps/ansi/keymap.c          | 2 +-
 keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c          | 2 +-
 keyboards/chlx/str_merro60/keymaps/tsangan/keymap.c       | 2 +-
 keyboards/ck60i/keymaps/default/keymap.c                  | 2 +-
 keyboards/ck60i/keymaps/via/keymap.c                      | 2 +-
 keyboards/clueboard/60/keymaps/default/keymap.c           | 2 +-
 keyboards/clueboard/60/keymaps/default_aek/keymap.c       | 2 +-
 keyboards/clueboard/66/keymaps/66_ansi/keymap.c           | 2 +-
 keyboards/clueboard/66/keymaps/66_iso/keymap.c            | 2 +-
 keyboards/clueboard/66/keymaps/caps_fn/keymap.c           | 2 +-
 keyboards/clueboard/66/keymaps/colemak/keymap.c           | 2 +-
 keyboards/clueboard/66/keymaps/default/keymap.c           | 2 +-
 keyboards/clueboard/66/keymaps/mac_optimized/keymap.c     | 2 +-
 keyboards/clueboard/66/keymaps/magicmonty/keymap.c        | 2 +-
 keyboards/clueboard/66/keymaps/manofinterests/keymap.c    | 2 +-
 keyboards/clueboard/66/keymaps/mouse_keys/keymap.c        | 2 +-
 keyboards/clueboard/66/keymaps/mrscooty/keymap.c          | 2 +-
 keyboards/clueboard/66/keymaps/shift_fn/keymap.c          | 2 +-
 keyboards/clueboard/66/keymaps/smt/keymap.c               | 6 +++---
 keyboards/clueboard/66/keymaps/tetris/keymap.c            | 4 ++--
 keyboards/clueboard/66/keymaps/unix_optimized/keymap.c    | 2 +-
 keyboards/clueboard/66/keymaps/via/keymap.c               | 2 +-
 keyboards/clueboard/66/keymaps/win_optimized/keymap.c     | 2 +-
 keyboards/clueboard/66/rev4/keymaps/mine/keymap.c         | 2 +-
 keyboards/clueboard/66_hotswap/gen1/gen1.c                | 2 +-
 .../clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c    | 2 +-
 .../clueboard/66_hotswap/gen1/keymaps/default/keymap.c    | 2 +-
 .../clueboard/66_hotswap/gen1/keymaps/json/keymap.json    | 2 +-
 .../66_hotswap/prototype/keymaps/66_ansi/keymap.c         | 2 +-
 .../66_hotswap/prototype/keymaps/default/keymap.c         | 2 +-
 keyboards/contra/keymaps/bramver/README.md                | 2 +-
 keyboards/contra/keymaps/bramver/keymap.c                 | 2 +-
 keyboards/contra/keymaps/maxr1998/keymap.c                | 2 +-
 keyboards/converter/m0110_usb/keymaps/zyber/keymap.c      | 2 +-
 .../coseyfannitutti/discipline/keymaps/default/keymap.c   | 2 +-
 keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c | 2 +-
 keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c | 2 +-
 keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c | 2 +-
 .../coseyfannitutti/mullet/keymaps/alternate/keymap.c     | 2 +-
 keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c | 2 +-
 keyboards/cradio/keymaps/default/keymap.c                 | 2 +-
 keyboards/custommk/evo70/keymaps/default/keymap.c         | 2 +-
 keyboards/custommk/evo70/keymaps/via/keymap.c             | 2 +-
 keyboards/db/db63/keymaps/default/keymap.c                | 6 +++---
 keyboards/doppelganger/keymaps/default/keymap.c           | 2 +-
 keyboards/drhigsby/bkf/keymaps/default/keymap.c           | 2 +-
 keyboards/ducky/one2mini/keymaps/ansi/keymap.c            | 2 +-
 keyboards/ducky/one2mini/keymaps/default/keymap.c         | 2 +-
 keyboards/ducky/one2mini/keymaps/iso/keymap.c             | 2 +-
 keyboards/ducky/one2sf/keymaps/default/keymap.c           | 2 +-
 keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json  | 2 +-
 keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json      | 2 +-
 keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json  | 2 +-
 keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json      | 2 +-
 keyboards/dz60/keymaps/60_ansi/keymap.c                   | 2 +-
 keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c       | 2 +-
 keyboards/dz60/keymaps/60_tsangan/keymap.c                | 2 +-
 keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c       | 2 +-
 keyboards/dz60/keymaps/LEdiodes/keymap.c                  | 4 ++--
 keyboards/dz60/keymaps/atlacat/keymap.c                   | 2 +-
 keyboards/dz60/keymaps/boris_burger/keymap.c              | 2 +-
 keyboards/dz60/keymaps/chrisae9/keymap.c                  | 2 +-
 keyboards/dz60/keymaps/default/keymap.c                   | 2 +-
 keyboards/dz60/keymaps/default_abnt2/keymap.c             | 2 +-
 keyboards/dz60/keymaps/drewsky/keymap.c                   | 2 +-
 keyboards/dz60/keymaps/gk64/keymap.c                      | 2 +-
 keyboards/dz60/keymaps/iso_4th_row_all_1u/keymap.c        | 2 +-
 keyboards/dz60/keymaps/iso_uk/keymap.c                    | 2 +-
 keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c    | 2 +-
 keyboards/dz60/keymaps/joooosh_hhkb/keymap.c              | 2 +-
 keyboards/dz60/keymaps/kifinnsson/keymap.c                | 2 +-
 keyboards/dz60/keymaps/kream/keymap.c                     | 2 +-
 keyboards/dz60/keymaps/macos_64/config.h                  | 2 +-
 keyboards/dz60/keymaps/macos_64/keymap.c                  | 2 +-
 keyboards/dz60/keymaps/macos_arrow/config.h               | 2 +-
 keyboards/dz60/keymaps/mechmerlin/keymap.c                | 2 +-
 keyboards/dz60/keymaps/mpstewart/keymap.c                 | 2 +-
 keyboards/dz60/keymaps/pevecyan/keymap.c                  | 2 +-
 keyboards/dz60/keymaps/pok3r/keymap.c                     | 2 +-
 keyboards/dz60/keymaps/stephengrier/keymap.c              | 2 +-
 keyboards/dz60/keymaps/tailcall/keymap.c                  | 2 +-
 keyboards/dz60/keymaps/via/keymap.c                       | 2 +-
 keyboards/dz60/keymaps/weeheavy/keymap.c                  | 2 +-
 keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c      | 2 +-
 keyboards/dz60/keymaps/zepol_layout/keymap.c              | 2 +-
 keyboards/dztech/dz60rgb/keymaps/default/keymap.c         | 2 +-
 keyboards/dztech/dz60rgb/keymaps/didel/keymap.c           | 2 +-
 keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c     | 2 +-
 keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c    | 2 +-
 keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c        | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c        | 2 +-
 keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c         | 2 +-
 keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c          | 2 +-
 keyboards/dztech/dz60rgb/keymaps/via/keymap.c             | 4 ++--
 keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c            | 2 +-
 keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c    | 4 ++--
 keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md  | 4 ++--
 keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c        | 4 ++--
 keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c     | 2 +-
 keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c        | 2 +-
 keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c         | 2 +-
 keyboards/dztech/dz65rgb/keymaps/adi/keymap.c             | 4 ++--
 keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c   | 2 +-
 keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c         | 2 +-
 keyboards/dztech/dz65rgb/keymaps/default/keymap.c         | 4 ++--
 keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c          | 8 ++++----
 keyboards/dztech/dz65rgb/keymaps/haervig/keymap.c         | 2 +-
 keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c     | 2 +-
 keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c      | 2 +-
 keyboards/dztech/dz65rgb/keymaps/via/keymap.c             | 4 ++--
 keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c         | 2 +-
 keyboards/eco/keymaps/fsck/keymap.c                       | 2 +-
 keyboards/emery65/keymaps/default/keymap.c                | 2 +-
 keyboards/emery65/keymaps/via/keymap.c                    | 2 +-
 keyboards/ep/40/keymaps/default/keymap.c                  | 2 +-
 keyboards/ericrlau/numdiscipline/keymaps/default/keymap.c | 2 +-
 keyboards/esca/getawayvan/keymaps/7u/keymap.c             | 2 +-
 keyboards/esca/getawayvan/keymaps/default/keymap.c        | 2 +-
 keyboards/esca/getawayvan/keymaps/via/keymap.c            | 2 +-
 keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c        | 2 +-
 keyboards/esca/getawayvan_f042/keymaps/default/keymap.c   | 2 +-
 keyboards/evyd13/atom47/keymaps/evyd13/keymap.c           | 2 +-
 keyboards/evyd13/eon40/keymaps/default/keymap.c           | 2 +-
 keyboards/evyd13/eon40/keymaps/via/keymap.c               | 2 +-
 keyboards/evyd13/eon65/keymaps/default/keymap.c           | 2 +-
 keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c         | 2 +-
 keyboards/evyd13/eon65/keymaps/via/keymap.c               | 2 +-
 keyboards/evyd13/gud70/keymaps/default/keymap.c           | 2 +-
 keyboards/evyd13/gud70/keymaps/evyd13/keymap.c            | 2 +-
 keyboards/evyd13/gud70/keymaps/via/keymap.c               | 2 +-
 keyboards/evyd13/minitomic/keymaps/default/keymap.c       | 2 +-
 keyboards/evyd13/pockettype/keymaps/default/keymap.c      | 2 +-
 keyboards/evyd13/solheim68/keymaps/default/keymap.c       | 2 +-
 keyboards/exclusive/e65/keymaps/crd/keymap.c              | 2 +-
 keyboards/exclusive/e65/keymaps/madhatter/keymap.c        | 2 +-
 keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c         | 2 +-
 keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c  | 2 +-
 keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c      | 2 +-
 keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c  | 2 +-
 keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c      | 2 +-
 keyboards/facew/keymaps/default/keymap.c                  | 2 +-
 keyboards/fc660c/keymaps/default_rgb/keymap.c             | 2 +-
 keyboards/fc660c/keymaps/mikefightsbears/keymap.c         | 2 +-
 keyboards/fc660c/keymaps/siroleo/keymap.c                 | 4 ++--
 keyboards/fc660c/keymaps/via_rgb/keymap.c                 | 2 +-
 keyboards/ferris/keymaps/madhatter/keymap.c               | 2 +-
 keyboards/ferris/keymaps/via/keymap.c                     | 2 +-
 keyboards/fjlabs/ad65/keymaps/default/keymap.c            | 4 ++--
 keyboards/fjlabs/ad65/keymaps/via/keymap.c                | 4 ++--
 keyboards/fjlabs/avalon/keymaps/default/keymap.c          | 4 ++--
 keyboards/fjlabs/avalon/keymaps/via/keymap.c              | 4 ++--
 keyboards/fjlabs/bks65/keymaps/default/keymap.c           | 4 ++--
 keyboards/fjlabs/bks65/keymaps/via/keymap.c               | 4 ++--
 keyboards/fjlabs/bks65solder/keymaps/default/keymap.c     | 4 ++--
 keyboards/fjlabs/bks65solder/keymaps/via/keymap.c         | 4 ++--
 keyboards/fjlabs/kyuu/keymaps/default/keymap.c            | 4 ++--
 keyboards/fjlabs/kyuu/keymaps/via/keymap.c                | 4 ++--
 keyboards/fjlabs/ldk65/keymaps/default/keymap.c           | 4 ++--
 keyboards/fjlabs/ldk65/keymaps/via/keymap.c               | 4 ++--
 keyboards/fjlabs/midway60/keymaps/default/keymap.c        | 4 ++--
 keyboards/fjlabs/midway60/keymaps/via/keymap.c            | 4 ++--
 keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c     | 4 ++--
 keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c         | 4 ++--
 keyboards/fjlabs/polaris/keymaps/default/keymap.c         | 4 ++--
 keyboards/fjlabs/polaris/keymaps/via/keymap.c             | 4 ++--
 keyboards/fjlabs/ready100/keymaps/default/keymap.c        | 4 ++--
 keyboards/fjlabs/ready100/keymaps/via/keymap.c            | 4 ++--
 keyboards/fjlabs/sinanju/keymaps/default/keymap.c         | 4 ++--
 .../fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c      | 4 ++--
 keyboards/fjlabs/sinanju/keymaps/via/keymap.c             | 4 ++--
 keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c       | 4 ++--
 keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c           | 4 ++--
 keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c        | 4 ++--
 keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c            | 4 ++--
 keyboards/fjlabs/tf60v2/keymaps/default/keymap.c          | 4 ++--
 keyboards/fjlabs/tf60v2/keymaps/via/keymap.c              | 4 ++--
 keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c       | 4 ++--
 keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c           | 4 ++--
 keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c      | 2 +-
 .../foxlab/leaf60/universal/keymaps/mguterl/keymap.c      | 2 +-
 keyboards/funky40/keymaps/default/keymap.c                | 2 +-
 keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c | 2 +-
 keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c     | 2 +-
 keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c | 2 +-
 .../keymap.c                                              | 2 +-
 .../fms/keymaps/default_60_hhkb_10u_space/keymap.c        | 2 +-
 .../keymaps/default_60_tsangan_hhkb_10u_space/keymap.c    | 2 +-
 keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c     | 2 +-
 keyboards/gh60/revc/keymaps/default_abnt2/keymap.c        | 2 +-
 keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c         | 2 +-
 keyboards/gh60/revc/keymaps/sethbc/keymap.c               | 2 +-
 keyboards/gh60/satan/keymaps/abhixec/keymap.c             | 6 +++---
 keyboards/gh60/satan/keymaps/addcninblue/keymap.c         | 2 +-
 keyboards/gh60/satan/keymaps/bri/keymap.c                 | 2 +-
 keyboards/gh60/satan/keymaps/chaser/keymap.c              | 2 +-
 keyboards/gh60/satan/keymaps/default/keymap.c             | 2 +-
 keyboards/gh60/satan/keymaps/denolfe/keymap.c             | 2 +-
 keyboards/gh60/satan/keymaps/fakb/keymap.c                | 2 +-
 keyboards/gh60/satan/keymaps/isoHHKB/keymap.c             | 2 +-
 keyboards/gh60/satan/keymaps/sethbc/keymap.c              | 2 +-
 keyboards/gh60/satan/keymaps/stanleylai/keymap.c          | 2 +-
 keyboards/giabalanai/keymaps/2firmware/keymap.c           | 6 +++---
 keyboards/giabalanai/keymaps/3araht/keymap.c              | 6 +++---
 keyboards/giabalanai/keymaps/default/keymap.c             | 2 +-
 .../giabalanai/keymaps/default_giabarinaix2/keymap.c      | 4 ++--
 keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c     | 6 +++---
 keyboards/giabalanai/keymaps/party/keymap.c               | 6 +++---
 keyboards/giabalanai/keymaps/via/keymap.c                 | 4 ++--
 keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c    | 4 ++--
 keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c    | 2 +-
 keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c        | 2 +-
 keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c     | 2 +-
 keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c         | 2 +-
 keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c    | 2 +-
 keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c        | 2 +-
 keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c     | 2 +-
 keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c         | 2 +-
 keyboards/gray_studio/cod67/keymaps/default/keymap.c      | 2 +-
 keyboards/gray_studio/cod67/keymaps/via/keymap.c          | 2 +-
 keyboards/gray_studio/space65/keymaps/conor/keymap.c      | 2 +-
 keyboards/gray_studio/space65/keymaps/madhatter/keymap.c  | 4 ++--
 keyboards/gray_studio/space65/keymaps/via/keymap.c        | 2 +-
 .../gray_studio/think65/hotswap/keymaps/default/keymap.c  | 2 +-
 .../gray_studio/think65/hotswap/keymaps/via/keymap.c      | 2 +-
 .../think65/solder/keymaps/dangjoeltang/keymap.c          | 2 +-
 .../gray_studio/think65/solder/keymaps/default/keymap.c   | 2 +-
 keyboards/gray_studio/think65/solder/keymaps/via/keymap.c | 2 +-
 keyboards/han60/keymaps/default/keymap.c                  | 2 +-
 keyboards/han60/keymaps/via/keymap.c                      | 2 +-
 keyboards/handwired/aek64/keymaps/4sstylz/keymap.c        | 2 +-
 keyboards/handwired/colorlice/keymaps/default/keymap.c    | 2 +-
 keyboards/handwired/cyberstar/keymaps/default/keymap.c    | 2 +-
 keyboards/handwired/cyberstar/keymaps/via/keymap.c        | 2 +-
 .../handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c  | 2 +-
 .../handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c    | 2 +-
 keyboards/handwired/freoduo/keymaps/default/keymap.c      | 2 +-
 keyboards/handwired/jn68m/keymaps/default/keymap.c        | 2 +-
 keyboards/handwired/lagrange/keymaps/default/keymap.c     | 2 +-
 keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c | 2 +-
 keyboards/handwired/p65rgb/keymaps/default/keymap.c       | 4 ++--
 keyboards/handwired/pill60/keymaps/default/keymap.c       | 2 +-
 keyboards/handwired/split65/keymaps/default/keymap.c      | 2 +-
 keyboards/handwired/split65/keymaps/via/keymap.c          | 2 +-
 .../handwired/swiftrax/nodu/keymaps/default/keymap.c      | 2 +-
 keyboards/handwired/swiftrax/nodu/keymaps/via/keymap.c    | 2 +-
 keyboards/handwired/symmetry60/keymaps/default/keymap.c   | 2 +-
 keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c     | 2 +-
 keyboards/hhkb/ansi/keymaps/brett/keymap.c                | 4 ++--
 keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c         | 2 +-
 keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c           | 4 ++--
 keyboards/hhkb/ansi/keymaps/xyverz/keymap.c               | 6 +++---
 keyboards/hineybush/physix/keymaps/via/keymap.c           | 2 +-
 keyboards/hnahkb/vn66/keymaps/default/keymap.c            | 2 +-
 keyboards/hp69/keymaps/via/keymap.c                       | 2 +-
 keyboards/hs60/v1/keymaps/ansi/keymap.c                   | 2 +-
 keyboards/hs60/v1/keymaps/default/keymap.c                | 2 +-
 keyboards/hs60/v2/ansi/keymaps/default/keymap.c           | 2 +-
 keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c          | 2 +-
 keyboards/hs60/v2/ansi/keymaps/via/keymap.c               | 2 +-
 keyboards/hs60/v2/iso/keymaps/default/keymap.c            | 2 +-
 keyboards/hs60/v2/iso/keymaps/via/keymap.c                | 2 +-
 keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c       | 2 +-
 keyboards/ibnuda/gurindam/keymaps/default/keymap.c        | 2 +-
 keyboards/ibnuda/gurindam/keymaps/via/keymap.c            | 2 +-
 keyboards/idb/idb_60/keymaps/all_keys/keymap.c            | 2 +-
 keyboards/idb/idb_60/keymaps/default/keymap.c             | 2 +-
 keyboards/idb/idb_60/keymaps/pngu/keymap.c                | 2 +-
 keyboards/idb/idb_60/keymaps/via/keymap.c                 | 2 +-
 keyboards/idobao/id42/keymaps/default/keymap.c            | 2 +-
 keyboards/idobao/id42/keymaps/idobao/keymap.c             | 2 +-
 keyboards/idobao/id42/keymaps/via/keymap.c                | 2 +-
 keyboards/idobao/id61/keymaps/default/keymap.c            | 2 +-
 keyboards/idobao/id61/keymaps/idobao/keymap.c             | 2 +-
 keyboards/idobao/id61/keymaps/via/keymap.c                | 2 +-
 keyboards/idobao/id63/keymaps/default/keymap.c            | 2 +-
 keyboards/idobao/id63/keymaps/idobao/keymap.c             | 2 +-
 keyboards/idobao/id63/keymaps/via/keymap.c                | 2 +-
 keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c      | 2 +-
 keyboards/idobao/id75/keymaps/revok75/keymap.c            | 6 +++---
 keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c    | 2 +-
 keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c        | 2 +-
 keyboards/idobao/montex/v2/keymaps/default/keymap.c       | 2 +-
 keyboards/idobao/montex/v2/keymaps/via/keymap.c           | 2 +-
 keyboards/ilumkb/simpler61/keymaps/default/keymap.c       | 4 ++--
 keyboards/ilumkb/simpler61/keymaps/via/keymap.c           | 4 ++--
 keyboards/ilumkb/simpler64/keymaps/default/keymap.c       | 4 ++--
 keyboards/ilumkb/simpler64/keymaps/via/keymap.c           | 4 ++--
 .../input_club/whitefox/keymaps/jetpacktuxedo/keymap.c    | 2 +-
 .../s7_elephant/rev1/keymaps/default/keymap.c             | 2 +-
 .../s7_elephant/rev2/keymaps/default/keymap.c             | 2 +-
 keyboards/jagdpietr/drakon/keymaps/default/keymap.c       | 2 +-
 keyboards/jagdpietr/drakon/keymaps/wkl/keymap.c           | 2 +-
 keyboards/jc65/v32a/keymaps/default/keymap.c              | 2 +-
 keyboards/jc65/v32a/keymaps/ptillemans/keymap.c           | 2 +-
 keyboards/jc65/v32u4/keymaps/coth/keymap.c                | 2 +-
 keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c     | 2 +-
 keyboards/jc65/v32u4/keymaps/default/keymap.c             | 2 +-
 keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c             | 2 +-
 keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c       | 2 +-
 keyboards/jc65/v32u4/keymaps/na7thana/keymap.c            | 2 +-
 keyboards/jels/jels60/keymaps/default/keymap.c            | 2 +-
 keyboards/jels/jels60/keymaps/via/keymap.c                | 2 +-
 keyboards/jm60/keymaps/default/keymap.c                   | 2 +-
 keyboards/jm60/keymaps/poker3/keymap.c                    | 2 +-
 keyboards/kapcave/arya/keymaps/default/keymap.c           | 2 +-
 keyboards/kapcave/arya/keymaps/via/keymap.c               | 2 +-
 keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c | 6 +++---
 keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c     | 6 +++---
 .../kbdfans/baguette66/soldered/keymaps/default/keymap.c  | 6 +++---
 .../kbdfans/baguette66/soldered/keymaps/via/keymap.c      | 6 +++---
 keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c     | 2 +-
 keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c         | 2 +-
 keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c             | 2 +-
 keyboards/kbdfans/kbd66/keymaps/default/keymap.c          | 2 +-
 keyboards/kbdfans/kbd66/keymaps/iso/keymap.c              | 2 +-
 keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c   | 2 +-
 .../kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c      | 4 ++--
 .../kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c | 4 ++--
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c  | 4 ++--
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c  | 4 ++--
 .../kemmeldev-4-layered-layout.json                       | 2 +-
 .../kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c      | 4 ++--
 .../kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json   | 2 +-
 .../kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c        | 2 +-
 .../kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c    | 4 ++--
 keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c      | 4 ++--
 .../kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c    | 2 +-
 keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c  | 2 +-
 keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c         | 2 +-
 keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c         | 2 +-
 keyboards/kbdfans/kbd6x/keymaps/othi/config.h             | 2 +-
 keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c             | 2 +-
 keyboards/kbdfans/maja/keymaps/default/keymap.c           | 4 ++--
 keyboards/kbdfans/maja/keymaps/via/keymap.c               | 4 ++--
 keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c  | 4 ++--
 keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c      | 4 ++--
 keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c        | 2 +-
 keyboards/kc60/keymaps/stanleylai/keymap.c                | 2 +-
 keyboards/kc60se/keymaps/60_ansi/keymap.c                 | 2 +-
 keyboards/keebio/iris/keymaps/blucky/keymap.c             | 2 +-
 keyboards/keebio/iris/keymaps/fluffactually/keymap.c      | 2 +-
 keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c     | 2 +-
 keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c        | 2 +-
 keyboards/keebio/iris/keymaps/omgvee/keymap.c             | 4 ++--
 keyboards/keebio/iris/keymaps/osiris/keymap.c             | 4 ++--
 keyboards/keebio/nyquist/keymaps/bramver/keymap.c         | 2 +-
 keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c       | 2 +-
 keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c      | 4 ++--
 keyboards/keebio/quefrency/keymaps/bramver/README.md      | 4 ++--
 keyboards/keebio/quefrency/keymaps/bramver/keymap.c       | 4 ++--
 keyboards/keebio/quefrency/keymaps/default/keymap.c       | 4 ++--
 keyboards/keebio/quefrency/keymaps/default60/keymap.c     | 4 ++--
 keyboards/keebio/quefrency/keymaps/default65/keymap.c     | 4 ++--
 keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c    | 4 ++--
 keyboards/keebio/quefrency/keymaps/joestrong/keymap.c     | 2 +-
 keyboards/keebio/quefrency/keymaps/jonavin/keymap.c       | 2 +-
 keyboards/keebio/quefrency/keymaps/via/keymap.c           | 4 ++--
 keyboards/keebio/quefrency/keymaps/yoryer/keymap.c        | 6 +++---
 keyboards/keebio/sinc/keymaps/default/keymap.c            | 2 +-
 keyboards/keebio/sinc/keymaps/iso/keymap.c                | 2 +-
 keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c       | 2 +-
 keyboards/keebio/sinc/keymaps/via/keymap.c                | 2 +-
 keyboards/keebio/wtf60/keymaps/default/keymap.c           | 2 +-
 keyboards/keebio/wtf60/keymaps/via/keymap.c               | 2 +-
 keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c     | 2 +-
 .../keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c      | 2 +-
 keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c         | 2 +-
 keyboards/kegen/gboy/keymaps/default/keymap.c             | 2 +-
 keyboards/kegen/gboy/keymaps/via/keymap.c                 | 2 +-
 keyboards/keybee/keybee65/keymaps/default/keymap.c        | 2 +-
 keyboards/keybee/keybee65/keymaps/via/keymap.c            | 2 +-
 keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c        | 2 +-
 keyboards/keygem/kg60ansi/keymaps/default/keymap.c        | 4 ++--
 keyboards/keygem/kg60ansi/keymaps/via/keymap.c            | 4 ++--
 keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c       | 4 ++--
 keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c           | 4 ++--
 keyboards/keyhive/absinthe/keymaps/via/keymap.c           | 2 +-
 keyboards/keyhive/lattice60/keymaps/default/keymap.c      | 2 +-
 keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c | 2 +-
 keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c    | 2 +-
 keyboards/keyprez/rhino/keymaps/default/keymap.c          | 2 +-
 keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c     | 2 +-
 keyboards/keyprez/unicorn/keymaps/default/keymap.c        | 2 +-
 keyboards/kiwikey/borderland/keymaps/default/keymap.c     | 2 +-
 keyboards/kiwikey/borderland/keymaps/via/keymap.c         | 2 +-
 keyboards/kopibeng/mnk65/keymaps/default/keymap.c         | 2 +-
 keyboards/kopibeng/mnk65/keymaps/via/keymap.c             | 2 +-
 keyboards/kopibeng/typ65/keymaps/default/keymap.c         | 2 +-
 keyboards/kopibeng/typ65/keymaps/via/keymap.c             | 2 +-
 keyboards/kopibeng/xt60/keymaps/default/keymap.c          | 2 +-
 keyboards/kopibeng/xt60/keymaps/via/keymap.c              | 2 +-
 keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c    | 2 +-
 keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c        | 2 +-
 keyboards/kopibeng/xt65/keymaps/default/keymap.c          | 2 +-
 keyboards/kopibeng/xt65/keymaps/via/keymap.c              | 2 +-
 .../bm60hsrgb_iso/rev1/keymaps/default/keymap.c           | 2 +-
 .../bm60hsrgb_iso/rev2/keymaps/default/keymap.c           | 2 +-
 .../kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c    | 2 +-
 .../bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c       | 2 +-
 .../bm60hsrgb_poker/rev2/keymaps/default/keymap.c         | 2 +-
 .../kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c  | 2 +-
 .../bm65hsrgb_iso/rev1/keymaps/default/keymap.c           | 2 +-
 .../kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c    | 2 +-
 .../kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c    | 4 ++--
 keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c  | 4 ++--
 keyboards/kprepublic/cospad/keymaps/detrus/keymap.c       | 8 ++++----
 keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c        | 2 +-
 keyboards/ktec/daisy/keymaps/default/keymap.c             | 2 +-
 keyboards/ktec/daisy/keymaps/via/keymap.c                 | 2 +-
 keyboards/kwub/bloop/keymaps/crispyy/keymap.c             | 2 +-
 keyboards/kwub/bloop/keymaps/default/keymap.c             | 2 +-
 keyboards/kwub/bloop/keymaps/kevin_hhkb/keymap.c          | 2 +-
 keyboards/kwub/bloop/keymaps/via/keymap.c                 | 2 +-
 keyboards/lazydesigners/bolt/keymaps/default/keymap.c     | 2 +-
 keyboards/lazydesigners/bolt/keymaps/via/keymap.c         | 2 +-
 .../dimple/staggered/keymaps/default/keymap.c             | 2 +-
 .../lazydesigners/dimple/staggered/keymaps/via/keymap.c   | 2 +-
 .../dimple/staggered/rev3/keymaps/via/keymap.c            | 2 +-
 keyboards/lazydesigners/the50/keymaps/default/keymap.c    | 2 +-
 .../lazydesigners/the50/keymaps/mikethetiger/keymap.c     | 2 +-
 .../lazydesigners/the60/rev1/keymaps/default/keymap.c     | 2 +-
 keyboards/leeku/finger65/keymaps/default/keymap.c         | 2 +-
 keyboards/leeku/finger65/keymaps/madhatter/keymap.c       | 2 +-
 keyboards/lets_split/keymaps/aerialviews007/keymap.c      | 6 +++---
 keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c   | 2 +-
 keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c     | 4 ++--
 keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c      | 2 +-
 keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c          | 2 +-
 keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c | 2 +-
 keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c          | 2 +-
 keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c  | 2 +-
 keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c   | 2 +-
 keyboards/lfkeyboards/smk65/keymaps/default/keymap.c      | 2 +-
 keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c          | 2 +-
 keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c     | 2 +-
 keyboards/lily58/keymaps/chuan/keymap.c                   | 2 +-
 keyboards/lily58/keymaps/mikefightsbears/keymap.c         | 2 +-
 keyboards/linworks/fave65h/keymaps/default/keymap.c       | 2 +-
 .../fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c  | 2 +-
 .../keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c | 2 +-
 keyboards/linworks/fave65h/keymaps/via/keymap.c           | 2 +-
 keyboards/loki65/keymaps/default/keymap.c                 | 2 +-
 keyboards/loki65/keymaps/via/keymap.c                     | 2 +-
 keyboards/lucid/alexa/keymaps/default/keymap.c            | 4 ++--
 keyboards/lucid/alexa/keymaps/via/keymap.c                | 4 ++--
 keyboards/lucid/alexa_solder/keymaps/default/keymap.c     | 4 ++--
 keyboards/lucid/alexa_solder/keymaps/via/keymap.c         | 4 ++--
 keyboards/lucid/phantom_hs/keymaps/default/keymap.c       | 4 ++--
 keyboards/lucid/phantom_hs/keymaps/via/keymap.c           | 4 ++--
 keyboards/lucid/phantom_solder/keymaps/default/keymap.c   | 4 ++--
 keyboards/lucid/phantom_solder/keymaps/via/keymap.c       | 4 ++--
 keyboards/lyso1/lck75/keymaps/7u/keymap.c                 | 2 +-
 keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c             | 2 +-
 keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c             | 2 +-
 keyboards/lyso1/lck75/keymaps/default/keymap.c            | 2 +-
 keyboards/lyso1/lck75/keymaps/iso/keymap.c                | 2 +-
 keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c            | 2 +-
 keyboards/lyso1/lck75/keymaps/sbs/keymap.c                | 2 +-
 keyboards/lyso1/lck75/keymaps/via/keymap.c                | 2 +-
 keyboards/massdrop/alt/keymaps/jdelkins/keymap.c          | 6 +++---
 keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c       | 2 +-
 keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c      | 2 +-
 keyboards/massdrop/alt/keymaps/xulkal/keymap.c            | 4 ++--
 keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c           | 2 +-
 .../mechanickeys/miniashen40/keymaps/default/keymap.c     | 2 +-
 keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c   | 2 +-
 keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c  | 2 +-
 .../mb65s/keymaps/iso_blocker_tsangan/keymap.c            | 2 +-
 keyboards/mechkeys/acr60/keymaps/default/keymap.c         | 2 +-
 keyboards/mechkeys/acr60/keymaps/mitch/keymap.c           | 2 +-
 keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c | 2 +-
 .../mechkeys/mechmini/v2/keymaps/split_space/keymap.c     | 2 +-
 keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c       | 2 +-
 .../mechwild/mercutio/keymaps/fearless_spiff/keymap.c     | 2 +-
 .../mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c  | 2 +-
 .../mechwild/mokulua/mirrored/keymaps/default/keymap.c    | 2 +-
 keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c  | 2 +-
 .../mechwild/mokulua/standard/keymaps/default/keymap.c    | 2 +-
 .../mechwild/mokulua/standard/keymaps/silly/keymap.c      | 2 +-
 keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c  | 2 +-
 keyboards/mechwild/obe/keymaps/default/keymap.c           | 2 +-
 keyboards/mechwild/obe/keymaps/jonavin/keymap.c           | 2 +-
 keyboards/mechwild/obe/keymaps/via/keymap.c               | 2 +-
 keyboards/mechwild/waka60/keymaps/audio/keymap.c          | 2 +-
 keyboards/mechwild/waka60/keymaps/default/keymap.c        | 2 +-
 keyboards/mechwild/waka60/keymaps/via/keymap.c            | 2 +-
 keyboards/melgeek/mach80/keymaps/default/keymap.c         | 2 +-
 keyboards/melgeek/mach80/keymaps/tkl/keymap.c             | 2 +-
 keyboards/melgeek/mach80/keymaps/via/keymap.c             | 2 +-
 keyboards/melgeek/mach80/keymaps/wkl/keymap.c             | 2 +-
 keyboards/melgeek/mj61/keymaps/default/keymap.c           | 4 ++--
 keyboards/melgeek/mj61/keymaps/via/keymap.c               | 4 ++--
 keyboards/melgeek/mj63/keymaps/default/keymap.c           | 2 +-
 keyboards/melgeek/mj63/keymaps/via/keymap.c               | 2 +-
 keyboards/melgeek/mj64/keymaps/default/keymap.c           | 4 ++--
 keyboards/melgeek/mj64/keymaps/via/keymap.c               | 4 ++--
 keyboards/melgeek/mj65/keymaps/default/keymap.c           | 4 ++--
 keyboards/melgeek/mj65/keymaps/via/keymap.c               | 4 ++--
 keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c          | 2 +-
 keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c   | 2 +-
 .../mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c        | 2 +-
 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c    | 2 +-
 .../melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c   | 2 +-
 .../mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c  | 2 +-
 .../melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c   | 2 +-
 .../mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c  | 2 +-
 .../mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c     | 2 +-
 .../melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c | 2 +-
 .../mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c  | 2 +-
 keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c | 2 +-
 keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c           | 2 +-
 .../60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c      | 2 +-
 .../keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c | 2 +-
 .../keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c     | 2 +-
 .../mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c  | 2 +-
 keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c    | 2 +-
 .../melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c | 2 +-
 .../mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c  | 2 +-
 .../mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c     | 2 +-
 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c     | 2 +-
 .../melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c    | 2 +-
 .../mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c   | 2 +-
 .../melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c    | 2 +-
 .../mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c   | 2 +-
 .../mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c      | 2 +-
 .../melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c  | 2 +-
 .../mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c   | 2 +-
 keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c  | 2 +-
 .../melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c | 2 +-
 .../melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c    | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c          | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c   | 2 +-
 .../mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c        | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c   | 2 +-
 .../mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c        | 2 +-
 .../melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c   | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c | 2 +-
 .../mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c        | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c           | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c    | 2 +-
 .../melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c    | 2 +-
 .../melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c | 2 +-
 .../melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c    | 2 +-
 keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c  | 2 +-
 .../melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c | 2 +-
 keyboards/melgeek/mj6xy/keymaps/default/keymap.c          | 2 +-
 keyboards/melgeek/mj6xy/keymaps/via/keymap.c              | 2 +-
 keyboards/melgeek/mojo68/keymaps/default/keymap.c         | 2 +-
 keyboards/melgeek/mojo68/keymaps/via/keymap.c             | 2 +-
 keyboards/melgeek/mojo75/keymaps/default/keymap.c         | 2 +-
 keyboards/melgeek/mojo75/keymaps/via/keymap.c             | 2 +-
 keyboards/melgeek/tegic/keymaps/default/keymap.c          | 2 +-
 keyboards/melgeek/tegic/keymaps/via/keymap.c              | 2 +-
 keyboards/melgeek/z70ultra/keymaps/default/keymap.c       | 2 +-
 keyboards/melgeek/z70ultra/keymaps/via/keymap.c           | 2 +-
 keyboards/meme/keymaps/default/keymap.c                   | 2 +-
 keyboards/miller/gm862/keymaps/default/keymap.c           | 4 ++--
 keyboards/miller/gm862/keymaps/via/keymap.c               | 4 ++--
 .../minimon/index_tab/keymaps/default_7u_space/keymap.c   | 2 +-
 keyboards/misterknife/knife66/keymaps/default/keymap.c    | 2 +-
 keyboards/misterknife/knife66/keymaps/zyber/keymap.c      | 2 +-
 .../misterknife/knife66_iso/keymaps/default/keymap.c      | 2 +-
 keyboards/mnk1800s/keymaps/default/keymap.c               | 2 +-
 keyboards/mnk1800s/keymaps/via/keymap.c                   | 2 +-
 keyboards/mnk50/keymaps/default/keymap.c                  | 2 +-
 keyboards/mnk50/keymaps/via/keymap.c                      | 2 +-
 keyboards/mokey/xox70/keymaps/default/keymap.c            | 2 +-
 keyboards/mokey/xox70/keymaps/via/keymap.c                | 2 +-
 keyboards/mokey/xox70hot/keymaps/default/keymap.c         | 2 +-
 keyboards/mokey/xox70hot/keymaps/via/keymap.c             | 2 +-
 keyboards/mt/blocked65/keymaps/default/keymap.c           | 2 +-
 keyboards/mt/blocked65/keymaps/via/keymap.c               | 2 +-
 keyboards/murcielago/rev1/keymaps/default/keymap.c        | 2 +-
 keyboards/murcielago/rev1/keymaps/via/keymap.c            | 2 +-
 keyboards/mxss/keymaps/default/keymap.c                   | 2 +-
 keyboards/mxss/keymaps/via/keymap.c                       | 2 +-
 keyboards/mysticworks/wyvern/keymaps/default/keymap.c     | 2 +-
 keyboards/mysticworks/wyvern/keymaps/via/keymap.c         | 2 +-
 keyboards/neito/keymaps/default/keymap.c                  | 2 +-
 keyboards/neito/keymaps/olli_works/keymap.c               | 2 +-
 keyboards/neito/keymaps/via/keymap.c                      | 2 +-
 .../nightly_boards/alter/rev1/keymaps/default/keymap.c    | 2 +-
 .../nightly_boards/alter_lite/keymaps/default/keymap.c    | 2 +-
 keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c  | 2 +-
 keyboards/nightmare/keymaps/default/keymap.c              | 2 +-
 keyboards/nightmare/keymaps/via/keymap.c                  | 2 +-
 keyboards/nix_studio/n60_a/keymaps/default/keymap.c       | 2 +-
 keyboards/nix_studio/n60_a/keymaps/via/keymap.c           | 2 +-
 keyboards/novelkeys/nk65/keymaps/default/keymap.c         | 2 +-
 keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c       | 2 +-
 keyboards/novelkeys/nk65/keymaps/via/keymap.c             | 2 +-
 keyboards/novelkeys/nk65b/keymaps/default/keymap.c        | 2 +-
 keyboards/novelkeys/nk65b/keymaps/via/keymap.c            | 2 +-
 keyboards/noxary/378/keymaps/default/keymap.c             | 2 +-
 keyboards/noxary/378/keymaps/via/keymap.c                 | 2 +-
 keyboards/noxary/valhalla/keymaps/default/keymap.c        | 2 +-
 keyboards/noxary/valhalla/keymaps/via/keymap.c            | 2 +-
 .../nullbitsco/nibble/keymaps/oled_bongocat/keymap.c      | 2 +-
 keyboards/nullbitsco/nibble/keymaps/via/keymap.c          | 2 +-
 .../omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c      | 2 +-
 keyboards/onekeyco/dango40/keymaps/default/keymap.c       | 2 +-
 keyboards/onekeyco/dango40/keymaps/via/keymap.c           | 2 +-
 keyboards/org60/keymaps/boardy/keymap.c                   | 2 +-
 keyboards/orthocode/keymaps/default/keymap.c              | 2 +-
 keyboards/orthocode/keymaps/via/keymap.c                  | 2 +-
 keyboards/pearl/keymaps/default/keymap.c                  | 2 +-
 keyboards/pearl/keymaps/jetpacktuxedo/keymap.c            | 2 +-
 keyboards/pearlboards/atlas/keymaps/default/keymap.c      | 2 +-
 keyboards/pearlboards/atlas/keymaps/via/keymap.c          | 2 +-
 keyboards/pearlboards/pandora/keymaps/default/keymap.c    | 2 +-
 keyboards/pearlboards/pandora/keymaps/via/keymap.c        | 2 +-
 keyboards/pearlboards/pearl/keymaps/default/keymap.c      | 2 +-
 keyboards/pearlboards/pearl/keymaps/via/keymap.c          | 2 +-
 keyboards/pearlboards/zeus/keymaps/default/keymap.c       | 2 +-
 keyboards/pearlboards/zeus/keymaps/via/keymap.c           | 2 +-
 keyboards/peej/rosaline/ortho/keymaps/default/keymap.c    | 2 +-
 keyboards/peej/rosaline/ortho/keymaps/via/keymap.c        | 2 +-
 .../peej/rosaline/staggered/keymaps/default/keymap.c      | 2 +-
 keyboards/peej/rosaline/staggered/keymaps/via/keymap.c    | 2 +-
 keyboards/peej/tripel/keymaps/default/keymap.c            | 2 +-
 keyboards/peej/tripel/keymaps/via/keymap.c                | 2 +-
 keyboards/percent/canoe/keymaps/boy_314/keymap.c          | 2 +-
 keyboards/percent/canoe/keymaps/default/keymap.c          | 2 +-
 keyboards/percent/canoe/keymaps/via/keymap.c              | 2 +-
 .../picolab/frusta_fundamental/keymaps/default/keymap.c   | 2 +-
 keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c | 2 +-
 keyboards/planck/keymaps/abhixec/keymap.c                 | 4 ++--
 keyboards/planck/keymaps/ariccb/keymap.c                  | 2 +-
 keyboards/planck/keymaps/davidrambo/keymap.c              | 2 +-
 keyboards/planck/keymaps/jetpacktuxedo/keymap.c           | 2 +-
 keyboards/planck/keymaps/mjuma/keymap.c                   | 4 ++--
 keyboards/planck/keymaps/roguepullrequest/keymap.c        | 2 +-
 keyboards/planck/keymaps/rootiest/keymap.c                | 6 +++---
 keyboards/planck/keymaps/skank/keymap.c                   | 4 ++--
 keyboards/planck/keymaps/ttys0/keymap.c                   | 2 +-
 keyboards/playkbtw/ca66/keymaps/default/keymap.c          | 2 +-
 keyboards/playkbtw/ca66/keymaps/zyber/keymap.c            | 2 +-
 keyboards/polilla/rev1/keymaps/default/keymap.c           | 2 +-
 keyboards/polilla/rev1/keymaps/via/keymap.c               | 2 +-
 keyboards/preonic/keymaps/ekis_isa/keymap.c               | 6 +++---
 keyboards/preonic/keymaps/kuatsure/keymap.c               | 2 +-
 keyboards/preonic/keymaps/mguterl/keymap.c                | 2 +-
 keyboards/preonic/keymaps/pcurt854/keymap.c               | 6 +++---
 keyboards/preonic/keymaps/seph/keymap.c                   | 2 +-
 keyboards/preonic/keymaps/trigotometry/keymap.c           | 2 +-
 keyboards/primekb/prime_e/keymaps/madhatter/keymap.c      | 2 +-
 .../primekb/prime_o/keymaps/reasonsandreasons/keymap.c    | 2 +-
 keyboards/projectkb/alice/keymaps/madhatter/keymap.c      | 2 +-
 keyboards/protozoa/cassini/keymaps/default/keymap.c       | 2 +-
 keyboards/protozoa/cassini/keymaps/via/keymap.c           | 2 +-
 keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c     | 2 +-
 keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c         | 2 +-
 keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c         | 2 +-
 keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c   | 2 +-
 keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c       | 2 +-
 keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c       | 2 +-
 keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c   | 2 +-
 keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c       | 2 +-
 keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c       | 2 +-
 keyboards/rart/rartlice/keymaps/default/keymap.c          | 2 +-
 keyboards/rart/rartlice/keymaps/via/keymap.c              | 2 +-
 keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c | 2 +-
 keyboards/redox_w/keymaps/dvorak/keymap.c                 | 8 ++++----
 .../redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c    | 2 +-
 keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c   | 2 +-
 keyboards/reviung/reviung53/keymaps/default/keymap.c      | 2 +-
 keyboards/reviung/reviung53/keymaps/via/keymap.c          | 2 +-
 keyboards/reviung/reviung61/keymaps/default/keymap.c      | 2 +-
 keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c  | 2 +-
 keyboards/rgbkb/mun/keymaps/default/keymap.c              | 2 +-
 keyboards/rgbkb/mun/keymaps/via/keymap.c                  | 2 +-
 keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c              | 2 +-
 keyboards/rgbkb/pan/keymaps/default/keymap.c              | 4 ++--
 keyboards/rgbkb/sol/keymaps/default/keymap.c              | 4 ++--
 keyboards/rgbkb/sol3/keymaps/default/keymap.c             | 2 +-
 keyboards/rgbkb/sol3/keymaps/via/keymap.c                 | 2 +-
 keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c         | 2 +-
 keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c      | 2 +-
 keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c           | 2 +-
 .../rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c    | 4 ++--
 keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c         | 2 +-
 keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c         | 2 +-
 keyboards/rgbkb/zygomorph/keymaps/default/keymap.c        | 4 ++--
 keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c   | 4 ++--
 keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c      | 2 +-
 keyboards/rocketboard_16/keycode_lookup.c                 | 2 +-
 keyboards/roseslite/keymaps/default/keymap.c              | 2 +-
 keyboards/roseslite/keymaps/via/keymap.c                  | 2 +-
 keyboards/ryloo_studio/m0110/keymaps/default/keymap.c     | 2 +-
 keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c        | 2 +-
 .../krush60/solder/keymaps/60_ansi_split_bs/keymap.c      | 2 +-
 .../krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c  | 2 +-
 .../krush60/solder/keymaps/60_ansi_split_spc/keymap.c     | 2 +-
 .../solder/keymaps/60_ansi_tsangan_split_bs/keymap.c      | 2 +-
 keyboards/sentraq/s65_x/keymaps/default/keymap.c          | 2 +-
 keyboards/sentraq/s65_x/keymaps/iso/keymap.c              | 2 +-
 keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c         | 6 +++---
 keyboards/sentraq/s65_x/keymaps/nall/keymap.c             | 2 +-
 keyboards/sentraq/s65_x/keymaps/smt/keymap.c              | 6 +++---
 .../rooboard65/keymaps/default/keymap.c                   | 4 ++--
 .../skippys_custom_pcs/rooboard65/keymaps/via/keymap.c    | 4 ++--
 keyboards/slz40/keymaps/default/keymap.c                  | 2 +-
 keyboards/smithrune/iron165r2/keymaps/default/keymap.c    | 2 +-
 keyboards/smithrune/iron165r2/keymaps/via/keymap.c        | 2 +-
 keyboards/spaceholdings/nebula68/keymaps/default/keymap.c | 2 +-
 keyboards/spaceholdings/nebula68/keymaps/via/keymap.c     | 2 +-
 .../spaceholdings/nebula68b/keymaps/default/keymap.c      | 2 +-
 keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c    | 2 +-
 keyboards/spaceman/yun65/keymaps/default/keymap.c         | 2 +-
 keyboards/spaceman/yun65/keymaps/via/keymap.c             | 2 +-
 keyboards/spiderisland/split78/keymaps/default/keymap.c   | 2 +-
 .../switchplate/switchplate910/keymaps/default/keymap.c   | 2 +-
 keyboards/switchplate/switchplate910/keymaps/via/keymap.c | 2 +-
 keyboards/sx60/keymaps/default/keymap.c                   | 2 +-
 keyboards/sx60/keymaps/via/keymap.c                       | 2 +-
 keyboards/tada68/keymaps/abishalom/keymap.c               | 2 +-
 keyboards/tada68/keymaps/bazooka/keymap.c                 | 2 +-
 keyboards/tada68/keymaps/emdarcher/keymap.c               | 2 +-
 keyboards/tada68/keymaps/fakb/keymap.c                    | 2 +-
 keyboards/tada68/keymaps/mattdicarlo/keymap.c             | 2 +-
 keyboards/tada68/keymaps/mattgemmell/keymap.c             | 2 +-
 keyboards/tada68/keymaps/mekberg/keymap.c                 | 2 +-
 keyboards/tada68/keymaps/peippo/keymap.c                  | 2 +-
 keyboards/tada68/keymaps/shalzz/keymap.c                  | 2 +-
 keyboards/tada68/keymaps/tshack/keymap.c                  | 2 +-
 keyboards/tada68/keymaps/unix/keymap.c                    | 2 +-
 keyboards/tada68/keymaps/wamsm_tada/keymap.c              | 2 +-
 keyboards/team0110/p1800fl/keymaps/default/keymap.c       | 2 +-
 keyboards/team0110/p1800fl/keymaps/via/keymap.c           | 2 +-
 keyboards/technika/keymaps/default/keymap.c               | 2 +-
 keyboards/tgr/alice/keymaps/default/keymap.c              | 2 +-
 keyboards/tgr/alice/keymaps/mrkeebs/keymap.c              | 2 +-
 .../bananasplit/keymaps/coloneljesus/keymap.c             | 2 +-
 keyboards/thevankeyboards/jetvan/keymaps/default/keymap.c | 4 ++--
 keyboards/thevankeyboards/jetvan/keymaps/via/keymap.c     | 8 ++++----
 .../minivan/keymaps/jetpacktuxedo/keymap.c                | 2 +-
 .../thevankeyboards/minivan/keymaps/lexworth/keymap.c     | 2 +-
 keyboards/tkc/portico/keymaps/default/keymap.c            | 6 +++---
 keyboards/tkc/portico/keymaps/via/keymap.c                | 6 +++---
 keyboards/tkc/portico68v2/keymaps/default/keymap.c        | 4 ++--
 keyboards/tkc/portico68v2/keymaps/via/keymap.c            | 4 ++--
 keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c        | 2 +-
 keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c           | 2 +-
 keyboards/tkw/stoutgat/v2/keymaps/default/keymap.c        | 2 +-
 keyboards/tmo50/keymaps/ottodokto/keymap.c                | 2 +-
 keyboards/trashman/ketch/keymaps/default/keymap.c         | 2 +-
 keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c   | 2 +-
 keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c    | 2 +-
 keyboards/viendi8l/keymaps/default/keymap.c               | 4 ++--
 keyboards/viendi8l/keymaps/via/keymap.c                   | 4 ++--
 keyboards/w1_at/keymaps/default/keymap.c                  | 2 +-
 keyboards/w1_at/keymaps/via/keymap.c                      | 2 +-
 keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c     | 2 +-
 keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c | 2 +-
 keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c         | 2 +-
 keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c     | 2 +-
 .../westfoxtrot/cypher/rev1/keymaps/default/keymap.c      | 2 +-
 .../westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c  | 2 +-
 .../westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c  | 2 +-
 .../wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c  | 2 +-
 keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c    | 2 +-
 keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c        | 2 +-
 keyboards/wolf/kuku65/keymaps/default/keymap.c            | 2 +-
 keyboards/wolf/kuku65/keymaps/via/keymap.c                | 2 +-
 keyboards/wolf/ryujin/keymaps/default/keymap.c            | 2 +-
 keyboards/wolf/ryujin/keymaps/via/keymap.c                | 2 +-
 keyboards/wolf/ts60/keymaps/default/keymap.c              | 2 +-
 keyboards/wolf/ts60/keymaps/via/keymap.c                  | 2 +-
 keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c       | 2 +-
 keyboards/wsk/gothic50/keymaps/default/keymap.c           | 2 +-
 keyboards/wsk/jerkin/keymaps/default/keymap.c             | 2 +-
 keyboards/xbows/woody/keymaps/default/keymap.c            | 4 ++--
 keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c            | 2 +-
 keyboards/xiudi/xd60/keymaps/petesmom/keymap.c            | 2 +-
 keyboards/xiudi/xd60/keymaps/rooski/keymap.c              | 2 +-
 keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c   | 2 +-
 keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c         | 2 +-
 keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c             | 2 +-
 keyboards/xiudi/xd75/keymaps/bramver/keymap.c             | 2 +-
 keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c        | 2 +-
 keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c          | 2 +-
 keyboards/xiudi/xd75/keymaps/revok75/keymap.c             | 6 +++---
 keyboards/yandrstudio/nz64/keymaps/default/keymap.c       | 2 +-
 keyboards/yandrstudio/nz64/keymaps/via/keymap.c           | 2 +-
 keyboards/yandrstudio/yr6095/keymaps/default/keymap.c     | 2 +-
 keyboards/yandrstudio/yr6095/keymaps/via/keymap.c         | 2 +-
 keyboards/ydkb/just60/keymaps/default/keymap.c            | 2 +-
 keyboards/ydkb/just60/keymaps/thinxer/keymap.c            | 2 +-
 .../yiancardesigns/barleycorn/keymaps/default/keymap.c    | 2 +-
 keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c  | 2 +-
 keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c  | 2 +-
 .../gingham/keymaps/codecoffeecode/keymap.c               | 2 +-
 keyboards/yiancardesigns/gingham/keymaps/default/keymap.c | 2 +-
 keyboards/yiancardesigns/gingham/keymaps/iso/keymap.c     | 2 +-
 keyboards/yiancardesigns/gingham/keymaps/via/keymap.c     | 2 +-
 keyboards/ymdk/bface/keymaps/default/keymap.c             | 2 +-
 keyboards/ymdk/bface/keymaps/emdarcher/keymap.c           | 2 +-
 keyboards/ymdk/bface/keymaps/via/keymap.c                 | 2 +-
 keyboards/ymdk/melody96/keymaps/zunger/keymap.c           | 2 +-
 keyboards/ymdk/yd60mq/keymaps/64key/keymap.c              | 2 +-
 keyboards/ztboards/after/keymaps/default/keymap.c         | 2 +-
 keyboards/ztboards/after/keymaps/ellicose/keymap.c        | 2 +-
 keyboards/ztboards/after/keymaps/phlop/keymap.c           | 2 +-
 keyboards/ztboards/noon/keymaps/default/keymap.c          | 2 +-
 keyboards/ztboards/noon/keymaps/via/keymap.c              | 2 +-
 layouts/community/60_ansi/mechmerlin-ansi/keymap.c        | 2 +-
 layouts/community/60_ansi/readme.md                       | 2 +-
 layouts/community/60_ansi/stanrc85-ansi/keymap.c          | 2 +-
 .../60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c      | 2 +-
 .../60_ansi_split_bs_rshift/mechmerlin-split/keymap.c     | 2 +-
 layouts/community/65_ansi/mechmerlin/keymap.c             | 2 +-
 layouts/community/65_ansi_blocker/mechmerlin/keymap.c     | 2 +-
 layouts/community/65_ansi_blocker/spidey3/keymap.c        | 2 +-
 layouts/community/65_ansi_blocker/stanrc85/keymap.c       | 2 +-
 layouts/community/66_ansi/mechmerlin/keymap.c             | 2 +-
 layouts/community/66_ansi/skully/keymap.c                 | 2 +-
 layouts/community/66_ansi/xyverz/keymap.c                 | 6 +++---
 layouts/community/68_ansi/mechmerlin/keymap.c             | 2 +-
 layouts/community/ortho_4x12/mguterl/keymap.c             | 2 +-
 layouts/community/ortho_5x14/peej/keymap.c                | 2 +-
 .../default/60_ansi_arrow/default_60_ansi_arrow/keymap.c  | 2 +-
 .../default_60_ansi_arrow_split_bs_7u_spc/keymap.c        | 2 +-
 quantum/quantum_keycodes_legacy.h                         | 4 ----
 users/peej/layout.h                                       | 4 ++--
 users/rupa/wrappers.h                                     | 2 +-
 users/tominabox1/wrappers.h                               | 2 +-
 users/xulkal/layouts.h                                    | 2 +-
 953 files changed, 1158 insertions(+), 1162 deletions(-)

diff --git a/keyboards/0xc7/61key/keymaps/default/keymap.c b/keyboards/0xc7/61key/keymaps/default/keymap.c
index c6691a4c37..eb0579d8f8 100644
--- a/keyboards/0xc7/61key/keymaps/default/keymap.c
+++ b/keyboards/0xc7/61key/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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,
diff --git a/keyboards/0xc7/61key/keymaps/via/keymap.c b/keyboards/0xc7/61key/keymaps/via/keymap.c
index 38596c60d2..404a8baffb 100644
--- a/keyboards/0xc7/61key/keymaps/via/keymap.c
+++ b/keyboards/0xc7/61key/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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,
diff --git a/keyboards/0xcb/static/keymaps/bongocat/keymap.c b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
index 034547e07e..4f51a1a744 100644
--- a/keyboards/0xcb/static/keymaps/bongocat/keymap.c
+++ b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
@@ -28,7 +28,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_HOME] = LAYOUT_all(
                                                                                                        KC_MPLY,
-    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC, KC_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_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSPC,
     KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
diff --git a/keyboards/0xcb/static/keymaps/default/keymap.c b/keyboards/0xcb/static/keymaps/default/keymap.c
index 9184a43fb3..36070b6341 100644
--- a/keyboards/0xcb/static/keymaps/default/keymap.c
+++ b/keyboards/0xcb/static/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_HOME] = LAYOUT_all(
                                                                                                        KC_MPLY,
-    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC, KC_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_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSPC,
     KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
diff --git a/keyboards/0xcb/static/keymaps/via/keymap.c b/keyboards/0xcb/static/keymaps/via/keymap.c
index 7ea6b4f0b1..8377675f41 100644
--- a/keyboards/0xcb/static/keymaps/via/keymap.c
+++ b/keyboards/0xcb/static/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_HOME] = LAYOUT_all(
                                                                                                        KC_MPLY,
-    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC, KC_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_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSPC,
     KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
index 0d860f495e..d0c47c526d 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // typing layer to handle basic typing
   [_typing] = LAYOUT_all
   (
-   KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
+   QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
    KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT,
    KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
index 61b1884f4e..f7e54360ea 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 *                             `-------------'             `-------------'
 	 */
 	[_LOWER] = LAYOUT(/* Numbers, Function Row, Media Control, Shifted Symbols, Dvorak Slash Key */
-	  KC_GESC, KC_1,  KC_2,  KC_3,  KC_4,   KC_5,   KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+	  QK_GESC, KC_1,  KC_2,  KC_3,  KC_4,   KC_5,   KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
 	  KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5,  KC_F6,   KC_VOLU, KC_MPLY, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
 	  KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,  KC_VOLD, KC_MNXT, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
 									                KC_TRNS,    					            KC_TRNS
diff --git a/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c
index 97fc2b415e..73d40abd48 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
-    KC_GESC, KC_Q, KC_W, KC_E, KC_R,   KC_T, KC_LCTL, KC_RCTL, KC_Y, KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC,
+    QK_GESC, KC_Q, KC_W, KC_E, KC_R,   KC_T, KC_LCTL, KC_RCTL, 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_LALT, KC_RALT, KC_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_APP,  KC_N, KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
                                KC_SPC,                               KC_SPC
diff --git a/keyboards/40percentclub/luddite/keymaps/default/keymap.c b/keyboards/40percentclub/luddite/keymaps/default/keymap.c
index fa3a83ba87..bf447d8340 100644
--- a/keyboards/40percentclub/luddite/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/luddite/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+    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,
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_60_ansi(
-    KC_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,
+    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,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index 18343067f8..c129396665 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -53,7 +53,7 @@ enum {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_68_ansi( /* Default layer
    ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓ */
-    KC_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  , KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,KC_EQL ,  KC_BSPC  ,  KC_INS ,KC_PGUP, /*
+    QK_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  , KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,KC_EQL ,  KC_BSPC  ,  KC_INS ,KC_PGUP, /*
    ┣━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━━━━━┫ ┣━━━━╋━━━━┫ */
      KC_TAB  , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_LBRC,KC_RBRC, KC_BSLS ,  KC_DEL ,KC_PGDN, /*
    ┣━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━┫ ┗━━━━┻━━━━┛ */
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
index ab9029e7a2..ea659979ea 100644
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
@@ -10,7 +10,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Default layer */
   [_QWERTY] = LAYOUT_68_ansi(
-    KC_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  , KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS, KC_EQL, KC_BSPC,      KC_INS ,KC_PGUP,
+    QK_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  , KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS, KC_EQL, KC_BSPC,      KC_INS ,KC_PGUP,
     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_LBRC,KC_RBRC, KC_BSLS,      KC_DEL ,KC_PGDN,
     X0     , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,    KC_ENTER,
     KC_LSFT     , KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,       KC_RSFT,            KC_UP ,
diff --git a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
index 98ec3860a0..62cb24b11a 100644
--- a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
@@ -3,14 +3,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_all(
-  KC_GESC,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,KC_GRV,
+  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_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_LSPO, 	KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_RSPC, MO(2), 
   KC_LCTL, 	KC_LGUI, KC_NO,  KC_LALT, KC_RALT, MO(2),  KC_SPC, KC_RALT, KC_RGUI, KC_NO,   KC_APP,  KC_RCTL),
 
 [1] = LAYOUT_all(
-  KC_GESC, KC_1,    KC_2,   KC_3,     KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,KC_GRV,
+  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_NO, KC_ENT,        
   KC_LSPO, KC_NO, 	KC_Z,   KC_X,     KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_RSPC, MO(2), 
diff --git a/keyboards/acheron/arctic/keymaps/default/keymap.c b/keyboards/acheron/arctic/keymaps/default/keymap.c
index 0d71ccd037..041b814bb9 100755
--- a/keyboards/acheron/arctic/keymaps/default/keymap.c
+++ b/keyboards/acheron/arctic/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_60_tsangan_hhkb(
-        KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,
+        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, KC_RSFT,        
diff --git a/keyboards/acheron/keebspcb/keymaps/default/keymap.c b/keyboards/acheron/keebspcb/keymaps/default/keymap.c
index 21a1afc1e1..f032534bdf 100755
--- a/keyboards/acheron/keebspcb/keymaps/default/keymap.c
+++ b/keyboards/acheron/keebspcb/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_60_ansi_tsangan(
-        KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
+        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,        
diff --git a/keyboards/acheron/lasgweloth/keymaps/default/keymap.c b/keyboards/acheron/lasgweloth/keymaps/default/keymap.c
index 6f12b21363..061430aa73 100755
--- a/keyboards/acheron/lasgweloth/keymaps/default/keymap.c
+++ b/keyboards/acheron/lasgweloth/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
+        QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
         KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) ,
diff --git a/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c b/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c
index ace964fea8..24ec0c9a36 100755
--- a/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c
+++ b/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
+        QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_TILD,
         KC_LCTL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
         KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) ,
diff --git a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
index a33a9247af..0fd56a1a4a 100644
--- a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
+++ b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_tsangan_hhkb(
 //  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 //  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_NUBS, KC_RBRC,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_NUBS, KC_RBRC,
 //  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
 //  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
   LT(_NAV,KC_TAB), KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,   KC_LBRC, KC_NUHS,   KC_BSPC,
diff --git a/keyboards/akb/eb46/keymaps/default/keymap.c b/keyboards/akb/eb46/keymaps/default/keymap.c
index 4f12733558..83a219aa2e 100644
--- a/keyboards/akb/eb46/keymaps/default/keymap.c
+++ b/keyboards/akb/eb46/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
-  KC_F5,    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+  KC_F5,    QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
   KC_PGUP,  KC_TAB,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,       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_RSFT,
   KC_ESC,   LCTL_T(KC_LBRC), KC_LGUI, KC_LALT,  KC_SPC,  LT(1, KC_SPC), KC_RALT, MO(2), RCTL_T(KC_RBRC) ),
diff --git a/keyboards/akegata_denki/device_one/keymaps/ansi_arrow_keys/keymap.c b/keyboards/akegata_denki/device_one/keymaps/ansi_arrow_keys/keymap.c
index 15eadcbbd9..8b6b050161 100644
--- a/keyboards/akegata_denki/device_one/keymaps/ansi_arrow_keys/keymap.c
+++ b/keyboards/akegata_denki/device_one/keymaps/ansi_arrow_keys/keymap.c
@@ -4,13 +4,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi_arrow(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, 
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, 
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, 
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,  KC_ENT,           
   KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_RSFT,                  KC_UP,   KC_SLSH,
   KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          MO(1), KC_RGUI,  KC_LEFT, KC_DOWN, KC_RIGHT),
 [1] = LAYOUT_60_ansi_arrow(
-  KC_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, 
+  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_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, 
   KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_TRNS, 
   KC_TRNS, 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/akegata_denki/device_one/keymaps/ansi_split_backspace/keymap.c b/keyboards/akegata_denki/device_one/keymaps/ansi_split_backspace/keymap.c
index f602c19b73..2fe730c9e8 100644
--- a/keyboards/akegata_denki/device_one/keymaps/ansi_split_backspace/keymap.c
+++ b/keyboards/akegata_denki/device_one/keymaps/ansi_split_backspace/keymap.c
@@ -4,13 +4,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi_split_bs(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,  KC_EQL, KC_BSLS,  KC_GRAVE, 
+  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_GRAVE, 
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC,  KC_RBRC, KC_BSPC, 
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,  KC_ENT,           
   KC_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_split_bs(
-  KC_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_TRNS, KC_TRNS, 
+  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_TRNS, KC_TRNS, 
   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,          
   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,                   
   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/akegata_denki/device_one/keymaps/default/keymap.c b/keyboards/akegata_denki/device_one/keymaps/default/keymap.c
index 1d0b919cb8..a1f59226c7 100644
--- a/keyboards/akegata_denki/device_one/keymaps/default/keymap.c
+++ b/keyboards/akegata_denki/device_one/keymaps/default/keymap.c
@@ -4,14 +4,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, 
+  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_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, 
+  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_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, 
   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,          
   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/akegata_denki/device_one/keymaps/iso/keymap.c b/keyboards/akegata_denki/device_one/keymaps/iso/keymap.c
index 720f10e13a..cc307ced4e 100644
--- a/keyboards/akegata_denki/device_one/keymaps/iso/keymap.c
+++ b/keyboards/akegata_denki/device_one/keymaps/iso/keymap.c
@@ -4,13 +4,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_iso(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, 
+  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,  MO(1),   KC_RCTL),
 [1] = LAYOUT_60_iso(
-  KC_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,  
+  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_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,          
   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, 
   KC_TRNS, 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/al1/keymaps/via/keymap.c b/keyboards/al1/keymaps/via/keymap.c
index 46c8b0ddce..a5539d526a 100644
--- a/keyboards/al1/keymaps/via/keymap.c
+++ b/keyboards/al1/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        [0] = LAYOUT(
-       KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+       QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,
        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/alpine65/keymaps/default/keymap.c b/keyboards/alpine65/keymaps/default/keymap.c
index fc9b8b8e9c..04c0c80212 100755
--- a/keyboards/alpine65/keymaps/default/keymap.c
+++ b/keyboards/alpine65/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
-	KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, 
+	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_PGDN, 
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT          , KC_HOME, 
         KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END , 
diff --git a/keyboards/alpine65/keymaps/via/keymap.c b/keyboards/alpine65/keymaps/via/keymap.c
index 15e557ded5..eaa348490a 100755
--- a/keyboards/alpine65/keymaps/via/keymap.c
+++ b/keyboards/alpine65/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
-	KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, 
+	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_PGDN, 
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT          , KC_HOME, 
         KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END , 
diff --git a/keyboards/alps64/keymaps/mechmerlin/keymap.c b/keyboards/alps64/keymaps/mechmerlin/keymap.c
index d32d9f61e9..9a360dd84f 100644
--- a/keyboards/alps64/keymaps/mechmerlin/keymap.c
+++ b/keyboards/alps64/keymaps/mechmerlin/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* 0: qwerty */
   [_BL] = LAYOUT_infinity( \
-      KC_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, \
+      QK_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, \
       KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          \
       KC_CTCP, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    \
       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(_AL),                   \
diff --git a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
index 365f4ac0c0..49d243cb82 100755
--- a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Default Layer
   [0] = LAYOUT( \
-      KC_GESC,       KC_Q,    KC_W,   KC_E, KC_R, KC_T,    KC_Y, KC_U,    KC_I,    KC_O,   KC_P,   KC_BSPC,\
+      QK_GESC,       KC_Q,    KC_W,   KC_E, KC_R, KC_T,    KC_Y, KC_U,    KC_I,    KC_O,   KC_P,   KC_BSPC,\
       LT(2, KC_TAB), KC_A,    KC_S,   KC_D, KC_F, KC_G,    KC_H, KC_J,    KC_K,    KC_L,   LT(2, KC_ENT),\
       KC_LSFT,       KC_Z,    KC_X,   KC_C, KC_V, KC_B,    KC_N, KC_M,    KC_COMM, KC_DOT, MT(MOD_RSFT, KC_SLSH),\
       KC_LCTL,       KC_LGUI, KC_LALT,      LT(1, KC_SPC), LT(1, KC_SPC), KC_RALT, MO(3),  KC_RCTL \
diff --git a/keyboards/aos/tkl/keymaps/aholland909/keymap.c b/keyboards/aos/tkl/keymaps/aholland909/keymap.c
index f876915a88..87f12d1763 100644
--- a/keyboards/aos/tkl/keymaps/aholland909/keymap.c
+++ b/keyboards/aos/tkl/keymaps/aholland909/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_tkl_iso_wkl(
-    KC_GESC,       KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUSE,
+    QK_GESC,       KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUSE,
 
     KC_GRV,        KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
     KC_TAB,        KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/arisu/keymaps/default/keymap.c b/keyboards/arisu/keymaps/default/keymap.c
index 57cea80769..157da7eddc 100644
--- a/keyboards/arisu/keymaps/default/keymap.c
+++ b/keyboards/arisu/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
     KC_TAB,  KC_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,                    MO(1),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/arisu/keymaps/stanrc85/keymap.c b/keyboards/arisu/keymaps/stanrc85/keymap.c
index 6874d584dc..417b1663b5 100644
--- a/keyboards/arisu/keymaps/stanrc85/keymap.c
+++ b/keyboards/arisu/keymaps/stanrc85/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_DEFAULT] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
     KC_TAB,  KC_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,                    MO(_FN2_60),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/arisu/keymaps/via/keymap.c b/keyboards/arisu/keymaps/via/keymap.c
index 1cbce827af..9e50d24720 100644
--- a/keyboards/arisu/keymaps/via/keymap.c
+++ b/keyboards/arisu/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
     KC_TAB,  KC_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,                    MO(1),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/at_at/660m/keymaps/default/keymap.c b/keyboards/at_at/660m/keymaps/default/keymap.c
index fe788a286f..da1b30eb61 100644
--- a/keyboards/at_at/660m/keymaps/default/keymap.c
+++ b/keyboards/at_at/660m/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                   KC_INS,
+    QK_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                   KC_INS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,                   KC_DEL,
     KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT,          KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT,          KC_UP,
diff --git a/keyboards/atlas_65/keymaps/default/keymap.c b/keyboards/atlas_65/keymaps/default/keymap.c
index 807ce3ccd8..f36a71c518 100644
--- a/keyboards/atlas_65/keymaps/default/keymap.c
+++ b/keyboards/atlas_65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_PGUP,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_LNUM,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/atlas_65/keymaps/via/keymap.c b/keyboards/atlas_65/keymaps/via/keymap.c
index 6c0f9ec0ef..ec4b042329 100644
--- a/keyboards/atlas_65/keymaps/via/keymap.c
+++ b/keyboards/atlas_65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_PGUP,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_LNUM,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/aurora65/keymaps/default/keymap.c b/keyboards/aurora65/keymaps/default/keymap.c
index 082dbb3a6a..f671ce5939 100644
--- a/keyboards/aurora65/keymaps/default/keymap.c
+++ b/keyboards/aurora65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi_blocker( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/aurora65/keymaps/via/keymap.c b/keyboards/aurora65/keymaps/via/keymap.c
index 7e87c8bfac..c084842549 100644
--- a/keyboards/aurora65/keymaps/via/keymap.c
+++ b/keyboards/aurora65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi_blocker( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/baguette/keymaps/default/keymap.c b/keyboards/baguette/keymaps/default/keymap.c
index f5df8ee478..5f168c3d5b 100644
--- a/keyboards/baguette/keymaps/default/keymap.c
+++ b/keyboards/baguette/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,  KC_TRNS,  KC_INS,
+    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_TRNS,  KC_INS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,            KC_DEL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
     KC_LSFT,  KC_TRNS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_TRNS, KC_RSFT,  KC_UP,
diff --git a/keyboards/baguette/keymaps/iso/keymap.c b/keyboards/baguette/keymaps/iso/keymap.c
index f3445e8b1a..b372f71111 100644
--- a/keyboards/baguette/keymaps/iso/keymap.c
+++ b/keyboards/baguette/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,  KC_TRNS,  KC_INS,
+    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_TRNS,  KC_INS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                     KC_DEL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_QUOT, KC_ENT,
     KC_LSFT,  KC_TRNS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_TRNS, KC_RSFT,  KC_UP,
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 9120ed525c..6629900ceb 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT_wrapper(
                    _________________NUMBER_L__________________,
-       KC_GESC, KC_TAB, _________________QWERTY_L1_________________,
+       QK_GESC, KC_TAB, _________________QWERTY_L1_________________,
           KC_CAPS, _________________QWERTY_L2_________________, KC_H,
        KC_LSFT, _________________QWERTY_L3_________________, KC_N,
      KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_COLEMAK] = LAYOUT_wrapper(
                    _________________NUMBER_L__________________,
-       KC_GESC, KC_TAB, _________________COLEMAK_L1________________,
+       QK_GESC, KC_TAB, _________________COLEMAK_L1________________,
           KC_LCTL, _________________COLEMAK_L2________________, KC_ENT,
        KC_LSFT, _________________COLEMAK_L3________________, KC_M,
      KC_CAPS, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
diff --git a/keyboards/bandominedoni/keymaps/lednotg/keymap.c b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
index 784d14e645..b98d9a18b8 100644
--- a/keyboards/bandominedoni/keymaps/lednotg/keymap.c
+++ b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT_wrapper(
                    _________________NUMBER_L__________________,
-       KC_GESC, KC_TAB, _________________QWERTY_L1_________________,
+       QK_GESC, KC_TAB, _________________QWERTY_L1_________________,
           KC_CAPS, _________________QWERTY_L2_________________, KC_H,
        KC_LSFT, _________________QWERTY_L3_________________, KC_N,
      KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_COLEMAK] = LAYOUT_wrapper(
                    _________________NUMBER_L__________________,
-       KC_GESC, KC_TAB, _________________COLEMAK_L1________________,
+       QK_GESC, KC_TAB, _________________COLEMAK_L1________________,
           KC_LCTL, _________________COLEMAK_L2________________, KC_ENT,
        KC_LSFT, _________________COLEMAK_L3________________, KC_M,
      KC_CAPS, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
diff --git a/keyboards/barleycorn_smd/keymaps/default/keymap.c b/keyboards/barleycorn_smd/keymaps/default/keymap.c
index a998994165..9775a961ad 100644
--- a/keyboards/barleycorn_smd/keymaps/default/keymap.c
+++ b/keyboards/barleycorn_smd/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_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_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/barleycorn_smd/keymaps/iso/keymap.c b/keyboards/barleycorn_smd/keymaps/iso/keymap.c
index 29845c752a..69460023fb 100644
--- a/keyboards/barleycorn_smd/keymaps/iso/keymap.c
+++ b/keyboards/barleycorn_smd/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_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_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,                                     KC_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_BSPC,
diff --git a/keyboards/barleycorn_smd/keymaps/via/keymap.c b/keyboards/barleycorn_smd/keymaps/via/keymap.c
index 21843996b1..5f406174a9 100644
--- a/keyboards/barleycorn_smd/keymaps/via/keymap.c
+++ b/keyboards/barleycorn_smd/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_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_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/basketweave/keymaps/default/keymap.c b/keyboards/basketweave/keymaps/default/keymap.c
index 83ad046ae8..379c9f7985 100644
--- a/keyboards/basketweave/keymaps/default/keymap.c
+++ b/keyboards/basketweave/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_default(  /* base */
-      KC_GESC, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+      QK_GESC, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_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_MUTE,
       KC_DEL,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
                KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/basketweave/keymaps/via/keymap.c b/keyboards/basketweave/keymaps/via/keymap.c
index 7d85863d01..dd89371aea 100644
--- a/keyboards/basketweave/keymaps/via/keymap.c
+++ b/keyboards/basketweave/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_default(  /* base */
-      KC_GESC, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+      QK_GESC, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_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_MUTE,
       KC_DEL,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
                KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/bfake/keymaps/default/keymap.c b/keyboards/bfake/keymaps/default/keymap.c
index 493898c3ca..529d71eebc 100644
--- a/keyboards/bfake/keymaps/default/keymap.c
+++ b/keyboards/bfake/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-      KC_GESC, KC_1,  KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
+      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,
       MO(1),   KC_A,  KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
       KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/bfake/keymaps/mechmerlin/keymap.c b/keyboards/bfake/keymaps/mechmerlin/keymap.c
index ecd3350876..fec728d87e 100644
--- a/keyboards/bfake/keymaps/mechmerlin/keymap.c
+++ b/keyboards/bfake/keymaps/mechmerlin/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-      KC_GESC, KC_1,    KC_2,    KC_3,     KC_4,  KC_5,    KC_6,    KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+      QK_GESC, KC_1,    KC_2,    KC_3,     KC_4,  KC_5,    KC_6,    KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
       KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,  KC_T,    KC_Y,    KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
       KC_LCTL, KC_A,    KC_S,    KC_D,     KC_F,  KC_G,    KC_H,    KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
       KC_LSFT, KC_NO,   KC_Z,    KC_X,     KC_C,  KC_V,    KC_B,    KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TG(2),
diff --git a/keyboards/blackplum/keymaps/default/keymap.c b/keyboards/blackplum/keymaps/default/keymap.c
index a38cf80979..c118c18980 100644
--- a/keyboards/blackplum/keymaps/default/keymap.c
+++ b/keyboards/blackplum/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_68_ansi(
-    KC_GESC, 	KC_1,    	KC_2,    	KC_3,    KC_4,    	KC_5,    KC_6,    KC_7,    	KC_8,    	KC_9,    	KC_0,    	KC_MINS, 	KC_EQL,  	KC_BSPC, 	KC_INS,		KC_PGUP,
+    QK_GESC, 	KC_1,    	KC_2,    	KC_3,    KC_4,    	KC_5,    KC_6,    KC_7,    	KC_8,    	KC_9,    	KC_0,    	KC_MINS, 	KC_EQL,  	KC_BSPC, 	KC_INS,		KC_PGUP,
     KC_TAB,  	KC_Q,    	KC_W,    	KC_E,    KC_R,    	KC_T,    KC_Y,    KC_U,    	KC_I,    	KC_O,    	KC_P,    	KC_LBRC, 	KC_RBRC, 	KC_BSLS, 	KC_DEL,		KC_PGDN,
     KC_CAPS, 	KC_A,    	KC_S,    	KC_D,    KC_F,    	KC_G,    KC_H,    KC_J,    	KC_K,    	KC_L,    	KC_SCLN, 	KC_QUOT, 				KC_ENT,
     KC_LSFT, 	KC_Z,    	KC_X,    	KC_C,    KC_V,    	KC_B,    KC_N,    KC_M,    	KC_COMM, 				KC_DOT,  	KC_SLSH, 				KC_RSFT,	KC_UP,
diff --git a/keyboards/blackplum/keymaps/via/keymap.c b/keyboards/blackplum/keymaps/via/keymap.c
index 241323ef1d..e542892b37 100644
--- a/keyboards/blackplum/keymaps/via/keymap.c
+++ b/keyboards/blackplum/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_68_ansi(
-    KC_GESC, 	KC_1,    	KC_2,    	KC_3,    KC_4,    	KC_5,    KC_6,    KC_7,    	KC_8,    	KC_9,    	KC_0,    	KC_MINS, 	KC_EQL,  	KC_BSPC, 	KC_INS,		KC_PGUP,
+    QK_GESC, 	KC_1,    	KC_2,    	KC_3,    KC_4,    	KC_5,    KC_6,    KC_7,    	KC_8,    	KC_9,    	KC_0,    	KC_MINS, 	KC_EQL,  	KC_BSPC, 	KC_INS,		KC_PGUP,
     KC_TAB,  	KC_Q,    	KC_W,    	KC_E,    KC_R,    	KC_T,    KC_Y,    KC_U,    	KC_I,    	KC_O,    	KC_P,    	KC_LBRC, 	KC_RBRC, 	KC_BSLS, 	KC_DEL,		KC_PGDN,
     KC_CAPS, 	KC_A,    	KC_S,    	KC_D,    KC_F,    	KC_G,    KC_H,    KC_J,    	KC_K,    	KC_L,    	KC_SCLN, 	KC_QUOT, 				KC_ENT,
     KC_LSFT, 	KC_Z,    	KC_X,    	KC_C,    KC_V,    	KC_B,    KC_N,    KC_M,    	KC_COMM, 				KC_DOT,  	KC_SLSH, 				KC_RSFT,	KC_UP,
diff --git a/keyboards/boardwalk/keymaps/nchristus/keymap.c b/keyboards/boardwalk/keymaps/nchristus/keymap.c
index 3f05e2bb1d..904d8f3f4b 100644
--- a/keyboards/boardwalk/keymaps/nchristus/keymap.c
+++ b/keyboards/boardwalk/keymaps/nchristus/keymap.c
@@ -26,7 +26,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _QWE: Base Layer (Default Layer) */
   [_QW] = LAYOUT_ortho_hhkb(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
+  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, \
   CTRLESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______, _______, KC_H,   KC_J,    KC_K,    KC_L,    KC_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, \
diff --git a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
index 2c85b0985b..d0be810451 100644
--- a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
+++ b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
 [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC, 
+    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, 
diff --git a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
index 6c3f82ef3b..143fcc780f 100644
--- a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
+++ b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
 
 [0] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC, 
+    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, 
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
index 3693dba220..63764a6891 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
@@ -44,7 +44,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_all( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+  QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_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_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/canary/canary60rgb/keymaps/default/keymap.c b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
index fb4205fb4c..094595130f 100644
--- a/keyboards/canary/canary60rgb/keymaps/default/keymap.c
+++ b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         KC_CAPS,        KC_A,    KC_S,            KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,            KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_P0,   KC_PDOT,                            KC_PENT,                   KC_P0,   KC_PDOT, _______, _______, _______
     ),
     [4] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
diff --git a/keyboards/canary/canary60rgb/keymaps/via/keymap.c b/keyboards/canary/canary60rgb/keymaps/via/keymap.c
index ab58867ca2..91de0c7348 100644
--- a/keyboards/canary/canary60rgb/keymaps/via/keymap.c
+++ b/keyboards/canary/canary60rgb/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         KC_CAPS,        KC_A,    KC_S,            KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,            KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_P0,   KC_PDOT,                            KC_PENT,                   KC_P0,   KC_PDOT, _______, _______, _______
     ),
     [4] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
diff --git a/keyboards/cannonkeys/adelie/keymaps/default/keymap.c b/keyboards/cannonkeys/adelie/keymaps/default/keymap.c
index aa83d2901e..4e771dca7b 100644
--- a/keyboards/cannonkeys/adelie/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/adelie/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC, KC_PGUP,
+    QK_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC, KC_PGUP,
     KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
     KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP, TG(_FN3),
     KC_LCTL,  KC_LGUI, KC_LALT, MO(_FN1), KC_SPC, KC_RALT, KC_RGUI, MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/cannonkeys/adelie/keymaps/via/keymap.c b/keyboards/cannonkeys/adelie/keymaps/via/keymap.c
index aa83d2901e..4e771dca7b 100644
--- a/keyboards/cannonkeys/adelie/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/adelie/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC, KC_PGUP,
+    QK_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC, KC_PGUP,
     KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
     KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP, TG(_FN3),
     KC_LCTL,  KC_LGUI, KC_LALT, MO(_FN1), KC_SPC, KC_RALT, KC_RGUI, MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/cannonkeys/aella/keymaps/default/keymap.c b/keyboards/cannonkeys/aella/keymaps/default/keymap.c
index 286c62a8ac..fde4ffc01f 100644
--- a/keyboards/cannonkeys/aella/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/aella/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN1] = LAYOUT_all(
         KC_ESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-		KC_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_TRNS, KC_TRNS,
+		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_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, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/aella/keymaps/via/keymap.c b/keyboards/cannonkeys/aella/keymaps/via/keymap.c
index bb3830d0f8..5aa30a12c7 100644
--- a/keyboards/cannonkeys/aella/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/aella/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN1] = LAYOUT_all(
         KC_ESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-		KC_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_TRNS, KC_TRNS,
+		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_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, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/an_c/keymaps/default/keymap.c b/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
index 56e4b32fd3..e82bf0bdee 100644
--- a/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+    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,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_60_ansi(
-    KC_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,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
diff --git a/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
index 2e18c26383..f42eab53ac 100644
--- a/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
+++ b/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_tsangan_hhkb(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                 KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/an_c/keymaps/via/keymap.c b/keyboards/cannonkeys/an_c/keymaps/via/keymap.c
index 52d3478ecb..3e518d71ce 100644
--- a/keyboards/cannonkeys/an_c/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/an_c/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                 KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c b/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c
index bd1a709584..28a512fc9f 100644
--- a/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+		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_NUBS, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_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_TRNS,
+		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_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,
 		BL_BRTG, 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,
 		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c b/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c
index bd1a709584..28a512fc9f 100644
--- a/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+		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_NUBS, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_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_TRNS,
+		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_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,
 		BL_BRTG, 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,
 		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/db60/keymaps/default/keymap.c b/keyboards/cannonkeys/db60/keymaps/default/keymap.c
index e79e2b1ee3..60288c6443 100644
--- a/keyboards/cannonkeys/db60/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+    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,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_60_ansi(
-    KC_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,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
diff --git a/keyboards/cannonkeys/db60/keymaps/iso/keymap.c b/keyboards/cannonkeys/db60/keymaps/iso/keymap.c
index 65a1b8c9a5..9a0fd2ea98 100644
--- a/keyboards/cannonkeys/db60/keymaps/iso/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/iso/keymap.c
@@ -28,7 +28,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_iso(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+    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,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_60_iso(
-    KC_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,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
     BL_INC,  _______, BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
diff --git a/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
index d9a4661702..affb0bb132 100644
--- a/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_tsangan_hhkb(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                 KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/db60/keymaps/via/keymap.c b/keyboards/cannonkeys/db60/keymaps/via/keymap.c
index 64b5357ae8..43390564a5 100644
--- a/keyboards/cannonkeys/db60/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_BSPC,
+    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_NUHS, KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c
index 0967054438..ae922b638b 100644
--- a/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
+		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
 		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c
index b5b7564543..cc674a0f1f 100644
--- a/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
+		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/instant60/keymaps/default/keymap.c b/keyboards/cannonkeys/instant60/keymaps/default/keymap.c
index bd3e7eebe1..d0a9e8af03 100644
--- a/keyboards/cannonkeys/instant60/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+    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,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_60_ansi(
-    KC_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,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
diff --git a/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
index 8294141327..b78d591fe3 100644
--- a/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
@@ -31,7 +31,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_tsangan_hhkb(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL, \
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL, \
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC, \
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                 KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,  \
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT, MO(_FN1),\
diff --git a/keyboards/cannonkeys/instant60/keymaps/via/keymap.c b/keyboards/cannonkeys/instant60/keymaps/via/keymap.c
index 43decee798..c29bc5a3ee 100644
--- a/keyboards/cannonkeys/instant60/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSPC,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                 KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c b/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
index 52d3478ecb..3e518d71ce 100644
--- a/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                 KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/instant65/keymaps/default/keymap.c b/keyboards/cannonkeys/instant65/keymaps/default/keymap.c
index 0967054438..ae922b638b 100644
--- a/keyboards/cannonkeys/instant65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/instant65/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
+		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
 		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/instant65/keymaps/via/keymap.c b/keyboards/cannonkeys/instant65/keymaps/via/keymap.c
index b5b7564543..cc674a0f1f 100644
--- a/keyboards/cannonkeys/instant65/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/instant65/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
+		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/iron165/keymaps/default/keymap.c b/keyboards/cannonkeys/iron165/keymaps/default/keymap.c
index 8609bed47f..3bcf0cd5d9 100644
--- a/keyboards/cannonkeys/iron165/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/iron165/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS,
         KC_TAB, KC_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_NUBS, KC_ENT, KC_PGUP,
         KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_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_TRNS,
+		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_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,
 		BL_BRTG, 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,
 		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/iron165/keymaps/via/keymap.c b/keyboards/cannonkeys/iron165/keymaps/via/keymap.c
index 610b442cdc..b26d9e050f 100644
--- a/keyboards/cannonkeys/iron165/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/iron165/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BASE] = LAYOUT_default(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,    KC_7,    KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        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_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_NUBS, KC_ENT,  KC_PGUP,
         KC_LSFT, KC_NUHS, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_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_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/moment/keymaps/default/keymap.c b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
index 307776a9d1..0341152011 100644
--- a/keyboards/cannonkeys/moment/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_BSLS, KC_ENT,
     KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/moment/keymaps/via/keymap.c b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
index 307776a9d1..0341152011 100644
--- a/keyboards/cannonkeys/moment/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_BSLS, KC_ENT,
     KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
index d9878144f4..7cf77c4f90 100644
--- a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
index ccb2fcf418..6a0943e9bb 100644
--- a/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c b/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
index fcd3c8f056..c8feb56a09 100644
--- a/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN1] = LAYOUT_all(
         KC_ESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-		KC_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_TRNS, RGB_TOG,
+		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
 		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c b/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c
index 05d4bad449..920d2893af 100644
--- a/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN1] = LAYOUT_all(
         KC_ESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,
-		KC_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_TRNS, RGB_TOG,
+		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/practice60/keymaps/default/keymap.c b/keyboards/cannonkeys/practice60/keymaps/default/keymap.c
index f0f6206675..e4943de3f8 100644
--- a/keyboards/cannonkeys/practice60/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/practice60/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+    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,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_60_ansi(
-    KC_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,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
diff --git a/keyboards/cannonkeys/practice65/keymaps/default/keymap.c b/keyboards/cannonkeys/practice65/keymaps/default/keymap.c
index ce528c5ce2..15a19c6b68 100644
--- a/keyboards/cannonkeys/practice65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/practice65/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_default(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL, KC_INS,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL, KC_INS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, KC_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,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_default(
-    KC_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, _______, _______,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
diff --git a/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c b/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
index 8125b76f66..093895bb99 100644
--- a/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_PGUP, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+		KC_PGUP, 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_PGDN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_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_END, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_RSFT,
diff --git a/keyboards/cannonkeys/sagittarius/keymaps/via/keymap.c b/keyboards/cannonkeys/sagittarius/keymaps/via/keymap.c
index 37bbe22991..a5a0f52149 100644
--- a/keyboards/cannonkeys/sagittarius/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/sagittarius/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_BASE] = LAYOUT_default(
-		KC_PGUP, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+		KC_PGUP, 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_PGDN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_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_END, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_RSFT,
diff --git a/keyboards/cannonkeys/savage65/keymaps/default/keymap.c b/keyboards/cannonkeys/savage65/keymaps/default/keymap.c
index ea490d94af..1c95b25a47 100644
--- a/keyboards/cannonkeys/savage65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/savage65/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_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_NUBS, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_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_TRNS, RGB_TOG,
+		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
 		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/savage65/keymaps/via/keymap.c b/keyboards/cannonkeys/savage65/keymaps/via/keymap.c
index 30d5d82d43..245187bfc2 100644
--- a/keyboards/cannonkeys/savage65/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/savage65/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_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_NUBS, KC_ENT, KC_PGUP,
 		KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_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_TRNS, RGB_TOG,
+		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
 		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c b/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c
index 476ef88463..64071a0752 100644
--- a/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_ESC, KC_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_TRNS, RGB_TOG,
+		KC_ESC, 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_TRNS, RGB_TOG,
 		KC_F5,  KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		KC_F6,  BL_BRTG, 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_F7,  BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c b/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c
index 33d20d1cda..8333746088 100644
--- a/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN1] = LAYOUT_default(
-		KC_ESC, KC_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_TRNS, RGB_TOG,
+		KC_ESC, 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_TRNS, RGB_TOG,
 		KC_F5,  KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		KC_F6,  BL_BRTG, 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_F7,  BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/vector/keymaps/default/keymap.c b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
index b5afbd2e4b..60c2115a22 100644
--- a/keyboards/cannonkeys/vector/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_BSPC,
+    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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/vector/keymaps/via/keymap.c b/keyboards/cannonkeys/vector/keymaps/via/keymap.c
index 877e364f3a..53f1f83fd7 100644
--- a/keyboards/cannonkeys/vector/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/vector/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_BSPC,
+    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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
diff --git a/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c b/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c
index 1fb5c37b6d..e561f305c0 100644
--- a/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+		QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
 		KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
 		KC_LCTL, KC_LGUI, KC_LALT, LT(_FN1, KC_SPC), KC_SPC, LT(_FN2, KC_SPC), KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c b/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c
index e1b17e1ec5..e71fb7d022 100644
--- a/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+		QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
 		KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
 		KC_LCTL, KC_LGUI, KC_LALT, LT(_FN1, KC_SPC), KC_SPC, LT(_FN2, KC_SPC), KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/capsunlocked/cu65/keymaps/default/keymap.c b/keyboards/capsunlocked/cu65/keymaps/default/keymap.c
index 2bcfdccfbe..0de6615f3b 100644
--- a/keyboards/capsunlocked/cu65/keymaps/default/keymap.c
+++ b/keyboards/capsunlocked/cu65/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│LGUI│LAlt│         Space          │RAlt│ L1 │ │ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c b/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c
index 7d677a6439..31f4fbc4f4 100644
--- a/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c
+++ b/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│LGUI│LAlt│         Space          │RAlt│ L1 │ │ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c b/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c
index 6049fa7433..5ca55e2efb 100644
--- a/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c
+++ b/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│LGUI│LAlt│         Space          │RAlt│ L1 │ │ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_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,
diff --git a/keyboards/carbo65/keymaps/default/keymap.c b/keyboards/carbo65/keymaps/default/keymap.c
index d8a7cb5504..dcebf51bd9 100644
--- a/keyboards/carbo65/keymaps/default/keymap.c
+++ b/keyboards/carbo65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/carbo65/keymaps/via/keymap.c b/keyboards/carbo65/keymaps/via/keymap.c
index 74005be77b..5e4c012b3b 100644
--- a/keyboards/carbo65/keymaps/via/keymap.c
+++ b/keyboards/carbo65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/charue/charon/keymaps/debug/keymap.c b/keyboards/charue/charon/keymaps/debug/keymap.c
index 9d1d2371c1..e8e4ca13b7 100644
--- a/keyboards/charue/charon/keymaps/debug/keymap.c
+++ b/keyboards/charue/charon/keymaps/debug/keymap.c
@@ -30,7 +30,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-      KC_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
+      QK_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
diff --git a/keyboards/charue/charon/keymaps/default/keymap.c b/keyboards/charue/charon/keymaps/default/keymap.c
index 26203f089b..852888c44d 100644
--- a/keyboards/charue/charon/keymaps/default/keymap.c
+++ b/keyboards/charue/charon/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-      KC_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
+      QK_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,
         KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
diff --git a/keyboards/charue/charon/keymaps/via/keymap.c b/keyboards/charue/charon/keymaps/via/keymap.c
index bbb72cc736..78b1542ac1 100644
--- a/keyboards/charue/charon/keymaps/via/keymap.c
+++ b/keyboards/charue/charon/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_all(
-      KC_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
+      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_VOLU,
          KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,            KC_VOLD,
   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,             KC_UP,   KC_MUTE,
diff --git a/keyboards/charue/sunsetter/keymaps/default/keymap.c b/keyboards/charue/sunsetter/keymaps/default/keymap.c
index 01cf15282f..6a73249e28 100755
--- a/keyboards/charue/sunsetter/keymaps/default/keymap.c
+++ b/keyboards/charue/sunsetter/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_1065_ansi(
-        KC_F1,   KC_F2,     KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
+        KC_F1,   KC_F2,     QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
         KC_F3,   KC_F4,     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_VOLD,
         KC_F5,   KC_F6,     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_MUTE,
         KC_F7,   KC_F8,     KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_MNXT,
diff --git a/keyboards/charue/sunsetter/keymaps/default_all/keymap.c b/keyboards/charue/sunsetter/keymaps/default_all/keymap.c
index 99ac800734..f6681faf22 100644
--- a/keyboards/charue/sunsetter/keymaps/default_all/keymap.c
+++ b/keyboards/charue/sunsetter/keymaps/default_all/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-        KC_F1,   KC_F2,     KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_VOLU,
+        KC_F1,   KC_F2,     QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_VOLU,
         KC_F3,   KC_F4,     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_VOLD,
         KC_F5,   KC_F6,     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_ENT , KC_MUTE,
         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,          KC_UP  , KC_MNXT,
diff --git a/keyboards/charue/sunsetter/keymaps/default_iso/keymap.c b/keyboards/charue/sunsetter/keymaps/default_iso/keymap.c
index 84b0a99e35..b9f074032d 100644
--- a/keyboards/charue/sunsetter/keymaps/default_iso/keymap.c
+++ b/keyboards/charue/sunsetter/keymaps/default_iso/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_1065_iso(
-        KC_F1,   KC_F2,     KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
+        KC_F1,   KC_F2,     QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
         KC_F3,   KC_F4,     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC,          KC_VOLD,
         KC_F5,   KC_F6,     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_MUTE,
         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, KC_UP  , KC_MNXT,
diff --git a/keyboards/charue/sunsetter/keymaps/via/keymap.c b/keyboards/charue/sunsetter/keymaps/via/keymap.c
index ceba72e92f..c8729bfd2b 100644
--- a/keyboards/charue/sunsetter/keymaps/via/keymap.c
+++ b/keyboards/charue/sunsetter/keymaps/via/keymap.c
@@ -18,25 +18,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_1065_ansi(
-        KC_F1,   KC_F2,     KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
+        KC_F1,   KC_F2,     QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
         KC_F3,   KC_F4,     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_VOLD,
         KC_F5,   KC_F6,     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_MUTE,
         KC_F7,   KC_F8,     KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_MNXT,
         KC_F9,   KC_F10,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
    [1] = LAYOUT_1065_ansi(
-        KC_F1,   KC_F2,     KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
+        KC_F1,   KC_F2,     QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
         KC_F3,   KC_F4,     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_VOLD,
         KC_F5,   KC_F6,     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_MUTE,
         KC_F7,   KC_F8,     KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_MNXT,
         KC_F9,   KC_F10,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
    [2] = LAYOUT_1065_ansi(
-        KC_F1,   KC_F2,     KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
+        KC_F1,   KC_F2,     QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
         KC_F3,   KC_F4,     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_VOLD,
         KC_F5,   KC_F6,     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_MUTE,
         KC_F7,   KC_F8,     KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_MNXT,
         KC_F9,   KC_F10,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
    [3] = LAYOUT_1065_ansi(
-        KC_F1,   KC_F2,     KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
+        KC_F1,   KC_F2,     QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_VOLU,
         KC_F3,   KC_F4,     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_VOLD,
         KC_F5,   KC_F6,     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_MUTE,
         KC_F7,   KC_F8,     KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_MNXT,
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
index 3be1681378..e1e0c963f5 100644
--- a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
+++ b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-      KC_F1, KC_F2,   KC_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
+      KC_F1, KC_F2,   QK_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
       KC_F3, KC_F4,     KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F5, KC_F6,      KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F7, KC_F8,   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
diff --git a/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
index 031b6f9fcb..dbd330632d 100644
--- a/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
+++ b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-      KC_F1, KC_F2,   KC_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
+      KC_F1, KC_F2,   QK_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
       KC_F3, KC_F4,     KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F5, KC_F6,      KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F7, KC_F8,   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
diff --git a/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
index 0081481001..4671f53413 100644
--- a/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
+++ b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-      KC_F1, KC_F2,   KC_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
+      KC_F1, KC_F2,   QK_GESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_VOLU,
       KC_F3, KC_F4,     KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,    KC_VOLD,
       KC_F5, KC_F6,      KC_CAPS,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT,       KC_ENT,          KC_MUTE,
       KC_F7, KC_F8,   KC_LSFT, KC_BSLS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,       KC_UP,   KC_MNXT,
diff --git a/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c b/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c
index 7974239005..9fb36cc8bc 100644
--- a/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-------------------------------------------------------------'
   */
     [0] = LAYOUT_all(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, TT(1),
diff --git a/keyboards/checkerboards/g_idb60/keymaps/via/keymap.c b/keyboards/checkerboards/g_idb60/keymaps/via/keymap.c
index 5b1151f17e..44711774fe 100644
--- a/keyboards/checkerboards/g_idb60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/g_idb60/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-------------------------------------------------------------'
   */
     [0] = LAYOUT_all(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, TT(1),
diff --git a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
index d7394e8bf6..b81a95c671 100644
--- a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-------------------------------------------------------------'
   */
     [0] = LAYOUT_60_tsangan_hhkb(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, TT(1),
diff --git a/keyboards/checkerboards/nop60/keymaps/default/keymap.c b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
index 07d97de606..0b3bdee669 100644
--- a/keyboards/checkerboards/nop60/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-------------------------------------------------------------'
     */
     [0] = LAYOUT_60_tsangan_hhkb_split_space(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, KC_SPC,
diff --git a/keyboards/checkerboards/nop60/keymaps/via/keymap.c b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
index 6686fa06a5..d8cba3f2ab 100644
--- a/keyboards/checkerboards/nop60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                               └───┴───┴───┘
      */
     [_BASE] = LAYOUT_60_tsangan_hhkb_split_space(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, KC_SPC,
diff --git a/keyboards/checkerboards/snop60/keymaps/7u/keymap.c b/keyboards/checkerboards/snop60/keymaps/7u/keymap.c
index ced523a4b0..82a332887f 100644
--- a/keyboards/checkerboards/snop60/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/snop60/keymaps/7u/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-------------------------------------------------------------'
     */
     [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TT(1),
diff --git a/keyboards/checkerboards/snop60/keymaps/default/keymap.c b/keyboards/checkerboards/snop60/keymaps/default/keymap.c
index 7ea2db0d46..6fdcad7989 100644
--- a/keyboards/checkerboards/snop60/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/snop60/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-------------------------------------------------------------'
     */
     [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift_space(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_SPC,
diff --git a/keyboards/checkerboards/snop60/keymaps/via/keymap.c b/keyboards/checkerboards/snop60/keymaps/via/keymap.c
index 6d5aa433a3..9f3d7f2925 100644
--- a/keyboards/checkerboards/snop60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/snop60/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * └─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
     */
     [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift_space(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_SPC,
diff --git a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
index e2084a5129..b330ece369 100644
--- a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
@@ -28,7 +28,7 @@ enum keyboard_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL] = LAYOUT_default(
-    KC_NO,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+    KC_NO,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
     KC_NO,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_NO,   KC_CTES, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
              KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL),
diff --git a/keyboards/cheshire/curiosity/keymaps/default/keymap.c b/keyboards/cheshire/curiosity/keymaps/default/keymap.c
index 4e03c8a1d8..f80b85483e 100644
--- a/keyboards/cheshire/curiosity/keymaps/default/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ enum my_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_default(
-    KC_GESC, KC_GRV,  KC_1,  KC_2,    KC_3,   KC_4,    KC_5,  KC_6,  KC_7,   KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+    QK_GESC, KC_GRV,  KC_1,  KC_2,    KC_3,   KC_4,    KC_5,  KC_6,  KC_7,   KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
     KC_PGUP, KC_TAB,  KC_Q,  KC_W,    KC_E,   KC_R,    KC_T,         KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_PGDN, CAP_CTL, KC_A,  KC_S,    KC_D,   KC_F,    KC_G,         KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
              KC_LSFT, KC_Z,  KC_X,    KC_C,   KC_V,    KC_B,         KC_B,   KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
diff --git a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
index ddfbadd72f..8af0218869 100644
--- a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
@@ -29,7 +29,7 @@ enum my_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_default(
-    KC_GESC, KC_GRV,  KC_1,  KC_2,    KC_3,   KC_4,    KC_5,  KC_6,  KC_7,   KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+    QK_GESC, KC_GRV,  KC_1,  KC_2,    KC_3,   KC_4,    KC_5,  KC_6,  KC_7,   KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
     KC_PGUP, KC_TAB,  KC_Q,  KC_W,    KC_E,   KC_R,    KC_T,         KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_PGDN, CAP_CTL, KC_A,  KC_S,    KC_D,   KC_F,    KC_G,         KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
              KC_LSFT, KC_Z,  KC_X,    KC_C,   KC_V,    KC_B,         KC_B,   KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
diff --git a/keyboards/chlx/merro60/keymaps/ansi/keymap.c b/keyboards/chlx/merro60/keymaps/ansi/keymap.c
index f9445559d1..58b227b9e4 100644
--- a/keyboards/chlx/merro60/keymaps/ansi/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/ansi/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_60_ansi_split_bs_rshift(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+  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, KC_RSFT,
diff --git a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
index e88e2d9b33..29b1a79e5e 100644
--- a/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/hhkb/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_60_hhkb(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+  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),
diff --git a/keyboards/chlx/merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
index e0a634c3c7..557711eeed 100644
--- a/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_60_tsangan_hhkb(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+  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),
diff --git a/keyboards/chlx/str_merro60/keymaps/ansi/keymap.c b/keyboards/chlx/str_merro60/keymaps/ansi/keymap.c
index dbd73407ab..0d33ba9b98 100644
--- a/keyboards/chlx/str_merro60/keymaps/ansi/keymap.c
+++ b/keyboards/chlx/str_merro60/keymaps/ansi/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_60_ansi(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+  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,
diff --git a/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
index cb323febe3..588779a038 100644
--- a/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
+++ b/keyboards/chlx/str_merro60/keymaps/hhkb/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_60_hhkb(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+  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),
diff --git a/keyboards/chlx/str_merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/str_merro60/keymaps/tsangan/keymap.c
index 92e1bb9155..1ee50bdaf0 100644
--- a/keyboards/chlx/str_merro60/keymaps/tsangan/keymap.c
+++ b/keyboards/chlx/str_merro60/keymaps/tsangan/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_60_tsangan_hhkb(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+  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),
diff --git a/keyboards/ck60i/keymaps/default/keymap.c b/keyboards/ck60i/keymaps/default/keymap.c
index b8bb2abea4..ccd1b11fce 100755
--- a/keyboards/ck60i/keymaps/default/keymap.c
+++ b/keyboards/ck60i/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
-	KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
+	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_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_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_NUHS ,
diff --git a/keyboards/ck60i/keymaps/via/keymap.c b/keyboards/ck60i/keymaps/via/keymap.c
index 589383fdc7..4c859464db 100755
--- a/keyboards/ck60i/keymaps/via/keymap.c
+++ b/keyboards/ck60i/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
-	KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
+	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_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_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_NUHS ,
diff --git a/keyboards/clueboard/60/keymaps/default/keymap.c b/keyboards/clueboard/60/keymaps/default/keymap.c
index 066b9df998..80e2329a83 100644
--- a/keyboards/clueboard/60/keymaps/default/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'
      */
     [_BL] = LAYOUT_all(
-      KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,
+      QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,
       KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,
       KC_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_BSLS,
diff --git a/keyboards/clueboard/60/keymaps/default_aek/keymap.c b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
index 338d80cf5d..d3b25e555a 100644
--- a/keyboards/clueboard/60/keymaps/default_aek/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'
      */
     [_BL] = LAYOUT_aek(
-      KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,  KC_BSPC,
+      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,
diff --git a/keyboards/clueboard/66/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66/keymaps/66_ansi/keymap.c
index 915bd0f70c..6fbdb79bc9 100644
--- a/keyboards/clueboard/66/keymaps/66_ansi/keymap.c
+++ b/keyboards/clueboard/66/keymaps/66_ansi/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT_66_ansi(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,
   KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/66_iso/keymap.c b/keyboards/clueboard/66/keymaps/66_iso/keymap.c
index b2f83ce17f..20a57a1564 100644
--- a/keyboards/clueboard/66/keymaps/66_iso/keymap.c
+++ b/keyboards/clueboard/66/keymaps/66_iso/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT_66_iso(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,    KC_BSPC,             KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,    KC_BSPC,             KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,                        KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
index 0ffa72643a..2bbe67cb73 100644
--- a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c
index b2a755ca41..c271a23493 100644
--- a/keyboards/clueboard/66/keymaps/colemak/keymap.c
+++ b/keyboards/clueboard/66/keymaps/colemak/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,    KC_SCLN,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   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_NUHS,  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_INT1,  KC_RSFT,          KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/default/keymap.c b/keyboards/clueboard/66/keymaps/default/keymap.c
index 92ea0c8627..be350fe874 100644
--- a/keyboards/clueboard/66/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
index 56b0fdba4b..50c31563c8 100644
--- a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index c27b929b95..b9a3454e25 100644
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -47,7 +47,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer) */
   [_BL] = LAYOUT(
-    KC_GESC,    KC_1,    KC_2,   KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0, KC_MINS,   KC_EQL, _______, KC_BSPC,          KC_INS,
+    QK_GESC,    KC_1,    KC_2,   KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0, KC_MINS,   KC_EQL, _______, KC_BSPC,          KC_INS,
     HPR_TAB,    KC_Q,    KC_W,   KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P, KC_LBRC,  KC_RBRC, KC_BSLS,                   KC_DEL,
     ESC_FUN,    KC_A,    KC_S,   KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,  KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,
     KC_LSFT, KC_NUBS,    KC_Z,   KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,   KC_DOT, KC_SLSH,  _______, KC_RSFT,          KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c b/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
index e380286b5a..4e9a35e0b6 100644
--- a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
+++ b/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        RGB_VAI,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_GRV, KC_BSPC,        RGB_VAI,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                RGB_VAD,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
index 43e31b6796..0f7c5762f4 100644
--- a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c b/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
index 138ba6f48a..f26ac0b90d 100644
--- a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,	KC_1,	KC_2,	KC_3,   KC_4,   KC_5,   KC_6,   KC_7,	KC_8,	KC_9,		KC_0,		KC_MINS,	KC_EQL,		KC_GRV,		KC_BSPC,	KC_HOME,
+  QK_GESC,	KC_1,	KC_2,	KC_3,   KC_4,   KC_5,   KC_6,   KC_7,	KC_8,	KC_9,		KC_0,		KC_MINS,	KC_EQL,		KC_GRV,		KC_BSPC,	KC_HOME,
   KC_TAB,	KC_Q,	KC_W,	KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,		KC_P,		KC_LBRC,	KC_RBRC,	KC_BSLS,				KC_END,
   MO(_FL), 	KC_A,	KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   	KC_SCLN,	KC_QUOT,  	KC_NUHS,  	KC_ENT,
   KC_LSFT, 	KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,	KC_DOT, 	KC_SLSH,  	KC_INT1,   	KC_RSFT,          		KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
index 4e6f9b65e4..fc6a0ed535 100644
--- a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
   MO(_FL), KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
index f52a74238c..7c9ef443d7 100644
--- a/keyboards/clueboard/66/keymaps/smt/keymap.c
+++ b/keyboards/clueboard/66/keymaps/smt/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------'
    */
 [_QWERTY] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS, KC_GRV,           KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS, KC_GRV,           KC_PGUP,
   HPR_TAB, KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,                   KC_PGDN,
   CTL_ESC, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  XXXXXXX,  KC_ENT,
   KC_LSFT, XXXXXXX, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  SFT_ENT,  MO(_FL),          KC_UP,
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------'
    */
 [_COLEMAK] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS, KC_GRV,           KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS, KC_GRV,           KC_PGUP,
   HPR_TAB, KC_Q,    KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,    KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSPC,                   KC_PGDN,
   CTL_ESC, KC_A,    KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,    KC_O,     KC_QUOT,  XXXXXXX,  KC_ENT,
   KC_LSFT, XXXXXXX, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  SFT_ENT,  MO(_FL),          KC_UP,
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------'
    */
 [_DVORAK] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_GRV,           KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_GRV,           KC_PGUP,
   HPR_TAB, KC_QUOT, KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,    KC_L,     KC_SLSH,  KC_EQL,   KC_BSPC,                   KC_PGDN,
   CTL_ESC, KC_A,    KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,    KC_S,     KC_MINS,  XXXXXXX,  KC_ENT,
   KC_LSFT, XXXXXXX, KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,    KC_V,     KC_Z,     SFT_ENT,  MO(_FL),          KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
index 80061b3a51..b6385e2fa0 100644
--- a/keyboards/clueboard/66/keymaps/tetris/keymap.c
+++ b/keyboards/clueboard/66/keymaps/tetris/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
@@ -72,7 +72,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
 
   switch (keycode) {
-    case KC_GESC:
+    case QK_GRAVE_ESCAPE:
       // clueboard specific hook to make escape quite tetris
       if (tetris_running) {
         tetris_running = 0;
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
index 7271d1c08b..2dfaafab02 100644
--- a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/via/keymap.c b/keyboards/clueboard/66/keymaps/via/keymap.c
index 16735a5b6e..1e9781af4b 100644
--- a/keyboards/clueboard/66/keymaps/via/keymap.c
+++ b/keyboards/clueboard/66/keymaps/via/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT_66_ansi(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,
   KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
index f41bd5f64d..4a5e8c4720 100644
--- a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_INS,
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  KC_BSPC,          KC_INS,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_DEL,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
diff --git a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c b/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
index 8e5cf923e3..8b2f9d096b 100644
--- a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
+++ b/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
@@ -7,7 +7,7 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_SPC, KC_INT4, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+	[0] = LAYOUT(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_SPC, KC_INT4, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 	[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
 	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
 };
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index 1d70f8b8b1..72b8b8bbab 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -21,7 +21,7 @@ const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
  *    driver
  *    |  LED address
  *    |  | */
-    { 0, C1_1  }, // k00  KC_GESC
+    { 0, C1_1  }, // k00 QK_GESC
     { 0, C1_2  }, // k01 KC_1
     { 0, C1_3  }, // k02 KC_2
     { 0, C1_4  }, // k03 KC_3
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
index c16d63e758..4dfa570cbc 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT_66_ansi(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,
   KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
index 253cfc2782..f3d4fe5c3d 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,
   KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json b/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
index b2111dc3ca..4849f814dd 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
@@ -1 +1 @@
-{"keyboard":"clueboard/66_hotswap/gen1","keymap":"default_66","layout":"LAYOUT","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","MO(1)","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_DEL","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_MPRV","KC_MPLY","KC_MNXT","KC_NO","KC_MUTE","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","MO(1)","KC_NO","KC_HOME","KC_PGDN","KC_END"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_TOGG","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_STEP","KC_NO","KC_NO","MO(1)","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"","notes":""}
\ No newline at end of file
+{"keyboard":"clueboard/66_hotswap/gen1","keymap":"default_66","layout":"LAYOUT","layers":[["QK_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","MO(1)","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_DEL","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_MPRV","KC_MPLY","KC_MNXT","KC_NO","KC_MUTE","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","MO(1)","KC_NO","KC_HOME","KC_PGDN","KC_END"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_TOGG","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_STEP","KC_NO","KC_NO","MO(1)","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c
index c16d63e758..4dfa570cbc 100644
--- a/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c
+++ b/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT_66_ansi(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,
   KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,        KC_UP,
diff --git a/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c
index 57ff747369..80f75a0fde 100644
--- a/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN,
   KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,
   KC_LSFT, KC_NUHS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_NUBS,KC_RSFT,        KC_UP,
diff --git a/keyboards/contra/keymaps/bramver/README.md b/keyboards/contra/keymaps/bramver/README.md
index 5327beba7c..3c7028a933 100644
--- a/keyboards/contra/keymaps/bramver/README.md
+++ b/keyboards/contra/keymaps/bramver/README.md
@@ -10,7 +10,7 @@ Still many options, but time will tell if changes are needed.
 
 
 BASE layer
-  { KC_GESC , KC_Q    , KC_W    , KC_E    , KC_R    , KC_T    , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_BSPC }, 
+  { QK_GESC , KC_Q    , KC_W    , KC_E    , KC_R    , KC_T    , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_BSPC }, 
   { KC_TAB  , KC_A    , KC_S    , KC_D    , KC_F    , KC_G    , KC_H    , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_ENT  }, 
   { KC_LSFT , KC_Z    , KC_X    , KC_C    , KC_V    , KC_B    , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_QUOT }, 
   { KC_LCTL , KC_GRV  , KC_LALT , KC_LGUI , MO(1)   , SP_MSE  , SP_MSE  , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , MO(2)   },
diff --git a/keyboards/contra/keymaps/bramver/keymap.c b/keyboards/contra/keymaps/bramver/keymap.c
index 8ccaf686bd..d34b958b2b 100644
--- a/keyboards/contra/keymaps/bramver/keymap.c
+++ b/keyboards/contra/keymaps/bramver/keymap.c
@@ -92,7 +92,7 @@ const uint32_t PROGMEM unicode_map[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_ortho_4x12(
-			KC_GESC	, KC_Q		, KC_W		, KC_E		, KC_R 		, KC_T 		, KC_Y 		, KC_U 		, KC_I 		, KC_O 		, KC_P 		, KC_BSPC , 
+			QK_GESC	, KC_Q		, KC_W		, KC_E		, KC_R 		, KC_T 		, KC_Y 		, KC_U 		, KC_I 		, KC_O 		, KC_P 		, KC_BSPC , 
 			KC_TAB	, KC_A		, KC_S		, KC_D		, KC_F 		, KC_G 		, KC_H 		, KC_J 		, KC_K 		, KC_L 		, KC_SCLN , KC_ENT	, 
 			KC_LSFT	, KC_Z		, KC_X		, KC_C		, KC_V 		, KC_B 		, KC_N 		, KC_M 		, KC_COMM , KC_DOT 	, KC_SLSH , KC_QUOT	, 
 			KC_LCTL	, KC_GRV  , KC_LALT	, KC_LGUI , MO(1)		, SP_MSE 	, SP_MSE	, KC_LEFT , KC_DOWN , KC_UP 	, KC_RGHT , MO(2)   
diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c
index df3f7ea591..25e2e01933 100644
--- a/keyboards/contra/keymaps/maxr1998/keymap.c
+++ b/keyboards/contra/keymaps/maxr1998/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTZ] = {
-  {KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
+  {QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
   {KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS, KC_ENT },
   {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT},
   {KC_LCTL, KC_LGUI, KC_LALT, KC_I3,   KC_NR,   KC_SPC,  KC_SPC,  KC_N3,   KC_FN,   KC_LEFT, KC_DOWN, KC_RGHT}
diff --git a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
index d08787fe30..15ed043aa6 100644
--- a/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
+++ b/keyboards/converter/m0110_usb/keymaps/zyber/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 */
 
 	[0] = LAYOUT_iso(
-	       KC_GESC,   KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,             KC_MINS, KC_EQL,  KC_BSPC,     KC_NUM,  KC_EQL, KC_PSLS, KC_PAST, \
+	       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_EQL, KC_PSLS, KC_PAST, \
 	       KC_TAB,    KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,             KC_LBRC, KC_RBRC, KC_ENT,      KC_P7,   KC_P8,  KC_P9,   KC_PMNS, \
 	       CTRL_C_UP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN,          KC_QUOT, KC_NUHS,              KC_P4,   KC_P5,  KC_P6,   KC_PPLS, \
 	       KC_LSFT,   KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,                                KC_P1,   KC_P2,  KC_P3,   KC_PENT, \
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c
index 68828e7792..203529b4b3 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_65_ansi(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_DEL,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,            KC_PGUP,
       KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c
index af1ed19934..652d4cc56e 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_65_iso(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+      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_DEL,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,   KC_PGUP,
       KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
index dbd5d4409e..da719690e7 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_65_ansi(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_DEL,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,            KC_PGUP,
       KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c
index 143b8d9bb3..8cffb36432 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_65_iso(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+      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_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_BSLS,  KC_PGUP,
       KC_LSFT, KC_TRNS, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
diff --git a/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c b/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
index 0d11c9a9bb..dcc035140e 100644
--- a/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
+++ b/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
@@ -48,7 +48,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL] = LAYOUT(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_DEL, 
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_DEL, 
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_PGUP,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,            KC_PGDN,
       KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    MO(_FL),
diff --git a/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c b/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c
index 2674a0efe6..dc1e36539b 100644
--- a/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c
+++ b/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c
@@ -48,7 +48,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BL] = LAYOUT(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_INS,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_INS,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_DEL,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,            KC_PGUP,
       KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
diff --git a/keyboards/cradio/keymaps/default/keymap.c b/keyboards/cradio/keymaps/default/keymap.c
index 97f69e6e11..ef3a214a6c 100644
--- a/keyboards/cradio/keymaps/default/keymap.c
+++ b/keyboards/cradio/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_1,    KC_2,    KC_3,    KC_VOLU,     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
     _______, KC_4,    KC_5,    KC_6,    KC_VOLD,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
     KC_CAPS, KC_7,    KC_8,    KC_9,    KC_0,        _______, _______, _______, _______, _______,
-                               MO(3),   KC_GESC,     _______, _______
+                               MO(3),   QK_GESC,     _______, _______
     ),
     [2] = LAYOUT_split_3x5_2(
     _______, KC_LBRC, KC_LCBR, KC_RCBR, _______,     KC_CIRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_TILD,
diff --git a/keyboards/custommk/evo70/keymaps/default/keymap.c b/keyboards/custommk/evo70/keymaps/default/keymap.c
index 795f10fdec..cf912e0d08 100644
--- a/keyboards/custommk/evo70/keymaps/default/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
-						  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
+						  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
 						  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
 		KC_F1,   KC_F2,   KC_CAPS, 			KC_A,    KC_S,    KC_D,     KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, 
 	    KC_F3,   KC_F4,	           KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END, 
diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c
index 68687d6c1a..74f68590cf 100644
--- a/keyboards/custommk/evo70/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
-						  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
+						  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
 						  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
 		KC_F1,   KC_F2,   KC_CAPS, 			KC_A,    KC_S,    KC_D,     KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, 
 	    KC_F3,   KC_F4,            KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END, 
diff --git a/keyboards/db/db63/keymaps/default/keymap.c b/keyboards/db/db63/keymaps/default/keymap.c
index ff1d76575b..d6086ddc87 100644
--- a/keyboards/db/db63/keymaps/default/keymap.c
+++ b/keyboards/db/db63/keymaps/default/keymap.c
@@ -19,21 +19,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         MO(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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   MO(2),
         KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_SLSH, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   XXXXXXX,
         KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    _______, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [2] = LAYOUT(
-        KC_GESC, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_TOG, RGB_VAD, RGB_VAI, KC_BSPC,
+        QK_GESC, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_TOG, RGB_VAD, RGB_VAI, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          _______,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   MO(2),
diff --git a/keyboards/doppelganger/keymaps/default/keymap.c b/keyboards/doppelganger/keymaps/default/keymap.c
index dedbd23940..0f04e0f3f4 100644
--- a/keyboards/doppelganger/keymaps/default/keymap.c
+++ b/keyboards/doppelganger/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
-            KC_F1,  KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,  KC_DEL,
+            KC_F1,  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_F2,  KC_F3,  KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,            KC_DEL,
     KC_F4,  KC_F5,  KC_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_F6,  KC_F7,  KC_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,
diff --git a/keyboards/drhigsby/bkf/keymaps/default/keymap.c b/keyboards/drhigsby/bkf/keymaps/default/keymap.c
index cb047a6816..9644532b07 100644
--- a/keyboards/drhigsby/bkf/keymaps/default/keymap.c
+++ b/keyboards/drhigsby/bkf/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_625uC(
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL,
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL,
         KC_TAB,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,     KC_ENT,
         KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
         KC_LCTL, KC_LGUI, KC_LALT,           KC_SPC,                        NUM, FN, KC_QUOT
diff --git a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
index 2b43b42fad..8ea4a1729f 100644
--- a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_60_ansi(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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_NUBS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/ducky/one2mini/keymaps/default/keymap.c b/keyboards/ducky/one2mini/keymaps/default/keymap.c
index be11dbc456..537c5a420e 100644
--- a/keyboards/ducky/one2mini/keymaps/default/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_all(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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_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,
diff --git a/keyboards/ducky/one2mini/keymaps/iso/keymap.c b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
index e34178283b..1c653d0fd5 100644
--- a/keyboards/ducky/one2mini/keymaps/iso/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_60_iso(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/ducky/one2sf/keymaps/default/keymap.c b/keyboards/ducky/one2sf/keymaps/default/keymap.c
index e78667c9ad..0290761783 100644
--- a/keyboards/ducky/one2sf/keymaps/default/keymap.c
+++ b/keyboards/ducky/one2sf/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT_all(
         //       2        3        4        5        6        7        8        9        10       11       12       13       14         15
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
         KC_LSFT,  KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
index 81edb22343..bf20d1fadf 100644
--- a/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT_65_ansi",
   "layers": [
     [
-      "KC_GESC",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_DEL", 
+      "QK_GESC",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_DEL", 
       "KC_TAB",   "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_HOME",
       "KC_CAPS",  "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",            "KC_ENT",  "KC_PGUP", 
       "KC_LSFT",             "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT", "KC_UP",   "KC_PGDN", 
diff --git a/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
index 44c56568a8..3c525ee047 100644
--- a/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT_65_ansi",
   "layers": [
     [
-      "KC_GESC",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_DEL", 
+      "QK_GESC",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_DEL", 
       "KC_TAB",   "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_HOME",
       "KC_CAPS",  "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",            "KC_ENT",  "KC_PGUP", 
       "KC_LSFT",             "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT", "KC_UP",   "KC_PGDN", 
diff --git a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
index 00742818f1..d52a554557 100644
--- a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT_60_ansi",
   "layers": [
     [
-      "KC_GESC", "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",
+      "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",            "RSFT_T(KC_UP)",
diff --git a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
index 9d9bcf7467..9bbbccb411 100644
--- a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
@@ -4,7 +4,7 @@
   "layout": "LAYOUT_60_ansi",
   "layers": [
     [
-      "KC_GESC", "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC",
+      "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",            "RSFT_T(KC_UP)",
diff --git a/keyboards/dz60/keymaps/60_ansi/keymap.c b/keyboards/dz60/keymaps/60_ansi/keymap.c
index 89286bd6b2..dd3788a0bc 100644
--- a/keyboards/dz60/keymaps/60_ansi/keymap.c
+++ b/keyboards/dz60/keymaps/60_ansi/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
+		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,
diff --git a/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c b/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c
index 6a7fd7a7cf..19834a7665 100644
--- a/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c
+++ b/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   LAYOUT_directional(
-      KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, ______, KC_BSPC,
+      QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, ______, KC_BSPC,
       KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
       KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
       KC_LSFT,         KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
diff --git a/keyboards/dz60/keymaps/60_tsangan/keymap.c b/keyboards/dz60/keymaps/60_tsangan/keymap.c
index 113e1007dd..cd430a39d5 100644
--- a/keyboards/dz60/keymaps/60_tsangan/keymap.c
+++ b/keyboards/dz60/keymaps/60_tsangan/keymap.c
@@ -9,7 +9,7 @@ enum keyboard_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_BL] = LAYOUT_60_tsangan(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
+		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, MO(_FL),
diff --git a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
index 863a02e726..ab5b0430c8 100644
--- a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO,
diff --git a/keyboards/dz60/keymaps/LEdiodes/keymap.c b/keyboards/dz60/keymaps/LEdiodes/keymap.c
index ffb7d59c36..3fdd37803c 100644
--- a/keyboards/dz60/keymaps/LEdiodes/keymap.c
+++ b/keyboards/dz60/keymaps/LEdiodes/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Keymap _L0: (Layer 0 - Base Layer) This is the default layer
  * This layer has a key set to MO(_L1) which means when held down Layer 1 will become active, If Layer 1 does not have anything set for tat key is will revert to uing the key set at layer 0.
  * LT(_L1, KC_1) means that when the "1" key is long touched then it will activate the layer _L1 key(F1) but if the key is just tapped it will activate the "1" key.
- * KC_GESC = Escape when tapped, ` when pressed with Shift or GUI
+ * QK_GESC = Escape when tapped, ` when pressed with Shift or GUI
  * KC_LSPO = Left Shift when held, ( when tapped
  * TD(LT(_L3,KC_SPACE)) = This is a test... hoping it will tap dance if double tapped it does enter if single tap it does space if long hold down it does _L3(Layer 3).
  * LT(_L3,KC_SPACE) = if tapped it does space, is long touch it does _L3(Layer 3)
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------'
  */
 [_L0] = LAYOUT(
-      KC_GESC,              LT(_L1, KC_1),LT(_L1, KC_2),LT(_L1, KC_3),LT(_L1, KC_4),LT(_L1, KC_5),LT(_L1, KC_6),LT(_L1, KC_7),LT(_L1, KC_8),LT(_L1, KC_9),LT(_L1, KC_0),LT(_L1, KC_MINS),LT(_L1, KC_EQL),KC_BSPC,  KC_DEL,    \
+      QK_GESC,              LT(_L1, KC_1),LT(_L1, KC_2),LT(_L1, KC_3),LT(_L1, KC_4),LT(_L1, KC_5),LT(_L1, KC_6),LT(_L1, KC_7),LT(_L1, KC_8),LT(_L1, KC_9),LT(_L1, KC_0),LT(_L1, KC_MINS),LT(_L1, KC_EQL),KC_BSPC,  KC_DEL,    \
       KC_TAB,              KC_Q,    KC_W,    KC_E,     KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_BSLS,   \
       KC_CAPS,             KC_A,    KC_S,    KC_D,     KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,              KC_ENT,    \
       KC_LSPO,   KC_Z,    KC_X,     KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    TO(_L1), \
diff --git a/keyboards/dz60/keymaps/atlacat/keymap.c b/keyboards/dz60/keymaps/atlacat/keymap.c
index fd596570fe..8ecd45cb18 100644
--- a/keyboards/dz60/keymaps/atlacat/keymap.c
+++ b/keyboards/dz60/keymaps/atlacat/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
     LAYOUT(
-        KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , XXXXXXX, KC_BSPC,
+        QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , XXXXXXX, KC_BSPC,
         KC_TAB ,          KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
         LT(MO(1), KC_CAPS),KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
         KC_LSFT, XXXXXXX, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          XXXXXXX,
diff --git a/keyboards/dz60/keymaps/boris_burger/keymap.c b/keyboards/dz60/keymaps/boris_burger/keymap.c
index 683591179a..fcc1121d69 100644
--- a/keyboards/dz60/keymaps/boris_burger/keymap.c
+++ b/keyboards/dz60/keymaps/boris_burger/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-----------------------------------------------------------------------------------------'
     */
     LAYOUT_directional(
-        KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , _______, KC_BSPC,
+        QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , _______, KC_BSPC,
         KC_TAB ,          KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
         MO(1)  ,          KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,
         KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_INS ,
diff --git a/keyboards/dz60/keymaps/chrisae9/keymap.c b/keyboards/dz60/keymaps/chrisae9/keymap.c
index fbf4ec2eb7..689f9f228d 100644
--- a/keyboards/dz60/keymaps/chrisae9/keymap.c
+++ b/keyboards/dz60/keymaps/chrisae9/keymap.c
@@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_directional(
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_GESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+		QK_GESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_MINS, KC_BSPC, KC_RALT, MO(2), KC_LEFT, KC_DOWN, KC_RIGHT),
 
diff --git a/keyboards/dz60/keymaps/default/keymap.c b/keyboards/dz60/keymaps/default/keymap.c
index 3b6c147a18..8b8c47e3a8 100644
--- a/keyboards/dz60/keymaps/default/keymap.c
+++ b/keyboards/dz60/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX,
diff --git a/keyboards/dz60/keymaps/default_abnt2/keymap.c b/keyboards/dz60/keymaps/default_abnt2/keymap.c
index d27e42e390..ee14f87054 100644
--- a/keyboards/dz60/keymaps/default_abnt2/keymap.c
+++ b/keyboards/dz60/keymaps/default_abnt2/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   [_BL] = LAYOUT_60_abnt2(
-    KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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,    BR_ACUT, BR_LBRC,
     KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,  BR_CCED,  BR_TILD, BR_RBRC, KC_ENT,
     KC_LSFT, BR_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT, BR_SCLN, BR_SLSH, KC_RSFT,
diff --git a/keyboards/dz60/keymaps/drewsky/keymap.c b/keyboards/dz60/keymaps/drewsky/keymap.c
index d67c1a0299..71dd913bb6 100755
--- a/keyboards/dz60/keymaps/drewsky/keymap.c
+++ b/keyboards/dz60/keymaps/drewsky/keymap.c
@@ -8,7 +8,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 
   [_L0] = LAYOUT_60_ansi(
-			KC_GESC,   KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,    KC_BSPC, 
+			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_LSPO,      KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, 
diff --git a/keyboards/dz60/keymaps/gk64/keymap.c b/keyboards/dz60/keymaps/gk64/keymap.c
index 9d16714cb7..69d1bcf922 100644
--- a/keyboards/dz60/keymaps/gk64/keymap.c
+++ b/keyboards/dz60/keymaps/gk64/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
 		KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   MO(1),
diff --git a/keyboards/dz60/keymaps/iso_4th_row_all_1u/keymap.c b/keyboards/dz60/keymaps/iso_4th_row_all_1u/keymap.c
index e1552eccc4..f9c5096eb3 100644
--- a/keyboards/dz60/keymaps/iso_4th_row_all_1u/keymap.c
+++ b/keyboards/dz60/keymaps/iso_4th_row_all_1u/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_60_iso_4th_row_all_1u(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
     MO(_FN), 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_INS,  KC_UP,   KC_DEL,
diff --git a/keyboards/dz60/keymaps/iso_uk/keymap.c b/keyboards/dz60/keymaps/iso_uk/keymap.c
index 49acefd92d..cabe386b0c 100644
--- a/keyboards/dz60/keymaps/iso_uk/keymap.c
+++ b/keyboards/dz60/keymaps/iso_uk/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_60_iso(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c b/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c
index fadc7296c5..e2e393af44 100644
--- a/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c
+++ b/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_60_iso_5x1u_split_bs_rshift_spc(
 //QWERTY Base layer:
 //  1        2        3        4        5        6        7        8        9        10       11       12       13       14       15
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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,
     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_CAPS, KC_VOLU,
diff --git a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c b/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
index 7dfe7f4338..3ae3b75f7d 100644
--- a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
+++ b/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------'
  */
 	LAYOUT_60_hhkb(
-		KC_GESC,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSLS, KC_DEL,
+		QK_GESC,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSLS, KC_DEL,
 		KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSPC,
 		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, MO(1),
diff --git a/keyboards/dz60/keymaps/kifinnsson/keymap.c b/keyboards/dz60/keymaps/kifinnsson/keymap.c
index 49067a2ab5..6fbb4466ab 100644
--- a/keyboards/dz60/keymaps/kifinnsson/keymap.c
+++ b/keyboards/dz60/keymaps/kifinnsson/keymap.c
@@ -29,7 +29,7 @@ enum my_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_all(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,     KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,     KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,   KC_U,     KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
 		MO(1),   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,   KC_E,     KC_I,    KC_O,    KC_QUOT, KC_ENT,
 		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(2),   KC_K,   KC_M,     KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT, XXXXXXX,
diff --git a/keyboards/dz60/keymaps/kream/keymap.c b/keyboards/dz60/keymaps/kream/keymap.c
index c2bb517115..26935642be 100644
--- a/keyboards/dz60/keymaps/kream/keymap.c
+++ b/keyboards/dz60/keymaps/kream/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi_split_space_rshift(
-        KC_GESC, KC_1,    KC_2,    KC_3,   KC_4,  KC_5,   KC_6,    KC_7,  KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,   KC_4,  KC_5,   KC_6,    KC_7,  KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,  KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         MO(1),   KC_A,    KC_S,    KC_D,   KC_F,  KC_G,   KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,  KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/dz60/keymaps/macos_64/config.h b/keyboards/dz60/keymaps/macos_64/config.h
index 235ae1b2db..0e4aa34dd7 100644
--- a/keyboards/dz60/keymaps/macos_64/config.h
+++ b/keyboards/dz60/keymaps/macos_64/config.h
@@ -3,7 +3,7 @@
 
 #include "../../config.h"
 
-// Fix KC_GESC conflict with Cmd+Alt+Esc on macos
+// Fix QK_GESC conflict with Cmd+Alt+Esc on macos
 #define GRAVE_ESC_GUI_OVERRIDE
 
 #endif
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/macos_64/keymap.c b/keyboards/dz60/keymaps/macos_64/keymap.c
index 56f8e5abe2..105eed257b 100644
--- a/keyboards/dz60/keymaps/macos_64/keymap.c
+++ b/keyboards/dz60/keymaps/macos_64/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------------'
    */
   LAYOUT_all(
-    KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
+    QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
     KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DELETE,
diff --git a/keyboards/dz60/keymaps/macos_arrow/config.h b/keyboards/dz60/keymaps/macos_arrow/config.h
index 235ae1b2db..0e4aa34dd7 100644
--- a/keyboards/dz60/keymaps/macos_arrow/config.h
+++ b/keyboards/dz60/keymaps/macos_arrow/config.h
@@ -3,7 +3,7 @@
 
 #include "../../config.h"
 
-// Fix KC_GESC conflict with Cmd+Alt+Esc on macos
+// Fix QK_GESC conflict with Cmd+Alt+Esc on macos
 #define GRAVE_ESC_GUI_OVERRIDE
 
 #endif
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/mechmerlin/keymap.c b/keyboards/dz60/keymaps/mechmerlin/keymap.c
index eaaee21d86..0b7b17f2cd 100644
--- a/keyboards/dz60/keymaps/mechmerlin/keymap.c
+++ b/keyboards/dz60/keymaps/mechmerlin/keymap.c
@@ -12,7 +12,7 @@ enum keyboard_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_BL] = LAYOUT_60_b_ansi(
-      KC_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+      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_CTCP, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
       KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSSH, KC_UP,   KC_DEL,
diff --git a/keyboards/dz60/keymaps/mpstewart/keymap.c b/keyboards/dz60/keymaps/mpstewart/keymap.c
index 95bd226187..d83acfde74 100644
--- a/keyboards/dz60/keymaps/mpstewart/keymap.c
+++ b/keyboards/dz60/keymaps/mpstewart/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 	[_BASE] = LAYOUT_60_ansi_split_bs_rshift(
  //    _0        _1        _2      _3       _4      _5      _6      _7       _8     _9       _A       _B        _C       _D           _E
-/*0_*/ KC_GESC,  KC_1,     KC_2,   KC_3,    KC_4,   KC_5,   KC_6,   KC_7,    KC_8,  KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSLS,     KC_GRV,
+/*0_*/ QK_GESC,  KC_1,     KC_2,   KC_3,    KC_4,   KC_5,   KC_6,   KC_7,    KC_8,  KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSLS,     KC_GRV,
 /*1_*/ KC_TAB,             KC_Q,   KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,     KC_LBRC, KC_RBRC,     KC_BSPC,
 /*2_*/ C_ESC,              KC_A,   KC_S,    KC_D,   KC_F,   KC_G,   KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_ENT,
 /*3_*/ KC_LSFT,            KC_Z,   KC_X,    KC_C,   KC_V,   KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT,     MO(_FN),
diff --git a/keyboards/dz60/keymaps/pevecyan/keymap.c b/keyboards/dz60/keymaps/pevecyan/keymap.c
index bfde76b07b..720600627f 100644
--- a/keyboards/dz60/keymaps/pevecyan/keymap.c
+++ b/keyboards/dz60/keymaps/pevecyan/keymap.c
@@ -8,7 +8,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT( \
-    KC_GESC,SI_1,   SI_2,   SI_3,   SI_4,   SI_5,   SI_6,   SI_7,   SI_8,   SI_9,   SI_0,   SI_QUOT, SI_PLUS,XXXXXXX,KC_BSPC, \
+    QK_GESC,SI_1,   SI_2,   SI_3,   SI_4,   SI_5,   SI_6,   SI_7,   SI_8,   SI_9,   SI_0,   SI_QUOT, SI_PLUS,XXXXXXX,KC_BSPC, \
     KC_TAB,         SI_Q,   SI_W,   SI_E,   SI_R,   SI_T,   SI_Z,   SI_U,   SI_I,   SI_O,   SI_P,    SI_GRV, SI_TILD,CARON,   \
     MO(2),          SI_A,   SI_S,   SI_D,   SI_F,   SI_G,   SI_H,   SI_J,   SI_K,   SI_L,   KC_SCLN, KC_QUOT,KC_ENT,          \
     KC_LSFT,XXXXXXX,SI_Y,   SI_X,   SI_C,   SI_V,   SI_B,   SI_N,   SI_M,   SI_COMM,SI_DOT, SI_MINS,        KC_RSFT,XXXXXXX, \
diff --git a/keyboards/dz60/keymaps/pok3r/keymap.c b/keyboards/dz60/keymaps/pok3r/keymap.c
index 2db8318003..410fd9473f 100644
--- a/keyboards/dz60/keymaps/pok3r/keymap.c
+++ b/keyboards/dz60/keymaps/pok3r/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
 		MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO,
diff --git a/keyboards/dz60/keymaps/stephengrier/keymap.c b/keyboards/dz60/keymaps/stephengrier/keymap.c
index b55915463d..35d5485b44 100644
--- a/keyboards/dz60/keymaps/stephengrier/keymap.c
+++ b/keyboards/dz60/keymaps/stephengrier/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   LAYOUT_directional(
-      KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, ______, KC_BSPC,
+      QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, ______, KC_BSPC,
       KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
       MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
       KC_LSFT,         KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
diff --git a/keyboards/dz60/keymaps/tailcall/keymap.c b/keyboards/dz60/keymaps/tailcall/keymap.c
index e95c520cc5..9df51f54c1 100644
--- a/keyboards/dz60/keymaps/tailcall/keymap.c
+++ b/keyboards/dz60/keymaps/tailcall/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT(
-        KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , XXXXXXX, KC_BSPC,
+        QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , XXXXXXX, KC_BSPC,
         KC_TAB ,          KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
         KC_LCTL,          KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
         KC_LSFT, XXXXXXX, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          XXXXXXX,
diff --git a/keyboards/dz60/keymaps/via/keymap.c b/keyboards/dz60/keymaps/via/keymap.c
index b1fd7badda..2107ee8d7d 100644
--- a/keyboards/dz60/keymaps/via/keymap.c
+++ b/keyboards/dz60/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_NO,   KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_NO,   KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,
diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index f5df06ae73..633a0f3311 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Base layer - ANSI QWERTY
 [L0] = LAYOUT_all(
-	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, XXXX, KC_BSPC,
+	QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, XXXX, KC_BSPC,
 	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
 	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
diff --git a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
index 8138eaa5bb..9702baccac 100644
--- a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Base layer - ANSI QWERTY
 [L0] = LAYOUT_all(
-	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, XXXX, KC_BSPC,
+	QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, XXXX, KC_BSPC,
 	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
 	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT,
diff --git a/keyboards/dz60/keymaps/zepol_layout/keymap.c b/keyboards/dz60/keymaps/zepol_layout/keymap.c
index 6389da4953..ffa4e133c4 100644
--- a/keyboards/dz60/keymaps/zepol_layout/keymap.c
+++ b/keyboards/dz60/keymaps/zepol_layout/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO,
diff --git a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
index e1f7285b44..87e64544e0 100644
--- a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,            KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,            KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
index 98d797bf6b..2147ca8bf8 100644
--- a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
@@ -27,7 +27,7 @@ enum didel_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
         LSFT_T(KC_GRAVE), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
index 1ebbad37d7..2f34e03d3f 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
@@ -32,7 +32,7 @@ extern bool autoshift_enabled;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_QWERTY] = LAYOUT(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
 		LT_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           \
 		KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MT_SLSH,          KC_UP,   LT_DEL,  \
diff --git a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
index e6cf400da3..743d9188b0 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
@@ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,            KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,            KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index 2d77c87fb3..4dca4d2396 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -9,7 +9,7 @@
 #define _LAYER7 7
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_LAYER0] = LAYOUT( /* MAC */
-		KC_GESC,  KC_1, 	KC_2, 	  KC_3,  KC_4,  KC_5,  KC_6,	KC_7,  KC_8,	KC_9,	  KC_0,			   KC_MINS,  KC_EQL,  KC_BSPC,
+		QK_GESC,  KC_1, 	KC_2, 	  KC_3,  KC_4,  KC_5,  KC_6,	KC_7,  KC_8,	KC_9,	  KC_0,			   KC_MINS,  KC_EQL,  KC_BSPC,
 		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,			   KC_LBRC,  KC_RBRC, KC_BSLS,
 		CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,         KC_QUOT,           KC_ENT,
 		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,    KC_P1,    KC_P2,    KC_P3,    _______,    _______,    _______,    _______,    KC_P1,    KC_P2,    KC_P3,    _______,              _______,
 		_______,    KC_P0,    KC_PDOT,                        KC_ENT,                             KC_P0,    KC_PDOT,  _______,  _______,              _______),
 	[_LAYER4] = LAYOUT( /* WIN */
-		KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,            KC_MINS,  KC_EQL,  KC_BSPC,
+		QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,            KC_MINS,  KC_EQL,  KC_BSPC,
 		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,            KC_LBRC,  KC_RBRC, KC_BSLS,
 		CTL_T(KC_CAPS),     KC_A,     KC_S,  KC_D,  KC_F,  KC_G,    KC_H,  KC_J,    KC_K,     KC_L,  KC_SCLN,  KC_QUOT,           KC_ENT,
 		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
diff --git a/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c b/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
index bd396b8ead..a659770f82 100644
--- a/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/moults31/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,            KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
         KC_LSFT,                 KC_Z,            KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_SLSH, KC_RSHFT, KC_UP,   LT(2, KC_DEL),
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
index 4912fb6210..c4a9a2b588 100644
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
@@ -13,7 +13,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_QWERTY] = LAYOUT( /* Base */
-		KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,       KC_MINS,  KC_EQL,  KC_BSPC,
+		QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,       KC_MINS,  KC_EQL,  KC_BSPC,
 		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,       KC_LBRC,  KC_RBRC, KC_BSLS,
 		KC_GRV,   KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,    KC_QUOT,           KC_ENT,
 		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,    KC_UP,             KC_DEL,
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
index 8c42797d20..abb2c07885 100644
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
@@ -55,7 +55,7 @@ enum piv3rt_rgbprofiles current_profile = OFF;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DEF] = LAYOUT(
-        KC_GESC, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
         LT_CAPS, KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,           KC_ENT,
         KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   RSFT_SL,  KC_UP,   LT_DEL,
diff --git a/keyboards/dztech/dz60rgb/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
index 3697f38d6c..da128eec4f 100644
--- a/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,            KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,            KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_P0,   KC_PDOT,                            KC_PENT,                   KC_P0,   KC_PDOT, _______, _______, _______
     ),
     [4] = LAYOUT(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
index 0cf6ab644d..905ec1b531 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
@@ -4,7 +4,7 @@
 #define _LAYER2 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_LAYER0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+	[_LAYER0] = LAYOUT(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
 							KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
 							KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 							KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2,KC_DEL),
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
index 5bef7af7da..339d2fa428 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
@@ -2,14 +2,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
         KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(2),   KC_RCTL
     ),
     [1] = LAYOUT_60_ansi(
-        KC_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,
+        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_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md
index 905a21e9c8..b9dbdfeb90 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md
@@ -9,8 +9,8 @@ maintaining a uniform position of keys across devices helps a lot.
 
 The below keymap attempts to maintain a uniform keymap across Linux and Mac.
 
-Avoiding the use of `KC_GESC` as the intention is to use the same layer for mac and linux.
-`KC_GESC` causes `` CMD+` `` to be send which has a default mapping
+Avoiding the use of `QK_GESC` as the intention is to use the same layer for mac and linux.
+`QK_GESC` causes `` CMD+` `` to be send which has a default mapping
 
 Layer: 1
 
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
index cd4129d5bb..a15e986d2d 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
@@ -2,14 +2,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
         KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(2),   KC_RCTL
     ),
     [1] = LAYOUT_60_ansi(
-        KC_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,
+        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_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
index e2856101b9..bf02a301be 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_tsangan_hhkb(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
index 0549320f44..b39359fa0b 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_tsangan_hhkb(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+        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,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSPO,        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(1),
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c
index 58cf36f786..8a5857b55b 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_tsangan_hhkb(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
diff --git a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
index c6c542c630..914d1cc756 100644
--- a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
@@ -2,14 +2,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        QK_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
         KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         LCTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
         KC_LSFT,                  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
         KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_65_ansi(
-        KC_GESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        QK_GESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS,         RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
         LCTL_T(KC_CAPS), RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,  KC_PGDN,
         KC_LSFT,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index b8e66c729a..5ef122672c 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -138,7 +138,7 @@ const uint32_t PROGMEM unicode_map[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAIN] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_APP), KC_UP, KC_PGDN,
diff --git a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c b/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
index b0ab0165f4..731f287a27 100644
--- a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
@@ -9,7 +9,7 @@ enum tofu68_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_QWERTY] = LAYOUT_65_ansi(
-		KC_GESC, KC_1,     KC_2,     KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_GRV,  \
+		QK_GESC, KC_1,     KC_2,     KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_GRV,  \
 		KC_TAB,  KC_Q,     KC_W,     KC_E,   KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL, \
 		KC_GRV,  KC_A,     KC_S,     KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,           KC_ENT,  KC_PGUP, \
 		KC_LSFT, KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,           KC_UP,   KC_PGDN,  \
diff --git a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
index 35b556d3c3..548d55799a 100644
--- a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
@@ -2,14 +2,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
         KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_65_ansi(
-        KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        QK_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP,
         CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index 29b73f063d..f5529876da 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -110,7 +110,7 @@ const layers_leds_map[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAIN] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_LEAD, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
@@ -522,11 +522,11 @@ void matrix_scan_user(void)
             onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)): SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL));
         }
         /*  `   => LdrKey > Escape */
-        SEQ_ONE_KEY(KC_GESC) {
+        SEQ_ONE_KEY(QK_GESC) {
             SEND_STRING("`");
         }
         /*  ``` => LdrKey > Escape > Escape > Escape */
-        SEQ_THREE_KEYS(KC_GESC, KC_GESC, KC_GESC) {
+        SEQ_THREE_KEYS(QK_GESC, QK_GESC, QK_GESC) {
             SEND_STRING("```");
         }
         /*  Printscreen             => LdrKey > Insert */
@@ -690,7 +690,7 @@ void matrix_scan_user(void)
             onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_DOWN)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_END))));
         }
         /* HELPER => spit out the url of the layout description page on github */
-        SEQ_FIVE_KEYS(KC_GESC, KC_GESC, KC_GESC, KC_GESC, KC_GESC) {
+        SEQ_FIVE_KEYS(QK_GESC, QK_GESC, QK_GESC, QK_GESC, QK_GESC) {
             SEND_STRING("https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz65rgb/keymaps/drootz");
         }
         /*  google.ca   => LdrKey > G > G */
diff --git a/keyboards/dztech/dz65rgb/keymaps/haervig/keymap.c b/keyboards/dztech/dz65rgb/keymaps/haervig/keymap.c
index 6784c14f00..f2ccd311e8 100644
--- a/keyboards/dztech/dz65rgb/keymaps/haervig/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/haervig/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,        DK_1,    CU_2,    DK_3,    CU_4,    DK_5,    CU_6,    CU_7,    CU_8,    CU_9,    CU_0,    CU_MINS, CU_EQL,  CU_BSPC, KC_HOME,
+        QK_GESC,        DK_1,    CU_2,    DK_3,    CU_4,    DK_5,    CU_6,    CU_7,    CU_8,    CU_9,    CU_0,    CU_MINS, CU_EQL,  CU_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,    CU_LBRC, CU_RBRC, CU_BSLS, KC_PGUP,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    CU_SCLN, CU_QUOT,          KC_ENT,  KC_PGDN,
         CU_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    CU_COMM, CU_DOT,  CU_SLSH, CU_RSFT, KC_UP,   KC_END,
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index cf2117232c..07ed4f06e6 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -31,7 +31,7 @@ extern bool autoshift_enabled;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_QWERTY] = LAYOUT_65_ansi(
-		KC_GESC, KC_1,     KC_2,     KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,  \
+		QK_GESC, KC_1,     KC_2,     KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,  \
 		KC_TAB,  KC_Q,     KC_W,     KC_E,   KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS, KC_PGUP, \
 		LT_CAPS, KC_A,     KC_S,     KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,           KC_ENT,  KC_PGDN, \
 		KC_LSPO, KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSPC,           KC_UP,   KC_END,  \
diff --git a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c b/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
index 83a947d70f..34977bdbe3 100644
--- a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
@@ -4,7 +4,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
diff --git a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
index 919a81d746..3d1772e3b2 100644
--- a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c
@@ -2,14 +2,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
         KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_65_ansi(
-        KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        QK_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
         CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  KC_PGDN,
         KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
index bfe1c04894..adca28584e 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
@@ -36,7 +36,7 @@ enum my_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_ALPHA_LAYER] = LAYOUT_65_ansi(
-		KC_GESC,	KC_1,	KC_2,	KC_3,   KC_4,	KC_5,	KC_6,	KC_7,	KC_8,		KC_9,	KC_0,		KC_MINUS,	KC_EQUAL,		KC_BSPC,	KC_HOME,
+		QK_GESC,	KC_1,	KC_2,	KC_3,   KC_4,	KC_5,	KC_6,	KC_7,	KC_8,		KC_9,	KC_0,		KC_MINUS,	KC_EQUAL,		KC_BSPC,	KC_HOME,
 		KC_TAB,		KC_Q,	KC_W,	KC_E,	KC_R,	KC_T,	KC_Y,	KC_U,	KC_I,		KC_O,	KC_P,		KC_LBRC,KC_RBRC,	KC_BSLS,	KC_PGUP,
 		KC_LCTL,	KC_A,   KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,		KC_L,	KC_SCLN,	KC_QUOTE,	        KC_ENTER,	        KC_PGDN,
 		KC_LSFT,	KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMMA,	KC_DOT,	KC_SLASH,           KC_RSFT,          KC_UP,		KC_END,
diff --git a/keyboards/eco/keymaps/fsck/keymap.c b/keyboards/eco/keymaps/fsck/keymap.c
index 52b5c2d3b0..34cb279992 100644
--- a/keyboards/eco/keymaps/fsck/keymap.c
+++ b/keyboards/eco/keymaps/fsck/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT(
   KC_TAB,   KC_1,   KC_2,    KC_3,   KC_4,    KC_5,  KC_MINS, KC_EQL,  KC_6,   KC_7,   KC_8,     KC_9,     KC_0,    KC_BSPC,
-  KC_GESC,  KC_Q,   KC_W,    KC_E,   KC_R,    KC_T,  KC_HOME, KC_PGUP, KC_Y,   KC_U,   KC_I,     KC_O,     KC_P,    KC_QUOT,
+  QK_GESC,  KC_Q,   KC_W,    KC_E,   KC_R,    KC_T,  KC_HOME, KC_PGUP, KC_Y,   KC_U,   KC_I,     KC_O,     KC_P,    KC_QUOT,
   JC_CAPS,  KC_A,   KC_S,    KC_D,   KC_F,    KC_G,  KC_END,  KC_PGDN, KC_H,   KC_J,   KC_K,     KC_L,     KC_SCLN, KC_ENT,
   KC_LSFT,  JC_Z,   JC_X,    JC_C,   KC_V,    KC_B,  KC_SPC,  KC_SPC,  KC_N,   KC_M,   JC_COMM,  JC_DOT,   JC_SLSH, KC_RSFT
 ),
diff --git a/keyboards/emery65/keymaps/default/keymap.c b/keyboards/emery65/keymaps/default/keymap.c
index 332babc8c6..51e8b7bb81 100644
--- a/keyboards/emery65/keymaps/default/keymap.c
+++ b/keyboards/emery65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, KC_HOME,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,         KC_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,
diff --git a/keyboards/emery65/keymaps/via/keymap.c b/keyboards/emery65/keymaps/via/keymap.c
index beeae2971b..47c460e8d2 100644
--- a/keyboards/emery65/keymaps/via/keymap.c
+++ b/keyboards/emery65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, KC_HOME,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,         KC_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,
diff --git a/keyboards/ep/40/keymaps/default/keymap.c b/keyboards/ep/40/keymaps/default/keymap.c
index 1c62bbed6d..918381a577 100644
--- a/keyboards/ep/40/keymaps/default/keymap.c
+++ b/keyboards/ep/40/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Base */
-    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, M_BSDEL,
+    QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, M_BSDEL,
     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_RSFT,
     LCTL_T(KC_LBRC), KC_LGUI, KC_LALT,  KC_SPC,  LT(1, KC_SPC), KC_RALT, MO(2), RCTL_T(KC_RBRC),  KC_F5
diff --git a/keyboards/ericrlau/numdiscipline/keymaps/default/keymap.c b/keyboards/ericrlau/numdiscipline/keymaps/default/keymap.c
index c24713eb6e..aa354e70f1 100644
--- a/keyboards/ericrlau/numdiscipline/keymaps/default/keymap.c
+++ b/keyboards/ericrlau/numdiscipline/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,            KC_DEL,   KC_PSLS, KC_PAST, KC_PMNS,
+        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_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,            KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,                      KC_P4,    KC_P5,   KC_P6,   
         KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,           KC_UP,    KC_P1,    KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/esca/getawayvan/keymaps/7u/keymap.c b/keyboards/esca/getawayvan/keymaps/7u/keymap.c
index 5e20978332..beeac2bffb 100644
--- a/keyboards/esca/getawayvan/keymaps/7u/keymap.c
+++ b/keyboards/esca/getawayvan/keymaps/7u/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,  KC_F, KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_QUOT, LT(3, KC_ENT),
     KC_LSFT, ALT_T(KC_Z),   KC_X,    KC_C,  KC_V, KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_NO,   KC_RSFT,
     KC_LCTL,       KC_LGUI, KC_NO,   KC_NO,                LT(1, KC_SPC), KC_NO,   MO(2),   KC_NO,   KC_LALT
diff --git a/keyboards/esca/getawayvan/keymaps/default/keymap.c b/keyboards/esca/getawayvan/keymaps/default/keymap.c
index 4c213a5225..16a09cc34e 100644
--- a/keyboards/esca/getawayvan/keymaps/default/keymap.c
+++ b/keyboards/esca/getawayvan/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,  KC_F, KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_QUOT, LT(3, KC_ENT),
     KC_LSFT,       KC_Z,    KC_X,    KC_C,  KC_V, KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
     KC_LCTL,       KC_LGUI, KC_LALT, LT(2, KC_SPC),        LT(1, KC_SPC), MO(2),   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/esca/getawayvan/keymaps/via/keymap.c b/keyboards/esca/getawayvan/keymaps/via/keymap.c
index 55c60a9256..22e315b558 100644
--- a/keyboards/esca/getawayvan/keymaps/via/keymap.c
+++ b/keyboards/esca/getawayvan/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,  KC_F, KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_QUOT, LT(3, KC_ENT),
     KC_LSFT,       KC_Z,    KC_X,    KC_C,  KC_V, KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
     KC_LCTL,       KC_LGUI, KC_LALT, LT(2, KC_SPC),        LT(1, KC_SPC), MO(2),   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c b/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c
index 5e20978332..beeac2bffb 100644
--- a/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c
+++ b/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,  KC_F, KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_QUOT, LT(3, KC_ENT),
     KC_LSFT, ALT_T(KC_Z),   KC_X,    KC_C,  KC_V, KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_NO,   KC_RSFT,
     KC_LCTL,       KC_LGUI, KC_NO,   KC_NO,                LT(1, KC_SPC), KC_NO,   MO(2),   KC_NO,   KC_LALT
diff --git a/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c b/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c
index 55c60a9256..22e315b558 100644
--- a/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c
+++ b/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* Qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,  KC_F, KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_QUOT, LT(3, KC_ENT),
     KC_LSFT,       KC_Z,    KC_X,    KC_C,  KC_V, KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
     KC_LCTL,       KC_LGUI, KC_LALT, LT(2, KC_SPC),        LT(1, KC_SPC), MO(2),   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c b/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
index 2f3cb33d94..9bd3361800 100644
--- a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = LAYOUT_split_space(
-  KC_GESC,  KC_Q,     KC_W,       KC_E,      KC_R,        KC_T,       KC_Y,    KC_U,      KC_I,     KC_O,      KC_P,     KC_DEL,   KC_BSPC,
+  QK_GESC,  KC_Q,     KC_W,       KC_E,      KC_R,        KC_T,       KC_Y,    KC_U,      KC_I,     KC_O,      KC_P,     KC_DEL,   KC_BSPC,
   KC_TAB,   KC_A,     KC_S,       KC_D,      KC_F,        KC_G,       KC_H,    KC_J,      KC_K,     KC_L,      KC_SCLN,            KC_ENT,
   KC_LSFT,            KC_Z,       KC_X,      KC_C,        KC_V,       KC_B,    KC_N,      KC_M,     KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,
   KC_LCTL,  KC_LGUI,  KC_LALT,    MO(_LO),                KC_SPC,              KC_SPC,              MO(_RA),   KC_RALT,  KC_APP,   KC_RCTL),
diff --git a/keyboards/evyd13/eon40/keymaps/default/keymap.c b/keyboards/evyd13/eon40/keymaps/default/keymap.c
index a0e0cb6d8a..1ddd92ce27 100644
--- a/keyboards/evyd13/eon40/keymaps/default/keymap.c
+++ b/keyboards/evyd13/eon40/keymaps/default/keymap.c
@@ -26,7 +26,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = LAYOUT_ortho_4x12(
-  KC_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
+  QK_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
   KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
   KC_LSFT,  KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
   KC_LCTL,  KC_LGUI,     KC_LALT,     KC_RALT,     MO(_LO),     KC_SPC,   KC_BSPC,  MO(_HI),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
diff --git a/keyboards/evyd13/eon40/keymaps/via/keymap.c b/keyboards/evyd13/eon40/keymaps/via/keymap.c
index f4831fa7a5..347ab6755a 100644
--- a/keyboards/evyd13/eon40/keymaps/via/keymap.c
+++ b/keyboards/evyd13/eon40/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ortho_4x12(
-  KC_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
+  QK_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
   KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
   KC_LSFT,  KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
   KC_LCTL,  KC_LGUI,     KC_LALT,     KC_RALT,     MO(1),       KC_SPC,   KC_BSPC,  MO(2),    KC_LEFT,  KC_DOWN,  KC_UP,    KC_MPLY),
diff --git a/keyboards/evyd13/eon65/keymaps/default/keymap.c b/keyboards/evyd13/eon65/keymaps/default/keymap.c
index 8ee89afd7b..b5b3de82b9 100644
--- a/keyboards/evyd13/eon65/keymaps/default/keymap.c
+++ b/keyboards/evyd13/eon65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
     KC_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,
diff --git a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c b/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
index 0cd82063d6..00df8b8c71 100644
--- a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
+++ b/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * │Ctrl│Opt │Cmd │          Space         │Cmd │Opt │█│←  │↓  │→  │
    * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
    */
-     [0] = LAYOUT_65_ansi_blocker(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+     [0] = LAYOUT_65_ansi_blocker(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
 	                              KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
 							      KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
 							      KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
diff --git a/keyboards/evyd13/eon65/keymaps/via/keymap.c b/keyboards/evyd13/eon65/keymaps/via/keymap.c
index 19d97a059a..552a8660a9 100644
--- a/keyboards/evyd13/eon65/keymaps/via/keymap.c
+++ b/keyboards/evyd13/eon65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
     KC_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,
diff --git a/keyboards/evyd13/gud70/keymaps/default/keymap.c b/keyboards/evyd13/gud70/keymaps/default/keymap.c
index d9b1bdc598..281af662f6 100644
--- a/keyboards/evyd13/gud70/keymaps/default/keymap.c
+++ b/keyboards/evyd13/gud70/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,  KC_HOME,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,  KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,		 KC_LBRC, KC_RBRC,                   KC_DEL,  KC_END,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,           TO(2),   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, MO(1),            KC_UP,   KC_PGDN,
diff --git a/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c b/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
index 2fd6f56f8c..5f2ca6ad8d 100644
--- a/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
+++ b/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,   KC_HOME,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,   KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,		 KC_LBRC, KC_RBRC,                   KC_DEL,   KC_END,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,           KC_MPLY,  KC_PGUP,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(1),    KC_PGDN,
diff --git a/keyboards/evyd13/gud70/keymaps/via/keymap.c b/keyboards/evyd13/gud70/keymaps/via/keymap.c
index af25a00574..49abab8eb7 100644
--- a/keyboards/evyd13/gud70/keymaps/via/keymap.c
+++ b/keyboards/evyd13/gud70/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,  KC_HOME,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,  KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,		 KC_LBRC, KC_RBRC,                   KC_DEL,  KC_END,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,           TO(2),   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, MO(1),            KC_UP,   KC_PGDN,
diff --git a/keyboards/evyd13/minitomic/keymaps/default/keymap.c b/keyboards/evyd13/minitomic/keymaps/default/keymap.c
index f29a16b5e1..400c5e364d 100644
--- a/keyboards/evyd13/minitomic/keymaps/default/keymap.c
+++ b/keyboards/evyd13/minitomic/keymaps/default/keymap.c
@@ -26,7 +26,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = LAYOUT_split_space(
-  KC_GESC,  KC_Q,     KC_W,        KC_E,        KC_R,        KC_T,        KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,    KC_BSPC,
+  QK_GESC,  KC_Q,     KC_W,        KC_E,        KC_R,        KC_T,        KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,    KC_BSPC,
   KC_TAB,   KC_A,     KC_S,        KC_D,        KC_F,        KC_G,        KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,             KC_ENT,
   KC_LSFT,            KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,
   KC_LCTL,  KC_LGUI,  KC_LALT,     MO(_LO),                  KC_SPC,                KC_SPC,             MO(_HI),  KC_RALT,  KC_APP,    KC_RCTL),
diff --git a/keyboards/evyd13/pockettype/keymaps/default/keymap.c b/keyboards/evyd13/pockettype/keymaps/default/keymap.c
index c68e371f20..6e3574f0cf 100644
--- a/keyboards/evyd13/pockettype/keymaps/default/keymap.c
+++ b/keyboards/evyd13/pockettype/keymaps/default/keymap.c
@@ -26,7 +26,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = LAYOUT_ortho_4x12(
-  KC_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
+  QK_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
   KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
   KC_LSFT,  KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
   KC_LCTL,  KC_LGUI,     KC_LALT,     KC_RALT,     MO(_LO),     KC_SPC,   KC_BSPC,  MO(_HI),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_MPLY),
diff --git a/keyboards/evyd13/solheim68/keymaps/default/keymap.c b/keyboards/evyd13/solheim68/keymaps/default/keymap.c
index 57901ed500..c2cd539e8c 100644
--- a/keyboards/evyd13/solheim68/keymaps/default/keymap.c
+++ b/keyboards/evyd13/solheim68/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS,  KC_BSPC,  KC_MPLY, KC_HOME,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS,  KC_BSPC,  KC_MPLY, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,		 KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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, MO(1),              KC_UP,
diff --git a/keyboards/exclusive/e65/keymaps/crd/keymap.c b/keyboards/exclusive/e65/keymaps/crd/keymap.c
index 28fa2e79f1..865db0a792 100644
--- a/keyboards/exclusive/e65/keymaps/crd/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/crd/keymap.c
@@ -9,7 +9,7 @@ enum keyboard_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BL] = LAYOUT_65_ansi_7u_wk_splitbs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, LT(_FL, KC_UP), KC_DEL,
diff --git a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c b/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
index fa2043f4a0..97461dd7d8 100644
--- a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
@@ -9,7 +9,7 @@ enum keyboard_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_65_ansi_7u_wk_splitbs(
-    KC_GESC, KC_1,    KC_2,   KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,KC_DEL, KC_HOME,
+    QK_GESC, KC_1,    KC_2,   KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,KC_DEL, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,   KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC,         KC_BSPC,KC_PGUP,
     KC_TILD, KC_A,    KC_S,   KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,         KC_PGDN,
     KC_LSFT,          KC_Z,   KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,KC_UP,  KC_END,
diff --git a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
index df98572daf..ee2e581e7a 100644
--- a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
+++ b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *           `--------------------------------------------------------------------'
  */
   [_BL] = LAYOUT_60_hhkb(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
       HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
       CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SFT_ENT, MO(_FL),
diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
index 41c6da296a..550103ca99 100644
--- a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c b/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
index 31675a3d37..2444a2e363 100644
--- a/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
index 41c6da296a..550103ca99 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
index c7414d83b8..9a1c95fc45 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/facew/keymaps/default/keymap.c b/keyboards/facew/keymaps/default/keymap.c
index d1470814c8..ef9a063e6c 100644
--- a/keyboards/facew/keymaps/default/keymap.c
+++ b/keyboards/facew/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-      KC_GESC, KC_1,  KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
+      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,
       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_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/fc660c/keymaps/default_rgb/keymap.c b/keyboards/fc660c/keymaps/default_rgb/keymap.c
index a67d4d3c40..a220acff7c 100644
--- a/keyboards/fc660c/keymaps/default_rgb/keymap.c
+++ b/keyboards/fc660c/keymaps/default_rgb/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-        KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
+        QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
         KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,     KC_DEL,
         MO(1),   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,     KC_ENT,
         KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,     KC_UP,
diff --git a/keyboards/fc660c/keymaps/mikefightsbears/keymap.c b/keyboards/fc660c/keymaps/mikefightsbears/keymap.c
index 23f650a11e..0139905ae1 100644
--- a/keyboards/fc660c/keymaps/mikefightsbears/keymap.c
+++ b/keyboards/fc660c/keymaps/mikefightsbears/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-        KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
+        QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
         KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,     KC_DEL,
         KC_LCTL,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,     KC_ENT,
         KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,     KC_UP,
diff --git a/keyboards/fc660c/keymaps/siroleo/keymap.c b/keyboards/fc660c/keymaps/siroleo/keymap.c
index dd677e7c7d..540c1c2d6a 100644
--- a/keyboards/fc660c/keymaps/siroleo/keymap.c
+++ b/keyboards/fc660c/keymaps/siroleo/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `--------------------------------------------------------------------------------------------------´
    */
   [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,   KC_2,   KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,  KC_0,   KC_MINS,KC_EQL, KC_BSPC,    KC_GRV,
+        QK_GESC, KC_1,   KC_2,   KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,  KC_0,   KC_MINS,KC_EQL, KC_BSPC,    KC_GRV,
         KC_TAB,  KC_Q,   KC_W,   KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,  KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,    KC_DEL,
         KC_GRV , KC_A,   KC_S,   KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,  KC_SCLN,KC_QUOT,     KC_ENT,
         KC_LSFT, KC_Z,   KC_X,   KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,     KC_UP,
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `--------------------------------------------------------------------------------------------------´
    */
   [_COLEMAK] = LAYOUT(
-        KC_GESC, KC_1,   KC_2,   KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,  KC_0,   KC_MINS,KC_EQL, KC_BSPC,    KC_GRV,
+        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_F,  KC_P,  KC_G,  KC_J,  KC_L,  KC_U,   KC_Y,  KC_SCLN,KC_LBRC,KC_RBRC,KC_BSLS,    KC_DEL,
         KC_GRV , KC_A,   KC_R,   KC_S,  KC_T,  KC_D,  KC_H,  KC_N,  KC_E,   KC_I,  KC_O   ,KC_QUOT,     KC_ENT,
         KC_LSFT, KC_Z,   KC_X,   KC_C,  KC_V,  KC_B,  KC_K,  KC_M,  KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,     KC_UP,
diff --git a/keyboards/fc660c/keymaps/via_rgb/keymap.c b/keyboards/fc660c/keymaps/via_rgb/keymap.c
index a7b96a48a3..2749c32f6c 100644
--- a/keyboards/fc660c/keymaps/via_rgb/keymap.c
+++ b/keyboards/fc660c/keymaps/via_rgb/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-        KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
+        QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
         KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,     KC_DEL,
         MO(1),   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,     KC_ENT,
         KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,     KC_UP,
diff --git a/keyboards/ferris/keymaps/madhatter/keymap.c b/keyboards/ferris/keymaps/madhatter/keymap.c
index 1bdc8604f2..db6928918b 100644
--- a/keyboards/ferris/keymaps/madhatter/keymap.c
+++ b/keyboards/ferris/keymaps/madhatter/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT( /* [> LOWER <] */
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    KC_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
+    QK_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT,
                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
   ),
diff --git a/keyboards/ferris/keymaps/via/keymap.c b/keyboards/ferris/keymaps/via/keymap.c
index af014a9ca8..70b51e3d91 100644
--- a/keyboards/ferris/keymaps/via/keymap.c
+++ b/keyboards/ferris/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT(
     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    KC_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
+    QK_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT,
                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
   ),
diff --git a/keyboards/fjlabs/ad65/keymaps/default/keymap.c b/keyboards/fjlabs/ad65/keymaps/default/keymap.c
index c950e1480b..ab4d9067cf 100644
--- a/keyboards/fjlabs/ad65/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/ad65/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        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_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_DEL,  KC_TRNS,
+        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_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/fjlabs/ad65/keymaps/via/keymap.c b/keyboards/fjlabs/ad65/keymaps/via/keymap.c
index 11741e67bd..6d44018a69 100644
--- a/keyboards/fjlabs/ad65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/ad65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        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_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_DEL,  KC_TRNS,
+        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_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/fjlabs/avalon/keymaps/default/keymap.c b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
index 5c3a765f85..7bbd9bb3f5 100644
--- a/keyboards/fjlabs/avalon/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/avalon/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         [_LAYER0] = LAYOUT_all(
-        KC_F1, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        KC_F1, 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_GRV,
         KC_F2, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_F3, KC_CAPS, KC_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_F4, 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,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_TRNS, KC_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_DEL,  KC_TRNS,
+        KC_TRNS, 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_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
diff --git a/keyboards/fjlabs/avalon/keymaps/via/keymap.c b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
index 3b5d13ab4a..8528216988 100644
--- a/keyboards/fjlabs/avalon/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/avalon/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         [_LAYER0] = LAYOUT_all(
-        KC_F1, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        KC_F1, 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_F2, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_F3, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_DEL,  KC_PGDN,
         KC_F4, 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,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_TRNS, KC_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_DEL,  KC_TRNS,
+        KC_TRNS, 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_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
diff --git a/keyboards/fjlabs/bks65/keymaps/default/keymap.c b/keyboards/fjlabs/bks65/keymaps/default/keymap.c
index dfb0ca691e..17090ae052 100644
--- a/keyboards/fjlabs/bks65/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/bks65/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/fjlabs/bks65/keymaps/via/keymap.c b/keyboards/fjlabs/bks65/keymaps/via/keymap.c
index f3cb7c9125..55a217d909 100644
--- a/keyboards/fjlabs/bks65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/bks65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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, 
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c b/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c
index a63001feea..88ff28f475 100644
--- a/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_TRNS, KC_HOME,
+        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_TRNS, KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,            KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c b/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c
index 9dfa768c98..ee17d22ea3 100644
--- a/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c
@@ -24,14 +24,14 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_LAYER1] = LAYOUT_all(
-        KC_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_TRNS, KC_HOME,
+        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_TRNS, KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,            KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/kyuu/keymaps/default/keymap.c b/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
index 4f51adbd8e..9d34865dd7 100644
--- a/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_badge(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, 
         KC_LSFT, KC_LSFT, KC_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, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
-        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/fjlabs/kyuu/keymaps/via/keymap.c b/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
index 3cd7a637bc..56c8b242d6 100644
--- a/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_badge(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, 
         KC_LSFT, KC_LSFT, KC_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, 
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
-        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/fjlabs/ldk65/keymaps/default/keymap.c b/keyboards/fjlabs/ldk65/keymaps/default/keymap.c
index dfb0ca691e..17090ae052 100644
--- a/keyboards/fjlabs/ldk65/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/ldk65/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/fjlabs/ldk65/keymaps/via/keymap.c b/keyboards/fjlabs/ldk65/keymaps/via/keymap.c
index f3cb7c9125..55a217d909 100644
--- a/keyboards/fjlabs/ldk65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/ldk65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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, 
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/fjlabs/midway60/keymaps/default/keymap.c b/keyboards/fjlabs/midway60/keymaps/default/keymap.c
index bf4dd394a1..e1c921c419 100644
--- a/keyboards/fjlabs/midway60/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/midway60/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/midway60/keymaps/via/keymap.c b/keyboards/fjlabs/midway60/keymaps/via/keymap.c
index a5f19db973..31f21f0908 100644
--- a/keyboards/fjlabs/midway60/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/midway60/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
index 43d018547e..3ee8a546fe 100644
--- a/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/mk61rgbansi/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c b/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
index 0331ab69a9..6f058e6046 100644
--- a/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/mk61rgbansi/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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, 
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/polaris/keymaps/default/keymap.c b/keyboards/fjlabs/polaris/keymaps/default/keymap.c
index 24c4fc6480..bff6ccc710 100644
--- a/keyboards/fjlabs/polaris/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/polaris/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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_DEL,
         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_TRNS,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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, 
+        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/polaris/keymaps/via/keymap.c b/keyboards/fjlabs/polaris/keymaps/via/keymap.c
index 7317f14a57..aa8410694a 100644
--- a/keyboards/fjlabs/polaris/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/polaris/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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_DEL,
         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_TRNS,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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,
+        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/ready100/keymaps/default/keymap.c b/keyboards/fjlabs/ready100/keymaps/default/keymap.c
index 6ac8a367c9..d1bab847dc 100644
--- a/keyboards/fjlabs/ready100/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/ready100/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_64_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_64_ansi(
-        KC_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,
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          QK_BOOT,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/ready100/keymaps/via/keymap.c b/keyboards/fjlabs/ready100/keymaps/via/keymap.c
index 1e24d683be..7541055136 100644
--- a/keyboards/fjlabs/ready100/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/ready100/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_64_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_64_ansi(
-        KC_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,
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          QK_BOOT,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/sinanju/keymaps/default/keymap.c b/keyboards/fjlabs/sinanju/keymaps/default/keymap.c
index dbe096e494..b82b513b1e 100644
--- a/keyboards/fjlabs/sinanju/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/sinanju/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi_wkl_split_bs_rshift(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi_wkl_split_bs_rshift(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c b/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c
index c36445ca98..5035004e2f 100644
--- a/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c
+++ b/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi_wkl(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi_wkl(
-        KC_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,
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
diff --git a/keyboards/fjlabs/sinanju/keymaps/via/keymap.c b/keyboards/fjlabs/sinanju/keymaps/via/keymap.c
index 7cf05996ae..dc910d93f1 100644
--- a/keyboards/fjlabs/sinanju/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/sinanju/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi_wkl_split_bs_rshift(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi_wkl_split_bs_rshift(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
index ad8439a760..ab0f38756b 100644
--- a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS, KC_EQL,  KC_BSPC, 
+        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_DEL,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT, MO(1),
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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,  
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
index 3a39be888d..b66dcffc48 100644
--- a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+        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_DEL,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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,  
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c b/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
index 43d018547e..3ee8a546fe 100644
--- a/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/tf60ansi/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c b/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
index 0331ab69a9..6f058e6046 100644
--- a/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/tf60ansi/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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, 
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c b/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c
index d27df75120..6efc305223 100644
--- a/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/tf60v2/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi_arrow(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, KC_DEL,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi_arrow(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c b/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c
index cda333a255..9333873966 100644
--- a/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/tf60v2/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi_arrow(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, KC_DEL,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi_arrow(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c b/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c
index 94c2f9ddb2..16b8bd693b 100644
--- a/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/tf65rgbv2/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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_DEL,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c b/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c
index dee3d04ae8..9d3938fda8 100644
--- a/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/tf65rgbv2/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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_DEL,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
index 2d57dd71bb..e59dbeda1d 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
@@ -10,7 +10,7 @@ enum keyboard_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_BL] = LAYOUT_60_tsangan_hhkb(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_CTES, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL),
diff --git a/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c b/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c
index 0aa1dc6376..22dede0696 100644
--- a/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c
+++ b/keyboards/foxlab/leaf60/universal/keymaps/mguterl/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_QWERTY] = LAYOUT_all(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
+		QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
 		HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
 		ESC_CTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_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(UTIL),
diff --git a/keyboards/funky40/keymaps/default/keymap.c b/keyboards/funky40/keymaps/default/keymap.c
index 10ecc7602b..a539db0eb7 100644
--- a/keyboards/funky40/keymaps/default/keymap.c
+++ b/keyboards/funky40/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 
+		QK_GESC, KC_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_SFTENT, 
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(1, KC_DEL), KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
diff --git a/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c b/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
index 1c69068bd6..4a800e085b 100644
--- a/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
+++ b/keyboards/geonworks/frogmini/fmh/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_tsangan_hhkb( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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),
diff --git a/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c b/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
index 1c69068bd6..4a800e085b 100644
--- a/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
+++ b/keyboards/geonworks/frogmini/fmh/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_tsangan_hhkb( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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),
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
index e09b7d830d..a067ec46de 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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_NUHS, KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c
index 49a78a3382..5b5a4f2706 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default_60_ansi_wkl_split_bs_rshift_10u_space/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi_wkl_split_bs_rshift_10u_space( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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),
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c
index bcb4ea1aea..602e1ee9f8 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default_60_hhkb_10u_space/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_hhkb_10u_space( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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),
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c
index 384669101d..db8693a146 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/default_60_tsangan_hhkb_10u_space/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_tsangan_hhkb_10u_space( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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),
diff --git a/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c b/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
index e09b7d830d..a067ec46de 100644
--- a/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
+++ b/keyboards/geonworks/frogmini/fms/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+    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_NUHS, KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c
index d28f028563..f6b25dbb74 100644
--- a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c
+++ b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   [_BL] = LAYOUT_60_abnt2(
-    KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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,    BR_ACUT, BR_LBRC,
     KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,  BR_CCED,  BR_TILD, BR_RBRC, KC_ENT,
     KC_LSFT, BR_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT, BR_SCLN, BR_SLSH, KC_RSFT,
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
index 708bb61ebd..a031457300 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   [_BL] = LAYOUT(
-        KC_GESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC, \
+        QK_GESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC, \
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS, \
         LT(2, KC_CAPS),KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_NO,KC_ENT,  \
         KC_LSFT,KC_NO,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_NO,KC_RSFT, \
diff --git a/keyboards/gh60/revc/keymaps/sethbc/keymap.c b/keyboards/gh60/revc/keymaps/sethbc/keymap.c
index 1557d109b4..9836d15c27 100644
--- a/keyboards/gh60/revc/keymaps/sethbc/keymap.c
+++ b/keyboards/gh60/revc/keymaps/sethbc/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: qwerty */
   LAYOUT_60_ansi_split_bs_rshift(
-        KC_GESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,\
+        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),\
diff --git a/keyboards/gh60/satan/keymaps/abhixec/keymap.c b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
index 3254a85f22..8b226cb043 100644
--- a/keyboards/gh60/satan/keymaps/abhixec/keymap.c
+++ b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_BL] = LAYOUT_60_ansi_split_rshift(
-  KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, \
+  QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS, \
   LT(_EL, KC_BSPC), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT, \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         KC_RSFT, KC_DEL, \
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap _CL: (Colemak Layer) 
  */
 [_CL] = LAYOUT_60_ansi_split_rshift(
-  KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, \
+  QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, \
   KC_TAB,  KC_Q,   KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,   KC_LBRC, KC_RBRC,KC_BSLS, \
   LT(_EL, KC_BSPC), KC_A,   KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,   KC_O,KC_QUOT,         KC_ENT, \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         KC_RSFT, KC_DEL, \
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_EL] = LAYOUT_60_ansi_split_rshift(
   
   KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,  \
-  _______,KC_LCTL,KC_WH_U,_______,_______,KC_MS_U,KC_PGUP,KC_HOME,KC_UP,KC_END,KC_DEL, KC_GESC, _______,_______, \
+  _______,KC_LCTL,KC_WH_U,_______,_______,KC_MS_U,KC_PGUP,KC_HOME,KC_UP,KC_END,KC_DEL, QK_GESC, _______,_______, \
   _______,KC_LALT,KC_WH_D, KC_LSFT,_______,KC_MS_D,KC_PGDN,KC_LEFT,KC_DOWN,KC_RIGHT, KC_BSPC,_______,_______, \
 _______,KC_UNDO,KC_CUT,KC_COPY,KC_PASTE, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2,KC_MS_LEFT,KC_MS_RIGHT,_______,_______, _______, \
   _______,_______,_______,                _______,                        _______,_______,_______,_______),
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
index 0226624094..3cfbd340cf 100644
--- a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
+++ b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         `-----------------------------------------------------------------'
  */
   [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
-      KC_GESC , KC_1    , KC_2    , KC_3   , KC_4    , KC_5    , KC_6   , KC_7     , KC_8    , KC_9   , KC_0    , KC_MINS , KC_EQL   , KC_BSLS , KC_GRV , \
+      QK_GESC , KC_1    , KC_2    , KC_3   , KC_4    , KC_5    , KC_6   , KC_7     , KC_8    , KC_9   , KC_0    , KC_MINS , KC_EQL   , KC_BSLS , KC_GRV , \
       KC_TAB  , KC_Q    , KC_W    , KC_E   , KC_R    , KC_T    , KC_Y   , KC_U     , KC_I    , KC_O   , KC_P    , KC_LBRC , KC_RBRC  , KC_BSPC , \
       KC_LCTL , KC_A    , KC_S    , KC_D   , KC_F    , KC_G    , KC_H   , KC_J     , KC_K    , KC_L   , KC_SCLN , KC_QUOT , KC_ENT   , \
       KC_LSFT , KC_Z    , KC_X    , KC_C   , KC_V    , KC_B    , KC_N   , KC_M     , KC_COMM , KC_DOT , KC_SLSH , KC_RSFT , TO(_VIM) , \
diff --git a/keyboards/gh60/satan/keymaps/bri/keymap.c b/keyboards/gh60/satan/keymaps/bri/keymap.c
index fd9bb7e672..4c4af28be9 100644
--- a/keyboards/gh60/satan/keymaps/bri/keymap.c
+++ b/keyboards/gh60/satan/keymaps/bri/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_BL] = LAYOUT_60_ansi(
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, \
+  QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS, \
   MO(2),   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,         KC_RSFT, \
diff --git a/keyboards/gh60/satan/keymaps/chaser/keymap.c b/keyboards/gh60/satan/keymaps/chaser/keymap.c
index f438b84d39..6df80e1562 100644
--- a/keyboards/gh60/satan/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/satan/keymaps/chaser/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_BL] = LAYOUT_all(
-    KC_GESC     ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC    , _______,  \
+    QK_GESC     ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC    , _______,  \
     KC_TAB      ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS    ,           \
     KC_CAPS     ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,_______,KC_ENT     ,           \
     KC_LSFT     ,_______,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_UP  ,MO(_FL)    ,           \
diff --git a/keyboards/gh60/satan/keymaps/default/keymap.c b/keyboards/gh60/satan/keymaps/default/keymap.c
index b5c1284ecc..0f23120127 100644
--- a/keyboards/gh60/satan/keymaps/default/keymap.c
+++ b/keyboards/gh60/satan/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   [_BL] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/gh60/satan/keymaps/denolfe/keymap.c b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
index 03c5007c8c..4114f0db9e 100644
--- a/keyboards/gh60/satan/keymaps/denolfe/keymap.c
+++ b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
 [_BL] = LAYOUT_60_ansi(
-  KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,     KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC, \
+  QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,     KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC, \
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,     KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS, \
   MO(_FL),   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,     KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,  \
   KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,  KC_DOT,  KC_SLSH,                     KC_RSFT, \
diff --git a/keyboards/gh60/satan/keymaps/fakb/keymap.c b/keyboards/gh60/satan/keymaps/fakb/keymap.c
index b6dda8e3ef..e7b23395c3 100644
--- a/keyboards/gh60/satan/keymaps/fakb/keymap.c
+++ b/keyboards/gh60/satan/keymaps/fakb/keymap.c
@@ -9,7 +9,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_all(
- KC_GESC,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL, KC_BSLS,KC_NUBS,\
+ QK_GESC,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL, KC_BSLS,KC_NUBS,\
  TABS_MA,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSPC,\
  LCTL_MA,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,XXXXXXX,KC_ENT ,\
  LSFT_MA,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,RSFT_MA,MO(1)  ,\
diff --git a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
index 65df547f2a..ef7a330926 100644
--- a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *
    */
   [_BL] = LAYOUT_60_iso_split_rshift( \
-    KC_GESC,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,        KC_BSPC,
+    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_LCTL,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENYE, KC_SCLN, KC_QUOT,       KC_ENT,
     OSM(MOD_LSFT), _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT), MO(_FL),
diff --git a/keyboards/gh60/satan/keymaps/sethbc/keymap.c b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
index d81efd3b36..90121733ce 100644
--- a/keyboards/gh60/satan/keymaps/sethbc/keymap.c
+++ b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   [_BL] = LAYOUT_60_ansi_split_bs_rshift(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, \
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, \
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  \
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL), \
diff --git a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
index 43a41c5bf4..b064685277 100644
--- a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
+++ b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Base Default Layer
   // Mac Modifier Layout. Use BootMagic to toggle GUI and ALT positions.
   [_BL] = LAYOUT_60_ansi_split_bs_rshift(
-    KC_GESC,          KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, \
+    QK_GESC,          KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, \
     KC_TAB,           KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
     LT(_FL, KC_CAPS), KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  \
     KC_LSFT,                   KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   MO(_FL), \
diff --git a/keyboards/giabalanai/keymaps/2firmware/keymap.c b/keyboards/giabalanai/keymaps/2firmware/keymap.c
index 790bb76619..cfd4d38e3b 100644
--- a/keyboards/giabalanai/keymaps/2firmware/keymap.c
+++ b/keyboards/giabalanai/keymaps/2firmware/keymap.c
@@ -282,7 +282,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
@@ -296,7 +296,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* COLEMAK */
   [_COLEMAK] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
         KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
           KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
@@ -691,7 +691,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 #ifdef RGBLIGHT_ENABLE
         case KC_A ... KC_RGUI:                // for QWERTY
-        case KC_GESC:
+        case QK_GRAVE_ESCAPE:
         case ADJ_EIS:
         case MO_ADJ:
         case SHIF_UP:
diff --git a/keyboards/giabalanai/keymaps/3araht/keymap.c b/keyboards/giabalanai/keymaps/3araht/keymap.c
index 220acae078..9e487f81c9 100644
--- a/keyboards/giabalanai/keymaps/3araht/keymap.c
+++ b/keyboards/giabalanai/keymaps/3araht/keymap.c
@@ -297,7 +297,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
@@ -311,7 +311,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* COLEMAK */
   [_COLEMAK] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
         KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
           KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
@@ -706,7 +706,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 #ifdef RGBLIGHT_ENABLE
         case KC_A ... KC_RGUI:                // for QWERTY
-        case KC_GESC:
+        case QK_GRAVE_ESCAPE:
         case ADJ_EIS:
         case MO_ADJ:
         case SHIF_UP:
diff --git a/keyboards/giabalanai/keymaps/default/keymap.c b/keyboards/giabalanai/keymaps/default/keymap.c
index 5b582d1d65..a7b3a6b6a0 100644
--- a/keyboards/giabalanai/keymaps/default/keymap.c
+++ b/keyboards/giabalanai/keymaps/default/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
index 506e0cb811..06749a4f8a 100644
--- a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
@@ -165,13 +165,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper_giabarinaix2(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
             KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
index 32fc77f1cb..dfedd981d9 100644
--- a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
@@ -223,13 +223,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper_giabarinaix2(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
             KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
@@ -445,7 +445,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 #ifdef RGBLIGHT_ENABLE
         case KC_A ... KC_RGUI:                // for QWERTY
-        case KC_GESC:
+        case QK_GRAVE_ESCAPE:
             keylight_manager(record, HSV_GOLDENROD, keylocation);
             break;
 #endif
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
index 8d2853e5c2..873a25acde 100644
--- a/keyboards/giabalanai/keymaps/party/keymap.c
+++ b/keyboards/giabalanai/keymaps/party/keymap.c
@@ -297,7 +297,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
@@ -311,7 +311,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* COLEMAK */
   [_COLEMAK] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
         KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
           KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
@@ -755,7 +755,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 #ifdef RGBLIGHT_ENABLE
         case KC_A ... KC_RGUI:                // for QWERTY
-        case KC_GESC:
+        case QK_GRAVE_ESCAPE:
         case ADJ_EIS:
         case MO_ADJ:
         case SHIF_UP:
diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c
index 5bd2ebf5b8..dbb575f89d 100644
--- a/keyboards/giabalanai/keymaps/via/keymap.c
+++ b/keyboards/giabalanai/keymaps/via/keymap.c
@@ -164,13 +164,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
             KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
-    KC_GESC,
+    QK_GESC,
       _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_MINS, KC_BSPC,   _______,
     KC_LCTL, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, KC_ENT,
       KC_LALT, _________________QWERTY_L3_________________, KC_N, KC_M, KC_COMM, KC_DOT, KC_SPC, KC_RSFT
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
index f7dc18a4c8..a9da9c82e7 100644
--- a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
@@ -165,13 +165,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* QWERTY */
   [_QWERTY] = LAYOUT_wrapper_giabarinaix2(
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
             KC_LCTL, KC_LGUI, KC_LALT, KC_LNG2, KC_SPC,  KC_SPC, KC_SPC, KC_SPC, KC_LNG1, KC_RALT,  KC_RGUI, KC_RCTL,
 
-    KC_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
+    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
         KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
           KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
index e331d60c4e..7b84bca595 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+  QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_PGUP,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,            KC_PGDN,
   KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
index 365c7578cc..38f89379e6 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [0] = LAYOUT(
-  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+  QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_PGUP,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,            KC_PGDN,
   KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
index 61072536d7..03cdcfc10e 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+  QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_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_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,
diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c
index 53918fc1e1..6146e7817f 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [0] = LAYOUT(
-  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+  QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_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_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,
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
index 37ca812e21..81dd960377 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
+  QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
index 5db6cd1945..0df96f3ec1 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
+  QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
index 3c13fb8337..eae862138c 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
+  QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,            KC_P4,    KC_P5,    KC_P6,
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
index 83dc1f21d3..0ddc19b954 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
+  QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
   KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,            KC_P4,    KC_P5,    KC_P6,
diff --git a/keyboards/gray_studio/cod67/keymaps/default/keymap.c b/keyboards/gray_studio/cod67/keymaps/default/keymap.c
index b84e073f72..f9167deef8 100644
--- a/keyboards/gray_studio/cod67/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/cod67/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
-		KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+		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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT,
 		KC_LSFT, KC_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,
diff --git a/keyboards/gray_studio/cod67/keymaps/via/keymap.c b/keyboards/gray_studio/cod67/keymaps/via/keymap.c
index caca2febfa..42e0365137 100644
--- a/keyboards/gray_studio/cod67/keymaps/via/keymap.c
+++ b/keyboards/gray_studio/cod67/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
+        QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
         KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT, _______,  KC_ENT,
         KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,  KC_DEL,
diff --git a/keyboards/gray_studio/space65/keymaps/conor/keymap.c b/keyboards/gray_studio/space65/keymaps/conor/keymap.c
index 1ae64e1114..975c0c6072 100644
--- a/keyboards/gray_studio/space65/keymaps/conor/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/conor/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_HOME] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
diff --git a/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c b/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
index 943d5eae4c..be9d9b283c 100644
--- a/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
@@ -25,7 +25,7 @@ enum keyboard_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL, KC_HOME,
+        QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
         KC_GRV, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,      KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 [_FNM] = LAYOUT(
-        KC_GESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_VOLD, KC_VOLU, KC_MFFD,
+        QK_GESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_VOLD, KC_VOLU, KC_MFFD,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD,  RGB_SPI, KC_TRNS, KC_TRNS, QK_BOOT, KC_MRWD,
         KC_TRNS, RGB_M_P, RGB_M_G, RGB_M_K, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS,
         AG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRID,  KC_BRIU, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
diff --git a/keyboards/gray_studio/space65/keymaps/via/keymap.c b/keyboards/gray_studio/space65/keymaps/via/keymap.c
index 0398f8116b..302c25a4b3 100644
--- a/keyboards/gray_studio/space65/keymaps/via/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c b/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c
index 7182bd512e..479d822e11 100644
--- a/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c b/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c
index 22b29a1672..77e91438df 100644
--- a/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c
+++ b/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
diff --git a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
index f9c171f1ae..884efb7b96 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
+++ b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
@@ -201,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
     */
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        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,
diff --git a/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c
index 7182bd512e..479d822e11 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
diff --git a/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c
index 8f08cfe070..be14b55e20 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c
+++ b/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
         KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
diff --git a/keyboards/han60/keymaps/default/keymap.c b/keyboards/han60/keymaps/default/keymap.c
index 4b80f8258c..54840b7df4 100644
--- a/keyboards/han60/keymaps/default/keymap.c
+++ b/keyboards/han60/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* BASE */
     [0] = LAYOUT_all(
-     KC_GESC,  KC_1,     KC_2,    KC_3,     KC_4,     KC_5,    KC_6,    KC_7,      KC_8,    KC_9,     KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,  
+     QK_GESC,  KC_1,     KC_2,    KC_3,     KC_4,     KC_5,    KC_6,    KC_7,      KC_8,    KC_9,     KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,  
      KC_TAB,   KC_Q,     KC_W,    KC_E,     KC_R,     KC_T,    KC_Y,    KC_U,      KC_I,    KC_O,     KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,
      KC_CAPS,  KC_A,     KC_S,    KC_D,     KC_F,     KC_G,    KC_H,    KC_J,      KC_K,    KC_L,     KC_SCLN, KC_QUOT,            KC_ENT,   
 	 KC_LSFT,  KC_GRAVE, KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,    KC_N,      KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,    KC_SLSH,  	
diff --git a/keyboards/han60/keymaps/via/keymap.c b/keyboards/han60/keymaps/via/keymap.c
index 64a8046a1b..fb37814093 100644
--- a/keyboards/han60/keymaps/via/keymap.c
+++ b/keyboards/han60/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* LAYER 1 */
     [0] = LAYOUT_all(
-     KC_GESC,  KC_1,     KC_2,    KC_3,     KC_4,     KC_5,    KC_6,    KC_7,      KC_8,    KC_9,     KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,  
+     QK_GESC,  KC_1,     KC_2,    KC_3,     KC_4,     KC_5,    KC_6,    KC_7,      KC_8,    KC_9,     KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,  
      KC_TAB,   KC_Q,     KC_W,    KC_E,     KC_R,     KC_T,    KC_Y,    KC_U,      KC_I,    KC_O,     KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,
      KC_CAPS,  KC_A,     KC_S,    KC_D,     KC_F,     KC_G,    KC_H,    KC_J,      KC_K,    KC_L,     KC_SCLN, KC_QUOT,            KC_ENT,   
 	 KC_LSFT,  KC_GRAVE, KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,    KC_N,      KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,    KC_SLSH,  	
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
index f063329104..cc33c93b23 100644
--- a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
+++ b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *  - Press JKLM for Windows + L (Session lock)
    */
   [0] = LAYOUT( \
-    KC_GESC        , KC_1   , KC_2   , KC_3 , KC_4 , KC_5 , KC_6  , KC_7 , KC_8 , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
+    QK_GESC        , KC_1   , KC_2   , KC_3 , KC_4 , KC_5 , KC_6  , KC_7 , KC_8 , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
     KC_TAB         , KC_Q   , KC_W   , KC_E , KC_R , KC_T , KC_Y  , KC_U , KC_I , KC_O   , KC_P   , KC_LBRC, KC_RBRC,
     MO(1)          , KC_A   , KC_S   , KC_D , KC_F , KC_G , KC_H  , KC_J , KC_K , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
     KC_LSPO        , KC_NUBS, KC_Z   , KC_X , KC_C , KC_V , KC_B  , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC         ,
diff --git a/keyboards/handwired/colorlice/keymaps/default/keymap.c b/keyboards/handwired/colorlice/keymaps/default/keymap.c
index 2360c7d46e..1b17cce81a 100644
--- a/keyboards/handwired/colorlice/keymaps/default/keymap.c
+++ b/keyboards/handwired/colorlice/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_alice_split_bs(
-        RGB_TOG,    KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,       KC_9,   KC_0,       KC_MINS,    KC_EQL, KC_GRV, KC_BSLS,
+        RGB_TOG,    QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,       KC_9,   KC_0,       KC_MINS,    KC_EQL, KC_GRV, KC_BSLS,
         RGB_MOD,    KC_TAB,     KC_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/handwired/cyberstar/keymaps/default/keymap.c b/keyboards/handwired/cyberstar/keymaps/default/keymap.c
index 04ce749c44..67b5639c12 100644
--- a/keyboards/handwired/cyberstar/keymaps/default/keymap.c
+++ b/keyboards/handwired/cyberstar/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_F1,    KC_GESC, KC_1, KC_2,    KC_3,    KC_4,   KC_5,   KC_6, KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS, KC_HOME, KC_PGUP,
+    KC_F1,    QK_GESC, KC_1, KC_2,    KC_3,    KC_4,   KC_5,   KC_6, KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS, KC_HOME, KC_PGUP,
     KC_F2,    KC_TAB,  KC_Q, KC_W,    KC_E,    KC_R,   KC_T,   KC_Y, KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL, KC_END,  KC_PGDN,
     KC_F3,    KC_CAPS, KC_A, KC_S,    KC_D,    KC_F,   KC_G,   KC_H, KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_F4,    KC_LSFT, KC_Z, KC_X,    KC_C,    KC_V,   KC_B,   KC_N, KC_M,   KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1),                     KC_UP,
diff --git a/keyboards/handwired/cyberstar/keymaps/via/keymap.c b/keyboards/handwired/cyberstar/keymaps/via/keymap.c
index 1c2e1bf256..2577c2ac80 100644
--- a/keyboards/handwired/cyberstar/keymaps/via/keymap.c
+++ b/keyboards/handwired/cyberstar/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_F1,    KC_GESC, KC_1, KC_2,    KC_3,    KC_4,   KC_5,   KC_6, KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS, KC_HOME, KC_PGUP,
+    KC_F1,    QK_GESC, KC_1, KC_2,    KC_3,    KC_4,   KC_5,   KC_6, KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS, KC_HOME, KC_PGUP,
     KC_F2,    KC_TAB,  KC_Q, KC_W,    KC_E,    KC_R,   KC_T,   KC_Y, KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL, KC_END,  KC_PGDN,
     KC_F3,    KC_CAPS, KC_A, KC_S,    KC_D,    KC_F,   KC_G,   KC_H, KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_F4,    KC_LSFT, KC_Z, KC_X,    KC_C,    KC_V,   KC_B,   KC_N, KC_M,   KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1),                     KC_UP,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
index 0872edcc05..d118eec92a 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_5x6(
-     KC_GESC, KC_1 , KC_2  ,  KC_3  , KC_4  , KC_5  ,         KC_6     , KC_7  , KC_8  , KC_9 , KC_0  ,KC_RBRC,
+     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,_______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
index 7928153f9e..2e79040bf0 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -38,7 +38,7 @@ LAYOUT_5x6(                       \
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [L_QWER] = LAYOUT_uqs(
-     KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
      KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
      KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
      KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
diff --git a/keyboards/handwired/freoduo/keymaps/default/keymap.c b/keyboards/handwired/freoduo/keymaps/default/keymap.c
index 1f24469a7a..b4cb619d92 100644
--- a/keyboards/handwired/freoduo/keymaps/default/keymap.c
+++ b/keyboards/handwired/freoduo/keymaps/default/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT(
-  KC_GESC,            KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+  QK_GESC,            KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
   KC_TAB,             KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,
   LT(_LOWER,KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, LT(_RAISE, KC_QUOT),
   KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   RSFT_T(KC_SLSH),
diff --git a/keyboards/handwired/jn68m/keymaps/default/keymap.c b/keyboards/handwired/jn68m/keymaps/default/keymap.c
index f0ed52340c..295aa63365 100644
--- a/keyboards/handwired/jn68m/keymaps/default/keymap.c
+++ b/keyboards/handwired/jn68m/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_INS, KC_PGUP,
+    QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_INS, KC_PGUP,
     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL, KC_PGDN,
     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT,
 	  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          KC_RSFT,                   KC_UP,
diff --git a/keyboards/handwired/lagrange/keymaps/default/keymap.c b/keyboards/handwired/lagrange/keymaps/default/keymap.c
index db624e9be0..d5f73a8fed 100644
--- a/keyboards/handwired/lagrange/keymaps/default/keymap.c
+++ b/keyboards/handwired/lagrange/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
                            /* Left hand */                                                                                     /* Right hand */
 
-        KC_GESC,  KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    TT(1),
+        QK_GESC,  KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    TT(1),
         KC_TAB,   KC_Q,    KC_W,    KC_E,     KC_R,     KC_T,                                                KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSLS,
         KC_CAPS,  KC_A,    KC_S,    KC_D,     KC_F,     KC_G,                                                KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
         KC_LSFT,  KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,                                                KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_RSFT,
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
index ec4503c67c..f75bf56048 100644
--- a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
@@ -43,7 +43,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = {
-        {KC_GESC,  KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     SC(BSPC) },
+        {QK_GESC,  KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     SC(BSPC) },
         {ED(TAB),  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     XXXXXXX,  NM(SCLN) },
         {LS(QUOT), XXXXXXX,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  FK(DOT),  RS(SLSH) },
         {LC(ESC),  XXXXXXX,  LG(LBRC), LA(RBRC), NM(BSPC), XXXXXXX,  XXXXXXX,  SM(SPC),  XXXXXXX,  RA(MINS), RG(EQL),  RC(ENT)  }
diff --git a/keyboards/handwired/p65rgb/keymaps/default/keymap.c b/keyboards/handwired/p65rgb/keymaps/default/keymap.c
index bfb62edd8e..1467ff5336 100644
--- a/keyboards/handwired/p65rgb/keymaps/default/keymap.c
+++ b/keyboards/handwired/p65rgb/keymaps/default/keymap.c
@@ -18,13 +18,13 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT( /* Base */
-        KC_GESC,        KC_1,       KC_2,       KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,       KC_9,   KC_0,       KC_MINS,    KC_EQL,     KC_GRV,     KC_BSLS, KC_DEL,
+        QK_GESC,        KC_1,       KC_2,       KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,       KC_9,   KC_0,       KC_MINS,    KC_EQL,     KC_GRV,     KC_BSLS, KC_DEL,
         KC_TAB,         KC_Q,       KC_W,       KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,       KC_O,   KC_P,       KC_LBRC,    KC_RBRC,    KC_BSPC,    KC_PGUP,
 		CTL_T(KC_CAPS), KC_A,       KC_S,       KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,       KC_L,   KC_SCLN,    KC_QUOT,    KC_ENT,     KC_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,      TO(1),
 		KC_LCTL,        KC_LGUI,    KC_LALT,                            KC_SPC,         MO(1),      KC_APP,             KC_LEFT,    KC_DOWN,    KC_RIGHT),
     [1] = LAYOUT( /* FN */
-        KC_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_TRNS, KC_TRNS,   KC_INS,
+        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_TRNS, KC_TRNS,   KC_INS,
         KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,    KC_HOME,
         CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, EE_CLR,   KC_END,
         KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
diff --git a/keyboards/handwired/pill60/keymaps/default/keymap.c b/keyboards/handwired/pill60/keymaps/default/keymap.c
index 38c5556fe2..e7a74fc3c5 100644
--- a/keyboards/handwired/pill60/keymaps/default/keymap.c
+++ b/keyboards/handwired/pill60/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT(
         KC_F1,
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
         KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_BSPC,
         KC_LCTL,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,
         KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT, MO(_FL),
diff --git a/keyboards/handwired/split65/keymaps/default/keymap.c b/keyboards/handwired/split65/keymaps/default/keymap.c
index acb9b679eb..ba5eed862c 100644
--- a/keyboards/handwired/split65/keymaps/default/keymap.c
+++ b/keyboards/handwired/split65/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T,       KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_DEL,
         KC_LCTL, KC_A,    KC_S, KC_D, KC_F, KC_G,       KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
         KC_LSFT, 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,
diff --git a/keyboards/handwired/split65/keymaps/via/keymap.c b/keyboards/handwired/split65/keymaps/via/keymap.c
index acb9b679eb..ba5eed862c 100644
--- a/keyboards/handwired/split65/keymaps/via/keymap.c
+++ b/keyboards/handwired/split65/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T,       KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_DEL,
         KC_LCTL, KC_A,    KC_S, KC_D, KC_F, KC_G,       KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
         KC_LSFT, 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,
diff --git a/keyboards/handwired/swiftrax/nodu/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/nodu/keymaps/default/keymap.c
index 79d5da8ea6..341932fddf 100644
--- a/keyboards/handwired/swiftrax/nodu/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/nodu/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_60_ansi_split_bs_rshift(
-    KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
+    QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
     KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,
diff --git a/keyboards/handwired/swiftrax/nodu/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/nodu/keymaps/via/keymap.c
index 4b84c1016e..db3976462f 100644
--- a/keyboards/handwired/swiftrax/nodu/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/nodu/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_60_ansi_split_bs_rshift(
-    KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
+    QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL,
     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
     KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,
diff --git a/keyboards/handwired/symmetry60/keymaps/default/keymap.c b/keyboards/handwired/symmetry60/keymaps/default/keymap.c
index 6960698951..79f1a04543 100644
--- a/keyboards/handwired/symmetry60/keymaps/default/keymap.c
+++ b/keyboards/handwired/symmetry60/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_ortho_5x14(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT, 
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
diff --git a/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c b/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c
index c4e4408f9e..d7ca30798b 100644
--- a/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c
+++ b/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BASE] = LAYOUT(
-KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,  KC_ESC,
+QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,  KC_ESC,
 KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,   KC_RBRC,  KC_BSLS,  KC_INS,
 KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,             KC_ENT,   KC_DEL,
 KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,  KC_UP,
diff --git a/keyboards/hhkb/ansi/keymaps/brett/keymap.c b/keyboards/hhkb/ansi/keymaps/brett/keymap.c
index 1201146b00..3b5808dd1c 100644
--- a/keyboards/hhkb/ansi/keymaps/brett/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/brett/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
 	[BASE] = LAYOUT(
-    KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
+    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,
     TAB_MOUSE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
     CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, PROG_SCLN, KC_QUOT, KC_ENT,
     KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(HHKB),
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 |------+------+----------------------------+------+------|
     */
 	[PROG] = LAYOUT(
-    KC_GESC, LCA(KC_F1), LCA(KC_F2), LCA(KC_F3), LCA(KC_F4), LCA(KC_F5), LCA(KC_F6), LCA(KC_F7), LCA(KC_F8), LCA(KC_F9), LCA(KC_F10), LCA(KC_F11), LCA(KC_F12), KC_TRNS, KC_TRNS,
+    QK_GESC, LCA(KC_F1), LCA(KC_F2), LCA(KC_F3), LCA(KC_F4), LCA(KC_F5), LCA(KC_F6), LCA(KC_F7), LCA(KC_F8), LCA(KC_F9), LCA(KC_F10), LCA(KC_F11), LCA(KC_F12), KC_TRNS, KC_TRNS,
     KC_TRNS, FAT_ARROW, KC_AT, BIND, BIND_FLIPPED, OR, CONCAT, ALT, APPLY, FLAP, PIPE, VOID_LEFT, VOID_RIGHT, KC_TRNS,
     TG(MOUSE), SKINNY_ARROW, KC_ASTR, MAP, MAP_FLIPPED, AND, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, DOUBLE_COLON, KC_GRV, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, REVERSE_ARROW, SKINNY_ARROW, CONCAT, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c b/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c
index 68e23b45df..4f0451f7a9 100644
--- a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c
@@ -5,7 +5,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT( //  default layer
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_RBRC, KC_GRV,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_RBRC, KC_GRV,
         KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,    KC_P,     KC_LBRC, KC_NUHS, KC_BSPC,
         KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN,  KC_QUOT,          KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, KC_NUBS,
diff --git a/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c b/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
index 5a1cf967b2..61688d399a 100644
--- a/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c
@@ -2,11 +2,11 @@
 #include "tominabox1.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, TD(TD_SFT_CPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2)),
+	[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_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, TD(TD_SFT_CPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2)),
 
 	[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_CAPS, KC_MFFD, 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_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[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, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS),
 
-    [3] = LAYOUT(KC_GESC, KC_EXLM, KC_EML, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGDN, KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_TRNS)
+    [3] = LAYOUT(QK_GESC, KC_EXLM, KC_EML, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGDN, KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_TRNS)
 };
diff --git a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c b/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
index d14e2fdd33..4e89c9290f 100644
--- a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   /* Layer 0: Qwerty */
   [_QW] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL ,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL ,
     FN_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT ,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(_FL),
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   /* Layer 1: Dvorak */
   [_DV] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
     FN_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSPC,
     KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_ENT,
     KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,             KC_RSFT, MO(_FL),
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   /* Layer 2: Colemak */
   [_CM] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL ,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL ,
     FN_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
     KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(_FL),
diff --git a/keyboards/hineybush/physix/keymaps/via/keymap.c b/keyboards/hineybush/physix/keymaps/via/keymap.c
index 42387dc251..34c76c3cd4 100644
--- a/keyboards/hineybush/physix/keymaps/via/keymap.c
+++ b/keyboards/hineybush/physix/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_bksp_275_rspace(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_ENT,                    KC_PGDN,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/hnahkb/vn66/keymaps/default/keymap.c b/keyboards/hnahkb/vn66/keymaps/default/keymap.c
index 6b5bb083d3..40f7938ef5 100644
--- a/keyboards/hnahkb/vn66/keymaps/default/keymap.c
+++ b/keyboards/hnahkb/vn66/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT_all( /* Base */
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,         KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,
diff --git a/keyboards/hp69/keymaps/via/keymap.c b/keyboards/hp69/keymaps/via/keymap.c
index 81901dfe5e..69b5209072 100644
--- a/keyboards/hp69/keymaps/via/keymap.c
+++ b/keyboards/hp69/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,    KC_MEDIA_PLAY_PAUSE,  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_BSLS, KC_GRV,    KC_MEDIA_PLAY_PAUSE,  KC_VOLU,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,        KC_MUTE,  KC_VOLD,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        MO(1),     KC_UP,
diff --git a/keyboards/hs60/v1/keymaps/ansi/keymap.c b/keyboards/hs60/v1/keymaps/ansi/keymap.c
index 9155aaa741..3d52fe4d52 100644
--- a/keyboards/hs60/v1/keymaps/ansi/keymap.c
+++ b/keyboards/hs60/v1/keymaps/ansi/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/hs60/v1/keymaps/default/keymap.c b/keyboards/hs60/v1/keymaps/default/keymap.c
index a748e3e324..5059aabe20 100644
--- a/keyboards/hs60/v1/keymaps/default/keymap.c
+++ b/keyboards/hs60/v1/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/hs60/v2/ansi/keymaps/default/keymap.c b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
index 359e0ccf17..27cb8d8bf6 100644
--- a/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
index 5c2fd1f273..13fb7f005b 100644
--- a/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,          KC_RALT, TD_TWIN, MO(_FN2_60),   TD_TCTL),
 
   [_DEFAULT] = LAYOUT_60_ansi(
-	KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+	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,
diff --git a/keyboards/hs60/v2/ansi/keymaps/via/keymap.c b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
index 359e0ccf17..27cb8d8bf6 100644
--- a/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/hs60/v2/iso/keymaps/default/keymap.c b/keyboards/hs60/v2/iso/keymaps/default/keymap.c
index 984175788f..58c5d29310 100644
--- a/keyboards/hs60/v2/iso/keymaps/default/keymap.c
+++ b/keyboards/hs60/v2/iso/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/hs60/v2/iso/keymaps/via/keymap.c b/keyboards/hs60/v2/iso/keymaps/via/keymap.c
index 984175788f..58c5d29310 100644
--- a/keyboards/hs60/v2/iso/keymaps/via/keymap.c
+++ b/keyboards/hs60/v2/iso/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c b/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c
index 81abccb313..42b959f090 100644
--- a/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c
+++ b/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c
@@ -39,7 +39,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_60_iso( /* Windows ISO layout */
-    KC_GESC,    KC_1,       KC_2,      KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,        KC_0,       KC_MINS,    KC_EQL,     KC_BSPC,\
+    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_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_TAB,     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,\
diff --git a/keyboards/ibnuda/gurindam/keymaps/default/keymap.c b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c
index bbbd4a2c2a..89cc729a61 100644
--- a/keyboards/ibnuda/gurindam/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
     KC_TAB,  KC_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,                    MO(1),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/ibnuda/gurindam/keymaps/via/keymap.c b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c
index 1cbce827af..9e50d24720 100644
--- a/keyboards/ibnuda/gurindam/keymaps/via/keymap.c
+++ b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, KC_PGUP,
     KC_TAB,  KC_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,                    MO(1),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
index eac16f142a..a2483eae53 100644
--- a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_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_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),
diff --git a/keyboards/idb/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/default/keymap.c
index a05fbd42c7..1519608659 100644
--- a/keyboards/idb/idb_60/keymaps/default/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_wkl_split_rshift(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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, MO(1),
diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
index bda744bef3..23649e791b 100644
--- a/keyboards/idb/idb_60/keymaps/pngu/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
-        KC_GESC,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,
+        QK_GESC,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_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),
diff --git a/keyboards/idb/idb_60/keymaps/via/keymap.c b/keyboards/idb/idb_60/keymaps/via/keymap.c
index a05fbd42c7..1519608659 100644
--- a/keyboards/idb/idb_60/keymaps/via/keymap.c
+++ b/keyboards/idb/idb_60/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_wkl_split_rshift(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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, MO(1),
diff --git a/keyboards/idobao/id42/keymaps/default/keymap.c b/keyboards/idobao/id42/keymaps/default/keymap.c
index 080ab21ac5..efef7d7183 100644
--- a/keyboards/idobao/id42/keymaps/default/keymap.c
+++ b/keyboards/idobao/id42/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
      */
     [0] = LAYOUT(
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        QK_GESC, KC_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_RSFT, KC_UP,   KC_DEL,
         KC_LCTL, KC_LGUI, KC_LALT,          SPC_FN2,          FN_MO13,                   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/idobao/id42/keymaps/idobao/keymap.c b/keyboards/idobao/id42/keymaps/idobao/keymap.c
index 27f8384d75..e4dd411df2 100644
--- a/keyboards/idobao/id42/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id42/keymaps/idobao/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
      */
     [0] = LAYOUT(
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        QK_GESC, KC_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_RSFT, KC_UP,   KC_DEL,
         KC_LCTL, KC_LGUI, KC_LALT,          SPC_FN2,          FN_MO13,                   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/idobao/id42/keymaps/via/keymap.c b/keyboards/idobao/id42/keymaps/via/keymap.c
index 61e79622d3..6f0e8534b5 100644
--- a/keyboards/idobao/id42/keymaps/via/keymap.c
+++ b/keyboards/idobao/id42/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴───┴────┴─────────┴─────────┘ └───┴───┴───┘
      */
     [0] = LAYOUT(
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        QK_GESC, KC_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_RSFT, KC_UP,   KC_DEL,
         KC_LCTL, KC_LGUI, KC_LALT,          SPC_FN2,          FN_MO13,                   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/idobao/id61/keymaps/default/keymap.c b/keyboards/idobao/id61/keymaps/default/keymap.c
index 3d6fe4232f..0476f18024 100644
--- a/keyboards/idobao/id61/keymaps/default/keymap.c
+++ b/keyboards/idobao/id61/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
      */
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c
index 8315d1498d..e670ca7b3e 100644
--- a/keyboards/idobao/id61/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id61/keymaps/idobao/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
      */
     [_BASE] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_BSPC,
+        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,
         SK_LT1C, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KB_RSFT,
diff --git a/keyboards/idobao/id61/keymaps/via/keymap.c b/keyboards/idobao/id61/keymaps/via/keymap.c
index 6935194df8..dfd6441ed6 100644
--- a/keyboards/idobao/id61/keymaps/via/keymap.c
+++ b/keyboards/idobao/id61/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
      */
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/idobao/id63/keymaps/default/keymap.c b/keyboards/idobao/id63/keymaps/default/keymap.c
index 5824ecc995..c6ad7e5abf 100644
--- a/keyboards/idobao/id63/keymaps/default/keymap.c
+++ b/keyboards/idobao/id63/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
      */
     [0] = LAYOUT_60_ansi_arrow(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index 77a42f25ae..9fd4e1110b 100644
--- a/keyboards/idobao/id63/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
      */
     [_BASE] = LAYOUT_60_ansi_arrow(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
         SK_LT1C, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/keyboards/idobao/id63/keymaps/via/keymap.c b/keyboards/idobao/id63/keymaps/via/keymap.c
index 5024df62a8..305d09caae 100644
--- a/keyboards/idobao/id63/keymaps/via/keymap.c
+++ b/keyboards/idobao/id63/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
      */
     [0] = LAYOUT_60_ansi_arrow(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index 48745856b7..3479be574e 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [_BASE] = LAYOUT_65_ansi_blocker(
-        KC_GESC,  KC_1,     KC_2,    KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_BSPC,   KC_GRAVE, \
+        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, \
diff --git a/keyboards/idobao/id75/keymaps/revok75/keymap.c b/keyboards/idobao/id75/keymaps/revok75/keymap.c
index 3c23bfff5a..a2e3fce38f 100644
--- a/keyboards/idobao/id75/keymaps/revok75/keymap.c
+++ b/keyboards/idobao/id75/keymaps/revok75/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 */
 
 	[_QW_M] = LAYOUT_ortho_5x15( /* QWERTY MAC*/
-		KC_GESC,  KC_1,     KC_2,     KC_3,     	KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,     LGUI(KC_X),  KC_BSPC, \
+		QK_GESC,  KC_1,     KC_2,     KC_3,     	KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,     LGUI(KC_X),  KC_BSPC, \
 		KC_TAB,   KC_Q,     KC_W,     KC_E,     	KC_R,     	KC_T, 	KC_Y,   KC_U,   				KC_I,     KC_O,     KC_P,     KC_LCBR,    KC_RCBR,    LGUI(KC_C),  LGUI(KC_V), \
 		KC_CAPS,  KC_A,     KC_S,     KC_D,     	KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    LGUI(KC_R), KC_NO,       KC_ENT, \
 		KC_LSFT,  KC_Z,     KC_X,     KC_C,     	KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,    KC_RSFT,    KC_UP,       LGUI(KC_S), \
@@ -59,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	  */
 
   [_QW_W] = LAYOUT_ortho_5x15( /* QWERTY WIN*/
-  	KC_GESC,  KC_1,     KC_2,     KC_3,     		KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,     KC_EQL,     LCTL(KC_X),  KC_BSPC, \
+  	QK_GESC,  KC_1,     KC_2,     KC_3,     		KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,     KC_EQL,     LCTL(KC_X),  KC_BSPC, \
   	KC_TAB,   KC_Q,     KC_W,     KC_E,     		KC_R,     	KC_T, 	KC_Y,   KC_U,   				KC_I,     KC_O,     KC_P,     KC_LCBR,     KC_RCBR,    LCTL(KC_C),  LCTL(KC_V), \
   	KC_CAPS,  KC_A,     KC_S,     KC_D,     		KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,     LCTL(KC_R), KC_NO,       KC_ENT, \
   	KC_LSFT,  KC_Z,     KC_X,     KC_C,     		KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,     KC_RSFT,    KC_UP,       LCTL(KC_S), \
-  	KC_LCTL,  KC_LALT,  KC_LGUI,  LCTL(KC_F), 	LCTL(KC_T), KC_SPC, KC_NO,	LCTL(KC_GESC),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,     KC_LEFT,    KC_DOWN,     KC_RGHT \
+  	KC_LCTL,  KC_LALT,  KC_LGUI,  LCTL(KC_F), 	LCTL(KC_T), KC_SPC, KC_NO,	LCTL(QK_GESC),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,     KC_LEFT,    KC_DOWN,     KC_RGHT \
  	),
 
 	/* FUNCTION
diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
index 5fb6b4fcca..c5c1bf7e18 100755
--- a/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v1rgb/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┴───┘
      */
     [0] = LAYOUT_numpad_6x5(
-        KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
+        QK_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
         KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
index cf2799591b..ffb020fc3c 100755
--- a/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v1rgb/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┴───┘
      */
     [_BASE] = LAYOUT_numpad_6x5(
-        KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
+        QK_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
         KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
diff --git a/keyboards/idobao/montex/v2/keymaps/default/keymap.c b/keyboards/idobao/montex/v2/keymaps/default/keymap.c
index b5740daedc..db37bc72c7 100755
--- a/keyboards/idobao/montex/v2/keymaps/default/keymap.c
+++ b/keyboards/idobao/montex/v2/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┴───┘
      */
     [0] = LAYOUT_numpad_6x5(
-        KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
+        QK_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
         KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
diff --git a/keyboards/idobao/montex/v2/keymaps/via/keymap.c b/keyboards/idobao/montex/v2/keymaps/via/keymap.c
index fab29e31a7..5f62688917 100755
--- a/keyboards/idobao/montex/v2/keymaps/via/keymap.c
+++ b/keyboards/idobao/montex/v2/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴───────┴───┴───┘
      */
     [_BASE] = LAYOUT_numpad_6x5(
-        KC_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
+        QK_GESC,   KC_TAB,   KC_F1,   KC_CALC, KC_BSPC,
         KC_LCTL,   KC_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
         KC_LGUI,   KC_P7,    KC_P8,   KC_P9,   KC_PPLS,
         KC_LALT,   KC_P4,    KC_P5,   KC_P6,
diff --git a/keyboards/ilumkb/simpler61/keymaps/default/keymap.c b/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
index 916b7b8168..bd9e605eda 100644
--- a/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
+++ b/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_61_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		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,          MO(1),
 		KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                                    KC_RALT, KC_RGUI,          KC_RCTL
 	),
 	[1] = LAYOUT_61_ansi(
-        KC_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,
+        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,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, QK_BOOT,
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, _______,          _______,
diff --git a/keyboards/ilumkb/simpler61/keymaps/via/keymap.c b/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
index 05dee2143b..643b498445 100644
--- a/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
+++ b/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_61_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		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,          MO(1),
 		KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                                    KC_RALT, KC_RGUI,          KC_RCTL
 	),
 	[1] = LAYOUT_61_ansi(
-        KC_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,
+        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,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, QK_BOOT,
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
 		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, _______,          _______,
diff --git a/keyboards/ilumkb/simpler64/keymaps/default/keymap.c b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
index a81cd58927..bc4b232480 100644
--- a/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
+++ b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_64_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,  MO(1),
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
 	),
 	[1] = LAYOUT_64_ansi(
-        KC_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,
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EE_CLR,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
diff --git a/keyboards/ilumkb/simpler64/keymaps/via/keymap.c b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
index 1affb8c3c0..eac3fac0c8 100644
--- a/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
+++ b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_64_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,  MO(1),
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
 	),
 	[1] = LAYOUT_64_ansi(
-        KC_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,
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EE_CLR,
         _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
diff --git a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
index 27010793d9..b0006a5d4b 100644
--- a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
@@ -31,7 +31,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------------------------------------------------------------'
      */
     [0] = LAYOUT( \
-        KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,KC_NO,KC_BSPC,KC_INS, \
+        QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,KC_NO,KC_BSPC,KC_INS, \
         KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,   KC_BSLS,  KC_DEL, \
         MO(1),   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,  KC_ENT,    KC_PGUP,\
         KC_LSFT, KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,    KC_RSFT, KC_UP,  KC_PGDN,\
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
index 55afa96a52..b4261696ad 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_QWERTY] = LAYOUT_ansi(
-KC_F1, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+KC_F1, QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
 KC_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_DEL,
 KC_F3, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,      KC_HOME,
 KC_F4, KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
index 31a664304c..4a4b37151d 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
     [_QWERTY] = LAYOUT_ansi_1u(
-        KC_F1, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        KC_F1, QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_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_DEL,
         KC_F3, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,      KC_HOME,
         KC_F4, KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
diff --git a/keyboards/jagdpietr/drakon/keymaps/default/keymap.c b/keyboards/jagdpietr/drakon/keymaps/default/keymap.c
index 70ec6845b7..31a65cd359 100644
--- a/keyboards/jagdpietr/drakon/keymaps/default/keymap.c
+++ b/keyboards/jagdpietr/drakon/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ _Lyr2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_Base] = LAYOUT_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,            KC_MUTE,
+        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_MUTE,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,           KC_MPRV, KC_MPLY, 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_MSTP,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/jagdpietr/drakon/keymaps/wkl/keymap.c b/keyboards/jagdpietr/drakon/keymaps/wkl/keymap.c
index 79582353c3..4c5f50cce8 100644
--- a/keyboards/jagdpietr/drakon/keymaps/wkl/keymap.c
+++ b/keyboards/jagdpietr/drakon/keymaps/wkl/keymap.c
@@ -24,7 +24,7 @@ _Lyr2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_Base] = LAYOUT_wkl(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,            KC_MUTE,
+        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_MUTE,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_MPRV, KC_MPLY, 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_MSTP,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/jc65/v32a/keymaps/default/keymap.c b/keyboards/jc65/v32a/keymaps/default/keymap.c
index 2a581ae41d..a8370b4cfb 100644
--- a/keyboards/jc65/v32a/keymaps/default/keymap.c
+++ b/keyboards/jc65/v32a/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSLS,KC_BSPC, KC_INS,
+        QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSLS,KC_BSPC, KC_INS,
          KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,        KC_BSLS, KC_DEL,
         KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,KC_NUHS,         KC_ENT,KC_PGUP,
         KC_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,
diff --git a/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c b/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
index cbb5e8c237..cfe39559e1 100644
--- a/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
+++ b/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
@@ -9,7 +9,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-                 KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSLS,KC_BSPC, KC_INS,
+                 QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSLS,KC_BSPC, KC_INS,
                  KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,        KC_HASH,KC_PGUP,
                  KC_CTES,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,KC_HASH,         KC_ENT,KC_PGDN,
                  KC_LSFT,KC_BSLS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,  KC_UP, KC_END,
diff --git a/keyboards/jc65/v32u4/keymaps/coth/keymap.c b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
index 990d32220b..5bb4920374 100644
--- a/keyboards/jc65/v32u4/keymaps/coth/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-      KC_GESC, KC_1,    KC_2,   KC_3,     KC_4,     KC_5,     KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, KC_INS,
+      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,
diff --git a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
index d02b67a930..358ee72479 100644
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
@@ -19,7 +19,7 @@ const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-      KC_GESC, KC_1,    KC_2,   KC_3,     KC_4,     KC_5,     KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, KC_PSCR,
+      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,
diff --git a/keyboards/jc65/v32u4/keymaps/default/keymap.c b/keyboards/jc65/v32u4/keymaps/default/keymap.c
index c11e5ebeeb..68f75a4ba5 100644
--- a/keyboards/jc65/v32u4/keymaps/default/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-      KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS,
+      QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS,
       KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
       KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
       KC_LSFT, KC_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,
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
index d3b3055b0f..ea3d694f46 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *  *---------------------------------------------------------------*
     */
     [_BL] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC, KC_INS,
+        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,
diff --git a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
index 7e24d2f96b..00068afe95 100644
--- a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-      KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS,
+      QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS,
       KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL,
       MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
       KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c b/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
index e7e907972d..70ae80044d 100644
--- a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-      KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSLS, KC_HOME,
+      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),
diff --git a/keyboards/jels/jels60/keymaps/default/keymap.c b/keyboards/jels/jels60/keymaps/default/keymap.c
index 072ae3e059..084f3d8275 100644
--- a/keyboards/jels/jels60/keymaps/default/keymap.c
+++ b/keyboards/jels/jels60/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 //base layer
 [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+    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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
     KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/jels/jels60/keymaps/via/keymap.c b/keyboards/jels/jels60/keymaps/via/keymap.c
index 072ae3e059..084f3d8275 100644
--- a/keyboards/jels/jels60/keymaps/via/keymap.c
+++ b/keyboards/jels/jels60/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 //base layer
 [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+    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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
     KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/jm60/keymaps/default/keymap.c b/keyboards/jm60/keymaps/default/keymap.c
index f4d444cc75..4488721a77 100644
--- a/keyboards/jm60/keymaps/default/keymap.c
+++ b/keyboards/jm60/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'
      */
     [_BL] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/jm60/keymaps/poker3/keymap.c b/keyboards/jm60/keymaps/poker3/keymap.c
index fcd4854396..ee1583eab7 100644
--- a/keyboards/jm60/keymaps/poker3/keymap.c
+++ b/keyboards/jm60/keymaps/poker3/keymap.c
@@ -7,7 +7,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         MO(_FL), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/kapcave/arya/keymaps/default/keymap.c b/keyboards/kapcave/arya/keymaps/default/keymap.c
index b8300b1f4a..4e20956789 100644
--- a/keyboards/kapcave/arya/keymaps/default/keymap.c
+++ b/keyboards/kapcave/arya/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_alice_split_bs(
-        KC_ESC,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
+        KC_ESC,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN,    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/kapcave/arya/keymaps/via/keymap.c b/keyboards/kapcave/arya/keymaps/via/keymap.c
index 4b98707da7..cdf7f0da81 100644
--- a/keyboards/kapcave/arya/keymaps/via/keymap.c
+++ b/keyboards/kapcave/arya/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* QWERTY */
 	[_BASE] = LAYOUT_alice_split_bs(
-        KC_ESC,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
+        KC_ESC,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN,    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
index 74f68e73ac..589aa78636 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c
@@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                          KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
 		[1] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
index 0fa9788f91..0029103cc8 100644
--- a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c
@@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                          KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
         [1] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
         [2] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
         [3] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,   KC_PGDN,
                          KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
index e9c1ce494b..5b85eb2150 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c
@@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                          KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
 		[1] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
index e9c1ce494b..5b85eb2150 100644
--- a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c
@@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                          KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_DEL,  KC_UP,
                                   KC_LCTL,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,            KC_LEFT,KC_DOWN,    KC_RIGHT),
 		[1] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[2] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
                                         KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD, KC_MNXT),
 		[3] = LAYOUT_all(
-                         KC_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_GRAVE,  KC_PGUP,
+                         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_GRAVE,  KC_PGUP,
                          KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,   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,          EE_CLR,
                          KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_DEL,  KC_VOLU,
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
index bd5ae02a0c..7ad5c5bf17 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
-			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
+			QK_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
index dc762d9e40..e3e93d9c0b 100644
--- a/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/boop65/rgb/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		    KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
 		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
-			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
+			QK_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
diff --git a/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
index a79781da8b..2b4f033f16 100644
--- a/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------------------------------------------------------------------'
      */
 [_L0] = LAYOUT_all(
-  KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, XXXXX, KC_BSPC,        KC_INS,
+  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, XXXXX, KC_BSPC,        KC_INS,
   KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_BSLS,           KC_DEL,
   KC_CAPS,     KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,
   KC_LSFT, XXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXX, KC_UP,
diff --git a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
index 10a907bf01..0bfab45536 100644
--- a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------------------------------------------------------------------'
      */
 [_L0] = LAYOUT_all(
-  KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC,            KC_INS,
+  QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC,            KC_INS,
   KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_BSLS,               KC_DEL,
   KC_CAPS,     KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_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(_L1), KC_UP,
diff --git a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
index 14705cb6ae..4b11bfdb07 100644
--- a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-------------------------------------------------------------------'
      */
 [_L0] = LAYOUT_all(
-  KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC,            KC_INS,
+  QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC,            KC_INS,
   KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_NUHS,               KC_DEL,
   KC_CAPS,     KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,
   KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_L1), KC_UP,
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index 441ce2a079..faf90b624e 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
 [_QWERTY] = LAYOUT(
-  KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BRK,  KC_HOME, \
+  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BRK,  KC_HOME, \
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,  \
   KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP, \
   KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_UP,   KC_PGDN, \
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
index b688bf5a50..53f3b83d3a 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* 0: _QWERTY
      * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
-     * │ KC_GESC │ KC_1    │ KC_2    │ KC_3    │ KC_4    │ KC_5    │ KC_6    │ KC_7    │ KC_8    │ KC_9    │ KC_0    │ KC_MINS │ KC_EQL  │    KC_BSPC (2)    │ KC_DEL  │
+     * │ 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 │
      * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────────┼─────────┤
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
      */
     [_QWERTY] = LAYOUT_all(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL,
+        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),
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
index 72afb69f0b..b1bdefb4d4 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------┘   └-------------+------´
    */
     [0] = LAYOUT_65_ansi_blocker( /* Base */
-        KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
+        QK_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
         KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_END, 
         CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGUP,
         KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  MO(2),             KC_UP,     KC_PGDN,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [2] = LAYOUT_65_ansi_blocker( /* MO(2) - RShift */
-        KC_GESC,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
+        QK_GESC,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
         LCTL(KC_L),    _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
         _______,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
         _______,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
index ecf58746a5..d00b74f7b6 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
@@ -3,13 +3,13 @@
 #define _LAYER1 1
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[_LAYER0] = LAYOUT_65_ansi_blocker( /* Base */
-			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
+			QK_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
 		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
 		    KC_LCTL,       KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
 		[_LAYER1] = LAYOUT_65_ansi_blocker( /* FN */
-			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
+			QK_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
index 9d6e08074c..163ecb3f7b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@@ -21,14 +21,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_65_ansi_blocker(
-        KC_GESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_DEL,
+        QK_GESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_DEL,
         KC_TAB,   KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
       TT(_LOWER), KC_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_LSFTCAPSWIN, KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
         KC_LCTL,  KC_LGUI,  KC_LALT,                             KC_SPC,                    MO(1),   KC_RCTL,            KC_LEFT, KC_DOWN,   KC_RIGHT
     ),
     [_FN1] = LAYOUT_65_ansi_blocker(
-        KC_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_CALC,
+        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_CALC,
         _______,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_PSCR, KC_SCRL, KC_PAUS, _______,  _______,  _______, QK_BOOT,   KC_HOME,
         KC_CAPS,  RGB_SPI,  RGB_SPD, RGB_VAD,  RGB_VAI, _______, _______, _______, _______, _______, _______,  _______,           EE_CLR,    KC_END,
         KC_LSFT,  RGB_NITE, _______, _______,  _______, _______, KC_NUM,  _______, RGB_TOD, RGB_TOI, KC_MPLY,  _______,           KC_VOLU,   KC_MUTE,
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
index 167d65f09b..c15ab8c85a 100644
--- 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
@@ -1 +1 @@
-{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["KC_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_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"],["KC_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
+{"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
index 1087573b30..10ccb4ca46 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
@@ -1,8 +1,8 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi_blocker(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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),
+	[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(KC_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),
+	[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
index 487ae91385..4fe0b20d9b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
@@ -1 +1 @@
-[["KC_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_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"], ["KC_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
+[["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/mikefightsbears/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
index 3df8b766ed..5f7977e5b5 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi_blocker(
-		KC_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  
+		QK_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  
 		KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, 
 		KC_LCTL, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  	  KC_PGUP, 
 		KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,		 KC_UP,   KC_PGDN, 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
index f6ba07cee1..df4bceed3f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi_blocker( 
-		KC_GESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_PSCR,
+		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( 
-		KC_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,
+		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,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
index 9f852a5569..2ca78f2da7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/keymap.c
@@ -2,13 +2,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT_65_ansi_blocker( 
-			KC_GESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
+			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_RIGHT),
 		[1] = LAYOUT_65_ansi_blocker( 
-			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
+			QK_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
index a970636c41..221cccefb4 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_65_iso_blocker(
-        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,  QK_BOOT, KC_PGDN,
         KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
index b8e5d6567f..d2875c7716 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_65_iso_blocker(
-        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,          KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,  QK_BOOT, KC_PGDN,
         KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
index 79033db590..9746ba09e6 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        QK_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
         KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         LCTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
         KC_LSFT,                  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
index 8e196a1437..7d8599e58b 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘
      */
     [0] = LAYOUT_65_iso(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        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_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,
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/config.h b/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
index 42f68b4358..d5bc8ab7ec 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
@@ -5,6 +5,6 @@
 #define TAPPING_TERM 200
 #define TAPPING_TOGGLE 2
 #define PERMISSIVE_HOLD
-// Fix KC_GESC conflict with Cmd+Alt+Esc on macros
+// 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
index 6282e1b895..fe0080375a 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
@@ -151,7 +151,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 // old R3 capslock, LT(NM_MODE,KC_BSPC),
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [CL] = LAYOUT(
-      KC_GESC, 					 KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,        KC_EQL,     KC_BSLS,    KC_DEL,
+      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),
diff --git a/keyboards/kbdfans/maja/keymaps/default/keymap.c b/keyboards/kbdfans/maja/keymaps/default/keymap.c
index ca392c92c1..fbc0f59304 100755
--- a/keyboards/kbdfans/maja/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/default/keymap.c
@@ -3,13 +3,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
-			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
+			QK_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
 		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,  KC_HOME,
+			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,  QK_BOOT,  KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/kbdfans/maja/keymaps/via/keymap.c b/keyboards/kbdfans/maja/keymaps/via/keymap.c
index 9edfe39fff..5cd783c020 100755
--- a/keyboards/kbdfans/maja/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja/keymaps/via/keymap.c
@@ -3,13 +3,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
-			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
+			QK_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
 		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,  KC_HOME,
+			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,  QK_BOOT,  KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
index e56dc4dfd8..31eeb0cd96 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c
@@ -17,13 +17,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
-			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,KC_DEL,   KC_HOME,
+			QK_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,KC_DEL,   KC_HOME,
 		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,  KC_TRNS,KC_HOME,
+			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,  QK_BOOT,  KC_TRNS,KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
index ba6e64c125..e7a8b5f27a 100755
--- a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c
@@ -17,13 +17,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[0] = LAYOUT( /* Base */
-			KC_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,KC_DEL,   KC_HOME,
+			QK_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,KC_DEL,   KC_HOME,
 		    KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
 			CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
 		    KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  MO(1),   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_RIGHT),
 		[1] = LAYOUT( /* FN */
-			KC_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,  QK_BOOT,  KC_TRNS,KC_HOME,
+			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,  QK_BOOT,  KC_TRNS,KC_HOME,
 		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,  KC_PGUP,
 			CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EE_CLR,   KC_PGDN,
 		    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
index 69613cfbcf..67025b20dc 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------`
  */
 [_QWERTY] = LAYOUT_planck_mit(
-    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+    QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
     KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
     MO(1), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(2),
     KC_LCTL, KC_LGUI, KC_TRNS, KC_LALT, MO(3), KC_SPC, KC_SFTENT, MO(8), KC_TRNS, TO(4), KC_DEL
diff --git a/keyboards/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c
index b6bbff7c89..b19680d0fc 100644
--- a/keyboards/kc60/keymaps/stanleylai/keymap.c
+++ b/keyboards/kc60/keymaps/stanleylai/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Base Default Layer
 // Mac Modifier Layout. Use BootMagic to toggle GUI and ALT positions.
 [_BL] = LAYOUT(
-  KC_GESC,          KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,  KC_EQL,   KC_BSPC, \
+  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(_FL, KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,  KC_NO,    KC_ENT,  \
   KC_LSFT, KC_NO,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,  MO(_FL),  KC_UP,   \
diff --git a/keyboards/kc60se/keymaps/60_ansi/keymap.c b/keyboards/kc60se/keymaps/60_ansi/keymap.c
index 184e24697b..c6d44b1394 100644
--- a/keyboards/kc60se/keymaps/60_ansi/keymap.c
+++ b/keyboards/kc60se/keymaps/60_ansi/keymap.c
@@ -23,7 +23,7 @@ enum my_layers { _BL, _FL };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [_BL] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/keebio/iris/keymaps/blucky/keymap.c b/keyboards/keebio/iris/keymaps/blucky/keymap.c
index 040eb23b2a..5f529703f6 100644
--- a/keyboards/keebio/iris/keymaps/blucky/keymap.c
+++ b/keyboards/keebio/iris/keymaps/blucky/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_EQL,
+      QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_EQL,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
       KC_TAB,   KC_Q,     KC_W,   KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_BSPC,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/keymap.c b/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
index 6caaed18d4..b8c675c968 100644
--- a/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
+++ b/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
@@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+     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,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c b/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
index 956cec115d..ef20fbbea7 100644
--- a/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+     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,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
index 414743e30f..98b2cb3526 100644
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
@@ -4,7 +4,7 @@
 #define _LOWER 1
 #define _RAISE 2
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, LCTL_T(KC_LGUI), KC_Z, KC_X, KC_C, KC_D, KC_V, LGUI(KC_L), MEH_T(KC_MINS), KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LGUI, LT(1, KC_QUOT), KC_SFTENT, KC_SPC, LT(2, KC_BSLS), LALT_T(KC_APP)),
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, LCTL_T(KC_LGUI), KC_Z, KC_X, KC_C, KC_D, KC_V, LGUI(KC_L), MEH_T(KC_MINS), KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LGUI, LT(1, KC_QUOT), KC_SFTENT, KC_SPC, LT(2, KC_BSLS), LALT_T(KC_APP)),
                                                               [1] = LAYOUT(KC_MPLY, KC_NO, KC_DQUO, KC_NO, LALT(KC_F4), KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, QK_BOOT, KC_MPRV, KC_END, KC_UP, KC_HOME, KC_PGUP, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_SAI, RGB_SAD, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P1, KC_P2, KC_P3, KC_PAST, RGB_HUI, RGB_HUD, KC_NO, KC_WBAK, KC_WFWD, KC_WSTP, KC_WREF, KC_NO, LCA(KC_DEL), KC_NUM, KC_P0, KC_P0, KC_PDOT, KC_PENT, RGB_SPI, RGB_SPD, KC_PSCR, KC_NO, KC_LGUI, RGB_TOG, RGB_VAI, RGB_VAD),
                                                               [2] = LAYOUT(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_K, KC_NO, KC_WH_D, KC_MS_U, KC_WH_U, KC_NO, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)};
 
diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index e0be37892d..adbb32ac0d 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+     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,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  
   [_RAISE] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _______, _______, _______, KC_PGUP, _______,                            _______, _______, _______, _______, _______, KC_INS,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/osiris/keymap.c b/keyboards/keebio/iris/keymaps/osiris/keymap.c
index 1356fb8323..0d76268c0f 100644
--- a/keyboards/keebio/iris/keymaps/osiris/keymap.c
+++ b/keyboards/keebio/iris/keymaps/osiris/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT(
   //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     KC_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
+     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,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_COLEMAK] = LAYOUT(
   //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     KC_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
+     QK_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
      KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,                KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSLS,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
index fc39554475..0448862023 100644
--- a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------' `-----------------------------------------'
    */
   [_BASE] = LAYOUT( \
-    KC_GESC ,   KC_1  ,   KC_2    ,   KC_3    ,   KC_4    ,   KC_5    , /**/    KC_6    ,   KC_7    ,   KC_8    ,   KC_9    , KC_0    ,   KC_BSPC , \
+    QK_GESC ,   KC_1  ,   KC_2    ,   KC_3    ,   KC_4    ,   KC_5    , /**/    KC_6    ,   KC_7    ,   KC_8    ,   KC_9    , KC_0    ,   KC_BSPC , \
     KC_TAB  ,   KC_Q  ,   KC_W    ,   KC_E    ,   KC_R    ,   KC_T    , /**/    KC_Y    ,   KC_U    ,   KC_I    ,   KC_O    , KC_P    ,   KC_ENT  , \
     LOW     ,   KC_A  ,   KC_S    ,   KC_D    ,   KC_F    ,   KC_G    , /**/    KC_H    ,   KC_J    ,   KC_K    ,   KC_L    , KC_SCLN ,   KC_QUOT , \
     KC_LSFT ,   KC_Z  ,   KC_X    ,   KC_C    ,   KC_V    ,   KC_B    , /**/    KC_N    ,   KC_M    ,   KC_COMM ,   KC_DOT  , KC_SLSH ,   KC_RSFT , \
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
index 47510a22db..025266669c 100644
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_QWERTY] = LAYOUT( \
-  KC_GESC,  KC_1,        KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  QK_GESC,  KC_1,        KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,   KC_Q,        KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \
   KC_RCTL,  KC_A,        KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT,  KC_Z,        KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c b/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
index bafbbe8cb1..2ace5b3c79 100644
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
@@ -34,7 +34,7 @@ enum custom_keycodes {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_65(
-    KC_GESC,         KC_1,         KC_2,    KC_3,     KC_4,    KC_5,   KC_6,             KC_7,    KC_8,    KC_9,    KC_0,            KC_MINS, KC_EQL,         KC_DEL,  KC_BSPC, KC_HOME, \
+    QK_GESC,         KC_1,         KC_2,    KC_3,     KC_4,    KC_5,   KC_6,             KC_7,    KC_8,    KC_9,    KC_0,            KC_MINS, KC_EQL,         KC_DEL,  KC_BSPC, KC_HOME, \
     KC_TAB,          KC_Q,         KC_W,    KC_E,     KC_R,    KC_T,   KC_Y,             KC_U,    KC_I,    KC_O,    KC_P,            KC_LBRC, KC_RBRC,        KC_BSLS, KC_END, \
     LGUI_T(KC_BSPC), KC_A,         KC_S,    KC_D,     KC_F,    KC_G,   KC_H,             KC_J,    KC_K,    KC_L,    KC_SCLN,         KC_QUOT, LGUI_T(KC_ENT), KC_PGUP, \
     KC_LSFT,         LCTL_T(KC_Z), KC_X,    KC_C,     KC_V,    KC_B,   KC_N,             KC_M,    KC_COMM, KC_DOT,  LCTL_T(KC_SLSH), KC_RSFT, KC_UP,          KC_PGDN, \
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_65(
-    KC_GESC,         KC_F1,        KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F10,          KC_F11,  KC_F12,         KC_DEL,  KC_BSPC, _______, \
+    QK_GESC,         KC_F1,        KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F10,          KC_F11,  KC_F12,         KC_DEL,  KC_BSPC, _______, \
     RGB_TOG,         RGB_MOD,      _______, _______, _______, _______, _______,          _______, _______, _______, _______,         _______, _______,        _______, _______, \
     _______,         _______,      _______, _______, _______, _______, KC_LEFT,          KC_DOWN, KC_UP,   KC_RGHT, _______,         _______, _______,        _______, \
     _______,         _______,      _______, _______, _______, _______, _______,          _______, _______, _______, _______,         _______, _______,        _______, \
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/README.md b/keyboards/keebio/quefrency/keymaps/bramver/README.md
index 76310ed73a..7baaf126e7 100644
--- a/keyboards/keebio/quefrency/keymaps/bramver/README.md
+++ b/keyboards/keebio/quefrency/keymaps/bramver/README.md
@@ -10,7 +10,7 @@ Mostly based off of my other XD75 and Nyquist layouts.
 ```
 /* BASE
  *
- *   KC_GESC , KC_1    , KC_2    , KC_3     , KC_4   , KC_5    , KC_6    ,   /**/  KC_7    , KC_8    , KC_9    , KC_0    , KC_MINS , KC_EQL  , KC_DEL  ,  KC_BSPC  , \
+ *   QK_GESC , KC_1    , KC_2    , KC_3     , KC_4   , KC_5    , KC_6    ,   /**/  KC_7    , KC_8    , KC_9    , KC_0    , KC_MINS , KC_EQL  , KC_DEL  ,  KC_BSPC  , \
  *   KC_TAB  , KC_Q    , KC_W    , KC_E     , KC_R   , KC_T    ,   /**/  KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_LBRC , KC_RBRC , KC_BSLS , \
  *   MO_EMOJ , KC_A    , KC_S    , KC_D     , KC_F   , KC_G    ,   /**/  KC_H    , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_QUOT , KC_ENT  , \
  *   KC_LSFT , KC_Z    , KC_X    , KC_C     , KC_V   , KC_B    ,   /**/  KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT , KC_UP   , \
@@ -40,7 +40,7 @@ Mostly based off of my other XD75 and Nyquist layouts.
 
 /* SYMB
  *
- *   KC_GESC , KC_F1   , KC_F12  , KC_F3   , KC_F4   , KC_F5   , KC_F6   ,   /**/  KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_DEL  ,  KC_BSPC  , \
+ *   QK_GESC , KC_F1   , KC_F12  , KC_F3   , KC_F4   , KC_F5   , KC_F6   ,   /**/  KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_DEL  ,  KC_BSPC  , \
  *   _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
  *   _______ , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC ,   /**/  KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , _______ , _______ ,\
  *   _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
index f995f9bfab..1b8738a1d2 100644
--- a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
@@ -85,7 +85,7 @@ const uint32_t PROGMEM unicode_map[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
-    KC_GESC , KC_1    , KC_2    , KC_3     , KC_4   , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_MINS , KC_EQL  , KC_DEL  ,  KC_BSPC  , \
+    QK_GESC , KC_1    , KC_2    , KC_3     , KC_4   , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_MINS , KC_EQL  , KC_DEL  ,  KC_BSPC  , \
     KC_TAB  , KC_Q    , KC_W    , KC_E     , KC_R   , KC_T    , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_LBRC , KC_RBRC , KC_BSLS , \
     MO_EMOJ , KC_A    , KC_S    , KC_D     , KC_F   , KC_G    , KC_H    , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_QUOT , KC_ENT  , \
     KC_LSFT , KC_Z    , KC_X    , KC_C     , KC_V   , KC_B    , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT , KC_UP   , \
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_SYMB] = LAYOUT(
-    KC_GESC , KC_F1   , KC_F12  , KC_F3   , KC_F4   , KC_F5   , KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_DEL  ,  KC_BSPC  , \
+    QK_GESC , KC_F1   , KC_F12  , KC_F3   , KC_F4   , KC_F5   , KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_DEL  ,  KC_BSPC  , \
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
     _______ , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , _______ , _______ ,\
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , \
diff --git a/keyboards/keebio/quefrency/keymaps/default/keymap.c b/keyboards/keebio/quefrency/keymaps/default/keymap.c
index a152c304a7..afcdd6bd87 100644
--- a/keyboards/keebio/quefrency/keymaps/default/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_65_with_macro(
-    KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+    KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
     KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
     KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
     KC_F7,   KC_F8,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_65_with_macro(
-    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
+    _______, _______, QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
     _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/quefrency/keymaps/default60/keymap.c b/keyboards/keebio/quefrency/keymaps/default60/keymap.c
index f987d9aa4d..dbbd3d0792 100644
--- a/keyboards/keebio/quefrency/keymaps/default60/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default60/keymap.c
@@ -18,7 +18,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_60(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_60(
-    KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC,
     RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/quefrency/keymaps/default65/keymap.c b/keyboards/keebio/quefrency/keymaps/default65/keymap.c
index 481de2aa00..6515544959 100644
--- a/keyboards/keebio/quefrency/keymaps/default65/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default65/keymap.c
@@ -15,7 +15,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_65(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
     KC_CAPS, KC_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,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_65(
-    KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
     RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
index 3bd3ea330f..5e28460f9e 100644
--- a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
@@ -13,7 +13,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_65_with_macro(
-    KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, XXXXXXX, KC_BSPC, KC_HOME, \
+    KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, XXXXXXX, KC_BSPC, KC_HOME, \
     KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,     KC_BSLS,     KC_END, \
     KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,             KC_PGUP, \
     KC_F7,   KC_F8,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT,              KC_UP,   KC_PGDN, \
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_65_with_macro(
-    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, QK_BOOT, \
+    _______, _______, QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, QK_BOOT, \
     _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c b/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
index 530e62eaa4..3ed4718c30 100644
--- a/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_60_iso(
-        KC_GESC, KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  _______, KC_BSPC,
+        QK_GESC, KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  _______, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,     KC_E,    KC_R,    KC_T,                 KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,    KC_LBRC, KC_RBRC,
         MO(_FN1),KC_A,    KC_S,     KC_D,    KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
         KC_LSFT, UK_BSLS, KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,          KC_RSFT, _______,
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
index 32fad3a2cd..c2375514f0 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
@@ -25,7 +25,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_65(
-      KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_INS,
+      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_INS,
       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,
       TT(_LOWER), KC_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_LSFTCAPS, KC_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,
diff --git a/keyboards/keebio/quefrency/keymaps/via/keymap.c b/keyboards/keebio/quefrency/keymaps/via/keymap.c
index ad6cfd84eb..6cf08745f7 100644
--- a/keyboards/keebio/quefrency/keymaps/via/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+    KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
     KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
     KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
     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, KC_UP,   KC_PGDN,
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [1] = LAYOUT_all(
-    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
+    _______, _______, QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
     _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/quefrency/keymaps/yoryer/keymap.c b/keyboards/keebio/quefrency/keymaps/yoryer/keymap.c
index fcfaead5b1..ff67e4b697 100644
--- a/keyboards/keebio/quefrency/keymaps/yoryer/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/yoryer/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ) \
   **/
   [_BASE] = LAYOUT_65(
-    KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,       KC_5,       KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   _______,  KC_BSPC,  KC_HOME,  \
+    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,  \
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1] = LAYOUT_65(
-    KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,      KC_F5,      KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  KC_MUTE,  KC_BRMU,  \
+    QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,      KC_F5,      KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  KC_MUTE,  KC_BRMU,  \
     _______,  _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_BRMD,  \
     _______,  _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,            KC_MPLY,  _______,  \
     _______,            _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______,  KC_VOLU,  _______,  \
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_RGB2] = LAYOUT_65(
-    KC_GESC,    RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW,   RGB_M_SN,   RGB_M_K,  RGB_M_X,  RGB_M_G,  RGB_M_T,  _______,  _______,  _______,  _______,  _______,  RGB_VAI,  \
+    QK_GESC,    RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW,   RGB_M_SN,   RGB_M_K,  RGB_M_X,  RGB_M_G,  RGB_M_T,  _______,  _______,  _______,  _______,  _______,  RGB_VAI,  \
     _______,    _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_VAD,  \
     _______,    _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_SAI,  \
     _______,              _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______,  RGB_HUI,  RGB_SAD,  \
diff --git a/keyboards/keebio/sinc/keymaps/default/keymap.c b/keyboards/keebio/sinc/keymaps/default/keymap.c
index 060bf5dc6c..20c12a4a6e 100644
--- a/keyboards/keebio/sinc/keymaps/default/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_80_with_macro(
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RGB_HUI, RGB_HUD, KC_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,  _______, _______, _______,
+    RGB_HUI, RGB_HUD, 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,  _______, _______, _______,
     RGB_SAI, RGB_SAD, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_VAI, RGB_VAD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/sinc/keymaps/iso/keymap.c b/keyboards/keebio/sinc/keymaps/iso/keymap.c
index dde99bbeb1..f7ad1047bf 100644
--- a/keyboards/keebio/sinc/keymaps/iso/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/iso/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_80_iso_with_macro(
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RGB_HUI, RGB_HUD, KC_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,  _______, _______, _______,
+    RGB_HUI, RGB_HUD, 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,  _______, _______, _______,
     RGB_SAI, RGB_SAD, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     RGB_VAI, RGB_VAD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c b/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c
index c0137a36ab..2bd560c199 100644
--- a/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_80_with_macro_wrapper(
     RGB_TOG,          _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
-    RGB_HUI, RGB_HUD, KC_GESC, _________________FUNC_LEFT_________________,           _________________FUNC_RIGHT________________,  KC_F11,  KC_F12,  _______, _______, KC_MPRV,
+    RGB_HUI, RGB_HUD, QK_GESC, _________________FUNC_LEFT_________________,           _________________FUNC_RIGHT________________,  KC_F11,  KC_F12,  _______, _______, KC_MPRV,
     RGB_SAI, RGB_SAD, RGB_TOG, _______, _______, _______, _______, KC_LPRN,           KC_RPRN, _______, _______, _______, _______, _______, _______, _______, KC_MNXT,
     RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_LCBR,           KC_RCBR, _______, _______, _______, _______, _______,          _______, KC_VOLU,
     RGB_MOD, RGB_RMOD, _______, _______, _______, _______, _______, KC_LBRC,          KC_RBRC, _______, _______, _______, _______, _______, _______, KC_VOLD,
diff --git a/keyboards/keebio/sinc/keymaps/via/keymap.c b/keyboards/keebio/sinc/keymaps/via/keymap.c
index 225e9c07df..3d0b859cb8 100644
--- a/keyboards/keebio/sinc/keymaps/via/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_all(
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RGB_HUI, RGB_HUD, KC_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,  _______, _______, _______,
+    RGB_HUI, RGB_HUD, 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,  _______, _______, _______,
     RGB_SAI, RGB_SAD, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_VAI, RGB_VAD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/wtf60/keymaps/default/keymap.c b/keyboards/keebio/wtf60/keymaps/default/keymap.c
index ffaad13c78..c821482a77 100644
--- a/keyboards/keebio/wtf60/keymaps/default/keymap.c
+++ b/keyboards/keebio/wtf60/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_full_wtf(
-        KC_BSPC, KC_DEL,  KC_EQL,  KC_MINS, KC_0,    KC_9,    KC_8,    KC_7,    KC_6,    KC_5,    KC_4,    KC_3,    KC_2,    KC_1,    KC_GESC,
+        KC_BSPC, KC_DEL,  KC_EQL,  KC_MINS, KC_0,    KC_9,    KC_8,    KC_7,    KC_6,    KC_5,    KC_4,    KC_3,    KC_2,    KC_1,    QK_GESC,
         KC_BSLS,          KC_RBRC, KC_LBRC, KC_P,    KC_O,    KC_I,    KC_U,    KC_Y,    KC_T,    KC_R,    KC_E,    KC_W,    KC_Q,    KC_TAB,
         KC_ENT,  KC_NUHS,          KC_QUOT, KC_SCLN, KC_L,    KC_K,    KC_J,    KC_H,    KC_G,    KC_F,    KC_D,    KC_S,    KC_A,    KC_CAPS,
         MO(1),   KC_RSFT,          KC_SLSH, KC_DOT,  KC_COMM, KC_M,    KC_N,    KC_B,    KC_V,    KC_C,    KC_X,    KC_Z,    KC_NUBS, KC_LSFT,
diff --git a/keyboards/keebio/wtf60/keymaps/via/keymap.c b/keyboards/keebio/wtf60/keymaps/via/keymap.c
index 0c2b5ed35e..7500546ba9 100644
--- a/keyboards/keebio/wtf60/keymaps/via/keymap.c
+++ b/keyboards/keebio/wtf60/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_full_wtf(
-        KC_BSPC, KC_DEL,  KC_EQL,  KC_MINS, KC_0,    KC_9,    KC_8,    KC_7,    KC_6,    KC_5,    KC_4,    KC_3,    KC_2,    KC_1,    KC_GESC,
+        KC_BSPC, KC_DEL,  KC_EQL,  KC_MINS, KC_0,    KC_9,    KC_8,    KC_7,    KC_6,    KC_5,    KC_4,    KC_3,    KC_2,    KC_1,    QK_GESC,
         KC_BSLS,          KC_RBRC, KC_LBRC, KC_P,    KC_O,    KC_I,    KC_U,    KC_Y,    KC_T,    KC_R,    KC_E,    KC_W,    KC_Q,    KC_TAB,
         KC_ENT,  KC_NUHS,          KC_QUOT, KC_SCLN, KC_L,    KC_K,    KC_J,    KC_H,    KC_G,    KC_F,    KC_D,    KC_S,    KC_A,    KC_CAPS,
         MO(1),   KC_RSFT,          KC_SLSH, KC_DOT,  KC_COMM, KC_M,    KC_N,    KC_B,    KC_V,    KC_C,    KC_X,    KC_Z,    KC_NUBS, KC_LSFT,
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c
index aaa096bd84..a6b5fdf416 100755
--- a/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c
+++ b/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
index dde2e84e09..a9b1dec281 100644
--- a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
+++ b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c
index c88a9629a3..16b351a039 100755
--- a/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c
+++ b/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/kegen/gboy/keymaps/default/keymap.c b/keyboards/kegen/gboy/keymaps/default/keymap.c
index f4b5d3c090..575073d3a2 100644
--- a/keyboards/kegen/gboy/keymaps/default/keymap.c
+++ b/keyboards/kegen/gboy/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
         KC_LSFT, KC_SLSH, KC_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,
diff --git a/keyboards/kegen/gboy/keymaps/via/keymap.c b/keyboards/kegen/gboy/keymaps/via/keymap.c
index f4b5d3c090..575073d3a2 100644
--- a/keyboards/kegen/gboy/keymaps/via/keymap.c
+++ b/keyboards/kegen/gboy/keymaps/via/keymap.c
@@ -20,7 +20,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
         KC_LSFT, KC_SLSH, KC_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,
diff --git a/keyboards/keybee/keybee65/keymaps/default/keymap.c b/keyboards/keybee/keybee65/keymaps/default/keymap.c
index bd6609fb92..ef56606692 100644
--- a/keyboards/keybee/keybee65/keymaps/default/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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,
diff --git a/keyboards/keybee/keybee65/keymaps/via/keymap.c b/keyboards/keybee/keybee65/keymaps/via/keymap.c
index 52ae89abee..8bf570a894 100644
--- a/keyboards/keybee/keybee65/keymaps/via/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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,
diff --git a/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c b/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c
index 751e5faa00..461172ca04 100644
--- a/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c
+++ b/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_QWERTY] = LAYOUT_ortho_5x12_2x2u(
         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
         KC_LCTL, KC_LALT, KC_LGUI, LOWER,      KC_ENT,           KC_SPC,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
diff --git a/keyboards/keygem/kg60ansi/keymaps/default/keymap.c b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
index dfa6d6ee8c..827d824b49 100644
--- a/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
+++ b/keyboards/keygem/kg60ansi/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/keygem/kg60ansi/keymaps/via/keymap.c b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
index 9d43b63541..41c38a9c5d 100644
--- a/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
+++ b/keyboards/keygem/kg60ansi/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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, 
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
-        KC_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, 
+        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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, 
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c b/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
index 8f77c2df68..087605b7b9 100644
--- a/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
+++ b/keyboards/keygem/kg65rgbv2/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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_DEL,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c b/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
index 0617657778..4acba72d39 100644
--- a/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
+++ b/keyboards/keygem/kg65rgbv2/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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_DEL,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/keyhive/absinthe/keymaps/via/keymap.c b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
index 27b474d8ab..646b1af5fd 100644
--- a/keyboards/keyhive/absinthe/keymaps/via/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_default(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_INS,  KC_HOME, KC_PGUP,
+      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_HOME, KC_PGUP,
       KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL,  KC_END,  KC_PGDN,
       KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
       KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                     KC_UP,
diff --git a/keyboards/keyhive/lattice60/keymaps/default/keymap.c b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
index 54b809e984..b5178cf301 100644
--- a/keyboards/keyhive/lattice60/keymaps/default/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
+        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(_FN),
diff --git a/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
index ff3656666b..15866be105 100644
--- a/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_60_hhkb(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
+        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(_FN),
diff --git a/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
index 82712bd816..545de87646 100644
--- a/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_60_hhkb(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
         KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,    KC_BSPC,
         KC_LCTL,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,     KC_ENT,
         KC_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN0),
diff --git a/keyboards/keyprez/rhino/keymaps/default/keymap.c b/keyboards/keyprez/rhino/keymaps/default/keymap.c
index 80e04b1c48..51602218ea 100644
--- a/keyboards/keyprez/rhino/keymaps/default/keymap.c
+++ b/keyboards/keyprez/rhino/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BASE] = LAYOUT_ortho_2x2u(
                                                                                                                              KC_MUTE,
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+        QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
         TAB_CTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_BSPC,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
                  KC_LGUI, FN,      KC_LALT, LOWER,       KC_SPC,          KC_SPC,     KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
diff --git a/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c b/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
index 68aaf2f24e..8a384607ae 100644
--- a/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
+++ b/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_BASE] = LAYOUT_ergo_2x2u(
                                                                                                                              KC_MUTE,
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+        QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
         TAB_CTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_END,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_BSPC,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
                  KC_LGUI, FN,      KC_LALT, LOWER,       KC_SPC,          SPC_RAISE,     KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
diff --git a/keyboards/keyprez/unicorn/keymaps/default/keymap.c b/keyboards/keyprez/unicorn/keymaps/default/keymap.c
index ef385bce50..511389969b 100644
--- a/keyboards/keyprez/unicorn/keymaps/default/keymap.c
+++ b/keyboards/keyprez/unicorn/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, KC_MUTE,
+        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_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_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_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,
diff --git a/keyboards/kiwikey/borderland/keymaps/default/keymap.c b/keyboards/kiwikey/borderland/keymaps/default/keymap.c
index e232e68beb..965d507575 100644
--- a/keyboards/kiwikey/borderland/keymaps/default/keymap.c
+++ b/keyboards/kiwikey/borderland/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL, KC_PGUP,
+    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_PGUP,
     KC_TAB,  KC_Q,    KC_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,                    MO(1),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/kiwikey/borderland/keymaps/via/keymap.c b/keyboards/kiwikey/borderland/keymaps/via/keymap.c
index a785a53d15..53477b7f85 100644
--- a/keyboards/kiwikey/borderland/keymaps/via/keymap.c
+++ b/keyboards/kiwikey/borderland/keymaps/via/keymap.c
@@ -5,7 +5,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL, KC_PGUP,
+    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_PGUP,
     KC_TAB,  KC_Q,    KC_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,                    MO(1),
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/kopibeng/mnk65/keymaps/default/keymap.c b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
index 75221584d8..f1f7bd9281 100644
--- a/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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,
diff --git a/keyboards/kopibeng/mnk65/keymaps/via/keymap.c b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
index 3f8d0f5f27..bd904bb879 100644
--- a/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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,
diff --git a/keyboards/kopibeng/typ65/keymaps/default/keymap.c b/keyboards/kopibeng/typ65/keymaps/default/keymap.c
index 2a69c2bb0c..6cdf423f76 100644
--- a/keyboards/kopibeng/typ65/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/typ65/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+		         QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
 		KC_TRNS, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
 		KC_TRNS, KC_CAPS, KC_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_TRNS, KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
diff --git a/keyboards/kopibeng/typ65/keymaps/via/keymap.c b/keyboards/kopibeng/typ65/keymaps/via/keymap.c
index 2a69c2bb0c..6cdf423f76 100644
--- a/keyboards/kopibeng/typ65/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/typ65/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+		         QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
 		KC_TRNS, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
 		KC_TRNS, KC_CAPS, KC_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_TRNS, KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
diff --git a/keyboards/kopibeng/xt60/keymaps/default/keymap.c b/keyboards/kopibeng/xt60/keymaps/default/keymap.c
index ee43182799..ff460018c9 100644
--- a/keyboards/kopibeng/xt60/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/xt60/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+		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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),  
diff --git a/keyboards/kopibeng/xt60/keymaps/via/keymap.c b/keyboards/kopibeng/xt60/keymaps/via/keymap.c
index ee43182799..ff460018c9 100644
--- a/keyboards/kopibeng/xt60/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/xt60/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+		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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),  
diff --git a/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c b/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c
index ee43182799..ff460018c9 100644
--- a/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+		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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),  
diff --git a/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c b/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c
index ee43182799..ff460018c9 100644
--- a/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_all(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+		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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),  
diff --git a/keyboards/kopibeng/xt65/keymaps/default/keymap.c b/keyboards/kopibeng/xt65/keymaps/default/keymap.c
index 901f1ec547..84f74a0f4c 100644
--- a/keyboards/kopibeng/xt65/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/xt65/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_65_ansi_blocker_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_PGUP,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  KC_PGUP,
 		KC_TAB,  KC_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_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,
diff --git a/keyboards/kopibeng/xt65/keymaps/via/keymap.c b/keyboards/kopibeng/xt65/keymaps/via/keymap.c
index 7d515d977a..7b3b97b1a5 100644
--- a/keyboards/kopibeng/xt65/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/xt65/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// Default layer
 	[0] = LAYOUT_65_ansi_blocker_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_PGUP,
+		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_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGDN,
 		KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_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,
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c
index 4178c5066e..7df75df11c 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_iso_arrow(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_RSFT, KC_UP,   KC_SLSH,
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c
index 4ed48135f8..52610f04d6 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_iso_arrow(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_BSLS, KC_ENT,
         KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c
index 48484dee1b..d9a22d3bac 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_iso_arrow(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_BSLS, KC_ENT,
         KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
index fa58841cc6..b9a297c10e 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            KC_SPFN,                            _______, _______, _______,  _______
     ),
     [_fn] = LAYOUT_60_ansi(
-        KC_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,
+        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,
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c
index 069dcf1689..dac3e07c7c 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c
index ef525f3ab0..aef3eca901 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c
index 3d6ff36e08..fdcae9037c 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_65_iso_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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_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,
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c
index e405cef34d..c959f4a0bf 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_65_iso_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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_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,
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c
index e9961a7238..1be0806771 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c
@@ -73,14 +73,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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(
-        KC_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,  QK_BOOT,
+        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,  QK_BOOT,
         _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______,
         KC_CAPS,        RMT,     RMS,     RMIH,    RMDH,    RMIS,    RMDS,    RMIV,    RMDV,    _______, _______,  _______,         _______, _______,
         _______,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
index d85e4ae979..3db3a9a7af 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
@@ -73,14 +73,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi(
-        KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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(
-        KC_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,  QK_BOOT,
+        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,  QK_BOOT,
         _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______,
         KC_CAPS,        RM_TOGG, RM_MOD,  RM_HUI,  RM_HUD,  RM_SAI,  RM_SAD,  RM_VAI,  RM_VAD,  _______, _______,  _______,         _______, _______,
         _______,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
diff --git a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
index 45fbb6470b..9172ab8a93 100644
--- a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
+++ b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_E,    KC_D,    KC_C,              \
 			KC_W,    KC_S,    KC_X,    KC_SPACE, \
 			KC_Q,    KC_A,    KC_Z,    MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
+			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,  _______,  \
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_E,    KC_D,    KC_C,              \
 			KC_W,    KC_S,    KC_X,    KC_SPACE, \
 			KC_Q,    KC_A,    KC_Y,    MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
+			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,  _______,  \
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_E,    KC_S,     KC_C,              \
 			KC_W,    KC_R,     KC_X,    KC_SPACE, \
 			KC_Q,    KC_A,     KC_Z,    MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,   KC_LSFT, KC_LCTL),
+			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,  _______,  \
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_DOT,  KC_E,    KC_J,               \
 			KC_COMM, KC_O,    KC_A,    KC_SPACE,  \
 			KC_QUOT, KC_A,    KC_SCLN, MO(_RAISE_LAYER),\
-			KC_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
+			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,    _______, \
diff --git a/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c b/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
index 34c6c861e5..afc90880c8 100644
--- a/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_planck_mit( \
-  KC_GESC, KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+  QK_GESC, KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_TAB,  KC_A,      KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
   KC_LCTL, MO(_FUNC), KC_LGUI, KC_LALT, MO(_LOWER),  KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
diff --git a/keyboards/ktec/daisy/keymaps/default/keymap.c b/keyboards/ktec/daisy/keymaps/default/keymap.c
index 5fa591734a..2bb7048696 100644
--- a/keyboards/ktec/daisy/keymaps/default/keymap.c
+++ b/keyboards/ktec/daisy/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴───┴────┴────────┴──────────┴────┴───┴────┘
      */
     [_BL] = LAYOUT(
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_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,  KC_BSPC,                   LOWER,   RAISE,   KC_RALT
diff --git a/keyboards/ktec/daisy/keymaps/via/keymap.c b/keyboards/ktec/daisy/keymaps/via/keymap.c
index e55715b3a3..2b56645483 100644
--- a/keyboards/ktec/daisy/keymaps/via/keymap.c
+++ b/keyboards/ktec/daisy/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴───┴────┴────────┴──────────┴────┴───┴────┘
      */
     [_BL] = LAYOUT(
-        KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_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,  KC_BSPC,                   LOWER,   RAISE,   KC_RALT
diff --git a/keyboards/kwub/bloop/keymaps/crispyy/keymap.c b/keyboards/kwub/bloop/keymaps/crispyy/keymap.c
index 6892f5d14b..1b4f2a3ab4 100644
--- a/keyboards/kwub/bloop/keymaps/crispyy/keymap.c
+++ b/keyboards/kwub/bloop/keymaps/crispyy/keymap.c
@@ -24,7 +24,7 @@ enum keyboard_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [_BL]= LAYOUT_625_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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,
diff --git a/keyboards/kwub/bloop/keymaps/default/keymap.c b/keyboards/kwub/bloop/keymaps/default/keymap.c
index 4b0518b09e..a15032370a 100644
--- a/keyboards/kwub/bloop/keymaps/default/keymap.c
+++ b/keyboards/kwub/bloop/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum keyboard_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [_BL]= LAYOUT_625_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            MO(_FL),
diff --git a/keyboards/kwub/bloop/keymaps/kevin_hhkb/keymap.c b/keyboards/kwub/bloop/keymaps/kevin_hhkb/keymap.c
index 80faf620c3..ddcc995e1a 100644
--- a/keyboards/kwub/bloop/keymaps/kevin_hhkb/keymap.c
+++ b/keyboards/kwub/bloop/keymaps/kevin_hhkb/keymap.c
@@ -24,7 +24,7 @@ enum keyboard_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [_BL]= LAYOUT_625_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+        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_PGUP,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            MO(_FL),
diff --git a/keyboards/kwub/bloop/keymaps/via/keymap.c b/keyboards/kwub/bloop/keymaps/via/keymap.c
index ad91fb40ce..da5104b03f 100644
--- a/keyboards/kwub/bloop/keymaps/via/keymap.c
+++ b/keyboards/kwub/bloop/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum keyboard_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [_BL]= LAYOUT_625_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            MO(_F1),
diff --git a/keyboards/lazydesigners/bolt/keymaps/default/keymap.c b/keyboards/lazydesigners/bolt/keymaps/default/keymap.c
index e6ca2e891d..c1f9870ad6 100644
--- a/keyboards/lazydesigners/bolt/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/bolt/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-               KC_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+               QK_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
                LT2_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
                KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MO(2),
                KC_LCTL,  KC_LALT,                   KC_LGUI, LT1_SPC,          KC_SPC,  LT1_SPC,                   KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/lazydesigners/bolt/keymaps/via/keymap.c b/keyboards/lazydesigners/bolt/keymaps/via/keymap.c
index 6e39046b9a..11c4a8409d 100644
--- a/keyboards/lazydesigners/bolt/keymaps/via/keymap.c
+++ b/keyboards/lazydesigners/bolt/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-               KC_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+               QK_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
                KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
                KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MO(2),
                KC_LCTL,  KC_LALT,                   KC_LGUI, KC_SPC,           KC_SPC,  MO(1),                     KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
index 03d34fef2b..3e0c6340f6 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 	[_QWERTY] = LAYOUT(
-		KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+		QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
 		KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
 		SFT_CPS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_UP,   KC_DOT,
 		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c
index d3bfed176c..70498628ef 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c
@@ -7,7 +7,7 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
+	[0] = LAYOUT(QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 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_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
 	[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),
 	[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),
 	[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)
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c
index eb8bc1406b..1e0548a8a4 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/via/keymap.c
@@ -7,7 +7,7 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_all(KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
+	[0] = LAYOUT_all(QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_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_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
 	[1] = LAYOUT_all(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
 	[2] = LAYOUT_all(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
 	[3] = LAYOUT_all(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
diff --git a/keyboards/lazydesigners/the50/keymaps/default/keymap.c b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
index b0b01106c0..5d8ea732f6 100644
--- a/keyboards/lazydesigners/the50/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_QWERTY] = LAYOUT(
-KC_GESC, KC_Q,    KC_W,    KC_E,     KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,     KC_7, KC_8,   KC_9,
+QK_GESC, KC_Q,    KC_W,    KC_E,     KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,     KC_7, KC_8,   KC_9,
 KC_TAB,  KC_A,    KC_S,    KC_D,     KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,        KC_ENT,           KC_4, KC_5,   KC_6,
 SFT_CPS, KC_Z,    KC_X,    KC_C,     KC_V,   KC_B,    KC_N,    KC_M,             KC_COMM, KC_DOT,  MO(_FN),     KC_1, KC_2,   KC_3,
 KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,            KC_SPC,                      KC_RALT, KC_RGUI, KC_RCTL,     KC_0, KC_DOT, KC_ENT
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
index 1b3978dc86..8986fd6c3d 100644
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_QWERTY] = LAYOUT(
-KC_GESC, KC_Q,    KC_W,    KC_E,     KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,     KC_P7, KC_P8,   KC_P9,
+QK_GESC, KC_Q,    KC_W,    KC_E,     KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,     KC_P7, KC_P8,   KC_P9,
 KC_TAB,  KC_A,    KC_S,    KC_D,     KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,        KC_ENT,           KC_P4, KC_P5,   KC_P6,
 SFT_CPS, KC_Z,    KC_X,    KC_C,     KC_V,   KC_B,    KC_N,    KC_M,             KC_COMM, KC_DOT,  MO(_L2),     KC_P1, KC_P2,   KC_P3,
 KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,            KC_SPC,                      KC_RALT, KC_RCTL, MO(_L1),     KC_0, KC_PDOT, KC_PENT
diff --git a/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c b/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c
index 97f70cf219..33ec4e2e57 100755
--- a/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/the60/rev1/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_QWERTY] = LAYOUT_split_spc_split_bspc(
-KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_HOME, KC_DEL,
+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_HOME, 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_LBRC, KC_RBRC,
 KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,                    KC_SCLN, KC_QUOT,
 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,
diff --git a/keyboards/leeku/finger65/keymaps/default/keymap.c b/keyboards/leeku/finger65/keymaps/default/keymap.c
index ca1e556269..b583577a0d 100644
--- a/keyboards/leeku/finger65/keymaps/default/keymap.c
+++ b/keyboards/leeku/finger65/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_HOME,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
     TG(_FN), 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, 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_END,
diff --git a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
index 95a0200683..3f7f7d9c8b 100644
--- a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
+++ b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
@@ -23,7 +23,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_65_ansi_split_bs(
-    KC_GESC, KC_1,   KC_2,   KC_3,  KC_4, KC_5,  KC_6,  KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSLS, KC_HOME,
+    QK_GESC, KC_1,   KC_2,   KC_3,  KC_4, KC_5,  KC_6,  KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSLS, KC_HOME,
     KC_TAB,  KC_Q,   KC_W,   KC_E,  KC_R, KC_T,  KC_Y,  KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_PGUP,
     KC_GRV,  KC_A,   KC_S,   KC_D,  KC_F, KC_G,  KC_H,  KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
     KC_LSFT, KC_Z,   KC_X,   KC_C,  KC_V, KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
diff --git a/keyboards/lets_split/keymaps/aerialviews007/keymap.c b/keyboards/lets_split/keymaps/aerialviews007/keymap.c
index ce031dd25b..a86069bbf5 100644
--- a/keyboards/lets_split/keymaps/aerialviews007/keymap.c
+++ b/keyboards/lets_split/keymaps/aerialviews007/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_ortho_4x12(
    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-   KC_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+   QK_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
    KC_AT,   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_COLEMAK] = LAYOUT_ortho_4x12(
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_GESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  QK_GESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
   KC_AT,   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_DVORAK] = LAYOUT_ortho_4x12(
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_GESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+  QK_GESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
   KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
   KC_AT,   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
index 6928a2f559..d2c1f9db6b 100644
--- a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------'
      */
     [BASE] = LAYOUT_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,  KC_PGUP,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
index 6e52d3f0a9..d55bc25ab5 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `------------------------------------------------------'    `-------------'
      */
     [VANILLA] = LAYOUT_split_rshift(
-        KC_VOLD, KC_VOLU, KC_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSPC,            LALT(KC_F5), KC_PGUP,
+        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,
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [CS_GO] = LAYOUT_split_rshift(
-        _______, _______, KC_GESC,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            F(0),        _______,
+        _______, _______, QK_GESC,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            F(0),        _______,
         _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            _______,     _______,
         _______, _______, KC_LCTL,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
         _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                          _______,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
index ccd5b1c716..76662c988f 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `------------------------------------------------------'    `-------------'
      */
     [VANILLA] = LAYOUT(
-        KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,          KC_INS,  KC_PGUP,
+        KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,          KC_INS,  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,   KC_CAPS, KC_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,          KC_UP,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
index f61efbbfe4..854c151f0b 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `------------------------------------------------------'    `-------------'
      */
     [VANILLA] = LAYOUT_iso(
-        KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,          KC_INS,  KC_PGUP,
+        KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,          KC_INS,  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_ENT,           KC_DEL,  KC_PGDN,
         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_NUHS,
         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,          KC_UP,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
index b4efe94f06..e772d86223 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `------------------------------------------------------'    `-------------'
      */
     [VANILLA] = LAYOUT_split_bs(
-        KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_GRV,           KC_INS,  KC_PGUP,
+        KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_GRV,           KC_INS,  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_BSPC,                   KC_DEL,  KC_PGDN,
         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_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,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
index e388706814..2289562262 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [0] = LAYOUT(
-        KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,          KC_INS,  KC_PGUP,
+        KC_F1,   KC_F2,   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,          KC_INS,  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,   KC_CAPS, KC_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,          KC_UP,
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
index 615ca2e4eb..6252dd6dff 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [VANILLA] = LAYOUT(
-        KC_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        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,
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index feb093e828..9d9df7904c 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------'   `-------------'
      */
     [VANILLA] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                   KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL,
+        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_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_BSLS,                   KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_LSFT, KC_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,
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
index 868c5eca27..87cfcccdc1 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------'
      */
     [_BASE] = LAYOUT_65_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,  KC_PGUP,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,   KC_PGDN,
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
index fe75179572..a93112c017 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------'
      */
     [_BASE] = LAYOUT_65_iso(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,          KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,  KC_PGUP,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c b/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c
index d7aac3ddaf..d2a22a09ec 100644
--- a/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c
+++ b/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_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,
+    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_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_BSLS, 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,
diff --git a/keyboards/lily58/keymaps/chuan/keymap.c b/keyboards/lily58/keymaps/chuan/keymap.c
index 6054fa80ff..e1c5437ac9 100644
--- a/keyboards/lily58/keymaps/chuan/keymap.c
+++ b/keyboards/lily58/keymaps/chuan/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
  [_QWERTY] = LAYOUT(
-  KC_GESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  QK_GESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
   ALL_T(KC_GRV), KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENTER, \
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MINS,  MEH_T(KC_EQL),  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, \
diff --git a/keyboards/lily58/keymaps/mikefightsbears/keymap.c b/keyboards/lily58/keymaps/mikefightsbears/keymap.c
index a17ff07049..0923f47f0d 100644
--- a/keyboards/lily58/keymaps/mikefightsbears/keymap.c
+++ b/keyboards/lily58/keymaps/mikefightsbears/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   `----------------------------'           '------''--------------------'
  */
  [_QWERTY] = LAYOUT( \
-  KC_GESC,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+  QK_GESC,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
   KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,  KC_LBRC,  KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
diff --git a/keyboards/linworks/fave65h/keymaps/default/keymap.c b/keyboards/linworks/fave65h/keymaps/default/keymap.c
index 308c2a9acc..1d58ae3399 100644
--- a/keyboards/linworks/fave65h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_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,
diff --git a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
index 15d9bcb765..ab9e3c0535 100644
--- a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_wkl(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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,
diff --git a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
index a4264c8412..06ff7c1174 100644
--- a/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/default_65_ansi_blocker_wkl_split_bs/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_wkl_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_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,
diff --git a/keyboards/linworks/fave65h/keymaps/via/keymap.c b/keyboards/linworks/fave65h/keymaps/via/keymap.c
index 7febf885ce..22a6ea947f 100644
--- a/keyboards/linworks/fave65h/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave65h/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_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,
diff --git a/keyboards/loki65/keymaps/default/keymap.c b/keyboards/loki65/keymaps/default/keymap.c
index 3c3be3b242..8435d6affa 100644
--- a/keyboards/loki65/keymaps/default/keymap.c
+++ b/keyboards/loki65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
     KC_LSFT, KC_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,
diff --git a/keyboards/loki65/keymaps/via/keymap.c b/keyboards/loki65/keymaps/via/keymap.c
index 2980ec515a..78bd3c8746 100644
--- a/keyboards/loki65/keymaps/via/keymap.c
+++ b/keyboards/loki65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
     KC_LSFT, KC_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,
diff --git a/keyboards/lucid/alexa/keymaps/default/keymap.c b/keyboards/lucid/alexa/keymaps/default/keymap.c
index 85b03cdb60..fb8f7ca802 100644
--- a/keyboards/lucid/alexa/keymaps/default/keymap.c
+++ b/keyboards/lucid/alexa/keymaps/default/keymap.c
@@ -22,14 +22,14 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_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_TRNS, KC_TRNS, KC_TRNS,
+        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_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/lucid/alexa/keymaps/via/keymap.c b/keyboards/lucid/alexa/keymaps/via/keymap.c
index 0ab9bcf764..5356ae2829 100644
--- a/keyboards/lucid/alexa/keymaps/via/keymap.c
+++ b/keyboards/lucid/alexa/keymaps/via/keymap.c
@@ -24,14 +24,14 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_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_TRNS, KC_TRNS, KC_TRNS,
+        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_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/lucid/alexa_solder/keymaps/default/keymap.c b/keyboards/lucid/alexa_solder/keymaps/default/keymap.c
index 160e3d240d..60889b6e23 100644
--- a/keyboards/lucid/alexa_solder/keymaps/default/keymap.c
+++ b/keyboards/lucid/alexa_solder/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        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_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_DEL,  KC_TRNS,
+        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_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/lucid/alexa_solder/keymaps/via/keymap.c b/keyboards/lucid/alexa_solder/keymaps/via/keymap.c
index 050862d91a..dcd2f7de29 100644
--- a/keyboards/lucid/alexa_solder/keymaps/via/keymap.c
+++ b/keyboards/lucid/alexa_solder/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        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_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_TRNS, KC_DEL,
+        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_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/lucid/phantom_hs/keymaps/default/keymap.c b/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
index ccbf70421c..3d06b473a0 100644
--- a/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
+++ b/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, 
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi_blocker(
-        KC_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_DEL, 
+        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_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/lucid/phantom_hs/keymaps/via/keymap.c b/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
index edc876f6f2..82b535032b 100644
--- a/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
+++ b/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, 
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi_blocker(
-        KC_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_DEL, 
+        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_DEL, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
diff --git a/keyboards/lucid/phantom_solder/keymaps/default/keymap.c b/keyboards/lucid/phantom_solder/keymaps/default/keymap.c
index 8a5897eea9..17244e580d 100644
--- a/keyboards/lucid/phantom_solder/keymaps/default/keymap.c
+++ b/keyboards/lucid/phantom_solder/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        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_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_DEL,  KC_TRNS,
+        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_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,   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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/lucid/phantom_solder/keymaps/via/keymap.c b/keyboards/lucid/phantom_solder/keymaps/via/keymap.c
index d08bc138f3..8d65087c78 100644
--- a/keyboards/lucid/phantom_solder/keymaps/via/keymap.c
+++ b/keyboards/lucid/phantom_solder/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_GRV,
+        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_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_all(
-        KC_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_TRNS, KC_DEL,
+        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_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT,   KC_PGUP,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/lyso1/lck75/keymaps/7u/keymap.c b/keyboards/lyso1/lck75/keymaps/7u/keymap.c
index 44498f9a48..e3458103a1 100644
--- a/keyboards/lyso1/lck75/keymaps/7u/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/7u/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_7u(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,  KC_INS, 
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,  KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                      KC_ENT,   KC_PGUP,
diff --git a/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c b/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c
index 61d77cac5d..74750a5dc6 100644
--- a/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_7u_iso(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,  KC_INS, 
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,                      KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,  KC_BSLS,            KC_ENT,   KC_PGUP,
diff --git a/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c
index 1f1879db3d..4a57ab5a63 100644
--- a/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_7u_sbs(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_BSPC,  KC_INS, 
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,  KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                      KC_ENT,   KC_PGUP,
diff --git a/keyboards/lyso1/lck75/keymaps/default/keymap.c b/keyboards/lyso1/lck75/keymaps/default/keymap.c
index 550d0863f4..4f72b50e4a 100644
--- a/keyboards/lyso1/lck75/keymaps/default/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/default/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_default(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,  KC_INS, 
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,  KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                      KC_ENT,   KC_PGUP,
diff --git a/keyboards/lyso1/lck75/keymaps/iso/keymap.c b/keyboards/lyso1/lck75/keymaps/iso/keymap.c
index 24d2adc478..3d412a66c6 100644
--- a/keyboards/lyso1/lck75/keymaps/iso/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/iso/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_iso(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,  KC_INS, 
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,                      KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,  KC_BSLS,            KC_ENT,   KC_PGUP,
diff --git a/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c
index 2f48e0fc11..ca2e235163 100644
--- a/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_iso_sbs(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_BSPC,  KC_INS, 
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,                      KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,  KC_BSLS,            KC_ENT,   KC_PGUP,
diff --git a/keyboards/lyso1/lck75/keymaps/sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/sbs/keymap.c
index a2f0fee195..d47ae38498 100644
--- a/keyboards/lyso1/lck75/keymaps/sbs/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/sbs/keymap.c
@@ -21,7 +21,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_sbs(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE, 
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_BSPC,  KC_INS, 
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,  KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                      KC_ENT,   KC_PGUP,
diff --git a/keyboards/lyso1/lck75/keymaps/via/keymap.c b/keyboards/lyso1/lck75/keymaps/via/keymap.c
index 97da242d1e..21ad242094 100644
--- a/keyboards/lyso1/lck75/keymaps/via/keymap.c
+++ b/keyboards/lyso1/lck75/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_default(
-      KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE,
+      QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,   KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_MUTE,
       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,  KC_INS,
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,  KC_DEL,
       KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,  KC_QUOT,                      KC_ENT,   KC_PGUP,
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
index 1d1f8014bb..1adfcb7d71 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
@@ -90,7 +90,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 
 const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,    KC_RBRC, KC_BSLS, KC_HOME,
         MY_CAPS, KC_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,
@@ -358,8 +358,8 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     rgb_matrix_enable_noeeprom();
 
     switch (keycode) {
-        // custom handle KC_GESC to emulate auto shift on it
-        case KC_GESC:
+        // custom handle QK_GESC to emulate auto shift on it
+        case QK_GRAVE_ESCAPE:
 #ifdef AUTO_SHIFT_ENABLE
             if (get_autoshift_state()) {
                 static uint16_t gesc_timer;
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
index 4c28e35ef4..51772f1fa3 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
@@ -45,7 +45,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,    KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,           KC_PGUP,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,             KC_UP,   KC_PGDN,
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
index 33f3b88b02..e69106c2ff 100644
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
@@ -12,7 +12,7 @@ enum alt_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
diff --git a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
index 50f06d655d..5a6d2dc82a 100644
--- a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
@@ -16,7 +16,7 @@ enum ctrl_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  TD_BSPC, KC_HOME, \
+        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,  TD_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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    TD_COMM, KC_DOT,  KC_SLSH, KC_RSPC,          KC_UP,   KC_PGDN, \
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifndef GAMELAYER_DISABLE
     [_GAME] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, \
+        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, \
diff --git a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
index d12f2d64ac..e971c96046 100644
--- a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
@@ -16,7 +16,7 @@ enum ctrl_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS, \
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_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,  TD_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,   TD_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, \
diff --git a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
index 11834add94..31db553117 100644
--- a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
+++ b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* 0: qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,           KC_MUTE,  KC_MPLY,
     KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,
                    KC_LALT, KC_LGUI,          KC_SPC,                             KC_SPC,  KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
index 8859f53856..45a09b06a7 100644
--- a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
+++ b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT( /* 0: qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,           KC_MUTE,  KC_MPLY,
     KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,
                    KC_LALT, KC_LGUI,          KC_SPC,                             KC_SPC,  KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c
index 5f884d95f6..c23b43e84f 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [0] = LAYOUT_65_iso_blocker_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_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,
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
index d0c1b6675a..64b4f000e5 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [0] = LAYOUT_65_iso_blocker_7u_spc(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_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,
diff --git a/keyboards/mechkeys/acr60/keymaps/default/keymap.c b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
index cf14a86b58..b91b830b9b 100644
--- a/keyboards/mechkeys/acr60/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, 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),
diff --git a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
index fddd71a2bb..758243ea1e 100644
--- a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Hit MO(_FN) and Alt in that order to lock into the _FN layer.
  */
   [_DFT] = LAYOUT_mitchsplit( /* Basic QWERTY */
-      KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
+      QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
       KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  \
       MO(_FN), KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  \
       KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN), \
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
index eb194be203..9d2ce727d3 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
@@ -7,7 +7,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BL] = LAYOUT_625_space(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+		QK_GESC, KC_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_LSFT, KC_DOT,
 		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(1), MO(2)),
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
index 5764123179..3619cbfdbf 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
@@ -7,7 +7,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BL] = LAYOUT_split_space(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+		QK_GESC, KC_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_RSFT, KC_DOT,
 		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RCTL, MO(1), MO(2)),
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
index e0d22980d2..1dc2328163 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_ortho(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+		QK_GESC, KC_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_CAPS, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
index 53e0566005..f150c04803 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FN_1] = LAYOUT_all(
                                                                                                                        KC_MUTE,
-    	  KC_GESC,          _______, _______, _______, DE_LCBR, DE_RCBR, _______, DE_UDIA, KC_UP,    DE_ODIA, DE_QUES, KC_DEL,
+    	  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 ),
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
index 73bc282a7e..b39bc8b123 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FN_1] = LAYOUT_all(
                                                                                                                        KC_MUTE,
-    	  KC_GESC,          _______, KC_UP, _______, KC_LCBR, KC_RCBR, _______, _______, KC_UP,    _______, KC_QUES, KC_DEL,
+    	  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 ),
diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c
index d83bcedfe7..ab472326b3 100644
--- a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c
+++ b/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c
@@ -16,7 +16,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC, _______,
+        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_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_RBRC, 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,    KC_MUTE,    KC_MUTE, KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c
index d83bcedfe7..ab472326b3 100644
--- a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c
+++ b/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC, _______,
+        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_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_RBRC, 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,    KC_MUTE,    KC_MUTE, KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c
index bb438fe1bf..e88c715712 100644
--- a/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c
+++ b/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c
@@ -16,7 +16,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_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,
+        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,    KC_MUTE,    KC_MUTE, KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
index 61df3e000f..d7fcf0f221 100644
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
+++ b/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
@@ -17,7 +17,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    
     [_BASE] = LAYOUT(
-        KC_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,
+        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,
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c
index bb438fe1bf..e88c715712 100644
--- a/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c
+++ b/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_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,
+        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,    KC_MUTE,    KC_MUTE, KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
diff --git a/keyboards/mechwild/obe/keymaps/default/keymap.c b/keyboards/mechwild/obe/keymaps/default/keymap.c
index 59f163cc9d..6188fa736d 100644
--- a/keyboards/mechwild/obe/keymaps/default/keymap.c
+++ b/keyboards/mechwild/obe/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-    KC_MUTE, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_TRNS, KC_BSPC,
+    KC_MUTE, 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_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, MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
              KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,
diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
index 750ab013ae..1fa3378c16 100644
--- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
@@ -25,7 +25,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-    KC_TSTOG,KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+    KC_TSTOG,QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
     KC_PGUP, KC_TAB,  KC_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, TT(_RAISE), KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFTCAPSWIN,KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, LT(_LOWER,KC_B), KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_SFTUP,KC_RSFT,
diff --git a/keyboards/mechwild/obe/keymaps/via/keymap.c b/keyboards/mechwild/obe/keymaps/via/keymap.c
index cd6dcda001..c7b8d5d7a1 100644
--- a/keyboards/mechwild/obe/keymaps/via/keymap.c
+++ b/keyboards/mechwild/obe/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-    KC_MUTE, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_TRNS, KC_BSPC,
+    KC_MUTE, 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_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, MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
              KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,
diff --git a/keyboards/mechwild/waka60/keymaps/audio/keymap.c b/keyboards/mechwild/waka60/keymaps/audio/keymap.c
index dc4e5ea742..69e79c7ffd 100644
--- a/keyboards/mechwild/waka60/keymaps/audio/keymap.c
+++ b/keyboards/mechwild/waka60/keymaps/audio/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
diff --git a/keyboards/mechwild/waka60/keymaps/default/keymap.c b/keyboards/mechwild/waka60/keymaps/default/keymap.c
index 1f8c8523d4..aae958ae36 100644
--- a/keyboards/mechwild/waka60/keymaps/default/keymap.c
+++ b/keyboards/mechwild/waka60/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
diff --git a/keyboards/mechwild/waka60/keymaps/via/keymap.c b/keyboards/mechwild/waka60/keymaps/via/keymap.c
index 83b44d6365..17fe246fc5 100644
--- a/keyboards/mechwild/waka60/keymaps/via/keymap.c
+++ b/keyboards/mechwild/waka60/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
diff --git a/keyboards/melgeek/mach80/keymaps/default/keymap.c b/keyboards/melgeek/mach80/keymaps/default/keymap.c
index a3ba924718..3530c9e7cb 100755
--- a/keyboards/melgeek/mach80/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        QK_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,  
diff --git a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
index 9ac911af2e..3ce16cd736 100755
--- a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_PAUS, 
+        QK_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,  
diff --git a/keyboards/melgeek/mach80/keymaps/via/keymap.c b/keyboards/melgeek/mach80/keymaps/via/keymap.c
index 6a448300d3..3ec65081b7 100755
--- a/keyboards/melgeek/mach80/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_PAUS,    
+        QK_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,   
diff --git a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
index e40950d9ca..dff20e628c 100755
--- a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
+++ b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tkl_ansi_wkl( /* Base */
-        KC_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        QK_GESC,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,  KC_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,       
diff --git a/keyboards/melgeek/mj61/keymaps/default/keymap.c b/keyboards/melgeek/mj61/keymaps/default/keymap.c
index 3ed0e8bf56..d11223bd34 100644
--- a/keyboards/melgeek/mj61/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj61/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_ansi(
-		KC_GESC,    KC_1,    KC_2,      KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		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, MO(1),   MO(2),   KC_RCTL
 	),
 	[1] = LAYOUT_60_ansi(
-        KC_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,
+        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,          EE_CLR,
 		KC_MPRV,             KC_VOLD,  KC_VOLU,  KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, 
diff --git a/keyboards/melgeek/mj61/keymaps/via/keymap.c b/keyboards/melgeek/mj61/keymaps/via/keymap.c
index 8351165eb0..2a0fbc0e6f 100644
--- a/keyboards/melgeek/mj61/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj61/keymaps/via/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_ansi(
-		KC_GESC,    KC_1,    KC_2,      KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		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, MO(1),   MO(2),   KC_RCTL
 	),
 	[1] = LAYOUT_60_ansi(
-        KC_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,
+        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,          EE_CLR,
 		KC_MPRV,             KC_VOLD,  KC_VOLU,  KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_MNXT, 
diff --git a/keyboards/melgeek/mj63/keymaps/default/keymap.c b/keyboards/melgeek/mj63/keymaps/default/keymap.c
index 18a0b95ab4..1bac2f819c 100644
--- a/keyboards/melgeek/mj63/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj63/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi_arrow(
-        KC_GESC,   KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,   KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,    KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         KC_CAPS,   KC_A,     KC_S,     KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,             KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,     KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   KC_DEL,
diff --git a/keyboards/melgeek/mj63/keymaps/via/keymap.c b/keyboards/melgeek/mj63/keymaps/via/keymap.c
index ebaa726f28..dcbc36ed44 100644
--- a/keyboards/melgeek/mj63/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj63/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi_arrow(
-        KC_GESC,   KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        QK_GESC,   KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,     KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
         KC_TAB,    KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
         KC_CAPS,   KC_A,     KC_S,     KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,                  KC_ENT,
         KC_LSFT,             KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,     KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   KC_DEL,
diff --git a/keyboards/melgeek/mj64/keymaps/default/keymap.c b/keyboards/melgeek/mj64/keymaps/default/keymap.c
index c91d248d1d..775afccbff 100644
--- a/keyboards/melgeek/mj64/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_64_ansi( /* Base */
-			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+			QK_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
 		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
 			KC_CAPS,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,   KC_DEL,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN, KC_RIGHT
 	),
 	[1] = LAYOUT_64_ansi( /* FN */
-			KC_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,
+			QK_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
 			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EE_CLR,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   KC_PGDN,  KC_VOLU,  KC_MUTE,
diff --git a/keyboards/melgeek/mj64/keymaps/via/keymap.c b/keyboards/melgeek/mj64/keymaps/via/keymap.c
index 87de497cfd..4df1107cbf 100644
--- a/keyboards/melgeek/mj64/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj64/keymaps/via/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_64_ansi( /* Base */
-			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+			QK_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
 		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
 			KC_CAPS,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,   KC_DEL,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN, KC_RIGHT
 	),
 	[1] = LAYOUT_64_ansi( /* FN */
-			KC_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,
+			QK_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
 			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  KC_PGUP,  EE_CLR,
 		    _______,   _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  KC_INS,   KC_END,   KC_PGDN,  KC_VOLU,  KC_MUTE,
diff --git a/keyboards/melgeek/mj65/keymaps/default/keymap.c b/keyboards/melgeek/mj65/keymaps/default/keymap.c
index d82446840a..4e96ba55f1 100644
--- a/keyboards/melgeek/mj65/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
-			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_INS,
+			QK_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_INS,
 		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_DEL,
 			KC_CAPS,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,             KC_PGUP,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
-			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
+			QK_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
 			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,  _______,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EE_CLR,             _______,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
diff --git a/keyboards/melgeek/mj65/keymaps/via/keymap.c b/keyboards/melgeek/mj65/keymaps/via/keymap.c
index 5653f1a3fc..280ae63c72 100644
--- a/keyboards/melgeek/mj65/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/via/keymap.c
@@ -18,14 +18,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
-			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_INS,
+			QK_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_INS,
 		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_DEL,
 			KC_CAPS,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,             KC_PGUP,
 		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
-			KC_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
+			QK_GESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
 			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,  _______,
             _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EE_CLR,             _______,
 		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
index e5269628cd..dd9f13d424 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
index 951ba0c1c3..5f3ea93b77 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_7u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
index a0f7967ff9..28ce4c4310 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT_60_ansi_7u_spc_split_bs( 
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
index cac6c3fb10..220220c163 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
index 609428242c..6abb2c3131 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
index 4fe3ff1857..2a0bd7955e 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
index a100ee806f..90c24735ec 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
index 8faac8acd8..046c01f30e 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
@@ -20,7 +20,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
index 79448fe924..1d176e7411 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
index b83da5c06a..1c906f01ed 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
index 14f4029eec..79e28bc33b 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_arrow_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
index 3e42e23307..a028410452 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV, KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV, KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
index ba91dedc45..c955b7ec3e 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
index 3da18b6055..e7ab938464 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
index 5c479a241c..fe5ae749c1 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
index 1e0cb52153..0484e60d43 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
index aeaea17d39..d67391b1f1 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_1u_lshift_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
index b6d2472399..3067a2d1be 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
index aa4071991f..729f230779 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
index 201bed7cda..bd95f11762 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
index 653e420ed5..08d0d28662 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_7u_spc_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
index e56402af8f..68619f1ff2 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
index 52f06e0c1f..b77190ced9 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
index 4c853a9088..e2d14c2d04 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
index 8874df85b4..4f0bbe7620 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
index 62b56d5b35..161a319045 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
index 23cbf2d69b..fb58551d1a 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
index cd8b6c01ea..39e57fa68f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
index 4bd2c525d2..e34b94438a 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_arrow_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
index b547098f03..73c6e772fb 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
index 412b8af80e..25a87d7059 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
index 2f39f15b53..4927d3faa9 100755
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_iso_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
index cdfe295b48..f51d52028d 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
index ce80e1a9fc..acb7dc5cba 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
index c94a605a1e..0b44ef003c 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
index e466c59f36..6586d62395 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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,  EE_CLR,  KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
index f707a7c718..b924c83fbb 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
index 4340106755..b854b8cdd1 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
index 7562b2ed7f..b1bde45284 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
index 4a878c5f29..fd3ccaefc1 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_ansi_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
 		KC_LSFT,          KC_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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
index e8223d3b87..d9d15bcbf7 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
index 5892b4eeb8..1b388b36f3 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
index 40d3b0e016..8d9b49d245 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
index e8aaa89906..6fbbb353f5 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
index 9101767eae..8123c33a84 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
index 08ad8d8ab9..0943fea5d8 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
index de538456a5..4a19faf64c 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
index 77f55b3cf8..48883d1fa5 100755
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_64_iso_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
diff --git a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
index e5269628cd..dd9f13d424 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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,
diff --git a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
index 85e9ddd183..0bba431c89 100755
--- a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
+		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,
diff --git a/keyboards/melgeek/mojo68/keymaps/default/keymap.c b/keyboards/melgeek/mojo68/keymaps/default/keymap.c
index 4b919ca05a..d5c1d91985 100755
--- a/keyboards/melgeek/mojo68/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mojo68/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_68_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+		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_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,
diff --git a/keyboards/melgeek/mojo68/keymaps/via/keymap.c b/keyboards/melgeek/mojo68/keymaps/via/keymap.c
index 3fe69ac05e..6f6118236b 100755
--- a/keyboards/melgeek/mojo68/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mojo68/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_68_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+		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_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,
diff --git a/keyboards/melgeek/mojo75/keymaps/default/keymap.c b/keyboards/melgeek/mojo75/keymaps/default/keymap.c
index 00394f86b1..730ce55bf6 100644
--- a/keyboards/melgeek/mojo75/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mojo75/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_75_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,
+        QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,          KC_HOME,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,           KC_PGUP,
diff --git a/keyboards/melgeek/mojo75/keymaps/via/keymap.c b/keyboards/melgeek/mojo75/keymaps/via/keymap.c
index 73b7902b93..7f3d5d784b 100644
--- a/keyboards/melgeek/mojo75/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mojo75/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_75_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,
+        QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,          KC_HOME,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,           KC_PGUP,
diff --git a/keyboards/melgeek/tegic/keymaps/default/keymap.c b/keyboards/melgeek/tegic/keymaps/default/keymap.c
index fbf0287c8f..8ba1edc41d 100755
--- a/keyboards/melgeek/tegic/keymaps/default/keymap.c
+++ b/keyboards/melgeek/tegic/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tegic_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,    
+        QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,    
         KC_GRV,   KC_1,     KC_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,   
diff --git a/keyboards/melgeek/tegic/keymaps/via/keymap.c b/keyboards/melgeek/tegic/keymaps/via/keymap.c
index 3b73859bb5..91a68240ba 100755
--- a/keyboards/melgeek/tegic/keymaps/via/keymap.c
+++ b/keyboards/melgeek/tegic/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_tegic_ansi( /* Base */
-        KC_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,    
+        QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_SCRL,    
         KC_GRV,   KC_1,     KC_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,   
diff --git a/keyboards/melgeek/z70ultra/keymaps/default/keymap.c b/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
index 3e3f2f9250..2987796572 100644
--- a/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
+++ b/keyboards/melgeek/z70ultra/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker( /* Base */
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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,
diff --git a/keyboards/melgeek/z70ultra/keymaps/via/keymap.c b/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
index 551b51c74f..851671e529 100644
--- a/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
+++ b/keyboards/melgeek/z70ultra/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker( /* Base */
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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,
diff --git a/keyboards/meme/keymaps/default/keymap.c b/keyboards/meme/keymaps/default/keymap.c
index 4ae5749205..c84ca220bd 100644
--- a/keyboards/meme/keymaps/default/keymap.c
+++ b/keyboards/meme/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_spicy(
-    KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
+    QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
     KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_RCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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,
diff --git a/keyboards/miller/gm862/keymaps/default/keymap.c b/keyboards/miller/gm862/keymaps/default/keymap.c
index 6a7cf0a9f7..07b3acee9b 100644
--- a/keyboards/miller/gm862/keymaps/default/keymap.c
+++ b/keyboards/miller/gm862/keymaps/default/keymap.c
@@ -3,13 +3,13 @@
 #define _LAYER1 1
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[_LAYER0] = LAYOUT_60_ansi( /* Base */
-			KC_GESC,         KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,      KC_MINS,  KC_EQL,  KC_BSPC,
+			QK_GESC,         KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,      KC_MINS,  KC_EQL,  KC_BSPC,
 		    KC_TAB,          KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,      KC_LBRC,  KC_RBRC, KC_BSLS,
 			CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,   KC_QUOT,           KC_ENT,
 		    KC_LSFT,         KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,   KC_RSFT,
 		    KC_LCTL,         KC_LGUI,  KC_LALT,                KC_SPC,                         KC_RALT,  MO(1),     KC_RGUI,             KC_RCTL),
 		[_LAYER1] = LAYOUT_60_ansi( /* FN */
-				KC_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 ,
+				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_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
 				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
diff --git a/keyboards/miller/gm862/keymaps/via/keymap.c b/keyboards/miller/gm862/keymaps/via/keymap.c
index 6a7cf0a9f7..07b3acee9b 100644
--- a/keyboards/miller/gm862/keymaps/via/keymap.c
+++ b/keyboards/miller/gm862/keymaps/via/keymap.c
@@ -3,13 +3,13 @@
 #define _LAYER1 1
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		[_LAYER0] = LAYOUT_60_ansi( /* Base */
-			KC_GESC,         KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,      KC_MINS,  KC_EQL,  KC_BSPC,
+			QK_GESC,         KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,      KC_MINS,  KC_EQL,  KC_BSPC,
 		    KC_TAB,          KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,      KC_LBRC,  KC_RBRC, KC_BSLS,
 			CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,   KC_QUOT,           KC_ENT,
 		    KC_LSFT,         KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,   KC_RSFT,
 		    KC_LCTL,         KC_LGUI,  KC_LALT,                KC_SPC,                         KC_RALT,  MO(1),     KC_RGUI,             KC_RCTL),
 		[_LAYER1] = LAYOUT_60_ansi( /* FN */
-				KC_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 ,
+				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_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
 				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
diff --git a/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c b/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
index 17bffb0518..e384c41e9d 100644
--- a/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
+++ b/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
@@ -24,7 +24,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_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_RBRC,
        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_ENT,
-       KC_GESC, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LEFT, KC_DOWN, KC_RGHT
+       QK_GESC, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_7u_space(
diff --git a/keyboards/misterknife/knife66/keymaps/default/keymap.c b/keyboards/misterknife/knife66/keymaps/default/keymap.c
index 831efca177..1c6d1b6fba 100644
--- a/keyboards/misterknife/knife66/keymaps/default/keymap.c
+++ b/keyboards/misterknife/knife66/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,  KC_PGUP,
+    QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,  KC_PGUP,
     KC_TAB,     KC_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_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,
diff --git a/keyboards/misterknife/knife66/keymaps/zyber/keymap.c b/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
index cec762fb64..e76c629e17 100644
--- a/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
+++ b/keyboards/misterknife/knife66/keymaps/zyber/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC,   KC_1,    KC_2,    KC_3,    TD(SSHT), KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_NO,  TD(END_HOME),
+    QK_GESC,   KC_1,    KC_2,    KC_3,    TD(SSHT), KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_NO,  TD(END_HOME),
     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     TD(LBRC), KC_RBRC,  KC_BSLS,         KC_DEL,
     CTRL_C_UP, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(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,
diff --git a/keyboards/misterknife/knife66_iso/keymaps/default/keymap.c b/keyboards/misterknife/knife66_iso/keymaps/default/keymap.c
index 81b30bb263..ae9e828ef7 100644
--- a/keyboards/misterknife/knife66_iso/keymaps/default/keymap.c
+++ b/keyboards/misterknife/knife66_iso/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_GESC,   KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_DEL, KC_BSPC,  KC_HOME,
+    QK_GESC,   KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_DEL, KC_BSPC,  KC_HOME,
     KC_TAB,    KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_END,
     KC_LCTL,   KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS,  KC_ENT,           KC_PGUP,
     KC_LSFT,   KC_GRAVE, KC_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,
diff --git a/keyboards/mnk1800s/keymaps/default/keymap.c b/keyboards/mnk1800s/keymaps/default/keymap.c
index 43791360b5..34b8428ba2 100644
--- a/keyboards/mnk1800s/keymaps/default/keymap.c
+++ b/keyboards/mnk1800s/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,          KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,          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_P7,   KC_P8,   KC_P9,   KC_PPLS,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PENT,          KC_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_P1,   KC_P2,   KC_P3,   KC_PENT, KC_UP,            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/mnk1800s/keymaps/via/keymap.c b/keyboards/mnk1800s/keymaps/via/keymap.c
index 51df5e7a46..3c1e7ce276 100644
--- a/keyboards/mnk1800s/keymaps/via/keymap.c
+++ b/keyboards/mnk1800s/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,          KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,          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_P7,   KC_P8,   KC_P9,   KC_PPLS,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     KC_P4,   KC_P5,   KC_P6,   KC_PENT,          KC_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_P1,   KC_P2,   KC_P3,   KC_PENT, KC_UP,            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/mnk50/keymaps/default/keymap.c b/keyboards/mnk50/keymaps/default/keymap.c
index 3a0b6e2f2f..4baabc8694 100644
--- a/keyboards/mnk50/keymaps/default/keymap.c
+++ b/keyboards/mnk50/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+    QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
              KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,  KC_SPC,  KC_SPC,           KC_SPC,  KC_RALT, KC_LCTL),
diff --git a/keyboards/mnk50/keymaps/via/keymap.c b/keyboards/mnk50/keymaps/via/keymap.c
index 964010d535..2e26561c2e 100644
--- a/keyboards/mnk50/keymaps/via/keymap.c
+++ b/keyboards/mnk50/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+    QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
              KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,  KC_SPC,  KC_SPC,           KC_SPC,  KC_RALT, KC_LCTL),
diff --git a/keyboards/mokey/xox70/keymaps/default/keymap.c b/keyboards/mokey/xox70/keymaps/default/keymap.c
index b19174948b..5b5a07ac00 100644
--- a/keyboards/mokey/xox70/keymaps/default/keymap.c
+++ b/keyboards/mokey/xox70/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_tkl_nofrow_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_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,
diff --git a/keyboards/mokey/xox70/keymaps/via/keymap.c b/keyboards/mokey/xox70/keymaps/via/keymap.c
index 304fe3968c..48539861b4 100644
--- a/keyboards/mokey/xox70/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        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_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
diff --git a/keyboards/mokey/xox70hot/keymaps/default/keymap.c b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
index 6ea7623603..d855d3dd0e 100644
--- a/keyboards/mokey/xox70hot/keymaps/default/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_tkl_nofrow_ansi_tsangan(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,  KC_INSERT, KC_HOME, KC_PGUP,
+        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_INSERT, KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  KC_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,
diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
index aae027eb1c..6472029bf4 100644
--- a/keyboards/mokey/xox70hot/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     LAYOUT_tkl_nofrow_ansi_tsangan(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,  KC_INSERT, KC_HOME, KC_PGUP,
+        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_INSERT, KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  KC_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,
diff --git a/keyboards/mt/blocked65/keymaps/default/keymap.c b/keyboards/mt/blocked65/keymaps/default/keymap.c
index 9838fb80dd..ab7f37a51d 100644
--- a/keyboards/mt/blocked65/keymaps/default/keymap.c
+++ b/keyboards/mt/blocked65/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BL] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/mt/blocked65/keymaps/via/keymap.c b/keyboards/mt/blocked65/keymaps/via/keymap.c
index 58cd2291dd..b328b0e735 100644
--- a/keyboards/mt/blocked65/keymaps/via/keymap.c
+++ b/keyboards/mt/blocked65/keymaps/via/keymap.c
@@ -15,7 +15,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BL] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/murcielago/rev1/keymaps/default/keymap.c b/keyboards/murcielago/rev1/keymaps/default/keymap.c
index 7470fef2b4..63fbb04f7b 100644
--- a/keyboards/murcielago/rev1/keymaps/default/keymap.c
+++ b/keyboards/murcielago/rev1/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_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_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    QK_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
              KC_LALT, KC_LGUI, SYM,     KC_BSPC, KC_LCTL,                   KC_RALT, KC_SPC,  NAV,     FN,      KC_MPLY
   ),
 
diff --git a/keyboards/murcielago/rev1/keymaps/via/keymap.c b/keyboards/murcielago/rev1/keymaps/via/keymap.c
index 7470fef2b4..63fbb04f7b 100644
--- a/keyboards/murcielago/rev1/keymaps/via/keymap.c
+++ b/keyboards/murcielago/rev1/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_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_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    QK_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
              KC_LALT, KC_LGUI, SYM,     KC_BSPC, KC_LCTL,                   KC_RALT, KC_SPC,  NAV,     FN,      KC_MPLY
   ),
 
diff --git a/keyboards/mxss/keymaps/default/keymap.c b/keyboards/mxss/keymaps/default/keymap.c
index bb34ccd996..8fe84d6b45 100644
--- a/keyboards/mxss/keymaps/default/keymap.c
+++ b/keyboards/mxss/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT( /* Base */
-	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+	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_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,
diff --git a/keyboards/mxss/keymaps/via/keymap.c b/keyboards/mxss/keymaps/via/keymap.c
index 29d91460f0..ae7b7ff40c 100644
--- a/keyboards/mxss/keymaps/via/keymap.c
+++ b/keyboards/mxss/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all( /* L0 */
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_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_NO, KC_ENT, KC_PGUP,
         KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
diff --git a/keyboards/mysticworks/wyvern/keymaps/default/keymap.c b/keyboards/mysticworks/wyvern/keymaps/default/keymap.c
index 59f366b9be..e95d7e0d80 100644
--- a/keyboards/mysticworks/wyvern/keymaps/default/keymap.c
+++ b/keyboards/mysticworks/wyvern/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP,
     KC_P4,   KC_P5,   KC_P6,   KC_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_NUBS, KC_ENT,  KC_PGDN,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_LSFT, KC_NUHS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(1),
diff --git a/keyboards/mysticworks/wyvern/keymaps/via/keymap.c b/keyboards/mysticworks/wyvern/keymaps/via/keymap.c
index c58862f222..bcf6198ede 100644
--- a/keyboards/mysticworks/wyvern/keymaps/via/keymap.c
+++ b/keyboards/mysticworks/wyvern/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP,
     KC_P4,   KC_P5,   KC_P6,   KC_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_NUBS, KC_ENT,  KC_PGDN,
     KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_LSFT, KC_NUHS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(1),
diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c
index a9cc10f147..0ec8bfdbb4 100644
--- a/keyboards/neito/keymaps/default/keymap.c
+++ b/keyboards/neito/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DEFAULT] = LAYOUT(
-        KC_GESC, KC_1, KC_2,      KC_3, KC_4, KC_5, KC_6,                    KC_7, KC_8, KC_9, KC_0,                      KC_MINS, KC_EQL, KC_BSPC,                KC_MUTE,
+        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_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_ENT,              MO(_FN0),
         KC_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,           MO(_FN1),
         KC_LSFT, KC_NUBS, KC_Z,   KC_X, KC_C, KC_V, KC_B,              KC_B, KC_N, KC_M, KC_COMM, KC_DOT,                       KC_SLSH, KC_RSFT,         KC_UP,
diff --git a/keyboards/neito/keymaps/olli_works/keymap.c b/keyboards/neito/keymaps/olli_works/keymap.c
index c17d1f95ab..7c714af43a 100644
--- a/keyboards/neito/keymaps/olli_works/keymap.c
+++ b/keyboards/neito/keymaps/olli_works/keymap.c
@@ -25,7 +25,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DEFAULT] = LAYOUT(
-        KC_GESC, KC_1, KC_2,      KC_3, KC_4, KC_5, KC_6,                    KC_7, KC_8, KC_9, KC_0,                        KC_MINS, KC_EQL, KC_BSPC,              KC_MUTE,
+        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_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_ENT,              TG(_MAC),
         MO(_FN1), KC_A,           KC_S, KC_D, KC_F, KC_G,                    KC_H, KC_J, KC_K, KC_L,                          KC_SCLN, KC_QUOT, KC_NUHS,           MO(_FN2),
         KC_LSFT, KC_NUBS, KC_Z,   KC_X, KC_C, KC_V, KC_B,              KC_B, KC_N, KC_M, KC_COMM, KC_DOT,                       KC_SLSH, KC_RSFT,         KC_UP,
diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c
index a9cc10f147..0ec8bfdbb4 100644
--- a/keyboards/neito/keymaps/via/keymap.c
+++ b/keyboards/neito/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DEFAULT] = LAYOUT(
-        KC_GESC, KC_1, KC_2,      KC_3, KC_4, KC_5, KC_6,                    KC_7, KC_8, KC_9, KC_0,                      KC_MINS, KC_EQL, KC_BSPC,                KC_MUTE,
+        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_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_ENT,              MO(_FN0),
         KC_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,           MO(_FN1),
         KC_LSFT, KC_NUBS, KC_Z,   KC_X, KC_C, KC_V, KC_B,              KC_B, KC_N, KC_M, KC_COMM, KC_DOT,                       KC_SLSH, KC_RSFT,         KC_UP,
diff --git a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c
index 70b9c19126..b5b909a07d 100644
--- a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c
+++ b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_alice_split_bs(
-        KC_ESC,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC, 
+        KC_ESC,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC, 
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          
         KC_PGDN,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           
                     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            
diff --git a/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c b/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c
index 477336847d..fbf3eb0271 100644
--- a/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c
+++ b/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC, 
+        KC_ESC,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC, 
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          
         KC_PGDN,    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           
                     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            
diff --git a/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c b/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c
index bc898dd3bc..744d365b57 100644
--- a/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c
+++ b/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC, 
+        KC_ESC,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC, 
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          
         KC_PGDN,    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENTER,           
                     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/nightmare/keymaps/default/keymap.c b/keyboards/nightmare/keymaps/default/keymap.c
index dd8896cefc..7c8bcd4d6d 100644
--- a/keyboards/nightmare/keymaps/default/keymap.c
+++ b/keyboards/nightmare/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split(/* Base */
-                 KC_HOME, KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+                 KC_HOME, QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
                  KC_END, OPT_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
                  KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
                  KC_PGDN, KC_LGUI, KC_LALT, KC_LALT, KC_SPACE, KC_SPACE, KC_RGUI, KC_RCTL, MO(2)),
diff --git a/keyboards/nightmare/keymaps/via/keymap.c b/keyboards/nightmare/keymaps/via/keymap.c
index a347e7e4dc..3128f0c76a 100644
--- a/keyboards/nightmare/keymaps/via/keymap.c
+++ b/keyboards/nightmare/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split(/* Base */
-        KC_HOME, KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+        KC_HOME, QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
         KC_END, LCTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
         KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
         KC_PGDN, KC_LGUI, KC_LALT, KC_LALT, KC_SPACE, KC_SPACE, KC_RGUI, KC_RCTL, MO(2)),
diff --git a/keyboards/nix_studio/n60_a/keymaps/default/keymap.c b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
index e49120a5c0..a057e1ea41 100644
--- a/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
+++ b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, 
+        QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, 
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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, MO(1),   
diff --git a/keyboards/nix_studio/n60_a/keymaps/via/keymap.c b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
index 166fc4c3ed..36b547eb8e 100644
--- a/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
+++ b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, 
+        QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, 
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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, MO(1),   
diff --git a/keyboards/novelkeys/nk65/keymaps/default/keymap.c b/keyboards/novelkeys/nk65/keymaps/default/keymap.c
index 597da5c18d..c8ab09e317 100755
--- a/keyboards/novelkeys/nk65/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
index 093d929699..ea00650c37 100755
--- a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
+++ b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
@@ -22,7 +22,7 @@ enum my_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_HOME,\
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_HOME,\
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,\
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,\
     KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END, \
diff --git a/keyboards/novelkeys/nk65/keymaps/via/keymap.c b/keyboards/novelkeys/nk65/keymaps/via/keymap.c
index 597da5c18d..c8ab09e317 100755
--- a/keyboards/novelkeys/nk65/keymaps/via/keymap.c
+++ b/keyboards/novelkeys/nk65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/novelkeys/nk65b/keymaps/default/keymap.c b/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
index feac00f10c..1a2496db27 100755
--- a/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk65b/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/novelkeys/nk65b/keymaps/via/keymap.c b/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
index 4849af39d1..d64872a40c 100755
--- a/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
+++ b/keyboards/novelkeys/nk65b/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_65_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    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,
diff --git a/keyboards/noxary/378/keymaps/default/keymap.c b/keyboards/noxary/378/keymaps/default/keymap.c
index 0bd9b7390d..6fd622466e 100755
--- a/keyboards/noxary/378/keymaps/default/keymap.c
+++ b/keyboards/noxary/378/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_F1  , KC_F6  , KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_PSCR,
+        KC_F1  , KC_F6  , 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_PSCR,
         KC_F2  , KC_F7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
         KC_F3  , KC_F8  , KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_HOME,
         KC_F4  , KC_F9  , KC_LSFT,          KC_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 ,
diff --git a/keyboards/noxary/378/keymaps/via/keymap.c b/keyboards/noxary/378/keymaps/via/keymap.c
index bcbe816903..580f435b41 100755
--- a/keyboards/noxary/378/keymaps/via/keymap.c
+++ b/keyboards/noxary/378/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_F1  , KC_F6  , KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_PSCR,
+        KC_F1  , KC_F6  , 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_PSCR,
         KC_F2  , KC_F7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
         KC_F3  , KC_F8  , KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_HOME,
         KC_F4  , KC_F9  , KC_LSFT,          KC_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 ,
diff --git a/keyboards/noxary/valhalla/keymaps/default/keymap.c b/keyboards/noxary/valhalla/keymaps/default/keymap.c
index cb251d585d..88330acf5c 100755
--- a/keyboards/noxary/valhalla/keymaps/default/keymap.c
+++ b/keyboards/noxary/valhalla/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_GESC, KC_1   , KC_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 ,
+        QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_DEL ,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_PGDN,
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
diff --git a/keyboards/noxary/valhalla/keymaps/via/keymap.c b/keyboards/noxary/valhalla/keymaps/via/keymap.c
index cb251d585d..88330acf5c 100755
--- a/keyboards/noxary/valhalla/keymaps/via/keymap.c
+++ b/keyboards/noxary/valhalla/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_GESC, KC_1   , KC_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 ,
+        QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_DEL ,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_PGDN,
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
index 586de79af3..631f28171a 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
@@ -44,7 +44,7 @@ bool deafened = false;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-              KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+              QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
     KC_F13,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_F14,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
     KC_F15,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
index 86fe152cd4..399fe552df 100644
--- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ bool deafened = false;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-              KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+              QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
     KC_F13,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_F14,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
     KC_F15,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
index 895533c39f..e0ba37f674 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
+++ b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
@@ -45,7 +45,7 @@ const key_override_t **key_overrides = (const key_override_t *[]){
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Qwerty */
     [_QWERTY] = LAYOUT(
-    KC_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,
+    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), KC_SFTENT, RAISE,   KC_RGUI,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/keyboards/onekeyco/dango40/keymaps/default/keymap.c b/keyboards/onekeyco/dango40/keymaps/default/keymap.c
index 4bed789d0c..88fb656a42 100644
--- a/keyboards/onekeyco/dango40/keymaps/default/keymap.c
+++ b/keyboards/onekeyco/dango40/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-    KC_GESC,  KC_Q   ,  KC_W   ,  KC_E   ,  KC_R   ,  KC_T   ,  KC_Y   ,  KC_U   ,  KC_I   ,  KC_O   ,  KC_P   ,  KC_BSPC,  KC_MUTE, 
+    QK_GESC,  KC_Q   ,  KC_W   ,  KC_E   ,  KC_R   ,  KC_T   ,  KC_Y   ,  KC_U   ,  KC_I   ,  KC_O   ,  KC_P   ,  KC_BSPC,  KC_MUTE, 
     KC_TAB ,  KC_A   ,  KC_S   ,  KC_D   ,  KC_F   ,  KC_G   ,  KC_H   ,  KC_J   ,  KC_K   ,  KC_L   ,  KC_SCLN,  KC_ENT ,  KC_PGUP, 
     KC_LSFT,  KC_Z   ,  KC_X   ,  KC_C   ,  KC_V   ,  KC_B   ,  KC_N   ,  KC_M   ,  KC_COMM,  KC_DOT ,  KC_SLSH,  KC_RSFT,  KC_PGDN, 
     KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC ,            KC_SPC ,  KC_RALT,            KC_RCTL,  MO(1)  ,  KC_RGHT                
diff --git a/keyboards/onekeyco/dango40/keymaps/via/keymap.c b/keyboards/onekeyco/dango40/keymaps/via/keymap.c
index 5c13bcee86..28c73c5741 100644
--- a/keyboards/onekeyco/dango40/keymaps/via/keymap.c
+++ b/keyboards/onekeyco/dango40/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-    KC_GESC,  KC_Q   ,  KC_W   ,  KC_E   ,  KC_R   ,  KC_T   ,  KC_Y   ,  KC_U   ,  KC_I   ,  KC_O   ,  KC_P   ,  KC_BSPC,  KC_MUTE, 
+    QK_GESC,  KC_Q   ,  KC_W   ,  KC_E   ,  KC_R   ,  KC_T   ,  KC_Y   ,  KC_U   ,  KC_I   ,  KC_O   ,  KC_P   ,  KC_BSPC,  KC_MUTE, 
     KC_TAB ,  KC_A   ,  KC_S   ,  KC_D   ,  KC_F   ,  KC_G   ,  KC_H   ,  KC_J   ,  KC_K   ,  KC_L   ,  KC_SCLN,  KC_ENT ,  KC_PGUP, 
     KC_LSFT,  KC_Z   ,  KC_X   ,  KC_C   ,  KC_V   ,  KC_B   ,  KC_N   ,  KC_M   ,  KC_COMM,  KC_DOT ,  KC_SLSH,  KC_RSFT,  KC_PGDN, 
     KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC ,            KC_SPC ,  KC_RALT,            KC_RCTL,  MO(1)  ,  KC_RGHT            
diff --git a/keyboards/org60/keymaps/boardy/keymap.c b/keyboards/org60/keymaps/boardy/keymap.c
index 52eea78a8d..1c3e784556 100644
--- a/keyboards/org60/keymaps/boardy/keymap.c
+++ b/keyboards/org60/keymaps/boardy/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    //--------------------------------------------------------------------------------------------------------------------------------------.
    //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
    //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,   
+     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,   
    //--------------------------------------------------------------------------------------------------------------------------------------|
    //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
    //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
diff --git a/keyboards/orthocode/keymaps/default/keymap.c b/keyboards/orthocode/keymaps/default/keymap.c
index ee01cd620f..ba00c5956a 100644
--- a/keyboards/orthocode/keymaps/default/keymap.c
+++ b/keyboards/orthocode/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /* Rotary                                                                                                                                  */
         KC_MUTE,
      /*           esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
-        RGB_TOG,    KC_GESC, KC_1,    KC_2,    KC_3,  KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_HOME,
+        RGB_TOG,    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_HOME,
      /*           tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
         RGB_MOD,    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,
      /*           caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
diff --git a/keyboards/orthocode/keymaps/via/keymap.c b/keyboards/orthocode/keymaps/via/keymap.c
index e28420e7d8..177f5ad190 100644
--- a/keyboards/orthocode/keymaps/via/keymap.c
+++ b/keyboards/orthocode/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /* Rotary                                                                                                                                  */
         KC_MUTE,
      /*           esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
-        RGB_TOG,    KC_GESC, KC_1,    KC_2,    KC_3,  KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_HOME,
+        RGB_TOG,    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_HOME,
      /*           tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
         RGB_MOD,    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,
      /*           caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
diff --git a/keyboards/pearl/keymaps/default/keymap.c b/keyboards/pearl/keymaps/default/keymap.c
index bffa9b14f1..be63e345dc 100644
--- a/keyboards/pearl/keymaps/default/keymap.c
+++ b/keyboards/pearl/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-      KC_GESC,               KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_BSPC,
+      QK_GESC,               KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_BSPC,
       KC_TAB,                KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_ENT,
       MT(MOD_LSFT, KC_CAPS), 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_LSFT,    KC_SPC,        KC_SPC, KC_APP,  MO(1)
diff --git a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
index 69118a59df..acdd80944e 100644
--- a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC,       KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+    QK_GESC,       KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
     LT(2, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, LT(2,KC_ENT),
     KC_LSFT,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
     KC_LCTL,    KC_LGUI, KC_LALT,    KC_BSPC,    KC_NO,      LT(1, KC_SPC),    MO(3), KC_RALT
diff --git a/keyboards/pearlboards/atlas/keymaps/default/keymap.c b/keyboards/pearlboards/atlas/keymaps/default/keymap.c
index fffdaf4b08..af7b9831db 100644
--- a/keyboards/pearlboards/atlas/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/atlas/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all(
-		KC_GESC,  KC_1,     KC_2,      KC_3,  KC_4,  KC_5,  KC_6,  KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_COPY,
+		QK_GESC,  KC_1,     KC_2,      KC_3,  KC_4,  KC_5,  KC_6,  KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_COPY,
 		KC_TAB,   KC_Q,     KC_W,      KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,    KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_PSTE,
 		KC_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_FIND,
 		KC_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),
diff --git a/keyboards/pearlboards/atlas/keymaps/via/keymap.c b/keyboards/pearlboards/atlas/keymaps/via/keymap.c
index 49fccc63c8..6fb385869b 100644
--- a/keyboards/pearlboards/atlas/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/atlas/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_all(
-		KC_GESC,  KC_1,     KC_2,      KC_3,  KC_4,  KC_5,  KC_6,  KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_BSPC,
+		QK_GESC,  KC_1,     KC_2,      KC_3,  KC_4,  KC_5,  KC_6,  KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_BSPC,
 		KC_TAB,   KC_Q,     KC_W,      KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,    KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,
 		KC_CAPS,  KC_A,     KC_S,      KC_D,  KC_F,  KC_G,  KC_H,  KC_J,    KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT ,            KC_MEDIA_PLAY_PAUSE,
 		KC_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),
diff --git a/keyboards/pearlboards/pandora/keymaps/default/keymap.c b/keyboards/pearlboards/pandora/keymaps/default/keymap.c
index c8bc6636a1..974ea1fc10 100644
--- a/keyboards/pearlboards/pandora/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/pandora/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,  KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,    KC_BSPC,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,  KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,    KC_BSPC,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,    KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,    KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
diff --git a/keyboards/pearlboards/pandora/keymaps/via/keymap.c b/keyboards/pearlboards/pandora/keymaps/via/keymap.c
index 369b30b5a3..b306772e1c 100644
--- a/keyboards/pearlboards/pandora/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/pandora/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,  KC_7,   KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,    KC_BSPC,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,  KC_7,   KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_DEL,    KC_BSPC,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,   KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,   KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
diff --git a/keyboards/pearlboards/pearl/keymaps/default/keymap.c b/keyboards/pearlboards/pearl/keymaps/default/keymap.c
index 0462f74d63..56b4f54469 100644
--- a/keyboards/pearlboards/pearl/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/pearl/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all(
-		KC_GESC,  KC_Q,     KC_W,     KC_E,    KC_R,     KC_T,    KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,     KC_MINS,  KC_BSPC,
+		QK_GESC,  KC_Q,     KC_W,     KC_E,    KC_R,     KC_T,    KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,     KC_MINS,  KC_BSPC,
 		KC_TAB,   KC_A,     KC_S,     KC_D,    KC_F,     KC_G,    KC_H,   KC_J,  KC_K,     KC_L,    KC_SCLN,  KC_ENT,
 		KC_CAPS,  KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,    KC_N,   KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,
 		KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  KC_BSPC,  KC_APP,  MO(1)),
diff --git a/keyboards/pearlboards/pearl/keymaps/via/keymap.c b/keyboards/pearlboards/pearl/keymaps/via/keymap.c
index 706ae597b4..7da48bdabc 100644
--- a/keyboards/pearlboards/pearl/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/pearl/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_all(
-		KC_GESC,  KC_Q,     KC_W,     KC_E,    KC_R,     KC_T,    KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,     KC_MINS,  KC_BSPC,
+		QK_GESC,  KC_Q,     KC_W,     KC_E,    KC_R,     KC_T,    KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,     KC_MINS,  KC_BSPC,
 		KC_TAB,   KC_A,     KC_S,     KC_D,    KC_F,     KC_G,    KC_H,   KC_J,  KC_K,     KC_L,    KC_SCLN,  KC_ENT,
 		KC_CAPS,  KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,    KC_N,   KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,
 		KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  KC_BSPC,  KC_APP,  MO(1)),
diff --git a/keyboards/pearlboards/zeus/keymaps/default/keymap.c b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
index 4fafc63d95..5d560ecefc 100644
--- a/keyboards/pearlboards/zeus/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
                                    KC_MEDIA_PLAY_PAUSE,
-        KC_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,
+        QK_GESC,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/pearlboards/zeus/keymaps/via/keymap.c b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
index 6be8bce5d5..c36f486f58 100644
--- a/keyboards/pearlboards/zeus/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
                                    KC_MEDIA_PLAY_PAUSE,
-        KC_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,
+        QK_GESC,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
diff --git a/keyboards/peej/rosaline/ortho/keymaps/default/keymap.c b/keyboards/peej/rosaline/ortho/keymaps/default/keymap.c
index e307ecccb3..eb5c16c111 100644
--- a/keyboards/peej/rosaline/ortho/keymaps/default/keymap.c
+++ b/keyboards/peej/rosaline/ortho/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_ortho_4x15(
     KC_TAB,  KC_Q, KC_W,    KC_E,    KC_R, KC_T,   KC_P7,  KC_P8, KC_P9,  KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_GESC, KC_A, KC_S,    KC_D,    KC_F, KC_G,   KC_P4,  KC_P5, KC_P6,  KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    QK_GESC, KC_A, KC_S,    KC_D,    KC_F, KC_G,   KC_P4,  KC_P5, KC_P6,  KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z, KC_X,    KC_C,    KC_V, KC_B,   KC_P1,  KC_P2, KC_P3,  KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
     KC_LCTL, FN,   KC_LALT, KC_LGUI, FN,   KC_SPC, KC_SPC, KC_P0, KC_SPC, KC_SPC, FN,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/peej/rosaline/ortho/keymaps/via/keymap.c b/keyboards/peej/rosaline/ortho/keymaps/via/keymap.c
index 0a6068fa96..d99e858d2c 100644
--- a/keyboards/peej/rosaline/ortho/keymaps/via/keymap.c
+++ b/keyboards/peej/rosaline/ortho/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_ortho_4x15(
     KC_TAB,  KC_Q,   KC_W,     KC_E,    KC_R,   KC_T,     KC_P7,   KC_P8,   KC_P9,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_GESC, KC_A,   KC_S,     KC_D,    KC_F,   KC_G,     KC_P4,   KC_P5,   KC_P6,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    QK_GESC, KC_A,   KC_S,     KC_D,    KC_F,   KC_G,     KC_P4,   KC_P5,   KC_P6,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,   KC_X,     KC_C,    KC_V,   KC_B,     KC_P1,   KC_P2,   KC_P3,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
     KC_LCTL, MO(1),  KC_LALT,  KC_LGUI, MO(1),  KC_SPC,   KC_SPC,  KC_P0,   KC_SPC,  KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/peej/rosaline/staggered/keymaps/default/keymap.c b/keyboards/peej/rosaline/staggered/keymaps/default/keymap.c
index 11f3831c44..de1052ba77 100644
--- a/keyboards/peej/rosaline/staggered/keymaps/default/keymap.c
+++ b/keyboards/peej/rosaline/staggered/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_all(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-    KC_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    QK_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN,
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/peej/rosaline/staggered/keymaps/via/keymap.c b/keyboards/peej/rosaline/staggered/keymaps/via/keymap.c
index 87c0717da6..78f2d15467 100644
--- a/keyboards/peej/rosaline/staggered/keymaps/via/keymap.c
+++ b/keyboards/peej/rosaline/staggered/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_all(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-    KC_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    QK_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/peej/tripel/keymaps/default/keymap.c b/keyboards/peej/tripel/keymaps/default/keymap.c
index fa52bbce36..1273ef5695 100644
--- a/keyboards/peej/tripel/keymaps/default/keymap.c
+++ b/keyboards/peej/tripel/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------------------------------'
  */
  [_BASE] = LAYOUT_ortho_7u(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NUM,  KC_EQL,  KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NUM,  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_P7,   KC_P8,   KC_P9,   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_P4,   KC_P5,   KC_P6,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
diff --git a/keyboards/peej/tripel/keymaps/via/keymap.c b/keyboards/peej/tripel/keymaps/via/keymap.c
index 6b0bb776c6..ce7cf1bbd0 100644
--- a/keyboards/peej/tripel/keymaps/via/keymap.c
+++ b/keyboards/peej/tripel/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_ortho_7u(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NUM,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_NUM,  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_P7,   KC_P8,   KC_P9,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index 68af832d7c..edab3acf90 100644
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BL] = LAYOUT(
-      KC_GESC,        KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_LBRC,  KC_RBRC, KC_BSPC,  KC_DEL,    \
+      QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_LBRC,  KC_RBRC, KC_BSPC,  KC_DEL,    \
       KC_TAB,         KC_QUOT, KC_COMM, KC_DOT,  KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,    KC_L,    KC_SLSH,  KC_EQL,  KC_BSLS,  KC_PGUP,  \
       CTL_T(KC_CAPS), KC_A,    KC_O,    KC_E,    KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,    KC_S,    KC_MINS,  KC_ENT,            KC_PGDN,    \
       KC_LSPO,                 KC_SCLN, KC_Q,    KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,     KC_RSPC, KC_UP,    MO(_F2),      \
diff --git a/keyboards/percent/canoe/keymaps/default/keymap.c b/keyboards/percent/canoe/keymaps/default/keymap.c
index 669527698a..9c0e6680d5 100644
--- a/keyboards/percent/canoe/keymaps/default/keymap.c
+++ b/keyboards/percent/canoe/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BL] = LAYOUT_65_ansi_blocker(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_PSCR,
+      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_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,
diff --git a/keyboards/percent/canoe/keymaps/via/keymap.c b/keyboards/percent/canoe/keymaps/via/keymap.c
index 8b8f09c0f8..e381cf7f2f 100644
--- a/keyboards/percent/canoe/keymaps/via/keymap.c
+++ b/keyboards/percent/canoe/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT_65_ansi_blocker(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PSCR,
+      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_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,
diff --git a/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c b/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c
index de4229e906..2038883510 100644
--- a/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c
+++ b/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_GESC,    KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,    RGB_TOG,
+        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,    RGB_TOG,
         KC_TAB,     KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,    KC_HOME,
         KC_CAPS,    KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN,  KC_QUOT,    KC_ENT,                 KC_END,
         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,
diff --git a/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c b/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c
index 896e8afc78..8d18625a88 100644
--- a/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c
+++ b/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC,    KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,    RGB_TOG,
+        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,    RGB_TOG,
         KC_TAB,     KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,    KC_HOME,
         KC_CAPS,    KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN,  KC_QUOT,    KC_ENT,                 KC_END,
         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,
diff --git a/keyboards/planck/keymaps/abhixec/keymap.c b/keyboards/planck/keymaps/abhixec/keymap.c
index 9b5256e3a9..cfaef27e73 100644
--- a/keyboards/planck/keymaps/abhixec/keymap.c
+++ b/keyboards/planck/keymaps/abhixec/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_planck_grid(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_GESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    QK_GESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SHENT ,
     _______,KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_COLEMAK] = LAYOUT_planck_grid(
     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_GESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    QK_GESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SHENT ,
      _______,KC_LCTL, KC_LALT,KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index fca84bd461..4a3d30508d 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -207,7 +207,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------'
  */
 [_GAMING] = LAYOUT_planck_grid( /* GAMING */
-  KC_GESC, KC_1,  KC_2,  KC_3,    KC_4,    KC_5,   KC_6,   KC_7,  KC_P8,   KC_9,  KC_0,    EXT_GAMING,
+  QK_GESC, KC_1,  KC_2,  KC_3,    KC_4,    KC_5,   KC_6,   KC_7,  KC_P8,   KC_9,  KC_0,    EXT_GAMING,
   KC_TAB,  KC_Q,  KC_W,  KC_E,    KC_R,    KC_T,   KC_I,   KC_P4, KC_P5,   KC_P6, KC_PMNS, KC_PPLS,
   KC_LSFT, KC_A,  KC_S,  KC_D,    KC_F,    KC_G,   KC_K,   KC_P1, KC_P2,   KC_P3, KC_PSLS, KC_PAST,
   KC_NO,   KC_NO, KC_NO, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_P0, KC_PDOT, KC_NO, KC_NO,   KC_NO
diff --git a/keyboards/planck/keymaps/davidrambo/keymap.c b/keyboards/planck/keymaps/davidrambo/keymap.c
index 66151adcbc..bd0603a760 100644
--- a/keyboards/planck/keymaps/davidrambo/keymap.c
+++ b/keyboards/planck/keymaps/davidrambo/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 
 [_COLEMAK] = LAYOUT_planck_grid(
-  KC_GESC, KC_Q   , KC_W   , KC_F   , KC_P   , KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+  QK_GESC, KC_Q   , KC_W   , KC_F   , KC_P   , KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
   NAV    , KC_A   , KC_R   , KC_S   , KC_T   , KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   SftLck , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SftEnt ,
   RECT   , KC_LGUI, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
index 31855f7685..c5d2df86ce 100644
--- a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_planck_grid(
-    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
     RGB_TOG, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/planck/keymaps/mjuma/keymap.c b/keyboards/planck/keymaps/mjuma/keymap.c
index 825e3d681b..4d0209a91b 100644
--- a/keyboards/planck/keymaps/mjuma/keymap.c
+++ b/keyboards/planck/keymaps/mjuma/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_planck_grid(
     KC_TAB,            KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,      KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_GESC,           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    QK_GESC,           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     TD(TD_SHIFT_CAPS), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_N,      KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
     KC_LCTL,           FN,      KC_LALT, KC_LGUI, LOWER,   SPACE_FN,  SPACE_FN,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_GAMING] = LAYOUT_planck_grid(
     KC_TAB,            KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,      KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_GESC,           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    QK_GESC,           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     TD(TD_SHIFT_CAPS), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_N,      KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
     KC_LCTL, FN,       KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,    RAISE,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
diff --git a/keyboards/planck/keymaps/roguepullrequest/keymap.c b/keyboards/planck/keymaps/roguepullrequest/keymap.c
index 848ececd1a..53171593b2 100644
--- a/keyboards/planck/keymaps/roguepullrequest/keymap.c
+++ b/keyboards/planck/keymaps/roguepullrequest/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	/* Programmer Dvorak */
 	[_PDVORAK] = LAYOUT_planck_grid(
-		  KC_GESC, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
+		  QK_GESC, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
    		KC_LAST, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, TD(TD_S), TD(SLASH),
    		TD(LSHIFT), KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, TD(RSHIFT),
     	TD(X_AT_FUN), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, ALT_TAB, KC_SPACE, KC_ENTER, MT(MOD_LCTL | MOD_LSFT, KC_LGUI), KC_PGUP, KC_PGDN, LT(_LOWER, KC_PLUS)
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index a6f75f4fc7..f49e6e48e9 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -272,7 +272,7 @@ bool led_update_user(led_t led_state) {
 // Define key layout/layers
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                             // Define all the layers
     [_BASE] = LAYOUT_planck_mit(                                                                           //
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,                      //
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,                      //
         LT(_TABULA, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,       //
         TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT,  //
         TD(TD_LCTL_STICKY), KC_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
@@ -290,7 +290,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_COLEMAK] = LAYOUT_planck_mit(                                                                        //
-        KC_GESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,                   //
+        QK_GESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,                   //
         LT(_TABULA, KC_TAB), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,          //
         TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT,  //
         TD(TD_LCTL_STICKY), KC_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
@@ -308,7 +308,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_DVORAK] = LAYOUT_planck_mit(                                                                    //
-        KC_GESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,         //
+        QK_GESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,         //
         LT(_TABULA, KC_TAB), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_TRNS, KC_S, KC_SLSH,  //
         TD(TD_LSHFT_CAPS), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SFTENT,  //
         TD(TD_LCTL_STICKY), KC_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
diff --git a/keyboards/planck/keymaps/skank/keymap.c b/keyboards/planck/keymaps/skank/keymap.c
index da7b471085..7eaeb98134 100644
--- a/keyboards/planck/keymaps/skank/keymap.c
+++ b/keyboards/planck/keymaps/skank/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    QK_GESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
     KC_LCTL, KC_LALT, KC_LGUI, KC_BSLS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_COLEMAK] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_GESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    QK_GESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
     KC_LCTL, KC_LALT, KC_LGUI, KC_BSLS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
diff --git a/keyboards/planck/keymaps/ttys0/keymap.c b/keyboards/planck/keymaps/ttys0/keymap.c
index 11bad3b7c4..c98cda20be 100644
--- a/keyboards/planck/keymaps/ttys0/keymap.c
+++ b/keyboards/planck/keymaps/ttys0/keymap.c
@@ -76,7 +76,7 @@
 #define mins KC_MINS
 #define quot KC_QUOT
 #define esc KC_ESC
-#define escg KC_GESC
+#define escg QK_GESC
 
 #define down KC_DOWN
 #define home G(KC_LEFT)
diff --git a/keyboards/playkbtw/ca66/keymaps/default/keymap.c b/keyboards/playkbtw/ca66/keymaps/default/keymap.c
index a723e2fb4d..65db4b6be3 100644
--- a/keyboards/playkbtw/ca66/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
-    KC_GESC,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC, KC_PSCR,
+    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_PSCR,
     KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,          KC_DEL,  
     MO(1),            KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,           KC_PGUP, 
     KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,                     KC_PGDN, 
diff --git a/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
index d759357b84..0f446fd8f6 100644
--- a/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/zyber/keymap.c
@@ -6,7 +6,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
-    KC_GESC,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+    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,     TD(LBRC), KC_RBRC, KC_BSLS,          KC_PGUP,
     CTRL_C_UP,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(QUOT),          KC_ENT,           KC_PGDN,
     KC_LSFT,   KC_NO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,                     KC_HOME,
diff --git a/keyboards/polilla/rev1/keymaps/default/keymap.c b/keyboards/polilla/rev1/keymaps/default/keymap.c
index 307c3552e8..eb3644d5b3 100644
--- a/keyboards/polilla/rev1/keymaps/default/keymap.c
+++ b/keyboards/polilla/rev1/keymaps/default/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LBRC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    QK_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
              KC_LALT, KC_LGUI, MF1,     KC_BSPC, KC_LCTL,                   ALT_BSL, KC_SPC,  MF2,     KC_RWIN, KC_CAPS
   ),
 
diff --git a/keyboards/polilla/rev1/keymaps/via/keymap.c b/keyboards/polilla/rev1/keymaps/via/keymap.c
index 3725107354..2f6c63c358 100644
--- a/keyboards/polilla/rev1/keymaps/via/keymap.c
+++ b/keyboards/polilla/rev1/keymaps/via/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LBRC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    QK_GESC, KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
              KC_LALT, KC_LGUI, MF1,     KC_BSPC, KC_LCTL,                   ALT_BSL, KC_SPC,  MF2,     KC_RWIN, KC_CAPS
   ),
 
diff --git a/keyboards/preonic/keymaps/ekis_isa/keymap.c b/keyboards/preonic/keymaps/ekis_isa/keymap.c
index c196d3607f..715fc0ea0c 100644
--- a/keyboards/preonic/keymaps/ekis_isa/keymap.c
+++ b/keyboards/preonic/keymaps/ekis_isa/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_preonic_1x2uC( \
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,  \
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_COLEMAK] = LAYOUT_preonic_1x2uC( \
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
+  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,  \
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_DVORAK] = LAYOUT_preonic_1x2uC( \
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
   KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
   KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,  \
diff --git a/keyboards/preonic/keymaps/kuatsure/keymap.c b/keyboards/preonic/keymaps/kuatsure/keymap.c
index 19860945ed..7e0ecf5c45 100644
--- a/keyboards/preonic/keymaps/kuatsure/keymap.c
+++ b/keyboards/preonic/keymaps/kuatsure/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = LAYOUT_preonic_grid_wrapper( \
-  KC_GESC, _________________SYMBOL_L1_________________,  _________________SYMBOL_R1_________________, _______, \
+  QK_GESC, _________________SYMBOL_L1_________________,  _________________SYMBOL_R1_________________, _______, \
   _______, _______, _______, KC_UP,   _______,  KC_GRV,  _______, ____CRBRACES____, KC_UNDS, _______, KC_PIPE, \
   _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_TILD, KC_EQL,  _____PARENS_____, KC_PLUS, KC_COLN, KC_DQT , \
   _______, KC_VOLD, KC_MRWD, KC_MPLY, KC_MFFD,  KC_VOLU, KC_MINS, ___SQBRACKETS___, _______, KC_QUES, _______, \
diff --git a/keyboards/preonic/keymaps/mguterl/keymap.c b/keyboards/preonic/keymaps/mguterl/keymap.c
index 4493a959f7..2a56a75309 100644
--- a/keyboards/preonic/keymaps/mguterl/keymap.c
+++ b/keyboards/preonic/keymaps/mguterl/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     ESC_CTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-    KC_GESC, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SPC_UTL, SPC_UTL, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    QK_GESC, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SPC_UTL, SPC_UTL, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /*
diff --git a/keyboards/preonic/keymaps/pcurt854/keymap.c b/keyboards/preonic/keymaps/pcurt854/keymap.c
index e4501e4220..445b41c450 100644
--- a/keyboards/preonic/keymaps/pcurt854/keymap.c
+++ b/keyboards/preonic/keymaps/pcurt854/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_preonic_grid(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  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_LEAD,
   LCTL_T(KC_ESC),
            KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_COLEMAK] = LAYOUT_preonic_grid(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LEAD,
   LCTL_T(KC_ESC),
            KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_DVORAK] = LAYOUT_preonic_grid(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LEAD,
   LCTL_T(KC_ESC),
            KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
diff --git a/keyboards/preonic/keymaps/seph/keymap.c b/keyboards/preonic/keymaps/seph/keymap.c
index 1584d2cb98..ea93c2ed12 100644
--- a/keyboards/preonic/keymaps/seph/keymap.c
+++ b/keyboards/preonic/keymaps/seph/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QW] = LAYOUT_ortho_5x12 ( \
-   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL , \
    KC_MINS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
diff --git a/keyboards/preonic/keymaps/trigotometry/keymap.c b/keyboards/preonic/keymaps/trigotometry/keymap.c
index f44c8becbe..80743039bd 100644
--- a/keyboards/preonic/keymaps/trigotometry/keymap.c
+++ b/keyboards/preonic/keymaps/trigotometry/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_preonic_grid(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   SFT_ENT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT, \
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
index e02cedcec9..9c8d24bb18 100644
--- a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
@@ -39,7 +39,7 @@ enum ilpse_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
-    KC_GESC, KC_Q,  KC_W,  KC_E,  KC_R,   KC_T,    KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_MINS, KC_BSPC,
+    QK_GESC, KC_Q,  KC_W,  KC_E,  KC_R,   KC_T,    KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_MINS, KC_BSPC,
     KC_TAB,  KC_A,  KC_S,  KC_D,  KC_F,   KC_G,    KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_ENT,
     KC_LSPO, KC_Z,  KC_X,  KC_C,  KC_V,   KC_B,    KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
     KC_LCTL, KC_LALT,          LOWER,  GUBS,      KC_SPC,  RAISE,          KC_RGUI, KC_RCTL
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
index be3ee52f39..f5a4d06204 100644
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [1] = LAYOUT(
-    KC_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,
+    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,
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
index a2660b8bd1..43a6ff338a 100644
--- a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
@@ -28,7 +28,7 @@ enum my_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_default(
-    KC_GESC, KC_GRV,  KC_1,  KC_2,    KC_3,   KC_4,    KC_5,  KC_6,  KC_7,   KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+    QK_GESC, KC_GRV,  KC_1,  KC_2,    KC_3,   KC_4,    KC_5,  KC_6,  KC_7,   KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
     KC_PGUP, KC_TAB,  KC_Q,  KC_W,    KC_E,   KC_R,    KC_T,         KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
     KC_PGDN, CAP_CTL, KC_A,  KC_S,    KC_D,   KC_F,    KC_G,         KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
              KC_LSFT, KC_Z,  KC_X,    KC_C,   KC_V,    KC_B,         KC_B,   KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
diff --git a/keyboards/protozoa/cassini/keymaps/default/keymap.c b/keyboards/protozoa/cassini/keymaps/default/keymap.c
index b631c1f66a..6f8749b23b 100644
--- a/keyboards/protozoa/cassini/keymaps/default/keymap.c
+++ b/keyboards/protozoa/cassini/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/protozoa/cassini/keymaps/via/keymap.c b/keyboards/protozoa/cassini/keymaps/via/keymap.c
index ebbc577f8d..2a3845ba1a 100644
--- a/keyboards/protozoa/cassini/keymaps/via/keymap.c
+++ b/keyboards/protozoa/cassini/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c
index 5cf76c8585..430c77b289 100644
--- a/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c
index 704c8bf46f..966f0b6efe 100644
--- a/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_iso(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c
index 3bd85273e8..14ba2a4339 100644
--- a/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c b/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c
index 5cf76c8585..430c77b289 100644
--- a/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c b/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c
index 704c8bf46f..966f0b6efe 100644
--- a/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_iso(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c b/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c
index a86b5fa6c7..f7e88610f0 100644
--- a/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c b/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c
index 5cf76c8585..430c77b289 100644
--- a/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c b/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c
index 704c8bf46f..966f0b6efe 100644
--- a/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_iso(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c b/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c
index a86b5fa6c7..f7e88610f0 100644
--- a/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/rart/rartlice/keymaps/default/keymap.c b/keyboards/rart/rartlice/keymaps/default/keymap.c
index 739382a750..eec2a4b176 100644
--- a/keyboards/rart/rartlice/keymaps/default/keymap.c
+++ b/keyboards/rart/rartlice/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-        KC_GESC, KC_ESC,  KC_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,
+        QK_GESC, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_DEL,
         KC_PGUP, KC_TAB,  KC_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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/rart/rartlice/keymaps/via/keymap.c b/keyboards/rart/rartlice/keymaps/via/keymap.c
index 5bb3627e76..5c28e7bc7b 100644
--- a/keyboards/rart/rartlice/keymaps/via/keymap.c
+++ b/keyboards/rart/rartlice/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-        KC_GESC, KC_ESC,  KC_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,
+        QK_GESC, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_DEL,
         KC_PGUP, KC_TAB,  KC_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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
index c29076e5e1..b7d46d1a7d 100644
--- a/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
+++ b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
-    KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+    QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, 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_QUOTE, KC_ENTER,
     KC_LSFT,  KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, KC_FN,
     KC_LALT,  KC_LGUI, KC_NUMS, KC_SYMS, KC_RGUI, KC_RALT
diff --git a/keyboards/redox_w/keymaps/dvorak/keymap.c b/keyboards/redox_w/keymaps/dvorak/keymap.c
index 25c33e6345..bf3d8917a4 100644
--- a/keyboards/redox_w/keymaps/dvorak/keymap.c
+++ b/keyboards/redox_w/keymaps/dvorak/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_DVORAK] = LAYOUT(
 //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_GESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
+    QK_GESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_TAB  ,KC_QUOT ,KC_COMM ,KC_DOT  ,KC_P    ,KC_Y    ,KC_LBRC,                          KC_RBRC ,KC_F    ,KC_G    ,KC_C    ,KC_R    ,KC_L    ,KC_SLSH  ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_SYMB] = LAYOUT(
 //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_GESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F8   ,KC_F9   ,KC_F10   ,KC_F11  ,KC_F12 ,KC_BSPC ,
+    QK_GESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F8   ,KC_F9   ,KC_F10   ,KC_F11  ,KC_F12 ,KC_BSPC ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_TAB , KC_BTN1 ,KC_MS_U  ,KC_BTN2 ,KC_WH_U ,KC_COPY ,KC_F6 ,                            KC_F7  ,KC_COPY ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_MPRV ,KC_PPLS ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_QWERTY] = LAYOUT(
 //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_GESC  ,KC_1     ,KC_2   ,KC_3    ,KC_4     ,KC_5   ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9     ,KC_0  ,KC_BSPC,
+    QK_GESC  ,KC_1     ,KC_2   ,KC_3    ,KC_4     ,KC_5   ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9     ,KC_0  ,KC_BSPC,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_TAB  ,KC_Q     ,KC_W   ,KC_E    ,KC_R    ,KC_T    ,KC_MINS ,                          KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT(
 //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_GESC   ,TO(0)   ,TO(1)   ,TO(2)   ,KC_NO   ,KC_NO   ,                                            KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO  ,KC_NO   ,
+    QK_GESC   ,TO(0)   ,TO(1)   ,TO(2)   ,KC_NO   ,KC_NO   ,                                            KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO  ,KC_NO   ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,                          KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,
 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c b/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
index 4dd8115c3d..e6019db2ee 100644
--- a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
+++ b/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
@@ -24,7 +24,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_numpad_split0(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, TG(1), KC_PSLS, KC_PAST, KC_PMNS, 
+        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), 
diff --git a/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c b/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c
index 5e72b5ffe1..351d77c80c 100644
--- a/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c
+++ b/keyboards/redscarf_iiplus/verd/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_numpad(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
+        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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, 
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_P1, KC_P2, KC_P3, 
diff --git a/keyboards/reviung/reviung53/keymaps/default/keymap.c b/keyboards/reviung/reviung53/keymaps/default/keymap.c
index 2fabf74fb9..4764cbd274 100644
--- a/keyboards/reviung/reviung53/keymaps/default/keymap.c
+++ b/keyboards/reviung/reviung53/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,               SP_LO,                   SP_RA,                KC_LALT,  KC_RGUI,  KC_RCTL
 	),
 	[_LOWER] = LAYOUT_reviung53(
-                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SCRL,  KC_PSCR,  _______,
+                        QK_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SCRL,  KC_PSCR,  _______,
     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
     _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  KC_QUOT,
     _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,            KC_SLSH,
diff --git a/keyboards/reviung/reviung53/keymaps/via/keymap.c b/keyboards/reviung/reviung53/keymaps/via/keymap.c
index 2fabf74fb9..4764cbd274 100644
--- a/keyboards/reviung/reviung53/keymaps/via/keymap.c
+++ b/keyboards/reviung/reviung53/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,               SP_LO,                   SP_RA,                KC_LALT,  KC_RGUI,  KC_RCTL
 	),
 	[_LOWER] = LAYOUT_reviung53(
-                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SCRL,  KC_PSCR,  _______,
+                        QK_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SCRL,  KC_PSCR,  _______,
     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
     _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  KC_QUOT,
     _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,            KC_SLSH,
diff --git a/keyboards/reviung/reviung61/keymaps/default/keymap.c b/keyboards/reviung/reviung61/keymaps/default/keymap.c
index c0ef54c357..4b66239d26 100644
--- a/keyboards/reviung/reviung61/keymaps/default/keymap.c
+++ b/keyboards/reviung/reviung61/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Base */
   [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c b/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c
index c0ef54c357..4b66239d26 100644
--- a/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c
+++ b/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Base */
   [_BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    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,
diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c
index 458ce164ae..f407f95833 100644
--- a/keyboards/rgbkb/mun/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
      */
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,   KC_RPRN,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c
index 458ce164ae..f407f95833 100644
--- a/keyboards/rgbkb/mun/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
      */
     [_QWERTY] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,   KC_RPRN,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
index 91ae64fd1b..fdf620d11e 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
      */
     [_QWERTY] = LAYOUT(
-        KC_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,
+        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,
         KC_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, KC_RSPC,
diff --git a/keyboards/rgbkb/pan/keymaps/default/keymap.c b/keyboards/rgbkb/pan/keymaps/default/keymap.c
index 214348122b..1d2811933c 100644
--- a/keyboards/rgbkb/pan/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/pan/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ enum layer_number {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT_all(
         KC_NO,                                                                                                      KC_NO,
-        GRAVE_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,
+        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_DEL,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
         KC_LSFT,   KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_COLEMAK] = LAYOUT_all(
         KC_NO,                                                                                                      KC_NO,
-        GRAVE_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,
+        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_DEL,
         KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
         FN_CAPS,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
         KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_ENT,
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index 341ea00bce..60e4873275 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                    `-------------'  `-------------'
    */
   [_QWERTY] = LAYOUT(
-    KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS,  KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+    QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS,  KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
      KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_RBRC,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
     FN_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_LPRN, KC_RPRN,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_LCBR, KC_RCBR,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                    `-------------'  `-------------'
    */
   [_COLEMAK] = LAYOUT(
-    KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS,  KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+    QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS,  KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
      KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_LBRC, KC_RBRC,    KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSLS,
     FN_CAPS,    KC_A,    KC_R,    KC_S,    KC_T,    KC_D, KC_LPRN, KC_RPRN,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_LCBR, KC_RCBR,    KC_K,    KC_M, KC_COMM, KC_DOT,  KC_SLSH,  KC_ENT,
diff --git a/keyboards/rgbkb/sol3/keymaps/default/keymap.c b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
index 6f97b626f9..995ac585ae 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ enum sol_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                  KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                  KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
diff --git a/keyboards/rgbkb/sol3/keymaps/via/keymap.c b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
index 2bd54eb96e..0daf3dbe66 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
@@ -62,7 +62,7 @@ enum sol_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT(
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                  KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                  KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
index b91ae7f922..b044652afd 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------''-----------------------------------------------'
    */
   [_QWERTY] = LAYOUT(
-    KC_GESC,          KC_1,    KC_2,    KC_3,    KC_4,     KC_5,                       KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    KC_BSPC,
+    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_ENT,
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
index c8d45933f5..3ae11c9d49 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------''-----------------------------------------------'
    */
   [_QWERTY] = LAYOUT( \
-    KC_GESC,          KC_1,    KC_2,    KC_3,    KC_4,     KC_5,                       KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    KC_BSPC, \
+    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, \
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
index 9e5d2212ea..19289846b6 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
@@ -52,7 +52,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_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, KC_GESC,  KC_ENT,  LT(_NAV, KC_SPACE), KC_RALT, MO(_NAV), _______, KC_MINS, KC_EQL
+    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
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
index a8d93e5639..ec7deb7118 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
@@ -116,7 +116,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
-KC_GESC, KC_1, 	KC_2, 	KC_3, 	KC_4, 	KC_5, 				KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, KC_BSLS, 
+QK_GESC, KC_1, 	KC_2, 	KC_3, 	KC_4, 	KC_5, 				KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, KC_BSLS, 
 KC_TAB,  KC_Q, 	KC_W, 	KC_E, 	KC_R, 	KC_T, 				KC_Y, 	KC_U, 	KC_I, 	KC_O, 	KC_P, KC_BSPC, 
 KC_LCTL, KC_A, 	KC_S, 	KC_D, 	KC_F, 	KC_G, 				KC_H, 	KC_J, 	KC_K, 	KC_L, 	KC_SCLN, KC_QUOT, 
 KC_LSFT, KC_Z, 	KC_X, 	KC_C, 	KC_V, 	KC_B, 				KC_N, 	KC_M, 	KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT, 
@@ -130,7 +130,7 @@ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 			MAGIC_TOGGLE_NKRO, KC_T
 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(
-KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, 				KC_6,KC_7, KC_8, KC_9, KC_0, KC_BSLS, 
+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, 
diff --git a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
index b67893170f..4b289b095f 100644
--- a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                    '-------------''-------------'
    */
   [_QWERTY] = LAYOUT(
-    KC_GESC,          KC_1,    KC_2,    KC_3,    KC_4,     KC_5,                       KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    KC_BSPC,
+    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,    RGB_RMOD,RGB_MOD,  KC_N,     KC_M,     KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
diff --git a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
index ed94b50ea1..131ac0e820 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
@@ -53,7 +53,7 @@ enum macro_keycodes {
   _30, _31, _32, _33, _34 \
 ) \
 LAYOUT_ortho_5x6( \
-      KC_GESC, _00,     _01,     _02,     _03,     _04, \
+      QK_GESC, _00,     _01,     _02,     _03,     _04, \
       KC_TAB,  _10,     _11,     _12,     _13,     _14, \
       FN_CAPS, _20,     _21,     _22,     _23,     _24, \
       KC_LSFT, _30,     _31,     _32,     _33,     _34, \
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c
index 63564b7654..db376d1a85 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * \------+------+------+------+------+------/  \------+------+------+------+------+------/
    */
   [_QWERTY] = LAYOUT_ortho_5x12(
-    KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+    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,
     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_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * \------+------+------+------+------+------/  \------+------+------+------+------+------/
    */
   [_COLEMAK] = LAYOUT_ortho_5x12(
-    KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+    QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
      KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,   KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSLS,
     FN_CAPS,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,   KC_K,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,   KC_M,    KC_H, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
index f4d5c82a71..63a26989b1 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * \------+------+------+------+------+------/  \------+------+------+------+------+------/
    */
   [_QWERTY] = LAYOUT_ortho_5x12(
-    KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+    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,
     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_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * \------+------+------+------+------+------/  \------+------+------+------+------+------/
    */
   [_COLEMAK] = LAYOUT_ortho_5x12(
-    KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+    QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
      KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,   KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSLS,
     FN_CAPS,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,   KC_K,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,   KC_M,    KC_H, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
index c4bcbcfbeb..21209271e1 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
@@ -29,7 +29,7 @@
   _20, _21, _22, _23, _24,  _25, _26, _27, _28, _29 \
 ) \
 EXPAND_LAYOUT( \
-      KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+      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,  _00,     _01,     _02,     _03,     _04,    _05,     _06,     _07,     _08,     _09,     KC_BSLS, \
       FN_CAPS, _10,     _11,     _12,     _13,     _14,    _15,     _16,     _17,     _18,     _19,     KC_QUOT, \
       KC_LSFT, _20,     _21,     _22,     _23,     _24,    _25,     _26,     _27,     _28,     _29,     KC_ENT, \
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 7e56c68605..6d1210048b 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -290,7 +290,7 @@ lookup_table_t lookup_table[333] =
  {"RESET", QK_BOOT},
  {"DB_TOGG", DB_TOGG},
  {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},
- {"KC_GESC", KC_GESC},
+ {"QK_GESC", QK_GESC},
  {"AU_ON", AU_ON},
  {"AU_OFF", AU_OFF},
  {"AU_TOG", AU_TOG},
diff --git a/keyboards/roseslite/keymaps/default/keymap.c b/keyboards/roseslite/keymaps/default/keymap.c
index 22365a5e2e..9e28ba9e9f 100644
--- a/keyboards/roseslite/keymaps/default/keymap.c
+++ b/keyboards/roseslite/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_HOME, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_PGUP,
+    KC_HOME, QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_PGUP,
     KC_END,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGDN,
     KC_INS,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    MO(1),
              KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/roseslite/keymaps/via/keymap.c b/keyboards/roseslite/keymaps/via/keymap.c
index b4b455cf38..0db056914e 100644
--- a/keyboards/roseslite/keymaps/via/keymap.c
+++ b/keyboards/roseslite/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_HOME, KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_PGUP,
+    KC_HOME, QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_PGUP,
     KC_END,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGDN,
     KC_INS,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    MO(1),
              KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
diff --git a/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c b/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
index 87eb3146e3..f0496b404b 100755
--- a/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
+++ b/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ enum keyboard_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, 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, XXXXXXX,
diff --git a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
index 0a8fa898c3..262000d6ca 100644
--- a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
+++ b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
@@ -24,7 +24,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_65_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
index c41ae1701f..721437956a 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        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,
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
index ce4f9f25ad..bd94b0dd77 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_split_bs_spc(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        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,
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
index d3e8e025fe..e55022baa6 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_split_spc(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
index 4fe88fceda..a3a6f1edb3 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_60_ansi_tsangan_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        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,
diff --git a/keyboards/sentraq/s65_x/keymaps/default/keymap.c b/keyboards/sentraq/s65_x/keymaps/default/keymap.c
index 66caedb7ba..dfce8a05b5 100644
--- a/keyboards/sentraq/s65_x/keymaps/default/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 0: ANSI qwerty */
   [_BL] = LAYOUT_65_ansi(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
     FL_CAPS, KC_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,
diff --git a/keyboards/sentraq/s65_x/keymaps/iso/keymap.c b/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
index 004b43a076..a0c0308b78 100644
--- a/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 0: ISO qwerty */
   [_BL] = LAYOUT_65_iso(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    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_END,
     FL_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,
diff --git a/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c b/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
index 3721bf2a25..5fa9c9cfb2 100644
--- a/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 0: ANSI qwerty */
   [_BL] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
         KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, \
         LT(_FL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,       KC_ENT,     KC_PGUP, \
         KC_LSFT,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT, KC_UP, KC_PGDN, \
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 1: Colemak layer */
   [_CM] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
         KC_TAB,  KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, \
         LT(_FL, KC_BSPC), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,       KC_ENT,     KC_PGUP, \
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT, KC_UP, KC_PGDN, \
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 2: Dvorak layer */
   [_DV] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, \
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, \
         KC_TAB,  KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_END, \
         LT(_FL, KC_BSPC), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,       KC_ENT,     KC_PGUP, \
         KC_LSFT,       KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,    KC_RSFT, KC_UP, KC_PGDN, \
diff --git a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
index c37f390865..60edf8da4f 100644
--- a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 0: ANSI qwerty */
   [_BL] = LAYOUT_65_ansi(
-        KC_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
+        QK_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, \
         LT(_FL, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,       KC_ENT,     KC_PGUP, \
         KC_LSPO,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSPC, KC_UP, KC_PGDN, \
diff --git a/keyboards/sentraq/s65_x/keymaps/smt/keymap.c b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
index 0d5be02fc3..e2c755aca6 100644
--- a/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 0: ANSI qwerty */
   [_QWERTY] = LAYOUT_65_ansi(
-    KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_GRV,  \
+    QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_GRV,  \
     HPR_TAB,  KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,  \
     CTL_ESC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_PGUP, \
     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  SFT_ENT,  KC_UP,    KC_PGDN, \
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 1: ANSI colemak */
   [_COLEMAK] = LAYOUT_65_ansi(
-    KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_GRV,  \
+    QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_GRV,  \
     HPR_TAB,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,  \
     CTL_ESC,  KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOT,            KC_ENT,   KC_PGUP, \
     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  SFT_ENT,  KC_UP,    KC_PGDN, \
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 2: ANSI dvorak */
   [_DVORAK] = LAYOUT_65_ansi(
-    KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_LBRC,  KC_RBRC,  KC_BSPC,  KC_GRV,  \
+    QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_LBRC,  KC_RBRC,  KC_BSPC,  KC_GRV,  \
     HPR_TAB,  KC_QUOT,  KC_COMM,  KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,     KC_C,     KC_R,     KC_L,     KC_SLSH,  KC_EQL,   KC_BSLS,  KC_DEL,  \
     CTL_ESC,  KC_A,     KC_O,     KC_E,     KC_U,     KC_I,     KC_D,     KC_H,     KC_T,     KC_N,     KC_S,     KC_MINS,            KC_ENT,   KC_PGUP, \
     KC_LSFT,            KC_SCLN,  KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,     KC_M,     KC_W,     KC_V,     KC_Z,     SFT_ENT,  KC_UP,    KC_PGDN, \
diff --git a/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c b/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c
index 94c2f9ddb2..16b8bd693b 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c
+++ b/keyboards/skippys_custom_pcs/rooboard65/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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_DEL,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c b/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c
index dee3d04ae8..9d3938fda8 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c
+++ b/keyboards/skippys_custom_pcs/rooboard65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_65_ansi(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+        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_DEL,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_65_ansi(
-        KC_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_TRNS,
+        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_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS,
         KC_TRNS, RGB_SPI, 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, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/slz40/keymaps/default/keymap.c b/keyboards/slz40/keymaps/default/keymap.c
index 5e35132110..cbb67b3769 100644
--- a/keyboards/slz40/keymaps/default/keymap.c
+++ b/keyboards/slz40/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, KC_BSPC,
+		QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, KC_BSPC,
 		LT(_FN, KC_TAB),  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  LT(_FN,KC_ENT),
 		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, 
 		KC_LCTL, KC_LGUI, KC_LALT,  LT(_FN2, KC_DEL), LT(_FN2, KC_ENTER),   KC_SPACE,   KC_QUOT,  KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/smithrune/iron165r2/keymaps/default/keymap.c b/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
index 901a0486e9..a9b88a29a0 100644
--- a/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
+++ b/keyboards/smithrune/iron165r2/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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,
diff --git a/keyboards/smithrune/iron165r2/keymaps/via/keymap.c b/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
index 901a0486e9..a9b88a29a0 100644
--- a/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
+++ b/keyboards/smithrune/iron165r2/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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,
diff --git a/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
index 3d27b48229..1a20fc1ebc 100755
--- a/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
+++ b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_68_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_PGUP,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_UP,
diff --git a/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
index 3d27b48229..1a20fc1ebc 100755
--- a/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
+++ b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_68_ansi( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_PGUP,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_INS,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_UP,
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
index efb16d920e..08c433bdb1 100755
--- a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
+++ b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_68_ansi_split_bs( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
index 565e11bd36..87727200f4 100755
--- a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
+++ b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_68_ansi_split_bs( /* Base */
-    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
     KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
diff --git a/keyboards/spaceman/yun65/keymaps/default/keymap.c b/keyboards/spaceman/yun65/keymaps/default/keymap.c
index 3c329160a6..4810ea41c4 100644
--- a/keyboards/spaceman/yun65/keymaps/default/keymap.c
+++ b/keyboards/spaceman/yun65/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, 
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, 
            KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_BSLS,    KC_F1, 
          KC_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_F2, 
          KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,  KC_RSFT,  KC_UP, KC_F3, 
diff --git a/keyboards/spaceman/yun65/keymaps/via/keymap.c b/keyboards/spaceman/yun65/keymaps/via/keymap.c
index 3c329160a6..4810ea41c4 100644
--- a/keyboards/spaceman/yun65/keymaps/via/keymap.c
+++ b/keyboards/spaceman/yun65/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, 
+        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, 
            KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_BSLS,    KC_F1, 
          KC_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_F2, 
          KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,  KC_RSFT,  KC_UP, KC_F3, 
diff --git a/keyboards/spiderisland/split78/keymaps/default/keymap.c b/keyboards/spiderisland/split78/keymaps/default/keymap.c
index 834017e537..87d00efbe2 100644
--- a/keyboards/spiderisland/split78/keymaps/default/keymap.c
+++ b/keyboards/spiderisland/split78/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_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,
+        QK_GESC,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_SCLN,          KC_ENT,
diff --git a/keyboards/switchplate/switchplate910/keymaps/default/keymap.c b/keyboards/switchplate/switchplate910/keymaps/default/keymap.c
index 021f545d2b..4387a5eb21 100644
--- a/keyboards/switchplate/switchplate910/keymaps/default/keymap.c
+++ b/keyboards/switchplate/switchplate910/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all( /* Base */
-	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_TRNS,
+	QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_TRNS,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_CAPS, KC_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,
diff --git a/keyboards/switchplate/switchplate910/keymaps/via/keymap.c b/keyboards/switchplate/switchplate910/keymaps/via/keymap.c
index 21c4ec3156..e21068a508 100644
--- a/keyboards/switchplate/switchplate910/keymaps/via/keymap.c
+++ b/keyboards/switchplate/switchplate910/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_all( /* Base */
-	KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_TRNS,
+	QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_TRNS,
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_CAPS, KC_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,
diff --git a/keyboards/sx60/keymaps/default/keymap.c b/keyboards/sx60/keymaps/default/keymap.c
index 9e730fa3e7..5ec3f52b8f 100755
--- a/keyboards/sx60/keymaps/default/keymap.c
+++ b/keyboards/sx60/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi_split_bs_rshift(
-                 KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+                 QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_HOME, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_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,
diff --git a/keyboards/sx60/keymaps/via/keymap.c b/keyboards/sx60/keymaps/via/keymap.c
index ac1034e57e..c52e9b9dbb 100755
--- a/keyboards/sx60/keymaps/via/keymap.c
+++ b/keyboards/sx60/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_ansi_split_bs_rshift(
-                 KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+                 QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_HOME, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_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,
diff --git a/keyboards/tada68/keymaps/abishalom/keymap.c b/keyboards/tada68/keymaps/abishalom/keymap.c
index 92088eb9ee..6e2099acb8 100644
--- a/keyboards/tada68/keymaps/abishalom/keymap.c
+++ b/keyboards/tada68/keymaps/abishalom/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
 [_BL] = LAYOUT_ansi(
-  KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
+  QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   LT(_FL, KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SEMI_FN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
diff --git a/keyboards/tada68/keymaps/bazooka/keymap.c b/keyboards/tada68/keymaps/bazooka/keymap.c
index 18da58607b..42f6d95228 100644
--- a/keyboards/tada68/keymaps/bazooka/keymap.c
+++ b/keyboards/tada68/keymaps/bazooka/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
 [_BL] = LAYOUT_ansi(
-  KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_GRV, \
+  QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_GRV, \
    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, \
   KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP, \
           KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT,  KC_UP,KC_PGDN, \
diff --git a/keyboards/tada68/keymaps/emdarcher/keymap.c b/keyboards/tada68/keymaps/emdarcher/keymap.c
index 6c459c2db0..38e7563266 100755
--- a/keyboards/tada68/keymaps/emdarcher/keymap.c
+++ b/keyboards/tada68/keymaps/emdarcher/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
 [_BL] = LAYOUT_ansi(
-  KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV,
+  QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV,
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL,
   KC_X0,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN,
diff --git a/keyboards/tada68/keymaps/fakb/keymap.c b/keyboards/tada68/keymaps/fakb/keymap.c
index 743c30ad62..3e30cffac0 100755
--- a/keyboards/tada68/keymaps/fakb/keymap.c
+++ b/keyboards/tada68/keymaps/fakb/keymap.c
@@ -12,7 +12,7 @@
 #define SPCE_MA LT(2,KC_SPC)
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ansi(
- KC_GESC,KC_1   ,KC_2   ,KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_NUBS,\
+ QK_GESC,KC_1   ,KC_2   ,KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_NUBS,\
  TABS_MA,KC_Q   ,KC_W   ,KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSPC,_______,\
  LCTL_MA,KC_A   ,KC_S   ,KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT ,_______,\
  LSFT_MA,KC_Z   ,KC_X   ,KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        RSFT_MA,MO(1)  ,_______,\
diff --git a/keyboards/tada68/keymaps/mattdicarlo/keymap.c b/keyboards/tada68/keymaps/mattdicarlo/keymap.c
index 8fad86b0be..208801a320 100755
--- a/keyboards/tada68/keymaps/mattdicarlo/keymap.c
+++ b/keyboards/tada68/keymaps/mattdicarlo/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Base layer, always active.
 [BASE_LAYER] = LAYOUT_ansi(
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, \
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,  \
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_DEL,  \
   KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   _______, \
diff --git a/keyboards/tada68/keymaps/mattgemmell/keymap.c b/keyboards/tada68/keymaps/mattgemmell/keymap.c
index 93b2ebc1c7..9be5db6484 100644
--- a/keyboards/tada68/keymaps/mattgemmell/keymap.c
+++ b/keyboards/tada68/keymaps/mattgemmell/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
   [_BL] = LAYOUT_iso(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NUBS, \
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NUBS, \
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  \
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP, \
     KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN, \
diff --git a/keyboards/tada68/keymaps/mekberg/keymap.c b/keyboards/tada68/keymaps/mekberg/keymap.c
index 732e4f1bbd..b1fbd309b8 100755
--- a/keyboards/tada68/keymaps/mekberg/keymap.c
+++ b/keyboards/tada68/keymaps/mekberg/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_iso(
 //  ,----------------------------------------------------------------------------------------------------------------------------------------------.
 //  |  Esc   |    1   |    2   |    3   |    4   |    5   |    6   |    7   |    8   |    9   |    0   |    +   |    ´   |   Backspace    |  Home  |
-     KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SE_PLUS, SE_TCK,     KC_BSPC,      KC_HOME,
+     QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SE_PLUS, SE_TCK,     KC_BSPC,      KC_HOME,
 //  |----------------------------------------------------------------------------------------------------------------------------------------------|
 //  |    Tab     |    Q   |    W   |    E   |    R   |    T   |    Y   |    U   |    I   |    O   |    P   |    Å   |    ¨   |            |  End   |
      LT(2,KC_TAB), KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    SE_ARNG, SE_UML,              KC_END,
diff --git a/keyboards/tada68/keymaps/peippo/keymap.c b/keyboards/tada68/keymaps/peippo/keymap.c
index c7ffd36fbe..8db2839336 100644
--- a/keyboards/tada68/keymaps/peippo/keymap.c
+++ b/keyboards/tada68/keymaps/peippo/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/
 
 	[_BL] = LAYOUT_iso(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, AG_NORM,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, AG_NORM,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,
 		MO(_FL), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
diff --git a/keyboards/tada68/keymaps/shalzz/keymap.c b/keyboards/tada68/keymaps/shalzz/keymap.c
index 8839b4feac..bdd8155b52 100644
--- a/keyboards/tada68/keymaps/shalzz/keymap.c
+++ b/keyboards/tada68/keymaps/shalzz/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       Win   + Esc = `
    */
 [_BL] = LAYOUT_ansi(
-  KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
+  QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,KC_PGDN, \
diff --git a/keyboards/tada68/keymaps/tshack/keymap.c b/keyboards/tada68/keymaps/tshack/keymap.c
index 0246acad36..8051557dd0 100755
--- a/keyboards/tada68/keymaps/tshack/keymap.c
+++ b/keyboards/tada68/keymaps/tshack/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       Win   + Esc = `
    */
 [_BL] = LAYOUT_ansi(
-  KC_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_GRV,  \
+  QK_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_GRV,  \
   KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS, KC_DEL , \
   KC_LCTL, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,      KC_PGUP, \
   KC_LSFT,          KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,  KC_PGDN, \
diff --git a/keyboards/tada68/keymaps/unix/keymap.c b/keyboards/tada68/keymaps/unix/keymap.c
index d3362854f9..3c777a82ac 100644
--- a/keyboards/tada68/keymaps/unix/keymap.c
+++ b/keyboards/tada68/keymaps/unix/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       Hold  + LShift = )
    */
 [_BL] = LAYOUT_ansi(
-  KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
+  QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,KC_PGDN, \
diff --git a/keyboards/tada68/keymaps/wamsm_tada/keymap.c b/keyboards/tada68/keymaps/wamsm_tada/keymap.c
index 3b5e9d373b..8972e39a9e 100755
--- a/keyboards/tada68/keymaps/wamsm_tada/keymap.c
+++ b/keyboards/tada68/keymaps/wamsm_tada/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------'
    */
 [_BL] = LAYOUT_ansi(
-  KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
+  QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   MO(_FL), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
   KC_LSFT,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,KC_UP,KC_PGDN, \
diff --git a/keyboards/team0110/p1800fl/keymaps/default/keymap.c b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
index e486e8d339..ce1f4a5eff 100644
--- a/keyboards/team0110/p1800fl/keymaps/default/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT(
-        KC_GESC,          KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,        KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL,
+        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_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_BSLS,                 KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,          KC_A,     KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_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,
diff --git a/keyboards/team0110/p1800fl/keymaps/via/keymap.c b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
index 50eadcbbd7..7aed3c918c 100644
--- a/keyboards/team0110/p1800fl/keymaps/via/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT(
-        KC_GESC,          KC_1,     KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,        KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL,
+        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_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_BSLS,                 KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
         KC_CAPS,          KC_A,     KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_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,
diff --git a/keyboards/technika/keymaps/default/keymap.c b/keyboards/technika/keymaps/default/keymap.c
index b95b15488d..763115a22e 100755
--- a/keyboards/technika/keymaps/default/keymap.c
+++ b/keyboards/technika/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
-        KC_GESC, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_P7  , KC_P8  , KC_P9  ,
+        QK_GESC, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_P7  , KC_P8  , KC_P9  ,
         KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_ENT , KC_P4  , KC_P5  , KC_P6  ,
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_RSFT, MO(1)  , KC_P3  , KC_P2  , KC_P1  ,
         KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_BSPC, KC_P0  , KC_P0  , KC_PDOT ),
diff --git a/keyboards/tgr/alice/keymaps/default/keymap.c b/keyboards/tgr/alice/keymaps/default/keymap.c
index bd168e5d78..fddb2d4cfe 100644
--- a/keyboards/tgr/alice/keymaps/default/keymap.c
+++ b/keyboards/tgr/alice/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_alice_split_bs(
-        KC_ESC,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
+        KC_ESC,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN,    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c b/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
index 5ba309f8de..a5492ee162 100644
--- a/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
+++ b/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,     KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS, \
+        KC_ESC,     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS, \
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          \
         KC_PGDN,    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           \
                     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            \
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
index 9678864d85..af30fe54c1 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 -------------------------------------------------------------------------------------------
 */
 [0] = LAYOUT_base( \
-    KC_GESC, KC_1,    KC_2,    KC_3, KC_4,   KC_5,  KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
+    QK_GESC, KC_1,    KC_2,    KC_3, KC_4,   KC_5,  KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
     KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R,   KC_T,  KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
     MO(1),   KC_A,    KC_S,    KC_D, KC_F,   KC_G,  KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, \
     KC_LSFT,          KC_Z,    KC_X, KC_C,   KC_V,  KC_B,   KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, WIN_SWITCH_LAYOUT,\
diff --git a/keyboards/thevankeyboards/jetvan/keymaps/default/keymap.c b/keyboards/thevankeyboards/jetvan/keymaps/default/keymap.c
index 618a713c27..73823b9015 100644
--- a/keyboards/thevankeyboards/jetvan/keymaps/default/keymap.c
+++ b/keyboards/thevankeyboards/jetvan/keymaps/default/keymap.c
@@ -22,13 +22,13 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT(
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, MO(1),
         KC_LCTL, MO(1), KC_LGUI, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_LAYER1] = LAYOUT(
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, MO(1),
         KC_LCTL, MO(1), KC_LGUI, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/thevankeyboards/jetvan/keymaps/via/keymap.c b/keyboards/thevankeyboards/jetvan/keymaps/via/keymap.c
index f722c11411..135844703b 100644
--- a/keyboards/thevankeyboards/jetvan/keymaps/via/keymap.c
+++ b/keyboards/thevankeyboards/jetvan/keymaps/via/keymap.c
@@ -24,28 +24,28 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT(
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, MO(1),
         KC_LCTL, MO(1), KC_LGUI, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT(
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, MO(1),
         KC_LCTL, MO(1), KC_LGUI, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER2] = LAYOUT(
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, MO(1),
         KC_LCTL, MO(1), KC_LGUI, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER3] = LAYOUT(
-        KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, MO(1),
         KC_LCTL, MO(1), KC_LGUI, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
index 7674038a46..ae3619859a 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
@@ -4,7 +4,7 @@ extern keymap_config_t keymap_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_arrow_command( /* Qwerty */
-    KC_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
     LT(2, KC_TAB), KC_A,    KC_S,    KC_D,  KC_F, KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, LT(2, KC_ENT),
     KC_LSFT,       KC_Z,    KC_X,    KC_C,  KC_V, KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   MT(MOD_RSFT, KC_SLSH),
     KC_LCTL,       KC_LGUI, KC_LALT, MO(3), LT(1, KC_SPC), LT(1, KC_SPC), MO(4),   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
index 6ab2aacfcb..372dc3e337 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
@@ -4,7 +4,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT
-	(KC_GESC,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,            KC_BSPC, 
+	(QK_GESC,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,            KC_BSPC, 
 	LT(1,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(1,KC_QUOT), 
 	KC_LSPO,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 
 	KC_LCTL,  KC_LALT,  KC_LGUI,    KC_ENT,    KC_SPC,    TG(2),    LT(3,KC_APP),      KC_DEL),
diff --git a/keyboards/tkc/portico/keymaps/default/keymap.c b/keyboards/tkc/portico/keymaps/default/keymap.c
index 3d8dc77765..d00d0bbf2c 100644
--- a/keyboards/tkc/portico/keymaps/default/keymap.c
+++ b/keyboards/tkc/portico/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        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,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 #ifdef RGB_BACKLIGHT_PORTICO
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
         _______,  EF_INC,  EF_DEC,  BR_INC,  BR_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, _______, _______, _______, _______,  H2_INC,  H2_DEC,  S2_INC,  S2_DEC, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 #else
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
diff --git a/keyboards/tkc/portico/keymaps/via/keymap.c b/keyboards/tkc/portico/keymaps/via/keymap.c
index 3d8dc77765..d00d0bbf2c 100644
--- a/keyboards/tkc/portico/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        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,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 #ifdef RGB_BACKLIGHT_PORTICO
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
         _______,  EF_INC,  EF_DEC,  BR_INC,  BR_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, _______, _______, _______, _______,  H2_INC,  H2_DEC,  S2_INC,  S2_DEC, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 #else
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
diff --git a/keyboards/tkc/portico68v2/keymaps/default/keymap.c b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
index a79ef5a430..6a15b17613 100644
--- a/keyboards/tkc/portico68v2/keymaps/default/keymap.c
+++ b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
@@ -19,14 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        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,                               MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
diff --git a/keyboards/tkc/portico68v2/keymaps/via/keymap.c b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
index cc50f4170d..1b3cfa0f99 100644
--- a/keyboards/tkc/portico68v2/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
@@ -19,14 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        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,                               MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        QK_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS,   QK_BOOT, KC_PGUP,
         KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
         KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
diff --git a/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c b/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c
index 00be8be514..6b73bc2b8e 100644
--- a/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c
+++ b/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c
@@ -8,7 +8,7 @@
    const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      [0] = LAYOUT_encoder(
        KC_MPLY,KC_ESC,
-         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+         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_DEL,
          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,   KC_PGUP,
          KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
diff --git a/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c b/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c
index 145b2dc635..de6f510abc 100644
--- a/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c
+++ b/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c
@@ -7,7 +7,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_65_ansi_blocker(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_GRV,
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_DEL,
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,            KC_PGUP,
       KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    KC_PGDN,
diff --git a/keyboards/tkw/stoutgat/v2/keymaps/default/keymap.c b/keyboards/tkw/stoutgat/v2/keymaps/default/keymap.c
index 1e2b3aafd5..d14a060c3f 100644
--- a/keyboards/tkw/stoutgat/v2/keymaps/default/keymap.c
+++ b/keyboards/tkw/stoutgat/v2/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_encoder(
-                 KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+                 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_DEL,
                  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
         KC_MPLY, KC_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,
diff --git a/keyboards/tmo50/keymaps/ottodokto/keymap.c b/keyboards/tmo50/keymaps/ottodokto/keymap.c
index 795d59c852..2fc55caf03 100644
--- a/keyboards/tmo50/keymaps/ottodokto/keymap.c
+++ b/keyboards/tmo50/keymaps/ottodokto/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   // Numerals layer
   [1] = LAYOUT_all(
-		KC_BRIU, KC_GESC,  KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL, KC_DEL,
+		KC_BRIU, QK_GESC,  KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL, KC_DEL,
 		KC_BRID, KC_CAPS, _______, _______, _______, _______, _______, _______, KC_4, KC_5,    KC_6,   _______, _______, _______,
 		RGB_MOD, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, _______, _______, _______, _______,
 		RGB_RMOD, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/trashman/ketch/keymaps/default/keymap.c b/keyboards/trashman/ketch/keymaps/default/keymap.c
index 37d396ace3..231704686e 100644
--- a/keyboards/trashman/ketch/keymaps/default/keymap.c
+++ b/keyboards/trashman/ketch/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ SOFTWARE.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all( /* Qwerty */
-    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MT(MOD_RSFT, KC_SLSH),
     KC_LCTL, KC_LGUI, KC_LALT, MO(1),       KC_SPC,           KC_SPC,       MO(2),   KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
index 0cbe1bb7f9..7b7b565c0f 100644
--- a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
@@ -25,7 +25,7 @@ SOFTWARE.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_jetvan( /* Qwerty */
-        KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
+        QK_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
         LT(2, KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, LT(2, KC_ENT),
         KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_UP,   MT(MOD_RSFT, KC_SLSH),
         KC_LCTL,       KC_LGUI, KC_LALT,                   LT(1, KC_SPC),                     KC_LEFT, KC_DOWN, KC_RIGHT
diff --git a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
index f9556b168a..cea7e882b9 100644
--- a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
@@ -27,7 +27,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT(
-    KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                   KC_EQL,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                   KC_EQL,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
     KC_CAPS,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LCBR,                   KC_RCBR,  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_PSCR,                   KC_PGUP,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_NUHS,
     KC_LSFT,  KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_INS,                    KC_PGDN,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENT,
diff --git a/keyboards/viendi8l/keymaps/default/keymap.c b/keyboards/viendi8l/keymaps/default/keymap.c
index 8051e739ad..0a2f96c20b 100755
--- a/keyboards/viendi8l/keymaps/default/keymap.c
+++ b/keyboards/viendi8l/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    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_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_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_BSPC,
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    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_BSPC,
         KC_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
diff --git a/keyboards/viendi8l/keymaps/via/keymap.c b/keyboards/viendi8l/keymaps/via/keymap.c
index c85ddf9ed0..59adaa6241 100755
--- a/keyboards/viendi8l/keymaps/via/keymap.c
+++ b/keyboards/viendi8l/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    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_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [1] = LAYOUT_all(
-        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    KC_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_BSPC,
+        KC_MUTE, KC_PSLS, KC_PAST, KC_BSPC,    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_BSPC,
         KC_PMNS, KC_P7,   KC_P8,   KC_P9,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_PPLS, KC_P4,   KC_P5,   KC_P6,      LTCAPS,  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_PENT, KC_P1,   KC_P2,   KC_P3,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MTRSFT,  MO(2),
diff --git a/keyboards/w1_at/keymaps/default/keymap.c b/keyboards/w1_at/keymaps/default/keymap.c
index dbc238eec7..7c190b73d6 100644
--- a/keyboards/w1_at/keymaps/default/keymap.c
+++ b/keyboards/w1_at/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_F1, KC_F2,     KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
+    KC_F1, KC_F2,     QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
     KC_F3, KC_F4,     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_F5, KC_F6,     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,             KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
     KC_F7, KC_F8,     KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),              KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
diff --git a/keyboards/w1_at/keymaps/via/keymap.c b/keyboards/w1_at/keymaps/via/keymap.c
index e4f51eef6c..2c6cf0f018 100644
--- a/keyboards/w1_at/keymaps/via/keymap.c
+++ b/keyboards/w1_at/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_F1, KC_F2,     KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
+    KC_F1, KC_F2,     QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
     KC_F3, KC_F4,     KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_F5, KC_F6,     KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,             KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
     KC_F7, KC_F8,     KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),              KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
index 8bbc76a977..d0de40733c 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MA] = LAYOUT_ansi(
-    KC_GESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_DEL, KC_HOME,
+    QK_GESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_DEL, KC_HOME,
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,         KC_END,
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,         KC_PGUP,
     KC_LSFT,          KC_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,
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
index ebb3c7a9aa..4dd531741e 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MA] = LAYOUT_iso(
-    KC_GESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_HOME,
+    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_END,
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,KC_NUHS, KC_ENT, KC_PGUP,
     KC_LSFT,  KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT,  KC_UP, KC_PGDN,
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
index daad60a1f4..8fca8fa125 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MA] = LAYOUT_ansi(
-    KC_GESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_DEL, KC_HOME,
+    QK_GESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_DEL, KC_HOME,
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,         KC_END,
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,         KC_PGUP,
     KC_LSFT,          KC_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,
diff --git a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
index 08ceea33c7..94d134d7c9 100644
--- a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
+++ b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/
 
 	[0] = LAYOUT(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,         KC_PGDN,
 		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,   KC_UP,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
index f5bf18267d..de1c8c6450 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_ansi( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+  QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_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_PEQL,
   KC_LSFT,      KC_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,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
index 1ab68865fc..0dac87536a 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_iso( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+  QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
   KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,              	 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
index 8f92eb9ae0..b73d6f8fd5 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
@@ -21,7 +21,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_MA] = LAYOUT_all( /* Base */
-  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+  QK_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NUM, KC_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_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
   KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
   KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
index 03f0eaad2f..0b77e16403 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c
@@ -45,7 +45,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [QWER] = LAYOUT_60_hhkb(
-	KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+	QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
 	HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_HHKB,
diff --git a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c b/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
index ae1dadf15c..df9f0cc50c 100644
--- a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
+++ b/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Default layer
 [_QWERTY] = LAYOUT_all(
-	KC_GESC, KC_1,    KC_2,   KC_3,  KC_4, KC_5, KC_6,  KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+	QK_GESC, KC_1,    KC_2,   KC_3,  KC_4, KC_5, KC_6,  KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
 	KC_TAB,  KC_Q,    KC_W,   KC_E,  KC_R, KC_T, KC_Y,  KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_GRV,  KC_A,    KC_S,   KC_D,  KC_F, KC_G, KC_H,  KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_NO,   KC_Z,   KC_X,  KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
diff --git a/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c b/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
index 8d6e4da77c..a74ec35701 100644
--- a/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
+++ b/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,  KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL, KC_BSPC,
+        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,
diff --git a/keyboards/wolf/kuku65/keymaps/default/keymap.c b/keyboards/wolf/kuku65/keymaps/default/keymap.c
index a310ea69a3..5e876efe69 100644
--- a/keyboards/wolf/kuku65/keymaps/default/keymap.c
+++ b/keyboards/wolf/kuku65/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER0] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_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,
diff --git a/keyboards/wolf/kuku65/keymaps/via/keymap.c b/keyboards/wolf/kuku65/keymaps/via/keymap.c
index d605e4ec5b..e0bb8dad78 100644
--- a/keyboards/wolf/kuku65/keymaps/via/keymap.c
+++ b/keyboards/wolf/kuku65/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [_LAYER0] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+        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_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,
diff --git a/keyboards/wolf/ryujin/keymaps/default/keymap.c b/keyboards/wolf/ryujin/keymaps/default/keymap.c
index 9bd1f05e5a..118515242c 100644
--- a/keyboards/wolf/ryujin/keymaps/default/keymap.c
+++ b/keyboards/wolf/ryujin/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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,
diff --git a/keyboards/wolf/ryujin/keymaps/via/keymap.c b/keyboards/wolf/ryujin/keymaps/via/keymap.c
index be61f2d194..4a66cdf5c1 100644
--- a/keyboards/wolf/ryujin/keymaps/via/keymap.c
+++ b/keyboards/wolf/ryujin/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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,
diff --git a/keyboards/wolf/ts60/keymaps/default/keymap.c b/keyboards/wolf/ts60/keymaps/default/keymap.c
index 262d51f25e..9a93f6e28c 100644
--- a/keyboards/wolf/ts60/keymaps/default/keymap.c
+++ b/keyboards/wolf/ts60/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/wolf/ts60/keymaps/via/keymap.c b/keyboards/wolf/ts60/keymaps/via/keymap.c
index c418f9697e..80c36169ee 100644
--- a/keyboards/wolf/ts60/keymaps/via/keymap.c
+++ b/keyboards/wolf/ts60/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_60_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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,
diff --git a/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c b/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c
index 9817557d66..a525e19c22 100644
--- a/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c
+++ b/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
-KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_GRV,  KC_DEL, KC_HOME,
+QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_GRV,  KC_DEL, KC_HOME,
 KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,   KC_RBRC,  KC_BSPC,  KC_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,   MO(1),
 KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,  KC_UP,
diff --git a/keyboards/wsk/gothic50/keymaps/default/keymap.c b/keyboards/wsk/gothic50/keymaps/default/keymap.c
index d366bccc9e..bf6c9c89aa 100644
--- a/keyboards/wsk/gothic50/keymaps/default/keymap.c
+++ b/keyboards/wsk/gothic50/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ enum {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_PSCR,
+    QK_GESC,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_PSCR,
     LCTL_T(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_INS,
     SCAPS_LG,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            MO(2),   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,      KC_UP,       KC_DEL,
     KC_APP,         KC_LGUI,          KC_LALT, MO(1),   LT(1,KC_SPC),    KC_BSPC, KC_RALT, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RGHT
diff --git a/keyboards/wsk/jerkin/keymaps/default/keymap.c b/keyboards/wsk/jerkin/keymaps/default/keymap.c
index 13cb333bad..046d703c39 100644
--- a/keyboards/wsk/jerkin/keymaps/default/keymap.c
+++ b/keyboards/wsk/jerkin/keymaps/default/keymap.c
@@ -6,7 +6,7 @@ enum custom_keycodes {KC_PASTA = SAFE_RANGE};
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
-		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, 
+		QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, 
 		CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, LT(2, KC_ENT), 
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, LT(1, KC_SPC), KC_N, KC_M, KC_COMM, ALT_T(KC_DOT), GUI_T(KC_SLSH), SFT_T(KC_DEL)),
 
diff --git a/keyboards/xbows/woody/keymaps/default/keymap.c b/keyboards/xbows/woody/keymaps/default/keymap.c
index 65ce7b939b..ea2cf42e2e 100644
--- a/keyboards/xbows/woody/keymaps/default/keymap.c
+++ b/keyboards/xbows/woody/keymaps/default/keymap.c
@@ -2,13 +2,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT( /* Base */
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_INS,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
     [1] = LAYOUT( /* FN */
-        KC_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_DEL,
+        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_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_HOME,
         KC_CAPS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,  KC_END,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_VOLU, KC_MUTE,
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
index 5817e61dbf..1ad1d63f04 100755
--- a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_all(
-		KC_GESC,       KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,
+		QK_GESC,       KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,
 		KC_TAB,        KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NO,
 		MO(1), KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
 		KC_LSFT,       KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_NO,   KC_RSFT, KC_PSCR,
diff --git a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
index 8c72370f87..2f70dd4c1b 100644
--- a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 0: Base Layer
   [BASE] = LAYOUT_all(
-      KC_GESC,   KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,   \
+      QK_GESC,   KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,   \
       KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,   \
       KC_CAPS,   KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,  KC_NO,              KC_ENT,    \
       KC_LSFT,   KC_NO,   KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_NO,    RSFT_T(KC_SLASH),  KC_UP,    KC_RCTL,    \
diff --git a/keyboards/xiudi/xd60/keymaps/rooski/keymap.c b/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
index 9eb68ca368..8ca74e357f 100644
--- a/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   // 0: Base Layer
   [_BL] = LAYOUT_all(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,  \
+      QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,  \
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            \
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,             \
       KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  XXXXXXX, RSTT,    KC_UP,   KC_DEL,    \
diff --git a/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c b/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
index b39a596fbf..d1c1c2be15 100644
--- a/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/split_bksp_arrows/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   // 0: Base Layer
   LAYOUT_all(
-      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSLS,  KC_INS,    \
+      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_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,   \
       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_TRNS,           KC_ENT,    \
       KC_LSFT, KC_TRNS, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_SLSH, KC_UP,    KC_DEL,    \
diff --git a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
index 46e9b5aae6..f4cd6476b5 100644
--- a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
@@ -23,7 +23,7 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_60_ansi(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, 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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, TG(1)),
+	[0] = LAYOUT_60_ansi(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, TG(1)),
 	[1] = LAYOUT_60_ansi(QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_UP, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
index da48d080af..f21aa059b4 100644
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-    KC_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5  , KC_DEL , KC_6  , KC_7   , KC_8   , KC_9   , KC_0    , KC_MINUS, KC_EQUAL, KC_PSCR,
+    QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5  , KC_DEL , KC_6  , KC_7   , KC_8   , KC_9   , KC_0    , KC_MINUS, KC_EQUAL, KC_PSCR,
     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T  , KC_BSPC, KC_Y  , KC_U   , KC_I   , KC_O   , KC_P    , KC_LBRC , KC_RBRC , KC_HOME,
     MO(_FN), KC_A   , KC_S   , KC_D   , KC_F   , KC_G  , KC_ENT , KC_H  , KC_J   , KC_K   , KC_L   , KC_SCLN , KC_QUOT , KC_NUHS , KC_END ,
     KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B  , ALT_TAB, KC_N  , KC_M   , KC_COMM, KC_DOT , KC_SLSH , KC_RSFT , MO(_FN) , KC_PGUP,
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
index 77ebfe6a03..e816858711 100644
--- a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
@@ -51,7 +51,7 @@ const uint32_t PROGMEM unicode_map[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_ortho_5x15(
-    KC_GESC , KC_1  , KC_2    , KC_3    , KC_4    , KC_5    , KC_MPRV , KC_MPLY , KC_MNXT , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_BSPC,
+    QK_GESC , KC_1  , KC_2    , KC_3    , KC_4    , KC_5    , KC_MPRV , KC_MPLY , KC_MNXT , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_BSPC,
     KC_TAB  , KC_Q  , KC_W    , KC_E    , KC_R    , KC_T    , KC_MINS , KC_EQL  , KC_BSLS , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_ENT ,
     MO(3)   , KC_A  , KC_S    , KC_D    , KC_F    , KC_G    , KC_LBRC , KC_MUTE , KC_RBRC , KC_H    , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_QUOT,
     KC_LSFT , KC_Z  , KC_X    , KC_C    , KC_V    , KC_B    , KC_HOME , KC_SLEP , KC_END  , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT,
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
index f54ccc7644..1295d52665 100644
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_MUTE,
     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_VOLD, KC_VOLU, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_HOME, KC_PGUP, KC_UP,   KC_PGDN,
diff --git a/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c b/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
index 97010c39e1..3b40c12567 100644
--- a/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   
    [_QUD] = LAYOUT_ortho_5x15( /* Roguelike Layer */
    _______, _______, _______, _______, _______, _______, _______,KC_PSLS, KC_PAST, _______, _______, _______, _______, _______, TO(0),
-   KC_GESC, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_LBRC, KC_BSLS, KC_RBRC, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+   QK_GESC, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_LBRC, KC_BSLS, KC_RBRC, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
    NAV    , KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_PGUP, KC_MPLY, GGRV   , KC_H,   KC_N,   KC_E,    KC_I,    KC_O,    KC_QUOT,
    SftLck , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_PGDN, KC_UP  , ATAB   , KC_K,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, SftEnt ,
    KC_DEL , KC_LGUI, KC_LGUI, KC_LALT, KC_LCTL, TO(7),  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, MO(4) , KC_RGUI, KC_RALT, KC_RCTL, _______
diff --git a/keyboards/xiudi/xd75/keymaps/revok75/keymap.c b/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
index 4e8b821ca7..8cc00bc5b9 100644
--- a/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
  	[_QW_M] = LAYOUT_ortho_5x15( /* QWERTY MAC*/
-  	KC_GESC,  KC_1,     KC_2,     KC_3,     	KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,     LGUI(KC_X),  KC_BSPC, \
+  	QK_GESC,  KC_1,     KC_2,     KC_3,     	KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,     LGUI(KC_X),  KC_BSPC, \
   	KC_TAB,   KC_Q,     KC_W,     KC_E,     	KC_R,     	KC_T, 	KC_Y,   KC_U,   				KC_I,     KC_O,     KC_P,     KC_LCBR,    KC_RCBR,    LGUI(KC_C),  LGUI(KC_V), \
   	KC_CAPS,  KC_A,     KC_S,     KC_D,     	KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    LGUI(KC_R), KC_NO,       KC_ENT, \
   	KC_LSFT,  KC_Z,     KC_X,     KC_C,     	KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,    KC_RSFT,    KC_UP,       LGUI(KC_S), \
@@ -59,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
 
   [_QW_W] =  LAYOUT_ortho_5x15( /* QWERTY WIN*/
-  	KC_GESC,  KC_1,     KC_2,     KC_3,     		KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,     KC_EQL,     LCTL(KC_X),  KC_BSPC, \
+  	QK_GESC,  KC_1,     KC_2,     KC_3,     		KC_4,     	KC_5, 	KC_6,   KC_7,   				KC_8,     KC_9,     KC_0,     KC_MINS,     KC_EQL,     LCTL(KC_X),  KC_BSPC, \
   	KC_TAB,   KC_Q,     KC_W,     KC_E,     		KC_R,     	KC_T, 	KC_Y,   KC_U,   				KC_I,     KC_O,     KC_P,     KC_LCBR,     KC_RCBR,    LCTL(KC_C),  LCTL(KC_V), \
   	KC_CAPS,  KC_A,     KC_S,     KC_D,     		KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,     LCTL(KC_R), KC_NO,       KC_ENT, \
   	KC_LSFT,  KC_Z,     KC_X,     KC_C,     		KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,     KC_RSFT,    KC_UP,       LCTL(KC_S), \
-  	KC_LCTL,  KC_LALT,  KC_LGUI,  LCTL(KC_F), 	LCTL(KC_T), KC_SPC, KC_NO,	LCTL(KC_GESC),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,     KC_LEFT,    KC_DOWN,     KC_RGHT \
+  	KC_LCTL,  KC_LALT,  KC_LGUI,  LCTL(KC_F), 	LCTL(KC_T), KC_SPC, KC_NO,	LCTL(QK_GESC),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,     KC_LEFT,    KC_DOWN,     KC_RGHT \
  	),
 
 /* FUNCTION
diff --git a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c
index 1ff72b568b..9d722b6f22 100644
--- a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    QK_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
     KC_LSFT, KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,   KC_DELETE,
diff --git a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c
index 195a39ff39..f6f8bb4ed6 100644
--- a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    QK_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
     KC_LSFT, KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,   KC_DELETE,
diff --git a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
index 57d7c083df..194e85d719 100644
--- a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_60_tsangan_split_rshift(
-    KC_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,
+    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, MO(1),
diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
index 0411f3b924..4287097f97 100644
--- a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-    KC_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC,
+    QK_GESC, KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
     KC_CAPS, KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,     KC_SCLN,  KC_QUOT,  KC_BSLS, KC_ENT,
     KC_LSFT, KC_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,
diff --git a/keyboards/ydkb/just60/keymaps/default/keymap.c b/keyboards/ydkb/just60/keymaps/default/keymap.c
index 9bc7e9668b..ebb7ba3673 100644
--- a/keyboards/ydkb/just60/keymaps/default/keymap.c
+++ b/keyboards/ydkb/just60/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
+        QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
          KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         MO(_FN),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
         KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,
diff --git a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
index 9bc7e9668b..ebb7ba3673 100644
--- a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
+++ b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
+        QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
          KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         MO(_FN),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
         KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,
diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
index aedbeee630..ae2738b604 100644
--- a/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
+++ b/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_ansi( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_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_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
index 363bee633b..13d0aa8ff9 100644
--- a/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
+++ b/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_iso( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_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_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,                                     KC_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_BSPC,
diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
index bca0c57e7c..6f477896be 100644
--- a/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
+++ b/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_all( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,                            KC_NUM,  KC_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_PEQL,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_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_BSPC,
diff --git a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
index 062cc26bfe..67fdf6c35d 100644
--- a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi_split_bs_rshift( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
     KC_LSFT,            KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, MO(2),
diff --git a/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c
index 7b53bb7af0..395f06f6ac 100644
--- a/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c
+++ b/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_ansi_split_bs_rshift( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
     KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
     KC_LSFT,            KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_RSFT,
diff --git a/keyboards/yiancardesigns/gingham/keymaps/iso/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/iso/keymap.c
index 541ef59114..4a35909b42 100644
--- a/keyboards/yiancardesigns/gingham/keymaps/iso/keymap.c
+++ b/keyboards/yiancardesigns/gingham/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_iso_split_bs_rshift( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
+    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_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,
     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_RSFT,
diff --git a/keyboards/yiancardesigns/gingham/keymaps/via/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/via/keymap.c
index 29e16a7b2f..cf13bcc96d 100644
--- a/keyboards/yiancardesigns/gingham/keymaps/via/keymap.c
+++ b/keyboards/yiancardesigns/gingham/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT_60_iso_split_bs_rshift( /* Base */
-    KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
+    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_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_BSLS, KC_ENT,
     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, MO(1),
diff --git a/keyboards/ymdk/bface/keymaps/default/keymap.c b/keyboards/ymdk/bface/keymaps/default/keymap.c
index e17eb79116..97c80cfce7 100644
--- a/keyboards/ymdk/bface/keymaps/default/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //Base Layer
     [0] = LAYOUT_60_ansi(
-        KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,
+        QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,
         KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,
         KC_X0,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT, KC_ENT,
         KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,
diff --git a/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c b/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
index 3ba35bb3ba..10095f929b 100644
--- a/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //Base layer
     [0] = LAYOUT_60_ansi_split_rshift(
-        KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,
+        QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,
         KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,
         KC_X0,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT, KC_ENT,
         KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,  KC_UP,
diff --git a/keyboards/ymdk/bface/keymaps/via/keymap.c b/keyboards/ymdk/bface/keymaps/via/keymap.c
index 56a9451dc2..0be92502f6 100644
--- a/keyboards/ymdk/bface/keymaps/via/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //Base Layer
     [0] = LAYOUT_all(
-        KC_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL, KC_NO, KC_BSPC,
+        QK_GESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL, KC_NO, KC_BSPC,
         KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,
         KC_CAPS,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT, KC_NO, KC_ENT,
         KC_LSFT, KC_NO,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_NO,        KC_RSFT, KC_NO,
diff --git a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
index d533089f2e..1f228ef204 100644
--- a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // NB: Using GESC for escape in the QWERTY layer as a temporary hack because I messed up the
   // switch on the KC_GRV key; change back to KC_ESC once this is fixed.
 	[_QWERTY] = LAYOUT_hotswap(
-    KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_MPLY, KC_BRK,
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_MPLY, KC_BRK,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_LLCK, KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,
     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
diff --git a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
index 784f7cd317..62eda15d26 100644
--- a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_all(
-        KC_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,      KC_EQL,  KC_GRV, KC_BSPC,
+        QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,      KC_EQL,  KC_GRV, KC_BSPC,
         KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,      KC_RBRC, KC_BSLS,
         LT(1,KC_CAPS), KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_NUHS, KC_ENT,
         KC_LSFT,    KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,      KC_RSFT, KC_UP,   KC_DEL,
diff --git a/keyboards/ztboards/after/keymaps/default/keymap.c b/keyboards/ztboards/after/keymaps/default/keymap.c
index 9197c54b95..deb241f82f 100644
--- a/keyboards/ztboards/after/keymaps/default/keymap.c
+++ b/keyboards/ztboards/after/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME  ,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME  ,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGUP  ,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN  ,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP  ,          KC_DEL   ,
diff --git a/keyboards/ztboards/after/keymaps/ellicose/keymap.c b/keyboards/ztboards/after/keymaps/ellicose/keymap.c
index e0ce04b8a9..9b329b5716 100644
--- a/keyboards/ztboards/after/keymaps/ellicose/keymap.c
+++ b/keyboards/ztboards/after/keymaps/ellicose/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_AUDIO_MUTE   ,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_AUDIO_MUTE   ,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGUP  ,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN  ,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP  ,          MO(1)    ,
diff --git a/keyboards/ztboards/after/keymaps/phlop/keymap.c b/keyboards/ztboards/after/keymaps/phlop/keymap.c
index 15f101fc34..bf9b6935cc 100644
--- a/keyboards/ztboards/after/keymaps/phlop/keymap.c
+++ b/keyboards/ztboards/after/keymaps/phlop/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_DEL   ,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_DEL   ,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGUP  ,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN  ,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP  ,          MO(1)    ,
diff --git a/keyboards/ztboards/noon/keymaps/default/keymap.c b/keyboards/ztboards/noon/keymaps/default/keymap.c
index fbdbd5d64d..8c660de044 100644
--- a/keyboards/ztboards/noon/keymaps/default/keymap.c
+++ b/keyboards/ztboards/noon/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] LAYOUT_all (
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,        
+        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_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_DEL ,
diff --git a/keyboards/ztboards/noon/keymaps/via/keymap.c b/keyboards/ztboards/noon/keymaps/via/keymap.c
index f8cf030352..edce512200 100644
--- a/keyboards/ztboards/noon/keymaps/via/keymap.c
+++ b/keyboards/ztboards/noon/keymaps/via/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,        
+        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_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_DEL ,
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
index 957d1bb74a..33a440e4e4 100644
--- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
+++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
@@ -3,7 +3,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,   \
+    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_CTCP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,             \
     KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                      \
diff --git a/layouts/community/60_ansi/readme.md b/layouts/community/60_ansi/readme.md
index e4e59f1a64..fe3374ef05 100644
--- a/layouts/community/60_ansi/readme.md
+++ b/layouts/community/60_ansi/readme.md
@@ -49,7 +49,7 @@ This keymap must have a `LAYOUT_60_ansi` layout defined.
 ```c
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT_60_ansi(
-    KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, \
+    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_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, \
diff --git a/layouts/community/60_ansi/stanrc85-ansi/keymap.c b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
index 32542352ca..42f6675282 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/keymap.c
+++ b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,          KC_RALT, TD_TWIN, MO(_FN2_60),   TD_TCTL),
 
   [_DEFAULT] = LAYOUT_60_ansi(
-	KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+	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,
diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
index 3368e01b72..3af6af5091 100644
--- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
+++ b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
      */
     [_BASE] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
-        KC_GESC, KC_1,    KC_2, KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+        QK_GESC, KC_1,    KC_2, KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
         KC_TAB,           KC_Q, KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_CAPS,          KC_A, KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT,          KC_Z, KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,           KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index a0bbaf03c7..3f5251fb1c 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -3,7 +3,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_60_ansi_split_bs_rshift(
-    KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC, \
+    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_CTCP, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,                    \
     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(_AL),                   \
diff --git a/layouts/community/65_ansi/mechmerlin/keymap.c b/layouts/community/65_ansi/mechmerlin/keymap.c
index e2bc67df00..23d42b6d8c 100644
--- a/layouts/community/65_ansi/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi/mechmerlin/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
      */
     [_BL] = LAYOUT_65_ansi(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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_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,
diff --git a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
index 3e21544539..f95f64e4b5 100644
--- a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_65_ansi_blocker(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         KC_CTCP, KC_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,
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index ffd26e50fc..bbe2a91d0e 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -8,7 +8,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Base
     [_BASE] = LAYOUT_65_ansi_blocker(
-        KC_GESC,    KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_MINS,    KC_EQL,                 KC_BSPC,    KC_HOME,
+        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,
diff --git a/layouts/community/65_ansi_blocker/stanrc85/keymap.c b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
index ce6efb235e..a9132fcb40 100644
--- a/layouts/community/65_ansi_blocker/stanrc85/keymap.c
+++ b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_DEFAULT] = LAYOUT_65_ansi_blocker(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_PGDN,
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
index 666e34c514..6c67e65dde 100644
--- a/layouts/community/66_ansi/mechmerlin/keymap.c
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -3,7 +3,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_66_ansi(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP, \
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP, \
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN, \
   KC_CTCP,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,                            \
   KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,        KC_UP,         \
diff --git a/layouts/community/66_ansi/skully/keymap.c b/layouts/community/66_ansi/skully/keymap.c
index fa138ce445..927352797b 100644
--- a/layouts/community/66_ansi/skully/keymap.c
+++ b/layouts/community/66_ansi/skully/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT_66_ansi(
-  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,            KC_PGUP,
+  QK_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,            KC_PGUP,
   KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,        KC_PGDN,
   KC_LCTL,      KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_ENT,
   MO(_FL),           KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,         KC_UP,
diff --git a/layouts/community/66_ansi/xyverz/keymap.c b/layouts/community/66_ansi/xyverz/keymap.c
index 92a388d31d..ef330af942 100644
--- a/layouts/community/66_ansi/xyverz/keymap.c
+++ b/layouts/community/66_ansi/xyverz/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
 [_QWERTY] = LAYOUT_66_ansi (
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,                   KC_PGUP, \
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,                   KC_PGUP, \
   KC_TAB,  KC_Q,    KC_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, \
   FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                                      \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,                              \
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------'
    */
 [_COLEMAK] = LAYOUT_66_ansi (
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,                   KC_PGUP, \
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,                   KC_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_PGDN, \
   FN_CAPS, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,                                      \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,                             \
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------'
    */
 [_DVORAK] = LAYOUT_66_ansi (
-  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,                   KC_PGUP, \
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,                   KC_PGUP, \
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS,                   KC_PGDN, \
   FN_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, KC_ENT,                                      \
   KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,          KC_UP,                             \
diff --git a/layouts/community/68_ansi/mechmerlin/keymap.c b/layouts/community/68_ansi/mechmerlin/keymap.c
index d9c6b5d367..0f2f8d90eb 100644
--- a/layouts/community/68_ansi/mechmerlin/keymap.c
+++ b/layouts/community/68_ansi/mechmerlin/keymap.c
@@ -3,7 +3,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_68_ansi(\
-        KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_PGUP,
+        QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN,
         KC_CTCP, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           
         KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,                   KC_UP,          
diff --git a/layouts/community/ortho_4x12/mguterl/keymap.c b/layouts/community/ortho_4x12/mguterl/keymap.c
index 7fb99fcd70..5b55fa3fa5 100644
--- a/layouts/community/ortho_4x12/mguterl/keymap.c
+++ b/layouts/community/ortho_4x12/mguterl/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     ESC_CTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-    KC_GESC, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SPC_UTL, SPC_UTL, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    QK_GESC, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SPC_UTL, SPC_UTL, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /*
diff --git a/layouts/community/ortho_5x14/peej/keymap.c b/layouts/community/ortho_5x14/peej/keymap.c
index ac0b4d9631..ea55361bd5 100644
--- a/layouts/community/ortho_5x14/peej/keymap.c
+++ b/layouts/community/ortho_5x14/peej/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *          `-----------------------------------------------------------------------------------------------------------'
 */
 [_BASE] = LAYOUT_PEEJ_hhkb(
-    KC_GESC, BASE_ROW_1_L, BASE_ROW_1_M,    BASE_ROW_1_R, KC_BSPC,
+    QK_GESC, BASE_ROW_1_L, BASE_ROW_1_M,    BASE_ROW_1_R, KC_BSPC,
     KC_TAB,  BASE_ROW_2_L, BASE_ROW_2_M,    BASE_ROW_2_R, KC_BSLS,
     CTLESC,  BASE_ROW_3_L, BASE_ROW_3_M,    BASE_ROW_3_R, KC_QUOT,
     KC_LSFT, BASE_ROW_4_L, BASE_ROW_4_M,    BASE_ROW_4_R, KC_ENT,
diff --git a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
index c2bd4fa1b0..be081ed647 100644
--- a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
+++ b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
      */
     [_BASE] = LAYOUT_60_ansi_arrow(
-        KC_GESC, KC_1,    KC_2, KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
+        QK_GESC, KC_1,    KC_2, KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
         KC_TAB,           KC_Q, KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS,          KC_A, KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT,          KC_Z, KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,           KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c b/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
index 8f240beaba..4e753c2f4c 100644
--- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
+++ b/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
      */
     [_BASE] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
-        KC_GESC, KC_1,    KC_2, KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+        QK_GESC, KC_1,    KC_2, KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
         KC_TAB,           KC_Q, KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_CAPS,          KC_A, KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT,          KC_Z, KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,           KC_RSFT, KC_UP,   KC_SLSH,
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 21a90a35f0..3a468d61f5 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -4,10 +4,6 @@
 
 // Deprecated Quantum keycodes
 
-#define GRAVE_ESC    QK_GRAVE_ESCAPE
-
-#define KC_GESC QK_GRAVE_ESCAPE
-
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")
diff --git a/users/peej/layout.h b/users/peej/layout.h
index f10b6d031c..4340ed4a0b 100644
--- a/users/peej/layout.h
+++ b/users/peej/layout.h
@@ -49,9 +49,9 @@
 #define BASE_ROW_3_M KC_LCBR, KC_RCBR
 #define BASE_ROW_4_M KC_LPRN, KC_RPRN
 
-#define BASE_ROW_1 KC_GESC, BASE_ROW_1_L, BASE_ROW_1_R, KC_DEL
+#define BASE_ROW_1 QK_GESC, BASE_ROW_1_L, BASE_ROW_1_R, KC_DEL
 #define BASE_ROW_2 KC_TAB,  BASE_ROW_2_L, BASE_ROW_2_R, KC_BSPC
-#define BASE_ROW_3 KC_GESC, BASE_ROW_3_L, BASE_ROW_3_R, KC_QUOT
+#define BASE_ROW_3 QK_GESC, BASE_ROW_3_L, BASE_ROW_3_R, KC_QUOT
 #define BASE_ROW_4 KC_LSFT, BASE_ROW_4_L, BASE_ROW_4_R, KC_ENTER
 #define BASE_ROW_5          BASE_ROW_5_L, BASE_ROW_5_R
 
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h
index d04541d200..199404a760 100644
--- a/users/rupa/wrappers.h
+++ b/users/rupa/wrappers.h
@@ -51,7 +51,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * │Ctrl│Alt │Gui │        Space           │RAI│LOW│CAP│ ← │ ↓ │ → │
  * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
  */
-#define ____65_QWERTY______________ROW1    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV
+#define ____65_QWERTY______________ROW1    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
 #define ____65_QWERTY______________ROW2    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL
 #define ____65_QWERTY______________ROW3    RAISE,   KC_A,    KC_S,    KC_D,    KC_F,    G_LWR,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP
 #define ____65_QWERTY______________ROW4    KC_LSFT,          KC_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
diff --git a/users/tominabox1/wrappers.h b/users/tominabox1/wrappers.h
index 032fad273f..c5aeadae38 100644
--- a/users/tominabox1/wrappers.h
+++ b/users/tominabox1/wrappers.h
@@ -24,7 +24,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
                     |_|
 */
 // Dimple Base layer
-#define __________________DIMPLE1__________________       KC_GESC, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC
+#define __________________DIMPLE1__________________       QK_GESC, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC
 #define __________________DIMPLE2__________________       LCTL_T(KC_TAB), KC_A,    KC_R,    KC_S,    KC_T,    KC_D, KC_H,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT
 #define __________________DIMPLE3L_________________       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
 #define __________________DIMPLE3R_________________       KC_K,    KC_M,    KC_COMM, KC_UP,  LT(_FKEY,KC_DOT)
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index 24f6bde468..d5c9fb7e61 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -14,7 +14,7 @@
   * `-----------------------------------------'  `-----------------------------------------'
   */
 
-#define _________________QWERTY_L1_________________ KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5
+#define _________________QWERTY_L1_________________ QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5
 #define _________________QWERTY_L2_________________ KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T
 #define _________________QWERTY_L3_________________ RIS_CAPS, KC_A,     KC_S,     KC_D,     KC_F,     KC_G
 #define _________________QWERTY_L4_________________ KC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B

From c3b6a4bcb2b7ee3a511b0179ac50f7effab25404 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 20 Oct 2022 18:17:04 -0700
Subject: [PATCH 686/959] Wavtype p01_ultra Touch-Up (#18784)

---
 keyboards/wavtype/p01_ultra/info.json         | 780 +++++++++++++++++-
 .../p01_ultra/keymaps/default_iso/keymap.c    |  45 +
 keyboards/wavtype/p01_ultra/p01_ultra.h       | 107 ++-
 keyboards/wavtype/p01_ultra/rules.mk          |   2 +
 4 files changed, 914 insertions(+), 20 deletions(-)
 create mode 100644 keyboards/wavtype/p01_ultra/keymaps/default_iso/keymap.c

diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json
index 03a069b968..bc09e0a78a 100644
--- a/keyboards/wavtype/p01_ultra/info.json
+++ b/keyboards/wavtype/p01_ultra/info.json
@@ -8,18 +8,786 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_tkl_ansi_7u": "LAYOUT_tkl_ansi_tsangan",
+        "LAYOUT_tkl_iso_7u": "LAYOUT_tkl_iso_tsangan"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.25, "w":1.25}, {"label":"Fn", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_tkl_ansi_7u": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Fn", "x":12.5, "y":5.25}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         },
         "LAYOUT_tkl_iso": {
-            "layout": [{"x":0, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6.5, "y":0.25}, {"x":7.5, "y":0.25}, {"x":8.5, "y":0.25}, {"x":9.5, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25}, {"x":14, "y":0.25}, {"x":15.25, "y":0.25}, {"x":16.25, "y":0.25}, {"x":17.25, "y":0.25}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_tkl_iso_7u": {
-            "layout": [{"x":0, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6.5, "y":0.25}, {"x":7.5, "y":0.25}, {"x":8.5, "y":0.25}, {"x":9.5, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25}, {"x":14, "y":0.25}, {"x":15.25, "y":0.25}, {"x":16.25, "y":0.25}, {"x":17.25, "y":0.25}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"AltGr", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"AltGr", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/wavtype/p01_ultra/keymaps/default_iso/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..82d62f16ba
--- /dev/null
+++ b/keyboards/wavtype/p01_ultra/keymaps/default_iso/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2021 wavtype
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT_tkl_iso(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_FN] = LAYOUT_tkl_iso(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_VOLD, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/wavtype/p01_ultra/p01_ultra.h b/keyboards/wavtype/p01_ultra/p01_ultra.h
index 0873d91a62..bc27e93373 100644
--- a/keyboards/wavtype/p01_ultra/p01_ultra.h
+++ b/keyboards/wavtype/p01_ultra/p01_ultra.h
@@ -20,21 +20,32 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+/*              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0B │0C │0D │0E │ │0F │0G │0H │
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐      ┌───────┐
+ *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3E │ │1F │1G │1H │      │1D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
+ *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2F │2G │2H │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴┐3D  │ ISO Enter
+ *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                   │2D │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌─┴───┴────┤
+ * │40      │   │40  │4B │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D    │4E │     │4G │       │4D        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ *              │50  │51  │52  │56                      │59  │5A  │5C  │5E  │ │5F │5G │5H │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │50   │51 │52   │56                         │5A   │5C │5E   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
+
 #define LAYOUT_tkl_ansi( \
     K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
     K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D,           K4G,      \
-	K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
+    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
 ) \
 { \
     { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
@@ -45,7 +56,24 @@
     { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
 }
 
-#define LAYOUT_tkl_ansi_7u( \
+#define LAYOUT_tkl_ansi_split_bs_rshift( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
+    K50, K51, K52,                K56,                K59, K5A, K5C, K5E,        K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_ansi_tsangan( \
     K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
@@ -62,12 +90,29 @@
     { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
 }
 
+#define LAYOUT_tkl_ansi_tsangan_split_bs_rshift( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
+    K50, K51, K52,                K56,                     K5A, K5C, K5E,        K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
 #define LAYOUT_tkl_iso( \
     K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                     \
-    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
+    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
     K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
 ) \
 { \
@@ -75,16 +120,33 @@
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, _x_, _x_, K4G, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, _x_, _x_, K4G, _x_ }, \
     { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
 }
 
-#define LAYOUT_tkl_iso_7u( \
+#define LAYOUT_tkl_iso_split_bs_rshift( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                       \
+    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
+    K50, K51, K52,                K56,                K59, K5A, K5C, K5E,        K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, K4E, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_iso_tsangan( \
     K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                     \
-    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
+    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
     K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
 ) \
 { \
@@ -92,6 +154,23 @@
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, _x_, _x_, K4G, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, _x_, _x_, K4G, _x_ }, \
+    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
+}
+
+#define LAYOUT_tkl_iso_tsangan_split_bs_rshift( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                       \
+    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
+    K50, K51, K52,                K56,                     K5A, K5C, K5E,        K5F, K5G, K5H  \
+) \
+{ \
+    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, K4E, _x_, K4G, _x_ }, \
     { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
 }
diff --git a/keyboards/wavtype/p01_ultra/rules.mk b/keyboards/wavtype/p01_ultra/rules.mk
index 3ff392a61f..6eb2081c3f 100644
--- a/keyboards/wavtype/p01_ultra/rules.mk
+++ b/keyboards/wavtype/p01_ultra/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = tkl_ansi tkl_ansi_split_bs_rshift tkl_ansi_tsangan tkl_ansi_tsangan_split_bs_rshift tkl_iso tkl_iso_split_bs_rshift tkl_iso_tsangan tkl_iso_tsangan_split_bs_rshift

From 93a0995e485e4d2fe1cb070edffcdd8581d525ed Mon Sep 17 00:00:00 2001
From: 8bits4ever <87928173+8bits4ever@users.noreply.github.com>
Date: Fri, 21 Oct 2022 03:20:23 +0200
Subject: [PATCH 687/959] A1200 Converter. Small modification on a1200.h file
 (#18783)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/converter/a1200/a1200.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/converter/a1200/a1200.h b/keyboards/converter/a1200/a1200.h
index ae99809e09..3f7defb244 100644
--- a/keyboards/converter/a1200/a1200.h
+++ b/keyboards/converter/a1200/a1200.h
@@ -35,7 +35,7 @@
     K0A,      K0B,                K0C,                     K0D,      K0E,                        K0I,      K0J \
 ) \
 { \
-/* "Q" */ { K3A,   K3B,   K3C,   K3D,   K3E,   K3F,  K3G,   K3H,  K3I,   K3J,   K3K,   K3L,   K3M,  K2O,   K0F,   K4P }, \
+/* "Q" */ { K3A,   K3B,   K3C,   K3D,   K3E,   K3F,  K3G,   K3H,  K3I,   K3J,   K3K,   K3L,   K3M,  K2O,   K0F,   K1A }, \
 /* "A" */ { K2B,   K2C,   K2D,   K2E,   K2F,   K2G,  K2H,   K2I,  K2J,   K2K,   K2L,   K2M,   K2N,  K4P,   K0H,   K0B }, \
 /* "Z" */ { K1B,   K1C,   K1D,   K1E,   K1F,   K1G,  K1H,   K1I,  K1J,   K1K,   K1L,   K4O,   K0C,  K4O,   K0G,   K0A }, \
 /* PAD */ { K4U,   K2T,   K3T,   K2S,   K1Q,   K0J,  K3S,   K2R,  K1P,   K1R,   K3R,   K2Q,   K1O,  K0I,   K3U,   K1A }, \

From 2c3859fbf7f4253dc8d3751063e5e64145cd2a8c Mon Sep 17 00:00:00 2001
From: Stefan <ctndesigner@gmail.com>
Date: Fri, 21 Oct 2022 03:20:47 +0200
Subject: [PATCH 688/959] Keychron Q3 I2C & CKLED2001 transfer speedup (#18780)

---
 drivers/led/ckled2001.c        | 17 ++++++++---------
 keyboards/keychron/q3/config.h |  7 +++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/led/ckled2001.c b/drivers/led/ckled2001.c
index b7e7db06cc..16a096780b 100644
--- a/drivers/led/ckled2001.c
+++ b/drivers/led/ckled2001.c
@@ -36,7 +36,7 @@
 #endif
 
 // Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
+uint8_t g_twi_transfer_buffer[65];
 
 // These buffers match the CKLED2001 PWM registers.
 // The control buffers match the PG0 LED On/Off registers.
@@ -72,27 +72,26 @@ bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
 bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     // Assumes PG1 is already selected.
     // If any of the transactions fails function returns false.
-    // Transmit PWM registers in 12 transfers of 16 bytes.
-    // g_twi_transfer_buffer[] is 20 bytes
+    // Transmit PWM registers in 3 transfers of 64 bytes.
 
-    // Iterate over the pwm_buffer contents at 16 byte intervals.
-    for (int i = 0; i < 192; i += 16) {
+    // Iterate over the pwm_buffer contents at 64 byte intervals.
+    for (uint8_t i = 0; i < 192; i += 64) {
         g_twi_transfer_buffer[0] = i;
-        // Copy the data from i to i+15.
+        // Copy the data from i to i+63.
         // Device will auto-increment register for data after the first byte
         // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        for (int j = 0; j < 16; j++) {
+        for (uint8_t j = 0; j < 64; j++) {
             g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
         }
 
 #if CKLED2001_PERSISTENCE > 0
         for (uint8_t i = 0; i < CKLED2001_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, CKLED2001_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 65, CKLED2001_TIMEOUT) != 0) {
                 return false;
             }
         }
 #else
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, CKLED2001_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 65, CKLED2001_TIMEOUT) != 0) {
             return false;
         }
 #endif
diff --git a/keyboards/keychron/q3/config.h b/keyboards/keychron/q3/config.h
index 59b9e0f54b..4c62c589bd 100644
--- a/keyboards/keychron/q3/config.h
+++ b/keyboards/keychron/q3/config.h
@@ -31,6 +31,13 @@
 #define DRIVER_ADDR_1 0b1110111
 #define DRIVER_ADDR_2 0b1110100
 
+/* Increase I2C speed to 1000 KHz */
+#define I2C1_TIMINGR_PRESC 0U
+#define I2C1_TIMINGR_SCLDEL 3U
+#define I2C1_TIMINGR_SDADEL 0U
+#define I2C1_TIMINGR_SCLH 15U
+#define I2C1_TIMINGR_SCLL 51U
+
 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
 #define PHASE_CHANNEL MSKPHASE_9CHANNEL
 

From 345f19a5d763053cd9cea6698656d4a2a1000b23 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 21 Oct 2022 02:21:17 +0100
Subject: [PATCH 689/959] Add converter support to keymap.json (#18776)

---
 data/schemas/keymap.jsonschema          | 4 ++++
 lib/python/qmk/cli/generate/config_h.py | 2 +-
 lib/python/qmk/cli/generate/rules_mk.py | 7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema
index 0a4fb5d453..1b8d01bcc6 100644
--- a/data/schemas/keymap.jsonschema
+++ b/data/schemas/keymap.jsonschema
@@ -5,6 +5,10 @@
     "type": "object",
     "properties": {
         "author": {"type": "string"},
+        "converter": {
+            "type": "string",
+            "enum": ["elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bonsai_c4"]
+        },
         "host_language": {"$ref": "qmk.definitions.v1#/text_identifier"},
         "keyboard": {"$ref": "qmk.definitions.v1#/text_identifier"},
         "keymap": {"$ref": "qmk.definitions.v1#/text_identifier"},
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index fa7c43788d..f64daba134 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -174,7 +174,7 @@ def generate_config_h(cli):
     # Determine our keyboard/keymap
     if cli.args.filename:
         user_keymap = parse_configurator_json(cli.args.filename)
-        kb_info_json = user_keymap.get('config', {})
+        kb_info_json = dotty(user_keymap.get('config', {}))
     elif cli.args.keyboard:
         kb_info_json = dotty(info_json(cli.args.keyboard))
     else:
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 361d3c758a..1d708f371e 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -49,10 +49,12 @@ def process_mapping_rule(kb_info_json, rules_key, info_dict):
 def generate_rules_mk(cli):
     """Generates a rules.mk file from info.json.
     """
+    converter = None
     # Determine our keyboard/keymap
     if cli.args.filename:
         user_keymap = parse_configurator_json(cli.args.filename)
-        kb_info_json = user_keymap.get('config', {})
+        kb_info_json = dotty(user_keymap.get('config', {}))
+        converter = user_keymap.get('converter', None)
     elif cli.args.keyboard:
         kb_info_json = dotty(info_json(cli.args.keyboard))
     else:
@@ -88,6 +90,9 @@ def generate_rules_mk(cli):
         else:
             rules_mk_lines.append('CUSTOM_MATRIX ?= yes')
 
+    if converter:
+        rules_mk_lines.append(f'CONVERT_TO ?= {converter}')
+
     # Show the results
     dump_lines(cli.args.output, rules_mk_lines)
 

From 693303ddbc24e37dba8db5e5914990e598c5df74 Mon Sep 17 00:00:00 2001
From: DeskDaily <65656486+DeskDaily@users.noreply.github.com>
Date: Fri, 21 Oct 2022 10:21:04 +0800
Subject: [PATCH 690/959] [Keyboard] Add Octopad+ Keyboard (#18484)

Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
---
 keyboards/nightly_boards/octopadplus/config.h | 60 +++++++++++++++++++
 .../nightly_boards/octopadplus/info.json      | 48 +++++++++++++++
 .../octopadplus/keymaps/default/keymap.c      | 54 +++++++++++++++++
 .../octopadplus/keymaps/default/rules.mk      |  1 +
 .../octopadplus/keymaps/via/keymap.c          | 54 +++++++++++++++++
 .../octopadplus/keymaps/via/rules.mk          |  2 +
 .../nightly_boards/octopadplus/octopadplus.c  | 17 ++++++
 .../nightly_boards/octopadplus/octopadplus.h  | 37 ++++++++++++
 .../nightly_boards/octopadplus/readme.md      | 26 ++++++++
 keyboards/nightly_boards/octopadplus/rules.mk | 19 ++++++
 10 files changed, 318 insertions(+)
 create mode 100644 keyboards/nightly_boards/octopadplus/config.h
 create mode 100644 keyboards/nightly_boards/octopadplus/info.json
 create mode 100644 keyboards/nightly_boards/octopadplus/keymaps/default/keymap.c
 create mode 100644 keyboards/nightly_boards/octopadplus/keymaps/default/rules.mk
 create mode 100644 keyboards/nightly_boards/octopadplus/keymaps/via/keymap.c
 create mode 100644 keyboards/nightly_boards/octopadplus/keymaps/via/rules.mk
 create mode 100644 keyboards/nightly_boards/octopadplus/octopadplus.c
 create mode 100644 keyboards/nightly_boards/octopadplus/octopadplus.h
 create mode 100644 keyboards/nightly_boards/octopadplus/readme.md
 create mode 100644 keyboards/nightly_boards/octopadplus/rules.mk

diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h
new file mode 100644
index 0000000000..3b2a7cea1a
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/config.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2022 DeskDaily
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 6
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F6, D3 }
+#define MATRIX_COL_PINS { E6, F5, C7, D7, F4, D2 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+
+/* Encoders */
+
+#define ENCODERS 2
+#define ENCODERS_PAD_A { F0, D1 }
+#define ENCODERS_PAD_B { F1, D0 }
+#define TAP_CODE_DELAY 10
+#define ENCODER_RESOLUTION 5
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json
new file mode 100644
index 0000000000..c4ae8b5200
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/info.json
@@ -0,0 +1,48 @@
+{
+    "keyboard_name": "Octopad+"	,
+    "manufacturer": "DeskDaily",
+    "url": "",
+    "maintainer": "DeskDaily",
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0014",
+    	"device_version": "0.0.1"
+	},
+	    "rgblight": {
+        "animations": {
+			"alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 8,
+        "hue_steps": 8,
+        "led_count": 8,
+        "max_brightness": 255,
+        "pin": "F7",
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+			{"x":0, "y":0}, 
+			{"x":3, "y":0}, 
+			{"x":0, "y":1.25}, 
+			{"x":1, "y":1.25}, 
+			{"x":2, "y":1.25}, 
+			{"x":3, "y":1.25}, 
+			
+			{"x":0, "y":2.25}, 
+			{"x":1, "y":2.25}, 
+			{"x":2, "y":2.25}, 
+			{"x":3, "y":2.25}]
+        }
+    }
+}
diff --git a/keyboards/nightly_boards/octopadplus/keymaps/default/keymap.c b/keyboards/nightly_boards/octopadplus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0929f354ef
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 DeskDaily
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		 KC_MUTE,                      KC_MYCM,
+		 KC_Q,     KC_W,     KC_E,     KC_R,
+		 KC_A,     KC_S,     KC_D,     KC_F
+		
+    ),
+	[1] = LAYOUT(
+		KC_TRNS,                     KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+		
+    ),
+	[2] = LAYOUT(
+		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
+		
+    ),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [1] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+	};
+#endif
\ No newline at end of file
diff --git a/keyboards/nightly_boards/octopadplus/keymaps/default/rules.mk b/keyboards/nightly_boards/octopadplus/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/nightly_boards/octopadplus/keymaps/via/keymap.c b/keyboards/nightly_boards/octopadplus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0929f354ef
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 DeskDaily
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		 KC_MUTE,                      KC_MYCM,
+		 KC_Q,     KC_W,     KC_E,     KC_R,
+		 KC_A,     KC_S,     KC_D,     KC_F
+		
+    ),
+	[1] = LAYOUT(
+		KC_TRNS,                     KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+		
+    ),
+	[2] = LAYOUT(
+		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
+		
+    ),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [1] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+	};
+#endif
\ No newline at end of file
diff --git a/keyboards/nightly_boards/octopadplus/keymaps/via/rules.mk b/keyboards/nightly_boards/octopadplus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..4253f570f0
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/nightly_boards/octopadplus/octopadplus.c b/keyboards/nightly_boards/octopadplus/octopadplus.c
new file mode 100644
index 0000000000..6e5c025ba2
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/octopadplus.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 DeskDaily
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "octopadplus.h"
diff --git a/keyboards/nightly_boards/octopadplus/octopadplus.h b/keyboards/nightly_boards/octopadplus/octopadplus.h
new file mode 100644
index 0000000000..b32e6d8f2f
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/octopadplus.h
@@ -0,0 +1,37 @@
+/* Copyright 2022 DeskDaily
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    K04,                K15, \
+    K00,  K01,   K02,   K03,    \
+    K10,  K11,   K12,   K13    \
+\
+) { \
+    { K00,   K01,   K02,    K03,    K04,    KC_NO  }, \
+    { K10,   K11,   K12,    K13,    KC_NO,  K15    }, \
+}
diff --git a/keyboards/nightly_boards/octopadplus/readme.md b/keyboards/nightly_boards/octopadplus/readme.md
new file mode 100644
index 0000000000..c211cc2a14
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/readme.md
@@ -0,0 +1,26 @@
+# DeskDaily Octopad+
+
+![Octopad+](https://i.imgur.com/Sa83N0Gh.jpg)
+
+Aluminum version of the Octopad. An 8 key macropad with 2 rotary encoders.
+
+* Keyboard Maintainer: [DeskDaily](https://github.com/DeskDaily)
+* Hardware Supported: atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nightly_boards/octopadplus:default
+	
+Flashing example for this keyboard:
+
+    make nightly_boards/octopadplus:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key among the 8 keys) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/nightly_boards/octopadplus/rules.mk b/keyboards/nightly_boards/octopadplus/rules.mk
new file mode 100644
index 0000000000..08b58953c2
--- /dev/null
+++ b/keyboards/nightly_boards/octopadplus/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes        # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes         # Mouse keys
+EXTRAKEY_ENABLE = yes         # Audio control and System control
+CONSOLE_ENABLE = no           # Console for debug
+COMMAND_ENABLE = no           # Commands for debug and configuration
+NKRO_ENABLE = yes             # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no         # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes         # Enable keyboard RGB underglow
+ENCODER_ENABLE = yes          # Enable Rotary Encoders
+

From 5343df09e081f7cf53e680ca818acaadc3184d29 Mon Sep 17 00:00:00 2001
From: Alex Berger <419632+aberger@users.noreply.github.com>
Date: Fri, 21 Oct 2022 05:27:20 +0200
Subject: [PATCH 691/959] [Keyboard] Fix saka68 solder layout (#18788)

---
 keyboards/cmm_studio/saka68/solder/solder.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/cmm_studio/saka68/solder/solder.h b/keyboards/cmm_studio/saka68/solder/solder.h
index e1945eab46..a39205f247 100644
--- a/keyboards/cmm_studio/saka68/solder/solder.h
+++ b/keyboards/cmm_studio/saka68/solder/solder.h
@@ -29,7 +29,7 @@
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   KC_NO }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, KC_NO, KC_NO }, \
     { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   KC_NO }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K4A,   K4B,   K4C,   KC_NO,   K4D,   K4E,   K4F,   KC_NO }, \
 }
 
 #define LAYOUT_68_ansi_split_bs( \

From bd044ae5fff8b811caaf542f0d31d73f3c50ec36 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Fri, 21 Oct 2022 12:02:11 +0700
Subject: [PATCH 692/959] Update Black E6.5 keymap issues on QMK Configurator
 (#18794)

---
 .../chinese_pcb/black_e65/config.h            |  4 +-
 .../black_e65/keymaps/default/keymap.c        | 26 +++----
 .../black_e65/keymaps/default/readme.md       |  3 -
 .../black_e65/keymaps/via/config.h            | 19 -----
 .../black_e65/keymaps/via/keymap.c            | 72 +++++++++++++++----
 .../black_e65/keymaps/via/readme.md           |  3 -
 .../chinese_pcb/black_e65/readme.md           |  2 +-
 7 files changed, 75 insertions(+), 54 deletions(-)
 delete mode 100644 keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/readme.md
 delete mode 100644 keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/config.h
 delete mode 100644 keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/readme.md

diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index bcd38d62c7..28f0aa4756 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -26,8 +26,8 @@
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
 
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 6
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
index 0f838488ef..064eaaefd6 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,13 +54,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3     4     5     6       7     8        9        10       11       12       13        14     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15      */
     [_BASE] = LAYOUT_all(
-                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,   KC_BSPC,
-                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP,
-                KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,            KC_PGDN,
-                KC_LSFT, KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B,   KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,    MO(_FN),
-                KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,       KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN,
+                KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(_FN),
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
 /*
@@ -76,12 +76,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_FN]   = LAYOUT_all(
-                QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-                RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, KC_HOME,
-                BL_TOGG, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,          KC_END,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                _______, _______, _______,                            _______,          _______, _______, _______, _______, _______, _______, KC_PSCR
+                QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PSCR,
+                RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_HOME,
+                BL_TOGG, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_END,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
             ),
 };
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/readme.md b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/readme.md
deleted file mode 100644
index 820d3551c3..0000000000
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default Layout
-
-Keymap is default 68 qwerty, 65% layout
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/config.h
deleted file mode 100644
index 6e5965cd67..0000000000
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
index 0f838488ef..66ea1efa24 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@
 enum layer_names {
     _BASE,
     _FN,
+    _FN1,
+    _FN2
 };
 
 // enum layer_keycodes { };
@@ -54,13 +56,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3     4     5     6       7     8        9        10       11       12       13        14     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15      */
     [_BASE] = LAYOUT_all(
-                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,   KC_BSPC,
-                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP,
-                KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,            KC_PGDN,
-                KC_LSFT, KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B,   KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,    MO(_FN),
-                KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,       KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN,
+                KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(_FN),
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
 /*
@@ -76,12 +78,56 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_FN]   = LAYOUT_all(
-                QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-                RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, KC_HOME,
-                BL_TOGG, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,          KC_END,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                _______, _______, _______,                            _______,          _______, _______, _______, _______, _______, _______, KC_PSCR
+                QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PSCR,
+                RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_HOME,
+                BL_TOGG, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_END,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN1]  = LAYOUT_all(
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN2]  = LAYOUT_all(
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
             ),
 };
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/readme.md b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/readme.md
deleted file mode 100644
index b0407cd266..0000000000
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default Layout with VIA
-
-Keymap is default 68 qwerty, 65% multi-layout
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/readme.md b/keyboards/horrortroll/chinese_pcb/black_e65/readme.md
index 115f91424b..47abcdd928 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/readme.md
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/readme.md
@@ -19,6 +19,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 Enter the bootloader in 3 ways:
 
-* **Bootmagic reset**: Hold down the key at (3,6) in the matrix (B key) and plug in the keyboard
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
 * **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

From 374d5d74804e0a99d93c3685f63f9f709b6ded22 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper <ToyKeeper@users.noreply.github.com>
Date: Fri, 21 Oct 2022 07:25:01 -0600
Subject: [PATCH 693/959] wilba_tech: allow keymaps to override
 backlight_effect_indicators() (#18791)

---
 keyboards/wilba_tech/wt_rgb_backlight.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index d093488fbf..c82f86304c 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -2417,7 +2417,7 @@ void backlight_effect_indicators_set_colors( uint8_t index, HS color )
 
 // This runs after another backlight effect and replaces
 // colors already set
-void backlight_effect_indicators(void)
+__attribute__ ((weak)) void backlight_effect_indicators(void)
 {
     if ( g_config.caps_lock_indicator.index != 255 && host_keyboard_led_state().caps_lock )
     {

From b33fc349671148bff6f0a60172b53c51e59cda49 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 22 Oct 2022 00:25:54 +1100
Subject: [PATCH 694/959] Deprecate `KC_LEAD` for `QK_LEAD` (#18792)

---
 docs/feature_leader_key.md                           | 12 ++++++------
 docs/keycodes.md                                     |  2 +-
 keyboards/7c8/framework/keymaps/default/keymap.c     |  2 +-
 keyboards/7c8/framework/keymaps/steven/keymap.c      |  2 +-
 .../converter/sun_usb/type5/keymaps/sigma/keymap.c   |  2 +-
 keyboards/crkbd/keymaps/curry/keymap.c               |  2 +-
 .../dztech/dz65rgb/keymaps/catrielmuller/keymap.c    |  4 ++--
 keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c     |  4 ++--
 keyboards/ergodox_ez/keymaps/danielo515/keymap.c     |  2 +-
 keyboards/ergodox_ez/keymaps/stamm/keymap.c          |  2 +-
 .../ergodox_ez/util/keymap_beautifier/README.md      |  4 ++--
 .../co60/keymaps/jmdaly_hhkb_split_space/keymap.c    |  4 ++--
 .../dactyl_manuform/5x6/keymaps/uqs/keymap.c         | 10 +++++-----
 keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c      |  2 +-
 .../squiggle/keymaps/rick-complicated/keymap.c       |  2 +-
 .../ergodox_infinity/keymaps/not-quite-neo/keymap.c  |  4 ++--
 .../q1/rev_0102/keymaps/victorsavu3/keymap.c         |  4 ++--
 .../kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c  |  2 +-
 .../bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c     |  2 +-
 .../dimple/staggered/keymaps/erovia/keymap.c         |  2 +-
 keyboards/lily58/keymaps/curry/keymap.c              |  2 +-
 .../c39/keymaps/kuchosauronad0/keymap.c              |  2 +-
 keyboards/maxr1998/phoebe/keymaps/default/keymap.c   |  2 +-
 .../mechkeys/mechmini/v2/keymaps/arkag/keymap.c      |  2 +-
 .../mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c  |  2 +-
 keyboards/planck/keymaps/copface/keymap.c            |  2 +-
 keyboards/planck/keymaps/experimental/keymap.c       |  6 +++---
 keyboards/planck/keymaps/jweickm/keymap.c            |  4 ++--
 keyboards/planck/keymaps/kmontag42/keymap.c          |  2 +-
 keyboards/planck/keymaps/kuatsure/keymap.c           |  2 +-
 keyboards/planck/keymaps/rootiest/keymap.c           |  8 ++++----
 keyboards/planck/keymaps/yhaliaw/keymap.c            |  2 +-
 keyboards/preonic/keymaps/arkag/keymap.c             |  2 +-
 keyboards/preonic/keymaps/kuatsure/keymap.c          |  2 +-
 keyboards/preonic/keymaps/pcurt854/keymap.c          |  6 +++---
 keyboards/preonic/keymaps/uqs/keymap.c               |  2 +-
 keyboards/preonic/keymaps/yhaliaw/keymap.c           |  2 +-
 keyboards/redox_w/keymaps/danielo515/keymap.c        |  2 +-
 keyboards/signum/3_0/keymaps/sgurenkov/keymap.c      |  2 +-
 keyboards/splitkb/kyria/keymaps/cjuniet/default.json |  2 +-
 keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c     |  2 +-
 keyboards/splitkb/kyria/keymaps/corodiak/keymap.c    |  4 ++--
 keyboards/splitkb/kyria/keymaps/mattir/keymap.c      |  2 +-
 keyboards/splitkb/kyria/keymaps/mattir2/keymap.c     |  2 +-
 keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c |  2 +-
 keyboards/splitkb/kyria/keymaps/plattfot/keymap.c    |  4 ++--
 keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c |  2 +-
 keyboards/splitkb/kyria/keymaps/uqs/keymap.c         |  2 +-
 keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c      |  2 +-
 layouts/community/ergodox/deadcyclo/keymap.c         |  2 +-
 layouts/community/ergodox/issmirnov/README.md        |  2 +-
 quantum/process_keycode/process_leader.c             |  2 +-
 quantum/quantum.c                                    |  2 +-
 quantum/quantum_keycodes.h                           |  5 ++++-
 quantum/quantum_keycodes_legacy.h                    |  2 ++
 users/alfrdmalr/alfrdmalr.h                          |  2 +-
 users/jjerrell/wrappers.h                            |  8 ++++----
 users/uqs/uqs.h                                      |  2 +-
 58 files changed, 90 insertions(+), 85 deletions(-)

diff --git a/docs/feature_leader_key.md b/docs/feature_leader_key.md
index e5b1e7a4d9..e285d10597 100644
--- a/docs/feature_leader_key.md
+++ b/docs/feature_leader_key.md
@@ -2,11 +2,11 @@
 
 If you've ever used Vim, you know what a Leader key is. If not, you're about to discover a wonderful concept. :) Instead of hitting Alt+Shift+W for example (holding down three keys at the same time), what if you could hit a _sequence_ of keys instead? So you'd hit our special modifier (the Leader key), followed by W and then C (just a rapid succession of keys), and something would happen.
 
-That's what `KC_LEAD` does. Here's an example:
+That's what `QK_LEAD` does. Here's an example:
 
-1. Pick a key on your keyboard you want to use as the Leader key. Assign it the keycode `KC_LEAD`. This key would be dedicated just for this -- it's a single action key, can't be used for anything else.
-2. Include the line `#define LEADER_TIMEOUT 300` in your `config.h`. This sets the timeout for the `KC_LEAD` key.  Specifically, when you press the `KC_LEAD` key, you only have a certain amount of time to complete the Leader Key sequence.  The `300` here sets that to 300ms, and you can increase this value to give you more time to hit the sequence. But any keys pressed during this timeout are intercepted and not sent, so you may want to keep this value low.  
-   * By default, this timeout is how long after pressing `KC_LEAD` to complete your entire sequence. This may be very low for some people. So you may want to increase this timeout.  Optionally, you may want to enable the `LEADER_PER_KEY_TIMING` option, which resets the timeout after each key is tapped.  This allows you to maintain a low value here, but still be able to use the longer sequences.   To enable this option, add `#define LEADER_PER_KEY_TIMING` to your `config.h`.
+1. Pick a key on your keyboard you want to use as the Leader key. Assign it the keycode `QK_LEAD`. This key would be dedicated just for this -- it's a single action key, can't be used for anything else.
+2. Include the line `#define LEADER_TIMEOUT 300` in your `config.h`. This sets the timeout for the `QK_LEAD` key.  Specifically, when you press the `QK_LEAD` key, you only have a certain amount of time to complete the Leader Key sequence.  The `300` here sets that to 300ms, and you can increase this value to give you more time to hit the sequence. But any keys pressed during this timeout are intercepted and not sent, so you may want to keep this value low.  
+   * By default, this timeout is how long after pressing `QK_LEAD` to complete your entire sequence. This may be very low for some people. So you may want to increase this timeout.  Optionally, you may want to enable the `LEADER_PER_KEY_TIMING` option, which resets the timeout after each key is tapped.  This allows you to maintain a low value here, but still be able to use the longer sequences.   To enable this option, add `#define LEADER_PER_KEY_TIMING` to your `config.h`.
 3. Within your `matrix_scan_user` function, add something like this:
 
 ```c
@@ -95,7 +95,7 @@ While, this may be fine for most, if you want to specify the whole keycode (eg,
 
 The Leader Key feature has some additional customization to how the Leader Key feature works. It has two functions that can be called at certain parts of the process. Namely `leader_start()` and `leader_end()`.
 
-The `leader_start()` function is called when you tap the `KC_LEAD` key, and the `leader_end()` function is called when either the leader sequence is completed, or the leader timeout is hit. 
+The `leader_start()` function is called when you tap the `QK_LEAD` key, and the `leader_end()` function is called when either the leader sequence is completed, or the leader timeout is hit. 
 
 You can add these functions to your code (`keymap.c` usually) to add feedback to the Leader sequences (such as beeping or playing music).
 
@@ -111,7 +111,7 @@ void leader_end(void) {
 
 ### Example
 
-This example will play the Mario "One Up" sound when you hit `KC_LEAD` to start the Leader Sequence, and will play "All Star" if it completes successfully or "Rick Roll" you if it fails. 
+This example will play the Mario "One Up" sound when you hit `QK_LEAD` to start the Leader Sequence, and will play "All Star" if it completes successfully or "Rick Roll" you if it fails. 
 
 ```c
 bool did_leader_succeed;
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 9121385f1a..b0409327c8 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -328,7 +328,7 @@ See also: [Leader Key](feature_leader_key.md)
 
 |Key      |Description             |
 |---------|------------------------|
-|`KC_LEAD`|Begins a leader sequence|
+|`QK_LEAD`|Begins a leader sequence|
 
 ## Magic Keycodes :id=magic-keycodes
 
diff --git a/keyboards/7c8/framework/keymaps/default/keymap.c b/keyboards/7c8/framework/keymaps/default/keymap.c
index 5f8214eb13..37809aa0a1 100644
--- a/keyboards/7c8/framework/keymaps/default/keymap.c
+++ b/keyboards/7c8/framework/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT_ortho_5x12(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______,
-    KC_LEAD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
+    QK_LEAD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
     KC_DEL,  KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______, _______, _______, _______, _______,
     KC_TRNS, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, _______,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, _______, _______, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END
diff --git a/keyboards/7c8/framework/keymaps/steven/keymap.c b/keyboards/7c8/framework/keymaps/steven/keymap.c
index c027cfc9bc..f39be10c2d 100644
--- a/keyboards/7c8/framework/keymaps/steven/keymap.c
+++ b/keyboards/7c8/framework/keymaps/steven/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = framework_via(
     _______, _______, _______, _______, _______, _______, _______, _______,   _______, KC_MINS, KC_EQL,  _______,
-    KC_LEAD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______,   _______, KC_LBRC, KC_RBRC, KC_BSLS,
+    QK_LEAD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______,   _______, KC_LBRC, KC_RBRC, KC_BSLS,
     KC_DEL,  KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______,   _______, _______, _______, _______,
     _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,   _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, MO(_BOTH), KC_HOME, KC_PGDN, KC_PGUP, KC_END,
diff --git a/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c b/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c
index 9e5f6ebb9d..3996b7d2e1 100644
--- a/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c
+++ b/keyboards/converter/sun_usb/type5/keymaps/sigma/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
   {
    [_QWERTY] = LAYOUT_us_unix(
-      KC_LEAD,                 KC_SCRT, KC_F1,KC_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_VOLD,KC_VOLU,KC_OS_LOCK,
+      QK_LEAD,                 KC_SCRT, KC_F1,KC_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_VOLD,KC_VOLU,KC_OS_LOCK,
       KC_STOP,   KC_OS_REDO,   KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,  KC_INS, KC_HOME,KC_PGUP,  KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,
       VRSN,      KC_OS_UNDO,   KC_TAB,  KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,  KC_BSPC,    KC_DEL, KC_END, KC_PGDN,  KC_P7,  KC_P8, KC_P9,  KC_PPLS,
       KC_MAKE,   KC_OS_COPY,   KC_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,
diff --git a/keyboards/crkbd/keymaps/curry/keymap.c b/keyboards/crkbd/keymaps/curry/keymap.c
index b2cffcdfd3..cbfc0cb537 100644
--- a/keyboards/crkbd/keymaps/curry/keymap.c
+++ b/keyboards/crkbd/keymaps/curry/keymap.c
@@ -9,7 +9,7 @@
         KC_ESC,  K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, KC_MINS, \
         MT_TAB,  K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, KC_QUOT, \
         OS_LSFT, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, OS_RSFT, \
-                KC_LEAD,OS_LALT, SP_LWER,      ET_RAIS, KC_BSPC, KC_RGUI         \
+                QK_LEAD,OS_LALT, SP_LWER,      ET_RAIS, KC_BSPC, KC_RGUI         \
     )
 #define LAYOUT_crkbd_base_wrapper(...)       LAYOUT_crkbd_base(__VA_ARGS__)
 
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 5ef122672c..925f5d0509 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_APP), KC_UP, KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LEAD, TO(_INDEX), MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, QK_LEAD, TO(_INDEX), MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_INDEX] = LAYOUT_65_ansi(
         TO(_MAIN), TO(_INDEX), TO(_FN), TO(_MULTIMEDIA), TO(_EMOJI), TO(_EXT1), TO(_EXT2), TO(_EXT3), TO(_EXT4), TO(_EXT5), TO(_EXT6), TO(_RGB), TO(_CONFIG), TO(_MAIN), KC_NO,
@@ -170,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB, X(UC_HUGGING_FACE), X(UC_SHUSHING_FACE), X(UC_THINKING_FACE), X(UC_FACE_RAISED_EYEBROW), X(UC_NEUTRAL_FACE), X(UC_SMIRKING_FACE), X(UC_FACE_ROLLING_EYES), X(UC_PENSIVE_FACE), X(UC_FACE_VOMITING), X(UC_WOOZY_FACE), X(UC_PLEADING_FACE), X(UC_LOUDLY_CRYING_FACE), X(UC_THUMBSUP), KC_END,
         KC_APP, X(UC_DISAPPOINTED_FACE), X(UC_FACE_SYMBOLS_MOUTH), X(UC_SMILING_FACE_HORNS), X(UC_SKULL), X(UC_PILE_POO), X(UC_GHOST), X(UC_ALIEN_MONSTER), X(UC_RED_HEART), X(UC_BOMB), X(UC_WAVING_HAND), X(UC_OK_HAND), KC_ENT, KC_PGUP,
         KC_LSFT, X(UC_CLAPPING_HANDS), X(UC_EYES), X(UC_MAN_FACEPALMING), X(UC_TURTLE), X(UC_SNAKE), X(UC_SPOUTING_WHALE), X(UC_DRAGON), X(UC_TREX), X(UC_ARGENTINA_A), X(UC_ARGENTINA_R), X(UC_THUMBSDOWN), KC_UP, KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LEAD, TO(_INDEX), TO(_MAIN), KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, QK_LEAD, TO(_INDEX), TO(_MAIN), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_EXT1] = LAYOUT_65_ansi(
         TO(_MAIN), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index f5529876da..63d4662efc 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAIN] = LAYOUT_65_ansi(
         QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_LEAD, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+        QK_LEAD, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
@@ -473,7 +473,7 @@ void matrix_scan_user(void)
             }
         }
         /*  CapsLock */
-        SEQ_ONE_KEY(KC_LEAD) {
+        SEQ_ONE_KEY(QK_LEAD) {
             tap_code(KC_CAPS);
         }
         /*  ±       => LdrKey > = > - */
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
index 14530cafd1..281ac956e0 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LT(4,KC_ENTER)      ,KC_DOWN             ,KC_LBRC             ,KC_RBRC             ,OSL(2)              ,
     KC_AUDIO_MUTE       ,KC_ESCAPE           ,
     KC_END              ,
-    KC_COLN             ,KC_LEAD             ,LT(4,KC_SPACE)
+    KC_COLN             ,QK_LEAD             ,LT(4,KC_SPACE)
     ),
 
   [1] = LAYOUT_ergodox(
diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
index 65382ff074..2b0aff6362 100644
--- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
@@ -55,7 +55,7 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_0_BASE] = LAYOUT_ergodox(
   KC_NUBS,              KC_EXLM,              KC_AT,         KC_HASH,        KC_DLR,       KC_PERC,   KC_AUDIO_MUTE,
-  KC_LEAD,              KC_Q,                 KC_W,          E_NUMBERS,      R_MOUSE,      KC_T,      XXXXXXX,
+  QK_LEAD,              KC_Q,                 KC_W,          E_NUMBERS,      R_MOUSE,      KC_T,      XXXXXXX,
   LCTL(KC_B),           LSFT_T(KC_A),         LCTL_T(KC_S),  LALT_T(KC_D),   LGUI_T(KC_F), KC_G,
   KC_BSLS,              KC_Z,                 KC_X,          KC_C,           KC_V,         KC_B,      XXXXXXX,
   ALT_TAB,              XXXXXXX,              XXXXXXX,       MO(_1_NUMBERS), ARROWS,
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/README.md b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
index 33d485590f..9781c55a1c 100644
--- a/keyboards/ergodox_ez/util/keymap_beautifier/README.md
+++ b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
@@ -47,7 +47,7 @@ KC_PGDN, LT(1,KC_TAB)    , KC_ENTER
 Optionally, it can also render [LAYOUT_ergodox_pretty](https://github.com/qmk/qmk_firmware/blob/ee700b2e831067bdb7584425569b61bc6329247b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c#L49-L57):
 ```
 [0] = LAYOUT_ergodox_pretty(
-  KC_ESCAPE,        KC_1,     KC_2,    KC_3,     KC_4,           KC_5,          KC_LEAD,      KC_LEAD, KC_6          , KC_7            , KC_8            , KC_9               , KC_0              , KC_BSPC             ,
+  KC_ESCAPE,        KC_1,     KC_2,    KC_3,     KC_4,           KC_5,          QK_LEAD,      QK_LEAD, 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_HYPR,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLS             ,
    KC_LCTL,         KC_A,     KC_S,    KC_D,     KC_F,           KC_G,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
   KC_LSFT,          KC_Z,     KC_X,    KC_C,     KC_V,           KC_B,           SH_MON,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSFT             ,
@@ -62,7 +62,7 @@ LT(6,KC_NO), LT(7,KC_NO), KC_LCTL,  KC_LGUI,  KC_LALT,
 We can also align everythng t othe left (easier editing in my opinon):
 ```
 [0] = LAYOUT_ergodox_pretty(
-KC_ESCAPE  , KC_1       , KC_2    , KC_3   , KC_4    , KC_5          , KC_LEAD         ,      KC_LEAD, KC_6          , KC_7            , KC_8            , KC_9               , KC_0              , KC_BSPC             ,
+KC_ESCAPE  , KC_1       , KC_2    , KC_3   , KC_4    , KC_5          , QK_LEAD         ,      QK_LEAD, 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_HYPR         ,      KC_HYPR, KC_Y          , KC_U            , KC_I            , KC_O               , KC_P              , KC_BSLS             ,
 KC_LCTL    , KC_A       , KC_S    , KC_D   , KC_F    , KC_G          ,                                 KC_H          , KC_J            , KC_K            , KC_L               , KC_SCLN           , KC_QUOTE            ,
 KC_LSFT    , KC_Z       , KC_X    , KC_C   , KC_V    , KC_B          , SH_MON          ,      SH_MON , KC_N          , KC_M            , KC_COMMA        , KC_DOT             , KC_SLASH          , KC_RSFT             ,
diff --git a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
index 5f53092aef..4f790c229f 100644
--- a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
+++ b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
@@ -29,7 +29,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_BSPC,
     CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(_L3),
-             KC_LALT, KC_LGUI,       KC_ENT,              MO(_L3),       KC_SPC,  KC_LEAD, KC_RGUI, KC_RALT
+             KC_LALT, KC_LGUI,       KC_ENT,              MO(_L3),       KC_SPC,  QK_LEAD, KC_RGUI, KC_RALT
   ),
   // My preferred base layout. This doesn't match the caps
   // on my boards, so I don't make it default.
@@ -38,7 +38,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_BSPC,
     CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(_L3),
-             KC_LALT, KC_LGUI,       KC_ENT,              MO(_L3),       KC_SPC,  KC_LEAD, KC_RGUI, KC_RALT
+             KC_LALT, KC_LGUI,       KC_ENT,              MO(_L3),       KC_SPC,  QK_LEAD, KC_RGUI, KC_RALT
   ),
   [_L3] = LAYOUT_60_hhkb_split_625u_space( /* Function */
     QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,    KC_F11,     KC_F12,   _______, _______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
index 2e79040bf0..620994fc37 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -44,14 +44,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
                          KC_LBRC,  KC_RBRC,
      /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
-      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+      /*aux*/  QK_LEAD,  OSM_GUI,  KC_LALT,
      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
      KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
      KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
                          KC_MINS,  KC_EQL,
      /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
-      /*aux*/  KC_RALT,  KC_APP,   KC_LEAD
+      /*aux*/  KC_RALT,  KC_APP,   QK_LEAD
   ),
 
   [L_WASD] = LAYOUT_uqs(
@@ -78,21 +78,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
                          MS_WHUP,  MS_WHDN,
      /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
-      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+      /*aux*/  QK_LEAD,  OSM_GUI,  KC_LALT,
      KC_NO,    KC_BTN1,  KC_BTN2,  KC_BTN3,  KC_NO,    KC_NO,
      KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
      KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
      KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
                          KC_NO,    KC_NO,
      /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
-      /*aux*/  KC_LEAD,  KC_RALT,  KC_APP
+      /*aux*/  QK_LEAD,  KC_RALT,  KC_APP
   ),
 
   // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
   // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
   [L_EXTD] = LAYOUT_uqs(
      _______,  _______,  _______,  _______,  _______,  _______,
-     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  QK_LEAD,
      _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
      _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
                          _______,  _______,
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c b/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c
index 1d84f383c7..370bc8774e 100644
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     [BASE] = LAYOUT( //  default layer
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_LEAD,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, QK_LEAD,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         ALL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MEDIA, KC_SCLN), KC_QUOT, ALL_T(KC_ENT),
         KC_LSFT, CTL_T(KC_Z), ALT_T(KC_X), GUI_T(KC_C), KC_V, KC_B, KC_N, KC_M, GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_SLSH), KC_RSFT, TG(DEV),
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
index 86cb3f747d..23551827e4 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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,KC_LEAD,    ALT_ENT,RS_SPC,
+                            LW_BSPC,QK_LEAD,    ALT_ENT,RS_SPC,
                             LW_BSPC,SFT_ESC,    ALT_ENT,RS_SPC
 ),
 
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
index 9538824722..bfbe2a0318 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [L01] = LAYOUT_ergodox_wrapper(
   KC_TAB,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX,
-  KC_ESC,                 L01_LEFT_01,                 KC_LEAD,
+  KC_ESC,                 L01_LEFT_01,                 QK_LEAD,
   MO(L03),                L01_LEFT_02,
   KC_LSFT,                L01_LEFT_03,                 MO(LFN),
   KC_LCTL, KC_LGUI,KC_LALT, MO(L05), MO(L04),
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      KC_SPACE,KC_LSFT, KC_PGDN,
   //--
   XXXXXXX,  KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_LEAD,                L01_RIGHT_01,                 KC_ENTER,
+  QK_LEAD,                L01_RIGHT_01,                 KC_ENTER,
                           L01_RIGHT_02,                 MO(L03),
   MO(LFN),                L01_RIGHT_03,                 KC_RSFT,
                     MO(L04), MO(L05), KC_RALT, MO(LFN), KC_RCTL,
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c
index 1f56295fa9..8478ccbe57 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c
+++ b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   X(SAD),
      KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            X(GRIN),
      KC_TAB,   KC_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_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,
+     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),
 
@@ -84,7 +84,7 @@ void matrix_scan_user(void) {
         leading = false;
         leader_end();
 
-        SEQ_ONE_KEY(KC_LEAD) {
+        SEQ_ONE_KEY(QK_LEAD) {
             tap_code(KC_CAPS);
         }
 
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
index 585f2e25b7..f488965ae0 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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,
-      _______,   _______,    _______,                            KC_LEAD,                                  _______, _______,          KC_MPRV,    KC_MSTP,    KC_MNXT
+      _______,   _______,    _______,                            QK_LEAD,                                  _______, _______,          KC_MPRV,    KC_MSTP,    KC_MNXT
       ),
   /* 2: Mouse layer and virtual/multiple desktop navigation */
   [_LVL2_] = LAYOUT_65_iso_blocker(
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
index baa41693d6..3308a62db9 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______,          LGUI(KC_PAUSE),
       _______, TO(_GREEN_), TO(_BLUE_), TO(_CYAN_), TO(_MAGENTA_), TO(_YELLOW_), _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
       _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-      QK_BOOT, _______,     _______,                               KC_LEAD,                                 _______, _______,          KC_MPLY, KC_VOLD, KC_MUTE
+      QK_BOOT, _______,     _______,                               QK_LEAD,                                 _______, _______,          KC_MPLY, KC_VOLD, KC_MUTE
       ),
 
 
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
index e6e1ab8638..1f8d3d5969 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_ADJUST] = LAYOUT(
 		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_LEAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QWERTY,  COLEMAK, KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		QK_LEAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QWERTY,  COLEMAK, KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
 	),
diff --git a/keyboards/lily58/keymaps/curry/keymap.c b/keyboards/lily58/keymaps/curry/keymap.c
index f28b54edcc..37b83908af 100644
--- a/keyboards/lily58/keymaps/curry/keymap.c
+++ b/keyboards/lily58/keymaps/curry/keymap.c
@@ -11,7 +11,7 @@
         KC_TAB,  K11, K12, K13, K14, K15,                    K16, K17, K18, K19, K1A, KC_BSLS, \
         KC_LCTL, K21, K22, K23, K24, K25,                    K26, K27, K28, K29, K2A, KC_QUOT, \
         OS_LSFT, K31, K32, K33, K34, K35, KC_LBRC, KC_RBRC,  K36, K37, K38, K39, K3A, OS_RSFT, \
-                 KC_LEAD, OS_LALT, LOWER, KC_SPC,  KC_ENT,   RAISE, KC_BSPC, OS_RGUI           \
+                 QK_LEAD, OS_LALT, LOWER, KC_SPC,  KC_ENT,   RAISE, KC_BSPC, OS_RGUI           \
     )
 #define LAYOUT_lily58_base_wrapper(...) LAYOUT_lily58_base(__VA_ARGS__)
 
diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
index f122b8395f..3c6328a02a 100644
--- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   LAYOUT_wrapper( \
     MT(MOD_LALT,KC_TAB),  K01,    K02,     K03,      K04,     K05,     LT(RAISE,KC_PGUP),  K06,     K07,     K08,     K09,     K0A,     KC_BSPC, \
     SFT_T(KC_ESC),        K11,    K12,     K13,      K14,     K15,     LT(LOWER,KC_PGDN),  K16,     K17,     K18,     K19,     K1A,     SFT_T(KC_ENT), \
-    MT(MOD_LCTL,KC_DEL),  K21,    K22,     K23,      K24,     K25,     KC_SPACE,           K26,     K27,     K28,     K29,     K2A,     KC_LEAD  \
+    MT(MOD_LCTL,KC_DEL),  K21,    K22,     K23,      K24,     K25,     KC_SPACE,           K26,     K27,     K28,     K29,     K2A,     QK_LEAD  \
   )
 
 /* 
diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
index 11ac657751..afd66347d5 100644
--- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS, KC_ENT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSPC,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_LEAD, KC_SC,       KC_SPC,       KC_ALGR, KC_FN,   KC_LEFT, KC_DOWN, KC_RGHT
+  KC_LCTL, KC_LGUI, KC_LALT, QK_LEAD, KC_SC,       KC_SPC,       KC_ALGR, KC_FN,   KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
 /* Special characters
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
index 64d7603144..7a3d233172 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-    M_PMOD,  M_SMOD,  KC_LALT, MEDIA,   SYMBOL,      KC_SPC,       ARROW,   FUNCT,   XXXXXXX, KC_RALT, KC_LEAD),
+    M_PMOD,  M_SMOD,  KC_LALT, MEDIA,   SYMBOL,      KC_SPC,       ARROW,   FUNCT,   XXXXXXX, KC_RALT, QK_LEAD),
 
 
   [_SYMBOL] = LAYOUT_2u_space_ortho(
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
index 7a6b640d18..5d995194b2 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
@@ -32,7 +32,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_BSPC,
 		CTRL_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
 		KC_LSPO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     TD(1),    TD(2),    TD(3),    KC_RSPC,
-		KC_LCTL,    KC_LEAD,  KC_LALT,  KC_LGUI,  MO(1),        KC_SPC,         MO(2),    KC_VOLD,  KC_MPLY,  KC_VOLU,  KC_GRV),
+		KC_LCTL,    QK_LEAD,  KC_LALT,  KC_LGUI,  MO(1),        KC_SPC,         MO(2),    KC_VOLD,  KC_MPLY,  KC_VOLU,  KC_GRV),
 
 	[raise] = LAYOUT_2u_space_ortho(
 		_______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DEL,
diff --git a/keyboards/planck/keymaps/copface/keymap.c b/keyboards/planck/keymaps/copface/keymap.c
index 2ba55c6a52..da23715949 100644
--- a/keyboards/planck/keymaps/copface/keymap.c
+++ b/keyboards/planck/keymaps/copface/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DEFAULT] = LAYOUT_planck_grid(
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,  KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,  KC_J,    KC_K,    KC_L,    XXXXXXX, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  XXXXXXX, KC_LEAD,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  XXXXXXX, QK_LEAD,
     KC_LGUI, KC_LCTL, KC_LALT, KC_LALT, LOWER,   KC_SPC,  META,  RAISE,   KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT
 ),
 
diff --git a/keyboards/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c
index 7252b5b5d3..d0a45529c1 100644
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ b/keyboards/planck/keymaps/experimental/keymap.c
@@ -61,7 +61,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_BSPC,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Colemak
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
   KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Dvorak
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
   KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
   KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
index 204c4ddc45..eeafcfe23b 100644
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ b/keyboards/planck/keymaps/jweickm/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LGUI_T(KC_Q), LALT_T(KC_W), LSFT_T(KC_F), LCTL_T(KC_P), LT(_NUM, KC_B), KC_SVU_BU, LT(_NUM, KC_J), RCTL_T(KC_L), RSFT_T(KC_U), LALT_T(KC_Y), RGUI_T(KC_SCLN), DE_ue, 
         KC_A, KC_R, KC_S, KC_T, KC_G, KC_TAB, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, 
         LT(_MOUSE, KC_Z), KC_X, KC_C, KC_D, KC_V, KC_SVD_BD, KC_K, KC_H, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), KC_BSLS, 
-        LCTL_T(KC_CAPS), KC_LEAD, KC_BSPC, LT(_LOWER, KC_ESC), OSM(MOD_LSFT), LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), LT(_RAISE, KC_ENT), RSFT_T(KC_DEL), KC_RALT, LT(_MOUSE, KC_LEFT), LT(_MOUSE, KC_RIGHT)
+        LCTL_T(KC_CAPS), QK_LEAD, KC_BSPC, LT(_LOWER, KC_ESC), OSM(MOD_LSFT), LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), LT(_RAISE, KC_ENT), RSFT_T(KC_DEL), KC_RALT, LT(_MOUSE, KC_LEFT), LT(_MOUSE, KC_RIGHT)
     ),
 
     /* _HRWIDECOLEMAK_DE
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LGUI_T(KC_Q), LALT_T(KC_W), LSFT_T(KC_F), LCTL_T(KC_P), LT(_NUM, KC_B), KC_SVU_BU, LT(_NUM, KC_J), RCTL_T(KC_L), RSFT_T(KC_U), LALT_T(KC_Z), M_RGUI_SCLN, KC_LBRC, 
         KC_A, KC_R, KC_S, KC_T, KC_G, KC_TAB, KC_M, KC_N, KC_E, KC_I, KC_O, DE_QUOT, 
         LT(_MOUSE, KC_Y), KC_X, KC_C, KC_D, KC_V, KC_SVD_BD, KC_K, KC_H, DE_COMM_LAB, DE_DOT_RAB, DE_SLSH_QUST, DE_BSLS, 
-        LCTL_T(KC_CAPS), KC_LEAD, KC_BSPC, LT(_LOWER_DE, KC_ESC), OSM(MOD_LSFT), LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), LT(_RAISE_DE, KC_ENT), RSFT_T(KC_DEL), KC_RALT, LT(_MOUSE, KC_LEFT), LT(_MOUSE, KC_RIGHT)
+        LCTL_T(KC_CAPS), QK_LEAD, KC_BSPC, LT(_LOWER_DE, KC_ESC), OSM(MOD_LSFT), LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), LT(_RAISE_DE, KC_ENT), RSFT_T(KC_DEL), KC_RALT, LT(_MOUSE, KC_LEFT), LT(_MOUSE, KC_RIGHT)
     ),
 
     /* _GAMING
diff --git a/keyboards/planck/keymaps/kmontag42/keymap.c b/keyboards/planck/keymaps/kmontag42/keymap.c
index 5f42099a6d..17b1a71fac 100644
--- a/keyboards/planck/keymaps/kmontag42/keymap.c
+++ b/keyboards/planck/keymaps/kmontag42/keymap.c
@@ -52,7 +52,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_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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LGUI, KC_LCTL, KC_LALT, KC_RPRN, LOWER,   KC_LEAD,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  KC_LGUI, KC_LCTL, KC_LALT, KC_RPRN, LOWER,   QK_LEAD,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/planck/keymaps/kuatsure/keymap.c b/keyboards/planck/keymaps/kuatsure/keymap.c
index 98ace0e34a..b43392f9bb 100644
--- a/keyboards/planck/keymaps/kuatsure/keymap.c
+++ b/keyboards/planck/keymaps/kuatsure/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KT_MTAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC,
     KT_CESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT,
     KT_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT,
-    KC_MPLY, KC_LEAD, KC_LALT, KC_LGUI, LOWER,     RAISE, KC_SPC, KC_SPC,     KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    KC_MPLY, QK_LEAD, KC_LALT, KC_LGUI, LOWER,     RAISE, KC_SPC, KC_SPC,     KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 ),
 
 /* Lower
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index f49e6e48e9..5b34ad01e9 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -275,7 +275,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,                      //
         LT(_TABULA, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,       //
         TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT,  //
-        TD(TD_LCTL_STICKY), KC_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+        TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     /*
     Base Layer [0]
      * ,-----------------------------------------------------------------------------------.
@@ -293,7 +293,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,                   //
         LT(_TABULA, KC_TAB), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,          //
         TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT,  //
-        TD(TD_LCTL_STICKY), KC_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+        TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     /*
     Colemak Layer [1]
      * ,-----------------------------------------------------------------------------------.
@@ -311,7 +311,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,         //
         LT(_TABULA, KC_TAB), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_TRNS, KC_S, KC_SLSH,  //
         TD(TD_LSHFT_CAPS), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SFTENT,  //
-        TD(TD_LCTL_STICKY), KC_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+        TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     /* Dvorak Layer [2]
      * ,-----------------------------------------------------------------------------------.
      * |Gr/ESC|   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
@@ -399,7 +399,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, KC_HOME, KC_UP, KC_END, KC_PERC, KC_LCBR, KC_RCBR, KC_TAB, KC_P7, KC_P8, KC_P9, KC_BSPC,       //
         KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSLS, KC_LBRC, KC_RBRC, KC_PSLS, KC_P4, KC_P5, KC_P6, KC_PMNS,  //
         KC_LSFT, KC_SLSH, KC_CUT, KC_COPY, KC_PASTE, KC_LT, KC_GT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PPLS,      //
-        TO(_BASE), KC_LEAD, KC_LGUI, KC_LALT, KC_LCPO, KC_SPC, KC_RCPC, KC_HASH, KC_P0, KC_PDOT, KC_PENT),
+        TO(_BASE), QK_LEAD, KC_LGUI, KC_LALT, KC_LCPO, KC_SPC, KC_RCPC, KC_HASH, KC_P0, KC_PDOT, KC_PENT),
     /*
     Numpad Layer [7]
     * ,-----------------------------------------------------------------------------------.
diff --git a/keyboards/planck/keymaps/yhaliaw/keymap.c b/keyboards/planck/keymaps/yhaliaw/keymap.c
index b239e44b1c..54bf431f22 100644
--- a/keyboards/planck/keymaps/yhaliaw/keymap.c
+++ b/keyboards/planck/keymaps/yhaliaw/keymap.c
@@ -50,7 +50,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_BSPC,
         KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_RALT, KC_RCTL, KC_DEL
+        QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_RALT, KC_RCTL, KC_DEL
     ),
 
     /* Lower
diff --git a/keyboards/preonic/keymaps/arkag/keymap.c b/keyboards/preonic/keymaps/arkag/keymap.c
index 188269298a..ff67b758d5 100644
--- a/keyboards/preonic/keymaps/arkag/keymap.c
+++ b/keyboards/preonic/keymaps/arkag/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT, MEDIA,   SYMBOL,  KC_SPC,  KC_LEAD, ARROW,   FUNCT,   XXXXXXX, KC_RALT, KC_LEAD),
+    KC_LCTL, KC_LGUI, KC_LALT, MEDIA,   SYMBOL,  KC_SPC,  QK_LEAD, ARROW,   FUNCT,   XXXXXXX, KC_RALT, QK_LEAD),
 
   [_SYMBOL] = LAYOUT_preonic_grid(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/preonic/keymaps/kuatsure/keymap.c b/keyboards/preonic/keymaps/kuatsure/keymap.c
index 7e0ecf5c45..5594f6391e 100644
--- a/keyboards/preonic/keymaps/kuatsure/keymap.c
+++ b/keyboards/preonic/keymaps/kuatsure/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KT_MTAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSLS, \
   KT_CESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, \
   KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT,  \
-  KC_LEAD, GAME, KC_LALT, KC_LGUI, LOWER,       KC_SPC, KC_SPC,      RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT  \
+  QK_LEAD, GAME, KC_LALT, KC_LGUI, LOWER,       KC_SPC, KC_SPC,      RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT  \
 ),
 
 /* Game
diff --git a/keyboards/preonic/keymaps/pcurt854/keymap.c b/keyboards/preonic/keymaps/pcurt854/keymap.c
index 445b41c450..c039320b34 100644
--- a/keyboards/preonic/keymaps/pcurt854/keymap.c
+++ b/keyboards/preonic/keymaps/pcurt854/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_QWERTY] = LAYOUT_preonic_grid(
   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LEAD,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    QK_LEAD,
   LCTL_T(KC_ESC),
            KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   OSL(_BRACKET),
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_COLEMAK] = LAYOUT_preonic_grid(
   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LEAD,
+  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, QK_LEAD,
   LCTL_T(KC_ESC),
            KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
   OSL(_BRACKET),
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_DVORAK] = LAYOUT_preonic_grid(
   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LEAD,
+  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    QK_LEAD,
   LCTL_T(KC_ESC),
            KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
   OSL(_BRACKET),
diff --git a/keyboards/preonic/keymaps/uqs/keymap.c b/keyboards/preonic/keymaps/uqs/keymap.c
index c94e8995ee..4e3fdec111 100644
--- a/keyboards/preonic/keymaps/uqs/keymap.c
+++ b/keyboards/preonic/keymaps/uqs/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [L_EXTD] = LAYOUT_uqs(
      KC_F11,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
-     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  QK_LEAD,
      _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
      _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
      /*thumb*/ _______,  _______,
diff --git a/keyboards/preonic/keymaps/yhaliaw/keymap.c b/keyboards/preonic/keymaps/yhaliaw/keymap.c
index 251d410a0f..139bd16a29 100644
--- a/keyboards/preonic/keymaps/yhaliaw/keymap.c
+++ b/keyboards/preonic/keymaps/yhaliaw/keymap.c
@@ -52,7 +52,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_BSPC,
         KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_RALT, KC_RCTL, KC_DEL
+        QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_RALT, KC_RCTL, KC_DEL
     ),
 
     /* Lower
diff --git a/keyboards/redox_w/keymaps/danielo515/keymap.c b/keyboards/redox_w/keymaps/danielo515/keymap.c
index d500fec640..d40ba1a340 100644
--- a/keyboards/redox_w/keymaps/danielo515/keymap.c
+++ b/keyboards/redox_w/keymaps/danielo515/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_BSLS ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_DEL  ,KC_PLUS ,        ALT_TAB ,AD_ESC  ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_ASTR ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     CTL     ,ALT     ,KC_LEFT ,KC_RIGHT,     GUI     ,    SHIFT   ,KC_BSPC ,        KC_LEAD ,NAV_SPC ,    ENT_SYM,     KC_LBRC ,KC_RBRC ,KC_DOWN ,KC_UP
+     CTL     ,ALT     ,KC_LEFT ,KC_RIGHT,     GUI     ,    SHIFT   ,KC_BSPC ,        QK_LEAD ,NAV_SPC ,    ENT_SYM,     KC_LBRC ,KC_RBRC ,KC_DOWN ,KC_UP
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   ),
 
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
index 577aa09f8a..cfd848fcfd 100644
--- a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
+++ b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,         KC_Q,      KC_W,       KC_E,      KC_R,      KC_T,       KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,         KC_DEL,
     KC_TAB,         M4(KC_A),  M3(KC_S),   M2(KC_D),  M1(KC_F),  M0(KC_G),   M0(KC_H), M1(KC_J), M2(KC_K), M3(KC_L), M4(KC_COLN),  KC_QUOT,
     KC_GRV,         KC_Z,      KC_X,       KC_C,      KC_V,      KC_B,       KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,      KC_BSLS,
-    OSM(MOD_LSFT),  KC_LEAD,   KC_LGUI,    LTH1,      XXXXXXX,   LTH2,       RTH2,     XXXXXXX,  RTH1,     KC_RGUI,  KC_LEAD,      OSM(MOD_HYPR)),
+    OSM(MOD_LSFT),  QK_LEAD,   KC_LGUI,    LTH1,      XXXXXXX,   LTH2,       RTH2,     XXXXXXX,  RTH1,     KC_RGUI,  QK_LEAD,      OSM(MOD_HYPR)),
 
 // L_LEFT
     LAYOUT(
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
index da56f81fc4..adbd6e0df6 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
@@ -7,7 +7,7 @@
       "KC_ESC", "KC_Q", "KC_W", "KC_F", "KC_P", "KC_G", "KC_J", "KC_L", "KC_U", "KC_Y", "KC_SCLN", "KC_BSLS",
       "LCTL_T(KC_BSPC)", "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_LAPO", "LGUI_T(KC_LBRC)", "RGUI_T(KC_RBRC)", "KC_RAPC", "KC_K", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_MINS",
-      "KC_TAB", "KC_LGUI", "TT(1)", "LSFT_T(KC_SPC)", "LCTL_T(KC_ENT)", "RCTL_T(KC_ENT)", "RSFT_T(KC_SPC)", "TT(2)", "KC_RGUI", "KC_LEAD"
+      "KC_TAB", "KC_LGUI", "TT(1)", "LSFT_T(KC_SPC)", "LCTL_T(KC_ENT)", "RCTL_T(KC_ENT)", "RSFT_T(KC_SPC)", "TT(2)", "KC_RGUI", "QK_LEAD"
     ],
     [
       "KC_TRNS", "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "KC_TILD",
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
index 6037a2e96d..6eddb235df 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
         LCTL_T(KC_BSPC), 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_LAPO, LGUI_T(KC_LBRC), RGUI_T(KC_RBRC), KC_RAPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
-        KC_TAB, KC_LGUI, TT(_SYMBOLS), LSFT_T(KC_SPC), LCTL_T(KC_ENT), RCTL_T(KC_ENT), RSFT_T(KC_SPC), TT(_NUMBERS), KC_RGUI, KC_LEAD),
+        KC_TAB, KC_LGUI, TT(_SYMBOLS), LSFT_T(KC_SPC), LCTL_T(KC_ENT), RCTL_T(KC_ENT), RSFT_T(KC_SPC), TT(_NUMBERS), KC_RGUI, QK_LEAD),
     [_SYMBOLS] = LAYOUT(
         KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
         KC_TRNS, KC_MPLY, KC_MS_L, KC_MS_U, KC_MS_R, KC_WH_U, KC_PGUP, KC_LEFT, KC_UP, KC_RGHT, KC_VOLU, KC_GRV,
diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c b/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c
index 0f7e05991b..2a28d49752 100644
--- a/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c
@@ -63,7 +63,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_BSPC,
       MO(_NAV), KC_A ,  KC_S   ,  KC_D  ,   KC_F ,   KC_G ,                                        KC_H,   KC_J ,  KC_K ,   KC_L ,KC_SCLN, KC_QUOT,
       KC_LSFT , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , XXXXXXX, KC_ESC , MO(_ADJUST), XXXXXXX, KC_N,  KC_M ,KC_COMM, KC_DOT ,KC_SLSH, RSFT_T(KC_DEL),
-                                 KC_LCTL, KC_LGUI, KC_RALT, KC_ENT ,TT(_NUM),TT(_NUM), KC_SPC, MO(_SYMBOLS), MO(_NAV), KC_LEAD
+                                 KC_LCTL, KC_LGUI, KC_RALT, KC_ENT ,TT(_NUM),TT(_NUM), KC_SPC, MO(_SYMBOLS), MO(_NAV), QK_LEAD
     ),
 
 /*
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB  , KC_Q ,  KC_W   ,  KC_F  ,   KC_P ,   KC_G ,                                        KC_J,   KC_L ,  KC_U ,   KC_Y ,KC_SCLN, KC_BSPC,
       MO(_NAV), KC_A ,  KC_R   ,  KC_S  ,   KC_T ,   KC_D ,                                        KC_H,   KC_N ,  KC_E ,   KC_I ,  KC_O , KC_QUOT,
       KC_LSFT , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , XXXXXXX, KC_ESC , MO(_ADJUST), XXXXXXX, KC_K,  KC_M ,KC_COMM, KC_DOT ,KC_SLSH, RSFT_T(KC_DEL),
-                                 KC_LCTL, KC_LGUI, KC_RALT, KC_ENT ,TT(_NUM),TT(_NUM), KC_SPC, MO(_SYMBOLS), MO(_NAV), KC_LEAD
+                                 KC_LCTL, KC_LGUI, KC_RALT, KC_ENT ,TT(_NUM),TT(_NUM), KC_SPC, MO(_SYMBOLS), MO(_NAV), QK_LEAD
     ),
 
 /*
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
index 7b567cbd60..5f97c40765 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [QWERTY] = LAYOUT(
       KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
       KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
-      KC_LEAD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, XXXXXXX, XXXXXXX, KC_MINS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
+      QK_LEAD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, XXXXXXX, XXXXXXX, KC_MINS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
       KC_MUTE, KC_LCTL, KC_LGUI, TT(RAISE), SFT_T(KC_SPC), SFT_T(KC_SPC), TT(LOWER), KC_BSPC, KC_LALT, TG(RGBLED)
       ),
   [LOWER] = LAYOUT(
diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
index d6bb026d26..0d09bcce74 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [QWERTY] = LAYOUT(
       KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
       KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-      KC_LEAD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, KC_GRV, TT(FUNCS), KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
+      QK_LEAD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, KC_GRV, TT(FUNCS), KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
       KC_LSFT, KC_LALT, KC_LGUI, LT(LOWER, KC_SPC), LT(RAISE, KC_ENT), LT(RAISE, KC_ENT), LT(LOWER, KC_SPC), KC_BSPC, KC_LCTL, KC_RSFT
       ),
   [LOWER] = LAYOUT(
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
index 13dc8bd476..5f5cc94535 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CLMK_DH] = LAYOUT_wrapper(
     CAPSWRD, __COLEMAK_MOD_DH_L1________________________,                                     __COLEMAK_MOD_DH_R1_W_QUOT_________________, KC_BSLS,
     HY_ESC,  __COLEMAK_MOD_DH_L2_W_GACS_________________,                                     __COLEMAK_MOD_DH_R2_W_SCAG_________________, KC_QUOT,
-    TD_LAYR, __COLEMAK_MOD_DH_L3________________________, KC_LSFT, KC_LEAD, KC_DEL,  KC_TAB,  __COLEMAK_MOD_DH_R3________________________, KC_SFTENT,
+    TD_LAYR, __COLEMAK_MOD_DH_L3________________________, KC_LSFT, QK_LEAD, KC_DEL,  KC_TAB,  __COLEMAK_MOD_DH_R3________________________, KC_SFTENT,
                                KC_MUTE, KC_DEL,  HY_ESC,  LOW_BSP, RAI_ENT, KC_BSPC, NAV_SPC, HY_ESC,  RAI_TAB, KC_RALT
 ),
 [_QWERTY] = LAYOUT_wrapper(
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
index 39ef640e39..1a351803a2 100644
--- a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DEFAULT] = LAYOUT(
       KC_ESC,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
       KC_TAB,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-      KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,    KC_LEAD,  L_RAISE, L_LOWER, KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+      KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,    QK_LEAD,  L_RAISE, L_LOWER, KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
                                KC_MPLY,KC_LGUI,KC_LCTL, KC_SPACE, KC_LALT, KC_RCTL,  KC_ENT, L_NAV,   KC_RALT, KC_SCRL
     ),
 
@@ -193,7 +193,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     CLO_USED:
                     CLO_ACTIVE|CLO_PRESSED;
                 return false;
-            case KC_LEAD:
+            case QK_LEADER:
                 close_tap_it = CLO_DISABLED;
                 return true;
         }
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
index b5d561897f..420d9a89af 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
@@ -47,7 +47,7 @@ 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_PIPE,
       KC_LSFT, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-      KC_LCTL, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_CCCV,   XXXXXXX, KC_DEL, KC_LEAD,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
+      KC_LCTL, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_CCCV,   XXXXXXX, KC_DEL, QK_LEAD,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
               KC_LGUI, KC_LALT, MO(LOWER), MT(MOD_LSFT, KC_SPC), MT(MOD_LALT, KC_ENT), KC_BSPC, LT(NAV, KC_SPC), MO(RAISE), KC_TAB, KC_RALT
     ),
 /*
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
index 965b306bb7..9d3d6d1f66 100644
--- a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
   // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
   [L_EXTD] = LAYOUT_uqs(
-     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  QK_LEAD,
      _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
      _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
                          _______,  _______,
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
index 30e6e688e8..3f13ad497b 100644
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
@@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 0: Base Layer
   LAYOUT_all(
-      KC_LEAD, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_GRV,  KC_BSPC,    \
+      QK_LEAD, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_GRV,  KC_BSPC,    \
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,          KC_BSLS,   \
       KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_DOT,           KC_ENT,    \
       KC_LSPO, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO,   KC_RSPC, KC_RGUI,      \
diff --git a/layouts/community/ergodox/deadcyclo/keymap.c b/layouts/community/ergodox/deadcyclo/keymap.c
index ab0e4c4f92..6edf8b00f6 100644
--- a/layouts/community/ergodox/deadcyclo/keymap.c
+++ b/layouts/community/ergodox/deadcyclo/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	TG(MDIA),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             LT(SYMB, KC_BSLS),
 	KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,CTL_T(KC_QUOT),
 	MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,LT(MDIA, KC_DOT), LT(UNI2, KC_SLSH),   KC_RSFT,
-		KC_LALT,  KC_RALT,KC_LEAD,LCTL(LSFT(KC_U)),          LT(SYMB,KC_TILD),
+		KC_LALT,  KC_RALT,QK_LEAD,LCTL(LSFT(KC_U)),          LT(SYMB,KC_TILD),
              KC_PGUP,        KC_INS,
              KC_PGDN,
              KC_RBRC,KC_BSPC, KC_ENT
diff --git a/layouts/community/ergodox/issmirnov/README.md b/layouts/community/ergodox/issmirnov/README.md
index 564edfe31d..fc8de6f99f 100644
--- a/layouts/community/ergodox/issmirnov/README.md
+++ b/layouts/community/ergodox/issmirnov/README.md
@@ -5,7 +5,7 @@
 
 - Shift and Cmd are One Shot Modifiers, so tapping them once will apply them to the next key. When tapped twice they will lock, until tapped again to clear.
 - When switching to other layers, any stuck modifiers are cleared in order to avoid unintended key combos
-- There are a few leader key combinations. Right now, `KC_LEAD` + `s` will open my wiki homepage.
+- There are a few leader key combinations. Right now, `QK_LEAD` + `s` will open my wiki homepage.
 - All transparent keys have been replaced with noops to avoid layer bleeding.
 
 ## Initial Setup
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index 3593f75f0d..7e6f3ad73c 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -72,7 +72,7 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
                 return false;
             }
         } else {
-            if (keycode == KC_LEAD) {
+            if (keycode == QK_LEADER) {
                 qk_leader_start();
             }
         }
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 0f94e3855d..add7402550 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -225,7 +225,7 @@ bool process_record_quantum(keyrecord_t *record) {
     uint16_t keycode = get_record_keycode(record, true);
 
     // This is how you use actions here
-    // if (keycode == KC_LEAD) {
+    // if (keycode == QK_LEADER) {
     //   action_t action;
     //   action.code = ACTION_DEFAULT_LAYER_SET(0);
     //   process_action(record, action);
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 939fab9298..f9268c833d 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -465,7 +465,7 @@ enum quantum_keycodes {
     JS_BUTTON31, // 5D28
 
     // Leader Key
-    KC_LEAD, // 5D29
+    QK_LEADER, // 5D29
 
     // Bluetooth: output selection (continued)
     OUT_BT, // 5D2A
@@ -846,6 +846,9 @@ enum quantum_keycodes {
 #define UC_M_WC UNICODE_MODE_WINC
 #define UC_M_EM UNICODE_MODE_EMACS
 
+// Leader key
+#define QK_LEAD QK_LEADER
+
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
 #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 3a468d61f5..73c486492f 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -4,6 +4,8 @@
 
 // Deprecated Quantum keycodes
 
+#define KC_LEAD QK_LEADER
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")
diff --git a/users/alfrdmalr/alfrdmalr.h b/users/alfrdmalr/alfrdmalr.h
index 6d6e5dfcfc..1537afd208 100644
--- a/users/alfrdmalr/alfrdmalr.h
+++ b/users/alfrdmalr/alfrdmalr.h
@@ -73,7 +73,7 @@ enum alfrdmalr_keycodes {
 #define K1B_ALT    KC_DEL // for 5x12 boards, keep backspace as the top-left key and add delete key
 #define K2B        KC_QUOT
 #define K3B        KC_RSFT
-#define K4B        KC_LEAD
+#define K4B        QK_LEAD
 
 // LAYOUT WRAPPERS =====================================================================
 #if (!defined(LAYOUT) && defined(KEYMAP))
diff --git a/users/jjerrell/wrappers.h b/users/jjerrell/wrappers.h
index 0f10e98249..87aa8e250f 100644
--- a/users/jjerrell/wrappers.h
+++ b/users/jjerrell/wrappers.h
@@ -53,10 +53,10 @@
  */
 
 #   define ____________________________________________________________PLANCK_VERBOSE_BOTTOM_ROW_____________________________________________________________ \
-           KC_LEAD, KC_LSFT, KC_CCCV, KC_HYPR, LT(_LOWER, KC_BSPC), SFT_T(KC_SPC), XXXXXXX, LT(_RAISE, KC_ENT),  KC_MEH,    RGB_TOG,    RGB_IDL,    LED_LEVEL
+           QK_LEAD, KC_LSFT, KC_CCCV, KC_HYPR, LT(_LOWER, KC_BSPC), SFT_T(KC_SPC), XXXXXXX, LT(_RAISE, KC_ENT),  KC_MEH,    RGB_TOG,    RGB_IDL,    LED_LEVEL
 
 #   define _________________________________________PLANCK_LOWER_BOTTOM_ROW_________________________________________ \
-           KC_LEAD, KC_LSFT, KC_CCCV, KC_HYPR,  KC_BSPC,  KC_SPC, XXXXXXX,   KC_ENT, KC_0, KC_DOT, KC_COMM, LED_LEVEL
+           QK_LEAD, KC_LSFT, KC_CCCV, KC_HYPR,  KC_BSPC,  KC_SPC, XXXXXXX,   KC_ENT, KC_0, KC_DOT, KC_COMM, LED_LEVEL
 // TODO: It would be nice to find a way to apply the bottom row with optional left/right varargs. 
 //       I'm completely unsure if this language can support something like that though.
 
@@ -131,7 +131,7 @@
         XXXXXXX,     k21,     k22,     k23,     k24,     k25, XXXXXXX,   XXXXXXX, k81,     k82,     k83,     k84,     k85,     XXXXXXX,      \
         KC_LSFT,     k31,     k32,     k33,     k34,     k35,                     k91,     k92,     k93,     k94,     k95,     KC_RSFT,      \
    MO(_SPECIAL),     k41,     k42,     k43,     k44,        TO(_GAME),   XXXXXXX,          ka2,     ka3,     ka4,     ka5,     MO(_SPECIAL), \
-                           LT(_LOWER, KC_SPC),HYPR_T(KC_BSPC),KC_LEAD,   KC_CCCV,SFT_T(KC_TAB),LT(_RAISE, KC_ENT)                            )
+                           LT(_LOWER, KC_SPC),HYPR_T(KC_BSPC),QK_LEAD,   KC_CCCV,SFT_T(KC_TAB),LT(_RAISE, KC_ENT)                            )
 
 #   define WRAPPER_moonlander_mods( \
         k11, k12, k13, k14, k15,             k71, k72, k73, k74, k75, \
@@ -232,7 +232,7 @@
                                                                                                                                                      \
                                                       XXXXXXX,XXXXXXX,           XXXXXXX,XXXXXXX,                                                    \
                                                               XXXXXXX,           XXXXXXX,                                                            \
-                           LT(_LOWER, KC_SPC),HYPR_T(KC_BSPC),KC_LEAD,           KC_CCCV,SFT_T(KC_TAB),LT(_RAISE, KC_ENT)                            )
+                           LT(_LOWER, KC_SPC),HYPR_T(KC_BSPC),QK_LEAD,           KC_CCCV,SFT_T(KC_TAB),LT(_RAISE, KC_ENT)                            )
 
 /** Common Wrapper with Mod Tap/Hold overlay
      .---------------------------------------------. .---------------------------------------------.
diff --git a/users/uqs/uqs.h b/users/uqs/uqs.h
index f8b30caf79..b5026e5b59 100644
--- a/users/uqs/uqs.h
+++ b/users/uqs/uqs.h
@@ -52,7 +52,7 @@ enum custom_keycodes {
 };
 
 #ifndef LEADER_ENABLE
-#define KC_LEAD KC_NO
+#define QK_LEAD KC_NO
 #endif
 
 // Shorter names

From 7cbff9d921879ef3c54837cb2ffc455e019f45b4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 22 Oct 2022 01:46:10 +1100
Subject: [PATCH 695/959] Deprecate `KC_LOCK` for `QK_LOCK` (#18796)

---
 docs/feature_key_lock.md                                  | 6 +++---
 docs/keycodes.md                                          | 2 +-
 keyboards/0xc7/61key/keymaps/default/keymap.c             | 2 +-
 keyboards/0xc7/61key/keymaps/via/keymap.c                 | 2 +-
 keyboards/contra/keymaps/maxr1998/keymap.c                | 2 +-
 keyboards/crkbd/keymaps/edvorakjp/keymap.c                | 6 ------
 keyboards/dumbpad/v0x/keymaps/default/keymap.c            | 2 +-
 keyboards/dumbpad/v0x_right/keymaps/default/keymap.c      | 2 +-
 keyboards/dumbpad/v1x/keymaps/default/keymap.c            | 2 +-
 .../dumbpad/v1x_dualencoder/keymaps/default/keymap.c      | 2 +-
 keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c       | 2 +-
 keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c           | 2 +-
 keyboards/dumbpad/v1x_right/keymaps/default/keymap.c      | 2 +-
 keyboards/dz60/keymaps/split_space_arrows/keymap.c        | 2 +-
 keyboards/dz60/keymaps/split_space_arrows/rules.mk        | 2 +-
 keyboards/dz60/keymaps/twschum_b_4_10/keymap.c            | 2 +-
 keyboards/dz60/keymaps/twschum_b_4_10/rules.mk            | 2 +-
 keyboards/edi/hardlight/mk1/keymaps/default/keymap.c      | 2 +-
 keyboards/edi/hardlight/mk2/keymaps/default/keymap.c      | 2 +-
 keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c         | 2 +-
 keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk       | 2 +-
 keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk     | 2 +-
 keyboards/gh60/revc/keymaps/bluezio/keymap.c              | 2 +-
 keyboards/gh60/revc/keymaps/maxr1998/keymap.c             | 2 +-
 .../dactyl_manuform/5x6_5/keymaps/333fred/keymap.c        | 2 +-
 keyboards/handwired/snatchpad/keymaps/default/keymap.c    | 2 +-
 keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h     | 5 -----
 keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c       | 2 +-
 keyboards/keebio/iris/keymaps/edvorakjp/keymap.c          | 6 ------
 keyboards/keebio/iris/keymaps/nstickney/keymap.c          | 2 +-
 .../keyboardio/atreus/keymaps/replicaJunction/keymap.c    | 2 +-
 keyboards/kprepublic/bm43hsrgb/rules.mk                   | 2 +-
 keyboards/kprepublic/jj40/keymaps/fun40/keymap.c          | 2 +-
 keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c      | 2 +-
 keyboards/maxr1998/phoebe/keymaps/default/keymap.c        | 2 +-
 keyboards/moonlander/keymaps/jjerrell/keymap.c            | 4 ++--
 keyboards/mschwingen/modelm/keymaps/default/keymap.c      | 2 +-
 keyboards/neokeys/g67/element_hs/rules.mk                 | 2 +-
 keyboards/neokeys/g67/hotswap/rules.mk                    | 2 +-
 keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c    | 4 ++--
 keyboards/planck/keymaps/gunp/keymap.c                    | 2 +-
 keyboards/planck/keymaps/vifon/keymap.c                   | 2 +-
 keyboards/playkbtw/helen80/rules.mk                       | 2 +-
 keyboards/preonic/keymaps/kjwon15/keymap.c                | 2 +-
 keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c         | 4 ++--
 keyboards/winry/winry25tc/rules.mk                        | 2 +-
 keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c            | 2 +-
 keyboards/ymdk/ymd40/v2/rules.mk                          | 2 +-
 keyboards/ymdk/ymd75/rev3/rules.mk                        | 2 +-
 keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c      | 2 +-
 layouts/community/ergodox/333fred/keymap.c                | 4 ++--
 layouts/community/ergodox/replicaJunction/keymap.c        | 4 ++--
 layouts/community/ortho_5x12/333fred/keymap.c             | 4 ++--
 quantum/process_keycode/process_key_lock.c                | 8 ++++----
 quantum/quantum_keycodes.h                                | 2 +-
 quantum/quantum_keycodes_legacy.h                         | 2 +-
 users/ericgebhart/rules.mk                                | 2 +-
 users/nstickney/readme.md                                 | 2 +-
 58 files changed, 66 insertions(+), 83 deletions(-)

diff --git a/docs/feature_key_lock.md b/docs/feature_key_lock.md
index 7681394229..d5ad1708c7 100644
--- a/docs/feature_key_lock.md
+++ b/docs/feature_key_lock.md
@@ -2,17 +2,17 @@
 
 Sometimes you may find yourself needing to hold down a specific key for a long period of time. Key Lock holds down the next key you press for you. Press it again, and it will be released.
 
-Let's say you need to type in ALL CAPS for a few sentences. Hit `KC_LOCK`, and then Shift. Now, Shift will be considered held until you tap it again. You can think of Key Lock as Caps Lock, but supercharged.
+Let's say you need to type in ALL CAPS for a few sentences. Hit `QK_LOCK`, and then Shift. Now, Shift will be considered held until you tap it again. You can think of Key Lock as Caps Lock, but supercharged.
 
 ## Usage
 
-First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Then pick a key in your keymap and assign it the keycode `KC_LOCK`.
+First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Then pick a key in your keymap and assign it the keycode `QK_LOCK`.
 
 ## Keycodes
 
 |Keycode  |Description                                                   |
 |---------|--------------------------------------------------------------|
-|`KC_LOCK`|Hold down the next key pressed, until the key is pressed again|
+|`QK_LOCK`|Hold down the next key pressed, until the key is pressed again|
 
 ## Caveats
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index b0409327c8..5565e0c22c 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -305,7 +305,7 @@ See also: [Key Lock](feature_key_lock.md)
 
 |Key      |Description                                                   |
 |---------|--------------------------------------------------------------|
-|`KC_LOCK`|Hold down the next key pressed, until the key is pressed again|
+|`QK_LOCK`|Hold down the next key pressed, until the key is pressed again|
 
 ## Layer Switching :id=layer-switching
 
diff --git a/keyboards/0xc7/61key/keymaps/default/keymap.c b/keyboards/0xc7/61key/keymaps/default/keymap.c
index eb0579d8f8..06e39c1baa 100644
--- a/keyboards/0xc7/61key/keymaps/default/keymap.c
+++ b/keyboards/0xc7/61key/keymaps/default/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
+        KC_TRNS, KC_TRNS, QK_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
     )
 };
\ No newline at end of file
diff --git a/keyboards/0xc7/61key/keymaps/via/keymap.c b/keyboards/0xc7/61key/keymaps/via/keymap.c
index 404a8baffb..cc8e40c196 100644
--- a/keyboards/0xc7/61key/keymaps/via/keymap.c
+++ b/keyboards/0xc7/61key/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
+        KC_TRNS, KC_TRNS, QK_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
     ),
     [2] = LAYOUT_60_ansi(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c
index 25e2e01933..b169ce3238 100644
--- a/keyboards/contra/keymaps/maxr1998/keymap.c
+++ b/keyboards/contra/keymaps/maxr1998/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = {
   {_______, _______, _______, _______, _______, _______, _______, DE_UDIA, _______, DE_ODIA, _______, KC_DEL },
-  {KC_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______},
+  {QK_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______},
   {_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______},
   {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END }
 },
diff --git a/keyboards/crkbd/keymaps/edvorakjp/keymap.c b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
index f3b801da68..66c39783fd 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/keymap.c
+++ b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
@@ -5,12 +5,6 @@
 
 #include "edvorakjp.h"
 
-/*
- * enum custom_keycodes {
- *   KC_LOCK = NEW_SAFE_RANGE,
- * };
- */
-
 #define LAYOUT_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
 
 // clang-format off
diff --git a/keyboards/dumbpad/v0x/keymaps/default/keymap.c b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
index c0627e7490..9787c24f0f 100644
--- a/keyboards/dumbpad/v0x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     _______,     _______,     _______,      QK_BOOT,
                     _______,     _______,     _______,      KC_KP_PLUS,
                     _______,     _______,     _______,      KC_KP_MINUS,
-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
     ),
 };
 
diff --git a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
index bc762bc0f2..a0f4e3a669 100644
--- a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,     _______,     _______,      QK_BOOT,
         _______,     _______,     _______,      KC_KP_PLUS,
         _______,     _______,     _______,      KC_KP_MINUS,
-        _______,     _______,     _______,      KC_EQL,         KC_LOCK
+        _______,     _______,     _______,      KC_EQL,         QK_LOCK
   ),
 };
 
diff --git a/keyboards/dumbpad/v1x/keymaps/default/keymap.c b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
index c0627e7490..9787c24f0f 100644
--- a/keyboards/dumbpad/v1x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     _______,     _______,     _______,      QK_BOOT,
                     _______,     _______,     _______,      KC_KP_PLUS,
                     _______,     _______,     _______,      KC_KP_MINUS,
-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
     ),
 };
 
diff --git a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
index b21ac95849..805815253a 100644
--- a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     _______,     _______,     _______,      QK_BOOT,
                     _______,     _______,     _______,      KC_KP_PLUS,
                     _______,     _______,     _______,      KC_KP_MINUS,
-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
     ),
 };
 
diff --git a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
index 84d23f665a..94f5b55b8d 100644
--- a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     _______,     _______,     _______,      QK_BOOT,
                     _______,     _______,     _______,      KC_KP_PLUS,
                     _______,     _______,     _______,      KC_KP_MINUS,
-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
     ),
 
     [2] = LAYOUT(
diff --git a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
index 00f4500469..a1db187d2b 100644
--- a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
+++ b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     _______,     _______,     _______,      QK_BOOT,
                     _______,     _______,     _______,      KC_KP_PLUS,
                     _______,     _______,     _______,      KC_KP_MINUS,
-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
     ),
 
     [2] = LAYOUT(
diff --git a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
index bc762bc0f2..a0f4e3a669 100644
--- a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,     _______,     _______,      QK_BOOT,
         _______,     _______,     _______,      KC_KP_PLUS,
         _______,     _______,     _______,      KC_KP_MINUS,
-        _______,     _______,     _______,      KC_EQL,         KC_LOCK
+        _______,     _______,     _______,      KC_EQL,         QK_LOCK
   ),
 };
 
diff --git a/keyboards/dz60/keymaps/split_space_arrows/keymap.c b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
index f256d25c14..0ac20ea480 100644
--- a/keyboards/dz60/keymaps/split_space_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,         KC_F3,               KC_F4,           KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12, KC_DEL,
         KC_TAB,  KC_NO,   KC_HOME,       KC_UP,               KC_END,          KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,   KC_NO,   KC_NO,   KC_NO,  KC_NO,
         KC_CAPS, KC_NO,   KC_LEFT,       KC_DOWN,             KC_RIGHT,        KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_NO,   KC_NO,   KC_ENT,
-        KC_LSFT, KC_MPRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_LOCK, KC_PGUP, KC_INS,
+        KC_LSFT, KC_MPRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,    QK_LOCK, KC_PGUP, KC_INS,
         KC_MEH,  KC_LALT, KC_LGUI,       KC_MEDIA_PLAY_PAUSE, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN,  KC_END
     ),
 
diff --git a/keyboards/dz60/keymaps/split_space_arrows/rules.mk b/keyboards/dz60/keymaps/split_space_arrows/rules.mk
index 81c7b3f263..e30193dab9 100644
--- a/keyboards/dz60/keymaps/split_space_arrows/rules.mk
+++ b/keyboards/dz60/keymaps/split_space_arrows/rules.mk
@@ -4,4 +4,4 @@ BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-KEY_LOCK_ENABLE = yes       # Enables use of KC_LOCK
+KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
index ecbfd8ed84..a2cba4fe67 100644
--- a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
+++ b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // |--------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------------||
     //
     // |------2.25--------|---Z----|---X----|---C----|---V----|---B----|---N----|---M----|---,----|---.----||----1.75------|--------|--------||
-          KC_LSFT,         KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     KC_LOCK,     KC_PGUP,  KC_INS,
+          KC_LSFT,         KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     QK_LOCK,     KC_PGUP,  KC_INS,
     // |------------------|--------|--------|--------|--------|--------|--------|--------|--------|--------||--------------|--------|--------||
     //
     // |---1.25---|---1.25---||---1.25---||--------2.75----------||---1.25---|------2.25--------||--------|--------|--------|--------|--------|
diff --git a/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk b/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk
index b3e56546ac..932a64748d 100644
--- a/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk
+++ b/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk
@@ -9,7 +9,7 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-KEY_LOCK_ENABLE = yes       # Enables use of KC_LOCK
+KEY_LOCK_ENABLE = yes
 
 # Enables including users/twschum/twschum.h
 USER_NAME := twschum
diff --git a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
index 57cee64884..4ebe59d947 100644
--- a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
+++ b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
@@ -48,7 +48,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_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_PAUS, KC_KP_4, KC_KP_5,   KC_KP_6,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,  KC_KP_1, KC_KP_2,   KC_KP_3,
-  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
+  KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
   ),
 
 /* RAISE
diff --git a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
index d52275fec2..88beb9be46 100644
--- a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
+++ b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
@@ -48,7 +48,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_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_PAUS, KC_KP_4, KC_KP_5,   KC_KP_6,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,  KC_KP_1, KC_KP_2,   KC_KP_3,
-  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
+  KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
   ),
 
 /* RAISE
diff --git a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
index 84760dd219..bae4fce2c4 100644
--- a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
+++ b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
@@ -48,7 +48,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_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_KP_4, KC_KP_5,   KC_KP_6,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_PAUS, KC_KP_1, KC_KP_2,   KC_KP_3,
-  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
+  KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
   ),
 
 /* RAISE
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk b/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
index 9c24dadd78..785b3df8be 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
@@ -3,7 +3,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control
 COMMAND_ENABLE   = yes # Commands for debug and configuration
 NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
-KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key
+KEY_LOCK_ENABLE  = yes
 TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
 CONSOLE_ENABLE   = yes  # Console for debug
 
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
index a7f524fa43..75832dcf8e 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
@@ -3,7 +3,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control
 COMMAND_ENABLE   = yes # Commands for debug and configuration
 NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard
-KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key
+KEY_LOCK_ENABLE  = yes
 TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
 CONSOLE_ENABLE   = yes  # Console for debug
 
diff --git a/keyboards/gh60/revc/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
index cabe0b28fd..facb0a49d3 100644
--- a/keyboards/gh60/revc/keymaps/bluezio/keymap.c
+++ b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,           KC_1,    KC_2,    KC_3,  KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_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_LOCK, KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
+        KC_LSFT, QK_LOCK, KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
         KC_HYPR, KC_LGUI, KC_LALT, LT(1, KC_SPC),                                           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
 
     /* 1: spacefn with WASD arrows/navigation block and extra space key for
diff --git a/keyboards/gh60/revc/keymaps/maxr1998/keymap.c b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
index 4a1ad54b41..3abadf0404 100644
--- a/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
+++ b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT(
     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,\
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NO,  \
-    KC_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT, \
+    QK_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT, \
     KC_LSFT, KC_BSLS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,\
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_NO,   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
   /* 1: fn */
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
index c341bdf0b6..139cd1f510 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_T,   KC_TAB,  KC_Q,    KC_W,  KC_E,    KC_R,                                          KC_Y,    KC_U,     KC_I,         KC_O,   KC_P,    KC_BSLS,
      KC_G,   KC_LCTL, KC_A,    KC_S,  KC_D,    KC_F,                                          KC_H,    KC_J,     KC_K,         KC_L,   KC_SCLN, KC_QUOT,
      KC_B,   KC_LSFT, KC_Z,    KC_X,  KC_C,    KC_V,                                          KC_N,    KC_M,     KC_COMM,      KC_DOT, KC_SLSH, KC_RSFT,
-                      KC_LOCK,        KC_LALT, KC_SPC, KC_ENT,  KC_GRV,    TG(GAME), _______, _______, _______,                KC_EQL,
+                      QK_LOCK,        KC_LALT, KC_SPC, KC_ENT,  KC_GRV,    TG(GAME), _______, _______, _______,                KC_EQL,
                                                        KC_BSPC, KC_F5,     KC_F6,    _______
   ),
 };
diff --git a/keyboards/handwired/snatchpad/keymaps/default/keymap.c b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
index a473d4778b..db8305129d 100644
--- a/keyboards/handwired/snatchpad/keymaps/default/keymap.c
+++ b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MUTE,          KC_MPLY
   ),
   [1] = LAYOUT(
-    KC_LOCK, KC_UP  , _______,
+    QK_LOCK, KC_UP  , _______,
     KC_LEFT, KC_DOWN, KC_RGHT,
     KC_BTN1,          KC_BTN2
   ),
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
index aae83fc7a8..3ff95a3c6e 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
@@ -1,11 +1,6 @@
 #pragma once
 
 #include "edvorakjp.h"
-/*
- * enum custom_keycodes {
- *   KC_LOCK = NEW_SAFE_RANGE,
- * };
- */
 
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 
diff --git a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
index 20f836cd12..6798e9e625 100644
--- a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FCTN] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ,
                     //-------------------------------//
-                    KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
+                    KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
                     //-------------------------------//
                     KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
                     //-------------------------------//
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
index 013d6c00a5..d0df36b5f9 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
@@ -1,12 +1,6 @@
 #include QMK_KEYBOARD_H
 #include "edvorakjp.h"
 
-/*
- * enum custom_keycodes {
- *   KC_LOCK = NEW_SAFE_RANGE,
- * };
- */
-
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 #define __KC_TRNS_x6__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 
diff --git a/keyboards/keebio/iris/keymaps/nstickney/keymap.c b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
index 2738ed2827..eca6ce7093 100644
--- a/keyboards/keebio/iris/keymaps/nstickney/keymap.c
+++ b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [FCTN] = LAYOUT(
         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ,
-        KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
+        KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
         KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
         _______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_F11, KC_F12, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
         _______, _______, _______, _______, _______, _______
diff --git a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
index 2d4685c53a..5607f8d0d9 100644
--- a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [L_GAMING] = LAYOUT(
     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
-    _______,_______,KC_C,   KC_D,   _______,_______,KC_LOCK,_______,_______,_______,_______,_______,
+    _______,_______,KC_C,   KC_D,   _______,_______,QK_LOCK,_______,_______,_______,_______,_______,
     _______,KC_TAB, KC_LALT,KC_LSFT,KC_SPC, KC_LCTL,KC_LALT,KC_BSPC,KC_BTN1,KC_BTN2,KC_BTN3,_______
 ),
 
diff --git a/keyboards/kprepublic/bm43hsrgb/rules.mk b/keyboards/kprepublic/bm43hsrgb/rules.mk
index 30dc2eaefe..296559b474 100755
--- a/keyboards/kprepublic/bm43hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm43hsrgb/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-KEY_LOCK_ENABLE = no        # Enable KC_LOCK support
+KEY_LOCK_ENABLE = no
diff --git a/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c b/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
index c15ba47ebb..86e13395ee 100644
--- a/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_RAISE] = LAYOUT_ortho_4x12( \
   KC_CAPS, KC_MINS, KC_PLUS, KC_EQL,  KC_LPRN, KC_RPRN, _______, KC_7,  KC_8,    KC_9, KC_BSPC, KC_DEL, \
-  KC_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______, \
+  QK_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______, \
   KC_INS, KC_GRV, KC_BSLS, KC_PIPE,  KC_LCBR, KC_RCBR, _______, KC_1,  KC_2,    KC_3, KC_DOT, _______, \
   KC_LCTL, _______, KC_LALT, _______, _______, _______, _______, _______, KC_0, _______, KC_HOME, KC_END \
 )
diff --git a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
index 0d8adbffbc..1d23e5afe0 100644
--- a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
   KC_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \
   QK_BOOT, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
-  _______, _______, _______, _______, KC_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
+  _______, _______, _______, _______, QK_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
 ),
 
 /* Raise
diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
index afd66347d5..506d3b6897 100644
--- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FN] = LAYOUT(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F10,  KC_F11,  KC_F12,
   _______, _______, _______, _______, _______, _______, _______, DE_UDIA, KC_F9,   DE_ODIA, _______, KC_DEL,
-  KC_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______,
+  QK_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______,
   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,      _______,     XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
 ),
diff --git a/keyboards/moonlander/keymaps/jjerrell/keymap.c b/keyboards/moonlander/keymaps/jjerrell/keymap.c
index 012b773678..ee6226177f 100644
--- a/keyboards/moonlander/keymaps/jjerrell/keymap.c
+++ b/keyboards/moonlander/keymaps/jjerrell/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  __________________QWERTY_L1__________________, KC_SLSH,
         KC_LALT, __________________QWERTY_L2__________________, KC_BSLS,
         KC_LSFT, __________________QWERTY_L3__________________,
-        KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4,   KC_LOCK,
+        KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4,   QK_LOCK,
                                     KC_SPC, KC_BTN2, MO(_LOWER)
     ),
     [_GAME_LOWER] = LAYOUT_moonlander_gamepad(
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  __________________QWERTY_L1__________________, KC_SLSH,
         KC_LALT, __________________QWERTY_L2__________________, KC_BSLS,
         KC_LSFT, __________________QWERTY_L3__________________,
-        KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8,   KC_LOCK,
+        KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8,   QK_LOCK,
                                     KC_SPC, KC_BTN2, MO(_LOWER)
     )
 };
diff --git a/keyboards/mschwingen/modelm/keymaps/default/keymap.c b/keyboards/mschwingen/modelm/keymaps/default/keymap.c
index 97b154fb53..8e28b4e449 100644
--- a/keyboards/mschwingen/modelm/keymaps/default/keymap.c
+++ b/keyboards/mschwingen/modelm/keymaps/default/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Space:  Media Play / Pause
     // m: enter mouse layer
     _______,          DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_LOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_LOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, TG(_MS), _______, _______, _______,          _______,          KC_VOLU,          _______, _______, _______, _______,
diff --git a/keyboards/neokeys/g67/element_hs/rules.mk b/keyboards/neokeys/g67/element_hs/rules.mk
index 574f0067fb..8670b7f874 100644
--- a/keyboards/neokeys/g67/element_hs/rules.mk
+++ b/keyboards/neokeys/g67/element_hs/rules.mk
@@ -17,6 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
+KEY_LOCK_ENABLE = yes
 
 LAYOUTS = 65_ansi_blocker
diff --git a/keyboards/neokeys/g67/hotswap/rules.mk b/keyboards/neokeys/g67/hotswap/rules.mk
index 574f0067fb..8670b7f874 100644
--- a/keyboards/neokeys/g67/hotswap/rules.mk
+++ b/keyboards/neokeys/g67/hotswap/rules.mk
@@ -17,6 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
+KEY_LOCK_ENABLE = yes
 
 LAYOUTS = 65_ansi_blocker
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
index 8fb5d0db26..399acccbd4 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       SIX_TRNS,                                              _______,     _______, SIX_TRNS,
       KC_LCTL,  FOUR_TRNS,                          _______, KC_F6,         _______, SIX_TRNS,
       KC_LSFT,  KC_Z,    FOUR_TRNS,                          KC_F5,         _______, SIX_TRNS,
-      KC_ENT,   _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),     _______, SIX_TRNS
+      KC_ENT,   _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),     _______, SIX_TRNS
   ),
 
   [GAME_ARROW] = LAYOUT_wrapper(
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  _______, KC_UP,   _______,  _______, _______, _______,     _______, SIX_TRNS,
       KC_LCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  _______, _______, KC_F6,       _______, SIX_TRNS,
       KC_LSFT,  KC_Z,    FOUR_TRNS,                           KC_F5,       _______, SIX_TRNS,
-      KC_ENT,   _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),    _______, SIX_TRNS
+      KC_ENT,   _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),    _______, SIX_TRNS
   )
 };
 
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index e745acf498..0731595767 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MC(KC_W), KC_DELETE,    KC_APP
 ),
 [LY_1101] = LAYOUT_gunp(
-  SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT,
+  SANDBOX,   XXXXXXX,    AU_TOG,       QK_LOCK,    RGB_TOG,       QK_BOOT,
   KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DB_TOGG,
   KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EE_CLR,
   KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
diff --git a/keyboards/planck/keymaps/vifon/keymap.c b/keyboards/planck/keymaps/vifon/keymap.c
index 6d6d11020d..6929197542 100644
--- a/keyboards/planck/keymaps/vifon/keymap.c
+++ b/keyboards/planck/keymaps/vifon/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
     [_DYN] = LAYOUT_planck_mit( /* special */
         KM_HOLD,  DYN_REC_START1, DYN_MACRO_PLAY1, _______, _______,    _______, _______, KC_APP,  KC_INS,  _______, KC_PSCR, KC_PAUS,
-        KC_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
+        QK_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
         KM_SHLK,  _______,        _______,         _______, _______,    _______, _______, _______, _______, _______, _______, _______,
         _______,  _______,        _______,         _______, KM_PP_GAME,      DF(_QW),     DF(_PP), _______, _______, _______, _______
         ),
diff --git a/keyboards/playkbtw/helen80/rules.mk b/keyboards/playkbtw/helen80/rules.mk
index d29ae3dafa..9b01a36202 100644
--- a/keyboards/playkbtw/helen80/rules.mk
+++ b/keyboards/playkbtw/helen80/rules.mk
@@ -18,6 +18,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
-KEY_LOCK_ENABLE = no      # Enable KC_LOCK support
+KEY_LOCK_ENABLE = no
 
 LAYOUTS = tkl_ansi
diff --git a/keyboards/preonic/keymaps/kjwon15/keymap.c b/keyboards/preonic/keymaps/kjwon15/keymap.c
index 45db32be92..99c29d5849 100644
--- a/keyboards/preonic/keymaps/kjwon15/keymap.c
+++ b/keyboards/preonic/keymaps/kjwon15/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  KC_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
+  QK_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
   _______, AU_ON,   AU_OFF,  KC_BTN2, KC_BTN1, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_ACL0, \
   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_ACL1, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL2  \
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
index 4cde20a7ef..3d1974b8ac 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
     KC_LCTL, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
     KC_LSFT, KC_Z,           _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI, \
-    KC_ENT,  TG(GAME_ARROW), KC_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
+    KC_ENT,  TG(GAME_ARROW), QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
 ),
 /* Gaming Arrow mode (Raise)
  * Turns wasd into arrows
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, KC_UP,   _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
     KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                    _______, _______, _______, _______, _______, _______, \
     KC_LSFT, KC_Z,    _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI, \
-    KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
+    KC_ENT,  _______, QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
 )
 };
 
diff --git a/keyboards/winry/winry25tc/rules.mk b/keyboards/winry/winry25tc/rules.mk
index b0352b513c..53a67bd4ae 100644
--- a/keyboards/winry/winry25tc/rules.mk
+++ b/keyboards/winry/winry25tc/rules.mk
@@ -16,4 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 
-KEY_LOCK_ENABLE = yes     # Enable KC_LOCK support
+KEY_LOCK_ENABLE = yes
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
index dcd1ac563f..241d07275e 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_K,    KC_DOT,  KC_O,    KC_COMM,  N_Y,    DM_REC2,  DM_PLY2, KC_V,   KC_G,    KC_C,    KC_L,    N_SS,   N_Z,     KC_TRNS,
     MO(_3),  KC_H,    KC_A,    KC_E,    KC_I,     KC_U,   N_UNDO,   DM_RSTP, KC_D,   KC_T,    KC_R,    KC_N,    KC_S,   KC_F,    MO(_3),
     KC_LSFT, KC_X,    KC_Q,    N_AE,    N_UE,     N_OE,   N_COPY,   N_CUT,   KC_B,   KC_P,    KC_W,    KC_M,    KC_J,   KC_RSFT, KC_RSFT,
-    KC_LCTL, MO(_4),  KC_TRNS, KC_LGUI, KC_LALT,  KC_SPC, N_PASTE,  KC_SPC,  KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, KC_TRNS,KC_LOCK, MO(_7)
+    KC_LCTL, MO(_4),  KC_TRNS, KC_LGUI, KC_LALT,  KC_SPC, N_PASTE,  KC_SPC,  KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, KC_TRNS,QK_LOCK, MO(_7)
   ),
 
 /* Layer 3
diff --git a/keyboards/ymdk/ymd40/v2/rules.mk b/keyboards/ymdk/ymd40/v2/rules.mk
index 7c64cc042f..3a34f2d80a 100644
--- a/keyboards/ymdk/ymd40/v2/rules.mk
+++ b/keyboards/ymdk/ymd40/v2/rules.mk
@@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-KEY_LOCK_ENABLE = no        # Enable KC_LOCK support
+KEY_LOCK_ENABLE = no
 
 AUDIO_SUPPORTED = no
 
diff --git a/keyboards/ymdk/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk
index 258c4d3ff6..14d8f08c35 100644
--- a/keyboards/ymdk/ymd75/rev3/rules.mk
+++ b/keyboards/ymdk/ymd75/rev3/rules.mk
@@ -16,4 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
+KEY_LOCK_ENABLE = yes
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
index e970c1b695..7c9b4f59e4 100644
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, BL_OFF,  BL_ON,   BL_DEC,   BL_INC,       _______,     _______, _______, _______, _______,  \
 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,  RGB_VAI,      KC_MUTE,     _______, KC_VOLU, _______, _______,  \
 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,  BL_TOGG,                   KC_MPRV, KC_MPLY, KC_MNXT, _______,  \
-		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, KC_LOCK,  \
+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, QK_LOCK,  \
 		_______,  _______, KC_RALT,                               _______,                           _______,      _______,    KC_HOME, KC_PGDN, KC_END,  _______, _______            \
 	)
 };
diff --git a/layouts/community/ergodox/333fred/keymap.c b/layouts/community/ergodox/333fred/keymap.c
index 5dee9a1e3f..01fcf8916c 100644
--- a/layouts/community/ergodox/333fred/keymap.c
+++ b/layouts/community/ergodox/333fred/keymap.c
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
         KC_LCTL, _______, _______, _______, _______, _______,                                              _______, _______, _______, _______, _______, _______,
         KC_LSFT, KC_Z,    _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
-        KC_ENT,  _______, _______, KC_LOCK, KC_BSPC,                                                                _______, _______, _______, _______, _______,
+        KC_ENT,  _______, _______, QK_LOCK, KC_BSPC,                                                                _______, _______, _______, _______, _______,
                                                               KC_F5,   KC_F6,         LCTL(KC_C), LCTL(KC_V),
                                                                        _______,       KC_UP,
                                                      KC_LALT, KC_SPC,  OSM(SYMB),     KC_DOWN,    _______, _______
@@ -254,7 +254,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, KC_UP,   _______,  _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
         KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,                                              _______, _______, _______, _______, _______, _______,
         KC_LSFT, KC_Z,    _______, _______,  _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
-        KC_ENT,  _______, _______, KC_LOCK,  KC_BSPC,                                                                _______, _______, _______, _______, _______,
+        KC_ENT,  _______, _______, QK_LOCK,  KC_BSPC,                                                                _______, _______, _______, _______, _______,
                                                                KC_F5,   KC_F6,         LCTL(KC_C), LCTL(KC_V),
                                                                         _______,       KC_UP,
                                                       KC_LALT, KC_SPC,  OSM(SYMB),     KC_DOWN,    _______, _______
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index f5c7f32688..4e0559a3e2 100644
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG_GAME, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
     CAPWORD, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
              KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-    KC_LOCK, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    QK_LOCK, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
                       TAB_SFT, MO_FN,   KC_RALT, KC_RGUI, MO_SLED,
     KC_LEFT, KC_RGHT,
     KC_UP,
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC, KC_A,   KC_R,   KC_S,   KC_T,   _______,
     KC_LSFT,_______,_______,KC_C,   KC_D,   _______,_______,
     _______,_______,KC_TAB, KC_LALT,KC_LCTL,
-                                            KC_LOCK,_______,
+                                            QK_LOCK,_______,
                                                     _______,
                                     KC_SPC, KC_LSFT,_______,
 
diff --git a/layouts/community/ortho_5x12/333fred/keymap.c b/layouts/community/ortho_5x12/333fred/keymap.c
index 4eaf35c47e..15deea50d3 100644
--- a/layouts/community/ortho_5x12/333fred/keymap.c
+++ b/layouts/community/ortho_5x12/333fred/keymap.c
@@ -49,7 +49,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_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, \
     OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X,  KC_C,    KC_V,    KC_B,           KC_N,    KC_M,    KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \
-    KC_LCTL,       KC_LALT,      KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC,  KC_ENT,  KC_LOCK, KC_EQL, KC_RALT,         KC_DEL \
+    KC_LCTL,       KC_LALT,      KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC,  KC_ENT,  QK_LOCK, KC_EQL, KC_RALT,         KC_DEL \
 ),
 
 /* Symbols
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______,    \
     KC_LCTL, _______, _______, _______, KC_F,    _______, _______,   _______, _______, _______, _______, _______,    \
     KC_LSFT, KC_Z,    _______, _______, _______, _______, _______,   _______, _______, _______, _______, KC_LGUI,    \
-    KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
+    KC_ENT,  _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
 )
 };
 
diff --git a/quantum/process_keycode/process_key_lock.c b/quantum/process_keycode/process_key_lock.c
index 941a2c5780..2542e32ec2 100644
--- a/quantum/process_keycode/process_key_lock.c
+++ b/quantum/process_keycode/process_key_lock.c
@@ -70,7 +70,7 @@ bool process_key_lock(uint16_t *keycode, keyrecord_t *record) {
     //    reset the state in our map and return false. When the user releases the
     //    key, the up event will no longer be masked and the OS will observe the
     //    released key.
-    // 3. KC_LOCK was just pressed. In this case, we set up the state machine
+    // 3. QK_LOCK was just pressed. In this case, we set up the state machine
     //    to watch for the next key down event, and finish processing
     // 4. The keycode is below 0xFF, and we are watching for new keys. In this case,
     //    we will send the key down event to the os, and set the key_state for that
@@ -95,20 +95,20 @@ bool process_key_lock(uint16_t *keycode, keyrecord_t *record) {
 
     if (record->event.pressed) {
         // Non-standard keycode, reset and return
-        if (!(IS_STANDARD_KEYCODE(translated_keycode) || translated_keycode == KC_LOCK)) {
+        if (!(IS_STANDARD_KEYCODE(translated_keycode) || translated_keycode == QK_LOCK)) {
             watching = false;
             return true;
         }
 
         // If we're already watching, turn off the watch.
-        if (translated_keycode == KC_LOCK) {
+        if (translated_keycode == QK_LOCK) {
             watching = !watching;
             return false;
         }
 
         if (IS_STANDARD_KEYCODE(translated_keycode)) {
             // We check watching first. This is so that in the following scenario, we continue to
-            // hold the key: KC_LOCK, KC_F, KC_LOCK, KC_F
+            // hold the key: QK_LOCK, KC_F, QK_LOCK, KC_F
             // If we checked in reverse order, we'd end up holding the key pressed after the second
             // KC_F press is registered, when the user likely meant to hold F
             if (watching) {
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index f9268c833d..57dbfa0509 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -471,7 +471,7 @@ enum quantum_keycodes {
     OUT_BT, // 5D2A
 
     // Lock Key
-    KC_LOCK, // 5D2B
+    QK_LOCK, // 5D2B
 
     // Unused slots
     UNUSED_000, // 5D2C
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 73c486492f..6a847f71a6 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -3,8 +3,8 @@
 // clang-format off
 
 // Deprecated Quantum keycodes
-
 #define KC_LEAD QK_LEADER
+#define KC_LOCK QK_LOCK
 
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
diff --git a/users/ericgebhart/rules.mk b/users/ericgebhart/rules.mk
index 8afaeb7808..a5d5e2c1ca 100755
--- a/users/ericgebhart/rules.mk
+++ b/users/ericgebhart/rules.mk
@@ -18,7 +18,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control
 COMMAND_ENABLE   = no # Commands for debug and configuration
 NKRO_ENABLE      = no # Enable N-Key Rollover
 SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
-KEY_LOCK_ENABLE  = no # Enable the KC_LOCK key
+KEY_LOCK_ENABLE  = no
 TAP_DANCE_ENABLE = no # Enable the tap dance feature.
 CONSOLE_ENABLE   = no  # Console for debug
 
diff --git a/users/nstickney/readme.md b/users/nstickney/readme.md
index b62264d687..fbd86bc607 100644
--- a/users/nstickney/readme.md
+++ b/users/nstickney/readme.md
@@ -38,7 +38,7 @@ Note that my Iris keyboard has an Elite-C on the left half and a ProMicro on the
 	* `PRINT SCREEN`, `PAUSE`, `SYSREQ`, `INSERT`, and `CLEAR` also mapped, as intelligently as possible.
 	* `Q` toggles the RGB underglow (which changes color to indicate active layer).
 	* `A` increases RGB underglow brightness (with `SHIFT`, decreases brightness).
-	* `Y` is mapped to [`KC_LOCK`](https://beta.docs.qmk.fm/using-qmk/software-features/feature_key_lock).
+	* `Y` is mapped to [`QK_LOCK`](https://beta.docs.qmk.fm/using-qmk/software-features/feature_key_lock).
 
 ## Contribute
 

From 4f3af0920903b2253ea80fce9de55ed669ba2e8d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 22 Oct 2022 07:43:55 +1100
Subject: [PATCH 696/959] Remove legacy fauxclicky and unicode keycodes
 (#18800)

---
 keyboards/atreus62/keymaps/d4mation/keymap.c               | 2 +-
 keyboards/planck/keymaps/buhearns/keymap.c                 | 2 +-
 keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c | 2 +-
 keyboards/ymdk/melody96/keymaps/zunger/keymap.c            | 2 +-
 layouts/community/60_iso/bifbofii/keymap.c                 | 2 +-
 layouts/community/ortho_4x12/bifbofii/keymap.c             | 2 +-
 quantum/quantum_keycodes.h                                 | 6 ------
 7 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c
index becf036233..1448f0a9d1 100644
--- a/keyboards/atreus62/keymaps/d4mation/keymap.c
+++ b/keyboards/atreus62/keymaps/d4mation/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT(
     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, UC_M_WI, UC_M_OS, XXXXXXX,                   XXXXXXX, DF(_DVR),DF(_QWR),XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, UC_M_WI, UC_M_MA, XXXXXXX,                   XXXXXXX, DF(_DVR),DF(_QWR),XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, CG_SWAP, CG_NORM, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
   ),
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
index 0ffe391a7d..46029127e7 100644
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ b/keyboards/planck/keymaps/buhearns/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   UC(0xB0), UC(0xB9), UC(0xB2), UC(0xB3), UC(0xDF),   UC(0x20AC), KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
   KC_TRNS,  UC(0xC4), UC(0xD6), UC(0xDC), UC(0xBB),   UC(0xAB),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
   KC_TRNS,  UC(0xE4), UC(0xF6), UC(0xFC), UC(0x2022), KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, UC_M_OS, UC_M_LN, UC_M_WI, UC_M_WC
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, UC_M_MA, UC_M_LN, UC_M_WI, UC_M_WC
 )};
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
index 04ba28912d..17550a2168 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
@@ -1192,7 +1192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //                ,                  ,                  ,                  , -*-              ,                 <|,>              ,         ,                  ,                    ,         ,               ,
         CTO_BASE  , COUNT_TOG        , COUNT_NULL       , COUNT_WORDMIN    , COUNT_REPORT     , SPEED_TOG         , SPEED_REPORT  , KC_MPLY , KC_MNXT          , KC_MPRV            , KC_MSTP , KC_RSFT       ,
         KC_CAPS   , C_KC_PWR         , C_KC_WAKE        , C_KC_SLEP        , C_KC_PAUS        , KC_SCRL           , KC_PSCR       , XXXXXXX , KC_VOLU          , KC_VOLD            , KC_MUTE , KC_INS        ,
-        XP_DRA_CG , UNICODE_MODE_LNX , UNICODE_MODE_BSD , UNICODE_MODE_OSX , UNICODE_MODE_WIN , UNICODE_MODE_WINC , XXXXXXX       , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP        ,
+        XP_DRA_CG , UNICODE_MODE_LNX , UNICODE_MODE_BSD , UNICODE_MODE_MAC , UNICODE_MODE_WIN , UNICODE_MODE_WINC , XXXXXXX       , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP        ,
 //      -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         LEDS_ON  
 #     ifdef TRANSMINIVAN_LEFTSIDE
diff --git a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
index 1f228ef204..98be4f22c7 100644
--- a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
@@ -239,7 +239,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT,
     KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______, KC_CAGU, _______, _______, _______, KC_CDIA, KC_CCIR, _______, _______, _______, _______,          _______, _______, _______, _______,
-    _______, _______, _______, UC_M_OS, UC_M_LN, UC_M_WI, UC_M_BS, UC_M_WC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+    _______, _______, _______, UC_M_MA, UC_M_LN, UC_M_WI, UC_M_BS, UC_M_WC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
     _______,          _______, _______, KC_CCED, _______, _______, KC_CTIL, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
diff --git a/layouts/community/60_iso/bifbofii/keymap.c b/layouts/community/60_iso/bifbofii/keymap.c
index 84c7512e53..7365f98e97 100755
--- a/layouts/community/60_iso/bifbofii/keymap.c
+++ b/layouts/community/60_iso/bifbofii/keymap.c
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [SPECIALS] = LAYOUT_60_iso(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, XXXXXXX,
-        XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, UC_M_OS, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, UC_M_MA, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(GAMING), XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX,                               XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS
diff --git a/layouts/community/ortho_4x12/bifbofii/keymap.c b/layouts/community/ortho_4x12/bifbofii/keymap.c
index 2042fd0fac..d754741899 100644
--- a/layouts/community/ortho_4x12/bifbofii/keymap.c
+++ b/layouts/community/ortho_4x12/bifbofii/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
  */
 [SPECIALS] = LAYOUT_ortho_4x12(
-    XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_OS, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_MA, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 57dbfa0509..caf4d2b395 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -680,10 +680,6 @@ enum quantum_keycodes {
 #define CK_DOWN CLICKY_DOWN
 #define CK_ON CLICKY_ENABLE
 #define CK_OFF CLICKY_DISABLE
-// Fauxclicky (deprecated) redirects to Audio Clicky
-#define FC_ON CLICKY_ENABLE
-#define FC_OFF CLICKY_DISABLE
-#define FC_TOGG CLICKY_TOGGLE
 
 // RGB aliases
 #define RGB_MOD RGB_MODE_FORWARD
@@ -838,8 +834,6 @@ enum quantum_keycodes {
 #define UC_RMOD UNICODE_MODE_REVERSE
 
 #define UC_M_MA UNICODE_MODE_MAC
-#define UNICODE_MODE_OSX UNICODE_MODE_MAC // Deprecated alias
-#define UC_M_OS UNICODE_MODE_MAC          // Deprecated alias
 #define UC_M_LN UNICODE_MODE_LNX
 #define UC_M_WI UNICODE_MODE_WIN
 #define UC_M_BS UNICODE_MODE_BSD

From 428114fac25dedadfff9fceaf98f3ecd196a469d Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 22 Oct 2022 18:03:33 +0100
Subject: [PATCH 697/959] Remove broken userspace and keymaps (#18806)

---
 .../splitkb/kyria/keymaps/bbaserdem/config.h  |  32 -
 .../splitkb/kyria/keymaps/bbaserdem/keymap.c  | 109 ---
 .../splitkb/kyria/keymaps/bbaserdem/readme.md |  32 -
 .../splitkb/kyria/keymaps/bbaserdem/rules.mk  |  30 -
 .../community/ortho_3x10/bbaserdem/config.h   |  21 -
 .../community/ortho_3x10/bbaserdem/keymap.c   |  98 ---
 .../community/ortho_3x10/bbaserdem/readme.md  |  19 -
 .../community/ortho_3x10/bbaserdem/rules.mk   |  23 -
 .../community/ortho_4x12/bbaserdem/config.h   |  26 -
 .../community/ortho_4x12/bbaserdem/keymap.c   |  88 --
 .../community/ortho_4x12/bbaserdem/readme.md  |  12 -
 .../community/ortho_4x12/bbaserdem/rules.mk   |  26 -
 .../community/split_3x5_3/bbaserdem/config.h  |  35 -
 .../community/split_3x5_3/bbaserdem/keymap.c  | 117 ---
 .../community/split_3x5_3/bbaserdem/readme.md |  18 -
 .../community/split_3x5_3/bbaserdem/rules.mk  |  22 -
 .../community/split_3x6_3/bbaserdem/chconf.h  |  23 -
 .../community/split_3x6_3/bbaserdem/config.h  |  77 --
 .../community/split_3x6_3/bbaserdem/halconf.h |  24 -
 .../community/split_3x6_3/bbaserdem/keymap.c  | 191 -----
 .../community/split_3x6_3/bbaserdem/mcuconf.h |  25 -
 .../community/split_3x6_3/bbaserdem/readme.md |  15 -
 .../community/split_3x6_3/bbaserdem/rules.mk  |  47 --
 .../community/split_3x6_3/bbaserdem/ssd1306.c |  16 -
 users/bbaserdem/.gitignore                    |   2 -
 users/bbaserdem/bb-audio.c                    |  82 --
 users/bbaserdem/bb-audio.h                    |  28 -
 users/bbaserdem/bb-backlight.c                |  30 -
 users/bbaserdem/bb-backlight.h                |  23 -
 users/bbaserdem/bb-encoder.c                  | 514 -----------
 users/bbaserdem/bb-encoder.h                  |  29 -
 users/bbaserdem/bb-macro.c                    | 156 ----
 users/bbaserdem/bb-macro.h                    | 113 ---
 users/bbaserdem/bb-oled-extra.c               | 796 ------------------
 users/bbaserdem/bb-oled-extra.h               |  25 -
 users/bbaserdem/bb-oled.c                     | 216 -----
 users/bbaserdem/bb-oled.h                     |  32 -
 users/bbaserdem/bb-rgb.c                      | 123 ---
 users/bbaserdem/bb-rgb.h                      |  28 -
 users/bbaserdem/bb-underglow.c                | 116 ---
 users/bbaserdem/bb-underglow.h                |  28 -
 users/bbaserdem/bbaserdem.c                   | 376 ---------
 users/bbaserdem/bbaserdem.h                   | 573 -------------
 users/bbaserdem/config.h                      | 134 ---
 users/bbaserdem/keymap-bitmaps/.gitignore     |   4 -
 users/bbaserdem/keymap-bitmaps/cropBmp        |  38 -
 users/bbaserdem/readme.md                     | 131 ---
 users/bbaserdem/rules.mk                      |  87 --
 48 files changed, 4810 deletions(-)
 delete mode 100644 keyboards/splitkb/kyria/keymaps/bbaserdem/config.h
 delete mode 100644 keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c
 delete mode 100644 keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
 delete mode 100644 keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk
 delete mode 100644 layouts/community/ortho_3x10/bbaserdem/config.h
 delete mode 100644 layouts/community/ortho_3x10/bbaserdem/keymap.c
 delete mode 100644 layouts/community/ortho_3x10/bbaserdem/readme.md
 delete mode 100755 layouts/community/ortho_3x10/bbaserdem/rules.mk
 delete mode 100755 layouts/community/ortho_4x12/bbaserdem/config.h
 delete mode 100755 layouts/community/ortho_4x12/bbaserdem/keymap.c
 delete mode 100644 layouts/community/ortho_4x12/bbaserdem/readme.md
 delete mode 100755 layouts/community/ortho_4x12/bbaserdem/rules.mk
 delete mode 100644 layouts/community/split_3x5_3/bbaserdem/config.h
 delete mode 100644 layouts/community/split_3x5_3/bbaserdem/keymap.c
 delete mode 100644 layouts/community/split_3x5_3/bbaserdem/readme.md
 delete mode 100644 layouts/community/split_3x5_3/bbaserdem/rules.mk
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/chconf.h
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/config.h
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/halconf.h
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/keymap.c
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/mcuconf.h
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/readme.md
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/rules.mk
 delete mode 100644 layouts/community/split_3x6_3/bbaserdem/ssd1306.c
 delete mode 100644 users/bbaserdem/.gitignore
 delete mode 100644 users/bbaserdem/bb-audio.c
 delete mode 100644 users/bbaserdem/bb-audio.h
 delete mode 100644 users/bbaserdem/bb-backlight.c
 delete mode 100644 users/bbaserdem/bb-backlight.h
 delete mode 100644 users/bbaserdem/bb-encoder.c
 delete mode 100644 users/bbaserdem/bb-encoder.h
 delete mode 100644 users/bbaserdem/bb-macro.c
 delete mode 100644 users/bbaserdem/bb-macro.h
 delete mode 100644 users/bbaserdem/bb-oled-extra.c
 delete mode 100644 users/bbaserdem/bb-oled-extra.h
 delete mode 100644 users/bbaserdem/bb-oled.c
 delete mode 100644 users/bbaserdem/bb-oled.h
 delete mode 100644 users/bbaserdem/bb-rgb.c
 delete mode 100644 users/bbaserdem/bb-rgb.h
 delete mode 100644 users/bbaserdem/bb-underglow.c
 delete mode 100644 users/bbaserdem/bb-underglow.h
 delete mode 100644 users/bbaserdem/bbaserdem.c
 delete mode 100644 users/bbaserdem/bbaserdem.h
 delete mode 100644 users/bbaserdem/config.h
 delete mode 100644 users/bbaserdem/keymap-bitmaps/.gitignore
 delete mode 100755 users/bbaserdem/keymap-bitmaps/cropBmp
 delete mode 100644 users/bbaserdem/readme.md
 delete mode 100644 users/bbaserdem/rules.mk

diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/config.h b/keyboards/splitkb/kyria/keymaps/bbaserdem/config.h
deleted file mode 100644
index b7b883d3bd..0000000000
--- a/keyboards/splitkb/kyria/keymaps/bbaserdem/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Kyria specific
-#ifdef KEYBOARD_splitkb_kyria_rev1
-    // Split definition; use the following to flash;
-    //  pro-micro:      avrdude-split-left/right
-    //  elite-c:        dfu-split-left/right
-#   define ENCODER_DIRECTION_FLIP
-#   define EE_HANDS
-
-    // Make sure kyria has bigger oled display
-#   ifdef OLED_ENABLE
-#   define OLED_DISPLAY_128X64
-#   endif
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c b/keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c
deleted file mode 100644
index d3720ea764..0000000000
--- a/keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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 "bbaserdem.h"
-
-#define LAYOUT_split_3x6_5_wrapper(...) LAYOUT_split_3x6_5(__VA_ARGS__)
-
-/* F layout
- * ┌───┬───┬───┬───┬───┬───┐                 ┌───┬───┬───┬───┬───┬───┐
- * │ W │ F │ G │ Ğ │ I │ O │                 │ D │ R │ N │ H │ P │ Q │
- * ├───┼───┼───┼───┼───┼───┤                 ├───┼───┼───┼───┼───┼───┤
- * │ X │ A │ S │ D │ F │ G │                 │ T │ K │ M │ L │ Y │ Ş │
- * ├───┼───┼───┼───┼───┼───┼───┬───┐ ┌───┬───┼───┼───┼───┼───┼───┼───┤
- * │* +│ J │ Ö │ V │ C │ Ç │   │   │ │   │   │ Z │ S │ B │. :│, ;│< >│
- * └───┴───┴───┼───┼───┼───┤Esc│Shf│ │Shf│Del├───┼───┼───┼───┴───┴───┘
- *             │En1│Tab│Ent│   │   │ │   │   │Spc│Bsp│En2│
- *             └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_split_3x6_5_wrapper(
-        _BL1_1_,_BL1_5_,                _BR1_5_,_BR1_1_,
-        _BL2_1_,_BL2_5_,                _BR2_5_,_BR2_1_,
-        _BL3_1_,_BL3_5_,xxx2xxx,xxx2xxx,_BR3_5_,_BR3_1_,
-        BB_ENC0, _BL4_3_,KC_LSFT,KC_RSFT,_BR4_3_,BB_ENC1
-    ),
-    [_CHAR] = LAYOUT_split_3x6_5_wrapper(
-        XXXXXXX,_CL1_5_,                _CR1_5_,XXXXXXX,
-        XXXXXXX,_CL2_5_,                _CR2_5_,XXXXXXX,
-        XXXXXXX,_CL3_5_,xxx2xxx,xxx2xxx,_CR3_5_,XXXXXXX,
-        _______,_CL4_3_,_______,_______,_CR4_3_,_______
-    ),
-    [_GAME] = LAYOUT_split_3x6_5_wrapper(
-        _GA1_1_,_GA1_5_,                ___5___,___1___,
-        _GA2_1_,_GA2_5_,                ___5___,___1___,
-        _GA3_1_,_GA3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
-        _______,_GA4_3_,_______,_______,___3___,_______
-    ),
-    [_MEDI] = LAYOUT_split_3x6_5_wrapper(
-        ___1___,___5___,                _ME1_5_,___1___,
-        ___1___,___5___,                _ME2_5_,___1___,
-        ___1___,___5___,xxx2xxx,xxx2xxx,_ME3_5_,___1___,
-        ___1___,___3___,_______,_______,_ME4_3_,___1___	
-    ),
-    [_NAVI] = LAYOUT_split_3x6_5_wrapper(
-        ___1___,___5___,                _NA1_5_,___1___,
-        ___1___,___5___,                _NA2_5_,___1___,
-        ___1___,___5___,xxx2xxx,xxx2xxx,_NA3_5_,___1___,
-        ___1___,___3___,_______,_______,_NA4_3_,___1___
-    ),
-    [_SYMB] = LAYOUT_split_3x6_5_wrapper(
-        ___1___,___5___,                _SY1_5_,___1___,
-        ___1___,___5___,                _SY2_5_,___1___,
-        ___1___,___5___,xxx2xxx,xxx2xxx,_SY3_5_,___1___,
-        ___1___,___3___,_______,_______,_SY4_3_,___1___
-    ),
-    [_NUMB] = LAYOUT_split_3x6_5_wrapper(
-        ___1___,_NU1_5_,                ___5___,___1___,
-        ___1___,_NU2_5_,                ___5___,___1___,
-        ___1___,_NU3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
-        ___1___,_NU4_3_,_______,_______,___3___,___1___
-    ),
-    [_FUNC] = LAYOUT_split_3x6_5_wrapper(
-        ___1___,_FU1_5_,                ___5___,___1___,
-        ___1___,_FU2_5_,                ___5___,___1___,
-        ___1___,_FU3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
-        ___1___,_FU4_3_,_______,_______,___3___,___1___
-    ),
-    [_MOUS] = LAYOUT_split_3x6_5_wrapper(
-        ___1___,_MO1_5_,                ___5___,___1___,
-        ___1___,_MO2_5_,                ___5___,___1___,
-        ___1___,_MO3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
-        ___1___,_MO4_3_,_______,_______,___3___,___1___
-    ),
-    [_MUSI] = LAYOUT_split_3x6_5_wrapper(
-        _MU_12_,_MU_12_,
-        _MU_06_,xxx2xxx,xxx2xxx,_MU_06_,
-        MU_TOG,_MUL_3_,_MU_02_,_MUR_3_,___1___
-    )
-};
-
-#ifdef KEYBOARD_splitkb_kyria_rev1      // Kyria specific code
-#ifdef OLED_ENABLE                          // Kyria's oled screen
-// Rotate the display on kyria
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-// For kyria; print logo, and allow default status printing
-bool oled_task_keymap(void) {
-    render_qmk_logo(0, 0);
-    render_status_lite(4, 0);
-    return false;
-}
-#endif //OLED_ENABLE
-#endif //KEYBOARD_splitkb_kyria_rev1
diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md b/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
deleted file mode 100644
index 6381612978..0000000000
--- a/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-This folder contains my Kyria (`split_3x6_5`) board layout.
-Check out the [user readme](../../../../../users/bbaserdem/readme.md) for more info.
-
-# Kyria
-
-I use a rev 1.3 PCB as a daily driver.
-
-## Hardware
-
-* Using a modified High-profile case; with metal switch plate.
-* Currently using a Pro-Micro and an Elite-C as microcontrollers.
-* Using Gateron Silent Black Ink with Progressive springs (100g), lubed.
-* Have mill-max sockets for hotswap feature.
-* All microcontrollers and OLED's are socketed for easy removal.
-
-## Features
-
-* Use two thumb keys in the 2u layout.
-* Have rotary encoders in the outermost keys of the thumb cluster.
-* Have underglow leds soldered.
-
-## Issues
-
-* Stabilizers squiek, and need lubing.
-* The double tap buttons (home row; left leader the most) don't contact well.
-
-## Todo
-
-* Switch to Proton C conversion with a game plan.
-* Lube stabilizers.
-* Get tenting puck.
-* (Not depending on me) migrate this code to layouts.
diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk b/keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk
deleted file mode 100644
index 21013120e6..0000000000
--- a/keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Kyria hardware
-ifneq (,$(findstring splitkb/kyria/rev1,$(KEYBOARD)))
-    # Elective features
-    ENCODER_ENABLE = yes
-    OLED_ENABLE = yes
-    # Nonexistent features
-    AUDIO_ENABLE = no
-    BACKLIGHT_ENABLE = no
-    RGB_MATRIX_ENABLE = no
-    # Space savers
-    NKRO_ENABLE = no
-    VELOCIKEY_ENABLE = no
-    WPM_ENABLE = no
-endif
diff --git a/layouts/community/ortho_3x10/bbaserdem/config.h b/layouts/community/ortho_3x10/bbaserdem/config.h
deleted file mode 100644
index b792b2e6fa..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2019 Batuhan Başerdem <baserdem.batuhan@gmail.com> @bbaserdem
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-// Gherkin specific
-#ifdef KEYBOARD_40percentclub_gherkin
-    #define MUSIC_MAP
-    #define RGB_DI_PIN F6
-    #define RGB_MATRIX_LED_COUNT 10
-#endif
diff --git a/layouts/community/ortho_3x10/bbaserdem/keymap.c b/layouts/community/ortho_3x10/bbaserdem/keymap.c
deleted file mode 100644
index 06228cc37a..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Copyright 2019 Batuhan Başerdem <baserdem.batuhan@gmail.com> @bbaserdem
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received 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 "bbaserdem.h"
-
-#ifdef KEYBOARD_40percentclub_gherkin
-    // Flip it
-    #undef LAYOUT_ortho_3x10
-    #define LAYOUT_ortho_3x10( \
-	 K00,   K01,   K02,   K03,   K04,   K05,   K10,   K11,   K12,   K13 , \
-	 K14,   K15,   K20,   K21,   K22,   K23,   K24,   K25,   K30,   K31 , \
-	 K32,   K33,   K34,   K35,   K40,   K41,   K42,   K43,   K44,   K45   \
-    ) { \
-	{ K45,   K44,   K43,   K42,   K41,   K40 }, \
-	{ K35,   K34,   K33,   K32,   K31,   K30 }, \
-	{ K25,   K24,   K23,   K22,   K21,   K20 }, \
-	{ K15,   K14,   K13,   K12,   K11,   K10 }, \
-	{ K05,   K04,   K03,   K02,   K01,   K00 }  \
-    }
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Game pad
- * ,-----------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  | F1  | F2  | F3  |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |AdjsL|  Q  |  W  |  E  |  R  | Ent | Tab | Ctr | |^| | Alt |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |Music|  A  |  S  |  D  |  F  | Spc |Shift| <-- | |v| | --> |
- * `-----------------------------------------------------------'
- */
-    [_BASE] = LAYOUT_ortho_3x10(
-        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_F1,  KC_F2,  KC_F3,
-    MO(_MEDI),  KC_Q,   KC_W,   KC_E,   KC_R,   KC_ENT, KC_TAB, KC_LCTL,KC_UP,  KC_LALT,
-        MU_TOG, KC_A,   KC_S,   KC_D,   KC_F,   KC_SPC, KC_LSFT,KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-/* Adjust
- * ,-----------------------------------------------------------.
- * | Esc |RGBTg|HueUp|HueDn|SatUp|SatDn|ValUp|ValDn|ModNx|ModPr|
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |     |BltTg|Breth|BriUp|BriDn|     |     |Veloc|SpdUp|SpdDn|
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |Music|     |     |     |     |     |     |     |EEprm|Reset|
- * `-----------------------------------------------------------'
- */
-    [_MEDI] = LAYOUT_ortho_3x10(
-        CK_TOGG,RGB_TOG,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,RGB_MOD,RGB_RMOD,
-        _______,BL_TOGG,BL_BRTG,BL_INC, BL_DEC, XXXXXXX,XXXXXXX,VLK_TOG,RGB_SPI,RGB_SPD,
-        AU_TOG, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EE_CLR,QK_BOOT
-    ),
-    [_MUSI] = LAYOUT_ortho_3x10_wrapper(
-        MU_FAST,_MU_08_,MU_REC,
-        MU_SLOW,_MU_08_,MU_STOP,
-        MU_TOG, _MU_08_,MU_PLAY
-    ),
-};
-
-// Music map, guitar like.
-#ifdef AUDIO_ENABLE
-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_ortho_3x10(
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-     5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9
-);
-#endif
-
-// RGB matrix code
-#ifdef RGB_MATRIX_ENABLE
-// Gherkin
-#if defined(KEYBOARD_40percentclub_gherkin)
-led_config_t g_led_config = {
-  { // Key Matrix to LED Index
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED}
-}, { // LED Index to Physical Position
-    {224,  0}, {168,  0}, {112,  0}, { 56,  0}, {  0,  0},
-    {  0, 64}, { 56, 64}, {112, 64}, {168, 64}, {224, 64},
-}, { // LED Index to Flag
-    2,2,2,2,2,2,2,2,2,2
-}};
-// Disable layer switching
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {return true;}
-#endif // Gherkin
-#endif // RGB Matrix
diff --git a/layouts/community/ortho_3x10/bbaserdem/readme.md b/layouts/community/ortho_3x10/bbaserdem/readme.md
deleted file mode 100644
index 3681eb840a..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-This folder contains my [3x10\_ortho](../../../default/ortho_3x10) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Gherkin
-
-I use [Gherkin](../../../../keyboards/40percentclub/gherkin/readme.md).
-
-It is used as a game pad, and key layout is inspired by spare keys I had lying around.
-The firmware is very simple, and only includes one layer keymap, and RGB effects.
-
-## Status
-
-* [x] Layout adapted
-* [x] Tested build
-* [x] Confirmed on board
-
-## Build
-
-Build command: `CFLAGS="-Wno-error=deprecated" <FILL-IN-LATER>`
diff --git a/layouts/community/ortho_3x10/bbaserdem/rules.mk b/layouts/community/ortho_3x10/bbaserdem/rules.mk
deleted file mode 100755
index 7232f6969d..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019 Batuhan Başerdem <baserdem.batuhan@gmail.com> @bbaserdem
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This small layout is a macro-pad; does not need userspace
-
-# Gherkin has both RGB strip and LED lights
-ifneq (,$(findstring 40percentclub/gherkin,$(KEYBOARD)))
-    CONVERT_TO_PROTON_C = yes
-    RGB_MATRIX_ENABLE = yes
-    RGB_MATRIX_DRIVER = WS2812
-    AUDIO_ENABLE = yes
-    BACKLIGHT_ENABLE = yes
-    VELOCIKEY_ENABLE = yes
-endif
diff --git a/layouts/community/ortho_4x12/bbaserdem/config.h b/layouts/community/ortho_4x12/bbaserdem/config.h
deleted file mode 100755
index fb3ec1371b..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-// Code pertaining to planck rev6
-#ifdef KEYBOARD_planck_rev6
-    // Encoder I use;
-#   ifdef ENCODER_RESOLUTION
-#   undef ENCODER_RESOLUTION
-#   endif
-#   define ENCODER_RESOLUTION 2
-#endif
diff --git a/layouts/community/ortho_4x12/bbaserdem/keymap.c b/layouts/community/ortho_4x12/bbaserdem/keymap.c
deleted file mode 100755
index 91ddc61764..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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 "bbaserdem.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Base layer
-    [_BASE] = LAYOUT_ortho_4x12_wrapper(
-        _BL1_5_,_BL1_1_,_BR1_1_,_BR1_5_,
-        _BL2_5_,_BL2_1_,_BR2_1_,_BR2_5_,
-        _BL3_5_,_BL3_1_,_BR3_1_,_BR3_5_,
-        BB_ENC0,KC_DOWN,KC_UP,  _BL4_3_,_BR4_3_,KC_LEFT,KC_RGHT,RGB_TOG
-    ),
-    // Extra characters overlay
-    [_CHAR] = LAYOUT_ortho_4x12_wrapper(
-        _CL1_5_,xxx2xxx,_CR1_5_,
-        _CL2_5_,xxx2xxx,_CR2_5_,
-        _CL3_5_,xxx2xxx,_CR3_5_,
-        ___3___,_CL4_3_,_CR4_3_,___3___
-    ),
-    // Game layer: left_half
-    [_GAME] = LAYOUT_ortho_4x12_wrapper(
-        _GA1_5_,_GA1_1_,___6___,
-        _GA2_5_,_GA2_1_,___6___,
-        _GA3_5_,_GA3_1_,___6___,
-        ___3___,_GA4_3_,___6___
-    ),
-    // Media layer: right_half
-    [_MEDI] = LAYOUT_ortho_4x12_wrapper(
-        ___6___,xxx1xxx,_ME1_5_,
-        ___6___,xxx1xxx,_ME2_5_,
-        ___6___,xxx1xxx,_ME3_5_,
-        ___6___,_ME4_3_,___3___
-    ),
-    // Navigation layer: right_half
-    [_NAVI] = LAYOUT_ortho_4x12_wrapper(
-        ___6___,xxx1xxx,_NA1_5_,
-        ___6___,xxx1xxx,_NA2_5_,
-        ___6___,xxx1xxx,_NA3_5_,
-        ___6___,_NA4_3_,___3___
-    ),
-    // Symbol layer: right_half
-    [_SYMB] = LAYOUT_ortho_4x12_wrapper(
-        ___6___,xxx1xxx,_SY1_5_,
-        ___6___,xxx1xxx,_SY2_5_,
-        ___6___,xxx1xxx,_SY3_5_,
-        ___6___,_SY4_3_,___3___
-    ),
-    // Number layer: left_half
-    [_NUMB] = LAYOUT_ortho_4x12_wrapper(
-        xxx1xxx,_NU1_5_,___6___,
-        xxx1xxx,_NU2_5_,___6___,
-        xxx1xxx,_NU3_5_,___6___,
-        ___3___,_NU4_3_,___6___
-    ),
-    // Function layer: left_half
-    [_FUNC] = LAYOUT_ortho_4x12_wrapper(
-        _FU1_5_,xxx1xxx,___6___,
-        _FU2_5_,xxx1xxx,___6___,
-        _FU3_5_,xxx1xxx,___6___,
-        ___3___,_FU4_3_,___6___
-    ),
-    // Mouse layer: left_half
-    [_MOUS] = LAYOUT_ortho_4x12_wrapper(
-        _MO1_5_,xxx1xxx,___6___,
-        _MO2_5_,xxx1xxx,___6___,
-        _MO3_5_,xxx1xxx,___6___,
-        ___3___,_MO4_3_,___6___
-    ),
-    // Music layer: everything
-    [_MUSI] = LAYOUT_ortho_4x12_wrapper(
-        _MU_12_,_MU_12_,_MU_12_,
-        ___1___,_MU_02_,_MUL_3_,_MUR_3_,_MU_02_,___1___)
-};
diff --git a/layouts/community/ortho_4x12/bbaserdem/readme.md b/layouts/community/ortho_4x12/bbaserdem/readme.md
deleted file mode 100644
index 5eb6548574..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-This folder contains my [4x12\_ortho](../../../default/ortho_4x12) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Planck Light
-
-I use a couple [planck](../../../../keyboards/planck/readme.md) keyboards.
-To sell soon; don't use them anymore, but will keep the light version.
-
-# JJ40
-
-A planck rev4 replacement; for my acrylic planck case which used to host a now
-defunct rev4.
diff --git a/layouts/community/ortho_4x12/bbaserdem/rules.mk b/layouts/community/ortho_4x12/bbaserdem/rules.mk
deleted file mode 100755
index b3ce684315..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/rules.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Planck rev6 has both RGBLIGHT and RGB_MATRIX enabled
-ifneq (,$(findstring planck/rev6,$(KEYBOARD)))
-    RGB_MATRIX_ENABLE = yes
-    RGBLIGHT_ENABLE = no
-endif
-# JJ40 here
-ifneq (,$(findstring jj40,$(KEYBOARD)))
-    RGB_MATRIX_ENABLE = yes
-endif
diff --git a/layouts/community/split_3x5_3/bbaserdem/config.h b/layouts/community/split_3x5_3/bbaserdem/config.h
deleted file mode 100644
index 2f7c0f7068..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-// Split definition; use the following to flash;
-//  pro-micro:      avrdude-split-left/right
-//  elite-c:        dfu-split-left/right
-#define EE_HANDS
-
-#ifdef KEYBOARD_crkbd_rev1
-    // Corne overrides
-#   ifdef RGBLED_NUM
-#   undef RGBLED_NUM
-#   endif
-#   ifdef RGB_MATRIX_LED_COUNT
-#   undef RGB_MATRIX_LED_COUNT
-#   endif
-#   define RGBLED_NUM 48
-#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x5_3/bbaserdem/keymap.c b/layouts/community/split_3x5_3/bbaserdem/keymap.c
deleted file mode 100644
index f39a81082e..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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 "bbaserdem.h"
-
-/* D layout
- * ┌───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┐
- * │' "│, <│. >│ 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 │
- * └───┴───┴───┼───┼───┼───┐ ┌───┼───┼───┼───┴───┴───┘
- *             │Del│Tab│Spc│ │Ent│Esc│Bsp│
- *             └───┴───┴───┘ └───┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_split_3x5_3_wrapper(
-        _BL1_5_,_BR1_5_,
-        _BL2_5_,_BR2_5_,
-        _BL3_5_,_BR3_5_,
-        _BL4_3_,_BR4_3_
-    ),
-    [_CHAR] = LAYOUT_split_3x5_3_wrapper(
-        _CL1_5_,_CR1_5_,
-        _CL2_5_,_CR2_5_,
-        _CL3_5_,_CR3_5_,
-        _CL4_3_,_CR4_3_
-    ),
-    [_GAME] = LAYOUT_split_3x5_3_wrapper(
-        _GA1_5_,___5___,
-        _GA2_5_,___5___,
-        _GA3_5_,___5___,
-        _GA4_3_,___3___
-    ),
-    [_MEDI] = LAYOUT_split_3x5_3_wrapper(
-        ___5___,_ME1_5_,
-        ___5___,_ME2_5_,
-        ___5___,_ME3_5_,
-        ___3___,_ME4_3_
-    ),
-    [_NAVI] = LAYOUT_split_3x5_3_wrapper(
-        ___5___,_NA1_5_,
-        ___5___,_NA2_5_,
-        ___5___,_NA3_5_,
-        ___3___,_NA4_3_
-    ),
-    [_SYMB] = LAYOUT_split_3x5_3_wrapper(
-        ___5___,_SY1_5_,
-        ___5___,_SY2_5_,
-        ___5___,_SY3_5_,
-        ___3___,_SY4_3_
-    ),
-    [_NUMB] = LAYOUT_split_3x5_3_wrapper(
-        _NU1_5_,___5___,
-        _NU2_5_,___5___,
-        _NU3_5_,___5___,
-        _NU4_3_,___3___
-    ),
-    [_FUNC] = LAYOUT_split_3x5_3_wrapper(
-        _FU1_5_,___5___,
-        _FU2_5_,___5___,
-        _FU3_5_,___5___,
-        _FU4_3_,___3___
-    ),
-    [_MOUS] = LAYOUT_split_3x5_3_wrapper(
-        _MO1_5_,___5___,
-        _MO2_5_,___5___,
-        _MO3_5_,___5___,
-        _MO4_3_,___3___
-    ),
-    [_MUSI] = LAYOUT_split_3x5_3_wrapper(
-            _MU_10_,
-            _MU_10_,
-            _MU_10_,
-        _MUL_3_,_MUR_3_
-    )
-};
-
-// RGB Matrix configuration
-#ifdef RGB_MATRIX_ENABLE
-
-// crkbd
-#ifdef KEYBOARD_crkbd_rev1
-/* This is left-right for crkbd indicator light
- * ┌──┬──┬──┬──┬──┐      ┌──┬──┬──┬──┬──┐
- * │23│18│17│10│09│      │33│34│41│42│47│
- * ├02┼──┼01┼──┼00┤      ├24┼──┼25┼──┼26┤
- * │22│19│16│11│08│      │32│35│40│43│46│
- * ├03┼──┼04┼──┼05┤      ├29┼──┼28┼──┼27┤
- * │21│20│15│12│07│      │31│36│39│44│45│
- * └──┴──┴──┼──┼──┼──┐┌──┼──┼──┼──┴──┴──┘
- *          │14│13│06││30│37│38│
- *          └──┴──┴──┘└──┴──┴──┘
- */
-
-// End of differentiations
-#endif // KEYBOARD_crkbd_rev1
-
-// End of code for the RGB_MATRIX setup
-#endif // RGB_MATRIX_ENABLE
diff --git a/layouts/community/split_3x5_3/bbaserdem/readme.md b/layouts/community/split_3x5_3/bbaserdem/readme.md
deleted file mode 100644
index 30cacd85ea..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-This folder contains my [split\_3x5\_3](../../../default/split_3x5_3) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Crkbd
-
-Using a no 6th column crkbd (rev 2.1 choc) as a mobile keyboard.
-
-This version uses ProMicro as controllers; can't have OLED and RGB at the same time.
-
-## Build
-
-QMK cli commands no longer works with Archlinux (2021 Sep.) on my PC for flashing promicro.
-In the past; I used to flash Pro Micro explicitly using the following line, for referance.
-
-```
-sudo avrdude -p atmgea34u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:<hexfile>.hex
-```
-
diff --git a/layouts/community/split_3x5_3/bbaserdem/rules.mk b/layouts/community/split_3x5_3/bbaserdem/rules.mk
deleted file mode 100644
index 047629b401..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Corne keyboard
-ifneq (,$(findstring crkbd/rev1,$(KEYBOARD)))
-    RGBLIGHT_ENABLE = no
-    RGB_MATRIX_ENABLE = yes
-    OLED_ENABLE = no
-endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/chconf.h b/layouts/community/split_3x6_3/bbaserdem/chconf.h
deleted file mode 100644
index 4c6d15441f..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/chconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Code pertaining the ARM crkbd version
-#ifdef KEYBOARD_crkbd_rev1
-#   define CH_CFG_ST_RESOLUTION 16
-#   define CH_CFG_ST_FREQUENCY 10000
-#   include_next "chconf.h"
-#endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x6_3/bbaserdem/config.h b/layouts/community/split_3x6_3/bbaserdem/config.h
deleted file mode 100644
index 1d269335fe..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/config.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-// Split definition; use the following to flash;
-//  pro-micro:      avrdude-split-left/right
-//  elite-c:        dfu-split-left/right
-
-// Code pertaining to Corne ARM; from Waffle's keymap
-#ifdef KEYBOARD_crkbd_rev1
-    // Use EE_HANDS to determine handedness
-#   define EE_HANDS
-
-    // Rebrand the PCB
-#   undef PRODUCT
-#   define PRODUCT "Protorne Keyboard"
-#   undef MANUFACTURER
-#   define MANUFACTURER "Waffles"
-
-    // Remove OLED definitions? 
-#   undef USE_I2C
-#   undef SSD1306OLED
-
-    // Audio output on pin A5 (actualy will be output on B1 using keymap init)
-#   ifdef AUDIO_ENABLE
-#       define AUDIO_PIN A5
-#       define MUSIC_MAP
-#   endif
-
-    // Set serial pin as D3 for sure
-#   undef SOFT_SERIAL_PIN
-#   define SOFT_SERIAL_PIN D3
-#   define SERIAL_USART_SPEED 921600
-#   define SERIAL_USART_DRIVER SD1
-#   define SERIAL_USART_TX_PAL_MODE 7
-
-    // Things to make RGB matrix work on the waffle board
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 54
-#   undef RGB_DI_PIN
-#   define RGB_DI_PIN B5
-#   ifdef RGB_MATRIX_ENABLE
-#       define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100
-#       define RGB_MATRIX_SPLIT { 27, 27 }
-#   endif
-#   define WS2812_PWM_DRIVER PWMD3
-#   define WS2812_PWM_CHANNEL 3
-#   define WS2812_PWM_PAL_MODE 2
-#   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#   define WS2812_DMA_CHANNEL 3
-
-    // OLED related code
-#   ifdef OLED_ENABLE
-#       define OLED_UPDATE_INTERVAL 100
-#   endif
-    
-    // Encoder definitons
-#   define ENCODERS_PAD_A { B2 }
-#   define ENCODERS_PAD_B { B6 }
-#   define ENCODER_RESOLUTIONS { 4 }
-#   define ENCODERS_PAD_A_RIGHT { B2 }
-#   define ENCODERS_PAD_B_RIGHT { B6 }
-#   define ENCODER_RESOLUTIONS_RIGHT { 2 }
-#endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/halconf.h b/layouts/community/split_3x6_3/bbaserdem/halconf.h
deleted file mode 100644
index f3978c4175..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/halconf.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifdef KEYBOARD_crkbd_rev1
-    // #define HAL_USE_DAC TRUE
-#   define HAL_USE_PWM TRUE
-#   define HAL_USE_SERIAL TRUE
-#   include_next <halconf.h>
-#endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/keymap.c b/layouts/community/split_3x6_3/bbaserdem/keymap.c
deleted file mode 100644
index 589b8eda0c..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/keymap.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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 "bbaserdem.h"
-
-#ifdef KEYBOARD_crkbd_rev1
-#   include "bb-oled-extra.h"
-#endif // KEYBOARD_crkbd_rev1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_split_3x6_3_wrapper(
-        BB_ENC0,_BL1_5_,_BR1_5_,BB_ENC1,
-        _BL2_1_,_BL2_5_,_BR2_5_,_BR2_1_,
-        _BL3_1_,_BL3_5_,_BR3_5_,_BR3_1_,
-                _BL4_3_,_BR4_3_
-    ),
-    [_CHAR] = LAYOUT_split_3x6_3_wrapper(
-        _______,_CL1_5_,_CR1_5_,_______,
-        XXXXXXX,_CL2_5_,_CR2_5_,XXXXXXX,
-        XXXXXXX,_CL3_5_,_CR3_5_,XXXXXXX,
-                _CL4_3_,_CR4_3_
-    ),
-    [_GAME] = LAYOUT_split_3x6_3_wrapper(
-        _______,_GA1_5_,___6___,
-        _GA2_1_,_GA2_5_,___6___,
-        _GA3_1_,_GA3_5_,___6___,
-                _GA4_3_,___3___
-    ),
-    [_MEDI] = LAYOUT_split_3x6_3_wrapper(
-        ___6___,_ME1_5_,_______,
-        ___6___,_ME2_5_,xxx1xxx,
-        ___6___,_ME3_5_,xxx1xxx,
-        ___3___,_ME4_3_
-    ),
-    [_NAVI] = LAYOUT_split_3x6_3_wrapper(
-        ___6___,_NA1_5_,_______,
-        ___6___,_NA2_5_,xxx1xxx,
-        ___6___,_NA3_5_,xxx1xxx,
-        ___3___,_NA4_3_
-    ),
-    [_SYMB] = LAYOUT_split_3x6_3_wrapper(
-        ___6___,_SY1_5_,_______,
-        ___6___,_SY2_5_,xxx1xxx,
-        ___6___,_SY3_5_,xxx1xxx,
-        ___3___,_SY4_3_
-    ),
-    [_NUMB] = LAYOUT_split_3x6_3_wrapper(
-        _______,_NU1_5_,___6___,
-        xxx1xxx,_NU2_5_,___6___,
-        xxx1xxx,_NU3_5_,___6___,
-                _NU4_3_,___3___
-    ),
-    [_FUNC] = LAYOUT_split_3x6_3_wrapper(
-        _______,_FU1_5_,___6___,
-        xxx1xxx,_FU2_5_,___6___,
-        xxx1xxx,_FU3_5_,___6___,
-                _FU4_3_,___3___
-    ),
-    [_MOUS] = LAYOUT_split_3x6_3_wrapper(
-        _______,_MO1_5_,___6___,
-        xxx1xxx,_MO2_5_,___6___,
-        xxx1xxx,_MO3_5_,___6___,
-                _MO4_3_,___3___
-    ),
-    [_MUSI] = LAYOUT_split_3x6_3_wrapper(
-            _MU_12_,
-            _MU_12_,
-            _MU_12_,
-        _MUL_3_,_MUR_3_
-    )
-};
-
-// crkbd
-#ifdef KEYBOARD_crkbd_rev1
-#ifdef AUDIO_ENABLE
-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_split_3x6_3(
-    24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-    12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-                 0,  0,  0,  0,  0,  0
-);
-#endif // AUDIO_ENABLE
-void keyboard_pre_init_keymap(void) {
-#   ifdef AUDIO_ENABLE
-    //thank you to @sigprof for this
-    // Set audio pins to analog mode
-    palSetLineMode(A5, PAL_MODE_INPUT_ANALOG);
-    palSetLineMode(B1, PAL_MODE_INPUT_ANALOG);
-#   endif // AUDIO_ENABLE
-#   ifdef RGB_MATRIX_ENABLE
-    // Led locations are different on protorne; need to be fixed
-    g_led_config = (led_config_t) { {
-        // Logical Layout
-        // 0  1  2  3  4  5  COLS
-        // -LEFT             ROWS
-        // 16 17 18 19 20 21   0
-        // 15 14 13 12 11 10   1
-        // 04 05 06 07 08 09   2
-        //          03 02 01   3
-        // -Right
-        // 21 20 19 18 17 16   4
-        // 10 11 12 13 14 15   5
-        // 09 08 07 06 05 04   6
-        //          01 02 03   7
-        {  15,  16,  17,  18,  19,   20},
-        {  14,  13,  12,  11,  10,   9 },
-        {   3,   4,   5,   6,   7,   8 },
-        { NO_LED, NO_LED, NO_LED,   2,   1,   0 },
-        {  47,  46,  45,  44,  43,  42 },
-        {  36,  37,  38,  39,  40,  41 },
-        {  35,  34,  33,  32,  31,  30 },
-        { NO_LED, NO_LED, NO_LED,  27,  28,  29 }
-    }, {
-        // Physical Layout
-        //      LEFT                    RIGHT
-        // 16 17 18 19 20 21       16 17 18 19 20 21
-        //    24    23    22       24    23    22
-        // 15 14 13 12 11 10       15 14 13 12 11 10
-        //    25                               27
-        // 04 05 06 07 08 09       04 05 06 07 08 09
-        //          26    27       25    26
-        //           03 02 01     03 02 01
-        {  95,  63 }, {  80,  58 }, {  60,  55 },
-        {   0,  41 }, {  16,  42 }, {  33,  37 }, {  50,  35 }, {  68,  37 }, {  85,  39 },
-        {  85,  21 }, {  68,  19 }, {  50,  13 }, {  33,  20 }, {  16,  24 }, {   0,  24 },
-        {   0,   7 }, {  16,   7 }, {  33,   3 }, {  50,   0 }, {  68,   2 }, {  85,   4 },
-        {  85,  16 }, {  50,  13 }, {  16,  20 }, {  16,  38 }, {  50,  48 }, {  85,  52 },
-        { 164,  55 }, { 144,  58 }, { 129,  63 },
-        { 139,  39 }, { 156,  37 }, { 174,  35 }, { 191,  37 }, { 208,  42 }, { 224,  41 },
-        { 224,  24 }, { 208,  24 }, { 191,  20 }, { 174,  13 }, { 156,  19 }, { 139,  21 },
-        { 139,   4 }, { 156,   2 }, { 174,   0 }, { 191,   3 }, { 208,   7 }, { 224,   7 },
-        { 208,  20 }, { 174,  13 }, { 139,  16 }, { 139,  52 }, { 174,  48 }, { 208,  38 }
-    }, {
-        // (x---)8 stands for indicator
-        // (-x--)4 stands for per-key led
-        // (--x-)2 stands for underglow led
-        // (---1)1 stands for modifier key
-        12, 12, 12,
-         4,  4,  5,  4,  4,  4,
-         4,  5,  5,  5,  5,  4,
-         4,  4,  4,  4,  4,  4,
-        10, 10, 10, 10, 10, 10,
-        12, 12, 12,
-         4,  4,  4,  5,  4,  4,
-         4,  5,  5,  5,  5,  4,
-         4,  4,  4,  4,  4,  4,
-        10, 10, 10, 10, 10, 10
-    } };
-#   endif // RGB_MATRIX_ENABLE
-}
-
-// Enable OPAMP1 as A5 → B1 follower
-#ifdef AUDIO_ENABLE
-void keyboard_post_init_keymap(void) {
-    OPAMP3->CSR = OPAMP3_CSR_VMSEL_1 | OPAMP3_CSR_VMSEL_0 | OPAMP3_CSR_VPSEL_0 | OPAMP3_CSR_OPAMP3EN;
-}
-#endif // AUDIO_ENABLE
-
-#ifdef OLED_ENABLE
-// Flip the display on the right half
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_left()) {
-        return OLED_ROTATION_180; 
-    }
-    return rotation;
-}
-
-bool oled_task_keymap(void) {
-    if (is_keyboard_left()) {
-        render_status_left(0, 0);
-    } else {
-        render_status_right(0, 0);
-    }
-    return false;
-}
-#endif // OLED_ENABLE
-#endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x6_3/bbaserdem/mcuconf.h b/layouts/community/split_3x6_3/bbaserdem/mcuconf.h
deleted file mode 100644
index bde80b316f..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/mcuconf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifdef KEYBOARD_crkbd_rev1
-#   include_next <mcuconf.h>
-#   undef STM32_PWM_USE_TIM3
-#   define STM32_PWM_USE_TIM3 TRUE
-#   undef STM32_SERIAL_USE_USART1
-#   define STM32_SERIAL_USE_USART1 TRUE
-#endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/readme.md b/layouts/community/split_3x6_3/bbaserdem/readme.md
deleted file mode 100644
index c3dea2882f..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-This folder contains my [split\_3x6\_3](../../../default/split_3x6_3) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Crkbd
-
-Using [this](https://github.com/ItsWaffIe/waffle_corne) Proton-C compatible PCB.
-
-Applying the similar keymap to [@waffle](https://github.com/ItsWaffIe/waffle_corne);
-using their `crkbd:rev1:arm` build.
-
-## Build
-
-Build commands;
-
-* For ARM: `CFLAGS="-Wno-error=deprecated" qmk flash -kb crkdb/rev1 -km bbaserdem -bl dfu-util-split-{left,right}`
diff --git a/layouts/community/split_3x6_3/bbaserdem/rules.mk b/layouts/community/split_3x6_3/bbaserdem/rules.mk
deleted file mode 100644
index 09619936da..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/rules.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Corne keyboard; with ARM
-ifneq (,$(findstring crkbd/rev1,$(KEYBOARD)))
-    # Proton C conversion
-    MCU = STM32F303
-    CTPC = yes
-    # BOARD  = QMK_PROTON_C
-    # BOOTLOADER = stm32-dfu
-    # My usual features
-    AUDIO_ENABLE = yes
-    BACKLIGHT_ENABLE = no
-    ENCODER_ENABLE = yes
-    RGB_MATRIX_ENABLE = yes
-    OLED_ENABLE = yes
-    # Features that take otherwise too much space
-    WPM_ENABLE = yes
-    NKRO_ENABLE = yes
-    # Config
-    SERIAL_DRIVER = usart
-    WS2812_DRIVER = pwm
-    AUDIO_DRIVER = dac_basic
-    SPLIT_KEYBOARD = yes
-    # These are from waffle
-    DEBUG_MATRIX_SCAN_RATE_ENABLE = no # output matrix scan rate in qmk console/qmk toolbox
-    QUANTUM_LIB_SRC += i2c_master.c #drivers/chibios/i2cmaster.h needs patch - see lines 27/28
-    VIA_ENABLE = no
-    # COMMAND_ENABLE = no
-    # CONSOLE_ENABLE = no
-    # BOOTMAGIC_ENABLE = lite
-    # LTO_ENABLE = yes
-    # PIMORONI_TRACKBALL = no
-endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/ssd1306.c b/layouts/community/split_3x6_3/bbaserdem/ssd1306.c
deleted file mode 100644
index 4983248555..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/ssd1306.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
diff --git a/users/bbaserdem/.gitignore b/users/bbaserdem/.gitignore
deleted file mode 100644
index 57bd0e43b4..0000000000
--- a/users/bbaserdem/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/secrets.h
-/secrets.c
diff --git a/users/bbaserdem/bb-audio.c b/users/bbaserdem/bb-audio.c
deleted file mode 100644
index eef0cdf2f6..0000000000
--- a/users/bbaserdem/bb-audio.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "bb-audio.h"
-/* AUDIO
- * This contains some audio related stuff.
- * There is no need to wrap this up with preprocessor commands;
- * This is only called if audio is enabled
- */
-
-float tone_game_intro[][2] = GAME_ON_SONG;
-float tone_game_outro[][2] = GAME_OFF_SONG;
-
-// Audio playing when layer changes
-layer_state_t layer_state_set_audio(layer_state_t state) {
-    // Get this layer
-    static bool prev_game = false;
-
-    // If entering the game layer; play the intro sound
-    if (layer_state_cmp(state, _GAME) && (!prev_game)) {
-        stop_all_notes();
-        PLAY_SONG(tone_game_intro);
-        prev_game = true;
-    }
-    // If exiting the game layer; play the outro sound
-    if ((!layer_state_cmp(state, _GAME)) && prev_game) {
-        stop_all_notes();
-        PLAY_SONG(tone_game_outro);
-        prev_game = false;
-    }
-    return state;
-}
-
-// Audio layer switch; add the music layer on top of this
-bool process_record_audio(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case MU_TOG:
-            if (!record->event.pressed) {
-                // On release, exit music mode if enabled
-                if (layer_state_is(_MUSI)) {
-                    layer_off(_MUSI);
-                // If not enabled; turn off all layers and load music layer
-                } else {
-                    layer_clear();
-                    layer_on(_MUSI);
-                }
-            }
-            return true;
-            break;
-        case MU_ON:
-            if (!record->event.pressed) {
-                // On release, enter music mode
-                layer_clear();
-                layer_on(_MUSI);
-            }
-            return true;
-            break;
-        case MU_OFF:
-            if (!record->event.pressed) {
-                // On release, exit music mode
-                layer_off(_MUSI);
-            }
-            return true;
-            break;
-    }
-    return true;
-}
diff --git a/users/bbaserdem/bb-audio.h b/users/bbaserdem/bb-audio.h
deleted file mode 100644
index 351061ab9a..0000000000
--- a/users/bbaserdem/bb-audio.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-/* AUDIO
- * Some functions to hook to some modes
- */
-
-// Hook to layer change effects
-layer_state_t layer_state_set_audio(layer_state_t state);
-
-// Hook to audio keycodes
-bool process_record_audio(uint16_t keycode, keyrecord_t *record);
diff --git a/users/bbaserdem/bb-backlight.c b/users/bbaserdem/bb-backlight.c
deleted file mode 100644
index 5eca1f2c11..0000000000
--- a/users/bbaserdem/bb-backlight.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bb-backlight.h"
-/* Replaced functions with noeeprom varieties; I don't need retention across
- * booting.
- */
-
-// Backlight LEDs
-void keyboard_post_init_backlight(void) {
-    backlight_enable();
-    backlight_level(2);
-#   ifdef BACKLIGHT_BREATHING
-    breathing_enable();
-#   endif // BACKLIGHT_BREATHING
-}
diff --git a/users/bbaserdem/bb-backlight.h b/users/bbaserdem/bb-backlight.h
deleted file mode 100644
index 3af3137d9a..0000000000
--- a/users/bbaserdem/bb-backlight.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-/* Hooks for backlight definitions
- */
-
-void keyboard_post_init_backlight(void);
diff --git a/users/bbaserdem/bb-encoder.c b/users/bbaserdem/bb-encoder.c
deleted file mode 100644
index eea9751051..0000000000
--- a/users/bbaserdem/bb-encoder.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bb-encoder.h"
-
-// Need this to call velocikey activation
-#ifdef VELOCIKEY_ENABLE
-#   include "velocikey.h"
-#endif // VELOCIKEY_ENABLE
-// Need memcpy and memcmp from string.h along with transfer stuff
-#ifdef OLED_ENABLE
-#   include <string.h>
-#endif // OLED_ENABLE
-
-/* ROTARY ENCODER
- * This contains my general rotary encoder code
- * Encoders each have a list of different modes they can be in.
- * Each mode also have an on click action as well.
- * Modes can be cycled using either shift-click or ctrl-click
- * Modes can be reset using OS click
- * Some modes are only accessible through some keymap layers
- */
-
-// Default state for the encoders
-void reset_encoder_state(void) {
-    userspace_config.e0base = 0;
-    userspace_config.e0point = 0;
-    userspace_config.e0rgb = 0;
-    userspace_config.e1base = 1;
-    userspace_config.e1point = 1;
-    userspace_config.e1rgb = 1;
-}
-
-// Encoder scroll functionality
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    uint8_t this_number;
-    // Differentiate layer roles
-    switch (get_highest_layer(layer_state)) {
-#       ifdef RGB_MATRIX_ENABLE
-        case _MEDI:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0rgb;
-            } else if (index == 1) {
-                this_number = userspace_config.e1rgb;
-            } else {
-                this_number = 128;
-            }
-            switch(this_number) {
-                case 0: // Effect the RGB mode
-                    if (clockwise) {
-                        rgb_matrix_step_noeeprom();
-                    } else {
-                        rgb_matrix_step_reverse_noeeprom();
-                    }
-                    break;
-                case 1: // Effect the RGB hue
-                    if (clockwise) {
-                        rgb_matrix_increase_hue_noeeprom();
-                    } else {
-                        rgb_matrix_decrease_hue_noeeprom();
-                    }
-                    break;
-                case 2: // Effect the RGB saturation
-                    if (clockwise) {
-                        rgb_matrix_increase_sat_noeeprom();
-                    } else {
-                        rgb_matrix_decrease_sat_noeeprom();
-                    }
-                    break;
-                case 3: // Effect the RGB brightness
-                    if (clockwise) {
-                        rgb_matrix_increase_val_noeeprom();
-                    } else {
-                        rgb_matrix_decrease_val_noeeprom();
-                    }
-                    break;
-                case 4: // Effect the RGB effect speed
-                    if (clockwise) {
-                        rgb_matrix_increase_speed_noeeprom();
-                    } else {
-                        rgb_matrix_decrease_speed_noeeprom();
-                    }
-                    break;
-            }
-            break;
-#       endif // RGB_MATRIX_ENABLE
-#       ifdef MOUSEKEY_ENABLE
-        case _MOUS:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0point;
-            } else if (index == 1) {
-                this_number = userspace_config.e1point;
-            } else {
-                this_number = 128;
-            }
-            switch(this_number) {
-                case 0: // Move mouse on horizontal axis
-                    if (clockwise) {
-                        tap_code(KC_MS_R);
-                    } else {
-                        tap_code(KC_MS_L);
-                    }
-                    break;
-                case 1: // Move mouse on vertical axis
-                    if (clockwise) {
-                        tap_code(KC_MS_D);
-                    } else {
-                        tap_code(KC_MS_U);
-                    }
-                    break;
-                case 2: // Move mouse wheel on vertical axis
-                    if (clockwise) {
-                        tap_code(KC_WH_D);
-                    } else {
-                        tap_code(KC_WH_U);
-                    }
-                    break;
-                case 3: // Move mouse on horizontal axis
-                    if (clockwise) {
-                        tap_code(KC_WH_R);
-                    } else {
-                        tap_code(KC_WH_L);
-                    }
-                    break;
-            }
-            break;
-#       endif // MOUSEKEY_ENABLE
-        default:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0base;
-            } else if (index == 1) {
-                this_number = userspace_config.e1base;
-            } else {
-                this_number = 128;
-            }
-            switch(this_number) {
-                case 0: // Volume
-                    if (clockwise) {
-                        tap_code16(KC_VOLU);
-                    } else {
-                        tap_code16(KC_VOLD);
-                    }
-                    break;
-                case 1: // Song change
-                    if (clockwise) {
-                        tap_code16(KC_MNXT);
-                    } else {
-                        tap_code16(KC_MPRV);
-                    }
-                    break;
-                case 2: // Move to audio sink
-                    if (clockwise) {
-                        tap_code16(KC_F13);
-                    } else {
-                        tap_code16(S(KC_F13));
-                    }
-                    break;
-                case 3: // Volume of source
-                    if (clockwise) {
-                        tap_code16(S(KC_VOLU));
-                    } else {
-                        tap_code16(C(KC_VOLD));
-                    }
-                    break;
-                case 4: // Move to audio source
-                    if (clockwise) {
-                        tap_code16(C(KC_F13));
-                    } else {
-                        tap_code16(C(S(KC_F13)));
-                    }
-                    break;
-                case 5: // Left-right
-                    if (clockwise) {
-                        tap_code16(KC_RGHT);
-                    } else {
-                        tap_code16(KC_LEFT);
-                    }
-                    break;
-                case 6: // Up-down
-                    if (clockwise) {
-                        tap_code16(KC_DOWN);
-                    } else {
-                        tap_code16(KC_UP);
-                    }
-                    break;
-                case 7: // Page Up-down
-                    if (clockwise) {
-                        tap_code16(KC_PGDN);
-                    } else {
-                        tap_code16(KC_PGUP);
-                    }
-                    break;
-                case 8: // Delete 
-                    if (clockwise) {
-                        tap_code16(KC_DEL);
-                    } else {
-                        tap_code16(KC_BSPC);
-                    }
-                    break;
-            }
-            break;
-    }
-    return false;
-}
-
-void encoder_click_action(uint8_t index) {
-    uint8_t this_number;
-    // Differentiate layer roles
-    switch (get_highest_layer(layer_state)) {
-#       ifdef RGB_MATRIX_ENABLE
-        case _MEDI:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0rgb;
-            } else if (index == 1) {
-                this_number = userspace_config.e1rgb;
-            } else {
-                this_number = 128;
-            }
-            switch(this_number) {
-                case 0: // Return to no animation
-                    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-                    break;
-                case 1:
-                case 2:
-                case 3: // Toggle
-                    rgb_matrix_increase_val_noeeprom();
-                    break;
-                case 4: // Toggle velocikey
-#                   ifdef VELOCIKEY_ENABLE
-                    velocikey_toggle();
-#                   endif // VELOCIKEY_ENABLE
-                    break;
-            }
-            break;
-#       endif // RGB_MATRIX_ENABLE
-#       ifdef MOUSEKEY_ENABLE
-        case _MOUS:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0point;
-            } else if (index == 1) {
-                this_number = userspace_config.e1point;
-            } else {
-                this_number = 128;
-            }
-            switch(this_number) {
-                case 0: // Left click
-                    tap_code16(KC_BTN1);
-                    break;
-                case 1: // Right click
-                    tap_code16(KC_BTN2);
-                    break;
-                case 2:
-                case 3: // Middle click
-                    tap_code16(KC_BTN2);
-                    break;
-            }
-            break;
-#       endif // MOUSEKEY_ENABLE
-        default:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0base;
-            } else if (index == 1) {
-                this_number = userspace_config.e1base;
-            } else {
-                this_number = 128;
-            }
-            switch(this_number) {
-                case 0: // Toggle mute
-                case 2:
-                    tap_code16(KC_MUTE);
-                    break;
-                case 1: // Pause
-                    tap_code16(KC_MPLY);
-                    break;
-                case 3: // Mute source
-                case 4:
-                    tap_code16(A(KC_MUTE));
-                    break;
-                case 5: // Insert
-                    tap_code16(KC_INS);
-                    break;
-                case 6: // Capslock
-                    tap_code16(KC_CAPS);
-                    break;
-                case 7: // Redo
-                    tap_code16(BB_REDO);
-                    break;
-                case 8: // Undo
-                    tap_code16(BB_UNDO);
-                    break;
-            }
-            break;
-    }
-}
-
-bool process_record_encoder(uint16_t keycode, keyrecord_t *record) {
-    // Check if and which encoder
-    int encoder_index = -1;
-    
-    // Get the pressed encoder
-    switch (keycode) {
-        case BB_ENC0:
-            encoder_index = 0;
-            break;
-        case BB_ENC1:
-            encoder_index = 1;
-            break;
-    }
-
-    // Activate encoder function of button
-    if ((encoder_index >= 0) & (!record->event.pressed)) {
-        // If shifted, move mode one point forward
-        if (get_mods() & MOD_MASK_SHIFT) {
-            switch (get_highest_layer(layer_state)) {
-#               ifdef RGB_MATRIX_ENABLE
-                case _MEDI:
-                    if (encoder_index == 0) {
-                        userspace_config.e0rgb = (userspace_config.e0rgb + 1) % 5;
-                    } else {
-                        userspace_config.e1rgb = (userspace_config.e1rgb + 1) % 5;
-                    }
-                    break;
-#               endif // RGB_MATRIX_ENABLE
-#               ifdef MOUSEKEY_ENABLE
-                case _MOUS:
-                    if (encoder_index == 0) {
-                        userspace_config.e0point = (userspace_config.e0point + 1) % 4;
-                    } else {
-                        userspace_config.e1point = (userspace_config.e1point + 1) % 4;
-                    }
-                    break;
-#               endif // MOUSEKEY_ENABLE
-                default:
-                    if (encoder_index == 0) {
-                        userspace_config.e0base = (userspace_config.e0base + 1) % 9;
-                    } else {
-                        userspace_config.e1base = (userspace_config.e1base + 1) % 9;
-                    }
-                    break;
-            }
-        // If ctrl is active, move mode one point backwards
-        } else if (get_mods() & MOD_MASK_CTRL) {
-            switch (get_highest_layer(layer_state)) {
-#               ifdef RGB_MATRIX_ENABLE
-                case _MEDI:
-                    if (encoder_index == 0) {
-                        userspace_config.e0rgb = (userspace_config.e0rgb + 5 - 1) % 5;
-                    } else {
-                        userspace_config.e1rgb = (userspace_config.e1rgb + 5 - 1) % 5;
-                    }
-                    break;
-#               endif // RGB_MATRIX_ENABLE
-#               ifdef MOUSEKEY_ENABLE
-                case _MOUS:
-                    if (encoder_index == 0) {
-                        userspace_config.e0point = (userspace_config.e0point + 4 - 1) % 4;
-                    } else {
-                        userspace_config.e1point = (userspace_config.e1point + 4 - 1) % 4;
-                    }
-                    break;
-#               endif // MOUSEKEY_ENABLE
-                default:
-                    if (encoder_index == 0) {
-                        userspace_config.e0base = (userspace_config.e0base + 9 - 1) % 9;
-                    } else {
-                        userspace_config.e1base = (userspace_config.e1base + 9 - 1) % 9;
-                    }
-                    break;
-            }
-        // If meta is active, reset the encoder states
-        } else if (get_mods() & MOD_MASK_GUI) {
-            reset_encoder_state();
-            eeconfig_update_user(userspace_config.raw);
-        // If nothing else; just perform the click action
-        } else {
-            encoder_click_action(encoder_index);
-        }
-    }
-    return true;
-}
-
-// For printing status to OLED
-#ifdef OLED_ENABLE
-void encoder_state_string(uint8_t index, uint8_t layer, char* buffer) {
-    uint8_t this_number;
-    // Get the layer straight from the main function
-    switch (layer) {
-        // If RGB control mode is enabled
-#       ifdef RGB_MATRIX_ENABLE
-        case _MEDI:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0rgb;
-            } else if (index == 1) {
-                this_number = userspace_config.e1rgb;
-            } else {
-                this_number = 128;
-            }
-            switch (this_number) {
-                case 0:
-                    strcpy(buffer, "ani mode");
-                    break;
-                case 1:
-                    strcpy(buffer, "hue     ");
-                    break;
-                case 2:
-                    strcpy(buffer, "saturat.");
-                    break;
-                case 3:
-                    strcpy(buffer, "bright. ");
-                    break;
-                case 4:
-                    strcpy(buffer, "ani. spd");
-                    break;
-                default:
-                    strcpy(buffer, " -N/A-  ");
-                    break;
-            }
-            break;
-#       endif // RGB_MATRIX_ENABLE
-        // If pointer control is enabled
-#       ifdef MOUSEKEY_ENABLE
-        case _MOUS:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0point;
-            } else if (index == 1) {
-                this_number = userspace_config.e1point;
-            } else {
-                this_number = 128;
-            }
-            switch (this_number) {
-                case 0:
-                    strcpy(buffer, "Lateral ");
-                    break;
-                case 1:
-                    strcpy(buffer, "Vertical");
-                    break;
-                case 2:
-                    strcpy(buffer, "Scr. Ver");
-                    break;
-                case 3:
-                    strcpy(buffer, "Scr. Lat");
-                    break;
-                default:
-                    strcpy(buffer, " -N/A-  ");
-                    break;
-            }
-            break;
-#       endif // MOUSEKEY_ENABLE
-        default:
-            // Get correct index
-            if (index == 0) {
-                this_number = userspace_config.e0base;
-            } else if (index == 1) {
-                this_number = userspace_config.e1base;
-            } else {
-                this_number = 128;
-            }
-            switch (this_number) {
-                case 0:
-                    strcpy(buffer, "Volume  ");
-                    break;
-                case 1:
-                    strcpy(buffer, "Song    ");
-                    break;
-                case 2:
-                    strcpy(buffer, "Sink    ");
-                    break;
-                case 3:
-                    strcpy(buffer, "Src. Vol");
-                    break;
-                case 4:
-                    strcpy(buffer, "Source  ");
-                    break;
-                case 5:
-                    strcpy(buffer, "Arrow LR");
-                    break;
-                case 6:
-                    strcpy(buffer, "Arrow UD");
-                    break;
-                case 7:
-                    strcpy(buffer, "Page U/D");
-                    break;
-                case 8:
-                    strcpy(buffer, "Erase   ");
-                    break;
-                default:
-                    strcpy(buffer, " -N/A-  ");
-                    break;
-            }
-            break;
-    }
-}
-#endif // OLED_ENABLE
diff --git a/users/bbaserdem/bb-encoder.h b/users/bbaserdem/bb-encoder.h
deleted file mode 100644
index dce08cd3d5..0000000000
--- a/users/bbaserdem/bb-encoder.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-// Hook to encoder stuff
-bool encoder_update_user(uint8_t index, bool clockwise);
-// Complicated code for what the encoder keys do when pressed
-bool process_record_encoder(uint16_t keycode, keyrecord_t *record);
-// Clear the encoder settings
-void reset_encoder_state(void);
-// This is so that encoder state is synched between two halves
-void housekeeping_task_encoder(void);
-// This is purely for oled; should it want to use it
-void encoder_state_string(uint8_t index, uint8_t layer, char* buffer);
diff --git a/users/bbaserdem/bb-macro.c b/users/bbaserdem/bb-macro.c
deleted file mode 100644
index 6a722e6db1..0000000000
--- a/users/bbaserdem/bb-macro.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bb-macro.h"
-
-/* MACRO Definitions
- * This file has my macros/unicodes
- * Hooks for other functionality to inject itself into the process_record
- */
-
-// Tap dance definitons
-#ifdef AUDIO_ENABLE
-#ifdef TAP_DANCE_ENABLE
-qk_tap_dance_action_t tap_dance_actions[] = {
-    // Music playback speed modulator
-    [TD_AUDIO_TEMPO] = ACTION_TAP_DANCE_DOUBLE(MU_SLOW, MU_FAST),
-};
-#endif // AUDIO_ENABLE
-#endif // TAP_DANCE_ENABLE
-
-// Unicode definitions; for single character keys
-//  We mask their definitions if unicode is not enabled
-#ifdef UNICODEMAP_ENABLE
-const uint32_t PROGMEM unicode_map[] = {
-    [UPC_A_CIRC]  = 0x00C2, [LOW_A_CIRC]  = 0x00E2, // Â â
-    [UPC_C_CEDI]  = 0x00C7, [LOW_C_CEDI]  = 0x00E7, // Ç ç
-    [UPC_G_BREV]  = 0x011E, [LOW_G_BREV]  = 0x001F, // Ğ ğ
-    [UPC_I_CIRC]  = 0x00CE, [LOW_I_CIRC]  = 0x00EE, // Î î
-    [UPC_I_DOTL]  = 0x0049, [LOW_I_DOTL]  = 0x0131, // I ı
-    [UPC_I_DOTT]  = 0x0130, [LOW_I_DOTT]  = 0x0069, // İ i
-    [UPC_O_DIAE]  = 0x00D6, [LOW_O_DIAE]  = 0x00F6, // Ö ö
-    [UPC_S_CEDI]  = 0x015E, [LOW_S_CEDI]  = 0x015F, // Ş ş
-    [UPC_U_CIRC]  = 0x00DB, [LOW_U_CIRC]  = 0x00FB, // Û û
-    [UPC_U_DIAE]  = 0x00DC, [LOW_U_DIAE]  = 0x00FC, // Ü ü
-    [UPC_ALPHA]   = 0x0391, [LOW_ALPHA]   = 0x03B1, // Α α
-    [UPC_BETA]    = 0x0392, [LOW_BETA]    = 0x03B2, // Β β
-    [UPC_GAMMA]   = 0x0393, [LOW_GAMMA]   = 0x03B3, // Γ γ
-    [UPC_DELTA]   = 0x0394, [LOW_DELTA]   = 0x03B4, // Δ δ
-    [UPC_EPSILON] = 0x0395, [LOW_EPSILON] = 0x03B5, // Ε ε
-    [UPC_ZETA]    = 0x0396, [LOW_ZETA]    = 0x03B6, // Ζ ζ
-    [UPC_ETA]     = 0x0397, [LOW_ETA]     = 0x03B7, // Η η
-    [UPC_THETA]   = 0x0398, [LOW_THETA]   = 0x03B8, // Θ θ
-    [UPC_IOTA]    = 0x0399, [LOW_IOTA]    = 0x03B9, // Ι ι
-    [UPC_KAPPA]   = 0x039A, [LOW_KAPPA]   = 0x03BA, // Κ κ
-    [UPC_LAMBDA]  = 0x039B, [LOW_LAMBDA]  = 0x03BB, // Λ λ
-    [UPC_MU]      = 0x039C, [LOW_MU]      = 0x03BC, // Μ μ
-    [UPC_NU]      = 0x039D, [LOW_NU]      = 0x03BD, // Ν ν
-    [UPC_XI]      = 0x039E, [LOW_XI]      = 0x03BE, // Ξ ξ
-    [UPC_OMICRON] = 0x039F, [LOW_OMICRON] = 0x03BF, // Ο ο
-    [UPC_PI]      = 0x03A0, [LOW_PI]      = 0x03C0, // Π π
-    [UPC_RHO]     = 0x03A1, [LOW_RHO]     = 0x03C1, // Ρ ρ
-    [UPC_SIGMA]   = 0x03A3, [LOW_SIGMA]   = 0x03C3, // Σ σ
-    [UPC_TAU]     = 0x03A4, [LOW_TAU]     = 0x03C4, // Τ τ
-    [UPC_UPSILON] = 0x03A5, [LOW_UPSILON] = 0x03C5, // Υ υ
-    [UPC_PHI]     = 0x03A6, [LOW_PHI]     = 0x03C6, // Φ φ
-    [UPC_CHI]     = 0x03A7, [LOW_CHI]     = 0x03C7, // Χ χ
-    [UPC_PSI]     = 0x03A8, [LOW_PSI]     = 0x03C8, // Ψ ψ
-    [UPC_OMEGA]   = 0x03A9, [LOW_OMEGA]   = 0x03C9, // Ω ω
-    [ELLIPSIS]    = 0x2026,  // …
-    [PLANCK_CON]  = 0x210F,  // ℏ
-    [ANGSTROM]    = 0x212B,  // Å
-    [BITCOIN]     = 0x20BF   // ₿
-};
-#endif // UNICODEMAP_ENABLE
-
-// Keycodes
-bool process_record_macro(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // AltGr + Caps should change the oled layout variable
-        case KC_CAPS_LOCK:
-            if (record->event.pressed) {
-                if (get_mods() & MOD_BIT(KC_RALT)) {
-                    userspace_config.layout = (userspace_config.layout + 1) % 3;
-                }
-            }
-            return true;
-            break;
-        case BB_OLED:
-            if (record->event.pressed) {
-                if (get_mods() & MOD_MASK_SHIFT) {
-                    // Scroll in opposite direction 
-                    userspace_config.layout = (userspace_config.layout + 4) % 3;
-                } else {
-                    userspace_config.layout = (userspace_config.layout + 1) % 3;
-                }
-            }
-            return false;
-            break;
-        // Plain macros
-        case BB_PGPK:
-            // My public PGP key
-            if (record->event.pressed) {
-                SEND_STRING("0B7151C823559DD8A7A04CE36426139E2F4C6CCE");
-            }
-            return false; break;
-        case DBL_ANG:
-            // Double angular bracket
-            if (record->event.pressed) {
-                SEND_STRING("<>"SS_TAP(X_LEFT));
-            }
-            return false; break;
-        case DBL_PAR:
-            // Double paranthesis
-            if (record->event.pressed) {
-                SEND_STRING("()"SS_TAP(X_LEFT));
-            }
-            return false; break;
-        case DBL_BRC:
-            // Double square brackets
-            if (record->event.pressed) {
-                SEND_STRING("[]"SS_TAP(X_LEFT));
-            }
-            return false; break;
-        case DBL_CBR:
-            // Double curly brackets
-            if (record->event.pressed) {
-                SEND_STRING("{}"SS_TAP(X_LEFT));
-            }
-            return false; break;
-        // Unicode macros
-#       ifdef UNICODEMAP_ENABLE
-        case TR_FLAG:
-            // Turkish flag
-            if (record->event.pressed) {
-                send_unicode_string("🇹🇷");
-            }
-            return false; break;
-        case BB_LENY:
-            // Lenny face: ( ͡° ͜ʖ ͡°)
-            if (record->event.pressed) {
-                send_unicode_string("( ͡° ͜ʖ ͡°)");
-            }
-            return false; break;
-        case BB_TABL:
-            // Table flip: ┻━┻︵ \(°□°)/ ︵ ┻━┻
-            if (record->event.pressed) {
-                send_unicode_string("┻━┻︵ \\(°□°)/ ︵ ┻━┻");
-            }
-            return false; break;
-#       endif // UNICODEMAP_ENABLE
-    }
-    return true;
-}
diff --git a/users/bbaserdem/bb-macro.h b/users/bbaserdem/bb-macro.h
deleted file mode 100644
index 3dc14e7a8a..0000000000
--- a/users/bbaserdem/bb-macro.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-/* This header file contains definitons regarding custom keycodes.
- * - Both regular and unicode macros are dealt with in this file
- */
-
-// These will be delegated to keymap specific stuff (weak definition)
-bool process_record_macro(uint16_t keycode, keyrecord_t *record);
-
-// Unicodemap implementation
-#ifdef UNICODEMAP_ENABLE
-enum userspace_unicodemap {
-    UPC_A_CIRC,
-    UPC_C_CEDI,
-    UPC_G_BREV,
-    UPC_I_CIRC,
-    UPC_I_DOTL,
-    UPC_I_DOTT,
-    UPC_O_DIAE,
-    UPC_S_CEDI,
-    UPC_U_CIRC,
-    UPC_U_DIAE,
-    LOW_A_CIRC,
-    LOW_C_CEDI,
-    LOW_G_BREV,
-    LOW_I_CIRC,
-    LOW_I_DOTL,
-    LOW_I_DOTT,
-    LOW_O_DIAE,
-    LOW_S_CEDI,
-    LOW_U_CIRC,
-    LOW_U_DIAE,
-    ELLIPSIS,
-    PLANCK_CON,
-    ANGSTROM,
-    MATHPI,
-    BITCOIN,
-    UPC_ALPHA,
-    UPC_BETA,
-    UPC_GAMMA,
-    UPC_DELTA,
-    UPC_EPSILON,
-    UPC_ZETA,
-    UPC_ETA,
-    UPC_THETA,
-    UPC_IOTA,
-    UPC_KAPPA,
-    UPC_LAMBDA,
-    UPC_MU,
-    UPC_NU,
-    UPC_XI,
-    UPC_OMICRON,
-    UPC_PI,
-    UPC_RHO,
-    UPC_SIGMA,
-    UPC_TAU,
-    UPC_UPSILON,
-    UPC_PHI,
-    UPC_CHI,
-    UPC_PSI,
-    UPC_OMEGA,
-    LOW_ALPHA,
-    LOW_BETA,
-    LOW_GAMMA,
-    LOW_DELTA,
-    LOW_EPSILON,
-    LOW_ZETA,
-    LOW_ETA,
-    LOW_THETA,
-    LOW_IOTA,
-    LOW_KAPPA,
-    LOW_LAMBDA,
-    LOW_MU,
-    LOW_NU,
-    LOW_XI,
-    LOW_OMICRON,
-    LOW_PI,
-    LOW_RHO,
-    LOW_SIGMA,
-    LOW_TAU,
-    LOW_UPSILON,
-    LOW_PHI,
-    LOW_CHI,
-    LOW_PSI,
-    LOW_OMEGA,
-};
-#endif // UNICODEMAP_ENABLE
-
-// Tap dance stuff
-#ifdef AUDIO_ENABLE
-#ifdef TAP_DANCE_ENABLE
-enum {
-    TD_AUDIO_TEMPO,
-};
-#endif // AUDIO_ENABLE
-#endif // TAP_DANCE_ENABLE
diff --git a/users/bbaserdem/bb-oled-extra.c b/users/bbaserdem/bb-oled-extra.c
deleted file mode 100644
index b52c4b335a..0000000000
--- a/users/bbaserdem/bb-oled-extra.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bb-oled.h"
-#include "bb-oled-extra.h"
-
-// Helper function that draws images
-void draw_image(uint8_t row, uint8_t col, const char image[4][42]) {
-    // Draw this image iteratively
-    for (int i = 0; i < 4; i++) {
-        oled_set_cursor(col, row + i);
-        oled_write_raw_P(image[i], 42);
-    }
-}
-
-// Write modifiers to the screen
-void render_modifiers(uint8_t row, uint8_t col, uint8_t mods) {
-    static const char PROGMEM mod_meta[12] = {0x00,0x01,0x01,0x01,0x01,0x06,0x18,0x60,0x81,0x81,0x81,0x81};
-    static const char PROGMEM mod_altL[12] = {0x00,0x80,0x80,0x80,0x40,0x20,0x10,0x08,0x84,0x95,0x8e,0x84};
-    static const char PROGMEM mod_altR[12] = {0x00,0x86,0x8f,0x8f,0x46,0x20,0x10,0x08,0x84,0x95,0x8e,0x84};
-    static const char PROGMEM mod_ctrl[12] = {0x00,0x00,0xbd,0x42,0xa5,0x99,0x99,0xa5,0x42,0xbd,0x00,0x00};
-    static const char PROGMEM mod_shft[12] = {0x00,0x20,0x30,0x28,0xe4,0x02,0x01,0x02,0xe4,0x28,0x30,0x20};
-    // Looks like Mods: <OS> <Alt/Gr> <Ctrl> <Shift>
-    oled_set_cursor(col, row);
-    oled_write("Mods: ", false);
-    // Meta
-    if (mods & MOD_MASK_GUI) {
-        oled_write_raw_P(mod_meta, 12);
-        oled_set_cursor(col + 8, row);
-    } else {
-        oled_write("  ", false);
-    }
-    // Alt(Gr)
-    if (mods & MOD_BIT(KC_RALT)) {
-        oled_write_raw_P(mod_altR, 12);
-        oled_set_cursor(col + 10, row);
-    } else if (mods & MOD_MASK_ALT) {
-        oled_write_raw_P(mod_altL, 12);
-        oled_set_cursor(col + 10, row);
-    } else {
-        oled_write("  ", false);
-    }
-    // Ctrl
-    if (mods & MOD_MASK_CTRL) {
-        oled_write_raw_P(mod_ctrl, 12);
-        oled_set_cursor(col + 12, row);
-    } else {
-        oled_write("  ", false);
-    }
-    // Shift
-    if (mods & MOD_MASK_SHIFT) {
-        oled_write_raw_P(mod_shft, 12);
-        oled_set_cursor(col + 14, row);
-    } else {
-        oled_write("  ", false);
-    }
-}
-
-// Draws the image of the currently used layout
-void render_layout(uint8_t row, uint8_t col, uint8_t mods, bool isLeft) {
-    // DVORAK
-    static const char PROGMEM base0_L_dvor_nomod[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x04,0x08,0x10,0x00,0x00,0x00,
-            0x00,0x0e,0x00,0x00,0x00,0x00,0x60,0xe0,0x00,0x00,0x00,0x00,0xc0,0xc0,
-            0x00,0x00,0x00,0xf8,0x90,0x88,0x88,0x70,0x00,0x78,0x80,0x80,0x40,0xf8
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x80,0x60,0x18,0x00,0x00,
-            0x40,0x40,0x40,0x80,0x00,0x80,0x41,0x40,0x40,0x80,0x00,0x80,0x40,0x40,
-            0x40,0x80,0x00,0xc3,0x00,0x00,0x00,0xc0,0x00,0x00,0x42,0xd2,0x02,0x01
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0xd8,0x06,0x01,0x00,0x00,0x00,0x02,
-            0x05,0x05,0x05,0x07,0x00,0x03,0x04,0x04,0x04,0x03,0x00,0x03,0x05,0x05,
-            0x85,0x05,0x00,0xc3,0x04,0x04,0x02,0x07,0x00,0x00,0x00,0x07,0x04,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x03,0x0c,0x30,0xc0,0x00,0x00,
-            0xb6,0x76,0x00,0x00,0x00,0x1c,0x22,0x22,0x12,0xfe,0x00,0x00,0x80,0x82,
-            0x7e,0x00,0x00,0x3f,0x08,0x0c,0x12,0x20,0x00,0x22,0x14,0x08,0x14,0x22}};
-    static const char PROGMEM base0_L_dvor_shift[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x20,0x10,0x20,0x40,0x20,0x00,0x00,
-            0x07,0x00,0x07,0x00,0x00,0x10,0x28,0x44,0x82,0x00,0x00,0x82,0x44,0x28,
-            0x10,0x00,0x00,0xfe,0x12,0x12,0x12,0x0c,0x00,0x06,0x08,0xf0,0x08,0x06
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xe0,
-            0x90,0x90,0x90,0xe0,0x00,0xe0,0x10,0x10,0x10,0xe0,0x00,0xf0,0x90,0x90,
-            0x90,0x10,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x10,0xf0,0x10,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x80,0x87,0x80,0x00,0x00,0x07,
-            0x00,0x00,0x00,0x07,0x00,0x03,0x84,0x84,0x84,0x03,0x00,0x07,0x04,0x04,
-            0x04,0x84,0x00,0x83,0x04,0x04,0x04,0x83,0x00,0x80,0x04,0x07,0x04,0x80
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x01,0x00,0x28,0x04,0x03,0x00,0x00,
-            0x36,0x36,0x00,0x00,0x00,0x1f,0x20,0x28,0x10,0x6f,0x00,0x18,0x20,0x20,
-            0x20,0x1f,0x00,0x3f,0x04,0x0a,0x11,0x20,0x00,0x31,0x0a,0x04,0x0a,0x31}};
-    static const char PROGMEM base0_R_dvor_nomod[4][42] = {
-        {   0x00,0xfc,0x12,0x12,0x00,0x00,0x70,0x88,0x88,0x48,0xf8,0x00,0x70,0x88,
-            0x88,0x88,0x88,0x00,0xf8,0x10,0x08,0x08,0x10,0x00,0x00,0x02,0x7e,0x80,
-            0x80,0x00,0x10,0x28,0x44,0x82,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x00,0x80,0x80,0x80,0xf0,0x00,0xf0,0x02,0x82,0x82,0x01,0x00,0x00,0x80,
-            0xf0,0x80,0x80,0x00,0xc0,0x40,0x40,0x40,0x80,0x00,0x80,0x40,0x40,0x40,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x83,0x04,0x04,0x02,0x07,0x00,0x07,0x01,0x00,0x00,0x07,0x00,0x00,0x00,
-            0x03,0x04,0x04,0x00,0x07,0x00,0x00,0x00,0x07,0x00,0x04,0x05,0x05,0x05,
-            0x02,0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x3f,0x24,0x22,0x22,0x1c,0x00,0x3e,0x02,0x3e,0x02,0x3c,0x00,0x1e,0x20,
-            0x1c,0x20,0x1e,0x00,0x06,0x18,0x20,0x18,0x06,0x00,0x22,0x32,0x2a,0x26,
-            0x22,0x00,0x14,0x14,0x14,0x14,0x14,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM base0_R_dvor_shift[4][42] = {
-        {   0xfe,0x12,0x12,0x12,0x02,0x00,0xfc,0x02,0x12,0x12,0xf4,0x00,0xfc,0x02,
-            0x02,0x02,0x84,0x00,0xfe,0x12,0x12,0x32,0xcc,0x00,0xfe,0x00,0x00,0x00,
-            0x00,0x00,0x04,0x88,0x50,0x20,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0xf1,0x10,0x10,0x10,0xe0,0x00,0xf0,0x81,0x81,0x81,0xf0,0x00,0x10,0x11,
-            0xf1,0x11,0x10,0x00,0xf1,0x60,0x80,0x00,0xf1,0x00,0x61,0x91,0x91,0x91,
-            0x21,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x8f,0x88,0x88,0x88,0x07,0x00,0x8f,0x00,0x00,0x00,0x8f,0x00,0x80,0x00,
-            0x0f,0x00,0x80,0x00,0x8f,0x00,0x01,0x06,0x8f,0x00,0x84,0x88,0x88,0x88,
-            0x87,0x00,0x08,0x08,0x08,0x08,0x08,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x7f,0x44,0x44,0x44,0x3b,0x00,0x7f,0x01,0x06,0x01,0x7f,0x00,0x1f,0x60,
-            0x1c,0x60,0x1f,0x00,0x07,0x18,0x60,0x18,0x07,0x00,0x70,0x48,0x44,0x42,
-            0x41,0x00,0x08,0x08,0x3e,0x08,0x08,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM symb5_R_dvor[4][42] = {
-        {   0x00,0x02,0x04,0x08,0x00,0x00,0x20,0x20,0xdc,0x02,0x02,0x00,0x02,0x02,
-            0xdc,0x20,0x20,0x00,0x00,0xc0,0x30,0x0c,0x03,0x00,0x50,0x50,0x50,0x50,
-            0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x00,0x80,0x00,0x00,0x00,0x00,0x00,0xf0,0x11,0x12,0x02,0x00,0x02,0x12,
-            0x11,0xf0,0x00,0x00,0x43,0x20,0x20,0x20,0xc0,0x00,0x00,0x00,0xc0,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x01,0x80,0x41,0x82,0x01,0x00,0x00,0x1f,0x10,0x90,0x00,0x00,0x00,0x90,
-            0x10,0x1f,0x00,0x00,0xc0,0x00,0x14,0x03,0x00,0x00,0x01,0x01,0x87,0x01,
-            0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x22,0xf3,0x0a,0xf3,0x22,0x00,0x00,0x1c,0x63,0x80,0x00,0x00,0x00,0x80,
-            0x63,0x1c,0x00,0x00,0x00,0x03,0x0c,0x30,0xc0,0x00,0x00,0x00,0x7f,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM numb6_L_dvor_nomod[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,
-            0x50,0x88,0x04,0x00,0x00,0x04,0x04,0xc4,0x34,0x0c,0x00,0xd8,0x24,0x24,
-            0x24,0xd8,0x00,0x18,0x24,0x24,0x24,0xf8,0x00,0xf8,0x44,0x24,0x14,0xf8
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x01,0x00,0x00,0x00,0x80,0x41,0xe0,0x00,0x00,0xe0,0xa1,0xa1,
-            0xa1,0x20,0x00,0xc0,0xa1,0xa1,0xa1,0x00,0x00,0x00,0x01,0x01,0x01,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,
-            0x08,0x08,0x08,0x08,0x00,0x03,0x02,0x02,0x0f,0x02,0x00,0x04,0x08,0x08,
-            0x08,0x07,0x00,0x07,0x08,0x08,0x08,0x07,0x00,0x01,0x01,0x01,0x01,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,
-            0x22,0x14,0x08,0x00,0x00,0x00,0x04,0x02,0x7f,0x00,0x00,0x42,0x61,0x51,
-            0x49,0x46,0x00,0x22,0x41,0x49,0x49,0x36,0x00,0x5e,0x61,0x01,0x61,0x5e}};
-    static const char PROGMEM numb6_L_dvor_shift[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0xd8,0x24,0x54,0x88,0x40,0x00,0x50,0x20,0xf8,
-            0x20,0x50,0x00,0x00,0x38,0xc6,0x01,0x00,0x00,0x00,0x01,0xc6,0x38,0x00
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x60,0x91,0xf9,0x90,0x21,0x00,0x20,0x50,0x20,
-            0x80,0x60,0x00,0x40,0x20,0x10,0x21,0x40,0x00,0x00,0x01,0x00,0x00,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x8f,0x04,0x03,0x00,0x0c,0x02,0x09,
-            0x14,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0x00,0x00,0x00,0x3e,0x41,0x5d,
-            0x55,0x5e,0x00,0x14,0x7f,0x14,0x7f,0x14,0x00,0x00,0x00,0x00,0x00,0x00}};
-    // Turkish F
-    static const char PROGMEM base0_L_turf_nomod[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x10,0x10,0x7c,0x10,0x10,0x00,0x00,
-            0xfe,0x09,0x09,0x00,0x00,0x70,0x88,0x88,0x48,0xf8,0x00,0x51,0xaa,0xaa,
-            0x92,0x09,0x00,0x00,0x88,0xf8,0x80,0x00,0x00,0x70,0x88,0x88,0x88,0x70
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x40,0x80,0x00,0x80,0x40,0x00,0xc0,
-            0x00,0x00,0x00,0xc0,0x00,0x00,0x42,0xd2,0x02,0x01,0x00,0x81,0x42,0x42,
-            0x42,0x81,0x00,0x00,0x40,0x40,0x40,0x80,0x00,0xc0,0x10,0x00,0x10,0xc0
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x04,0x02,0x01,0x02,0x04,0x00,0x03,
-            0x04,0x04,0x82,0x07,0x00,0x00,0x80,0x07,0x84,0x00,0x00,0x03,0x05,0x05,
-            0x05,0x05,0x00,0x02,0x05,0x05,0x05,0x07,0x00,0x03,0x04,0x04,0x02,0x07
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x1c,0x22,0x22,0x12,0xfe,0x00,0x00,
-            0x80,0x82,0x7e,0x00,0x00,0x1c,0x22,0x22,0x22,0x1c,0x00,0x06,0x18,0x20,
-            0x18,0x06,0x00,0x1c,0x22,0x22,0x22,0x22,0x00,0x1c,0xa2,0x62,0x22,0x22}};
-    static const char PROGMEM base0_L_turf_shift[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x28,0x10,0x7c,0x10,0x28,0x00,0xfe,
-            0x12,0x12,0x12,0x02,0x00,0xfc,0x02,0x12,0x12,0xf4,0x00,0xf1,0x0a,0x4a,
-            0x4a,0xd1,0x00,0x00,0x02,0xfe,0x02,0x00,0x00,0xfc,0x02,0x02,0x02,0xfc
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x30,0x40,0x80,0x40,0x30,0x00,0xf1,
-            0x00,0x00,0x00,0xf0,0x00,0x00,0x21,0xe9,0x21,0x00,0x00,0xf1,0x92,0x92,
-            0x92,0x11,0x00,0xe0,0x91,0x91,0x91,0xe0,0x00,0xe0,0x09,0x01,0x09,0xe0
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x0e,0x81,0x80,0x81,0x0e,0x00,0x07,
-            0x08,0x08,0x08,0x87,0x00,0x00,0x50,0x1f,0x50,0x00,0x00,0x8f,0x08,0x08,
-            0x08,0x88,0x00,0x0f,0x80,0x80,0x80,0x0f,0x00,0x8f,0x50,0x50,0x50,0x8f
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x3f,0x40,0x50,0x20,0xdf,0x00,0x30,
-            0x40,0x40,0x40,0x3f,0x00,0x7e,0x81,0x81,0x81,0x7e,0x00,0x07,0x18,0x60,
-            0x18,0x07,0x00,0x3f,0x40,0x40,0x40,0x21,0x00,0x1f,0xa0,0x60,0x20,0x10}};
-    static const char PROGMEM base0_L_turf_altgr[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x10,0x10,0x10,0x30,0x00,0x00,0xf0,
-            0x08,0xe8,0xa8,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x0c,0x1e,0xfe,0x02,0xfe,0x00,0x70,0x8a,0x89,0x8a,0x70
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x10,0x20,0x40,0x00,0x00,0xc1,
-            0x12,0x0a,0x12,0xc2,0x00,0x00,0x10,0xc8,0x10,0x00,0x00,0x40,0xe0,0x50,
-            0x10,0x20,0x00,0x00,0x50,0x48,0x50,0x80,0x00,0xc0,0x10,0x08,0x10,0xc0
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x80,0x00,0x80,0x00,0x00,0x03,
-            0x04,0x04,0x02,0x07,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x01,0x83,0x05,
-            0x04,0x82,0x00,0x02,0x05,0x05,0x05,0x07,0x00,0x83,0x84,0x04,0x82,0x87
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x3e,0x3e,0x3e,0x00,0x08,0x14,
-            0x22,0x08,0x14,0x22,0x00,0x22,0x14,0x08,0x22,0x14,0x08,0x03,0x02,0x00,
-            0x03,0x02,0x00,0x1c,0x22,0x7f,0x22,0x22,0x00,0x02,0x01,0x00,0x02,0x01}};
-    static const char PROGMEM base0_L_turf_shfgr[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x90,0x90,0xfc,0x90,0x90,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x0a,0x09,0x0a,0xf0
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x88,0x90,0xa0,0x00,0x00,0xc0,
-            0x10,0x08,0x10,0xc0,0x00,0x00,0x50,0xc8,0x50,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x80,0x50,0x48,0x50,0x80,0x00,0xc1,0x12,0x0a,0x12,0xc1
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x8f,0x4f,0x8f,0x00,0x00,0x0f,
-            0x10,0x10,0x90,0x0f,0x00,0x80,0x10,0x1f,0x10,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x1f,0x82,0x82,0x82,0x1f,0x00,0x0f,0x10,0x10,0x10,0x0f
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x7c,0x7d,0x7c,0x00,0x00,0x04,
-            0x0a,0x11,0x20,0x00,0x00,0x20,0x11,0x0a,0x04,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x1f,0x24,0x2a,0x20,0x1f,0x00,0x00,0x00,0x00,0x00,0x00}};
-    static const char PROGMEM base0_R_turf_nomod[4][42] = {
-        {   0x70,0x88,0x88,0x48,0xff,0x00,0xf8,0x10,0x08,0x08,0x10,0x00,0xf8,0x08,
-            0x08,0x08,0xf0,0x00,0xff,0x10,0x08,0x08,0xf0,0x00,0xf8,0x90,0x88,0x88,
-            0x70,0x00,0x10,0x28,0x44,0x82,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x40,0xf8,0x40,0x40,0x00,0x00,0xf8,0x00,0x80,0x40,0x00,0x00,0xc0,0x40,
-            0xc0,0x40,0x80,0x00,0x08,0xf8,0x00,0x00,0x00,0x00,0xc3,0x00,0x00,0x00,
-            0xc0,0x00,0x80,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x00,0x03,0x04,0x04,0x00,0x00,0x07,0x01,0x01,0x02,0x04,0x00,0xc7,0x00,
-            0x07,0x00,0x07,0x00,0x00,0x03,0x04,0x04,0x00,0x00,0x03,0x14,0x14,0x12,
-            0x0f,0x00,0x04,0x15,0x0d,0x05,0x02,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x22,0x32,0x2a,0x26,0x22,0x00,0x24,0x2a,0x2a,0x2a,0x10,0x00,0x3f,0x24,
-            0x22,0x22,0x1c,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00,0xb0,0x70,0x00,
-            0x00,0x00,0x1e,0x20,0x1c,0x20,0x1e,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM base0_R_turf_shift[4][42] = {
-        {   0xfe,0x02,0x02,0x02,0xfc,0x00,0xfe,0x12,0x12,0x32,0xcc,0x00,0xfe,0x0c,
-            0x30,0xc0,0xfe,0x00,0xfe,0x10,0x10,0x10,0xfe,0x00,0xfe,0x12,0x12,0x12,
-            0x0c,0x00,0x82,0x44,0x28,0x10,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x11,0x11,0xf1,0x11,0x10,0x00,0xf1,0x80,0x40,0x20,0x11,0x00,0xf1,0x20,
-            0xc0,0x20,0xf1,0x00,0xf1,0x00,0x00,0x00,0x01,0x00,0x31,0x40,0x80,0x40,
-            0x30,0x00,0x30,0x48,0x48,0x48,0x90,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x80,0x80,0x8f,0x80,0x80,0x00,0x0f,0x80,0x81,0x82,0x0c,0x00,0x8f,0x80,
-            0x80,0x80,0x0f,0x00,0x0f,0x08,0x08,0x08,0x08,0x00,0x00,0x00,0x0f,0x00,
-            0x00,0x00,0x82,0x14,0x0c,0x04,0x83,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x70,0x48,0x44,0x42,0x41,0x00,0x23,0x44,0x44,0x44,0x39,0x00,0x7f,0x44,
-            0x44,0x44,0x3b,0x00,0x00,0x36,0x36,0x00,0x00,0x00,0x00,0xb6,0x76,0x00,
-            0x00,0x00,0x1f,0x60,0x1c,0x60,0x1f,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM base0_R_turf_altgr[4][42] = {
-        {   0x53,0x54,0xf8,0x54,0x53,0x00,0x7c,0xba,0x8a,0x8a,0x7c,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x0c,0x12,0x12,0x0c,0x00,0x00,0x20,0xfc,0x22,0x02,
-            0x84,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x80,0x80,0xf1,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,
-            0x00,0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x20,0x11,0x01,
-            0x00,0x00,0x40,0xf0,0x41,0xf0,0x40,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x02,0x01,0x0f,0x08,0x08,0x06,0x83,0x40,0x40,0x40,0x00,0x00,0x0f,0x02,
-            0x04,0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x01,0x07,0x01,0x07,0x01,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x00,0x00,0x00,0x00,0x00,0x00,0x47,0x4a,0x4a,0x3c,0x00,0x00,0x11,0x0a,
-            0x04,0x0a,0x11,0x00,0x04,0x04,0x15,0x04,0x04,0x00,0x00,0x00,0x04,0x00,
-            0x00,0x00,0x04,0x02,0x04,0x08,0x04,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM base0_R_turf_shfgr[4][42] = {
-        {   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0xef,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0x90,0x88,
-            0x00,0x00,0x00,0x90,0xa1,0x90,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0x0f,0x0f,
-            0x00,0x00,0x00,0x0f,0x0f,0x0f,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x7d,0x7c,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM symb5_R_turf_nomod[4][42] = {
-        {   0x20,0x20,0xf8,0x20,0x20,0x00,0x00,0xc0,0x30,0x0c,0x03,0x00,0x20,0x20,
-            0x20,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x80,0x00,0xc0,0x00,0x80,0x00,0x43,0x20,0x20,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,0x9c,0xce,0x00,0x00
-        },{ 0x02,0x81,0x47,0x81,0x02,0x00,0x00,0x00,0x0a,0x01,0x00,0x00,0x04,0x04,
-            0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x22,0xf3,0x0a,0xf3,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM symb5_R_turf_altgr[4][42] = {
-        {   0x10,0x10,0x10,0x30,0x00,0x00,0x03,0x0c,0x30,0xc0,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,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x80,0x80,0xe0,0x80,0x80,0x00,0x00,0x00,0xa0,0x00,0x03,0x00,0x00,0x00,
-            0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x04,0x84,0x47,0x84,0x04,0x00,0x06,0x09,0x08,0x08,0x04,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x22,0xf3,0x0a,0xf3,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM numb6_L_turf_nomod[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,
-            0x50,0x88,0x04,0x00,0x00,0x04,0x04,0xc4,0x34,0x0c,0x00,0xd8,0x24,0x24,
-            0x24,0xd8,0x00,0x18,0x24,0x24,0x24,0xf8,0x00,0xf8,0x44,0x24,0x14,0xf8
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x01,0x00,0x00,0x00,0x80,0x41,0xe0,0x00,0x00,0xe0,0xa1,0xa1,
-            0xa1,0x20,0x00,0xc0,0xa1,0xa1,0xa1,0x00,0x00,0x00,0x01,0x01,0x01,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x03,0x02,0x02,0x0f,0x02,0x00,0x04,0x08,0x08,
-            0x08,0x07,0x00,0x07,0x08,0x08,0x08,0x07,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,
-            0x22,0x14,0x08,0x00,0x00,0x00,0x04,0x02,0x7f,0x00,0x00,0x42,0x61,0x51,
-            0x49,0x46,0x00,0x22,0x41,0x49,0x49,0x36,0x00,0x5e,0x61,0x01,0x61,0x5e}};
-    static const char PROGMEM numb6_L_turf_shift[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,
-            0x88,0x50,0x20,0x00,0x00,0x00,0x00,0x0e,0x00,0x00,0x00,0x00,0x38,0xc6,
-            0x01,0x00,0x00,0x00,0x01,0xc6,0x38,0x00,0x00,0x50,0x50,0x50,0x50,0x50
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
-            0x00,0x00,0x00,0x00,0x00,0x60,0x90,0xf8,0x90,0x20,0x00,0x20,0x50,0x20,
-            0x81,0x60,0x00,0x70,0x89,0x48,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x8f,0x04,0x03,0x00,0x0c,0x82,0x09,
-            0x94,0x08,0x00,0x07,0x08,0x89,0x06,0x09,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,
-            0x22,0x14,0x08,0x00,0x00,0x00,0x00,0x5f,0x00,0x00,0x00,0x00,0x03,0x00,
-            0x03,0x00,0x00,0x02,0x01,0x00,0x01,0x02,0x00,0x5e,0x61,0x01,0x61,0x5e}};
-    static const char PROGMEM numb6_L_turf_altgr[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0xff,0x00,0x00,0x00,0x10,0x10,0xee,0x01,0x01,0x00,0x00,0xff,0x01,
-            0x01,0x00,0x00,0x00,0x01,0x01,0xff,0x00,0x00,0x01,0x01,0xee,0x10,0x10
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x01,0x00,0x00,0x00,0x10,0xf8,0x00,0x01,0x01,0x00,0x10,0xf9,0x01,
-            0x01,0x00,0x00,0x88,0xa9,0x51,0x01,0x00,0x00,0x01,0x01,0x00,0x00,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0xc0,0x00,0x00,0x00,0x00,0x08,0x8c,0x0a,0x1f,0x00,0x00,0x00,0x90,
-            0x90,0x10,0x00,0x00,0x08,0x0c,0x0a,0x1f,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x7b,0x00,0x00,0x00,0x00,0x09,0x0f,0x08,0x00,0x00,0x00,0x09,0x0c,
-            0x0a,0x09,0x00,0x14,0x7f,0x14,0x7f,0x14,0x00,0x5e,0x61,0x01,0x61,0x5e}};
-    static const char PROGMEM numb6_L_turf_shfgr[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x90,0x90,0xfc,
-            0x90,0x90,0x00,0x06,0x09,0x09,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0xa8,0x50,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x0a,
-            0x15,0x0a,0x00,0x40,0x40,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x7b,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x04,0x05,0x05,0x02,0x00,0x00,0x5e,0x61,0x01,0x61,0x5e}};
-    // QWERTY
-    static const char PROGMEM base0_L_qwer_nomod[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x04,0x08,0x10,0x00,0x00,0x70,
-            0x88,0x88,0x48,0xf8,0x00,0x78,0x80,0x70,0x80,0x78,0x00,0x70,0xa8,0xa8,
-            0xa8,0xb0,0x00,0xf8,0x10,0x08,0x08,0x10,0x00,0x08,0x7f,0x88,0x88,0x00
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x18,0x60,0x80,0x00,0x00,0x00,0x00,
-            0x40,0x40,0x40,0x83,0x00,0x80,0x40,0x40,0x40,0x00,0x00,0x80,0x40,0x40,
-            0x40,0xf8,0x00,0x00,0xf0,0x48,0x48,0x00,0x00,0x80,0x40,0x40,0x40,0xc0
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0xc0,0x41,0x46,0x18,0x00,0x02,
-            0x05,0x05,0x05,0x07,0x00,0x04,0x05,0x05,0x05,0x02,0x00,0x03,0x04,0x04,
-            0x02,0x07,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0xc3,0x14,0x14,0x12,0x0f
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0xff,0x80,0x80,0x00,0x00,0x22,
-            0x32,0x2a,0x26,0x22,0x00,0x22,0x14,0x08,0x14,0x22,0x00,0x1c,0x22,0x22,
-            0x22,0x22,0x00,0x06,0x18,0x20,0x18,0x06,0x00,0x3f,0x24,0x22,0x22,0x1c}};
-    static const char PROGMEM base0_L_qwer_shift[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x20,0x10,0x20,0x40,0x20,0x00,0xfc,
-            0x02,0x42,0x82,0x7c,0x00,0x7e,0x80,0x70,0x80,0x7e,0x00,0xfe,0x12,0x12,
-            0x12,0x02,0x00,0xfe,0x12,0x12,0x32,0xcc,0x00,0x02,0x02,0xfe,0x02,0x02
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0xf8,0x00,0x00,0x00,0xe0,
-            0x91,0x91,0x90,0xe3,0x00,0x60,0x91,0x90,0x91,0x20,0x00,0xf1,0x11,0x11,
-            0x11,0xe1,0x00,0xf1,0x90,0x90,0x90,0x11,0x00,0xe0,0x10,0x91,0x90,0xa0
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x9f,0x40,0x40,0x00,0x8f,
-            0x80,0x80,0x80,0x8f,0x00,0x84,0x08,0x08,0x08,0x87,0x00,0x0f,0x88,0x88,
-            0x88,0x07,0x00,0x8f,0x00,0x00,0x00,0x80,0x00,0x87,0x88,0x88,0x88,0x07
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x04,0x04,0x7b,0x80,0x80,0x00,0x70,
-            0x48,0x44,0x42,0x41,0x00,0x71,0x0a,0x04,0x0a,0x71,0x00,0x3f,0x40,0x40,
-            0x40,0x21,0x00,0x07,0x18,0x60,0x18,0x07,0x00,0x7f,0x44,0x44,0x44,0x3b}};
-    static const char PROGMEM base0_R_qwer_nomod[4][42] = {
-        {   0x78,0x80,0x80,0x40,0xf8,0x00,0x78,0x80,0x80,0x40,0xf8,0x00,0x00,0x08,
-            0xfa,0x80,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x00,0xf8,0x90,0x88,0x88,
-            0x70,0x00,0x10,0x28,0x44,0x82,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0xf8,0x82,0x42,0x42,0x81,0x00,0x00,0x00,0x40,0xd0,0x00,0x00,0xf8,0x00,
-            0x80,0x40,0x00,0x00,0x08,0xf8,0x00,0x00,0x00,0x00,0x03,0xc0,0xc0,0x00,
-            0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x07,0x00,0x00,0x00,0x07,0x00,0x00,0x10,0x10,0x0f,0x00,0x00,0x07,0x01,
-            0x01,0x02,0x04,0x00,0x00,0x03,0x04,0x04,0x00,0x00,0x00,0x16,0x0e,0x00,
-            0xc0,0x00,0x00,0x40,0x40,0xc0,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x3e,0x02,0x02,0x02,0x3c,0x00,0x3e,0x02,0x3e,0x02,0x3c,0x00,0x00,0xb0,
-            0x70,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0xc0,0x30,0x0c,0x03,
-            0x00,0x00,0x00,0x80,0x80,0xff,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM base0_R_qwer_shift[4][42] = {
-        {   0x06,0x08,0xf0,0x08,0x06,0x00,0xfe,0x00,0x00,0x00,0xfe,0x00,0x00,0x02,
-            0xfe,0x02,0x00,0x00,0xfc,0x02,0x02,0x02,0xfc,0x00,0xfe,0x12,0x12,0x12,
-            0x0c,0x00,0x82,0x44,0x28,0x10,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0xf0,0x80,0x81,0x80,0xf0,0x00,0x00,0x01,0x01,0x01,0xf0,0x00,0xf0,0x81,
-            0x41,0x21,0x10,0x00,0xf0,0x01,0x01,0x01,0x00,0x00,0x01,0xc0,0xc0,0x00,
-            0x00,0x00,0x00,0x70,0x00,0x70,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x8f,0x00,0x00,0x00,0x8f,0x00,0x86,0x08,0x08,0x08,0x87,0x00,0x0f,0x00,
-            0x01,0x82,0x0c,0x00,0x8f,0x08,0x08,0x08,0x08,0x00,0x00,0x86,0x86,0x80,
-            0x00,0x00,0x00,0x40,0x40,0x80,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x7f,0x03,0x0c,0x30,0x7f,0x00,0x7f,0x01,0x06,0x01,0x7f,0x00,0x04,0x0a,
-            0x11,0x20,0x00,0x00,0x20,0x11,0x0a,0x04,0x00,0x00,0x01,0x00,0x28,0x04,
-            0x03,0x00,0x00,0x80,0x80,0x7b,0x04,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM symb5_R_qwer[4][42] = {
-        {   0x00,0x04,0x08,0x10,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x00,0x50,0x50,
-            0x50,0x50,0x50,0x00,0x10,0x10,0xee,0x01,0x01,0x00,0x01,0x01,0xee,0x10,
-            0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0xc0,0x00,0x00,0x00,0x00,0xf8,0x09,0x0a,0x02,0x00,0x02,0x0a,0x09,0xf8,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x01,0x80,0x41,0x82,0x01,0x00,0x04,0x04,0x84,0x44,0x04,0x00,0x01,0x41,
-            0x87,0x01,0x01,0x00,0xc0,0x1f,0x10,0x10,0x00,0x00,0x00,0x10,0xd0,0x1f,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x22,0xf3,0x0a,0xf3,0x22,0x00,0x00,0x1e,0x61,0x80,0x00,0x00,0x00,0x80,
-            0x61,0x1e,0x00,0x00,0x00,0x03,0x0c,0x30,0xc0,0x00,0x00,0x00,0xff,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM numb6_L_qwer_nomod[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,
-            0x50,0x88,0x04,0x00,0x00,0x04,0x04,0xc4,0x34,0x0c,0x00,0xd8,0x24,0x24,
-            0x24,0xd8,0x00,0x18,0x24,0x24,0x24,0xf8,0x00,0xf8,0x44,0x24,0x14,0xf8
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x70,0x00,0x71,0x00,0x00,0x00,0x80,0x41,0xe0,0x00,0x00,0xe0,0xa1,0xa1,
-            0xa1,0x20,0x00,0xc0,0xa1,0xa1,0xa1,0x00,0x00,0x00,0x01,0x71,0x01,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x03,0x02,0x02,0x0f,0x02,0x00,0x04,0x08,0x08,
-            0x08,0x07,0x00,0x07,0x08,0x08,0x08,0x07,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,
-            0x22,0x14,0x08,0x00,0x00,0x00,0x04,0x02,0x7f,0x00,0x00,0x42,0x61,0x51,
-            0x49,0x46,0x00,0x22,0x41,0x49,0x49,0x36,0x00,0x5e,0x61,0x01,0x61,0x5e}};
-    static const char PROGMEM numb6_L_qwer_shift[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0xd8,0x24,0x54,0x88,0x40,0x00,0x50,0x20,0xf8,
-            0x20,0x50,0x00,0x00,0x38,0xc6,0x01,0x00,0x00,0x00,0x01,0xc6,0x38,0x00
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x70,0x00,0x70,0x00,0x00,0x60,0x91,0xf9,0x90,0x21,0x00,0x20,0x50,0x20,
-            0x80,0x60,0x00,0x40,0x20,0x10,0x21,0x40,0x00,0x00,0x71,0x00,0x70,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x8f,0x04,0x03,0x00,0x0c,0x02,0x09,
-            0x14,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0x00,0x00,0x00,0x3e,0x41,0x5d,
-            0x55,0x5e,0x00,0x14,0x7f,0x14,0x7f,0x14,0x00,0x00,0x00,0x00,0x00,0x00}};
-
-    // UNIVERSAL
-    static const char PROGMEM char1_L[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-            0xe2,0xae,0x42,0x00,0x00,0x20,0x44,0x40,0x4c,0x20,0x00,0x12,0xa4,0x88,
-            0xa4,0x12,0x00,0x08,0xf8,0x08,0xf8,0x08,0x00,0x78,0x80,0x80,0x80,0x78
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
-            0x41,0x40,0x41,0x80,0x00,0x80,0x40,0x40,0x40,0x80,0x00,0x81,0x40,0x40,
-            0x40,0x81,0x00,0xc0,0x00,0xc0,0x00,0xc0,0x00,0x00,0xc0,0x00,0x00,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83,
-            0xc4,0x84,0xc2,0x07,0x00,0x03,0x04,0x04,0x04,0x03,0x00,0x02,0x85,0x05,
-            0x04,0x82,0x00,0x03,0x04,0x1f,0x04,0x03,0x00,0x80,0x83,0x84,0x82,0x80
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,
-            0xc4,0x44,0xef,0x3b,0x00,0x3e,0x49,0x49,0x49,0x3e,0x00,0x02,0x7f,0x09,
-            0x09,0x78,0x00,0x3e,0x08,0x08,0x14,0x22,0x00,0x20,0x24,0x24,0x24,0x20}};
-    static const char PROGMEM char1_R[4][42] = {
-        {   0x70,0x88,0xf0,0x88,0x70,0x00,0xfe,0x02,0x02,0x02,0x06,0x00,0x88,0x48,
-            0x70,0x90,0x88,0x00,0xf0,0x88,0x88,0x88,0x70,0x00,0xc0,0x30,0x0c,0x30,
-            0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0xa0,0x50,0x53,0x90,0x20,0x00,0xc0,0x80,0x40,0x40,0x80,0x00,0x40,0x40,
-            0xc0,0x40,0x40,0x00,0xc3,0x00,0x00,0x00,0xc0,0x00,0x80,0x40,0xc0,0x40,
-            0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x03,0x84,0x84,0x04,0x03,0x00,0x07,0x00,0x00,0x00,0x1f,0x00,0x00,0x80,
-            0x83,0x84,0x00,0x00,0x00,0x83,0x54,0x8b,0x00,0x00,0x83,0x84,0x84,0x83,
-            0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0xff,0x24,0x24,0x27,0x18,0x00,0x7e,0x10,0x20,0x20,0x1e,0x00,0x2f,0x30,
-            0x00,0x30,0x2f,0x00,0xe0,0x38,0x25,0x38,0xe0,0x00,0x18,0x26,0xa1,0xa0,
-            0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM game2_L[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,
-            0x82,0xa2,0x42,0xbc,0x00,0x3e,0xc0,0x30,0xc0,0x3e,0x00,0xfe,0x92,0x92,
-            0x92,0x82,0x00,0xfe,0x12,0x12,0x32,0xcc,0x00,0x02,0x02,0xfe,0x02,0x02
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0xe0,0x00,0xe0,
-            0x90,0x90,0x90,0xe1,0x00,0x60,0x90,0x90,0x90,0x20,0x00,0xf0,0x10,0x10,
-            0x10,0xe0,0x00,0xf0,0x90,0x90,0x90,0x10,0x00,0xe0,0x10,0x90,0x90,0xa0
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x00,0x07,0x02,0x02,0x02,0x02,0x00,0x87,
-            0x80,0x80,0x80,0x87,0x00,0x82,0x04,0x04,0x04,0x83,0x00,0x07,0x84,0x84,
-            0x84,0x03,0x00,0x87,0x00,0x00,0x00,0x80,0x00,0x83,0x84,0x84,0x84,0x03
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x08,0x3c,0x02,0x3c,0x08,0x00,0x30,
-            0x28,0x24,0x22,0x21,0x00,0x31,0x0a,0x04,0x0a,0x31,0x00,0x1f,0x20,0x20,
-            0x20,0x11,0x00,0x03,0x0c,0x30,0x0c,0x03,0x00,0x3f,0x24,0x24,0x24,0x1b}};
-    static const char PROGMEM medi3_R_nomod[4][42] = {
-        {   0x03,0x0c,0xb0,0x0c,0x03,0x00,0x3f,0x02,0x9c,0x02,0x3f,0x00,0x3f,0x04,
-            0x84,0x04,0x3f,0x00,0x22,0x25,0xa5,0x25,0x18,0x00,0x3f,0x25,0xa5,0x25,
-            0x1a,0x00,0x00,0xe0,0x8f,0x02,0x31,0x49,0xfa,0x00,0xe7,0x73,0x00,0x00
-        },{ 0xc0,0x01,0x73,0x01,0xc0,0x00,0xf0,0x81,0xc3,0xe1,0xf0,0x00,0x00,0x71,
-            0x03,0x71,0x00,0x00,0x00,0xc1,0xc3,0xc1,0x00,0x00,0xf0,0xe1,0xc3,0x81,
-            0xf0,0x00,0x00,0x03,0xe2,0x21,0xe0,0x21,0xc0,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x01,0x02,0x02,0x02,0x01,0x00,0x07,0x00,0x01,0x03,0x87,0x00,0x00,0x1f,
-            0x0e,0x04,0x80,0x00,0x00,0x03,0x03,0x03,0x00,0x00,0x07,0x03,0x01,0x00,
-            0x87,0x00,0x00,0x40,0xa6,0xa8,0x08,0x04,0x8e,0x00,0x73,0x39,0x00,0x00
-        },{ 0x3e,0x31,0x01,0x31,0x3e,0x00,0x00,0x46,0x46,0x4f,0x1f,0x00,0x00,0xa6,
-            0x46,0xaf,0x1f,0x00,0x28,0x2c,0x2e,0x2c,0x28,0x00,0x00,0x46,0xe6,0x4f,
-            0x1f,0x00,0x00,0x02,0x72,0x8a,0x89,0x00,0x1e,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM medi3_R_shift[4][42] = {
-        {   0x03,0x0c,0x30,0x0c,0x03,0x00,0x3f,0x02,0x1c,0x02,0x3f,0x00,0x3f,0x04,
-            0x04,0x04,0x3f,0x00,0x22,0x25,0x25,0x25,0x18,0x00,0x3f,0x25,0x25,0x25,
-            0x1a,0x00,0x00,0xe0,0x8f,0x02,0x31,0x49,0xfa,0x00,0xe7,0x73,0x00,0x00
-        },{ 0xc0,0x01,0x71,0x01,0xc0,0x00,0xf0,0x81,0xc1,0xe1,0xf0,0x00,0x00,0x71,
-            0x01,0x71,0x00,0x00,0x00,0xc1,0xc1,0xc1,0x00,0x00,0xf0,0xe1,0xc1,0x81,
-            0xf0,0x00,0x00,0x03,0xe2,0x21,0xe0,0x21,0xc0,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x01,0x02,0x02,0x02,0x01,0x00,0x07,0x00,0x01,0x03,0x87,0x00,0x00,0x1f,
-            0x0e,0x04,0x80,0x00,0x00,0x03,0x03,0x03,0x00,0x00,0x07,0x03,0x01,0x00,
-            0x87,0x00,0x00,0x40,0xa6,0xa8,0x08,0x04,0x8e,0x00,0x73,0x39,0x00,0x00
-        },{ 0x3e,0x31,0x01,0x31,0x3e,0x00,0x00,0x46,0x46,0x4f,0x1f,0x00,0x00,0xa6,
-            0x46,0xaf,0x1f,0x00,0x28,0x2c,0x2e,0x2c,0x28,0x00,0x00,0x46,0xe6,0x4f,
-            0x1f,0x00,0x00,0x02,0x72,0x8a,0x89,0x00,0x1e,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM navi4_R[4][42] = {
-        {   0xe0,0x10,0x54,0x38,0x10,0x00,0xfc,0x24,0x24,0x24,0x18,0x00,0x0c,0x10,
-            0xe0,0x10,0x0c,0x00,0x8c,0x50,0x20,0x50,0x8c,0x00,0xc0,0xbe,0xa2,0xbe,
-            0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x80,0xc1,0xa1,0x81,0x00,0x00,0x01,0x80,0x40,0x20,0x00,0x00,0x00,0x00,
-            0xf1,0x00,0x00,0x00,0x41,0x20,0xd0,0x20,0x41,0x00,0x01,0x21,0x41,0x81,
-            0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x00,0x49,0x4a,0x48,0x87,0x00,0x81,0x82,0x85,0x89,0x01,0x00,0x01,0x02,
-            0x85,0x02,0x01,0x00,0x40,0x40,0x47,0x40,0x40,0x00,0x81,0x09,0x05,0x02,
-            0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x39,0x00,0x00
-        },{ 0x12,0x65,0x85,0x65,0x17,0x00,0x07,0x01,0x06,0x18,0x60,0x00,0x88,0x90,
-            0xaf,0x90,0x88,0x00,0x04,0x02,0x7d,0x02,0x04,0x00,0x01,0x46,0x58,0x60,
-            0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    static const char PROGMEM func7_L[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0xff,0x09,0xe9,0xc9,0x01,0x00,0xe0,0x00,
-            0x10,0x08,0xfc,0x00,0x00,0x08,0x84,0x44,0x24,0x18,0x00,0x88,0x04,0x24,
-            0x24,0xd8,0x00,0x60,0x50,0x48,0xfc,0x40,0x00,0x70,0x80,0x9c,0x80,0x70
-        },{ 0x00,0x00,0xce,0x9c,0x00,0xf0,0x00,0x00,0x9f,0x00,0x03,0x0c,0x1f,0x00,
-            0xe0,0xa0,0xa1,0x20,0x00,0xc1,0xa1,0xa1,0xa1,0x01,0x00,0x20,0x21,0x21,
-            0xa1,0x60,0x00,0xc0,0x20,0x20,0x21,0xc0,0x00,0x40,0xe0,0x50,0x40,0x80
-        },{ 0x00,0x00,0x39,0x73,0x00,0xef,0x02,0x83,0xe4,0x00,0x0e,0x15,0x16,0x00,
-            0x04,0x08,0x08,0x07,0x00,0x07,0x48,0xc8,0x08,0x07,0x00,0x00,0x40,0xce,
-            0x01,0x00,0x00,0x06,0x49,0xc9,0x09,0x06,0x00,0x06,0x08,0x49,0x08,0x07
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x05,0x04,0x03,0x90,0xa8,0xa8,0x40,0x06,
-            0x49,0x49,0x49,0x3e,0x00,0x7c,0xa2,0x93,0x8a,0x7c,0x00,0x00,0x08,0x07,
-            0xfe,0x00,0x00,0x84,0xc2,0xa3,0x92,0x8c,0x00,0x70,0x38,0x0d,0x38,0x70}};
-    static const char PROGMEM mous8_L[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x3c,0x84,0xbc,0x84,0x38,0x00,0x00,0x00,0x10,
-            0x28,0x92,0xc5,0x82,0x00,0xfe,0x1f,0x1f,0x01,0xfe,0x00,0xfe,0x01,0x19,
-            0x01,0xfe,0x00,0xfe,0x01,0x1f,0x1f,0xfe,0x00,0x10,0x38,0x92,0xc7,0x82
-        },{ 0x00,0x00,0xce,0x9c,0x00,0xe7,0x08,0x08,0x08,0xe7,0x00,0x00,0x00,0x00,
-            0x00,0x80,0x01,0x00,0x00,0x01,0x01,0x81,0x01,0x01,0x00,0x01,0x01,0x81,
-            0x01,0x01,0x00,0x01,0x01,0x81,0x01,0x01,0x00,0x60,0x50,0xf8,0x41,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x91,0xaa,0xaa,0xa9,0x43,0x00,0x00,0x00,0x02,
-            0x07,0xca,0x02,0x02,0x00,0x02,0x01,0xcf,0x01,0x02,0x00,0x02,0x04,0x0f,
-            0x04,0x02,0x00,0x02,0x02,0xca,0x07,0x02,0x00,0xdc,0x58,0x5c,0x18,0x1f
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x1c,0x2a,0x2a,0x2a,0x2c,0x00,0x00,0x00,0x0c,
-            0x33,0xc0,0x00,0x00,0x00,0x0c,0x03,0x00,0x03,0x0c,0x00,0x0c,0x30,0xc0,
-            0x30,0x0c,0x00,0x00,0x00,0xc0,0x33,0x0c,0x00,0xe5,0xc9,0xe6,0xc0,0xf8}};
-    static const char PROGMEM musi9_L[4][42] = {
-        {   0x00,0x00,0x73,0xe7,0x00,0x00,0x00,0x00,0x00,0xfe,0x04,0x18,0x04,0xfe,
-            0x00,0x00,0xfe,0x00,0x00,0x00,0xfe,0x00,0x8c,0x12,0x12,0x12,0xe4,0x00,
-            0x00,0x02,0xfe,0x02,0x00,0x00,0xfc,0x02,0x02,0x02,0x84,0x00,0x00,0x00
-        },{ 0x00,0x00,0xce,0x9c,0x00,0x00,0xc0,0xe0,0xf0,0xf9,0xf8,0xf8,0xf8,0xf9,
-            0xf0,0xe0,0xc0,0x01,0x01,0x01,0x00,0xf0,0xf0,0x01,0x01,0xf1,0xf0,0x00,
-            0x00,0x01,0x01,0x01,0x00,0x00,0xf8,0xf1,0xe1,0xc1,0x80,0x00,0x00,0x00
-        },{ 0x00,0x00,0x39,0x73,0x00,0x00,0x07,0x0f,0x1f,0x3f,0x3f,0x3f,0x3f,0x3f,
-            0x1f,0x0f,0x07,0x00,0x00,0x00,0x00,0x1f,0x1f,0x00,0x00,0x1f,0x1f,0x00,
-            0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x1f,0x0f,0x07,0x03,0x01,0x00,0x00
-        },{ 0x00,0x00,0xe7,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x08,
-            0xf8,0x08,0xf0,0x00,0x70,0x88,0x88,0x88,0x70,0x00,0x70,0x88,0x88,0x48,
-            0xff,0x00,0x70,0xa8,0xa8,0xa8,0xb0,0x00,0x00,0x00,0x00,0x00,0x00,0x00}};
-    static const char PROGMEM musi9_R[4][42] = {
-        {   0x00,0x00,0x00,0xfe,0x04,0x18,0x04,0xfe,0x00,0x00,0xfe,0x00,0x00,0x00,
-            0xfe,0x00,0x8c,0x12,0x12,0x12,0xe4,0x00,0x00,0x02,0xfe,0x02,0x00,0x00,
-            0xfc,0x02,0x02,0x02,0x84,0x00,0x00,0x00,0x00,0x00,0xe7,0x73,0x00,0x00
-        },{ 0x00,0x00,0x00,0x81,0x60,0x10,0x60,0x81,0x60,0x10,0x00,0x01,0x01,0x01,
-            0xe0,0xe0,0x60,0x61,0x61,0x61,0x60,0xf8,0x70,0x21,0x01,0x01,0xc0,0xe0,
-            0x60,0x01,0xf9,0xf9,0x00,0x60,0xe0,0xc0,0x00,0x00,0x9c,0xce,0x00,0x00
-        },{ 0x18,0x24,0x4b,0x48,0x48,0x4c,0x4b,0x48,0x4b,0x2c,0x18,0x00,0x00,0x00,
-            0x4f,0xe7,0xf0,0x60,0x60,0x60,0x60,0x60,0x7e,0x7f,0x00,0x0f,0x3f,0x70,
-            0x60,0xc0,0xc1,0xc1,0xc0,0x60,0x70,0x3f,0x0f,0x00,0x73,0x39,0x00,0x00
-        },{ 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x08,0xf8,0x08,0xf0,0x00,0x70,0x88,
-            0x88,0x88,0x71,0x00,0x70,0x88,0x88,0x48,0xff,0x00,0x70,0xa8,0xa8,0xa8,
-            0xb0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xe7,0x00,0x00}};
-    uint8_t this_layout = userspace_config.layout % 3;
-
-    // Render the requested image on the given column and row 
-    // Don't grab highest layer; instead compare from top to bottom.
-    // Highest layer might be on the other side
-    if (isLeft) {
-        if (layer_state_cmp(layer_state, _MUSI)) {
-            draw_image(row, col, musi9_L);
-        } else if (layer_state_cmp(layer_state, _MOUS)) {
-            draw_image(row, col, mous8_L);
-        } else if (layer_state_cmp(layer_state, _FUNC)) {
-            draw_image(row, col, func7_L);
-        } else if (layer_state_cmp(layer_state, _NUMB)) {
-            switch (this_layout) {
-                case 0: // Dvorak
-                    if (mods & MOD_MASK_SHIFT) {
-                        draw_image(row, col, numb6_L_dvor_shift);
-                    } else {
-                        draw_image(row, col, numb6_L_dvor_nomod);
-                    }
-                    break;
-                case 1: // Turkish F
-                    if ((mods & MOD_MASK_SHIFT) && (mods & MOD_BIT(KC_RALT))) {
-                        // Shift + AltGr
-                        draw_image(row, col, numb6_L_turf_shfgr);
-                    } else if (mods & MOD_MASK_SHIFT) {
-                        // Shift
-                        draw_image(row, col, numb6_L_turf_shift);
-                    } else if (mods & MOD_BIT(KC_RALT)) {
-                        // AltGr
-                        draw_image(row, col, numb6_L_turf_altgr);
-                    } else {
-                        // Normal
-                        draw_image(row, col, numb6_L_turf_nomod);
-                    }
-                    break;
-                case 2: // Qwerty
-                    if (mods & MOD_MASK_SHIFT) {
-                        draw_image(row, col, numb6_L_qwer_shift);
-                    } else {
-                        draw_image(row, col, numb6_L_qwer_nomod);
-                    }
-                    break;
-            }
-        } else if (layer_state_cmp(layer_state, _GAME)) {
-            draw_image(row, col, game2_L);
-        } else if (layer_state_cmp(layer_state, _CHAR)) {
-            draw_image(row, col, char1_L);
-        } else {
-            switch (this_layout) {
-                case 0: // Dvorak
-                    if (mods & MOD_MASK_SHIFT) {
-                        draw_image(row, col, base0_L_dvor_shift);
-                    } else {
-                        draw_image(row, col, base0_L_dvor_nomod);
-                    }
-                    break;
-                case 1: // Turkish F
-                    if ((mods & MOD_MASK_SHIFT) && (mods & MOD_BIT(KC_RALT))) {
-                        // Shift + AltGr
-                        draw_image(row, col, base0_L_turf_shfgr);
-                    } else if (mods & MOD_MASK_SHIFT) {
-                        // Shift
-                        draw_image(row, col, base0_L_turf_shift);
-                    } else if (mods & MOD_BIT(KC_RALT)) {
-                        // AltGr
-                        draw_image(row, col, base0_L_turf_altgr);
-                    } else {
-                        // Normal
-                        draw_image(row, col, base0_L_turf_nomod);
-                    }
-                    break;
-                case 2: // Qwerty
-                    if (mods & MOD_MASK_SHIFT) {
-                        draw_image(row, col, base0_L_qwer_shift);
-                    } else {
-                        draw_image(row, col, base0_L_qwer_nomod);
-                    }
-                    break;
-            }
-        }
-    } else {
-        if (layer_state_cmp(layer_state, _MUSI)) {
-            draw_image(row, col, musi9_R);
-        } else if (layer_state_cmp(layer_state, _SYMB)) {
-            switch (this_layout) {
-                case 0: // Dvorak
-                    draw_image(row, col, symb5_R_dvor);
-                    break;
-                case 1: // Turkish f
-                    if (mods & MOD_BIT(KC_RALT)) {
-                        // AltGr
-                        draw_image(row, col, symb5_R_turf_altgr);
-                    } else {
-                        // Normal
-                        draw_image(row, col, symb5_R_turf_nomod);
-                    }
-                    break;
-                case 2: // Qwerty 
-                    draw_image(row, col, symb5_R_qwer);
-                    break;
-            }
-        } else if (layer_state_cmp(layer_state, _NAVI)) {
-            draw_image(row, col, navi4_R);
-        } else if (layer_state_cmp(layer_state, _MEDI)) {
-            if (mods & MOD_MASK_SHIFT) {
-                draw_image(row, col, medi3_R_shift);
-            } else {
-                draw_image(row, col, medi3_R_nomod);
-            }
-        } else if (layer_state_cmp(layer_state, _CHAR)) {
-            draw_image(row, col, char1_R);
-        } else {
-            switch (this_layout) {
-                case 0: // Dvorak
-                    if (mods & MOD_MASK_SHIFT) {
-                        draw_image(row, col, base0_R_dvor_shift);
-                    } else {
-                        draw_image(row, col, base0_R_dvor_nomod);
-                    }
-                    break;
-                case 1: // Turkish F
-                    if ((mods & MOD_MASK_SHIFT) && (mods & MOD_BIT(KC_RALT))) {
-                        // Shift + AltGr
-                        draw_image(row, col, base0_R_turf_shfgr);
-                    } else if (mods & MOD_MASK_SHIFT) {
-                        // Shift
-                        draw_image(row, col, base0_R_turf_shift);
-                    } else if (mods & MOD_BIT(KC_RALT)) {
-                        // AltGr
-                        draw_image(row, col, base0_R_turf_altgr);
-                    } else {
-                        // Normal
-                        draw_image(row, col, base0_R_turf_nomod);
-                    }
-                    break;
-                case 2: // Qwerty
-                    if (mods & MOD_MASK_SHIFT) {
-                        draw_image(row, col, base0_R_qwer_shift);
-                    } else {
-                        draw_image(row, col, base0_R_qwer_nomod);
-                    }
-                    break;
-            }
-        }
-    }
-}
-
-// Render the RGB state on the given column and row 
-void render_rgb(uint8_t row, uint8_t col) {
-    static const char PROGMEM rgb_enab[12] = {0x08,0x81,0x3c,0x42,0x99,0xbd,0xbd,0x99,0x42,0x3c,0x81,0x10};
-    static const char PROGMEM rgb_disa[12] = {0x08,0x81,0x3c,0x42,0x81,0x81,0x81,0x81,0x42,0x3c,0x81,0x10};
-    static char rgb_temp4[4] = {0};
-    static char rgb_temp3[3] = {0};
-
-    oled_set_cursor(col, row);
-#   ifdef RGB_MATRIX_ENABLE
-    if (rgb_matrix_is_enabled()) {
-        oled_write_raw_P(rgb_enab, 12);
-    } else {
-        oled_write_raw_P(rgb_disa, 12);
-    }
-    oled_set_cursor(col + 2, row);
-    oled_write(" hue sat val", false);
-    oled_set_cursor(col, row + 1);
-    itoa(rgb_matrix_get_mode(), rgb_temp3, 10);
-    oled_write(rgb_temp3, false);
-    oled_write(" ", false);
-    itoa(rgb_matrix_get_hue(), rgb_temp4, 10);
-    oled_write(rgb_temp4, false);
-    oled_write(" ", false);
-    itoa(rgb_matrix_get_sat(), rgb_temp4, 10);
-    oled_write(rgb_temp4, false);
-    oled_write(" ", false);
-    itoa(rgb_matrix_get_val(), rgb_temp4, 10);
-    oled_write(rgb_temp4, false);
-#   else // RGB_MATRIX_ENABLE
-    oled_write("-RGB disabled-", false);
-#   endif // RGB_MATRIX_ENABLE
-}
-
-void render_status_left(uint8_t row, uint8_t col) {
-    // Left side looks like this on the left half
-    // (Should be 14 characters per line)
-    //  Mods: <OS> <Alt/Gr> <Ctrl> <Shift>
-    //  Enc: <8 len str>
-    //  Wpm: <wpm here>
-    //  Layout: <dvorak/qwerty/tur. f>
-    // Right half is whatever layer image needs be
-    uint8_t this_mod =   get_mods();
-    uint8_t this_layer = get_highest_layer(layer_state);
-
-    // MODIFIERS
-    render_modifiers(row + 0, col + 0, this_mod);
-    // Encoders
-    render_encoder(row + 1, col + 0, 0, this_layer);
-    // WPM text
-    render_wpm(row + 2, col + 0);
-    // Visual layout
-    render_keymap(row + 3, col + 0, false);
-    // Draw the image after 14'th character
-    render_layout(row + 0, col + 14, this_mod, true);
-}
-
-void render_status_right(uint8_t row, uint8_t col) {
-    // Right half is whatever layer image needs be on the left
-    // Right side looks like this on the right half
-    // (Should be after the 12'th character; max 14 characters per line)
-    //  Mods: <OS> <Alt/Gr> <Ctrl> <Shift>
-    //  Enc: <8 len str>
-    //  Wpm: <wpm here>
-    //  Layout: <dvorak/qwerty/tur. f>
-    uint8_t this_mod =   get_mods();
-    uint8_t this_layer = get_highest_layer(layer_state);
-
-    // Draw the image
-    render_layout(row + 0, col + 0, this_mod, false);
-    // Modifiers
-    render_modifiers(row + 0, col + 7, this_mod);
-    // Encoder
-    render_encoder(row + 1, col + 7, 1, this_layer);
-    // RGB State (2 rows)
-    render_rgb(row + 2, col + 7);
-}
diff --git a/users/bbaserdem/bb-oled-extra.h b/users/bbaserdem/bb-oled-extra.h
deleted file mode 100644
index c051e6226c..0000000000
--- a/users/bbaserdem/bb-oled-extra.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-// OLED layout images writer function
-void render_modifiers(uint8_t row, uint8_t col, uint8_t mods);
-void render_layout(uint8_t row, uint8_t col, uint8_t mods, bool isLeft);
-void render_rgb(uint8_t row, uint8_t col);
-void render_status_left(uint8_t row, uint8_t col);
-void render_status_right(uint8_t row, uint8_t col);
diff --git a/users/bbaserdem/bb-oled.c b/users/bbaserdem/bb-oled.c
deleted file mode 100644
index cf00193c03..0000000000
--- a/users/bbaserdem/bb-oled.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bb-oled.h"
-
-#include <string.h>
-// Grab the print function 
-#ifdef ENCODER_ENABLE
-#   include "bb-encoder.h"
-#endif // ENCODER_ENABLE
-
-/* OLED
- * This contains general purpose oled code
- */ 
-
-// Allow default to be overwritten by keymap if they return false
-__attribute__ ((weak)) bool oled_task_keymap(void) {return true;}
-
-// Do sane defaults for regular oled rendering
-void oled_task_user(void) {
-    if (is_oled_on()) {
-        if (oled_task_keymap()) {
-            render_status_lite(0, 0);
-        }
-    }
-}
-
-/*-------------------------*\
-|*---RENDERING FUNCTIONS---*|
-\*-------------------------*/
-void render_qmk_logo(uint8_t row, uint8_t col) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,
-        0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,
-        0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,
-        0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-    oled_set_cursor(col, row);
-    oled_write_P(qmk_logo, false);
-}
-
-void render_layer(uint8_t row, uint8_t col, uint8_t top_layer) {
-    // Write the layer state; 17 chars
-    oled_set_cursor(col, row);
-    oled_write("Layer: ", false);
-    switch (top_layer) {
-        case _BASE:
-            oled_write("Default   ", false);
-            break;
-        case _CHAR:
-            oled_write("Sp. Chars ", false);
-            break;
-        case _GAME:
-            oled_write("Gaming    ", false);
-            break;
-        case _MEDI:
-            oled_write("Media Ctr ", false);
-            break;
-        case _NAVI:
-            oled_write("Navigation", false);
-            break;
-        case _SYMB:
-            oled_write("Symbols   ", false);
-            break;
-        case _NUMB:
-            oled_write("Numpad    ", false);
-            break;
-        case _FUNC:
-            oled_write("Funct Keys", false);
-            break;
-        case _MOUS:
-            oled_write("Mouse Keys", false);
-            break;
-        case _MUSI:
-            oled_write("Music Mode", false);
-            break;
-        default:
-            oled_write("?? N/A ?? ", false);
-    }
-}
-
-void render_modifiers_lite(uint8_t row, uint8_t col, uint8_t mods) {
-    // Write the modifier state, 16 characters
-    oled_set_cursor(col, row);
-    oled_write((mods & MOD_MASK_SHIFT  ) ? "Shft " : "     ", false);
-    oled_write((mods & MOD_MASK_CTRL   ) ? "Ctrl " : "     ", false);
-    oled_write((mods & MOD_MASK_ALT    ) ? "Alt"   : "   ",   false);
-    oled_write((mods & MOD_BIT(KC_RALT)) ? "G "    : "  ",    false);
-    oled_write((mods & MOD_MASK_GUI    ) ? "Meta " : "    ",  false);
-}
-
-void render_encoder(uint8_t row, uint8_t col, uint8_t index, uint8_t layer) {
-    // Renders the encoder state, 14 characters
-    oled_set_cursor(col, row);
-
-#   ifdef ENCODER_ENABLE
-    static char encoder_temp9[9] = {0};
-    oled_write("Enc: ", false);
-    encoder_state_string(index, layer, encoder_temp9);
-    oled_write(encoder_temp9, false);
-#   else // ENCODER_ENABLE
-    oled_write("No enc. avail.", false);
-#   endif // ENCODER_ENABLE
-}
-
-void render_wpm(uint8_t row, uint8_t col) {
-    // Renders the WPM, 8 characters
-    oled_set_cursor(col, row);
-#   ifdef WPM_ENABLE
-    static char wpm_temp4[4] = {0};
-    oled_write("WPM: ", false);
-    itoa(get_current_wpm(), wpm_temp4, 10);
-    oled_write(wpm_temp4, false);
-    oled_write("      ", false);
-#   else // WPM_ENABLE
-    oled_write("WPM: N/A", false);
-#   endif // WPM_ENABLE
-}
-
-// Writes the currently used OLED display layout
-void render_keymap(uint8_t row, uint8_t col, bool isLite) {
-    // Render the oled layout; lite is 11, regular is 14 characters
-    oled_set_cursor(col, row);
-    if (isLite) {
-        oled_write("KM: ", false);
-    } else {
-        oled_write("Layout: ", false);
-    }
-    switch (userspace_config.layout % 3) {
-        case 0:
-            oled_write("Dvorak", false);
-            break;
-        case 1:
-            oled_write("Tur. F", false);
-            break;
-        case 2:
-            oled_write("Qwerty", false);
-            break;
-    }
-    if (isLite) {
-        oled_write(" ", false);
-    }
-}
-
-// Writes the currently used OLED display layout
-#ifdef RGB_MATRIX_ENABLE
-void render_rgb_lite(uint8_t row, uint8_t col) {
-    // Writes the currently used OLED display layout, 19 characters
-    static char rgb_temp4[4] = {0};
-    // Render the oled layout
-    oled_set_cursor(col, row);
-    oled_write("m", false);
-    itoa(rgb_matrix_get_mode(), rgb_temp4, 10);
-    oled_write(rgb_temp4, false);
-    oled_write(" h", false);
-    itoa(rgb_matrix_get_hue(), rgb_temp4, 10);
-    oled_write(rgb_temp4, false);
-    oled_write(" s", false);
-    itoa(rgb_matrix_get_sat(), rgb_temp4, 10);
-    oled_write(rgb_temp4, false);
-    oled_write(" v", false);
-    itoa(rgb_matrix_get_val(), rgb_temp4, 10);
-    oled_write(rgb_temp4, false);
-}
-#endif // RGB_MATRIX_ENABLE
-
-void render_status_lite(uint8_t row, uint8_t col) {
-    // Function to print state information; for low flash memory
-    uint8_t this_layer = get_highest_layer(layer_state);
-    uint8_t this_mod =   get_mods();
-
-    // Line 1: Layer State
-    render_layer(row + 0, col + 0, this_layer);
-
-    // Line 2: Mod or info
-    switch (this_layer) {
-        // Show RGB mode as an overlay in media mode.
-#       ifdef RGB_MATRIX_ENABLE
-        case _MEDI:
-            render_rgb_lite(row + 1, col + 0);
-            break;
-#       endif // RGB_MATRIX_ENABLE
-        // Show the modifier if nothing else is doing anything
-        default:
-            render_modifiers_lite(row + 1, col + 0, this_mod);
-            break;
-    }
-
-    // Line 3: WPM and layout
-    render_keymap(row + 2, col + 0, true);
-    render_wpm(row + 2, col + 11);
-
-    // Line 4: Encoder states
-#   ifdef SPLIT_KEYBOARD
-    if (is_keyboard_left()) {
-        render_encoder(row + 3, col + 0, 0, this_layer);
-    } else {
-        render_encoder(row + 3, col + 0, 1, this_layer);
-    }
-#   else // SPLIT_KEYBOARD
-    render_encoder(row + 3, col + 0, 0, this_layer);
-#   endif // SPLIT_KEYBOARD
-}
diff --git a/users/bbaserdem/bb-oled.h b/users/bbaserdem/bb-oled.h
deleted file mode 100644
index a355c88ca9..0000000000
--- a/users/bbaserdem/bb-oled.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-// Contain the main oled writer here 
-void oled_task_user(void);
-// Some generic rendering functions
-void render_qmk_logo(uint8_t row, uint8_t col);
-void render_layer(uint8_t row, uint8_t col, uint8_t top_layer);
-void render_modifiers_lite(uint8_t row, uint8_t col, uint8_t mods);
-void render_encoder(uint8_t row, uint8_t col, uint8_t index, uint8_t layer);
-void render_wpm(uint8_t row, uint8_t col);
-void render_keymap(uint8_t row, uint8_t col, bool isLite);
-#ifdef RGB_MATRIX_ENABLE
-void render_rgb_lite(uint8_t row, uint8_t col);
-#endif // RGB_MATRIX_ENABLE
-void render_status_lite(uint8_t row, uint8_t col);
diff --git a/users/bbaserdem/bb-rgb.c b/users/bbaserdem/bb-rgb.c
deleted file mode 100644
index 49b91129ba..0000000000
--- a/users/bbaserdem/bb-rgb.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bb-rgb.h"
-#include "color.h"
-
-#define X_DIV 224/2
-/* Code relating to per-key RGB LED stuff
- */
-
-// Allow hooking into the RGB matrix indications using keymap code
-
-// Modulates the brightness of indicator
-RGB helper_dimmer(uint8_t r, uint8_t g, uint8_t b) {
-    RGB output;
-    output.r = r / 2;
-    output.g = g / 2;
-    output.b = b / 2;
-    return output;
-}
-// x range from 0-left to 224-right
-// y range from 0-top  to  64-bottom
-void helper_painter(uint8_t led_min, uint8_t led_max, RGB col, uint8_t side) {
-    if (side == 1) {
-        // Left
-        for(uint8_t i = led_min; i <= led_max; i++) {
-            if((g_led_config.point[i].x < X_DIV) && (g_led_config.flags[i] & LED_FLAG_INDICATOR)) {
-                rgb_matrix_set_color(i, col.r, col.g, col.b);
-            }
-        }
-    } else if (side == 2) {
-        // Right
-        for(uint8_t i = led_min; i <= led_max; i++) {
-            if((g_led_config.point[i].x > X_DIV) && (g_led_config.flags[i] & LED_FLAG_INDICATOR)) {
-                rgb_matrix_set_color(i, col.r, col.g, col.b);
-            }
-        }
-    } else if (side == 0) {
-        // Both
-        for(uint8_t i = led_min; i <= led_max; i++) {
-            if(g_led_config.flags[i] & LED_FLAG_INDICATOR) {
-                rgb_matrix_set_color(i, col.r, col.g, col.b);
-            }
-        }
-    }
-}
-
-// Allow to turn off global handling
-__attribute__ ((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
-    return false;
-}
-// Set RGB state depending on layer
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t thisInd = 3;
-    RGB thisCol;
-    // Load keymap hooks
-    if(rgb_matrix_indicators_advanced_keymap(led_min, led_max)) {
-        return false;
-    }
-    // Grab color info
-    switch (get_highest_layer(layer_state)) {
-        case _GAME: // Set left side as purple
-            thisCol = helper_dimmer(RGB_PURPLE);
-            thisInd = 1;
-            break;
-        case _CHAR: // Set full board as gold
-            thisCol = helper_dimmer(RGB_GOLD);
-            thisInd = 0;
-            break;
-        case _MEDI: // Set right side as pink
-            thisCol = helper_dimmer(RGB_MAGENTA);
-            thisInd = 2;
-            break;
-        case _NAVI: // Set right side as green
-            thisCol = helper_dimmer(RGB_GREEN);
-            thisInd = 2;
-            break;
-        case _SYMB: // Set right side as yellow
-            thisCol = helper_dimmer(RGB_YELLOW);
-            thisInd = 2;
-            break;
-        case _NUMB: // Set left side as blue
-            thisCol = helper_dimmer(RGB_BLUE);
-            thisInd = 1;
-            break;
-        case _FUNC: // Set left side as red
-            thisCol = helper_dimmer(RGB_RED);
-            thisInd = 1;
-            break;
-        case _MOUS: // Set left side as blue-green
-            thisCol = helper_dimmer(RGB_SPRINGGREEN);
-            thisInd = 1;
-            break;
-        case _MUSI: // Set full board as orange
-            thisCol = helper_dimmer(RGB_ORANGE);
-            thisInd = 0;
-            break;
-    }
-    helper_painter(led_min, led_max, thisCol, thisInd);
-    return false;
-}
-
-// Hook into shutdown code to make all perkey LED's red on hitting reset
-void shutdown_rgb(void) {
-    // Flash all the key LED's red on shutdown
-    uint16_t timer_start = timer_read();
-    rgb_matrix_set_color_all(RGB_CORAL);
-    // Delay until this registers
-    while(timer_elapsed(timer_start) < 250) {wait_ms(1);}
-}
diff --git a/users/bbaserdem/bb-rgb.h b/users/bbaserdem/bb-rgb.h
deleted file mode 100644
index 3e96b997fe..0000000000
--- a/users/bbaserdem/bb-rgb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-/* Hooks involving perkey RGB LEDs
- */
-
-// For custom indicators
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
-// Hook into shutdown code
-void shutdown_rgb(void);
-void suspend_wakeup_init_rgb(void);
-void suspend_power_down_rgb(void);
diff --git a/users/bbaserdem/bb-underglow.c b/users/bbaserdem/bb-underglow.c
deleted file mode 100644
index 69aae439f4..0000000000
--- a/users/bbaserdem/bb-underglow.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bb-underglow.h"
-
-/* UNDERGLOW IMPLEMENTATION
- */
-
-// Define the layer switching code
-
-// An empty layer on the base
-const rgblight_segment_t PROGMEM bb_base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 0, HSV_WHITE}
-);
-// Gaming layer is turquoise
-const rgblight_segment_t PROGMEM bb_game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {RGBLIGHT_LEFT_BEG, RGBLIGHT_LEFT_NUM, HSV_PURPLE}
-);
-// Character overlay is chartereuse
-const rgblight_segment_t PROGMEM bb_char_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, RGBLED_NUM, HSV_GOLD}
-);
-
-// Right-hand layers
-
-// Media layer is orange
-const rgblight_segment_t PROGMEM bb_medi_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {RGBLIGHT_RIGHT_BEG, RGBLIGHT_RIGHT_NUM, HSV_MAGENTA}
-);
-// Navigation layer is green
-const rgblight_segment_t PROGMEM bb_navi_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {RGBLIGHT_RIGHT_BEG, RGBLIGHT_RIGHT_NUM, HSV_GREEN}
-);
-// Symbol layer is purple
-const rgblight_segment_t PROGMEM bb_symb_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {RGBLIGHT_RIGHT_BEG, RGBLIGHT_RIGHT_NUM, HSV_YELLOW}
-);
-
-// Left-hand layers
-
-// Number layer is blue
-const rgblight_segment_t PROGMEM bb_numb_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {RGBLIGHT_LEFT_BEG, RGBLIGHT_LEFT_NUM, HSV_BLUE}
-);
-// Function layer is red
-const rgblight_segment_t PROGMEM bb_func_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {RGBLIGHT_LEFT_BEG, RGBLIGHT_LEFT_NUM, HSV_RED}
-);
-// Pointer layer is yellow
-const rgblight_segment_t PROGMEM bb_mous_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {RGBLIGHT_LEFT_BEG, RGBLIGHT_LEFT_NUM, HSV_SPRINGGREEN}
-);
-
-// Music playback layer is magenta
-const rgblight_segment_t PROGMEM bb_musi_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, RGBLED_NUM, HSV_ORANGE}
-);
-
-const rgblight_segment_t* const PROGMEM bb_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    bb_base_layer,
-    bb_char_layer,
-    bb_game_layer,
-    bb_medi_layer,
-    bb_navi_layer,
-    bb_symb_layer,
-    bb_numb_layer,
-    bb_func_layer,
-    bb_mous_layer,
-    bb_musi_layer
-);
-
-// Enable the LED switching layers
-void keyboard_post_init_underglow(void) {
-    rgblight_layers = bb_rgb_layers;
-    // Default rgb mode is rainbow swirl; set this
-    rgblight_sethsv_noeeprom(100, 255, 255);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL + 0);
-}
-
-// Set RGBLIGHT state depending on layer
-layer_state_t layer_state_set_underglow(layer_state_t state) {
-    // Activate layers if on that region
-    rgblight_set_layer_state(_BASE, layer_state_cmp(state, _BASE));
-    rgblight_set_layer_state(_GAME, layer_state_cmp(state, _GAME));
-    rgblight_set_layer_state(_CHAR, layer_state_cmp(state, _CHAR));
-    rgblight_set_layer_state(_MEDI, layer_state_cmp(state, _MEDI));
-    rgblight_set_layer_state(_NAVI, layer_state_cmp(state, _NAVI));
-    rgblight_set_layer_state(_SYMB, layer_state_cmp(state, _SYMB));
-    rgblight_set_layer_state(_NUMB, layer_state_cmp(state, _NUMB));
-    rgblight_set_layer_state(_FUNC, layer_state_cmp(state, _FUNC));
-    rgblight_set_layer_state(_MOUS, layer_state_cmp(state, _MOUS));
-    rgblight_set_layer_state(_MUSI, layer_state_cmp(state, _MUSI));
-    // Return so other stuff can be done
-    return state;
-}
-
-// Hook into shutdown code
-void shutdown_underglow(void) {
-    // Make the LED's red on shutdown
-    rgblight_enable_noeeprom();
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_sethsv(HSV_WHITE);
-}
diff --git a/users/bbaserdem/bb-underglow.h b/users/bbaserdem/bb-underglow.h
deleted file mode 100644
index 9cc1db3757..0000000000
--- a/users/bbaserdem/bb-underglow.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 "bbaserdem.h"
-
-/* UNDERGLOW IMPLEMENTATION
- */
-
-// Used to initialize layer switching overlay
-void keyboard_post_init_underglow(void);
-// Used to change RGB underglow layers on keymap layer change
-layer_state_t layer_state_set_underglow(layer_state_t state);
-// Hook into shutdown to show effect on shutdown
-void shutdown_underglow(void);
diff --git a/users/bbaserdem/bbaserdem.c b/users/bbaserdem/bbaserdem.c
deleted file mode 100644
index e0e204c302..0000000000
--- a/users/bbaserdem/bbaserdem.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bbaserdem.h"
-// Language imports
-#include <sendstring_dvorak.h>
-// Need memcpy and memcmp from string.h along with transfer stuff
-#ifdef SPLIT_KEYBOARD
-#include "transactions.h"
-#include <string.h>
-#endif // SPLIT_KEYBOARD
-
-/*-------------------------*\
-|*-----KEYBOARD CONFIG-----*|
-\*-------------------------*/
-userspace_config_t userspace_config;
-userspace_runtime_t userspace_runtime;
-
-/*---------------------------------*\
-|*----SPLIT KEYBOARD TRANSPORT-----*|
-\*---------------------------------*/
-#ifdef SPLIT_KEYBOARD
-userspace_config_t transport_userspace_config;
-userspace_runtime_t transport_userspace_runtime;
-
-// Translate the RPC data to the local variable
-void userspace_config_sync(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) {
-    // Copy incoming data to local variable
-    if (in_buflen == sizeof(transport_userspace_config)) {
-        memcpy(&transport_userspace_config, in_data, in_buflen);
-    }
-    // There is no data to send back; so no output handling
-}
-void userspace_runtime_sync(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) {
-    // Copy incoming data to local variable
-    if (in_buflen == sizeof(transport_userspace_runtime)) {
-        memcpy(&transport_userspace_runtime, in_data, in_buflen);
-    }
-    // There is no data to send back; so no output handling
-}
-
-// Either send or receive the correct data
-void userspace_transport_update(void) {
-    if (is_keyboard_master()) {
-        // If we are the main device; we want to send info.
-        transport_userspace_config.raw = userspace_config.raw;
-        transport_userspace_runtime.raw = userspace_runtime.raw;
-    } else {
-        // If we are the secondary device; we want to receive info, and save to eeprom.
-        userspace_config.raw = transport_userspace_config.raw;
-        userspace_runtime.raw = transport_userspace_runtime.raw;
-    }
-}
-
-// Initiate the protocol on sync
-void userspace_transport_sync(bool force_sync) {
-    if (is_keyboard_master()) {
-        // Keep track of the last state
-        static userspace_config_t last_userspace_config;
-        static userspace_runtime_t last_userspace_runtime;
-        bool needs_sync = false;
-
-        // Check if the config values are different
-        if (memcmp(&transport_userspace_config, &last_userspace_config, sizeof(transport_userspace_config))) {
-            needs_sync = true;
-            memcpy(&last_userspace_config, &transport_userspace_config, sizeof(transport_userspace_config));
-        }
-        // Perform the sync if requested
-        if (needs_sync || force_sync) {
-            transaction_rpc_send(RPC_ID_CONFIG_SYNC, sizeof(transport_userspace_config), &transport_userspace_config);
-            needs_sync = false;
-        }
-
-        // Check if the runtime values are different
-        if (memcmp(&transport_userspace_runtime, &last_userspace_runtime, sizeof(transport_userspace_runtime))) {
-            needs_sync = true;
-            memcpy(&last_userspace_runtime, &transport_userspace_runtime, sizeof(transport_userspace_runtime));
-        }
-
-        // Perform the sync if requested
-        if (needs_sync || force_sync) {
-            transaction_rpc_send(RPC_ID_RUNTIME_SYNC, sizeof(transport_userspace_runtime), &transport_userspace_runtime);
-            needs_sync = false;
-        }
-    }
-}
-#endif // SPLIT_KEYBOARD
-
-/*---------------------------*\
-|*-----KEYBOARD PRE INIT-----*|
-\*---------------------------*/
-/* This code runs before anything is started.
- * Good for early hardware setup
- */
-__attribute__ ((weak)) void keyboard_pre_init_keymap(void) {}
-__attribute__ ((weak)) void keyboard_pre_init_user(void) {
-    // Keymap specific stuff
-    keyboard_pre_init_keymap();
-}
-
-/*---------------------*\
-|*-----MATRIX INIT-----*|
-\*---------------------*/
-/* This code runs once midway thru the firmware process.
- * So far, sets the base layer and fixes unicode mode
- */
-__attribute__ ((weak)) void matrix_init_keymap(void) {}
-void matrix_init_user (void) {
-    // Keymap specific things
-    matrix_init_keymap();
-}
-
-/*----------------------------*\
-|*-----KEYBOARD POST INIT-----*|
-\*----------------------------*/
-/* This code runs after anything is started.
- * Good for late hardware setup, like setting up layer specifications
- */
-__attribute__ ((weak)) void keyboard_post_init_keymap(void) {}
-__attribute__ ((weak)) void keyboard_post_init_user(void) {
-    // Fix beginning base layer, in case some other firmware was flashed
-    //  set_single_persistent_default_layer(_BASE);
-
-    // Unicode mode
-#   ifdef UNICODEMAP_ENABLE
-    set_unicode_input_mode(UC_LNX);
-#   endif // UNICODEMAP_ENABLE
-
-    // Split keyboard halves communication
-#   ifdef SPLIT_KEYBOARD
-    // Register the transactions
-    transaction_register_rpc( RPC_ID_CONFIG_SYNC, userspace_config_sync );
-    transaction_register_rpc(RPC_ID_RUNTIME_SYNC, userspace_runtime_sync);
-    // Load default config values
-    if (is_keyboard_master()) {
-        // If we are main; load from eeconfig
-        userspace_config.raw = eeconfig_read_user();
-        // And update the transport variable
-        userspace_transport_update();
-        // Do one forced transfer to sync halves
-        userspace_transport_sync(true);
-    } else {
-        // Just sync the data received
-        userspace_transport_update();
-    }
-#   else // SPLIT_KEYBOARD
-    // If we are not split; just load from eeprom
-    userspace_config.raw = eeconfig_read_user();
-#   endif // SPLIT_KEYBOARD
-
-    // Backlight LED
-#   ifdef BACKLIGHT_ENABLE
-    keyboard_post_init_backlight();
-#   endif // BACKLIGHT_ENABLE
-
-    // RGB underglow
-#   ifdef RGBLIGHT_ENABLE
-    keyboard_post_init_underglow();
-#   endif // RGBLIGHT_ENABLE
-
-    // Keymap specific stuff
-    keyboard_post_init_keymap();
-}
-
-/*---------------------------*\
-|*-----HOUSEKEEPING TASK-----*|
-\*---------------------------*/
-/* I have no idea what this does
- */
-__attribute__ ((weak)) void housekeeping_task_keymap(void) {}
-void housekeeping_task_user(void) {
-    // Check eeprom every now and then
-    static userspace_config_t prev_userspace_config;
-    static fast_timer_t throttle_timer = 0;
-    static bool init_flag = true;
-
-    // Read this if we never read it before
-    if (init_flag) {
-        init_flag = false;
-        prev_userspace_config.raw = eeconfig_read_user();
-    }
-
-    // Throttled tasks here
-    if (timer_elapsed_fast(throttle_timer) >= HOUSEKEEPING_THROTTLE_INTERVAL_MS) {
-        // Refresh timer
-        throttle_timer = timer_read_fast();
-        // Check userspace config for eeprom updates
-        if (memcmp(&prev_userspace_config, &userspace_config, sizeof(userspace_config))) {
-            memcpy(&prev_userspace_config, &userspace_config, sizeof(userspace_config));
-            eeconfig_update_user(userspace_config.raw);
-        }
-    }
-
-    // Do transport stuff
-#   ifdef SPLIT_KEYBOARD
-    userspace_transport_update();
-    userspace_transport_sync(false);
-#   endif // SPLIT_KEYBOARD
-
-    // Hook to keymap code
-    housekeeping_task_keymap();
-}
-
-/*-----------------------*\
-|*-----EECONFIG INIT-----*|
-\*-----------------------*/
-/* Default values to send to the eeprom
- */
-void eeconfig_init_user(void) {
-    // Set everything to default
-    userspace_config.raw = 0;
-    // Set encoder states to sane defaults if enabled
-#   ifdef ENCODER_ENABLE
-    reset_encoder_state();
-#   endif // ENCODER_ENABLE
-}
-
-/*------------------------*\
-|*-----PROCESS RECORD-----*|
-\*------------------------*/
-/* Process record: custom keycodes to process here
- * Allow also the following codes to hook here as well;
- *  Macro definitions
- *  Audio hooks
- */
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Return after running through all individual hooks
-    return
-        process_record_keymap(keycode, record)  &&
-#       ifdef AUDIO_ENABLE
-        process_record_audio(keycode, record)   &&
-#       endif // AUDIO_ENABLE
-#       ifdef ENCODER_ENABLE
-        process_record_encoder(keycode, record) &&
-#       endif // ENCODER_ENABLE
-        process_record_macro(keycode, record);
-}
-
-/*---------------------*\
-|*-----MATRIX SCAN-----*|
-\*---------------------*/
-/* This code runs every frame
- * I used to check for layer switching here, but layer state is better used.
- * Try to not put anything here; as it runs hundreds time per second-ish
- */
-__attribute__ ((weak)) void matrix_scan_keymap(void) { }
-void matrix_scan_user (void) {
-    // Keymap specific scan function
-    matrix_scan_keymap();
-}
-
-/*---------------------*\
-|*-----LAYER STATE-----*|
-\*---------------------*/
-/* This code runs after every layer change
- * State represents the new layer state.
- */
-__attribute__ ((weak))
-layer_state_t layer_state_set_keymap (layer_state_t state) {
-    return state;
-}
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Keymap layer state setting
-    state = layer_state_set_keymap(state);
-    // For underglow stuff
-#   ifdef RGBLIGHT_ENABLE
-    state = layer_state_set_underglow(state);
-#   endif // RGBLIGHT_ENABLE
-    // Audio playback
-#   ifdef AUDIO_ENABLE
-    state = layer_state_set_audio(state);
-#   endif // AUDIO_ENABLE
-
-    return state;
-}
-
-/*-----------------------------*\
-|*-----DEFAULT LAYER STATE-----*|
-\*-----------------------------*/
-/* This code runs after every time default base layer is changed
- */
-__attribute__ ((weak))
-layer_state_t default_layer_state_set_keymap (layer_state_t state) {
-    return state;
-}
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    // Keymap level code
-    state = default_layer_state_set_keymap(state);
-    return state;
-}
-
-/*------------------------*\
-|*-----LED SET KEYMAP-----*|
-\*------------------------*/
-/* Code for LED indicators
- * I'm not sure when exactly does this code run
- */
-__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) {}
-void led_set_user(uint8_t usb_led) {
-    led_set_keymap(usb_led);
-}
-
-/*-----------------*\
-|*-----SUSPEND-----*|
-\*-----------------*/
-/* Suspend stuff here, mostly for the rgb lighting.
- */
-__attribute__ ((weak)) void suspend_power_down_keymap (void) { }
-void suspend_power_down_user(void) {
-    suspend_power_down_keymap();
-    // RGB matrix sleep hook
-#   ifdef RGB_MATRIX_ENABLE
-    suspend_power_down_rgb();
-#   endif // RGB_MATRIX_ENABLE
-}
-__attribute__ ((weak)) void suspend_wakeup_init_keymap (void) { }
-void suspend_wakeup_init_user(void) {
-    suspend_wakeup_init_keymap();
-    // RGB matrix sleep hook
-#   ifdef RGB_MATRIX_ENABLE
-    suspend_wakeup_init_rgb();
-#   endif // RGB_MATRIX_ENABLE
-}
-
-<<<<<<< HEAD
-    state = layer_state_set_keymap (state);
-#ifdef RGBLIGHT_ENABLE
-    // Change RGB lighting depending on the last layer activated
-    rgblight_change( get_highest_layer(state) );
-#endif
-    return state;
-||||||| f439fe6055
-    state = layer_state_set_keymap (state);
-#ifdef RGBLIGHT_ENABLE
-    // Change RGB lighting depending on the last layer activated
-    rgblight_change( biton32(state) );
-#endif
-    return state;
-=======
-/*------------------*\
-|*-----SHUTDOWN-----*|
-\*------------------*/
-/* Shutdown stuff here; for when entering bootmode.
- */
-__attribute__ ((weak)) void shutdown_keymap (void) { }
-void shutdown_user(void) {
-    // Underglow LED hook on boot
-#   ifdef RGBLIGHT_ENABLE
-    shutdown_underglow();
-#   endif // RGBLIGHT_ENABLE
-    // Perkey led hook on boot
-#   ifdef RGB_MATRIX_ENABLE
-    shutdown_rgb();
-#   endif // RGB_MATRIX_ENABLE
-    // Keymap hooks
-    shutdown_keymap();
->>>>>>> upstream/master
-}
diff --git a/users/bbaserdem/bbaserdem.h b/users/bbaserdem/bbaserdem.h
deleted file mode 100644
index bfa083b870..0000000000
--- a/users/bbaserdem/bbaserdem.h
+++ /dev/null
@@ -1,573 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include QMK_KEYBOARD_H
-#include "quantum.h"
-#include "keymap_dvorak.h"
-
-/* Besides loading libraries and definitions, this file has my layout defs
- * LAYOUTS:
- *  This file has a couple layouts I use; so that the general changes can be
- *  propagated by only editing this file.
- */
-
-// Macros to use, this has base level code so not affected by enabled features
-#include "bb-macro.h"
-// Audio from onboard speakers
-#ifdef AUDIO_ENABLE
-#include "bb-audio.h"
-#endif // AUDIO_ENABLE
-// Keycap backlight using non-rgb LEDs
-#ifdef BACKLIGHT_ENABLE         
-#include "bb-backlight.h"
-#endif // BACKLIGHT_ENABLE
-// Underglow light using rgb LEDs
-#ifdef RGBLIGHT_ENABLE
-#include "bb-underglow.h"
-#endif // RGBLIGHT_ENABLE
-// Keycap backlight using rgb LEDs
-#ifdef RGB_MATRIX_ENABLE
-#include "bb-rgb.h"
-#endif // RGB_MATRIX_ENABLE
-// Rotary encoder
-#ifdef ENCODER_ENABLE  
-#include "bb-encoder.h"
-#endif // ENCODER_ENABLE
-// Oled screen
-#ifdef OLED_ENABLE
-#include "bb-oled.h"
-#endif // OLED_ENABLE
-
-// Structure to keep runtime info on encoder state
-typedef union {
-    uint32_t raw;
-    struct {
-        bool rgb_sleep;
-    };
-} userspace_runtime_t;
-
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t e0base  :4; // ( 4:0) The encoder state on most layers; regular function
-        uint8_t e1base  :4; // ( 8:1) 9 states for this; 4 bits
-        uint8_t e0point :2; // (10:1) The encoder state on mouse layer; moves pointer
-        uint8_t e1point :2; // (12:1) 4 states for this; 2 bits
-        uint8_t e0rgb   :4; // (16:2) The encoder state on media layer; controls light
-        uint8_t e1rgb   :4; // (20:2) 5 states for this; 3 bits but 4 is better
-        uint8_t layout  :2; // (22:2) Stores keymap layout; 3 states is good on 2 bits
-        uint16_t       :10; // (32:3) Padding here, free space for 10 more bits
-    };
-} userspace_config_t;
-
-// Broadcast us to everyone else
-extern userspace_runtime_t  userspace_runtime;
-extern userspace_config_t   userspace_config;
-
-// Function definitions that can be accessed through specific keymaps
-// Runs before all initialization
-void keyboard_pre_init_keymap(void);
-// For code that launches once midway through initialization
-void matrix_init_keymap(void);
-// For code that launches after initialization is finished.
-void keyboard_post_init_keymap(void);
-// These will be delegated to keymap specific stuff (weak definition)
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
-// This code runs on every tick
-void matrix_scan_keymap(void);
-// This code runs after every layer change
-layer_state_t layer_state_set_keymap(layer_state_t state);
-// This code runs when the default layer changes
-layer_state_t default_layer_state_set_keymap (layer_state_t state);
-// Some code
-void housekeeping_task_user(void);
-// This code runs to set LED states
-void led_set_keymap(uint8_t usb_led);
-// For code that runs on suspend
-void suspend_power_down_keymap(void);
-void suspend_wakeup_init_keymap(void);
-// For code that runs on powerdown
-void shutdown_keymap(void);
-
-// Make it so that keymaps can use KEYMAP_SAFE_RANGE for custom keycodes
-#ifdef KEYMAP_SAFE_RANGE
-#define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE
-#else
-#define PLACEHOLDER_SAFE_RANGE SAFE_RANGE
-#endif
-
-// Custom macro keycode ranges
-enum userspace_custom_keycodes {
-    // Safe stuff
-    BB_SAFE = PLACEHOLDER_SAFE_RANGE,
-    // Double entry macros
-    DBL_ANG,
-    DBL_PAR,
-    DBL_CBR,
-    DBL_BRC,
-    // Macro key
-    BB_PGPK,
-    // Unicode strings
-#   ifdef UNICODEMAP_ENABLE
-    BB_LENY,
-    BB_TABL,
-    TR_FLAG,
-#   endif // UNICODEMAP_ENABLE
-    // Encoder buttons
-#   ifdef ENCODER_ENABLE
-    BB_ENC0,
-    BB_ENC1,
-#   endif // ENCODER_ENABLE
-    // Oled editor
-#   ifdef OLED_ENABLE
-    BB_OLED,
-#   endif // OLED_ENABLE
-    //use for keymap specific codes
-    KEYMAP_SAFE_RANGE
-};
-// Mask these keycodes if required features are not enabled
-#ifndef UNICODEMAP_ENABLE
-#define BB_LENY KC_NO
-#define BB_TABL KC_NO
-#define TR_FLAG KC_NO
-#endif // UNICODEMAP_ENABLE
-#ifndef ENCODER_ENABLE
-#define BB_ENC0 KC_NO
-#define BB_ENC1 KC_NO
-#endif // ENCODER_ENABLE
-
-/// Enumerate of layers
-enum userspace_layers {
-    _BASE = 0,  // Base layer
-    _CHAR,      // Characters layer
-    _GAME,      // Game layer
-    _MEDI,      // R3: Media layer
-    _NAVI,      // R3: Navigation layer
-    _SYMB,      // R1: Symbols layer
-    _NUMB,      // L1: Numbers layer
-    _FUNC,      // L2: Function keys layer
-    _MOUS,      // L3: Mouse keys layer
-    _MUSI       // Music overlay
-};
-
-// Use 7 wide characters for keymaps, to keep things aligned with 4 tabs
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-// These defines allow multiple multi-parameter definitions to expand
-// for these boards
-#define LAYOUT_wrapper(...)             LAYOUT(__VA_ARGS__)
-#define LAYOUT_ortho_4x12_wrapper(...)  LAYOUT_ortho_4x12(__VA_ARGS__)
-#define LAYOUT_ortho_5x15_wrapper(...)  LAYOUT_ortho_5x15(__VA_ARGS__)
-#define LAYOUT_ortho_3x10_wrapper(...)  LAYOUT_ortho_3x10(__VA_ARGS__)
-#define LAYOUT_split_3x6_3_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
-#define LAYOUT_split_3x5_3_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__)
-
-// Masks
-#define ___1___ _______
-#define ___2___ _______,_______
-#define ___3___ _______,_______,_______
-#define ___4___ _______,_______,_______,_______
-#define ___5___ _______,_______,_______,_______,_______
-#define ___6___ _______,_______,_______,_______,_______,_______
-#define xxx1xxx KC_NO
-#define xxx2xxx KC_NO,  KC_NO
-#define xxx3xxx KC_NO,  KC_NO,  KC_NO
-#define xxx4xxx KC_NO,  KC_NO,  KC_NO,  KC_NO
-#define xxx5xxx KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-#define xxx6xxx KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-#define xxx1xxx KC_NO
-#define xxx3xxx KC_NO,  KC_NO,  KC_NO
-#define xxx5xxx KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-#define xxx6xxx KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-
-// Quick macros: in dvorak
-#define BB_UNDO    LCTL(KC_SLSH)    // Ctrl + Z
-#define BB_REDO    LCTL(KC_T)       // Ctrl + Y
-#define BB_YANK    LCTL(KC_I)       // Ctrl + C
-#define BB_CUT     LCTL(KC_B)       // Ctrl + X
-#define BB_PSTE    LCTL(KC_DOT)     // Ctrl + V
-
-// Audio keys
-#ifdef AUDIO_ENABLE
-#define MU_REC  KC_LCTL
-#define MU_STOP KC_LALT
-#define MU_PLAY KC_LGUI
-#define MU_FAST KC_UP
-#define MU_SLOW KC_DOWN
-#define MU_MASK KC_A
-#define BB_SND  MU_ON
-#ifdef TAP_DANCE_ENABLE
-#define MU_TEMP TD(TD_AUDIO_TEMPO)
-#else // TAP_DANCE_ENABLE
-#define MU_TEMP KC_DOWN
-#endif // TAP_DANCE_ENABLE
-#else // AUDIO_ENABLE
-#define MU_REC  KC_NO
-#define MU_STOP KC_NO
-#define MU_PLAY KC_NO
-#define MU_FAST KC_NO
-#define MU_TEMP KC_NO
-#define MU_SLOW KC_NO
-#define MU_MASK KC_NO
-#define BB_SND  KC_MUTE
-#endif // AUDIO_ENABLE
-
-// Unicode keys
-#ifdef UNICODEMAP_ENABLE
-#define TR_ACIR XP(LOW_A_CIRC, UPC_A_CIRC )
-#define TR_CCED XP(LOW_C_CEDI, UPC_C_CEDI )
-#define TR_GBRE XP(LOW_G_BREV, LOW_G_BREV )
-#define TR_ICIR XP(LOW_I_CIRC, LOW_I_CIRC )
-#define TR_I_NO XP(LOW_I_DOTL, LOW_I_DOTL )
-#define TR_IDOT XP(LOW_I_DOTT, LOW_I_DOTT )
-#define TR_ODIA XP(LOW_O_DIAE, LOW_O_DIAE )
-#define TR_SCED XP(LOW_S_CEDI, LOW_S_CEDI )
-#define TR_UCIR XP(LOW_U_CIRC, LOW_U_CIRC )
-#define TR_UDIA XP(LOW_U_DIAE, LOW_U_DIAE )
-#define GR_ALP  XP(LOW_ALPHA,  UPC_ALPHA  )
-#define GR_BET  XP(LOW_BETA,   UPC_BETA   )
-#define GR_GAM  XP(LOW_GAMMA,  UPC_GAMMA  )
-#define GR_DEL  XP(LOW_DELTA,  UPC_DELTA  )
-#define GR_EPS  XP(LOW_EPSILON,UPC_EPSILON)
-#define GR_ZET  XP(LOW_ZETA,   UPC_ZETA   )
-#define GR_ETA  XP(LOW_ETA,    UPC_ETA    )
-#define GR_THE  XP(LOW_THETA,  UPC_THETA  )
-#define GR_IOT  XP(LOW_IOTA,   UPC_IOTA   )
-#define GR_KAP  XP(LOW_KAPPA,  UPC_KAPPA  )
-#define GR_LAM  XP(LOW_LAMBDA, UPC_LAMBDA )
-#define GR_MU   XP(LOW_MU,     UPC_MU     )
-#define GR_NU   XP(LOW_NU,     UPC_NU     )
-#define GR_XI   XP(LOW_XI,     UPC_XI     )
-#define GR_OMI  XP(LOW_OMICRON,UPC_OMICRON)
-#define GR_PI   XP(LOW_PI,     UPC_PI     )
-#define GR_RHO  XP(LOW_RHO,    UPC_RHO    )
-#define GR_SIG  XP(LOW_SIGMA,  UPC_SIGMA  )
-#define GR_TAU  XP(LOW_TAU,    UPC_TAU    )
-#define GR_UPS  XP(LOW_UPSILON,UPC_UPSILON)
-#define GR_PHI  XP(LOW_PHI,    UPC_PHI    )
-#define GR_CHI  XP(LOW_CHI,    UPC_CHI    )
-#define GR_PSI  XP(LOW_PSI,    UPC_PSI    )
-#define GR_OME  XP(LOW_OMEGA,  UPC_OMEGA  )
-#define BB_ELLI X(ELLIPSIS)
-#define BB_PLNK X(PLANCK_CON)
-#define BB_ANGS X(ANGSTROM)
-#define BB_BITC X(BITCOIN)
-#else // UNICODEMAP_ENABLE
-#define TR_ACIR KC_A
-#define TR_CCED KC_C
-#define TR_GBRE KC_G
-#define TR_ICIR KC_I
-#define TR_I_NO KC_I
-#define TR_IDOT KC_I
-#define TR_ODIA KC_O
-#define TR_SCED KC_S
-#define TR_UCIR KC_U
-#define TR_UDIA KC_U
-#define GR_ALP  KC_NO
-#define GR_BET  KC_NO
-#define GR_GAM  KC_NO
-#define GR_DEL  KC_NO
-#define GR_EPS  KC_NO
-#define GR_ZET  KC_NO
-#define GR_ETA  KC_NO
-#define GR_THE  KC_NO
-#define GR_IOT  KC_NO
-#define GR_KAP  KC_NO
-#define GR_LAM  KC_NO
-#define GR_MU   KC_NO
-#define GR_NU   KC_NO
-#define GR_XI   KC_NO
-#define GR_OMI  KC_NO
-#define GR_PI   KC_NO
-#define GR_RHO  KC_NO
-#define GR_SIG  KC_NO
-#define GR_TAU  KC_NO
-#define GR_UPS  KC_NO
-#define GR_PHI  KC_NO
-#define GR_CHI  KC_NO
-#define GR_PSI  KC_NO
-#define GR_OME  KC_NO
-#define BB_ELLI KC_NO
-#define BB_PLNK KC_NO
-#define BB_ANGS KC_NO
-#define BB_BITC KC_NO
-#endif // UNICODEMAP_ENABLE
-
-// MOD-tap definitions
-#define GUI_A   MT(MOD_LGUI, DV_A)
-#define ALT_O   MT(MOD_LALT, DV_O)
-#define CTRL_E  MT(MOD_LCTL, DV_E)
-#define SHIFT_U MT(MOD_LSFT, DV_U)
-#define ALTGR_Q MT(MOD_RALT, DV_Q)
-#define GUI_S   MT(MOD_RGUI, DV_S)
-#define ALT_N   MT(MOD_LALT, DV_N)
-#define CTRL_T  MT(MOD_LCTL, DV_T)
-#define SHIFT_H MT(MOD_LSFT, DV_H)
-#define ALTGR_V MT(MOD_RALT, DV_V)
-
-// Layer switches
-#define MED_DEL LT(_MEDI, KC_DEL )
-#define NAV_TAB LT(_NAVI, KC_TAB )
-#define SYM_SPC LT(_SYMB, KC_SPC )
-#define NUM_ENT LT(_NUMB, KC_ENT )
-#define FUN_ESC LT(_FUNC, KC_ESC )
-#define MOU_BSP LT(_MOUS, KC_BSPC)
-
-// Layer switches
-#define BB_CHAR OSL(_CHAR)
-#define BB_GAME TG(_GAME)
-
-/* Depending on how the layouts change with language; the keys are shown as;
- * ┌────────────────────────────────────────────────┐
- * │AltGr       -none-      Shift       Shift+AltGr │
- * └────────────────────────────────────────────────┘
- * If there is an exclamation mark; it indicates a dead key on this map.
- */
-
-/* Base layout
- * DVORAK
- *      ┌─────┬─────┬─────┬─────┬─────┐             ┌─────┬─────┬─────┬─────┬─────┐
- *  ` ~ │ ' " │ , < │ . > │ p P │ y Y │             │ f F │ g G │ c C │ r R │ l L │ < > 
- *      ├─────┼─────┼─────┼─────┼─────┤             ├─────┼─────┼─────┼─────┼─────┤
- *  \ | │ a A │ o O │ e E │ u U │ i I │             │ d D │ h H │ t T │ n N │ s S │ - _ 
- *      ├─Gui─┼─Alt─┼─Ctr─┼─Sft─┼─────┤             ├─────┼─Sft─┼─Ctr─┼─Alt─┼─Gui─┤
- *  / ? │ ; : │ q Q │ j J │ k K │ x X │             │ b B │ m M │ w W │ v V │ z Z │ = + 
- *      └─────┴AltGr┴─────┼─────┼─────┼─────┐ ┌─────┼─────┼─────┼─────┴AltGr┴─────┘
- *                        │ Del │ Tab │Space│ │Enter│ Esc │BkSpc│
- *                        └─Med─┴─Nav─┴─Sym─┘ └─Num─┴─Fun─┴─Mou─┘
- * TURKISH F
- *      ┌─────┬─────┬─────┬─────┬─────┐             ┌─────┬─────┬─────┬─────┬─────┐
- * ¬+ *±│@f F │ g G │ ğ Ğ │¶ı I │ôo OÔ│             │¥d D │®r R │ n N │°h H │£p P │|< >¦
- *     !├─────┼─────┼─────┼─────┼─────┤             ├─────┼─────┼─────┼─────┼────!┤    !
- * `x Xà│ûu UÛ│îi İÎ│€e E │âa AÂ│ûü ÜÛ│             │₺t T │ k K │µm M │ l L │´y Yá│#ş Şǎ
- * !   !├─Gui─┼─Alt─┼─Ctr─┼─Sft─┼─────┤             ├─────┼─Sft─┼─Ctr─┼─Alt!┼─Gui─┤    
- * äq Qå│«j J<│»ö Ö>│“v V │¢c C©│”ç Ç │             │ z Z │§s S │×b B │÷. :ȧ│·, ; │~w W 
- *      └─────┴AltGr┴─────┼─────┼─────┼─────┐ ┌─────┼─────┼─────┼─────┴AltGr┴─────┘
- *                        │ Del │ Tab │Space│ │Enter│ Esc │BkSpc│
- *                        └─Med─┴─Nav─┴─Sym─┘ └─Num─┴─Fun─┴─Mou─┘
- * The thing about this layout is that these will fit most boards I have.
- */
-#define _BL1_5_ DV_QUOT,DV_COMM,DV_DOT, DV_P,   DV_Y
-#define _BR1_5_ DV_F,   DV_G,   DV_C,   DV_R,   DV_L
-#define _BL2_5_ GUI_A,  ALT_O,  CTRL_E, SHIFT_U,DV_I
-#define _BR2_5_ DV_D,   SHIFT_H,CTRL_T, ALT_N,  GUI_S
-#define _BL3_5_ DV_SCLN,ALTGR_Q,DV_J,   DV_K,   DV_X
-#define _BR3_5_ DV_B,   DV_M,   DV_W,   ALTGR_V,DV_Z
-#define _BL4_3_ MED_DEL,NAV_TAB,SYM_SPC
-#define _BR4_3_ NUM_ENT,FUN_ESC,MOU_BSP
-// The extra line for the 6th (or 0th) row
-#define _BL1_1_ DV_GRV
-#define _BR1_1_ KC_NUBS
-#define _BL2_1_ DV_BSLS
-#define _BR2_1_ DV_MINS
-#define _BL3_1_ DV_SLSH
-#define _BR3_1_ DV_EQL
-
-/* Extra characters layer
- * This is accessed using unicode; so IBus compatible apps only.
- * ┌─────┬─────┬─────┬─────┬─────┐             ┌─────┬─────┬─────┬─────┬─────┐
- * │TrFlg│Lenny│Table│  π  │  υ  │             │  φ  │  γ  │  χ  │  ρ  │  λ  │
- * ├─────┼─────┼─────┼─────┼─────┤             ├─────┼─────┼─────┼─────┼─────┤
- * │  α  │  ο  │  ε  │  ψ  │  ι  │             │  δ  │  η  │  τ  │  ν  │  σ  │
- * ├─────┼─────┼─────┼─────┼─────┤             ├─────┼─────┼─────┼─────┼─────┤
- * │  ₿  │  θ  │  ℏ  │  κ  │  ξ  │             │  β  │  μ  │  ω  │  Å  │  ζ  │
- * └─────┴─────┴─────┼─────┼─────┼─────┐ ┌─────┼─────┼─────┼─────┴─────┴─────┘
- *                   │ Shf │ ... │ GPG │ │     │     │ Shf │
- *                   └─────┴─────┴─────┘ └─────┴─────┴─────┘
- *
- */
-#define _CL1_5_ TR_FLAG,BB_LENY,BB_TABL,GR_PI,  GR_UPS
-#define _CR1_5_ GR_PHI, GR_GAM, GR_CHI, GR_RHO, GR_LAM
-#define _CL2_5_ GR_ALP, GR_OMI, GR_EPS, GR_PSI, GR_IOT
-#define _CR2_5_ GR_DEL, GR_ETA, GR_TAU, GR_NU,  GR_SIG
-#define _CL3_5_ BB_BITC,GR_THE, BB_PLNK,GR_KAP, GR_XI
-#define _CR3_5_ GR_BET, GR_MU,  GR_OME, BB_ANGS,GR_ZET
-#define _CL4_3_ KC_RSFT,BB_ELLI,BB_PGPK
-#define _CR4_3_ XXXXXXX,XXXXXXX,KC_LSFT
-
-/* Game layer
- * This layer turns off the tap-hold keys for the left half.
- *      ┌─────┬─────┬─────┬─────┬─────┐
- *      │  Q  │  W  │  E  │  R  │  T  │
- *      ├─────┼─────┼─────┼─────┼─────┤
- *  Tab │  A  │  S  │  D  │  F  │  G  │
- *      ├─────┼─────┼─────┼─────┼─────┤
- * Shift│  Z  │  X  │  C  │  V  │  B  │
- *      └─────┴─────┴─────┼─────┼─────┼─────┐
- *                        │ Esc │Enter│Space│
- *                        └─────┴─────┴─────┘
- */
-#define _GA1_5_ KC_Q,   KC_W,   KC_E,   KC_R,   KC_T
-#define _GA1_1_ _______
-#define _GA2_5_ KC_A,   KC_S,   KC_D,   KC_F,   KC_G
-#define _GA2_1_ KC_TAB
-#define _GA3_5_ KC_Z,   KC_X,   KC_C,   KC_V,   KC_B
-#define _GA3_1_ KC_LSFT
-#define _GA4_3_ KC_ESC, KC_ENT, KC_SPC
-
-/* Media layer
- *       ┌─────┬─────┬─────┬─────┬─────┐
- *       │Speed│ Mod │ Hue │ Sat │ Bri │ RGB light control
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │Togg.│Prev.│MuTog│MuStp│Next │ Media control
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │Sink │Vol -│ Mut │Eject│Vol +│ Volume control
- * ┌─────┼─────┼─────┼─────┴─────┴─────┘
- * │OledL│Veloc│Music│                   Feature control on keyboard
- * └─────┴─────┴─────┘
- */
-#define _ME1_5_ RGB_SPI,RGB_MOD,RGB_HUI,RGB_SAI,RGB_VAI
-#define _ME2_5_ RGB_TOG,KC_MPRV,KC_MPLY,KC_MSTP,KC_MNXT
-#define _ME3_5_ KC_F13, KC_VOLD,KC_MUTE,KC_EJCT,KC_VOLU
-#define _ME4_3_ BB_OLED,VLK_TOG,MU_TOG
-
-/* Navigation layer
- *       ┌─────┬─────┬─────┬─────┬─────┐
- *       │Redo │Paste│Yank │ Cut │PrScr│
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │Undo │  <  │  v  │  ^  │  >  │
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │ Ins │Home │PgDwn│PgUp │ End │
- * ┌─────┼─────┼─────┼─────┴─────┴─────┘
- * │Enter│ Esc │BkSpc│
- * └─────┴─────┴─────┘
- */
-#define _NA1_5_ BB_REDO,BB_PSTE,BB_YANK,BB_CUT, KC_PSCR
-#define _NA2_5_ BB_UNDO,KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT
-#define _NA3_5_ KC_INS, KC_HOME,KC_PGDN,KC_PGUP,KC_END
-#define _NA4_3_ KC_ENT, KC_ESC, KC_BSPC
-
-/* Symbols layer
- *  This layer has the central columns shifted for convenience
- * DVORAK
- *       ┌─────┬─────┬─────┬─────┬─────┐
- *       │  `  │  {  │  }  │  /  │  =  │
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │  ~  │  [  │  ]  │  ?  │  +  │
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │CapsL│  (  │  )  │  \  │  |  │
- * ┌─────┼─────┼─────┼─────┴─────┴─────┘
- * │Enter│ Esc │BkSpc│
- * └─────┴─────┴─────┘
- * Turkish F
- * (AltGr is right on the central column, red. keys on main layer are omitted)
- *       ┌─────┬─────┬─────┬─────┬─────┐
- *       │ + ¬ │ / \ │ - | │     │     │ 
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │ * ± │ ? ¿ │  _  │     │     │
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │CapsL│     │     │     │     │
- * ┌─────┼─────┼─────┼─────┴─────┴─────┘
- * │Enter│ Esc │BkSpc│
- * └─────┴─────┴─────┘
- * QWERTY
- *       ┌─────┬─────┬─────┬─────┬─────┐
- *       │  `  │  -  │  =  │  {  │  }  │
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │  ~  │  _  │  +  │  [  │  ]  │
- *       ├─────┼─────┼─────┼─────┼─────┤
- *       │CapsL│  (  │  )  │  \  │  |  │
- * ┌─────┼─────┼─────┼─────┴─────┴─────┘
- * │Enter│ Esc │BkSpc│
- * └─────┴─────┴─────┘
- */
-#define _SY1_5_ DV_GRV, DV_LCBR,DV_RCBR,DV_SLSH,DV_EQL
-#define _SY2_5_ DV_TILD,DV_LBRC,DV_RBRC,DV_QUES,DV_PLUS
-#define _SY3_5_ KC_CAPS,DV_LPRN,DV_RPRN,DV_BSLS,DV_PIPE
-#define _SY4_3_ KC_ENT, KC_ESC, KC_BSPC
-
-/* Numbers layer
- *  This layer contains numbers and the associated symbols.
- * DVORAK
- * ┌─────┬─────┬─────┬─────┬─────┐
- * │  <  │ 7 & │ 8 * │ 9 ( │ 0 ) │
- * ├─────┼─────┼─────┼─────┼─────┤
- * │  _  │ 4 $ │ 5 % │ 6 ^ │  -  │
- * ├─────┼─────┼─────┼─────┼─────┤
- * │  >  │ 1 ! │ 2 @ │ 3 # │Char.│
- * └─────┴─────┴─────┼─────┼─────┼─────┐
- *                   │ Del │ Tab │Space│
- *                   └─────┴─────┴─────┘
- * Turkish F
- * ┌─────┬─────┬─────┬─────┬─────┐
- * │ < | │{7 ' │[8 ( │]9 )±│}0 =°│
- * ├─────┼─────┼─────┼─────┼─────┤
- * │     │¼4 $ │½5 %⅜│¾6 & │     │
- * ├─────┼─────┼─────┼─────┼─────┤
- * │ > ¦ │¹1 !¡│²2 " │#3 ^³│Char.│
- * └─────┴─────┴─────┼─────┼─────┼─────┐
- *                   │ Del │ Tab │Space│
- *                   └─────┴─────┴─────┘
- */
-#define _NU1_5_         KC_NUBS,KC_7,   KC_8,   KC_9,   KC_0
-#define _NU2_5_         DV_UNDS,KC_4,   KC_5,   KC_6,   DV_MINS
-#define _NU3_5_ LSFT(KC_NUBS),  KC_1,   KC_2,   KC_3,   BB_CHAR
-#define _NU4_3_ KC_DEL, KC_TAB, KC_SPC
-
-/* Function layer
- * ┌─────┬─────┬─────┬─────┬─────┐
- * │ F01 │ F02 │ F03 │ F04 │EEPRM│
- * ├─────┼─────┼─────┼─────┼─────┤
- * │ F05 │ F06 │ F07 │ F08 │EEPRM│
- * ├─────┼─────┼─────┼─────┼─────┤
- * │ F09 │ F10 │ F11 │ F12 │GameL│
- * └─────┴─────┴─────┼─────┼─────┼─────┐
- *                   │ Del │ Tab │Space│
- *                   └─────┴─────┴─────┘
- */
-#define _FU1_5_ KC_F1,  KC_F2,  KC_F3,  KC_F4,  RESET
-#define _FU2_5_ KC_F5,  KC_F6,  KC_F7,  KC_F8,  EE_CLR
-#define _FU3_5_ KC_F9,  KC_F10, KC_F11, KC_F12, BB_GAME
-#define _FU4_3_ KC_DEL, KC_TAB, KC_SPC
-
-/* Mouse layer
- * ┌─────┬─────┬─────┬─────┬─────┐
- * │Slow │Right│ Mid │ Lft │Fast │
- * ├─────┼─────┼─────┼─────┼─────┤
- * │ |<| │ |v| │ |^| │ |>| │ Bt4 │
- * ├─────┼─────┼─────┼─────┼─────┤
- * │ <<< │ vvv │ ^^^ │ >>> │ Bt5 │
- * └─────┴─────┴─────┼─────┼─────┼─────┐
- *                   │ Del │ Tab │Space│
- *                   └─────┴─────┴─────┘
- */
-#define _MO1_5_ KC_ACL0,KC_BTN1,KC_BTN2,KC_BTN3,KC_ACL2
-#define _MO2_5_ KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,KC_BTN4
-#define _MO3_5_ KC_WH_L,KC_WH_D,KC_WH_U,KC_WH_R,KC_BTN5
-#define _MO4_3_ KC_DEL, KC_TAB, KC_SPC
-
-/* Music layer
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │   │   │   │   │   │   │   │   │   │   │   │   │
- * └───┴───┴───┼───┼───┼───┼───┼───┼───┼───┴───┴───┘
- *             │Rec│Stp│Ply│Tmp│Mod│Off│
- *             └───┴───┴───┴───┴───┴───┘
- */
-#define _MUL_3_ MU_REC, MU_STOP,MU_PLAY
-#define _MUR_3_ MU_TEMP,MU_MOD, MU_TOG
-#define _MU_01_ MU_MASK
-#define _MU_02_ MU_MASK,MU_MASK
-#define _MU_03_ MU_MASK,MU_MASK,MU_MASK
-#define _MU_06_ MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK
-#define _MU_08_ MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK
-#define _MU_10_ MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK
-#define _MU_12_ MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK
diff --git a/users/bbaserdem/config.h b/users/bbaserdem/config.h
deleted file mode 100644
index 3c467d5e7d..0000000000
--- a/users/bbaserdem/config.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-/* CONFIG
- * Common hardware configuration accross my boards
- */
-// Space saving
-#ifdef LOCKING_SUPPORT_ENABLE
-#    undef LOCKING_SUPPORT_ENABLE
-#endif
-#ifdef LOCKING_RESYNC_ENABLE
-#    undef LOCKING_RESYNC_ENABLE
-#endif
-#ifndef NO_DEBUG
-#   define NO_DEBUG
-#endif
-
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#   define NO_PRINT
-#endif
-
-// Some of my own settings
-# define HOUSEKEEPING_THROTTLE_INTERVAL_MS 250
-
-// Split transport settings
-#ifdef SPLIT_KEYBOARD
-#   define SPLIT_TRANSPORT_MIRROR
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define SPLIT_MODS_ENABLE
-#   define SPLIT_TRANSACTION_IDS_USER RPC_ID_CONFIG_SYNC, RPC_ID_RUNTIME_SYNC, RPC_ID_KEYMAP_SYNC
-#   define SPLIT_LED_STATE_ENABLE
-#   ifdef WPM_ENABLE
-#       define SPLIT_WPM_ENABLE
-#   endif // WPM_ENABLE
-#   ifdef OLED_ENABLE
-#       define SPLIT_OLED_ENABLE
-#   endif // OLED_ENABLE
-#endif // SPLIT_KEYBOARD
-
-// Unicode entry mode
-#ifdef UNICODEMAP_ENABLE
-#   define UNICODE_SELECTED_MODES UC_LNX
-    // Adapt the unicode entry mode to dvorak
-#   ifdef UNICODE_KEY_LNX
-#   undef UNICODE_KEY_LNX
-#   endif
-#   define UNICODE_KEY_LNX LCTL(LSFT(KC_F))
-#endif // UNICODEMAP_ENABLE
-
-// Mousekey mode
-#ifdef MOUSEKEY_ENABLE
-#   define MK_COMBINED
-#endif // MOUSEKEY_ENABLE
-
-// Tap-hold settings
-#define TAPPING_TERM 200
-#define TAP_CODE_DELAY 20
-#define IGNORE_MOD_TAP_INTERRUPT
-#define PERMISSIVE_HOLD
-#define TAPPING_FORCE_HOLD
-
-// Backlight settings
-#ifdef BACKLIGHT_ENABLE
-#   define BACKLIGHT_BREATHING
-#   define BREATHING_PERIOD 5
-#endif // BACKLIGHT_ENABLE
-
-// Audio definitions
-#ifdef AUDIO_ENABLE
-//#   define AUDIO_ENABLE_TONE_MULTIPLEXING
-    // Make findable songs as defaults
-#   ifdef HOROLOGY
-#   define STARTUP_SONG    SONG(HOROLOGY)
-#   endif
-#   ifdef PEOPLE_VULTURES
-#   define GOODBYE_SONG    SONG(PEOPLE_VULTURES)
-#   endif
-#   ifdef NONAGON_INFINITY
-#   define MUSIC_ON_SONG   SONG(NONAGON_INFINITY)
-#   endif
-#   ifdef WAH_WAH
-#   define MUSIC_OFF_SONG  SONG(WAH_WAH)
-#   endif
-    // Audio code expects these to be defined
-#   ifdef BIG_FIG_WASP
-#   define GAME_ON_SONG    SONG(BIG_FIG_WASP)
-#   else
-#   define GAME_ON_SONG    SONG(USSR_ANTHEM)
-#   endif
-#   ifdef POLYGONDWANALAND
-#   define GAME_OFF_SONG   SONG(POLYGONDWANALAND)
-#   else
-#   define GAME_OFF_SONG   SONG(NOCTURNE_OP_9_NO_1)
-#   endif
-#endif // AUDIO_ENABLE
-
-// OLED definitions
-#ifdef OLED_ENABLE
-    // Timeout does not work for split secondary board; i implemented it myself
-#   define OLED_TIMEOUT 30000
-    // Fade out the screen when timing out
-#   define OLED_FADE_OUT
-#   define OLED_FADE_OUT_INTERVAL 15
-#endif // OLED_ENABLE
-
-// For perkey leds
-#ifdef RGB_MATRIX_ENABLE
-// This is not working
-//#   define RGB_MATRIX_TIMEOUT 1800000
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED true
-    // Start using this mode
-#   define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_BEACON
-#   define RGB_MATRIX_STARTUP_HUE 100
-#   define RGB_MATRIX_STARTUP_SAT 255
-#   define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    // Some config options
-#   define RGB_MATRIX_KEYRELEASES
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS      // Enable framebuffer effects
-#endif // RGB_MATRIX_ENABLE
diff --git a/users/bbaserdem/keymap-bitmaps/.gitignore b/users/bbaserdem/keymap-bitmaps/.gitignore
deleted file mode 100644
index 6448f593d6..0000000000
--- a/users/bbaserdem/keymap-bitmaps/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bmp
-splitImages
-templates
-!.gitignore
diff --git a/users/bbaserdem/keymap-bitmaps/cropBmp b/users/bbaserdem/keymap-bitmaps/cropBmp
deleted file mode 100755
index 4a322b4175..0000000000
--- a/users/bbaserdem/keymap-bitmaps/cropBmp
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Goes through all the files and turns them into strips in their respective folder
-if [ -z "${1}" ] ; then
-  echo 'No argument; defaulting to script directory.'
-  target_dir="$(dirname "${0}")"
-elif [ -d "${1}" ] ; then
-  echo "Targeting files in '${1}'."
-  target_dir="${1}"
-else
-  echo 'Argument is not directory.'
-  exit 1
-fi
-
-output_dir="${target_dir}/splitImages"
-mkdir -p "${output_dir}"
-
-for this_image in "${target_dir}/"*.bmp ; do
-  echo "Found '${this_image}'."
-  this_name="$(basename "${this_image%%.bmp}")"
-  convert "${this_image}" -crop 'x8' "${output_dir}/${this_name}"_%d.bmp
-done
diff --git a/users/bbaserdem/readme.md b/users/bbaserdem/readme.md
deleted file mode 100644
index 0a1b80cc74..0000000000
--- a/users/bbaserdem/readme.md
+++ /dev/null
@@ -1,131 +0,0 @@
-# BBASERDEM userspace code for qmk
-
-My userspace code for my various keyboards; available here.
-
-## Builds
-
-These are my keyboard builds and info, it allows me to plan out my builds. 
-
-### Planck SERVER
-
-* Board: `kprepublic/jj40`
-* Microcontroller: Embedded
-* Layout: `ortho_4x12`
-* Functionality: Underglow RGB Lighting, LED diode lighting.
-* Case: Clear Acrylic Top and Bottow, with Frosted Acrylic Diffuser (Smashing Acrylics)
-* Switches: BOX Navy
-* Keycaps: Datamancer Tall Deco Typewriter Keycaps
-
-Just a decorative planck replacement (for my rev4 PCB that died.)
-
-### Planck Light
-
-* Board: `planck/light`
-* Microcontroller: Embedded
-* Layout: `ortho_4x12`
-* Functionality: Per-key RGB Lighting, Audio.
-* Case: Clear Acrylic Top and Bottow, with Frosted Acrylic Diffuser (Smashing Acrylics)
-* Switches: BOX Navy
-* Keycaps: Datamancer Tall Deco Typewriter Keycaps
-
-Just a decorative planck replacement (for my rev4 PCB that died.)
-
-### Corne ARM
-
-* Board: `crkbd/rev1`
-* Microcontroller: Proton C (x2)
-* Layout: `split_3x6_3`
-* Functionality: OLED, Audio, Per-key RGB Lighting, Rotary Encoder (x2)
-* Case: IMK Corne Case v2 Polycarbonate
-* Switches: Healios V2
-* Keycaps: POM Jelly
-
-PCB is actually [Proton-C Compatible crkbd PCB](https://github.com/ItsWaffIe/waffle_corne).
-
-### Corne Lite
-
-* Board: `crkbd/rev1`
-* Microcontroller: Pro Micro (x2)
-* Layout: `split_3x5_3`
-* Functionality: Per-key RGB Lighting, OLED (No firmware space)
-* Case: Custom
-* Switches: Choc Low Burnt Orange
-* Keycaps: [Scooped Choc Keycaps](https://mkultra.click/collections/keycaps/products/scooped-choc-keycaps?variant=31223543365730)
-
-Maybe try adding a trackpad for this, as detailed
-[here](https://github.com/manna-harbour/crkbd/blob/master/trackpoint/readme.org).
-
-### Kyria
-
-* Board: `splitkb/kyria/rev1`
-* Microcontroller: Pro Micro (x2)
-* Layout: `split_3x6_6`
-* Functionality: OLED, Underglow RGB Lighting (No firmware space), Rotary Encoder (x2)
-* Case: Matte Black Acrylic High-Profile case
-* Switches: Gateron Ink Silent Black
-* Keycaps: Oblotzky SA Oblivion
-
-Main driver at work currently; love the switches and the board layout.
-
-# Firmware building
-
-## Archlinux
-
-On archlinux, the package *arm-none-eabi-gcc* is too new.
-To fix; add to the environment `CFLAGS="-Wno-error=deprecated"` to compilation commands.
-Also; says to run `avr-gcc` version `8.4.0` for smaller firmware,
-but I find that it only saves a few bytes.
-
-## Bootloader
-
-Needed to type this out from the QMK website.
-If I want to flash a new bootloader for a machine; here are steps;
-
-1. Flash the util/pro_micro_ISP_B6_10.hex to a spare promicro using;
-`avrdude -p atmega32u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:pro_micro_ISP_B6_10.hex`
-2. Wire the pins; (first is the ISP pro micro; second is the target)
-```
-Pro Micro 10 (B6)  <-> Keyboard RESET
-Pro Micro 15 (B1)  <-> Keyboard B1 (SCLK)
-Pro Micro 16 (B2)  <-> Keyboard B2 (MOSI)
-Pro Micro 14 (B3)  <-> Keyboard B3 (MISO)
-Pro Micro VCC      <-> Keyboard VCC
-Pro Micro GND      <-> Keyboard GND
-```
-I do have this on hand I believe; from massdrop's planck light firmware updater.
-3. Connect the flashed pro micro to my computer and run
-`avrdude -c avrisp -P "$(ls /dev/ttyACM*)" -p atmega32u4 -U flash:w:bootloader_atmega32u4_1.0.0.hex:i -U lfuse:w:0x5E:m -U hfuse:w:0xD9:m -U efuse:w:0xC3:m`
-
-The avrisp here refers to the firmware on the ISP flasher pro micro.
-The `atmega32u4` refers to the CPU used in the respective breakout boards.
-The `avrdude` command interacts with catalina bootloader.
-The shell call after the `-P` flag auto finds the port that the pro micro connects to.
-The last few arguments are some jumpers apparently.
-
-# Features
-
-My userspace has a lot of shared code between different keyboards.
-These files are prefixed with `sbp-` to remove any naming clash.
-
-* [bb-audio](bb-audio.c): Code dealing with audio playback using onboard sound.
-* [bb-encoder](bb-encoder.c): Rotary encoder sutff.
-* [bb-macro](bb-macro.c): My custom keycodes; macros, tap dances, etc.
-* [bb-oled](bb-oled.c): Controls OLED displays. For higher memory; there is also [bb-oled-extra](bb-oled-extra.c).
-* [bb-rgb](bb-rgb.c): Controls per-key RGB LED matrix stuff, and layer indication. Uses `RGB_MATRIX`.
-* [bb-underglaw](bb-underglow.c): Controls RGB LED strip, and layer indication. Uses `RGBLIGHT`.
-
-# Layout
-
-My personal layout is mostly inspired by the
-[Miryoku layout](../manna-harbour_miryoku/miryoku.org).
-There are some changes to make it friendlier to international keyboards.
-My board is compatible with software implementation of Dvorak and Turkish F.
-
-## Base
-
-Base layer uses tap-hold functionality to have access to modifiers.
-The modifiers are mirrored on each half of the layout;
-as to make those modifiers accessible to the keys that overlap them.
-Besides the Alt key; each side has the proper L/R version of the modifier.
-Since Right Alt key functions as AltGr key;
-both the L and R versions are available on each side.
diff --git a/users/bbaserdem/rules.mk b/users/bbaserdem/rules.mk
deleted file mode 100644
index 58f72bb110..0000000000
--- a/users/bbaserdem/rules.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Common compilation flags
-LTO_ENABLE = yes
-
-# These should be enabled in all boards
-MOUSEKEY_ENABLE = yes   # Mouse emulation keys
-EXTRAKEY_ENABLE = yes   # OS signals like volume control
-UNICODEMAP_ENABLE = yes # Used for unicode character emulation
-
-# These should be disabled in all boards
-BOOTMAGIC_ENABLE = no   # Access to EEPROM settings, not needed
-CONSOLE_ENABLE = no     # Allows console output with a command
-COMMAND_ENABLE = no     # Some bootmagic thing i dont use
-SLEEP_LED_ENABLE = no   # Breathes LED's when computer is asleep. Untested.
-MIDI_ENABLE = no        # Midi driver (untested)
-UNICODE_ENABLE = no 	# We use unicodemap, not unicode
-UCIS_ENABLE = no 	# We use unicodemap, not ucis
-VARIABLE_TRACE = no     # Allows debugging variables
-KEY_LOCK_ENABLE = no    # Allows locking any key. Not used in general
-RGBLIGHT_ENABLE = no    # LED strip, but there is RGB_MATRIX instead
-TAP_DANCE_ENABLE = no   # Tap dance keys; i don't use tap dance
-
-# These features can be disabled at whim
-NKRO_ENABLE ?= yes      # Default is 6KRO
-VELOCIKEY_ENABLE ?= yes # Speed effects change with typing speed
-WPM_ENABLE ?= yes       # Get WPM reports as you type
-
-# Manually configure these on each keyboard individually
-# AUDIO_ENABLE            # Audio stuff
-# BACKLIGHT_ENABLE        # Switch LEDs
-# ENCODER_ENABLE          # Rotary encoder
-# RGB_MATRIX_ENABLE       # RGB LEDs
-# OLED_ENABLE  	          # For OLED
-
-# Userspace code
-SRC += bbaserdem.c
-
-# Macros
-SRC += bb-macro.c
-
-# Audio code
-ifeq ($(strip $(AUDIO_ENABLE)), yes)
-SRC += bb-audio.c
-endif
-
-# Rotary encoder stuff
-ifeq ($(strip $(ENCODER_ENABLE)), yes)
-SRC += bb-encoder.c
-endif
-
-# RGB LED (Underglow) code
-ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
-SRC += bb-underglow.c
-endif
-
-# RGB LED (Perkey) code
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-SRC += bb-rgb.c
-endif
-
-# Backlight code
-ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
-SRC += bb-backlight.c
-endif
-
-# OLED code
-ifeq ($(strip $(OLED_ENABLE)), yes)
-    SRC += bb-oled.c
-    ifeq ($(strip $(CTPC)), yes)
-        SRC += bb-oled-extra.c
-    endif
-endif

From 1ea54e5052fdf2ced1e19ff5a5f54a9d25156d1d Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Sat, 22 Oct 2022 20:16:09 +0300
Subject: [PATCH 698/959] ChibiOS USB: Add a dummy IN callback to work around
 LLD bugs (#18811)

In #18631 some IN notification callbacks that were doing nothing were
removed, which should be a valid thing to do (ChibiOS HAL checks the
`in_cb` and `out_cb` pointers for being non-NULL before invoking those
optional callbacks).  However, it turned out that some less popular USB
LLDs (KINETIS and MIMXRT1062) have their own checks for those pointers,
and (incorrectly) skip the ChibiOS callback handling when those pointers
are NULL, which breaks the code for the `USB_USE_WAIT` configuration
option (the waiting thread never gets resumed if the corresponding
callback pointer is NULL).

Add those dummy callbacks again (but use a single function for all of
them instead of individual ones for each endpoint); this restores the
KINETIS and MIMXRT1062 boards to the working state while the LLDs are
getting fixed.
---
 tmk_core/protocol/chibios/usb_main.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 2bf273488b..fb3d575846 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -120,6 +120,16 @@ static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype
         return &desc;
 }
 
+/*
+ * 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;
@@ -127,7 +137,7 @@ static USBInEndpointState kbd_ep_state;
 static const USBEndpointConfig kbd_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    NULL,                   /* IN notification callback */
+    dummy_usb_cb,           /* IN notification callback */
     NULL,                   /* OUT notification callback */
     KEYBOARD_EPSIZE,        /* IN maximum packet size */
     0,                      /* OUT maximum packet size */
@@ -145,7 +155,7 @@ static USBInEndpointState mouse_ep_state;
 static const USBEndpointConfig mouse_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    NULL,                   /* IN notification callback */
+    dummy_usb_cb,           /* IN notification callback */
     NULL,                   /* OUT notification callback */
     MOUSE_EPSIZE,           /* IN maximum packet size */
     0,                      /* OUT maximum packet size */
@@ -163,7 +173,7 @@ static USBInEndpointState shared_ep_state;
 static const USBEndpointConfig shared_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    NULL,                   /* IN notification callback */
+    dummy_usb_cb,           /* IN notification callback */
     NULL,                   /* OUT notification callback */
     SHARED_EPSIZE,          /* IN maximum packet size */
     0,                      /* OUT maximum packet size */
@@ -181,7 +191,7 @@ static USBInEndpointState joystick_ep_state;
 static const USBEndpointConfig joystick_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    NULL,                   /* IN notification callback */
+    dummy_usb_cb,           /* IN notification callback */
     NULL,                   /* OUT notification callback */
     JOYSTICK_EPSIZE,        /* IN maximum packet size */
     0,                      /* OUT maximum packet size */
@@ -199,7 +209,7 @@ static USBInEndpointState digitizer_ep_state;
 static const USBEndpointConfig digitizer_ep_config = {
     USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
     NULL,                   /* SETUP packet notification callback */
-    NULL,                   /* IN notification callback */
+    dummy_usb_cb,           /* IN notification callback */
     NULL,                   /* OUT notification callback */
     DIGITIZER_EPSIZE,       /* IN maximum packet size */
     0,                      /* OUT maximum packet size */

From 68e68e7dc22f2a63d86e958406f7e97b7b6433f4 Mon Sep 17 00:00:00 2001
From: stanrc85 <47038504+stanrc85@users.noreply.github.com>
Date: Sat, 22 Oct 2022 14:50:20 -0400
Subject: [PATCH 699/959] [Keyboard] Add Bolsalice keyboard (#18772)

---
 keyboards/bolsa/bolsalice/bolsalice.c         |  18 +++
 keyboards/bolsa/bolsalice/bolsalice.h         |  52 ++++++
 keyboards/bolsa/bolsalice/config.h            |  49 ++++++
 keyboards/bolsa/bolsalice/info.json           | 153 ++++++++++++++++++
 .../bolsa/bolsalice/keymaps/default/keymap.c  |  38 +++++
 .../bolsa/bolsalice/keymaps/via/keymap.c      |  38 +++++
 .../bolsa/bolsalice/keymaps/via/rules.mk      |   1 +
 keyboards/bolsa/bolsalice/readme.md           |  22 +++
 keyboards/bolsa/bolsalice/rules.mk            |  20 +++
 9 files changed, 391 insertions(+)
 create mode 100644 keyboards/bolsa/bolsalice/bolsalice.c
 create mode 100644 keyboards/bolsa/bolsalice/bolsalice.h
 create mode 100644 keyboards/bolsa/bolsalice/config.h
 create mode 100644 keyboards/bolsa/bolsalice/info.json
 create mode 100644 keyboards/bolsa/bolsalice/keymaps/default/keymap.c
 create mode 100644 keyboards/bolsa/bolsalice/keymaps/via/keymap.c
 create mode 100644 keyboards/bolsa/bolsalice/keymaps/via/rules.mk
 create mode 100644 keyboards/bolsa/bolsalice/readme.md
 create mode 100644 keyboards/bolsa/bolsalice/rules.mk

diff --git a/keyboards/bolsa/bolsalice/bolsalice.c b/keyboards/bolsa/bolsalice/bolsalice.c
new file mode 100644
index 0000000000..8fc60ce213
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/bolsalice.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2022 CMM.Studio Freather
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "bolsalice.h"
diff --git a/keyboards/bolsa/bolsalice/bolsalice.h b/keyboards/bolsa/bolsalice/bolsalice.h
new file mode 100644
index 0000000000..871b047f3c
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/bolsalice.h
@@ -0,0 +1,52 @@
+/*
+Copyright 2022 CMM.Studio Freather
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_alice_split_bs( \
+	K00, K01, K02, K03, K04, K05, K06, K07,     K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \
+	K10, K11, K12, K13, K14, K15, K16,          K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
+	K20, K21, K22, K23, K24, K25, K26,          K27, K28, K29, K2A, K2B, K2C, K2D,  \
+	     K31, K32, K33, K34, K35, K36,          K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+	     K41,      K43, K45, K46,               K48, K4A,                          K4E \
+){ \
+	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E},\
+	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX},\
+	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
+	{XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
+	{XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
+}
+
+#define LAYOUT_alice( \
+	K00, K01, K02, K03, K04, K05, K06, K07,    K08, K09, K0A, K0B, K0C, K0D, K0E,\
+	K10, K11, K12, K13, K14, K15, K16,         K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
+	K20, K21, K22, K23, K24, K25, K26,         K27, K28, K29, K2A, K2B, K2C, K2D,  \
+	     K31, K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+	     K41,      K43, K45, K46,              K48, K4A,                          K4E \
+){ \
+	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},\
+	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX},\
+	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
+	{XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
+	{XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
+}
+
+
diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h
new file mode 100644
index 0000000000..d41b2fddc7
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2022 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+
+#define MATRIX_ROW_PINS { B2, B3, C7, C6, B5 }
+#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B4, D7, D6, D4, D5, D3, D2, D1 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN B1
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 8
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json
new file mode 100644
index 0000000000..d9d8977d44
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/info.json
@@ -0,0 +1,153 @@
+{
+    "keyboard_name": "Bolsalice",
+    "manufacturer": "BolsaSupply",
+    "usb": {
+        "pid": "0x414C",
+        "vid": "0x4253",
+        "device_version": "0.0.1"
+    },
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"~", "x":1.75, "y":0},
+                {"label":"!", "x":2.75, "y":0},
+                {"label":"@", "x":3.75, "y":0},
+                {"label":"#", "x":4.75, "y":0},
+                {"label":"$", "x":5.75, "y":0},
+                {"label":"%", "x":6.75, "y":0},
+                {"label":"^", "x":7.75, "y":0},
+                {"label":"&", "x":10, "y":0},
+                {"label":"*", "x":11, "y":0},
+                {"label":"(", "x":12, "y":0},
+                {"label":")", "x":13, "y":0},
+                {"label":"_", "x":14, "y":0},
+                {"label":"+", "x":15, "y":0},
+                {"label":"|", "x":16, "y":0},
+                {"label":"~", "x":17, "y":0},
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":9.75, "y":1},
+                {"label":"U", "x":10.75, "y":1},
+                {"label":"I", "x":11.75, "y":1},
+                {"label":"O", "x":12.75, "y":1},
+                {"label":"P", "x":13.75, "y":1},
+                {"label":"{", "x":14.75, "y":1},
+                {"label":"}", "x":15.75, "y":1},
+                {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Control", "x":1.25, "y":2, "w":1.75},
+                {"label":"A", "x":3, "y":2},
+                {"label":"S", "x":4, "y":2},
+                {"label":"D", "x":5, "y":2},
+                {"label":"F", "x":6, "y":2},
+                {"label":"G", "x":7, "y":2},
+                {"label":"H", "x":10.25, "y":2},
+                {"label":"J", "x":11.25, "y":2},
+                {"label":"K", "x":12.25, "y":2},
+                {"label":"L", "x":13.25, "y":2},
+                {"label":":", "x":14.25, "y":2},
+                {"label":"\"", "x":15.25, "y":2},
+                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
+                {"label":"Shift", "x":1, "y":3, "w":2.25},
+                {"label":"Z", "x":3.25, "y":3},
+                {"label":"X", "x":4.25, "y":3},
+                {"label":"C", "x":5.25, "y":3},
+                {"label":"V", "x":6.25, "y":3},
+                {"label":"B", "x":7.25, "y":3},
+                {"label":"B", "x":10, "y":3},
+                {"label":"N", "x":11, "y":3},
+                {"label":"M", "x":12, "y":3},
+                {"label":"<", "x":13, "y":3},
+                {"label":">", "x":14, "y":3},
+                {"label":"?", "x":15, "y":3},
+                {"label":"Shift", "x":16, "y":3, "w":1.75},
+                {"label":"Fn1", "x":17.75, "y":3},
+                {"label":"Ctrl", "x":1, "y":4, "w":1.5},
+                {"label":"Alt", "x":4, "y":4, "w":1.5},
+                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
+                {"label":"Fn2", "x":7.75, "y":4},
+                {"label":"RSpace", "x":10, "y":4, "w":2.75},
+                {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
+                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"~", "x":1.75, "y":0},
+                {"label":"!", "x":2.75, "y":0},
+                {"label":"@", "x":3.75, "y":0},
+                {"label":"#", "x":4.75, "y":0},
+                {"label":"$", "x":5.75, "y":0},
+                {"label":"%", "x":6.75, "y":0},
+                {"label":"^", "x":7.75, "y":0},
+                {"label":"&", "x":10, "y":0},
+                {"label":"*", "x":11, "y":0},
+                {"label":"(", "x":12, "y":0},
+                {"label":")", "x":13, "y":0},
+                {"label":"_", "x":14, "y":0},
+                {"label":"+", "x":15, "y":0},
+                {"label":"Backspace", "x":16, "y":0, "w":2},
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":9.75, "y":1},
+                {"label":"U", "x":10.75, "y":1},
+                {"label":"I", "x":11.75, "y":1},
+                {"label":"O", "x":12.75, "y":1},
+                {"label":"P", "x":13.75, "y":1},
+                {"label":"{", "x":14.75, "y":1},
+                {"label":"}", "x":15.75, "y":1},
+                {"label":"|", "x":16.75, "y":1, "w":1.5},
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Control", "x":1.25, "y":2, "w":1.75},
+                {"label":"A", "x":3, "y":2},
+                {"label":"S", "x":4, "y":2},
+                {"label":"D", "x":5, "y":2},
+                {"label":"F", "x":6, "y":2},
+                {"label":"G", "x":7, "y":2},
+                {"label":"H", "x":10.25, "y":2},
+                {"label":"J", "x":11.25, "y":2},
+                {"label":"K", "x":12.25, "y":2},
+                {"label":"L", "x":13.25, "y":2},
+                {"label":":", "x":14.25, "y":2},
+                {"label":"\"", "x":15.25, "y":2},
+                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
+                {"label":"Shift", "x":1, "y":3, "w":2.25},
+                {"label":"Z", "x":3.25, "y":3},
+                {"label":"X", "x":4.25, "y":3},
+                {"label":"C", "x":5.25, "y":3},
+                {"label":"V", "x":6.25, "y":3},
+                {"label":"B", "x":7.25, "y":3},
+                {"label":"B", "x":10, "y":3},
+                {"label":"N", "x":11, "y":3},
+                {"label":"M", "x":12, "y":3},
+                {"label":"<", "x":13, "y":3},
+                {"label":">", "x":14, "y":3},
+                {"label":"?", "x":15, "y":3},
+                {"label":"Shift", "x":16, "y":3, "w":1.75},
+                {"label":"Fn1", "x":17.75, "y":3},
+                {"label":"Ctrl", "x":1, "y":4, "w":1.5},
+                {"label":"Alt", "x":4, "y":4, "w":1.5},
+                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
+                {"label":"Fn2", "x":7.75, "y":4},
+                {"label":"RSpace", "x":10, "y":4, "w":2.75},
+                {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
+                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+            ]
+        }
+    },
+    "meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/bolsa/bolsalice/keymaps/default/keymap.c b/keyboards/bolsa/bolsalice/keymaps/default/keymap.c
new file mode 100644
index 0000000000..184d94a2cd
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2022 CMM.Studio Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_alice(
+        KC_INS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_DEL, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+                 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LALT,          KC_SPC, KC_LGUI,          KC_SPC,          KC_RALT,                   KC_RCTL
+    ),
+
+    [1] = LAYOUT_alice(
+      _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,        _______,          _______,                   _______
+    ),
+    [2] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+    [3] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+
+};
diff --git a/keyboards/bolsa/bolsalice/keymaps/via/keymap.c b/keyboards/bolsa/bolsalice/keymaps/via/keymap.c
new file mode 100644
index 0000000000..184d94a2cd
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2022 CMM.Studio Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_alice(
+        KC_INS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_DEL, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+                 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LALT,          KC_SPC, KC_LGUI,          KC_SPC,          KC_RALT,                   KC_RCTL
+    ),
+
+    [1] = LAYOUT_alice(
+      _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,        _______,          _______,                   _______
+    ),
+    [2] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+    [3] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+
+};
diff --git a/keyboards/bolsa/bolsalice/keymaps/via/rules.mk b/keyboards/bolsa/bolsalice/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bolsa/bolsalice/readme.md b/keyboards/bolsa/bolsalice/readme.md
new file mode 100644
index 0000000000..a666e0e21c
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/readme.md
@@ -0,0 +1,22 @@
+# Bolsalice
+
+An Alice layout keyboard by Bolsa Supply
+
+-   Keyboard Maintainer: [matthewdias](https://github.com/matthewdias)
+-   Hardware Supported: Bolsalice PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bolsa/bolsalice:default
+
+Flashing example for this keyboard:
+
+    make bolsa/bolsalice:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB (or short the reset/ground pads, should a tactile button not be installed)
diff --git a/keyboards/bolsa/bolsalice/rules.mk b/keyboards/bolsa/bolsalice/rules.mk
new file mode 100644
index 0000000000..221dbb2380
--- /dev/null
+++ b/keyboards/bolsa/bolsalice/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = alice alice_split_bs

From 575db6949abb76d7f75ba69311a9492d7b79108a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 22 Oct 2022 20:39:39 +0100
Subject: [PATCH 700/959] Generalise CTPC logic from common_features (#18803)

---
 builddefs/build_keyboard.mk                                 | 4 ++++
 builddefs/common_features.mk                                | 6 +-----
 .../converters/promicro_to_proton_c/post_converter.mk       | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 platforms/chibios/converters/promicro_to_proton_c/post_converter.mk

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index cfec9cdebe..499e6ffc69 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -368,6 +368,10 @@ endif
 # Disable features that a keyboard doesn't support
 -include $(BUILDDEFS_PATH)/disable_features.mk
 
+ifneq ("$(CONVERTER)","")
+    -include $(CONVERTER)/post_converter.mk
+endif
+
 # Pull in post_rules.mk files from all our subfolders
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
     include $(KEYBOARD_PATH_1)/post_rules.mk
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 8814d8b0f9..9939e0e5df 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -539,11 +539,7 @@ endif
 VALID_BACKLIGHT_TYPES := pwm timer software custom
 
 BACKLIGHT_ENABLE ?= no
-ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
-    BACKLIGHT_DRIVER ?= software
-else
-    BACKLIGHT_DRIVER ?= pwm
-endif
+BACKLIGHT_DRIVER ?= pwm
 ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid BACKLIGHT_DRIVER,BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
diff --git a/platforms/chibios/converters/promicro_to_proton_c/post_converter.mk b/platforms/chibios/converters/promicro_to_proton_c/post_converter.mk
new file mode 100644
index 0000000000..12651bd87c
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_proton_c/post_converter.mk
@@ -0,0 +1 @@
+BACKLIGHT_DRIVER ?= software

From fc394dfdd43651e5ba46575319832b91afe92e14 Mon Sep 17 00:00:00 2001
From: Eddie Nuno <GOD11341258@gmail.com>
Date: Sat, 22 Oct 2022 13:39:49 -0600
Subject: [PATCH 701/959] [Docs] Fix link to keyboard layout editor (#18801)

---
 docs/documentation_templates.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/documentation_templates.md b/docs/documentation_templates.md
index e22dbf2387..91ad801662 100644
--- a/docs/documentation_templates.md
+++ b/docs/documentation_templates.md
@@ -4,7 +4,7 @@ This page documents the templates you should use when submitting new Keymaps and
 
 ## Keymap `readme.md` Template :id=keyboard-readmemd-template
 
-Most keymaps have an image depicting the layout. You can use [Keyboard Layout Editor](https://keyboard-layout-editor.com) to create an image. Upload it to [Imgur](https://imgur.com) or another hosting service, please do not include images in your Pull Request.
+Most keymaps have an image depicting the layout. You can use [Keyboard Layout Editor](http://keyboard-layout-editor.com) to create an image. Upload it to [Imgur](https://imgur.com) or another hosting service, please do not include images in your Pull Request.
 
 Below the image you should write a short description to help people understand your keymap.
 

From cdb04900cd1c84bb2ef983a8eca0667fba4ce5c0 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 22 Oct 2022 13:22:29 -0700
Subject: [PATCH 702/959] Polyandry: rename LAYOUT to LAYOUT_ortho_4x3 (#18815)

---
 keyboards/40percentclub/polyandry/info.json                | 2 +-
 keyboards/40percentclub/polyandry/keymaps/default/keymap.c | 2 +-
 keyboards/40percentclub/polyandry/promicro/promicro.h      | 2 +-
 keyboards/40percentclub/polyandry/teensy2/teensy2.h        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index 3572b38c23..f5f33e3d97 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x3": {
             "layout": [
                 {"label": "k000", "x": 0, "y": 0},
                 {"label": "k001", "x": 1, "y": 0},
diff --git a/keyboards/40percentclub/polyandry/keymaps/default/keymap.c b/keyboards/40percentclub/polyandry/keymaps/default/keymap.c
index 3e1f278b35..572899903d 100644
--- a/keyboards/40percentclub/polyandry/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/polyandry/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	LAYOUT(
+	LAYOUT_ortho_4x3(
 		KC_1, KC_2, KC_3, 
 		KC_4, KC_5, KC_6, 
 		KC_7, KC_8, KC_9, 
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h
index 65e2b4b9c2..0a6f8b36b8 100644
--- a/keyboards/40percentclub/polyandry/promicro/promicro.h
+++ b/keyboards/40percentclub/polyandry/promicro/promicro.h
@@ -17,7 +17,7 @@
 
 #include "polyandry.h"
 
-#define LAYOUT( \
+#define LAYOUT_ortho_4x3( \
 	K000, K001, K002, \
  	K003, K004, K005, \
 	K006, K007, K008, \
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
index 118eb353a4..ce7790434b 100644
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h
+++ b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
@@ -22,7 +22,7 @@
 
 #include "polyandry.h"
 
-#define LAYOUT( \
+#define LAYOUT_ortho_4x3( \
 	K000, K001, K002, \
  	K003, K004, K005, \
 	K006, K007, K008, \

From 74484e21afc819b8e20f408aebc5c4e6cfdcc991 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 23 Oct 2022 07:45:20 +1100
Subject: [PATCH 703/959] Deprecate `VLK_TOG` for `VK_TOGG` (#18807)

---
 docs/feature_velocikey.md                                    | 2 +-
 .../1upkeyboards/super16/keymaps/ahk_companion/keymap.c      | 2 +-
 keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c      | 2 +-
 keyboards/donutcables/budget96/keymaps/donut/keymap.c        | 2 +-
 keyboards/dz60/keymaps/ottodokto/keymap.c                    | 2 +-
 keyboards/edi/hardlight/mk2/keymaps/default/keymap.c         | 2 +-
 keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c            | 2 +-
 keyboards/evyd13/wonderland/keymaps/default/keymap.c         | 2 +-
 keyboards/evyd13/wonderland/keymaps/keebs/keymap.c           | 2 +-
 keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c  | 2 +-
 keyboards/evyd13/wonderland/keymaps/rys/keymap.c             | 2 +-
 keyboards/evyd13/wonderland/keymaps/via/keymap.c             | 2 +-
 keyboards/handwired/freoduo/keymaps/default/keymap.c         | 2 +-
 keyboards/hub16/keymaps/ahk_companion/keymap.c               | 2 +-
 keyboards/hub16/keymaps/peepeetee/keymap.c                   | 2 +-
 keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c        | 2 +-
 keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c             | 2 +-
 keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c          | 2 +-
 keyboards/keebio/iris/keymaps/blucky/keymap.c                | 2 +-
 keyboards/keebio/iris/keymaps/sethBarberee/keymap.c          | 2 +-
 keyboards/keyhive/ut472/keymaps/tucznak/keymap.c             | 2 +-
 keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c       | 2 +-
 keyboards/lets_split/keymaps/shaymdev/keymap.c               | 2 +-
 keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c         | 4 ++--
 keyboards/orthodox/keymaps/shaymdev/keymap.c                 | 2 +-
 keyboards/planck/keymaps/rootiest/keymap.c                   | 4 ++--
 keyboards/projectkb/alice/keymaps/madhatter/keymap.c         | 2 +-
 keyboards/projectkb/alice/keymaps/stanrc85/keymap.c          | 2 +-
 keyboards/tanuki/keymaps/tucznak/keymap.c                    | 2 +-
 keyboards/tkc/osav2/keymaps/stanrc85/keymap.c                | 2 +-
 keyboards/tmo50/keymaps/ottodokto/keymap.c                   | 2 +-
 layouts/community/60_ansi/mechmerlin-ansi/keymap.c           | 2 +-
 .../60_ansi_split_bs_rshift/mechmerlin-split/keymap.c        | 2 +-
 layouts/community/65_ansi_blocker/spidey3/keymap.c           | 2 +-
 layouts/community/66_ansi/mechmerlin/keymap.c                | 2 +-
 layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c        | 2 +-
 layouts/community/75_ansi/spidey3/keymap.c                   | 2 +-
 layouts/community/75_ansi/yanfali/keymap.c                   | 2 +-
 layouts/community/alice/stanrc85-alice/keymap.c              | 2 +-
 quantum/quantum.c                                            | 2 +-
 quantum/quantum_keycodes.h                                   | 5 ++++-
 quantum/quantum_keycodes_legacy.h                            | 2 ++
 users/spidey3/layer_rgb.c                                    | 2 +-
 43 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/docs/feature_velocikey.md b/docs/feature_velocikey.md
index 14d4be314d..aeb1865e8a 100644
--- a/docs/feature_velocikey.md
+++ b/docs/feature_velocikey.md
@@ -12,7 +12,7 @@ EXTRAKEY_ENABLE = yes
 VELOCIKEY_ENABLE = yes
 ```
 
-Then, while using your keyboard, you need to also turn it on with the `VLK_TOG` keycode, which toggles the feature on and off.
+Then, while using your keyboard, you need to also turn it on with the `VK_TOGG` keycode, which toggles the feature on and off.
 
 The following light effects will all be controlled by Velocikey when it is enabled:
  - RGB Breathing
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
index 292aa927d2..ec707557d1 100644
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
@@ -89,7 +89,7 @@ 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 ... VLK_TOG:
+    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
       for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
         rgblight_set_layer_state(i, false);
       }
diff --git a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
index 8af0218869..f539a4f8fc 100644
--- a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FNMS] = LAYOUT_default(
     RGB_TOG, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
     RGB_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
-    VLK_TOG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
+    VK_TOGG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
              _______, _______, _______, _______, _______, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
              AG_TOGG,                   _______,  _______, _______,        _______,          _______,                        _______
   ),
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
index d3a60f6e93..d7beffde4d 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* (3) Fn 2 */
     [_FN2] = LAYOUT_96_ansi(
 	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC_M_WC, EE_CLR, QK_BOOT, 
-	VLK_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+	VK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
diff --git a/keyboards/dz60/keymaps/ottodokto/keymap.c b/keyboards/dz60/keymaps/ottodokto/keymap.c
index bccf718de6..3645f0886e 100644
--- a/keyboards/dz60/keymaps/ottodokto/keymap.c
+++ b/keyboards/dz60/keymaps/ottodokto/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		RGB_TOG, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT, \
 		_______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, RGB_SPI, RGB_HUD, RGB_VAI, RGB_HUI, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
 		_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, RGB_SPD, RGB_SAD, RGB_VAD, RGB_SAI, KC_BRID, KC_BRIU, _______, \
-		_______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VLK_TOG, _______, _______, _______, _______, \
+		_______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VK_TOGG, _______, _______, _______, _______, \
 		_______, _______, _______,                            _______,                            _______, _______, _______
     )
 };
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
index 88beb9be46..fc611fcf0e 100644
--- a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
+++ b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_SET] = LAYOUT_ortho_4x16(
-  _______, KC_CAPS, KC_SCRL, KC_NUM,  VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
+  _______, KC_CAPS, KC_SCRL, KC_NUM,  VK_TOGG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, QK_BOOT,   _______, _______, _______, 
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
index bae4fce2c4..d4074f02a4 100644
--- a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
+++ b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [_SET] = LAYOUT_ortho_4x16(
-  _______, KC_CAPS, KC_SCRL, KC_NUM,  VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
+  _______, KC_CAPS, KC_SCRL, KC_NUM,  VK_TOGG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, QK_BOOT, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, _______, _______, _______, _______, 
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/evyd13/wonderland/keymaps/default/keymap.c b/keyboards/evyd13/wonderland/keymaps/default/keymap.c
index 2b2a457ec1..987e7f7826 100644
--- a/keyboards/evyd13/wonderland/keymaps/default/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_LCTL,    KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   KC_RCTL
    ),
 [_FUNC] = LAYOUT(
- RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
+ RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
  RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
           KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
diff --git a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
index 15f45eb8e8..2020f2ceae 100644
--- a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_LCTL,    KC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, KC_RAPC,                   KC_RCTL \
    ),
 [_FUNC] = LAYOUT(
- RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT, \
+ RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT, \
  RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
 RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, \
           KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, \
diff --git a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
index 231922a144..974c8f9804 100644
--- a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_MPLY,          KC_LALT, _______,  _______,          _______,                   KC_RALT,                            XXXXXXX
    ),
 [_RGB] = LAYOUT(
- RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
+ RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
  RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 RGB_RMOD, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
           KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
diff --git a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c b/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
index 617999da74..f7dcab8b4d 100644
--- a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_LCTL,          KC_LGUI, KC_NUBS, KC_LALT,           KC_SPC,                   KC_NUHS,                            KC_RCTL
    ),
 [_FUNC] = LAYOUT(
- RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12, XXXXXXX, QK_BOOT,
+ RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12, XXXXXXX, QK_BOOT,
  RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
 RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,   KC_UP,  XXXXXXX,
           RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX,
diff --git a/keyboards/evyd13/wonderland/keymaps/via/keymap.c b/keyboards/evyd13/wonderland/keymaps/via/keymap.c
index e2cb7be3ab..f58b30b310 100644
--- a/keyboards/evyd13/wonderland/keymaps/via/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL,          KC_LAPO,          KC_BSPC, KC_LGUI, KC_SPC,                    KC_RAPC,                            KC_RCTL
     ),
 	[1] = LAYOUT(
-        RGB_TOG,  VLK_TOG, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   QK_BOOT,
+        RGB_TOG,  VK_TOGG, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   QK_BOOT,
         RGB_MOD,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
         RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UP,            KC_NO,
                   _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, _______,
diff --git a/keyboards/handwired/freoduo/keymaps/default/keymap.c b/keyboards/handwired/freoduo/keymaps/default/keymap.c
index b4cb619d92..9086871654 100644
--- a/keyboards/handwired/freoduo/keymaps/default/keymap.c
+++ b/keyboards/handwired/freoduo/keymaps/default/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] =  LAYOUT(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  QK_BOOT  , RGB_TOG, RGB_MOD, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______,
+  QK_BOOT  , RGB_TOG, RGB_MOD, VK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, RGB_VAD, RGB_VAI, _______, _______,                   _______, _______, _______, _______, _______
diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c
index 6523e1aaf1..a3b19521a0 100644
--- a/keyboards/hub16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/hub16/keymaps/ahk_companion/keymap.c
@@ -123,7 +123,7 @@ 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 ... VLK_TOG:
+    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
       for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
         rgblight_set_layer_state(i, false);
       }
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c
index 1e07e2b690..8979eef165 100644
--- a/keyboards/hub16/keymaps/peepeetee/keymap.c
+++ b/keyboards/hub16/keymaps/peepeetee/keymap.c
@@ -162,7 +162,7 @@ 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 ... VLK_TOG:
+    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
       for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
         rgblight_set_layer_state(i, false);
       }
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
index 33f4ef3f72..bc04eb5bcb 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FUNC] = LAYOUT_all(
          KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,_______,KC_INS, 
          _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,      KC_HOME, 
-         _______,     VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,_______,_______,_______,_______,_______,      _______,      KC_END, 
+         _______,     VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,_______,_______,_______,_______,_______,      _______,      KC_END, 
          _______,_______,BL_TOGG, BL_DEC, BL_INC, BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,_______, 
          KC_SLEP,QK_BOOT,_______,      LCA(KC_DEL),     LCA(KC_DEL),    LCA(KC_DEL),  LCA(KC_INS),KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
        
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index 6537afa49d..ba1f78ce49 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS,
         KC_TRNS, MACRO1, MACRO2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         MACROTAB, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS,
-        KC_TRNS, VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DYN_REC_START2, DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS,
+        KC_TRNS, VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DYN_REC_START2, DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS,
         KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, DYN_REC_STOP, DYN_REC_START1, DYN_MACRO_PLAY1, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, LCA(KC_DEL), KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS
     ),
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
index 299db67831..be09319c49 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FN] = LAYOUT_ortho_4x12(
         _______, BL_STEP, _______,  KC_SLEP, _______, _______,     _______,     DYN_REC_START1, DYN_MACRO_PLAY1, DYN_REC_STOP, _______, KC_VOLU,
-        _______, VLK_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,     _______,     DYN_REC_START2, DYN_MACRO_PLAY2, _______,      _______, KC_VOLD,
+        _______, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,     _______,     DYN_REC_START2, DYN_MACRO_PLAY2, _______,      _______, KC_VOLD,
         _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,     _______,     _______,        _______,         _______,      KC_MSTP, KC_MUTE,
         QK_BOOT, _______, _______,  _______, _______, LCA(KC_DEL), LCA(KC_INS), _______,        _______,         KC_MPRV,      KC_MPLY, KC_MNXT
     )
diff --git a/keyboards/keebio/iris/keymaps/blucky/keymap.c b/keyboards/keebio/iris/keymaps/blucky/keymap.c
index 5f529703f6..b81e840769 100644
--- a/keyboards/keebio/iris/keymaps/blucky/keymap.c
+++ b/keyboards/keebio/iris/keymaps/blucky/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT, KC_VOLD, KC_VOLU, KC_MUTE, KC_BRID, KC_BRIU,  MU_MOD,           AU_OFF,  KC_RCTL, KC_LCTL, KC_RALT, KC_LALT, KC_DEL,  KC_NO,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                      WM_6,  VLK_TOG, RGB_MOD,                   RGB_TOG, BL_TOGG,  BL_STEP
+                                      WM_6,  VK_TOGG, RGB_MOD,                   RGB_TOG, BL_TOGG,  BL_STEP
   //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
diff --git a/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c b/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c
index a44f245f5f..b2dc3816f7 100644
--- a/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c
@@ -27,7 +27,7 @@ extern backlight_config_t backlight_config;
 #define KC_RSAD RGB_SAD
 #define KC_RVAI RGB_VAI
 #define KC_RVAD RGB_VAD
-#define KC_VK VLK_TOG
+#define KC_VK VK_TOGG
 
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 
diff --git a/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
index 0b7fe1edc8..bb9e50e6b7 100644
--- a/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN] = LAYOUT(
         QK_BOOT, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
-        _______, VLK_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_VOLD,
+        _______, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_VOLD,
         _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, KC_MSTP, KC_MUTE,
         KC_SLEP, _______, _______,  _______, _______,  LCA(KC_DEL), LCA(KC_INS), _______, KC_MPRV, KC_MPLY, KC_MNXT
     )
diff --git a/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
index ce36d1ba38..b21b91073d 100644
--- a/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
+++ b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_alice(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
     _______,  _______, _______, _______, _______, _______, _______,           _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c
index 2d6a352acf..19a2c082df 100644
--- a/keyboards/lets_split/keymaps/shaymdev/keymap.c
+++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] =  LAYOUT( 
     TO_DV, QK_BOOT, _______, _______, _______, _______, 		_______, _______, _______, _______, _______, KC_DEL,  
-  RGB_TOG, RGB_MOD, VLK_TOG, AU_ON,   AU_OFF,  AG_NORM, 		AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______, 
+  RGB_TOG, RGB_MOD, VK_TOGG, AU_ON,   AU_OFF,  AG_NORM, 		AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______, 
   RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 		_______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, 
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
index e69106c2ff..e1b6de116e 100644
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_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,  VLK_TOG, KC_MUTE,
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  VK_TOGG, KC_MUTE,
         _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
         _______, _______, RGB_TOG, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
@@ -118,7 +118,7 @@ idle_timer = timer_read();
               }
             }
             return false;
-/*         case VLK_TOG:
+/*         case QK_VELOCIKEY_TOGGLE:
             if (record->event.pressed) {
                 Jelocikey_toggle =! Jelocikey_toggle;
             }
diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c
index 978d637730..495a61c2e4 100644
--- a/keyboards/orthodox/keymaps/shaymdev/keymap.c
+++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] =  LAYOUT( 
     TO_DV, QK_BOOT, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_SLEP,  
-  RGB_TOG, RGB_MOD, VLK_TOG,  AU_ON,   AU_OFF,  AG_NORM, _______,          _______,          _______,          _______, AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______, 
+  RGB_TOG, RGB_MOD, VK_TOGG,  AU_ON,   AU_OFF,  AG_NORM, _______,          _______,          _______,          _______, AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______, 
   RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  
 )
 
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 5b34ad01e9..ae66904d8a 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -413,7 +413,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-----------------------------------------------------------------------------------'
     */
     [_TABULA] = LAYOUT_planck_mit(                                                                                                   //
-        KC_ESC, KC_ALTF4, VLK_TOG, PRINT_WPM_KEY, WAKE_ANI_TOG, WAKE_AUD_TOG, KC_REDO, UC_MOD, UC_M_WC, CG_TOGG, AG_TOGG, KC_DLINE,  //
+        KC_ESC, KC_ALTF4, VK_TOGG, PRINT_WPM_KEY, WAKE_ANI_TOG, WAKE_AUD_TOG, KC_REDO, UC_MOD, UC_M_WC, CG_TOGG, AG_TOGG, KC_DLINE,  //
         KC_NXTAB, KC_SLCTALL, KC_SAVE, KC_TRNS, KC_FIND, SH_TG, SH_TG, IRONY, KC_LCUT, KC_LCOPY, KC_TRNS, KC_KILL,                   //
         KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, TG(_MOUSY), KC_TRNS, KC_HOME, KC_END, KC_SFTENT,            //
         TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, KC_LSPO, ALT_TAB, KC_RSPC, KC_PRVWD, KC_BRID, KC_BRIU, KC_NXTWD),
@@ -431,7 +431,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_MOUSY] = LAYOUT_planck_mit(                                                                                                  //
         KC_ESC, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, UC_MOD, UC_M_WC, CG_TOGG, AG_TOGG, KC_BSPC,  //
-        KC_TAB, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, IRONY, VLK_TOG, KC_TRNS, KC_TRNS, KC_TRNS,                   //
+        KC_TAB, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, IRONY, VK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,                   //
         KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, KC_TRNS, KC_HOME, KC_BTN3, KC_END, KC_SFTENT,             //
         TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, KC_BTN1, ALT_TAB, KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R)};
 /* MousePad Layer [9]
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
index 43a6ff338a..5162564cb5 100644
--- a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FNMS] = LAYOUT_default(
     RGB_TOG, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
     RGB_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
-    VLK_TOG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
+    VK_TOGG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
              _______, BL_INC,   BL_DEC, BL_TOGG, BL_BRTG, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
              AG_TOGG,                   _______,  _______, _______,        _______,          _______,                        _______
   )
diff --git a/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c b/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
index 482765a9c0..ef112f6698 100644
--- a/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_default(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/keyboards/tanuki/keymaps/tucznak/keymap.c b/keyboards/tanuki/keymaps/tucznak/keymap.c
index a2b8a05001..2b687b8485 100644
--- a/keyboards/tanuki/keymaps/tucznak/keymap.c
+++ b/keyboards/tanuki/keymaps/tucznak/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 
     [_FN] = LAYOUT(
         QK_BOOT, _______, _______,  _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, _______, 
-        KC_SLEP, VLK_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, 
+        KC_SLEP, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, 
         _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, 
                  _______, _______,  _______, _______,          _______,          _______, _______
     )
diff --git a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c b/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
index ce45cd436f..de9082918c 100644
--- a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
+++ b/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_all(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/keyboards/tmo50/keymaps/ottodokto/keymap.c b/keyboards/tmo50/keymaps/ottodokto/keymap.c
index 2fc55caf03..736b0374fd 100644
--- a/keyboards/tmo50/keymaps/ottodokto/keymap.c
+++ b/keyboards/tmo50/keymaps/ottodokto/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [3] = LAYOUT_all(
 		RGB_SPI, RGB_TOG, RGB_HUD, RGB_VAI, RGB_HUI, _______, _______, _______, _______, _______,    _______,   _______,    _______, _______, QK_BOOT,
 		RGB_SPD, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______, _______, _______, _______,    _______,   _______, _______, _______,
-		_______, _______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VLK_TOG, _______, _______, _______, EE_CLR,
+		_______, _______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VK_TOGG, _______, _______, _______, EE_CLR,
 		_______, _______, _______, _______, _______, _______, _______
   )
 };
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
index 33a440e4e4..eeb2c55d15 100644
--- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
+++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  \
 	BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,          \
-    VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                   \
+    VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                   \
     _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
 
 [_AL] = LAYOUT_60_ansi(
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index 3f5251fb1c..3b80fa4acf 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL, \
   	BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,        \
     RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,                 \
-    VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,                 \
+    VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,                 \
     _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
 
 [_AL] = LAYOUT_60_ansi_split_bs_rshift(
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index bbe2a91d0e..e4a417ef90 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // FN
     [_FN] = LAYOUT_65_ansi_blocker(
         KC_GRV,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_INS,     KC_SCRL,
-        XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
+        XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VK_TOGG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
         MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            KC_CPNL,    KC_BRID,
         _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    XXXXXXX,    XXXXXXX,    DB_TOGG,                            _______,    KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,                KC_MPRV,    KC_VOLD,    KC_MNXT
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
index 6c67e65dde..c2387ae2f1 100644
--- a/layouts/community/66_ansi/mechmerlin/keymap.c
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -20,6 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   _______,           RGB_VAI, \
   _______,_______,_______,EE_CLR, QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,                 RGB_VAD, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,                             \
-  VLK_TOG,        _______,_______,_______,KC_VER,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,         \
+  VK_TOGG,        _______,_______,_______,KC_VER,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,         \
   CK_TOGG,_______,_______,                       _______,                                _______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
 };
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
index b1258b2985..586d0a822f 100644
--- a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
+++ b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI,  _______, _______, _______, _______, _______, _______, _______, _______,
-        VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
+        VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
         _______, _______,  _______,          MO(_CL),            _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
 
 [_CL] = LAYOUT_75_ansi(\
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index d92a83251e..65656173a4 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_75_ansi(
         QK_BOOT,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
         EE_CLR,     X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
-        XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VLK_TOG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
+        XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VK_TOGG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
         _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DB_TOGG,    _______,                            KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,    KC_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
diff --git a/layouts/community/75_ansi/yanfali/keymap.c b/layouts/community/75_ansi/yanfali/keymap.c
index 1b3ebbbbf5..a1893a9798 100644
--- a/layouts/community/75_ansi/yanfali/keymap.c
+++ b/layouts/community/75_ansi/yanfali/keymap.c
@@ -20,6 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT, _______,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI,  _______, _______, _______, _______, _______, _______, _______, _______,
-        VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PGUP, _______,
+        VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PGUP, _______,
         _______, _______,  _______,          _______,            _______, _______, _______, KC_HOME, KC_PGDN, KC_END)
 };
diff --git a/layouts/community/alice/stanrc85-alice/keymap.c b/layouts/community/alice/stanrc85-alice/keymap.c
index dcbd570777..07e056deda 100644
--- a/layouts/community/alice/stanrc85-alice/keymap.c
+++ b/layouts/community/alice/stanrc85-alice/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_alice(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
diff --git a/quantum/quantum.c b/quantum/quantum.c
index add7402550..2c55f45e3b 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -379,7 +379,7 @@ bool process_record_quantum(keyrecord_t *record) {
 #endif
                 return false;
 #ifdef VELOCIKEY_ENABLE
-            case VLK_TOG:
+            case QK_VELOCIKEY_TOGGLE:
                 velocikey_toggle();
                 return false;
 #endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index caf4d2b395..44702a362d 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -359,7 +359,7 @@ enum quantum_keycodes {
     RGB_MODE_RGBTEST,  // 5CD6
 
     // Velocikey
-    VLK_TOG, // 5CD7
+    QK_VELOCIKEY_TOGGLE, // 5CD7
 
     // Space Cadet
     KC_LSPO,   // 5CD8
@@ -743,6 +743,9 @@ enum quantum_keycodes {
 #define CRT_OFF AUTOCORRECT_OFF
 #define CRT_TOG AUTOCORRECT_TOGGLE
 
+// Velocikey
+#define VK_TOGG QK_VELOCIKEY_TOGGLE
+
 // GOTO layer - 256 layer max
 #define TO(layer) (QK_TO | ((layer)&0xFF))
 
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 6a847f71a6..db13d5973d 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -6,6 +6,8 @@
 #define KC_LEAD QK_LEADER
 #define KC_LOCK QK_LOCK
 
+#define VLK_TOG QK_VELOCIKEY_TOGGLE
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index 835a79186b..102848fc90 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -470,7 +470,7 @@ void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
             break;
 
 #ifdef VELOCIKEY_ENABLE
-        case VLK_TOG:
+        case QK_VELOCIKEY_TOGGLE:
             rgb_layer_ack_yn(velocikey_enabled());
             break;
 #endif

From af02e24aa7eb9fa7df646f5ebcc3a18601f6314d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 22 Oct 2022 13:48:13 -0700
Subject: [PATCH 704/959] MechBrewery MB65S Layout Rework (#18814)

* rename LAYOUT_65_ansi_blocker_tsangan to LAYOUT_65_ansi_blocker_tsangan_split_bs

Layout was implemented with Split Backspace.

* rename LAYOUT_65_iso_blocker_7u_spc to LAYOUT_65_iso_blocker_tsangan_split_bs

* rules.mk: update Community Layout support setting

* mb65s.h: update matrix diagram

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_ansi_blocker_tsangan

* add LAYOUT_65_iso_blocker_tsangan

* move Community Layout support to info.json

* update Community Layout support
---
 keyboards/mechbrewery/mb65s/info.json         | 312 +++++++++++++++++-
 .../keymaps/ansi_blocker_7u_spc/keymap.c      |   4 +-
 .../keymaps/ansi_blocker_7u_spc/readme.md     |   2 +-
 .../keymaps/iso_blocker_tsangan/keymap.c      |   4 +-
 keyboards/mechbrewery/mb65s/mb65s.h           |  87 ++++-
 keyboards/mechbrewery/mb65s/rules.mk          |   2 -
 6 files changed, 391 insertions(+), 20 deletions(-)

diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index 3ad4c7b2c2..fbcaea0d57 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -8,6 +8,16 @@
         "pid": "0x3635",
         "device_version": "0.0.1"
     },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -86,6 +96,81 @@
                 {"x":15, "y":4}
             ]
         },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
                 {"x":0, "y":0},
@@ -162,6 +247,82 @@
                 {"x":15, "y":4}
             ]
         },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
                 {"x":0, "y":0},
@@ -240,6 +401,80 @@
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x": 0, "y": 4, "w": 1.5},
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -314,7 +549,82 @@
                 {"x":15, "y":4}
             ]
         },
-        "LAYOUT_65_iso_blocker_7u_spc": {
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x": 0, "y": 4, "w": 1.5},
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
diff --git a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c
index eb9fc329f3..6d639df883 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |Ctrl|LGUI|Alt |          Space         |Alt |Fn  | |Lef|Dow|Rig|
      * `---------------------------------------------------------------'
      */
-    [0] = LAYOUT_65_ansi_blocker_tsangan(
+    [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, KC_HOME,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |    |    |    |                        |    |    | |   |   |   |
      * `---------------------------------------------------------------'
      */
-    [1] = LAYOUT_65_ansi_blocker_tsangan(
+    [1] = LAYOUT_65_ansi_blocker_tsangan_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_DEL,  _______,
         KC_CAPS,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
         _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
diff --git a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/readme.md b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/readme.md
index 62d334c743..defb3344a0 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/readme.md
+++ b/keyboards/mechbrewery/mb65s/keymaps/ansi_blocker_7u_spc/readme.md
@@ -1,4 +1,4 @@
 # Keymap by tuananhnguyen204, supported by thaoOil, phamMinhThuy, nguyenHuyenTrang
 ANSI layout with split backspace.
 
-Made with `LAYOUT_65_ansi_blocker_tsangan`
+Made with `LAYOUT_65_ansi_blocker_tsangan_split_bs`
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
index 4eed1f0e8c..601fb19862 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│LGUI│LAlt│          Space         │RAlt│Fn  │ │ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-    [0] = LAYOUT_65_iso_blocker_7u_spc(
+    [0] = LAYOUT_65_iso_blocker_tsangan_split_bs(
         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_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,
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │    │    │    │                        │    │    │ │   │   │   │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-    [1] = LAYOUT_65_iso_blocker_7u_spc(
+    [1] = LAYOUT_65_iso_blocker_tsangan_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_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS,                   _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
diff --git a/keyboards/mechbrewery/mb65s/mb65s.h b/keyboards/mechbrewery/mb65s/mb65s.h
index 77e1be2791..1e863b9bcd 100644
--- a/keyboards/mechbrewery/mb65s/mb65s.h
+++ b/keyboards/mechbrewery/mb65s/mb65s.h
@@ -21,17 +21,20 @@
 #define XXX KC_NO
 
 /*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │   │1E │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │43  │46                      │4A  │4B  │ │4D │4E │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ *              │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │   │1E │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ *              │40  │41  │43  │46                      │4A  │4B  │ │4D │4E │4F │
+ *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *              │40   │41 │43   │46                         │4B   │ Tsangan
+ *              └─────┴───┴─────┴───────────────────────────┴─────┘
  */
 
 /* This a shortcut to help you visually see your layout.
@@ -57,6 +60,21 @@
     { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
 }
 
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
+}
+
 #define LAYOUT_65_ansi_blocker_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
@@ -72,6 +90,21 @@
     { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
 }
 
+#define LAYOUT_65_iso_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
+}
+
 #define LAYOUT_65_iso_blocker_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
@@ -88,6 +121,21 @@
 }
 
 #define LAYOUT_65_ansi_blocker_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41,      K43,           K46,                     K4B,      K4D, K4E, K4F  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
@@ -102,7 +150,22 @@
     { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
 }
 
-#define LAYOUT_65_iso_blocker_7u_spc( \
+#define LAYOUT_65_iso_blocker_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41,      K43,           K46,                     K4B,      K4D, K4E, K4F  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
+}
+
+#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
diff --git a/keyboards/mechbrewery/mb65s/rules.mk b/keyboards/mechbrewery/mb65s/rules.mk
index 8217717005..be36efd406 100644
--- a/keyboards/mechbrewery/mb65s/rules.mk
+++ b/keyboards/mechbrewery/mb65s/rules.mk
@@ -17,5 +17,3 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
-
-LAYOUTS = 65_ansi_blocker_split_bs 65_iso_blocker_split_bs 65_ansi_blocker_tsangan

From 69719db6e99750d5de911ffe0dfb01f6f666d19f Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 22 Oct 2022 13:48:29 -0700
Subject: [PATCH 705/959] Bathroom Epiphanies Ghost Squid Refactor (#18816)

* refactor default keymap

- shorten layer names
  - KM_QWERTY -> _QW
  - KM_MEDIA -> _MD
  - KM_GUI_LOCK -> _GL
- use QMK-native keycode aliases
- use four-space indent
- grid-align keycodes

* remove third layer from default keymap

The third layer only serves to disable the GUI keys, which we can do with a keycode.

* update default keymap readme

* ghost_squid.h: add matrix diagram

* add LAYOUT_fullsize_ansi

* add LAYOUT_fullsize_iso

* use LAYOUT_fullsize_iso macro in default keymap

Refactor the default keymap to use the new LAYOUT_fullsize_iso macro.

* remove LAYOUT macro

Same matrix as LAYOUT_fullsize_iso, but in a different assignment order.

* enable Community Layout support
---
 keyboards/bpiphany/ghost_squid/ghost_squid.h  |  69 +++++++---
 keyboards/bpiphany/ghost_squid/info.json      | 125 +++++++++++++++++-
 .../ghost_squid/keymaps/default/keymap.c      |  57 ++++----
 .../ghost_squid/keymaps/default/readme.md     |  34 ++++-
 4 files changed, 233 insertions(+), 52 deletions(-)

diff --git a/keyboards/bpiphany/ghost_squid/ghost_squid.h b/keyboards/bpiphany/ghost_squid/ghost_squid.h
index 839c9fc123..55259ba740 100644
--- a/keyboards/bpiphany/ghost_squid/ghost_squid.h
+++ b/keyboards/bpiphany/ghost_squid/ghost_squid.h
@@ -24,21 +24,56 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define  ___ KC_NO
 
-#define LAYOUT( \
-	KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
-	KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-	KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-	KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \
-	KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-	KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
-	) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-		/* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
-		/* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
-		/* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
-		/* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
-		/* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-		/* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
-		/* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
-		/* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-	}
+/*
+ *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │J6 │   │I4 │H4 │H2 │H6 │ │A7 │E6 │D2 │D4 │ │B4 │B7 │B6 │B0 │ │C7 │C5 │A5 │
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+ *              │J4 │J7 │I7 │H7 │G7 │G4 │F4 │F7 │E7 │D7 │R7 │R4 │E4 │B2     │ │L4 │O4 │Q4 │ │K1 │L1 │Q1 │Q0 │
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤      ┌─────┐
+ *              │J2   │J5 │I5 │H5 │G5 │G2 │F2 │F5 │E5 │D5 │R5 │R2 │E2 │B3   │ │K4 │O7 │Q7 │ │K5 │L5 │Q5 │O5 │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤   │   ┌──┴┐B1  │ ISO Enter
+ *  LShift      │I2    │J3 │I3 │H3 │G3 │G6 │F6 │F3 │E3 │D3 │R3 │R6 │B1      │               │K2 │L2 │Q2 │   │   │B3 │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤   └───┴────┘
+ * │N2      │   │N2  │I6 │J1 │I1 │H1 │G1 │G0 │F0 │F1 │E1 │D1 │R0 │N3        │     │O6 │     │K3 │L3 │Q3 │O3 │
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
+ *              │A4  │P2  │C6  │K6                      │C0  │M3  │D0  │A1  │ │O0 │K0 │L0 │ │L6     │Q6 │   │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+ */
+
+#define LAYOUT_fullsize_ansi( \
+    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
+    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
+    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
+    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \
+    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
+    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
+    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
+        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
+        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
+        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
+        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
+        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
+        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
+        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
+        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
+    }
+
+#define LAYOUT_fullsize_iso( \
+    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
+    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
+    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,        KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
+    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                    KK2, KL2, KQ2,      \
+    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
+    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
+    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
+        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
+        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
+        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
+        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
+        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
+        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
+        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
+        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
+    }
 
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
index 3617c7efaf..2938b1b6eb 100644
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -8,8 +8,12 @@
         "pid": "0x6050",
         "device_version": "1.0.4"
     },
+    "community_layouts": [
+        "fullsize_ansi",
+        "fullsize_iso"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_fullsize_ansi": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
                 {"label":"F1", "x":2, "y":0},
@@ -66,7 +70,7 @@
                 {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
                 {"label":"Delete", "x":15.25, "y":2.25},
                 {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page DownDN", "x":17.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
                 {"label":"7", "x":18.5, "y":2.25},
                 {"label":"8", "x":19.5, "y":2.25},
                 {"label":"9", "x":20.5, "y":2.25},
@@ -89,8 +93,7 @@
                 {"label":"5", "x":19.5, "y":3.25},
                 {"label":"6", "x":20.5, "y":3.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
                 {"label":"Z", "x":2.25, "y":4.25},
                 {"label":"X", "x":3.25, "y":4.25},
                 {"label":"C", "x":4.25, "y":4.25},
@@ -122,6 +125,120 @@
                 {"label":"0", "x":18.5, "y":5.25, "w":2},
                 {"label":".", "x":20.5, "y":5.25}
             ]
+        },
+        "LAYOUT_fullsize_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen,", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25, "h": 2},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25},
+                {"label":"0", "x":18.5, "y":5.25, "w":2},
+                {"label":".", "x":20.5, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
index 5f0b1c599a..220bd0bd19 100644
--- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
@@ -25,50 +25,47 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │INS│HOM│PgU│ │NUM│ / │ * │ - │
 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
 * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │DEL│END│PgD│ │ 7 │ 8 │ 9 │   │
-* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  ↲ │ └───┴───┴───┘ ├───┼───┼───┤ + │
+* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
 * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │               │ 7 │ 8 │ 9 │   │
 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
 * │Shif│ # │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
-* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤ ↲ │
-* │Ctrl│GUI │Alt │                        │ Alt│ GUI│Fn  │Ctrl│ │ ← │ ↓ │ → │ │   0   │ , │   │ 
+* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+* │Ctrl│GUI │Alt │                        │ Alt│ GUI│Fn  │Ctrl│ │ ← │ ↓ │ → │ │   0   │ , │   │
 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
 */
 
 enum layer_names {
-    KM_QWERTY,
-    KM_MEDIA,
-    KM_GUI_LOCK
+    _QW,
+    _MD
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* Layer 0: Standard ISO layer */
-	[KM_QWERTY] = LAYOUT(
-KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_SLCK,KC_PAUS,
-KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,    KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
-KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,  KC_DEL, KC_END, KC_PGDN,    KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
-KC_CLCK, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,                               KC_P4,  KC_P5,  KC_P6,
-KC_LSFT, KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,          KC_UP,              KC_P1,  KC_P2,  KC_P3,  KC_PENT,
-KC_LCTL, KC_LGUI,KC_LALT,                       KC_SPC,                          KC_RALT,KC_RGUI,MO(KM_MEDIA),KC_RCTL,   KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,          KC_PDOT),
-	/* Layer 1: Function layer */
-	[KM_MEDIA] = LAYOUT(
-_______,_______,_______,_______,_______,  KC_MEDIA_PLAY_PAUSE, KC_MEDIA_STOP, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK,  TG(KM_GUI_LOCK),KC_MUTE, KC_VOLD, KC_VOLU,_______,_______, QK_BOOT,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______),
-	[KM_GUI_LOCK] = LAYOUT(
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-_______,KC_NO,_______,_______,_______,KC_NO,_______,_______,_______,_______,_______,_______,_______)
+
+    /* Layer 0: Standard ISO layer */
+    [_QW] = LAYOUT_fullsize_iso(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CLCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_MD), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
+    ),
+
+    /* Layer 1: Function layer */
+    [_MD] = LAYOUT_fullsize_iso(
+        _______,          _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GUI_TOG, KC_MUTE, KC_VOLD, KC_VOLU,    _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                  _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,             _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______,    _______,          _______
+    ),
+
 };
 
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    if (IS_LAYER_ON_STATE(state, KM_GUI_LOCK)) {
+    if (IS_LAYER_ON_STATE(state, _MD)) {
         fn_led_on();
     } else {
         fn_led_off();
diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/readme.md b/keyboards/bpiphany/ghost_squid/keymaps/default/readme.md
index 3c27324d1c..a6fa001740 100644
--- a/keyboards/bpiphany/ghost_squid/keymaps/default/readme.md
+++ b/keyboards/bpiphany/ghost_squid/keymaps/default/readme.md
@@ -1 +1,33 @@
-# Default layout desc TODO
+# Ghost Squid Default Keymap
+
+## Base Layer
+
+```
+ ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐     ┌───────────┐
+ │ESC│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PRT│SCR│PAU│     │Ghost Squid│
+ └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘     └───────────┘
+ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+ │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │INS│HOM│PgU│ │NUM│ / │ * │ - │
+ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+ │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │DEL│END│PgD│ │ 7 │ 8 │ 9 │   │
+ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
+ │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │               │ 7 │ 8 │ 9 │   │
+ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
+ │Shif│ # │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+ │Ctrl│GUI │Alt │                        │ Alt│ GUI│Fn  │Ctrl│ │ ← │ ↓ │ → │ │   0   │ , │   │
+ └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+
+```
+
+## Function Layer
+
+* `Fn` + `F5`  =  Play
+* `Fn` + `F6`  =  Stop
+* `Fn` + `F7`  =  Previous Track
+* `Fn` + `F8`  =  Next Track
+* `Fn` + `F9`  =  Toggle GUI key
+* `Fn` + `F10` =  Mute
+* `Fn` + `F11` =  Volume Down
+* `Fn` + `F12` =  Volume Up
+* `Fn` + `Pause` = Reset to Bootloader

From c012490712b0d09a73769b46bd31b0a5fd434372 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Sun, 23 Oct 2022 00:51:24 +0200
Subject: [PATCH 706/959] Add unit tests for HOLD_ON_OTHER_KEY_PRESS (#18721)

* Add HOLD_ON_OTHER_KEY_PRESS to data/ files

* Add unit tests for HOLD_ON_OTHER_KEY_PRESS
---
 data/mappings/info_config.json                |   2 +
 data/schemas/keyboard.jsonschema              |   2 +
 .../hold_on_other_key_press/config.h          |  20 +
 .../hold_on_other_key_press/test.mk           |  18 +
 .../hold_on_other_key_press/test_tap_hold.cpp | 423 ++++++++++++++++++
 5 files changed, 465 insertions(+)
 create mode 100644 tests/tap_hold_configurations/hold_on_other_key_press/config.h
 create mode 100644 tests/tap_hold_configurations/hold_on_other_key_press/test.mk
 create mode 100644 tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 4559423b25..01f39540d0 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -29,6 +29,8 @@
     "DYNAMIC_KEYMAP_LAYER_COUNT": {"info_key": "dynamic_keymap.layer_count", "value_type": "int"},
     "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "tapping.ignore_mod_tap_interrupt", "value_type": "bool"},
     "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "tapping.ignore_mod_tap_interrupt_per_key", "value_type": "bool"},
+    "HOLD_ON_OTHER_KEY_PRESS": {"info_key": "tapping.hold_on_other_key_press", "value_type": "bool"},
+    "HOLD_ON_OTHER_KEY_PRESS_PER_KEY": {"info_key": "tapping.hold_on_other_key_press_per_key", "value_type": "bool"},
     "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"},
     "LEADER_PER_KEY_TIMING": {"info_key": "leader_key.timing", "value_type": "bool"},
     "LEADER_KEY_STRICT_KEY_PROCESSING": {"info_key": "leader_key.strict_processing", "value_type": "bool"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 06ccccc160..bc07eaf5fb 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -586,6 +586,8 @@
                 "force_hold_per_key": {"type": "boolean"},
                 "ignore_mod_tap_interrupt": {"type": "boolean"},
                 "ignore_mod_tap_interrupt_per_key": {"type": "boolean"},
+                "hold_on_other_key_press": {"type": "boolean"},
+                "hold_on_other_key_press_per_key": {"type": "boolean"},
                 "permissive_hold": {"type": "boolean"},
                 "permissive_hold_per_key": {"type": "boolean"},
                 "retro": {"type": "boolean"},
diff --git a/tests/tap_hold_configurations/hold_on_other_key_press/config.h b/tests/tap_hold_configurations/hold_on_other_key_press/config.h
new file mode 100644
index 0000000000..98a72ec81f
--- /dev/null
+++ b/tests/tap_hold_configurations/hold_on_other_key_press/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2022 Vladislav Kucheriavykh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "test_common.h"
+#define HOLD_ON_OTHER_KEY_PRESS
diff --git a/tests/tap_hold_configurations/hold_on_other_key_press/test.mk b/tests/tap_hold_configurations/hold_on_other_key_press/test.mk
new file mode 100644
index 0000000000..6b5968df16
--- /dev/null
+++ b/tests/tap_hold_configurations/hold_on_other_key_press/test.mk
@@ -0,0 +1,18 @@
+# Copyright 2022 Vladislav Kucheriavykh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
diff --git a/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp b/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
new file mode 100644
index 0000000000..b074922f74
--- /dev/null
+++ b/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
@@ -0,0 +1,423 @@
+/* Copyright 2022 Vladislav Kucheriavykh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "action_tapping.h"
+#include "test_fixture.hpp"
+#include "test_keymap_key.hpp"
+
+using testing::_;
+using testing::InSequence;
+
+class HoldOnOtherKeyPress : public TestFixture {};
+
+TEST_F(HoldOnOtherKeyPress, short_distinct_taps_of_mod_tap_key_and_regular_key) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+    auto       regular_key      = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({mod_tap_hold_key, regular_key});
+
+    /* Press mod-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release mod-tap-hold key. */
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key. */
+    EXPECT_REPORT(driver, (KC_A));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key. */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, long_distinct_taps_of_mod_tap_key_and_regular_key) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+    auto       regular_key      = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({mod_tap_hold_key, regular_key});
+
+    /* Press mod-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Idle for tapping term of mod tap hold key. */
+    EXPECT_REPORT(driver, (KC_LSFT));
+    idle_for(TAPPING_TERM + 1);
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release mod-tap-hold key. */
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key. */
+    EXPECT_REPORT(driver, (KC_A));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key. */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, short_distinct_taps_of_layer_tap_key_and_regular_key) {
+    TestDriver driver;
+    InSequence s;
+    auto       layer_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+    auto       regular_key        = KeymapKey(0, 2, 0, KC_A);
+    auto       layer_key          = KeymapKey(0, 2, 0, KC_B);
+
+    set_keymap({layer_tap_hold_key, regular_key});
+
+    /* Press layer-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    layer_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release layer-tap-hold key. */
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    layer_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key. */
+    EXPECT_REPORT(driver, (KC_A));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key. */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, long_distinct_taps_of_layer_tap_key_and_regular_key) {
+    TestDriver driver;
+    InSequence s;
+    auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
+    auto       regular_key        = KeymapKey(0, 2, 0, KC_A);
+    auto       layer_key          = KeymapKey(0, 2, 0, KC_B);
+
+    set_keymap({layer_tap_hold_key, regular_key});
+
+    /* Press layer-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    layer_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Idle for tapping term of layer tap hold key. */
+    EXPECT_NO_REPORT(driver);
+    idle_for(TAPPING_TERM + 1);
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release layer-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    layer_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key. */
+    EXPECT_REPORT(driver, (KC_A));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key. */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, tap_regular_key_while_mod_tap_key_is_held) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+    auto       regular_key      = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({mod_tap_hold_key, regular_key});
+
+    /* Press mod-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key. */
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_REPORT(driver, (KC_A, KC_LSFT));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key. */
+    EXPECT_REPORT(driver, (KC_LSFT));
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release mod-tap-hold key. */
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Idle for tapping term of mod tap hold key. */
+    idle_for(TAPPING_TERM - 3);
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, tap_a_mod_tap_key_while_another_mod_tap_key_is_held) {
+    TestDriver driver;
+    InSequence s;
+    auto       first_mod_tap_hold_key  = KeymapKey(0, 1, 0, SFT_T(KC_P));
+    auto       second_mod_tap_hold_key = KeymapKey(0, 2, 0, RSFT_T(KC_A));
+
+    set_keymap({first_mod_tap_hold_key, second_mod_tap_hold_key});
+
+    /* Press first mod-tap-hold key */
+    EXPECT_NO_REPORT(driver);
+    first_mod_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press second tap-hold key */
+    EXPECT_REPORT(driver, (KC_LSFT));
+    second_mod_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release second tap-hold key */
+    EXPECT_REPORT(driver, (KC_A, KC_LSFT));
+    EXPECT_REPORT(driver, (KC_LSFT));
+    second_mod_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release first mod-tap-hold key */
+    EXPECT_EMPTY_REPORT(driver);
+    first_mod_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, tap_regular_key_while_layer_tap_key_is_held) {
+    TestDriver driver;
+    InSequence s;
+    auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
+    auto       regular_key        = KeymapKey(0, 2, 0, KC_A);
+    auto       layer_key          = KeymapKey(1, 2, 0, KC_B);
+
+    set_keymap({layer_tap_hold_key, regular_key, layer_key});
+
+    /* Press layer-tap-hold key */
+    EXPECT_NO_REPORT(driver);
+    layer_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key */
+    EXPECT_REPORT(driver, (KC_B));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release layer-tap-hold key */
+    EXPECT_NO_REPORT(driver);
+    layer_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_0_layer_tap_keys) {
+    TestDriver driver;
+    InSequence s;
+    /* The keys are layer-taps on layer 0 but regular keys on layer 1 */
+    auto       first_layer_tap_key  = KeymapKey(0, 1, 0, LT(1, KC_A));
+    auto       second_layer_tap_key = KeymapKey(0, 2, 0, LT(1, KC_P));
+    auto       first_key_on_layer   = KeymapKey(1, 1, 0, KC_B);
+    auto       second_key_on_layer  = KeymapKey(1, 2, 0, KC_Q);
+
+    set_keymap({first_layer_tap_key, second_layer_tap_key, first_key_on_layer, second_key_on_layer});
+
+    /* Press first layer-tap key */
+    EXPECT_NO_REPORT(driver);
+    first_layer_tap_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press second layer-tap key */
+    EXPECT_REPORT(driver, (KC_Q));
+    second_layer_tap_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release second layer-tap key */
+    EXPECT_EMPTY_REPORT(driver);
+    second_layer_tap_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release first layer-tap key */
+    EXPECT_NO_REPORT(driver);
+    first_layer_tap_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_tap_keys) {
+    TestDriver driver;
+    InSequence s;
+    /* The keys are layer-taps on all layers */
+    auto       first_key_layer_0  = KeymapKey(0, 1, 0, LT(1, KC_A));
+    auto       second_key_layer_0 = KeymapKey(0, 2, 0, LT(1, KC_P));
+    auto       first_key_layer_1  = KeymapKey(1, 1, 0, LT(2, KC_B));
+    auto       second_key_layer_1 = KeymapKey(1, 2, 0, LT(2, KC_Q));
+    auto       first_key_layer_2  = KeymapKey(2, 1, 0, KC_TRNS);
+    auto       second_key_layer_2 = KeymapKey(2, 2, 0, KC_TRNS);
+
+    set_keymap({first_key_layer_0, second_key_layer_0, first_key_layer_1, second_key_layer_1, first_key_layer_2, second_key_layer_2});
+
+    /* Press first layer-tap key */
+    EXPECT_NO_REPORT(driver);
+    first_key_layer_0.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press second layer-tap key */
+    EXPECT_NO_REPORT(driver);
+    second_key_layer_0.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release second layer-tap key */
+    EXPECT_REPORT(driver, (KC_Q));
+    EXPECT_EMPTY_REPORT(driver);
+    second_key_layer_0.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release first layer-tap key */
+    EXPECT_NO_REPORT(driver);
+    first_key_layer_0.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, roll_mod_tap_key_with_regular_key) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+    auto       regular_key      = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({mod_tap_hold_key, regular_key});
+
+    /* Press mod-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key. */
+    EXPECT_REPORT(driver, (KC_LSFT));
+    EXPECT_REPORT(driver, (KC_A, KC_LSFT));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release mod-tap-hold key. */
+    EXPECT_REPORT(driver, (KC_A));
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key. */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}
+
+TEST_F(HoldOnOtherKeyPress, roll_layer_tap_key_with_regular_key) {
+    TestDriver driver;
+    InSequence s;
+
+    auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
+    auto       regular_key        = KeymapKey(0, 2, 0, KC_A);
+    auto       layer_key          = KeymapKey(1, 2, 0, KC_B);
+
+    set_keymap({layer_tap_hold_key, regular_key, layer_key});
+
+    /* Press layer-tap-hold key */
+    EXPECT_NO_REPORT(driver);
+    layer_tap_hold_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Press regular key */
+    EXPECT_REPORT(driver, (KC_B));
+    regular_key.press();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release layer-tap-hold key */
+    EXPECT_NO_REPORT(driver);
+    layer_tap_hold_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+
+    /* Release regular key */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    testing::Mock::VerifyAndClearExpectations(&driver);
+}

From 9e2a063163c84629c61042f255f3357a40f36579 Mon Sep 17 00:00:00 2001
From: Controller Works <103382872+controller-works@users.noreply.github.com>
Date: Sat, 22 Oct 2022 18:56:38 -0400
Subject: [PATCH 707/959] Add mini36 (#18739)

---
 keyboards/controllerworks/mini36/config.h     |  64 ++++++++
 keyboards/controllerworks/mini36/halconf.h    |  22 +++
 keyboards/controllerworks/mini36/info.json    | 154 ++++++++++++++++++
 .../mini36/keymaps/default/config.h           |  79 +++++++++
 .../mini36/keymaps/default/keymap.c           |  68 ++++++++
 .../mini36/keymaps/via/config.h               |  79 +++++++++
 .../mini36/keymaps/via/keymap.c               |  68 ++++++++
 .../mini36/keymaps/via/rules.mk               |   1 +
 keyboards/controllerworks/mini36/mcuconf.h    |  23 +++
 keyboards/controllerworks/mini36/mini36.c     |  82 ++++++++++
 keyboards/controllerworks/mini36/readme.md    |  43 +++++
 keyboards/controllerworks/mini36/rules.mk     |   3 +
 12 files changed, 686 insertions(+)
 create mode 100644 keyboards/controllerworks/mini36/config.h
 create mode 100644 keyboards/controllerworks/mini36/halconf.h
 create mode 100644 keyboards/controllerworks/mini36/info.json
 create mode 100644 keyboards/controllerworks/mini36/keymaps/default/config.h
 create mode 100644 keyboards/controllerworks/mini36/keymaps/default/keymap.c
 create mode 100644 keyboards/controllerworks/mini36/keymaps/via/config.h
 create mode 100644 keyboards/controllerworks/mini36/keymaps/via/keymap.c
 create mode 100644 keyboards/controllerworks/mini36/keymaps/via/rules.mk
 create mode 100644 keyboards/controllerworks/mini36/mcuconf.h
 create mode 100644 keyboards/controllerworks/mini36/mini36.c
 create mode 100644 keyboards/controllerworks/mini36/readme.md
 create mode 100644 keyboards/controllerworks/mini36/rules.mk

diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h
new file mode 100644
index 0000000000..ab98e119b7
--- /dev/null
+++ b/keyboards/controllerworks/mini36/config.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+/* #define DEBOUNCE 5 */
+
+#define WS2812_PIO_USE_PIO1
+#define RGBLED_NUM 48
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_SPLIT \
+        { 24, 24 }
+
+#define SPLIT_TRANSPORT_MIRROR
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_MODS_ENABLE
+
+#define I2C_DRIVER I2CD1
+#define I2C1_SCL_PIN GP25
+#define I2C1_SDA_PIN GP24
+
+/* #define EE_HANDS  */
+/* #define MASTER_LEFT */
+/* #define MASTER_RIGHT */
+
+/* Top left key on left half */
+#define BOOTMAGIC_LITE_ROW    0
+#define BOOTMAGIC_LITE_COLUMN 0
+/* Top right key on right half */
+#define BOOTMAGIC_LITE_ROW_RIGHT    0
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+/*
+ * 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
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/halconf.h b/keyboards/controllerworks/mini36/halconf.h
new file mode 100644
index 0000000000..1664802d6c
--- /dev/null
+++ b/keyboards/controllerworks/mini36/halconf.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json
new file mode 100644
index 0000000000..4f6f11b33e
--- /dev/null
+++ b/keyboards/controllerworks/mini36/info.json
@@ -0,0 +1,154 @@
+{
+    "manufacturer": "Controller Works",
+    "keyboard_name": "mini36",
+    "maintainer": "controller-works",
+    "processor": "RP2040",
+    "url": "https://controller.works/products/mini36-low-profile-ergonomic-keyboard",
+    "tags": ["split", "RP2040", "choc v1", "choc spaced" ],    
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x4357"
+    },
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "build": {
+        "lto":true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP3",  "GP4",   "GP5",  "GP6",  "GP7"],
+            ["GP9",  "GP10", "GP11", "GP12", "GP13"],
+            ["GP15", "GP16", "GP17", "GP18", "GP19"],
+            ["GP20", "GP21", "GP22",   null,   null]
+        ]
+    },
+    "rgblight": {
+        "pin": "GP0"
+     },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["GP7",   "GP6",  "GP5",  "GP4",  "GP3"],
+                    ["GP13", "GP12", "GP11", "GP10",  "GP9"],
+                    ["GP19", "GP18", "GP17", "GP16", "GP15"],
+                    ["GP22", "GP21", "GP20",   null,   null]                    
+                ]
+            }
+        },
+        "soft_serial_pin": "GP1",
+        "transport": {
+            "protocol": "serial"
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 2, "x": 71, "y": 4 },
+            { "flags": 2, "x": 32, "y": 2 },
+            { "flags": 2, "x": 0, "y": 24 },
+            { "flags": 2, "x": 16, "y": 51 },
+            { "flags": 2, "x": 63, "y": 58 },
+            { "flags": 2, "x": 94, "y": 55 },
+            { "flags": 1, "matrix": [3, 2], "x": 90,  "y": 64 },
+            { "flags": 4, "matrix": [2, 4], "x": 79,  "y": 39 },
+            { "flags": 4, "matrix": [1, 4], "x": 79,  "y": 22 },
+            { "flags": 4, "matrix": [0, 4], "x": 79,  "y": 5 },
+            { "flags": 4, "matrix": [0, 3], "x": 61,  "y": 2 },
+            { "flags": 4, "matrix": [1, 3], "x": 61,  "y": 19 },
+            { "flags": 4, "matrix": [2, 3], "x": 61,  "y": 37 },
+            { "flags": 1, "matrix": [3, 1], "x": 74,  "y": 58 },
+            { "flags": 1, "matrix": [3, 0], "x": 53,  "y": 55 },
+            { "flags": 4, "matrix": [2, 2], "x": 43,  "y": 34 },
+            { "flags": 4, "matrix": [1, 2], "x": 43,  "y": 17 },
+            { "flags": 4, "matrix": [0, 2], "x": 43,  "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 25,  "y": 2 },
+            { "flags": 4, "matrix": [1, 1], "x": 25,  "y": 19 },
+            { "flags": 4, "matrix": [2, 1], "x": 25,  "y": 37 },
+            { "flags": 4, "matrix": [2, 0], "x": 7,  "y": 41 },
+            { "flags": 4, "matrix": [1, 0], "x": 7,  "y": 24 },
+            { "flags": 4, "matrix": [0, 0], "x": 7,  "y": 7 },
+            { "flags": 2, "x": 153, "y": 4 },
+            { "flags": 2, "x": 192, "y": 2 },
+            { "flags": 2, "x": 224, "y": 24 },
+            { "flags": 2, "x": 204, "y": 53 },
+            { "flags": 2, "x": 161, "y": 57 },
+            { "flags": 2, "x": 130, "y": 55 },
+            { "flags": 1, "matrix": [7, 0], "x": 134,  "y": 64 },
+            { "flags": 4, "matrix": [6, 0], "x": 145,  "y": 39 },
+            { "flags": 4, "matrix": [5, 0], "x": 145,  "y": 22 },
+            { "flags": 4, "matrix": [4, 0], "x": 145,  "y": 5 },
+            { "flags": 4, "matrix": [4, 1], "x": 163,  "y": 2 },
+            { "flags": 4, "matrix": [5, 1], "x": 163,  "y": 19 },
+            { "flags": 4, "matrix": [6, 1], "x": 163,  "y": 37 },
+            { "flags": 1, "matrix": [7, 1], "x": 150,  "y": 58 },
+            { "flags": 1, "matrix": [7, 2], "x": 171,  "y": 55 },
+            { "flags": 4, "matrix": [6, 2], "x": 181,  "y": 34 },
+            { "flags": 4, "matrix": [5, 2], "x": 181,  "y": 17 },
+            { "flags": 4, "matrix": [4, 2], "x": 181,  "y": 0 },
+            { "flags": 4, "matrix": [4, 3], "x": 199,  "y": 2 },
+            { "flags": 4, "matrix": [5, 3], "x": 199,  "y": 19 },
+            { "flags": 4, "matrix": [6, 3], "x": 199,  "y": 37 },
+            { "flags": 4, "matrix": [6, 4], "x": 217,  "y": 41 },
+            { "flags": 4, "matrix": [5, 4], "x": 217,  "y": 24 },
+            { "flags": 4, "matrix": [4, 4], "x": 217,  "y": 7 }
+          ]
+    },
+
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.25 },
+                { "matrix": [0, 1], "x": 1, "y": 0.125 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0.125 },
+                { "matrix": [0, 4], "x": 4, "y": 0.25 },
+                { "matrix": [4, 0], "x": 7, "y": 0.25 },
+                { "matrix": [4, 1], "x": 8, "y": 0.125 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 3], "x": 10, "y": 0.125 },
+                { "matrix": [4, 4], "x": 11, "y": 0.25 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.125 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1.125 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [5, 0], "x": 7, "y": 1.25 },
+                { "matrix": [5, 1], "x": 8, "y": 1.125 },
+                { "matrix": [5, 2], "x": 9, "y": 1 },
+                { "matrix": [5, 3], "x": 10, "y": 1.125 },
+                { "matrix": [5, 4], "x": 11, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.125 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2.125 },
+                { "matrix": [2, 4], "x": 4, "y": 2.25 },
+                { "matrix": [6, 0], "x": 7, "y": 2.25 },
+                { "matrix": [6, 1], "x": 8, "y": 2.125 },
+                { "matrix": [6, 2], "x": 9, "y": 2 },
+                { "matrix": [6, 3], "x": 10, "y": 2.125 },
+                { "matrix": [6, 4], "x": 11, "y": 2.25 },
+                { "matrix": [3, 0], "x": 2.5, "y": 3.25 },
+                { "matrix": [3, 1], "x": 3.5, "y": 3.5 },
+                { "matrix": [3, 2], "x": 4.5, "y": 3.75, "h":1.5 },
+                { "matrix": [7, 0], "x": 6.5, "y": 3.75, "h":1.5 },
+                { "matrix": [7, 1], "x": 7.5, "y": 3.5 },
+                { "matrix": [7, 2], "x": 8.5, "y": 3.25 }
+            ]
+          }
+    }
+}
diff --git a/keyboards/controllerworks/mini36/keymaps/default/config.h b/keyboards/controllerworks/mini36/keymaps/default/config.h
new file mode 100644
index 0000000000..e1d162ef3e
--- /dev/null
+++ b/keyboards/controllerworks/mini36/keymaps/default/config.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#ifdef RGB_MATRIX_ENABLE
+//#    define SPLIT_TRANSPORT_MIRROR
+#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 8
+#    define RGB_MATRIX_SPD_STEP 10
+
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/keymaps/default/keymap.c b/keyboards/controllerworks/mini36/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b5fbe49bb2
--- /dev/null
+++ b/keyboards/controllerworks/mini36/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+ LCTL_T(KC_A),    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+ LSFT_T(KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI,   MO(1),  KC_SPC,     KC_SPC,   MO(2), GUI_T(KC_TAB)
+                            //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+       KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP,                      XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+      KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN,                      KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI, _______,  KC_ESC,     KC_ENT,   MO(3), KC_RALT
+                             //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+      KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+        KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI,   MO(3),  KC_ESC,     KC_DEL, _______, KC_RALT
+                             //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                             //`--------------------------'  `--------------------------'
+  )
+};
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/keymaps/via/config.h b/keyboards/controllerworks/mini36/keymaps/via/config.h
new file mode 100644
index 0000000000..e1d162ef3e
--- /dev/null
+++ b/keyboards/controllerworks/mini36/keymaps/via/config.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#ifdef RGB_MATRIX_ENABLE
+//#    define SPLIT_TRANSPORT_MIRROR
+#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 8
+#    define RGB_MATRIX_SPD_STEP 10
+
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/keymaps/via/keymap.c b/keyboards/controllerworks/mini36/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b5fbe49bb2
--- /dev/null
+++ b/keyboards/controllerworks/mini36/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+ LCTL_T(KC_A),    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+ LSFT_T(KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI,   MO(1),  KC_SPC,     KC_SPC,   MO(2), GUI_T(KC_TAB)
+                            //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+       KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP,                      XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+      KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGDN,                      KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI, _______,  KC_ESC,     KC_ENT,   MO(3), KC_RALT
+                             //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+      KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+        KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI,   MO(3),  KC_ESC,     KC_DEL, _______, KC_RALT
+                             //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x5_3(
+  //,--------------------------------------------.                    ,--------------------------------------------.
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                 KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                             //`--------------------------'  `--------------------------'
+  )
+};
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/keymaps/via/rules.mk b/keyboards/controllerworks/mini36/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/controllerworks/mini36/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/mcuconf.h b/keyboards/controllerworks/mini36/mcuconf.h
new file mode 100644
index 0000000000..7f0840c7a7
--- /dev/null
+++ b/keyboards/controllerworks/mini36/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/mini36.c b/keyboards/controllerworks/mini36/mini36.c
new file mode 100644
index 0000000000..efe97009d9
--- /dev/null
+++ b/keyboards/controllerworks/mini36/mini36.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2022 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+
+static void render_logo(void) {
+    static const char PROGMEM raw_logo[] = {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12, 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, 12, 12,  0,  0,  0,  0,  0,  0,  0,  6,  6,  6,  6,  6,134,230,126, 30,  6,  0,  0,  0,  0,  0,128,192, 96, 56, 28,  6,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,252,  6,  3,  3,  3,  3,  7,254,252,  6,  3,  3,  3,  3,  6,252,248,  0,  0,  0,  0,  0,  0,255,255,  0,  0,  0,  0,  0,  0,248,252,  6,  3,  3,  3,  3,  3,  3,  6,252,248,  0,  0,  0,  0,  0,  0,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28, 31, 27, 24, 48,224,192,  0,  0,240,252, 62, 27, 25, 24, 24, 24, 24, 48,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0,  0,127,127,  0,  0,  0,  0,  0, 12, 24, 48, 96, 96, 96, 96, 96, 96, 48, 31, 15,  0,  0, 15, 31, 48, 96, 96, 96, 96, 96, 96, 48, 31, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    if (!is_keyboard_master()) {
+        return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+    }
+
+    return rotation;
+}
+
+bool render_status(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("BASE\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("LOWER\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("RAISE\n"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("ADJUST\n"), false);
+            break;            
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+    
+    return false;
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        render_status();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+    } else {
+        render_logo();  // Renders a static logo
+        oled_scroll_left();  // Turns on scrolling
+    }
+    return false;
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/readme.md b/keyboards/controllerworks/mini36/readme.md
new file mode 100644
index 0000000000..c23cbc92c6
--- /dev/null
+++ b/keyboards/controllerworks/mini36/readme.md
@@ -0,0 +1,43 @@
+# mini36
+
+![mini36](https://i.imgur.com/JwhiE9ll.png)
+![mini36PCB](https://i.imgur.com/6NjZ8Cql.jpg)
+
+*A pre-built, low profile, split mechanical keyboard with 36 keys based on the RP2040 processor*
+
+* Keyboard Maintainer: [Kevin Gee](https://github.com/controller-works)
+* Hardware Supported: *mini36 split ergonomic keyboard*
+* Hardware Availability: *https://controller.works/products/mini36-low-profile-ergonomic-keyboard* Hardware is available as pre-built units only.
+
+Make example for this keyboard (after setting up your build environment):
+
+```sh
+    make controllerworks/mini36:default
+```
+
+Flashing example for this keyboard:
+
+```sh
+    make controllerworks/mini36:default:flash
+```
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Features
+- Highly integrated design with microcontroller, USB and TRRS connectors, and OLED all integrated on the main board with no secondary modules
+- RP2040 processor by Raspberry Pi Foundation running at 130 MHz with 16MB flash memory
+- CNC milled aluminum case with only 8mm thickness
+- "PCB art" shine through back plate with gold surface finish
+- 128x32 OLED on each keyboard half
+- 36 per-key RGB LEDs and 12 backlight RGB LEDS are individually addressable
+- ESD and over-current protection on USB and TRRS connectors
+- Reset and boot tactile switches
+- USB C host connection
+- Hot swap connectors for Kailh Chocolate PG1350 switches
+- Chocolate key spacing (18mm horizontal x 17mm vertical) 
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the upper left key on the left hand keyboard half or the upper right key on the right hand keyboard half while plugging in USB
+* **Physical reset button**: Press the RST button twice, rapidly
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/rules.mk b/keyboards/controllerworks/mini36/rules.mk
new file mode 100644
index 0000000000..f487b11ec8
--- /dev/null
+++ b/keyboards/controllerworks/mini36/rules.mk
@@ -0,0 +1,3 @@
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
+OLED_DRIVER   = SSD1306
\ No newline at end of file

From 4a9771c0ecc9ffe8c7b9ad69f11df03406dc4cfc Mon Sep 17 00:00:00 2001
From: Huy Ta Ba Thanh <huytbt@gmail.com>
Date: Sun, 23 Oct 2022 05:59:43 +0700
Subject: [PATCH 708/959] Add H50 keyboard from huytbt (#18752)

* Add H50 keyboard from huytbt

Add H50 keyboard

The H50 is a mini keyboard with a 50 percent layout. The keyboard consists of 53 keys.

* Optimize code

* Optimize keymap code

* Optimize code H50 keyboard
---
 keyboards/huytbt/h50/config.h                 | 42 +++++++++++
 keyboards/huytbt/h50/h50.c                    | 17 +++++
 keyboards/huytbt/h50/h50.h                    | 35 +++++++++
 keyboards/huytbt/h50/info.json                | 72 +++++++++++++++++++
 keyboards/huytbt/h50/keymaps/default/keymap.c | 51 +++++++++++++
 keyboards/huytbt/h50/keymaps/via/keymap.c     | 51 +++++++++++++
 keyboards/huytbt/h50/keymaps/via/rules.mk     |  1 +
 keyboards/huytbt/h50/readme.md                | 27 +++++++
 keyboards/huytbt/h50/rules.mk                 | 16 +++++
 9 files changed, 312 insertions(+)
 create mode 100644 keyboards/huytbt/h50/config.h
 create mode 100644 keyboards/huytbt/h50/h50.c
 create mode 100644 keyboards/huytbt/h50/h50.h
 create mode 100644 keyboards/huytbt/h50/info.json
 create mode 100644 keyboards/huytbt/h50/keymaps/default/keymap.c
 create mode 100644 keyboards/huytbt/h50/keymaps/via/keymap.c
 create mode 100644 keyboards/huytbt/h50/keymaps/via/rules.mk
 create mode 100644 keyboards/huytbt/h50/readme.md
 create mode 100644 keyboards/huytbt/h50/rules.mk

diff --git a/keyboards/huytbt/h50/config.h b/keyboards/huytbt/h50/config.h
new file mode 100644
index 0000000000..a89fe3763e
--- /dev/null
+++ b/keyboards/huytbt/h50/config.h
@@ -0,0 +1,42 @@
+/* Copyright 2022 Huy Ta (@huytbt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ */
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, B4, B5, D2, D3 }
+
+#define LED_CAPS_LOCK_PIN D5
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+// #define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
diff --git a/keyboards/huytbt/h50/h50.c b/keyboards/huytbt/h50/h50.c
new file mode 100644
index 0000000000..bb80f14583
--- /dev/null
+++ b/keyboards/huytbt/h50/h50.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Huy Ta (@huytbt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "h50.h"
diff --git a/keyboards/huytbt/h50/h50.h b/keyboards/huytbt/h50/h50.h
new file mode 100644
index 0000000000..9d710de915
--- /dev/null
+++ b/keyboards/huytbt/h50/h50.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 Huy Ta (@huytbt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* h50 keymap definition macro
+ */
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
+    k30, k31, k32, k33,      k35,      k37,      k39, k3A, k3B, k3C, k3D \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
+    { k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3A, k3B, k3C, k3D } \
+}
diff --git a/keyboards/huytbt/h50/info.json b/keyboards/huytbt/h50/info.json
new file mode 100644
index 0000000000..14326061c9
--- /dev/null
+++ b/keyboards/huytbt/h50/info.json
@@ -0,0 +1,72 @@
+{
+  "keyboard_name": "H50",
+  "url": "https://github.com/huytbt/h50-keyboard",
+  "maintainer": "huytbt",
+  "usb": {
+    "vid": "0x4859",
+    "pid": "0x0002",
+    "device_version": "0.0.1"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "Tab", "x": 0, "y": 0 },
+        { "label": "Q", "x": 1, "y": 0 },
+        { "label": "W", "x": 2, "y": 0 },
+        { "label": "E", "x": 3, "y": 0 },
+        { "label": "R", "x": 4, "y": 0 },
+        { "label": "T", "x": 5, "y": 0 },
+        { "label": "Y", "x": 6, "y": 0 },
+        { "label": "U", "x": 7, "y": 0 },
+        { "label": "I", "x": 8, "y": 0 },
+        { "label": "O", "x": 9, "y": 0 },
+        { "label": "P", "x": 10, "y": 0 },
+        { "label": "[", "x": 11, "y": 0 },
+        { "label": "]", "x": 12, "y": 0 },
+        { "label": "Back<br>Space", "x": 13, "y": 0 },
+
+        { "label": "Caps", "x": 0, "y": 1, "w": 1.25 },
+        { "label": "A", "x": 1.25, "y": 1 },
+        { "label": "S", "x": 2.25, "y": 1 },
+        { "label": "D", "x": 3.25, "y": 1 },
+        { "label": "F", "x": 4.25, "y": 1 },
+        { "label": "G", "x": 5.25, "y": 1 },
+        { "label": "H", "x": 6.25, "y": 1 },
+        { "label": "J", "x": 7.25, "y": 1 },
+        { "label": "K", "x": 8.25, "y": 1 },
+        { "label": "L", "x": 9.25, "y": 1 },
+        { "label": ";", "x": 10.25, "y": 1 },
+        { "label": "'", "x": 11.25, "y": 1 },
+        { "label": "Enter", "x": 12.25, "y": 1, "w": 1.75 },
+        { "label": "PGUP", "x": 14, "y": 1 },
+
+        { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
+        { "label": "Z", "x": 1.75, "y": 2 },
+        { "label": "X", "x": 2.75, "y": 2 },
+        { "label": "C", "x": 3.75, "y": 2 },
+        { "label": "V", "x": 4.75, "y": 2 },
+        { "label": "B", "x": 5.75, "y": 2 },
+        { "label": "N", "x": 6.75, "y": 2 },
+        { "label": "M", "x": 7.75, "y": 2 },
+        { "label": ",", "x": 8.75, "y": 2 },
+        { "label": ".", "x": 9.75, "y": 2 },
+        { "label": "/", "x": 10.75, "y": 2 },
+        { "label": "Shift", "x": 11.75, "y": 2, "w": 1.25 },
+        { "label": "Up", "x": 13, "y": 2 },
+        { "label": "PGDN", "x": 14, "y": 2 },
+
+        { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
+        { "label": "Alt", "x": 1.25, "y": 3, "w": 1.25 },
+        { "label": "Super", "x": 2.5, "y": 3, "w": 1.25 },
+        { "x": 3.75, "y": 3, "w": 1.75 },
+        { "x": 5.5, "y": 3, "w": 1.75 },
+        { "label": "Fn1", "x": 7.25, "y": 3, "w": 1.75 },
+        { "label": "Fn2", "x": 9, "y": 3, "w": 1.25 },
+        { "label": "Fn3", "x": 10.25, "y": 3, "w": 1.25 },
+        { "label": "Left", "x": 12, "y": 3 },
+        { "label": "Down", "x": 13, "y": 3 },
+        { "label": "Right", "x": 14, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/huytbt/h50/keymaps/default/keymap.c b/keyboards/huytbt/h50/keymaps/default/keymap.c
new file mode 100644
index 0000000000..209a396ac5
--- /dev/null
+++ b/keyboards/huytbt/h50/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2022 Huy Ta (@huytbt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+/* this keymap is to provide a basic keyboard layout for testing the matrix
+ * for more practical and complicated keymap refer to other keymaps in the same folder
+ */
+
+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_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_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_SPC, MO(1), MO(2), MO(3), KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT(
+    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+    KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/huytbt/h50/keymaps/via/keymap.c b/keyboards/huytbt/h50/keymaps/via/keymap.c
new file mode 100644
index 0000000000..209a396ac5
--- /dev/null
+++ b/keyboards/huytbt/h50/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2022 Huy Ta (@huytbt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+/* this keymap is to provide a basic keyboard layout for testing the matrix
+ * for more practical and complicated keymap refer to other keymaps in the same folder
+ */
+
+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_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_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_SPC, MO(1), MO(2), MO(3), KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT(
+    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+    KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/huytbt/h50/keymaps/via/rules.mk b/keyboards/huytbt/h50/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/huytbt/h50/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/huytbt/h50/readme.md b/keyboards/huytbt/h50/readme.md
new file mode 100644
index 0000000000..4e08f807ef
--- /dev/null
+++ b/keyboards/huytbt/h50/readme.md
@@ -0,0 +1,27 @@
+# H50
+
+![h50](https://i.imgur.com/1dB2mfMh.jpeg)
+
+The H50 is a mini keyboard with a 50 percent layout. The keyboard consists of 53 keys.
+
+* Keyboard Maintainer: [huytbt](https://github.com/huytbt)
+* Hardware Supported: Handwired
+* Hardware Availability: You can follow the build guide here <https://github.com/huytbt/h50-keyboard>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make huytbt/h50:default
+
+Flashing example for this keyboard:
+
+    make huytbt/h50:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/huytbt/h50/rules.mk b/keyboards/huytbt/h50/rules.mk
new file mode 100644
index 0000000000..288fe84296
--- /dev/null
+++ b/keyboards/huytbt/h50/rules.mk
@@ -0,0 +1,16 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Disable keyboard backlight functionality

From 1a1a3651d3ca6dfd8a09dd3e79498afbd54fa350 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sat, 22 Oct 2022 16:00:40 -0700
Subject: [PATCH 709/959] Format code according to conventions (#18818)

---
 .../hold_on_other_key_press/test_tap_hold.cpp | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp b/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
index b074922f74..e77c756624 100644
--- a/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
@@ -282,10 +282,10 @@ TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_0_layer_tap_keys) {
     TestDriver driver;
     InSequence s;
     /* The keys are layer-taps on layer 0 but regular keys on layer 1 */
-    auto       first_layer_tap_key  = KeymapKey(0, 1, 0, LT(1, KC_A));
-    auto       second_layer_tap_key = KeymapKey(0, 2, 0, LT(1, KC_P));
-    auto       first_key_on_layer   = KeymapKey(1, 1, 0, KC_B);
-    auto       second_key_on_layer  = KeymapKey(1, 2, 0, KC_Q);
+    auto first_layer_tap_key  = KeymapKey(0, 1, 0, LT(1, KC_A));
+    auto second_layer_tap_key = KeymapKey(0, 2, 0, LT(1, KC_P));
+    auto first_key_on_layer   = KeymapKey(1, 1, 0, KC_B);
+    auto second_key_on_layer  = KeymapKey(1, 2, 0, KC_Q);
 
     set_keymap({first_layer_tap_key, second_layer_tap_key, first_key_on_layer, second_key_on_layer});
 
@@ -318,12 +318,12 @@ TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_tap_keys) {
     TestDriver driver;
     InSequence s;
     /* The keys are layer-taps on all layers */
-    auto       first_key_layer_0  = KeymapKey(0, 1, 0, LT(1, KC_A));
-    auto       second_key_layer_0 = KeymapKey(0, 2, 0, LT(1, KC_P));
-    auto       first_key_layer_1  = KeymapKey(1, 1, 0, LT(2, KC_B));
-    auto       second_key_layer_1 = KeymapKey(1, 2, 0, LT(2, KC_Q));
-    auto       first_key_layer_2  = KeymapKey(2, 1, 0, KC_TRNS);
-    auto       second_key_layer_2 = KeymapKey(2, 2, 0, KC_TRNS);
+    auto first_key_layer_0  = KeymapKey(0, 1, 0, LT(1, KC_A));
+    auto second_key_layer_0 = KeymapKey(0, 2, 0, LT(1, KC_P));
+    auto first_key_layer_1  = KeymapKey(1, 1, 0, LT(2, KC_B));
+    auto second_key_layer_1 = KeymapKey(1, 2, 0, LT(2, KC_Q));
+    auto first_key_layer_2  = KeymapKey(2, 1, 0, KC_TRNS);
+    auto second_key_layer_2 = KeymapKey(2, 2, 0, KC_TRNS);
 
     set_keymap({first_key_layer_0, second_key_layer_0, first_key_layer_1, second_key_layer_1, first_key_layer_2, second_key_layer_2});
 
@@ -391,9 +391,9 @@ TEST_F(HoldOnOtherKeyPress, roll_layer_tap_key_with_regular_key) {
     TestDriver driver;
     InSequence s;
 
-    auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
-    auto       regular_key        = KeymapKey(0, 2, 0, KC_A);
-    auto       layer_key          = KeymapKey(1, 2, 0, KC_B);
+    auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
+    auto regular_key        = KeymapKey(0, 2, 0, KC_A);
+    auto layer_key          = KeymapKey(1, 2, 0, KC_B);
 
     set_keymap({layer_tap_hold_key, regular_key, layer_key});
 

From 716969a01a5a2a6d48bfb4d8595bf85092b7244b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 22 Oct 2022 16:07:31 -0700
Subject: [PATCH 710/959] Macro3: rename LAYOUT to LAYOUT_ortho_2x4 (#18820)

---
 keyboards/macro3/info.json                | 5 ++++-
 keyboards/macro3/keymaps/default/keymap.c | 4 ++--
 keyboards/macro3/macro3.h                 | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json
index f3ebdb8acd..b95ab110f3 100644
--- a/keyboards/macro3/info.json
+++ b/keyboards/macro3/info.json
@@ -8,8 +8,11 @@
         "pid": "0x3388",
         "device_version": "0.0.3"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_2x4"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_2x4": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/macro3/keymaps/default/keymap.c
index 8881612a3f..50cafe9d0f 100644
--- a/keyboards/macro3/keymaps/default/keymap.c
+++ b/keyboards/macro3/keymaps/default/keymap.c
@@ -6,11 +6,11 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_2x4(
         KC_MUTE, KC_MPLY, KC_MRWD, LT(1,KC_MFFD),
         C(KC_Z), C(KC_X), C(KC_C), C(KC_V)
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_2x4(
         _______, _______, _______, _______,
         QK_BOOT, _______, _______, _______
     )
diff --git a/keyboards/macro3/macro3.h b/keyboards/macro3/macro3.h
index d95f504083..4a5071cbfe 100644
--- a/keyboards/macro3/macro3.h
+++ b/keyboards/macro3/macro3.h
@@ -5,7 +5,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_ortho_2x4( \
     K00, K01, K02, K03, \
     K10, K11, K12, K13  \
 ) \

From 64ca14feea586442516a2ec50d7335445f5f08f6 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 23 Oct 2022 04:30:17 +0100
Subject: [PATCH 711/959] Fix garbled test output (#18822)

* Fix garbled test output

* Correct SRC listing
---
 builddefs/build_test.mk    | 2 +-
 tests/test_common/main.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builddefs/build_test.mk b/builddefs/build_test.mk
index 64db99fed9..7c8fdd20e5 100644
--- a/builddefs/build_test.mk
+++ b/builddefs/build_test.mk
@@ -71,7 +71,7 @@ include $(BUILDDEFS_PATH)/build_full_test.mk
 endif
 
 $(TEST)_SRC += \
-	tests/test_common/main.c \
+	tests/test_common/main.cpp \
 	$(QUANTUM_PATH)/logging/print.c
 
 $(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)
diff --git a/tests/test_common/main.cpp b/tests/test_common/main.cpp
index 3e4b4c0f95..0f4e320b07 100644
--- a/tests/test_common/main.cpp
+++ b/tests/test_common/main.cpp
@@ -5,7 +5,7 @@ extern "C" {
 #include "debug.h"
 
 int8_t sendchar(uint8_t c) {
-    fprintf(stderr, "%c", c);
+    fprintf(stdout, "%c", c);
     return 0;
 }
 

From ac75d6e4e6750a357690a3f524eb935544f20774 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 23 Oct 2022 06:32:10 -0700
Subject: [PATCH 712/959] Aurora65: Correct Layout Data (#18826)

* info.json: apply friendly formatting

* info.json: correct layout data
---
 keyboards/aurora65/info.json | 74 +++++++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
index 7962fda7e7..1f7207787a 100644
--- a/keyboards/aurora65/info.json
+++ b/keyboards/aurora65/info.json
@@ -10,7 +10,79 @@
     },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
         }
     }
 }

From 9248a04e17618a796532c62d6cf71427bce9133a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 23 Oct 2022 06:32:34 -0700
Subject: [PATCH 713/959] Studio Kestra Galatea: fix ISO layout macros (#18825)

Switch the matrix positions for `KC_NUHS` and `KC_ENT`.
---
 keyboards/studiokestra/galatea/rev1/rev1.h | 2 +-
 keyboards/studiokestra/galatea/rev2/rev2.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/studiokestra/galatea/rev1/rev1.h b/keyboards/studiokestra/galatea/rev1/rev1.h
index 55aed02db8..c319dfa63f 100644
--- a/keyboards/studiokestra/galatea/rev1/rev1.h
+++ b/keyboards/studiokestra/galatea/rev1/rev1.h
@@ -97,7 +97,7 @@
     k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
     k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,        k57, k48, k58, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k47, k66,                  \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k47,                  \
     k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
     kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
 ) { \
diff --git a/keyboards/studiokestra/galatea/rev2/rev2.h b/keyboards/studiokestra/galatea/rev2/rev2.h
index 55aed02db8..c319dfa63f 100644
--- a/keyboards/studiokestra/galatea/rev2/rev2.h
+++ b/keyboards/studiokestra/galatea/rev2/rev2.h
@@ -97,7 +97,7 @@
     k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
     k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,        k57, k48, k58, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k47, k66,                  \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k47,                  \
     k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
     kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
 ) { \

From 64e84419106013d9977192fd2087c0bb8baae84a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 23 Oct 2022 06:33:25 -0700
Subject: [PATCH 714/959] Han60 Refactor (#18819)

* info.json: apply friendly formatting

* han60.h: add matrix diagram

* han60.h: tidy file

- remove trailing whitespace
- use four-space indent

* info.json: remove key overlaps from LAYOUT_all rendering

* rename LAYOUT_tsangan to LAYOUT_60_ansi_tsangan

* rename LAYOUT_tsangan_arrowkeys to LAYOUT_60_ansi_arrow_tsangan

* refactor LAYOUT_tsangan_iso into LAYOUT_60_iso_tsangan

Moves position `K2C` (Enter) to the home row.

* refactor LAYOUT_tsangan_iso_arrowkeys into LAYOUT_60_iso_arrow_tsangan

Moves position `K2C` (Enter) to the home row.

* refactor default keymap

- use four-space indent
- use QMK-native keycode aliases
- grid-align keycodes

* bugfix layout macros

* add reference keymaps
---
 keyboards/han60/han60.h                       | 106 +--
 keyboards/han60/info.json                     | 658 +++++++++---------
 keyboards/han60/keymaps/default/keymap.c      |  27 +-
 .../default_ansi_arrow_tsangan/keymap.c       |  35 +
 .../keymaps/default_ansi_tsangan/keymap.c     |  35 +
 .../default_iso_arrow_tsangan/keymap.c        |  35 +
 .../keymaps/default_iso_tsangan/keymap.c      |  35 +
 7 files changed, 554 insertions(+), 377 deletions(-)
 create mode 100644 keyboards/han60/keymaps/default_ansi_arrow_tsangan/keymap.c
 create mode 100644 keyboards/han60/keymaps/default_ansi_tsangan/keymap.c
 create mode 100644 keyboards/han60/keymaps/default_iso_arrow_tsangan/keymap.c
 create mode 100644 keyboards/han60/keymaps/default_iso_tsangan/keymap.c

diff --git a/keyboards/han60/han60.h b/keyboards/han60/han60.h
index f6e25c23b2..ebc443a277 100644
--- a/keyboards/han60/han60.h
+++ b/keyboards/han60/han60.h
@@ -26,78 +26,94 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
- 
+
 #define XXX KC_NO
 
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐          ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │          │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤          └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │            │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤         ┌──┴┐2C  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │         │1D │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤   ┌─────┴┬──┴┬───┤
+ * │30      │   │30  │40 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B        │   │3B    │3D │4D │ 1.75u/1u/1u
+ * └────────┘   ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤   └──────┴───┴───┘
+ *              │41   │42 │43   │44                         │47   │49 │4B   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+ *              │41   │42 │43   │44                         │47 │48 │4A │4C │ Arrow
+ *              └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+ */
 
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,      \
-	K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K4D, \
-	K41, K42, K43,                K44,           K47, K48, K49, K4A, K4B, K4C  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K4D, \
+    K41, K42, K43,                K44,           K47, K48, K49, K4A, K4B, K4C  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
-	{ K40, K41, K42, K43, K44, XXX, XXX, K47, K48, K49, K4A, K4B, K4C, K4D }  \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
+    { K40, K41, K42, K43, K44, XXX, XXX, K47, K48, K49, K4A, K4B, K4C, K4D }  \
 }
 
-#define LAYOUT_tsangan( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,           K3B, \
-	K41, K42, K43,                K44,                     K47, K49, K4B  \
+#define LAYOUT_60_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3B, \
+    K41, K42, K43,                K44,                     K47, K49, K4B  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
-	{ XXX, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX }  \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
+    { XXX, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX }  \
 }
 
-#define LAYOUT_tsangan_arrowkeys( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39,      K3B, K3D, K4D, \
-	K41, K42, K43,                K44,                K47, K48, K4A, K4C  \
+#define LAYOUT_60_ansi_arrow_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K4D, \
+    K41, K42, K43,                K44,                K47, K48, K4A, K4C  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
-	{ XXX, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D }  \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
+    { XXX, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D }  \
 }
 
-#define LAYOUT_tsangan_iso( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, \
-	K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3B, \
-	K41, K42, K43,                K44,                     K47, K49, K4B  \
+#define LAYOUT_60_iso_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2C, \
+    K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3B, \
+    K41, K42, K43,                K44,                     K47, K49, K4B  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
-	{ K40, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX }  \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX }  \
 }
 
-#define LAYOUT_tsangan_iso_arrowkeys( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, \
-	K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K4D, \
-	K41, K42, K43,                K44,                K47, K48, K4A, K4C  \
+#define LAYOUT_60_iso_arrow_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2C, \
+    K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K4D, \
+    K41, K42, K43,                K44,                K47, K48, K4A, K4C  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
-	{ K40, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D }  \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
+    { K40, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D }  \
 }
 
 
diff --git a/keyboards/han60/info.json b/keyboards/han60/info.json
index 1722996c85..bbc60791f7 100644
--- a/keyboards/han60/info.json
+++ b/keyboards/han60/info.json
@@ -8,338 +8,362 @@
         "pid": "0xFB60",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_tsangan": "LAYOUT_60_ansi_tsangan",
+        "LAYOUT_tsangan_arrowkeys": "LAYOUT_60_ansi_arrow_tsangan"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0 },
-                { "x": 14, "y": 0 },
-                { "w": 1.5, "x": 0, "y": 1 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "w": 1.5, "x": 13.5, "y": 1 },
-                { "w": 1.75, "x": 0, "y": 2 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "w": 2.25, "x": 12.75, "y": 2 },
-                { "w": 1.25, "x": 0, "y": 3 },
-                { "x": 1.25, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "x": 11.25, "y": 3 },
-                { "w": 1.75, "x": 11.25, "y": 3 },
-                { "x": 13, "y": 3 },
-                { "x": 14, "y": 3 },
-                { "w": 1.5, "x": 0, "y": 4 },
-                { "x": 1.5, "y": 4 },
-                { "w": 1.5, "x": 2.5, "y": 4 },
-                { "w": 7, "x": 4, "y": 4 },
-                { "x": 11, "y": 4 },
-                { "x": 12, "y": 4 },
-                { "x": 12.5, "y": 4 },
-                { "x": 13, "y": 4 },
-                { "w": 1.5, "x": 13.5, "y": 4 },
-                { "x": 14, "y": 4 }
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":0.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4},
+                {"x":12, "y":4, "w":0.6},
+                {"x":12.6, "y":4, "w":0.6},
+                {"x":13.2, "y":4, "w":0.6},
+                {"x":13.8, "y":4, "w":0.6},
+                {"x":14.4, "y":4, "w":0.6}
             ]
         },
-		"LAYOUT_tsangan": {
+        "LAYOUT_60_ansi_tsangan": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "w": 2, "x": 13, "y": 0 },
-                { "w": 1.5, "x": 0, "y": 1 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "w": 1.5, "x": 13.5, "y": 1 },
-                { "w": 1.75, "x": 0, "y": 2 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "w": 2.25, "x": 12.75, "y": 2 },
-                { "w": 2.25, "x": 0, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "x": 11.25, "y": 3 },
-                { "w": 2.75, "x": 12.25, "y": 3 },
-                { "w": 1.5, "x": 0, "y": 4 },
-                { "x": 1.5, "y": 4 },
-                { "w": 1.5, "x": 2.5, "y": 4 },
-                { "w": 7, "x": 4, "y": 4 },
-                { "w": 1.5, "x": 11, "y": 4 },
-                { "x": 12.5, "y": 4 },
-                { "w": 1.5, "x": 13.5, "y": 4 }
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
             ]
         },
-		"LAYOUT_tsangan_arrowkeys": {
+        "LAYOUT_60_ansi_arrow_tsangan": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "w": 2, "x": 13, "y": 0 },
-                { "w": 1.5, "x": 0, "y": 1 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "w": 1.5, "x": 13.5, "y": 1 },
-                { "w": 1.75, "x": 0, "y": 2 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "w": 2.25, "x": 12.75, "y": 2 },
-                { "w": 2.25, "x": 0, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "w": 1.75, "x": 11.25, "y": 3 },
-                { "x": 13, "y": 3 },
-                { "x": 14, "y": 3 },
-                { "w": 1.5, "x": 0, "y": 4 },
-                { "x": 1.5, "y": 4 },
-                { "w": 1.5, "x": 2.5, "y": 4 },
-                { "w": 7, "x": 4, "y": 4 },
-                { "x": 11, "y": 4 },
-                { "x": 12, "y": 4 },
-                { "x": 13, "y": 4 },
-                { "x": 14, "y": 4 }
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
             ]
         },
-        "LAYOUT_tsangan_iso": {
+        "LAYOUT_60_iso_tsangan": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "w": 2, "x": 13, "y": 0 },
-                { "w": 1.5, "x": 0, "y": 1 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "h": 2, "w": 1.25, "x": 13.75, "y": 1 },
-                { "w": 1.75, "x": 0, "y": 2 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "x": 12.75, "y": 2 },
-                { "w": 1.25, "x": 0, "y": 3 },
-                { "x": 1.25, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "x": 11.25, "y": 3 },
-                { "w": 2.75, "x": 12.25, "y": 3 },
-                { "w": 1.5, "x": 0, "y": 4 },
-                { "x": 1.5, "y": 4 },
-                { "w": 1.5, "x": 2.5, "y": 4 },
-                { "w": 7, "x": 4, "y": 4 },
-                { "w": 1.5, "x": 11, "y": 4 },
-                { "x": 12.5, "y": 4 },
-                { "w": 1.5, "x": 13.5, "y": 4 }
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
             ]
         },
-        "LAYOUT_tsangan_iso_arrowkeys": {
+        "LAYOUT_60_iso_arrow_tsangan": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "w": 2, "x": 13, "y": 0 },
-                { "w": 1.5, "x": 0, "y": 1 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "h": 2, "w": 1.25, "x": 13.75, "y": 1 },
-                { "w": 1.75, "x": 0, "y": 2 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "x": 12.75, "y": 2 },
-                { "w": 1.25, "x": 0, "y": 3 },
-                { "x": 1.25, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "w": 1.75, "x": 11.25, "y": 3 },
-                { "x": 13, "y": 3 },
-                { "x": 14, "y": 3 },
-                { "w": 1.5, "x": 0, "y": 4 },
-                { "x": 1.5, "y": 4 },
-                { "w": 1.5, "x": 2.5, "y": 4 },
-                { "w": 7, "x": 4, "y": 4 },
-                { "x": 11, "y": 4 },
-                { "x": 12, "y": 4 },
-                { "x": 13, "y": 4 },
-                { "x": 14, "y": 4 }
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
             ]
         }
     }
diff --git a/keyboards/han60/keymaps/default/keymap.c b/keyboards/han60/keymaps/default/keymap.c
index 4b80f8258c..5e3044f27d 100644
--- a/keyboards/han60/keymaps/default/keymap.c
+++ b/keyboards/han60/keymaps/default/keymap.c
@@ -18,21 +18,18 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* BASE */
     [0] = LAYOUT_all(
-     KC_GESC,  KC_1,     KC_2,    KC_3,     KC_4,     KC_5,    KC_6,    KC_7,      KC_8,    KC_9,     KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,  
-     KC_TAB,   KC_Q,     KC_W,    KC_E,     KC_R,     KC_T,    KC_Y,    KC_U,      KC_I,    KC_O,     KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,
-     KC_CAPS,  KC_A,     KC_S,    KC_D,     KC_F,     KC_G,    KC_H,    KC_J,      KC_K,    KC_L,     KC_SCLN, KC_QUOT,            KC_ENT,   
-	 KC_LSFT,  KC_GRAVE, KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,    KC_N,      KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,  KC_UP,    KC_SLSH,  	
-	 KC_LCTL,  KC_LCMD,  KC_LALT,                              KC_SPACE,                    KC_RALT,  KC_LEFT, MO(1),    KC_DOWN,  KC_RCTL,  KC_RGHT 	
-    ), 
-	/* FN */
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_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_SLSH,
+        KC_LCTL, KC_LCMD, KC_LALT,                            KC_SPC,                    KC_RALT, KC_LEFT, MO(1),   KC_DOWN, KC_RCTL, KC_RGHT
+    ),
+    /* FN */
     [1] = LAYOUT_all(
-     QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_DEL,  KC_TRNS, 
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,           KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,  KC_TRNS, KC_TRNS,	
-	 KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, MO(1),   KC_TRNS,  KC_TRNS, KC_TRNS 
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, MO(1),   _______, _______, _______
     )
 };
-
-
-
diff --git a/keyboards/han60/keymaps/default_ansi_arrow_tsangan/keymap.c b/keyboards/han60/keymaps/default_ansi_arrow_tsangan/keymap.c
new file mode 100644
index 0000000000..200321e412
--- /dev/null
+++ b/keyboards/han60/keymaps/default_ansi_arrow_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 farhandsome
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* BASE */
+    [0] = LAYOUT_60_ansi_tsangan_arrowkeys(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LCMD, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    /* FN */
+    [1] = LAYOUT_60_ansi_tsangan_arrowkeys(
+        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,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            MO(1),   _______, _______, _______
+    )
+};
diff --git a/keyboards/han60/keymaps/default_ansi_tsangan/keymap.c b/keyboards/han60/keymaps/default_ansi_tsangan/keymap.c
new file mode 100644
index 0000000000..88a438aee0
--- /dev/null
+++ b/keyboards/han60/keymaps/default_ansi_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 farhandsome
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* BASE */
+    [0] = LAYOUT_60_ansi_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_LCMD, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL
+    ),
+    /* FN */
+    [1] = LAYOUT_60_ansi_tsangan(
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,          _______,
+        _______, _______, _______,                            _______,                                     _______, MO(1),   _______
+    )
+};
diff --git a/keyboards/han60/keymaps/default_iso_arrow_tsangan/keymap.c b/keyboards/han60/keymaps/default_iso_arrow_tsangan/keymap.c
new file mode 100644
index 0000000000..9af474fcd8
--- /dev/null
+++ b/keyboards/han60/keymaps/default_iso_arrow_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 farhandsome
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* BASE */
+    [0] = LAYOUT_60_iso_tsangan_arrowkeys(
+        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_RSFT, KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LCMD, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    /* FN */
+    [1] = LAYOUT_60_iso_tsangan_arrowkeys(
+        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,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            MO(1),   _______, _______, _______
+    )
+};
diff --git a/keyboards/han60/keymaps/default_iso_tsangan/keymap.c b/keyboards/han60/keymaps/default_iso_tsangan/keymap.c
new file mode 100644
index 0000000000..58fc5237fb
--- /dev/null
+++ b/keyboards/han60/keymaps/default_iso_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 farhandsome
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* BASE */
+    [0] = LAYOUT_60_iso_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_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_LCMD, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL
+    ),
+    /* FN */
+    [1] = LAYOUT_60_iso_tsangan(
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,          _______,
+        _______, _______, _______,                            _______,                                     _______, MO(1),   _______
+    )
+};

From 590ce134b38756d3fad607136f84b239309a9f6e Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 23 Oct 2022 06:33:45 -0700
Subject: [PATCH 715/959] Mode SixtyFive HI Layout Refactor (#18823)

* m65hi_alpha.h: add matrix diagram

* rename LAYOUT_all to LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_tsangan

* tidy-up keymaps

- use four-space indent
- polish keycode grid alignment

* touch-up keymaps

Switch one Page Down keycode for Page Up on the `default` keymap, and switch the Page Down and Page Up keycodes on the `via` keymap.
---
 keyboards/mode/m65hi_alpha/info.json          | 80 ++++++++++++++++++-
 .../mode/m65hi_alpha/keymaps/default/keymap.c | 52 ++++++------
 .../mode/m65hi_alpha/keymaps/via/keymap.c     | 54 ++++++-------
 keyboards/mode/m65hi_alpha/m65hi_alpha.h      | 34 +++++++-
 4 files changed, 165 insertions(+), 55 deletions(-)

diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json
index 231299e6d1..7869008f8d 100644
--- a/keyboards/mode/m65hi_alpha/info.json
+++ b/keyboards/mode/m65hi_alpha/info.json
@@ -8,8 +8,11 @@
     "pid": "0x6574",
     "device_version": "0.6.5"
   },
+  "layout_aliases": {
+      "LAYOUT_all": "LAYOUT_65_iso_blocker"
+  },
   "layouts": {
-      "LAYOUT_all": {
+      "LAYOUT_65_iso_blocker": {
           "layout": [
               { "label": "K00", "x": 0, "y": 0 },
               { "label": "K01", "x": 1, "y": 0 },
@@ -84,6 +87,81 @@
               { "label": "K5D", "x": 14, "y": 4 },
               { "label": "K5E", "x": 15, "y": 4 }
           ]
+      },
+      "LAYOUT_65_iso_blocker_tsangan": {
+          "layout": [
+              { "label": "K00", "x": 0, "y": 0 },
+              { "label": "K01", "x": 1, "y": 0 },
+              { "label": "K02", "x": 2, "y": 0 },
+              { "label": "K03", "x": 3, "y": 0 },
+              { "label": "K04", "x": 4, "y": 0 },
+              { "label": "K05", "x": 5, "y": 0 },
+              { "label": "K06", "x": 6, "y": 0 },
+              { "label": "K07", "x": 7, "y": 0 },
+              { "label": "K08", "x": 8, "y": 0 },
+              { "label": "K09", "x": 9, "y": 0 },
+              { "label": "K0A", "x": 10, "y": 0 },
+              { "label": "K0B", "x": 11, "y": 0 },
+              { "label": "K0C", "x": 12, "y": 0 },
+              { "label": "K0D", "x": 13, "y": 0, "w": 2 },
+              { "label": "K0E", "x": 15, "y": 0 },
+
+              { "label": "K10", "x": 0, "y": 1, "w": 1.5 },
+              { "label": "K11", "x": 1.5, "y": 1 },
+              { "label": "K12", "x": 2.5, "y": 1 },
+              { "label": "K13", "x": 3.5, "y": 1 },
+              { "label": "K14", "x": 4.5, "y": 1 },
+              { "label": "K15", "x": 5.5, "y": 1 },
+              { "label": "K16", "x": 6.5, "y": 1 },
+              { "label": "K17", "x": 7.5, "y": 1 },
+              { "label": "K18", "x": 8.5, "y": 1 },
+              { "label": "K19", "x": 9.5, "y": 1 },
+              { "label": "K1A", "x": 10.5, "y": 1 },
+              { "label": "K1B", "x": 11.5, "y": 1 },
+              { "label": "K1C", "x": 12.5, "y": 1 },
+              { "label": "K1E", "x": 15, "y": 1 },
+
+              { "label": "K20", "x": 0, "y": 2, "w": 1.75 },
+              { "label": "K21", "x": 1.75, "y": 2 },
+              { "label": "K22", "x": 2.75, "y": 2 },
+              { "label": "K23", "x": 3.75, "y": 2 },
+              { "label": "K24", "x": 4.75, "y": 2 },
+              { "label": "K25", "x": 5.75, "y": 2 },
+              { "label": "K26", "x": 6.75, "y": 2 },
+              { "label": "K27", "x": 7.75, "y": 2 },
+              { "label": "K28", "x": 8.75, "y": 2 },
+              { "label": "K29", "x": 9.75, "y": 2 },
+              { "label": "K2A", "x": 10.75, "y": 2 },
+              { "label": "K2B", "x": 11.75, "y": 2 },
+              { "label": "K2C", "x": 12.75, "y": 2 },
+              { "label": "K2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+              { "label": "K2E", "x": 15, "y": 2 },
+
+              { "label": "K30", "x": 0, "y": 3, "w": 1.25 },
+              { "label": "K31", "x": 1.25, "y": 3 },
+              { "label": "K32", "x": 2.25, "y": 3 },
+              { "label": "K33", "x": 3.25, "y": 3 },
+              { "label": "K34", "x": 4.25, "y": 3 },
+              { "label": "K35", "x": 5.25, "y": 3 },
+              { "label": "K36", "x": 6.25, "y": 3 },
+              { "label": "K37", "x": 7.25, "y": 3 },
+              { "label": "K38", "x": 8.25, "y": 3 },
+              { "label": "K39", "x": 9.25, "y": 3 },
+              { "label": "K3A", "x": 10.25, "y": 3 },
+              { "label": "K3B", "x": 11.25, "y": 3 },
+              { "label": "K3C", "x": 12.25, "y": 3, "w": 1.75 },
+              { "label": "K3D", "x": 14, "y": 3 },
+              { "label": "K3E", "x": 15, "y": 3 },
+
+              { "label": "K40", "x": 0, "y": 4, "w": 1.5 },
+              { "label": "K41", "x": 1.5, "y": 4 },
+              { "label": "K42", "x": 2.5, "y": 4, "w": 1.5 },
+              { "label": "K56", "x": 4, "y": 4, "w": 7 },
+              { "label": "K5B", "x": 11, "y": 4, "w": 1.5 },
+              { "label": "K5C", "x": 13, "y": 4 },
+              { "label": "K5D", "x": 14, "y": 4 },
+              { "label": "K5E", "x": 15, "y": 4 }
+          ]
       }
   }
 }
diff --git a/keyboards/mode/m65hi_alpha/keymaps/default/keymap.c b/keyboards/mode/m65hi_alpha/keymaps/default/keymap.c
index 5b5f558dd3..5b3cb847f9 100755
--- a/keyboards/mode/m65hi_alpha/keymaps/default/keymap.c
+++ b/keyboards/mode/m65hi_alpha/keymaps/default/keymap.c
@@ -18,32 +18,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
+    [0] = 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_PGDN,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC,          KC_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_LEFT, KC_DOWN, KC_RGHT 
-	),
-   [1] = LAYOUT_all(
-	QK_BOOT  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_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_VOLU, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, 
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	),
-   [2] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	),
-   [3] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	)
+        KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  , KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso_blocker(
+        QK_BOOT, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_MUTE,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_65_iso_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, KC_TRNS
+    ),
+    [3] = LAYOUT_65_iso_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, KC_TRNS
+    )
 };
diff --git a/keyboards/mode/m65hi_alpha/keymaps/via/keymap.c b/keyboards/mode/m65hi_alpha/keymaps/via/keymap.c
index 787512fbbb..b2bce9ffb8 100755
--- a/keyboards/mode/m65hi_alpha/keymaps/via/keymap.c
+++ b/keyboards/mode/m65hi_alpha/keymaps/via/keymap.c
@@ -18,32 +18,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
+    [0] = 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_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_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_END ,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  , KC_LEFT, KC_DOWN, KC_RGHT 
-	),
-   [1] = LAYOUT_all(
-	QK_BOOT  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_MUTE, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, 
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	),
-   [2] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	),
-   [3] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	)
+        KC_TAB , KC_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_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso_blocker(
+        QK_BOOT  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_MUTE,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_65_iso_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, KC_TRNS
+    ),
+    [3] = LAYOUT_65_iso_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, KC_TRNS
+    )
 };
diff --git a/keyboards/mode/m65hi_alpha/m65hi_alpha.h b/keyboards/mode/m65hi_alpha/m65hi_alpha.h
index 7d2b5cc68e..a4360e6ef0 100644
--- a/keyboards/mode/m65hi_alpha/m65hi_alpha.h
+++ b/keyboards/mode/m65hi_alpha/m65hi_alpha.h
@@ -21,7 +21,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ___ KC_NO
 
-#define LAYOUT_all( \
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D     │0E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2D  ├───┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │40  │41  │42  │56                      │5A  │5B  │ │5C │5D │5E │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │40   │41 │42   │56                         │5B   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
+#define LAYOUT_65_iso_blocker( \
 	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
 	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
 	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
@@ -35,3 +52,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
 	{ ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E } \
 }
+
+#define LAYOUT_65_iso_blocker_tsangan( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+	K40, K41, K42,                K56,                     K5B, K5C, K5D, K5E \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+	{ K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+	{ ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E } \
+}

From 51dd63c9268220a4810e7568b63edffcb96260df Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 23 Oct 2022 06:34:42 -0700
Subject: [PATCH 716/959] MWStudio MW65 Black Refactor (#18824)

* mw65_black.h: add matrix diagram

* mw65_black.h: fill-in matrix definition

Fill the empty electrical positions with `KC_NO`.

* mw65_black.h: update matrix diagram

* rename LAYOUT to LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_tsangan

* info.json: correct maintainer value
---
 keyboards/mwstudio/mw65_black/info.json       | 82 ++++++++++++++++++-
 .../mw65_black/keymaps/default/keymap.c       |  8 +-
 .../mwstudio/mw65_black/keymaps/via/keymap.c  |  8 +-
 keyboards/mwstudio/mw65_black/mw65_black.h    | 43 ++++++++--
 4 files changed, 125 insertions(+), 16 deletions(-)

diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index ccf09114da..05057ba8f0 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -2,14 +2,17 @@
     "keyboard_name": "MW65 Black",
     "manufacturer": "MWStudio",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "TW59420",
     "usb": {
         "vid": "0x7BA1",
         "pid": "0x6500",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
                 {"label":"ESC", "x":0, "y":0},
                 {"label":"1", "x":1, "y":0},
@@ -84,6 +87,81 @@
                 {"label":"\u2193", "x":14, "y":4},
                 {"label":"\u2192", "x":15, "y":4}
             ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label":"ESC", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[", "x":11.5, "y":1},
+                {"label":"]", "x":12.5, "y":1},
+                {"label":"\\", "x":13.5, "y":1, "w":1.5},
+                {"label":"PgUp", "x":15, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";", "x":10.75, "y":2},
+                {"label":"'", "x":11.75, "y":2},
+                {"label":"\\", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":2, "w":1.25},
+                {"label":"PgDn", "x":15, "y":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",", "x":9.25, "y":3},
+                {"label":".", "x":10.25, "y":3},
+                {"label":"/", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"End", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"label":"Fn", "x":11, "y":4, "w":1.5},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c b/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c
index c08fe87785..44e3097d47 100644
--- a/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c
+++ b/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_65_ansi_blocker(
 		KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, RGB_TOG,
 		KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
 		KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
 		KC_LCTL, KC_LGUI, KC_LALT,             KC_SPC,                      KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT),
 
-	[1] = LAYOUT(
+	[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,  _______, _______,
         RGB_TOG, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
-	[2] = LAYOUT(
+	[2] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
-	[3] = LAYOUT(
+	[3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c
index c08fe87785..44e3097d47 100644
--- a/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_65_ansi_blocker(
 		KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, RGB_TOG,
 		KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
 		KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
 		KC_LCTL, KC_LGUI, KC_LALT,             KC_SPC,                      KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT),
 
-	[1] = LAYOUT(
+	[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,  _______, _______,
         RGB_TOG, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
-	[2] = LAYOUT(
+	[2] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
-	[3] = LAYOUT(
+	[3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/mwstudio/mw65_black/mw65_black.h b/keyboards/mwstudio/mw65_black/mw65_black.h
index be7f3e6f3c..56c69be229 100644
--- a/keyboards/mwstudio/mw65_black/mw65_black.h
+++ b/keyboards/mwstudio/mw65_black/mw65_black.h
@@ -15,16 +15,47 @@
  */
 #include "quantum.h"
 
-#define LAYOUT( \
+/*                                                           (403┬404) rotary encoder
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬─┴─┐
+ * │000│001│002│003│004│005│006│007│008│009│010│011│012│013    │014│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤      ┌─────┐
+ * │100  │101│102│103│104│105│106│107│108│109│110│111│112│113  │114│      │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐213 │ ISO Enter
+ * │200   │201│202│203│204│205│206│207│208│209│210│211│213     │214│   │212│    │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │300     │301│302│303│304│305│306│307│308│309│310│311   │313│314│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │400 │401 │402 │405                     │409 │410 │ │412│413│414│
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │400  │401│402  │405                        │410  │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
+#define LAYOUT_65_ansi_blocker( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
 	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
 	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
 	K400, K401, K402,             K405,                   K409, K410,       K412, K413, K414  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,         K313,  K314 }, \
-	{ K400,  K401,  K402,                K405,                       K409,  K410,         K412,  K413,  K414 }  \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214  }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K313,  K314,  KC_NO }, \
+	{ K400,  K401,  K402,  K405,  K409,  K410,  K412,  K413,  K414,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+	K400, K401, K402,             K405,                         K410,       K412, K413, K414  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214  }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K313,  K314,  KC_NO }, \
+	{ K400,  K401,  K402,  K405,  ____,  K410,  K412,  K413,  K414,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
 }

From 6bbe8b6eddc56d43f4db07c665bf1791ea2ab871 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 25 Oct 2022 01:50:33 +1100
Subject: [PATCH 717/959] Normalise Joystick and Programmable Button keycodes
 (#18832)

---
 docs/feature_joystick.md                      |  38 ++-
 docs/feature_programmable_button.md           |  68 ++---
 docs/keycodes.md                              | 108 +++++---
 .../rev1/ansi/keymaps/lalitmaganti/keymap.c   |  18 +-
 .../keymaps/default/keymap.c                  |  10 +-
 .../misterdeck/keymaps/default/keymap.c       |   2 +-
 .../onekey/keymaps/joystick/keymap.c          |   2 +-
 .../synthlabs/solo/keymaps/gamepad/keymap.c   |   6 +-
 quantum/process_keycode/process_joystick.c    |   6 +-
 .../process_programmable_button.c             |   4 +-
 quantum/quantum_keycodes.h                    | 233 ++++++++++--------
 quantum/quantum_keycodes_legacy.h             |  66 +++++
 12 files changed, 365 insertions(+), 196 deletions(-)

diff --git a/docs/feature_joystick.md b/docs/feature_joystick.md
index a82192bfe1..a5e4921f9b 100644
--- a/docs/feature_joystick.md
+++ b/docs/feature_joystick.md
@@ -119,9 +119,41 @@ By default, the resolution of each axis is 8 bit, giving a range of -127 to +127
 
 Note that the supported AVR MCUs have a 10-bit ADC, and 12-bit for most STM32 MCUs.
 
-### Triggering Joystick Buttons
+### Keycodes
 
-Joystick buttons are normal Quantum keycodes, defined as `JS_BUTTON0` to `JS_BUTTON31`, depending on the number of buttons you have configured.
-To trigger a joystick button, just add the corresponding keycode to your keymap.
+|Key                    |Aliases|Description|
+|-----------------------|-------|-----------|
+|`QK_JOYSTICK_BUTTON_0` |`JS_0` |Button 0   |
+|`QK_JOYSTICK_BUTTON_1` |`JS_1` |Button 1   |
+|`QK_JOYSTICK_BUTTON_2` |`JS_2` |Button 2   |
+|`QK_JOYSTICK_BUTTON_3` |`JS_3` |Button 3   |
+|`QK_JOYSTICK_BUTTON_4` |`JS_4` |Button 4   |
+|`QK_JOYSTICK_BUTTON_5` |`JS_5` |Button 5   |
+|`QK_JOYSTICK_BUTTON_6` |`JS_6` |Button 6   |
+|`QK_JOYSTICK_BUTTON_7` |`JS_7` |Button 7   |
+|`QK_JOYSTICK_BUTTON_8` |`JS_8` |Button 8   |
+|`QK_JOYSTICK_BUTTON_9` |`JS_9` |Button 9   |
+|`QK_JOYSTICK_BUTTON_10`|`JS_10`|Button 10  |
+|`QK_JOYSTICK_BUTTON_11`|`JS_11`|Button 11  |
+|`QK_JOYSTICK_BUTTON_12`|`JS_12`|Button 12  |
+|`QK_JOYSTICK_BUTTON_13`|`JS_13`|Button 13  |
+|`QK_JOYSTICK_BUTTON_14`|`JS_14`|Button 14  |
+|`QK_JOYSTICK_BUTTON_15`|`JS_15`|Button 15  |
+|`QK_JOYSTICK_BUTTON_16`|`JS_16`|Button 16  |
+|`QK_JOYSTICK_BUTTON_17`|`JS_17`|Button 17  |
+|`QK_JOYSTICK_BUTTON_18`|`JS_18`|Button 18  |
+|`QK_JOYSTICK_BUTTON_19`|`JS_19`|Button 19  |
+|`QK_JOYSTICK_BUTTON_20`|`JS_20`|Button 20  |
+|`QK_JOYSTICK_BUTTON_21`|`JS_21`|Button 21  |
+|`QK_JOYSTICK_BUTTON_22`|`JS_22`|Button 22  |
+|`QK_JOYSTICK_BUTTON_23`|`JS_23`|Button 23  |
+|`QK_JOYSTICK_BUTTON_24`|`JS_24`|Button 24  |
+|`QK_JOYSTICK_BUTTON_25`|`JS_25`|Button 25  |
+|`QK_JOYSTICK_BUTTON_26`|`JS_26`|Button 26  |
+|`QK_JOYSTICK_BUTTON_27`|`JS_27`|Button 27  |
+|`QK_JOYSTICK_BUTTON_28`|`JS_28`|Button 28  |
+|`QK_JOYSTICK_BUTTON_29`|`JS_29`|Button 29  |
+|`QK_JOYSTICK_BUTTON_30`|`JS_30`|Button 30  |
+|`QK_JOYSTICK_BUTTON_31`|`JS_31`|Button 31  |
 
 You can also trigger joystick buttons in code with `register_joystick_button(button)` and `unregister_joystick_button(button)`, where `button` is the 0-based button index (0 = button 1).
diff --git a/docs/feature_programmable_button.md b/docs/feature_programmable_button.md
index 1982b8295e..43a9e7fc16 100644
--- a/docs/feature_programmable_button.md
+++ b/docs/feature_programmable_button.md
@@ -16,40 +16,40 @@ PROGRAMMABLE_BUTTON_ENABLE = yes
 
 ## Keycodes :id=keycodes
 
-|Key                     |Aliases|Description           |
-|------------------------|-------|----------------------|
-|`PROGRAMMABLE_BUTTON_1` |`PB_1` |Programmable button 1 |
-|`PROGRAMMABLE_BUTTON_2` |`PB_2` |Programmable button 2 |
-|`PROGRAMMABLE_BUTTON_3` |`PB_3` |Programmable button 3 |
-|`PROGRAMMABLE_BUTTON_4` |`PB_4` |Programmable button 4 |
-|`PROGRAMMABLE_BUTTON_5` |`PB_5` |Programmable button 5 |
-|`PROGRAMMABLE_BUTTON_6` |`PB_6` |Programmable button 6 |
-|`PROGRAMMABLE_BUTTON_7` |`PB_7` |Programmable button 7 |
-|`PROGRAMMABLE_BUTTON_8` |`PB_8` |Programmable button 8 |
-|`PROGRAMMABLE_BUTTON_9` |`PB_9` |Programmable button 9 |
-|`PROGRAMMABLE_BUTTON_10`|`PB_10`|Programmable button 10|
-|`PROGRAMMABLE_BUTTON_11`|`PB_11`|Programmable button 11|
-|`PROGRAMMABLE_BUTTON_12`|`PB_12`|Programmable button 12|
-|`PROGRAMMABLE_BUTTON_13`|`PB_13`|Programmable button 13|
-|`PROGRAMMABLE_BUTTON_14`|`PB_14`|Programmable button 14|
-|`PROGRAMMABLE_BUTTON_15`|`PB_15`|Programmable button 15|
-|`PROGRAMMABLE_BUTTON_16`|`PB_16`|Programmable button 16|
-|`PROGRAMMABLE_BUTTON_17`|`PB_17`|Programmable button 17|
-|`PROGRAMMABLE_BUTTON_18`|`PB_18`|Programmable button 18|
-|`PROGRAMMABLE_BUTTON_19`|`PB_19`|Programmable button 19|
-|`PROGRAMMABLE_BUTTON_20`|`PB_20`|Programmable button 20|
-|`PROGRAMMABLE_BUTTON_21`|`PB_21`|Programmable button 21|
-|`PROGRAMMABLE_BUTTON_22`|`PB_22`|Programmable button 22|
-|`PROGRAMMABLE_BUTTON_23`|`PB_23`|Programmable button 23|
-|`PROGRAMMABLE_BUTTON_24`|`PB_24`|Programmable button 24|
-|`PROGRAMMABLE_BUTTON_25`|`PB_25`|Programmable button 25|
-|`PROGRAMMABLE_BUTTON_26`|`PB_26`|Programmable button 26|
-|`PROGRAMMABLE_BUTTON_27`|`PB_27`|Programmable button 27|
-|`PROGRAMMABLE_BUTTON_28`|`PB_28`|Programmable button 28|
-|`PROGRAMMABLE_BUTTON_29`|`PB_29`|Programmable button 29|
-|`PROGRAMMABLE_BUTTON_30`|`PB_30`|Programmable button 30|
-|`PROGRAMMABLE_BUTTON_31`|`PB_31`|Programmable button 31|
-|`PROGRAMMABLE_BUTTON_32`|`PB_32`|Programmable button 32|
+|Key                        |Aliases|Description           |
+|---------------------------|-------|----------------------|
+|`QK_PROGRAMMABLE_BUTTON_1` |`PB_1` |Programmable button 1 |
+|`QK_PROGRAMMABLE_BUTTON_2` |`PB_2` |Programmable button 2 |
+|`QK_PROGRAMMABLE_BUTTON_3` |`PB_3` |Programmable button 3 |
+|`QK_PROGRAMMABLE_BUTTON_4` |`PB_4` |Programmable button 4 |
+|`QK_PROGRAMMABLE_BUTTON_5` |`PB_5` |Programmable button 5 |
+|`QK_PROGRAMMABLE_BUTTON_6` |`PB_6` |Programmable button 6 |
+|`QK_PROGRAMMABLE_BUTTON_7` |`PB_7` |Programmable button 7 |
+|`QK_PROGRAMMABLE_BUTTON_8` |`PB_8` |Programmable button 8 |
+|`QK_PROGRAMMABLE_BUTTON_9` |`PB_9` |Programmable button 9 |
+|`QK_PROGRAMMABLE_BUTTON_10`|`PB_10`|Programmable button 10|
+|`QK_PROGRAMMABLE_BUTTON_11`|`PB_11`|Programmable button 11|
+|`QK_PROGRAMMABLE_BUTTON_12`|`PB_12`|Programmable button 12|
+|`QK_PROGRAMMABLE_BUTTON_13`|`PB_13`|Programmable button 13|
+|`QK_PROGRAMMABLE_BUTTON_14`|`PB_14`|Programmable button 14|
+|`QK_PROGRAMMABLE_BUTTON_15`|`PB_15`|Programmable button 15|
+|`QK_PROGRAMMABLE_BUTTON_16`|`PB_16`|Programmable button 16|
+|`QK_PROGRAMMABLE_BUTTON_17`|`PB_17`|Programmable button 17|
+|`QK_PROGRAMMABLE_BUTTON_18`|`PB_18`|Programmable button 18|
+|`QK_PROGRAMMABLE_BUTTON_19`|`PB_19`|Programmable button 19|
+|`QK_PROGRAMMABLE_BUTTON_20`|`PB_20`|Programmable button 20|
+|`QK_PROGRAMMABLE_BUTTON_21`|`PB_21`|Programmable button 21|
+|`QK_PROGRAMMABLE_BUTTON_22`|`PB_22`|Programmable button 22|
+|`QK_PROGRAMMABLE_BUTTON_23`|`PB_23`|Programmable button 23|
+|`QK_PROGRAMMABLE_BUTTON_24`|`PB_24`|Programmable button 24|
+|`QK_PROGRAMMABLE_BUTTON_25`|`PB_25`|Programmable button 25|
+|`QK_PROGRAMMABLE_BUTTON_26`|`PB_26`|Programmable button 26|
+|`QK_PROGRAMMABLE_BUTTON_27`|`PB_27`|Programmable button 27|
+|`QK_PROGRAMMABLE_BUTTON_28`|`PB_28`|Programmable button 28|
+|`QK_PROGRAMMABLE_BUTTON_29`|`PB_29`|Programmable button 29|
+|`QK_PROGRAMMABLE_BUTTON_30`|`PB_30`|Programmable button 30|
+|`QK_PROGRAMMABLE_BUTTON_31`|`PB_31`|Programmable button 31|
+|`QK_PROGRAMMABLE_BUTTON_32`|`PB_32`|Programmable button 32|
 
 ## API :id=api
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 5565e0c22c..239f28833a 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -299,6 +299,45 @@ See also: [Grave Escape](feature_grave_esc.md)
 |-----------------|---------|------------------------------------------------------------------|
 |`QK_GRAVE_ESCAPE`|`QK_GESC`|Escape when pressed, <code>&#96;</code> when Shift or GUI are held|
 
+## Joystick :id=joystick
+
+See also: [Joystick](feature_joystick.md)
+
+|Key                    |Aliases|Description|
+|-----------------------|-------|-----------|
+|`QK_JOYSTICK_BUTTON_0` |`JS_0` |Button 0   |
+|`QK_JOYSTICK_BUTTON_1` |`JS_1` |Button 1   |
+|`QK_JOYSTICK_BUTTON_2` |`JS_2` |Button 2   |
+|`QK_JOYSTICK_BUTTON_3` |`JS_3` |Button 3   |
+|`QK_JOYSTICK_BUTTON_4` |`JS_4` |Button 4   |
+|`QK_JOYSTICK_BUTTON_5` |`JS_5` |Button 5   |
+|`QK_JOYSTICK_BUTTON_6` |`JS_6` |Button 6   |
+|`QK_JOYSTICK_BUTTON_7` |`JS_7` |Button 7   |
+|`QK_JOYSTICK_BUTTON_8` |`JS_8` |Button 8   |
+|`QK_JOYSTICK_BUTTON_9` |`JS_9` |Button 9   |
+|`QK_JOYSTICK_BUTTON_10`|`JS_10`|Button 10  |
+|`QK_JOYSTICK_BUTTON_11`|`JS_11`|Button 11  |
+|`QK_JOYSTICK_BUTTON_12`|`JS_12`|Button 12  |
+|`QK_JOYSTICK_BUTTON_13`|`JS_13`|Button 13  |
+|`QK_JOYSTICK_BUTTON_14`|`JS_14`|Button 14  |
+|`QK_JOYSTICK_BUTTON_15`|`JS_15`|Button 15  |
+|`QK_JOYSTICK_BUTTON_16`|`JS_16`|Button 16  |
+|`QK_JOYSTICK_BUTTON_17`|`JS_17`|Button 17  |
+|`QK_JOYSTICK_BUTTON_18`|`JS_18`|Button 18  |
+|`QK_JOYSTICK_BUTTON_19`|`JS_19`|Button 19  |
+|`QK_JOYSTICK_BUTTON_20`|`JS_20`|Button 20  |
+|`QK_JOYSTICK_BUTTON_21`|`JS_21`|Button 21  |
+|`QK_JOYSTICK_BUTTON_22`|`JS_22`|Button 22  |
+|`QK_JOYSTICK_BUTTON_23`|`JS_23`|Button 23  |
+|`QK_JOYSTICK_BUTTON_24`|`JS_24`|Button 24  |
+|`QK_JOYSTICK_BUTTON_25`|`JS_25`|Button 25  |
+|`QK_JOYSTICK_BUTTON_26`|`JS_26`|Button 26  |
+|`QK_JOYSTICK_BUTTON_27`|`JS_27`|Button 27  |
+|`QK_JOYSTICK_BUTTON_28`|`JS_28`|Button 28  |
+|`QK_JOYSTICK_BUTTON_29`|`JS_29`|Button 29  |
+|`QK_JOYSTICK_BUTTON_30`|`JS_30`|Button 30  |
+|`QK_JOYSTICK_BUTTON_31`|`JS_31`|Button 31  |
+
 ## Key Lock :id=key-lock
 
 See also: [Key Lock](feature_key_lock.md)
@@ -708,41 +747,40 @@ See also: [One Shot Keys](one_shot_keys.md)
 
 See also: [Programmable Button](feature_programmable_button.md)
 
-|Key                     |Description                                                     |
-|------------------------|----------------------|
-|`PROGRAMMABLE_BUTTON_1` |Programmable button 1 |
-|`PROGRAMMABLE_BUTTON_2` |Programmable button 2 |
-|`PROGRAMMABLE_BUTTON_3` |Programmable button 3 |
-|`PROGRAMMABLE_BUTTON_4` |Programmable button 4 |
-|`PROGRAMMABLE_BUTTON_5` |Programmable button 5 |
-|`PROGRAMMABLE_BUTTON_6` |Programmable button 6 |
-|`PROGRAMMABLE_BUTTON_7` |Programmable button 7 |
-|`PROGRAMMABLE_BUTTON_8` |Programmable button 8 |
-|`PROGRAMMABLE_BUTTON_9` |Programmable button 9 |
-|`PROGRAMMABLE_BUTTON_10`|Programmable button 10|
-|`PROGRAMMABLE_BUTTON_11`|Programmable button 11|
-|`PROGRAMMABLE_BUTTON_12`|Programmable button 12|
-|`PROGRAMMABLE_BUTTON_13`|Programmable button 13|
-|`PROGRAMMABLE_BUTTON_14`|Programmable button 14|
-|`PROGRAMMABLE_BUTTON_15`|Programmable button 15|
-|`PROGRAMMABLE_BUTTON_16`|Programmable button 16|
-|`PROGRAMMABLE_BUTTON_17`|Programmable button 17|
-|`PROGRAMMABLE_BUTTON_18`|Programmable button 18|
-|`PROGRAMMABLE_BUTTON_19`|Programmable button 19|
-|`PROGRAMMABLE_BUTTON_20`|Programmable button 20|
-|`PROGRAMMABLE_BUTTON_21`|Programmable button 21|
-|`PROGRAMMABLE_BUTTON_22`|Programmable button 22|
-|`PROGRAMMABLE_BUTTON_23`|Programmable button 23|
-|`PROGRAMMABLE_BUTTON_24`|Programmable button 24|
-|`PROGRAMMABLE_BUTTON_25`|Programmable button 25|
-|`PROGRAMMABLE_BUTTON_26`|Programmable button 26|
-|`PROGRAMMABLE_BUTTON_27`|Programmable button 27|
-|`PROGRAMMABLE_BUTTON_28`|Programmable button 28|
-|`PROGRAMMABLE_BUTTON_29`|Programmable button 29|
-|`PROGRAMMABLE_BUTTON_30`|Programmable button 30|
-|`PROGRAMMABLE_BUTTON_31`|Programmable button 31|
-|`PROGRAMMABLE_BUTTON_32`|Programmable button 32|
-|`PB_1` to `PB_32`       |Aliases for keymaps   |
+|Key                        |Aliases|Description           |
+|---------------------------|-------|----------------------|
+|`QK_PROGRAMMABLE_BUTTON_1` |`PB_1` |Programmable button 1 |
+|`QK_PROGRAMMABLE_BUTTON_2` |`PB_2` |Programmable button 2 |
+|`QK_PROGRAMMABLE_BUTTON_3` |`PB_3` |Programmable button 3 |
+|`QK_PROGRAMMABLE_BUTTON_4` |`PB_4` |Programmable button 4 |
+|`QK_PROGRAMMABLE_BUTTON_5` |`PB_5` |Programmable button 5 |
+|`QK_PROGRAMMABLE_BUTTON_6` |`PB_6` |Programmable button 6 |
+|`QK_PROGRAMMABLE_BUTTON_7` |`PB_7` |Programmable button 7 |
+|`QK_PROGRAMMABLE_BUTTON_8` |`PB_8` |Programmable button 8 |
+|`QK_PROGRAMMABLE_BUTTON_9` |`PB_9` |Programmable button 9 |
+|`QK_PROGRAMMABLE_BUTTON_10`|`PB_10`|Programmable button 10|
+|`QK_PROGRAMMABLE_BUTTON_11`|`PB_11`|Programmable button 11|
+|`QK_PROGRAMMABLE_BUTTON_12`|`PB_12`|Programmable button 12|
+|`QK_PROGRAMMABLE_BUTTON_13`|`PB_13`|Programmable button 13|
+|`QK_PROGRAMMABLE_BUTTON_14`|`PB_14`|Programmable button 14|
+|`QK_PROGRAMMABLE_BUTTON_15`|`PB_15`|Programmable button 15|
+|`QK_PROGRAMMABLE_BUTTON_16`|`PB_16`|Programmable button 16|
+|`QK_PROGRAMMABLE_BUTTON_17`|`PB_17`|Programmable button 17|
+|`QK_PROGRAMMABLE_BUTTON_18`|`PB_18`|Programmable button 18|
+|`QK_PROGRAMMABLE_BUTTON_19`|`PB_19`|Programmable button 19|
+|`QK_PROGRAMMABLE_BUTTON_20`|`PB_20`|Programmable button 20|
+|`QK_PROGRAMMABLE_BUTTON_21`|`PB_21`|Programmable button 21|
+|`QK_PROGRAMMABLE_BUTTON_22`|`PB_22`|Programmable button 22|
+|`QK_PROGRAMMABLE_BUTTON_23`|`PB_23`|Programmable button 23|
+|`QK_PROGRAMMABLE_BUTTON_24`|`PB_24`|Programmable button 24|
+|`QK_PROGRAMMABLE_BUTTON_25`|`PB_25`|Programmable button 25|
+|`QK_PROGRAMMABLE_BUTTON_26`|`PB_26`|Programmable button 26|
+|`QK_PROGRAMMABLE_BUTTON_27`|`PB_27`|Programmable button 27|
+|`QK_PROGRAMMABLE_BUTTON_28`|`PB_28`|Programmable button 28|
+|`QK_PROGRAMMABLE_BUTTON_29`|`PB_29`|Programmable button 29|
+|`QK_PROGRAMMABLE_BUTTON_30`|`PB_30`|Programmable button 30|
+|`QK_PROGRAMMABLE_BUTTON_31`|`PB_31`|Programmable button 31|
+|`QK_PROGRAMMABLE_BUTTON_32`|`PB_32`|Programmable button 32|
 
 ## Space Cadet :id=space-cadet
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
index bc20d46d3a..46e0a128f9 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
@@ -17,15 +17,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-#define L1_NUM1 PROGRAMMABLE_BUTTON_1
-#define L1_NUM2 PROGRAMMABLE_BUTTON_2
-#define L1_NUM3 PROGRAMMABLE_BUTTON_3
-#define L1_NUM4 PROGRAMMABLE_BUTTON_4
-#define L1_NUM5 PROGRAMMABLE_BUTTON_5
-#define L1_NUM6 PROGRAMMABLE_BUTTON_6
-#define L1_NUM7 PROGRAMMABLE_BUTTON_7
-#define L1_NUM8 PROGRAMMABLE_BUTTON_8
-#define L1_NUM9 PROGRAMMABLE_BUTTON_9
+#define L1_NUM1 QK_PROGRAMMABLE_BUTTON_1
+#define L1_NUM2 QK_PROGRAMMABLE_BUTTON_2
+#define L1_NUM3 QK_PROGRAMMABLE_BUTTON_3
+#define L1_NUM4 QK_PROGRAMMABLE_BUTTON_4
+#define L1_NUM5 QK_PROGRAMMABLE_BUTTON_5
+#define L1_NUM6 QK_PROGRAMMABLE_BUTTON_6
+#define L1_NUM7 QK_PROGRAMMABLE_BUTTON_7
+#define L1_NUM8 QK_PROGRAMMABLE_BUTTON_8
+#define L1_NUM9 QK_PROGRAMMABLE_BUTTON_9
 #else
 #define L1_NUM1 _______
 #define L1_NUM2 _______
diff --git a/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c b/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
index 4f950a5d62..b59692fec5 100644
--- a/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
+++ b/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, TG(2), KC_TRNS, KC_TRNS),
 	
 	[2] = LAYOUT(
-		KC_TRNS, KC_TRNS,   TG(2), JS_BUTTON0,  JS_BUTTON1,  JS_BUTTON2,  JS_BUTTON3,  JS_BUTTON4, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON5,  JS_BUTTON6,  JS_BUTTON7,  JS_BUTTON8,  JS_BUTTON9, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON10, JS_BUTTON11, JS_BUTTON12, JS_BUTTON13, JS_BUTTON14, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON15, JS_BUTTON16, JS_BUTTON17, JS_BUTTON18, JS_BUTTON19, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON20, JS_BUTTON21, JS_BUTTON22, JS_BUTTON23, JS_BUTTON24)
+		KC_TRNS, KC_TRNS,   TG(2), JS_0,  JS_1,  JS_2,  JS_3,  JS_4, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_5,  JS_6,  JS_7,  JS_8,  JS_9, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_10, JS_11, JS_12, JS_13, JS_14, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_15, JS_16, JS_17, JS_18, JS_19, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_20, JS_21, JS_22, JS_23, JS_24)
 };
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
index b8ed3cb9d9..0992e06f87 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [NORMAL_LAYER] = LAYOUT(
         C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
         C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
-        JS_BUTTON0,  JS_BUTTON1,  JS_BUTTON2,  JS_BUTTON3
+        JS_0,        JS_1,        JS_2,        JS_3
     )
 };
 
diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index c74707e931..96115aa496 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -5,7 +5,7 @@
 #endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ortho_1x1(JS_BUTTON0)
+    LAYOUT_ortho_1x1(JS_0)
 };
 
 void matrix_scan_user() {
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
index 8da2afc97a..e6f9678fbb 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -5,9 +5,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
-          KC_NO,   JS_BUTTON7,  KC_NO,
-                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6
+                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6,
+          KC_NO,   JS_7,  KC_NO,
+                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6
     )
 };
 
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index af69d3aa05..c4c6fb59a8 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -19,11 +19,11 @@
 
 bool process_joystick(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case JS_BUTTON0 ... JS_BUTTON_MAX:
+        case QK_JOYSTICK_BUTTON_MIN ... QK_JOYSTICK_BUTTON_MAX:
             if (record->event.pressed) {
-                register_joystick_button(keycode - JS_BUTTON0);
+                register_joystick_button(keycode - QK_JOYSTICK_BUTTON_MIN);
             } else {
-                unregister_joystick_button(keycode - JS_BUTTON0);
+                unregister_joystick_button(keycode - QK_JOYSTICK_BUTTON_MIN);
             }
             return false;
     }
diff --git a/quantum/process_keycode/process_programmable_button.c b/quantum/process_keycode/process_programmable_button.c
index 6379698848..d6a14e120c 100644
--- a/quantum/process_keycode/process_programmable_button.c
+++ b/quantum/process_keycode/process_programmable_button.c
@@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "programmable_button.h"
 
 bool process_programmable_button(uint16_t keycode, keyrecord_t *record) {
-    if (keycode >= PROGRAMMABLE_BUTTON_MIN && keycode <= PROGRAMMABLE_BUTTON_MAX) {
-        uint8_t button = keycode - PROGRAMMABLE_BUTTON_MIN + 1;
+    if (keycode >= QK_PROGRAMMABLE_BUTTON_MIN && keycode <= QK_PROGRAMMABLE_BUTTON_MAX) {
+        uint8_t button = keycode - QK_PROGRAMMABLE_BUTTON_MIN + 1;
         if (record->event.pressed) {
             programmable_button_register(button);
         } else {
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 44702a362d..ac3968895b 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -431,38 +431,38 @@ enum quantum_keycodes {
     DYN_MACRO_PLAY2, // 5D08
 
     // Joystick
-    JS_BUTTON0,  // 5D09
-    JS_BUTTON1,  // 5D0A
-    JS_BUTTON2,  // 5D0B
-    JS_BUTTON3,  // 5D0C
-    JS_BUTTON4,  // 5D0D
-    JS_BUTTON5,  // 5D0E
-    JS_BUTTON6,  // 5D0F
-    JS_BUTTON7,  // 5D10
-    JS_BUTTON8,  // 5D11
-    JS_BUTTON9,  // 5D12
-    JS_BUTTON10, // 5D13
-    JS_BUTTON11, // 5D14
-    JS_BUTTON12, // 5D15
-    JS_BUTTON13, // 5D16
-    JS_BUTTON14, // 5D17
-    JS_BUTTON15, // 5D18
-    JS_BUTTON16, // 5D19
-    JS_BUTTON17, // 5D1A
-    JS_BUTTON18, // 5D1B
-    JS_BUTTON19, // 5D1C
-    JS_BUTTON20, // 5D1D
-    JS_BUTTON21, // 5D1E
-    JS_BUTTON22, // 5D1F
-    JS_BUTTON23, // 5D20
-    JS_BUTTON24, // 5D21
-    JS_BUTTON25, // 5D22
-    JS_BUTTON26, // 5D23
-    JS_BUTTON27, // 5D24
-    JS_BUTTON28, // 5D25
-    JS_BUTTON29, // 5D26
-    JS_BUTTON30, // 5D27
-    JS_BUTTON31, // 5D28
+    QK_JOYSTICK_BUTTON_0,  // 5D09
+    QK_JOYSTICK_BUTTON_1,  // 5D0A
+    QK_JOYSTICK_BUTTON_2,  // 5D0B
+    QK_JOYSTICK_BUTTON_3,  // 5D0C
+    QK_JOYSTICK_BUTTON_4,  // 5D0D
+    QK_JOYSTICK_BUTTON_5,  // 5D0E
+    QK_JOYSTICK_BUTTON_6,  // 5D0F
+    QK_JOYSTICK_BUTTON_7,  // 5D10
+    QK_JOYSTICK_BUTTON_8,  // 5D11
+    QK_JOYSTICK_BUTTON_9,  // 5D12
+    QK_JOYSTICK_BUTTON_10, // 5D13
+    QK_JOYSTICK_BUTTON_11, // 5D14
+    QK_JOYSTICK_BUTTON_12, // 5D15
+    QK_JOYSTICK_BUTTON_13, // 5D16
+    QK_JOYSTICK_BUTTON_14, // 5D17
+    QK_JOYSTICK_BUTTON_15, // 5D18
+    QK_JOYSTICK_BUTTON_16, // 5D19
+    QK_JOYSTICK_BUTTON_17, // 5D1A
+    QK_JOYSTICK_BUTTON_18, // 5D1B
+    QK_JOYSTICK_BUTTON_19, // 5D1C
+    QK_JOYSTICK_BUTTON_20, // 5D1D
+    QK_JOYSTICK_BUTTON_21, // 5D1E
+    QK_JOYSTICK_BUTTON_22, // 5D1F
+    QK_JOYSTICK_BUTTON_23, // 5D20
+    QK_JOYSTICK_BUTTON_24, // 5D21
+    QK_JOYSTICK_BUTTON_25, // 5D22
+    QK_JOYSTICK_BUTTON_26, // 5D23
+    QK_JOYSTICK_BUTTON_27, // 5D24
+    QK_JOYSTICK_BUTTON_28, // 5D25
+    QK_JOYSTICK_BUTTON_29, // 5D26
+    QK_JOYSTICK_BUTTON_30, // 5D27
+    QK_JOYSTICK_BUTTON_31, // 5D28
 
     // Leader Key
     QK_LEADER, // 5D29
@@ -526,38 +526,38 @@ enum quantum_keycodes {
     DT_DOWN,
 
     // Programmable Button
-    PROGRAMMABLE_BUTTON_1,
-    PROGRAMMABLE_BUTTON_2,
-    PROGRAMMABLE_BUTTON_3,
-    PROGRAMMABLE_BUTTON_4,
-    PROGRAMMABLE_BUTTON_5,
-    PROGRAMMABLE_BUTTON_6,
-    PROGRAMMABLE_BUTTON_7,
-    PROGRAMMABLE_BUTTON_8,
-    PROGRAMMABLE_BUTTON_9,
-    PROGRAMMABLE_BUTTON_10,
-    PROGRAMMABLE_BUTTON_11,
-    PROGRAMMABLE_BUTTON_12,
-    PROGRAMMABLE_BUTTON_13,
-    PROGRAMMABLE_BUTTON_14,
-    PROGRAMMABLE_BUTTON_15,
-    PROGRAMMABLE_BUTTON_16,
-    PROGRAMMABLE_BUTTON_17,
-    PROGRAMMABLE_BUTTON_18,
-    PROGRAMMABLE_BUTTON_19,
-    PROGRAMMABLE_BUTTON_20,
-    PROGRAMMABLE_BUTTON_21,
-    PROGRAMMABLE_BUTTON_22,
-    PROGRAMMABLE_BUTTON_23,
-    PROGRAMMABLE_BUTTON_24,
-    PROGRAMMABLE_BUTTON_25,
-    PROGRAMMABLE_BUTTON_26,
-    PROGRAMMABLE_BUTTON_27,
-    PROGRAMMABLE_BUTTON_28,
-    PROGRAMMABLE_BUTTON_29,
-    PROGRAMMABLE_BUTTON_30,
-    PROGRAMMABLE_BUTTON_31,
-    PROGRAMMABLE_BUTTON_32,
+    QK_PROGRAMMABLE_BUTTON_1,
+    QK_PROGRAMMABLE_BUTTON_2,
+    QK_PROGRAMMABLE_BUTTON_3,
+    QK_PROGRAMMABLE_BUTTON_4,
+    QK_PROGRAMMABLE_BUTTON_5,
+    QK_PROGRAMMABLE_BUTTON_6,
+    QK_PROGRAMMABLE_BUTTON_7,
+    QK_PROGRAMMABLE_BUTTON_8,
+    QK_PROGRAMMABLE_BUTTON_9,
+    QK_PROGRAMMABLE_BUTTON_10,
+    QK_PROGRAMMABLE_BUTTON_11,
+    QK_PROGRAMMABLE_BUTTON_12,
+    QK_PROGRAMMABLE_BUTTON_13,
+    QK_PROGRAMMABLE_BUTTON_14,
+    QK_PROGRAMMABLE_BUTTON_15,
+    QK_PROGRAMMABLE_BUTTON_16,
+    QK_PROGRAMMABLE_BUTTON_17,
+    QK_PROGRAMMABLE_BUTTON_18,
+    QK_PROGRAMMABLE_BUTTON_19,
+    QK_PROGRAMMABLE_BUTTON_20,
+    QK_PROGRAMMABLE_BUTTON_21,
+    QK_PROGRAMMABLE_BUTTON_22,
+    QK_PROGRAMMABLE_BUTTON_23,
+    QK_PROGRAMMABLE_BUTTON_24,
+    QK_PROGRAMMABLE_BUTTON_25,
+    QK_PROGRAMMABLE_BUTTON_26,
+    QK_PROGRAMMABLE_BUTTON_27,
+    QK_PROGRAMMABLE_BUTTON_28,
+    QK_PROGRAMMABLE_BUTTON_29,
+    QK_PROGRAMMABLE_BUTTON_30,
+    QK_PROGRAMMABLE_BUTTON_31,
+    QK_PROGRAMMABLE_BUTTON_32,
 
     // Dedicated macro keys for Configurator and VIA
     MACRO_0,
@@ -876,8 +876,40 @@ enum quantum_keycodes {
 #define DM_PLY2 DYN_MACRO_PLAY2
 
 // Joystick aliases
-#define JS_BUTTON_MIN JS_BUTTON0
-#define JS_BUTTON_MAX JS_BUTTON31
+#define JS_0 QK_JOYSTICK_BUTTON_0
+#define JS_1 QK_JOYSTICK_BUTTON_1
+#define JS_2 QK_JOYSTICK_BUTTON_2
+#define JS_3 QK_JOYSTICK_BUTTON_3
+#define JS_4 QK_JOYSTICK_BUTTON_4
+#define JS_5 QK_JOYSTICK_BUTTON_5
+#define JS_6 QK_JOYSTICK_BUTTON_6
+#define JS_7 QK_JOYSTICK_BUTTON_7
+#define JS_8 QK_JOYSTICK_BUTTON_8
+#define JS_9 QK_JOYSTICK_BUTTON_9
+#define JS_10 QK_JOYSTICK_BUTTON_10
+#define JS_11 QK_JOYSTICK_BUTTON_11
+#define JS_12 QK_JOYSTICK_BUTTON_12
+#define JS_13 QK_JOYSTICK_BUTTON_13
+#define JS_14 QK_JOYSTICK_BUTTON_14
+#define JS_15 QK_JOYSTICK_BUTTON_15
+#define JS_16 QK_JOYSTICK_BUTTON_16
+#define JS_17 QK_JOYSTICK_BUTTON_17
+#define JS_18 QK_JOYSTICK_BUTTON_18
+#define JS_19 QK_JOYSTICK_BUTTON_19
+#define JS_20 QK_JOYSTICK_BUTTON_20
+#define JS_21 QK_JOYSTICK_BUTTON_21
+#define JS_22 QK_JOYSTICK_BUTTON_22
+#define JS_23 QK_JOYSTICK_BUTTON_23
+#define JS_24 QK_JOYSTICK_BUTTON_24
+#define JS_25 QK_JOYSTICK_BUTTON_25
+#define JS_26 QK_JOYSTICK_BUTTON_26
+#define JS_27 QK_JOYSTICK_BUTTON_27
+#define JS_28 QK_JOYSTICK_BUTTON_28
+#define JS_29 QK_JOYSTICK_BUTTON_29
+#define JS_30 QK_JOYSTICK_BUTTON_30
+#define JS_31 QK_JOYSTICK_BUTTON_31
+#define QK_JOYSTICK_BUTTON_MIN QK_JOYSTICK_BUTTON_0
+#define QK_JOYSTICK_BUTTON_MAX QK_JOYSTICK_BUTTON_31
 
 // One Shot aliases
 #define OS_TOGG ONESHOT_TOGGLE
@@ -885,40 +917,41 @@ enum quantum_keycodes {
 #define OS_OFF ONESHOT_DISABLE
 
 // Programmable Button aliases
-#define PB_1 PROGRAMMABLE_BUTTON_1
-#define PB_2 PROGRAMMABLE_BUTTON_2
-#define PB_3 PROGRAMMABLE_BUTTON_3
-#define PB_4 PROGRAMMABLE_BUTTON_4
-#define PB_5 PROGRAMMABLE_BUTTON_5
-#define PB_6 PROGRAMMABLE_BUTTON_6
-#define PB_7 PROGRAMMABLE_BUTTON_7
-#define PB_8 PROGRAMMABLE_BUTTON_8
-#define PB_9 PROGRAMMABLE_BUTTON_9
-#define PB_10 PROGRAMMABLE_BUTTON_10
-#define PB_11 PROGRAMMABLE_BUTTON_11
-#define PB_12 PROGRAMMABLE_BUTTON_12
-#define PB_13 PROGRAMMABLE_BUTTON_13
-#define PB_14 PROGRAMMABLE_BUTTON_14
-#define PB_15 PROGRAMMABLE_BUTTON_15
-#define PB_16 PROGRAMMABLE_BUTTON_16
-#define PB_17 PROGRAMMABLE_BUTTON_17
-#define PB_18 PROGRAMMABLE_BUTTON_18
-#define PB_19 PROGRAMMABLE_BUTTON_19
-#define PB_20 PROGRAMMABLE_BUTTON_20
-#define PB_21 PROGRAMMABLE_BUTTON_21
-#define PB_22 PROGRAMMABLE_BUTTON_22
-#define PB_23 PROGRAMMABLE_BUTTON_23
-#define PB_24 PROGRAMMABLE_BUTTON_24
-#define PB_25 PROGRAMMABLE_BUTTON_25
-#define PB_26 PROGRAMMABLE_BUTTON_26
-#define PB_27 PROGRAMMABLE_BUTTON_27
-#define PB_28 PROGRAMMABLE_BUTTON_28
-#define PB_29 PROGRAMMABLE_BUTTON_29
-#define PB_30 PROGRAMMABLE_BUTTON_30
-#define PB_31 PROGRAMMABLE_BUTTON_31
-#define PB_32 PROGRAMMABLE_BUTTON_32
-#define PROGRAMMABLE_BUTTON_MIN PROGRAMMABLE_BUTTON_1
-#define PROGRAMMABLE_BUTTON_MAX PROGRAMMABLE_BUTTON_32
+#define PB_1 QK_PROGRAMMABLE_BUTTON_1
+#define PB_2 QK_PROGRAMMABLE_BUTTON_2
+#define PB_3 QK_PROGRAMMABLE_BUTTON_3
+#define PB_4 QK_PROGRAMMABLE_BUTTON_4
+#define PB_5 QK_PROGRAMMABLE_BUTTON_5
+#define PB_6 QK_PROGRAMMABLE_BUTTON_6
+#define PB_7 QK_PROGRAMMABLE_BUTTON_7
+#define PB_8 QK_PROGRAMMABLE_BUTTON_8
+#define PB_9 QK_PROGRAMMABLE_BUTTON_9
+#define PB_10 QK_PROGRAMMABLE_BUTTON_10
+#define PB_11 QK_PROGRAMMABLE_BUTTON_11
+#define PB_12 QK_PROGRAMMABLE_BUTTON_12
+#define PB_13 QK_PROGRAMMABLE_BUTTON_13
+#define PB_14 QK_PROGRAMMABLE_BUTTON_14
+#define PB_15 QK_PROGRAMMABLE_BUTTON_15
+#define PB_16 QK_PROGRAMMABLE_BUTTON_16
+#define PB_17 QK_PROGRAMMABLE_BUTTON_17
+#define PB_18 QK_PROGRAMMABLE_BUTTON_18
+#define PB_19 QK_PROGRAMMABLE_BUTTON_19
+#define PB_20 QK_PROGRAMMABLE_BUTTON_20
+#define PB_21 QK_PROGRAMMABLE_BUTTON_21
+#define PB_22 QK_PROGRAMMABLE_BUTTON_22
+#define PB_23 QK_PROGRAMMABLE_BUTTON_23
+#define PB_24 QK_PROGRAMMABLE_BUTTON_24
+#define PB_25 QK_PROGRAMMABLE_BUTTON_25
+#define PB_26 QK_PROGRAMMABLE_BUTTON_26
+#define PB_27 QK_PROGRAMMABLE_BUTTON_27
+#define PB_28 QK_PROGRAMMABLE_BUTTON_28
+#define PB_29 QK_PROGRAMMABLE_BUTTON_29
+#define PB_30 QK_PROGRAMMABLE_BUTTON_30
+#define PB_31 QK_PROGRAMMABLE_BUTTON_31
+#define PB_32 QK_PROGRAMMABLE_BUTTON_32
+#define QK_PROGRAMMABLE_BUTTON_MIN QK_PROGRAMMABLE_BUTTON_1
+#define QK_PROGRAMMABLE_BUTTON_MAX QK_PROGRAMMABLE_BUTTON_32
+
 #define CAPSWRD CAPS_WORD
 
 #include "quantum_keycodes_legacy.h"
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index db13d5973d..bab34025cf 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -8,6 +8,72 @@
 
 #define VLK_TOG QK_VELOCIKEY_TOGGLE
 
+#define PROGRAMMABLE_BUTTON_1 QK_PROGRAMMABLE_BUTTON_1
+#define PROGRAMMABLE_BUTTON_2 QK_PROGRAMMABLE_BUTTON_2
+#define PROGRAMMABLE_BUTTON_3 QK_PROGRAMMABLE_BUTTON_3
+#define PROGRAMMABLE_BUTTON_4 QK_PROGRAMMABLE_BUTTON_4
+#define PROGRAMMABLE_BUTTON_5 QK_PROGRAMMABLE_BUTTON_5
+#define PROGRAMMABLE_BUTTON_6 QK_PROGRAMMABLE_BUTTON_6
+#define PROGRAMMABLE_BUTTON_7 QK_PROGRAMMABLE_BUTTON_7
+#define PROGRAMMABLE_BUTTON_8 QK_PROGRAMMABLE_BUTTON_8
+#define PROGRAMMABLE_BUTTON_9 QK_PROGRAMMABLE_BUTTON_9
+#define PROGRAMMABLE_BUTTON_10 QK_PROGRAMMABLE_BUTTON_10
+#define PROGRAMMABLE_BUTTON_11 QK_PROGRAMMABLE_BUTTON_11
+#define PROGRAMMABLE_BUTTON_12 QK_PROGRAMMABLE_BUTTON_12
+#define PROGRAMMABLE_BUTTON_13 QK_PROGRAMMABLE_BUTTON_13
+#define PROGRAMMABLE_BUTTON_14 QK_PROGRAMMABLE_BUTTON_14
+#define PROGRAMMABLE_BUTTON_15 QK_PROGRAMMABLE_BUTTON_15
+#define PROGRAMMABLE_BUTTON_16 QK_PROGRAMMABLE_BUTTON_16
+#define PROGRAMMABLE_BUTTON_17 QK_PROGRAMMABLE_BUTTON_17
+#define PROGRAMMABLE_BUTTON_18 QK_PROGRAMMABLE_BUTTON_18
+#define PROGRAMMABLE_BUTTON_19 QK_PROGRAMMABLE_BUTTON_19
+#define PROGRAMMABLE_BUTTON_20 QK_PROGRAMMABLE_BUTTON_20
+#define PROGRAMMABLE_BUTTON_21 QK_PROGRAMMABLE_BUTTON_21
+#define PROGRAMMABLE_BUTTON_22 QK_PROGRAMMABLE_BUTTON_22
+#define PROGRAMMABLE_BUTTON_23 QK_PROGRAMMABLE_BUTTON_23
+#define PROGRAMMABLE_BUTTON_24 QK_PROGRAMMABLE_BUTTON_24
+#define PROGRAMMABLE_BUTTON_25 QK_PROGRAMMABLE_BUTTON_25
+#define PROGRAMMABLE_BUTTON_26 QK_PROGRAMMABLE_BUTTON_26
+#define PROGRAMMABLE_BUTTON_27 QK_PROGRAMMABLE_BUTTON_27
+#define PROGRAMMABLE_BUTTON_28 QK_PROGRAMMABLE_BUTTON_28
+#define PROGRAMMABLE_BUTTON_29 QK_PROGRAMMABLE_BUTTON_29
+#define PROGRAMMABLE_BUTTON_30 QK_PROGRAMMABLE_BUTTON_30
+#define PROGRAMMABLE_BUTTON_31 QK_PROGRAMMABLE_BUTTON_31
+#define PROGRAMMABLE_BUTTON_32 QK_PROGRAMMABLE_BUTTON_32
+
+#define JS_BUTTON0 QK_JOYSTICK_BUTTON_0
+#define JS_BUTTON1 QK_JOYSTICK_BUTTON_1
+#define JS_BUTTON2 QK_JOYSTICK_BUTTON_2
+#define JS_BUTTON3 QK_JOYSTICK_BUTTON_3
+#define JS_BUTTON4 QK_JOYSTICK_BUTTON_4
+#define JS_BUTTON5 QK_JOYSTICK_BUTTON_5
+#define JS_BUTTON6 QK_JOYSTICK_BUTTON_6
+#define JS_BUTTON7 QK_JOYSTICK_BUTTON_7
+#define JS_BUTTON8 QK_JOYSTICK_BUTTON_8
+#define JS_BUTTON9 QK_JOYSTICK_BUTTON_9
+#define JS_BUTTON10 QK_JOYSTICK_BUTTON_10
+#define JS_BUTTON11 QK_JOYSTICK_BUTTON_11
+#define JS_BUTTON12 QK_JOYSTICK_BUTTON_12
+#define JS_BUTTON13 QK_JOYSTICK_BUTTON_13
+#define JS_BUTTON14 QK_JOYSTICK_BUTTON_14
+#define JS_BUTTON15 QK_JOYSTICK_BUTTON_15
+#define JS_BUTTON16 QK_JOYSTICK_BUTTON_16
+#define JS_BUTTON17 QK_JOYSTICK_BUTTON_17
+#define JS_BUTTON18 QK_JOYSTICK_BUTTON_18
+#define JS_BUTTON19 QK_JOYSTICK_BUTTON_19
+#define JS_BUTTON20 QK_JOYSTICK_BUTTON_20
+#define JS_BUTTON21 QK_JOYSTICK_BUTTON_21
+#define JS_BUTTON22 QK_JOYSTICK_BUTTON_22
+#define JS_BUTTON23 QK_JOYSTICK_BUTTON_23
+#define JS_BUTTON24 QK_JOYSTICK_BUTTON_24
+#define JS_BUTTON25 QK_JOYSTICK_BUTTON_25
+#define JS_BUTTON26 QK_JOYSTICK_BUTTON_26
+#define JS_BUTTON27 QK_JOYSTICK_BUTTON_27
+#define JS_BUTTON28 QK_JOYSTICK_BUTTON_28
+#define JS_BUTTON29 QK_JOYSTICK_BUTTON_29
+#define JS_BUTTON30 QK_JOYSTICK_BUTTON_30
+#define JS_BUTTON31 QK_JOYSTICK_BUTTON_31
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")

From 40aa9c87456b8677c10c241ec13ef9de0a84b64f Mon Sep 17 00:00:00 2001
From: Peter Hindes <19994487+PeterHindes@users.noreply.github.com>
Date: Mon, 24 Oct 2022 10:18:03 -0600
Subject: [PATCH 718/959] spelling fix (#18831)

---
 docs/serial_driver.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/serial_driver.md b/docs/serial_driver.md
index fff63109a1..7fad23911a 100644
--- a/docs/serial_driver.md
+++ b/docs/serial_driver.md
@@ -1,6 +1,6 @@
 # 'serial' Driver
 
-The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more then two halves.
+The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more than two halves.
 
 | Driver                                  | AVR                | ARM                | Connection between halves                                                                     |
 | --------------------------------------- | ------------------ | ------------------ | --------------------------------------------------------------------------------------------- |

From a80b886751aaddb0e030a14a82cf99b6778145b4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 25 Oct 2022 03:30:37 +1100
Subject: [PATCH 719/959] Deprecate `CAPS_WORD`/`CAPSWRD` for `CW_TOGG`
 (#18834)

---
 docs/feature_caps_word.md                                 | 4 ++--
 docs/keycodes.md                                          | 6 +++---
 keyboards/bastardkb/dilemma/keymaps/default/keymap.c      | 2 +-
 .../handwired/hillside/46/keymaps/default/keymap.json     | 6 +++---
 .../handwired/hillside/46/keymaps/default_dot_c/keymap.c  | 2 +-
 keyboards/handwired/hillside/46/keymaps/via/keymap.c      | 2 +-
 .../handwired/hillside/48/keymaps/default/keymap.json     | 6 +++---
 .../handwired/hillside/52/keymaps/default/keymap.json     | 2 +-
 .../handwired/hillside/52/keymaps/default_dot_c/keymap.c  | 2 +-
 keyboards/handwired/hillside/52/keymaps/via/keymap.c      | 2 +-
 .../stef9998/split_5x7/keymaps/stef9998/keymap.c          | 2 +-
 keyboards/planck/keymaps/muppetjones/keymap.c             | 2 +-
 keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c      | 2 +-
 quantum/process_keycode/process_caps_word.c               | 2 +-
 quantum/quantum_keycodes.h                                | 7 ++++---
 quantum/quantum_keycodes_legacy.h                         | 2 ++
 tests/caps_word/test_caps_word.cpp                        | 8 ++++----
 users/muppetjones/muppetjones.c                           | 5 -----
 users/muppetjones/muppetjones.h                           | 1 -
 19 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/docs/feature_caps_word.md b/docs/feature_caps_word.md
index 507ea637b2..c58d1a56e2 100644
--- a/docs/feature_caps_word.md
+++ b/docs/feature_caps_word.md
@@ -42,8 +42,8 @@ CAPS_WORD_ENABLE = yes
 
 Next, use one the following methods to activate Caps Word:
 
-* **Activate by pressing a key**: Use the `CAPS_WORD` keycode (short
-  alias `CAPSWRD`) in your keymap.
+* **Activate by pressing a key**: Use the `QK_CAPS_WORD_TOGGLE` keycode (short
+  alias `CW_TOGG`) in your keymap.
 
 * **Activate by pressing Left Shift + Right Shift**: Add `#define
   BOTH_SHIFTS_TURNS_ON_CAPS_WORD` to config.h. You may also need to disable or
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 239f28833a..27620bc2ec 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -275,9 +275,9 @@ See also: [Bluetooth](feature_bluetooth.md)
 
 See also: [Caps Word](feature_caps_word.md)
 
-|Key        |Aliases  |Description                   |
-|-----------|---------|------------------------------|
-|`CAPS_WORD`|`CAPSWRD`|Toggles Caps Word             |
+|Key                  |Aliases  |Description                   |
+|---------------------|---------|------------------------------|
+|`QK_CAPS_WORD_TOGGLE`|`CW_TOGG`|Toggles Caps Word             |
 
 ## Dynamic Macros :id=dynamic-macros
 
diff --git a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
index a0c8394fe3..0f9aff0a85 100644
--- a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/dilemma/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
-                                      NAV, CAPSWRD,     KC_SPC,     SYM
+                                      NAV, CW_TOGG,     KC_SPC,     SYM
   //                            ╰──────────────────╯ ╰──────────────────╯
   ),
 
diff --git a/keyboards/handwired/hillside/46/keymaps/default/keymap.json b/keyboards/handwired/hillside/46/keymaps/default/keymap.json
index 9e5e8eec6f..f5171564d1 100644
--- a/keyboards/handwired/hillside/46/keymaps/default/keymap.json
+++ b/keyboards/handwired/hillside/46/keymaps/default/keymap.json
@@ -12,7 +12,7 @@
          "KC_H"        , "KC_J"    , "KC_K"         , "KC_L"   , "KC_SCLN", "KC_ENT",
 
          "KC_LCTL"     , "KC_Z"    , "KC_X"         , "KC_C"   , "KC_V"   , "KC_B"      , "KC_ESC",
-         "ANY(CAPSWRD)", "KC_N"    , "KC_M"         , "KC_COMM", "KC_DOT" , "KC_SLSH"   , "KC_QUOT",
+         "ANY(CW_TOGG)", "KC_N"    , "KC_M"         , "KC_COMM", "KC_DOT" , "KC_SLSH"   , "KC_QUOT",
 
          "KC_LGUI"     , "KC_LALT" , "OSM(MOD_LSFT)", "MO(3)",
          "MO(4)"       , "KC_SPC"  , "KC_LALT"      , "KC_RGUI"
@@ -25,7 +25,7 @@
          "KC_D"        , "KC_H"    , "KC_T"         , "KC_N"   , "KC_S"   , "KC_ENT",
 
          "KC_LCTL"     , "KC_SCLN" , "KC_Q"         , "KC_J"   , "KC_K"   , "KC_X"      , "KC_ESC",
-         "ANY(CAPSWRD)", "KC_B"    , "KC_M"         , "KC_W"   , "KC_V"   , "KC_Z"      , "KC_SLSH",
+         "ANY(CW_TOGG)", "KC_B"    , "KC_M"         , "KC_W"   , "KC_V"   , "KC_Z"      , "KC_SLSH",
 
          "KC_LGUI"     , "KC_LALT" , "OSM(MOD_LSFT)", "MO(3)",
          "MO(4)"       , "KC_SPC"  , "KC_LALT"      , "KC_RGUI"
@@ -38,7 +38,7 @@
          "KC_M"        , "KC_N"    , "KC_E"         , "KC_I"   , "KC_O"   , "KC_ENT",
 
          "KC_LCTL"     , "KC_Z"    , "KC_TRNS"      , "KC_C"   , "KC_D"   , "KC_V"      , "KC_ESC",
-         "ANY(CAPSWRD)", "KC_K"    , "KC_H"         , "KC_COMM", "KC_DOT" , "KC_SLSH"   , "KC_QUOT",
+         "ANY(CW_TOGG)", "KC_K"    , "KC_H"         , "KC_COMM", "KC_DOT" , "KC_SLSH"   , "KC_QUOT",
 
          "KC_LGUI"     , "KC_LALT" , "OSM(MOD_LSFT)", "MO(3)",
          "MO(4)"       , "KC_SPC"  , "KC_LALT"      , "KC_RGUI"
diff --git a/keyboards/handwired/hillside/46/keymaps/default_dot_c/keymap.c b/keyboards/handwired/hillside/46/keymaps/default_dot_c/keymap.c
index ca58cdeef5..8a1a7cfbe2 100644
--- a/keyboards/handwired/hillside/46/keymaps/default_dot_c/keymap.c
+++ b/keyboards/handwired/hillside/46/keymaps/default_dot_c/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
      KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
      KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                           KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,                       CAPSWRD, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
+     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,                       CW_TOGG, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
                                          KC_LGUI, KC_LALT, OSM_SFT, LY_NAV ,    LY_SYM , KC_SPC , KC_LALT, KC_RGUI
     ),
     [_NAV] = LAYOUT(
diff --git a/keyboards/handwired/hillside/46/keymaps/via/keymap.c b/keyboards/handwired/hillside/46/keymaps/via/keymap.c
index ca58cdeef5..8a1a7cfbe2 100644
--- a/keyboards/handwired/hillside/46/keymaps/via/keymap.c
+++ b/keyboards/handwired/hillside/46/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT(
      KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
      KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                           KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,                       CAPSWRD, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
+     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,                       CW_TOGG, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
                                          KC_LGUI, KC_LALT, OSM_SFT, LY_NAV ,    LY_SYM , KC_SPC , KC_LALT, KC_RGUI
     ),
     [_NAV] = LAYOUT(
diff --git a/keyboards/handwired/hillside/48/keymaps/default/keymap.json b/keyboards/handwired/hillside/48/keymaps/default/keymap.json
index 364ab726a0..268fa51839 100644
--- a/keyboards/handwired/hillside/48/keymaps/default/keymap.json
+++ b/keyboards/handwired/hillside/48/keymaps/default/keymap.json
@@ -12,7 +12,7 @@
          "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_ESC",
-         "CAPS_WORD" , "KC_N"    , "KC_M"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+         "CW_TOGG"   , "KC_N"    , "KC_M"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
 
          "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
          "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_QUOT"
@@ -25,7 +25,7 @@
          "KC_D"      , "KC_H"    , "KC_T"   , "KC_N"   , "KC_S"         , "KC_ENT",
 
          "KC_LSFT"   , "KC_SCLN" , "KC_Q"   , "KC_J"   , "KC_K"         , "KC_X"      , "KC_ESC",
-         "CAPS_WORD"   , "KC_B"    , "KC_M"   , "KC_W"   , "KC_V"         , "KC_Z"      , "KC_RSFT",
+         "CW_TOGG"   , "KC_B"    , "KC_M"   , "KC_W"   , "KC_V"         , "KC_Z"      , "KC_RSFT",
 
          "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
          "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_SLSH"
@@ -38,7 +38,7 @@
          "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_ESC",
-         "CAPS_WORD"   , "KC_K"    , "KC_H"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+         "CW_TOGG"   , "KC_K"    , "KC_H"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
 
          "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
          "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_QUOT"
diff --git a/keyboards/handwired/hillside/52/keymaps/default/keymap.json b/keyboards/handwired/hillside/52/keymaps/default/keymap.json
index c9760428ed..a49daf6b2c 100644
--- a/keyboards/handwired/hillside/52/keymaps/default/keymap.json
+++ b/keyboards/handwired/hillside/52/keymaps/default/keymap.json
@@ -60,7 +60,7 @@
         ["KC_INS"      , "KC_EXLM" , "KC_AT"  , "KC_HASH", "KC_DLR" , "KC_PERC",
          "KC_CIRC"     , "KC_AMPR" , "KC_ASTR", "KC_LPRN", "KC_RPRN", "KC_DEL",
 
-         "ANY(CAPSWRD)", "KC_BSLS" , "KC_MINS", "KC_EQL" , "KC_LBRC", "KC_RBRC",
+         "ANY(CW_TOGG)", "KC_BSLS" , "KC_MINS", "KC_EQL" , "KC_LBRC", "KC_RBRC",
          "KC_VOLU"     , "KC_RSFT" , "KC_RCTL", "KC_LALT", "KC_RGUI", "KC_TRNS",
 
          "KC_TRNS"     , "KC_PIPE" , "KC_UNDS", "KC_PLUS", "KC_LCBR", "KC_RCBR"      , "KC_MPLY",
diff --git a/keyboards/handwired/hillside/52/keymaps/default_dot_c/keymap.c b/keyboards/handwired/hillside/52/keymaps/default_dot_c/keymap.c
index f0c5b755d5..3033f177e7 100644
--- a/keyboards/handwired/hillside/52/keymaps/default_dot_c/keymap.c
+++ b/keyboards/handwired/hillside/52/keymaps/default_dot_c/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_SYM] = LAYOUT(
      KC_INS,  KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-     CAPSWRD, KC_BSLS, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC,                                        KC_VOLU, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
+     CW_TOGG, KC_BSLS, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC,                                        KC_VOLU, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
      _______, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_MPLY,                      KC_MUTE, KC_VOLD, KC_0   , KC_1   , KC_2   , xxxxxxx, _______,   
      xxxxxxx, xxxxxxx, _______,          _______, _______, _______, LY_ADJ ,    _______, _______, _______, _______,          KC_RCTL, KC_APP, ALT_GR
     ),
diff --git a/keyboards/handwired/hillside/52/keymaps/via/keymap.c b/keyboards/handwired/hillside/52/keymaps/via/keymap.c
index f0c5b755d5..3033f177e7 100644
--- a/keyboards/handwired/hillside/52/keymaps/via/keymap.c
+++ b/keyboards/handwired/hillside/52/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_SYM] = LAYOUT(
      KC_INS,  KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-     CAPSWRD, KC_BSLS, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC,                                        KC_VOLU, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
+     CW_TOGG, KC_BSLS, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC,                                        KC_VOLU, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
      _______, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_MPLY,                      KC_MUTE, KC_VOLD, KC_0   , KC_1   , KC_2   , xxxxxxx, _______,   
      xxxxxxx, xxxxxxx, _______,          _______, _______, _______, LY_ADJ ,    _______, _______, _______, _______,          KC_RCTL, KC_APP, ALT_GR
     ),
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
index 0be1e4cbb3..608b5f7068 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
@@ -134,7 +134,7 @@ _______ ,_______ ,RALT_T(KC_S),LCTL_T(KC_D),LSFT_T(KC_F),LT(_SYM,KC_G),_______ ,
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     _______ ,KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,_______ ,                          _______ ,KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_LPRN ,KC_RPRN ,XXXXXXX ,
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    CAPSWRD ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,_______ ,                          _______ ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_QUOT ,
+    CW_TOGG ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,_______ ,                          _______ ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_QUOT ,
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     _______ ,KC_MSEL ,KC_MPLY ,XXXXXXX ,KC_EQL  ,KC_PLUS ,_______ ,                          _______ ,KC_UNDS ,KC_MINS , KC_MPRV, KC_MNXT,KC_MPLY ,_______ ,
 // ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
diff --git a/keyboards/planck/keymaps/muppetjones/keymap.c b/keyboards/planck/keymaps/muppetjones/keymap.c
index 518ab43233..dddfbccc94 100644
--- a/keyboards/planck/keymaps/muppetjones/keymap.c
+++ b/keyboards/planck/keymaps/muppetjones/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_CLMK_DH] = LAYOUT_planck_wrapper(
     __COLEMAK_MOD_DH_L1________________________, KC_DEL,  KC_BSPC, __COLEMAK_MOD_DH_R1_W_QUOT_________________,
-    __COLEMAK_MOD_DH_L2_W_GACS_________________, CAPSWRD, KC_QUOT, __COLEMAK_MOD_DH_R2_W_SCAG_________________,
+    __COLEMAK_MOD_DH_L2_W_GACS_________________, CW_TOGG, KC_QUOT, __COLEMAK_MOD_DH_R2_W_SCAG_________________,
     __COLEMAK_MOD_DH_L3_W_SFTV_________________, KC_ENT,  KC_TAB,  __COLEMAK_MOD_DH_R3________________________,
     TD_LAYR,  XXXXXXX, XXXXXXX, HY_ESC, LOW_ENT, KC_BSPC, KC_BSPC, RAI_SPC, HY_ESC,  KC_BSPC, XXXXXXX, XXXXXXX
 ),
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
index 5f5cc94535..2ad43428b9 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                        `----------------------------------'  `----------------------------------'
  */
 [_CLMK_DH] = LAYOUT_wrapper(
-    CAPSWRD, __COLEMAK_MOD_DH_L1________________________,                                     __COLEMAK_MOD_DH_R1_W_QUOT_________________, KC_BSLS,
+    CW_TOGG, __COLEMAK_MOD_DH_L1________________________,                                     __COLEMAK_MOD_DH_R1_W_QUOT_________________, KC_BSLS,
     HY_ESC,  __COLEMAK_MOD_DH_L2_W_GACS_________________,                                     __COLEMAK_MOD_DH_R2_W_SCAG_________________, KC_QUOT,
     TD_LAYR, __COLEMAK_MOD_DH_L3________________________, KC_LSFT, QK_LEAD, KC_DEL,  KC_TAB,  __COLEMAK_MOD_DH_R3________________________, KC_SFTENT,
                                KC_MUTE, KC_DEL,  HY_ESC,  LOW_BSP, RAI_ENT, KC_BSPC, NAV_SPC, HY_ESC,  RAI_TAB, KC_RALT
diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index 1b9583196d..7a83f7bf49 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -15,7 +15,7 @@
 #include "process_caps_word.h"
 
 bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
-    if (keycode == CAPSWRD) { // Pressing CAPSWRD toggles Caps Word.
+    if (keycode == QK_CAPS_WORD_TOGGLE) {
         if (record->event.pressed) {
             caps_word_toggle();
         }
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index ac3968895b..2e2ba8cd81 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -603,7 +603,7 @@ enum quantum_keycodes {
     SECURE_TOGGLE,
     SECURE_REQUEST,
 
-    CAPS_WORD,
+    QK_CAPS_WORD_TOGGLE,
 
     MAGIC_SWAP_ESCAPE_CAPSLOCK,
     MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
@@ -846,6 +846,9 @@ enum quantum_keycodes {
 // Leader key
 #define QK_LEAD QK_LEADER
 
+// Caps Word
+#define CW_TOGG QK_CAPS_WORD_TOGGLE
+
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
 #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
@@ -952,6 +955,4 @@ enum quantum_keycodes {
 #define QK_PROGRAMMABLE_BUTTON_MIN QK_PROGRAMMABLE_BUTTON_1
 #define QK_PROGRAMMABLE_BUTTON_MAX QK_PROGRAMMABLE_BUTTON_32
 
-#define CAPSWRD CAPS_WORD
-
 #include "quantum_keycodes_legacy.h"
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index bab34025cf..40aa0f49a1 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -7,6 +7,8 @@
 #define KC_LOCK QK_LOCK
 
 #define VLK_TOG QK_VELOCIKEY_TOGGLE
+#define CAPSWRD QK_CAPS_WORD_TOGGLE
+#define CAPS_WORD QK_CAPS_WORD_TOGGLE
 
 #define PROGRAMMABLE_BUTTON_1 QK_PROGRAMMABLE_BUTTON_1
 #define PROGRAMMABLE_BUTTON_2 QK_PROGRAMMABLE_BUTTON_2
diff --git a/tests/caps_word/test_caps_word.cpp b/tests/caps_word/test_caps_word.cpp
index 3f59ed3744..91dd1a0221 100644
--- a/tests/caps_word/test_caps_word.cpp
+++ b/tests/caps_word/test_caps_word.cpp
@@ -118,19 +118,19 @@ TEST_F(CapsWord, DefaultCapsWordPressUserFun) {
     }
 }
 
-// Tests that `CAPSWRD` key toggles Caps Word.
+// Tests that `QK_CAPS_WORD_TOGGLE` key toggles Caps Word.
 TEST_F(CapsWord, CapswrdKey) {
     TestDriver driver;
-    KeymapKey  key_capswrd(0, 0, 0, CAPSWRD);
+    KeymapKey  key_capswrd(0, 0, 0, QK_CAPS_WORD_TOGGLE);
     set_keymap({key_capswrd});
 
     // No keyboard reports should be sent.
     EXPECT_NO_REPORT(driver);
 
-    tap_key(key_capswrd); // Tap the CAPSWRD key.
+    tap_key(key_capswrd); // Tap the QK_CAPS_WORD_TOGGLE key.
     EXPECT_EQ(is_caps_word_on(), true);
 
-    tap_key(key_capswrd); // Tap the CAPSWRD key again.
+    tap_key(key_capswrd); // Tap the QK_CAPS_WORD_TOGGLE key again.
     EXPECT_EQ(is_caps_word_on(), false);
 
     testing::Mock::VerifyAndClearExpectations(&driver);
diff --git a/users/muppetjones/muppetjones.c b/users/muppetjones/muppetjones.c
index 55051bdbcd..c4cb02124a 100644
--- a/users/muppetjones/muppetjones.c
+++ b/users/muppetjones/muppetjones.c
@@ -45,11 +45,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
             break;
-        case CAPSWRD:
-            if (record->event.pressed) {
-                toggle_caps_word();
-            }
-            return false;
         default:
             break;
     }
diff --git a/users/muppetjones/muppetjones.h b/users/muppetjones/muppetjones.h
index f5b2a3a465..3ada6c8198 100644
--- a/users/muppetjones/muppetjones.h
+++ b/users/muppetjones/muppetjones.h
@@ -52,5 +52,4 @@ enum userspace_layers {
 enum custom_keycodes {
     CLMK_DH = SAFE_RANGE,
     QWERTY,
-    CAPSWRD,
 };

From 67fd4e6b7afe5515b67f153723f57beabbebe25e Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 24 Oct 2022 23:29:23 +0100
Subject: [PATCH 720/959] [DOCS] Use correct OSM arguments (#18835)

---
 docs/feature_key_lock.md    | 2 +-
 docs/ja/feature_key_lock.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/feature_key_lock.md b/docs/feature_key_lock.md
index 7681394229..1b02c7c291 100644
--- a/docs/feature_key_lock.md
+++ b/docs/feature_key_lock.md
@@ -16,7 +16,7 @@ First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Th
 
 ## Caveats
 
-Key Lock is only able to hold standard action keys and [One Shot modifier](one_shot_keys.md) keys (for example, if you have your Shift defined as `OSM(KC_LSFT)`).
+Key Lock is only able to hold standard action keys and [One Shot modifier](one_shot_keys.md) keys (for example, if you have your Shift defined as `OSM(MOD_LSFT)`).
 This does not include any of the QMK special functions (except One Shot modifiers), or shifted versions of keys such as `KC_LPRN`. If it's in the [Basic Keycodes](keycodes_basic.md) list, it can be held.
 
 Switching layers will not cancel the Key Lock. The Key Lock can be cancelled by calling the `cancel_key_lock()` function.
diff --git a/docs/ja/feature_key_lock.md b/docs/ja/feature_key_lock.md
index b786fbb048..22cd9fb810 100644
--- a/docs/ja/feature_key_lock.md
+++ b/docs/ja/feature_key_lock.md
@@ -21,7 +21,7 @@
 
 ## 注意事項
 
-キーロックは、標準アクションキーと[ワンショットモディファイア](ja/one_shot_keys.md)キー (例えば、Shift を `OSM(KC_LSFT)` と定義した場合)のみを押し続けることができます。
+キーロックは、標準アクションキーと[ワンショットモディファイア](ja/one_shot_keys.md)キー (例えば、Shift を `OSM(MOD_LSFT)` と定義した場合)のみを押し続けることができます。
 これは、QMK の特殊機能(ワンショットモディファイアを除く)、または `KC_LPRN` のような shift を押されたキーのバージョンは含みません。[基本的なキーコード](ja/keycodes_basic.md)リストにある場合、押したままにすることができます。
 
 レイヤーの切り替えは、キーロックを解除しません。

From e863c431f61565f41cf28fa7e981bdb3cba4f642 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper <ToyKeeper@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:02:21 -0600
Subject: [PATCH 721/959] added BS_TOGG so BS_SWAP and BS_NORM can be on a
 single key (#18837)

Co-authored-by: Selene ToyKeeper <git@toykeeper.net>
---
 docs/keycodes.md                        | 1 +
 quantum/process_keycode/process_magic.c | 4 ++++
 quantum/quantum_keycodes.h              | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index 27620bc2ec..b541975640 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -404,6 +404,7 @@ See also: [Magic Keycodes](keycodes_magic.md)
 |`MAGIC_UNSWAP_GRAVE_ESC`          |`GE_NORM`|Unswap <code>&#96;</code> and Escape                                      |
 |`MAGIC_SWAP_BACKSLASH_BACKSPACE`  |`BS_SWAP`|Swap `\` and Backspace                                                    |
 |`MAGIC_UNSWAP_BACKSLASH_BACKSPACE`|`BS_NORM`|Unswap `\` and Backspace                                                  |
+|`MAGIC_TOGGLE_BACKSLASH_BACKSPACE`|`BS_TOGG`|Toggle `\` and Backspace swap state                                       |
 |`MAGIC_HOST_NKRO`                 |`NK_ON`  |Enable N-key rollover                                                     |
 |`MAGIC_UNHOST_NKRO`               |`NK_OFF` |Disable N-key rollover                                                    |
 |`MAGIC_TOGGLE_NKRO`               |`NK_TOGG`|Toggle N-key rollover                                                     |
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c
index ae60f29bf5..50816c5261 100644
--- a/quantum/process_keycode/process_magic.c
+++ b/quantum/process_keycode/process_magic.c
@@ -45,6 +45,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
             case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT:
             case MAGIC_TOGGLE_GUI:
             case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
+            case MAGIC_TOGGLE_BACKSLASH_BACKSPACE:
             case MAGIC_SWAP_ESCAPE_CAPSLOCK ... MAGIC_TOGGLE_ESCAPE_CAPSLOCK:
                 /* keymap config */
                 keymap_config.raw = eeconfig_read_keymap();
@@ -163,6 +164,9 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                         }
 #endif
                         break;
+                    case MAGIC_TOGGLE_BACKSLASH_BACKSPACE:
+                        keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace;
+                        break;
                     case MAGIC_TOGGLE_NKRO:
                         clear_keyboard(); // clear first buffer to prevent stuck keys
                         keymap_config.nkro = !keymap_config.nkro;
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 2e2ba8cd81..7bd270cfd5 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -615,6 +615,8 @@ enum quantum_keycodes {
     AUTOCORRECT_OFF,
     AUTOCORRECT_TOGGLE,
 
+    MAGIC_TOGGLE_BACKSLASH_BACKSPACE,
+
     // Start of custom keycode range for keyboards and keymaps - always leave at the end
     SAFE_RANGE
 };
@@ -731,6 +733,7 @@ enum quantum_keycodes {
 
 #define BS_SWAP MAGIC_SWAP_BACKSLASH_BACKSPACE
 #define BS_NORM MAGIC_UNSWAP_BACKSLASH_BACKSPACE
+#define BS_TOGG MAGIC_TOGGLE_BACKSLASH_BACKSPACE
 
 #define NK_ON MAGIC_HOST_NKRO
 #define NK_OFF MAGIC_UNHOST_NKRO

From d861a35ebf0b067a1cc4d7fce3d09b16462a078d Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@klaviyo.com>
Date: Tue, 25 Oct 2022 01:05:22 -0400
Subject: [PATCH 722/959] [Keyboard] Add Ellipse hotswap PCB support (#18707)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cannonkeys/ellipse_hs/info.json     | 94 +++++++++++++++++++
 .../ellipse_hs/keymaps/default/keymap.c       | 45 +++++++++
 .../ellipse_hs/keymaps/via/keymap.c           | 45 +++++++++
 .../ellipse_hs/keymaps/via/rules.mk           |  1 +
 keyboards/cannonkeys/ellipse_hs/readme.md     | 25 +++++
 keyboards/cannonkeys/ellipse_hs/rules.mk      |  2 +
 6 files changed, 212 insertions(+)
 create mode 100644 keyboards/cannonkeys/ellipse_hs/info.json
 create mode 100644 keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/ellipse_hs/readme.md
 create mode 100644 keyboards/cannonkeys/ellipse_hs/rules.mk

diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/info.json
new file mode 100644
index 0000000000..76cb0cfae2
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/info.json
@@ -0,0 +1,94 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Ellipse HS",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com/",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xCA04",
+        "pid": "0x0016"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "label": "Del", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+                { "label": "Bksp", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
+                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7cf77c4f90
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6a0943e9bb
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk b/keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/ellipse_hs/readme.md b/keyboards/cannonkeys/ellipse_hs/readme.md
new file mode 100644
index 0000000000..e516ee49e3
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/readme.md
@@ -0,0 +1,25 @@
+# Ellipse Hotswap
+
+*A ellipse inspired 60% keyboard with 3 mounting styles from Skepur*
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/ellipse_hs:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/ellipse_hs:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/ellipse_hs/rules.mk b/keyboards/cannonkeys/ellipse_hs/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse_hs/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

From 2dff39720dda4ad00f89102ab238104c400490df Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@klaviyo.com>
Date: Tue, 25 Oct 2022 01:05:53 -0400
Subject: [PATCH 723/959] [Keyboard] Add Ellipse PCB support (#18706)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cannonkeys/ellipse/config.h         |  20 ++++
 keyboards/cannonkeys/ellipse/halconf.h        |  27 +++++
 keyboards/cannonkeys/ellipse/info.json        | 108 ++++++++++++++++++
 .../ellipse/keymaps/default/keymap.c          |  45 ++++++++
 .../cannonkeys/ellipse/keymaps/via/keymap.c   |  45 ++++++++
 .../cannonkeys/ellipse/keymaps/via/rules.mk   |   1 +
 keyboards/cannonkeys/ellipse/mcuconf.h        |  28 +++++
 keyboards/cannonkeys/ellipse/readme.md        |  25 ++++
 keyboards/cannonkeys/ellipse/rules.mk         |   2 +
 9 files changed, 301 insertions(+)
 create mode 100644 keyboards/cannonkeys/ellipse/config.h
 create mode 100644 keyboards/cannonkeys/ellipse/halconf.h
 create mode 100644 keyboards/cannonkeys/ellipse/info.json
 create mode 100644 keyboards/cannonkeys/ellipse/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/ellipse/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/ellipse/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/ellipse/mcuconf.h
 create mode 100644 keyboards/cannonkeys/ellipse/readme.md
 create mode 100644 keyboards/cannonkeys/ellipse/rules.mk

diff --git a/keyboards/cannonkeys/ellipse/config.h b/keyboards/cannonkeys/ellipse/config.h
new file mode 100644
index 0000000000..8236eb17d9
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2022 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/ellipse/halconf.h b/keyboards/cannonkeys/ellipse/halconf.h
new file mode 100644
index 0000000000..4bec05bd69
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/halconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/an_c/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/info.json
new file mode 100644
index 0000000000..f313dd96d7
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/info.json
@@ -0,0 +1,108 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Ellipse",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "backlight": true,
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "backlight": {
+        "breathing": true,
+        "breathing_period": 5,
+        "levels": 15,
+        "pin": "A6"
+    },
+    "indicators": {
+        "caps_lock": "A3",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com/",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xCA04",
+        "pid": "0x0015"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
+                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
+                { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4.0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c b/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ec4710734d
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_BSLS, KC_ENT,
+    KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, MO(_FN1), KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, _______, QK_BOOT
+  ),
+
+  [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c b/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c
new file mode 100644
index 0000000000..49dcf74e20
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all(
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_BSLS, KC_ENT,
+    KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT, MO(_FN1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                         KC_RALT, MO(_FN1), KC_RGUI, KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_all(
+    KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                           _______,                                     _______, _______, _______, QK_BOOT
+  ),
+
+    [_FN2] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT_all(
+    _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+    _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    _______,  _______, _______,                            _______,                                     _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/ellipse/keymaps/via/rules.mk b/keyboards/cannonkeys/ellipse/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/ellipse/mcuconf.h b/keyboards/cannonkeys/ellipse/mcuconf.h
new file mode 100644
index 0000000000..45f6a54cd1
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/mcuconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/an_c/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
diff --git a/keyboards/cannonkeys/ellipse/readme.md b/keyboards/cannonkeys/ellipse/readme.md
new file mode 100644
index 0000000000..9253c59124
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/readme.md
@@ -0,0 +1,25 @@
+# Ellipse
+
+*An ellipse inspired 60% keyboard with 3 mounting styles from Skepur*
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/ellipse:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/ellipse:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/ellipse/rules.mk b/keyboards/cannonkeys/ellipse/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/cannonkeys/ellipse/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

From 4f63be4d1d44c7d4a154c14a982186e0ca27ceba Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 25 Oct 2022 06:07:34 +0100
Subject: [PATCH 724/959] Remove some assumptions on sequential keycode ranges
 (#18838)

---
 keyboards/moonlander/moonlander.c             | 11 +++++++++--
 keyboards/planck/ez/ez.c                      | 11 +++++++++--
 quantum/process_keycode/process_autocorrect.c |  9 +++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 8bde17b79e..29d13af3ee 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -316,8 +316,15 @@ led_config_t g_led_config = { {
 #ifdef AUDIO_ENABLE
 bool music_mask_kb(uint16_t keycode) {
     switch (keycode) {
-        case QK_LAYER_TAP ... QK_ONE_SHOT_LAYER_MAX:
-        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
+        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+        case QK_TO ... QK_TO_MAX:
+        case QK_MOMENTARY ... QK_MOMENTARY_MAX:
+        case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:
+        case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
+        case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
+        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
+        case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
+        case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
         case AU_ON ... MUV_DE:
         case QK_BOOT:
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 01157e106b..84eb725c90 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -318,8 +318,15 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 #ifdef AUDIO_ENABLE
 bool music_mask_kb(uint16_t keycode) {
     switch (keycode) {
-    case QK_LAYER_TAP ... QK_ONE_SHOT_LAYER_MAX:
-    case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
+    case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+    case QK_TO ... QK_TO_MAX:
+    case QK_MOMENTARY ... QK_MOMENTARY_MAX:
+    case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:
+    case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
+    case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
+    case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
+    case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
+    case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
     case QK_MOD_TAP ... QK_MOD_TAP_MAX:
     case AU_ON ... MUV_DE:
     case QK_BOOT:
diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
index abae5e7811..f19ca4a90b 100644
--- a/quantum/process_keycode/process_autocorrect.c
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -73,8 +73,13 @@ __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord
         case KC_LSFT:
         case KC_RSFT:
         case KC_CAPS:
-        case QK_TO ... QK_ONE_SHOT_LAYER_MAX:
-        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
+        case QK_TO ... QK_TO_MAX:
+        case QK_MOMENTARY ... QK_MOMENTARY_MAX:
+        case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:
+        case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
+        case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
+        case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
+        case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
         case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
             return false;
 

From 846e9d4c537c85f1a549f14865d1923793d8dbf9 Mon Sep 17 00:00:00 2001
From: syntax-magic <dan.syntaxmagic@gmail.com>
Date: Mon, 24 Oct 2022 22:46:37 -0700
Subject: [PATCH 725/959] [Keymap] Added tap dance to LNG1 key (LNG2) (#18682)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: syntax-magic <dkim.8881@gmail.com>
---
 .../kprepublic/bm40hsrgb/keymaps/dan/config.h |  7 ++
 .../kprepublic/bm40hsrgb/keymaps/dan/keymap.c | 90 ++++++++++---------
 .../bm40hsrgb/keymaps/dan/readme.md           | 25 ++++--
 .../kprepublic/bm40hsrgb/keymaps/dan/rules.mk |  1 +
 4 files changed, 72 insertions(+), 51 deletions(-)
 create mode 100644 keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h
 create mode 100644 keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk

diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h
new file mode 100644
index 0000000000..67f7e7cd6f
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h
@@ -0,0 +1,7 @@
+// Copyright 2021 Dan Kim (@syntax-magic)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define TAPPING_TERM 168
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
index 29e359b94a..797dc164c7 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
@@ -41,42 +41,53 @@ enum layers {
 #define CLEAN TG(_CLEAN)
 #define RGB MO(_RGB)
 
+// Tap dance declarations
+enum {
+    TD_LNG1_LNG2,
+    TD_PAST_PSLS
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_LNG1_LNG2] = ACTION_TAP_DANCE_DOUBLE(KC_LNG1, KC_LNG2),
+    [TD_PAST_PSLS] = ACTION_TAP_DANCE_DOUBLE(KC_PAST, KC_PSLS)
+};
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* ALPHA
  * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |  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/NP|  KOR | Win  | Alt  |LEFTFN|    Space    |RFN/- |   =  |Delete|  \   | Enter|
+ * |ESC/NU|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
+    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), TD(TD_LNG1_LNG2), 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+/|HANJA |   [  |   ]  |   )  |   :  |  "   |
+ * | Ctrl | Left | Down | Up   |Right |Ctrl+/| PGUP |   [  |   ]  |   )  |   :  |  "   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| PGUP | PGDN | Home | End  | CAPS |PRNTSR|   (  |   ,  |   .  |   /  |Return|
+ * | Shift|CapLck| Ins  | Home | End  | PGDN |PrntSc|   (  |   ,  |   .  |   /  |Return|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RGB  |   [  |   ]  | Alt  | Trns |    Space    |   _  |   +  | INS  |   |  | Enter|
+ * | RGB  |   [  |   ]  | 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_LNG2, KC_LBRC, KC_RBRC, KC_RPRN, KC_COLN, KC_DQUO,
-    KC_LSFT, KC_PGUP, KC_PGDN, KC_HOME, KC_END,   KC_CAPS,        KC_PSCR, KC_LPRN, KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-    RGB,     KC_LBRC, KC_RBRC, KC_LALT, KC_TRNS,           KC_SPC,         KC_UNDS, KC_PLUS, KC_INS,  KC_PIPE, KC_PENT
+    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_PGUP, KC_LBRC, KC_RBRC, KC_RPRN, KC_COLN, KC_DQUO,
+    KC_LSFT, KC_CAPS, KC_INS,  KC_HOME, KC_END,   KC_PGDN,       KC_PSCR, KC_LPRN, KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    RGB,     KC_LBRC, KC_RBRC, KC_LALT, KC_TRNS,        KC_SPC,           KC_UNDS, KC_PLUS, KC_DEL,  KC_PIPE, KC_PENT
 ),
 
 /* RIGHTFN
@@ -99,23 +110,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* NUMPAD
  * ,-----------------------------------------------------------------------------------.
- * |   *  |   7  |   8  |   9  | NumLk|      |      |      |      |      |      | Bksp |
+ * | *or/ |   7  |   8  |   9  | NumLk|      |      |      |      |      |      | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |  Alt |   4  |   5  |   6  |Return|      |      |      |      |      | Shift|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   -  |   1  |   2  |   3  | Bksp |      |      |      |      |      | Ctrl |Return|
+ * |   -  |   1  |   2  |   3  | Bksp |      |      |      |   ,  |   .  | Ctrl |Return|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Trns |   ,  |   +  |   .  |   0  |    Space    |LEAGUE| PUBG | OVWCh|  SC  |TETRIS|
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_planck_mit(
-    KC_ASTR, KC_P7,   KC_P8,   KC_P9,   KC_NLCK, 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_NO, KC_NO,     KC_LCTL,   KC_ENT,
-    KC_TRNS, KC_COMM, KC_PPLS, KC_PDOT, KC_0,       KC_SPC,    LEAGUE, PUBG,  OVERWATCH, STARCRAFT, TETRIS
+    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,       LEAGUE, PUBG,    OVERWATCH, STARCRAFT, TETRIS
 ),
 
-
 /* LEAGUE
  * ,-----------------------------------------------------------------------------------.
  * | Tab  |   Q  |   W  |   E  |   R  |   5  |   Y  |      |      |   O  |   P  | ESC  |
@@ -248,21 +258,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 /*
-
 // 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}
-
 */
-
 void rgb_matrix_indicators_user(void) {
-    uint8_t red[3] = {50, 5, 0};
-    uint8_t yellow[3] = {50, 50, 0};
-    uint8_t blue[3] = {0, 15, 50};
-    uint8_t green[3] = {15, 33, 1};
+    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 pink[3] = {17, 0, 22};
     uint8_t white[3] = {255, 255, 255};
+    uint8_t wasd[4] = {2, 13, 14, 15};
 
     switch (get_highest_layer(layer_state)) {
         case _ALPHA:
@@ -274,54 +284,50 @@ void rgb_matrix_indicators_user(void) {
         case _NUMPAD:
             break;
         case _LEAGUE:
-            rgb_matrix_set_color(15, yellow[0], yellow[1], yellow[2]);
             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(42, green[0], green[1], green[2]);
-
+            rgb_matrix_set_color(10, purple[0], purple[1], purple[2]);
             break;
-
         case _PUBG:
             rgb_matrix_set_color(43, green[0], green[1], green[2]);
-
             break;
-
         case _OVERWATCH:
             rgb_matrix_set_color(44, green[0], green[1], green[2]);
             break;
-
         case _STARCRAFT:
             rgb_matrix_set_color(45, green[0], green[1], green[2]);
             break;
-
         case _TETRIS:
-            rgb_matrix_set_color(46, green[0], green[1], green[2]);
+            for (int i = 0; i < sizeof wasd; i++) {
+                rgb_matrix_set_color(wasd[i], pink[0], pink[1], pink[2]);
+            }
             break;
-
         case _CLEAN:
             rgb_matrix_set_color_all(white[0], white[1], white[2]);
             break;
-
         case _RGB:
             break;
     }
 
     led_t led_state = host_keyboard_led_state();
-
     //Capslock led
     if (led_state.caps_lock) {
         rgb_matrix_set_color(12, 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]);
     }
-
+}
+
+// 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
index cc59c816f0..20a15a020b 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
@@ -1,6 +1,8 @@
 # Dan's KPrepublic BM40 Keymap
 
->This is my personal keymap with an LED indicator support for num lock, caps lock and scroll lock. 
+> ** There isn't a qmk firmware for the new bm40 v2 pcb yet. Check with your vendor before purchasing.  
+>  
+>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
@@ -8,6 +10,11 @@
 > * Keycaps: WOB ABS Cherry Profile
 > * Switches: Gazzew Boba u4t (62g 2 stage long spring)
 
+![](https://i.imgur.com/imqhjZW.jpg)
+> * Case: JJ40 Aluminium Acclive Case with Acrylic Diffuser
+> * Keycaps: YMDK DSA Keycaps
+> * Artisan: Rodríguez Cap by Polykeys
+
 ### BM40 LED INDEX
 **_Numlock (11) Capslock (12) Scroll lock (23)_**
 
@@ -37,19 +44,19 @@
 | **_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 |
+| **_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+/ | HAN |  [  |  ]  |  )  |  :  |  "  |
-| **_3_** | SFT | PGU | PGD | HOM | END | CAP | PRN |  (  |  ,  |  .  |  /  | RET |
-| **_4_** | RGB |  [  |  ]  | &nbsp;ALT | TRN | &nbsp;SPC || &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_ | &nbsp;&nbsp;&nbsp;&nbsp;+ | &nbsp;INS | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | ENT |
+| **_2_** | CTL | LFT | DN  | UP  | RHT | C+/ | PGU |  [  |  ]  |  )  |  :  |  "  |
+| **_3_** | SFT | CAPS| INS | HOM | END | PGD | PRN |  (  |  ,  |  .  |  /  | RET |
+| **_4_** | RGB |  [  |  ]&nbsp;  | 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 />
@@ -70,9 +77,9 @@
 
 |         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
 |---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** |  *  |  7  |  8  |  9  | NUM |     |     |     |     |     |     | BSP |
-| **_2_** | ALT |  4  |  5  |  6  | RET |     |     |     |     |     |     |     |
-| **_3_** |  -  |  1  |  2  |  3  | BSP |     |     |     |     |     |     | RET |
+| **_1_** | *or/|  7  |  8  |  9  | NUM |     |     |     |     |     |     | BSP |
+| **_2_** | ALT |  4  |  5  |  6  | RET |     |     |     |     |     | SFT |     |
+| **_3_** |  -  |  1  |  2  |  3  | BSP |     |     |     |  ,  |  .  | CTL | 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.
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes

From e3594135012aa8c8bc309bf43aaa958f3135a30a Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 24 Oct 2022 23:52:44 -0600
Subject: [PATCH 726/959] [Keyboard] Fixup emptystring/nqg (#18804)

---
 keyboards/emptystring/nqg/config.h                 |  2 --
 keyboards/emptystring/nqg/keymaps/default/keymap.c | 10 +++++-----
 keyboards/emptystring/nqg/nqg.c                    |  2 ++
 keyboards/emptystring/nqg/nqg.h                    |  2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/keyboards/emptystring/nqg/config.h b/keyboards/emptystring/nqg/config.h
index 66abf55834..8a0a71766f 100644
--- a/keyboards/emptystring/nqg/config.h
+++ b/keyboards/emptystring/nqg/config.h
@@ -30,5 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-#define TAPPING_TERM 200
diff --git a/keyboards/emptystring/nqg/keymaps/default/keymap.c b/keyboards/emptystring/nqg/keymaps/default/keymap.c
index aca045342c..eec249187b 100644
--- a/keyboards/emptystring/nqg/keymaps/default/keymap.c
+++ b/keyboards/emptystring/nqg/keymaps/default/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include QMK_KEYBOARD_H
 
 #define _BASE 0
@@ -21,7 +23,7 @@ enum tapdances{
 #define KC_CTEN LCTL(KC_ENT)
 #define KC_STAB LSFT_T(KC_TAB)
 #define KC_WLNG LALT(KC_LSFT)
-#define KC_LOCK LGUI(KC_L)
+#define WIN_LOCK LGUI(KC_L)
 #define KC_ULCK LCTL(LALT(KC_DEL))
 #define KC_DSTP LGUI(KC_D)
 #define KC_ESLO LT(_LOWER, KC_ESC)
@@ -54,8 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_1,    KC_2,    KC_3,      KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_N0BS,
              _______, _______, _______,   _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
              _______, _______, _______,   _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-             KC_ALEN,          KC_LOCK,   KC_BSCT, KC_BSCT, KC_SPC,  KC_SPC,  _______
-  ),
-
-
+             KC_ALEN,          WIN_LOCK,  KC_BSCT, KC_BSCT, KC_SPC,  KC_SPC,  _______
+  )
 };
diff --git a/keyboards/emptystring/nqg/nqg.c b/keyboards/emptystring/nqg/nqg.c
index 85eb47e6d3..8001a3a11b 100644
--- a/keyboards/emptystring/nqg/nqg.c
+++ b/keyboards/emptystring/nqg/nqg.c
@@ -1 +1,3 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include "nqg.h"
diff --git a/keyboards/emptystring/nqg/nqg.h b/keyboards/emptystring/nqg/nqg.h
index 943ea6ab16..004fbb5456 100644
--- a/keyboards/emptystring/nqg/nqg.h
+++ b/keyboards/emptystring/nqg/nqg.h
@@ -1,3 +1,5 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
 #include "quantum.h"

From f100de88e524633d4f7b35602b37ad6a76044f1d Mon Sep 17 00:00:00 2001
From: Dalius Dobravolskas <daliusd@wix.com>
Date: Tue, 25 Oct 2022 09:23:35 +0300
Subject: [PATCH 727/959] Callum style layout improvements and my layout
 changes (#16174)

---
 keyboards/a_dux/keymaps/daliusd/config.h  |   5 +-
 keyboards/a_dux/keymaps/daliusd/flow.c    | 336 ++++++++++++++++++++++
 keyboards/a_dux/keymaps/daliusd/flow.h    |  27 ++
 keyboards/a_dux/keymaps/daliusd/keymap.c  | 233 +++++++--------
 keyboards/a_dux/keymaps/daliusd/oneshot.c | 195 -------------
 keyboards/a_dux/keymaps/daliusd/oneshot.h |  65 -----
 keyboards/a_dux/keymaps/daliusd/readme.md | 299 ++++++++++++++++++-
 keyboards/a_dux/keymaps/daliusd/rules.mk  |   2 +-
 8 files changed, 769 insertions(+), 393 deletions(-)
 create mode 100644 keyboards/a_dux/keymaps/daliusd/flow.c
 create mode 100644 keyboards/a_dux/keymaps/daliusd/flow.h
 delete mode 100644 keyboards/a_dux/keymaps/daliusd/oneshot.c
 delete mode 100644 keyboards/a_dux/keymaps/daliusd/oneshot.h

diff --git a/keyboards/a_dux/keymaps/daliusd/config.h b/keyboards/a_dux/keymaps/daliusd/config.h
index 42e88a687f..786451768a 100644
--- a/keyboards/a_dux/keymaps/daliusd/config.h
+++ b/keyboards/a_dux/keymaps/daliusd/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
+#define UNICODE_SELECTED_MODES UC_LNX
 
 #define MOUSEKEY_INTERVAL 12
 #define MOUSEKEY_MAX_SPEED 6
@@ -30,3 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_INTERVAL 50
 // The default is 40
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 100
+
+#define FLOW_COUNT 6
+#define FLOW_LAYERS_COUNT 5
diff --git a/keyboards/a_dux/keymaps/daliusd/flow.c b/keyboards/a_dux/keymaps/daliusd/flow.c
new file mode 100644
index 0000000000..6e4db873fe
--- /dev/null
+++ b/keyboards/a_dux/keymaps/daliusd/flow.c
@@ -0,0 +1,336 @@
+/* Copyright 2022 @daliusd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "flow.h"
+
+extern const uint16_t flow_config[FLOW_COUNT][2];
+extern const uint16_t flow_layers_config[FLOW_LAYERS_COUNT][2];
+
+// Represents the states a flow key can be in
+typedef enum {
+    flow_up_unqueued,
+    flow_up_queued,
+    flow_up_queued_used,
+    flow_down_unused,
+    flow_down_used,
+} flow_state_t;
+
+#ifdef FLOW_ONESHOT_TERM
+const int g_flow_oneshot_term = FLOW_ONESHOT_TERM;
+#else
+const int g_flow_oneshot_term = 500;
+#endif
+
+#ifdef FLOW_ONESHOT_WAIT_TERM
+const int g_flow_oneshot_wait_term = FLOW_ONESHOT_WAIT_TERM;
+#else
+const int g_flow_oneshot_wait_term = 500;
+#endif
+
+flow_state_t flow_state[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = flow_up_unqueued };
+bool flow_pressed[FLOW_COUNT][2] = { [0 ... FLOW_COUNT - 1] = {false, false} };
+uint16_t flow_timers[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = 0 };
+bool flow_timeout_timers_active[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = false };
+uint16_t flow_timeout_timers_value[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = 0 };
+uint16_t flow_timeout_wait_timers_value[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = 0 };
+
+flow_state_t flow_layers_state[FLOW_LAYERS_COUNT] = {
+    [0 ... FLOW_LAYERS_COUNT - 1] = flow_up_unqueued
+};
+bool flow_layer_timeout_timers_active[FLOW_LAYERS_COUNT] = { [0 ... FLOW_LAYERS_COUNT - 1] = false };
+uint16_t flow_layer_timeout_timers_value[FLOW_LAYERS_COUNT] = { [0 ... FLOW_LAYERS_COUNT - 1] = 0 };
+uint16_t flow_layer_timeout_wait_timers_value[FLOW_LAYERS_COUNT] = { [0 ... FLOW_LAYERS_COUNT - 1] = 0 };
+
+bool is_flow_ignored_key(uint16_t keycode) {
+    for (int i = 0; i < FLOW_COUNT; i++) {
+        if (flow_config[i][0] == keycode) {
+            return true;
+        }
+    }
+
+    for (int i = 0; i < FLOW_LAYERS_COUNT; i++) {
+        if (flow_layers_config[i][0] == keycode) {
+            return true;
+        }
+    }
+
+    if (keycode == KC_LSFT || keycode == KC_RSFT
+            || keycode == KC_LCTL || keycode == KC_RCTL
+            || keycode == KC_LALT || keycode == KC_RALT
+            || keycode == KC_LGUI || keycode == KC_RGUI) {
+        return true;
+    }
+
+    return false;
+}
+
+bool update_flow_mods(
+    uint16_t keycode,
+    bool pressed
+) {
+    bool pass = true;
+    bool flow_key_list_triggered[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = false };
+    bool flow_key_list_pressed[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = false };
+
+    bool flow_triggered = false;
+
+    for (uint8_t i = 0; i < FLOW_COUNT; i++) {
+        // Layer key
+        if (keycode == flow_config[i][0]) {
+            if (pressed) {
+                flow_pressed[i][0] = true;
+            } else {
+                flow_pressed[i][0] = false;
+            }
+        // KC mod key
+        } else if (keycode == flow_config[i][1]) {
+            if (pressed) {
+                if (flow_pressed[i][0]) {
+                    flow_pressed[i][1] = true;
+                    flow_key_list_triggered[i] = true;
+                    flow_triggered = true;
+                    flow_key_list_pressed[i] = true;
+                    pass = false;
+                 }
+            } else if (flow_pressed[i][1]) {
+                flow_pressed[i][1] = false;
+                if (flow_pressed[i][0]) {
+                    flow_key_list_triggered[i] = true;
+                    flow_triggered = true;
+                    pass = false;
+                } else if ((flow_state[i] == flow_down_unused)
+                        || (flow_state[i] == flow_down_used)) {
+                    flow_key_list_triggered[i] = true;
+                    flow_triggered = true;
+                    pass = false;
+                }
+            }
+        }
+    }
+
+    for (uint8_t i = 0; i < FLOW_COUNT; i++) {
+        if (flow_key_list_triggered[i]) {
+            if (flow_key_list_pressed[i]) {
+                if (flow_state[i] == flow_up_unqueued) {
+                    register_code(flow_config[i][1]);
+                }
+                flow_timeout_wait_timers_value[i] = timer_read();
+                flow_state[i] = flow_down_unused;
+            } else {
+                // Trigger keyup
+                switch (flow_state[i]) {
+                case flow_down_unused:
+                    if (!flow_pressed[i][1]) {
+                        if (timer_elapsed(flow_timeout_wait_timers_value[i]) > g_flow_oneshot_wait_term) {
+                            flow_state[i] = flow_up_unqueued;
+                            unregister_code(flow_config[i][1]);
+                        } else {
+                            // If we didn't use the mod while trigger was held, queue it.
+                            flow_state[i] = flow_up_queued;
+                            flow_timeout_timers_active[i] = true;
+                            flow_timeout_timers_value[i] = timer_read();
+                        }
+                    }
+                    break;
+                case flow_down_used:
+                    // If we did use the mod while trigger was held, unregister it.
+                    if (!flow_pressed[i][1]) {
+                        flow_state[i] = flow_up_unqueued;
+                        unregister_code(flow_config[i][1]);
+                    }
+                    break;
+                default:
+                    break;
+                }
+            }
+        } else if (!flow_triggered) {
+            if (pressed) {
+                if (!is_flow_ignored_key(keycode)) {
+                    switch (flow_state[i]) {
+                    case flow_up_queued:
+                        flow_state[i] = flow_up_queued_used;
+                        flow_timeout_timers_active[i] = false;
+                        break;
+                    case flow_up_queued_used:
+                        flow_state[i] = flow_up_unqueued;
+                        unregister_code(flow_config[i][1]);
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            } else {
+                if (!is_flow_ignored_key(keycode)) {
+                    // On non-ignored keyup, consider the oneshot used.
+                    switch (flow_state[i]) {
+                    case flow_down_unused:
+                        flow_state[i] = flow_down_used;
+                        break;
+                    case flow_up_queued:
+                        flow_state[i] = flow_up_unqueued;
+                        unregister_code(flow_config[i][1]);
+                        break;
+                    case flow_up_queued_used:
+                        flow_state[i] = flow_up_unqueued;
+                        unregister_code(flow_config[i][1]);
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return pass;
+}
+
+void change_pressed_status(uint16_t keycode, bool pressed) {
+    for (int i = 0; i < FLOW_COUNT; i++) {
+        if (flow_config[i][0] == keycode) {
+            flow_pressed[i][0] = pressed;
+        }
+    }
+}
+
+bool update_flow_layers(
+    uint16_t keycode,
+    bool pressed,
+    keypos_t key_position
+) {
+    uint8_t key_layer = read_source_layers_cache(key_position);
+    bool pass = true;
+
+    for (int i = 0; i < FLOW_LAYERS_COUNT; i++) {
+        uint16_t trigger = flow_layers_config[i][0];
+        uint16_t layer = flow_layers_config[i][1];
+
+        if (keycode == trigger) {
+            if (pressed) {
+                // Trigger keydown
+                if (flow_layers_state[i] == flow_up_unqueued) {
+                    layer_on(layer);
+                    change_pressed_status(trigger, true);
+                }
+                flow_layer_timeout_wait_timers_value[i] = timer_read();
+                flow_layers_state[i] = flow_down_unused;
+                pass = false;
+            } else {
+                // Trigger keyup
+                switch (flow_layers_state[i]) {
+                case flow_down_unused:
+                    if (timer_elapsed(flow_layer_timeout_wait_timers_value[i]) > g_flow_oneshot_wait_term) {
+                        flow_layers_state[i] = flow_up_unqueued;
+                        layer_off(layer);
+                        change_pressed_status(trigger, false);
+                        pass = false;
+                    } else {
+                        // If we didn't use the layer while trigger was held, queue it.
+                        flow_layers_state[i] = flow_up_queued;
+                        flow_layer_timeout_timers_active[i] = true;
+                        flow_layer_timeout_timers_value[i] = timer_read();
+                        pass = false;
+                        change_pressed_status(trigger, true);
+                    }
+                    break;
+                case flow_down_used:
+                    // If we did use the layer while trigger was held, turn off it.
+                    flow_layers_state[i] = flow_up_unqueued;
+                    layer_off(layer);
+                    change_pressed_status(trigger, false);
+                    pass = false;
+                    break;
+                default:
+                    break;
+                }
+            }
+        } else {
+            if (pressed) {
+                if (key_layer == layer) {
+                    // On non-ignored keyup, consider the oneshot used.
+                    switch (flow_layers_state[i]) {
+                    case flow_down_unused:
+                        flow_layers_state[i] = flow_down_used;
+                        break;
+                    case flow_up_queued:
+                        flow_layers_state[i] = flow_up_queued_used;
+                        flow_layer_timeout_timers_active[i] = false;
+                        break;
+                   case flow_up_queued_used:
+                        flow_layers_state[i] = flow_up_unqueued;
+                        layer_off(layer);
+                        change_pressed_status(trigger, false);
+                        pass = false;
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            } else {
+                // Ignore key ups from other layers
+                if (key_layer == layer) {
+                    // On non-ignored keyup, consider the oneshot used.
+                    switch (flow_layers_state[i]) {
+                    case flow_up_queued:
+                        flow_layers_state[i] = flow_up_unqueued;
+                        layer_off(layer);
+                        change_pressed_status(trigger, false);
+                        break;
+                    case flow_up_queued_used:
+                        flow_layers_state[i] = flow_up_unqueued;
+                        layer_off(layer);
+                        change_pressed_status(trigger, false);
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return pass;
+}
+
+bool update_flow(
+    uint16_t keycode,
+    bool pressed,
+    keypos_t key_position
+) {
+    bool pass = update_flow_mods(keycode, pressed);
+    pass = update_flow_layers(keycode, pressed, key_position) & pass;
+    return pass;
+}
+
+void flow_matrix_scan(void) {
+    for (int i = 0; i < FLOW_COUNT; i++) {
+        if (flow_timeout_timers_active[i]
+                && timer_elapsed(flow_timeout_timers_value[i]) > g_flow_oneshot_term) {
+            flow_timeout_timers_active[i] = false;
+            flow_state[i] = flow_up_unqueued;
+            unregister_code(flow_config[i][1]);
+        }
+    }
+
+    for (int i = 0; i < FLOW_LAYERS_COUNT; i++) {
+        if (flow_layer_timeout_timers_active[i]
+                && timer_elapsed(flow_layer_timeout_timers_value[i]) > g_flow_oneshot_term) {
+            flow_layer_timeout_timers_active[i] = false;
+            flow_layers_state[i] = flow_up_unqueued;
+            layer_off(flow_layers_config[i][1]);
+            change_pressed_status(flow_layers_config[i][0], false);
+        }
+    }
+}
diff --git a/keyboards/a_dux/keymaps/daliusd/flow.h b/keyboards/a_dux/keymaps/daliusd/flow.h
new file mode 100644
index 0000000000..e9ac32c8ed
--- /dev/null
+++ b/keyboards/a_dux/keymaps/daliusd/flow.h
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 Dalius Dobravolskas <dalius.dobravolskas@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+bool update_flow(
+    uint16_t keycode,
+    bool pressed,
+    keypos_t key_position
+);
+
+void flow_matrix_scan(void);
diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c
index aa45d10449..3da9b76057 100644
--- a/keyboards/a_dux/keymaps/daliusd/keymap.c
+++ b/keyboards/a_dux/keymaps/daliusd/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#include "oneshot.h"
+#include "flow.h"
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -25,11 +25,12 @@ enum layers {
     _QWERTY,
     _SYM,
     _NAV,
-    _NUMB,
+    _MISC,
     _TMUX,
     _MOUSE,
-    _MISC,
     _FUNC,
+    _LT_MAC,
+    _LT_LINUX,
 };
 
 enum custom_keycodes {
@@ -41,22 +42,40 @@ enum custom_keycodes {
   TM_SLCT,
   TM_SRCH,
   TM_URL,
-  OS_CTRL,
-  OS_ALT,
-  OS_GUI,
-  OS_TMUX,
   OS_MISC,
+  OS_TMUX,
   OS_FUNC,
+  LT_OSLNX,
 };
 
 // Shortcut to make keymap more readable
 
 #define L_NAV       MO(_NAV)
 #define L_SYM       MO(_SYM)
-#define L_MOUSE     TG(_MOUSE)
+#define L_MOUSE     MO(_MOUSE)
 
 #define K_PRINT     (QK_LCTL | QK_LSFT | QK_LGUI | KC_4)
+#define K_VIDEO     (QK_LSFT | QK_LGUI | KC_5)
 
+// flow_config should correspond to following format:
+// * layer keycode
+// * modifier keycode
+const uint16_t flow_config[FLOW_COUNT][2] = {
+    {L_NAV, KC_LALT},
+    {L_NAV, KC_LGUI},
+    {L_NAV, KC_LCTL},
+    {L_SYM, KC_RCTL},
+    {L_SYM, KC_RGUI},
+    {L_SYM, KC_RALT},
+};
+
+const uint16_t flow_layers_config[FLOW_LAYERS_COUNT][2] = {
+    {OS_MISC, _MISC},
+    {OS_TMUX, _TMUX},
+    {OS_FUNC, _FUNC},
+};
+
+// Unicode characters
 enum unicode_names {
     SNEK,
     EURO,
@@ -96,7 +115,7 @@ const uint32_t PROGMEM unicode_map[] = {
     [LT_S_I] = 0x12f, // į
     [LT_L_I] = 0x12e, // Į
     [LT_S_S] = 0x161, // š
-    [LT_L_S] = 0x160, // Š'
+    [LT_L_S] = 0x160, // Š
     [LT_S_U1] = 0x173, // ų
     [LT_L_U1] = 0x172, // Ų
     [LT_S_U2] = 0x16b, // ū
@@ -110,14 +129,23 @@ const uint32_t PROGMEM unicode_map[] = {
 #define K_SNEK      X(SNEK)
 #define K_EURO      X(EURO)
 #define K_LT_A      XP(LT_S_A, LT_L_A)
+#define K_LT_AU     X(LT_L_A)
 #define K_LT_C      XP(LT_S_C, LT_L_C)
+#define K_LT_CU     X(LT_L_C)
 #define K_LT_E1     XP(LT_S_E1, LT_L_E1)
+#define K_LT_E1U    X(LT_L_E1)
 #define K_LT_E2     XP(LT_S_E2, LT_L_E2)
+#define K_LT_E2U    X(LT_L_E2)
 #define K_LT_I      XP(LT_S_I, LT_L_I)
+#define K_LT_IU     X(LT_L_I)
 #define K_LT_S      XP(LT_S_S, LT_L_S)
+#define K_LT_SU     X(LT_L_S)
 #define K_LT_U1     XP(LT_S_U1, LT_L_U1)
+#define K_LT_U1U    X(LT_L_U1)
 #define K_LT_U2     XP(LT_S_U2, LT_L_U2)
+#define K_LT_U2U    X(LT_L_U2)
 #define K_LT_Z      XP(LT_S_Z, LT_L_Z)
+#define K_LT_ZU     X(LT_L_Z)
 #define K_LT_OB     X(LT_OB)
 #define K_LT_CB     X(LT_CB)
 
@@ -139,35 +167,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
      KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,                          KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_LPRN ,KC_RPRN ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_GRV  ,KC_PLUS ,KC_LBRC ,KC_RBRC ,K_LT_OB ,                          KC_MINS ,OS_ALT  ,OS_CTRL ,OS_GUI  ,KC_PIPE ,
+     XXXXXXX ,KC_GRV  ,KC_LBRC ,KC_RBRC ,KC_PLUS ,                          KC_MINS ,KC_PIPE ,KC_RCTL ,KC_RGUI ,KC_RALT ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     K_SNEK  ,KC_EQL  ,KC_LCBR ,KC_RCBR ,K_LT_CB ,                          KC_UNDS ,KC_QUOT ,KC_DQT  ,K_EURO  ,KC_BSLS ,
+     KC_DEL  ,KC_BSPC ,KC_LCBR ,KC_RCBR ,KC_EQL  ,                          KC_UNDS ,KC_QUOT ,KC_DQT  ,OS_MISC ,KC_BSLS ,
   //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     _______ ,    _______ ,        _______ ,    _______
+                                     _______ ,    _______ ,        _______ ,    XXXXXXX
   //                                └────────┘   └────────┘       └────────┘   └────────┘
   ),
 
   [_NAV] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     KC_TILDE,L_MOUSE ,OS_FUNC ,OS_MISC ,OS_TMUX ,                          K_LT_A  ,K_LT_C  ,K_LT_E1 ,K_LT_E2 ,K_LT_I  ,
+     KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                          KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,OS_GUI  ,OS_CTRL ,OS_ALT  ,KC_ENT  ,                          KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,KC_END  ,
+     KC_LALT ,KC_LGUI ,KC_LCTL ,KC_TAB  ,KC_ENT  ,                          KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,KC_PGUP ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_DELT ,KC_BSPC ,KC_ESC  ,KC_PGDN ,KC_PGUP ,                          KC_HOME ,K_LT_S  ,K_LT_U1 ,K_LT_U2 ,K_LT_Z  ,
+     KC_LSFT ,KC_BSPC ,KC_ESC  ,KC_TILDE,OS_TMUX ,                          OS_FUNC ,L_MOUSE ,KC_COMM ,KC_DOT  ,KC_PGDN ,
   //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     _______ ,    _______ ,        _______ ,    _______
+                                     XXXXXXX ,    _______ ,        _______ ,    _______
   //                                └────────┘   └────────┘       └────────┘   └────────┘
   ),
 
-  [_NUMB] = LAYOUT(
+  [_MISC] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     RESET   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,KC_PSCR ,XXXXXXX ,K_PRINT ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,                          XXXXXXX ,OS_ALT  ,OS_CTRL ,OS_GUI  ,XXXXXXX ,
+     XXXXXXX ,XXXXXXX ,DEBUG   ,LT_OSLNX,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,KC_MNXT ,XXXXXXX ,K_VIDEO ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_DELT ,KC_BSPC ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_VOLD ,KC_VOLU ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     _______ ,    _______ ,        _______ ,    _______
+                                     XXXXXXX ,    XXXXXXX ,        XXXXXXX ,    XXXXXXX
   //                                └────────┘   └────────┘       └────────┘   └────────┘
   ),
 
@@ -185,127 +213,59 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MOUSE] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,L_MOUSE ,KC_MS_U ,KC_BTN3 ,KC_WH_U ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,XXXXXXX ,KC_MS_U ,KC_BTN3 ,KC_WH_U ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,                          XXXXXXX ,KC_LALT ,KC_LCTL ,KC_LGUI ,XXXXXXX ,
+     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,                          XXXXXXX ,XXXXXXX ,KC_RCTL ,KC_RGUI ,KC_RALT ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_ESC  ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     KC_BTN1 ,    KC_BTN2 ,        XXXXXXX ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_MISC] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     QK_BOOT,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,XXXXXXX ,KC_PSCR ,K_PRINT ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,DEBUG   ,XXXXXXX ,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,XXXXXXX ,KC_MNXT ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_VOLD ,KC_VOLU ,XXXXXXX ,XXXXXXX ,UC_MOD  ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     XXXXXXX ,    XXXXXXX ,        XXXXXXX ,    XXXXXXX
+                                     KC_BTN1 ,    KC_BTN2 ,        _______ ,    XXXXXXX
   //                                └────────┘   └────────┘       └────────┘   └────────┘
   ),
 
   [_FUNC] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,
+     KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,
+     KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,                          XXXXXXX ,XXXXXXX ,KC_RCTL ,KC_RGUI ,KC_RALT ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_F11  ,KC_F12  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+     KC_F11  ,KC_F12  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
                                      XXXXXXX ,    XXXXXXX ,        XXXXXXX ,    XXXXXXX
   //                                └────────┘   └────────┘       └────────┘   └────────┘
   ),
+
+  [_LT_MAC] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
+     KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,                          KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_PLUS ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
+     KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                          KC_6    ,KC_7    ,KC_8    ,KC_EQL  ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
+     XXXXXXX ,KC_BSPC ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
+                                     XXXXXXX ,    XXXXXXX ,        _______ ,    XXXXXXX
+  //                                └────────┘   └────────┘       └────────┘   └────────┘
+  ),
+
+  [_LT_LINUX] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
+     K_LT_AU ,K_LT_CU ,K_LT_E1U,K_LT_E2U,K_LT_IU ,                          K_LT_SU ,K_LT_U1U,K_LT_U2U,K_LT_ZU ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
+     K_LT_A  ,K_LT_C  ,K_LT_E1 ,K_LT_E2 ,K_LT_I  ,                          K_LT_S  ,K_LT_U1 ,K_LT_U2 ,K_LT_Z  ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
+     XXXXXXX ,KC_BSPC ,XXXXXXX ,K_SNEK  ,K_LT_OB ,                          K_LT_CB ,K_EURO  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
+                                     XXXXXXX ,    XXXXXXX ,        _______ ,    XXXXXXX
+  //                                └────────┘   └────────┘       └────────┘   └────────┘
+  ),
 };
 
 #define TMUX_PREFIX SS_DOWN(X_LCTL) "b" SS_UP(X_LCTL)
 
-bool is_oneshot_cancel_key(uint16_t keycode) {
-    switch (keycode) {
-    case L_SYM:
-    case L_NAV:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool is_oneshot_layer_cancel_key(uint16_t keycode) {
-    switch (keycode) {
-    case L_SYM:
-    case L_NAV:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool is_oneshot_ignored_key(uint16_t keycode) {
-    switch (keycode) {
-    case L_SYM:
-    case L_NAV:
-    case OS_CTRL:
-    case OS_ALT:
-    case OS_GUI:
-    case OS_TMUX:
-    case OS_MISC:
-    case KC_LSFT:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool is_oneshot_mod_key(uint16_t keycode) {
-    switch (keycode) {
-    case OS_CTRL:
-    case OS_ALT:
-    case OS_GUI:
-        return true;
-    default:
-        return false;
-    }
-}
-
-oneshot_state os_ctrl_state = os_up_unqueued;
-oneshot_state os_alt_state = os_up_unqueued;
-oneshot_state os_cmd_state = os_up_unqueued;
-oneshot_state os_tmux_state = os_up_unqueued;
-oneshot_state os_misc_state = os_up_unqueued;
-oneshot_state os_func_state = os_up_unqueued;
+bool lt_os_is_linux = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    update_oneshot(
-        &os_ctrl_state, KC_LCTL, OS_CTRL,
-        keycode, record
-    );
-    update_oneshot(
-        &os_alt_state, KC_LALT, OS_ALT,
-        keycode, record
-    );
-    update_oneshot(
-        &os_cmd_state, KC_LGUI, OS_GUI,
-        keycode, record
-    );
-
-    bool handled = true;
-    handled = update_oneshot_layer(
-        &os_tmux_state, _TMUX, OS_TMUX,
-        keycode, record
-    ) & handled;
-
-    handled = update_oneshot_layer(
-        &os_misc_state, _MISC, OS_MISC,
-        keycode, record
-    ) & handled;
-
-    handled = update_oneshot_layer(
-        &os_func_state, _FUNC, OS_FUNC,
-        keycode, record
-    ) & handled;
-    if (!handled) return false;
+    if (!update_flow(keycode, record->event.pressed, record->event.key)) return false;
 
     switch (keycode) {
         case TM_LEFT:
@@ -340,10 +300,35 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (!record->event.pressed) return true;
             SEND_STRING(TMUX_PREFIX SS_LCTL("u"));
             return false;
+        case LT_OSLNX:
+            if (!record->event.pressed) return true;
+            lt_os_is_linux = !lt_os_is_linux;
+            return false;
     }
     return true;
 }
 
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _SYM, _NAV, _NUMB);
+void matrix_scan_user(void) {
+    flow_matrix_scan();
+}
+
+bool lang_layer_on = false;
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    state = update_tri_layer_state(state, _SYM, _NAV, lt_os_is_linux ? _LT_LINUX : _LT_MAC);
+
+    uint8_t hl = get_highest_layer(state);
+    if (hl == _LT_MAC) {
+        if (!lang_layer_on) {
+            tap_code16(LCTL(KC_SPC));
+            lang_layer_on = true;
+        }
+    } else {
+        if (lang_layer_on) {
+            tap_code16(LCTL(KC_SPC));
+            lang_layer_on = false;
+        }
+    }
+
+    return state;
 }
diff --git a/keyboards/a_dux/keymaps/daliusd/oneshot.c b/keyboards/a_dux/keymaps/daliusd/oneshot.c
deleted file mode 100644
index 1e7b4d9650..0000000000
--- a/keyboards/a_dux/keymaps/daliusd/oneshot.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Copyright 2021 @daliusd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "print.h"
-#include "oneshot.h"
-
-void update_oneshot(
-    oneshot_state *state,
-    uint16_t mod,
-    uint16_t trigger,
-    uint16_t keycode,
-    keyrecord_t *record
-) {
-    if (keycode == trigger) {
-        if (record->event.pressed) {
-            // Trigger keydown
-            if (*state == os_up_unqueued) {
-                register_code(mod);
-            }
-            *state = os_down_unused;
-            dprintf("trigger down (on?), mod: %d, ? -> os_down_unused\n", mod);
-        } else {
-            // Trigger keyup
-            switch (*state) {
-            case os_down_unused:
-                // If we didn't use the mod while trigger was held, queue it.
-                *state = os_up_queued;
-                dprintf("trigger up, mod: %d, os_down_unused -> os_up_queued\n", mod);
-                break;
-            case os_down_used:
-                // If we did use the mod while trigger was held, unregister it.
-                *state = os_up_unqueued;
-                unregister_code(mod);
-                dprintf("trigger up (off), mod: %d, os_down_used -> os_up_unqueued\n", mod);
-                break;
-            default:
-                break;
-            }
-        }
-    } else {
-        if (record->event.pressed) {
-            if (is_oneshot_cancel_key(keycode) && *state != os_up_unqueued) {
-                // Cancel oneshot on designated cancel keydown.
-                *state = os_up_unqueued;
-                unregister_code(mod);
-                dprintf("cancel (off), mod: %d, ? -> os_up_unqueued\n", mod);
-            }
-            if (!is_oneshot_ignored_key(keycode)) {
-                switch (*state) {
-                case os_up_queued:
-                    *state = os_up_queued_used;
-                    dprintf("key up (off), mod: %d, os_up_queued -> os_up_queued_used\n", mod);
-                    break;
-                case os_up_queued_used:
-                    *state = os_up_unqueued;
-                    unregister_code(mod);
-                    dprintf("key up (off), mod: %d, os_up_queued_used -> os_up_unqueued\n", mod);
-                    break;
-                default:
-                    break;
-                }
-            }
-        } else {
-            if (!is_oneshot_ignored_key(keycode)) {
-                // On non-ignored keyup, consider the oneshot used.
-                switch (*state) {
-                case os_down_unused:
-                    *state = os_down_used;
-                    dprintf("key up, mod: %d, os_down_unused -> os_down_used\n", mod);
-                    break;
-                case os_up_queued:
-                    *state = os_up_unqueued;
-                    unregister_code(mod);
-                    dprintf("key up (off), mod: %d, os_up_queued -> os_up_unqueued\n", mod);
-                    break;
-                case os_up_queued_used:
-                    *state = os_up_unqueued;
-                    unregister_code(mod);
-                    dprintf("key up (off), mod: %d, os_up_queued_used -> os_up_unqueued\n", mod);
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-    }
-}
-
-bool update_oneshot_layer(
-    oneshot_state *state,
-    uint16_t layer,
-    uint16_t trigger,
-    uint16_t keycode,
-    keyrecord_t *record
-) {
-    if (keycode == trigger) {
-        if (record->event.pressed) {
-            // Trigger keydown
-            if (*state == os_up_unqueued) {
-                layer_on(layer);
-            }
-            *state = os_down_unused;
-            dprintf("trigger down (on?), layer: %d, ? -> os_down_unused\n", layer);
-            return false;
-        } else {
-            // Trigger keyup
-            switch (*state) {
-            case os_down_unused:
-                // If we didn't use the layer while trigger was held, queue it.
-                *state = os_up_queued;
-                dprintf("trigger up, layer: %d, os_down_unused -> os_up_queued\n", layer);
-                return false;
-            case os_down_used:
-                // If we did use the layer while trigger was held, turn off it.
-                *state = os_up_unqueued;
-                layer_off(layer);
-                dprintf("trigger up (off), layer: %d, os_down_used -> os_up_unqueued\n", layer);
-                return false;
-            default:
-                break;
-            }
-        }
-    } else {
-        if (record->event.pressed) {
-            if (is_oneshot_layer_cancel_key(keycode) && *state != os_up_unqueued) {
-                // Cancel oneshot layer on designated cancel keydown.
-                *state = os_up_unqueued;
-                layer_off(layer);
-                dprintf("cancel (off), layer: %d, ? -> os_up_unqueued\n", layer);
-                return false;
-            }
-            uint8_t key_layer = read_source_layers_cache(record->event.key);
-            if (key_layer == layer) {
-                // On non-ignored keyup, consider the oneshot used.
-                switch (*state) {
-                case os_down_unused:
-                    *state = os_down_used;
-                    dprintf("key down, layer: %d, os_down_unused -> os_down_used\n", layer);
-                    return true;
-                case os_up_queued:
-                    if (is_oneshot_mod_key(keycode)) {
-                        *state = os_up_unqueued;
-                        layer_off(layer);
-                        dprintf("key down, layer: %d, os_up_queued -> os_up_unqueued\n", layer);
-                        return false;
-                    } else {
-                        *state = os_up_queued_used;
-                        dprintf("key down, layer: %d, os_up_queued -> os_up_queued_used\n", layer);
-                    }
-                    return true;
-               case os_up_queued_used:
-                    *state = os_up_unqueued;
-                    layer_off(layer);
-                    dprintf("key down (off), layer: %d, os_up_queued_used -> os_up_unqueued\n", layer);
-                    return false;
-                default:
-                    break;
-                }
-            }
-        } else {
-            // Ignore key ups from other layers
-            uint8_t key_layer = read_source_layers_cache(record->event.key);
-            if (key_layer == layer) {
-                // On non-ignored keyup, consider the oneshot used.
-                switch (*state) {
-                case os_up_queued:
-                    *state = os_up_unqueued;
-                    layer_off(layer);
-                    dprintf("key up (off), layer: %d, os_up_queued -> os_up_unqueued\n", layer);
-                    return true;
-                case os_up_queued_used:
-                    *state = os_up_unqueued;
-                    layer_off(layer);
-                    dprintf("key up (off), layer: %d, os_up_queued_used -> os_up_unqueued\n", layer);
-                    return true;
-                default:
-                    break;
-                }
-            }
-        }
-    }
-    return true;
-}
diff --git a/keyboards/a_dux/keymaps/daliusd/oneshot.h b/keyboards/a_dux/keymaps/daliusd/oneshot.h
deleted file mode 100644
index a4ea71b8a7..0000000000
--- a/keyboards/a_dux/keymaps/daliusd/oneshot.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2021 @daliusd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-// Represents the four states a oneshot key can be in
-typedef enum {
-    os_up_unqueued,
-    os_up_queued,
-    os_up_queued_used,
-    os_down_unused,
-    os_down_used,
-} oneshot_state;
-
-// Custom oneshot mod implementation that doesn't rely on timers. If a mod is
-// used while it is held it will be unregistered on keyup as normal, otherwise
-// it will be queued and only released after the next non-mod keyup.
-void update_oneshot(
-    oneshot_state *state,
-    uint16_t mod,
-    uint16_t trigger,
-    uint16_t keycode,
-    keyrecord_t *record
-);
-
-// Oneshot implementation for layers
-bool update_oneshot_layer(
-    oneshot_state *state,
-    uint16_t layer,
-    uint16_t trigger,
-    uint16_t keycode,
-    keyrecord_t *record
-);
-
-// To be implemented by the consumer. Layers one shot implementation needs to
-// know which keys are used as oneshot mods
-bool is_oneshot_mod_key(
-    uint16_t keycode
-);
-
-// To be implemented by the consumer. Defines keys to cancel oneshot mods.
-bool is_oneshot_cancel_key(uint16_t keycode);
-
-// To be implemented by the consumer. Defines keys to cancel oneshot layers.
-bool is_oneshot_layer_cancel_key(uint16_t keycode);
-
-// To be implemented by the consumer. Defines keys to ignore when determining
-// whether a oneshot mod has been used. Setting this to modifiers and layer
-// change keys allows stacking multiple oneshot modifiers, and carrying them
-// between layers.
-bool is_oneshot_ignored_key(uint16_t keycode);
diff --git a/keyboards/a_dux/keymaps/daliusd/readme.md b/keyboards/a_dux/keymaps/daliusd/readme.md
index f6e0efd0e8..fde19ee630 100644
--- a/keyboards/a_dux/keymaps/daliusd/readme.md
+++ b/keyboards/a_dux/keymaps/daliusd/readme.md
@@ -1,21 +1,306 @@
 # My 34 keys layout
 
-This are my principles for layout:
+This is my principles for layout:
 
 * I am using Callum style layout. Here you can read explanation by
   Callum himself and his reasoning for not using mod-tap:
   [here](../../../../users/callum/readme.md)
 
 * There should be only one way to type key. Key can be on
-  different layer but it must maintain its physical location.
+  different layer but it must maintain its physical location. I
+  broke this rule for Shift key only.
 
 * The less features are used the better.
 
-* trilayer is cool.
+* There is simple TMUX layer.
 
-* There is 🐍 key for no reason.
+* Common keys must be accessible using two keys if possible.
 
-As well I have added one shot layers compatible with Callum's one
-shot keys.
+* It should be possible to work with left keyboard side and mouse
+  in right hand without lifting hands for some scenarios (that's
+  why I had to duplicate Shift key).
 
-There is simple TMUX layer as well.
+## Improvements over Callum
+
+* I have added one shot layers compatible with Callum's one shot
+  keys.
+
+* There is one issue with accidental uppercase characters fixed
+  that exists in original Callum layout's implementation.
+
+* Another annoying feature of Callum layer is one shot keys are
+  frozen until you cancel them. This is problem when you use one
+  hand for keyboard and another for mouse. E.g. you click Ctrl and
+  mouse to get some menu (on Mac OS X), and then you want to click
+  some item in that menu. You have to remember to cancel one shot in such
+  situation. I have added two settings two handle situations like
+  this:
+
+  * `FLOW_ONESHOT_WAIT_TERM` - if hold one shot key longer than
+    `FLOW_ONESHOT_WAIT_TERM` ms then mod key / layer key is not
+    treated as one shot key (defaults to 500ms).
+
+  * `FLOW_ONESHOT_TERM` - if you do not click another key in
+  `FLOW_ONESHOT_TERM` ms then one shot key / layer key is treated
+  as normal key. Therefore if you lift it after `FLOW_ONESHOT_TERM`
+  it will not be treated as one shot (defaults to 500ms).
+
+  After adding those two settings I have found out that I don't
+  need one shot cancel key anymore so I have removed it.
+
+Since differences are significant I named this layout `flow`.
+
+## Using flow with your keyboard
+
+Copy `flow.c` and `flow.h` to keyboard folder.
+
+Add following line to `rules.mk`:
+
+```make
+SRC += flow.c
+```
+
+Define following in `config.h` for modifiers and layers:
+
+```c
+#define FLOW_COUNT 7
+#define FLOW_LAYERS_COUNT 3
+```
+
+In your `keymap.c` add and configure like this:
+
+```c
+#include "flow.h"
+
+...
+
+// flow_config should correspond to following format:
+// * layer keycode
+// * modifier keycode
+const uint16_t flow_config[FLOW_COUNT][2] = {
+    {L_NAV, KC_LALT},
+    {L_NAV, KC_LGUI},
+    {L_NAV, KC_LCTL},
+    {L_NAV, KC_LSFT},
+    {L_SYM, KC_LCTL},
+    {L_SYM, KC_LGUI},
+    {L_SYM, KC_LALT},
+};
+
+
+// for layers configuration follow this format:
+// * custom layer key
+// * layer name
+const uint16_t flow_layers_config[FLOW_LAYERS_COUNT][2] = {
+    {OS_TMUX, _TMUX},
+    {OS_MISC, _MISC},
+    {OS_FUNC, _FUNC},
+};
+
+...
+
+// Add following to handle flow
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!update_flow(keycode, record->event.pressed, record->event.key)) return false;
+    return true;
+}
+
+void matrix_scan_user(void) {
+    flow_matrix_scan();
+}
+
+```
+
+## Lithuanian letters
+
+There are at least two ways how to enter Lithuanian letters: to
+use Unicode support from QMK or to switch OS language when
+necessary. Unicode support has some problems:
+
+* it is OS specific (you need to change Unicode input mode based
+  on your OS and I sometimes switch between Mac OS X and Ubuntu).
+  This is minor issue but it is still issue.
+
+* There is bug in Mac OS X and I can't enter `Š` using unicode
+  input method.
+
+* Unicode Hex Input in Mac OS X is not perfect and there are some
+  minor issue while using it.
+
+On Linux Unicode support meanwhile works perfectly.
+
+This leaves us with other option to use OS language switching as
+you most probably have done before. Still there is space for
+improvement. E.g. I have added Lithuanian letters to trilayer and
+trilayer activation toggles OS language (this works because I use
+only two languages). Check `layer_state_set_user` implementation
+for details.
+
+# Rejected ideas
+
+## Mods as combos
+
+Sometimes when I press `NAV (layer key) + S + Tab` to get `Command
++ Tab` I ended up with `S + Nav + Tab`. This happened because I
+did that really fast and sometimes clicked S slightly earlier than
+NAV layer key. Initially I have solved this problem using Combo
+keys, but that's additional dependency and combo keys are not
+ideal for Callum layer. You need to release both keys to trigger
+Combo key release. Therefore I have written custom code that
+allows pressing S some milliseconds earlier. This is controlled by
+FLOW_TERM and defaults to 10. I do not recommend setting this to
+higher than 30.
+
+This idea was rejected because it looks like 10ms did not made
+that big difference.
+
+## Swapper
+
+Idea of swapper is to have key that registers Mode key (e.g.
+Command while layer and some key is pressed) to simulate two key
+combo, e.g. Command + Tab. Overall I found that 3 keys combo that
+I have currently for swapping windows is equally good as 2 keys
+swapper. Another problem with swapper is that it is OS specific.
+Still if you want here is swapper implementation I have used:
+
+```c
+bool active;
+
+void update_swapper(
+    uint16_t trigger,
+    uint16_t keycode,
+    bool pressed
+) {
+    if (keycode == trigger) {
+        if (pressed) {
+            if (!active) {
+                active = true;
+                register_code(KC_LGUI);
+            }
+            register_code(KC_TAB);
+        } else {
+            unregister_code(KC_TAB);
+        }
+    } else if (active && keycode != KC_LSFT && keycode != KC_LEFT && keycode != KC_RIGHT) {
+        unregister_code(KC_LGUI);
+        active = false;
+    }
+}
+```
+
+## Combos
+
+I have seen that some people use two letter horizontal combos for
+some actions, e.g. XC for Command+C, CV for Command+V, JK for ESC
+and etc. I found that this kind of kicks me out of the flow when
+working as it requires different kind of action and I need to
+pause to make that action.
+
+## Comma-space
+
+I have noticed that I put space after comma `,` usually. That
+means I can use comma + letter for something else with backspace,
+e.g. for Lithuanian letters. Performance wise that works OK, but
+practically that does not feel really good. Trilayer with language
+layer switch works better.
+
+Still if you are interested here is comma-space implementation:
+
+```c
+void swap_layout(void) {
+    uint8_t saved_mods = get_mods();
+    clear_mods();
+    tap_code16(LCTL(KC_SPC));
+    set_mods(saved_mods);
+}
+
+void press_with_layout_swap(uint16_t keycode) {
+    tap_code16(KC_BSPC);
+    swap_layout();
+    tap_code16(keycode);
+    swap_layout();
+}
+
+bool comma_pressed = false;
+
+bool update_commaspace(
+    uint16_t keycode,
+    bool pressed
+) {
+    if (keycode == KC_COMM) {
+        if (!(get_mods() & MOD_MASK_SHIFT)) {
+            comma_pressed = true;
+        }
+    } else if (comma_pressed) {
+        if (keycode != KC_LSFT) {
+            comma_pressed = false;
+        }
+
+        switch(keycode) {
+            case KC_Q:
+                if (pressed) {
+                    press_with_layout_swap(KC_1);
+                    return false;
+                }
+                break;
+            case KC_W:
+                if (pressed) {
+                    press_with_layout_swap(KC_2);
+                    return false;
+                }
+                break;
+            case KC_E:
+                if (pressed) {
+                    press_with_layout_swap(KC_3);
+                    return false;
+                }
+                break;
+            case KC_R:
+                if (pressed) {
+                    press_with_layout_swap(KC_4);
+                    return false;
+                }
+                break;
+            case KC_T:
+                if (pressed) {
+                    press_with_layout_swap(KC_5);
+                    return false;
+                }
+                break;
+            case KC_Y:
+                if (pressed) {
+                    press_with_layout_swap(KC_6);
+                    return false;
+                }
+                break;
+            case KC_U:
+                if (pressed) {
+                    press_with_layout_swap(KC_7);
+                    return false;
+                }
+                break;
+            case KC_I:
+                if (pressed) {
+                    press_with_layout_swap(KC_8);
+                    return false;
+                }
+                break;
+            case KC_O:
+                if (pressed) {
+                    press_with_layout_swap(KC_EQL);
+                    return false;
+                }
+                break;
+        }
+    }
+
+    return true;
+};
+```
+
+## Using one shot layers on top layer keys (NAV and SYM)
+
+While this looked promising and fun it was really easy to get lost
+in which layer you actually are. You can still use it as `flow`
+supports this scenario, but I do not recommend it.
diff --git a/keyboards/a_dux/keymaps/daliusd/rules.mk b/keyboards/a_dux/keymaps/daliusd/rules.mk
index 0f203f004c..dda50a4f78 100644
--- a/keyboards/a_dux/keymaps/daliusd/rules.mk
+++ b/keyboards/a_dux/keymaps/daliusd/rules.mk
@@ -2,4 +2,4 @@ UNICODE_ENABLE = no
 UNICODEMAP_ENABLE = yes
 #CONSOLE_ENABLE = yes
 
-SRC += oneshot.c
+SRC += flow.c

From cb960da1f4453b324dc78aee0cab9e61dae363c1 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 25 Oct 2022 07:40:40 -0600
Subject: [PATCH 728/959] Fixup bpiphany/ghost_squid (#18842)

---
 keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
index 220bd0bd19..f53bdd8337 100644
--- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-        KC_CLCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_MD), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
     ),

From 51cc4f804e4befae6cfd6f75c01699dab9b2870b Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 25 Oct 2022 07:41:21 -0600
Subject: [PATCH 729/959] Fixup huytbt/h50 (#18841)

---
 keyboards/huytbt/h50/info.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/huytbt/h50/info.json b/keyboards/huytbt/h50/info.json
index 14326061c9..9e47b768e8 100644
--- a/keyboards/huytbt/h50/info.json
+++ b/keyboards/huytbt/h50/info.json
@@ -1,4 +1,5 @@
 {
+  "manufacturer": "huytbt",
   "keyboard_name": "H50",
   "url": "https://github.com/huytbt/h50-keyboard",
   "maintainer": "huytbt",

From 843680d85b1b153cc8bc71778783c5a78d818c67 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 25 Oct 2022 07:41:54 -0600
Subject: [PATCH 730/959] Fixup controllerwords/mini36 (#18840)

---
 keyboards/controllerworks/mini36/config.h | 28 +----------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h
index ab98e119b7..0903534838 100644
--- a/keyboards/controllerworks/mini36/config.h
+++ b/keyboards/controllerworks/mini36/config.h
@@ -24,7 +24,7 @@
 
 #define WS2812_PIO_USE_PIO1
 #define RGBLED_NUM 48
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_SPLIT \
         { 24, 24 }
 
@@ -36,29 +36,3 @@
 #define I2C_DRIVER I2CD1
 #define I2C1_SCL_PIN GP25
 #define I2C1_SDA_PIN GP24
-
-/* #define EE_HANDS  */
-/* #define MASTER_LEFT */
-/* #define MASTER_RIGHT */
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-/*
- * 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
\ No newline at end of file

From 5d8c8a6f7c2fcb0b104af78ef8cca311b1840c44 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 26 Oct 2022 00:44:25 +1100
Subject: [PATCH 731/959] Fix splitkb/aurora/sweep (#18839)

* Fix splitkb/aurora/sweep

* Add back layout alias
---
 keyboards/splitkb/aurora/sweep/info.json      |  51 ------
 keyboards/splitkb/aurora/sweep/rev1/info.json | 165 +++++++++---------
 2 files changed, 83 insertions(+), 133 deletions(-)

diff --git a/keyboards/splitkb/aurora/sweep/info.json b/keyboards/splitkb/aurora/sweep/info.json
index 12d739e7be..4199fc6c11 100644
--- a/keyboards/splitkb/aurora/sweep/info.json
+++ b/keyboards/splitkb/aurora/sweep/info.json
@@ -3,65 +3,14 @@
     "url": "https://splitkb.com/products/aurora-sweep-pcb-kit",
     "maintainer": "splitkb",
     "usb": {
-        // pid is not defined here as that is
-        // revision-specific due to VIA limitations
         "vid": "0x8D1D",
         "device_version": "1.0.0"
     },
-    // Technically it only uses Pro Micro pins,
-    // but most people buy the Elite-C controller
-    // so we want to use the atmel-dfu bootloader.
     "development_board": "elite_c",
     "split": {
         "enabled": true
     },
     "build": {
         "lto": true
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_split_3x5_2"
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"label": "L01", "x":  0, "y": 0.93},
-                {"label": "L02", "x":  1, "y": 0.31},
-                {"label": "L03", "x":  2, "y": 0},
-                {"label": "L04", "x":  3, "y": 0.28},
-                {"label": "L05", "x":  4, "y": 0.42},
-                {"label": "R05", "x":  7, "y": 0.42},
-                {"label": "R04", "x":  8, "y": 0.28},
-                {"label": "R03", "x":  9, "y": 0},
-                {"label": "R02", "x": 10, "y": 0.31},
-                {"label": "R01", "x": 11, "y": 0.93},
-
-                {"label": "L06", "x":  0, "y": 1.93},
-                {"label": "L07", "x":  1, "y": 1.31},
-                {"label": "L08", "x":  2, "y": 1},
-                {"label": "L09", "x":  3, "y": 1.28},
-                {"label": "L10", "x":  4, "y": 1.42},
-                {"label": "R10", "x":  7, "y": 1.42},
-                {"label": "R09", "x":  8, "y": 1.28},
-                {"label": "R08", "x":  9, "y": 1},
-                {"label": "R07", "x": 10, "y": 1.31},
-                {"label": "R06", "x": 11, "y": 1.93},
-
-                {"label": "L11", "x":  0, "y": 2.93},
-                {"label": "L12", "x":  1, "y": 2.31},
-                {"label": "L13", "x":  2, "y": 2},
-                {"label": "L14", "x":  3, "y": 2.28},
-                {"label": "L15", "x":  4, "y": 2.42},
-                {"label": "R15", "x":  7, "y": 2.42},
-                {"label": "R14", "x":  8, "y": 2.28},
-                {"label": "R13", "x":  9, "y": 2},
-                {"label": "R12", "x": 10, "y": 2.31},
-                {"label": "R11", "x": 11, "y": 2.93},
-
-                {"label": "L16", "x": 3.5, "y": 3.75},
-                {"label": "L17", "x": 4.5, "y": 4},
-                {"label": "R17", "x": 6.5, "y": 4},
-                {"label": "R16", "x": 7.5, "y": 3.75}
-            ]
-        }
     }
 }
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index 16c490ad5f..07b7fa8e60 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -8,48 +8,49 @@
         "bootmagic": true,
         "extrakey": true
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                // Note: `label` is here only for readability,
-                // order must match the parent's definition!
-                {"label": "L01", "matrix": [0, 4]},
-                {"label": "L02", "matrix": [0, 3]},
-                {"label": "L03", "matrix": [0, 2]},
-                {"label": "L04", "matrix": [0, 1]},
-                {"label": "L05", "matrix": [0, 0]},
-                {"label": "R05", "matrix": [4, 0]},
-                {"label": "R04", "matrix": [4, 1]},
-                {"label": "R03", "matrix": [4, 2]},
-                {"label": "R02", "matrix": [4, 3]},
-                {"label": "R01", "matrix": [4, 4]},
+                {"label": "L01", "matrix": [0, 4], "x":  0, "y": 0.93},
+                {"label": "L02", "matrix": [0, 3], "x":  1, "y": 0.31},
+                {"label": "L03", "matrix": [0, 2], "x":  2, "y": 0},
+                {"label": "L04", "matrix": [0, 1], "x":  3, "y": 0.28},
+                {"label": "L05", "matrix": [0, 0], "x":  4, "y": 0.42},
+                {"label": "R05", "matrix": [4, 0], "x":  7, "y": 0.42},
+                {"label": "R04", "matrix": [4, 1], "x":  8, "y": 0.28},
+                {"label": "R03", "matrix": [4, 2], "x":  9, "y": 0},
+                {"label": "R02", "matrix": [4, 3], "x": 10, "y": 0.31},
+                {"label": "R01", "matrix": [4, 4], "x": 11, "y": 0.93},
 
-                {"label": "L06", "matrix": [1, 4]},
-                {"label": "L07", "matrix": [1, 3]},
-                {"label": "L08", "matrix": [1, 2]},
-                {"label": "L09", "matrix": [1, 1]},
-                {"label": "L10", "matrix": [1, 0]},
-                {"label": "R10", "matrix": [5, 0]},
-                {"label": "R09", "matrix": [5, 1]},
-                {"label": "R08", "matrix": [5, 2]},
-                {"label": "R07", "matrix": [5, 3]},
-                {"label": "R06", "matrix": [5, 4]},
+                {"label": "L06", "matrix": [1, 4], "x":  0, "y": 1.93},
+                {"label": "L07", "matrix": [1, 3], "x":  1, "y": 1.31},
+                {"label": "L08", "matrix": [1, 2], "x":  2, "y": 1},
+                {"label": "L09", "matrix": [1, 1], "x":  3, "y": 1.28},
+                {"label": "L10", "matrix": [1, 0], "x":  4, "y": 1.42},
+                {"label": "R10", "matrix": [5, 0], "x":  7, "y": 1.42},
+                {"label": "R09", "matrix": [5, 1], "x":  8, "y": 1.28},
+                {"label": "R08", "matrix": [5, 2], "x":  9, "y": 1},
+                {"label": "R07", "matrix": [5, 3], "x": 10, "y": 1.31},
+                {"label": "R06", "matrix": [5, 4], "x": 11, "y": 1.93},
 
-                {"label": "L11", "matrix": [2, 4]},
-                {"label": "L12", "matrix": [2, 3]},
-                {"label": "L13", "matrix": [2, 2]},
-                {"label": "L14", "matrix": [2, 1]},
-                {"label": "L15", "matrix": [2, 0]},
-                {"label": "R15", "matrix": [6, 0]},
-                {"label": "R14", "matrix": [6, 1]},
-                {"label": "R13", "matrix": [6, 2]},
-                {"label": "R12", "matrix": [6, 3]},
-                {"label": "R11", "matrix": [6, 4]},
+                {"label": "L11", "matrix": [2, 4], "x":  0, "y": 2.93},
+                {"label": "L12", "matrix": [2, 3], "x":  1, "y": 2.31},
+                {"label": "L13", "matrix": [2, 2], "x":  2, "y": 2},
+                {"label": "L14", "matrix": [2, 1], "x":  3, "y": 2.28},
+                {"label": "L15", "matrix": [2, 0], "x":  4, "y": 2.42},
+                {"label": "R15", "matrix": [6, 0], "x":  7, "y": 2.42},
+                {"label": "R14", "matrix": [6, 1], "x":  8, "y": 2.28},
+                {"label": "R13", "matrix": [6, 2], "x":  9, "y": 2},
+                {"label": "R12", "matrix": [6, 3], "x": 10, "y": 2.31},
+                {"label": "R11", "matrix": [6, 4], "x": 11, "y": 2.93},
 
-                {"label": "L16", "matrix": [3, 1]},
-                {"label": "L17", "matrix": [3, 0]},
-                {"label": "R17", "matrix": [7, 0]},
-                {"label": "R16", "matrix": [7, 1]}
+                {"label": "L16", "matrix": [3, 1], "x": 3.5, "y": 3.75},
+                {"label": "L17", "matrix": [3, 0], "x": 4.5, "y": 4},
+                {"label": "R17", "matrix": [7, 0], "x": 6.5, "y": 4},
+                {"label": "R16", "matrix": [7, 1], "x": 7.5, "y": 3.75}
             ]
         }
     },
@@ -104,52 +105,52 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"flags": 2, "x":  71, "y": 15},                   // L RGB1
-            {"flags": 2, "x":  51, "y":  8},                   // L RGB2
-            {"flags": 2, "x":  10, "y": 13},                   // L RGB3
-            {"flags": 2, "x":  10, "y": 42},                   // L RGB4
-            {"flags": 2, "x":  41, "y": 45},                   // L RGB5
-            {"flags": 2, "x":  76, "y": 50},                   // L RGB6
-            {"flags": 4, "matrix": [0, 4], "x":   0, "y": 15}, // L SW01
-            {"flags": 4, "matrix": [0, 3], "x":  20, "y":  5}, // L SW02
-            {"flags": 4, "matrix": [0, 2], "x":  41, "y":  0}, // L SW03
-            {"flags": 4, "matrix": [0, 1], "x":  61, "y":  4}, // L SW04
-            {"flags": 4, "matrix": [0, 0], "x":  81, "y":  7}, // L SW05
-            {"flags": 4, "matrix": [1, 4], "x":   0, "y": 31}, // L SW06
-            {"flags": 4, "matrix": [1, 3], "x":  20, "y": 21}, // L SW07
-            {"flags": 4, "matrix": [1, 2], "x":  41, "y": 16}, // L SW08
-            {"flags": 4, "matrix": [1, 1], "x":  61, "y": 20}, // L SW09
-            {"flags": 4, "matrix": [1, 0], "x":  81, "y": 23}, // L SW10
-            {"flags": 4, "matrix": [2, 4], "x":   0, "y": 47}, // L SW11
-            {"flags": 4, "matrix": [2, 3], "x":  20, "y": 37}, // L SW12
-            {"flags": 4, "matrix": [2, 2], "x":  41, "y": 32}, // L SW13
-            {"flags": 4, "matrix": [2, 1], "x":  61, "y": 36}, // L SW14
-            {"flags": 4, "matrix": [2, 0], "x":  81, "y": 39}, // L SW15
-            {"flags": 4, "matrix": [3, 1], "x":  71, "y": 60}, // L SW16
-            {"flags": 4, "matrix": [3, 0], "x":  92, "y": 64}, // L SW17
-            {"flags": 2, "x": 150, "y": 15},                   // R RGB1
-            {"flags": 2, "x": 190, "y":  8},                   // R RGB2
-            {"flags": 2, "x": 210, "y": 13},                   // R RGB3
-            {"flags": 2, "x": 220, "y": 42},                   // R RGB4
-            {"flags": 2, "x": 183, "y": 45},                   // R RGB5
-            {"flags": 2, "x": 155, "y": 50},                   // R RGB6
-            {"flags": 4, "matrix": [4, 0], "x": 143, "y":  7}, // R SW05
-            {"flags": 4, "matrix": [4, 1], "x": 163, "y":  4}, // R SW04
-            {"flags": 4, "matrix": [4, 2], "x": 183, "y":  0}, // R SW03
-            {"flags": 4, "matrix": [4, 3], "x": 204, "y":  5}, // R SW02
-            {"flags": 4, "matrix": [4, 4], "x": 224, "y": 15}, // R SW01
-            {"flags": 4, "matrix": [5, 0], "x": 143, "y": 23}, // R SW10
-            {"flags": 4, "matrix": [5, 1], "x": 163, "y": 20}, // R SW09
-            {"flags": 4, "matrix": [5, 2], "x": 183, "y": 16}, // R SW08
-            {"flags": 4, "matrix": [5, 3], "x": 204, "y": 21}, // R SW07
-            {"flags": 4, "matrix": [5, 4], "x": 224, "y": 31}, // R SW06
-            {"flags": 4, "matrix": [6, 0], "x": 143, "y": 39}, // R SW15
-            {"flags": 4, "matrix": [6, 1], "x": 163, "y": 36}, // R SW14
-            {"flags": 4, "matrix": [6, 2], "x": 183, "y": 32}, // R SW13
-            {"flags": 4, "matrix": [6, 3], "x": 204, "y": 37}, // R SW12
-            {"flags": 4, "matrix": [6, 4], "x": 224, "y": 47}, // R SW11
-            {"flags": 4, "matrix": [7, 0], "x": 132, "y": 64}, // R SW17
-            {"flags": 4, "matrix": [7, 1], "x": 153, "y": 60}  // R SW16
+            {"flags": 2, "x":  71, "y": 15},
+            {"flags": 2, "x":  51, "y":  8},
+            {"flags": 2, "x":  10, "y": 13},
+            {"flags": 2, "x":  10, "y": 42},
+            {"flags": 2, "x":  41, "y": 45},
+            {"flags": 2, "x":  76, "y": 50},
+            {"flags": 4, "matrix": [0, 4], "x":   0, "y": 15},
+            {"flags": 4, "matrix": [0, 3], "x":  20, "y":  5},
+            {"flags": 4, "matrix": [0, 2], "x":  41, "y":  0},
+            {"flags": 4, "matrix": [0, 1], "x":  61, "y":  4},
+            {"flags": 4, "matrix": [0, 0], "x":  81, "y":  7},
+            {"flags": 4, "matrix": [1, 4], "x":   0, "y": 31},
+            {"flags": 4, "matrix": [1, 3], "x":  20, "y": 21},
+            {"flags": 4, "matrix": [1, 2], "x":  41, "y": 16},
+            {"flags": 4, "matrix": [1, 1], "x":  61, "y": 20},
+            {"flags": 4, "matrix": [1, 0], "x":  81, "y": 23},
+            {"flags": 4, "matrix": [2, 4], "x":   0, "y": 47},
+            {"flags": 4, "matrix": [2, 3], "x":  20, "y": 37},
+            {"flags": 4, "matrix": [2, 2], "x":  41, "y": 32},
+            {"flags": 4, "matrix": [2, 1], "x":  61, "y": 36},
+            {"flags": 4, "matrix": [2, 0], "x":  81, "y": 39},
+            {"flags": 4, "matrix": [3, 1], "x":  71, "y": 60},
+            {"flags": 4, "matrix": [3, 0], "x":  92, "y": 64},
+            {"flags": 2, "x": 150, "y": 15},
+            {"flags": 2, "x": 190, "y":  8},
+            {"flags": 2, "x": 210, "y": 13},
+            {"flags": 2, "x": 220, "y": 42},
+            {"flags": 2, "x": 183, "y": 45},
+            {"flags": 2, "x": 155, "y": 50},
+            {"flags": 4, "matrix": [4, 0], "x": 143, "y":  7},
+            {"flags": 4, "matrix": [4, 1], "x": 163, "y":  4},
+            {"flags": 4, "matrix": [4, 2], "x": 183, "y":  0},
+            {"flags": 4, "matrix": [4, 3], "x": 204, "y":  5},
+            {"flags": 4, "matrix": [4, 4], "x": 224, "y": 15},
+            {"flags": 4, "matrix": [5, 0], "x": 143, "y": 23},
+            {"flags": 4, "matrix": [5, 1], "x": 163, "y": 20},
+            {"flags": 4, "matrix": [5, 2], "x": 183, "y": 16},
+            {"flags": 4, "matrix": [5, 3], "x": 204, "y": 21},
+            {"flags": 4, "matrix": [5, 4], "x": 224, "y": 31},
+            {"flags": 4, "matrix": [6, 0], "x": 143, "y": 39},
+            {"flags": 4, "matrix": [6, 1], "x": 163, "y": 36},
+            {"flags": 4, "matrix": [6, 2], "x": 183, "y": 32},
+            {"flags": 4, "matrix": [6, 3], "x": 204, "y": 37},
+            {"flags": 4, "matrix": [6, 4], "x": 224, "y": 47},
+            {"flags": 4, "matrix": [7, 0], "x": 132, "y": 64},
+            {"flags": 4, "matrix": [7, 1], "x": 153, "y": 60}
         ]
     }
 }

From 1d34f380eb2717169c59fb4eb59bb1824a1f7187 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 26 Oct 2022 00:45:57 +1100
Subject: [PATCH 732/959] Deprecate `KEY_OVERRIDE_*` keycodes for `KO_*`
 (#18843)

---
 docs/feature_key_overrides.md                  | 14 ++++++--------
 quantum/process_keycode/process_key_override.c |  6 +++---
 quantum/quantum_keycodes.h                     | 11 ++++++++---
 quantum/quantum_keycodes_legacy.h              |  4 ++++
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/docs/feature_key_overrides.md b/docs/feature_key_overrides.md
index 2417fcf594..36fd383cd4 100644
--- a/docs/feature_key_overrides.md
+++ b/docs/feature_key_overrides.md
@@ -150,15 +150,13 @@ const key_override_t fn_override = {.trigger_mods          = MOD_BIT(KC_RGUI) |
                                    .enabled                = NULL};
 ```
 
-## Keycodes 
+## Keycodes
 
-You can enable, disable and toggle all key overrides on the fly.
-
-|Keycode   |Description                      |Function Equivalent|
-|----------|---------------------------------|--------|
-|`KEY_OVERRIDE_ON`  |Turns on Key Override feature           | `key_override_on(void)`|
-|`KEY_OVERRIDE_OFF` |Turns off Key Override feature          |`key_override_off(void)`|
-|`KEY_OVERRIDE_TOGGLE` |Toggles Key Override feature on and off |`key_override_toggle(void)`|
+|Keycode                 |Aliases  |Description           |
+|------------------------|---------|----------------------|
+|`QK_KEY_OVERRIDE_TOGGLE`|`KO_TOGG`|Toggle key overrides  |
+|`QK_KEY_OVERRIDE_ON`    |`KO_ON`  |Turn on key overrides |
+|`QK_KEY_OVERRIDE_OFF`   |`KO_OFF` |Turn off key overrides|
 
 ## Reference for `key_override_t`
 
diff --git a/quantum/process_keycode/process_key_override.c b/quantum/process_keycode/process_key_override.c
index ad9683d106..9c5abccd4f 100644
--- a/quantum/process_keycode/process_key_override.c
+++ b/quantum/process_keycode/process_key_override.c
@@ -406,15 +406,15 @@ bool process_key_override(const uint16_t keycode, const keyrecord_t *const recor
 
     if (key_down) {
         switch (keycode) {
-            case KEY_OVERRIDE_TOGGLE:
+            case QK_KEY_OVERRIDE_TOGGLE:
                 key_override_toggle();
                 return false;
 
-            case KEY_OVERRIDE_ON:
+            case QK_KEY_OVERRIDE_ON:
                 key_override_on();
                 return false;
 
-            case KEY_OVERRIDE_OFF:
+            case QK_KEY_OVERRIDE_OFF:
                 key_override_off();
                 return false;
 
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 7bd270cfd5..06cc7835ae 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -513,9 +513,9 @@ enum quantum_keycodes {
     RGB_MODE_TWINKLE,
 
     // Key Overrides
-    KEY_OVERRIDE_TOGGLE,
-    KEY_OVERRIDE_ON,
-    KEY_OVERRIDE_OFF,
+    QK_KEY_OVERRIDE_TOGGLE,
+    QK_KEY_OVERRIDE_ON,
+    QK_KEY_OVERRIDE_OFF,
 
     // Additional magic key
     MAGIC_TOGGLE_GUI,
@@ -852,6 +852,11 @@ enum quantum_keycodes {
 // Caps Word
 #define CW_TOGG QK_CAPS_WORD_TOGGLE
 
+// Key Overrides
+#define KO_TOGG QK_KEY_OVERRIDE_TOGGLE
+#define KO_ON QK_KEY_OVERRIDE_ON
+#define KO_OFF QK_KEY_OVERRIDE_OFF
+
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
 #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 40aa0f49a1..858875a58d 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -10,6 +10,10 @@
 #define CAPSWRD QK_CAPS_WORD_TOGGLE
 #define CAPS_WORD QK_CAPS_WORD_TOGGLE
 
+#define KEY_OVERRIDE_TOGGLE QK_KEY_OVERRIDE_TOGGLE
+#define KEY_OVERRIDE_ON QK_KEY_OVERRIDE_ON
+#define KEY_OVERRIDE_OFF QK_KEY_OVERRIDE_OFF
+
 #define PROGRAMMABLE_BUTTON_1 QK_PROGRAMMABLE_BUTTON_1
 #define PROGRAMMABLE_BUTTON_2 QK_PROGRAMMABLE_BUTTON_2
 #define PROGRAMMABLE_BUTTON_3 QK_PROGRAMMABLE_BUTTON_3

From 812001de7fd0926f59fd399550f902ef4ec03ee6 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 26 Oct 2022 03:50:22 +1100
Subject: [PATCH 733/959] Deprecate `ONESHOT_*` keycodes for `QK_ONE_SHOT_*`
 (#18844)

* Deprecate `ONESHOT_*` keycodes for `QK_ONE_SHOT_*`

* Docs
---
 docs/keycodes.md                  | 14 +++++++-------
 quantum/quantum.c                 |  6 +++---
 quantum/quantum_keycodes.h        | 12 ++++++------
 quantum/quantum_keycodes_legacy.h |  4 ++++
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index b541975640..230f88456b 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -736,13 +736,13 @@ See also: [US ANSI Shifted Symbols](keycodes_us_ansi_shifted.md)
 
 See also: [One Shot Keys](one_shot_keys.md)
 
-|Key         |Description                       |
-|------------|----------------------------------|
-|`OSM(mod)`  |Hold `mod` for one keypress       |
-|`OSL(layer)`|Switch to `layer` for one keypress|
-|`OS_ON`     |Turns One Shot keys on            |
-|`OS_OFF`    |Turns One Shot keys off           |
-|`OS_TOGG`   |Toggles One Shot keys status      |
+|Key                 |Aliases  |Description                       |
+|--------------------|---------|----------------------------------|
+|`OSM(mod)`          |         |Hold `mod` for one keypress       |
+|`OSL(layer)`        |         |Switch to `layer` for one keypress|
+|`QK_ONE_SHOT_TOGGLE`|`OS_TOGG`|Toggles One Shot keys status      |
+|`QK_ONE_SHOT_ON`    |`OS_ON`  |Turns One Shot keys on            |
+|`QK_ONE_SHOT_OFF`   |`OS_OFF` |Turns One Shot keys off           |
 
 ## Programmable Button Support :id=programmable-button
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 2c55f45e3b..2333357be1 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -395,13 +395,13 @@ bool process_record_quantum(keyrecord_t *record) {
                 return false;
 #endif
 #ifndef NO_ACTION_ONESHOT
-            case ONESHOT_TOGGLE:
+            case QK_ONE_SHOT_TOGGLE:
                 oneshot_toggle();
                 break;
-            case ONESHOT_ENABLE:
+            case QK_ONE_SHOT_ON:
                 oneshot_enable();
                 break;
-            case ONESHOT_DISABLE:
+            case QK_ONE_SHOT_OFF:
                 oneshot_disable();
                 break;
 #endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 06cc7835ae..8689b913ed 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -505,9 +505,9 @@ enum quantum_keycodes {
 #define SQ_T(n) (n < SEQUENCER_TRACKS ? SEQUENCER_TRACK_MIN + n : KC_NO)
 
     // One Shot
-    ONESHOT_ENABLE,
-    ONESHOT_DISABLE,
-    ONESHOT_TOGGLE,
+    QK_ONE_SHOT_ON,
+    QK_ONE_SHOT_OFF,
+    QK_ONE_SHOT_TOGGLE,
 
     // RGB underglow/matrix (continued)
     RGB_MODE_TWINKLE,
@@ -923,9 +923,9 @@ enum quantum_keycodes {
 #define QK_JOYSTICK_BUTTON_MAX QK_JOYSTICK_BUTTON_31
 
 // One Shot aliases
-#define OS_TOGG ONESHOT_TOGGLE
-#define OS_ON ONESHOT_ENABLE
-#define OS_OFF ONESHOT_DISABLE
+#define OS_TOGG QK_ONE_SHOT_TOGGLE
+#define OS_ON QK_ONE_SHOT_ON
+#define OS_OFF QK_ONE_SHOT_OFF
 
 // Programmable Button aliases
 #define PB_1 QK_PROGRAMMABLE_BUTTON_1
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 858875a58d..f53b8ef72a 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -14,6 +14,10 @@
 #define KEY_OVERRIDE_ON QK_KEY_OVERRIDE_ON
 #define KEY_OVERRIDE_OFF QK_KEY_OVERRIDE_OFF
 
+#define ONESHOT_ENABLE QK_ONE_SHOT_ON
+#define ONESHOT_DISABLE QK_ONE_SHOT_OFF
+#define ONESHOT_TOGGLE QK_ONE_SHOT_TOGGLE
+
 #define PROGRAMMABLE_BUTTON_1 QK_PROGRAMMABLE_BUTTON_1
 #define PROGRAMMABLE_BUTTON_2 QK_PROGRAMMABLE_BUTTON_2
 #define PROGRAMMABLE_BUTTON_3 QK_PROGRAMMABLE_BUTTON_3

From ec2414c0742277488adf83d26451e07d0e0402de Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 25 Oct 2022 22:59:17 +0100
Subject: [PATCH 734/959] Deprecate `SECURE_*` keycodes for `QK_SECURE_*`
 (#18847)

* Deprecate SECURE_* keycodes for QK_SECURE_*

* Update keycode process

* Update process_secure.c

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/feature_secure.md                   | 12 ++++++------
 quantum/process_keycode/process_secure.c |  8 ++++----
 quantum/quantum_keycodes.h               | 14 ++++++++++----
 quantum/quantum_keycodes_legacy.h        |  5 +++++
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/docs/feature_secure.md b/docs/feature_secure.md
index ee774b05a8..eaa2b601ae 100644
--- a/docs/feature_secure.md
+++ b/docs/feature_secure.md
@@ -26,12 +26,12 @@ SECURE_ENABLE = yes
 
 ## Keycodes
 
-| Key              | Description                                                                    |
-|------------------|--------------------------------------------------------------------------------|
-| `SECURE_LOCK`    | Revert back to a locked state                                                  |
-| `SECURE_UNLOCK`  | Forces unlock without performing a unlock sequence                             |
-| `SECURE_TOGGLE`  | Toggle directly between locked and unlock without performing a unlock sequence |
-| `SECURE_REQUEST` | Request that user perform the unlock sequence                                  |
+| Key                 |Aliases  | Description                                                                    |
+|---------------------|---------|--------------------------------------------------------------------------------|
+| `QK_SECURE_LOCK`    |`SE_LOCK`| Revert back to a locked state                                                  |
+| `QK_SECURE_UNLOCK`  |`SE_UNLK`| Forces unlock without performing a unlock sequence                             |
+| `QK_SECURE_TOGGLE`  |`SE_TOGG`| Toggle directly between locked and unlock without performing a unlock sequence |
+| `QK_SECURE_REQUEST` |`SE_REQ` | Request that user perform the unlock sequence                                  |
 
 ## Configuration
 
diff --git a/quantum/process_keycode/process_secure.c b/quantum/process_keycode/process_secure.c
index 3224104c99..894051fb33 100644
--- a/quantum/process_keycode/process_secure.c
+++ b/quantum/process_keycode/process_secure.c
@@ -23,19 +23,19 @@ bool preprocess_secure(uint16_t keycode, keyrecord_t *record) {
 bool process_secure(uint16_t keycode, keyrecord_t *record) {
 #ifndef SECURE_DISABLE_KEYCODES
     if (!record->event.pressed) {
-        if (keycode == SECURE_LOCK) {
+        if (keycode == QK_SECURE_LOCK) {
             secure_lock();
             return false;
         }
-        if (keycode == SECURE_UNLOCK) {
+        if (keycode == QK_SECURE_UNLOCK) {
             secure_unlock();
             return false;
         }
-        if (keycode == SECURE_TOGGLE) {
+        if (keycode == QK_SECURE_TOGGLE) {
             secure_is_locked() ? secure_unlock() : secure_lock();
             return false;
         }
-        if (keycode == SECURE_REQUEST) {
+        if (keycode == QK_SECURE_REQUEST) {
             secure_request_unlock();
             return false;
         }
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 8689b913ed..c5b9342b17 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -598,10 +598,10 @@ enum quantum_keycodes {
     QK_MAKE,
     QK_REBOOT,
 
-    SECURE_LOCK,
-    SECURE_UNLOCK,
-    SECURE_TOGGLE,
-    SECURE_REQUEST,
+    QK_SECURE_LOCK,
+    QK_SECURE_UNLOCK,
+    QK_SECURE_TOGGLE,
+    QK_SECURE_REQUEST,
 
     QK_CAPS_WORD_TOGGLE,
 
@@ -857,6 +857,12 @@ enum quantum_keycodes {
 #define KO_ON QK_KEY_OVERRIDE_ON
 #define KO_OFF QK_KEY_OVERRIDE_OFF
 
+// Secure
+#define SE_LOCK QK_SECURE_LOCK
+#define SE_UNLK QK_SECURE_UNLOCK
+#define SE_TOGG QK_SECURE_TOGGLE
+#define SE_REQ QK_SECURE_REQUEST
+
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
 #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index f53b8ef72a..652aaaa9a8 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -84,6 +84,11 @@
 #define JS_BUTTON30 QK_JOYSTICK_BUTTON_30
 #define JS_BUTTON31 QK_JOYSTICK_BUTTON_31
 
+#define SECURE_LOCK QK_SECURE_LOCK
+#define SECURE_UNLOCK QK_SECURE_UNLOCK
+#define SECURE_TOGGLE QK_SECURE_TOGGLE
+#define SECURE_REQUEST QK_SECURE_REQUEST
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")

From cd8099539b289c2d990d30be33d47bdb535ee911 Mon Sep 17 00:00:00 2001
From: ziptyze <mwcordier@gmail.com>
Date: Wed, 26 Oct 2022 13:57:11 -0400
Subject: [PATCH 735/959] Addition of pi60_rgb to 1upkeyboards (#18633)

---
 keyboards/1upkeyboards/pi60_rgb/config.h      |  73 ++++++++
 keyboards/1upkeyboards/pi60_rgb/info.json     | 170 ++++++++++++++++++
 .../pi60_rgb/keymaps/default/keymap.c         |  36 ++++
 .../pi60_rgb/keymaps/via/keymap.c             | 100 +++++++++++
 .../pi60_rgb/keymaps/via/rules.mk             |   2 +
 keyboards/1upkeyboards/pi60_rgb/readme.md     |  23 +++
 keyboards/1upkeyboards/pi60_rgb/rules.mk      |   1 +
 7 files changed, 405 insertions(+)
 create mode 100644 keyboards/1upkeyboards/pi60_rgb/config.h
 create mode 100644 keyboards/1upkeyboards/pi60_rgb/info.json
 create mode 100644 keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c
 create mode 100644 keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c
 create mode 100644 keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk
 create mode 100644 keyboards/1upkeyboards/pi60_rgb/readme.md
 create mode 100644 keyboards/1upkeyboards/pi60_rgb/rules.mk

diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
new file mode 100644
index 0000000000..19eb8d71a7
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/config.h
@@ -0,0 +1,73 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define RGB_DI_PIN GP19
+#define DRIVER_LED_TOTAL 61
+#define RGBLED_NUM 61
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGBLIGHT_LIMIT_VAL 125
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
new file mode 100644
index 0000000000..0659e5b2f9
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -0,0 +1,170 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "pi60_rgb",
+    "maintainer": "ziptyze",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5602",
+        "vid": "0x6F75"
+    },
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "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
+    },
+    "matrix_pins": {
+        "cols": ["GP3", "GP4", "GP5", "GP20", "GP18", "GP13", "GP17", "GP16", "GP15", "GP12", "GP11", "GP14", "GP10", "GP9"],
+        "rows": ["GP1", "GP2", "GP8", "GP6", "GP0", "GP21"]
+    },
+    "mouse_key": {
+        "enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 1, "matrix": [5, 5], "x": 103, "y": 58 },
+            { "flags": 1, "matrix": [5, 10], "x": 159, "y": 58 },
+            { "flags": 1, "matrix": [5, 11], "x": 178, "y": 58 },
+            { "flags": 1, "matrix": [5, 12], "x": 196, "y": 58 },
+            { "flags": 1, "matrix": [5, 13], "x": 215, "y": 58 },
+            { "flags": 1, "matrix": [3, 13], "x": 204, "y": 45 },
+            { "flags": 4, "matrix": [3, 10], "x": 176, "y": 45 },
+            { "flags": 4, "matrix": [3, 9], "x": 161, "y": 45 },
+            { "flags": 4, "matrix": [3, 8], "x": 146, "y": 45 },
+            { "flags": 4, "matrix": [3, 7], "x": 131, "y": 45 },
+            { "flags": 4, "matrix": [3, 6], "x": 116, "y": 45 },
+            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 45 },
+            { "flags": 4, "matrix": [3, 4], "x": 86, "y": 45 },
+            { "flags": 4, "matrix": [3, 3], "x": 71, "y": 45 },
+            { "flags": 4, "matrix": [3, 2], "x": 56, "y": 45 },
+            { "flags": 4, "matrix": [3, 1], "x": 41, "y": 45 },
+            { "flags": 1, "matrix": [4, 2], "x": 47, "y": 58 },
+            { "flags": 1, "matrix": [4, 1], "x": 28, "y": 58 },
+            { "flags": 1, "matrix": [4, 0], "x": 10, "y": 58 },
+            { "flags": 1, "matrix": [3, 0], "x": 17, "y": 45 },
+            { "flags": 1, "matrix": [2, 0], "x": 13, "y": 32 },
+            { "flags": 4, "matrix": [2, 1], "x": 34, "y": 32 },
+            { "flags": 4, "matrix": [2, 2], "x": 49, "y": 32 },
+            { "flags": 4, "matrix": [2, 3], "x": 64, "y": 32 },
+            { "flags": 4, "matrix": [2, 4], "x": 79, "y": 32 },
+            { "flags": 4, "matrix": [2, 5], "x": 94, "y": 32 },
+            { "flags": 4, "matrix": [2, 6], "x": 109, "y": 32 },
+            { "flags": 4, "matrix": [2, 7], "x": 124, "y": 32 },
+            { "flags": 4, "matrix": [2, 8], "x": 139, "y": 32 },
+            { "flags": 4, "matrix": [2, 9], "x": 153, "y": 32 },
+            { "flags": 4, "matrix": [2, 10], "x": 168, "y": 32 },
+            { "flags": 4, "matrix": [2, 11], "x": 183, "y": 32 },
+            { "flags": 1, "matrix": [2, 13], "x": 208, "y": 32 },
+            { "flags": 1, "matrix": [1, 13], "x": 213, "y": 19 },
+            { "flags": 4, "matrix": [1, 12], "x": 195, "y": 19 },
+            { "flags": 4, "matrix": [1, 11], "x": 180, "y": 19 },
+            { "flags": 4, "matrix": [1, 10], "x": 165, "y": 19 },
+            { "flags": 4, "matrix": [1, 9], "x": 150, "y": 19 },
+            { "flags": 4, "matrix": [1, 8], "x": 135, "y": 19 },
+            { "flags": 4, "matrix": [1, 7], "x": 120, "y": 19 },
+            { "flags": 4, "matrix": [1, 6], "x": 105, "y": 19 },
+            { "flags": 4, "matrix": [1, 5], "x": 90, "y": 19 },
+            { "flags": 4, "matrix": [1, 4], "x": 75, "y": 19 },
+            { "flags": 4, "matrix": [1, 3], "x": 60, "y": 19 },
+            { "flags": 4, "matrix": [1, 2], "x": 45, "y": 19 },
+            { "flags": 4, "matrix": [1, 1], "x": 30, "y": 19 },
+            { "flags": 1, "matrix": [1, 0], "x": 12, "y": 19 },
+            { "flags": 1, "matrix": [0, 0], "x": 8, "y": 7 },
+            { "flags": 4, "matrix": [0, 1], "x": 23, "y": 7 },
+            { "flags": 4, "matrix": [0, 2], "x": 38, "y": 7 },
+            { "flags": 4, "matrix": [0, 3], "x": 53, "y": 7 },
+            { "flags": 4, "matrix": [0, 4], "x": 68, "y": 7 },
+            { "flags": 4, "matrix": [0, 5], "x": 83, "y": 7 },
+            { "flags": 4, "matrix": [0, 6], "x": 98, "y": 7 },
+            { "flags": 4, "matrix": [0, 7], "x": 113, "y": 7 },
+            { "flags": 4, "matrix": [0, 8], "x": 127, "y": 7 },
+            { "flags": 4, "matrix": [0, 9], "x": 142, "y": 7 },
+            { "flags": 4, "matrix": [0, 10], "x": 157, "y": 7 },
+            { "flags": 4, "matrix": [0, 11], "x": 172, "y": 7 },
+            { "flags": 4, "matrix": [0, 12], "x": 187, "y": 7 },
+            { "flags": 1, "matrix": [0, 13], "x": 209, "y": 7 }
+        ]
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                { "label": "Esc",    "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "1",      "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "2",      "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "3",      "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "4",      "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "5",      "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "6",      "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "7",      "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "8",      "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "9",      "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "0",      "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "-",      "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "=",      "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "BS",     "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab",    "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q",      "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W",      "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E",      "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R",      "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T",      "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y",      "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U",      "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I",      "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O",      "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P",      "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "[",      "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "]",      "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|",      "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps",   "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A",      "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S",      "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D",      "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F",      "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G",      "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H",      "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J",      "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K",      "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L",      "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ";",      "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "'",      "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter",  "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z",      "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X",      "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C",      "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V",      "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B",      "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N",      "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M",      "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
+                { "label": ",",      "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ".",      "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "/",      "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "LCtrl",  "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "LGui",   "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "LAlt",   "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space",  "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "RAlt",   "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "RGui",   "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "FN",     "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "RCtrl",  "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..bc8a5ca95e
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_60_ansi(
+         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS, KC_EQL,  KC_BSPC,
+         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
+        KC_LSFT,             KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                               KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4d2e654ad6
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c
@@ -0,0 +1,100 @@
+/* Copyright 2022 ziptyze
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_60_ansi(
+         KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS, KC_EQL,  KC_BSPC,
+         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,             KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                               KC_RALT, KC_RGUI,   MO(1), KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi(
+         KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [3] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [4] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [5] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [6] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [7] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [8] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [9] = LAYOUT_60_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/pi60_rgb/readme.md b/keyboards/1upkeyboards/pi60_rgb/readme.md
new file mode 100644
index 0000000000..0cceb55956
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/readme.md
@@ -0,0 +1,23 @@
+# pi60_rgb
+
+The pi60 RGB is a 60% pcb from 1upkeyboards. This keyboard features an ANSI layout hot swap PCB with per-key in-switch RGB lighting. The controller is a Raspberry Pi rp2040 microcontroller.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+* Hardware Availability: (https://1upkeyboards.com/shop/controllers/1upkeyboards-pi60rgb-60-pcb/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/pi60_rgb:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/pi60_rgb:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Bootloader button**: Hold the button on the back of the PCB and plug in the keyboard
diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk
new file mode 100644
index 0000000000..8e853e0af7
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER = vendor
\ No newline at end of file

From 9dec43a0f2ebfb0af1aea7e43b651cc67fd39a32 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Thu, 27 Oct 2022 00:59:30 +0700
Subject: [PATCH 736/959] Added new keyboard DOIO KB16 (Rev 2) (#18699)

---
 keyboards/doio/kb16/kb16.c                    |  21 +--
 keyboards/doio/kb16/kb16.h                    |  31 +---
 keyboards/doio/kb16/keymaps/bongocat/rules.mk |   9 --
 keyboards/doio/kb16/keymaps/via/rules.mk      |   1 -
 .../bongocat/oled => lib/bongocat}/bongocat.c |   0
 .../bongocat/oled => lib/bongocat}/bongocat.h |   0
 keyboards/doio/kb16/readme.md                 |  25 +--
 keyboards/doio/kb16/{ => rev1}/config.h       |   6 +-
 keyboards/doio/kb16/{ => rev1}/info.json      |  10 +-
 .../kb16/{ => rev1}/keymaps/bongocat/config.h |   0
 .../kb16/{ => rev1}/keymaps/bongocat/keymap.c |  80 +++-------
 .../doio/kb16/rev1/keymaps/bongocat/rules.mk  |  17 ++
 .../doio/kb16/rev1/keymaps/default/keymap.c   | 140 +++++++++++++++++
 .../kb16/{ => rev1}/keymaps/default/rules.mk  |   0
 .../default => rev1/keymaps/via}/keymap.c     |  38 ++---
 keyboards/doio/kb16/rev1/keymaps/via/rules.mk |   4 +
 keyboards/doio/kb16/rev1/readme.md            |  30 ++++
 keyboards/doio/kb16/rev1/rev1.c               |  37 +++++
 keyboards/doio/kb16/rev1/rev1.h               |  46 ++++++
 keyboards/doio/kb16/{ => rev1}/rules.mk       |   4 +-
 keyboards/doio/kb16/rev2/config.h             |  95 +++++++++++
 keyboards/doio/kb16/rev2/halconf.h            |  27 ++++
 keyboards/doio/kb16/rev2/info.json            |  42 +++++
 .../doio/kb16/rev2/keymaps/bongocat/keymap.c  | 148 ++++++++++++++++++
 .../doio/kb16/rev2/keymaps/bongocat/rules.mk  |   9 ++
 .../doio/kb16/rev2/keymaps/default/keymap.c   | 140 +++++++++++++++++
 .../doio/kb16/rev2/keymaps/default/rules.mk   |   2 +
 .../doio/kb16/{ => rev2}/keymaps/via/keymap.c |  78 +++------
 keyboards/doio/kb16/rev2/keymaps/via/rules.mk |   4 +
 keyboards/doio/kb16/rev2/mcuconf.h            |  28 ++++
 keyboards/doio/kb16/rev2/readme.md            |  30 ++++
 keyboards/doio/kb16/rev2/rev2.c               |  37 +++++
 keyboards/doio/kb16/rev2/rev2.h               |  46 ++++++
 keyboards/doio/kb16/rev2/rules.mk             |  43 +++++
 34 files changed, 1010 insertions(+), 218 deletions(-)
 delete mode 100644 keyboards/doio/kb16/keymaps/bongocat/rules.mk
 delete mode 100644 keyboards/doio/kb16/keymaps/via/rules.mk
 rename keyboards/doio/kb16/{keymaps/bongocat/oled => lib/bongocat}/bongocat.c (100%)
 rename keyboards/doio/kb16/{keymaps/bongocat/oled => lib/bongocat}/bongocat.h (100%)
 rename keyboards/doio/kb16/{ => rev1}/config.h (96%)
 rename keyboards/doio/kb16/{ => rev1}/info.json (67%)
 rename keyboards/doio/kb16/{ => rev1}/keymaps/bongocat/config.h (100%)
 rename keyboards/doio/kb16/{ => rev1}/keymaps/bongocat/keymap.c (67%)
 create mode 100644 keyboards/doio/kb16/rev1/keymaps/bongocat/rules.mk
 create mode 100644 keyboards/doio/kb16/rev1/keymaps/default/keymap.c
 rename keyboards/doio/kb16/{ => rev1}/keymaps/default/rules.mk (100%)
 rename keyboards/doio/kb16/{keymaps/default => rev1/keymaps/via}/keymap.c (74%)
 create mode 100644 keyboards/doio/kb16/rev1/keymaps/via/rules.mk
 create mode 100644 keyboards/doio/kb16/rev1/readme.md
 create mode 100644 keyboards/doio/kb16/rev1/rev1.c
 create mode 100644 keyboards/doio/kb16/rev1/rev1.h
 rename keyboards/doio/kb16/{ => rev1}/rules.mk (93%)
 create mode 100644 keyboards/doio/kb16/rev2/config.h
 create mode 100644 keyboards/doio/kb16/rev2/halconf.h
 create mode 100644 keyboards/doio/kb16/rev2/info.json
 create mode 100644 keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
 create mode 100644 keyboards/doio/kb16/rev2/keymaps/bongocat/rules.mk
 create mode 100644 keyboards/doio/kb16/rev2/keymaps/default/keymap.c
 create mode 100644 keyboards/doio/kb16/rev2/keymaps/default/rules.mk
 rename keyboards/doio/kb16/{ => rev2}/keymaps/via/keymap.c (65%)
 create mode 100644 keyboards/doio/kb16/rev2/keymaps/via/rules.mk
 create mode 100644 keyboards/doio/kb16/rev2/mcuconf.h
 create mode 100644 keyboards/doio/kb16/rev2/readme.md
 create mode 100644 keyboards/doio/kb16/rev2/rev2.c
 create mode 100644 keyboards/doio/kb16/rev2/rev2.h
 create mode 100644 keyboards/doio/kb16/rev2/rules.mk

diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index 037f561e97..991848c6d3 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -18,26 +18,7 @@
 #include "kb16.h"
 
 // OLED animation
-#include "lib/logo.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    {  0,      1,      2,      3, NO_LED, NO_LED, NO_LED },
-    {  4,      5,      6,      7, NO_LED, NO_LED, NO_LED },
-    {  8,      9,     10,     11, NO_LED, NO_LED, NO_LED },
-    { 12,     13,     14,     15, NO_LED, NO_LED, NO_LED }
-}, {
-    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
-    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
-    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
-    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
-}, {
-    1, 1, 1, 1,
-    1, 4, 4, 1,
-    1, 4, 4, 1,
-    1, 1, 1, 1,
-} };
-#endif
+#include "./lib/logo.h"
 
 #ifdef OLED_ENABLE
     uint16_t startup_timer; 
diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h
index c4dc7cfed1..4d3a1e3a03 100644
--- a/keyboards/doio/kb16/kb16.h
+++ b/keyboards/doio/kb16/kb16.h
@@ -19,29 +19,8 @@
 
 #include "quantum.h"
 
-#define XXX KC_NO
-
-/*                    06 ◯ 05 16 ◯ 15
- * ┌───┬───┬───┬───┐   ┌───┐    ┌───┐
- * │00 │01 │02 │03 │   │04 │    │14 │
- * ├───┼───┼───┼───┤   └───┘    └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤      26 ◯ 25
- * │20 │21 │22 │23 │       ┌───┐
- * ├───┼───┼───┼───┤       │24 │
- * │30 │31 │32 │33 │       └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K06, K04, K05, \
-    K10, K11, K12, K13, K16, K14, K15, \
-    K20, K21, K22, K23, K26, K24, K25, \
-    K30, K31, K32, K33                 \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { K30, K31, K32, K33, XXX, XXX, XXX }  \
-}
-
+#if defined(KEYBOARD_doio_kb16_rev1)
+    #include "rev1.h"
+#elif defined(KEYBOARD_doio_kb16_rev2)
+    #include "rev2.h"
+#endif
\ No newline at end of file
diff --git a/keyboards/doio/kb16/keymaps/bongocat/rules.mk b/keyboards/doio/kb16/keymaps/bongocat/rules.mk
deleted file mode 100644
index 087a45a944..0000000000
--- a/keyboards/doio/kb16/keymaps/bongocat/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-SRC += oled/bongocat.c
-
-VIA_ENABLE = yes
-
-# Additional thing to reduce compiled size
-GRAVE_ESC_ENABLE = no 
-
-# OLED enabled
-WPM_ENABLE = yes
diff --git a/keyboards/doio/kb16/keymaps/via/rules.mk b/keyboards/doio/kb16/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/doio/kb16/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/doio/kb16/keymaps/bongocat/oled/bongocat.c b/keyboards/doio/kb16/lib/bongocat/bongocat.c
similarity index 100%
rename from keyboards/doio/kb16/keymaps/bongocat/oled/bongocat.c
rename to keyboards/doio/kb16/lib/bongocat/bongocat.c
diff --git a/keyboards/doio/kb16/keymaps/bongocat/oled/bongocat.h b/keyboards/doio/kb16/lib/bongocat/bongocat.h
similarity index 100%
rename from keyboards/doio/kb16/keymaps/bongocat/oled/bongocat.h
rename to keyboards/doio/kb16/lib/bongocat/bongocat.h
diff --git a/keyboards/doio/kb16/readme.md b/keyboards/doio/kb16/readme.md
index 8667da41d5..dd3007ff4f 100644
--- a/keyboards/doio/kb16/readme.md
+++ b/keyboards/doio/kb16/readme.md
@@ -1,26 +1,13 @@
 # KB16-01
 
-![KB16-01](https://i.imgur.com/lpq47ELh.png)
+#### This keyboard have 2 revision, so before you need to write your own firmware code. Please read it carefully, or you could accident bricked your keeb after that.
 
-A macropad that have 16-key keyboard made by DOIO, which controlled by an Atmega32u4 chipset. The keyboard features per-key RGB, 3 encoder and an OLED screen for displaying useful information.
+- **Revision 1**: Using ATMEGA32U4.
 
-* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
-* Hardware Supported: Atmega32u4
+When you try to go bootloader mode, QMK Toolbox will showing this message `Atmel DFU device connected (libusb0): Atmel Corp. ATmega32U4 (03EB:2FF4:0000)`. So please compile Revision 1 and flash after that.
 
-Make example for this keyboard (after setting up your build environment):
+Oh, and one more thing. As for the Bongo Cat on OLED screen, due to small flash size that ATMEGA32U4 support. It need to be disable Mouse key support.
 
-    make doio/kb16/rev1:default
+- **Revision 2**: Using APM32F103CBT6 (clone STM32F103CBT6).
 
-Flashing example for this keyboard:
-
-    make doio/kb16/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 (1! key) and plug in the keyboard
-* **Physical reset button**: Short press the button under Spacebar keycap to enter the Bootloader and flash the firmware
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+When you try to go bootloader mode, QMK Toolbox will showing this message `STM32Duino device connected: LeafLabs Maple 003 (1EAF:0003:0201)`. So please compile Revision 2 and flash after that.
diff --git a/keyboards/doio/kb16/config.h b/keyboards/doio/kb16/rev1/config.h
similarity index 96%
rename from keyboards/doio/kb16/config.h
rename to keyboards/doio/kb16/rev1/config.h
index 911ba9d3d5..5d5068e931 100644
--- a/keyboards/doio/kb16/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -21,11 +21,11 @@
 
 /* key matrix size */
 #define MATRIX_ROWS 4
-#define MATRIX_COLS 7
+#define MATRIX_COLS 5
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D5, D4, D3, D2 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B7, B4, B5 }
+#define MATRIX_COL_PINS { F5, F4, F1, F0, B7 }
 
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
@@ -40,7 +40,7 @@
 #define FORCE_NKRO
 
 /* Use the custom font */
-#define OLED_FONT_H "lib/glcdfont.c"
+#define OLED_FONT_H "./lib/glcdfont.c"
 
 /* Encoder pins */
 #define ENCODERS_PAD_A { F7, C7, D7 }
diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/rev1/info.json
similarity index 67%
rename from keyboards/doio/kb16/info.json
rename to keyboards/doio/kb16/rev1/info.json
index 7cd02bce7b..9bb19482e3 100644
--- a/keyboards/doio/kb16/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -16,27 +16,21 @@
                 {"label":"3#", "x":2, "y":0},
                 {"label":"4$", "x":3, "y":0},
 
-                {"label":"Encoder 1 CCW", "x":4.25, "y":0, "w":0.5},
                 {"label":"Encoder 1", "x":4.75, "y":0},
-                {"label":"Encoder 1 CW", "x":5.75, "y":0, "w":0.5},
 
                 {"label":"5%", "x":0, "y":1},
                 {"label":"6^", "x":1, "y":1},
                 {"label":"7&", "x":2, "y":1},
                 {"label":"8*", "x":3, "y":1},
 
-                {"label":"Encoder 2 CCW", "x":6.25, "y":0, "w":0.5},
-                {"label":"Encoder 2", "x":6.75, "y":0},
-                {"label":"Encoder 2 CW", "x":7.75, "y":0, "w":0.5},
+                {"label":"Encoder 2", "x":6, "y":0},
 
                 {"label":"9(", "x":0, "y":2},
                 {"label":"0)", "x":1, "y":2},
                 {"label":"\u2191", "x":2, "y":2},
                 {"label":"Enter", "x":3, "y":2},
 
-                {"label":"Encoder 3 CCW", "x":5.25, "y":2.5, "w":0.5},
-                {"label":"Encoder 3", "x":5.75, "y":2.5},
-                {"label":"Encoder 3 CW", "x":6.75, "y":2.5, "w":0.5},
+                {"label":"Encoder 3", "x":5.375, "y":2.5},
 
                 {"label":"Fn", "x":0, "y":3},
                 {"label":"\u2190", "x":1, "y":3},
diff --git a/keyboards/doio/kb16/keymaps/bongocat/config.h b/keyboards/doio/kb16/rev1/keymaps/bongocat/config.h
similarity index 100%
rename from keyboards/doio/kb16/keymaps/bongocat/config.h
rename to keyboards/doio/kb16/rev1/keymaps/bongocat/config.h
diff --git a/keyboards/doio/kb16/keymaps/bongocat/keymap.c b/keyboards/doio/kb16/rev1/keymaps/bongocat/keymap.c
similarity index 67%
rename from keyboards/doio/kb16/keymaps/bongocat/keymap.c
rename to keyboards/doio/kb16/rev1/keymaps/bongocat/keymap.c
index b60688a385..bda4731a99 100644
--- a/keyboards/doio/kb16/keymaps/bongocat/keymap.c
+++ b/keyboards/doio/kb16/rev1/keymaps/bongocat/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 // OLED animation
-#include "oled/bongocat.h"
+#include "./lib/bongocat/bongocat.h"
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -55,11 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0         1        2        3         4        5        6      */
+    /*  Row:    0         1        2        3         4      */
     [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPRV, KC_MPLY, KC_MNXT,
-                KC_5,     KC_6,    KC_7,    KC_8,     KC_PGDN, TO(_FN), KC_PGUP,
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_VOLD, KC_MUTE, KC_VOLU,
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
                 MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
@@ -74,11 +74,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN1), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -93,11 +93,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN2), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -112,11 +112,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │Vai│Hud│Vad│      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5          6      */
+    /*  Row:    0        1        2        3        4        */
     [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______, _______,   _______,
-                RGB_SAI, RGB_SAD, _______, _______, _______, TO(_BASE), _______,
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______,   _______,
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
                 _______, RGB_VAI, RGB_HUD, RGB_VAD
             ),
 };
@@ -138,43 +138,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     }
 #endif
 
-#ifdef ENCODER_ENABLE
-
-#define ENCODERS 3
-static uint8_t  encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS]    = {{ 5, 0 }, { 5, 1 }, { 5, 2 }};
-static keypos_t encoder_ccw[ENCODERS]   = {{ 6, 0 }, { 6, 1 }, { 6, 2 }};
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < ENCODERS; ++index) {
-        if (encoder_state[index]) {
-            keyevent_t encoder_event = (keyevent_t) {
-                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
-                .pressed = false,
-                .time = (timer_read() | 1)
-            };
-            encoder_state[index] = 0;
-            action_exec(encoder_event);
-        }
-    }
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = true,
-        .time = (timer_read() | 1)
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_user(void) {
-    encoder_action_unregister();
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-	return false;
-}
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
 #endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/bongocat/rules.mk b/keyboards/doio/kb16/rev1/keymaps/bongocat/rules.mk
new file mode 100644
index 0000000000..78d071eab3
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keymaps/bongocat/rules.mk
@@ -0,0 +1,17 @@
+SRC += ./lib/bongocat/bongocat.c
+
+# Build Options
+#   change yes to no to disable
+#
+MOUSEKEY_ENABLE = no       # Mouse keys
+
+VIA_ENABLE = yes
+
+# Additional thing to reduce compiled size
+GRAVE_ESC_ENABLE = no 
+
+# OLED enabled
+WPM_ENABLE = yes
+
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev1/keymaps/default/keymap.c b/keyboards/doio/kb16/rev1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6ab8294efe
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keymaps/default/keymap.c
@@ -0,0 +1,140 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// OLED animation
+#include "./lib/layer_status/layer_status.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN1,
+    _FN2
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │ 5 │ 6 │ 7 │ 8 │
+       ├───┼───┼───┼───┤
+       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
+       ├───┼───┼───┼───┤      │Mut│
+       │Fn2│ ← │ ↓ │ → │      └───┘
+       └───┴───┴───┴───┘
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │ ! │ @ │ # │ $ │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │ % │ ^ │ & │ * │
+       ├───┼───┼───┼───┤
+       │ ( │ ) │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0         1        2        3         4      */
+    [_BASE] = LAYOUT(
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
+                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │   │   │   │   │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │   │   │   │   │
+       ├───┼───┼───┼───┤
+       │   │   │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4       */
+    [_FN] = LAYOUT(
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │   │   │   │   │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │   │   │   │   │
+       ├───┼───┼───┼───┤
+       │   │   │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4       */
+    [_FN1] = LAYOUT(
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │Spi│Spd│   │   │   │   │ │TO0│
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │Sai│Sad│   │   │
+       ├───┼───┼───┼───┤
+       │Tog│Mod│Hui│   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │Vai│Hud│Vad│      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        */
+    [_FN2] = LAYOUT(
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
+                _______, RGB_VAI, RGB_HUD, RGB_VAD
+            ),
+};
+
+#ifdef OLED_ENABLE
+    bool oled_task_user(void) {
+        render_layer_status();
+
+        return true;
+    }
+#endif
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/doio/kb16/keymaps/default/rules.mk b/keyboards/doio/kb16/rev1/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/doio/kb16/keymaps/default/rules.mk
rename to keyboards/doio/kb16/rev1/keymaps/default/rules.mk
diff --git a/keyboards/doio/kb16/keymaps/default/keymap.c b/keyboards/doio/kb16/rev1/keymaps/via/keymap.c
similarity index 74%
rename from keyboards/doio/kb16/keymaps/default/keymap.c
rename to keyboards/doio/kb16/rev1/keymaps/via/keymap.c
index df72bbe15a..61c582fa1c 100644
--- a/keyboards/doio/kb16/keymaps/default/keymap.c
+++ b/keyboards/doio/kb16/rev1/keymaps/via/keymap.c
@@ -56,11 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0         1        2        3         4        5        6      */
+    /*  Row:    0         1        2        3         4      */
     [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     _______, KC_MPLY, _______,
-                KC_5,     KC_6,    KC_7,    KC_8,     _______, TO(_FN), _______,
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   _______, KC_MUTE, _______,
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
                 MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
@@ -75,11 +75,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN1), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -94,11 +94,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN2), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -113,11 +113,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │Vai│Hud│Vad│      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5          6      */
+    /*  Row:    0        1        2        3        4        */
     [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______, _______,   _______,
-                RGB_SAI, RGB_SAD, _______, _______, _______, TO(_BASE), _______,
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______,   _______,
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
                 _______, RGB_VAI, RGB_HUD, RGB_VAD
             ),
 };
@@ -133,8 +133,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 };
 #endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/via/rules.mk b/keyboards/doio/kb16/rev1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..d76c12896f
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev1/readme.md b/keyboards/doio/kb16/rev1/readme.md
new file mode 100644
index 0000000000..94573f3875
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/readme.md
@@ -0,0 +1,30 @@
+# KB16-01 (Revision 1)
+
+![KB16-01](https://i.imgur.com/lpq47ELh.png)
+
+A macropad that have 16-key keyboard made by DOIO, which controlled by an Atmega32u4 chipset. The keyboard features per-key RGB, 3 encoder and an OLED screen for displaying useful information.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    `make doio/kb16/rev1:default`
+    or with the qmk cli:
+    `qmk compile -kb doio/kb16/rev1 -km default`
+
+Flashing example for this keyboard:
+
+    `make doio/kb16/rev1:default:flash`
+    or with the qmk cli:
+    `qmk flash -kb doio/kb16/rev1 -km default`
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (1! 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/doio/kb16/rev1/rev1.c b/keyboards/doio/kb16/rev1/rev1.c
new file mode 100644
index 0000000000..9c7fc823a6
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/rev1.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev1.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    {  0,      1,      2,      3, NO_LED },
+    {  4,      5,      6,      7, NO_LED },
+    {  8,      9,     10,     11, NO_LED },
+    { 12,     13,     14,     15, NO_LED }
+}, {
+    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
+    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
+    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
+    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
+}, {
+    1, 1, 1, 1,
+    1, 4, 4, 1,
+    1, 4, 4, 1,
+    1, 1, 1, 1,
+} };
+#endif
diff --git a/keyboards/doio/kb16/rev1/rev1.h b/keyboards/doio/kb16/rev1/rev1.h
new file mode 100644
index 0000000000..f1e86fb674
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/rev1.h
@@ -0,0 +1,46 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
+ * │00 │01 │02 │03 │  │04 │ │14 │
+ * ├───┼───┼───┼───┤  └───┘ └───┘
+ * │10 │11 │12 │13 │
+ * ├───┼───┼───┼───┤
+ * │20 │21 │22 │23 │     ┌───┐
+ * ├───┼───┼───┼───┤     │24 │
+ * │30 │31 │32 │33 │     └───┘
+ * └───┴───┴───┴───┘
+ */
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, \
+    K10, K11, K12, K13, K14, \
+    K20, K21, K22, K23, K24, \
+    K30, K31, K32, K33       \
+) { \
+    { K00, K01, K02, K03, K04 }, \
+    { K10, K11, K12, K13, K14 }, \
+    { K20, K21, K22, K23, K24 }, \
+    { K30, K31, K32, K33, XXX }  \
+}
+
diff --git a/keyboards/doio/kb16/rules.mk b/keyboards/doio/kb16/rev1/rules.mk
similarity index 93%
rename from keyboards/doio/kb16/rules.mk
rename to keyboards/doio/kb16/rev1/rules.mk
index b2982c9743..07ca8da9ea 100644
--- a/keyboards/doio/kb16/rules.mk
+++ b/keyboards/doio/kb16/rev1/rules.mk
@@ -1,5 +1,5 @@
-SRC += lib/layer_status/layer_status.c
-SRC += lib/logo.c
+SRC += ./lib/layer_status/layer_status.c
+SRC += ./lib/logo.c
 
 # MCU name
 MCU = atmega32u4
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
new file mode 100644
index 0000000000..d5152f3ec7
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -0,0 +1,95 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 5
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B3, B4, B9, B8 }
+#define MATRIX_COL_PINS { B14, B13, B12, B0, A7 }
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+#ifdef OLED_ENABLE
+    /* Mapping I2C2 for OLED */
+    #define I2C1_SCL_PIN B10
+    #define I2C1_SDA_PIN B11
+    #define I2C_DRIVER I2CD2
+
+    /* Use the custom font */
+    #define OLED_FONT_H "./lib/glcdfont.c"
+#endif
+
+/* Encoder pins */
+#define ENCODERS_PAD_A { B5, A1, A3 }
+#define ENCODERS_PAD_B { B6, A2, A4 }
+
+#ifdef RGB_MATRIX_ENABLE
+    /* RGB Matrix config */
+    #define RGB_DI_PIN A10
+    #define DRIVER_LED_TOTAL 16
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
+    #define RGB_MATRIX_KEYPRESSES
+
+    /* RGB Matrix effect */
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_SAT
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    #define ENABLE_RGB_MATRIX_RAINDROPS
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+    #define ENABLE_RGB_MATRIX_HUE_WAVE
+    #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+    #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+    #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/doio/kb16/rev2/halconf.h b/keyboards/doio/kb16/rev2/halconf.h
new file mode 100644
index 0000000000..dc84fc6b26
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/halconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/doio/kb16/rev2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
new file mode 100644
index 0000000000..9bb19482e3
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -0,0 +1,42 @@
+{
+    "keyboard_name": "KB16-01",
+    "manufacturer": "DOIO",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0xD010",
+        "pid": "0x1601",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"1!", "x":0, "y":0},
+                {"label":"2@", "x":1, "y":0},
+                {"label":"3#", "x":2, "y":0},
+                {"label":"4$", "x":3, "y":0},
+
+                {"label":"Encoder 1", "x":4.75, "y":0},
+
+                {"label":"5%", "x":0, "y":1},
+                {"label":"6^", "x":1, "y":1},
+                {"label":"7&", "x":2, "y":1},
+                {"label":"8*", "x":3, "y":1},
+
+                {"label":"Encoder 2", "x":6, "y":0},
+
+                {"label":"9(", "x":0, "y":2},
+                {"label":"0)", "x":1, "y":2},
+                {"label":"\u2191", "x":2, "y":2},
+                {"label":"Enter", "x":3, "y":2},
+
+                {"label":"Encoder 3", "x":5.375, "y":2.5},
+
+                {"label":"Fn", "x":0, "y":3},
+                {"label":"\u2190", "x":1, "y":3},
+                {"label":"\u2193", "x":2, "y":3},
+                {"label":"\u2192", "x":3, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c b/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
new file mode 100644
index 0000000000..bda4731a99
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
@@ -0,0 +1,148 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// OLED animation
+#include "./lib/bongocat/bongocat.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN1,
+    _FN2
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │ 5 │ 6 │ 7 │ 8 │
+       ├───┼───┼───┼───┤
+       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
+       ├───┼───┼───┼───┤      │Mut│
+       │Fn2│ ← │ ↓ │ → │      └───┘
+       └───┴───┴───┴───┘
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │ ! │ @ │ # │ $ │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │ % │ ^ │ & │ * │
+       ├───┼───┼───┼───┤
+       │ ( │ ) │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0         1        2        3         4      */
+    [_BASE] = LAYOUT(
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
+                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │   │   │   │   │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │   │   │   │   │
+       ├───┼───┼───┼───┤
+       │   │   │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4       */
+    [_FN] = LAYOUT(
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │   │   │   │   │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │   │   │   │   │
+       ├───┼───┼───┼───┤
+       │   │   │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4       */
+    [_FN1] = LAYOUT(
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │Spi│Spd│   │   │   │   │ │TO0│
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │Sai│Sad│   │   │
+       ├───┼───┼───┼───┤
+       │Tog│Mod│Hui│   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │Vai│Hud│Vad│      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        */
+    [_FN2] = LAYOUT(
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
+                _______, RGB_VAI, RGB_HUD, RGB_VAD
+            ),
+};
+
+#ifdef OLED_ENABLE
+    bool oled_task_user(void) {
+        led_t led_usb_state = host_keyboard_led_state();
+
+        render_bongocat();
+        oled_set_cursor(14, 0);                                // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
+        oled_write_P(PSTR("WPM:"), false);
+        oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
+        oled_set_cursor(17, 2);
+        oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+        oled_set_cursor(17, 3);
+        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
+
+        return true;
+    }
+#endif
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/doio/kb16/rev2/keymaps/bongocat/rules.mk b/keyboards/doio/kb16/rev2/keymaps/bongocat/rules.mk
new file mode 100644
index 0000000000..822e06e179
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/keymaps/bongocat/rules.mk
@@ -0,0 +1,9 @@
+SRC += ./lib/bongocat/bongocat.c
+
+VIA_ENABLE = yes
+
+# OLED enabled
+WPM_ENABLE = yes
+
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/keymaps/default/keymap.c b/keyboards/doio/kb16/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6ab8294efe
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/keymaps/default/keymap.c
@@ -0,0 +1,140 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// OLED animation
+#include "./lib/layer_status/layer_status.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN1,
+    _FN2
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │ 5 │ 6 │ 7 │ 8 │
+       ├───┼───┼───┼───┤
+       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
+       ├───┼───┼───┼───┤      │Mut│
+       │Fn2│ ← │ ↓ │ → │      └───┘
+       └───┴───┴───┴───┘
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │ ! │ @ │ # │ $ │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │ % │ ^ │ & │ * │
+       ├───┼───┼───┼───┤
+       │ ( │ ) │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0         1        2        3         4      */
+    [_BASE] = LAYOUT(
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
+                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │   │   │   │   │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │   │   │   │   │
+       ├───┼───┼───┼───┤
+       │   │   │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4       */
+    [_FN] = LAYOUT(
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │   │   │   │   │   │   │ │   │
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │   │   │   │   │
+       ├───┼───┼───┼───┤
+       │   │   │   │   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │   │   │   │      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4       */
+    [_FN1] = LAYOUT(
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______
+            ),
+
+/*
+       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+       │Spi│Spd│   │   │   │   │ │TO0│
+       ├───┼───┼───┼───┤   └───┘ └───┘
+       │Sai│Sad│   │   │
+       ├───┼───┼───┼───┤
+       │Tog│Mod│Hui│   │      ┌───┐
+       ├───┼───┼───┼───┤      │   │
+       │   │Vai│Hud│Vad│      └───┘
+       └───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        */
+    [_FN2] = LAYOUT(
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
+                _______, RGB_VAI, RGB_HUD, RGB_VAD
+            ),
+};
+
+#ifdef OLED_ENABLE
+    bool oled_task_user(void) {
+        render_layer_status();
+
+        return true;
+    }
+#endif
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/doio/kb16/rev2/keymaps/default/rules.mk b/keyboards/doio/kb16/rev2/keymaps/default/rules.mk
new file mode 100644
index 0000000000..00003ba11b
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/keymaps/via/keymap.c b/keyboards/doio/kb16/rev2/keymaps/via/keymap.c
similarity index 65%
rename from keyboards/doio/kb16/keymaps/via/keymap.c
rename to keyboards/doio/kb16/rev2/keymaps/via/keymap.c
index 4f01846eae..61c582fa1c 100644
--- a/keyboards/doio/kb16/keymaps/via/keymap.c
+++ b/keyboards/doio/kb16/rev2/keymaps/via/keymap.c
@@ -56,11 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0         1        2        3         4        5        6      */
+    /*  Row:    0         1        2        3         4      */
     [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPRV, KC_MPLY, KC_MNXT,
-                KC_5,     KC_6,    KC_7,    KC_8,     KC_PGDN, TO(_FN), KC_PGUP,
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_VOLD, KC_MUTE, KC_VOLU,
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
                 MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
@@ -75,11 +75,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN1), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -94,11 +94,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN2), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -113,11 +113,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │Vai│Hud│Vad│      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5          6      */
+    /*  Row:    0        1        2        3        4        */
     [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______, _______,   _______,
-                RGB_SAI, RGB_SAD, _______, _______, _______, TO(_BASE), _______,
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______,   _______,
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
                 _______, RGB_VAI, RGB_HUD, RGB_VAD
             ),
 };
@@ -130,43 +130,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     }
 #endif
 
-#ifdef ENCODER_ENABLE
-
-#define ENCODERS 3
-static uint8_t  encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS]    = {{ 5, 0 }, { 5, 1 }, { 5, 2 }};
-static keypos_t encoder_ccw[ENCODERS]   = {{ 6, 0 }, { 6, 1 }, { 6, 2 }};
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < ENCODERS; ++index) {
-        if (encoder_state[index]) {
-            keyevent_t encoder_event = (keyevent_t) {
-                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
-                .pressed = false,
-                .time = (timer_read() | 1)
-            };
-            encoder_state[index] = 0;
-            action_exec(encoder_event);
-        }
-    }
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = true,
-        .time = (timer_read() | 1)
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_user(void) {
-    encoder_action_unregister();
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-	return false;
-}
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
 #endif
diff --git a/keyboards/doio/kb16/rev2/keymaps/via/rules.mk b/keyboards/doio/kb16/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..d76c12896f
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/mcuconf.h b/keyboards/doio/kb16/rev2/mcuconf.h
new file mode 100644
index 0000000000..a86ca86d0c
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/mcuconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/doio/kb16/rev2/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/doio/kb16/rev2/readme.md b/keyboards/doio/kb16/rev2/readme.md
new file mode 100644
index 0000000000..4692268cc0
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/readme.md
@@ -0,0 +1,30 @@
+# KB16-01 (Revision 2)
+
+![KB16-01](https://i.imgur.com/lpq47ELh.png)
+
+A macropad that have 16-key keyboard made by DOIO, which controlled by an APM32F103CBT6 chipset. The keyboard features per-key RGB, 3 encoder and an OLED screen for displaying useful information.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: APM32F103CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    `make doio/kb16/rev2:default`
+    or with the qmk cli:
+    `qmk compile -kb doio/kb16/rev2 -km default`
+
+Flashing example for this keyboard:
+
+    `make doio/kb16/rev2:default:flash`
+    or with the qmk cli:
+    `qmk flash -kb doio/kb16/rev2 -km default`
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (1! 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/doio/kb16/rev2/rev2.c b/keyboards/doio/kb16/rev2/rev2.c
new file mode 100644
index 0000000000..78637842c5
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/rev2.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    {  0,      1,      2,      3, NO_LED },
+    {  4,      5,      6,      7, NO_LED },
+    {  8,      9,     10,     11, NO_LED },
+    { 12,     13,     14,     15, NO_LED }
+}, {
+    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
+    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
+    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
+    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
+}, {
+    1, 1, 1, 1,
+    1, 4, 4, 1,
+    1, 4, 4, 1,
+    1, 1, 1, 1,
+} };
+#endif
diff --git a/keyboards/doio/kb16/rev2/rev2.h b/keyboards/doio/kb16/rev2/rev2.h
new file mode 100644
index 0000000000..f1e86fb674
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/rev2.h
@@ -0,0 +1,46 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
+ * │00 │01 │02 │03 │  │04 │ │14 │
+ * ├───┼───┼───┼───┤  └───┘ └───┘
+ * │10 │11 │12 │13 │
+ * ├───┼───┼───┼───┤
+ * │20 │21 │22 │23 │     ┌───┐
+ * ├───┼───┼───┼───┤     │24 │
+ * │30 │31 │32 │33 │     └───┘
+ * └───┴───┴───┴───┘
+ */
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, \
+    K10, K11, K12, K13, K14, \
+    K20, K21, K22, K23, K24, \
+    K30, K31, K32, K33       \
+) { \
+    { K00, K01, K02, K03, K04 }, \
+    { K10, K11, K12, K13, K14 }, \
+    { K20, K21, K22, K23, K24 }, \
+    { K30, K31, K32, K33, XXX }  \
+}
+
diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk
new file mode 100644
index 0000000000..7fa9b91da0
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/rules.mk
@@ -0,0 +1,43 @@
+SRC += ./lib/layer_status/layer_status.c
+SRC += ./lib/logo.c
+
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+# Cannot use `BOOTLOADER = stm32duino` due to the need to override
+# `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually.
+OPT_DEFS += -DBOOTLOADER_STM32DUINO
+MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader
+BOARD = STM32_F103_STM32DUINO
+BOOTLOADER_TYPE = stm32duino
+DFU_ARGS = -d 1EAF:0003 -a 2 -R
+DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# OLED enabled
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+
+# RGB Matrix enabled
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+# Encoder enabled
+ENCODER_ENABLE = yes
+
+# Wear-levelling driver
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash

From e485261e53517931d205cb8542446e36e7246f26 Mon Sep 17 00:00:00 2001
From: Markus Korn <markus.korn@gmail.com>
Date: Wed, 26 Oct 2022 21:38:20 +0200
Subject: [PATCH 737/959] [Keymap] gmmk gmmk2 p65: new keymap (#18808)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../gmmk2/p65/ansi/keymaps/thekorn/keymap.c   | 44 +++++++++++++++++++
 .../gmmk2/p65/ansi/keymaps/thekorn/readme.md  |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
 create mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md

diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
new file mode 100644
index 0000000000..69ad291c08
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
@@ -0,0 +1,44 @@
+/* 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(
+  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_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
new file mode 100644
index 0000000000..4f80a5b956
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md
@@ -0,0 +1 @@
+# ANSI GMMKV2 65% Layout

From e59475992e984e3384f48205e2f90855bc4661bf Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Thu, 27 Oct 2022 06:39:17 +1100
Subject: [PATCH 738/959] [Keyboard] Add Binepad BNR1 rotary encoder (#18809)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/binepad/bnr1/info.json              | 29 +++++++++++++++++++
 .../binepad/bnr1/keymaps/default/keymap.c     | 28 ++++++++++++++++++
 .../binepad/bnr1/keymaps/default/rules.mk     |  6 ++++
 keyboards/binepad/bnr1/keymaps/via/config.h   | 11 +++++++
 keyboards/binepad/bnr1/keymaps/via/keymap.c   | 28 ++++++++++++++++++
 keyboards/binepad/bnr1/keymaps/via/rules.mk   |  7 +++++
 keyboards/binepad/bnr1/readme.md              | 23 +++++++++++++++
 keyboards/binepad/bnr1/rules.mk               |  3 ++
 keyboards/binepad/bnr1/v1/info.json           | 14 +++++++++
 keyboards/binepad/bnr1/v1/rules.mk            |  1 +
 10 files changed, 150 insertions(+)
 create mode 100755 keyboards/binepad/bnr1/info.json
 create mode 100644 keyboards/binepad/bnr1/keymaps/default/keymap.c
 create mode 100644 keyboards/binepad/bnr1/keymaps/default/rules.mk
 create mode 100644 keyboards/binepad/bnr1/keymaps/via/config.h
 create mode 100644 keyboards/binepad/bnr1/keymaps/via/keymap.c
 create mode 100644 keyboards/binepad/bnr1/keymaps/via/rules.mk
 create mode 100755 keyboards/binepad/bnr1/readme.md
 create mode 100755 keyboards/binepad/bnr1/rules.mk
 create mode 100644 keyboards/binepad/bnr1/v1/info.json
 create mode 100644 keyboards/binepad/bnr1/v1/rules.mk

diff --git a/keyboards/binepad/bnr1/info.json b/keyboards/binepad/bnr1/info.json
new file mode 100755
index 0000000000..c5f1c05cce
--- /dev/null
+++ b/keyboards/binepad/bnr1/info.json
@@ -0,0 +1,29 @@
+{
+    "manufacturer": "Binepad",
+    "keyboard_name": "BNR1",
+    "maintainer": "Binpad",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
+    },
+    "url": "http://binepad.com",
+    "usb": {
+        "vid": "0x4249",
+        "pid": "0x4231",
+        "device_version": "1.0.0"
+    },
+    "community_layouts": ["ortho_1x1"],
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 2, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/binepad/bnr1/keymaps/default/keymap.c b/keyboards/binepad/bnr1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..974005afaa
--- /dev/null
+++ b/keyboards/binepad/bnr1/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 Binepad (@binpad) */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _L0,
+    _L1
+} keyboard_layers;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = LAYOUT_ortho_1x1(
+        LT(_L1, KC_MUTE)
+    ),
+
+    [_L1] = LAYOUT_ortho_1x1(
+        _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_L0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_L1] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) }
+};
+
+#endif
diff --git a/keyboards/binepad/bnr1/keymaps/default/rules.mk b/keyboards/binepad/bnr1/keymaps/default/rules.mk
new file mode 100644
index 0000000000..7f80bd39c6
--- /dev/null
+++ b/keyboards/binepad/bnr1/keymaps/default/rules.mk
@@ -0,0 +1,6 @@
+# Copyright 2022 Binepad (@binpad)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+LTO_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/binepad/bnr1/keymaps/via/config.h b/keyboards/binepad/bnr1/keymaps/via/config.h
new file mode 100644
index 0000000000..ed7a62296f
--- /dev/null
+++ b/keyboards/binepad/bnr1/keymaps/via/config.h
@@ -0,0 +1,11 @@
+/* Copyright 2022 Binepad (@binpad) */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define TAPPING_TERM 175
+
+#ifdef DYNAMIC_KEYMAP_LAYER_COUNT
+    #undef DYNAMIC_KEYMAP_LAYER_COUNT
+#endif
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/binepad/bnr1/keymaps/via/keymap.c b/keyboards/binepad/bnr1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..974005afaa
--- /dev/null
+++ b/keyboards/binepad/bnr1/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 Binepad (@binpad) */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _L0,
+    _L1
+} keyboard_layers;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = LAYOUT_ortho_1x1(
+        LT(_L1, KC_MUTE)
+    ),
+
+    [_L1] = LAYOUT_ortho_1x1(
+        _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_L0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_L1] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) }
+};
+
+#endif
diff --git a/keyboards/binepad/bnr1/keymaps/via/rules.mk b/keyboards/binepad/bnr1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..746edfaa56
--- /dev/null
+++ b/keyboards/binepad/bnr1/keymaps/via/rules.mk
@@ -0,0 +1,7 @@
+# Copyright 2022 Binepad (@binpad)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+LTO_ENABLE = yes
+VIA_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/binepad/bnr1/readme.md b/keyboards/binepad/bnr1/readme.md
new file mode 100755
index 0000000000..5a8afe2be9
--- /dev/null
+++ b/keyboards/binepad/bnr1/readme.md
@@ -0,0 +1,23 @@
+# BINEPAD BNR1
+
+The BNR1 is a multifunction knob, which can be rotated, pressed, and rotated while pressed.
+
+* Keyboard Maintainer: [Binpad](https://github.com/binepad)
+* Hardware Supported: **BNR1** & **BNR1 R2** *("V1" ft. ATMega32u4 MCU)*
+* Hardware Availability: [Binepad.com](https://www.binepad.com/bnr1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make binepad/bnr1/v1:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the knob while plugging in the keyboard's USB cable
+* **Physical reset button**: Briefly press the button on the underside of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` *(or `RESET`)* if it is available
diff --git a/keyboards/binepad/bnr1/rules.mk b/keyboards/binepad/bnr1/rules.mk
new file mode 100755
index 0000000000..b1b1126ff4
--- /dev/null
+++ b/keyboards/binepad/bnr1/rules.mk
@@ -0,0 +1,3 @@
+# This file intentionally left blank
+
+DEFAULT_FOLDER = binepad/bnr1/v1
diff --git a/keyboards/binepad/bnr1/v1/info.json b/keyboards/binepad/bnr1/v1/info.json
new file mode 100644
index 0000000000..44edbf87d3
--- /dev/null
+++ b/keyboards/binepad/bnr1/v1/info.json
@@ -0,0 +1,14 @@
+{
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["E6"]
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D6", "pin_b": "D7" }
+        ]
+    }
+}
diff --git a/keyboards/binepad/bnr1/v1/rules.mk b/keyboards/binepad/bnr1/v1/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/binepad/bnr1/v1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 99d5b5506ae780ffb522075788e3472b570ed7a4 Mon Sep 17 00:00:00 2001
From: Nostril <hong.aaron.c@gmail.com>
Date: Wed, 26 Oct 2022 12:40:44 -0700
Subject: [PATCH 739/959] [Keymap] Add new IIDX gamepad keymap for Synth Labs
 Solo (#18741)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/synthlabs/solo/config.h             |  2 +-
 .../synthlabs/solo/keymaps/gamepad/readme.md  |  2 +-
 .../synthlabs/solo/keymaps/iidx/keymap.c      | 72 +++++++++++++++++++
 .../synthlabs/solo/keymaps/iidx/readme.md     | 16 +++++
 .../synthlabs/solo/keymaps/iidx/rules.mk      |  3 +
 5 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/synthlabs/solo/keymaps/iidx/keymap.c
 create mode 100644 keyboards/synthlabs/solo/keymaps/iidx/readme.md
 create mode 100644 keyboards/synthlabs/solo/keymaps/iidx/rules.mk

diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h
index 112d12d1ee..e8d9870e46 100644
--- a/keyboards/synthlabs/solo/config.h
+++ b/keyboards/synthlabs/solo/config.h
@@ -53,6 +53,6 @@
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 1
 
-#define JOYSTICK_BUTTON_COUNT 8
+#define JOYSTICK_BUTTON_COUNT 13
 #define JOYSTICK_AXES_COUNT 1
 #define JOYSTICK_AXES_RESOLUTION 16
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/readme.md b/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
index 9930bb61b4..12e0df2cf2 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
@@ -1,3 +1,3 @@
 # Gamepad Synth Labs Solo Layout
 
-This keymap is intended for usage as a IIDX controller. The rotary encoder is mapped as a virtual 1-axis joystick.
+This keymap is intended for usage as a generic gamepad. The rotary encoder is mapped as a virtual 1-axis joystick.
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
new file mode 100644
index 0000000000..f274ba9c06
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
@@ -0,0 +1,72 @@
+// Copyright 2022 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "joystick.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
+        JS_BUTTON8, MO(1), JS_BUTTON7,
+                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6
+    ),
+    [1] = LAYOUT_all(
+                                    JS_BUTTON9,JS_BUTTON0,JS_BUTTON10, _______,JS_BUTTON11,JS_BUTTON1,JS_BUTTON12,
+        _______, _______, _______,
+                                    JS_BUTTON10,JS_BUTTON0,JS_BUTTON9, _______,JS_BUTTON11,JS_BUTTON1,JS_BUTTON12
+    ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+/* The amount of time the encoder has to remain stationary, before unregistering encoder bindings */
+uint16_t encoder_stationary_release_delay_ms = 25;
+
+uint16_t encoder_last_update_time = 0;
+
+enum {
+    CCW_JOYSTICK_BUTTON = 8,
+    CW_JOYSTICK_BUTTON = 7,
+};
+
+enum {
+    CCW_MACRO = SAFE_RANGE,
+    CW_MACRO,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case CCW_MACRO:
+            unregister_joystick_button(CW_JOYSTICK_BUTTON);
+            register_joystick_button(CCW_JOYSTICK_BUTTON);
+            encoder_last_update_time = timer_read(); /* Update the last time that the encoder was detected as rotated */
+            return false;
+        case CW_MACRO:
+            unregister_joystick_button(CCW_JOYSTICK_BUTTON);
+            register_joystick_button(CW_JOYSTICK_BUTTON);
+            encoder_last_update_time = timer_read();  /* Update the last time that the encoder was detected as rotated */
+            return false;
+        default:
+            return true;
+    }
+}
+
+void housekeeping_task_user(void) {
+    uint16_t current_time = timer_read();
+    uint16_t elapsed_time_since_last_update = current_time - encoder_last_update_time;
+
+    /* If an encoder has been stationary for encoder_stationary_release_delay_ms, then unregister the joystick buttons for both directions */
+    if (elapsed_time_since_last_update >= encoder_stationary_release_delay_ms) {
+        unregister_joystick_button(CCW_JOYSTICK_BUTTON);
+        unregister_joystick_button(CW_JOYSTICK_BUTTON);
+    }
+}
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(
+                CCW_MACRO,
+                CW_MACRO
+            ) },
+    [1] =   { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/readme.md b/keyboards/synthlabs/solo/keymaps/iidx/readme.md
new file mode 100644
index 0000000000..f56fa622d3
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/readme.md
@@ -0,0 +1,16 @@
+# IIDX Synth Labs Solo Layout
+
+This keymap is intended for usage as a gamepad for [beatmania IIDX INFINITAS](https://p.eagate.573.jp/game/infinitas/2/index.html).
+
+This keycap follows the default keymapping for the game, shown here:
+
+![Default Keymapping Settings Screen](https://i.imgur.com/Va48FnZ.png)
+
+The face buttons correspond directly to ボタン 1 - ボタン 7
+
+Turning the knob clockwise corresponds to スクラッチ-右回転
+Turning the knob counter-clockwise corresponds to スクラッチ-左回転
+
+While holding down the knob button
+* The bottom row of face buttons corresponds to ボタン E1 - ボタン E4
+* The top-left and top-right face buttons correspond to ボタン 1 and ボタン 2, for adjustment of in-game scroll speed
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/rules.mk b/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
new file mode 100644
index 0000000000..550de16143
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
@@ -0,0 +1,3 @@
+JOYSTICK_ENABLE = yes
+DEBOUNCE_TYPE = sym_eager_pk
+ENCODER_MAP_ENABLE = yes

From 48dc8122e71abd76763109e02295d29644a75b96 Mon Sep 17 00:00:00 2001
From: kopibeng <52724926+kopibeng@users.noreply.github.com>
Date: Thu, 27 Oct 2022 03:41:02 +0800
Subject: [PATCH 740/959] [Keyboard] Update MNK65 (#18743)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/kopibeng/mnk65/config.h             |   8 +-
 keyboards/kopibeng/mnk65/info.json            | 144 +++++++++---------
 .../kopibeng/mnk65/keymaps/default/keymap.c   |  22 ++-
 keyboards/kopibeng/mnk65/keymaps/via/keymap.c |   8 +-
 keyboards/kopibeng/mnk65/mnk65.h              |  38 +++--
 keyboards/kopibeng/mnk65/readme.md            |   6 +-
 6 files changed, 127 insertions(+), 99 deletions(-)

diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
index a5bc7430c8..bdabb4af7e 100644
--- a/keyboards/kopibeng/mnk65/config.h
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -32,10 +32,12 @@
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
 */
-#define MATRIX_ROW_PINS { F0, F1, F4, B7, B3 }
-#define MATRIX_COL_PINS { D0, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
 
-#define LED_CAPS_LOCK_PIN D1
+#define MATRIX_ROW_PINS { B3, D0, F6, F4, F1 }
+#define MATRIX_COL_PINS { B7, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, F5 }
+#define UNUSED_PINS
+
+#define LED_CAPS_LOCK_PIN F0
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/info.json
index 90266e2438..63db590dd3 100644
--- a/keyboards/kopibeng/mnk65/info.json
+++ b/keyboards/kopibeng/mnk65/info.json
@@ -1,89 +1,91 @@
 {
     "keyboard_name": "MNK65",
     "manufacturer": "kopibeng",
-    "url": "https://monokei.co/",
     "maintainer": "kopibeng",
+    "url": "https://monokei.co/",
     "usb": {
         "vid": "0x4B50",
         "pid": "0x0651",
-        "device_version": "0.0.1"
+        "device_version": "1.0.0"
     },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "0,0", "x": 0, "y": 0 },
-                { "label": "0,1", "x": 1, "y": 0 },
-                { "label": "0,2", "x": 2, "y": 0 },
-                { "label": "0,3", "x": 3, "y": 0 },
-                { "label": "0,4", "x": 4, "y": 0 },
-                { "label": "0,5", "x": 5, "y": 0 },
-                { "label": "0,6", "x": 6, "y": 0 },
-                { "label": "0,7", "x": 7, "y": 0 },
-                { "label": "0,8", "x": 8, "y": 0 },
-                { "label": "0,9", "x": 9, "y": 0 },
-                { "label": "0,10", "x": 10, "y": 0 },
-                { "label": "0,11", "x": 11, "y": 0 },
-                { "label": "0,12", "x": 12, "y": 0 },
-                { "label": "1,13", "x": 13, "y": 0 },
-                { "label": "0,13", "x": 14, "y": 0 },
-                { "label": "0,14", "x": 15, "y": 0 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [1, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15, "y": 0 },
 				
-                { "label": "1,0", "w": 1.5, "x": 0, "y": 1 },
-                { "label": "1,1", "x": 1.5, "y": 1 },
-                { "label": "1,2", "x": 2.5, "y": 1 },
-                { "label": "1,3", "x": 3.5, "y": 1 },
-                { "label": "1,4", "x": 4.5, "y": 1 },
-                { "label": "1,5", "x": 5.5, "y": 1 },
-                { "label": "1,6", "x": 6.5, "y": 1 },
-                { "label": "1,7", "x": 7.5, "y": 1 },
-                { "label": "1,8", "x": 8.5, "y": 1 },
-                { "label": "1,9", "x": 9.5, "y": 1 },
-                { "label": "1,10", "x": 10.5, "y": 1 },
-                { "label": "1,11", "x": 11.5, "y": 1 },
-                { "label": "2,12", "x": 12.5, "y": 1 },
-                { "label": "1,12", "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "1,14", "x": 15, "y": 1 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [2, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 12], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [1, 14], "x": 15, "y": 1 },
 				
-                { "label": "2,0", "w": 1.75, "x": 0, "y": 2 },
-                { "label": "2,1", "x": 1.75, "y": 2 },
-                { "label": "2,2", "x": 2.75, "y": 2 },
-                { "label": "2,3", "x": 3.75, "y": 2 },
-                { "label": "2,4", "x": 4.75, "y": 2 },
-                { "label": "2,5", "x": 5.75, "y": 2 },
-                { "label": "2,6", "x": 6.75, "y": 2 },
-                { "label": "2,7", "x": 7.75, "y": 2 },
-                { "label": "2,8", "x": 8.75, "y": 2 },
-                { "label": "2,9", "x": 9.75, "y": 2 },
-                { "label": "2,10", "x": 10.75, "y": 2 },
-                { "label": "2,11", "x": 11.75, "y": 2 },
-                { "label": "2,13", "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "2,14", "x": 15, "y": 2 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [2, 14], "x": 15, "y": 2 },
 				
-                { "label": "3,0", "w": 1.25, "x": 0, "y": 3 },
-                { "label": "3,1", "x": 1.25, "y": 3 },
-                { "label": "3,2", "x": 2.25, "y": 3 },
-                { "label": "3,3", "x": 3.25, "y": 3 },
-                { "label": "3,4", "x": 4.25, "y": 3 },
-                { "label": "3,5", "x": 5.25, "y": 3 },
-                { "label": "3,6", "x": 6.25, "y": 3 },
-                { "label": "3,7", "x": 7.25, "y": 3 },
-                { "label": "3,8", "x": 8.25, "y": 3 },
-                { "label": "3,9", "x": 9.25, "y": 3 },
-                { "label": "3,10", "x": 10.25, "y": 3 },
-                { "label": "3,11", "x": 11.25, "y": 3 },
-                { "label": "3,12", "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "3,13", "x": 14, "y": 3 },
-                { "label": "3,14", "x": 15, "y": 3 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+                { "matrix": [3, 14], "x": 15, "y": 3 },
 				
-                { "label": "4,0", "w": 1.25, "x": 0, "y": 4 },
-                { "label": "4,1", "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "4,2", "w": 1.25, "x": 2.5, "y": 4 },
-                { "label": "4,6", "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "4,10", "w": 1.25, "x": 10, "y": 4 },
-                { "label": "4,11", "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "4,12", "x": 13, "y": 4 },
-                { "label": "4,13", "x": 14, "y": 4 },
-                { "label": "4,14", "x": 15, "y": 4 }
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 12], "x": 13, "y": 4 },
+                { "matrix": [4, 13], "x": 14, "y": 4 },
+                { "matrix": [4, 14], "x": 15, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/kopibeng/mnk65/keymaps/default/keymap.c b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
index 75221584d8..809502ad80 100644
--- a/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
 	),
 
 	// Fn1 Layer
@@ -33,7 +33,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 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 Layer
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 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 Layer
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 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/kopibeng/mnk65/keymaps/via/keymap.c b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
index 3f8d0f5f27..809502ad80 100644
--- a/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
 	),
 
 	// Fn1 Layer
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 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 Layer
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 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 Layer
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 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/kopibeng/mnk65/mnk65.h b/keyboards/kopibeng/mnk65/mnk65.h
index 60a92f1a65..7e1483ba9e 100644
--- a/keyboards/kopibeng/mnk65/mnk65.h
+++ b/keyboards/kopibeng/mnk65/mnk65.h
@@ -23,33 +23,39 @@
 /*
  * 
  *             ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐  ┌───────┐
- *             │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │1D │0D │0E │  │0D     │ Full Backspace
+ *             │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │010│011│012│113│013│014│  │013    │ Full Backspace
  *             ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤  └─┬─────┤
- *             │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │2C │1C   │1E │    │2D   │
+ *             │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │110│111│212│112   │114│    │213  │
  *  2.25u      ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤  ┌─┴─┐   │ ISO
- *  LShift     │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │  │1C │   │
+ *  LShift     │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │210│211│213     │214│  │112│   │
  * ┌────────┐  ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤  └───┴───┘
- * │30      │  │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+ * │30      │  │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │310│311│312   │313│314│
  * └────────┘  ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *             │40  │41  │42  │46                      │4A  │4B  │ │4C │4D │4E │
+ *             │40  │41  │42  │46                      │410 │411 │ │412│413│414│
  *             └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *             ┌────┬────┬────┬────────┬────┬──────────┬────┬────┐
+ *             │40  │41  │42  │44      │46  │48        │410 │411 │ 2.25u-1.25u-2.75u Split
+ *             └────┴────┴────┴────────┴────┴──────────┴────┴────┘
+ *             ┌────┬────┬────┬──────────┬────┬────────┬────┬────┐
+ *             │40  │41  │42  │44        │46  │48      │410 │411 │ 2.75u-1.25u-2.25u Split
+ *             └────┴────┴────┴──────────┴────┴────────┴────┴────┘
  *             ┌─────┬───┬─────┬───────────────────────────┬─────┐
- *             │40   │41 │42   │46                         │4B   │ 7u Tsangan
+ *             │40   │41 │42   │46                         │411  │ 7u Tsangan
  *             └─────┴───┴─────┴───────────────────────────┴─────┘
  *
  */
 
 // LAYOUT_all:
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K2C, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4C, K4D, K4E  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K113, K013, K014, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K212, K112,       K114, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211,       K213,       K214, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312,       K313, K314, \
+    K40, K41, K42,      K44,      K46,      K48,      K410, K411,       K412, K413, K414  \
 ) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \
-    {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E}  \
+    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \
+    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, K114}, \
+    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, K214}, \
+    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, K314}, \
+    {K40, K41, K42, ___, K44, ___, K46, ___, K48, ___, K410, K411, K412, K413, K414}  \
 }
diff --git a/keyboards/kopibeng/mnk65/readme.md b/keyboards/kopibeng/mnk65/readme.md
index f4c07ce6a8..e3eefb6d67 100644
--- a/keyboards/kopibeng/mnk65/readme.md
+++ b/keyboards/kopibeng/mnk65/readme.md
@@ -1,11 +1,11 @@
 # MNK65
 
-![MNK65](https://i.imgur.com/5BzAgPgl.png)
+![MNK65](https://i.imgur.com/YTrMDHjh.jpg)
 
-A QMK-powered, VIA-enabled 65% PCB with support for ANSI/ISO layouts, split Backspace and 6.25U/7U bottom row.
+A QMK-powered, VIA-enabled 65% PCB with support for ANSI/ISO layouts, split Backspace and various bottom row layout configurations.
 
 * Keyboard Maintainer: kopibeng
-* Hardware Supported: MONOKEI - Hiro
+* Hardware Supported: MONOKEI
 * Hardware Availability: https://monokei.co/
 
 Make example for this keyboard (after setting up your build environment):

From 8ea8a4edcb2e33df93bdcfae08b4aeef05d995c6 Mon Sep 17 00:00:00 2001
From: Terlekchi Seityagiya <seityaya@ukr.net>
Date: Wed, 26 Oct 2022 22:41:30 +0300
Subject: [PATCH 741/959] [Keyboard] Kepler 33 (#18771)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/kepler_33/proto/info.json           | 85 +++++++++++++++++++
 .../kepler_33/proto/keymaps/default/keymap.c  | 30 +++++++
 keyboards/kepler_33/proto/readme.md           |  3 +
 keyboards/kepler_33/proto/rules.mk            |  0
 keyboards/kepler_33/readme.md                 | 26 ++++++
 5 files changed, 144 insertions(+)
 create mode 100644 keyboards/kepler_33/proto/info.json
 create mode 100644 keyboards/kepler_33/proto/keymaps/default/keymap.c
 create mode 100644 keyboards/kepler_33/proto/readme.md
 create mode 100644 keyboards/kepler_33/proto/rules.mk
 create mode 100644 keyboards/kepler_33/readme.md

diff --git a/keyboards/kepler_33/proto/info.json b/keyboards/kepler_33/proto/info.json
new file mode 100644
index 0000000000..bcf8405ecd
--- /dev/null
+++ b/keyboards/kepler_33/proto/info.json
@@ -0,0 +1,85 @@
+{
+    "manufacturer": "Yaya-alone-Team",
+    "keyboard_name": "Kepler-33",
+    "maintainer": "Seityaya",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+
+    "processor": "STM32F401",
+    "board": "BLACKPILL_STM32_F401",
+    "url": "https://github.com/seityaya/Kepler-33",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "rows": ["B12", "B13", "B14", "B15"],
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5",  "A6", "A7", "B0", "B1", "B6", "B10", "B9", "B8", "B7"]
+    },
+    "layouts": {
+        "LAYOUT_proto": {
+            "layout": [
+                {"matrix": [0, 0],  "label":"Esc",     "x":0,        "y":0},
+                {"matrix": [0, 1],  "label":"Q",       "x":1,        "y":0},
+                {"matrix": [0, 2],  "label":"W",       "x":2,        "y":0},
+                {"matrix": [0, 3],  "label":"E",       "x":3,        "y":0},
+                {"matrix": [0, 4],  "label":"R",       "x":4,        "y":0},
+                {"matrix": [0, 5],  "label":"T",       "x":5,        "y":0},
+                {"matrix": [0, 6],  "label":"Y",       "x":6,        "y":0},
+                {"matrix": [0, 8],  "label":"U",       "x":7,        "y":0},
+                {"matrix": [0, 9],  "label":"I",       "x":8,        "y":0},
+                {"matrix": [0, 10], "label":"O",       "x":9,        "y":0},
+                {"matrix": [0, 11], "label":"P",       "x":10,       "y":0},
+                {"matrix": [0, 12], "label":"[{",      "x":11,       "y":0},
+                {"matrix": [0, 13], "label":"]}",      "x":12,       "y":0},
+                {"matrix": [0, 14], "label":"Del",     "x":13,       "y":0},
+
+                {"matrix": [1, 0],  "label":"Layer",   "x":0.25,     "y":1},
+                {"matrix": [1, 1],  "label":"A",       "x":1.5,      "y":1},
+                {"matrix": [1, 2],  "label":"S",       "x":2.5,      "y":1},
+                {"matrix": [1, 3],  "label":"D",       "x":3.5,      "y":1},
+                {"matrix": [1, 4],  "label":"F",       "x":4.5,      "y":1},
+                {"matrix": [1, 5],  "label":"G",       "x":5.5,      "y":1},
+                {"matrix": [1, 7],  "label":"H",       "x":6.5,      "y":1},
+                {"matrix": [1, 9],  "label":"J",       "x":7.5,      "y":1},
+                {"matrix": [1, 10], "label":"K",       "x":8.5,      "y":1},
+                {"matrix": [1, 11], "label":"L",       "x":9.5,      "y":1},
+                {"matrix": [1, 12], "label":";:",      "x":10.5,     "y":1},
+                {"matrix": [1, 13], "label":"'\"",     "x":11.5,     "y":1},
+                {"matrix": [1, 14], "label":"Enter",   "x":12.75,    "y":1},
+  
+                {"matrix": [2, 0],  "label":"Shift_L", "x":0.5,       "y":2},
+                {"matrix": [2, 1],  "label":"Z",       "x":2,         "y":2},
+                {"matrix": [2, 2],  "label":"X",       "x":3,         "y":2},
+                {"matrix": [2, 3],  "label":"C",       "x":4,         "y":2},
+                {"matrix": [2, 4],  "label":"V",       "x":5,         "y":2},
+                {"matrix": [2, 6],  "label":"B",       "x":6,         "y":2},
+                {"matrix": [2, 8],  "label":"N",       "x":7,         "y":2},
+                {"matrix": [2, 10], "label":"M",       "x":8,         "y":2},
+                {"matrix": [2, 11], "label":",<",      "x":9,         "y":2},
+                {"matrix": [2, 12], "label":".>",      "x":10,        "y":2},
+                {"matrix": [2, 13], "label":"/?",      "x":11,        "y":2},
+                {"matrix": [2, 14], "label":"BackS",   "x":12.5,      "y":2},
+
+                {"matrix": [3, 0],  "label":"Ctrl_L",  "x":0,         "y":3},
+                {"matrix": [3, 1],  "label":"FN_L",    "x":1.25,      "y":3},
+                {"matrix": [3, 2],  "label":"Alt_L",   "x":2.5,       "y":3},
+                {"matrix": [3, 4],  "label":"Space",   "x":5,         "y":3},
+                {"matrix": [3, 7],  "label":"Space",   "x":6.5,       "y":3},
+                {"matrix": [3, 10], "label":"Menu",    "x":8,         "y":3},
+                {"matrix": [3, 12], "label":"Alt_R",   "x":10.5,      "y":3},
+                {"matrix": [3, 13], "label":"FN_R",    "x":11.75,     "y":3},
+                {"matrix": [3, 14], "label":"Ctrl_R",  "x":13,        "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kepler_33/proto/keymaps/default/keymap.c b/keyboards/kepler_33/proto/keymaps/default/keymap.c
new file mode 100644
index 0000000000..13eec6661d
--- /dev/null
+++ b/keyboards/kepler_33/proto/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2022 Seityaya <seityaya@ukr.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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_proto(
+        KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, 
+		MO(15),    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT, 
+		KC_LSFT,      KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_BSPC, 
+		KC_LCTL, MO(1), KC_LALT,          KC_SPC, KC_SPC, KC_APP,            KC_RALT, MO(2), KC_RCTL
+    )
+};
diff --git a/keyboards/kepler_33/proto/readme.md b/keyboards/kepler_33/proto/readme.md
new file mode 100644
index 0000000000..ad1918ee1d
--- /dev/null
+++ b/keyboards/kepler_33/proto/readme.md
@@ -0,0 +1,3 @@
+# Kepler-33 / proto
+
+True 40% keyboard. So far only a prototype.
\ No newline at end of file
diff --git a/keyboards/kepler_33/proto/rules.mk b/keyboards/kepler_33/proto/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/kepler_33/readme.md b/keyboards/kepler_33/readme.md
new file mode 100644
index 0000000000..edafb26c42
--- /dev/null
+++ b/keyboards/kepler_33/readme.md
@@ -0,0 +1,26 @@
+# Kepler-33
+
+![Kepler-33](https://i.imgur.com/zVvzBrOl.png)
+
+True 40% keyboard. The simple and symmetric.
+
+* Keyboard Maintainer: [Yaya](https://github.com/seityaya)
+* Hardware Supported: Kepler-33/proto, STM32F401
+* Hardware Availability: *[Telegram](https://t.me/seityaya)*
+* Keyboard Layout Editor: [Kepler-33](http://www.keyboard-layout-editor.com/#/gists/a456c2256174a2cfa0b4aea832e78d8e)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kepler_33/proto:default
+
+Flashing example for this keyboard:
+
+    make kepler_33/proto:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 1 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
\ No newline at end of file

From 2a61bfc27d6915877d18a09bc440d462a2051857 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper <ToyKeeper@users.noreply.github.com>
Date: Wed, 26 Oct 2022 13:49:44 -0600
Subject: [PATCH 742/959] add "inertia" mode for mouse keys (#18774)

Co-authored-by: Selene ToyKeeper <git@toykeeper.net>
---
 docs/feature_mouse_keys.md |  34 ++++++++-
 quantum/mousekey.c         | 147 +++++++++++++++++++++++++++++++++++++
 quantum/mousekey.h         |  39 +++++++---
 3 files changed, 208 insertions(+), 12 deletions(-)

diff --git a/docs/feature_mouse_keys.md b/docs/feature_mouse_keys.md
index 8e474c4245..eed4f4f4aa 100644
--- a/docs/feature_mouse_keys.md
+++ b/docs/feature_mouse_keys.md
@@ -48,8 +48,9 @@ Mouse keys supports three different modes to move the cursor:
 * **Kinetic:** Holding movement keys accelerates the cursor with its speed following a quadratic curve until it reaches its maximum speed.
 * **Constant:** Holding movement keys moves the cursor at constant speeds.
 * **Combined:** Holding movement keys accelerates the cursor until it reaches its maximum speed, but holding acceleration and movement keys simultaneously moves the cursor at constant speeds.
+* **Inertia:** Cursor accelerates when key held, and decelerates after key release.  Tracks X and Y velocity separately for more nuanced movements.  Applies to cursor only, not scrolling.
 
-The same principle applies to scrolling.
+The same principle applies to scrolling, in most modes.
 
 Configuration options that are times, intervals or delays are given in milliseconds. Scroll speed is given as multiples of the default scroll step. For example, a scroll speed of 8 means that each scroll action covers 8 times the length of the default scroll step as defined by your operating system or application.
 
@@ -170,6 +171,37 @@ To use combined speed mode, you must at least define `MK_COMBINED` in your keyma
 #define MK_COMBINED
 ```
 
+### Inertia mode
+
+This mode provides smooth motion, like sliding on ice.  The cursor accelerates
+along a quadratic curve while a key is held, then glides to a stop after the
+key is released.  Vertical and horizontal movements are tracked independently,
+so the cursor can move in many directions and make curves.
+
+Cannot be used at the same time as Kinetic mode, Constant mode, or Combined mode.
+
+Recommended settings in your keymap’s `config.h` file:
+
+|Define                      |Default  |Description                                                |
+|----------------------------|---------|-----------------------------------------------------------|
+|`MOUSEKEY_INERTIA`          |undefined|Enable Inertia mode                                        |
+|`MOUSEKEY_DELAY`            |150      |Delay between pressing a movement key and cursor movement  |
+|`MOUSEKEY_INTERVAL`         |16       |Time between cursor movements in milliseconds (16 = 60fps) |
+|`MOUSEKEY_MAX_SPEED`        |32       |Maximum cursor speed at which acceleration stops           |
+|`MOUSEKEY_TIME_TO_MAX`      |32       |Number of frames until maximum cursor speed is reached     |
+|`MOUSEKEY_FRICTION`         |24       |How quickly the cursor stops after releasing a key         |
+|`MOUSEKEY_MOVE_DELTA`       |1        |How much to move on first frame (1 strongly recommended)   |
+
+Tips:
+
+* Set `MOUSEKEY_DELAY` to roughly the same value as your host computer's key repeat delay, in ms.  Recommended values are 100 to 300.
+* Set `MOUSEKEY_INTERVAL` to a value of 1000 / your monitor's FPS.  For 60 FPS, 1000/60 = 16.
+* Set `MOUSEKEY_MAX_SPEED` based on your screen resolution and refresh rate, like Width / FPS.  For example, 1920 pixels / 60 FPS = 32 pixels per frame.
+* Set `MOUSEKEY_TIME_TO_MAX` to a value of approximately FPS / 2, to make it reach full speed in half a second (or so).
+* Set `MOUSEKEY_FRICTION` to something between 1 and 255.  Lower makes the cursor glide longer. Values from 8 to 40 are the most effective.
+* Keep `MOUSEKEY_MOVE_DELTA` at 1.  This allows precise movements before the gliding effect starts.
+* Mouse wheel options are the same as the default accelerated mode, and do not use inertia.
+
 ## Use with PS/2 Mouse and Pointing Device
 
 Mouse keys button state is shared with [PS/2 mouse](feature_ps2_mouse.md) and [pointing device](feature_pointing_device.md) so mouse keys button presses can be used for clicks and drags.
diff --git a/quantum/mousekey.c b/quantum/mousekey.c
index 25a89bdba7..b91db80de6 100644
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -37,6 +37,13 @@ static void           mousekey_debug(void);
 static uint8_t        mousekey_accel        = 0;
 static uint8_t        mousekey_repeat       = 0;
 static uint8_t        mousekey_wheel_repeat = 0;
+#ifdef MOUSEKEY_INERTIA
+static uint8_t mousekey_frame     = 0; // track whether gesture is inactive, first frame, or repeating
+static int8_t  mousekey_x_dir     = 0; // -1 / 0 / 1 = left / neutral / right
+static int8_t  mousekey_y_dir     = 0; // -1 / 0 / 0 = up / neutral / down
+static int8_t  mousekey_x_inertia = 0; // current velocity, limit +/- MOUSEKEY_TIME_TO_MAX
+static int8_t  mousekey_y_inertia = 0; // ...
+#endif
 #ifdef MK_KINETIC_SPEED
 static uint16_t mouse_timer = 0;
 #endif
@@ -76,6 +83,7 @@ uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
 
 #    ifndef MK_COMBINED
 #        ifndef MK_KINETIC_SPEED
+#            ifndef MOUSEKEY_INERTIA
 
 /* Default accelerated mode */
 
@@ -97,6 +105,53 @@ static uint8_t move_unit(void) {
     return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : (unit == 0 ? 1 : unit));
 }
 
+#            else // MOUSEKEY_INERTIA mode
+
+static int8_t move_unit(uint8_t axis) {
+    int16_t unit;
+
+    // handle X or Y axis
+    int8_t inertia, dir;
+    if (axis) {
+        inertia = mousekey_y_inertia;
+        dir     = mousekey_y_dir;
+    } else {
+        inertia = mousekey_x_inertia;
+        dir     = mousekey_x_dir;
+    }
+
+    if (mousekey_frame < 2) { // first frame(s): initial keypress moves one pixel
+        mousekey_frame = 1;
+        unit           = dir * MOUSEKEY_MOVE_DELTA;
+    } else { // acceleration
+        // linear acceleration (is here for reference, but doesn't feel as good during use)
+        // unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed * inertia) / mk_time_to_max;
+
+        // x**2 acceleration (quadratic, more precise for short movements)
+        int16_t percent = (inertia << 8) / mk_time_to_max;
+        percent         = (percent * percent) >> 8;
+        if (inertia < 0) percent = -percent;
+
+        // unit = sign(inertia) + (percent of max speed)
+        if (inertia > 0)
+            unit = 1;
+        else if (inertia < 0)
+            unit = -1;
+        else
+            unit = 0;
+
+        unit = unit + ((mk_max_speed * percent) >> 8);
+    }
+
+    if (unit > MOUSEKEY_MOVE_MAX)
+        unit = MOUSEKEY_MOVE_MAX;
+    else if (unit < -MOUSEKEY_MOVE_MAX)
+        unit = -MOUSEKEY_MOVE_MAX;
+    return unit;
+}
+
+#            endif // end MOUSEKEY_INERTIA mode
+
 static uint8_t wheel_unit(void) {
     uint16_t unit;
     if (mousekey_accel & (1 << 0)) {
@@ -213,6 +268,28 @@ static uint8_t wheel_unit(void) {
 
 #    endif /* #ifndef MK_COMBINED */
 
+#    ifdef MOUSEKEY_INERTIA
+
+static int8_t calc_inertia(int8_t direction, int8_t velocity) {
+    // simulate acceleration and deceleration
+
+    // deceleration
+    if ((direction > -1) && (velocity < 0))
+        velocity = (velocity + 1) * (256 - MOUSEKEY_FRICTION) / 256;
+    else if ((direction < 1) && (velocity > 0))
+        velocity = velocity * (256 - MOUSEKEY_FRICTION) / 256;
+
+    // acceleration
+    if ((direction > 0) && (velocity < mk_time_to_max))
+        velocity++;
+    else if ((direction < 0) && (velocity > -mk_time_to_max))
+        velocity--;
+
+    return velocity;
+}
+
+#    endif
+
 void mousekey_task(void) {
     // report cursor and scroll movement independently
     report_mouse_t tmpmr = mouse_report;
@@ -222,6 +299,32 @@ void mousekey_task(void) {
     mouse_report.v = 0;
     mouse_report.h = 0;
 
+#    ifdef MOUSEKEY_INERTIA
+
+    // if an animation is in progress and it's time for the next frame
+    if ((mousekey_frame) && timer_elapsed(last_timer_c) > ((mousekey_frame > 1) ? mk_interval : mk_delay * 10)) {
+        mousekey_x_inertia = calc_inertia(mousekey_x_dir, mousekey_x_inertia);
+        mousekey_y_inertia = calc_inertia(mousekey_y_dir, mousekey_y_inertia);
+
+        mouse_report.x = move_unit(0);
+        mouse_report.y = move_unit(1);
+
+        // prevent sticky "drift"
+        if ((!mousekey_x_dir) && (!mousekey_x_inertia)) tmpmr.x = 0;
+        if ((!mousekey_y_dir) && (!mousekey_y_inertia)) tmpmr.y = 0;
+
+        if (mousekey_frame < 2) mousekey_frame++;
+    }
+
+    // reset if not moving and no movement keys are held
+    if ((!mousekey_x_dir) && (!mousekey_y_dir) && (!mousekey_x_inertia) && (!mousekey_y_inertia)) {
+        mousekey_frame = 0;
+        tmpmr.x        = 0;
+        tmpmr.y        = 0;
+    }
+
+#    else // default acceleration
+
     if ((tmpmr.x || tmpmr.y) && timer_elapsed(last_timer_c) > (mousekey_repeat ? mk_interval : mk_delay * 10)) {
         if (mousekey_repeat != UINT8_MAX) mousekey_repeat++;
         if (tmpmr.x != 0) mouse_report.x = move_unit() * ((tmpmr.x > 0) ? 1 : -1);
@@ -239,6 +342,9 @@ void mousekey_task(void) {
             }
         }
     }
+
+#    endif // MOUSEKEY_INERTIA or not
+
     if ((tmpmr.v || tmpmr.h) && timer_elapsed(last_timer_w) > (mousekey_wheel_repeat ? mk_wheel_interval : mk_wheel_delay * 10)) {
         if (mousekey_wheel_repeat != UINT8_MAX) mousekey_wheel_repeat++;
         if (tmpmr.v != 0) mouse_report.v = wheel_unit() * ((tmpmr.v > 0) ? 1 : -1);
@@ -260,6 +366,7 @@ void mousekey_task(void) {
     if (has_mouse_report_changed(&mouse_report, &tmpmr) || should_mousekey_report_send(&mouse_report)) {
         mousekey_send();
     }
+    // save the state for later
     memcpy(&mouse_report, &tmpmr, sizeof(tmpmr));
 }
 
@@ -270,6 +377,19 @@ void mousekey_on(uint8_t code) {
     }
 #    endif /* #ifdef MK_KINETIC_SPEED */
 
+#    ifdef MOUSEKEY_INERTIA
+
+    // initial keypress sets impulse and activates first frame of movement
+    if ((code == KC_MS_UP) || (code == KC_MS_DOWN)) {
+        mousekey_y_dir = (code == KC_MS_DOWN) ? 1 : -1;
+        if (mousekey_frame < 2) mouse_report.y = move_unit(1);
+    } else if ((code == KC_MS_LEFT) || (code == KC_MS_RIGHT)) {
+        mousekey_x_dir = (code == KC_MS_RIGHT) ? 1 : -1;
+        if (mousekey_frame < 2) mouse_report.x = move_unit(0);
+    }
+
+#    else // no inertia
+
     if (code == KC_MS_UP)
         mouse_report.y = move_unit() * -1;
     else if (code == KC_MS_DOWN)
@@ -278,6 +398,9 @@ void mousekey_on(uint8_t code) {
         mouse_report.x = move_unit() * -1;
     else if (code == KC_MS_RIGHT)
         mouse_report.x = move_unit();
+
+#    endif // inertia or not
+
     else if (code == KC_MS_WH_UP)
         mouse_report.v = wheel_unit();
     else if (code == KC_MS_WH_DOWN)
@@ -297,6 +420,20 @@ void mousekey_on(uint8_t code) {
 }
 
 void mousekey_off(uint8_t code) {
+#    ifdef MOUSEKEY_INERTIA
+
+    // key release clears impulse unless opposite direction is held
+    if ((code == KC_MS_UP) && (mousekey_y_dir < 1))
+        mousekey_y_dir = 0;
+    else if ((code == KC_MS_DOWN) && (mousekey_y_dir > -1))
+        mousekey_y_dir = 0;
+    else if ((code == KC_MS_LEFT) && (mousekey_x_dir < 1))
+        mousekey_x_dir = 0;
+    else if ((code == KC_MS_RIGHT) && (mousekey_x_dir > -1))
+        mousekey_x_dir = 0;
+
+#    else // no inertia
+
     if (code == KC_MS_UP && mouse_report.y < 0)
         mouse_report.y = 0;
     else if (code == KC_MS_DOWN && mouse_report.y > 0)
@@ -305,6 +442,9 @@ void mousekey_off(uint8_t code) {
         mouse_report.x = 0;
     else if (code == KC_MS_RIGHT && mouse_report.x > 0)
         mouse_report.x = 0;
+
+#    endif // inertia or not
+
     else if (code == KC_MS_WH_UP && mouse_report.v > 0)
         mouse_report.v = 0;
     else if (code == KC_MS_WH_DOWN && mouse_report.v < 0)
@@ -476,6 +616,13 @@ void mousekey_clear(void) {
     mousekey_repeat       = 0;
     mousekey_wheel_repeat = 0;
     mousekey_accel        = 0;
+#ifdef MOUSEKEY_INERTIA
+    mousekey_frame     = 0;
+    mousekey_x_inertia = 0;
+    mousekey_y_inertia = 0;
+    mousekey_x_dir     = 0;
+    mousekey_y_dir     = 0;
+#endif
 }
 
 static void mousekey_debug(void) {
diff --git a/quantum/mousekey.h b/quantum/mousekey.h
index da2edb481a..e968e000c0 100644
--- a/quantum/mousekey.h
+++ b/quantum/mousekey.h
@@ -36,34 +36,48 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 
 #    ifndef MOUSEKEY_MOVE_DELTA
-#        ifndef MK_KINETIC_SPEED
-#            define MOUSEKEY_MOVE_DELTA 8
-#        else
+#        if defined(MK_KINETIC_SPEED)
 #            define MOUSEKEY_MOVE_DELTA 16
+#        elif defined(MOUSEKEY_INERTIA)
+#            define MOUSEKEY_MOVE_DELTA 1
+#        else
+#            define MOUSEKEY_MOVE_DELTA 8
 #        endif
 #    endif
 #    ifndef MOUSEKEY_WHEEL_DELTA
 #        define MOUSEKEY_WHEEL_DELTA 1
 #    endif
 #    ifndef MOUSEKEY_DELAY
-#        ifndef MK_KINETIC_SPEED
-#            define MOUSEKEY_DELAY 10
-#        else
+#        if defined(MK_KINETIC_SPEED)
 #            define MOUSEKEY_DELAY 5
+#        elif defined(MOUSEKEY_INERTIA)
+#            define MOUSEKEY_DELAY 150 // allow single-pixel movements before repeat activates
+#        else
+#            define MOUSEKEY_DELAY 10
 #        endif
 #    endif
 #    ifndef MOUSEKEY_INTERVAL
-#        ifndef MK_KINETIC_SPEED
-#            define MOUSEKEY_INTERVAL 20
-#        else
+#        if defined(MK_KINETIC_SPEED)
 #            define MOUSEKEY_INTERVAL 10
+#        elif defined(MOUSEKEY_INERTIA)
+#            define MOUSEKEY_INTERVAL 16 // 60 fps
+#        else
+#            define MOUSEKEY_INTERVAL 20
 #        endif
 #    endif
 #    ifndef MOUSEKEY_MAX_SPEED
-#        define MOUSEKEY_MAX_SPEED 10
+#        if defined(MOUSEKEY_INERTIA)
+#            define MOUSEKEY_MAX_SPEED 32
+#        else
+#            define MOUSEKEY_MAX_SPEED 10
+#        endif
 #    endif
 #    ifndef MOUSEKEY_TIME_TO_MAX
-#        define MOUSEKEY_TIME_TO_MAX 30
+#        if defined(MOUSEKEY_INERTIA)
+#            define MOUSEKEY_TIME_TO_MAX 32
+#        else
+#            define MOUSEKEY_TIME_TO_MAX 30
+#        endif
 #    endif
 #    ifndef MOUSEKEY_WHEEL_DELAY
 #        define MOUSEKEY_WHEEL_DELAY 10
@@ -78,6 +92,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define MOUSEKEY_WHEEL_TIME_TO_MAX 40
 #    endif
 
+#    ifndef MOUSEKEY_FRICTION
+#        define MOUSEKEY_FRICTION 24 // 0 to 255
+#    endif
 #    ifndef MOUSEKEY_INITIAL_SPEED
 #        define MOUSEKEY_INITIAL_SPEED 100
 #    endif

From d05334cfabafdf93d2604571f6296b3ce592a684 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Wed, 26 Oct 2022 14:37:59 -0600
Subject: [PATCH 743/959] Fixup 1upkeyboards/pi60_rgb (#18858)

---
 keyboards/1upkeyboards/pi60_rgb/config.h             | 8 +-------
 keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
index 19eb8d71a7..4d2b9dcd22 100644
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ b/keyboards/1upkeyboards/pi60_rgb/config.h
@@ -6,11 +6,9 @@
 #include "config_common.h"
 
 #define RGB_DI_PIN GP19
-#define DRIVER_LED_TOTAL 61
-#define RGBLED_NUM 61
+#define RGB_MATRIX_LED_COUNT 61
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGBLIGHT_LIMIT_VAL 125
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125
 // RGB Matrix Animation modes. Explicitly enabled
@@ -67,7 +65,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c
index 4d2e654ad6..f158a50d8b 100644
--- a/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi(
          KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
         KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
@@ -97,4 +97,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
-};
\ No newline at end of file
+};

From 42c240f6cfe697744cdf876ace1e7273f43db60d Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Wed, 26 Oct 2022 16:44:06 -0400
Subject: [PATCH 744/959] Add Sinc Rev. 3 (#18846)

* Initial work on adding Sinc Rev. 3

* Add RGB Matrix support

* Add encoder map support

* Set I2C pins

* Update LED locations for right half

* Move USB definitions to info.json

* Update RGB modes

* Replace pin mappings for right half with correct ones

* Move config.h back to rev1/rev2 due to addition of rev3

* Convert initial Rev. 3 config work to be data-driven

* Convert RGB Matrix config to DD format

* More config cleanup

* Use full-duplex PIO

* Add MCU/bootloader settings for Rev. 2

* Change ISO Enter location since it shares location with Backslash

* Adjust build settings to reduce flash/EEPROM usage
---
 keyboards/keebio/sinc/info.json            |   2 -
 keyboards/keebio/sinc/keymaps/via/keymap.c |   9 +
 keyboards/keebio/sinc/keymaps/via/rules.mk |   1 +
 keyboards/keebio/sinc/{ => rev1}/config.h  |   1 +
 keyboards/keebio/sinc/rev1/info.json       |  13 +-
 keyboards/keebio/sinc/rev2/config.h        |  34 +++
 keyboards/keebio/sinc/rev2/info.json       |  13 +-
 keyboards/keebio/sinc/rev3/config.h        |  78 +++++++
 keyboards/keebio/sinc/rev3/halconf.h       |  21 ++
 keyboards/keebio/sinc/rev3/info.json       | 182 +++++++++++++++++
 keyboards/keebio/sinc/rev3/mcuconf.h       |  23 +++
 keyboards/keebio/sinc/rev3/rev3.h          | 227 +++++++++++++++++++++
 keyboards/keebio/sinc/rev3/rules.mk        |   2 +
 keyboards/keebio/sinc/sinc.c               |   4 +
 keyboards/keebio/sinc/sinc.h               |   3 +
 15 files changed, 609 insertions(+), 4 deletions(-)
 rename keyboards/keebio/sinc/{ => rev1}/config.h (97%)
 create mode 100644 keyboards/keebio/sinc/rev2/config.h
 create mode 100644 keyboards/keebio/sinc/rev3/config.h
 create mode 100644 keyboards/keebio/sinc/rev3/halconf.h
 create mode 100644 keyboards/keebio/sinc/rev3/info.json
 create mode 100644 keyboards/keebio/sinc/rev3/mcuconf.h
 create mode 100644 keyboards/keebio/sinc/rev3/rev3.h
 create mode 100644 keyboards/keebio/sinc/rev3/rules.mk

diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index ad28aaea6b..d7d7faadd2 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -5,8 +5,6 @@
     "usb": {
         "vid": "0xCB10"
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
     "features": {
         "audio": false,
         "bootmagic": true,
diff --git a/keyboards/keebio/sinc/keymaps/via/keymap.c b/keyboards/keebio/sinc/keymaps/via/keymap.c
index 225e9c07df..946f88ee27 100644
--- a/keyboards/keebio/sinc/keymaps/via/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/via/keymap.c
@@ -37,3 +37,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
   )
 };
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+	[0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+	[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/via/rules.mk b/keyboards/keebio/sinc/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/keebio/sinc/keymaps/via/rules.mk
+++ b/keyboards/keebio/sinc/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/sinc/config.h b/keyboards/keebio/sinc/rev1/config.h
similarity index 97%
rename from keyboards/keebio/sinc/config.h
rename to keyboards/keebio/sinc/rev1/config.h
index 92d2fda644..d00bd12328 100644
--- a/keyboards/keebio/sinc/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@@ -31,3 +31,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default
 #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 3c8a90c206..86af86c3b6 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -4,6 +4,8 @@
         "pid": "0x1267",
         "device_version": "1.0.0"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "debounce": 5,
     "diode_direction": "COL2ROW",
     "features": {
@@ -51,7 +53,16 @@
         "led_count" : 16,
         "split_count": [8, 8],
         "animations": {
-            "all": true,
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     }
 }
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
new file mode 100644
index 0000000000..d00bd12328
--- /dev/null
+++ b/keyboards/keebio/sinc/rev2/config.h
@@ -0,0 +1,34 @@
+/* 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
+
+// wiring of each half
+#define SPLIT_HAND_PIN F7
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* ws2812 RGB LED */
+#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
+
+// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default
+#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index c3dd1d80ed..4588513d2c 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -4,6 +4,8 @@
         "pid": "0x2267",
         "device_version": "2.0.0"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "debounce": 5,
     "diode_direction": "COL2ROW",
     "features": {
@@ -51,7 +53,16 @@
         "led_count" : 16,
         "split_count": [8, 8],
         "animations": {
-            "all": true,
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
         }
     }
 }
diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h
new file mode 100644
index 0000000000..5d698b7aec
--- /dev/null
+++ b/keyboards/keebio/sinc/rev3/config.h
@@ -0,0 +1,78 @@
+/* Copyright 2022 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 SPLIT_HAND_PIN GP4
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+#define SERIAL_USART_PIN_SWAP
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+#define I2C_DRIVER I2CD2
+#define I2C1_SCL_PIN GP22
+#define I2C1_SDA_PIN GP23
+
+#define RGBLIGHT_DEFAULT_VAL 120
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
+// RGB Matrix
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/keebio/sinc/rev3/halconf.h b/keyboards/keebio/sinc/rev3/halconf.h
new file mode 100644
index 0000000000..a4c25c090a
--- /dev/null
+++ b/keyboards/keebio/sinc/rev3/halconf.h
@@ -0,0 +1,21 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
new file mode 100644
index 0000000000..37640dbf9b
--- /dev/null
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -0,0 +1,182 @@
+{
+    "keyboard_name": "Sinc Rev. 3",
+    "usb": {
+        "pid": "0x3267",
+        "device_version": "3.0.0"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "console": true,
+        "rgblight": false,
+        "backlight": false,
+        "rgb_matrix": true,
+    },
+    "split": {
+        "enabled": true,
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "GP5", "pin_b": "GP6" }
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right":{
+                "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
+                "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
+            },
+        },
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
+        "rows": ["GP25", "GP19", "GP24", "GP17", "GP16", "GP26"]
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP21", "pin_b": "GP20" }
+        ]
+    },
+    "rgblight": {
+       "pin": "GP18",
+       "led_count": 113,
+       "max_brightness": 120,
+       "sleep": true,
+       "split": true,
+       "split_count": [56, 57]
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 4, "matrix": [5, 2], "x": 30,  "y": 0 },
+            { "flags": 2, "x": 42, "y": 6 },
+            { "flags": 4, "matrix": [5, 3], "x": 45,  "y": 0 },
+            { "flags": 4, "matrix": [5, 4], "x": 58,  "y": 0 },
+            { "flags": 2, "x": 67,  "y": 6 },
+            { "flags": 4, "matrix": [5, 5], "x": 70,  "y": 0 },
+            { "flags": 4, "matrix": [5, 6], "x": 82,  "y": 0 },
+            { "flags": 4, "matrix": [5, 7], "x": 97,  "y": 0 },
+            { "flags": 2, "x": 103,  "y": 6 },
+            { "flags": 4, "matrix": [5, 8], "x": 109, "y": 0 },
+
+            { "flags": 4, "matrix": [0, 8], "x": 103, "y": 15 },
+            { "flags": 4, "matrix": [0, 7], "x": 91,  "y": 15 },
+            { "flags": 4, "matrix": [0, 6], "x": 79,  "y": 15 },
+            { "flags": 4, "matrix": [0, 5], "x": 67,  "y": 15 },
+            { "flags": 4, "matrix": [0, 4], "x": 54,  "y": 15 },
+            { "flags": 4, "matrix": [0, 3], "x": 42,  "y": 15 },
+            { "flags": 4, "matrix": [0, 2], "x": 30,  "y": 15 },
+
+            { "flags": 4, "matrix": [1, 2], "x": 33,  "y": 27 },
+            { "flags": 4, "matrix": [1, 3], "x": 48,  "y": 27 },
+            { "flags": 4, "matrix": [1, 4], "x": 61,  "y": 27 },
+            { "flags": 4, "matrix": [1, 5], "x": 73,  "y": 27 },
+            { "flags": 4, "matrix": [1, 6], "x": 85,  "y": 27 },
+            { "flags": 4, "matrix": [1, 7], "x": 97,  "y": 27 },
+
+            { "flags": 4, "matrix": [2, 7], "x": 100, "y": 40 },
+            { "flags": 4, "matrix": [2, 6], "x": 88,  "y": 40 },
+            { "flags": 4, "matrix": [2, 5], "x": 76,  "y": 40 },
+            { "flags": 4, "matrix": [2, 4], "x": 64,  "y": 40 },
+            { "flags": 4, "matrix": [2, 3], "x": 51,  "y": 40 },
+            { "flags": 4, "matrix": [2, 2], "x": 35,  "y": 40 },
+
+            { "flags": 4, "matrix": [3, 2], "x": 38,  "y": 52 },
+            { "flags": 4, "matrix": [3, 4], "x": 58,  "y": 52 },
+            { "flags": 4, "matrix": [3, 5], "x": 70,  "y": 52 },
+            { "flags": 4, "matrix": [3, 6], "x": 82,  "y": 52 },
+            { "flags": 4, "matrix": [3, 7], "x": 94,  "y": 52 },
+            { "flags": 4, "matrix": [3, 8], "x": 106, "y": 52 },
+
+            { "flags": 2, "x": 106, "y": 64 },
+            { "flags": 4, "matrix": [4, 7], "x": 98,  "y": 64 },
+            { "flags": 4, "matrix": [4, 5], "x": 77,  "y": 64 },
+            { "flags": 2, "x": 67, "y": 64 },
+            { "flags": 4, "matrix": [4, 4], "x": 62,  "y": 64 },
+            { "flags": 4, "matrix": [4, 3], "x": 47,  "y": 64 },
+            { "flags": 2, "x": 39, "y": 64 },
+            { "flags": 4, "matrix": [4, 2], "x": 32,  "y": 64 },
+
+            { "flags": 4, "matrix": [4, 1], "x": 12,  "y": 64 },
+            { "flags": 2, "x": 6, "y": 64 },
+            { "flags": 4, "matrix": [4, 0], "x": 0,   "y": 64 },
+
+            { "flags": 4, "matrix": [3, 0], "x": 0,   "y": 52 },
+            { "flags": 4, "matrix": [3, 1], "x": 12,  "y": 52 },
+            { "flags": 4, "matrix": [2, 1], "x": 12,  "y": 40 },
+            { "flags": 4, "matrix": [2, 0], "x": 0,   "y": 40 },
+            { "flags": 4, "matrix": [1, 0], "x": 0,   "y": 27 },
+            { "flags": 4, "matrix": [1, 1], "x": 12,  "y": 27 },
+            { "flags": 4, "matrix": [0, 1], "x": 12,  "y": 15 },
+            { "flags": 4, "matrix": [0, 0], "x": 0,   "y": 15 },
+            { "flags": 4, "matrix": [5, 0], "x": 0,   "y": 0 },
+            { "flags": 2, "x": 9, "y": 0 },
+
+            { "flags": 2, "x": 224, "y": 6 },
+            { "flags": 4, "matrix": [11, 8], "x": 224, "y": 0 },
+            { "flags": 4, "matrix": [11, 7], "x": 212, "y": 0 },
+            { "flags": 4, "matrix": [11, 6], "x": 197, "y": 0 },
+            { "flags": 2, "x": 191, "y": 6 },
+            { "flags": 4, "matrix": [11, 5], "x": 185, "y": 0 },
+            { "flags": 4, "matrix": [11, 4], "x": 173, "y": 0 },
+            { "flags": 2, "x": 166, "y": 6 },
+            { "flags": 4, "matrix": [11, 3], "x": 160, "y": 0 },
+            { "flags": 4, "matrix": [11, 2], "x": 145, "y": 0 },
+            { "flags": 2, "x": 139, "y": 6 },
+            { "flags": 4, "matrix": [11, 1], "x": 133, "y": 0 },
+
+            { "flags": 4, "matrix": [6, 0], "x": 127, "y": 15 },
+            { "flags": 4, "matrix": [6, 1], "x": 139, "y": 15 },
+            { "flags": 4, "matrix": [6, 2], "x": 151, "y": 15 },
+            { "flags": 4, "matrix": [6, 3], "x": 163, "y": 15 },
+            { "flags": 4, "matrix": [6, 4], "x": 176, "y": 15 },
+            { "flags": 4, "matrix": [6, 5], "x": 188, "y": 15 },
+            { "flags": 4, "matrix": [6, 6], "x": 200, "y": 15 },
+            { "flags": 4, "matrix": [6, 7], "x": 212, "y": 15 },
+            { "flags": 4, "matrix": [6, 8], "x": 224, "y": 15 },
+
+            { "flags": 4, "matrix": [7, 8], "x": 224, "y": 27 },
+            { "flags": 4, "matrix": [7, 7], "x": 209, "y": 27 },
+            { "flags": 4, "matrix": [7, 6], "x": 194, "y": 27 },
+            { "flags": 4, "matrix": [7, 5], "x": 182, "y": 27 },
+            { "flags": 4, "matrix": [7, 4], "x": 170, "y": 27 },
+            { "flags": 4, "matrix": [7, 3], "x": 157, "y": 27 },
+            { "flags": 4, "matrix": [7, 2], "x": 145, "y": 27 },
+            { "flags": 4, "matrix": [7, 1], "x": 133, "y": 27 },
+            { "flags": 4, "matrix": [7, 0], "x": 121, "y": 27 },
+
+            { "flags": 4, "matrix": [8, 0], "x": 124, "y": 40 },
+            { "flags": 4, "matrix": [8, 1], "x": 136, "y": 40 },
+            { "flags": 4, "matrix": [8, 2], "x": 148, "y": 40 },
+            { "flags": 4, "matrix": [8, 3], "x": 160, "y": 40 },
+            { "flags": 4, "matrix": [8, 4], "x": 173, "y": 40 },
+            { "flags": 4, "matrix": [8, 5], "x": 185, "y": 40 },
+            { "flags": 4, "matrix": [8, 7], "x": 204, "y": 40 },
+            { "flags": 4, "matrix": [8, 8], "x": 224, "y": 40 },
+
+            { "flags": 4, "matrix": [9, 8], "x": 224, "y": 52 },
+            { "flags": 4, "matrix": [9, 7], "x": 212, "y": 52 },
+            { "flags": 4, "matrix": [9, 6], "x": 195, "y": 52 },
+            { "flags": 4, "matrix": [9, 4], "x": 179, "y": 52 },
+            { "flags": 4, "matrix": [9, 3], "x": 166, "y": 52 },
+            { "flags": 4, "matrix": [9, 2], "x": 154, "y": 52 },
+            { "flags": 4, "matrix": [9, 1], "x": 142, "y": 52 },
+            { "flags": 4, "matrix": [9, 0], "x": 130, "y": 52 },
+
+            { "flags": 2, "x": 133, "y": 64 },
+            { "flags": 4, "matrix": [10, 1], "x": 141, "y": 64 },
+            { "flags": 2, "x": 160, "y": 64 },
+            { "flags": 4, "matrix": [10, 2], "x": 163, "y": 64 },
+            { "flags": 4, "matrix": [10, 3], "x": 176, "y": 64 },
+            { "flags": 4, "matrix": [10, 4], "x": 188, "y": 64 },
+            { "flags": 2, "x": 194, "y": 64 },
+            { "flags": 4, "matrix": [10, 5], "x": 200, "y": 64 },
+            { "flags": 4, "matrix": [10, 6], "x": 212, "y": 64 },
+            { "flags": 4, "matrix": [10, 7], "x": 224, "y": 64 },
+            { "flags": 2, "x": 224, "y": 55 }
+          ]
+    },
+}
diff --git a/keyboards/keebio/sinc/rev3/mcuconf.h b/keyboards/keebio/sinc/rev3/mcuconf.h
new file mode 100644
index 0000000000..5e47eac54f
--- /dev/null
+++ b/keyboards/keebio/sinc/rev3/mcuconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keebio/sinc/rev3/rev3.h b/keyboards/keebio/sinc/rev3/rev3.h
new file mode 100644
index 0000000000..57d072398a
--- /dev/null
+++ b/keyboards/keebio/sinc/rev3/rev3.h
@@ -0,0 +1,227 @@
+/* Copyright 2022 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
+
+#include "sinc.h"
+#include "quantum.h"
+
+#define LAYOUT_75( \
+  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
+  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
+  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
+  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
+  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
+  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
+  ) \
+  { \
+    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+  }
+
+#define LAYOUT_80( \
+  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
+  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
+  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
+  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+  }
+
+#define LAYOUT_75_with_macro( \
+  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
+  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
+  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+  }
+
+#define LAYOUT_80_with_macro( \
+  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
+  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+  }
+
+#define LAYOUT_75_iso( \
+  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
+  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
+  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
+  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
+  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
+  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
+  ) \
+  { \
+    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, KC_NO }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, KC_NO }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+  }
+
+#define LAYOUT_80_iso( \
+  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
+  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
+  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
+  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+  }
+
+#define LAYOUT_75_iso_with_macro( \
+  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
+  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
+  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, KC_NO }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, KC_NO }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
+  }
+
+#define LAYOUT_80_iso_with_macro( \
+  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
+  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+  }
+
+#define LAYOUT_all( \
+  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
+  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
+    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
+  }
diff --git a/keyboards/keebio/sinc/rev3/rules.mk b/keyboards/keebio/sinc/rev3/rules.mk
new file mode 100644
index 0000000000..8fb51ec82d
--- /dev/null
+++ b/keyboards/keebio/sinc/rev3/rules.mk
@@ -0,0 +1,2 @@
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c
index f6dff42ebb..9b2f6da512 100644
--- a/keyboards/keebio/sinc/sinc.c
+++ b/keyboards/keebio/sinc/sinc.c
@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sinc.h"
 #include "split_util.h"
 
+#ifdef BACKLIGHT_ENABLE
 bool led_update_kb(led_t led_state) {
     if (!led_update_user(led_state)) { return false; }
     // Only update if left half
@@ -25,6 +26,7 @@ bool led_update_kb(led_t led_state) {
     }
     return true;
 }
+#endif
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
@@ -35,6 +37,7 @@ void eeconfig_init_kb(void) {
     eeconfig_init_user();
 }
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -52,3 +55,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return true;
 }
+#endif
diff --git a/keyboards/keebio/sinc/sinc.h b/keyboards/keebio/sinc/sinc.h
index 75f14595bf..4607d8125c 100644
--- a/keyboards/keebio/sinc/sinc.h
+++ b/keyboards/keebio/sinc/sinc.h
@@ -23,3 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef KEYBOARD_keebio_sinc_rev2
     #include "rev2.h"
 #endif
+#ifdef KEYBOARD_keebio_sinc_rev3
+    #include "rev3.h"
+#endif

From 432feecc61d9b4ede3fb7b65920714853209a7a7 Mon Sep 17 00:00:00 2001
From: ai03 <admin@ai03.com>
Date: Thu, 27 Oct 2022 09:16:59 +0900
Subject: [PATCH 745/959] [Keyboard] Add Lunar II (#18827)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: ai03 <sarcaphx510@gmail.com>
---
 keyboards/ai03/lunar_ii/config.h              | 62 +++++++++++++
 keyboards/ai03/lunar_ii/info.json             | 90 +++++++++++++++++++
 .../ai03/lunar_ii/keymaps/default/keymap.c    | 34 +++++++
 .../ai03/lunar_ii/keymaps/default/readme.md   |  2 +
 keyboards/ai03/lunar_ii/keymaps/via/keymap.c  | 48 ++++++++++
 keyboards/ai03/lunar_ii/keymaps/via/readme.md |  2 +
 keyboards/ai03/lunar_ii/keymaps/via/rules.mk  |  1 +
 keyboards/ai03/lunar_ii/readme.md             | 15 ++++
 keyboards/ai03/lunar_ii/rules.mk              | 21 +++++
 9 files changed, 275 insertions(+)
 create mode 100644 keyboards/ai03/lunar_ii/config.h
 create mode 100644 keyboards/ai03/lunar_ii/info.json
 create mode 100644 keyboards/ai03/lunar_ii/keymaps/default/keymap.c
 create mode 100644 keyboards/ai03/lunar_ii/keymaps/default/readme.md
 create mode 100644 keyboards/ai03/lunar_ii/keymaps/via/keymap.c
 create mode 100644 keyboards/ai03/lunar_ii/keymaps/via/readme.md
 create mode 100644 keyboards/ai03/lunar_ii/keymaps/via/rules.mk
 create mode 100644 keyboards/ai03/lunar_ii/readme.md
 create mode 100644 keyboards/ai03/lunar_ii/rules.mk

diff --git a/keyboards/ai03/lunar_ii/config.h b/keyboards/ai03/lunar_ii/config.h
new file mode 100644
index 0000000000..5942457d57
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/config.h
@@ -0,0 +1,62 @@
+/*
+Copyright 2022 ai03 Design Studio
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* Mechanical lock switch support */
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+/* Solenoid support */
+#define SOLENOID_PIN B7
+#define SOLENOID_DEFAULT_DWELL 15
+
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
new file mode 100644
index 0000000000..5d86a13ad1
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/info.json
@@ -0,0 +1,90 @@
+{
+    "keyboard_name": "Lunar II",
+    "manufacturer": "ai03 Design Studio",
+    "url": "https://ai03.com/projects/lunar-ii",
+    "maintainer": "ai03-2725",
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0016",
+        "device_version": "1.0.0",
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": [ "D0", "D1", "D2", "F0", "F1" ],
+        "cols": [ "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"]
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+                { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
+                { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3.0 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+                { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4.0 },
+                { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4.0 },
+                { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4.0 },
+                { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4.0 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4.0 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4.0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/ai03/lunar_ii/keymaps/default/keymap.c b/keyboards/ai03/lunar_ii/keymaps/default/keymap.c
new file mode 100644
index 0000000000..261c999da7
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 ai03 Design Studio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include 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_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,
+		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,
+		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+		KC_CAPS, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______,
+		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
+		_______,          HPT_TOG, HPT_FBK, HPT_DWLI, HPT_DWLD, _______, _______, _______, _______, _______, _______,                 _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    )
+};
+
diff --git a/keyboards/ai03/lunar_ii/keymaps/default/readme.md b/keyboards/ai03/lunar_ii/keymaps/default/readme.md
new file mode 100644
index 0000000000..a956904f1c
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The default keymap for lunar_ii
+Nothing special
\ No newline at end of file
diff --git a/keyboards/ai03/lunar_ii/keymaps/via/keymap.c b/keyboards/ai03/lunar_ii/keymaps/via/keymap.c
new file mode 100644
index 0000000000..58fe4c7ecb
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 ai03 Design Studio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include 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_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,
+		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,
+		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+		KC_CAPS, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______,
+		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
+		_______,          HPT_TOG, HPT_FBK, HPT_DWLI, HPT_DWLD, _______, _______, _______, _______, _______, _______,                 _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    ),
+	[2] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    ),
+	[3] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    )
+};
+
diff --git a/keyboards/ai03/lunar_ii/keymaps/via/readme.md b/keyboards/ai03/lunar_ii/keymaps/via/readme.md
new file mode 100644
index 0000000000..942e11ff4a
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The via keymap for lunar_ii
+Enables via support; for use with via configurator
diff --git a/keyboards/ai03/lunar_ii/keymaps/via/rules.mk b/keyboards/ai03/lunar_ii/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ai03/lunar_ii/readme.md b/keyboards/ai03/lunar_ii/readme.md
new file mode 100644
index 0000000000..7bf8769c76
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/readme.md
@@ -0,0 +1,15 @@
+# Lunar II
+
+![lunar_ii](https://i.imgur.com/W3xbm4mh.png)
+
+Second generation compact AEK keyboard
+
+* Keyboard Maintainer: [ai03-2725](https://github.com/ai03-2725)
+* Hardware Supported: The Lunar II PCB
+* Hardware Availability: Switchplate Peripherals, TypePlus
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ai03/lunar_ii: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/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk
new file mode 100644
index 0000000000..1a29d22700
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+HAPTIC_ENABLE = yes         # Enable solenoid support
+HAPTIC_DRIVER += SOLENOID

From fb8cfe43a31f57f978b37579c1e7e0dbf43a3078 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Wed, 26 Oct 2022 22:24:13 -0600
Subject: [PATCH 746/959] initial (#18859)

---
 keyboards/doio/kb16/kb16.c         | 19 ++++++++++++
 keyboards/doio/kb16/kb16.h         | 29 +++++++++++++++----
 keyboards/doio/kb16/rev1/config.h  |  3 --
 keyboards/doio/kb16/rev1/rev1.c    | 37 ------------------------
 keyboards/doio/kb16/rev1/rev1.h    | 46 ------------------------------
 keyboards/doio/kb16/rev2/config.h  |  5 +---
 keyboards/doio/kb16/rev2/info.json |  2 +-
 keyboards/doio/kb16/rev2/rev2.c    | 37 ------------------------
 keyboards/doio/kb16/rev2/rev2.h    | 46 ------------------------------
 9 files changed, 45 insertions(+), 179 deletions(-)
 delete mode 100644 keyboards/doio/kb16/rev1/rev1.c
 delete mode 100644 keyboards/doio/kb16/rev1/rev1.h
 delete mode 100644 keyboards/doio/kb16/rev2/rev2.c
 delete mode 100644 keyboards/doio/kb16/rev2/rev2.h

diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index 991848c6d3..c0f7f96b9e 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -45,3 +45,22 @@
         return true;
     }
 #endif
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    {  0,      1,      2,      3, NO_LED },
+    {  4,      5,      6,      7, NO_LED },
+    {  8,      9,     10,     11, NO_LED },
+    { 12,     13,     14,     15, NO_LED }
+}, {
+    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
+    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
+    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
+    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
+}, {
+    1, 1, 1, 1,
+    1, 4, 4, 1,
+    1, 4, 4, 1,
+    1, 1, 1, 1,
+} };
+#endif
diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h
index 4d3a1e3a03..6e6ab2f7f4 100644
--- a/keyboards/doio/kb16/kb16.h
+++ b/keyboards/doio/kb16/kb16.h
@@ -19,8 +19,27 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_doio_kb16_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_doio_kb16_rev2)
-    #include "rev2.h"
-#endif
\ No newline at end of file
+#define XXX KC_NO
+
+/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
+ * │00 │01 │02 │03 │  │04 │ │14 │
+ * ├───┼───┼───┼───┤  └───┘ └───┘
+ * │10 │11 │12 │13 │
+ * ├───┼───┼───┼───┤
+ * │20 │21 │22 │23 │     ┌───┐
+ * ├───┼───┼───┼───┤     │24 │
+ * │30 │31 │32 │33 │     └───┘
+ * └───┴───┴───┴───┘
+ */
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, \
+    K10, K11, K12, K13, K14, \
+    K20, K21, K22, K23, K24, \
+    K30, K31, K32, K33       \
+) { \
+    { K00, K01, K02, K03, K04 }, \
+    { K10, K11, K12, K13, K14 }, \
+    { K20, K21, K22, K23, K24 }, \
+    { K30, K31, K32, K33, XXX }  \
+}
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index 1714c41b01..5187354513 100644
--- a/keyboards/doio/kb16/rev1/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -27,9 +27,6 @@
 #define MATRIX_ROW_PINS { D5, D4, D3, D2 }
 #define MATRIX_COL_PINS { F5, F4, F1, F0, B7 }
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/doio/kb16/rev1/rev1.c b/keyboards/doio/kb16/rev1/rev1.c
deleted file mode 100644
index 9c7fc823a6..0000000000
--- a/keyboards/doio/kb16/rev1/rev1.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    {  0,      1,      2,      3, NO_LED },
-    {  4,      5,      6,      7, NO_LED },
-    {  8,      9,     10,     11, NO_LED },
-    { 12,     13,     14,     15, NO_LED }
-}, {
-    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
-    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
-    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
-    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
-}, {
-    1, 1, 1, 1,
-    1, 4, 4, 1,
-    1, 4, 4, 1,
-    1, 1, 1, 1,
-} };
-#endif
diff --git a/keyboards/doio/kb16/rev1/rev1.h b/keyboards/doio/kb16/rev1/rev1.h
deleted file mode 100644
index f1e86fb674..0000000000
--- a/keyboards/doio/kb16/rev1/rev1.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
- * │00 │01 │02 │03 │  │04 │ │14 │
- * ├───┼───┼───┼───┤  └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │     ┌───┐
- * ├───┼───┼───┼───┤     │24 │
- * │30 │31 │32 │33 │     └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33       \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, XXX }  \
-}
-
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index d5152f3ec7..d75c69c9a2 100644
--- a/keyboards/doio/kb16/rev2/config.h
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -27,9 +27,6 @@
 #define MATRIX_ROW_PINS { B3, B4, B9, B8 }
 #define MATRIX_COL_PINS { B14, B13, B12, B0, A7 }
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
@@ -56,7 +53,7 @@
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
     #define RGB_DI_PIN A10
-    #define DRIVER_LED_TOTAL 16
+    #define RGB_MATRIX_LED_COUNT 16
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 9bb19482e3..28aa77b127 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -6,7 +6,7 @@
     "usb": {
         "vid": "0xD010",
         "pid": "0x1601",
-        "device_version": "0.0.1"
+        "device_version": "0.0.2"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/doio/kb16/rev2/rev2.c b/keyboards/doio/kb16/rev2/rev2.c
deleted file mode 100644
index 78637842c5..0000000000
--- a/keyboards/doio/kb16/rev2/rev2.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    {  0,      1,      2,      3, NO_LED },
-    {  4,      5,      6,      7, NO_LED },
-    {  8,      9,     10,     11, NO_LED },
-    { 12,     13,     14,     15, NO_LED }
-}, {
-    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
-    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
-    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
-    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
-}, {
-    1, 1, 1, 1,
-    1, 4, 4, 1,
-    1, 4, 4, 1,
-    1, 1, 1, 1,
-} };
-#endif
diff --git a/keyboards/doio/kb16/rev2/rev2.h b/keyboards/doio/kb16/rev2/rev2.h
deleted file mode 100644
index f1e86fb674..0000000000
--- a/keyboards/doio/kb16/rev2/rev2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
- * │00 │01 │02 │03 │  │04 │ │14 │
- * ├───┼───┼───┼───┤  └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │     ┌───┐
- * ├───┼───┼───┼───┤     │24 │
- * │30 │31 │32 │33 │     └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33       \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, XXX }  \
-}
-

From 91b1e8a3e563addc1492cabc78466c8142edcf91 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 27 Oct 2022 18:29:26 +1100
Subject: [PATCH 747/959] Allow overriding of dynamic keymap start address.
 (#18867)

---
 quantum/dynamic_keymap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index e9529ed14e..d800bbab84 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -24,7 +24,9 @@
 #    include "via.h" // for VIA_EEPROM_CONFIG_END
 #    define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
 #else
-#    define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
+#    ifndef DYNAMIC_KEYMAP_EEPROM_START
+#        define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
+#    endif
 #endif
 
 #ifdef ENCODER_ENABLE

From 8e0945c82224ca2fdcc21eb7184520f879804fb6 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 27 Oct 2022 09:52:51 +0100
Subject: [PATCH 748/959] Fix rgb_matrix_set_flags_noeeprom declaration
 (#18860)

---
 quantum/rgb_matrix/rgb_matrix.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index e1bdad42e0..62078f6e60 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -182,8 +182,8 @@ void        rgb_matrix_increase_speed_noeeprom(void);
 void        rgb_matrix_decrease_speed(void);
 void        rgb_matrix_decrease_speed_noeeprom(void);
 led_flags_t rgb_matrix_get_flags(void);
-led_flags_t rgb_matrix_get_flags_noeeprom(void);
 void        rgb_matrix_set_flags(led_flags_t flags);
+void        rgb_matrix_set_flags_noeeprom(led_flags_t flags);
 
 #ifndef RGBLIGHT_ENABLE
 #    define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix

From 18a70451fd4d2bcf8b1914d89f386e411da8b6aa Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Thu, 27 Oct 2022 03:57:50 -0500
Subject: [PATCH 749/959] userspace: fix up sethBarberee sinc keymap CI errors
 (#18865)

---
 .../keebio/sinc/keymaps/sethBarberee/rules.mk |  1 +
 users/sethBarberee/config.h                   | 84 +++++++++++--------
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/keyboards/keebio/sinc/keymaps/sethBarberee/rules.mk b/keyboards/keebio/sinc/keymaps/sethBarberee/rules.mk
index 049c5ae9b5..1475c36e7c 100644
--- a/keyboards/keebio/sinc/keymaps/sethBarberee/rules.mk
+++ b/keyboards/keebio/sinc/keymaps/sethBarberee/rules.mk
@@ -1,3 +1,4 @@
 BACKLIGHT_ENABLE=no
 CONSOLE_ENABLE=no
 TAP_DANCE_ENABLE=yes
+MUSIC_ENABLE=no
diff --git a/users/sethBarberee/config.h b/users/sethBarberee/config.h
index c97d39151b..7e9fd7d2f1 100644
--- a/users/sethBarberee/config.h
+++ b/users/sethBarberee/config.h
@@ -1,45 +1,57 @@
- /* Copyright 2021 SethBarberee <seth.barberee@gmail.com>
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
+/* Copyright 2021 SethBarberee <seth.barberee@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#   define RGBLIGHT_SLEEP
-# ifndef RGBLIGHT_HUE_STEP
-#   define RGBLIGHT_HUE_STEP 8
-#endif
-# ifndef RGBLIGHT_SAT_STEPT
-#   define RGBLIGHT_SAT_STEP 8
-#endif
-# ifndef RGBLIGHT_VAL_STEP
-#   define RGBLIGHT_VAL_STEP 8
-#endif
+#    define RGBLIGHT_SLEEP
+#    ifndef RGBLIGHT_HUE_STEP
+#        define RGBLIGHT_HUE_STEP 8
+#    endif
+#    ifndef RGBLIGHT_SAT_STEPT
+#        define RGBLIGHT_SAT_STEP 8
+#    endif
+#    ifndef RGBLIGHT_VAL_STEP
+#        define RGBLIGHT_VAL_STEP 8
+#    endif
+
 // Trim animations I don't use/like
-#   ifdef RGBLIGHT_ANIMATIONS
-#       undef RGBLIGHT_ANIMATIONS
-#   endif
-#   define RGBLIGHT_EFFECT_BREATHING
-#   define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#   define RGBLIGHT_EFFECT_TWINKLE
-#   ifndef CAPS_LOCK_MODE
-#       define CAPS_LOCK_MODE RGBLIGHT_MODE_STATIC_LIGHT
-#   endif
+#    ifdef RGBLIGHT_ANIMATIONS
+#        undef RGBLIGHT_ANIMATIONS
+#    endif
+#    ifndef RGBLIGHT_EFFECT_BREATHING
+#        define RGBLIGHT_EFFECT_BREATHING
+#    endif
+#    ifndef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#        define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    endif
+#    ifndef RGBLIGHT_EFFECT_TWINKLE
+#        define RGBLIGHT_EFFECT_TWINKLE
+#    endif
+#    ifdef RGBLIGHT_DEFAULT_MODE
+#        undef RGBLIGHT_DEFAULT_MODE
+#        define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_TWINKLE
+#    endif
+
+#    ifndef CAPS_LOCK_MODE
+#        define CAPS_LOCK_MODE RGBLIGHT_MODE_STATIC_LIGHT
+#    endif
 #endif // RGBLIGHT_ENABLE
 
 #ifndef AUDIO_ENABLE
-#       define NO_MUSIC_MODE
+#    define NO_MUSIC_MODE
 #endif // AUDIO_ENABLE
 
 #define FORCE_NKRO // Force NKRO on by default
@@ -47,7 +59,7 @@
 // Totally taken from @drashna's userspace
 #ifdef TAPPING_TERM
 #    undef TAPPING_TERM
-#endif  // TAPPING_TERM
+#endif // TAPPING_TERM
 //
 // Keeping these commented for examples when I want to tweak per keyboard
 // but setting a default across my boards for now

From 002b58f0e4ea64eb5b06e36d988160bbb907cb83 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 27 Oct 2022 21:19:16 +1100
Subject: [PATCH 750/959] Normalise Space Cadet keycodes (#18864)

---
 docs/feature_space_cadet.md                   | 30 +++++++++----------
 docs/keycodes.md                              | 18 +++++------
 .../0xcb/static/keymaps/bongocat/keymap.c     |  2 +-
 .../0xcb/static/keymaps/default/keymap.c      |  2 +-
 keyboards/0xcb/static/keymaps/via/keymap.c    |  2 +-
 .../half_n_half/keymaps/Boy_314/keymap.c      |  4 +--
 .../4pplet/steezy60/keymaps/4pplet/keymap.c   |  4 +--
 keyboards/atreus62/keymaps/hvp/keymap.c       |  2 +-
 keyboards/atreus62/keymaps/mfluid/keymap.c    |  2 +-
 keyboards/boardwalk/keymaps/niclake/keymap.c  |  4 +--
 .../sunsetter/keymaps/peott-fr/keymap.c       |  2 +-
 .../quark/keymaps/ajp10304/keymap.c           |  2 +-
 .../clueboard/66/keymaps/bloodlvst/keymap.c   |  2 +-
 .../clueboard/66/keymaps/magicmonty/keymap.c  |  2 +-
 keyboards/crkbd/keymaps/dsanchezseco/keymap.c |  2 +-
 keyboards/crkbd/keymaps/hvp/keymap.c          |  2 +-
 keyboards/crkbd/keymaps/rpbaptist/keymap.c    |  4 +--
 keyboards/crkbd/keymaps/soundmonster/keymap.c |  2 +-
 .../plaid/keymaps/gipsy-king/keymap.c         |  2 +-
 .../plaid/keymaps/thehalfdeafchef/keymap.c    |  6 ++--
 .../drhigsby/bkf/keymaps/default/keymap.c     |  2 +-
 keyboards/dz60/keymaps/LEdiodes/keymap.c      |  4 +--
 keyboards/dz60/keymaps/bingocaller/keymap.c   |  2 +-
 keyboards/dz60/keymaps/drewsky/keymap.c       |  2 +-
 keyboards/dz60/keymaps/hailbreno/keymap.c     |  6 ++--
 .../dz60/keymaps/marianas/keyDefinitions.h    |  4 +--
 keyboards/dz60/keymaps/marianas/relativity.c  |  8 ++---
 keyboards/dz60/keymaps/mpstewart/keymap.c     |  2 +-
 .../dz60rgb/keymaps/matthewrobo/keymap.c      |  2 +-
 .../dz60rgb_ansi/keymaps/bingocaller/keymap.c |  2 +-
 .../dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c  |  2 +-
 .../dz65rgb/keymaps/matthewrobo/keymap.c      |  2 +-
 keyboards/elephant42/keymaps/default/keymap.c | 10 +++----
 .../keymaps/bpruitt-goddard/keymap.c          |  4 +--
 keyboards/ergodox_ez/keymaps/skug/keymap.c    |  4 +--
 keyboards/ergodox_ez/keymaps/testing/keymap.c |  2 +-
 .../util/keymap_beautifier/README.md          |  6 ++--
 .../wonderland/keymaps/default/keymap.c       |  2 +-
 .../evyd13/wonderland/keymaps/keebs/keymap.c  |  2 +-
 .../keymaps/rafael-azevedo/keymap.c           |  2 +-
 .../evyd13/wonderland/keymaps/via/keymap.c    |  2 +-
 .../cornelius/keymaps/gipsy-king/keymap.c     |  2 +-
 .../foostan/cornelius/keymaps/hvp/keymap.c    |  4 +--
 keyboards/funky40/keymaps/default/keymap.c    |  2 +-
 keyboards/gh60/satan/keymaps/ben_iso/keymap.c |  2 +-
 .../chimera_ergo/keymaps/default/keymap.c     |  2 +-
 .../chimera_ls/keymaps/default/keymap.c       |  2 +-
 .../chimera_ortho/keymaps/default/keymap.c    |  2 +-
 .../keymaps/default/keymap.c                  |  2 +-
 .../handwired/aek64/keymaps/4sstylz/keymap.c  |  4 +--
 .../handwired/aek64/keymaps/default/keymap.c  |  4 +--
 .../handwired/aranck/keymaps/default/keymap.c |  2 +-
 .../aranck/keymaps/turkishish/keymap.c        |  2 +-
 .../atreus50/keymaps/ajp10304/keymap.c        |  2 +-
 .../keymaps/jmdaly_hhkb_split_space/keymap.c  |  4 +--
 .../concertina/64key/keymaps/default/keymap.c |  6 ++--
 .../5x6_2_5/keymaps/default/keymap.json       | 16 +++++-----
 .../5x6_5/keymaps/default/keymap.json         |  8 ++---
 .../6x6/keymaps/dumam/keymap.c                |  2 +-
 .../dmote/62key/keymaps/default/keymap.c      |  4 +--
 .../heisenberg/keymaps/default/keymap.c       |  2 +-
 .../heisenberg/keymaps/turkishish/keymap.c    |  2 +-
 .../lagrange/keymaps/default/keymap.c         |  2 +-
 .../magicforce61/keymaps/default/keymap.c     |  2 +-
 .../steamvan/keymaps/jmdaly/keymap.c          |  2 +-
 .../split_5x7/keymaps/default/keymap.c        |  4 +--
 .../split_5x7/keymaps/stef9998/keymap.c       |  8 ++---
 .../terminus_mini/keymaps/default/keymap.c    |  8 ++---
 keyboards/hhkb/ansi/keymaps/brett/keymap.c    |  2 +-
 .../hidtech/bastyl/keymaps/nstickney/keymap.c |  2 +-
 .../hineybush/h87a/keymaps/peott-fr/keymap.c  |  2 +-
 keyboards/hotdox/keymaps/bliss/keymap.c       |  6 ++--
 .../infinity60/keymaps/depariel/keymap.c      |  2 +-
 keyboards/jd40/keymaps/vanagon/keymap.c       |  4 +--
 .../kbdfans/kbd6x/keymaps/peott-fr/keymap.c   |  2 +-
 .../kbdfans/niu_mini/keymaps/edvard/keymap.c  |  2 +-
 .../keymaps/insertsnideremarks/keymap.c       |  4 +--
 .../bfo9000/keymaps/tuesdayjohn/keymap.c      |  4 +--
 .../iris/keymaps/compilation-error/keymap.c   |  2 +-
 keyboards/keebio/iris/keymaps/ddone/keymap.c  |  2 +-
 keyboards/keebio/iris/keymaps/gary/keymap.c   |  2 +-
 .../keebio/iris/keymaps/jerryhcooke/keymap.c  |  2 +-
 keyboards/keebio/iris/keymaps/jhelvy/keymap.c |  2 +-
 .../keebio/iris/keymaps/nstickney/keymap.c    |  2 +-
 .../keebio/iris/keymaps/two_knob/keymap.c     |  2 +-
 .../iris/keymaps/two_knob/two_knob.json       |  4 +--
 .../keebio/nyquist/keymaps/peott-fr/keymap.c  |  2 +-
 .../keebio/nyquist/keymaps/skug/keymap.c      |  2 +-
 .../quefrency/keymaps/peott-fr/keymap.c       |  2 +-
 .../keymaps/insertsnideremarks/keymap.c       |  4 +--
 .../rorschach/keymaps/tuesdayjohn/keymap.c    |  4 +--
 .../tragicforce68/keymaps/buswerks/keymap.c   |  4 +--
 ...472_Annihilator6000_Configurator_file.json |  2 +-
 .../ut472/keymaps/annihilator6000/keymap.c    |  4 +--
 .../keyhive/ut472/keymaps/default/keymap.c    |  2 +-
 .../keyhive/ut472/keymaps/gardego5/keymap.c   |  2 +-
 keyboards/keyhive/ut472/keymaps/hvp/keymap.c  |  4 +--
 keyboards/keyhive/ut472/keymaps/via/keymap.c  |  2 +-
 keyboards/kin80/keymaps/quartz64/keymap.c     |  2 +-
 keyboards/kinesis/keymaps/heatxsink/keymap.c  |  4 +--
 .../keymaps/insertsnideremarks/keymap.c       |  4 +--
 keyboards/kinesis/keymaps/peott-fr/keymap.c   |  2 +-
 .../kinesis/keymaps/tuesdayjohn/keymap.c      |  4 +--
 .../bm40hsrgb/keymaps/wolff_abnt2/keymap.c    |  8 ++---
 .../bm65hsrgb_iso/keymaps/p4yne/keymap.c      | 20 ++++++-------
 .../rev1/keymaps/deadolus/keymap.c            |  8 ++---
 .../ktec/ergodone/keymaps/erovia/keymap.c     |  8 ++---
 keyboards/ktec/ergodone/keymaps/vega/keymap.c | 12 ++++----
 .../lets_split/keymaps/cpeters1982/keymap.c   |  2 +-
 keyboards/lets_split/keymaps/hvp/keymap.c     |  4 +--
 keyboards/lets_split/keymaps/mekberg/keymap.c |  2 +-
 keyboards/lily58/keymaps/cykedev/keymap.c     |  2 +-
 keyboards/lily58/keymaps/drasbeck/keymap.c    |  4 +--
 keyboards/lily58/keymaps/jhelvy/keymap.c      |  2 +-
 keyboards/lily58/keymaps/muppetjones/keymap.c |  2 +-
 .../massdrop/alt/keymaps/xulkal/keymap.c      |  4 +--
 .../massdrop/ctrl/keymaps/endgame/keymap.c    |  4 +--
 .../ctrl/keymaps/matthewrobo/keymap.c         |  2 +-
 .../massdrop/ctrl/keymaps/xanimos/keymap.c    |  2 +-
 .../massdrop/ctrl/keymaps/xanimos/readme.md   |  2 +-
 .../massdrop/ctrl/keymaps/xulkal/keymap.c     |  4 +--
 .../maxr1998/phoebe/keymaps/default/keymap.c  |  2 +-
 .../mechkeys/alu84/keymaps/turbomech/keymap.c |  2 +-
 .../espectro/keymaps/default/keymap.c         |  2 +-
 .../mechkeys/espectro/keymaps/mac/keymap.c    |  4 +--
 .../mechkeys/espectro/keymaps/mapdev/keymap.c |  2 +-
 .../espectro/keymaps/mikethetiger/keymap.c    |  2 +-
 .../mechmini/v2/keymaps/wsturgiss/keymap.c    |  2 +-
 .../mercutio/keymaps/jonavin/keymap.c         |  4 +--
 .../minimon/index_tab/keymaps/via/keymap.c    |  2 +-
 keyboards/mitosis/keymaps/datagrok/keymap.c   |  4 +--
 keyboards/mlego/m65/keymaps/default/keymap.c  |  4 +--
 keyboards/mlego/m65/keymaps/dk/keymap.c       |  4 +--
 keyboards/mlego/m65/keymaps/uk/keymap.c       |  4 +--
 keyboards/mlego/m65/keymaps/via/keymap.c      |  4 +--
 keyboards/mt/mt40/keymaps/default/keymap.c    |  2 +-
 .../kastenwagen1840/keymaps/default/keymap.c  |  2 +-
 .../kastenwagen1840/keymaps/via/keymap.c      |  2 +-
 .../kastenwagen48/keymaps/default/keymap.c    |  2 +-
 .../kastenwagen48/keymaps/jonavin/keymap.c    |  2 +-
 .../kastenwagen48/keymaps/via/keymap.c        |  2 +-
 .../mini/keymaps/yoshimaru46/keymap.c         |  2 +-
 .../percent/canoe/keymaps/boy_314/keymap.c    |  6 ++--
 keyboards/planck/keymaps/buffet/keymap.c      |  2 +-
 .../planck/keymaps/dsanchezseco/keymap.c      |  2 +-
 keyboards/planck/keymaps/dvz/keymap.c         |  2 +-
 keyboards/planck/keymaps/hvp/keymap.c         |  2 +-
 keyboards/planck/keymaps/kmontag42/keymap.c   |  2 +-
 keyboards/planck/keymaps/motform/keymap.c     |  2 +-
 keyboards/planck/keymaps/muppetjones/keymap.c |  2 +-
 keyboards/planck/keymaps/mwpeterson/keymap.c  |  2 +-
 keyboards/planck/keymaps/phreed/keymap.c      |  2 +-
 keyboards/planck/keymaps/pickle_jr/keymap.c   |  2 +-
 .../planck/keymaps/prog_qgmlwb/src/qgmlwb.h   |  2 +-
 keyboards/planck/keymaps/rennerom/keymap.c    |  2 +-
 keyboards/planck/keymaps/rootiest/keymap.c    | 14 ++++-----
 keyboards/planck/keymaps/skug/keymap.c        |  2 +-
 keyboards/planck/keymaps/via/keymap.c         |  2 +-
 keyboards/preonic/keymaps/boy314/keymap.c     |  4 +--
 keyboards/preonic/keymaps/drasbeck/keymap.c   |  4 +--
 keyboards/preonic/keymaps/kjwon15/keymap.c    |  2 +-
 .../prime_e/keymaps/madhatter/keymap.c        |  2 +-
 .../primekb/prime_e/keymaps/peott-fr/keymap.c |  2 +-
 .../primekb/prime_r/keymaps/rooski/keymap.c   |  2 +-
 .../relic/keymaps/default/keymap.c            |  2 +-
 .../punk75/keymaps/dsanchezseco/keymap.c      |  6 ++--
 keyboards/qwertyydox/keymaps/default/keymap.c |  2 +-
 keyboards/redox/keymaps/cykedev/keymap.c      |  2 +-
 .../redox/keymaps/eightbitraptor/keymap.c     |  2 +-
 keyboards/redox/keymaps/finex/keymap.c        |  8 ++---
 keyboards/rgbkb/mun/keymaps/default/keymap.c  |  2 +-
 keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c |  2 +-
 keyboards/rgbkb/mun/keymaps/via/keymap.c      |  2 +-
 keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c  |  4 +--
 keyboards/rgbkb/pan/keymaps/default/keymap.c  |  4 +--
 .../rgbkb/sol/keymaps/brianweyer/keymap.c     |  2 +-
 .../rgbkb/sol/keymaps/kageurufu/keymap.c      |  2 +-
 keyboards/rgbkb/sol3/keymaps/default/keymap.c |  2 +-
 .../rgbkb/sol3/keymaps/kageurufu/keymap.c     |  2 +-
 keyboards/rgbkb/sol3/keymaps/via/keymap.c     |  2 +-
 .../rgbkb/zen/rev1/keymaps/kageurufu/keymap.c |  2 +-
 .../rev1/keymaps/starcalleramethyst/keymap.c  |  2 +-
 keyboards/rocketboard_16/keycode_lookup.c     | 14 ++++-----
 keyboards/sentraq/s65_x/keymaps/nall/keymap.c |  2 +-
 keyboards/signum/3_0/keymaps/default/keymap.c |  4 +--
 .../signum/3_0/keymaps/default/layout.py      |  2 +-
 keyboards/slz40/keymaps/default/keymap.c      |  2 +-
 keyboards/sofle/keymaps/killmaster/keymap.c   |  2 +-
 .../splitkb/kyria/keymaps/artflag/keymap.c    |  2 +-
 .../keymaps/artflag/workman-artflag.json      |  4 +--
 .../kyria/keymaps/cjuniet/default.json        |  2 +-
 .../splitkb/kyria/keymaps/cjuniet/keymap.c    |  2 +-
 .../splitkb/kyria/keymaps/jhelvy/keymap.c     |  4 +--
 keyboards/splitkb/kyria/keymaps/lw/keymap.c   |  2 +-
 .../kyria/keymaps/muppetjones/keymap.c        |  2 +-
 keyboards/tada68/keymaps/amnesia0287/keymap.c |  2 +-
 keyboards/tada68/keymaps/shalzz/keymap.c      |  2 +-
 keyboards/tada68/keymaps/sm0g/keymap.c        |  2 +-
 keyboards/tada68/keymaps/unix/keymap.c        |  2 +-
 .../minivan/keymaps/hvp/keymap.c              |  2 +-
 .../minivan/keymaps/lexworth/keymap.c         |  2 +-
 .../tzarc/ghoul/keymaps/default/keymap.c      |  2 +-
 .../keymaps/followingghosts/keymap.c          |  2 +-
 .../viktus/sp_mini/keymaps/peott-fr/keymap.c  |  6 ++--
 .../keymaps/vitavim/keymap.c                  |  4 +--
 keyboards/wren/keymaps/walterhanley/keymap.c  |  4 +--
 .../xiudi/xd60/keymaps/kmontag42/keymap.c     |  2 +-
 .../xiudi/xd60/keymaps/suryanisaac/keymap.c   |  2 +-
 keyboards/xiudi/xd60/keymaps/yuuki/keymap.c   |  2 +-
 keyboards/xiudi/xd75/keymaps/boy_314/keymap.c |  4 +--
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |  4 +--
 keyboards/ymdk/bface/keymaps/minila/keymap.c  |  2 +-
 .../60_tsangan_hhkb/dohmain/keymap.c          |  4 +--
 layouts/community/ergodox/haegin/keymap.c     |  4 +--
 .../community/ortho_4x12/ajp10304/keymap.c    |  2 +-
 .../community/ortho_4x12/bredfield/keymap.c   |  2 +-
 .../community/ortho_4x12/buswerks/keymap.c    |  4 +--
 layouts/community/ortho_5x12/riblee/keymap.c  | 10 +++----
 quantum/process_keycode/process_space_cadet.c | 14 ++++-----
 quantum/quantum_keycodes.h                    | 22 +++++++++-----
 quantum/quantum_keycodes_legacy.h             |  8 +++++
 quantum/via_ensure_keycode.h                  | 14 ++++-----
 tests/caps_word/test_caps_word.cpp            |  6 ++--
 users/gourdo1/autocorrect/autocorrection.c    |  2 +-
 users/hvp/per_key.c                           |  2 +-
 users/xulkal/layouts.h                        |  8 ++---
 226 files changed, 419 insertions(+), 403 deletions(-)

diff --git a/docs/feature_space_cadet.md b/docs/feature_space_cadet.md
index e290964241..63a3881da8 100644
--- a/docs/feature_space_cadet.md
+++ b/docs/feature_space_cadet.md
@@ -5,22 +5,22 @@ Steve Losh described the [Space Cadet Shift](https://stevelosh.com/blog/2012/10/
 ## Usage
 
 Firstly, in your keymap, do one of the following:
-- Replace the Left Shift key with `KC_LSPO` (Left Shift, Parenthesis Open), and Right Shift with `KC_RSPC` (Right Shift, Parenthesis Close).
-- Replace the Left Control key with `KC_LCPO` (Left Control, Parenthesis Open), and Right Control with `KC_RCPC` (Right Control, Parenthesis Close).
-- Replace the Left Alt key with `KC_LAPO` (Left Alt, Parenthesis Open), and Right Alt with `KC_RAPC` (Right Alt, Parenthesis Close).
-- Replace any Shift key in your keymap with `KC_SFTENT` (Right Shift, Enter).
+- Replace the Left Shift key with `SC_LSPO` (Left Shift, Parenthesis Open), and Right Shift with `SC_RSPC` (Right Shift, Parenthesis Close).
+- Replace the Left Control key with `SC_LCPO` (Left Control, Parenthesis Open), and Right Control with `SC_RCPC` (Right Control, Parenthesis Close).
+- Replace the Left Alt key with `SC_LAPO` (Left Alt, Parenthesis Open), and Right Alt with `SC_RAPC` (Right Alt, Parenthesis Close).
+- Replace any Shift key in your keymap with `SC_SENT` (Right Shift, Enter).
 
 ## Keycodes
 
-|Keycode    |Description                                |
-|-----------|-------------------------------------------|
-|`KC_LSPO`  |Left Shift when held, `(` when tapped      |
-|`KC_RSPC`  |Right Shift when held, `)` when tapped     |
-|`KC_LCPO`  |Left Control when held, `(` when tapped    |
-|`KC_RCPC`  |Right Control when held, `)` when tapped   |
-|`KC_LAPO`  |Left Alt when held, `(` when tapped        |
-|`KC_RAPC`  |Right Alt when held, `)` when tapped       |
-|`KC_SFTENT`|Right Shift when held, Enter when tapped   |
+|Keycode                                       |Aliases  |Description                             |
+|----------------------------------------------|---------|----------------------------------------|
+|`QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN`   |`SC_LCPO`|Left Control when held, `(` when tapped |
+|`QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE` |`SC_RCPC`|Right Control when held, `)` when tapped|
+|`QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN`  |`SC_LSPO`|Left Shift when held, `(` when tapped   |
+|`QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE`|`SC_RSPC`|Right Shift when held, `)` when tapped  |
+|`QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN`    |`SC_LAPO`|Left Alt when held, `(` when tapped     |
+|`QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE`  |`SC_RAPC`|Right Alt when held, `)` when tapped    |
+|`QK_SPACE_CADET_RIGHT_SHIFT_ENTER`            |`SC_SENT`|Right Shift when held, Enter when tapped|
 
 ## Caveats
 
@@ -32,7 +32,7 @@ COMMAND_ENABLE = no
 
 ## Configuration
 
-By default Space Cadet assumes a US ANSI layout, but if your layout uses different keys for parentheses, you can redefine them in your `config.h`. In addition, you can redefine the modifier to send on tap, or even send no modifier at all. The new configuration defines bundle all options up into a single define of 3 key codes in this order: the `Modifier` when held or when used with other keys, the `Tap Modifer` sent when tapped (no modifier if `KC_TRNS`), finally the `Keycode` sent when tapped. Now keep in mind, mods from other keys will still apply to the `Keycode` if say `KC_RSFT` is held while tapping `KC_LSPO` key with `KC_TRNS` as the `Tap Modifer`.
+By default Space Cadet assumes a US ANSI layout, but if your layout uses different keys for parentheses, you can redefine them in your `config.h`. In addition, you can redefine the modifier to send on tap, or even send no modifier at all. The new configuration defines bundle all options up into a single define of 3 key codes in this order: the `Modifier` when held or when used with other keys, the `Tap Modifer` sent when tapped (no modifier if `KC_TRNS`), finally the `Keycode` sent when tapped. Now keep in mind, mods from other keys will still apply to the `Keycode` if say `KC_RSFT` is held while tapping `SC_LSPO` key with `KC_TRNS` as the `Tap Modifer`.
 
 |Define          |Default                        |Description                                                                      |
 |----------------|-------------------------------|---------------------------------------------------------------------------------|
@@ -48,7 +48,7 @@ By default Space Cadet assumes a US ANSI layout, but if your layout uses differe
 
 ## Obsolete Configuration
 
-These defines are used in the above defines internally to support backwards compatibility, so you may continue to use them, however the above defines open up a larger range of flexibility than before. As an example, say you want to not send any modifier when you tap just `KC_LSPO`, with the old defines you had an all or nothing choice of using the `DISABLE_SPACE_CADET_MODIFIER` define. Now you can define that key as: `#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_9`. This tells the system to set Left Shift if held or used with other keys, then on tap send no modifier (transparent) with the `KC_9`.
+These defines are used in the above defines internally to support backwards compatibility, so you may continue to use them, however the above defines open up a larger range of flexibility than before. As an example, say you want to not send any modifier when you tap just `SC_LSPO`, with the old defines you had an all or nothing choice of using the `DISABLE_SPACE_CADET_MODIFIER` define. Now you can define that key as: `#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_9`. This tells the system to set Left Shift if held or used with other keys, then on tap send no modifier (transparent) with the `KC_9`.
 
 |Define                        |Default      |Description                                                       |
 |------------------------------|-------------|------------------------------------------------------------------|
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 230f88456b..0de0ce56b4 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -787,15 +787,15 @@ See also: [Programmable Button](feature_programmable_button.md)
 
 See also: [Space Cadet](feature_space_cadet.md)
 
-|Key        |Description                             |
-|-----------|----------------------------------------|
-|`KC_LCPO`  |Left Control when held, `(` when tapped |
-|`KC_RCPC`  |Right Control when held, `)` when tapped|
-|`KC_LSPO`  |Left Shift when held, `(` when tapped   |
-|`KC_RSPC`  |Right Shift when held, `)` when tapped  |
-|`KC_LAPO`  |Left Alt when held, `(` when tapped     |
-|`KC_RAPC`  |Right Alt when held, `)` when tapped    |
-|`KC_SFTENT`|Right Shift when held, Enter when tapped|
+|Key                                           |Aliases  |Description                             |
+|----------------------------------------------|---------|----------------------------------------|
+|`QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN`   |`SC_LCPO`|Left Control when held, `(` when tapped |
+|`QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE` |`SC_RCPC`|Right Control when held, `)` when tapped|
+|`QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN`  |`SC_LSPO`|Left Shift when held, `(` when tapped   |
+|`QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE`|`SC_RSPC`|Right Shift when held, `)` when tapped  |
+|`QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN`    |`SC_LAPO`|Left Alt when held, `(` when tapped     |
+|`QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE`  |`SC_RAPC`|Right Alt when held, `)` when tapped    |
+|`QK_SPACE_CADET_RIGHT_SHIFT_ENTER`            |`SC_SENT`|Right Shift when held, Enter when tapped|
 
 ## Swap Hands :id=swap-hands
 
diff --git a/keyboards/0xcb/static/keymaps/bongocat/keymap.c b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
index 4f51a1a744..144b8daaa4 100644
--- a/keyboards/0xcb/static/keymaps/bongocat/keymap.c
+++ b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                        KC_MPLY,
     QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENT,
-    KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSPC,
+    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  SC_RSPC,
     KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
 ),
 [_FN2] = LAYOUT_all(
diff --git a/keyboards/0xcb/static/keymaps/default/keymap.c b/keyboards/0xcb/static/keymaps/default/keymap.c
index 36070b6341..43261076e7 100644
--- a/keyboards/0xcb/static/keymaps/default/keymap.c
+++ b/keyboards/0xcb/static/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                        KC_MPLY,
     QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENT,
-    KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSPC,
+    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  SC_RSPC,
     KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
 ),
 [_FN2] = LAYOUT_all(
diff --git a/keyboards/0xcb/static/keymaps/via/keymap.c b/keyboards/0xcb/static/keymaps/via/keymap.c
index 8377675f41..2a8b2d7c25 100644
--- a/keyboards/0xcb/static/keymaps/via/keymap.c
+++ b/keyboards/0xcb/static/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                        KC_MPLY,
     QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENT,
-    KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSPC,
+    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  SC_RSPC,
     KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
 ),
 [_FN2] = LAYOUT_all(
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
index f7e54360ea..e874cc3fea 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_DVORAK] = LAYOUT(/* Base Dvorak */
 	  KC_TAB,           KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_BRIU, KC_EQL,     KC_F, KC_G, KC_C,    KC_R,   KC_L,   KC_BSPC,
 	  LCTL_T(KC_CAPS),  KC_A,    KC_O,    KC_E,   KC_U, KC_I, KC_BRID, LCTL(KC_F), KC_D, KC_H, KC_T,    KC_N,   KC_S,   KC_ENT,
-	  KC_LSPO,          KC_SCLN, KC_Q,    KC_J,   KC_K, KC_X, KC_LALT, KC_MINS,    KC_B, KC_M, KC_W,    KC_V,   KC_Z,   KC_RSPC,
+	  SC_LSPO,          KC_SCLN, KC_Q,    KC_J,   KC_K, KC_X, KC_LALT, KC_MINS,    KC_B, KC_M, KC_W,    KC_V,   KC_Z,   SC_RSPC,
 	                                              TD(TD_SWAP_LAYERS),                    KC_SPC
 	),
 
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_QWERTY] = LAYOUT(/* Base Qwerty */
 	  KC_TAB,           KC_Q,    KC_W,    KC_E,   KC_R, KC_T, KC_BRIU, KC_QUOT,    KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSPC,
 	  LCTL_T(KC_CAPS),  KC_A,    KC_S,    KC_D,   KC_F, KC_G, KC_BRID, LCTL(KC_F), KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_ENT,
-	  KC_LSPO,          KC_Z,    KC_X,    KC_C,   KC_V, KC_B, KC_LALT, KC_MINS,    KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+	  SC_LSPO,          KC_Z,    KC_X,    KC_C,   KC_V, KC_B, KC_LALT, KC_MINS,    KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
 	                                              TD(TD_SWAP_LAYERS),                    KC_SPC
 	),
 
diff --git a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
index 62cb24b11a..802a61b907 100644
--- a/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
+++ b/keyboards/4pplet/steezy60/keymaps/4pplet/keymap.c
@@ -6,14 +6,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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_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_LSPO, 	KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_RSPC, MO(2), 
+  SC_LSPO, 	KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, SC_RSPC, MO(2), 
   KC_LCTL, 	KC_LGUI, KC_NO,  KC_LALT, KC_RALT, MO(2),  KC_SPC, KC_RALT, KC_RGUI, KC_NO,   KC_APP,  KC_RCTL),
 
 [1] = 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_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_LSPO, KC_NO, 	KC_Z,   KC_X,     KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_RSPC, MO(2), 
+  SC_LSPO, KC_NO, 	KC_Z,   KC_X,     KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, SC_RSPC, MO(2), 
   KC_LCTL, KC_LGUI, KC_NO,  KC_LALT,	KC_RALT, MO(2),  KC_SPC, KC_RALT,	KC_RGUI, KC_NO,   KC_APP,  KC_RCTL),
 
 [2] = LAYOUT_all(
diff --git a/keyboards/atreus62/keymaps/hvp/keymap.c b/keyboards/atreus62/keymaps/hvp/keymap.c
index 4b5615c809..1a49f838fa 100644
--- a/keyboards/atreus62/keymaps/hvp/keymap.c
+++ b/keyboards/atreus62/keymaps/hvp/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC ,
     LT4_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC ,
     LT3_ESC,   KC_A,    KC_S,    KC_D,    LT(3,KC_F),    LT(4,KC_G),                        KC_H,    KC_J,    KC_K,    KC_L,    TD(TD1), TD(TD2) ,
-    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), KC_SFTENT ,
+    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), SC_SENT ,
     KC_LCTL,  KC_APP, _______, KC_LGUI,  KC_LALT,SFT_T(KC_SPC), LT2_BSP,   LT1_ENT,   SFT_T(KC_SPC),  KC_LSFT,  KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
   ),
 
diff --git a/keyboards/atreus62/keymaps/mfluid/keymap.c b/keyboards/atreus62/keymaps/mfluid/keymap.c
index 3c25a4b827..40eeb8b858 100644
--- a/keyboards/atreus62/keymaps/mfluid/keymap.c
+++ b/keyboards/atreus62/keymaps/mfluid/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,                      KC_6,   KC_7,  KC_8,    KC_9,   KC_0,    KC_MINS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,                      KC_Y,   KC_U,  KC_I,    KC_O,   KC_P,    KC_BSLS,
     KC_ESC,  KC_A,    KC_S,    KC_D,  KC_F,  KC_G,                      KC_H,   KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-    KC_LSPO, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,                      KC_N,   KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+    SC_LSPO, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,                      KC_N,   KC_M,  KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
     KC_LCTL, KC_LGUI, KC_LALT, MO(3), MO(1), KC_BSPC, KC_RCTL, KC_ENT,  KC_SPC, MO(2), KC_DEL,  KC_EQL, KC_LBRC, KC_RBRC 
   ),
 
diff --git a/keyboards/boardwalk/keymaps/niclake/keymap.c b/keyboards/boardwalk/keymaps/niclake/keymap.c
index ecfc64d41f..640ff8767e 100644
--- a/keyboards/boardwalk/keymaps/niclake/keymap.c
+++ b/keyboards/boardwalk/keymaps/niclake/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS, KC_EQL,  KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_LBRC, KC_RBRC, KC_J, KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
         FN,      KC_A,    KC_R,    KC_S,    KC_T,    KC_D, KC_HOME, KC_PGUP, KC_H, KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-        KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_END,  KC_PGDN, KC_K, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_END,  KC_PGDN, KC_K, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
                  KC_LCTL, KC_LALT, KC_LGUI, NUM,           KC_ENT,  KC_SPC,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
 
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS, KC_EQL,  KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN,      KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_HOME, KC_PGUP, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_END,  KC_PGDN, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_END,  KC_PGDN, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
                  KC_LCTL, KC_LALT, KC_LGUI, NUM,           KC_ENT,  KC_SPC,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
 
diff --git a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
index d0dd3f5928..e8a20abacf 100644
--- a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
+++ b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_DEL, KC_PSCR, 
         KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         KC_F5, KC_F6, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_NO, KC_PGDN, 
-        KC_F7, KC_F8, KC_LSPO, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, LT(2,KC_HOME), 
+        KC_F7, KC_F8, SC_LSPO, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_UP, LT(2,KC_HOME), 
         KC_F9, KC_F10, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_APP, KC_BSPC, KC_RALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT
         ),
         [1] = LAYOUT_all(
diff --git a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
index a3e69f6051..a37bad7210 100644
--- a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_ortho_4x12(
   KC_1,        KC_2,       KC_3,           KC_4,           KC_5,          KC_6,          KC_7,           KC_8,            KC_9,           KC_0,          KC_DEL,          KC_BSPC                ,
   LSFT(KC_1),  LSFT(KC_2), LSFT(KC_3),     LSFT(KC_4),     LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),     LSFT(KC_8),      LSFT(KC_9),     LSFT(KC_0),    LCTL(KC_DEL),    LCTL(KC_BSPC)          ,
-  KC_LSPO,     KC_NUBS,    KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
+  SC_LSPO,     KC_NUBS,    KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
   _______,     _______,    _______,        _______,        _______,       KC_DEL,        _______,        _______,         KC_MNXT,        KC_VOLD,       KC_VOLU,         KC_MPLY
 ),
 
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
index 26529d1f2f..fc49663fa4 100644
--- a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_INS,  KC_DEL,           KC_PGUP,
   KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,                   KC_PGDN,
   KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSPO, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSPC,          KC_UP,
+  SC_LSPO, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  SC_RSPC,          KC_UP,
   KC_LCTL, KC_LGUI, MO(_FL), KC_LALT,          KC_BSPC,KC_SPC,                       KC_RALT,  KC_APP,   MO(_FL),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index b9a3454e25..a537a36d2e 100644
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12, _______, _______,          BL_STEP,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,  KC_PAUS, _______,  _______, _______,                   _______,
     _______, _______,  MO_CTL, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,  _______, _______,  _______, _______,
-    KC_LSPO, _______, _______, _______, _______, _______, _______, _______,   MEDIA, _______,  _______, TO_MIDI,  _______, KC_RSPC,          KC_PGUP,
+    SC_LSPO, _______, _______, _______, _______, _______, _______, _______,   MEDIA, _______,  _______, TO_MIDI,  _______, SC_RSPC,          KC_PGUP,
     _______, _______, _______, _______,                   _______, _______,                    _______, _______,  _______, MO_FUNC, KC_HOME, KC_PGDN, KC_END),
 
   /* Keymap _ME: Media layer */
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
index ab84e5c580..90cd186c06 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
      ESC_CTL, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,              KC_D,   KC_H,   KC_T,   KC_N,   KC_S, KC_MINUS,\
   //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     KC_LSFT,KC_SCLN, KC_Q,   KC_J,   KC_K,   KC_X,              KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,KC_SFTENT,\
+     KC_LSFT,KC_SCLN, KC_Q,   KC_J,   KC_K,   KC_X,              KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,SC_SENT,\
   //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
                                 KC_LGUI, LOWER, KC_SPC,    KC_BSPC, RAISE,KC_RALT \
                              //`-----------------------'  `----------------------'
diff --git a/keyboards/crkbd/keymaps/hvp/keymap.c b/keyboards/crkbd/keymaps/hvp/keymap.c
index bdc8746199..7e1953e34d 100644
--- a/keyboards/crkbd/keymaps/hvp/keymap.c
+++ b/keyboards/crkbd/keymaps/hvp/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
     LSFT_T(KC_ESC),  KC_A,  KC_S,  KC_D,  LT(3,KC_F), KC_G, KC_H,  KC_J,  KC_K,  KC_L,TD(TD1),TD(TD2),
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    KC_LCTL,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,                   KC_N,  KC_M,KC_COMM,KC_DOT,TD(TD3),KC_SFTENT,
+    KC_LCTL,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,                   KC_N,  KC_M,KC_COMM,KC_DOT,TD(TD3),SC_SENT,
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
                                 KC_LGUI, LT(1,KC_SPC),MT(MOD_LSFT, KC_SPC),   MT(MOD_LSFT,KC_ENT), LT(2,KC_SPC),KC_LALT
                               //`--------------------'  `--------------------'
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index b0059705a0..d77fc16e34 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -76,8 +76,8 @@ user_config_t user_config;
 #define WIN_CLS LALT(KC_F4)
 
 // CTRL become parens keys on NAV and NUM layers
-#define LCT_PRN KC_LCPO
-#define RCT_PRN KC_RCPC
+#define LCT_PRN SC_LCPO
+#define RCT_PRN SC_RCPC
 
 // €
 #define KC_EUR ALGR(KC_5)
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 1082ab4e60..054ac77191 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+-------+------+-------+--------|
     KC_LCTL,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,                   KC_H,  KC_J,  KC_K,  KC_L, KC_SCLN,KC_QUOT,
   //|------+------+------+------+------+------|                |------+------+-------+------+-------+--------|
-    KC_LSPO,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,                   KC_N,  KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSPC,
+    SC_LSPO,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,                   KC_N,  KC_M,KC_COMM,KC_DOT,KC_SLSH,SC_RSPC,
   //|------+------+------+------+------+------+------|  |------+------+------+-------+------+-------+--------|
                                KC_LGESC,LOWER, KC_SPC,   RCTL_T(KC_ENT), RAISE, KC_RACL
                               //`--------------------'  `--------------------'
diff --git a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
index 8327fe685d..4d26c7adc7 100644
--- a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
@@ -62,7 +62,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_BSPC,
     LS_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RS_QUOT,
     LCT_MINS,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RCT_EQL,
-    KC_LCTL, KC_LALT, KC_LGUI, XMONAD,  KC_LSPO, KC_SPACE,_______, ENT_RSE, KC_RSPC, LOWER,   KC_RALT, KC_RCTL
+    KC_LCTL, KC_LALT, KC_LGUI, XMONAD,  SC_LSPO, KC_SPACE,_______, ENT_RSE, SC_RSPC, LOWER,   KC_RALT, KC_RCTL
 ),
 
 [_XMONAD] = LAYOUT_plaid_grid( // Xmonad with MOD4
diff --git a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
index 3149bec5de..82494e40af 100644
--- a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | Ctrl | LGUI | Alt  |   [  |Lower |    Space    |Raise |   ]  | RGUI |   \  | RS/) |
      * `-----------------------------------------------------------------------------------'
      */
-    [_QWERTY] = LAYOUT_planck_mit(KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_LGUI, KC_LALT, KC_LBRC, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, KC_RSPC),
+    [_QWERTY] = LAYOUT_planck_mit(KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_LGUI, KC_LALT, KC_LBRC, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, SC_RSPC),
 
     /* Colemak
      * ,-----------------------------------------------------------------------------------.
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
 
-    [_COLEMAK] = LAYOUT_planck_mit(KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, KC_RSPC),
+    [_COLEMAK] = LAYOUT_planck_mit(KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, SC_RSPC),
 
     /* Dvorak
      * ,-----------------------------------------------------------------------------------.
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
 
-    [_DVORAK] = LAYOUT_planck_mit(KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, KC_RSPC),
+    [_DVORAK] = LAYOUT_planck_mit(KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, SC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, SC_RSPC),
 
     /* LOWER
      * ,----------------------------------------------------------------------------.
diff --git a/keyboards/drhigsby/bkf/keymaps/default/keymap.c b/keyboards/drhigsby/bkf/keymaps/default/keymap.c
index 9644532b07..af32e9121f 100644
--- a/keyboards/drhigsby/bkf/keymaps/default/keymap.c
+++ b/keyboards/drhigsby/bkf/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_625uC(
         QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL,
         KC_TAB,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,     KC_ENT,
-        KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+        SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
         KC_LCTL, KC_LGUI, KC_LALT,           KC_SPC,                        NUM, FN, KC_QUOT
   ),
 
diff --git a/keyboards/dz60/keymaps/LEdiodes/keymap.c b/keyboards/dz60/keymaps/LEdiodes/keymap.c
index 3fdd37803c..cec6e859f5 100644
--- a/keyboards/dz60/keymaps/LEdiodes/keymap.c
+++ b/keyboards/dz60/keymaps/LEdiodes/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * This layer has a key set to MO(_L1) which means when held down Layer 1 will become active, If Layer 1 does not have anything set for tat key is will revert to uing the key set at layer 0.
  * LT(_L1, KC_1) means that when the "1" key is long touched then it will activate the layer _L1 key(F1) but if the key is just tapped it will activate the "1" key.
  * QK_GESC = Escape when tapped, ` when pressed with Shift or GUI
- * KC_LSPO = Left Shift when held, ( when tapped
+ * SC_LSPO = Left Shift when held, ( when tapped
  * TD(LT(_L3,KC_SPACE)) = This is a test... hoping it will tap dance if double tapped it does enter if single tap it does space if long hold down it does _L3(Layer 3).
  * LT(_L3,KC_SPACE) = if tapped it does space, is long touch it does _L3(Layer 3)
  * BL_TOGG = Toggles the LEDs.
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       QK_GESC,              LT(_L1, KC_1),LT(_L1, KC_2),LT(_L1, KC_3),LT(_L1, KC_4),LT(_L1, KC_5),LT(_L1, KC_6),LT(_L1, KC_7),LT(_L1, KC_8),LT(_L1, KC_9),LT(_L1, KC_0),LT(_L1, KC_MINS),LT(_L1, KC_EQL),KC_BSPC,  KC_DEL,    \
       KC_TAB,              KC_Q,    KC_W,    KC_E,     KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_BSLS,   \
       KC_CAPS,             KC_A,    KC_S,    KC_D,     KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,              KC_ENT,    \
-      KC_LSPO,   KC_Z,    KC_X,     KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    TO(_L1), \
+      SC_LSPO,   KC_Z,    KC_X,     KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    TO(_L1), \
       KC_LCTL,             KC_LGUI, KC_LALT, LT(_L3,KC_SPACE),BL_TOGG,TD(TD_SPC_ENT),     KC_RGUI, TO(_L2), KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
 /* Keymap _L1: (Layer 1) This is function layer 1
diff --git a/keyboards/dz60/keymaps/bingocaller/keymap.c b/keyboards/dz60/keymaps/bingocaller/keymap.c
index 7c09b1f2a8..6e1bb29481 100644
--- a/keyboards/dz60/keymaps/bingocaller/keymap.c
+++ b/keyboards/dz60/keymaps/bingocaller/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
         LCTL_T(KC_ESC), KC_A, KC_S, LT(_ARROWS, KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_NO,
+        SC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_NO,
         ALL_T(KC_CAPS), KC_LALT, KC_LGUI, KC_NO, LT(_MOUSE, KC_SPC), KC_NO, KC_RGUI, KC_RALT, KC_NO, MO(_FN), ALL_T(KC_CAPS)),
 
     /*  Layer 1:
diff --git a/keyboards/dz60/keymaps/drewsky/keymap.c b/keyboards/dz60/keymaps/drewsky/keymap.c
index 71dd913bb6..0de122a7f0 100755
--- a/keyboards/dz60/keymaps/drewsky/keymap.c
+++ b/keyboards/dz60/keymaps/drewsky/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			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_LSPO,      KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, 
+			SC_LSPO,      KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, 
 			KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                                 TT(2),   KC_RALT,    MO(1),    KC_RCTL),
 	
   [_L1] = LAYOUT_60_ansi(
diff --git a/keyboards/dz60/keymaps/hailbreno/keymap.c b/keyboards/dz60/keymaps/hailbreno/keymap.c
index 813bf00035..3abc57aca6 100644
--- a/keyboards/dz60/keymaps/hailbreno/keymap.c
+++ b/keyboards/dz60/keymaps/hailbreno/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,          KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS,  KC_EQL,  KC_BSLS, KC_GRV,
   KC_TAB,             KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_LBRC,  KC_RBRC,       KC_DEL,
   LT(_FUNC,KC_CAPS),   KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  KC_QUOT,             KC_ENT,
-  KC_LSPO, X,         KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  KC_RSPC,  KC_UP,     RGB,
+  SC_LSPO, X,         KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,  KC_UP,     RGB,
   KC_LCTL,            KC_LALT,  KC_LGUI,  KC_BSPC,    FUNC2,   KC_SPC,     KC_RALT,  KC_APP,  KC_LEFT,  KC_DOWN,   KC_RGHT),
 
 /* COLEMAK
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,          KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_MINS,  KC_EQL,  KC_BSLS, KC_GRV,
   KC_TAB,             KC_Q,  KC_W,  KC_F,  KC_P,  KC_G,  KC_J,  KC_L,  KC_U,  KC_Y,  KC_SCLN,  KC_LBRC,  KC_RBRC,    KC_DEL,
   LT(_FUNC,KC_CAPS),   KC_A,  KC_R,  KC_S,  KC_T,  KC_D,  KC_H,  KC_N,  KC_E,  KC_I,  KC_O,  KC_QUOT,                KC_ENT,
-  KC_LSPO, X,         KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_K,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  KC_RSPC,  KC_UP,     RGB,
+  SC_LSPO, X,         KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_K,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,  KC_UP,     RGB,
   KC_LCTL,            KC_LALT,  KC_LGUI,  KC_BSPC,    FUNC2,   KC_SPC,     KC_RALT,  KC_APP,  KC_LEFT,  KC_DOWN,   KC_RGHT),
 
 /* DVORAK
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,         KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_LBRC,  KC_RBRC,  KC_BSLS, KC_GRV,
   KC_TAB,          KC_QUOTE,  KC_COMM,  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_SLSH,  KC_EQL,  KC_DEL,
   LT(_FUNC,KC_CAPS),   KC_A,  KC_O,  KC_E,  KC_U,  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_MINS,                KC_ENT,
-  KC_LSPO, X,         KC_SCLN,  KC_Q,  KC_J,  KC_K,  KC_X,  KC_B,  KC_M,  KC_W, KC_V,  KC_Z,  KC_RSPC,     KC_UP,       RGB,
+  SC_LSPO, X,         KC_SCLN,  KC_Q,  KC_J,  KC_K,  KC_X,  KC_B,  KC_M,  KC_W, KC_V,  KC_Z,  SC_RSPC,     KC_UP,       RGB,
   KC_LCTL,            KC_LALT,  KC_LGUI,  KC_BSPC,    FUNC2,   KC_SPC,      KC_RALT,  KC_APP,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
 /* FUNC
diff --git a/keyboards/dz60/keymaps/marianas/keyDefinitions.h b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
index f3122acf5f..3e99580e04 100644
--- a/keyboards/dz60/keymaps/marianas/keyDefinitions.h
+++ b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
@@ -39,11 +39,11 @@
 
 //Modifiers
 #define CTLL KC_LCTL
-#define LEFTSHFT KC_LSPO
+#define LEFTSHFT SC_LSPO
 #define WINL KC_LGUI
 #define ALTL KC_LALT
 #define CTLR KC_RCTL
-#define RIGHT_SHIFT__PAREN KC_RSPC
+#define RIGHT_SHIFT__PAREN SC_RSPC
 #define WINR KC_RGUI
 #define ALTR KC_RALT
 #define APPR KC_APP
diff --git a/keyboards/dz60/keymaps/marianas/relativity.c b/keyboards/dz60/keymaps/marianas/relativity.c
index 96a5eb4e6f..d2b9393400 100644
--- a/keyboards/dz60/keymaps/marianas/relativity.c
+++ b/keyboards/dz60/keymaps/marianas/relativity.c
@@ -400,8 +400,8 @@ bool storeShiftState(uint16_t keycode, keyrecord_t *record)
   {
     switch (keycode)
     {
-      case KC_LSPO:
-      case KC_RSPC:
+      case SC_LSPO:
+      case SC_RSPC:
         shifted = true;
     }
   }
@@ -410,8 +410,8 @@ bool storeShiftState(uint16_t keycode, keyrecord_t *record)
     switch (keycode)
     {
 
-      case KC_LSPO:
-      case KC_RSPC:
+      case SC_LSPO:
+      case SC_RSPC:
         shifted = false;
         return true;
     }
diff --git a/keyboards/dz60/keymaps/mpstewart/keymap.c b/keyboards/dz60/keymaps/mpstewart/keymap.c
index d83acfde74..8cc97a549b 100644
--- a/keyboards/dz60/keymaps/mpstewart/keymap.c
+++ b/keyboards/dz60/keymaps/mpstewart/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*0_*/ KC_SLEP, KC_F1,   KC_F2  , KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,    KC_DEL,
 /*1_*/ KC_CAPS,          KC_BRID,  KC_BRIU,  KC_NO,    QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_NO,     KC_NO,
 /*2_*/ KC_NO,            KC_VOLD,  KC_VOLU,  KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_RGHT, KC_RETURN,
-/*3_*/ KC_LSPO,          KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_PGDN, KC_DOWN,          KC_RSPC,   KC_TRNS,
+/*3_*/ SC_LSPO,          KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_PGDN, KC_DOWN,          SC_RSPC,   KC_TRNS,
 /*4_*/ KC_LCTL, KC_LALT,          KC_LGUI,                    KC_SPC,                             KC_RGUI, KC_RALT,          KC_APP,    AG_TOGG
   ),
 
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
index 2f34e03d3f..2b44828c76 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
 		LT_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           \
-		KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MT_SLSH,          KC_UP,   LT_DEL,  \
+		SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MT_SLSH,          KC_UP,   LT_DEL,  \
 		KC_LCTL, KC_LGUI, LM_LALT,       KC_SPC,                                MT_APP,  MO(_FNC),         KC_LEFT, KC_DOWN, KC_RGHT  \
 	),
 	[_FNM] = LAYOUT(
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
index 994c2a3a9a..6ed31b62bc 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         CTL_ESC,   KC_A,    KC_S,    ARROWS,  KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSPO,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC,
+        SC_LSPO,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,
         HYPR_CAPS, KC_LALT, KC_LGUI,                            MOUSP,                              KC_RGUI, KC_RALT, FN,      HYPR_CAPS
     ),
 
diff --git a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
index b39359fa0b..878e3ee91b 100644
--- a/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
+++ b/keyboards/dztech/dz60rgb_wkl/keymaps/hhkb/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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,
         CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSPO,        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(1),
+        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(1),
         _______,     KC_LALT, KC_LGUI,                            KC_SPC,                                      KC_RGUI, KC_RALT, _______
     ),
     [1] = LAYOUT_60_tsangan_hhkb(
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index 07ed4f06e6..70283fa841 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		QK_GESC, KC_1,     KC_2,     KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,  \
 		KC_TAB,  KC_Q,     KC_W,     KC_E,   KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS, KC_PGUP, \
 		LT_CAPS, KC_A,     KC_S,     KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,           KC_ENT,  KC_PGDN, \
-		KC_LSPO, KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSPC,           KC_UP,   KC_END,  \
+		SC_LSPO, KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,           KC_UP,   KC_END,  \
 		KC_LCTL, KC_LGUI,  LM_LALT,                   KC_SPC,                             KC_RALT, MO(_FNC), KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT  \
 	),
 	[_FNM]    = LAYOUT_65_ansi(
diff --git a/keyboards/elephant42/keymaps/default/keymap.c b/keyboards/elephant42/keymaps/default/keymap.c
index e0235d75bb..7cb90fe35e 100644
--- a/keyboards/elephant42/keymaps/default/keymap.c
+++ b/keyboards/elephant42/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 #define KC_VU KC_AUDIO_VOL_UP
 #define KC_VD KC_AUDIO_VOL_DOWN
 #define KC_MU KC_AUDIO_MUTE
-#define KC_LSPC LT(_LOWER, KC_SPC)
-#define KC_RSPC LT(_RAISE, KC_SPC)
+#define SC_LSPC LT(_LOWER, KC_SPC)
+#define SC_RSPC LT(_RAISE, KC_SPC)
 
 enum layer_names {
     _QWERTY,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
               KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                                      KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT,     KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------|
              XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN,                                     KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL ,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT,     KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
              KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD,                                     KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT,     KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   )
 };
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
index 61a6779ebf..b1a343bbdf 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_DLR,           KC_AMPR,  KC_LBRC,  KC_LCBR, KC_RCBR, KC_LPRN, KC_CIRC,           KC_F4,        KC_EQUAL,KC_ASTR, KC_BSLS,   KC_PLUS, KC_RBRC,     KC_EXLM,
     GUI_T(KC_BSLS),   KC_SCLN,  KC_COMMA, KC_DOT,  KC_P,    KC_Y,    KC_PERC,           KC_DELETE,    KC_F,    KC_G,    KC_C,      KC_R,    KC_L,        KC_SLASH,
     MO(NUM),          KC_A,     KC_O,     KC_E,    KC_U,    KC_I,                                     KC_D,    KC_H,    KC_T,      KC_N,    KC_S,        KC_MINUS,
-    KC_LSPO,          KC_QUOTE, KC_Q,     KC_J,    KC_K,    KC_X,    KC_LALT,           TD(TAP_MACRO),KC_B,    KC_M,    KC_W,      KC_V,    KC_Z,        KC_RSPC,
+    SC_LSPO,          KC_QUOTE, KC_Q,     KC_J,    KC_K,    KC_X,    KC_LALT,           TD(TAP_MACRO),KC_B,    KC_M,    KC_W,      KC_V,    KC_Z,        SC_RSPC,
     KC_AT,            KC_HASH,  KC_GRAVE, KC_LEFT, KC_RIGHT,                                                   KC_UP,   KC_DOWN,   KC_HOME, KC_END,      TO(QWERTY),
                                          ALT_T(KC_APPLICATION), ALL_T(KC_NO),           KC_PGUP, KC_LGUI,
                                                                    KC_BSLS,             TO(MAC),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_EQUAL,   KC_1,     KC_2,         KC_3,     KC_4,     KC_5,    KC_LEFT,           KC_RIGHT,     KC_6,   KC_7,   KC_8,     KC_9,         KC_0,         KC_MINUS,
     KC_DELETE,  KC_Q,     KC_W,         KC_E,     KC_R,     KC_T,    KC_Y,              TO(BASE),     KC_Y,   KC_U,   KC_I,     KC_O,         KC_P,         KC_BSLS,
     MO(NUM),    KC_A,     KC_S,         KC_D,     KC_F,     KC_G,                                     KC_H,   KC_J,   KC_K,     KC_L,         KC_SCLN,      GUI_T(KC_QUOT),
-    KC_LSFT,    KC_Z,     KC_X,         KC_C,     KC_V,     KC_B, ALT_T(KC_NO),         MEH_T(KC_NO), KC_N,   KC_M,   KC_COMMA, KC_DOT,       KC_SLASH,     KC_RSPC,
+    KC_LSFT,    KC_Z,     KC_X,         KC_C,     KC_V,     KC_B, ALT_T(KC_NO),         MEH_T(KC_NO), KC_N,   KC_M,   KC_COMMA, KC_DOT,       KC_SLASH,     SC_RSPC,
     KC_GRAVE,   KC_QUOTE, LALT(KC_TAB), KC_LEFT,  KC_RIGHT,                                                   KC_UP,  KC_DOWN,  KC_LBRC,      KC_RBRC,      TO(BASE),
                                                   ___, KC_LGUI,                         ___, KC_ESCAPE,
                                                        KC_HOME,                         KC_PGUP,
diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c
index 04aa6a99fd..d878b8a9da 100644
--- a/keyboards/ergodox_ez/keymaps/skug/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,           KC_1,           KC_2,          KC_3,    KC_4,    KC_5,   KC_INS,
     KC_TAB,           KC_Q,           KC_W,          KC_E,    KC_R,    KC_T,   TG(SYMB),
     MO(ARRW),         KC_A,           KC_S,          KC_D,    KC_F,    KC_G,
-    KC_LSPO,          CTL_T(KC_Z),    KC_X,          KC_C,    KC_V,    KC_B,   KC_WBAK,
+    SC_LSPO,          CTL_T(KC_Z),    KC_X,          KC_C,    KC_V,    KC_B,   KC_WBAK,
     CTL_T(SE_QUOT),   SE_ACUT,        KC_LALT,       KC_BSPC, KC_SPC,
                                                                              SE_LABK,   KC_END,
                                                               KC_LEFT,      KC_RIGHT,  KC_PGDN,
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          TO(ARRW),       KC_6,   KC_7,   KC_8,    KC_9,    KC_0,              SE_PLUS,
          TG(SYMB),       KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,              SE_ARNG,
                          KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, SE_ODIA), LT(SYMB, SE_ADIA),
-         KC_WFWD,        KC_N,   KC_M,   KC_COMM, KC_DOT,  SE_MINS,           KC_RSPC,
+         KC_WFWD,        KC_N,   KC_M,   KC_COMM, KC_DOT,  SE_MINS,           SC_RSPC,
                                  KC_SPC, KC_BSPC, KC_ALGR, SE_ASTR,           CTL_T(SE_TILD),
         KC_HOME,  SE_CIRC,
         KC_PGUP,  KC_UP,         KC_DOWN,
diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c
index 016bec72f4..ef8ca63e3b 100644
--- a/keyboards/ergodox_ez/keymaps/testing/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c
@@ -20,7 +20,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
+  [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,SC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
 
   [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCLN,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI),
 
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/README.md b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
index 9781c55a1c..e7c7096f77 100644
--- a/keyboards/ergodox_ez/util/keymap_beautifier/README.md
+++ b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
@@ -7,7 +7,7 @@ This Python 3 script, by [Tsan-Kuang Lee](https://github.com/tsankuanglee) takes
 For example, the original `keymap.c` looks like
 
 ```
-[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
+[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,SC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
 ```
 
 The beautifier parses it and outputs:
@@ -19,7 +19,7 @@ The beautifier parses it and outputs:
 KC_EQUAL      , KC_1       , KC_2           , KC_3   , KC_4    , KC_5, LCTL(KC_MINUS),
 KC_DELETE     , KC_Q       , KC_W           , KC_E   , KC_R    , KC_T, KC_LBRC   ,
 KC_BSPC       , KC_A       , KC_S           , KC_D   , KC_F    , KC_G,
-KC_LSPO       , CTL_T(KC_Z), KC_X           , KC_C   , KC_V    , KC_B, ALL_T(KC_NO)  ,
+SC_LSPO       , CTL_T(KC_Z), KC_X           , KC_C   , KC_V    , KC_B, ALL_T(KC_NO)  ,
 LT(1,KC_GRAVE), KC_QUOTE   , LALT(KC_LSFT)  , KC_LEFT, KC_RIGHT,
 
 // left thumb
@@ -33,7 +33,7 @@ KC_SPACE, KC_UNDS              , KC_END ,
 LCTL(KC_EQUAL), KC_6, KC_7       , KC_8    , KC_9       , KC_0           , KC_MINUS       ,
 KC_RBRC       , KC_Y, KC_U       , KC_I    , KC_O       , KC_P           , KC_BSLS        ,
                 KC_H, ALT_T(KC_J), KC_K    , KC_L       , LT(2,KC_SCLN)  , GUI_T(KC_QUOTE),
-MEH_T(KC_NO)  , KC_N, KC_M       , KC_COMMA, KC_DOT     , CTL_T(KC_SLASH), KC_RSPC        ,
+MEH_T(KC_NO)  , KC_N, KC_M       , KC_COMMA, KC_DOT     , CTL_T(KC_SLASH), SC_RSPC        ,
                       KC_UP      , KC_DOWN , KC_LBRC,     KC_RBRC        , TT(1)          ,
 
 // right thumb
diff --git a/keyboards/evyd13/wonderland/keymaps/default/keymap.c b/keyboards/evyd13/wonderland/keymaps/default/keymap.c
index 987e7f7826..cb81428043 100644
--- a/keyboards/evyd13/wonderland/keymaps/default/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_PGUP, KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
  KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
           KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-          KC_LCTL,    KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   KC_RCTL
+          KC_LCTL,    SC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       SC_RAPC,                   KC_RCTL
    ),
 [_FUNC] = LAYOUT(
  RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
diff --git a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
index 2020f2ceae..d56324567c 100644
--- a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F10, KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
   KC_F11, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, \
           KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), \
-          KC_LCTL,    KC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, KC_RAPC,                   KC_RCTL \
+          KC_LCTL,    SC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, SC_RAPC,                   KC_RCTL \
    ),
 [_FUNC] = LAYOUT(
  RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT, \
diff --git a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
index 974c8f9804..3dc90de8f2 100644
--- a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_HOME, KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
  KC_END,  CAPSTL,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
           KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_DEL,  MO(2),
-          TG(1),      KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   MO(3)
+          TG(1),      SC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       SC_RAPC,                   MO(3)
    ),
 [_GAME] = LAYOUT(
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_BSPC,  _______,
diff --git a/keyboards/evyd13/wonderland/keymaps/via/keymap.c b/keyboards/evyd13/wonderland/keymaps/via/keymap.c
index f58b30b310..886a376ae7 100644
--- a/keyboards/evyd13/wonderland/keymaps/via/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/via/keymap.c
@@ -7,7 +7,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-                 KC_LCTL,          KC_LAPO,          KC_BSPC, KC_LGUI, KC_SPC,                    KC_RAPC,                            KC_RCTL
+                 KC_LCTL,          SC_LAPO,          KC_BSPC, KC_LGUI, KC_SPC,                    SC_RAPC,                            KC_RCTL
     ),
 	[1] = LAYOUT(
         RGB_TOG,  VK_TOGG, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   QK_BOOT,
diff --git a/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c b/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
index f99bd7461b..8e79d5a4f8 100644
--- a/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
+++ b/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
@@ -45,7 +45,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_BSPC,
   KC_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
   KC_MINS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_EQL,
-  KC_LCTL,KC_LALT,KC_LGUI,MOD4,   KC_LSPO,KC_SPC, RAISE,  KC_RSPC,KC_RALT,KC_RGUI,FNLAY,  KC_RCTL
+  KC_LCTL,KC_LALT,KC_LGUI,MOD4,   SC_LSPO,KC_SPC, RAISE,  SC_RSPC,KC_RALT,KC_RGUI,FNLAY,  KC_RCTL
 ),
 /* Raise
  * .-----------------------------------------------------------------------------------.
diff --git a/keyboards/foostan/cornelius/keymaps/hvp/keymap.c b/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
index e514e0c68e..247eaf7a4e 100644
--- a/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
+++ b/keyboards/foostan/cornelius/keymaps/hvp/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
     LT4_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
     LT3_ESC, MT(MOD_LGUI, KC_A), MT(MOD_LALT, KC_S), MT(MOD_LSFT, KC_D), MT(MOD_LCTL, KC_F), LT(4,KC_G), MT(MOD_RCTL, KC_H), MT(MOD_RSFT, KC_J), MT(MOD_RALT,KC_K), MT(MOD_RGUI,KC_L), TD(TD1), TD(TD2),
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TD(TD3), KC_SFTENT,
-    KC_LCPO, KC_LCTL, KC_LGUI, KC_LALT, LT2,  KC_SPC,  KC_ENT,  LT1,  KC_RALT, KC_RGUI, KC_RCTL, KC_RSPC
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TD(TD3), SC_SENT,
+    SC_LCPO, KC_LCTL, KC_LGUI, KC_LALT, LT2,  KC_SPC,  KC_ENT,  LT1,  KC_RALT, KC_RGUI, KC_RCTL, SC_RSPC
   ),
 
 [1] = LAYOUT( /* Right */
diff --git a/keyboards/funky40/keymaps/default/keymap.c b/keyboards/funky40/keymaps/default/keymap.c
index a539db0eb7..f30b01228c 100644
--- a/keyboards/funky40/keymaps/default/keymap.c
+++ b/keyboards/funky40/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT(
 		QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 
 		KC_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_SFTENT, 
+		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_LGUI, KC_LALT, KC_SPC, LT(1, KC_DEL), KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
 
 	LAYOUT(
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
index 587695fdfa..f48e6b0f5b 100644
--- a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,              KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,     KC_BSPC,
     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,              KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,
     OSL(CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,    KC_ENT,
-    KC_LSPO,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,              KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSPC,
+    SC_LSPO,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,              KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,
     KC_LCTL,   KC_LGUI, KC_LALT,                   LT(SPACE, KC_SPC),                                     KC_RALT, OSL(FN1), TG(NUMPAD), KC_RCTL
   ),
 
diff --git a/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
index dd7e32f7dc..84db1a188e 100644
--- a/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LBRC, KC_1,    SC_SCTL, SC_SPLT, SC_SPFN, KC_5,          KC_6,    SC_GBRC, SC_SPRT, SC_SCTR, KC_0,    KC_RBRC,
      SC_MESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
      KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+     SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
                                          SC_NMPD, KC_BSPC,       KC_SPC,  SC_SYMB
   ),
 
diff --git a/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
index cc0fbb2628..9f46cc5d3e 100644
--- a/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
      KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
   //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+     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_SCTL, KC_SPFN, KC_SPLT, KC_AMPR, KC_NMPD, KC_SPC,       KC_SPC,  KC_SYMB, KC_ASTR, KC_EXLM, KC_LBRC, KC_SCTR
   //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
diff --git a/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
index f4c9ad81ca..48694a6e15 100644
--- a/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|-------+-------+-------+-------+-------+-------+-------|     |-------+-------+-------+-------+-------+-------+-------|
      KC_TAB , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_SPLT,      KC_SPRT, KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_ENT ,
   //|-------+-------+-------+-------+-------+-------+-------|     |-------+-------+-------+-------+-------+-------+-------|
-     KC_LSPO, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_SPFN,      KC_GBRC, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC,
+     SC_LSPO, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_SPFN,      KC_GBRC, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,SC_RSPC,
   //|-------+-------+-------+-------+-------+-------+-------|     |-------+-------+-------+-------+-------+-------+-------|
                                      KC_NMPD,KC_BSPC,                      KC_SPC ,KC_SYMB
   // \------------------------------+-------+-------+------/       \------+-------+-------+------------------------------/
diff --git a/keyboards/glenpickle/chimera_ortho_plus/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ortho_plus/keymaps/default/keymap.c
index 9b45037701..85989f2416 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/keymaps/default/keymap.c
+++ b/keyboards/glenpickle/chimera_ortho_plus/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|-------+-------+-------+-------+-------+-------|     |-------+-------+-------+-------+-------+-------|
      KC_TAB , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,       KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_ENT ,
   //|-------+-------+-------+-------+-------+-------|     |-------+-------+-------+-------+-------+-------|
-     KC_LSPO, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,       KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC,
+     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_NMPD,KC_BSPC,      KC_SPC ,KC_SYMB
   //|-------------------------------+-------+-------|     |-------+-------+-------------------------------|
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
index cc33c93b23..4b1c571e35 100644
--- a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
+++ b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC        , KC_1   , KC_2   , KC_3 , KC_4 , KC_5 , KC_6  , KC_7 , KC_8 , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
     KC_TAB         , KC_Q   , KC_W   , KC_E , KC_R , KC_T , KC_Y  , KC_U , KC_I , KC_O   , KC_P   , KC_LBRC, KC_RBRC,
     MO(1)          , KC_A   , KC_S   , KC_D , KC_F , KC_G , KC_H  , KC_J , KC_K , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
-    KC_LSPO        , KC_NUBS, KC_Z   , KC_X , KC_C , KC_V , KC_B  , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC         ,
-    KC_LCPO        , KC_LGUI, KC_LALT,                      KC_SPC,                                 KC_APP , KC_RALT, KC_RCPC
+    SC_LSPO        , KC_NUBS, KC_Z   , KC_X , KC_C , KC_V , KC_B  , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, SC_RSPC         ,
+    SC_LCPO        , KC_LGUI, KC_LALT,                      KC_SPC,                                 KC_APP , KC_RALT, SC_RCPC
   ),
 
   /* 1: second layer for media keys and many advanced features ç
diff --git a/keyboards/handwired/aek64/keymaps/default/keymap.c b/keyboards/handwired/aek64/keymaps/default/keymap.c
index ad27f8fa39..ff5ca48ad7 100644
--- a/keyboards/handwired/aek64/keymaps/default/keymap.c
+++ b/keyboards/handwired/aek64/keymaps/default/keymap.c
@@ -26,8 +26,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_BSPC,
     KC_TAB , KC_Q   , KC_W   , KC_E , KC_R , KC_T , KC_Y  , KC_U , KC_I , KC_O   , KC_P   , KC_LBRC, KC_RBRC,
     MO(1)  , KC_A   , KC_S   , KC_D , KC_F , KC_G , KC_H  , KC_J , KC_K , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
-    KC_LSPO, KC_NUBS, KC_Z   , KC_X , KC_C , KC_V , KC_B  , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC         ,
-    KC_LCPO, KC_LALT, KC_LGUI,                      KC_SPC,                                 KC_RGUI, KC_RALT, KC_RCPC
+    SC_LSPO, KC_NUBS, KC_Z   , KC_X , KC_C , KC_V , KC_B  , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, SC_RSPC         ,
+    SC_LCPO, KC_LALT, KC_LGUI,                      KC_SPC,                                 KC_RGUI, KC_RALT, SC_RCPC
   ),
 
   /* 1: second layer for media keys and many advanced features ç
diff --git a/keyboards/handwired/aranck/keymaps/default/keymap.c b/keyboards/handwired/aranck/keymaps/default/keymap.c
index db11a2182a..9e732dd0b4 100644
--- a/keyboards/handwired/aranck/keymaps/default/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    LSFT_T(KC_CAPS), KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+    LSFT_T(KC_CAPS), KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
     LT(_SODA, KC_PWR), KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), LT(_SPACE, KC_SPC), MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
index a9c99f726d..496cde905a 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    LSFT_T(KC_CAPS), KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+    LSFT_T(KC_CAPS), KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
     LT(_SODA, KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_BSLS), LT(_SPACE, KC_SPC),  LT(_RAISE, KC_NUBS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 ),
 
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index f158e3bc01..02f4149235 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT(
   KC_1,        KC_2,       KC_3,        KC_4,           KC_5,        KC_6,                         KC_7,       KC_8,          KC_9,       KC_0,       KC_DEL,       KC_BSPC              ,
   LSFT(KC_1),  LSFT(KC_2), LSFT(KC_3),  LSFT(KC_4),     LSFT(KC_5),  LSFT(KC_6),                   LSFT(KC_7), LSFT(KC_8),    LSFT(KC_9), LSFT(KC_0), LCTL(KC_DEL), LCTL(KC_BSPC)        ,
-  KC_LSPO,     KC_NUBS,    KC_GRAVE,    KC_NONUS_HASH,  KC_QUOT,     KC_MINS,                      KC_EQL,     KC_NONUS_HASH, KC_LBRC,    KC_RBRC,    KC_QUOT,      MT(MOD_RSFT, KC_ENT) ,
+  SC_LSPO,     KC_NUBS,    KC_GRAVE,    KC_NONUS_HASH,  KC_QUOT,     KC_MINS,                      KC_EQL,     KC_NONUS_HASH, KC_LBRC,    KC_RBRC,    KC_QUOT,      MT(MOD_RSFT, KC_ENT) ,
   _______,     _______,    _______,     _______,        _______,     KC_DEL,     _______, _______, _______,    _______,       KC_MNXT,    KC_VOLD,    KC_VOLU,      KC_MPLY
 ),
 
diff --git a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
index 4f790c229f..b356fc53d4 100644
--- a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
+++ b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7, KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,  KC_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,
     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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(_L3),
+    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(_L3),
              KC_LALT, KC_LGUI,       KC_ENT,              MO(_L3),       KC_SPC,  QK_LEAD, KC_RGUI, KC_RALT
   ),
   // My preferred base layout. This doesn't match the caps
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7, KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,  KC_BSLS, KC_DEL,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC,    KC_RBRC, KC_BSPC,
     CTL_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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(_L3),
+    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(_L3),
              KC_LALT, KC_LGUI,       KC_ENT,              MO(_L3),       KC_SPC,  QK_LEAD, KC_RGUI, KC_RALT
   ),
   [_L3] = LAYOUT_60_hhkb_split_625u_space( /* Function */
diff --git a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
index 181e7a3569..edc0f7d3cf 100644
--- a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
+++ b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
@@ -44,9 +44,9 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_QWERTY] = LAYOUT_64key(
-                      KC_LSPO, KC_MINS, KC_EQL,                           KC_VOLD, KC_VOLU, KC_RSPC,
-                      KC_LCPO, KC_LGUI, KC_LNG1, KC_ENT,         KC_MUTE, TD(PNX), LAYER_N, KC_RCPC,
-                               KC_LAPO, KC_SPC,  SLQ,            SRQ,     KC_ESC,  KC_RAPC,
+                      SC_LSPO, KC_MINS, KC_EQL,                           KC_VOLD, KC_VOLU, SC_RSPC,
+                      SC_LCPO, KC_LGUI, KC_LNG1, KC_ENT,         KC_MUTE, TD(PNX), LAYER_N, SC_RCPC,
+                               SC_LAPO, KC_SPC,  SLQ,            SRQ,     KC_ESC,  SC_RAPC,
 
                       CM_W,    CM_F,    CM_P,    CM_G,           CM_J,    CM_L,    CM_U,    CM_Y,
     KC_TAB,  CM_Q,    CM_R,    CM_S,    CM_T,    CM_D,           CM_H,    CM_N,    CM_E,    CM_I,    CM_SCLN, KC_BSLS,
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json
index c3b4cd41ef..a2760f42bb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json
@@ -46,7 +46,7 @@
             "KC_SCLN",
             "KC_QUOT",
 
-            "KC_LSPO",
+            "SC_LSPO",
             "KC_Z",
             "KC_X",
             "KC_C",
@@ -57,7 +57,7 @@
             "KC_COMM",
             "KC_DOT",
             "KC_SLSH",
-            "KC_RSPC",
+            "SC_RSPC",
 
             "KC_LCTL",
             "KC_LALT",
@@ -77,8 +77,8 @@
             "KC_RCTL",
 
             "LCTL_T(KC_LBRC)",
-            "KC_LSPO",
-            "KC_RSPC",
+            "SC_LSPO",
+            "SC_RSPC",
             "RCTL_T(KC_RBRC)"
         ],
         [
@@ -121,7 +121,7 @@
             "KC_O",
             "KC_QUOT",
 
-            "KC_LSPO",
+            "SC_LSPO",
             "KC_Z",
             "KC_X",
             "KC_C",
@@ -132,7 +132,7 @@
             "KC_COMM",
             "KC_DOT",
             "KC_SLSH",
-            "KC_RSPC",
+            "SC_RSPC",
 
             "KC_LCTL",
             "KC_LALT",
@@ -151,8 +151,8 @@
             "KC_RALT",
             "KC_RCTL",
             "LCTL_T(KC_LBRC)",
-            "KC_LSPO",
-            "KC_RSPC",
+            "SC_LSPO",
+            "SC_RSPC",
             "RCTL_T(KC_RBRC)"
         ],
         [
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json
index 798cfdc3d7..3cb115ffd5 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json
@@ -46,7 +46,7 @@
             "KC_SCLN",
             "KC_QUOT",
 
-            "KC_LSPO",
+            "SC_LSPO",
             "KC_Z",
             "KC_X",
             "KC_C",
@@ -57,7 +57,7 @@
             "KC_COMM",
             "KC_DOT",
             "KC_SLSH",
-            "KC_RSPC",
+            "SC_RSPC",
 
             "KC_LGUI",
             "KC_LALT",
@@ -117,7 +117,7 @@
             "KC_O",
             "KC_QUOT",
 
-            "KC_LSPO",
+            "SC_LSPO",
             "KC_Z",
             "KC_X",
             "KC_C",
@@ -128,7 +128,7 @@
             "KC_COMM",
             "KC_DOT",
             "KC_SLSH",
-            "KC_RSPC",
+            "SC_RSPC",
 
             "KC_LGUI",
             "KC_LALT",
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
index ab258a0c5e..421a1e6247 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
@@ -11,7 +11,7 @@ enum custom_layers {
 #define _KC_SPC LT(_CONF, KC_SPC)
 #define _KC_ENT LT(_MOVE, KC_ENT)
 
-#define KC_SPEC KC_SFTENT //KC_SFTENT - Right Shift when held, Enter when tapped
+#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
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
index 442455bfcf..ce2c8a3702 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_BSPC, CM_A,    CM_X,    CM_C,    CM_V,    CM_B,
         SLQ,     CM_Z,    KC_HOME, KC_PGUP, KC_END,
                                    KC_PGDN,          KC_ENT,  KC_SPC,
-                                                 KC_LSPO, KC_LGUI, KC_MINS,
+                                                 SC_LSPO, KC_LGUI, KC_MINS,
                                                      BK_LCTL, KC_LALT,
 
                      CM_J,    CM_L,    CM_U,    CM_Y,    KC_MPLY, KC_MUTE,
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                      CM_K,    CM_M,    KC_COMM, KC_DOT,  CM_O,    KC_QUOT,
                               KC_LEFT, KC_UP,   KC_RGHT, KC_SLSH, SRQ,
             KC_DEL,  KC_ESC,           KC_DOWN,
-        KC_EQL,  LAYER_N, KC_RSPC,
+        KC_EQL,  LAYER_N, SC_RSPC,
             KC_RALT, BK_RCTL
     ),
 
diff --git a/keyboards/handwired/heisenberg/keymaps/default/keymap.c b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
index 3332a99553..cc214f98f0 100644
--- a/keyboards/handwired/heisenberg/keymaps/default/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    LSFT_T(KC_CAPS), KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT /*KC_ENT*/,
+    LSFT_T(KC_CAPS), KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT /*KC_ENT*/,
     LT(_SODA, KC_PWR), KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), LT(_SPACE, KC_SPC), MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
index e66db86667..3cdc3e0026 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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,
     LT(_NUMPAD, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    LSFT_T(KC_CAPS), KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT /*KC_ENT*/,
+    LSFT_T(KC_CAPS), KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT /*KC_ENT*/,
     LT(_SODA, KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_BSLS), LT(_SPACE, KC_SPC),  LT(_RAISE, KC_NUBS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 ),
 
diff --git a/keyboards/handwired/lagrange/keymaps/default/keymap.c b/keyboards/handwired/lagrange/keymaps/default/keymap.c
index d5f73a8fed..1c38de29f5 100644
--- a/keyboards/handwired/lagrange/keymaps/default/keymap.c
+++ b/keyboards/handwired/lagrange/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS,  KC_A,    KC_S,    KC_D,     KC_F,     KC_G,                                                KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
         KC_LSFT,  KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,                                                KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_RSFT,
 
-        KC_LCPO,           KC_INS,  KC_LBRC, MINS_ALT, KC_BSPC,  KC_DEL,  KC_PSCR,   KC_PAUSE,   KC_ENT,   KC_SPC,   EQL_ALT, KC_RBRC, KC_DEL,          KC_RCPC,
+        SC_LCPO,           KC_INS,  KC_LBRC, MINS_ALT, KC_BSPC,  KC_DEL,  KC_PSCR,   KC_PAUSE,   KC_ENT,   KC_SPC,   EQL_ALT, KC_RBRC, KC_DEL,          SC_RCPC,
                                              HOME_GUI, KC_PGUP,  KC_END,                         KC_LEFT,  KC_UP,    RGHT_GUI,
                                                        KC_PGDN,                                            KC_DOWN
         ),
diff --git a/keyboards/handwired/magicforce61/keymaps/default/keymap.c b/keyboards/handwired/magicforce61/keymaps/default/keymap.c
index 7f1c073203..3e69a44979 100644
--- a/keyboards/handwired/magicforce61/keymaps/default/keymap.c
+++ b/keyboards/handwired/magicforce61/keymaps/default/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /*|tab-----`-q------`-w------`-e------`-r------`-t------`-y------`-u------`-i------`-o------`-p------`-{------`-}------`--|-----| */
     NAV_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,
  /*|caps----`-a------`-s------`-d------`-f------`-g------`-h------`-j------`-k------`-l------`-;------`-'------`-----------enter-| */
-    KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSPC,
+    SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   SC_RSPC,
  /*|shift---`-z------`-x------`-c------`-v------`-b------`-n------`-m------`-,------`-.------`-/------`--------------------shift-| */
     KC_LCTL, KC_RGUI, KC_LALT,                            KC_SPC,                             KC_X1,   KC_RALT, KC_RCTL, KC_X1
  /*`ctrl----`-gui----`-alt----`------------------space---------------------------------------`-fn-----`-alt----`ctrl----' ANY      */
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
index ad52fcfaf8..7b6a4c1e74 100644
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
+++ b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
@@ -34,7 +34,7 @@ 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),
-    KC_LSPO,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSPC,
+    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 */
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c
index ce130d6e79..bcaa3f0a85 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/default/keymap.c
@@ -46,9 +46,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_CAPS ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_EQL  ,                          KC_MINS ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,SH_OS   ,                          KC_NO   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+    SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,SH_OS   ,                          KC_NO   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
 // ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
-    KC_LCTL ,KC_LCPO ,KC_LGUI   ,KC_LALT   ,KC_SPC       ,MO(_SYM),                          MO(_SYM),KC_SPC       ,KC_RALT   ,MO(_FN)   ,KC_RCPC ,KC_RCTL
+    KC_LCTL ,SC_LCPO ,KC_LGUI   ,KC_LALT   ,KC_SPC       ,MO(_SYM),                          MO(_SYM),KC_SPC       ,KC_RALT   ,MO(_FN)   ,SC_RCPC ,KC_RCTL
 // └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
 ),
 
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
index 608b5f7068..5b74c3567e 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
@@ -41,13 +41,13 @@ enum custom_keycodes {
 
 bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case KC_LSPO:
+        case SC_LSPO:
             // Do not force the mod-tap key press to be handled as a modifier
             // if any other key was pressed while the mod-tap key is held down.
             return false;
 //        case MT(MOD_LSFT,KC_9):
 //            return false;
-        case KC_RSPC:
+        case SC_RSPC:
             return false;
         default:
             // Force the mod-tap key press to be handled as a modifier if any
@@ -94,9 +94,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     KC_CAPS ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_EQL  ,                          KC_MINS ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,SH_OS   ,                          KC_NO   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+    SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,SH_OS   ,                          KC_NO   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
 // ├────────┼────────┼────────┴─┬──────┴───┬────┴────────┼────────┤                         ├────────┼────────┴────┬───┴──────┬─┴────────┼────────┼────────┤
-    KC_LCTL ,KC_LCPO ,KC_LGUI   ,KC_LALT   ,SH_T(KC_SPC) ,MO(_SYM),                          MO(_SYM),KC_SPC       ,KC_RALT   ,MO(_FN)   ,KC_RCPC ,KC_RCTL
+    KC_LCTL ,SC_LCPO ,KC_LGUI   ,KC_LALT   ,SH_T(KC_SPC) ,MO(_SYM),                          MO(_SYM),KC_SPC       ,KC_RALT   ,MO(_FN)   ,SC_RCPC ,KC_RCTL
 // └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
 ),
 
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index fe871b67a0..5b0dc9f383 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT(
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
   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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  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_LCTL, KC_LGUI, LOWER,   KC_LALT,     SPC_LW,           ENT_RS,       MO(5),   MO(6),   KC_APP,  KC_RCTL
   ),
 
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
   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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   KC_LCTL, KC_LGUI, LOWER,   KC_LALT,     SPC_LW,           ENT_RS,       MO(5),   MO(6),   KC_APP,  KC_RCTL
   ),
 
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT(
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
   KC_BSPC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC,
+  SC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_RSPC,
   KC_LCTL, KC_LGUI, LOWER,   KC_LALT,     SPC_LW,           ENT_RS,       MO(5),   MO(6),   KC_APP,  KC_RCTL
 ),
 
@@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MOUSE] = LAYOUT(
   KC_ESC,  KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX, XXXXXXX,
   KC_BSPC, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSPC,
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SC_RSPC,
   _______, XXXXXXX, XXXXXXX, XXXXXXX,     KC_ACL2,          KC_ACL0,      XXXXXXX, MO(6),   XXXXXXX, KC_RCTL
   ),
 
diff --git a/keyboards/hhkb/ansi/keymaps/brett/keymap.c b/keyboards/hhkb/ansi/keymaps/brett/keymap.c
index 3b5808dd1c..04e3517a95 100644
--- a/keyboards/hhkb/ansi/keymaps/brett/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/brett/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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,
     TAB_MOUSE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
     CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, PROG_SCLN, KC_QUOT, KC_ENT,
-    KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(HHKB),
+    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(HHKB),
     KC_LALT, KC_LGUI, SPACE_PROG, KC_RGUI, KC_RALT),
 
     /* HHKB Level: Function Layer
diff --git a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
index 6798e9e625..8dbb311309 100644
--- a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     //-------------------------------//
                     CC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, CC_QUOT,
                     //-------------------------------//
-                    KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+                    SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
                     //-------------------------------//
                     AC_SLSH, FC_BSLS, KC_SPC, KC_ENT, FC_MINS, AC_EQL,
                     //-------------------------------//
diff --git a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
index ba4ae519a3..85232ba8b9 100644
--- a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
@@ -21,7 +21,7 @@
 */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [0] = LAYOUT_all(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_LSPO, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, LT(2,KC_HOME), KC_UP, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_APP, RCTL_T(KC_END), KC_LEFT, KC_DOWN, KC_RGHT),
+        [0] = LAYOUT_all(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, SC_LSPO, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, LT(2,KC_HOME), KC_UP, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_APP, RCTL_T(KC_END), KC_LEFT, KC_DOWN, KC_RGHT),
         [1] = LAYOUT_all(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
         [2] = LAYOUT_all(KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_VAI, RGB_SPI, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
\ No newline at end of file
diff --git a/keyboards/hotdox/keymaps/bliss/keymap.c b/keyboards/hotdox/keymaps/bliss/keymap.c
index 0076718fcb..b83114d024 100644
--- a/keyboards/hotdox/keymaps/bliss/keymap.c
+++ b/keyboards/hotdox/keymaps/bliss/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV,               KC_1,    KC_2,    KC_3,    KC_4,  KC_5, KC_6,
       KC_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,
-      KC_LSPO,              KC_Z,    KC_X,    KC_C,    KC_V,  KC_B, LSFT(KC_6),
+      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,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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,               KC_RSPC,
+      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,
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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, KC_RSPC,
+    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,
diff --git a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
index 72a834212b..ec8335bd42 100755
--- a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,            KC_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),  \
-        KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(4), \
+        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
diff --git a/keyboards/jd40/keymaps/vanagon/keymap.c b/keyboards/jd40/keymaps/vanagon/keymap.c
index e16a44af33..5f1cfc3579 100644
--- a/keyboards/jd40/keymaps/vanagon/keymap.c
+++ b/keyboards/jd40/keymaps/vanagon/keymap.c
@@ -12,8 +12,8 @@ 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),
-        KC_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, KC_RSPC, MO(_AL2)),
+        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,
diff --git a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
index 5455402dbc..1c95118868 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
@@ -17,7 +17,7 @@
 #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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, LT(2,KC_HOME), LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), RALT_T(KC_DEL), KC_APP, RCTL_T(KC_END)),
+        [0] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, LT(2,KC_HOME), LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), RALT_T(KC_DEL), KC_APP, RCTL_T(KC_END)),
         [1] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_UP, KC_RBRC, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC, KC_TRNS, KC_WREF, KC_WBAK, KC_WFWD, KC_WHOM, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_PGDN),
         [2] = LAYOUT(RGB_TOG, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_UP, KC_TRNS, KC_TRNS, KC_CAPS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
index 67025b20dc..fe276bac20 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
     KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
     MO(1), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(2),
-    KC_LCTL, KC_LGUI, KC_TRNS, KC_LALT, MO(3), KC_SPC, KC_SFTENT, MO(8), KC_TRNS, TO(4), KC_DEL
+    KC_LCTL, KC_LGUI, KC_TRNS, KC_LALT, MO(3), KC_SPC, SC_SENT, MO(8), KC_TRNS, TO(4), KC_DEL
 ),
 
 /* NUMPAD
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
index 1d312cac95..1795d55c62 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
index 34c63e96fd..37031b936b 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
@@ -116,7 +116,7 @@ Colemak
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
@@ -142,7 +142,7 @@ QWERTY
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
diff --git a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c b/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
index 93888665d1..1143430009 100644
--- a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
+++ b/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      LALT_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MUTE,           KC_PSCR,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+     SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MUTE,           KC_PSCR,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     KC_LGUI, LOWER,   KC_SPC,                    KC_ENT,  RAISE,   KC_LCTL
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/ddone/keymap.c b/keyboards/keebio/iris/keymaps/ddone/keymap.c
index a3905181ea..f787a739ed 100644
--- a/keyboards/keebio/iris/keymaps/ddone/keymap.c
+++ b/keyboards/keebio/iris/keymaps/ddone/keymap.c
@@ -40,7 +40,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_DEL,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     SFTESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_SFTENT,
+     SFTESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, SC_SENT,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    SPCFN1,           KC_DEL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/gary/keymap.c b/keyboards/keebio/iris/keymaps/gary/keymap.c
index fd9a8a0d45..0a178ecb05 100644
--- a/keyboards/keebio/iris/keymaps/gary/keymap.c
+++ b/keyboards/keebio/iris/keymaps/gary/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
      KC_RASE, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
   //|----+----+----+----   +----+----+----.    ,----|----+----+----+----+----+----|
-     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_NEXT,     KC_FULL , KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_SFTENT,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_NEXT,     KC_FULL , KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,SC_SENT,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
                        KC_LGUI,KC_LOWR,KC_SPC ,        KC_GARY, KC_ENT,KC_LALT
   //                  `----+----+----'        `----+----+----'
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
index 98b2cb3526..e13745b29c 100644
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
@@ -4,7 +4,7 @@
 #define _LOWER 1
 #define _RAISE 2
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, LCTL_T(KC_LGUI), KC_Z, KC_X, KC_C, KC_D, KC_V, LGUI(KC_L), MEH_T(KC_MINS), KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LGUI, LT(1, KC_QUOT), KC_SFTENT, KC_SPC, LT(2, KC_BSLS), LALT_T(KC_APP)),
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, LCTL_T(KC_LGUI), KC_Z, KC_X, KC_C, KC_D, KC_V, LGUI(KC_L), MEH_T(KC_MINS), KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LGUI, LT(1, KC_QUOT), SC_SENT, KC_SPC, LT(2, KC_BSLS), LALT_T(KC_APP)),
                                                               [1] = LAYOUT(KC_MPLY, KC_NO, KC_DQUO, KC_NO, LALT(KC_F4), KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, QK_BOOT, KC_MPRV, KC_END, KC_UP, KC_HOME, KC_PGUP, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_SAI, RGB_SAD, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P1, KC_P2, KC_P3, KC_PAST, RGB_HUI, RGB_HUD, KC_NO, KC_WBAK, KC_WFWD, KC_WSTP, KC_WREF, KC_NO, LCA(KC_DEL), KC_NUM, KC_P0, KC_P0, KC_PDOT, KC_PENT, RGB_SPI, RGB_SPD, KC_PSCR, KC_NO, KC_LGUI, RGB_TOG, RGB_VAI, RGB_VAD),
                                                               [2] = LAYOUT(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_K, KC_NO, KC_WH_D, KC_MS_U, KC_WH_U, KC_NO, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)};
 
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c b/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
index ad67b6c63d..0e776f26f3 100644
--- a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
@@ -23,7 +23,7 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
-[QWERTY] = LAYOUT(LALT(KC_A), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_EQL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(4), KC_LGUI, MO(2), KC_SPC, MO(1), TG(1)),
+[QWERTY] = LAYOUT(LALT(KC_A), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_EQL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, MO(4), KC_LGUI, MO(2), KC_SPC, MO(1), TG(1)),
 
 [HOTKEYS] = LAYOUT(KC_F5, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F14, KC_F6, KC_NO, KC_NO, LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_NO, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, KC_ASTG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, LALT(KC_SPC), KC_LGUI, KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/keebio/iris/keymaps/nstickney/keymap.c b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
index eca6ce7093..cc4c5bf375 100644
--- a/keyboards/keebio/iris/keymaps/nstickney/keymap.c
+++ b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_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,
 		CC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, CC_QUOT,
-		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, TD(LOCKS), TD(LAYERS), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, TD(LOCKS), TD(LAYERS), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
 		AC_SLSH, FC_BSLS, KC_SPC, KC_ENT, FC_MINS, AC_EQL
 		),
 
diff --git a/keyboards/keebio/iris/keymaps/two_knob/keymap.c b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
index 173d8a6700..221855d3fa 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/keymap.c
+++ b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
@@ -71,7 +71,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
  * The rotary encoders are programmed manually below because the configurator does not support them yet.
  */
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(KC_EQL, KC_1, KC_2, KC_3, KC_4, TD_FIVE_ENTER, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, LT(1, KC_DEL), LT(2, KC_A), LCTL_T(KC_S), KC_D, LGUI_T(KC_F), KC_G, KC_H, RGUI_T(KC_J), KC_K, RCTL_T(KC_L), LT(2, KC_SCLN), LT(1, KC_QUOT), KC_LSPO, LALT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_MINIM, KC_MAXIM, KC_N, KC_M, KC_COMM, KC_DOT, RALT_T(KC_SLSH), KC_RSPC, QK_GESC, KC_SPC, KC_BSPC, KC_TAB, KC_ENT, KC_DEL),
+    [_QWERTY] = LAYOUT(KC_EQL, KC_1, KC_2, KC_3, KC_4, TD_FIVE_ENTER, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, LT(1, KC_DEL), LT(2, KC_A), LCTL_T(KC_S), KC_D, LGUI_T(KC_F), KC_G, KC_H, RGUI_T(KC_J), KC_K, RCTL_T(KC_L), LT(2, KC_SCLN), LT(1, KC_QUOT), SC_LSPO, LALT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_MINIM, KC_MAXIM, KC_N, KC_M, KC_COMM, KC_DOT, RALT_T(KC_SLSH), SC_RSPC, QK_GESC, KC_SPC, KC_BSPC, KC_TAB, KC_ENT, KC_DEL),
     [_LOWER]  = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, DT_PRNT, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, DT_UP, KC_4, KC_5, KC_6, KC_PPLS, KC_TRNS, KC_TRNS, KC_HASH, KC_DLR, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS, DT_DOWN, KC_1, KC_2, KC_3, KC_PSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0),
     [_RAISE]  = LAYOUT(RGB_TOG, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_UP, KC_BTN2, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_CSGLA, KC_CSGRA, KC_TRNS, KC_TRNS),
     [_ADJUST] = LAYOUT(
diff --git a/keyboards/keebio/iris/keymaps/two_knob/two_knob.json b/keyboards/keebio/iris/keymaps/two_knob/two_knob.json
index 62fb931873..fd1f7b8c42 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/two_knob.json
+++ b/keyboards/keebio/iris/keymaps/two_knob/two_knob.json
@@ -43,7 +43,7 @@
       "RCTL_T(KC_L)",
       "LT(2,KC_SCLN)",
       "LT(1,KC_QUOT)",
-      "KC_LSPO",
+      "SC_LSPO",
       "LALT_T(KC_Z)",
       "KC_X",
       "KC_C",
@@ -56,7 +56,7 @@
       "KC_COMM",
       "KC_DOT",
       "RALT_T(KC_SLSH)",
-      "KC_RSPC",
+      "SC_RSPC",
       "QK_GESC",
       "KC_SPC",
       "KC_BSPC",
diff --git a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c b/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
index 8f5b0e3cfe..03aea211ea 100644
--- a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5,                                        KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,                                        KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, 
 		LCTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G,                                KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 
-		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,                                       KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 
+		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,                                       KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, 
 		LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_DEL, SPC_LFT, SPC_LFT, BSP_FUNC, BSP_FUNC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 	),
 
diff --git a/keyboards/keebio/nyquist/keymaps/skug/keymap.c b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
index 70ad4b2a8a..a2818d40f0 100644
--- a/keyboards/keebio/nyquist/keymaps/skug/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SE_PLUS, \
   KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    SE_ARNG, \
   MO(ARRW), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    MD_ODIA, SM_ADIA, \
-  KC_LSPO,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, KC_RSPC, \
+  SC_LSPO,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, SC_RSPC, \
   CT_APOS,  SE_ACUT, KC_LALT, KC_BSPC, KC_SPC,  KC_LGUI,     KC_ENT,  KC_SPC,  KC_BSPC, KC_ALGR, SE_ASTR, CT_TILD  \
 ),
 
diff --git a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
index 4b11eef55c..921b870107 100644
--- a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1, KC_F2,  KC_ESC,  KC_1,  KC_2,  KC_3,   KC_4,   KC_5, KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_9,    KC_MINS, KC_GRV,  KC_DEL, 
     KC_F3, KC_F4,  KC_TAB,  KC_Q,  KC_W,  KC_E,   KC_R,   KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
     KC_F5, KC_F6,  KC_LCTL, KC_A,  KC_S,  KC_D,   KC_F,   KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, 
-    KC_F7, KC_F8,  KC_LSPO, KC_Z,  KC_X,  KC_C,   KC_V,   KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, LR_NUM, 
+    KC_F7, KC_F8,  SC_LSPO, KC_Z,  KC_X,  KC_C,   KC_V,   KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, LR_NUM, 
     KC_F9, KC_F10, L_CTRL,  L_GUI, L_ALT, KC_APP, LR_SPC,             LR_BKSP, LR_BKSP, KC_RALT, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
     [_FN] = LAYOUT_60_with_macro(
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
index 946c465487..39b171dcdc 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT(
   KC_TAB,  KC_Q,   KC_W,    KC_F,    KC_P,   KC_G,                    KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,   KC_R,    KC_S,    KC_T,   KC_D,                    KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_K,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  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
 ),
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
   KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,   KC_T,                    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,   KC_S,    KC_D,    KC_F,   KC_G,                    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  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
 ),
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
index 7d7a350e64..38d523a34c 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
@@ -110,7 +110,7 @@ Colemak
 [_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,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  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
 ),
@@ -133,7 +133,7 @@ QWERTY
 [_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,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  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
 ),
diff --git a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
index 515f770eb2..e205c627cd 100644
--- a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
      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,
   //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     KC_LSPO,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC,          KC_UP,
+     SC_LSPO,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,          KC_UP,
   //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
      KC_LCTL,   KC_LGUI,   KC_LALT,                        KC_SPACE,                          KC_RALT,   KC_CAPS,   KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
   //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
      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,
   //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     KC_LSPO,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC,          KC_UP,
+     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
   //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
index 6629ca30b1..8dea44e33c 100755
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
@@ -1 +1 @@
-{"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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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","KC_SFTENT","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
+{"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
index 698caacdfd..2235c07bb5 100644
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
@@ -57,7 +57,7 @@ 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,
   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, KC_SFTENT,
+  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
 ),
 
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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, KC_SFTENT,
+  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
 ),
 
diff --git a/keyboards/keyhive/ut472/keymaps/default/keymap.c b/keyboards/keyhive/ut472/keymaps/default/keymap.c
index e303f2220c..0c34287da0 100644
--- a/keyboards/keyhive/ut472/keymaps/default/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 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, KC_SFTENT,
+  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
 ),
 
diff --git a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c b/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
index 60a2f99bc7..f629766b28 100644
--- a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 LAYOUT(
 KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
-KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_SFTENT,
+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)
 ),
diff --git a/keyboards/keyhive/ut472/keymaps/hvp/keymap.c b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
index d890f33266..49bfedcc3f 100644
--- a/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(
   LT4_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
   LT3_ESC, LG_A, LA_S, LS_D, LC_F, LT(4,KC_G), RC_H, RS_J, RA_K, RG_L, TD(TD1), TD(TD2),
-  KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TD(TD3), KC_SFTENT,
-  KC_LCPO, KC_RPRN, KC_LGUI, KC_LALT, LT2, KC_SPC, LT1, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+  KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TD(TD3), SC_SENT,
+  SC_LCPO, KC_RPRN, KC_LGUI, KC_LALT, LT2, KC_SPC, LT1, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
 ),
 
 [1] = LAYOUT( /* Right */
diff --git a/keyboards/keyhive/ut472/keymaps/via/keymap.c b/keyboards/keyhive/ut472/keymaps/via/keymap.c
index 506e8b3cde..b76395d1b0 100644
--- a/keyboards/keyhive/ut472/keymaps/via/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/via/keymap.c
@@ -7,7 +7,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 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, KC_SFTENT,
+  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
 ),
 
diff --git a/keyboards/kin80/keymaps/quartz64/keymap.c b/keyboards/kin80/keymaps/quartz64/keymap.c
index 2b676539c4..4eab31caf2 100644
--- a/keyboards/kin80/keymaps/quartz64/keymap.c
+++ b/keyboards/kin80/keymaps/quartz64/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_LSPO,    LCTL_T(KC_Z), KC_X,          KC_C,    KC_V,    KC_B,      KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+    SC_LSPO,    LCTL_T(KC_Z), KC_X,          KC_C,    KC_V,    KC_B,      KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
     KC_MPLY,         MO(_MC), LCTL(KC_LSFT), KC_LBRC, KC_RBRC, KC_NO,     KC_NO,  KC_LEFT,KC_DOWN, KC_UP,  KC_RGHT,KC_NO,
 			                                        MO(_NM),  KC_ENTER,            KC_RGUI,KC_RCTL,
                                                         KC_HOME,             KC_PGUP,
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
index 5be1b60654..53b4b57cf5 100644
--- a/keyboards/kinesis/keymaps/heatxsink/keymap.c
+++ b/keyboards/kinesis/keymaps/heatxsink/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_EQL ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,
         KC_TAB ,_______,_______,_______,_______,_______,
         HCTLESC,_______,_______,_______,_______,_______,
-        KC_LSPO,_______,_______,_______,_______,_______,
+        SC_LSPO,_______,_______,_______,_______,_______,
                 KC_GRV ,LAYERS ,KC_LEFT,KC_RGHT,
         // LTHUMB
                 KC_LALT,KC_LCTL,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
         _______,_______,_______,_______,_______,KC_BSLS,
         _______,_______,_______,_______,_______,KC_QUOT,
-        _______,_______,_______,_______,_______,KC_RSPC,
+        _______,_______,_______,_______,_______,SC_RSPC,
                 KC_UP  ,KC_DOWN,KC_LBRC,KC_RBRC,
         // RTHUMB
         KC_RCTL,KC_LGUI,
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 9bf94d6869..0888f3f8cd 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
diff --git a/keyboards/kinesis/keymaps/peott-fr/keymap.c b/keyboards/kinesis/keymaps/peott-fr/keymap.c
index b0ba1b55ea..9bdcb6df31 100644
--- a/keyboards/kinesis/keymaps/peott-fr/keymap.c
+++ b/keyboards/kinesis/keymaps/peott-fr/keymap.c
@@ -21,7 +21,7 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
+	[0] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
 	[1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
index e8946ad325..5fdbbcd902 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
@@ -124,7 +124,7 @@ Colemak
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
   CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  HYPER,                     KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
@@ -161,7 +161,7 @@ QWERTY
   KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
            KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
                                                         CTLESC,  HYPER,                     KC_RALT, KC_RCTL,
                                                                  ALTAPP,                    KC_RGUI,
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
index ecce30e237..1b24651ec4 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_planck_mit(
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    BR_TILD,
     MYTAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    BR_CCED, BR_ACUT,
-    KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  BR_SLSH, KC_RSPC,
+    SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  BR_SLSH, SC_RSPC,
     KC_LCTL, KC_LALT, KC_LGUI, SYM,     MYNAV,       KC_SPC,       MYNUM,   FUN,     KC_RGUI, KC_LALT, RCTL_T(KC_ENT)
 ),
 
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_WORKMAN] = LAYOUT_planck_mit(
     KC_ESC,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    BR_CCED, BR_TILD,
     MYTAB,   KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    BR_ACUT,
-    KC_LSPO, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  BR_SLSH, KC_RSPC,
+    SC_LSPO, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  BR_SLSH, SC_RSPC,
     KC_LCTL, KC_LALT, KC_LGUI, SYM,     MYNAV,       KC_SPC,       MYNUM,   FUN,     KC_RGUI, KC_LALT, RCTL_T(KC_ENT)
 ),
 
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT_planck_mit(
     KC_ESC,  KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    BR_SLSH, BR_TILD,
     MYTAB,   KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    BR_ACUT,
-    KC_LSPO, BR_CCED, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC,
+    SC_LSPO, BR_CCED, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_RSPC,
     KC_LCTL, KC_LALT, KC_LGUI, SYM,     MYNAV,       KC_SPC,       MYNUM,   FUN,     KC_RGUI, KC_LALT, RCTL_T(KC_ENT)
 ),
 
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_COLEMAK] = LAYOUT_planck_mit(
     KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    BR_CCED, BR_TILD,
     MYTAB,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    BR_ACUT,
-    KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  BR_SLSH, KC_RSPC,
+    SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  BR_SLSH, SC_RSPC,
     KC_LCTL, KC_LALT, KC_LGUI, SYM,     MYNAV,       KC_SPC,       MYNUM,   FUN,     KC_RGUI, KC_LALT, RCTL_T(KC_ENT)
 ),
 
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
index f488965ae0..8b59f9de4f 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
@@ -69,8 +69,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_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,
-      KC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, KC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LAPO,                    KC_SPC,                               KC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
+      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 */
@@ -78,8 +78,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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,
-      KC_LSPO, DE_LABK,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,    DE_MINS, KC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LAPO,                    KC_SPC,                               KC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
+      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 */
@@ -87,8 +87,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_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,
-      KC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, KC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LAPO,                    KC_SPC,                               KC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
+      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 */
@@ -157,8 +157,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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,
-      KC_LSPO, DE_LABK,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,    DE_MINS, KC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LAPO,                    KC_SPC,                               KC_RAPC, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
+      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 */
@@ -166,8 +166,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_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_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, KC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LAPO,                    KC_SPC,                               KC_RAPC, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
+      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
 
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
index 3308a62db9..044b864c28 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
@@ -62,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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,
-      KC_LSPO, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, KC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LAPO,                   KC_SPC,                             KC_RAPC, MO(_RED_),          KC_LEFT, KC_DOWN, KC_RGHT
+      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
@@ -71,8 +71,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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,
-      KC_LSPO, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, KC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LAPO,                   KC_SPC,                             KC_RAPC, MO(_RED_),          KC_LEFT, KC_DOWN, KC_RGHT
+      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
diff --git a/keyboards/ktec/ergodone/keymaps/erovia/keymap.c b/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
index 502c0dafe6..ee24fb36ed 100644
--- a/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,  KC_COPY,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,  KC_MUTE,
         KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
-        KC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,  TT(FN),
+        SC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,  TT(FN),
         KC_LCTL,  KC_LGUI,  KC_LALT,  KC_LEFT,  KC_RGHT,
                                                        KC_CAPS,  KC_LGUI,
                                                                  KC_HOME,
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_PASTE,  KC_6,  KC_7,     KC_8,     KC_9,     KC_0,      KC_SLEP,
              KC_LBRC,   KC_Y,  KC_U,     KC_I,     KC_O,     KC_P,      KC_BSLS,
                         KC_H,  KC_J,     KC_K,     KC_L,     KC_SCLN,   KC_QUOTE,
-             KC_RBRC,   KC_N,  KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSPC,
+             KC_RBRC,   KC_N,  KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   SC_RSPC,
                                KC_DOWN,  KC_UP,    KC_MINS,  KC_EQL,    KC_RCTL,
              KC_INS,    KC_DEL,
              KC_PGUP,
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,  KC_COPY,
         KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,  KC_MUTE,
         KC_ESC,   KC_A,     KC_R,     KC_S,     KC_T,     KC_G,
-        KC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,  TT(FN),
+        SC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,  TT(FN),
         KC_LCTL,  KC_LGUI,  KC_LALT,  KC_LEFT,  KC_RGHT,
                                                        KC_CAPS,  KC_LGUI,
                                                                  KC_HOME,
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_PASTE,  KC_6,  KC_7,     KC_8,     KC_9,     KC_0,     KC_SLEP,
              KC_LBRC,   KC_J,  KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_BSLS,
                         KC_M,  KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOTE,
-             KC_RBRC,   KC_K,  KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSPC,
+             KC_RBRC,   KC_K,  KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  SC_RSPC,
                                KC_DOWN,  KC_UP,    KC_MINS,  KC_EQL,   KC_RCTL,
              KC_INS,    KC_DEL,
              KC_PGUP,
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
index e7ce38eac2..5e166f940a 100644
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
@@ -635,14 +635,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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,
-        KC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_AMPR,
+        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, KC_RSPC,
+        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
 ),
@@ -672,14 +672,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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,
-        KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_QUOT,
+        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, KC_RSPC,
+        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
 ),
@@ -688,14 +688,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
 	KC_TAB,	X(Mc),	X(Munion),	X(arwl),	X(or),	X(exists),	KC_BSLS,
 	X(arwr), X(root), X(and), X(imply), X(nexists), X(forall),
-	KC_LSPO,	KC_SCLN,	X(intgrl),	X(Mn),	X(Mz),	X(member),	X(arwl),
+	SC_LSPO,	KC_SCLN,	X(intgrl),	X(Mn),	X(Mz),	X(member),	X(arwl),
 	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
 	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
 
 	TT(FNLR), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
 	KC_PGUP, X(plsminus),	X(infin),	X(neleof),	X(equiv),	X(Mq),	KC_EQL,
 	X(sum),	X(emtyset),	X(porp),	X(suprsetof),	X(not),	X(neq),
-	KC_PGDN,	X(subsetof),	X(intersection),	X(angl),	X(nmember),	X(eleof),	KC_RSPC,
+	KC_PGDN,	X(subsetof),	X(intersection),	X(angl),	X(nmember),	X(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
 ),
diff --git a/keyboards/lets_split/keymaps/cpeters1982/keymap.c b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
index c87114855d..5090da573b 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/keymap.c
+++ b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT( \
   KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, \
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, \
   KC_LCTL, KC_LALT, KC_LGUI, KC_ESC, TG(_LOWER),  LT(_ADJUST, KC_SPC),  KC_ENT,  TG(_RAISE),   MT(MOD_RGUI, KC_LBRC), MT(MOD_RALT, KC_RBRC), MT(MOD_HYPR, KC_EQL), KC_MINS \
 ),
 
diff --git a/keyboards/lets_split/keymaps/hvp/keymap.c b/keyboards/lets_split/keymaps/hvp/keymap.c
index 1c86381f64..6246404231 100644
--- a/keyboards/lets_split/keymaps/hvp/keymap.c
+++ b/keyboards/lets_split/keymaps/hvp/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ortho_4x12(
    LT4_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 
    LT3_ESC,  KC_A,    KC_S,    KC_D,    F_NAVI,    LT(6,KC_G),    KC_H,    KC_J,    KC_K,    KC_L,    TD(TD1), TD(TD2),
-   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), KC_SFTENT , 
-   KC_LCTL,  KC_APP, KC_LGUI, KC_LALT, LT(3,KC_SPC),   SFT_T(KC_SPC),  KC_SFTENT, LT(4,KC_SPC),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  
+   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), SC_SENT , 
+   KC_LCTL,  KC_APP, KC_LGUI, KC_LALT, LT(3,KC_SPC),   SFT_T(KC_SPC),  SC_SENT, LT(4,KC_SPC),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  
 ),
 
 [_RAISE] = LAYOUT_ortho_4x12( /* Right */
diff --git a/keyboards/lets_split/keymaps/mekberg/keymap.c b/keyboards/lets_split/keymaps/mekberg/keymap.c
index bb88e8a756..e8cfa03888 100644
--- a/keyboards/lets_split/keymaps/mekberg/keymap.c
+++ b/keyboards/lets_split/keymaps/mekberg/keymap.c
@@ -36,7 +36,7 @@ enum layer_names {
 #define SPECIAL MO(_SPECIAL)
 
 // Modifiers
-#define SFTENT KC_SFTENT        // Enter => Shift when held
+#define SFTENT SC_SENT          // Enter => Shift when held
 #define CTLTAB LCTL_T(KC_TAB)   // Tab => Ctrl when held
 
 // ISO keycodes with Swedish layout names
diff --git a/keyboards/lily58/keymaps/cykedev/keymap.c b/keyboards/lily58/keymaps/cykedev/keymap.c
index 96ed2c5e0f..94db33771a 100644
--- a/keyboards/lily58/keymaps/cykedev/keymap.c
+++ b/keyboards/lily58/keymaps/cykedev/keymap.c
@@ -50,7 +50,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_BSLS,
   KC_LCTL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   SY_PLS,    SY_MIN,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                             ADJ,     KC_LALT, G_COMM, KC_SFTENT, SY_SPC,  A_DOT,   KC_HOME, KC_END
+                             ADJ,     KC_LALT, G_COMM, SC_SENT,   SY_SPC,  A_DOT,   KC_HOME, KC_END
 ),
 /* SYMBOL
  * ,-----------------------------------------.                    ,-----------------------------------------.
diff --git a/keyboards/lily58/keymaps/drasbeck/keymap.c b/keyboards/lily58/keymaps/drasbeck/keymap.c
index 13db2a9dd9..a6a51a1945 100644
--- a/keyboards/lily58/keymaps/drasbeck/keymap.c
+++ b/keyboards/lily58/keymaps/drasbeck/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_NO,   KC_MUTE, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_NO,   KC_MUTE, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
                              KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_NUBS, KC_LCTL
   ),
 
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5),                RALT(KC_6), RALT(KC_7),    RALT(KC_8), RALT(KC_9), RALT(KC_0), KC_DEL,
   KC_TRNS, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                     KC_NO,      KC_NO,         KC_UP,      KC_MINS,    KC_EQL,     KC_RBRC,
   KC_ESC,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                     KC_NO,      KC_LEFT,       KC_DOWN,    KC_RGHT,    KC_NO,      KC_NUHS,
-  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,      KC_VOLD,       KC_VOLU,    KC_MUTE,    KC_INT1,    KC_SFTENT,
+  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,      KC_VOLD,       KC_VOLU,    KC_MUTE,    KC_INT1,    SC_SENT,
                                    KC_RALT,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RALT(KC_NUBS), KC_TRNS
   ),
 
diff --git a/keyboards/lily58/keymaps/jhelvy/keymap.c b/keyboards/lily58/keymaps/jhelvy/keymap.c
index 9517e22708..249c008cfe 100644
--- a/keyboards/lily58/keymaps/jhelvy/keymap.c
+++ b/keyboards/lily58/keymaps/jhelvy/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL, \
      KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS, \
       KC_BSPC, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,  KC_ENT, \
-     KC_LSPO,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSPC, \
+     SC_LSPO,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC, \
                              LALT(KC_A), KC_LCTL,KC_LGUI,  MO(1),   KC_SPC,   MO(2),   KC_PGDN,     KC_NO),
 
 [_LOWER] = LAYOUT( \
diff --git a/keyboards/lily58/keymaps/muppetjones/keymap.c b/keyboards/lily58/keymaps/muppetjones/keymap.c
index 5a507eb9cb..1eea90fce1 100644
--- a/keyboards/lily58/keymaps/muppetjones/keymap.c
+++ b/keyboards/lily58/keymaps/muppetjones/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_CAPS,                   __BLANK____________________________________, KC_BSPC,
     KC_CAPS, __COLEMAK_MOD_DH_L1________________________,                   __COLEMAK_MOD_DH_R1_W_QUOT_________________, KC_BSPC,
     HY_ESC,  __COLEMAK_MOD_DH_L2_W_GACS_________________,                   __COLEMAK_MOD_DH_R2_W_SCAG_________________, KC_QUOT,
-    TD_LAYR, __COLEMAK_MOD_DH_L3_W_SFTV_________________, KC_CAPS, KC_TAB,  __COLEMAK_MOD_DH_R3________________________, KC_SFTENT,
+    TD_LAYR, __COLEMAK_MOD_DH_L3_W_SFTV_________________, KC_CAPS, KC_TAB,  __COLEMAK_MOD_DH_R3________________________, SC_SENT,
                                 XXXXXXX, XXXXXXX, HY_ESC, LOW_ENT, NAV_SPC, HY_BSPC, XXXXXXX, XXXXXXX
 ),
 
diff --git a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
index 5a6d2dc82a..92127ba7b8 100644
--- a/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/xulkal/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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,  TD_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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    TD_COMM, KC_DOT,  KC_SLSH, KC_RSPC,          KC_UP,   KC_PGDN, \
-        KC_LCPO, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LOWER,   KC_LEFT, KC_DOWN, KC_RGHT  \
+        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    TD_COMM, KC_DOT,  KC_SLSH, SC_RSPC,          KC_UP,   KC_PGDN, \
+        SC_LCPO, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LOWER,   KC_LEFT, KC_DOWN, KC_RGHT  \
     ),
 
 #ifndef GAMELAYER_DISABLE
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
index 1422769a8a..aaea8199f1 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,            KC_1,           KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,       KC_EQL,  KC_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_SFTENT,                                KC_UP,
+        KC_LSFT,           KC_Z,           KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,                                  KC_UP,
         TD(TD_CTRL_TERM),  TD(TD_LGUI_ML), KC_LALT,                   KC_SPC,                             KC_RALT, TT(_FL), TD(TD_APP_YL), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FL] = LAYOUT(
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_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_SFTENT,                            KC_UP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,                              KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                            KC_RALT, TG(_VL), KC_APP,    KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     // Works with https://github.com/ash0x0/config/blob/master/yakuake.shortcuts
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
index f09cda42fd..d97f45fde0 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
         LT_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,                              KC_UP,
+        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,                              KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(_FL), KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_NL] = LAYOUT(
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
index 8fd0002b45..3dbb48f16c 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //   CAPS       A        S        D        F        G        H        J        K        L        ;        '      ENTER
         KC_CAPS,  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,  KC_G  ,  KC_H  ,  KC_J  ,  KC_K  ,  KC_L  , KC_SCLN, KC_QUOT, KC_ENT ,
     //   SHIFT      Z        X        C        V        B        N        M        ,        .        /      RSHIFT                               UP
-        KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,  KC_N  ,  KC_M  , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC,                             KC_UP ,
+        SC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,  KC_N  ,  KC_M  , KC_COMM, KC_DOT , KC_SLSH, SC_RSPC,                             KC_UP ,
     //   CTRL      GUI      ALT                       SPACE                               RALT     MENU     RGUI     RCTRL             LEFT     DOWN     RIGHT
        KC_LCTL,  KC_LGUI, KC_LALT,                    KC_SPC,                   TD(TD_FN_SWITCH), KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md b/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
index a4e9aa77d5..5be66aadf8 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
@@ -32,7 +32,7 @@ _I physically switched around my RALT and Menu keys as my personal preference. T
   |_________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________|                __________
   |      SHIFT         |    Z     |    X     |    C     |    V     |    B     |    N     |    M     |    ,     |    .     |    /     |               RSHIFT            |               |    UP    |
   |     ------         |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |               ------            |               |  ------  |
-  |     KC_LSPO        |   KC_Z   |   KC_X   |   KC_C   |   KC_V   |   KC_B   |   KC_N   |   KC_M   |  KC_COMM |  KC_DOT  |  KC_SLSH |               KC_RSPC           |               |   KC_UP  |
+  |     SC_LSPO        |   KC_Z   |   KC_X   |   KC_C   |   KC_V   |   KC_B   |   KC_N   |   KC_M   |  KC_COMM |  KC_DOT  |  KC_SLSH |               SC_RSPC           |               |   KC_UP  |
   |____________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________________|     __________|__________|__________
   |    CTRL     |    GUI      |    ALT      |                       SPACE                                     |    RALT      |   MENU      |   RGUI      |    RCTRL    |    |   LEFT   |   DOWN   |  RIGHT   |
   |   ------    |   ------    |   ------    |                       ------                                    |    ------    |   ------    |   ------    |    ------   |    |  ------  |  ------  |  ------  |
diff --git a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
index e971c96046..a9476d07c5 100644
--- a/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/xulkal/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  TD_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,   TD_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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    TD_COMM, KC_DOT,  KC_SLSH, KC_RSPC,                              KC_UP, \
-        KC_LCPO, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, LOWER,   KC_APP,  KC_RCPC,            KC_LEFT, KC_DOWN, KC_RGHT \
+        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    TD_COMM, KC_DOT,  KC_SLSH, SC_RSPC,                              KC_UP, \
+        SC_LCPO, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, LOWER,   KC_APP,  SC_RCPC,            KC_LEFT, KC_DOWN, KC_RGHT \
     ),
 
 #ifndef GAMELAYER_DISABLE
diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
index 506d3b6897..2ee3c3cb85 100644
--- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,    DE_QUES,
   KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS, KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSPC,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   SC_RSPC,
   KC_LCTL, KC_LGUI, KC_LALT, QK_LEAD, KC_SC,       KC_SPC,       KC_ALGR, KC_FN,   KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
diff --git a/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
index df90a94362..7a8cb3d321 100644
--- a/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
+++ b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_6,       KC_7,    KC_8,       KC_9,       KC_0,       KC_MINS,    KC_EQL,           KC_BSPC, KC_PWR,
         KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,       KC_U,    KC_I,       KC_O,       KC_P,       KC_LBRC,    KC_RBRC, KC_BSLS,          C(G(KC_N)),
         KC_CAPS, KC_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_LSPO,          KC_Z,    KC_X,     KC_C,    KC_V,    KC_B,       KC_N,    KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,             KC_RSPC, KC_UP,   KC_PGDN,
+        SC_LSPO,          KC_Z,    KC_X,     KC_C,    KC_V,    KC_B,       KC_N,    KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,             SC_RSPC, KC_UP,   KC_PGDN,
         KC_LCTL, KC_LALT, KC_LGUI,                             KC_SPC,                                      KC_RGUI,    KC_RALT,    MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
diff --git a/keyboards/mechkeys/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
index aac3afdb25..664cdb6e80 100755
--- a/keyboards/mechkeys/espectro/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ ________________________________________________________________________________
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,     KC_P4,   KC_P5,   KC_P6,
-    KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT
   ),
 
diff --git a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
index 266deb755d..3ebe1c45c5 100644
--- a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
@@ -62,7 +62,7 @@ ________________________________________________________________________________
 		KC_GRV,  KC_1,   KC_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_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_LSPO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,      KC_RSPC,        KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        SC_LSPO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,      SC_RSPC,        KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
 		KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                           KC_RGUI,  KC_RCTL,  TT(1),  KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0,   KC_PDOT
   ),
 /* FN1 - SEE readme.md
@@ -126,7 +126,7 @@ ________________________________________________________________________________
     KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,       KC_BSPC,      KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
       KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,   KC_QUOT,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,
-        KC_LSPO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,      KC_RSPC,        KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        SC_LSPO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,      SC_RSPC,        KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_LGUI, KC_LALT, KC_LCTL,                   KC_SPC,                           KC_RCTL,  KC_RALT,  TO(0),  KC_LEFT, KC_DOWN,  KC_RIGHT, KC_P0,   KC_PDOT
   ),
 };
diff --git a/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
index 689ea869b1..1f389a3699 100644
--- a/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
@@ -48,7 +48,7 @@ ________________________________________________________________________________
     KC_GRV,  KC_1,   KC_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_PSLS, KC_PAST, KC_PMNS,
       KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,     KC_BSLS,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
        KC_LCTL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,   KC_QUOT,          KC_ENT,     KC_P4,   KC_P5,   KC_P6,
-        KC_LSPO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,      KC_RSPC,        KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        SC_LSPO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,      SC_RSPC,        KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
     MO(_FN1), KC_LALT, KC_LGUI,                   KC_SPC,                           KC_RGUI, _______,  KC_RCTL,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0,  KC_PDOT
   ),
 
diff --git a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
index a4ba5717e0..15ef2b3b6c 100644
--- a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
@@ -49,7 +49,7 @@ ________________________________________________________________________________
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, \
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS, \
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,     KC_P4,   KC_P5,   KC_P6,            \
-    KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
+    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_VOLD, KC_VOLU, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT           \
   ),
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
index 5d995194b2..ee48567aba 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[base] = LAYOUT_2u_space_ortho(
 		KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
 		CTRL_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
-		KC_LSPO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     TD(1),    TD(2),    TD(3),    KC_RSPC,
+		SC_LSPO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     TD(1),    TD(2),    TD(3),    SC_RSPC,
 		KC_LCTL,    QK_LEAD,  KC_LALT,  KC_LGUI,  MO(1),        KC_SPC,         MO(2),    KC_VOLD,  KC_MPLY,  KC_VOLU,  KC_GRV),
 
 	[raise] = LAYOUT_2u_space_ortho(
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
index e76c171478..7e1e055d1d 100755
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
@@ -24,14 +24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                                                 KC_MUTE,
     KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     TT(_RAISE),       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFTCAPS, KC_SLSH, KC_Z,  KC_X,  KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_SFTENT,
+    KC_LSFTCAPS, KC_SLSH, KC_Z,  KC_X,  KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           SC_SENT,
     KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  LT(_LOWER,KC_SPC),         KC_SPC,           KC_RALT, MO(_FN1),  KC_RCTL ),
 
   [_FN1] = LAYOUT_all(
                                                                                                                 ENCFUNC,
     KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
     KC_CAPS,          KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,   KC_NO,
-    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NUM,  KC_NO,   KC_NO,   KC_NO,            KC_SFTENT,
+    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NUM,  KC_NO,   KC_NO,   KC_NO,            SC_SENT,
     KC_TRNS, KC_WINLCK, KC_TRNS,        KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS ),
 
   [_LOWER] = LAYOUT_all(
diff --git a/keyboards/minimon/index_tab/keymaps/via/keymap.c b/keyboards/minimon/index_tab/keymaps/via/keymap.c
index f3bac2aee8..23debb7a19 100644
--- a/keyboards/minimon/index_tab/keymaps/via/keymap.c
+++ b/keyboards/minimon/index_tab/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_NUBS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,
        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_RBRC,
-       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NUHS, KC_SFTENT,
+       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NUHS, SC_SENT,
        KC_ESC,  KC_GRV,  KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  TG(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),
 
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index 54b2da42b0..da8d9cf927 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -42,7 +42,7 @@ enum mitosis_keycodes
 // The weird /*,*/ comments are a hack to get slightly better automatic
 // tabulation in my editor.
 
-// We use Space Cadet KC_RSPC to get _ on right shift. See config.h for details.
+// We use Space Cadet SC_RSPC to get _ on right shift. See config.h for details.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_xQ] = LAYOUT(
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_A,    KC_S,       KC_D,    KC_F,    KC_G,           KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,
       KC_Z,    KC_X,       KC_C,    KC_V,    KC_B,           KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_QUOT,
       /*,      */ KC_LGUI, KC_LCTL, MO(_xS), KC_BSPC,        KC_SPC,  MO(_xS), KC_RCTL, KC_RGUI,
-      /*,      */ KC_INT4, KC_LALT, MO(_xN), LSFT_T(KC_TAB), KC_RSPC, MO(_xN), KC_RALT, KC_INT5),
+      /*,      */ KC_INT4, KC_LALT, MO(_xN), LSFT_T(KC_TAB), SC_RSPC, MO(_xN), KC_RALT, KC_INT5),
   [_xC] = 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,
diff --git a/keyboards/mlego/m65/keymaps/default/keymap.c b/keyboards/mlego/m65/keymaps/default/keymap.c
index 4b4b23ca6e..00e144e221 100644
--- a/keyboards/mlego/m65/keymaps/default/keymap.c
+++ b/keyboards/mlego/m65/keymaps/default/keymap.c
@@ -24,8 +24,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_BSPC ,
        KC_TAB, KC_Q   , KC_W    , KC_E   , KC_R    , KC_T  , KC_Y  , KC_U  , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC ,
       KC_NUHS, KC_A   , KC_S    , KC_D   , KC_F    , KC_G  , KC_H  , KC_J  , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT  ,
-      KC_LSPO, KC_NUBS, KC_Z    , KC_X   , KC_C    , KC_V  , KC_B  , KC_N  , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SLSH ,
-      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+      SC_LSPO, KC_NUBS, KC_Z    , KC_X   , KC_C    , KC_V  , KC_B  , KC_N  , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SLSH ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_LWR] = LAYOUT_ortho_5x13(
        KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL  ,
diff --git a/keyboards/mlego/m65/keymaps/dk/keymap.c b/keyboards/mlego/m65/keymaps/dk/keymap.c
index e44bf2adf2..2bf20bf2f6 100644
--- a/keyboards/mlego/m65/keymaps/dk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/dk/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_ESC, DK_1   , DK_2    , DK_3   , DK_4    , DK_5  , DK_6  , DK_7  , DK_8   , DK_9   , DK_0   , DK_PLUS, KC_BSPC ,
        KC_TAB, DK_Q   , DK_W    , DK_E   , DK_R    , DK_T  , DK_Y  , DK_U  , DK_I   , DK_O   , DK_P   , DK_ARNG, DK_DIAE ,
       DK_QUOT, DK_A   , DK_S    , DK_D   , DK_F    , DK_G  , DK_H  , DK_J  , DK_K   , DK_L   , DK_AE  , DK_OSTR, KC_ENT  ,
-      KC_LSPO, DK_LABK, DK_Z    , DK_X   , DK_C    , DK_V  , DK_B  , DK_N  , DK_M   , DK_COMM, DK_DOT , KC_UP  , DK_MINS ,
-      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+      SC_LSPO, DK_LABK, DK_Z    , DK_X   , DK_C    , DK_V  , DK_B  , DK_N  , DK_M   , DK_COMM, DK_DOT , KC_UP  , DK_MINS ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_LWR] = LAYOUT_ortho_5x13(
        DK_HALF, KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , DK_ACUT  ,
diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c
index 3a4c6a4bc3..2d8e597f07 100644
--- a/keyboards/mlego/m65/keymaps/uk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/uk/keymap.c
@@ -157,8 +157,8 @@ altgr shift symbols
        KC_ESC, UK_1   , UK_2    , UK_3   , UK_4    , UK_5  , UK_6  , UK_7  , UK_8   , UK_9   , UK_0   , UK_MINS, KC_BSPC ,
        KC_TAB, UK_Q   , UK_W    , UK_E   , UK_R    , UK_T  , UK_Y  , UK_U  , UK_I   , UK_O   , UK_P   , UK_LBRC, UK_RBRC ,
       UK_HASH, UK_A   , UK_S    , UK_D   , UK_F    , UK_G  , UK_H  , UK_J  , UK_K   , UK_L   , UK_SCLN, UK_QUOT, KC_ENT  ,
-      KC_LSPO, UK_BSLS, UK_Z    , UK_X   , UK_C    , UK_V  , UK_B  , UK_N  , UK_M   , UK_COMM, UK_DOT , KC_UP  , UK_SLSH ,
-      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+      SC_LSPO, UK_BSLS, UK_Z    , UK_X   , UK_C    , UK_V  , UK_B  , UK_N  , UK_M   , UK_COMM, UK_DOT , KC_UP  , UK_SLSH ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
 
 /*
 lower layer
diff --git a/keyboards/mlego/m65/keymaps/via/keymap.c b/keyboards/mlego/m65/keymaps/via/keymap.c
index e88c9207e4..bfdcacc039 100644
--- a/keyboards/mlego/m65/keymaps/via/keymap.c
+++ b/keyboards/mlego/m65/keymaps/via/keymap.c
@@ -24,8 +24,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_BSPC ,
        KC_TAB, KC_Q   , KC_W    , KC_E   , KC_R    , KC_T  , KC_Y  , KC_U  , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC ,
       KC_NUHS, KC_A   , KC_S    , KC_D   , KC_F    , KC_G  , KC_H  , KC_J  , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT  ,
-      KC_LSPO, KC_NUBS, KC_Z    , KC_X   , KC_C    , KC_V  , KC_B  , KC_N  , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SLSH ,
-      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+      SC_LSPO, KC_NUBS, KC_Z    , KC_X   , KC_C    , KC_V  , KC_B  , KC_N  , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SLSH ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_LWR] = LAYOUT_ortho_5x13(
        KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL  ,
diff --git a/keyboards/mt/mt40/keymaps/default/keymap.c b/keyboards/mt/mt40/keymaps/default/keymap.c
index 7dc77dd7e1..19c3abcd35 100644
--- a/keyboards/mt/mt40/keymaps/default/keymap.c
+++ b/keyboards/mt/mt40/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_planck_mit(
         KC_TAB,  KC_Q,   KC_W,     KC_E,  KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,     KC_P,    KC_BSPC,
         C_ESC,   KC_A,   KC_S,     KC_D,  KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,     KC_SCLN, C_ENT,
-        KC_LSPO, KC_Z,   KC_X,     KC_C,  KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,   KC_SLSH, KC_RSPC,
+        SC_LSPO, KC_Z,   KC_X,     KC_C,  KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,   KC_SLSH, SC_RSPC,
         C_LCTL,  C_LGUI, MOD_LALT, MO(3), MO(1),     KC_SPC,     MO(2), MO(4),   MOD_RALT, C_RGUI,  C_RCTL),
 
     [1] = LAYOUT_planck_mit(
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
index 0f642c81f7..c8c83e0e5e 100644
--- a/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
     KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
-    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
+    SC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,SC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT,KC_P0  ,KC_PDOT,L3_PENT  
     ),
 [1] = LAYOUT_all(
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
index 0f642c81f7..c8c83e0e5e 100644
--- a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
     KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
-    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
+    SC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,SC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT,KC_P0  ,KC_PDOT,L3_PENT  
     ),
 [1] = LAYOUT_all(
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
index 251caa8b14..e6d451cd27 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_DEL ,
     KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_PGUP,
-    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_PGDN,
+    SC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,SC_RSPC ,KC_UP , KC_PGDN,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
 [1] = LAYOUT_all(
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
index f8a04ca2c7..691eddde10 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
@@ -30,7 +30,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_BSPC  , KC_DEL ,
     TT(_RAISE)  ,KC_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_LSFTCAPS ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH, KC_SFTENT ,KC_UP , KC_PGDN,
+    KC_LSFTCAPS ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH, SC_SENT ,KC_UP , KC_PGDN,
     KC_LCTL  ,KC_LALT  ,KC_LGUI ,KC_SPC       ,L3_SPC           ,MO(_LOWER) ,MO(_FN1) ,KC_RCTL   ,KC_LEFT,KC_DOWN,KC_RGHT
     ),
 [_FN1] = LAYOUT_48(
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
index 251caa8b14..e6d451cd27 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_DEL ,
     KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_PGUP,
-    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_PGDN,
+    SC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,SC_RSPC ,KC_UP , KC_PGDN,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
 [1] = LAYOUT_all(
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
index e0ba37f674..9636b761bc 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
+++ b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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), KC_SFTENT, RAISE,   KC_RGUI,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_LGUI, LOWER,   CTL_T(KC_SPC), SC_SENT,   RAISE,   KC_RGUI,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
   ),
 
   /* Lower */
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index edab3acf90..584d6c3f3b 100644
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
@@ -28,21 +28,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_LBRC,  KC_RBRC, KC_BSPC,  KC_DEL,    \
       KC_TAB,         KC_QUOT, KC_COMM, KC_DOT,  KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,    KC_L,    KC_SLSH,  KC_EQL,  KC_BSLS,  KC_PGUP,  \
       CTL_T(KC_CAPS), KC_A,    KC_O,    KC_E,    KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,    KC_S,    KC_MINS,  KC_ENT,            KC_PGDN,    \
-      KC_LSPO,                 KC_SCLN, KC_Q,    KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,     KC_RSPC, KC_UP,    MO(_F2),      \
+      SC_LSPO,                 KC_SCLN, KC_Q,    KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,     SC_RSPC, KC_UP,    MO(_F2),      \
       KC_LCTL,        KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, MO(_F1),           KC_LEFT, KC_DOWN,  KC_RIGHT),
 
   [_F1] = LAYOUT(
 	  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_TRNS,    \
       KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_TRNS,  KC_PAUS, KC_BSLS,  KC_TRNS, \
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,   \
-      KC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSPC, KC_VOLU,  KC_TRNS,      \
+      SC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    SC_RSPC, KC_VOLU,  KC_TRNS,      \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_MPLY, KC_VOLD,  KC_MNXT),
 	  
   [_F2] = LAYOUT(
       KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PAUS,    \
       KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SCRL,  KC_PAUS, KC_BSLS,  KC_SCRL, \
       KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,   \
-      KC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    KC_RSPC, KC_PGUP,  KC_TRNS,       \
+      SC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    SC_RSPC, KC_PGUP,  KC_TRNS,       \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDN,  KC_END)
 
 };
diff --git a/keyboards/planck/keymaps/buffet/keymap.c b/keyboards/planck/keymaps/buffet/keymap.c
index 966ec23a6f..abcb5f7568 100644
--- a/keyboards/planck/keymaps/buffet/keymap.c
+++ b/keyboards/planck/keymaps/buffet/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [QWERTY] = LAYOUT_planck_grid(
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,      KC_T,   KC_Y, KC_U,      KC_I,    KC_O,    KC_P,    KC_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_SFTENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,      KC_B,   KC_N, KC_M,      KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
         MO(PHI), KC_LCTL, KC_LALT, KC_LGUI, MO(LOWER), KC_SPC, XXXX, MO(RAISE), KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
     ),
     [GAME] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/dsanchezseco/keymap.c b/keyboards/planck/keymaps/dsanchezseco/keymap.c
index f20f68667b..57c22bb953 100644
--- a/keyboards/planck/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/planck/keymaps/dsanchezseco/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT_planck_grid(
     KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
     ESC_CTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINUS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_SFTENT,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_SENT,
     KC_LCTL, _______, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_BSPC, RAISE,   KC_RGUI, KC_RALT, _______, KC_RCTL
 ),
 
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index f409a8555a..85a516b96e 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTZ] = LAYOUT_planck_grid(
     SCROLL,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    DE_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L, DE_PLUS,    DE_MINS,
-LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT,   KC_UP,    KC_SFTENT,
+LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT,   KC_UP,    SC_SENT,
     KC_LCTL, KC_LGUI, NUMPD,   KC_LALT, LOWER,  KC_SPC,  KC_SPC,   RAISE,  KC_DEL, KC_LEFT, KC_DOWN,  KC_RGHT
 ),
 
diff --git a/keyboards/planck/keymaps/hvp/keymap.c b/keyboards/planck/keymaps/hvp/keymap.c
index 984b9624af..e6a742b49b 100644
--- a/keyboards/planck/keymaps/hvp/keymap.c
+++ b/keyboards/planck/keymaps/hvp/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_planck_grid(
   LT4_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
   LT3_ESC, KC_A,    KC_S,    KC_D,    LT(3,KC_F),    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(TD1), TD(TD2),
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), KC_SFTENT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), SC_SENT,
   KC_LCTL, KC_APP, KC_LGUI, KC_LALT,  MO(2), KC_SPC,  KC_SPC, MO(1),  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
diff --git a/keyboards/planck/keymaps/kmontag42/keymap.c b/keyboards/planck/keymaps/kmontag42/keymap.c
index 17b1a71fac..be1f40249b 100644
--- a/keyboards/planck/keymaps/kmontag42/keymap.c
+++ b/keyboards/planck/keymaps/kmontag42/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_planck_grid(
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_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_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
   KC_LGUI, KC_LCTL, KC_LALT, KC_RPRN, LOWER,   QK_LEAD,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
diff --git a/keyboards/planck/keymaps/motform/keymap.c b/keyboards/planck/keymaps/motform/keymap.c
index 7238df3e47..54d472d7f1 100644
--- a/keyboards/planck/keymaps/motform/keymap.c
+++ b/keyboards/planck/keymaps/motform/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 (
  KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    SE_ODIA, SE_ARNG,
  KC_ECTL,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    SE_ADIA,
- KC_SFTENT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, KC_SFTENT,
+ SC_SENT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, SC_SENT,
  KC_ESC,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_BSPC, RAISE,   KC_RGUI, KC_RALT, KC_HYPR, KC_MEH
  ),
 
diff --git a/keyboards/planck/keymaps/muppetjones/keymap.c b/keyboards/planck/keymaps/muppetjones/keymap.c
index dddfbccc94..5fb6f717e9 100644
--- a/keyboards/planck/keymaps/muppetjones/keymap.c
+++ b/keyboards/planck/keymaps/muppetjones/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // [_CLMK_DH] = LAYOUT_planck_grid(
 //     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
 //     HY_ESC,  HOME_A,  HOME_R,  HOME_S,  HOME_T,  KC_G,    KC_M,    HOME_N,  HOME_E,  HOME_I, HOME_O, KC_QUOT,
-//     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+//     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
 //     KC_LCTL, NUMPD,   KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX
 // ),
 /* Lower (numpad, symbols)
diff --git a/keyboards/planck/keymaps/mwpeterson/keymap.c b/keyboards/planck/keymaps/mwpeterson/keymap.c
index 8c29e57779..c3f6a70784 100644
--- a/keyboards/planck/keymaps/mwpeterson/keymap.c
+++ b/keyboards/planck/keymaps/mwpeterson/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [QWERTY_LAYER] = LAYOUT_planck_grid(
     KC_TAB,        KC_Q,           KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,           KC_QUOT,
     CTL_T(KC_ESC), KC_A,           KC_S,    KC_D,    KC_F,  KC_G,   KC_H,    KC_J,  KC_K,    KC_L,    NAV_SCLN,       CTL_T(KC_ENT),
-    KC_LSPO,       KC_Z,           KC_X,    KC_C,    KC_V,  KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH,        KC_RSPC,
+    SC_LSPO,       KC_Z,           KC_X,    KC_C,    KC_V,  KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH,        SC_RSPC,
     GUI_L,         ALL_T(KC_RBRC), KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_RGUI, KC_RALT, ALL_T(KC_LBRC), GUI_R
   ),
 
diff --git a/keyboards/planck/keymaps/phreed/keymap.c b/keyboards/planck/keymaps/phreed/keymap.c
index bf68288220..21d6fbd501 100644
--- a/keyboards/planck/keymaps/phreed/keymap.c
+++ b/keyboards/planck/keymaps/phreed/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_Q,    KC_W,    KC_E,    KC_R,         KC_T,   MEH_T(KC_ESC),  GUI_T(KC_BSLS),   KC_Y,         KC_U,    KC_I,    KC_O,     KC_P,
   KC_A,    KC_S,    KC_D,    LT(_NP,KC_F), KC_G,   ALT_T(KC_TAB),  ALT_T(KC_QUOT),   KC_H, LT(_FN,KC_J),    KC_K,    KC_L,  KC_SCLN,
   KC_Z,    KC_X,    KC_C,    LT(_SC,KC_V), KC_B,   KC_LBRC,               KC_RBRC,   KC_N, LT(_CD,KC_M), KC_COMM,  KC_DOT,  KC_SLSH,
-  KC_LEFT, KC_DOWN, KC_BSPC, KC_ENT,       KC_LSPO,CTL_T(KC_MINS),  CTL_T(KC_EQL),KC_RSPC,       KC_SPC,  KC_DEL,   KC_UP,  KC_RGHT
+  KC_LEFT, KC_DOWN, KC_BSPC, KC_ENT,       SC_LSPO,CTL_T(KC_MINS),  CTL_T(KC_EQL),SC_RSPC,       KC_SPC,  KC_DEL,   KC_UP,  KC_RGHT
 ),
 
 [_NP] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/pickle_jr/keymap.c b/keyboards/planck/keymaps/pickle_jr/keymap.c
index 2cd471c909..3fbf1b2836 100644
--- a/keyboards/planck/keymaps/pickle_jr/keymap.c
+++ b/keyboards/planck/keymaps/pickle_jr/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_planck_grid(
   TABCALC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    QUOCALC,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,     KC_L,    SCOLNAV, KC_ENT ,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SC_RSPC,
   LBRACK , KC_LCTL, KC_PSCR, KC_LGUI, KC_BSPC, LOWER,  RAISE,  KC_SPC,  KC_RALT,  VIMSAVE, KC_RCTL, RBRACK
 ),
 
diff --git a/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h b/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h
index 431083fa08..290fee765d 100644
--- a/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h
+++ b/keyboards/planck/keymaps/prog_qgmlwb/src/qgmlwb.h
@@ -21,7 +21,7 @@
     KC_TAB,  KC_Q,    KC_G,   KC_M,    KC_L,   KC_W,    KC_B,    KC_Y,   KC_U,    KC_V,    KC_QUOT, KC_BSPC,\
     KC_ESC,  KC_D,    KC_S,   KC_T,    KC_N,   KC_R,    KC_I,    KC_A,   KC_E,    KC_O,    KC_H,    KC_ENT,\
     KC_LSFT, KC_Z,    KC_X,   KC_C,    KC_F,   KC_J,    KC_K,    KC_P,   KC_COMM, KC_DOT,  KC_MINS, KC_BSLS,\
-    KC_LCTL, KC_LALT, numpad, KC_LGUI, QLower, KC_LSPC, KC_RSPC, QRaise, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT\
+    KC_LCTL, KC_LALT, numpad, KC_LGUI, QLower, SC_LSPC, SC_RSPC, QRaise, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT\
 )
 // Norwegian Layout
 #define qgmlwb_no_map qgmlwb_en_map
diff --git a/keyboards/planck/keymaps/rennerom/keymap.c b/keyboards/planck/keymaps/rennerom/keymap.c
index b9d7f2dd5d..6423d848ab 100644
--- a/keyboards/planck/keymaps/rennerom/keymap.c
+++ b/keyboards/planck/keymaps/rennerom/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_planck_grid(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     ESCNAV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT ,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT ,
     FN,      KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index ae66904d8a..42ba7f033a 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -274,7 +274,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_planck_mit(                                                                           //
         QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,                      //
         LT(_TABULA, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,       //
-        TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT,  //
+        TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_SENT,    //
         TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     /*
     Base Layer [0]
@@ -292,7 +292,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_COLEMAK] = LAYOUT_planck_mit(                                                                        //
         QK_GESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,                   //
         LT(_TABULA, KC_TAB), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,          //
-        TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT,  //
+        TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_SENT,    //
         TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     /*
     Colemak Layer [1]
@@ -310,7 +310,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_DVORAK] = LAYOUT_planck_mit(                                                                    //
         QK_GESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,         //
         LT(_TABULA, KC_TAB), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_TRNS, KC_S, KC_SLSH,  //
-        TD(TD_LSHFT_CAPS), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SFTENT,  //
+        TD(TD_LSHFT_CAPS), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SC_SENT,    //
         TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
     /* Dvorak Layer [2]
      * ,-----------------------------------------------------------------------------------.
@@ -399,7 +399,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, KC_HOME, KC_UP, KC_END, KC_PERC, KC_LCBR, KC_RCBR, KC_TAB, KC_P7, KC_P8, KC_P9, KC_BSPC,       //
         KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSLS, KC_LBRC, KC_RBRC, KC_PSLS, KC_P4, KC_P5, KC_P6, KC_PMNS,  //
         KC_LSFT, KC_SLSH, KC_CUT, KC_COPY, KC_PASTE, KC_LT, KC_GT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PPLS,      //
-        TO(_BASE), QK_LEAD, KC_LGUI, KC_LALT, KC_LCPO, KC_SPC, KC_RCPC, KC_HASH, KC_P0, KC_PDOT, KC_PENT),
+        TO(_BASE), QK_LEAD, KC_LGUI, KC_LALT, SC_LCPO, KC_SPC, SC_RCPC, KC_HASH, KC_P0, KC_PDOT, KC_PENT),
     /*
     Numpad Layer [7]
     * ,-----------------------------------------------------------------------------------.
@@ -415,8 +415,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_TABULA] = LAYOUT_planck_mit(                                                                                                   //
         KC_ESC, KC_ALTF4, VK_TOGG, PRINT_WPM_KEY, WAKE_ANI_TOG, WAKE_AUD_TOG, KC_REDO, UC_MOD, UC_M_WC, CG_TOGG, AG_TOGG, KC_DLINE,  //
         KC_NXTAB, KC_SLCTALL, KC_SAVE, KC_TRNS, KC_FIND, SH_TG, SH_TG, IRONY, KC_LCUT, KC_LCOPY, KC_TRNS, KC_KILL,                   //
-        KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, TG(_MOUSY), KC_TRNS, KC_HOME, KC_END, KC_SFTENT,            //
-        TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, KC_LSPO, ALT_TAB, KC_RSPC, KC_PRVWD, KC_BRID, KC_BRIU, KC_NXTWD),
+        KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, TG(_MOUSY), KC_TRNS, KC_HOME, KC_END, SC_SENT,              //
+        TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, SC_LSPO, ALT_TAB, SC_RSPC, KC_PRVWD, KC_BRID, KC_BRIU, KC_NXTWD),
     /* Tabular Layer [8]
      * ,-----------------------------------------------------------------------------------.
      * |  Esc |Alt+F4|Veloci|  WPM |WakANI|WakAUD|Ctrl+Y|UCMode|UCWinC|CtGUTg|AltGTg| DLine|
@@ -432,7 +432,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MOUSY] = LAYOUT_planck_mit(                                                                                                  //
         KC_ESC, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, UC_MOD, UC_M_WC, CG_TOGG, AG_TOGG, KC_BSPC,  //
         KC_TAB, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, IRONY, VK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,                   //
-        KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, KC_TRNS, KC_HOME, KC_BTN3, KC_END, KC_SFTENT,             //
+        KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, KC_TRNS, KC_HOME, KC_BTN3, KC_END, SC_SENT,               //
         TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, KC_BTN1, ALT_TAB, KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R)};
 /* MousePad Layer [9]
  * ,-----------------------------------------------------------------------------------.
diff --git a/keyboards/planck/keymaps/skug/keymap.c b/keyboards/planck/keymaps/skug/keymap.c
index ce9c15e099..86638eb5e3 100644
--- a/keyboards/planck/keymaps/skug/keymap.c
+++ b/keyboards/planck/keymaps/skug/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DEFAULT] = LAYOUT_planck_grid(
     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y    , KC_U   , KC_I   , KC_O   , KC_P   , SE_ARNG,
     UTILITY, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H    , KC_J   , KC_K   , KC_L   , SE_ODIA, SE_ADIA,
-    KC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N    , KC_M   , KC_COMM, KC_DOT , SE_MINS, KC_RSPC,
+    SC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N    , KC_M   , KC_COMM, KC_DOT , SE_MINS, SC_RSPC,
     LFT_CTR, KC_LALT, KC_LGUI, SE_AT  , ESC_LOW, KC_ENT , KC_SPC  , BSP_RAI, _______, KC_ALGR, SE_ASTR, RGT_CTR
 ),
 
diff --git a/keyboards/planck/keymaps/via/keymap.c b/keyboards/planck/keymaps/via/keymap.c
index 09b9cee192..57c6900d83 100644
--- a/keyboards/planck/keymaps/via/keymap.c
+++ b/keyboards/planck/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] =  LAYOUT_ortho_4x12 (
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
         KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+        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_NO,   KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
 
diff --git a/keyboards/preonic/keymaps/boy314/keymap.c b/keyboards/preonic/keymaps/boy314/keymap.c
index a19c69ab6f..de5b59a025 100644
--- a/keyboards/preonic/keymaps/boy314/keymap.c
+++ b/keyboards/preonic/keymaps/boy314/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,  \
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, \
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, \
   KC_LCTL, KC_DEL,  KC_LGUI, KC_LALT, LOWER,   RAISE,   KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT \
 ),
 
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, \
   KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT,  \
-  KC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC, \
+  SC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_RSPC, \
   KC_LCTL, KC_DEL,  KC_LGUI, KC_LALT, LOWER,   RAISE, KC_SPC,  KC_SPC,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT \
 ),
 
diff --git a/keyboards/preonic/keymaps/drasbeck/keymap.c b/keyboards/preonic/keymaps/drasbeck/keymap.c
index f938918e33..81566d33dc 100644
--- a/keyboards/preonic/keymaps/drasbeck/keymap.c
+++ b/keyboards/preonic/keymaps/drasbeck/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
   KC_LCTL, KC_NO, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_NUBS, KC_LCTL, KC_NO,   KC_NO
 ),
 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5), RALT(KC_6), RALT(KC_7), RALT(KC_8), RALT(KC_9), RALT(KC_0), KC_DEL,
   KC_TRNS, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_UP,      KC_MINS,    KC_EQL,     KC_RBRC,
   KC_ESC,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_LEFT,    KC_DOWN,    KC_RGHT,    KC_NO,      KC_NUHS,
-  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_INT1,    KC_SFTENT,
+  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_INT1,    SC_SENT,
   KC_TRNS, KC_TRNS,    KC_TRNS,    KC_RALT,    KC_TRNS,    KC_TRNS,    KC_TRNS, RALT(KC_NUBS), KC_TRNS,   KC_VOLD,    KC_VOLU,     KC_MPLY
 ),
 
diff --git a/keyboards/preonic/keymaps/kjwon15/keymap.c b/keyboards/preonic/keymaps/kjwon15/keymap.c
index 99c29d5849..8e828aed19 100644
--- a/keyboards/preonic/keymaps/kjwon15/keymap.c
+++ b/keyboards/preonic/keymaps/kjwon15/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  \
   KC_CESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,  \
+  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,  \
   KC_ENT,   KC_LCTL, KC_LGUI, KC_LALT, LOWER,   SPC_MOU, KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
 
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
index 9c8d24bb18..f3228ec0d5 100644
--- a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
     QK_GESC, KC_Q,  KC_W,  KC_E,  KC_R,   KC_T,    KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_MINS, KC_BSPC,
     KC_TAB,  KC_A,  KC_S,  KC_D,  KC_F,   KC_G,    KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_ENT,
-    KC_LSPO, KC_Z,  KC_X,  KC_C,  KC_V,   KC_B,    KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+    SC_LSPO, KC_Z,  KC_X,  KC_C,  KC_V,   KC_B,    KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
     KC_LCTL, KC_LALT,          LOWER,  GUBS,      KC_SPC,  RAISE,          KC_RGUI, KC_RCTL
   ),
 
diff --git a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
index 74bde8ea64..a3ab5711af 100644
--- a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_QWERTY] = LAYOUT(
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,              KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, 
 		KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,             KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 
-		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,             KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 
+		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,             KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, 
 		LCTL_T(KC_MPRV), LALT_T(KC_MPLY), FN_NUM, SPC_LFT, BSP_FUNC, LGUI_T(KC_DEL), RALT_T(KC_HOME), RCTL_T(KC_END)
 		),
 	[_LEFTHAND] = LAYOUT(
diff --git a/keyboards/primekb/prime_r/keymaps/rooski/keymap.c b/keyboards/primekb/prime_r/keymaps/rooski/keymap.c
index 40c73e7c16..1703d3fdf1 100644
--- a/keyboards/primekb/prime_r/keymaps/rooski/keymap.c
+++ b/keyboards/primekb/prime_r/keymaps/rooski/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC, KC_DEL,  KC_HOME, KC_END,   \
     KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_P7,   KC_P8,   KC_P9,    \
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,          KC_ENT,  KC_P4,   KC_P5,   KC_P6,    \
-    KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_P1,   AR_UP,   KC_P3,    \
+    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, KC_P1,   AR_UP,   KC_P3,    \
     KC_LCTL,          KC_LGUI, KC_LALT, TO(1),   SPC_LT,           SPC_LT,           AR_TOG,  KC_APP,  KC_RALT, KC_RCTL, AR_LT,   AR_DN,   AR_RT     \
   ),
 
diff --git a/keyboards/projectcain/relic/keymaps/default/keymap.c b/keyboards/projectcain/relic/keymaps/default/keymap.c
index 60561f4c15..f2e61c4b1c 100644
--- a/keyboards/projectcain/relic/keymaps/default/keymap.c
+++ b/keyboards/projectcain/relic/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [NUM] = LAYOUT_all(
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_KP_SLASH,    KC_7,    KC_8,    KC_9,    KC_MINUS,    KC_BSPC,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_KP_ASTERISK,    KC_4,    KC_5,    KC_6,    KC_PLUS,   
-     KC_LCPO,    KC_X,    KC_C,    KC_V,    KC_B,    KC_0,    KC_1,    KC_2, KC_3,  KC_RCPC,  
+     SC_LCPO,    KC_X,    KC_C,    KC_V,    KC_B,    KC_0,    KC_1,    KC_2, KC_3,  SC_RCPC,  
          MO(1), KC_LCTL,       KC_TRNS,  SFT_T(KC_BSPC), KC_TRNS,  KC_SPACE,  KC_TRNS,       KC_LALT, MO(2)
   ),
   
diff --git a/keyboards/punk75/keymaps/dsanchezseco/keymap.c b/keyboards/punk75/keymaps/dsanchezseco/keymap.c
index af4b7053e6..3d8f41b4b4 100644
--- a/keyboards/punk75/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/punk75/keymaps/dsanchezseco/keymap.c
@@ -31,14 +31,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
         KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_LBRC,  KC_PSCR, KC_RBRC, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
         ESC_CTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_HOME,  KC_MNXT, KC_PGUP, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_END,   KC_MPLY, KC_PGDN, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_SFTENT,
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_END,   KC_MPLY, KC_PGDN, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_SENT,
         KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_MPRV, KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
     ),
     [_DVORAK_NUM] = LAYOUT_ortho_5x15( /* DVORAK with center NUMPAD*/
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
         KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_P7,    KC_P8,   KC_P9, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
         ESC_CTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_P4,    KC_P5,   KC_P6, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_P1,    KC_P2,   KC_P3, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_SFTENT,
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_P1,    KC_P2,   KC_P3, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_SENT,
         KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_P0,   KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
     ),
 
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,  KC_PSCR, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_SLSH,
         ESC_CTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,  KC_MNXT, KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,   KC_MPLY, KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_MINS, KC_SFTENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,   KC_MPLY, KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_MINS, SC_SENT,
         KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_MPRV, KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
     ),
 
diff --git a/keyboards/qwertyydox/keymaps/default/keymap.c b/keyboards/qwertyydox/keymaps/default/keymap.c
index 2a4099b3cc..49d45b9c5f 100644
--- a/keyboards/qwertyydox/keymaps/default/keymap.c
+++ b/keyboards/qwertyydox/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+     SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
      KC_LCTL, KC_LGUI, KC_LALT, qwerty,  KC_ENT,  KC_DEL,  TO(1),            TO(2),   KC_SPC,  KC_BSPC, KC_LEFT, KC_RALT, KC_RGUI, KC_RCTL
   //`--------+--------+--------+--------+--------+--------+--------/        \--------+--------+--------+--------+--------+--------+--------'
diff --git a/keyboards/redox/keymaps/cykedev/keymap.c b/keyboards/redox/keymaps/cykedev/keymap.c
index ffff8ad0a6..9ada4463b4 100644
--- a/keyboards/redox/keymaps/cykedev/keymap.c
+++ b/keyboards/redox/keymaps/cykedev/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_HOME ,                         KC_END , KC_Y   , KC_U   , KC_I    , KC_O    , KC_P    , KC_BSLS ,
      KC_LCTL , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , SY_LBRC ,                         SY_RBRC, KC_H   , KC_J   , KC_K    , KC_L    , KC_SCLN , KC_QUOT ,
      KC_LSFT , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_PEQL , KC_BSPC   , KC_PPLS   , KC_MINS, KC_N   , KC_M   , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT ,
-     ADJ     , KC_HYPR, KC_MEH ,KC_LCTL ,          A_COMM , KC_LGUI , KC_SFTENT , KC_SFTENT , SY_SPC , A_DOT  ,          KC_RCTL , KC_PGUP , KC_PGDN , ADJ
+     ADJ     , KC_HYPR, KC_MEH ,KC_LCTL ,          A_COMM , KC_LGUI , SC_SENT   , SC_SENT   , SY_SPC , A_DOT  ,          KC_RCTL , KC_PGUP , KC_PGDN , ADJ
   ),
 
   [_SYMBOL] = LAYOUT(
diff --git a/keyboards/redox/keymaps/eightbitraptor/keymap.c b/keyboards/redox/keymaps/eightbitraptor/keymap.c
index 110abb8368..ab2dd307c8 100644
--- a/keyboards/redox/keymaps/eightbitraptor/keymap.c
+++ b/keyboards/redox/keymaps/eightbitraptor/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_ECTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_LBRC ,                          KC_RBRC ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QCTL ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+     SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
      NAV_L   ,SYM_L   ,XXXXXXX ,KC_LALT ,     KC_LGUI ,    KC_SPC  ,KC_DEL  ,        KC_ENT  ,KC_BSPC ,    KC_RGUI ,     KC_LALT ,XXXXXXX ,SYM_L   ,KC_NABS
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
diff --git a/keyboards/redox/keymaps/finex/keymap.c b/keyboards/redox/keymaps/finex/keymap.c
index 6bc41bc0b3..6470addb27 100644
--- a/keyboards/redox/keymaps/finex/keymap.c
+++ b/keyboards/redox/keymaps/finex/keymap.c
@@ -241,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
        KC_CESC ,KC_A    ,KC_R    ,KC_AL_S ,KC_T_SH ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_M    ,KC_N_SH ,KC_AL_E ,KC_I    ,KC_O    ,KC_CMIN ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_D    ,KC_V    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_K    ,KC_H    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_D    ,KC_V    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_K    ,KC_H    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
     //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
        KC_GSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_CBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
     //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
@@ -256,7 +256,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
        KC_CESC ,KC_A    ,KC_R    ,KC_AL_S ,KC_T_SH ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_M    ,KC_N_SH ,KC_AL_E ,KC_I    ,KC_O    ,KC_CMIN ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_D    ,KC_V    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_K    ,KC_H    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_D    ,KC_V    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_K    ,KC_H    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
     //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
        KC_CSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_GBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
     //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
@@ -271,7 +271,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
        KC_CESC ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_TDSC ,KC_CMIN ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
     //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
        KC_GSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_CBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
     //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
@@ -286,7 +286,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
        KC_CESC ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_TDSC ,KC_CMIN ,
     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
+       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
     //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
        KC_CSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_GBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
     //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c
index f407f95833..a1b9dcfe46 100644
--- a/keyboards/rgbkb/mun/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,   KC_RPRN,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
         KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_DEL,    KC_ENT,    KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_RCTL,
 
         KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD,                                                          KC_PGDN, KC_PGUP, KC_PGDN, KC_PGUP,
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
index 226d6a8c97..8767edbb57 100644
--- a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_ESC,  KC_1,    KC_2,    KC_3,  KC_4, 	KC_5,     KC_GRV, 		KC_EQL,   KC_6,     KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, 
 			KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R, 	KC_T,     KC_LBRC,  	KC_RBRC,  KC_Y,     KC_U,    KC_I,    KC_O,   KC_P,    KC_BSLS, 
 			KC_LCTL, KC_A,    KC_S,    KC_D,  KC_F, 	KC_G,     KC_HOME,  	KC_END,   KC_H,     KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-			KC_LSPO, KC_Z,    KC_X,    KC_C,  KC_V,     KC_B,     KC_MPLY,  	KC_MUTE,  KC_N,     KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 
+			SC_LSPO, KC_Z,    KC_X,    KC_C,  KC_V,     KC_B,     KC_MPLY,  	KC_MUTE,  KC_N,     KC_M,    KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, 
 			KC_LCTL, KC_LGUI, KC_LALT, MO(3), DEL_FUNC, SPC_LHND, SPC_LHND, 	BSP_FUNC, BSP_FUNC, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_RCTL, 
 			// Here we have the encoder setup. Encoder 0 clockwise, Encoder 0 counter-clockwise, Encoder 1 clockwise, Encoder 1 counter-clockwise , then right side
 			KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_PGDN, KC_PGUP, KC_PGDN, KC_PGUP, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV, RGB_HUI, RGB_HUD, RGB_RMOD, RGB_TOG, RGB_MOD
diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c
index f407f95833..a1b9dcfe46 100644
--- a/keyboards/rgbkb/mun/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,   KC_EQL,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_RBRC,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,   KC_RPRN,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,   KC_RCBR,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
         KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_DEL,    KC_ENT,    KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_RCTL,
 
         KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD,                                                          KC_PGDN, KC_PGUP, KC_PGDN, KC_PGUP,
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
index fdf620d11e..960cc9266d 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
@@ -57,8 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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,
-        KC_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, KC_RSPC,
-        KC_LCPO, KC_LGUI, KC_LALT, KC_DEL,  KC_SPC,  KC_NO,   ADJ,        FN,      KC_NO,   KC_SPC,  KC_QUOTE,KC_RALT, KC_APP,  KC_RCPC,
+        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,    KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
+        SC_LCPO, KC_LGUI, KC_LALT, KC_DEL,  KC_SPC,  KC_NO,   ADJ,        FN,      KC_NO,   KC_SPC,  KC_QUOTE,KC_RALT, KC_APP,  SC_RCPC,
 
         KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD,                                                          MENU_DN, MENU_UP, MENU_DN, MENU_UP,
         KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                        RGB_HUI, RGB_HUD, RGB_RMOD,RGB_TOG, RGB_MOD
diff --git a/keyboards/rgbkb/pan/keymaps/default/keymap.c b/keyboards/rgbkb/pan/keymaps/default/keymap.c
index 1d2811933c..367aadbb4b 100644
--- a/keyboards/rgbkb/pan/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/pan/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEL,
         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT,   KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+        KC_LSFT,   KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
         KC_LCTL,   KC_LGUI, KC_LALT, RGB_TOG, MO(_ADJ),KC_SPC, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
     ),
 
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEL,
         KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
         FN_CAPS,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, KC_ENT,
         KC_LCTL,   KC_LGUI, KC_LALT, RGB_TOG, MO(_ADJ),KC_SPC, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
     ),
 
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
index 3ccd96036a..2dde367959 100644
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
           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_LSPO,       KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,    _______,      _______,          KC_N,       KC_M,    KC_COMM,     KC_DOT,    KC_SLSH,    KC_RSPC,
+         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,
   //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
index 1c8320ac6e..95b22824af 100644
--- a/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
@@ -33,7 +33,7 @@ EXPAND_LAYOUT( \
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   RGB_MOD,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
       KC_TAB,  _00,     _01,     _02,     _03,     _04,    KC_LBRC,  KC_RBRC, _05,     _06,     _07,     _08,     _09,     KC_BSLS, \
       FN_ESC,  _10,     _11,     _12,     _13,     _14,    RGB_SAI,  RGB_VAI, _15,     _16,     _17,     _18,     _19,     KC_QUOT, \
-      KC_LSPO, _20,     _21,     _22,     _23,     _24,    RGB_SAD,  RGB_VAD, _25,     _26,     _27,     _28,     _29,     KC_RSPC, \
+      SC_LSPO, _20,     _21,     _22,     _23,     _24,    RGB_SAD,  RGB_VAD, _25,     _26,     _27,     _28,     _29,     SC_RSPC, \
       KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN,      KC_SPC, FN,       FN,      KC_SPC,  KC_MINS, KC_EQL,  KC_DOWN, KC_PGUP, KC_PGDN, \
                                                    KC_SPC, KC_BSPC,  KC_ENT,  KC_SPC \
 )
diff --git a/keyboards/rgbkb/sol3/keymaps/default/keymap.c b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
index 995ac585ae..31fb3ac5f1 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                  KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                  KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
         KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_PGDN, KC_DEL, KC_ENT,  KC_PGUP, KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RCTL,
 
         KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,                                     KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
index 90773203b5..ab8f7d0ce3 100644
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    RGB_MOD,                   KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
       KC_TAB,  _________________QWERTY_L1_________________, KC_LBRC,                   KC_RBRC, _________________QWERTY_R1_________________, KC_BSLS,
       FN_ESC,  _________________QWERTY_L2_________________, RGB_SAI,                   RGB_VAI, _________________QWERTY_R2_________________, KC_QUOT,
-      KC_LSPO, _________________QWERTY_L3_________________, RGB_SAD,                   RGB_VAD, _________________QWERTY_R3_________________, KC_RSPC,
+      SC_LSPO, _________________QWERTY_L3_________________, RGB_SAD,                   RGB_VAD, _________________QWERTY_R3_________________, SC_RSPC,
       KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN,      KC_SPC,  KC_MUTE, KC_BSPC, KC_ENT,  FN,      KC_SPC,  KC_MINS, KC_EQL,  KC_DOWN, KC_PGUP, KC_PGDN
   ),
 
diff --git a/keyboards/rgbkb/sol3/keymaps/via/keymap.c b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
index 0daf3dbe66..cb7ce63a8d 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                  KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
         FN_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                  KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
         KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_PGDN, KC_DEL, KC_ENT,  KC_PGUP, KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RCTL,
 
         KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,                                     KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c
index 75884635cd..83192f4bfd 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c
@@ -19,7 +19,7 @@ EXPAND_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,  _00,     _01,     _02,     _03,     _04,                       _05,     _06,     _07,     _08,     _09,     KC_BSLS, \
       FN_ESC,  _10,     _11,     _12,     _13,     _14,                       _15,     _16,     _17,     _18,     _19,     KC_QUOT, \
-      KC_LSPO, _20,     _21,     _22,     _23,     _24,                       _25,     _26,     _27,     _28,     _29,     KC_RSPC, \
+      SC_LSPO, _20,     _21,     _22,     _23,     _24,                       _25,     _26,     _27,     _28,     _29,     SC_RSPC, \
       KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN,      KC_SPC, KC_BSPC,  KC_ENT,  KC_SPC,  KC_MINS, KC_EQL,  KC_DOWN, KC_PGUP, KC_PGDN \
 )
 #define BASE_LAYOUT(...) _BASE_LAYOUT(__VA_ARGS__)
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
index ec7deb7118..1b4227708a 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 QK_GESC, KC_1, 	KC_2, 	KC_3, 	KC_4, 	KC_5, 				KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, KC_BSLS, 
 KC_TAB,  KC_Q, 	KC_W, 	KC_E, 	KC_R, 	KC_T, 				KC_Y, 	KC_U, 	KC_I, 	KC_O, 	KC_P, KC_BSPC, 
 KC_LCTL, KC_A, 	KC_S, 	KC_D, 	KC_F, 	KC_G, 				KC_H, 	KC_J, 	KC_K, 	KC_L, 	KC_SCLN, KC_QUOT, 
-KC_LSFT, KC_Z, 	KC_X, 	KC_C, 	KC_V, 	KC_B, 				KC_N, 	KC_M, 	KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT, 
+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(
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 6d1210048b..ff476dacd1 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -330,13 +330,13 @@ lookup_table_t lookup_table[333] =
  {"RGB_M_K", RGB_M_K},
  {"RGB_M_X", RGB_M_X},
  {"RGB_M_G", RGB_M_G},
- {"KC_LSPO", KC_LSPO},
- {"KC_RSPC", KC_RSPC},
- {"KC_SFTENT", KC_SFTENT},
- {"KC_LCPO", KC_LCPO},
- {"KC_RCPC", KC_RCPC},
- {"KC_LAPO", KC_LAPO},
- {"KC_RAPC", KC_RAPC},
+ {"SC_LSPO", SC_LSPO},
+ {"SC_RSPC", SC_RSPC},
+ {"SC_SENT", SC_SENT},
+ {"SC_LCPO", SC_LCPO},
+ {"SC_RCPC", SC_RCPC},
+ {"SC_LAPO", SC_LAPO},
+ {"SC_RAPC", SC_RAPC},
  {"FN_MO13", FN_MO13},
  {"FN_MO23", FN_MO23},
  {"MACRO00", MACRO00},
diff --git a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
index 60edf8da4f..f42e4c75e9 100644
--- a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, \
         LT(_FL, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,       KC_ENT,     KC_PGUP, \
-        KC_LSPO,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSPC, KC_UP, KC_PGDN, \
+        SC_LSPO,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    SC_RSPC, KC_UP, KC_PGDN, \
         KC_LCTL, KC_LALT, KC_LGUI,            KC_SPC,            KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
 
 
diff --git a/keyboards/signum/3_0/keymaps/default/keymap.c b/keyboards/signum/3_0/keymaps/default/keymap.c
index ed31c54760..e9f7816018 100644
--- a/keyboards/signum/3_0/keymaps/default/keymap.c
+++ b/keyboards/signum/3_0/keymaps/default/keymap.c
@@ -638,7 +638,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_ortho_4x12(
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
 		LCTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
 		LCTL_T(KC_LBRC), KC_LALT, KC_LGUI, TT(2), LT(6,KC_SPC), LT(4,KC_DEL), LT(4,KC_ENT), KC_SPC, LT(2,KC_BSPC), KC_RGUI, LALT_T(KC_RALT), RCTL_T(KC_RBRC)
 	),
 
@@ -657,7 +657,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_ortho_4x12(
 		KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC,
 		LCTL_T(KC_ESC), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
-		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
 		LCTL_T(KC_LBRC), KC_LALT, KC_LGUI, TT(2), LT(6,KC_SPC), LT(4,KC_DEL), LT(4,KC_ENT), KC_SPC, LT(2,KC_BSPC), KC_RGUI, LALT_T(KC_RALT), RCTL_T(KC_RBRC)
 	),
 
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index 1dd483212d..2842bee7db 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -359,7 +359,7 @@ qmk_dict = {
     # Basic Keycodes missing from Print Screen onwards, included as fallback
     # random Keycodes
     "RGui": "KC_RGUI", "LGui": "KC_LGUI", "LAlt": "KC_LALT", "RLAlt": "LALT_T(KC_RALT)", "RAlt": "KC_RALT", "LShift": "KC_LSFT", "LCtrl": "KC_LCTL", "LCtTBsp": "LCTL_T(KC_BSPC)", "LCtTEsc": "LCTL_T(KC_ESC)", "RCtrl": "KC_RCTL",
-    "LShift(": "KC_LSPO", "RShift)": "KC_RSPC",
+    "LShift(": "SC_LSPO", "RShift)": "SC_RSPC",
     # "LShift(": "LSFT_T(KC_9)", "RShift)": "RSFT_T(RSFT(KC_0))",
     "LCtrl[": "LCTL_T(KC_LBRC)", "RCtrl]": "RCTL_T(KC_RBRC)",
     "L1_ENT": "LT(1, KC_ENT)", "LT2_BSP":  "LT(2,KC_BSPC)", "LT4_DEL":  "LT(4,KC_DEL)", "LT4_ENT":  "LT(4,KC_ENT)", "LT6_SPC": "LT(6,KC_SPC)",
diff --git a/keyboards/slz40/keymaps/default/keymap.c b/keyboards/slz40/keymaps/default/keymap.c
index cbb67b3769..fbf47358ce 100644
--- a/keyboards/slz40/keymaps/default/keymap.c
+++ b/keyboards/slz40/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
 		QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, KC_BSPC,
 		LT(_FN, KC_TAB),  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  LT(_FN,KC_ENT),
-		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, 
+		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, SC_RSPC, 
 		KC_LCTL, KC_LGUI, KC_LALT,  LT(_FN2, KC_DEL), LT(_FN2, KC_ENTER),   KC_SPACE,   KC_QUOT,  KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [_FN] = LAYOUT(
diff --git a/keyboards/sofle/keymaps/killmaster/keymap.c b/keyboards/sofle/keymaps/killmaster/keymap.c
index c601edd727..65c02bb952 100644
--- a/keyboards/sofle/keymaps/killmaster/keymap.c
+++ b/keyboards/sofle/keymaps/killmaster/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_MINS,
   KC_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_LSPO,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSPC,
+  SC_LSPO,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  SC_RSPC,
                  KC_LGUI,KC_LALT,KC_LCTL, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /* LOWER
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/keymap.c b/keyboards/splitkb/kyria/keymaps/artflag/keymap.c
index 9f732b767c..a49eaafb89 100644
--- a/keyboards/splitkb/kyria/keymaps/artflag/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/artflag/keymap.c
@@ -31,7 +31,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_ESC, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, TD(CT_CLN), KC_BSPC, KC_LGUI, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, KC_TAB, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_BSLS, TT(2), KC_LBRC, KC_RBRC, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, KC_GRV, KC_LCTL, KC_LALT, KC_SPC, KC_LSPO, TT(1), TT(1), KC_RSPC, KC_ENT, KC_MINS, KC_EQL),
+	[0] = LAYOUT(KC_ESC, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, TD(CT_CLN), KC_BSPC, KC_LGUI, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, KC_TAB, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_BSLS, TT(2), KC_LBRC, KC_RBRC, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, KC_GRV, KC_LCTL, KC_LALT, KC_SPC, SC_LSPO, TT(1), TT(1), SC_RSPC, KC_ENT, KC_MINS, KC_EQL),
 	[1] = LAYOUT(KC_TRNS, KC_NO, KC_7, KC_8, KC_9, KC_NO, KC_NO, KC_NO, KC_UP, KC_PGUP, KC_PSLS, KC_TRNS, KC_TRNS, KC_0, KC_4, KC_5, KC_6, KC_PDOT, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_PAST, KC_PPLS, KC_TRNS, KC_NO, KC_1, KC_2, KC_3, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_HOME, KC_END, KC_PGDN, KC_EXLM, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[2] = LAYOUT(KC_NO, KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_MPLY, KC_VOLU, KC_BRIU, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_F5, KC_F6, KC_F7, KC_F8, KC_NO, KC_MSTP, KC_VOLD, KC_BRID, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/workman-artflag.json b/keyboards/splitkb/kyria/keymaps/artflag/workman-artflag.json
index f7429164c4..be4096b72b 100644
--- a/keyboards/splitkb/kyria/keymaps/artflag/workman-artflag.json
+++ b/keyboards/splitkb/kyria/keymaps/artflag/workman-artflag.json
@@ -50,10 +50,10 @@
       "KC_LCTL",
       "KC_LALT",
       "KC_SPC",
-      "KC_LSPO",
+      "SC_LSPO",
       "TT(1)",
       "TT(1)",
-      "KC_RSPC",
+      "SC_RSPC",
       "KC_ENT",
       "KC_MINS",
       "KC_EQL"
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
index adbd6e0df6..f769c9a5dd 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/default.json
@@ -6,7 +6,7 @@
     [
       "KC_ESC", "KC_Q", "KC_W", "KC_F", "KC_P", "KC_G", "KC_J", "KC_L", "KC_U", "KC_Y", "KC_SCLN", "KC_BSLS",
       "LCTL_T(KC_BSPC)", "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_LAPO", "LGUI_T(KC_LBRC)", "RGUI_T(KC_RBRC)", "KC_RAPC", "KC_K", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_MINS",
+      "LSFT_T(KC_DEL)", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "SC_LAPO", "LGUI_T(KC_LBRC)", "RGUI_T(KC_RBRC)", "SC_RAPC", "KC_K", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_MINS",
       "KC_TAB", "KC_LGUI", "TT(1)", "LSFT_T(KC_SPC)", "LCTL_T(KC_ENT)", "RCTL_T(KC_ENT)", "RSFT_T(KC_SPC)", "TT(2)", "KC_RGUI", "QK_LEAD"
     ],
     [
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
index 6eddb235df..a375c5cc4d 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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,
         LCTL_T(KC_BSPC), 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_LAPO, LGUI_T(KC_LBRC), RGUI_T(KC_RBRC), KC_RAPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
+        LSFT_T(KC_DEL), KC_Z, KC_X, KC_C, KC_V, KC_B, SC_LAPO, LGUI_T(KC_LBRC), RGUI_T(KC_RBRC), SC_RAPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
         KC_TAB, KC_LGUI, TT(_SYMBOLS), LSFT_T(KC_SPC), LCTL_T(KC_ENT), RCTL_T(KC_ENT), RSFT_T(KC_SPC), TT(_NUMBERS), KC_RGUI, QK_LEAD),
     [_SYMBOLS] = LAYOUT(
         KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
index e78e15ea3e..9ad6fa7bd4 100644
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[QWERTY] = LAYOUT(LALT(KC_A), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LALT, KC_LCTL, KC_LGUI, MO(2), MO(4), KC_BSPC, KC_SPC, MO(1), KC_PGDN, TG(1)),
+[QWERTY] = LAYOUT(LALT(KC_A), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LALT, KC_LCTL, KC_LGUI, MO(2), MO(4), KC_BSPC, KC_SPC, MO(1), KC_PGDN, TG(1)),
 
 [HOTKEYS] = LAYOUT(KC_F6, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_F14, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, KC_ASTG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, KC_F5, KC_NO, KC_LGUI, KC_LGUI, KC_LCTL, KC_BSPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS),
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [SELECT] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, SGUI(KC_LEFT), LSFT(KC_UP), SGUI(KC_RGHT), KC_NO, R_COLS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_RGHT), KC_NO, R_IN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LALT(LSFT(KC_LEFT)), LALT(LSFT(KC_RIGHT)), KC_NO, TEX, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, KC_SPC, KC_LGUI, KC_NO, KC_NO),
 
-[NUMBERS] = LAYOUT(KC_NO, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), KC_EQL, KC_7, KC_8, KC_9, KC_TILD, KC_MINS, KC_NO, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PLUS, KC_4, KC_5, KC_6, KC_COLN, KC_ENT, KC_LSPO, KC_NO, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_NO, KC_NO, KC_NO, KC_NO, KC_MINS, KC_1, KC_2, KC_3, KC_SLSH, KC_PIPE, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_BSPC, KC_SPC, KC_0, KC_DOT, KC_COMM)
+[NUMBERS] = LAYOUT(KC_NO, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), KC_EQL, KC_7, KC_8, KC_9, KC_TILD, KC_MINS, KC_NO, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PLUS, KC_4, KC_5, KC_6, KC_COLN, KC_ENT, SC_LSPO, KC_NO, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_NO, KC_NO, KC_NO, KC_NO, KC_MINS, KC_1, KC_2, KC_3, KC_SLSH, KC_PIPE, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_BSPC, KC_SPC, KC_0, KC_DOT, KC_COMM)
 
 };
 
diff --git a/keyboards/splitkb/kyria/keymaps/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
index a67b82b172..71b0416209 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                        KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,  KC_DEL,
   KC_TAB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                        KC_H,    KC_J,    KC_K,    KC_L, XP(APOST,QUOTE), KC_BSPC, //  XP(APOST,QUOTE) or KC_QUOT
  KC_LSFT,    KC_Y,    KC_X,    KC_C,    KC_V,    KC_B, KC_BSLS, KC_GRV,  KC_LPRN,    KC_RPRN, KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SCLN, KC_CAPS,
-                            KC_LCTL, KC_LGUI, KC_LALT,  KC_SPC,   MO(1),   MO(2),  KC_SFTENT, KC_MINS, KC_EXLM, KC_SLSH
+                            KC_LCTL, KC_LGUI, KC_LALT,  KC_SPC,   MO(1),   MO(2),    SC_SENT, KC_MINS, KC_EXLM, KC_SLSH
     ),
 
 // /*
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
index 2ad43428b9..c3e98ec872 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CLMK_DH] = LAYOUT_wrapper(
     CW_TOGG, __COLEMAK_MOD_DH_L1________________________,                                     __COLEMAK_MOD_DH_R1_W_QUOT_________________, KC_BSLS,
     HY_ESC,  __COLEMAK_MOD_DH_L2_W_GACS_________________,                                     __COLEMAK_MOD_DH_R2_W_SCAG_________________, KC_QUOT,
-    TD_LAYR, __COLEMAK_MOD_DH_L3________________________, KC_LSFT, QK_LEAD, KC_DEL,  KC_TAB,  __COLEMAK_MOD_DH_R3________________________, KC_SFTENT,
+    TD_LAYR, __COLEMAK_MOD_DH_L3________________________, KC_LSFT, QK_LEAD, KC_DEL,  KC_TAB,  __COLEMAK_MOD_DH_R3________________________, SC_SENT,
                                KC_MUTE, KC_DEL,  HY_ESC,  LOW_BSP, RAI_ENT, KC_BSPC, NAV_SPC, HY_ESC,  RAI_TAB, KC_RALT
 ),
 [_QWERTY] = LAYOUT_wrapper(
diff --git a/keyboards/tada68/keymaps/amnesia0287/keymap.c b/keyboards/tada68/keymaps/amnesia0287/keymap.c
index 667b8fbcfe..e066b6cb5b 100644
--- a/keyboards/tada68/keymaps/amnesia0287/keymap.c
+++ b/keyboards/tada68/keymaps/amnesia0287/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_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_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,LT(_HLa, KC_END), \
+  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,LT(_HLa, KC_END), \
   KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,FN_HLa,FN_HLb, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _HL: Hype Fn Layer
diff --git a/keyboards/tada68/keymaps/shalzz/keymap.c b/keyboards/tada68/keymaps/shalzz/keymap.c
index bdd8155b52..ff31abec11 100644
--- a/keyboards/tada68/keymaps/shalzz/keymap.c
+++ b/keyboards/tada68/keymaps/shalzz/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
-  KC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,KC_PGDN, \
+  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,KC_PGDN, \
   KC_LCTL, KC_LGUI,KC_LALT,            LT(_BL, KC_SPC),                    MO(_FL),KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/tada68/keymaps/sm0g/keymap.c b/keyboards/tada68/keymaps/sm0g/keymap.c
index 25312cd98f..0517e799b9 100644
--- a/keyboards/tada68/keymaps/sm0g/keymap.c
+++ b/keyboards/tada68/keymaps/sm0g/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC, TD(TD_F1), TD(TD_F2), TD(TD_F3), TD(TD_F4), TD(TD_F5), TD(TD_F6), TD(TD_F7), TD(TD_F8), TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), KC_BSLS,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSPC,KC_DEL, \
   CTL_T(KC_ESC), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
-  KC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,KC_PGDN, \
+  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,KC_PGDN, \
   KC_CAPS, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RCTL,MO(_FL), KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/tada68/keymaps/unix/keymap.c b/keyboards/tada68/keymaps/unix/keymap.c
index 3c777a82ac..e0581b4d3a 100644
--- a/keyboards/tada68/keymaps/unix/keymap.c
+++ b/keyboards/tada68/keymaps/unix/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   QK_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,         KC_ENT,KC_PGUP,  \
-  KC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSPC,KC_UP,KC_PGDN, \
+  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,KC_PGDN, \
   KC_LCTL, KC_LGUI,KC_LALT,            LT(_FL, KC_SPC),                    KC_RALT,MO(_FL),KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
 
   /* Keymap _FL: Function Layer
diff --git a/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c
index 780694f335..0600856660 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/hvp/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QW] = LAYOUT_arrow( /* Qwerty */
     LT4_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     LT3_ESC, KC_A,    KC_S,    KC_D,    LT(3,KC_F),    LT(4,KC_G),    KC_H,    KC_J,    KC_K,    KC_L,    TD(TD1), TD(TD2),
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), KC_SFTENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  TD(TD3), SC_SENT,
     KC_LCTL, KC_LGUI, KC_LALT, LT(_L2,KC_ENT),  LT(_L1,KC_SPC), KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
   ),
   [_L1] = LAYOUT_arrow( /* LAYER 1 */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
index 372dc3e337..11105dd945 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
@@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT
 	(QK_GESC,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,            KC_BSPC, 
 	LT(1,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(1,KC_QUOT), 
-	KC_LSPO,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 
+	SC_LSPO,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, 
 	KC_LCTL,  KC_LALT,  KC_LGUI,    KC_ENT,    KC_SPC,    TG(2),    LT(3,KC_APP),      KC_DEL),
 	
 	[1] = LAYOUT
diff --git a/keyboards/tzarc/ghoul/keymaps/default/keymap.c b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
index 01814b0a84..920af658c4 100644
--- a/keyboards/tzarc/ghoul/keymaps/default/keymap.c
+++ b/keyboards/tzarc/ghoul/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            RGB_MOD,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
         HOME_A,  HOME_S,  HOME_D,  HOME_F,  KC_G,                                KC_H,    HOME_J,  HOME_K,  HOME_L,  HOME_SCLN,
         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-        SFT_ESC, KC_LCTL, KC_LGUI, KC_SPC,  LOWER,                               RAISE,   KC_SPC,  KC_LALT, KC_BSPC, KC_SFTENT
+        SFT_ESC, KC_LCTL, KC_LGUI, KC_SPC,  LOWER,                               RAISE,   KC_SPC,  KC_LALT, KC_BSPC, SC_SENT
     ),
     [_LOWER] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         RGB_MOD,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
index 2142ca58c0..a6b57aa8fe 100644
--- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
+++ b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	       KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
 	       LT(2, KC_TAB),  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
 	       LT(1, KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  \
-	       KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSPC,   \
+	       SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,   \
 	       KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                                      MO(1),   KC_RGUI, KC_APP,  KC_RCTL),
 
          /*
diff --git a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c b/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
index 11cb334084..dac34bd228 100644
--- a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
+++ b/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
@@ -37,21 +37,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MPLY, KC_GRV,  KC_1,    KC_2,  KC_3,  KC_4,  KC_5,    KC_6,  KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,
         KC_TRNS, KC_TAB,  KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,    KC_Y,  KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, NUM,
         KC_TRNS, KC_LCTL, KC_A,    KC_S,  KC_D,  KC_F,  KC_G,    KC_H,  KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,
-        KC_TRNS, KC_LSPO, KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,
+        KC_TRNS, SC_LSPO, KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,
         KC_TRNS, L_CTRL,  KC_LGUI, L_ALT, KC_NO, LHAND,          RHAND, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_LHAND] = LAYOUT_all(
         QK_BOOT, KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,
         KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS,
         KC_PGUP, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT,  KC_TRNS,
-        KC_PGDN, KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT,  KC_BSPC,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSPC, KC_TRNS,
+        KC_PGDN, KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT,  KC_BSPC,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, SC_RSPC, KC_TRNS,
         KC_END,  KC_LCTL, KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS,              KC_TRNS, KC_RALT, KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_RHAND] = LAYOUT_all(
         KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,
         KC_NO, KC_GRV,  KC_1,    KC_2,  KC_3,    KC_4,   KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSLS,
         KC_NO, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,     KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, KC_NO,   KC_PIPE,
-        KC_NO, KC_LSFT, KC_NO,   KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSPC, KC_NO,
+        KC_NO, KC_LSFT, KC_NO,   KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   SC_RSPC, KC_NO,
         KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,               KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
     ),
     [_NUM] = LAYOUT_all(
diff --git a/keyboards/vitamins_included/keymaps/vitavim/keymap.c b/keyboards/vitamins_included/keymaps/vitavim/keymap.c
index d59ff88029..5c2715550f 100644
--- a/keyboards/vitamins_included/keymaps/vitavim/keymap.c
+++ b/keyboards/vitamins_included/keymaps/vitavim/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ALPHAS] = LAYOUT_ortho_4x12(
   KC_TAB,         KC_Q,    KC_W,    KC_E,  KC_R,         KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,          KC_INS,
   LCTL_T(KC_ESC), KC_A,    KC_S,    KC_D,  KC_F,         KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    LT(2,KC_SCLN), RSFT_T(KC_ENT),
-  KC_LSPO,        KC_Z,    KC_X,    KC_C,  KC_V,         KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_UP,         KC_RSPC,
+  SC_LSPO,        KC_Z,    KC_X,    KC_C,  KC_V,         KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_UP,         SC_RSPC,
   KC_LCTL,        KC_LGUI, KC_LALT, MO(1), LT(3,KC_DEL), KC_SPC, KC_SPC, KC_BSPC, MO(4),   KC_LEFT, KC_DOWN,       KC_RGHT
 ),
 
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_NUMPAD] =  LAYOUT_ortho_4x12(
     KC_LBRC, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN, KC_7, KC_8,  KC_9,  KC_RPRN, KC_RBRC,
     KC_LCBR, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_NO,   KC_EQL,  KC_4, KC_5,  KC_6,  KC_SCLN, KC_RCBR,
-    KC_LSPO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_1, KC_2,  KC_3,  KC_PEQL, KC_RSPC,
+    SC_LSPO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_1, KC_2,  KC_3,  KC_PEQL, SC_RSPC,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC,  KC_0, KC_NO, KC_NO, KC_NO,   KC_NO
 ),
 
diff --git a/keyboards/wren/keymaps/walterhanley/keymap.c b/keyboards/wren/keymaps/walterhanley/keymap.c
index ee4b6f3734..bf6afc9ac6 100644
--- a/keyboards/wren/keymaps/walterhanley/keymap.c
+++ b/keyboards/wren/keymaps/walterhanley/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      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,  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, 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
     ),
 
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      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,  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, 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
     ),
 
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
index 3f13ad497b..2f9a933aba 100644
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       QK_LEAD, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_GRV,  KC_BSPC,    \
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,          KC_BSLS,   \
       KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_DOT,           KC_ENT,    \
-      KC_LSPO, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO,   KC_RSPC, KC_RGUI,      \
+      SC_LSPO, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO,   SC_RSPC, KC_RGUI,      \
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_LEFT,  KC_DOWN, KC_UP,   KC_RIGHT),
 
   // 1: Function Layer
diff --git a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
index f4cd6476b5..fff9fc6fc3 100644
--- a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
@@ -23,7 +23,7 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_60_ansi(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, TG(1)),
+	[0] = LAYOUT_60_ansi(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, TG(1)),
 	[1] = LAYOUT_60_ansi(QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_UP, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
diff --git a/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c b/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
index 19328bc68e..f178acbecc 100644
--- a/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_ESC,    KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,   \
       KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,   \
       CTL_SLSH,  KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,  KC_NO,              KC_ENT,    \
-      KC_LSPO,   KC_NO,   KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_NO,    KC_RSPC,  KC_UP,    MO(FN),    \
+      SC_LSPO,   KC_NO,   KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_NO,    SC_RSPC,  KC_UP,    MO(FN),    \
       MO(FN),    KC_LGUI, KC_LALT,                              KC_SPC,                              KC_RALT,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RIGHT
       ),
   // 1: Function Layer
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
index 0e9c639c9f..1c5aa90627 100644
--- a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_LBRC, KC_UP,   KC_RBRC, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
   LCTL_T(KC_CAPS), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_LEFT, KC_DOWN, KC_RGHT, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT,
-  KC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_PGDN,  KC_UP,  KC_PGUP, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC,
+  SC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_PGDN,  KC_UP,  KC_PGUP, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_RSPC,
   KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
  ),
 
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,
   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
   KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
  ),
  
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index 55f554f86b..52aeaa0a19 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS,
          KC_TAB ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,  KC_T  ,________  ,________,________,  KC_Y  ,  KC_U  ,  KC_I  ,  KC_O  ,  KC_P  ,KC_BSDEL, //Custom shift Codes. Backspace ^ Delete
 LT(_LYMD,KC_ESC),  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,  KC_G  ,________  ,________,________,  KC_H  ,  KC_J  ,  KC_K  ,  KC_L  ,KC_SCLN ,KC_QUOT,
-         KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_N  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,KC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
+         SC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_N  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,SC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
       KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)
 
  ),
@@ -79,7 +79,7 @@ LT(_LYMD,KC_ESC),  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,  KC_G  ,________  ,_______
          KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS,
          KC_TAB ,  KC_Q  ,  KC_W  ,  KC_F  ,  KC_P  ,  KC_G  ,________  ,________,________,  KC_J  ,  KC_L  ,  KC_U  ,  KC_Y  ,KC_SCLN ,KC_BSDEL, //Custom shift Codes. Backspace ^ Delete
 LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,________,________,  KC_H  ,  KC_N  ,  KC_E  ,  KC_I  ,  KC_O  ,KC_QUOT,
-         KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_K  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,KC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
+         SC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_K  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,SC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
      KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)
 
  ),
diff --git a/keyboards/ymdk/bface/keymaps/minila/keymap.c b/keyboards/ymdk/bface/keymaps/minila/keymap.c
index 91bcbad6a2..f249b50e20 100644
--- a/keyboards/ymdk/bface/keymaps/minila/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/minila/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, 
 		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
 		LT(_FL, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, MT(MOD_RCTL, KC_ENT), 
-		KC_LSPO, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL, 
+		SC_LSPO, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_UP, KC_DEL, 
 		KC_LCTL, KC_LGUI, KC_LALT, MO(_FL), KC_SPC, MO(_FL), KC_RALT, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     //FN Layer
diff --git a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
index 9dcb34ea39..3f5c09acf5 100644
--- a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS, KC_GRV,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,
         LT(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,  LT(2,KC_ENT),
-        KC_LSPO,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSPC,  MO(3),
+        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(3),
         KC_LCTL,  KC_LALT,  KC_LGUI,                                          KC_SPC,                                           KC_RGUI,  KC_RALT, KC_RCTL
     ),
 
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS, KC_GRV,
         KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSPC,
         LT(2, KC_CAPS),     KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOT,  LT(2,KC_ENT),
-        KC_LSPO,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSPC,  MO(3),
+        SC_LSPO,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  SC_RSPC,  MO(3),
         KC_LCTL,  KC_LALT,  KC_LGUI,                                          KC_SPC,                                           KC_RGUI,  KC_RALT, KC_RCTL
     ),
 
diff --git a/layouts/community/ergodox/haegin/keymap.c b/layouts/community/ergodox/haegin/keymap.c
index 7b0e1b6c0e..7c1883e57a 100644
--- a/layouts/community/ergodox/haegin/keymap.c
+++ b/layouts/community/ergodox/haegin/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_EQL,              KC_1,               KC_2,            KC_3,     KC_4,            KC_5,               KC_LEFT,
         KC_SLSH,             KC_QUOT,            KC_COMM,         KC_DOT,   KC_P,            KC_Y,               KC_NO,
         CTL_T(KC_ESC),       KC_A,               KC_O,            KC_E,     KC_U,            KC_I,
-        KC_LSPO,             KC_SCLN,            KC_Q,            KC_J,     KC_K,            KC_X,               ALL_T(KC_NO),
+        SC_LSPO,             KC_SCLN,            KC_Q,            KC_J,     KC_K,            KC_X,               ALL_T(KC_NO),
         LT(SYMBOLS,KC_GRV),  KC_QUOT,            KC_SLSH,         KC_LALT,  SFT_T(KC_RGHT),
                                                                                              KC_HOME,            KC_END,
                                                                                                                  KC_PGUP,
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_RGHT,        KC_6,              KC_7,                KC_8,        KC_9,        KC_0,                LGUI(KC_SPC),
         KC_NO,          KC_F,              KC_G,                KC_C,        KC_R,        KC_L,                LT(MEDIA, KC_BSLS),
                         KC_D,              KC_H,                KC_T,        KC_N,        KC_S,                KC_MINS,
-        MEH_T(KC_NO),   KC_B,              KC_M,                KC_W,        KC_V,        KC_Z,                KC_RSPC,
+        MEH_T(KC_NO),   KC_B,              KC_M,                KC_W,        KC_V,        KC_Z,                SC_RSPC,
                                            ALT_T(KC_UP),        KC_DOWN,     KC_LBRC,     KC_RBRC,             KC_NO,
         KC_PGUP,        CTL_T(KC_ESC),
         KC_PGDN,
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 8267c66730..d1c3d08e91 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_ortho_4x12(
   KC_1,        KC_2,       KC_3,           KC_4,           KC_5,          KC_6,          KC_7,           KC_8,            KC_9,           KC_0,          KC_DEL,          KC_BSPC                ,
   LSFT(KC_1),  LSFT(KC_2), LSFT(KC_3),     LSFT(KC_4),     LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),     LSFT(KC_8),      LSFT(KC_9),     LSFT(KC_0),    LCTL(KC_DEL),    LCTL(KC_BSPC)          ,
-  KC_LSPO,     KC_NUBS,    KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
+  SC_LSPO,     KC_NUBS,    KC_GRAVE,       KC_NONUS_HASH,  KC_QUOT,       KC_MINS,       KC_EQL,         KC_NONUS_HASH,   KC_LBRC,        KC_RBRC,       KC_QUOT,         MT(MOD_RSFT, KC_ENT)   ,
   _______,     _______,    _______,        _______,        _______,       KC_DEL,        _______,        _______,         KC_MNXT,        KC_VOLD,       KC_VOLU,         KC_MPLY
 ),
 
diff --git a/layouts/community/ortho_4x12/bredfield/keymap.c b/layouts/community/ortho_4x12/bredfield/keymap.c
index 6621cc2483..97d85d5d40 100644
--- a/layouts/community/ortho_4x12/bredfield/keymap.c
+++ b/layouts/community/ortho_4x12/bredfield/keymap.c
@@ -21,7 +21,7 @@ enum layer_names {
 #define L_KEYBD MO(_KEYBOARD_LAYER)
 #define SCL_NAV LT(_NAVIGATION_LAYER, KC_SCLN)
 #define SFT_MIN MT(MOD_RSFT, KC_MINS)
-#define SFT_ENT KC_SFTENT
+#define SFT_ENT SC_SENT
 
 // GUI chords
 #define GUI_1 LGUI(KC_1)
diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
index 0f8d380a0d..6ce39b41ed 100644
--- a/layouts/community/ortho_4x12/buswerks/keymap.c
+++ b/layouts/community/ortho_4x12/buswerks/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_QWERTY] = LAYOUT_ortho_4x12(
             KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I,    KC_O   , KC_P   , KC_BSPC, \
             ESC_CMD, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K,    KC_L   , KC_SCLN, KC_QUOT, \
-            KC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC, \
+            SC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, SC_RSPC, \
             XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, LOWER  , KC_SPC , KC_SPC , RSE_ENT, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT \
             ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_COLEMAK] = LAYOUT_ortho_4x12( \
             KC_TAB , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC, \
             ESC_CTL, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT, \
-            KC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC, \
+            SC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, SC_RSPC, \
             XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, LOWER  , KC_SPC , KC_SPC , RSE_ENT, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT \
             ),
 
diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index 1ce3a8dd3e..00b3ec1d82 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+    SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+    KC_LCTL, KC_LGUI, KC_LALT, SC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
 /* Hungarian
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
     KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT, SC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
 /* Dvorak
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
     KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
     KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT, SC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Workman
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_DEL,
     KC_ESC,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT, SC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
 /* Lower
diff --git a/quantum/process_keycode/process_space_cadet.c b/quantum/process_keycode/process_space_cadet.c
index 0997e7b7f3..a62cd60a70 100644
--- a/quantum/process_keycode/process_space_cadet.c
+++ b/quantum/process_keycode/process_space_cadet.c
@@ -122,31 +122,31 @@ void perform_space_cadet(keyrecord_t *record, uint16_t sc_keycode, uint8_t holdM
 
 bool process_space_cadet(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case KC_LSPO: {
+        case QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN: {
             perform_space_cadet(record, keycode, LSPO_KEYS);
             return false;
         }
-        case KC_RSPC: {
+        case QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE: {
             perform_space_cadet(record, keycode, RSPC_KEYS);
             return false;
         }
-        case KC_LCPO: {
+        case QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN: {
             perform_space_cadet(record, keycode, LCPO_KEYS);
             return false;
         }
-        case KC_RCPC: {
+        case QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE: {
             perform_space_cadet(record, keycode, RCPC_KEYS);
             return false;
         }
-        case KC_LAPO: {
+        case QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN: {
             perform_space_cadet(record, keycode, LAPO_KEYS);
             return false;
         }
-        case KC_RAPC: {
+        case QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE: {
             perform_space_cadet(record, keycode, RAPC_KEYS);
             return false;
         }
-        case KC_SFTENT: {
+        case QK_SPACE_CADET_RIGHT_SHIFT_ENTER: {
             perform_space_cadet(record, keycode, SFTENT_KEYS);
             return false;
         }
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index c5b9342b17..c2b707fbf0 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -362,9 +362,9 @@ enum quantum_keycodes {
     QK_VELOCIKEY_TOGGLE, // 5CD7
 
     // Space Cadet
-    KC_LSPO,   // 5CD8
-    KC_RSPC,   // 5CD9
-    KC_SFTENT, // 5CDA
+    QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN,   // 5CD8
+    QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE, // 5CD9
+    QK_SPACE_CADET_RIGHT_SHIFT_ENTER,             // 5CDA
 
     // Thermal Printer
     PRINT_ON,  // 5CDB
@@ -402,10 +402,10 @@ enum quantum_keycodes {
     HPT_DWLD, // 5CF3
 
     // Space Cadet (continued)
-    KC_LCPO, // 5CF4
-    KC_RCPC, // 5CF5
-    KC_LAPO, // 5CF6
-    KC_RAPC, // 5CF7
+    QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN,   // 5CF4
+    QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE, // 5CF5
+    QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN,    // 5CF6
+    QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE,  // 5CF7
 
     // Combos
     CMB_ON,  // 5CF8
@@ -863,6 +863,14 @@ enum quantum_keycodes {
 #define SE_TOGG QK_SECURE_TOGGLE
 #define SE_REQ QK_SECURE_REQUEST
 
+// Space Cadet
+#define SC_LSPO QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN
+#define SC_RSPC QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE
+#define SC_LCPO QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN
+#define SC_RCPC QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE
+#define SC_LAPO QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN
+#define SC_RAPC QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE
+
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
 #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 652aaaa9a8..92ec68b622 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -89,6 +89,14 @@
 #define SECURE_TOGGLE QK_SECURE_TOGGLE
 #define SECURE_REQUEST QK_SECURE_REQUEST
 
+#define KC_LSPO QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN
+#define KC_RSPC QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE
+#define KC_LCPO QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN
+#define KC_RCPC QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE
+#define KC_LAPO QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN
+#define KC_RAPC QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE
+#define KC_SFTENT QK_SPACE_CADET_RIGHT_SHIFT_ENTER
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")
diff --git a/quantum/via_ensure_keycode.h b/quantum/via_ensure_keycode.h
index 010e1d92d4..48e611d0fa 100644
--- a/quantum/via_ensure_keycode.h
+++ b/quantum/via_ensure_keycode.h
@@ -296,14 +296,14 @@ _Static_assert(RGB_M_X                == 0x5CD3, "");
 _Static_assert(RGB_M_G                == 0x5CD4, "");
 _Static_assert(RGB_M_T                == 0x5CD5, "");
 
-_Static_assert(KC_LSPO                == 0x5CD7, "");
-_Static_assert(KC_RSPC                == 0x5CD8, "");
-_Static_assert(KC_SFTENT              == 0x5CD9, "");
+_Static_assert(SC_LSPO                == 0x5CD7, "");
+_Static_assert(SC_RSPC                == 0x5CD8, "");
+_Static_assert(SC_SENT                == 0x5CD9, "");
 
-_Static_assert(KC_LCPO                == 0x5CF3, "");
-_Static_assert(KC_RCPC                == 0x5CF4, "");
-_Static_assert(KC_LAPO                == 0x5CF5, "");
-_Static_assert(KC_RAPC                == 0x5CF6, "");
+_Static_assert(SC_LCPO                == 0x5CF3, "");
+_Static_assert(SC_RCPC                == 0x5CF4, "");
+_Static_assert(SC_LAPO                == 0x5CF5, "");
+_Static_assert(SC_RAPC                == 0x5CF6, "");
 
 _Static_assert(FN_MO13                == 0x5F10, "");
 _Static_assert(FN_MO23                == 0x5F11, "");
diff --git a/tests/caps_word/test_caps_word.cpp b/tests/caps_word/test_caps_word.cpp
index 91dd1a0221..3d0735d8c2 100644
--- a/tests/caps_word/test_caps_word.cpp
+++ b/tests/caps_word/test_caps_word.cpp
@@ -419,7 +419,7 @@ TEST_P(CapsWordBothShifts, PressLRLR) {
     right_shift.press();
 
     // For mod-tap and Space Cadet keys, wait for the tapping term.
-    if (left_shift.code == LSFT_T(KC_A) || left_shift.code == KC_LSPO) {
+    if (left_shift.code == LSFT_T(KC_A) || left_shift.code == QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN) {
         idle_for(TAPPING_TERM);
     }
 
@@ -456,7 +456,7 @@ TEST_P(CapsWordBothShifts, PressLRRL) {
     run_one_scan_loop();
     right_shift.press();
 
-    if (left_shift.code == LSFT_T(KC_A) || left_shift.code == KC_LSPO) {
+    if (left_shift.code == LSFT_T(KC_A) || left_shift.code == QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN) {
         idle_for(TAPPING_TERM);
     }
     run_one_scan_loop();
@@ -481,7 +481,7 @@ INSTANTIATE_TEST_CASE_P(
         CapsWordBothShiftsParams{
             "OneshotShifts", OSM(MOD_LSFT), OSM(MOD_RSFT)},
         CapsWordBothShiftsParams{
-            "SpaceCadetShifts", KC_LSPO, KC_RSPC},
+            "SpaceCadetShifts", SC_LSPO, SC_RSPC},
         CapsWordBothShiftsParams{
             "ModTapShifts", LSFT_T(KC_A), RSFT_T(KC_B)}
         ),
diff --git a/users/gourdo1/autocorrect/autocorrection.c b/users/gourdo1/autocorrect/autocorrection.c
index bc711016d9..dae62d37a2 100644
--- a/users/gourdo1/autocorrect/autocorrection.c
+++ b/users/gourdo1/autocorrect/autocorrection.c
@@ -71,7 +71,7 @@ bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
           break;
 
         // NOTE: Space Cadet keys expose no info to check whether they are being
-        // tapped vs. held. This makes autocorrection ambiguous, e.g. KC_LCPO might
+        // tapped vs. held. This makes autocorrection ambiguous, e.g. SC_LCPO might
         // be '(', which we would treat as a word break, or it might be shift, which
         // we would treat as having no effect. To behave cautiously, we allow Space
         // Cadet keycodes to fall to the logic below and clear autocorrection state.
diff --git a/users/hvp/per_key.c b/users/hvp/per_key.c
index 571fdcc915..fc4d455f5a 100644
--- a/users/hvp/per_key.c
+++ b/users/hvp/per_key.c
@@ -35,7 +35,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
             return TAPPING_TERM + LONG_TAPPING_TERM;
         case MT(MOD_RGUI, KC_L):
             return TAPPING_TERM + LONG_TAPPING_TERM;
-        case KC_LCPO:
+        case SC_LCPO:
             return TAPPING_TERM 75;
         default:
             return TAPPING_TERM;
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index d5c9fb7e61..ccf466166e 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -17,14 +17,14 @@
 #define _________________QWERTY_L1_________________ QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5
 #define _________________QWERTY_L2_________________ KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T
 #define _________________QWERTY_L3_________________ RIS_CAPS, KC_A,     KC_S,     KC_D,     KC_F,     KC_G
-#define _________________QWERTY_L4_________________ KC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B
-#define _________________QWERTY_L5_________________ KC_LCPO,  KC_LGUI,  KC_LALT,  LOWER,    RAISE,  KC_SPC
+#define _________________QWERTY_L4_________________ SC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B
+#define _________________QWERTY_L5_________________ SC_LCPO,  KC_LGUI,  KC_LALT,  LOWER,    RAISE,  KC_SPC
 
 #define _________________QWERTY_R1_________________           KC_6,    KC_7,      KC_8,     KC_9,     KC_0,     TD_BSPC
 #define _________________QWERTY_R2_________________           KC_Y,    KC_U,      KC_I,     KC_O,     KC_P,     KC_BSLS
 #define _________________QWERTY_R3_________________           KC_H,    KC_J,      KC_K,     KC_L,     KC_SCLN,  KC_ENT
-#define _________________QWERTY_R4_________________           KC_N,    KC_M,      TD_COMM,  KC_DOT,   KC_SLASH, KC_RSPC
-#define _________________QWERTY_R5_________________           KC_SPC,  KC_LEFT,   KC_UP,    KC_DOWN,  KC_RIGHT, KC_RCPC
+#define _________________QWERTY_R4_________________           KC_N,    KC_M,      TD_COMM,  KC_DOT,   KC_SLASH, SC_RSPC
+#define _________________QWERTY_R5_________________           KC_SPC,  KC_LEFT,   KC_UP,    KC_DOWN,  KC_RIGHT, SC_RCPC
 
 
 #define ___________________GAME_L1_________________ KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5

From 8436f0dfa6ee35a33080237280b55a89adbb5f7e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 27 Oct 2022 23:08:14 +1100
Subject: [PATCH 751/959] Add missing Space Cadet alias (#18876)

---
 quantum/quantum_keycodes.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index c2b707fbf0..36cb01b5f5 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -870,6 +870,7 @@ enum quantum_keycodes {
 #define SC_RCPC QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE
 #define SC_LAPO QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN
 #define SC_RAPC QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE
+#define SC_SENT QK_SPACE_CADET_RIGHT_SHIFT_ENTER
 
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))

From d8183c52492557fdc8f35cec67c70170bae55efa Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Thu, 27 Oct 2022 23:50:32 +1100
Subject: [PATCH 752/959] [Keymap] Update Miryoku (#18773)

* [miryoku] Revert "[Keymap] manna-harbour_miryoku RESET to QK_BOOT (#18755)"

This reverts commit 89dbc181617e69a5b4d91d9d772724daa2d387bb.

* [miryoku] Add keyboardio/model01

* [miryoku] Add handwired/dactyl_manuform/4x6

* [miryoku] Update BT keycodes

- Update BT keycodes on Media inner index:
  - Move OUT_AUTO to bottom row
- Move RGB_TOG in vi to pinkie column to match other TOG keycodes, and rotate row

* [miryoku] Add Extra and Tap layers

* [miryoku] Rename config workflow option to custom_config

* [miryoku] Update custom_config.h and custom_rules.mk behaviour

* [miryoku] Make mapping macro customisable globally and per layer

* [miryoku] Add layer lock

* [miryoku] Update RGB order in media-l-invertedt

* [miryoku] Change mouse button order

* [miryoku] Change to X macros for layer list

- Supports adding and removing layers from custom_config.h
- Add "U_" prefix to layer names
- Add layer name strings
- Populate keymaps array from X macro
- Populate layers enum from X macro
- Move layers enum to manna-harbour_miryoku.h
- Rename miryoku_alternatives.h to miryoku_layer_alternatives.h
- Rename miryoku_layer.h to miryoku_layer_selection.h
- Remove miryoku_layer_names.h
- Add miryoku_layer_list.h

* [miryoku] Reformat split_3x6_3 mapping

* [miryoku] Add merge field to workflows

* [miryoku] Update thumb combos with new layer names

* [miryoku] Update cover image

* [miryoku] Add satt/vision

* [miryoku] Update Branches and Building docs

* [miryoku] Update reset keycode

* [miryoku] Add xmk

* [miryoku] Add boardsource/lulu

* [miryoku] Fix keyboardio/model01
---
 .../keymaps/manna-harbour_miryoku/config.h    |  22 +
 .../keymaps/manna-harbour_miryoku/keymap.c    |   5 -
 .../keymaps/manna-harbour_miryoku/config.h    |  24 ++
 .../keymaps/manna-harbour_miryoku/keymap.c    |   4 +
 .../keymaps/manna-harbour_miryoku/config.h    |  26 ++
 .../keymaps/manna-harbour_miryoku/keymap.c    |   4 +
 .../keymaps/manna-harbour_miryoku/rules.mk    |   4 +
 .../keymaps/manna-harbour_miryoku/config.h    |  21 +
 .../keymaps/manna-harbour_miryoku/keymap.c    |   4 +
 .../manna-harbour_miryoku/config.h            |  26 +-
 users/manna-harbour_miryoku/config.h          |   4 +-
 .../manna-harbour_miryoku.c                   |  27 +-
 .../manna-harbour_miryoku.h                   |  16 +-
 .../miryoku_babel/miryoku_alternatives.h      | 267 ------------
 .../miryoku_babel/miryoku_layer.h             | 139 -------
 .../miryoku_layer_alternatives.h              | 389 ++++++++++++++++++
 .../miryoku_babel/miryoku_layer_list.h        |  23 ++
 .../miryoku_babel/miryoku_layer_selection.h   | 277 +++++++++++++
 users/manna-harbour_miryoku/post_rules.mk     |  19 +-
 users/manna-harbour_miryoku/readme.org        | 156 ++++++-
 20 files changed, 985 insertions(+), 472 deletions(-)
 create mode 100644 keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h
 rename users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_names.h => keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c (81%)
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c
 create mode 100644 keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/config.h
 create mode 100644 keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/keymap.c
 create mode 100644 keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/rules.mk
 create mode 100644 keyboards/satt/vision/keymaps/manna-harbour_miryoku/config.h
 create mode 100644 keyboards/satt/vision/keymaps/manna-harbour_miryoku/keymap.c
 delete mode 100644 users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
 delete mode 100644 users/manna-harbour_miryoku/miryoku_babel/miryoku_layer.h
 create mode 100644 users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
 create mode 100644 users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_list.h
 create mode 100644 users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_selection.h

diff --git a/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..b4249396da
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,22 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT_miryoku(\
+     K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09,\
+     K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19,\
+     K20, K21, K22, K23, K24,                K25, K26, K27, K28, K29,\
+     N30, N31, K32, K33, K34,                K35, K36, K37, N38, N39\
+)\
+LAYOUT(\
+XXX, XXX, XXX, XXX, XXX, XXX,                XXX, XXX, XXX, XXX, XXX, XXX,\
+XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX,\
+XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX,\
+XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX,\
+               XXX, K32, K33, K34,      K35, K36, K37, XXX\
+)
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_names.h b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c
similarity index 81%
rename from users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_names.h
rename to keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c
index 87e1f18d8c..dbab7f9820 100644
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_names.h
+++ b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/keymap.c
@@ -1,9 +1,4 @@
 // Copyright 2019 Manna Harbour
 // https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#if !defined (MIRYOKU_LAYER_NAMES)
-  #define MIRYOKU_LAYER_NAMES BASE, BUTTON, NAV, MOUSE, MEDIA, NUM, SYM, FUN
-#endif
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..f50033a046
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,24 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT_miryoku(\
+     K00, K01, K02, K03, K04,                         K05, K06, K07, K08, K09, \
+     K10, K11, K12, K13, K14,                         K15, K16, K17, K18, K19, \
+     K20, K21, K22, K23, K24,                         K25, K26, K27, K28, K29, \
+     N30, N31, K32, K33, K34,                         K35, K36, K37, N38, N39 \
+) \
+LAYOUT( \
+XXX, K00, K01, K02, K03, K04,                         K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14,                         K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24,                         K25, K26, K27, K28, K29, XXX, \
+          XXX, XXX,                                             XXX, XXX, \
+                    K32, K33,                         K36, K37, \
+                              K34, XXX,     XXX, K35, \
+                              XXX, XXX,     XXX, XXX \
+)
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..dbab7f9820
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/config.h b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..b97a66c264
--- /dev/null
+++ b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,26 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT_miryoku( \
+     K00, K01, K02, K03, K04,                     K05, K06, K07, K08, K09, \
+     K10, K11, K12, K13, K14,                     K15, K16, K17, K18, K19, \
+     K20, K21, K22, K23, K24,                     K25, K26, K27, K28, K29, \
+     N30, N31, K32, K33, K34,                     K35, K36, K37, N38, N39 \
+) \
+LAYOUT( \
+XXX, XXX, XXX, XXX, XXX, XXX,                     XXX, XXX, XXX, XXX, XXX, XXX, \
+XXX, K00, K01, K02, K03, K04, XXX,           XXX, K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14, XXX,           XXX, K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24, XXX,           XXX, K25, K26, K27, K28, K29, XXX, \
+                         K32,                     K37, \
+                            K33,               K36, \
+                               K34,         K35, \
+                                  XXX,   XXX, \
+                         XXX,                     XXX \
+)
diff --git a/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..dbab7f9820
--- /dev/null
+++ b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/rules.mk
new file mode 100644
index 0000000000..6a111feef0
--- /dev/null
+++ b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+CONSOLE_ENABLE = no
diff --git a/keyboards/satt/vision/keymaps/manna-harbour_miryoku/config.h b/keyboards/satt/vision/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..958554be55
--- /dev/null
+++ b/keyboards/satt/vision/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,21 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT_miryoku( \
+          K00, K01, K02, K03, K04,           K05, K06, K07, K08, K09, \
+          K10, K11, K12, K13, K14,           K15, K16, K17, K18, K19, \
+          K20, K21, K22, K23, K24,           K25, K26, K27, K28, K29, \
+          N30, N31, K32, K33, K34,           K35, K36, K37, N38, N39 \
+) \
+LAYOUT( \
+XXX, XXX, K00, K01, K02, K03, K04,           K05, K06, K07, K08, K09, XXX, XXX, \
+XXX, XXX, K10, K11, K12, K13, K14,           K15, K16, K17, K18, K19, XXX, \
+     XXX, K20, K21, K22, K23, K24,      XXX, K25, K26, K27, K28, K29, XXX,\
+     XXX,           K32, K33, K34,           K35, K36, K37,      XXX \
+)
diff --git a/keyboards/satt/vision/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/satt/vision/keymaps/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..dbab7f9820
--- /dev/null
+++ b/keyboards/satt/vision/keymaps/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/layouts/community/split_3x6_3/manna-harbour_miryoku/config.h b/layouts/community/split_3x6_3/manna-harbour_miryoku/config.h
index 7e0e13047f..d7083f5603 100644
--- a/layouts/community/split_3x6_3/manna-harbour_miryoku/config.h
+++ b/layouts/community/split_3x6_3/manna-harbour_miryoku/config.h
@@ -1,19 +1,21 @@
-// Copyright 2019 Manna Harbour
+// Copyright 2022 Manna Harbour
 // https://github.com/manna-harbour/miryoku
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LAYOUT_miryoku(\
-       K00,   K01,   K02,   K03,   K04,          K05,   K06,   K07,   K08,   K09,\
-       K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19,\
-       K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29,\
-       N30,   N31,   K32,   K33,   K34,          K35,   K36,   K37,   N38,   N39\
-)\
-LAYOUT_split_3x6_3(\
-KC_NO, K00,   K01,   K02,   K03,   K04,          K05,   K06,   K07,   K08,   K09,   KC_NO,\
-KC_NO, K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19,   KC_NO,\
-KC_NO, K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29,   KC_NO,\
-                     K32,   K33,   K34,          K35,   K36,   K37\
+#define XXX KC_NO
+
+#define LAYOUT_miryoku( \
+      K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09, \
+      K10,  K11,  K12,  K13,  K14,         K15,  K16,  K17,  K18,  K19, \
+      K20,  K21,  K22,  K23,  K24,         K25,  K26,  K27,  K28,  K29, \
+      N30,  N31,  K32,  K33,  K34,         K35,  K36,  K37,  N38,  N39 \
+) \
+LAYOUT_split_3x6_3( \
+XXX,  K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,  XXX, \
+XXX,  K10,  K11,  K12,  K13,  K14,         K15,  K16,  K17,  K18,  K19,  XXX, \
+XXX,  K20,  K21,  K22,  K23,  K24,         K25,  K26,  K27,  K28,  K29,  XXX , \
+                  K32,  K33,  K34,         K35,  K36,  K37 \
 )
diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h
index c4538ee304..920003598e 100644
--- a/users/manna-harbour_miryoku/config.h
+++ b/users/manna-harbour_miryoku/config.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "custom_config.h"
+
 // default but used in macros
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
@@ -39,5 +41,3 @@
   #define EXTRA_SHORT_COMBOS
 #endif
 
-#include "custom_config.h"
-
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
index 28ad18d1aa..42660a6a5b 100644
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
@@ -1,4 +1,4 @@
-// Copyright 2019 Manna Harbour
+// Copyright 2022 Manna Harbour
 // https://github.com/manna-harbour/miryoku
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -7,24 +7,17 @@
 
 #include "manna-harbour_miryoku.h"
 
-enum layers { MIRYOKU_LAYER_NAMES };
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE]   = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_BASE),
-  [NAV]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_NAV),
-  [MOUSE]  = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_MOUSE),
-  [MEDIA]  = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_MEDIA),
-  [NUM]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_NUM),
-  [SYM]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_SYM),
-  [FUN]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_FUN),
-  [BUTTON] = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_BUTTON)
+#define MIRYOKU_X(LAYER, STRING) [U_##LAYER] = U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_##LAYER, MIRYOKU_LAYER_##LAYER),
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
 };
 
 #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS)
-const uint16_t PROGMEM thumbcombos_base_right[] = {LT(SYM, KC_ENT), LT(NUM, KC_BSPC), COMBO_END};
-const uint16_t PROGMEM thumbcombos_base_left[] = {LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), COMBO_END};
+const uint16_t PROGMEM thumbcombos_base_right[] = {LT(U_SYM, KC_ENT), LT(U_NUM, KC_BSPC), COMBO_END};
+const uint16_t PROGMEM thumbcombos_base_left[] = {LT(U_NAV, KC_SPC), LT(U_MOUSE, KC_TAB), COMBO_END};
 const uint16_t PROGMEM thumbcombos_nav[] = {KC_ENT, KC_BSPC, COMBO_END};
-const uint16_t PROGMEM thumbcombos_mouse[] = {KC_BTN1, KC_BTN3, COMBO_END};
+const uint16_t PROGMEM thumbcombos_mouse[] = {KC_BTN2, KC_BTN1, COMBO_END};
 const uint16_t PROGMEM thumbcombos_media[] = {KC_MSTP, KC_MPLY, COMBO_END};
 const uint16_t PROGMEM thumbcombos_num[] = {KC_0, KC_MINS, COMBO_END};
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -34,10 +27,10 @@ const uint16_t PROGMEM thumbcombos_sym[] = {KC_RPRN, KC_UNDS, COMBO_END};
   #endif
 const uint16_t PROGMEM thumbcombos_fun[] = {KC_SPC, KC_TAB, COMBO_END};
 combo_t key_combos[COMBO_COUNT] = {
-  COMBO(thumbcombos_base_right, LT(FUN, KC_DEL)),
-  COMBO(thumbcombos_base_left, LT(MEDIA, KC_ESC)),
+  COMBO(thumbcombos_base_right, LT(U_FUN, KC_DEL)),
+  COMBO(thumbcombos_base_left, LT(U_MEDIA, KC_ESC)),
   COMBO(thumbcombos_nav, KC_DEL),
-  COMBO(thumbcombos_mouse, KC_BTN2),
+  COMBO(thumbcombos_mouse, KC_BTN3),
   COMBO(thumbcombos_media, KC_MUTE),
   COMBO(thumbcombos_num, KC_DOT),
   #if defined (MIRYOKU_LAYERS_FLIP)
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.h b/users/manna-harbour_miryoku/manna-harbour_miryoku.h
index f6ef63c360..4d1fbf17cf 100644
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.h
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.h
@@ -1,15 +1,25 @@
-// Copyright 2019 Manna Harbour
+// Copyright 2022 Manna Harbour
 // https://github.com/manna-harbour/miryoku
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should 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 "miryoku_babel/miryoku_layer_names.h"
-#include "miryoku_babel/miryoku_layer.h"
+#include "miryoku_babel/miryoku_layer_selection.h"
+#include "miryoku_babel/miryoku_layer_list.h"
+
+enum miryoku_layers {
+#define MIRYOKU_X(LAYER, STRING) U_##LAYER,
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+};
 
 #define U_MACRO_VA_ARGS(macro, ...) macro(__VA_ARGS__)
 
+#if !defined (MIRYOKU_MAPPING)
+  #define MIRYOKU_MAPPING LAYOUT_miryoku
+#endif
+
 #define U_NP KC_NO // key is not present
 #define U_NA KC_NO // present but not available for use
 #define U_NU KC_NO // available but not used
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
deleted file mode 100644
index 914a81bb79..0000000000
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_alternatives.h
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
-// target: qmk
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#pragma once
-
-#define MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP \
-KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
-LGUI_T(KC_Q),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_M),      \
-LT(BUTTON, KC_W),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            ALGR_T(KC_SLSH),   LT(BUTTON, KC_QUOT), \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP \
-KC_Q,              KC_H,              KC_O,              KC_U,              KC_X,              KC_G,              KC_C,              KC_R,              KC_F,              KC_Z,              \
-LGUI_T(KC_Y),      LALT_T(KC_I),      LCTL_T(KC_E),      LSFT_T(KC_A),      KC_DOT,            KC_D,              LSFT_T(KC_S),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_B),      \
-LT(BUTTON, KC_J),  ALGR_T(KC_SLSH),   KC_COMM,           KC_K,              KC_QUOT,           KC_W,              KC_M,              KC_L,              ALGR_T(KC_P),      LT(BUTTON, KC_V),  \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP \
-KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_D,              KC_H,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP \
-KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP \
-KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_K,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP \
-KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,              \
-LGUI_T(KC_A),      LALT_T(KC_O),      LCTL_T(KC_E),      LSFT_T(KC_U),      KC_I,              KC_D,              LSFT_T(KC_H),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_S),      \
-LT(BUTTON, KC_SLSH), ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      LT(BUTTON, KC_Z),  \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP \
-KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,              \
-LGUI_T(KC_S),      LALT_T(KC_H),      LCTL_T(KC_N),      LSFT_T(KC_T),      KC_COMM,           KC_DOT,            LSFT_T(KC_A),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
-LT(BUTTON, KC_F),  ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      LT(BUTTON, KC_Y),  \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP \
-KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_H),      LSFT_T(KC_T),      KC_G,              KC_Y,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP \
-KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
-LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP \
-KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              KC_U,              KC_I,              KC_O,              KC_P,              \
-LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
-LT(BUTTON, KC_Y),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_AZERTY \
-KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
-LGUI_T(KC_Q),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_M),      \
-LT(BUTTON, KC_W),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            ALGR_T(KC_SLSH),   LT(BUTTON, KC_QUOT), \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_BEAKL15 \
-KC_Q,              KC_H,              KC_O,              KC_U,              KC_X,              KC_G,              KC_C,              KC_R,              KC_F,              KC_Z,              \
-LGUI_T(KC_Y),      LALT_T(KC_I),      LCTL_T(KC_E),      LSFT_T(KC_A),      KC_DOT,            KC_D,              LSFT_T(KC_S),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_B),      \
-LT(BUTTON, KC_J),  ALGR_T(KC_SLSH),   KC_COMM,           KC_K,              KC_QUOT,           KC_W,              KC_M,              KC_L,              ALGR_T(KC_P),      LT(BUTTON, KC_V),  \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_COLEMAK \
-KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_D,              KC_H,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH \
-KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \
-KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_K,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_DVORAK \
-KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,              \
-LGUI_T(KC_A),      LALT_T(KC_O),      LCTL_T(KC_E),      LSFT_T(KC_U),      KC_I,              KC_D,              LSFT_T(KC_H),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_S),      \
-LT(BUTTON, KC_SLSH), ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      LT(BUTTON, KC_Z),  \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_HALMAK \
-KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,              \
-LGUI_T(KC_S),      LALT_T(KC_H),      LCTL_T(KC_N),      LSFT_T(KC_T),      KC_COMM,           KC_DOT,            LSFT_T(KC_A),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
-LT(BUTTON, KC_F),  ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      LT(BUTTON, KC_Y),  \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_WORKMAN \
-KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,           \
-LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_H),      LSFT_T(KC_T),      KC_G,              KC_Y,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_QWERTY \
-KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
-LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
-LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_BASE_QWERTZ \
-KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              KC_U,              KC_I,              KC_O,              KC_P,              \
-LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
-LT(BUTTON, KC_Y),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH), \
-U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
-
-
-#define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \
-KC_PGUP,           KC_HOME,           KC_UP,             KC_END,            KC_INS,            U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_PGDN,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_NAV_FLIP \
-KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_INS,            KC_HOME,           KC_UP,             KC_END,            KC_PGUP,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_PGDN,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_NAV_VI \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_NAV \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
-
-
-#define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP \
-KC_WH_U,           KC_WH_L,           KC_MS_U,           KC_WH_R,           U_NU,              U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_WH_D,           KC_MS_L,           KC_MS_D,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_BTN2,           KC_BTN3,           KC_BTN1,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \
-KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_BTN2,           KC_BTN3,           KC_BTN1,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_NU,              KC_WH_L,           KC_MS_U,           KC_WH_R,           KC_WH_U,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_R,           KC_WH_D,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN1,           KC_BTN3,           KC_BTN2,           U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MOUSE_VI \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN1,           KC_BTN3,           KC_BTN2,           U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MOUSE \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN1,           KC_BTN3,           KC_BTN2,           U_NP,              U_NP
-
-
-#define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \
-RGB_SAI,           RGB_HUI,           KC_VOLU,           RGB_MOD,           RGB_TOG,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-RGB_VAI,           KC_MPRV,           KC_VOLD,           KC_MNXT,           OUT_AUTO,          U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MEDIA_FLIP \
-RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           OUT_AUTO,          U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           KC_VOLU,           RGB_HUI,           RGB_SAI,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              OUT_AUTO,          KC_MPRV,           KC_VOLD,           KC_MNXT,           RGB_VAI,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MEDIA_VI \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           OUT_AUTO,          \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_MEDIA \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              OUT_AUTO,          KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              U_NU,              \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
-
-
-#define MIRYOKU_ALTERNATIVES_NUM_FLIP \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_EQL,            KC_4,              KC_5,              KC_6,              KC_SCLN,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_BSLS,           KC_1,              KC_2,              KC_3,              KC_GRV,            \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MINS,           KC_0,              KC_DOT,            U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_NUM \
-KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_SCLN,           KC_4,              KC_5,              KC_6,              KC_EQL,            U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-KC_GRV,            KC_1,              KC_2,              KC_3,              KC_BSLS,           U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_DOT,            KC_0,              KC_MINS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-
-#define MIRYOKU_ALTERNATIVES_SYM_FLIP \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_PLUS,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_COLN,           \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_PIPE,           KC_EXLM,           KC_AT,             KC_HASH,           KC_TILD,           \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_UNDS,           KC_LPRN,           KC_RPRN,           U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_SYM \
-KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_COLN,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_PLUS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-KC_TILD,           KC_EXLM,           KC_AT,             KC_HASH,           KC_PIPE,           U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_LPRN,           KC_RPRN,           KC_UNDS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-
-#define MIRYOKU_ALTERNATIVES_FUN_FLIP \
-QK_BOOT,           U_NA,              U_NA,              U_NA,              U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SLCK,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
-U_NA,              KC_ALGR,           U_NA,              U_NA,              U_NA,              KC_PAUS,           KC_F1,             KC_F2,             KC_F3,             KC_F10,            \
-U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_TAB,            KC_SPC,            KC_APP,            U_NP,              U_NP
-
-#define MIRYOKU_ALTERNATIVES_FUN \
-KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              U_NA,              U_NA,              U_NA,              QK_BOOT,           \
-KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SLCK,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-KC_F10,            KC_F1,             KC_F2,             KC_F3,             KC_PAUS,           U_NA,              U_NA,              U_NA,              KC_ALGR,           U_NA,              \
-U_NP,              U_NP,              KC_APP,            KC_SPC,            KC_TAB,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
-
-
-#define MIRYOKU_ALTERNATIVES_BUTTON \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           KC_NO,             KC_NO,             KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-U_NP,              U_NP,              KC_BTN2,           KC_BTN3,           KC_BTN1,           KC_BTN1,           KC_BTN3,           KC_BTN2,           U_NP,              U_NP
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer.h
deleted file mode 100644
index 025bf3914c..0000000000
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should 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 "miryoku_alternatives.h"
-
-#if !defined(MIRYOKU_LAYER_BASE)
-  #if defined (MIRYOKU_LAYERS_FLIP)
-    #if defined (MIRYOKU_ALPHAS_AZERTY)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP
-    #elif defined (MIRYOKU_ALPHAS_BEAKL15)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP
-    #elif defined (MIRYOKU_ALPHAS_COLEMAK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP
-    #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP
-    #elif defined (MIRYOKU_ALPHAS_DVORAK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP
-    #elif defined (MIRYOKU_ALPHAS_HALMAK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP
-    #elif defined (MIRYOKU_ALPHAS_WORKMAN)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP
-    #elif defined (MIRYOKU_ALPHAS_QWERTY)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP
-    #elif defined (MIRYOKU_ALPHAS_QWERTZ)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP
-    #else
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP
-    #endif
-  #else
-    #if defined (MIRYOKU_ALPHAS_AZERTY)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_AZERTY
-    #elif defined (MIRYOKU_ALPHAS_BEAKL15)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15
-    #elif defined (MIRYOKU_ALPHAS_COLEMAK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK
-    #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK
-    #elif defined (MIRYOKU_ALPHAS_DVORAK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_DVORAK
-    #elif defined (MIRYOKU_ALPHAS_HALMAK)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_HALMAK
-    #elif defined (MIRYOKU_ALPHAS_WORKMAN)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_WORKMAN
-    #elif defined (MIRYOKU_ALPHAS_QWERTY)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTY
-    #elif defined (MIRYOKU_ALPHAS_QWERTZ)
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTZ
-    #else
-      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH
-    #endif
-  #endif
-#endif
-
-#if !defined(MIRYOKU_LAYER_NAV)
-  #if defined (MIRYOKU_LAYERS_FLIP)
-    #if defined (MIRYOKU_NAV_INVERTEDT)
-      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP
-    #else
-      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_FLIP
-    #endif
-  #else
-    #if defined (MIRYOKU_NAV_INVERTEDT)
-      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_INVERTEDT
-    #elif defined (MIRYOKU_NAV_VI)
-      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_VI
-    #else
-      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV
-    #endif
-  #endif
-#endif
-
-#if !defined(MIRYOKU_LAYER_MOUSE)
-  #if defined (MIRYOKU_LAYERS_FLIP)
-    #if defined (MIRYOKU_NAV_INVERTEDT)
-      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP
-    #else
-      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_FLIP
-    #endif
-  #else
-    #if defined (MIRYOKU_NAV_INVERTEDT)
-      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT
-    #elif defined (MIRYOKU_NAV_VI)
-      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_VI
-    #else
-      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE
-    #endif
-  #endif
-#endif
-
-#if !defined(MIRYOKU_LAYER_MEDIA)
-  #if defined (MIRYOKU_LAYERS_FLIP)
-    #if defined (MIRYOKU_NAV_INVERTEDT)
-      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP
-    #else
-      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_FLIP
-    #endif
-  #else
-    #if defined (MIRYOKU_NAV_INVERTEDT)
-      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT
-    #elif defined (MIRYOKU_NAV_VI)
-      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_VI
-    #else
-      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA
-    #endif
-  #endif
-#endif
-
-#if !defined(MIRYOKU_LAYER_NUM)
-  #if defined (MIRYOKU_LAYERS_FLIP)
-    #define MIRYOKU_LAYER_NUM MIRYOKU_ALTERNATIVES_NUM_FLIP
-  #else
-    #define MIRYOKU_LAYER_NUM MIRYOKU_ALTERNATIVES_NUM
-  #endif
-#endif
-
-#if !defined(MIRYOKU_LAYER_SYM)
-  #if defined (MIRYOKU_LAYERS_FLIP)
-    #define MIRYOKU_LAYER_SYM MIRYOKU_ALTERNATIVES_SYM_FLIP
-  #else
-    #define MIRYOKU_LAYER_SYM MIRYOKU_ALTERNATIVES_SYM
-  #endif
-#endif
-
-#if !defined(MIRYOKU_LAYER_FUN)
-  #if defined (MIRYOKU_LAYERS_FLIP)
-    #define MIRYOKU_LAYER_FUN MIRYOKU_ALTERNATIVES_FUN_FLIP
-  #else
-    #define MIRYOKU_LAYER_FUN MIRYOKU_ALTERNATIVES_FUN
-  #endif
-#endif
-
-#if !defined(MIRYOKU_LAYER_BUTTON)
-  #define MIRYOKU_LAYER_BUTTON MIRYOKU_ALTERNATIVES_BUTTON
-#endif
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
new file mode 100644
index 0000000000..33619a9e8f
--- /dev/null
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
@@ -0,0 +1,389 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+// generated -*- buffer-read-only: t -*-
+// target: qmk
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+
+#define MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP \
+KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
+LGUI_T(KC_Q),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_M),      \
+LT(U_BUTTON,KC_W), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            ALGR_T(KC_SLSH),   LT(U_BUTTON,KC_QUOT),\
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP \
+KC_Q,              KC_H,              KC_O,              KC_U,              KC_X,              KC_G,              KC_C,              KC_R,              KC_F,              KC_Z,              \
+LGUI_T(KC_Y),      LALT_T(KC_I),      LCTL_T(KC_E),      LSFT_T(KC_A),      KC_DOT,            KC_D,              LSFT_T(KC_S),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_B),      \
+LT(U_BUTTON,KC_J), ALGR_T(KC_SLSH),   KC_COMM,           KC_K,              KC_QUOT,           KC_W,              KC_M,              KC_L,              ALGR_T(KC_P),      LT(U_BUTTON,KC_V), \
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_D,              KC_H,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_K,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP \
+KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,              \
+LGUI_T(KC_A),      LALT_T(KC_O),      LCTL_T(KC_E),      LSFT_T(KC_U),      KC_I,              KC_D,              LSFT_T(KC_H),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_S),      \
+LT(U_BUTTON,KC_SLSH),ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      LT(U_BUTTON,KC_Z), \
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP \
+KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,              \
+LGUI_T(KC_S),      LALT_T(KC_H),      LCTL_T(KC_N),      LSFT_T(KC_T),      KC_COMM,           KC_DOT,            LSFT_T(KC_A),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
+LT(U_BUTTON,KC_F), ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      LT(U_BUTTON,KC_Y), \
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP \
+KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_H),      LSFT_T(KC_T),      KC_G,              KC_Y,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP \
+KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
+LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP \
+KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              KC_U,              KC_I,              KC_O,              KC_P,              \
+LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
+LT(U_BUTTON,KC_Y), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_FUN,KC_DEL),  LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT),  LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC),  LT(U_MEDIA,KC_ESC),U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_AZERTY \
+KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
+LGUI_T(KC_Q),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_M),      \
+LT(U_BUTTON,KC_W), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            ALGR_T(KC_SLSH),   LT(U_BUTTON,KC_QUOT),\
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_BEAKL15 \
+KC_Q,              KC_H,              KC_O,              KC_U,              KC_X,              KC_G,              KC_C,              KC_R,              KC_F,              KC_Z,              \
+LGUI_T(KC_Y),      LALT_T(KC_I),      LCTL_T(KC_E),      LSFT_T(KC_A),      KC_DOT,            KC_D,              LSFT_T(KC_S),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_B),      \
+LT(U_BUTTON,KC_J), ALGR_T(KC_SLSH),   KC_COMM,           KC_K,              KC_QUOT,           KC_W,              KC_M,              KC_L,              ALGR_T(KC_P),      LT(U_BUTTON,KC_V), \
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_COLEMAK \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_D,              KC_H,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_K,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_DVORAK \
+KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,              \
+LGUI_T(KC_A),      LALT_T(KC_O),      LCTL_T(KC_E),      LSFT_T(KC_U),      KC_I,              KC_D,              LSFT_T(KC_H),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_S),      \
+LT(U_BUTTON,KC_SLSH),ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      LT(U_BUTTON,KC_Z), \
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_HALMAK \
+KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,              \
+LGUI_T(KC_S),      LALT_T(KC_H),      LCTL_T(KC_N),      LSFT_T(KC_T),      KC_COMM,           KC_DOT,            LSFT_T(KC_A),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
+LT(U_BUTTON,KC_F), ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      LT(U_BUTTON,KC_Y), \
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_WORKMAN \
+KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,           \
+LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_H),      LSFT_T(KC_T),      KC_G,              KC_Y,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),      \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_QWERTY \
+KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
+LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
+LT(U_BUTTON,KC_Z), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_BASE_QWERTZ \
+KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              KC_U,              KC_I,              KC_O,              KC_P,              \
+LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),   \
+LT(U_BUTTON,KC_Y), ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(U_BUTTON,KC_SLSH),\
+U_NP,              U_NP,              LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC),  LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT),  LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL),  U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP \
+KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
+KC_Q,              KC_S,              KC_D,              KC_F,              KC_G,              KC_H,              KC_J,              KC_K,              KC_L,              KC_M,              \
+KC_W,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            KC_SLSH,           KC_QUOT,           \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_BEAKL15_FLIP \
+KC_Q,              KC_H,              KC_O,              KC_U,              KC_X,              KC_G,              KC_C,              KC_R,              KC_F,              KC_Z,              \
+KC_Y,              KC_I,              KC_E,              KC_A,              KC_DOT,            KC_D,              KC_S,              KC_T,              KC_N,              KC_B,              \
+KC_J,              KC_SLSH,           KC_COMM,           KC_K,              KC_QUOT,           KC_W,              KC_M,              KC_L,              KC_P,              KC_V,              \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_COLEMAK_FLIP \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+KC_A,              KC_R,              KC_S,              KC_T,              KC_D,              KC_H,              KC_N,              KC_E,              KC_I,              KC_O,              \
+KC_Z,              KC_X,              KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP \
+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_SLSH,           \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK_FLIP \
+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_K,              KC_N,              KC_E,              KC_I,              KC_O,              \
+KC_Z,              KC_X,              KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_DVORAK_FLIP \
+KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,              \
+KC_A,              KC_O,              KC_E,              KC_U,              KC_I,              KC_D,              KC_H,              KC_T,              KC_N,              KC_S,              \
+KC_SLSH,           KC_Q,              KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              KC_V,              KC_Z,              \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_HALMAK_FLIP \
+KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,              \
+KC_S,              KC_H,              KC_N,              KC_T,              KC_COMM,           KC_DOT,            KC_A,              KC_E,              KC_O,              KC_I,              \
+KC_F,              KC_M,              KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              KC_K,              KC_Y,              \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_WORKMAN_FLIP \
+KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,           \
+KC_A,              KC_S,              KC_H,              KC_T,              KC_G,              KC_Y,              KC_N,              KC_E,              KC_O,              KC_I,              \
+KC_Z,              KC_X,              KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_QWERTY_FLIP \
+KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
+KC_A,              KC_S,              KC_D,              KC_F,              KC_G,              KC_H,              KC_J,              KC_K,              KC_L,              KC_QUOT,           \
+KC_Z,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_QWERTZ_FLIP \
+KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              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_Y,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            KC_TAB,            KC_SPC,            KC_ESC,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_AZERTY \
+KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              \
+KC_Q,              KC_S,              KC_D,              KC_F,              KC_G,              KC_H,              KC_J,              KC_K,              KC_L,              KC_M,              \
+KC_W,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            KC_SLSH,           KC_QUOT,           \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_BEAKL15 \
+KC_Q,              KC_H,              KC_O,              KC_U,              KC_X,              KC_G,              KC_C,              KC_R,              KC_F,              KC_Z,              \
+KC_Y,              KC_I,              KC_E,              KC_A,              KC_DOT,            KC_D,              KC_S,              KC_T,              KC_N,              KC_B,              \
+KC_J,              KC_SLSH,           KC_COMM,           KC_K,              KC_QUOT,           KC_W,              KC_M,              KC_L,              KC_P,              KC_V,              \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_COLEMAK \
+KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,           \
+KC_A,              KC_R,              KC_S,              KC_T,              KC_D,              KC_H,              KC_N,              KC_E,              KC_I,              KC_O,              \
+KC_Z,              KC_X,              KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH \
+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_SLSH,           \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK \
+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_K,              KC_N,              KC_E,              KC_I,              KC_O,              \
+KC_Z,              KC_X,              KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_DVORAK \
+KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,              \
+KC_A,              KC_O,              KC_E,              KC_U,              KC_I,              KC_D,              KC_H,              KC_T,              KC_N,              KC_S,              \
+KC_SLSH,           KC_Q,              KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              KC_V,              KC_Z,              \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_HALMAK \
+KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,              \
+KC_S,              KC_H,              KC_N,              KC_T,              KC_COMM,           KC_DOT,            KC_A,              KC_E,              KC_O,              KC_I,              \
+KC_F,              KC_M,              KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              KC_K,              KC_Y,              \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_WORKMAN \
+KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,           \
+KC_A,              KC_S,              KC_H,              KC_T,              KC_G,              KC_Y,              KC_N,              KC_E,              KC_O,              KC_I,              \
+KC_Z,              KC_X,              KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_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_QUOT,           \
+KC_Z,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_TAP_QWERTZ \
+KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              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_Y,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           \
+U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_TAB,            KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \
+KC_PGUP,           KC_HOME,           KC_UP,             KC_END,            KC_INS,            U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_PGDN,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_NAV),         DF(U_NUM),         KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_NAV_FLIP \
+KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_NAV),         DF(U_NUM),         KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_INS,            KC_HOME,           KC_UP,             KC_END,            KC_PGUP,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_PGDN,           \
+U_NA,              KC_ALGR,           DF(U_NUM),         DF(U_NAV),         U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_NAV_VI \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           \
+U_NA,              KC_ALGR,           DF(U_NUM),         DF(U_NAV),         U_NA,              KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_NAV \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           \
+U_NA,              KC_ALGR,           DF(U_NUM),         DF(U_NAV),         U_NA,              KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP \
+KC_WH_U,           KC_WH_L,           KC_MS_U,           KC_WH_R,           U_NU,              U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_WH_D,           KC_MS_L,           KC_MS_D,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_MOUSE),       DF(U_SYM),         KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_BTN3,           KC_BTN1,           KC_BTN2,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \
+KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_MOUSE),       DF(U_SYM),         KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_BTN3,           KC_BTN1,           KC_BTN2,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_NU,              KC_WH_L,           KC_MS_U,           KC_WH_R,           KC_WH_U,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_R,           KC_WH_D,           \
+U_NA,              KC_ALGR,           DF(U_SYM),         DF(U_MOUSE),       U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN2,           KC_BTN1,           KC_BTN3,           U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MOUSE_VI \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              \
+U_NA,              KC_ALGR,           DF(U_SYM),         DF(U_MOUSE),       U_NA,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN2,           KC_BTN1,           KC_BTN3,           U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MOUSE \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           \
+U_NA,              KC_ALGR,           DF(U_SYM),         DF(U_MOUSE),       U_NA,              U_NU,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN2,           KC_BTN1,           KC_BTN3,           U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \
+RGB_HUI,           RGB_SAI,           KC_VOLU,           RGB_VAI,           RGB_TOG,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+RGB_MOD,           KC_MPRV,           KC_VOLD,           KC_MNXT,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_NU,              U_NU,              U_NU,              U_NU,              OUT_AUTO,          U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MEDIA_FLIP \
+RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_NU,              U_NU,              U_NU,              U_NU,              OUT_AUTO,          U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_TOG,           RGB_MOD,           KC_VOLU,           RGB_HUI,           RGB_SAI,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MPRV,           KC_VOLD,           KC_MNXT,           RGB_VAI,           \
+U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OUT_AUTO,          U_NU,              U_NU,              U_NU,              U_NU,              \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MEDIA_VI \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           U_NU,              \
+U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              OUT_AUTO,          \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_MEDIA \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           \
+U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OUT_AUTO,          U_NU,              U_NU,              U_NU,              U_NU,              \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_NUM_FLIP \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_EQL,            KC_4,              KC_5,              KC_6,              KC_SCLN,           \
+U_NA,              KC_ALGR,           DF(U_NAV),         DF(U_NUM),         U_NA,              KC_BSLS,           KC_1,              KC_2,              KC_3,              KC_GRV,            \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MINS,           KC_0,              KC_DOT,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_NUM \
+KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_SCLN,           KC_4,              KC_5,              KC_6,              KC_EQL,            U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+KC_GRV,            KC_1,              KC_2,              KC_3,              KC_BSLS,           U_NA,              DF(U_NUM),         DF(U_NAV),         KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_DOT,            KC_0,              KC_MINS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_SYM_FLIP \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_PLUS,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_COLN,           \
+U_NA,              KC_ALGR,           DF(U_MOUSE),       DF(U_SYM),         U_NA,              KC_PIPE,           KC_EXLM,           KC_AT,             KC_HASH,           KC_TILD,           \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_UNDS,           KC_LPRN,           KC_RPRN,           U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_SYM \
+KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_COLN,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_PLUS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+KC_TILD,           KC_EXLM,           KC_AT,             KC_HASH,           KC_PIPE,           U_NA,              DF(U_SYM),         DF(U_MOUSE),       KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_LPRN,           KC_RPRN,           KC_UNDS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_FUN_FLIP \
+QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SLCK,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
+U_NA,              KC_ALGR,           DF(U_MEDIA),       DF(U_FUN),         U_NA,              KC_PAUS,           KC_F1,             KC_F2,             KC_F3,             KC_F10,            \
+U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_TAB,            KC_SPC,            KC_APP,            U_NP,              U_NP
+
+#define MIRYOKU_ALTERNATIVES_FUN \
+KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SLCK,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+KC_F10,            KC_F1,             KC_F2,             KC_F3,             KC_PAUS,           U_NA,              DF(U_FUN),         DF(U_MEDIA),       KC_ALGR,           U_NA,              \
+U_NP,              U_NP,              KC_APP,            KC_SPC,            KC_TAB,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
+
+
+#define MIRYOKU_ALTERNATIVES_BUTTON \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NU,              U_NU,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+U_NP,              U_NP,              KC_BTN3,           KC_BTN1,           KC_BTN2,           KC_BTN2,           KC_BTN1,           KC_BTN3,           U_NP,              U_NP
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_list.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_list.h
new file mode 100644
index 0000000000..adac139c1c
--- /dev/null
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_list.h
@@ -0,0 +1,23 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+// generated -*- buffer-read-only: t -*-
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#if !defined (MIRYOKU_LAYER_LIST)
+
+#define MIRYOKU_LAYER_LIST \
+MIRYOKU_X(BASE,   "Base") \
+MIRYOKU_X(EXTRA,  "Extra") \
+MIRYOKU_X(TAP,    "Tap") \
+MIRYOKU_X(BUTTON, "Button") \
+MIRYOKU_X(NAV,    "Nav") \
+MIRYOKU_X(MOUSE,  "Mouse") \
+MIRYOKU_X(MEDIA,  "Media") \
+MIRYOKU_X(NUM,    "Num") \
+MIRYOKU_X(SYM,    "Sym") \
+MIRYOKU_X(FUN,    "Fun")
+
+#endif
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_selection.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_selection.h
new file mode 100644
index 0000000000..609186c480
--- /dev/null
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_selection.h
@@ -0,0 +1,277 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+// generated -*- buffer-read-only: t -*-
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should 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 "miryoku_layer_alternatives.h"
+
+#if !defined(MIRYOKU_LAYER_BASE)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #if defined (MIRYOKU_ALPHAS_AZERTY)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP
+    #elif defined (MIRYOKU_ALPHAS_BEAKL15)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP
+    #elif defined (MIRYOKU_ALPHAS_COLEMAK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP
+    #elif defined (MIRYOKU_ALPHAS_COLEMAKDH)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP
+    #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP
+    #elif defined (MIRYOKU_ALPHAS_DVORAK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP
+    #elif defined (MIRYOKU_ALPHAS_HALMAK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP
+    #elif defined (MIRYOKU_ALPHAS_WORKMAN)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP
+    #elif defined (MIRYOKU_ALPHAS_QWERTY)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP
+    #elif defined (MIRYOKU_ALPHAS_QWERTZ)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP
+    #else
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP
+    #endif
+  #else
+    #if defined (MIRYOKU_ALPHAS_AZERTY)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_AZERTY
+    #elif defined (MIRYOKU_ALPHAS_BEAKL15)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_BEAKL15
+    #elif defined (MIRYOKU_ALPHAS_COLEMAK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAK
+    #elif defined (MIRYOKU_ALPHAS_COLEMAKDH)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH
+    #elif defined (MIRYOKU_ALPHAS_COLEMAKDHK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK
+    #elif defined (MIRYOKU_ALPHAS_DVORAK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_DVORAK
+    #elif defined (MIRYOKU_ALPHAS_HALMAK)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_HALMAK
+    #elif defined (MIRYOKU_ALPHAS_WORKMAN)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_WORKMAN
+    #elif defined (MIRYOKU_ALPHAS_QWERTY)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTY
+    #elif defined (MIRYOKU_ALPHAS_QWERTZ)
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_QWERTZ
+    #else
+      #define MIRYOKU_LAYER_BASE MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH
+    #endif
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_BASE)
+  #define MIRYOKU_LAYERMAPPING_BASE MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_EXTRA)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #if defined (MIRYOKU_EXTRA_AZERTY)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP
+    #elif defined (MIRYOKU_EXTRA_BEAKL15)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP
+    #elif defined (MIRYOKU_EXTRA_COLEMAK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP
+    #elif defined (MIRYOKU_EXTRA_COLEMAKDH)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP
+    #elif defined (MIRYOKU_EXTRA_COLEMAKDHK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP
+    #elif defined (MIRYOKU_EXTRA_DVORAK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP
+    #elif defined (MIRYOKU_EXTRA_HALMAK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP
+    #elif defined (MIRYOKU_EXTRA_WORKMAN)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP
+    #elif defined (MIRYOKU_EXTRA_QWERTY)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP
+    #elif defined (MIRYOKU_EXTRA_QWERTZ)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP
+    #else
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP
+    #endif
+  #else
+    #if defined (MIRYOKU_EXTRA_AZERTY)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_AZERTY
+    #elif defined (MIRYOKU_EXTRA_BEAKL15)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_BEAKL15
+    #elif defined (MIRYOKU_EXTRA_COLEMAK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAK
+    #elif defined (MIRYOKU_EXTRA_COLEMAKDH)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH
+    #elif defined (MIRYOKU_EXTRA_COLEMAKDHK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK
+    #elif defined (MIRYOKU_EXTRA_DVORAK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_DVORAK
+    #elif defined (MIRYOKU_EXTRA_HALMAK)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_HALMAK
+    #elif defined (MIRYOKU_EXTRA_WORKMAN)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_WORKMAN
+    #elif defined (MIRYOKU_EXTRA_QWERTY)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY
+    #elif defined (MIRYOKU_EXTRA_QWERTZ)
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTZ
+    #else
+      #define MIRYOKU_LAYER_EXTRA MIRYOKU_ALTERNATIVES_BASE_QWERTY
+    #endif
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_EXTRA)
+  #define MIRYOKU_LAYERMAPPING_EXTRA MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_TAP)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #if defined (MIRYOKU_TAP_AZERTY)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP
+    #elif defined (MIRYOKU_TAP_BEAKL15)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_BEAKL15_FLIP
+    #elif defined (MIRYOKU_TAP_COLEMAK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAK_FLIP
+    #elif defined (MIRYOKU_TAP_COLEMAKDH)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP
+    #elif defined (MIRYOKU_TAP_COLEMAKDHK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK_FLIP
+    #elif defined (MIRYOKU_TAP_DVORAK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_DVORAK_FLIP
+    #elif defined (MIRYOKU_TAP_HALMAK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_HALMAK_FLIP
+    #elif defined (MIRYOKU_TAP_WORKMAN)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_WORKMAN_FLIP
+    #elif defined (MIRYOKU_TAP_QWERTY)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTY_FLIP
+    #elif defined (MIRYOKU_TAP_QWERTZ)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTZ_FLIP
+    #else
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP
+    #endif
+  #else
+    #if defined (MIRYOKU_TAP_AZERTY)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_AZERTY
+    #elif defined (MIRYOKU_TAP_BEAKL15)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_BEAKL15
+    #elif defined (MIRYOKU_TAP_COLEMAK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAK
+    #elif defined (MIRYOKU_TAP_COLEMAKDH)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH
+    #elif defined (MIRYOKU_TAP_COLEMAKDHK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK
+    #elif defined (MIRYOKU_TAP_DVORAK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_DVORAK
+    #elif defined (MIRYOKU_TAP_HALMAK)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_HALMAK
+    #elif defined (MIRYOKU_TAP_WORKMAN)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_WORKMAN
+    #elif defined (MIRYOKU_TAP_QWERTY)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTY
+    #elif defined (MIRYOKU_TAP_QWERTZ)
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_QWERTZ
+    #else
+      #define MIRYOKU_LAYER_TAP MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH
+    #endif
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_TAP)
+  #define MIRYOKU_LAYERMAPPING_TAP MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_BUTTON)
+  #define MIRYOKU_LAYER_BUTTON MIRYOKU_ALTERNATIVES_BUTTON
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_BUTTON)
+  #define MIRYOKU_LAYERMAPPING_BUTTON MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_NAV)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #if defined (MIRYOKU_NAV_INVERTEDT)
+      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP
+    #else
+      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_FLIP
+    #endif
+  #else
+    #if defined (MIRYOKU_NAV_INVERTEDT)
+      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_INVERTEDT
+    #elif defined (MIRYOKU_NAV_VI)
+      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV_VI
+    #else
+      #define MIRYOKU_LAYER_NAV MIRYOKU_ALTERNATIVES_NAV
+    #endif
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_NAV)
+  #define MIRYOKU_LAYERMAPPING_NAV MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_MOUSE)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #if defined (MIRYOKU_NAV_INVERTEDT)
+      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP
+    #else
+      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_FLIP
+    #endif
+  #else
+    #if defined (MIRYOKU_NAV_INVERTEDT)
+      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT
+    #elif defined (MIRYOKU_NAV_VI)
+      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE_VI
+    #else
+      #define MIRYOKU_LAYER_MOUSE MIRYOKU_ALTERNATIVES_MOUSE
+    #endif
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_MOUSE)
+  #define MIRYOKU_LAYERMAPPING_MOUSE MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_MEDIA)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #if defined (MIRYOKU_NAV_INVERTEDT)
+      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP
+    #else
+      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_FLIP
+    #endif
+  #else
+    #if defined (MIRYOKU_NAV_INVERTEDT)
+      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT
+    #elif defined (MIRYOKU_NAV_VI)
+      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA_VI
+    #else
+      #define MIRYOKU_LAYER_MEDIA MIRYOKU_ALTERNATIVES_MEDIA
+    #endif
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_MEDIA)
+  #define MIRYOKU_LAYERMAPPING_MEDIA MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_NUM)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #define MIRYOKU_LAYER_NUM MIRYOKU_ALTERNATIVES_NUM_FLIP
+  #else
+    #define MIRYOKU_LAYER_NUM MIRYOKU_ALTERNATIVES_NUM
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_NUM)
+  #define MIRYOKU_LAYERMAPPING_NUM MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_SYM)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #define MIRYOKU_LAYER_SYM MIRYOKU_ALTERNATIVES_SYM_FLIP
+  #else
+    #define MIRYOKU_LAYER_SYM MIRYOKU_ALTERNATIVES_SYM
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_SYM)
+  #define MIRYOKU_LAYERMAPPING_SYM MIRYOKU_MAPPING
+#endif
+
+#if !defined(MIRYOKU_LAYER_FUN)
+  #if defined (MIRYOKU_LAYERS_FLIP)
+    #define MIRYOKU_LAYER_FUN MIRYOKU_ALTERNATIVES_FUN_FLIP
+  #else
+    #define MIRYOKU_LAYER_FUN MIRYOKU_ALTERNATIVES_FUN
+  #endif
+#endif
+#if !defined(MIRYOKU_LAYERMAPPING_FUN)
+  #define MIRYOKU_LAYERMAPPING_FUN MIRYOKU_MAPPING
+#endif
diff --git a/users/manna-harbour_miryoku/post_rules.mk b/users/manna-harbour_miryoku/post_rules.mk
index 8fece85e66..e4f1806bf5 100644
--- a/users/manna-harbour_miryoku/post_rules.mk
+++ b/users/manna-harbour_miryoku/post_rules.mk
@@ -1,34 +1,39 @@
-# Copyright 2019 Manna Harbour
+# Copyright 2022 Manna Harbour
 # https://github.com/manna-harbour/miryoku
 
-# alternative layouts:
+# alternative layout options
 
-# alphas
 ifneq ($(strip $(MIRYOKU_ALPHAS)),)
   OPT_DEFS += -DMIRYOKU_ALPHAS_$(MIRYOKU_ALPHAS)
 endif
 
-# nav
+ifneq ($(strip $(MIRYOKU_EXTRA)),)
+  OPT_DEFS += -DMIRYOKU_EXTRA_$(MIRYOKU_EXTRA)
+endif
+
+ifneq ($(strip $(MIRYOKU_TAP)),)
+  OPT_DEFS += -DMIRYOKU_TAP_$(MIRYOKU_TAP)
+endif
+
 ifneq ($(strip $(MIRYOKU_NAV)),)
   OPT_DEFS += -DMIRYOKU_NAV_$(MIRYOKU_NAV)
 endif
 
-# clipboard
 ifneq ($(strip $(MIRYOKU_CLIPBOARD)),)
   OPT_DEFS += -DMIRYOKU_CLIPBOARD_$(MIRYOKU_CLIPBOARD)
 endif
 
-# layers
 ifneq ($(strip $(MIRYOKU_LAYERS)),)
   OPT_DEFS += -DMIRYOKU_LAYERS_$(MIRYOKU_LAYERS)
 endif
 
 # subset mappings
+
 ifneq ($(strip $(MIRYOKU_MAPPING)),)
   OPT_DEFS += -DMIRYOKU_MAPPING_$(MIRYOKU_MAPPING)
 endif
 
-# kludges:
+# kludges
 
 # thumb combos
 ifeq ($(strip $(MIRYOKU_KLUDGE_THUMBCOMBOS)),yes)
diff --git a/users/manna-harbour_miryoku/readme.org b/users/manna-harbour_miryoku/readme.org
index 9e3e587240..0adc414e36 100644
--- a/users/manna-harbour_miryoku/readme.org
+++ b/users/manna-harbour_miryoku/readme.org
@@ -3,37 +3,42 @@
 
 * Miryoku QMK [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]]
 
-[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/cover/miryoku-kle-cover.png]]
+[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/cover/miryoku-kle-cover-miryoku_qmk.png]]
 
 [[https://github.com/manna-harbour/miryoku/][Miryoku]] is an ergonomic, minimal, orthogonal, and universal keyboard layout.  [[https://github.com/manna-harbour/miryoku_qmk/tree/miryoku/users/manna-harbour_miryoku][Miryoku QMK]] is the Miryoku implementation for [[https://qmk.fm][QMK]].
 
+
 ** Branches
 
 
 *** QMK master
 
-Miryoku QMK is periodically merged upstream into QMK master and it is generally recommended to build directly from QMK master.
+QMK master is the current version of QMK, but usually does not contain the current version of Miryoku QMK.
 
-QMK master is at https://github.com/qmk/qmk_firmware/tree/master, and the corresponding Miryoku QMK readme is at https://github.com/qmk/qmk_firmware/tree/master/users/manna-harbour_miryoku.
+QMK master is at https://github.com/qmk/qmk_firmware/tree/master. The corresponding Miryoku QMK readme is at https://github.com/qmk/qmk_firmware/tree/master/users/manna-harbour_miryoku and describes the version of Miryoku QMK in QMK master.
 
 
 *** Miryoku QMK development branch
 
-The Miryoku QMK development branch is ~miryoku~ and may contain new commits not yet merged into QMK master.
+The Miryoku QMK development branch is the current version of Miryoku QMK, but usually does not contain the current version of QMK.
 
-~miryoku~ is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku, and the corresponding Miryoku QMK readme is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku/users/manna-harbour_miryoku.
+The Miryoku QMK development branch is named ~miryoku~ and is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku. The corresponding Miryoku QMK readme is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku/users/manna-harbour_miryoku.
 
-New commits can be seen at the top of the [[https://github.com/manna-harbour/miryoku_qmk/commits/miryoku][history]] with commit messages beginning ~[miryoku]~.  After the new commits are squashed and merged upstream into QMK master by pull request the ~miryoku~ branch is renamed and a new ~miryoku~ branch is created from QMK master.
+New commits can be seen at the top of the [[https://github.com/manna-harbour/miryoku_qmk/commits/miryoku][history]] with commit messages beginning ~[miryoku]~ or ~[miryoku-github]~
 
-To checkout the ~miryoku~ branch in your existing QMK build environment:
-#+BEGIN_SRC sh :tangle no
-git remote add miryoku_qmk git@github.com:manna-harbour/miryoku_qmk.git # if using SSH
-git remote add miryoku_qmk https://github.com/manna-harbour/miryoku_qmk.git # if using HTTPS
-git fetch miryoku_qmk
-git checkout --track miryoku_qmk/miryoku
-#+END_SRC
+Periodically, the ~[miryoku]~ commits are squashed and merged upstream into QMK master by pull request, the ~miryoku~ branch is renamed, and a new ~miryoku~ branch is created from QMK master.
 
 
+**** Merge
+
+To use both the current versions of QMK and Miryoku QMK together, the QMK master and ~miryoku~ branches need to be merged.
+
+The ~[miryoku-github]~ commits relate to GitHub specific functions of the Miryoku QMK repository and forks, such as workflows. Directly merging ~miryoku~ with a branch based on QMK master will lead to conflicts due to those commits. To avoid conflicts, first drop or revert all ~[miryoku-github]~ commits from ~miryoku~ before merging.
+
+Merging branches can be performed automatically at build time for [[#workflow-builds][workflow builds]] using the ~merge~ option, which will automatically revert all ~[miryoku-github]~ commits before merging.  For local builds, see [[#checkout-update-and-merge][Checkout, Update, and Merge]] below.
+
+Any local changes to existing workflow files should be made independently in commits with messages starting ~[miryoku-github]~ so that they can also be automatically excluded in workflow builds.
+
 ** Building
 
 
@@ -41,7 +46,52 @@ git checkout --track miryoku_qmk/miryoku
 
 First [[https://docs.qmk.fm/#/newbs_getting_started][set up the QMK build environment and build the default keymap for your keyboard]].
 
-Build with ~manna-harbour_miryoku~ as the keymap name.  Customised defaults for [[https://github.com/manna-harbour/miryoku/tree/master/docs/reference#alternative-layouts][alternative layout]] options can be set in [[#userspace][custom_rules.mk]].  Options can also be set or overridden at build time.
+Next choose the [[#branches][branch]]. If using ~miryoku~, [[#checkout-update-and-merge][checkout, update, or merge]] as needed.
+
+Build with ~manna-harbour_miryoku~ as the keymap name.  Personalised defaults for [[https://github.com/manna-harbour/miryoku/tree/master/docs/reference#alternative-layouts][alternative layout]] options can be set in [[#userspace][custom_rules.mk]].  Options can also be set or overridden at build time. Build with [[#qmk][qmk]] or [[#make][make]].
+
+
+**** Checkout, Update, and Merge
+
+All of the following examples operate in your existing QMK build environment.
+#+BEGIN_SRC sh :tangle no
+cd qmk_firmware
+#+END_SRC
+
+To checkout the ~miryoku~ branch from Miryoku QMK:
+#+BEGIN_SRC sh :tangle no
+git remote add miryoku_qmk git@github.com:manna-harbour/miryoku_qmk.git # if using SSH
+git remote add miryoku_qmk https://github.com/manna-harbour/miryoku_qmk.git # if using HTTPS
+git fetch miryoku_qmk
+git checkout --track miryoku_qmk/miryoku
+make git-submodule
+#+END_SRC
+
+To update the ~miryoku~ branch from Miryoku QMK:
+#+BEGIN_SRC sh :tangle no
+git checkout miryoku
+git fetch miryoku_qmk
+git merge miryoku_qmk/miryoku
+#+END_SRC
+
+If a new ~miryoku~ branch has been created in Miryoku QMK you will see ~(forced update)~ after the fetch. To rename the existing ~miryoku~ branch and create a new ~miryoku~ branch from Miryoku QMK:
+#+BEGIN_SRC sh :tangle no
+git checkout miryoku
+git branch -m miryoku-`whoami`-`date --rfc-3339=date`
+git fetch miryoku_qmk
+git checkout --track miryoku_qmk/miryoku
+make git-submodule
+#+END_SRC
+
+To [[#merge][merge]] the ~miryoku~ branch with QMK master:
+#+BEGIN_SRC sh :tangle no
+git checkout miryoku
+git checkout -b miryoku-merge-master
+git revert --no-edit `git log --grep='^\[miryoku-github\]' --pretty='format:%H' | tr '\n' ' '`
+git fetch origin
+git merge origin/master
+make git-submodule
+#+END_SRC
 
 
 **** qmk
@@ -51,7 +101,13 @@ Build with the ~qmk~ command.  E.g.
 #+BEGIN_SRC sh :tangle no
 qmk compile -c -kb crkbd -km manna-harbour_miryoku # build for crkbd
 qmk flash -c -kb crkbd -km manna-harbour_miryoku # build for crkbd and flash
-qmk compile -c -kb crkbd -km manna-harbour_miryoku -e MIRYOKU_ALPHAS=QWERTY -e MIRYOKU_NAV=INVERTEDT -e MIRYOKU_CLIPBOARD=WIN -e MIRYOKU_LAYERS=FLIP # build for crkbd with alternative layouts
+qmk compile -c -kb crkbd -km manna-harbour_miryoku \
+  -e MIRYOKU_ALPHAS=QWERTY \
+  -e MIRYOKU_EXTRA=COLEMAKDH \
+  -e MIRYOKU_TAP=QWERTY \
+  -e MIRYOKU_NAV=INVERTEDT \
+  -e MIRYOKU_CLIPBOARD=WIN \
+  -e MIRYOKU_LAYERS=FLIP # build for crkbd with alternative layouts
 #+END_SRC
 
 
@@ -62,7 +118,13 @@ First ~cd~ to the repository root.  Then build with ~make~. E.g.
 #+BEGIN_SRC sh :tangle no
 make clean crkbd:manna-harbour_miryoku # build for crkbd
 make clean crkbd:manna-harbour_miryoku:flash # build for crkbd and flash
-make clean crkbd:manna-harbour_miryoku MIRYOKU_ALPHAS=QWERTY MIRYOKU_NAV=INVERTEDT MIRYOKU_CLIPBOARD=WIN MIRYOKU_LAYERS=FLIP # build for crkbd with alternative layouts
+make clean crkbd:manna-harbour_miryoku \
+  MIRYOKU_ALPHAS=QWERTY \
+  MIRYOKU_EXTRA=COLEMAKDH \
+  MIRYOKU_TAP=QWERTY \
+  MIRYOKU_NAV=INVERTEDT \
+  MIRYOKU_CLIPBOARD=WIN \
+  MIRYOKU_LAYERS=FLIP # build for crkbd with alternative layouts
 #+END_SRC
 
 
@@ -70,13 +132,22 @@ make clean crkbd:manna-harbour_miryoku MIRYOKU_ALPHAS=QWERTY MIRYOKU_NAV=INVERTE
 
 Firmware can be built via GitHub Actions workflows without use of a local build environment.  Local tools are still required for [[https://docs.qmk.fm/#/newbs_flashing][flashing]].
 
-First log in to GitHub, fork the [[#miryoku-qmk-development-branch][Miryoku QMK development branch]] repository, and enable workflows.
+First [[#fork-or-sync][fork the Miryoku QMK repository or sync the ~miryoku~ branch]]. Then use the [[#build-examples][Build Examples]] or [[#build-inputs][Build Inputs]] workflows.
 
 To access a workflow, visit the Actions tab and select the workflow.  To download the firmware from a workflow run, select the workflow, select the workflow run, select the desired Artifacts, and unzip the downloaded zip file.
 
 Workflow files are in [[../../.github/workflows]].
 
 
+**** Fork or Sync
+
+If you don't have a fork, first [[https://github.com/signup][create a GitHub account]], [[https://github.com/login][login to GitHub]], [[https://docs.github.com/en/get-started/quickstart/fork-a-repo#forking-a-repository][fork]] https://github.com/manna-harbour/miryoku_qmk, and visit the Actions tab and enable workflows.
+
+If you already have a fork, [[https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-branch-from-the-web-ui][sync]] the ~miryoku~ branch.
+
+If a new ~miryoku~ branch has been created in Miryoku QMK, there will be a warning about conflicts when trying to sync.  If you have local changes, first create a copy of the branch by [[https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository#creating-a-branch][creating a new branch]] and specifying the ~miryoku~ branch in your fork as the source, then sync the ~miryoku~ branch again.  Accept the prompt to discard commits.
+
+
 **** Build Examples
 
 Copy one of the included Build Example workflow files, edit the ~name~ value, and edit and add options and values as desired.  Select Run workflow, select the Branch if desired, and activate Run workflow.
@@ -91,7 +162,9 @@ The ~keyboard~ option specifies the keyboard and is required.  All other options
 
 The ~alphas~, ~nav~, ~clipboard~, and ~layers~ options correspond to the [[https://github.com/manna-harbour/miryoku/tree/master/docs/reference#alternative-layouts][alternative layout]] options.  The ~mapping~ option corresponds to the alternative [[#subset-mapping][mapping]] options.  Alternative layout and mapping options are given in the documentation in the form ~MIRYOKU_OPTION=VALUE~.  To use here, convert to the form specified above.  Use ~default~ to represent the default value.  Values for these five options are case-insensitive.  See the [[../../.github/workflows/test-all-configs.yml][Test All Configs workflow file]] for all supported values.
 
-The ~rules~ and ~config~ options can be used to specify values to be appended to ~custom_rules.mk~ and ~custom_config.h~, respectively.  Separate multiple lines with ~\n~.
+The ~rules~ and ~custom_config~ options can be used to specify values to be appended to ~custom_rules.mk~ and ~custom_config.h~, respectively.  Separate multiple lines with ~\n~.
+
+The ~merge~ option can be used to merge branches at build time. Branches are specified in the form ~<user>/<repo>/<branch>~. E.g. QMK ~master~ and ~develop~ would be specified as ~qmk/qmk_firmware/master~ and ~qmk/qmk_firmware/develop~ respectively. Multiple space separated branches can be specified. For no merges, leave as ~default~.
 
 
 **** Build Inputs
@@ -106,6 +179,8 @@ The ~Miryoku Alphas~, ~Miryoku Nav~, ~Miryoku Clipboard~, and ~Miryoku Layers~ o
 
 The ~custom_rules.mk~ and ~custom_config.h~ options can be used to specify values to be appended to the corresponding files.  Join multiple lines with ~\n~.
 
+The ~Merge QMK Branches~ option can be used to merge branches at build time. Branches are specified in the form ~<user>/<repo>/<branch>~. E.g. QMK ~master~ and ~develop~ would be specified as ~qmk/qmk_firmware/master~ and ~qmk/qmk_firmware/develop~ respectively. Multiple space separated branches can be specified. For no merges, leave as ~default~.
+
 
 ** Subset Mapping
 
@@ -122,13 +197,13 @@ thumb keys.
 
 - [[./rules.mk]] :: Build options.  Automatically included.
 
-- [[./custom_rules.mk]] :: Custom ~make~ options including customised defaults for alternative layout options, for local builds.  Included from ~rules.mk~.
+- [[./custom_rules.mk]] :: Custom ~make~ options including customised defaults for alternative layout and mapping options.  Included from ~rules.mk~.
 
 - [[./post_rules.mk]] :: Handles Miryoku ~make~ options.  Included from ~rules.mk~.
 
 - [[./config.h]] :: Config options.  Automatically included.
 
-- [[./custom_config.h]] :: Custom config options for local builds.  Included from ~config.h~.
+- [[./custom_config.h]] :: Custom config options.  Included from ~config.h~.
 
 - [[./manna-harbour_miryoku.h]] :: Keymap-related definitions.  Included from ~manna-harbour_miryoku.c~.  Layer data is generated by [[https://github.com/manna-harbour/miryoku_babel][Miryoku Babel]] and is included from files in the [[miryoku_babel]] directory.
 
@@ -500,6 +575,17 @@ make handwired/dactyl_manuform/4x5:manna-harbour_miryoku:flash
 #+END_SRC
 
 
+**** handwired/dactyl_manuform/4x6
+
+Only the main 5x3 alphas and the main 3 thumb keys are used.
+
+To build for this keyboard,
+
+#+BEGIN_SRC sh :tangle no
+make handwired/dactyl_manuform/4x6:manna-harbour_miryoku:flash
+#+END_SRC
+
+
 **** handwired/dactyl_manuform/5x6
 
 Only the main 5x3 alphas and the main 3 thumb keys are used.
@@ -542,6 +628,17 @@ make keyboardio/atreus:manna-harbour_miryoku:flash
 #+END_SRC
 
 
+**** keyboardio/model01
+
+Only the main 5x3 alphas and the inner 3 thumb keys are used.
+
+To build for this keyboard,
+
+#+BEGIN_SRC sh :tangle no
+make keyboardio/model01:manna-harbour_miryoku:flash
+#+END_SRC
+
+
 **** lily58
 
 Only the main 5x3 alphas and the inner 3 thumb keys are used.
@@ -588,6 +685,15 @@ make redox_w:manna-harbour_miryoku:flash
 #+END_SRC
 
 
+**** satt/vision
+
+To build for this keyboard,
+
+#+BEGIN_SRC sh :tangle no
+make satt/vision:manna-harbour_miryoku:flash
+#+END_SRC
+
+
 **** sofle
 
 To build for this keyboard,
@@ -647,6 +753,16 @@ Combo the primary and secondary thumb keys to emulate the tertiary thumb key.  C
 - [[https://github.com/manna-harbour/qmk_firmware/issues/33][Retro Shift]]
 
 
+*** 𝑥MK
+
+Use Miryoku QMK with any keyboard with [[https://github.com/manna-harbour/xmk][𝑥MK]].
+
+For [[#local-builds][local builds]], merge https://github.com/manna-harbour/qmk_firmware/tree/xmk and build for keyboard ~converter/xmk~.
+
+For [[#workflow-builds][workflow builds]], use the Build Inputs workflow and build with keyboard ~converter/xmk~ and merge ~manna-harbour/qmk_firmware/xmk~, or use the Build Example 𝑥MK workflow.
+
+Also see [[https://github.com/manna-harbour/miryoku_kmonad][Miryoku KMonad]].
+
 ** 
 
 [[https://github.com/manna-harbour][https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/manna-harbour-boa-32.png]]

From efe520645ec8b67d306eb63f54b0a52380269596 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 27 Oct 2022 23:59:58 +1100
Subject: [PATCH 753/959] Normalise Combo keycodes (#18877)

---
 docs/feature_combo.md                                 | 10 +++++-----
 keyboards/centromere/keymaps/mini_bom/keymap.c        |  2 +-
 .../gboards/gergoplex/keymaps/colemak-dhm/keymap.c    |  2 +-
 keyboards/gboards/gergoplex/keymaps/default/keymap.c  |  2 +-
 keyboards/ymdk/melody96/keymaps/dvz/keymap.c          |  4 ++--
 quantum/process_keycode/process_combo.c               |  6 +++---
 quantum/quantum_keycodes.h                            | 11 ++++++++---
 quantum/quantum_keycodes_legacy.h                     |  4 ++++
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index bb0b5d7aa0..2696ff6833 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -105,11 +105,11 @@ It is worth noting that `COMBO_ACTION`s are not needed anymore. As of [PR#8591](
 ## Keycodes
 You can enable, disable and toggle the Combo feature on the fly. This is useful if you need to disable them temporarily, such as for a game. The following keycodes are available for use in your `keymap.c`
 
-|Keycode   |Description                      |
-|----------|---------------------------------|
-|`CMB_ON`  |Turns on Combo feature           |
-|`CMB_OFF` |Turns off Combo feature          |
-|`CMB_TOG` |Toggles Combo feature on and off |
+|Keycode          |Aliases  |Description                     |
+|-----------------|---------|--------------------------------|
+|`QK_COMBO_ON`    |`CM_ON`  |Turns on Combo feature          |
+|`QK_COMBO_OFF`   |`CM_OFF` |Turns off Combo feature         |
+|`QK_COMBO_TOGGLE`|`CM_TOGG`|Toggles Combo feature on and off|
 
 # Advanced Configuration
 These configuration settings can be set in your `config.h` file.
diff --git a/keyboards/centromere/keymaps/mini_bom/keymap.c b/keyboards/centromere/keymaps/mini_bom/keymap.c
index 75b2ea08f1..82e68aafa5 100644
--- a/keyboards/centromere/keymaps/mini_bom/keymap.c
+++ b/keyboards/centromere/keymaps/mini_bom/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_NO, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE,        KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS, KC_NO,
  KC_NO, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2,       KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT, KC_NO,
  KC_NO, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1,      KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS, KC_NO,
- CMB_TOG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL 
+ CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL 
   ),
 
     /* Keymap 2: Pad/Function layer
diff --git a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
index ec2c17f8bc..19b5f122ca 100644
--- a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
+++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,          KC_GRV,  KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS,
          KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_BTN2,          KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT,
          KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1,          KC_AMPR, KC_EQL,  KC_COMM, KC_DOT,  KC_MINS,
-                            CMB_TOG, KC_SCLN, KC_EQL,          KC_EQL, KC_SCLN, KC_DEL),
+                            CM_TOGG, KC_SCLN, KC_EQL,          KC_EQL, KC_SCLN, KC_DEL),
 
     /* Keymap 2: Numbers/Function/Motion layer
      *
diff --git a/keyboards/gboards/gergoplex/keymaps/default/keymap.c b/keyboards/gboards/gergoplex/keymaps/default/keymap.c
index c632751204..7728304a9a 100644
--- a/keyboards/gboards/gergoplex/keymaps/default/keymap.c
+++ b/keyboards/gboards/gergoplex/keymaps/default/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,          KC_GRV,  KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS,
          KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_BTN2,          KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT,
          KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1,          KC_AMPR, KC_EQL,  KC_COMM, KC_DOT,  KC_MINS,
-                            CMB_TOG, KC_SCLN, KC_EQL,          KC_EQL, KC_SCLN, KC_DEL),
+                            CM_TOGG, KC_SCLN, KC_EQL,          KC_EQL, KC_SCLN, KC_DEL),
 
     /* Keymap 2: Numbers/Function/Motion layer
      *
diff --git a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
index ff19e2c393..c0f6d88663 100644
--- a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
     KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
     BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CMB_TOG, BL_TOGG, BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CM_TOGG, BL_TOGG, BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END,  KC_TRNS, KC_TRNS, KC_MUTE),
 
 	[2] = LAYOUT(
@@ -133,7 +133,7 @@ void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case KC_CAPS:
         case KC_MUTE:
-        case CMB_TOG:
+        case QK_COMBO_TOGGLE:
             if (record->event.pressed) {
                 rgblight_blink_layer(4, 250);
             }
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index e5135e5a64..d8b089db16 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -531,17 +531,17 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
     bool is_combo_key          = false;
     bool no_combo_keys_pressed = true;
 
-    if (keycode == CMB_ON && record->event.pressed) {
+    if (keycode == QK_COMBO_ON && record->event.pressed) {
         combo_enable();
         return true;
     }
 
-    if (keycode == CMB_OFF && record->event.pressed) {
+    if (keycode == QK_COMBO_OFF && record->event.pressed) {
         combo_disable();
         return true;
     }
 
-    if (keycode == CMB_TOG && record->event.pressed) {
+    if (keycode == QK_COMBO_TOGGLE && record->event.pressed) {
         combo_toggle();
         return true;
     }
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 36cb01b5f5..a3f9888ffc 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -408,9 +408,9 @@ enum quantum_keycodes {
     QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE,  // 5CF7
 
     // Combos
-    CMB_ON,  // 5CF8
-    CMB_OFF, // 5CF9
-    CMB_TOG, // 5CFA
+    QK_COMBO_ON,     // 5CF8
+    QK_COMBO_OFF,    // 5CF9
+    QK_COMBO_TOGGLE, // 5CFA
 
     // Magic (continued)
     MAGIC_SWAP_LCTL_LGUI,   // 5CFB
@@ -872,6 +872,11 @@ enum quantum_keycodes {
 #define SC_RAPC QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE
 #define SC_SENT QK_SPACE_CADET_RIGHT_SHIFT_ENTER
 
+// Combos
+#define CM_ON QK_COMBO_ON
+#define CM_OFF QK_COMBO_OFF
+#define CM_TOGG QK_COMBO_TOGGLE
+
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
 #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 92ec68b622..a6023dee30 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -18,6 +18,10 @@
 #define ONESHOT_DISABLE QK_ONE_SHOT_OFF
 #define ONESHOT_TOGGLE QK_ONE_SHOT_TOGGLE
 
+#define CMB_ON QK_COMBO_ON
+#define CMB_OFF QK_COMBO_OFF
+#define CMB_TOG QK_COMBO_TOGGLE
+
 #define PROGRAMMABLE_BUTTON_1 QK_PROGRAMMABLE_BUTTON_1
 #define PROGRAMMABLE_BUTTON_2 QK_PROGRAMMABLE_BUTTON_2
 #define PROGRAMMABLE_BUTTON_3 QK_PROGRAMMABLE_BUTTON_3

From 20ce76f48c4c8c0978b6b78075319b41bb503c76 Mon Sep 17 00:00:00 2001
From: leah-splitkb <103112489+leah-splitkb@users.noreply.github.com>
Date: Thu, 27 Oct 2022 17:01:17 +0200
Subject: [PATCH 754/959] [Keyboard] Minor Aurora Sweep fixes (#18879)

- Fixes compile error with `SWAP_HANDS_ENABLE = yes`
- Fixes OLED, RGB Matrix, and encoder when using QMK Configurator
---
 .../splitkb/aurora/sweep/keymaps/debug/rules.mk      |  9 +++++++--
 .../splitkb/aurora/sweep/keymaps/default/keymap.json |  3 +++
 .../splitkb/aurora/sweep/keymaps/default/readme.md   | 12 +++++++-----
 keyboards/splitkb/aurora/sweep/rev1/info.json        |  5 ++++-
 keyboards/splitkb/aurora/sweep/rev1/rev1.c           |  2 ++
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk b/keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk
index 066675cb48..c8a3944323 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk
+++ b/keyboards/splitkb/aurora/sweep/keymaps/debug/rules.mk
@@ -13,6 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
+# NOTE: These are already enabled by default at the revision level
+#ENCODER_ENABLE = yes
+#OLED_ENABLE = yes
+
+# RGB Matrix is enabled at the revision level,
+# while we use the regular RGB underglow for testing
+RGB_MATRIX_ENABLE = no
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
index 0af1244c1f..a5f4826c6d 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
@@ -54,6 +54,9 @@
         ]
     ],
     "config": {
+        // Support for OLED, RGB, and encoders is already enabled
+        // by default on the revision level, but we repeat it here
+        // to make clear that you can disable them to save space.
         "features": {
             "oled": true,
             "rgb_matrix": true,
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/readme.md b/keyboards/splitkb/aurora/sweep/keymaps/default/readme.md
index 535580f9a7..03e146e091 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/default/readme.md
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/readme.md
@@ -100,26 +100,28 @@ Where is the keymap.c?
 
 The keymap.c file is not published to the repository. It is generated from `keymap.json` by the build system.
 
-This avoids duplicating information and allow users to edit their keymap from the qmk configurator web interface.
+This avoids duplicating information and allow users to edit their keymap from the QMK Configurator web interface.
 
 How do I edit and update the keymap?
 ------------------------------------
 
-The `keymap.json` file is generated from the qmk configurator interface and formatted for better readability in the context of the Ferris keyboard.
+The `keymap.json` file is generated from the QMK Configurator interface and formatted for better readability in the context of the Ferris keyboard.
 
 To edit it, you may:
 * Edit it directly from a text editor.
-* Edit it from the qmk configurator.
+* Edit it from the QMK Configurator.
 
 If you decide to use the latter workflow, here are the steps to follow:
 
-* From the qmk configurator, hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it).
+* From the [QMK Configurator](https://config.qmk.fm/#/splitkb/aurora/sweep/rev1/LAYOUT_split_3x5_2), hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it).
 * Browse to the location of your keymap (for example, `<your qmk repo>/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json`)
 * Perform any modification to the keymap in the web UI
 * Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it)
 * Replace your original keymap with the one you just downloaded
 
-I want to do more than the configurator supports!
+_**Note:** At the time of writing (the 24th of October 2022), not every feature used in the default keymap is supported by the QMK Configurator. You cannot yet upload the default `keymap.json` due to a file format mismatch - use the "Load Default" button to load the default keymap instead. Additionally, custom configuration options are still being worked on: if your keymap depends on them, please compile your firmware offline for now._
+
+I want to do more than the JSON format supports!
 -------------------------------------------------
 
 While the `json` format is easy to use, it does lack certain functionality - most notably custom OLED or encoder behaviour.
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index 07b7fa8e60..104879b28e 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -6,7 +6,9 @@
     "features": {
         "mousekey": true,
         "bootmagic": true,
-        "extrakey": true
+        "extrakey": true,
+        "oled": true,
+        "rgb_matrix": true
     },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x5_2"
@@ -60,6 +62,7 @@
         "cols": ["B6", "D4", "C6", "D7", "E6"]
     },
     "encoder": {
+        "enabled": true,
         "rotary": [
             {
                 "pin_a": "B5",
diff --git a/keyboards/splitkb/aurora/sweep/rev1/rev1.c b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
index ce19aea5ce..43c2d12a67 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/rev1.c
+++ b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include QMK_KEYBOARD_H
+
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
     __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {

From 84569788d59ab01f0dec22aed53450bdfae5230e Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 27 Oct 2022 09:52:21 -0700
Subject: [PATCH 755/959] MelGeek MJ6XY Refactor (#18862)

* mj6xy.h: convert tabs to spaces

* info.json: convert tabs to spaces

* info.json: apply friendly formatting

Whitespace-only change.

* rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan

- rename `60_ansi_7u_spc` keymap to `default_ansi_tsangan`

* add K31 position to LAYOUT_60_iso

* rename LAYOUT_60_iso_7u_spc_split_rshift to LAYOUT_60_iso_tsangan_split_rshift

- rename `60_iso_7u_spc_split_rshift` keymap to `default_iso_tsangan_split_rshift`

* add K31 position to LAYOUT_60_iso_arrow

* add K31 position to LAYOUT_60_iso_arrow_6u_spc

* add K31 position to LAYOUT_60_iso_arrow_3u_spc

* refactor LAYOUT_60_iso_7u_spc into LAYOUT_60_iso_tsangan

- add K31 position to layout macro
- rename `60_iso_7u_spc` keymap to `default_iso_tsangan`

* add K31 position to LAYOUT_64_iso

- rename `64_iso` keymap to `default_64_iso`

* add K31 position to LAYOUT_64_iso_3u_spc

- rename `64_iso_3u_spc` keymap to `default_64_iso_3u_spc`

* add K31 position to LAYOUT_64_iso_split_3u_spc

- rename `64_iso_split_3u_spc` keymap to `default_64_iso_split_3u_spc`

* remove LAYOUT_60_iso_1u_lshift_split_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_split_rshift`.

* remove LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_tsangan_split_rshift`.

* rename LAYOUT_60_ansi_7u_spc_split_bs to LAYOUT_60_ansi_tsangan_split_bs

- rename `60_ansi_7u_spc_split_bs` keymap to `default_60_ansi_tsangan_split_bs`

* add K31 position to LAYOUT_60_iso_split_bs

* rename LAYOUT_60_iso_7u_spc_split_bs_rshift to LAYOUT_60_iso_tsangan_split_bs_rshift

- rename `60_iso_7u_spc_split_bs_rshift` keymap to `default_60_iso_tsangan_split_bs_rshift`

* add K31 position to LAYOUT_60_iso_arrow_split_bs

* add K31 position to LAYOUT_60_iso_arrow_3u_spc_split_bs

- rename `60_iso_arrow_3u_spc_split_bs` keymap to `default_60_iso_arrow_3u_spc_split_bs`

* add K31 position to LAYOUT_60_iso_arrow_split_bs_3u_spc

- rename `60_iso_arrow_split_bs_3u_spc` keymap to `default_60_iso_arrow_split_bs_3u_spc`

* refactor LAYOUT_60_iso_7u_spc_split_bs into LAYOUT_60_iso_tsangan_split_bs

- add K31 position to layout macro
- rename `60_iso_7u_spc_split_bs` keymap to `default_60_iso_tsangan_split_bs`

* add K31 position to LAYOUT_64_iso_split_bs

- rename `64_iso_split_bs` keymap to `default_64_iso_split_bs`

* add K31 position to LAYOUT_64_iso_3u_spc_split_bs

rename `64_iso_3u_spc_split_bs` keymap to `default_64_iso_3u_spc_split_bs`

* add K31 position to LAYOUT_64_iso_split_bs_3u_spc

- rename `64_iso_split_bs_3u_spc` keymap to `default_64_iso_split_bs_3u_spc`

* remove LAYOUT_60_ansi_arrow_6u_spc macro and keymap

Functionally identical to `LAYOUT_60_ansi_arrow`.

* remove LAYOUT_64_ansi_6u_spc macro and keymap

Functionally identical to `LAYOUT_64_ansi`.

* remove LAYOUT_60_iso_arrow_6u_spc macro and keymap

Functionally identical to `LAYOUT_60_iso_arrow`.

* remove LAYOUT_64_iso_6u_spc macro and keymap

Functionally identical to `LAYOUT_64_iso`.

* remove LAYOUT_60_ansi_arrow_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_60_ansi_arrow_split_bs`.

* remove LAYOUT_64_ansi_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_64_ansi_split_bs`.

* remove LAYOUT_60_iso_arrow_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_60_iso_arrow_split_bs`.

* remove LAYOUT_64_iso_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_64_iso_split_bs`.

* remove LAYOUT_60_iso_1u_lshift_split_bs_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_split_bs_rshift`.

* remove LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_tsangan_split_bs_rshift`.

* refactor keymaps

- convert tabs to spaces
- update keycode grid alignment

* remove LAYOUT_60_ansi_arrow_3u_spc macro and keymap

Subset of `LAYOUT_60_ansi_arrow_3u_spc_split_bs`.

* remove LAYOUT_60_iso_arrow_3u_spc macro and keymap

Subset of `LAYOUT_60_iso_arrow_3u_spc_split_bs`.

* remove LAYOUT_60_iso_tsangan_split_bs macro and keymap

Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`.

* remove LAYOUT_60_iso_tsangan_split_rshift macro and keymap

Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`.

* remove LAYOUT_64_ansi_3u_spc macro and keymap

Subset of `LAYOUT_64_ansi_3u_spc_split_bs`.

* remove LAYOUT_64_iso_3u_spc macro and keymap

Subset of `LAYOUT_64_iso_3u_spc_split_bs`.

* remove LAYOUT_60_iso_split_bs macro and keymap

Subset of `LAYOUT_60_iso_split_bs_rshift`.

* remove LAYOUT_60_iso_split_rshift macro and keymap

Subset of `LAYOUT_60_iso_split_bs_rshift`.

* add LAYOUT_60_ansi_split_bs_rshift macro and keymap

* remove LAYOUT_60_ansi_split_bs macro and keymap

Subset of `LAYOUT_60_ansi_split_bs_rshift`.

* add LAYOUT_60_tsangan_hhkb macro and keymap

* remove LAYOUT_60_ansi_tsangan_split_bs macro and keymap

Subset of `LAYOUT_60_tsangan_hhkb`.

* standardize keymap names

Rename all keymaps per QMK guidelines (e.g. keymap using `LAYOUT_60_ansi_arrow` should be named `default_60_ansi_arrow`).

* add LAYOUT_all; refactor default keymap

Add a `LAYOUT_all` macro, and update the `default` keymap to use the new macro.

* refactor via keymap

Update the `via` keymap to match the behaviour of the `default` keymap.

* improve keyboard readme

- fix broken image reference
- improve grammar on keyboard description
- fix Hardware Availability link
- fix `make` instructions
- add bootloader and flashing instructions

* fix default_60_tsangan_hhkb keymap

Fix a keycode count mismatch.

* mj6xy.h: add matrix diagram

* KC_GESC -> QK_GESC per fauxpark

* KC_SLCK -> KC_SCRL per fauxpark
---
 keyboards/melgeek/mj6xy/info.json             | 5245 ++++++-----------
 .../melgeek/mj6xy/keymaps/60_ansi/keymap.c    |   35 -
 .../mj6xy/keymaps/60_ansi_7u_spc/keymap.c     |   35 -
 .../keymaps/60_ansi_7u_spc_split_bs/keymap.c  |   35 -
 .../mj6xy/keymaps/60_ansi_arrow/keymap.c      |   35 -
 .../keymaps/60_ansi_arrow_3u_spc/keymap.c     |   35 -
 .../60_ansi_arrow_3u_spc_split_bs/keymap.c    |   35 -
 .../keymaps/60_ansi_arrow_6u_spc/keymap.c     |   35 -
 .../60_ansi_arrow_6u_spc_split_bs/keymap.c    |   36 -
 .../60_ansi_arrow_split_3u_spc/keymap.c       |   35 -
 .../keymaps/60_ansi_arrow_split_bs/keymap.c   |   35 -
 .../60_ansi_arrow_split_bs_3u_spc/keymap.c    |   35 -
 .../mj6xy/keymaps/60_ansi_split_bs/keymap.c   |   35 -
 .../melgeek/mj6xy/keymaps/60_iso/keymap.c     |   35 -
 .../keymap.c                                  |   39 -
 .../keymap.c                                  |   39 -
 .../60_iso_1u_lshift_split_bs_rshift/keymap.c |   39 -
 .../60_iso_1u_lshift_split_rshift/keymap.c    |   39 -
 .../mj6xy/keymaps/60_iso_7u_spc/keymap.c      |   35 -
 .../keymaps/60_iso_7u_spc_split_bs/keymap.c   |   35 -
 .../60_iso_7u_spc_split_bs_rshift/keymap.c    |   39 -
 .../60_iso_7u_spc_split_rshift/keymap.c       |   39 -
 .../mj6xy/keymaps/60_iso_arrow/keymap.c       |   35 -
 .../keymaps/60_iso_arrow_3u_spc/keymap.c      |   35 -
 .../60_iso_arrow_3u_spc_split_bs/keymap.c     |   35 -
 .../keymaps/60_iso_arrow_6u_spc/keymap.c      |   35 -
 .../60_iso_arrow_6u_spc_split_bs/keymap.c     |   35 -
 .../60_iso_arrow_split_3u_spc/keymap.c        |   35 -
 .../keymaps/60_iso_arrow_split_bs/keymap.c    |   35 -
 .../60_iso_arrow_split_bs_3u_spc/keymap.c     |   35 -
 .../mj6xy/keymaps/60_iso_split_bs/keymap.c    |   35 -
 .../keymaps/60_iso_split_bs_rshift/keymap.c   |   39 -
 .../keymaps/60_iso_split_rshift/keymap.c      |   39 -
 .../melgeek/mj6xy/keymaps/64_ansi/keymap.c    |   35 -
 .../mj6xy/keymaps/64_ansi_3u_spc/keymap.c     |   35 -
 .../keymaps/64_ansi_3u_spc_split_bs/keymap.c  |   35 -
 .../mj6xy/keymaps/64_ansi_6u_spc/keymap.c     |   35 -
 .../keymaps/64_ansi_6u_spc_split_bs/keymap.c  |   35 -
 .../keymaps/64_ansi_split_3u_spc/keymap.c     |   35 -
 .../mj6xy/keymaps/64_ansi_split_bs/keymap.c   |   35 -
 .../keymaps/64_ansi_split_bs_3u_spc/keymap.c  |   35 -
 .../melgeek/mj6xy/keymaps/64_iso/keymap.c     |   35 -
 .../mj6xy/keymaps/64_iso_3u_spc/keymap.c      |   35 -
 .../keymaps/64_iso_3u_spc_split_bs/keymap.c   |   35 -
 .../mj6xy/keymaps/64_iso_6u_spc/keymap.c      |   35 -
 .../keymaps/64_iso_6u_spc_split_bs/keymap.c   |   35 -
 .../keymaps/64_iso_split_3u_spc/keymap.c      |   35 -
 .../mj6xy/keymaps/64_iso_split_bs/keymap.c    |   35 -
 .../keymaps/64_iso_split_bs_3u_spc/keymap.c   |   35 -
 .../melgeek/mj6xy/keymaps/default/keymap.c    |   26 +-
 .../mj6xy/keymaps/default_60_ansi/keymap.c    |   35 +
 .../keymaps/default_60_ansi_arrow/keymap.c    |   35 +
 .../keymap.c                                  |   35 +
 .../keymap.c                                  |   35 +
 .../default_60_ansi_arrow_split_bs/keymap.c   |   35 +
 .../keymap.c                                  |   35 +
 .../default_60_ansi_split_bs_rshift/keymap.c  |   35 +
 .../keymaps/default_60_ansi_tsangan/keymap.c  |   35 +
 .../mj6xy/keymaps/default_60_iso/keymap.c     |   35 +
 .../keymaps/default_60_iso_arrow/keymap.c     |   35 +
 .../keymap.c                                  |   35 +
 .../keymap.c                                  |   35 +
 .../default_60_iso_arrow_split_bs/keymap.c    |   35 +
 .../keymap.c                                  |   35 +
 .../default_60_iso_split_bs_rshift/keymap.c   |   35 +
 .../keymaps/default_60_iso_tsangan/keymap.c   |   35 +
 .../keymap.c                                  |   35 +
 .../keymaps/default_60_tsangan_hhkb/keymap.c  |   35 +
 .../mj6xy/keymaps/default_64_ansi/keymap.c    |   35 +
 .../default_64_ansi_3u_spc_split_bs/keymap.c  |   35 +
 .../default_64_ansi_split_3u_spc/keymap.c     |   35 +
 .../keymaps/default_64_ansi_split_bs/keymap.c |   35 +
 .../default_64_ansi_split_bs_3u_spc/keymap.c  |   35 +
 .../mj6xy/keymaps/default_64_iso/keymap.c     |   35 +
 .../default_64_iso_3u_spc_split_bs/keymap.c   |   35 +
 .../default_64_iso_split_3u_spc/keymap.c      |   35 +
 .../keymaps/default_64_iso_split_bs/keymap.c  |   35 +
 .../default_64_iso_split_bs_3u_spc/keymap.c   |   35 +
 keyboards/melgeek/mj6xy/keymaps/via/keymap.c  |   54 +-
 keyboards/melgeek/mj6xy/mj6xy.h               |  468 +-
 keyboards/melgeek/mj6xy/readme.md             |   23 +-
 81 files changed, 3119 insertions(+), 5390 deletions(-)
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
 delete mode 100755 keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c
 create mode 100644 keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c
 create mode 100644 keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c
 create mode 100755 keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c

diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json
index 7bd66020b0..cdd2e05749 100755
--- a/keyboards/melgeek/mj6xy/info.json
+++ b/keyboards/melgeek/mj6xy/info.json
@@ -8,3455 +8,2126 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_60_ansi_7u_spc": "LAYOUT_60_ansi_tsangan",
+        "LAYOUT_60_iso_7u_spc_split_bs_rshift": "LAYOUT_60_iso_tsangan_split_bs_rshift",
+        "LAYOUT_60_ansi_arrow_6u_spc": "LAYOUT_60_ansi_arrow",
+        "LAYOUT_64_ansi_6u_spc": "LAYOUT_64_ansi",
+        "LAYOUT_60_iso_arrow_6u_spc": "LAYOUT_60_iso_arrow",
+        "LAYOUT_64_iso_6u_spc": "LAYOUT_64_iso",
+        "LAYOUT_60_ansi_arrow_6u_spc_split_bs": "LAYOUT_60_ansi_arrow_split_bs",
+        "LAYOUT_64_ansi_6u_spc_split_bs": "LAYOUT_64_ansi_split_bs",
+        "LAYOUT_60_iso_arrow_6u_spc_split_bs": "LAYOUT_60_iso_arrow_split_bs",
+        "LAYOUT_64_iso_6u_spc_split_bs": "LAYOUT_64_iso_split_bs",
+        "LAYOUT_60_iso_1u_lshift_split_bs_rshift": "LAYOUT_60_iso_split_bs_rshift",
+        "LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift": "LAYOUT_60_iso_tsangan_split_bs_rshift"
+    },
     "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2, "w":1.25},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"label":"1.25u Left Mod / 3u Left Spacebar", "x":3.75, "y":4, "w":1.25},
+                {"label":"3u Center/6u/6.25u Spacebar", "x":5, "y":4, "w":2},
+                {"label":"7u Spacebar", "x":7, "y":4},
+                {"label":"3u Right Spacebar", "x":8, "y":4},
+                {"label":"1.25u Right Mod", "x":9, "y":4},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
         "LAYOUT_60_ansi_arrow": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_ansi_arrow_6u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_ansi_arrow_3u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_ansi_arrow_split_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_ansi_7u_spc": {
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
 
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        },
         "LAYOUT_64_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_64_ansi_6u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w":1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_64_ansi_3u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_64_ansi_split_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
-        "LAYOUT_60_iso_split_rshift": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
-        "LAYOUT_60_iso_7u_spc_split_rshift": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
         "LAYOUT_60_iso_arrow": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_arrow_6u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_arrow_3u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_iso_arrow_split_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_7u_spc": {
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
 
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        },
         "LAYOUT_64_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_64_iso_6u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w":1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_64_iso_3u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_64_iso_split_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_1u_lshift_split_rshift": {
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3, "w": 2},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
-        "LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3, "w": 2},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		},
-        "LAYOUT_60_ansi_split_bs": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
         "LAYOUT_60_ansi_arrow_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_ansi_arrow_6u_spc_split_bs": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_ansi_arrow_3u_spc_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.75},
+                {"x":1.75, "y":4, "w":1.25},
+                {"x":3, "y":4, "w":1.25},
+                {"x":4.25, "y":4, "w":1.25},
+                {"x":5.5, "y":4, "w":3},
+                {"x":8.5, "y":4, "w":1.25},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_ansi_arrow_split_bs_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_ansi_7u_spc_split_bs": {
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        },
         "LAYOUT_64_ansi_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_64_ansi_6u_spc_split_bs": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w":1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_64_ansi_3u_spc_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.75},
+                {"x":1.75, "y":4, "w":1.25},
+                {"x":3, "y":4, "w":1.25},
+                {"x":4.25, "y":4, "w":1.25},
+                {"x":5.5, "y":4, "w":3},
+                {"x":8.5, "y":4, "w":1.25},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_64_ansi_split_bs_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":2},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_split_bs": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_iso_split_bs_rshift": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
-        "LAYOUT_60_iso_7u_spc_split_bs_rshift": {
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        },
         "LAYOUT_60_iso_arrow_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_arrow_6u_spc_split_bs": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_iso_arrow_3u_spc_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.75},
+                {"x":1.75, "y":4, "w":1.25},
+                {"x":3, "y":4, "w":1.25},
+                {"x":4.25, "y":4, "w":1.25},
+                {"x":5.5, "y":4, "w":3},
+                {"x":8.5, "y":4, "w":1.25},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_60_iso_arrow_split_bs_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_7u_spc_split_bs": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_64_iso_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_64_iso_6u_spc_split_bs": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6},
-                {"x": 9.75, "y": 4, "w":1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_64_iso_3u_spc_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.75},
-                {"x": 1.75, "y": 4, "w": 1.25},
-                {"x": 3, "y": 4, "w": 1.25},
-                {"x": 4.25, "y": 4, "w": 1.25},
-                {"x": 5.5, "y": 4, "w": 3 },
-                {"x": 8.5, "y": 4, "w": 1.25 },
-                {"x": 9.75, "y": 4 , "w": 1.25},
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
+                {"x":0, "y":4, "w":1.75},
+                {"x":1.75, "y":4, "w":1.25},
+                {"x":3, "y":4, "w":1.25},
+                {"x":4.25, "y":4, "w":1.25},
+                {"x":5.5, "y":4, "w":3},
+                {"x":8.5, "y":4, "w":1.25},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        },
         "LAYOUT_64_iso_split_bs_3u_spc": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x": 0, "y": 3, "w": 2},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 3 },
-                {"x": 6.75, "y": 4, "w": 3 },
-                {"x": 9.75, "y": 4, "w": 1.25 },
-                {"x": 11, "y": 4 },
-                {"x": 12, "y": 4 },
-                {"x": 13, "y": 4 },
-                {"x": 14, "y": 4 }
-		    ]
-		},
-        "LAYOUT_60_iso_1u_lshift_split_bs_rshift": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3, "w": 2},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
-		    ]
-		},
-        "LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
- 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3, "w": 2},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
-		    ]
-		}
-	}
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4, "w":3},
+                {"x":9.75, "y":4, "w":1.25},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
deleted file mode 100755
index 77e9d940d1..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_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),
-
-	LAYOUT_60_ansi(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
deleted file mode 100755
index a9509e96dc..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_7u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_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_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_ansi_7u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
deleted file mode 100755
index b4cd656ec2..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    LAYOUT_60_ansi_7u_spc_split_bs( 
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RGUI, MO(1),            KC_RCTL),
-
-    LAYOUT_60_ansi_7u_spc_split_bs( 
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
deleted file mode 100755
index 1b0e576ac8..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	           KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
deleted file mode 100755
index f9e7afa8dc..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
deleted file mode 100755
index 791337744d..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow_3u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
deleted file mode 100755
index c15b740e32..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow_6u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
deleted file mode 100755
index 56ac6faf20..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow_6u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
deleted file mode 100755
index 357d93214d..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                      KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow_split_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
deleted file mode 100755
index 9c0ecdd405..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
deleted file mode 100755
index c7369ebcbc..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_arrow_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                      KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_ansi_arrow_split_bs_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
deleted file mode 100755
index 568eb96235..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV, KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_ansi_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
deleted file mode 100755
index 0d72a78e6c..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
deleted file mode 100755
index 0f213e6ff6..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
deleted file mode 100755
index 3394ab81ab..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_1u_lshift_7u_spc_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
deleted file mode 100755
index eb82f33d04..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_1u_lshift_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_1u_lshift_split_bs_rshift(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
deleted file mode 100755
index 68d60791bd..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_1u_lshift_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_1u_lshift_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
deleted file mode 100755
index e379a5e638..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_7u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_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_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_7u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
deleted file mode 100755
index 18e6734fbe..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_7u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_7u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
deleted file mode 100755
index 96b317b78f..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_7u_spc_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_7u_spc_split_bs_rshift(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
deleted file mode 100755
index 149cd4de57..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_7u_spc_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_7u_spc_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
deleted file mode 100755
index 2713820c12..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
deleted file mode 100755
index f3ee53674a..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
deleted file mode 100755
index c0ed6ad606..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow_3u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
deleted file mode 100755
index 8879490b7b..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow_6u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
deleted file mode 100755
index 78a2f441de..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow_6u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
deleted file mode 100755
index 2a4669a049..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                      KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow_split_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
deleted file mode 100755
index 327e456f37..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
deleted file mode 100755
index 46a08e64d0..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_arrow_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                      KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_60_iso_arrow_split_bs_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
deleted file mode 100755
index 098e5af8cb..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
deleted file mode 100755
index af57d434c6..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_split_bs_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_split_bs_rshift(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
deleted file mode 100755
index 8e78d4082c..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_iso_split_rshift(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),            KC_RCTL),
-
-	LAYOUT_60_iso_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_TRNS,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
-};
-
-
-
-
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
deleted file mode 100755
index 65aad57130..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
deleted file mode 100755
index 5e0a5bf1df..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
deleted file mode 100755
index a33215e624..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi_3u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
deleted file mode 100755
index 939ff02ff0..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  EEP_RST,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi_6u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
deleted file mode 100755
index a2f027ae71..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi_6u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
deleted file mode 100755
index f08a899541..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                      KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi_split_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
deleted file mode 100755
index 6a2bccc0d1..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
deleted file mode 100755
index 2d13f48a83..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,		     KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                      KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_ansi_split_bs_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
deleted file mode 100755
index 52cfd611ee..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_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(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
deleted file mode 100755
index 39eb0817d5..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_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_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
deleted file mode 100755
index ba0be5ec7a..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso_3u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso_3u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
deleted file mode 100755
index f93e2a4f8c..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso_6u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_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(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso_6u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
deleted file mode 100755
index 9b68fb00b6..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso_6u_spc_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso_6u_spc_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
deleted file mode 100755
index 2ae9f1c477..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso_split_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_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_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso_split_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
deleted file mode 100755
index 42312c6693..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso_split_bs(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),	 KC_LEFT,KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso_split_bs(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
deleted file mode 100755
index 68d3f84daa..0000000000
--- a/keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_iso_split_bs_3u_spc(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,	 KC_GRV,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, 
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,	
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,	  KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                      KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_iso_split_bs_3u_spc(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,	 KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
index 77e9d940d1..924c779bec 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
@@ -18,18 +18,18 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_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),
+    LAYOUT_all(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,           KC_SPC,  KC_SPC,  KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
-	LAYOUT_60_ansi(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
 };
-
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c
new file mode 100755
index 0000000000..150679208a
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    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),
+
+    LAYOUT_60_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c
new file mode 100755
index 0000000000..9c7fb6a63d
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_ansi_arrow(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_ansi_arrow(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c
new file mode 100755
index 0000000000..e37832e6e8
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_ansi_arrow_3u_spc_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,                    KC_SPC,           KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_ansi_arrow_3u_spc_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c
new file mode 100755
index 0000000000..9b34448af6
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_ansi_arrow_split_3u_spc(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_ansi_arrow_split_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c
new file mode 100755
index 0000000000..99ab2acd84
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_ansi_arrow_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_ansi_arrow_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c
new file mode 100755
index 0000000000..5f69c20b0e
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_ansi_arrow_split_bs_3u_spc(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_ansi_arrow_split_bs_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c
new file mode 100644
index 0000000000..98c40171ab
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+    LAYOUT_60_ansi_split_bs_rshift(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c
new file mode 100755
index 0000000000..405bae776e
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    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_RGUI, MO(1),   KC_RCTL),
+
+    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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c
new file mode 100755
index 0000000000..9e8cfc7d9f
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    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_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, MO(1),   KC_RCTL),
+
+    LAYOUT_60_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c
new file mode 100755
index 0000000000..2abc100bc2
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_arrow(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_iso_arrow(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c
new file mode 100755
index 0000000000..701b37dacc
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_arrow_3u_spc_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,                    KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_iso_arrow_3u_spc_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c
new file mode 100755
index 0000000000..42acb5c3ac
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_arrow_split_3u_spc(
+        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_BSLS, KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_iso_arrow_split_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c
new file mode 100755
index 0000000000..e717aac44c
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_arrow_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),    KC_LEFT,KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_iso_arrow_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c
new file mode 100755
index 0000000000..cb0686caaa
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_arrow_split_bs_3u_spc(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,          KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_60_iso_arrow_split_bs_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c
new file mode 100755
index 0000000000..88e7ebbdcf
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+    LAYOUT_60_iso_split_bs_rshift(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c
new file mode 100755
index 0000000000..f6cc1799f6
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RGUI, MO(1),   KC_RCTL),
+
+    LAYOUT_60_iso_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_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c
new file mode 100755
index 0000000000..b37ea941c8
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_60_iso_tsangan_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RGUI, MO(1),   KC_RCTL),
+
+    LAYOUT_60_iso_tsangan_split_bs_rshift(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c
new file mode 100644
index 0000000000..ed01c3824b
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RGUI, MO(1),   KC_RCTL),
+
+    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_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c
new file mode 100755
index 0000000000..9f232a6891
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_ansi(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c
new file mode 100755
index 0000000000..eb25a08f74
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_ansi_3u_spc_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,                    KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_ansi_3u_spc_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c
new file mode 100755
index 0000000000..fc5a90d547
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_ansi_split_3u_spc(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_ansi_split_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c
new file mode 100755
index 0000000000..6cb4b49a57
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_ansi_split_bs(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),    KC_LEFT,KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_ansi_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c
new file mode 100755
index 0000000000..30305dd281
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_ansi_split_bs_3u_spc(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_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_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_ansi_split_bs_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c
new file mode 100755
index 0000000000..760255fbfb
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_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_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_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c
new file mode 100755
index 0000000000..27309940fa
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_iso_3u_spc_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,                    KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_iso_3u_spc_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c
new file mode 100755
index 0000000000..43fcfec7cb
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_iso_split_3u_spc(
+        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_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_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_iso_split_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c
new file mode 100755
index 0000000000..3954a094d1
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_iso_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_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_iso_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c
new file mode 100755
index 0000000000..bcc0360874
--- /dev/null
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    LAYOUT_64_iso_split_bs_3u_spc(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_64_iso_split_bs_3u_spc(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
index ee1bc38e7c..ddfcd202f7 100755
--- a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
@@ -18,32 +18,32 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,		      KC_BSPC,
-		KC_TAB,  KC_Q,    KC_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),
+    LAYOUT_all(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,           KC_SPC,           KC_SPC,  KC_SPC,  KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
-	LAYOUT_60_ansi(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,			  KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS),
-	
-	LAYOUT_60_ansi(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS),
-	
-	LAYOUT_60_ansi(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
 };
-
diff --git a/keyboards/melgeek/mj6xy/mj6xy.h b/keyboards/melgeek/mj6xy/mj6xy.h
index e394c99414..213d29a2e7 100755
--- a/keyboards/melgeek/mj6xy/mj6xy.h
+++ b/keyboards/melgeek/mj6xy/mj6xy.h
@@ -20,6 +20,66 @@
 
 #define XXX KC_NO
 
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │      │0e     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │        │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐2d  │ ISO Enter
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d      │     │2c │    │
+ * └──────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴────────┘     └───┴────┘
+ *
+ * Shift Row:
+ *   1u or 2u LShift:
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ * ┌───────┐                                       ┌───────┐
+ * │30     │ 2u LShift                             │3c     │ 2u RShift
+ * └───────┘                                       └───────┘
+ *   1.25u or 2.25u LShift:
+ * ┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┬───┬───┐
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b    │3d │3e │ 1.75u/1u/1u (Arrow Keys)
+ * └────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────┴───┴───┘
+ * ┌────────┐                                   ┌───┬──────┬───┐
+ * │30      │ 2.25u LShift                      │3b │3c    │3e │ 1u/1.75u/1u (HHKB Fn)
+ * └────────┘                                   └───┴──────┴───┘
+ *                                              ┌───┬──────────┐
+ *                                              │3b │3d        │ 1u/2.75u (Standard Layout)
+ *                                              └───┴──────────┘
+ *
+ * Bottom Row:
+ * ┌──────┬────┬────┬────┬───────────┬────┬────┬───┬───┬───┬───┐
+ * │40    │41  │42  │43  │45         │49  │4a  │4b │4c │4d │4e │ 3u Spacebar
+ * └──────┴────┴────┴────┴───────────┴────┴────┴───┴───┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬───┬───┬───┬───┬───┐
+ * │40  │41  │42  │45 (6u or 6.25u)        │4a │4b │4c │4d │4e │ Arrow Keys
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+ * ┌────┬────┬────┬───────────┬───────────┬────┬───┬───┬───┬───┐
+ * │40  │41  │42  │43         │48         │4a  │4b │4c │4d │4e │ 2x3u Spacebars
+ * └────┴────┴────┴───────────┴───────────┴────┴───┴───┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+ * │40  │41  │42  │45                      │4a  │4b  │4c  │4e  │ Standard Layout
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │40   │41 │42   │47                         │4b   │4c │4e   │ Tsangan/WKL/HHKB
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
+#define LAYOUT_all( \
+     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+     k40, k41, k42, k43,      k45,      k47, k48, k49, k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k40, k41, k42, k43, XXX, k45, XXX, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \
+}
+
 #define LAYOUT_60_ansi( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
@@ -35,10 +95,10 @@
 }
 
 #define LAYOUT_60_ansi_arrow( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
@@ -48,39 +108,11 @@
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_ansi_arrow_6u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_60_ansi_arrow_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
-    k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { k40, k41, k42, k43, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
 #define LAYOUT_60_ansi_arrow_split_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
@@ -90,12 +122,12 @@
     { k40, k41, k42, k43, XXX, XXX, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_ansi_7u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+#define LAYOUT_60_ansi_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d,	   \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41, k42,                     k47,                k4b, k4c,      k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
@@ -105,10 +137,10 @@
 }
 
 #define LAYOUT_64_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
@@ -118,39 +150,11 @@
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_64_ansi_6u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_64_ansi_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, k43, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
 #define LAYOUT_64_ansi_split_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
@@ -161,94 +165,38 @@
 }
 
 #define LAYOUT_60_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d,	   \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c,	  k4e  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41, k42,           k45,                     k4a, k4b, k4c,      k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, XXX, k4e }  \
 }
 
-#define LAYOUT_60_iso_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, XXX, k4e }  \
-}
-
-#define LAYOUT_60_iso_7u_spc_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
-    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
-}
-
 #define LAYOUT_60_iso_arrow( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_iso_arrow_6u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_60_iso_arrow_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
-    k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { k40, k41, k42, k43, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
 #define LAYOUT_60_iso_arrow_split_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
@@ -258,115 +206,59 @@
     { k40, k41, k42, k43, XXX, XXX, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_iso_7u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+#define LAYOUT_60_iso_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d,	   \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41, k42,                     k47,                k4b, k4c,      k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
     { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
 }
 
 #define LAYOUT_64_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_64_iso_6u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_64_iso_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, k43, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
 #define LAYOUT_64_iso_split_3u_spc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
     { k40, k41, k42, k43, XXX, XXX, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_iso_1u_lshift_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, XXX, k4e }  \
-}
-
-#define LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,	  k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
-    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
-}
-
-#define LAYOUT_60_ansi_split_bs( \
+#define LAYOUT_60_ansi_split_bs_rshift( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d,	   \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c,	  k4e  \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3e, \
+    k40, k41, k42,           k45,                     k4a, k4b, k4c,      k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, XXX, k4e }  \
 }
 
@@ -374,7 +266,7 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
@@ -384,25 +276,11 @@
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_ansi_arrow_6u_spc_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-	{ k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
 #define LAYOUT_60_ansi_arrow_3u_spc_split_bs( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
@@ -416,7 +294,7 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
@@ -426,17 +304,17 @@
     { k40, k41, k42, k43, XXX, XXX, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_ansi_7u_spc_split_bs( \
+#define LAYOUT_60_tsangan_hhkb( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d,	   \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3e, \
+    k40, k41, k42,                     k47,                k4b, k4c,      k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
     { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
 }
 
@@ -444,21 +322,7 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_64_ansi_6u_spc_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
@@ -472,7 +336,7 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
@@ -486,7 +350,7 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
@@ -496,26 +360,12 @@
     { k40, k41, k42, k43, XXX, XXX, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_iso_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d,	   \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, XXX, k4e }  \
-}
-
 #define LAYOUT_60_iso_split_bs_rshift( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c,	  k4e  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3e, \
+    k40, k41, k42,           k45,                     k4a, k4b, k4c,      k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
@@ -524,45 +374,31 @@
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, XXX, k4e }  \
 }
 
-#define LAYOUT_60_iso_7u_spc_split_bs_rshift( \
+#define LAYOUT_60_iso_tsangan_split_bs_rshift( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3e, \
+    k40, k41, k42,                     k47,                k4b, k4c,      k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
-	{ k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
+    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
 }
 
 #define LAYOUT_60_iso_arrow_split_bs( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_60_iso_arrow_6u_spc_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
@@ -570,13 +406,13 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
     { k40, k41, k42, k43, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e }  \
 }
 
@@ -584,55 +420,27 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
     { k40, k41, k42, k43, XXX, XXX, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
-#define LAYOUT_60_iso_7u_spc_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,		 k3d,	   \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
-}
-
 #define LAYOUT_64_iso_split_bs( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_64_iso_6u_spc_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
     { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
 
@@ -640,13 +448,13 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42, k43,      k45,                k49, k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
     { k40, k41, k42, k43, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e }  \
 }
 
@@ -654,40 +462,12 @@
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,	  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
     k40, k41, k42, k43,                     k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
     { k40, k41, k42, k43, XXX, XXX, XXX, XXX, k48, XXX, k4a, k4b, k4c, k4d, k4e }  \
 }
-
-#define LAYOUT_60_iso_1u_lshift_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,           k45,                     k4a, k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, XXX, k4e }  \
-}
-
-#define LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,	k3c,	  k3e, \
-    k40, k41, k42,                     k47,                k4b, k4c,	  k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \
-    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, XXX, k4e }  \
-}
diff --git a/keyboards/melgeek/mj6xy/readme.md b/keyboards/melgeek/mj6xy/readme.md
index 952f8c4868..bbeffd3179 100755
--- a/keyboards/melgeek/mj6xy/readme.md
+++ b/keyboards/melgeek/mj6xy/readme.md
@@ -1,17 +1,28 @@
 # MJ6XY 60% Mechanical Keyboard PCB
 
-![MJ6XY](https://cdn.shopifycdn.net/s/files/1/0078/2863/5712/products/e66b60bbaa22111cfcb8c9287ff182fa_fe508bda-4e62-4d0e-9842-552ed1233af0_1024x1024@2x.jpg?v=1625753059)
+![MJ6XY rev3](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/melgeek/mj6xy/7084b1fb2e7228c664ee0e481544bd24.webp)
 
-## A Customizable 60% Mechanical Keyboard PCB which is support multi-layouts
-
-![A Customizable 60% Mechanical Keyboard PCB](https://cdn.shopifycdn.net/s/files/1/0078/2863/5712/products/e66b60bbaa22111cfcb8c9287ff182fa_fe508bda-4e62-4d0e-9842-552ed1233af0_1024x1024@2x.jpg?v=1625753059)
+A customizable 60% Mechanical Keyboard PCB which supports multiple layouts.
 
 * Keyboard Maintainer: QMK Community
 * Hardware Supported: MJ6XY 60% Mechanical Keyboard PCB
-* Hardware Availability: [MelGeek](https://www.melgeek.com/collections/pcb-plate/products/melgeek-mj6xy-soldered-pcba-melgeek-com)
+* Hardware Availability: [MelGeek](https://www.melgeek.com/products/melgeek-mj6xy-60-mechanical-keyboard-pcb-melgeek-com)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make melgeek/mj6xy:default
+    make melgeek/mj6xy/rev3:default
+
+Flashing example for this keyboard:
+
+    make melgeek/mj6xy/rev3:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Bootmagic reset**: Hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings)
+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**: Tap the Reset switch mounted on the bottom side of the PCB (near the QWERTY `S` and `D` keys)
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

From 19145704e4a7a8a7609d697585a6423b67dc5371 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 27 Oct 2022 19:26:16 +0200
Subject: [PATCH 756/959] [Core] Adjust PWM hardware audio driver for RP2040
 (#17723)

---
 docs/audio_driver.md                          |  10 +-
 docs/platformdev_rp2040.md                    |   4 +-
 .../charybdis/3x5/keymaps/drashna/config.h    |   1 -
 .../charybdis/3x5/keymaps/drashna/halconf.h   |   1 -
 .../charybdis/3x5/keymaps/drashna/mcuconf.h   |   3 -
 .../charybdis/4x6/keymaps/drashna/config.h    |   1 -
 .../charybdis/4x6/keymaps/drashna/halconf.h   |   1 -
 .../charybdis/4x6/keymaps/drashna/mcuconf.h   |   3 -
 keyboards/handwired/macroboard/f411/config.h  |   1 -
 keyboards/handwired/macroboard/halconf.h      |   1 -
 keyboards/handwired/macroboard/mcuconf.h      |   3 -
 keyboards/handwired/onekey/rp2040/config.h    |   4 +
 keyboards/handwired/onekey/rp2040/mcuconf.h   |   3 +
 .../tractyl_manuform/5x6_right/f411/config.h  |   1 -
 .../tractyl_manuform/5x6_right/f411/halconf.h |   1 -
 .../tractyl_manuform/5x6_right/f411/mcuconf.h |   3 -
 keyboards/yanghu/unicorne/config.h            |   1 -
 keyboards/yanghu/unicorne/f411/halconf.h      |   3 -
 keyboards/yanghu/unicorne/f411/mcuconf.h      |   3 -
 platforms/chibios/chibios_config.h            |  10 +
 .../chibios/drivers/audio_pwm_hardware.c      | 176 +++++++-----------
 platforms/chibios/vendors/RP/_pin_defs.h      |   5 -
 22 files changed, 94 insertions(+), 145 deletions(-)

diff --git a/docs/audio_driver.md b/docs/audio_driver.md
index ffd9c8d5ad..a0bbb22e19 100644
--- a/docs/audio_driver.md
+++ b/docs/audio_driver.md
@@ -159,7 +159,6 @@ A configuration example for the STM32F103C8 would be:
 //halconf.h:
 #define HAL_USE_PWM                 TRUE
 #define HAL_USE_PAL                 TRUE
-#define HAL_USE_GPT                 TRUE
 #include_next <halconf.h>
 ```
 
@@ -168,8 +167,6 @@ A configuration example for the STM32F103C8 would be:
 #include_next <mcuconf.h>
 #undef STM32_PWM_USE_TIM1
 #define STM32_PWM_USE_TIM1                  TRUE
-#undef STM32_GPT_USE_TIM4
-#define STM32_GPT_USE_TIM4                  TRUE
 ```
 
 If we now target pin A8, looking through the data-sheet of the STM32F103C8, for the timers and alternate functions
@@ -184,7 +181,6 @@ with all this information, the configuration would contain these lines:
 #define AUDIO_PIN A8
 #define AUDIO_PWM_DRIVER PWMD1
 #define AUDIO_PWM_CHANNEL 1
-#define AUDIO_STATE_TIMER GPTD4
 ```
 
 ChibiOS uses GPIOv1 for the F103, which only knows of one alternate function.
@@ -207,15 +203,15 @@ You can also change the timer used for software PWM by defining the driver.  For
 
 While not an exhaustive list, the following table provides the scenarios that have been partially validated:
 
-|                          | DAC basic          | DAC additive       | PWM hardware       | PWM software       |
-|--------------------------|--------------------|--------------------|--------------------|--------------------|
+|                          |     DAC basic      |    DAC additive    |    PWM hardware    |    PWM software    |
+| ------------------------ | ------------------ | ------------------ | ------------------ | ------------------ |
 | Atmega32U4               | :o:                | :o:                | :heavy_check_mark: | :o:                |
+| RP2040                   | :x:                | :x:                | :heavy_check_mark: | ?                  |
 | STM32F103C8 (bluepill)   | :x:                | :x:                | :heavy_check_mark: | :heavy_check_mark: |
 | STM32F303CCT6 (proton-c) | :heavy_check_mark: | :heavy_check_mark: | ?                  | :heavy_check_mark: |
 | STM32F405VG              | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | L0xx                     | :x: (no Tim8)      | ?                  | ?                  | ?                  |
 
-
 :heavy_check_mark: : works and was tested  
 :o: : does not apply  
 :x: : not supported by MCU
diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md
index 65055ef07a..3a6f1a1683 100644
--- a/docs/platformdev_rp2040.md
+++ b/docs/platformdev_rp2040.md
@@ -2,10 +2,10 @@
 
 The following table shows the current driver status for peripherals on RP2040 MCUs:
 
-| System                                                           | Support                                        |
+|                              System                              |                    Support                     |
 | ---------------------------------------------------------------- | ---------------------------------------------- |
 | [ADC driver](adc_driver.md)                                      | Support planned (no ETA)                       |
-| [Audio](audio_driver.md)                                         | Support planned (no ETA)                       |
+| [Audio](audio_driver.md#pwm-hardware)                            | :heavy_check_mark:                             |
 | [Backlight](feature_backlight.md)                                | :heavy_check_mark:                             |
 | [I2C driver](i2c_driver.md)                                      | :heavy_check_mark:                             |
 | [SPI driver](spi_driver.md)                                      | :heavy_check_mark:                             |
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
index f3e8f83b2a..ad549a5e22 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
@@ -60,7 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PWM_DRIVER   PWMD3
 #define AUDIO_PWM_CHANNEL  4
 #define AUDIO_PWM_PAL_MODE 2
-#define AUDIO_STATE_TIMER  GPTD4
 
 /* serial.c configuration for split keyboard */
 #undef SOFT_SERIAL_PIN
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
index 39644726c3..bc07c10527 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
@@ -21,6 +21,5 @@
 #define HAL_USE_SPI     TRUE
 #define SPI_USE_WAIT    TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#define HAL_USE_GPT     TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
index 05b5776ac3..fd71b54b77 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
@@ -38,8 +38,5 @@
 #undef STM32_SERIAL_USE_USART2
 #define STM32_SERIAL_USE_USART2 TRUE
 
-#undef STM32_GPT_USE_TIM4
-#define STM32_GPT_USE_TIM4 TRUE
-
 #undef STM32_ST_USE_TIMER
 #define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
index 7e47953d63..e29ff644da 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -56,7 +56,6 @@
 #define AUDIO_PWM_DRIVER   PWMD4
 #define AUDIO_PWM_CHANNEL  2
 #define AUDIO_PWM_PAL_MODE 2
-#define AUDIO_STATE_TIMER  GPTD3
 #define AUDIO_INIT_DELAY
 #define AUDIO_ENABLE_TONE_MULTIPLEXING
 #define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
index 3d9f187317..8aad829e5c 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
@@ -17,7 +17,6 @@
 
 #define HAL_USE_PWM     TRUE
 #define HAL_USE_PAL     TRUE
-#define HAL_USE_GPT     TRUE
 #define HAL_USE_SERIAL  TRUE
 // #define HAL_USE_I2C     TRUE
 #define HAL_USE_SPI     TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
index 5712bb4574..4f04811e54 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
@@ -36,8 +36,5 @@
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
 
-#undef STM32_GPT_USE_TIM3
-#define STM32_GPT_USE_TIM3 TRUE
-
 #undef STM32_ST_USE_TIMER
 #define STM32_ST_USE_TIMER 5
diff --git a/keyboards/handwired/macroboard/f411/config.h b/keyboards/handwired/macroboard/f411/config.h
index 31cb5fa11b..03fd00d182 100644
--- a/keyboards/handwired/macroboard/f411/config.h
+++ b/keyboards/handwired/macroboard/f411/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PWM_DRIVER PWMD2
 #define AUDIO_PWM_CHANNEL 3
 #define AUDIO_PWM_PAL_MODE 1
-#define AUDIO_STATE_TIMER  GPTD1
 
 #define AUDIO_CLICKY
 #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
diff --git a/keyboards/handwired/macroboard/halconf.h b/keyboards/handwired/macroboard/halconf.h
index 06585c9d5e..02e11e8144 100644
--- a/keyboards/handwired/macroboard/halconf.h
+++ b/keyboards/handwired/macroboard/halconf.h
@@ -23,6 +23,5 @@
 #pragma once
 
 #define HAL_USE_PWM TRUE
-#define HAL_USE_GPT TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/macroboard/mcuconf.h b/keyboards/handwired/macroboard/mcuconf.h
index 5b190d7ec2..e62fb3341e 100644
--- a/keyboards/handwired/macroboard/mcuconf.h
+++ b/keyboards/handwired/macroboard/mcuconf.h
@@ -23,8 +23,5 @@
 #undef STM32_PWM_USE_TIM4
 #define STM32_PWM_USE_TIM4 TRUE
 
-#undef STM32_GPT_USE_TIM1
-#define STM32_GPT_USE_TIM1 TRUE
-
 #undef STM32_ST_USE_TIMER
 #define STM32_ST_USE_TIMER 5
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index 82c5592dc9..d3e7b5c076 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -16,3 +16,7 @@
 
 #define BACKLIGHT_PWM_DRIVER PWMD4
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
+
+#define AUDIO_PIN GP16
+#define AUDIO_PWM_DRIVER PWMD0
+#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A
diff --git a/keyboards/handwired/onekey/rp2040/mcuconf.h b/keyboards/handwired/onekey/rp2040/mcuconf.h
index 86f821640f..5c2587395d 100644
--- a/keyboards/handwired/onekey/rp2040/mcuconf.h
+++ b/keyboards/handwired/onekey/rp2040/mcuconf.h
@@ -5,5 +5,8 @@
 
 #include_next "mcuconf.h"
 
+#undef RP_PWM_USE_PWM0
+#define RP_PWM_USE_PWM0 TRUE
+
 #undef RP_PWM_USE_PWM4
 #define RP_PWM_USE_PWM4 TRUE
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index f7e9cfb7d6..e93e70f569 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PWM_DRIVER   PWMD3
 #define AUDIO_PWM_CHANNEL  4
 #define AUDIO_PWM_PAL_MODE 2
-#define AUDIO_STATE_TIMER  GPTD4
 
 /* serial.c configuration for split keyboard */
 #define SERIAL_USART_FULL_DUPLEX  // Enable full duplex operation mode.
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h
index 39644726c3..bc07c10527 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h
@@ -21,6 +21,5 @@
 #define HAL_USE_SPI     TRUE
 #define SPI_USE_WAIT    TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#define HAL_USE_GPT     TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
index 05b5776ac3..fd71b54b77 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
@@ -38,8 +38,5 @@
 #undef STM32_SERIAL_USE_USART2
 #define STM32_SERIAL_USE_USART2 TRUE
 
-#undef STM32_GPT_USE_TIM4
-#define STM32_GPT_USE_TIM4 TRUE
-
 #undef STM32_ST_USE_TIMER
 #define STM32_ST_USE_TIMER 5
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index 285f3209aa..4279f955a9 100644
--- a/keyboards/yanghu/unicorne/config.h
+++ b/keyboards/yanghu/unicorne/config.h
@@ -46,7 +46,6 @@
 #define AUDIO_PWM_PAL_MODE 1
 #define AUDIO_PWM_DRIVER PWMD1
 #define AUDIO_PWM_CHANNEL 1
-#define AUDIO_STATE_TIMER GPTD4
 
 /* RGB LED */
 #define RGB_DI_PIN B1
diff --git a/keyboards/yanghu/unicorne/f411/halconf.h b/keyboards/yanghu/unicorne/f411/halconf.h
index d28ae12fde..04fa5f6994 100644
--- a/keyboards/yanghu/unicorne/f411/halconf.h
+++ b/keyboards/yanghu/unicorne/f411/halconf.h
@@ -18,9 +18,6 @@
 
 /* PWM for AUDIO and RGB LED */
 #define HAL_USE_PWM TRUE
-/* GPT and PAL for Audio */
-#define HAL_USE_GPT TRUE
-#define HAL_USE_PAL TRUE
 /* I2C for OLED display */
 #define HAL_USE_I2C TRUE
 
diff --git a/keyboards/yanghu/unicorne/f411/mcuconf.h b/keyboards/yanghu/unicorne/f411/mcuconf.h
index f4dc31bff2..c2763caabc 100644
--- a/keyboards/yanghu/unicorne/f411/mcuconf.h
+++ b/keyboards/yanghu/unicorne/f411/mcuconf.h
@@ -21,9 +21,6 @@
 /* TIM1 PWM used for audio driver */
 #undef STM32_PWM_USE_TIM1
 #define STM32_PWM_USE_TIM1 TRUE
-/* TIM5 GPT used for audio driver */
-#undef STM32_GPT_USE_TIM4
-#define STM32_GPT_USE_TIM4 TRUE
 
 /* TIM3 used for WS2812 driver */
 #undef STM32_PWM_USE_TIM3
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index 38d3a40f6b..4c8333f07b 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -28,10 +28,18 @@
 #    define USE_GPIOV1
 #    define PAL_OUTPUT_TYPE_OPENDRAIN _Static_assert(0, "RP2040 has no Open Drain GPIO configuration, setting this is not possible");
 
+/* Aliases for GPIO PWM channels - every pin has at least one PWM channel
+ * assigned */
+#    define RP2040_PWM_CHANNEL_A 1U
+#    define RP2040_PWM_CHANNEL_B 2U
+
 #    define BACKLIGHT_PAL_MODE (PAL_MODE_ALTERNATE_PWM | PAL_RP_PAD_DRIVE12 | PAL_RP_GPIO_OE)
 #    define BACKLIGHT_PWM_COUNTER_FREQUENCY 1000000
 #    define BACKLIGHT_PWM_PERIOD BACKLIGHT_PWM_COUNTER_FREQUENCY / 2048
 
+#    define AUDIO_PWM_PAL_MODE (PAL_MODE_ALTERNATE_PWM | PAL_RP_PAD_DRIVE12 | PAL_RP_GPIO_OE)
+#    define AUDIO_PWM_COUNTER_FREQUENCY 500000
+
 #    define usb_lld_endpoint_fields
 
 #    define I2C1_SCL_PAL_MODE (PAL_MODE_ALTERNATE_I2C | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_PUE | PAL_RP_PAD_DRIVE4)
@@ -55,6 +63,7 @@
 #        define USE_GPIOV1
 #        define PAL_MODE_ALTERNATE_OPENDRAIN PAL_MODE_STM32_ALTERNATE_OPENDRAIN
 #        define PAL_MODE_ALTERNATE_PUSHPULL PAL_MODE_STM32_ALTERNATE_PUSHPULL
+#        define AUDIO_PWM_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
 #    else
 #        define PAL_OUTPUT_TYPE_OPENDRAIN PAL_STM32_OTYPE_OPENDRAIN
 #        define PAL_OUTPUT_TYPE_PUSHPULL PAL_STM32_OTYPE_PUSHPULL
@@ -76,6 +85,7 @@
 #        define USE_I2CV1
 #        define PAL_MODE_ALTERNATE_OPENDRAIN PAL_MODE_GD32_ALTERNATE_OPENDRAIN
 #        define PAL_MODE_ALTERNATE_PUSHPULL PAL_MODE_GD32_ALTERNATE_PUSHPULL
+#        define AUDIO_PWM_PAL_MODE PAL_MODE_GD32_ALTERNATE_PUSHPULL
 #    endif
 #endif
 
diff --git a/platforms/chibios/drivers/audio_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
index 710f397609..54dac46605 100644
--- a/platforms/chibios/drivers/audio_pwm_hardware.c
+++ b/platforms/chibios/drivers/audio_pwm_hardware.c
@@ -1,29 +1,15 @@
-/* Copyright 2020 Jack Humbert
- * Copyright 2020 JohSchneider
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Stefan Kerkmann
+// Copyright 2020 Jack Humbert
+// Copyright 2020 JohSchneider
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-/*
-Audio Driver: PWM
-
-the duty-cycle is always kept at 50%, and the pwm-period is adjusted to match the frequency of a note to be played back.
-
-this driver uses the chibios-PWM system to produce a square-wave on specific output pins that are connected to the PWM hardware.
-The hardware directly toggles the pin via its alternate function. see your MCUs data-sheet for which pin can be driven by what timer - looking for TIMx_CHy and the corresponding alternate function.
-
- */
+// Audio Driver: PWM the duty-cycle is always kept at 50%, and the pwm-period is
+// adjusted to match the frequency of a note to be played back. This driver uses
+// the chibios-PWM system to produce a square-wave on specific output pins that
+// are connected to the PWM hardware. The hardware directly toggles the pin via
+// its alternate function. see your MCUs data-sheet for which pin can be driven
+// by what timer - looking for TIMx_CHy and the corresponding alternate
+// function.
 
 #include "audio.h"
 #include "ch.h"
@@ -33,53 +19,36 @@ The hardware directly toggles the pin via its alternate function. see your MCUs
 #    error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"
 #endif
 
+#if !defined(AUDIO_PWM_COUNTER_FREQUENCY)
+#    define AUDIO_PWM_COUNTER_FREQUENCY 100000
+#endif
+
 extern bool    playing_note;
 extern bool    playing_melody;
 extern uint8_t note_timbre;
 
-static PWMConfig pwmCFG = {
-    .frequency = 100000, /* PWM clock frequency  */
-    // CHIBIOS-BUG? can't set the initial period to <2, or the pwm (hard or software) takes ~130ms with .frequency=500000 for a pwmChangePeriod to take effect; with no output=silence in the meantime
-    .period   = 2,    /* initial PWM period (in ticks) 1S (1/10kHz=0.1mS 0.1ms*10000 ticks=1S) */
-    .callback = NULL, /* no callback, the hardware directly toggles the pin */
-    .channels =
-        {
-#if AUDIO_PWM_CHANNEL == 4
-            {PWM_OUTPUT_DISABLED, NULL},   /* channel 0 -> TIMx_CH1 */
-            {PWM_OUTPUT_DISABLED, NULL},   /* channel 1 -> TIMx_CH2 */
-            {PWM_OUTPUT_DISABLED, NULL},   /* channel 2 -> TIMx_CH3 */
-            {PWM_OUTPUT_ACTIVE_HIGH, NULL} /* channel 3 -> TIMx_CH4 */
-#elif AUDIO_PWM_CHANNEL == 3
-            {PWM_OUTPUT_DISABLED, NULL},
-            {PWM_OUTPUT_DISABLED, NULL},
-            {PWM_OUTPUT_ACTIVE_HIGH, NULL}, /* TIMx_CH3 */
-            {PWM_OUTPUT_DISABLED, NULL}
-#elif AUDIO_PWM_CHANNEL == 2
-            {PWM_OUTPUT_DISABLED, NULL},
-            {PWM_OUTPUT_ACTIVE_HIGH, NULL}, /* TIMx_CH2 */
-            {PWM_OUTPUT_DISABLED, NULL},
-            {PWM_OUTPUT_DISABLED, NULL}
-#else /*fallback to CH1 */
-            {PWM_OUTPUT_ACTIVE_HIGH, NULL}, /* TIMx_CH1 */
-            {PWM_OUTPUT_DISABLED, NULL},
-            {PWM_OUTPUT_DISABLED, NULL},
-            {PWM_OUTPUT_DISABLED, NULL}
-#endif
-        },
-};
+static PWMConfig pwmCFG = {.frequency = AUDIO_PWM_COUNTER_FREQUENCY, /* PWM clock frequency  */
+                           .period    = 2,
+                           .callback  = NULL,
+                           .channels  = {[(AUDIO_PWM_CHANNEL - 1)] = {.mode = PWM_OUTPUT_ACTIVE_HIGH, .callback = NULL}}};
 
 static float channel_1_frequency = 0.0f;
-void         channel_1_set_frequency(float freq) {
+
+void channel_1_set_frequency(float freq) {
     channel_1_frequency = freq;
 
-    if (freq <= 0.0) // a pause/rest has freq=0
+    if (freq <= 0.0) {
+        // a pause/rest has freq=0
         return;
+    }
 
     pwmcnt_t period = (pwmCFG.frequency / freq);
-    pwmChangePeriod(&AUDIO_PWM_DRIVER, period);
-    pwmEnableChannel(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1,
-                     // adjust the duty-cycle so that the output is for 'note_timbre' duration HIGH
-                     PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
+    chSysLockFromISR();
+    pwmChangePeriodI(&AUDIO_PWM_DRIVER, period);
+    pwmEnableChannelI(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1,
+                      // adjust the duty-cycle so that the output is for 'note_timbre' duration HIGH
+                      PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
+    chSysUnlockFromISR();
 }
 
 float channel_1_get_frequency(void) {
@@ -95,54 +64,53 @@ void channel_1_stop(void) {
     pwmStop(&AUDIO_PWM_DRIVER);
 }
 
-static void gpt_callback(GPTDriver *gptp);
-GPTConfig   gptCFG = {
-    /* a whole note is one beat, which is - per definition in musical_notes.h - set to 64
-       the longest note is BREAVE_DOT=128+64=192, the shortest SIXTEENTH=4
-       the tempo (which might vary!) is in bpm (beats per minute)
-       therefore: if the timer ticks away at .frequency = (60*64)Hz,
-       and the .interval counts from 64 downwards - audio_update_state is
-       called just often enough to not miss any notes
-    */
-    .frequency = 60 * 64,
-    .callback  = gpt_callback,
-};
+static virtual_timer_t audio_vt;
+static void            audio_callback(virtual_timer_t *vtp, void *p);
 
-void audio_driver_initialize(void) {
-    pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
-
-    // connect the AUDIO_PIN to the PWM hardware
-#if defined(USE_GPIOV1) // STM32F103C8
-    palSetLineMode(AUDIO_PIN, PAL_MODE_ALTERNATE_PUSHPULL);
-#else // GPIOv2 (or GPIOv3 for f4xx, which is the same/compatible at this command)
-    palSetLineMode(AUDIO_PIN, PAL_MODE_ALTERNATE(AUDIO_PWM_PAL_MODE));
-#endif
-
-    gptStart(&AUDIO_STATE_TIMER, &gptCFG);
-}
-
-void audio_driver_start(void) {
-    channel_1_stop();
-    channel_1_start();
-
-    if (playing_note || playing_melody) {
-        gptStartContinuous(&AUDIO_STATE_TIMER, 64);
-    }
-}
-
-void audio_driver_stop(void) {
-    channel_1_stop();
-    gptStopTimer(&AUDIO_STATE_TIMER);
-}
-
-/* a regular timer task, that checks the note to be currently played
- * and updates the pwm to output that frequency
- */
-static void gpt_callback(GPTDriver *gptp) {
+// a regular timer task, that checks the note to be currently played and updates
+// the pwm to output that frequency.
+static void audio_callback(virtual_timer_t *vtp, void *p) {
     float freq; // TODO: freq_alt
 
     if (audio_update_state()) {
         freq = audio_get_processed_frequency(0); // freq_alt would be index=1
         channel_1_set_frequency(freq);
     }
+
+    chSysLockFromISR();
+    chVTSetI(&audio_vt, TIME_MS2I(16), audio_callback, NULL);
+    chSysUnlockFromISR();
+}
+
+void audio_driver_initialize(void) {
+    pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
+
+    // connect the AUDIO_PIN to the PWM hardware
+#if defined(USE_GPIOV1) // STM32F103C8, RP2040
+    palSetLineMode(AUDIO_PIN, AUDIO_PWM_PAL_MODE);
+#else // GPIOv2 (or GPIOv3 for f4xx, which is the same/compatible at this command)
+    palSetLineMode(AUDIO_PIN, PAL_MODE_ALTERNATE(AUDIO_PWM_PAL_MODE));
+#endif
+
+    chVTObjectInit(&audio_vt);
+}
+
+void audio_driver_start(void) {
+    channel_1_stop();
+    channel_1_start();
+
+    if ((playing_note || playing_melody) && !chVTIsArmed(&audio_vt)) {
+        // a whole note is one beat, which is - per definition in
+        // musical_notes.h - set to 64 the longest note is
+        // BREAVE_DOT=128+64=192, the shortest SIXTEENTH=4 the tempo (which
+        // might vary!) is in bpm (beats per minute) therefore: if the timer
+        // ticks away at 64Hz (~16.6ms) audio_update_state is called just often
+        // enough to not miss any notes
+        chVTSet(&audio_vt, TIME_MS2I(16), audio_callback, NULL);
+    }
+}
+
+void audio_driver_stop(void) {
+    channel_1_stop();
+    chVTReset(&audio_vt);
 }
diff --git a/platforms/chibios/vendors/RP/_pin_defs.h b/platforms/chibios/vendors/RP/_pin_defs.h
index b56ab31406..4241845369 100644
--- a/platforms/chibios/vendors/RP/_pin_defs.h
+++ b/platforms/chibios/vendors/RP/_pin_defs.h
@@ -35,8 +35,3 @@
 #define GP28 28U
 #define GP29 29U
 #define GP30 30U
-
-/* Aliases for GPIO PWM channels - every pin has at least one PWM channel
- * assigned */
-#define RP2040_PWM_CHANNEL_A 1U
-#define RP2040_PWM_CHANNEL_B 2U

From 90f6b75873ff1304b517bc30d43440d3c0bd95a4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 28 Oct 2022 05:33:38 +1100
Subject: [PATCH 757/959] Remove `KC_DELT` (#18882)

---
 keyboards/atreus/keymaps/workman/keymap.c                 | 2 +-
 .../cannonkeys/tmov2/keymaps/brandonschlack/keymap.c      | 2 +-
 .../discipline/keymaps/brandonschlack/keymap.c            | 2 +-
 .../coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c | 2 +-
 keyboards/ergodox_ez/keymaps/rishka/keymap.c              | 2 +-
 .../evyd13/wonderland/keymaps/brandonschlack/keymap.c     | 2 +-
 .../think65/solder/keymaps/brandonschlack/keymap.c        | 2 +-
 .../handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c | 2 +-
 keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c | 6 +++---
 keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c        | 6 +++---
 keyboards/ibnuda/squiggle/keymaps/default/keymap.c        | 8 ++++----
 keyboards/ibnuda/squiggle/keymaps/default38/keymap.c      | 6 +++---
 keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c    | 8 ++++----
 keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c | 6 +++---
 .../ibnuda/squiggle/keymaps/rick-complicated/keymap.c     | 6 +++---
 keyboards/ibnuda/squiggle/keymaps/rick/keymap.c           | 6 +++---
 .../mechlovin/adelais/keymaps/brandonschlack/keymap.c     | 2 +-
 keyboards/nightmare/keymaps/brandonschlack/keymap.c       | 2 +-
 keyboards/numatreus/keymaps/default/keymap.c              | 2 +-
 keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c | 2 +-
 .../the_royal/liminal/keymaps/brandonschlack/keymap.c     | 2 +-
 keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c       | 2 +-
 .../walletburner/neuron/keymaps/brandonschlack/keymap.c   | 2 +-
 layouts/community/60_ansi/brandonschlack-ansi/keymap.c    | 2 +-
 .../60_ansi_split_bs_rshift/brandonschlack-split/keymap.c | 2 +-
 .../60_tsangan_hhkb/brandonschlack-tsngn/keymap.c         | 2 +-
 layouts/community/65_ansi_blocker/brandonschlack/keymap.c | 2 +-
 .../brandonschlack-split/keymap.c                         | 2 +-
 layouts/community/75_ansi/brandonschlack/keymap.c         | 2 +-
 layouts/community/ortho_4x12/brandonschlack/keymap.c      | 4 ++--
 layouts/community/ortho_5x12/brandonschlack/keymap.c      | 4 ++--
 layouts/community/tkl_ansi/brandonschlack/keymap.c        | 2 +-
 quantum/quantum_keycodes.h                                | 2 --
 users/csc027/defines.h                                    | 4 ++--
 users/drashna/keyrecords/unicode.c                        | 4 ++--
 users/ibnuda/abstraction.h                                | 2 +-
 users/ibnuda/combo.h                                      | 4 ++--
 users/ridingqwerty/process_records.c                      | 2 +-
 users/ridingqwerty/wrappers.h                             | 2 +-
 39 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/keyboards/atreus/keymaps/workman/keymap.c b/keyboards/atreus/keymaps/workman/keymap.c
index b7540e6739..c0633f6362 100644
--- a/keyboards/atreus/keymaps/workman/keymap.c
+++ b/keyboards/atreus/keymaps/workman/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LW] = LAYOUT( /* [> LOWER <] */
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_VOLU, KC_F7,   KC_F8,   KC_F9,   KC_F10,
-    KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,
+    KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EN_DASH, KC_TRNS, KC_TRNS, DIAERESIS, QK_BOOT  )
 };
diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
index 724463ebe8..5a72f71959 100644
--- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
      */
     [_LOWER] = LAYOUT_default( \
-        KC_MNXT,   KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
+        KC_MNXT,   KC_DEL,  KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
         KC_VOLU,   HY_CAPS, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT,          KC_MPLY, \
         KC_VOLD,   _______, XXXXXXX, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \
         KC_MPRV,                     _______, _______,                   _______, _______,                            _______, _______  \
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
index 8dc554c3d3..e77a24dbc5 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
  */
 [_FN1] = LAYOUT_65_ansi_2_right_mods( \
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DELT, MC_SLPD, \
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  MC_SLPD, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_LHPD, KC_VOLU, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
     _______,          _______, _______, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
index 5999b3dea1..d730efecfa 100644
--- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
+++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * └────┴───┴───┴────────────────────────┴────┴───┴────┘
 */
 [_LOWER] = LAYOUT_ansi_40( \
-    KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  MC_SLPD, \
+    KC_DEL,  KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  MC_SLPD, \
     HY_CAPS, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_PGDN, KC_UP,            KC_MPLY, \
     _______,          KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, \
     _______, _______, _______,                            _______,                   _______, _______, _______  \
diff --git a/keyboards/ergodox_ez/keymaps/rishka/keymap.c b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
index 0146196eee..f6ca540e63 100644
--- a/keyboards/ergodox_ez/keymaps/rishka/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rishka/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [BASE] = LAYOUT_ergodox_pretty_wrapper(
   KC_EQL,  ________________NUMBERS_L__________________, TG(WIN),       OSX_LOCK, ________________NUMBERS_R__________________, KC_MINS,
-  KC_DELT, _________________QWERTY_L1_________________, TG(SYMB),      TG(SYMB), _________________QWERTY_R1_________________, KC_BSLS,
+  KC_DEL,  _________________QWERTY_L1_________________, TG(SYMB),      TG(SYMB), _________________QWERTY_R1_________________, KC_BSLS,
   KC_BSPC, _____________MOD_QWERTY_L2_________________,                          _____________MOD_QWERTY_R2_________________, LT(MDIA, KC_QUOT),
   OS_LSFT, _________________QWERTY_L3_________________, ALL_T(KC_NO),  TG(MDIA), _________________QWERTY_R3_________________, OS_RSFT,
   LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT,                        KC_UP,   KC_DOWN, KC_LBRC,  KC_RBRC,        OSL(SYMB),
diff --git a/keyboards/evyd13/wonderland/keymaps/brandonschlack/keymap.c b/keyboards/evyd13/wonderland/keymaps/brandonschlack/keymap.c
index ca7bd773c5..9933f638a8 100755
--- a/keyboards/evyd13/wonderland/keymaps/brandonschlack/keymap.c
+++ b/keyboards/evyd13/wonderland/keymaps/brandonschlack/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 [_FN1] = LAYOUT( \
     KC_MUTE, QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
-    KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_DELT, \
+    KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_DEL,  \
     KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP,            KC_MPLY, \
              _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \
              _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
index 0286444fe1..0217f1aaf2 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
+++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
  */
 [_FN1] = 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_DELT, KC_VOLU, \
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_VOLU, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_SLPD, KC_VOLD, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD,          _______, XXXXXXX, \
     _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
index 3d0975bd6b..9d613042c9 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/ibnuda/keymap.c
@@ -7,7 +7,7 @@
 #define MIN KC_MINS
 #define SLS KC_SLSH
 #define CTL KC_LCTL
-#define DEL KC_DELT
+#define DEL KC_DEL
 #define QUE KC_QUES
 #define ___ KC_NO
 
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
index f75bf56048..7d541270fb 100644
--- a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
@@ -67,9 +67,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #endif
     [_EDITOR] = {
       //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-        {KC_GRV,  _______, _______, KC_END,  _______, KC_F5,   _______, _______, KC_INS,  _______, KC_PGUP, KC_DELT },
+        {KC_GRV,  _______, _______, KC_END,  _______, KC_F5,   _______, _______, KC_INS,  _______, KC_PGUP, KC_DEL  },
       //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-        {_______, KC_HOME, _______, KC_DELT, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, KC_SCLN },
+        {_______, KC_HOME, _______, KC_DEL,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, KC_SCLN },
       //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
         {_______, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PGDN, _______, KC_SCLN, KC_QUOT, KC_BSLS },
       //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     },
     [_SYMBOL] = {
       //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-        {KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT },
+        {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_LBRC, KC_RBRC, XXXXXXX, _______ },
       //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
index 909b1035c5..88c3784754 100644
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
@@ -146,7 +146,7 @@ enum custom_keycodes {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
@@ -199,7 +199,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [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_DELT),
+    [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),
@@ -215,7 +215,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [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_DELT),
+    [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),
diff --git a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
index 5b486fddb2..c85099a144 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
@@ -77,7 +77,7 @@ enum {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
@@ -112,7 +112,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [E_R]           = COMBO(e_r_combo, KC_UNDS),
     [Z_X]           = COMBO(z_x_combo, KC_ENT),
     [C_X]           = COMBO(x_c_combo, LCTL(KC_W)),
-    [C_V]           = COMBO(c_v_combo, KC_DELT),
+    [C_V]           = COMBO(c_v_combo, KC_DEL),
 
     // right hand combinations.
     [P_O]           = COMBO(p_o_combo,       KC_BSPC),
@@ -120,7 +120,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [U_I]           = COMBO(u_i_combo,       KC_MINS),
     [SLASH_DOT]     = COMBO(slash_dot_combo, KC_PIPE),
     [DOT_COMMA]     = COMBO(dot_comma_combo, KC_APP),
-    [COMMA_M]       = COMBO(comma_m_combo,   KC_DELT),
+    [COMMA_M]       = COMBO(comma_m_combo,   KC_DEL),
 
     // both hand combinations.
     [SLASH_Z]       = COMBO(z_slash_combo, KC_HOME),
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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,  _______,    KC_DELT,ADDDD
+                            ADDDD,  _______,    KC_DEL, ADDDD
 ),
 [_ADJUST] = LAYOUT(
     _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
index 2793f36ba4..aa51f479ff 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
@@ -77,7 +77,7 @@ enum {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
@@ -112,7 +112,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [E_R]           = COMBO(e_r_combo, KC_UNDS),
     [Z_X]           = COMBO(z_x_combo, KC_ENT),
     [C_X]           = COMBO(x_c_combo, LCTL(KC_W)),
-    [C_V]           = COMBO(c_v_combo, KC_DELT),
+    [C_V]           = COMBO(c_v_combo, KC_DEL),
 
     // right hand combinations.
     [P_O]           = COMBO(p_o_combo,       KC_BSPC),
@@ -120,7 +120,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [U_I]           = COMBO(u_i_combo,       KC_MINS),
     [SLASH_DOT]     = COMBO(slash_dot_combo, KC_PIPE),
     [DOT_COMMA]     = COMBO(dot_comma_combo, KC_APP),
-    [COMMA_M]       = COMBO(comma_m_combo,   KC_DELT),
+    [COMMA_M]       = COMBO(comma_m_combo,   KC_DEL),
 
     // both hand combinations.
     [SLASH_Z]       = COMBO(z_slash_combo, KC_HOME),
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
index f8b7de0e4c..78f9617cf0 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
@@ -77,7 +77,7 @@ enum {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
@@ -112,7 +112,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [E_R]           = COMBO(e_r_combo, KC_UNDS),
     [Z_X]           = COMBO(z_x_combo, KC_ENT),
     [C_X]           = COMBO(x_c_combo, LCTL(KC_W)),
-    [C_V]           = COMBO(c_v_combo, KC_DELT),
+    [C_V]           = COMBO(c_v_combo, KC_DEL),
 
     // right hand combinations.
     [P_O]           = COMBO(p_o_combo,       KC_BSPC),
@@ -120,7 +120,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [U_I]           = COMBO(u_i_combo,       KC_MINS),
     [SLASH_DOT]     = COMBO(slash_dot_combo, KC_PIPE),
     [DOT_COMMA]     = COMBO(dot_comma_combo, KC_APP),
-    [COMMA_M]       = COMBO(comma_m_combo,   KC_DELT),
+    [COMMA_M]       = COMBO(comma_m_combo,   KC_DEL),
 
     // both hand combinations.
     [SLASH_Z]       = COMBO(z_slash_combo, KC_HOME),
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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,  _______,    KC_DELT,ADDDD,  _______,_______,_______
+    _______,_______,_______,ADDDD,  _______,    KC_DEL, ADDDD,  _______,_______,_______
 ),
 [_ADJUST] = LAYOUT_full(
     _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
index 3b14fe9136..477aa2229e 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
@@ -77,7 +77,7 @@ enum {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
@@ -112,7 +112,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [E_R]           = COMBO(e_r_combo, KC_UNDS),
     [Z_X]           = COMBO(z_x_combo, KC_ENT),
     [C_X]           = COMBO(x_c_combo, LCTL(KC_W)),
-    [C_V]           = COMBO(c_v_combo, KC_DELT),
+    [C_V]           = COMBO(c_v_combo, KC_DEL),
 
     // right hand combinations.
     [P_O]           = COMBO(p_o_combo,       KC_BSPC),
@@ -120,7 +120,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [U_I]           = COMBO(u_i_combo,       KC_MINS),
     [SLASH_DOT]     = COMBO(slash_dot_combo, KC_PIPE),
     [DOT_COMMA]     = COMBO(dot_comma_combo, KC_APP),
-    [COMMA_M]       = COMBO(comma_m_combo,   KC_DELT),
+    [COMMA_M]       = COMBO(comma_m_combo,   KC_DEL),
 
     // both hand combinations.
     [SLASH_Z]       = COMBO(z_slash_combo, KC_HOME),
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
index 23551827e4..b8c0d9f844 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
@@ -88,7 +88,7 @@ enum custom_keycodes {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
@@ -130,7 +130,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [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_DELT),
+    [J_K]           = COMBO(j_k_combo,          KC_DEL),
     [Q_K]           = COMBO(q_k_combo,          KC_TAB),
     [K_X]           = COMBO(k_x_combo,          KC_TILD),
 
@@ -141,7 +141,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [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_DELT),
+    [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),
 
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
index e49d99ed0e..f0ab692f28 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
@@ -88,7 +88,7 @@ enum custom_keycodes {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
@@ -130,7 +130,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [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_DELT),
+    [J_K]           = COMBO(j_k_combo,          KC_DEL),
     [Q_K]           = COMBO(q_k_combo,          KC_TAB),
     [K_X]           = COMBO(k_x_combo,          KC_TILD),
 
@@ -141,7 +141,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [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_DELT),
+    [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),
 
diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
index f683358f4e..c679e97857 100644
--- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT_all( \
     KC_MUTE, QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
-    KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  KC_DELT, \
+    KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  KC_DEL,  \
     KC_MPRV, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP,            KC_MPLY, \
              _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, RGT_SFT, KC_DOWN, \
              _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c
index 4d5f6ba257..29b7bd1c67 100644
--- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c
+++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
  */
 [_LOWER] = LAYOUT_default( \
-    KC_MNXT,   KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
+    KC_MNXT,   KC_DEL,  KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
     KC_VOLU,   _______, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT,          KC_MPLY, \
     KC_VOLD,            SF_CAPS, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \
     KC_MPRV,                     _______, _______,                            _______,                            _______, _______  \
diff --git a/keyboards/numatreus/keymaps/default/keymap.c b/keyboards/numatreus/keymaps/default/keymap.c
index a916ecdc11..50c426a40f 100644
--- a/keyboards/numatreus/keymaps/default/keymap.c
+++ b/keyboards/numatreus/keymaps/default/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_LOWER] = LAYOUT( /* [> LOWER <] */
     KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                 KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN  ,
-    KC_DELT, KC_ESC,  KC_NO,   KC_NO,   KC_NO,                   KC_PGDN,  KC_PGUP,   KC_PSCR,  KC_NO,  KC_NO,
+    KC_DEL,  KC_ESC,  KC_NO,   KC_NO,   KC_NO,                   KC_PGDN,  KC_PGUP,   KC_PSCR,  KC_NO,  KC_NO,
     KC_CAPS, KC_VOLU, KC_NO,   KC_ENT,  QK_BOOT,                   KC_NO,    KC_NO,     KC_NO,    KC_UP,  KC_NO  ,
     KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_SPC, KC_BSPC, KC_LALT, KC_ENT,  KC_NO,     KC_LEFT, KC_DOWN, KC_RGHT ) 
     
diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
index d513ca8636..b7fb4dae47 100644
--- a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LOWER] = LAYOUT( \
-        KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______,         _______, _______, _______, KC_HOME, KC_UP,   KC_PGUP, MC_SLPD, \
+        KC_DEL,  KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______,         _______, _______, _______, KC_HOME, KC_UP,   KC_PGUP, MC_SLPD, \
         _______, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK,         MC_FWRD, NXT_TAB, _______, KC_LEFT, KC_RGHT,          KC_MPLY, \
         SF_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, PX_AFLL,         OP_AFLL, _______, _______, KC_END,  KC_DOWN, KC_PGDN, _______, \
         _______, _______,                   _______, _______,         _______,          _______,                   _______, _______  \
diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
index cc8280492b..19196db763 100644
--- a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
+++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
  */
 [_LOWER] = LAYOUT_base_kit_all( \
-    KC_MNXT, KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
+    KC_MNXT, KC_DEL,  KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
     KC_VOLU, HY_CAPS, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, KC_LEFT, KC_RGHT, XXXXXXX, KC_MPLY, \
     KC_VOLD, _______, XXXXXXX, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, KC_DOWN, _______, _______, \
     KC_MPRV, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
index 10c20638ed..c2889c5bbe 100755
--- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
+++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT_all( \
     KC_MUTE, QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
-    KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  KC_DELT, \
+    KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  KC_DEL,  \
     KC_MPRV, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP,            KC_MPLY, \
              _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \
              _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
index 35ae5ca5b9..0e272903d1 100644
--- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
+++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘
  */
 [_LOWER] = LAYOUT( \
-    KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_HOME, KC_UP,   KC_PGUP, MC_SLPD, \
+    KC_DEL,  KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_HOME, KC_UP,   KC_PGUP, MC_SLPD, \
     _______, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_LEFT, KC_RGHT,          KC_MPLY, \
     SF_CAPS,          KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, _______, KC_END,  KC_DOWN, KC_PGDN, _______, \
              _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
index 82ddd37fd5..4c129116f2 100644
--- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
+++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
  */
 [_FN1] = 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_DELT, \
+    KC_GRV,  KC_F1,   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_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_PGUP, MC_LHPD, MC_SLPD, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END,           KC_MPLY, \
     _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_PGDN,          _______, \
diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
index 237a0f8e38..d4fb76c288 100644
--- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT_60_ansi_split_bs_rshift( \
     QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
-    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_VOLU, KC_MPRV, KC_MNXT, KC_UP,   MC_MSSN, KC_DELT, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_VOLU, KC_MPRV, KC_MNXT, KC_UP,   MC_MSSN, KC_DEL,  \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_MPLY, \
     _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, KC_MUTE, KC_END,  KC_PGDN, KC_DOWN, PGU_SFT, _______, \
     _______, _______, _______,                            _______,                            _______, HOM_OPT, PGD_FN1, END_CTL  \
diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
index 8fd0739d91..155c51dbe5 100644
--- a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT_60_tsangan_hhkb( \
     QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
-    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, BL_INC,  _______, _______, _______, _______, _______, _______, KC_UP,   MC_MSSN, KC_DELT, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, BL_INC,  _______, _______, _______, _______, _______, _______, KC_UP,   MC_MSSN, KC_DEL,  \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  _______, _______, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_RGHT,          KC_MPLY, \
     _______,          RGB_LYR, RGB_THM, BL_TOGG, _______, QK_BOOT, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_DOWN, PGU_SFT, _______, \
     _______, _______, _______,                            _______,                                     HOM_CMD, PGD_OPT, END_CTL  \
diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
index bd5431a5b8..0e0c2d4040 100644
--- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
+++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
  */
 [_FN1] = 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_DELT, MC_SLPD, \
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  MC_SLPD, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_LHPD, KC_VOLU, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
     _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
index 5a32962baa..acce75f2ab 100644
--- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT_65_ansi_blocker_split_bs( \
     QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_MSSN, MC_SLPD, \
-    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DELT, KC_VOLU, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DEL,  KC_VOLU, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
     _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
     _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END   \
diff --git a/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c
index 91c215ed80..7a26c549cc 100644
--- a/layouts/community/75_ansi/brandonschlack/keymap.c
+++ b/layouts/community/75_ansi/brandonschlack/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT_75_ansi( \
     QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DELT, MC_SLPD, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DEL,  MC_SLPD, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_VOLD, \
     _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          KC_PGUP, KC_MUTE, \
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index 33094f9ca5..75fc339434 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
     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_DELT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
     SF_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_PGUP, KC_PGDN, KC_END,  _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_DELT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
     SF_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_PGUP, KC_PGDN, KC_END,  _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c
index 0e415fe3bf..5f6932cf67 100644
--- a/layouts/community/ortho_5x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \
+    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, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
     KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELT, \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, \
 // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c
index e4f6c53a32..d6a08ebf37 100644
--- a/layouts/community/tkl_ansi/brandonschlack/keymap.c
+++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT_tkl_ansi( \
     QM_MAKE,          KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______,          _______, _______, KC_MUTE, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT,          KC_MPLY, MC_SLPD, KC_VOLU, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           KC_MPLY, MC_SLPD, KC_VOLU, \
     RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD, \
     RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______,                                     \
     _______,          RGB_LYR, RGB_THM, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,          _______,                   KC_PGUP,          \
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index a3f9888ffc..9d332ffb11 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -660,8 +660,6 @@ enum quantum_keycodes {
 // US ANSI shifted keycode aliases
 #include "keymap_us.h"
 
-#define KC_DELT KC_DELETE // Del key (four letter code)
-
 // Modified keycode aliases
 #define C(kc) LCTL(kc)
 #define S(kc) LSFT(kc)
diff --git a/users/csc027/defines.h b/users/csc027/defines.h
index 1086973ba2..ac05941582 100644
--- a/users/csc027/defines.h
+++ b/users/csc027/defines.h
@@ -102,7 +102,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ______________________RAISE_L3_____________________  _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5
 #define ______________________RAISE_L4_____________________  _______,  _______,  _______,  _______,  _______,  _______
 
-#define ______________________RAISE_R1_____________________  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_DELT
+#define ______________________RAISE_R1_____________________  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_DEL
 #define ______________________RAISE_R2_____________________  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   XXXXXXX,  XXXXXXX
 #define ______________________RAISE_R3_____________________  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______
 #define ______________________RAISE_R4_____________________  _______,  _______,  _______,  _______,  XXXXXXX,  XXXXXXX
@@ -135,7 +135,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ______________________LOWER_L3_____________________  _______,  KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,  XXXXXXX
 #define ______________________LOWER_L4_____________________  _______,  _______,  _______,  _______,  _______,  _______
 
-#define ______________________LOWER_R1_____________________  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DELT
+#define ______________________LOWER_R1_____________________  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL
 #define ______________________LOWER_R2_____________________  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  XXXXXXX
 #define ______________________LOWER_R3_____________________  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______
 #define ______________________LOWER_R4_____________________  _______,  _______,  _______,  _______,  XXXXXXX,  XXXXXXX
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index bfce38f555..753fca3231 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -193,9 +193,9 @@ bool process_record_aussie(uint16_t keycode, keyrecord_t *record) {
         tap_code16_nomods(KC_HOME);
         return false;
     } else if (record->event.pressed && keycode == KC_BSPC) {
-        tap_code16_nomods(KC_DELT);
+        tap_code16_nomods(KC_DEL);
         return false;
-    } else if (record->event.pressed && keycode == KC_DELT) {
+    } else if (record->event.pressed && keycode == KC_DEL) {
         tap_code16_nomods(KC_BSPC);
         return false;
     } else if (record->event.pressed && keycode == KC_QUOT) {
diff --git a/users/ibnuda/abstraction.h b/users/ibnuda/abstraction.h
index 0870116c9a..499d512dfc 100644
--- a/users/ibnuda/abstraction.h
+++ b/users/ibnuda/abstraction.h
@@ -109,7 +109,7 @@ enum {
 #define DNTAB  LCTL(LSFT(KC_PGDN))
 #define NXTWIN LALT(KC_TAB)
 #define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DELT))
+#define CALDL  LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
 #define EXPLR  LGUI(KC_E)
 #define LCKGUI LGUI(KC_L)
diff --git a/users/ibnuda/combo.h b/users/ibnuda/combo.h
index 5a331e7d01..d7e79764a9 100644
--- a/users/ibnuda/combo.h
+++ b/users/ibnuda/combo.h
@@ -75,7 +75,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [R_L_PINKY_RING]          = COMBO(ll_p_r_combo,  KC_ENT),
     [R_L_RING_MIDDLE]         = COMBO(ll_r_m_combo,  LCTL(KC_W)),
     [R_L_RING_INDEX]          = COMBO(ll_r_i_combo,  KC_TAB),
-    [R_L_MIDDLE_INDEX]        = COMBO(ll_m_i_combo,  KC_DELT),
+    [R_L_MIDDLE_INDEX]        = COMBO(ll_m_i_combo,  KC_DEL),
     [R_L_INDEX_INNER_INDEX]   = COMBO(ll_i_ii_combo, KC_TILD),
 
     // right hand combinations.
@@ -88,7 +88,7 @@ combo_t key_combos[COMBO_COUNT] = {
     [L_L_PINKY_RING]          = COMBO(rl_p_r_combo,  KC_BSLS),
     [L_L_RING_MIDDLE]         = COMBO(rl_r_m_combo,  KC_APP),
     [L_L_RING_INDEX]          = COMBO(rl_r_i_combo,  LSFT(KC_TAB)),
-    [L_L_MIDDLE_INDEX]        = COMBO(rl_m_i_combo,  KC_DELT),
+    [L_L_MIDDLE_INDEX]        = COMBO(rl_m_i_combo,  KC_DEL),
     [L_L_INDEX_INNER_INDEX]   = COMBO(rl_i_ii_combo, KC_GRV),
 
     // both hand combinations.
diff --git a/users/ridingqwerty/process_records.c b/users/ridingqwerty/process_records.c
index 770af286e9..4aa688ca00 100644
--- a/users/ridingqwerty/process_records.c
+++ b/users/ridingqwerty/process_records.c
@@ -334,7 +334,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return false;
       case KC_BSPC:
         if (record->event.pressed) {
-          tap_code(KC_DELT);
+          tap_code(KC_DEL);
         }
         return false;
       case KC_SPC:
diff --git a/users/ridingqwerty/wrappers.h b/users/ridingqwerty/wrappers.h
index 392ca12012..f4f3de91f1 100644
--- a/users/ridingqwerty/wrappers.h
+++ b/users/ridingqwerty/wrappers.h
@@ -81,7 +81,7 @@
 #define ________________FKEYROW_R1_________________        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
 
 #define ________________EDITOR_L1__________________        KC_GRV,  _______, KC_END,  _______, KC_F5  
-#define ________________EDITOR_L2__________________        KC_HOME, _______, KC_DELT, _______, _______
+#define ________________EDITOR_L2__________________        KC_HOME, _______, KC_DEL,  _______, _______
 #if defined(TAP_DANCE_ENABLE)
 #define ________________EDITOR_L3__________________        _______, KC_VOLD, KC_VOLU, CCCV,    TD_BRC
 #else

From 7b888fb3287b939af5ae12688e2e808a81c91427 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 28 Oct 2022 05:34:00 +1100
Subject: [PATCH 758/959] elephant42: fix default keymap (#18884)

---
 keyboards/elephant42/keymaps/default/keymap.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/elephant42/keymaps/default/keymap.c b/keyboards/elephant42/keymaps/default/keymap.c
index 7cb90fe35e..e0235d75bb 100644
--- a/keyboards/elephant42/keymaps/default/keymap.c
+++ b/keyboards/elephant42/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 #define KC_VU KC_AUDIO_VOL_UP
 #define KC_VD KC_AUDIO_VOL_DOWN
 #define KC_MU KC_AUDIO_MUTE
-#define SC_LSPC LT(_LOWER, KC_SPC)
-#define SC_RSPC LT(_RAISE, KC_SPC)
+#define KC_LSPC LT(_LOWER, KC_SPC)
+#define KC_RSPC LT(_RAISE, KC_SPC)
 
 enum layer_names {
     _QWERTY,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
               KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                                      KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT,     KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------|
              XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN,                                     KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL ,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT,     KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
              KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD,                                     KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT,     KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   )
 };

From a96a9fd5f8d1db141bc4d5083b63267aac035adf Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 27 Oct 2022 14:04:33 -0600
Subject: [PATCH 759/959] Fixup keebio/sinc/rev3 (#18866)

---
 keyboards/keebio/sinc/rev3/config.h  |  6 ++----
 keyboards/keebio/sinc/rev3/info.json | 17 +++++------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h
index 5d698b7aec..664ad11535 100644
--- a/keyboards/keebio/sinc/rev3/config.h
+++ b/keyboards/keebio/sinc/rev3/config.h
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_SCL_PIN GP22
 #define I2C1_SDA_PIN GP23
 
-#define RGBLIGHT_DEFAULT_VAL 120
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 // RGB Matrix
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
@@ -70,8 +68,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#define RGB_DI_PIN GP18
+#define RGB_MATRIX_LED_COUNT 113
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index 37640dbf9b..0b4e32a6ab 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -12,7 +12,7 @@
         "console": true,
         "rgblight": false,
         "backlight": false,
-        "rgb_matrix": true,
+        "rgb_matrix": true
     },
     "split": {
         "enabled": true,
@@ -27,8 +27,8 @@
             "right":{
                 "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
                 "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
-            },
-        },
+            }
+        }
     },
     "matrix_pins": {
         "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
@@ -40,16 +40,9 @@
             {"pin_a": "GP21", "pin_b": "GP20" }
         ]
     },
-    "rgblight": {
-       "pin": "GP18",
-       "led_count": 113,
-       "max_brightness": 120,
-       "sleep": true,
-       "split": true,
-       "split_count": [56, 57]
-    },
     "rgb_matrix": {
         "driver": "WS2812",
+        "split_count": [56, 57],
         "layout": [
             { "flags": 4, "matrix": [5, 2], "x": 30,  "y": 0 },
             { "flags": 2, "x": 42, "y": 6 },
@@ -178,5 +171,5 @@
             { "flags": 4, "matrix": [10, 7], "x": 224, "y": 64 },
             { "flags": 2, "x": 224, "y": 55 }
           ]
-    },
+    }
 }

From 7407347be1df69928d27ea9b6a4fe094429f2a55 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 28 Oct 2022 09:50:14 +1100
Subject: [PATCH 760/959] Remove rgblight_list.h (#18878)

* Remove rgblight_list defines with no usage

* Remove rgblight_setrgb_*[_at] defines

* Remove rgblight_sethsv_* defines

* Remove rgblight_sethsv_noeeprom_* defines

* Delete rgblight_list.h and remove all references
---
 docs/feature_eeprom.md                        |  14 +-
 .../super16/keymaps/ahk_companion/keymap.c    |   2 +-
 .../charybdis/3x5/keymaps/bstiq/keymap.c      |   2 +-
 .../charybdis/3x5/keymaps/via/keymap.c        |   2 +-
 .../charybdis/3x6/keymaps/via/keymap.c        |   2 +-
 .../charybdis/4x6/keymaps/via/keymap.c        |   2 +-
 .../bastardkb/dilemma/keymaps/bstiq/keymap.c  |   2 +-
 .../biacco42/ergo42/keymaps/hdbx/keymap.c     |  10 +-
 keyboards/crkbd/keymaps/edvorakjp/keymap.c    |   6 +-
 keyboards/dp60/keymaps/indicator/indicator.c  |   1 -
 .../dz60/keymaps/iso_split-spacebar/keymap.c  |   8 +-
 keyboards/dz60/keymaps/mechmerlin/keymap.c    |   4 +-
 keyboards/dz60/keymaps/mechmerlin/readme.md   |   2 +-
 .../hacker_dvorak/user/layer_set_state_user.c |  20 +--
 .../hacker_dvorak/user/matrix_scan_user.c     |   2 +-
 .../ergodox_ez/keymaps/rgb_layer/keymap.c     |  20 +--
 .../heisenberg/keymaps/turkishish/keymap.c    |   2 +-
 .../handwired/onekey/keymaps/apa102/keymap.c  |   2 +-
 .../handwired/onekey/keymaps/rgb/keymap.c     |   2 +-
 .../helix/rev2/keymaps/edvorakjp/keymap.c     |   6 +-
 .../hub16/keymaps/ahk_companion/keymap.c      |   2 +-
 keyboards/hub16/keymaps/peepeetee/keymap.c    |   2 +-
 .../kbdfans/kbd75/keymaps/edulpn/keymap.c     |   8 +-
 .../keebio/iris/keymaps/edvorakjp/keymap.c    |   6 +-
 .../levinson/keymaps/issmirnov/README.md      |   2 +-
 .../keebio/levinson/keymaps/issmirnov/rgb.c   |   8 +-
 .../ktec/staryu/keymaps/default/keymap.c      |  12 +-
 .../lfkpad/keymaps/pascalpfeil/keymap.c       |   2 +-
 .../m12og/rev1/keymaps/default/keymap.c       |   2 +-
 .../mechlovin/kanu/keymaps/dhertz/keymap.c    |   6 +-
 .../percent/canoe/keymaps/dhertz/keymap.c     |   6 +-
 keyboards/redox/keymaps/jeherve/keymap.c      |  10 +-
 .../bigseries/1key/keymaps/8ball/keymap.c     |   8 +-
 keyboards/xiudi/xd75/keymaps/hybrid/keymap.c  |   6 +-
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |  16 +--
 keyboards/yushakobo/quick17/rgb_matrix_kb.inc |   2 +-
 .../community/numpad_5x6/bjohnson/keymap.c    |   6 +-
 quantum/rgblight/rgblight.h                   |   1 -
 quantum/rgblight/rgblight_list.h              | 136 ------------------
 users/brandonschlack/rgb_theme.h              |   1 -
 users/curry/curry.c                           |   2 +-
 users/greatwizard/underglow.c                 |  16 +--
 users/kuchosauronad0/kuchosauronad0.c         |   2 +-
 users/kuchosauronad0/leader.c                 |   2 +-
 users/kuchosauronad0/rgblight_user.c          |  18 +--
 users/peej/peej.c                             |   2 +-
 users/twschum/twschum.c                       |   1 -
 users/wanleg/wanleg.c                         |   2 +-
 48 files changed, 129 insertions(+), 269 deletions(-)
 delete mode 100644 quantum/rgblight/rgblight_list.h

diff --git a/docs/feature_eeprom.md b/docs/feature_eeprom.md
index 3a4119eab7..088f4f36ff 100644
--- a/docs/feature_eeprom.md
+++ b/docs/feature_eeprom.md
@@ -40,7 +40,7 @@ void keyboard_post_init_user(void) {
   // Set default layer, if enabled
   if (user_config.rgb_layer_change) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_cyan();
+    rgblight_sethsv_noeeprom(HSV_CYAN);
     rgblight_mode_noeeprom(1);
   }
 }
@@ -51,19 +51,19 @@ The above function will use the EEPROM config immediately after reading it, to s
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
     case _RAISE:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_magenta(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_MAGENTA); rgblight_mode_noeeprom(1); }
         break;
     case _LOWER:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_red(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(1); }
         break;
     case _PLOVER:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_green(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_GREEN); rgblight_mode_noeeprom(1); }
         break;
     case _ADJUST:
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_white(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_WHITE); rgblight_mode_noeeprom(1); }
         break;
     default: //  for any other layers, or the default layer
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_cyan(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); }
         break;
     }
   return state;
@@ -119,7 +119,7 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
 
   // use the non noeeprom versions, to write these values to EEPROM too
   rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv_cyan();  // Set it to CYAN by default
+  rgblight_sethsv(HSV_CYAN);  // Set it to CYAN by default
   rgblight_mode(1); // set to solid by default
 }
 ```
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
index ec707557d1..a326abcf83 100644
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
@@ -131,6 +131,6 @@ void matrix_scan_user(void) {
 //EEPROM Reset Function
 void eeconfig_init_user(void) {
   rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv_orange();  // Set it to orange by default
+  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
 }
 
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
index a28c200b2d..2664b531a2 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
@@ -215,7 +215,7 @@ void shutdown_user(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_setrgb_red();
+    rgblight_setrgb(RGB_RED);
 #endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(RGB_RED);
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
index 417220a38e..d3fdfef14a 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -260,7 +260,7 @@ void shutdown_user(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_setrgb_red();
+    rgblight_setrgb(RGB_RED);
 #endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(RGB_RED);
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
index 9a6eb5f236..39b05b9234 100644
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
@@ -139,7 +139,7 @@ void shutdown_user(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(1);
-    rgblight_setrgb_red();
+    rgblight_setrgb(RGB_RED);
 #endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(RGB_RED);
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
index 0ab7b78cc4..92a861e91a 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
@@ -162,7 +162,7 @@ void shutdown_user(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(1);
-    rgblight_setrgb_red();
+    rgblight_setrgb(RGB_RED);
 #endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(RGB_RED);
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
index 5533bc40c6..e8c0441d7b 100644
--- a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
+++ b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
@@ -215,7 +215,7 @@ void shutdown_user(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_setrgb_red();
+    rgblight_setrgb(RGB_RED);
 #endif // RGBLIGHT_ENABLE
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(RGB_RED);
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
index 161543806f..2d687037e4 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
@@ -141,7 +141,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) {
 void matrix_init_user(void) {
 #ifdef RGBLIGHT_ENABLE
   rgblight_enable();
-  rgblight_setrgb_teal();
+  rgblight_setrgb(RGB_TEAL);
 #endif
 }
 
@@ -150,16 +150,16 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 #ifdef RGBLIGHT_ENABLE
     switch (get_highest_layer(state)) {
     case _RAISE:
-      rgblight_setrgb_chartreuse(); // RAISE:シャルトリューズ
+      rgblight_setrgb(RGB_CHARTREUSE); // RAISE:シャルトリューズ
       break;
     case _LOWER:
-      rgblight_setrgb_pink(); // LOWER:ピンク
+      rgblight_setrgb(RGB_PINK); // LOWER:ピンク
       break;
     case _ADJUST:
-      rgblight_setrgb_red(); // ADJUST:レッド
+      rgblight_setrgb(RGB_RED); // ADJUST:レッド
       break;
     default: //  for any other layers, or the default layer
-      rgblight_setrgb_teal(); // 他:ティール
+      rgblight_setrgb(RGB_TEAL); // 他:ティール
       break;
     }
 #endif
diff --git a/keyboards/crkbd/keymaps/edvorakjp/keymap.c b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
index 66c39783fd..0cc8a0c4ba 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/keymap.c
+++ b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
@@ -52,14 +52,14 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
     switch (get_highest_layer(state)) {
         case L_EDVORAKJP_LOWER:
-            rgblight_sethsv_noeeprom_red();
+            rgblight_sethsv_noeeprom(HSV_RED);
             break;
         case L_EDVORAKJP_RAISE:
-            rgblight_sethsv_noeeprom_green();
+            rgblight_sethsv_noeeprom(HSV_GREEN);
             break;
         default:  // for any other layers, or the default layer
             rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
-            rgblight_sethsv_red();
+            rgblight_sethsv(HSV_RED);
             break;
     }
     return state;
diff --git a/keyboards/dp60/keymaps/indicator/indicator.c b/keyboards/dp60/keymaps/indicator/indicator.c
index 999e0c3338..683ae3625a 100644
--- a/keyboards/dp60/keymaps/indicator/indicator.c
+++ b/keyboards/dp60/keymaps/indicator/indicator.c
@@ -16,7 +16,6 @@
 
 #include "dp60.h"
 
-#include "rgblight_list.h"
 #include "rgblight.h"
 
 
diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
index a790f6d3ad..56dccf376f 100644
--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -39,16 +39,16 @@
 #define RGB_XMS RGB_M_X   //rgb christmas
 //
 #define RGB_BL_MODE    rgblight_mode_noeeprom(3)              //rgb mode for BL layer
-#define RGB_BL_LIGHT   rgblight_sethsv_noeeprom_turquoise()   //rgb light for BL layer
+#define RGB_BL_LIGHT   rgblight_sethsv_noeeprom(HSV_TURQUOISE)   //rgb light for BL layer
 //
 #define RGB_FL_MODE    rgblight_mode_noeeprom(1)             //rgb mode for FL layer
-#define RGB_FL_LIGHT   rgblight_sethsv_noeeprom_orange()      //rgb light for FL layer
+#define RGB_FL_LIGHT   rgblight_sethsv_noeeprom(HSV_ORANGE)      //rgb light for FL layer
 //
 #define RGB_NL_MODE    rgblight_mode_noeeprom(12)             //rgb mode for NL layer
-#define RGB_NL_LIGHT   rgblight_sethsv_noeeprom_turquoise()       //rgb light for NL layer
+#define RGB_NL_LIGHT   rgblight_sethsv_noeeprom(HSV_TURQUOISE)       //rgb light for NL layer
 //
 #define RGB_RL_MODE    rgblight_mode_noeeprom(22)             //rgb mode for RL layer
-#define RGB_RL_LIGHT   rgblight_sethsv_noeeprom_red()         //rgb light for RL layer
+#define RGB_RL_LIGHT   rgblight_sethsv_noeeprom(HSV_RED)         //rgb light for RL layer
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/dz60/keymaps/mechmerlin/keymap.c b/keyboards/dz60/keymaps/mechmerlin/keymap.c
index 0b7b17f2cd..795ba24798 100644
--- a/keyboards/dz60/keymaps/mechmerlin/keymap.c
+++ b/keyboards/dz60/keymaps/mechmerlin/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Set underglow RGB leds to yellow
-// Find the list of available colors in quantum/rgblight_list.h
+// Find the list of available colors in quantum/color.h
 void matrix_init_user(void) {
-  rgblight_sethsv_noeeprom_yellow();
+  rgblight_sethsv_noeeprom(HSV_YELLOW);
 }
diff --git a/keyboards/dz60/keymaps/mechmerlin/readme.md b/keyboards/dz60/keymaps/mechmerlin/readme.md
index 9c53288fea..bb8fbf84b3 100644
--- a/keyboards/dz60/keymaps/mechmerlin/readme.md
+++ b/keyboards/dz60/keymaps/mechmerlin/readme.md
@@ -65,4 +65,4 @@ This is set in `mechmerlin/config.h` so that when the computer goes to sleep, th
 
 ### RGB Underglow Color: Yellow
 
-This is set in `mechmerlin/keymap.c` in the `matrix_init_user` function. The list of available colors can be found in [`quantum/rgblight_list.h`](https://github.com/qmk/qmk_firmware/blob/388df5359b913eaf1ce6fb0ef624e430ad010ea5/quantum/rgblight_list.h#L59-L121).
+This is set in `mechmerlin/keymap.c` in the `matrix_init_user` function. The list of available colors can be found in [`quantum/color.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/color.h).
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
index ed407def79..bd4fd10ad1 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
@@ -4,7 +4,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
     switch (layer) {
         case DVORAK:
-            rgblight_sethsv_noeeprom_green();
+            rgblight_sethsv_noeeprom(GREEN);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
 
             if (PLOVER_MODE) {
@@ -15,7 +15,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case PLOVER:
-            rgblight_sethsv_noeeprom_red();
+            rgblight_sethsv_noeeprom(HSV_RED);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
 
             if (!(PLOVER_MODE)) {
@@ -26,7 +26,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case GAMING:
-            rgblight_sethsv_noeeprom_red();
+            rgblight_sethsv_noeeprom(HSV_RED);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
@@ -37,7 +37,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case ARROWS:
-            rgblight_sethsv_noeeprom_blue();
+            rgblight_sethsv_noeeprom(HSV_BLUE);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
@@ -48,7 +48,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case MOUSE:
-            rgblight_sethsv_noeeprom_blue();
+            rgblight_sethsv_noeeprom(HSV_BLUE);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
@@ -59,7 +59,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case NUMPAD:
-            rgblight_sethsv_noeeprom_blue();
+            rgblight_sethsv_noeeprom(HSV_BLUE);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
@@ -70,7 +70,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case LAYERS:
-            rgblight_sethsv_noeeprom_cyan();
+            rgblight_sethsv_noeeprom(HSV_CYAN);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
@@ -81,7 +81,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case MEDIA_FN:
-            rgblight_sethsv_noeeprom_yellow();
+            rgblight_sethsv_noeeprom(HSV_YELLOW);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
@@ -92,7 +92,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case CHORD:
-            rgblight_sethsv_noeeprom_magenta();
+            rgblight_sethsv_noeeprom(HSV_MAGENTA);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
@@ -103,7 +103,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
             break;
 
         case FIRMWARE:
-            rgblight_sethsv_noeeprom_magenta();
+            rgblight_sethsv_noeeprom(HSV_MAGENTA);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
 
             if (PLOVER_MODE) {
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c
index 3b78079cca..277821afac 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c
@@ -4,7 +4,7 @@ bool MATRIX_SCANNED = false;
 
 void matrix_scan_user(void) {
     if (!(MATRIX_SCANNED)) {
-        rgblight_sethsv_noeeprom_green();
+        rgblight_sethsv_noeeprom(HSV_GREEN);
         MATRIX_SCANNED = true;
     }
 
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
index a41a21072c..6ed204a357 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void eeconfig_init_user(void) {
   rgblight_enable();
-  rgblight_sethsv_cyan();
+  rgblight_sethsv(HSV_CYAN);
   rgblight_mode(1);
   user_config.rgb_layer_change = true;
   eeconfig_update_user(user_config.raw);
@@ -213,7 +213,7 @@ void matrix_init_user(void) {
   // Set default layer, if enabled
   if (user_config.rgb_layer_change) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_cyan();
+    rgblight_sethsv_noeeprom(HSV_CYAN);
     rgblight_mode_noeeprom(1);
   }
 }
@@ -231,39 +231,39 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   switch (get_highest_layer(state)) {
     case SYMB:
         ergodox_right_led_1_on();
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_red(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(1); }
         break;
     case MDIA:
         ergodox_right_led_2_on();
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_green(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_GREEN); rgblight_mode_noeeprom(1); }
         break;
     case 3:
         ergodox_right_led_3_on();
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_blue(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_BLUE); rgblight_mode_noeeprom(1); }
         break;
     case 4:
         ergodox_right_led_1_on();
         ergodox_right_led_2_on();
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_orange(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_ORANGE); rgblight_mode_noeeprom(1); }
         break;
     case 5:
         ergodox_right_led_1_on();
         ergodox_right_led_3_on();
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_yellow(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_YELLOW); rgblight_mode_noeeprom(1); }
         break;
     case 6:
         ergodox_right_led_2_on();
         ergodox_right_led_3_on();
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_pink(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_PINK); rgblight_mode_noeeprom(1); }
         break;
     case 7:
         ergodox_right_led_1_on();
         ergodox_right_led_2_on();
         ergodox_right_led_3_on();
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_white(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_WHITE); rgblight_mode_noeeprom(1); }
         break;
     default: //  for any other layers, or the default layer
-        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_cyan(); rgblight_mode_noeeprom(1); }
+        if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); }
         break;
     }
   return state;
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
index 3cdc3e0026..0aa6e56a06 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
@@ -227,6 +227,6 @@ void keyboard_post_init_user(void) {
   //rgblight_config.val    = 255;
   rgblight_enable_noeeprom(); // enables Rgb, without saving settings
   rgblight_sethsv_noeeprom(100, 255, 255); // sets the color to greenish without saving
-  //rgblight_sethsv_noeeprom_turquoise();
+  //rgblight_sethsv_noeeprom(HSV_TURQUOISE);
 
 }
\ No newline at end of file
diff --git a/keyboards/handwired/onekey/keymaps/apa102/keymap.c b/keyboards/handwired/onekey/keymaps/apa102/keymap.c
index 700755a452..8b4191fb28 100644
--- a/keyboards/handwired/onekey/keymaps/apa102/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/apa102/keymap.c
@@ -9,6 +9,6 @@ void keyboard_post_init_user(void) {
     apa102_set_brightness(5);
 
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_cyan();
+    rgblight_sethsv_noeeprom(HSV_CYAN);
     rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
 }
diff --git a/keyboards/handwired/onekey/keymaps/rgb/keymap.c b/keyboards/handwired/onekey/keymaps/rgb/keymap.c
index c3e77f1ec1..c99eb86339 100644
--- a/keyboards/handwired/onekey/keymaps/rgb/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/rgb/keymap.c
@@ -6,6 +6,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void keyboard_post_init_user(void) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_cyan();
+    rgblight_sethsv_noeeprom(HSV_CYAN);
     rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
 }
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
index 80d0392ffb..5cb34887c0 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
@@ -9,14 +9,14 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
     switch (get_highest_layer(state)) {
         case L_EDVORAKJP_LOWER:
-            rgblight_sethsv_noeeprom_red();
+            rgblight_sethsv_noeeprom(HSV_RED);
             break;
         case L_EDVORAKJP_RAISE:
-            rgblight_sethsv_noeeprom_green();
+            rgblight_sethsv_noeeprom(HSV_GREEN);
             break;
         default:  //  for any other layers, or the default layer
             rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
-            rgblight_sethsv_red();
+            rgblight_sethsv(HSV_RED);
             break;
     }
     return state;
diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c
index a3b19521a0..a5148f97e1 100644
--- a/keyboards/hub16/keymaps/ahk_companion/keymap.c
+++ b/keyboards/hub16/keymaps/ahk_companion/keymap.c
@@ -165,5 +165,5 @@ void matrix_scan_user(void) {
 //EEPROM Reset Function
 void eeconfig_init_user(void) {
   rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv_orange();  // Set it to orange by default
+  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
 }
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c
index 8979eef165..dac88c8482 100644
--- a/keyboards/hub16/keymaps/peepeetee/keymap.c
+++ b/keyboards/hub16/keymaps/peepeetee/keymap.c
@@ -205,5 +205,5 @@ void matrix_scan_user(void) {
 //EEPROM Reset Function
 void eeconfig_init_user(void) {
   rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv_orange();  // Set it to orange by default
+  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
 }
diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
index 320d38ea71..61552499bd 100644
--- a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
@@ -47,16 +47,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
     case WINDOWS_LAYER:
-        rgblight_setrgb_blue();
+        rgblight_setrgb(RGB_BLUE);
         break;
     case WINDOWS_FN_LAYER:
-        rgblight_setrgb_blue();
+        rgblight_setrgb(RGB_BLUE);
         break;
     case MAC_LAYER:
-        rgblight_setrgb_white();
+        rgblight_setrgb(RGB_WHITE);
         break;
     case MAC_FN_LAYER:
-        rgblight_setrgb_white();
+        rgblight_setrgb(RGB_WHITE)
         break;
     default:
         rgblight_setrgb (0x00,  0xFF, 0xFF);
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
index d0df36b5f9..e593051db8 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
@@ -57,14 +57,14 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
     switch (get_highest_layer(state)) {
         case L_EDVORAKJP_LOWER:
-            rgblight_sethsv_noeeprom_red();
+            rgblight_sethsv_noeeprom(HSV_RED);
             break;
         case L_EDVORAKJP_RAISE:
-            rgblight_sethsv_noeeprom_green();
+            rgblight_sethsv_noeeprom(HSV_GREEN);
             break;
         default:  // for any other layers, or the default layer
             rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
-            rgblight_sethsv_red();
+            rgblight_sethsv(HSV_RED);
             break;
     }
     return state;
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/README.md b/keyboards/keebio/levinson/keymaps/issmirnov/README.md
index 1e03e58e71..b6a94c6c3d 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/README.md
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/README.md
@@ -4,7 +4,7 @@
 
 - https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgblight.md
   - main docs.
-- https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h
+- https://github.com/qmk/qmk_firmware/blob/master/quantum/color.h
   - list of colors
 - https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight.h
   - list of functions for RGB manipulation
diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c
index 3695731353..0b123bb8d2 100644
--- a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c
+++ b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c
@@ -11,13 +11,13 @@ layer_state_t layer_state_set_rgb(layer_state_t state) {
       rgblight_sethsv_noeeprom(RGB_CLEAR);
       break;
     case _SYMB:
-      rgblight_sethsv_noeeprom_red();
+      rgblight_sethsv_noeeprom(HSV_RED);
       break;
     case _NUMP:
-      rgblight_sethsv_noeeprom_green();
+      rgblight_sethsv_noeeprom(HSV_GREEN);
       break;
     case _OVERWATCH:
-      rgblight_sethsv_noeeprom_blue();
+      rgblight_sethsv_noeeprom(HSV_BLUE);
       // TODO set up animated rainbow swirl with overwatch colors.
       // rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
       // rgblight_effect_breathing(&animation_status);
@@ -47,7 +47,7 @@ void matrix_scan_rgb(void) {
 void set_rgb_indicators(uint8_t this_mod, uint8_t this_osm) {
   if (get_highest_layer(layer_state) == _QWERTY) {
     if ((this_mod | this_osm) & MOD_MASK_SHIFT) {
-      rgblight_setrgb_gold_at(SHFT_LED1);
+      rgblight_setrgb_at(RGB_GOLD, SHFT_LED1);
     } else {
       rgblight_setrgb_at(RGB_CLEAR, SHFT_LED1);
     }
diff --git a/keyboards/ktec/staryu/keymaps/default/keymap.c b/keyboards/ktec/staryu/keymaps/default/keymap.c
index c41c436f9d..0769227c6c 100755
--- a/keyboards/ktec/staryu/keymaps/default/keymap.c
+++ b/keyboards/ktec/staryu/keymaps/default/keymap.c
@@ -78,26 +78,26 @@ void eeconfig_init_user(void) {
 
 void keyboard_post_init_user(void) {
   //layer_state_set_user is not called for inital state - set it here
-  rgblight_sethsv_noeeprom_white();
+  rgblight_sethsv_noeeprom(HSV_WHITE);
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
   switch (get_highest_layer(state)) {
     case _LAYER1:
-        rgblight_sethsv_noeeprom_cyan();
+        rgblight_sethsv_noeeprom(HSV_CYAN);
         break;
     case _LAYER2:
-        rgblight_sethsv_noeeprom_magenta();
+        rgblight_sethsv_noeeprom(HSV_MAGENTA);
         break;
     case _LAYER3:
-        rgblight_sethsv_noeeprom_red();
+        rgblight_sethsv_noeeprom(HSV_RED);
         break;
     case _LAYER4:
-        rgblight_sethsv_noeeprom_orange();
+        rgblight_sethsv_noeeprom(HSV_ORANGE);
         break;
     case _LAYER0:
     default: //  for any other layers, or the default layer
-        rgblight_sethsv_noeeprom_white();
+        rgblight_sethsv_noeeprom(HSV_WHITE);
         break;
     }
   return state;
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
index 7afbb8cd08..94f66e78b2 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
@@ -67,7 +67,7 @@ bool led_update_user(led_t led_state) {
             // this is needed so that upon disabling num lock, the leds don't stay red 
             rgblight_sethsv_at(rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val(), numer_leds[i]); 
         else
-            rgblight_setrgb_red_at(numer_leds[i]); // set to red
+            rgblight_setrgb_at(RGB_RED, numer_leds[i]); // set to red
 
     return true;
 }
diff --git a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
index 287e85f924..10ed423186 100644
--- a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
+++ b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ bool led_update_user(led_t led_state) {
     static uint8_t caps_state = 0;
     if (caps_state != led_state.caps_lock) {
         if (led_state.caps_lock) {
-            rgblight_sethsv_noeeprom_cyan();
+            rgblight_sethsv_noeeprom(HSV_CYAN);
             rgblight_mode_noeeprom(1);
         } else {
             rgblight_sethsv_noeeprom(5, 255, 255);
diff --git a/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c b/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c
index 1446ad8cf4..d3b9987bd8 100644
--- a/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c
+++ b/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c
@@ -46,16 +46,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void keyboard_post_init_user(void) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_teal();
+    rgblight_sethsv(HSV_TEAL);
 }
 
 layer_state_t layer_state_set_keymap(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case 1:
-            rgblight_sethsv_noeeprom_magenta();
+            rgblight_sethsv_noeeprom(HSV_MAGENTA);
             break;
         default: //  for any other layers, or the default layer
-            rgblight_sethsv_noeeprom_teal();
+            rgblight_sethsv_noeeprom(HSV_TEAL);
             break;
     }
     return state;
diff --git a/keyboards/percent/canoe/keymaps/dhertz/keymap.c b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
index b6785f963c..bd948327d5 100644
--- a/keyboards/percent/canoe/keymaps/dhertz/keymap.c
+++ b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
@@ -46,16 +46,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void keyboard_post_init_user(void) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_teal();
+    rgblight_sethsv(HSV_TEAL);
 }
 
 layer_state_t layer_state_set_keymap(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case 1:
-            rgblight_sethsv_noeeprom_magenta();
+            rgblight_sethsv_noeeprom(HSV_MAGENTA);
             break;
         default: //  for any other layers, or the default layer
-            rgblight_sethsv_noeeprom_cyan();
+            rgblight_sethsv_noeeprom(HSV_CYAN);
             break;
     }
     return state;
diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c
index ac590116ab..85707be9d6 100644
--- a/keyboards/redox/keymaps/jeherve/keymap.c
+++ b/keyboards/redox/keymaps/jeherve/keymap.c
@@ -249,19 +249,19 @@ void persistent_default_layer_set(uint16_t default_layer) {
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case _SYMB:
-            rgblight_setrgb_orange();
+            rgblight_setrgb(RGB_ORANGE);
             break;
         case _NAV:
-            rgblight_setrgb_springgreen();
+            rgblight_setrgb(RGB_SPRINGGREEN);
             break;
         case _INTER:
-            rgblight_setrgb_teal();
+            rgblight_setrgb(RGB_TEAL);
             break;
         case _ADJUST:
-            rgblight_setrgb_red();
+            rgblight_setrgb(RGB_RED);
             break;
         default:  //  for any other layers, or the default layer
-            rgblight_setrgb_yellow();
+            rgblight_setrgb(RGB_YELLOW);
             break;
     }
     return state;
diff --git a/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
index 33a5428fe4..500fddd53f 100755
--- a/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
@@ -84,11 +84,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       uint8_t num = rand() / (RAND_MAX / NUM_ANSWERS + 1);
       rgblight_mode(1);
       if (num < UNCERTAIN_BREAK) {
-        rgblight_setrgb_green();
+        rgblight_setrgb(RGB_GREEN);
       } else if (num < NO_BREAK) {
-        rgblight_setrgb_yellow();
+        rgblight_setrgb(RGB_YELLOW);
       } else {
-        rgblight_setrgb_red();
+        rgblight_setrgb(RGB_RED);
       }
       send_string(ANSWERS[num]);
       lastTime = timer_read32();
@@ -135,6 +135,6 @@ void led_set_user(uint8_t usb_led) {
 void reset_rgb(void) {
   // This gets called on init and after the timeout for the answer color
   // If you want to change the default color/mode, do it here
-  rgblight_sethsv_blue();
+  rgblight_sethsv(HSV_BLUE);
   rgblight_mode(7);
 }
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
index 2ef38e25b5..6d7b52439d 100644
--- a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
@@ -282,9 +282,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 //Define layer colors
-#define rgblight_setrgb_user_MAIN()  rgblight_sethsv_red()
-#define rgblight_setrgb_user_LY1()  rgblight_sethsv_green()
-#define rgblight_setrgb_user_LY2() rgblight_sethsv_blue()
+#define rgblight_setrgb_user_MAIN()  rgblight_sethsv(HSV_RED)
+#define rgblight_setrgb_user_LY1()  rgblight_sethsv(HSV_GREEN)
+#define rgblight_setrgb_user_LY2() rgblight_sethsv(HSV_BLUE)
 
 void matrix_init_user(void) {
   rgblight_enable();
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index 52aeaa0a19..d7f8b044e3 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -162,14 +162,14 @@ LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,_______
 
 //Define layer colors
 #define rgblight_setrgb_user_base()  rgblight_sethsv(325,255,255)
-#define rgblight_setrgb_user_LYFK()  rgblight_sethsv_red()
-#define rgblight_setrgb_user_LYMED() rgblight_sethsv_blue()
-#define rgblight_setrgb_user_LYNUM() rgblight_sethsv_purple()
-#define rgblight_setrgb_user_LYNAV() rgblight_sethsv_cyan()
-#define rgblight_setrgb_user_LYMOS() rgblight_sethsv_orange()
-#define rgblight_setrgb_user_LYSYS() rgblight_sethsv_green()
-#define rgblight_setrgb_user_LYLT()  rgblight_sethsv_yellow()
-#define rgblight_setrgb_user_LYMD()  rgblight_sethsv_white()
+#define rgblight_setrgb_user_LYFK()  rgblight_sethsv(HSV_RED)
+#define rgblight_setrgb_user_LYMED() rgblight_sethsv(HSV_BLUE)
+#define rgblight_setrgb_user_LYNUM() rgblight_sethsv(HSV_PURPLE)
+#define rgblight_setrgb_user_LYNAV() rgblight_sethsv(HSV_CYAN)
+#define rgblight_setrgb_user_LYMOS() rgblight_sethsv(HSV_ORANGE)
+#define rgblight_setrgb_user_LYSYS() rgblight_sethsv(HSV_GREEN)
+#define rgblight_setrgb_user_LYLT()  rgblight_sethsv(HSV_YELLOW)
+#define rgblight_setrgb_user_LYMD()  rgblight_sethsv(HSV_WHITE)
 
 //initialize rgb
 void matrix_init_user(void) {
diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
index d0071205af..34b410ce57 100644
--- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
+++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
@@ -51,7 +51,7 @@ const uint8_t rgb_keymaps [][RGB_MATRIX_LED_COUNT] = {
 };
 
 static void led_color_set(uint8_t index, uint8_t color_patterns) {
-    HSV hsv = rgb_matrix_config.hsv; // 'quantum/rgblight_list.h'
+    HSV hsv = rgb_matrix_config.hsv; // 'quantum/color.h'
     RGB rgb_white = hsv_to_rgb(_HSV(  0,   0, hsv.v)); // HSV_WHITE
     RGB rgb_indc1 = hsv_to_rgb(_HSV(128, 255, hsv.v)); // HSV_TEAL
     RGB rgb_indc2 = hsv_to_rgb(_HSV(191, 255, hsv.v)); // HSV_PURPLE
diff --git a/layouts/community/numpad_5x6/bjohnson/keymap.c b/layouts/community/numpad_5x6/bjohnson/keymap.c
index dc6b939e5f..71c8829d02 100644
--- a/layouts/community/numpad_5x6/bjohnson/keymap.c
+++ b/layouts/community/numpad_5x6/bjohnson/keymap.c
@@ -37,9 +37,9 @@ void keyboard_post_init_user(void) {
 
 void led_set_user(uint8_t usb_led) {
   if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-    rgblight_sethsv_noeeprom_cyan();
+    rgblight_sethsv_noeeprom(HSV_CYAN);
   } else {
-    rgblight_sethsv_noeeprom_magenta();
+    rgblight_sethsv_noeeprom(HSV_MAGENTA);
   }
 }
 
@@ -47,6 +47,6 @@ void shutdown_user (void) {
   #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_setrgb_red();
+    rgblight_setrgb(RGB_RED);
   #endif // RGBLIGHT_ENABLE
 }
diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h
index a08b9a7b6b..46e8e07212 100644
--- a/quantum/rgblight/rgblight.h
+++ b/quantum/rgblight/rgblight.h
@@ -181,7 +181,6 @@ enum RGBLIGHT_EFFECT_MODE {
 #include "eeconfig.h"
 #include "ws2812.h"
 #include "color.h"
-#include "rgblight_list.h"
 
 #ifdef RGBLIGHT_LAYERS
 typedef struct {
diff --git a/quantum/rgblight/rgblight_list.h b/quantum/rgblight/rgblight_list.h
deleted file mode 100644
index 0fd68b75f3..0000000000
--- a/quantum/rgblight/rgblight_list.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "color.h"
-
-/*
-########################################################################################
-##                                                                                    ##
-##                                                                                    ##
-##                                                                                    ##
-##  The functions below have been deprecated and may be removed in a future release.  ##
-##                                                                                    ##
-##              Please use the values in color.h with the RGB functions.              ##
-##                                                                                    ##
-##                                                                                    ##
-##                                                                                    ##
-########################################################################################
-*/
-
-/*                            SET RGB List                            */
-#define rgblight_setrgb_white() rgblight_setrgb(RGB_WHITE)
-#define rgblight_setrgb_red() rgblight_setrgb(RGB_RED)
-#define rgblight_setrgb_coral() rgblight_setrgb(RGB_CORAL)
-#define rgblight_setrgb_orange() rgblight_setrgb(RGB_ORANGE)
-#define rgblight_setrgb_goldenrod() rgblight_setrgb(RGB_GOLDENROD)
-#define rgblight_setrgb_gold() rgblight_setrgb(RGB_GOLD)
-#define rgblight_setrgb_yellow() rgblight_setrgb(RGB_YELLOW)
-#define rgblight_setrgb_chartreuse() rgblight_setrgb(RGB_CHARTREUSE)
-#define rgblight_setrgb_green() rgblight_setrgb(RGB_GREEN)
-#define rgblight_setrgb_springgreen() rgblight_setrgb(RGB_SPRINGGREEN)
-#define rgblight_setrgb_turquoise() rgblight_setrgb(RGB_TURQUOISE)
-#define rgblight_setrgb_teal() rgblight_setrgb(RGB_TEAL)
-#define rgblight_setrgb_cyan() rgblight_setrgb(RGB_CYAN)
-#define rgblight_setrgb_azure() rgblight_setrgb(RGB_AZURE)
-#define rgblight_setrgb_blue() rgblight_setrgb(RGB_BLUE)
-#define rgblight_setrgb_purple() rgblight_setrgb(RGB_PURPLE)
-#define rgblight_setrgb_magenta() rgblight_setrgb(RGB_MAGENTA)
-#define rgblight_setrgb_pink() rgblight_setrgb(RGB_PINK)
-
-/*                            SET RGB List                            */
-#define rgblight_setrgb_white_at(at) rgblight_setrgb_at(RGB_WHITE, at)
-#define rgblight_setrgb_red_at(at) rgblight_setrgb_at(RGB_RED, at)
-#define rgblight_setrgb_coral_at(at) rgblight_setrgb_at(RGB_CORAL, at)
-#define rgblight_setrgb_orange_at(at) rgblight_setrgb_at(RGB_ORANGE at)
-#define rgblight_setrgb_goldenrod_at(at) rgblight_setrgb_at(RGB_GOLDENROD, at)
-#define rgblight_setrgb_gold_at(at) rgblight_setrgb_at(RGB_GOLD, at)
-#define rgblight_setrgb_yellow_at(at) rgblight_setrgb_at(RGB_YELLOW, at)
-#define rgblight_setrgb_chartreuse_at(at) rgblight_setrgb_at(RGB_CHARTREUSE, at)
-#define rgblight_setrgb_green_at(at) rgblight_setrgb_at(RGB_GREEN, at)
-#define rgblight_setrgb_springgreen_at(at) rgblight_setrgb_at(RGB_SPRINGGREEN, at)
-#define rgblight_setrgb_turquoise_at(at) rgblight_setrgb_at(RGB_TURQUOISE, at)
-#define rgblight_setrgb_teal_at(at) rgblight_setrgb_at(RGB_TEAL, at)
-#define rgblight_setrgb_cyan_at(at) rgblight_setrgb_at(RGB_CYAN, at)
-#define rgblight_setrgb_azure_at(at) rgblight_setrgb_at(RGB_AZURE, at)
-#define rgblight_setrgb_blue_at(at) rgblight_setrgb_at(RGB_BLUE, at)
-#define rgblight_setrgb_purple_at(at) rgblight_setrgb_at(RGB_PURPLE, at)
-#define rgblight_setrgb_magenta_at(at) rgblight_setrgb_at(RGB_MAGENTA, at)
-#define rgblight_setrgb_pink_at(at) rgblight_setrgb_at(RGB_PINK, at)
-
-/*                            SET HSV List                            */
-#define rgblight_sethsv_white() rgblight_sethsv(HSV_WHITE)
-#define rgblight_sethsv_red() rgblight_sethsv(HSV_RED)
-#define rgblight_sethsv_coral() rgblight_sethsv(HSV_CORAL)
-#define rgblight_sethsv_orange() rgblight_sethsv(HSV_ORANGE)
-#define rgblight_sethsv_goldenrod() rgblight_sethsv(HSV_GOLDENROD)
-#define rgblight_sethsv_gold() rgblight_sethsv(HSV_GOLD)
-#define rgblight_sethsv_yellow() rgblight_sethsv(HSV_YELLOW)
-#define rgblight_sethsv_chartreuse() rgblight_sethsv(HSV_CHARTREUSE)
-#define rgblight_sethsv_green() rgblight_sethsv(HSV_GREEN)
-#define rgblight_sethsv_springgreen() rgblight_sethsv(HSV_SPRINGGREEN)
-#define rgblight_sethsv_turquoise() rgblight_sethsv(HSV_TURQUOISE)
-#define rgblight_sethsv_teal() rgblight_sethsv(HSV_TEAL)
-#define rgblight_sethsv_cyan() rgblight_sethsv(HSV_CYAN)
-#define rgblight_sethsv_azure() rgblight_sethsv(HSV_AZURE)
-#define rgblight_sethsv_blue() rgblight_sethsv(HSV_BLUE)
-#define rgblight_sethsv_purple() rgblight_sethsv(HSV_PURPLE)
-#define rgblight_sethsv_magenta() rgblight_sethsv(HSV_MAGENTA)
-#define rgblight_sethsv_pink() rgblight_sethsv(HSV_PINK)
-
-/*                            SET HSV List                            */
-/*   If you're doing layer indication, this is best, as it won't      */
-/*   write to the eeprom, since it's limited (very high value).       */
-/*   If you want to use modes with this (since you can), then you     */
-/*   want to use rgblight_mode_noeeprom(x) instead.                   */
-#define rgblight_sethsv_noeeprom_white() rgblight_sethsv_noeeprom(HSV_WHITE)
-#define rgblight_sethsv_noeeprom_red() rgblight_sethsv_noeeprom(HSV_RED)
-#define rgblight_sethsv_noeeprom_coral() rgblight_sethsv_noeeprom(HSV_CORAL)
-#define rgblight_sethsv_noeeprom_orange() rgblight_sethsv_noeeprom(HSV_ORANGE)
-#define rgblight_sethsv_noeeprom_goldenrod() rgblight_sethsv_noeeprom(HSV_GOLDENROD)
-#define rgblight_sethsv_noeeprom_gold() rgblight_sethsv_noeeprom(HSV_GOLD)
-#define rgblight_sethsv_noeeprom_yellow() rgblight_sethsv_noeeprom(HSV_YELLOW)
-#define rgblight_sethsv_noeeprom_chartreuse() rgblight_sethsv_noeeprom(HSV_CHARTREUSE)
-#define rgblight_sethsv_noeeprom_green() rgblight_sethsv_noeeprom(HSV_GREEN)
-#define rgblight_sethsv_noeeprom_springgreen() rgblight_sethsv_noeeprom(HSV_SPRINGGREEN)
-#define rgblight_sethsv_noeeprom_turquoise() rgblight_sethsv_noeeprom(HSV_TURQUOISE)
-#define rgblight_sethsv_noeeprom_teal() rgblight_sethsv_noeeprom(HSV_TEAL)
-#define rgblight_sethsv_noeeprom_cyan() rgblight_sethsv_noeeprom(HSV_CYAN)
-#define rgblight_sethsv_noeeprom_azure() rgblight_sethsv_noeeprom(HSV_AZURE)
-#define rgblight_sethsv_noeeprom_blue() rgblight_sethsv_noeeprom(HSV_BLUE)
-#define rgblight_sethsv_noeeprom_purple() rgblight_sethsv_noeeprom(HSV_PURPLE)
-#define rgblight_sethsv_noeeprom_magenta() rgblight_sethsv_noeeprom(HSV_MAGENTA)
-#define rgblight_sethsv_noeeprom_pink() rgblight_sethsv_noeeprom(HSV_PINK)
-
-/*                            SET HSV List                            */
-#define rgblight_sethsv_white_at(at) rgblight_sethsv_at(HSV_WHITE, at)
-#define rgblight_sethsv_red_at(at) rgblight_sethsv_at(HSV_RED, at)
-#define rgblight_sethsv_coral_at(at) rgblight_sethsv_at(HSV_CORAL, at)
-#define rgblight_sethsv_orange_at(at) rgblight_sethsv_at(HSV_ORANGE, at)
-#define rgblight_sethsv_goldenrod_at(at) rgblight_sethsv_at(HSV_GOLDENROD, at)
-#define rgblight_sethsv_gold_at(at) rgblight_sethsv_at(HSV_GOLD, at)
-#define rgblight_sethsv_yellow_at(at) rgblight_sethsv_at(HSV_YELLOW, at)
-#define rgblight_sethsv_chartreuse_at(at) rgblight_sethsv_at(HSV_CHARTREUSE, at)
-#define rgblight_sethsv_green_at(at) rgblight_sethsv_at(HSV_GREEN, at)
-#define rgblight_sethsv_springgreen_at(at) rgblight_sethsv_at(HSV_SPRINGGREEN, at)
-#define rgblight_sethsv_turquoise_at(at) rgblight_sethsv_at(HSV_TURQUOISE, at)
-#define rgblight_sethsv_teal_at(at) rgblight_sethsv_at(HSV_TEAL, at)
-#define rgblight_sethsv_cyan_at(at) rgblight_sethsv_at(HSV_CYAN, at)
-#define rgblight_sethsv_azure_at(at) rgblight_sethsv_at(HSV_AZURE, at)
-#define rgblight_sethsv_blue_at(at) rgblight_sethsv_at(HSV_BLUE, at)
-#define rgblight_sethsv_purple_at(at) rgblight_sethsv_at(HSV_PURPLE, at)
-#define rgblight_sethsv_magenta_at(at) rgblight_sethsv_at(HSV_MAGENTA, at)
-#define rgblight_sethsv_pink_at(at) rgblight_sethsv_at(HSV_PINK, at)
diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h
index 7c8b2923fc..cf9b681de6 100644
--- a/users/brandonschlack/rgb_theme.h
+++ b/users/brandonschlack/rgb_theme.h
@@ -17,7 +17,6 @@
 
 #include "brandonschlack.h"
 #include "color.h"
-#include "rgblight_list.h"
 
 /*TODO Update as RGBLIGHT Mode */
 #ifndef RGB_THEME_COLORS_MAX
diff --git a/users/curry/curry.c b/users/curry/curry.c
index a9f9f79870..f29b9c3ff7 100644
--- a/users/curry/curry.c
+++ b/users/curry/curry.c
@@ -58,7 +58,7 @@ void shutdown_user(void) {
 #if defined(RGBLIGHT_ENABLE)
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(1);
-    rgblight_setrgb_red();
+    rgblight_setrgb(RGB_RED);
 #endif
 
 #if defined(RGB_MATRIX_ENABLE)
diff --git a/users/greatwizard/underglow.c b/users/greatwizard/underglow.c
index db31290acd..c23fb5bc51 100644
--- a/users/greatwizard/underglow.c
+++ b/users/greatwizard/underglow.c
@@ -22,7 +22,7 @@ void keyboard_post_init_rgb(void) {
         return;
     }
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_orange();
+    rgblight_sethsv_noeeprom(HSV_ORANGE);
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
 }
 
@@ -64,31 +64,31 @@ layer_state_t layer_state_set_rgb(layer_state_t state) {
 #ifdef LAYERS_PROGRAMMER
         case _PROGRAMMER_SHIFTED:
 #endif
-            rgblight_sethsv_noeeprom_orange();
+            rgblight_sethsv_noeeprom(HSV_ORANGE);
             break;
 #ifdef LAYERS_ORTHO
         case _LOWER:
-            rgblight_sethsv_noeeprom_red();
+            rgblight_sethsv_noeeprom(HSV_RED);
             break;
         case _RAISE:
-            rgblight_sethsv_noeeprom_blue();
+            rgblight_sethsv_noeeprom(HSV_BLUE);
             break;
         case _ADJUST:
-            rgblight_sethsv_noeeprom_purple();
+            rgblight_sethsv_noeeprom(HSV_PURPLE);
             break;
 #endif
 #ifdef LAYER_FN
         case _FN:
-            rgblight_sethsv_noeeprom_chartreuse();
+            rgblight_sethsv_noeeprom(HSV_CHARTREUSE);
             break;
 #endif
 #ifdef LAYER_GIT
         case _GIT:
-            rgblight_sethsv_noeeprom_teal();
+            rgblight_sethsv_noeeprom(HSV_TEAL);
             break;
 #endif
         default:
-            rgblight_sethsv_noeeprom_white();
+            rgblight_sethsv_noeeprom(HSV_WHITE);
             break;
     }
     return state;
diff --git a/users/kuchosauronad0/kuchosauronad0.c b/users/kuchosauronad0/kuchosauronad0.c
index 820d84daad..4e9e856107 100644
--- a/users/kuchosauronad0/kuchosauronad0.c
+++ b/users/kuchosauronad0/kuchosauronad0.c
@@ -69,7 +69,7 @@ void shutdown_user (void) {
   #ifdef RGBLIGHT_ENABLE
     rgblight_enable_noeeprom();
     rgblight_mode_noeeprom(1);
-    rgblight_setrgb_teal();
+    rgblight_setrgb(RGB_TEAL);
   #endif // RGBLIGHT_ENABLE
   #ifdef RGB_MATRIX_ENABLE
     // uint16_t timer_start = timer_read();
diff --git a/users/kuchosauronad0/leader.c b/users/kuchosauronad0/leader.c
index 22674eef05..ac2a6599a1 100644
--- a/users/kuchosauronad0/leader.c
+++ b/users/kuchosauronad0/leader.c
@@ -97,7 +97,7 @@ void leader_start(void) {
 #ifdef RGBLIGHT_ENABLE
  rgblight_savebase();
  rgblight_mode_noeeprom(1);
- rgblight_sethsv_noeeprom_goldenrod();
+ rgblight_sethsv_noeeprom(HSV_GOLDENROD);
 #endif
 }
 
diff --git a/users/kuchosauronad0/rgblight_user.c b/users/kuchosauronad0/rgblight_user.c
index feea0c412f..77a8ac6df8 100644
--- a/users/kuchosauronad0/rgblight_user.c
+++ b/users/kuchosauronad0/rgblight_user.c
@@ -86,36 +86,36 @@ layer_state_t layer_state_set_rgb(layer_state_t state) {
   if (userspace_config.rgb_layer_change) {
     switch (get_highest_layer(state)) {  // _RAISE, _LOWER and _ADJUST use a custom color and the breathing effect
       case _RAISE:
-        rgblight_sethsv_noeeprom_green();
+        rgblight_sethsv_noeeprom(HSV_GREEN);
         rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
         break;
       case _LOWER:
-        rgblight_sethsv_noeeprom_red();
+        rgblight_sethsv_noeeprom(HSV_RED);
         rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
         break;
       case _ADJUST:
-        rgblight_sethsv_noeeprom_white();
+        rgblight_sethsv_noeeprom(HSV_WHITE);
         rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 2);
         break;
       default:  // Use a solid color for normal layers
         switch (get_highest_layer(default_layer_state)) {
           case _QWERTY:
-            rgblight_sethsv_noeeprom_magenta();
+            rgblight_sethsv_noeeprom(HSV_MAGENTA);
             break;
           case _COLEMAK:
-            rgblight_sethsv_noeeprom_green();
+            rgblight_sethsv_noeeprom(HSV_GREEN);
             break;
           case _DVORAK:
-            rgblight_sethsv_noeeprom_blue();
+            rgblight_sethsv_noeeprom(HSV_BLUE);
             break;
           case _WORKMAN:
-            rgblight_sethsv_noeeprom_goldenrod();
+            rgblight_sethsv_noeeprom(HSV_GOLDENROD);
             break;
           case _PLOVER:
-            rgblight_sethsv_noeeprom_pink();
+            rgblight_sethsv_noeeprom(HSV_PINK);
             break;
           default:
-            rgblight_sethsv_noeeprom_white();
+            rgblight_sethsv_noeeprom(HSV_WHITE);
             break;
         }
         get_highest_layer(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);  // if _MODS layer is on, then breath to denote it
diff --git a/users/peej/peej.c b/users/peej/peej.c
index c4ea4f87b1..bd9264ea60 100644
--- a/users/peej/peej.c
+++ b/users/peej/peej.c
@@ -57,7 +57,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 #ifdef RGBLIGHT_ENABLE
                     rgblight_enable_noeeprom();
                     rgblight_mode_noeeprom(1);
-                    rgblight_setrgb_red();
+                    rgblight_setrgb(RGB_RED);
                 #endif
                 reset_keyboard();
                 break;
diff --git a/users/twschum/twschum.c b/users/twschum/twschum.c
index 7f1cb3de78..f0ae1e65a9 100644
--- a/users/twschum/twschum.c
+++ b/users/twschum/twschum.c
@@ -97,7 +97,6 @@ static inline bool tap_ctrl_other_pressed(void) {
 /* Use RGB underglow to indicate layer
  * https://docs.qmk.fm/reference/customizing-functionality
  */
-// add to quantum/rgblight_list.h
 #ifdef RGBLIGHT_ENABLE
 static bool rgb_layers_enabled = true;
 static bool rgb_L0_enabled = false;
diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c
index aa7b1c9a4c..b056f5dd96 100644
--- a/users/wanleg/wanleg.c
+++ b/users/wanleg/wanleg.c
@@ -129,7 +129,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 		  #if defined(RGBLIGHT_ENABLE)
 		  rgblight_enable_noeeprom(); // enables Rgb, without saving settings
 		  rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-		  rgblight_sethsv_noeeprom_red();
+		  rgblight_sethsv_noeeprom(HSV_RED);
 		  #endif
       }
       return true; // Let QMK send the press/release events as normal

From 6514c25ca6dac80e642186b58d4dde4b96c486db Mon Sep 17 00:00:00 2001
From: weimao <luanty@163.com>
Date: Fri, 28 Oct 2022 18:48:08 +0800
Subject: [PATCH 761/959] Docs: fix a typo (#18896)

---
 docs/feature_rgb_matrix.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 31f0a2cbc5..c5d473ef2a 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -560,7 +560,7 @@ enum rgb_matrix_effects {
     RGB_MATRIX_CYCLE_UP_DOWN,       // Full gradient scrolling top to bottom
     RGB_MATRIX_CYCLE_OUT_IN,        // Full gradient scrolling out to in
     RGB_MATRIX_CYCLE_OUT_IN_DUAL,   // Full dual gradients scrolling out to in
-    RGB_MATRIX_RAINBOW_MOVING_CHEVRON,  // Full gradent Chevron shapped scrolling left to right
+    RGB_MATRIX_RAINBOW_MOVING_CHEVRON,  // Full gradient Chevron shapped scrolling left to right
     RGB_MATRIX_CYCLE_PINWHEEL,      // Full gradient spinning pinwheel around center of keyboard
     RGB_MATRIX_CYCLE_SPIRAL,        // Full gradient spinning spiral around center of keyboard
     RGB_MATRIX_DUAL_BEACON,         // Full gradient spinning around center of keyboard

From 2ff1d852909daaaf94433fab202e7bf94274d67b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 28 Oct 2022 22:21:24 +1100
Subject: [PATCH 762/959] Normalise Autocorrect keycodes (#18893)

---
 docs/feature_autocorrect.md                   | 14 +++++++-------
 docs/keycodes.md                              | 10 ++++++++++
 quantum/process_keycode/process_autocorrect.c |  8 ++++----
 quantum/quantum_keycodes.h                    | 12 ++++++------
 users/drashna/keyrecords/process_records.h    |  2 +-
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/docs/feature_autocorrect.md b/docs/feature_autocorrect.md
index 480131e5fc..e042027c0f 100644
--- a/docs/feature_autocorrect.md
+++ b/docs/feature_autocorrect.md
@@ -22,7 +22,7 @@ AUTOCORRECT_ENABLE = yes
 
 Additionally, you will need a library for autocorrection.  A small sample library is included by default, so that you can get up and running right away, but you can provide a customized library.
 
-By default, autocorrect is disabled.  To enable it, you need to use the `AUTOCORRECT_TOGGLE` keycode to enable it. The status is stored in persistent memory, so you shouldn't need to enabled it again.
+By default, autocorrect is disabled.  To enable it, you need to use the `AC_TOGG` keycode to enable it. The status is stored in persistent memory, so you shouldn't need to enabled it again.
 
 ## Customizing autocorrect library :id=customizing-autocorrect-library
 
@@ -94,15 +94,15 @@ Occasionally you might actually want to type a typo (for instance, while editing
 
 This works because the autocorrection implementation doesn’t understand hotkeys, so it resets itself whenever a modifier other than shift is held.
 
-Additionally, you can use the `AUTOCORRECT_TOGGLE` keycode to toggle the on/off status for Autocorrect.
+Additionally, you can use the `AC_TOGG` keycode to toggle the on/off status for Autocorrect.
 
 ### Keycodes :id=keycodes
 
-|Keycode              | Short keycode | Description                                    |
-|---------------------|---------------|------------------------------------------------|
-|`AUTOCORRECT_ON`     | `CRT_ON`      | Turns on the Autocorrect feature.              |
-|`AUTOCORRECT_OFF`    | `CRT_OFF`     | Turns off the Autocorrect feature.             |
-|`AUTOCORRECT_TOGGLE` | `CRT_TOG`     | Toggles the status of the Autocorrect feature. |
+|Keycode                |Aliases  |Description                                   |
+|-----------------------|---------|----------------------------------------------|
+|`QK_AUTOCORRECT_ON`    |`AC_ON`  |Turns on the Autocorrect feature.             |
+|`QK_AUTOCORRECT_OFF`   |`AC_OFF` |Turns off the Autocorrect feature.            |
+|`QK_AUTOCORRECT_TOGGLE`|`AC_TOGG`|Toggles the status of the Autocorrect feature.|
 
 ## User Callback Functions
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 0de0ce56b4..4aa54e1c20 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -247,6 +247,16 @@ See also: [Audio](feature_audio.md)
 |`MU_TOG`        |         |Toggles Music Mode                |
 |`MU_MOD`        |         |Cycles through the music modes    |
 
+## Autocorrect :id=autocorrect
+
+See also: [Autocorrect](feature_autocorrect.md)
+
+|Key                    |Aliases  |Description                                   |
+|-----------------------|---------|----------------------------------------------|
+|`QK_AUTOCORRECT_ON`    |`AC_ON`  |Turns on the Autocorrect feature.             |
+|`QK_AUTOCORRECT_OFF`   |`AC_OFF` |Turns off the Autocorrect feature.            |
+|`QK_AUTOCORRECT_TOGGLE`|`AC_TOGG`|Toggles the status of the Autocorrect feature.|
+
 ## Backlighting :id=backlighting
 
 See also: [Backlighting](feature_backlight.md)
diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
index f19ca4a90b..e3fcbc34ae 100644
--- a/quantum/process_keycode/process_autocorrect.c
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -165,12 +165,12 @@ bool process_autocorrect(uint16_t keycode, keyrecord_t *record) {
     mods |= get_oneshot_mods();
 #endif
 
-    if ((keycode >= AUTOCORRECT_ON && keycode <= AUTOCORRECT_TOGGLE) && record->event.pressed) {
-        if (keycode == AUTOCORRECT_ON) {
+    if ((keycode >= QK_AUTOCORRECT_ON && keycode <= QK_AUTOCORRECT_TOGGLE) && record->event.pressed) {
+        if (keycode == QK_AUTOCORRECT_ON) {
             autocorrect_enable();
-        } else if (keycode == AUTOCORRECT_OFF) {
+        } else if (keycode == QK_AUTOCORRECT_OFF) {
             autocorrect_disable();
-        } else if (keycode == AUTOCORRECT_TOGGLE) {
+        } else if (keycode == QK_AUTOCORRECT_TOGGLE) {
             autocorrect_toggle();
         } else {
             return true;
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 9d332ffb11..0be090e48b 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -611,9 +611,9 @@ enum quantum_keycodes {
 
     UNICODE_MODE_EMACS,
 
-    AUTOCORRECT_ON,
-    AUTOCORRECT_OFF,
-    AUTOCORRECT_TOGGLE,
+    QK_AUTOCORRECT_ON,
+    QK_AUTOCORRECT_OFF,
+    QK_AUTOCORRECT_TOGGLE,
 
     MAGIC_TOGGLE_BACKSLASH_BACKSPACE,
 
@@ -740,9 +740,9 @@ enum quantum_keycodes {
 #define EH_LEFT MAGIC_EE_HANDS_LEFT
 #define EH_RGHT MAGIC_EE_HANDS_RIGHT
 
-#define CRT_ON AUTOCORRECT_ON
-#define CRT_OFF AUTOCORRECT_OFF
-#define CRT_TOG AUTOCORRECT_TOGGLE
+#define AC_ON QK_AUTOCORRECT_ON
+#define AC_OFF QK_AUTOCORRECT_OFF
+#define AC_TOGG QK_AUTOCORRECT_TOGGLE
 
 // Velocikey
 #define VK_TOGG QK_VELOCIKEY_TOGGLE
diff --git a/users/drashna/keyrecords/process_records.h b/users/drashna/keyrecords/process_records.h
index cae3620fe4..2ee7551648 100644
--- a/users/drashna/keyrecords/process_records.h
+++ b/users/drashna/keyrecords/process_records.h
@@ -125,7 +125,7 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record);
 
 #define MG_NKRO MAGIC_TOGGLE_NKRO
 
-#define AUTO_CTN AUTOCORRECT_TOGGLE
+#define AUTO_CTN QK_AUTOCORRECT_TOGGLE
 /*
 Custom Keycodes for Diablo 3 layer
 But since TD() doesn't work when tap dance is disabled

From 22be7e79ac6a328ed5a7dc8c4e6f17d749852221 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 28 Oct 2022 23:53:15 +1100
Subject: [PATCH 763/959] Normalise Auto Shift keycodes (#18892)

* Normalise Auto Shift keycodes

* Add keycode table to main list

* Add old keycodes to legacy header
---
 docs/feature_auto_shift.md                    | 30 +++++++++----------
 docs/keycodes.md                              | 13 ++++++++
 keyboards/contra/keymaps/erovia/keymap.c      |  2 +-
 keyboards/crkbd/keymaps/rmeli/keymap.c        |  6 ++--
 .../dz60rgb/keymaps/matthewrobo/keymap.c      |  6 ++--
 .../dz65rgb/keymaps/matthewrobo/keymap.c      |  4 +--
 keyboards/idobao/id75/keymaps/egstad/config.h | 12 ++++----
 keyboards/idobao/id75/keymaps/egstad/keymap.c |  2 +-
 keyboards/jian/keymaps/advanced/keymap.c      |  6 ++--
 keyboards/jorne/keymaps/default/keymap.c      |  2 +-
 keyboards/jorne/keymaps/via/keymap.c          |  2 +-
 .../keebio/iris/keymaps/gsigler/keymap.c      |  6 ++--
 keyboards/keebio/iris/keymaps/jhelvy/keymap.c |  2 +-
 .../atreus/keymaps/kkokdae/keymap.c           |  4 +--
 .../lets_split/keymaps/cpeters1982/keymap.c   |  2 +-
 keyboards/lily58/keymaps/jhelvy/keymap.c      |  2 +-
 keyboards/planck/keymaps/corvec/keymap.c      |  4 +--
 keyboards/preonic/keymaps/egstad/config.h     | 12 ++++----
 keyboards/preonic/keymaps/egstad/keymap.c     |  6 ++--
 keyboards/sofle/keymaps/michal/keymap.c       |  2 +-
 .../splitkb/kyria/keymaps/jhelvy/keymap.c     |  2 +-
 .../diverge3/keymaps/iso_uk/keymap.c          | 10 +++----
 quantum/process_keycode/process_auto_shift.c  | 12 ++++----
 quantum/quantum_keycodes.h                    | 20 +++++++++----
 quantum/quantum_keycodes_legacy.h             |  7 +++++
 users/alfrdmalr/alfrdmalr.h                   |  4 +--
 26 files changed, 104 insertions(+), 76 deletions(-)

diff --git a/docs/feature_auto_shift.md b/docs/feature_auto_shift.md
index 99b0ca3c8a..d3437a9c60 100644
--- a/docs/feature_auto_shift.md
+++ b/docs/feature_auto_shift.md
@@ -300,14 +300,14 @@ This will enable you to define three keys temporarily to increase, decrease and
 
 Map three keys temporarily in your keymap:
 
-| Key Name | Description                                         |
-|----------|-----------------------------------------------------|
-| KC_ASDN  | Lower the Auto Shift timeout variable (down)        |
-| KC_ASUP  | Raise the Auto Shift timeout variable (up)          |
-| KC_ASRP  | Report your current Auto Shift timeout value        |
-| KC_ASON  | Turns on the Auto Shift Function                    |
-| KC_ASOFF | Turns off the Auto Shift Function                   |
-| KC_ASTG  | Toggles the state of the Auto Shift feature         |
+|Keycode               |Aliases  |Description                                 |
+|----------------------|---------|--------------------------------------------|
+|`QK_AUTO_SHIFT_DOWN`  |`AS_DOWN`|Lower the Auto Shift timeout variable (down)|
+|`QK_AUTO_SHIFT_UP`    |`AS_UP`  |Raise the Auto Shift timeout variable (up)  |
+|`QK_AUTO_SHIFT_REPORT`|`AS_RPT` |Report your current Auto Shift timeout value|
+|`QK_AUTO_SHIFT_ON`    |`AS_ON`  |Turns on the Auto Shift Function            |
+|`QK_AUTO_SHIFT_OFF`   |`AS_OFF` |Turns off the Auto Shift Function           |
+|`QK_AUTO_SHIFT_TOGGLE`|`AS_TOGG`|Toggles the state of the Auto Shift feature |
 
 Compile and upload your new firmware.
 
@@ -318,18 +318,18 @@ completely normal and with no intention of shifted keys.
 
 1. Type multiple sentences of alphabetical letters.
 2. Observe any upper case letters.
-3. If there are none, press the key you have mapped to `KC_ASDN` to decrease
+3. If there are none, press the key you have mapped to `AS_DOWN` to decrease
    time Auto Shift timeout value and go back to step 1.
 4. If there are some upper case letters, decide if you need to work on tapping
    those keys with less down time, or if you need to increase the timeout.
 5. If you decide to increase the timeout, press the key you have mapped to
-   `KC_ASUP` and go back to step 1.
+   `AS_UP` and go back to step 1.
 6. Once you are happy with your results, press the key you have mapped to
-   `KC_ASRP`. The keyboard will type by itself the value of your
+   `AS_RPT`. The keyboard will type by itself the value of your
    `AUTO_SHIFT_TIMEOUT`.
 7. Update `AUTO_SHIFT_TIMEOUT` in your `config.h` with the value reported.
 8. Add `AUTO_SHIFT_NO_SETUP` to your `config.h`.
-9. Remove the key bindings `KC_ASDN`, `KC_ASUP` and `KC_ASRP`.
+9. Remove the key bindings `AS_DOWN`, `AS_UP` and `AS_RPT`.
 10. Compile and upload your new firmware.
 
 #### An Example Run
@@ -337,17 +337,17 @@ completely normal and with no intention of shifted keys.
     hello world. my name is john doe. i am a computer programmer playing with
     keyboards right now.
 
-    [PRESS KC_ASDN quite a few times]
+    [PRESS AS_DOWN quite a few times]
 
     heLLo woRLd. mY nAMe is JOHn dOE. i AM A compUTeR proGRaMMER PlAYiNG witH
     KEYboArDS RiGHT NOw.
 
-    [PRESS KC_ASUP a few times]
+    [PRESS AS_UP a few times]
 
     hello world. my name is john Doe. i am a computer programmer playing with
     keyboarDs right now.
 
-    [PRESS KC_ASRP]
+    [PRESS AS_RPT]
 
     115
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 4aa54e1c20..1aea603ede 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -247,6 +247,19 @@ See also: [Audio](feature_audio.md)
 |`MU_TOG`        |         |Toggles Music Mode                |
 |`MU_MOD`        |         |Cycles through the music modes    |
 
+## Auto Shift :id=auto-shift
+
+See also: [Auto Shift](feature_auto_shift.md)
+
+|Key                   |Aliases  |Description                                 |
+|----------------------|---------|--------------------------------------------|
+|`QK_AUTO_SHIFT_DOWN`  |`AS_DOWN`|Lower the Auto Shift timeout variable (down)|
+|`QK_AUTO_SHIFT_UP`    |`AS_UP`  |Raise the Auto Shift timeout variable (up)  |
+|`QK_AUTO_SHIFT_REPORT`|`AS_RPT` |Report your current Auto Shift timeout value|
+|`QK_AUTO_SHIFT_ON`    |`AS_ON`  |Turns on the Auto Shift Function            |
+|`QK_AUTO_SHIFT_OFF`   |`AS_OFF` |Turns off the Auto Shift Function           |
+|`QK_AUTO_SHIFT_TOGGLE`|`AS_TOGG`|Toggles the state of the Auto Shift feature |
+
 ## Autocorrect :id=autocorrect
 
 See also: [Autocorrect](feature_autocorrect.md)
diff --git a/keyboards/contra/keymaps/erovia/keymap.c b/keyboards/contra/keymaps/erovia/keymap.c
index 9b72e57332..7063a85509 100644
--- a/keyboards/contra/keymaps/erovia/keymap.c
+++ b/keyboards/contra/keymaps/erovia/keymap.c
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ASTG
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AS_TOGG
 )
 
 };
diff --git a/keyboards/crkbd/keymaps/rmeli/keymap.c b/keyboards/crkbd/keymaps/rmeli/keymap.c
index 3dcd0b3ed9..b1fc6d1d02 100644
--- a/keyboards/crkbd/keymaps/rmeli/keymap.c
+++ b/keyboards/crkbd/keymaps/rmeli/keymap.c
@@ -120,11 +120,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG] = LAYOUT_split_3x6_3(
   //|-----------------------------------------------------|                    |-----------------------------------------------------|
-        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      UC_MOD,  KC_ASUP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       UC_MOD,   AS_UP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, KC_ASTG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
+      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, AS_TOGG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      UC_RMOD, KC_ASDN,  NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
+      XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      UC_RMOD, AS_DOWN,  NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,   _______, _______, _______
                                       //|--------------------------|  |--------------------------|
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
index 2b44828c76..bd04aa8be1 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______,  _______,                   _______,                   _______, _______,          _______, _______, _______  \
 	),
 	[_FNC] = LAYOUT( // fuck it edition
-		RCTL(KC_ESC),  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,         KC_F9,        KC_F10,        KC_F11,        KC_F12,        KC_ASTG,       \
+		RCTL(KC_ESC),  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,         KC_F9,        KC_F10,        KC_F11,        KC_F12,        AS_TOGG,       \
 		RCTL(KC_TAB),  RCTL(KC_Q), RCTL(KC_W), RCTL(KC_E), RCTL(KC_R), RCTL(KC_T), RCTL(KC_Y), RCTL(KC_U), RCTL(KC_I),    RCTL(KC_O),   RCTL(KC_P),    RCTL(KC_LBRC), RCTL(KC_RBRC), RCTL(KC_BSLS), \
 		RCTL(KC_CAPS), RCTL(KC_A), RCTL(KC_S), RCTL(KC_D), RCTL(KC_F), RCTL(KC_G), RCTL(KC_H), RCTL(KC_J), RCTL(KC_K),    RCTL(KC_L),   RCTL(KC_SCLN), RCTL(KC_QUOT), RCTL(KC_ENT),                 \
 		RCTL(KC_LSFT), RCTL(KC_Z), RCTL(KC_X), RCTL(KC_C), RCTL(KC_V), REBOOT,     RCTL(KC_N), RCTL(KC_M), RCTL(KC_COMM), RCTL(KC_DOT), RCTL(KC_SLSH),                KC_VOLU, RCTL(KC_DEL),        \
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	/*
 	[_FNC] = LAYOUT(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_ASTG, \
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  AS_TOGG, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
 		_______, _______, _______, _______, _______, REBOOT,  _______, _______, _______, _______, RCTL(KC_SLSH),    KC_VOLU, RCTL(KC_DEL), \
@@ -205,7 +205,7 @@ bool rgb_matrix_indicators_user(void) {
 			rgb_matrix_set_color(43, 0xFF, 0x00, 0x40); // ctrl+slash
 
 			if (this_led & (1 << !autoshift_enabled)) {
-				rgb_matrix_set_color(0, 0xFF, 0x00, 0x00); // KC_ASTG
+				rgb_matrix_set_color(0, 0xFF, 0x00, 0x00); // AS_TOGG
 			} else {
 				rgb_matrix_set_color(0, 0xFF, 0xFF, 0x00);
 			}
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index 70283fa841..bcd04a622b 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______,  _______,                   _______,                            _______, _______,  _______,  _______, _______, _______  \
 	),
 	[_FNC]    = LAYOUT_65_ansi(
-		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  _______, KC_ASTG, \
+		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  _______, AS_TOGG, \
 		_______, RGB_MOD,  RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT,  RGB_RMOD, RGB_MOD, _______, KC_MPRV, \
 		_______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP,  _______,           EE_CLR,  KC_MNXT, \
 		_______, RGB_TOG,  _______, _______, REEPROM, REBOOT,  TG_NKRO, MAS_YEL, MAS_GRN, MAS_CRM, _______,  _______,           KC_VOLU, KC_MUTE, \
@@ -172,7 +172,7 @@ bool rgb_matrix_indicators_user(void) {
 			rgb_matrix_set_color(25, 0xFF, 0x40, 0x00);
 
 			if (this_led & (1 << !autoshift_enabled)) {
-				rgb_matrix_set_color(15, 0xFF, 0x00, 0x00); // KC_ASTG
+				rgb_matrix_set_color(15, 0xFF, 0x00, 0x00); // AS_TOGG
 			} else {
 				rgb_matrix_set_color(15, 0xFF, 0xFF, 0x00);
 			}
diff --git a/keyboards/idobao/id75/keymaps/egstad/config.h b/keyboards/idobao/id75/keymaps/egstad/config.h
index 45dbd3df82..c0227431fb 100644
--- a/keyboards/idobao/id75/keymaps/egstad/config.h
+++ b/keyboards/idobao/id75/keymaps/egstad/config.h
@@ -50,19 +50,19 @@
 // #define NO_AUTO_SHIFT_ALPHA
 
 // Lower the Auto Shift timeout variable (down)
-// KC_ASDN
+// AS_DOWN
 
 // Raise the Auto Shift timeout variable (up)
-// KC_ASUP
+// AS_UP
 
 // Report your current Auto Shift timeout value
-// KC_ASRP
+// AS_RPT
 
 // Turns on the Auto Shift Function
-// KC_ASON
+// AS_ON
 
 // Turns off the Auto Shift Function
-// KC_ASOFF
+// AS_OFF
 
 // Toggles the state of the Auto Shift feature
-// KC_ASTG
+// AS_TOGG
diff --git a/keyboards/idobao/id75/keymaps/egstad/keymap.c b/keyboards/idobao/id75/keymaps/egstad/keymap.c
index 9bd350aa7e..99f358da0f 100644
--- a/keyboards/idobao/id75/keymaps/egstad/keymap.c
+++ b/keyboards/idobao/id75/keymaps/egstad/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
     _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, \
-    KC_ASTG, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______, \
+    AS_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______, \
     RGB_TOG, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, \
     QK_BOOT, _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, KC_MPLY, KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD  \
  ),
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 55e34de931..589afefbb6 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -212,9 +212,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_symmetric(
-  QK_BOOT, DB_TOGG, KC_ASUP, CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,
-           KC_ASRP, KC_ASTG, XXXXXXX, XXXXXXX, QWERTY,  PLOVER,
-           BL_ADJ,  KC_ASDN, XXXXXXX, XXXXXXX, ISO,     THUMB_ALT,
+  QK_BOOT, DB_TOGG, AS_UP,   CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,
+           AS_RPT,  AS_TOGG, XXXXXXX, XXXXXXX, QWERTY,  PLOVER,
+           BL_ADJ,  AS_DOWN, XXXXXXX, XXXXXXX, ISO,     THUMB_ALT,
                                       _______, SW_TG,   _______
 ),
 #if defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
diff --git a/keyboards/jorne/keymaps/default/keymap.c b/keyboards/jorne/keymaps/default/keymap.c
index 23696f4650..7484fc3e94 100644
--- a/keyboards/jorne/keymaps/default/keymap.c
+++ b/keyboards/jorne/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT(
-  QK_BOOT,   RGBRST,  KC_ASUP, KC_ASTG, KC_ASDN, _______, _______,      _______, _______, KC_ASDN, KC_ASTG, KC_ASUP, RGBRST,  QK_BOOT,
+  QK_BOOT, RGBRST,  AS_UP,   AS_TOGG, AS_DOWN, _______, _______,      _______, _______, AS_DOWN, AS_TOGG, AS_UP,   RGBRST,  QK_BOOT,
            RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,      _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG,
            RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,      _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD,
                                       _______, SH_TG,   _______,      _______, SH_TG,   _______
diff --git a/keyboards/jorne/keymaps/via/keymap.c b/keyboards/jorne/keymaps/via/keymap.c
index 23696f4650..7484fc3e94 100644
--- a/keyboards/jorne/keymaps/via/keymap.c
+++ b/keyboards/jorne/keymaps/via/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT(
-  QK_BOOT,   RGBRST,  KC_ASUP, KC_ASTG, KC_ASDN, _______, _______,      _______, _______, KC_ASDN, KC_ASTG, KC_ASUP, RGBRST,  QK_BOOT,
+  QK_BOOT, RGBRST,  AS_UP,   AS_TOGG, AS_DOWN, _______, _______,      _______, _______, AS_DOWN, AS_TOGG, AS_UP,   RGBRST,  QK_BOOT,
            RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,      _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG,
            RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,      _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD,
                                       _______, SH_TG,   _______,      _______, SH_TG,   _______
diff --git a/keyboards/keebio/iris/keymaps/gsigler/keymap.c b/keyboards/keebio/iris/keymaps/gsigler/keymap.c
index 9344d8ec52..bac940e39e 100644
--- a/keyboards/keebio/iris/keymaps/gsigler/keymap.c
+++ b/keyboards/keebio/iris/keymaps/gsigler/keymap.c
@@ -55,13 +55,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
   //|        |        |        |        |        |        |                          |        |   7    |    8   |    9   |    *   |    /   |
-     KC_ASUP, KC_ASON, KC_ASRP,  XXXXXXX, XXXXXXX, XXXXXXX,                           XXXXXXX,   KC_P7,   KC_P8,   KC_P9,  KC_PAST, KC_PSLS,
+     AS_UP,   AS_ON,   AS_RPT,   XXXXXXX, XXXXXXX, XXXXXXX,                           XXXXXXX,   KC_P7,   KC_P8,   KC_P9,  KC_PAST, KC_PSLS,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
   //|        |        |        |        |        |        |                          |        |    4   |    5   |    6   |    +   |    -    |
-     KC_ASDN, KC_ASOFF, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,                            XXXXXXX,  KC_P4,   KC_P5,   KC_P6,  KC_PPLS, KC_PMNS,
+     AS_DOWN, AS_OFF,   XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,                            XXXXXXX,  KC_P4,   KC_P5,   KC_P6,  KC_PPLS, KC_PMNS,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
   //|        |        |        |        |        |        |                          |        |    1   |    2   |    3   |        |        |
-     XXXXXXX, KC_ASTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX,  KC_P1,   KC_P2,   KC_P3,  XXXXXXX, XXXXXXX,
+     XXXXXXX, AS_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX,  KC_P1,   KC_P2,   KC_P3,  XXXXXXX, XXXXXXX,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
   //| LOWER  |        |        |        |        |        |  ESC   |        | ALT    |        |   0    |    .   | ENTER  |   =    |        |
       KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS,         KC_TRNS,  XXXXXXX, KC_P0,   KC_PDOT, KC_PENT, KC_PEQL, XXXXXXX,
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c b/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
index 0e776f26f3..17fe535611 100644
--- a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [QWERTY] = LAYOUT(LALT(KC_A), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_EQL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, MO(4), KC_LGUI, MO(2), KC_SPC, MO(1), TG(1)),
 
-[HOTKEYS] = LAYOUT(KC_F5, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F14, KC_F6, KC_NO, KC_NO, LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_NO, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, KC_ASTG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, LALT(KC_SPC), KC_LGUI, KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS),
+[HOTKEYS] = LAYOUT(KC_F5, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F14, KC_F6, KC_NO, KC_NO, LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_NO, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, AS_TOGG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, LALT(KC_SPC), KC_LGUI, KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS),
 
 [TEXT] = LAYOUT(KC_ESC, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), KC_SCLN, KC_PIPE, KC_COLN, KC_NO, KC_UNDS, KC_PLUS, LGUI(KC_BSPC), LGUI(KC_Q), LGUI(KC_W), KC_ESC, LGUI(KC_R), LGUI(KC_T), LCTL(KC_Y), LGUI(KC_LEFT), KC_UP, LGUI(KC_RGHT), KC_TILD, R_PIPE, KC_BSPC, MO(3), LGUI(KC_S), LGUI(KC_C), LGUI(KC_V), LGUI(KC_X), KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_ENT, KC_F18, LGUI(KC_A), LGUI(KC_D), KC_F1, LGUI(KC_Z), LGUI(KC_Y), KC_NO, KC_NO, KC_BSPC, LGUI(KC_F), SGUI(KC_G), LGUI(KC_G), KC_BSLS, R_ASSIGN, KC_LALT, KC_LGUI, KC_TRNS, KC_SPC, KC_RGUI, KC_NO),
 
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c b/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
index 0110c64395..b61b937984 100644
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
@@ -58,14 +58,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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,
-      _______, _______, _______, KC_ASTG, _______, _______, _______, DNUMPAD, _______, _______, _______, _______
+      _______, _______, _______, AS_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),
-      _______, _______, _______, KC_ASTG, _______, _______, _______, _______, KC_0,    _______, _______, _______
+      _______, _______, _______, AS_TOGG, _______, _______, _______, _______, KC_0,    _______, _______, _______
       ),
 
   [_SYMBOL] = LAYOUT(
diff --git a/keyboards/lets_split/keymaps/cpeters1982/keymap.c b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
index 5090da573b..8428aa58c5 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/keymap.c
+++ b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, KC_LEFT,  KC_DOWN, KC_RGHT, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PERC, KC_GRV, KC_TILD, \
-  KC_ASDN, KC_ASUP, KC_ASRP, _______, _______, _______, _______, KC_RBRC, KC_LBRC, KC_MINS, KC_EQL, KC_BSLS \
+  AS_DOWN, AS_UP,   AS_RPT,  _______, _______, _______, _______, KC_RBRC, KC_LBRC, KC_MINS, KC_EQL, KC_BSLS \
 )
 
 
diff --git a/keyboards/lily58/keymaps/jhelvy/keymap.c b/keyboards/lily58/keymaps/jhelvy/keymap.c
index 249c008cfe..f239faf9f6 100644
--- a/keyboards/lily58/keymaps/jhelvy/keymap.c
+++ b/keyboards/lily58/keymaps/jhelvy/keymap.c
@@ -41,7 +41,7 @@ LGUI(KC_BSPC),MO(2),LGUI(KC_S),LGUI(KC_C),LGUI(KC_V),LGUI(KC_X),
             KC_VOLU,LGUI(LALT(KC_1)),LGUI(LALT(KC_2)),   KC_F3,   KC_F4,   KC_F5,                    KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,LSFT(KC_EQL), \
     KC_VOLD,  KC_NO,  KC_NO,   KC_NO,SGUI(KC_R),  KC_F14,               SGUI(KC_K),SGUI(KC_LEFT),LSFT(KC_UP),SGUI(KC_RGHT),  KC_F18,LSFT(KC_MINS), \
       KC_MUTE,KC_TRNS,  KC_NO, KC_LGUI,  KC_TAB,  KC_F21,                    KC_NO,LSFT(KC_LEFT),LSFT(KC_DOWN),LSFT(KC_RGHT),     KC_F20,  KC_F16, \
-     KC_ASTG, KC_NO,  KC_NO,   KC_NO,  KC_F22,LCTL(KC_U),LGUI(KC_LBRC),LGUI(KC_RBRC),LGUI(KC_N),   KC_NO,LALT(LSFT(KC_LEFT)),LALT(LSFT(KC_RIGHT)),   KC_F17,   KC_F19, \
+     AS_TOGG, KC_NO,  KC_NO,   KC_NO,  KC_F22,LCTL(KC_U),LGUI(KC_LBRC),LGUI(KC_RBRC),LGUI(KC_N),   KC_NO,LALT(LSFT(KC_LEFT)),LALT(LSFT(KC_RIGHT)),   KC_F17,   KC_F19, \
                                   KC_NO,   KC_NO,KC_NO,  KC_NO,    KC_NO, KC_TRNS,     KC_NO,     KC_NO)
 
 };
diff --git a/keyboards/planck/keymaps/corvec/keymap.c b/keyboards/planck/keymaps/corvec/keymap.c
index 1c94ef5448..ecd7456c97 100644
--- a/keyboards/planck/keymaps/corvec/keymap.c
+++ b/keyboards/planck/keymaps/corvec/keymap.c
@@ -134,8 +134,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_planck_grid(
   COLEMAK, _______, DB_TOGG,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QWERTY ,
-  _______, _______, MU_MOD,   AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, KC_ASON, KC_ASUP,
-  _______, MUV_DE,  MUV_IN,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, KC_ASRP, KC_ASOFF,KC_ASDN,
+  _______, _______, MU_MOD,   AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, AS_ON,   AS_UP,
+  _______, MUV_DE,  MUV_IN,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, AS_RPT,  AS_OFF,  AS_DOWN,
   _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
 )
 
diff --git a/keyboards/preonic/keymaps/egstad/config.h b/keyboards/preonic/keymaps/egstad/config.h
index 2a3cab826a..4f4fbfe05c 100644
--- a/keyboards/preonic/keymaps/egstad/config.h
+++ b/keyboards/preonic/keymaps/egstad/config.h
@@ -35,22 +35,22 @@
 // #define NO_AUTO_SHIFT_ALPHA
 
 // Lower the Auto Shift timeout variable (down)
-// KC_ASDN	  
+// AS_DOWN
 
 // Raise the Auto Shift timeout variable (up)
-// KC_ASUP	  
+// AS_UP
 
 // Report your current Auto Shift timeout value
-// KC_ASRP	  
+// AS_RPT
 
 // Turns on the Auto Shift Function
-// KC_ASON	  
+// AS_ON
 
 // Turns off the Auto Shift Function
-// KC_ASOFF	 
+// AS_OFF
 
 // Toggles the state of the Auto Shift feature
-// KC_ASTG	  
+// AS_TOGG
 
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/preonic/keymaps/egstad/keymap.c b/keyboards/preonic/keymaps/egstad/keymap.c
index 9706cf6651..0ea9c339b1 100644
--- a/keyboards/preonic/keymaps/egstad/keymap.c
+++ b/keyboards/preonic/keymaps/egstad/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [L_LOWER] = LAYOUT_preonic_grid(
 /*01          02          03          04          05          06          07          08          09          10          11          12         */
-  KC_ASTG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_BSPC,    \
+  AS_TOGG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_BSPC,    \
   MT_UNTB,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MINUS,   KC_PLUS,    KC_PAST,    KC_PSLS,    _______,    \
   _______,    MT_HILF,    MT_HIRT,    _______,    _______,    _______,    _______,    KC_LEFT,    KC_UP,      KC_DOWN,    KC_RIGHT,   KC_ENTER,   \
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_LBRC,    KC_RBRC,    KC_LPRN,    KC_RPRN,    KC_BSLS,    \
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [L_RAISE] = LAYOUT_preonic_grid(
 /*01          02          03          04          05          06          07          08          09          10          11          12         */
-  KC_ASTG,    KC_F1,      KC_F2,      KC_VOLU,    KC_VOLD,    _______,    _______,    KC_PSLS,    KC_PAST,    KC_LPRN,    KC_RPRN,    _______,    \
+  AS_TOGG,    KC_F1,      KC_F2,      KC_VOLU,    KC_VOLD,    _______,    _______,    KC_PSLS,    KC_PAST,    KC_LPRN,    KC_RPRN,    _______,    \
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P7,      KC_P8,      KC_P9,      KC_PLUS,    _______,    \
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P4,      KC_P5,      KC_P6,      KC_MINUS,   _______,    \
   KC_CAPS,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P1,      KC_P2,      KC_P3,      KC_PSLS,    _______,    \
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F12,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     \
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    \
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    \
-  KC_ASTG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    \
+  AS_TOGG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    \
   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______     \
 )
 
diff --git a/keyboards/sofle/keymaps/michal/keymap.c b/keyboards/sofle/keymaps/michal/keymap.c
index 24ed97dcbe..564ef06454 100644
--- a/keyboards/sofle/keymaps/michal/keymap.c
+++ b/keyboards/sofle/keymaps/michal/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            `----------------------------------'           '------''---------------------------'
  */
 [_RAISE] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, KC_ASTG,
+  _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, AS_TOGG,
   _______, _______, _______, _______, _______, _______,                         _______, _______, KC_UP,   _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, _______,                         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_WORKMAN,
   _______, _______, _______, KC_MIDI, _______, _______, _______,       _______, _______, _______, KC_HOME, KC_END,  _______, KC_QWERTY,
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
index 9ad6fa7bd4..55b0d85afc 100644
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [QWERTY] = LAYOUT(LALT(KC_A), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LALT, KC_LCTL, KC_LGUI, MO(2), MO(4), KC_BSPC, KC_SPC, MO(1), KC_PGDN, TG(1)),
 
-[HOTKEYS] = LAYOUT(KC_F6, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_F14, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, KC_ASTG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, KC_F5, KC_NO, KC_LGUI, KC_LGUI, KC_LCTL, KC_BSPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS),
+[HOTKEYS] = LAYOUT(KC_F6, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_F14, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, AS_TOGG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, KC_F5, KC_NO, KC_LGUI, KC_LGUI, KC_LCTL, KC_BSPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS),
 
 [TEXT] = LAYOUT(LGUI(KC_BSPC), LGUI(KC_Q), LGUI(KC_W), KC_ESC, LGUI(KC_R), LGUI(KC_T), LCTL(KC_Y), LGUI(KC_LEFT), KC_UP, LGUI(KC_RGHT), KC_SCLN, R_PIPE, KC_BSPC, MO(3), LGUI(KC_S), LGUI(KC_C), LGUI(KC_V), LGUI(KC_X), KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_ENT, KC_F18, LGUI(KC_A), LGUI(KC_D), KC_F1, LGUI(KC_Z), LGUI(KC_Y), KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, LGUI(KC_F), SGUI(KC_G), LGUI(KC_G), KC_BSLS, R_ASSIGN, KC_LALT, KC_LCTL, KC_LGUI, KC_TRNS, KC_NO, KC_BSPC, KC_SPC, KC_LGUI, KC_PGUP, KC_NO),
 
diff --git a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
index cea7e882b9..ee0c500eda 100644
--- a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
@@ -35,11 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_LOWER] = LAYOUT(
-    QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                     KC_F12,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, _______,
-    BL_TOGG, KC_ASTG, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  KC_ASUP, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
-    BL_DEC,  KC_ASDN, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_ASRP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   _______,
+    BL_TOGG, AS_TOGG, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+    BL_INC,  AS_UP,   _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+    BL_DEC,  AS_DOWN, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+    _______, AS_RPT,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
 
 };
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index 644ad2cbaf..35d4851ee5 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -375,24 +375,24 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
         }
 
         switch (keycode) {
-            case KC_ASTG:
+            case AS_TOGG:
                 autoshift_toggle();
                 break;
-            case KC_ASON:
+            case AS_ON:
                 autoshift_enable();
                 break;
-            case KC_ASOFF:
+            case AS_OFF:
                 autoshift_disable();
                 break;
 
 #    ifndef AUTO_SHIFT_NO_SETUP
-            case KC_ASUP:
+            case AS_UP:
                 autoshift_timeout += 5;
                 break;
-            case KC_ASDN:
+            case AS_DOWN:
                 autoshift_timeout -= 5;
                 break;
-            case KC_ASRP:
+            case AS_RPT:
                 autoshift_timer_report();
                 break;
 #    endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 0be090e48b..6c9a262484 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -105,12 +105,12 @@ enum quantum_keycodes {
     QK_GRAVE_ESCAPE, // 5C16
 
     // Auto Shift
-    KC_ASUP,  // 5C17
-    KC_ASDN,  // 5C18
-    KC_ASRP,  // 5C19
-    KC_ASTG,  // 5C1A
-    KC_ASON,  // 5C1B
-    KC_ASOFF, // 5C1C
+    QK_AUTO_SHIFT_UP,     // 5C17
+    QK_AUTO_SHIFT_DOWN,   // 5C18
+    QK_AUTO_SHIFT_REPORT, // 5C19
+    QK_AUTO_SHIFT_TOGGLE, // 5C1A
+    QK_AUTO_SHIFT_ON,     // 5C1B
+    QK_AUTO_SHIFT_OFF,    // 5C1C
 
     // Audio
     AU_ON,  // 5C1D
@@ -844,6 +844,14 @@ enum quantum_keycodes {
 #define UC_M_WC UNICODE_MODE_WINC
 #define UC_M_EM UNICODE_MODE_EMACS
 
+// Auto Shift
+#define AS_UP QK_AUTO_SHIFT_UP
+#define AS_DOWN QK_AUTO_SHIFT_DOWN
+#define AS_RPT QK_AUTO_SHIFT_REPORT
+#define AS_TOGG QK_AUTO_SHIFT_TOGGLE
+#define AS_ON QK_AUTO_SHIFT_ON
+#define AS_OFF QK_AUTO_SHIFT_OFF
+
 // Leader key
 #define QK_LEAD QK_LEADER
 
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index a6023dee30..3baf37d378 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -6,6 +6,13 @@
 #define KC_LEAD QK_LEADER
 #define KC_LOCK QK_LOCK
 
+#define KC_ASUP QK_AUTO_SHIFT_UP
+#define KC_ASDN QK_AUTO_SHIFT_DOWN
+#define KC_ASRP QK_AUTO_SHIFT_REPORT
+#define KC_ASTG QK_AUTO_SHIFT_TOGGLE
+#define KC_ASON QK_AUTO_SHIFT_ON
+#define KC_ASOFF QK_AUTO_SHIFT_OFF
+
 #define VLK_TOG QK_VELOCIKEY_TOGGLE
 #define CAPSWRD QK_CAPS_WORD_TOGGLE
 #define CAPS_WORD QK_CAPS_WORD_TOGGLE
diff --git a/users/alfrdmalr/alfrdmalr.h b/users/alfrdmalr/alfrdmalr.h
index 1537afd208..851ab02815 100644
--- a/users/alfrdmalr/alfrdmalr.h
+++ b/users/alfrdmalr/alfrdmalr.h
@@ -268,7 +268,7 @@ enum alfrdmalr_keycodes {
 #define K00_SET    KC_NO
 #define K10_SET    KC_NO
 #define K20_SET    KC_NO
-#define K30_SET    KC_ASTG
+#define K30_SET    AS_TOGG
 #define K40_SET    KC_NO
 
 // RIGHT
@@ -282,5 +282,5 @@ enum alfrdmalr_keycodes {
 #define K0B_SET    KC_NO
 #define K1B_SET    KC_NO
 #define K2B_SET    KC_NO
-#define K3B_SET    KC_ASTG
+#define K3B_SET    AS_TOGG
 #define K4B_SET    KC_NO

From e31fa77e9b349b29fa43f36aeb26435d9e9f4910 Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Fri, 28 Oct 2022 15:27:38 -0400
Subject: [PATCH 764/959] [Keyboard] Add Sinc Rev 1&2 Encoder Map Support
 (#18861)

---
 keyboards/keebio/sinc/rev1/config.h  | 2 --
 keyboards/keebio/sinc/rev1/info.json | 4 ++--
 keyboards/keebio/sinc/rev2/config.h  | 2 --
 keyboards/keebio/sinc/rev2/info.json | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
index d00bd12328..7fde38b58e 100644
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@@ -28,7 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
-// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default
-#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 86af86c3b6..7e43746bfd 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Sinc Rev. 1",
     "usb": {
-        "pid": "0x1267",
-        "device_version": "1.0.0"
+        "pid": "0x1367",
+        "device_version": "1.1.0"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
index d00bd12328..7fde38b58e 100644
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/config.h
@@ -28,7 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
-// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default
-#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 4588513d2c..72a3555351 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Sinc Rev. 2",
     "usb": {
-        "pid": "0x2267",
-        "device_version": "2.0.0"
+        "pid": "0x2367",
+        "device_version": "2.1.0"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

From bc502348c3d52c63215b89e617fd6ad250c638c8 Mon Sep 17 00:00:00 2001
From: Alabahuy <rezzaadio@gmail.com>
Date: Sat, 29 Oct 2022 02:49:01 +0700
Subject: [PATCH 765/959] [Keyboard] Add Encoder map support for rart (#18851)

---
 keyboards/rart/rart4x4/config.h              |  7 +++++-
 keyboards/rart/rart4x4/keymaps/via/keymap.c  | 24 +++++++-------------
 keyboards/rart/rart4x4/keymaps/via/rules.mk  |  1 +
 keyboards/rart/rart75/keymaps/via/keymap.c   | 18 +++++++--------
 keyboards/rart/rart75/keymaps/via/rules.mk   |  2 ++
 keyboards/rart/rart75hs/keymaps/via/keymap.c |  9 ++++++++
 keyboards/rart/rart75hs/keymaps/via/rules.mk |  1 +
 keyboards/rart/rart75hs/rart75hs.c           |  2 +-
 keyboards/rart/rart75m/keymaps/via/keymap.c  | 11 ++++++++-
 keyboards/rart/rart75m/keymaps/via/rules.mk  |  4 +++-
 keyboards/rart/rart80/config.h               |  4 ++--
 keyboards/rart/rart80/rules.mk               |  3 +--
 keyboards/rart/rartpad/config.h              | 10 ++++++--
 keyboards/rart/rartpad/keymaps/via/keymap.c  | 24 +++++++-------------
 keyboards/rart/rartpad/keymaps/via/rules.mk  |  1 +
 keyboards/rart/rartpad/rartpad.c             |  9 +-------
 16 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index b859a2f552..bde3948b39 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -44,7 +44,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 7
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rart/rart4x4/keymaps/via/keymap.c b/keyboards/rart/rart4x4/keymaps/via/keymap.c
index dd6c81d768..27f61db94f 100644
--- a/keyboards/rart/rart4x4/keymaps/via/keymap.c
+++ b/keyboards/rart/rart4x4/keymaps/via/keymap.c
@@ -44,19 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_WH_U);
-        } else {
-            tap_code(KC_WH_D);
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/rart/rart4x4/keymaps/via/rules.mk b/keyboards/rart/rart4x4/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/rart/rart4x4/keymaps/via/rules.mk
+++ b/keyboards/rart/rart4x4/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rart/rart75/keymaps/via/keymap.c b/keyboards/rart/rart75/keymaps/via/keymap.c
index 56058bd102..86e75a5b52 100644
--- a/keyboards/rart/rart75/keymaps/via/keymap.c
+++ b/keyboards/rart/rart75/keymaps/via/keymap.c
@@ -40,13 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/rart/rart75/keymaps/via/rules.mk b/keyboards/rart/rart75/keymaps/via/rules.mk
index 36b7ba9cbc..8111cb54a7 100644
--- a/keyboards/rart/rart75/keymaps/via/rules.mk
+++ b/keyboards/rart/rart75/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
diff --git a/keyboards/rart/rart75hs/keymaps/via/keymap.c b/keyboards/rart/rart75hs/keymaps/via/keymap.c
index e64380d4d2..eb5d231b41 100644
--- a/keyboards/rart/rart75hs/keymaps/via/keymap.c
+++ b/keyboards/rart/rart75hs/keymaps/via/keymap.c
@@ -53,3 +53,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/rart/rart75hs/keymaps/via/rules.mk b/keyboards/rart/rart75hs/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/rart/rart75hs/keymaps/via/rules.mk
+++ b/keyboards/rart/rart75hs/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rart/rart75hs/rart75hs.c b/keyboards/rart/rart75hs/rart75hs.c
index f2475ab960..6c1c408a8b 100644
--- a/keyboards/rart/rart75hs/rart75hs.c
+++ b/keyboards/rart/rart75hs/rart75hs.c
@@ -28,4 +28,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return true;
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/keyboards/rart/rart75m/keymaps/via/keymap.c b/keyboards/rart/rart75m/keymaps/via/keymap.c
index 2d847bc6ee..a8deffa500 100644
--- a/keyboards/rart/rart75m/keymaps/via/keymap.c
+++ b/keyboards/rart/rart75m/keymaps/via/keymap.c
@@ -51,4 +51,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-}; 
\ No newline at end of file
+}; 
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/rart/rart75m/keymaps/via/rules.mk b/keyboards/rart/rart75m/keymaps/via/rules.mk
index 036bd6d1c3..aaf0497be1 100644
--- a/keyboards/rart/rart75m/keymaps/via/rules.mk
+++ b/keyboards/rart/rart75m/keymaps/via/rules.mk
@@ -1 +1,3 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
index 21c88a18cf..c49ebc38af 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/config.h
@@ -39,13 +39,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define LED_CAPS_LOCK_PIN D5
+#define LED_CAPS_LOCK_PIN D4
 #define LED_PIN_ON_STATE 0
 
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 1
 
-#define RGB_DI_PIN C0
+#define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/rart/rart80/rules.mk b/keyboards/rart/rart80/rules.mk
index 3f9d76149a..4655675b62 100644
--- a/keyboards/rart/rart80/rules.mk
+++ b/keyboards/rart/rart80/rules.mk
@@ -18,5 +18,4 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index 495f6f99ba..da89cbbd80 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -30,7 +30,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define NUM_LOCK_LED_PIN D7
+#define LED_CAPS_LOCK_PIN D7
+#define LED_PIN_ON_STATE 1
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
@@ -46,7 +47,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/rart/rartpad/keymaps/via/keymap.c b/keyboards/rart/rartpad/keymaps/via/keymap.c
index 84aaca1ec6..02d9316104 100644
--- a/keyboards/rart/rartpad/keymaps/via/keymap.c
+++ b/keyboards/rart/rartpad/keymaps/via/keymap.c
@@ -35,19 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_WH_U);
-        } else {
-            tap_code(KC_WH_D);
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/rart/rartpad/keymaps/via/rules.mk b/keyboards/rart/rartpad/keymaps/via/rules.mk
index 36b7ba9cbc..aaf0497be1 100644
--- a/keyboards/rart/rartpad/keymaps/via/rules.mk
+++ b/keyboards/rart/rartpad/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rart/rartpad/rartpad.c b/keyboards/rart/rartpad/rartpad.c
index 566c3fa466..4b5a9eb0c2 100644
--- a/keyboards/rart/rartpad/rartpad.c
+++ b/keyboards/rart/rartpad/rartpad.c
@@ -12,11 +12,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rartpad.h"
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(NUM_LOCK_LED_PIN, led_state.num_lock);
-    }
-    return true;
-}
+#include "rartpad.h"
\ No newline at end of file

From bb97a78d3e16460cb25ff82d0ad36cbd272e48d3 Mon Sep 17 00:00:00 2001
From: Toshihiro Suzuki <t.suzuki326@gmail.com>
Date: Sat, 29 Oct 2022 04:49:52 +0900
Subject: [PATCH 766/959] [Keymap] toshi0383 keymaps update (#18760)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../25keys/zinc/keymaps/toshi0383/keymap.c    |  8 +-
 .../ergodox_ez/keymaps/toshi0383/keymap.c     | 98 -------------------
 .../reviung39/keymaps/toshi0383/keymap.c      |  2 +-
 3 files changed, 5 insertions(+), 103 deletions(-)
 delete mode 100644 keyboards/ergodox_ez/keymaps/toshi0383/keymap.c

diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
index 122ecd3611..0c851fe326 100644
--- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
+++ b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
@@ -36,9 +36,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
   [_ADJUST] =  LAYOUT_ortho_4x12(
-    RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  XXXXXXX,   RGB_TOG,    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  XXXXXXX,
-    RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, XXXXXXX,   XXXXXXX,    KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  XXXXXXX,
-    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LANG1,  KC_LANG2,
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, KC_KANA
+    _______, _______, _______, _______, RCMD(LALT(KC_1)), RCMD(LALT(KC_2)), RCMD(LALT(KC_3)), RCMD(LALT(KC_4)), RCMD(LALT(KC_5)), RCMD(LALT(KC_6)), RCMD(LALT(KC_7)), RCMD(LALT(KC_0)),
+    RGB_SAI, RGB_HUI,  RGB_MOD,  _______,   RGB_TOG,    RGB_VAI,   RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,   _______,
+    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c b/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
deleted file mode 100644
index c419f8893f..0000000000
--- a/keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_ergodox(
-        // left hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    LGUI(KC_LCTL),
-        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-        KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    LGUI(KC_LALT),
-        _______, _______, _______, _______, LOWER,
-                                                       KC_LGUI, _______,
-                                                                _______,
-                                         KC_ENT, RGUI(KC_RCTL), _______,
-        // right hand
-        _______,       _______, _______, _______, _______, _______, _______,
-        RGUI(KC_RCTL), KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-                       KC_H,    KC_J,    KC_K,    KC_L,    KC_RSFT, KC_RGUI,
-        RGUI(KC_RALT), KC_N,    KC_M,    KC_RCTL, KC_DOT,  KC_RALT, RGUI(KC_RSFT),
-                                RAISE,   _______, _______, _______, _______,
-             _______, KC_RGUI,
-             _______,
-             _______, KC_BSPC, KC_ENT
-    ),
-
-    [_LOWER] = LAYOUT_ergodox(
-        // left hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-        _______, KC_LT,   KC_GT,   KC_LPRN, KC_RPRN, KC_GRV,
-        KC_LALT, _______, _______, _______, KC_EQL,  KC_QUES, _______,
-        _______, _______, _______, _______, _______,
-                                                       _______, _______,
-                                                                _______,
-                                               KC_NO,  KC_NO,   _______,
-        // right hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_NO,   KC_CIRC, KC_AMPR, KC_ASTR, _______, _______, _______,
-                 KC_MINS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
-        KC_NO,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
-                          KC_RGUI, _______, _______, _______, _______,
-             _______, KC_NO,
-             _______,
-             _______, KC_NO, KC_NO
-    ),
-
-    [_RAISE] = LAYOUT_ergodox(
-        // left hand
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,
-        KC_NO,   KC_COLN, KC_SCLN, KC_DQT,  KC_QUOT, KC_BSLS,
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, KC_LGUI,
-                                                       _______, _______,
-                                                                _______,
-                                               KC_NO,  KC_NO,   _______,
-        // right hand
-        _______, _______, _______, _______, _______, _______, KC_NO,
-        KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
-                 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, KC_NO,
-        _______, ADJUST,  _______, _______, _______, _______, _______,
-                          _______, _______, _______, _______, _______,
-             _______, KC_NO,
-             _______,
-             _______, KC_NO, KC_NO
-    ),
-
-    [_ADJUST] = LAYOUT_ergodox(
-        // left hand
-        _______,  _______,     _______,   _______, _______, _______, _______,
-        _______,  _______,     _______,   _______, _______, _______,
-        _______,  _______,     _______,   _______, _______, _______, _______,
-        KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, QK_BOOT, _______,
-        _______, _______, _______, _______, KC_LGUI,
-                                                       _______, _______,
-                                                                _______,
-                                               KC_NO,  KC_NO,   _______,
-        // right hand
-        _______, _______, _______, _______, _______, _______,  _______,
-        KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    _______,
-                 KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   _______,
-        _______, _______, _______, _______, _______, KC_LANG1, KC_LANG2,
-                          _______, _______, _______, _______,  _______,
-             _______, KC_NO,
-             _______,
-             _______, KC_NO, KC_NO
-    )
-};
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
index 36d643370a..c370f4e2cf 100644
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
+++ b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] = LAYOUT_reviung39(
-    _______, RCMD(LALT(KC_1)), RCMD(LALT(KC_2)), RCMD(LALT(KC_3)), RCMD(LALT(KC_4)), RCMD(LALT(KC_5)), RCMD(LALT(KC_6)), RCMD(LALT(KC_7)), _______, _______, RCMD(LALT(KC_0)), _______,
+    _______, _______, _______, _______, RCMD(LALT(KC_1)), RCMD(LALT(KC_2)), RCMD(LALT(KC_3)), RCMD(LALT(KC_4)), RCMD(LALT(KC_5)), RCMD(LALT(KC_6)), RCMD(LALT(KC_7)), RCMD(LALT(KC_0)),
     RGB_SAI, RGB_HUI,  RGB_MOD,  _______,   RGB_TOG,    RGB_VAI,   RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,   _______,
     KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,
                                                    KC_LGUI,  _______,  _______

From e90ff84c31905932849164204c10ea58255ddad2 Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Fri, 28 Oct 2022 19:55:18 -0400
Subject: [PATCH 767/959] Add indicator LEDs to hoodrow G PCB (#18888)

---
 keyboards/cannonkeys/hoodrowg/config.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 6971cf02b8..d537eca59f 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -39,6 +39,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
+#define LED_CAPS_LOCK_PIN B6
+#define LED_SCROLL_LOCK_PIN B2
+
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 

From 078a51139440e416e3d23d1f568b19f390d1a3cc Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Sun, 30 Oct 2022 03:48:45 +0700
Subject: [PATCH 768/959] [Keyboard] Update Kay65 LED state (#18895)

---
 keyboards/mechlovin/kay65/config.h                 | 1 +
 keyboards/mechlovin/kay65/keymaps/default/keymap.c | 4 ++--
 keyboards/mechlovin/kay65/keymaps/via/keymap.c     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index 09e841804e..8dcdbf9611 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/config.h
@@ -48,6 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define LED_SCROLL_LOCK_PIN B2
 //#define LED_COMPOSE_PIN B3
 //#define LED_KANA_PIN B4
+#define LED_PIN_ON_STATE 0
 
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mechlovin/kay65/keymaps/default/keymap.c b/keyboards/mechlovin/kay65/keymaps/default/keymap.c
index f72c8d8bb4..189b782b20 100644
--- a/keyboards/mechlovin/kay65/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/default/keymap.c
@@ -36,12 +36,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case LOGO_LED_ON:
         if (record->event.pressed) {
-             writePinHigh(D7);	
+             writePinLow(D7);	
         } 
         break;
     case LOGO_LED_OFF:
         if (record->event.pressed) {
-             writePinLow(D7);	
+             writePinHigh(D7);	
         } 
         break;
   }
diff --git a/keyboards/mechlovin/kay65/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
index 01a524e2a0..5011472a79 100644
--- a/keyboards/mechlovin/kay65/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
@@ -59,12 +59,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case LOGO_LED_ON:
         if (record->event.pressed) {
-             writePinHigh(D7);	
+             writePinLow(D7);	
         } 
         break;
     case LOGO_LED_OFF:
         if (record->event.pressed) {
-             writePinLow(D7);	
+             writePinHigh(D7);	
         } 
         break;
   }

From c63e2e378d4f3e96379bbc816f93a94aa05928ed Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 29 Oct 2022 22:33:47 +0100
Subject: [PATCH 769/959] Revert "mcp23018: add return status to init (#18178)"
 (#18709)

This reverts commit 3fffa51554556edc9ca53bc04ef45abe87d3d3c9.
---
 drivers/gpio/mcp23018.c | 14 ++++----------
 drivers/gpio/mcp23018.h |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/gpio/mcp23018.c b/drivers/gpio/mcp23018.c
index b4fbf296f8..41cbfe087e 100644
--- a/drivers/gpio/mcp23018.c
+++ b/drivers/gpio/mcp23018.c
@@ -18,20 +18,14 @@ enum {
     CMD_GPIOB  = 0x13,
 };
 
-bool mcp23018_init(uint8_t slave_addr) {
+void mcp23018_init(uint8_t addr) {
     static uint8_t s_init = 0;
-    uint8_t        addr   = SLAVE_TO_ADDR(slave_addr);
-    if (0 == s_init) {
+    if (!s_init) {
         i2c_init();
-        wait_ms(100);
+        wait_ms(1000);
 
-        // probe that the expander is actually connected by reading from it
-        uint8_t data = 0;
-        if (I2C_STATUS_SUCCESS == i2c_readReg(addr, 0, &data, sizeof(data), 150)) {
-            s_init = 1;
-        }
+        s_init = 1;
     }
-    return (s_init > 0);
 }
 
 bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {
diff --git a/drivers/gpio/mcp23018.h b/drivers/gpio/mcp23018.h
index 081fdb24e3..e7c2730dd1 100644
--- a/drivers/gpio/mcp23018.h
+++ b/drivers/gpio/mcp23018.h
@@ -33,7 +33,7 @@ enum {
 /**
  * Init expander and any other dependent drivers
  */
-bool mcp23018_init(uint8_t slave_addr);
+void mcp23018_init(uint8_t slave_addr);
 
 /**
  * Configure input/output to a given port

From ac4b3fd1e9c421ee38dd9ac98f6514ae582f3540 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 30 Oct 2022 05:26:23 +0000
Subject: [PATCH 770/959] Remove duplicate key in novelkeys/nk65b (#18907)

---
 keyboards/novelkeys/nk65b/info.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index 8868b78531..609a64ab79 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -2,7 +2,6 @@
     "keyboard_name": "NK65B",
     "manufacturer": "Yiancar-Designs",
     "url": "www.yiancar-designs.com",
-    "url": "", 
     "maintainer": "Yiancar",
     "usb": {
         "vid": "0x8968",
@@ -14,4 +13,4 @@
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
         }
     }
-}
\ No newline at end of file
+}

From 594dcbf66c5ddc9865bd0243f8d4215e8c034707 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 31 Oct 2022 02:34:24 +1100
Subject: [PATCH 771/959] Properly fix elephant42 (#18908)

---
 keyboards/elephant42/keymaps/default/keymap.c | 12 ++++++------
 keyboards/elephant42/keymaps/via/keymap.c     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/keyboards/elephant42/keymaps/default/keymap.c b/keyboards/elephant42/keymaps/default/keymap.c
index e0235d75bb..21f743a6ee 100644
--- a/keyboards/elephant42/keymaps/default/keymap.c
+++ b/keyboards/elephant42/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
 #define KC_VU KC_AUDIO_VOL_UP
 #define KC_VD KC_AUDIO_VOL_DOWN
 #define KC_MU KC_AUDIO_MUTE
-#define KC_LSPC LT(_LOWER, KC_SPC)
-#define KC_RSPC LT(_RAISE, KC_SPC)
+#define KC_LWSP LT(_LOWER, KC_SPC)
+#define KC_RSSP LT(_RAISE, KC_SPC)
 
 enum layer_names {
     _QWERTY,
@@ -30,7 +30,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT( \
+  [_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,
   //|-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------|
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
               KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                                      KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT,     KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------|
              XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN,                                     KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL ,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT,     KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   ),
 
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------'
              KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD,                                     KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX,
   //        `-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------'
-                                     KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT,     KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC
+                                     KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT,     KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC
   //                                `-------+-------+-------+-------'    `-------+-------+-------+-------'
   )
 };
diff --git a/keyboards/elephant42/keymaps/via/keymap.c b/keyboards/elephant42/keymaps/via/keymap.c
index 32b9dc1fcb..86d28e1930 100644
--- a/keyboards/elephant42/keymaps/via/keymap.c
+++ b/keyboards/elephant42/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT( \
+  [_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,
   //|-------+-------+-------+-------+-------+-------|                                    |-------+-------+-------+-------+-------+-------|

From 652b10e6a76c07f59dd3199b7d167fc65722a98c Mon Sep 17 00:00:00 2001
From: Anton Chernenko <ch3rny777@gmail.com>
Date: Mon, 31 Oct 2022 03:57:23 +0200
Subject: [PATCH 772/959] [Keyboard] Add Hubble keyboard (#18718)

Co-authored-by: Anton Chernenko <anton.chernenko@chaintrust.it>
---
 keyboards/hubble/config.h                 | 23 ++++++
 keyboards/hubble/info.json                | 91 +++++++++++++++++++++++
 keyboards/hubble/keymaps/default/keymap.c | 41 ++++++++++
 keyboards/hubble/keymaps/via/keymap.c     | 42 +++++++++++
 keyboards/hubble/keymaps/via/rules.mk     |  1 +
 keyboards/hubble/readme.md                | 26 +++++++
 keyboards/hubble/rules.mk                 |  1 +
 7 files changed, 225 insertions(+)
 create mode 100644 keyboards/hubble/config.h
 create mode 100644 keyboards/hubble/info.json
 create mode 100644 keyboards/hubble/keymaps/default/keymap.c
 create mode 100644 keyboards/hubble/keymaps/via/keymap.c
 create mode 100644 keyboards/hubble/keymaps/via/rules.mk
 create mode 100644 keyboards/hubble/readme.md
 create mode 100644 keyboards/hubble/rules.mk

diff --git a/keyboards/hubble/config.h b/keyboards/hubble/config.h
new file mode 100644
index 0000000000..eb2aad2e50
--- /dev/null
+++ b/keyboards/hubble/config.h
@@ -0,0 +1,23 @@
+// Copyright 2022 Anton Chernenko (@ch3rny)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* rgb */
+#define RGB_DI_PIN D2
+#define RGBLED_NUM 7
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define DEBOUNCE 5
diff --git a/keyboards/hubble/info.json b/keyboards/hubble/info.json
new file mode 100644
index 0000000000..2677927194
--- /dev/null
+++ b/keyboards/hubble/info.json
@@ -0,0 +1,91 @@
+{
+    "manufacturer": "Anton Chernenko",
+    "keyboard_name": "hubble",
+    "maintainer": "ch3rny",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "velocikey": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B4", "E6", "D7", "C6", "D4", "D0"],
+        "rows": ["D1", "F4", "F7", "B5", "B1", "B3", "B6", "B2"]
+    },
+    "url": "",
+    "usb": {
+        "vid": "0x4680",
+        "pid": "0x1357",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [1, 7], "x": 8, "y": 0 },
+                { "matrix": [1, 6], "x": 9, "y": 0 },
+                { "matrix": [1, 5], "x": 10, "y": 0 },
+                { "matrix": [1, 4], "x": 11, "y": 0 },
+                { "matrix": [1, 3], "x": 12, "y": 0 },
+                { "matrix": [1, 2], "x": 13, "y": 0 },
+                { "matrix": [1, 1], "x": 14.25, "y": 0 },
+                { "matrix": [1, 0], "x": 15.25, "y": 0 },
+                { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "matrix": [2, 1], "x": 1.25, "y": 1 },
+                { "matrix": [2, 2], "x": 2.25, "y": 1 },
+                { "matrix": [2, 3], "x": 3.25, "y": 1 },
+                { "matrix": [2, 4], "x": 4.25, "y": 1 },
+                { "matrix": [2, 5], "x": 5.25, "y": 1 },
+                { "matrix": [2, 6], "x": 6.25, "y": 1 },
+                { "matrix": [2, 7], "x": 7.25, "y": 1 }, 
+                { "matrix": [3, 7], "x": 8.25, "y": 1 },
+                { "matrix": [3, 6], "x": 9.25, "y": 1 },
+                { "matrix": [3, 5], "x": 10.25, "y": 1 },
+                { "matrix": [3, 4], "x": 11.25, "y": 1 },
+                { "matrix": [3, 3], "x": 12.25, "y": 1, "w": 1.75 },
+                { "matrix": [3, 1], "x": 14.25, "y": 1 },
+                { "matrix": [3, 0], "x": 15.25, "y": 1 },
+                { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 },
+                { "matrix": [4, 1], "x": 1.75, "y": 2 },
+                { "matrix": [4, 2], "x": 2.75, "y": 2 },
+                { "matrix": [4, 3], "x": 3.75, "y": 2 },
+                { "matrix": [4, 4], "x": 4.75, "y": 2 },
+                { "matrix": [4, 5], "x": 5.75, "y": 2 },
+                { "matrix": [4, 6], "x": 6.75, "y": 2 },
+                { "matrix": [4, 7], "x": 7.75, "y": 2 },
+                { "matrix": [5, 7], "x": 8.75, "y": 2 },
+                { "matrix": [5, 6], "x": 9.75, "y": 2 },
+                { "matrix": [5, 5], "x": 10.75, "y": 2 },
+                { "matrix": [5, 4], "x": 11.75, "y": 2, "w": 1.25 },
+                { "matrix": [5, 3], "x": 13, "y": 2 },
+                { "matrix": [5, 1], "x": 14.25, "y": 2 },
+                { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25  },             
+                { "matrix": [6, 1], "x": 1.25, "y": 3, "w": 1.25},
+                { "matrix": [6, 2], "x": 2.5, "y": 3, "w": 1.25 },
+                { "matrix": [6, 3], "x": 3.75, "y": 3, "w": 2.25 },
+                { "matrix": [6, 5], "x": 6, "y": 3, "w": 1.25 },
+                { "matrix": [6, 7], "x": 7.25, "y": 3, "w": 2.75 },
+                { "matrix": [7, 6], "x": 10, "y": 3 },             
+                { "matrix": [7, 5], "x": 11, "y": 3 },
+                { "matrix": [7, 4], "x": 12, "y": 3 },
+                { "matrix": [7, 2], "x": 13.25, "y": 3 },
+                { "matrix": [7, 1], "x": 14.25, "y": 3 },
+                { "matrix": [7, 0], "x": 15.25, "y": 3 }
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/hubble/keymaps/default/keymap.c b/keyboards/hubble/keymaps/default/keymap.c
new file mode 100644
index 0000000000..41e21de0e2
--- /dev/null
+++ b/keyboards/hubble/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2022 Anton Chernenko (@ch3rny)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+  BASE,
+  LOWER,
+  RAISE,
+  ADJUST
+};
+
+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_LBRC, KC_RBRC, KC_BSLS, KC_INS,  KC_PGUP, 
+       KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_DEL,  KC_PGDN, 
+       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(LOWER),        KC_UP,
+       KC_LCTL, KC_LGUI, KC_LALT, LT(LOWER, KC_BSPC),   LT(ADJUST, KC_ENT),    LT(RAISE, KC_SPC),KC_RALT,MO(RAISE),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [LOWER] = LAYOUT(
+       KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PPLS, KC_EQL,  _______, KC_HOME, 
+       _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PMNS, _______,          _______, KC_END, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______, _______,          _______,          _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+    [RAISE] = LAYOUT(
+       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,          _______, _______, _______
+    ),
+
+    [ADJUST] = LAYOUT(
+       QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_RBT,  RGB_HUI, RGB_SAI, 
+       _______, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,          RGB_HUD, RGB_SAD, 
+       _______, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+    ),
+};
diff --git a/keyboards/hubble/keymaps/via/keymap.c b/keyboards/hubble/keymaps/via/keymap.c
new file mode 100644
index 0000000000..050781373d
--- /dev/null
+++ b/keyboards/hubble/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2022 Anton Chernenko (@ch3rny)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+enum layers {
+  BASE,
+  LOWER,
+  RAISE,
+  ADJUST
+};
+
+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_LBRC, KC_RBRC, KC_BSLS, KC_INS,  KC_PGUP, 
+       KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_DEL,  KC_PGDN, 
+       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(LOWER),        KC_UP,
+       KC_LCTL, KC_LGUI, KC_LALT, LT(LOWER, KC_BSPC),   LT(ADJUST, KC_ENT),    LT(RAISE, KC_SPC),KC_RALT,MO(RAISE),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [LOWER] = LAYOUT(
+       KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PPLS, KC_EQL,  _______, KC_HOME, 
+       _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PMNS, _______,          _______, KC_END, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______, _______,          _______,          _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+    [RAISE] = LAYOUT(
+       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,          _______, _______, _______
+    ),
+
+    [ADJUST] = LAYOUT(
+       QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_RBT,  RGB_HUI, RGB_SAI, 
+       _______, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,          RGB_HUD, RGB_SAD, 
+       _______, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+    ),
+};
diff --git a/keyboards/hubble/keymaps/via/rules.mk b/keyboards/hubble/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/hubble/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/hubble/readme.md b/keyboards/hubble/readme.md
new file mode 100644
index 0000000000..3b79a85d0a
--- /dev/null
+++ b/keyboards/hubble/readme.md
@@ -0,0 +1,26 @@
+# hubble
+
+![hubble](https://i.imgur.com/buTSdUqh.jpg)
+
+*ProMicro based 40% keyboard for with nav cluster, underglow and cyrillic layout support*
+
+* Keyboard Maintainer: [Anton Chernenko](https://github.com/ch3rny)
+* Hardware Supported: [Hubble PCB](https://github.com/ch3rny/hubble-keyboard)
+* Hardware Availability: Opensource
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hubble:default
+
+Flashing example for this keyboard:
+
+    make hubble:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/hubble/rules.mk b/keyboards/hubble/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/hubble/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 118370457820ecc45707bc0fa81f27c1b01fc794 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 31 Oct 2022 11:02:49 -0700
Subject: [PATCH 773/959] Star75 Refactor (#18885)

---
 keyboards/star75/info.json                | 99 +++++++++++++++++++++--
 keyboards/star75/keymaps/default/keymap.c |  8 +-
 keyboards/star75/keymaps/via/keymap.c     |  8 +-
 keyboards/star75/star75.h                 | 50 ++++++++----
 4 files changed, 135 insertions(+), 30 deletions(-)

diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json
index f7d0f17e50..879e681c38 100644
--- a/keyboards/star75/info.json
+++ b/keyboards/star75/info.json
@@ -1,16 +1,105 @@
 {
-    "keyboard_name": "Star75", 
+    "keyboard_name": "Star75",
     "manufacturer": "DXWS",
-    "url": "https://item.taobao.com/item.htm?id=656392112467", 
-    "maintainer": "qmk", 
+    "url": "https://item.taobao.com/item.htm?id=656392112467",
+    "maintainer": "qmk",
     "usb": {
         "vid": "0x4B35",
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15, "y":2.25}, {"label":"Capslock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":"", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"PgDn", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Fn", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":11.25, "y":5.25, "w":1.25}, {"label":"Left", "x":13, "y":5.25}, {"label":"Down", "x":14, "y":5.25}, {"label":"Right", "x":15, "y":5.25}]
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Ins", "x":15, "y":0},
+
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1.25},
+                {"label":"+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Home", "x":15, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"PgUp", "x":15, "y":2.25},
+
+                {"label":"Capslock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":"", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"PgDn", "x":15, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Up", "x":14, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Fn", "x":10, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Left", "x":13, "y":5.25},
+                {"label":"Down", "x":14, "y":5.25},
+                {"label":"Right", "x":15, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/star75/keymaps/default/keymap.c b/keyboards/star75/keymaps/default/keymap.c
index 996615877d..a25a1fe102 100644
--- a/keyboards/star75/keymaps/default/keymap.c
+++ b/keyboards/star75/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[_HOME] = LAYOUT_all(
+	[_HOME] = 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_GRV, KC_1, KC_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, 
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, 
 		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC, MO(1), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
 
-	[_FN1] = LAYOUT_all(
+	[_FN1] = LAYOUT(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_RMOD, KC_TRNS),
 
-	[_FN2] = LAYOUT_all(
+	[_FN2] = LAYOUT(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
-	[_FN3] = LAYOUT_all(
+	[_FN3] = LAYOUT(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/star75/keymaps/via/keymap.c b/keyboards/star75/keymaps/via/keymap.c
index 43b53d80dd..15ddf59274 100644
--- a/keyboards/star75/keymaps/via/keymap.c
+++ b/keyboards/star75/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_HOME] = LAYOUT_all(
+    [_HOME] = 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_GRV, KC_1, KC_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, 
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [_FN1] = LAYOUT_all(
+    [_FN1] = LAYOUT(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_RMOD, KC_TRNS),
 
-    [_FN2] = LAYOUT_all(
+    [_FN2] = LAYOUT(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
-    [_FN3] = LAYOUT_all(
+    [_FN3] = LAYOUT(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/star75/star75.h b/keyboards/star75/star75.h
index 7e47ea0e40..899889efb7 100644
--- a/keyboards/star75/star75.h
+++ b/keyboards/star75/star75.h
@@ -1,25 +1,41 @@
-/* 
+/*
 Copyright 2022 Horns Lyn (@hornslyn)
 SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
 #include "quantum.h"
 
-#define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
-	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C, K4D,      \
-	K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E  \
+#define XXX KC_NO
+
+/*
+ * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+ * │00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │
+ * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │1E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C      │3E │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┘
+ * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4C    │4D │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┐
+ * │50  │51  │52  │55                      │59  │5A  │ │5C │5D │5E │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ */
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C, K4D,      \
+    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E  \
 ) { \
-	{ K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  KC_NO, K0E }, \
-	{ K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,   K1E }, \
-	{ K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,   K2E }, \
-	{ K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  KC_NO, K3E }, \
-	{ K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  KC_NO, K4C, K4D, KC_NO }, \
-	{ K50,  K51,  K52,  KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59,  K5A,  KC_NO, K5C,  K5D,  K5E }  \
+    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  XXX,  K0E }, \
+    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,  K1E }, \
+    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E }, \
+    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  XXX,  K3E }, \
+    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  XXX,  K4C,  K4D,  XXX }, \
+    { K50,  K51,  K52,  XXX,  XXX,  K55,  XXX,  XXX,  XXX,  K59,  K5A,  XXX,  K5C,  K5D,  K5E }  \
 }
-
-
-

From a45607f4e6e0f5b7a40d655c10e6bc79272cd4d5 Mon Sep 17 00:00:00 2001
From: Max Rumpf <max.rumpf1998@gmail.com>
Date: Mon, 31 Oct 2022 19:03:14 +0100
Subject: [PATCH 774/959] Phoebe: Add key to print screen (#18856)

---
 keyboards/maxr1998/phoebe/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
index 11ac657751..6f94aacb23 100644
--- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
  * │     │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F10 │ F11 │ F12 │
  * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- * │     │     │     │     │     │     │     │  Ü  │ F9  │  Ö  │     │ Del │
+ * │     │     │     │     │     │     │     │  Ü  │ F9  │  Ö  │ Pscr│ Del │
  * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
  * │ Lck │  Ä  │  ß  │     │     │ GAME│     │RGB S│RGB B│RGB S│     │     │
  * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F10,  KC_F11,  KC_F12,
-  _______, _______, _______, _______, _______, _______, _______, DE_UDIA, KC_F9,   DE_ODIA, _______, KC_DEL,
+  _______, _______, _______, _______, _______, _______, _______, DE_UDIA, KC_F9,   DE_ODIA, KC_PSCR, KC_DEL,
   KC_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______,
   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______,
   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,      _______,     XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END

From 96c48a5f4aa461ed31fd4ee61151ac206e16fb5f Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 31 Oct 2022 20:16:43 +0000
Subject: [PATCH 775/959] Refactor to avoid deprecated wmic execution (#18122)

* wmic deprecated?

* Update platforms/avr/flash.mk

* Update platforms/avr/flash.mk
---
 platforms/avr/flash.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk
index c104f730b3..e058e8d296 100644
--- a/platforms/avr/flash.mk
+++ b/platforms/avr/flash.mk
@@ -78,7 +78,7 @@ AVRDUDE_PROGRAMMER ?= avrdude
 define EXEC_AVRDUDE
 	list_devices() { \
 		if $(GREP) -q -s icrosoft /proc/version; then \
-		    wmic.exe path Win32_SerialPort get DeviceID 2>/dev/null | LANG=C perl -pne 's/COM(\d+)/COM.($$1-1)/e' | sed 's!COM!/dev/ttyS!' | xargs echo -n | sort; \
+			powershell.exe 'Get-CimInstance -Class Win32_SerialPort | Select -ExpandProperty "DeviceID"' 2>/dev/null | sed -e "s/\r//g" | LANG=C perl -pne 's/COM(\d+)/COM.($$1-1)/e' | sed 's!COM!/dev/ttyS!' | sort; \
 		elif [ "`uname`" = "FreeBSD" ]; then \
 			ls /dev/tty* | grep -v '\.lock$$' | grep -v '\.init$$'; \
 		else \

From 5974d989fe72f6c576901a065bee4487a58c351d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 1 Nov 2022 08:15:12 +1100
Subject: [PATCH 776/959] Normalise Unicode keycodes (#18898)

* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`

* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`

* `UC_MAC` -> `UNICODE_MODE_MACOS`

* `UC_LNX` -> `UNICODE_MODE_LINUX`

* `UC_WIN` -> `UNICODE_MODE_WINDOWS`

* `UC_BSD` -> `UNICODE_MODE_BSD`

* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`

* `UC_EMACS` -> `UNICODE_MODE_EMACS`

* `UC__COUNT` -> `UNICODE_MODE_COUNT`

* `UC_M_MA` -> `UC_MAC`

* `UC_M_LN` -> `UC_LINX`

* `UC_M_WI` -> `UC_WIN`

* `UC_M_BS` -> `UC_BSD`

* `UC_M_WC` -> `UC_WINC`

* `UC_M_EM` -> `UC_EMAC`

* Docs

* Update quantum/unicode/unicode.h
---
 docs/feature_unicode.md                       | 42 +++++++--------
 docs/keycodes.md                              | 25 ++++-----
 keyboards/a_dux/keymaps/daliusd/config.h      |  2 +-
 keyboards/abacus/keymaps/unicodemap/keymap.c  |  2 +-
 keyboards/atreus62/keymaps/d4mation/keymap.c  |  4 +-
 .../b_sides/rev41lp/keymaps/namnlos/config.h  |  2 +-
 .../b_sides/rev41lp/keymaps/namnlos/keymap.c  |  2 +-
 .../charybdis/4x6/keymaps/drashna/keymap.c    |  2 +-
 keyboards/bop/config.h                        |  2 +-
 .../quark/keymaps/pezhore/config.h            |  2 +-
 .../quark/keymaps/pezhore/keymap.c            |  4 +-
 keyboards/contra/keymaps/bramver/keymap.c     |  2 +-
 .../ibm_terminal/keymaps/priyadi/keymap.c     |  8 +--
 keyboards/crkbd/keymaps/nimishgautam/config.h |  2 +-
 keyboards/crkbd/keymaps/ollyhayes/config.h    |  2 +-
 keyboards/crkbd/keymaps/rmeli/config.h        |  2 +-
 keyboards/crkbd/keymaps/rmeli/keymap.c        |  4 +-
 .../budget96/keymaps/donut/keymap.c           |  2 +-
 .../doro67/multi/keymaps/konstantin/keymap.c  |  2 +-
 .../durgod/k320/keymaps/kuenhlee/keymap.c     |  2 +-
 .../dz65rgb/keymaps/catrielmuller/config.h    |  2 +-
 .../dz65rgb/keymaps/catrielmuller/keymap.c    |  2 +-
 .../evyd13/wasdat/keymaps/konstantin/keymap.c |  2 +-
 .../gmmk2/p96/ansi/keymaps/default/keymap.c   |  2 +-
 .../gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c  |  2 +-
 .../gmmk2/p96/iso/keymaps/default/keymap.c    |  2 +-
 .../gmmk/gmmk2/p96/iso/keymaps/via/keymap.c   |  2 +-
 .../keymaps/default_tapdance/keymap.c         |  2 +-
 .../handwired/aek64/keymaps/4sstylz/keymap.c  |  2 +-
 .../handwired/d48/keymaps/anderson/keymap.c   |  2 +-
 .../handwired/d48/keymaps/default/keymap.c    |  2 +-
 .../spaget/keymaps/default/keymap.c           |  2 +-
 .../promethium/keymaps/default/keymap.c       | 16 +++---
 .../promethium/keymaps/priyadi/keymap.c       | 16 +++---
 .../handwired/t111/keymaps/oleg/config.h      |  2 +-
 .../handwired/t111/keymaps/oleg/keymap.c      |  2 +-
 .../4x6_right/keymaps/drashna/keymap.c        |  2 +-
 .../5x6_right/keymaps/drashna/keymap.c        |  2 +-
 .../videowriter/keymaps/oleg/keymap.c         |  2 +-
 .../handwired/wulkan/keymaps/default/keymap.c |  2 +-
 keyboards/idobao/id75/keymaps/gkbd/config.h   |  2 +-
 .../keymaps/not-quite-neo/keymap.c            |  2 +-
 .../whitefox/keymaps/konstantin/keymap.c      |  2 +-
 .../kbd67/hotswap/keymaps/zunger/keymap.c     |  2 +-
 keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c |  2 +-
 .../levinson/keymaps/drogglbecher/keymap.c    |  2 +-
 .../keebio/nyquist/keymaps/bramver/keymap.c   |  2 +-
 .../keebio/quefrency/keymaps/bramver/keymap.c |  2 +-
 .../q1/rev_0102/keymaps/victorsavu3/config.h  |  2 +-
 .../bm43hsrgb/keymaps/bitstarr/config.h       |  2 +-
 .../bm43hsrgb/keymaps/bitstarr/keymap.c       |  2 +-
 .../bm43hsrgb/keymaps/bitstarr/readme.md      |  2 +-
 .../rev1/keymaps/carlosala/config.h           |  2 +-
 keyboards/ktec/ergodone/keymaps/vega/keymap.c |  8 +--
 keyboards/lyso1/lck75/config.h                |  2 +-
 .../alt/keymaps/charlesrocket/config.h        |  2 +-
 .../alt/keymaps/charlesrocket/keymap.c        |  2 +-
 .../mechmini/v2/keymaps/wsturgiss/keymap.c    |  4 +-
 keyboards/mitosis/keymaps/nzen/keymap.c       |  2 +-
 keyboards/mlego/m48/keymaps/default/config.h  |  2 +-
 keyboards/mlego/m60/keymaps/default/config.h  |  2 +-
 .../mlego/m60_split/keymaps/default/config.h  |  2 +-
 keyboards/mlego/m65/keymaps/uk/config.h       |  4 +-
 keyboards/moonlander/keymaps/drashna/keymap.c |  2 +-
 keyboards/planck/keymaps/buhearns/keymap.c    |  2 +-
 keyboards/planck/keymaps/mwpeterson/keymap.c  |  2 +-
 keyboards/planck/keymaps/rootiest/config.h    |  2 +-
 keyboards/planck/keymaps/rootiest/keymap.c    |  4 +-
 keyboards/planck/keymaps/sascha/keymap.c      |  2 +-
 keyboards/planck/keymaps/snowkuma/keymap.c    |  2 +-
 .../keymaps/zach/zach_common_functions.c      |  4 +-
 keyboards/preonic/keymaps/pezhore/config.h    |  2 +-
 keyboards/preonic/keymaps/pezhore/keymap.c    | 10 ++--
 .../keymaps/zach/zach_common_functions.c      |  4 +-
 keyboards/redox/keymaps/jeherve/config.h      |  2 +-
 .../reviung41/keymaps/ciutadellla/config.h    |  2 +-
 .../reviung41/keymaps/ciutadellla/keymap.c    |  2 +-
 .../nknl7jp/keymaps/salicylic/config.h        |  2 +-
 .../signum/3_0/keymaps/default/layout.py      |  2 +-
 .../spaceman/2_milk/keymaps/emoji/config.h    |  2 +-
 .../spaceman/2_milk/keymaps/emoji/readme.md   | 10 ++--
 .../spaceman/2_milk/keymaps/encg/config.h     |  2 +-
 .../spaceman/2_milk/keymaps/encg/readme.md    |  2 +-
 .../splitkb/kyria/keymaps/drashna/keymap.c    |  2 +-
 keyboards/splitkb/kyria/keymaps/lw/config.h   |  2 +-
 keyboards/splitkb/kyria/keymaps/lw/keymap.c   |  4 +-
 keyboards/splitkb/kyria/keymaps/lw/readme.md  |  4 +-
 .../minivan/keymaps/josjoha/keymap.c          |  2 +-
 .../xiudi/xd75/keymaps/billypython/keymap.c   |  2 +-
 keyboards/xiudi/xd75/keymaps/bramver/keymap.c |  2 +-
 keyboards/xiudi/xd75/keymaps/markus/config.h  |  2 +-
 keyboards/xiudi/xd75/keymaps/markus/keymap.c  |  6 +--
 keyboards/xiudi/xd75/keymaps/minna/config.h   |  2 +-
 keyboards/xiudi/xd75/keymaps/minna/keymap.c   |  2 +-
 .../yatara/drink_me/keymaps/queen/config.h    |  2 +-
 .../yatara/drink_me/keymaps/queen/keymap.c    |  8 +--
 keyboards/ymdk/melody96/keymaps/dvz/config.h  |  2 +-
 .../ymdk/melody96/keymaps/konstantin/keymap.c |  2 +-
 .../ymdk/melody96/keymaps/zunger/keymap.c     |  2 +-
 layouts/community/60_iso/bifbofii/keymap.c    |  4 +-
 .../65_ansi_blocker/spidey3/keymap.c          |  4 +-
 layouts/community/75_ansi/spidey3/keymap.c    |  4 +-
 layouts/community/ergodox/deadcyclo/keymap.c  |  2 +-
 layouts/community/ergodox/drashna/keymap.c    |  2 +-
 .../community/ortho_4x12/bifbofii/keymap.c    |  4 +-
 layouts/community/ortho_5x12/riblee/config.h  |  2 +-
 layouts/community/ortho_5x12/riblee/keymap.c  |  2 +-
 .../process_keycode/process_unicode_common.c  | 28 +++++-----
 quantum/quantum_keycodes.h                    | 32 +++++------
 quantum/quantum_keycodes_legacy.h             |  9 ++++
 quantum/unicode/unicode.c                     | 54 +++++++++----------
 quantum/unicode/unicode.h                     | 15 +++---
 tests/caps_word/caps_word_unicodemap/config.h |  2 +-
 tests/test_common/test_driver.hpp             |  2 +-
 users/arkag/arkag.c                           |  6 +--
 users/drashna/config.h                        |  2 +-
 users/konstantin/config.h                     |  2 +-
 users/kuchosauronad0/kuchosauronad0.c         |  4 +-
 users/ridingqwerty/ridingqwerty.c             |  2 +-
 users/romus/romus.c                           |  6 +--
 users/rupa/config.h                           |  2 +-
 users/rupa/wrappers.h                         |  2 +-
 users/rverst/rverst.c                         |  6 +--
 users/rverst/unicode.h                        |  2 +-
 users/sigma/sigma.c                           |  6 +--
 users/spidey3/config.h                        |  2 +-
 users/spidey3/layer_rgb.c                     | 22 ++++----
 users/spidey3/spidey3.c                       |  6 +--
 users/spidey3/spidey3_unicode.c               |  2 +-
 users/uqs/config.h                            |  2 +-
 users/uqs/uqs.c                               |  4 +-
 .../yet-another-developer.c                   |  4 +-
 132 files changed, 303 insertions(+), 292 deletions(-)

diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
index 0b06cae6c2..a93e9ad2ba 100644
--- a/docs/feature_unicode.md
+++ b/docs/feature_unicode.md
@@ -112,28 +112,28 @@ Unicode input in QMK works by inputting a sequence of characters to the OS, sort
 
 The following input modes are available:
 
-* **`UC_MAC`**: macOS built-in Unicode hex input. Supports code points up to `0x10FFFF` (all possible code points).
+* **`UNICODE_MODE_MACOS`**: macOS built-in Unicode hex input. Supports code points up to `0x10FFFF` (all possible code points).
 
   To enable, go to _System Preferences > Keyboard > Input Sources_, add _Unicode Hex Input_ to the list (it's under _Other_), then activate it from the input dropdown in the Menu Bar.
   By default, this mode uses the left Option key (`KC_LALT`) for Unicode input, but this can be changed by defining [`UNICODE_KEY_MAC`](#input-key-configuration) with a different keycode.
 
   !> Using the _Unicode Hex Input_ input source may disable some Option-based shortcuts, such as Option+Left and Option+Right.
 
-* **`UC_LNX`**: Linux built-in IBus Unicode input. Supports code points up to `0x10FFFF` (all possible code points).
+* **`UNICODE_MODE_LINUX`**: Linux built-in IBus Unicode input. Supports code points up to `0x10FFFF` (all possible code points).
 
   Enabled by default and works almost anywhere on IBus-enabled distros. Without IBus, this mode works under GTK apps, but rarely anywhere else.
   By default, this mode uses Ctrl+Shift+U (`LCTL(LSFT(KC_U))`) to start Unicode input, but this can be changed by defining [`UNICODE_KEY_LNX`](#input-key-configuration) with a different keycode. This might be required for IBus versions ≥1.5.15, where Ctrl+Shift+U behavior is consolidated into Ctrl+Shift+E.
 
   Users who wish support in non-GTK apps without IBus may need to resort to a more indirect method, such as creating a custom keyboard layout ([more on this method](#custom-linux-layout)).
 
-* **`UC_WIN`**: _(not recommended)_ Windows built-in hex numpad Unicode input. Supports code points up to `0xFFFF`.
+* **`UNICODE_MODE_WINDOWS`**: _(not recommended)_ Windows built-in hex numpad Unicode input. Supports code points up to `0xFFFF`.
 
   To enable, create a registry key under `HKEY_CURRENT_USER\Control Panel\Input Method` of type `REG_SZ` called `EnableHexNumpad` and set its value to `1`. This can be done from the Command Prompt by running `reg add "HKCU\Control Panel\Input Method" -v EnableHexNumpad -t REG_SZ -d 1` with administrator privileges. Reboot afterwards.
-  This mode is not recommended because of reliability and compatibility issues; use the `UC_WINC` mode instead.
+  This mode is not recommended because of reliability and compatibility issues; use the `UNICODE_MODE_WINCOMPOSE` mode instead.
 
-* **`UC_BSD`**: _(non implemented)_ Unicode input under BSD. Not implemented at this time. If you're a BSD user and want to help add support for it, please [open an issue on GitHub](https://github.com/qmk/qmk_firmware/issues).
+* **`UNICODE_MODE_BSD`**: _(non implemented)_ Unicode input under BSD. Not implemented at this time. If you're a BSD user and want to help add support for it, please [open an issue on GitHub](https://github.com/qmk/qmk_firmware/issues).
 
-* **`UC_WINC`**: Windows Unicode input using [WinCompose](https://github.com/samhocevar/wincompose). As of v0.9.0, supports code points up to `0x10FFFF` (all possible code points).
+* **`UNICODE_MODE_WINCOMPOSE`**: Windows Unicode input using [WinCompose](https://github.com/samhocevar/wincompose). As of v0.9.0, supports code points up to `0x10FFFF` (all possible code points).
 
   To enable, install the [latest release](https://github.com/samhocevar/wincompose/releases/latest). Once installed, WinCompose will automatically run on startup. This mode works reliably under all version of Windows supported by the app.
   By default, this mode uses right Alt (`KC_RALT`) as the Compose key, but this can be changed in the WinCompose settings and by defining [`UNICODE_KEY_WINC`](#input-key-configuration) with a different keycode.
@@ -144,15 +144,15 @@ The following input modes are available:
 To set your desired input mode, add the following define to your `config.h`:
 
 ```c
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 ```
 
-This example sets the board's default input mode to `UC_LNX`. You can replace this with `UC_MAC`, `UC_WINC`, or any of the other modes listed [above](#input-modes). The board will automatically use the selected mode on startup, unless you manually switch to another mode (see [below](#keycodes)).
+This example sets the board's default input mode to `UNICODE_MODE_LINUX`. You can replace this with `UNICODE_MODE_MACOS`, `UNICODE_MODE_WINCOMPOSE`, or any of the other modes listed [above](#input-modes). The board will automatically use the selected mode on startup, unless you manually switch to another mode (see [below](#keycodes)).
 
-You can also select multiple input modes, which allows you to easily cycle through them using the `UC_MOD`/`UC_RMOD` keycodes.
+You can also select multiple input modes, which allows you to easily cycle through them using the `UC_NEXT`/`UC_PREV` keycodes.
 
 ```c
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
 ```
 
 Note that the values are separated by commas. The board will remember the last used input mode and will continue using it on next power-up. You can disable this and force it to always start with the first mode in the list by adding `#define UNICODE_CYCLE_PERSIST false` to your `config.h`.
@@ -161,18 +161,18 @@ Note that the values are separated by commas. The board will remember the last u
 
 You can switch the input mode at any time by using the following keycodes. Adding these to your keymap allows you to quickly switch to a specific input mode, including modes not listed in `UNICODE_SELECTED_MODES`.
 
-|Keycode               |Alias    |Input Mode  |Description                                                                  |
-|----------------------|---------|------------|-----------------------------------------------------------------------------|
-|`UNICODE_MODE_FORWARD`|`UC_MOD` |Next in list|Cycle through selected modes, reverse direction when Shift is held           |
-|`UNICODE_MODE_REVERSE`|`UC_RMOD`|Prev in list|Cycle through selected modes in reverse, forward direction when Shift is held|
-|`UNICODE_MODE_MAC`    |`UC_M_MA`|`UC_MAC`    |Switch to macOS input                                                        |
-|`UNICODE_MODE_LNX`    |`UC_M_LN`|`UC_LNX`    |Switch to Linux input                                                        |
-|`UNICODE_MODE_WIN`    |`UC_M_WI`|`UC_WIN`    |Switch to Windows input                                                      |
-|`UNICODE_MODE_BSD`    |`UC_M_BS`|`UC_BSD`    |Switch to BSD input _(not implemented)_                                      |
-|`UNICODE_MODE_WINC`   |`UC_M_WC`|`UC_WINC`   |Switch to Windows input using WinCompose                                     |
-|`UNICODE_MODE_EMACS`  |`UC_M_EM`|`UC_EMACS`  |Switch to emacs (`C-x-8 RET`)                                               |
+|Keycode                     |Alias    |Input Mode               |Description                                                                  |
+|----------------------------|---------|-------------------------|-----------------------------------------------------------------------------|
+|`QK_UNICODE_MODE_NEXT`      |`UC_NEXT`|Next in list             |Cycle through selected modes, reverse direction when Shift is held           |
+|`QK_UNICODE_MODE_PREVIOUS`  |`UC_PREV`|Prev in list             |Cycle through selected modes in reverse, forward direction when Shift is held|
+|`QK_UNICODE_MODE_MACOS`     |`UC_MAC` |`UNICODE_MODE_MACOS`     |Switch to macOS input                                                        |
+|`QK_UNICODE_MODE_LINUX`     |`UC_LINX`|`UNICODE_MODE_LINUX`     |Switch to Linux input                                                        |
+|`QK_UNICODE_MODE_WINDOWS`   |`UC_WIN` |`UNICODE_MODE_WINDOWS`   |Switch to Windows input                                                      |
+|`QK_UNICODE_MODE_BSD`       |`UC_BSD` |`UNICODE_MODE_BSD`       |Switch to BSD input _(not implemented)_                                      |
+|`QK_UNICODE_MODE_WINCOMPOSE`|`UC_WINC`|`UNICODE_MODE_WINCOMPOSE`|Switch to Windows input using WinCompose                                     |
+|`QK_UNICODE_MODE_EMACS`     |`UC_EMAC`|`UNICODE_MODE_EMACS`     |Switch to emacs (`C-x-8 RET`)                                                |
 
-You can also switch the input mode by calling `set_unicode_input_mode(x)` in your code, where _x_ is one of the above input mode constants (e.g. `UC_LNX`).
+You can also switch the input mode by calling `set_unicode_input_mode(x)` in your code, where _x_ is one of the above input mode constants (e.g. `UNICODE_MODE_LINUX`).
 
 ?> Using `UNICODE_SELECTED_MODES` is preferable to calling `set_unicode_input_mode()` in `matrix_init_user()` or similar functions, since it's better integrated into the Unicode system and has the added benefit of avoiding unnecessary writes to EEPROM.
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 1aea603ede..f701193a45 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -839,15 +839,16 @@ See also: [Swap Hands](feature_swap_hands.md)
 
 See also: [Unicode Support](feature_unicode.md)
 
-|Key                   |Aliases  |Description                                                     |
-|----------------------|---------|----------------------------------------------------------------|
-|`UC(c)`               |         |Send Unicode code point `c`, up to `0x7FFF`                     |
-|`X(i)`                |         |Send Unicode code point at index `i` in `unicode_map`           |
-|`XP(i, j)`            |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
-|`UNICODE_MODE_FORWARD`|`UC_MOD` |Cycle through selected input modes                              |
-|`UNICODE_MODE_REVERSE`|`UC_RMOD`|Cycle through selected input modes in reverse                   |
-|`UNICODE_MODE_MAC`    |`UC_M_MA`|Switch to macOS input                                           |
-|`UNICODE_MODE_LNX`    |`UC_M_LN`|Switch to Linux input                                           |
-|`UNICODE_MODE_WIN`    |`UC_M_WI`|Switch to Windows input                                         |
-|`UNICODE_MODE_BSD`    |`UC_M_BS`|Switch to BSD input (not implemented)                           |
-|`UNICODE_MODE_WINC`   |`UC_M_WC`|Switch to Windows input using WinCompose                        |
+|Key                         |Aliases  |Description                                                     |
+|----------------------------|---------|----------------------------------------------------------------|
+|`UC(c)`                     |         |Send Unicode code point `c`, up to `0x7FFF`                     |
+|`X(i)`                      |         |Send Unicode code point at index `i` in `unicode_map`           |
+|`XP(i, j)`                  |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
+|`QK_UNICODE_MODE_NEXT`      |`UC_NEXT`|Cycle through selected input modes                              |
+|`QK_UNICODE_MODE_PREVIOUS`  |`UC_PREV`|Cycle through selected input modes in reverse                   |
+|`QK_UNICODE_MODE_MACOS`     |`UC_MAC` |Switch to macOS input                                           |
+|`QK_UNICODE_MODE_LINUX`     |`UC_LINX`|Switch to Linux input                                           |
+|`QK_UNICODE_MODE_WINDOWS`   |`UC_WIN` |Switch to Windows input                                         |
+|`QK_UNICODE_MODE_BSD`       |`UC_BSD` |Switch to BSD input (not implemented)                           |
+|`QK_UNICODE_MODE_WINCOMPOSE`|`UC_WINC`|Switch to Windows input using WinCompose                        |
+|`QK_UNICODE_MODE_EMACS`     |`UC_EMAC`|Switch to emacs (`C-x-8 RET`)                                   |
diff --git a/keyboards/a_dux/keymaps/daliusd/config.h b/keyboards/a_dux/keymaps/daliusd/config.h
index 786451768a..78a96dd7ac 100644
--- a/keyboards/a_dux/keymaps/daliusd/config.h
+++ b/keyboards/a_dux/keymaps/daliusd/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 
 #define MOUSEKEY_INTERVAL 12
 #define MOUSEKEY_MAX_SPEED 6
diff --git a/keyboards/abacus/keymaps/unicodemap/keymap.c b/keyboards/abacus/keymaps/unicodemap/keymap.c
index 95f343b33c..7441b12882 100644
--- a/keyboards/abacus/keymaps/unicodemap/keymap.c
+++ b/keyboards/abacus/keymaps/unicodemap/keymap.c
@@ -130,7 +130,7 @@ bool dip_switch_update_user(uint8_t index, bool active) {
 
 
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_WINC);
+    set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
 }
 
 bool encoder_update_user(uint8_t index, bool clockwise) {
diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c
index 1448f0a9d1..e01f5b9ec6 100644
--- a/keyboards/atreus62/keymaps/d4mation/keymap.c
+++ b/keyboards/atreus62/keymaps/d4mation/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT(
     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, UC_M_WI, UC_M_MA, XXXXXXX,                   XXXXXXX, DF(_DVR),DF(_QWR),XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, UC_WIN,  UC_MAC,  XXXXXXX,                   XXXXXXX, DF(_DVR),DF(_QWR),XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, CG_SWAP, CG_NORM, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
   ),
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Runs just one time when the keyboard initializes. */
 void eeconfig_init_keymap( void ) {
-  set_unicode_input_mode( UC_MAC );
+  set_unicode_input_mode( UNICODE_MODE_MACOS );
 };
 
 bool process_record_keymap( uint16_t keycode, keyrecord_t *record ) {
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
index 69d44bdd03..b6f2866c46 100644
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
+++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
@@ -24,7 +24,7 @@
 #define COMBO_COUNT 3
 #define IGNORE_MOD_TAP_INTERRUPT
 
-#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_MAC, UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
index 968f96f3b2..0a43c83440 100644
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
+++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_rev41lp(
     XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,    BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   BL_STEP,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    XXXXXXX,   UC_M_WC, UC_M_MA,  UC_M_LN,  XXXXXXX,   XXXXXXX,            QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   UC_WINC, UC_MAC,   UC_LINX,  XXXXXXX,   XXXXXXX,            QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
                                                _______, _______, _______,  _______,  _______
   )
 };
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
index a0f290ad57..cc6dbc34e9 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_BLOCKS,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT,
         VRSN,    _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________, EE_CLR,
         KEYLOCK, _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________, TG_MODS,
-        UC_MOD,  _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________, KC_MPLY,
+        UC_NEXT, _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________, KC_MPLY,
                                    QK_RBT, AUTO_CTN, _______,    _______, KC_NUKE,
                                            _______, _______,      _______
     )
diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h
index 00bae0f655..d3b3c90d48 100644
--- a/keyboards/bop/config.h
+++ b/keyboards/bop/config.h
@@ -41,4 +41,4 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* Unicode select mode */
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/checkerboards/quark/keymaps/pezhore/config.h b/keyboards/checkerboards/quark/keymaps/pezhore/config.h
index 824bad44af..35b49ed9c9 100644
--- a/keyboards/checkerboards/quark/keymaps/pezhore/config.h
+++ b/keyboards/checkerboards/quark/keymaps/pezhore/config.h
@@ -15,5 +15,5 @@
  */
 
 #pragma once
-#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
index 4c96169830..f331e2b9cf 100644
--- a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
@@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT_ortho_4x12(
    KC_GRV,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  POOP,     KC_PSCR,  KC_DEL,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_M_WC,
-  _______,    SHRUG,    TFLIP,     POOP,   DPOINT,    STRUT,  _______,  _______,  _______,  _______,   SARCSM,  UC_M_LN,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_WINC,
+  _______,    SHRUG,    TFLIP,     POOP,   DPOINT,    STRUT,  _______,  _______,  _______,  _______,   SARCSM,  UC_LINX,
   _______,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  _______
 ),
 
diff --git a/keyboards/contra/keymaps/bramver/keymap.c b/keyboards/contra/keymaps/bramver/keymap.c
index d34b958b2b..e84dcc9af6 100644
--- a/keyboards/contra/keymaps/bramver/keymap.c
+++ b/keyboards/contra/keymaps/bramver/keymap.c
@@ -122,5 +122,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
index ab92ad2112..15db200779 100644
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
+++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
@@ -281,15 +281,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     /* os switcher */
     case OS_LIN:
-      set_unicode_input_mode(UC_LNX);
+      set_unicode_input_mode(UNICODE_MODE_LINUX);
       return false;
       break;
     case OS_WIN:
-      set_unicode_input_mode(UC_WINC);
+      set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
       return false;
       break;
     case OS_MAC:
-      set_unicode_input_mode(UC_MAC);
+      set_unicode_input_mode(UNICODE_MODE_MACOS);
       return false;
       break;
 
@@ -298,5 +298,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void matrix_init_user() {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h
index d237727091..38146abb43 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/config.h
+++ b/keyboards/crkbd/keymaps/nimishgautam/config.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // OS-specific stuff
-//#define UNICODE_SELECTED_MODES UC_MAC
+//#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS
 
 /* Select hand configuration */
 //#define MASTER_LEFT
diff --git a/keyboards/crkbd/keymaps/ollyhayes/config.h b/keyboards/crkbd/keymaps/ollyhayes/config.h
index 734d41d084..4c51005181 100644
--- a/keyboards/crkbd/keymaps/ollyhayes/config.h
+++ b/keyboards/crkbd/keymaps/ollyhayes/config.h
@@ -25,7 +25,7 @@
 
 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
 
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/crkbd/keymaps/rmeli/config.h b/keyboards/crkbd/keymaps/rmeli/config.h
index 36fb755d00..007e4bc45b 100644
--- a/keyboards/crkbd/keymaps/rmeli/config.h
+++ b/keyboards/crkbd/keymaps/rmeli/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 200
 
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
 
 #define AUTO_SHIFT_REPEAT
 
diff --git a/keyboards/crkbd/keymaps/rmeli/keymap.c b/keyboards/crkbd/keymaps/rmeli/keymap.c
index b1fc6d1d02..04528fda8c 100644
--- a/keyboards/crkbd/keymaps/rmeli/keymap.c
+++ b/keyboards/crkbd/keymaps/rmeli/keymap.c
@@ -120,11 +120,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_CONFIG] = LAYOUT_split_3x6_3(
   //|-----------------------------------------------------|                    |-----------------------------------------------------|
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       UC_MOD,   AS_UP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      UC_NEXT,   AS_UP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, AS_TOGG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      UC_RMOD, AS_DOWN,  NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
+      XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      UC_PREV, AS_DOWN,  NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,   _______, _______, _______
                                       //|--------------------------|  |--------------------------|
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
index d7beffde4d..d7e2bfd0d0 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* (3) Fn 2 */
     [_FN2] = LAYOUT_96_ansi(
-	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC_M_WC, EE_CLR, QK_BOOT, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC_WINC, EE_CLR, QK_BOOT, 
 	VK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
diff --git a/keyboards/doro67/multi/keymaps/konstantin/keymap.c b/keyboards/doro67/multi/keymaps/konstantin/keymap.c
index 54f5ba09e6..02687f8248 100644
--- a/keyboards/doro67/multi/keymaps/konstantin/keymap.c
+++ b/keyboards/doro67/multi/keymaps/konstantin/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [L_FN] = LAYOUT_multi(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  NUMPAD,  KC_SCRL, KC_PAUS,
-        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            KC_INS,
+        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_NEXT, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            KC_INS,
         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______,          _______,          TOP,
         _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, BOTTOM,
         _______, DST_P_R, DST_N_A,          KC_WH_D,          _______,          _______,          _______, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
index ff339dcb54..c03fdb5bf7 100644
--- a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
+++ b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
@@ -141,5 +141,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_WINC);
+  set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
 }
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
index 966bc5d064..76feedceb0 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
@@ -1,3 +1,3 @@
 #define LEADER_TIMEOUT 300
 #define FORCE_NKRO
-#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
\ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 925f5d0509..8bc5edf937 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -224,7 +224,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_CONFIG] = LAYOUT_65_ansi(
         TO(_MAIN), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL2,
         KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, DB_TOGG, EE_CLR, KC_NO, KC_ACL1,
-        KC_NO, UC_RMOD, UC_MOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL0,
+        KC_NO, UC_PREV, UC_NEXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL0,
         KC_NO, MAGIC_TOGGLE_NKRO, MAGIC_UNHOST_NKRO, MAGIC_HOST_NKRO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
     ),
diff --git a/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c b/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
index 2c18d9c447..fcbab46b72 100644
--- a/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
+++ b/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [L_FN] = LAYOUT_tkl_iso(
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NUMPAD,  KC_MUTE,
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  CLEAR,   KC_MPLY, KC_MSTP, KC_VOLU,
-        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD,
+        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_NEXT, _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD,
         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  _______, _______, _______,          _______,          KC_PGUP,
         _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
index 81dd960377..27d1d74c9f 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
@@ -42,5 +42,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
   _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-	_______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
+	_______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
 };
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
index 0df96f3ec1..15c2b2b3b9 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
   _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-	_______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
+	_______,  UC_WIN,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
 [2] = LAYOUT(
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
index eae862138c..8662bdf630 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
@@ -40,5 +40,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
   _______,  _______,  RGB_SAI,  RGB_SAD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-  _______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
+  _______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
 };
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
index 0ddc19b954..1b73959bce 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
   _______,  _______,  RGB_SAI,  RGB_SAD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-	_______,  UC_M_WI,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
+	_______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
 [2] = LAYOUT(
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c
index d567c9febd..c70ecd5562 100644
--- a/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c
+++ b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c
@@ -135,7 +135,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 void matrix_init_user(void)
 {
-    set_unicode_input_mode(UC_WINC);  /* See https://jayliu50.github.io/qmk-cheatsheet/ */
+    set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);  /* See https://jayliu50.github.io/qmk-cheatsheet/ */
 }
 
 
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
index 4b1c571e35..0c9c5a7c18 100644
--- a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
+++ b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Set the unicode input mode for using UC.
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
 
 // Processing all the key pressed.
diff --git a/keyboards/handwired/d48/keymaps/anderson/keymap.c b/keyboards/handwired/d48/keymaps/anderson/keymap.c
index adead97505..ae5ed7ad86 100644
--- a/keyboards/handwired/d48/keymaps/anderson/keymap.c
+++ b/keyboards/handwired/d48/keymaps/anderson/keymap.c
@@ -133,7 +133,7 @@ void keyboard_post_init_user(void) {
 }
 
 void eeconfig_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
 
 void matrix_init_user(void) {
diff --git a/keyboards/handwired/d48/keymaps/default/keymap.c b/keyboards/handwired/d48/keymaps/default/keymap.c
index 5dbd66a71b..388a0726d5 100644
--- a/keyboards/handwired/d48/keymaps/default/keymap.c
+++ b/keyboards/handwired/d48/keymaps/default/keymap.c
@@ -110,7 +110,7 @@ void keyboard_post_init_user(void) {
 }
 
 void eeconfig_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
 
 static uint32_t last_update = 0;
diff --git a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
index 8ed2443441..afd1eb399e 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
+++ b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
@@ -339,7 +339,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 // Unicode input mode set to Windows using WinCompose
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_WINC);
+    set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
 };
 #ifdef OLED_ENABLE
 bool oled_task_user(void) {
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 00ba10b769..ff95655242 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -603,14 +603,14 @@ void led_set_unicode_input_mode(void) {
   rgbsps_set(LED_IND_WINDOWS, COLOR_BLANK);
 
   switch (get_unicode_input_mode()) {
-    case UC_LNX:
+    case UNICODE_MODE_LINUX:
       rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
       break;
-    case UC_MAC:
+    case UNICODE_MODE_MACOS:
       rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
       break;
-    case UC_WIN:
-    case UC_WINC:
+    case UNICODE_MODE_WINDOWS:
+    case UNICODE_MODE_WINCOMPOSE:
       rgbsps_set(LED_IND_WINDOWS, THEME_COLOR_WINDOWS);
       break;
   }
@@ -1199,21 +1199,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     // OS switchers
     case LINUX:
-      set_unicode_input_mode(UC_LNX);
+      set_unicode_input_mode(UNICODE_MODE_LINUX);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
       return false;
       break;
     case WIN:
-      set_unicode_input_mode(UC_WINC);
+      set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
       return false;
       break;
     case OSX:
-      set_unicode_input_mode(UC_MAC);
+      set_unicode_input_mode(UNICODE_MODE_MACOS);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
@@ -1278,7 +1278,7 @@ void set_output_user(uint8_t output) {
 void matrix_init_user() {
   wait_ms(500); // give time for usb to initialize
 
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 
 #ifdef RGBSPS_ENABLE
   led_init();
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 3bfcd61a1a..9d3f01b812 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -606,14 +606,14 @@ void led_set_unicode_input_mode(void) {
   rgbsps_set(LED_IND_WINDOWS, COLOR_BLANK);
 
   switch (get_unicode_input_mode()) {
-    case UC_LNX:
+    case UNICODE_MODE_LINUX:
       rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
       break;
-    case UC_MAC:
+    case UNICODE_MODE_MACOS:
       rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
       break;
-    case UC_WIN:
-    case UC_WINC:
+    case UNICODE_MODE_WINDOWS:
+    case UNICODE_MODE_WINCOMPOSE:
       rgbsps_set(LED_IND_WINDOWS, THEME_COLOR_WINDOWS);
       break;
   }
@@ -1202,21 +1202,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     // OS switchers
     case LINUX:
-      set_unicode_input_mode(UC_LNX);
+      set_unicode_input_mode(UNICODE_MODE_LINUX);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
       return false;
       break;
     case WIN:
-      set_unicode_input_mode(UC_WINC);
+      set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
       return false;
       break;
     case OSX:
-      set_unicode_input_mode(UC_MAC);
+      set_unicode_input_mode(UNICODE_MODE_MACOS);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif
@@ -1281,7 +1281,7 @@ void set_output_user(uint8_t output) {
 void matrix_init_user() {
   wait_ms(500); // give time for usb to initialize
 
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 
 #ifdef RGBSPS_ENABLE
   led_init();
diff --git a/keyboards/handwired/t111/keymaps/oleg/config.h b/keyboards/handwired/t111/keymaps/oleg/config.h
index 22ae5bcf4c..b4f15ae896 100644
--- a/keyboards/handwired/t111/keymaps/oleg/config.h
+++ b/keyboards/handwired/t111/keymaps/oleg/config.h
@@ -17,4 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_WIN, UC_WINC
\ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
\ No newline at end of file
diff --git a/keyboards/handwired/t111/keymaps/oleg/keymap.c b/keyboards/handwired/t111/keymaps/oleg/keymap.c
index 9d66ded502..0a00151f89 100644
--- a/keyboards/handwired/t111/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/t111/keymaps/oleg/keymap.c
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------------------------------------------'
 */    
     [1] = LAYOUT(
-    VRSN,             KC_SLEP, _______, UC_MOD,  _______, _______, _______, _______, _______, _______,        _______,        _______, _______, _______, _______, _______, _______,
+    VRSN,             KC_SLEP, _______, UC_NEXT, _______, _______, _______, _______, _______, _______,        _______,        _______, _______, _______, _______, _______, _______,
     _______, _______, X(UAT),  X(UHSH), X(UDLR), X(USCT), X(UCFX), X(UAMP), X(UAST), _______, _______,        _______,               _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
     _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SCRL, KC_PAUS,        XP(ULSB, ULCB), XP(URSB, URCB),        _______,   _______, _______, _______, _______, _______, _______,
     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______, _______, XP(USCO, UCLN), XP(UAPO, UQOT),        _______,                          _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
index dde663b6ac..bb873a33f7 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_4x6_right_wrapper(
         QK_MAKE, _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, QK_BOOT,
         VRSN,    _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, EE_CLR,
-        UC_MOD,  _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, TG_MODS,
+        UC_NEXT, _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, TG_MODS,
                           HPT_DWLI, HPT_DWLD,                                                        TG_GAME, TG_DBLO,
                                             HPT_TOG, HPT_BUZ,                               KC_NUKE,
                                                      _______, _______,             _______,
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 1a46317a42..a96630842d 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,                 KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, QK_BOOT,
         VRSN,    _________________ADJUST_L1_________________,                        _________________ADJUST_R1_________________, EE_CLR,
         KEYLOCK, _________________ADJUST_L2_________________,                        _________________ADJUST_R2_________________, TG_MODS,
-        UC_MOD,  _________________ADJUST_L3_________________,                        _________________ADJUST_R3_________________, KC_MPLY,
+        UC_NEXT, _________________ADJUST_L3_________________,                        _________________ADJUST_R3_________________, KC_MPLY,
                    TG(_DIABLOII), AUTO_CTN,                                                            TG_GAME, TG_DBLO,
                                             _______, QK_RBT,                                  KC_NUKE,
                                                      _______, _______,               _______,
diff --git a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
index 1568b2f61b..94e3fbcfe1 100644
--- a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
@@ -103,6 +103,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_WIN);
+  set_unicode_input_mode(UNICODE_MODE_WINDOWS);
 }
 
diff --git a/keyboards/handwired/wulkan/keymaps/default/keymap.c b/keyboards/handwired/wulkan/keymaps/default/keymap.c
index 6ae4ad0b86..2612c084fd 100644
--- a/keyboards/handwired/wulkan/keymaps/default/keymap.c
+++ b/keyboards/handwired/wulkan/keymaps/default/keymap.c
@@ -107,5 +107,5 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 }
 
 void eeconfig_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
diff --git a/keyboards/idobao/id75/keymaps/gkbd/config.h b/keyboards/idobao/id75/keymaps/gkbd/config.h
index 35572307c0..35e479fdf6 100644
--- a/keyboards/idobao/id75/keymaps/gkbd/config.h
+++ b/keyboards/idobao/id75/keymaps/gkbd/config.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE
 
 /* Selected Unicode input method relies on WinCompose
  * https://docs.qmk.fm/#/feature_unicode?id=input-modes
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
index bfbe2a0318..be1edfc019 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
@@ -258,7 +258,7 @@ L06 -> <TBD>: UNSPECIFIED
 
 // Runs just one time when the keyboard initializes.
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 };
 
 
diff --git a/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
index a7273b6902..d89888aa59 100644
--- a/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [L_FN] = 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,  NUMPAD,  KC_SCRL, KC_PAUS,
-        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            KC_INS,
+        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_NEXT, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            KC_INS,
         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______,          _______,          TOP,
         _______,          KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, BOTTOM,
         _______, DST_P_R, DST_N_A,                            KC_WH_D,                   _______, _______,                   KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index faf90b624e..9cdf31ce9b 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -161,7 +161,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void eeconfig_init_user(void) {
-  set_unicode_input_mode(UC_MAC);
+  set_unicode_input_mode(UNICODE_MODE_MACOS);
 }
 
 void matrix_init_user(void) {
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
index fe0080375a..e822b39276 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
@@ -27,7 +27,7 @@
 
 //Unicode keymaps
 void eeconfig_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
 #define DE_ADIA     UC(0x00E4)
 #define DE_SS       UC(0x00DF)
diff --git a/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c b/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c
index b8d2dc5949..4906faf4ef 100644
--- a/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c
@@ -72,5 +72,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 };
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
index 0448862023..183a77cc2d 100644
--- a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
@@ -241,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 };
 
 
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
index 1b8738a1d2..6b0ddfe8da 100644
--- a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
@@ -127,5 +127,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 };
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
index 8120a9352a..4019f83429 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
+++ b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
@@ -61,7 +61,7 @@
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
 
 // Unicode for Linux
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 #define UNICODE_KEY_LNX  LCTL(LSFT(KC_U))
 
 // Leader config
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
index 2de4c8f889..50c75ee7f6 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX, UC_MAC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
 #define UNICODE_CYCLE_PERSIST false
 
 #ifdef RGB_DI_PIN
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
index f201c3d88f..6a4ca7550d 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_MOD
+        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,
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
index f277cc284a..704be0e416 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
@@ -88,7 +88,7 @@ UNI Layer
 * Umlauts
 * Punctuation
 * Special Characters
-* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UC_WINC, UC_WIN, UC_LNX, UC_MAC)
+* 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
 ```
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
index 81750ce50b..4eba7eea7d 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
@@ -4,4 +4,4 @@
 #pragma once
 
 #define TAPPING_TERM 175
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
index 5e166f940a..eafbdda513 100644
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
@@ -649,8 +649,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [FNLR] = LAYOUT_ergodox(
        // left hand
-       UC_M_LN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,
-       UC_M_WC,KC_F11, KC_F12, KC_F13,KC_F14, KC_F15,  KC_NO,
+       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),
@@ -658,8 +658,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                KC_NO,
                                KC_NO,KC_NO,KC_NO,
        // right hand
-       TO(BASE), KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  UC_M_LN,
-       KC_NO, KC_F16,  KC_F17,KC_F18,   KC_F19,  KC_F20,  UC_M_WI,
+       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,
diff --git a/keyboards/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h
index a631992eb8..b5d6bb1331 100644
--- a/keyboards/lyso1/lck75/config.h
+++ b/keyboards/lyso1/lck75/config.h
@@ -60,7 +60,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define OLED_TIMEOUT 10000
 
-#define UNICODE_SELECTED_MODES UC_WINC, UC_MAC, UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
 
 #define UNICODE_CYCLE_PERSIST false
 
diff --git a/keyboards/massdrop/alt/keymaps/charlesrocket/config.h b/keyboards/massdrop/alt/keymaps/charlesrocket/config.h
index 90b4a27f33..119477f80d 100644
--- a/keyboards/massdrop/alt/keymaps/charlesrocket/config.h
+++ b/keyboards/massdrop/alt/keymaps/charlesrocket/config.h
@@ -16,4 +16,4 @@
 
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_BSD, UC_MAC, UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_BSD, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
diff --git a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
index cfc3629714..edd906deb5 100644
--- a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, UC_RMOD, UC_MOD,  _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, UC_PREV, UC_NEXT, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, LAG_SWP, LAG_NRM,                            _______,                            _______, TG(3),   _______, _______, _______
     ),
     [3] = LAYOUT(
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
index ee48567aba..c55bc30ada 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
@@ -65,7 +65,7 @@ void matrix_scan_user(void) {
     }
     //tableflip (LEADER - TF)
     SEQ_TWO_KEYS(KC_T, KC_F) {
-        set_unicode_input_mode(UC_MAC);
+        set_unicode_input_mode(UNICODE_MODE_MACOS);
         send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
     }
     //screencap (LEADER - SC)
@@ -74,7 +74,7 @@ void matrix_scan_user(void) {
     }
     //screencap (LEADER - TM)
     SEQ_TWO_KEYS(KC_T, KC_M) {
-        set_unicode_input_mode(UC_MAC);
+        set_unicode_input_mode(UNICODE_MODE_MACOS);
         register_unicode(0x2122); // ™
     }
     /*
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
index 4fed93f67c..07816067b4 100644
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ b/keyboards/mitosis/keymaps/nzen/keymap.c
@@ -203,5 +203,5 @@ void matrix_scan_user(void) {
 };
 
 void matrix_init_user(void) {
-	set_unicode_input_mode(UC_LNX); // or UC_WINC
+	set_unicode_input_mode(UNICODE_MODE_LINUX); // or UNICODE_MODE_WINCOMPOSE
 };
diff --git a/keyboards/mlego/m48/keymaps/default/config.h b/keyboards/mlego/m48/keymaps/default/config.h
index b1aed18a18..d3e949574f 100644
--- a/keyboards/mlego/m48/keymaps/default/config.h
+++ b/keyboards/mlego/m48/keymaps/default/config.h
@@ -18,4 +18,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define TAPPING_TOGGLE 2
-#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/mlego/m60/keymaps/default/config.h b/keyboards/mlego/m60/keymaps/default/config.h
index b1aed18a18..d3e949574f 100644
--- a/keyboards/mlego/m60/keymaps/default/config.h
+++ b/keyboards/mlego/m60/keymaps/default/config.h
@@ -18,4 +18,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define TAPPING_TOGGLE 2
-#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/mlego/m60_split/keymaps/default/config.h b/keyboards/mlego/m60_split/keymaps/default/config.h
index b1aed18a18..d3e949574f 100644
--- a/keyboards/mlego/m60_split/keymaps/default/config.h
+++ b/keyboards/mlego/m60_split/keymaps/default/config.h
@@ -18,4 +18,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define TAPPING_TOGGLE 2
-#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/mlego/m65/keymaps/uk/config.h b/keyboards/mlego/m65/keymaps/uk/config.h
index 7b5ced9ccb..b0c6cfd639 100644
--- a/keyboards/mlego/m65/keymaps/uk/config.h
+++ b/keyboards/mlego/m65/keymaps/uk/config.h
@@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TOGGLE 2
 
-#define UNICODE_SELECTED_MODES UC_LNX
-//#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
+//#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
 
 #ifdef WPM_ENABLE
 #define WPM_SAMPLE_SECONDS 10
diff --git a/keyboards/moonlander/keymaps/drashna/keymap.c b/keyboards/moonlander/keymaps/drashna/keymap.c
index ced94786ef..e38a2828fe 100644
--- a/keyboards/moonlander/keymaps/drashna/keymap.c
+++ b/keyboards/moonlander/keymaps/drashna/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,_______,   KC_NUKE,KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, QK_BOOT,
         VRSN,    _________________ADJUST_L1_________________, TG(_DIABLOII),  _______, _________________ADJUST_R1_________________, EE_CLR,
         KEYLOCK, _________________ADJUST_L2_________________, _______,        _______, _________________ADJUST_R2_________________, RGB_IDL,
-        UC_MOD,  _________________ADJUST_L3_________________,                          _________________ADJUST_R3_________________, TG_MODS,
+        UC_NEXT, _________________ADJUST_L3_________________,                          _________________ADJUST_R3_________________, TG_MODS,
         _______, _______, _______, _______, _______,          _______,        _______,          _______, _______, _______, _______, AUTO_CTN,
                                             QK_RBT,  _______, _______,        _______, _______, _______
     ),
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
index 46029127e7..d20ebbe5b9 100644
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ b/keyboards/planck/keymaps/buhearns/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   UC(0xB0), UC(0xB9), UC(0xB2), UC(0xB3), UC(0xDF),   UC(0x20AC), KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
   KC_TRNS,  UC(0xC4), UC(0xD6), UC(0xDC), UC(0xBB),   UC(0xAB),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
   KC_TRNS,  UC(0xE4), UC(0xF6), UC(0xFC), UC(0x2022), KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, UC_M_MA, UC_M_LN, UC_M_WI, UC_M_WC
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, UC_MAC,  UC_LINX, UC_WIN,  UC_WINC
 )};
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/planck/keymaps/mwpeterson/keymap.c b/keyboards/planck/keymaps/mwpeterson/keymap.c
index c3f6a70784..2828192100 100644
--- a/keyboards/planck/keymaps/mwpeterson/keymap.c
+++ b/keyboards/planck/keymaps/mwpeterson/keymap.c
@@ -255,7 +255,7 @@ void plover_lookup(void) {
 }
 
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
index 63275011db..4de638ce29 100644
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ b/keyboards/planck/keymaps/rootiest/config.h
@@ -91,7 +91,7 @@
 /*
  * UNICODE options
  */
-#define UNICODE_SELECTED_MODES UC_WINC, UC_LNX, UC_MAC  // Define the methods used for in/outputting unicode
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS  // Define the methods used for in/outputting unicode
 
 /*
  * TAP-DANCE options
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 42ba7f033a..68b19e5eba 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -413,7 +413,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `-----------------------------------------------------------------------------------'
     */
     [_TABULA] = LAYOUT_planck_mit(                                                                                                   //
-        KC_ESC, KC_ALTF4, VK_TOGG, PRINT_WPM_KEY, WAKE_ANI_TOG, WAKE_AUD_TOG, KC_REDO, UC_MOD, UC_M_WC, CG_TOGG, AG_TOGG, KC_DLINE,  //
+        KC_ESC, KC_ALTF4, VK_TOGG, PRINT_WPM_KEY, WAKE_ANI_TOG, WAKE_AUD_TOG, KC_REDO, UC_NEXT, UC_WINC, CG_TOGG, AG_TOGG, KC_DLINE,  //
         KC_NXTAB, KC_SLCTALL, KC_SAVE, KC_TRNS, KC_FIND, SH_TG, SH_TG, IRONY, KC_LCUT, KC_LCOPY, KC_TRNS, KC_KILL,                   //
         KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, TG(_MOUSY), KC_TRNS, KC_HOME, KC_END, SC_SENT,              //
         TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, SC_LSPO, ALT_TAB, SC_RSPC, KC_PRVWD, KC_BRID, KC_BRIU, KC_NXTWD),
@@ -430,7 +430,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [_MOUSY] = LAYOUT_planck_mit(                                                                                                  //
-        KC_ESC, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, UC_MOD, UC_M_WC, CG_TOGG, AG_TOGG, KC_BSPC,  //
+        KC_ESC, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, UC_NEXT, UC_WINC, CG_TOGG, AG_TOGG, KC_BSPC,  //
         KC_TAB, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, IRONY, VK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,                   //
         KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, KC_TRNS, KC_HOME, KC_BTN3, KC_END, SC_SENT,               //
         TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, KC_BTN1, ALT_TAB, KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R)};
diff --git a/keyboards/planck/keymaps/sascha/keymap.c b/keyboards/planck/keymaps/sascha/keymap.c
index ec4781c78b..aaa2c28215 100644
--- a/keyboards/planck/keymaps/sascha/keymap.c
+++ b/keyboards/planck/keymaps/sascha/keymap.c
@@ -37,5 +37,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 };
diff --git a/keyboards/planck/keymaps/snowkuma/keymap.c b/keyboards/planck/keymaps/snowkuma/keymap.c
index 3dbf680d95..ecf6b0725a 100644
--- a/keyboards/planck/keymaps/snowkuma/keymap.c
+++ b/keyboards/planck/keymaps/snowkuma/keymap.c
@@ -369,5 +369,5 @@ void matrix_scan_user(void) {
 }
 
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_MAC);
+    set_unicode_input_mode(UNICODE_MODE_MACOS);
 }
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
index 13034897cf..7a594b567f 100644
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ b/keyboards/planck/keymaps/zach/zach_common_functions.c
@@ -301,7 +301,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     #ifdef UNICODE_ENABLE
     case UNIWIN:
         if(record->event.pressed){
-            set_unicode_input_mode(UC_WIN);
+            set_unicode_input_mode(UNICODE_MODE_WINDOWS);
             #ifdef AUDIO_ENABLE
               PLAY_SONG(uniwin);
             #endif
@@ -310,7 +310,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
     case UNILIN:
         if(record->event.pressed){
-            set_unicode_input_mode(UC_LNX);
+            set_unicode_input_mode(UNICODE_MODE_LINUX);
             #ifdef AUDIO_ENABLE
               PLAY_SONG(unilin);
             #endif
diff --git a/keyboards/preonic/keymaps/pezhore/config.h b/keyboards/preonic/keymaps/pezhore/config.h
index 727d58c3d0..1c0099ae40 100644
--- a/keyboards/preonic/keymaps/pezhore/config.h
+++ b/keyboards/preonic/keymaps/pezhore/config.h
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#define UNICODE_SELECTED_MODES UC_WINC, UC_LNX, UC_MAC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PREONIC_SOUND)
     // #define STARTUP_SONG SONG(NO_SOUND)
diff --git a/keyboards/preonic/keymaps/pezhore/keymap.c b/keyboards/preonic/keymaps/pezhore/keymap.c
index 722f68bcd0..5470a8542d 100644
--- a/keyboards/preonic/keymaps/pezhore/keymap.c
+++ b/keyboards/preonic/keymaps/pezhore/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |RGBTgl|Brigt-|Brigt+|      |      |      |      |      |      |      |      | POOP |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RGB+ | Hue- | Hue+ |      |      |      |      |      |      |      |PrtScr|UC_MOD|
+ * | RGB+ | Hue- | Hue+ |      |      |      |      |      |      |      |PrtScr|UC_Nxt|
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * | RGB- | Sat- | Sat+ |      |      |      |      |      |      |      |      |UC_Wnc|
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -76,10 +76,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = LAYOUT_preonic_grid(
   RGB_TOG,  RGB_VAD, RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  POOP,
-  RGB_MOD,  RGB_HUD, RGB_HUI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  UC_MOD,
-  RGB_RMOD, RGB_SAD, RGB_SAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_M_WC,
-  _______,  RGB_SPD, RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_M_LN,
-  _______,  SHRUG,   TFLIP,    DPOINT,   STRUT,    _______,  _______,  _______,   _______, TG_NUMP,   _______,  UC_M_MA
+  RGB_MOD,  RGB_HUD, RGB_HUI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  UC_NEXT,
+  RGB_RMOD, RGB_SAD, RGB_SAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_WINC,
+  _______,  RGB_SPD, RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_LINX,
+  _______,  SHRUG,   TFLIP,    DPOINT,   STRUT,    _______,  _______,  _______,   _______, TG_NUMP,  _______,  UC_MAC
 ),
 
 /* Numpad
diff --git a/keyboards/preonic/keymaps/zach/zach_common_functions.c b/keyboards/preonic/keymaps/zach/zach_common_functions.c
index 13034897cf..7a594b567f 100644
--- a/keyboards/preonic/keymaps/zach/zach_common_functions.c
+++ b/keyboards/preonic/keymaps/zach/zach_common_functions.c
@@ -301,7 +301,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     #ifdef UNICODE_ENABLE
     case UNIWIN:
         if(record->event.pressed){
-            set_unicode_input_mode(UC_WIN);
+            set_unicode_input_mode(UNICODE_MODE_WINDOWS);
             #ifdef AUDIO_ENABLE
               PLAY_SONG(uniwin);
             #endif
@@ -310,7 +310,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
     case UNILIN:
         if(record->event.pressed){
-            set_unicode_input_mode(UC_LNX);
+            set_unicode_input_mode(UNICODE_MODE_LINUX);
             #ifdef AUDIO_ENABLE
               PLAY_SONG(unilin);
             #endif
diff --git a/keyboards/redox/keymaps/jeherve/config.h b/keyboards/redox/keymaps/jeherve/config.h
index 7e334aee64..689e8f6e4d 100644
--- a/keyboards/redox/keymaps/jeherve/config.h
+++ b/keyboards/redox/keymaps/jeherve/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SLEEP
 
 /* Set Unicode mode by default */
-#define UNICODE_SELECTED_MODES UC_MAC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS
 
 /* Custom startup sound */
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
index 7d4a356308..4e26907640 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
@@ -24,4 +24,4 @@
 #endif
 
 #define TAPPING_TERM 200
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC
+#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
index 6a2fb4de2f..e3ae65a45f 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
@@ -133,7 +133,7 @@
 
 
  void matrix_init_user(){
-     set_unicode_input_mode(UC_MAC);
+     set_unicode_input_mode(UNICODE_MODE_MACOS);
  }
 
 
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
index 653695d629..6f3b77b0de 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
@@ -20,4 +20,4 @@
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
-#define UNICODE_SELECTED_MODES UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index 2842bee7db..63fd3c2ac2 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -398,7 +398,7 @@ qmk_dict = {
     "_sp_swp": "SHT(KC_SPC)",
     # Unicode support (via X()) included implicitly
     # Switching Unicode Input Modes
-    "UC_win": "UC_M_WC", "UC_lnx": "UC_M_LN", "UC_mac": "UC_M_MA",
+    "UC_win": "UC_WINC", "UC_lnx": "UC_LINX", "UC_mac": "UC_MAC",
 
     # custom keys
     "altF4": "LALT(KC_F4)",
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/config.h b/keyboards/spaceman/2_milk/keymaps/emoji/config.h
index 2d86c008d5..a564c44a29 100644
--- a/keyboards/spaceman/2_milk/keymaps/emoji/config.h
+++ b/keyboards/spaceman/2_milk/keymaps/emoji/config.h
@@ -1,2 +1,2 @@
-#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
 #define TAPPING_TERM 300
\ No newline at end of file
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/readme.md b/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
index 3bcc4831b3..43b7dc4257 100644
--- a/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
+++ b/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
@@ -11,14 +11,14 @@ corresponding input mode has to be set in QMK.
 
 Documentation: [Feature Unicode](https://beta.docs.qmk.fm/features/feature_unicode#input-modes)
 
-On this keymap the default unicode mode it's `UC_LNX`.
+On this keymap the default unicode mode it's `UNICODE_MODE_LINUX`.
 You can change it permanently tapping 2 times the KeyOne to select the next mode.
 
 ## Unicode Mode List
-- UC_LNX
-- UC_MAC
-- UC_WIN
-- UC_WINC
+- UNICODE_MODE_LINUX
+- UNICODE_MODE_MACOS
+- UNICODE_MODE_WINDOWS
+- UNICODE_MODE_WINCOMPOSE
 
 # Keymap
 To add more functionality to this Minimal Keyboard, 
diff --git a/keyboards/spaceman/2_milk/keymaps/encg/config.h b/keyboards/spaceman/2_milk/keymaps/encg/config.h
index 4d7e1bb573..abb80c2a34 100644
--- a/keyboards/spaceman/2_milk/keymaps/encg/config.h
+++ b/keyboards/spaceman/2_milk/keymaps/encg/config.h
@@ -16,5 +16,5 @@
 
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_MAC, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
 #define UNICODE_CYCLE_PERSIST true
diff --git a/keyboards/spaceman/2_milk/keymaps/encg/readme.md b/keyboards/spaceman/2_milk/keymaps/encg/readme.md
index f1f9cd6c6d..73232ec32f 100644
--- a/keyboards/spaceman/2_milk/keymaps/encg/readme.md
+++ b/keyboards/spaceman/2_milk/keymaps/encg/readme.md
@@ -16,7 +16,7 @@ The bottom button outputs 3 random emojis one by one. The random function takes
 
 ## Unicode Setup
 
-This keymap's default unicode input mode is `UC_WINC` which requires [WinCompose](https://github.com/samhocevar/wincompose). For other OSes, see [QMK documentation on unicode input modes](https://docs.qmk.fm/#/feature_unicode?id=input-modes).
+This keymap's default unicode input mode is `UNICODE_MODE_WINCOMPOSE` which requires [WinCompose](https://github.com/samhocevar/wincompose). For other OSes, see [QMK documentation on unicode input modes](https://docs.qmk.fm/#/feature_unicode?id=input-modes).
 
 ## Ideas for the future
 
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
index 9775454f24..6e403595a1 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_wrapper(
         QK_MAKE, _________________ADJUST_L1_________________,                                       _________________ADJUST_R1_________________, QK_BOOT,
         VRSN,    _________________ADJUST_L2_________________,                                       _________________ADJUST_R2_________________, EE_CLR,
-        UC_MOD,  _________________ADJUST_L3_________________, HPT_TOG, HPT_FBK,   MG_NKRO, UC_MOD,  _________________ADJUST_R3_________________, TG_MODS,
+        UC_NEXT, _________________ADJUST_L3_________________, HPT_TOG, HPT_FBK,   MG_NKRO, UC_NEXT, _________________ADJUST_R3_________________, TG_MODS,
                                    QK_RBT,  _______, KEYLOCK, KC_NUKE, _______,   _______, _______, _______, _______, AUTO_CTN
     ),
 //     [_LAYERINDEX] = LAYOUT_wrapper(
diff --git a/keyboards/splitkb/kyria/keymaps/lw/config.h b/keyboards/splitkb/kyria/keymaps/lw/config.h
index 038a8ff3dd..6766ab5cdb 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/config.h
+++ b/keyboards/splitkb/kyria/keymaps/lw/config.h
@@ -23,4 +23,4 @@
 // #define SPLIT_USB_DETECT
 // #define NO_USB_STARTUP_CHECK
 
-#define UNICODE_SELECTED_MODES UC_LNX, UC_WINC // support for Linux and Windows unicode 
\ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode 
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
index 71b0416209..0e25d2cdf3 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
  * |        | Brt- | Prev | Bckw | Stop | Vol- |                              |  End | Left | Down | Right|ScrLck| BkSpace|
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_MOD|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
+ * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_Nxt|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
  *                        |LCtrl | LGUI | LAlt |      | MO(1)|  | MO(2)| UNDO |  CUT | COPY | PASTE|
  *                        |      |      |      |      |      |  |      |      |      |      |      |
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NAV] = LAYOUT(
  _______, KC_BRIU, KC_MNXT, KC_MFFD, KC_MPLY, KC_VOLU,                                     KC_HOME, KC_PGUP,   KC_UP, KC_PGDN, _______,  KC_DEL,
  _______, KC_BRID, KC_MPRV, KC_MRWD, KC_MSTP, KC_VOLD,                                      KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_SCRL, KC_BSPC,
- KC_LSFT, US_ACUT, US_DGRV, US_DCIR, US_DIAE, KC_MUTE, _______,  UC_MOD, KC_RSFT,  KC_APP, KC_PSCR, XP(CEDIL,CEDIL_MAJ), XP(SECTION,DEGREE), _______, LCTL(KC_S),  KC_INS,
+ KC_LSFT, US_ACUT, US_DGRV, US_DCIR, US_DIAE, KC_MUTE, _______, UC_NEXT, KC_RSFT,  KC_APP, KC_PSCR, XP(CEDIL,CEDIL_MAJ), XP(SECTION,DEGREE), _______, LCTL(KC_S),  KC_INS,
                             KC_LCTL, KC_LGUI, KC_LALT, _______,   MO(1),   MO(2), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V)
     ),
 
diff --git a/keyboards/splitkb/kyria/keymaps/lw/readme.md b/keyboards/splitkb/kyria/keymaps/lw/readme.md
index 67be1950ab..87d4d17e96 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/readme.md
+++ b/keyboards/splitkb/kyria/keymaps/lw/readme.md
@@ -93,7 +93,7 @@ This layer is activated when holding `MO(2)`.
  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
  * |        | Brt- | Prev | Bckw | Stop | Vol- |                              |  End | Left | Down | Right|ScrLck| BkSpace|
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_MOD|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
+ * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_Nxt|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
  *                        |LCtrl | LGUI | LAlt |      | MO(1)|  | MO(2)| UNDO |  CUT | COPY | PASTE|
  *                        |      |      |      |      |      |  |      |      |      |      |      |
@@ -101,4 +101,4 @@ This layer is activated when holding `MO(2)`.
  */
 ```
 
-The key `UC_MOD` allows to switch between Linux and Windows unicode. Note however that [WinCompose](https://github.com/samhocevar/wincompose) must be installed on Windows (simply download and install the latest release and it will run). 
\ No newline at end of file
+The key `UC_NEXT` allows to switch between Linux and Windows unicode. Note however that [WinCompose](https://github.com/samhocevar/wincompose) must be installed on Windows (simply download and install the latest release and it will run). 
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
index 17550a2168..92356446fd 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
@@ -1192,7 +1192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //                ,                  ,                  ,                  , -*-              ,                 <|,>              ,         ,                  ,                    ,         ,               ,
         CTO_BASE  , COUNT_TOG        , COUNT_NULL       , COUNT_WORDMIN    , COUNT_REPORT     , SPEED_TOG         , SPEED_REPORT  , KC_MPLY , KC_MNXT          , KC_MPRV            , KC_MSTP , KC_RSFT       ,
         KC_CAPS   , C_KC_PWR         , C_KC_WAKE        , C_KC_SLEP        , C_KC_PAUS        , KC_SCRL           , KC_PSCR       , XXXXXXX , KC_VOLU          , KC_VOLD            , KC_MUTE , KC_INS        ,
-        XP_DRA_CG , UNICODE_MODE_LNX , UNICODE_MODE_BSD , UNICODE_MODE_MAC , UNICODE_MODE_WIN , UNICODE_MODE_WINC , XXXXXXX       , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP        ,
+        XP_DRA_CG , UC_LINX          , UC_BSD           , UC_MAC           , UC_WIN           , UC_WINC           , XXXXXXX       , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP        ,
 //      -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         LEDS_ON  
 #     ifdef TRANSMINIVAN_LEFTSIDE
diff --git a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
index 9f4b7d1942..f902e8c121 100644
--- a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
@@ -16,7 +16,7 @@
 #define MINUS   UC(0x2212)
 
 void eeconfig_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
 
 enum layers {
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
index e816858711..673dbc474d 100644
--- a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_init_user(void) {
   _delay_ms(20); // Gets rid of tick
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
 
 /* Template for future layers
diff --git a/keyboards/xiudi/xd75/keymaps/markus/config.h b/keyboards/xiudi/xd75/keymaps/markus/config.h
index c56028a5fc..15b0ac8e36 100644
--- a/keyboards/xiudi/xd75/keymaps/markus/config.h
+++ b/keyboards/xiudi/xd75/keymaps/markus/config.h
@@ -46,4 +46,4 @@
 #define MK_W_INTERVAL_1     120
 #define MK_W_OFFSET_2       1
 #define MK_W_INTERVAL_2     20
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/keyboards/xiudi/xd75/keymaps/markus/keymap.c b/keyboards/xiudi/xd75/keymaps/markus/keymap.c
index dc1590749b..18052f5ef7 100644
--- a/keyboards/xiudi/xd75/keymaps/markus/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/markus/keymap.c
@@ -160,9 +160,9 @@ MO(_FN2), ________, ________, ________, ________, KC_PENT,  KC_P0,    DE_DOT,
  */
 [_FN3] = LAYOUT_ortho_5x15(
 KC_F13,   KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   KC_BRID,  ___xx___, KC_BRIU,  KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24,
-________, QWERTZ,   UC_M_LN,  ___xx___, ___xx___, KC_PWR,   RGB_TOG,  RGB_M_P,  RGB_MOD,  ___xx___, KC_PGUP,  KC_UP,    KC_PGDN,  ___xx___, ___xx___,
-________, QWERTY,   UC_M_WC,  UC(L'›'), UC(L'‹'), KC_SLEP,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_END,   ________,
-________, GAMING,   UC_M_MA,  UC(L'»'), UC(L'«'), KC_WAKE,  RGB_HUD,  RGB_SAD,  RGB_VAD,  UC(L' '), UC(L' '), UC(L' '), UC(L' '), UC(L'‑'), ________,
+________, QWERTZ,   UC_LINX,  ___xx___, ___xx___, KC_PWR,   RGB_TOG,  RGB_M_P,  RGB_MOD,  ___xx___, KC_PGUP,  KC_UP,    KC_PGDN,  ___xx___, ___xx___,
+________, QWERTY,   UC_WINC,  UC(L'›'), UC(L'‹'), KC_SLEP,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_END,   ________,
+________, GAMING,   UC_MAC,   UC(L'»'), UC(L'«'), KC_WAKE,  RGB_HUD,  RGB_SAD,  RGB_VAD,  UC(L' '), UC(L' '), UC(L' '), UC(L' '), UC(L'‑'), ________,
 ________, ________, ________, ________, ________, ________, ________, QK_BOOT,  ________, ________, ________, ________, ________, ________, ________
 )
 
diff --git a/keyboards/xiudi/xd75/keymaps/minna/config.h b/keyboards/xiudi/xd75/keymaps/minna/config.h
index 27975f0e24..f8805edc36 100644
--- a/keyboards/xiudi/xd75/keymaps/minna/config.h
+++ b/keyboards/xiudi/xd75/keymaps/minna/config.h
@@ -4,4 +4,4 @@
 #pragma once
 
 // place overrides here
-#define UNICODE_SELECTED_MODES UC_WINC, UC_LNX, UC_MAC
\ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/minna/keymap.c b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
index 26c9c07b27..b0b513c60f 100644
--- a/keyboards/xiudi/xd75/keymaps/minna/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
@@ -74,6 +74,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MSEL, KC_NO,   KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_CALC, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
     KC_MPRV, KC_NO,   KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_MPLY, KC_P4, KC_P5, KC_P6, KC_PLUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MO(1),   RGB_TOG, KC_NO,   RGB_RMOD,RGB_MOD, KC_NO, KC_P0, KC_NO, KC_PDOT, KC_PENT, KC_PENT, MO(1), UC_RMOD, UC_MOD)
+    KC_TRNS, MO(1),   RGB_TOG, KC_NO,   RGB_RMOD,RGB_MOD, KC_NO, KC_P0, KC_NO, KC_PDOT, KC_PENT, KC_PENT, MO(1), UC_PREV, UC_NEXT)
 };
 
diff --git a/keyboards/yatara/drink_me/keymaps/queen/config.h b/keyboards/yatara/drink_me/keymaps/queen/config.h
index ed8565a311..4cb538fc6c 100644
--- a/keyboards/yatara/drink_me/keymaps/queen/config.h
+++ b/keyboards/yatara/drink_me/keymaps/queen/config.h
@@ -1 +1 @@
-#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/yatara/drink_me/keymaps/queen/keymap.c b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
index 70b24be79d..2d99b38663 100644
--- a/keyboards/yatara/drink_me/keymaps/queen/keymap.c
+++ b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
@@ -13,7 +13,7 @@ void td_spade_lnx (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_unicode(0x2660); // ♠
     } else {
-        set_unicode_input_mode(UC_LNX);
+        set_unicode_input_mode(UNICODE_MODE_LINUX);
     }
     reset_tap_dance(state);
 }
@@ -23,7 +23,7 @@ void td_diamond_osx (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_unicode(0x2666); // ♦
     } else {
-        set_unicode_input_mode(UC_MAC);
+        set_unicode_input_mode(UNICODE_MODE_MACOS);
     }
     reset_tap_dance(state);
 }
@@ -33,7 +33,7 @@ void td_club_win (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_unicode(0x2663); // ♣
     } else {
-        set_unicode_input_mode(UC_WIN);
+        set_unicode_input_mode(UNICODE_MODE_WINDOWS);
     }
     reset_tap_dance(state);
 }
@@ -43,7 +43,7 @@ void td_heart_winc (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_unicode(0x2665); // ♥
     } else {
-        set_unicode_input_mode(UC_WINC);
+        set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
     }
     reset_tap_dance(state);
 }
diff --git a/keyboards/ymdk/melody96/keymaps/dvz/config.h b/keyboards/ymdk/melody96/keymaps/dvz/config.h
index 78b95df64e..9c834bdce1 100644
--- a/keyboards/ymdk/melody96/keymaps/dvz/config.h
+++ b/keyboards/ymdk/melody96/keymaps/dvz/config.h
@@ -19,7 +19,7 @@
 #define COMBO_COUNT 4
 #define COMBO_TERM 100
 
-//#define UNICODE_SELECTED_MODES UC_WINC
+//#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
diff --git a/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
index 473f89704c..5dff7a249a 100644
--- a/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [L_FN] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, SYSRQ,   KC_SCRL, KC_PAUS, BREAK,   TOP,     BOTTOM,
         _______, 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, DIVIDE,  TIMES,   MINUS,
-        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
+        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_NEXT, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, RGB_SET,
         _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, RGB_M_R, RGB_M_SN,RGB_M_B, XXXXXXX,
         _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, XXXXXXX, _______, KC_HOME, KC_PGDN, KC_END,  RGB_RMOD,RGB_MOD, RGB_M_P
diff --git a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
index 98be4f22c7..d65f10dcec 100644
--- a/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c
@@ -239,7 +239,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT,
     KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______, KC_CAGU, _______, _______, _______, KC_CDIA, KC_CCIR, _______, _______, _______, _______,          _______, _______, _______, _______,
-    _______, _______, _______, UC_M_MA, UC_M_LN, UC_M_WI, UC_M_BS, UC_M_WC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+    _______, _______, _______, UC_MAC,  UC_LINX, UC_WIN,  UC_BSD,  UC_WINC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
     _______,          _______, _______, KC_CCED, _______, _______, KC_CTIL, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
diff --git a/layouts/community/60_iso/bifbofii/keymap.c b/layouts/community/60_iso/bifbofii/keymap.c
index 7365f98e97..f335bd3289 100755
--- a/layouts/community/60_iso/bifbofii/keymap.c
+++ b/layouts/community/60_iso/bifbofii/keymap.c
@@ -144,8 +144,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [SPECIALS] = LAYOUT_60_iso(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, XXXXXXX,
-        XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, UC_M_MA, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(GAMING), XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
+        XXXXXXX, XXXXXXX, UC_WINC, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, UC_MAC,  XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(GAMING), XXXXXXX, XXXXXXX, XXXXXXX, UC_LINX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX,                               XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS
     ),
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index e4a417ef90..5f8080d471 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN] = LAYOUT_65_ansi_blocker(
         KC_GRV,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,                 KC_INS,     KC_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VK_TOGG,    CH_SUSP,    KC_SLEP,                KC_PWR,     KC_BRIU,
-        MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            KC_CPNL,    KC_BRID,
-        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    XXXXXXX,    XXXXXXX,    DB_TOGG,                            _______,    KC_VOLU,    KC_MUTE,
+        MO(_GLYPH), RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_LINX,    XXXXXXX,    XXXXXXX,                            KC_CPNL,    KC_BRID,
+        _______,    XXXXXXX,    UC_EMAC,    UC_WINC,    UC_NEXT,    NK_TOGG,    TG(_NUMPAD),UC_MAC,     XXXXXXX,    XXXXXXX,    DB_TOGG,                            _______,    KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,                KC_MPRV,    KC_VOLD,    KC_MNXT
     ),
     // Glyph Transformation
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index 65656173a4..5c2f6a150b 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
         EE_CLR,     X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VK_TOGG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
-        XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_M_LN,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
-        _______,    XXXXXXX,    UC_M_EM,    UC_M_WC,    UC_MOD,     NK_TOGG,    TG(_NUMPAD),UC_M_MA,    X(LARR),    X(RARR),    DB_TOGG,    _______,                            KC_VOLU,    KC_MUTE,
+        XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_LINX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
+        _______,    XXXXXXX,    UC_EMAC,    UC_WINC,    UC_NEXT,    NK_TOGG,    TG(_NUMPAD),UC_MAC,     X(LARR),    X(RARR),    DB_TOGG,    _______,                            KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,    KC_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
     )
 };
diff --git a/layouts/community/ergodox/deadcyclo/keymap.c b/layouts/community/ergodox/deadcyclo/keymap.c
index 6edf8b00f6..97e95d103b 100644
--- a/layouts/community/ergodox/deadcyclo/keymap.c
+++ b/layouts/community/ergodox/deadcyclo/keymap.c
@@ -341,7 +341,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 // Runs just one time when the keyboard initializes.
 void matrix_init_user(void) {
-  set_unicode_input_mode(UC_LNX);
+  set_unicode_input_mode(UNICODE_MODE_LINUX);
 };
 
 // Runs constantly in the background, in a loop.
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index c9c63168f6..64ef098280 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -167,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             ),
 
   [_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
-             QK_MAKE, _______, _______, _______, _______, _______, UC_MOD,                  KC_NUKE, _________________ADJUST_R1_________________, QK_BOOT,
+             QK_MAKE, _______, _______, _______, _______, _______, UC_NEXT,                 KC_NUKE, _________________ADJUST_R1_________________, QK_BOOT,
              VRSN,    _________________ADJUST_L1_________________, _______,                 _______, _________________ADJUST_R1_________________, EE_CLR,
              _______, _________________ADJUST_L2_________________,                                   _________________ADJUST_R2_________________, RGB_IDL,
              KEYLOCK, _________________ADJUST_L3_________________, _______,                 _______, _________________ADJUST_R3_________________, TG_MODS,
diff --git a/layouts/community/ortho_4x12/bifbofii/keymap.c b/layouts/community/ortho_4x12/bifbofii/keymap.c
index d754741899..fde4bd006d 100644
--- a/layouts/community/ortho_4x12/bifbofii/keymap.c
+++ b/layouts/community/ortho_4x12/bifbofii/keymap.c
@@ -164,8 +164,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
  */
 [SPECIALS] = LAYOUT_ortho_4x12(
-    XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_MA, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, UC_WINC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_MAC,  XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_LINX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 )
diff --git a/layouts/community/ortho_5x12/riblee/config.h b/layouts/community/ortho_5x12/riblee/config.h
index 8dbff5e10e..6f7393861e 100644
--- a/layouts/community/ortho_5x12/riblee/config.h
+++ b/layouts/community/ortho_5x12/riblee/config.h
@@ -15,4 +15,4 @@
  */
 
 #pragma once
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index 00b3ec1d82..7a786de79d 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,    KC_F12,
     _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,  KC_INS,  KC_PSCR,   KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  HUNGARIAN, WORKMAN,
-    _______, _______, _______, _______, UC_MOD,  UC_RMOD, NK_TOGG, CG_NORM, CG_SWAP,  _______, _______,   _______,
+    _______, _______, _______, _______, UC_NEXT, UC_PREV, NK_TOGG, CG_NORM, CG_SWAP,  _______, _______,   _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______
 )
 
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index bd5fc560f3..a0b9010027 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -31,29 +31,29 @@ bool process_unicode_common(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         bool shifted = get_mods() & MOD_MASK_SHIFT;
         switch (keycode) {
-            case UNICODE_MODE_FORWARD:
+            case QK_UNICODE_MODE_NEXT:
                 cycle_unicode_input_mode(shifted ? -1 : +1);
                 break;
-            case UNICODE_MODE_REVERSE:
+            case QK_UNICODE_MODE_PREVIOUS:
                 cycle_unicode_input_mode(shifted ? +1 : -1);
                 break;
-            case UNICODE_MODE_MAC:
-                set_unicode_input_mode(UC_MAC);
+            case QK_UNICODE_MODE_MACOS:
+                set_unicode_input_mode(UNICODE_MODE_MACOS);
                 break;
-            case UNICODE_MODE_LNX:
-                set_unicode_input_mode(UC_LNX);
+            case QK_UNICODE_MODE_LINUX:
+                set_unicode_input_mode(UNICODE_MODE_LINUX);
                 break;
-            case UNICODE_MODE_WIN:
-                set_unicode_input_mode(UC_WIN);
+            case QK_UNICODE_MODE_WINDOWS:
+                set_unicode_input_mode(UNICODE_MODE_WINDOWS);
                 break;
-            case UNICODE_MODE_BSD:
-                set_unicode_input_mode(UC_BSD);
+            case QK_UNICODE_MODE_BSD:
+                set_unicode_input_mode(UNICODE_MODE_BSD);
                 break;
-            case UNICODE_MODE_WINC:
-                set_unicode_input_mode(UC_WINC);
+            case QK_UNICODE_MODE_WINCOMPOSE:
+                set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
                 break;
-            case UNICODE_MODE_EMACS:
-                set_unicode_input_mode(UC_EMACS);
+            case QK_UNICODE_MODE_EMACS:
+                set_unicode_input_mode(UNICODE_MODE_EMACS);
                 break;
         }
     }
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 6c9a262484..2f9e211cc1 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -378,13 +378,13 @@ enum quantum_keycodes {
     QK_CLEAR_EEPROM, // 5CDF
 
     // Unicode
-    UNICODE_MODE_FORWARD, // 5CE0
-    UNICODE_MODE_REVERSE, // 5CE1
-    UNICODE_MODE_MAC,     // 5CE2
-    UNICODE_MODE_LNX,     // 5CE3
-    UNICODE_MODE_WIN,     // 5CE4
-    UNICODE_MODE_BSD,     // 5CE5
-    UNICODE_MODE_WINC,    // 5CE6
+    QK_UNICODE_MODE_NEXT,       // 5CE0
+    QK_UNICODE_MODE_PREVIOUS,   // 5CE1
+    QK_UNICODE_MODE_MACOS,      // 5CE2
+    QK_UNICODE_MODE_LINUX,      // 5CE3
+    QK_UNICODE_MODE_WINDOWS,    // 5CE4
+    QK_UNICODE_MODE_BSD,        // 5CE5
+    QK_UNICODE_MODE_WINCOMPOSE, // 5CE6
 
     // Haptic
     HPT_ON,   // 5CE7
@@ -609,7 +609,7 @@ enum quantum_keycodes {
     MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
     MAGIC_TOGGLE_ESCAPE_CAPSLOCK,
 
-    UNICODE_MODE_EMACS,
+    QK_UNICODE_MODE_EMACS,
 
     QK_AUTOCORRECT_ON,
     QK_AUTOCORRECT_OFF,
@@ -834,15 +834,15 @@ enum quantum_keycodes {
 #define X(i) (QK_UNICODEMAP | (i))
 #define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
 
-#define UC_MOD UNICODE_MODE_FORWARD
-#define UC_RMOD UNICODE_MODE_REVERSE
+#define UC_NEXT QK_UNICODE_MODE_NEXT
+#define UC_PREV QK_UNICODE_MODE_PREVIOUS
 
-#define UC_M_MA UNICODE_MODE_MAC
-#define UC_M_LN UNICODE_MODE_LNX
-#define UC_M_WI UNICODE_MODE_WIN
-#define UC_M_BS UNICODE_MODE_BSD
-#define UC_M_WC UNICODE_MODE_WINC
-#define UC_M_EM UNICODE_MODE_EMACS
+#define UC_MAC QK_UNICODE_MODE_MACOS
+#define UC_LINX QK_UNICODE_MODE_LINUX
+#define UC_WIN QK_UNICODE_MODE_WINDOWS
+#define UC_BSD QK_UNICODE_MODE_BSD
+#define UC_WINC QK_UNICODE_MODE_WINCOMPOSE
+#define UC_EMAC QK_UNICODE_MODE_EMACS
 
 // Auto Shift
 #define AS_UP QK_AUTO_SHIFT_UP
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 3baf37d378..68771baece 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -29,6 +29,15 @@
 #define CMB_OFF QK_COMBO_OFF
 #define CMB_TOG QK_COMBO_TOGGLE
 
+#define UC_MOD QK_UNICODE_MODE_NEXT
+#define UC_RMOD QK_UNICODE_MODE_PREVIOUS
+#define UC_M_MA QK_UNICODE_MODE_MACOS
+#define UC_M_LN QK_UNICODE_MODE_LINUX
+#define UC_M_WI QK_UNICODE_MODE_WINDOWS
+#define UC_M_BS QK_UNICODE_MODE_BSD
+#define UC_M_WC QK_UNICODE_MODE_WINCOMPOSE
+#define UC_M_EM QK_UNICODE_MODE_EMACS
+
 #define PROGRAMMABLE_BUTTON_1 QK_PROGRAMMABLE_BUTTON_1
 #define PROGRAMMABLE_BUTTON_2 QK_PROGRAMMABLE_BUTTON_2
 #define PROGRAMMABLE_BUTTON_3 QK_PROGRAMMABLE_BUTTON_3
diff --git a/quantum/unicode/unicode.c b/quantum/unicode/unicode.c
index e2bfd68a3a..35cb62e700 100644
--- a/quantum/unicode/unicode.c
+++ b/quantum/unicode/unicode.c
@@ -46,7 +46,7 @@
 #endif
 
 // Comma-delimited, ordered list of input modes selected for use (e.g. in cycle)
-// Example: #define UNICODE_SELECTED_MODES UC_WINC, UC_LNX
+// Example: #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX
 #ifndef UNICODE_SELECTED_MODES
 #    define UNICODE_SELECTED_MODES -1
 #endif
@@ -108,32 +108,32 @@ static float song_emacs[][2] = UNICODE_SONG_EMACS;
 static void unicode_play_song(uint8_t mode) {
     switch (mode) {
 #    ifdef UNICODE_SONG_MAC
-        case UC_MAC:
+        case UNICODE_MODE_MACOS:
             PLAY_SONG(song_mac);
             break;
 #    endif
 #    ifdef UNICODE_SONG_LNX
-        case UC_LNX:
+        case UNICODE_MODE_LINUX:
             PLAY_SONG(song_lnx);
             break;
 #    endif
 #    ifdef UNICODE_SONG_WIN
-        case UC_WIN:
+        case UNICODE_MODE_WINDOWS:
             PLAY_SONG(song_win);
             break;
 #    endif
 #    ifdef UNICODE_SONG_BSD
-        case UC_BSD:
+        case UNICODE_MODE_BSD:
             PLAY_SONG(song_bsd);
             break;
 #    endif
 #    ifdef UNICODE_SONG_WINC
-        case UC_WINC:
+        case UNICODE_MODE_WINCOMPOSE:
             PLAY_SONG(song_winc);
             break;
 #    endif
 #    ifdef UNICODE_SONG_EMACS
-        case UC_EMACS:
+        case UNICODE_MODE_EMACS:
             PLAY_SONG(song_emacs);
             break;
 #    endif
@@ -209,7 +209,7 @@ __attribute__((weak)) void unicode_input_start(void) {
     // Need to do this before we mess around with the mods, or else
     // UNICODE_KEY_LNX (which is usually Ctrl-Shift-U) might not work
     // correctly in the shifted case.
-    if (unicode_config.input_mode == UC_LNX && unicode_saved_led_state.caps_lock) {
+    if (unicode_config.input_mode == UNICODE_MODE_LINUX && unicode_saved_led_state.caps_lock) {
         tap_code(KC_CAPS_LOCK);
     }
 
@@ -218,13 +218,13 @@ __attribute__((weak)) void unicode_input_start(void) {
     clear_weak_mods();
 
     switch (unicode_config.input_mode) {
-        case UC_MAC:
+        case UNICODE_MODE_MACOS:
             register_code(UNICODE_KEY_MAC);
             break;
-        case UC_LNX:
+        case UNICODE_MODE_LINUX:
             tap_code16(UNICODE_KEY_LNX);
             break;
-        case UC_WIN:
+        case UNICODE_MODE_WINDOWS:
             // For increased reliability, use numpad keys for inputting digits
             if (!unicode_saved_led_state.num_lock) {
                 tap_code(KC_NUM_LOCK);
@@ -233,11 +233,11 @@ __attribute__((weak)) void unicode_input_start(void) {
             wait_ms(UNICODE_TYPE_DELAY);
             tap_code(KC_KP_PLUS);
             break;
-        case UC_WINC:
+        case UNICODE_MODE_WINCOMPOSE:
             tap_code(UNICODE_KEY_WINC);
             tap_code(KC_U);
             break;
-        case UC_EMACS:
+        case UNICODE_MODE_EMACS:
             // The usual way to type unicode in emacs is C-x-8 <RET> then the unicode number in hex
             tap_code16(LCTL(KC_X));
             tap_code16(KC_8);
@@ -250,25 +250,25 @@ __attribute__((weak)) void unicode_input_start(void) {
 
 __attribute__((weak)) void unicode_input_finish(void) {
     switch (unicode_config.input_mode) {
-        case UC_MAC:
+        case UNICODE_MODE_MACOS:
             unregister_code(UNICODE_KEY_MAC);
             break;
-        case UC_LNX:
+        case UNICODE_MODE_LINUX:
             tap_code(KC_SPACE);
             if (unicode_saved_led_state.caps_lock) {
                 tap_code(KC_CAPS_LOCK);
             }
             break;
-        case UC_WIN:
+        case UNICODE_MODE_WINDOWS:
             unregister_code(KC_LEFT_ALT);
             if (!unicode_saved_led_state.num_lock) {
                 tap_code(KC_NUM_LOCK);
             }
             break;
-        case UC_WINC:
+        case UNICODE_MODE_WINCOMPOSE:
             tap_code(KC_ENTER);
             break;
-        case UC_EMACS:
+        case UNICODE_MODE_EMACS:
             tap_code16(KC_ENTER);
             break;
     }
@@ -278,25 +278,25 @@ __attribute__((weak)) void unicode_input_finish(void) {
 
 __attribute__((weak)) void unicode_input_cancel(void) {
     switch (unicode_config.input_mode) {
-        case UC_MAC:
+        case UNICODE_MODE_MACOS:
             unregister_code(UNICODE_KEY_MAC);
             break;
-        case UC_LNX:
+        case UNICODE_MODE_LINUX:
             tap_code(KC_ESCAPE);
             if (unicode_saved_led_state.caps_lock) {
                 tap_code(KC_CAPS_LOCK);
             }
             break;
-        case UC_WINC:
+        case UNICODE_MODE_WINCOMPOSE:
             tap_code(KC_ESCAPE);
             break;
-        case UC_WIN:
+        case UNICODE_MODE_WINDOWS:
             unregister_code(KC_LEFT_ALT);
             if (!unicode_saved_led_state.num_lock) {
                 tap_code(KC_NUM_LOCK);
             }
             break;
-        case UC_EMACS:
+        case UNICODE_MODE_EMACS:
             tap_code16(LCTL(KC_G)); // C-g cancels
             break;
     }
@@ -307,7 +307,7 @@ __attribute__((weak)) void unicode_input_cancel(void) {
 // clang-format off
 
 static void send_nibble_wrapper(uint8_t digit) {
-    if (unicode_config.input_mode == UC_WIN) {
+    if (unicode_config.input_mode == UNICODE_MODE_WINDOWS) {
         uint8_t kc = digit < 10
                    ? KC_KP_1 + (10 + digit - 1) % 10
                    : KC_A + (digit - 10);
@@ -328,7 +328,7 @@ void register_hex(uint16_t hex) {
 
 void register_hex32(uint32_t hex) {
     bool first_digit        = true;
-    bool needs_leading_zero = (unicode_config.input_mode == UC_WINC);
+    bool needs_leading_zero = (unicode_config.input_mode == UNICODE_MODE_WINCOMPOSE);
     for (int i = 7; i >= 0; i--) {
         // Work out the digit we're going to transmit
         uint8_t digit = ((hex >> (i * 4)) & 0xF);
@@ -352,13 +352,13 @@ void register_hex32(uint32_t hex) {
 }
 
 void register_unicode(uint32_t code_point) {
-    if (code_point > 0x10FFFF || (code_point > 0xFFFF && unicode_config.input_mode == UC_WIN)) {
+    if (code_point > 0x10FFFF || (code_point > 0xFFFF && unicode_config.input_mode == UNICODE_MODE_WINDOWS)) {
         // Code point out of range, do nothing
         return;
     }
 
     unicode_input_start();
-    if (code_point > 0xFFFF && unicode_config.input_mode == UC_MAC) {
+    if (code_point > 0xFFFF && unicode_config.input_mode == UNICODE_MODE_MACOS) {
         // Convert code point to UTF-16 surrogate pair on macOS
         code_point -= 0x10000;
         uint32_t lo = code_point & 0x3FF, hi = (code_point & 0xFFC00) >> 10;
diff --git a/quantum/unicode/unicode.h b/quantum/unicode/unicode.h
index b3e43799ff..6f1e35d554 100644
--- a/quantum/unicode/unicode.h
+++ b/quantum/unicode/unicode.h
@@ -30,13 +30,14 @@ typedef union {
 extern unicode_config_t unicode_config;
 
 enum unicode_input_modes {
-    UC_MAC,   // macOS using Unicode Hex Input
-    UC_LNX,   // Linux using IBus
-    UC_WIN,   // Windows using EnableHexNumpad
-    UC_BSD,   // BSD (not implemented)
-    UC_WINC,  // Windows using WinCompose (https://github.com/samhocevar/wincompose)
-    UC_EMACS, // Emacs is an operating system in search of a good text editor
-    UC__COUNT // Number of available input modes (always leave at the end)
+    UNICODE_MODE_MACOS,      // macOS using Unicode Hex Input
+    UNICODE_MODE_LINUX,      // Linux using IBus
+    UNICODE_MODE_WINDOWS,    // Windows using EnableHexNumpad
+    UNICODE_MODE_BSD,        // BSD (not implemented)
+    UNICODE_MODE_WINCOMPOSE, // Windows using WinCompose (https://github.com/samhocevar/wincompose)
+    UNICODE_MODE_EMACS,      // Emacs is an operating system in search of a good text editor
+
+    UNICODE_MODE_COUNT // Number of available input modes (always leave at the end)
 };
 
 void    unicode_input_mode_init(void);
diff --git a/tests/caps_word/caps_word_unicodemap/config.h b/tests/caps_word/caps_word_unicodemap/config.h
index 89fd7924d4..0f770337b1 100644
--- a/tests/caps_word/caps_word_unicodemap/config.h
+++ b/tests/caps_word/caps_word_unicodemap/config.h
@@ -17,4 +17,4 @@
 
 #include "test_common.h"
 
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/tests/test_common/test_driver.hpp b/tests/test_common/test_driver.hpp
index c97bda8bc5..982aec6c83 100644
--- a/tests/test_common/test_driver.hpp
+++ b/tests/test_common/test_driver.hpp
@@ -64,7 +64,7 @@ class TestDriver {
 #define EXPECT_REPORT(driver, report) EXPECT_CALL((driver), send_keyboard_mock(KeyboardReport report))
 
 /**
- * @brief Sets gmock expectation that Unicode `code_point` is sent with UC_LNX input
+ * @brief Sets gmock expectation that Unicode `code_point` is sent with UNICODE_MODE_LINUX input
  * mode. For instance for U+2013,
  *
  *   EXPECT_UNICODE(driver, 0x2013);
diff --git a/users/arkag/arkag.c b/users/arkag/arkag.c
index fccae5ad6d..e7c8218587 100644
--- a/users/arkag/arkag.c
+++ b/users/arkag/arkag.c
@@ -190,15 +190,15 @@ void set_os (uint8_t os, bool update) {
   }
   switch (os) {
   case OS_MAC:
-    set_unicode_input_mode(UC_MAC);
+    set_unicode_input_mode(UNICODE_MODE_MACOS);
     underglow = (Color){ 213, 255, 255 };
     break;
   case OS_WIN:
-    set_unicode_input_mode(UC_WINC);
+    set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
     underglow = (Color){ 128, 255, 255 };
     break;
   case OS_NIX:
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
     underglow = (Color){ 43, 255, 255 };
     break;
   default:
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 57b26786b3..5c5c131e36 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -63,7 +63,7 @@
 #    endif
 #endif // !AUDIO_ENABLE
 
-#define UNICODE_SELECTED_MODES UC_WINC, UC_MAC
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS
 
 // #define WPM_ESTIMATED_WORD_SIZE 5
 #define WPM_ALLOW_COUNT_REGRESSION
diff --git a/users/konstantin/config.h b/users/konstantin/config.h
index f5247cf5a9..26c7ecc0c7 100644
--- a/users/konstantin/config.h
+++ b/users/konstantin/config.h
@@ -53,7 +53,7 @@
 
 // Unicode
 #define UNICODE_CYCLE_PERSIST  false
-#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX
 #define UNICODE_KEY_WINC       KC_RGUI
 
 // Firmware size reduction
diff --git a/users/kuchosauronad0/kuchosauronad0.c b/users/kuchosauronad0/kuchosauronad0.c
index 4e9e856107..2c63eadfd1 100644
--- a/users/kuchosauronad0/kuchosauronad0.c
+++ b/users/kuchosauronad0/kuchosauronad0.c
@@ -19,9 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 userspace_config_t userspace_config;
 #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-#  define KUCHOSAURONAD0_UNICODE_MODE UC_WINC
+#  define KUCHOSAURONAD0_UNICODE_MODE UNICODE_MODE_WINCOMPOSE
 #else
-#  define KUCHOSAURONAD0_UNICODE_MODE 2 // set to 2 for UC_WIN, set to 4 for UC_WINC
+#  define KUCHOSAURONAD0_UNICODE_MODE 2 // set to 2 for UNICODE_MODE_WINDOWS, set to 4 for UNICODE_MODE_WINCOMPOSE
 #endif
 
 
diff --git a/users/ridingqwerty/ridingqwerty.c b/users/ridingqwerty/ridingqwerty.c
index 19b417a80f..8934b9365b 100644
--- a/users/ridingqwerty/ridingqwerty.c
+++ b/users/ridingqwerty/ridingqwerty.c
@@ -7,7 +7,7 @@ void matrix_init_user(void) {
     matrix_init_keymap();
 
 #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE)
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 #endif
 
     //set_single_persistent_default_layer(_QWERTY);
diff --git a/users/romus/romus.c b/users/romus/romus.c
index a41a6df578..7b2e330228 100644
--- a/users/romus/romus.c
+++ b/users/romus/romus.c
@@ -142,7 +142,7 @@ void matrix_init_user (void) {
 
     // Correct unicode
 #ifdef UNICODE_ENABLE
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 #endif
 
     // Make beginning layer DVORAK
@@ -272,7 +272,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 stop_all_notes();
                 PLAY_SONG(tone_linux);
 #endif
-                set_unicode_input_mode(UC_LNX);
+                set_unicode_input_mode(UNICODE_MODE_LINUX);
             }
             return false;
             break;
@@ -282,7 +282,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 stop_all_notes();
                 PLAY_SONG(tone_windows);
 #endif
-                set_unicode_input_mode(UC_WIN);
+                set_unicode_input_mode(UNICODE_MODE_WINDOWS);
             }
             return false;
             break;
diff --git a/users/rupa/config.h b/users/rupa/config.h
index 723d9b3b5f..42a1708f9c 100644
--- a/users/rupa/config.h
+++ b/users/rupa/config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
 
 #define ONESHOT_TAP_TOGGLE 5
 #define ONESHOT_TIMEOUT 5000
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h
index 199404a760..b5794c8fad 100644
--- a/users/rupa/wrappers.h
+++ b/users/rupa/wrappers.h
@@ -111,7 +111,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ____65_ADJUST______________ROW1    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______
 #define ____65_ADJUST______________ROW2    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______
 #define ____65_ADJUST______________ROW3    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______
-#define ____65_ADJUST______________ROW4    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_MOD,  _______, _______
+#define ____65_ADJUST______________ROW4    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_NEXT, _______, _______
 #define ____65_ADJUST______________ROW5    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
 
 #define ____65_ADJUST__________RGB_ROW2    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, RESET,   _______
diff --git a/users/rverst/rverst.c b/users/rverst/rverst.c
index 2cbffbc478..df37ba9b5f 100644
--- a/users/rverst/rverst.c
+++ b/users/rverst/rverst.c
@@ -75,13 +75,13 @@ void switch_mode(uint8_t mode) {
 #ifdef UNICODEMAP_ENABLE
     switch (mode) {
         case MAC_UNI:
-            set_unicode_input_mode(UC_MAC);
+            set_unicode_input_mode(UNICODE_MODE_MACOS);
             break;
         case WINDOWS_UNI:
-            set_unicode_input_mode(UC_WINC);
+            set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
             break;
         case LINUX_UNI:
-            set_unicode_input_mode(UC_LNX);
+            set_unicode_input_mode(UNICODE_MODE_LINUX);
             break;
     }
 #endif
diff --git a/users/rverst/unicode.h b/users/rverst/unicode.h
index 2268ffb594..45d1585809 100644
--- a/users/rverst/unicode.h
+++ b/users/rverst/unicode.h
@@ -18,7 +18,7 @@
 
 #ifdef UNICODE_SELECTED_MODES
 #    undef UNICODE_SELECTED_MODES
-#    define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC
+#    define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
 #endif
 
 enum unicode_names { BANG, IRONY, SNEK };
diff --git a/users/sigma/sigma.c b/users/sigma/sigma.c
index 70a76d4c01..9a0786233b 100644
--- a/users/sigma/sigma.c
+++ b/users/sigma/sigma.c
@@ -67,13 +67,13 @@ void set_os(uint8_t os) {
 #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
   switch (os) {
   case _OS_MACOS:
-    set_unicode_input_mode(UC_MAC);
+    set_unicode_input_mode(UNICODE_MODE_MACOS);
     break;
   case _OS_LINUX:
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
     break;
   case _OS_WINDOWS:
-    set_unicode_input_mode(UC_WIN);
+    set_unicode_input_mode(UNICODE_MODE_WINDOWS);
     break;
   }
 #endif
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index 15f46a1f4a..0b3bf8f723 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -31,7 +31,7 @@
 
 #endif
 
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC, UC_EMACS
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_EMACS
 
 #define SPI_DEBUG_SCAN_RATE
 
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index 102848fc90..75a4b4c0a1 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -61,9 +61,9 @@ const rgblight_segment_t PROGMEM _huh_layer[]    = RGBLIGHT_LAYER_SEGMENTS(CORNE
 
 #define UNICODE_OFFSET 12
 const rgblight_segment_t PROGMEM _uc_mac_layer[]  = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_PURPLE));
-// No indicator for UC_LNX
-// UC_WIN disabled in config.h
-// UC_BSD not implemented
+// No indicator for UNICODE_MODE_LINUX
+// UNICODE_MODE_WINDOWS disabled in config.h
+// UNICODE_MODE_BSD not implemented
 const rgblight_segment_t PROGMEM _uc_winc_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_CYAN));
 const rgblight_segment_t PROGMEM _uc_emacs_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_GREEN));
 
@@ -85,14 +85,14 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
     [ACK_OFFSET + ACK_MEH]    = _meh_layer,
     [ACK_OFFSET + ACK_HUH]    = _huh_layer,
 
-    [UNICODE_OFFSET + UC_MAC]  = _uc_mac_layer,
-    [UNICODE_OFFSET + UC_LNX]  = _none,
-    [UNICODE_OFFSET + UC_WIN]  = _none,
-    [UNICODE_OFFSET + UC_BSD]  = _none,
-    [UNICODE_OFFSET + UC_WINC] = _uc_winc_layer,
-    [UNICODE_OFFSET + UC_EMACS] = _uc_emacs_layer,
+    [UNICODE_OFFSET + UNICODE_MODE_MACOS]      = _uc_mac_layer,
+    [UNICODE_OFFSET + UNICODE_MODE_LINUX]      = _none,
+    [UNICODE_OFFSET + UNICODE_MODE_WINDOWS]    = _none,
+    [UNICODE_OFFSET + UNICODE_MODE_BSD]        = _none,
+    [UNICODE_OFFSET + UNICODE_MODE_WINCOMPOSE] = _uc_winc_layer,
+    [UNICODE_OFFSET + UNICODE_MODE_EMACS]      = _uc_emacs_layer,
 
-    [UNICODE_OFFSET + UC__COUNT] = NULL
+    [UNICODE_OFFSET + UNICODE_MODE_COUNT] = NULL
 };
 
 // clang-format on
@@ -113,7 +113,7 @@ void do_rgb_layers(layer_state_t state, uint8_t start, uint8_t end) {
 }
 
 void do_rgb_unicode(uint8_t uc_mode) {
-    for (uint8_t i = 0; i < UC__COUNT; i++) {
+    for (uint8_t i = 0; i < UNICODE_MODE_COUNT; i++) {
         bool is_on = i == uc_mode;
         rgblight_set_layer_state(UNICODE_OFFSET + i, is_on);
     }
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index 0955bef3c3..3cf458d460 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -224,7 +224,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 // to determine what Print Screen key should do. The
                 // idea here is to make it consistent across hosts.
                 switch (get_unicode_input_mode()) {
-                    case UC_MAC:
+                    case UNICODE_MODE_MACOS:
                         if ((mods | osm) & MOD_MASK_ALT) {
                             // Window screenshot
                             clear_mods();
@@ -247,8 +247,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                         }
                         break;
 
-                    case UC_WIN:
-                    case UC_WINC:
+                    case UNICODE_MODE_WINDOWS
+                    case UNICODE_MODE_WINCOMPOSE:
                         if ((mods | osm) & MOD_MASK_ALT) {
                             // Window screenshot
                             // Alt+PrintScreen should work as is
diff --git a/users/spidey3/spidey3_unicode.c b/users/spidey3/spidey3_unicode.c
index c2804d8805..bda0876b54 100644
--- a/users/spidey3/spidey3_unicode.c
+++ b/users/spidey3/spidey3_unicode.c
@@ -24,5 +24,5 @@ const uint32_t PROGMEM unicode_map[] = {
 
 void eeconfig_init_user_unicode(void) {
     // Default to Linux style
-    set_unicode_input_mode(UC_LNX);
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
 }
diff --git a/users/uqs/config.h b/users/uqs/config.h
index 5530417de1..4bb793532b 100644
--- a/users/uqs/config.h
+++ b/users/uqs/config.h
@@ -22,7 +22,7 @@
 #define LEADER_TIMEOUT 400
 #define LEADER_PER_KEY_TIMING
 
-#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 
 // make KC_ACL0 et al work when held.
 #define MK_COMBINED
diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c
index ede34d4556..82cf70c439 100644
--- a/users/uqs/uqs.c
+++ b/users/uqs/uqs.c
@@ -560,13 +560,13 @@ void matrix_scan_user(void) {
     }
     // tableflip (LEADER - TF)
     SEQ_TWO_KEYS(KC_T, KC_F) {
-      //set_unicode_input_mode(UC_LNX);
+      //set_unicode_input_mode(UNICODE_MODE_LINUX);
       //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
       send_unicode_string("(╯°□°）╯︵ ┻━┻");
     }
     // untableflip
     SEQ_THREE_KEYS(KC_U, KC_T, KC_F) {
-      //set_unicode_input_mode(UC_LNX);
+      //set_unicode_input_mode(UNICODE_MODE_LINUX);
       //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
       send_unicode_string("┬─┬ノ( º _ ºノ)");
     }
diff --git a/users/yet-another-developer/yet-another-developer.c b/users/yet-another-developer/yet-another-developer.c
index b729c06219..0e62d0cc88 100644
--- a/users/yet-another-developer/yet-another-developer.c
+++ b/users/yet-another-developer/yet-another-developer.c
@@ -4,9 +4,9 @@
 userspace_config_t userspace_config;
 
 #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-    #define YAD_UNICODE_MODE UC_WIN
+    #define YAD_UNICODE_MODE UNICODE_MODE_WINDOWS
 #else
-// set to 2 for UC_WIN, set to 4 for UC_WINC
+// set to 2 for UNICODE_MODE_WINDOWS, set to 4 for UNICODE_MODE_WINCOMPOSE
     #define YAD_UNICODE_MODE 2
 #endif
 

From 7ebc3968761b01202a36c57bb98e90067e733074 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 1 Nov 2022 11:35:38 +1100
Subject: [PATCH 777/959] compiler.txt: ensure file exists before comparison
 (#18921)

---
 builddefs/common_rules.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index 22746b92a3..5d100fec59 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -332,6 +332,7 @@ $1/asflags.txt: $1/force
 	echo '$$($1_ASFLAGS)' | cmp -s - $$@ || echo '$$($1_ASFLAGS)' > $$@
 
 $1/compiler.txt: $1/force
+	test -f $$@ || touch $$@
 	$$(CC) --version | cmp -s - $$@ || $$(CC) --version > $$@
 endef
 

From ae5f818d5a1efa321ffc0c6e659fa8fb47e79a01 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 31 Oct 2022 18:02:43 -0700
Subject: [PATCH 778/959] Simplify Keymap Config EEPROM (#18886)

* Simplify Keymap Config EEPROM

* Decrement eeconfig magic number due to eeconfig changes

* Update quantum/eeconfig.h

Co-authored-by: Joel Challis <git@zvecr.com>
---
 quantum/eeconfig.c | 11 ++++-------
 quantum/eeconfig.h | 11 +++--------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 27a0f6d48f..2e2df11d69 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -45,10 +45,8 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_DEBUG, 0);
     eeprom_update_byte(EECONFIG_DEFAULT_LAYER, 0);
     default_layer_state = 0;
-    eeprom_update_byte(EECONFIG_KEYMAP_LOWER_BYTE, 0);
-    // Enable oneshot and autocorrect by default: 0b0001 0100
-    eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, 0x14);
-    eeprom_update_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
+    // Enable oneshot and autocorrect by default: 0b0001 0100 0000 0000
+    eeprom_update_word(EECONFIG_KEYMAP, 0x1400);
     eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
     eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default
     eeprom_update_dword(EECONFIG_RGBLIGHT, 0);
@@ -167,15 +165,14 @@ void eeconfig_update_default_layer(uint8_t val) {
  * FIXME: needs doc
  */
 uint16_t eeconfig_read_keymap(void) {
-    return (eeprom_read_byte(EECONFIG_KEYMAP_LOWER_BYTE) | (eeprom_read_byte(EECONFIG_KEYMAP_UPPER_BYTE) << 8));
+    return eeprom_read_word(EECONFIG_KEYMAP);
 }
 /** \brief eeconfig update keymap
  *
  * FIXME: needs doc
  */
 void eeconfig_update_keymap(uint16_t val) {
-    eeprom_update_byte(EECONFIG_KEYMAP_LOWER_BYTE, val & 0xFF);
-    eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, (val >> 8) & 0xFF);
+    eeprom_update_word(EECONFIG_KEYMAP, val);
 }
 
 /** \brief eeconfig read audio
diff --git a/quantum/eeconfig.h b/quantum/eeconfig.h
index 565a0dbe5b..9c4617c962 100644
--- a/quantum/eeconfig.h
+++ b/quantum/eeconfig.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 
 #ifndef EECONFIG_MAGIC_NUMBER
-#    define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE8 // When changing, decrement this value to avoid future re-init issues
+#    define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE7 // When changing, decrement this value to avoid future re-init issues
 #endif
 #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF
 
@@ -29,8 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EECONFIG_MAGIC (uint16_t *)0
 #define EECONFIG_DEBUG (uint8_t *)2
 #define EECONFIG_DEFAULT_LAYER (uint8_t *)3
-#define EECONFIG_KEYMAP (uint8_t *)4
-#define EECONFIG_MOUSEKEY_ACCEL (uint8_t *)5
+#define EECONFIG_KEYMAP (uint16_t *)4
 #define EECONFIG_BACKLIGHT (uint8_t *)6
 #define EECONFIG_AUDIO (uint8_t *)7
 #define EECONFIG_RGBLIGHT (uint32_t *)8
@@ -51,10 +50,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EECONFIG_LED_MATRIX_EXTENDED (uint16_t *)32
 #define EECONFIG_RGB_MATRIX_EXTENDED (uint16_t *)32
 
-// TODO: Combine these into a single word and single block of EEPROM
-#define EECONFIG_KEYMAP_UPPER_BYTE (uint8_t *)34
 // Size of EEPROM being used, other code can refer to this for available EEPROM
-#define EECONFIG_SIZE 35
+#define EECONFIG_SIZE 34
 /* debug bit */
 #define EECONFIG_DEBUG_ENABLE (1 << 0)
 #define EECONFIG_DEBUG_MATRIX (1 << 1)
@@ -71,8 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EECONFIG_KEYMAP_SWAP_BACKSLASH_BACKSPACE (1 << 6)
 #define EECONFIG_KEYMAP_NKRO (1 << 7)
 
-#define EECONFIG_KEYMAP_LOWER_BYTE EECONFIG_KEYMAP
-
 bool eeconfig_is_enabled(void);
 bool eeconfig_is_disabled(void);
 

From 9435ad19eedba9e56fa6a33989bc5c788f080e54 Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Tue, 1 Nov 2022 12:04:15 +0800
Subject: [PATCH 779/959] Added analog support for WB32 MCU. (#18289)

Co-authored-by: Joy <chang.li@westberrytech.com>
---
 .../handwired/onekey/evb_wb32f3g71/config.h   | 25 +++++++++++++++++++
 .../handwired/onekey/evb_wb32f3g71/halconf.h  | 11 ++++++++
 .../handwired/onekey/evb_wb32f3g71/info.json  |  6 +++++
 .../handwired/onekey/evb_wb32f3g71/mcuconf.h  | 17 +++++++++++++
 .../handwired/onekey/evb_wb32f3g71/rules.mk   |  4 +--
 .../handwired/onekey/evb_wb32fq95/config.h    | 25 +++++++++++++++++++
 .../handwired/onekey/evb_wb32fq95/halconf.h   | 11 ++++++++
 .../handwired/onekey/evb_wb32fq95/info.json   |  6 +++++
 .../handwired/onekey/evb_wb32fq95/mcuconf.h   | 17 +++++++++++++
 .../handwired/onekey/evb_wb32fq95/rules.mk    |  4 +--
 platforms/chibios/drivers/analog.c            | 12 ++++-----
 11 files changed, 126 insertions(+), 12 deletions(-)
 create mode 100644 keyboards/handwired/onekey/evb_wb32f3g71/config.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32f3g71/halconf.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32fq95/config.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32fq95/halconf.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h

diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
new file mode 100644
index 0000000000..d1f87b4e3e
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
@@ -0,0 +1,25 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define ADC_PIN A0
+
+#define BACKLIGHT_PWM_DRIVER  PWMD4
+#define BACKLIGHT_PWM_CHANNEL 3
+#define BACKLIGHT_PAL_MODE    2
+
+#define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
+#define RGB_CI_PIN B8
+
+#define SOLENOID_PIN B12
+#define SOLENOID_PINS { B12, B13, B14, B15 }
+#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
+
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PIN B6
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 100000
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/halconf.h b/keyboards/handwired/onekey/evb_wb32f3g71/halconf.h
new file mode 100644
index 0000000000..f0cf0a179f
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
index 6287cdc34a..304517d266 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
@@ -5,5 +5,11 @@
     "matrix_pins": {
         "cols": ["B12"],
         "rows": ["B13"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "pin": "A0"
     }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
new file mode 100644
index 0000000000..7ef36ff66c
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
@@ -0,0 +1,17 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef WB32_ADC_USE_ADC1
+#define WB32_ADC_USE_ADC1 TRUE
+
+#undef WB32_DMA_REQUIRED
+#define WB32_DMA_REQUIRED TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
+
+#undef WB32_PWM_USE_TIM4
+#define WB32_PWM_USE_TIM4 TRUE
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk b/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
index 033dd66aa4..1071cf62ee 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
@@ -1,3 +1 @@
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-NKRO_ENABLE = no           # Enable N-Key Rollover
+KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h
new file mode 100644
index 0000000000..d1f87b4e3e
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h
@@ -0,0 +1,25 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define ADC_PIN A0
+
+#define BACKLIGHT_PWM_DRIVER  PWMD4
+#define BACKLIGHT_PWM_CHANNEL 3
+#define BACKLIGHT_PAL_MODE    2
+
+#define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
+#define RGB_CI_PIN B8
+
+#define SOLENOID_PIN B12
+#define SOLENOID_PINS { B12, B13, B14, B15 }
+#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
+
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PIN B6
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 100000
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/halconf.h b/keyboards/handwired/onekey/evb_wb32fq95/halconf.h
new file mode 100644
index 0000000000..f0cf0a179f
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32fq95/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json
index 3fc1c88657..bbf5139668 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json
@@ -5,5 +5,11 @@
     "matrix_pins": {
         "cols": ["B12"],
         "rows": ["B13"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "pin": "A0"
     }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
new file mode 100644
index 0000000000..7ef36ff66c
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
@@ -0,0 +1,17 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef WB32_ADC_USE_ADC1
+#define WB32_ADC_USE_ADC1 TRUE
+
+#undef WB32_DMA_REQUIRED
+#define WB32_DMA_REQUIRED TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
+
+#undef WB32_PWM_USE_TIM4
+#define WB32_PWM_USE_TIM4 TRUE
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/rules.mk b/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
index 033dd66aa4..1071cf62ee 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
+++ b/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
@@ -1,3 +1 @@
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-NKRO_ENABLE = no           # Enable N-Key Rollover
+KEYBOARD_SHARED_EP = yes
diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c
index a7b7ec76d7..8b03e73849 100644
--- a/platforms/chibios/drivers/analog.c
+++ b/platforms/chibios/drivers/analog.c
@@ -22,7 +22,7 @@
 #    error "You need to set HAL_USE_ADC to TRUE in your halconf.h to use the ADC."
 #endif
 
-#if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC2 && !STM32_ADC_USE_ADC3 && !STM32_ADC_USE_ADC4
+#if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC2 && !STM32_ADC_USE_ADC3 && !STM32_ADC_USE_ADC4 && !WB32_ADC_USE_ADC1
 #    error "You need to set one of the 'STM32_ADC_USE_ADCx' settings to TRUE in your mcuconf.h to use the ADC."
 #endif
 
@@ -37,7 +37,7 @@
 // Otherwise assume V3
 #if defined(STM32F0XX) || defined(STM32L0XX)
 #    define USE_ADCV1
-#elif defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(GD32VF103)
+#elif defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(GD32VF103) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
 #    define USE_ADCV2
 #endif
 
@@ -74,7 +74,7 @@
 
 /* User configurable ADC options */
 #ifndef ADC_COUNT
-#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F4XX) || defined(GD32VF103)
+#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F4XX) || defined(GD32VF103) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
 #        define ADC_COUNT 1
 #    elif defined(STM32F3XX)
 #        define ADC_COUNT 4
@@ -121,7 +121,7 @@ static ADCConversionGroup adcConversionGroup = {
     .cfgr1 = ADC_CFGR1_CONT | ADC_RESOLUTION,
     .smpr  = ADC_SAMPLING_RATE,
 #elif defined(USE_ADCV2)
-#    if !defined(STM32F1XX) && !defined(GD32VF103)
+#    if !defined(STM32F1XX) && !defined(GD32VF103) && !defined(WB32F3G71xx) && !defined(WB32FQ95xx)
     .cr2   = ADC_CR2_SWSTART, // F103 seem very unhappy with, F401 seems very unhappy without...
 #    endif
     .smpr2 = ADC_SMPR2_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN9(ADC_SAMPLING_RATE),
@@ -219,7 +219,7 @@ __attribute__((weak)) adc_mux pinToMux(pin_t pin) {
         case F9:  return TO_MUX( ADC_CHANNEL_IN7,  2 );
         case F10: return TO_MUX( ADC_CHANNEL_IN8,  2 );
 #    endif
-#elif defined(STM32F1XX) || defined(GD32VF103)
+#elif defined(STM32F1XX) || defined(GD32VF103) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
         case A0:  return TO_MUX( ADC_CHANNEL_IN0,  0 );
         case A1:  return TO_MUX( ADC_CHANNEL_IN1,  0 );
         case A2:  return TO_MUX( ADC_CHANNEL_IN2,  0 );
@@ -248,7 +248,7 @@ __attribute__((weak)) adc_mux pinToMux(pin_t pin) {
 
 static inline ADCDriver* intToADCDriver(uint8_t adcInt) {
     switch (adcInt) {
-#if STM32_ADC_USE_ADC1
+#if STM32_ADC_USE_ADC1 || WB32_ADC_USE_ADC1
         case 0:
             return &ADCD1;
 #endif

From 5fb80562f11b9bbd291a7d7e920912dedcc8a9f2 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Tue, 1 Nov 2022 17:34:31 -0400
Subject: [PATCH 780/959] Fix syntax error introduced in #18800 (#18933)

---
 users/spidey3/spidey3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index 3cf458d460..0f3c08fca6 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -247,7 +247,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                         }
                         break;
 
-                    case UNICODE_MODE_WINDOWS
+                    case UNICODE_MODE_WINDOWS:
                     case UNICODE_MODE_WINCOMPOSE:
                         if ((mods | osm) & MOD_MASK_ALT) {
                             // Window screenshot

From 7fe76e53c1e7c1569a99b6dbf3eee11aad3df094 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 3 Nov 2022 10:40:56 -0700
Subject: [PATCH 781/959] [Keyboard]  Add hotdox76v2 support (#18680)

---
 keyboards/hotdox76v2/config.h                 |  46 +++
 keyboards/hotdox76v2/hotdox76v2.c             | 309 ++++++++++++++++++
 keyboards/hotdox76v2/hotdox76v2.h             |   9 +
 keyboards/hotdox76v2/info.json                | 224 +++++++++++++
 keyboards/hotdox76v2/keymaps/default/keymap.c |  35 ++
 keyboards/hotdox76v2/keymaps/via/keymap.c     | 179 ++++++++++
 keyboards/hotdox76v2/keymaps/via/rules.mk     |   3 +
 keyboards/hotdox76v2/oled_font_lib/ext_font.h | 122 +++++++
 keyboards/hotdox76v2/oled_font_lib/logo2.h    |  14 +
 keyboards/hotdox76v2/readme.md                |  25 ++
 keyboards/hotdox76v2/rules.mk                 |   1 +
 11 files changed, 967 insertions(+)
 create mode 100644 keyboards/hotdox76v2/config.h
 create mode 100644 keyboards/hotdox76v2/hotdox76v2.c
 create mode 100644 keyboards/hotdox76v2/hotdox76v2.h
 create mode 100644 keyboards/hotdox76v2/info.json
 create mode 100644 keyboards/hotdox76v2/keymaps/default/keymap.c
 create mode 100644 keyboards/hotdox76v2/keymaps/via/keymap.c
 create mode 100644 keyboards/hotdox76v2/keymaps/via/rules.mk
 create mode 100644 keyboards/hotdox76v2/oled_font_lib/ext_font.h
 create mode 100644 keyboards/hotdox76v2/oled_font_lib/logo2.h
 create mode 100644 keyboards/hotdox76v2/readme.md
 create mode 100644 keyboards/hotdox76v2/rules.mk

diff --git a/keyboards/hotdox76v2/config.h b/keyboards/hotdox76v2/config.h
new file mode 100644
index 0000000000..8a1bdb0288
--- /dev/null
+++ b/keyboards/hotdox76v2/config.h
@@ -0,0 +1,46 @@
+// Copyright 2021 JasonRen(biu)
+// Copyright 2022 Drashna Jael're (@Drashna Jael're)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define RGB_MATRIX_SPLIT \
+    { 43, 43 }
+
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 86
+#define DRIVER_LED_TOTAL RGBLED_NUM
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_CENTER \
+    { 112, 32 }
+
+#define SPLIT_TRANSPORT_MIRROR
+#define SPLIT_MODS_ENABLE
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_OLED_ENABLE
+#define SPLIT_TRANSACTION_IDS_KB KEYBOARD_CURRENT_ALPA_SYNC
+
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
diff --git a/keyboards/hotdox76v2/hotdox76v2.c b/keyboards/hotdox76v2/hotdox76v2.c
new file mode 100644
index 0000000000..15613a36cd
--- /dev/null
+++ b/keyboards/hotdox76v2/hotdox76v2.c
@@ -0,0 +1,309 @@
+// Copyright 2021 JasonRen(biu)
+// Copyright 2022 Drashna Jael're (@Drashna Jael're)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include <string.h>
+#include <transactions.h>
+#include "oled_font_lib/logo2.h"
+#include "oled_font_lib/ext_font.h"
+
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = {
+    {
+        { NO_LED, 34, 33, 32, 35, 37, 36     },
+        { 27, 28, 29, 30, 31, NO_LED, NO_LED },
+        { 26, 25, 24, 23, 22, 21, 20         },
+        { 14, 15, 16, 17, 18, 19, NO_LED     },
+        { 13, 12, 11, 10,  9,  8,  7         },
+        {   0, 1,  2,   3, 4,  5,  6         },
+        /*right*/
+        { NO_LED, 72, 71, 70, 73, 75, 74     },
+        { 65, 66, 67, 68, 69, NO_LED, NO_LED },
+        { 64, 63, 62, 61, 60, 59, 58         },
+        { 52, 53, 54, 55, 56, 57, NO_LED     },
+        { 51, 50, 49, 48, 47, 46, 45         },
+        { 38, 39, 40, 41, 42, 43, 44         }
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},    {17,0},  {34,0},  {52,0},  {69,0},  {86,0},  {103,0}, \
+        {103,13}, {86,13}, {69,13}, {52,13}, {34,13}, {17,13}, {0,13}, \
+        {0,26},   {17,26}, {34,26}, {52,26}, {69,26}, {86,26}, \
+        {103,38}, {86,38}, {69,38}, {52,38}, {34,38}, {17,38}, {0,38}, \
+        {0,51},   {17,51}, {34,51}, {52,51}, {69,51},  \
+                  {86,64}, {69,64}, {52,64}, {34,64}, {17,64}, {0,64}, \
+                  {69,64}, {52,64}, {34,64}, {17,64}, {0,64}, \
+
+                                                                                    \
+        {224,0},  {207,0},  {190,0},  {172,0},  {155,0},  {138,0},  {121,0}, \
+        {121,13}, {138,13}, {155,13}, {172,13}, {190,13}, {207,13}, {224,13}, \
+        {224,26}, {207,26}, {190,26}, {172,26}, {155,26}, {138,26}, \
+        {121,38}, {138,38}, {155,38}, {172,38}, {190,38}, {207,38}, {224,38}, \
+        {224,51}, {207,51}, {190,51}, {172,51}, {155,51},  \
+                  {138,64}, {155,64}, {172,64}, {190,64}, {207,64}, {224,64}, \
+                  {155,64}, {172,64}, {190,64}, {207,64}, {224,64}\
+
+
+    },
+    {
+      // LED Index to Flag
+      4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,\
+      2,2,2,2,2,\
+      4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,\
+      2,2,2,2,2
+    }
+};
+// clang-format on
+#endif
+
+#ifdef OLED_ENABLE
+
+#    define UNC (94 + 0x21)
+typedef struct _master_to_slave_t {
+    int  cur_alp_index;
+    char current_alp[7];
+} master_to_slave_t;
+master_to_slave_t m2s;
+
+typedef struct _slave_to_master_t {
+    int  cur_alp_index;
+    char current_alp[7];
+} slave_to_master_t;
+slave_to_master_t s2m;
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    strcpy((char *)(m2s.current_alp), "[    ]");
+    m2s.current_alp[1] = UNC;
+    m2s.current_alp[2] = UNC;
+    m2s.current_alp[3] = UNC;
+    m2s.current_alp[4] = UNC;
+
+    m2s.cur_alp_index = 1;
+
+    strcpy((char *)(s2m.current_alp), "[    ]");
+    s2m.current_alp[1] = UNC;
+    s2m.current_alp[2] = UNC;
+    s2m.current_alp[3] = UNC;
+    s2m.current_alp[4] = UNC;
+
+    s2m.cur_alp_index = 1;
+
+    if (is_keyboard_left()) {
+        return OLED_ROTATION_180;
+    } else {
+        return OLED_ROTATION_0;
+    }
+}
+
+void render_logo(void) {
+    uint8_t i = 0, j = 0;
+    for (i = 0; i < 4; ++i) {
+        for (j = 0; j < 32; ++j) {
+            if (is_keyboard_left()) {
+                oled_write_raw_byte(pgm_read_byte(&logo_mouse[i * 32 + j]), i * 128 + j);
+            } else {
+                oled_write_raw_byte(pgm_read_byte(&logo_mouse[i * 32 + j]), i * 128 + j + 96);
+            }
+        }
+    }
+}
+
+void render_layer_helper_fun(uint8_t start_line, const char *data, uint8_t gap_w, uint8_t l) {
+    uint8_t j = 0, k = 0;
+    for (j = 0; j < l; ++j) {      // font index
+        for (k = 0; k < 12; ++k) { // font byte index
+            //                                        base + logo_w(32) + gap_w(12) +l*font_w(12)+current_byte_index
+            oled_write_raw_byte(pgm_read_byte(&ext_big_font[pgm_read_byte(&data[j]) - 0x21][k]), start_line * 2 * 128 + 32 + gap_w + j * 12 + k);
+            oled_write_raw_byte(pgm_read_byte(&ext_big_font[pgm_read_byte(&data[j]) - 0x21][k + 12]), start_line * 2 * 128 + 128 + 32 + gap_w + j * 12 + k);
+        }
+    }
+    for (j = 0; j < gap_w; ++j) {
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + 32 + j);
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + 32 + gap_w + l * 12 + j);
+
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + 128 + 32 + j);
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + 128 + 32 + gap_w + l * 12 + j);
+    }
+}
+void render_layer(uint8_t layer) {
+    render_layer_helper_fun(0, PSTR("LAYER:"), 12, 6);
+    switch (layer) {
+        case 0:
+            render_layer_helper_fun(1, PSTR("1:HOME"), 12, 6);
+            break;
+        case 1:
+            render_layer_helper_fun(1, PSTR("2:CODE"), 12, 6);
+            break;
+        case 2:
+            render_layer_helper_fun(1, PSTR("3:OFFICE"), 0, 8);
+            break;
+        case 3:
+        default:
+            render_layer_helper_fun(1, PSTR("4:OTHERS"), 0, 8);
+            break;
+    }
+}
+
+void render_cur_input_helper_fun(uint8_t start_line, const char *data, uint8_t gap_w, uint8_t l) {
+    uint8_t j = 0, k = 0;
+    for (j = 0; j < l; ++j) {      // font index
+        for (k = 0; k < 12; ++k) { // font byte index
+            //                                        base + logo_w(0) + gap_w(12) +l*font_w(12)+current_byte_index
+            oled_write_raw_byte(pgm_read_byte(&ext_big_font[data[j] - 0x21][k]), start_line * 2 * 128 + gap_w + j * 12 + k);
+            oled_write_raw_byte(pgm_read_byte(&ext_big_font[data[j] - 0x21][12 + k]), start_line * 2 * 128 + 128 + gap_w + j * 12 + k);
+        }
+    }
+    for (j = 0; j < gap_w; ++j) {
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + j);
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + gap_w + l * 12 + j);
+
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + 128 + j);
+        oled_write_raw_byte(pgm_read_byte(&blank_block), start_line * 2 * 128 + 128 + gap_w + l * 12 + j);
+    }
+}
+
+void render_cur_input(void) {
+    render_cur_input_helper_fun(0, "INPUTS:", 6, 7);
+    if (is_keyboard_master()) {
+        render_cur_input_helper_fun(1, (const char *)(m2s.current_alp), 12, 6);
+    } else {
+        render_cur_input_helper_fun(1, (const char *)(s2m.current_alp), 12, 6);
+    }
+    return;
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    render_logo();
+    if (is_keyboard_left()) {
+        render_layer(biton32(layer_state));
+    } else {
+        render_cur_input();
+    }
+    return false;
+}
+
+static const char PROGMEM code_to_name[0xFF] = {
+    //   0    1    2    3    4    5    6    7    8    9    A    B    c    D    E    F
+    UNC, UNC,  UNC, UNC, 'a',  'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', // 0x
+    'm', 'n',  'o', 'p', 'q',  'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', // 1x
+    '3', '4',  '5', '6', '7',  '8', '9', '0', UNC, UNC, UNC, UNC, UNC, '-', '=', '[', // 2x
+    ']', '\\', '#', ';', '\'', '`', ',', '.', '/', UNC, UNC, UNC, UNC, UNC, UNC, UNC, // 3x
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // 4x
+    UNC, UNC,  UNC, UNC, '/',  '*', '-', '+', UNC, '1', '2', '3', '4', '5', '6', '7', // 5x
+    '8', '9',  '0', '.', UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // 6x
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // 7x
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // 8x
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // 9x
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // Ax
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // Bx
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // Cx
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // Dx
+    UNC, UNC,  'A', 'W', UNC,  'S', UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, // Ex
+    UNC, UNC,  UNC, UNC, UNC,  UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC, UNC       // Fx
+};
+
+void get_cur_alp_hook(uint16_t keycode) {
+    if (keycode >= 0xF0) {
+        keycode = 0xF0;
+    }
+    if (m2s.cur_alp_index < 4) {
+        m2s.current_alp[m2s.cur_alp_index] = pgm_read_byte(&code_to_name[keycode]);
+        if (m2s.cur_alp_index == 1) {
+            m2s.current_alp[2] = m2s.current_alp[3] = m2s.current_alp[4] = UNC;
+        }
+        m2s.cur_alp_index++;
+    } else {
+        for (uint8_t i = 2; i <= 4; ++i) {
+            m2s.current_alp[i - 1] = m2s.current_alp[i];
+        }
+        m2s.current_alp[m2s.cur_alp_index] = pgm_read_byte(&code_to_name[keycode]);
+    }
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        get_cur_alp_hook(keycode);
+    }
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case TOG_OLED:
+            if (record->event.pressed) {
+                if (is_oled_on()) {
+                    oled_off();
+                } else {
+                    oled_on();
+                }
+            }
+            return false;
+        default:
+            return true;
+    }
+    return true;
+}
+
+void matrix_scan_kb(void) {
+    if (!is_oled_on()) {
+        m2s.cur_alp_index = 1;
+    }
+    matrix_scan_user();
+}
+
+void user_sync_alpa_slave_handler(uint8_t in_buflen, const void *in_data, uint8_t out_buflen, void *out_data) {
+    const master_to_slave_t *m2s_p = (const master_to_slave_t *)in_data;
+    s2m.cur_alp_index              = m2s_p->cur_alp_index;
+    for (size_t i = 0; i < 7; i++) {
+        s2m.current_alp[i] = m2s_p->current_alp[i];
+    }
+}
+
+void keyboard_post_init_kb(void) {
+    transaction_register_rpc(KEYBOARD_CURRENT_ALPA_SYNC, user_sync_alpa_slave_handler);
+    keyboard_post_init_user();
+}
+
+void housekeeping_task_kb(void) {
+    if (is_keyboard_master()) {
+        // Interact with slave every 200ms
+        static uint32_t last_sync = 0;
+        if (timer_elapsed32(last_sync) > 200) {
+            if (transaction_rpc_exec(KEYBOARD_CURRENT_ALPA_SYNC, sizeof(m2s), &m2s, sizeof(s2m), &s2m)) {
+                last_sync = timer_read32();
+                dprint("Slave sync successed!\n");
+            } else {
+                dprint("Slave sync failed!\n");
+            }
+        }
+    }
+    housekeeping_task_user();
+}
+
+#endif
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__((weak))
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    /* Left hand, matrix positions */
+    {{0,  6}, {1,  6}, {2,  6}, {3,  6}, {4,  6}, {5,  6}, {6, 6}},
+    {{0,  7}, {1,  7}, {2,  7}, {3,  7}, {4,  7}, {5,  7}, {6,  7}},
+    {{0,  8}, {1,  8}, {2,  8}, {3,  8}, {4,  8}, {5,  8}, {6,  8}},
+    {{0,  9}, {1,  9}, {2,  9}, {3,  9}, {4,  9}, {5,  9}, {6,  9}},
+    {{0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10},  {6, 10}},
+    {{0, 11}, {1, 11}, {2, 11}, {3, 11}, {4, 11}, {5, 11},  {6, 11}},
+
+    /* Right hand, matrix positions */
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}},
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}},
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}}
+};
+#endif
diff --git a/keyboards/hotdox76v2/hotdox76v2.h b/keyboards/hotdox76v2/hotdox76v2.h
new file mode 100644
index 0000000000..a9165dd673
--- /dev/null
+++ b/keyboards/hotdox76v2/hotdox76v2.h
@@ -0,0 +1,9 @@
+// Copyright 2021 JasonRen(biu)
+// Copyright 2022 Drashna Jael're (@Drashna Jael're)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define TOG_OLED KC_F13
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json
new file mode 100644
index 0000000000..70c62212f1
--- /dev/null
+++ b/keyboards/hotdox76v2/info.json
@@ -0,0 +1,224 @@
+{
+    "manufacturer": "JasonRen biu",
+    "keyboard_name": "hotdox76",
+    "maintainer": "Drashna Jael're",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "lto": true,
+        "oled": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["D6", "D7", "B4", "B5", "B6", "C6"]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/Oh-My-Mechanical-Keyboard",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xAAA9",
+        "vid": "0xAA96"
+    },
+    "community_layouts": [
+        "ergodox"
+    ],
+    "layouts": {
+        "LAYOUT_ergodox": {
+            "layout": [
+                { "label": "L00", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 0.375 },
+                { "label": "L01", "matrix": [5, 1], "w": 1, "x": 1.5, "y": 0.375 },
+                { "label": "L02", "matrix": [5, 2], "w": 1, "x": 2.5, "y": 0.125 },
+                { "label": "L03", "matrix": [5, 3], "w": 1, "x": 3.5, "y": 0 },
+                { "label": "L04", "matrix": [5, 4], "w": 1, "x": 4.5, "y": 0.125 },
+                { "label": "L05", "matrix": [5, 5], "w": 1, "x": 5.5, "y": 0.25 },
+                { "label": "L06", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 0.25 },
+
+                { "label": "L10", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 1.375 },
+                { "label": "L11", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 1.375 },
+                { "label": "L12", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 1.125 },
+                { "label": "L13", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "L14", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 1.125 },
+                { "label": "L15", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 1.25 },
+                { "label": "L16", "matrix": [4, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
+
+                { "label": "L20", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 2.375 },
+                { "label": "L21", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 2.375 },
+                { "label": "L22", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 2.125 },
+                { "label": "L23", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 2 },
+                { "label": "L24", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 2.125 },
+                { "label": "L25", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 2.25 },
+
+                { "label": "L30", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.375 },
+                { "label": "L31", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 3.375 },
+                { "label": "L32", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 3.125 },
+                { "label": "L33", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 3 },
+                { "label": "L34", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 3.125 },
+                { "label": "L35", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 3.25 },
+                { "label": "L36", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
+
+                { "label": "L40", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 4.375 },
+                { "label": "L41", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 4.375 },
+                { "label": "L42", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 4.125 },
+                { "label": "L43", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 4 },
+                { "label": "L44", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 4.125 },
+
+                { "label": "L55", "matrix": [0, 5], "w": 1, "x": 6, "y": 5 },
+                { "label": "L56", "matrix": [0, 6], "w": 1, "x": 7, "y": 5 },
+                { "label": "L54", "matrix": [0, 4], "w": 1, "x": 7, "y": 6 },
+                { "label": "L53", "matrix": [0, 3], "w": 1, "x": 5, "y": 6, "h": 2 },
+                { "label": "L52", "matrix": [0, 2], "w": 1, "x": 6, "y": 6, "h": 2 },
+                { "label": "L51", "matrix": [0, 1], "w": 1, "x": 7, "y": 7 },
+
+                { "label": "R06", "matrix": [11, 6], "w": 1, "x": 9.5, "y": 0.25 },
+                { "label": "R05", "matrix": [11, 5], "w": 1, "x": 10.5, "y": 0.25 },
+                { "label": "R04", "matrix": [11, 4], "w": 1, "x": 11.5, "y": 0.125 },
+                { "label": "R03", "matrix": [11, 3], "w": 1, "x": 12.5, "y": 0 },
+                { "label": "R02", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 0.125 },
+                { "label": "R01", "matrix": [11, 1], "w": 1, "x": 14.5, "y": 0.375 },
+                { "label": "R00", "matrix": [11, 0], "w": 1.5, "x": 15.5, "y": 0.375 },
+
+                { "label": "R16", "matrix": [10, 6], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
+                { "label": "R15", "matrix": [10, 5], "w": 1, "x": 10.5, "y": 1.25 },
+                { "label": "R14", "matrix": [10, 4], "w": 1, "x": 11.5, "y": 1.125 },
+                { "label": "R13", "matrix": [10, 3], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "R12", "matrix": [10, 2], "w": 1, "x": 13.5, "y": 1.125 },
+                { "label": "R11", "matrix": [10, 1], "w": 1, "x": 14.5, "y": 1.375 },
+                { "label": "R10", "matrix": [10, 0], "w": 1.5, "x": 15.5, "y": 1.375 },
+
+                { "label": "R25", "matrix": [9, 5], "w": 1, "x": 10.5, "y": 2.25 },
+                { "label": "R24", "matrix": [9, 4], "w": 1, "x": 11.5, "y": 2.125 },
+                { "label": "R23", "matrix": [9, 3], "w": 1, "x": 12.5, "y": 2 },
+                { "label": "R22", "matrix": [9, 2], "w": 1, "x": 13.5, "y": 2.125 },
+                { "label": "R21", "matrix": [9, 1], "w": 1, "x": 14.5, "y": 2.375 },
+                { "label": "R20", "matrix": [9, 0], "w": 1.5, "x": 15.5, "y": 2.375 },
+
+                { "label": "R36", "matrix": [8, 6], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
+                { "label": "R35", "matrix": [8, 5], "w": 1, "x": 10.5, "y": 3.25 },
+                { "label": "R34", "matrix": [8, 4], "w": 1, "x": 11.5, "y": 3.125 },
+                { "label": "R33", "matrix": [8, 3], "w": 1, "x": 12.5, "y": 3 },
+                { "label": "R32", "matrix": [8, 2], "w": 1, "x": 13.5, "y": 3.125 },
+                { "label": "R31", "matrix": [8, 1], "w": 1, "x": 14.5, "y": 3.375 },
+                { "label": "R30", "matrix": [8, 0], "w": 1.5, "x": 15.5, "y": 3.375 },
+
+                { "label": "R44", "matrix": [7, 4], "w": 1, "x": 11.5, "y": 4.125 },
+                { "label": "R43", "matrix": [7, 3], "w": 1, "x": 12.5, "y": 4 },
+                { "label": "R42", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 4.125 },
+                { "label": "R41", "matrix": [7, 1], "w": 1, "x": 14.5, "y": 4.375 },
+                { "label": "R40", "matrix": [7, 0], "w": 1, "x": 15.5, "y": 4.375 },
+
+                { "label": "R56", "matrix": [6, 6], "w": 1, "x": 9, "y": 5 },
+                { "label": "R55", "matrix": [6, 5], "w": 1, "x": 10, "y": 5 },
+                { "label": "R54", "matrix": [6, 4], "w": 1, "x": 9, "y": 6 },
+                { "label": "R51", "matrix": [6, 1], "w": 1, "x": 9, "y": 7 },
+                { "label": "R52", "matrix": [6, 2], "w": 1, "x": 11, "y": 6, "h": 2 },
+                { "label": "R53", "matrix": [6, 3], "w": 1, "x": 10, "y": 6, "h": 2 }
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                { "label": "L00", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 0.375 },
+                { "label": "L01", "matrix": [5, 1], "w": 1, "x": 1.5, "y": 0.375 },
+                { "label": "L02", "matrix": [5, 2], "w": 1, "x": 2.5, "y": 0.125 },
+                { "label": "L03", "matrix": [5, 3], "w": 1, "x": 3.5, "y": 0 },
+                { "label": "L04", "matrix": [5, 4], "w": 1, "x": 4.5, "y": 0.125 },
+                { "label": "L05", "matrix": [5, 5], "w": 1, "x": 5.5, "y": 0.25 },
+                { "label": "L06", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 0.25 },
+
+                { "label": "R06", "matrix": [11, 6], "w": 1, "x": 9.5, "y": 0.25 },
+                { "label": "R05", "matrix": [11, 5], "w": 1, "x": 10.5, "y": 0.25 },
+                { "label": "R04", "matrix": [11, 4], "w": 1, "x": 11.5, "y": 0.125 },
+                { "label": "R03", "matrix": [11, 3], "w": 1, "x": 12.5, "y": 0 },
+                { "label": "R02", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 0.125 },
+                { "label": "R01", "matrix": [11, 1], "w": 1, "x": 14.5, "y": 0.375 },
+                { "label": "R00", "matrix": [11, 0], "w": 1.5, "x": 15.5, "y": 0.375 },
+
+                { "label": "L10", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 1.375 },
+                { "label": "L11", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 1.375 },
+                { "label": "L12", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 1.125 },
+                { "label": "L13", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "L14", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 1.125 },
+                { "label": "L15", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 1.25 },
+                { "label": "L16", "matrix": [4, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
+
+                { "label": "R16", "matrix": [10, 6], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
+                { "label": "R15", "matrix": [10, 5], "w": 1, "x": 10.5, "y": 1.25 },
+                { "label": "R14", "matrix": [10, 4], "w": 1, "x": 11.5, "y": 1.125 },
+                { "label": "R13", "matrix": [10, 3], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "R12", "matrix": [10, 2], "w": 1, "x": 13.5, "y": 1.125 },
+                { "label": "R11", "matrix": [10, 1], "w": 1, "x": 14.5, "y": 1.375 },
+                { "label": "R10", "matrix": [10, 0], "w": 1.5, "x": 15.5, "y": 1.375 },
+
+                { "label": "L20", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 2.375 },
+                { "label": "L21", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 2.375 },
+                { "label": "L22", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 2.125 },
+                { "label": "L23", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 2 },
+                { "label": "L24", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 2.125 },
+                { "label": "L25", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 2.25 },
+
+                { "label": "R25", "matrix": [9, 5], "w": 1, "x": 10.5, "y": 2.25 },
+                { "label": "R24", "matrix": [9, 4], "w": 1, "x": 11.5, "y": 2.125 },
+                { "label": "R23", "matrix": [9, 3], "w": 1, "x": 12.5, "y": 2 },
+                { "label": "R22", "matrix": [9, 2], "w": 1, "x": 13.5, "y": 2.125 },
+                { "label": "R21", "matrix": [9, 1], "w": 1, "x": 14.5, "y": 2.375 },
+                { "label": "R20", "matrix": [9, 0], "w": 1.5, "x": 15.5, "y": 2.375 },
+
+                { "label": "L30", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.375 },
+                { "label": "L31", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 3.375 },
+                { "label": "L32", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 3.125 },
+                { "label": "L33", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 3 },
+                { "label": "L34", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 3.125 },
+                { "label": "L35", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 3.25 },
+                { "label": "L36", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
+
+                { "label": "R36", "matrix": [8, 6], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
+                { "label": "R35", "matrix": [8, 5], "w": 1, "x": 10.5, "y": 3.25 },
+                { "label": "R34", "matrix": [8, 4], "w": 1, "x": 11.5, "y": 3.125 },
+                { "label": "R33", "matrix": [8, 3], "w": 1, "x": 12.5, "y": 3 },
+                { "label": "R32", "matrix": [8, 2], "w": 1, "x": 13.5, "y": 3.125 },
+                { "label": "R31", "matrix": [8, 1], "w": 1, "x": 14.5, "y": 3.375 },
+                { "label": "R30", "matrix": [8, 0], "w": 1.5, "x": 15.5, "y": 3.375 },
+
+                { "label": "L40", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 4.375 },
+                { "label": "L41", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 4.375 },
+                { "label": "L42", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 4.125 },
+                { "label": "L43", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 4 },
+                { "label": "L44", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 4.125 },
+
+                { "label": "R44", "matrix": [7, 4], "w": 1, "x": 11.5, "y": 4.125 },
+                { "label": "R43", "matrix": [7, 3], "w": 1, "x": 12.5, "y": 4 },
+                { "label": "R42", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 4.125 },
+                { "label": "R41", "matrix": [7, 1], "w": 1, "x": 14.5, "y": 4.375 },
+                { "label": "R40", "matrix": [7, 0], "w": 1, "x": 15.5, "y": 4.375 },
+
+                { "label": "L55", "matrix": [0, 5], "w": 1, "x": 6, "y": 5 },
+                { "label": "L56", "matrix": [0, 6], "w": 1, "x": 7, "y": 5 },
+
+                { "label": "R56", "matrix": [6, 6], "w": 1, "x": 9, "y": 5 },
+                { "label": "R55", "matrix": [6, 5], "w": 1, "x": 10, "y": 5 },
+
+                { "label": "L54", "matrix": [0, 4], "w": 1, "x": 7, "y": 6 },
+
+                { "label": "R54", "matrix": [6, 4], "w": 1, "x": 9, "y": 6 },
+
+                { "label": "L53", "matrix": [0, 3], "w": 1, "x": 5, "y": 6,"h": 2 },
+                { "label": "L52", "matrix": [0, 2], "w": 1, "x": 6, "y": 6,"h": 2 },
+                { "label": "L51", "matrix": [0, 1], "w": 1, "x": 7, "y": 7 },
+
+                { "label": "R51", "matrix": [6, 1], "w": 1, "x": 9, "y": 7 },
+                { "label": "R52", "matrix": [6, 2], "w": 1, "x": 11, "y": 6, "h": 2 },
+                { "label": "R53", "matrix": [6, 3], "w": 1, "x": 10, "y": 6, "h": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/hotdox76v2/keymaps/default/keymap.c b/keyboards/hotdox76v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f6978ac10b
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2021 JasonRen(biu)
+// Copyright 2022 Drashna Jael're (@Drashna Jael're)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌──────┬───┬───┬───┬───┬───┬───┐                     ┌───┬───┬───┬───┬───┬───┬──────┐
+     * │ `    │ 1 │ 2 │ 3 │ 4 │ 5 │ = │                     │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │    - │
+     * ├──────┼───┼───┼───┼───┼───┼───┤                     ├───┼───┼───┼───┼───┼───┼──────┤
+     * │ Tab  │ Q │ W │ E │ R │ T │ = │                     │ Y │ Y │ U │ I │ O │ P │    \ │
+     * ├──────┼───┼───┼───┼───┼───┤   │                     │   ├───┼───┼───┼───┼───┼──────┤
+     * │Escape│ A │ S │ D │ F │ G ├───┤                     ├───┤ H │ J │ K │ L │ ; │    ' │
+     * ├──────┼───┼───┼───┼───┼───┤   │                     │   ├───┼───┼───┼───┼───┼──────┤
+     * │Shift │ Z │ X │ C │ V │ B │ B │                     │ N │ N │ M │ , │ . │ / │ Shift│
+     * └──┬───┼───┼───┼───┼───┼───┴───┘ ┌───┬───┐ ┌───┬───┐ └───┴───┼───┼───┼───┼───┼───┬──┘
+     *    │Ctl│F4 │F5 │GUI│Alt│         │ C │ V │ │Alt│ A │         │ ← │ ↓ │ ↑ │ → │GUI│
+     *    └───┴───┴───┴───┴───┘     ┌───┼───┼───┤ ├───┼───┼───┐     └───┴───┴───┴───┴───┘
+     *                              │   │   │PgU│ │PgD│   │   │
+     *                              │Bsp│Bsp├───┤ ├───┤Ent│   │
+     *                              │   │   │Del│ │Ctl│   │   │
+     *                              └───┴───┴───┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_ergodox_pretty(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,             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_EQL,             KC_Y,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,               KC_N,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_F4,   KC_F5,   KC_LGUI, KC_LALT,                                                KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RGUI,
+                                                     KC_C,    KC_V,               KC_RALT, KC_A,
+                                                              KC_PGUP,            KC_PGDN,
+                                            KC_BSPC, KC_BSPC, KC_DEL,             KC_RCTL, KC_ENT, KC_SPC
+    )
+};
diff --git a/keyboards/hotdox76v2/keymaps/via/keymap.c b/keyboards/hotdox76v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..764c1599e7
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/via/keymap.c
@@ -0,0 +1,179 @@
+// Copyright 2021 JasonRen(biu)
+// Copyright 2022 Drashna Jael're (@Drashna Jael're)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum Layer_name {
+    HOME,
+    CODE,
+    OFFICE,
+    OTHER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
+ * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
+ *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+	LAYOUT_ergodox(
+        // left hand
+        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
+        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(1),
+        KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
+        LT(1,KC_GRV),   KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
+                                              ALT_T(KC_APP),  KC_LGUI,
+                                                              KC_HOME,
+                                               KC_SPC,KC_BSPC,KC_END,
+        // right hand
+        KC_RGHT,     KC_6,   KC_7,  KC_8,   KC_9,   KC_0,             KC_MINS,
+        TG(1),       KC_Y,   KC_U,  KC_I,   KC_O,   KC_P,             KC_BSLS,
+                     KC_H,   KC_J,  KC_K,   KC_L,   LT(2, KC_SCLN),   GUI_T(KC_QUOT),
+        MEH_T(KC_NO),KC_N,   KC_M,  KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
+                             KC_UP, KC_DOWN,KC_LBRC,KC_RBRC,          TT(1),
+        KC_LALT,        CTL_T(KC_ESC),
+        KC_PGUP,
+        KC_PGDN,KC_TAB, KC_ENT
+    ),
+/* Keymap 1: Symbol Layer
+ *
+ * ,---------------------------------------------------.           ,--------------------------------------------------.
+ * |         |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
+ * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
+ * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
+ * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
+ * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |       |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   `-----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |Animat|      |       |Toggle|      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
+ *                                 |ness- |ness+ |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+	LAYOUT_ergodox(
+       // left hand
+       KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_TRNS,
+       KC_TRNS,  KC_EXLM,  KC_AT,    KC_LCBR,  KC_RCBR,   KC_PIPE,  KC_TRNS,
+       KC_TRNS,  KC_HASH,  KC_DLR,   KC_LPRN,  KC_RPRN,   KC_GRV,
+       KC_TRNS,  KC_PERC,  KC_CIRC,  KC_LBRC,  KC_RBRC,   KC_TILD,  KC_TRNS,
+       TOG_OLED, 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, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, RGB_HUD, RGB_HUI
+    ),
+/* Keymap 2: Media and mouse keys
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |  Play  |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |Brwser|
+ *                                 |      |      |------|       |------|      |Back  |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+	LAYOUT_ergodox(
+       // left hand
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+                                           KC_TRNS, KC_TRNS,
+                                                    KC_TRNS,
+                                  KC_TRNS, KC_TRNS, KC_TRNS,
+    // right hand
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
+                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_WBAK
+    ),
+/* Keymap 3: Empty
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      |      |      |                                       |      |      |      |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+	LAYOUT_ergodox(
+       // left hand
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                           KC_TRNS, KC_TRNS,
+                                                    KC_TRNS,
+                                  KC_TRNS, KC_TRNS, KC_TRNS,
+    // right hand
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/hotdox76v2/keymaps/via/rules.mk b/keyboards/hotdox76v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..30c991c6ee
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
diff --git a/keyboards/hotdox76v2/oled_font_lib/ext_font.h b/keyboards/hotdox76v2/oled_font_lib/ext_font.h
new file mode 100644
index 0000000000..3d0f524025
--- /dev/null
+++ b/keyboards/hotdox76v2/oled_font_lib/ext_font.h
@@ -0,0 +1,122 @@
+// Copyright 2021 JasonRen(biu)
+// Copyright 2022 Drashna Jael're (@Drashna Jael're)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "progmem.h"
+
+/*
+ !(0) "(1) #(2) $(3) %(4) &(5) '(6) ((7)
+ )(8) *(9) +(10) ,(11) -(12) .(13) /(14) 0(15)
+ 1(16) 2(17) 3(18) 4(19) 5(20) 6(21) 7(22) 8(23)
+ 9(24) :(25) ;(26) <(27) =(28) >(29) ?(30) @(31)
+ A(32) B(33) C(34) D(35) E(36) F(37) G(38) H(39)
+ I(40) J(41) K(42) L(43) M(44) N(45) O(46) P(47)
+ Q(48) R(49) S(50) T(51) U(52) V(53) W(54) X(55)
+ Y(56) Z(57) [(58) \(59) ](60) ^(61) _(62) `(63)
+ a(64) b(65) c(66) d(67) e(68) f(69) g(70) h(71)
+ i(72) j(73) k(74) l(75) m(76) n(77) o(78) p(79)
+ q(80) r(81) s(82) t(83) u(84) v(85) w(86) x(87)
+ y(88) z(89) {(90) |(91) }(92) ~(93)  (94)
+ */
+
+static const unsigned char ext_big_font[95][24] PROGMEM = {
+{0x00,0x00,0x00,0x00,0xFC,0xFC,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1B,0x1B,0x1B,0x1B,0x00,0x00,0x00,0x00},/*"!",0*/
+{0x00,0x00,0x00,0x18,0xF8,0x18,0x00,0x18,0xF8,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*""",1*/
+{0x00,0x00,0x60,0x60,0xFE,0xFE,0x60,0xFE,0xFE,0x60,0x00,0x00,0x00,0x00,0x06,0x7F,0x7F,0x06,0x7F,0x7F,0x06,0x06,0x00,0x00},/*"#",2*/
+{0x00,0x00,0x00,0xF0,0xF8,0x9E,0x9E,0xB8,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0xF9,0xF9,0x1F,0x0F,0x00,0x00,0x00},/*"$",3*/
+{0x00,0x00,0x38,0x44,0xC4,0xC4,0xB8,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00,0x00},/*"%",4*/
+{0x00,0x00,0x60,0xE0,0xB0,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00,0x0E,0x0F,0x19,0x19,0x1B,0x1E,0x0E,0x0F,0x1B,0x00,0x00},/*"&",5*/
+{0x00,0x00,0x00,0x00,0x00,0x18,0xF8,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",6*/
+{0x00,0x00,0x00,0x00,0x00,0xC0,0xF0,0x3C,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x1F,0x78,0x60,0x00,0x00,0x00},/*"(",7*/
+{0x00,0x00,0x0C,0x3C,0xF0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x78,0x1F,0x07,0x00,0x00,0x00,0x00,0x00,0x00},/*")",8*/
+{0x00,0x00,0x30,0xB0,0xF0,0xFC,0xFC,0xF0,0xB0,0x30,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x01,0x01,0x00,0x00,0x00},/*"*",9*/
+{0x00,0x80,0x80,0x80,0x80,0xF8,0xF8,0x80,0x80,0x80,0x80,0x00,0x00,0x01,0x01,0x01,0x01,0x1F,0x1F,0x01,0x01,0x01,0x01,0x00},/*"+",10*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x38,0x08,0x00,0x00,0x00,0x00,0x00},/*",",11*/
+{0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00},/*"-",12*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x00,0x00,0x00,0x00},/*".",13*/
+{0x00,0x00,0x00,0x00,0x00,0x80,0xE0,0x78,0x1E,0x06,0x00,0x00,0x00,0x00,0x60,0x78,0x1E,0x07,0x01,0x00,0x00,0x00,0x00,0x00},/*"/",14*/
+{0x00,0x00,0xF0,0xF8,0x1C,0x0C,0x1C,0xF8,0xF0,0x00,0x00,0x00,0x00,0x00,0x07,0x0F,0x1C,0x18,0x1C,0x0F,0x07,0x00,0x00,0x00},/*"0",15*/
+{0x00,0x00,0x18,0x18,0x18,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x00,0x00},/*"1",16*/
+{0x00,0x00,0x30,0x38,0x0C,0x0C,0x8C,0xF8,0x70,0x00,0x00,0x00,0x00,0x00,0x18,0x1C,0x1E,0x1B,0x19,0x18,0x18,0x00,0x00,0x00},/*"2",17*/
+{0x00,0x00,0x18,0x1C,0xCC,0xCC,0xCC,0xFC,0x38,0x00,0x00,0x00,0x00,0x0C,0x1C,0x18,0x18,0x18,0x19,0x0F,0x07,0x00,0x00,0x00},/*"3",18*/
+{0x00,0x00,0xC0,0xE0,0x78,0x1C,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x03,0x1B,0x1B,0x1F,0x1F,0x1B,0x00,0x00,0x00},/*"4",19*/
+{0x00,0x00,0xFC,0xFC,0xCC,0xCC,0xCC,0x8C,0x00,0x00,0x00,0x00,0x00,0x0C,0x1C,0x18,0x18,0x18,0x18,0x0F,0x07,0x00,0x00,0x00},/*"5",20*/
+{0x00,0x00,0xE0,0xF0,0xB8,0xDC,0xCC,0xCC,0x8C,0x00,0x00,0x00,0x00,0x00,0x07,0x0F,0x19,0x18,0x18,0x1F,0x0F,0x00,0x00,0x00},/*"6",21*/
+{0x00,0x00,0x1C,0x1C,0x0C,0x0C,0xCC,0xFC,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1F,0x03,0x00,0x00,0x00,0x00},/*"7",22*/
+{0x00,0x00,0x38,0xFC,0xCC,0xCC,0xCC,0xFC,0x38,0x00,0x00,0x00,0x00,0x00,0x0F,0x1F,0x18,0x18,0x18,0x1F,0x0F,0x00,0x00,0x00},/*"8",23*/
+{0x00,0x00,0xF8,0xFC,0x8C,0x8C,0xCC,0xF8,0xF0,0x00,0x00,0x00,0x00,0x00,0x18,0x19,0x19,0x1D,0x0E,0x07,0x03,0x00,0x00,0x00},/*"9",24*/
+{0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x00,0x00,0x00,0x00},/*":",25*/
+{0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x18,0x08,0x00,0x00,0x00,0x00,0x00},/*";",26*/
+{0x00,0x00,0x00,0x80,0x80,0xC0,0x60,0x60,0x30,0x30,0x00,0x00,0x00,0x01,0x01,0x03,0x03,0x06,0x0C,0x0C,0x18,0x18,0x00,0x00},/*"<",27*/
+{0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x00,0x00},/*"=",28*/
+{0x00,0x30,0x30,0x60,0x60,0xC0,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x0C,0x0C,0x06,0x03,0x03,0x01,0x01,0x00,0x00},/*">",29*/
+{0x00,0x00,0x70,0x78,0x18,0x18,0x98,0xF8,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1B,0x1B,0x01,0x01,0x00,0x00,0x00,0x00},/*"?",30*/
+{0x00,0x00,0xF0,0x08,0xC4,0x24,0x24,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x10,0x21,0x22,0x22,0x13,0x00,0x00,0x00,0x00},/*"@",31*/
+{0x00,0x00,0x18,0x98,0xF8,0x38,0x38,0xF0,0x80,0x00,0x00,0x00,0x00,0x18,0x1C,0x1F,0x1B,0x03,0x03,0x1B,0x1F,0x1C,0x18,0x00},/*"A",32*/
+{0x00,0x18,0xF8,0xF8,0x98,0x98,0x98,0xF8,0x70,0x00,0x00,0x00,0x00,0x18,0x1F,0x1F,0x19,0x19,0x19,0x19,0x1F,0x0E,0x00,0x00},/*"B",33*/
+{0x00,0xE0,0xF0,0x38,0x18,0x18,0x18,0x10,0x78,0x78,0x00,0x00,0x00,0x07,0x0F,0x0C,0x18,0x18,0x18,0x18,0x0C,0x0C,0x00,0x00},/*"C",34*/
+{0x00,0x18,0xF8,0xF8,0x18,0x18,0x18,0x38,0xF0,0xE0,0x00,0x00,0x00,0x18,0x1F,0x1F,0x18,0x18,0x18,0x1C,0x0F,0x07,0x00,0x00},/*"D",35*/
+{0x00,0x18,0xF8,0xF8,0x98,0xD8,0xD8,0x18,0x78,0x78,0x00,0x00,0x00,0x18,0x1F,0x1F,0x19,0x1B,0x1B,0x18,0x1E,0x1E,0x00,0x00},/*"E",36*/
+{0x00,0x18,0xF8,0xF8,0x98,0xD8,0xD8,0x18,0x78,0x78,0x00,0x00,0x00,0x18,0x1F,0x1F,0x19,0x1B,0x1B,0x00,0x00,0x00,0x00,0x00},/*"F",37*/
+{0x00,0xE0,0xF0,0x38,0x18,0x18,0x10,0x38,0x38,0x00,0x00,0x00,0x00,0x07,0x0F,0x1C,0x18,0x1B,0x1B,0x1F,0x0F,0x03,0x00,0x00},/*"G",38*/
+{0x00,0x18,0xF8,0xF8,0x98,0x80,0x98,0xF8,0xF8,0x18,0x00,0x00,0x00,0x18,0x1F,0x1F,0x19,0x01,0x19,0x1F,0x1F,0x18,0x00,0x00},/*"H",39*/
+{0x00,0x00,0x18,0x18,0x18,0xF8,0xF8,0x18,0x18,0x18,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x00,0x00},/*"I",40*/
+{0x00,0x00,0x00,0x00,0x18,0x18,0x18,0xF8,0xF8,0x18,0x18,0x00,0x00,0x00,0x0F,0x0F,0x18,0x18,0x18,0x0F,0x0F,0x00,0x00,0x00},/*"J",41*/
+{0x00,0x18,0xF8,0xF8,0x98,0xC0,0x78,0x38,0x18,0x18,0x00,0x00,0x00,0x18,0x1F,0x1F,0x19,0x01,0x07,0x1E,0x18,0x18,0x00,0x00},/*"K",42*/
+{0x00,0x18,0x18,0xF8,0xF8,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x1F,0x1F,0x00,0x00},/*"L",43*/
+{0x18,0xF8,0xF8,0x38,0xE0,0x00,0xE0,0x38,0xF8,0xF8,0x18,0x00,0x18,0x1F,0x1F,0x18,0x19,0x03,0x19,0x18,0x1F,0x1F,0x18,0x00},/*"M",44*/
+{0x00,0x18,0xF8,0xF8,0xF8,0xE0,0x18,0xF8,0xF8,0x18,0x00,0x00,0x00,0x18,0x1F,0x1F,0x18,0x03,0x1F,0x1F,0x1F,0x00,0x00,0x00},/*"N",45*/
+{0x00,0xC0,0xF0,0x30,0x18,0x18,0x18,0x30,0xF0,0xC0,0x00,0x00,0x00,0x03,0x0F,0x0C,0x18,0x18,0x18,0x0C,0x0F,0x03,0x00,0x00},/*"O",46*/
+{0x00,0x18,0xF8,0xF8,0x98,0x98,0x98,0xF8,0xF0,0x00,0x00,0x00,0x00,0x18,0x1F,0x1F,0x19,0x19,0x19,0x01,0x00,0x00,0x00,0x00},/*"P",47*/
+{0x00,0xC0,0xF0,0x30,0x18,0x18,0x18,0x30,0xF0,0xC0,0x00,0x00,0x00,0x03,0x0F,0xCC,0xF8,0x78,0x78,0xCC,0xEF,0x63,0x00,0x00},/*"Q",48*/
+{0x00,0x18,0xF8,0xF8,0x98,0x98,0x98,0xF8,0x70,0x00,0x00,0x00,0x00,0x18,0x1F,0x1F,0x19,0x1B,0x07,0x0E,0x1C,0x18,0x00,0x00},/*"R",49*/
+{0x00,0x00,0x70,0xF8,0x98,0x98,0x90,0x38,0x38,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x09,0x19,0x19,0x1F,0x0E,0x00,0x00,0x00},/*"S",50*/
+{0x00,0xF8,0xF8,0x18,0x18,0xF8,0xF8,0x18,0x18,0xF8,0xF8,0x00,0x00,0x00,0x00,0x18,0x18,0x1F,0x1F,0x18,0x18,0x00,0x00,0x00},/*"T",51*/
+{0x00,0x18,0xF8,0xF8,0x18,0x00,0x18,0xF8,0xF8,0x18,0x00,0x00,0x00,0x00,0x07,0x0F,0x18,0x18,0x18,0x0F,0x07,0x00,0x00,0x00},/*"U",52*/
+{0x00,0x18,0x78,0xF8,0x98,0x00,0x98,0xF8,0x78,0x18,0x00,0x00,0x00,0x00,0x00,0x03,0x1F,0x18,0x1F,0x03,0x00,0x00,0x00,0x00},/*"V",53*/
+{0x18,0xF8,0xF8,0x18,0xD8,0xC0,0xD8,0x18,0xF8,0xF8,0x18,0x00,0x00,0x01,0x1F,0x1C,0x1F,0x01,0x1F,0x1C,0x1F,0x01,0x00,0x00},/*"W",54*/
+{0x00,0x18,0x38,0x78,0xD8,0x80,0xD8,0x78,0x38,0x18,0x00,0x00,0x00,0x18,0x1C,0x1E,0x1B,0x01,0x1B,0x1E,0x1C,0x18,0x00,0x00},/*"X",55*/
+{0x00,0x18,0x38,0x78,0xD8,0x80,0x80,0xD8,0x78,0x38,0x18,0x00,0x00,0x00,0x00,0x18,0x18,0x1F,0x1F,0x18,0x18,0x00,0x00,0x00},/*"Y",56*/
+{0x00,0x00,0x78,0x78,0x18,0x98,0xD8,0x78,0x38,0x00,0x00,0x00,0x00,0x00,0x1C,0x1E,0x1B,0x19,0x18,0x1E,0x1E,0x00,0x00,0x00},/*"Z",57*/
+{0x00,0x00,0x00,0x00,0x00,0xFC,0xFC,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x7F,0x60,0x60,0x00,0x00,0x00},/*"[",58*/
+{0x00,0x00,0x06,0x1E,0x78,0xE0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x07,0x1E,0x78,0x60,0x00,0x00},/*"\",59*/
+{0x00,0x00,0x00,0x0C,0x0C,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x7F,0x7F,0x00,0x00,0x00,0x00,0x00},/*"]",60*/
+{0x00,0x00,0x00,0x60,0x70,0x18,0x0C,0x18,0x70,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"^",61*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"_",62*/
+{0x00,0x00,0x00,0x00,0x02,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",63*/
+{0x00,0x00,0x00,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x00,0x00,0x0E,0x1F,0x1B,0x1B,0x0B,0x1F,0x1F,0x18,0x00,0x00},/*"a",64*/
+{0x00,0x0C,0xFC,0xFC,0xC0,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x18,0x1F,0x1F,0x0C,0x18,0x18,0x1C,0x0F,0x07,0x00,0x00},/*"b",65*/
+{0x00,0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0xC0,0xE0,0x00,0x00,0x00,0x00,0x07,0x0F,0x1C,0x18,0x18,0x18,0x18,0x0C,0x00,0x00},/*"c",66*/
+{0x00,0x00,0x80,0xC0,0xE0,0x60,0x60,0xCC,0xFC,0xFC,0x00,0x00,0x00,0x00,0x07,0x0F,0x1C,0x18,0x18,0x0C,0x1F,0x1F,0x18,0x00},/*"d",67*/
+{0x00,0x00,0x80,0xC0,0x60,0x60,0x60,0x60,0xC0,0x80,0x00,0x00,0x00,0x00,0x07,0x0F,0x1B,0x1B,0x1B,0x1B,0x1B,0x0B,0x00,0x00},/*"e",68*/
+{0x00,0x00,0x60,0x60,0xF8,0xFC,0x6C,0x6C,0x6C,0x6C,0x00,0x00,0x00,0x00,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x00,0x00,0x00},/*"f",69*/
+{0x00,0x00,0x80,0xC0,0xE0,0x60,0x60,0xC0,0xE0,0xE0,0x60,0x00,0x00,0x00,0x07,0x0F,0xDC,0xD8,0xD8,0xCC,0xFF,0x7F,0x00,0x00},/*"g",70*/
+{0x00,0x0C,0xFC,0xFC,0xC0,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x18,0x1F,0x1F,0x18,0x00,0x00,0x18,0x1F,0x1F,0x18,0x00},/*"h",71*/
+{0x00,0x00,0x00,0x60,0x60,0xEC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x00,0x00},/*"i",72*/
+{0x00,0x00,0x60,0x60,0x60,0x6C,0x6C,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0x7F,0x00,0x00,0x00},/*"j",73*/
+{0x00,0x00,0x0C,0xFC,0xFC,0x80,0xE0,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x18,0x1F,0x1F,0x03,0x06,0x1C,0x18,0x18,0x00,0x00},/*"k",74*/
+{0x00,0x00,0x00,0x0C,0x0C,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x00,0x00},/*"l",75*/
+{0x00,0x60,0xE0,0xE0,0x60,0xE0,0xC0,0x60,0xE0,0xC0,0x00,0x00,0x00,0x18,0x1F,0x1F,0x00,0x1F,0x1F,0x00,0x1F,0x1F,0x18,0x00},/*"m",76*/
+{0x00,0x60,0xE0,0xE0,0xC0,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x18,0x1F,0x1F,0x18,0x00,0x00,0x18,0x1F,0x1F,0x18,0x00},/*"n",77*/
+{0x00,0x00,0x80,0xC0,0xE0,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x07,0x0F,0x1C,0x18,0x18,0x1C,0x0F,0x07,0x00,0x00},/*"o",78*/
+{0x00,0x60,0xE0,0xE0,0xC0,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0xC0,0xFF,0xFF,0xCC,0xD8,0x18,0x1C,0x0F,0x07,0x00,0x00},/*"p",79*/
+{0x00,0x00,0x80,0xC0,0xE0,0x60,0x60,0xC0,0xE0,0xE0,0x60,0x00,0x00,0x00,0x07,0x0F,0x1C,0x18,0xD8,0xCC,0xFF,0xFF,0xC0,0x00},/*"q",80*/
+{0x00,0x00,0x60,0x60,0xE0,0xE0,0xC0,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x00,0x00,0x00},/*"r",81*/
+{0x00,0x00,0xC0,0xE0,0x60,0x60,0x60,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x1D,0x1D,0x1B,0x1B,0x1B,0x1E,0x0E,0x00,0x00,0x00},/*"s",82*/
+{0x00,0x00,0x60,0x60,0xFC,0xFC,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x1F,0x18,0x18,0x18,0x0C,0x00,0x00},/*"t",83*/
+{0x00,0x60,0xE0,0xE0,0x00,0x00,0x00,0x60,0xE0,0xE0,0x00,0x00,0x00,0x00,0x0F,0x1F,0x18,0x18,0x18,0x0C,0x1F,0x1F,0x18,0x00},/*"u",84*/
+{0x00,0x60,0xE0,0xE0,0x60,0x00,0x60,0xE0,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x07,0x1F,0x18,0x1F,0x07,0x00,0x00,0x00,0x00},/*"v",85*/
+{0x60,0xE0,0xE0,0x60,0x00,0x80,0x00,0x60,0xE0,0xE0,0x60,0x00,0x00,0x01,0x1F,0x1E,0x07,0x03,0x07,0x1E,0x1F,0x01,0x00,0x00},/*"w",86*/
+{0x00,0x00,0x60,0xE0,0xE0,0x00,0x00,0xE0,0xE0,0x60,0x00,0x00,0x00,0x00,0x18,0x1C,0x1F,0x03,0x03,0x1F,0x1C,0x18,0x00,0x00},/*"x",87*/
+{0x00,0x60,0xE0,0xE0,0x60,0x00,0x00,0x60,0xE0,0xE0,0x60,0x00,0x00,0xC0,0xC0,0xC1,0xE7,0xFE,0xDC,0xC7,0x03,0x00,0x00,0x00},/*"y",88*/
+{0x00,0x00,0xE0,0xE0,0x60,0x60,0x60,0xE0,0xE0,0x60,0x00,0x00,0x00,0x00,0x18,0x1C,0x1E,0x1B,0x1B,0x19,0x1C,0x1C,0x00,0x00},/*"z",89*/
+{0x00,0x00,0x00,0x00,0x00,0xF8,0xFC,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3F,0x7E,0x60,0x00,0x00,0x00,0x00},/*"{",90*/
+{0x00,0x00,0x00,0x00,0x00,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x7F,0x00,0x00,0x00,0x00,0x00},/*"|",91*/
+{0x00,0x00,0x00,0x00,0x0C,0xFC,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x7E,0x3F,0x01,0x00,0x00,0x00,0x00},/*"}",92*/
+{0x00,0x00,0x80,0xC0,0xC0,0xC0,0x80,0x00,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x01,0x03,0x03,0x03,0x01,0x00,0x00},/*"~",93*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",94*/
+};
+
+static const unsigned char blank_block PROGMEM = 0x00;
diff --git a/keyboards/hotdox76v2/oled_font_lib/logo2.h b/keyboards/hotdox76v2/oled_font_lib/logo2.h
new file mode 100644
index 0000000000..8a4a0e4622
--- /dev/null
+++ b/keyboards/hotdox76v2/oled_font_lib/logo2.h
@@ -0,0 +1,14 @@
+// Copyright 2021 JasonRen(biu)
+// Copyright 2022 Drashna Jael're (@Drashna Jael're)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "progmem.h"
+
+static const unsigned char logo_mouse[] PROGMEM = {
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xAA,0xAA,0xA8,0xA8,0xAA,0xAA,0xA8,0xA0,0xA0,0x00,0x00,0x00,\
+    0x00,0x00,0x00,0x00,0x80,0xA0,0xA8,0xA8,0xA8,0xA8,0xA8,0xA8,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA8,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0x80,0x00,0x00,0x00,0x00,\
+    0x00,0x00,0x00,0x2A,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0x0A,0x02,0x00,0x00,0x00,0x00,\
+    0x00,0x00,0x00,0x00,0x00,0x02,0x2A,0x2A,0x2A,0x2A,0x0A,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x0A,0x2A,0x2A,0x2A,0x2A,0x02,0x00,0x00,0x00,0x00,0x00,0x00
+};
diff --git a/keyboards/hotdox76v2/readme.md b/keyboards/hotdox76v2/readme.md
new file mode 100644
index 0000000000..ef6b1c4ec1
--- /dev/null
+++ b/keyboards/hotdox76v2/readme.md
@@ -0,0 +1,25 @@
+# hotdox76
+
+*An Ergodox style keyboard with per key RGB.*
+
+* Keyboard Maintainer: [Drashna Jael're](https://github.com/Drashna Jael're)
+* Hardware Supported: Hotdox 76v2
+* Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hotdox76v2:default
+
+Flashing example for this keyboard:
+
+    make hotdox76v2:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/hotdox76v2/rules.mk b/keyboards/hotdox76v2/rules.mk
new file mode 100644
index 0000000000..32afd21635
--- /dev/null
+++ b/keyboards/hotdox76v2/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_DRIVER = WS2812

From db2aa039f197f958fbf0e95c0d7256a5a41c7163 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Nov 2022 04:42:19 +1100
Subject: [PATCH 782/959] Remove more `UNUSED_PINS` defines (#18940)

---
 keyboards/adpenrose/shisaku/config.h          |  1 -
 keyboards/cannonkeys/nearfield/config.h       |  1 -
 keyboards/dumbpad/v1x_oled/config.h           |  1 -
 keyboards/ferris/0_1/config.h                 |  4 ----
 keyboards/ferris/0_2/config.h                 |  4 ----
 keyboards/fjlabs/avalon/config.h              |  1 -
 keyboards/fjlabs/peaker/config.h              |  1 -
 keyboards/fjlabs/sinanjuwk/config.h           |  1 -
 keyboards/ingrained/config.h                  |  4 ----
 .../jkeys_design/gentleman65_se_s/config.h    |  1 -
 keyboards/kegen/gboy/config.h                 |  1 -
 keyboards/keygem/kg60ansi/config.h            |  1 -
 keyboards/keygem/kg65rgbv2/config.h           |  1 -
 keyboards/keyten/aperture/config.h            |  1 -
 keyboards/kopibeng/mnk65/config.h             |  1 -
 keyboards/linworks/fave104/config.h           |  1 -
 keyboards/mechlovin/foundation/config.h       |  1 -
 keyboards/mechwild/puckbuddy/config.h         |  1 -
 keyboards/mokey/ibis80/config.h               |  1 -
 .../trackball_thumb/rev1_001/config.h         | 24 -------------------
 .../trackball_thumb/trackball_thumb.c         | 13 ----------
 keyboards/plywrks/lune/config.h               |  1 -
 keyboards/xelus/valor_frl_tkl/rev2_0/config.h |  1 -
 keyboards/xelus/valor_frl_tkl/rev2_1/config.h |  1 -
 24 files changed, 68 deletions(-)
 delete mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/config.h

diff --git a/keyboards/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h
index 7371685ca6..4980749d9f 100644
--- a/keyboards/adpenrose/shisaku/config.h
+++ b/keyboards/adpenrose/shisaku/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { B2, B0, B1, D0, B4, D6, B3, D7 }
 #define MATRIX_COL_PINS { D1, C3, C4, D4, C0, C1, C2 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h
index 7d8f904915..a275a6213c 100755
--- a/keyboards/cannonkeys/nearfield/config.h
+++ b/keyboards/cannonkeys/nearfield/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B4, D2, D4, D6, D7 }
 #define MATRIX_COL_PINS { D3, D5, C6, C7, B6, B5, B7, F0, F1, F4, F5, F6, F7, B3, B2, D1 }
-#define UNUSED_PINS { E2, E6, D0, B1, B0 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
index 2dba0c3b14..4b3695096e 100644
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ b/keyboards/dumbpad/v1x_oled/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { C6, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* Dual rotary encoders */
 #define ENCODERS_PAD_A { B4, E6 }
diff --git a/keyboards/ferris/0_1/config.h b/keyboards/ferris/0_1/config.h
index 79a74ae9bb..8d062d9b5f 100644
--- a/keyboards/ferris/0_1/config.h
+++ b/keyboards/ferris/0_1/config.h
@@ -32,14 +32,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B3, B2, B1, F0 }
 #define MATRIX_COL_PINS_MCU \
     { D6, D7, B4, B5, B6 }
-#define UNUSED_PINS_MCU \
-    { B0, B7, C6, C7, D2, D3, D4, D5, E6, F1, F4, F5, F6, F7 }
 #define MATRIX_ROW_PINS_MCP \
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCP \
     { A0, A1, A2, A3, A4 }
-#define UNUSED_PINS_MCP \
-    { B4, B5, B6, B7, A5, A6, A7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h
index 5de356f3cf..b6816b396e 100644
--- a/keyboards/ferris/0_2/config.h
+++ b/keyboards/ferris/0_2/config.h
@@ -32,14 +32,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B7, B6, B5, A2 }
 #define MATRIX_COL_PINS_MCU \
     { B8, B4, B3, A15, A14 }
-#define UNUSED_PINS_MCU \
-    { A0, A1, A3, A4, A5, A6, A7, A8, A9, A10, A13, B0, B1, B2, B9, B12, B13, B14, B15, C13, C14, C15, F0, F1 }
 #define MATRIX_ROW_PINS_MCP \
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCP \
     { A0, A1, A2, A3, A4 }
-#define UNUSED_PINS_MCP \
-    { B4, B5, B6, B7, A5, A6, A7 }
 
 #define MATRIX_ROW_PINS \
     { B7, B6, B5, A2, A0, A0, A0, A0 }
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index 2d2c53c14e..9975b9a513 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { B0, F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/peaker/config.h b/keyboards/fjlabs/peaker/config.h
index c7d19f0c6c..f9f1886143 100644
--- a/keyboards/fjlabs/peaker/config.h
+++ b/keyboards/fjlabs/peaker/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B5, B6, C0, E1, E0 }
 #define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h
index 01d81a2f3d..751dd24383 100644
--- a/keyboards/fjlabs/sinanjuwk/config.h
+++ b/keyboards/fjlabs/sinanjuwk/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ingrained/config.h b/keyboards/ingrained/config.h
index 7741dde0f7..8fb731efe5 100644
--- a/keyboards/ingrained/config.h
+++ b/keyboards/ingrained/config.h
@@ -21,14 +21,10 @@
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCU \
     { F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS_MCU \
-    { B4, B5, B6, B7, C6, C7, D2, D3, D4, D5, D6, D7, E6}
 #define MATRIX_ROW_PINS_MCP \
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCP \
     { A0, A1, A2, A3, A4, A5 }
-#define UNUSED_PINS_MCP \
-    { B4, B5, B6, B7, A6, A7 }
 
 /*
  * Keyboard Matrix Assignments
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index f5ecb8f5de..1676e2e5ae 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { D5, D3, D2, D1, D0, B7, B2, B3, D4, D6, D7, C7, C6, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
index 77f9ef3b21..30268122ed 100644
--- a/keyboards/kegen/gboy/config.h
+++ b/keyboards/kegen/gboy/config.h
@@ -27,7 +27,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { E2, E6, C6, C7, D7, B6, B5, B4, B3, B2, B1, B0, D4, D6, D5, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
index 6c79d5571c..3be2c3efeb 100644
--- a/keyboards/keygem/kg60ansi/config.h
+++ b/keyboards/keygem/kg60ansi/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
index e62df985c4..941fef6c08 100644
--- a/keyboards/keygem/kg65rgbv2/config.h
+++ b/keyboards/keygem/kg65rgbv2/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyten/aperture/config.h b/keyboards/keyten/aperture/config.h
index 27eecf2602..9234382117 100644
--- a/keyboards/keyten/aperture/config.h
+++ b/keyboards/keyten/aperture/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, F7, F5, F6 }
 #define MATRIX_COL_PINS { B7, F0, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
index bdabb4af7e..cab71e8210 100644
--- a/keyboards/kopibeng/mnk65/config.h
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -35,7 +35,6 @@
 
 #define MATRIX_ROW_PINS { B3, D0, F6, F4, F1 }
 #define MATRIX_COL_PINS { B7, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, F5 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN F0
 
diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h
index 6a13406ead..e631c079f0 100644
--- a/keyboards/linworks/fave104/config.h
+++ b/keyboards/linworks/fave104/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B11, B10, B2,  B1,  B0, A7, A6,  A5,  A4,  A3,  A2, A0 }
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A13, A14, A15, B3     }
-#define UNUSED_PINS
 
 #define LED_NUM_LOCK_PIN B6
 #define LED_CAPS_LOCK_PIN B5
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index 35145c440b..7f98028a05 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3}
-#define UNUSED_PINS
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 656fa2e7d1..473b7b5ecd 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -39,7 +39,6 @@
  */
 #define MATRIX_ROW_PINS { B12, B13, B14, B15 }
 #define MATRIX_COL_PINS { B10, A8, B4, B5 }
-#define UNUSED_PINS
 
 /* spi config */
 #define SPI_DRIVER SPID1
diff --git a/keyboards/mokey/ibis80/config.h b/keyboards/mokey/ibis80/config.h
index e70b8b8084..c6a40383aa 100644
--- a/keyboards/mokey/ibis80/config.h
+++ b/keyboards/mokey/ibis80/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, E6, F0, F1 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/config.h b/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
deleted file mode 100644
index dc80d9401e..0000000000
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// These pins are not broken out, and cannot be used normally.
-// They are set as output and pulled high, by default
-#define UNUSED_PINS \
-    { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
index f76d243f18..123ee57151 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
@@ -188,19 +188,6 @@ void keyboard_pre_init_kb(void) {
     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.
-     */
-#ifdef UNUSED_PINS
-    const pin_t unused_pins[] = UNUSED_PINS;
-
-    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
-        setPinOutput(unused_pins[i]);
-        writePinLow(unused_pins[i]);
-    }
-#endif
-
     // This is the debug LED.
 #if defined(DEBUG_LED_PIN)
     setPinOutput(DEBUG_LED_PIN);
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index 065cc52d93..66aad1dc95 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F1, F0, B7, B0, B6, B5, D7, B4, D6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
index 4f42348b56..53064275b1 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { A15, A14, A10, B3, B4 }
 #define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
index 2ab1350753..fdcbf4ffe3 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { A15, A14, A13, B3, B4 }
 #define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW

From 40122c28e026ab2da6dd784b66fd8de2b6dc1fed Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Nov 2022 05:26:18 +1100
Subject: [PATCH 783/959] Resolve info.json/rules.mk feature conflicts in three
 boards (#18942)

---
 keyboards/0_sixty/info.json               |  9 +++++++++
 keyboards/0_sixty/rules.mk                | 20 --------------------
 keyboards/handwired/reclined/info.json    |  8 +-------
 keyboards/handwired/reclined/rules.mk     | 19 +------------------
 keyboards/makenova/omega/omega4/info.json |  2 --
 keyboards/makenova/omega/omega4/rules.mk  | 19 +------------------
 6 files changed, 12 insertions(+), 65 deletions(-)

diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json
index 7fc718c602..154f7bd442 100644
--- a/keyboards/0_sixty/info.json
+++ b/keyboards/0_sixty/info.json
@@ -6,6 +6,15 @@
         "vid": "0x7654",
         "device_version": "0.0.1"
     },
+    "features": {
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "lto": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
 	"LAYOUT_1x2uC": {
             "layout": [
diff --git a/keyboards/0_sixty/rules.mk b/keyboards/0_sixty/rules.mk
index 18f45534c8..a0d06a89dd 100644
--- a/keyboards/0_sixty/rules.mk
+++ b/keyboards/0_sixty/rules.mk
@@ -1,21 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-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
-
-LTO_ENABLE = yes            # Link-time opt
-
 DEFAULT_FOLDER = 0_sixty/base
diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json
index a5f308fa75..bc928b2b44 100644
--- a/keyboards/handwired/reclined/info.json
+++ b/keyboards/handwired/reclined/info.json
@@ -6,16 +6,10 @@
   "debounce": 5,
   "diode_direction": "ROW2COL",
   "features": {
-    "audio": false,
-    "backlight": false,
-    "bootmagic": false,
     "command": true,
     "console": true,
     "extrakey": true,
-    "mousekey": true,
-    "nkro": false,
-    "sleep_led": false,
-    "unicode": false
+    "mousekey": true
   },
   "matrix_pins": {
     "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"],
diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk
index 64e496d030..6e7633bfe0 100644
--- a/keyboards/handwired/reclined/rules.mk
+++ b/keyboards/handwired/reclined/rules.mk
@@ -1,18 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank
diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json
index 5e9bf22595..437f850963 100644
--- a/keyboards/makenova/omega/omega4/info.json
+++ b/keyboards/makenova/omega/omega4/info.json
@@ -6,8 +6,6 @@
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
diff --git a/keyboards/makenova/omega/omega4/rules.mk b/keyboards/makenova/omega/omega4/rules.mk
index 515ca5621f..6e7633bfe0 100644
--- a/keyboards/makenova/omega/omega4/rules.mk
+++ b/keyboards/makenova/omega/omega4/rules.mk
@@ -1,18 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank

From f11a247127c82bc207f20e0b1be2cf6efea3a129 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 3 Nov 2022 20:44:36 +0000
Subject: [PATCH 784/959] Reduce includes for sequencer header (#18946)

---
 quantum/sequencer/sequencer.c |  2 ++
 quantum/sequencer/sequencer.h | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/quantum/sequencer/sequencer.c b/quantum/sequencer/sequencer.c
index 2e92f7b3eb..ff243c870b 100644
--- a/quantum/sequencer/sequencer.c
+++ b/quantum/sequencer/sequencer.c
@@ -15,6 +15,8 @@
  */
 
 #include "sequencer.h"
+#include "debug.h"
+#include "timer.h"
 
 #ifdef MIDI_ENABLE
 #    include "process_midi.h"
diff --git a/quantum/sequencer/sequencer.h b/quantum/sequencer/sequencer.h
index a8ea16eece..a6498ed413 100644
--- a/quantum/sequencer/sequencer.h
+++ b/quantum/sequencer/sequencer.h
@@ -17,8 +17,7 @@
 #pragma once
 
 #include <stdbool.h>
-#include "debug.h"
-#include "timer.h"
+#include <stdint.h>
 
 // Maximum number of steps: 256
 #ifndef SEQUENCER_STEPS
@@ -42,7 +41,18 @@
  * Make sure that the items of this enumeration follow the powers of 2, separated by a ternary variant.
  * Check the implementation of `get_step_duration` for further explanation.
  */
-typedef enum { SQ_RES_2, SQ_RES_2T, SQ_RES_4, SQ_RES_4T, SQ_RES_8, SQ_RES_8T, SQ_RES_16, SQ_RES_16T, SQ_RES_32, SEQUENCER_RESOLUTIONS } sequencer_resolution_t;
+typedef enum {
+    SQ_RES_2, //
+    SQ_RES_2T,
+    SQ_RES_4,
+    SQ_RES_4T,
+    SQ_RES_8,
+    SQ_RES_8T,
+    SQ_RES_16,
+    SQ_RES_16T,
+    SQ_RES_32,
+    SEQUENCER_RESOLUTIONS
+} sequencer_resolution_t;
 
 typedef struct {
     bool                   enabled;

From 3de296f42014c489682730d9ab554d25ba8953a4 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 3 Nov 2022 21:36:58 +0000
Subject: [PATCH 785/959] Reduce includes for crc header (#18947)

---
 quantum/crc.c | 28 ++++++++++++++++++++++------
 quantum/crc.h |  5 +++--
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/quantum/crc.c b/quantum/crc.c
index 0d8b9d6017..6b406df64a 100644
--- a/quantum/crc.c
+++ b/quantum/crc.c
@@ -16,16 +16,32 @@
 
 #include "crc.h"
 
-__attribute__((weak)) void crc_init(void){
-    /* Software implementation nothing todo here. */
-};
+__attribute__((weak)) void crc_init(void) {
+    // Software implementation nothing todo here.
+}
 
 #if defined(CRC8_USE_TABLE)
 /**
  * Static table used for the table_driven implementation.
  */
-static const crc_t crc_table[256] = {0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, 0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d, 0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65, 0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d, 0xe0, 0xe7, 0xee, 0xe9, 0xfc, 0xfb, 0xf2, 0xf5, 0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd, 0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85, 0xa8, 0xaf, 0xa6, 0xa1, 0xb4, 0xb3, 0xba, 0xbd, 0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2, 0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea, 0xb7, 0xb0, 0xb9, 0xbe, 0xab, 0xac, 0xa5, 0xa2, 0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a, 0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32, 0x1f, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0d, 0x0a, 0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42, 0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a,
-                                     0x89, 0x8e, 0x87, 0x80, 0x95, 0x92, 0x9b, 0x9c, 0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4, 0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec, 0xc1, 0xc6, 0xcf, 0xc8, 0xdd, 0xda, 0xd3, 0xd4, 0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c, 0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44, 0x19, 0x1e, 0x17, 0x10, 0x05, 0x02, 0x0b, 0x0c, 0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34, 0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b, 0x76, 0x71, 0x78, 0x7f, 0x6a, 0x6d, 0x64, 0x63, 0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b, 0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13, 0xae, 0xa9, 0xa0, 0xa7, 0xb2, 0xb5, 0xbc, 0xbb, 0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83, 0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb, 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3};
+static const crc_t crc_table[256] = {
+    0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, 0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d, //
+    0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65, 0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d, //
+    0xe0, 0xe7, 0xee, 0xe9, 0xfc, 0xfb, 0xf2, 0xf5, 0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd, //
+    0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85, 0xa8, 0xaf, 0xa6, 0xa1, 0xb4, 0xb3, 0xba, 0xbd, //
+    0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2, 0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea, //
+    0xb7, 0xb0, 0xb9, 0xbe, 0xab, 0xac, 0xa5, 0xa2, 0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a, //
+    0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32, 0x1f, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0d, 0x0a, //
+    0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42, 0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a, //
+    0x89, 0x8e, 0x87, 0x80, 0x95, 0x92, 0x9b, 0x9c, 0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4, //
+    0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec, 0xc1, 0xc6, 0xcf, 0xc8, 0xdd, 0xda, 0xd3, 0xd4, //
+    0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c, 0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44, //
+    0x19, 0x1e, 0x17, 0x10, 0x05, 0x02, 0x0b, 0x0c, 0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34, //
+    0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b, 0x76, 0x71, 0x78, 0x7f, 0x6a, 0x6d, 0x64, 0x63, //
+    0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b, 0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13, //
+    0xae, 0xa9, 0xa0, 0xa7, 0xb2, 0xb5, 0xbc, 0xbb, 0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83, //
+    0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb, 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3  //
+};
 
 __attribute__((weak)) uint8_t crc8(const void *data, size_t data_len) {
     const uint8_t *d   = (const uint8_t *)data;
@@ -56,4 +72,4 @@ __attribute__((weak)) uint8_t crc8(const void *data, size_t data_len) {
     }
     return crc;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/quantum/crc.h b/quantum/crc.h
index c17f5888e2..86635847d0 100644
--- a/quantum/crc.h
+++ b/quantum/crc.h
@@ -16,7 +16,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stddef.h>
+#include <stdint.h>
 
 /**
  * The type of the CRC values.
@@ -41,4 +42,4 @@ __attribute__((weak)) void crc_init(void);
  * \param[in] data_len Number of bytes in the \a data buffer.
  * \return             The calculated crc value.
  */
-__attribute__((weak)) uint8_t crc8(const void *data, size_t data_len);
\ No newline at end of file
+__attribute__((weak)) uint8_t crc8(const void *data, size_t data_len);

From fe18df9d4186c7f2c97a2bfccf3cc0e11615c728 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Nov 2022 10:01:06 +1100
Subject: [PATCH 786/959] Normalise Dynamic Macro keycodes (#18939)

* `DYN_REC_START1` -> `QK_DYNAMIC_MACRO_RECORD_START_1`

* `DYN_REC_START2` -> `QK_DYNAMIC_MACRO_RECORD_START_2`

* `DYN_MACRO_PLAY1` -> `QK_DYNAMIC_MACRO_PLAY_1`

* `DYN_MACRO_PLAY2` -> `QK_DYNAMIC_MACRO_PLAY_2`

* `DYN_REC_STOP` -> `QK_DYNAMIC_MACRO_RECORD_STOP`

* Update docs
---
 docs/feature_dynamic_macros.md                | 24 ++++++++---------
 docs/keycodes.md                              | 14 +++++-----
 .../biacco42/ergo42/keymaps/hdbx/keymap.c     |  2 +-
 .../quark/keymaps/ajp10304/keymap.c           |  6 ++---
 keyboards/dz60/keymaps/iso_de_root/keymap.c   | 12 ++++-----
 .../dztech/dz65rgb/keymaps/drootz/keymap.c    |  6 ++---
 .../dztech/dz65rgb/keymaps/yuannan/keymap.c   |  4 +--
 .../ergodox_ez/keymaps/bepo_tm_style/keymap.c |  6 ++---
 .../keymaps/bpruitt-goddard/keymap.c          |  6 ++---
 .../keymaps/hacker_dvorak/hacker_dvorak.c     | 10 +++----
 .../gh60/satan/keymaps/addcninblue/keymap.c   |  2 +-
 .../gon/nerdtkl/keymaps/gam3cat/keymap.c      | 10 +++----
 .../atreus50/keymaps/ajp10304/keymap.c        |  6 ++---
 keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c  |  6 ++---
 keyboards/hhkb/ansi/keymaps/mjt/keymap.c      |  6 ++---
 keyboards/hhkb/ansi/keymaps/shela/keymap.c    |  4 +--
 .../hineybush/h87a/keymaps/gam3cat/keymap.c   | 10 +++----
 keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c | 10 +++----
 keyboards/jd45/keymaps/mjt6u/keymap.c         |  6 ++---
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |  4 +--
 .../kbdfans/niu_mini/keymaps/tucznak/keymap.c |  4 +--
 .../keebio/levinson/keymaps/jyh2/keymap.c     | 10 +++----
 keyboards/m10a/keymaps/gam3cat/keymap.c       | 10 +++----
 keyboards/mt/split75/keymaps/art/keymap.c     |  4 +--
 .../planck/keymaps/dr_notsokind/keymap.c      | 14 +++++-----
 keyboards/planck/keymaps/mjt/keymap.c         |  6 ++---
 keyboards/planck/keymaps/mjtnumsym/keymap.c   | 10 +++----
 keyboards/planck/keymaps/vifon/keymap.c       |  6 ++---
 keyboards/preonic/keymaps/era1112/keymap.c    |  8 +++---
 .../preonic/keymaps/laurentlaurent/keymap.c   | 24 ++++++++---------
 .../roadkit/keymaps/flipphone/keymap.c        |  4 +--
 .../roadkit/keymaps/mjt/keymap.c              |  4 +--
 keyboards/xiudi/xd75/keymaps/colinta/keymap.c | 24 ++++++++---------
 .../xiudi/xd75/keymaps/colinta/readme.md      |  2 +-
 .../xd75/keymaps/dyn_macro_tap_dance/keymap.c |  8 +++---
 .../ymdk/melody96/keymaps/crilith/keymap.c    |  6 ++---
 .../ergodox/colemak_code_friendly/keymap.c    | 26 +++++++++----------
 .../ergodox/qwerty_code_friendly/keymap.c     | 16 ++++++------
 .../community/ortho_4x12/ajp10304/keymap.c    |  6 ++---
 quantum/dynamic_macro.h                       | 16 ++++++------
 .../process_keycode/process_dynamic_macro.c   | 26 +++++++++----------
 quantum/quantum_keycodes.h                    | 20 +++++++-------
 quantum/quantum_keycodes_legacy.h             |  6 +++++
 users/klackygears/tap_dances.c                | 12 ++++-----
 44 files changed, 216 insertions(+), 210 deletions(-)

diff --git a/docs/feature_dynamic_macros.md b/docs/feature_dynamic_macros.md
index 0660e0c065..f5a6952b6b 100644
--- a/docs/feature_dynamic_macros.md
+++ b/docs/feature_dynamic_macros.md
@@ -6,21 +6,21 @@ You can store one or two macros and they may have a combined total of 128 keypre
 
 To enable them, first include `DYNAMIC_MACRO_ENABLE = yes` in your `rules.mk`. Then, add the following keys to your keymap:
 
-|Key               |Alias     |Description                                        |
-|------------------|----------|---------------------------------------------------|
-|`DYN_REC_START1`  |`DM_REC1` |Start recording Macro 1                            |
-|`DYN_REC_START2`  |`DM_REC2` |Start recording Macro 2                            |
-|`DYN_MACRO_PLAY1` |`DM_PLY1` |Replay Macro 1                                     |
-|`DYN_MACRO_PLAY2` |`DM_PLY2` |Replay Macro 2                                     |
-|`DYN_REC_STOP`    |`DM_RSTP` |Finish the macro that is currently being recorded. |
+|Key                              |Alias    |Description                                       |
+|---------------------------------|---------|--------------------------------------------------|
+|`QK_DYNAMIC_MACRO_RECORD_START_1`|`DM_REC1`|Start recording Macro 1                           |
+|`QK_DYNAMIC_MACRO_RECORD_START_2`|`DM_REC2`|Start recording Macro 2                           |
+|`QK_DYNAMIC_MACRO_PLAY_1`        |`DM_PLY1`|Replay Macro 1                                    |
+|`QK_DYNAMIC_MACRO_PLAY_2`        |`DM_PLY2`|Replay Macro 2                                    |
+|`QK_DYNAMIC_MACRO_RECORD_STOP`   |`DM_RSTP`|Finish the macro that is currently being recorded.|
 
 That should be everything necessary. 
 
-To start recording the macro, press either `DYN_REC_START1` or `DYN_REC_START2`. 
+To start recording the macro, press either `DM_REC1` or `DM_REC2`. 
 
-To finish the recording, press the `DYN_REC_STOP` layer button. You can also press `DYN_REC_START1` or `DYN_REC_START2` again to stop the recording.
+To finish the recording, press the `DM_RSTP` layer button. You can also press `DM_REC1` or `DM_REC2` again to stop the recording.
 
-To replay the macro, press either `DYN_MACRO_PLAY1` or `DYN_MACRO_PLAY2`.
+To replay the macro, press either `DM_PLY1` or `DM_PLY2`.
 
 It is possible to replay a macro as part of a macro. It's ok to replay macro 2 while recording macro 1 and vice versa but never create recursive macros i.e. macro 1 that replays macro 1. If you do so and the keyboard will get unresponsive, unplug the keyboard and plug it again.  You can disable this completely by defining `DYNAMIC_MACRO_NO_NESTING`  in your `config.h` file.
 
@@ -43,10 +43,10 @@ If the LEDs start blinking during the recording with each keypress, it means the
 
 ### DYNAMIC_MACRO_USER_CALL
 
-For users of the earlier versions of dynamic macros: It is still possible to finish the macro recording using just the layer modifier used to access the dynamic macro keys, without a dedicated `DYN_REC_STOP` key. If you want this behavior back, add `#define DYNAMIC_MACRO_USER_CALL` to your `config.h` and insert the following snippet at the beginning of your `process_record_user()` function:
+For users of the earlier versions of dynamic macros: It is still possible to finish the macro recording using just the layer modifier used to access the dynamic macro keys, without a dedicated `DM_RSTP` key. If you want this behavior back, add `#define DYNAMIC_MACRO_USER_CALL` to your `config.h` and insert the following snippet at the beginning of your `process_record_user()` function:
 
 ```c
-	uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode);
+	uint16_t macro_kc = (keycode == MO(_DYN) ? DM_RSTP : keycode);
 
 	if (!process_record_dynamic_macro(macro_kc, record)) {
 		return false;
diff --git a/docs/keycodes.md b/docs/keycodes.md
index f701193a45..0c216ae499 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -306,13 +306,13 @@ See also: [Caps Word](feature_caps_word.md)
 
 See also: [Dynamic Macros](feature_dynamic_macros.md)
 
-|Key              |Aliases  |Description                                       |
-|-----------------|---------|--------------------------------------------------|
-|`DYN_REC_START1` |`DM_REC1`|Start recording Macro 1                           |
-|`DYN_REC_START2` |`DM_REC2`|Start recording Macro 2                           |
-|`DYN_MACRO_PLAY1`|`DM_PLY1`|Replay Macro 1                                    |
-|`DYN_MACRO_PLAY2`|`DM_PLY2`|Replay Macro 2                                    |
-|`DYN_REC_STOP`   |`DM_RSTP`|Finish the macro that is currently being recorded.|
+|Key                              |Aliases  |Description                                       |
+|---------------------------------|---------|--------------------------------------------------|
+|`QK_DYNAMIC_MACRO_RECORD_START_1`|`DM_REC1`|Start recording Macro 1                           |
+|`QK_DYNAMIC_MACRO_RECORD_START_2`|`DM_REC2`|Start recording Macro 2                           |
+|`QK_DYNAMIC_MACRO_PLAY_1`        |`DM_PLY1`|Replay Macro 1                                    |
+|`QK_DYNAMIC_MACRO_PLAY_2`        |`DM_PLY2`|Replay Macro 2                                    |
+|`QK_DYNAMIC_MACRO_RECORD_STOP`   |`DM_RSTP`|Finish the macro that is currently being recorded.|
 
 ## Grave Escape :id=grave-escape
 
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
index 2d687037e4..cd58acc48d 100644
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
+++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------'   `-------------------------------------------------------'
    */
   [_ADJUST] = LAYOUT( \
-    RGB_TOG,  MCR1,    MCR2,    MCR3,    XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, DYN_REC_START1, DYN_REC_START2, DYN_REC_STOP, KC_BSPC, \
+    RGB_TOG,  MCR1,    MCR2,    MCR3,    XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP, KC_BSPC, \
     QK_BOOT,  RGB_MOD, RGB_M_P, RGB_M_B, RGB_HUI, RGB_SAI, RGB_VAI,   XXXXXXX, XXXXXXX, QWERTY,  GAME,   XXXXXXX, XXXXXXX, XXXXXXX, \
     KC_LSFT,  RGB_M_R, RGB_M_SN,RGB_M_G, RGB_HUD, RGB_SAD, RGB_VAD,   XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, \
     DB_TOGG,  XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
diff --git a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
index a37bad7210..b5b4721ce6 100644
--- a/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
@@ -121,9 +121,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
-  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
-  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
+  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DM_REC1,         DM_REC2,         _______,             _______,           _______,              _______,  KC_DEL  ,
+  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DM_PLY1,         DM_PLY2,         KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
+  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DM_RSTP,         DM_RSTP,         KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______
 ),
 
diff --git a/keyboards/dz60/keymaps/iso_de_root/keymap.c b/keyboards/dz60/keymaps/iso_de_root/keymap.c
index 961c1be428..f3fb169dc0 100644
--- a/keyboards/dz60/keymaps/iso_de_root/keymap.c
+++ b/keyboards/dz60/keymaps/iso_de_root/keymap.c
@@ -18,7 +18,7 @@ enum {
 
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint16_t macro_kc = (keycode == MO(DYN) ? DYN_REC_STOP : keycode);
+  uint16_t macro_kc = (keycode == MO(DYN) ? QK_DYNAMIC_MACRO_RECORD_STOP : keycode);
   
   if (!process_record_dynamic_macro(macro_kc, record)) {
       return false;
@@ -85,11 +85,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
 */
 
-#define MacRec1 DYN_REC_START1
-#define MacRec2 DYN_REC_START2
-#define MacPla1 DYN_MACRO_PLAY1
-#define MacPla2 DYN_MACRO_PLAY2
-#define MacStop DYN_REC_STOP
+#define MacRec1 DM_REC1
+#define MacRec2 DM_REC2
+#define MacPla1 DM_PLY1
+#define MacPla2 DM_PLY2
+#define MacStop DM_RSTP
 
   [DEF] = LAYOUT_60_iso_5x1u_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,
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index 63d4662efc..d0d22f28b4 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -124,9 +124,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_LALT, KC_LGUI, KC_TRNS, KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_FN] = LAYOUT_65_ansi(
-        DYN_REC_STOP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
-        KC_TRNS, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, DYN_MACRO_PLAY2, DYN_REC_START2,
-        KC_TRNS, KC_BRID, KC_VOLD, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, DYN_MACRO_PLAY1, DYN_REC_START1,
+        DM_RSTP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
+        KC_TRNS, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, DM_PLY2, DM_REC2,
+        KC_TRNS, KC_BRID, KC_VOLD, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, DM_PLY1, DM_REC1,
         KC_TRNS, TO(_MAIN), TO(_MAC), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPD, RGB_SPI, KC_TRNS, RGB_VAI, KC_NO,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_MOD
     ),
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
index adca28584e..db88a2132f 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
@@ -57,8 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		DEC_CLICK_SPEED,INC_CLICK_SPEED,KC_TRNS,								KC_TRNS,							KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS
     ),
     [_HYPER_LAYER] = LAYOUT_65_ansi(
-		DYN_REC_STOP,	DYN_REC_START1,		DYN_REC_START2,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
-		KC_NO,			DYN_MACRO_PLAY1,	DYN_MACRO_PLAY2,	KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
+		DM_RSTP,		DM_REC1,			DM_REC2,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
+		KC_NO,			DM_PLY1,			DM_PLY2,			KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
 		KC_NO,			KC_NO,				KC_NO,				KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
 		KC_LSFT,		KC_NO,				KC_NO,				RGB_HUI,	RGB_SAI,	RGB_VAI,	RGB_SPI,	RGB_MOD,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
 		KC_TRNS,		KC_TRNS,			KC_TRNS,									RGB_TOG,							KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
index 85a81bce9c..6949261980 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
@@ -201,13 +201,13 @@ void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) {
   keyrecord_t record;
   dprintf("macro_tap_dance_fn %d\n", state->count);
   if (is_macro1_recording) {
-    keycode = DYN_REC_STOP;
+    keycode = DM_RSTP;
     is_macro1_recording = false;
     layer_state_set_user(current_layer_state);
   } else if (state->count == 1) {
-    keycode = DYN_MACRO_PLAY1;
+    keycode = DM_PLY1;
   } else {
-    keycode = DYN_REC_START1;
+    keycode = DM_REC1;
     is_macro1_recording = true;
     layer_state_set_user(current_layer_state);
   }
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
index b1a343bbdf..b2065bca83 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
@@ -109,13 +109,13 @@ void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) {
   keyrecord_t record;
   dprintf("macro_tap_dance_fn %d\n", state->count);
   if (is_macro1_recording) {
-    keycode = DYN_REC_STOP;
+    keycode = DM_RSTP;
     is_macro1_recording = false;
     layer_state_set_user(current_layer_state);
   } else if (state->count == 1) {
-    keycode = DYN_MACRO_PLAY1;
+    keycode = DM_PLY1;
   } else {
-    keycode = DYN_REC_START1;
+    keycode = DM_REC1;
     is_macro1_recording = true;
     layer_state_set_user(current_layer_state);
   }
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
index 6224e8baa8..19627ad11f 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
@@ -7,13 +7,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
         //  ESCAPE                 |                         |                         |                         |                         |                         |     START RECORDING     //
         //                         |                         |                         |                         |                         |                         |                         //
-                   KC_ESC,                 TD(GRV_TILD),             TD(AT_DLR),              TD(LCBR_LABK),            TD(LPRN_LBRC),            TD(EXLM_QUES),           DYN_REC_START1,     //
+                   KC_ESC,                 TD(GRV_TILD),             TD(AT_DLR),              TD(LCBR_LABK),            TD(LPRN_LBRC),            TD(EXLM_QUES),           DM_REC1,            //
         //                         |                       ~ |                       $ |                       < |                       [ |                       ? |                         //
         //                         |            TAP DANCE: ` |            TAP DANCE: @              TAP DANCE: { |            TAP DANCE: ( |            TAP DANCE: ! |     DYNAMIC MARCO 1     //
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
         //  TAB                    |      MOD TAP: ALT+SHIFT |       MOD TAP: CTRL+ALT |     MOD TAP: CTRL+SHIFT | P                       | Y                       |                         //
         //                         |                         |                         |                         |                         |                         |                         //
-                   KC_TAB,                TD(NONE_LEAD),            TD(QUOT_DQUO),           TD(DOT_COMM),               LCG_T(KC_P),              LAG_T(KC_Y),            DYN_MACRO_PLAY1,    //
+                   KC_TAB,                TD(NONE_LEAD),            TD(QUOT_DQUO),           TD(DOT_COMM),               LCG_T(KC_P),              LAG_T(KC_Y),            DM_PLY1,            //
         //                         |                    LEAD |                       " |                       , |                         |                         |                         //
         //                         |         TAP DANCE: NONE |            TAP DANCE: ' |            TAP DANCE: . |       MOD TAP: CTRL+GUI |        MOD TAP: ALT+GUI |                         //
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------|   PLAY DYNAMIC MACRO 1  //
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------|  META                   //
         //          STOP RECORDING |  MOD TAP: GUI+SHIFT+ALT | Q                       | J                       | K                       | X                       |                         //
         //                         |                         |                         |                         |                         |                         |                         //
-                DYN_REC_STOP,             TD(SCLN_COLN),            LCAG_T(KC_Q),             TD(J_MED_MEH),            TD(K_NUM_HYP),            LCSG_T(KC_X),                KC_LGUI,        //
+                DM_RSTP,                  TD(SCLN_COLN),            LCAG_T(KC_Q),             TD(J_MED_MEH),            TD(K_NUM_HYP),            LCSG_T(KC_X),                KC_LGUI,        //
         //                         |                       : |                         |                         |                         |                         |                         //
         //           DYNAMIC MACRO |            TAP DANCE: ; |      MOD TAP: SHIFT+GUI |  M TAP DANCE: MEDIA/MEH |  M TAP DANCE: ATM/HYPER |  MOD TAP: CTL+SHIFT+GUI |                         //
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
@@ -63,13 +63,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
         //                         |                         |                         |                         |                         |                         |                         //
         //                         |                         |                         |                         |                         |                         |                         //
-                DYN_REC_START2,           TD(APMR_PIPE),            TD(RPRN_RBRC),            TD(RCBR_RABK),            TD(HASH_PERC),            TD(ASTR_CIRC),               XXXXXXX,        //
+                DM_REC2,                   TD(APMR_PIPE),            TD(RPRN_RBRC),            TD(RCBR_RABK),            TD(HASH_PERC),            TD(ASTR_CIRC),               XXXXXXX,        //
         //                         |                         |                         |                         |                         |                         |                         //
         //                         |                         |                         |                         |                         |                         |                         //
          //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
         //                         |                         |                         |                         |                         |                         |                         //
         //                         |                         |                         |                         |                         |                         |                         //
-                DYN_MACRO_PLAY2,           LAG_T(KC_F),              LCG_T(KC_G),             C_S_T(KC_C),                LCA_T(KC_R),             LAS_T(KC_L),             TD(SLSH_BSLS),     //
+                DM_PLY2,                   LAG_T(KC_F),              LCG_T(KC_G),             C_S_T(KC_C),                LCA_T(KC_R),             LAS_T(KC_L),             TD(SLSH_BSLS),     //
         //                         |                         |                         |                         |                         |                         |                         //
         //                         |                         |                         |                         |                         |                         |                         //
         //                         |-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
index 3cfbd340cf..d120f19e8b 100644
--- a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
+++ b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 2 */
       KC_GRAVE , KC_F1   , KC_F2   , KC_F3   , KC_F4          , KC_F5           , KC_F6        , KC_F7    , KC_F8   , KC_F9    , KC_F10  , KC_F11  , KC_F12       , KC_INS , KC_DEL , \
-      KC_CAPS  , KC_VOLD , KC_MUTE , KC_VOLU , DYN_REC_START1 , DYN_MACRO_PLAY1 , DYN_REC_STOP , KC_PGUP  , KC_HOME , ______   , KC_PSCR , KC_UP   , ______       , KC_DEL , \
+      KC_CAPS  , KC_VOLD , KC_MUTE , KC_VOLU , DM_REC1        , DM_PLY1         , DM_RSTP      , KC_PGUP  , KC_HOME , ______   , KC_PSCR , KC_UP   , ______       , KC_DEL , \
       KC_LCTL  , KC_END  , ______  , KC_PGDN , ______         , ______          , KC_LEFT      , KC_DOWN  , KC_UP   , KC_RIGHT , KC_LEFT , KC_RGHT , KC_ENT       , \
       KC_LSFT  , KC_MPRV , KC_MPLY , KC_MNXT , BL_DEC         , BL_TOGG         , BL_INC       , ______   , ______  , ______   , KC_DOWN , KC_RSFT , TO(_DEFAULT) , \
       ______   , ______  , KC_LALT , KC_SPC  , KC_RALT        , QK_BOOT           , ______       , ______ \
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
index dc50958c57..6a153eaf8f 100644
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
@@ -22,11 +22,11 @@ extern backlight_config_t backlight_config;
 
 #include "dynamic_macro.h"
 #define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DYN_REC_START1
-#define KC_DMR2 DYN_REC_START2
-#define KC_DMP1 DYN_MACRO_PLAY1
-#define KC_DMP2 DYN_MACRO_PLAY2
-#define KC_DMRS DYN_REC_STOP
+#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.
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 02f4149235..d807df047d 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -122,9 +122,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-  M_CUSTOM, QK_BOOT, QWERTY,  _______, _______, DYN_REC_START1,                    DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
-  KC_CAPS,  _______, _______, _______, _______, DYN_MACRO_PLAY1,                   DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
-  TG(_MAC), _______, _______, _______, _______, DYN_REC_STOP,                      DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
+  M_CUSTOM, QK_BOOT, QWERTY,  _______, _______, DM_REC1,                    DM_REC2,  _______,             _______,           _______,              _______,  KC_DEL  ,
+  KC_CAPS,  _______, _______, _______, _______, DM_PLY1,                    DM_PLY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
+  TG(_MAC), _______, _______, _______, _______, DM_RSTP,                    DM_RSTP, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______, _______, _______,         _______,             _______,           _______,              _______,  _______
 ),
 
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
index 520bcb35d0..5ad8bee641 100644
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [UTIL] = LAYOUT(
-        QK_BOOT, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DB_TOGG,
+        QK_BOOT, DM_PLY1, DM_PLY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DB_TOGG,
         ____, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, ____, KC_HOME, KC_PGDN, KC_PGUP, KC_END, ____, ____, ____, ____,
         ____, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ____, ____, ____,
         ____, ____, ____, ____, ____, KC_SPC, ____, ____, ____, ____, ____, ____, ____,
@@ -154,9 +154,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [MREC] = LAYOUT(
-        ____, DYN_REC_START1, DYN_REC_START2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+        ____, DM_REC1, DM_REC2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
         ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, DYN_REC_STOP, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+        ____, ____, DM_RSTP, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
         ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
         ____, ____, ____, ____, ____)
 
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
index 71a24fa2a5..b4a36c97ee 100644
--- a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
@@ -75,15 +75,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     [DYN] = LAYOUT(
-        KC_TRNS, DYN_REC_START1, DYN_REC_START2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,
+        KC_TRNS, DM_REC1, DM_REC2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DM_PLY1, DM_PLY2,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MACSLEEP, KC_HOME, KC_END, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, DYN_REC_STOP, KC_TRNS, KC_TRNS)};
+        KC_TRNS, KC_TRNS, DM_RSTP, KC_TRNS, KC_TRNS)};
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record)
 {
-    uint16_t macro_kc = (keycode == MO(DYN) ? DYN_REC_STOP : keycode);
+    uint16_t macro_kc = (keycode == MO(DYN) ? DM_RSTP : keycode);
     if (!process_dynamic_macro(macro_kc, record))
     {
         return false;
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap.c b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
index bc901472f6..922ec02c41 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
@@ -50,8 +50,8 @@ enum custom_keycodes {
 /* Additional custom keycodes */
 #define MO_HHKB MO(_HHKB)
 #define LT_SPFN LT(_SPACE_FN, KC_SPC)
-#define DM_STA1 DYN_REC_START1
-#define DM_PLY1 DYN_MACRO_PLAY1
+#define DM_STA1 DM_REC1
+#define DM_PLY1 DM_PLY1
 
 /* User settings structure for the EEPROM */
 typedef union {
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
index 5ce963e4bf..5c3ee4d961 100644
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
@@ -22,11 +22,11 @@ extern backlight_config_t backlight_config;
 
 #include "dynamic_macro.h"
 #define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DYN_REC_START1
-#define KC_DMR2 DYN_REC_START2
-#define KC_DMP1 DYN_MACRO_PLAY1
-#define KC_DMP2 DYN_MACRO_PLAY2
-#define KC_DMRS DYN_REC_STOP
+#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.
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
index ea3d694f46..000a7b472d 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
@@ -22,11 +22,11 @@ extern backlight_config_t backlight_config;
 
 #include "dynamic_macro.h"
 #define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DYN_REC_START1
-#define KC_DMR2 DYN_REC_START2
-#define KC_DMP1 DYN_MACRO_PLAY1
-#define KC_DMP2 DYN_MACRO_PLAY2
-#define KC_DMRS DYN_REC_STOP
+#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.
diff --git a/keyboards/jd45/keymaps/mjt6u/keymap.c b/keyboards/jd45/keymaps/mjt6u/keymap.c
index 1afb4f0191..8880fc267c 100644
--- a/keyboards/jd45/keymaps/mjt6u/keymap.c
+++ b/keyboards/jd45/keymaps/mjt6u/keymap.c
@@ -74,8 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] = LAYOUT( \
-    _______, QK_BOOT, _______, _______, _______,   _______, _______,    DYN_REC_START1,  DYN_REC_START2,  _______,  KC_PSCR, _______, _______, \
-    _______, _______, _______, _______, USEFNMODS, _______, _______,    DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, MACSLEEP, _______,          _______, \
+    _______, QK_BOOT, _______, _______, _______,   _______, _______,    DM_REC1,  DM_REC2,  _______,  KC_PSCR, _______, _______, \
+    _______, _______, _______, _______, USEFNMODS, _______, _______,    DM_PLY1,  DM_PLY2, MACSLEEP, _______,          _______, \
     _______, _______, _______, _______, _______,   _______, USENUMMODS, _______,         _______,         _______,  _______,          _______, \
     XXXXXXX, _______, _______, XXXXXXX,            XXXXXXX,             _______,                          XXXXXXX, __MOD__,  __MOD__, XXXXXXX  \
   )
@@ -91,7 +91,7 @@ static bool singular_key = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record)
 {
-    uint16_t macro_kc = (keycode == MO(_ADJUST) ? DYN_REC_STOP : keycode);
+    uint16_t macro_kc = (keycode == MO(_ADJUST) ? DM_RSTP : keycode);
     if (!process_record_dynamic_macro(macro_kc, record))
     {
         return false;
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index ba1f78ce49..8184b06253 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS,
         KC_TRNS, MACRO1, MACRO2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         MACROTAB, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS,
-        KC_TRNS, VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DYN_REC_START2, DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, DYN_REC_STOP, DYN_REC_START1, DYN_MACRO_PLAY1, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DM_REC2, DM_PLY2, KC_TRNS, KC_TRNS,
+        KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, DM_RSTP, DM_REC1, DM_PLY1, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, LCA(KC_DEL), KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_NUMPAD] = LAYOUT_ansi_1u(
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
index be09319c49..b4f75a9d1e 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
@@ -105,8 +105,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------------------------------'
      */
     [_FN] = LAYOUT_ortho_4x12(
-        _______, BL_STEP, _______,  KC_SLEP, _______, _______,     _______,     DYN_REC_START1, DYN_MACRO_PLAY1, DYN_REC_STOP, _______, KC_VOLU,
-        _______, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,     _______,     DYN_REC_START2, DYN_MACRO_PLAY2, _______,      _______, KC_VOLD,
+        _______, BL_STEP, _______,  KC_SLEP, _______, _______,     _______,     DM_REC1, DM_PLY1, DM_RSTP, _______, KC_VOLU,
+        _______, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,     _______,     DM_REC2, DM_PLY2, _______,      _______, KC_VOLD,
         _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,     _______,     _______,        _______,         _______,      KC_MSTP, KC_MUTE,
         QK_BOOT, _______, _______,  _______, _______, LCA(KC_DEL), LCA(KC_INS), _______,        _______,         KC_MPRV,      KC_MPLY, KC_MNXT
     )
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
index 544a9f4f0b..87c02c5a44 100644
--- a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
@@ -31,11 +31,11 @@ enum custom_keycodes {
 
 #include "dynamic_macro.h"
 
-#define DREC_1  DYN_REC_START1
-#define DREC_2  DYN_REC_START2
-#define DPLAY_1 DYN_MACRO_PLAY1
-#define DPLAY_2 DYN_MACRO_PLAY2
-#define DSTOP   DYN_REC_STOP
+#define DREC_1  DM_REC1
+#define DREC_2  DM_REC2
+#define DPLAY_1 DM_PLY1
+#define DPLAY_2 DM_PLY2
+#define DSTOP   DM_RSTP
 
 
 // Mod Tap Definitions
diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c
index 345b03945d..bfe30b7981 100644
--- a/keyboards/m10a/keymaps/gam3cat/keymap.c
+++ b/keyboards/m10a/keymaps/gam3cat/keymap.c
@@ -27,11 +27,11 @@ extern backlight_config_t backlight_config;
 
 #include "dynamic_macro.h"
 #define FN_ZERO LT(_L9, KC_KP_0)
-#define KC_DMR1 DYN_REC_START1
-#define KC_DMR2 DYN_REC_START2
-#define KC_DMP1 DYN_MACRO_PLAY1
-#define KC_DMP2 DYN_MACRO_PLAY2
-#define KC_DMRS DYN_REC_STOP
+#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:
diff --git a/keyboards/mt/split75/keymaps/art/keymap.c b/keyboards/mt/split75/keymaps/art/keymap.c
index 0196505854..1658c8ba38 100644
--- a/keyboards/mt/split75/keymaps/art/keymap.c
+++ b/keyboards/mt/split75/keymaps/art/keymap.c
@@ -72,8 +72,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 KC_VOLD,KC_VOLU, KC_GRAVE, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,                 KC_7,   KC_8,    KC_9,   KC_0,    KC_MINUS, KC_EQUAL, KC_BSPC,          KC_DEL,
 KC_MPRV,KC_MNXT, KC_TAB,   KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,                 KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,           KC_END,
 KC_HOME,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_ENTER,         KC_PGUP,
-DYN_MACRO_PLAY1,KC_MUTE,KC_LSFT,KC_Z,KC_X,KC_C,  KC_V,   KC_B,                 KC_N,   KC_M,   KC_COMM, KC_DOT, LT(GIT,KC_SLSH),                     KC_RSFT,  KC_UP,   KC_PGDN,
-DYN_REC_STOP,DYN_REC_START1,KC_LCTL, KC_LGUI, KC_LALT, LT(MEDIA,KC_SPC), LT(COMBOS,KC_BSPC),       LT(NAV,KC_APP), LT(LAYOUT_CHG, KC_ENTER),KC_RALT,KC_RCTL,   KC_LEFT,  KC_DOWN, KC_RIGHT
+DM_PLY1,KC_MUTE,KC_LSFT,KC_Z,KC_X,KC_C,  KC_V,   KC_B,                 KC_N,   KC_M,   KC_COMM, KC_DOT, LT(GIT,KC_SLSH),                     KC_RSFT,  KC_UP,   KC_PGDN,
+DM_RSTP,DM_REC1,KC_LCTL, KC_LGUI, KC_LALT, LT(MEDIA,KC_SPC), LT(COMBOS,KC_BSPC),       LT(NAV,KC_APP), LT(LAYOUT_CHG, KC_ENTER),KC_RALT,KC_RCTL,   KC_LEFT,  KC_DOWN, KC_RIGHT
   ),
 
   /* Base          ,-----------------------------------------.     ,-----------------------------------------------------.
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
index 15562a537a..f02292beee 100644
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -161,8 +161,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_MEDIA] = LAYOUT_planck_grid(
 	XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS,   XXXXXXX, KC_PSCR, XXXXXXX,
-	XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,
-	KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DYN_REC_STOP,
+	XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, DM_PLY1, DM_PLY2,
+	KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DM_RSTP,
 	ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE,  KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY 
 ),
 
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ONESHOT] = LAYOUT_planck_grid(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
@@ -221,16 +221,16 @@ void press_key(uint16_t key) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // uint16_t macro_kc = (keycode == ONESHOT ? DYN_REC_STOP : keycode);
+    // uint16_t macro_kc = (keycode == ONESHOT ? DM_RSTP : keycode);
     if (!process_record_dynamic_macro(keycode, record)) {
         switch(keycode) {
-          case DYN_REC_START1:
-          case DYN_REC_START2:
+          case QK_DYNAMIC_MACRO_RECORD_START_1:
+          case QK_DYNAMIC_MACRO_RECORD_START_2:
 #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_dyn_macro_rec);
 #endif
               break;
-          case DYN_REC_STOP:
+          case QK_DYNAMIC_MACRO_RECORD_STOP:
 #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_dyn_macro_stop);
 #endif
diff --git a/keyboards/planck/keymaps/mjt/keymap.c b/keyboards/planck/keymaps/mjt/keymap.c
index a895d9519b..3410fa4b1a 100644
--- a/keyboards/planck/keymaps/mjt/keymap.c
+++ b/keyboards/planck/keymaps/mjt/keymap.c
@@ -124,10 +124,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 [_DYN] = LAYOUT_planck_grid(
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2, _______ ,
+  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2, _______ ,
   _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______
+  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, _______
 )
 
 };
@@ -151,7 +151,7 @@ void persistant_default_layer_set(uint16_t default_layer) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode);
+  uint16_t macro_kc = (keycode == MO(_DYN) ? DM_RSTP : keycode);
   if (!process_record_dynamic_macro(macro_kc, record)) {
     return false;
   }
diff --git a/keyboards/planck/keymaps/mjtnumsym/keymap.c b/keyboards/planck/keymaps/mjtnumsym/keymap.c
index 86368c6dab..e7ae02397d 100644
--- a/keyboards/planck/keymaps/mjtnumsym/keymap.c
+++ b/keyboards/planck/keymaps/mjtnumsym/keymap.c
@@ -63,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FKEYS] = LAYOUT_planck_grid(
   KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  KC_DEL,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F6,   _______, _______, MACSLEEP, DYN_REC_START1, DYN_REC_START2,
-  _______, _______, _______, _______, _______, _______, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______, DYN_REC_STOP,
+  KC_DEL,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F6,   _______, _______, MACSLEEP, DM_REC1, DM_REC2,
+  _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, _______, DM_RSTP,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
@@ -123,10 +123,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ) /*,
 [_DYN] = LAYOUT_planck_grid(
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2, _______ ,
+  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2, _______ ,
   _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______
+  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, _______
 )*/
 
 };
@@ -150,7 +150,7 @@ void persistant_default_layer_set(uint16_t default_layer) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint16_t macro_kc = (keycode == FKEYS ? DYN_REC_STOP : keycode);
+  uint16_t macro_kc = (keycode == FKEYS ? DM_RSTP : keycode);
   if (!process_record_dynamic_macro(macro_kc, record)) {
     return false;
   }
diff --git a/keyboards/planck/keymaps/vifon/keymap.c b/keyboards/planck/keymaps/vifon/keymap.c
index 6929197542..bd82d7b642 100644
--- a/keyboards/planck/keymaps/vifon/keymap.c
+++ b/keyboards/planck/keymaps/vifon/keymap.c
@@ -82,8 +82,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, KC_LGUI, KC_LALT, _______,           _______,           _______, _______, _______, _______, _______
         ),
     [_DYN] = LAYOUT_planck_mit( /* special */
-        KM_HOLD,  DYN_REC_START1, DYN_MACRO_PLAY1, _______, _______,    _______, _______, KC_APP,  KC_INS,  _______, KC_PSCR, KC_PAUS,
-        QK_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
+        KM_HOLD,  DM_REC1, DM_PLY1, _______, _______,    _______, _______, KC_APP,  KC_INS,  _______, KC_PSCR, KC_PAUS,
+        QK_LOCK,  DM_REC2, DM_PLY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
         KM_SHLK,  _______,        _______,         _______, _______,    _______, _______, _______, _______, _______, _______, _______,
         _______,  _______,        _______,         _______, KM_PP_GAME,      DF(_QW),     DF(_PP), _______, _______, _______, _______
         ),
@@ -103,7 +103,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static uint16_t key_timer;
     static uint8_t ignore_up_events = 0;
 
-    uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode);
+    uint16_t macro_kc = (keycode == MO(_DYN) ? DM_RSTP : keycode);
     if (!process_record_dynamic_macro(macro_kc, record)) {
         return false;
     }
diff --git a/keyboards/preonic/keymaps/era1112/keymap.c b/keyboards/preonic/keymaps/era1112/keymap.c
index 4031f998db..43c8ab9572 100644
--- a/keyboards/preonic/keymaps/era1112/keymap.c
+++ b/keyboards/preonic/keymaps/era1112/keymap.c
@@ -264,7 +264,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
         }
 
     // Sound when Dynamic recording started
-    case DYN_REC_START1:
+    case QK_DYNAMIC_MACRO_RECORD_START_1:
 
         // If pressed
         if (record->event.pressed) {
@@ -279,7 +279,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
         }
 
     // Sound when Dynamic recording stopped
-    case DYN_REC_STOP:
+    case QK_DYNAMIC_MACRO_RECORD_STOP:
 
         // If pressed
         if (record->event.pressed) {
@@ -336,7 +336,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // lower key
     [_LOWER] = LAYOUT_ortho_5x12 (
-        DYN_MACRO_PLAY1,    DYN_REC_START1, DYN_REC_STOP,   KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
+        DM_PLY1,            DM_REC1,        DM_RSTP,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
         KC_TRNS,            KC_1,           KC_2,           KC_3,           KC_4,           KC_5,           KC_6,           KC_7,               KC_8,           KC_9,       KC_0,       KC_DEL,
         KC_BSPC,            KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_QUOT,            KC_GRV,         KC_LCBR,    KC_RCBR,    KC_TRNS,
         KC_TRNS,            KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_MINS,            KC_EQL,         KC_TRNS,    KC_BSLS,    KC_TRNS,
@@ -345,7 +345,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // raise key
     [_RAISE] = LAYOUT_ortho_5x12 (
-        DYN_MACRO_PLAY1,    DYN_REC_START1, DYN_REC_STOP,   KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
+        DM_PLY1,            DM_REC1,        DM_RSTP,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
         KC_TRNS,            KC_EXLM,        KC_AT,          KC_HASH,        KC_DLR,         KC_PERC,        KC_CIRC,        KC_AMPR,            KC_ASTR,        KC_LPRN,    KC_RPRN,    KC_DEL,
         KC_DEL,             KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_DQUO,            KC_TILD,        KC_LBRC,    KC_RBRC,    KC_TRNS,
         KC_TRNS,            KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_UNDS,            KC_PLUS	,       KC_TRNS,    KC_PIPE,    KC_TRNS,
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index a64469051a..0e12012517 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -6,11 +6,11 @@
         #include "../../rev3/config.h"
         #include "../../rev3/rev3.h"
         enum dynamic_macro_keycodes {
-            DYN_REC_START1 = DYNAMIC_MACRO_RANGE,
-            DYN_REC_START2,
-            DYN_REC_STOP,
-            DYN_MACRO_PLAY1,
-            DYN_MACRO_PLAY2,
+            DM_REC1 = DYNAMIC_MACRO_RANGE,
+            DM_REC2,
+            DM_RSTP,
+            DM_PLY1,
+            DM_PLY2,
         };
         #define QMK_KEYBOARD_H "rev3.h"
     #endif
@@ -258,8 +258,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_SCRL,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
         KC_TAB,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, XXXXXXX,  KC_AMPR, KC_ASTR, KC_LCBR, KC_RCBR, KC_DEL,
         KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15, XXXXXXX,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, XXXXXXX,
-        _______, KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, XXXXXXX,  KC_NUHS, KC_NUBS, DYN_REC_START1,   DYN_REC_START2, DYN_REC_STOP,
-        KC_LCTL, KC_LALT, KC_LGUI, _______, KC_BSPC, KC_SPC,  KC_SPC,  KC_ENT,  __LYB__, DYN_MACRO_PLAY1,  DYN_MACRO_PLAY2, LLSWIT
+        _______, KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, XXXXXXX,  KC_NUHS, KC_NUBS, DM_REC1, DM_REC2, DM_RSTP,
+        KC_LCTL, KC_LALT, KC_LGUI, _______, KC_BSPC, KC_SPC,  KC_SPC,  KC_ENT,  __LYB__, DM_PLY1, DM_PLY2, LLSWIT
     ),
 
     /* Adjust (Lower + Raise)
@@ -322,8 +322,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   _______,  _______,  _______,  _______,  KC_SCRL,  _______,  _______,  _______,  _______,  _______,  _______,
         KC_TAB,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  DYN_REC_START1, DYN_REC_START2, DYN_REC_STOP,
-        KC_LCTL,  KC_LALT,  KC_LGUI,  KC_DEL,  KC_BSPC,  KC_SPC,   KC_SPC,   __LYB__,  _______,  DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,  LLSWIT
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  DM_REC1,  DM_REC2,  DM_RSTP,
+        KC_LCTL,  KC_LALT,  KC_LGUI,  KC_DEL,  KC_BSPC,  KC_SPC,   KC_SPC,   __LYB__,  _______,   DM_PLY1,  DM_PLY2,  LLSWIT
     ),
 
     /* Numeric Pad
@@ -419,7 +419,7 @@ bool            process_record_user(uint16_t keycode, keyrecord_t *record) {
 // Play sound on Macro stop
 #ifdef AUDIO_ENABLE
         switch (keycode) {
-            case DYN_REC_STOP:
+            case QK_DYNAMIC_MACRO_RECORD_STOP:
                 if (record->event.pressed) {
                     PLAY_SONG(tone_macro_record_stop);
                 }
@@ -506,13 +506,13 @@ bool            process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 #ifdef AUDIO_ENABLE
             // Play sound on Macro record start
-        case DYN_REC_START1:
+        case QK_DYNAMIC_MACRO_RECORD_START_1:
             if (record->event.pressed) {
                 PLAY_SONG(tone_macro1_record);
             }
             return false;
             break;
-        case DYN_REC_START2:
+        case QK_DYNAMIC_MACRO_RECORD_START_2:
             if (record->event.pressed) {
                 PLAY_SONG(tone_macro2_record);
             }
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
index 612ec7060a..8629ccbd9c 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
@@ -66,9 +66,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,                   MO(_DYN)               \
   ),
   [_DYN] = LAYOUT_numpad_4x4( /* DYNAMIC MACRO */
-    DYN_REC_START1, DYN_REC_START2, _______, DYN_REC_STOP, \
+    DM_REC1, DM_REC2, _______, DM_RSTP, \
     _______, _______,  _______,                            \
-    DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______, _______,    \
+    DM_PLY1, DM_PLY2, _______, _______,    \
     _______,            _______                            \
   ),
 };
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
index 57b4a1c4b8..8b8719a315 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
@@ -64,9 +64,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,                 _______
   ),
   [_DYN] = LAYOUT_numpad_4x4( /* DYNAMIC MACRO */
-    DYN_REC_START1,  DYN_REC_START2,  _______, _______, \
+    DM_REC1,  DM_REC2,  _______, _______, \
     _______,         _______,         _______, \
-    DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______, _______, \
+    DM_PLY1, DM_PLY2, _______, _______, \
     _______,                          _______
   ),
 };
diff --git a/keyboards/xiudi/xd75/keymaps/colinta/keymap.c b/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
index 4d7c2d2007..5cdbdd6c74 100644
--- a/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
@@ -46,8 +46,8 @@
 // "MMENU" is a macro for "CMD+SPC" (aka Spotlight/Alfred)
 #define MMENU LGUI(KC_SPC)
 #define _____ KC_TRNS
-#define MM_0 DYN_MACRO_PLAY1
-#define MM_1 DYN_MACRO_PLAY2
+#define MM_0 DM_PLY1
+#define MM_1 DM_PLY2
 
 // tap-hold settings
 #define LONGPRESS_DELAY 250
@@ -114,8 +114,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [LAYER_RECORD] = LAYOUT(
-    _____, _____, _____, _____, _____, _____, DYN_REC_STOP, DYN_REC_STOP, _____, _____, _____, _____, _____, _____, _____,
-    _____, _____, _____, _____, _____, _____, DYN_REC_STOP, DYN_REC_STOP, _____, _____, _____, _____, _____, _____, _____,
+    _____, _____, _____, _____, _____, _____, DM_RSTP, DM_RSTP, _____, _____, _____, _____, _____, _____, _____,
+    _____, _____, _____, _____, _____, _____, DM_RSTP, DM_RSTP, _____, _____, _____, _____, _____, _____, _____,
     _____, _____, _____, _____, _____, _____,    _____,        _____,     _____, _____, _____, _____, _____, _____, _____,
     _____, _____, _____, _____, _____, _____,    _____,        _____,     _____, _____, _____, _____, _____, _____, _____,
     _____, _____, _____, _____, _____, _____,    _____,        _____,     _____, _____, _____, _____, _____, _____, _____
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   [LAYER_FN] = LAYOUT(
-    GOTO_CM, GOTO_QW, KC_NO, KC_NO, KC_NO, KC_NO, DYN_REC_START1, DYN_REC_START2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    GOTO_CM, GOTO_QW, KC_NO, KC_NO, KC_NO, KC_NO, DM_REC1, DM_REC2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,          KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,          KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,          KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
@@ -221,7 +221,7 @@ bool did_record_m1 = false;
 bool did_record_m2 = false;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     bool try_dynamic_macro = true;
-    if ((keycode == DYN_MACRO_PLAY1 && !did_record_m1) || (keycode == DYN_MACRO_PLAY2 && !did_record_m2)) {
+    if ((keycode == QK_DYNAMIC_MACRO_PLAY_1 && !did_record_m1) || (keycode == QK_DYNAMIC_MACRO_PLAY_2 && !did_record_m2)) {
         try_dynamic_macro = false;
     }
     else if (keycode == DM_CLEAR) {
@@ -231,18 +231,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
 
     if (try_dynamic_macro && !process_record_dynamic_macro(keycode, record)) {
-        if (keycode == DYN_MACRO_PLAY1) {
+        if (keycode == QK_DYNAMIC_MACRO_PLAY_1) {
                 did_record_m1 = true;
         }
 
-        if (keycode == DYN_MACRO_PLAY2) {
+        if (keycode == QK_DYNAMIC_MACRO_PLAY_2) {
                 did_record_m2 = true;
         }
 
-        if (keycode == DYN_REC_START1 || keycode == DYN_REC_START2) {
+        if (keycode == QK_DYNAMIC_MACRO_RECORD_START_1 || keycode == QK_DYNAMIC_MACRO_RECORD_START_2) {
                 layer_move(LAYER_RECORD);
         }
-        else if (keycode == DYN_REC_STOP) {
+        else if (keycode == QK_DYNAMIC_MACRO_RECORD_STOP) {
                 layer_move(LAYER_COLEMAK);
         }
 
@@ -250,10 +250,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
 
     switch (keycode) {
-    case DYN_MACRO_PLAY1:
+    case QK_DYNAMIC_MACRO_PLAY_1:
         SEND_STRING(SENDSTRING_MM0);
         return false;
-    case DYN_MACRO_PLAY2:
+    case QK_DYNAMIC_MACRO_PLAY_2:
         SEND_STRING(SENDSTRING_MM1);
         return false;
     case MM_2:
diff --git a/keyboards/xiudi/xd75/keymaps/colinta/readme.md b/keyboards/xiudi/xd75/keymaps/colinta/readme.md
index e4e8049015..92c76e1315 100644
--- a/keyboards/xiudi/xd75/keymaps/colinta/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/colinta/readme.md
@@ -23,7 +23,7 @@ I've implemented my own "tap/hold" feature, identical in spirit to "Space Cadet"
 
 The function layer is only to switch to Qwerty (so other people can use this keyboard - also turns off sticky keys) and to start recording keypresses.
 
-I implemented "stop recording" in a unique way; starting a macro recording sends the keyboard layer to one that has all the macro keys assigned to `DYN_REC_STOP`, and restores the layer to the default when recording is stopped.
+I implemented "stop recording" in a unique way; starting a macro recording sends the keyboard layer to one that has all the macro keys assigned to `DM_RSTP`, and restores the layer to the default when recording is stopped.
 
 I wish Dynamic Macros supported more, because I'd like to record a third macro in the MACRO slot instead of hardcoding it.  I'm using these to store some passwords.
 
diff --git a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
index 4c9a61dcb4..353494f914 100644
--- a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
@@ -40,17 +40,17 @@ void macro_tog_key( qk_tap_dance_state_t *state, void *user_data ) {
 
   keyrecord_t kr;
   kr.event.pressed = false;
-  uint16_t action = DYN_REC_STOP;
+  uint16_t action = QK_DYNAMIC_MACRO_RECORD_STOP;
 
   if ( state->count == 1 ) {
-    action = DYN_MACRO_PLAY1;
+    action = QK_DYNAMIC_MACRO_PLAY_1;
   }
   else if ( state->count == 2 ) {
-    action = DYN_REC_STOP;
+    action = QK_DYNAMIC_MACRO_RECORD_STOP;
     kr.event.pressed = true;
   }
   else if ( state->count == 3 ) {
-    action = DYN_REC_START1;
+    action = QK_DYNAMIC_MACRO_RECORD_START_1;
   }
 
   process_record_dynamic_macro( action, &kr );
diff --git a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
index 4786b7c125..6ca644e460 100644
--- a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
@@ -7,9 +7,9 @@ enum custom_keycodes {
 
 #include "dynamic_macro.h"
 
-#define KC_REC DYN_REC_START1
-#define KC_DONE DYN_REC_STOP
-#define KC_PLAY DYN_MACRO_PLAY1
+#define KC_REC DM_REC1
+#define KC_DONE DM_RSTP
+#define KC_PLAY DM_PLY1
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/layouts/community/ergodox/colemak_code_friendly/keymap.c b/layouts/community/ergodox/colemak_code_friendly/keymap.c
index 1d537b331f..ae5bdcc5b8 100644
--- a/layouts/community/ergodox/colemak_code_friendly/keymap.c
+++ b/layouts/community/ergodox/colemak_code_friendly/keymap.c
@@ -103,17 +103,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_MUTE, KC_VOLD,    KC_VOLU, KC_TRNS,  KC_TRNS,
 
                                                        KC_TRNS,   KC_TRNS,
-                                                           DYN_REC_START1,
-                                        KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1,
+                                                           DM_REC1,
+                                        KC_TRNS, KC_TRNS, DM_PLY1,
   /* right hand */
   KC_TRNS, KC_TRNS,    KC_ASTR, KC_LPRN,  KC_RPRN,  KC_MINS,  KC_TRNS,
   KC_EQL,  M_LAMBDA,   KC_7,    KC_8,     KC_9,     KC_PLUS,  KC_TRNS,
            M_POINER,   KC_4,    KC_5,     KC_6,     KC_0,     KC_TRNS,
   KC_ENT,  M_NOT_EQL,  KC_1,    KC_2,     KC_3,     KC_TRNS,  KC_TRNS,
                        KC_0,    KC_COMM,  KC_DOT,   KC_TRNS,  KC_TRNS,
-  KC_TRNS, DYN_REC_STOP,
-  DYN_REC_START2,
-  DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS
+  KC_TRNS, DM_RSTP,
+  DM_REC2,
+  DM_PLY2, KC_TRNS, KC_TRNS
 ),
 /* Keymap 2: Left side -> LAYER_NUM,                             Right side -> Shift + LAYER_BASE
  *
@@ -145,8 +145,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_MUTE, KC_VOLD,    KC_VOLU, KC_TRNS,  KC_TRNS,
 
                                                        KC_TRNS,   KC_TRNS,
-                                                           DYN_REC_START1,
-                                        KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1,
+                                                           DM_REC1,
+                                        KC_TRNS, KC_TRNS, DM_PLY1,
   /* right hand */
   TG(1),          KC_AMPR,       KC_ASTR,       KC_LPRN,    KC_RPRN,    S(KC_MINS),  S(KC_BSPC),
   KC_UNDS,        S(KC_J),       S(KC_L),       S(KC_U),    S(KC_Y),    S(KC_SCLN),  S(KC_BSLS),
@@ -195,9 +195,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            M_POINER,    KC_4,    KC_5,     KC_6,     KC_0,     KC_TRNS,
   KC_ENT,  M_NOT_EQL,   KC_1,    KC_2,     KC_3,     KC_TRNS,  KC_TRNS,
                         KC_0,    KC_COMM,  KC_DOT,   KC_TRNS,  KC_TRNS,
-  KC_TRNS, DYN_REC_STOP,
-  DYN_REC_START2,
-  DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS
+  KC_TRNS, DM_RSTP,
+  DM_REC2,
+  DM_PLY2, KC_TRNS, KC_TRNS
 ),
 };
 
@@ -206,13 +206,13 @@ static bool recording_dynamic_macro;
 static bool process_record_dynamic_macro_wrapper(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     /* detect dynamic macro recording state */
-    case DYN_REC_START1:
-    case DYN_REC_START2:
+    case QK_DYNAMIC_MACRO_RECORD_START_1:
+    case QK_DYNAMIC_MACRO_RECORD_START_2:
       if (record->event.pressed) {
         recording_dynamic_macro = true;
       }
       break;
-    case DYN_REC_STOP:
+    case QK_DYNAMIC_MACRO_RECORD_STOP:
       if (record->event.pressed) {
         recording_dynamic_macro = false;
       }
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index 19c00e1b03..b07bc42aca 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -282,11 +282,11 @@ enum custom_keycodes {
 #  include "dynamic_macro.h"
 #else
    /* avoid ifdef's in keymap */
-#  define DYN_REC_START1 KC_TRNS
-#  define DYN_REC_START2 KC_TRNS
-#  define DYN_MACRO_PLAY1 KC_TRNS
-#  define DYN_MACRO_PLAY2 KC_TRNS
-#  define DYN_REC_STOP KC_TRNS
+#  define DM_REC1 KC_TRNS
+#  define DM_REC2 KC_TRNS
+#  define DM_PLY1 KC_TRNS
+#  define DM_PLY2 KC_TRNS
+#  define DM_RSTP KC_TRNS
 #endif
 
 #ifdef CFQ_USE_MOMENTARY_LAYER_KEYS
@@ -391,9 +391,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_ARROW_RMINUS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_BRACKET_IN_ANG, M_BRACKET_IN_BRC,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                               DYN_REC_START1,   DYN_REC_START2,
-                              K80(L1K0),       K80(L1K1),        DYN_MACRO_PLAY1,
-                              DYN_REC_STOP,    KC_TRNS,          DYN_MACRO_PLAY2,
+                                               DM_REC1,          DM_REC2,
+                              K80(L1K0),       K80(L1K1),        DM_PLY1,
+                              DM_RSTP,         KC_TRNS,          DM_PLY2,
   /* right hand */
   M_BRACKET_OUT_CBR, KC_TRNS,           KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,  KC_TRNS,
   M_BRACKET_OUT_PRN, M_ARROW_LEQL,      KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index d1c3d08e91..9e9096c33e 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -121,9 +121,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
-  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
-  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
+  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DM_REC1,         DM_REC2,         _______,             _______,           _______,              _______,  KC_DEL  ,
+  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DM_PLY1,         DM_PLY2,         KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
+  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DM_RSTP,         DM_RSTP,         KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______
 ),
 
diff --git a/quantum/dynamic_macro.h b/quantum/dynamic_macro.h
index fe9de6fa65..64c532e6ce 100644
--- a/quantum/dynamic_macro.h
+++ b/quantum/dynamic_macro.h
@@ -129,7 +129,7 @@ void dynamic_macro_record_end(keyrecord_t *macro_buffer, keyrecord_t *macro_poin
     dynamic_macro_led_blink();
 
     /* Do not save the keys being held when stopping the recording,
-     * i.e. the keys used to access the layer DYN_REC_STOP is on.
+     * i.e. the keys used to access the layer DM_RSTP is on.
      */
     while (macro_pointer != macro_buffer && (macro_pointer - direction)->event.pressed) {
         dprintln("dynamic macro: trimming a trailing key-down event");
@@ -202,18 +202,18 @@ bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
         /* No macro recording in progress. */
         if (!record->event.pressed) {
             switch (keycode) {
-                case DYN_REC_START1:
+                case QK_DYNAMIC_MACRO_RECORD_START_1:
                     dynamic_macro_record_start(&macro_pointer, macro_buffer);
                     macro_id = 1;
                     return false;
-                case DYN_REC_START2:
+                case QK_DYNAMIC_MACRO_RECORD_START_2:
                     dynamic_macro_record_start(&macro_pointer, r_macro_buffer);
                     macro_id = 2;
                     return false;
-                case DYN_MACRO_PLAY1:
+                case QK_DYNAMIC_MACRO_PLAY_1:
                     dynamic_macro_play(macro_buffer, macro_end, +1);
                     return false;
-                case DYN_MACRO_PLAY2:
+                case QK_DYNAMIC_MACRO_PLAY_2:
                     dynamic_macro_play(r_macro_buffer, r_macro_end, -1);
                     return false;
             }
@@ -221,7 +221,7 @@ bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
     } else {
         /* A macro is being recorded right now. */
         switch (keycode) {
-            case DYN_REC_STOP:
+            case QK_DYNAMIC_MACRO_RECORD_STOP:
                 /* Stop the macro recording. */
                 if (record->event.pressed) { /* Ignore the initial release
                                               * just after the recoding
@@ -237,8 +237,8 @@ bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
                     macro_id = 0;
                 }
                 return false;
-            case DYN_MACRO_PLAY1:
-            case DYN_MACRO_PLAY2:
+            case QK_DYNAMIC_MACRO_PLAY_1:
+            case QK_DYNAMIC_MACRO_PLAY_2:
                 dprintln("dynamic macro: ignoring macro play key while recording");
                 return false;
             default:
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index 41207092a9..c2e7e7716f 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -139,7 +139,7 @@ void dynamic_macro_record_end(keyrecord_t *macro_buffer, keyrecord_t *macro_poin
     dynamic_macro_record_end_user(direction);
 
     /* Do not save the keys being held when stopping the recording,
-     * i.e. the keys used to access the layer DYN_REC_STOP is on.
+     * i.e. the keys used to access the layer DM_RSTP is on.
      */
     while (macro_pointer != macro_buffer && (macro_pointer - direction)->event.pressed) {
         dprintln("dynamic macro: trimming a trailing key-down event");
@@ -212,18 +212,18 @@ bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
         /* No macro recording in progress. */
         if (!record->event.pressed) {
             switch (keycode) {
-                case DYN_REC_START1:
+                case QK_DYNAMIC_MACRO_RECORD_START_1:
                     dynamic_macro_record_start(&macro_pointer, macro_buffer);
                     macro_id = 1;
                     return false;
-                case DYN_REC_START2:
+                case QK_DYNAMIC_MACRO_RECORD_START_2:
                     dynamic_macro_record_start(&macro_pointer, r_macro_buffer);
                     macro_id = 2;
                     return false;
-                case DYN_MACRO_PLAY1:
+                case QK_DYNAMIC_MACRO_PLAY_1:
                     dynamic_macro_play(macro_buffer, macro_end, +1);
                     return false;
-                case DYN_MACRO_PLAY2:
+                case QK_DYNAMIC_MACRO_PLAY_2:
                     dynamic_macro_play(r_macro_buffer, r_macro_end, -1);
                     return false;
             }
@@ -231,13 +231,13 @@ bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
     } else {
         /* A macro is being recorded right now. */
         switch (keycode) {
-            case DYN_REC_START1:
-            case DYN_REC_START2:
-            case DYN_REC_STOP:
+            case QK_DYNAMIC_MACRO_RECORD_START_1:
+            case QK_DYNAMIC_MACRO_RECORD_START_2:
+            case QK_DYNAMIC_MACRO_RECORD_STOP:
                 /* Stop the macro recording. */
-                if (record->event.pressed ^ (keycode != DYN_REC_STOP)) { /* Ignore the initial release
-                                                                          * just after the recording
-                                                                          * starts for DYN_REC_STOP. */
+                if (record->event.pressed ^ (keycode != QK_DYNAMIC_MACRO_RECORD_STOP)) { /* Ignore the initial release
+                                                                                          * just after the recording
+                                                                                          * starts for DM_RSTP. */
                     switch (macro_id) {
                         case 1:
                             dynamic_macro_record_end(macro_buffer, macro_pointer, +1, &macro_end);
@@ -250,8 +250,8 @@ bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
                 }
                 return false;
 #ifdef DYNAMIC_MACRO_NO_NESTING
-            case DYN_MACRO_PLAY1:
-            case DYN_MACRO_PLAY2:
+            case QK_DYNAMIC_MACRO_PLAY_1:
+            case QK_DYNAMIC_MACRO_PLAY_2:
                 dprintln("dynamic macro: ignoring macro play key while recording");
                 return false;
 #endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 2f9e211cc1..2df733fe1f 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -424,11 +424,11 @@ enum quantum_keycodes {
     MAGIC_EE_HANDS_RIGHT,   // 5D03
 
     // Dynamic Macros
-    DYN_REC_START1,  // 5D04
-    DYN_REC_START2,  // 5D05
-    DYN_REC_STOP,    // 5D06
-    DYN_MACRO_PLAY1, // 5D07
-    DYN_MACRO_PLAY2, // 5D08
+    QK_DYNAMIC_MACRO_RECORD_START_1, // 5D04
+    QK_DYNAMIC_MACRO_RECORD_START_2, // 5D05
+    QK_DYNAMIC_MACRO_RECORD_STOP,    // 5D06
+    QK_DYNAMIC_MACRO_PLAY_1,         // 5D07
+    QK_DYNAMIC_MACRO_PLAY_2,         // 5D08
 
     // Joystick
     QK_JOYSTICK_BUTTON_0,  // 5D09
@@ -906,11 +906,11 @@ enum quantum_keycodes {
 #define MIDI_CHANNEL_MAX MI_CH16
 
 // Dynamic Macros aliases
-#define DM_REC1 DYN_REC_START1
-#define DM_REC2 DYN_REC_START2
-#define DM_RSTP DYN_REC_STOP
-#define DM_PLY1 DYN_MACRO_PLAY1
-#define DM_PLY2 DYN_MACRO_PLAY2
+#define DM_REC1 QK_DYNAMIC_MACRO_RECORD_START_1
+#define DM_REC2 QK_DYNAMIC_MACRO_RECORD_START_2
+#define DM_RSTP QK_DYNAMIC_MACRO_RECORD_STOP
+#define DM_PLY1 QK_DYNAMIC_MACRO_PLAY_1
+#define DM_PLY2 QK_DYNAMIC_MACRO_PLAY_2
 
 // Joystick aliases
 #define JS_0 QK_JOYSTICK_BUTTON_0
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 68771baece..8f325251bc 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -38,6 +38,12 @@
 #define UC_M_WC QK_UNICODE_MODE_WINCOMPOSE
 #define UC_M_EM QK_UNICODE_MODE_EMACS
 
+#define DYN_REC_START1 QK_DYNAMIC_MACRO_RECORD_START_1
+#define DYN_REC_START2 QK_DYNAMIC_MACRO_RECORD_START_2
+#define DYN_REC_STOP QK_DYNAMIC_MACRO_RECORD_STOP
+#define DYN_MACRO_PLAY1 QK_DYNAMIC_MACRO_PLAY_1
+#define DYN_MACRO_PLAY2 QK_DYNAMIC_MACRO_PLAY_2
+
 #define PROGRAMMABLE_BUTTON_1 QK_PROGRAMMABLE_BUTTON_1
 #define PROGRAMMABLE_BUTTON_2 QK_PROGRAMMABLE_BUTTON_2
 #define PROGRAMMABLE_BUTTON_3 QK_PROGRAMMABLE_BUTTON_3
diff --git a/users/klackygears/tap_dances.c b/users/klackygears/tap_dances.c
index af4f187fcc..9f706d2b7f 100644
--- a/users/klackygears/tap_dances.c
+++ b/users/klackygears/tap_dances.c
@@ -7,17 +7,17 @@ void macroTogKey(qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1)
   {
     kr.event.pressed = false;
-    process_record_dynamic_macro( DYN_MACRO_PLAY1, &kr );
+    process_record_dynamic_macro( DM_PLY1, &kr );
   }
   else if (state->count == 2)
   {
     kr.event.pressed = true;
-    process_record_dynamic_macro( DYN_REC_STOP, &kr );
+    process_record_dynamic_macro( DM_RSTP, &kr );
   }
   else if (state->count == 3)
   {
     kr.event.pressed = false;
-    process_record_dynamic_macro( DYN_REC_START1, &kr );
+    process_record_dynamic_macro( QK_DYNAMIC_MACRO_RECORD_START_1, &kr );
   }
 }
 
@@ -27,17 +27,17 @@ void macroTogKey2(qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1)
   {
     kr.event.pressed = false;
-    process_record_dynamic_macro( DYN_MACRO_PLAY2, &kr );
+    process_record_dynamic_macro( DM_PLY2, &kr );
   }
   else if (state->count == 2)
   {
     kr.event.pressed = true;
-    process_record_dynamic_macro( DYN_REC_STOP, &kr );
+    process_record_dynamic_macro( DM_RSTP, &kr );
   }
   else if (state->count == 3)
   {
     kr.event.pressed = false;
-    process_record_dynamic_macro( DYN_REC_START2, &kr );
+    process_record_dynamic_macro( DM_REC2, &kr );
   }
 }
 */

From 1249f74b31863bc0118057884abae10de698e4a5 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 3 Nov 2022 23:42:58 +0000
Subject: [PATCH 787/959] Reduce includes for caps_word header (#18948)

---
 quantum/caps_word.c |  6 ++++++
 quantum/caps_word.h | 25 +++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/quantum/caps_word.c b/quantum/caps_word.c
index 5b83659f28..66fd0e8afb 100644
--- a/quantum/caps_word.c
+++ b/quantum/caps_word.c
@@ -12,7 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdint.h>
 #include "caps_word.h"
+#include "timer.h"
+#include "action.h"
+#include "action_util.h"
 
 /** @brief True when Caps Word is active. */
 static bool caps_word_active = false;
@@ -36,6 +40,8 @@ void caps_word_task(void) {
 void caps_word_reset_idle_timer(void) {
     idle_timer = timer_read() + CAPS_WORD_IDLE_TIMEOUT;
 }
+#else
+void caps_word_task(void) {}
 #endif // CAPS_WORD_IDLE_TIMEOUT > 0
 
 void caps_word_on(void) {
diff --git a/quantum/caps_word.h b/quantum/caps_word.h
index b83f73371e..078d29ead0 100644
--- a/quantum/caps_word.h
+++ b/quantum/caps_word.h
@@ -14,26 +14,31 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
 
 #ifndef CAPS_WORD_IDLE_TIMEOUT
 #    define CAPS_WORD_IDLE_TIMEOUT 5000 // Default timeout of 5 seconds.
-#endif                                  // CAPS_WORD_IDLE_TIMEOUT
+#endif
 
-#if CAPS_WORD_IDLE_TIMEOUT > 0
 /** @brief Matrix scan task for Caps Word feature */
 void caps_word_task(void);
 
+#if CAPS_WORD_IDLE_TIMEOUT > 0
 /** @brief Resets timer for Caps Word idle timeout. */
 void caps_word_reset_idle_timer(void);
-#else
-static inline void caps_word_task(void) {}
-#endif // CAPS_WORD_IDLE_TIMEOUT > 0
+#endif
 
-void caps_word_on(void);     /**< Activates Caps Word. */
-void caps_word_off(void);    /**< Deactivates Caps Word. */
-void caps_word_toggle(void); /**< Toggles Caps Word. */
-bool is_caps_word_on(void);  /**< Gets whether currently active. */
+/** @brief Activates Caps Word. */
+void caps_word_on(void);
+
+/** @brief Deactivates Caps Word. */
+void caps_word_off(void);
+
+/** @brief Toggles Caps Word. */
+void caps_word_toggle(void);
+
+/** @brief Gets whether currently active. */
+bool is_caps_word_on(void);
 
 /**
  * @brief Caps Word set callback.

From fb96b88842f4481df8942768f43813b489ca5c3a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 4 Nov 2022 00:50:59 +0000
Subject: [PATCH 788/959] Reduce includes for wpm header (#18949)

---
 quantum/wpm.c | 4 +++-
 quantum/wpm.h | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/quantum/wpm.c b/quantum/wpm.c
index b2e6fe0430..6a4e39a8d6 100644
--- a/quantum/wpm.c
+++ b/quantum/wpm.c
@@ -16,7 +16,9 @@
  */
 
 #include "wpm.h"
-
+#include "timer.h"
+#include "keycode.h"
+#include "quantum_keycodes.h"
 #include <math.h>
 
 // WPM Stuff
diff --git a/quantum/wpm.h b/quantum/wpm.h
index 305d75b450..87a55fd422 100644
--- a/quantum/wpm.h
+++ b/quantum/wpm.h
@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 #ifndef WPM_ESTIMATED_WORD_SIZE
 #    define WPM_ESTIMATED_WORD_SIZE 5

From 8213eb7fbb979ee20c5394f1281713b76bde86e5 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Nov 2022 15:13:26 +1100
Subject: [PATCH 789/959] Fix DD warnings for RGBKB boards (#18944)

---
 keyboards/rgbkb/mun/config.h  | 7 ++++---
 keyboards/rgbkb/sol/config.h  | 4 +++-
 keyboards/rgbkb/sol3/config.h | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 269b215786..bcf4c59b65 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -80,8 +80,8 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#define RGB_MATRIX_LED_COUNT 98
+#define RGB_MATRIX_SPLIT { 49, 49 }
 #define RGB_MATRIX_CENTER { 128, 34 }
 #define RGB_MATRIX_LED_FLUSH_LIMIT 33
 #define RGB_MATRIX_LED_PROCESS_LIMIT 10
@@ -139,10 +139,11 @@
 
 #if RGB_UNLIMITED_POWER
   #define RGBLIGHT_LIMIT_VAL 255
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #else
   #define RGBLIGHT_LIMIT_VAL 127
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 127
 #endif
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index f8c07b974e..1a477acad9 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -42,12 +42,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 40
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40
 #elif RGBLIGHT_FULL_POWER
   #define RGBLIGHT_LIMIT_VAL 255
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #else
   #define RGBLIGHT_LIMIT_VAL 120
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #endif
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 9689f65356..1ab4cddc9b 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -96,10 +96,10 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#define RGB_MATRIX_LED_COUNT 156
+#define RGB_MATRIX_SPLIT { 78, 78 }
 #define RGB_MATRIX_CENTER { 81, 28 }
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_LED_FLUSH_LIMIT 33
 #define RGB_MATRIX_LED_PROCESS_LIMIT 10
 #define RGB_DISABLE_WHEN_USB_SUSPENDED

From ea98aa8e5ef8bebac52a76ad22ddd22e6d7f289e Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 4 Nov 2022 11:54:35 +0000
Subject: [PATCH 790/959] Reduce includes for dip_switch header (#18951)

---
 quantum/dip_switch.c | 8 +++++---
 quantum/dip_switch.h | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index e180cfccdf..6e254578d1 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -16,14 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h> // for memcpy
+
 #include "dip_switch.h"
+#include "gpio.h"
+#include "util.h"
+
 #ifdef SPLIT_KEYBOARD
 #    include "split_common/split_util.h"
 #endif
 
-// for memcpy
-#include <string.h>
-
 #if !defined(DIP_SWITCH_PINS) && !defined(DIP_SWITCH_MATRIX_GRID)
 #    error "Either DIP_SWITCH_PINS or DIP_SWITCH_MATRIX_GRID must be defined."
 #endif
diff --git a/quantum/dip_switch.h b/quantum/dip_switch.h
index 058a10f41f..6e79dcb0bf 100644
--- a/quantum/dip_switch.h
+++ b/quantum/dip_switch.h
@@ -18,7 +18,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 bool dip_switch_update_kb(uint8_t index, bool active);
 bool dip_switch_update_user(uint8_t index, bool active);

From f82e90bdeaab1b2ec5c96716731f0a4c63193de9 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 5 Nov 2022 06:20:11 +1100
Subject: [PATCH 791/959] Formalise keyboard- and user-specific EEPROM blocks
 (#18874)

* Formalise keyboard and user eeconfig datablocks.

* Add debounce helper that checks a condition and issues post-write function invocation.

* Naming.
---
 quantum/dynamic_keymap.c |  4 +--
 quantum/eeconfig.c       | 66 +++++++++++++++++++++++++++++++++++++
 quantum/eeconfig.h       | 70 ++++++++++++++++++++++++++++++++++++----
 3 files changed, 130 insertions(+), 10 deletions(-)

diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index d800bbab84..e9529ed14e 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -24,9 +24,7 @@
 #    include "via.h" // for VIA_EEPROM_CONFIG_END
 #    define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
 #else
-#    ifndef DYNAMIC_KEYMAP_EEPROM_START
-#        define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
-#    endif
+#    define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
 #endif
 
 #ifdef ENCODER_ENABLE
diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 2e2df11d69..3b4d690e42 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include "eeprom.h"
@@ -23,13 +24,17 @@ void eeconfig_init_via(void);
  * FIXME: needs doc
  */
 __attribute__((weak)) void eeconfig_init_user(void) {
+#if (EECONFIG_USER_DATA_SIZE) == 0
     // Reset user EEPROM value to blank, rather than to a set value
     eeconfig_update_user(0);
+#endif
 }
 
 __attribute__((weak)) void eeconfig_init_kb(void) {
+#if (EECONFIG_KB_DATA_SIZE) == 0
     // Reset Keyboard EEPROM value to blank, rather than to a set value
     eeconfig_update_kb(0);
+#endif
 
     eeconfig_init_user();
 }
@@ -64,6 +69,19 @@ void eeconfig_init_quantum(void) {
     // when a haptic-enabled firmware is loaded onto the keyboard.
     eeprom_update_dword(EECONFIG_HAPTIC, 0);
 #endif
+
+#if (EECONFIG_KB_DATA_SIZE) > 0
+    eeprom_update_dword(EECONFIG_KEYBOARD, (EECONFIG_KB_DATA_VERSION));
+    uint8_t dummy_kb[(EECONFIG_KB_DATA_SIZE)] = {0};
+    eeprom_update_block(EECONFIG_KB_DATABLOCK, dummy_kb, (EECONFIG_KB_DATA_SIZE));
+#endif
+
+#if (EECONFIG_USER_DATA_SIZE) > 0
+    eeprom_update_dword(EECONFIG_USER, (EECONFIG_USER_DATA_VERSION));
+    uint8_t dummy_user[(EECONFIG_USER_DATA_SIZE)] = {0};
+    eeprom_update_block(EECONFIG_USER_DATABLOCK, dummy_user, (EECONFIG_USER_DATA_SIZE));
+#endif
+
 #if defined(VIA_ENABLE)
     // Invalidate VIA eeprom config, and then reset.
     // Just in case if power is lost mid init, this makes sure that it pets
@@ -190,6 +208,7 @@ void eeconfig_update_audio(uint8_t val) {
     eeprom_update_byte(EECONFIG_AUDIO, val);
 }
 
+#if (EECONFIG_KB_DATA_SIZE) == 0
 /** \brief eeconfig read kb
  *
  * FIXME: needs doc
@@ -204,7 +223,9 @@ uint32_t eeconfig_read_kb(void) {
 void eeconfig_update_kb(uint32_t val) {
     eeprom_update_dword(EECONFIG_KEYBOARD, val);
 }
+#endif // (EECONFIG_KB_DATA_SIZE) == 0
 
+#if (EECONFIG_USER_DATA_SIZE) == 0
 /** \brief eeconfig read user
  *
  * FIXME: needs doc
@@ -219,6 +240,7 @@ uint32_t eeconfig_read_user(void) {
 void eeconfig_update_user(uint32_t val) {
     eeprom_update_dword(EECONFIG_USER, val);
 }
+#endif // (EECONFIG_USER_DATA_SIZE) == 0
 
 /** \brief eeconfig read haptic
  *
@@ -249,3 +271,47 @@ bool eeconfig_read_handedness(void) {
 void eeconfig_update_handedness(bool val) {
     eeprom_update_byte(EECONFIG_HANDEDNESS, !!val);
 }
+
+#if (EECONFIG_KB_DATA_SIZE) > 0
+/** \brief eeconfig read keyboard data block
+ *
+ * FIXME: needs doc
+ */
+void eeconfig_read_kb_datablock(void *data) {
+    if (eeprom_read_dword(EECONFIG_KEYBOARD) == (EECONFIG_KB_DATA_VERSION)) {
+        eeprom_read_block(data, EECONFIG_KB_DATABLOCK, (EECONFIG_KB_DATA_SIZE));
+    } else {
+        memset(data, 0, (EECONFIG_KB_DATA_SIZE));
+    }
+}
+/** \brief eeconfig update keyboard data block
+ *
+ * FIXME: needs doc
+ */
+void eeconfig_update_kb_datablock(const void *data) {
+    eeprom_update_dword(EECONFIG_KEYBOARD, (EECONFIG_KB_DATA_VERSION));
+    eeprom_update_block(data, EECONFIG_KB_DATABLOCK, (EECONFIG_KB_DATA_SIZE));
+}
+#endif // (EECONFIG_KB_DATA_SIZE) > 0
+
+#if (EECONFIG_USER_DATA_SIZE) > 0
+/** \brief eeconfig read user data block
+ *
+ * FIXME: needs doc
+ */
+void eeconfig_read_user_datablock(void *data) {
+    if (eeprom_read_dword(EECONFIG_USER) == (EECONFIG_USER_DATA_VERSION)) {
+        eeprom_read_block(data, EECONFIG_USER_DATABLOCK, (EECONFIG_USER_DATA_SIZE));
+    } else {
+        memset(data, 0, (EECONFIG_USER_DATA_SIZE));
+    }
+}
+/** \brief eeconfig update user data block
+ *
+ * FIXME: needs doc
+ */
+void eeconfig_update_user_datablock(const void *data) {
+    eeprom_update_dword(EECONFIG_USER, (EECONFIG_USER_DATA_VERSION));
+    eeprom_update_block(data, EECONFIG_USER_DATABLOCK, (EECONFIG_USER_DATA_SIZE));
+}
+#endif // (EECONFIG_USER_DATA_SIZE) > 0
diff --git a/quantum/eeconfig.h b/quantum/eeconfig.h
index 9c4617c962..9fc563d09c 100644
--- a/quantum/eeconfig.h
+++ b/quantum/eeconfig.h
@@ -50,8 +50,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EECONFIG_LED_MATRIX_EXTENDED (uint16_t *)32
 #define EECONFIG_RGB_MATRIX_EXTENDED (uint16_t *)32
 
+// Size of EEPROM being used for core data storage
+#define EECONFIG_BASE_SIZE 34
+
+// Size of EEPROM dedicated to keyboard- and user-specific data
+#ifndef EECONFIG_KB_DATA_SIZE
+#    define EECONFIG_KB_DATA_SIZE 0
+#endif
+#ifndef EECONFIG_KB_DATA_VERSION
+#    define EECONFIG_KB_DATA_VERSION (EECONFIG_KB_DATA_SIZE)
+#endif
+#ifndef EECONFIG_USER_DATA_SIZE
+#    define EECONFIG_USER_DATA_SIZE 0
+#endif
+#ifndef EECONFIG_USER_DATA_VERSION
+#    define EECONFIG_USER_DATA_VERSION (EECONFIG_USER_DATA_SIZE)
+#endif
+
+#define EECONFIG_KB_DATABLOCK ((uint8_t *)(EECONFIG_BASE_SIZE))
+#define EECONFIG_USER_DATABLOCK ((uint8_t *)((EECONFIG_BASE_SIZE) + (EECONFIG_KB_DATA_SIZE)))
+
 // Size of EEPROM being used, other code can refer to this for available EEPROM
-#define EECONFIG_SIZE 34
+#define EECONFIG_SIZE ((EECONFIG_BASE_SIZE) + (EECONFIG_KB_DATA_SIZE) + (EECONFIG_USER_DATA_SIZE))
+
 /* debug bit */
 #define EECONFIG_DEBUG_ENABLE (1 << 0)
 #define EECONFIG_DEBUG_MATRIX (1 << 1)
@@ -94,10 +115,15 @@ uint8_t eeconfig_read_audio(void);
 void    eeconfig_update_audio(uint8_t val);
 #endif
 
+#if (EECONFIG_KB_DATA_SIZE) == 0
 uint32_t eeconfig_read_kb(void);
 void     eeconfig_update_kb(uint32_t val);
+#endif // (EECONFIG_KB_DATA_SIZE) == 0
+
+#if (EECONFIG_USER_DATA_SIZE) == 0
 uint32_t eeconfig_read_user(void);
 void     eeconfig_update_user(uint32_t val);
+#endif // (EECONFIG_USER_DATA_SIZE) == 0
 
 #ifdef HAPTIC_ENABLE
 uint32_t eeconfig_read_haptic(void);
@@ -107,16 +133,36 @@ void     eeconfig_update_haptic(uint32_t val);
 bool eeconfig_read_handedness(void);
 void eeconfig_update_handedness(bool val);
 
-#define EECONFIG_DEBOUNCE_HELPER(name, offset, config)                  \
+#if (EECONFIG_KB_DATA_SIZE) > 0
+void eeconfig_read_kb_datablock(void *data);
+void eeconfig_update_kb_datablock(const void *data);
+#endif // (EECONFIG_KB_DATA_SIZE) > 0
+
+#if (EECONFIG_USER_DATA_SIZE) > 0
+void eeconfig_read_user_datablock(void *data);
+void eeconfig_update_user_datablock(const void *data);
+#endif // (EECONFIG_USER_DATA_SIZE) > 0
+
+// Any "checked" debounce variant used requires implementation of:
+//    -- bool eeconfig_check_valid_##name(void)
+//    -- void eeconfig_post_flush_##name(void)
+#define EECONFIG_DEBOUNCE_HELPER_CHECKED(name, offset, config)          \
     static uint8_t dirty_##name = false;                                \
                                                                         \
+    bool eeconfig_check_valid_##name(void);                             \
+    void eeconfig_post_flush_##name(void);                              \
+                                                                        \
     static inline void eeconfig_init_##name(void) {                     \
-        eeprom_read_block(&config, offset, sizeof(config));             \
-        dirty_##name = false;                                           \
+        dirty_##name = true;                                            \
+        if (eeconfig_check_valid_##name()) {                            \
+            eeprom_read_block(&config, offset, sizeof(config));         \
+            dirty_##name = false;                                       \
+        }                                                               \
     }                                                                   \
     static inline void eeconfig_flush_##name(bool force) {              \
         if (force || dirty_##name) {                                    \
             eeprom_update_block(&config, offset, sizeof(config));       \
+            eeconfig_post_flush_##name();                               \
             dirty_##name = false;                                       \
         }                                                               \
     }                                                                   \
@@ -130,7 +176,17 @@ void eeconfig_update_handedness(bool val);
     static inline void eeconfig_flag_##name(bool v) {                   \
         dirty_##name |= v;                                              \
     }                                                                   \
-    static inline void eeconfig_write_##name(typeof(config) conf) {     \
-        memcpy(&config, &conf, sizeof(config));                         \
-        eeconfig_flag_##name(true);                                     \
+    static inline void eeconfig_write_##name(typeof(config) *conf) {    \
+        if (memcmp(&config, conf, sizeof(config)) != 0) {               \
+            memcpy(&config, conf, sizeof(config));                      \
+            eeconfig_flag_##name(true);                                 \
+        }                                                               \
     }
+
+#define EECONFIG_DEBOUNCE_HELPER(name, offset, config)     \
+    EECONFIG_DEBOUNCE_HELPER_CHECKED(name, offset, config) \
+                                                           \
+    bool eeconfig_check_valid_##name(void) {               \
+        return true;                                       \
+    }                                                      \
+    void eeconfig_post_flush_##name(void) {}

From 54682f961e5d4eb1ea66aaec36303800842b7fc3 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 5 Nov 2022 13:48:00 +1100
Subject: [PATCH 792/959] Fix "no matrix definition" errors for some boards
 (#18954)

---
 keyboards/acheron/arctic/arctic.h             |  14 +
 keyboards/acheron/arctic/info.json            | 136 ++++++-
 keyboards/bpiphany/pegasushoof/2013/info.json | 282 ++++++++++++-
 keyboards/bpiphany/pegasushoof/2015/info.json | 374 +++++++++++++++++-
 keyboards/bpiphany/pegasushoof/info.json      | 372 -----------------
 keyboards/ergodox_stm32/info.json             |  49 +--
 keyboards/eyeohdesigns/babyv/info.json        |   4 +-
 keyboards/geekboards/macropad_v2/info.json    |  51 +--
 keyboards/handwired/fruity60/info.json        |   2 +-
 keyboards/handwired/swiftrax/bebol/info.json  |   2 +-
 keyboards/sneakbox/disarray/ortho/info.json   |   2 +-
 keyboards/spaceholdings/nebula12/info.json    |  18 +-
 .../nebula12/keymaps/default/keymap.c         |   8 +-
 .../nebula12/keymaps/via/keymap.c             |   8 +-
 keyboards/spaceholdings/nebula12/nebula12.h   |  10 +-
 15 files changed, 847 insertions(+), 485 deletions(-)

diff --git a/keyboards/acheron/arctic/arctic.h b/keyboards/acheron/arctic/arctic.h
index 19c9385cc1..91a1976d59 100644
--- a/keyboards/acheron/arctic/arctic.h
+++ b/keyboards/acheron/arctic/arctic.h
@@ -21,6 +21,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ___ KC_NO
 
+#define LAYOUT_60_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           \
+    K40, K41, K42,                K46,           K49, K4A, K4B            \
+) { \
+    {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \
+    {  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \
+    {  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___}, \
+    {  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___}, \
+    {  K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, ___, ___} \
+}
+
 #define LAYOUT_60_tsangan_hhkb( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,\
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     \
diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json
index 4c249a31d3..a0102aaaab 100644
--- a/keyboards/acheron/arctic/info.json
+++ b/keyboards/acheron/arctic/info.json
@@ -10,10 +10,142 @@
     },
     "layouts": {
         "LAYOUT_60_ansi_tsangan": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Fn", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
         },
         "LAYOUT_60_tsangan_hhkb": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Fn", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"|", "x":13, "y":0},
+                {"label":"Del", "x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":13.25, "y":3, "w":1.75},
+                {"label":"Fn", "x":12.25, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/info.json
index c96b6ba06c..a3fdff3338 100644
--- a/keyboards/bpiphany/pegasushoof/2013/info.json
+++ b/keyboards/bpiphany/pegasushoof/2013/info.json
@@ -1,3 +1,283 @@
 {
-    "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013"
+    "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"`", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"x":3.75, "y":5.5, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"`", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"x":3.75, "y":5.5, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_jis": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"Half-width/Full-width", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"^", "x":12, "y":1.5},
+                {"label":"Yen", "x":13, "y":1.5},
+                {"label":"Backspace", "x":14, "y":1.5},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"@", "x":11.5, "y":2.5},
+                {"label":"[", "x":12.5, "y":2.5},
+                {"label":"Del", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":":", "x":11.75, "y":3.5},
+                {"label":"]", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"\\", "x":12.25, "y":4.5},
+                {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"label":"Muhenkan", "x":3.5, "y":5.5},
+                {"label":"Space", "x":4.5, "y":5.5, "w":4.5},
+                {"label":"Henkan", "x":9, "y":5.5, "w":1.25},
+                {"label":"Kana", "x":10.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":12.75, "y":5.5},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json
index 8af38d9501..9293a72bcb 100644
--- a/keyboards/bpiphany/pegasushoof/2015/info.json
+++ b/keyboards/bpiphany/pegasushoof/2015/info.json
@@ -1,3 +1,375 @@
 {
-    "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2015"
+    "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2015",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"`", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"x":3.75, "y":5.5, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"`", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"x":3.75, "y":5.5, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"`", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"#", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"↑", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"x":3.75, "y":5.5, "w":6.25},
+                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"App", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"←", "x":15.25, "y":5.5},
+                {"label":"↓", "x":16.25, "y":5.5},
+                {"label":"→", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_jis": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"Half-width/Full-width", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"^", "x":12, "y":1.5},
+                {"label":"Yen", "x":13, "y":1.5},
+                {"label":"Backspace", "x":14, "y":1.5},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"@", "x":11.5, "y":2.5},
+                {"label":"[", "x":12.5, "y":2.5},
+                {"label":"Del", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":":", "x":11.75, "y":3.5},
+                {"label":"]", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"\\", "x":12.25, "y":4.5},
+                {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"label":"Muhenkan", "x":3.5, "y":5.5},
+                {"label":"Space", "x":4.5, "y":5.5, "w":4.5},
+                {"label":"Henkan", "x":9, "y":5.5, "w":1.25},
+                {"label":"Kana", "x":10.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":12.75, "y":5.5},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/bpiphany/pegasushoof/info.json b/keyboards/bpiphany/pegasushoof/info.json
index 2869e9f763..102304092a 100644
--- a/keyboards/bpiphany/pegasushoof/info.json
+++ b/keyboards/bpiphany/pegasushoof/info.json
@@ -6,377 +6,5 @@
     "vid": "0xFEED",
     "pid": "0x6050",
     "device_version": "1.0.4"
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":"'", "x":11.75, "y":3.5},
-        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-        {"label":"ISO \\", "x":1.25, "y":4.5},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"x":3.75, "y":5.5, "w":6.25},
-        {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5}
-      ]
-    },
-    "LAYOUT_tkl_ansi": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":"'", "x":11.75, "y":3.5},
-        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"x":3.75, "y":5.5, "w":6.25},
-        {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5}
-      ]
-    },
-    "LAYOUT_tkl_iso": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":"'", "x":11.75, "y":3.5},
-        {"label":"#", "x":12.75, "y":3.5},
-        {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-        {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-        {"label":"\\", "x":1.25, "y":4.5},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"↑", "x":16.25, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"x":3.75, "y":5.5, "w":6.25},
-        {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"App", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"←", "x":15.25, "y":5.5},
-        {"label":"↓", "x":16.25, "y":5.5},
-        {"label":"→", "x":17.25, "y":5.5}
-      ]
-    },
-    "LAYOUT_tkl_jis": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"Half-width/Full-width", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"^", "x":12, "y":1.5},
-        {"label":"Yen", "x":13, "y":1.5},
-        {"label":"Backspace", "x":14, "y":1.5},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"@", "x":11.5, "y":2.5},
-        {"label":"[", "x":12.5, "y":2.5},
-        {"label":"Del", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":":", "x":11.75, "y":3.5},
-        {"label":"]", "x":12.75, "y":3.5},
-        {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"\\", "x":12.25, "y":4.5},
-        {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5},
-        {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-        {"label":"Muhenkan", "x":3.5, "y":5.5},
-        {"label":"Space", "x":4.5, "y":5.5, "w":4.5},
-        {"label":"Henkan", "x":9, "y":5.5, "w":1.25},
-        {"label":"Kana", "x":10.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
-        {"label":"Fn", "x":12.75, "y":5.5},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5}
-      ]
-    }
   }
 }
diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json
index e93c71e29c..73e2d7f532 100644
--- a/keyboards/ergodox_stm32/info.json
+++ b/keyboards/ergodox_stm32/info.json
@@ -55,53 +55,6 @@
                                                             {"x":7, "y":6},      {"x":9, "y":6},
               {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
             ]
-        },
-        "LAYOUT_ergodox_80": {
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-
-                                          {"x":6, "y":5}, {"x":7, "y":5},
-                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},
-                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},
-
-
-                          {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                          {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                                        {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                          {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                              {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
-
-
-            {"x":9, "y":5}, {"x":10, "y":5},
-            {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-            {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-          ]
-      },
-        "LAYOUT_ergodox_pretty_80": {
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-            {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                  {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
-
-                                          {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},      {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-          ]
-      }
+        }
     }
 }
diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json
index 65453ffaf6..ec9c66cec8 100644
--- a/keyboards/eyeohdesigns/babyv/info.json
+++ b/keyboards/eyeohdesigns/babyv/info.json
@@ -15,10 +15,10 @@
 		"LAYOUT_1u": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"label":"Ctl", "x":0, "y":3}, {"label":"Alt", "x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"label":"Fn", "x":9, "y":3}, {"label":"OS", "x":12, "y":3}]
         },
-		"LAYOUT_1u2u": {
+		"LAYOUT_1u_2u": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"x":0, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"label":"OS", "x":12, "y":3}]
         },
-		"LAYOUT_2u1u": {
+		"LAYOUT_2u_1u": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"x":0, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"label":"OS", "x":12, "y":3}]
         }
 		
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index b62620af9b..bac03b43f1 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -9,48 +9,17 @@
     "device_version": "0.0.2"
   },
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_ortho_2x4": {
       "layout": [
-        {
-          "label": "K0",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "K1",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "K2",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "K3",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "K4",
-          "x": 0,
-          "y": 1
-        },
-        {
-          "label": "K5",
-          "x": 1,
-          "y": 1
-        },
-        {
-          "label": "K6",
-          "x": 2,
-          "y": 1
-        },
-        {
-          "label": "K7",
-          "x": 3,
-          "y": 1
-        }
+        {"label": "K0", "x": 0, "y": 0},
+        {"label": "K1", "x": 1, "y": 0},
+        {"label": "K2", "x": 2, "y": 0},
+        {"label": "K3", "x": 3, "y": 0},
+
+        {"label": "K4", "x": 0, "y": 1},
+        {"label": "K5", "x": 1, "y": 1},
+        {"label": "K6", "x": 2, "y": 1},
+        {"label": "K7", "x": 3, "y": 1}
       ]
     }
   }
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
index 40e38795e8..3a6d3d7a6e 100644
--- a/keyboards/handwired/fruity60/info.json
+++ b/keyboards/handwired/fruity60/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Menu", "x":13.5, "y":4, "w":1.5}]
         }
     }
diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/info.json
index 0f4ddd0d95..c25284ac9f 100644
--- a/keyboards/handwired/swiftrax/bebol/info.json
+++ b/keyboards/handwired/swiftrax/bebol/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
         }
     }
diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json
index 5172c0c963..46e163e484 100644
--- a/keyboards/sneakbox/disarray/ortho/info.json
+++ b/keyboards/sneakbox/disarray/ortho/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "layouts": {
-      "LAYOUT_all": {
+      "LAYOUT": {
           "layout": [
               {"y":0, "x":0},
               {"y":1, "x":0},{"y":1, "x":1},{"y":1, "x":2},{"y":1, "x":3},{"y":1, "x":4},{"y":1, "x":5},{"y":1, "x":6},{"y":1, "x":7},{"y":1, "x":8},{"y":1, "x":9},{"y":1, "x":10},{"y":1, "x":11},{"y":1, "x":12},{"y":1, "x":13},{"y":1, "x":14},{"y":1, "x":15},
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
index aca8ea5f69..a48f88c814 100755
--- a/keyboards/spaceholdings/nebula12/info.json
+++ b/keyboards/spaceholdings/nebula12/info.json
@@ -9,9 +9,23 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT_68_ansi": {
+        "LAYOUT_ortho_4x3": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3}
             ]
         }
     }
diff --git a/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
index 670d25e732..f7ec10f881 100755
--- a/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
+++ b/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
@@ -16,25 +16,25 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT_ortho_4x3( /* Base */
     KC_P7, KC_P8, KC_P9,
     KC_P4, KC_P5, KC_P6,
     KC_P1, KC_P2, KC_P3,
     MO(1), KC_P0, KC_PDOT),
 
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT_ortho_4x3( /* FN */
     RGB_TOG, RGB_MOD, KC_TRNS,
     EF_DEC,  EF_INC,  KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_PENT),
 
-[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+[2] = LAYOUT_ortho_4x3( /* 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),
 
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+[3] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
index 670d25e732..f7ec10f881 100755
--- a/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
+++ b/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
@@ -16,25 +16,25 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT_ortho_4x3( /* Base */
     KC_P7, KC_P8, KC_P9,
     KC_P4, KC_P5, KC_P6,
     KC_P1, KC_P2, KC_P3,
     MO(1), KC_P0, KC_PDOT),
 
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT_ortho_4x3( /* FN */
     RGB_TOG, RGB_MOD, KC_TRNS,
     EF_DEC,  EF_INC,  KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_PENT),
 
-[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+[2] = LAYOUT_ortho_4x3( /* 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),
 
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+[3] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/spaceholdings/nebula12/nebula12.h b/keyboards/spaceholdings/nebula12/nebula12.h
index 1c73fbdaec..cc08bce5e6 100755
--- a/keyboards/spaceholdings/nebula12/nebula12.h
+++ b/keyboards/spaceholdings/nebula12/nebula12.h
@@ -22,14 +22,14 @@
 
 // This a shortcut to help you visually see your layout.
 
-#define LAYOUT_all( \
+#define LAYOUT_ortho_4x3( \
     K00, K01, K02, \
     K10, K11, K12, \
     K20, K21, K22, \
     K30, K31, K32 \
 ) { \
-    { K00, K01, K02, }, \
-    { K10, K11, K12, }, \
-    { K20, K21, K22, }, \
-    { K30, K31, K32, }  \
+    { K00, K01, K02 }, \
+    { K10, K11, K12 }, \
+    { K20, K21, K22 }, \
+    { K30, K31, K32 }  \
 }

From a070c4c50134cf274a674ee73227289fde81b8ed Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 5 Nov 2022 08:12:37 +0000
Subject: [PATCH 793/959] Remove hardcoded VIA keycode range (#18956)

---
 keyboards/cannonkeys/satisfaction75/satisfaction75.h | 2 +-
 keyboards/nullbitsco/nibble/keymaps/via/keymap.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
index c6dbc31f1b..ea71345a38 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
@@ -25,7 +25,7 @@ typedef union {
 
 // Start these at the USER code range in VIA
 enum my_keycodes {
-  ENC_PRESS = 0x5F80,
+  ENC_PRESS = USER00,
   CLOCK_SET,
   OLED_TOGG
 };
diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
index 399fe552df..aab6a41af3 100644
--- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 #define KC_DISC_MUTE KC_F23
 #define KC_DISC_DEAF KC_F24
 #define NUM_CUST_KEYCODES (_NUM_CUST_KCS - SAFE_RANGE)
-#define VIA_KEYCODE_RANGE 0x5F80
+#define VIA_KEYCODE_RANGE USER00
 
 enum custom_keycodes {
   PROG = SAFE_RANGE,

From a69ab05dd687cb9aa38e0c125e4f64956c7da6c7 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 5 Nov 2022 10:30:09 +0000
Subject: [PATCH 794/959] Initial DD keycode migration (#18643)

* Initial DD keycode migration

* Sort magic keycodes
---
 data/constants/keycodes/keycodes_0.0.1.hjson  |   96 ++
 .../keycodes/keycodes_0.0.1_audio.hjson       |   84 +
 .../keycodes/keycodes_0.0.1_basic.hjson       | 1515 +++++++++++++++++
 .../keycodes/keycodes_0.0.1_joystick.hjson    |  228 +++
 .../keycodes/keycodes_0.0.1_lighting.hjson    |  154 ++
 .../keycodes/keycodes_0.0.1_macro.hjson       |  133 ++
 .../keycodes/keycodes_0.0.1_magic.hjson       |  249 +++
 .../keycodes/keycodes_0.0.1_midi.hjson        |  670 ++++++++
 .../keycodes_0.0.1_programmable_button.hjson  |  228 +++
 .../keycodes/keycodes_0.0.1_quantum.hjson     |  464 +++++
 .../keycodes/keycodes_0.0.1_sequencer.hjson   |   40 +
 .../keycodes/keycodes_0.0.1_steno.hjson       |   20 +
 .../keycodes/keycodes_0.0.1_swap_hands.hjson  |   32 +
 data/schemas/keycodes.jsonschema              |   57 +
 lib/python/qmk/cli/__init__.py                |    1 +
 lib/python/qmk/cli/generate/api.py            |   14 +
 lib/python/qmk/cli/generate/keycodes.py       |   88 +
 lib/python/qmk/keycodes.py                    |   57 +
 quantum/action_code.h                         |    3 +
 quantum/keycode.h                             |  497 +-----
 quantum/keycodes.h                            | 1115 ++++++++++++
 quantum/keymap_common.c                       |    6 +-
 quantum/process_keycode/process_joystick.c    |    6 +-
 quantum/process_keycode/process_magic.c       |  280 ++-
 .../process_programmable_button.c             |    4 +-
 quantum/quantum_keycodes.h                    |  891 +---------
 quantum/send_string/send_string_keycodes.h    |   61 +-
 quantum/via.c                                 |    1 -
 quantum/via.h                                 |   11 +-
 quantum/via_ensure_keycode.h                  |  344 ----
 30 files changed, 5471 insertions(+), 1878 deletions(-)
 create mode 100644 data/constants/keycodes/keycodes_0.0.1.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_audio.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_basic.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_joystick.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_lighting.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_macro.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_magic.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_midi.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_programmable_button.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_quantum.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_sequencer.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_steno.hjson
 create mode 100644 data/constants/keycodes/keycodes_0.0.1_swap_hands.hjson
 create mode 100644 data/schemas/keycodes.jsonschema
 create mode 100644 lib/python/qmk/cli/generate/keycodes.py
 create mode 100644 lib/python/qmk/keycodes.py
 create mode 100644 quantum/keycodes.h
 delete mode 100644 quantum/via_ensure_keycode.h

diff --git a/data/constants/keycodes/keycodes_0.0.1.hjson b/data/constants/keycodes/keycodes_0.0.1.hjson
new file mode 100644
index 0000000000..7ba1ecf201
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1.hjson
@@ -0,0 +1,96 @@
+{
+    "ranges": {
+        "0x0000/0x00FF": {
+            "define": "QK_BASIC"
+        },
+        "0x0100/0x1EFF": {
+            "define": "QK_MODS"
+        },
+        "0x2000/0x1FFF": {
+            "define": "QK_MOD_TAP"
+        },
+        "0x4000/0x0FFF": {
+            "define": "QK_LAYER_TAP"
+        },
+        "0x5000/0x01FF": {
+            "define": "QK_LAYER_MOD"
+        },
+        "0x5200/0x001F": {
+            "define": "QK_TO"
+        },
+        "0x5220/0x001F": {
+            "define": "QK_MOMENTARY"
+        },
+        "0x5240/0x001F": {
+            "define": "QK_DEF_LAYER"
+        },
+        "0x5260/0x001F": {
+            "define": "QK_TOGGLE_LAYER"
+        },
+        "0x5280/0x001F": {
+            "define": "QK_ONE_SHOT_LAYER"
+        },
+        "0x52A0/0x001F": {
+            "define": "QK_ONE_SHOT_MOD"
+        },
+        "0x52C0/0x001F": {
+            "define": "QK_LAYER_TAP_TOGGLE"
+        },
+        // 0x52E0/0x001F - UNUSED
+        // 0x5300/0x02FF - UNUSED
+        "0x5600/0x00FF": {
+            "define": "QK_SWAP_HANDS"
+        },
+        "0x5700/0x00FF": {
+            "define": "QK_TAP_DANCE"
+        },
+        // 0x5800/0x17FF - UNUSED
+        "0x7000/0x00FF": {
+            "define": "QK_MAGIC"
+        },
+        "0x7100/0x00FF": {
+            "define": "QK_MIDI"
+        },
+        "0x7200/0x01FF": {
+            "define": "QK_SEQUENCER"
+        },
+        "0x7400/0x003F": {
+            "define": "QK_JOYSTICK"
+        },
+        "0x7440/0x003F": {
+            "define": "QK_PROGRAMMABLE_BUTTON"
+        },
+        "0x7480/0x003F": {
+            "define": "QK_AUDIO"
+        },
+        "0x74C0/0x003F": {
+            "define": "QK_STENO"
+        },
+        // 0x7500/0x01FF - UNUSED
+        "0x7700/0x007F": {
+            "define": "QK_MACRO"
+        },
+        // 0x7780/0x007F - UNUSED
+        "0x7800/0x00FF": {
+            "define": "QK_LIGHTING"
+        },
+        // 0x7900/0x02FF - UNUSED
+        "0x7C00/0x01FF": {
+            "define": "QK_QUANTUM"
+        },
+        "0x7E00/0x00FF": {
+            "define": "QK_KB"
+        },
+        "0x7F00/0x00FF": {
+            "define": "QK_USER"
+        },
+        "0x8000/0x7FFF": {
+            "define": "QK_UNICODE"
+        }
+    },
+    "keycodes": {
+        "0x7E00": {
+            "key": "SAFE_RANGE"
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_audio.hjson b/data/constants/keycodes/keycodes_0.0.1_audio.hjson
new file mode 100644
index 0000000000..d26e515682
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_audio.hjson
@@ -0,0 +1,84 @@
+{
+    "keycodes": {
+        "0x7480": {
+            "group": "audio",
+            "key": "AU_ON"
+        },
+        "0x7481": {
+            "group": "audio",
+            "key": "AU_OFF"
+        },
+        "0x7482": {
+            "group": "audio",
+            "key": "AU_TOG"
+        },
+
+        "0x748A": {
+            "group": "audio",
+            "key": "CLICKY_TOGGLE",
+            "aliases": [
+                "CK_TOGG"
+            ]
+        },
+        "0x748B": {
+            "group": "audio",
+            "key": "CLICKY_ENABLE",
+            "aliases": [
+                "CK_ON"
+            ]
+        },
+        "0x748C": {
+            "group": "audio",
+            "key": "CLICKY_DISABLE",
+            "aliases": [
+                "CK_OFF"
+            ]
+        },
+        "0x748D": {
+            "group": "audio",
+            "key": "CLICKY_UP",
+            "aliases": [
+                "CK_UP"
+            ]
+        },
+        "0x748E": {
+            "group": "audio",
+            "key": "CLICKY_DOWN",
+            "aliases": [
+                "CK_DOWN"
+            ]
+        },
+        "0x748F": {
+            "group": "audio",
+            "key": "CLICKY_RESET",
+            "aliases": [
+                "CK_RST"
+            ]
+        },
+
+        "0x7490": {
+            "group": "audio",
+            "key": "MU_ON"
+        },
+        "0x7491": {
+            "group": "audio",
+            "key": "MU_OFF"
+        },
+        "0x7492": {
+            "group": "audio",
+            "key": "MU_TOG"
+        },
+        "0x7493": {
+            "group": "audio",
+            "key": "MU_MOD"
+        },
+        "0x7494": {
+            "group": "audio",
+            "key": "MUV_IN"
+        },
+        "0x7495": {
+            "group": "audio",
+            "key": "MUV_DE"
+        }
+    }
+}
diff --git a/data/constants/keycodes/keycodes_0.0.1_basic.hjson b/data/constants/keycodes/keycodes_0.0.1_basic.hjson
new file mode 100644
index 0000000000..7141d553b0
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_basic.hjson
@@ -0,0 +1,1515 @@
+{
+    "keycodes": {
+        "0x0000": {
+            "group": "internal",
+            "key": "KC_NO",
+            "label": "",
+            "aliases": [
+                "XXXXXXX"
+            ]
+        },
+        "0x0001": {
+            "group": "internal",
+            "key": "KC_TRANSPARENT",
+            "label": "",
+            "aliases": [
+                "_______",
+                "KC_TRNS"
+            ]
+        },
+        "0x0004": {
+            "group": "basic",
+            "key": "KC_A",
+            "label": "A"
+        },
+        "0x0005": {
+            "group": "basic",
+            "key": "KC_B",
+            "label": "B"
+        },
+        "0x0006": {
+            "group": "basic",
+            "key": "KC_C",
+            "label": "C"
+        },
+        "0x0007": {
+            "group": "basic",
+            "key": "KC_D",
+            "label": "D"
+        },
+        "0x0008": {
+            "group": "basic",
+            "key": "KC_E",
+            "label": "E"
+        },
+        "0x0009": {
+            "group": "basic",
+            "key": "KC_F",
+            "label": "F"
+        },
+        "0x000A": {
+            "group": "basic",
+            "key": "KC_G",
+            "label": "G"
+        },
+        "0x000B": {
+            "group": "basic",
+            "key": "KC_H",
+            "label": "H"
+        },
+        "0x000C": {
+            "group": "basic",
+            "key": "KC_I",
+            "label": "I"
+        },
+        "0x000D": {
+            "group": "basic",
+            "key": "KC_J",
+            "label": "J"
+        },
+        "0x000E": {
+            "group": "basic",
+            "key": "KC_K",
+            "label": "K"
+        },
+        "0x000F": {
+            "group": "basic",
+            "key": "KC_L",
+            "label": "L"
+        },
+        "0x0010": {
+            "group": "basic",
+            "key": "KC_M",
+            "label": "M"
+        },
+        "0x0011": {
+            "group": "basic",
+            "key": "KC_N",
+            "label": "N"
+        },
+        "0x0012": {
+            "group": "basic",
+            "key": "KC_O",
+            "label": "O"
+        },
+        "0x0013": {
+            "group": "basic",
+            "key": "KC_P",
+            "label": "P"
+        },
+        "0x0014": {
+            "group": "basic",
+            "key": "KC_Q",
+            "label": "Q"
+        },
+        "0x0015": {
+            "group": "basic",
+            "key": "KC_R",
+            "label": "R"
+        },
+        "0x0016": {
+            "group": "basic",
+            "key": "KC_S",
+            "label": "S"
+        },
+        "0x0017": {
+            "group": "basic",
+            "key": "KC_T",
+            "label": "T"
+        },
+        "0x0018": {
+            "group": "basic",
+            "key": "KC_U",
+            "label": "U"
+        },
+        "0x0019": {
+            "group": "basic",
+            "key": "KC_V",
+            "label": "V"
+        },
+        "0x001A": {
+            "group": "basic",
+            "key": "KC_W",
+            "label": "W"
+        },
+        "0x001B": {
+            "group": "basic",
+            "key": "KC_X",
+            "label": "X"
+        },
+        "0x001C": {
+            "group": "basic",
+            "key": "KC_Y",
+            "label": "Y"
+        },
+        "0x001D": {
+            "group": "basic",
+            "key": "KC_Z",
+            "label": "Z"
+        },
+        "0x001E": {
+            "group": "basic",
+            "key": "KC_1",
+            "label": "1"
+        },
+        "0x001F": {
+            "group": "basic",
+            "key": "KC_2",
+            "label": "2"
+        },
+        "0x0020": {
+            "group": "basic",
+            "key": "KC_3",
+            "label": "3"
+        },
+        "0x0021": {
+            "group": "basic",
+            "key": "KC_4",
+            "label": "4"
+        },
+        "0x0022": {
+            "group": "basic",
+            "key": "KC_5",
+            "label": "5"
+        },
+        "0x0023": {
+            "group": "basic",
+            "key": "KC_6",
+            "label": "6"
+        },
+        "0x0024": {
+            "group": "basic",
+            "key": "KC_7",
+            "label": "7"
+        },
+        "0x0025": {
+            "group": "basic",
+            "key": "KC_8",
+            "label": "8"
+        },
+        "0x0026": {
+            "group": "basic",
+            "key": "KC_9",
+            "label": "9"
+        },
+        "0x0027": {
+            "group": "basic",
+            "key": "KC_0",
+            "label": "0"
+        },
+        "0x0028": {
+            "group": "basic",
+            "key": "KC_ENTER",
+            "label": "Enter",
+            "aliases": [
+                "KC_ENT"
+            ]
+        },
+        "0x0029": {
+            "group": "basic",
+            "key": "KC_ESCAPE",
+            "label": "Esc",
+            "aliases": [
+                "KC_ESC"
+            ]
+        },
+        "0x002A": {
+            "group": "basic",
+            "key": "KC_BACKSPACE",
+            "label": "Backspace",
+            "aliases": [
+                "KC_BSPC"
+            ]
+        },
+        "0x002B": {
+            "group": "basic",
+            "key": "KC_TAB",
+            "label": "Tab"
+        },
+        "0x002C": {
+            "group": "basic",
+            "key": "KC_SPACE",
+            "label": "Spacebar",
+            "aliases": [
+                "KC_SPC"
+            ]
+        },
+        "0x002D": {
+            "group": "basic",
+            "key": "KC_MINUS",
+            "label": "-",
+            "aliases": [
+                "KC_MINS"
+            ]
+        },
+        "0x002E": {
+            "group": "basic",
+            "key": "KC_EQUAL",
+            "label": "=",
+            "aliases": [
+                "KC_EQL"
+            ]
+        },
+        "0x002F": {
+            "group": "basic",
+            "key": "KC_LEFT_BRACKET",
+            "label": "]",
+            "aliases": [
+                "KC_LBRC"
+            ]
+        },
+        "0x0030": {
+            "group": "basic",
+            "key": "KC_RIGHT_BRACKET",
+            "label": "[",
+            "aliases": [
+                "KC_RBRC"
+            ]
+        },
+        "0x0031": {
+            "group": "basic",
+            "key": "KC_BACKSLASH",
+            "label": "\\",
+            "aliases": [
+                "KC_BSLS"
+            ]
+        },
+        "0x0032": {
+            "group": "basic",
+            "key": "KC_NONUS_HASH",
+            "label": "#",
+            "aliases": [
+                "KC_NUHS"
+            ]
+        },
+        "0x0033": {
+            "group": "basic",
+            "key": "KC_SEMICOLON",
+            "label": ";",
+            "aliases": [
+                "KC_SCLN"
+            ]
+        },
+        "0x0034": {
+            "group": "basic",
+            "key": "KC_QUOTE",
+            "label": "'",
+            "aliases": [
+                "KC_QUOT"
+            ]
+        },
+        "0x0035": {
+            "group": "basic",
+            "key": "KC_GRAVE",
+            "label": "`",
+            "aliases": [
+                "KC_GRV"
+            ]
+        },
+        "0x0036": {
+            "group": "basic",
+            "key": "KC_COMMA",
+            "label": ",",
+            "aliases": [
+                "KC_COMM"
+            ]
+        },
+        "0x0037": {
+            "group": "basic",
+            "key": "KC_DOT",
+            "label": "."
+        },
+        "0x0038": {
+            "group": "basic",
+            "key": "KC_SLASH",
+            "label": "/",
+            "aliases": [
+                "KC_SLSH"
+            ]
+        },
+        "0x0039": {
+            "group": "basic",
+            "key": "KC_CAPS_LOCK",
+            "label": "Caps Lock",
+            "aliases": [
+                "KC_CAPS"
+            ]
+        },
+        "0x003A": {
+            "group": "basic",
+            "key": "KC_F1",
+            "label": "F1"
+        },
+        "0x003B": {
+            "group": "basic",
+            "key": "KC_F2",
+            "label": "F2"
+        },
+        "0x003C": {
+            "group": "basic",
+            "key": "KC_F3",
+            "label": "F3"
+        },
+        "0x003D": {
+            "group": "basic",
+            "key": "KC_F4",
+            "label": "F4"
+        },
+        "0x003E": {
+            "group": "basic",
+            "key": "KC_F5",
+            "label": "F5"
+        },
+        "0x003F": {
+            "group": "basic",
+            "key": "KC_F6",
+            "label": "F6"
+        },
+        "0x0040": {
+            "group": "basic",
+            "key": "KC_F7",
+            "label": "F7"
+        },
+        "0x0041": {
+            "group": "basic",
+            "key": "KC_F8",
+            "label": "F8"
+        },
+        "0x0042": {
+            "group": "basic",
+            "key": "KC_F9",
+            "label": "F9"
+        },
+        "0x0043": {
+            "group": "basic",
+            "key": "KC_F10",
+            "label": "F10"
+        },
+        "0x0044": {
+            "group": "basic",
+            "key": "KC_F11",
+            "label": "F11"
+        },
+        "0x0045": {
+            "group": "basic",
+            "key": "KC_F12",
+            "label": "F12"
+        },
+        "0x0046": {
+            "group": "basic",
+            "key": "KC_PRINT_SCREEN",
+            "label": "Print Screen",
+            "aliases": [
+                "KC_PSCR"
+            ]
+        },
+        "0x0047": {
+            "group": "basic",
+            "key": "KC_SCROLL_LOCK",
+            "label": "Scroll Lock",
+            "aliases": [
+                "KC_SCRL",
+                "KC_BRMD"
+            ]
+        },
+        "0x0048": {
+            "group": "basic",
+            "key": "KC_PAUSE",
+            "label": "Pause",
+            "aliases": [
+                "KC_PAUS",
+                "KC_BRK",
+                "KC_BRMU"
+            ]
+        },
+        "0x0049": {
+            "group": "basic",
+            "key": "KC_INSERT",
+            "label": "Insert",
+            "aliases": [
+                "KC_INS"
+            ]
+        },
+        "0x004A": {
+            "group": "basic",
+            "key": "KC_HOME",
+            "label": "Home"
+        },
+        "0x004B": {
+            "group": "basic",
+            "key": "KC_PAGE_UP",
+            "label": "Page Up",
+            "aliases": [
+                "KC_PGUP"
+            ]
+        },
+        "0x004C": {
+            "group": "basic",
+            "key": "KC_DELETE",
+            "label": "Delete",
+            "aliases": [
+                "KC_DEL"
+            ]
+        },
+        "0x004D": {
+            "group": "basic",
+            "key": "KC_END",
+            "label": "End"
+        },
+        "0x004E": {
+            "group": "basic",
+            "key": "KC_PAGE_DOWN",
+            "label": "Page Down",
+            "aliases": [
+                "KC_PGDN"
+            ]
+        },
+        "0x004F": {
+            "group": "basic",
+            "key": "KC_RIGHT",
+            "label": "Right",
+            "aliases": [
+                "KC_RGHT"
+            ]
+        },
+        "0x0050": {
+            "group": "basic",
+            "key": "KC_LEFT",
+            "label": "Left"
+        },
+        "0x0051": {
+            "group": "basic",
+            "key": "KC_DOWN",
+            "label": "Down"
+        },
+        "0x0052": {
+            "group": "basic",
+            "key": "KC_UP",
+            "label": "Up"
+        },
+        "0x0053": {
+            "group": "basic",
+            "key": "KC_NUM_LOCK",
+            "label": "Num Lock",
+            "aliases": [
+                "KC_NUM"
+            ]
+        },
+        "0x0054": {
+            "group": "basic",
+            "key": "KC_KP_SLASH",
+            "label": "/",
+            "aliases": [
+                "KC_PSLS"
+            ]
+        },
+        "0x0055": {
+            "group": "basic",
+            "key": "KC_KP_ASTERISK",
+            "label": "*",
+            "aliases": [
+                "KC_PAST"
+            ]
+        },
+        "0x0056": {
+            "group": "basic",
+            "key": "KC_KP_MINUS",
+            "label": "-",
+            "aliases": [
+                "KC_PMNS"
+            ]
+        },
+        "0x0057": {
+            "group": "basic",
+            "key": "KC_KP_PLUS",
+            "label": "+",
+            "aliases": [
+                "KC_PPLS"
+            ]
+        },
+        "0x0058": {
+            "group": "basic",
+            "key": "KC_KP_ENTER",
+            "label": "Enter",
+            "aliases": [
+                "KC_PENT"
+            ]
+        },
+        "0x0059": {
+            "group": "basic",
+            "key": "KC_KP_1",
+            "label": "1",
+            "aliases": [
+                "KC_P1"
+            ]
+        },
+        "0x005A": {
+            "group": "basic",
+            "key": "KC_KP_2",
+            "label": "2",
+            "aliases": [
+                "KC_P2"
+            ]
+        },
+        "0x005B": {
+            "group": "basic",
+            "key": "KC_KP_3",
+            "label": "3",
+            "aliases": [
+                "KC_P3"
+            ]
+        },
+        "0x005C": {
+            "group": "basic",
+            "key": "KC_KP_4",
+            "label": "4",
+            "aliases": [
+                "KC_P4"
+            ]
+        },
+        "0x005D": {
+            "group": "basic",
+            "key": "KC_KP_5",
+            "label": "5",
+            "aliases": [
+                "KC_P5"
+            ]
+        },
+        "0x005E": {
+            "group": "basic",
+            "key": "KC_KP_6",
+            "label": "6",
+            "aliases": [
+                "KC_P6"
+            ]
+        },
+        "0x005F": {
+            "group": "basic",
+            "key": "KC_KP_7",
+            "label": "7",
+            "aliases": [
+                "KC_P7"
+            ]
+        },
+        "0x0060": {
+            "group": "basic",
+            "key": "KC_KP_8",
+            "label": "8",
+            "aliases": [
+                "KC_P8"
+            ]
+        },
+        "0x0061": {
+            "group": "basic",
+            "key": "KC_KP_9",
+            "label": "9",
+            "aliases": [
+                "KC_P9"
+            ]
+        },
+        "0x0062": {
+            "group": "basic",
+            "key": "KC_KP_0",
+            "label": "0",
+            "aliases": [
+                "KC_P0"
+            ]
+        },
+        "0x0063": {
+            "group": "basic",
+            "key": "KC_KP_DOT",
+            "label": ".",
+            "aliases": [
+                "KC_PDOT"
+            ]
+        },
+        "0x0064": {
+            "group": "basic",
+            "key": "KC_NONUS_BACKSLASH",
+            "label": "\\",
+            "aliases": [
+                "KC_NUBS"
+            ]
+        },
+        "0x0065": {
+            "group": "basic",
+            "key": "KC_APPLICATION",
+            "label": "Application",
+            "aliases": [
+                "KC_APP"
+            ]
+        },
+        "0x0066": {
+            "group": "basic",
+            "key": "KC_KB_POWER",
+            "label": "Application"
+        },
+        "0x0067": {
+            "group": "basic",
+            "key": "KC_KP_EQUAL",
+            "label": "=",
+            "aliases": [
+                "KC_PEQL"
+            ]
+        },
+        "0x0068": {
+            "group": "basic",
+            "key": "KC_F13",
+            "label": "F13"
+        },
+        "0x0069": {
+            "group": "basic",
+            "key": "KC_F14",
+            "label": "F14"
+        },
+        "0x006A": {
+            "group": "basic",
+            "key": "KC_F15",
+            "label": "F15"
+        },
+        "0x006B": {
+            "group": "basic",
+            "key": "KC_F16",
+            "label": "F16"
+        },
+        "0x006C": {
+            "group": "basic",
+            "key": "KC_F17",
+            "label": "F17"
+        },
+        "0x006D": {
+            "group": "basic",
+            "key": "KC_F18",
+            "label": "F18"
+        },
+        "0x006E": {
+            "group": "basic",
+            "key": "KC_F19",
+            "label": "F19"
+        },
+        "0x006F": {
+            "group": "basic",
+            "key": "KC_F20",
+            "label": "F20"
+        },
+        "0x0070": {
+            "group": "basic",
+            "key": "KC_F21",
+            "label": "F21"
+        },
+        "0x0071": {
+            "group": "basic",
+            "key": "KC_F22",
+            "label": "F22"
+        },
+        "0x0072": {
+            "group": "basic",
+            "key": "KC_F23",
+            "label": "F23"
+        },
+        "0x0073": {
+            "group": "basic",
+            "key": "KC_F24",
+            "label": "F24"
+        },
+        "0x0074": {
+            "group": "basic",
+            "key": "KC_EXECUTE",
+            "label": "Execute",
+            "aliases": [
+                "KC_EXEC"
+            ]
+        },
+        "0x0075": {
+            "group": "basic",
+            "key": "KC_HELP",
+            "label": "Help"
+        },
+        "0x0076": {
+            "group": "basic",
+            "key": "KC_MENU",
+            "label": "Menu"
+        },
+        "0x0077": {
+            "group": "basic",
+            "key": "KC_SELECT",
+            "label": "Select",
+            "aliases": [
+                "KC_SLCT"
+            ]
+        },
+        "0x0078": {
+            "group": "basic",
+            "key": "KC_STOP",
+            "label": "Stop"
+        },
+        "0x0079": {
+            "group": "basic",
+            "key": "KC_AGAIN",
+            "label": "Again",
+            "aliases": [
+                "KC_AGIN"
+            ]
+        },
+        "0x007A": {
+            "group": "basic",
+            "key": "KC_UNDO",
+            "label": "Undo"
+        },
+        "0x007B": {
+            "group": "basic",
+            "key": "KC_CUT",
+            "label": "Cut"
+        },
+        "0x007C": {
+            "group": "basic",
+            "key": "KC_COPY",
+            "label": "Copy"
+        },
+        "0x007D": {
+            "group": "basic",
+            "key": "KC_PASTE",
+            "label": "Paste",
+            "aliases": [
+                "KC_PSTE"
+            ]
+        },
+        "0x007E": {
+            "group": "basic",
+            "key": "KC_FIND",
+            "label": "Find"
+        },
+        "0x007F": {
+            "group": "basic",
+            "key": "KC_KB_MUTE",
+            "label": "Mute"
+        },
+        "0x0080": {
+            "group": "basic",
+            "key": "KC_KB_VOLUME_UP",
+            "label": "Volume Up"
+        },
+        "0x0081": {
+            "group": "basic",
+            "key": "KC_KB_VOLUME_DOWN",
+            "label": "Volume Down"
+        },
+        "0x0082": {
+            "group": "basic",
+            "key": "KC_LOCKING_CAPS_LOCK",
+            "label": "Caps Lock",
+            "aliases": [
+                "KC_LCAP"
+            ]
+        },
+        "0x0083": {
+            "group": "basic",
+            "key": "KC_LOCKING_NUM_LOCK",
+            "label": "Num Lock",
+            "aliases": [
+                "KC_LNUM"
+            ]
+        },
+        "0x0084": {
+            "group": "basic",
+            "key": "KC_LOCKING_SCROLL_LOCK",
+            "label": "Scroll Lock",
+            "aliases": [
+                "KC_LSCR"
+            ]
+        },
+        "0x0085": {
+            "group": "basic",
+            "key": "KC_KP_COMMA",
+            "label": ",",
+            "aliases": [
+                "KC_PCMM"
+            ]
+        },
+        "0x0086": {
+            "group": "basic",
+            "key": "KC_KP_EQUAL_AS400",
+            "label": "="
+        },
+        "0x0087": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_1",
+            "label": "INT 1",
+            "aliases": [
+                "KC_INT1"
+            ]
+        },
+        "0x0088": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_2",
+            "label": "INT 2",
+            "aliases": [
+                "KC_INT2"
+            ]
+        },
+        "0x0089": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_3",
+            "label": "INT 3",
+            "aliases": [
+                "KC_INT3"
+            ]
+        },
+        "0x008A": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_4",
+            "label": "INT 4",
+            "aliases": [
+                "KC_INT4"
+            ]
+        },
+        "0x008B": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_5",
+            "label": "INT 5",
+            "aliases": [
+                "KC_INT5"
+            ]
+        },
+        "0x008C": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_6",
+            "label": "INT 6",
+            "aliases": [
+                "KC_INT6"
+            ]
+        },
+        "0x008D": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_7",
+            "label": "INT 7",
+            "aliases": [
+                "KC_INT7"
+            ]
+        },
+        "0x008E": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_8",
+            "label": "INT 8",
+            "aliases": [
+                "KC_INT8"
+            ]
+        },
+        "0x008F": {
+            "group": "basic",
+            "key": "KC_INTERNATIONAL_9",
+            "label": "INT 9",
+            "aliases": [
+                "KC_INT9"
+            ]
+        },
+        "0x0090": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_1",
+            "label": "LANG 1",
+            "aliases": [
+                "KC_LNG1"
+            ]
+        },
+        "0x0091": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_2",
+            "label": "LANG 2",
+            "aliases": [
+                "KC_LNG2"
+            ]
+        },
+        "0x0092": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_3",
+            "label": "LANG 3",
+            "aliases": [
+                "KC_LNG3"
+            ]
+        },
+        "0x0093": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_4",
+            "label": "LANG 4",
+            "aliases": [
+                "KC_LNG4"
+            ]
+        },
+        "0x0094": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_5",
+            "label": "LANG 5",
+            "aliases": [
+                "KC_LNG5"
+            ]
+        },
+        "0x0095": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_6",
+            "label": "LANG 6",
+            "aliases": [
+                "KC_LNG6"
+            ]
+        },
+        "0x0096": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_7",
+            "label": "LANG 7",
+            "aliases": [
+                "KC_LNG7"
+            ]
+        },
+        "0x0097": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_8",
+            "label": "LANG 8",
+            "aliases": [
+                "KC_LNG8"
+            ]
+        },
+        "0x0098": {
+            "group": "basic",
+            "key": "KC_LANGUAGE_9",
+            "label": "LANG 9",
+            "aliases": [
+                "KC_LNG9"
+            ]
+        },
+        "0x0099": {
+            "group": "basic",
+            "key": "KC_ALTERNATE_ERASE",
+            "label": "Alternate Erase",
+            "aliases": [
+                "KC_ERAS"
+            ]
+        },
+        "0x009A": {
+            "group": "basic",
+            "key": "KC_SYSTEM_REQUEST",
+            "label": "SysReq/Attention",
+            "aliases": [
+                "KC_SYRQ"
+            ]
+        },
+        "0x009B": {
+            "group": "basic",
+            "key": "KC_CANCEL",
+            "label": "Cancel",
+            "aliases": [
+                "KC_CNCL"
+            ]
+        },
+        "0x009C": {
+            "group": "basic",
+            "key": "KC_CLEAR",
+            "label": "Clear",
+            "aliases": [
+                "KC_CLR"
+            ]
+        },
+        "0x009D": {
+            "group": "basic",
+            "key": "KC_PRIOR",
+            "label": "Prior",
+            "aliases": [
+                "KC_PRIR"
+            ]
+        },
+        "0x009E": {
+            "group": "basic",
+            "key": "KC_RETURN",
+            "label": "Return",
+            "aliases": [
+                "KC_RETN"
+            ]
+        },
+        "0x009F": {
+            "group": "basic",
+            "key": "KC_SEPARATOR",
+            "label": "Separator",
+            "aliases": [
+                "KC_SEPR"
+            ]
+        },
+        "0x00A0": {
+            "group": "basic",
+            "key": "KC_OUT",
+            "label": "Out"
+        },
+        "0x00A1": {
+            "group": "basic",
+            "key": "KC_OPER",
+            "label": "Oper"
+        },
+        "0x00A2": {
+            "group": "basic",
+            "key": "KC_CLEAR_AGAIN",
+            "label": "Clear/Again",
+            "aliases": [
+                "KC_CLAG"
+            ]
+        },
+        "0x00A3": {
+            "group": "basic",
+            "key": "KC_CRSEL",
+            "label": "CrSel/Props",
+            "aliases": [
+                "KC_CRSL"
+            ]
+        },
+        "0x00A4": {
+            "group": "basic",
+            "key": "KC_EXSEL",
+            "label": "ExSel",
+            "aliases": [
+                "KC_EXSL"
+            ]
+        },
+        "0x00A5": {
+            "group": "system",
+            "key": "KC_SYSTEM_POWER",
+            "label": "System Power Down",
+            "aliases": [
+                "KC_PWR"
+            ]
+        },
+        "0x00A6": {
+            "group": "system",
+            "key": "KC_SYSTEM_SLEEP",
+            "label": "System Sleep",
+            "aliases": [
+                "KC_SLEP"
+            ]
+        },
+        "0x00A7": {
+            "group": "system",
+            "key": "KC_SYSTEM_WAKE",
+            "label": "System Wake",
+            "aliases": [
+                "KC_WAKE"
+            ]
+        },
+        "0x00A8": {
+            "group": "media",
+            "key": "KC_AUDIO_MUTE",
+            "label": "Mute",
+            "aliases": [
+                "KC_MUTE"
+            ]
+        },
+        "0x00A9": {
+            "group": "media",
+            "key": "KC_AUDIO_VOL_UP",
+            "label": "Volume Up",
+            "aliases": [
+                "KC_VOLU"
+            ]
+        },
+        "0x00AA": {
+            "group": "media",
+            "key": "KC_AUDIO_VOL_DOWN",
+            "label": "Volume Down",
+            "aliases": [
+                "KC_VOLD"
+            ]
+        },
+        "0x00AB": {
+            "group": "media",
+            "key": "KC_MEDIA_NEXT_TRACK",
+            "label": "Next",
+            "aliases": [
+                "KC_MNXT"
+            ]
+        },
+        "0x00AC": {
+            "group": "media",
+            "key": "KC_MEDIA_PREV_TRACK",
+            "label": "Previous",
+            "aliases": [
+                "KC_MPRV"
+            ]
+        },
+        "0x00AD": {
+            "group": "media",
+            "key": "KC_MEDIA_STOP",
+            "label": "Stop",
+            "aliases": [
+                "KC_MSTP"
+            ]
+        },
+        "0x00AE": {
+            "group": "media",
+            "key": "KC_MEDIA_PLAY_PAUSE",
+            "label": "Mute",
+            "aliases": [
+                "KC_MPLY"
+            ]
+        },
+        "0x00AF": {
+            "group": "media",
+            "key": "KC_MEDIA_SELECT",
+            "label": "Launch Player",
+            "aliases": [
+                "KC_MSEL"
+            ]
+        },
+        "0x00B0": {
+            "group": "media",
+            "key": "KC_MEDIA_EJECT",
+            "label": "Eject",
+            "aliases": [
+                "KC_EJCT"
+            ]
+        },
+        "0x00B1": {
+            "group": "media",
+            "key": "KC_MAIL",
+            "label": "Launch Mail"
+        },
+        "0x00B2": {
+            "group": "media",
+            "key": "KC_CALCULATOR",
+            "label": "Launch Calculator",
+            "aliases": [
+                "KC_CALC"
+            ]
+        },
+        "0x00B3": {
+            "group": "media",
+            "key": "KC_MY_COMPUTER",
+            "label": "Launch My Computer",
+            "aliases": [
+                "KC_MYCM"
+            ]
+        },
+        "0x00B4": {
+            "group": "media",
+            "key": "KC_WWW_SEARCH",
+            "label": "Browser Search",
+            "aliases": [
+                "KC_WSCH"
+            ]
+        },
+        "0x00B5": {
+            "group": "media",
+            "key": "KC_WWW_HOME",
+            "label": "Browser Home",
+            "aliases": [
+                "KC_WHOM"
+            ]
+        },
+        "0x00B6": {
+            "group": "media",
+            "key": "KC_WWW_BACK",
+            "label": "Browser Back",
+            "aliases": [
+                "KC_WBAK"
+            ]
+        },
+        "0x00B7": {
+            "group": "media",
+            "key": "KC_WWW_FORWARD",
+            "label": "Browser Forward",
+            "aliases": [
+                "KC_WFWD"
+            ]
+        },
+        "0x00B8": {
+            "group": "media",
+            "key": "KC_WWW_STOP",
+            "label": "Browser Stop",
+            "aliases": [
+                "KC_WSTP"
+            ]
+        },
+        "0x00B9": {
+            "group": "media",
+            "key": "KC_WWW_REFRESH",
+            "label": "Browser Refresh",
+            "aliases": [
+                "KC_WREF"
+            ]
+        },
+        "0x00BA": {
+            "group": "media",
+            "key": "KC_WWW_FAVORITES",
+            "label": "Browser Favorites",
+            "aliases": [
+                "KC_WFAV"
+            ]
+        },
+        "0x00BB": {
+            "group": "media",
+            "key": "KC_MEDIA_FAST_FORWARD",
+            "label": "Next Track",
+            "aliases": [
+                "KC_MFFD"
+            ]
+        },
+        "0x00BC": {
+            "group": "media",
+            "key": "KC_MEDIA_REWIND",
+            "label": "Previous Track",
+            "aliases": [
+                "KC_MRWD"
+            ]
+        },
+        "0x00BD": {
+            "group": "media",
+            "key": "KC_BRIGHTNESS_UP",
+            "label": "Brightness Up",
+            "aliases": [
+                "KC_BRIU"
+            ]
+        },
+        "0x00BE": {
+            "group": "media",
+            "key": "KC_BRIGHTNESS_DOWN",
+            "label": "Brightness Down",
+            "aliases": [
+                "KC_BRID"
+            ]
+        },
+        "0x00BF": {
+            "group": "media",
+            "key": "KC_CONTROL_PANEL",
+            "label": "Open Control Panel",
+            "aliases": [
+                "KC_CPNL"
+            ]
+        },
+        "0x00C0": {
+            "group": "media",
+            "key": "KC_ASSISTANT",
+            "label": "Launch Assistant",
+            "aliases": [
+                "KC_ASST"
+            ]
+        },
+
+        "0x00CD": {
+            "group": "mouse",
+            "key": "KC_MS_UP",
+            "label": "Move cursor up",
+            "aliases": [
+                "KC_MS_U"
+            ]
+        },
+        "0x00CE": {
+            "group": "mouse",
+            "key": "KC_MS_DOWN",
+            "label": "Move cursor down",
+            "aliases": [
+                "KC_MS_D"
+            ]
+        },
+        "0x00CF": {
+            "group": "mouse",
+            "key": "KC_MS_LEFT",
+            "label": "Move cursor left",
+            "aliases": [
+                "KC_MS_L"
+            ]
+        },
+        "0x00D0": {
+            "group": "mouse",
+            "key": "KC_MS_RIGHT",
+            "label": "Move cursor right",
+            "aliases": [
+                "KC_MS_R"
+            ]
+        },
+        "0x00D1": {
+            "group": "mouse",
+            "key": "KC_MS_BTN1",
+            "label": "Press button 1",
+            "aliases": [
+                "KC_BTN1"
+            ]
+        },
+        "0x00D2": {
+            "group": "mouse",
+            "key": "KC_MS_BTN2",
+            "label": "Press button 2",
+            "aliases": [
+                "KC_BTN2"
+            ]
+        },
+        "0x00D3": {
+            "group": "mouse",
+            "key": "KC_MS_BTN3",
+            "label": "Press button 3",
+            "aliases": [
+                "KC_BTN3"
+            ]
+        },
+        "0x00D4": {
+            "group": "mouse",
+            "key": "KC_MS_BTN4",
+            "label": "Press button 4",
+            "aliases": [
+                "KC_BTN4"
+            ]
+        },
+        "0x00D5": {
+            "group": "mouse",
+            "key": "KC_MS_BTN5",
+            "label": "Press button 5",
+            "aliases": [
+                "KC_BTN5"
+            ]
+        },
+        "0x00D6": {
+            "group": "mouse",
+            "key": "KC_MS_BTN6",
+            "label": "Press button 6",
+            "aliases": [
+                "KC_BTN6"
+            ]
+        },
+        "0x00D7": {
+            "group": "mouse",
+            "key": "KC_MS_BTN7",
+            "label": "Press button 7",
+            "aliases": [
+                "KC_BTN7"
+            ]
+        },
+        "0x00D8": {
+            "group": "mouse",
+            "key": "KC_MS_BTN8",
+            "label": "Press button 8",
+            "aliases": [
+                "KC_BTN8"
+            ]
+        },
+        "0x00D9": {
+            "group": "mouse",
+            "key": "KC_MS_WH_UP",
+            "label": "Move wheel up",
+            "aliases": [
+                "KC_WH_U"
+            ]
+        },
+        "0x00DA": {
+            "group": "mouse",
+            "key": "KC_MS_WH_DOWN",
+            "label": "Move wheel down",
+            "aliases": [
+                "KC_WH_D"
+            ]
+        },
+        "0x00DB": {
+            "group": "mouse",
+            "key": "KC_MS_WH_LEFT",
+            "label": "Move wheel left",
+            "aliases": [
+                "KC_WH_L"
+            ]
+        },
+        "0x00DC": {
+            "group": "mouse",
+            "key": "KC_MS_WH_RIGHT",
+            "label": "Move wheel right",
+            "aliases": [
+                "KC_WH_R"
+            ]
+        },
+        "0x00DD": {
+            "group": "mouse",
+            "key": "KC_MS_ACCEL0",
+            "label": "Set speed to 0",
+            "aliases": [
+                "KC_ACL0"
+            ]
+        },
+        "0x00DE": {
+            "group": "mouse",
+            "key": "KC_MS_ACCEL1",
+            "label": "Set speed to 1",
+            "aliases": [
+                "KC_ACL1"
+            ]
+        },
+        "0x00DF": {
+            "group": "mouse",
+            "key": "KC_MS_ACCEL2",
+            "label": "Set speed to 2",
+            "aliases": [
+                "KC_ACL2"
+            ]
+        },
+
+        "0x00E0": {
+            "group": "modifiers",
+            "key": "KC_LEFT_CTRL",
+            "label": "Left Control",
+            "aliases": [
+                "KC_LCTL"
+            ]
+        },
+        "0x00E1": {
+            "group": "modifiers",
+            "key": "KC_LEFT_SHIFT",
+            "label": "Left Shift",
+            "aliases": [
+                "KC_LSFT"
+            ]
+        },
+        "0x00E2": {
+            "group": "modifiers",
+            "key": "KC_LEFT_ALT",
+            "label": "Left Alt",
+            "aliases": [
+                "KC_LALT",
+                "KC_LOPT"
+            ]
+        },
+        "0x00E3": {
+            "group": "modifiers",
+            "key": "KC_LEFT_GUI",
+            "label": "Left GUI",
+            "aliases": [
+                "KC_LGUI",
+                "KC_LCMD",
+                "KC_LWIN"
+            ]
+        },
+        "0x00E4": {
+            "group": "modifiers",
+            "key": "KC_RIGHT_CTRL",
+            "label": "Right Control",
+            "aliases": [
+                "KC_RCTL"
+            ]
+        },
+        "0x00E5": {
+            "group": "modifiers",
+            "key": "KC_RIGHT_SHIFT",
+            "label": "Right Shift",
+            "aliases": [
+                "KC_RSFT"
+            ]
+        },
+        "0x00E6": {
+            "group": "modifiers",
+            "key": "KC_RIGHT_ALT",
+            "label": "Right Alt",
+            "aliases": [
+                "KC_RALT",
+                "KC_ROPT",
+                "KC_ALGR"
+            ]
+        },
+        "0x00E7": {
+            "group": "modifiers",
+            "key": "KC_RIGHT_GUI",
+            "label": "Right GUI",
+            "aliases": [
+                "KC_RGUI",
+                "KC_RCMD",
+                "KC_RWIN"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_joystick.hjson b/data/constants/keycodes/keycodes_0.0.1_joystick.hjson
new file mode 100644
index 0000000000..0bda7c29f3
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_joystick.hjson
@@ -0,0 +1,228 @@
+{
+    "keycodes": {
+        "0x7400": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_0",
+            "aliases": [
+                "JS_0"
+            ]
+        },
+        "0x7401": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_1",
+            "aliases": [
+                "JS_1"
+            ]
+        },
+        "0x7402": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_2",
+            "aliases": [
+                "JS_2"
+            ]
+        },
+        "0x7403": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_3",
+            "aliases": [
+                "JS_3"
+            ]
+        },
+        "0x7404": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_4",
+            "aliases": [
+                "JS_4"
+            ]
+        },
+        "0x7405": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_5",
+            "aliases": [
+                "JS_5"
+            ]
+        },
+        "0x7406": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_6",
+            "aliases": [
+                "JS_6"
+            ]
+        },
+        "0x7407": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_7",
+            "aliases": [
+                "JS_7"
+            ]
+        },
+        "0x7408": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_8",
+            "aliases": [
+                "JS_8"
+            ]
+        },
+        "0x7409": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_9",
+            "aliases": [
+                "JS_9"
+            ]
+        },
+        "0x740A": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_10",
+            "aliases": [
+                "JS_10"
+            ]
+        },
+        "0x740B": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_11",
+            "aliases": [
+                "JS_11"
+            ]
+        },
+        "0x740C": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_12",
+            "aliases": [
+                "JS_12"
+            ]
+        },
+        "0x740D": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_13",
+            "aliases": [
+                "JS_13"
+            ]
+        },
+        "0x740E": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_14",
+            "aliases": [
+                "JS_14"
+            ]
+        },
+        "0x740F": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_15",
+            "aliases": [
+                "JS_15"
+            ]
+        },
+        "0x7410": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_16",
+            "aliases": [
+                "JS_16"
+            ]
+        },
+        "0x7411": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_17",
+            "aliases": [
+                "JS_17"
+            ]
+        },
+        "0x7412": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_18",
+            "aliases": [
+                "JS_18"
+            ]
+        },
+        "0x7413": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_19",
+            "aliases": [
+                "JS_19"
+            ]
+        },
+        "0x7414": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_20",
+            "aliases": [
+                "JS_20"
+            ]
+        },
+        "0x7415": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_21",
+            "aliases": [
+                "JS_21"
+            ]
+        },
+        "0x7416": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_22",
+            "aliases": [
+                "JS_22"
+            ]
+        },
+        "0x7417": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_23",
+            "aliases": [
+                "JS_23"
+            ]
+        },
+        "0x7418": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_24",
+            "aliases": [
+                "JS_24"
+            ]
+        },
+        "0x7419": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_25",
+            "aliases": [
+                "JS_25"
+            ]
+        },
+        "0x741A": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_26",
+            "aliases": [
+                "JS_26"
+            ]
+        },
+        "0x741B": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_27",
+            "aliases": [
+                "JS_27"
+            ]
+        },
+        "0x741C": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_28",
+            "aliases": [
+                "JS_28"
+            ]
+        },
+        "0x741D": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_29",
+            "aliases": [
+                "JS_29"
+            ]
+        },
+        "0x741E": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_30",
+            "aliases": [
+                "JS_30"
+            ]
+        },
+        "0x741F": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_31",
+            "aliases": [
+                "JS_31"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_lighting.hjson b/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
new file mode 100644
index 0000000000..90ed36c645
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
@@ -0,0 +1,154 @@
+{
+    "keycodes": {
+        "0x7800": {
+            "group": "backlight",
+            "key": "BL_ON"
+        },
+        "0x7801": {
+            "group": "backlight",
+            "key": "BL_OFF"
+        },
+        "0x7802": {
+            "group": "backlight",
+            "key": "BL_DEC"
+        },
+        "0x7803": {
+            "group": "backlight",
+            "key": "BL_INC"
+        },
+        "0x7804": {
+            "group": "backlight",
+            "key": "BL_TOGG"
+        },
+        "0x7805": {
+            "group": "backlight",
+            "key": "BL_STEP"
+        },
+        "0x7806": {
+            "group": "backlight",
+            "key": "BL_BRTG"
+        },
+
+        "0x7820": {
+            "group": "rgb",
+            "key": "RGB_TOG"
+        },
+        "0x7821": {
+            "group": "rgb",
+            "key": "RGB_MODE_FORWARD",
+            "aliases": [
+                "RGB_MOD"
+            ]
+        },
+        "0x7822": {
+            "group": "rgb",
+            "key": "RGB_MODE_REVERSE",
+            "aliases": [
+                "RGB_RMOD"
+            ]
+        },
+        "0x7823": {
+            "group": "rgb",
+            "key": "RGB_HUI"
+        },
+        "0x7824": {
+            "group": "rgb",
+            "key": "RGB_HUD"
+        },
+        "0x7825": {
+            "group": "rgb",
+            "key": "RGB_SAI"
+        },
+        "0x7826": {
+            "group": "rgb",
+            "key": "RGB_SAD"
+        },
+        "0x7827": {
+            "group": "rgb",
+            "key": "RGB_VAI"
+        },
+        "0x7828": {
+            "group": "rgb",
+            "key": "RGB_VAD"
+        },
+        "0x7829": {
+            "group": "rgb",
+            "key": "RGB_SPI"
+        },
+        "0x782A": {
+            "group": "rgb",
+            "key": "RGB_SPD"
+        },
+
+        "0x782B": {
+            "group": "rgb",
+            "key": "RGB_MODE_PLAIN",
+            "aliases": [
+                "RGB_M_P"
+            ]
+        },
+        "0x782C": {
+            "group": "rgb",
+            "key": "RGB_MODE_BREATHE",
+            "aliases": [
+                "RGB_M_B"
+            ]
+        },
+        "0x782D": {
+            "group": "rgb",
+            "key": "RGB_MODE_RAINBOW",
+            "aliases": [
+                "RGB_M_R"
+            ]
+        },
+        "0x782E": {
+            "group": "rgb",
+            "key": "RGB_MODE_SWIRL",
+            "aliases": [
+                "RGB_M_SW"
+            ]
+        },
+        "0x782F": {
+            "group": "rgb",
+            "key": "RGB_MODE_SNAKE",
+            "aliases": [
+                "RGB_M_SN"
+            ]
+        },
+        "0x7830": {
+            "group": "rgb",
+            "key": "RGB_MODE_KNIGHT",
+            "aliases": [
+                "RGB_M_K"
+            ]
+        },
+        "0x7831": {
+            "group": "rgb",
+            "key": "RGB_MODE_XMAS",
+            "aliases": [
+                "RGB_M_X"
+            ]
+        },
+        "0x7832": {
+            "group": "rgb",
+            "key": "RGB_MODE_GRADIENT",
+            "aliases": [
+                "RGB_M_G"
+            ]
+        },
+        "0x7833": {
+            "group": "rgb",
+            "key": "RGB_MODE_RGBTEST",
+            "aliases": [
+                "RGB_M_T"
+            ]
+        },
+        "0x7834": {
+            "group": "rgb",
+            "key": "RGB_MODE_TWINKLE",
+            "aliases": [
+                "RGB_M_TW"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_macro.hjson b/data/constants/keycodes/keycodes_0.0.1_macro.hjson
new file mode 100644
index 0000000000..70b9ecf154
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_macro.hjson
@@ -0,0 +1,133 @@
+{
+    "keycodes": {
+
+        "0x7700": {
+            "group": "macro",
+            "key": "MACRO_0"
+        },
+        "0x7701": {
+            "group": "macro",
+            "key": "MACRO_1"
+        },
+        "0x7702": {
+            "group": "macro",
+            "key": "MACRO_2"
+        },
+        "0x7703": {
+            "group": "macro",
+            "key": "MACRO_3"
+        },
+        "0x7704": {
+            "group": "macro",
+            "key": "MACRO_4"
+        },
+        "0x7705": {
+            "group": "macro",
+            "key": "MACRO_5"
+        },
+        "0x7706": {
+            "group": "macro",
+            "key": "MACRO_6"
+        },
+        "0x7707": {
+            "group": "macro",
+            "key": "MACRO_7"
+        },
+        "0x7708": {
+            "group": "macro",
+            "key": "MACRO_8"
+        },
+        "0x7709": {
+            "group": "macro",
+            "key": "MACRO_9"
+        },
+        "0x770A": {
+            "group": "macro",
+            "key": "MACRO_10"
+        },
+        "0x770B": {
+            "group": "macro",
+            "key": "MACRO_11"
+        },
+        "0x770C": {
+            "group": "macro",
+            "key": "MACRO_12"
+        },
+        "0x770D": {
+            "group": "macro",
+            "key": "MACRO_13"
+        },
+        "0x770E": {
+            "group": "macro",
+            "key": "MACRO_14"
+        },
+        "0x770F": {
+            "group": "macro",
+            "key": "MACRO_15"
+        },
+        "0x7710": {
+            "group": "macro",
+            "key": "MACRO_16"
+        },
+        "0x7711": {
+            "group": "macro",
+            "key": "MACRO_17"
+        },
+        "0x7712": {
+            "group": "macro",
+            "key": "MACRO_18"
+        },
+        "0x7713": {
+            "group": "macro",
+            "key": "MACRO_19"
+        },
+        "0x7714": {
+            "group": "macro",
+            "key": "MACRO_20"
+        },
+        "0x7715": {
+            "group": "macro",
+            "key": "MACRO_21"
+        },
+        "0x7716": {
+            "group": "macro",
+            "key": "MACRO_22"
+        },
+        "0x7717": {
+            "group": "macro",
+            "key": "MACRO_23"
+        },
+        "0x7718": {
+            "group": "macro",
+            "key": "MACRO_24"
+        },
+        "0x7719": {
+            "group": "macro",
+            "key": "MACRO_25"
+        },
+        "0x771A": {
+            "group": "macro",
+            "key": "MACRO_26"
+        },
+        "0x771B": {
+            "group": "macro",
+            "key": "MACRO_27"
+        },
+        "0x771C": {
+            "group": "macro",
+            "key": "MACRO_28"
+        },
+        "0x771D": {
+            "group": "macro",
+            "key": "MACRO_29"
+        },
+        "0x771E": {
+            "group": "macro",
+            "key": "MACRO_30"
+        },
+        "0x771F": {
+            "group": "macro",
+            "key": "MACRO_31"
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_magic.hjson b/data/constants/keycodes/keycodes_0.0.1_magic.hjson
new file mode 100644
index 0000000000..7ee1f2bce9
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_magic.hjson
@@ -0,0 +1,249 @@
+{
+    "keycodes": {
+        "0x7000": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_CONTROL_CAPSLOCK",
+            "aliases": [
+                "CL_SWAP"
+            ]
+        },
+        "0x7001": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_CONTROL_CAPSLOCK",
+            "aliases": [
+                "CL_NORM"
+            ]
+        },
+        "0x7002": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_CONTROL_CAPSLOCK",
+            "aliases": [
+                "CL_TOGG"
+            ]
+        },
+        "0x7003": {
+            "group": "magic",
+            "key": "MAGIC_UNCAPSLOCK_TO_CONTROL",
+            "aliases": [
+                "CL_CAPS"
+            ]
+        },
+        "0x7004": {
+            "group": "magic",
+            "key": "MAGIC_CAPSLOCK_TO_CONTROL",
+            "aliases": [
+                "CL_CTRL"
+            ]
+        },
+        "0x7005": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_LALT_LGUI",
+            "aliases": [
+                "LAG_SWP"
+            ]
+        },
+        "0x7006": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_LALT_LGUI",
+            "aliases": [
+                "LAG_NRM"
+            ]
+        },
+        "0x7007": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_RALT_RGUI",
+            "aliases": [
+                "RAG_SWP"
+            ]
+        },
+        "0x7008": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_RALT_RGUI",
+            "aliases": [
+                "RAG_NRM"
+            ]
+        },
+        "0x7009": {
+            "group": "magic",
+            "key": "MAGIC_UNNO_GUI",
+            "aliases": [
+                "GUI_ON"
+            ]
+        },
+        "0x700A": {
+            "group": "magic",
+            "key": "MAGIC_NO_GUI",
+            "aliases": [
+                "GUI_OFF"
+            ]
+        },
+        "0x700B": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_GUI",
+            "aliases": [
+                "GUI_TOG"
+            ]
+        },
+        "0x700C": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_GRAVE_ESC",
+            "aliases": [
+                "GE_SWAP"
+            ]
+        },
+        "0x700D": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_GRAVE_ESC",
+            "aliases": [
+                "GE_NORM"
+            ]
+        },
+        "0x700E": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_BACKSLASH_BACKSPACE",
+            "aliases": [
+                "BS_SWAP"
+            ]
+        },
+        "0x700F": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_BACKSLASH_BACKSPACE",
+            "aliases": [
+                "BS_NORM"
+            ]
+        },
+        "0x7010": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_BACKSLASH_BACKSPACE",
+            "aliases": [
+                "BS_TOGG"
+            ]
+        },
+        "0x7011": {
+            "group": "magic",
+            "key": "MAGIC_HOST_NKRO",
+            "aliases": [
+                "NK_ON"
+            ]
+        },
+        "0x7012": {
+            "group": "magic",
+            "key": "MAGIC_UNHOST_NKRO",
+            "aliases": [
+                "NK_OFF"
+            ]
+        },
+        "0x7013": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_NKRO",
+            "aliases": [
+                "NK_TOGG"
+            ]
+        },
+        "0x7014": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_ALT_GUI",
+            "aliases": [
+                "AG_SWAP"
+            ]
+        },
+        "0x7015": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_ALT_GUI",
+            "aliases": [
+                "AG_NORM"
+            ]
+        },
+        "0x7016": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_ALT_GUI",
+            "aliases": [
+                "AG_TOGG"
+            ]
+        },
+        "0x7017": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_LCTL_LGUI",
+            "aliases": [
+                "LCG_SWP"
+            ]
+        },
+        "0x7018": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_LCTL_LGUI",
+            "aliases": [
+                "LCG_NRM"
+            ]
+        },
+        "0x7019": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_RCTL_RGUI",
+            "aliases": [
+                "RCG_SWP"
+            ]
+        },
+        "0x701A": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_RCTL_RGUI",
+            "aliases": [
+                "RCG_NRM"
+            ]
+        },
+        "0x701B": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_CTL_GUI",
+            "aliases": [
+                "CG_SWAP"
+            ]
+        },
+        "0x701C": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_CTL_GUI",
+            "aliases": [
+                "CG_NORM"
+            ]
+        },
+        "0x701D": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_CTL_GUI",
+            "aliases": [
+                "CG_TOGG"
+            ]
+        },
+        "0x701E": {
+            "group": "magic",
+            "key": "MAGIC_EE_HANDS_LEFT",
+            "aliases": [
+                "EH_LEFT"
+            ]
+        },
+        "0x701F": {
+            "group": "magic",
+            "key": "MAGIC_EE_HANDS_RIGHT",
+            "aliases": [
+                "EH_RGHT"
+            ]
+        },
+        "0x7020": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_ESCAPE_CAPSLOCK",
+            "aliases": [
+                "EC_SWAP"
+            ]
+        },
+        "0x7021": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_ESCAPE_CAPSLOCK",
+            "aliases": [
+                "EC_NORM"
+            ]
+        },
+        "0x7022": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_ESCAPE_CAPSLOCK",
+            "aliases": [
+                "EC_TOGG"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_midi.hjson b/data/constants/keycodes/keycodes_0.0.1_midi.hjson
new file mode 100644
index 0000000000..72d6e38900
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_midi.hjson
@@ -0,0 +1,670 @@
+{
+    "keycodes": {
+        "0x7100": {
+            "group": "midi",
+            "key": "MI_ON"
+        },
+        "0x7101": {
+            "group": "midi",
+            "key": "MI_OFF"
+        },
+        "0x7102": {
+            "group": "midi",
+            "key": "MI_TOG"
+        },
+        "0x7110": {
+            "group": "midi",
+            "key": "MI_C"
+        },
+        "0x7111": {
+            "group": "midi",
+            "key": "MI_Cs",
+            "aliases": [
+                "MI_Db"
+            ]
+        },
+        "0x7112": {
+            "group": "midi",
+            "key": "MI_D"
+        },
+        "0x7113": {
+            "group": "midi",
+            "key": "MI_Ds",
+            "aliases": [
+                "MI_Eb"
+            ]
+        },
+        "0x7114": {
+            "group": "midi",
+            "key": "MI_E"
+        },
+        "0x7115": {
+            "group": "midi",
+            "key": "MI_F"
+        },
+        "0x7116": {
+            "group": "midi",
+            "key": "MI_Fs",
+            "aliases": [
+                "MI_Gb"
+            ]
+        },
+        "0x7117": {
+            "group": "midi",
+            "key": "MI_G"
+        },
+        "0x7118": {
+            "group": "midi",
+            "key": "MI_Gs",
+            "aliases": [
+                "MI_Ab"
+            ]
+        },
+        "0x7119": {
+            "group": "midi",
+            "key": "MI_A"
+        },
+        "0x711A": {
+            "group": "midi",
+            "key": "MI_As",
+            "aliases": [
+                "MI_Bb"
+            ]
+        },
+        "0x711B": {
+            "group": "midi",
+            "key": "MI_B"
+        },
+        "0x7120": {
+            "group": "midi",
+            "key": "MI_C_1"
+        },
+        "0x7121": {
+            "group": "midi",
+            "key": "MI_Cs_1",
+            "aliases": [
+                "MI_Db_1"
+            ]
+        },
+        "0x7122": {
+            "group": "midi",
+            "key": "MI_D_1"
+        },
+        "0x7123": {
+            "group": "midi",
+            "key": "MI_Ds_1",
+            "aliases": [
+                "MI_Eb_1"
+            ]
+        },
+        "0x7124": {
+            "group": "midi",
+            "key": "MI_E_1"
+        },
+        "0x7125": {
+            "group": "midi",
+            "key": "MI_F_1"
+        },
+        "0x7126": {
+            "group": "midi",
+            "key": "MI_Fs_1",
+            "aliases": [
+                "MI_Gb_1"
+            ]
+        },
+        "0x7127": {
+            "group": "midi",
+            "key": "MI_G_1"
+        },
+        "0x7128": {
+            "group": "midi",
+            "key": "MI_Gs_1",
+            "aliases": [
+                "MI_Ab_1"
+            ]
+        },
+        "0x7129": {
+            "group": "midi",
+            "key": "MI_A_1"
+        },
+        "0x712A": {
+            "group": "midi",
+            "key": "MI_As_1",
+            "aliases": [
+                "MI_Bb_1"
+            ]
+        },
+        "0x712B": {
+            "group": "midi",
+            "key": "MI_B_1"
+        },
+        "0x7130": {
+            "group": "midi",
+            "key": "MI_C_2"
+        },
+        "0x7131": {
+            "group": "midi",
+            "key": "MI_Cs_2",
+            "aliases": [
+                "MI_Db_2"
+            ]
+        },
+        "0x7132": {
+            "group": "midi",
+            "key": "MI_D_2"
+        },
+        "0x7133": {
+            "group": "midi",
+            "key": "MI_Ds_2",
+            "aliases": [
+                "MI_Eb_2"
+            ]
+        },
+        "0x7134": {
+            "group": "midi",
+            "key": "MI_E_2"
+        },
+        "0x7135": {
+            "group": "midi",
+            "key": "MI_F_2"
+        },
+        "0x7136": {
+            "group": "midi",
+            "key": "MI_Fs_2",
+            "aliases": [
+                "MI_Gb_2"
+            ]
+        },
+        "0x7137": {
+            "group": "midi",
+            "key": "MI_G_2"
+        },
+        "0x7138": {
+            "group": "midi",
+            "key": "MI_Gs_2",
+            "aliases": [
+                "MI_Ab_2"
+            ]
+        },
+        "0x7139": {
+            "group": "midi",
+            "key": "MI_A_2"
+        },
+        "0x713A": {
+            "group": "midi",
+            "key": "MI_As_2",
+            "aliases": [
+                "MI_Bb_2"
+            ]
+        },
+        "0x713B": {
+            "group": "midi",
+            "key": "MI_B_2"
+        },
+        "0x7140": {
+            "group": "midi",
+            "key": "MI_C_3"
+        },
+        "0x7141": {
+            "group": "midi",
+            "key": "MI_Cs_3",
+            "aliases": [
+                "MI_Db_3"
+            ]
+        },
+        "0x7142": {
+            "group": "midi",
+            "key": "MI_D_3"
+        },
+        "0x7143": {
+            "group": "midi",
+            "key": "MI_Ds_3",
+            "aliases": [
+                "MI_Eb_3"
+            ]
+        },
+        "0x7144": {
+            "group": "midi",
+            "key": "MI_E_3"
+        },
+        "0x7145": {
+            "group": "midi",
+            "key": "MI_F_3"
+        },
+        "0x7146": {
+            "group": "midi",
+            "key": "MI_Fs_3",
+            "aliases": [
+                "MI_Gb_3"
+            ]
+        },
+        "0x7147": {
+            "group": "midi",
+            "key": "MI_G_3"
+        },
+        "0x7148": {
+            "group": "midi",
+            "key": "MI_Gs_3",
+            "aliases": [
+                "MI_Ab_3"
+            ]
+        },
+        "0x7149": {
+            "group": "midi",
+            "key": "MI_A_3"
+        },
+        "0x714A": {
+            "group": "midi",
+            "key": "MI_As_3",
+            "aliases": [
+                "MI_Bb_3"
+            ]
+        },
+        "0x714B": {
+            "group": "midi",
+            "key": "MI_B_3"
+        },
+        "0x7150": {
+            "group": "midi",
+            "key": "MI_C_4"
+        },
+        "0x7151": {
+            "group": "midi",
+            "key": "MI_Cs_4",
+            "aliases": [
+                "MI_Db_4"
+            ]
+        },
+        "0x7152": {
+            "group": "midi",
+            "key": "MI_D_4"
+        },
+        "0x7153": {
+            "group": "midi",
+            "key": "MI_Ds_4",
+            "aliases": [
+                "MI_Eb_4"
+            ]
+        },
+        "0x7154": {
+            "group": "midi",
+            "key": "MI_E_4"
+        },
+        "0x7155": {
+            "group": "midi",
+            "key": "MI_F_4"
+        },
+        "0x7156": {
+            "group": "midi",
+            "key": "MI_Fs_4",
+            "aliases": [
+                "MI_Gb_4"
+            ]
+        },
+        "0x7157": {
+            "group": "midi",
+            "key": "MI_G_4"
+        },
+        "0x7158": {
+            "group": "midi",
+            "key": "MI_Gs_4",
+            "aliases": [
+                "MI_Ab_4"
+            ]
+        },
+        "0x7159": {
+            "group": "midi",
+            "key": "MI_A_4"
+        },
+        "0x715A": {
+            "group": "midi",
+            "key": "MI_As_4",
+            "aliases": [
+                "MI_Bb_4"
+            ]
+        },
+        "0x715B": {
+            "group": "midi",
+            "key": "MI_B_4"
+        },
+        "0x7160": {
+            "group": "midi",
+            "key": "MI_C_5"
+        },
+        "0x7161": {
+            "group": "midi",
+            "key": "MI_Cs_5",
+            "aliases": [
+                "MI_Db_5"
+            ]
+        },
+        "0x7162": {
+            "group": "midi",
+            "key": "MI_D_5"
+        },
+        "0x7163": {
+            "group": "midi",
+            "key": "MI_Ds_5",
+            "aliases": [
+                "MI_Eb_5"
+            ]
+        },
+        "0x7164": {
+            "group": "midi",
+            "key": "MI_E_5"
+        },
+        "0x7165": {
+            "group": "midi",
+            "key": "MI_F_5"
+        },
+        "0x7166": {
+            "group": "midi",
+            "key": "MI_Fs_5",
+            "aliases": [
+                "MI_Gb_5"
+            ]
+        },
+        "0x7167": {
+            "group": "midi",
+            "key": "MI_G_5"
+        },
+        "0x7168": {
+            "group": "midi",
+            "key": "MI_Gs_5",
+            "aliases": [
+                "MI_Ab_5"
+            ]
+        },
+        "0x7169": {
+            "group": "midi",
+            "key": "MI_A_5"
+        },
+        "0x716A": {
+            "group": "midi",
+            "key": "MI_As_5",
+            "aliases": [
+                "MI_Bb_5"
+            ]
+        },
+        "0x716B": {
+            "group": "midi",
+            "key": "MI_B_5"
+        },
+        "0x7170": {
+            "group": "midi",
+            "key": "MI_OCT_N2"
+        },
+        "0x7171": {
+            "group": "midi",
+            "key": "MI_OCT_N1"
+        },
+        "0x7172": {
+            "group": "midi",
+            "key": "MI_OCT_0"
+        },
+        "0x7173": {
+            "group": "midi",
+            "key": "MI_OCT_1"
+        },
+        "0x7174": {
+            "group": "midi",
+            "key": "MI_OCT_2"
+        },
+        "0x7175": {
+            "group": "midi",
+            "key": "MI_OCT_3"
+        },
+        "0x7176": {
+            "group": "midi",
+            "key": "MI_OCT_4"
+        },
+        "0x7177": {
+            "group": "midi",
+            "key": "MI_OCT_5"
+        },
+        "0x7178": {
+            "group": "midi",
+            "key": "MI_OCT_6"
+        },
+        "0x7179": {
+            "group": "midi",
+            "key": "MI_OCT_7"
+        },
+        "0x717A": {
+            "group": "midi",
+            "key": "MI_OCTD"
+        },
+        "0x717B": {
+            "group": "midi",
+            "key": "MI_OCTU"
+        },
+        "0x7180": {
+            "group": "midi",
+            "key": "MI_TRNS_N6"
+        },
+        "0x7181": {
+            "group": "midi",
+            "key": "MI_TRNS_N5"
+        },
+        "0x7182": {
+            "group": "midi",
+            "key": "MI_TRNS_N4"
+        },
+        "0x7183": {
+            "group": "midi",
+            "key": "MI_TRNS_N3"
+        },
+        "0x7184": {
+            "group": "midi",
+            "key": "MI_TRNS_N2"
+        },
+        "0x7185": {
+            "group": "midi",
+            "key": "MI_TRNS_N1"
+        },
+        "0x7186": {
+            "group": "midi",
+            "key": "MI_TRNS_0"
+        },
+        "0x7187": {
+            "group": "midi",
+            "key": "MI_TRNS_1"
+        },
+        "0x7188": {
+            "group": "midi",
+            "key": "MI_TRNS_2"
+        },
+        "0x7189": {
+            "group": "midi",
+            "key": "MI_TRNS_3"
+        },
+        "0x718A": {
+            "group": "midi",
+            "key": "MI_TRNS_4"
+        },
+        "0x718B": {
+            "group": "midi",
+            "key": "MI_TRNS_5"
+        },
+        "0x718C": {
+            "group": "midi",
+            "key": "MI_TRNS_6"
+        },
+        "0x718D": {
+            "group": "midi",
+            "key": "MI_TRNSD"
+        },
+        "0x718E": {
+            "group": "midi",
+            "key": "MI_TRNSU"
+        },
+        "0x7190": {
+            "group": "midi",
+            "key": "MI_VEL_0"
+        },
+        "0x7191": {
+            "group": "midi",
+            "key": "MI_VEL_1"
+        },
+        "0x7192": {
+            "group": "midi",
+            "key": "MI_VEL_2"
+        },
+        "0x7193": {
+            "group": "midi",
+            "key": "MI_VEL_3"
+        },
+        "0x7194": {
+            "group": "midi",
+            "key": "MI_VEL_4"
+        },
+        "0x7195": {
+            "group": "midi",
+            "key": "MI_VEL_5"
+        },
+        "0x7196": {
+            "group": "midi",
+            "key": "MI_VEL_6"
+        },
+        "0x7197": {
+            "group": "midi",
+            "key": "MI_VEL_7"
+        },
+        "0x7198": {
+            "group": "midi",
+            "key": "MI_VEL_8"
+        },
+        "0x7199": {
+            "group": "midi",
+            "key": "MI_VEL_9"
+        },
+        "0x719A": {
+            "group": "midi",
+            "key": "MI_VEL_10"
+        },
+        "0x719B": {
+            "group": "midi",
+            "key": "MI_VELD"
+        },
+        "0x719C": {
+            "group": "midi",
+            "key": "MI_VELU"
+        },
+        "0x71A0": {
+            "group": "midi",
+            "key": "MI_CH1"
+        },
+        "0x71A1": {
+            "group": "midi",
+            "key": "MI_CH2"
+        },
+        "0x71A2": {
+            "group": "midi",
+            "key": "MI_CH3"
+        },
+        "0x71A3": {
+            "group": "midi",
+            "key": "MI_CH4"
+        },
+        "0x71A4": {
+            "group": "midi",
+            "key": "MI_CH5"
+        },
+        "0x71A5": {
+            "group": "midi",
+            "key": "MI_CH6"
+        },
+        "0x71A6": {
+            "group": "midi",
+            "key": "MI_CH7"
+        },
+        "0x71A7": {
+            "group": "midi",
+            "key": "MI_CH8"
+        },
+        "0x71A8": {
+            "group": "midi",
+            "key": "MI_CH9"
+        },
+        "0x71A9": {
+            "group": "midi",
+            "key": "MI_CH10"
+        },
+        "0x71AA": {
+            "group": "midi",
+            "key": "MI_CH11"
+        },
+        "0x71AB": {
+            "group": "midi",
+            "key": "MI_CH12"
+        },
+        "0x71AC": {
+            "group": "midi",
+            "key": "MI_CH13"
+        },
+        "0x71AD": {
+            "group": "midi",
+            "key": "MI_CH14"
+        },
+        "0x71AE": {
+            "group": "midi",
+            "key": "MI_CH15"
+        },
+        "0x71AF": {
+            "group": "midi",
+            "key": "MI_CH16"
+        },
+        "0x71B0": {
+            "group": "midi",
+            "key": "MI_CHD"
+        },
+        "0x71B1": {
+            "group": "midi",
+            "key": "MI_CHU"
+        },
+        "0x71C0": {
+            "group": "midi",
+            "key": "MI_ALLOFF"
+        },
+        "0x71C1": {
+            "group": "midi",
+            "key": "MI_SUS"
+        },
+        "0x71C2": {
+            "group": "midi",
+            "key": "MI_PORT"
+        },
+        "0x71C3": {
+            "group": "midi",
+            "key": "MI_SOST"
+        },
+        "0x71C4": {
+            "group": "midi",
+            "key": "MI_SOFT"
+        },
+        "0x71C5": {
+            "group": "midi",
+            "key": "MI_LEG"
+        },
+        "0x71C6": {
+            "group": "midi",
+            "key": "MI_MOD"
+        },
+        "0x71C7": {
+            "group": "midi",
+            "key": "MI_MODSD"
+        },
+        "0x71C8": {
+            "group": "midi",
+            "key": "MI_MODSU"
+        },
+        "0x71C9": {
+            "group": "midi",
+            "key": "MI_BENDD"
+        },
+        "0x71CA": {
+            "group": "midi",
+            "key": "MI_BENDU"
+        }
+    }
+}
diff --git a/data/constants/keycodes/keycodes_0.0.1_programmable_button.hjson b/data/constants/keycodes/keycodes_0.0.1_programmable_button.hjson
new file mode 100644
index 0000000000..645bcd6a39
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_programmable_button.hjson
@@ -0,0 +1,228 @@
+{
+    "keycodes": {
+        "0x7440": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_1",
+            "aliases": [
+                "PB_1"
+            ]
+        },
+        "0x7441": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_2",
+            "aliases": [
+                "PB_2"
+            ]
+        },
+        "0x7442": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_3",
+            "aliases": [
+                "PB_3"
+            ]
+        },
+        "0x7443": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_4",
+            "aliases": [
+                "PB_4"
+            ]
+        },
+        "0x7444": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_5",
+            "aliases": [
+                "PB_5"
+            ]
+        },
+        "0x7445": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_6",
+            "aliases": [
+                "PB_6"
+            ]
+        },
+        "0x7446": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_7",
+            "aliases": [
+                "PB_7"
+            ]
+        },
+        "0x7447": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_8",
+            "aliases": [
+                "PB_8"
+            ]
+        },
+        "0x7448": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_9",
+            "aliases": [
+                "PB_9"
+            ]
+        },
+        "0x7449": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_10",
+            "aliases": [
+                "PB_10"
+            ]
+        },
+        "0x744A": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_11",
+            "aliases": [
+                "PB_11"
+            ]
+        },
+        "0x744B": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_12",
+            "aliases": [
+                "PB_12"
+            ]
+        },
+        "0x744C": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_13",
+            "aliases": [
+                "PB_13"
+            ]
+        },
+        "0x744D": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_14",
+            "aliases": [
+                "PB_14"
+            ]
+        },
+        "0x744E": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_15",
+            "aliases": [
+                "PB_15"
+            ]
+        },
+        "0x744F": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_16",
+            "aliases": [
+                "PB_16"
+            ]
+        },
+        "0x7450": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_17",
+            "aliases": [
+                "PB_17"
+            ]
+        },
+        "0x7451": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_18",
+            "aliases": [
+                "PB_18"
+            ]
+        },
+        "0x7452": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_19",
+            "aliases": [
+                "PB_19"
+            ]
+        },
+        "0x7453": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_20",
+            "aliases": [
+                "PB_20"
+            ]
+        },
+        "0x7454": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_21",
+            "aliases": [
+                "PB_21"
+            ]
+        },
+        "0x7455": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_22",
+            "aliases": [
+                "PB_22"
+            ]
+        },
+        "0x7456": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_23",
+            "aliases": [
+                "PB_23"
+            ]
+        },
+        "0x7457": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_24",
+            "aliases": [
+                "PB_24"
+            ]
+        },
+        "0x7458": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_25",
+            "aliases": [
+                "PB_25"
+            ]
+        },
+        "0x7459": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_26",
+            "aliases": [
+                "PB_26"
+            ]
+        },
+        "0x745A": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_27",
+            "aliases": [
+                "PB_27"
+            ]
+        },
+        "0x745B": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_28",
+            "aliases": [
+                "PB_28"
+            ]
+        },
+        "0x745C": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_29",
+            "aliases": [
+                "PB_29"
+            ]
+        },
+        "0x745D": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_30",
+            "aliases": [
+                "PB_30"
+            ]
+        },
+        "0x745E": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_31",
+            "aliases": [
+                "PB_31"
+            ]
+        },
+        "0x745F": {
+            "group": "programmable_button",
+            "key": "QK_PROGRAMMABLE_BUTTON_32",
+            "aliases": [
+                "PB_32"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
new file mode 100644
index 0000000000..ceb9d4d16c
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
@@ -0,0 +1,464 @@
+{
+    "keycodes": {
+        "0x7C00": {
+            "group": "quantum",
+            "key": "QK_BOOTLOADER",
+            "aliases": [
+                "QK_BOOT"
+            ]
+        },
+        "0x7C01": {
+            "group": "quantum",
+            "key": "QK_REBOOT",
+            "aliases": [
+                "QK_RBT"
+            ]
+        },
+        "0x7C02": {
+            "group": "quantum",
+            "key": "QK_DEBUG_TOGGLE",
+            "aliases": [
+                "DB_TOGG"
+            ]
+        },
+        "0x7C03": {
+            "group": "quantum",
+            "key": "QK_CLEAR_EEPROM",
+            "aliases": [
+                "EE_CLR"
+            ]
+        },
+        "0x7C04": {
+            "group": "quantum",
+            "key": "QK_MAKE"
+        },
+
+        "0x7C10": {
+            "group": "quantum",
+            "key": "QK_AUTO_SHIFT_DOWN",
+            "aliases": [
+                "AS_DOWN"
+            ]
+        },
+        "0x7C11": {
+            "group": "quantum",
+            "key": "QK_AUTO_SHIFT_UP",
+            "aliases": [
+                "AS_UP"
+            ]
+        },
+        "0x7C12": {
+            "group": "quantum",
+            "key": "QK_AUTO_SHIFT_REPORT",
+            "aliases": [
+                "AS_RPT"
+            ]
+        },
+        "0x7C13": {
+            "group": "quantum",
+            "key": "QK_AUTO_SHIFT_ON",
+            "aliases": [
+                "AS_ON"
+            ]
+        },
+        "0x7C14": {
+            "group": "quantum",
+            "key": "QK_AUTO_SHIFT_OFF",
+            "aliases": [
+                "AS_OFF"
+            ]
+        },
+        "0x7C15": {
+            "group": "quantum",
+            "key": "QK_AUTO_SHIFT_TOGGLE",
+            "aliases": [
+                "AS_TOGG"
+            ]
+        },
+
+        "0x7C16": {
+            "group": "quantum",
+            "key": "QK_GRAVE_ESCAPE",
+            "aliases": [
+                "QK_GESC"
+            ]
+        },
+
+        "0x7C17": {
+            "group": "quantum",
+            "key": "QK_VELOCIKEY_TOGGLE",
+            "aliases": [
+                "VK_TOGG"
+            ]
+        },
+
+        "0x7C18": {
+            "group": "quantum",
+            "key": "QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN",
+            "aliases": [
+                "SC_LCPO"
+            ]
+        },
+        "0x7C19": {
+            "group": "quantum",
+            "key": "QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE",
+            "aliases": [
+                "SC_RCPC"
+            ]
+        },
+        "0x7C1A": {
+            "group": "quantum",
+            "key": "QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN",
+            "aliases": [
+                "SC_LSPO"
+            ]
+        },
+        "0x7C1B": {
+            "group": "quantum",
+            "key": "QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE",
+            "aliases": [
+                "SC_RSPC"
+            ]
+        },
+        "0x7C1C": {
+            "group": "quantum",
+            "key": "QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN",
+            "aliases": [
+                "SC_LAPO"
+            ]
+        },
+        "0x7C1D": {
+            "group": "quantum",
+            "key": "QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE",
+            "aliases": [
+                "SC_RAPC"
+            ]
+        },
+        "0x7C1E": {
+            "group": "quantum",
+            "key": "QK_SPACE_CADET_RIGHT_SHIFT_ENTER",
+            "aliases": [
+                "SC_SENT"
+            ]
+        },
+
+        "0x7C20": {
+            "group": "quantum",
+            "key": "OUT_AUTO"
+        },
+        "0x7C21": {
+            "group": "quantum",
+            "key": "OUT_USB"
+        },
+        "0x7C22": {
+            "group": "quantum",
+            "key": "OUT_BT"
+        },
+
+        "0x7C30": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_NEXT",
+            "aliases": [
+                "UC_NEXT"
+            ]
+        },
+        "0x7C31": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_PREVIOUS",
+            "aliases": [
+                "UC_PREV"
+            ]
+        },
+        "0x7C32": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_MACOS",
+            "aliases": [
+                "UC_MAC"
+            ]
+        },
+        "0x7C33": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_LINUX",
+            "aliases": [
+                "UC_LINX"
+            ]
+        },
+        "0x7C34": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_WINDOWS",
+            "aliases": [
+                "UC_WIN"
+            ]
+        },
+        "0x7C35": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_BSD",
+            "aliases": [
+                "UC_BSD"
+            ]
+        },
+        "0x7C36": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_WINCOMPOSE",
+            "aliases": [
+                "UC_WINC"
+            ]
+        },
+        "0x7C37": {
+            "group": "quantum",
+            "key": "QK_UNICODE_MODE_EMACS",
+            "aliases": [
+                "UC_EMAC"
+            ]
+        },
+
+        "0x7C40": {
+            "group": "quantum",
+            "key": "HPT_ON"
+        },
+        "0x7C41": {
+            "group": "quantum",
+            "key": "HPT_OFF"
+        },
+        "0x7C42": {
+            "group": "quantum",
+            "key": "HPT_TOG"
+        },
+        "0x7C43": {
+            "group": "quantum",
+            "key": "HPT_RST"
+        },
+        "0x7C44": {
+            "group": "quantum",
+            "key": "HPT_FBK"
+        },
+        "0x7C45": {
+            "group": "quantum",
+            "key": "HPT_BUZ"
+        },
+        "0x7C46": {
+            "group": "quantum",
+            "key": "HPT_MODI"
+        },
+        "0x7C47": {
+            "group": "quantum",
+            "key": "HPT_MODD"
+        },
+        "0x7C48": {
+            "group": "quantum",
+            "key": "HPT_CONT"
+        },
+        "0x7C49": {
+            "group": "quantum",
+            "key": "HPT_CONI"
+        },
+        "0x7C4A": {
+            "group": "quantum",
+            "key": "HPT_COND"
+        },
+        "0x7C4B": {
+            "group": "quantum",
+            "key": "HPT_DWLI"
+        },
+        "0x7C4C": {
+            "group": "quantum",
+            "key": "HPT_DWLD"
+        },
+
+        "0x7C50": {
+            "group": "quantum",
+            "key": "QK_COMBO_ON",
+            "aliases": [
+                "CM_ON"
+            ]
+        },
+        "0x7C51": {
+            "group": "quantum",
+            "key": "QK_COMBO_OFF",
+            "aliases": [
+                "CM_OFF"
+            ]
+        },
+        "0x7C52": {
+            "group": "quantum",
+            "key": "QK_COMBO_TOGGLE",
+            "aliases": [
+                "CM_TOGG"
+            ]
+        },
+
+        "0x7C53": {
+            "group": "quantum",
+            "key": "QK_DYNAMIC_MACRO_RECORD_START_1",
+            "aliases": [
+                "DM_REC1"
+            ]
+        },
+        "0x7C54": {
+            "group": "quantum",
+            "key": "QK_DYNAMIC_MACRO_RECORD_START_2",
+            "aliases": [
+                "DM_REC2"
+            ]
+        },
+        "0x7C55": {
+            "group": "quantum",
+            "key": "QK_DYNAMIC_MACRO_RECORD_STOP",
+            "aliases": [
+                "DM_RSTP"
+            ]
+        },
+        "0x7C56": {
+            "group": "quantum",
+            "key": "QK_DYNAMIC_MACRO_PLAY_1",
+            "aliases": [
+                "DM_PLY1"
+            ]
+        },
+        "0x7C57": {
+            "group": "quantum",
+            "key": "QK_DYNAMIC_MACRO_PLAY_2",
+            "aliases": [
+                "DM_PLY2"
+            ]
+        },
+
+        "0x7C58": {
+            "group": "quantum",
+            "key": "QK_LEADER",
+            "aliases": [
+                "QK_LEAD"
+            ]
+        },
+
+        "0x7C59": {
+            "group": "quantum",
+            "key": "QK_LOCK"
+        },
+
+        "0x7C5A": {
+            "group": "quantum",
+            "key": "QK_ONE_SHOT_ON",
+            "aliases": [
+                "OS_ON"
+            ]
+        },
+        "0x7C5B": {
+            "group": "quantum",
+            "key": "QK_ONE_SHOT_OFF",
+            "aliases": [
+                "OS_OFF"
+            ]
+        },
+        "0x7C5C": {
+            "group": "quantum",
+            "key": "QK_ONE_SHOT_TOGGLE",
+            "aliases": [
+                "OS_TOGG"
+            ]
+        },
+
+        "0x7C5D": {
+            "group": "quantum",
+            "key": "QK_KEY_OVERRIDE_TOGGLE",
+            "aliases": [
+                "KO_TOGG"
+            ]
+        },
+        "0x7C5E": {
+            "group": "quantum",
+            "key": "QK_KEY_OVERRIDE_ON",
+            "aliases": [
+                "KO_ON"
+            ]
+        },
+        "0x7C5F": {
+            "group": "quantum",
+            "key": "QK_KEY_OVERRIDE_OFF",
+            "aliases": [
+                "KO_OFF"
+            ]
+        },
+
+        "0x7C60": {
+            "group": "quantum",
+            "key": "QK_SECURE_LOCK",
+            "aliases": [
+                "SE_LOCK"
+            ]
+        },
+        "0x7C61": {
+            "group": "quantum",
+            "key": "QK_SECURE_UNLOCK",
+            "aliases": [
+                "SE_UNLK"
+            ]
+        },
+        "0x7C62": {
+            "group": "quantum",
+            "key": "QK_SECURE_TOGGLE",
+            "aliases": [
+                "SE_TOGG"
+            ]
+        },
+        "0x7C63": {
+            "group": "quantum",
+            "key": "QK_SECURE_REQUEST",
+            "aliases": [
+                "SE_REQ"
+            ]
+        },
+
+        "0x7C70": {
+            "group": "quantum",
+            "key": "DT_PRNT"
+        },
+        "0x7C71": {
+            "group": "quantum",
+            "key": "DT_UP"
+        },
+        "0x7C72": {
+            "group": "quantum",
+            "key": "DT_DOWN"
+        },
+
+        "0x7C73": {
+            "group": "quantum",
+            "key": "PRINT_ON"
+        },
+        "0x7C74": {
+            "group": "quantum",
+            "key": "PRINT_OFF"
+        },
+
+        "0x7C75": {
+            "group": "quantum",
+            "key": "QK_CAPS_WORD_TOGGLE",
+            "aliases": [
+                "CW_TOGG"
+            ]
+        },
+
+        "0x7C76": {
+            "group": "quantum",
+            "key": "QK_AUTOCORRECT_ON",
+            "aliases": [
+                "AC_ON"
+            ]
+        },
+        "0x7C77": {
+            "group": "quantum",
+            "key": "QK_AUTOCORRECT_OFF",
+            "aliases": [
+                "AC_OFF"
+            ]
+        },
+        "0x7C78": {
+            "group": "quantum",
+            "key": "QK_AUTOCORRECT_TOGGLE",
+            "aliases": [
+                "AC_TOGG"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_sequencer.hjson b/data/constants/keycodes/keycodes_0.0.1_sequencer.hjson
new file mode 100644
index 0000000000..039d09b2fa
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_sequencer.hjson
@@ -0,0 +1,40 @@
+{
+    "keycodes": {
+        "0x7200": {
+            "group": "sequencer",
+            "key": "SQ_ON"
+        },
+        "0x7201": {
+            "group": "sequencer",
+            "key": "SQ_OFF"
+        },
+        "0x7202": {
+            "group": "sequencer",
+            "key": "SQ_TOG"
+        },
+        "0x7203": {
+            "group": "sequencer",
+            "key": "SQ_TMPD"
+        },
+        "0x7204": {
+            "group": "sequencer",
+            "key": "SQ_TMPU"
+        },
+        "0x7205": {
+            "group": "sequencer",
+            "key": "SQ_RESD"
+        },
+        "0x7206": {
+            "group": "sequencer",
+            "key": "SQ_RESU"
+        },
+        "0x7207": {
+            "group": "sequencer",
+            "key": "SQ_SALL"
+        },
+        "0x7208": {
+            "group": "sequencer",
+            "key": "SQ_SCLR"
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/constants/keycodes/keycodes_0.0.1_steno.hjson b/data/constants/keycodes/keycodes_0.0.1_steno.hjson
new file mode 100644
index 0000000000..cd19fdcde5
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_steno.hjson
@@ -0,0 +1,20 @@
+{
+    "keycodes": {
+        "0x74F0": {
+            "group": "steno",
+            "key": "QK_STENO_BOLT"
+        },
+        "0x74F1": {
+            "group": "steno",
+            "key": "QK_STENO_GEMINI"
+        },
+        "0x74F2": {
+            "group": "steno",
+            "key": "QK_STENO_COMB"
+        },
+        "0x74FC": {
+            "group": "steno",
+            "key": "QK_STENO_COMB_MAX"
+        }
+    }
+}
diff --git a/data/constants/keycodes/keycodes_0.0.1_swap_hands.hjson b/data/constants/keycodes/keycodes_0.0.1_swap_hands.hjson
new file mode 100644
index 0000000000..c800baef35
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.1_swap_hands.hjson
@@ -0,0 +1,32 @@
+{
+    "keycodes": {
+        "0x56F0": {
+            "group": "swap_hands",
+            "key": "SH_TG"
+        },
+        "0x56F1": {
+            "group": "swap_hands",
+            "key": "SH_TT"
+        },
+        "0x56F2": {
+            "group": "swap_hands",
+            "key": "SH_MON"
+        },
+        "0x56F3": {
+            "group": "swap_hands",
+            "key": "SH_MOFF"
+        },
+        "0x56F4": {
+            "group": "swap_hands",
+            "key": "SH_OFF"
+        },
+        "0x56F5": {
+            "group": "swap_hands",
+            "key": "SH_ON"
+        },
+        "0x56F6": {
+            "group": "swap_hands",
+            "key": "SH_OS"
+        }
+    }
+}
diff --git a/data/schemas/keycodes.jsonschema b/data/schemas/keycodes.jsonschema
new file mode 100644
index 0000000000..77a8347b3b
--- /dev/null
+++ b/data/schemas/keycodes.jsonschema
@@ -0,0 +1,57 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema#",
+    "$id": "qmk.keycodes.v1",
+    "title": "Keycode Information",
+    "type": "object",
+    "definitions": {
+        "define": {
+            "type": "string",
+            "minLength": 2,
+            "maxLength": 50,
+            "pattern": "^[A-Zs_0-9]*$"
+        },
+        "hex_number_4d": {
+            "type": "string",
+            "pattern": "^0x[0-9A-F]{4}$"
+        }
+    },
+    "properties": {
+        "ranges": {
+            "type": "object",
+            "propertyNames": {
+                "type": "string"
+            },
+            "additionalProperties": {
+                "type": "object",
+                "required": [
+                    "define"
+                ],
+                "properties": {
+                    "define": {"$ref": "#/definitions/define"}
+                }
+            }
+        },
+        "keycodes": {
+            "type": "object",
+            "propertyNames": {
+                "$ref": "#/definitions/hex_number_4d"
+            },
+            "additionalProperties": {
+                "type": "object",
+                "required": [
+                    "key"
+                ],
+                "properties": {
+                    "key": {"$ref": "#/definitions/define"},
+                    "aliases": {
+                        "type": "array",
+                        "minItems": 1,
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index cf5b5ad87e..9190af4e50 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -56,6 +56,7 @@ subcommands = [
     'qmk.cli.generate.info_json',
     'qmk.cli.generate.keyboard_c',
     'qmk.cli.generate.keyboard_h',
+    'qmk.cli.generate.keycodes',
     'qmk.cli.generate.rgb_breathe_table',
     'qmk.cli.generate.rules_mk',
     'qmk.cli.generate.version_h',
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 8d8ca3cd41..0f29cd2327 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -11,12 +11,23 @@ from qmk.info import info_json
 from qmk.json_encoders import InfoJSONEncoder
 from qmk.json_schema import json_load
 from qmk.keyboard import find_readme, list_keyboards
+from qmk.keycodes import load_spec, list_versions
 
 DATA_PATH = Path('data')
 TEMPLATE_PATH = DATA_PATH / 'templates/api/'
 BUILD_API_PATH = Path('.build/api_data/')
 
 
+def _resolve_keycode_specs(output_folder):
+    """To make it easier for consumers, publish pre-merged spec files
+    """
+    for version in list_versions():
+        overall = load_spec(version)
+
+        output_file = output_folder / f'constants/keycodes_{version}.json'
+        output_file.write_text(json.dumps(overall, indent=4), encoding='utf-8')
+
+
 def _filtered_keyboard_list():
     """Perform basic filtering of list_keyboards
     """
@@ -95,6 +106,9 @@ def generate_api(cli):
         'usb': usb_list,
     }
 
+    # Feature specific handling
+    _resolve_keycode_specs(v1_dir)
+
     # Write the global JSON files
     keyboard_all_json = json.dumps({'last_updated': current_datetime(), 'keyboards': kb_all}, cls=InfoJSONEncoder)
     usb_json = json.dumps({'last_updated': current_datetime(), 'usb': usb_list}, cls=InfoJSONEncoder)
diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py
new file mode 100644
index 0000000000..29b7db3c80
--- /dev/null
+++ b/lib/python/qmk/cli/generate/keycodes.py
@@ -0,0 +1,88 @@
+"""Used by the make system to generate keycodes.h from keycodes_{version}.json
+"""
+from milc import cli
+
+from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
+from qmk.commands import dump_lines
+from qmk.path import normpath
+from qmk.keycodes import load_spec
+
+
+def _generate_ranges(lines, keycodes):
+    lines.append('')
+    lines.append('enum qk_keycode_ranges {')
+    lines.append('// Ranges')
+    for key, value in keycodes["ranges"].items():
+        lo, mask = map(lambda x: int(x, 16), key.split("/"))
+        hi = lo + mask
+        define = value.get("define")
+        lines.append(f'    {define.ljust(30)} = 0x{lo:04X},')
+        lines.append(f'    {(define + "_MAX").ljust(30)} = 0x{hi:04X},')
+    lines.append('};')
+
+
+def _generate_defines(lines, keycodes):
+    lines.append('')
+    lines.append('enum qk_keycode_defines {')
+    lines.append('// Keycodes')
+    for key, value in keycodes["keycodes"].items():
+        lines.append(f'    {value.get("key")} = {key},')
+
+    lines.append('')
+    lines.append('// Alias')
+    for key, value in keycodes["keycodes"].items():
+        temp = value.get("key")
+        for alias in value.get("aliases", []):
+            lines.append(f'    {alias.ljust(10)} = {temp},')
+
+    lines.append('};')
+
+
+def _generate_helpers(lines, keycodes):
+    lines.append('')
+    lines.append('// Range Helpers')
+    for value in keycodes["ranges"].values():
+        define = value.get("define")
+        lines.append(f'#define IS_{define}(code) ((code) >= {define} && (code) <= {define + "_MAX"})')
+
+    # extract min/max
+    temp = {}
+    for key, value in keycodes["keycodes"].items():
+        group = value.get('group', None)
+        if not group:
+            continue
+        if group not in temp:
+            temp[group] = [0xFFFF, 0]
+        key = int(key, 16)
+        if key < temp[group][0]:
+            temp[group][0] = key
+        if key > temp[group][1]:
+            temp[group][1] = key
+
+    lines.append('')
+    lines.append('// Group Helpers')
+    for group, codes in temp.items():
+        lo = keycodes["keycodes"][f'0x{codes[0]:04X}']['key']
+        hi = keycodes["keycodes"][f'0x{codes[1]:04X}']['key']
+        lines.append(f'#define IS_{ group.upper() }_KEYCODE(code) ((code) >= {lo} && (code) <= {hi})')
+
+
+@cli.argument('-v', '--version', arg_only=True, required=True, help='Version of keycodes to generate.')
+@cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
+@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
+@cli.subcommand('Used by the make system to generate keycodes.h from keycodes_{version}.json', hidden=True)
+def generate_keycodes(cli):
+    """Generates the keycodes.h file.
+    """
+
+    # Build the keycodes.h file.
+    keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '// clang-format off']
+
+    keycodes = load_spec(cli.args.version)
+
+    _generate_ranges(keycodes_h_lines, keycodes)
+    _generate_defines(keycodes_h_lines, keycodes)
+    _generate_helpers(keycodes_h_lines, keycodes)
+
+    # Show the results
+    dump_lines(cli.args.output, keycodes_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/keycodes.py b/lib/python/qmk/keycodes.py
new file mode 100644
index 0000000000..cf1ee0767a
--- /dev/null
+++ b/lib/python/qmk/keycodes.py
@@ -0,0 +1,57 @@
+from pathlib import Path
+
+from qmk.json_schema import deep_update, json_load, validate
+
+CONSTANTS_PATH = Path('data/constants/keycodes/')
+
+
+def _validate(spec):
+    # first throw it to the jsonschema
+    validate(spec, 'qmk.keycodes.v1')
+
+    # no duplicate keycodes
+    keycodes = []
+    for value in spec['keycodes'].values():
+        keycodes.append(value['key'])
+        keycodes.extend(value.get('aliases', []))
+    duplicates = set([x for x in keycodes if keycodes.count(x) > 1])
+    if duplicates:
+        raise ValueError(f'Keycode spec contains duplicate keycodes! ({",".join(duplicates)})')
+
+
+def load_spec(version):
+    """Build keycode data from the requested spec file
+    """
+    if version == 'latest':
+        version = list_versions()[0]
+
+    file = CONSTANTS_PATH / f'keycodes_{version}.hjson'
+    if not file.exists():
+        raise ValueError(f'Requested keycode spec ({version}) is invalid!')
+
+    # Load base
+    spec = json_load(file)
+
+    # Merge in fragments
+    fragments = CONSTANTS_PATH.glob(f'keycodes_{version}_*.hjson')
+    for file in fragments:
+        deep_update(spec, json_load(file))
+
+    # Sort?
+    spec['keycodes'] = dict(sorted(spec['keycodes'].items()))
+
+    # Validate?
+    _validate(spec)
+
+    return spec
+
+
+def list_versions():
+    """Return available versions - sorted newest first
+    """
+    ret = []
+    for file in CONSTANTS_PATH.glob('keycodes_[0-9].[0-9].[0-9].hjson'):
+        ret.append(file.stem.split('_')[1])
+
+    ret.sort(reverse=True)
+    return ret
diff --git a/quantum/action_code.h b/quantum/action_code.h
index 14cfd025f1..58d929016d 100644
--- a/quantum/action_code.h
+++ b/quantum/action_code.h
@@ -179,6 +179,9 @@ enum mods_bit {
     MOD_RALT = 0x14,
     MOD_RGUI = 0x18,
 };
+#define MOD_HYPR (MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI)
+#define MOD_MEH (MOD_LCTL | MOD_LSFT | MOD_LALT)
+
 enum mods_codes {
     MODS_ONESHOT    = 0x00,
     MODS_TAP_TOGGLE = 0x01,
diff --git a/quantum/keycode.h b/quantum/keycode.h
index 2e9a85ee66..45736e92f1 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -26,16 +26,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* FIXME: Add doxygen comments here */
 
-#define IS_ERROR(code) (KC_ROLL_OVER <= (code) && (code) <= KC_UNDEFINED)
 #define IS_ANY(code) (KC_A <= (code) && (code) <= 0xFF)
-#define IS_KEY(code) (KC_A <= (code) && (code) <= KC_EXSEL)
-#define IS_MOD(code) (KC_LEFT_CTRL <= (code) && (code) <= KC_RIGHT_GUI)
+#define IS_KEY(code) IS_BASIC_KEYCODE(code)
+#define IS_MOD(code) IS_MODIFIERS_KEYCODE(code)
 
-#define IS_SPECIAL(code) ((0xA5 <= (code) && (code) <= 0xDF) || (0xE8 <= (code) && (code) <= 0xFF))
-#define IS_SYSTEM(code) (KC_PWR <= (code) && (code) <= KC_WAKE)
-#define IS_CONSUMER(code) (KC_MUTE <= (code) && (code) <= KC_ASST)
+#define IS_SYSTEM(code) IS_SYSTEM_KEYCODE(code)
+#define IS_CONSUMER(code) IS_MEDIA_KEYCODE(code)
 
-#define IS_MOUSEKEY(code) (KC_MS_UP <= (code) && (code) <= KC_MS_ACCEL2)
+#define IS_MOUSEKEY(code) IS_MOUSE_KEYCODE(code)
 #define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT)
 #define IS_MOUSEKEY_BUTTON(code) (KC_MS_BTN1 <= (code) && (code) <= KC_MS_BTN8)
 #define IS_MOUSEKEY_WHEEL(code) (KC_MS_WH_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
@@ -62,486 +60,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // clang-format off
 
-/*
- * Short names for ease of definition of keymap
- */
-/* Transparent */
-#define KC_TRANSPARENT 0x01
-#define KC_TRNS KC_TRANSPARENT
-
-/* Punctuation */
-#define KC_ENT  KC_ENTER
-#define KC_ESC  KC_ESCAPE
-#define KC_BSPC KC_BACKSPACE
-#define KC_SPC  KC_SPACE
-#define KC_MINS KC_MINUS
-#define KC_EQL  KC_EQUAL
-#define KC_LBRC KC_LEFT_BRACKET
-#define KC_RBRC KC_RIGHT_BRACKET
-#define KC_BSLS KC_BACKSLASH
-#define KC_NUHS KC_NONUS_HASH
-#define KC_SCLN KC_SEMICOLON
-#define KC_QUOT KC_QUOTE
-#define KC_GRV  KC_GRAVE
-#define KC_COMM KC_COMMA
-#define KC_SLSH KC_SLASH
-#define KC_NUBS KC_NONUS_BACKSLASH
-
-/* Lock Keys */
-#define KC_CAPS KC_CAPS_LOCK
-#define KC_SCRL KC_SCROLL_LOCK
-#define KC_NUM  KC_NUM_LOCK
-#define KC_LCAP KC_LOCKING_CAPS_LOCK
-#define KC_LNUM KC_LOCKING_NUM_LOCK
-#define KC_LSCR KC_LOCKING_SCROLL_LOCK
-
-/* Commands */
-#define KC_PSCR KC_PRINT_SCREEN
-#define KC_PAUS KC_PAUSE
-#define KC_BRK  KC_PAUSE
-#define KC_INS  KC_INSERT
-#define KC_PGUP KC_PAGE_UP
-#define KC_DEL  KC_DELETE
-#define KC_PGDN KC_PAGE_DOWN
-#define KC_RGHT KC_RIGHT
-#define KC_APP  KC_APPLICATION
-#define KC_EXEC KC_EXECUTE
-#define KC_SLCT KC_SELECT
-#define KC_AGIN KC_AGAIN
-#define KC_PSTE KC_PASTE
-#define KC_ERAS KC_ALTERNATE_ERASE
-#define KC_SYRQ KC_SYSTEM_REQUEST
-#define KC_CNCL KC_CANCEL
-#define KC_CLR  KC_CLEAR
-#define KC_PRIR KC_PRIOR
-#define KC_RETN KC_RETURN
-#define KC_SEPR KC_SEPARATOR
-#define KC_CLAG KC_CLEAR_AGAIN
-#define KC_CRSL KC_CRSEL
-#define KC_EXSL KC_EXSEL
-
-/* Keypad */
-#define KC_PSLS KC_KP_SLASH
-#define KC_PAST KC_KP_ASTERISK
-#define KC_PMNS KC_KP_MINUS
-#define KC_PPLS KC_KP_PLUS
-#define KC_PENT KC_KP_ENTER
-#define KC_P1   KC_KP_1
-#define KC_P2   KC_KP_2
-#define KC_P3   KC_KP_3
-#define KC_P4   KC_KP_4
-#define KC_P5   KC_KP_5
-#define KC_P6   KC_KP_6
-#define KC_P7   KC_KP_7
-#define KC_P8   KC_KP_8
-#define KC_P9   KC_KP_9
-#define KC_P0   KC_KP_0
-#define KC_PDOT KC_KP_DOT
-#define KC_PEQL KC_KP_EQUAL
-#define KC_PCMM KC_KP_COMMA
-
-/* Language Specific */
-#define KC_INT1 KC_INTERNATIONAL_1
-#define KC_INT2 KC_INTERNATIONAL_2
-#define KC_INT3 KC_INTERNATIONAL_3
-#define KC_INT4 KC_INTERNATIONAL_4
-#define KC_INT5 KC_INTERNATIONAL_5
-#define KC_INT6 KC_INTERNATIONAL_6
-#define KC_INT7 KC_INTERNATIONAL_7
-#define KC_INT8 KC_INTERNATIONAL_8
-#define KC_INT9 KC_INTERNATIONAL_9
-#define KC_LNG1 KC_LANGUAGE_1
-#define KC_LNG2 KC_LANGUAGE_2
-#define KC_LNG3 KC_LANGUAGE_3
-#define KC_LNG4 KC_LANGUAGE_4
-#define KC_LNG5 KC_LANGUAGE_5
-#define KC_LNG6 KC_LANGUAGE_6
-#define KC_LNG7 KC_LANGUAGE_7
-#define KC_LNG8 KC_LANGUAGE_8
-#define KC_LNG9 KC_LANGUAGE_9
-
-/* Modifiers */
-#define KC_LCTL KC_LEFT_CTRL
-#define KC_LSFT KC_LEFT_SHIFT
-#define KC_LALT KC_LEFT_ALT
-#define KC_LOPT KC_LEFT_ALT
-#define KC_LGUI KC_LEFT_GUI
-#define KC_LCMD KC_LEFT_GUI
-#define KC_LWIN KC_LEFT_GUI
-#define KC_RCTL KC_RIGHT_CTRL
-#define KC_RSFT KC_RIGHT_SHIFT
-#define KC_RALT KC_RIGHT_ALT
-#define KC_ALGR KC_RIGHT_ALT
-#define KC_ROPT KC_RIGHT_ALT
-#define KC_RGUI KC_RIGHT_GUI
-#define KC_RCMD KC_RIGHT_GUI
-#define KC_RWIN KC_RIGHT_GUI
-
-/* Generic Desktop Page (0x01) */
-#define KC_PWR  KC_SYSTEM_POWER
-#define KC_SLEP KC_SYSTEM_SLEEP
-#define KC_WAKE KC_SYSTEM_WAKE
-
-/* Consumer Page (0x0C) */
-#define KC_MUTE KC_AUDIO_MUTE
-#define KC_VOLU KC_AUDIO_VOL_UP
-#define KC_VOLD KC_AUDIO_VOL_DOWN
-#define KC_MNXT KC_MEDIA_NEXT_TRACK
-#define KC_MPRV KC_MEDIA_PREV_TRACK
-#define KC_MSTP KC_MEDIA_STOP
-#define KC_MPLY KC_MEDIA_PLAY_PAUSE
-#define KC_MSEL KC_MEDIA_SELECT
-#define KC_EJCT KC_MEDIA_EJECT
-#define KC_CALC KC_CALCULATOR
-#define KC_MYCM KC_MY_COMPUTER
-#define KC_WSCH KC_WWW_SEARCH
-#define KC_WHOM KC_WWW_HOME
-#define KC_WBAK KC_WWW_BACK
-#define KC_WFWD KC_WWW_FORWARD
-#define KC_WSTP KC_WWW_STOP
-#define KC_WREF KC_WWW_REFRESH
-#define KC_WFAV KC_WWW_FAVORITES
-#define KC_MFFD KC_MEDIA_FAST_FORWARD
-#define KC_MRWD KC_MEDIA_REWIND
-#define KC_BRIU KC_BRIGHTNESS_UP
-#define KC_BRID KC_BRIGHTNESS_DOWN
-#define KC_CPNL KC_CONTROL_PANEL
-#define KC_ASST KC_ASSISTANT
-
-/* System Specific */
-#define KC_BRMU KC_PAUSE
-#define KC_BRMD KC_SCROLL_LOCK
-
-/* Mouse Keys */
-#define KC_MS_U KC_MS_UP
-#define KC_MS_D KC_MS_DOWN
-#define KC_MS_L KC_MS_LEFT
-#define KC_MS_R KC_MS_RIGHT
-#define KC_BTN1 KC_MS_BTN1
-#define KC_BTN2 KC_MS_BTN2
-#define KC_BTN3 KC_MS_BTN3
-#define KC_BTN4 KC_MS_BTN4
-#define KC_BTN5 KC_MS_BTN5
-#define KC_BTN6 KC_MS_BTN6
-#define KC_BTN7 KC_MS_BTN7
-#define KC_BTN8 KC_MS_BTN8
-#define KC_WH_U KC_MS_WH_UP
-#define KC_WH_D KC_MS_WH_DOWN
-#define KC_WH_L KC_MS_WH_LEFT
-#define KC_WH_R KC_MS_WH_RIGHT
-#define KC_ACL0 KC_MS_ACCEL0
-#define KC_ACL1 KC_MS_ACCEL1
-#define KC_ACL2 KC_MS_ACCEL2
-
-// clang-format on
-
-/* Keyboard/Keypad Page (0x07) */
-enum hid_keyboard_keypad_usage {
-    KC_NO = 0x00,
-    KC_ROLL_OVER,
-    KC_POST_FAIL,
-    KC_UNDEFINED,
-    KC_A,
-    KC_B,
-    KC_C,
-    KC_D,
-    KC_E,
-    KC_F,
-    KC_G,
-    KC_H,
-    KC_I,
-    KC_J,
-    KC_K,
-    KC_L,
-    KC_M, // 0x10
-    KC_N,
-    KC_O,
-    KC_P,
-    KC_Q,
-    KC_R,
-    KC_S,
-    KC_T,
-    KC_U,
-    KC_V,
-    KC_W,
-    KC_X,
-    KC_Y,
-    KC_Z,
-    KC_1,
-    KC_2,
-    KC_3, // 0x20
-    KC_4,
-    KC_5,
-    KC_6,
-    KC_7,
-    KC_8,
-    KC_9,
-    KC_0,
-    KC_ENTER,
-    KC_ESCAPE,
-    KC_BACKSPACE,
-    KC_TAB,
-    KC_SPACE,
-    KC_MINUS,
-    KC_EQUAL,
-    KC_LEFT_BRACKET,
-    KC_RIGHT_BRACKET, // 0x30
-    KC_BACKSLASH,
-    KC_NONUS_HASH,
-    KC_SEMICOLON,
-    KC_QUOTE,
-    KC_GRAVE,
-    KC_COMMA,
-    KC_DOT,
-    KC_SLASH,
-    KC_CAPS_LOCK,
-    KC_F1,
-    KC_F2,
-    KC_F3,
-    KC_F4,
-    KC_F5,
-    KC_F6,
-    KC_F7, // 0x40
-    KC_F8,
-    KC_F9,
-    KC_F10,
-    KC_F11,
-    KC_F12,
-    KC_PRINT_SCREEN,
-    KC_SCROLL_LOCK,
-    KC_PAUSE,
-    KC_INSERT,
-    KC_HOME,
-    KC_PAGE_UP,
-    KC_DELETE,
-    KC_END,
-    KC_PAGE_DOWN,
-    KC_RIGHT,
-    KC_LEFT, // 0x50
-    KC_DOWN,
-    KC_UP,
-    KC_NUM_LOCK,
-    KC_KP_SLASH,
-    KC_KP_ASTERISK,
-    KC_KP_MINUS,
-    KC_KP_PLUS,
-    KC_KP_ENTER,
-    KC_KP_1,
-    KC_KP_2,
-    KC_KP_3,
-    KC_KP_4,
-    KC_KP_5,
-    KC_KP_6,
-    KC_KP_7,
-    KC_KP_8, // 0x60
-    KC_KP_9,
-    KC_KP_0,
-    KC_KP_DOT,
-    KC_NONUS_BACKSLASH,
-    KC_APPLICATION,
-    KC_KB_POWER,
-    KC_KP_EQUAL,
-    KC_F13,
-    KC_F14,
-    KC_F15,
-    KC_F16,
-    KC_F17,
-    KC_F18,
-    KC_F19,
-    KC_F20,
-    KC_F21, // 0x70
-    KC_F22,
-    KC_F23,
-    KC_F24,
-    KC_EXECUTE,
-    KC_HELP,
-    KC_MENU,
-    KC_SELECT,
-    KC_STOP,
-    KC_AGAIN,
-    KC_UNDO,
-    KC_CUT,
-    KC_COPY,
-    KC_PASTE,
-    KC_FIND,
-    KC_KB_MUTE,
-    KC_KB_VOLUME_UP, // 0x80
-    KC_KB_VOLUME_DOWN,
-    KC_LOCKING_CAPS_LOCK,
-    KC_LOCKING_NUM_LOCK,
-    KC_LOCKING_SCROLL_LOCK,
-    KC_KP_COMMA,
-    KC_KP_EQUAL_AS400,
-    KC_INTERNATIONAL_1,
-    KC_INTERNATIONAL_2,
-    KC_INTERNATIONAL_3,
-    KC_INTERNATIONAL_4,
-    KC_INTERNATIONAL_5,
-    KC_INTERNATIONAL_6,
-    KC_INTERNATIONAL_7,
-    KC_INTERNATIONAL_8,
-    KC_INTERNATIONAL_9,
-    KC_LANGUAGE_1, // 0x90
-    KC_LANGUAGE_2,
-    KC_LANGUAGE_3,
-    KC_LANGUAGE_4,
-    KC_LANGUAGE_5,
-    KC_LANGUAGE_6,
-    KC_LANGUAGE_7,
-    KC_LANGUAGE_8,
-    KC_LANGUAGE_9,
-    KC_ALTERNATE_ERASE,
-    KC_SYSTEM_REQUEST,
-    KC_CANCEL,
-    KC_CLEAR,
-    KC_PRIOR,
-    KC_RETURN,
-    KC_SEPARATOR,
-    KC_OUT, // 0xA0
-    KC_OPER,
-    KC_CLEAR_AGAIN,
-    KC_CRSEL,
-    KC_EXSEL,
-
-#if 0
-  // ***************************************************************
-  // These keycodes are present in the HID spec, but are           *
-  // nonfunctional on modern OSes. QMK uses this range (0xA5-0xDF) *
-  // for the media and function keys instead - see below.          *
-  // ***************************************************************
-
-  KC_KP_00                = 0xB0,
-  KC_KP_000,
-  KC_THOUSANDS_SEPARATOR,
-  KC_DECIMAL_SEPARATOR,
-  KC_CURRENCY_UNIT,
-  KC_CURRENCY_SUB_UNIT,
-  KC_KP_LEFT_PARENTHESIS,
-  KC_KP_RIGHT_PARENTHESIS,
-  KC_KP_LEFT_BRACE,
-  KC_KP_RIGHT_BRACE,
-  KC_KP_TAB,
-  KC_KP_BACKSPACE,
-  KC_KP_A,
-  KC_KP_B,
-  KC_KP_C,
-  KC_KP_D,
-  KC_KP_E,                //0xC0
-  KC_KP_F,
-  KC_KP_XOR,
-  KC_KP_HAT,
-  KC_KP_PERCENT,
-  KC_KP_LESS_THAN,
-  KC_KP_GREATER_THAN,
-  KC_KP_AND,
-  KC_KP_LAZY_AND,
-  KC_KP_OR,
-  KC_KP_LAZY_OR,
-  KC_KP_COLON,
-  KC_KP_HASH,
-  KC_KP_SPACE,
-  KC_KP_AT,
-  KC_KP_EXCLAMATION,
-  KC_KP_MEM_STORE,        //0xD0
-  KC_KP_MEM_RECALL,
-  KC_KP_MEM_CLEAR,
-  KC_KP_MEM_ADD,
-  KC_KP_MEM_SUB,
-  KC_KP_MEM_MUL,
-  KC_KP_MEM_DIV,
-  KC_KP_PLUS_MINUS,
-  KC_KP_CLEAR,
-  KC_KP_CLEAR_ENTRY,
-  KC_KP_BINARY,
-  KC_KP_OCTAL,
-  KC_KP_DECIMAL,
-  KC_KP_HEXADECIMAL,
-#endif
-
-    /* Modifiers */
-    KC_LEFT_CTRL = 0xE0,
-    KC_LEFT_SHIFT,
-    KC_LEFT_ALT,
-    KC_LEFT_GUI,
-    KC_RIGHT_CTRL,
-    KC_RIGHT_SHIFT,
-    KC_RIGHT_ALT,
-    KC_RIGHT_GUI
-
-    // **********************************************
-    // * 0xF0-0xFF are unallocated in the HID spec. *
-    // * QMK uses these for Mouse Keys - see below. *
-    // **********************************************
-};
-
-/* Media and Function keys */
-enum internal_special_keycodes {
-    /* Generic Desktop Page (0x01) */
-    KC_SYSTEM_POWER = 0xA5,
-    KC_SYSTEM_SLEEP,
-    KC_SYSTEM_WAKE,
-
-    /* Consumer Page (0x0C) */
-    KC_AUDIO_MUTE,
-    KC_AUDIO_VOL_UP,
-    KC_AUDIO_VOL_DOWN,
-    KC_MEDIA_NEXT_TRACK,
-    KC_MEDIA_PREV_TRACK,
-    KC_MEDIA_STOP,
-    KC_MEDIA_PLAY_PAUSE,
-    KC_MEDIA_SELECT,
-    KC_MEDIA_EJECT, // 0xB0
-    KC_MAIL,
-    KC_CALCULATOR,
-    KC_MY_COMPUTER,
-    KC_WWW_SEARCH,
-    KC_WWW_HOME,
-    KC_WWW_BACK,
-    KC_WWW_FORWARD,
-    KC_WWW_STOP,
-    KC_WWW_REFRESH,
-    KC_WWW_FAVORITES,
-    KC_MEDIA_FAST_FORWARD,
-    KC_MEDIA_REWIND,
-    KC_BRIGHTNESS_UP,
-    KC_BRIGHTNESS_DOWN,
-    KC_CONTROL_PANEL,
-    KC_ASSISTANT // 0xC0
-};
-
-enum mouse_keys {
-/* Mouse Buttons */
-#ifdef VIA_ENABLE
-    KC_MS_UP = 0xF0,
-#else
-    KC_MS_UP = 0xCD,
-#endif
-    KC_MS_DOWN,
-    KC_MS_LEFT,
-    KC_MS_RIGHT,
-    KC_MS_BTN1,
-    KC_MS_BTN2,
-    KC_MS_BTN3,
-    KC_MS_BTN4,
-    KC_MS_BTN5,
-#ifdef VIA_ENABLE
-    KC_MS_BTN6 = KC_MS_BTN5,
-    KC_MS_BTN7 = KC_MS_BTN5,
-    KC_MS_BTN8 = KC_MS_BTN5,
-#else
-    KC_MS_BTN6,
-    KC_MS_BTN7,
-    KC_MS_BTN8,
-#endif
-
-    /* Mouse Wheel */
-    KC_MS_WH_UP,
-    KC_MS_WH_DOWN,
-    KC_MS_WH_LEFT,
-    KC_MS_WH_RIGHT,
-
-    /* Acceleration */
-    KC_MS_ACCEL0,
-    KC_MS_ACCEL1,
-    KC_MS_ACCEL2 // 0xDF, or 0xFF if via enabled
-};
+// TODO: dd keycodes
+#include "keycodes.h"
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
new file mode 100644
index 0000000000..6772bb6a4a
--- /dev/null
+++ b/quantum/keycodes.h
@@ -0,0 +1,1115 @@
+// Copyright 2022 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
+// clang-format off
+
+enum qk_keycode_ranges {
+// Ranges
+    QK_BASIC                       = 0x0000,
+    QK_BASIC_MAX                   = 0x00FF,
+    QK_MODS                        = 0x0100,
+    QK_MODS_MAX                    = 0x1FFF,
+    QK_MOD_TAP                     = 0x2000,
+    QK_MOD_TAP_MAX                 = 0x3FFF,
+    QK_LAYER_TAP                   = 0x4000,
+    QK_LAYER_TAP_MAX               = 0x4FFF,
+    QK_LAYER_MOD                   = 0x5000,
+    QK_LAYER_MOD_MAX               = 0x51FF,
+    QK_TO                          = 0x5200,
+    QK_TO_MAX                      = 0x521F,
+    QK_MOMENTARY                   = 0x5220,
+    QK_MOMENTARY_MAX               = 0x523F,
+    QK_DEF_LAYER                   = 0x5240,
+    QK_DEF_LAYER_MAX               = 0x525F,
+    QK_TOGGLE_LAYER                = 0x5260,
+    QK_TOGGLE_LAYER_MAX            = 0x527F,
+    QK_ONE_SHOT_LAYER              = 0x5280,
+    QK_ONE_SHOT_LAYER_MAX          = 0x529F,
+    QK_ONE_SHOT_MOD                = 0x52A0,
+    QK_ONE_SHOT_MOD_MAX            = 0x52BF,
+    QK_LAYER_TAP_TOGGLE            = 0x52C0,
+    QK_LAYER_TAP_TOGGLE_MAX        = 0x52DF,
+    QK_SWAP_HANDS                  = 0x5600,
+    QK_SWAP_HANDS_MAX              = 0x56FF,
+    QK_TAP_DANCE                   = 0x5700,
+    QK_TAP_DANCE_MAX               = 0x57FF,
+    QK_MAGIC                       = 0x7000,
+    QK_MAGIC_MAX                   = 0x70FF,
+    QK_MIDI                        = 0x7100,
+    QK_MIDI_MAX                    = 0x71FF,
+    QK_SEQUENCER                   = 0x7200,
+    QK_SEQUENCER_MAX               = 0x73FF,
+    QK_JOYSTICK                    = 0x7400,
+    QK_JOYSTICK_MAX                = 0x743F,
+    QK_PROGRAMMABLE_BUTTON         = 0x7440,
+    QK_PROGRAMMABLE_BUTTON_MAX     = 0x747F,
+    QK_AUDIO                       = 0x7480,
+    QK_AUDIO_MAX                   = 0x74BF,
+    QK_STENO                       = 0x74C0,
+    QK_STENO_MAX                   = 0x74FF,
+    QK_MACRO                       = 0x7700,
+    QK_MACRO_MAX                   = 0x777F,
+    QK_LIGHTING                    = 0x7800,
+    QK_LIGHTING_MAX                = 0x78FF,
+    QK_QUANTUM                     = 0x7C00,
+    QK_QUANTUM_MAX                 = 0x7DFF,
+    QK_KB                          = 0x7E00,
+    QK_KB_MAX                      = 0x7EFF,
+    QK_USER                        = 0x7F00,
+    QK_USER_MAX                    = 0x7FFF,
+    QK_UNICODE                     = 0x8000,
+    QK_UNICODE_MAX                 = 0xFFFF,
+};
+
+enum qk_keycode_defines {
+// Keycodes
+    KC_NO = 0x0000,
+    KC_TRANSPARENT = 0x0001,
+    KC_A = 0x0004,
+    KC_B = 0x0005,
+    KC_C = 0x0006,
+    KC_D = 0x0007,
+    KC_E = 0x0008,
+    KC_F = 0x0009,
+    KC_G = 0x000A,
+    KC_H = 0x000B,
+    KC_I = 0x000C,
+    KC_J = 0x000D,
+    KC_K = 0x000E,
+    KC_L = 0x000F,
+    KC_M = 0x0010,
+    KC_N = 0x0011,
+    KC_O = 0x0012,
+    KC_P = 0x0013,
+    KC_Q = 0x0014,
+    KC_R = 0x0015,
+    KC_S = 0x0016,
+    KC_T = 0x0017,
+    KC_U = 0x0018,
+    KC_V = 0x0019,
+    KC_W = 0x001A,
+    KC_X = 0x001B,
+    KC_Y = 0x001C,
+    KC_Z = 0x001D,
+    KC_1 = 0x001E,
+    KC_2 = 0x001F,
+    KC_3 = 0x0020,
+    KC_4 = 0x0021,
+    KC_5 = 0x0022,
+    KC_6 = 0x0023,
+    KC_7 = 0x0024,
+    KC_8 = 0x0025,
+    KC_9 = 0x0026,
+    KC_0 = 0x0027,
+    KC_ENTER = 0x0028,
+    KC_ESCAPE = 0x0029,
+    KC_BACKSPACE = 0x002A,
+    KC_TAB = 0x002B,
+    KC_SPACE = 0x002C,
+    KC_MINUS = 0x002D,
+    KC_EQUAL = 0x002E,
+    KC_LEFT_BRACKET = 0x002F,
+    KC_RIGHT_BRACKET = 0x0030,
+    KC_BACKSLASH = 0x0031,
+    KC_NONUS_HASH = 0x0032,
+    KC_SEMICOLON = 0x0033,
+    KC_QUOTE = 0x0034,
+    KC_GRAVE = 0x0035,
+    KC_COMMA = 0x0036,
+    KC_DOT = 0x0037,
+    KC_SLASH = 0x0038,
+    KC_CAPS_LOCK = 0x0039,
+    KC_F1 = 0x003A,
+    KC_F2 = 0x003B,
+    KC_F3 = 0x003C,
+    KC_F4 = 0x003D,
+    KC_F5 = 0x003E,
+    KC_F6 = 0x003F,
+    KC_F7 = 0x0040,
+    KC_F8 = 0x0041,
+    KC_F9 = 0x0042,
+    KC_F10 = 0x0043,
+    KC_F11 = 0x0044,
+    KC_F12 = 0x0045,
+    KC_PRINT_SCREEN = 0x0046,
+    KC_SCROLL_LOCK = 0x0047,
+    KC_PAUSE = 0x0048,
+    KC_INSERT = 0x0049,
+    KC_HOME = 0x004A,
+    KC_PAGE_UP = 0x004B,
+    KC_DELETE = 0x004C,
+    KC_END = 0x004D,
+    KC_PAGE_DOWN = 0x004E,
+    KC_RIGHT = 0x004F,
+    KC_LEFT = 0x0050,
+    KC_DOWN = 0x0051,
+    KC_UP = 0x0052,
+    KC_NUM_LOCK = 0x0053,
+    KC_KP_SLASH = 0x0054,
+    KC_KP_ASTERISK = 0x0055,
+    KC_KP_MINUS = 0x0056,
+    KC_KP_PLUS = 0x0057,
+    KC_KP_ENTER = 0x0058,
+    KC_KP_1 = 0x0059,
+    KC_KP_2 = 0x005A,
+    KC_KP_3 = 0x005B,
+    KC_KP_4 = 0x005C,
+    KC_KP_5 = 0x005D,
+    KC_KP_6 = 0x005E,
+    KC_KP_7 = 0x005F,
+    KC_KP_8 = 0x0060,
+    KC_KP_9 = 0x0061,
+    KC_KP_0 = 0x0062,
+    KC_KP_DOT = 0x0063,
+    KC_NONUS_BACKSLASH = 0x0064,
+    KC_APPLICATION = 0x0065,
+    KC_KB_POWER = 0x0066,
+    KC_KP_EQUAL = 0x0067,
+    KC_F13 = 0x0068,
+    KC_F14 = 0x0069,
+    KC_F15 = 0x006A,
+    KC_F16 = 0x006B,
+    KC_F17 = 0x006C,
+    KC_F18 = 0x006D,
+    KC_F19 = 0x006E,
+    KC_F20 = 0x006F,
+    KC_F21 = 0x0070,
+    KC_F22 = 0x0071,
+    KC_F23 = 0x0072,
+    KC_F24 = 0x0073,
+    KC_EXECUTE = 0x0074,
+    KC_HELP = 0x0075,
+    KC_MENU = 0x0076,
+    KC_SELECT = 0x0077,
+    KC_STOP = 0x0078,
+    KC_AGAIN = 0x0079,
+    KC_UNDO = 0x007A,
+    KC_CUT = 0x007B,
+    KC_COPY = 0x007C,
+    KC_PASTE = 0x007D,
+    KC_FIND = 0x007E,
+    KC_KB_MUTE = 0x007F,
+    KC_KB_VOLUME_UP = 0x0080,
+    KC_KB_VOLUME_DOWN = 0x0081,
+    KC_LOCKING_CAPS_LOCK = 0x0082,
+    KC_LOCKING_NUM_LOCK = 0x0083,
+    KC_LOCKING_SCROLL_LOCK = 0x0084,
+    KC_KP_COMMA = 0x0085,
+    KC_KP_EQUAL_AS400 = 0x0086,
+    KC_INTERNATIONAL_1 = 0x0087,
+    KC_INTERNATIONAL_2 = 0x0088,
+    KC_INTERNATIONAL_3 = 0x0089,
+    KC_INTERNATIONAL_4 = 0x008A,
+    KC_INTERNATIONAL_5 = 0x008B,
+    KC_INTERNATIONAL_6 = 0x008C,
+    KC_INTERNATIONAL_7 = 0x008D,
+    KC_INTERNATIONAL_8 = 0x008E,
+    KC_INTERNATIONAL_9 = 0x008F,
+    KC_LANGUAGE_1 = 0x0090,
+    KC_LANGUAGE_2 = 0x0091,
+    KC_LANGUAGE_3 = 0x0092,
+    KC_LANGUAGE_4 = 0x0093,
+    KC_LANGUAGE_5 = 0x0094,
+    KC_LANGUAGE_6 = 0x0095,
+    KC_LANGUAGE_7 = 0x0096,
+    KC_LANGUAGE_8 = 0x0097,
+    KC_LANGUAGE_9 = 0x0098,
+    KC_ALTERNATE_ERASE = 0x0099,
+    KC_SYSTEM_REQUEST = 0x009A,
+    KC_CANCEL = 0x009B,
+    KC_CLEAR = 0x009C,
+    KC_PRIOR = 0x009D,
+    KC_RETURN = 0x009E,
+    KC_SEPARATOR = 0x009F,
+    KC_OUT = 0x00A0,
+    KC_OPER = 0x00A1,
+    KC_CLEAR_AGAIN = 0x00A2,
+    KC_CRSEL = 0x00A3,
+    KC_EXSEL = 0x00A4,
+    KC_SYSTEM_POWER = 0x00A5,
+    KC_SYSTEM_SLEEP = 0x00A6,
+    KC_SYSTEM_WAKE = 0x00A7,
+    KC_AUDIO_MUTE = 0x00A8,
+    KC_AUDIO_VOL_UP = 0x00A9,
+    KC_AUDIO_VOL_DOWN = 0x00AA,
+    KC_MEDIA_NEXT_TRACK = 0x00AB,
+    KC_MEDIA_PREV_TRACK = 0x00AC,
+    KC_MEDIA_STOP = 0x00AD,
+    KC_MEDIA_PLAY_PAUSE = 0x00AE,
+    KC_MEDIA_SELECT = 0x00AF,
+    KC_MEDIA_EJECT = 0x00B0,
+    KC_MAIL = 0x00B1,
+    KC_CALCULATOR = 0x00B2,
+    KC_MY_COMPUTER = 0x00B3,
+    KC_WWW_SEARCH = 0x00B4,
+    KC_WWW_HOME = 0x00B5,
+    KC_WWW_BACK = 0x00B6,
+    KC_WWW_FORWARD = 0x00B7,
+    KC_WWW_STOP = 0x00B8,
+    KC_WWW_REFRESH = 0x00B9,
+    KC_WWW_FAVORITES = 0x00BA,
+    KC_MEDIA_FAST_FORWARD = 0x00BB,
+    KC_MEDIA_REWIND = 0x00BC,
+    KC_BRIGHTNESS_UP = 0x00BD,
+    KC_BRIGHTNESS_DOWN = 0x00BE,
+    KC_CONTROL_PANEL = 0x00BF,
+    KC_ASSISTANT = 0x00C0,
+    KC_MS_UP = 0x00CD,
+    KC_MS_DOWN = 0x00CE,
+    KC_MS_LEFT = 0x00CF,
+    KC_MS_RIGHT = 0x00D0,
+    KC_MS_BTN1 = 0x00D1,
+    KC_MS_BTN2 = 0x00D2,
+    KC_MS_BTN3 = 0x00D3,
+    KC_MS_BTN4 = 0x00D4,
+    KC_MS_BTN5 = 0x00D5,
+    KC_MS_BTN6 = 0x00D6,
+    KC_MS_BTN7 = 0x00D7,
+    KC_MS_BTN8 = 0x00D8,
+    KC_MS_WH_UP = 0x00D9,
+    KC_MS_WH_DOWN = 0x00DA,
+    KC_MS_WH_LEFT = 0x00DB,
+    KC_MS_WH_RIGHT = 0x00DC,
+    KC_MS_ACCEL0 = 0x00DD,
+    KC_MS_ACCEL1 = 0x00DE,
+    KC_MS_ACCEL2 = 0x00DF,
+    KC_LEFT_CTRL = 0x00E0,
+    KC_LEFT_SHIFT = 0x00E1,
+    KC_LEFT_ALT = 0x00E2,
+    KC_LEFT_GUI = 0x00E3,
+    KC_RIGHT_CTRL = 0x00E4,
+    KC_RIGHT_SHIFT = 0x00E5,
+    KC_RIGHT_ALT = 0x00E6,
+    KC_RIGHT_GUI = 0x00E7,
+    SH_TG = 0x56F0,
+    SH_TT = 0x56F1,
+    SH_MON = 0x56F2,
+    SH_MOFF = 0x56F3,
+    SH_OFF = 0x56F4,
+    SH_ON = 0x56F5,
+    SH_OS = 0x56F6,
+    MAGIC_SWAP_CONTROL_CAPSLOCK = 0x7000,
+    MAGIC_UNSWAP_CONTROL_CAPSLOCK = 0x7001,
+    MAGIC_TOGGLE_CONTROL_CAPSLOCK = 0x7002,
+    MAGIC_UNCAPSLOCK_TO_CONTROL = 0x7003,
+    MAGIC_CAPSLOCK_TO_CONTROL = 0x7004,
+    MAGIC_SWAP_LALT_LGUI = 0x7005,
+    MAGIC_UNSWAP_LALT_LGUI = 0x7006,
+    MAGIC_SWAP_RALT_RGUI = 0x7007,
+    MAGIC_UNSWAP_RALT_RGUI = 0x7008,
+    MAGIC_UNNO_GUI = 0x7009,
+    MAGIC_NO_GUI = 0x700A,
+    MAGIC_TOGGLE_GUI = 0x700B,
+    MAGIC_SWAP_GRAVE_ESC = 0x700C,
+    MAGIC_UNSWAP_GRAVE_ESC = 0x700D,
+    MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E,
+    MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F,
+    MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010,
+    MAGIC_HOST_NKRO = 0x7011,
+    MAGIC_UNHOST_NKRO = 0x7012,
+    MAGIC_TOGGLE_NKRO = 0x7013,
+    MAGIC_SWAP_ALT_GUI = 0x7014,
+    MAGIC_UNSWAP_ALT_GUI = 0x7015,
+    MAGIC_TOGGLE_ALT_GUI = 0x7016,
+    MAGIC_SWAP_LCTL_LGUI = 0x7017,
+    MAGIC_UNSWAP_LCTL_LGUI = 0x7018,
+    MAGIC_SWAP_RCTL_RGUI = 0x7019,
+    MAGIC_UNSWAP_RCTL_RGUI = 0x701A,
+    MAGIC_SWAP_CTL_GUI = 0x701B,
+    MAGIC_UNSWAP_CTL_GUI = 0x701C,
+    MAGIC_TOGGLE_CTL_GUI = 0x701D,
+    MAGIC_EE_HANDS_LEFT = 0x701E,
+    MAGIC_EE_HANDS_RIGHT = 0x701F,
+    MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020,
+    MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021,
+    MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022,
+    MI_ON = 0x7100,
+    MI_OFF = 0x7101,
+    MI_TOG = 0x7102,
+    MI_C = 0x7110,
+    MI_Cs = 0x7111,
+    MI_D = 0x7112,
+    MI_Ds = 0x7113,
+    MI_E = 0x7114,
+    MI_F = 0x7115,
+    MI_Fs = 0x7116,
+    MI_G = 0x7117,
+    MI_Gs = 0x7118,
+    MI_A = 0x7119,
+    MI_As = 0x711A,
+    MI_B = 0x711B,
+    MI_C_1 = 0x7120,
+    MI_Cs_1 = 0x7121,
+    MI_D_1 = 0x7122,
+    MI_Ds_1 = 0x7123,
+    MI_E_1 = 0x7124,
+    MI_F_1 = 0x7125,
+    MI_Fs_1 = 0x7126,
+    MI_G_1 = 0x7127,
+    MI_Gs_1 = 0x7128,
+    MI_A_1 = 0x7129,
+    MI_As_1 = 0x712A,
+    MI_B_1 = 0x712B,
+    MI_C_2 = 0x7130,
+    MI_Cs_2 = 0x7131,
+    MI_D_2 = 0x7132,
+    MI_Ds_2 = 0x7133,
+    MI_E_2 = 0x7134,
+    MI_F_2 = 0x7135,
+    MI_Fs_2 = 0x7136,
+    MI_G_2 = 0x7137,
+    MI_Gs_2 = 0x7138,
+    MI_A_2 = 0x7139,
+    MI_As_2 = 0x713A,
+    MI_B_2 = 0x713B,
+    MI_C_3 = 0x7140,
+    MI_Cs_3 = 0x7141,
+    MI_D_3 = 0x7142,
+    MI_Ds_3 = 0x7143,
+    MI_E_3 = 0x7144,
+    MI_F_3 = 0x7145,
+    MI_Fs_3 = 0x7146,
+    MI_G_3 = 0x7147,
+    MI_Gs_3 = 0x7148,
+    MI_A_3 = 0x7149,
+    MI_As_3 = 0x714A,
+    MI_B_3 = 0x714B,
+    MI_C_4 = 0x7150,
+    MI_Cs_4 = 0x7151,
+    MI_D_4 = 0x7152,
+    MI_Ds_4 = 0x7153,
+    MI_E_4 = 0x7154,
+    MI_F_4 = 0x7155,
+    MI_Fs_4 = 0x7156,
+    MI_G_4 = 0x7157,
+    MI_Gs_4 = 0x7158,
+    MI_A_4 = 0x7159,
+    MI_As_4 = 0x715A,
+    MI_B_4 = 0x715B,
+    MI_C_5 = 0x7160,
+    MI_Cs_5 = 0x7161,
+    MI_D_5 = 0x7162,
+    MI_Ds_5 = 0x7163,
+    MI_E_5 = 0x7164,
+    MI_F_5 = 0x7165,
+    MI_Fs_5 = 0x7166,
+    MI_G_5 = 0x7167,
+    MI_Gs_5 = 0x7168,
+    MI_A_5 = 0x7169,
+    MI_As_5 = 0x716A,
+    MI_B_5 = 0x716B,
+    MI_OCT_N2 = 0x7170,
+    MI_OCT_N1 = 0x7171,
+    MI_OCT_0 = 0x7172,
+    MI_OCT_1 = 0x7173,
+    MI_OCT_2 = 0x7174,
+    MI_OCT_3 = 0x7175,
+    MI_OCT_4 = 0x7176,
+    MI_OCT_5 = 0x7177,
+    MI_OCT_6 = 0x7178,
+    MI_OCT_7 = 0x7179,
+    MI_OCTD = 0x717A,
+    MI_OCTU = 0x717B,
+    MI_TRNS_N6 = 0x7180,
+    MI_TRNS_N5 = 0x7181,
+    MI_TRNS_N4 = 0x7182,
+    MI_TRNS_N3 = 0x7183,
+    MI_TRNS_N2 = 0x7184,
+    MI_TRNS_N1 = 0x7185,
+    MI_TRNS_0 = 0x7186,
+    MI_TRNS_1 = 0x7187,
+    MI_TRNS_2 = 0x7188,
+    MI_TRNS_3 = 0x7189,
+    MI_TRNS_4 = 0x718A,
+    MI_TRNS_5 = 0x718B,
+    MI_TRNS_6 = 0x718C,
+    MI_TRNSD = 0x718D,
+    MI_TRNSU = 0x718E,
+    MI_VEL_0 = 0x7190,
+    MI_VEL_1 = 0x7191,
+    MI_VEL_2 = 0x7192,
+    MI_VEL_3 = 0x7193,
+    MI_VEL_4 = 0x7194,
+    MI_VEL_5 = 0x7195,
+    MI_VEL_6 = 0x7196,
+    MI_VEL_7 = 0x7197,
+    MI_VEL_8 = 0x7198,
+    MI_VEL_9 = 0x7199,
+    MI_VEL_10 = 0x719A,
+    MI_VELD = 0x719B,
+    MI_VELU = 0x719C,
+    MI_CH1 = 0x71A0,
+    MI_CH2 = 0x71A1,
+    MI_CH3 = 0x71A2,
+    MI_CH4 = 0x71A3,
+    MI_CH5 = 0x71A4,
+    MI_CH6 = 0x71A5,
+    MI_CH7 = 0x71A6,
+    MI_CH8 = 0x71A7,
+    MI_CH9 = 0x71A8,
+    MI_CH10 = 0x71A9,
+    MI_CH11 = 0x71AA,
+    MI_CH12 = 0x71AB,
+    MI_CH13 = 0x71AC,
+    MI_CH14 = 0x71AD,
+    MI_CH15 = 0x71AE,
+    MI_CH16 = 0x71AF,
+    MI_CHD = 0x71B0,
+    MI_CHU = 0x71B1,
+    MI_ALLOFF = 0x71C0,
+    MI_SUS = 0x71C1,
+    MI_PORT = 0x71C2,
+    MI_SOST = 0x71C3,
+    MI_SOFT = 0x71C4,
+    MI_LEG = 0x71C5,
+    MI_MOD = 0x71C6,
+    MI_MODSD = 0x71C7,
+    MI_MODSU = 0x71C8,
+    MI_BENDD = 0x71C9,
+    MI_BENDU = 0x71CA,
+    SQ_ON = 0x7200,
+    SQ_OFF = 0x7201,
+    SQ_TOG = 0x7202,
+    SQ_TMPD = 0x7203,
+    SQ_TMPU = 0x7204,
+    SQ_RESD = 0x7205,
+    SQ_RESU = 0x7206,
+    SQ_SALL = 0x7207,
+    SQ_SCLR = 0x7208,
+    QK_JOYSTICK_BUTTON_0 = 0x7400,
+    QK_JOYSTICK_BUTTON_1 = 0x7401,
+    QK_JOYSTICK_BUTTON_2 = 0x7402,
+    QK_JOYSTICK_BUTTON_3 = 0x7403,
+    QK_JOYSTICK_BUTTON_4 = 0x7404,
+    QK_JOYSTICK_BUTTON_5 = 0x7405,
+    QK_JOYSTICK_BUTTON_6 = 0x7406,
+    QK_JOYSTICK_BUTTON_7 = 0x7407,
+    QK_JOYSTICK_BUTTON_8 = 0x7408,
+    QK_JOYSTICK_BUTTON_9 = 0x7409,
+    QK_JOYSTICK_BUTTON_10 = 0x740A,
+    QK_JOYSTICK_BUTTON_11 = 0x740B,
+    QK_JOYSTICK_BUTTON_12 = 0x740C,
+    QK_JOYSTICK_BUTTON_13 = 0x740D,
+    QK_JOYSTICK_BUTTON_14 = 0x740E,
+    QK_JOYSTICK_BUTTON_15 = 0x740F,
+    QK_JOYSTICK_BUTTON_16 = 0x7410,
+    QK_JOYSTICK_BUTTON_17 = 0x7411,
+    QK_JOYSTICK_BUTTON_18 = 0x7412,
+    QK_JOYSTICK_BUTTON_19 = 0x7413,
+    QK_JOYSTICK_BUTTON_20 = 0x7414,
+    QK_JOYSTICK_BUTTON_21 = 0x7415,
+    QK_JOYSTICK_BUTTON_22 = 0x7416,
+    QK_JOYSTICK_BUTTON_23 = 0x7417,
+    QK_JOYSTICK_BUTTON_24 = 0x7418,
+    QK_JOYSTICK_BUTTON_25 = 0x7419,
+    QK_JOYSTICK_BUTTON_26 = 0x741A,
+    QK_JOYSTICK_BUTTON_27 = 0x741B,
+    QK_JOYSTICK_BUTTON_28 = 0x741C,
+    QK_JOYSTICK_BUTTON_29 = 0x741D,
+    QK_JOYSTICK_BUTTON_30 = 0x741E,
+    QK_JOYSTICK_BUTTON_31 = 0x741F,
+    QK_PROGRAMMABLE_BUTTON_1 = 0x7440,
+    QK_PROGRAMMABLE_BUTTON_2 = 0x7441,
+    QK_PROGRAMMABLE_BUTTON_3 = 0x7442,
+    QK_PROGRAMMABLE_BUTTON_4 = 0x7443,
+    QK_PROGRAMMABLE_BUTTON_5 = 0x7444,
+    QK_PROGRAMMABLE_BUTTON_6 = 0x7445,
+    QK_PROGRAMMABLE_BUTTON_7 = 0x7446,
+    QK_PROGRAMMABLE_BUTTON_8 = 0x7447,
+    QK_PROGRAMMABLE_BUTTON_9 = 0x7448,
+    QK_PROGRAMMABLE_BUTTON_10 = 0x7449,
+    QK_PROGRAMMABLE_BUTTON_11 = 0x744A,
+    QK_PROGRAMMABLE_BUTTON_12 = 0x744B,
+    QK_PROGRAMMABLE_BUTTON_13 = 0x744C,
+    QK_PROGRAMMABLE_BUTTON_14 = 0x744D,
+    QK_PROGRAMMABLE_BUTTON_15 = 0x744E,
+    QK_PROGRAMMABLE_BUTTON_16 = 0x744F,
+    QK_PROGRAMMABLE_BUTTON_17 = 0x7450,
+    QK_PROGRAMMABLE_BUTTON_18 = 0x7451,
+    QK_PROGRAMMABLE_BUTTON_19 = 0x7452,
+    QK_PROGRAMMABLE_BUTTON_20 = 0x7453,
+    QK_PROGRAMMABLE_BUTTON_21 = 0x7454,
+    QK_PROGRAMMABLE_BUTTON_22 = 0x7455,
+    QK_PROGRAMMABLE_BUTTON_23 = 0x7456,
+    QK_PROGRAMMABLE_BUTTON_24 = 0x7457,
+    QK_PROGRAMMABLE_BUTTON_25 = 0x7458,
+    QK_PROGRAMMABLE_BUTTON_26 = 0x7459,
+    QK_PROGRAMMABLE_BUTTON_27 = 0x745A,
+    QK_PROGRAMMABLE_BUTTON_28 = 0x745B,
+    QK_PROGRAMMABLE_BUTTON_29 = 0x745C,
+    QK_PROGRAMMABLE_BUTTON_30 = 0x745D,
+    QK_PROGRAMMABLE_BUTTON_31 = 0x745E,
+    QK_PROGRAMMABLE_BUTTON_32 = 0x745F,
+    AU_ON = 0x7480,
+    AU_OFF = 0x7481,
+    AU_TOG = 0x7482,
+    CLICKY_TOGGLE = 0x748A,
+    CLICKY_ENABLE = 0x748B,
+    CLICKY_DISABLE = 0x748C,
+    CLICKY_UP = 0x748D,
+    CLICKY_DOWN = 0x748E,
+    CLICKY_RESET = 0x748F,
+    MU_ON = 0x7490,
+    MU_OFF = 0x7491,
+    MU_TOG = 0x7492,
+    MU_MOD = 0x7493,
+    MUV_IN = 0x7494,
+    MUV_DE = 0x7495,
+    QK_STENO_BOLT = 0x74F0,
+    QK_STENO_GEMINI = 0x74F1,
+    QK_STENO_COMB = 0x74F2,
+    QK_STENO_COMB_MAX = 0x74FC,
+    MACRO_0 = 0x7700,
+    MACRO_1 = 0x7701,
+    MACRO_2 = 0x7702,
+    MACRO_3 = 0x7703,
+    MACRO_4 = 0x7704,
+    MACRO_5 = 0x7705,
+    MACRO_6 = 0x7706,
+    MACRO_7 = 0x7707,
+    MACRO_8 = 0x7708,
+    MACRO_9 = 0x7709,
+    MACRO_10 = 0x770A,
+    MACRO_11 = 0x770B,
+    MACRO_12 = 0x770C,
+    MACRO_13 = 0x770D,
+    MACRO_14 = 0x770E,
+    MACRO_15 = 0x770F,
+    MACRO_16 = 0x7710,
+    MACRO_17 = 0x7711,
+    MACRO_18 = 0x7712,
+    MACRO_19 = 0x7713,
+    MACRO_20 = 0x7714,
+    MACRO_21 = 0x7715,
+    MACRO_22 = 0x7716,
+    MACRO_23 = 0x7717,
+    MACRO_24 = 0x7718,
+    MACRO_25 = 0x7719,
+    MACRO_26 = 0x771A,
+    MACRO_27 = 0x771B,
+    MACRO_28 = 0x771C,
+    MACRO_29 = 0x771D,
+    MACRO_30 = 0x771E,
+    MACRO_31 = 0x771F,
+    BL_ON = 0x7800,
+    BL_OFF = 0x7801,
+    BL_DEC = 0x7802,
+    BL_INC = 0x7803,
+    BL_TOGG = 0x7804,
+    BL_STEP = 0x7805,
+    BL_BRTG = 0x7806,
+    RGB_TOG = 0x7820,
+    RGB_MODE_FORWARD = 0x7821,
+    RGB_MODE_REVERSE = 0x7822,
+    RGB_HUI = 0x7823,
+    RGB_HUD = 0x7824,
+    RGB_SAI = 0x7825,
+    RGB_SAD = 0x7826,
+    RGB_VAI = 0x7827,
+    RGB_VAD = 0x7828,
+    RGB_SPI = 0x7829,
+    RGB_SPD = 0x782A,
+    RGB_MODE_PLAIN = 0x782B,
+    RGB_MODE_BREATHE = 0x782C,
+    RGB_MODE_RAINBOW = 0x782D,
+    RGB_MODE_SWIRL = 0x782E,
+    RGB_MODE_SNAKE = 0x782F,
+    RGB_MODE_KNIGHT = 0x7830,
+    RGB_MODE_XMAS = 0x7831,
+    RGB_MODE_GRADIENT = 0x7832,
+    RGB_MODE_RGBTEST = 0x7833,
+    RGB_MODE_TWINKLE = 0x7834,
+    QK_BOOTLOADER = 0x7C00,
+    QK_REBOOT = 0x7C01,
+    QK_DEBUG_TOGGLE = 0x7C02,
+    QK_CLEAR_EEPROM = 0x7C03,
+    QK_MAKE = 0x7C04,
+    QK_AUTO_SHIFT_DOWN = 0x7C10,
+    QK_AUTO_SHIFT_UP = 0x7C11,
+    QK_AUTO_SHIFT_REPORT = 0x7C12,
+    QK_AUTO_SHIFT_ON = 0x7C13,
+    QK_AUTO_SHIFT_OFF = 0x7C14,
+    QK_AUTO_SHIFT_TOGGLE = 0x7C15,
+    QK_GRAVE_ESCAPE = 0x7C16,
+    QK_VELOCIKEY_TOGGLE = 0x7C17,
+    QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN = 0x7C18,
+    QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE = 0x7C19,
+    QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN = 0x7C1A,
+    QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE = 0x7C1B,
+    QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN = 0x7C1C,
+    QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE = 0x7C1D,
+    QK_SPACE_CADET_RIGHT_SHIFT_ENTER = 0x7C1E,
+    OUT_AUTO = 0x7C20,
+    OUT_USB = 0x7C21,
+    OUT_BT = 0x7C22,
+    QK_UNICODE_MODE_NEXT = 0x7C30,
+    QK_UNICODE_MODE_PREVIOUS = 0x7C31,
+    QK_UNICODE_MODE_MACOS = 0x7C32,
+    QK_UNICODE_MODE_LINUX = 0x7C33,
+    QK_UNICODE_MODE_WINDOWS = 0x7C34,
+    QK_UNICODE_MODE_BSD = 0x7C35,
+    QK_UNICODE_MODE_WINCOMPOSE = 0x7C36,
+    QK_UNICODE_MODE_EMACS = 0x7C37,
+    HPT_ON = 0x7C40,
+    HPT_OFF = 0x7C41,
+    HPT_TOG = 0x7C42,
+    HPT_RST = 0x7C43,
+    HPT_FBK = 0x7C44,
+    HPT_BUZ = 0x7C45,
+    HPT_MODI = 0x7C46,
+    HPT_MODD = 0x7C47,
+    HPT_CONT = 0x7C48,
+    HPT_CONI = 0x7C49,
+    HPT_COND = 0x7C4A,
+    HPT_DWLI = 0x7C4B,
+    HPT_DWLD = 0x7C4C,
+    QK_COMBO_ON = 0x7C50,
+    QK_COMBO_OFF = 0x7C51,
+    QK_COMBO_TOGGLE = 0x7C52,
+    QK_DYNAMIC_MACRO_RECORD_START_1 = 0x7C53,
+    QK_DYNAMIC_MACRO_RECORD_START_2 = 0x7C54,
+    QK_DYNAMIC_MACRO_RECORD_STOP = 0x7C55,
+    QK_DYNAMIC_MACRO_PLAY_1 = 0x7C56,
+    QK_DYNAMIC_MACRO_PLAY_2 = 0x7C57,
+    QK_LEADER = 0x7C58,
+    QK_LOCK = 0x7C59,
+    QK_ONE_SHOT_ON = 0x7C5A,
+    QK_ONE_SHOT_OFF = 0x7C5B,
+    QK_ONE_SHOT_TOGGLE = 0x7C5C,
+    QK_KEY_OVERRIDE_TOGGLE = 0x7C5D,
+    QK_KEY_OVERRIDE_ON = 0x7C5E,
+    QK_KEY_OVERRIDE_OFF = 0x7C5F,
+    QK_SECURE_LOCK = 0x7C60,
+    QK_SECURE_UNLOCK = 0x7C61,
+    QK_SECURE_TOGGLE = 0x7C62,
+    QK_SECURE_REQUEST = 0x7C63,
+    DT_PRNT = 0x7C70,
+    DT_UP = 0x7C71,
+    DT_DOWN = 0x7C72,
+    PRINT_ON = 0x7C73,
+    PRINT_OFF = 0x7C74,
+    QK_CAPS_WORD_TOGGLE = 0x7C75,
+    QK_AUTOCORRECT_ON = 0x7C76,
+    QK_AUTOCORRECT_OFF = 0x7C77,
+    QK_AUTOCORRECT_TOGGLE = 0x7C78,
+    SAFE_RANGE = 0x7E00,
+
+// Alias
+    XXXXXXX    = KC_NO,
+    _______    = KC_TRANSPARENT,
+    KC_TRNS    = KC_TRANSPARENT,
+    KC_ENT     = KC_ENTER,
+    KC_ESC     = KC_ESCAPE,
+    KC_BSPC    = KC_BACKSPACE,
+    KC_SPC     = KC_SPACE,
+    KC_MINS    = KC_MINUS,
+    KC_EQL     = KC_EQUAL,
+    KC_LBRC    = KC_LEFT_BRACKET,
+    KC_RBRC    = KC_RIGHT_BRACKET,
+    KC_BSLS    = KC_BACKSLASH,
+    KC_NUHS    = KC_NONUS_HASH,
+    KC_SCLN    = KC_SEMICOLON,
+    KC_QUOT    = KC_QUOTE,
+    KC_GRV     = KC_GRAVE,
+    KC_COMM    = KC_COMMA,
+    KC_SLSH    = KC_SLASH,
+    KC_CAPS    = KC_CAPS_LOCK,
+    KC_PSCR    = KC_PRINT_SCREEN,
+    KC_SCRL    = KC_SCROLL_LOCK,
+    KC_BRMD    = KC_SCROLL_LOCK,
+    KC_PAUS    = KC_PAUSE,
+    KC_BRK     = KC_PAUSE,
+    KC_BRMU    = KC_PAUSE,
+    KC_INS     = KC_INSERT,
+    KC_PGUP    = KC_PAGE_UP,
+    KC_DEL     = KC_DELETE,
+    KC_PGDN    = KC_PAGE_DOWN,
+    KC_RGHT    = KC_RIGHT,
+    KC_NUM     = KC_NUM_LOCK,
+    KC_PSLS    = KC_KP_SLASH,
+    KC_PAST    = KC_KP_ASTERISK,
+    KC_PMNS    = KC_KP_MINUS,
+    KC_PPLS    = KC_KP_PLUS,
+    KC_PENT    = KC_KP_ENTER,
+    KC_P1      = KC_KP_1,
+    KC_P2      = KC_KP_2,
+    KC_P3      = KC_KP_3,
+    KC_P4      = KC_KP_4,
+    KC_P5      = KC_KP_5,
+    KC_P6      = KC_KP_6,
+    KC_P7      = KC_KP_7,
+    KC_P8      = KC_KP_8,
+    KC_P9      = KC_KP_9,
+    KC_P0      = KC_KP_0,
+    KC_PDOT    = KC_KP_DOT,
+    KC_NUBS    = KC_NONUS_BACKSLASH,
+    KC_APP     = KC_APPLICATION,
+    KC_PEQL    = KC_KP_EQUAL,
+    KC_EXEC    = KC_EXECUTE,
+    KC_SLCT    = KC_SELECT,
+    KC_AGIN    = KC_AGAIN,
+    KC_PSTE    = KC_PASTE,
+    KC_LCAP    = KC_LOCKING_CAPS_LOCK,
+    KC_LNUM    = KC_LOCKING_NUM_LOCK,
+    KC_LSCR    = KC_LOCKING_SCROLL_LOCK,
+    KC_PCMM    = KC_KP_COMMA,
+    KC_INT1    = KC_INTERNATIONAL_1,
+    KC_INT2    = KC_INTERNATIONAL_2,
+    KC_INT3    = KC_INTERNATIONAL_3,
+    KC_INT4    = KC_INTERNATIONAL_4,
+    KC_INT5    = KC_INTERNATIONAL_5,
+    KC_INT6    = KC_INTERNATIONAL_6,
+    KC_INT7    = KC_INTERNATIONAL_7,
+    KC_INT8    = KC_INTERNATIONAL_8,
+    KC_INT9    = KC_INTERNATIONAL_9,
+    KC_LNG1    = KC_LANGUAGE_1,
+    KC_LNG2    = KC_LANGUAGE_2,
+    KC_LNG3    = KC_LANGUAGE_3,
+    KC_LNG4    = KC_LANGUAGE_4,
+    KC_LNG5    = KC_LANGUAGE_5,
+    KC_LNG6    = KC_LANGUAGE_6,
+    KC_LNG7    = KC_LANGUAGE_7,
+    KC_LNG8    = KC_LANGUAGE_8,
+    KC_LNG9    = KC_LANGUAGE_9,
+    KC_ERAS    = KC_ALTERNATE_ERASE,
+    KC_SYRQ    = KC_SYSTEM_REQUEST,
+    KC_CNCL    = KC_CANCEL,
+    KC_CLR     = KC_CLEAR,
+    KC_PRIR    = KC_PRIOR,
+    KC_RETN    = KC_RETURN,
+    KC_SEPR    = KC_SEPARATOR,
+    KC_CLAG    = KC_CLEAR_AGAIN,
+    KC_CRSL    = KC_CRSEL,
+    KC_EXSL    = KC_EXSEL,
+    KC_PWR     = KC_SYSTEM_POWER,
+    KC_SLEP    = KC_SYSTEM_SLEEP,
+    KC_WAKE    = KC_SYSTEM_WAKE,
+    KC_MUTE    = KC_AUDIO_MUTE,
+    KC_VOLU    = KC_AUDIO_VOL_UP,
+    KC_VOLD    = KC_AUDIO_VOL_DOWN,
+    KC_MNXT    = KC_MEDIA_NEXT_TRACK,
+    KC_MPRV    = KC_MEDIA_PREV_TRACK,
+    KC_MSTP    = KC_MEDIA_STOP,
+    KC_MPLY    = KC_MEDIA_PLAY_PAUSE,
+    KC_MSEL    = KC_MEDIA_SELECT,
+    KC_EJCT    = KC_MEDIA_EJECT,
+    KC_CALC    = KC_CALCULATOR,
+    KC_MYCM    = KC_MY_COMPUTER,
+    KC_WSCH    = KC_WWW_SEARCH,
+    KC_WHOM    = KC_WWW_HOME,
+    KC_WBAK    = KC_WWW_BACK,
+    KC_WFWD    = KC_WWW_FORWARD,
+    KC_WSTP    = KC_WWW_STOP,
+    KC_WREF    = KC_WWW_REFRESH,
+    KC_WFAV    = KC_WWW_FAVORITES,
+    KC_MFFD    = KC_MEDIA_FAST_FORWARD,
+    KC_MRWD    = KC_MEDIA_REWIND,
+    KC_BRIU    = KC_BRIGHTNESS_UP,
+    KC_BRID    = KC_BRIGHTNESS_DOWN,
+    KC_CPNL    = KC_CONTROL_PANEL,
+    KC_ASST    = KC_ASSISTANT,
+    KC_MS_U    = KC_MS_UP,
+    KC_MS_D    = KC_MS_DOWN,
+    KC_MS_L    = KC_MS_LEFT,
+    KC_MS_R    = KC_MS_RIGHT,
+    KC_BTN1    = KC_MS_BTN1,
+    KC_BTN2    = KC_MS_BTN2,
+    KC_BTN3    = KC_MS_BTN3,
+    KC_BTN4    = KC_MS_BTN4,
+    KC_BTN5    = KC_MS_BTN5,
+    KC_BTN6    = KC_MS_BTN6,
+    KC_BTN7    = KC_MS_BTN7,
+    KC_BTN8    = KC_MS_BTN8,
+    KC_WH_U    = KC_MS_WH_UP,
+    KC_WH_D    = KC_MS_WH_DOWN,
+    KC_WH_L    = KC_MS_WH_LEFT,
+    KC_WH_R    = KC_MS_WH_RIGHT,
+    KC_ACL0    = KC_MS_ACCEL0,
+    KC_ACL1    = KC_MS_ACCEL1,
+    KC_ACL2    = KC_MS_ACCEL2,
+    KC_LCTL    = KC_LEFT_CTRL,
+    KC_LSFT    = KC_LEFT_SHIFT,
+    KC_LALT    = KC_LEFT_ALT,
+    KC_LOPT    = KC_LEFT_ALT,
+    KC_LGUI    = KC_LEFT_GUI,
+    KC_LCMD    = KC_LEFT_GUI,
+    KC_LWIN    = KC_LEFT_GUI,
+    KC_RCTL    = KC_RIGHT_CTRL,
+    KC_RSFT    = KC_RIGHT_SHIFT,
+    KC_RALT    = KC_RIGHT_ALT,
+    KC_ROPT    = KC_RIGHT_ALT,
+    KC_ALGR    = KC_RIGHT_ALT,
+    KC_RGUI    = KC_RIGHT_GUI,
+    KC_RCMD    = KC_RIGHT_GUI,
+    KC_RWIN    = KC_RIGHT_GUI,
+    CL_SWAP    = MAGIC_SWAP_CONTROL_CAPSLOCK,
+    CL_NORM    = MAGIC_UNSWAP_CONTROL_CAPSLOCK,
+    CL_TOGG    = MAGIC_TOGGLE_CONTROL_CAPSLOCK,
+    CL_CAPS    = MAGIC_UNCAPSLOCK_TO_CONTROL,
+    CL_CTRL    = MAGIC_CAPSLOCK_TO_CONTROL,
+    LAG_SWP    = MAGIC_SWAP_LALT_LGUI,
+    LAG_NRM    = MAGIC_UNSWAP_LALT_LGUI,
+    RAG_SWP    = MAGIC_SWAP_RALT_RGUI,
+    RAG_NRM    = MAGIC_UNSWAP_RALT_RGUI,
+    GUI_ON     = MAGIC_UNNO_GUI,
+    GUI_OFF    = MAGIC_NO_GUI,
+    GUI_TOG    = MAGIC_TOGGLE_GUI,
+    GE_SWAP    = MAGIC_SWAP_GRAVE_ESC,
+    GE_NORM    = MAGIC_UNSWAP_GRAVE_ESC,
+    BS_SWAP    = MAGIC_SWAP_BACKSLASH_BACKSPACE,
+    BS_NORM    = MAGIC_UNSWAP_BACKSLASH_BACKSPACE,
+    BS_TOGG    = MAGIC_TOGGLE_BACKSLASH_BACKSPACE,
+    NK_ON      = MAGIC_HOST_NKRO,
+    NK_OFF     = MAGIC_UNHOST_NKRO,
+    NK_TOGG    = MAGIC_TOGGLE_NKRO,
+    AG_SWAP    = MAGIC_SWAP_ALT_GUI,
+    AG_NORM    = MAGIC_UNSWAP_ALT_GUI,
+    AG_TOGG    = MAGIC_TOGGLE_ALT_GUI,
+    LCG_SWP    = MAGIC_SWAP_LCTL_LGUI,
+    LCG_NRM    = MAGIC_UNSWAP_LCTL_LGUI,
+    RCG_SWP    = MAGIC_SWAP_RCTL_RGUI,
+    RCG_NRM    = MAGIC_UNSWAP_RCTL_RGUI,
+    CG_SWAP    = MAGIC_SWAP_CTL_GUI,
+    CG_NORM    = MAGIC_UNSWAP_CTL_GUI,
+    CG_TOGG    = MAGIC_TOGGLE_CTL_GUI,
+    EH_LEFT    = MAGIC_EE_HANDS_LEFT,
+    EH_RGHT    = MAGIC_EE_HANDS_RIGHT,
+    EC_SWAP    = MAGIC_SWAP_ESCAPE_CAPSLOCK,
+    EC_NORM    = MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
+    EC_TOGG    = MAGIC_TOGGLE_ESCAPE_CAPSLOCK,
+    MI_Db      = MI_Cs,
+    MI_Eb      = MI_Ds,
+    MI_Gb      = MI_Fs,
+    MI_Ab      = MI_Gs,
+    MI_Bb      = MI_As,
+    MI_Db_1    = MI_Cs_1,
+    MI_Eb_1    = MI_Ds_1,
+    MI_Gb_1    = MI_Fs_1,
+    MI_Ab_1    = MI_Gs_1,
+    MI_Bb_1    = MI_As_1,
+    MI_Db_2    = MI_Cs_2,
+    MI_Eb_2    = MI_Ds_2,
+    MI_Gb_2    = MI_Fs_2,
+    MI_Ab_2    = MI_Gs_2,
+    MI_Bb_2    = MI_As_2,
+    MI_Db_3    = MI_Cs_3,
+    MI_Eb_3    = MI_Ds_3,
+    MI_Gb_3    = MI_Fs_3,
+    MI_Ab_3    = MI_Gs_3,
+    MI_Bb_3    = MI_As_3,
+    MI_Db_4    = MI_Cs_4,
+    MI_Eb_4    = MI_Ds_4,
+    MI_Gb_4    = MI_Fs_4,
+    MI_Ab_4    = MI_Gs_4,
+    MI_Bb_4    = MI_As_4,
+    MI_Db_5    = MI_Cs_5,
+    MI_Eb_5    = MI_Ds_5,
+    MI_Gb_5    = MI_Fs_5,
+    MI_Ab_5    = MI_Gs_5,
+    MI_Bb_5    = MI_As_5,
+    JS_0       = QK_JOYSTICK_BUTTON_0,
+    JS_1       = QK_JOYSTICK_BUTTON_1,
+    JS_2       = QK_JOYSTICK_BUTTON_2,
+    JS_3       = QK_JOYSTICK_BUTTON_3,
+    JS_4       = QK_JOYSTICK_BUTTON_4,
+    JS_5       = QK_JOYSTICK_BUTTON_5,
+    JS_6       = QK_JOYSTICK_BUTTON_6,
+    JS_7       = QK_JOYSTICK_BUTTON_7,
+    JS_8       = QK_JOYSTICK_BUTTON_8,
+    JS_9       = QK_JOYSTICK_BUTTON_9,
+    JS_10      = QK_JOYSTICK_BUTTON_10,
+    JS_11      = QK_JOYSTICK_BUTTON_11,
+    JS_12      = QK_JOYSTICK_BUTTON_12,
+    JS_13      = QK_JOYSTICK_BUTTON_13,
+    JS_14      = QK_JOYSTICK_BUTTON_14,
+    JS_15      = QK_JOYSTICK_BUTTON_15,
+    JS_16      = QK_JOYSTICK_BUTTON_16,
+    JS_17      = QK_JOYSTICK_BUTTON_17,
+    JS_18      = QK_JOYSTICK_BUTTON_18,
+    JS_19      = QK_JOYSTICK_BUTTON_19,
+    JS_20      = QK_JOYSTICK_BUTTON_20,
+    JS_21      = QK_JOYSTICK_BUTTON_21,
+    JS_22      = QK_JOYSTICK_BUTTON_22,
+    JS_23      = QK_JOYSTICK_BUTTON_23,
+    JS_24      = QK_JOYSTICK_BUTTON_24,
+    JS_25      = QK_JOYSTICK_BUTTON_25,
+    JS_26      = QK_JOYSTICK_BUTTON_26,
+    JS_27      = QK_JOYSTICK_BUTTON_27,
+    JS_28      = QK_JOYSTICK_BUTTON_28,
+    JS_29      = QK_JOYSTICK_BUTTON_29,
+    JS_30      = QK_JOYSTICK_BUTTON_30,
+    JS_31      = QK_JOYSTICK_BUTTON_31,
+    PB_1       = QK_PROGRAMMABLE_BUTTON_1,
+    PB_2       = QK_PROGRAMMABLE_BUTTON_2,
+    PB_3       = QK_PROGRAMMABLE_BUTTON_3,
+    PB_4       = QK_PROGRAMMABLE_BUTTON_4,
+    PB_5       = QK_PROGRAMMABLE_BUTTON_5,
+    PB_6       = QK_PROGRAMMABLE_BUTTON_6,
+    PB_7       = QK_PROGRAMMABLE_BUTTON_7,
+    PB_8       = QK_PROGRAMMABLE_BUTTON_8,
+    PB_9       = QK_PROGRAMMABLE_BUTTON_9,
+    PB_10      = QK_PROGRAMMABLE_BUTTON_10,
+    PB_11      = QK_PROGRAMMABLE_BUTTON_11,
+    PB_12      = QK_PROGRAMMABLE_BUTTON_12,
+    PB_13      = QK_PROGRAMMABLE_BUTTON_13,
+    PB_14      = QK_PROGRAMMABLE_BUTTON_14,
+    PB_15      = QK_PROGRAMMABLE_BUTTON_15,
+    PB_16      = QK_PROGRAMMABLE_BUTTON_16,
+    PB_17      = QK_PROGRAMMABLE_BUTTON_17,
+    PB_18      = QK_PROGRAMMABLE_BUTTON_18,
+    PB_19      = QK_PROGRAMMABLE_BUTTON_19,
+    PB_20      = QK_PROGRAMMABLE_BUTTON_20,
+    PB_21      = QK_PROGRAMMABLE_BUTTON_21,
+    PB_22      = QK_PROGRAMMABLE_BUTTON_22,
+    PB_23      = QK_PROGRAMMABLE_BUTTON_23,
+    PB_24      = QK_PROGRAMMABLE_BUTTON_24,
+    PB_25      = QK_PROGRAMMABLE_BUTTON_25,
+    PB_26      = QK_PROGRAMMABLE_BUTTON_26,
+    PB_27      = QK_PROGRAMMABLE_BUTTON_27,
+    PB_28      = QK_PROGRAMMABLE_BUTTON_28,
+    PB_29      = QK_PROGRAMMABLE_BUTTON_29,
+    PB_30      = QK_PROGRAMMABLE_BUTTON_30,
+    PB_31      = QK_PROGRAMMABLE_BUTTON_31,
+    PB_32      = QK_PROGRAMMABLE_BUTTON_32,
+    CK_TOGG    = CLICKY_TOGGLE,
+    CK_ON      = CLICKY_ENABLE,
+    CK_OFF     = CLICKY_DISABLE,
+    CK_UP      = CLICKY_UP,
+    CK_DOWN    = CLICKY_DOWN,
+    CK_RST     = CLICKY_RESET,
+    RGB_MOD    = RGB_MODE_FORWARD,
+    RGB_RMOD   = RGB_MODE_REVERSE,
+    RGB_M_P    = RGB_MODE_PLAIN,
+    RGB_M_B    = RGB_MODE_BREATHE,
+    RGB_M_R    = RGB_MODE_RAINBOW,
+    RGB_M_SW   = RGB_MODE_SWIRL,
+    RGB_M_SN   = RGB_MODE_SNAKE,
+    RGB_M_K    = RGB_MODE_KNIGHT,
+    RGB_M_X    = RGB_MODE_XMAS,
+    RGB_M_G    = RGB_MODE_GRADIENT,
+    RGB_M_T    = RGB_MODE_RGBTEST,
+    RGB_M_TW   = RGB_MODE_TWINKLE,
+    QK_BOOT    = QK_BOOTLOADER,
+    QK_RBT     = QK_REBOOT,
+    DB_TOGG    = QK_DEBUG_TOGGLE,
+    EE_CLR     = QK_CLEAR_EEPROM,
+    AS_DOWN    = QK_AUTO_SHIFT_DOWN,
+    AS_UP      = QK_AUTO_SHIFT_UP,
+    AS_RPT     = QK_AUTO_SHIFT_REPORT,
+    AS_ON      = QK_AUTO_SHIFT_ON,
+    AS_OFF     = QK_AUTO_SHIFT_OFF,
+    AS_TOGG    = QK_AUTO_SHIFT_TOGGLE,
+    QK_GESC    = QK_GRAVE_ESCAPE,
+    VK_TOGG    = QK_VELOCIKEY_TOGGLE,
+    SC_LCPO    = QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN,
+    SC_RCPC    = QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE,
+    SC_LSPO    = QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN,
+    SC_RSPC    = QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE,
+    SC_LAPO    = QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN,
+    SC_RAPC    = QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE,
+    SC_SENT    = QK_SPACE_CADET_RIGHT_SHIFT_ENTER,
+    UC_NEXT    = QK_UNICODE_MODE_NEXT,
+    UC_PREV    = QK_UNICODE_MODE_PREVIOUS,
+    UC_MAC     = QK_UNICODE_MODE_MACOS,
+    UC_LINX    = QK_UNICODE_MODE_LINUX,
+    UC_WIN     = QK_UNICODE_MODE_WINDOWS,
+    UC_BSD     = QK_UNICODE_MODE_BSD,
+    UC_WINC    = QK_UNICODE_MODE_WINCOMPOSE,
+    UC_EMAC    = QK_UNICODE_MODE_EMACS,
+    CM_ON      = QK_COMBO_ON,
+    CM_OFF     = QK_COMBO_OFF,
+    CM_TOGG    = QK_COMBO_TOGGLE,
+    DM_REC1    = QK_DYNAMIC_MACRO_RECORD_START_1,
+    DM_REC2    = QK_DYNAMIC_MACRO_RECORD_START_2,
+    DM_RSTP    = QK_DYNAMIC_MACRO_RECORD_STOP,
+    DM_PLY1    = QK_DYNAMIC_MACRO_PLAY_1,
+    DM_PLY2    = QK_DYNAMIC_MACRO_PLAY_2,
+    QK_LEAD    = QK_LEADER,
+    OS_ON      = QK_ONE_SHOT_ON,
+    OS_OFF     = QK_ONE_SHOT_OFF,
+    OS_TOGG    = QK_ONE_SHOT_TOGGLE,
+    KO_TOGG    = QK_KEY_OVERRIDE_TOGGLE,
+    KO_ON      = QK_KEY_OVERRIDE_ON,
+    KO_OFF     = QK_KEY_OVERRIDE_OFF,
+    SE_LOCK    = QK_SECURE_LOCK,
+    SE_UNLK    = QK_SECURE_UNLOCK,
+    SE_TOGG    = QK_SECURE_TOGGLE,
+    SE_REQ     = QK_SECURE_REQUEST,
+    CW_TOGG    = QK_CAPS_WORD_TOGGLE,
+    AC_ON      = QK_AUTOCORRECT_ON,
+    AC_OFF     = QK_AUTOCORRECT_OFF,
+    AC_TOGG    = QK_AUTOCORRECT_TOGGLE,
+};
+
+// Range Helpers
+#define IS_QK_BASIC(code) ((code) >= QK_BASIC && (code) <= QK_BASIC_MAX)
+#define IS_QK_MODS(code) ((code) >= QK_MODS && (code) <= QK_MODS_MAX)
+#define IS_QK_MOD_TAP(code) ((code) >= QK_MOD_TAP && (code) <= QK_MOD_TAP_MAX)
+#define IS_QK_LAYER_TAP(code) ((code) >= QK_LAYER_TAP && (code) <= QK_LAYER_TAP_MAX)
+#define IS_QK_LAYER_MOD(code) ((code) >= QK_LAYER_MOD && (code) <= QK_LAYER_MOD_MAX)
+#define IS_QK_TO(code) ((code) >= QK_TO && (code) <= QK_TO_MAX)
+#define IS_QK_MOMENTARY(code) ((code) >= QK_MOMENTARY && (code) <= QK_MOMENTARY_MAX)
+#define IS_QK_DEF_LAYER(code) ((code) >= QK_DEF_LAYER && (code) <= QK_DEF_LAYER_MAX)
+#define IS_QK_TOGGLE_LAYER(code) ((code) >= QK_TOGGLE_LAYER && (code) <= QK_TOGGLE_LAYER_MAX)
+#define IS_QK_ONE_SHOT_LAYER(code) ((code) >= QK_ONE_SHOT_LAYER && (code) <= QK_ONE_SHOT_LAYER_MAX)
+#define IS_QK_ONE_SHOT_MOD(code) ((code) >= QK_ONE_SHOT_MOD && (code) <= QK_ONE_SHOT_MOD_MAX)
+#define IS_QK_LAYER_TAP_TOGGLE(code) ((code) >= QK_LAYER_TAP_TOGGLE && (code) <= QK_LAYER_TAP_TOGGLE_MAX)
+#define IS_QK_SWAP_HANDS(code) ((code) >= QK_SWAP_HANDS && (code) <= QK_SWAP_HANDS_MAX)
+#define IS_QK_TAP_DANCE(code) ((code) >= QK_TAP_DANCE && (code) <= QK_TAP_DANCE_MAX)
+#define IS_QK_MAGIC(code) ((code) >= QK_MAGIC && (code) <= QK_MAGIC_MAX)
+#define IS_QK_MIDI(code) ((code) >= QK_MIDI && (code) <= QK_MIDI_MAX)
+#define IS_QK_SEQUENCER(code) ((code) >= QK_SEQUENCER && (code) <= QK_SEQUENCER_MAX)
+#define IS_QK_JOYSTICK(code) ((code) >= QK_JOYSTICK && (code) <= QK_JOYSTICK_MAX)
+#define IS_QK_PROGRAMMABLE_BUTTON(code) ((code) >= QK_PROGRAMMABLE_BUTTON && (code) <= QK_PROGRAMMABLE_BUTTON_MAX)
+#define IS_QK_AUDIO(code) ((code) >= QK_AUDIO && (code) <= QK_AUDIO_MAX)
+#define IS_QK_STENO(code) ((code) >= QK_STENO && (code) <= QK_STENO_MAX)
+#define IS_QK_MACRO(code) ((code) >= QK_MACRO && (code) <= QK_MACRO_MAX)
+#define IS_QK_LIGHTING(code) ((code) >= QK_LIGHTING && (code) <= QK_LIGHTING_MAX)
+#define IS_QK_QUANTUM(code) ((code) >= QK_QUANTUM && (code) <= QK_QUANTUM_MAX)
+#define IS_QK_KB(code) ((code) >= QK_KB && (code) <= QK_KB_MAX)
+#define IS_QK_USER(code) ((code) >= QK_USER && (code) <= QK_USER_MAX)
+#define IS_QK_UNICODE(code) ((code) >= QK_UNICODE && (code) <= QK_UNICODE_MAX)
+
+// Group Helpers
+#define IS_INTERNAL_KEYCODE(code) ((code) >= KC_NO && (code) <= KC_TRANSPARENT)
+#define IS_BASIC_KEYCODE(code) ((code) >= KC_A && (code) <= KC_EXSEL)
+#define IS_SYSTEM_KEYCODE(code) ((code) >= KC_SYSTEM_POWER && (code) <= KC_SYSTEM_WAKE)
+#define IS_MEDIA_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_ASSISTANT)
+#define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2)
+#define IS_MODIFIERS_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI)
+#define IS_SWAP_HANDS_KEYCODE(code) ((code) >= SH_TG && (code) <= SH_OS)
+#define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK)
+#define IS_MIDI_KEYCODE(code) ((code) >= MI_ON && (code) <= MI_BENDU)
+#define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR)
+#define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31)
+#define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32)
+#define IS_AUDIO_KEYCODE(code) ((code) >= AU_ON && (code) <= MUV_DE)
+#define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX)
+#define IS_MACRO_KEYCODE(code) ((code) >= MACRO_0 && (code) <= MACRO_31)
+#define IS_BACKLIGHT_KEYCODE(code) ((code) >= BL_ON && (code) <= BL_BRTG)
+#define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
+#define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE)
+
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 50e581cd87..a5997711f2 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -109,7 +109,7 @@ action_t action_for_keycode(uint16_t keycode) {
             break;
         case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:;
             // OSM(mod) - One-shot mod
-            mod         = mod_config(keycode & 0xFF);
+            mod         = mod_config(keycode & 0x1F);
             action.code = ACTION_MODS_ONESHOT(mod);
             break;
 #endif
@@ -118,8 +118,8 @@ action_t action_for_keycode(uint16_t keycode) {
             action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF);
             break;
         case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
-            mod          = mod_config(keycode & 0xF);
-            action_layer = (keycode >> 4) & 0xF;
+            mod          = mod_config(keycode & 0x1F);
+            action_layer = (keycode >> 5) & 0xF;
             action.code  = ACTION_LAYER_MODS(action_layer, mod);
             break;
 #endif
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index c4c6fb59a8..43067b81db 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -19,11 +19,11 @@
 
 bool process_joystick(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case QK_JOYSTICK_BUTTON_MIN ... QK_JOYSTICK_BUTTON_MAX:
+        case QK_JOYSTICK ... QK_JOYSTICK_MAX:
             if (record->event.pressed) {
-                register_joystick_button(keycode - QK_JOYSTICK_BUTTON_MIN);
+                register_joystick_button(keycode - QK_JOYSTICK);
             } else {
-                unregister_joystick_button(keycode - QK_JOYSTICK_BUTTON_MIN);
+                unregister_joystick_button(keycode - QK_JOYSTICK);
             }
             return false;
     }
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c
index 50816c5261..72332b20d7 100644
--- a/quantum/process_keycode/process_magic.c
+++ b/quantum/process_keycode/process_magic.c
@@ -40,158 +40,152 @@ float cg_swap_song[][2] = CG_SWAP_SONG;
 bool process_magic(uint16_t keycode, keyrecord_t *record) {
     // skip anything that isn't a keyup
     if (record->event.pressed) {
-        switch (keycode) {
-            case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_ALT_GUI:
-            case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT:
-            case MAGIC_TOGGLE_GUI:
-            case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
-            case MAGIC_TOGGLE_BACKSLASH_BACKSPACE:
-            case MAGIC_SWAP_ESCAPE_CAPSLOCK ... MAGIC_TOGGLE_ESCAPE_CAPSLOCK:
-                /* keymap config */
-                keymap_config.raw = eeconfig_read_keymap();
-                switch (keycode) {
-                    case MAGIC_SWAP_CONTROL_CAPSLOCK:
-                        keymap_config.swap_control_capslock = true;
-                        break;
-                    case MAGIC_SWAP_ESCAPE_CAPSLOCK:
-                        keymap_config.swap_escape_capslock = true;
-                        break;
-                    case MAGIC_CAPSLOCK_TO_CONTROL:
-                        keymap_config.capslock_to_control = true;
-                        break;
-                    case MAGIC_SWAP_LALT_LGUI:
-                        keymap_config.swap_lalt_lgui = true;
-                        break;
-                    case MAGIC_SWAP_RALT_RGUI:
-                        keymap_config.swap_ralt_rgui = true;
-                        break;
-                    case MAGIC_SWAP_LCTL_LGUI:
-                        keymap_config.swap_lctl_lgui = true;
-                        break;
-                    case MAGIC_SWAP_RCTL_RGUI:
-                        keymap_config.swap_rctl_rgui = true;
-                        break;
-                    case MAGIC_NO_GUI:
-                        keymap_config.no_gui = true;
-                        break;
-                    case MAGIC_SWAP_GRAVE_ESC:
-                        keymap_config.swap_grave_esc = true;
-                        break;
-                    case MAGIC_SWAP_BACKSLASH_BACKSPACE:
-                        keymap_config.swap_backslash_backspace = true;
-                        break;
-                    case MAGIC_HOST_NKRO:
-                        clear_keyboard(); // clear first buffer to prevent stuck keys
-                        keymap_config.nkro = true;
-                        break;
-                    case MAGIC_SWAP_ALT_GUI:
-                        keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true;
+        if (IS_MAGIC_KEYCODE(keycode)) {
+            /* keymap config */
+            keymap_config.raw = eeconfig_read_keymap();
+            switch (keycode) {
+                case MAGIC_SWAP_CONTROL_CAPSLOCK:
+                    keymap_config.swap_control_capslock = true;
+                    break;
+                case MAGIC_SWAP_ESCAPE_CAPSLOCK:
+                    keymap_config.swap_escape_capslock = true;
+                    break;
+                case MAGIC_CAPSLOCK_TO_CONTROL:
+                    keymap_config.capslock_to_control = true;
+                    break;
+                case MAGIC_SWAP_LALT_LGUI:
+                    keymap_config.swap_lalt_lgui = true;
+                    break;
+                case MAGIC_SWAP_RALT_RGUI:
+                    keymap_config.swap_ralt_rgui = true;
+                    break;
+                case MAGIC_SWAP_LCTL_LGUI:
+                    keymap_config.swap_lctl_lgui = true;
+                    break;
+                case MAGIC_SWAP_RCTL_RGUI:
+                    keymap_config.swap_rctl_rgui = true;
+                    break;
+                case MAGIC_NO_GUI:
+                    keymap_config.no_gui = true;
+                    break;
+                case MAGIC_SWAP_GRAVE_ESC:
+                    keymap_config.swap_grave_esc = true;
+                    break;
+                case MAGIC_SWAP_BACKSLASH_BACKSPACE:
+                    keymap_config.swap_backslash_backspace = true;
+                    break;
+                case MAGIC_HOST_NKRO:
+                    clear_keyboard(); // clear first buffer to prevent stuck keys
+                    keymap_config.nkro = true;
+                    break;
+                case MAGIC_SWAP_ALT_GUI:
+                    keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true;
 #ifdef AUDIO_ENABLE
+                    PLAY_SONG(ag_swap_song);
+#endif
+                    break;
+                case MAGIC_SWAP_CTL_GUI:
+                    keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true;
+#ifdef AUDIO_ENABLE
+                    PLAY_SONG(cg_swap_song);
+#endif
+                    break;
+                case MAGIC_UNSWAP_CONTROL_CAPSLOCK:
+                    keymap_config.swap_control_capslock = false;
+                    break;
+                case MAGIC_UNSWAP_ESCAPE_CAPSLOCK:
+                    keymap_config.swap_escape_capslock = false;
+                    break;
+                case MAGIC_UNCAPSLOCK_TO_CONTROL:
+                    keymap_config.capslock_to_control = false;
+                    break;
+                case MAGIC_UNSWAP_LALT_LGUI:
+                    keymap_config.swap_lalt_lgui = false;
+                    break;
+                case MAGIC_UNSWAP_RALT_RGUI:
+                    keymap_config.swap_ralt_rgui = false;
+                    break;
+                case MAGIC_UNSWAP_LCTL_LGUI:
+                    keymap_config.swap_lctl_lgui = false;
+                    break;
+                case MAGIC_UNSWAP_RCTL_RGUI:
+                    keymap_config.swap_rctl_rgui = false;
+                    break;
+                case MAGIC_UNNO_GUI:
+                    keymap_config.no_gui = false;
+                    break;
+                case MAGIC_UNSWAP_GRAVE_ESC:
+                    keymap_config.swap_grave_esc = false;
+                    break;
+                case MAGIC_UNSWAP_BACKSLASH_BACKSPACE:
+                    keymap_config.swap_backslash_backspace = false;
+                    break;
+                case MAGIC_UNHOST_NKRO:
+                    clear_keyboard(); // clear first buffer to prevent stuck keys
+                    keymap_config.nkro = false;
+                    break;
+                case MAGIC_UNSWAP_ALT_GUI:
+                    keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false;
+#ifdef AUDIO_ENABLE
+                    PLAY_SONG(ag_norm_song);
+#endif
+                    break;
+                case MAGIC_UNSWAP_CTL_GUI:
+                    keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false;
+#ifdef AUDIO_ENABLE
+                    PLAY_SONG(cg_norm_song);
+#endif
+                    break;
+                case MAGIC_TOGGLE_ALT_GUI:
+                    keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui;
+                    keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui;
+#ifdef AUDIO_ENABLE
+                    if (keymap_config.swap_ralt_rgui) {
                         PLAY_SONG(ag_swap_song);
-#endif
-                        break;
-                    case MAGIC_SWAP_CTL_GUI:
-                        keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true;
-#ifdef AUDIO_ENABLE
-                        PLAY_SONG(cg_swap_song);
-#endif
-                        break;
-                    case MAGIC_UNSWAP_CONTROL_CAPSLOCK:
-                        keymap_config.swap_control_capslock = false;
-                        break;
-                    case MAGIC_UNSWAP_ESCAPE_CAPSLOCK:
-                        keymap_config.swap_escape_capslock = false;
-                        break;
-                    case MAGIC_UNCAPSLOCK_TO_CONTROL:
-                        keymap_config.capslock_to_control = false;
-                        break;
-                    case MAGIC_UNSWAP_LALT_LGUI:
-                        keymap_config.swap_lalt_lgui = false;
-                        break;
-                    case MAGIC_UNSWAP_RALT_RGUI:
-                        keymap_config.swap_ralt_rgui = false;
-                        break;
-                    case MAGIC_UNSWAP_LCTL_LGUI:
-                        keymap_config.swap_lctl_lgui = false;
-                        break;
-                    case MAGIC_UNSWAP_RCTL_RGUI:
-                        keymap_config.swap_rctl_rgui = false;
-                        break;
-                    case MAGIC_UNNO_GUI:
-                        keymap_config.no_gui = false;
-                        break;
-                    case MAGIC_UNSWAP_GRAVE_ESC:
-                        keymap_config.swap_grave_esc = false;
-                        break;
-                    case MAGIC_UNSWAP_BACKSLASH_BACKSPACE:
-                        keymap_config.swap_backslash_backspace = false;
-                        break;
-                    case MAGIC_UNHOST_NKRO:
-                        clear_keyboard(); // clear first buffer to prevent stuck keys
-                        keymap_config.nkro = false;
-                        break;
-                    case MAGIC_UNSWAP_ALT_GUI:
-                        keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false;
-#ifdef AUDIO_ENABLE
+                    } else {
                         PLAY_SONG(ag_norm_song);
+                    }
 #endif
-                        break;
-                    case MAGIC_UNSWAP_CTL_GUI:
-                        keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false;
+                    break;
+                case MAGIC_TOGGLE_CTL_GUI:
+                    keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui;
+                    keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui;
 #ifdef AUDIO_ENABLE
+                    if (keymap_config.swap_rctl_rgui) {
+                        PLAY_SONG(cg_swap_song);
+                    } else {
                         PLAY_SONG(cg_norm_song);
+                    }
 #endif
-                        break;
-                    case MAGIC_TOGGLE_ALT_GUI:
-                        keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui;
-                        keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui;
-#ifdef AUDIO_ENABLE
-                        if (keymap_config.swap_ralt_rgui) {
-                            PLAY_SONG(ag_swap_song);
-                        } else {
-                            PLAY_SONG(ag_norm_song);
-                        }
-#endif
-                        break;
-                    case MAGIC_TOGGLE_CTL_GUI:
-                        keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui;
-                        keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui;
-#ifdef AUDIO_ENABLE
-                        if (keymap_config.swap_rctl_rgui) {
-                            PLAY_SONG(cg_swap_song);
-                        } else {
-                            PLAY_SONG(cg_norm_song);
-                        }
-#endif
-                        break;
-                    case MAGIC_TOGGLE_BACKSLASH_BACKSPACE:
-                        keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace;
-                        break;
-                    case MAGIC_TOGGLE_NKRO:
-                        clear_keyboard(); // clear first buffer to prevent stuck keys
-                        keymap_config.nkro = !keymap_config.nkro;
-                        break;
-                    case MAGIC_EE_HANDS_LEFT:
-                        eeconfig_update_handedness(true);
-                        break;
-                    case MAGIC_EE_HANDS_RIGHT:
-                        eeconfig_update_handedness(false);
-                        break;
-                    case MAGIC_TOGGLE_GUI:
-                        keymap_config.no_gui = !keymap_config.no_gui;
-                        break;
-                    case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
-                        keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock;
-                        break;
-                    case MAGIC_TOGGLE_ESCAPE_CAPSLOCK:
-                        keymap_config.swap_escape_capslock = !keymap_config.swap_escape_capslock;
-                        break;
-                }
+                    break;
+                case MAGIC_TOGGLE_BACKSLASH_BACKSPACE:
+                    keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace;
+                    break;
+                case MAGIC_TOGGLE_NKRO:
+                    clear_keyboard(); // clear first buffer to prevent stuck keys
+                    keymap_config.nkro = !keymap_config.nkro;
+                    break;
+                case MAGIC_EE_HANDS_LEFT:
+                    eeconfig_update_handedness(true);
+                    break;
+                case MAGIC_EE_HANDS_RIGHT:
+                    eeconfig_update_handedness(false);
+                    break;
+                case MAGIC_TOGGLE_GUI:
+                    keymap_config.no_gui = !keymap_config.no_gui;
+                    break;
+                case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
+                    keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock;
+                    break;
+                case MAGIC_TOGGLE_ESCAPE_CAPSLOCK:
+                    keymap_config.swap_escape_capslock = !keymap_config.swap_escape_capslock;
+                    break;
+            }
 
-                eeconfig_update_keymap(keymap_config.raw);
-                clear_keyboard(); // clear to prevent stuck keys
+            eeconfig_update_keymap(keymap_config.raw);
+            clear_keyboard(); // clear to prevent stuck keys
 
-                return false;
+            return false;
         }
     }
 
diff --git a/quantum/process_keycode/process_programmable_button.c b/quantum/process_keycode/process_programmable_button.c
index d6a14e120c..03034edb61 100644
--- a/quantum/process_keycode/process_programmable_button.c
+++ b/quantum/process_keycode/process_programmable_button.c
@@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "programmable_button.h"
 
 bool process_programmable_button(uint16_t keycode, keyrecord_t *record) {
-    if (keycode >= QK_PROGRAMMABLE_BUTTON_MIN && keycode <= QK_PROGRAMMABLE_BUTTON_MAX) {
-        uint8_t button = keycode - QK_PROGRAMMABLE_BUTTON_MIN + 1;
+    if (IS_QK_PROGRAMMABLE_BUTTON(keycode)) {
+        uint8_t button = keycode - QK_PROGRAMMABLE_BUTTON + 1;
         if (record->event.pressed) {
             programmable_button_register(button);
         } else {
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 2df733fe1f..ec69fadbab 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -16,610 +16,28 @@
 
 #pragma once
 
-#include "sequencer.h"
-
-// Fillers to make layering more clear
-#define _______ KC_TRANSPARENT
-#define XXXXXXX KC_NO
-
-enum quantum_keycodes {
-    // Ranges used in shortcuts - not to be used directly
-    QK_BASIC                = 0x0000,
-    QK_BASIC_MAX            = 0x00FF,
-    QK_MODS                 = 0x0100,
-    QK_LCTL                 = 0x0100,
-    QK_LSFT                 = 0x0200,
-    QK_LALT                 = 0x0400,
-    QK_LGUI                 = 0x0800,
-    QK_RMODS_MIN            = 0x1000,
-    QK_RCTL                 = 0x1100,
-    QK_RSFT                 = 0x1200,
-    QK_RALT                 = 0x1400,
-    QK_RGUI                 = 0x1800,
-    QK_MODS_MAX             = 0x1FFF,
-    QK_LAYER_TAP            = 0x4000,
-    QK_LAYER_TAP_MAX        = 0x4FFF,
-    QK_TO                   = 0x5000,
-    QK_TO_MAX               = 0x50FF,
-    QK_MOMENTARY            = 0x5100,
-    QK_MOMENTARY_MAX        = 0x51FF,
-    QK_DEF_LAYER            = 0x5200,
-    QK_DEF_LAYER_MAX        = 0x52FF,
-    QK_TOGGLE_LAYER         = 0x5300,
-    QK_TOGGLE_LAYER_MAX     = 0x53FF,
-    QK_ONE_SHOT_LAYER       = 0x5400,
-    QK_ONE_SHOT_LAYER_MAX   = 0x54FF,
-    QK_ONE_SHOT_MOD         = 0x5500,
-    QK_ONE_SHOT_MOD_MAX     = 0x55FF,
-    QK_SWAP_HANDS           = 0x5600,
-    QK_SWAP_HANDS_MAX       = 0x56FF,
-    QK_TAP_DANCE            = 0x5700,
-    QK_TAP_DANCE_MAX        = 0x57FF,
-    QK_LAYER_TAP_TOGGLE     = 0x5800,
-    QK_LAYER_TAP_TOGGLE_MAX = 0x58FF,
-    QK_LAYER_MOD            = 0x5900,
-    QK_LAYER_MOD_MAX        = 0x59FF,
-    QK_STENO                = 0x5A00,
-    QK_STENO_BOLT           = 0x5A30,
-    QK_STENO_GEMINI         = 0x5A31,
-    QK_STENO_COMB           = 0x5A32,
-    QK_STENO_COMB_MAX       = 0x5A3C,
-    QK_STENO_MAX            = 0x5A3F,
-    // 0x5C00 - 0x5FFF are reserved, see below
-    QK_MOD_TAP             = 0x6000,
-    QK_MOD_TAP_MAX         = 0x7FFF,
-    QK_UNICODE             = 0x8000,
-    QK_UNICODE_MAX         = 0xFFFF,
-    QK_UNICODEMAP          = 0x8000,
-    QK_UNICODEMAP_MAX      = 0xBFFF,
-    QK_UNICODEMAP_PAIR     = 0xC000,
-    QK_UNICODEMAP_PAIR_MAX = 0xFFFF,
-
-    // Loose keycodes - to be used directly
-    QK_BOOTLOADER = 0x5C00,
-    QK_DEBUG_TOGGLE, // 5C01
-
-    // Magic
-    MAGIC_SWAP_CONTROL_CAPSLOCK,      // 5C02
-    MAGIC_CAPSLOCK_TO_CONTROL,        // 5C03
-    MAGIC_SWAP_LALT_LGUI,             // 5C04
-    MAGIC_SWAP_RALT_RGUI,             // 5C05
-    MAGIC_NO_GUI,                     // 5C06
-    MAGIC_SWAP_GRAVE_ESC,             // 5C07
-    MAGIC_SWAP_BACKSLASH_BACKSPACE,   // 5C08
-    MAGIC_HOST_NKRO,                  // 5C09
-    MAGIC_SWAP_ALT_GUI,               // 5C0A
-    MAGIC_UNSWAP_CONTROL_CAPSLOCK,    // 5C0B
-    MAGIC_UNCAPSLOCK_TO_CONTROL,      // 5C0C
-    MAGIC_UNSWAP_LALT_LGUI,           // 5C0D
-    MAGIC_UNSWAP_RALT_RGUI,           // 5C0E
-    MAGIC_UNNO_GUI,                   // 5C0F
-    MAGIC_UNSWAP_GRAVE_ESC,           // 5C10
-    MAGIC_UNSWAP_BACKSLASH_BACKSPACE, // 5C11
-    MAGIC_UNHOST_NKRO,                // 5C12
-    MAGIC_UNSWAP_ALT_GUI,             // 5C13
-    MAGIC_TOGGLE_NKRO,                // 5C14
-    MAGIC_TOGGLE_ALT_GUI,             // 5C15
-
-    // Grave Escape
-    QK_GRAVE_ESCAPE, // 5C16
-
-    // Auto Shift
-    QK_AUTO_SHIFT_UP,     // 5C17
-    QK_AUTO_SHIFT_DOWN,   // 5C18
-    QK_AUTO_SHIFT_REPORT, // 5C19
-    QK_AUTO_SHIFT_TOGGLE, // 5C1A
-    QK_AUTO_SHIFT_ON,     // 5C1B
-    QK_AUTO_SHIFT_OFF,    // 5C1C
-
-    // Audio
-    AU_ON,  // 5C1D
-    AU_OFF, // 5C1E
-    AU_TOG, // 5C1F
-
-    // Audio Clicky
-    CLICKY_TOGGLE,  // 5C20
-    CLICKY_ENABLE,  // 5C21
-    CLICKY_DISABLE, // 5C22
-    CLICKY_UP,      // 5C23
-    CLICKY_DOWN,    // 5C24
-    CLICKY_RESET,   // 5C25
-
-    // Music mode
-    MU_ON,  // 5C26
-    MU_OFF, // 5C27
-    MU_TOG, // 5C28
-    MU_MOD, // 5C29
-    MUV_IN, // 5C2A
-    MUV_DE, // 5C2B
-
-    // MIDI
-    MI_ON,  // 5C2C
-    MI_OFF, // 5C2D
-    MI_TOG, // 5C2E
-
-    MI_C,  // 5C2F
-    MI_Cs, // 5C30
-    MI_Db = MI_Cs,
-    MI_D,  // 5C31
-    MI_Ds, // 5C32
-    MI_Eb = MI_Ds,
-    MI_E,  // 5C33
-    MI_F,  // 5C34
-    MI_Fs, // 5C35
-    MI_Gb = MI_Fs,
-    MI_G,  // 5C36
-    MI_Gs, // 5C37
-    MI_Ab = MI_Gs,
-    MI_A,  // 5C38
-    MI_As, // 5C39
-    MI_Bb = MI_As,
-    MI_B, // 5C3A
-
-    MI_C_1,  // 5C3B
-    MI_Cs_1, // 5C3C
-    MI_Db_1 = MI_Cs_1,
-    MI_D_1,  // 5C3D
-    MI_Ds_1, // 5C3E
-    MI_Eb_1 = MI_Ds_1,
-    MI_E_1,  // 5C3F
-    MI_F_1,  // 5C40
-    MI_Fs_1, // 5C41
-    MI_Gb_1 = MI_Fs_1,
-    MI_G_1,  // 5C42
-    MI_Gs_1, // 5C43
-    MI_Ab_1 = MI_Gs_1,
-    MI_A_1,  // 5C44
-    MI_As_1, // 5C45
-    MI_Bb_1 = MI_As_1,
-    MI_B_1, // 5C46
-
-    MI_C_2,  // 5C47
-    MI_Cs_2, // 5C48
-    MI_Db_2 = MI_Cs_2,
-    MI_D_2,  // 5C49
-    MI_Ds_2, // 5C4A
-    MI_Eb_2 = MI_Ds_2,
-    MI_E_2,  // 5C4B
-    MI_F_2,  // 5C4C
-    MI_Fs_2, // 5C4D
-    MI_Gb_2 = MI_Fs_2,
-    MI_G_2,  // 5C4E
-    MI_Gs_2, // 5C4F
-    MI_Ab_2 = MI_Gs_2,
-    MI_A_2,  // 5C50
-    MI_As_2, // 5C51
-    MI_Bb_2 = MI_As_2,
-    MI_B_2, // 5C52
-
-    MI_C_3,  // 5C53
-    MI_Cs_3, // 5C54
-    MI_Db_3 = MI_Cs_3,
-    MI_D_3,  // 5C55
-    MI_Ds_3, // 5C56
-    MI_Eb_3 = MI_Ds_3,
-    MI_E_3,  // 5C57
-    MI_F_3,  // 5C58
-    MI_Fs_3, // 5C59
-    MI_Gb_3 = MI_Fs_3,
-    MI_G_3,  // 5C5A
-    MI_Gs_3, // 5C5B
-    MI_Ab_3 = MI_Gs_3,
-    MI_A_3,  // 5C5C
-    MI_As_3, // 5C5D
-    MI_Bb_3 = MI_As_3,
-    MI_B_3, // 5C5E
-
-    MI_C_4,  // 5C5F
-    MI_Cs_4, // 5C60
-    MI_Db_4 = MI_Cs_4,
-    MI_D_4,  // 5C61
-    MI_Ds_4, // 5C62
-    MI_Eb_4 = MI_Ds_4,
-    MI_E_4,  // 5C63
-    MI_F_4,  // 5C64
-    MI_Fs_4, // 5C65
-    MI_Gb_4 = MI_Fs_4,
-    MI_G_4,  // 5C66
-    MI_Gs_4, // 5C67
-    MI_Ab_4 = MI_Gs_4,
-    MI_A_4,  // 5C68
-    MI_As_4, // 5C69
-    MI_Bb_4 = MI_As_4,
-    MI_B_4, // 5C6A
-
-    MI_C_5,  // 5C6B
-    MI_Cs_5, // 5C6C
-    MI_Db_5 = MI_Cs_5,
-    MI_D_5,  // 5C6D
-    MI_Ds_5, // 5C6E
-    MI_Eb_5 = MI_Ds_5,
-    MI_E_5,  // 5C6F
-    MI_F_5,  // 5C70
-    MI_Fs_5, // 5C71
-    MI_Gb_5 = MI_Fs_5,
-    MI_G_5,  // 5C72
-    MI_Gs_5, // 5C73
-    MI_Ab_5 = MI_Gs_5,
-    MI_A_5,  // 5C74
-    MI_As_5, // 5C75
-    MI_Bb_5 = MI_As_5,
-    MI_B_5, // 5C76
-
-    MI_OCT_N2, // 5C77
-    MI_OCT_N1, // 5C78
-    MI_OCT_0,  // 5C79
-    MI_OCT_1,  // 5C7A
-    MI_OCT_2,  // 5C7B
-    MI_OCT_3,  // 5C7C
-    MI_OCT_4,  // 5C7D
-    MI_OCT_5,  // 5C7E
-    MI_OCT_6,  // 5C7F
-    MI_OCT_7,  // 5C80
-    MI_OCTD,   // 5C81
-    MI_OCTU,   // 5C82
-
-    MI_TRNS_N6, // 5C83
-    MI_TRNS_N5, // 5C84
-    MI_TRNS_N4, // 5C85
-    MI_TRNS_N3, // 5C86
-    MI_TRNS_N2, // 5C87
-    MI_TRNS_N1, // 5C88
-    MI_TRNS_0,  // 5C89
-    MI_TRNS_1,  // 5C8A
-    MI_TRNS_2,  // 5C8B
-    MI_TRNS_3,  // 5C8C
-    MI_TRNS_4,  // 5C8D
-    MI_TRNS_5,  // 5C8E
-    MI_TRNS_6,  // 5C8F
-    MI_TRNSD,   // 5C90
-    MI_TRNSU,   // 5C91
-
-    MI_VEL_0, // 5C92
-#ifdef VIA_ENABLE
-    MI_VEL_1 = MI_VEL_0,
-#else
-    MI_VEL_1, // 5C93
-#endif
-    MI_VEL_2,  // 5C94
-    MI_VEL_3,  // 5C95
-    MI_VEL_4,  // 5C96
-    MI_VEL_5,  // 5C97
-    MI_VEL_6,  // 5C98
-    MI_VEL_7,  // 5C99
-    MI_VEL_8,  // 5C9A
-    MI_VEL_9,  // 5C9B
-    MI_VEL_10, // 5C9C
-    MI_VELD,   // 5C9D
-    MI_VELU,   // 5C9E
-
-    MI_CH1,  // 5C9F
-    MI_CH2,  // 5CA0
-    MI_CH3,  // 5CA1
-    MI_CH4,  // 5CA2
-    MI_CH5,  // 5CA3
-    MI_CH6,  // 5CA4
-    MI_CH7,  // 5CA5
-    MI_CH8,  // 5CA6
-    MI_CH9,  // 5CA7
-    MI_CH10, // 5CA8
-    MI_CH11, // 5CA9
-    MI_CH12, // 5CAA
-    MI_CH13, // 5CAB
-    MI_CH14, // 5CAC
-    MI_CH15, // 5CAD
-    MI_CH16, // 5CAE
-    MI_CHD,  // 5CAF
-    MI_CHU,  // 5CB0
-
-    MI_ALLOFF, // 5CB1
-
-    MI_SUS,  // 5CB2
-    MI_PORT, // 5CB3
-    MI_SOST, // 5CB4
-    MI_SOFT, // 5CB5
-    MI_LEG,  // 5CB6
-
-    MI_MOD,   // 5CB7
-    MI_MODSD, // 5CB8
-    MI_MODSU, // 5CB9
-
-    MI_BENDD, // 5CBA
-    MI_BENDU, // 5CBB
-
-    // Backlight
-    BL_ON,   // 5CBC
-    BL_OFF,  // 5CBD
-    BL_DEC,  // 5CBE
-    BL_INC,  // 5CBF
-    BL_TOGG, // 5CC0
-    BL_STEP, // 5CC1
-    BL_BRTG, // 5CC2
-
-    // RGB underglow/matrix
-    RGB_TOG,           // 5CC3
-    RGB_MODE_FORWARD,  // 5CC4
-    RGB_MODE_REVERSE,  // 5CC5
-    RGB_HUI,           // 5CC6
-    RGB_HUD,           // 5CC7
-    RGB_SAI,           // 5CC8
-    RGB_SAD,           // 5CC9
-    RGB_VAI,           // 5CCA
-    RGB_VAD,           // 5CCB
-    RGB_SPI,           // 5CCC
-    RGB_SPD,           // 5CCD
-    RGB_MODE_PLAIN,    // 5CCE
-    RGB_MODE_BREATHE,  // 5CCF
-    RGB_MODE_RAINBOW,  // 5CD0
-    RGB_MODE_SWIRL,    // 5CD1
-    RGB_MODE_SNAKE,    // 5CD2
-    RGB_MODE_KNIGHT,   // 5CD3
-    RGB_MODE_XMAS,     // 5CD4
-    RGB_MODE_GRADIENT, // 5CD5
-    RGB_MODE_RGBTEST,  // 5CD6
-
-    // Velocikey
-    QK_VELOCIKEY_TOGGLE, // 5CD7
-
-    // Space Cadet
-    QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN,   // 5CD8
-    QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE, // 5CD9
-    QK_SPACE_CADET_RIGHT_SHIFT_ENTER,             // 5CDA
-
-    // Thermal Printer
-    PRINT_ON,  // 5CDB
-    PRINT_OFF, // 5CDC
-
-    // Bluetooth: output selection
-    OUT_AUTO, // 5CDD
-    OUT_USB,  // 5CDE
-
-    // Clear EEPROM
-    QK_CLEAR_EEPROM, // 5CDF
-
-    // Unicode
-    QK_UNICODE_MODE_NEXT,       // 5CE0
-    QK_UNICODE_MODE_PREVIOUS,   // 5CE1
-    QK_UNICODE_MODE_MACOS,      // 5CE2
-    QK_UNICODE_MODE_LINUX,      // 5CE3
-    QK_UNICODE_MODE_WINDOWS,    // 5CE4
-    QK_UNICODE_MODE_BSD,        // 5CE5
-    QK_UNICODE_MODE_WINCOMPOSE, // 5CE6
-
-    // Haptic
-    HPT_ON,   // 5CE7
-    HPT_OFF,  // 5CE8
-    HPT_TOG,  // 5CE9
-    HPT_RST,  // 5CEA
-    HPT_FBK,  // 5CEB
-    HPT_BUZ,  // 5CEC
-    HPT_MODI, // 5CED
-    HPT_MODD, // 5CEE
-    HPT_CONT, // 5CEF
-    HPT_CONI, // 5CF0
-    HPT_COND, // 5CF1
-    HPT_DWLI, // 5CF2
-    HPT_DWLD, // 5CF3
-
-    // Space Cadet (continued)
-    QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN,   // 5CF4
-    QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE, // 5CF5
-    QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN,    // 5CF6
-    QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE,  // 5CF7
-
-    // Combos
-    QK_COMBO_ON,     // 5CF8
-    QK_COMBO_OFF,    // 5CF9
-    QK_COMBO_TOGGLE, // 5CFA
-
-    // Magic (continued)
-    MAGIC_SWAP_LCTL_LGUI,   // 5CFB
-    MAGIC_SWAP_RCTL_RGUI,   // 5CFC
-    MAGIC_UNSWAP_LCTL_LGUI, // 5CFD
-    MAGIC_UNSWAP_RCTL_RGUI, // 5CFE
-    MAGIC_SWAP_CTL_GUI,     // 5CFF
-    MAGIC_UNSWAP_CTL_GUI,   // 5D00
-    MAGIC_TOGGLE_CTL_GUI,   // 5D01
-    MAGIC_EE_HANDS_LEFT,    // 5D02
-    MAGIC_EE_HANDS_RIGHT,   // 5D03
-
-    // Dynamic Macros
-    QK_DYNAMIC_MACRO_RECORD_START_1, // 5D04
-    QK_DYNAMIC_MACRO_RECORD_START_2, // 5D05
-    QK_DYNAMIC_MACRO_RECORD_STOP,    // 5D06
-    QK_DYNAMIC_MACRO_PLAY_1,         // 5D07
-    QK_DYNAMIC_MACRO_PLAY_2,         // 5D08
-
-    // Joystick
-    QK_JOYSTICK_BUTTON_0,  // 5D09
-    QK_JOYSTICK_BUTTON_1,  // 5D0A
-    QK_JOYSTICK_BUTTON_2,  // 5D0B
-    QK_JOYSTICK_BUTTON_3,  // 5D0C
-    QK_JOYSTICK_BUTTON_4,  // 5D0D
-    QK_JOYSTICK_BUTTON_5,  // 5D0E
-    QK_JOYSTICK_BUTTON_6,  // 5D0F
-    QK_JOYSTICK_BUTTON_7,  // 5D10
-    QK_JOYSTICK_BUTTON_8,  // 5D11
-    QK_JOYSTICK_BUTTON_9,  // 5D12
-    QK_JOYSTICK_BUTTON_10, // 5D13
-    QK_JOYSTICK_BUTTON_11, // 5D14
-    QK_JOYSTICK_BUTTON_12, // 5D15
-    QK_JOYSTICK_BUTTON_13, // 5D16
-    QK_JOYSTICK_BUTTON_14, // 5D17
-    QK_JOYSTICK_BUTTON_15, // 5D18
-    QK_JOYSTICK_BUTTON_16, // 5D19
-    QK_JOYSTICK_BUTTON_17, // 5D1A
-    QK_JOYSTICK_BUTTON_18, // 5D1B
-    QK_JOYSTICK_BUTTON_19, // 5D1C
-    QK_JOYSTICK_BUTTON_20, // 5D1D
-    QK_JOYSTICK_BUTTON_21, // 5D1E
-    QK_JOYSTICK_BUTTON_22, // 5D1F
-    QK_JOYSTICK_BUTTON_23, // 5D20
-    QK_JOYSTICK_BUTTON_24, // 5D21
-    QK_JOYSTICK_BUTTON_25, // 5D22
-    QK_JOYSTICK_BUTTON_26, // 5D23
-    QK_JOYSTICK_BUTTON_27, // 5D24
-    QK_JOYSTICK_BUTTON_28, // 5D25
-    QK_JOYSTICK_BUTTON_29, // 5D26
-    QK_JOYSTICK_BUTTON_30, // 5D27
-    QK_JOYSTICK_BUTTON_31, // 5D28
-
-    // Leader Key
-    QK_LEADER, // 5D29
-
-    // Bluetooth: output selection (continued)
-    OUT_BT, // 5D2A
-
-    // Lock Key
-    QK_LOCK, // 5D2B
-
-    // Unused slots
-    UNUSED_000, // 5D2C
-    UNUSED_001, // 5D2D
-
-    // Sequencer
-    SQ_ON,  // 5D2E
-    SQ_OFF, // 5D2F
-    SQ_TOG, // 5D30
-
-    SQ_TMPD, // 5D31
-    SQ_TMPU, // 5D32
-
-    SQ_RESD, // 5D33
-    SQ_RESU, // 5D34
-
-    SQ_SALL, // 5D35
-    SQ_SCLR, // 5D36
-
-    SEQUENCER_STEP_MIN, // 5D37
-    SEQUENCER_STEP_MAX = SEQUENCER_STEP_MIN + SEQUENCER_STEPS,
-
-    SEQUENCER_RESOLUTION_MIN,
-    SEQUENCER_RESOLUTION_MAX = SEQUENCER_RESOLUTION_MIN + SEQUENCER_RESOLUTIONS,
-
-    SEQUENCER_TRACK_MIN,
-    SEQUENCER_TRACK_MAX = SEQUENCER_TRACK_MIN + SEQUENCER_TRACKS,
-
-#define SQ_S(n) (n < SEQUENCER_STEPS ? SEQUENCER_STEP_MIN + n : KC_NO)
-#define SQ_R(n) (n < SEQUENCER_RESOLUTIONS ? SEQUENCER_RESOLUTION_MIN + n : KC_NO)
-#define SQ_T(n) (n < SEQUENCER_TRACKS ? SEQUENCER_TRACK_MIN + n : KC_NO)
-
-    // One Shot
-    QK_ONE_SHOT_ON,
-    QK_ONE_SHOT_OFF,
-    QK_ONE_SHOT_TOGGLE,
-
-    // RGB underglow/matrix (continued)
-    RGB_MODE_TWINKLE,
-
-    // Key Overrides
-    QK_KEY_OVERRIDE_TOGGLE,
-    QK_KEY_OVERRIDE_ON,
-    QK_KEY_OVERRIDE_OFF,
-
-    // Additional magic key
-    MAGIC_TOGGLE_GUI,
-
-    // Adjust tapping term on the fly
-    DT_PRNT,
-    DT_UP,
-    DT_DOWN,
-
-    // Programmable Button
-    QK_PROGRAMMABLE_BUTTON_1,
-    QK_PROGRAMMABLE_BUTTON_2,
-    QK_PROGRAMMABLE_BUTTON_3,
-    QK_PROGRAMMABLE_BUTTON_4,
-    QK_PROGRAMMABLE_BUTTON_5,
-    QK_PROGRAMMABLE_BUTTON_6,
-    QK_PROGRAMMABLE_BUTTON_7,
-    QK_PROGRAMMABLE_BUTTON_8,
-    QK_PROGRAMMABLE_BUTTON_9,
-    QK_PROGRAMMABLE_BUTTON_10,
-    QK_PROGRAMMABLE_BUTTON_11,
-    QK_PROGRAMMABLE_BUTTON_12,
-    QK_PROGRAMMABLE_BUTTON_13,
-    QK_PROGRAMMABLE_BUTTON_14,
-    QK_PROGRAMMABLE_BUTTON_15,
-    QK_PROGRAMMABLE_BUTTON_16,
-    QK_PROGRAMMABLE_BUTTON_17,
-    QK_PROGRAMMABLE_BUTTON_18,
-    QK_PROGRAMMABLE_BUTTON_19,
-    QK_PROGRAMMABLE_BUTTON_20,
-    QK_PROGRAMMABLE_BUTTON_21,
-    QK_PROGRAMMABLE_BUTTON_22,
-    QK_PROGRAMMABLE_BUTTON_23,
-    QK_PROGRAMMABLE_BUTTON_24,
-    QK_PROGRAMMABLE_BUTTON_25,
-    QK_PROGRAMMABLE_BUTTON_26,
-    QK_PROGRAMMABLE_BUTTON_27,
-    QK_PROGRAMMABLE_BUTTON_28,
-    QK_PROGRAMMABLE_BUTTON_29,
-    QK_PROGRAMMABLE_BUTTON_30,
-    QK_PROGRAMMABLE_BUTTON_31,
-    QK_PROGRAMMABLE_BUTTON_32,
-
-    // Dedicated macro keys for Configurator and VIA
-    MACRO_0,
-    MACRO_1,
-    MACRO_2,
-    MACRO_3,
-    MACRO_4,
-    MACRO_5,
-    MACRO_6,
-    MACRO_7,
-    MACRO_8,
-    MACRO_9,
-    MACRO_10,
-    MACRO_11,
-    MACRO_12,
-    MACRO_13,
-    MACRO_14,
-    MACRO_15,
-    MACRO_16,
-    MACRO_17,
-    MACRO_18,
-    MACRO_19,
-    MACRO_20,
-    MACRO_21,
-    MACRO_22,
-    MACRO_23,
-    MACRO_24,
-    MACRO_25,
-    MACRO_26,
-    MACRO_27,
-    MACRO_28,
-    MACRO_29,
-    MACRO_30,
-    MACRO_31,
-
-    MAGIC_TOGGLE_CONTROL_CAPSLOCK,
-
-    QK_MAKE,
-    QK_REBOOT,
-
-    QK_SECURE_LOCK,
-    QK_SECURE_UNLOCK,
-    QK_SECURE_TOGGLE,
-    QK_SECURE_REQUEST,
-
-    QK_CAPS_WORD_TOGGLE,
-
-    MAGIC_SWAP_ESCAPE_CAPSLOCK,
-    MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
-    MAGIC_TOGGLE_ESCAPE_CAPSLOCK,
-
-    QK_UNICODE_MODE_EMACS,
-
-    QK_AUTOCORRECT_ON,
-    QK_AUTOCORRECT_OFF,
-    QK_AUTOCORRECT_TOGGLE,
-
-    MAGIC_TOGGLE_BACKSLASH_BACKSPACE,
-
-    // Start of custom keycode range for keyboards and keymaps - always leave at the end
-    SAFE_RANGE
-};
+//  Pull in dd keycodes to maintain header compatibility
+#include "keycodes.h"
+
+// US ANSI shifted keycode aliases
+#include "keymap_us.h"
+
+// TODO: sub-ranges?
+// clang-format off
+#define QK_LCTL                0x0100
+#define QK_LSFT                0x0200
+#define QK_LALT                0x0400
+#define QK_LGUI                0x0800
+#define QK_RMODS_MIN           0x1000
+#define QK_RCTL                0x1100
+#define QK_RSFT                0x1200
+#define QK_RALT                0x1400
+#define QK_RGUI                0x1800
+#define QK_UNICODEMAP          0x8000
+#define QK_UNICODEMAP_MAX      0xBFFF
+#define QK_UNICODEMAP_PAIR     0xC000
+#define QK_UNICODEMAP_PAIR_MAX 0xFFFF
+// clang-format on
 
 // Keycode modifiers & aliases
 #define LCTL(kc) (QK_LCTL | (kc))
@@ -654,122 +72,35 @@ enum quantum_keycodes {
 #define RCS(kc) (QK_RCTL | QK_RSFT | (kc))
 #define SAGR(kc) RSA(kc)
 
-#define MOD_HYPR 0xF
-#define MOD_MEH 0x7
-
-// US ANSI shifted keycode aliases
-#include "keymap_us.h"
-
 // Modified keycode aliases
 #define C(kc) LCTL(kc)
 #define S(kc) LSFT(kc)
 #define A(kc) LALT(kc)
 #define G(kc) LGUI(kc)
 
-#define QK_GESC QK_GRAVE_ESCAPE
+// GOTO layer - 32 layer max
+#define TO(layer) (QK_TO | ((layer)&0x1F))
 
-#define QK_BOOT QK_BOOTLOADER
-#define DB_TOGG QK_DEBUG_TOGGLE
-#define EE_CLR QK_CLEAR_EEPROM
-#define QK_RBT QK_REBOOT
+// Momentary switch layer - 32 layer max
+#define MO(layer) (QK_MOMENTARY | ((layer)&0x1F))
 
-// Audio Clicky aliases
-#define CK_TOGG CLICKY_TOGGLE
-#define CK_RST CLICKY_RESET
-#define CK_UP CLICKY_UP
-#define CK_DOWN CLICKY_DOWN
-#define CK_ON CLICKY_ENABLE
-#define CK_OFF CLICKY_DISABLE
+// Set default layer - 32 layer max
+#define DF(layer) (QK_DEF_LAYER | ((layer)&0x1F))
 
-// RGB aliases
-#define RGB_MOD RGB_MODE_FORWARD
-#define RGB_RMOD RGB_MODE_REVERSE
-#define RGB_M_P RGB_MODE_PLAIN
-#define RGB_M_B RGB_MODE_BREATHE
-#define RGB_M_R RGB_MODE_RAINBOW
-#define RGB_M_SW RGB_MODE_SWIRL
-#define RGB_M_SN RGB_MODE_SNAKE
-#define RGB_M_K RGB_MODE_KNIGHT
-#define RGB_M_X RGB_MODE_XMAS
-#define RGB_M_G RGB_MODE_GRADIENT
-#define RGB_M_T RGB_MODE_RGBTEST
-#define RGB_M_TW RGB_MODE_TWINKLE
+// Toggle to layer - 32 layer max
+#define TG(layer) (QK_TOGGLE_LAYER | ((layer)&0x1F))
 
-// Magic aliases
-#define CL_SWAP MAGIC_SWAP_CONTROL_CAPSLOCK
-#define CL_NORM MAGIC_UNSWAP_CONTROL_CAPSLOCK
-#define CL_CTRL MAGIC_CAPSLOCK_TO_CONTROL
-#define CL_CAPS MAGIC_UNCAPSLOCK_TO_CONTROL
-#define CL_TOGG MAGIC_TOGGLE_CONTROL_CAPSLOCK
+// One-shot layer - 32 layer max
+#define OSL(layer) (QK_ONE_SHOT_LAYER | ((layer)&0x1F))
 
-#define EC_SWAP MAGIC_SWAP_ESCAPE_CAPSLOCK
-#define EC_NORM MAGIC_UNSWAP_ESCAPE_CAPSLOCK
-#define EC_TOGG MAGIC_TOGGLE_ESCAPE_CAPSLOCK
-
-#define LCG_SWP MAGIC_SWAP_LCTL_LGUI
-#define LCG_NRM MAGIC_UNSWAP_LCTL_LGUI
-#define RCG_SWP MAGIC_SWAP_RCTL_RGUI
-#define RCG_NRM MAGIC_UNSWAP_RCTL_RGUI
-#define CG_SWAP MAGIC_SWAP_CTL_GUI
-#define CG_NORM MAGIC_UNSWAP_CTL_GUI
-#define CG_TOGG MAGIC_TOGGLE_CTL_GUI
-
-#define LAG_SWP MAGIC_SWAP_LALT_LGUI
-#define LAG_NRM MAGIC_UNSWAP_LALT_LGUI
-#define RAG_SWP MAGIC_SWAP_RALT_RGUI
-#define RAG_NRM MAGIC_UNSWAP_RALT_RGUI
-#define AG_SWAP MAGIC_SWAP_ALT_GUI
-#define AG_NORM MAGIC_UNSWAP_ALT_GUI
-#define AG_TOGG MAGIC_TOGGLE_ALT_GUI
-
-#define GUI_OFF MAGIC_NO_GUI
-#define GUI_ON MAGIC_UNNO_GUI
-#define GUI_TOG MAGIC_TOGGLE_GUI
-
-#define GE_SWAP MAGIC_SWAP_GRAVE_ESC
-#define GE_NORM MAGIC_UNSWAP_GRAVE_ESC
-
-#define BS_SWAP MAGIC_SWAP_BACKSLASH_BACKSPACE
-#define BS_NORM MAGIC_UNSWAP_BACKSLASH_BACKSPACE
-#define BS_TOGG MAGIC_TOGGLE_BACKSLASH_BACKSPACE
-
-#define NK_ON MAGIC_HOST_NKRO
-#define NK_OFF MAGIC_UNHOST_NKRO
-#define NK_TOGG MAGIC_TOGGLE_NKRO
-
-#define EH_LEFT MAGIC_EE_HANDS_LEFT
-#define EH_RGHT MAGIC_EE_HANDS_RIGHT
-
-#define AC_ON QK_AUTOCORRECT_ON
-#define AC_OFF QK_AUTOCORRECT_OFF
-#define AC_TOGG QK_AUTOCORRECT_TOGGLE
-
-// Velocikey
-#define VK_TOGG QK_VELOCIKEY_TOGGLE
-
-// GOTO layer - 256 layer max
-#define TO(layer) (QK_TO | ((layer)&0xFF))
-
-// Momentary switch layer - 256 layer max
-#define MO(layer) (QK_MOMENTARY | ((layer)&0xFF))
-
-// Set default layer - 256 layer max
-#define DF(layer) (QK_DEF_LAYER | ((layer)&0xFF))
-
-// Toggle to layer - 256 layer max
-#define TG(layer) (QK_TOGGLE_LAYER | ((layer)&0xFF))
-
-// One-shot layer - 256 layer max
-#define OSL(layer) (QK_ONE_SHOT_LAYER | ((layer)&0xFF))
-
-// L-ayer M-od: Momentary switch layer with modifiers active - 16 layer max, left mods only
-#define LM(layer, mod) (QK_LAYER_MOD | (((layer)&0xF) << 4) | ((mod)&0xF))
+// L-ayer M-od: Momentary switch layer with modifiers active - 16 layer max
+#define LM(layer, mod) (QK_LAYER_MOD | (((layer)&0xF) << 5) | ((mod)&0x1F))
 
 // One-shot mod
-#define OSM(mod) (QK_ONE_SHOT_MOD | ((mod)&0xFF))
+#define OSM(mod) (QK_ONE_SHOT_MOD | ((mod)&0x1F))
 
-// Layer tap-toggle
-#define TT(layer) (QK_LAYER_TAP_TOGGLE | ((layer)&0xFF))
+// Layer tap-toggle - 32 layer max
+#define TT(layer) (QK_LAYER_TAP_TOGGLE | ((layer)&0x1F))
 
 // L-ayer, T-ap - 256 keycode max, 16 layer max
 #define LT(layer, kc) (QK_LAYER_TAP | (((layer)&0xF) << 8) | ((kc)&0xFF))
@@ -834,64 +165,8 @@ enum quantum_keycodes {
 #define X(i) (QK_UNICODEMAP | (i))
 #define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
 
-#define UC_NEXT QK_UNICODE_MODE_NEXT
-#define UC_PREV QK_UNICODE_MODE_PREVIOUS
-
-#define UC_MAC QK_UNICODE_MODE_MACOS
-#define UC_LINX QK_UNICODE_MODE_LINUX
-#define UC_WIN QK_UNICODE_MODE_WINDOWS
-#define UC_BSD QK_UNICODE_MODE_BSD
-#define UC_WINC QK_UNICODE_MODE_WINCOMPOSE
-#define UC_EMAC QK_UNICODE_MODE_EMACS
-
-// Auto Shift
-#define AS_UP QK_AUTO_SHIFT_UP
-#define AS_DOWN QK_AUTO_SHIFT_DOWN
-#define AS_RPT QK_AUTO_SHIFT_REPORT
-#define AS_TOGG QK_AUTO_SHIFT_TOGGLE
-#define AS_ON QK_AUTO_SHIFT_ON
-#define AS_OFF QK_AUTO_SHIFT_OFF
-
-// Leader key
-#define QK_LEAD QK_LEADER
-
-// Caps Word
-#define CW_TOGG QK_CAPS_WORD_TOGGLE
-
-// Key Overrides
-#define KO_TOGG QK_KEY_OVERRIDE_TOGGLE
-#define KO_ON QK_KEY_OVERRIDE_ON
-#define KO_OFF QK_KEY_OVERRIDE_OFF
-
-// Secure
-#define SE_LOCK QK_SECURE_LOCK
-#define SE_UNLK QK_SECURE_UNLOCK
-#define SE_TOGG QK_SECURE_TOGGLE
-#define SE_REQ QK_SECURE_REQUEST
-
-// Space Cadet
-#define SC_LSPO QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN
-#define SC_RSPC QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE
-#define SC_LCPO QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN
-#define SC_RCPC QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE
-#define SC_LAPO QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN
-#define SC_RAPC QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE
-#define SC_SENT QK_SPACE_CADET_RIGHT_SHIFT_ENTER
-
-// Combos
-#define CM_ON QK_COMBO_ON
-#define CM_OFF QK_COMBO_OFF
-#define CM_TOGG QK_COMBO_TOGGLE
-
 // Swap Hands
 #define SH_T(kc) (QK_SWAP_HANDS | (kc))
-#define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
-#define SH_TT (QK_SWAP_HANDS | OP_SH_TAP_TOGGLE)
-#define SH_OS (QK_SWAP_HANDS | OP_SH_ONESHOT)
-#define SH_MON (QK_SWAP_HANDS | OP_SH_ON_OFF)
-#define SH_MOFF (QK_SWAP_HANDS | OP_SH_OFF_ON)
-#define SH_ON (QK_SWAP_HANDS | OP_SH_ON)
-#define SH_OFF (QK_SWAP_HANDS | OP_SH_OFF)
 
 // MIDI aliases
 #define MIDI_TONE_MIN MI_C
@@ -905,88 +180,20 @@ enum quantum_keycodes {
 #define MIDI_CHANNEL_MIN MI_CH1
 #define MIDI_CHANNEL_MAX MI_CH16
 
-// Dynamic Macros aliases
-#define DM_REC1 QK_DYNAMIC_MACRO_RECORD_START_1
-#define DM_REC2 QK_DYNAMIC_MACRO_RECORD_START_2
-#define DM_RSTP QK_DYNAMIC_MACRO_RECORD_STOP
-#define DM_PLY1 QK_DYNAMIC_MACRO_PLAY_1
-#define DM_PLY2 QK_DYNAMIC_MACRO_PLAY_2
+// TODO: somehow migrate sequencer to DD?
+#include "sequencer.h"
 
-// Joystick aliases
-#define JS_0 QK_JOYSTICK_BUTTON_0
-#define JS_1 QK_JOYSTICK_BUTTON_1
-#define JS_2 QK_JOYSTICK_BUTTON_2
-#define JS_3 QK_JOYSTICK_BUTTON_3
-#define JS_4 QK_JOYSTICK_BUTTON_4
-#define JS_5 QK_JOYSTICK_BUTTON_5
-#define JS_6 QK_JOYSTICK_BUTTON_6
-#define JS_7 QK_JOYSTICK_BUTTON_7
-#define JS_8 QK_JOYSTICK_BUTTON_8
-#define JS_9 QK_JOYSTICK_BUTTON_9
-#define JS_10 QK_JOYSTICK_BUTTON_10
-#define JS_11 QK_JOYSTICK_BUTTON_11
-#define JS_12 QK_JOYSTICK_BUTTON_12
-#define JS_13 QK_JOYSTICK_BUTTON_13
-#define JS_14 QK_JOYSTICK_BUTTON_14
-#define JS_15 QK_JOYSTICK_BUTTON_15
-#define JS_16 QK_JOYSTICK_BUTTON_16
-#define JS_17 QK_JOYSTICK_BUTTON_17
-#define JS_18 QK_JOYSTICK_BUTTON_18
-#define JS_19 QK_JOYSTICK_BUTTON_19
-#define JS_20 QK_JOYSTICK_BUTTON_20
-#define JS_21 QK_JOYSTICK_BUTTON_21
-#define JS_22 QK_JOYSTICK_BUTTON_22
-#define JS_23 QK_JOYSTICK_BUTTON_23
-#define JS_24 QK_JOYSTICK_BUTTON_24
-#define JS_25 QK_JOYSTICK_BUTTON_25
-#define JS_26 QK_JOYSTICK_BUTTON_26
-#define JS_27 QK_JOYSTICK_BUTTON_27
-#define JS_28 QK_JOYSTICK_BUTTON_28
-#define JS_29 QK_JOYSTICK_BUTTON_29
-#define JS_30 QK_JOYSTICK_BUTTON_30
-#define JS_31 QK_JOYSTICK_BUTTON_31
-#define QK_JOYSTICK_BUTTON_MIN QK_JOYSTICK_BUTTON_0
-#define QK_JOYSTICK_BUTTON_MAX QK_JOYSTICK_BUTTON_31
+#define SEQUENCER_STEP_MIN (QK_SEQUENCER + 0xF)
+#define SEQUENCER_STEP_MAX (SEQUENCER_STEP_MIN + SEQUENCER_STEPS)
 
-// One Shot aliases
-#define OS_TOGG QK_ONE_SHOT_TOGGLE
-#define OS_ON QK_ONE_SHOT_ON
-#define OS_OFF QK_ONE_SHOT_OFF
+#define SEQUENCER_RESOLUTION_MIN (SEQUENCER_STEP_MAX + 1)
+#define SEQUENCER_RESOLUTION_MAX (SEQUENCER_RESOLUTION_MIN + SEQUENCER_RESOLUTIONS)
 
-// Programmable Button aliases
-#define PB_1 QK_PROGRAMMABLE_BUTTON_1
-#define PB_2 QK_PROGRAMMABLE_BUTTON_2
-#define PB_3 QK_PROGRAMMABLE_BUTTON_3
-#define PB_4 QK_PROGRAMMABLE_BUTTON_4
-#define PB_5 QK_PROGRAMMABLE_BUTTON_5
-#define PB_6 QK_PROGRAMMABLE_BUTTON_6
-#define PB_7 QK_PROGRAMMABLE_BUTTON_7
-#define PB_8 QK_PROGRAMMABLE_BUTTON_8
-#define PB_9 QK_PROGRAMMABLE_BUTTON_9
-#define PB_10 QK_PROGRAMMABLE_BUTTON_10
-#define PB_11 QK_PROGRAMMABLE_BUTTON_11
-#define PB_12 QK_PROGRAMMABLE_BUTTON_12
-#define PB_13 QK_PROGRAMMABLE_BUTTON_13
-#define PB_14 QK_PROGRAMMABLE_BUTTON_14
-#define PB_15 QK_PROGRAMMABLE_BUTTON_15
-#define PB_16 QK_PROGRAMMABLE_BUTTON_16
-#define PB_17 QK_PROGRAMMABLE_BUTTON_17
-#define PB_18 QK_PROGRAMMABLE_BUTTON_18
-#define PB_19 QK_PROGRAMMABLE_BUTTON_19
-#define PB_20 QK_PROGRAMMABLE_BUTTON_20
-#define PB_21 QK_PROGRAMMABLE_BUTTON_21
-#define PB_22 QK_PROGRAMMABLE_BUTTON_22
-#define PB_23 QK_PROGRAMMABLE_BUTTON_23
-#define PB_24 QK_PROGRAMMABLE_BUTTON_24
-#define PB_25 QK_PROGRAMMABLE_BUTTON_25
-#define PB_26 QK_PROGRAMMABLE_BUTTON_26
-#define PB_27 QK_PROGRAMMABLE_BUTTON_27
-#define PB_28 QK_PROGRAMMABLE_BUTTON_28
-#define PB_29 QK_PROGRAMMABLE_BUTTON_29
-#define PB_30 QK_PROGRAMMABLE_BUTTON_30
-#define PB_31 QK_PROGRAMMABLE_BUTTON_31
-#define PB_32 QK_PROGRAMMABLE_BUTTON_32
-#define QK_PROGRAMMABLE_BUTTON_MIN QK_PROGRAMMABLE_BUTTON_1
-#define QK_PROGRAMMABLE_BUTTON_MAX QK_PROGRAMMABLE_BUTTON_32
+#define SEQUENCER_TRACK_MIN (SEQUENCER_RESOLUTION_MAX + 1)
+#define SEQUENCER_TRACK_MAX (SEQUENCER_TRACK_MIN + SEQUENCER_TRACKS)
+
+#define SQ_S(n) (n < SEQUENCER_STEPS ? SEQUENCER_STEP_MIN + n : KC_NO)
+#define SQ_R(n) (n < SEQUENCER_RESOLUTIONS ? SEQUENCER_RESOLUTION_MIN + n : KC_NO)
+#define SQ_T(n) (n < SEQUENCER_TRACKS ? SEQUENCER_TRACK_MIN + n : KC_NO)
 
 #include "quantum_keycodes_legacy.h"
diff --git a/quantum/send_string/send_string_keycodes.h b/quantum/send_string/send_string_keycodes.h
index f9e1c101ff..54b8382053 100644
--- a/quantum/send_string/send_string_keycodes.h
+++ b/quantum/send_string/send_string_keycodes.h
@@ -389,48 +389,25 @@
 #define X_ASSISTANT           c0
 
 /* Mouse Buttons (unallocated range in HID spec) */
-#ifdef VIA_ENABLE
-#define X_MS_UP               f0
-#define X_MS_DOWN             f1
-#define X_MS_LEFT             f2
-#define X_MS_RIGHT            f3
-#define X_MS_BTN1             f4
-#define X_MS_BTN2             f5
-#define X_MS_BTN3             f6
-#define X_MS_BTN4             f7
-#define X_MS_BTN5             f8
-#define X_MS_BTN6             f8
-#define X_MS_BTN7             f8
-#define X_MS_BTN8             f8
-#define X_MS_WH_UP            f9
-#define X_MS_WH_DOWN          fa
-#define X_MS_WH_LEFT          fb
-#define X_MS_WH_RIGHT         fc
-#define X_MS_ACCEL0           fd
-#define X_MS_ACCEL1           fe
-#define X_MS_ACCEL2           ff
-#else
-#define X_MS_UP               cd
-#define X_MS_DOWN             ce
-#define X_MS_LEFT             cf
-#define X_MS_RIGHT            d0
-#define X_MS_BTN1             d1
-#define X_MS_BTN2             d2
-#define X_MS_BTN3             d3
-#define X_MS_BTN4             d4
-#define X_MS_BTN5             d5
-#define X_MS_BTN6             d6
-#define X_MS_BTN7             d7
-#define X_MS_BTN8             d8
-#define X_MS_WH_UP            d9
-#define X_MS_WH_DOWN          da
-#define X_MS_WH_LEFT          db
-#define X_MS_WH_RIGHT         dc
-#define X_MS_ACCEL0           dd
-#define X_MS_ACCEL1           de
-#define X_MS_ACCEL2           df
-#endif
-
+#define X_MS_UP              cd
+#define X_MS_DOWN            ce
+#define X_MS_LEFT            cf
+#define X_MS_RIGHT           d0
+#define X_MS_BTN1            d1
+#define X_MS_BTN2            d2
+#define X_MS_BTN3            d3
+#define X_MS_BTN4            d4
+#define X_MS_BTN5            d5
+#define X_MS_BTN6            d6
+#define X_MS_BTN7            d7
+#define X_MS_BTN8            d8
+#define X_MS_WH_UP           d9
+#define X_MS_WH_DOWN         da
+#define X_MS_WH_LEFT         db
+#define X_MS_WH_RIGHT        dc
+#define X_MS_ACCEL0          dd
+#define X_MS_ACCEL1          de
+#define X_MS_ACCEL2          df
 
 // Send string macros
 #define STRINGIZE(z) #z
diff --git a/quantum/via.c b/quantum/via.c
index 37e2046a10..5afbee5a30 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -50,7 +50,6 @@
 #include "dynamic_keymap.h"
 #include "eeprom.h"
 #include "version.h" // for QMK_BUILDDATE used in EEPROM magic
-#include "via_ensure_keycode.h"
 
 // Forward declare some helpers.
 #if defined(VIA_QMK_BACKLIGHT_ENABLE)
diff --git a/quantum/via.h b/quantum/via.h
index 558ae95de4..84b264903f 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -58,7 +58,7 @@
 
 // This is changed only when the command IDs change,
 // so VIA Configurator can detect compatible firmware.
-#define VIA_PROTOCOL_VERSION 0x000A
+#define VIA_PROTOCOL_VERSION 0x000B
 
 enum via_command_id {
     id_get_protocol_version                 = 0x01, // always 0x01
@@ -103,13 +103,8 @@ enum via_lighting_value {
     id_qmk_rgblight_color        = 0x83,
 };
 
-// Can't use SAFE_RANGE here, it might change if someone adds
-// new values to enum quantum_keycodes.
-// Need to keep checking 0x5F10 is still in the safe range.
-// TODO: merge this into quantum_keycodes
-// Backlight keycodes are in range 0x5F00-0x5F0F
 enum via_keycodes {
-    FN_MO13 = 0x5F10,
+    FN_MO13 = QK_MACRO,
     FN_MO23,
     MACRO00,
     MACRO01,
@@ -130,7 +125,7 @@ enum via_keycodes {
 };
 
 enum user_keycodes {
-    USER00 = 0x5F80,
+    USER00 = QK_USER,
     USER01,
     USER02,
     USER03,
diff --git a/quantum/via_ensure_keycode.h b/quantum/via_ensure_keycode.h
deleted file mode 100644
index 48e611d0fa..0000000000
--- a/quantum/via_ensure_keycode.h
+++ /dev/null
@@ -1,344 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#include "via.h"
-
-#ifndef VIA_HAS_BROKEN_KEYCODES
-
-// clang-format off
-
-_Static_assert(KC_NO                  == 0x0000, "");
-_Static_assert(KC_TRANSPARENT         == 0x0001, "");
-
-_Static_assert(KC_A                   == 0x0004, "");
-_Static_assert(KC_B                   == 0x0005, "");
-_Static_assert(KC_C                   == 0x0006, "");
-_Static_assert(KC_D                   == 0x0007, "");
-_Static_assert(KC_E                   == 0x0008, "");
-_Static_assert(KC_F                   == 0x0009, "");
-_Static_assert(KC_G                   == 0x000A, "");
-_Static_assert(KC_H                   == 0x000B, "");
-_Static_assert(KC_I                   == 0x000C, "");
-_Static_assert(KC_J                   == 0x000D, "");
-_Static_assert(KC_K                   == 0x000E, "");
-_Static_assert(KC_L                   == 0x000F, "");
-_Static_assert(KC_M                   == 0x0010, "");
-_Static_assert(KC_N                   == 0x0011, "");
-_Static_assert(KC_O                   == 0x0012, "");
-_Static_assert(KC_P                   == 0x0013, "");
-_Static_assert(KC_Q                   == 0x0014, "");
-_Static_assert(KC_R                   == 0x0015, "");
-_Static_assert(KC_S                   == 0x0016, "");
-_Static_assert(KC_T                   == 0x0017, "");
-_Static_assert(KC_U                   == 0x0018, "");
-_Static_assert(KC_V                   == 0x0019, "");
-_Static_assert(KC_W                   == 0x001A, "");
-_Static_assert(KC_X                   == 0x001B, "");
-_Static_assert(KC_Y                   == 0x001C, "");
-_Static_assert(KC_Z                   == 0x001D, "");
-_Static_assert(KC_1                   == 0x001E, "");
-_Static_assert(KC_2                   == 0x001F, "");
-_Static_assert(KC_3                   == 0x0020, "");
-_Static_assert(KC_4                   == 0x0021, "");
-_Static_assert(KC_5                   == 0x0022, "");
-_Static_assert(KC_6                   == 0x0023, "");
-_Static_assert(KC_7                   == 0x0024, "");
-_Static_assert(KC_8                   == 0x0025, "");
-_Static_assert(KC_9                   == 0x0026, "");
-_Static_assert(KC_0                   == 0x0027, "");
-_Static_assert(KC_ENTER               == 0x0028, "");
-_Static_assert(KC_ESCAPE              == 0x0029, "");
-_Static_assert(KC_BACKSPACE           == 0x002A, "");
-_Static_assert(KC_TAB                 == 0x002B, "");
-_Static_assert(KC_SPACE               == 0x002C, "");
-_Static_assert(KC_MINUS               == 0x002D, "");
-_Static_assert(KC_EQUAL               == 0x002E, "");
-_Static_assert(KC_LEFT_BRACKET        == 0x002F, "");
-_Static_assert(KC_RIGHT_BRACKET       == 0x0030, "");
-_Static_assert(KC_BACKSLASH           == 0x0031, "");
-_Static_assert(KC_NONUS_HASH          == 0x0032, "");
-_Static_assert(KC_SEMICOLON           == 0x0033, "");
-_Static_assert(KC_QUOTE               == 0x0034, "");
-_Static_assert(KC_GRAVE               == 0x0035, "");
-_Static_assert(KC_COMMA               == 0x0036, "");
-_Static_assert(KC_DOT                 == 0x0037, "");
-_Static_assert(KC_SLASH               == 0x0038, "");
-_Static_assert(KC_CAPS_LOCK           == 0x0039, "");
-_Static_assert(KC_F1                  == 0x003A, "");
-_Static_assert(KC_F2                  == 0x003B, "");
-_Static_assert(KC_F3                  == 0x003C, "");
-_Static_assert(KC_F4                  == 0x003D, "");
-_Static_assert(KC_F5                  == 0x003E, "");
-_Static_assert(KC_F6                  == 0x003F, "");
-_Static_assert(KC_F7                  == 0x0040, "");
-_Static_assert(KC_F8                  == 0x0041, "");
-_Static_assert(KC_F9                  == 0x0042, "");
-_Static_assert(KC_F10                 == 0x0043, "");
-_Static_assert(KC_F11                 == 0x0044, "");
-_Static_assert(KC_F12                 == 0x0045, "");
-_Static_assert(KC_PRINT_SCREEN        == 0x0046, "");
-_Static_assert(KC_SCROLL_LOCK         == 0x0047, "");
-_Static_assert(KC_PAUSE               == 0x0048, "");
-_Static_assert(KC_INSERT              == 0x0049, "");
-_Static_assert(KC_HOME                == 0x004A, "");
-_Static_assert(KC_PAGE_UP             == 0x004B, "");
-_Static_assert(KC_DELETE              == 0x004C, "");
-_Static_assert(KC_END                 == 0x004D, "");
-_Static_assert(KC_PAGE_DOWN           == 0x004E, "");
-_Static_assert(KC_RIGHT               == 0x004F, "");
-_Static_assert(KC_LEFT                == 0x0050, "");
-_Static_assert(KC_DOWN                == 0x0051, "");
-_Static_assert(KC_UP                  == 0x0052, "");
-_Static_assert(KC_NUM_LOCK            == 0x0053, "");
-_Static_assert(KC_KP_SLASH            == 0x0054, "");
-_Static_assert(KC_KP_ASTERISK         == 0x0055, "");
-_Static_assert(KC_KP_MINUS            == 0x0056, "");
-_Static_assert(KC_KP_PLUS             == 0x0057, "");
-_Static_assert(KC_KP_ENTER            == 0x0058, "");
-_Static_assert(KC_KP_1                == 0x0059, "");
-_Static_assert(KC_KP_2                == 0x005A, "");
-_Static_assert(KC_KP_3                == 0x005B, "");
-_Static_assert(KC_KP_4                == 0x005C, "");
-_Static_assert(KC_KP_5                == 0x005D, "");
-_Static_assert(KC_KP_6                == 0x005E, "");
-_Static_assert(KC_KP_7                == 0x005F, "");
-_Static_assert(KC_KP_8                == 0x0060, "");
-_Static_assert(KC_KP_9                == 0x0061, "");
-_Static_assert(KC_KP_0                == 0x0062, "");
-_Static_assert(KC_KP_DOT              == 0x0063, "");
-_Static_assert(KC_NONUS_BACKSLASH     == 0x0064, "");
-_Static_assert(KC_APPLICATION         == 0x0065, "");
-_Static_assert(KC_KB_POWER            == 0x0066, "");
-_Static_assert(KC_KP_EQUAL            == 0x0067, "");
-_Static_assert(KC_F13                 == 0x0068, "");
-_Static_assert(KC_F14                 == 0x0069, "");
-_Static_assert(KC_F15                 == 0x006A, "");
-_Static_assert(KC_F16                 == 0x006B, "");
-_Static_assert(KC_F17                 == 0x006C, "");
-_Static_assert(KC_F18                 == 0x006D, "");
-_Static_assert(KC_F19                 == 0x006E, "");
-_Static_assert(KC_F20                 == 0x006F, "");
-_Static_assert(KC_F21                 == 0x0070, "");
-_Static_assert(KC_F22                 == 0x0071, "");
-_Static_assert(KC_F23                 == 0x0072, "");
-_Static_assert(KC_F24                 == 0x0073, "");
-_Static_assert(KC_EXECUTE             == 0x0074, "");
-_Static_assert(KC_HELP                == 0x0075, "");
-_Static_assert(KC_MENU                == 0x0076, "");
-_Static_assert(KC_SELECT              == 0x0077, "");
-_Static_assert(KC_STOP                == 0x0078, "");
-_Static_assert(KC_AGAIN               == 0x0079, "");
-_Static_assert(KC_UNDO                == 0x007A, "");
-_Static_assert(KC_CUT                 == 0x007B, "");
-_Static_assert(KC_COPY                == 0x007C, "");
-_Static_assert(KC_PASTE               == 0x007D, "");
-_Static_assert(KC_FIND                == 0x007E, "");
-
-_Static_assert(KC_LOCKING_CAPS_LOCK   == 0x0082, "");
-_Static_assert(KC_LOCKING_NUM_LOCK    == 0x0083, "");
-_Static_assert(KC_LOCKING_SCROLL_LOCK == 0x0084, "");
-_Static_assert(KC_KP_COMMA            == 0x0085, "");
-_Static_assert(KC_KP_EQUAL_AS400      == 0x0086, "");
-_Static_assert(KC_INTERNATIONAL_1     == 0x0087, "");
-_Static_assert(KC_INTERNATIONAL_2     == 0x0088, "");
-_Static_assert(KC_INTERNATIONAL_3     == 0x0089, "");
-_Static_assert(KC_INTERNATIONAL_4     == 0x008A, "");
-_Static_assert(KC_INTERNATIONAL_5     == 0x008B, "");
-_Static_assert(KC_INTERNATIONAL_6     == 0x008C, "");
-_Static_assert(KC_INTERNATIONAL_7     == 0x008D, "");
-_Static_assert(KC_INTERNATIONAL_8     == 0x008E, "");
-_Static_assert(KC_INTERNATIONAL_9     == 0x008F, "");
-_Static_assert(KC_LANGUAGE_1          == 0x0090, "");
-_Static_assert(KC_LANGUAGE_2          == 0x0091, "");
-_Static_assert(KC_LANGUAGE_3          == 0x0092, "");
-_Static_assert(KC_LANGUAGE_4          == 0x0093, "");
-_Static_assert(KC_LANGUAGE_5          == 0x0094, "");
-_Static_assert(KC_LANGUAGE_6          == 0x0095, "");
-_Static_assert(KC_LANGUAGE_7          == 0x0096, "");
-_Static_assert(KC_LANGUAGE_8          == 0x0097, "");
-_Static_assert(KC_LANGUAGE_9          == 0x0098, "");
-_Static_assert(KC_ALTERNATE_ERASE     == 0x0099, "");
-_Static_assert(KC_SYSTEM_REQUEST      == 0x009A, "");
-_Static_assert(KC_CANCEL              == 0x009B, "");
-_Static_assert(KC_CLEAR               == 0x009C, "");
-_Static_assert(KC_PRIOR               == 0x009D, "");
-
-_Static_assert(KC_OUT                 == 0x00A0, "");
-_Static_assert(KC_OPER                == 0x00A1, "");
-_Static_assert(KC_CLEAR_AGAIN         == 0x00A2, "");
-_Static_assert(KC_CRSEL               == 0x00A3, "");
-_Static_assert(KC_EXSEL               == 0x00A4, "");
-
-_Static_assert(KC_PWR                 == 0x00A5, "");
-_Static_assert(KC_SLEP                == 0x00A6, "");
-_Static_assert(KC_WAKE                == 0x00A7, "");
-_Static_assert(KC_MUTE                == 0x00A8, "");
-_Static_assert(KC_VOLU                == 0x00A9, "");
-_Static_assert(KC_VOLD                == 0x00AA, "");
-_Static_assert(KC_MNXT                == 0x00AB, "");
-_Static_assert(KC_MPRV                == 0x00AC, "");
-_Static_assert(KC_MSTP                == 0x00AD, "");
-_Static_assert(KC_MPLY                == 0x00AE, "");
-_Static_assert(KC_MSEL                == 0x00AF, "");
-_Static_assert(KC_EJCT                == 0x00B0, "");
-_Static_assert(KC_MAIL                == 0x00B1, "");
-_Static_assert(KC_CALC                == 0x00B2, "");
-_Static_assert(KC_MYCM                == 0x00B3, "");
-_Static_assert(KC_WSCH                == 0x00B4, "");
-_Static_assert(KC_WHOM                == 0x00B5, "");
-_Static_assert(KC_WBAK                == 0x00B6, "");
-_Static_assert(KC_WFWD                == 0x00B7, "");
-_Static_assert(KC_WSTP                == 0x00B8, "");
-_Static_assert(KC_WREF                == 0x00B9, "");
-_Static_assert(KC_WFAV                == 0x00BA, "");
-_Static_assert(KC_MFFD                == 0x00BB, "");
-_Static_assert(KC_MRWD                == 0x00BC, "");
-_Static_assert(KC_BRIU                == 0x00BD, "");
-_Static_assert(KC_BRID                == 0x00BE, "");
-_Static_assert(KC_CPNL                == 0x00BF, "");
-_Static_assert(KC_ASST                == 0x00C0, "");
-
-_Static_assert(KC_LEFT_CTRL           == 0x00E0, "");
-_Static_assert(KC_LEFT_SHIFT          == 0x00E1, "");
-_Static_assert(KC_LEFT_ALT            == 0x00E2, "");
-_Static_assert(KC_LEFT_GUI            == 0x00E3, "");
-_Static_assert(KC_RIGHT_CTRL          == 0x00E4, "");
-_Static_assert(KC_RIGHT_SHIFT         == 0x00E5, "");
-_Static_assert(KC_RIGHT_ALT           == 0x00E6, "");
-_Static_assert(KC_RIGHT_GUI           == 0x00E7, "");
-
-_Static_assert(KC_MS_U                == 0x00F0, "");
-_Static_assert(KC_MS_D                == 0x00F1, "");
-_Static_assert(KC_MS_L                == 0x00F2, "");
-_Static_assert(KC_MS_R                == 0x00F3, "");
-_Static_assert(KC_BTN1                == 0x00F4, "");
-_Static_assert(KC_BTN2                == 0x00F5, "");
-_Static_assert(KC_BTN3                == 0x00F6, "");
-_Static_assert(KC_BTN4                == 0x00F7, "");
-_Static_assert(KC_BTN5                == 0x00F8, "");
-_Static_assert(KC_WH_U                == 0x00F9, "");
-_Static_assert(KC_WH_D                == 0x00FA, "");
-_Static_assert(KC_WH_L                == 0x00FB, "");
-_Static_assert(KC_WH_R                == 0x00FC, "");
-_Static_assert(KC_ACL0                == 0x00FD, "");
-_Static_assert(KC_ACL1                == 0x00FE, "");
-_Static_assert(KC_ACL2                == 0x00FF, "");
-
-_Static_assert(KC_EXLM                == 0x021E, "");
-_Static_assert(KC_AT                  == 0x021F, "");
-_Static_assert(KC_HASH                == 0x0220, "");
-_Static_assert(KC_DLR                 == 0x0221, "");
-_Static_assert(KC_PERC                == 0x0222, "");
-_Static_assert(KC_CIRC                == 0x0223, "");
-_Static_assert(KC_AMPR                == 0x0224, "");
-_Static_assert(KC_ASTR                == 0x0225, "");
-_Static_assert(KC_LPRN                == 0x0226, "");
-_Static_assert(KC_RPRN                == 0x0227, "");
-_Static_assert(KC_UNDS                == 0x022D, "");
-_Static_assert(KC_PLUS                == 0x022E, "");
-_Static_assert(KC_LCBR                == 0x022F, "");
-_Static_assert(KC_RCBR                == 0x0230, "");
-_Static_assert(KC_PIPE                == 0x0231, "");
-_Static_assert(KC_COLN                == 0x0233, "");
-_Static_assert(KC_DQUO                == 0x0234, "");
-_Static_assert(KC_TILD                == 0x0235, "");
-_Static_assert(KC_LT                  == 0x0236, "");
-_Static_assert(KC_GT                  == 0x0237, "");
-_Static_assert(KC_QUES                == 0x0238, "");
-
-_Static_assert(QK_BOOTLOADER          == 0x5C00, "");
-_Static_assert(QK_DEBUG_TOGGLE        == 0x5C01, "");
-
-_Static_assert(MAGIC_TOGGLE_NKRO      == 0x5C14, "");
-
-_Static_assert(QK_GRAVE_ESCAPE        == 0x5C16, "");
-
-_Static_assert(AU_ON                  == 0x5C1D, "");
-_Static_assert(AU_OFF                 == 0x5C1E, "");
-_Static_assert(AU_TOG                 == 0x5C1F, "");
-
-_Static_assert(CLICKY_TOGGLE          == 0x5C20, "");
-_Static_assert(CLICKY_ENABLE          == 0x5C21, "");
-_Static_assert(CLICKY_DISABLE         == 0x5C22, "");
-_Static_assert(CLICKY_UP              == 0x5C23, "");
-_Static_assert(CLICKY_DOWN            == 0x5C24, "");
-_Static_assert(CLICKY_RESET           == 0x5C25, "");
-_Static_assert(MU_ON                  == 0x5C26, "");
-_Static_assert(MU_OFF                 == 0x5C27, "");
-_Static_assert(MU_TOG                 == 0x5C28, "");
-_Static_assert(MU_MOD                 == 0x5C29, "");
-
-_Static_assert(BL_ON                  == 0x5CBB, "");
-_Static_assert(BL_OFF                 == 0x5CBC, "");
-_Static_assert(BL_DEC                 == 0x5CBD, "");
-_Static_assert(BL_INC                 == 0x5CBE, "");
-_Static_assert(BL_TOGG                == 0x5CBF, "");
-_Static_assert(BL_STEP                == 0x5CC0, "");
-_Static_assert(BL_BRTG                == 0x5CC1, "");
-_Static_assert(RGB_TOG                == 0x5CC2, "");
-_Static_assert(RGB_MOD                == 0x5CC3, "");
-_Static_assert(RGB_RMOD               == 0x5CC4, "");
-_Static_assert(RGB_HUI                == 0x5CC5, "");
-_Static_assert(RGB_HUD                == 0x5CC6, "");
-_Static_assert(RGB_SAI                == 0x5CC7, "");
-_Static_assert(RGB_SAD                == 0x5CC8, "");
-_Static_assert(RGB_VAI                == 0x5CC9, "");
-_Static_assert(RGB_VAD                == 0x5CCA, "");
-_Static_assert(RGB_SPI                == 0x5CCB, "");
-_Static_assert(RGB_SPD                == 0x5CCC, "");
-_Static_assert(RGB_M_P                == 0x5CCD, "");
-_Static_assert(RGB_M_B                == 0x5CCE, "");
-_Static_assert(RGB_M_R                == 0x5CCF, "");
-_Static_assert(RGB_M_SW               == 0x5CD0, "");
-_Static_assert(RGB_M_SN               == 0x5CD1, "");
-_Static_assert(RGB_M_K                == 0x5CD2, "");
-_Static_assert(RGB_M_X                == 0x5CD3, "");
-_Static_assert(RGB_M_G                == 0x5CD4, "");
-_Static_assert(RGB_M_T                == 0x5CD5, "");
-
-_Static_assert(SC_LSPO                == 0x5CD7, "");
-_Static_assert(SC_RSPC                == 0x5CD8, "");
-_Static_assert(SC_SENT                == 0x5CD9, "");
-
-_Static_assert(SC_LCPO                == 0x5CF3, "");
-_Static_assert(SC_RCPC                == 0x5CF4, "");
-_Static_assert(SC_LAPO                == 0x5CF5, "");
-_Static_assert(SC_RAPC                == 0x5CF6, "");
-
-_Static_assert(FN_MO13                == 0x5F10, "");
-_Static_assert(FN_MO23                == 0x5F11, "");
-_Static_assert(MACRO00                == 0x5F12, "");
-_Static_assert(MACRO01                == 0x5F13, "");
-_Static_assert(MACRO02                == 0x5F14, "");
-_Static_assert(MACRO03                == 0x5F15, "");
-_Static_assert(MACRO04                == 0x5F16, "");
-_Static_assert(MACRO05                == 0x5F17, "");
-_Static_assert(MACRO06                == 0x5F18, "");
-_Static_assert(MACRO07                == 0x5F19, "");
-_Static_assert(MACRO08                == 0x5F1A, "");
-_Static_assert(MACRO09                == 0x5F1B, "");
-_Static_assert(MACRO10                == 0x5F1C, "");
-_Static_assert(MACRO11                == 0x5F1D, "");
-_Static_assert(MACRO12                == 0x5F1E, "");
-_Static_assert(MACRO13                == 0x5F1F, "");
-_Static_assert(MACRO14                == 0x5F20, "");
-_Static_assert(MACRO15                == 0x5F21, "");
-
-_Static_assert(USER00                 == 0x5F80, "");
-_Static_assert(USER01                 == 0x5F81, "");
-_Static_assert(USER02                 == 0x5F82, "");
-_Static_assert(USER03                 == 0x5F83, "");
-_Static_assert(USER04                 == 0x5F84, "");
-_Static_assert(USER05                 == 0x5F85, "");
-_Static_assert(USER06                 == 0x5F86, "");
-_Static_assert(USER07                 == 0x5F87, "");
-_Static_assert(USER08                 == 0x5F88, "");
-_Static_assert(USER09                 == 0x5F89, "");
-_Static_assert(USER10                 == 0x5F8A, "");
-_Static_assert(USER11                 == 0x5F8B, "");
-_Static_assert(USER12                 == 0x5F8C, "");
-_Static_assert(USER13                 == 0x5F8D, "");
-_Static_assert(USER14                 == 0x5F8E, "");
-_Static_assert(USER15                 == 0x5F8F, "");
-
-#endif

From fe00c8021192c43e27e5a91a5193d7fbe07b9fa8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 5 Nov 2022 21:45:40 +1100
Subject: [PATCH 795/959] Reduce includes for send_string header (#18952)

---
 quantum/send_string/send_string.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/quantum/send_string/send_string.c b/quantum/send_string/send_string.c
index 818a52f6dc..820fc25163 100644
--- a/quantum/send_string/send_string.c
+++ b/quantum/send_string/send_string.c
@@ -14,12 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <ctype.h>
-
-#include "quantum.h"
-
 #include "send_string.h"
 
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "quantum_keycodes.h"
+#include "keycode.h"
+#include "action.h"
+#include "wait.h"
+
 #if defined(AUDIO_ENABLE) && defined(SENDSTRING_BELL)
 #    include "audio.h"
 #    ifndef BELL_SOUND

From 4d33f356a62c195f5498ed2fe8dd3ea434d5a689 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 5 Nov 2022 23:22:11 +1100
Subject: [PATCH 796/959] Macro keycode name refactoring (#18958)

---
 .../keycodes/keycodes_0.0.1_macro.hjson       | 162 ++++++++++++++----
 docs/ChangeLog/20211127.md                    |  10 +-
 docs/configurator_default_keymaps.md          |  36 ++--
 docs/feature_macros.md                        |   6 +-
 docs/zh-cn/configurator_default_keymaps.md    |  36 ++--
 .../pytest/macro/keymaps/default/keymap.json  |   2 +-
 .../work_board/keymaps/via/keymap.c           |   2 +-
 lib/python/qmk/keymap.py                      |   2 +-
 lib/python/qmk/tests/test_cli_commands.py     |   4 +-
 quantum/keycodes.h                            |  99 +++++++----
 10 files changed, 243 insertions(+), 116 deletions(-)

diff --git a/data/constants/keycodes/keycodes_0.0.1_macro.hjson b/data/constants/keycodes/keycodes_0.0.1_macro.hjson
index 70b9ecf154..409853fed9 100644
--- a/data/constants/keycodes/keycodes_0.0.1_macro.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_macro.hjson
@@ -3,131 +3,227 @@
 
         "0x7700": {
             "group": "macro",
-            "key": "MACRO_0"
+            "key": "QK_MACRO_0",
+            "aliases": [
+                "MC_0"
+            ]
         },
         "0x7701": {
             "group": "macro",
-            "key": "MACRO_1"
+            "key": "QK_MACRO_1",
+            "aliases": [
+                "MC_1"
+            ]
         },
         "0x7702": {
             "group": "macro",
-            "key": "MACRO_2"
+            "key": "QK_MACRO_2",
+            "aliases": [
+                "MC_2"
+            ]
         },
         "0x7703": {
             "group": "macro",
-            "key": "MACRO_3"
+            "key": "QK_MACRO_3",
+            "aliases": [
+                "MC_3"
+            ]
         },
         "0x7704": {
             "group": "macro",
-            "key": "MACRO_4"
+            "key": "QK_MACRO_4",
+            "aliases": [
+                "MC_4"
+            ]
         },
         "0x7705": {
             "group": "macro",
-            "key": "MACRO_5"
+            "key": "QK_MACRO_5",
+            "aliases": [
+                "MC_5"
+            ]
         },
         "0x7706": {
             "group": "macro",
-            "key": "MACRO_6"
+            "key": "QK_MACRO_6",
+            "aliases": [
+                "MC_6"
+            ]
         },
         "0x7707": {
             "group": "macro",
-            "key": "MACRO_7"
+            "key": "QK_MACRO_7",
+            "aliases": [
+                "MC_7"
+            ]
         },
         "0x7708": {
             "group": "macro",
-            "key": "MACRO_8"
+            "key": "QK_MACRO_8",
+            "aliases": [
+                "MC_8"
+            ]
         },
         "0x7709": {
             "group": "macro",
-            "key": "MACRO_9"
+            "key": "QK_MACRO_9",
+            "aliases": [
+                "MC_9"
+            ]
         },
         "0x770A": {
             "group": "macro",
-            "key": "MACRO_10"
+            "key": "QK_MACRO_10",
+            "aliases": [
+                "MC_10"
+            ]
         },
         "0x770B": {
             "group": "macro",
-            "key": "MACRO_11"
+            "key": "QK_MACRO_11",
+            "aliases": [
+                "MC_11"
+            ]
         },
         "0x770C": {
             "group": "macro",
-            "key": "MACRO_12"
+            "key": "QK_MACRO_12",
+            "aliases": [
+                "MC_12"
+            ]
         },
         "0x770D": {
             "group": "macro",
-            "key": "MACRO_13"
+            "key": "QK_MACRO_13",
+            "aliases": [
+                "MC_13"
+            ]
         },
         "0x770E": {
             "group": "macro",
-            "key": "MACRO_14"
+            "key": "QK_MACRO_14",
+            "aliases": [
+                "MC_14"
+            ]
         },
         "0x770F": {
             "group": "macro",
-            "key": "MACRO_15"
+            "key": "QK_MACRO_15",
+            "aliases": [
+                "MC_15"
+            ]
         },
         "0x7710": {
             "group": "macro",
-            "key": "MACRO_16"
+            "key": "QK_MACRO_16",
+            "aliases": [
+                "MC_16"
+            ]
         },
         "0x7711": {
             "group": "macro",
-            "key": "MACRO_17"
+            "key": "QK_MACRO_17",
+            "aliases": [
+                "MC_17"
+            ]
         },
         "0x7712": {
             "group": "macro",
-            "key": "MACRO_18"
+            "key": "QK_MACRO_18",
+            "aliases": [
+                "MC_18"
+            ]
         },
         "0x7713": {
             "group": "macro",
-            "key": "MACRO_19"
+            "key": "QK_MACRO_19",
+            "aliases": [
+                "MC_19"
+            ]
         },
         "0x7714": {
             "group": "macro",
-            "key": "MACRO_20"
+            "key": "QK_MACRO_20",
+            "aliases": [
+                "MC_20"
+            ]
         },
         "0x7715": {
             "group": "macro",
-            "key": "MACRO_21"
+            "key": "QK_MACRO_21",
+            "aliases": [
+                "MC_21"
+            ]
         },
         "0x7716": {
             "group": "macro",
-            "key": "MACRO_22"
+            "key": "QK_MACRO_22",
+            "aliases": [
+                "MC_22"
+            ]
         },
         "0x7717": {
             "group": "macro",
-            "key": "MACRO_23"
+            "key": "QK_MACRO_23",
+            "aliases": [
+                "MC_23"
+            ]
         },
         "0x7718": {
             "group": "macro",
-            "key": "MACRO_24"
+            "key": "QK_MACRO_24",
+            "aliases": [
+                "MC_24"
+            ]
         },
         "0x7719": {
             "group": "macro",
-            "key": "MACRO_25"
+            "key": "QK_MACRO_25",
+            "aliases": [
+                "MC_25"
+            ]
         },
         "0x771A": {
             "group": "macro",
-            "key": "MACRO_26"
+            "key": "QK_MACRO_26",
+            "aliases": [
+                "MC_26"
+            ]
         },
         "0x771B": {
             "group": "macro",
-            "key": "MACRO_27"
+            "key": "QK_MACRO_27",
+            "aliases": [
+                "MC_27"
+            ]
         },
         "0x771C": {
             "group": "macro",
-            "key": "MACRO_28"
+            "key": "QK_MACRO_28",
+            "aliases": [
+                "MC_28"
+            ]
         },
         "0x771D": {
             "group": "macro",
-            "key": "MACRO_29"
+            "key": "QK_MACRO_29",
+            "aliases": [
+                "MC_29"
+            ]
         },
         "0x771E": {
             "group": "macro",
-            "key": "MACRO_30"
+            "key": "QK_MACRO_30",
+            "aliases": [
+                "MC_30"
+            ]
         },
         "0x771F": {
             "group": "macro",
-            "key": "MACRO_31"
+            "key": "QK_MACRO_31",
+            "aliases": [
+                "MC_31"
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/docs/ChangeLog/20211127.md b/docs/ChangeLog/20211127.md
index d954bb9f61..0780ab6a44 100644
--- a/docs/ChangeLog/20211127.md
+++ b/docs/ChangeLog/20211127.md
@@ -56,19 +56,19 @@ You can now define up to 32 macros in your `keymap.json` file, as used by [QMK C
     "keyboard": "handwired/my_macropad",
     "keymap": "my_keymap",
     "macros": [
-        [ // first listed is MACRO_0...
+        [ // first listed is QK_MACRO_0...
             {"action":"down", "keycodes": ["LSFT"]},
             "hello world1",
             {"action": "up","keycodes": ["LSFT"]}
         ],
-        [ // ...then MACRO_1...
+        [ // ...then QK_MACRO_1...
             {"action":"tap", "keycodes": ["LCTL", "LALT", "DEL"]}
         ],
-        [ // ...then MACRO_2...
+        [ // ...then QK_MACRO_2...
             "ding!",
             {"action":"beep"}
         ],
-        [ // ...and MACRO_3.
+        [ // ...and QK_MACRO_3.
             {"action":"tap", "keycodes": ["F1"]},
             {"action":"delay", "duration": "1000"},
             {"action":"tap", "keycodes": ["PGDN"]}
@@ -76,7 +76,7 @@ You can now define up to 32 macros in your `keymap.json` file, as used by [QMK C
     ],
     "layout": "LAYOUT_all",
     "layers": [
-        ["MACRO_0", "MACRO_1", "MACRO_2", "MACRO_3"]
+        ["QK_MACRO_0", "QK_MACRO_1", "QK_MACRO_2", "QK_MACRO_3"]
     ]
 }
 ```
diff --git a/docs/configurator_default_keymaps.md b/docs/configurator_default_keymaps.md
index 3fea15166a..d08ec29539 100644
--- a/docs/configurator_default_keymaps.md
+++ b/docs/configurator_default_keymaps.md
@@ -122,26 +122,26 @@ There is a way to support custom keycodes: if the logic for a custom keycode is
 
 ```c
 enum custom_keycodes {
-    MACRO_1 = SAFE_RANGE,
-    MACRO_2,
-    MACRO_3
+    CUSTOM_1 = SAFE_RANGE,
+    CUSTOM_2,
+    CUSTOM_3
 };
 ...
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch(keycode) {
-        case MACRO_1:
+        case CUSTOM_1:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #1.");
+                SEND_STRING("This is custom keycode #1.");
             }
             return false;
-        case MACRO_2:
+        case CUSTOM_2:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #2.");
+                SEND_STRING("This is custom keycode #2.");
             }
             return false;
-        case MACRO_3:
+        case CUSTOM_3:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #3.");
+                SEND_STRING("This is custom keycode #3.");
             }
             return false;
     }
@@ -153,9 +153,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 ```c
 enum keyboard_keycodes {
-    MACRO_1 = SAFE_RANGE,
-    MACRO_2,
-    MACRO_3,
+    CUSTOM_1 = SAFE_RANGE,
+    CUSTOM_2,
+    CUSTOM_3,
     NEW_SAFE_RANGE  // Important!
 };
 ```
@@ -165,19 +165,19 @@ enum keyboard_keycodes {
 ```c
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     switch(keycode) {
-        case MACRO_1:
+        case CUSTOM_1:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #1.");
+                SEND_STRING("This is custom keycode #1.");
             }
             return false;
-        case MACRO_2:
+        case CUSTOM_2:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #2.");
+                SEND_STRING("This is custom keycode #2.");
             }
             return false;
-        case MACRO_3:
+        case CUSTOM_3:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #3.");
+                SEND_STRING("This is custom keycode #3.");
             }
             return false;
     }
diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 63b7223db9..08310555fb 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -33,7 +33,7 @@ You can define up to 32 macros in a `keymap.json` file, as used by [Configurator
     ],
     "layout": "LAYOUT_all",
     "layers": [
-        ["MACRO_0", "MACRO_1", "MACRO_2", "MACRO_3"]
+        ["QK_MACRO_0", "QK_MACRO_1", "QK_MACRO_2", "QK_MACRO_3"]
     ]
 }
 ```
@@ -52,7 +52,7 @@ If you type in a language other than English, or use a non-QWERTY layout like Co
     ],
     "layout": "LAYOUT_all",
     "layers": [
-        ["MACRO_0"]
+        ["QK_MACRO_0"]
     ]
 }
 ```
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #### Advanced Macros
 
-In addition to the `process_record_user()` function, is the `post_process_record_user()` function. This runs after `process_record` and can be used to do things after a keystroke has been sent.  This is useful if you want to have a key pressed before and released after a normal key, for instance. 
+In addition to the `process_record_user()` function, is the `post_process_record_user()` function. This runs after `process_record` and can be used to do things after a keystroke has been sent.  This is useful if you want to have a key pressed before and released after a normal key, for instance.
 
 In this example, we modify most normal keypresses so that `F22` is pressed before the keystroke is normally sent, and release it __only after__ it's been released.
 
diff --git a/docs/zh-cn/configurator_default_keymaps.md b/docs/zh-cn/configurator_default_keymaps.md
index 82e4ca818d..c446a45714 100644
--- a/docs/zh-cn/configurator_default_keymaps.md
+++ b/docs/zh-cn/configurator_default_keymaps.md
@@ -127,26 +127,26 @@ enum layer_names {
 
 ```c
 enum custom_keycodes {
-    MACRO_1 = SAFE_RANGE,
-    MACRO_2,
-    MACRO_3
+    CUSTOM_1 = SAFE_RANGE,
+    CUSTOM_2,
+    CUSTOM_3
 };
 ...
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch(keycode) {
-        case MACRO_1:
+        case CUSTOM_1:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #1.");
+                SEND_STRING("This is custom keycode #1.");
             }
             return false;
-        case MACRO_2:
+        case CUSTOM_2:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #2.");
+                SEND_STRING("This is custom keycode #2.");
             }
             return false;
-        case MACRO_3:
+        case CUSTOM_3:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #3.");
+                SEND_STRING("This is custom keycode #3.");
             }
             return false;
     }
@@ -158,9 +158,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 ```c
 enum keyboard_keycodes {
-    MACRO_1 = SAFE_RANGE,
-    MACRO_2,
-    MACRO_3,
+    CUSTOM_1 = SAFE_RANGE,
+    CUSTOM_2,
+    CUSTOM_3,
     NEW_SAFE_RANGE  // 重要!
 };
 ```
@@ -170,19 +170,19 @@ enum keyboard_keycodes {
 ```c
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     switch(keycode) {
-        case MACRO_1:
+        case CUSTOM_1:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #1.");
+                SEND_STRING("This is custom keycode #1.");
             }
             return false;
-        case MACRO_2:
+        case CUSTOM_2:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #2.");
+                SEND_STRING("This is custom keycode #2.");
             }
             return false;
-        case MACRO_3:
+        case CUSTOM_3:
             if (record->event.pressed) {
-                SEND_STRING("This is macro #3.");
+                SEND_STRING("This is custom keycode #3.");
             }
             return false;
     }
diff --git a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
index f319d862d8..23c371aa34 100644
--- a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
+++ b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
@@ -2,7 +2,7 @@
     "keyboard": "handwired/pytest/basic",
     "keymap": "default_json",
     "layout": "LAYOUT_ortho_1x1",
-    "layers": [["MACRO_0"]],
+    "layers": [["QK_MACRO_0"]],
     "macros": [
         [
             "Hello, World!",
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index d39c5f405d..0ffdd8b494 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, _______,
-        _______, _______, _______, MACRO_1, _______, MACRO_0, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+        _______, _______, _______, MC_1,    _______, MC_0,    _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
     ),
     [_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, _______,
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index fc1421962f..315af35b73 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -266,7 +266,7 @@ def generate_c(keymap_json):
 
             new_macro = "".join(macro)
             new_macro = new_macro.replace('""', '')
-            macro_txt.append(f'            case MACRO_{i}:')
+            macro_txt.append(f'            case QK_MACRO_{i}:')
             macro_txt.append(f'                SEND_STRING({new_macro});')
             macro_txt.append('                return false;')
 
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 9bfc5a0a79..e598b281a6 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -150,8 +150,8 @@ def test_json2c():
 def test_json2c_macros():
     result = check_subcommand("json2c", 'keyboards/handwired/pytest/macro/keymaps/default/keymap.json')
     check_returncode(result)
-    assert 'LAYOUT_ortho_1x1(MACRO_0)' in result.stdout
-    assert 'case MACRO_0:' in result.stdout
+    assert 'LAYOUT_ortho_1x1(QK_MACRO_0)' in result.stdout
+    assert 'case QK_MACRO_0:' in result.stdout
     assert 'SEND_STRING("Hello, World!"SS_TAP(X_ENTER));' in result.stdout
 
 
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index 6772bb6a4a..e3c9321d16 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -582,38 +582,38 @@ enum qk_keycode_defines {
     QK_STENO_GEMINI = 0x74F1,
     QK_STENO_COMB = 0x74F2,
     QK_STENO_COMB_MAX = 0x74FC,
-    MACRO_0 = 0x7700,
-    MACRO_1 = 0x7701,
-    MACRO_2 = 0x7702,
-    MACRO_3 = 0x7703,
-    MACRO_4 = 0x7704,
-    MACRO_5 = 0x7705,
-    MACRO_6 = 0x7706,
-    MACRO_7 = 0x7707,
-    MACRO_8 = 0x7708,
-    MACRO_9 = 0x7709,
-    MACRO_10 = 0x770A,
-    MACRO_11 = 0x770B,
-    MACRO_12 = 0x770C,
-    MACRO_13 = 0x770D,
-    MACRO_14 = 0x770E,
-    MACRO_15 = 0x770F,
-    MACRO_16 = 0x7710,
-    MACRO_17 = 0x7711,
-    MACRO_18 = 0x7712,
-    MACRO_19 = 0x7713,
-    MACRO_20 = 0x7714,
-    MACRO_21 = 0x7715,
-    MACRO_22 = 0x7716,
-    MACRO_23 = 0x7717,
-    MACRO_24 = 0x7718,
-    MACRO_25 = 0x7719,
-    MACRO_26 = 0x771A,
-    MACRO_27 = 0x771B,
-    MACRO_28 = 0x771C,
-    MACRO_29 = 0x771D,
-    MACRO_30 = 0x771E,
-    MACRO_31 = 0x771F,
+    QK_MACRO_0 = 0x7700,
+    QK_MACRO_1 = 0x7701,
+    QK_MACRO_2 = 0x7702,
+    QK_MACRO_3 = 0x7703,
+    QK_MACRO_4 = 0x7704,
+    QK_MACRO_5 = 0x7705,
+    QK_MACRO_6 = 0x7706,
+    QK_MACRO_7 = 0x7707,
+    QK_MACRO_8 = 0x7708,
+    QK_MACRO_9 = 0x7709,
+    QK_MACRO_10 = 0x770A,
+    QK_MACRO_11 = 0x770B,
+    QK_MACRO_12 = 0x770C,
+    QK_MACRO_13 = 0x770D,
+    QK_MACRO_14 = 0x770E,
+    QK_MACRO_15 = 0x770F,
+    QK_MACRO_16 = 0x7710,
+    QK_MACRO_17 = 0x7711,
+    QK_MACRO_18 = 0x7712,
+    QK_MACRO_19 = 0x7713,
+    QK_MACRO_20 = 0x7714,
+    QK_MACRO_21 = 0x7715,
+    QK_MACRO_22 = 0x7716,
+    QK_MACRO_23 = 0x7717,
+    QK_MACRO_24 = 0x7718,
+    QK_MACRO_25 = 0x7719,
+    QK_MACRO_26 = 0x771A,
+    QK_MACRO_27 = 0x771B,
+    QK_MACRO_28 = 0x771C,
+    QK_MACRO_29 = 0x771D,
+    QK_MACRO_30 = 0x771E,
+    QK_MACRO_31 = 0x771F,
     BL_ON = 0x7800,
     BL_OFF = 0x7801,
     BL_DEC = 0x7802,
@@ -1000,6 +1000,38 @@ enum qk_keycode_defines {
     CK_UP      = CLICKY_UP,
     CK_DOWN    = CLICKY_DOWN,
     CK_RST     = CLICKY_RESET,
+    MC_0       = QK_MACRO_0,
+    MC_1       = QK_MACRO_1,
+    MC_2       = QK_MACRO_2,
+    MC_3       = QK_MACRO_3,
+    MC_4       = QK_MACRO_4,
+    MC_5       = QK_MACRO_5,
+    MC_6       = QK_MACRO_6,
+    MC_7       = QK_MACRO_7,
+    MC_8       = QK_MACRO_8,
+    MC_9       = QK_MACRO_9,
+    MC_10      = QK_MACRO_10,
+    MC_11      = QK_MACRO_11,
+    MC_12      = QK_MACRO_12,
+    MC_13      = QK_MACRO_13,
+    MC_14      = QK_MACRO_14,
+    MC_15      = QK_MACRO_15,
+    MC_16      = QK_MACRO_16,
+    MC_17      = QK_MACRO_17,
+    MC_18      = QK_MACRO_18,
+    MC_19      = QK_MACRO_19,
+    MC_20      = QK_MACRO_20,
+    MC_21      = QK_MACRO_21,
+    MC_22      = QK_MACRO_22,
+    MC_23      = QK_MACRO_23,
+    MC_24      = QK_MACRO_24,
+    MC_25      = QK_MACRO_25,
+    MC_26      = QK_MACRO_26,
+    MC_27      = QK_MACRO_27,
+    MC_28      = QK_MACRO_28,
+    MC_29      = QK_MACRO_29,
+    MC_30      = QK_MACRO_30,
+    MC_31      = QK_MACRO_31,
     RGB_MOD    = RGB_MODE_FORWARD,
     RGB_RMOD   = RGB_MODE_REVERSE,
     RGB_M_P    = RGB_MODE_PLAIN,
@@ -1108,8 +1140,7 @@ enum qk_keycode_defines {
 #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32)
 #define IS_AUDIO_KEYCODE(code) ((code) >= AU_ON && (code) <= MUV_DE)
 #define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX)
-#define IS_MACRO_KEYCODE(code) ((code) >= MACRO_0 && (code) <= MACRO_31)
+#define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31)
 #define IS_BACKLIGHT_KEYCODE(code) ((code) >= BL_ON && (code) <= BL_BRTG)
 #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
 #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE)
-

From 5233c69bc60aa612709e5d74a005431594612b6e Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 6 Nov 2022 00:15:55 +1100
Subject: [PATCH 797/959] Remove thermal printer. (#18959)

---
 builddefs/common_features.mk                  |   6 -
 builddefs/disable_features.mk                 |   1 -
 builddefs/show_options.mk                     |   1 -
 .../keycodes/keycodes_0.0.1_quantum.hjson     |  17 +-
 docs/_summary.md                              |   1 -
 docs/feature_thermal_printer.md               |  10 -
 docs/keycodes.md                              |   9 -
 docs/understanding_qmk.md                     |   1 -
 .../planck/keymaps/thermal_printer/config.h   |  18 --
 .../planck/keymaps/thermal_printer/keymap.c   | 303 ------------------
 .../planck/keymaps/thermal_printer/readme.md  |   2 -
 .../planck/keymaps/thermal_printer/rules.mk   |  20 --
 quantum/keycodes.h                            |  10 +-
 quantum/process_keycode/process_printer.c     | 269 ----------------
 quantum/process_keycode/process_printer.h     |  21 --
 quantum/process_keycode/process_printer_bb.c  | 270 ----------------
 quantum/quantum.c                             |   3 -
 quantum/quantum.h                             |   4 -
 18 files changed, 8 insertions(+), 958 deletions(-)
 delete mode 100644 docs/feature_thermal_printer.md
 delete mode 100644 keyboards/planck/keymaps/thermal_printer/config.h
 delete mode 100644 keyboards/planck/keymaps/thermal_printer/keymap.c
 delete mode 100644 keyboards/planck/keymaps/thermal_printer/readme.md
 delete mode 100644 keyboards/planck/keymaps/thermal_printer/rules.mk
 delete mode 100644 quantum/process_keycode/process_printer.c
 delete mode 100644 quantum/process_keycode/process_printer.h
 delete mode 100644 quantum/process_keycode/process_printer_bb.c

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 9939e0e5df..e597924469 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -514,12 +514,6 @@ ifeq ($(strip $(RGB_KEYCODES_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_rgb.c
 endif
 
-ifeq ($(strip $(PRINTING_ENABLE)), yes)
-    OPT_DEFS += -DPRINTING_ENABLE
-    SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c
-    QUANTUM_LIB_SRC += uart.c
-endif
-
 VARIABLE_TRACE ?= no
 ifneq ($(strip $(VARIABLE_TRACE)),no)
     SRC += $(QUANTUM_DIR)/variable_trace.c
diff --git a/builddefs/disable_features.mk b/builddefs/disable_features.mk
index 090a9b5a11..fe918b72b2 100644
--- a/builddefs/disable_features.mk
+++ b/builddefs/disable_features.mk
@@ -14,7 +14,6 @@ FEATURE_NAMES += LCD_BACKLIGHT
 FEATURE_NAMES += LCD
 FEATURE_NAMES += OLED
 FEATURE_NAMES += POINTING_DEVICE
-FEATURE_NAMES += PRINTING
 FEATURE_NAMES += PS2_MOUSE
 FEATURE_NAMES += RGBLIGHT
 FEATURE_NAMES += RGB_MATRIX
diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
index fac6576ba1..e9f7e7d047 100644
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@@ -43,7 +43,6 @@ OTHER_OPTION_NAMES = \
   KEY_LOCK_ENABLE \
   KEY_OVERRIDE_ENABLE \
   LEADER_ENABLE \
-  PRINTING_ENABLE \
   STENO_ENABLE \
   STENO_PROTOCOL \
   TAP_DANCE_ENABLE \
diff --git a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
index ceb9d4d16c..1f3d2c70cd 100644
--- a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
@@ -423,15 +423,6 @@
         },
 
         "0x7C73": {
-            "group": "quantum",
-            "key": "PRINT_ON"
-        },
-        "0x7C74": {
-            "group": "quantum",
-            "key": "PRINT_OFF"
-        },
-
-        "0x7C75": {
             "group": "quantum",
             "key": "QK_CAPS_WORD_TOGGLE",
             "aliases": [
@@ -439,21 +430,21 @@
             ]
         },
 
-        "0x7C76": {
+        "0x7C74": {
             "group": "quantum",
             "key": "QK_AUTOCORRECT_ON",
             "aliases": [
                 "AC_ON"
             ]
         },
-        "0x7C77": {
+        "0x7C75": {
             "group": "quantum",
             "key": "QK_AUTOCORRECT_OFF",
             "aliases": [
                 "AC_OFF"
             ]
         },
-        "0x7C78": {
+        "0x7C76": {
             "group": "quantum",
             "key": "QK_AUTOCORRECT_TOGGLE",
             "aliases": [
@@ -461,4 +452,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/docs/_summary.md b/docs/_summary.md
index 0af0c7bc64..97b7e8a2ec 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -123,7 +123,6 @@
     * [PS/2 Mouse](feature_ps2_mouse.md)
     * [Split Keyboard](feature_split_keyboard.md)
     * [Stenography](feature_stenography.md)
-    * [Thermal Printer](feature_thermal_printer.md)
     * [Velocikey](feature_velocikey.md)
 
   * Keyboard Building
diff --git a/docs/feature_thermal_printer.md b/docs/feature_thermal_printer.md
deleted file mode 100644
index 3f496646d4..0000000000
--- a/docs/feature_thermal_printer.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Thermal Printer
-
-<!-- FIXME: Describe thermal printers support here. -->
-
-## Thermal Printer Keycodes
-
-|Key        |Description                             |
-|-----------|----------------------------------------|
-|`PRINT_ON` |Start printing everything the user types|
-|`PRINT_OFF`|Stop printing everything the user types |
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 0c216ae499..3cde934828 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -718,15 +718,6 @@ See also: [RGB Matrix Lighting](feature_rgb_matrix.md)
 |`RGB_SPI`          |          |Increase effect speed (does not support eeprom yet), decrease speed when Shift is held|
 |`RGB_SPD`          |          |Decrease effect speed (does not support eeprom yet), increase speed when Shift is held|
 
-## Thermal Printer :id=thermal-printer
-
-See also: [Thermal Printer](feature_thermal_printer.md)
-
-|Key        |Description                             |
-|-----------|----------------------------------------|
-|`PRINT_ON` |Start printing everything the user types|
-|`PRINT_OFF`|Stop printing everything the user types |
-
 ## US ANSI Shifted Symbols :id=us-ansi-shifted-symbols
 
 See also: [US ANSI Shifted Symbols](keycodes_us_ansi_shifted.md)
diff --git a/docs/understanding_qmk.md b/docs/understanding_qmk.md
index ba47fc3ad3..ab7834e24a 100644
--- a/docs/understanding_qmk.md
+++ b/docs/understanding_qmk.md
@@ -159,7 +159,6 @@ The `process_record()` function itself is deceptively simple, but hidden within
           * [`bool process_unicodemap(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_unicodemap.c#L42)
           * [`bool process_ucis(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_ucis.c#L70)
       * [`bool process_leader(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_leader.c#L48)
-      * [`bool process_printer(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_printer.c#L77)
       * [`bool process_auto_shift(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_auto_shift.c#L353)
       * [`bool process_dynamic_tapping_term(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_dynamic_tapping_term.c#L35)
       * [`bool process_space_cadet(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/325da02e57fe7374e77b82cb00360ba45167e25c/quantum/process_keycode/process_space_cadet.c#L123)
diff --git a/keyboards/planck/keymaps/thermal_printer/config.h b/keyboards/planck/keymaps/thermal_printer/config.h
deleted file mode 100644
index dd9d6a9d25..0000000000
--- a/keyboards/planck/keymaps/thermal_printer/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
diff --git a/keyboards/planck/keymaps/thermal_printer/keymap.c b/keyboards/planck/keymaps/thermal_printer/keymap.c
deleted file mode 100644
index 6e23014ac5..0000000000
--- a/keyboards/planck/keymaps/thermal_printer/keymap.c
+++ /dev/null
@@ -1,303 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      | Print|no prnt |    |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, PRINT_ON, PRINT_OFF, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-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);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-}
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_SONG(tone_startup);
-}
-
-void shutdown_user()
-{
-    PLAY_SONG(tone_goodbye);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
diff --git a/keyboards/planck/keymaps/thermal_printer/readme.md b/keyboards/planck/keymaps/thermal_printer/readme.md
deleted file mode 100644
index de9680b498..0000000000
--- a/keyboards/planck/keymaps/thermal_printer/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/thermal_printer/rules.mk b/keyboards/planck/keymaps/thermal_printer/rules.mk
deleted file mode 100644
index 3959624376..0000000000
--- a/keyboards/planck/keymaps/thermal_printer/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-PRINTING_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index e3c9321d16..c27a5a732c 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -709,12 +709,10 @@ enum qk_keycode_defines {
     DT_PRNT = 0x7C70,
     DT_UP = 0x7C71,
     DT_DOWN = 0x7C72,
-    PRINT_ON = 0x7C73,
-    PRINT_OFF = 0x7C74,
-    QK_CAPS_WORD_TOGGLE = 0x7C75,
-    QK_AUTOCORRECT_ON = 0x7C76,
-    QK_AUTOCORRECT_OFF = 0x7C77,
-    QK_AUTOCORRECT_TOGGLE = 0x7C78,
+    QK_CAPS_WORD_TOGGLE = 0x7C73,
+    QK_AUTOCORRECT_ON = 0x7C74,
+    QK_AUTOCORRECT_OFF = 0x7C75,
+    QK_AUTOCORRECT_TOGGLE = 0x7C76,
     SAFE_RANGE = 0x7E00,
 
 // Alias
diff --git a/quantum/process_keycode/process_printer.c b/quantum/process_keycode/process_printer.c
deleted file mode 100644
index 6dd1f28c9b..0000000000
--- a/quantum/process_keycode/process_printer.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* Copyright 2016 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 "process_printer.h"
-#include "action_util.h"
-#include "uart.h"
-
-bool    printing_enabled = false;
-uint8_t character_shift  = 0;
-
-void enable_printing(void) {
-    printing_enabled = true;
-    uart_init(19200);
-}
-
-void disable_printing(void) {
-    printing_enabled = false;
-}
-
-uint8_t shifted_numbers[10] = {0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0x28, 0x29};
-
-// uint8_t keycode_to_ascii[0xFF][2];
-
-// keycode_to_ascii[KC_MINUS] = {0x2D, 0x5F};
-
-void print_char(char c) {
-    USB_Disable();
-    uart_write(c);
-    USB_Init();
-}
-
-void print_string(char c[]) {
-    for (uint8_t i = 0; i < strlen(c); i++)
-        print_char(c[i]);
-}
-
-void print_box_string(const char text[]) {
-    size_t len = strlen(text);
-    char   out[len * 3 + 8];
-    out[0] = 0xDA;
-    for (uint8_t i = 0; i < len; i++) {
-        out[i + 1] = 0xC4;
-    }
-    out[len + 1] = 0xBF;
-    out[len + 2] = '\n';
-
-    out[len + 3] = 0xB3;
-    for (uint8_t i = 0; i < len; i++) {
-        out[len + 4 + i] = text[i];
-    }
-    out[len * 2 + 4] = 0xB3;
-    out[len * 2 + 5] = '\n';
-
-    out[len * 2 + 6] = 0xC0;
-    for (uint8_t i = 0; i < len; i++) {
-        out[len * 2 + 7 + i] = 0xC4;
-    }
-    out[len * 3 + 7] = 0xD9;
-    out[len * 3 + 8] = '\n';
-
-    print_string(out);
-}
-
-bool process_printer(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == PRINT_ON) {
-        enable_printing();
-        return false;
-    }
-    if (keycode == PRINT_OFF) {
-        disable_printing();
-        return false;
-    }
-
-    if (printing_enabled) {
-        switch (keycode) {
-            case KC_EXLM ... KC_RPRN:
-            case KC_UNDS:
-            case KC_PLUS:
-            case KC_LCBR:
-            case KC_RCBR:
-            case KC_PIPE:
-            case KC_TILD:
-                keycode &= 0xFF;
-            case KC_LEFT_SHIFT:
-            case KC_RIGHT_SHIFT:
-                if (record->event.pressed) {
-                    character_shift++;
-                } else {
-                    character_shift--;
-                }
-                return false;
-                break;
-        }
-
-        switch (keycode) {
-            case KC_F1:
-                if (record->event.pressed) {
-                    print_box_string("This is a line of text!");
-                }
-                return false;
-            case KC_ESCAPE:
-                if (record->event.pressed) {
-                    print_char(0x1B);
-                }
-                return false;
-                break;
-            case KC_SPACE:
-                if (record->event.pressed) {
-                    print_char(0x20);
-                }
-                return false;
-                break;
-            case KC_A ... KC_Z:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x41 + (keycode - KC_A));
-                    } else {
-                        print_char(0x61 + (keycode - KC_A));
-                    }
-                }
-                return false;
-                break;
-            case KC_1 ... KC_0:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(shifted_numbers[keycode - KC_1]);
-                    } else {
-                        print_char(0x30 + ((keycode - KC_1 + 1) % 10));
-                    }
-                }
-                return false;
-                break;
-            case KC_ENTER:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x0C);
-                    } else {
-                        print_char(0x0A);
-                    }
-                }
-                return false;
-                break;
-            case KC_BACKSPACE:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x18);
-                    } else {
-                        print_char(0x1A);
-                    }
-                }
-                return false;
-                break;
-            case KC_DOT:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x3E);
-                    } else {
-                        print_char(0x2E);
-                    }
-                }
-                return false;
-                break;
-            case KC_COMMA:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x3C);
-                    } else {
-                        print_char(0x2C);
-                    }
-                }
-                return false;
-                break;
-            case KC_SLASH:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x3F);
-                    } else {
-                        print_char(0x2F);
-                    }
-                }
-                return false;
-                break;
-            case KC_QUOTE:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x22);
-                    } else {
-                        print_char(0x27);
-                    }
-                }
-                return false;
-                break;
-            case KC_GRAVE:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7E);
-                    } else {
-                        print_char(0x60);
-                    }
-                }
-                return false;
-                break;
-            case KC_MINUS:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x5F);
-                    } else {
-                        print_char(0x2D);
-                    }
-                }
-                return false;
-                break;
-            case KC_EQUAL:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x2B);
-                    } else {
-                        print_char(0x3D);
-                    }
-                }
-                return false;
-                break;
-            case KC_LEFT_BRACKET:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7B);
-                    } else {
-                        print_char(0x5B);
-                    }
-                }
-                return false;
-                break;
-            case KC_RIGHT_BRACKET:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7D);
-                    } else {
-                        print_char(0x5D);
-                    }
-                }
-                return false;
-                break;
-            case KC_BACKSLASH:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7C);
-                    } else {
-                        print_char(0x5C);
-                    }
-                }
-                return false;
-                break;
-        }
-    }
-    return true;
-}
diff --git a/quantum/process_keycode/process_printer.h b/quantum/process_keycode/process_printer.h
deleted file mode 100644
index 6f4d09f333..0000000000
--- a/quantum/process_keycode/process_printer.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2016 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
-
-#include "quantum.h"
-
-bool process_printer(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_printer_bb.c b/quantum/process_keycode/process_printer_bb.c
deleted file mode 100644
index 88a9f33994..0000000000
--- a/quantum/process_keycode/process_printer_bb.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/* Copyright 2016 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 "process_printer.h"
-#include "action_util.h"
-
-bool    printing_enabled = false;
-uint8_t character_shift  = 0;
-
-#define SERIAL_PIN_DDR DDRD
-#define SERIAL_PIN_PORT PORTD
-#define SERIAL_PIN_MASK _BV(PD3)
-#define SERIAL_DELAY 52
-
-inline static void serial_delay(void) {
-    _delay_us(SERIAL_DELAY);
-}
-
-inline static void serial_high(void) {
-    SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-inline static void serial_low(void) {
-    SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
-}
-
-inline static void serial_output(void) {
-    SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
-}
-
-void enable_printing() {
-    printing_enabled = true;
-    serial_output();
-    serial_high();
-}
-
-void disable_printing() {
-    printing_enabled = false;
-}
-
-uint8_t shifted_numbers[10] = {0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0x28, 0x29};
-
-// uint8_t keycode_to_ascii[0xFF][2];
-
-// keycode_to_ascii[KC_MINUS] = {0x2D, 0x5F};
-
-void print_char(char c) {
-    uint8_t b = 8;
-    serial_output();
-    while (b--) {
-        if (c & (1 << b)) {
-            serial_high();
-        } else {
-            serial_low();
-        }
-        serial_delay();
-    }
-}
-
-void print_string(char c[]) {
-    for (uint8_t i = 0; i < strlen(c); i++)
-        print_char(c[i]);
-}
-
-bool process_printer(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == PRINT_ON) {
-        enable_printing();
-        return false;
-    }
-    if (keycode == PRINT_OFF) {
-        disable_printing();
-        return false;
-    }
-
-    if (printing_enabled) {
-        switch (keycode) {
-            case KC_EXLM ... KC_RPRN:
-            case KC_UNDS:
-            case KC_PLUS:
-            case KC_LCBR:
-            case KC_RCBR:
-            case KC_PIPE:
-            case KC_TILD:
-                keycode &= 0xFF;
-            case KC_LEFT_SHIFT:
-            case KC_RIGHT_SHIFT:
-                if (record->event.pressed) {
-                    character_shift++;
-                } else {
-                    character_shift--;
-                }
-                return false;
-                break;
-        }
-
-        switch (keycode) {
-            case KC_F1:
-                if (record->event.pressed) {
-                    print_string("This is a line of text!\n\n\n");
-                }
-                return false;
-            case KC_ESCAPE:
-                if (record->event.pressed) {
-                    print_char(0x1B);
-                }
-                return false;
-                break;
-            case KC_SPACE:
-                if (record->event.pressed) {
-                    print_char(0x20);
-                }
-                return false;
-                break;
-            case KC_A ... KC_Z:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x41 + (keycode - KC_A));
-                    } else {
-                        print_char(0x61 + (keycode - KC_A));
-                    }
-                }
-                return false;
-                break;
-            case KC_1 ... KC_0:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(shifted_numbers[keycode - KC_1]);
-                    } else {
-                        print_char(0x30 + ((keycode - KC_1 + 1) % 10));
-                    }
-                }
-                return false;
-                break;
-            case KC_ENTER:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x0C);
-                    } else {
-                        print_char(0x0A);
-                    }
-                }
-                return false;
-                break;
-            case KC_BACKSPACE:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x18);
-                    } else {
-                        print_char(0x1A);
-                    }
-                }
-                return false;
-                break;
-            case KC_DOT:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x3E);
-                    } else {
-                        print_char(0x2E);
-                    }
-                }
-                return false;
-                break;
-            case KC_COMMA:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x3C);
-                    } else {
-                        print_char(0x2C);
-                    }
-                }
-                return false;
-                break;
-            case KC_SLASH:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x3F);
-                    } else {
-                        print_char(0x2F);
-                    }
-                }
-                return false;
-                break;
-            case KC_QUOTE:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x22);
-                    } else {
-                        print_char(0x27);
-                    }
-                }
-                return false;
-                break;
-            case KC_GRAVE:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7E);
-                    } else {
-                        print_char(0x60);
-                    }
-                }
-                return false;
-                break;
-            case KC_MINUS:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x5F);
-                    } else {
-                        print_char(0x2D);
-                    }
-                }
-                return false;
-                break;
-            case KC_EQUAL:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x2B);
-                    } else {
-                        print_char(0x3D);
-                    }
-                }
-                return false;
-                break;
-            case KC_LEFT_BRACKET:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7B);
-                    } else {
-                        print_char(0x5B);
-                    }
-                }
-                return false;
-                break;
-            case KC_RIGHT_BRACKET:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7D);
-                    } else {
-                        print_char(0x5D);
-                    }
-                }
-                return false;
-                break;
-            case KC_BACKSLASH:
-                if (record->event.pressed) {
-                    if (character_shift) {
-                        print_char(0x7C);
-                    } else {
-                        print_char(0x5C);
-                    }
-                }
-                return false;
-                break;
-        }
-    }
-    return true;
-}
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 2333357be1..c60ec22d8b 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -316,9 +316,6 @@ bool process_record_quantum(keyrecord_t *record) {
 #ifdef LEADER_ENABLE
             process_leader(keycode, record) &&
 #endif
-#ifdef PRINTING_ENABLE
-            process_printer(keycode, record) &&
-#endif
 #ifdef AUTO_SHIFT_ENABLE
             process_auto_shift(keycode, record) &&
 #endif
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 9c1b9952b8..4192b3fb16 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -121,10 +121,6 @@ extern layer_state_t layer_state;
 #    include "process_tap_dance.h"
 #endif
 
-#ifdef PRINTING_ENABLE
-#    include "process_printer.h"
-#endif
-
 #ifdef AUTO_SHIFT_ENABLE
 #    include "process_auto_shift.h"
 #endif

From fd4c3f46fb31c6b095607706808a58ba068536bf Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 5 Nov 2022 16:58:30 +0000
Subject: [PATCH 798/959] Align dynamic tapping term keycode names (#18963)

* Align dynamic tapping term keycode names

* regen header
---
 .../keycodes/keycodes_0.0.1_quantum.hjson         | 15 ++++++++++++---
 docs/keycodes.md                                  | 10 +++++-----
 docs/tap_hold.md                                  | 10 +++++-----
 quantum/keycodes.h                                | 10 +++++++---
 .../process_dynamic_tapping_term.c                |  6 +++---
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
index 1f3d2c70cd..e3db45be71 100644
--- a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
@@ -411,15 +411,24 @@
 
         "0x7C70": {
             "group": "quantum",
-            "key": "DT_PRNT"
+            "key": "QK_DYNAMIC_TAPPING_TERM_PRINT",
+            "aliases": [
+                "DT_PRNT"
+            ]
         },
         "0x7C71": {
             "group": "quantum",
-            "key": "DT_UP"
+            "key": "QK_DYNAMIC_TAPPING_TERM_UP",
+            "aliases": [
+                "DT_UP"
+            ]
         },
         "0x7C72": {
             "group": "quantum",
-            "key": "DT_DOWN"
+            "key": "QK_DYNAMIC_TAPPING_TERM_DOWN",
+            "aliases": [
+                "DT_DOWN"
+            ]
         },
 
         "0x7C73": {
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 3cde934828..bca0615b64 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -669,11 +669,11 @@ See also: [Mod-Tap](mod_tap.md)
 
 See also: [Dynamic Tapping Term](tap_hold#dynamic-tapping-term)
 
-| Key         | Description                                                                                                            |
-|-------------|------------------------------------------------------------------------------------------------------------------------|
-| `DT_PRNT`   | "Dynamic Tapping Term Print": Types the current tapping term, in milliseconds                                          |
-| `DT_UP`     | "Dynamic Tapping Term Up": Increases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default)   |
-| `DT_DOWN`   | "Dynamic Tapping Term Down": Decreases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default) |
+| Key                           | Aliases | Description                                                                               |
+|-------------------------------|---------|-------------------------------------------------------------------------------------------|
+|`QK_DYNAMIC_TAPPING_TERM_PRINT`|`DT_PRNT`| Types the current tapping term, in milliseconds                                           |
+|`QK_DYNAMIC_TAPPING_TERM_UP`   |`DT_UP`  | Increases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default) |
+|`QK_DYNAMIC_TAPPING_TERM_DOWN` |`DT_DOWN`| Decreases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default) |
 
 ## RGB Lighting :id=rgb-lighting
 
diff --git a/docs/tap_hold.md b/docs/tap_hold.md
index c8b708e2c9..8914b730b3 100644
--- a/docs/tap_hold.md
+++ b/docs/tap_hold.md
@@ -42,11 +42,11 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 
 `DYNAMIC_TAPPING_TERM_ENABLE` is a feature you can enable in `rules.mk` that lets you use three special keys in your keymap to configure the tapping term on the fly.
 
-| Key         | Description                                                                                                            |
-|-------------|------------------------------------------------------------------------------------------------------------------------|
-| `DT_PRNT`   | "Dynamic Tapping Term Print": Types the current tapping term, in milliseconds                                          |
-| `DT_UP`     | "Dynamic Tapping Term Up": Increases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default)   |
-| `DT_DOWN`   | "Dynamic Tapping Term Down": Decreases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default) |
+| Key                           | Aliases | Description                                                                               |
+|-------------------------------|---------|-------------------------------------------------------------------------------------------|
+|`QK_DYNAMIC_TAPPING_TERM_PRINT`|`DT_PRNT`| Types the current tapping term, in milliseconds                                           |
+|`QK_DYNAMIC_TAPPING_TERM_UP`   |`DT_UP`  | Increases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default) |
+|`QK_DYNAMIC_TAPPING_TERM_DOWN` |`DT_DOWN`| Decreases the current tapping term by `DYNAMIC_TAPPING_TERM_INCREMENT`ms (5ms by default) |
 
 Set the tapping term as usual with `#define TAPPING_TERM <value>` in `config.h` and add `DYNAMIC_TAPPING_TERM_ENABLE = yes` in `rules.mk`. Then, place the above three keys somewhere in your keymap and flash the new firmware onto your board.
 
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index c27a5a732c..2ef94f5d3e 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -706,9 +706,9 @@ enum qk_keycode_defines {
     QK_SECURE_UNLOCK = 0x7C61,
     QK_SECURE_TOGGLE = 0x7C62,
     QK_SECURE_REQUEST = 0x7C63,
-    DT_PRNT = 0x7C70,
-    DT_UP = 0x7C71,
-    DT_DOWN = 0x7C72,
+    QK_DYNAMIC_TAPPING_TERM_PRINT = 0x7C70,
+    QK_DYNAMIC_TAPPING_TERM_UP = 0x7C71,
+    QK_DYNAMIC_TAPPING_TERM_DOWN = 0x7C72,
     QK_CAPS_WORD_TOGGLE = 0x7C73,
     QK_AUTOCORRECT_ON = 0x7C74,
     QK_AUTOCORRECT_OFF = 0x7C75,
@@ -1088,6 +1088,9 @@ enum qk_keycode_defines {
     SE_UNLK    = QK_SECURE_UNLOCK,
     SE_TOGG    = QK_SECURE_TOGGLE,
     SE_REQ     = QK_SECURE_REQUEST,
+    DT_PRNT    = QK_DYNAMIC_TAPPING_TERM_PRINT,
+    DT_UP      = QK_DYNAMIC_TAPPING_TERM_UP,
+    DT_DOWN    = QK_DYNAMIC_TAPPING_TERM_DOWN,
     CW_TOGG    = QK_CAPS_WORD_TOGGLE,
     AC_ON      = QK_AUTOCORRECT_ON,
     AC_OFF     = QK_AUTOCORRECT_OFF,
@@ -1142,3 +1145,4 @@ enum qk_keycode_defines {
 #define IS_BACKLIGHT_KEYCODE(code) ((code) >= BL_ON && (code) <= BL_BRTG)
 #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
 #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE)
+
diff --git a/quantum/process_keycode/process_dynamic_tapping_term.c b/quantum/process_keycode/process_dynamic_tapping_term.c
index b682f34da6..146b9fccd7 100644
--- a/quantum/process_keycode/process_dynamic_tapping_term.c
+++ b/quantum/process_keycode/process_dynamic_tapping_term.c
@@ -35,15 +35,15 @@ static void tapping_term_report(void) {
 bool process_dynamic_tapping_term(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
-            case DT_PRNT:
+            case QK_DYNAMIC_TAPPING_TERM_PRINT:
                 tapping_term_report();
                 return false;
 
-            case DT_UP:
+            case QK_DYNAMIC_TAPPING_TERM_UP:
                 g_tapping_term += DYNAMIC_TAPPING_TERM_INCREMENT;
                 return false;
 
-            case DT_DOWN:
+            case QK_DYNAMIC_TAPPING_TERM_DOWN:
                 g_tapping_term -= DYNAMIC_TAPPING_TERM_INCREMENT;
                 return false;
         }

From 69fa02c37d296273c47a5cc0767ca9e6b7170a47 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 5 Nov 2022 17:05:19 +0000
Subject: [PATCH 799/959] Align audio keycode names (#18962)

* Align audio keycode names

* Update docs

* Update quantum
---
 .../keycodes/keycodes_0.0.1_audio.hjson       | 58 +++++++++++----
 docs/feature_audio.md                         | 71 ++++++++++++-------
 docs/keycodes.md                              | 30 ++++----
 quantum/keycodes.h                            | 53 ++++++++------
 quantum/process_keycode/process_audio.c       | 10 +--
 quantum/process_keycode/process_clicky.c      | 16 ++---
 quantum/process_keycode/process_music.c       |  8 +--
 quantum/quantum_keycodes_legacy.h             | 12 ++++
 8 files changed, 165 insertions(+), 93 deletions(-)

diff --git a/data/constants/keycodes/keycodes_0.0.1_audio.hjson b/data/constants/keycodes/keycodes_0.0.1_audio.hjson
index d26e515682..e1d3ac3a0f 100644
--- a/data/constants/keycodes/keycodes_0.0.1_audio.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_audio.hjson
@@ -2,55 +2,64 @@
     "keycodes": {
         "0x7480": {
             "group": "audio",
-            "key": "AU_ON"
+            "key": "QK_AUDIO_ON",
+            "aliases": [
+                "AU_ON"
+            ]
         },
         "0x7481": {
             "group": "audio",
-            "key": "AU_OFF"
+            "key": "QK_AUDIO_OFF",
+            "aliases": [
+                "AU_OFF"
+            ]
         },
         "0x7482": {
             "group": "audio",
-            "key": "AU_TOG"
+            "key": "QK_AUDIO_TOGGLE",
+            "aliases": [
+                "AU_TOGG"
+            ]
         },
 
         "0x748A": {
             "group": "audio",
-            "key": "CLICKY_TOGGLE",
+            "key": "QK_AUDIO_CLICKY_TOGGLE",
             "aliases": [
                 "CK_TOGG"
             ]
         },
         "0x748B": {
             "group": "audio",
-            "key": "CLICKY_ENABLE",
+            "key": "QK_AUDIO_CLICKY_ON",
             "aliases": [
                 "CK_ON"
             ]
         },
         "0x748C": {
             "group": "audio",
-            "key": "CLICKY_DISABLE",
+            "key": "QK_AUDIO_CLICKY_OFF",
             "aliases": [
                 "CK_OFF"
             ]
         },
         "0x748D": {
             "group": "audio",
-            "key": "CLICKY_UP",
+            "key": "QK_AUDIO_CLICKY_UP",
             "aliases": [
                 "CK_UP"
             ]
         },
         "0x748E": {
             "group": "audio",
-            "key": "CLICKY_DOWN",
+            "key": "QK_AUDIO_CLICKY_DOWN",
             "aliases": [
                 "CK_DOWN"
             ]
         },
         "0x748F": {
             "group": "audio",
-            "key": "CLICKY_RESET",
+            "key": "QK_AUDIO_CLICKY_RESET",
             "aliases": [
                 "CK_RST"
             ]
@@ -58,27 +67,46 @@
 
         "0x7490": {
             "group": "audio",
-            "key": "MU_ON"
+            "key": "QK_MUSIC_ON",
+            "aliases": [
+                "MU_ON"
+            ]
         },
         "0x7491": {
             "group": "audio",
-            "key": "MU_OFF"
+            "key": "QK_MUSIC_OFF",
+            "aliases": [
+                "MU_OFF"
+            ]
         },
         "0x7492": {
             "group": "audio",
-            "key": "MU_TOG"
+            "key": "QK_MUSIC_TOGGLE",
+            "aliases": [
+                "MU_TOGG"
+            ]
         },
         "0x7493": {
             "group": "audio",
-            "key": "MU_MOD"
+            "key": "QK_MUSIC_MODE_NEXT",
+            "aliases": [
+                "MU_NEXT"
+            ]
         },
+
         "0x7494": {
             "group": "audio",
-            "key": "MUV_IN"
+            "key": "QK_AUDIO_VOICE_NEXT",
+            "aliases": [
+                "AU_NEXT"
+            ]
         },
         "0x7495": {
             "group": "audio",
-            "key": "MUV_DE"
+            "key": "QK_AUDIO_VOICE_PREVIOUS",
+            "aliases": [
+                "AU_PREV"
+            ]
         }
     }
 }
diff --git a/docs/feature_audio.md b/docs/feature_audio.md
index 8c02f7c153..5227d063c3 100644
--- a/docs/feature_audio.md
+++ b/docs/feature_audio.md
@@ -161,9 +161,11 @@ It's advised that you wrap all audio features in `#ifdef AUDIO_ENABLE` / `#endif
 
 The available keycodes for audio are: 
 
-* `AU_ON` - Turn Audio Feature on
-* `AU_OFF` - Turn Audio Feature off
-* `AU_TOG` - Toggle Audio Feature state
+|Key                      |Aliases  |Description                                |
+|-------------------------|---------|-------------------------------------------|
+|`QK_AUDIO_ON`            |`AU_ON`  |Turns on Audio Feature                     |
+|`QK_AUDIO_OFF`           |`AU_OFF` |Turns off Audio Feature                    |
+|`QK_AUDIO_TOGGLE`        |`AU_TOGG`|Toggles Audio state                        |
 
 !> These keycodes turn all of the audio functionality on and off.  Turning it off means that audio feedback, audio clicky, music mode, etc. are disabled, completely.
 
@@ -219,6 +221,12 @@ Aka "audio effects", different ones can be enabled by setting in `config.h` thes
 `#define AUDIO_VOICES` to enable the feature, and `#define AUDIO_VOICE_DEFAULT something` to select a specific effect
 for details see quantum/audio/voices.h and .c
 
+Keycodes available:
+
+|Key                      |Aliases  |Description                                |
+|-------------------------|---------|-------------------------------------------|
+|`QK_AUDIO_VOICE_NEXT`    |`AU_NEXT`|Cycles through the audio voices            |
+|`QK_AUDIO_VOICE_PREVIOUS`|`AU_PREV`|Cycles through the audio voices in reverse |
 
 ## Music Mode
 
@@ -228,10 +236,14 @@ Recording is experimental due to some memory issues - if you experience some wei
 
 Keycodes available:
 
-* `MU_ON` - Turn music mode on
-* `MU_OFF` - Turn music mode off
-* `MU_TOG` - Toggle music mode
-* `MU_MOD` - Cycle through the music modes:
+|Key                      |Aliases  |Description                                |
+|-------------------------|---------|-------------------------------------------|
+|`QK_MUSIC_ON`            |`MU_ON`  |Turns on Music Mode                        |
+|`QK_MUSIC_OFF`           |`MU_OFF` |Turns off Music Mode                       |
+|`QK_MUSIC_TOGGLE`        |`MU_TOGG`|Toggles Music Mode                         |
+|`QK_MUSIC_MODE_NEXT`     |`MU_NEXT`|Cycles through the music modes             |
+
+Available Modes:
   * `CHROMATIC_MODE` - Chromatic scale, row changes the octave
   * `GUITAR_MODE` - Chromatic scale, but the row changes the string (+5 st)
   * `VIOLIN_MODE` - Chromatic scale, but the row changes the string (+7 st)
@@ -300,13 +312,16 @@ You can look at the [Planck Keyboard](https://github.com/qmk/qmk_firmware/blob/e
 
 This adds a click sound each time you hit a button, to simulate click sounds from the keyboard. And the sounds are slightly different for each keypress, so it doesn't sound like a single long note, if you type rapidly. 
 
-* `CK_TOGG` - Toggles the status (will play sound if enabled)
-* `CK_ON` - Turns on Audio Click (plays sound)
-* `CK_OFF` - Turns off Audio Click (doesn't play sound)
-* `CK_RST` - Resets the frequency to the default state (plays sound at default frequency)
-* `CK_UP` - Increases the frequency of the clicks (plays sound at new frequency)
-* `CK_DOWN` - Decreases the frequency of the clicks (plays sound at new frequency)
+Keycodes available:
 
+|Key                      |Aliases  |Description                                |
+|-------------------------|---------|-------------------------------------------|
+|`QK_AUDIO_CLICKY_TOGGLE` |`CK_TOGG`|Toggles Audio clicky mode                  |
+|`QK_AUDIO_CLICKY_ON`     |`CK_ON`  |Turns on Audio clicky mode                 |
+|`QK_AUDIO_CLICKY_OFF`    |`CK_OFF` |Turns on Audio clicky mode                 |
+|`QK_AUDIO_CLICKY_UP`     |`CK_UP`  |Increases frequency of the clicks          |
+|`QK_AUDIO_CLICKY_DOWN`   |`CK_DOWN`|Decreases frequency of the clicks          |
+|`QK_AUDIO_CLICKY_RESET`  |`CK_RST` |Resets frequency to default                |
 
 The feature is disabled by default, to save space.  To enable it, add this to your `config.h`:
 
@@ -333,16 +348,20 @@ See [MIDI](feature_midi.md)
 
 ## Audio Keycodes
 
-|Key             |Aliases  |Description                       |
-|----------------|---------|----------------------------------|
-|`AU_ON`         |         |Audio mode on                     |
-|`AU_OFF`        |         |Audio mode off                    |
-|`AU_TOG`        |         |Toggles Audio mode                |
-|`CLICKY_TOGGLE` |`CK_TOGG`|Toggles Audio clicky mode         |
-|`CLICKY_UP`     |`CK_UP`  |Increases frequency of the clicks |
-|`CLICKY_DOWN`   |`CK_DOWN`|Decreases frequency of the clicks |
-|`CLICKY_RESET`  |`CK_RST` |Resets frequency to default       |
-|`MU_ON`         |         |Turns on Music Mode               |
-|`MU_OFF`        |         |Turns off Music Mode              |
-|`MU_TOG`        |         |Toggles Music Mode                |
-|`MU_MOD`        |         |Cycles through the music modes    |
+|Key                      |Aliases  |Description                                |
+|-------------------------|---------|-------------------------------------------|
+|`QK_AUDIO_ON`            |`AU_ON`  |Turns on Audio Feature                     |
+|`QK_AUDIO_OFF`           |`AU_OFF` |Turns off Audio Feature                    |
+|`QK_AUDIO_TOGGLE`        |`AU_TOGG`|Toggles Audio state                        |
+|`QK_AUDIO_CLICKY_TOGGLE` |`CK_TOGG`|Toggles Audio clicky mode                  |
+|`QK_AUDIO_CLICKY_ON`     |`CK_ON`  |Turns on Audio clicky mode                 |
+|`QK_AUDIO_CLICKY_OFF`    |`CK_OFF` |Turns on Audio clicky mode                 |
+|`QK_AUDIO_CLICKY_UP`     |`CK_UP`  |Increases frequency of the clicks          |
+|`QK_AUDIO_CLICKY_DOWN`   |`CK_DOWN`|Decreases frequency of the clicks          |
+|`QK_AUDIO_CLICKY_RESET`  |`CK_RST` |Resets frequency to default                |
+|`QK_MUSIC_ON`            |`MU_ON`  |Turns on Music Mode                        |
+|`QK_MUSIC_OFF`           |`MU_OFF` |Turns off Music Mode                       |
+|`QK_MUSIC_TOGGLE`        |`MU_TOGG`|Toggles Music Mode                         |
+|`QK_MUSIC_MODE_NEXT`     |`MU_NEXT`|Cycles through the music modes             |
+|`QK_AUDIO_VOICE_NEXT`    |`AU_NEXT`|Cycles through the audio voices            |
+|`QK_AUDIO_VOICE_PREVIOUS`|`AU_PREV`|Cycles through the audio voices in reverse |
diff --git a/docs/keycodes.md b/docs/keycodes.md
index bca0615b64..d185fe38c0 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -233,19 +233,23 @@ See also: [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes)
 
 See also: [Audio](feature_audio.md)
 
-|Key             |Aliases  |Description                       |
-|----------------|---------|----------------------------------|
-|`AU_ON`         |         |Turns on Audio Feature            |
-|`AU_OFF`        |         |Turns off Audio Feature           |
-|`AU_TOG`        |         |Toggles Audio state               |
-|`CLICKY_TOGGLE` |`CK_TOGG`|Toggles Audio clicky mode         |
-|`CLICKY_UP`     |`CK_UP`  |Increases frequency of the clicks |
-|`CLICKY_DOWN`   |`CK_DOWN`|Decreases frequency of the clicks |
-|`CLICKY_RESET`  |`CK_RST` |Resets frequency to default       |
-|`MU_ON`         |         |Turns on Music Mode               |
-|`MU_OFF`        |         |Turns off Music Mode              |
-|`MU_TOG`        |         |Toggles Music Mode                |
-|`MU_MOD`        |         |Cycles through the music modes    |
+|Key                      |Aliases  |Description                                |
+|-------------------------|---------|-------------------------------------------|
+|`QK_AUDIO_ON`            |`AU_ON`  |Turns on Audio Feature                     |
+|`QK_AUDIO_OFF`           |`AU_OFF` |Turns off Audio Feature                    |
+|`QK_AUDIO_TOGGLE`        |`AU_TOGG`|Toggles Audio state                        |
+|`QK_AUDIO_CLICKY_TOGGLE` |`CK_TOGG`|Toggles Audio clicky mode                  |
+|`QK_AUDIO_CLICKY_ON`     |`CK_ON`  |Turns on Audio clicky mode                 |
+|`QK_AUDIO_CLICKY_OFF`    |`CK_OFF` |Turns on Audio clicky mode                 |
+|`QK_AUDIO_CLICKY_UP`     |`CK_UP`  |Increases frequency of the clicks          |
+|`QK_AUDIO_CLICKY_DOWN`   |`CK_DOWN`|Decreases frequency of the clicks          |
+|`QK_AUDIO_CLICKY_RESET`  |`CK_RST` |Resets frequency to default                |
+|`QK_MUSIC_ON`            |`MU_ON`  |Turns on Music Mode                        |
+|`QK_MUSIC_OFF`           |`MU_OFF` |Turns off Music Mode                       |
+|`QK_MUSIC_TOGGLE`        |`MU_TOGG`|Toggles Music Mode                         |
+|`QK_MUSIC_MODE_NEXT`     |`MU_NEXT`|Cycles through the music modes             |
+|`QK_AUDIO_VOICE_NEXT`    |`AU_NEXT`|Cycles through the audio voices            |
+|`QK_AUDIO_VOICE_PREVIOUS`|`AU_PREV`|Cycles through the audio voices in reverse |
 
 ## Auto Shift :id=auto-shift
 
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index 2ef94f5d3e..ec07648ab5 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -563,21 +563,21 @@ enum qk_keycode_defines {
     QK_PROGRAMMABLE_BUTTON_30 = 0x745D,
     QK_PROGRAMMABLE_BUTTON_31 = 0x745E,
     QK_PROGRAMMABLE_BUTTON_32 = 0x745F,
-    AU_ON = 0x7480,
-    AU_OFF = 0x7481,
-    AU_TOG = 0x7482,
-    CLICKY_TOGGLE = 0x748A,
-    CLICKY_ENABLE = 0x748B,
-    CLICKY_DISABLE = 0x748C,
-    CLICKY_UP = 0x748D,
-    CLICKY_DOWN = 0x748E,
-    CLICKY_RESET = 0x748F,
-    MU_ON = 0x7490,
-    MU_OFF = 0x7491,
-    MU_TOG = 0x7492,
-    MU_MOD = 0x7493,
-    MUV_IN = 0x7494,
-    MUV_DE = 0x7495,
+    QK_AUDIO_ON = 0x7480,
+    QK_AUDIO_OFF = 0x7481,
+    QK_AUDIO_TOGGLE = 0x7482,
+    QK_AUDIO_CLICKY_TOGGLE = 0x748A,
+    QK_AUDIO_CLICKY_ON = 0x748B,
+    QK_AUDIO_CLICKY_OFF = 0x748C,
+    QK_AUDIO_CLICKY_UP = 0x748D,
+    QK_AUDIO_CLICKY_DOWN = 0x748E,
+    QK_AUDIO_CLICKY_RESET = 0x748F,
+    QK_MUSIC_ON = 0x7490,
+    QK_MUSIC_OFF = 0x7491,
+    QK_MUSIC_TOGGLE = 0x7492,
+    QK_MUSIC_MODE_NEXT = 0x7493,
+    QK_AUDIO_VOICE_NEXT = 0x7494,
+    QK_AUDIO_VOICE_PREVIOUS = 0x7495,
     QK_STENO_BOLT = 0x74F0,
     QK_STENO_GEMINI = 0x74F1,
     QK_STENO_COMB = 0x74F2,
@@ -992,12 +992,21 @@ enum qk_keycode_defines {
     PB_30      = QK_PROGRAMMABLE_BUTTON_30,
     PB_31      = QK_PROGRAMMABLE_BUTTON_31,
     PB_32      = QK_PROGRAMMABLE_BUTTON_32,
-    CK_TOGG    = CLICKY_TOGGLE,
-    CK_ON      = CLICKY_ENABLE,
-    CK_OFF     = CLICKY_DISABLE,
-    CK_UP      = CLICKY_UP,
-    CK_DOWN    = CLICKY_DOWN,
-    CK_RST     = CLICKY_RESET,
+    AU_ON      = QK_AUDIO_ON,
+    AU_OFF     = QK_AUDIO_OFF,
+    AU_TOGG    = QK_AUDIO_TOGGLE,
+    CK_TOGG    = QK_AUDIO_CLICKY_TOGGLE,
+    CK_ON      = QK_AUDIO_CLICKY_ON,
+    CK_OFF     = QK_AUDIO_CLICKY_OFF,
+    CK_UP      = QK_AUDIO_CLICKY_UP,
+    CK_DOWN    = QK_AUDIO_CLICKY_DOWN,
+    CK_RST     = QK_AUDIO_CLICKY_RESET,
+    MU_ON      = QK_MUSIC_ON,
+    MU_OFF     = QK_MUSIC_OFF,
+    MU_TOGG    = QK_MUSIC_TOGGLE,
+    MU_NEXT    = QK_MUSIC_MODE_NEXT,
+    AU_NEXT    = QK_AUDIO_VOICE_NEXT,
+    AU_PREV    = QK_AUDIO_VOICE_PREVIOUS,
     MC_0       = QK_MACRO_0,
     MC_1       = QK_MACRO_1,
     MC_2       = QK_MACRO_2,
@@ -1139,7 +1148,7 @@ enum qk_keycode_defines {
 #define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR)
 #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31)
 #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32)
-#define IS_AUDIO_KEYCODE(code) ((code) >= AU_ON && (code) <= MUV_DE)
+#define IS_AUDIO_KEYCODE(code) ((code) >= QK_AUDIO_ON && (code) <= QK_AUDIO_VOICE_PREVIOUS)
 #define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX)
 #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31)
 #define IS_BACKLIGHT_KEYCODE(code) ((code) >= BL_ON && (code) <= BL_BRTG)
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index e7fe453308..03b0af9277 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -16,17 +16,17 @@ float compute_freq_for_midi_note(uint8_t note) {
 }
 
 bool process_audio(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == AU_ON && record->event.pressed) {
+    if (keycode == QK_AUDIO_ON && record->event.pressed) {
         audio_on();
         return false;
     }
 
-    if (keycode == AU_OFF && record->event.pressed) {
+    if (keycode == QK_AUDIO_OFF && record->event.pressed) {
         audio_off();
         return false;
     }
 
-    if (keycode == AU_TOG && record->event.pressed) {
+    if (keycode == QK_AUDIO_TOGGLE && record->event.pressed) {
         if (is_audio_on()) {
             audio_off();
         } else {
@@ -35,13 +35,13 @@ bool process_audio(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
 
-    if (keycode == MUV_IN && record->event.pressed) {
+    if (keycode == QK_AUDIO_VOICE_NEXT && record->event.pressed) {
         voice_iterate();
         PLAY_SONG(voice_change_song);
         return false;
     }
 
-    if (keycode == MUV_DE && record->event.pressed) {
+    if (keycode == QK_AUDIO_VOICE_PREVIOUS && record->event.pressed) {
         voice_deiterate();
         PLAY_SONG(voice_change_song);
         return false;
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index 9795734984..b662a3f2f4 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -82,31 +82,31 @@ bool is_clicky_on(void) {
 }
 
 bool process_clicky(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == CLICKY_TOGGLE && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_TOGGLE && record->event.pressed) {
         clicky_toggle();
     }
 
-    if (keycode == CLICKY_ENABLE && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_ON && record->event.pressed) {
         clicky_on();
     }
-    if (keycode == CLICKY_DISABLE && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_OFF && record->event.pressed) {
         clicky_off();
     }
 
-    if (keycode == CLICKY_RESET && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_RESET && record->event.pressed) {
         clicky_freq_reset();
     }
 
-    if (keycode == CLICKY_UP && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_UP && record->event.pressed) {
         clicky_freq_up();
     }
-    if (keycode == CLICKY_DOWN && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_DOWN && record->event.pressed) {
         clicky_freq_down();
     }
 
     if (audio_config.enable && audio_config.clicky_enable) {
-        if (record->event.pressed) {                      // Leave this separate so it's easier to add upstroke sound
-            if (keycode != AU_OFF && keycode != AU_TOG) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
+        if (record->event.pressed) {                                 // Leave this separate so it's easier to add upstroke sound
+            if (keycode != QK_AUDIO_ON && keycode != QK_AUDIO_OFF) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
                 clicky_play();
             }
         }
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index eeec0c28a4..950aec22f9 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -101,17 +101,17 @@ void music_all_notes_off(void) {
 }
 
 bool process_music(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == MU_ON && record->event.pressed) {
+    if (keycode == QK_MUSIC_ON && record->event.pressed) {
         music_on();
         return false;
     }
 
-    if (keycode == MU_OFF && record->event.pressed) {
+    if (keycode == QK_MUSIC_OFF && record->event.pressed) {
         music_off();
         return false;
     }
 
-    if (keycode == MU_TOG && record->event.pressed) {
+    if (keycode == QK_MUSIC_TOGGLE && record->event.pressed) {
         if (music_activated) {
             music_off();
         } else {
@@ -139,7 +139,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
 
-    if (keycode == MU_MOD && record->event.pressed) {
+    if (keycode == QK_MUSIC_MODE_NEXT && record->event.pressed) {
         music_mode_cycle();
         return false;
     }
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 8f325251bc..44044ec625 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -123,6 +123,18 @@
 #define KC_RAPC QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE
 #define KC_SFTENT QK_SPACE_CADET_RIGHT_SHIFT_ENTER
 
+#define AU_TOG QK_AUDIO_TOGGLE
+#define CLICKY_TOGGLE QK_AUDIO_CLICKY_TOGGLE
+#define CLICKY_ENABLE QK_AUDIO_CLICKY_ON
+#define CLICKY_DISABLE QK_AUDIO_CLICKY_OFF
+#define CLICKY_UP QK_AUDIO_CLICKY_UP
+#define CLICKY_DOWN QK_AUDIO_CLICKY_DOWN
+#define CLICKY_RESET QK_AUDIO_CLICKY_RESET
+#define MU_TOG QK_MUSIC_TOGGLE
+#define MU_MOD QK_MUSIC_MODE_NEXT
+#define MUV_IN QK_AUDIO_VOICE_NEXT
+#define MUV_DE QK_AUDIO_VOICE_PREVIOUS
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")

From e3a97eb1c8b97ff37412913e53f34cb7918497f1 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 5 Nov 2022 10:55:42 -0700
Subject: [PATCH 800/959] [Keyboard] Add Work Louder Numpad (#18912)

* [Keyboard] Add Work Louder Numpad

* Add future proofing for rgb matrix

* Update readme

* fixup copyright headers

* Actually enable via
---
 keyboards/work_louder/numpad/config.h         | 33 +++++++
 keyboards/work_louder/numpad/info.json        | 92 +++++++++++++++++++
 .../numpad/keymaps/default/keymap.c           | 24 +++++
 .../work_louder/numpad/keymaps/via/keymap.c   | 24 +++++
 .../work_louder/numpad/keymaps/via/rules.mk   |  1 +
 keyboards/work_louder/numpad/readme.md        | 27 ++++++
 keyboards/work_louder/numpad/rules.mk         |  1 +
 7 files changed, 202 insertions(+)
 create mode 100644 keyboards/work_louder/numpad/config.h
 create mode 100644 keyboards/work_louder/numpad/info.json
 create mode 100644 keyboards/work_louder/numpad/keymaps/default/keymap.c
 create mode 100644 keyboards/work_louder/numpad/keymaps/via/keymap.c
 create mode 100644 keyboards/work_louder/numpad/keymaps/via/rules.mk
 create mode 100644 keyboards/work_louder/numpad/readme.md
 create mode 100644 keyboards/work_louder/numpad/rules.mk

diff --git a/keyboards/work_louder/numpad/config.h b/keyboards/work_louder/numpad/config.h
new file mode 100644
index 0000000000..7cf84a7d18
--- /dev/null
+++ b/keyboards/work_louder/numpad/config.h
@@ -0,0 +1,33 @@
+// Copyright 2022 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+
+// #define RGB_DI_PIN D1
+#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT DRIVER_LED_TOTAL
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+#define RGB_MATRIX_DISABLE_KEYCODES
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGBLIGHT_DI_PIN D2
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9
+#define RGBLIGHT_DEFAULT_HUE 213
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/info.json
new file mode 100644
index 0000000000..b5117c91d3
--- /dev/null
+++ b/keyboards/work_louder/numpad/info.json
@@ -0,0 +1,92 @@
+{
+    "manufacturer": "Work Louder",
+    "keyboard_name": "numpad",
+    "maintainer": "Drashna Jael're",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6", "C7"],
+        "rows": ["F1", "F4", "F5", "F6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://worklouder.cc",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x99EB",
+        "vid": "0x574C"
+    },
+    "build": {
+        "lto": true
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 1, "matrix": [3, 3], "x": 141, "y": 64 },
+            { "flags": 1, "matrix": [3, 2], "x": 122, "y": 64 },
+            { "flags": 1, "matrix": [3, 1], "x": 103, "y": 64 },
+            { "flags": 4, "matrix": [3, 0], "x": 84, "y": 64 },
+            { "flags": 1, "matrix": [2, 0], "x": 84, "y": 45 },
+            { "flags": 1, "matrix": [2, 1], "x": 103, "y": 45 },
+            { "flags": 1, "matrix": [2, 2], "x": 122, "y": 45 },
+            { "flags": 4, "matrix": [2, 3], "x": 141, "y": 45 },
+            { "flags": 1, "matrix": [1, 3], "x": 141, "y": 26 },
+            { "flags": 1, "matrix": [1, 2], "x": 122, "y": 26 },
+            { "flags": 1, "matrix": [1, 1], "x": 103, "y": 26 },
+            { "flags": 4, "matrix": [1, 0], "x": 84, "y": 26 },
+            { "flags": 1, "matrix": [0, 0], "x": 84, "y": 7 },
+            { "flags": 4, "matrix": [0, 1], "x": 103, "y": 7 },
+            { "flags": 4, "matrix": [0, 2], "x": 122, "y": 7 },
+            { "flags": 4, "matrix": [0, 3], "x": 141, "y": 7 }
+        ]
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 8,
+        "hue_steps": 8,
+        "led_count": 8,
+        "max_brightness": 255,
+        "pin": "D1",
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/work_louder/numpad/keymaps/default/keymap.c b/keyboards/work_louder/numpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f4962b8be7
--- /dev/null
+++ b/keyboards/work_louder/numpad/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2022 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┐
+     * │ 7 │ 8 │ 9 │ / │
+     * ├───┼───┼───┼───┤
+     * │ 4 │ 5 │ 6 │ * │
+     * ├───┼───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ - │
+     * ├───┼───┼───┼───┤
+     * │ 0 │ . │Ent│ + │
+     * └───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_4x4(
+        KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
+        KC_P4,   KC_P5,   KC_P6,   KC_PAST,
+        KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
+        KC_P0,   KC_PDOT, KC_PENT, KC_PPLS
+    )
+};
diff --git a/keyboards/work_louder/numpad/keymaps/via/keymap.c b/keyboards/work_louder/numpad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f4962b8be7
--- /dev/null
+++ b/keyboards/work_louder/numpad/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2022 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┐
+     * │ 7 │ 8 │ 9 │ / │
+     * ├───┼───┼───┼───┤
+     * │ 4 │ 5 │ 6 │ * │
+     * ├───┼───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ - │
+     * ├───┼───┼───┼───┤
+     * │ 0 │ . │Ent│ + │
+     * └───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_4x4(
+        KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
+        KC_P4,   KC_P5,   KC_P6,   KC_PAST,
+        KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
+        KC_P0,   KC_PDOT, KC_PENT, KC_PPLS
+    )
+};
diff --git a/keyboards/work_louder/numpad/keymaps/via/rules.mk b/keyboards/work_louder/numpad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/work_louder/numpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/work_louder/numpad/readme.md b/keyboards/work_louder/numpad/readme.md
new file mode 100644
index 0000000000..a7e6b488da
--- /dev/null
+++ b/keyboards/work_louder/numpad/readme.md
@@ -0,0 +1,27 @@
+# Work Louder Num Pad
+
+![work_louder/numpad](https://worklouder.cc/wp-content/uploads/2022/08/Numpad-WP.png)
+
+*An ATmega32u4 based 4x4 number pad with per key and underglow RGB*
+
+* Keyboard Maintainer: [Drashna Jael're](https://github.com/drashna)
+* Hardware Supported: An ATmega32u4 based 4x4 number pad with per key and underglow RGB
+* Hardware Availability: [Work Louder](https://shop.worklouder.cc/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make work_louder/numpad:default
+
+Flashing example for this keyboard:
+
+    make work_louder/numpad:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/work_louder/numpad/rules.mk b/keyboards/work_louder/numpad/rules.mk
new file mode 100644
index 0000000000..e0822c009b
--- /dev/null
+++ b/keyboards/work_louder/numpad/rules.mk
@@ -0,0 +1 @@
+SRC += rgb_functions.c

From 352beeac2f62edf1f3288a2a7aa0f1e3bafa7dfd Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 5 Nov 2022 12:05:01 -0700
Subject: [PATCH 801/959] [Bug] Fix compilation issue with WPM (#18965)

---
 quantum/wpm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/wpm.c b/quantum/wpm.c
index 6a4e39a8d6..9a125efba0 100644
--- a/quantum/wpm.c
+++ b/quantum/wpm.c
@@ -19,6 +19,7 @@
 #include "timer.h"
 #include "keycode.h"
 #include "quantum_keycodes.h"
+#include "action_util.h"
 #include <math.h>
 
 // WPM Stuff

From 219afaba42e6b4384f578977eadbb71a03383ecc Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 6 Nov 2022 08:11:59 +1100
Subject: [PATCH 802/959] Reworked backlight keycodes. (#18961)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../keycodes/keycodes_0.0.1_lighting.hjson    | 37 +++++++++++++++----
 docs/feature_backlight.md                     | 18 ++++-----
 docs/feature_led_matrix.md                    | 20 +++++-----
 docs/keycodes.md                              | 18 ++++-----
 keyboards/0xcb/1337/keymaps/conor/keymap.c    |  2 +-
 keyboards/0xcb/1337/keymaps/default/keymap.c  |  2 +-
 keyboards/0xcb/1337/keymaps/jakob/keymap.c    |  2 +-
 keyboards/0xcb/1337/keymaps/via/keymap.c      |  2 +-
 .../1up60hse/keymaps/default/keymap.c         |  2 +-
 .../1up60hse/keymaps/via/keymap.c             |  2 +-
 .../1up60hse/keymaps/vosechu/keymap.c         |  2 +-
 .../1up60hte/keymaps/default/keymap.c         |  2 +-
 .../1up60hte/keymaps/hhkb/keymap.c            |  2 +-
 .../1up60hte/keymaps/via/keymap.c             |  2 +-
 .../1up60rgb/keymaps/tsangan/keymap.c         |  2 +-
 .../25keys/aleth42/keymaps/default/keymap.c   |  4 +-
 keyboards/25keys/aleth42/keymaps/via/keymap.c |  4 +-
 .../gherkin/keymaps/default/keymap.c          |  2 +-
 .../gherkin/keymaps/pierrec83/keymap.json     |  2 +-
 .../luddite/keymaps/default/keymap.c          |  2 +-
 .../luddite/keymaps/via/keymap.c              |  2 +-
 .../mf68/keymaps/delivrance/keymap.c          |  4 +-
 keyboards/8pack/keymaps/default/keymap.c      |  2 +-
 .../titan60/keymaps/default/keymap.c          |  2 +-
 .../acekeyboard/titan60/keymaps/iso/keymap.c  |  2 +-
 .../titan60/keymaps/tsangan/keymap.c          |  2 +-
 .../titan60/keymaps/utilitarian/keymap.c      |  2 +-
 .../shark/alpha/keymaps/default/keymap.c      |  4 +-
 .../acheron/shark/alpha/keymaps/via/keymap.c  |  4 +-
 .../ai03/polaris/keymaps/mekberg/keymap.c     |  2 +-
 keyboards/al1/keymaps/default/keymap.c        |  2 +-
 keyboards/al1/keymaps/splitbs/keymap.c        |  2 +-
 keyboards/alf/dc60/keymaps/default/keymap.c   |  2 +-
 keyboards/alf/x11/keymaps/default/keymap.c    |  2 +-
 .../amj40/keymaps/default/keymap.c            |  2 +-
 .../amj40/keymaps/default_625u_space/keymap.c |  2 +-
 .../keymaps/default_ortho_275u_space/keymap.c |  2 +-
 .../keymaps/default_ortho_600u_space/keymap.c |  2 +-
 .../amjkeyboard/amj40/keymaps/myee/keymap.c   |  2 +-
 .../b_sides/rev41lp/keymaps/cyril/keymap.c    |  2 +-
 .../b_sides/rev41lp/keymaps/default/keymap.c  |  2 +-
 .../b_sides/rev41lp/keymaps/namnlos/keymap.c  |  2 +-
 keyboards/bioi/f60/keymaps/default/keymap.c   |  2 +-
 keyboards/bioi/f60/keymaps/via/keymap.c       |  2 +-
 .../bt66tech60/keymaps/default/keymap.c       |  2 +-
 .../bt66tech/bt66tech60/keymaps/via/keymap.c  |  2 +-
 .../cypher/rev6/keymaps/default/keymap.c      |  2 +-
 .../cypher/rev6/keymaps/default_iso/keymap.c  |  2 +-
 .../cypher/rev6/keymaps/via/keymap.c          |  2 +-
 .../cannonkeys/an_c/keymaps/default/keymap.c  |  2 +-
 .../cannonkeys/an_c/keymaps/tsangan/keymap.c  |  2 +-
 .../cannonkeys/an_c/keymaps/via/keymap.c      |  2 +-
 .../cannonkeys/atlas/keymaps/via/keymap.c     |  2 +-
 .../chimera65/keymaps/default/keymap.c        |  2 +-
 .../cannonkeys/chimera65/keymaps/via/keymap.c |  2 +-
 .../cloudline/keymaps/default/keymap.c        |  2 +-
 .../cannonkeys/cloudline/keymaps/via/keymap.c |  2 +-
 .../cannonkeys/db60/keymaps/default/keymap.c  |  2 +-
 .../cannonkeys/db60/keymaps/iso/keymap.c      |  2 +-
 .../cannonkeys/db60/keymaps/tsangan/keymap.c  |  2 +-
 .../cannonkeys/db60/keymaps/via/keymap.c      |  2 +-
 .../devastatingtkl/keymaps/default/keymap.c   |  2 +-
 .../devastatingtkl/keymaps/via/keymap.c       |  2 +-
 .../ellipse/keymaps/default/keymap.c          |  2 +-
 .../cannonkeys/ellipse/keymaps/via/keymap.c   |  2 +-
 .../ellipse_hs/keymaps/default/keymap.c       |  2 +-
 .../gentoo_hs/keymaps/default/keymap.c        |  4 +-
 .../cannonkeys/gentoo_hs/keymaps/via/keymap.c |  4 +-
 .../hoodrowg/keymaps/default/keymap.c         |  2 +-
 .../cannonkeys/hoodrowg/keymaps/via/keymap.c  |  4 +-
 .../instant60/keymaps/default/keymap.c        |  2 +-
 .../instant60/keymaps/tsangan/keymap.c        |  2 +-
 .../cannonkeys/instant60/keymaps/via/keymap.c |  2 +-
 .../instant60/keymaps/via_standard/keymap.c   |  2 +-
 .../instant65/keymaps/default/keymap.c        |  4 +-
 .../cannonkeys/instant65/keymaps/via/keymap.c |  4 +-
 .../iron165/keymaps/default/keymap.c          |  2 +-
 .../malicious_ergo/keymaps/default/keymap.c   |  2 +-
 .../malicious_ergo/keymaps/via/keymap.c       |  2 +-
 .../moment/keymaps/default/keymap.c           |  2 +-
 .../cannonkeys/moment/keymaps/via/keymap.c    |  2 +-
 .../moment_hs/keymaps/default/keymap.c        |  2 +-
 .../obliterated75/keymaps/default/keymap.c    |  2 +-
 .../obliterated75/keymaps/via/keymap.c        |  2 +-
 .../ortho48/keymaps/default/keymap.c          |  2 +-
 .../cannonkeys/ortho48/keymaps/via/keymap.c   |  2 +-
 .../ortho60/keymaps/default/keymap.c          |  2 +-
 .../cannonkeys/ortho60/keymaps/via/keymap.c   |  2 +-
 .../practice60/keymaps/default/keymap.c       |  2 +-
 .../practice60/keymaps/via/keymap.c           |  2 +-
 .../practice65/keymaps/default/keymap.c       |  2 +-
 .../rekt1800/keymaps/default/keymap.c         |  2 +-
 .../cannonkeys/rekt1800/keymaps/via/keymap.c  |  2 +-
 .../satisfaction75/satisfaction_encoder.c     |  2 +-
 .../savage65/keymaps/default/keymap.c         |  2 +-
 .../cannonkeys/savage65/keymaps/via/keymap.c  |  2 +-
 .../cannonkeys/tmov2/keymaps/default/keymap.c |  4 +-
 .../cannonkeys/tmov2/keymaps/via/keymap.c     |  4 +-
 .../tsukuyomi/keymaps/default/keymap.c        |  2 +-
 .../cannonkeys/tsukuyomi/keymaps/via/keymap.c |  2 +-
 .../vector/keymaps/default/keymap.c           |  2 +-
 .../vicious40/keymaps/default/keymap.c        |  4 +-
 .../cannonkeys/vicious40/keymaps/via/keymap.c |  4 +-
 .../checkerboards/nop60/keymaps/7u/keymap.c   |  4 +-
 .../nop60/keymaps/default/keymap.c            |  4 +-
 .../checkerboards/nop60/keymaps/via/keymap.c  |  6 +--
 .../checkerboards/snop60/keymaps/7u/keymap.c  |  4 +-
 .../snop60/keymaps/default/keymap.c           |  2 +-
 .../checkerboards/snop60/keymaps/via/keymap.c |  6 +--
 .../chlx/merro60/keymaps/default/keymap.c     |  2 +-
 keyboards/chlx/merro60/keymaps/via/keymap.c   |  2 +-
 .../chlx/str_merro60/keymaps/default/keymap.c |  2 +-
 .../chlx/str_merro60/keymaps/via/keymap.c     |  2 +-
 .../66_hotswap/gen1/keymaps/default/keymap.c  |  4 +-
 .../66_hotswap/gen1/keymaps/json/keymap.json  |  2 +-
 .../prototype/keymaps/default/keymap.c        |  4 +-
 keyboards/db/db63/keymaps/default/keymap.c    |  2 +-
 keyboards/do60/keymaps/default/keymap.c       |  4 +-
 keyboards/do60/keymaps/via/keymap.c           |  4 +-
 .../budget96/keymaps/default/keymap.c         |  2 +-
 .../donutcables/budget96/keymaps/via/keymap.c |  2 +-
 .../doro67/multi/keymaps/default/keymap.c     |  2 +-
 .../doro67/multi/keymaps/default_iso/keymap.c |  2 +-
 .../multi/keymaps/default_multi/keymap.c      |  2 +-
 keyboards/doro67/multi/keymaps/via/keymap.c   |  2 +-
 keyboards/doro67/multi/keymaps/zyber/keymap.c |  2 +-
 .../dtisaac/dtisaac01/keymaps/via/keymap.c    |  4 +-
 .../duck/orion/v3/keymaps/default/keymap.c    |  2 +-
 keyboards/dz60/keymaps/60_ansi/keymap.c       |  2 +-
 .../dz60/keymaps/60_ansi_arrow_fkeys/keymap.c |  2 +-
 .../dz60/keymaps/60_plus_arrows/keymap.c      |  2 +-
 keyboards/dz60/keymaps/60_tsangan/keymap.c    |  2 +-
 .../dz60/keymaps/Ansi_plus_fn_arrows/keymap.c |  2 +-
 .../keymaps/_bonfire/keymap-parts/layers.c    |  2 +-
 keyboards/dz60/keymaps/atlacat/keymap.c       |  2 +-
 keyboards/dz60/keymaps/boris_burger/keymap.c  |  2 +-
 keyboards/dz60/keymaps/coppertop/keymap.c     |  4 +-
 keyboards/dz60/keymaps/danbee/keymap.c        |  2 +-
 keyboards/dz60/keymaps/dbroqua/keymap.c       |  2 +-
 keyboards/dz60/keymaps/default/keymap.c       |  2 +-
 keyboards/dz60/keymaps/default_abnt2/keymap.c |  2 +-
 .../dz60/keymaps/devinceble_wkl_tofu/keymap.c |  2 +-
 keyboards/dz60/keymaps/doogle999/keymap.c     |  2 +-
 keyboards/dz60/keymaps/f3d3/keymap.c          |  2 +-
 keyboards/dz60/keymaps/frogger/keymap.c       |  2 +-
 keyboards/dz60/keymaps/gk64/keymap.c          |  2 +-
 keyboards/dz60/keymaps/iso_6u_space/keymap.c  |  2 +-
 keyboards/dz60/keymaps/iso_7u_space/keymap.c  |  2 +-
 .../dz60/keymaps/iso_split-spacebar/keymap.c  |  2 +-
 keyboards/dz60/keymaps/iso_uk/keymap.c        |  2 +-
 keyboards/dz60/keymaps/itsaferbie/keymap.c    |  2 +-
 keyboards/dz60/keymaps/lint_kid/keymap.c      |  2 +-
 keyboards/dz60/keymaps/macos_arrow/keymap.c   |  4 +-
 keyboards/dz60/keymaps/model42/keymap.c       |  2 +-
 keyboards/dz60/keymaps/mpaarating/keymap.c    |  2 +-
 keyboards/dz60/keymaps/muralisc/keymap.c      |  2 +-
 keyboards/dz60/keymaps/muzfuz/keymap.c        |  2 +-
 keyboards/dz60/keymaps/pevecyan/keymap.c      |  2 +-
 keyboards/dz60/keymaps/pinpox/keymap.c        |  2 +-
 keyboards/dz60/keymaps/spotpuff/keymap.c      |  4 +-
 keyboards/dz60/keymaps/stephengrier/keymap.c  |  2 +-
 keyboards/dz60/keymaps/tailcall/keymap.c      |  2 +-
 keyboards/dz60/keymaps/tarnjotsingh/keymap.c  |  2 +-
 .../dz60/keymaps/tarnjotsingh/layers.json     |  2 +-
 keyboards/dz60/keymaps/via/keymap.c           |  2 +-
 keyboards/dz60/keymaps/xtonhasvim/keymap.c    |  2 +-
 .../dztech/duo_s/keymaps/default/keymap.c     |  4 +-
 keyboards/dztech/duo_s/keymaps/via/keymap.c   |  4 +-
 .../dztech/dz96/keymaps/default/keymap.c      |  2 +-
 keyboards/dztech/dz96/keymaps/iso/keymap.c    |  2 +-
 keyboards/dztech/dz96/keymaps/via/keymap.c    |  2 +-
 .../e80_1800/keymaps/ansi_6u/keymap.c         |  4 +-
 .../e80_1800/keymaps/ansi_7u/keymap.c         |  4 +-
 .../e80_1800/keymaps/default/keymap.c         |  4 +-
 .../ebastler/e80_1800/keymaps/iso_6u/keymap.c |  4 +-
 .../ebastler/e80_1800/keymaps/iso_7u/keymap.c |  4 +-
 .../ebastler/e80_1800/keymaps/via/keymap.c    |  4 +-
 .../rev1/keymaps/default/keymap.c             |  2 +-
 .../isometria_75/rev1/keymaps/via/keymap.c    |  2 +-
 keyboards/edda/keymaps/default/keymap.c       |  2 +-
 keyboards/epoch80/keymaps/default/keymap.c    |  2 +-
 keyboards/epoch80/keymaps/iso/keymap.c        |  2 +-
 keyboards/epoch80/keymaps/tsangan/keymap.c    |  2 +-
 keyboards/epoch80/keymaps/wkl/keymap.c        |  2 +-
 .../evyd13/atom47/keymaps/LEdiodes/keymap.c   |  2 +-
 .../evyd13/atom47/keymaps/default/keymap.c    |  2 +-
 keyboards/evyd13/atom47/keymaps/via/keymap.c  |  2 +-
 .../exclusive/e65/keymaps/default/keymap.c    |  2 +-
 .../e65/keymaps/default_iso/keymap.c          |  2 +-
 .../exclusive/e65/keymaps/masterzen/keymap.c  |  2 +-
 keyboards/exclusive/e65/keymaps/via/keymap.c  |  2 +-
 .../exclusive/e6v2/le/keymaps/johu/keymap.c   |  2 +-
 .../e6v2/le_bmc/keymaps/default/keymap.c      |  2 +-
 .../e6v2/le_bmc/keymaps/via/keymap.c          |  2 +-
 .../e6v2/oe/keymaps/amnesia0287/keymap.c      |  2 +-
 .../e6v2/oe_bmc/keymaps/default/keymap.c      |  2 +-
 .../e6v2/oe_bmc/keymaps/via/keymap.c          |  2 +-
 .../e7v1/keymaps/ansi_splitbs/keymap.c        |  2 +-
 .../exclusive/e7v1/keymaps/default/keymap.c   |  2 +-
 .../exclusive/e7v1/keymaps/masterzen/keymap.c |  2 +-
 keyboards/exclusive/e7v1/keymaps/via/keymap.c |  2 +-
 .../exclusive/e7v1se/keymaps/default/keymap.c |  2 +-
 .../exclusive/e7v1se/keymaps/mac/keymap.c     |  2 +-
 keyboards/exent/keymaps/default/keymap.c      |  2 +-
 keyboards/exent/keymaps/via/keymap.c          |  2 +-
 keyboards/flx/virgo/keymaps/default/keymap.c  |  2 +-
 keyboards/flx/virgo/keymaps/via/keymap.c      |  2 +-
 .../key65/hotswap/keymaps/default/keymap.c    |  2 +-
 .../foxlab/key65/hotswap/keymaps/via/keymap.c |  2 +-
 .../key65/universal/keymaps/default/keymap.c  |  2 +-
 .../key65/universal/keymaps/via/keymap.c      |  2 +-
 .../leaf60/hotswap/keymaps/crd/keymap.c       |  2 +-
 .../leaf60/hotswap/keymaps/default/keymap.c   |  2 +-
 .../leaf60/hotswap/keymaps/via/keymap.c       |  2 +-
 .../leaf60/universal/keymaps/default/keymap.c |  2 +-
 .../leaf60/universal/keymaps/via/keymap.c     |  2 +-
 keyboards/ft/mars65/keymaps/default/keymap.c  |  2 +-
 keyboards/ft/mars65/keymaps/via/keymap.c      |  2 +-
 .../lex60/keymaps/default/keymap.c            |  2 +-
 keyboards/gh60/revc/keymaps/danbee/keymap.c   |  2 +-
 .../gh60/revc/keymaps/default_abnt2/keymap.c  |  2 +-
 keyboards/gh60/satan/keymaps/abhixec/keymap.c |  2 +-
 .../gh60/satan/keymaps/addcninblue/keymap.c   |  2 +-
 keyboards/gh60/satan/keymaps/ben_iso/keymap.c |  2 +-
 keyboards/gh60/satan/keymaps/bri/keymap.c     |  4 +-
 keyboards/gh60/satan/keymaps/colemak/keymap.c |  4 +-
 keyboards/gh60/satan/keymaps/dbroqua/keymap.c |  2 +-
 keyboards/gh60/satan/keymaps/default/keymap.c |  2 +-
 keyboards/gh60/satan/keymaps/denolfe/keymap.c |  6 +--
 keyboards/gh60/satan/keymaps/fakb/keymap.c    |  2 +-
 .../gh60/satan/keymaps/gipsy-king/keymap.c    |  2 +-
 keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c |  2 +-
 keyboards/gh60/satan/keymaps/isoHHKB/keymap.c |  2 +-
 .../satan/keymaps/olligranlund_iso/keymap.c   |  2 +-
 keyboards/gh60/satan/keymaps/poker/keymap.c   |  4 +-
 keyboards/gh60/satan/keymaps/smt/keymap.c     |  2 +-
 keyboards/gh60/satan/keymaps/unxmaal/keymap.c |  4 +-
 keyboards/gh60/v1p3/keymaps/default/keymap.c  |  2 +-
 .../gh60/v1p3/keymaps/factory_hhkb/keymap.c   |  2 +-
 .../v1p3/keymaps/factory_layout5/keymap.c     |  2 +-
 .../v1p3/keymaps/factory_layout7/keymap.c     |  2 +-
 .../v1p3/keymaps/factory_layout9/keymap.c     |  2 +-
 .../gh60/v1p3/keymaps/factory_minila/keymap.c |  2 +-
 .../gh60/v1p3/keymaps/factory_poker/keymap.c  |  2 +-
 .../gon/nerdtkl/keymaps/gam3cat/keymap.c      |  2 +-
 .../gray_studio/hb85/keymaps/stt/keymap.c     |  2 +-
 .../hadron/ver2/keymaps/default/keymap.c      |  2 +-
 .../hadron/ver2/keymaps/side_numpad/keymap.c  |  2 +-
 .../hadron/ver3/keymaps/default/keymap.c      |  2 +-
 keyboards/hadron/ver3/keymaps/ishtob/keymap.c |  2 +-
 .../arrow_pad/keymaps/default/keymap.c        |  2 +-
 .../arrow_pad/keymaps/pad_21/keymap.c         |  2 +-
 .../arrow_pad/keymaps/pad_24/keymap.c         |  2 +-
 .../handwired/co60/keymaps/default/keymap.c   |  4 +-
 .../keymaps/jmdaly_hhkb_split_space/keymap.c  |  4 +-
 .../handwired/sick68/keymaps/default/keymap.c |  2 +-
 .../handwired/sick68/keymaps/via/keymap.c     |  2 +-
 .../hineybush/h60/keymaps/default/keymap.c    |  2 +-
 keyboards/hineybush/h60/keymaps/kei/keymap.c  |  2 +-
 keyboards/hineybush/h60/keymaps/via/keymap.c  |  2 +-
 .../hineybush/h660s/keymaps/default/keymap.c  |  2 +-
 .../hineybush/h660s/keymaps/via/keymap.c      |  2 +-
 .../hineybush/h87a/keymaps/default/keymap.c   |  2 +-
 .../hineybush/h87a/keymaps/gam3cat/keymap.c   |  2 +-
 .../hineybush/h87a/keymaps/peott-fr/keymap.c  |  2 +-
 keyboards/hineybush/h87a/keymaps/via/keymap.c |  6 +--
 keyboards/hineybush/h87a/keymaps/wkl/keymap.c |  2 +-
 .../hineybush/h88/keymaps/default/keymap.c    |  2 +-
 keyboards/hineybush/h88/keymaps/via/keymap.c  |  2 +-
 keyboards/hineybush/h88/keymaps/wkl/keymap.c  |  2 +-
 .../hineybush/physix/keymaps/default/keymap.c |  2 +-
 .../hineybush/physix/keymaps/via/keymap.c     |  2 +-
 .../black_e65/keymaps/default/keymap.c        |  2 +-
 .../black_e65/keymaps/via/keymap.c            |  2 +-
 .../id75/keymaps/greenshadowmaker/keymap.c    |  4 +-
 .../id80/v2/ansi/keymaps/default/keymap.c     |  4 +-
 .../idobao/id80/v2/ansi/keymaps/msf/keymap.c  |  4 +-
 .../idobao/id80/v2/ansi/keymaps/via/keymap.c  |  4 +-
 .../id80/v2/iso/keymaps/default/keymap.c      |  4 +-
 .../idobao/id80/v2/iso/keymaps/via/keymap.c   |  4 +-
 .../idobao/id87/v1/keymaps/default/keymap.c   |  4 +-
 keyboards/idobao/id87/v1/keymaps/via/keymap.c |  4 +-
 .../idobao/id96/keymaps/default/keymap.c      |  4 +-
 keyboards/idobao/id96/keymaps/via/keymap.c    |  2 +-
 .../ilumkb/primus75/keymaps/default/keymap.c  |  2 +-
 .../ilumkb/primus75/keymaps/via/keymap.c      |  2 +-
 .../keymaps/nordic_ergo/keymap.c              |  4 +-
 .../whitefox/keymaps/dhertz/keymap.c          |  4 +-
 .../whitefox/keymaps/jetpacktuxedo/keymap.c   |  4 +-
 .../whitefox/keymaps/kim-kim/keymap.c         |  4 +-
 keyboards/jae/j01/keymaps/default/keymap.c    |  4 +-
 keyboards/jc65/v32u4/keymaps/coth/keymap.c    |  4 +-
 .../v32u4/keymaps/dead_encryption/keymap.c    |  2 +-
 keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c |  2 +-
 keyboards/jian/keymaps/advanced/keymap.c      |  4 +-
 keyboards/jian/keymaps/default/keymap.c       |  4 +-
 keyboards/jian/keymaps/left_hand/keymap.c     |  4 +-
 keyboards/jian/keymaps/via/keymap.c           |  4 +-
 keyboards/jm60/keymaps/default/keymap.c       |  2 +-
 .../scythe/keymaps/default/keymap.c           |  2 +-
 .../scythe/keymaps/forties/keymap.c           |  4 +-
 .../75/hotswap/keymaps/default/keymap.c       |  6 +--
 .../bounce/75/hotswap/keymaps/via/keymap.c    |  6 +--
 .../75/soldered/keymaps/default/keymap.c      |  6 +--
 .../75/soldered/keymaps/default_ansi/keymap.c |  6 +--
 .../keymaps/default_ansi_split_bs/keymap.c    |  6 +--
 .../75/soldered/keymaps/default_iso/keymap.c  |  6 +--
 .../keymaps/default_iso_split_bs/keymap.c     |  6 +--
 .../bounce/75/soldered/keymaps/via/keymap.c   |  6 +--
 .../kbd67/mkii_soldered/keymaps/ai03/keymap.c |  4 +-
 .../kbd67/mkii_soldered/keymaps/ansi/keymap.c |  4 +-
 .../keymaps/ansi_split_bs/keymap.c            |  4 +-
 .../mkii_soldered/keymaps/default/keymap.c    |  4 +-
 .../kbd67/mkii_soldered/keymaps/iso/keymap.c  |  4 +-
 .../kbd67/mkii_soldered/keymaps/via/keymap.c  |  4 +-
 .../kbdfans/kbd67/rev1/keymaps/koba/keymap.c  |  2 +-
 .../kbdfans/kbd67/rev2/keymaps/iso/keymap.c   |  2 +-
 .../kbdfans/kbd67/rev2/keymaps/koba/keymap.c  |  2 +-
 .../kbd67/rev2/keymaps/tucznak/keymap.c       |  2 +-
 .../kbdfans/kbd6x/keymaps/dbroqua/keymap.c    |  2 +-
 .../kbdfans/kbd6x/keymaps/default/keymap.c    |  2 +-
 .../keymaps/devinceble_hhkb_tofu/keymap.c     |  2 +-
 .../kbdfans/kbd6x/keymaps/mekberg/keymap.c    |  2 +-
 keyboards/kbdfans/kbd6x/keymaps/via/keymap.c  |  2 +-
 .../kbdfans/kbd6x/keymaps/wanleg/keymap.c     |  2 +-
 .../kbd75/keymaps/aaronireland/keymap.c       |  2 +-
 .../kbd75/keymaps/adamdehaven/keymap.c        |  4 +-
 keyboards/kbdfans/kbd75/keymaps/adit/keymap.c |  2 +-
 .../kbdfans/kbd75/keymaps/broswen/keymap.c    |  2 +-
 .../kbdfans/kbd75/keymaps/default/keymap.c    |  2 +-
 .../kbdfans/kbd75/keymaps/digital/keymap.c    |  2 +-
 .../kbdfans/kbd75/keymaps/ethan605/keymap.c   |  2 +-
 keyboards/kbdfans/kbd75/keymaps/iso/keymap.c  |  2 +-
 .../kbd75/keymaps/noroadsleft/keymap.c        |  2 +-
 .../kbd75/keymaps/spacemanspiff/keymap.c      |  2 +-
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |  2 +-
 keyboards/kbdfans/kbd75/keymaps/via/keymap.c  |  2 +-
 .../kbdfans/kbd75hs/keymaps/default/keymap.c  |  6 +--
 .../kbdfans/kbd75hs/keymaps/via/keymap.c      |  6 +--
 .../kbdfans/kbd75rgb/keymaps/default/keymap.c |  6 +--
 .../kbdfans/kbd75rgb/keymaps/via/keymap.c     |  6 +--
 .../kbdfans/kbd8x/keymaps/default/keymap.c    |  2 +-
 .../keymaps/default_backlighting/keymap.c     |  2 +-
 keyboards/kc60/keymaps/dbroqua/keymap.c       |  2 +-
 keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c  |  2 +-
 keyboards/kc60/keymaps/default/keymap.c       |  2 +-
 keyboards/kc60/keymaps/noroadsleft/keymap.c   |  2 +-
 keyboards/kc60/keymaps/sgoodwin/keymap.c      |  2 +-
 keyboards/kc60/keymaps/via/keymap.c           |  2 +-
 keyboards/kc60/keymaps/wigguno/keymap.c       |  2 +-
 keyboards/kc60/keymaps/ws2812/keymap.c        |  2 +-
 .../keebio/dsp40/keymaps/default/keymap.c     |  2 +-
 keyboards/keebio/dsp40/keymaps/via/keymap.c   |  2 +-
 .../keebio_iris_rev2_layout_dvorak.json       |  2 +-
 .../iris/keymaps/olligranlund_nordic/keymap.c |  2 +-
 .../keymaps/olligranlund_nordic_v2/keymap.c   |  2 +-
 keyboards/keebio/iris/keymaps/omgvee/keymap.c |  8 ++--
 .../iris/keymaps/thattolleyguy/keymap.c       |  4 +-
 .../levinson/keymaps/xtonhasvim/keymap.c      |  4 +-
 keyboards/keebio/sinc/keymaps/lickel/keymap.c |  2 +-
 .../tragicforce68/keymaps/buswerks/keymap.c   |  4 +-
 .../tragicforce68/keymaps/default/keymap.c    |  4 +-
 .../coarse60/keymaps/default/keymap.c         |  2 +-
 .../keebsforall/coarse60/keymaps/via/keymap.c |  2 +-
 keyboards/kira80/keymaps/ansi/keymap.c        |  2 +-
 keyboards/kira80/keymaps/ansi_wkl/keymap.c    |  2 +-
 keyboards/kira80/keymaps/default/keymap.c     |  2 +-
 keyboards/kira80/keymaps/iso/keymap.c         |  2 +-
 keyboards/kira80/keymaps/via/keymap.c         |  2 +-
 .../wanderland/keymaps/stanrc85/keymap.c      |  4 +-
 .../kprepublic/bm16a/keymaps/factory/keymap.c |  2 +-
 .../kprepublic/bm16s/keymaps/default/keymap.c |  2 +-
 .../kprepublic/bm16s/keymaps/via/keymap.c     |  2 +-
 .../kprepublic/bm43a/keymaps/default/keymap.c |  2 +-
 .../bm43a/keymaps/stevexyz/keymap.c           |  2 +-
 .../kprepublic/jj40/keymaps/cockpit/keymap.c  |  4 +-
 .../kprepublic/jj40/keymaps/suzuken/keymap.c  |  4 +-
 .../kprepublic/jj50/keymaps/default/keymap.c  |  2 +-
 .../kprepublic/jj50/keymaps/via/keymap.c      |  2 +-
 .../lfk78/keymaps/ca178858/keymap.c           |  2 +-
 .../lfk78/keymaps/default/keymap.c            |  2 +-
 .../lfkeyboards/lfk78/keymaps/iso/keymap.c    |  2 +-
 .../lfk78/keymaps/split_bs_osx/keymap.c       |  2 +-
 .../lfkeyboards/lfk78/keymaps/via/keymap.c    |  4 +-
 .../lfk87/keymaps/ca178858/keymap.c           |  4 +-
 .../lfk87/keymaps/default/keymap.c            |  4 +-
 .../lfkeyboards/lfk87/keymaps/gbchk/keymap.c  |  4 +-
 .../lfkeyboards/lfk87/keymaps/iso/keymap.c    |  4 +-
 .../mini1800/keymaps/ca178858/keymap.c        |  2 +-
 .../mini1800/keymaps/default/keymap.c         |  2 +-
 .../linworks/fave104/keymaps/default/keymap.c |  2 +-
 .../linworks/fave104/keymaps/via/keymap.c     |  2 +-
 .../linworks/fave87/keymaps/default/keymap.c  |  2 +-
 .../linworks/fave87/keymaps/via/keymap.c      |  2 +-
 .../linworks/whale75/keymaps/default/keymap.c |  2 +-
 .../linworks/whale75/keymaps/via/keymap.c     |  2 +-
 .../mach3/keymaps/default/keymap.c            |  6 +--
 .../machkeyboards/mach3/keymaps/via/keymap.c  |  6 +--
 keyboards/massdrop/alt/keymaps/b_/keymap.c    |  4 +-
 .../mechkeys/acr60/keymaps/default/keymap.c   |  2 +-
 .../mechkeys/acr60/keymaps/mitch/keymap.c     |  2 +-
 .../mechkeys/alu84/keymaps/default/keymap.c   |  2 +-
 .../mechkeys/alu84/keymaps/turbomech/keymap.c |  2 +-
 .../espectro/keymaps/default/keymap.c         |  2 +-
 .../mechkeys/espectro/keymaps/iso/keymap.c    |  2 +-
 .../mechkeys/espectro/keymaps/mac/keymap.c    |  2 +-
 .../mechkeys/espectro/keymaps/mapdev/keymap.c |  2 +-
 .../espectro/keymaps/mikethetiger/keymap.c    |  2 +-
 .../mechmini/v2/keymaps/625_space/keymap.c    |  2 +-
 .../mechmini/v2/keymaps/arkag/keymap.c        |  2 +-
 .../mechmini/v2/keymaps/default/keymap.c      |  2 +-
 .../mechmini/v2/keymaps/split_space/keymap.c  |  2 +-
 .../mechkeys/mechmini/v2/keymaps/via/keymap.c |  2 +-
 .../mechkeys/mk60/keymaps/default/keymap.c    |  2 +-
 keyboards/mehkee96/keymaps/default/keymap.c   |  4 +-
 keyboards/mehkee96/keymaps/johann/keymap.c    |  4 +-
 .../melgeek/mj6xy/keymaps/default/keymap.c    |  2 +-
 .../mj6xy/keymaps/default_60_ansi/keymap.c    |  2 +-
 .../keymaps/default_60_ansi_arrow/keymap.c    |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../default_60_ansi_arrow_split_bs/keymap.c   |  2 +-
 .../keymap.c                                  |  2 +-
 .../default_60_ansi_split_bs_rshift/keymap.c  |  2 +-
 .../keymaps/default_60_ansi_tsangan/keymap.c  |  2 +-
 .../mj6xy/keymaps/default_60_iso/keymap.c     |  2 +-
 .../keymaps/default_60_iso_arrow/keymap.c     |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymap.c                                  |  2 +-
 .../default_60_iso_arrow_split_bs/keymap.c    |  2 +-
 .../keymap.c                                  |  2 +-
 .../default_60_iso_split_bs_rshift/keymap.c   |  2 +-
 .../keymaps/default_60_iso_tsangan/keymap.c   |  2 +-
 .../keymap.c                                  |  2 +-
 .../keymaps/default_60_tsangan_hhkb/keymap.c  |  2 +-
 .../mj6xy/keymaps/default_64_ansi/keymap.c    |  2 +-
 .../default_64_ansi_3u_spc_split_bs/keymap.c  |  2 +-
 .../default_64_ansi_split_3u_spc/keymap.c     |  2 +-
 .../keymaps/default_64_ansi_split_bs/keymap.c |  2 +-
 .../default_64_ansi_split_bs_3u_spc/keymap.c  |  2 +-
 .../mj6xy/keymaps/default_64_iso/keymap.c     |  2 +-
 .../default_64_iso_3u_spc_split_bs/keymap.c   |  2 +-
 .../default_64_iso_split_3u_spc/keymap.c      |  2 +-
 .../keymaps/default_64_iso_split_bs/keymap.c  |  2 +-
 .../default_64_iso_split_bs_3u_spc/keymap.c   |  2 +-
 keyboards/melgeek/mj6xy/keymaps/via/keymap.c  |  2 +-
 .../timberwolf/keymaps/a_ansi/keymap.c        |  4 +-
 .../timberwolf/keymaps/a_iso/keymap.c         |  4 +-
 .../timberwolf/keymaps/b_ansi/keymap.c        |  4 +-
 .../timberwolf/keymaps/b_iso/keymap.c         |  4 +-
 .../timberwolf/keymaps/default/keymap.c       |  4 +-
 .../timberwolf/keymaps/prime_ansi/keymap.c    |  4 +-
 .../timberwolf/keymaps/prime_iso/keymap.c     |  4 +-
 keyboards/mntre/keymaps/default/keymap.c      |  2 +-
 .../mokey/ginkgo65/keymaps/default/keymap.c   |  2 +-
 keyboards/mokey/ginkgo65/keymaps/via/keymap.c |  2 +-
 .../mokey/ginkgo65hot/keymaps/via/keymap.c    |  2 +-
 keyboards/monarch/keymaps/default/keymap.c    |  2 +-
 keyboards/monarch/keymaps/iso/keymap.c        |  2 +-
 keyboards/monarch/keymaps/via/keymap.c        |  2 +-
 .../xo87/solderable/keymaps/default/keymap.c  |  4 +-
 .../xo87/solderable/keymaps/via/keymap.c      |  4 +-
 keyboards/mt/mt40/keymaps/default/keymap.c    |  2 +-
 keyboards/mt/mt64rgb/keymaps/via/keymap.c     |  6 +--
 keyboards/mt/mt84/keymaps/via/keymap.c        |  2 +-
 .../ncc1701kb/keymaps/brushsize/keymap.c      |  2 +-
 keyboards/ncc1701kb/keymaps/default/keymap.c  |  2 +-
 keyboards/neito/keymaps/default/keymap.c      |  2 +-
 keyboards/neito/keymaps/olli_works/keymap.c   |  2 +-
 keyboards/neito/keymaps/via/keymap.c          |  2 +-
 .../g67/element_hs/keymaps/default/keymap.c   |  2 +-
 .../g67/element_hs/keymaps/via/keymap.c       |  2 +-
 .../g67/hotswap/keymaps/default/keymap.c      |  2 +-
 .../neokeys/g67/hotswap/keymaps/via/keymap.c  |  2 +-
 .../g67/soldered/keymaps/default/keymap.c     |  2 +-
 .../neokeys/g67/soldered/keymaps/via/keymap.c |  2 +-
 .../oxalys80/keymaps/default/keymap.c         |  2 +-
 .../nix_studio/oxalys80/keymaps/via/keymap.c  |  6 +--
 keyboards/noxary/220/keymaps/default/keymap.c |  2 +-
 keyboards/noxary/220/keymaps/via/keymap.c     |  2 +-
 keyboards/noxary/260/keymaps/default/keymap.c |  2 +-
 keyboards/noxary/260/keymaps/via/keymap.c     |  2 +-
 keyboards/noxary/268/keymaps/ansi/keymap.c    |  2 +-
 keyboards/noxary/268/keymaps/default/keymap.c |  2 +-
 keyboards/noxary/268/keymaps/iso/keymap.c     |  2 +-
 .../noxary/268/keymaps/sixtyeight/keymap.c    |  2 +-
 keyboards/noxary/268/keymaps/via/keymap.c     |  2 +-
 .../noxary/268_2/keymaps/default/keymap.c     |  2 +-
 keyboards/noxary/268_2/keymaps/via/keymap.c   |  2 +-
 .../noxary/268_2_rgb/keymaps/default/keymap.c |  2 +-
 .../noxary/268_2_rgb/keymaps/via/keymap.c     |  2 +-
 keyboards/noxary/280/keymaps/default/keymap.c |  2 +-
 keyboards/noxary/280/keymaps/via/keymap.c     |  2 +-
 .../noxary/x268/keymaps/default/keymap.c      |  2 +-
 keyboards/noxary/x268/keymaps/via/keymap.c    |  2 +-
 keyboards/ok60/keymaps/default/keymap.c       |  2 +-
 keyboards/ok60/keymaps/ebrowncross/keymap.c   |  2 +-
 keyboards/ok60/keymaps/ptillemans/keymap.c    |  2 +-
 keyboards/ok60/keymaps/via/keymap.c           |  2 +-
 .../ergodash/mini/keymaps/default/keymap.c    |  2 +-
 .../mini/keymaps/toyoshimahidenori/keymap.c   |  2 +-
 .../ergodash/rev1/keymaps/default/keymap.c    |  2 +-
 .../rev1/keymaps/greenshadowmaker/keymap.c    |  4 +-
 .../rev1/keymaps/shadowprogr/keymap.c         |  4 +-
 keyboards/orange75/keymaps/default/keymap.c   |  4 +-
 keyboards/org60/keymaps/boardy/keymap.c       |  2 +-
 .../pearl/keymaps/jetpacktuxedo/keymap.c      |  2 +-
 keyboards/pearl/keymaps/phil/keymap.c         |  4 +-
 keyboards/planck/keymaps/emiller/keymap.c     |  4 +-
 keyboards/planck/keymaps/ishtob/keymap.c      |  2 +-
 .../playkbtw/ca66/keymaps/kelorean/keymap.c   |  2 +-
 .../ca66/keymaps/kelorean/layers.json         |  2 +-
 keyboards/playkbtw/ca66/keymaps/via/keymap.c  |  2 +-
 .../playkbtw/pk60/keymaps/rfvizarra/keymap.c  |  4 +-
 .../playkbtw/pk64rgb/keymaps/via/keymap.c     |  6 +--
 .../plut0nium/0x3e/keymaps/default/keymap.c   |  4 +-
 keyboards/poker87c/keymaps/default/keymap.c   |  2 +-
 keyboards/poker87c/keymaps/via/keymap.c       |  2 +-
 keyboards/poker87d/keymaps/default/keymap.c   |  2 +-
 keyboards/poker87d/keymaps/via/keymap.c       |  2 +-
 .../polycarbdiet/s20/keymaps/default/keymap.c |  4 +-
 .../tnln95/keymaps/default/keymap.c           |  2 +-
 .../tnln95/keymaps/default_ansi/keymap.c      |  2 +-
 keyboards/preonic/keymaps/0xdec/keymap.c      |  4 +-
 keyboards/preonic/keymaps/arkag/keymap.c      |  2 +-
 keyboards/preonic/keymaps/zach/keymap.c       |  4 +-
 .../projectkb/alice/keymaps/default/keymap.c  |  2 +-
 .../alice/keymaps/devinceble/keymap.c         |  2 +-
 .../projectkb/alice/keymaps/keithlo/keymap.c  |  2 +-
 .../alice/keymaps/madhatter/keymap.c          |  2 +-
 .../projectkb/alice/keymaps/stanrc85/keymap.c |  4 +-
 .../allison/keymaps/default/keymap.c          |  2 +-
 .../prototypist/allison/keymaps/via/keymap.c  |  2 +-
 .../allison_numpad/keymaps/default/keymap.c   |  2 +-
 .../allison_numpad/keymaps/via/keymap.c       |  2 +-
 .../prototypist/j01/keymaps/default/keymap.c  |  2 +-
 .../prototypist/j01/keymaps/via/keymap.c      |  2 +-
 .../wete/v1/keymaps/default/keymap.c          |  4 +-
 .../ramonimbao/wete/v1/keymaps/iso/keymap.c   |  4 +-
 .../ramonimbao/wete/v1/keymaps/jis/keymap.c   |  2 +-
 .../ramonimbao/wete/v1/keymaps/via/keymap.c   |  4 +-
 .../rart/rart67/keymaps/default/keymap.c      |  2 +-
 keyboards/rart/rart67/keymaps/via/keymap.c    |  2 +-
 keyboards/rart/rart75/keymaps/ansi/keymap.c   |  2 +-
 .../rart/rart75/keymaps/default/keymap.c      |  2 +-
 keyboards/rart/rart75/keymaps/via/keymap.c    |  2 +-
 .../rart/rart75hs/keymaps/default/keymap.c    |  2 +-
 keyboards/rart/rart75hs/keymaps/via/keymap.c  |  2 +-
 .../rart/rart80/keymaps/default/keymap.c      |  2 +-
 keyboards/rart/rart80/keymaps/via/keymap.c    |  2 +-
 keyboards/rocketboard_16/keycode_lookup.c     |  4 +-
 .../m0110/keymaps/default/keymap.c            |  2 +-
 keyboards/sam/s80/keymaps/default/keymap.c    |  2 +-
 keyboards/sam/s80/keymaps/via/keymap.c        |  2 +-
 .../sandwich/keeb68/keymaps/default/keymap.c  |  4 +-
 .../sandwich/keeb68/keymaps/grv_esc/keymap.c  |  4 +-
 .../s60_x/keymaps/amnesia0287/keymap.c        |  2 +-
 .../sentraq/s60_x/keymaps/dbroqua/keymap.c    |  2 +-
 .../s60_x/keymaps/default_rgb/keymap.c        |  2 +-
 .../sentraq/s60_x/keymaps/iso_rgb/keymap.c    |  2 +-
 .../sets3n/kk980/keymaps/default/keymap.c     |  2 +-
 keyboards/sets3n/kk980/keymaps/via/keymap.c   |  2 +-
 .../signum/3_0/keymaps/default/layout.py      |  2 +-
 .../hotswap/keymaps/default/keymap.c          |  4 +-
 .../skeletn87/hotswap/keymaps/via/keymap.c    |  4 +-
 .../soldered/keymaps/default/keymap.c         |  4 +-
 .../skeletn87/soldered/keymaps/iso/keymap.c   |  4 +-
 .../soldered/keymaps/tsangan/keymap.c         |  4 +-
 .../skeletn87/soldered/keymaps/via/keymap.c   |  4 +-
 .../split78/keymaps/default/keymap.c          |  2 +-
 .../southpaw_65/keymaps/default/keymap.c      |  2 +-
 .../southpaw_65/keymaps/default_ansi/keymap.c |  2 +-
 .../southpaw_65/keymaps/default_iso/keymap.c  |  2 +-
 keyboards/tada68/keymaps/abishalom/keymap.c   |  2 +-
 keyboards/tada68/keymaps/amnesia0287/keymap.c |  2 +-
 keyboards/tada68/keymaps/ardakilic/keymap.c   |  2 +-
 keyboards/tada68/keymaps/bazooka/keymap.c     |  2 +-
 keyboards/tada68/keymaps/cheese/keymap.c      |  4 +-
 keyboards/tada68/keymaps/default/keymap.c     |  2 +-
 keyboards/tada68/keymaps/devinceble/keymap.c  |  2 +-
 keyboards/tada68/keymaps/dlg/keymap.c         |  2 +-
 keyboards/tada68/keymaps/emdarcher/keymap.c   |  2 +-
 keyboards/tada68/keymaps/fakb/keymap.c        |  2 +-
 keyboards/tada68/keymaps/fezzant/keymap.c     |  2 +-
 keyboards/tada68/keymaps/hhkb68/keymap.c      |  2 +-
 keyboards/tada68/keymaps/hhkb68/layers.json   |  2 +-
 keyboards/tada68/keymaps/iso-nor/keymap.c     |  2 +-
 keyboards/tada68/keymaps/iso-uk/keymap.c      |  2 +-
 keyboards/tada68/keymaps/isoish/keymap.c      |  2 +-
 keyboards/tada68/keymaps/jarred/keymap.c      |  4 +-
 keyboards/tada68/keymaps/kbp-v60/keymap.c     |  2 +-
 keyboards/tada68/keymaps/laas/keymap.c        |  2 +-
 keyboards/tada68/keymaps/mattdicarlo/keymap.c |  2 +-
 keyboards/tada68/keymaps/mattgemmell/keymap.c |  2 +-
 keyboards/tada68/keymaps/mekberg/keymap.c     |  2 +-
 keyboards/tada68/keymaps/mlechner/keymap.c    |  2 +-
 .../tada68/keymaps/onelivesleft/keymap.c      |  2 +-
 keyboards/tada68/keymaps/pascamel/keymap.c    |  2 +-
 keyboards/tada68/keymaps/peippo/keymap.c      |  2 +-
 keyboards/tada68/keymaps/raylas/keymap.c      |  2 +-
 keyboards/tada68/keymaps/rbong/keymap.c       |  2 +-
 keyboards/tada68/keymaps/rgb/keymap.c         |  2 +-
 keyboards/tada68/keymaps/rys/keymap.c         |  2 +-
 keyboards/tada68/keymaps/shalzz/keymap.c      |  2 +-
 keyboards/tada68/keymaps/sm0g/keymap.c        |  4 +-
 .../tada68/keymaps/stephengrier/keymap.c      |  2 +-
 .../tada68/keymaps/tokyovigilante/keymap.c    |  2 +-
 .../tada68/keymaps/tokyovigilante/layers.json |  2 +-
 keyboards/tada68/keymaps/trashcat/keymap.c    |  2 +-
 keyboards/tada68/keymaps/tshack/keymap.c      |  2 +-
 keyboards/tada68/keymaps/unix/keymap.c        |  2 +-
 keyboards/tada68/keymaps/via/keymap.c         |  2 +-
 keyboards/tada68/keymaps/wamsm_tada/keymap.c  |  2 +-
 .../team0110/p1800fl/keymaps/default/keymap.c |  2 +-
 .../team0110/p1800fl/keymaps/via/keymap.c     |  2 +-
 keyboards/tgr/910/keymaps/default/keymap.c    |  2 +-
 keyboards/tgr/910/keymaps/via/keymap.c        |  2 +-
 .../keymaps/jockyxu1122_ansi/keymap.c         |  2 +-
 .../minivan/keymaps/lexworth/keymap.c         |  2 +-
 keyboards/tkc/osav2/keymaps/stanrc85/keymap.c |  4 +-
 keyboards/tmo50/keymaps/default/keymap.c      |  4 +-
 keyboards/tmo50/keymaps/olivia/keymap.c       |  4 +-
 keyboards/tmo50/keymaps/via/keymap.c          |  4 +-
 keyboards/tmo50/keymaps/xerpocalypse/keymap.c |  4 +-
 keyboards/tr60w/keymaps/default/keymap.c      |  2 +-
 .../tzarc/djinn/keymaps/default/keymap.c      |  2 +-
 keyboards/uk78/keymaps/default/keymap.c       |  2 +-
 keyboards/uk78/keymaps/rask/keymap.c          |  2 +-
 .../diverge3/keymaps/iso_uk/keymap.c          |  4 +-
 .../diverge3/keymaps/workman/keymap.c         |  4 +-
 .../divergetm2/keymaps/xtonhasvim/keymap.c    |  4 +-
 .../keymaps/followingghosts/keymap.c          |  2 +-
 .../v60_type_r/keymaps/xtonhasvim/keymap.c    |  2 +-
 .../cypher/rev1/keymaps/default/keymap.c      |  2 +-
 .../cypher/rev1/keymaps/default_iso/keymap.c  |  2 +-
 .../cypher/rev5/keymaps/default/keymap.c      |  2 +-
 .../cypher/rev5/keymaps/default_iso/keymap.c  |  2 +-
 .../cypher/rev5/keymaps/max/keymap.c          |  2 +-
 .../cypher/rev5/keymaps/via/keymap.c          |  2 +-
 .../winkeyless/bface/keymaps/default/keymap.c |  2 +-
 .../winkeyless/bface/keymaps/via/keymap.c     |  2 +-
 keyboards/wolf/sabre/keymaps/default/keymap.c |  4 +-
 keyboards/wolf/sabre/keymaps/via/keymap.c     |  4 +-
 keyboards/wolf/ts60/keymaps/default/keymap.c  |  2 +-
 keyboards/wolf/ts60/keymaps/via/keymap.c      |  2 +-
 .../woodkeys/meira/keymaps/default/keymap.c   |  2 +-
 .../woodkeys/meira/keymaps/takmiya/keymap.c   |  2 +-
 keyboards/xiudi/xd60/keymaps/birkir/keymap.c  |  4 +-
 .../xiudi/xd60/keymaps/fvolpe83/keymap.c      |  2 +-
 keyboards/xiudi/xd60/keymaps/iso/keymap.c     |  2 +-
 keyboards/xiudi/xd68/keymaps/default/keymap.c |  2 +-
 .../xiudi/xd68/keymaps/default_iso/keymap.c   |  2 +-
 keyboards/xiudi/xd68/keymaps/via/keymap.c     |  2 +-
 .../xd75/keymaps/atomic_style_jp/keymap.c     |  2 +-
 keyboards/xiudi/xd75/keymaps/bramver/keymap.c |  4 +-
 .../xiudi/xd75/keymaps/bramver/readme.md      |  4 +-
 .../xiudi/xd75/keymaps/bulbizarre/keymap.c    |  4 +-
 .../xiudi/xd75/keymaps/buzzlighter1/keymap.c  | 12 +++---
 .../xiudi/xd75/keymaps/buzzlighter1/readme.md |  4 +-
 keyboards/xiudi/xd75/keymaps/french/keymap.c  |  4 +-
 keyboards/xiudi/xd75/keymaps/hybrid/keymap.c  |  2 +-
 .../xiudi/xd75/keymaps/kim-kim-xd73/keymap.c  |  4 +-
 keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c |  4 +-
 keyboards/xiudi/xd75/keymaps/msiu/keymap.c    |  2 +-
 .../xiudi/xd75/keymaps/tdl-jturner/keymap.c   |  2 +-
 keyboards/xiudi/xd75/keymaps/xo/keymap.c      |  2 +-
 .../xiudi/xd87/keymaps/mac_underglow/keymap.c |  4 +-
 keyboards/ymdk/bface/keymaps/default/keymap.c |  2 +-
 .../ymdk/melody96/keymaps/crilith/keymap.c    |  2 +-
 .../ymdk/melody96/keymaps/default/keymap.c    |  2 +-
 .../default_96_with60_split_num0/keymap.c     |  2 +-
 keyboards/ymdk/melody96/keymaps/dvz/keymap.c  |  2 +-
 keyboards/ymdk/melody96/keymaps/via/keymap.c  |  2 +-
 keyboards/ymdk/np21/keymaps/default/keymap.c  |  8 ++--
 keyboards/ymdk/np21/keymaps/via/keymap.c      |  8 ++--
 .../ymdk/np24/u4rgb6/keymaps/default/keymap.c |  8 ++--
 keyboards/ymdk/yd60mq/keymaps/64key/keymap.c  |  2 +-
 .../ymdk/yd60mq/keymaps/default/keymap.c      |  2 +-
 keyboards/ymdk/yd60mq/keymaps/via/keymap.c    |  2 +-
 keyboards/ymdk/ym68/keymaps/default/keymap.c  |  2 +-
 .../ymdk/ymd40/v2/keymaps/default/keymap.c    |  2 +-
 keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c  |  2 +-
 keyboards/ymdk/ymd67/keymaps/default/keymap.c |  2 +-
 keyboards/ymdk/ymd75/keymaps/default/keymap.c |  2 +-
 .../ymdk/ymd75/keymaps/default_iso/keymap.c   |  2 +-
 .../ymd96/keymaps/AnthonyWharton/keymap.c     |  2 +-
 keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c |  2 +-
 keyboards/zj68/keymaps/default/keymap.c       |  2 +-
 .../60_ansi/mechmerlin-ansi/keymap.c          |  2 +-
 .../60_ansi_split_bs_rshift/bcat/keymap.c     |  4 +-
 .../mechmerlin-split/keymap.c                 |  2 +-
 .../community/60_tsangan_hhkb/bcat/keymap.c   |  4 +-
 .../brandonschlack-tsngn/keymap.c             |  4 +-
 .../65_ansi_blocker/stanrc85/keymap.c         |  4 +-
 .../75_ansi/mechmerlin-75_ansi/keymap.c       |  2 +-
 layouts/community/75_ansi/yanfali/keymap.c    |  2 +-
 .../community/alice/stanrc85-alice/keymap.c   |  4 +-
 layouts/community/ergodox/333fred/keymap.c    |  2 +-
 .../community/ortho_4x12/greatwizard/keymap.c |  2 +-
 .../community/ortho_4x12/mindsound/keymap.c   |  2 +-
 .../community/ortho_5x12/greatwizard/keymap.c |  2 +-
 quantum/keycodes.h                            | 23 ++++++++----
 quantum/process_keycode/process_backlight.c   | 26 ++++++-------
 quantum/quantum_keycodes_legacy.h             |  3 ++
 users/dshields/dshields.h                     |  4 +-
 users/rs/rs.h                                 |  4 +-
 users/wanleg/wanleg.h                         |  2 +-
 707 files changed, 989 insertions(+), 958 deletions(-)

diff --git a/data/constants/keycodes/keycodes_0.0.1_lighting.hjson b/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
index 90ed36c645..77275cec29 100644
--- a/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
@@ -2,31 +2,52 @@
     "keycodes": {
         "0x7800": {
             "group": "backlight",
-            "key": "BL_ON"
+            "key": "QK_BACKLIGHT_ON",
+            "aliases": [
+                "BL_ON"
+            ]
         },
         "0x7801": {
             "group": "backlight",
-            "key": "BL_OFF"
+            "key": "QK_BACKLIGHT_OFF",
+            "aliases": [
+                "BL_OFF"
+            ]
         },
         "0x7802": {
             "group": "backlight",
-            "key": "BL_DEC"
+            "key": "QK_BACKLIGHT_TOGGLE",
+            "aliases": [
+                "BL_TOGG"
+            ]
         },
         "0x7803": {
             "group": "backlight",
-            "key": "BL_INC"
+            "key": "QK_BACKLIGHT_DOWN",
+            "aliases": [
+                "BL_DOWN"
+            ]
         },
         "0x7804": {
             "group": "backlight",
-            "key": "BL_TOGG"
+            "key": "QK_BACKLIGHT_UP",
+            "aliases": [
+                "BL_UP"
+            ]
         },
         "0x7805": {
             "group": "backlight",
-            "key": "BL_STEP"
+            "key": "QK_BACKLIGHT_STEP",
+            "aliases": [
+                "BL_STEP"
+            ]
         },
         "0x7806": {
             "group": "backlight",
-            "key": "BL_BRTG"
+            "key": "QK_BACKLIGHT_TOGGLE_BREATHING",
+            "aliases": [
+                "BL_BRTG"
+            ]
         },
 
         "0x7820": {
@@ -151,4 +172,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/docs/feature_backlight.md b/docs/feature_backlight.md
index 79782cf564..24057c608f 100644
--- a/docs/feature_backlight.md
+++ b/docs/feature_backlight.md
@@ -16,15 +16,15 @@ BACKLIGHT_ENABLE = yes
 
 Once enabled, the following keycodes below can be used to change the backlight level.
 
-|Key      |Description                        |
-|---------|-----------------------------------|
-|`BL_TOGG`|Turn the backlight on or off       |
-|`BL_STEP`|Cycle through backlight levels     |
-|`BL_ON`  |Set the backlight to max brightness|
-|`BL_OFF` |Turn the backlight off             |
-|`BL_INC` |Increase the backlight level       |
-|`BL_DEC` |Decrease the backlight level       |
-|`BL_BRTG`|Toggle backlight breathing         |
+| Key                             | Aliases   | Description                         |
+|---------------------------------|-----------|-------------------------------------|
+| `QK_BACKLIGHT_TOGGLE`           | `BL_TOGG` | Turn the backlight on or off        |
+| `QK_BACKLIGHT_STEP`             | `BL_STEP` | Cycle through backlight levels      |
+| `QK_BACKLIGHT_ON`               | `BL_ON`   | Set the backlight to max brightness |
+| `QK_BACKLIGHT_OFF`              | `BL_OFF`  | Turn the backlight off              |
+| `QK_BACKLIGHT_UP`               | `BL_UP`   | Increase the backlight level        |
+| `QK_BACKLIGHT_DOWN`             | `BL_DOWN` | Decrease the backlight level        |
+| `QK_BACKLIGHT_TOGGLE_BREATHING` | `BL_BRTG` | Toggle backlight breathing          |
 
 ## Functions :id=functions
 
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index 280db2a383..b468507424 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -199,7 +199,7 @@ x = 224 / (NUMBER_OF_COLS - 1) * COL_POSITION
 y =  64 / (NUMBER_OF_ROWS - 1) * ROW_POSITION
 ```
 
-Where NUMBER_OF_COLS, NUMBER_OF_ROWS, COL_POSITION, & ROW_POSITION are all based on the physical layout of your keyboard, not the electrical layout. 
+Where NUMBER_OF_COLS, NUMBER_OF_ROWS, COL_POSITION, & ROW_POSITION are all based on the physical layout of your keyboard, not the electrical layout.
 
 As mentioned earlier, the center of the keyboard by default is expected to be `{ 112, 32 }`, but this can be changed if you want to more accurately calculate the LED's physical `{ x, y }` positions. Keyboard designers can implement `#define LED_MATRIX_CENTER { 112, 32 }` in their config.h file with the new center point of the keyboard, or where they want it to be allowing more possibilities for the `{ x, y }` values. Do note that the maximum value for x or y is 255, and the recommended maximum is 224 as this gives animations runoff room before they reset.
 
@@ -221,14 +221,14 @@ As mentioned earlier, the center of the keyboard by default is expected to be `{
 
 All LED matrix keycodes are currently shared with the [Backlight feature](feature_backlight.md).
 
-|Key      |Description                  |
-|---------|-----------------------------|
-|`BL_TOGG`|Toggle LED Matrix on or off  |
-|`BL_STEP`|Cycle through modes          |
-|`BL_ON`  |Turn on LED Matrix           |
-|`BL_OFF` |Turn off LED Matrix          |
-|`BL_INC` |Increase the brightness level|
-|`BL_DEC` |Decrease the brightness level|
+| Key                     | Aliases   | Description                   |
+|-------------------------|-----------|-------------------------------|
+| `QK_BACKLIGHT_TOGGLE`   | `BL_TOGG` | Toggle LED Matrix on or off   |
+| `QK_BACKLIGHT_STEP`     | `BL_STEP` | Cycle through modes           |
+| `QK_BACKLIGHT_ON`       | `BL_ON`   | Turn on LED Matrix            |
+| `QK_BACKLIGHT_OFF`      | `BL_OFF`  | Turn off LED Matrix           |
+| `QK_BACKLIGHT_UP`       | `BL_UP`   | Increase the brightness level |
+| `QK_BACKLIGHT_DOWN`     | `BL_DOWN` | Decrease the brightness level |
 
 ## LED Matrix Effects :id=led-matrix-effects
 
@@ -439,7 +439,7 @@ Where `28` is an unused index from `eeconfig.h`.
 
 ### Indicators :id=indicators
 
-If you want to set custom indicators, such as an LED for Caps Lock, or layer indication, you can use the `led_matrix_indicators_kb` or `led_matrix_indicators_user` function for that: 
+If you want to set custom indicators, such as an LED for Caps Lock, or layer indication, you can use the `led_matrix_indicators_kb` or `led_matrix_indicators_user` function for that:
 ```c
 bool led_matrix_indicators_kb(void) {
     if (!led_matrix_indicators_user()) {
diff --git a/docs/keycodes.md b/docs/keycodes.md
index d185fe38c0..03ac181a44 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -278,15 +278,15 @@ See also: [Autocorrect](feature_autocorrect.md)
 
 See also: [Backlighting](feature_backlight.md)
 
-|Key      |Description                               |
-|---------|------------------------------------------|
-|`BL_TOGG`|Turn the backlight on or off              |
-|`BL_STEP`|Cycle through backlight levels            |
-|`BL_ON`  |Set the backlight to max brightness       |
-|`BL_OFF` |Turn the backlight off                    |
-|`BL_INC` |Increase the backlight level              |
-|`BL_DEC` |Decrease the backlight level              |
-|`BL_BRTG`|Toggle backlight breathing                |
+| Key                             | Aliases   | Description                         |
+|---------------------------------|-----------|-------------------------------------|
+| `QK_BACKLIGHT_TOGGLE`           | `BL_TOGG` | Turn the backlight on or off        |
+| `QK_BACKLIGHT_STEP`             | `BL_STEP` | Cycle through backlight levels      |
+| `QK_BACKLIGHT_ON`               | `BL_ON`   | Set the backlight to max brightness |
+| `QK_BACKLIGHT_OFF`              | `BL_OFF`  | Turn the backlight off              |
+| `QK_BACKLIGHT_UP`               | `BL_UP`   | Increase the backlight level        |
+| `QK_BACKLIGHT_DOWN`             | `BL_DOWN` | Decrease the backlight level        |
+| `QK_BACKLIGHT_TOGGLE_BREATHING` | `BL_BRTG` | Toggle backlight breathing          |
 
 ## Bluetooth :id=bluetooth
 
diff --git a/keyboards/0xcb/1337/keymaps/conor/keymap.c b/keyboards/0xcb/1337/keymaps/conor/keymap.c
index 615ca7baf8..2064537df1 100644
--- a/keyboards/0xcb/1337/keymaps/conor/keymap.c
+++ b/keyboards/0xcb/1337/keymaps/conor/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BLED] = LAYOUT(
     BL_STEP, BL_BRTG, BL_TOGG,
     BL_ON,   BL_OFF,  TO(2),
-    BL_INC,  BL_DEC,  TO(0)
+    BL_UP,   BL_DOWN, TO(0)
 )
 };
 // clang-format on
diff --git a/keyboards/0xcb/1337/keymaps/default/keymap.c b/keyboards/0xcb/1337/keymaps/default/keymap.c
index 751af6f4f7..3f05c97da9 100644
--- a/keyboards/0xcb/1337/keymaps/default/keymap.c
+++ b/keyboards/0xcb/1337/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BLED] = LAYOUT(
     BL_STEP, BL_BRTG, BL_TOGG,
     BL_ON,   BL_OFF,  TO(2),
-    BL_INC,  BL_DEC,  TO(0)
+    BL_UP,   BL_DOWN, TO(0)
 )
 };
 // clang-format on
diff --git a/keyboards/0xcb/1337/keymaps/jakob/keymap.c b/keyboards/0xcb/1337/keymaps/jakob/keymap.c
index f4a075844f..4f73a1d9fd 100644
--- a/keyboards/0xcb/1337/keymaps/jakob/keymap.c
+++ b/keyboards/0xcb/1337/keymaps/jakob/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BLED] = LAYOUT(
     BL_STEP, BL_BRTG, BL_TOGG,
     BL_ON,   BL_OFF,  TO(2),
-    BL_INC,  BL_DEC,  TO(0)
+    BL_UP,   BL_DOWN, TO(0)
 )
 };
 // clang-format on
diff --git a/keyboards/0xcb/1337/keymaps/via/keymap.c b/keyboards/0xcb/1337/keymaps/via/keymap.c
index a85670e06e..f6f32b7ba1 100644
--- a/keyboards/0xcb/1337/keymaps/via/keymap.c
+++ b/keyboards/0xcb/1337/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BLED] = LAYOUT(
     BL_STEP, BL_BRTG, BL_TOGG,
     BL_ON,   BL_OFF,  TO(2),
-    BL_INC,  BL_DEC,  TO(0)
+    BL_UP,   BL_DOWN, TO(0)
 )
 };
 // clang-format on
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
index e62f033d5f..c5db49007d 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [2] = LAYOUT_60_ansi(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-    BL_TOGG, BL_INC, BL_DEC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    BL_TOGG, BL_UP,  BL_DOWN,BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
index 040fda4399..001319637b 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [2] = LAYOUT_60_ansi(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-    BL_TOGG, BL_INC, BL_DEC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    BL_TOGG, BL_UP,  BL_DOWN,BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
index bd8ded4dcd..eeca330838 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [2] = LAYOUT_60_ansi(
     KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , QK_BOOT,
-    BL_TOGG , BL_INC   , BL_DEC  , BL_STEP , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ,
+    BL_TOGG , BL_UP    , BL_DOWN , BL_STEP , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ,
     RGB_TOG , RGB_MOD  , RGB_HUI , RGB_SAI , RGB_VAI , RGB_SPI , RGB_M_P  , RGB_M_B , RGB_M_R , RGB_M_SW , KC_TRNS , KC_TRNS , KC_TRNS ,
     KC_TRNS , RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , RGB_SPD , RGB_M_SN , RGB_M_K , RGB_M_X , RGB_M_G  , KC_TRNS , KC_TRNS ,
     KC_TRNS , KC_TRNS  , KC_TRNS ,           KC_TRNS           , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
index 56804c6608..ec7440588d 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_tsangan_hhkb(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
+        KC_CAPS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
index 4bf0c20b12..b1b5d06f5a 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_hhkb(
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
+        KC_CAPS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
                  _______, _______,                            _______,                                     _______, _______
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
index 6fde5f40c7..243df19de9 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_tsangan_hhkb(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
+        KC_CAPS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, _______
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
index efdd778215..c8b2f84b72 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_all(
 		QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
-		KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_TRNS, KC_TRNS,
+		KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/25keys/aleth42/keymaps/default/keymap.c b/keyboards/25keys/aleth42/keymaps/default/keymap.c
index a95fa7acf4..e078e731d7 100644
--- a/keyboards/25keys/aleth42/keymaps/default/keymap.c
+++ b/keyboards/25keys/aleth42/keymaps/default/keymap.c
@@ -99,8 +99,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       */
     [_ADJUST] = LAYOUT(
         KC_MUTE, KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-		_______, BL_TOGG, BL_STEP, BL_INC,  AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
-		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DEC,  _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
+		_______, BL_TOGG, BL_STEP, BL_UP,   AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
+		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DOWN, _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
 		KC_SLEP, _______, _______, _______, _______, _______, _______, _______
 		),
 };
diff --git a/keyboards/25keys/aleth42/keymaps/via/keymap.c b/keyboards/25keys/aleth42/keymaps/via/keymap.c
index 82fe4456f3..707d843950 100644
--- a/keyboards/25keys/aleth42/keymaps/via/keymap.c
+++ b/keyboards/25keys/aleth42/keymaps/via/keymap.c
@@ -99,8 +99,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       */
     [_ADJUST] = LAYOUT(
         KC_MUTE, KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-		_______, BL_TOGG, BL_STEP, BL_INC,  AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
-		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DEC,  _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
+		_______, BL_TOGG, BL_STEP, BL_UP,   AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
+		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DOWN, _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
 		KC_SLEP, _______, _______, _______, _______, _______, _______, _______
 		),
 };
diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
index cef154eed0..ab2a1fa1c1 100644
--- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [5] = LAYOUT_ortho_3x10(
     KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR,
-    _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,
+    _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, 
     _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______
   )
 
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
index fbbb5a2b85..139421c44c 100644
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
+++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
@@ -1 +1 @@
-{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"40percentclub/gherkin","keymap":"pierrec83","layout":"LAYOUT_ortho_3x10","layers":[["KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_BSPC","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_Z","KC_X","KC_M","KC_C","KC_V","LT(7,KC_SPC)","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_K"],["KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","KC_TRNS","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","KC_TRNS","KC_MPRV","KC_WH_D","KC_MNXT","TG(1)"],["KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","BL_BRTG","BL_INC","KC_WH_U","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","BL_TOGG","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","BL_STEP","BL_DEC","KC_WH_D","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS"],["KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_LCTL","KC_NO","KC_LALT","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12"],["KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["LT(8,KC_TRNS)","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","RALT(KC_TRNS)","RCTL(KC_TRNS)","TG(1)"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","EE_CLR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Anonymous"}
\ No newline at end of file
+{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"40percentclub/gherkin","keymap":"pierrec83","layout":"LAYOUT_ortho_3x10","layers":[["KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_BSPC","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_Z","KC_X","KC_M","KC_C","KC_V","LT(7,KC_SPC)","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_K"],["KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","KC_TRNS","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","KC_TRNS","KC_MPRV","KC_WH_D","KC_MNXT","TG(1)"],["KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","BL_BRTG","BL_UP","KC_WH_U","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","BL_TOGG","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","BL_STEP","BL_DOWN","KC_WH_D","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS"],["KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_LCTL","KC_NO","KC_LALT","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12"],["KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["LT(8,KC_TRNS)","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","RALT(KC_TRNS)","RCTL(KC_TRNS)","TG(1)"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","EE_CLR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Anonymous"}
\ No newline at end of file
diff --git a/keyboards/40percentclub/luddite/keymaps/default/keymap.c b/keyboards/40percentclub/luddite/keymaps/default/keymap.c
index bf447d8340..71a1c38976 100644
--- a/keyboards/40percentclub/luddite/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/luddite/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______,  _______
   )
 };
diff --git a/keyboards/40percentclub/luddite/keymaps/via/keymap.c b/keyboards/40percentclub/luddite/keymaps/via/keymap.c
index 61f83e6710..f8e876250a 100644
--- a/keyboards/40percentclub/luddite/keymaps/via/keymap.c
+++ b/keyboards/40percentclub/luddite/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [2] = LAYOUT_60_ansi(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_INC, BL_DEC, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP,  BL_DOWN,KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
     KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index c129396665..ed98d947e5 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -23,8 +23,8 @@
 #define KC_FN1 MO(_FN)
 #define KC_FN2 LT(_FN, KC_CAPS)
 
-#define KC_BLUP BL_INC   // Backlight increase
-#define KC_BLDN BL_DEC   // Backlight decrease
+#define KC_BLUP BL_UP    // Backlight increase
+#define KC_BLDN BL_DOWN  // Backlight decrease
 #define KC_BLTOG BL_TOGG // Backlight toggle
 #define KC_REC1 DM_REC1  // Record macro 1
 #define KC_PLY1 DM_PLY1  // Play macro 1
diff --git a/keyboards/8pack/keymaps/default/keymap.c b/keyboards/8pack/keymaps/default/keymap.c
index 9637f57702..e327d009e8 100644
--- a/keyboards/8pack/keymaps/default/keymap.c
+++ b/keyboards/8pack/keymaps/default/keymap.c
@@ -7,6 +7,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT(
 	    RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO,
-		QK_BOOT,   BL_DEC,   BL_INC,  BL_TOGG
+		QK_BOOT,   BL_DOWN,  BL_UP,   BL_TOGG
 	)
 };
diff --git a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
index 2070908b8d..a6742db9bb 100644
--- a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        BL_TOGG, BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
+        BL_TOGG, BL_DOWN, BL_UP,   KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
         KC_TRNS, QK_BOOT,   KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
index e8433ab6ca..02f6a1cda0 100644
--- a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-        BL_TOGG, BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
+        BL_TOGG, BL_DOWN, BL_UP,   KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
         KC_TRNS, QK_BOOT,   KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
index f9ae5253cc..eb4006a99b 100644
--- a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_SLEP,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
         RGB_TOG,  RGB_RMOD, RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_CLR,
         KC_TRNS,  KC_VOLD,  KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,         KC_TRNS,
-        BL_TOGG,  BL_DEC,   BL_INC,  KC_CALC, KC_MPLY, KC_MNXT, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
+        BL_TOGG,  BL_DOWN,  BL_UP,   KC_CALC, KC_MPLY, KC_MNXT, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
         KC_TRNS,  QK_BOOT,    KC_TRNS,                            KC_TRNS,                                     KC_STOP, KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
index c9b7b95306..99e6192794 100644
--- a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
+++ b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         RGB_TOG,  RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
         KC_TRNS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        BL_TOGG,  BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        BL_TOGG,  BL_DOWN, BL_UP,   KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c
index a02e82257f..612355ec45 100644
--- a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c
+++ b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_ortho_4x12(
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_INC , BL_DEC , _______, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_UP  , BL_DOWN, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, BL_TOGG, BL_INC,  BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______
+  _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
 
diff --git a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
index 34a58d508f..046e546848 100644
--- a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
+++ b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LOWER] = LAYOUT_ortho_4x12(
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_INC , BL_DEC , _______, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_UP  , BL_DOWN, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
@@ -95,6 +95,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, BL_TOGG, BL_INC,  BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______
+  _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
diff --git a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
index 0fd56a1a4a..6a15c93fa1 100644
--- a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
+++ b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_RCTL,    KC_VOLD, KC_VOLU, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,       MY_LOCK,
 //  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
 //  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-          _______,      BL_TOGG,  BL_INC,  BL_DEC, BL_STEP, _______, _______, _______, KC_MRWD, KC_MFFD, _______,    _______,     _______,
+          _______,      BL_TOGG,  BL_UP,   BL_DOWN,BL_STEP, _______, _______, _______, KC_MRWD, KC_MFFD, _______,    _______,     _______,
 //  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 //                   |        |   1,25u    |                                                        |   1,25u    |        |
          XXXXXXX,     _______,  _______,                          KC_MPLY,                            _______,    _______,      XXXXXXX
diff --git a/keyboards/al1/keymaps/default/keymap.c b/keyboards/al1/keymaps/default/keymap.c
index ef0c0abf06..9ea79868e4 100644
--- a/keyboards/al1/keymaps/default/keymap.c
+++ b/keyboards/al1/keymaps/default/keymap.c
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______,          BL_TOGG, BL_DEC,  BL_INC,           _______, _______
+        _______, _______, _______,                            _______,                            _______, _______, _______,          BL_TOGG, BL_DOWN, BL_UP,            _______, _______
     )
 };
diff --git a/keyboards/al1/keymaps/splitbs/keymap.c b/keyboards/al1/keymaps/splitbs/keymap.c
index db07e5ff25..71f2b80544 100644
--- a/keyboards/al1/keymaps/splitbs/keymap.c
+++ b/keyboards/al1/keymaps/splitbs/keymap.c
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                     _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______,                   BL_TOGG, BL_DEC,  BL_INC,           _______, _______
+        _______, _______, _______,                            _______,                            _______, _______, _______,                   BL_TOGG, BL_DOWN, BL_UP,            _______, _______
     )
 };
diff --git a/keyboards/alf/dc60/keymaps/default/keymap.c b/keyboards/alf/dc60/keymaps/default/keymap.c
index ddc488670c..68d49be983 100644
--- a/keyboards/alf/dc60/keymaps/default/keymap.c
+++ b/keyboards/alf/dc60/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS
       ),
 };
diff --git a/keyboards/alf/x11/keymaps/default/keymap.c b/keyboards/alf/x11/keymaps/default/keymap.c
index 4ba2d83a94..22d459faad 100644
--- a/keyboards/alf/x11/keymaps/default/keymap.c
+++ b/keyboards/alf/x11/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, QK_BOOT,
 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
-        BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_MUTE, KC_MPLY, KC_MSTP,
+        BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_MUTE, KC_MPLY, KC_MSTP,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,     _______, _______, _______
diff --git a/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
index 3c6475809d..41532c5d05 100755
--- a/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_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), BL_TOGG, BL_INC,  BL_DEC,
+        KC_F7,            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), BL_TOGG, BL_UP,   BL_DOWN,
         _______, _______, _______,                   _______, KC_LEFT,                         KC_DOWN, KC_UP,   KC_RGHT
     ),
 
diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
index 467e50982e..23ccc2b2ab 100644
--- a/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [2] = LAYOUT_625u_space(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        QK_BOOT,   KC_PWR,  _______, _______, KC_PSCR, KC_PAUS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP,          _______,
+        QK_BOOT,   KC_PWR,  _______, _______, KC_PSCR, KC_PAUS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP,          _______,
         KC_UP,            KC_MINS, KC_EQL,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LPRN, KC_RPRN, _______,
         KC_LEFT, KC_DOWN, KC_RGHT,                            _______,                            _______, _______
     ),
diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
index 42d79d0ade..e32bafc4c7 100644
--- a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [2] = LAYOUT_ortho_275u_space(
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         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,  BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______,
         QK_BOOT,   _______, _______, _______, _______,          _______,          _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
index 3489e84a47..07e1713b66 100644
--- a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [2] = LAYOUT_ortho_600u_space(
         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
-        _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______,
+        _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______
     ),
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
index 4a598d42a8..4a44ac6a85 100644
--- a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT, KC_SCLN, KC_COLON,KC_UNDS, KC_PLUS, _______, _______, KC_BSPC, \
 		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,             \
 		_______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______,          \
-		_______, _______, _______, _______, _______, _______, BL_INC,  BL_DEC                                      \
+		_______, _______, _______, _______, _______, _______, BL_UP,   BL_DOWN                                     \
 		),
 	
     [_ADJUST] = LAYOUT( \
diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c b/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
index fd87a98d19..72eb2bb5c8 100644
--- a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
+++ b/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
     [_ADJUST] = LAYOUT_rev41lp(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  BL_DEC, BL_TOGG,          BL_BRTG,  BL_INC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  BL_DOWN,BL_TOGG,          BL_BRTG,  BL_UP,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                         _______, _______, _______, _______, _______
diff --git a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
index 1e721883b2..8ee9053c12 100644
--- a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
+++ b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [3] = LAYOUT_rev41lp(
-    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,   BL_DOWN,  BL_TOGG,            BL_BRTG,   BL_UP,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            QK_BOOT,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
                                                _______, _______, _______,  _______,  _______
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
index 0a43c83440..f942cd3484 100644
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
+++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] = LAYOUT_rev41lp(
-    XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,    BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DOWN,  BL_TOGG,            BL_BRTG,   BL_UP,     BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   BL_STEP,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   UC_WINC, UC_MAC,   UC_LINX,  XXXXXXX,   XXXXXXX,            QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
                                                _______, _______, _______,  _______,  _______
diff --git a/keyboards/bioi/f60/keymaps/default/keymap.c b/keyboards/bioi/f60/keymaps/default/keymap.c
index 12162579cc..b988a17ce5 100644
--- a/keyboards/bioi/f60/keymaps/default/keymap.c
+++ b/keyboards/bioi/f60/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_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_HOME, KC_UP,   KC_END,  KC_PGUP, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
-        KC_TRNS,          BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,     KC_TRNS,
+        KC_TRNS,          BL_TOGG, BL_UP,   BL_DOWN, BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,     KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/bioi/f60/keymaps/via/keymap.c b/keyboards/bioi/f60/keymaps/via/keymap.c
index 398dc16ab6..6629b91a04 100644
--- a/keyboards/bioi/f60/keymaps/via/keymap.c
+++ b/keyboards/bioi/f60/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_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_HOME, KC_UP,   KC_END,  KC_PGUP, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, BL_TOGG, BL_UP,   BL_DOWN, BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [2] = LAYOUT_all(
diff --git a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
index d0be810451..5f4acc1b9d 100644
--- a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
+++ b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 [_FN1] = LAYOUT_60_ansi(
-    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_INC,   BL_DEC,   BL_BRTG,   _______,   _______,   _______,   _______,  BL_DEC,  BL_INC,   _______, 
+    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_UP,    BL_DOWN,  BL_BRTG,   _______,   _______,   _______,   _______,  BL_DOWN, BL_UP,    _______, 
      _______, _______,  _______,   _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, 
      _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, _______,          _______, 
      _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
diff --git a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
index 143fcc780f..397bf2c063 100644
--- a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
+++ b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [2] = LAYOUT_60_ansi(
-    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_INC,   BL_DEC,   BL_BRTG,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  BL_DEC,  BL_INC,   KC_TRNS, 
+    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_UP,    BL_DOWN,  BL_BRTG,   KC_TRNS,   KC_TRNS,   KC_TRNS,   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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
     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/cablecardesigns/cypher/rev6/keymaps/default/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
index 992bfcb32d..2481acd52a 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_F1] = LAYOUT_all( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, KC_DEL , _______,       _______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
   _______, _______,_______,                    _______,_______,_______,        _______,_______,_______,          _______,_______,_______,    _______, _______, _______),
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
index 63764a6891..a22cc247d6 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_F1] = LAYOUT_all( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,  	 	    _______, _______, _______, _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______,  _______, _______, _______, _______,
   _______, _______,_______,          _______,_______,_______,                  _______,_______,_______,           _______,_______,_______,	 _______, _______, _______),
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
index 380a305abc..aa276645ae 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all(
   QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,  	          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS,                  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/cannonkeys/an_c/keymaps/default/keymap.c b/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
index e82bf0bdee..d4d5faa9cc 100644
--- a/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
index f42eab53ac..adb33da258 100644
--- a/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
+++ b/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                            _______,                            _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/an_c/keymaps/via/keymap.c b/keyboards/cannonkeys/an_c/keymaps/via/keymap.c
index 3e518d71ce..07b2a9fa0c 100644
--- a/keyboards/cannonkeys/an_c/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/an_c/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/atlas/keymaps/via/keymap.c b/keyboards/cannonkeys/atlas/keymaps/via/keymap.c
index b9d047fc75..1513b119a4 100644
--- a/keyboards/cannonkeys/atlas/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/atlas/keymaps/via/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_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, _______,
-  RGB_TOG, RGB_MOD, BL_INC,  BL_DEC,  _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  RGB_TOG, RGB_MOD, BL_UP,   BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
 [_EXTRA] = LAYOUT_ortho_5x12(
diff --git a/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c b/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c
index 28a512fc9f..9fb6ad6f78 100644
--- a/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/chimera65/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_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,
 		BL_BRTG, 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,
-		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c b/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c
index 28a512fc9f..9fb6ad6f78 100644
--- a/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/chimera65/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_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,
 		BL_BRTG, 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,
-		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c b/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c
index 77c2c683b0..6170ce8880 100644
--- a/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                                KC_RALT,    KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c b/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c
index c3dc6905a7..ec06f2fc71 100644
--- a/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/db60/keymaps/default/keymap.c b/keyboards/cannonkeys/db60/keymaps/default/keymap.c
index 60288c6443..317eeab093 100644
--- a/keyboards/cannonkeys/db60/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/db60/keymaps/iso/keymap.c b/keyboards/cannonkeys/db60/keymaps/iso/keymap.c
index 9a0fd2ea98..a0cacca0f5 100644
--- a/keyboards/cannonkeys/db60/keymaps/iso/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/iso/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
-    BL_INC,  _______, BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    BL_UP,   _______, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
index affb0bb132..d280f72d1e 100644
--- a/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                            _______,                            _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/db60/keymaps/via/keymap.c b/keyboards/cannonkeys/db60/keymaps/via/keymap.c
index 43390564a5..a225928756 100644
--- a/keyboards/cannonkeys/db60/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/db60/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,         _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c b/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c
index b5ed3f0baf..6efe15c91d 100644
--- a/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/devastatingtkl/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  MO(1),      KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c b/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c
index 9f29ef880b..0ec9917a2f 100644
--- a/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/devastatingtkl/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c b/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c
index ec4710734d..646a0769c3 100644
--- a/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN,BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                           _______,                                     _______, _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c b/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c
index 49dcf74e20..4d32b2bd1e 100644
--- a/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN,BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                           _______,                                     _______, _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
index 7cf77c4f90..e510284d90 100644
--- a/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c
index ae922b638b..96419ee914 100644
--- a/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
-		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
+		BL_UP,   BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c
index cc674a0f1f..70ec9dc966 100644
--- a/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
+		BL_UP,   BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     ),
 
     [_FN2] = LAYOUT_default(
diff --git a/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c b/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
index 70ec6500df..901fed8e2d 100644
--- a/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                                KC_RALT,    KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS,
diff --git a/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c b/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
index 8e7b42bb7a..592a804925 100644
--- a/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                                KC_RALT,    KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
   [_FN1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
 
   [_FN2] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_MPLY, 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_TRNS,
diff --git a/keyboards/cannonkeys/instant60/keymaps/default/keymap.c b/keyboards/cannonkeys/instant60/keymaps/default/keymap.c
index d0a9e8af03..5f92f6bb87 100644
--- a/keyboards/cannonkeys/instant60/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
index b78d591fe3..a2ebb9a0c2 100644
--- a/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,\
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,\
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,\
     _______,  _______, _______,                            _______,                            _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/instant60/keymaps/via/keymap.c b/keyboards/cannonkeys/instant60/keymaps/via/keymap.c
index c29bc5a3ee..8e7ae79a5a 100644
--- a/keyboards/cannonkeys/instant60/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c b/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
index 3e518d71ce..07b2a9fa0c 100644
--- a/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
+++ b/keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/instant65/keymaps/default/keymap.c b/keyboards/cannonkeys/instant65/keymaps/default/keymap.c
index ae922b638b..96419ee914 100644
--- a/keyboards/cannonkeys/instant65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/instant65/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
-		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
+		BL_UP,   BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/instant65/keymaps/via/keymap.c b/keyboards/cannonkeys/instant65/keymaps/via/keymap.c
index cc674a0f1f..70ec9dc966 100644
--- a/keyboards/cannonkeys/instant65/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/instant65/keymaps/via/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		BL_INC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
+		BL_UP,   BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     ),
 
     [_FN2] = LAYOUT_default(
diff --git a/keyboards/cannonkeys/iron165/keymaps/default/keymap.c b/keyboards/cannonkeys/iron165/keymaps/default/keymap.c
index 3bcf0cd5d9..5dcf21077b 100644
--- a/keyboards/cannonkeys/iron165/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/iron165/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_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,
 		BL_BRTG, 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,
-		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c b/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c
index e5c58bfc0f..819f6530ec 100644
--- a/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL, _______,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______, _______,
-              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, BL_UP,   BL_DOWN, BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT,   _______, _______, _______
   )
 };
diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c b/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c
index f8d3753f43..31d88100cc 100644
--- a/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL, _______,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______, _______,
-              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, BL_UP,   BL_DOWN, BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT,   _______, _______, _______
   ),
 
diff --git a/keyboards/cannonkeys/moment/keymaps/default/keymap.c b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
index 0341152011..d8b10465e4 100644
--- a/keyboards/cannonkeys/moment/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/moment/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN,BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/moment/keymaps/via/keymap.c b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
index 0341152011..d8b10465e4 100644
--- a/keyboards/cannonkeys/moment/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/moment/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN,BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
index 7cf77c4f90..e510284d90 100644
--- a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c b/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
index c8feb56a09..7f0f3e3554 100644
--- a/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
-		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c b/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c
index 920d2893af..d976ed5355 100644
--- a/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     ),
 
diff --git a/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c
index c02fc0a470..c23ad896fa 100644
--- a/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c
@@ -83,6 +83,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_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, _______,
-    RGB_TOG, RGB_MOD, BL_INC,  BL_DEC, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    RGB_TOG, RGB_MOD, BL_UP,   BL_DOWN,_______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 };
diff --git a/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c
index ea9651f2d6..7189fa08c0 100644
--- a/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_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, _______,
-    RGB_TOG, RGB_MOD, BL_INC,  BL_DEC, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    RGB_TOG, RGB_MOD, BL_UP,   BL_DOWN,_______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
 [3] = LAYOUT_ortho_4x12(
diff --git a/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c
index 36f95318fb..4d35614f69 100644
--- a/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c
@@ -92,6 +92,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_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, _______,
-  RGB_TOG, RGB_MOD, BL_INC,  BL_DEC,  _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  RGB_TOG, RGB_MOD, BL_UP,   BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 )
 };
diff --git a/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c
index 8d0060d015..04accef9a1 100644
--- a/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_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, _______,
-  RGB_TOG, RGB_MOD, BL_INC,  BL_DEC,  _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  RGB_TOG, RGB_MOD, BL_UP,   BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
 [3] = LAYOUT_ortho_5x12(
diff --git a/keyboards/cannonkeys/practice60/keymaps/default/keymap.c b/keyboards/cannonkeys/practice60/keymaps/default/keymap.c
index e4943de3f8..b7303d34db 100644
--- a/keyboards/cannonkeys/practice60/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/practice60/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, _______
   )
 };
diff --git a/keyboards/cannonkeys/practice60/keymaps/via/keymap.c b/keyboards/cannonkeys/practice60/keymaps/via/keymap.c
index c7475f4b8c..ba853dec38 100644
--- a/keyboards/cannonkeys/practice60/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/practice60/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [2] = LAYOUT_60_ansi(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  KC_TRNS,
     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
     KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/cannonkeys/practice65/keymaps/default/keymap.c b/keyboards/cannonkeys/practice65/keymaps/default/keymap.c
index 15a19c6b68..1addad6b0d 100644
--- a/keyboards/cannonkeys/practice65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/practice65/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, _______, _______, QK_BOOT
   )
 };
diff --git a/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c b/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c
index 3a20ea911f..f7fa2ab75f 100644
--- a/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/rekt1800/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
 		BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,
-		BL_INC, BL_DEC, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		BL_UP,  BL_DOWN,BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
 		KC_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/cannonkeys/rekt1800/keymaps/via/keymap.c b/keyboards/cannonkeys/rekt1800/keymaps/via/keymap.c
index d8dc4ecb56..1ebf06221e 100644
--- a/keyboards/cannonkeys/rekt1800/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/rekt1800/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
 		BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,
-		BL_INC, BL_DEC, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		BL_UP,  BL_DOWN,BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
 		KC_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/cannonkeys/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
index 0d2fdc359c..c40815a8d8 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
@@ -144,7 +144,7 @@ uint16_t handle_encoder_ccw(){
       mapped_code = KC_WH_U;
       break;
     case ENC_MODE_BACKLIGHT:
-      // mapped_code = BL_DEC;
+      // mapped_code = BL_DOWN;
       if(kb_backlight_config.level != 0){
         kb_backlight_config.level = kb_backlight_config.level - 1;
       }
diff --git a/keyboards/cannonkeys/savage65/keymaps/default/keymap.c b/keyboards/cannonkeys/savage65/keymaps/default/keymap.c
index 1c95b25a47..475dd5a52b 100644
--- a/keyboards/cannonkeys/savage65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/savage65/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
-		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/savage65/keymaps/via/keymap.c b/keyboards/cannonkeys/savage65/keymaps/via/keymap.c
index 245187bfc2..cdba5d037c 100644
--- a/keyboards/cannonkeys/savage65/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/savage65/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		BL_BRTG, 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,
-		BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/tmov2/keymaps/default/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/default/keymap.c
index dbc1f6be05..2a06163a66 100644
--- a/keyboards/cannonkeys/tmov2/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/tmov2/keymaps/default/keymap.c
@@ -31,8 +31,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		BL_INC, KC_TAB, KC_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,
-		BL_DEC, KC_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,
+		BL_UP,  KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+		BL_DOWN,KC_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,
 		RGB_MOD, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2),
 		RGB_TOG, KC_LALT, KC_LGUI, LT(_FN1, KC_SPC), KC_SPC, KC_RALT, MO(_FN3)
     ),
diff --git a/keyboards/cannonkeys/tmov2/keymaps/via/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/via/keymap.c
index dbc1f6be05..2a06163a66 100644
--- a/keyboards/cannonkeys/tmov2/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/tmov2/keymaps/via/keymap.c
@@ -31,8 +31,8 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_BASE] = LAYOUT_default(
-		BL_INC, KC_TAB, KC_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,
-		BL_DEC, KC_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,
+		BL_UP,  KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+		BL_DOWN,KC_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,
 		RGB_MOD, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2),
 		RGB_TOG, KC_LALT, KC_LGUI, LT(_FN1, KC_SPC), KC_SPC, KC_RALT, MO(_FN3)
     ),
diff --git a/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c b/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c
index 64071a0752..1ab5bd7a17 100644
--- a/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/tsukuyomi/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC, 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_TRNS, RGB_TOG,
 		KC_F5,  KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		KC_F6,  BL_BRTG, 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_F7,  BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_F7,  BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_F8,  KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c b/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c
index 8333746088..259a247c95 100644
--- a/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/tsukuyomi/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC, 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_TRNS, RGB_TOG,
 		KC_F5,  KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
 		KC_F6,  BL_BRTG, 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_F7,  BL_INC,  BL_DEC,  BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_F7,  BL_UP,   BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_F8,  KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
     ),
 
diff --git a/keyboards/cannonkeys/vector/keymaps/default/keymap.c b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
index 60c2115a22..a4ce417ac4 100644
--- a/keyboards/cannonkeys/vector/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/vector/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
     _______,  _______, _______,                  _______, _______, _______,                            _______, _______, QK_BOOT
   ),
 
diff --git a/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c b/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c
index e561f305c0..b0e75af46f 100644
--- a/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/vicious40/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN2] = LAYOUT_default(
 		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_INS,
 		KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_INC, BL_TOGG,
-		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_BRTG
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP,  BL_TOGG,
+		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_BRTG
     )
 };
diff --git a/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c b/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c
index e71fb7d022..67753e056a 100644
--- a/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/vicious40/keymaps/via/keymap.c
@@ -47,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN2] = LAYOUT_default(
 		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_INS,
 		KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_INC, BL_TOGG,
-		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_BRTG
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP,  BL_TOGG,
+		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_BRTG
     ),
 
     [_FN3] = LAYOUT_default(
diff --git a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
index b81a95c671..79cc519ae7 100644
--- a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
       RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
       _______,  _______, _______,                                  _______,                                       _______, _______, QK_BOOT
     ),
 
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
       RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
       _______,  _______, _______,                           _______,                                              _______, _______, QK_BOOT
     )
 };
diff --git a/keyboards/checkerboards/nop60/keymaps/default/keymap.c b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
index 0b3bdee669..b8b06e40ef 100644
--- a/keyboards/checkerboards/nop60/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
       RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
       _______,  _______, _______,                               _______, _______, _______,                            _______, _______, QK_BOOT
     ),
 
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
       RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
       _______,  _______, _______,                           _______, _______, _______,                            _______, _______, QK_BOOT
     )
 };
diff --git a/keyboards/checkerboards/nop60/keymaps/via/keymap.c b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
index d8cba3f2ab..07345b9ca8 100644
--- a/keyboards/checkerboards/nop60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
       RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
       _______,  _______, _______,                               _______, _______, _______,                            _______, _______, QK_BOOT
     ),
 
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
       RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
       _______,  _______, _______,                           _______, _______, _______,                            _______, _______, QK_BOOT
     ),
 
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
       RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
       _______,  _______, _______,                           _______, _______, _______,                            _______, _______, QK_BOOT
     )
 };
diff --git a/keyboards/checkerboards/snop60/keymaps/7u/keymap.c b/keyboards/checkerboards/snop60/keymaps/7u/keymap.c
index 82a332887f..7b14bb3f57 100644
--- a/keyboards/checkerboards/snop60/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/snop60/keymaps/7u/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        BL_INC,           BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_UP,            BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, QK_BOOT
     ),
 
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        BL_INC,           BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_UP,            BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                                     _______, _______, QK_BOOT
     )
 };
diff --git a/keyboards/checkerboards/snop60/keymaps/default/keymap.c b/keyboards/checkerboards/snop60/keymaps/default/keymap.c
index 6fdcad7989..a381603e54 100644
--- a/keyboards/checkerboards/snop60/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/snop60/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        BL_INC,           BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_UP,            BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,                   _______, _______, QK_BOOT
     )
 };
diff --git a/keyboards/checkerboards/snop60/keymaps/via/keymap.c b/keyboards/checkerboards/snop60/keymaps/via/keymap.c
index 9f3d7f2925..c2d8c3af38 100644
--- a/keyboards/checkerboards/snop60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/snop60/keymaps/via/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        BL_INC,           BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_UP,            BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,                   _______, _______, QK_BOOT
     ),
 
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        BL_INC,           BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_UP,            BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,                   _______, _______, QK_BOOT
     ),
 
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        BL_INC,           BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_UP,            BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,                   _______, _______, QK_BOOT
     )
 };
diff --git a/keyboards/chlx/merro60/keymaps/default/keymap.c b/keyboards/chlx/merro60/keymaps/default/keymap.c
index 4bda91040b..9d9c34d919 100644
--- a/keyboards/chlx/merro60/keymaps/default/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/default/keymap.c
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
   _______, _______, _______,                   _______,                                     _______, _______, _______, _______),
 };
diff --git a/keyboards/chlx/merro60/keymaps/via/keymap.c b/keyboards/chlx/merro60/keymaps/via/keymap.c
index 3591766b62..5459a2558a 100644
--- a/keyboards/chlx/merro60/keymaps/via/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
   _______, _______, _______,                   _______,                                     _______, _______, _______, _______),
 
 [2] = LAYOUT_all(
diff --git a/keyboards/chlx/str_merro60/keymaps/default/keymap.c b/keyboards/chlx/str_merro60/keymaps/default/keymap.c
index cad07e7be7..46da3c827c 100644
--- a/keyboards/chlx/str_merro60/keymaps/default/keymap.c
+++ b/keyboards/chlx/str_merro60/keymaps/default/keymap.c
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
   _______, _______,                   _______, _______,                            _______, _______, _______, _______),
 };
diff --git a/keyboards/chlx/str_merro60/keymaps/via/keymap.c b/keyboards/chlx/str_merro60/keymaps/via/keymap.c
index d9820d0daf..115f80b583 100644
--- a/keyboards/chlx/str_merro60/keymaps/via/keymap.c
+++ b/keyboards/chlx/str_merro60/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
   _______, _______,                   _______, _______,                            _______, _______, _______, _______),
 
 [2] = LAYOUT_all(
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
index f3d4fe5c3d..2a1a772272 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
@@ -68,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _CL: Control layer
    */
 [_CL] = LAYOUT(
-  BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   BL_TOGG,           BL_INC,
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                BL_DEC,
+  BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   BL_TOGG,           BL_UP, 
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                BL_DOWN,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,
   _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,
   _______,_______,_______,                BL_BRTG,BL_BRTG,                        _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json b/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
index 4849f814dd..6ff257b850 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
@@ -1 +1 @@
-{"keyboard":"clueboard/66_hotswap/gen1","keymap":"default_66","layout":"LAYOUT","layers":[["QK_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","MO(1)","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_DEL","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_MPRV","KC_MPLY","KC_MNXT","KC_NO","KC_MUTE","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","MO(1)","KC_NO","KC_HOME","KC_PGDN","KC_END"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_TOGG","BL_INC","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_DEC","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_STEP","KC_NO","KC_NO","MO(1)","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"","notes":""}
\ No newline at end of file
+{"keyboard":"clueboard/66_hotswap/gen1","keymap":"default_66","layout":"LAYOUT","layers":[["QK_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_PGUP","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","MO(1)","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_DEL","BL_UP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_MPRV","KC_MPLY","KC_MNXT","KC_NO","KC_MUTE","BL_DOWN","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","MO(1)","KC_NO","KC_HOME","KC_PGDN","KC_END"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_TOGG","BL_UP","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_DOWN","KC_NO","KC_NO","MO(2)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_STEP","KC_NO","KC_NO","MO(1)","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c
index 80f75a0fde..a5bc772abd 100644
--- a/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c
@@ -68,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _CL: Control layer
    */
 [_CL] = LAYOUT(
-  BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   BL_TOGG,           BL_INC,
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                BL_DEC,
+  BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   BL_TOGG,           BL_UP, 
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                BL_DOWN,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_SAI,
   _______,_______,_______,                BL_BRTG,BL_BRTG,                        _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/keyboards/db/db63/keymaps/default/keymap.c b/keyboards/db/db63/keymaps/default/keymap.c
index d6086ddc87..409545b2a9 100644
--- a/keyboards/db/db63/keymaps/default/keymap.c
+++ b/keyboards/db/db63/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LALT, KC_LGUI,                              KC_SPC,                    _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [3] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_BRTG, BL_TOGG, BL_DEC,  BL_INC,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_BRTG, BL_TOGG, BL_DOWN, BL_UP,   _______,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         MO(3),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          QK_BOOT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   XXXXXXX,
diff --git a/keyboards/do60/keymaps/default/keymap.c b/keyboards/do60/keymaps/default/keymap.c
index 671d6d29a3..56be63b725 100644
--- a/keyboards/do60/keymaps/default/keymap.c
+++ b/keyboards/do60/keymaps/default/keymap.c
@@ -13,8 +13,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   [1] = LAYOUT_all(
       QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_NO,    KC_NO,
-      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,          KC_DEL,
-      KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DEC, KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
+      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_UP,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,          KC_DEL,
+      KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DOWN,KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
 
diff --git a/keyboards/do60/keymaps/via/keymap.c b/keyboards/do60/keymaps/via/keymap.c
index 28cf374ee7..9d930d3dac 100644
--- a/keyboards/do60/keymaps/via/keymap.c
+++ b/keyboards/do60/keymaps/via/keymap.c
@@ -13,8 +13,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // 1: Function Layer
   [1] = LAYOUT_all(
       QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_NO,    KC_NO,
-      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_INC, KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,          KC_DEL,
-      KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DEC, KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
+      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  BL_TOGG,BL_ON,  BL_UP,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,          KC_DEL,
+      KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DOWN,KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,            KC_ENT,
       KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,  KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  , KC_PGUP,  KC_INS,
       KC_LCTL, KC_LGUI, KC_LALT,                    KC_BSPC,KC_SPC, KC_DEL,                  KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
 
diff --git a/keyboards/donutcables/budget96/keymaps/default/keymap.c b/keyboards/donutcables/budget96/keymaps/default/keymap.c
index e3870a7fb5..da335622d0 100644
--- a/keyboards/donutcables/budget96/keymaps/default/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_96_ansi(
       QK_BOOT, EE_CLR,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
-      BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/donutcables/budget96/keymaps/via/keymap.c b/keyboards/donutcables/budget96/keymaps/via/keymap.c
index 65bceae47d..26a3c7cf0c 100644
--- a/keyboards/donutcables/budget96/keymaps/via/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_96_ansi(
       QK_BOOT, EE_CLR,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
-      BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/doro67/multi/keymaps/default/keymap.c b/keyboards/doro67/multi/keymaps/default/keymap.c
index fa9ac32e5e..87a4276843 100644
--- a/keyboards/doro67/multi/keymaps/default/keymap.c
+++ b/keyboards/doro67/multi/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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,  _______,          _______,
-        BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/doro67/multi/keymaps/default_iso/keymap.c b/keyboards/doro67/multi/keymaps/default_iso/keymap.c
index 2412a0836e..b683bced7e 100644
--- a/keyboards/doro67/multi/keymaps/default_iso/keymap.c
+++ b/keyboards/doro67/multi/keymaps/default_iso/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______,
-        BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/doro67/multi/keymaps/default_multi/keymap.c b/keyboards/doro67/multi/keymaps/default_multi/keymap.c
index 319ce06501..5a2900cfdd 100644
--- a/keyboards/doro67/multi/keymaps/default_multi/keymap.c
+++ b/keyboards/doro67/multi/keymaps/default_multi/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_multi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
-        BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
diff --git a/keyboards/doro67/multi/keymaps/via/keymap.c b/keyboards/doro67/multi/keymaps/via/keymap.c
index f3e1982c80..c6082150ad 100644
--- a/keyboards/doro67/multi/keymaps/via/keymap.c
+++ b/keyboards/doro67/multi/keymaps/via/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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,  _______,          _______,
-        BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
diff --git a/keyboards/doro67/multi/keymaps/zyber/keymap.c b/keyboards/doro67/multi/keymaps/zyber/keymap.c
index 367a648436..05200e8855 100644
--- a/keyboards/doro67/multi/keymaps/zyber/keymap.c
+++ b/keyboards/doro67/multi/keymaps/zyber/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_multi(
     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, ,
-    BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c b/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
index c8996b7bf1..b976dd03ad 100644
--- a/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
+++ b/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_LAYER1] = LAYOUT(
         QK_BOOT,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            KC_SLEP,  KC_WAKE,  KC_PWR,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            BL_STEP,  BL_ON,    BL_INC,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            BL_BRTG,  BL_OFF,   BL_DEC,
+		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            BL_STEP,  BL_ON,    BL_UP, 
+		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            BL_BRTG,  BL_OFF,   BL_DOWN,
 		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
 		    _______,        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,                           KC_VOLU, 
 		_______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,            KC_MPRV,  KC_VOLD,  KC_MNXT
diff --git a/keyboards/duck/orion/v3/keymaps/default/keymap.c b/keyboards/duck/orion/v3/keymaps/default/keymap.c
index 0e1279d473..bff90880f7 100644
--- a/keyboards/duck/orion/v3/keymaps/default/keymap.c
+++ b/keyboards/duck/orion/v3/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [1] = LAYOUT_tkl_ansi(
   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, 
   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-  BL_TOGG,  BL_STEP,  BL_INC,  BL_DEC,  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, 
+  BL_TOGG,  BL_STEP,  BL_UP,   BL_DOWN, 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, 
   RGB_TOG,  RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          
   KC_TRNS,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) 
diff --git a/keyboards/dz60/keymaps/60_ansi/keymap.c b/keyboards/dz60/keymaps/60_ansi/keymap.c
index dd3788a0bc..66a0aaf4b2 100644
--- a/keyboards/dz60/keymaps/60_ansi/keymap.c
+++ b/keyboards/dz60/keymaps/60_ansi/keymap.c
@@ -13,6 +13,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
 		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c b/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c
index 19834a7665..fab77b2f34 100644
--- a/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c
+++ b/keyboards/dz60/keymaps/60_ansi_arrow_fkeys/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_directional(
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS, QK_BOOT,
       ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, ______,
-      ______, BL_TOGG, BL_STEP, BL_INC, BL_DEC, ______, ______, ______, ______, ______, ______, ______,
+      ______, BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______
       ),
diff --git a/keyboards/dz60/keymaps/60_plus_arrows/keymap.c b/keyboards/dz60/keymaps/60_plus_arrows/keymap.c
index 4758c38a64..b14221ae71 100644
--- a/keyboards/dz60/keymaps/60_plus_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/60_plus_arrows/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
   LAYOUT_directional(
-      KC_ESC, BL_TOGG, BL_STEP, BL_DEC, BL_INC, ______, ______, QK_BOOT, ______, ______, ______, ______, ______, ______, ______,
+      KC_ESC, BL_TOGG, BL_STEP, BL_DOWN,BL_UP,  ______, ______, QK_BOOT, ______, ______, ______, ______, ______, ______, ______,
       ______, RGB_MOD, ______, ______, ______, ______, ______, ______, ______, ______, ______, RGB_VAI, RGB_VAD, RGB_TOG,
       ______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, ______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_RCTL, ______,
diff --git a/keyboards/dz60/keymaps/60_tsangan/keymap.c b/keyboards/dz60/keymaps/60_tsangan/keymap.c
index cd430a39d5..765e01150f 100644
--- a/keyboards/dz60/keymaps/60_tsangan/keymap.c
+++ b/keyboards/dz60/keymaps/60_tsangan/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______,
 		_______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
 		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______,          _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______,          _______, _______,
+		_______,          _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______,          _______, _______,
 		_______, _______,          _______,                   _______,                                     _______,          _______, _______
 	)
 };
diff --git a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
index ab5b0430c8..a7b77d423a 100644
--- a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
+++ b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
 		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_LEFT, KC_DOWN, KC_RIGHT),
 
 	LAYOUT(
diff --git a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c b/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
index 6111166eea..1c0c7f9078 100644
--- a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
+++ b/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [KEYB] = LAYOUT_bonfire(
         TO(BASE), TG(NRMN), TO(GAME), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, 
         XXXXXXX,  RGB_TOG,  RGB_MOD,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX,  BL_DEC,   BL_TOGG,  BL_INC,  BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX,  BL_DOWN,  BL_TOGG,  BL_UP,   BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX
     )
diff --git a/keyboards/dz60/keymaps/atlacat/keymap.c b/keyboards/dz60/keymaps/atlacat/keymap.c
index 8ecd45cb18..fa4c382f76 100644
--- a/keyboards/dz60/keymaps/atlacat/keymap.c
+++ b/keyboards/dz60/keymaps/atlacat/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_SLEP,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
         _______,          RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,
-        _______, _______, BL_DEC , BL_TOGG, BL_INC , BL_STEP, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,          _______,
+        _______, _______, BL_DOWN, BL_TOGG, BL_UP  , BL_STEP, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,          _______,
         _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
 
 };
diff --git a/keyboards/dz60/keymaps/boris_burger/keymap.c b/keyboards/dz60/keymaps/boris_burger/keymap.c
index fcc1121d69..b29c76ee12 100644
--- a/keyboards/dz60/keymaps/boris_burger/keymap.c
+++ b/keyboards/dz60/keymaps/boris_burger/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_directional(
         KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_DEL ,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
-        _______,          BL_TOGG, BL_STEP, BL_INC , BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          BL_TOGG, BL_STEP, BL_UP  , BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______,          _______, _______,          _______,          _______,          _______, _______, KC_HOME, KC_PGDN, KC_END
         ),
diff --git a/keyboards/dz60/keymaps/coppertop/keymap.c b/keyboards/dz60/keymaps/coppertop/keymap.c
index 85336e4f9d..3d733bfad2 100644
--- a/keyboards/dz60/keymaps/coppertop/keymap.c
+++ b/keyboards/dz60/keymaps/coppertop/keymap.c
@@ -67,8 +67,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_INS,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAD,
         KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PAUS, KC_PSCR,
-        _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, KC_PGUP, BL_INC,  KC_PGDN,
-        _______, _______, _______, XXXXXXX, _______,  XXXXXXX,  XXXXXXX, XXXXXXX, BL_TOGG, BL_DEC,  BL_STEP
+        _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, KC_PGUP, BL_UP,   KC_PGDN,
+        _______, _______, _______, XXXXXXX, _______,  XXXXXXX,  XXXXXXX, XXXXXXX, BL_TOGG, BL_DOWN, BL_STEP
         ),
 
 /* SFX/Multimedia/Numpad layer
diff --git a/keyboards/dz60/keymaps/danbee/keymap.c b/keyboards/dz60/keymaps/danbee/keymap.c
index b2ec2f72df..19ef257f52 100644
--- a/keyboards/dz60/keymaps/danbee/keymap.c
+++ b/keyboards/dz60/keymaps/danbee/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     │    │    │    │                        │    │    │    │    │
     └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
   [_L1] = LAYOUT_60_iso( /* Layer 1: Functions */
-    KC_NUBS, KC_BRID, KC_BRIU, _______, _______, BL_DEC,  BL_INC,  KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
+    KC_NUBS, KC_BRID, KC_BRIU, _______, _______, BL_DOWN, BL_UP,   KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______, KC_INS,
     _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/dz60/keymaps/dbroqua/keymap.c b/keyboards/dz60/keymaps/dbroqua/keymap.c
index 5cb1e46ad5..aa00117cf5 100644
--- a/keyboards/dz60/keymaps/dbroqua/keymap.c
+++ b/keyboards/dz60/keymaps/dbroqua/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_SFX] = LAYOUT_true_hhkb(
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
-      ______,   BL_TOGG,BL_STEP,BL_DEC, BL_INC, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
+      ______,   BL_TOGG,BL_STEP,BL_DOWN,BL_UP,  ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   ______, RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______, ______, ______,  \
                 ______, ______,                         ______,                         ______, ______ \
diff --git a/keyboards/dz60/keymaps/default/keymap.c b/keyboards/dz60/keymaps/default/keymap.c
index 8b8c47e3a8..84d1bbcfe6 100644
--- a/keyboards/dz60/keymaps/default/keymap.c
+++ b/keyboards/dz60/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/dz60/keymaps/default_abnt2/keymap.c b/keyboards/dz60/keymaps/default_abnt2/keymap.c
index ee14f87054..fd2bd310dd 100644
--- a/keyboards/dz60/keymaps/default_abnt2/keymap.c
+++ b/keyboards/dz60/keymaps/default_abnt2/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_LCTL, KC_LGUI, KC_LGUI,                            XXXXXXX,                            KC_RALT, KC_RGUI, _______, KC_RCTL),
 
   [_CL] = LAYOUT_60_abnt2(
diff --git a/keyboards/dz60/keymaps/devinceble_wkl_tofu/keymap.c b/keyboards/dz60/keymaps/devinceble_wkl_tofu/keymap.c
index 63b86b1d27..e1ba9c7ccc 100644
--- a/keyboards/dz60/keymaps/devinceble_wkl_tofu/keymap.c
+++ b/keyboards/dz60/keymaps/devinceble_wkl_tofu/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_INC, BL_DEC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP,  BL_DOWN,BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/dz60/keymaps/doogle999/keymap.c b/keyboards/dz60/keymaps/doogle999/keymap.c
index 8ecd0402f9..60fe258e25 100644
--- a/keyboards/dz60/keymaps/doogle999/keymap.c
+++ b/keyboards/dz60/keymaps/doogle999/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_directional(
       KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ______, KC_CALC,
       QK_BOOT, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_VOLD, KC_VOLU, KC_MUTE,
-      ______, ______, ______, ______, ______, ______, ______, ______, ______, BL_DEC, BL_INC, BL_TOGG, KC_APP,
+      ______, ______, ______, ______, ______, ______, ______, ______, ______, BL_DOWN,BL_UP,  BL_TOGG, KC_APP,
       KC_LSFT, ______, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_TOG, KC_RSFT, KC_PGUP, KC_INSERT,
       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, TO(2), ______, KC_HOME, KC_PGDN, KC_END
       ),
diff --git a/keyboards/dz60/keymaps/f3d3/keymap.c b/keyboards/dz60/keymaps/f3d3/keymap.c
index ac75f7487a..9b9f5d950a 100644
--- a/keyboards/dz60/keymaps/f3d3/keymap.c
+++ b/keyboards/dz60/keymaps/f3d3/keymap.c
@@ -44,6 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,  KC_DEL,
 		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
 };
diff --git a/keyboards/dz60/keymaps/frogger/keymap.c b/keyboards/dz60/keymaps/frogger/keymap.c
index f9f22e4ad4..0e2f0b62a8 100644
--- a/keyboards/dz60/keymaps/frogger/keymap.c
+++ b/keyboards/dz60/keymaps/frogger/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
       ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, ______,
 
-      ______, BL_TOGG, BL_STEP, BL_INC, BL_DEC, ______, ______, ______, ______, ______, ______, ______, ______,
+      ______, BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,______, ______, ______, ______, ______, ______, ______, ______,
 
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
 
diff --git a/keyboards/dz60/keymaps/gk64/keymap.c b/keyboards/dz60/keymaps/gk64/keymap.c
index 69d1bcf922..53b4b5c1a6 100644
--- a/keyboards/dz60/keymaps/gk64/keymap.c
+++ b/keyboards/dz60/keymaps/gk64/keymap.c
@@ -13,6 +13,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
 		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/dz60/keymaps/iso_6u_space/keymap.c b/keyboards/dz60/keymaps/iso_6u_space/keymap.c
index e0085b4904..2ade3a2400 100644
--- a/keyboards/dz60/keymaps/iso_6u_space/keymap.c
+++ b/keyboards/dz60/keymaps/iso_6u_space/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_LCTL, KC_LGUI, KC_LGUI,                            XXXXXXX,                            KC_RALT, KC_RGUI, _______, KC_RCTL),
 
   [2] = LAYOUT_60_iso(
diff --git a/keyboards/dz60/keymaps/iso_7u_space/keymap.c b/keyboards/dz60/keymaps/iso_7u_space/keymap.c
index 016fe9a6a5..c85332346a 100644
--- a/keyboards/dz60/keymaps/iso_7u_space/keymap.c
+++ b/keyboards/dz60/keymaps/iso_7u_space/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_PGDN, KC_LGUI, KC_LGUI,                            XXXXXXX,                            XXXXXXX, KC_RGUI, _______, KC_RCTL
   ),
 
diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
index 56dccf376f..8a6945567a 100644
--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	    TG(RL),    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   QK_BOOT,
         _______,   RGB_TOG,   RGB_MOD,   RGB_HUI,   RGB_HUD,   _______,   _______,   RGB_SAI,   RGB_SAD,   RGB_VAI,   RGB_VAD,   _______,   _______,
         _______,   RGB_STA,   RGB_BRE,   RGB_RAI,   RGB_SWI,   _______,   _______,   RGB_SNA,   RGB_KNI,   RGB_GRA,   RGB_XMS,   _______,   _______,   _______,
-        _______,   BL_DEC,    BL_TOGG,   BL_INC,    BL_STEP,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        _______,   BL_DOWN,   BL_TOGG,   BL_UP,     BL_STEP,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
         _______,   _______,   _______,   _______,   MO(FL),    _______,   _______,   _______,   TO(BL),    _______),
 
 
diff --git a/keyboards/dz60/keymaps/iso_uk/keymap.c b/keyboards/dz60/keymaps/iso_uk/keymap.c
index cabe386b0c..f083032640 100644
--- a/keyboards/dz60/keymaps/iso_uk/keymap.c
+++ b/keyboards/dz60/keymaps/iso_uk/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG(_CN), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______,                   XXXXXXX,                            _______, _______, _______, _______
   ),
 
diff --git a/keyboards/dz60/keymaps/itsaferbie/keymap.c b/keyboards/dz60/keymaps/itsaferbie/keymap.c
index 94c42ddac3..43a6a3af94 100644
--- a/keyboards/dz60/keymaps/itsaferbie/keymap.c
+++ b/keyboards/dz60/keymaps/itsaferbie/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, ______, ______, ______, ______, ______, ______,
 		RGB_MOD,          RGB_HUI, RGB_SAI, RGB_VAI,  ______,   ______,  ______,  ______,  ______, ______, ______, ______, ______, ______,
 		______,           RGB_HUD, RGB_SAD, RGB_VAD,  ______,   ______,  ______,  ______,  ______, ______, ______, ______, ______,
-		______,           ______,  ______,  BL_DEC,   BL_TOGG,  BL_INC,  ______,  ______,  ______, ______, ______,         ______, ______,
+		______,           ______,  ______,  BL_DOWN,  BL_TOGG,  BL_UP,   ______,  ______,  ______, ______, ______,         ______, ______,
 		         ______,           ______,                      ______,                                    ______,         ______),
 
 };
diff --git a/keyboards/dz60/keymaps/lint_kid/keymap.c b/keyboards/dz60/keymaps/lint_kid/keymap.c
index b16c988b5f..92412c2e89 100644
--- a/keyboards/dz60/keymaps/lint_kid/keymap.c
+++ b/keyboards/dz60/keymaps/lint_kid/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_directional(
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, _______, QK_BOOT,
       KC_TILD, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
-      TG(1), BL_TOGG, BL_STEP, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______, _______,
+      TG(1), BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,_______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, TG(2), TG(2), TG(2), _______, _______, _______, _______, _______
       ),
diff --git a/keyboards/dz60/keymaps/macos_arrow/keymap.c b/keyboards/dz60/keymaps/macos_arrow/keymap.c
index 2b2ccee567..17402aa931 100644
--- a/keyboards/dz60/keymaps/macos_arrow/keymap.c
+++ b/keyboards/dz60/keymaps/macos_arrow/keymap.c
@@ -67,8 +67,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MEDIA_EJECT, BR_DOWN, BR_UP, BL_TOGG, RGB_TOG, _______, _______, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_INC, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, RGB_MODE_REVERSE, BL_DEC, RGB_MODE_FORWARD),
+    _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_UP,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, RGB_MODE_REVERSE, BL_DOWN,RGB_MODE_FORWARD),
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/dz60/keymaps/model42/keymap.c b/keyboards/dz60/keymaps/model42/keymap.c
index f8d647d7ab..30b95e63e0 100644
--- a/keyboards/dz60/keymaps/model42/keymap.c
+++ b/keyboards/dz60/keymaps/model42/keymap.c
@@ -17,7 +17,7 @@ LAYOUT_directional(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,
 LAYOUT_directional(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 // layer 2
diff --git a/keyboards/dz60/keymaps/mpaarating/keymap.c b/keyboards/dz60/keymaps/mpaarating/keymap.c
index 37de7be6d5..0d8ae497ef 100644
--- a/keyboards/dz60/keymaps/mpaarating/keymap.c
+++ b/keyboards/dz60/keymaps/mpaarating/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_TRNS, KC_TRNS,
 		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_UP, KC_TRNS, KC_DELETE,
 		KC_CAPS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_LEFT, KC_RIGHT, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS,  KC_END,  KC_DOWN, KC_TRNS, KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS,  KC_END,  KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/dz60/keymaps/muralisc/keymap.c b/keyboards/dz60/keymaps/muralisc/keymap.c
index a000195be3..d7d4326a12 100644
--- a/keyboards/dz60/keymaps/muralisc/keymap.c
+++ b/keyboards/dz60/keymaps/muralisc/keymap.c
@@ -67,6 +67,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
 		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
 		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/dz60/keymaps/muzfuz/keymap.c b/keyboards/dz60/keymaps/muzfuz/keymap.c
index 6556eaa358..36b843d459 100644
--- a/keyboards/dz60/keymaps/muzfuz/keymap.c
+++ b/keyboards/dz60/keymaps/muzfuz/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
 		_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
diff --git a/keyboards/dz60/keymaps/pevecyan/keymap.c b/keyboards/dz60/keymaps/pevecyan/keymap.c
index 720600627f..27f5d86a7a 100644
--- a/keyboards/dz60/keymaps/pevecyan/keymap.c
+++ b/keyboards/dz60/keymaps/pevecyan/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_DEL,  \
     _______,        RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,_______,QK_BOOT, \
     _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,         \
-    _______,_______,_______,_______,BL_DEC, BL_TOGG,BL_INC, BL_STEP,_______,_______,_______,_______,        _______,_______, \
+    _______,_______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  BL_STEP,_______,_______,_______,_______,        _______,_______, \
     _______,_______,        _______,_______,        _______,        _______,        _______,_______,_______,_______,_______  \
   ),
 
diff --git a/keyboards/dz60/keymaps/pinpox/keymap.c b/keyboards/dz60/keymaps/pinpox/keymap.c
index a762a379be..a80a78c4b2 100644
--- a/keyboards/dz60/keymaps/pinpox/keymap.c
+++ b/keyboards/dz60/keymaps/pinpox/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			KC_SLEP, KC_F1,   KC_F2,    KC_F3,   KC_F3,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,   KC_DEL,
 			KC_NO,   RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_DOWN, KC_RGHT, KC_NO,   KC_NO,  KC_NO,   KC_PGUP,   KC_PGDN,  KC_NO,
 			KC_CAPS, BL_TOGG, RGB_TOG,  KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,     KC_MFFD,
-			KC_NO,   BL_INC,  BL_DEC,   BL_BRTG, KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_HOME, KC_END, KC_NO,   KC_PSCR,
+			KC_NO,   BL_UP,   BL_DOWN,  BL_BRTG, KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_HOME, KC_END, KC_NO,   KC_PSCR,
 			KC_NO,   KC_NO,   KC_TRNS,  KC_MPLY, KC_NO,   KC_NO,   KC_TRNS, KC_NO
 			)
 };
diff --git a/keyboards/dz60/keymaps/spotpuff/keymap.c b/keyboards/dz60/keymaps/spotpuff/keymap.c
index 0042965085..c4f5cd9555 100644
--- a/keyboards/dz60/keymaps/spotpuff/keymap.c
+++ b/keyboards/dz60/keymaps/spotpuff/keymap.c
@@ -67,8 +67,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_INS,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAD,
         KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PAUS, KC_PSCR,
-        _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, XXXXXXX, BL_INC,  XXXXXXX,
-        _______, _______, _______, XXXXXXX, _______,  XXXXXXX,  XXXXXXX, XXXXXXX, BL_TOGG, BL_DEC,  BL_STEP
+        _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, XXXXXXX, BL_UP,   XXXXXXX,
+        _______, _______, _______, XXXXXXX, _______,  XXXXXXX,  XXXXXXX, XXXXXXX, BL_TOGG, BL_DOWN, BL_STEP
         ),
 
 /* SFX/Multimedia/Numpad layer
diff --git a/keyboards/dz60/keymaps/stephengrier/keymap.c b/keyboards/dz60/keymaps/stephengrier/keymap.c
index 35d5485b44..de9bb632b0 100644
--- a/keyboards/dz60/keymaps/stephengrier/keymap.c
+++ b/keyboards/dz60/keymaps/stephengrier/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_directional(
       KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
       ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, QK_BOOT,
-      ______, BL_TOGG, BL_STEP, BL_INC, BL_DEC, ______, ______, ______, ______, ______, ______, ______,
+      ______, BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
       ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______
       ),
diff --git a/keyboards/dz60/keymaps/tailcall/keymap.c b/keyboards/dz60/keymaps/tailcall/keymap.c
index 9df51f54c1..8c92e98e9d 100644
--- a/keyboards/dz60/keymaps/tailcall/keymap.c
+++ b/keyboards/dz60/keymaps/tailcall/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_SLEP,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, BL_DEC , BL_TOGG, BL_INC , BL_STEP, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, BL_DOWN, BL_TOGG, BL_UP  , BL_STEP, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
 
 };
diff --git a/keyboards/dz60/keymaps/tarnjotsingh/keymap.c b/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
index b679de8dd3..47c337d67c 100644
--- a/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
+++ b/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
@@ -3,5 +3,5 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_iso(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LALT, KC_RCTL),
 	[1] = LAYOUT_60_iso(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_MUTE, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS),
-	[2] = LAYOUT_60_iso(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, 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_60_iso(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/dz60/keymaps/tarnjotsingh/layers.json b/keyboards/dz60/keymaps/tarnjotsingh/layers.json
index 3599fc570c..7399ef8fd6 100644
--- a/keyboards/dz60/keymaps/tarnjotsingh/layers.json
+++ b/keyboards/dz60/keymaps/tarnjotsingh/layers.json
@@ -1 +1 @@
-[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "MO(1)", "KC_RGUI", "KC_LALT", "KC_RCTL"], ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_TRNS", "KC_MUTE", "KC_VOLU", "KC_MPLY", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MRWD", "KC_MFFD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGDN", "KC_HOME", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(2)", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUI", "RGB_HUD", "RGB_SAI", "RGB_SAD", "RGB_VAI", "RGB_VAD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DEC", "BL_TOGG", "BL_INC", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]]
\ No newline at end of file
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "MO(1)", "KC_RGUI", "KC_LALT", "KC_RCTL"], ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_TRNS", "KC_MUTE", "KC_VOLU", "KC_MPLY", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MRWD", "KC_MFFD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGDN", "KC_HOME", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(2)", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUI", "RGB_HUD", "RGB_SAI", "RGB_SAD", "RGB_VAI", "RGB_VAD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DOWN", "BL_TOGG", "BL_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]]
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/via/keymap.c b/keyboards/dz60/keymaps/via/keymap.c
index 2107ee8d7d..98ceac0965 100644
--- a/keyboards/dz60/keymaps/via/keymap.c
+++ b/keyboards/dz60/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
 		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	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,
diff --git a/keyboards/dz60/keymaps/xtonhasvim/keymap.c b/keyboards/dz60/keymaps/xtonhasvim/keymap.c
index aa54698e78..997ae91547 100644
--- a/keyboards/dz60/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/dz60/keymaps/xtonhasvim/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
 		_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)),
 
 	[_MOVE] = LAYOUT(
diff --git a/keyboards/dztech/duo_s/keymaps/default/keymap.c b/keyboards/dztech/duo_s/keymaps/default/keymap.c
index 5465f8db8b..5ed06246b2 100644
--- a/keyboards/dztech/duo_s/keymaps/default/keymap.c
+++ b/keyboards/dztech/duo_s/keymaps/default/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   	),
 
 	[1] = LAYOUT_65_ansi_blocker( /* 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,  _______,          BL_INC,
-		KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
+		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          BL_UP, 
+		KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DOWN,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, RGB_MOD,
 		_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/dztech/duo_s/keymaps/via/keymap.c b/keyboards/dztech/duo_s/keymaps/via/keymap.c
index b928f97611..7608f22c09 100644
--- a/keyboards/dztech/duo_s/keymaps/via/keymap.c
+++ b/keyboards/dztech/duo_s/keymaps/via/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   	),
 
 	[1] = LAYOUT_65_ansi_blocker( /* 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,  _______,          BL_INC,
-		KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
+		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          BL_UP, 
+		KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DOWN,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, RGB_MOD,
 		_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/dztech/dz96/keymaps/default/keymap.c b/keyboards/dztech/dz96/keymaps/default/keymap.c
index 76cf9b07e9..920ef85b3c 100644
--- a/keyboards/dztech/dz96/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz96/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_default(
         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME, KC_END,
         _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______,
-        _______, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______,
+        _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,    _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,    _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______,    _______, _______
diff --git a/keyboards/dztech/dz96/keymaps/iso/keymap.c b/keyboards/dztech/dz96/keymaps/iso/keymap.c
index 6e48367574..6de4fcf5c5 100644
--- a/keyboards/dztech/dz96/keymaps/iso/keymap.c
+++ b/keyboards/dztech/dz96/keymaps/iso/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_iso(
         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME,  KC_END,
         _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______,
-        _______, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______,
+        _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,    _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______,    _______, _______
diff --git a/keyboards/dztech/dz96/keymaps/via/keymap.c b/keyboards/dztech/dz96/keymaps/via/keymap.c
index 75bc8fa208..11b9bbd7e0 100644
--- a/keyboards/dztech/dz96/keymaps/via/keymap.c
+++ b/keyboards/dztech/dz96/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_default(
         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME, KC_END,
         _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______,
-        _______, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______,
+        _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,    _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,    _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______,    _______, _______
diff --git a/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
index ce7a84f90e..c10a556755 100644
--- a/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/ansi_6u/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
     [1] = LAYOUT_1800_ansi_6u(    /* keymap for layer 1 */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_INC,  KC_TRNS,
-                                                                                                                                                               KC_TRNS, BL_TOGG, BL_DEC,  BL_BRTG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_UP,   KC_TRNS,
+                                                                                                                                                               KC_TRNS, BL_TOGG, 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, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_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_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
diff --git a/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
index 18d3bc8dfb..fca80299af 100644
--- a/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/ansi_7u/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LALT,                            KC_SPC,                    KC_RALT,          LT(1, KC_RCTL),            KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
     [1] = LAYOUT_1800_ansi_7u(    /* keymap for layer 1 */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_INC,  KC_TRNS,
-                                                                                                                                                               KC_TRNS, BL_TOGG, BL_DEC,  BL_BRTG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_UP,   KC_TRNS,
+                                                                                                                                                               KC_TRNS, BL_TOGG, 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, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_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_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
diff --git a/keyboards/ebastler/e80_1800/keymaps/default/keymap.c b/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
index 47fe2310e0..acaecbb414 100644
--- a/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/default/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
     [1] = LAYOUT_1800_all(    /* keymap for layer 1 */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_INC,  KC_TRNS,
-                                                                                                                                                               KC_TRNS, BL_TOGG, BL_DEC,  BL_BRTG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_UP,   KC_TRNS,
+                                                                                                                                                               KC_TRNS, BL_TOGG, 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, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_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_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
diff --git a/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
index 5412c4c874..688f964ea6 100644
--- a/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/iso_6u/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
     [1] = LAYOUT_1800_iso_6u(    /* keymap for layer 1 */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_INC,  KC_TRNS,
-                                                                                                                                                               KC_TRNS, BL_TOGG, BL_DEC,  BL_BRTG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_UP,   KC_TRNS,
+                                                                                                                                                               KC_TRNS, BL_TOGG, 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, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_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_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
diff --git a/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c b/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
index 3e854d59f6..4929c9d6ce 100644
--- a/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/iso_7u/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LALT,                            KC_SPC,                    KC_RALT,          LT(1, KC_RCTL),            KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
     [1] = LAYOUT_1800_iso_7u(    /* keymap for layer 1 */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_INC,  KC_TRNS,
-                                                                                                                                                               KC_TRNS, BL_TOGG, BL_DEC,  BL_BRTG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_UP,   KC_TRNS,
+                                                                                                                                                               KC_TRNS, BL_TOGG, 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, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_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_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
diff --git a/keyboards/ebastler/e80_1800/keymaps/via/keymap.c b/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
index d1e922206b..aaeab93e8d 100644
--- a/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
+++ b/keyboards/ebastler/e80_1800/keymaps/via/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,        KC_KP_0, KC_PDOT),
 
     [1] = LAYOUT_1800_all(    /* keymap for layer 1 */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_INC,  KC_TRNS,
-                                                                                                                                                               KC_TRNS, BL_TOGG, BL_DEC,  BL_BRTG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, BL_UP,   KC_TRNS,
+                                                                                                                                                               KC_TRNS, BL_TOGG, 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, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_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_MPRV, KC_MUTE, KC_MNXT, KC_TRNS,
diff --git a/keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c b/keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c
index 1769b042a8..1daa6e8ed8 100644
--- a/keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c
+++ b/keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, LT(1, KC_APP),    KC_LEFT, KC_DOWN,  KC_RGHT),
 
     [1] = LAYOUT_iso(    /* keymap for layer 1 */
-        RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPD, RGB_SPI, RGB_M_P, KC_MUTE,
+        RGB_TOG, RGB_VAD, RGB_VAI, BL_DOWN, BL_UP,   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPD, RGB_SPI, RGB_M_P, 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_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_TRNS, KC_TRNS, KC_TRNS, 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/ebastler/isometria_75/rev1/keymaps/via/keymap.c b/keyboards/ebastler/isometria_75/rev1/keymaps/via/keymap.c
index b84cdc5af0..09560f377e 100644
--- a/keyboards/ebastler/isometria_75/rev1/keymaps/via/keymap.c
+++ b/keyboards/ebastler/isometria_75/rev1/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, LT(1, KC_APP),    KC_LEFT, KC_DOWN,  KC_RGHT),
 
     [1] = LAYOUT_iso(    /* keymap for layer 1 */
-        RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPD, RGB_SPI, RGB_M_P, KC_MUTE,
+        RGB_TOG, RGB_VAD, RGB_VAI, BL_DOWN, BL_UP,   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPD, RGB_SPI, RGB_M_P, 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_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_TRNS, KC_TRNS, KC_TRNS, 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/edda/keymaps/default/keymap.c b/keyboards/edda/keymaps/default/keymap.c
index df21c4ce21..79c5571780 100644
--- a/keyboards/edda/keymaps/default/keymap.c
+++ b/keyboards/edda/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______,
-              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, BL_UP,   BL_DOWN, BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT
   )
 };
diff --git a/keyboards/epoch80/keymaps/default/keymap.c b/keyboards/epoch80/keymaps/default/keymap.c
index f718be0673..8fa715e675 100644
--- a/keyboards/epoch80/keymaps/default/keymap.c
+++ b/keyboards/epoch80/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_tkl_ansi(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPLY, 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_TRNS,
diff --git a/keyboards/epoch80/keymaps/iso/keymap.c b/keyboards/epoch80/keymaps/iso/keymap.c
index 77d71cbaf6..5e6eec8eca 100644
--- a/keyboards/epoch80/keymaps/iso/keymap.c
+++ b/keyboards/epoch80/keymaps/iso/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_tkl_iso(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPLY, 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_TRNS,
diff --git a/keyboards/epoch80/keymaps/tsangan/keymap.c b/keyboards/epoch80/keymaps/tsangan/keymap.c
index 946474ea24..9b74a7fdcf 100644
--- a/keyboards/epoch80/keymaps/tsangan/keymap.c
+++ b/keyboards/epoch80/keymaps/tsangan/keymap.c
@@ -26,7 +26,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_RGHT
     ),
     [1] = LAYOUT_tkl_ansi_tsangan(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPLY, 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_TRNS,
diff --git a/keyboards/epoch80/keymaps/wkl/keymap.c b/keyboards/epoch80/keymaps/wkl/keymap.c
index d6c8cf19f7..e673ee248b 100644
--- a/keyboards/epoch80/keymaps/wkl/keymap.c
+++ b/keyboards/epoch80/keymaps/wkl/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          MO(1),      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_tkl_ansi_wkl(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPLY, 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_TRNS,
diff --git a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
index a7b96530d9..f244bb8821 100644
--- a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_L2] = LAYOUT_split_space(
   _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	QK_BOOT,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SCRL,	KC_PAUS,
   KC_CAPS,		KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	_______,	KC_HOME,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_INS,					_______,
-  _______,		_______,	_______,	_______,	_______,	_______,	_______,	BL_TOGG,	BL_DEC,		BL_INC,		_______,				_______,
+  _______,		_______,	_______,	_______,	_______,	_______,	_______,	BL_TOGG,	BL_DOWN,		BL_UP, 		_______,				_______,
   _______,		_______,	_______,	_______,	_______, 				_______,				_______,	_______,	_______,				_______),
  
 [_L1] = LAYOUT_split_space(
diff --git a/keyboards/evyd13/atom47/keymaps/default/keymap.c b/keyboards/evyd13/atom47/keymaps/default/keymap.c
index ba547b5c2a..7ab806391a 100644
--- a/keyboards/evyd13/atom47/keymaps/default/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FN] = LAYOUT_split_space(
   _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,
   KC_CAPS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,  _______,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_INS,             _______,
-  _______,            _______,  _______,  _______,  _______,  _______,  _______,  BL_TOGG,  BL_DEC,   BL_INC,   _______,  _______,
+  _______,            _______,  _______,  _______,  _______,  _______,  _______,  BL_TOGG,  BL_DOWN,  BL_UP,    _______,  _______,
   _______,  _______,  _______,  _______,            _______,            _______,            _______,  _______,  _______,  _______),
  
 [_FN1] = LAYOUT_split_space(
diff --git a/keyboards/evyd13/atom47/keymaps/via/keymap.c b/keyboards/evyd13/atom47/keymaps/via/keymap.c
index 93788cf18c..acaf076e08 100644
--- a/keyboards/evyd13/atom47/keymaps/via/keymap.c
+++ b/keyboards/evyd13/atom47/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [1] = LAYOUT_split_space(
   _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  QK_BOOT,    _______,  KC_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,
   KC_CAPS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,  _______,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_INS,             _______,
-  _______,            _______,  _______,  _______,  _______,  _______,  _______,  BL_TOGG,  BL_DEC,   BL_INC,   _______,  _______,
+  _______,            _______,  _______,  _______,  _______,  _______,  _______,  BL_TOGG,  BL_DOWN,  BL_UP,    _______,  _______,
   _______,  _______,  _______,  _______,            _______,            _______,            _______,  _______,  _______,  _______),
  
 [2] = LAYOUT_split_space(
diff --git a/keyboards/exclusive/e65/keymaps/default/keymap.c b/keyboards/exclusive/e65/keymaps/default/keymap.c
index 36c1d62d1e..541fb349de 100644
--- a/keyboards/exclusive/e65/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_65_ansi_noblocker(
         KC_GRV,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT,
-        BL_TOGG, BL_DEC, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
+        BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,_______,
         _______, _______, _______,                  _______,                             _______,   MO(1), RGB_SAI, RGB_VAD, RGB_SAD),
diff --git a/keyboards/exclusive/e65/keymaps/default_iso/keymap.c b/keyboards/exclusive/e65/keymaps/default_iso/keymap.c
index b907fa3f7a..691fb4b284 100644
--- a/keyboards/exclusive/e65/keymaps/default_iso/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/default_iso/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_65_iso_noblocker(
         KC_GRV,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT,
-        BL_TOGG, BL_DEC, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
+        BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,_______, _______,
         _______, _______, _______,                  _______,                             _______,   MO(1), RGB_SAI, RGB_VAD, RGB_SAD),
diff --git a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
index 3aa5a95f96..aeceb7ba43 100644
--- a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] = LAYOUT_65_ansi_blocker_splitbs(
         QK_BOOT, LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
-        BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_TOGG, BL_DOWN,BL_UP,  KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______,
         _______, _______, _______,                  _______,                             _______, _______, RGB_MOD, RGB_VAD, RGB_HUD),
diff --git a/keyboards/exclusive/e65/keymaps/via/keymap.c b/keyboards/exclusive/e65/keymaps/via/keymap.c
index d06035cc33..5ca1254021 100644
--- a/keyboards/exclusive/e65/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e65/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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_NO,  QK_BOOT,
-        BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_HOME,
+        BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_HOME,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,  KC_END,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, RGB_VAI, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS,                             KC_TRNS, KC_NO, MO(1),      RGB_SAI, RGB_VAD, RGB_SAD),
diff --git a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
index ee2e581e7a..20c449dab1 100644
--- a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
+++ b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_CL] = LAYOUT_60_hhkb(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
-      _______, BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  _______, _______, _______, _______, _______,  _______, _______, _______, QK_BOOT,
+      _______, BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   _______, _______, _______, _______, _______,  _______, _______, _______, QK_BOOT,
       _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
       KC_CAPS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,  _______,          _______, _______,
                _______, _______,                        _______,                       _______,  _______
diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
index 550103ca99..4d28618091 100644
--- a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c b/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
index 2444a2e363..99c1312e45 100644
--- a/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
index b206d52029..1605f8da7c 100644
--- a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
+++ b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS, KC_TRNS,               KC_MPLY,                               KC_TRNS,  KC_TRNS
         ),
     [_HL] = LAYOUT_hhkb(
-        RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON, BL_DEC, BL_INC,     LALT(KC_F4),
+        RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON, BL_DOWN,BL_UP,      LALT(KC_F4),
         QK_BOOT, RGB_HUI, RGB_SAI,  RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_HUD, RGB_SAD,  RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,
         KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
index 550103ca99..4d28618091 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
index 9a1c95fc45..e798d6ca43 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [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,
-	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	     BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c b/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c
index dbc9dd2063..66cf79712d 100644
--- a/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/ansi_splitbs/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_75_ansi_splitbs(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		BL_TOGG, BL_DOWN,BL_UP,  KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
 		_______, _______, _______,                  _______,                             _______,   MO(1), RGB_MOD, RGB_VAD, RGB_HUD),
diff --git a/keyboards/exclusive/e7v1/keymaps/default/keymap.c b/keyboards/exclusive/e7v1/keymaps/default/keymap.c
index 6b5e1fc585..6e37ac8017 100644
--- a/keyboards/exclusive/e7v1/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_75_ansi(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		BL_TOGG, BL_DOWN,BL_UP,  KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
 		_______, _______, _______,                  _______,                             _______,   MO(1), RGB_MOD, RGB_VAD, RGB_HUD),
diff --git a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
index f30432cdb8..8550b72091 100644
--- a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[_ADJUST] = LAYOUT_75_ansi_splitbs(
 		QK_BOOT, LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		BL_TOGG, BL_DOWN,BL_UP,  KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
 		_______, _______, _______,                  _______,                             _______, _______, RGB_MOD, RGB_VAD, RGB_HUD),
diff --git a/keyboards/exclusive/e7v1/keymaps/via/keymap.c b/keyboards/exclusive/e7v1/keymaps/via/keymap.c
index 0f382eb04d..faaf0b3dfe 100644
--- a/keyboards/exclusive/e7v1/keymaps/via/keymap.c
+++ b/keyboards/exclusive/e7v1/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_75_ansi(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		BL_TOGG, BL_DEC, BL_INC, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		BL_TOGG, BL_DOWN,BL_UP,  KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
 		_______, _______, _______,                  _______,                             _______,   MO(1), RGB_MOD, RGB_VAD, RGB_HUD),
diff --git a/keyboards/exclusive/e7v1se/keymaps/default/keymap.c b/keyboards/exclusive/e7v1se/keymaps/default/keymap.c
index 8eec4ca7c9..8fa2ef8a20 100644
--- a/keyboards/exclusive/e7v1se/keymaps/default/keymap.c
+++ b/keyboards/exclusive/e7v1se/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		BL_TOGG, BL_DEC, BL_INC, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		BL_TOGG, BL_DOWN,BL_UP,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
 		_______, _______, AG_TOGG,                  _______,                             _______,   MO(1), RGB_MOD, RGB_VAD, RGB_HUD),
diff --git a/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c b/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c
index d9641f56f7..4b5ecc6ff3 100644
--- a/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c
+++ b/keyboards/exclusive/e7v1se/keymaps/mac/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		BL_TOGG, BL_DEC, BL_INC, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		BL_TOGG, BL_DOWN,BL_UP,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
 		_______, _______, AG_TOGG ,                  _______,                             _______,   MO(1), RGB_MOD, RGB_VAD, RGB_HUD),
diff --git a/keyboards/exent/keymaps/default/keymap.c b/keyboards/exent/keymaps/default/keymap.c
index 299a3de6dd..724878a09e 100644
--- a/keyboards/exent/keymaps/default/keymap.c
+++ b/keyboards/exent/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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,  _______,
-        BL_TOGG, BL_STEP, BL_INC,  BL_DEC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_TOGG, BL_STEP, BL_UP,   BL_DOWN, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/exent/keymaps/via/keymap.c b/keyboards/exent/keymaps/via/keymap.c
index 866cf2a019..478b150183 100644
--- a/keyboards/exent/keymaps/via/keymap.c
+++ b/keyboards/exent/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [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,  _______,
-        BL_TOGG, BL_STEP, BL_INC,  BL_DEC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_TOGG, BL_STEP, BL_UP,   BL_DOWN, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
diff --git a/keyboards/flx/virgo/keymaps/default/keymap.c b/keyboards/flx/virgo/keymaps/default/keymap.c
index 57d13f5f0c..8c577b9df2 100644
--- a/keyboards/flx/virgo/keymaps/default/keymap.c
+++ b/keyboards/flx/virgo/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LGUI, KC_LALT,          KC_SPC,                             KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                   RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,            BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                   RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,            BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          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/flx/virgo/keymaps/via/keymap.c b/keyboards/flx/virgo/keymaps/via/keymap.c
index c9b2e0406c..71db611ac9 100644
--- a/keyboards/flx/virgo/keymaps/via/keymap.c
+++ b/keyboards/flx/virgo/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LGUI, KC_LALT,          KC_SPC,                             KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                   RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,            BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                   RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,            BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          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/foxlab/key65/hotswap/keymaps/default/keymap.c b/keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c
index 486e1178e7..1f35b8448d 100644
--- a/keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c
+++ b/keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,            BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
+        _______,            BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
         _______,     _______, _______,                            _______,                                 _______,          _______, _______, _______
     ),
 
diff --git a/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c b/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c
index 9689e586d1..e869f1b799 100644
--- a/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c
+++ b/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,            BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
+        _______,            BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
         _______,     _______, _______,                            _______,                                 _______,          _______, _______, _______
     ),
     [2] = LAYOUT(
diff --git a/keyboards/foxlab/key65/universal/keymaps/default/keymap.c b/keyboards/foxlab/key65/universal/keymaps/default/keymap.c
index ffa53ccb0a..4077b3e5e7 100644
--- a/keyboards/foxlab/key65/universal/keymaps/default/keymap.c
+++ b/keyboards/foxlab/key65/universal/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, _______, _______, _______, _______, _______,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,   _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______,        _______, _______,
+        _______,   _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,        _______, _______,
         _______,   _______,   _______,   _______,                 _______,   _______,             _______,   _______,        _______, _______, _______
     ),
 
diff --git a/keyboards/foxlab/key65/universal/keymaps/via/keymap.c b/keyboards/foxlab/key65/universal/keymaps/via/keymap.c
index d9050fdca3..ffbadd4855 100644
--- a/keyboards/foxlab/key65/universal/keymaps/via/keymap.c
+++ b/keyboards/foxlab/key65/universal/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, _______, _______, _______, _______, _______,      _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,   _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______,        _______, _______,
+        _______,   _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,        _______, _______,
         _______,   _______,   _______,   _______,                 _______,   _______,             _______,   _______,        _______, _______, _______
     ),
     [2] = LAYOUT_all(
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
index e59dbeda1d..3662c57c4b 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_CL] = LAYOUT_60_tsangan_hhkb(
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_ON,   XXXXXXX, XXXXXXX,
-    XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_BRTG, BL_STEP,          XXXXXXX,
+    XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_BRTG, BL_STEP,          XXXXXXX,
     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_OFF,  XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                                     XXXXXXX, XXXXXXX, TO(_BL)
   )
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c
index 5e3ed8c1ea..1edc814bab 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_tsangan_hhkb(
 		QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, 
-		KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/foxlab/leaf60/hotswap/keymaps/via/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/via/keymap.c
index 83cb422dc0..89800f34f6 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/via/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_60_tsangan_hhkb(
 		QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, 
-		KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/foxlab/leaf60/universal/keymaps/default/keymap.c b/keyboards/foxlab/leaf60/universal/keymaps/default/keymap.c
index 2a032bf3cb..fdb5f9772b 100644
--- a/keyboards/foxlab/leaf60/universal/keymaps/default/keymap.c
+++ b/keyboards/foxlab/leaf60/universal/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_all(
 		QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, 
-		KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/foxlab/leaf60/universal/keymaps/via/keymap.c b/keyboards/foxlab/leaf60/universal/keymaps/via/keymap.c
index 490f563feb..8dcffd81c5 100644
--- a/keyboards/foxlab/leaf60/universal/keymaps/via/keymap.c
+++ b/keyboards/foxlab/leaf60/universal/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT_all(
 		QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, 
-		KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/ft/mars65/keymaps/default/keymap.c b/keyboards/ft/mars65/keymaps/default/keymap.c
index 0db47042e5..173b3e0b78 100644
--- a/keyboards/ft/mars65/keymaps/default/keymap.c
+++ b/keyboards/ft/mars65/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, QK_BOOT, 
-        BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, 
+        BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, 
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, 
         _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_VAD, RGB_SAD  
diff --git a/keyboards/ft/mars65/keymaps/via/keymap.c b/keyboards/ft/mars65/keymaps/via/keymap.c
index 0db47042e5..173b3e0b78 100644
--- a/keyboards/ft/mars65/keymaps/via/keymap.c
+++ b/keyboards/ft/mars65/keymaps/via/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, QK_BOOT, 
-        BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, 
+        BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, 
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, 
         _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_VAD, RGB_SAD  
diff --git a/keyboards/gami_studio/lex60/keymaps/default/keymap.c b/keyboards/gami_studio/lex60/keymaps/default/keymap.c
index b989ec5481..48e6d0a14f 100644
--- a/keyboards/gami_studio/lex60/keymaps/default/keymap.c
+++ b/keyboards/gami_studio/lex60/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL,              KC_LGUI, KC_LALT,                    KC_SPC,           LT(2, KC_ENT),                    KC_RGUI, KC_RALT, KC_APP,  KC_RCTL),
 
   [_FIRMWARE] = LAYOUT(
-      QK_BOOT,                RGB_TOG,  RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD,       RGB_VAI, BL_DEC,   BL_TOGG, BL_INC,  XXXXXXX, XXXXXXX,   TG(1),
+      QK_BOOT,                RGB_TOG,  RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD,       RGB_VAI, BL_DOWN,  BL_TOGG, BL_UP,   XXXXXXX, XXXXXXX,   TG(1),
       XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/gh60/revc/keymaps/danbee/keymap.c b/keyboards/gh60/revc/keymaps/danbee/keymap.c
index d8419f5a63..0dabb8b07f 100644
--- a/keyboards/gh60/revc/keymaps/danbee/keymap.c
+++ b/keyboards/gh60/revc/keymaps/danbee/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     │    │    │    │                        │    │    │    │    │
     └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
   [_L1] = LAYOUT_60_iso( /* Layer 1: Functions */
-    KC_NUBS, KC_BRID, KC_BRIU, _______, _______, BL_DEC,  BL_INC,  KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL ,
+    KC_NUBS, KC_BRID, KC_BRIU, _______, _______, BL_DOWN, BL_UP,   KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL ,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______, KC_INS ,
     _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c
index f6b25dbb74..fc6075f337 100644
--- a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c
+++ b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     KC_LCTL, KC_LGUI, KC_LGUI,                            XXXXXXX,                            KC_RALT, KC_RGUI, _______, KC_RCTL),
 
   [_CL] = LAYOUT_60_abnt2(
diff --git a/keyboards/gh60/satan/keymaps/abhixec/keymap.c b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
index 8b226cb043..cc28abb18f 100644
--- a/keyboards/gh60/satan/keymaps/abhixec/keymap.c
+++ b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
@@ -67,7 +67,7 @@ _______,KC_UNDO,KC_CUT,KC_COPY,KC_PASTE, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2,KC_M
 [_FL] = LAYOUT_60_ansi_split_rshift(
   
   KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,  \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR, BL_DEC, BL_INC,BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR, BL_DOWN,BL_UP, BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,_______,_______, \
   _______,_______,_______,_______,_______,_______,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_AUDIO_MUTE,KC_END,_______,_______, TG(_CL), \
   _______,_______,_______,                _______,                        _______,_______,_______,_______)
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
index d120f19e8b..e2e2388320 100644
--- a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
+++ b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRAVE , KC_F1   , KC_F2   , KC_F3   , KC_F4          , KC_F5           , KC_F6        , KC_F7    , KC_F8   , KC_F9    , KC_F10  , KC_F11  , KC_F12       , KC_INS , KC_DEL , \
       KC_CAPS  , KC_VOLD , KC_MUTE , KC_VOLU , DM_REC1        , DM_PLY1         , DM_RSTP      , KC_PGUP  , KC_HOME , ______   , KC_PSCR , KC_UP   , ______       , KC_DEL , \
       KC_LCTL  , KC_END  , ______  , KC_PGDN , ______         , ______          , KC_LEFT      , KC_DOWN  , KC_UP   , KC_RIGHT , KC_LEFT , KC_RGHT , KC_ENT       , \
-      KC_LSFT  , KC_MPRV , KC_MPLY , KC_MNXT , BL_DEC         , BL_TOGG         , BL_INC       , ______   , ______  , ______   , KC_DOWN , KC_RSFT , TO(_DEFAULT) , \
+      KC_LSFT  , KC_MPRV , KC_MPLY , KC_MNXT , BL_DOWN        , BL_TOGG         , BL_UP        , ______   , ______  , ______   , KC_DOWN , KC_RSFT , TO(_DEFAULT) , \
       ______   , ______  , KC_LALT , KC_SPC  , KC_RALT        , QK_BOOT           , ______       , ______ \
       ),
 
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
index f48e6b0f5b..5a61a854e7 100644
--- a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [FN1] = LAYOUT_60_iso( //Functions/settings
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
   ),
diff --git a/keyboards/gh60/satan/keymaps/bri/keymap.c b/keyboards/gh60/satan/keymaps/bri/keymap.c
index 4c4af28be9..1c0b396423 100644
--- a/keyboards/gh60/satan/keymaps/bri/keymap.c
+++ b/keyboards/gh60/satan/keymaps/bri/keymap.c
@@ -45,13 +45,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
   KC_GRV , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,_______,  \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN,BL_UP,  BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______, \
   _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______, \
   QK_BOOT,_______,_______,                 _______,                       _______,_______,_______, _______),
   #else
   KC_GRV, KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,_______,  \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC, BL_INC,BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN,BL_UP, BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   QK_BOOT,_______,_______,                _______,                        _______,_______,_______,_______),
diff --git a/keyboards/gh60/satan/keymaps/colemak/keymap.c b/keyboards/gh60/satan/keymaps/colemak/keymap.c
index 34cfdb9441..af0032341b 100644
--- a/keyboards/gh60/satan/keymaps/colemak/keymap.c
+++ b/keyboards/gh60/satan/keymaps/colemak/keymap.c
@@ -53,13 +53,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
   KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,  \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN,BL_UP,  BL_TOGG, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______, \
   _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______, \
   _______,_______,_______,                 _______,                       _______,_______,_______, _______),
   #else
   KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,  \
-  _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP, KC_END, BL_DEC, BL_INC,BL_TOGG, \
+  _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP, KC_END, BL_DOWN,BL_UP, BL_TOGG, \
   KC_DEL, KC_VOLD,KC_MUTE,KC_VOLU,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,_______,_______, \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
   _______,_______,_______,                _______,                        _______,_______,_______,_______),
diff --git a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
index 082e4bff28..d1e53e005c 100644
--- a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_SFX] = LAYOUT_60_ansi_split_bs_rshift(
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  QK_BOOT, \
-      ______,   BL_DEC, BL_INC, BL_TOGG,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
+      ______,   BL_DOWN,BL_UP,  BL_TOGG,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,   \
       ______,   RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______, ______, ______,  \
       ______,   ______, ______,                 ______,                 ______, ______, ______, ______ \
diff --git a/keyboards/gh60/satan/keymaps/default/keymap.c b/keyboards/gh60/satan/keymaps/default/keymap.c
index 0f23120127..02069f792a 100644
--- a/keyboards/gh60/satan/keymaps/default/keymap.c
+++ b/keyboards/gh60/satan/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_60_ansi(
     KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/gh60/satan/keymaps/denolfe/keymap.c b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
index 4114f0db9e..8b612908be 100644
--- a/keyboards/gh60/satan/keymaps/denolfe/keymap.c
+++ b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
   KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_INC,  BL_TOGG, \
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_UP,   BL_TOGG, \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, \
   KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI,  RGB_VAD, KC_TRNS, KC_TRNS,                   KC_TRNS, \
   KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,   KC_F1,    KC_F2,    KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,          KC_F8,        KC_F9,          KC_F10,   KC_F11,  KC_F12,  KC_DEL,  \
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PGDN,        KC_PGUP,      KC_TRNS,        KC_END,   KC_MPRV, KC_MNXT, KC_MPLY, \
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,        KC_UP,        KC_RIGHT,       KC_TRNS,  KC_TRNS,          KC_TRNS, \
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DEC,    BL_TOGG,  BL_INC,   KC_HOME,  LCTL(KC_LEFT),  LCTL(KC_END), LCTL(KC_RIGHT), KC_TRNS,                    QK_BOOT, \
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DOWN,   BL_TOGG,  BL_UP,    KC_HOME,  LCTL(KC_LEFT),  LCTL(KC_END), LCTL(KC_RIGHT), KC_TRNS,                    QK_BOOT, \
   KC_TRNS,  KC_TRNS,  LM(2, MOD_LSFT),                         KC_TRNS,                                                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
   #endif
 
@@ -66,6 +66,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,         KC_F7,               KC_F8,              KC_F9,                KC_F10,       KC_F11,  KC_F12,  KC_DEL,  \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_PGDN,             KC_PGUP,            KC_TRNS,              LSFT(KC_END), KC_MPRV, KC_MNXT, KC_MPLY, \
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_LEFT), LSFT(KC_DOWN),       LSFT(KC_UP),        LSFT(KC_RIGHT),       KC_TRNS,      KC_TRNS,          KC_TRNS, \
-  KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  LSFT(KC_HOME), LCTL(LSFT(KC_LEFT)), LCTL(LSFT(KC_END)), LCTL(LSFT(KC_RIGHT)), KC_TRNS,                        QK_BOOT, \
+  KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   LSFT(KC_HOME), LCTL(LSFT(KC_LEFT)), LCTL(LSFT(KC_END)), LCTL(LSFT(KC_RIGHT)), KC_TRNS,                        QK_BOOT, \
   KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                                                      KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/gh60/satan/keymaps/fakb/keymap.c b/keyboards/gh60/satan/keymaps/fakb/keymap.c
index e7b23395c3..e7f3efdf6d 100644
--- a/keyboards/gh60/satan/keymaps/fakb/keymap.c
+++ b/keyboards/gh60/satan/keymaps/fakb/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_PSCR,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_INS ,_______,\
  _______,_______,_______,KC_PGUP,KC_PGDN,KC_HOME,KC_END ,KC_PGDN,KC_PGUP,_______,_______,_______,_______,KC_DEL ,\
  KC_CAPS,KC_NUBS,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,_______,_______,_______,_______,\
- _______,_______,BL_TOGG,BL_INC ,BL_DEC ,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,_______,_______,\
+ _______,_______,BL_TOGG,BL_UP  ,BL_DOWN,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,_______,_______,\
  _______,_______,_______,                _______,                                _______,_______,_______,_______),
 
 [2] = LAYOUT_all(
diff --git a/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c b/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
index 9f2e167399..8de03bf80c 100644
--- a/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
+++ b/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FL] = LAYOUT_60_ansi(
     QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME,
-    RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG,
+    RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
     _______,          RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
index 4ccce44a1d..0ab072ff69 100644
--- a/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
+++ b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_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,_______,\
-      _______,   BL_DEC, BL_INC, BL_TOGG,_______, _______, KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,_______,_______,\
+      _______,   BL_DOWN,BL_UP,  BL_TOGG,_______, _______, KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,_______,_______,\
             _______,_______,                   _______,                     _______,_______\
       )
 };
diff --git a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
index ef7a330926..3e2043a8ff 100644
--- a/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT_60_iso_split_rshift(\
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_PSCR, QK_BOOT,
     _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, RGB_TOG, RGB_MOD, RGB_M_B, RGB_VAI, RGB_VAD, BL_INC,  BL_DEC,  _______,
+    KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, RGB_TOG, RGB_MOD, RGB_M_B, RGB_VAI, RGB_VAD, BL_UP,   BL_DOWN, _______,
     _______, _______, _______, _______, KC_CEDL, _______, BL_TOGG, _______, KC_MUTE, _______, _______, _______, _______, _______,
     _______, _______, _______,                   KC_MPLY,                                     _______, _______, _______, _______
   )
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
index a7efd791e2..5165ab4af6 100644
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [ NUMPAD ] = KEYMAP( //Numpad and alt shortcuts
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
-        _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, _______,\
+        _______, BL_TOGG, BL_DOWN,BL_UP,  _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, _______,\
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______,\
         _______, _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_7, KC_8, KC_9, KC_0, _______, _______, XXXXX,\
         _______, _______, _______,           _______,             _______, _______, _______, _______),
diff --git a/keyboards/gh60/satan/keymaps/poker/keymap.c b/keyboards/gh60/satan/keymaps/poker/keymap.c
index dc20686569..2a2aaa786f 100644
--- a/keyboards/gh60/satan/keymaps/poker/keymap.c
+++ b/keyboards/gh60/satan/keymaps/poker/keymap.c
@@ -75,13 +75,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_RL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
     KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,                   _______, \
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
   #else
     KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, \
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/gh60/satan/keymaps/smt/keymap.c b/keyboards/gh60/satan/keymaps/smt/keymap.c
index 06a3307bc4..7ac068f7c1 100644
--- a/keyboards/gh60/satan/keymaps/smt/keymap.c
+++ b/keyboards/gh60/satan/keymaps/smt/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FUNC] = LAYOUT_60_ansi(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, \
-    _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_UP,   BL_DEC,  BL_INC,  \
+    _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_UP,   BL_DOWN, BL_UP,   \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT,          _______, \
     _______,          _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGDN, KC_DOWN,          _______, \
     QK_BOOT, _______, _______,                   _______,                                     _______, _______, _______, _______
diff --git a/keyboards/gh60/satan/keymaps/unxmaal/keymap.c b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
index 9d585f4035..37bbcbda70 100644
--- a/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
+++ b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
@@ -69,13 +69,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_FL] = LAYOUT_60_ansi(
   #ifdef RGBLIGHT_ENABLE
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,          _______, \
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
   #else
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
     _______, _______, _______,                   _______,                                     _______, _______, _______, _______
diff --git a/keyboards/gh60/v1p3/keymaps/default/keymap.c b/keyboards/gh60/v1p3/keymaps/default/keymap.c
index b1b8d7c687..8a31e89aef 100644
--- a/keyboards/gh60/v1p3/keymaps/default/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,
         KC_NO,       RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_SPI, RGB_SPD, KC_PSCR, KC_SCRL, KC_PAUS,        KC_NO,
         KC_NO,         KC_LEFT, KC_DOWN, KC_RGHT, RGB_VAI, RGB_SAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_PGUP, KC_NO,
-        KC_NO,   KC_NO,   QK_BOOT,   BL_DEC,  BL_ON,   BL_INC,  KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   QK_BOOT,   BL_DOWN, BL_ON,   BL_UP,   KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, KC_NO,   KC_NO,   KC_NO,   KC_NO,
         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
index 13ef5e494b..6ff0212bf9 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_hhkb/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  _______, KC_BSPC,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        KC_BSPC,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_TILD, _______,
-        _______, _______, QK_BOOT, KC_APP,  BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, KC_APP,  BL_DOWN, BL_TOGG, BL_UP,   KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c
index 5a9a53e4a1..c0b6af0cde 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_layout5/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_DEL,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, KC_HASH, _______,
-        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c
index 3d80254de7..6f58413658 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_layout7/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_DEL,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, KC_HASH, _______,
-        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
index a8d34d22d4..8feaa2dbf5 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_layout9/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  _______,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
-        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
index 1d8d0e7d35..32c13c2ebf 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_minila/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
-        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c b/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
index 3983d88b0b..6b9e75b569 100644
--- a/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
+++ b/keyboards/gh60/v1p3/keymaps/factory_poker/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_DEL,
         _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS,        _______,
         _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_HASH, _______,
-        _______, _______, QK_BOOT, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_END,  KC_PGDN, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
index 6a153eaf8f..44ef8f3203 100644
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
@@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_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_DEC,  BL_INC,  XXXXXXX, XXXXXXX, KC_DMR1, KC_DMP1, \
+        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,          \
diff --git a/keyboards/gray_studio/hb85/keymaps/stt/keymap.c b/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
index 6b05a1ca45..96f1352872 100644
--- a/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
+++ b/keyboards/gray_studio/hb85/keymaps/stt/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_stt(
         QK_BOOT, RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_M_X,  RGB_M_G,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                            \
         EE_CLR,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
-        BL_TOGG, BL_STEP,  BL_INC,   BL_DEC,   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, \
+        BL_TOGG, BL_STEP,  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, \
         RGB_TOG, RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
         KC_TRNS, RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
         KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS                                                                             \
diff --git a/keyboards/hadron/ver2/keymaps/default/keymap.c b/keyboards/hadron/ver2/keymaps/default/keymap.c
index 5aec1550bc..535db7e2ee 100644
--- a/keyboards/hadron/ver2/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/default/keymap.c
@@ -189,7 +189,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   QK_BOOT,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
index 752ac2cf2e..3c7e5f8a8d 100644
--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -192,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   QK_BOOT,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, \
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,  KC_DEL, _______, _______, _______, \
   _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP,  QWERTY, _______, _______, _______, _______, _______, _______, _______, \
-  _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG, _______, _______, _______, \
+  _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
 )
 
diff --git a/keyboards/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c
index 0ca19e4a5b..5b96da8356 100644
--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
@@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   QK_BOOT,   HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST , _______, _______, _______, _______, _______, EE_CLR,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG
 )
 
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index 3114accd6b..673531f7c7 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST, _______, _______, _______, _______, _______, EE_CLR, \
   QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
   _______, MAGIC_TOGGLE_NKRO, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DEC,  BL_INC,  BL_STEP, BL_TOGG, \
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG\
 )
 
diff --git a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
index 9c9c3cbad6..cecaefe80d 100644
--- a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_BSPC, KC_PENT, KC_DEL,  M_SHFCT  ),
 
 [LAYER_FUNCTION] = LAYOUT(
-  BL_TOGG, BL_INC,  BL_DEC,  _______,
+  BL_TOGG, BL_UP,   BL_DOWN, _______,
   TG(1),   _______, _______, _______,
   _______, _______, _______, _______,
   _______, _______, _______, _______,
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
index 7fb667b026..bc940420fe 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_BSPC,          KC_DEL,  M_SHFCT),
 
 [LAYER_FUNCTION] = LAYOUT_pad21(
-  BL_TOGG, BL_INC,  BL_DEC,  _______,
+  BL_TOGG, BL_UP,   BL_DOWN, _______,
   TG(1),   _______, _______, _______,
   _______, _______, _______,
   _______, _______, _______, _______,
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
index 378edc7081..b69d49b7e5 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_BSPC, KC_PENT, KC_DEL,  M_SHFCT  ),
 
 [LAYER_FUNCTION] = LAYOUT(
-  BL_TOGG, BL_INC,  BL_DEC,  _______,
+  BL_TOGG, BL_UP,   BL_DOWN, _______,
   TG(1),   _______, _______, _______,
   _______, _______, _______, _______,
   _______, _______, _______, _______,
diff --git a/keyboards/handwired/co60/keymaps/default/keymap.c b/keyboards/handwired/co60/keymaps/default/keymap.c
index a77d42eb7a..a492137cb9 100644
--- a/keyboards/handwired/co60/keymaps/default/keymap.c
+++ b/keyboards/handwired/co60/keymaps/default/keymap.c
@@ -30,9 +30,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_L2] = LAYOUT_60_ansi( /* Base */
     QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,    KC_F11,     KC_F12,   KC_GRV,
-    _______, BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______,   _______,   KC_PGUP,    _______,  KC_INSERT,
+    _______, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, _______,   _______,   KC_PGUP,    _______,  KC_INSERT,
     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_HOME,   KC_END,     _______,
-    _______, BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______,   KC_PGDN,   _______,
+    _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______,   KC_PGDN,   _______,
     _______, _______, _______,                            _______,                              _______,   _______,    _______,  _______
   )
 };
diff --git a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
index b356fc53d4..885c31e8c6 100644
--- a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
+++ b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
@@ -42,9 +42,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_L3] = LAYOUT_60_hhkb_split_625u_space( /* Function */
     QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_F10,    KC_F11,     KC_F12,   _______, _______,
-    BL_BRTG, BL_TOGG, BL_INC,  BL_DEC, BL_ON, BL_OFF, _______, _______, _______, _______,   _______,   KC_PGUP,    KC_INSERT,  KC_DEL,
+    BL_BRTG, BL_TOGG, BL_UP,   BL_DOWN,BL_ON, BL_OFF, _______, _______, _______, _______,   _______,   KC_PGUP,    KC_INSERT,  KC_DEL,
     _______, RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_HOME,   KC_END,     _______,
-    _______, BL_DEC,  _______, _______, _______, _______, _______, DF(_L1), DF(_L2), _______,   KC_PGDN,   _______, _______,
+    _______, BL_DOWN, _______, _______, _______, _______, _______, DF(_L1), DF(_L2), _______,   KC_PGDN,   _______, _______,
              _______, _______,          _______,          _______,          _______, _______,   _______,   _______
   )
 };
diff --git a/keyboards/handwired/sick68/keymaps/default/keymap.c b/keyboards/handwired/sick68/keymaps/default/keymap.c
index 6d6030582c..121fc3956e 100644
--- a/keyboards/handwired/sick68/keymaps/default/keymap.c
+++ b/keyboards/handwired/sick68/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
         _______, _______, _______,                            _______,                   _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
     ),
 };
diff --git a/keyboards/handwired/sick68/keymaps/via/keymap.c b/keyboards/handwired/sick68/keymaps/via/keymap.c
index 3257c1b973..30c793799b 100644
--- a/keyboards/handwired/sick68/keymaps/via/keymap.c
+++ b/keyboards/handwired/sick68/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
         _______, _______, _______,                            _______,                   _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
     ),
     [2] = LAYOUT_65_ansi(
diff --git a/keyboards/hineybush/h60/keymaps/default/keymap.c b/keyboards/hineybush/h60/keymaps/default/keymap.c
index 5930c59e09..d7cd9b6d16 100644
--- a/keyboards/hineybush/h60/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h60/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, MO(1),   KC_RGUI,  KC_RCTL),
 
     [_FN] = LAYOUT_60_ansi(
-    KC_TRNS, BL_TOGG, BL_DEC,  BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, BL_TOGG, BL_DOWN, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/h60/keymaps/kei/keymap.c b/keyboards/hineybush/h60/keymaps/kei/keymap.c
index 30a289b9ff..8469535bc7 100644
--- a/keyboards/hineybush/h60/keymaps/kei/keymap.c
+++ b/keyboards/hineybush/h60/keymaps/kei/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    MO(1),
              KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI,  KC_RALT),
     [_FN] = LAYOUT_60_hhkb(
-    KC_TRNS, BL_TOGG, BL_DEC,  BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, BL_TOGG, BL_DOWN, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/h60/keymaps/via/keymap.c b/keyboards/hineybush/h60/keymaps/via/keymap.c
index ed36e977bb..f5093ca61b 100644
--- a/keyboards/hineybush/h60/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h60/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    KC_TRNS,
     KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS,                   KC_SPC,           KC_TRNS, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
     LAYOUT_all(
-    KC_TRNS, BL_TOGG, BL_DEC,  BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, BL_TOGG, BL_DOWN, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/h660s/keymaps/default/keymap.c b/keyboards/hineybush/h660s/keymaps/default/keymap.c
index 4f65a4871b..257184cf12 100644
--- a/keyboards/hineybush/h660s/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h660s/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,                  KC_UP,
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      MO(1),    KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT),
     [_FN] = LAYOUT_66_ansi_rwkl(
-    KC_TRNS,  RGB_TOG, RGB_MOD, BL_TOGG, BL_DEC,  BL_INC,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,        KC_TRNS,
+    KC_TRNS,  RGB_TOG, RGB_MOD, BL_TOGG, BL_DOWN, BL_UP,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,        KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  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,
diff --git a/keyboards/hineybush/h660s/keymaps/via/keymap.c b/keyboards/hineybush/h660s/keymaps/via/keymap.c
index b7b7ad45f8..5cb4f6a9b7 100644
--- a/keyboards/hineybush/h660s/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h660s/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,                  KC_UP,
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),    KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT),
     [_FN] = LAYOUT_all(
-    KC_TRNS, RGB_TOG, RGB_MOD, BL_TOGG, BL_DEC, BL_INC,  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, BL_TOGG, BL_DOWN,BL_UP,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,      KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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,
diff --git a/keyboards/hineybush/h87a/keymaps/default/keymap.c b/keyboards/hineybush/h87a/keymaps/default/keymap.c
index 4a580c4a8c..fc33945cea 100644
--- a/keyboards/hineybush/h87a/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  MO(1),      KC_RGUI,      KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
index 5c3ee4d961..b3f76d60d1 100644
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
@@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_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_DEC,  BL_INC,  XXXXXXX, XXXXXXX, XXXXXXX, KC_DMR1, KC_DMP1, \
+        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,          \
diff --git a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
index 85232ba8b9..0c142e5759 100644
--- a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
@@ -22,6 +22,6 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [0] = LAYOUT_all(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, SC_LSPO, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, LT(2,KC_HOME), KC_UP, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_APP, RCTL_T(KC_END), KC_LEFT, KC_DOWN, KC_RGHT),
-        [1] = LAYOUT_all(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        [1] = LAYOUT_all(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
         [2] = LAYOUT_all(KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_VAI, RGB_SPI, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
\ No newline at end of file
diff --git a/keyboards/hineybush/h87a/keymaps/via/keymap.c b/keyboards/hineybush/h87a/keymaps/via/keymap.c
index 89f0b53ccb..fc9e927599 100644
--- a/keyboards/hineybush/h87a/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  MO(1),      KC_RGUI,      KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
   [2] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
   [3] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c
index 458ff91885..80f0d86c24 100644
--- a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LALT,                   KC_SPC,                                      MO(1),             KC_RCTL,                                         KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT_tkl_ansi_wkl(
-    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS,
diff --git a/keyboards/hineybush/h88/keymaps/default/keymap.c b/keyboards/hineybush/h88/keymaps/default/keymap.c
index e8a3ec9bec..129c870571 100644
--- a/keyboards/hineybush/h88/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h88/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  MO(1),      KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/h88/keymaps/via/keymap.c b/keyboards/hineybush/h88/keymaps/via/keymap.c
index 353ef3f754..43660f94b3 100644
--- a/keyboards/hineybush/h88/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h88/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  MO(1),      KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/hineybush/h88/keymaps/wkl/keymap.c b/keyboards/hineybush/h88/keymaps/wkl/keymap.c
index f0d3e54851..f2f59a8757 100644
--- a/keyboards/hineybush/h88/keymaps/wkl/keymap.c
+++ b/keyboards/hineybush/h88/keymaps/wkl/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LALT,                   KC_SPC,                                      MO(1),             KC_RGUI,                                         KC_LEFT, KC_DOWN, KC_RGHT),
 
   [1] = LAYOUT_tkl_ansi_wkl(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
     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_MPLY, 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_TRNS,
diff --git a/keyboards/hineybush/physix/keymaps/default/keymap.c b/keyboards/hineybush/physix/keymaps/default/keymap.c
index 262556e935..60961b0677 100644
--- a/keyboards/hineybush/physix/keymaps/default/keymap.c
+++ b/keyboards/hineybush/physix/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,          KC_LALT,          KC_SPC,  MO(_FN),          KC_SPC,  KC_RALT,            KC_RGUI,                           KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT_split_bksp_275_rspace(
-    KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_TOGG, BL_INC,  BL_DEC,  KC_TRNS, KC_TRNS, KC_INS,
+    KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_TOGG, BL_UP,   BL_DOWN, KC_TRNS, KC_TRNS, KC_INS,
     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_HOME,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_END,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
diff --git a/keyboards/hineybush/physix/keymaps/via/keymap.c b/keyboards/hineybush/physix/keymaps/via/keymap.c
index 34c76c3cd4..0a4a3c7579 100644
--- a/keyboards/hineybush/physix/keymaps/via/keymap.c
+++ b/keyboards/hineybush/physix/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_split_bksp_275_rspace(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_INS,
     KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_HOME,
-    KC_TRNS, BL_BRTG, BL_TOGG, BL_INC,  BL_DEC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_END,
+    KC_TRNS, BL_BRTG, BL_TOGG, BL_UP,   BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_END,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
     ),
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
index 064eaaefd6..07c91ad334 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN]   = LAYOUT_all(
                 QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PSCR,
                 RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_HOME,
-                BL_TOGG, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_END,
+                BL_TOGG, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_END,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
                 _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
             ),
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
index 66ea1efa24..3450adfb01 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN]   = LAYOUT_all(
                 QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PSCR,
                 RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_HOME,
-                BL_TOGG, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_END,
+                BL_TOGG, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_END,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
                 _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
             ),
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
index f6fd7fc48b..a79b03b80f 100644
--- a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
+++ b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
@@ -95,8 +95,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_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_INC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-  EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC, 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  
 ),
 
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/default/keymap.c
index b09718dda0..c2f937d079 100644
--- a/keyboards/idobao/id80/v2/ansi/keymaps/default/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+        _______,            _______, _______, BL_DOWN, BL_TOGG, BL_UP,   NK_TOGG, _______, _______, _______, _______, _______,          BL_UP, 
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DOWN, BL_STEP
     ),
 };
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
index cff9cdeba6..ae8b42851c 100644
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_INS,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        KC_DEL,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+        _______,            _______, _______, BL_DOWN, BL_TOGG, BL_UP,   NK_TOGG, _______, _______, _______, _______, _______,          BL_UP, 
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DOWN, BL_STEP
     ),
     [2] = LAYOUT_ansi(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/via/keymap.c
index 4fc88dc592..df96a4473c 100644
--- a/keyboards/idobao/id80/v2/ansi/keymaps/via/keymap.c
+++ b/keyboards/idobao/id80/v2/ansi/keymaps/via/keymap.c
@@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+        _______,            _______, _______, BL_DOWN, BL_TOGG, BL_UP,   NK_TOGG, _______, _______, _______, _______, _______,          BL_UP, 
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DOWN, BL_STEP
     ),
     [2] = LAYOUT_ansi(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
diff --git a/keyboards/idobao/id80/v2/iso/keymaps/default/keymap.c b/keyboards/idobao/id80/v2/iso/keymaps/default/keymap.c
index 01eaa2a44f..3cd6cf55dd 100644
--- a/keyboards/idobao/id80/v2/iso/keymaps/default/keymap.c
+++ b/keyboards/idobao/id80/v2/iso/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,                 _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+        _______,   _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   NK_TOGG, _______, _______, _______, _______, _______,          BL_UP, 
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DOWN, BL_STEP
     ),
 };
diff --git a/keyboards/idobao/id80/v2/iso/keymaps/via/keymap.c b/keyboards/idobao/id80/v2/iso/keymaps/via/keymap.c
index 25ff6b084d..6a172e253a 100644
--- a/keyboards/idobao/id80/v2/iso/keymaps/via/keymap.c
+++ b/keyboards/idobao/id80/v2/iso/keymaps/via/keymap.c
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
         _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,                 _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+        _______,   _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   NK_TOGG, _______, _______, _______, _______, _______,          BL_UP, 
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DOWN, BL_STEP
     ),
     [2] = LAYOUT_iso(
         _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
diff --git a/keyboards/idobao/id87/v1/keymaps/default/keymap.c b/keyboards/idobao/id87/v1/keymaps/default/keymap.c
index 0c9f2f5282..b10de73848 100644
--- a/keyboards/idobao/id87/v1/keymaps/default/keymap.c
+++ b/keyboards/idobao/id87/v1/keymaps/default/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
         _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_UP, 
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_UP,   BL_DOWN,RGB_MOD
     ),
 
 };
diff --git a/keyboards/idobao/id87/v1/keymaps/via/keymap.c b/keyboards/idobao/id87/v1/keymaps/via/keymap.c
index fbb12c1c32..759a02813c 100644
--- a/keyboards/idobao/id87/v1/keymaps/via/keymap.c
+++ b/keyboards/idobao/id87/v1/keymaps/via/keymap.c
@@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
         _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_UP, 
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_UP,   BL_DOWN,RGB_MOD
     ),
 	[2] = LAYOUT_tkl_ansi(
         _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
diff --git a/keyboards/idobao/id96/keymaps/default/keymap.c b/keyboards/idobao/id96/keymaps/default/keymap.c
index 896acf3982..4bf52fff4d 100644
--- a/keyboards/idobao/id96/keymaps/default/keymap.c
+++ b/keyboards/idobao/id96/keymaps/default/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     |          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
     |          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
     |__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-    BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs
+    BL_TOGG, BL_DOWN,BL_UP changes the in-switch LEDs
     */
 
 
@@ -85,6 +85,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
         BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
diff --git a/keyboards/idobao/id96/keymaps/via/keymap.c b/keyboards/idobao/id96/keymaps/via/keymap.c
index f25ceff504..19e38c111c 100644
--- a/keyboards/idobao/id96/keymaps/via/keymap.c
+++ b/keyboards/idobao/id96/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
         BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
     [LAYER_2] = LAYOUT(
diff --git a/keyboards/ilumkb/primus75/keymaps/default/keymap.c b/keyboards/ilumkb/primus75/keymaps/default/keymap.c
index 2bed82ceb9..b00a270dc1 100644
--- a/keyboards/ilumkb/primus75/keymaps/default/keymap.c
+++ b/keyboards/ilumkb/primus75/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
     _______,  _______,            _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
   ),
 };
diff --git a/keyboards/ilumkb/primus75/keymaps/via/keymap.c b/keyboards/ilumkb/primus75/keymaps/via/keymap.c
index fcc216529a..ab7fbb23b9 100644
--- a/keyboards/ilumkb/primus75/keymaps/via/keymap.c
+++ b/keyboards/ilumkb/primus75/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
     _______,  _______,            _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
   ),
 
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index 0933e37eb5..ec3972c0ae 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -137,8 +137,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______,  DE_PERC,  DE_CIRC,  DE_LBRC,  DE_RBRC,  DE_TILD,  _______,
    _______,  _______,  _______,  _______,  _______,
                                            RGB_MOD,  BL_TOGG,
-                                           BL_INC,
-                                           RGB_VAD,  RGB_VAI,  BL_DEC,
+                                           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,  _______,
diff --git a/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
index 6fd5f43239..5bc868cac3 100644
--- a/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
@@ -50,9 +50,9 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_iso( \
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, KC_BSPC,    KC_INS, \
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_INC, KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_TRNS,KC_PAUS,  KC_UP,             KC_DEL, \
+        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_UP,  KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_TRNS,KC_PAUS,  KC_UP,             KC_DEL, \
         KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,BL_TOGG,KC_TRNS,KC_BSPC,KC_DEL, CMD_SFT_L,KC_LEFT,KC_RGHT,KC_NUBS,   KC_PENT,KC_PGUP,\
-        KC_TRNS,KC_NUBS,KC_TRNS,KC_TRNS,CMD_ALT_C, BL_DEC, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DOWN,KC_TRNS,KC_TRNS,  KC_PGUP,KC_PGDN,\
+        KC_TRNS,KC_NUBS,KC_TRNS,KC_TRNS,CMD_ALT_C, BL_DOWN,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DOWN,KC_TRNS,KC_TRNS,  KC_PGUP,KC_PGDN,\
         KC_TRNS,KC_TRNS,KC_TRNS,                        KC_TRNS,                KC_TRNS,KC_TRNS,KC_TRNS,     KC_HOME,KC_PGDN,KC_END  \
     ),
 };
diff --git a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
index b0006a5d4b..a18e84e8b2 100644
--- a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
@@ -52,8 +52,8 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT( \
         KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS,KC_TRNS,KC_MUTE,\
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_TOGG,KC_TRNS,KC_TRNS,BL_INC, KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,        KC_TRNS,\
-        KC_TRNS,KC_TRNS,KC_TRNS,BL_DEC, 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,BL_TOGG,KC_TRNS,KC_TRNS,BL_UP,  KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,        KC_TRNS,\
+        KC_TRNS,KC_TRNS,KC_TRNS,BL_DOWN,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_VOLU,\
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_PGUP,KC_VOLD,\
         KC_TRNS,KC_TRNS,KC_TRNS,                        KC_TRNS,                KC_TRNS,KC_TRNS,KC_TRNS,        KC_HOME,KC_PGDN,KC_END  \
     ),
diff --git a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
index 5509c05260..1b3b69e3f3 100644
--- a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
@@ -46,8 +46,8 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT( \
         _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,_______,_______,\
         _______,KC_MPRV,KC_MNXT,KC_VOLU,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______ ,     BL_TOGG ,\
-        _______,KC_MPLY,KC_MSTP,KC_VOLD,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,   BL_INC,\
-        _______,_______,_______,KC_MUTE,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,BL_DEC,\
+        _______,KC_MPLY,KC_MSTP,KC_VOLD,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,   BL_UP, \
+        _______,_______,_______,KC_MUTE,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,BL_DOWN,\
         _______,_______,_______,               _______,          _______,_______,_______,     KC_HOME,_______,KC_END  \
     ),
 };
diff --git a/keyboards/jae/j01/keymaps/default/keymap.c b/keyboards/jae/j01/keymaps/default/keymap.c
index 114939c4d2..0a70bc037c 100644
--- a/keyboards/jae/j01/keymaps/default/keymap.c
+++ b/keyboards/jae/j01/keymaps/default/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_ansi(
 	KC_TRNS,    KC_TRNS,    QK_BOOT,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,    KC_TRNS,    BL_TOGG,   BL_INC,     BL_STEP,    KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
-    KC_TRNS,    KC_TRNS,    BL_BRTG,   BL_DEC,     KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_END,
+    KC_TRNS,    KC_TRNS,    BL_TOGG,   BL_UP,      BL_STEP,    KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
+    KC_TRNS,    KC_TRNS,    BL_BRTG,   BL_DOWN,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_END,
     KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_MUTE,    KC_VOLD,   KC_VOLU,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,
                         KC_TRNS,  KC_TRNS,  KC_TRNS,                                  KC_TRNS,                             KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,   KC_TRNS),
 };
diff --git a/keyboards/jc65/v32u4/keymaps/coth/keymap.c b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
index 5bb4920374..025c585852 100644
--- a/keyboards/jc65/v32u4/keymaps/coth/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
@@ -17,8 +17,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
   [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_INC,   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_DEC,   KC_TRNS, KC_TRNS, KC_TRNS,
+      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/dead_encryption/keymap.c b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
index 358ee72479..0fca214f77 100644
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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_INC,  BL_DEC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,   KC_PGDN, 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/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
index 000a7b472d..b7349de55a 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *  *---------------------------------------------------------------*
     */
     [_AL] = LAYOUT(
-        QMK_REV, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, BL_TOGG, BL_DEC,  BL_INC,  XXXXXXX, XXXXXXX, KC_DMP1,
+        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,
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 589afefbb6..0c13b2d301 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -219,8 +219,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 #if defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
 [_BCKLT_ADJ] = LAYOUT_symmetric(
-  XXXXXXX, XXXXXXX, XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX, XXXXXXX, BL_DEC,  RGB_VAD, RGB_SAD, RGB_SAI,
+  XXXXXXX, XXXXXXX, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
+           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
            BL_ADJ,  BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
                                       _______, _______, _______
 ),
diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
index 3ef40f4dae..8a1234e1aa 100644
--- a/keyboards/jian/keymaps/default/keymap.c
+++ b/keyboards/jian/keymaps/default/keymap.c
@@ -80,8 +80,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #if defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE)
 [_BCKLT_ADJ] = LAYOUT_symmetric(
-  XXXXXXX, XXXXXXX,        XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX,        XXXXXXX, BL_DEC,  RGB_VAD, RGB_SAD, RGB_SAI,
+  XXXXXXX, XXXXXXX,        XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
+           XXXXXXX,        XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
            TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
                                              _______, _______, _______
 )
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index aa65af0915..5f6b93bc6e 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -63,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                      _______, _______, LT(_ADJUST, KC_ESC)
 ),
 [_ADJUST] = LAYOUT_symmetric_left(
-  QK_BOOT, DB_TOGG, XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX, XXXXXXX, BL_DEC,  RGB_VAD, RGB_SAD, RGB_SAI,
+  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
+           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
            XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
                                       _______, _______, _______
 )
diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c
index dd99f26e97..5844ef16e8 100644
--- a/keyboards/jian/keymaps/via/keymap.c
+++ b/keyboards/jian/keymaps/via/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                         _______, _______, LT(3, KC_ENT),      LT(3, KC_ESC), _______, _______
 ),
 [3] = LAYOUT_symmetric(
-  QK_BOOT, DB_TOGG, XXXXXXX, BL_INC,  RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX, XXXXXXX, BL_DEC,  RGB_VAD, RGB_SAD, RGB_SAI,
+  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
+           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
            XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
                                       _______, SH_TG,   _______
 )
diff --git a/keyboards/jm60/keymaps/default/keymap.c b/keyboards/jm60/keymaps/default/keymap.c
index 4488721a77..2bb26fccf6 100644
--- a/keyboards/jm60/keymaps/default/keymap.c
+++ b/keyboards/jm60/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FL] = LAYOUT_60_ansi(
         KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
diff --git a/keyboards/kagizaraya/scythe/keymaps/default/keymap.c b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
index 80411dee49..c36066071c 100644
--- a/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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_INC , BL_DEC ,      _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_INS,
+  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,  _______, _______, _______,
                              _______, _______, _______, _______,      _______, _______, _______, _______
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
index 9a564d2c9d..437be945bd 100644
--- a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
+++ b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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_INC , BL_DEC ,      _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_INS,
+  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,  _______, _______, _______,
                              _______, _______, _______, _______,      _______, _______, _______, _______
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_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_INC , BL_DEC ,      _______, _______, _______, _______, _______, _______, _______,
+  _______, 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, _______, _______,
                              _______, _______, _______, _______,      _______, _______, _______, _______
diff --git a/keyboards/kbdfans/bounce/75/hotswap/keymaps/default/keymap.c b/keyboards/kbdfans/bounce/75/hotswap/keymaps/default/keymap.c
index 8b0ddf88fe..deecc6b9b2 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/bounce/75/hotswap/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     )
 };
diff --git a/keyboards/kbdfans/bounce/75/hotswap/keymaps/via/keymap.c b/keyboards/kbdfans/bounce/75/hotswap/keymaps/via/keymap.c
index 8b0ddf88fe..deecc6b9b2 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/bounce/75/hotswap/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     )
 };
diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c
index 91339709c4..40cb4ad542 100644
--- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 };
diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c
index 25d4f63b7c..96a0260866 100644
--- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c
+++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c
index 1ef7179a10..56827e45d1 100644
--- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c
+++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c
index b4d9c5f581..e7f07d0af1 100644
--- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c
+++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c
index 1caa9f8519..8a76d6c9fd 100644
--- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c
+++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 };
diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c
index 91339709c4..40cb4ad542 100644
--- a/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 };
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
index d04874f182..5e2303ea15 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_all( /* FN */
 	QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
 	KC_CAPS, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______, _______,
-	_______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          BL_INC,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, BL_DEC,
+	_______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          BL_UP, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, BL_DOWN,
 	_______, _______, _______,          _______,          _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_END
   )
 };
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c
index ce277d0afe..2e490cc906 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_65_ansi_blocker( /* FN */
-	QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           BL_INC,
-	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
+	QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           BL_UP, 
+	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DOWN,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
 	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, _______,
 	_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c
index 2d00724086..61a4e6eadb 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_65_ansi_blocker_split_bs( /* 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,  _______, _______, BL_INC,
-	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
+	QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, BL_UP, 
+	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DOWN,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
 	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, _______,
 	_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c
index 98ba26ac46..7abaf11283 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_all( /* FN */
-	QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, BL_INC,
-	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
+	QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, BL_UP, 
+	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DOWN,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, _______,
 	_______, _______, _______,          _______,          _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c
index 8fc09cda25..896603a3cd 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c
@@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_65_iso_blocker( /* FN */
-	QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           BL_INC,
-	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   BL_DEC,
+	QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           BL_UP, 
+	KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   BL_DOWN,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, _______,
 	_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c
index d5b9e2e0ef..1c875eb124 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   	),
 
 	[1] = LAYOUT_all( /* FN */
-		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, BL_INC,
-		KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
+		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, BL_UP, 
+		KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DOWN,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, _______,
 		_______, _______, _______,          _______,          _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
index f40216eb02..1f1e1650c0 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
@@ -56,6 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
    _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
-   _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
+   _______,_______,BL_DOWN,BL_UP,  BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
    _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
 };
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
index 7d8599e58b..2ec9fbb21f 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_65_iso(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_INC,  BL_DEC,  BL_TOGG,          KC_INS,
+        KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_UP,   BL_DOWN, BL_TOGG,          KC_INS,
         _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_HOME,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END,
         _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
index f40216eb02..1f1e1650c0 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
@@ -56,6 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,  \
    _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______, \
    KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______, \
-   _______,_______,BL_DEC, BL_INC, BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
+   _______,_______,BL_DOWN,BL_UP,  BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______, \
    _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
 };
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
index bc04eb5bcb..682f15c445 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,_______,KC_INS, 
          _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,      KC_HOME, 
          _______,     VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,_______,_______,_______,_______,_______,      _______,      KC_END, 
-         _______,_______,BL_TOGG, BL_DEC, BL_INC, BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,_______, 
+         _______,_______,BL_TOGG, BL_DOWN,BL_UP,  BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,_______, 
          KC_SLEP,QK_BOOT,_______,      LCA(KC_DEL),     LCA(KC_DEL),    LCA(KC_DEL),  LCA(KC_INS),KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
        
     /* Keymap Numpad Layer
diff --git a/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
index 9966a28d73..5b8a6fcffd 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_INC, BL_DEC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP,  BL_DOWN,BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, DF(_DEFAULT), DF(_ALTERNATE), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
index 0aae1f906b..ed32de462e 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
       KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
       ),
 };
diff --git a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c
index 7fe2a9f4d3..e615dc3d8e 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_INC, BL_DEC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP,  BL_DOWN,BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
diff --git a/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
index d78c51ef2d..b7152d49fb 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_RCTL,    KC_VOLD, KC_VOLU, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,       MY_LOCK,
 //  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
 //  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-          _______,      BL_TOGG,  BL_INC,  BL_DEC, BL_STEP, _______, _______, _______, KC_MRWD, KC_MFFD, _______,    _______,     _______,
+          _______,      BL_TOGG,  BL_UP,   BL_DOWN,BL_STEP, _______, _______, _______, KC_MRWD, KC_MFFD, _______,    _______,     _______,
 //  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 //                   |        |   1,25u    |                                                        |   1,25u    |        |
          XXXXXXX,     _______,  _______,                          KC_MPLY,                            _______,    _______,      XXXXXXX
diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
index 39132fbfcb..49c4b3ffc0 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
       ),
 
diff --git a/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
index 4bf95fb4c9..75eb2f6074 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/wanleg/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [ONE] = LAYOUT_wrapper(
       KC_GRV,  _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-      _______, BL_BRTG, BL_DEC,  BL_INC,  BL_TOGG, BL_STEP,  BL_ON,   KC_PGUP, KC_HOME, _______, _______, _______, _______, _______,
+      _______, BL_BRTG, BL_DOWN, BL_UP,   BL_TOGG, BL_STEP,  BL_ON,   KC_PGUP, KC_HOME, _______, _______, _______, _______, _______,
       _______, RGB_M_B, RGB_VAD, RGB_VAI, RGB_TOG, RGB_MOD,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
       _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______,  _______, KC_PGDN, KC_END,  _______, gGHERKIN,_______, _______,
 	    _______, _______, _______,                   _______,                    _______, _______, _______
diff --git a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c b/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
index aaca0a06ee..2c3464c941 100644
--- a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
@@ -181,7 +181,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,          KC_F13 ,
     KC_TAB , QWERTY , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_SNU ,
     KC_CAPS, _______, _______, DVORAK , _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_SND ,
-    _______,          _______, _______, COLEMAK, BL_DEC , BL_TOGG, BL_INC , BL_STEP, _______, _______, _______, _______,          KC_PAUS, KC_MUTE,
+    _______,          _______, _______, COLEMAK, BL_DOWN, BL_TOGG, BL_UP  , BL_STEP, _______, _______, _______, _______,          KC_PAUS, KC_MUTE,
     KC_LGUI, KC_LALT, KC_LCTL,                   KC_SPC ,                                     KC_MNXT, KC_MPLY, _______, KC_VOLD, KC_SCRL, KC_VOLU
   ),
 };
diff --git a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
index b33f6fd961..9bd91eade0 100644
--- a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────────┼─────────┤
      * │    _______     │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │       _______        │ KC_VOLU │
      * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────────┬─────────┼─────────┤
-     * │     _______ (2)     │ _______ │ _______ │ BL_DEC  │ BL_TOGG │ BL_INC  │ BL_STEP │ _______ │ _______ │ _______ │ _______ │     _______     │ KC_MPLY │ KC_VOLD │
+     * │     _______ (2)     │ _______ │ _______ │ BL_DOWN │ BL_TOGG │ BL_UP   │ BL_STEP │ _______ │ _______ │ _______ │ _______ │     _______     │ KC_MPLY │ KC_VOLD │
      * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤
      * │  _______  │  _______  │  _______  │                            _______                            │ _______ │ _______ │ _______ │ KC_MPRV │ KC_MPLY │ KC_MNXT │
      * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
-        _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD,
+        _______, _______, _______, _______, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
     )
 };
diff --git a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
index e4570d5320..80b6c6bfe3 100644
--- a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
   )
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c b/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
index bfbdd9111a..3f79a13077 100644
--- a/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
   ),
 };
diff --git a/keyboards/kbdfans/kbd75/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75/keymaps/default/keymap.c
index 160800a0c2..4a20f3b7d5 100644
--- a/keyboards/kbdfans/kbd75/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c b/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
index ba751369bd..975246f487 100644
--- a/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
@@ -17,6 +17,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,                      _______,  _______,  _______,                      BL_TOGG,  BL_INC,   BL_DEC,   _______,  _______,  _______
+    _______,  _______,  _______,                      _______,  _______,  _______,                      BL_TOGG,  BL_UP,    BL_DOWN,  _______,  _______,  _______
   )
 };
diff --git a/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c b/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
index 79424226da..075fa78f09 100644
--- a/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
   ),
 };
diff --git a/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c
index 336f7c31e7..153ff34ceb 100644
--- a/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
index 59548ea417..479a52454b 100644
--- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_DEL,  XXXXXXX,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
         XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX,
-        XXXXXXX,          XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX,          XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX,                                     XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
     ),
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
index e0541293c7..6816c3302d 100644
--- a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
   ),
 
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index 8184b06253..88272e3c72 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, MACRO1, MACRO2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         MACROTAB, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS,
         KC_TRNS, VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DM_REC2, DM_PLY2, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, DM_RSTP, DM_REC1, DM_PLY1, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, DM_RSTP, DM_REC1, DM_PLY1, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, LCA(KC_DEL), KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_NUMPAD] = LAYOUT_ansi_1u(
diff --git a/keyboards/kbdfans/kbd75/keymaps/via/keymap.c b/keyboards/kbdfans/kbd75/keymaps/via/keymap.c
index d4c973aa78..c26a98b90b 100644
--- a/keyboards/kbdfans/kbd75/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c
index a4ae3f12dc..c76923eacf 100644
--- a/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
   
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
   
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   )  
 };
diff --git a/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c b/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c
index a4ae3f12dc..c76923eacf 100644
--- a/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
   
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
   
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   )  
 };
diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
index 3cb32e80c9..2f0455cfc2 100644
--- a/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
   
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
    [3] = LAYOUT_75_ansi(
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   )
 };
diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c b/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c
index cd9cd7d05a..1c56f4af31 100644
--- a/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
   
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   ),
    [3] = LAYOUT_75_ansi (
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,   
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
     _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
   )
 };
diff --git a/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
index 565f791349..ecc91b8c24 100644
--- a/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_all(
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                    KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT,      KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, BL_TOGG, 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,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                    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/kbd8x/keymaps/default_backlighting/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
index 804acbfeb9..eeae78e596 100644
--- a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
+++ b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      [1] = LAYOUT_all(
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                    KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT,      KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, BL_TOGG, 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,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                    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/kc60/keymaps/dbroqua/keymap.c b/keyboards/kc60/keymaps/dbroqua/keymap.c
index 9cb9bbd8bd..35dd62df63 100644
--- a/keyboards/kc60/keymaps/dbroqua/keymap.c
+++ b/keyboards/kc60/keymaps/dbroqua/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ______,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_INS,  \
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   ______, ______, ______, ______, ______, ______, KC_PSCR,______, ______, ______, ______, ______, ______,   \
-      ______,   ______, BL_TOGG, BL_INC, BL_DEC, ______,KC_MUTE,KC_VOLU,KC_VOLD,______, ______, ______, ______,KC_MPLY,  \
+      ______,   ______, BL_TOGG, BL_UP,  BL_DOWN,______,KC_MUTE,KC_VOLU,KC_VOLD,______, ______, ______, ______,KC_MPLY,  \
       ______,   ______, ______,                 ______,         KC_DEL,         ______, KC_MPRV,    KC_MSTP,    KC_MNXT \
       ),
 
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
index f6abed793d..7ecb782543 100644
--- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
+++ b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_FN] = LAYOUT( /* 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_CAPS, BL_TOGG, BL_INC, BL_DEC, ______, ______, ______, ______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, ______, ______,  \
+      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_DEL,         KC_MSTP, ______,    ______,    ______ \
diff --git a/keyboards/kc60/keymaps/default/keymap.c b/keyboards/kc60/keymaps/default/keymap.c
index 1ff95ab90c..dfadce34d8 100644
--- a/keyboards/kc60/keymaps/default/keymap.c
+++ b/keyboards/kc60/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
-        _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
+        _______, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
         _______, _______, _______,                            XXXXXXX,                            _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/kc60/keymaps/noroadsleft/keymap.c b/keyboards/kc60/keymaps/noroadsleft/keymap.c
index aa0f7ae965..eb528c3448 100644
--- a/keyboards/kc60/keymaps/noroadsleft/keymap.c
+++ b/keyboards/kc60/keymaps/noroadsleft/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         TG(_SY), TO(_DV), TO(_QW), TO(_CM), TG(_Q2), XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, DB_TOGG, XXXXXXX, VRSN,    XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-        XXXXXXX,          XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
+        XXXXXXX,          XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, _______, XXXXXXX
     ),
 
diff --git a/keyboards/kc60/keymaps/sgoodwin/keymap.c b/keyboards/kc60/keymaps/sgoodwin/keymap.c
index 1dc6e702f4..27b64072ad 100644
--- a/keyboards/kc60/keymaps/sgoodwin/keymap.c
+++ b/keyboards/kc60/keymaps/sgoodwin/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
   [2] = LAYOUT( /* KBP v60-like arrows, media keys, etc */
       KC_GRV,   KC_F1,    KC_F2,    KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,  KC_DEL,   \
-      KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    BL_INC,    BL_DEC,  BL_STEP,  \
+      KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    BL_UP,     BL_DOWN, BL_STEP,  \
       KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_NO,   KC_TRNS,  \
       KC_TRNS,  KC_NO,    KC_MPRV,  KC_MPLY,   KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_NO,   KC_TRNS,  \
       KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_SPC,                                 KC_NO,    DB_TOGG,  QK_BOOT,   KC_TRNS, KC_NO     \
diff --git a/keyboards/kc60/keymaps/via/keymap.c b/keyboards/kc60/keymaps/via/keymap.c
index 0144b1d031..d8925172fd 100644
--- a/keyboards/kc60/keymaps/via/keymap.c
+++ b/keyboards/kc60/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
-        _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
+        _______, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
         _______, _______, _______,                            XXXXXXX,                            _______, _______, _______, _______
     ),
     [2] = LAYOUT_all(
diff --git a/keyboards/kc60/keymaps/wigguno/keymap.c b/keyboards/kc60/keymaps/wigguno/keymap.c
index add7ccec9a..174573e883 100644
--- a/keyboards/kc60/keymaps/wigguno/keymap.c
+++ b/keyboards/kc60/keymaps/wigguno/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT( /* 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_DELETE, \
       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_DEC,   BL_INC,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  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_NO,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS    \
       ),
diff --git a/keyboards/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c
index 98f2c27aa4..7450bf4cfa 100644
--- a/keyboards/kc60/keymaps/ws2812/keymap.c
+++ b/keyboards/kc60/keymaps/ws2812/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
         XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
         XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
-        _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
+        _______, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP,   BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
         _______, _______, _______,                            XXXXXXX,                            _______, _______, _______, _______
     )
 };
diff --git a/keyboards/keebio/dsp40/keymaps/default/keymap.c b/keyboards/keebio/dsp40/keymaps/default/keymap.c
index b269b1e8ca..24296484f2 100755
--- a/keyboards/keebio/dsp40/keymaps/default/keymap.c
+++ b/keyboards/keebio/dsp40/keymaps/default/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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_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),BL_TOGG, BL_INC, BL_DEC,
+        KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),BL_TOGG, BL_UP,  BL_DOWN,
         _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
     ),
 
diff --git a/keyboards/keebio/dsp40/keymaps/via/keymap.c b/keyboards/keebio/dsp40/keymaps/via/keymap.c
index b98bf4ac84..c4dd6bd3bd 100755
--- a/keyboards/keebio/dsp40/keymaps/via/keymap.c
+++ b/keyboards/keebio/dsp40/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FN1] = LAYOUT_ortho_4x12(
         KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
         KC_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),BL_TOGG,BL_INC, BL_DEC,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),BL_TOGG,BL_UP,  BL_DOWN,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
 
diff --git a/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json b/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json
index 942116ef87..8f55ce3a4c 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json
+++ b/keyboards/keebio/iris/keymaps/dvorak/keebio_iris_rev2_layout_dvorak.json
@@ -96,7 +96,7 @@
             "KC_P6",
             "KC_PPLS",
             "KC_BSPC",
-            "BL_INC",
+            "BL_UP",
             "KC_NO",
             "KC_NO",
             "KC_NO",
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
index c4c5a2cc23..570bc9cf44 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
@@ -86,7 +86,7 @@ LT(_LOWER, KC_TAB),KC_Q,  KC_W, 	KC_E, 	 KC_R, 	  KC_T,                				  KC_
 	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
 	   BL_TOGG, BL_STEP, BL_BRTG, RGB_TOG, RGB_RMOD, RGB_MOD,                            _______, _______, _______, _______, _______, _______,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   BL_DEC, _______,   BL_INC, RGB_VAD, RGB_SAI, RGB_VAI,                            _______, _______, _______, _______, _______, _______,
+	   BL_DOWN,_______,   BL_UP,  RGB_VAD, RGB_SAI, RGB_VAI,                            _______, _______, _______, _______, _______, _______,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
 	   _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI,                            _______, _______, _______, _______, _______, _______,
 	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
index 7db5211311..d2c1959dac 100644
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
+++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
 	   BL_TOGG, BL_STEP, BL_BRTG, RGB_TOG, RGB_RMOD, RGB_MOD,                            _______, _______, _______, _______, _______, _______,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   BL_DEC, _______,   BL_INC, RGB_VAD, RGB_SAI, RGB_VAI,                            _______, _______, _______, _______, _______, _______,
+	   BL_DOWN,_______,   BL_UP,  RGB_VAD, RGB_SAI, RGB_VAI,                            _______, _______, _______, _______, _______, _______,
 	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
 	   _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI,                            _______, _______, _______, _______, _______, _______,
 	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index adbb32ac0d..29ce513fed 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
@@ -110,9 +110,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      BL_BRTG, _______, _______, _______, DB_TOGG, QK_BOOT,                            QK_BOOT, DB_TOGG, _______, RGB_HUI, RGB_SAI, RGB_VAI,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_INC, _______, _______, _______, _______, EE_CLR,                             EE_CLR,  _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
+      BL_UP,  _______, _______, _______, _______, EE_CLR,                             EE_CLR,  _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_DEC, KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,
+      BL_DOWN,KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      BL_TOGG, _______, _______, _______, _______, _______, _______,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
@@ -124,9 +124,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      BL_BRTG, _______, _______, _______, _______,   QK_BOOT,                            QK_BOOT, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_INC, _______, _______, _______, _______, _______,                            _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
+      BL_UP,  _______, _______, _______, _______, _______,                            _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_DEC, KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,
+      BL_DOWN,KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      BL_TOGG, _______, _______, _______, _______, _______, KC_EJCT,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/keymaps/thattolleyguy/keymap.c b/keyboards/keebio/iris/keymaps/thattolleyguy/keymap.c
index d12e776652..77c7dd0651 100644
--- a/keyboards/keebio/iris/keymaps/thattolleyguy/keymap.c
+++ b/keyboards/keebio/iris/keymaps/thattolleyguy/keymap.c
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_MUTE, KC_VOLD, RGB_M_SW,RGB_TOG, XXXXXXX, XXXXXXX,                            BL_TOGG, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, RGB_SPDU,                           BL_INC,  KC_P4,   KC_P5,   KC_P6,   KC_EQL,  KC_PSCR,
+     _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, RGB_SPDU,                           BL_UP,   KC_P4,   KC_P5,   KC_P6,   KC_EQL,  KC_PSCR,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,RGB_SPDD,_______,          _______, BL_DEC,  KC_P1,   KC_P2,   KC_P3,   KC_PDOT, _______,
+     _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,RGB_SPDD,_______,          _______, BL_DOWN, KC_P1,   KC_P2,   KC_P3,   KC_PDOT, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     _______, _______, _______,                   _______, L_RAISE, KC_P0
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
index 84e37ce5ef..66c01f2fc3 100644
--- a/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/xtonhasvim/keymap.c
@@ -111,8 +111,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12( \
-  BL_INC,  X_____X,    X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X,     RGB_MODE_PLAIN, \
-  BL_DEC,  X_____X,    X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X,     RGB_MODE_REVERSE, \
+  BL_UP,   X_____X,    X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X,     RGB_MODE_PLAIN, \
+  BL_DOWN, X_____X,    X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X,     RGB_MODE_REVERSE, \
   BL_STEP, X_____X,    X_____X, X_____X, X_____X, X_____X, X_____X, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,     RGB_MODE_FORWARD, \
   BL_TOGG, TO(_MOUSE), _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY), RGB_TOG \
 ),
diff --git a/keyboards/keebio/sinc/keymaps/lickel/keymap.c b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
index 258e7d0128..e6d5291ae7 100644
--- a/keyboards/keebio/sinc/keymaps/lickel/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
@@ -32,7 +32,7 @@ enum custom_keycodes {
 
 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_DEC,  BL_INC,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  KC_MPLY,
+    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,
diff --git a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
index e205c627cd..6e5afacff8 100644
--- a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
@@ -52,9 +52,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
      _______,       DESK_L,  MSN_CTL, DESK_R,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,       _______,
   //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     _______,           _______, _______, _______, _______, _______, LINE_L,  WORD_L,  WORD_R,  LINE_R,  _______,          _______,          BL_INC,
+     _______,           _______, _______, _______, _______, _______, LINE_L,  WORD_L,  WORD_R,  LINE_R,  _______,          _______,          BL_UP, 
   //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     _______,   _______,   _______,                        KC_BSPC,                           _______,   _______,   KC_MENU,        BL_BRTG, BL_DEC,  BL_TOGG
+     _______,   _______,   _______,                        KC_BSPC,                           _______,   _______,   KC_MENU,        BL_BRTG, BL_DOWN, BL_TOGG
   //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
   )
 };
\ No newline at end of file
diff --git a/keyboards/keebio/tragicforce68/keymaps/default/keymap.c b/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
index cb0adbdc4c..59076d4ecf 100644
--- a/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
+++ b/keyboards/keebio/tragicforce68/keymaps/default/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
      _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_QUOT,       KC_ENTER,
   //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     _______,           _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_END,           _______,          BL_INC,
+     _______,           _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_END,           _______,          BL_UP, 
   //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     _______,   _______,   _______,                        _______,                           _______,   _______,   KC_MENU,        BL_BRTG, BL_DEC,  BL_TOGG
+     _______,   _______,   _______,                        _______,                           _______,   _______,   KC_MENU,        BL_BRTG, BL_DOWN, BL_TOGG
   //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
   )
 };
diff --git a/keyboards/keebsforall/coarse60/keymaps/default/keymap.c b/keyboards/keebsforall/coarse60/keymaps/default/keymap.c
index 569f7cbd20..c41d67b751 100644
--- a/keyboards/keebsforall/coarse60/keymaps/default/keymap.c
+++ b/keyboards/keebsforall/coarse60/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______,
-              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, BL_UP,   BL_DOWN, BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT
   )
 };
diff --git a/keyboards/keebsforall/coarse60/keymaps/via/keymap.c b/keyboards/keebsforall/coarse60/keymaps/via/keymap.c
index 39155534f1..428a0650ad 100644
--- a/keyboards/keebsforall/coarse60/keymaps/via/keymap.c
+++ b/keyboards/keebsforall/coarse60/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______,
-              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, BL_UP,   BL_DOWN, BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT
   ),
 
diff --git a/keyboards/kira80/keymaps/ansi/keymap.c b/keyboards/kira80/keymaps/ansi/keymap.c
index 3cad1b277e..cadda95908 100644
--- a/keyboards/kira80/keymaps/ansi/keymap.c
+++ b/keyboards/kira80/keymaps/ansi/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_tkl_ansi(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY, 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_TRNS,
diff --git a/keyboards/kira80/keymaps/ansi_wkl/keymap.c b/keyboards/kira80/keymaps/ansi_wkl/keymap.c
index 69df61eeb5..d3b1130a11 100644
--- a/keyboards/kira80/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/kira80/keymaps/ansi_wkl/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          MO(1),                 KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_tkl_ansi_wkl(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY, 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_TRNS,
diff --git a/keyboards/kira80/keymaps/default/keymap.c b/keyboards/kira80/keymaps/default/keymap.c
index 187c723372..c433b4351c 100644
--- a/keyboards/kira80/keymaps/default/keymap.c
+++ b/keyboards/kira80/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_all(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY, 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_TRNS,
diff --git a/keyboards/kira80/keymaps/iso/keymap.c b/keyboards/kira80/keymaps/iso/keymap.c
index 2f49971d69..a6502d5ffa 100644
--- a/keyboards/kira80/keymaps/iso/keymap.c
+++ b/keyboards/kira80/keymaps/iso/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_tkl_iso(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_MPLY, 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_TRNS, KC_TRNS,
diff --git a/keyboards/kira80/keymaps/via/keymap.c b/keyboards/kira80/keymaps/via/keymap.c
index f74b6cf83c..ab04b07a0a 100644
--- a/keyboards/kira80/keymaps/via/keymap.c
+++ b/keyboards/kira80/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_all(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY, 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_TRNS,
diff --git a/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
index b21b91073d..5c84cc1e99 100644
--- a/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
+++ b/keyboards/kiwikey/wanderland/keymaps/stanrc85/keymap.c
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_alice(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
+    BL_UP,    VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_DOWN,  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
     _______,  _______, _______, _______, _______, _______, _______,           _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
   )
diff --git a/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c b/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
index ea61e608c3..08f3476266 100644
--- a/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
+++ b/keyboards/kprepublic/bm16a/keymaps/factory/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_FN1] = LAYOUT_ortho_4x4(
     QK_BOOT,  KC_PAST,  KC_PSLS,  _______,
-    BL_TOGG,  BL_DEC,   BL_INC,   BL_STEP,
+    BL_TOGG,  BL_DOWN,  BL_UP,    BL_STEP,
     RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,
     RGB_SAI,  RGB_SAD,  _______,  _______
   )
diff --git a/keyboards/kprepublic/bm16s/keymaps/default/keymap.c b/keyboards/kprepublic/bm16s/keymaps/default/keymap.c
index f2f0f43e9f..b5c0a3df05 100755
--- a/keyboards/kprepublic/bm16s/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm16s/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_ortho_4x4(
 		QK_BOOT,   BL_STEP, _______, KC_VOLU,
-		BL_TOGG, BL_DEC,  BL_INC,  KC_VOLD,
+		BL_TOGG, BL_DOWN, BL_UP,   KC_VOLD,
 		RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE,
 		RGB_SAI, RGB_SAD, RGB_HUD, _______
 	),
diff --git a/keyboards/kprepublic/bm16s/keymaps/via/keymap.c b/keyboards/kprepublic/bm16s/keymaps/via/keymap.c
index cdf46e2afe..5ed0f1fcd5 100644
--- a/keyboards/kprepublic/bm16s/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm16s/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 	[1] = LAYOUT_ortho_4x4(
 		QK_BOOT,   BL_STEP, KC_TRNS, KC_VOLU,
-		BL_TOGG, BL_DEC,  BL_INC,  KC_VOLD,
+		BL_TOGG, BL_DOWN, BL_UP,   KC_VOLD,
 		RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE,
 		RGB_SAI, RGB_SAD, RGB_HUD, KC_TRNS
 	),
diff --git a/keyboards/kprepublic/bm43a/keymaps/default/keymap.c b/keyboards/kprepublic/bm43a/keymaps/default/keymap.c
index 4398244f6f..e51156fd05 100644
--- a/keyboards/kprepublic/bm43a/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm43a/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,   BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______,   BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,
         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,
         _______, _______, _______, _______,                _______,             _______, _______, _______, _______
     ),
diff --git a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
index 483d444377..d759210afd 100644
--- a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 12+11+11+9
     DF(3), XXXXXXX, XXXXXXX, KC_SPC, KC_0, KC_DOT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT ),
   [3] = LAYOUT(
     DF(0), KC_SLEP, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-    XXXXXXX, BL_TOGG, BL_DEC, BL_INC, BL_STEP, BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ),
 };
diff --git a/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c b/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
index afc90880c8..aa4d30a9eb 100644
--- a/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
@@ -132,8 +132,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FUNC] = LAYOUT_planck_mit( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC,  _______, KC_BRIU, _______, KC_VOLU, \
-  KC_LSFT, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC,  _______, KC_BRID, KC_PSCR, KC_VOLD, \
+  KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_UP,   _______, KC_BRIU, _______, KC_VOLU, \
+  KC_LSFT, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DOWN, _______, KC_BRID, KC_PSCR, KC_VOLD, \
   KC_LCTL, _______, RGB_MOD, KC_LALT, _______,      KC_SPC,      KC_MPRV, KC_MSTP, KC_MNXT, KC_MPLY, CP_LOCK  \
 )
 };
diff --git a/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c b/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c
index 269e26cd76..093a30003e 100644
--- a/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c
@@ -87,8 +87,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FUNC] = LAYOUT_ortho_4x12( \
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-    _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC,  _______, _______, _______, KC_VOLU, \
-    _______, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC,  _______, _______, KC_PSCR, KC_VOLD, \
+    _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_UP,   _______, _______, _______, KC_VOLU, \
+    _______, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DOWN, _______, _______, KC_PSCR, KC_VOLD, \
     _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
 )
 };
diff --git a/keyboards/kprepublic/jj50/keymaps/default/keymap.c b/keyboards/kprepublic/jj50/keymaps/default/keymap.c
index af495f17f1..43c73cc99a 100644
--- a/keyboards/kprepublic/jj50/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/default/keymap.c
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_HUI, RGB_MOD,
-        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG
+        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_BRTG
     )
 };
 
diff --git a/keyboards/kprepublic/jj50/keymaps/via/keymap.c b/keyboards/kprepublic/jj50/keymaps/via/keymap.c
index 98396dd47a..a47756b212 100644
--- a/keyboards/kprepublic/jj50/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/via/keymap.c
@@ -133,6 +133,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_HUI, RGB_MOD,
-        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG
+        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_BRTG
     )
 };
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
index d55bc25ab5..61ca4bb398 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT_split_rshift(
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,       BL_TOGG,            RGB_TOG,     RGB_VAI,
+        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,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
index 76662c988f..e82e456dab 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `--------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
+        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, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RGB_MOD, RGB_VAD,
         XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
index 854c151f0b..b44b73a298 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `--------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT_iso(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
+        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, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RGB_MOD, RGB_VAD,
         XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
index e772d86223..1cfc6a7d1e 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `--------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT_split_bs(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  XXXXXXX, XXXXXXX,          RGB_TOG, RGB_VAI,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX,          RGB_TOG, RGB_VAI,
         XXXXXXX, XXXXXXX, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG,                   RGB_MOD, RGB_VAD,
         XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                   RGB_HUI,
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
index 2289562262..401e2b9d5c 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
@@ -48,14 +48,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [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, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, 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, BL_DOWN, BL_UP,   BL_TOGG,          RGB_TOG, RGB_VAI,
         KC_TRNS, KC_TRNS, MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_MOD, RGB_VAD,
         KC_TRNS, KC_TRNS, AU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
     ),
     [3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, 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, BL_DOWN, BL_UP,   BL_TOGG,          RGB_TOG, RGB_VAI,
         KC_TRNS, KC_TRNS, MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_MOD, RGB_VAD,
         KC_TRNS, KC_TRNS, AU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
index 1b9d0ff6a5..f38ae5127e 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
@@ -146,8 +146,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT_tkl_ansi(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
         AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
index 24fcc07dd4..e008e6000c 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
@@ -81,8 +81,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `------------------------------------------------------------------------------'
      */
     [SETTINGS] = LAYOUT_tkl_ansi(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
         AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
index 0288ffae82..797381b40c 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
@@ -81,8 +81,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `----------------------------------------------------------------------------'
      */
     [SETTINGS] = LAYOUT_tkl_ansi(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
         AU_TOG,  KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
index 8016af1f4b..484c8ae77b 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
@@ -81,8 +81,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT_tkl_iso(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_MOD, RGB_VAD, XXXXXXX,
         AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,               RGB_HUI,
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
index 6252dd6dff..83c0cd76c0 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `----------------------------------------------------------------------------'
      */
     [SETTINGS] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,                  RGB_TOG, RGB_VAI, 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,
         MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
         AU_TOG,  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_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index 9d9df7904c..301e7c66b6 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `----------------------------------------------------------------------------'
      */
     [SETTINGS] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,                  RGB_TOG, RGB_VAI, 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,
         MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
         AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/linworks/fave104/keymaps/default/keymap.c b/keyboards/linworks/fave104/keymaps/default/keymap.c
index 3bab501be9..691cf33db5 100644
--- a/keyboards/linworks/fave104/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave104/keymaps/default/keymap.c
@@ -26,7 +26,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_RGHT,   KC_P0,       KC_P0,   KC_PDOT, KC_PENT),
 
   [1] = LAYOUT_all(
-    KC_TRNS,            BL_STEP,  BL_TOGG,  BL_DEC,   BL_INC,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,            BL_STEP,  BL_TOGG,  BL_DOWN,  BL_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,                                   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/linworks/fave104/keymaps/via/keymap.c b/keyboards/linworks/fave104/keymaps/via/keymap.c
index 1630e6a79b..dd8e593604 100644
--- a/keyboards/linworks/fave104/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave104/keymaps/via/keymap.c
@@ -26,7 +26,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_RGHT,   KC_P0,       KC_P0,   KC_PDOT, KC_PENT),
 
   [1] = LAYOUT_all(
-    KC_TRNS,            BL_STEP,  BL_TOGG,  BL_DEC,   BL_INC,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,            BL_STEP,  BL_TOGG,  BL_DOWN,  BL_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,                                   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/linworks/fave87/keymaps/default/keymap.c b/keyboards/linworks/fave87/keymaps/default/keymap.c
index f6fdc475ef..7cc84d4ea4 100644
--- a/keyboards/linworks/fave87/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave87/keymaps/default/keymap.c
@@ -26,7 +26,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_RGHT),
 
   [1] = LAYOUT_all(
-    RGB_TOG,            RGB_VAD,  RGB_VAI,  BL_DEC,   BL_INC,   RGB_HUD,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_RMOD, RGB_MOD,  RGB_SPI,  RGB_SPI,                KC_TRNS, KC_TRNS, KC_TRNS,
+    RGB_TOG,            RGB_VAD,  RGB_VAI,  BL_DOWN,  BL_UP,    RGB_HUD,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_RMOD, RGB_MOD,  RGB_SPI,  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,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
diff --git a/keyboards/linworks/fave87/keymaps/via/keymap.c b/keyboards/linworks/fave87/keymaps/via/keymap.c
index f6fdc475ef..7cc84d4ea4 100644
--- a/keyboards/linworks/fave87/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave87/keymaps/via/keymap.c
@@ -26,7 +26,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_RGHT),
 
   [1] = LAYOUT_all(
-    RGB_TOG,            RGB_VAD,  RGB_VAI,  BL_DEC,   BL_INC,   RGB_HUD,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_RMOD, RGB_MOD,  RGB_SPI,  RGB_SPI,                KC_TRNS, KC_TRNS, KC_TRNS,
+    RGB_TOG,            RGB_VAD,  RGB_VAI,  BL_DOWN,  BL_UP,    RGB_HUD,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_RMOD, RGB_MOD,  RGB_SPI,  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,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
diff --git a/keyboards/linworks/whale75/keymaps/default/keymap.c b/keyboards/linworks/whale75/keymaps/default/keymap.c
index 8aa21048eb..8accfc63f4 100644
--- a/keyboards/linworks/whale75/keymaps/default/keymap.c
+++ b/keyboards/linworks/whale75/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
 
     [1] = LAYOUT_all(    /* keymap for layer 1 */
-        RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPI, RGB_SPI,                    KC_MPLY,
+        RGB_TOG, RGB_VAD, RGB_VAI, BL_DOWN, BL_UP,   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPI, RGB_SPI,                    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_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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_END,
diff --git a/keyboards/linworks/whale75/keymaps/via/keymap.c b/keyboards/linworks/whale75/keymaps/via/keymap.c
index eab5f110d1..bd7dc8a628 100644
--- a/keyboards/linworks/whale75/keymaps/via/keymap.c
+++ b/keyboards/linworks/whale75/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         ),
 
     [1] = LAYOUT_all(    /* keymap for layer 1 */
-        RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS,                    KC_MPLY,
+        RGB_TOG, RGB_VAD, RGB_VAI, BL_DOWN, BL_UP,   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS,                    KC_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_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_PGDN,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_END,
diff --git a/keyboards/machkeyboards/mach3/keymaps/default/keymap.c b/keyboards/machkeyboards/mach3/keymaps/default/keymap.c
index 19133200e0..c395c820f9 100644
--- a/keyboards/machkeyboards/mach3/keymaps/default/keymap.c
+++ b/keyboards/machkeyboards/mach3/keymaps/default/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_3x3(
-    BL_INC,    BL_DEC,    BL_BRTG,
-    BL_INC,    BL_DEC,    BL_BRTG,
-    BL_INC,    BL_DEC,    BL_BRTG
+    BL_UP,     BL_DOWN,   BL_BRTG,
+    BL_UP,     BL_DOWN,   BL_BRTG,
+    BL_UP,     BL_DOWN,   BL_BRTG
   )
 };
\ No newline at end of file
diff --git a/keyboards/machkeyboards/mach3/keymaps/via/keymap.c b/keyboards/machkeyboards/mach3/keymaps/via/keymap.c
index 19133200e0..c395c820f9 100644
--- a/keyboards/machkeyboards/mach3/keymaps/via/keymap.c
+++ b/keyboards/machkeyboards/mach3/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_3x3(
-    BL_INC,    BL_DEC,    BL_BRTG,
-    BL_INC,    BL_DEC,    BL_BRTG,
-    BL_INC,    BL_DEC,    BL_BRTG
+    BL_UP,     BL_DOWN,   BL_BRTG,
+    BL_UP,     BL_DOWN,   BL_BRTG,
+    BL_UP,     BL_DOWN,   BL_BRTG
   )
 };
\ No newline at end of file
diff --git a/keyboards/massdrop/alt/keymaps/b_/keymap.c b/keyboards/massdrop/alt/keymaps/b_/keymap.c
index 8eb1c32509..9f860cbd1a 100644
--- a/keyboards/massdrop/alt/keymaps/b_/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/b_/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ),
 	[1] = LAYOUT_65_ansi_blocker( /* hold tab */
       KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_MUTE, 
-      KC_TRNS, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, BL_INC, BL_DEC, BL_BRTG, BL_STEP, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_END, 
+      KC_TRNS, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, BL_UP,  BL_DOWN,BL_BRTG, BL_STEP, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_END, 
       MO(3), RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 
       KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, MO(4), NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD, 
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END // fn layer. f keys, media keys, backlight control, nkro-toggle, etc.
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[3] = LAYOUT_65_ansi_blocker( /* tab+ctrl */
       KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP, KC_AGIN, KC_UNDO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_EJCT,
       KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_FIND, BL_DEC, BL_INC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU,
+      KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_FIND, BL_DOWN,BL_UP,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU,
       KC_NO, KC_NO, KC_CUT, KC_COPY, KC_PSTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MSTP, KC_BRID,
       KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD // miscellaneous silly keys, subject to change
       ),
diff --git a/keyboards/mechkeys/acr60/keymaps/default/keymap.c b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
index b91b830b9b..def790703a 100644
--- a/keyboards/mechkeys/acr60/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
index 758243ea1e..7695577836 100644
--- a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Layer 2: "special effects": RGB lighting, backlighting, bootloader */
   [_SFX] = LAYOUT_mitchsplit(
       ______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G,______, ______, ______,  ______, ______,  \
-      ______,  BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  ______,  ______,  ______,  ______, ______, ______, ______,  ______,  QK_BOOT,  \
+      ______,  BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   ______,  ______,  ______,  ______, ______, ______, ______,  ______,  QK_BOOT,  \
       ______,  RGB_TOG, RGB_MOD,______,  ______,  ______,  ______,  ______,  ______, ______, ______, ______,  ______,  \
       ______,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______,  ______, ______, ______, ______,  ______,  \
       ______,  ______,  ______,             ______, ______, ______,                   ______, ______,TO(_DFT),______   \
diff --git a/keyboards/mechkeys/alu84/keymaps/default/keymap.c b/keyboards/mechkeys/alu84/keymaps/default/keymap.c
index cbbe4f3611..7fdbbc6899 100755
--- a/keyboards/mechkeys/alu84/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/alu84/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DEL,  _______,
         _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          BL_TOGG, BL_INC,  BL_DEC,  BL_STEP, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______,          BL_TOGG, BL_UP,   BL_DOWN, BL_STEP, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
index 7a8cb3d321..64ea7c139b 100644
--- a/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
+++ b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DEL,  C(A(G(KC_S))),
         _______,    RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,          _______,
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,             BL_TOGG, BL_INC,  BL_DEC,  BL_STEP, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______,             BL_TOGG, BL_UP,   BL_DOWN, BL_STEP, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
         _______,    _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/mechkeys/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
index 664cdb6e80..3efe7989a1 100755
--- a/keyboards/mechkeys/espectro/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
@@ -78,7 +78,7 @@ ________________________________________________________________________________
 	[_FN1] = LAYOUT_default(
     QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME, KC_END,
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______,
-    _______, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______,
+    _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,    _______, _______, _______,
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,    _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______,    _______, _______
diff --git a/keyboards/mechkeys/espectro/keymaps/iso/keymap.c b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
index a6c4d2257e..bd9426da6f 100755
--- a/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
@@ -78,7 +78,7 @@ ________________________________________________________________________________
 	[_FN1] = LAYOUT_iso(
     QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME,  KC_END,
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______,
-    _______, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______,
+    _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,    _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______,    _______, _______
diff --git a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
index 3ebe1c45c5..ddccebc857 100644
--- a/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
@@ -91,7 +91,7 @@ ________________________________________________________________________________
 	[_FUNCTION] = LAYOUT_default(
 		QALL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, KC_HOME, KC_END,  QK_BOOT,
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,      KC_DEL,     _______, _______, _______, _______,
-      _______, BL_TOGG,  BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, _______, _______,
+      _______, BL_TOGG,  BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,
          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,         _______,  _______, _______, _______, _______,
     _______, _______, _______,                  _______,                                 _______,  TO(2),  _______,  _______, _______,  _______, _______, _______
diff --git a/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
index 1f389a3699..abc742a894 100644
--- a/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
@@ -77,7 +77,7 @@ ________________________________________________________________________________
 	[_FN1] = LAYOUT_default(
     QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_END, _______, _______,  _______,
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,      KC_DEL,    _______, _______, _______, _______,
-      _______, BL_TOGG,  BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______, _______,
+      _______, BL_TOGG,  BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______, _______,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______,
          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,         _______, _______, _______, _______, _______,
     _______, _______, _______,                  _______,                                 _______, _______,  _______,  _______, _______, _______, _______, _______
diff --git a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
index 15ef2b3b6c..8406355f42 100644
--- a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
@@ -78,7 +78,7 @@ ________________________________________________________________________________
 	[_FN1] = LAYOUT_default(
     QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME, KC_END,  \
     _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______, \
-    _______, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______, \
+    _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,    _______, _______, _______,          \
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,    _______, _______, _______, _______, \
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______,    _______, _______           \
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
index 9d2ce727d3..ec60105cba 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FN2] = LAYOUT_625_space(
 		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
-		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS,
 		KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_END,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
index 7a3d233172..09c0e901cd 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_KEEB] = LAYOUT_2u_space_ortho(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, BL_TOGG, BL_STEP, BL_INC,  BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______,
+    _______, BL_TOGG, BL_STEP, BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______,
     RGB_M_P, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______,
     QK_BOOT, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______),
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
index 61173298ba..f89251e370 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_FN2] = LAYOUT_split_space(
 		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
-		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS,
 		KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_END,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
index 3619cbfdbf..92a77bd42b 100755
--- a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[_FN2] = LAYOUT_split_space(
 		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
-		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS,
 		KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_END,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
index 1dc2328163..45260830a4 100644
--- a/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[2] = LAYOUT_ortho(
 		KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
-		KC_TRNS, BL_TOGG, BL_STEP, BL_INC, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
+		KC_TRNS, BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
 		KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_HOME, KC_END, KC_TRNS,
 		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_PGDN, KC_PGUP, KC_MPLY),
 
diff --git a/keyboards/mechkeys/mk60/keymaps/default/keymap.c b/keyboards/mechkeys/mk60/keymaps/default/keymap.c
index f41ef3f3b6..faef51330d 100644
--- a/keyboards/mechkeys/mk60/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/mk60/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [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_TRNS,
-    BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
+    BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
     RGB_MOD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/mehkee96/keymaps/default/keymap.c b/keyboards/mehkee96/keymaps/default/keymap.c
index 45f4168cc4..6576661865 100644
--- a/keyboards/mehkee96/keymaps/default/keymap.c
+++ b/keyboards/mehkee96/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ ________________________________________________________________________________
 |          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
 |          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
 |__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs
+BL_TOGG, BL_DOWN,BL_UP changes the in-switch LEDs
 */
 
 
@@ -65,6 +65,6 @@ BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
     BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-    _______         , _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+    _______         , _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
diff --git a/keyboards/mehkee96/keymaps/johann/keymap.c b/keyboards/mehkee96/keymaps/johann/keymap.c
index 692a3f0d27..154506f816 100644
--- a/keyboards/mehkee96/keymaps/johann/keymap.c
+++ b/keyboards/mehkee96/keymaps/johann/keymap.c
@@ -56,7 +56,7 @@ ________________________________________________________________________________
 |          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
 |          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
 |__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs
+BL_TOGG, BL_DOWN,BL_UP changes the in-switch LEDs
 */
 
 
@@ -65,7 +65,7 @@ BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
     BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-    _______         , _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+    _______         , _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
diff --git a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
index 22a745939e..c104af8bd8 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default/keymap.c
@@ -28,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c
index 150679208a..ae901e4dac 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c
index 9c7fb6a63d..8df1f3f258 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c
index e37832e6e8..4ba878c3e9 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c
index 9b34448af6..656ad02547 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c
index 99ab2acd84..6142e9fdd6 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c
index 5f69c20b0e..9919533729 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c
index 98c40171ab..59f97fce11 100644
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c
index 405bae776e..86b53f335d 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c
index 9e8cfc7d9f..0ae15922fb 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c
index 2abc100bc2..aedd11f9d8 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c
index 701b37dacc..e71b3bebc4 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c
index 42acb5c3ac..13a60a488f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c
index e717aac44c..ff9b16efd3 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c
index cb0686caaa..e811788b54 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c
index 88e7ebbdcf..a3cc10a65c 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c
index f6cc1799f6..16316f1548 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c
index b37ea941c8..5b57afe87d 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c
index ed01c3824b..7345a1b31a 100644
--- a/keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c
index 9f232a6891..1974a5494a 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c
index eb25a08f74..f1a240fafd 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c
index fc5a90d547..9c7f472638 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c
index 6cb4b49a57..d0caff50c3 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c
index 30305dd281..497b37ac2b 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c
index 760255fbfb..6dd0b7e7fe 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c
index 27309940fa..f923481f09 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c
index 43fcfec7cb..87f5c71861 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c
index 3954a094d1..a45ae10a1c 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c
index bcc0360874..fae0d67f6f 100755
--- a/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
index f6715f68a7..d6a48991cf 100755
--- a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     LAYOUT_all(
diff --git a/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c
index 5727d78784..e2c4d225f3 100644
--- a/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/a_ansi/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_a_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_INS ,KC_HOME,KC_PGUP, 
-		BL_INC ,KC_GRV ,KC_1   ,KC_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_END ,KC_PGDN, 
-		BL_DEC ,KC_TAB ,KC_Q   ,KC_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_MUTE, 
+		BL_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_DEL ,KC_END ,KC_PGDN, 
+		BL_DOWN,KC_TAB ,KC_Q   ,KC_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_MUTE, 
 		KC_F13 ,KC_CAPS,KC_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_F14 ,KC_LSFT        ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,        KC_UP          ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RCTL                ,KC_LEFT,KC_DOWN,KC_RGHT,KC_PENT 
diff --git a/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c
index e10dd0116a..88779a9238 100644
--- a/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/a_iso/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_a_iso(
 		KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_PSCR,KC_INS ,KC_HOME,KC_PGUP, 
-		BL_INC ,KC_GRV ,KC_1   ,KC_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_END ,KC_PGDN, 
-		BL_DEC ,KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC                ,KC_INS ,KC_MUTE, 
+		BL_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_DEL ,KC_END ,KC_PGDN, 
+		BL_DOWN,KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC                ,KC_INS ,KC_MUTE, 
 		KC_F13 ,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL         , 
 		KC_F14 ,KC_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_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RCTL                ,KC_LEFT,KC_DOWN,KC_RGHT,KC_PENT 
diff --git a/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
index 84b6b83ebf..48c145fad0 100644
--- a/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/b_ansi/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_b_ansi(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_PSCR,KC_SCRL,KC_PAUS, 
-		BL_INC ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_DEL ,KC_HOME,KC_PGUP, 
-		BL_DEC ,KC_TAB ,KC_Q   ,KC_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_PGDN, 
+		BL_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_DEL ,KC_HOME,KC_PGUP, 
+		BL_DOWN,KC_TAB ,KC_Q   ,KC_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_PGDN, 
 		KC_F13 ,KC_CAPS,KC_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_INS , 
 		KC_F14 ,KC_LSFT        ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP          ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
diff --git a/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
index 8109a6e1d9..8a6b872066 100644
--- a/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/b_iso/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_b_iso(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_PSCR,KC_SCRL,KC_PAUS, 
-		BL_INC ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_DEL ,KC_HOME,KC_PGUP, 
-		BL_DEC ,KC_TAB ,KC_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_PGDN, 
+		BL_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_DEL ,KC_HOME,KC_PGUP, 
+		BL_DOWN,KC_TAB ,KC_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_PGDN, 
 		KC_F13 ,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL ,KC_INS , 
 		KC_F14 ,KC_LSFT,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP          ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
diff --git a/keyboards/metamechs/timberwolf/keymaps/default/keymap.c b/keyboards/metamechs/timberwolf/keymaps/default/keymap.c
index 00995915ca..5ef61f0200 100644
--- a/keyboards/metamechs/timberwolf/keymaps/default/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/default/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_INS ,KC_HOME,KC_PGUP, 
 		QK_BOOT  ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_DEL ,KC_END ,KC_PGDN, 
-		BL_INC ,KC_TAB ,KC_Q   ,KC_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_SCRL, 
-		BL_DEC ,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL ,KC_INS , 
+		BL_UP  ,KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS        ,KC_PSCR,KC_SCRL, 
+		BL_DOWN,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL ,KC_INS , 
 		KC_F13 ,KC_LSFT,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP  ,KC_UP  ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL,KC_LEFT,KC_LEFT,KC_DOWN,KC_RGHT,KC_PENT 
     ),
diff --git a/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c b/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
index 44ea7da5af..a91b88123d 100644
--- a/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/prime_ansi/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_prime_ansi(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_INS ,KC_HOME,KC_PGUP, 
-		BL_INC ,KC_GRV ,KC_1   ,KC_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_END ,KC_PGDN, 
-		BL_DEC ,KC_TAB ,KC_Q   ,KC_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_SCRL, 
+		BL_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_DEL ,KC_END ,KC_PGDN, 
+		BL_DOWN,KC_TAB ,KC_Q   ,KC_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_SCRL, 
 		KC_F13 ,KC_CAPS,KC_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_INS , 
 		KC_F14 ,KC_LSFT        ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP          ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
diff --git a/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c b/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
index 54f9f0a4fa..4cb95c53ce 100644
--- a/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
+++ b/keyboards/metamechs/timberwolf/keymaps/prime_iso/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_prime_iso(
 		KC_MUTE,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12         ,KC_INS ,KC_HOME,KC_PGUP, 
-		BL_INC ,KC_GRV ,KC_1   ,KC_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_END ,KC_PGDN, 
-		BL_DEC ,KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC                ,KC_PSCR,KC_SCRL, 
+		BL_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_DEL ,KC_END ,KC_PGDN, 
+		BL_DOWN,KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC                ,KC_PSCR,KC_SCRL, 
 		KC_F13 ,KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT         ,KC_DEL ,KC_INS , 
 		KC_F14 ,KC_LSFT,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,MO(1)  ,KC_UP          ,KC_PENT, 
 		MO(1)  ,KC_LCTL,KC_LGUI,KC_LALT                        ,KC_SPC                 ,KC_RALT,KC_RGUI,KC_RCTL        ,KC_LEFT,KC_DOWN,KC_RGHT 
diff --git a/keyboards/mntre/keymaps/default/keymap.c b/keyboards/mntre/keymaps/default/keymap.c
index 33b9442e38..227ab15c62 100644
--- a/keyboards/mntre/keymaps/default/keymap.c
+++ b/keyboards/mntre/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN] = LAYOUT(
-        _______, BL_DEC,   BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, BL_DOWN,  BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/mokey/ginkgo65/keymaps/default/keymap.c b/keyboards/mokey/ginkgo65/keymaps/default/keymap.c
index 9ebfe8ef28..fbe5a8531f 100644
--- a/keyboards/mokey/ginkgo65/keymaps/default/keymap.c
+++ b/keyboards/mokey/ginkgo65/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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,  _______, _______,
-        BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/keyboards/mokey/ginkgo65/keymaps/via/keymap.c b/keyboards/mokey/ginkgo65/keymaps/via/keymap.c
index c50a31f4a4..5a9f3cf839 100644
--- a/keyboards/mokey/ginkgo65/keymaps/via/keymap.c
+++ b/keyboards/mokey/ginkgo65/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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,  _______, _______,
-        BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
diff --git a/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c b/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c
index 0142988784..7f4924e1a1 100644
--- a/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c
+++ b/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-        BL_TOGG, BL_STEP, BL_DEC,  BL_INC,  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,                                     _______, _______,          _______, _______, _______
diff --git a/keyboards/monarch/keymaps/default/keymap.c b/keyboards/monarch/keymaps/default/keymap.c
index 84c50c7a85..a9f67ee904 100644
--- a/keyboards/monarch/keymaps/default/keymap.c
+++ b/keyboards/monarch/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   BL_ON,
-      _______, _______, _______,                                     BL_TOGG,                            _______,          BL_DEC,  BL_OFF,  BL_INC
+      _______, _______, _______,                                     BL_TOGG,                            _______,          BL_DOWN, BL_OFF,  BL_UP
   )
 };
 
diff --git a/keyboards/monarch/keymaps/iso/keymap.c b/keyboards/monarch/keymaps/iso/keymap.c
index 71ff786171..e707b2104b 100644
--- a/keyboards/monarch/keymaps/iso/keymap.c
+++ b/keyboards/monarch/keymaps/iso/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          BL_ON,
-      _______, _______, _______,                                     BL_TOGG,                            _______,          BL_DEC,  BL_OFF,  BL_INC
+      _______, _______, _______,                                     BL_TOGG,                            _______,          BL_DOWN, BL_OFF,  BL_UP
   )
 };
 
diff --git a/keyboards/monarch/keymaps/via/keymap.c b/keyboards/monarch/keymaps/via/keymap.c
index 1b822529e1..b1b86aa015 100644
--- a/keyboards/monarch/keymaps/via/keymap.c
+++ b/keyboards/monarch/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          BL_ON,
-      _______, _______, _______,                                      BL_TOGG,                   _______,                  BL_DEC,  BL_OFF,  BL_INC,
+      _______, _______, _______,                                      BL_TOGG,                   _______,                  BL_DOWN, BL_OFF,  BL_UP, 
       _______, _______
   ),
   [2] = LAYOUT_all(
diff --git a/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c b/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c
index e717031b43..ba3079afda 100644
--- a/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c
+++ b/keyboards/monstargear/xo87/solderable/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             BL_INC,
-        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    BL_TOGG, BL_DEC,  BL_STEP
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             BL_UP, 
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    BL_TOGG, BL_DOWN, BL_STEP
     )
 };
diff --git a/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c b/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c
index 0a2533b322..5515102a46 100644
--- a/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c
+++ b/keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c
@@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             BL_INC,
-        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    BL_TOGG, BL_DEC,  BL_STEP
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             BL_UP, 
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,    BL_TOGG, BL_DOWN, BL_STEP
     ),
     [2] = LAYOUT_all(
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
diff --git a/keyboards/mt/mt40/keymaps/default/keymap.c b/keyboards/mt/mt40/keymaps/default/keymap.c
index 19c3abcd35..098bc47d9d 100644
--- a/keyboards/mt/mt40/keymaps/default/keymap.c
+++ b/keyboards/mt/mt40/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_planck_mit(
         _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  RGB_TOG, RGB_MOD, KC_P7, KC_P8,   KC_P9,   KC_PSLS, _______,
         _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   RGB_VAD, RGB_VAI, KC_P4, KC_P5,   KC_P6,   KC_PAST, _______,
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   BL_TOGG, BL_INC,  KC_P1, KC_P2,   KC_P3,   KC_PMNS, KC_PGUP,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   BL_TOGG, BL_UP,   KC_P1, KC_P2,   KC_P3,   KC_PMNS, KC_PGUP,
         _______, _______, _______, _______, OOOOOOO,     _______,      KC_P0, KC_PDOT, KC_PENT, KC_PPLS, KC_PGDN),
 
     [2] = LAYOUT_planck_mit(
diff --git a/keyboards/mt/mt64rgb/keymaps/via/keymap.c b/keyboards/mt/mt64rgb/keymaps/via/keymap.c
index 0fa1c1b85f..6db46423e7 100644
--- a/keyboards/mt/mt64rgb/keymaps/via/keymap.c
+++ b/keyboards/mt/mt64rgb/keymaps/via/keymap.c
@@ -29,19 +29,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
 		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,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,RGB_VAI, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,RGB_VAI, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_VAD, RGB_HUD),
 	[2] = LAYOUT_64_ansi(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[3] = LAYOUT_64_ansi(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
diff --git a/keyboards/mt/mt84/keymaps/via/keymap.c b/keyboards/mt/mt84/keymaps/via/keymap.c
index f65f36647e..6906ddf9fe 100644
--- a/keyboards/mt/mt84/keymaps/via/keymap.c
+++ b/keyboards/mt/mt84/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
 		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	LAYOUT_75_ansi(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
diff --git a/keyboards/ncc1701kb/keymaps/brushsize/keymap.c b/keyboards/ncc1701kb/keymaps/brushsize/keymap.c
index 0cc21b7c34..6774efe088 100644
--- a/keyboards/ncc1701kb/keymaps/brushsize/keymap.c
+++ b/keyboards/ncc1701kb/keymaps/brushsize/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [1] = LAYOUT(
   BL_TOGG,  KC_TRNS, BL_BRTG,
-  BL_INC, BL_DEC,   BL_STEP,
+  BL_UP,  BL_DOWN,  BL_STEP,
   BL_ON,   BL_OFF,  KC_TRNS
 )
 
diff --git a/keyboards/ncc1701kb/keymaps/default/keymap.c b/keyboards/ncc1701kb/keymaps/default/keymap.c
index 91158f12d5..9585342e48 100644
--- a/keyboards/ncc1701kb/keymaps/default/keymap.c
+++ b/keyboards/ncc1701kb/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [1] = LAYOUT(
   BL_TOGG,  KC_TRNS, BL_BRTG,
-  BL_INC, BL_DEC,   BL_STEP,
+  BL_UP,  BL_DOWN,  BL_STEP,
   BL_ON,   BL_OFF,  KC_TRNS
 )
 
diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c
index 0ec8bfdbb4..1602a2a0b6 100644
--- a/keyboards/neito/keymaps/default/keymap.c
+++ b/keyboards/neito/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
         KC_TRNS, RGB_TOG, RGB_MOD,  RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI,           RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,            KC_TRNS, KC_TRNS, KC_DEL,                 KC_TRNS,
-        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,              QK_BOOT,
+        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, 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
diff --git a/keyboards/neito/keymaps/olli_works/keymap.c b/keyboards/neito/keymaps/olli_works/keymap.c
index 7c714af43a..cce6199492 100644
--- a/keyboards/neito/keymaps/olli_works/keymap.c
+++ b/keyboards/neito/keymaps/olli_works/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN2] = LAYOUT(
         KC_ESC, RGB_TOG, RGB_MOD,   RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI,           RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,            KC_TRNS, KC_TRNS, KC_DEL,               KC_TRNS,
-        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,            QK_BOOT,
+        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, 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_LGUI, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS,       KC_TRNS,
         KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS,                                                   KC_TRNS, KC_TRNS,  KC_TRNS
diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c
index 0ec8bfdbb4..1602a2a0b6 100644
--- a/keyboards/neito/keymaps/via/keymap.c
+++ b/keyboards/neito/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
         KC_TRNS, RGB_TOG, RGB_MOD,  RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI,           RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,            KC_TRNS, KC_TRNS, KC_DEL,                 KC_TRNS,
-        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,              QK_BOOT,
+        KC_TRNS, KC_MPRV,           KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,            BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, 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
diff --git a/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c b/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c
index 81f4f1d315..bd49d335d7 100644
--- a/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c
+++ b/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
-        _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
+        _______,          QK_BOOT,   BL_DOWN, BL_TOGG, BL_UP,   KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 };
diff --git a/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c b/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c
index 3dc5b9f093..e7c28aa0ad 100644
--- a/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c
+++ b/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
-        _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
+        _______,          QK_BOOT,   BL_DOWN, BL_TOGG, BL_UP,   KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
     [2] = LAYOUT_65_ansi_blocker(
diff --git a/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c b/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c
index 314bf000a8..33a5fa5e00 100644
--- a/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c
+++ b/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
-        _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
+        _______,          QK_BOOT,   BL_DOWN, BL_TOGG, BL_UP,   KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 };
diff --git a/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c b/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c
index 7d8a947e96..69d3a90fd8 100644
--- a/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c
+++ b/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______, KC_PGUP,
-        _______,          QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
+        _______,          QK_BOOT,   BL_DOWN, BL_TOGG, BL_UP,   KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, KC_PGDN,
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
     [2] = LAYOUT_65_ansi_blocker(
diff --git a/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c b/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c
index d2d102f460..b8c37e1404 100644
--- a/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c
+++ b/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______,
-        _______, _______, QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
+        _______, _______, QK_BOOT,   BL_DOWN, BL_TOGG, BL_UP,   KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c b/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c
index 762ca83022..7d7c1a1a44 100644
--- a/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c
+++ b/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______,
-        _______, _______, QK_BOOT,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
+        _______, _______, QK_BOOT,   BL_DOWN, BL_TOGG, BL_UP,   KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
     ),
     [2] = LAYOUT_all(
diff --git a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
index 5cb767a94a..ef5f9c9cf4 100644
--- a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
+++ b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_all(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLU,
         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_MPLY, 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_TRNS,
diff --git a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
index 145bef0a1e..3a4483f89e 100644
--- a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
+++ b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_all(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLU,
         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_MPLY, 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_TRNS,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS),
 
     [2] = LAYOUT_all(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLU,
         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_MPLY, 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_TRNS,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS),
 
     [3] = LAYOUT_all(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DEC,  BL_INC,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DOWN, BL_UP, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLU,
         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_MPLY, 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_TRNS,
diff --git a/keyboards/noxary/220/keymaps/default/keymap.c b/keyboards/noxary/220/keymaps/default/keymap.c
index 0179cb7918..3fd572a5ba 100644
--- a/keyboards/noxary/220/keymaps/default/keymap.c
+++ b/keyboards/noxary/220/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * └───┴───┴───┴───┘
     */
 	[_BL] = LAYOUT_ortho_6x4(
-	  KC_ESC,   BL_TOGG, BL_DEC,   BL_INC, 
+	  KC_ESC,   BL_TOGG, BL_DOWN,  BL_UP,  
 		KC_NUM,   KC_PSLS, KC_PAST,  KC_PEQL, 
 		KC_P7,    KC_P8,   KC_P9,    KC_PMNS, 
 		KC_P4,    KC_P5,   KC_P6,    KC_PPLS, 
diff --git a/keyboards/noxary/220/keymaps/via/keymap.c b/keyboards/noxary/220/keymaps/via/keymap.c
index c92e3931ea..ba6f6210d1 100644
--- a/keyboards/noxary/220/keymaps/via/keymap.c
+++ b/keyboards/noxary/220/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * └───┴───┴───┴───┘
     */
 	[_BL] = LAYOUT_ortho_6x4(
-	  KC_ESC,   BL_TOGG, BL_DEC,   BL_INC, 
+	  KC_ESC,   BL_TOGG, BL_DOWN,  BL_UP,  
 		KC_NUM,   KC_PSLS, KC_PAST,  KC_PEQL, 
 		KC_P7,    KC_P8,   KC_P9,    KC_PMNS, 
 		KC_P4,    KC_P5,   KC_P6,    KC_PPLS, 
diff --git a/keyboards/noxary/260/keymaps/default/keymap.c b/keyboards/noxary/260/keymaps/default/keymap.c
index 8c836bddab..904e3bed10 100644
--- a/keyboards/noxary/260/keymaps/default/keymap.c
+++ b/keyboards/noxary/260/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR,
         _______, KC_VOLU, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          _______,
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______,          _______),
     /* _FL2: Function Layer 2 - For ISO enter use ANSI enter
     * ,----------------------------------------------------------------.
diff --git a/keyboards/noxary/260/keymaps/via/keymap.c b/keyboards/noxary/260/keymaps/via/keymap.c
index 4cac4e4e83..1c7a672b72 100644
--- a/keyboards/noxary/260/keymaps/via/keymap.c
+++ b/keyboards/noxary/260/keymaps/via/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,
         _______, KC_VOLU, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          
+        _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______,          _______),
     /* _FL2: Function Layer 2 - For ISO enter use ANSI enter
     * ,----------------------------------------------------------------.
diff --git a/keyboards/noxary/268/keymaps/ansi/keymap.c b/keyboards/noxary/268/keymaps/ansi/keymap.c
index 8e36c7ec95..dac8e6c0dd 100644
--- a/keyboards/noxary/268/keymaps/ansi/keymap.c
+++ b/keyboards/noxary/268/keymaps/ansi/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, _______,
     _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
-    _______,          _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          KC_VOLU, KC_END,
+    _______,          _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          KC_VOLU, KC_END,
     _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
   ),
 
diff --git a/keyboards/noxary/268/keymaps/default/keymap.c b/keyboards/noxary/268/keymaps/default/keymap.c
index 70d40701ed..571396f21d 100644
--- a/keyboards/noxary/268/keymaps/default/keymap.c
+++ b/keyboards/noxary/268/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR, _______,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE, KC_MUTE, KC_VOLU, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE, KC_MUTE, KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______, _______, KC_VOLD, _______),
     /* _FL2: Function Layer 2 - For ISO enter use ANSI enter
     * ,----------------------------------------------------------------.
diff --git a/keyboards/noxary/268/keymaps/iso/keymap.c b/keyboards/noxary/268/keymaps/iso/keymap.c
index 3a75c891f9..410883dd54 100644
--- a/keyboards/noxary/268/keymaps/iso/keymap.c
+++ b/keyboards/noxary/268/keymaps/iso/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, _______,
     _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,                   KC_INS,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          KC_VOLU, KC_END,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          KC_VOLU, KC_END,
     _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
   ),
 
diff --git a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
index 1af41535e6..2502667d30 100644
--- a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
+++ b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR, KC_INS,
         _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE, KC_MUTE, KC_VOLU, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE, KC_MUTE, KC_VOLU, _______,
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______, _______, KC_VOLD, _______),
     /* _FL2: Function Layer 2 - For ISO enter use ANSI enter
     * ,----------------------------------------------------------------.
diff --git a/keyboards/noxary/268/keymaps/via/keymap.c b/keyboards/noxary/268/keymaps/via/keymap.c
index 9970730023..333172a2a2 100644
--- a/keyboards/noxary/268/keymaps/via/keymap.c
+++ b/keyboards/noxary/268/keymaps/via/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR, _______,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE, KC_MUTE, KC_VOLU, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE, KC_MUTE, KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______, _______, KC_VOLD, _______
         ),
     /* Function Layer 2 - For ISO enter use ANSI enter
diff --git a/keyboards/noxary/268_2/keymaps/default/keymap.c b/keyboards/noxary/268_2/keymaps/default/keymap.c
index ae37332248..d29114563a 100644
--- a/keyboards/noxary/268_2/keymaps/default/keymap.c
+++ b/keyboards/noxary/268_2/keymaps/default/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, _______,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  KC_MUTE,          KC_VOLU, KC_END,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   KC_MUTE,          KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
     ),
     /* Function Layer 2
diff --git a/keyboards/noxary/268_2/keymaps/via/keymap.c b/keyboards/noxary/268_2/keymaps/via/keymap.c
index 10c24ecc42..7c2002d0e4 100644
--- a/keyboards/noxary/268_2/keymaps/via/keymap.c
+++ b/keyboards/noxary/268_2/keymaps/via/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, _______,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  KC_MUTE,          KC_VOLU, KC_END,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   KC_MUTE,          KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
     ),
     /* Function Layer 2
diff --git a/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c b/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c
index a3194f285d..926855a0b4 100644
--- a/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c
+++ b/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, _______,
         RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  KC_MUTE,          KC_VOLU, KC_END,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   KC_MUTE,          KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
     ),
 };
diff --git a/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c b/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c
index 445f1a4ce2..dbd6dd8992 100644
--- a/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c
+++ b/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, _______,
         RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  KC_MUTE,          KC_VOLU, KC_END,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   KC_MUTE,          KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
     ),
     /* Function Layer 2
diff --git a/keyboards/noxary/280/keymaps/default/keymap.c b/keyboards/noxary/280/keymaps/default/keymap.c
index c547b407d3..4300540f46 100644
--- a/keyboards/noxary/280/keymaps/default/keymap.c
+++ b/keyboards/noxary/280/keymaps/default/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          _______,          KC_VOLU,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          _______,          KC_VOLU,
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______,          _______, _______, KC_VOLD, _______
         ),
     /* Function Layer 2 - For ISO enter use ANSI enter
diff --git a/keyboards/noxary/280/keymaps/via/keymap.c b/keyboards/noxary/280/keymaps/via/keymap.c
index c547b407d3..4300540f46 100644
--- a/keyboards/noxary/280/keymaps/via/keymap.c
+++ b/keyboards/noxary/280/keymaps/via/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          _______,          KC_VOLU,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          _______,          KC_VOLU,
         _______, _______, _______,                            BL_TOGG,                            _______, _______, _______,          _______, _______, KC_VOLD, _______
         ),
     /* Function Layer 2 - For ISO enter use ANSI enter
diff --git a/keyboards/noxary/x268/keymaps/default/keymap.c b/keyboards/noxary/x268/keymaps/default/keymap.c
index 81b6a2b791..90567b0f48 100644
--- a/keyboards/noxary/x268/keymaps/default/keymap.c
+++ b/keyboards/noxary/x268/keymaps/default/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR, _______,
         RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          KC_VOLU, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                   _______, _______, _______, _______,          KC_VOLD, _______
         ),
     /* Function Layer 2 - For ISO enter use ANSI enter
diff --git a/keyboards/noxary/x268/keymaps/via/keymap.c b/keyboards/noxary/x268/keymaps/via/keymap.c
index 81b6a2b791..90567b0f48 100644
--- a/keyboards/noxary/x268/keymaps/via/keymap.c
+++ b/keyboards/noxary/x268/keymaps/via/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR, _______,
         RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          KC_VOLU, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   _______, KC_MUTE,          KC_VOLU, KC_END,
         _______, _______, _______,                            BL_TOGG,                   _______, _______, _______, _______,          KC_VOLD, _______
         ),
     /* Function Layer 2 - For ISO enter use ANSI enter
diff --git a/keyboards/ok60/keymaps/default/keymap.c b/keyboards/ok60/keymaps/default/keymap.c
index 427eb10d6b..cd5b3962c1 100644
--- a/keyboards/ok60/keymaps/default/keymap.c
+++ b/keyboards/ok60/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/ok60/keymaps/ebrowncross/keymap.c b/keyboards/ok60/keymaps/ebrowncross/keymap.c
index e2dbc8429a..4ef2f9964c 100644
--- a/keyboards/ok60/keymaps/ebrowncross/keymap.c
+++ b/keyboards/ok60/keymaps/ebrowncross/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEC,  BL_TOGG, BL_INC,  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
+        _______,  _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
         _______,  _______, _______,                            _______,                            _______, MO(2),   _______, _______
     ),
 
diff --git a/keyboards/ok60/keymaps/ptillemans/keymap.c b/keyboards/ok60/keymaps/ptillemans/keymap.c
index 44e9f39973..0034e822d1 100644
--- a/keyboards/ok60/keymaps/ptillemans/keymap.c
+++ b/keyboards/ok60/keymaps/ptillemans/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, AG_NORM, AG_SWAP, _______, _______, _______, _______,
+        _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, AG_NORM, AG_SWAP, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/ok60/keymaps/via/keymap.c b/keyboards/ok60/keymaps/via/keymap.c
index d384075725..574d5798da 100644
--- a/keyboards/ok60/keymaps/via/keymap.c
+++ b/keyboards/ok60/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______
     ),
 
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
index d1016ecc5d..6eab3a1168 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
+++ b/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_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_INC , BL_DEC ,_______,                       _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, BL_TOGG, BL_BRTG, BL_UP  , BL_DOWN,_______,                       _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,_______,                       _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______,          _______,_______,_______,       _______,_______, _______,          _______, _______, _______, _______
   )
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
index 7dfaf61200..8bc5d09d80 100644
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
+++ b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_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_INC , BL_DEC ,_______,                       _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, 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,
     _______, _______, _______, _______,          _______,_______,_______,       _______,_______, _______,          _______, _______, _______, _______
   )
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
index 0251700433..739e22c04e 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_INC , BL_DEC ,_______,                       _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, BL_TOGG, BL_BRTG, BL_UP  , BL_DOWN,_______,                       _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______,_______,                       _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______,          _______,_______,_______,       _______,_______, _______,          _______, _______, _______, _______
   )
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
index e080fa5183..7ed548b765 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
@@ -93,8 +93,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_INC, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
+      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
   )
 }; 
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
index 919e8c81b0..174a945922 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
@@ -146,8 +146,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_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_INC,  XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, \
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, 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  \
   )
 };
diff --git a/keyboards/orange75/keymaps/default/keymap.c b/keyboards/orange75/keymaps/default/keymap.c
index 2d4465e9fd..c79fc918d0 100644
--- a/keyboards/orange75/keymaps/default/keymap.c
+++ b/keyboards/orange75/keymaps/default/keymap.c
@@ -46,8 +46,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_STEP,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, BL_INC,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DEC,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, BL_UP, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, BL_DOWN,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
         )
 };
diff --git a/keyboards/org60/keymaps/boardy/keymap.c b/keyboards/org60/keymaps/boardy/keymap.c
index 1c3e784556..48373de375 100644
--- a/keyboards/org60/keymaps/boardy/keymap.c
+++ b/keyboards/org60/keymaps/boardy/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    //--------------------------------------------------------------------------------------------------------------------------------------|
    //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
    //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-     KC_LSFT, KC_NO,     KC_1,    KC_2,    KC_3,    KC_NO,   BL_INC,  BL_DEC,  KC_NO,   KC_MPRV, KC_MNXT, KC_NO,   KC_NO, KC_VOLU, KC_NO,   
+     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,   
    //--------------------------------------------------------------------------------------------------------------------------------------|
    //          |          |          |                                                        |          |░░░░░░|        |        |        |
    //          |          |          |                                                        |          |░░░░░░|        |        |        |
diff --git a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
index acdd80944e..bf098d4d01 100644
--- a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [3] = LAYOUT_all(
     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS, QK_BOOT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, BL_TOGG, KC_TRNS, BL_INC,  BL_DEC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, BL_TOGG, KC_TRNS, BL_UP,   BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/pearl/keymaps/phil/keymap.c b/keyboards/pearl/keymaps/phil/keymap.c
index a84672c4b8..79dfd4ce37 100755
--- a/keyboards/pearl/keymaps/phil/keymap.c
+++ b/keyboards/pearl/keymaps/phil/keymap.c
@@ -57,9 +57,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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_INC,  BL_BRTG, RGB_M_P,  RGB_M_B, RGB_MOD,  RGB_HUI,  RGB_SAI, RGB_VAI, KC_NO,  KC_NO,
+      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_DEC,  KC_NO,   KC_NO,    KC_NO,   RGB_RMOD, RGB_M_SW, RGB_M_R, RGB_M_G, 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
       ),
 };
diff --git a/keyboards/planck/keymaps/emiller/keymap.c b/keyboards/planck/keymaps/emiller/keymap.c
index c257866f29..d40b4ddc33 100644
--- a/keyboards/planck/keymaps/emiller/keymap.c
+++ b/keyboards/planck/keymaps/emiller/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
   _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DEC, BL_INC, KC_PSCR
+  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DOWN,BL_UP,  KC_PSCR
 ),
 
 /* Raise
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
   _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DEC, BL_INC, KC_MPLY
+  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DOWN,BL_UP,  KC_MPLY
 ),
 
 /* Plover layer (http://opensteno.org)
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c
index ef642c8e5a..a2bf1b208f 100644
--- a/keyboards/planck/keymaps/ishtob/keymap.c
+++ b/keyboards/planck/keymaps/ishtob/keymap.c
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12_wrapper(
   DFU, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_DEL,
   _______, MAGIC_TOGGLE_NKRO, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, BL_DOWN,BL_UP,  BL_STEP, BL_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, CK_RST, CK_DOWN, CK_UP, CK_TOGG
 )
  
diff --git a/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c b/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
index 6258e8d7a9..a8f66d8f51 100644
--- a/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	//Layer3, Lighting Function keys, media keys and '\' is now Momentary Toggle to Layer 4, which has the soft reset.
 	[3] = LAYOUT(
 		KC_NO, 			   KC_NO, 	 KC_NO,    KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO,   KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 		KC_NO, 	 KC_NO, 		KC_NO, 
-		KC_NO, 			   KC_NO, 	 RGB_HUD,  RGB_HUI, RGB_VAD, RGB_VAI, KC_NO, 	BL_TOGG, BL_DEC, 	BL_INC,  BL_STEP, KC_NO, 	KC_NO, 		MO(4), 	 				KC_NO,
+		KC_NO, 			   KC_NO, 	 RGB_HUD,  RGB_HUI, RGB_VAD, RGB_VAI, KC_NO, 	BL_TOGG, BL_DOWN,	BL_UP,   BL_STEP, KC_NO, 	KC_NO, 		MO(4), 	 				KC_NO,
 		KC_TRNS, 		   KC_NO, 	 RGB_RMOD, RGB_MOD, RGB_TOG, KC_NO,   KC_MSTP,  KC_MPLY, KC_MPRV,   KC_MNXT, KC_VOLD, KC_VOLU, 				KC_NO, 					KC_NO, 
 		KC_NO, KC_NO, 	   KC_NO, 	 RGB_SAD,  RGB_SAI, KC_NO, 	 KC_NO,   KC_NO,	KC_NO, 	 KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 								KC_NO, 
 		KC_NO, 			   KC_NO, 	 KC_NO,    KC_NO, 			 KC_NO, 			KC_NO, 	 KC_NO, 	KC_NO, 				 KC_NO, KC_NO, KC_NO),
diff --git a/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json b/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
index fd28fc3f48..2e40f6ad74 100644
--- a/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
+++ b/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
@@ -1 +1 @@
-[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_BSPC", "KC_PSCR", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "MO(3)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_PGDN", "KC_UP", "KC_NO", "KC_LCTL", "KC_LALT", "KC_BSPC", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_HUD", "RGB_HUI", "KC_NO", "KC_NO", "KC_NO", "BL_TOGG", "BL_DEC", "BL_INC", "BL_STEP", "KC_NO", "KC_NO", "MO(4)", "KC_NO", "KC_TRNS", "RGB_TOG", "RGB_RMOD", "RGB_MOD", "RGB_VAD", "RGB_VAI", "KC_MSTP", "KC_MPLY", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_SAD", "RGB_SAI", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "QK_BOOT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_BSPC", "KC_PSCR", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "MO(3)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_PGDN", "KC_UP", "KC_NO", "KC_LCTL", "KC_LALT", "KC_BSPC", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_HUD", "RGB_HUI", "KC_NO", "KC_NO", "KC_NO", "BL_TOGG", "BL_DOWN", "BL_UP", "BL_STEP", "KC_NO", "KC_NO", "MO(4)", "KC_NO", "KC_TRNS", "RGB_TOG", "RGB_RMOD", "RGB_MOD", "RGB_VAD", "RGB_VAI", "KC_MSTP", "KC_MPLY", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_SAD", "RGB_SAI", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "QK_BOOT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/playkbtw/ca66/keymaps/via/keymap.c b/keyboards/playkbtw/ca66/keymaps/via/keymap.c
index c8c9c89b0a..ae8c97f6b2 100644
--- a/keyboards/playkbtw/ca66/keymaps/via/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	//Layer3, Lighting Function keys, soft reset on Tab.
 	[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,
-		QK_BOOT, 			   KC_NO, 	 RGB_HUD,  RGB_HUI, RGB_VAD, RGB_VAI, KC_NO, 	BL_TOGG, BL_DEC, 	BL_INC,  BL_STEP, KC_NO, 	KC_NO, 		MO(4), 	 				KC_NO,
+		QK_BOOT, 			   KC_NO, 	 RGB_HUD,  RGB_HUI, RGB_VAD, RGB_VAI, KC_NO, 	BL_TOGG, BL_DOWN,	BL_UP,   BL_STEP, KC_NO, 	KC_NO, 		MO(4), 	 				KC_NO,
 		KC_TRNS, 		   KC_NO, 	 RGB_RMOD, RGB_MOD, RGB_TOG, KC_NO,   KC_MSTP,  KC_MPLY, KC_MPRV,   KC_MNXT, KC_VOLD, KC_VOLU, 				KC_NO, 					KC_NO,
 		KC_NO, KC_NO, 	   KC_NO, 	 RGB_SAD,  RGB_SAI, KC_NO, 	 KC_NO,   KC_NO,	KC_NO, 	 KC_NO, 	KC_NO, 	 KC_NO,   KC_NO, 	KC_NO, 								KC_NO,
 		KC_NO, 			   KC_NO, 	 KC_NO,    KC_NO, 			 KC_NO, 			KC_NO, 	 KC_NO, 	KC_NO, 				 KC_NO, KC_NO, KC_NO),
diff --git a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c b/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
index 193185e58d..b6988e1cdc 100644
--- a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
+++ b/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
+        _______, RGB_RMOD, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
         _______, _______,  _______, _______,                            _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_MPLY 
     ),
 
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
         _______, RGB_TOG,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
         _______, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_RMOD, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
+        _______, RGB_RMOD, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
         _______, _______,  _______, _______,                            _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END 
     ),
 };
diff --git a/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c b/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c
index d3ce3114fe..c2ceddcca3 100644
--- a/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c
+++ b/keyboards/playkbtw/pk64rgb/keymaps/via/keymap.c
@@ -29,19 +29,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
 		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
 		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,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,RGB_VAI, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,RGB_VAI, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_VAD, RGB_HUD),
 	[2] = LAYOUT_64_ansi(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[3] = LAYOUT_64_ansi(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
diff --git a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c
index 243218f1c6..0b4c26369d 100644
--- a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c
+++ b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,             KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
         QK_BOOT,   _______, KC_UP,   _______, _______, _______,           _______, _______, _______, KC_F11,  KC_F12,  _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,           _______, _______, _______, _______, _______, _______,
-        _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, KC_END,   _______, _______, BL_INC,  KC_MPLY, KC_VOLU, KC_MUTE,
-        _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, RGB_TOG, KC_HOME,  BL_TOGG, BL_TOGG, BL_DEC,  KC_MPRV, KC_VOLD, KC_MNXT
+        _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, KC_END,   _______, _______, BL_UP,   KC_MPLY, KC_VOLU, KC_MUTE,
+        _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, RGB_TOG, KC_HOME,  BL_TOGG, BL_TOGG, BL_DOWN, KC_MPRV, KC_VOLD, KC_MNXT
     )
 };
 
diff --git a/keyboards/poker87c/keymaps/default/keymap.c b/keyboards/poker87c/keymaps/default/keymap.c
index f6a888d713..16c9df2b4d 100644
--- a/keyboards/poker87c/keymaps/default/keymap.c
+++ b/keyboards/poker87c/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,               _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
diff --git a/keyboards/poker87c/keymaps/via/keymap.c b/keyboards/poker87c/keymaps/via/keymap.c
index 65a4f15263..2b24e02b73 100644
--- a/keyboards/poker87c/keymaps/via/keymap.c
+++ b/keyboards/poker87c/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,               _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
     [2] = LAYOUT_all(
diff --git a/keyboards/poker87d/keymaps/default/keymap.c b/keyboards/poker87d/keymaps/default/keymap.c
index 3e94fff821..0271b848a4 100644
--- a/keyboards/poker87d/keymaps/default/keymap.c
+++ b/keyboards/poker87d/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                      _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
diff --git a/keyboards/poker87d/keymaps/via/keymap.c b/keyboards/poker87d/keymaps/via/keymap.c
index 8e96efee49..4d6a231796 100644
--- a/keyboards/poker87d/keymaps/via/keymap.c
+++ b/keyboards/poker87d/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                      _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
diff --git a/keyboards/polycarbdiet/s20/keymaps/default/keymap.c b/keyboards/polycarbdiet/s20/keymaps/default/keymap.c
index 8abfa30438..1186a5e460 100644
--- a/keyboards/polycarbdiet/s20/keymaps/default/keymap.c
+++ b/keyboards/polycarbdiet/s20/keymaps/default/keymap.c
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [2] = LAYOUT_ortho_5x4(
         RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
         RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-        BL_TOGG, BL_ON,   BL_INC,  BL_STEP,
-        KC_TRNS, BL_OFF,  BL_DEC,  BL_BRTG,
+        BL_TOGG, BL_ON,   BL_UP,   BL_STEP,
+        KC_TRNS, BL_OFF,  BL_DOWN, BL_BRTG,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [3] = LAYOUT_ortho_5x4(
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
index 411c27a4ee..cc8b3df982 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______,   _______,   _______, _______,   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12, KC_INS, KC_DEL,   _______,
     _______, _______,   _______,   _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD,     _______,      KC_VOLU,
     _______, _______,   _______,    _______, _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         BL_TOGG,       KC_VOLD,
-    _______, _______,   _______,   _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, BL_INC, BL_BRTG,         _______,        _______, KC_MUTE,
+    _______, _______,   _______,   _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN,BL_UP,  BL_BRTG,         _______,        _______, KC_MUTE,
     _______, _______,    _______,  _______,  _______ ,       _______,   _______,   _______,       _______,      _______,     _______,        _______,     MO(_FNC),  _______,   _______, _______, _______
   )
 };
diff --git a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
index a4eac9f881..7aed36df77 100644
--- a/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
+++ b/keyboards/pom_keyboards/tnln95/keymaps/default_ansi/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______,   _______,   _______, _______,   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,        KC_DEL,    KC_PSCR,
     _______, _______,   _______,   _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD,     KC_INS,      KC_VOLU,
              _______,   _______,    _______, _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         BL_TOGG,       KC_VOLD,
-    _______, _______,   _______,   _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, BL_INC, BL_BRTG,         _______,        _______, KC_MUTE,
+    _______, _______,   _______,   _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN,BL_UP,  BL_BRTG,         _______,        _______, KC_MUTE,
              _______,       _______,        _______ ,       _______,   _______,   _______,                             _______,                      _______,     MO(_FNC),    _______, _______, _______
   )
 };
diff --git a/keyboards/preonic/keymaps/0xdec/keymap.c b/keyboards/preonic/keymaps/0xdec/keymap.c
index 1ceffdc1b5..2a4b1bdc0c 100644
--- a/keyboards/preonic/keymaps/0xdec/keymap.c
+++ b/keyboards/preonic/keymaps/0xdec/keymap.c
@@ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_RAISE] = LAYOUT_preonic_grid( \
   KC_SLEP,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_PSCR, \
-  XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_INC ,COLEMAK,GAME   ,MU_TOG ,KC_MENU,KC_SCRL, \
-  KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DEC ,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_PAUS, \
+  XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_UP  ,COLEMAK,GAME   ,MU_TOG ,KC_MENU,KC_SCRL, \
+  KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DOWN,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_PAUS, \
   XXXXXXX,KC_WBAK,KC_WSTP,KC_WREF,KC_WFWD,KC_MUTE,BL_TOGG,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_INS,  \
   QK_BOOT,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______  \
 )
diff --git a/keyboards/preonic/keymaps/arkag/keymap.c b/keyboards/preonic/keymaps/arkag/keymap.c
index ff67b758d5..3b6a32682f 100644
--- a/keyboards/preonic/keymaps/arkag/keymap.c
+++ b/keyboards/preonic/keymaps/arkag/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_KEEB] = LAYOUT_preonic_grid(
     CK_TOGG, AU_TOG,  MU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
     M_USSR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, BL_TOGG, BL_STEP, BL_INC,  BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______,
+    _______, BL_TOGG, BL_STEP, BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______,
     RGB_M_P, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______,
     QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
diff --git a/keyboards/preonic/keymaps/zach/keymap.c b/keyboards/preonic/keymaps/zach/keymap.c
index 7423f9639d..49f465f2ee 100644
--- a/keyboards/preonic/keymaps/zach/keymap.c
+++ b/keyboards/preonic/keymaps/zach/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_1x2uC(  /* ADJUST - Macros, Layer Switching, Function Keys */
   UNIWIN,  XXXXXXX, XXXXXXX, RANDIG,  RANDIG,  KC_INS,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, AU_TOG, MU_TOG,  \
   UNILIN,  SUPA2,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,    KC_F2,   KC_F3,   KC_F4,  XXXXXXX, \
-  XXXXXXX, DEGREE,  IBANG,   LAROW,   RAROW,   SWCOLE,  COLEMAK, KC_F5,    KC_F6,   KC_F7,   KC_F8,  BL_INC,  \
-  _______, CADKEY,  MICRO,   WOMEGA,  OMEGA,   XXXXXXX, XXXXXXX, KC_F9,    KC_F10,  KC_F11,  KC_F12, BL_DEC,  \
+  XXXXXXX, DEGREE,  IBANG,   LAROW,   RAROW,   SWCOLE,  COLEMAK, KC_F5,    KC_F6,   KC_F7,   KC_F8,  BL_UP,   \
+  _______, CADKEY,  MICRO,   WOMEGA,  OMEGA,   XXXXXXX, XXXXXXX, KC_F9,    KC_F10,  KC_F11,  KC_F12, BL_DOWN, \
   _______, _______, _______, _______, _______,      QK_BOOT,     _______,  XXXXXXX, MUV_DE,  MUV_IN, BL_TOGG  \
 ),
 
diff --git a/keyboards/projectkb/alice/keymaps/default/keymap.c b/keyboards/projectkb/alice/keymaps/default/keymap.c
index d656e4f31b..9b1b0679f6 100644
--- a/keyboards/projectkb/alice/keymaps/default/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______,
-              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, BL_UP,   BL_DOWN, BL_TOGG, BL_BRTG, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT
   )
 };
diff --git a/keyboards/projectkb/alice/keymaps/devinceble/keymap.c b/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
index 01d281bc68..6c153b4998 100644
--- a/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_TOG, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
         RGB_MOD, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_RMOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_INC, BL_DEC, BL_TOGG, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, BL_UP,  BL_DOWN,BL_TOGG, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
     ),
 };
diff --git a/keyboards/projectkb/alice/keymaps/keithlo/keymap.c b/keyboards/projectkb/alice/keymaps/keithlo/keymap.c
index 49c6ccfd12..f489b78e6b 100644
--- a/keyboards/projectkb/alice/keymaps/keithlo/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/keithlo/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_VOLD, KC_VOLU, _______, KC_MUTE,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, KC_F11,  KC_F12, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          KC_LEFT, KC_DOWN, KC_UP  , KC_RIGHT, _______, _______,          _______,
-              _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, _______,
+              _______, BL_UP,   BL_DOWN, BL_TOGG, BL_BRTG, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                            _______,          _______,          QK_BOOT
   )
 };
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
index 5162564cb5..10fbbd1547 100644
--- a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
     RGB_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
     VK_TOGG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
-             _______, BL_INC,   BL_DEC, BL_TOGG, BL_BRTG, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
+             _______, BL_UP,    BL_DOWN,BL_TOGG, BL_BRTG, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
              AG_TOGG,                   _______,  _______, _______,        _______,          _______,                        _______
   )
 };
diff --git a/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c b/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
index ef112f6698..9862d6d422 100644
--- a/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/stanrc85/keymap.c
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_default(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
+    BL_UP,    VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_DOWN,  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
   )
diff --git a/keyboards/prototypist/allison/keymaps/default/keymap.c b/keyboards/prototypist/allison/keymaps/default/keymap.c
index 55eb1bd9c6..dada744943 100644
--- a/keyboards/prototypist/allison/keymaps/default/keymap.c
+++ b/keyboards/prototypist/allison/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_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, BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP,   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,                                     KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
 
     [2] = LAYOUT_all( /* Empty for dynamic keymaps */
diff --git a/keyboards/prototypist/allison/keymaps/via/keymap.c b/keyboards/prototypist/allison/keymaps/via/keymap.c
index 55eb1bd9c6..dada744943 100644
--- a/keyboards/prototypist/allison/keymaps/via/keymap.c
+++ b/keyboards/prototypist/allison/keymaps/via/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_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, BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP,   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,                                     KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
 
     [2] = LAYOUT_all( /* Empty for dynamic keymaps */
diff --git a/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c b/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
index d2682b2f78..481d6686fe 100644
--- a/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
+++ b/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_ortho_6x4( /* FN1 */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG,
+    BL_TOGG, BL_UP,   BL_DOWN, BL_BRTG,
     KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,
     KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c b/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
index d2682b2f78..481d6686fe 100644
--- a/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
+++ b/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_ortho_6x4( /* FN1 */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG,
+    BL_TOGG, BL_UP,   BL_DOWN, BL_BRTG,
     KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,
     KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/prototypist/j01/keymaps/default/keymap.c b/keyboards/prototypist/j01/keymaps/default/keymap.c
index f0601ffa85..5793ccbc43 100644
--- a/keyboards/prototypist/j01/keymaps/default/keymap.c
+++ b/keyboards/prototypist/j01/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Fn1 layer
     [1] = LAYOUT_all(
         BL_TOGG, BL_STEP,     KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,      KC_TRNS,
-        BL_DEC,  BL_INC,      KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        BL_DOWN, BL_UP,       KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,
         KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_TRNS,
         KC_TRNS, 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/prototypist/j01/keymaps/via/keymap.c b/keyboards/prototypist/j01/keymaps/via/keymap.c
index ed33d87b7d..edaedc541c 100644
--- a/keyboards/prototypist/j01/keymaps/via/keymap.c
+++ b/keyboards/prototypist/j01/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Fn1 layer
     [1] = LAYOUT_all(
         BL_TOGG, BL_STEP,     KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,      KC_TRNS,
-        BL_DEC,  BL_INC,      KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        BL_DOWN, BL_UP,       KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,
         KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_TRNS,
         KC_TRNS, 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/ramonimbao/wete/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
index 23cdd9c3b2..73f3811e76 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,   KC_NO,
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,
       KC_NO, KC_NO, KC_NO,          KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO,     KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,     BL_INC, KC_NO,
-         KC_NO,     KC_NO,          KC_NO,  KC_NO,  KC_NO,                      KC_NO,                     KC_NO, KC_TRNS,      BL_OFF, BL_DEC, BL_ON
+      KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,     BL_UP,  KC_NO,
+         KC_NO,     KC_NO,          KC_NO,  KC_NO,  KC_NO,                      KC_NO,                     KC_NO, KC_TRNS,      BL_OFF, BL_DOWN,BL_ON
   )
 };
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
index 33c71a7242..afaf6bfe9e 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,   KC_NO,
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,
       KC_NO, KC_NO, KC_NO,          KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO,     KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,     BL_INC, KC_NO,
-         KC_NO,     KC_NO,          KC_NO,  KC_NO,  KC_NO,                      KC_NO,                     KC_NO, KC_TRNS,      BL_OFF, BL_DEC, BL_ON
+      KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,     BL_UP,  KC_NO,
+         KC_NO,     KC_NO,          KC_NO,  KC_NO,  KC_NO,                      KC_NO,                     KC_NO, KC_TRNS,      BL_OFF, BL_DOWN,BL_ON
   )
 };
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
index 61f57ec09e..11db8e7da9 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
@@ -34,6 +34,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,
       KC_NO, KC_NO, KC_NO,          KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO,     KC_NO,
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,  KC_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, BL_OFF, BL_DEC, BL_INC, BL_ON
+         KC_NO,     KC_NO,          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_UP,  BL_ON
   )
 };
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
index 64fc4f462f..b9acb6cace 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
@@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,   KC_NO,
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,
       KC_NO, KC_NO, KC_NO,          KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO,     KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,     BL_INC, KC_NO,
-         KC_NO,     KC_NO,          KC_NO,  KC_NO,  KC_NO,                      KC_NO,                     KC_NO, KC_TRNS,      BL_OFF, BL_DEC, BL_ON
+      KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,     BL_UP,  KC_NO,
+         KC_NO,     KC_NO,          KC_NO,  KC_NO,  KC_NO,                      KC_NO,                     KC_NO, KC_TRNS,      BL_OFF, BL_DOWN,BL_ON
   ),
   [2] = LAYOUT_ansi_rhnp(
       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,
diff --git a/keyboards/rart/rart67/keymaps/default/keymap.c b/keyboards/rart/rart67/keymaps/default/keymap.c
index e572ccb210..812e3b1713 100644
--- a/keyboards/rart/rart67/keymaps/default/keymap.c
+++ b/keyboards/rart/rart67/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  KC_DEL,   _______,
     QK_BOOT,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_P7,    KC_P8,    KC_P9,    _______,            _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P4,    KC_P5,    KC_P6,                        KC_NUM,   _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  KC_P1,    KC_P2,    KC_P3,                        KC_VOLU,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  KC_P1,    KC_P2,    KC_P3,                        KC_VOLU,  _______,
     _______,  _______,  _______,                      _______,                                _______,  KC_P0,    KC_MPRV,                      KC_VOLD,  KC_MNXT
   ), 
 };
diff --git a/keyboards/rart/rart67/keymaps/via/keymap.c b/keyboards/rart/rart67/keymaps/via/keymap.c
index 4a2598e99c..43e2e0f0da 100644
--- a/keyboards/rart/rart67/keymaps/via/keymap.c
+++ b/keyboards/rart/rart67/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  KC_DEL,   _______,
     QK_BOOT,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_P7,    KC_P8,    KC_P9,    _______,            _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P4,    KC_P5,    KC_P6,                        KC_NUM,   _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  KC_P1,    KC_P2,    KC_P3,                        KC_VOLU,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  KC_P1,    KC_P2,    KC_P3,                        KC_VOLU,  _______,
     _______,  _______,  _______,                      _______,                                _______,  KC_P0,    KC_MPRV,                      KC_VOLD,  KC_MNXT
   ), 
   
diff --git a/keyboards/rart/rart75/keymaps/ansi/keymap.c b/keyboards/rart/rart75/keymaps/ansi/keymap.c
index 44758054c2..5bf3552e62 100644
--- a/keyboards/rart/rart75/keymaps/ansi/keymap.c
+++ b/keyboards/rart/rart75/keymaps/ansi/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,              _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,            _______,                                _______,  _______,  _______,  _______,                      _______,  _______
   ),
 };
diff --git a/keyboards/rart/rart75/keymaps/default/keymap.c b/keyboards/rart/rart75/keymaps/default/keymap.c
index 55966e262d..74da5df1e0 100644
--- a/keyboards/rart/rart75/keymaps/default/keymap.c
+++ b/keyboards/rart/rart75/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,                      _______,  _______
   ),
 };
diff --git a/keyboards/rart/rart75/keymaps/via/keymap.c b/keyboards/rart/rart75/keymaps/via/keymap.c
index 86e75a5b52..384412373c 100644
--- a/keyboards/rart/rart75/keymaps/via/keymap.c
+++ b/keyboards/rart/rart75/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,    _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,                      _______,  _______
   ),
 
diff --git a/keyboards/rart/rart75hs/keymaps/default/keymap.c b/keyboards/rart/rart75hs/keymaps/default/keymap.c
index 4582818a46..4a15736143 100644
--- a/keyboards/rart/rart75hs/keymaps/default/keymap.c
+++ b/keyboards/rart/rart75hs/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            QK_BOOT,    _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,            _______,                                _______,  _______,  _______,  _______,                      _______,  _______
   )
 
diff --git a/keyboards/rart/rart75hs/keymaps/via/keymap.c b/keyboards/rart/rart75hs/keymaps/via/keymap.c
index eb5d231b41..0dbd012100 100644
--- a/keyboards/rart/rart75hs/keymaps/via/keymap.c
+++ b/keyboards/rart/rart75hs/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            QK_BOOT,    _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
-    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
     _______,  _______,  _______,            _______,                                _______,  _______,  _______,  _______,                      _______,  _______
   ),
 
diff --git a/keyboards/rart/rart80/keymaps/default/keymap.c b/keyboards/rart/rart80/keymaps/default/keymap.c
index d3b42c56e5..3989453d90 100644
--- a/keyboards/rart/rart80/keymaps/default/keymap.c
+++ b/keyboards/rart/rart80/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______, _______, _______, _______, _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,           _______, _______, _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
-    _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
     _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
   ),
 
diff --git a/keyboards/rart/rart80/keymaps/via/keymap.c b/keyboards/rart/rart80/keymaps/via/keymap.c
index 8b49a8856c..84beb2fe99 100644
--- a/keyboards/rart/rart80/keymaps/via/keymap.c
+++ b/keyboards/rart/rart80/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______, _______, _______, _______, _______,
     _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,           _______, _______, _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,
-    _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
+    _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,                     _______, _______, _______,
     _______,  _______,  _______,                                _______,                                _______,  _______,  _______,           _______, _______, _______
   ),
 
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index ff476dacd1..59de0e64f3 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -306,8 +306,8 @@ lookup_table_t lookup_table[333] =
  {"MU_MOD", MU_MOD},
  {"BL_ON", BL_ON},
  {"BL_OFF", BL_OFF},
- {"BL_DEC", BL_DEC},
- {"BL_INC", BL_INC},
+ {"BL_DOWN", BL_DOWN},
+ {"BL_UP", BL_UP},
  {"BL_TOGG", BL_TOGG},
  {"BL_STEP", BL_STEP},
  {"BL_BRTG", BL_BRTG},
diff --git a/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c b/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
index f0496b404b..8d994aaab2 100755
--- a/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
+++ b/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
         RGB_TOG, _______, KC_UP,   _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, QK_BOOT,
         BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        BL_BRTG, _______, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_BRTG, _______, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/sam/s80/keymaps/default/keymap.c b/keyboards/sam/s80/keymaps/default/keymap.c
index 08444745c4..efdea3ceb9 100644
--- a/keyboards/sam/s80/keymaps/default/keymap.c
+++ b/keyboards/sam/s80/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG,     KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS,
         BL_TOGG,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,   KC_TRNS, KC_TRNS, KC_LCTL, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS,        KC_TRNS,            KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_LCTL, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS,        KC_TRNS,            KC_TRNS,
         KC_TRNS,   KC_TRNS,   KC_TRNS,                      KC_TRNS,                              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
diff --git a/keyboards/sam/s80/keymaps/via/keymap.c b/keyboards/sam/s80/keymaps/via/keymap.c
index ca8d290356..c63ebdf019 100644
--- a/keyboards/sam/s80/keymaps/via/keymap.c
+++ b/keyboards/sam/s80/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG,     KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS,
         BL_TOGG,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,   KC_TRNS, KC_TRNS, KC_LCTL, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS,        KC_TRNS,            KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_LCTL, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS,        KC_TRNS,            KC_TRNS,
         KC_TRNS,   KC_TRNS,   KC_TRNS,                      KC_TRNS,                              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [2] = LAYOUT(
diff --git a/keyboards/sandwich/keeb68/keymaps/default/keymap.c b/keyboards/sandwich/keeb68/keymaps/default/keymap.c
index ec8283c422..71d3dddac7 100644
--- a/keyboards/sandwich/keeb68/keymaps/default/keymap.c
+++ b/keyboards/sandwich/keeb68/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_65_ansi(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        _______, _______, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
-        _______, BL_TOGG, BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
+        _______, _______, BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
+        _______, BL_TOGG, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
         _______, QK_BOOT,   _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
     )
diff --git a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
index 262000d6ca..48f7774f11 100644
--- a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
+++ b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT_65_ansi(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        _______, _______, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
-        _______, BL_TOGG, BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
+        _______, _______, BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
+        _______, BL_TOGG, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
         _______, QK_BOOT, _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
     )
diff --git a/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
index 1f28648d8a..44ca8f5e2f 100644
--- a/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
         ),
     [_HL] = LAYOUT(
-        RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON,   BL_DEC,  BL_INC,  KC_TRNS, LALT(KC_F4),
+        RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON,   BL_DOWN, BL_UP,   KC_TRNS, LALT(KC_F4),
         QK_BOOT, RGB_HUI, RGB_SAI,  RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_HUD, RGB_SAD,  RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
diff --git a/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c b/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
index 0860b79e28..dac69eba93 100644
--- a/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [_SFX] = LAYOUT(
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
-      ______,   BL_TOGG,BL_STEP,BL_DEC, BL_INC, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
+      ______,   BL_TOGG,BL_STEP,BL_DOWN,BL_UP,  ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   ______, RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______,         ______, ______,  \
       ______,   ______, ______,                         ______,                         ______, ______, ______, ______ \
diff --git a/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c b/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
index 885b0d9831..d6977b9b09 100644
--- a/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_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_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, BL_DEC,  BL_TOGG, BL_INC,           _______,
+    _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, BL_DOWN, BL_TOGG, BL_UP,            _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______
   ),
 };
diff --git a/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c b/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
index 2ecc183633..7ec7e39335 100644
--- a/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
@@ -41,6 +41,6 @@ BL = Backlighting = In-Switch LED
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,            KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/sets3n/kk980/keymaps/default/keymap.c b/keyboards/sets3n/kk980/keymaps/default/keymap.c
index b138247283..d4df2b8fee 100644
--- a/keyboards/sets3n/kk980/keymaps/default/keymap.c
+++ b/keyboards/sets3n/kk980/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,           KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_DEC,  BL_INC,           BL_STEP,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_DOWN, BL_UP,            BL_STEP,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, 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/sets3n/kk980/keymaps/via/keymap.c b/keyboards/sets3n/kk980/keymaps/via/keymap.c
index b138247283..d4df2b8fee 100644
--- a/keyboards/sets3n/kk980/keymaps/via/keymap.c
+++ b/keyboards/sets3n/kk980/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,           KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_DEC,  BL_INC,           BL_STEP,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_DOWN, BL_UP,            BL_STEP,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, 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/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index 63fd3c2ac2..71f592b061 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -373,7 +373,7 @@ qmk_dict = {
     "_reset": "QK_BOOT", "_debug": "DB_TOGG", "_eep_re": "EE_CLR",
     # Audio Keys missing
     # Backlighting
-    "Led 0": "BL_TOGG", "Led +": "BL_INC", "Led -": "BL_DEC", "Led ~": "BL_BRTG",
+    "Led 0": "BL_TOGG", "Led +": "BL_UP", "Led -": "BL_DOWN", "Led ~": "BL_BRTG",
     # Bootmagic missing
     # Bluetooth
     "OUT_AUTO": "OUT_AUTO", "OUT_USB": "OUT_USB", "OUT_BT": "OUT_BT",
diff --git a/keyboards/skeletn87/hotswap/keymaps/default/keymap.c b/keyboards/skeletn87/hotswap/keymaps/default/keymap.c
index 5c99732840..bd678a1742 100644
--- a/keyboards/skeletn87/hotswap/keymaps/default/keymap.c
+++ b/keyboards/skeletn87/hotswap/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV, KC_MPLY, KC_MNXT,
         KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
-            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                  BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC, 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,                  BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN,BL_BRTG
     )
 };
diff --git a/keyboards/skeletn87/hotswap/keymaps/via/keymap.c b/keyboards/skeletn87/hotswap/keymaps/via/keymap.c
index f87fa84b16..17850453fa 100644
--- a/keyboards/skeletn87/hotswap/keymaps/via/keymap.c
+++ b/keyboards/skeletn87/hotswap/keymaps/via/keymap.c
@@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV, KC_MPLY, KC_MNXT,
         KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
-            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                  BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC, 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,                  BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN,BL_BRTG
     ),
     [2] = LAYOUT_tkl_ansi(
         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,
diff --git a/keyboards/skeletn87/soldered/keymaps/default/keymap.c b/keyboards/skeletn87/soldered/keymaps/default/keymap.c
index 5c99732840..bd678a1742 100644
--- a/keyboards/skeletn87/soldered/keymaps/default/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV, KC_MPLY, KC_MNXT,
         KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
-            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                  BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC, 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,                  BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN,BL_BRTG
     )
 };
diff --git a/keyboards/skeletn87/soldered/keymaps/iso/keymap.c b/keyboards/skeletn87/soldered/keymaps/iso/keymap.c
index 41e28dcd48..207ad86996 100644
--- a/keyboards/skeletn87/soldered/keymaps/iso/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/iso/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPRV, KC_MPLY, KC_MNXT,
         KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                  BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC, BL_BRTG
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                  BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN,BL_BRTG
     )
 };
diff --git a/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c b/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c
index 85c4b9f8b3..2d2c5f8a0a 100644
--- a/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/tsangan/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV, KC_MPLY, KC_MNXT,
         KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
-            KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                  BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC, 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,                  BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN,BL_BRTG
     )
 };
diff --git a/keyboards/skeletn87/soldered/keymaps/via/keymap.c b/keyboards/skeletn87/soldered/keymaps/via/keymap.c
index 70a65e14d7..d50b9c02f9 100644
--- a/keyboards/skeletn87/soldered/keymaps/via/keymap.c
+++ b/keyboards/skeletn87/soldered/keymaps/via/keymap.c
@@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV, KC_MPLY, KC_MNXT,
         KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DEC, BL_BRTG
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    BL_TOGG, BL_DOWN,BL_BRTG
     ),
     [2] = LAYOUT_all(
         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,
diff --git a/keyboards/spiderisland/split78/keymaps/default/keymap.c b/keyboards/spiderisland/split78/keymaps/default/keymap.c
index 87d00efbe2..6cb31a180f 100644
--- a/keyboards/spiderisland/split78/keymaps/default/keymap.c
+++ b/keyboards/spiderisland/split78/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT(
         QK_BOOT,            KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  KC_DEL,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   KC_DEL,
         KC_NUM,  XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
         KC_SCRL,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_SLSH, KC_PGUP, XXXXXXX,
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
index 63421b79f4..57b43a0988 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
     _______,  _______,  _______,  _______,  KC_GRV,   KC_F1,    KC_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,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴─────────┼─────────┤ */
-    _______,  _______,  _______,  _______,  QK_BOOT,         BL_TOGG,  BL_INC,    BL_DEC,  BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+    _______,  _______,  _______,  _______,  QK_BOOT,         BL_TOGG,  BL_UP,     BL_DOWN, BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
 /* ├─────────┼─────────┼─────────┼─────────┼──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬───────────┼─────────┤ */
     _______,  _______,  _______,  _______,  _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,     _______,
 /* ├─────────┼─────────┼─────────┼─────────┼───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
index de02d67667..f0668b5948 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
     _______,  _______,  _______,  _______,  KC_GRV,   KC_F1,    KC_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,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
-    _______,  _______,  _______,  _______,  QK_BOOT,         BL_TOGG,  BL_INC,    BL_DEC,  BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+    _______,  _______,  _______,  _______,  QK_BOOT,         BL_TOGG,  BL_UP,     BL_DOWN, BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
 /* ├─────────┼─────────┼─────────┤         ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
     _______,  _______,  _______,            _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,               _______,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */
diff --git a/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
index cbbf9e7222..188299ffca 100644
--- a/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
+++ b/keyboards/switchplate/southpaw_65/keymaps/default_iso/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────────────────┬─────────┐ */
     _______,  _______,  _______,  _______,  KC_GRV,   KC_F1,    KC_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,
 /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
-	  _______,  _______,  _______,  _______,  QK_BOOT, 	       BL_TOGG,  BL_INC,   BL_DEC,   BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,
+	  _______,  _______,  _______,  _______,  QK_BOOT, 	       BL_TOGG,  BL_UP,    BL_DOWN,  BL_BRTG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,
 /* ├─────────┼─────────┼─────────┤         ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
 	  _______,  _______,  _______,            _______,          RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EE_CLR,     _______,
 /* ├─────────┼─────────┼─────────┼─────────┼───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
diff --git a/keyboards/tada68/keymaps/abishalom/keymap.c b/keyboards/tada68/keymaps/abishalom/keymap.c
index 6e2099acb8..f21fd93313 100644
--- a/keyboards/tada68/keymaps/abishalom/keymap.c
+++ b/keyboards/tada68/keymaps/abishalom/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRAVE, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______ ,  \
   _______,_______, KC_MPRV,KC_MNXT,_______, _______,_______,KC_PGDN,KC_UP,KC_PGUP,KC_PSCR,_______,_______, _______,KC_INSERT, \
   _______,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPLY,_______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,        _______,KC_HOME, \
-  _______,_______,BL_BRTG,BL_DEC, BL_INC,BL_TOGG, _______,_______,_______,_______,_______,_______, KC_STOP, KC_END, \
+  _______,_______,BL_BRTG,BL_DOWN,BL_UP, BL_TOGG, _______,_______,_______,_______,_______,_______, KC_STOP, KC_END, \
   _______,TD(TD_WIN_LOCK),_______,                 _______,               _______,KC_TRNS,_______,KC_MPRV,KC_MPLY, KC_MNXT),
 
 };
diff --git a/keyboards/tada68/keymaps/amnesia0287/keymap.c b/keyboards/tada68/keymaps/amnesia0287/keymap.c
index e066b6cb5b..005eea2380 100644
--- a/keyboards/tada68/keymaps/amnesia0287/keymap.c
+++ b/keyboards/tada68/keymaps/amnesia0287/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
 
 [_HL] = LAYOUT_ansi(
-  BL_TOGG, BL_DEC, BL_INC,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,LALT(KC_F4),MAGIC_UNSWAP_BACKSLASH_BACKSPACE,  \
+  BL_TOGG, BL_DOWN,BL_UP, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,LALT(KC_F4),MAGIC_UNSWAP_BACKSLASH_BACKSPACE,  \
      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,MAGIC_SWAP_BACKSLASH_BACKSPACE, \
       _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______, \
            _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,KC_MNXT,_______, \
diff --git a/keyboards/tada68/keymaps/ardakilic/keymap.c b/keyboards/tada68/keymaps/ardakilic/keymap.c
index f8603f6ba3..141c18de3f 100755
--- a/keyboards/tada68/keymaps/ardakilic/keymap.c
+++ b/keyboards/tada68/keymaps/ardakilic/keymap.c
@@ -50,6 +50,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
   _______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
   _______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______,_______,_______, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______,_______,_______, \
   _______,_______,_______,                 _______,               _______,_______,_______,_______,_______,_______),
 };
diff --git a/keyboards/tada68/keymaps/bazooka/keymap.c b/keyboards/tada68/keymaps/bazooka/keymap.c
index 42f6d95228..c6984594d7 100644
--- a/keyboards/tada68/keymaps/bazooka/keymap.c
+++ b/keyboards/tada68/keymaps/bazooka/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,KC_WHOM, \
   _______,_______,_______,_______,_______,_______,_______,_______,MAC_TOG,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_CALC, KC_INS,  \
   _______,_______,_______,_______,_______,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,        _______,KC_HOME, \
-          _______,BL_TOGG, BL_DEC, BL_INC,_______,_______,_______,MOU_TOG,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_PGUP,KC_END , \
+          _______,BL_TOGG, BL_DOWN,BL_UP, _______,_______,_______,MOU_TOG,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_PGUP,KC_END , \
   _______,WIN_LCK,_______,                        _______,                _______,_______,_______,KC_HOME,KC_PGDN,KC_END),
 
   /* Keymap _MOUSE: Mouse Navigation Layer
diff --git a/keyboards/tada68/keymaps/cheese/keymap.c b/keyboards/tada68/keymaps/cheese/keymap.c
index a026f82a3d..a3660a557b 100755
--- a/keyboards/tada68/keymaps/cheese/keymap.c
+++ b/keyboards/tada68/keymaps/cheese/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRV,  \
   SPX4,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______, _______, _______, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______, _______, _______, \
   _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
 
   /* Keymap _CL: Caps Layer
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRV ,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
 
   /* Keymap _AL: ALT Layer
diff --git a/keyboards/tada68/keymaps/default/keymap.c b/keyboards/tada68/keymaps/default/keymap.c
index 25741a6290..fcc37aff6c 100755
--- a/keyboards/tada68/keymaps/default/keymap.c
+++ b/keyboards/tada68/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
         _______, _______, _______,                            _______,                   _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
     ),
 };
diff --git a/keyboards/tada68/keymaps/devinceble/keymap.c b/keyboards/tada68/keymaps/devinceble/keymap.c
index d0a1bf9ca3..f2abbea5ee 100755
--- a/keyboards/tada68/keymaps/devinceble/keymap.c
+++ b/keyboards/tada68/keymaps/devinceble/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
     _______,_______, _______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-    _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
+    _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
     _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______
     ),
 };
diff --git a/keyboards/tada68/keymaps/dlg/keymap.c b/keyboards/tada68/keymaps/dlg/keymap.c
index 275b5a48d8..4b99263353 100755
--- a/keyboards/tada68/keymaps/dlg/keymap.c
+++ b/keyboards/tada68/keymaps/dlg/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_ansi(
   MAGIC_UNSWAP_GRAVE_ESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12, KC_DEL,   MAGIC_SWAP_GRAVE_ESC, \
-  _______, BL_TOGG, BL_DEC,  BL_INC , _______, _______, _______, _______, TG(_MAC),_______,  KC_PSCR, _______, _______, _______, KC_INS, \
+  _______, BL_TOGG, BL_DOWN, BL_UP  , _______, _______, _______, _______, TG(_MAC),_______,  KC_PSCR, _______, _______, _______, KC_INS, \
   _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,     _______,      KC_HOME, \
   _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,  _______, _______,     KC_PGUP,      KC_END , \
   _______, _______, _______,                 _______,                     _______, _______,  _______, KC_HOME,     KC_PGDN,      KC_END ),
diff --git a/keyboards/tada68/keymaps/emdarcher/keymap.c b/keyboards/tada68/keymaps/emdarcher/keymap.c
index 38e7563266..5a218ba711 100755
--- a/keyboards/tada68/keymaps/emdarcher/keymap.c
+++ b/keyboards/tada68/keymaps/emdarcher/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,
   _______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS, _______,KC_HOME,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MRWD,KC_MFFD,        _______, KC_END,
-  _______,        _______,BL_BRTG,BL_DEC, BL_TOGG,BL_INC, KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
+  _______,        _______,BL_BRTG,BL_DOWN,BL_TOGG,BL_UP,  KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
   _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
 
  /* Keymap _CL: Function Layer for Caps Lock key
diff --git a/keyboards/tada68/keymaps/fakb/keymap.c b/keyboards/tada68/keymaps/fakb/keymap.c
index 3e30cffac0..378a899714 100755
--- a/keyboards/tada68/keymaps/fakb/keymap.c
+++ b/keyboards/tada68/keymaps/fakb/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_PSCR,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_INS ,_______,\
  _______,_______,_______,KC_PGUP,KC_PGDN,KC_HOME,KC_END ,KC_PGDN,KC_PGUP,_______,_______,_______,_______,KC_DEL ,_______,\
  KC_CAPS,KC_NUBS,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,_______,_______,        _______,_______,\
- _______,_______,BL_TOGG,BL_INC ,BL_DEC ,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,        _______,_______,_______,\
+ _______,_______,BL_TOGG,BL_UP  ,BL_DOWN,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,        _______,_______,_______,\
  _______,_______,_______,                _______,                        _______,_______,_______,_______,_______,_______),
 
 [2] = LAYOUT_ansi(
diff --git a/keyboards/tada68/keymaps/fezzant/keymap.c b/keyboards/tada68/keymaps/fezzant/keymap.c
index 2ca9178530..460e0ef9e3 100644
--- a/keyboards/tada68/keymaps/fezzant/keymap.c
+++ b/keyboards/tada68/keymaps/fezzant/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_ansi(
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PAUSE ,  \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,BL_BRTG,BL_DEC,BL_TOGG, BL_INC, KC_MAIL,TG(_NUM), \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,BL_BRTG,BL_DOWN,BL_TOGG, BL_UP,  KC_MAIL,TG(_NUM), \
   XXXXXXX,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_APPLICATION,        _______,KC_PGUP, \
   _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_BTN1, KC_MS_U, KC_PGDN, \
   MAGIC_UNNO_GUI,MAGIC_NO_GUI,_______,                 _______,               _______,_______,_______,KC_MPRV,KC_MSTP, KC_MNXT),
diff --git a/keyboards/tada68/keymaps/hhkb68/keymap.c b/keyboards/tada68/keymaps/hhkb68/keymap.c
index abde68f883..8ec7b8774e 100644
--- a/keyboards/tada68/keymaps/hhkb68/keymap.c
+++ b/keyboards/tada68/keymaps/hhkb68/keymap.c
@@ -2,5 +2,5 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ansi(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_PGDN, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-	[1] = LAYOUT_ansi(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_END, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+	[1] = LAYOUT_ansi(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_END, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/tada68/keymaps/hhkb68/layers.json b/keyboards/tada68/keymaps/hhkb68/layers.json
index 9553c3317b..1d084034df 100644
--- a/keyboards/tada68/keymaps/hhkb68/layers.json
+++ b/keyboards/tada68/keymaps/hhkb68/layers.json
@@ -1 +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_BSLS", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSPC", "KC_DEL", "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_PGDN", "MO(1)", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT"], ["KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_TRNS", "KC_INS", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_DEL", "KC_HOME", "KC_TRNS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_LEFT", "KC_RGHT", "KC_TRNS", "KC_END", "KC_TRNS", "BL_DEC", "BL_TOGG", "BL_INC", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_DOWN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]]
\ No newline at end of file
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSLS", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSPC", "KC_DEL", "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_PGDN", "MO(1)", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT"], ["KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_TRNS", "KC_INS", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_DEL", "KC_HOME", "KC_TRNS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_LEFT", "KC_RGHT", "KC_TRNS", "KC_END", "KC_TRNS", "BL_DOWN", "BL_TOGG", "BL_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_DOWN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]]
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/iso-nor/keymap.c b/keyboards/tada68/keymaps/iso-nor/keymap.c
index c4d8978716..36d86c93fa 100644
--- a/keyboards/tada68/keymaps/iso-nor/keymap.c
+++ b/keyboards/tada68/keymaps/iso-nor/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_iso(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_PSCR, \
-    _______, _______,   KC_UP, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, _______,          KC_INS,  \
+    _______, _______,   KC_UP, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, _______,          KC_INS,  \
     _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_END,  \
     _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
diff --git a/keyboards/tada68/keymaps/iso-uk/keymap.c b/keyboards/tada68/keymaps/iso-uk/keymap.c
index f4aa09f65b..711fb8456a 100644
--- a/keyboards/tada68/keymaps/iso-uk/keymap.c
+++ b/keyboards/tada68/keymaps/iso-uk/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,  \
     _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME, \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  \
-    _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2, \
+    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2, \
     _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 	),
 };
diff --git a/keyboards/tada68/keymaps/isoish/keymap.c b/keyboards/tada68/keymaps/isoish/keymap.c
index 69b382e1c2..cb36c46e50 100644
--- a/keyboards/tada68/keymaps/isoish/keymap.c
+++ b/keyboards/tada68/keymaps/isoish/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_FL] = LAYOUT_ansi_split_enter(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_PSCR, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, KC_INS,  \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, KC_INS,  \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, \
     _______,          _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_END,  \
     _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
diff --git a/keyboards/tada68/keymaps/jarred/keymap.c b/keyboards/tada68/keymaps/jarred/keymap.c
index 0c19b96d93..49ceac2f06 100644
--- a/keyboards/tada68/keymaps/jarred/keymap.c
+++ b/keyboards/tada68/keymaps/jarred/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL , KC_INS ,
     _______, _______, _______, _______, KC_DEL , KC_BSPC, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______, _______, _______, KC_HOME,
     _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_DEL ,          _______, KC_END ,
-    _______         , _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, BL_INC , _______,
-    _______, _______, _______,                   _______                           , _______, _______, _______, BL_TOGG, BL_DEC , _______
+    _______         , _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, BL_UP  , _______,
+    _______, _______, _______,                   _______                           , _______, _______, _______, BL_TOGG, BL_DOWN, _______
   ),
 
 };
diff --git a/keyboards/tada68/keymaps/kbp-v60/keymap.c b/keyboards/tada68/keymaps/kbp-v60/keymap.c
index 6e25107b80..f67cb89a10 100755
--- a/keyboards/tada68/keymaps/kbp-v60/keymap.c
+++ b/keyboards/tada68/keymaps/kbp-v60/keymap.c
@@ -48,6 +48,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS, \
   KC_CAPS, _______, KC_UP,   _______, KC_BSPC, KC_PSCR, KC_PGUP, KC_HOME, KC_END,  KC_PAUS, KC_UP,   _______, _______, _______, KC_END, \
   _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  KC_SCRL, KC_PGDN, KC_TLDE, KC_INS,  KC_LEFT, KC_DOWN, KC_RIGHT,         _______, KC_PSCR,\
-  _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,\
+  _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,\
   _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
 };
diff --git a/keyboards/tada68/keymaps/laas/keymap.c b/keyboards/tada68/keymaps/laas/keymap.c
index ea02d794af..fcc71021a3 100755
--- a/keyboards/tada68/keymaps/laas/keymap.c
+++ b/keyboards/tada68/keymaps/laas/keymap.c
@@ -47,6 +47,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS,
     _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,
     _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
-    _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
+    _______, _______, _______, BL_DOWN,BL_TOGG, BL_UP,  _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
     _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT),
 };
diff --git a/keyboards/tada68/keymaps/mattdicarlo/keymap.c b/keyboards/tada68/keymaps/mattdicarlo/keymap.c
index 208801a320..0cd765d2a6 100755
--- a/keyboards/tada68/keymaps/mattdicarlo/keymap.c
+++ b/keyboards/tada68/keymaps/mattdicarlo/keymap.c
@@ -19,6 +19,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_VOLU, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_MUTE, \
-  _______,          _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  BL_TOGG, _______, KC_PGUP, _______, \
+  _______,          _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, _______, KC_PGUP, _______, \
   _______, _______, KC_MRWD,                   KC_MPLY,                            KC_MFFD, _______, _______, KC_HOME, KC_PGDN, KC_END),
 };
diff --git a/keyboards/tada68/keymaps/mattgemmell/keymap.c b/keyboards/tada68/keymaps/mattgemmell/keymap.c
index 9be5db6484..705e9ce449 100644
--- a/keyboards/tada68/keymaps/mattgemmell/keymap.c
+++ b/keyboards/tada68/keymaps/mattgemmell/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_BRMU, \
     _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,          KC_BRMD, \
     _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, KC_HOME, \
-    _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_MS_U, KC_END,  \
+    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_MS_U, KC_END,  \
     _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 	),
 };
diff --git a/keyboards/tada68/keymaps/mekberg/keymap.c b/keyboards/tada68/keymaps/mekberg/keymap.c
index b1fbd309b8..663adb67c8 100755
--- a/keyboards/tada68/keymaps/mekberg/keymap.c
+++ b/keyboards/tada68/keymaps/mekberg/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS,    KC_LEFT, KC_DOWN, KC_RGHT, BL_BRTG, ______,   ______,  ______,  ______,  ______,  ______,  ______,  ______,  MY_LOCK,  KC_VOLU,
 //  |----------------------------------------------------------------------------------------------------------------------------------------------|
 //  |          |        |        |        |  Bl-   |BLtoggle | Bl+   |        |        |        |        |        |              |  Stop  | VolDn  |
-       ______,   ______,  ______,  ______, BL_DEC,  BL_TOGG, BL_INC,   ______,  ______,  ______,  ______,  ______,    ______,    KC_MSTP,  KC_VOLD,
+       ______,   ______,  ______,  ______, BL_DOWN, BL_TOGG, BL_UP,    ______,  ______,  ______,  ______,  ______,    ______,    KC_MSTP,  KC_VOLD,
 //  |----------------------------------------------------------------------------------------------------------------------------------------------|
 //  |          |          |          |                        Sleep                          |        |        |        |  Prev  |  Play  |  Fwd   |
       ______,    ______,    ______,                          KC_SLEP,                           ______,  ______,  XXXXXX, MY_PREV, MY_PLAY, MY_NEXT
diff --git a/keyboards/tada68/keymaps/mlechner/keymap.c b/keyboards/tada68/keymaps/mlechner/keymap.c
index 710ff9dcbe..72b7dc5ec6 100755
--- a/keyboards/tada68/keymaps/mlechner/keymap.c
+++ b/keyboards/tada68/keymaps/mlechner/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
   _______,_______,_______,_______,_______, _______,_______,MAC_UE,_______,MAC_OE,_______,_______,_______, _______,KC_HOME, \
   _______,MAC_AE , MAC_SS,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_END, \
-  _______  ,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
+  _______  ,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R)
 };
 
diff --git a/keyboards/tada68/keymaps/onelivesleft/keymap.c b/keyboards/tada68/keymaps/onelivesleft/keymap.c
index f99bff3137..c81fbe54b1 100644
--- a/keyboards/tada68/keymaps/onelivesleft/keymap.c
+++ b/keyboards/tada68/keymaps/onelivesleft/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,  \
     _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,          KC_BRK,  \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_GRV,  _______, _______, KC_PGUP, \
-    _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BTN2, KC_MS_U, KC_PGDN, \
+    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BTN2, KC_MS_U, KC_PGDN, \
     _______, _______, _______,                   _______,                            _______, _______, KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R
 	),
 };
diff --git a/keyboards/tada68/keymaps/pascamel/keymap.c b/keyboards/tada68/keymaps/pascamel/keymap.c
index 8bc118279c..75ae17de67 100755
--- a/keyboards/tada68/keymaps/pascamel/keymap.c
+++ b/keyboards/tada68/keymaps/pascamel/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_ansi(
   KC_TILDE,KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
-  _______,_______, KC_UP,_______,_______, _______,_______,_______, BL_DEC, BL_TOGG,BL_INC, _______,_______, _______,KC_HOME, \
+  _______,_______, KC_UP,_______,_______, _______,_______,_______, BL_DOWN,BL_TOGG,BL_UP,  _______,_______, _______,KC_HOME, \
   _______,KC_LEFT, KC_DOWN, KC_RIGHT, _______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
   _______,KC_MRWD, KC_MPLY, KC_MFFD, _______,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_BTN1, KC_MS_U, KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
diff --git a/keyboards/tada68/keymaps/peippo/keymap.c b/keyboards/tada68/keymaps/peippo/keymap.c
index 8db2839336..e5dee25306 100644
--- a/keyboards/tada68/keymaps/peippo/keymap.c
+++ b/keyboards/tada68/keymaps/peippo/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_ESC,  _______, _______,    _______, _______, _______, _______, _______, RALT(KC_8), RALT(KC_9), _______, _______, _______, KC_DEL,   AG_SWAP,
 		_______, _______, _______,    _______, _______, _______, _______, KC_PGUP, KC_UP,      KC_PGDN,    _______, _______, _______,           _______,
 		_______, _______, SGUI(KC_5), KC_F11,  _______, _______, _______, KC_LEFT, KC_DOWN,    KC_RGHT,    _______, _______, _______, _______,  KC_VOLU,
-		KC_LSFT, _______, _______,    _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______,    _______,    _______, _______, KC_RSFT, KC_MPLY,  KC_VOLD,
+		KC_LSFT, _______, _______,    _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______,    _______,    _______, _______, KC_RSFT, KC_MPLY,  KC_VOLD,
 		_______, _______, _______,                      _______,                               _______,    _______, _______, KC_MRWD, KC_MUTE,  KC_MFFD
 	),
 
diff --git a/keyboards/tada68/keymaps/raylas/keymap.c b/keyboards/tada68/keymaps/raylas/keymap.c
index 12ecaed31d..17cf539a1a 100755
--- a/keyboards/tada68/keymaps/raylas/keymap.c
+++ b/keyboards/tada68/keymaps/raylas/keymap.c
@@ -45,6 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILDE,KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
 };
diff --git a/keyboards/tada68/keymaps/rbong/keymap.c b/keyboards/tada68/keymaps/rbong/keymap.c
index 03b27fd594..33c8d2be10 100644
--- a/keyboards/tada68/keymaps/rbong/keymap.c
+++ b/keyboards/tada68/keymaps/rbong/keymap.c
@@ -63,6 +63,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______ ,_______,_______,_______, _______,KC_HOME, \
   _______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,  KC_UP,KC_RIGHT,_______,_______,        _______,KC_END, \
-  _______,_______,BL_BRTG,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE ,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
+  _______,_______,BL_BRTG,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE ,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______ ,_______,KC_MS_L,KC_MS_D, KC_MS_R),
 };
diff --git a/keyboards/tada68/keymaps/rgb/keymap.c b/keyboards/tada68/keymaps/rgb/keymap.c
index 572ec36009..530374cf76 100755
--- a/keyboards/tada68/keymaps/rgb/keymap.c
+++ b/keyboards/tada68/keymaps/rgb/keymap.c
@@ -45,6 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
   _______,_______,KC_UP,_______,_______,  RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, _______,KC_HOME, \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
 };
diff --git a/keyboards/tada68/keymaps/rys/keymap.c b/keyboards/tada68/keymaps/rys/keymap.c
index 118c30c4e7..ab5136dc20 100644
--- a/keyboards/tada68/keymaps/rys/keymap.c
+++ b/keyboards/tada68/keymaps/rys/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, PSTOKEN, \
     _______, KC_BTN1, KC_UP,   KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME, \
-    _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  QSTOKEN, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_MS_U, KC_END,  \
+    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   QSTOKEN, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_MS_U, KC_END,  \
     _______, _______, _______,                   QK_BOOT,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 	),
 };
diff --git a/keyboards/tada68/keymaps/shalzz/keymap.c b/keyboards/tada68/keymaps/shalzz/keymap.c
index ff31abec11..ac3c330c6f 100644
--- a/keyboards/tada68/keymaps/shalzz/keymap.c
+++ b/keyboards/tada68/keymaps/shalzz/keymap.c
@@ -48,6 +48,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_INS, \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RGHT,_______,_______,        _______,KC_HOME, \
-  KC_LPRN,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_RPRN, _______, KC_END, \
+  KC_LPRN,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_RPRN, _______, KC_END, \
   _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
 };
diff --git a/keyboards/tada68/keymaps/sm0g/keymap.c b/keyboards/tada68/keymaps/sm0g/keymap.c
index 0517e799b9..f7d1c6ba69 100644
--- a/keyboards/tada68/keymaps/sm0g/keymap.c
+++ b/keyboards/tada68/keymaps/sm0g/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TG(_GM), KC_INS ,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
   KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, BL_BRTG,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  BL_BRTG,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MPRV,KC_MPLY, KC_MNXT),
 
 [_GM] = LAYOUT_ansi(
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TG(_GM), KC_INS ,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
   KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, BL_BRTG,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  BL_BRTG,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MPRV,KC_MPLY, KC_MNXT),
 
 };
diff --git a/keyboards/tada68/keymaps/stephengrier/keymap.c b/keyboards/tada68/keymaps/stephengrier/keymap.c
index b3bf7875ef..b6e803d789 100755
--- a/keyboards/tada68/keymaps/stephengrier/keymap.c
+++ b/keyboards/tada68/keymaps/stephengrier/keymap.c
@@ -45,6 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______, KC_UP,_______,_______,_______,_______, _______,KC_HOME, \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,        _______,KC_END, \
-  _______,_______,BL_BRTG,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
+  _______,_______,BL_BRTG,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
 };
diff --git a/keyboards/tada68/keymaps/tokyovigilante/keymap.c b/keyboards/tada68/keymaps/tokyovigilante/keymap.c
index 3bf18d357b..80caaa4429 100644
--- a/keyboards/tada68/keymaps/tokyovigilante/keymap.c
+++ b/keyboards/tada68/keymaps/tokyovigilante/keymap.c
@@ -2,6 +2,6 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ansi(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-	[1] = LAYOUT_ansi(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R),
+	[1] = LAYOUT_ansi(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R),
 	[2] = LAYOUT_ansi(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
 };
diff --git a/keyboards/tada68/keymaps/tokyovigilante/layers.json b/keyboards/tada68/keymaps/tokyovigilante/layers.json
index e3d20aed88..67c5be5624 100644
--- a/keyboards/tada68/keymaps/tokyovigilante/layers.json
+++ b/keyboards/tada68/keymaps/tokyovigilante/layers.json
@@ -1 +1 @@
-[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "MO(1)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DEC", "BL_TOGG", "BL_INC", "KC_TRNS", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_TRNS", "MO(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "QK_BOOT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "MO(1)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DOWN", "BL_TOGG", "BL_UP", "KC_TRNS", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_TRNS", "MO(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "QK_BOOT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/trashcat/keymap.c b/keyboards/tada68/keymaps/trashcat/keymap.c
index 473df9770a..6f5f85aa53 100644
--- a/keyboards/tada68/keymaps/trashcat/keymap.c
+++ b/keyboards/tada68/keymaps/trashcat/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS ,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
   KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
   _______,_______,_______,                 TG(_GM),               _______,_______,_______,KC_MPRV,KC_MPLY, KC_MNXT),
 
   /* Keymap _GL: Gaming Layer. Basically makes Caps Lock behave normally. I know there is a better way to do this but copy and paste was my friend
diff --git a/keyboards/tada68/keymaps/tshack/keymap.c b/keyboards/tada68/keymaps/tshack/keymap.c
index 8051557dd0..12b2bf407f 100755
--- a/keyboards/tada68/keymaps/tshack/keymap.c
+++ b/keyboards/tada68/keymaps/tshack/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_FL] = LAYOUT_ansi(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12, KC_DEL,   _______, \
-  _______, BL_TOGG, BL_DEC,  BL_INC , _______, _______, _______, _______, _______, _______,  KC_PSCR, _______, _______, _______, _______, \
+  _______, BL_TOGG, BL_DOWN, BL_UP  , _______, _______, _______, _______, _______, _______,  KC_PSCR, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,     _______,      KC_HOME, \
   _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______, _______,     KC_PGUP,      KC_END , \
   _______, _______, _______,                 _______,                     _______, _______,  _______, KC_HOME,     KC_PGDN,      KC_END ),
diff --git a/keyboards/tada68/keymaps/unix/keymap.c b/keyboards/tada68/keymaps/unix/keymap.c
index e0581b4d3a..a48a3edaaa 100644
--- a/keyboards/tada68/keymaps/unix/keymap.c
+++ b/keyboards/tada68/keymaps/unix/keymap.c
@@ -50,6 +50,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______ ,  \
   _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_INS, \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RGHT,_______,_______,        _______,KC_HOME, \
-  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______, _______, KC_END, \
+  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______, _______, KC_END, \
   _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
 };
diff --git a/keyboards/tada68/keymaps/via/keymap.c b/keyboards/tada68/keymaps/via/keymap.c
index 34de6073e3..1cb087447e 100755
--- a/keyboards/tada68/keymaps/via/keymap.c
+++ b/keyboards/tada68/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
         _______, _______, _______,                            _______,                   _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
     ),
 
diff --git a/keyboards/tada68/keymaps/wamsm_tada/keymap.c b/keyboards/tada68/keymaps/wamsm_tada/keymap.c
index 8972e39a9e..9062aa11ab 100755
--- a/keyboards/tada68/keymaps/wamsm_tada/keymap.c
+++ b/keyboards/tada68/keymaps/wamsm_tada/keymap.c
@@ -45,6 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,  \
   _______,_______,KC_UP,_______,_______, _______,_______,_______,KC_UP,_______,_______,_______,_______, _______,KC_INS , \
   _______,KC_LEFT,KC_DOWN,KC_RIGHT,KC_MPLY,_______,_______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,        _______,KC_HOME, \
-  _______,KC_VOLD, KC_VOLU, KC_MUTE, _______,_______, _______,  _______,BL_DEC, BL_INC, BL_TOGG,KC_CAPS,_______,KC_END, \
+  _______,KC_VOLD, KC_VOLU, KC_MUTE, _______,_______, _______,  _______,BL_DOWN,BL_UP,  BL_TOGG,KC_CAPS,_______,KC_END, \
   _______,_______,_______,                 _______,               _______,_______,_______,KC_MRWD, KC_MPLY, KC_MFFD),
 };
diff --git a/keyboards/team0110/p1800fl/keymaps/default/keymap.c b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
index ce1f4a5eff..cdea2218aa 100644
--- a/keyboards/team0110/p1800fl/keymaps/default/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,           KC_F1,    KC_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_PSCR, KC_SCRL, KC_PAUS, _______,
         _______,          RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,                   KC_INS, KC_HOME, KC_PGUP, _______,
         _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDN, _______,
-        _______, _______, BL_TOGG,  BL_BRTG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
+        _______, _______, BL_TOGG,  BL_BRTG, BL_UP,  BL_DOWN,_______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
         _______,          _______,  _______,                   _______,             _______, _______, _______,                               _______, KC_VOLD, _______,   _______, _______, _______ 
     ),
 };
diff --git a/keyboards/team0110/p1800fl/keymaps/via/keymap.c b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
index 7aed3c918c..fffa38b15b 100644
--- a/keyboards/team0110/p1800fl/keymaps/via/keymap.c
+++ b/keyboards/team0110/p1800fl/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,           KC_F1,    KC_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_PSCR, KC_SCRL, KC_PAUS, _______,
         _______,          RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,                   KC_INS, KC_HOME, KC_PGUP, _______,
         _______,          RGB_MOD,  RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                 KC_DEL, KC_END, KC_PGDN, _______,
-        _______, _______, BL_TOGG,  BL_BRTG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
+        _______, _______, BL_TOGG,  BL_BRTG, BL_UP,  BL_DOWN,_______, _______, _______, _______, _______, _______,     KC_MUTE,                     KC_VOLU,   _______, _______, _______, _______,
         _______,          _______,  _______,                   _______,             _______, _______, _______,                               _______, KC_VOLD, _______,   _______, _______, _______ 
     ),
     [2] = LAYOUT(
diff --git a/keyboards/tgr/910/keymaps/default/keymap.c b/keyboards/tgr/910/keymaps/default/keymap.c
index e15423eb9c..6871f6c47e 100644
--- a/keyboards/tgr/910/keymaps/default/keymap.c
+++ b/keyboards/tgr/910/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_ansi_split_bs(
         KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSLS,  KC_DEL,
-        BL_TOGG, BL_STEP,  BL_INC,  BL_DEC,  QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+        BL_TOGG, BL_STEP,  BL_UP,   BL_DOWN, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
         KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS,  KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/tgr/910/keymaps/via/keymap.c b/keyboards/tgr/910/keymaps/via/keymap.c
index b5adb55f41..42dad2bbb6 100644
--- a/keyboards/tgr/910/keymaps/via/keymap.c
+++ b/keyboards/tgr/910/keymaps/via/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_ansi_split_bs(
         KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSLS, KC_TRNS,
-        BL_TOGG, BL_STEP,  BL_INC,  BL_DEC,  QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
+        BL_TOGG, BL_STEP,  BL_UP,   BL_DOWN, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
         KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS,  KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
index 828c82673e..cbfe46d780 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       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_DEC, BL_INC, 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, \
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
index 11105dd945..2bdf303e9f 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
@@ -25,5 +25,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR,   KC_TRNS, 
 	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,  KC_PIPE, 
 	KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, 
-	BL_TOGG,  BL_DEC,    BL_INC,    KC_TRNS,            KC_TRNS,        KC_TRNS,             KC_TRNS,       QK_BOOT)
+	BL_TOGG,  BL_DOWN,   BL_UP,     KC_TRNS,            KC_TRNS,        KC_TRNS,             KC_TRNS,       QK_BOOT)
 };
diff --git a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c b/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
index de9082918c..18d9edb850 100644
--- a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
+++ b/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_all(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
+    BL_UP,    VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_DOWN,  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
   )
diff --git a/keyboards/tmo50/keymaps/default/keymap.c b/keyboards/tmo50/keymaps/default/keymap.c
index 1486bf82cc..1a1778356d 100644
--- a/keyboards/tmo50/keymaps/default/keymap.c
+++ b/keyboards/tmo50/keymaps/default/keymap.c
@@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Fn3 layer
   [3] = LAYOUT_all(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/tmo50/keymaps/olivia/keymap.c b/keyboards/tmo50/keymaps/olivia/keymap.c
index 897ab54a2b..f7a094060d 100644
--- a/keyboards/tmo50/keymaps/olivia/keymap.c
+++ b/keyboards/tmo50/keymaps/olivia/keymap.c
@@ -46,8 +46,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Fn3 layer
   [3] = LAYOUT_all(
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/tmo50/keymaps/via/keymap.c b/keyboards/tmo50/keymaps/via/keymap.c
index 1486bf82cc..1a1778356d 100644
--- a/keyboards/tmo50/keymaps/via/keymap.c
+++ b/keyboards/tmo50/keymaps/via/keymap.c
@@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Fn3 layer
   [3] = LAYOUT_all(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/tmo50/keymaps/xerpocalypse/keymap.c b/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
index 50abdcd00b..53070fcb0b 100644
--- a/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
+++ b/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
@@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Fn3 layer
   [3] = LAYOUT_all(
         QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DEC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, 		  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/tr60w/keymaps/default/keymap.c b/keyboards/tr60w/keymaps/default/keymap.c
index ecfb9126bc..4f81df09ce 100644
--- a/keyboards/tr60w/keymaps/default/keymap.c
+++ b/keyboards/tr60w/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_UP,   _______, KC_DEL,
         _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_LEFT, KC_RGHT,          _______,
-        _______,          _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, KC_DOWN, _______, _______,
+        _______,          _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, KC_DOWN, _______, _______,
         _______, _______, _______,                                _______,                                 _______, _______, _______
     )
 };
diff --git a/keyboards/tzarc/djinn/keymaps/default/keymap.c b/keyboards/tzarc/djinn/keymaps/default/keymap.c
index 926c728b2d..65b494cf32 100644
--- a/keyboards/tzarc/djinn/keymaps/default/keymap.c
+++ b/keyboards/tzarc/djinn/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,   _______, _______,                             _______, _______, _______, _______, _______, _______, _______,
                                    _______, _______,   _______, _______,                             _______, _______, _______, _______,
-                                                                      BL_DEC,                BL_INC,
+                                                                      BL_DOWN,               BL_UP, 
                                                      _______,                                               _______,
                                             _______,   _______, _______,                             _______, _______, _______,
                                                      _______,                                               _______
diff --git a/keyboards/uk78/keymaps/default/keymap.c b/keyboards/uk78/keymaps/default/keymap.c
index fa0af29bfb..7c70cc0eaa 100644
--- a/keyboards/uk78/keymaps/default/keymap.c
+++ b/keyboards/uk78/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_INS,  KC_NUM,  _______, _______, _______,
     _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  BL_INC,  _______, KC_MUTE, KC_MUTE, KC_VOLU, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DOWN, BL_UP,   _______, KC_MUTE, KC_MUTE, KC_VOLU, _______, _______, _______, _______,
     _______, _______, _______,                            BL_TOGG,                            _______, _______, _______, _______, KC_VOLD, _______, _______, _______, _______
   ),
 
diff --git a/keyboards/uk78/keymaps/rask/keymap.c b/keyboards/uk78/keymaps/rask/keymap.c
index aada1f1da7..d0abe095fe 100644
--- a/keyboards/uk78/keymaps/rask/keymap.c
+++ b/keyboards/uk78/keymaps/rask/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,          _______, _______, _______, _______, _______,
     KC_CAPS, _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  BL_INC,  KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DOWN, BL_UP,   KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_APP,  KC_APP,                             BL_TOGG,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
 
diff --git a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
index ee0c500eda..ac12ef1d15 100644
--- a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LOWER] = LAYOUT(
     QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   _______,
     BL_TOGG, AS_TOGG, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,  AS_UP,   _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
-    BL_DEC,  AS_DOWN, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+    BL_UP,   AS_UP,   _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+    BL_DOWN, AS_DOWN, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
     _______, AS_RPT,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
 
diff --git a/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
index eca781b060..6181c8657e 100644
--- a/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
@@ -202,8 +202,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RAISE] = LAYOUT(
         _______, KC_F1,   KC_F2,     KC_F3,     KC_F4,   KC_F5,   KC_F6,                           KC_F6,     KC_F7,       KC_F8,   KC_F9,   KC_F10,  KC_F11,  QK_BOOT,
-        _______, _______, _______,   _______,   _______, _______, BL_INC,                          KC_VOLU,   _______,     _______, _______, _______, _______, KC_F12,
-        _______, _______, _______,   _______,   _______, _______, BL_DEC,                          KC_VOLD,   KC_LEFT,     KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
+        _______, _______, _______,   _______,   _______, _______, BL_UP,                           KC_VOLU,   _______,     _______, _______, _______, _______, KC_F12,
+        _______, _______, _______,   _______,   _______, _______, BL_DOWN,                         KC_VOLD,   KC_LEFT,     KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
         _______, _______, _______,   _______,   _______, _______, BL_BRTG,                         KC_MUTE,   _______,     _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,
         _______, _______, _______,   _______,   _______, _______, BL_TOGG, _______,       _______, _______,   _______,     _______, _______, _______, _______, _______),
 
diff --git a/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
index a7371d47c1..1d99418a42 100644
--- a/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
@@ -115,8 +115,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12_2x2u( \
-  BL_INC, X_____X,   X_____X,   X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, \
-  BL_DEC, X_____X, X_____X,  X_____X,   X_____X,  X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, \
+  BL_UP,  X_____X,   X_____X,   X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, \
+  BL_DOWN,X_____X, X_____X,  X_____X,   X_____X,  X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, \
   BL_STEP, X_____X,  X_____X,  X_____X,  X_____X,  X_____X, X_____X,  KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, X_____X, \
   BL_TOGG, TO(_MOUSE), _______, _______, _______,                 _______, _______, _______, TO(_QWERTY), X_____X \
 ),
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
index a6b57aa8fe..37aa2e1d64 100644
--- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
+++ b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	       KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL, \
 	       KC_TRNS,   KC_TRNS,  KC_UP,    RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS, \
 	       KC_TRNS,   KC_LEFT,  KC_DOWN,  KC_RIGHT, RGB_HUD, RGB_SAD, RGB_VAD,   KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          KC_TRNS,          \
-	       KC_TRNS,   BL_INC,  BL_STEP,  BL_DEC,  KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           QK_BOOT,  \
+	       KC_TRNS,   BL_UP,   BL_STEP,  BL_DOWN, KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           QK_BOOT,  \
 	       KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  AG_SWAP, KC_TRNS, KC_TRNS),
 
 /*
diff --git a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
index d8a236221c..0b3b2b2644 100644
--- a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	       KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  X_____X, KC_DEL, \
 	       X_____X,   X_____X,  KC_UP,    RGB_TOG,  IND_BRI,  X_____X,  X_____X,   X_____X, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    X_____X,          KC_INS, \
 	       X_____X,   KC_LEFT,  KC_DOWN,  KC_RIGHT, IND_DIM,  X_____X,  X_____X,   X_____X, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          FIREY_RETURN,          \
-	       _______,   X_____X,  BL_INC,   BL_STEP,  BL_DEC,   X_____X,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN, _______, X_____X,  \
+	       _______,   X_____X,  BL_UP,    BL_STEP,  BL_DOWN,  X_____X,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN, _______, X_____X,  \
 	       _______,   _______,  _______,            X_____X,                                                           _______,  _______, X_____X, _______
     ),
 
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
index de1c8c6450..cb38f7d58d 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_F1] = LAYOUT_ansi( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,       _______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	_______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	_______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,             _______,  	 	_______, _______, _______, _______,
   _______,      _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______,  	_______, _______, _______, _______,
   _______, _______,_______,                _______,                        _______,_______,_______,              _______,_______,_______,    _______, _______, _______),
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
index 0dac87536a..4a85f9a5f2 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_F1] = LAYOUT_iso( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    			_______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    			_______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,  	 	_______, _______, _______, _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______,  	_______, _______, _______, _______,
   _______, _______,_______,                _______,                        _______,_______,_______,              _______,_______,_______,	_______, _______, _______),
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c
index bf8baab4c8..88900fd61b 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_F1] = LAYOUT_all( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, KC_DEL , _______,       _______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
   _______, _______,_______,                    _______,_______,_______,        _______,_______,_______,          _______,_______,_______,    _______, _______, _______),
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
index b73d6f8fd5..0ffcc2c1bd 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_F1] = LAYOUT_all( /* Function Layer */
   QK_BOOT,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,  	 	    _______, _______, _______, _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______,  _______, _______, _______, _______,
   _______, _______,_______,          _______,_______,_______,                  _______,_______,_______,           _______,_______,_______,	 _______, _______, _______),
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
index 0ae4c5710a..2aa63a234c 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_F1] = LAYOUT_all( /* Function Layer */
   QK_BOOT, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,       _______, _______, _______, _______,
-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
   _______, _______,_______,                    _______,_______,_______,        _______,_______,_______,          _______,_______,_______,    _______, _______, _______),
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c
index 03e01ba0c9..e5442352c5 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [1] = LAYOUT_all(
   QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,  	          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS,                  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/winkeyless/bface/keymaps/default/keymap.c b/keyboards/winkeyless/bface/keymaps/default/keymap.c
index a3e9bc9577..32b5ce8c6e 100644
--- a/keyboards/winkeyless/bface/keymaps/default/keymap.c
+++ b/keyboards/winkeyless/bface/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_60_ansi(
         KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_INC, BL_DEC, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_UP,  BL_DOWN,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,RGB_MOD,KC_TRNS,BL_ON,  BL_OFF, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
     ),
diff --git a/keyboards/winkeyless/bface/keymaps/via/keymap.c b/keyboards/winkeyless/bface/keymaps/via/keymap.c
index 1d472e0556..088f3145d5 100644
--- a/keyboards/winkeyless/bface/keymaps/via/keymap.c
+++ b/keyboards/winkeyless/bface/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_60_ansi(
         KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_INC, BL_DEC, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_UP,  BL_DOWN,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,RGB_MOD,KC_TRNS,BL_ON,  BL_OFF, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
     ),
diff --git a/keyboards/wolf/sabre/keymaps/default/keymap.c b/keyboards/wolf/sabre/keymaps/default/keymap.c
index b9f378097c..f4711d3a69 100644
--- a/keyboards/wolf/sabre/keymaps/default/keymap.c
+++ b/keyboards/wolf/sabre/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   BL_TOGG, BL_DEC, BL_BRTG
+        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,                   BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   BL_TOGG, BL_DOWN,BL_BRTG
     )
 };
diff --git a/keyboards/wolf/sabre/keymaps/via/keymap.c b/keyboards/wolf/sabre/keymaps/via/keymap.c
index bc134b7c46..8b301e90e5 100644
--- a/keyboards/wolf/sabre/keymaps/via/keymap.c
+++ b/keyboards/wolf/sabre/keymaps/via/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   BL_INC,
-        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   BL_TOGG, BL_DEC, BL_BRTG
+        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,                   BL_UP, 
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   BL_TOGG, BL_DOWN,BL_BRTG
     ),
 
     [_LAYER2] = LAYOUT(
diff --git a/keyboards/wolf/ts60/keymaps/default/keymap.c b/keyboards/wolf/ts60/keymaps/default/keymap.c
index 9a93f6e28c..1c66528252 100644
--- a/keyboards/wolf/ts60/keymaps/default/keymap.c
+++ b/keyboards/wolf/ts60/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     )
 };
diff --git a/keyboards/wolf/ts60/keymaps/via/keymap.c b/keyboards/wolf/ts60/keymaps/via/keymap.c
index 80c36169ee..927d08c60f 100644
--- a/keyboards/wolf/ts60/keymaps/via/keymap.c
+++ b/keyboards/wolf/ts60/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV ,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     ),
 
diff --git a/keyboards/woodkeys/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c
index 44229c1b11..af3dca37a8 100644
--- a/keyboards/woodkeys/meira/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/default/keymap.c
@@ -290,7 +290,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
             break;
 #endif
-            //    case BL_INC:
+            //    case BL_UP:
             //    		meira_inc_backlight_level();
             //    	      return false;
             //    		break;
diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
index 00ca6a9db9..1a752abed1 100644
--- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
@@ -221,7 +221,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return false;
         break;
 #endif
-//    case BL_INC:
+//    case BL_UP:
 //    		meira_inc_backlight_level();
 //    	      return false;
 //    		break;
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
index 506d979793..172da72c36 100644
--- a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 1: Function Layer
   LAYOUT_all(
-    KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  BL_DEC,   BL_INC,  KC_F13,   KC_F14,    \
+    KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  BL_DOWN,  BL_UP,   KC_F13,   KC_F14,    \
     KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,    \
     KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,    \
     KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),     \
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 2: Cool Layer
   LAYOUT_all(
-    QK_BOOT, BL_DEC,   BL_INC,  BL_ON,   BL_OFF, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_MODE_PLAIN, KC_TRNS,    \
+    QK_BOOT, BL_DOWN,  BL_UP,   BL_ON,   BL_OFF, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_MODE_PLAIN, KC_TRNS,    \
     KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,       \
     KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,       \
     KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),       \
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
index 1ad1d63f04..c19a90abf8 100755
--- a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	
 	[2] = LAYOUT_all(
 		KC_NO, KC_NO,   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, QK_BOOT,
-		KC_NO, BL_TOGG, BL_STEP, BL_ON,    BL_OFF,   BL_INC,   BL_DEC,  BL_BRTG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
+		KC_NO, BL_TOGG, BL_STEP, BL_ON,    BL_OFF,   BL_UP,    BL_DOWN, BL_BRTG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
 		KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI,  RGB_HUD,  RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_NO, KC_NO,
 		KC_NO, RGB_M_P, RGB_M_B, RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_TRNS,
 		KC_NO, KC_NO,   KC_NO,                                KC_NO,                               KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO)
diff --git a/keyboards/xiudi/xd60/keymaps/iso/keymap.c b/keyboards/xiudi/xd60/keymaps/iso/keymap.c
index 155ba64e18..d4ec91919e 100644
--- a/keyboards/xiudi/xd60/keymaps/iso/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //,: Function Layer
     [_FL] = LAYOUT_60_iso(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, BL_DEC,  BL_INC,
+        XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP, 
         XXXXXXX, KC_MPLY, KC_MSTP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT,
         KC_LSFT, RGB_TOG, RGB_MOD, KC_CUT,  KC_COPY, KC_PSTE, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,          KC_RSFT,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
diff --git a/keyboards/xiudi/xd68/keymaps/default/keymap.c b/keyboards/xiudi/xd68/keymaps/default/keymap.c
index 8a450c97c2..bc8484e7f9 100644
--- a/keyboards/xiudi/xd68/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd68/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_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,
         QK_BOOT,   _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        RGB_HUI,          RGB_SAI, RGB_VAI, RGB_MOD, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
+        RGB_HUI,          RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
         RGB_HUD, RGB_SAD, RGB_VAD,                            RGB_TOG,                   _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
     ),
 };
diff --git a/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
index 3e13ddc7f7..2c9cce92d1 100644
--- a/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
+++ b/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_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,
         QK_BOOT,   _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
+        RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
         RGB_HUD, RGB_SAD, RGB_VAD,                            RGB_TOG,                   _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
     )
 };
diff --git a/keyboards/xiudi/xd68/keymaps/via/keymap.c b/keyboards/xiudi/xd68/keymaps/via/keymap.c
index f18bcce017..5dd09992bd 100644
--- a/keyboards/xiudi/xd68/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd68/keymaps/via/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_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,
         QK_BOOT,   _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        RGB_HUI, _______, RGB_SAI, RGB_VAI, RGB_MOD, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
+        RGB_HUI, _______, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
         RGB_HUD, RGB_SAD, RGB_VAD,                            RGB_TOG,                   _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
     )
 };
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
index 097294e3cc..2654efdbe7 100644
--- a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
    KC_SCRL, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
    KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______,
-   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   _______,KC_WH_U, KC_MS_U, KC_WH_D,
+   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_UP,   BL_DOWN,  _______,KC_WH_U, KC_MS_U, KC_WH_D,
    QK_BOOT, DF(_QW), DF(_EASY_QW), _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 	 ),
  [_CURSOR] = LAYOUT(
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
index 673dbc474d..130907f841 100644
--- a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_LOWER] = LAYOUT_ortho_5x15(
-    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DEC  , BL_INC  , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DOWN , BL_UP   , _______ , _______ , _______ , _______ , _______ , _______,
     _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , BL_STEP , RGB_TOG , RGB_MOD , _______ , _______ , _______ , _______ , _______ , _______,
     _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , RGB_HUI , RGB_HUD , RGB_SAI , _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______,
     _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______,
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_LINVERT] = LAYOUT_ortho_5x15(
-    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DEC  , BL_INC  , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DOWN , BL_UP   , _______ , _______ , _______ , _______ , _______ , _______,
     _______ , _______ , _______ , _______ , _______ , _______ , BL_STEP , RGB_TOG , RGB_MOD , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______,
     _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______ , RGB_SAI , RGB_HUI , RGB_HUD , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______,
     _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______,
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/readme.md b/keyboards/xiudi/xd75/keymaps/bramver/readme.md
index 2dcac5f0e3..a8ef38703b 100644
--- a/keyboards/xiudi/xd75/keymaps/bramver/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/bramver/readme.md
@@ -14,14 +14,14 @@ _BASE
   |    LCTL | MO(4)   |    LALT |    LGUI |    SPC  |    SPC  |   MO(1) |    DEL  |   MO(2) |   SPC   |    LEFT |    DOWN |    UP   |    RGHT |    RGUI |
 
 _LOWER
-  | _______ | _______ | _______ | _______ | _______ | _______ | BL_TOGG | BL_DEC  | BL_INC  | _______ | _______ | _______ | _______ | _______ | _______ |
+  | _______ | _______ | _______ | _______ | _______ | _______ | BL_TOGG | BL_DOWN | BL_UP   | _______ | _______ | _______ | _______ | _______ | _______ |
   | _______ |    WH_L |    BTN1 |    MS_U |    BTN2 |    WH_U | BL_STEP | RGB_TOG | RGB_MOD | _______ | _______ | _______ | _______ | _______ | _______ |
   | _______ |    WH_R |    MS_L |    MS_D |    MS_R |    WH_D | RGB_HUI | RGB_HUD | RGB_SAI | _______ |    LEFT |    DOWN |    UP   |    RGHT | _______ |
   | _______ | _______ | _______ | _______ | _______ | _______ | RGB_SAD | RGB_VAI | RGB_VAD | _______ | _______ | _______ | _______ | _______ | _______ |
   | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
 
 _LINVERT
-  | _______ | _______ | _______ | _______ | _______ | _______ | BL_TOGG | BL_DEC  | BL_INC  | _______ | _______ | _______ | _______ | _______ | _______ |
+  | _______ | _______ | _______ | _______ | _______ | _______ | BL_TOGG | BL_DOWN | BL_UP   | _______ | _______ | _______ | _______ | _______ | _______ |
   | _______ | _______ | _______ | _______ | _______ | _______ | BL_STEP | RGB_TOG | RGB_MOD |    WH_U |    BTN1 |    MS_U |    BTN2 |    WH_L | _______ |
   | _______ |    LEFT |    DOWN |    UP   |    RGHT | _______ | RGB_SAI | RGB_HUI | RGB_HUD |    WH_D |    MS_L |    MS_D |    MS_R |    WH_R | _______ |
   | _______ | _______ | _______ | _______ | _______ | _______ | RGB_SAD | RGB_VAI | RGB_VAD | _______ | _______ | _______ | _______ | _______ | _______ |
diff --git a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
index c263d569da..64add732ad 100644
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
@@ -91,8 +91,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FS] = LAYOUT_ortho_5x15( /* FUNCTION */
         _______, RGB_VAI, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
-        RGB_HUI, RGB_VAD, BL_INC,  _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
-        RGB_HUD, RGB_RMOD,BL_DEC,  KC_VOLU, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, QK_BOOT,
+        RGB_HUI, RGB_VAD, BL_UP,   _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        RGB_HUD, RGB_RMOD,BL_DOWN, KC_VOLU, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, QK_BOOT,
         RGB_SAI, RGB_MOD, BL_STEP, KC_VOLD, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
         RGB_SAD, RGB_TOG, BL_TOGG, KC_MUTE, _______, _______, _______, _______, _______, TO(_FN), TO(_QW), KC_P0,   KC_PDOT, KC_DOT,  _______
     )
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
index 1295d52665..f2d483fff4 100644
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
@@ -40,9 +40,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * | XXXXXXX| F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | _______| _______|
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P7     | P8     | P9     | +      | P*     | XXXXXXX| PR SCR | SCR LK | PAUSE  | XXXXXXX| BL_DEC | BL_INC | RGB HD | RGB HI |
+ * | _______| P7     | P8     | P9     | +      | P*     | XXXXXXX| PR SCR | SCR LK | PAUSE  | XXXXXXX| BL_DOWN| BL_UP  | RGB HD | RGB HI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P4     | P5     | P6     | NumLk  | CALC   | XXXXXXX| POWER  | XXXXXXX| QK_BOOT  | XXXXXXX| BL_BRTG| BL_STEP| RGB SD | RGB SI |
+ * | _______| P4     | P5     | P6     | NumLk  | CALC   | XXXXXXX| POWER  | XXXXXXX| QK_BOOT| XXXXXXX| BL_BRTG| BL_STEP| RGB SD | RGB SI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | _______| P1     | P2     | P3     | -      | P/     | XXXXXXX| OS     |  PLAY  | PREV   | NXT    | BL_OFF | BL_ON  | RGB VD | RGB VI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
     XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-    _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PAST, XXXXXXX, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI,
+    _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PAST, XXXXXXX, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   RGB_HUD, RGB_HUI,
     _______, KC_P4,   KC_P5,   KC_P6,   KC_NUM,  KC_CALC, XXXXXXX, KC_PWR,  XXXXXXX, QK_BOOT, XXXXXXX, BL_BRTG, BL_STEP, RGB_SAD, RGB_SAI,
     _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, KC_PSLS, XXXXXXX, KC_LWIN, KC_MPLY, KC_MPRV, KC_MNXT, BL_OFF,  BL_ON,   RGB_VAD, RGB_VAI,
     _______, KC_P0,   KC_PDOT, KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD
@@ -100,14 +100,14 @@ void led_set_user(uint8_t usb_led) {
 // Runs whenever there is a layer state change.
 layer_state_t layer_state_set_user(layer_state_t state) {
   uint8_t layer = get_highest_layer(state);
-    
+
   gp100_led_off();
   //gp103_led_off();
-  
+
   // turns on gp100 (top left led) for odd layers
   if (layer & (1<<0)) gp100_led_on();
   // turns on gp103 (top mid led) for layers 2, 6, ...
   //if (layer & (1<<1)) gp103_led_on();
-  
+
   return state;
 }
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md b/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
index 17232175e3..efa4e6bde1 100644
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
@@ -27,7 +27,7 @@
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * | XXXXXXX| F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | _______| _______|
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P7     | P8     | P9     | +      | P*     | XXXXXXX| PR SCR | SCR LK | PAUSE  | XXXXXXX| BL_DEC | BL_INC | RGB HD | RGB HI |
+ * | _______| P7     | P8     | P9     | +      | P*     | XXXXXXX| PR SCR | SCR LK | PAUSE  | XXXXXXX| BL_DOWN| BL_UP  | RGB HD | RGB HI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | _______| P4     | P5     | P6     | NumLk  | CALC   | XXXXXXX| POWER  | XXXXXXX| RESET  | XXXXXXX| BL_BRTG| BL_STEP| RGB SD | RGB SI |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -51,4 +51,4 @@ $ cd qmk_firmware
 build
 ```
 $ make xiudi/xd75:buzzlighter1
-```
\ No newline at end of file
+```
diff --git a/keyboards/xiudi/xd75/keymaps/french/keymap.c b/keyboards/xiudi/xd75/keymaps/french/keymap.c
index 42dfa076dc..fb6b1a2c78 100644
--- a/keyboards/xiudi/xd75/keymaps/french/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/french/keymap.c
@@ -48,8 +48,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
   FR_EMPT,	FR_F1,		FR_F2,		FR_F3,		FR_F4,		FR_F5,		FR_F6,  	FR_F7,		FR_F8,    	FR_F9,		FR_F10, 	FR_F11,  	FR_F12,   	FR_PSCR,	BL_TOGG,
-  FR_EMPT,	FR_MPRV,	FR_MPLY,	FR_MNXT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_NUML,  	FR_7,     	FR_8,   	FR_9,    	FR_MULT,  	FR_EMPT,	BL_INC,
-  FR_EMPT,	FR_MVDN,	FR_MUTE,	FR_MVUP,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_4,     	FR_5,   	FR_6,    	FR_MOIN,  	FR_EMPT,	BL_DEC,
+  FR_EMPT,	FR_MPRV,	FR_MPLY,	FR_MNXT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_NUML,  	FR_7,     	FR_8,   	FR_9,    	FR_MULT,  	FR_EMPT,	BL_UP, 
+  FR_EMPT,	FR_MVDN,	FR_MUTE,	FR_MVUP,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_4,     	FR_5,   	FR_6,    	FR_MOIN,  	FR_EMPT,	BL_DOWN,
   FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_1,     	FR_2,   	FR_3,    	FR_PLUS,  	FR_EMPT,	BL_ON,
   QK_BOOT,	FR_EMPT,	FR_EMPT,	FR_TRANS,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_EMPT,  	FR_0,   	FR_DOT,  	FR_ENTK,  	FR_EMPT,	BL_STEP
  )
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
index 6d7b52439d..fbb0ecdc8a 100644
--- a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
@@ -273,7 +273,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_LY2] = LAYOUT_ortho_5x15(
     KC_MPRV, KC_MNXT, KC_NO, KC_NO, KC_NO, BL_ON, BL_OFF, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO, DF(_LY1),
     KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, BL_TOGG, BL_STEP, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_M_P, RGB_M_B,
-    KC_MPLY, KC_MSTP, KC_MUTE, KC_NO, KC_NO, BL_DEC, BL_INC, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, RGB_M_R, RGB_M_SW,
+    KC_MPLY, KC_MSTP, KC_MUTE, KC_NO, KC_NO, BL_DOWN,BL_UP,  KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, RGB_M_R, RGB_M_SW,
     KC_MRWD, KC_MFFD, KC_NO, KC_NO, KC_NO, BL_BRTG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_VAI, RGB_M_SN, RGB_M_K,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, RGB_SPD, RGB_SPI, RGB_M_X, RGB_M_G
     )
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
index d14cd084e1..dd7a5802f4 100644
--- a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
@@ -87,8 +87,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_RS] = LAYOUT_ortho_5x15( /* RAISED */
   _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_INC, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_UP,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN,_______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
  ),
 
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
index 7b73348f39..3e49a0d7a4 100644
--- a/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
@@ -87,8 +87,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_RS] = LAYOUT_ortho_5x15( /* RAISED */
   _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_INC, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_UP,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN,_______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
  ),
 
diff --git a/keyboards/xiudi/xd75/keymaps/msiu/keymap.c b/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
index 62931ba088..4c10e46599 100644
--- a/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* FUNCTION */
 
  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______,
+  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, KC_PSCR, _______,
   _______, _______, _______, TO(_DV), TO(_QW), _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
index d7f8b044e3..2cc3f5b7a3 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
@@ -155,7 +155,7 @@ LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,_______
      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
      KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_HUD ,RGB_HUI ,RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI,
      ________,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_TOG ,RGB_RMOD,RGB_MOD ,___XX___,___XX___,___XX___,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,BL_TOGG ,BL_DEC  ,BL_INC  ,BL_BRTG ,___XX___,___XX___,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,BL_TOGG ,BL_DOWN ,BL_UP   ,BL_BRTG ,___XX___,___XX___,
      ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
   )
 };
diff --git a/keyboards/xiudi/xd75/keymaps/xo/keymap.c b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
index 29fe0a3703..ca3d4cff54 100644
--- a/keyboards/xiudi/xd75/keymaps/xo/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_DEC, BL_INC, BL_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, BL_DOWN,BL_UP,  BL_TOGG,
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_TOG)
 };
 
diff --git a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
index c940a8c4b9..219961e434 100755
--- a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
@@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_tkl_ansi(
       QK_BOOT,          EE_CLR,  DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_TOGG, BL_INC,
-      KC_TRNS, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DEC,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_TOGG, BL_UP, 
+      KC_TRNS, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DOWN,
       KC_TRNS, KC_TRNS, RGB_VAD, RGB_RMOD,RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,           KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS   )
diff --git a/keyboards/ymdk/bface/keymaps/default/keymap.c b/keyboards/ymdk/bface/keymaps/default/keymap.c
index 97c80cfce7..4ec9125996 100644
--- a/keyboards/ymdk/bface/keymaps/default/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,   KC_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_PGUP,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGDN, KC_END,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS, BL_DEC,BL_TOGG, BL_INC,KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS, BL_DOWN,BL_TOGG, BL_UP, KC_MPLY,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
     ),
     //CAPS LOCK layer
diff --git a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
index 6ca644e460..e5eff6ee9d 100644
--- a/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
     _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, KC_TAB,
     BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, KC_TAB,
-    _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
     _______, _______, _______,                            KC_PLAY,                            _______, KC_REC,  KC_DONE, _______, _______, _______, _______, _______, _______),
 };
 
diff --git a/keyboards/ymdk/melody96/keymaps/default/keymap.c b/keyboards/ymdk/melody96/keymaps/default/keymap.c
index 5149a6fb00..cc5a7cc0e5 100644
--- a/keyboards/ymdk/melody96/keymaps/default/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
         BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
index 55cbcf333a..6e4af827d6 100644
--- a/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______, _______, _______, _______, _______,
         BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+        _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
index c0f6d88663..b0f01eead6 100644
--- a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
     KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
     BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CM_TOGG, BL_TOGG, BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CM_TOGG, BL_TOGG, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END,  KC_TRNS, KC_TRNS, KC_MUTE),
 
 	[2] = LAYOUT(
diff --git a/keyboards/ymdk/melody96/keymaps/via/keymap.c b/keyboards/ymdk/melody96/keymaps/via/keymap.c
index b31473f1a7..897d86acb7 100644
--- a/keyboards/ymdk/melody96/keymaps/via/keymap.c
+++ b/keyboards/ymdk/melody96/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
         BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
     [2] = LAYOUT_all(
diff --git a/keyboards/ymdk/np21/keymaps/default/keymap.c b/keyboards/ymdk/np21/keymaps/default/keymap.c
index 926bd22d84..140489f903 100644
--- a/keyboards/ymdk/np21/keymaps/default/keymap.c
+++ b/keyboards/ymdk/np21/keymaps/default/keymap.c
@@ -18,9 +18,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_ortho_6x4(
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, BL_ON,   _______, BL_INC,
-        _______, BL_TOGG, _______, BL_INC,
-        _______, BL_OFF,  _______, BL_DEC,
-        BL_BRTG, _______, _______, BL_DEC
+        _______, BL_ON,   _______, BL_UP, 
+        _______, BL_TOGG, _______, BL_UP, 
+        _______, BL_OFF,  _______, BL_DOWN,
+        BL_BRTG, _______, _______, BL_DOWN
     )
 };
diff --git a/keyboards/ymdk/np21/keymaps/via/keymap.c b/keyboards/ymdk/np21/keymaps/via/keymap.c
index 207d6ad83e..1b306798ce 100644
--- a/keyboards/ymdk/np21/keymaps/via/keymap.c
+++ b/keyboards/ymdk/np21/keymaps/via/keymap.c
@@ -28,10 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_ortho_6x4(
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, BL_ON,   _______, BL_INC,
-        _______, BL_TOGG, _______, BL_INC,
-        _______, BL_OFF,  _______, BL_DEC,
-        BL_BRTG, _______, _______, BL_DEC
+        _______, BL_ON,   _______, BL_UP, 
+        _______, BL_TOGG, _______, BL_UP, 
+        _______, BL_OFF,  _______, BL_DOWN,
+        BL_BRTG, _______, _______, BL_DOWN
     ),
     [2] = LAYOUT_ortho_6x4(
         _______, _______, _______, _______,
diff --git a/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c b/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c
index 90168720ad..4996eaafe3 100644
--- a/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c
+++ b/keyboards/ymdk/np24/u4rgb6/keymaps/default/keymap.c
@@ -33,10 +33,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [L_BL] = LAYOUT_ortho_6x4(
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, BL_ON,   _______, BL_INC,
-        _______, BL_TOGG, _______, BL_INC,
-        _______, BL_OFF,  _______, BL_DEC,
-        BL_BRTG, _______, _______, BL_DEC
+        _______, BL_ON,   _______, BL_UP, 
+        _______, BL_TOGG, _______, BL_UP, 
+        _______, BL_OFF,  _______, BL_DOWN,
+        BL_BRTG, _______, _______, BL_DOWN
     ),
     [L_RGB] = LAYOUT_ortho_6x4(
         _______, _______, _______, _______,
diff --git a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
index 62eda15d26..a943e5800e 100644
--- a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_all(
         QK_BOOT, KC_F1,   KC_F2,     KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_PSCR, KC_SCRL, KC_PAUS,  KC_GRV,
-        _______, BL_TOGG, BL_DEC,   BL_INC, BL_BRTG, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,
+        _______, BL_TOGG, BL_DOWN,  BL_UP,  BL_BRTG, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, MO(2),   _______, KC_PGUP, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______,  KC_END, KC_PGDN, KC_HOME
     ),
diff --git a/keyboards/ymdk/yd60mq/keymaps/default/keymap.c b/keyboards/ymdk/yd60mq/keymaps/default/keymap.c
index b124da8a74..f9403fb0b9 100644
--- a/keyboards/ymdk/yd60mq/keymaps/default/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
         _______, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/ymdk/yd60mq/keymaps/via/keymap.c b/keyboards/ymdk/yd60mq/keymaps/via/keymap.c
index 043bb2809e..44b1eb5e65 100644
--- a/keyboards/ymdk/yd60mq/keymaps/via/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
         KC_TRNS, RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_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, BL_DEC,  BL_TOGG, BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
diff --git a/keyboards/ymdk/ym68/keymaps/default/keymap.c b/keyboards/ymdk/ym68/keymaps/default/keymap.c
index e4b9b11dbb..c0304d3145 100644
--- a/keyboards/ymdk/ym68/keymaps/default/keymap.c
+++ b/keyboards/ymdk/ym68/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_PSCR,
         RGB_TOG,     _______, KC_UP,   _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______,      KC_HOME,
         BL_TOGG,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,             KC_END,
-        _______,   _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,        _______, _______,
+        _______,   _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,        _______, _______,
         _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c b/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c
index e0f8c00026..82f8b5ac48 100644
--- a/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c
+++ b/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_ortho_4x12(
         QK_BOOT,   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG,
         _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-        _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______,
+        _______, BL_TOGG, BL_DOWN, BL_UP,   BL_BRTG, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c b/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c
index 82daae4080..2b9bca4bed 100644
--- a/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c
+++ b/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [3] = LAYOUT_ortho_4x12(
         QK_BOOT,   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG,
         _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
-        _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______,
+        _______, BL_TOGG, BL_DOWN, BL_UP,   BL_BRTG, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/ymdk/ymd67/keymaps/default/keymap.c b/keyboards/ymdk/ymd67/keymaps/default/keymap.c
index 11cb55598e..0bad7902d5 100644
--- a/keyboards/ymdk/ymd67/keymaps/default/keymap.c
+++ b/keyboards/ymdk/ymd67/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [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_DEL, 
                KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
                KC_TRNS, KC_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, BL_DEC, BL_TOGG, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+               KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 
 };
diff --git a/keyboards/ymdk/ymd75/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/keymaps/default/keymap.c
index 2b64124681..e51f88bb43 100644
--- a/keyboards/ymdk/ymd75/keymaps/default/keymap.c
+++ b/keyboards/ymdk/ymd75/keymaps/default/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FN] = LAYOUT(
         RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        BL_TOGG,  BL_INC,   BL_DEC,   P_MACRO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        BL_TOGG,  BL_UP,    BL_DOWN,  P_MACRO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
         BL_STEP,  KC_TRNS,  KC_TRNS,  KC_TRNS  ,KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,       KC_TRNS,                 KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,
diff --git a/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
index d712373feb..5041b72b9f 100644
--- a/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
+++ b/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
 		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   _______,
 	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
-		 _______,    _______,  _______,  _______,  BL_DEC,   BL_INC,   BL_STEP,  BL_TOGG,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
+		 _______,    _______,  _______,  _______,  BL_DOWN,  BL_UP,    BL_STEP,  BL_TOGG,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
 	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
 		 _______,    _______,    _______,                                _______,                            _______,  _______,  _______,  _______,  _______,  _______
 	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
index 7c9b4f59e4..b8bee255e2 100644
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Layer 1, raise layer */ 
 	[_RAISE] = LAYOUT_iso(
 		_______,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,   KC_F24,  _______, KC_PAUS, KC_SCRL, _______, _______, _______,  \
-		_______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, BL_OFF,  BL_ON,   BL_DEC,   BL_INC,       _______,     _______, _______, _______, _______,  \
+		_______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, BL_OFF,  BL_ON,   BL_DOWN,  BL_UP,        _______,     _______, _______, _______, _______,  \
 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,  RGB_VAI,      KC_MUTE,     _______, KC_VOLU, _______, _______,  \
 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,  BL_TOGG,                   KC_MPRV, KC_MPLY, KC_MNXT, _______,  \
 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, QK_LOCK,  \
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
index 4e53b2cbe3..16d8f08137 100644
--- a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
+++ b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/ 
 	[_RAISE] = LAYOUT(
 			QK_BOOT,RGB_TOG,  BL_TOGG,  BL_STEP,    ______,  ______,  ______,  ______,  ______,  ______,  ______, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
-			______,  BL_INC,  BL_DEC,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
+			______,  BL_UP,   BL_DOWN, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
 			______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_F22,  KC_F23,  KC_F24,  ______,  ______,  ______,  ______,  ______, \
 			______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_MODE_FORWARD	,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
 			______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  ______,  ______,  ______,  ______,  KC_VOLD,KC_VOLU, KC_MUTE,      KC_MPLY,  ______,  ______,  ______,  ______, \
diff --git a/keyboards/zj68/keymaps/default/keymap.c b/keyboards/zj68/keymaps/default/keymap.c
index 55bdd970a0..18c4a7e732 100644
--- a/keyboards/zj68/keymaps/default/keymap.c
+++ b/keyboards/zj68/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_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,   QK_BOOT,   KC_PSCR,
         RGB_TOG, _______, KC_UP,   _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
         BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, KC_END,
-        _______, _______, _______, BL_DEC,  BL_INC,  BL_STEP, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,
+        _______, _______, _______, BL_DOWN, BL_UP,   BL_STEP, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
index eeb2c55d15..a375de5233 100644
--- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
+++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FL] = 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,  \
-	BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+	BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
     RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,          \
     VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                   \
     _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
index e3f06e03be..c9266cc3d1 100644
--- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
         _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
-        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
-        _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_UP,    _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
+        _______,  _______,  _______,  KC_MUTE,  _______,  BL_DOWN,  _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,  _______,  _______
     ),
     // clang-format on
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index 3b80fa4acf..0228534b99 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_FL] = LAYOUT_60_ansi_split_bs_rshift(
     KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL, \
-  	BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,        \
+  	BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,        \
     RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,                 \
     VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,                 \
     _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
index 96bb4ef205..11518c97cb 100644
--- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
@@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
         _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
-        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
-        _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_UP,    _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
+        _______,  _______,  _______,  KC_MUTE,  _______,  BL_DOWN,  _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,            _______
     ),
     // clang-format on
diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
index 155c51dbe5..4e54ba444c 100644
--- a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
@@ -53,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN1] = LAYOUT_60_tsangan_hhkb( \
     QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
-    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, BL_INC,  _______, _______, _______, _______, _______, _______, KC_UP,   MC_MSSN, KC_DEL,  \
-    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  _______, _______, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_RGHT,          KC_MPLY, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, BL_UP,   _______, _______, _______, _______, _______, _______, KC_UP,   MC_MSSN, KC_DEL,  \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DOWN, _______, _______, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_RGHT,          KC_MPLY, \
     _______,          RGB_LYR, RGB_THM, BL_TOGG, _______, QK_BOOT, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_DOWN, PGU_SFT, _______, \
     _______, _______, _______,                            _______,                                     HOM_CMD, PGD_OPT, END_CTL  \
 )
diff --git a/layouts/community/65_ansi_blocker/stanrc85/keymap.c b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
index a9132fcb40..3938f93a4c 100644
--- a/layouts/community/65_ansi_blocker/stanrc85/keymap.c
+++ b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
@@ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_65_ansi_blocker(
     RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_SAD, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, BL_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, BL_INC,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,          BL_DEC,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, BL_UP, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,          BL_DOWN,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______, _______, _______,                            _______,                   TG(_DEFAULT), _______,     _______, _______, _______
   )
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
index 586d0a822f..e7c93cb3fc 100644
--- a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
+++ b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FL] = LAYOUT_75_ansi(\
         _______,   RGB_M_P,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI,  _______, _______, _______, _______, _______, _______, _______, _______,
         VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
         _______, _______,  _______,          MO(_CL),            _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
diff --git a/layouts/community/75_ansi/yanfali/keymap.c b/layouts/community/75_ansi/yanfali/keymap.c
index a1893a9798..7d95d49fd8 100644
--- a/layouts/community/75_ansi/yanfali/keymap.c
+++ b/layouts/community/75_ansi/yanfali/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [FN] = LAYOUT_75_ansi(\
         _______,   RGB_M_P,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, _______, _______,
         _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT, _______,
+        BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, _______,  _______,  _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT, _______,
         RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI,  _______, _______, _______, _______, _______, _______, _______, _______,
         VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,  RGB_SPD,  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PGUP, _______,
         _______, _______,  _______,          _______,            _______, _______, _______, KC_HOME, KC_PGDN, KC_END)
diff --git a/layouts/community/alice/stanrc85-alice/keymap.c b/layouts/community/alice/stanrc85-alice/keymap.c
index 07e056deda..b8bcfbdd5e 100644
--- a/layouts/community/alice/stanrc85-alice/keymap.c
+++ b/layouts/community/alice/stanrc85-alice/keymap.c
@@ -44,8 +44,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_alice(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______,          _______,
-    BL_INC,   VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
+    BL_UP,    VK_TOGG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+    BL_DOWN,  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)
   )
diff --git a/layouts/community/ergodox/333fred/keymap.c b/layouts/community/ergodox/333fred/keymap.c
index 01fcf8916c..e374ef442f 100644
--- a/layouts/community/ergodox/333fred/keymap.c
+++ b/layouts/community/ergodox/333fred/keymap.c
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,                                         _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, KC_BTN1, KC_BTN2,                                                           _______, _______, _______, _______, _______,
-                                                             BL_INC,  BL_DEC,      KC_VOLU, _______,
+                                                             BL_UP,   BL_DOWN,     KC_VOLU, _______,
                                                                       BL_TOGG,     KC_VOLD,
                                                     _______, _______, _______,     KC_MPRV, KC_MPLY, KC_MNXT
 ),
diff --git a/layouts/community/ortho_4x12/greatwizard/keymap.c b/layouts/community/ortho_4x12/greatwizard/keymap.c
index b63afe4424..eaf920fe7a 100644
--- a/layouts/community/ortho_4x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_4x12/greatwizard/keymap.c
@@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_LYR,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_HUI, RGB_MOD,
-        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG
+        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_BRTG
     ),
 
    /* GIT
diff --git a/layouts/community/ortho_4x12/mindsound/keymap.c b/layouts/community/ortho_4x12/mindsound/keymap.c
index a4205fe92d..3dded1480b 100644
--- a/layouts/community/ortho_4x12/mindsound/keymap.c
+++ b/layouts/community/ortho_4x12/mindsound/keymap.c
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,                  \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,                 \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, BL_TOGG, BL_DEC,  BL_INC,  BL_FLICKER,                 \
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, BL_TOGG, BL_DOWN, BL_UP,   BL_FLICKER,                 \
   _______, _______, _______, _______, _______, _______, _______, _______, CLICKY_TOGGLE, CLICKY_DOWN, CLICKY_UP, CLICKY_RESET \
 ),
 
diff --git a/layouts/community/ortho_5x12/greatwizard/keymap.c b/layouts/community/ortho_5x12/greatwizard/keymap.c
index 1125f5e316..ba1e9374ec 100644
--- a/layouts/community/ortho_5x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_5x12/greatwizard/keymap.c
@@ -316,7 +316,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_LYR,
         _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_HUI, RGB_MOD,
-        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_BRTG
+        _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_BRTG
     ),
 
    /* GIT
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index ec07648ab5..db4d373234 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -614,13 +614,13 @@ enum qk_keycode_defines {
     QK_MACRO_29 = 0x771D,
     QK_MACRO_30 = 0x771E,
     QK_MACRO_31 = 0x771F,
-    BL_ON = 0x7800,
-    BL_OFF = 0x7801,
-    BL_DEC = 0x7802,
-    BL_INC = 0x7803,
-    BL_TOGG = 0x7804,
-    BL_STEP = 0x7805,
-    BL_BRTG = 0x7806,
+    QK_BACKLIGHT_ON = 0x7800,
+    QK_BACKLIGHT_OFF = 0x7801,
+    QK_BACKLIGHT_TOGGLE = 0x7802,
+    QK_BACKLIGHT_DOWN = 0x7803,
+    QK_BACKLIGHT_UP = 0x7804,
+    QK_BACKLIGHT_STEP = 0x7805,
+    QK_BACKLIGHT_TOGGLE_BREATHING = 0x7806,
     RGB_TOG = 0x7820,
     RGB_MODE_FORWARD = 0x7821,
     RGB_MODE_REVERSE = 0x7822,
@@ -1039,6 +1039,13 @@ enum qk_keycode_defines {
     MC_29      = QK_MACRO_29,
     MC_30      = QK_MACRO_30,
     MC_31      = QK_MACRO_31,
+    BL_ON      = QK_BACKLIGHT_ON,
+    BL_OFF     = QK_BACKLIGHT_OFF,
+    BL_TOGG    = QK_BACKLIGHT_TOGGLE,
+    BL_DOWN    = QK_BACKLIGHT_DOWN,
+    BL_UP      = QK_BACKLIGHT_UP,
+    BL_STEP    = QK_BACKLIGHT_STEP,
+    BL_BRTG    = QK_BACKLIGHT_TOGGLE_BREATHING,
     RGB_MOD    = RGB_MODE_FORWARD,
     RGB_RMOD   = RGB_MODE_REVERSE,
     RGB_M_P    = RGB_MODE_PLAIN,
@@ -1151,7 +1158,7 @@ enum qk_keycode_defines {
 #define IS_AUDIO_KEYCODE(code) ((code) >= QK_AUDIO_ON && (code) <= QK_AUDIO_VOICE_PREVIOUS)
 #define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX)
 #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31)
-#define IS_BACKLIGHT_KEYCODE(code) ((code) >= BL_ON && (code) <= BL_BRTG)
+#define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING)
 #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
 #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE)
 
diff --git a/quantum/process_keycode/process_backlight.c b/quantum/process_keycode/process_backlight.c
index 8b70339a55..c1596ec07d 100644
--- a/quantum/process_keycode/process_backlight.c
+++ b/quantum/process_keycode/process_backlight.c
@@ -26,45 +26,45 @@ bool process_backlight(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
 #ifdef LED_MATRIX_ENABLE
-            case BL_ON:
+            case QK_BACKLIGHT_ON:
                 led_matrix_enable();
                 return false;
-            case BL_OFF:
+            case QK_BACKLIGHT_OFF:
                 led_matrix_disable();
                 return false;
-            case BL_DEC:
+            case QK_BACKLIGHT_DOWN:
                 led_matrix_decrease_val();
                 return false;
-            case BL_INC:
+            case QK_BACKLIGHT_UP:
                 led_matrix_increase_val();
                 return false;
-            case BL_TOGG:
+            case QK_BACKLIGHT_TOGGLE:
                 led_matrix_toggle();
                 return false;
-            case BL_STEP:
+            case QK_BACKLIGHT_STEP:
                 led_matrix_step();
                 return false;
 #else
-            case BL_ON:
+            case QK_BACKLIGHT_ON:
                 backlight_level(BACKLIGHT_LEVELS);
                 return false;
-            case BL_OFF:
+            case QK_BACKLIGHT_OFF:
                 backlight_level(0);
                 return false;
-            case BL_DEC:
+            case QK_BACKLIGHT_DOWN:
                 backlight_decrease();
                 return false;
-            case BL_INC:
+            case QK_BACKLIGHT_UP:
                 backlight_increase();
                 return false;
-            case BL_TOGG:
+            case QK_BACKLIGHT_TOGGLE:
                 backlight_toggle();
                 return false;
-            case BL_STEP:
+            case QK_BACKLIGHT_STEP:
                 backlight_step();
                 return false;
 #    ifdef BACKLIGHT_BREATHING
-            case BL_BRTG:
+            case QK_BACKLIGHT_TOGGLE_BREATHING:
                 backlight_toggle_breathing();
                 return false;
 #    endif
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 44044ec625..e2133513bd 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -123,6 +123,9 @@
 #define KC_RAPC QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE
 #define KC_SFTENT QK_SPACE_CADET_RIGHT_SHIFT_ENTER
 
+#define BL_DEC QK_BACKLIGHT_DOWN
+#define BL_INC QK_BACKLIGHT_UP
+
 #define AU_TOG QK_AUDIO_TOGGLE
 #define CLICKY_TOGGLE QK_AUDIO_CLICKY_TOGGLE
 #define CLICKY_ENABLE QK_AUDIO_CLICKY_ON
diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h
index 34544b0260..ca1dc8352e 100644
--- a/users/dshields/dshields.h
+++ b/users/dshields/dshields.h
@@ -38,8 +38,8 @@
     #define LGT_TOG BL_TOGG
     #define LGT_MOD BL_STEP
     #define LGT_BRT BL_BRTG
-    #define LGT_INC BL_INC
-    #define LGT_DEC BL_DEC
+    #define LGT_INC BL_UP
+    #define LGT_DEC BL_DOWN
 #endif
 #ifdef KEYBOARD_planck_rev6
     #define LGT_TOG _______
diff --git a/users/rs/rs.h b/users/rs/rs.h
index fde8c33558..d19b887f48 100644
--- a/users/rs/rs.h
+++ b/users/rs/rs.h
@@ -31,8 +31,8 @@ enum custom_keycodes {
 #define KC_CTRA LCTL(KC_A)
 #define KC_CTRE LCTL(KC_E)
 #define KC_BLTG BL_TOGG
-#define KC_BLUP BL_INC
-#define KC_BLDN BL_DEC
+#define KC_BLUP BL_UP
+#define KC_BLDN BL_DOWN
 #define KC_BLBR BL_BRTG
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h
index 2aea1a31e7..3c5901de41 100644
--- a/users/wanleg/wanleg.h
+++ b/users/wanleg/wanleg.h
@@ -317,6 +317,6 @@ enum {
  * |  UG_hue-   | UG_hue+   |  UG_sat-  |  UG_sat+  |             |             |     |     |     |QWERTY|
  * '-----------------------------------------------------------------------------------------------------'
  */
-#define _______________Gherkin_FN_0________________			BL_BRTG, BL_DEC,  BL_INC,  BL_TOGG, BL_STEP, BL_ON,   _______, _______, _______, _______
+#define _______________Gherkin_FN_0________________			BL_BRTG, BL_DOWN, BL_UP,   BL_TOGG, BL_STEP, BL_ON,   _______, _______, _______, _______
 #define _______________Gherkin_FN_1________________			RGB_M_B, RGB_VAD, RGB_VAI, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______
 #define _______________Gherkin_FN_2________________			RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, QWERTY

From 5f9b7c035bdbbbfccfcf2bbfed7d153f5043fdce Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 7 Nov 2022 05:42:59 +1100
Subject: [PATCH 803/959] `handwired/swiftrax/walter`: fix layout mismatch
 (#18974)

* `handwired/swiftrax/walter`: fix layout mismatch

* Undo K4A removal, fix info.json instead
---
 keyboards/handwired/swiftrax/walter/info.json |  52 ++++-----
 keyboards/handwired/swiftrax/walter/walter.h  | 107 +++++++++---------
 2 files changed, 78 insertions(+), 81 deletions(-)

diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index 72f3ce4f40..5de2a6f5c7 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -77,11 +77,12 @@
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
                 {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"label": "r5_05", "x": 10, "y": 4},
+                {"label": "r5_06", "x": 11, "y": 4},
+                {"label": "r5_07", "x": 12, "y": 4},
+                {"label": "r4_08", "x": 13, "y": 4},
+                {"label": "r4_09", "x": 14, "y": 4},
+                {"label": "r4_10", "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
@@ -115,8 +116,7 @@
                 {"label": "r2_11", "x": 10.5, "y": 1},
                 {"label": "r2_12", "x": 11.5, "y": 1},
                 {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"label": "r2_14", "x": 15, "y": 1},
 
                 {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
                 {"label": "r3_02", "x": 1.75, "y": 2},
@@ -134,7 +134,6 @@
                 {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
                 {"label": "r3_15", "x": 15, "y": 2},
 
-
                 {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
                 {"label": "r4_02", "x": 1.25, "y": 3},
                 {"label": "r4_03", "x": 2.25, "y": 3},
@@ -155,11 +154,12 @@
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
                 {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"label": "r5_05", "x": 10, "y": 4},
+                {"label": "r5_06", "x": 11, "y": 4},
+                {"label": "r5_07", "x": 12, "y": 4},
+                {"label": "r4_08", "x": 13, "y": 4},
+                {"label": "r4_09", "x": 14, "y": 4},
+                {"label": "r4_10", "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_splitbs": {
@@ -231,11 +231,12 @@
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
                 {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"label": "r5_05", "x": 10, "y": 4},
+                {"label": "r5_06", "x": 11, "y": 4},
+                {"label": "r5_07", "x": 12, "y": 4},
+                {"label": "r4_08", "x": 13, "y": 4},
+                {"label": "r4_09", "x": 14, "y": 4},
+                {"label": "r4_10", "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_splitbs": {
@@ -270,8 +271,7 @@
                 {"label": "r2_11", "x": 10.5, "y": 1},
                 {"label": "r2_12", "x": 11.5, "y": 1},
                 {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"label": "r2_14", "x": 15, "y": 1},
 
                 {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
                 {"label": "r3_02", "x": 1.75, "y": 2},
@@ -289,7 +289,6 @@
                 {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
                 {"label": "r3_15", "x": 15, "y": 2},
 
-
                 {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
                 {"label": "r4_02", "x": 1.25, "y": 3},
                 {"label": "r4_03", "x": 2.25, "y": 3},
@@ -310,11 +309,12 @@
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
                 {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"label": "r5_05", "x": 10, "y": 4},
+                {"label": "r5_06", "x": 11, "y": 4},
+                {"label": "r5_07", "x": 12, "y": 4},
+                {"label": "r4_08", "x": 13, "y": 4},
+                {"label": "r4_09", "x": 14, "y": 4},
+                {"label": "r4_10", "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/walter/walter.h b/keyboards/handwired/swiftrax/walter/walter.h
index e761797866..a99e24e9a4 100644
--- a/keyboards/handwired/swiftrax/walter/walter.h
+++ b/keyboards/handwired/swiftrax/walter/walter.h
@@ -18,61 +18,58 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
+#define LAYOUT_65_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E,   K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
+    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E,   K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E,   K4F } \
+}
 
- #define LAYOUT_65_ansi( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
-  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
-  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,KC_NO,K2F }, \
-  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
-  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B,   K4C,   K4D, K4E, K4F }, \
- }
+#define LAYOUT_65_iso( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E, K4F } \
+}
+
+#define LAYOUT_65_ansi_splitbs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E, K4F } \
+}
 
- #define LAYOUT_65_iso( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   KC_NO,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,     K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C,   KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,     K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,     K4D,   K4E, K4F }, \
- }
- #define LAYOUT_65_ansi_splitbs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-     { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-     { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C, K4D,   K4E, K4F }, \
- }
 #define LAYOUT_65_iso_splitbs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,   K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C, KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,   K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E, K4F }, \
- }
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E, K4F } \
+}

From a7b2f4233ca2062037303e783ced30d9376c9443 Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Mon, 7 Nov 2022 00:39:05 +0300
Subject: [PATCH 804/959] Fix keycode parameter extraction to match the new DD
 keycodes (#18977)

* Add macros to extract parameters from keycode values

Implement both encoding and decoding for keycodes like TO(layer) or
LM(layer, mod) in one place, so that the decoding won't get out of sync
with the encoding.

While at it, fix some macros for creating keycode values that did not
apply the appropriate masks to parameters (and therefore could allow the
result to be out of range if a wrong parameter was passed).

* keymap_common: Use extraction macros for keycodes

* pointing_device_auto_mouse: Use extraction macros for keycodes

Fixes #18970.

* process_autocorrect: Use extraction macros for keycodes

* process_caps_word: Use extraction macros for keycodes

(Also fix a minor bug - SH_TG was not handled properly)

* process_leader: Use extraction macros for keycodes

(Technically the code is not 100% correct, because it always assumes
that the LT() or MT() action was a tap, but it's a separate issue that
already existed before the keycode changes.)

* process_unicode: Use extraction macros for keycodes

* process_unicodemap: Use extraction macros for keycodes
---
 quantum/keymap_common.c                       | 28 +++++++++----------
 .../pointing_device_auto_mouse.c              | 16 +++++++----
 quantum/process_keycode/process_autocorrect.c | 17 ++++++++---
 quantum/process_keycode/process_caps_word.c   | 12 ++++----
 quantum/process_keycode/process_leader.c      |  6 ++--
 quantum/process_keycode/process_unicode.c     |  2 +-
 quantum/process_keycode/process_unicodemap.c  | 10 ++++---
 quantum/quantum_keycodes.h                    | 28 +++++++++++++++++--
 8 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index a5997711f2..c4336440f9 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -74,64 +74,64 @@ action_t action_for_keycode(uint16_t keycode) {
         case QK_MODS ... QK_MODS_MAX:;
             // Has a modifier
             // Split it up
-            action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF); // adds modifier to key
+            action.code = ACTION_MODS_KEY(QK_MODS_GET_MODS(keycode), QK_MODS_GET_BASIC_KEYCODE(keycode)); // adds modifier to key
             break;
 #ifndef NO_ACTION_LAYER
         case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
-            action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF);
+            action.code = ACTION_LAYER_TAP_KEY(QK_LAYER_TAP_GET_LAYER(keycode), QK_LAYER_TAP_GET_TAP_KEYCODE(keycode));
             break;
         case QK_TO ... QK_TO_MAX:;
             // Layer set "GOTO"
-            action_layer = keycode & 0xFF;
+            action_layer = QK_TO_GET_LAYER(keycode);
             action.code  = ACTION_LAYER_GOTO(action_layer);
             break;
         case QK_MOMENTARY ... QK_MOMENTARY_MAX:;
             // Momentary action_layer
-            action_layer = keycode & 0xFF;
+            action_layer = QK_MOMENTARY_GET_LAYER(keycode);
             action.code  = ACTION_LAYER_MOMENTARY(action_layer);
             break;
         case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:;
             // Set default action_layer
-            action_layer = keycode & 0xFF;
+            action_layer = QK_DEF_LAYER_GET_LAYER(keycode);
             action.code  = ACTION_DEFAULT_LAYER_SET(action_layer);
             break;
         case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:;
             // Set toggle
-            action_layer = keycode & 0xFF;
+            action_layer = QK_TOGGLE_LAYER_GET_LAYER(keycode);
             action.code  = ACTION_LAYER_TOGGLE(action_layer);
             break;
 #endif
 #ifndef NO_ACTION_ONESHOT
         case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:;
             // OSL(action_layer) - One-shot action_layer
-            action_layer = keycode & 0xFF;
+            action_layer = QK_ONE_SHOT_LAYER_GET_LAYER(keycode);
             action.code  = ACTION_LAYER_ONESHOT(action_layer);
             break;
         case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:;
             // OSM(mod) - One-shot mod
-            mod         = mod_config(keycode & 0x1F);
+            mod         = mod_config(QK_ONE_SHOT_MOD_GET_MODS(keycode));
             action.code = ACTION_MODS_ONESHOT(mod);
             break;
 #endif
 #ifndef NO_ACTION_LAYER
         case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
-            action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF);
+            action.code = ACTION_LAYER_TAP_TOGGLE(QK_LAYER_TAP_TOGGLE_GET_LAYER(keycode));
             break;
         case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
-            mod          = mod_config(keycode & 0x1F);
-            action_layer = (keycode >> 5) & 0xF;
+            mod          = mod_config(QK_LAYER_MOD_GET_MODS(keycode));
+            action_layer = QK_LAYER_MOD_GET_LAYER(keycode);
             action.code  = ACTION_LAYER_MODS(action_layer, mod);
             break;
 #endif
 #ifndef NO_ACTION_TAPPING
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-            mod         = mod_config((keycode >> 0x8) & 0x1F);
-            action.code = ACTION_MODS_TAP_KEY(mod, keycode & 0xFF);
+            mod         = mod_config(QK_MOD_TAP_GET_MODS(keycode));
+            action.code = ACTION_MODS_TAP_KEY(mod, QK_MOD_TAP_GET_TAP_KEYCODE(keycode));
             break;
 #endif
 #ifdef SWAP_HANDS_ENABLE
         case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
-            action.code = ACTION(ACT_SWAP_HANDS, keycode & 0xff);
+            action.code = ACTION(ACT_SWAP_HANDS, QK_SWAP_HANDS_GET_TAP_KEYCODE(keycode));
             break;
 #endif
 
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c
index edffd44787..5e78817c7c 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.c
+++ b/quantum/pointing_device/pointing_device_auto_mouse.c
@@ -266,16 +266,20 @@ bool process_auto_mouse(uint16_t keycode, keyrecord_t* record) {
         case QK_MODS ... QK_MODS_MAX:
             break;
         // TO((AUTO_MOUSE_TARGET_LAYER))-------------------------------------------------------------------------------
-        case QK_TO ... QK_TO_MAX: // same proccessing as next
+        case QK_TO ... QK_TO_MAX:
+            if (QK_TO_GET_LAYER(keycode) == (AUTO_MOUSE_TARGET_LAYER)) {
+                if (!(record->event.pressed)) auto_mouse_toggle();
+            }
+            break;
         // TG((AUTO_MOUSE_TARGET_LAYER))-------------------------------------------------------------------------------
         case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
-            if ((keycode & 0xff) == (AUTO_MOUSE_TARGET_LAYER)) {
+            if (QK_TOGGLE_LAYER_GET_LAYER(keycode) == (AUTO_MOUSE_TARGET_LAYER)) {
                 if (!(record->event.pressed)) auto_mouse_toggle();
             }
             break;
         // MO((AUTO_MOUSE_TARGET_LAYER))-------------------------------------------------------------------------------
         case QK_MOMENTARY ... QK_MOMENTARY_MAX:
-            if ((keycode & 0xff) == (AUTO_MOUSE_TARGET_LAYER)) {
+            if (QK_MOMENTARY_GET_LAYER(keycode) == (AUTO_MOUSE_TARGET_LAYER)) {
                 auto_mouse_keyevent(record->event.pressed);
             }
         // DF ---------------------------------------------------------------------------------------------------------
@@ -288,14 +292,14 @@ bool process_auto_mouse(uint16_t keycode, keyrecord_t* record) {
             break;
         // LM((AUTO_MOUSE_TARGET_LAYER), mod)--------------------------------------------------------------------------
         case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
-            if (((keycode >> 8) & 0x0f) == (AUTO_MOUSE_TARGET_LAYER)) {
+            if (QK_LAYER_MOD_GET_LAYER(keycode) == (AUTO_MOUSE_TARGET_LAYER)) {
                 auto_mouse_keyevent(record->event.pressed);
             }
             break;
             // TT((AUTO_MOUSE_TARGET_LAYER))---------------------------------------------------------------------------
 #    ifndef NO_ACTION_TAPPING
         case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
-            if ((keycode & 0xff) == (AUTO_MOUSE_TARGET_LAYER)) {
+            if (QK_LAYER_TAP_TOGGLE_GET_LAYER(keycode) == (AUTO_MOUSE_TARGET_LAYER)) {
                 auto_mouse_keyevent(record->event.pressed);
 #        if TAPPING_TOGGLE != 0
                 if (record->tap.count == TAPPING_TOGGLE) {
@@ -312,7 +316,7 @@ bool process_auto_mouse(uint16_t keycode, keyrecord_t* record) {
         // LT((AUTO_MOUSE_TARGET_LAYER), kc)---------------------------------------------------------------------------
         case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
             if (!record->tap.count) {
-                if (((keycode >> 8) & 0x0f) == (AUTO_MOUSE_TARGET_LAYER)) {
+                if (QK_LAYER_TAP_GET_LAYER(keycode) == (AUTO_MOUSE_TARGET_LAYER)) {
                     auto_mouse_keyevent(record->event.pressed);
                 }
                 break;
diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
index e3fcbc34ae..8aeebf0e06 100644
--- a/quantum/process_keycode/process_autocorrect.c
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -91,7 +91,7 @@ __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord
             } else {
                 *mods |= MOD_RSFT;
             }
-            *keycode &= 0xFF; // Get the basic keycode.
+            *keycode = QK_MODS_GET_BASIC_KEYCODE(*keycode); // Get the basic keycode.
             return true;
 #ifndef NO_ACTION_TAPPING
         // Exclude tap-hold keys when they are held down
@@ -101,13 +101,20 @@ __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord
             // Exclude Layer Tap, if layers are disabled
             // but action tapping is still enabled.
             return false;
+#    else
+            // Exclude hold keycode
+            if (!record->tap.count) {
+                return false;
+            }
+            *keycode = QK_LAYER_TAP_GET_TAP_KEYCODE(*keycode);
+            break;
 #    endif
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
             // Exclude hold keycode
             if (!record->tap.count) {
                 return false;
             }
-            *keycode &= 0xFF;
+            *keycode = QK_MOD_TAP_GET_TAP_KEYCODE(*keycode);
             break;
 #else
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
@@ -119,10 +126,12 @@ __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord
         // and mask for base keycode when they are tapped.
         case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
 #ifdef SWAP_HANDS_ENABLE
-            if (*keycode >= 0x56F0 || !record->tap.count) {
+            // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TG, SH_TT, ...,
+            // which currently overlap the SH_T(kc) range.
+            if (IS_SWAP_HANDS_KEYCODE(*keycode) || !record->tap.count) {
                 return false;
             }
-            *keycode &= 0xFF;
+            *keycode = QK_SWAP_HANDS_GET_TAP_KEYCODE(*keycode);
             break;
 #else
             // Exclude if disabled
diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index 7a83f7bf49..4c0217eba7 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -109,7 +109,7 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
             // * Otherwise stop Caps Word.
             case QK_MOD_TAP ... QK_MOD_TAP_MAX:
                 if (record->tap.count == 0) { // Mod-tap key is held.
-                    const uint8_t mods = (keycode >> 8) & 0x1f;
+                    const uint8_t mods = QK_MOD_TAP_GET_MODS(keycode);
                     switch (mods) {
                         case MOD_LSFT:
                             keycode = KC_LSFT;
@@ -127,7 +127,7 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
                             return true;
                     }
                 } else {
-                    keycode &= 0xff;
+                    keycode = QK_MOD_TAP_GET_TAP_KEYCODE(keycode);
                 }
                 break;
 
@@ -137,16 +137,18 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
                 if (record->tap.count == 0) {
                     return true;
                 }
-                keycode &= 0xff;
+                keycode = QK_LAYER_TAP_GET_TAP_KEYCODE(keycode);
                 break;
 #endif // NO_ACTION_TAPPING
 
 #ifdef SWAP_HANDS_ENABLE
             case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
-                if (keycode > 0x56F0 || record->tap.count == 0) {
+                // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TG, SH_TT, ...,
+                // which currently overlap the SH_T(kc) range.
+                if (IS_SWAP_HANDS_KEYCODE(keycode) || record->tap.count == 0) {
                     return true;
                 }
-                keycode &= 0xff;
+                keycode = QK_SWAP_HANDS_GET_TAP_KEYCODE(keycode);
                 break;
 #endif // SWAP_HANDS_ENABLE
         }
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index 7e6f3ad73c..b74b4927a8 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -54,8 +54,10 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
 #    endif // LEADER_NO_TIMEOUT
             {
 #    ifndef LEADER_KEY_STRICT_KEY_PROCESSING
-                if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-                    keycode = keycode & 0xFF;
+                if (IS_QK_MOD_TAP(keycode)) {
+                    keycode = QK_MOD_TAP_GET_TAP_KEYCODE(keycode);
+                } else if (IS_QK_LAYER_TAP(keycode)) {
+                    keycode = QK_LAYER_TAP_GET_TAP_KEYCODE(keycode);
                 }
 #    endif // LEADER_KEY_STRICT_KEY_PROCESSING
                 if (leader_sequence_size < ARRAY_SIZE(leader_sequence)) {
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index 99cc2f5f26..1ec76245a3 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -21,7 +21,7 @@
 bool process_unicode(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         if (keycode >= QK_UNICODE && keycode <= QK_UNICODE_MAX) {
-            register_unicode(keycode & 0x7FFF);
+            register_unicode(QK_UNICODE_GET_CODE_POINT(keycode));
         }
     }
     return true;
diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index 979d773b05..195c093e6e 100644
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -24,7 +24,7 @@
 __attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
     if (keycode >= QK_UNICODEMAP_PAIR) {
         // Keycode is a pair: extract index based on Shift / Caps Lock state
-        uint16_t index = keycode - QK_UNICODEMAP_PAIR;
+        uint16_t index;
 
         uint8_t mods = get_mods() | get_weak_mods();
 #ifndef NO_ACTION_ONESHOT
@@ -34,13 +34,15 @@ __attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
         bool shift = mods & MOD_MASK_SHIFT;
         bool caps  = host_keyboard_led_state().caps_lock;
         if (shift ^ caps) {
-            index >>= 7;
+            index = QK_UNICODEMAP_PAIR_GET_SHIFTED_INDEX(keycode);
+        } else {
+            index = QK_UNICODEMAP_PAIR_GET_UNSHIFTED_INDEX(keycode);
         }
 
-        return index & 0x7F;
+        return index;
     } else {
         // Keycode is a regular index
-        return keycode - QK_UNICODEMAP;
+        return QK_UNICODEMAP_GET_INDEX(keycode);
     }
 }
 
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index ec69fadbab..6b0e890792 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -39,6 +39,10 @@
 #define QK_UNICODEMAP_PAIR_MAX 0xFFFF
 // clang-format on
 
+// Generic decoding for the whole QK_MODS range
+#define QK_MODS_GET_MODS(kc) (((kc) >> 8) & 0x1F)
+#define QK_MODS_GET_BASIC_KEYCODE(kc) ((kc)&0xFF)
+
 // Keycode modifiers & aliases
 #define LCTL(kc) (QK_LCTL | (kc))
 #define LSFT(kc) (QK_LSFT | (kc))
@@ -80,33 +84,46 @@
 
 // GOTO layer - 32 layer max
 #define TO(layer) (QK_TO | ((layer)&0x1F))
+#define QK_TO_GET_LAYER(kc) ((kc)&0x1F)
 
 // Momentary switch layer - 32 layer max
 #define MO(layer) (QK_MOMENTARY | ((layer)&0x1F))
+#define QK_MOMENTARY_GET_LAYER(kc) ((kc)&0x1F)
 
 // Set default layer - 32 layer max
 #define DF(layer) (QK_DEF_LAYER | ((layer)&0x1F))
+#define QK_DEF_LAYER_GET_LAYER(kc) ((kc)&0x1F)
 
 // Toggle to layer - 32 layer max
 #define TG(layer) (QK_TOGGLE_LAYER | ((layer)&0x1F))
+#define QK_TOGGLE_LAYER_GET_LAYER(kc) ((kc)&0x1F)
 
 // One-shot layer - 32 layer max
 #define OSL(layer) (QK_ONE_SHOT_LAYER | ((layer)&0x1F))
+#define QK_ONE_SHOT_LAYER_GET_LAYER(kc) ((kc)&0x1F)
 
 // L-ayer M-od: Momentary switch layer with modifiers active - 16 layer max
 #define LM(layer, mod) (QK_LAYER_MOD | (((layer)&0xF) << 5) | ((mod)&0x1F))
+#define QK_LAYER_MOD_GET_LAYER(kc) (((kc) >> 5) & 0xF)
+#define QK_LAYER_MOD_GET_MODS(kc) ((kc)&0x1F)
 
 // One-shot mod
 #define OSM(mod) (QK_ONE_SHOT_MOD | ((mod)&0x1F))
+#define QK_ONE_SHOT_MOD_GET_MODS(kc) ((kc)&0x1F)
 
 // Layer tap-toggle - 32 layer max
 #define TT(layer) (QK_LAYER_TAP_TOGGLE | ((layer)&0x1F))
+#define QK_LAYER_TAP_TOGGLE_GET_LAYER(kc) ((kc)&0x1F)
 
 // L-ayer, T-ap - 256 keycode max, 16 layer max
 #define LT(layer, kc) (QK_LAYER_TAP | (((layer)&0xF) << 8) | ((kc)&0xFF))
+#define QK_LAYER_TAP_GET_LAYER(kc) (((kc) >> 8) & 0xF)
+#define QK_LAYER_TAP_GET_TAP_KEYCODE(kc) ((kc)&0xFF)
 
 // M-od, T-ap - 256 keycode max
 #define MT(mod, kc) (QK_MOD_TAP | (((mod)&0x1F) << 8) | ((kc)&0xFF))
+#define QK_MOD_TAP_GET_MODS(kc) (((kc) >> 8) & 0x1F)
+#define QK_MOD_TAP_GET_TAP_KEYCODE(kc) ((kc)&0xFF)
 
 #define LCTL_T(kc) MT(MOD_LCTL, kc)
 #define RCTL_T(kc) MT(MOD_RCTL, kc)
@@ -161,12 +178,19 @@
 // Unicode aliases
 // UNICODE_ENABLE - Allows Unicode input up to 0x7FFF
 #define UC(c) (QK_UNICODE | (c))
+#define QK_UNICODE_GET_CODE_POINT(kc) ((kc)&0x7FFF)
+
 // UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map
-#define X(i) (QK_UNICODEMAP | (i))
+#define X(i) (QK_UNICODEMAP | ((i)&0x3FFF))
+#define QK_UNICODEMAP_GET_INDEX(kc) ((kc)&0x3FFF)
+
 #define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
+#define QK_UNICODEMAP_PAIR_GET_UNSHIFTED_INDEX(kc) ((kc)&0x7F)
+#define QK_UNICODEMAP_PAIR_GET_SHIFTED_INDEX(kc) (((kc) >> 7) & 0x7F)
 
 // Swap Hands
-#define SH_T(kc) (QK_SWAP_HANDS | (kc))
+#define SH_T(kc) (QK_SWAP_HANDS | ((kc)&0xFF))
+#define QK_SWAP_HANDS_GET_TAP_KEYCODE(kc) ((kc)&0xFF)
 
 // MIDI aliases
 #define MIDI_TONE_MIN MI_C

From 442e7653cc833e95a84178dedafb4034738c52a1 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 6 Nov 2022 23:48:31 +0000
Subject: [PATCH 805/959] Fix use of shifted custom keycode (#18978)

---
 keyboards/silverbullet44/keymaps/default/keymap.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c
index 56aabe54d7..e930cf9adf 100644
--- a/keyboards/silverbullet44/keymaps/default/keymap.c
+++ b/keyboards/silverbullet44/keymaps/default/keymap.c
@@ -30,7 +30,8 @@ enum layer {
 enum custom_keycodes {
   RGBRST = SAFE_RANGE,
   KC_00,
-  ALTAB
+  ALTAB,
+  SALTAB
 };
 #define CALC LT(_CALC,   KC_ESC)
 #define CUSL LT(_CURSOL, KC_TAB)
@@ -71,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_CURSOL] = LAYOUT(
   QK_BOOT ,  KC_F1,   KC_F2,      KC_PGUP, KC_F4,      KC_F5,                              KC_F6,   KC_F7,        KC_UP,   KC_F9,        KC_F10,  QK_BOOT,
   _______, KC_TILD, KC_HOME,    KC_PGDN, KC_END,     KC_LPRN,                            KC_RPRN, KC_LEFT,      KC_DOWN, KC_RGHT,      KC_PIPE, KC_F11,
-  _______, KC_GRV,  C(KC_LEFT), KC_F3,   C(KC_RGHT), S(ALTAB),                           ALTAB,   LCA(KC_LEFT), KC_F8,   LCA(KC_RGHT), KC_BSLS, RGBRST,
+  _______, KC_GRV,  C(KC_LEFT), KC_F3,   C(KC_RGHT), SALTAB,                             ALTAB,   LCA(KC_LEFT), KC_F8,   LCA(KC_RGHT), KC_BSLS, RGBRST,
                                 _______,    _______, C(KC_SPC), MO(_ADJUST),    _______, _______, _______, _______
   ),
 
@@ -163,20 +164,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
             break;
-        case S(ALTAB):
+        case SALTAB:
         case ALTAB:
             if (record->event.pressed) {
                 if (!alt_pressed) {
                     alt_pressed = true;
                     register_code(KC_LALT);
                 }
-                if (keycode == S(ALTAB)) {
+                if (keycode == SALTAB) {
                     register_code(KC_LSFT);
                 }
                 register_code(KC_TAB);
             } else {
                 unregister_code(KC_TAB);
-                if (keycode == S(ALTAB)) {
+                if (keycode == SALTAB) {
                     unregister_code(KC_LSFT);
                 }
             }

From 8b658dcc9a826b03fedb1ef2bfcc692f3e25da1b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 7 Nov 2022 13:26:15 +1100
Subject: [PATCH 806/959] Normalise MIDI keycodes (#18972)

* `MI_ON`, `MI_OFF`, `MI_TOG` -> `MI_TOGG`

* `MI_CH*`, `MI_CHU` -> `MI_CHNU`, `MI_CHD` -> `MI_CHND`

* `MI_VEL_*` -> `MI_VL*`, `MI_VELU`, `MI_VELD`

* `MI_TRNS_*` -> `MI_TR*`, `MI_TRNSU` -> `MI_TRSU`, `MI_TRNSD` -> `MI_TRSD`

* `MI_OCT_*` -> `MI_OC*`, `MI_OCTU`, `MI_OCTD`

* Misc controls

* Note keycodes

* Add legacy keycodes

* Regenerate keycodes

* Typo
---
 .../keycodes/keycodes_0.0.1_midi.hjson        | 710 +++++++++++++-----
 docs/feature_midi.md                          | 306 ++++----
 docs/keycodes.md                              | 292 +++----
 .../gherkin/keymaps/midi/keymap.c             |  42 +-
 .../bandominedoni/keymaps/default/keymap.c    |  48 +-
 keyboards/bandominedoni/keymaps/led/keymap.c  |  48 +-
 .../bandominedoni/keymaps/lednotg/keymap.c    |  48 +-
 keyboards/bandominedoni/keymaps/via/keymap.c  |  48 +-
 .../chromatonemini/keymaps/default/keymap.c   |  14 +-
 keyboards/chromatonemini/keymaps/led/keymap.c |  40 +-
 .../chromatonemini/keymaps/party/keymap.c     |  40 +-
 keyboards/chromatonemini/keymaps/via/keymap.c |  16 +-
 .../ckeys/thedora/keymaps/default/keymap.c    |   8 +-
 .../clueboard/66/keymaps/magicmonty/keymap.c  |  10 +-
 keyboards/contra/keymaps/dana/keymap.c        |   8 +-
 keyboards/gh60/satan/keymaps/midi/keymap.c    |  10 +-
 .../giabalanai/keymaps/2firmware/keymap.c     |  88 +--
 keyboards/giabalanai/keymaps/3araht/keymap.c  | 106 +--
 keyboards/giabalanai/keymaps/default/keymap.c |  24 +-
 .../keymaps/default_giabarinaix2/keymap.c     |  26 +-
 .../keymaps/giabarinaix2led/keymap.c          |  76 +-
 keyboards/giabalanai/keymaps/party/keymap.c   | 106 +--
 keyboards/giabalanai/keymaps/via/keymap.c     |  24 +-
 .../keymaps/via_giabarinaix2/keymap.c         |  26 +-
 .../keebio/nyquist/keymaps/shovelpaw/keymap.c |   8 +-
 .../bm40hsrgb/keymaps/wolff_abnt2/keymap.c    |   6 +-
 .../keymaps/cassdelacruzmunoz/keymap.c        |   6 +-
 keyboards/preonic/keymaps/mverteuil/keymap.c  |   2 +-
 .../preonic/keymaps/mverteuil_2x2u/keymap.c   |   2 +-
 keyboards/sofle/keymaps/michal/keymap.c       |  10 +-
 .../bradpad/keymaps/4brad/keymap.c            |   6 +-
 .../bradpad/keymaps/midi_demo/keymap.c        |   4 +-
 quantum/keycodes.h                            | 495 +++++++-----
 quantum/process_keycode/process_midi.c        |  48 +-
 quantum/process_keycode/process_music.c       |   6 +-
 quantum/quantum_keycodes.h                    |  20 +-
 quantum/quantum_keycodes_legacy.h             | 130 ++++
 quantum/sequencer/tests/sequencer_tests.cpp   |  22 +-
 users/muppetjones/wrappers.h                  |  24 +-
 39 files changed, 1799 insertions(+), 1154 deletions(-)

diff --git a/data/constants/keycodes/keycodes_0.0.1_midi.hjson b/data/constants/keycodes/keycodes_0.0.1_midi.hjson
index 72d6e38900..b9826f92c9 100644
--- a/data/constants/keycodes/keycodes_0.0.1_midi.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_midi.hjson
@@ -2,669 +2,1041 @@
     "keycodes": {
         "0x7100": {
             "group": "midi",
-            "key": "MI_ON"
+            "key": "QK_MIDI_ON",
+            "aliases": [
+                "MI_ON"
+            ]
         },
         "0x7101": {
             "group": "midi",
-            "key": "MI_OFF"
+            "key": "QK_MIDI_OFF",
+            "aliases": [
+                "MI_OFF"
+            ]
         },
         "0x7102": {
             "group": "midi",
-            "key": "MI_TOG"
+            "key": "QK_MIDI_TOGGLE",
+            "aliases": [
+                "MI_TOGG"
+            ]
         },
         "0x7110": {
             "group": "midi",
-            "key": "MI_C"
+            "key": "QK_MIDI_NOTE_C_0",
+            "aliases": [
+                "MI_C"
+            ]
         },
         "0x7111": {
             "group": "midi",
-            "key": "MI_Cs",
+            "key": "QK_MIDI_NOTE_C_SHARP_0",
             "aliases": [
+                "MI_Cs",
                 "MI_Db"
             ]
         },
         "0x7112": {
             "group": "midi",
-            "key": "MI_D"
+            "key": "QK_MIDI_NOTE_D_0",
+            "aliases": [
+                "MI_D"
+            ]
         },
         "0x7113": {
             "group": "midi",
-            "key": "MI_Ds",
+            "key": "QK_MIDI_NOTE_D_SHARP_0",
             "aliases": [
+                "MI_Ds",
                 "MI_Eb"
             ]
         },
         "0x7114": {
             "group": "midi",
-            "key": "MI_E"
+            "key": "QK_MIDI_NOTE_E_0",
+            "aliases": [
+                "MI_E"
+            ]
         },
         "0x7115": {
             "group": "midi",
-            "key": "MI_F"
+            "key": "QK_MIDI_NOTE_F_0",
+            "aliases": [
+                "MI_F"
+            ]
         },
         "0x7116": {
             "group": "midi",
-            "key": "MI_Fs",
+            "key": "QK_MIDI_NOTE_F_SHARP_0",
             "aliases": [
+                "MI_Fs",
                 "MI_Gb"
             ]
         },
         "0x7117": {
             "group": "midi",
-            "key": "MI_G"
+            "key": "QK_MIDI_NOTE_G_0",
+            "aliases": [
+                "MI_G"
+            ]
         },
         "0x7118": {
             "group": "midi",
-            "key": "MI_Gs",
+            "key": "QK_MIDI_NOTE_G_SHARP_0",
             "aliases": [
+                "MI_Gs"
                 "MI_Ab"
             ]
         },
         "0x7119": {
             "group": "midi",
-            "key": "MI_A"
+            "key": "QK_MIDI_NOTE_A_0",
+            "aliases": [
+                "MI_A"
+            ]
         },
         "0x711A": {
             "group": "midi",
-            "key": "MI_As",
+            "key": "QK_MIDI_NOTE_A_SHARP_0",
             "aliases": [
+                "MI_As"
                 "MI_Bb"
             ]
         },
         "0x711B": {
             "group": "midi",
-            "key": "MI_B"
+            "key": "QK_MIDI_NOTE_B_0",
+            "aliases": [
+                "MI_B"
+            ]
         },
         "0x7120": {
             "group": "midi",
-            "key": "MI_C_1"
+            "key": "QK_MIDI_NOTE_C_1",
+            "aliases": [
+                "MI_C1"
+            ]
         },
         "0x7121": {
             "group": "midi",
-            "key": "MI_Cs_1",
+            "key": "QK_MIDI_NOTE_C_SHARP_1",
             "aliases": [
-                "MI_Db_1"
+                "MI_Cs1",
+                "MI_Db1"
             ]
         },
         "0x7122": {
             "group": "midi",
-            "key": "MI_D_1"
+            "key": "QK_MIDI_NOTE_D_1",
+            "aliases": [
+                "MI_D1"
+            ]
         },
         "0x7123": {
             "group": "midi",
-            "key": "MI_Ds_1",
+            "key": "QK_MIDI_NOTE_D_SHARP_1",
             "aliases": [
-                "MI_Eb_1"
+                "MI_Ds1",
+                "MI_Eb1"
             ]
         },
         "0x7124": {
             "group": "midi",
-            "key": "MI_E_1"
+            "key": "QK_MIDI_NOTE_E_1",
+            "aliases": [
+                "MI_E1"
+            ]
         },
         "0x7125": {
             "group": "midi",
-            "key": "MI_F_1"
+            "key": "QK_MIDI_NOTE_F_1",
+            "aliases": [
+                "MI_F1"
+            ]
         },
         "0x7126": {
             "group": "midi",
-            "key": "MI_Fs_1",
+            "key": "QK_MIDI_NOTE_F_SHARP_1",
             "aliases": [
-                "MI_Gb_1"
+                "MI_Fs1",
+                "MI_Gb1"
             ]
         },
         "0x7127": {
             "group": "midi",
-            "key": "MI_G_1"
+            "key": "QK_MIDI_NOTE_G_1",
+            "aliases": [
+                "MI_G1"
+            ]
         },
         "0x7128": {
             "group": "midi",
-            "key": "MI_Gs_1",
+            "key": "QK_MIDI_NOTE_G_SHARP_1",
             "aliases": [
-                "MI_Ab_1"
+                "MI_Gs1",
+                "MI_Ab1"
             ]
         },
         "0x7129": {
             "group": "midi",
-            "key": "MI_A_1"
+            "key": "QK_MIDI_NOTE_A_1",
+            "aliases": [
+                "MI_A1"
+            ]
         },
         "0x712A": {
             "group": "midi",
-            "key": "MI_As_1",
+            "key": "QK_MIDI_NOTE_A_SHARP_1",
             "aliases": [
-                "MI_Bb_1"
+                "MI_As1",
+                "MI_Bb1"
             ]
         },
         "0x712B": {
             "group": "midi",
-            "key": "MI_B_1"
+            "key": "QK_MIDI_NOTE_B_1",
+            "aliases": [
+                "MI_B1"
+            ]
         },
         "0x7130": {
             "group": "midi",
-            "key": "MI_C_2"
+            "key": "QK_MIDI_NOTE_C_2",
+            "aliases": [
+                "MI_C2"
+            ]
         },
         "0x7131": {
             "group": "midi",
-            "key": "MI_Cs_2",
+            "key": "QK_MIDI_NOTE_C_SHARP_2",
             "aliases": [
-                "MI_Db_2"
+                "MI_Cs2",
+                "MI_Db2"
             ]
         },
         "0x7132": {
             "group": "midi",
-            "key": "MI_D_2"
+            "key": "QK_MIDI_NOTE_D_2",
+            "aliases": [
+                "MI_D2"
+            ]
         },
         "0x7133": {
             "group": "midi",
-            "key": "MI_Ds_2",
+            "key": "QK_MIDI_NOTE_D_SHARP_2",
             "aliases": [
-                "MI_Eb_2"
+                "MI_Ds2",
+                "MI_Eb2"
             ]
         },
         "0x7134": {
             "group": "midi",
-            "key": "MI_E_2"
+            "key": "QK_MIDI_NOTE_E_2",
+            "aliases": [
+                "MI_E2"
+            ]
         },
         "0x7135": {
             "group": "midi",
-            "key": "MI_F_2"
+            "key": "QK_MIDI_NOTE_F_2",
+            "aliases": [
+                "MI_F2"
+            ]
         },
         "0x7136": {
             "group": "midi",
-            "key": "MI_Fs_2",
+            "key": "QK_MIDI_NOTE_F_SHARP_2",
             "aliases": [
-                "MI_Gb_2"
+                "MI_Fs2",
+                "MI_Gb2"
             ]
         },
         "0x7137": {
             "group": "midi",
-            "key": "MI_G_2"
+            "key": "QK_MIDI_NOTE_G_2",
+            "aliases": [
+                "MI_G2"
+            ]
         },
         "0x7138": {
             "group": "midi",
-            "key": "MI_Gs_2",
+            "key": "QK_MIDI_NOTE_G_SHARP_2",
             "aliases": [
-                "MI_Ab_2"
+                "MI_Gs2",
+                "MI_Ab2"
             ]
         },
         "0x7139": {
             "group": "midi",
-            "key": "MI_A_2"
+            "key": "QK_MIDI_NOTE_A_2",
+            "aliases": [
+                "MI_A2"
+            ]
         },
         "0x713A": {
             "group": "midi",
-            "key": "MI_As_2",
+            "key": "QK_MIDI_NOTE_A_SHARP_2",
             "aliases": [
-                "MI_Bb_2"
+                "MI_As2",
+                "MI_Bb2"
             ]
         },
         "0x713B": {
             "group": "midi",
-            "key": "MI_B_2"
+            "key": "QK_MIDI_NOTE_B_2",
+            "aliases": [
+                "MI_B2"
+            ]
         },
         "0x7140": {
             "group": "midi",
-            "key": "MI_C_3"
+            "key": "QK_MIDI_NOTE_C_3",
+            "aliases": [
+                "MI_C3"
+            ]
         },
         "0x7141": {
             "group": "midi",
-            "key": "MI_Cs_3",
+            "key": "QK_MIDI_NOTE_C_SHARP_3",
             "aliases": [
-                "MI_Db_3"
+                "MI_Cs3",
+                "MI_Db3"
             ]
         },
         "0x7142": {
             "group": "midi",
-            "key": "MI_D_3"
+            "key": "QK_MIDI_NOTE_D_3",
+            "aliases": [
+                "MI_D3"
+            ]
         },
         "0x7143": {
             "group": "midi",
-            "key": "MI_Ds_3",
+            "key": "QK_MIDI_NOTE_D_SHARP_3",
             "aliases": [
-                "MI_Eb_3"
+                "MI_Ds3",
+                "MI_Eb3"
             ]
         },
         "0x7144": {
             "group": "midi",
-            "key": "MI_E_3"
+            "key": "QK_MIDI_NOTE_E_3",
+            "aliases": [
+                "MI_E3"
+            ]
         },
         "0x7145": {
             "group": "midi",
-            "key": "MI_F_3"
+            "key": "QK_MIDI_NOTE_F_3",
+            "aliases": [
+                "MI_F3"
+            ]
         },
         "0x7146": {
             "group": "midi",
-            "key": "MI_Fs_3",
+            "key": "QK_MIDI_NOTE_F_SHARP_3",
             "aliases": [
-                "MI_Gb_3"
+                "MI_Fs3",
+                "MI_Gb3"
             ]
         },
         "0x7147": {
             "group": "midi",
-            "key": "MI_G_3"
+            "key": "QK_MIDI_NOTE_G_3",
+            "aliases": [
+                "MI_G3"
+            ]
         },
         "0x7148": {
             "group": "midi",
-            "key": "MI_Gs_3",
+            "key": "QK_MIDI_NOTE_G_SHARP_3",
             "aliases": [
-                "MI_Ab_3"
+                "MI_Gs3",
+                "MI_Ab3"
             ]
         },
         "0x7149": {
             "group": "midi",
-            "key": "MI_A_3"
+            "key": "QK_MIDI_NOTE_A_3",
+            "aliases": [
+                "MI_A3"
+            ]
         },
         "0x714A": {
             "group": "midi",
-            "key": "MI_As_3",
+            "key": "QK_MIDI_NOTE_A_SHARP_3",
             "aliases": [
-                "MI_Bb_3"
+                "MI_As3",
+                "MI_Bb3"
             ]
         },
         "0x714B": {
             "group": "midi",
-            "key": "MI_B_3"
+            "key": "QK_MIDI_NOTE_B_3",
+            "aliases": [
+                "MI_B3"
+            ]
         },
         "0x7150": {
             "group": "midi",
-            "key": "MI_C_4"
+            "key": "QK_MIDI_NOTE_C_4",
+            "aliases": [
+                "MI_C4"
+            ]
         },
         "0x7151": {
             "group": "midi",
-            "key": "MI_Cs_4",
+            "key": "QK_MIDI_NOTE_C_SHARP_4",
             "aliases": [
-                "MI_Db_4"
+                "MI_Cs4",
+                "MI_Db4"
             ]
         },
         "0x7152": {
             "group": "midi",
-            "key": "MI_D_4"
+            "key": "QK_MIDI_NOTE_D_4",
+            "aliases": [
+                "MI_D4"
+            ]
         },
         "0x7153": {
             "group": "midi",
-            "key": "MI_Ds_4",
+            "key": "QK_MIDI_NOTE_D_SHARP_4",
             "aliases": [
-                "MI_Eb_4"
+                "MI_Ds4",
+                "MI_Eb4"
             ]
         },
         "0x7154": {
             "group": "midi",
-            "key": "MI_E_4"
+            "key": "QK_MIDI_NOTE_E_4",
+            "aliases": [
+                "MI_E4"
+            ]
         },
         "0x7155": {
             "group": "midi",
-            "key": "MI_F_4"
+            "key": "QK_MIDI_NOTE_F_4",
+            "aliases": [
+                "MI_F4"
+            ]
         },
         "0x7156": {
             "group": "midi",
-            "key": "MI_Fs_4",
+            "key": "QK_MIDI_NOTE_F_SHARP_4",
             "aliases": [
-                "MI_Gb_4"
+                "MI_Fs4",
+                "MI_Gb4"
             ]
         },
         "0x7157": {
             "group": "midi",
-            "key": "MI_G_4"
+            "key": "QK_MIDI_NOTE_G_4",
+            "aliases": [
+                "MI_G4"
+            ]
         },
         "0x7158": {
             "group": "midi",
-            "key": "MI_Gs_4",
+            "key": "QK_MIDI_NOTE_G_SHARP_4",
             "aliases": [
-                "MI_Ab_4"
+                "MI_Gs4",
+                "MI_Ab4"
             ]
         },
         "0x7159": {
             "group": "midi",
-            "key": "MI_A_4"
+            "key": "QK_MIDI_NOTE_A_4",
+            "aliases": [
+                "MI_A4"
+            ]
         },
         "0x715A": {
             "group": "midi",
-            "key": "MI_As_4",
+            "key": "QK_MIDI_NOTE_A_SHARP_4",
             "aliases": [
-                "MI_Bb_4"
+                "MI_As4",
+                "MI_Bb4"
             ]
         },
         "0x715B": {
             "group": "midi",
-            "key": "MI_B_4"
+            "key": "QK_MIDI_NOTE_B_4",
+            "aliases": [
+                "MI_B4"
+            ]
         },
         "0x7160": {
             "group": "midi",
-            "key": "MI_C_5"
+            "key": "QK_MIDI_NOTE_C_5",
+            "aliases": [
+                "MI_C5"
+            ]
         },
         "0x7161": {
             "group": "midi",
-            "key": "MI_Cs_5",
+            "key": "QK_MIDI_NOTE_C_SHARP_5",
             "aliases": [
-                "MI_Db_5"
+                "MI_Cs5",
+                "MI_Db5"
             ]
         },
         "0x7162": {
             "group": "midi",
-            "key": "MI_D_5"
+            "key": "QK_MIDI_NOTE_D_5",
+            "aliases": [
+                "MI_D5"
+            ]
         },
         "0x7163": {
             "group": "midi",
-            "key": "MI_Ds_5",
+            "key": "QK_MIDI_NOTE_D_SHARP_5",
             "aliases": [
-                "MI_Eb_5"
+                "MI_Ds5",
+                "MI_Eb5"
             ]
         },
         "0x7164": {
             "group": "midi",
-            "key": "MI_E_5"
+            "key": "QK_MIDI_NOTE_E_5",
+            "aliases": [
+                "MI_E5"
+            ]
         },
         "0x7165": {
             "group": "midi",
-            "key": "MI_F_5"
+            "key": "QK_MIDI_NOTE_F_5",
+            "aliases": [
+                "MI_F5"
+            ]
         },
         "0x7166": {
             "group": "midi",
-            "key": "MI_Fs_5",
+            "key": "QK_MIDI_NOTE_F_SHARP_5",
             "aliases": [
-                "MI_Gb_5"
+                "MI_Fs5",
+                "MI_Gb5"
             ]
         },
         "0x7167": {
             "group": "midi",
-            "key": "MI_G_5"
+            "key": "QK_MIDI_NOTE_G_5",
+            "aliases": [
+                "MI_G5"
+            ]
         },
         "0x7168": {
             "group": "midi",
-            "key": "MI_Gs_5",
+            "key": "QK_MIDI_NOTE_G_SHARP_5",
             "aliases": [
-                "MI_Ab_5"
+                "MI_Gs5",
+                "MI_Ab5"
             ]
         },
         "0x7169": {
             "group": "midi",
-            "key": "MI_A_5"
+            "key": "QK_MIDI_NOTE_A_5",
+            "aliases": [
+                "MI_A5"
+            ]
         },
         "0x716A": {
             "group": "midi",
-            "key": "MI_As_5",
+            "key": "QK_MIDI_NOTE_A_SHARP_5",
             "aliases": [
-                "MI_Bb_5"
+                "MI_As5",
+                "MI_Bb5"
             ]
         },
         "0x716B": {
             "group": "midi",
-            "key": "MI_B_5"
+            "key": "QK_MIDI_NOTE_B_5",
+            "aliases": [
+                "MI_B5"
+            ]
         },
         "0x7170": {
             "group": "midi",
-            "key": "MI_OCT_N2"
+            "key": "QK_MIDI_OCTAVE_N2",
+            "aliases": [
+                "MI_OCN2"
+            ]
         },
         "0x7171": {
             "group": "midi",
-            "key": "MI_OCT_N1"
+            "key": "QK_MIDI_OCTAVE_N1",
+            "aliases": [
+                "MI_OCN1"
+            ]
         },
         "0x7172": {
             "group": "midi",
-            "key": "MI_OCT_0"
+            "key": "QK_MIDI_OCTAVE_0",
+            "aliases": [
+                "MI_OC0"
+            ]
         },
         "0x7173": {
             "group": "midi",
-            "key": "MI_OCT_1"
+            "key": "QK_MIDI_OCTAVE_1",
+            "aliases": [
+                "MI_OC1"
+            ]
         },
         "0x7174": {
             "group": "midi",
-            "key": "MI_OCT_2"
+            "key": "QK_MIDI_OCTAVE_2",
+            "aliases": [
+                "MI_OC2"
+            ]
         },
         "0x7175": {
             "group": "midi",
-            "key": "MI_OCT_3"
+            "key": "QK_MIDI_OCTAVE_3",
+            "aliases": [
+                "MI_OC3"
+            ]
         },
         "0x7176": {
             "group": "midi",
-            "key": "MI_OCT_4"
+            "key": "QK_MIDI_OCTAVE_4",
+            "aliases": [
+                "MI_OC4"
+            ]
         },
         "0x7177": {
             "group": "midi",
-            "key": "MI_OCT_5"
+            "key": "QK_MIDI_OCTAVE_5",
+            "aliases": [
+                "MI_OC5"
+            ]
         },
         "0x7178": {
             "group": "midi",
-            "key": "MI_OCT_6"
+            "key": "QK_MIDI_OCTAVE_6",
+            "aliases": [
+                "MI_OC6"
+            ]
         },
         "0x7179": {
             "group": "midi",
-            "key": "MI_OCT_7"
+            "key": "QK_MIDI_OCTAVE_7",
+            "aliases": [
+                "MI_OC7"
+            ]
         },
         "0x717A": {
             "group": "midi",
-            "key": "MI_OCTD"
+            "key": "QK_MIDI_OCTAVE_DOWN",
+            "aliases": [
+                "MI_OCTD"
+            ]
         },
         "0x717B": {
             "group": "midi",
-            "key": "MI_OCTU"
+            "key": "QK_MIDI_OCTAVE_UP",
+            "aliases": [
+                "MI_OCTU"
+            ]
         },
         "0x7180": {
             "group": "midi",
-            "key": "MI_TRNS_N6"
+            "key": "QK_MIDI_TRANSPOSE_N6",
+            "aliases": [
+                "MI_TRN6"
+            ]
         },
         "0x7181": {
             "group": "midi",
-            "key": "MI_TRNS_N5"
+            "key": "QK_MIDI_TRANSPOSE_N5",
+            "aliases": [
+                "MI_TRN5"
+            ]
         },
         "0x7182": {
             "group": "midi",
-            "key": "MI_TRNS_N4"
+            "key": "QK_MIDI_TRANSPOSE_N4",
+            "aliases": [
+                "MI_TRN4"
+            ]
         },
         "0x7183": {
             "group": "midi",
-            "key": "MI_TRNS_N3"
+            "key": "QK_MIDI_TRANSPOSE_N3",
+            "aliases": [
+                "MI_TRN3"
+            ]
         },
         "0x7184": {
             "group": "midi",
-            "key": "MI_TRNS_N2"
+            "key": "QK_MIDI_TRANSPOSE_N2",
+            "aliases": [
+                "MI_TRN2"
+            ]
         },
         "0x7185": {
             "group": "midi",
-            "key": "MI_TRNS_N1"
+            "key": "QK_MIDI_TRANSPOSE_N1",
+            "aliases": [
+                "MI_TRN1"
+            ]
         },
         "0x7186": {
             "group": "midi",
-            "key": "MI_TRNS_0"
+            "key": "QK_MIDI_TRANSPOSE_0",
+            "aliases": [
+                "MI_TR0"
+            ]
         },
         "0x7187": {
             "group": "midi",
-            "key": "MI_TRNS_1"
+            "key": "QK_MIDI_TRANSPOSE_1",
+            "aliases": [
+                "MI_TR1"
+            ]
         },
         "0x7188": {
             "group": "midi",
-            "key": "MI_TRNS_2"
+            "key": "QK_MIDI_TRANSPOSE_2",
+            "aliases": [
+                "MI_TR2"
+            ]
         },
         "0x7189": {
             "group": "midi",
-            "key": "MI_TRNS_3"
+            "key": "QK_MIDI_TRANSPOSE_3",
+            "aliases": [
+                "MI_TR3"
+            ]
         },
         "0x718A": {
             "group": "midi",
-            "key": "MI_TRNS_4"
+            "key": "QK_MIDI_TRANSPOSE_4",
+            "aliases": [
+                "MI_TR4"
+            ]
         },
         "0x718B": {
             "group": "midi",
-            "key": "MI_TRNS_5"
+            "key": "QK_MIDI_TRANSPOSE_5",
+            "aliases": [
+                "MI_TR5"
+            ]
         },
         "0x718C": {
             "group": "midi",
-            "key": "MI_TRNS_6"
+            "key": "QK_MIDI_TRANSPOSE_6",
+            "aliases": [
+                "MI_TR6"
+            ]
         },
         "0x718D": {
             "group": "midi",
-            "key": "MI_TRNSD"
+            "key": "QK_MIDI_TRANSPOSE_DOWN",
+            "aliases": [
+                "MI_TRSD"
+            ]
         },
         "0x718E": {
             "group": "midi",
-            "key": "MI_TRNSU"
+            "key": "QK_MIDI_TRANSPOSE_UP",
+            "aliases": [
+                "MI_TRSU"
+            ]
         },
         "0x7190": {
             "group": "midi",
-            "key": "MI_VEL_0"
+            "key": "QK_MIDI_VELOCITY_0",
+            "aliases": [
+                "MI_VL0"
+            ]
         },
         "0x7191": {
             "group": "midi",
-            "key": "MI_VEL_1"
+            "key": "QK_MIDI_VELOCITY_1",
+            "aliases": [
+                "MI_VL1"
+            ]
         },
         "0x7192": {
             "group": "midi",
-            "key": "MI_VEL_2"
+            "key": "QK_MIDI_VELOCITY_2",
+            "aliases": [
+                "MI_VL2"
+            ]
         },
         "0x7193": {
             "group": "midi",
-            "key": "MI_VEL_3"
+            "key": "QK_MIDI_VELOCITY_3",
+            "aliases": [
+                "MI_VL3"
+            ]
         },
         "0x7194": {
             "group": "midi",
-            "key": "MI_VEL_4"
+            "key": "QK_MIDI_VELOCITY_4",
+            "aliases": [
+                "MI_VL4"
+            ]
         },
         "0x7195": {
             "group": "midi",
-            "key": "MI_VEL_5"
+            "key": "QK_MIDI_VELOCITY_5",
+            "aliases": [
+                "MI_VL5"
+            ]
         },
         "0x7196": {
             "group": "midi",
-            "key": "MI_VEL_6"
+            "key": "QK_MIDI_VELOCITY_6",
+            "aliases": [
+                "MI_VL6"
+            ]
         },
         "0x7197": {
             "group": "midi",
-            "key": "MI_VEL_7"
+            "key": "QK_MIDI_VELOCITY_7",
+            "aliases": [
+                "MI_VL7"
+            ]
         },
         "0x7198": {
             "group": "midi",
-            "key": "MI_VEL_8"
+            "key": "QK_MIDI_VELOCITY_8",
+            "aliases": [
+                "MI_VL8"
+            ]
         },
         "0x7199": {
             "group": "midi",
-            "key": "MI_VEL_9"
+            "key": "QK_MIDI_VELOCITY_9",
+            "aliases": [
+                "MI_VL9"
+            ]
         },
         "0x719A": {
             "group": "midi",
-            "key": "MI_VEL_10"
+            "key": "QK_MIDI_VELOCITY_10",
+            "aliases": [
+                "MI_VL10"
+            ]
         },
         "0x719B": {
             "group": "midi",
-            "key": "MI_VELD"
+            "key": "QK_MIDI_VELOCITY_DOWN",
+            "aliases": [
+                "MI_VELD"
+            ]
         },
         "0x719C": {
             "group": "midi",
-            "key": "MI_VELU"
+            "key": "QK_MIDI_VELOCITY_UP",
+            "aliases": [
+                "MI_VELU"
+            ]
         },
         "0x71A0": {
             "group": "midi",
-            "key": "MI_CH1"
+            "key": "QK_MIDI_CHANNEL_1",
+            "aliases": [
+                "MI_CH1"
+            ]
         },
         "0x71A1": {
             "group": "midi",
-            "key": "MI_CH2"
+            "key": "QK_MIDI_CHANNEL_2",
+            "aliases": [
+                "MI_CH2"
+            ]
         },
         "0x71A2": {
             "group": "midi",
-            "key": "MI_CH3"
+            "key": "QK_MIDI_CHANNEL_3",
+            "aliases": [
+                "MI_CH3"
+            ]
         },
         "0x71A3": {
             "group": "midi",
-            "key": "MI_CH4"
+            "key": "QK_MIDI_CHANNEL_4",
+            "aliases": [
+                "MI_CH4"
+            ]
         },
         "0x71A4": {
             "group": "midi",
-            "key": "MI_CH5"
+            "key": "QK_MIDI_CHANNEL_5",
+            "aliases": [
+                "MI_CH5"
+            ]
         },
         "0x71A5": {
             "group": "midi",
-            "key": "MI_CH6"
+            "key": "QK_MIDI_CHANNEL_6",
+            "aliases": [
+                "MI_CH6"
+            ]
         },
         "0x71A6": {
             "group": "midi",
-            "key": "MI_CH7"
+            "key": "QK_MIDI_CHANNEL_7",
+            "aliases": [
+                "MI_CH7"
+            ]
         },
         "0x71A7": {
             "group": "midi",
-            "key": "MI_CH8"
+            "key": "QK_MIDI_CHANNEL_8",
+            "aliases": [
+                "MI_CH8"
+            ]
         },
         "0x71A8": {
             "group": "midi",
-            "key": "MI_CH9"
+            "key": "QK_MIDI_CHANNEL_9",
+            "aliases": [
+                "MI_CH9"
+            ]
         },
         "0x71A9": {
             "group": "midi",
-            "key": "MI_CH10"
+            "key": "QK_MIDI_CHANNEL_10",
+            "aliases": [
+                "MI_CH10"
+            ]
         },
         "0x71AA": {
             "group": "midi",
-            "key": "MI_CH11"
+            "key": "QK_MIDI_CHANNEL_11",
+            "aliases": [
+                "MI_CH11"
+            ]
         },
         "0x71AB": {
             "group": "midi",
-            "key": "MI_CH12"
+            "key": "QK_MIDI_CHANNEL_12",
+            "aliases": [
+                "MI_CH12"
+            ]
         },
         "0x71AC": {
             "group": "midi",
-            "key": "MI_CH13"
+            "key": "QK_MIDI_CHANNEL_13",
+            "aliases": [
+                "MI_CH13"
+            ]
         },
         "0x71AD": {
             "group": "midi",
-            "key": "MI_CH14"
+            "key": "QK_MIDI_CHANNEL_14",
+            "aliases": [
+                "MI_CH14"
+            ]
         },
         "0x71AE": {
             "group": "midi",
-            "key": "MI_CH15"
+            "key": "QK_MIDI_CHANNEL_15",
+            "aliases": [
+                "MI_CH15"
+            ]
         },
         "0x71AF": {
             "group": "midi",
-            "key": "MI_CH16"
+            "key": "QK_MIDI_CHANNEL_16",
+            "aliases": [
+                "MI_CH16"
+            ]
         },
         "0x71B0": {
             "group": "midi",
-            "key": "MI_CHD"
+            "key": "QK_MIDI_CHANNEL_DOWN",
+            "aliases": [
+                "MI_CHND"
+            ]
         },
         "0x71B1": {
             "group": "midi",
-            "key": "MI_CHU"
+            "key": "QK_MIDI_CHANNEL_UP",
+            "aliases": [
+                "MI_CHNU"
+            ]
         },
         "0x71C0": {
             "group": "midi",
-            "key": "MI_ALLOFF"
+            "key": "QK_MIDI_ALL_NOTES_OFF",
+            "aliases": [
+                "MI_AOFF"
+            ]
         },
         "0x71C1": {
             "group": "midi",
-            "key": "MI_SUS"
+            "key": "QK_MIDI_SUSTAIN",
+            "aliases": [
+                "MI_SUST"
+            ]
         },
         "0x71C2": {
             "group": "midi",
-            "key": "MI_PORT"
+            "key": "QK_MIDI_PORTAMENTO",
+            "aliases": [
+                "MI_PORT"
+            ]
         },
         "0x71C3": {
             "group": "midi",
-            "key": "MI_SOST"
+            "key": "QK_MIDI_SOSTENUTO",
+            "aliases": [
+                "MI_SOST"
+            ]
         },
         "0x71C4": {
             "group": "midi",
-            "key": "MI_SOFT"
+            "key": "QK_MIDI_SOFT",
+            "aliases": [
+                "MI_SOFT"
+            ]
         },
         "0x71C5": {
             "group": "midi",
-            "key": "MI_LEG"
+            "key": "QK_MIDI_LEGATO",
+            "aliases": [
+                "MI_LEG"
+            ]
         },
         "0x71C6": {
             "group": "midi",
-            "key": "MI_MOD"
+            "key": "QK_MIDI_MODULATION",
+            "aliases": [
+                "MI_MOD"
+            ]
         },
         "0x71C7": {
             "group": "midi",
-            "key": "MI_MODSD"
+            "key": "QK_MIDI_MODULATION_SPEED_DOWN",
+            "aliases": [
+                "MI_MODD"
+            ]
         },
         "0x71C8": {
             "group": "midi",
-            "key": "MI_MODSU"
+            "key": "QK_MIDI_MODULATION_SPEED_UP",
+            "aliases": [
+                "MI_MODU"
+            ]
         },
         "0x71C9": {
             "group": "midi",
-            "key": "MI_BENDD"
+            "key": "QK_MIDI_PITCH_BEND_DOWN",
+            "aliases": [
+                "MI_BNDD"
+            ]
         },
         "0x71CA": {
             "group": "midi",
-            "key": "MI_BENDU"
+            "key": "QK_MIDI_PITCH_BEND_UP",
+            "aliases": [
+                "MI_BNDU"
+            ]
         }
     }
 }
diff --git a/docs/feature_midi.md b/docs/feature_midi.md
index 7823b66113..1f0809ef14 100644
--- a/docs/feature_midi.md
+++ b/docs/feature_midi.md
@@ -80,164 +80,164 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 ### Keycodes
 
-|Keycode     |Aliases  |Description                      |
-|------------|---------|---------------------------------|
-|`MI_ON`     |         |Turn MIDI on                     |
-|`MI_OFF`    |         |Turn MIDI off                    |
-|`MI_TOG`    |         |Toggle MIDI enabled              |
-|`MI_C`      |         |C octave 0                       |
-|`MI_Cs`     |`MI_Db`  |C♯/D♭ octave 0                   |
-|`MI_D`      |         |D octave 0                       |
-|`MI_Ds`     |`MI_Eb`  |D♯/E♭ octave 0                   |
-|`MI_E`      |         |E octave 0                       |
-|`MI_F`      |         |F octave 0                       |
-|`MI_Fs`     |`MI_Gb`  |F♯/G♭ octave 0                   |
-|`MI_G`      |         |G octave 0                       |
-|`MI_Gs`     |`MI_Gs`  |G♯/A♭ octave 0                   |
-|`MI_A`      |         |A octave 0                       |
-|`MI_As`     |`MI_Bb`  |A♯/B♭ octave 0                   |
-|`MI_B`      |         |B octave 0                       |
-|`MI_C_1`    |         |C octave 1                       |
-|`MI_Cs_1`   |`MI_Db_1`|C♯/D♭ octave 1                   |
-|`MI_D_1`    |         |D octave 1                       |
-|`MI_Ds_1`   |`MI_Eb_1`|D♯/E♭ octave 1                   |
-|`MI_E_1`    |         |E octave 1                       |
-|`MI_F_1`    |         |F octave 1                       |
-|`MI_Fs_1`   |`MI_Gb_1`|F♯/G♭ octave 1                   |
-|`MI_G_1`    |         |G octave 1                       |
-|`MI_Gs_1`   |`MI_Ab_1`|G♯/A♭ octave 1                   |
-|`MI_A_1`    |         |A octave 1                       |
-|`MI_As_1`   |`MI_Bb_1`|A♯/B♭ octave 1                   |
-|`MI_B_1`    |         |B octave 1                       |
-|`MI_C_2`    |         |C octave 2                       |
-|`MI_Cs_2`   |`MI_Db_2`|C♯/D♭ octave 2                   |
-|`MI_D_2`    |         |D octave 2                       |
-|`MI_Ds_2`   |`MI_Eb_2`|D♯/E♭ octave 2                   |
-|`MI_E_2`    |         |E octave 2                       |
-|`MI_F_2`    |         |F octave 2                       |
-|`MI_Fs_2`   |`MI_Gb_2`|F♯/G♭ octave 2                   |
-|`MI_G_2`    |         |G octave 2                       |
-|`MI_Gs_2`   |`MI_Ab_2`|G♯/A♭ octave 2                   |
-|`MI_A_2`    |         |A octave 2                       |
-|`MI_As_2`   |`MI_Bb_2`|A♯/B♭ octave 2                   |
-|`MI_B_2`    |         |B octave 2                       |
-|`MI_C_3`    |         |C octave 3                       |
-|`MI_Cs_3`   |`MI_Db_3`|C♯/D♭ octave 3                   |
-|`MI_D_3`    |         |D octave 3                       |
-|`MI_Ds_3`   |`MI_Eb_3`|D♯/E♭ octave 3                   |
-|`MI_E_3`    |         |E octave 3                       |
-|`MI_F_3`    |         |F octave 3                       |
-|`MI_Fs_3`   |`MI_Gb_3`|F♯/G♭ octave 3                   |
-|`MI_G_3`    |         |G octave 3                       |
-|`MI_Gs_3`   |`MI_Ab_3`|G♯/A♭ octave 3                   |
-|`MI_A_3`    |         |A octave 3                       |
-|`MI_As_3`   |`MI_Bb_3`|A♯/B♭ octave 3                   |
-|`MI_B_3`    |         |B octave 3                       |
-|`MI_C_4`    |         |C octave 4                       |
-|`MI_Cs_4`   |`MI_Db_4`|C♯/D♭ octave 4                   |
-|`MI_D_4`    |         |D octave 4                       |
-|`MI_Ds_4`   |`MI_Eb_4`|D♯/E♭ octave 4                   |
-|`MI_E_4`    |         |E octave 4                       |
-|`MI_F_4`    |         |F octave 4                       |
-|`MI_Fs_4`   |`MI_Gb_4`|F♯/G♭ octave 4                   |
-|`MI_G_4`    |         |G octave 4                       |
-|`MI_Gs_4`   |`MI_Ab_4`|G♯/A♭ octave 4                   |
-|`MI_A_4`    |         |A octave 4                       |
-|`MI_As_4`   |`MI_Bb_4`|A♯/B♭ octave 4                   |
-|`MI_B_4`    |         |B octave 4                       |
-|`MI_C_5`    |         |C octave 5                       |
-|`MI_Cs_5`   |`MI_Db_5`|C♯/D♭ octave 5                   |
-|`MI_D_5`    |         |D octave 5                       |
-|`MI_Ds_5`   |`MI_Eb_5`|D♯/E♭ octave 5                   |
-|`MI_E_5`    |         |E octave 5                       |
-|`MI_F_5`    |         |F octave 5                       |
-|`MI_Fs_5`   |`MI_Gb_5`|F♯/G♭ octave 5                   |
-|`MI_G_5`    |         |G octave 5                       |
-|`MI_Gs_5`   |`MI_Ab_5`|G♯/A♭ octave 5                   |
-|`MI_A_5`    |         |A octave 5                       |
-|`MI_As_5`   |`MI_Bb_5`|A♯/B♭ octave 5                   |
-|`MI_B_5`    |         |B octave 5                       |
-|`MI_OCT_N2` |         |Set octave to -2                 |
-|`MI_OCT_N1` |         |Set octave to -1                 |
-|`MI_OCT_0`  |         |Set octave to 0                  |
-|`MI_OCT_1`  |         |Set octave to 1                  |
-|`MI_OCT_2`  |         |Set octave to 2                  |
-|`MI_OCT_3`  |         |Set octave to 3                  |
-|`MI_OCT_4`  |         |Set octave to 4                  |
-|`MI_OCT_5`  |         |Set octave to 5                  |
-|`MI_OCT_6`  |         |Set octave to 6                  |
-|`MI_OCT_7`  |         |Set octave to 7                  |
-|`MI_OCTD`   |         |Move down an octave              |
-|`MI_OCTU`   |         |Move up an octave                |
-|`MI_TRNS_N6`|         |Set transposition to -6 semitones|
-|`MI_TRNS_N5`|         |Set transposition to -5 semitones|
-|`MI_TRNS_N4`|         |Set transposition to -4 semitones|
-|`MI_TRNS_N3`|         |Set transposition to -3 semitones|
-|`MI_TRNS_N2`|         |Set transposition to -2 semitones|
-|`MI_TRNS_N1`|         |Set transposition to -1 semitone |
-|`MI_TRNS_0` |         |No transposition                 |
-|`MI_TRNS_1` |         |Set transposition to +1 semitone |
-|`MI_TRNS_2` |         |Set transposition to +2 semitones|
-|`MI_TRNS_3` |         |Set transposition to +3 semitones|
-|`MI_TRNS_4` |         |Set transposition to +4 semitones|
-|`MI_TRNS_5` |         |Set transposition to +5 semitones|
-|`MI_TRNS_6` |         |Set transposition to +6 semitones|
-|`MI_TRNSD`  |         |Decrease transposition           |
-|`MI_TRNSU`  |         |Increase transposition           |
-|`MI_VEL_0`  |         |Set velocity to 0                |
-|`MI_VEL_1`  |         |Set velocity to 12               |
-|`MI_VEL_2`  |         |Set velocity to 25               |
-|`MI_VEL_3`  |         |Set velocity to 38               |
-|`MI_VEL_4`  |         |Set velocity to 51               |
-|`MI_VEL_5`  |         |Set velocity to 64               |
-|`MI_VEL_6`  |         |Set velocity to 76               |
-|`MI_VEL_7`  |         |Set velocity to 89               |
-|`MI_VEL_8`  |         |Set velocity to 102              |
-|`MI_VEL_9`  |         |Set velocity to 114              |
-|`MI_VEL_10` |         |Set velocity to 127              |
-|`MI_VELD`   |         |Decrease velocity                |
-|`MI_VELU`   |         |Increase velocity                |
-|`MI_CH1`    |         |Set channel to 1                 |
-|`MI_CH2`    |         |Set channel to 2                 |
-|`MI_CH3`    |         |Set channel to 3                 |
-|`MI_CH4`    |         |Set channel to 4                 |
-|`MI_CH5`    |         |Set channel to 5                 |
-|`MI_CH6`    |         |Set channel to 6                 |
-|`MI_CH7`    |         |Set channel to 7                 |
-|`MI_CH8`    |         |Set channel to 8                 |
-|`MI_CH9`    |         |Set channel to 9                 |
-|`MI_CH10`   |         |Set channel to 10                |
-|`MI_CH11`   |         |Set channel to 11                |
-|`MI_CH12`   |         |Set channel to 12                |
-|`MI_CH13`   |         |Set channel to 13                |
-|`MI_CH14`   |         |Set channel to 14                |
-|`MI_CH15`   |         |Set channel to 15                |
-|`MI_CH16`   |         |Set channel to 16                |
-|`MI_CHD`    |         |Decrease channel                 |
-|`MI_CHU`    |         |Increase channel                 |
-|`MI_ALLOFF` |         |Stop all notes                   |
-|`MI_SUS`    |         |Sustain                          |
-|`MI_PORT`   |         |Portmento                        |
-|`MI_SOST`   |         |Sostenuto                        |
-|`MI_SOFT`   |         |Soft Pedal                       |
-|`MI_LEG`    |         |Legato                           |
-|`MI_MOD`    |         |Modulation                       |
-|`MI_MODSD`  |         |Decrease modulation speed        |
-|`MI_MODSU`  |         |Increase modulation speed        |
-|`MI_BENDD`  |         |Bend pitch down                  |
-|`MI_BENDU`  |         |Bend pitch up                    |
+|Keycode                        |Aliases           |Description                      |
+|-------------------------------|------------------|---------------------------------|
+|`QK_MIDI_ON`                   |`MI_ON`           |Turn MIDI on                     |
+|`QK_MIDI_OFF`                  |`MI_OFF`          |Turn MIDI off                    |
+|`QK_MIDI_TOGGLE`               |`MI_TOGG`         |Toggle MIDI enabled              |
+|`QK_MIDI_NOTE_C_0`             |`MI_C`            |C octave 0                       |
+|`QK_MIDI_NOTE_C_SHARP_0`       |`MI_Cs`, `MI_Db`  |C♯/D♭ octave 0                   |
+|`QK_MIDI_NOTE_D_0`             |`MI_D`            |D octave 0                       |
+|`QK_MIDI_NOTE_D_SHARP_0`       |`MI_Ds`, `MI_Eb`  |D♯/E♭ octave 0                   |
+|`QK_MIDI_NOTE_E_0`             |`MI_E`            |E octave 0                       |
+|`QK_MIDI_NOTE_F_0`             |`MI_F`            |F octave 0                       |
+|`QK_MIDI_NOTE_F_SHARP_0`       |`MI_Fs`, `MI_Gb`  |F♯/G♭ octave 0                   |
+|`QK_MIDI_NOTE_G_0`             |`MI_G`            |G octave 0                       |
+|`QK_MIDI_NOTE_G_SHARP_0`       |`MI_Gs`, `MI_Ab`  |G♯/A♭ octave 0                   |
+|`QK_MIDI_NOTE_A_0`             |`MI_A`            |A octave 0                       |
+|`QK_MIDI_NOTE_A_SHARP_0`       |`MI_As`, `MI_Bb`  |A♯/B♭ octave 0                   |
+|`QK_MIDI_NOTE_B_0`             |`MI_B`            |B octave 0                       |
+|`QK_MIDI_NOTE_C_1`             |`MI_C1`           |C octave 1                       |
+|`QK_MIDI_NOTE_C_SHARP_1`       |`MI_Cs1`, `MI_Db1`|C♯/D♭ octave 1                   |
+|`QK_MIDI_NOTE_D_1`             |`MI_D1`           |D octave 1                       |
+|`QK_MIDI_NOTE_D_SHARP_1`       |`MI_Ds1`, `MI_Eb1`|D♯/E♭ octave 1                   |
+|`QK_MIDI_NOTE_E_1`             |`MI_E1`           |E octave 1                       |
+|`QK_MIDI_NOTE_F_1`             |`MI_F1`           |F octave 1                       |
+|`QK_MIDI_NOTE_F_SHARP_1`       |`MI_Fs1`, `MI_Gb1`|F♯/G♭ octave 1                   |
+|`QK_MIDI_NOTE_G_1`             |`MI_G1`           |G octave 1                       |
+|`QK_MIDI_NOTE_G_SHARP_1`       |`MI_Gs1`, `MI_Ab1`|G♯/A♭ octave 1                   |
+|`QK_MIDI_NOTE_A_1`             |`MI_A1`           |A octave 1                       |
+|`QK_MIDI_NOTE_A_SHARP_1`       |`MI_As1`, `MI_Bb1`|A♯/B♭ octave 1                   |
+|`QK_MIDI_NOTE_B_1`             |`MI_B1`           |B octave 1                       |
+|`QK_MIDI_NOTE_C_2`             |`MI_C2`           |C octave 2                       |
+|`QK_MIDI_NOTE_C_SHARP_2`       |`MI_Cs2`, `MI_Db2`|C♯/D♭ octave 2                   |
+|`QK_MIDI_NOTE_D_2`             |`MI_D2`           |D octave 2                       |
+|`QK_MIDI_NOTE_D_SHARP_2`       |`MI_Ds2`, `MI_Eb2`|D♯/E♭ octave 2                   |
+|`QK_MIDI_NOTE_E_2`             |`MI_E2`           |E octave 2                       |
+|`QK_MIDI_NOTE_F_2`             |`MI_F2`           |F octave 2                       |
+|`QK_MIDI_NOTE_F_SHARP_2`       |`MI_Fs2`, `MI_Gb2`|F♯/G♭ octave 2                   |
+|`QK_MIDI_NOTE_G_2`             |`MI_G2`           |G octave 2                       |
+|`QK_MIDI_NOTE_G_SHARP_2`       |`MI_Gs2`, `MI_Ab2`|G♯/A♭ octave 2                   |
+|`QK_MIDI_NOTE_A_2`             |`MI_A2`           |A octave 2                       |
+|`QK_MIDI_NOTE_A_SHARP_2`       |`MI_As2`, `MI_Bb2`|A♯/B♭ octave 2                   |
+|`QK_MIDI_NOTE_B_2`             |`MI_B2`           |B octave 2                       |
+|`QK_MIDI_NOTE_C_3`             |`MI_C3`           |C octave 3                       |
+|`QK_MIDI_NOTE_C_SHARP_3`       |`MI_Cs3`, `MI_Db3`|C♯/D♭ octave 3                   |
+|`QK_MIDI_NOTE_D_3`             |`MI_D3`           |D octave 3                       |
+|`QK_MIDI_NOTE_D_SHARP_3`       |`MI_Ds3`, `MI_Eb3`|D♯/E♭ octave 3                   |
+|`QK_MIDI_NOTE_E_3`             |`MI_E3`           |E octave 3                       |
+|`QK_MIDI_NOTE_F_3`             |`MI_F3`           |F octave 3                       |
+|`QK_MIDI_NOTE_F_SHARP_3`       |`MI_Fs3`, `MI_Gb3`|F♯/G♭ octave 3                   |
+|`QK_MIDI_NOTE_G_3`             |`MI_G3`           |G octave 3                       |
+|`QK_MIDI_NOTE_G_SHARP_3`       |`MI_Gs3`, `MI_Ab3`|G♯/A♭ octave 3                   |
+|`QK_MIDI_NOTE_A_3`             |`MI_A3`           |A octave 3                       |
+|`QK_MIDI_NOTE_A_SHARP_3`       |`MI_As3`, `MI_Bb3`|A♯/B♭ octave 3                   |
+|`QK_MIDI_NOTE_B_3`             |`MI_B3`           |B octave 3                       |
+|`QK_MIDI_NOTE_C_4`             |`MI_C4`           |C octave 4                       |
+|`QK_MIDI_NOTE_C_SHARP_4`       |`MI_Cs4`, `MI_Db4`|C♯/D♭ octave 4                   |
+|`QK_MIDI_NOTE_D_4`             |`MI_D4`           |D octave 4                       |
+|`QK_MIDI_NOTE_D_SHARP_4`       |`MI_Ds4`, `MI_Eb4`|D♯/E♭ octave 4                   |
+|`QK_MIDI_NOTE_E_4`             |`MI_E4`           |E octave 4                       |
+|`QK_MIDI_NOTE_F_4`             |`MI_F4`           |F octave 4                       |
+|`QK_MIDI_NOTE_F_SHARP_4`       |`MI_Fs4`, `MI_Gb4`|F♯/G♭ octave 4                   |
+|`QK_MIDI_NOTE_G_4`             |`MI_G4`           |G octave 4                       |
+|`QK_MIDI_NOTE_G_SHARP_4`       |`MI_Gs4`, `MI_Ab4`|G♯/A♭ octave 4                   |
+|`QK_MIDI_NOTE_A_4`             |`MI_A4`           |A octave 4                       |
+|`QK_MIDI_NOTE_A_SHARP_4`       |`MI_As4`, `MI_Bb4`|A♯/B♭ octave 4                   |
+|`QK_MIDI_NOTE_B_4`             |`MI_B4`           |B octave 4                       |
+|`QK_MIDI_NOTE_C_5`             |`MI_C5`           |C octave 5                       |
+|`QK_MIDI_NOTE_C_SHARP_5`       |`MI_Cs5`, `MI_Db5`|C♯/D♭ octave 5                   |
+|`QK_MIDI_NOTE_D_5`             |`MI_D5`           |D octave 5                       |
+|`QK_MIDI_NOTE_D_SHARP_5`       |`MI_Ds5`, `MI_Eb5`|D♯/E♭ octave 5                   |
+|`QK_MIDI_NOTE_E_5`             |`MI_E5`           |E octave 5                       |
+|`QK_MIDI_NOTE_F_5`             |`MI_F5`           |F octave 5                       |
+|`QK_MIDI_NOTE_F_SHARP_5`       |`MI_Fs5`, `MI_Gb5`|F♯/G♭ octave 5                   |
+|`QK_MIDI_NOTE_G_5`             |`MI_G5`           |G octave 5                       |
+|`QK_MIDI_NOTE_G_SHARP_5`       |`MI_Gs5`, `MI_Ab5`|G♯/A♭ octave 5                   |
+|`QK_MIDI_NOTE_A_5`             |`MI_A5`           |A octave 5                       |
+|`QK_MIDI_NOTE_A_SHARP_5`       |`MI_As5`, `MI_Bb5`|A♯/B♭ octave 5                   |
+|`QK_MIDI_NOTE_B_5`             |`MI_B5`           |B octave 5                       |
+|`QK_MIDI_OCTAVE_N2`            |`MI_OCN2`         |Set octave to -2                 |
+|`QK_MIDI_OCTAVE_N1`            |`MI_OCN1`         |Set octave to -1                 |
+|`QK_MIDI_OCTAVE_0`             |`MI_OC0`          |Set octave to 0                  |
+|`QK_MIDI_OCTAVE_1`             |`MI_OC1`          |Set octave to 1                  |
+|`QK_MIDI_OCTAVE_2`             |`MI_OC2`          |Set octave to 2                  |
+|`QK_MIDI_OCTAVE_3`             |`MI_OC3`          |Set octave to 3                  |
+|`QK_MIDI_OCTAVE_4`             |`MI_OC4`          |Set octave to 4                  |
+|`QK_MIDI_OCTAVE_5`             |`MI_OC5`          |Set octave to 5                  |
+|`QK_MIDI_OCTAVE_6`             |`MI_OC6`          |Set octave to 6                  |
+|`QK_MIDI_OCTAVE_7`             |`MI_OC7`          |Set octave to 7                  |
+|`QK_MIDI_OCTAVE_DOWN`          |`MI_OCTD`         |Move down an octave              |
+|`QK_MIDI_OCTAVE_UP`            |`MI_OCTU`         |Move up an octave                |
+|`QK_MIDI_TRANSPOSE_N6`         |`MI_TRN6`         |Set transposition to -6 semitones|
+|`QK_MIDI_TRANSPOSE_N5`         |`MI_TRN5`         |Set transposition to -5 semitones|
+|`QK_MIDI_TRANSPOSE_N4`         |`MI_TRN4`         |Set transposition to -4 semitones|
+|`QK_MIDI_TRANSPOSE_N3`         |`MI_TRN3`         |Set transposition to -3 semitones|
+|`QK_MIDI_TRANSPOSE_N2`         |`MI_TRN2`         |Set transposition to -2 semitones|
+|`QK_MIDI_TRANSPOSE_N1`         |`MI_TRN1`         |Set transposition to -1 semitone |
+|`QK_MIDI_TRANSPOSE_0`          |`MI_TR0`          |No transposition                 |
+|`QK_MIDI_TRANSPOSE_1`          |`MI_TR1`          |Set transposition to +1 semitone |
+|`QK_MIDI_TRANSPOSE_2`          |`MI_TR2`          |Set transposition to +2 semitones|
+|`QK_MIDI_TRANSPOSE_3`          |`MI_TR3`          |Set transposition to +3 semitones|
+|`QK_MIDI_TRANSPOSE_4`          |`MI_TR4`          |Set transposition to +4 semitones|
+|`QK_MIDI_TRANSPOSE_5`          |`MI_TR5`          |Set transposition to +5 semitones|
+|`QK_MIDI_TRANSPOSE_6`          |`MI_TR6`          |Set transposition to +6 semitones|
+|`QK_MIDI_TRANSPOSE_DOWN`       |`MI_TRSD`         |Decrease transposition           |
+|`QK_MIDI_TRANSPOSE_UP`         |`MI_TRSU`         |Increase transposition           |
+|`QK_MIDI_VELOCITY_0`           |`MI_VL0`          |Set velocity to 0                |
+|`QK_MIDI_VELOCITY_1`           |`MI_VL1`          |Set velocity to 12               |
+|`QK_MIDI_VELOCITY_2`           |`MI_VL2`          |Set velocity to 25               |
+|`QK_MIDI_VELOCITY_3`           |`MI_VL3`          |Set velocity to 38               |
+|`QK_MIDI_VELOCITY_4`           |`MI_VL4`          |Set velocity to 51               |
+|`QK_MIDI_VELOCITY_5`           |`MI_VL5`          |Set velocity to 64               |
+|`QK_MIDI_VELOCITY_6`           |`MI_VL6`          |Set velocity to 76               |
+|`QK_MIDI_VELOCITY_7`           |`MI_VL7`          |Set velocity to 89               |
+|`QK_MIDI_VELOCITY_8`           |`MI_VL8`          |Set velocity to 102              |
+|`QK_MIDI_VELOCITY_9`           |`MI_VL9`          |Set velocity to 114              |
+|`QK_MIDI_VELOCITY_10`          |`MI_VL10`         |Set velocity to 127              |
+|`QK_MIDI_VELOCITY_DOWN`        |`MI_VELD`         |Decrease velocity                |
+|`QK_MIDI_VELOCITY_UP`          |`MI_VELU`         |Increase velocity                |
+|`QK_MIDI_CHANNEL_1`            |`MI_CH1`          |Set channel to 1                 |
+|`QK_MIDI_CHANNEL_2`            |`MI_CH2`          |Set channel to 2                 |
+|`QK_MIDI_CHANNEL_3`            |`MI_CH3`          |Set channel to 3                 |
+|`QK_MIDI_CHANNEL_4`            |`MI_CH4`          |Set channel to 4                 |
+|`QK_MIDI_CHANNEL_5`            |`MI_CH5`          |Set channel to 5                 |
+|`QK_MIDI_CHANNEL_6`            |`MI_CH6`          |Set channel to 6                 |
+|`QK_MIDI_CHANNEL_7`            |`MI_CH7`          |Set channel to 7                 |
+|`QK_MIDI_CHANNEL_8`            |`MI_CH8`          |Set channel to 8                 |
+|`QK_MIDI_CHANNEL_9`            |`MI_CH9`          |Set channel to 9                 |
+|`QK_MIDI_CHANNEL_10`           |`MI_CH10`         |Set channel to 10                |
+|`QK_MIDI_CHANNEL_11`           |`MI_CH11`         |Set channel to 11                |
+|`QK_MIDI_CHANNEL_12`           |`MI_CH12`         |Set channel to 12                |
+|`QK_MIDI_CHANNEL_13`           |`MI_CH13`         |Set channel to 13                |
+|`QK_MIDI_CHANNEL_14`           |`MI_CH14`         |Set channel to 14                |
+|`QK_MIDI_CHANNEL_15`           |`MI_CH15`         |Set channel to 15                |
+|`QK_MIDI_CHANNEL_16`           |`MI_CH16`         |Set channel to 16                |
+|`QK_MIDI_CHANNEL_DOWN`         |`MI_CHND`         |Decrease channel                 |
+|`QK_MIDI_CHANNEL_UP`           |`MI_CHNU`         |Increase channel                 |
+|`QK_MIDI_ALL_NOTES_OFF`        |`MI_AOFF`         |Stop all notes                   |
+|`QK_MIDI_SUSTAIN`              |`MI_SUST`         |Sustain                          |
+|`QK_MIDI_PORTAMENTO`           |`MI_PORT`         |Portmento                        |
+|`QK_MIDI_SOSTENUTO`            |`MI_SOST`         |Sostenuto                        |
+|`QK_MIDI_SOFT`                 |`MI_SOFT`         |Soft Pedal                       |
+|`QK_MIDI_LEGATO`               |`MI_LEG`          |Legato                           |
+|`QK_MIDI_MODULATION`           |`MI_MOD`          |Modulation                       |
+|`QK_MIDI_MODULATION_SPEED_DOWN`|`MI_MODD`         |Decrease modulation speed        |
+|`QK_MIDI_MODULATION_SPEED_UP`  |`MI_MODU`         |Increase modulation speed        |
+|`QK_MIDI_PITCH_BEND_DOWN`      |`MI_BNDD`         |Bend pitch down                  |
+|`QK_MIDI_PITCH_BEND_UP`        |`MI_BNDU`         |Bend pitch up                    |
 
 ### Configuration
 
 Certain values are stored in the `midi_config` struct. This configuration is not persisted to EEPROM. By default, these values are:
 
-|Configuration      |Value|Comments                 |
-|-------------------|-----|-------------------------|
-|Octave             |`4`  |Corresponds to `MI_OCT_2`|
-|Transposition      |`0`  |                         |
-|Velocity           |`127`|                         |
-|Channel            |`0`  |                         |
-|Modulation Interval|`8`  |                         |
+|Configuration      |Value|Comments               |
+|-------------------|-----|-----------------------|
+|Octave             |`4`  |Corresponds to `MI_OC2`|
+|Transposition      |`0`  |                       |
+|Velocity           |`127`|                       |
+|Channel            |`0`  |                       |
+|Modulation Interval|`8`  |                       |
 
 For the above, the `MI_C` keycode will produce a C3 (note number 48), and so on.
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 03ac181a44..6ec4e28978 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -442,152 +442,152 @@ See also: [Magic Keycodes](keycodes_magic.md)
 
 See also: [MIDI](feature_midi.md)
 
-|Key         |Aliases  |Description                      |
-|------------|---------|---------------------------------|
-|`MI_ON`     |         |Turn MIDI on                     |
-|`MI_OFF`    |         |Turn MIDI off                    |
-|`MI_TOG`    |         |Toggle MIDI enabled              |
-|`MI_C`      |         |C octave 0                       |
-|`MI_Cs`     |`MI_Db`  |C♯/D♭ octave 0                   |
-|`MI_D`      |         |D octave 0                       |
-|`MI_Ds`     |`MI_Eb`  |D♯/E♭ octave 0                   |
-|`MI_E`      |         |E octave 0                       |
-|`MI_F`      |         |F octave 0                       |
-|`MI_Fs`     |`MI_Gb`  |F♯/G♭ octave 0                   |
-|`MI_G`      |         |G octave 0                       |
-|`MI_Gs`     |`MI_Gs`  |G♯/A♭ octave 0                   |
-|`MI_A`      |         |A octave 0                       |
-|`MI_As`     |`MI_Bb`  |A♯/B♭ octave 0                   |
-|`MI_B`      |         |B octave 0                       |
-|`MI_C_1`    |         |C octave 1                       |
-|`MI_Cs_1`   |`MI_Db_1`|C♯/D♭ octave 1                   |
-|`MI_D_1`    |         |D octave 1                       |
-|`MI_Ds_1`   |`MI_Eb_1`|D♯/E♭ octave 1                   |
-|`MI_E_1`    |         |E octave 1                       |
-|`MI_F_1`    |         |F octave 1                       |
-|`MI_Fs_1`   |`MI_Gb_1`|F♯/G♭ octave 1                   |
-|`MI_G_1`    |         |G octave 1                       |
-|`MI_Gs_1`   |`MI_Ab_1`|G♯/A♭ octave 1                   |
-|`MI_A_1`    |         |A octave 1                       |
-|`MI_As_1`   |`MI_Bb_1`|A♯/B♭ octave 1                   |
-|`MI_B_1`    |         |B octave 1                       |
-|`MI_C_2`    |         |C octave 2                       |
-|`MI_Cs_2`   |`MI_Db_2`|C♯/D♭ octave 2                   |
-|`MI_D_2`    |         |D octave 2                       |
-|`MI_Ds_2`   |`MI_Eb_2`|D♯/E♭ octave 2                   |
-|`MI_E_2`    |         |E octave 2                       |
-|`MI_F_2`    |         |F octave 2                       |
-|`MI_Fs_2`   |`MI_Gb_2`|F♯/G♭ octave 2                   |
-|`MI_G_2`    |         |G octave 2                       |
-|`MI_Gs_2`   |`MI_Ab_2`|G♯/A♭ octave 2                   |
-|`MI_A_2`    |         |A octave 2                       |
-|`MI_As_2`   |`MI_Bb_2`|A♯/B♭ octave 2                   |
-|`MI_B_2`    |         |B octave 2                       |
-|`MI_C_3`    |         |C octave 3                       |
-|`MI_Cs_3`   |`MI_Db_3`|C♯/D♭ octave 3                   |
-|`MI_D_3`    |         |D octave 3                       |
-|`MI_Ds_3`   |`MI_Eb_3`|D♯/E♭ octave 3                   |
-|`MI_E_3`    |         |E octave 3                       |
-|`MI_F_3`    |         |F octave 3                       |
-|`MI_Fs_3`   |`MI_Gb_3`|F♯/G♭ octave 3                   |
-|`MI_G_3`    |         |G octave 3                       |
-|`MI_Gs_3`   |`MI_Ab_3`|G♯/A♭ octave 3                   |
-|`MI_A_3`    |         |A octave 3                       |
-|`MI_As_3`   |`MI_Bb_3`|A♯/B♭ octave 3                   |
-|`MI_B_3`    |         |B octave 3                       |
-|`MI_C_4`    |         |C octave 4                       |
-|`MI_Cs_4`   |`MI_Db_4`|C♯/D♭ octave 4                   |
-|`MI_D_4`    |         |D octave 4                       |
-|`MI_Ds_4`   |`MI_Eb_4`|D♯/E♭ octave 4                   |
-|`MI_E_4`    |         |E octave 4                       |
-|`MI_F_4`    |         |F octave 4                       |
-|`MI_Fs_4`   |`MI_Gb_4`|F♯/G♭ octave 4                   |
-|`MI_G_4`    |         |G octave 4                       |
-|`MI_Gs_4`   |`MI_Ab_4`|G♯/A♭ octave 4                   |
-|`MI_A_4`    |         |A octave 4                       |
-|`MI_As_4`   |`MI_Bb_4`|A♯/B♭ octave 4                   |
-|`MI_B_4`    |         |B octave 4                       |
-|`MI_C_5`    |         |C octave 5                       |
-|`MI_Cs_5`   |`MI_Db_5`|C♯/D♭ octave 5                   |
-|`MI_D_5`    |         |D octave 5                       |
-|`MI_Ds_5`   |`MI_Eb_5`|D♯/E♭ octave 5                   |
-|`MI_E_5`    |         |E octave 5                       |
-|`MI_F_5`    |         |F octave 5                       |
-|`MI_Fs_5`   |`MI_Gb_5`|F♯/G♭ octave 5                   |
-|`MI_G_5`    |         |G octave 5                       |
-|`MI_Gs_5`   |`MI_Ab_5`|G♯/A♭ octave 5                   |
-|`MI_A_5`    |         |A octave 5                       |
-|`MI_As_5`   |`MI_Bb_5`|A♯/B♭ octave 5                   |
-|`MI_B_5`    |         |B octave 5                       |
-|`MI_OCT_N2` |         |Set octave to -2                 |
-|`MI_OCT_N1` |         |Set octave to -1                 |
-|`MI_OCT_0`  |         |Set octave to 0                  |
-|`MI_OCT_1`  |         |Set octave to 1                  |
-|`MI_OCT_2`  |         |Set octave to 2                  |
-|`MI_OCT_3`  |         |Set octave to 3                  |
-|`MI_OCT_4`  |         |Set octave to 4                  |
-|`MI_OCT_5`  |         |Set octave to 5                  |
-|`MI_OCT_6`  |         |Set octave to 6                  |
-|`MI_OCT_7`  |         |Set octave to 7                  |
-|`MI_OCTD`   |         |Move down an octave              |
-|`MI_OCTU`   |         |Move up an octave                |
-|`MI_TRNS_N6`|         |Set transposition to -6 semitones|
-|`MI_TRNS_N5`|         |Set transposition to -5 semitones|
-|`MI_TRNS_N4`|         |Set transposition to -4 semitones|
-|`MI_TRNS_N3`|         |Set transposition to -3 semitones|
-|`MI_TRNS_N2`|         |Set transposition to -2 semitones|
-|`MI_TRNS_N1`|         |Set transposition to -1 semitone |
-|`MI_TRNS_0` |         |No transposition                 |
-|`MI_TRNS_1` |         |Set transposition to +1 semitone |
-|`MI_TRNS_2` |         |Set transposition to +2 semitones|
-|`MI_TRNS_3` |         |Set transposition to +3 semitones|
-|`MI_TRNS_4` |         |Set transposition to +4 semitones|
-|`MI_TRNS_5` |         |Set transposition to +5 semitones|
-|`MI_TRNS_6` |         |Set transposition to +6 semitones|
-|`MI_TRNSD`  |         |Decrease transposition           |
-|`MI_TRNSU`  |         |Increase transposition           |
-|`MI_VEL_0`  |         |Set velocity to 0                |
-|`MI_VEL_1`  |         |Set velocity to 12               |
-|`MI_VEL_2`  |         |Set velocity to 25               |
-|`MI_VEL_3`  |         |Set velocity to 38               |
-|`MI_VEL_4`  |         |Set velocity to 51               |
-|`MI_VEL_5`  |         |Set velocity to 64               |
-|`MI_VEL_6`  |         |Set velocity to 76               |
-|`MI_VEL_7`  |         |Set velocity to 89               |
-|`MI_VEL_8`  |         |Set velocity to 102              |
-|`MI_VEL_9`  |         |Set velocity to 114              |
-|`MI_VEL_10` |         |Set velocity to 127              |
-|`MI_VELD`   |         |Decrease velocity                |
-|`MI_VELU`   |         |Increase velocity                |
-|`MI_CH1`    |         |Set channel to 1                 |
-|`MI_CH2`    |         |Set channel to 2                 |
-|`MI_CH3`    |         |Set channel to 3                 |
-|`MI_CH4`    |         |Set channel to 4                 |
-|`MI_CH5`    |         |Set channel to 5                 |
-|`MI_CH6`    |         |Set channel to 6                 |
-|`MI_CH7`    |         |Set channel to 7                 |
-|`MI_CH8`    |         |Set channel to 8                 |
-|`MI_CH9`    |         |Set channel to 9                 |
-|`MI_CH10`   |         |Set channel to 10                |
-|`MI_CH11`   |         |Set channel to 11                |
-|`MI_CH12`   |         |Set channel to 12                |
-|`MI_CH13`   |         |Set channel to 13                |
-|`MI_CH14`   |         |Set channel to 14                |
-|`MI_CH15`   |         |Set channel to 15                |
-|`MI_CH16`   |         |Set channel to 16                |
-|`MI_CHD`    |         |Decrease channel                 |
-|`MI_CHU`    |         |Increase channel                 |
-|`MI_ALLOFF` |         |Stop all notes                   |
-|`MI_SUS`    |         |Sustain                          |
-|`MI_PORT`   |         |Portmento                        |
-|`MI_SOST`   |         |Sostenuto                        |
-|`MI_SOFT`   |         |Soft Pedal                       |
-|`MI_LEG`    |         |Legato                           |
-|`MI_MOD`    |         |Modulation                       |
-|`MI_MODSD`  |         |Decrease modulation speed        |
-|`MI_MODSU`  |         |Increase modulation speed        |
-|`MI_BENDD`  |         |Bend pitch down                  |
-|`MI_BENDU`  |         |Bend pitch up                    |
+|Key                            |Aliases           |Description                      |
+|-------------------------------|------------------|---------------------------------|
+|`QK_MIDI_ON`                   |`MI_ON`           |Turn MIDI on                     |
+|`QK_MIDI_OFF`                  |`MI_OFF`          |Turn MIDI off                    |
+|`QK_MIDI_TOGGLE`               |`MI_TOGG`         |Toggle MIDI enabled              |
+|`QK_MIDI_NOTE_C_0`             |`MI_C`            |C octave 0                       |
+|`QK_MIDI_NOTE_C_SHARP_0`       |`MI_Cs`, `MI_Db`  |C♯/D♭ octave 0                   |
+|`QK_MIDI_NOTE_D_0`             |`MI_D`            |D octave 0                       |
+|`QK_MIDI_NOTE_D_SHARP_0`       |`MI_Ds`, `MI_Eb`  |D♯/E♭ octave 0                   |
+|`QK_MIDI_NOTE_E_0`             |`MI_E`            |E octave 0                       |
+|`QK_MIDI_NOTE_F_0`             |`MI_F`            |F octave 0                       |
+|`QK_MIDI_NOTE_F_SHARP_0`       |`MI_Fs`, `MI_Gb`  |F♯/G♭ octave 0                   |
+|`QK_MIDI_NOTE_G_0`             |`MI_G`            |G octave 0                       |
+|`QK_MIDI_NOTE_G_SHARP_0`       |`MI_Gs`, `MI_Ab`  |G♯/A♭ octave 0                   |
+|`QK_MIDI_NOTE_A_0`             |`MI_A`            |A octave 0                       |
+|`QK_MIDI_NOTE_A_SHARP_0`       |`MI_As`, `MI_Bb`  |A♯/B♭ octave 0                   |
+|`QK_MIDI_NOTE_B_0`             |`MI_B`            |B octave 0                       |
+|`QK_MIDI_NOTE_C_1`             |`MI_C1`           |C octave 1                       |
+|`QK_MIDI_NOTE_C_SHARP_1`       |`MI_Cs1`, `MI_Db1`|C♯/D♭ octave 1                   |
+|`QK_MIDI_NOTE_D_1`             |`MI_D1`           |D octave 1                       |
+|`QK_MIDI_NOTE_D_SHARP_1`       |`MI_Ds1`, `MI_Eb1`|D♯/E♭ octave 1                   |
+|`QK_MIDI_NOTE_E_1`             |`MI_E1`           |E octave 1                       |
+|`QK_MIDI_NOTE_F_1`             |`MI_F1`           |F octave 1                       |
+|`QK_MIDI_NOTE_F_SHARP_1`       |`MI_Fs1`, `MI_Gb1`|F♯/G♭ octave 1                   |
+|`QK_MIDI_NOTE_G_1`             |`MI_G1`           |G octave 1                       |
+|`QK_MIDI_NOTE_G_SHARP_1`       |`MI_Gs1`, `MI_Ab1`|G♯/A♭ octave 1                   |
+|`QK_MIDI_NOTE_A_1`             |`MI_A1`           |A octave 1                       |
+|`QK_MIDI_NOTE_A_SHARP_1`       |`MI_As1`, `MI_Bb1`|A♯/B♭ octave 1                   |
+|`QK_MIDI_NOTE_B_1`             |`MI_B1`           |B octave 1                       |
+|`QK_MIDI_NOTE_C_2`             |`MI_C2`           |C octave 2                       |
+|`QK_MIDI_NOTE_C_SHARP_2`       |`MI_Cs2`, `MI_Db2`|C♯/D♭ octave 2                   |
+|`QK_MIDI_NOTE_D_2`             |`MI_D2`           |D octave 2                       |
+|`QK_MIDI_NOTE_D_SHARP_2`       |`MI_Ds2`, `MI_Eb2`|D♯/E♭ octave 2                   |
+|`QK_MIDI_NOTE_E_2`             |`MI_E2`           |E octave 2                       |
+|`QK_MIDI_NOTE_F_2`             |`MI_F2`           |F octave 2                       |
+|`QK_MIDI_NOTE_F_SHARP_2`       |`MI_Fs2`, `MI_Gb2`|F♯/G♭ octave 2                   |
+|`QK_MIDI_NOTE_G_2`             |`MI_G2`           |G octave 2                       |
+|`QK_MIDI_NOTE_G_SHARP_2`       |`MI_Gs2`, `MI_Ab2`|G♯/A♭ octave 2                   |
+|`QK_MIDI_NOTE_A_2`             |`MI_A2`           |A octave 2                       |
+|`QK_MIDI_NOTE_A_SHARP_2`       |`MI_As2`, `MI_Bb2`|A♯/B♭ octave 2                   |
+|`QK_MIDI_NOTE_B_2`             |`MI_B2`           |B octave 2                       |
+|`QK_MIDI_NOTE_C_3`             |`MI_C3`           |C octave 3                       |
+|`QK_MIDI_NOTE_C_SHARP_3`       |`MI_Cs3`, `MI_Db3`|C♯/D♭ octave 3                   |
+|`QK_MIDI_NOTE_D_3`             |`MI_D3`           |D octave 3                       |
+|`QK_MIDI_NOTE_D_SHARP_3`       |`MI_Ds3`, `MI_Eb3`|D♯/E♭ octave 3                   |
+|`QK_MIDI_NOTE_E_3`             |`MI_E3`           |E octave 3                       |
+|`QK_MIDI_NOTE_F_3`             |`MI_F3`           |F octave 3                       |
+|`QK_MIDI_NOTE_F_SHARP_3`       |`MI_Fs3`, `MI_Gb3`|F♯/G♭ octave 3                   |
+|`QK_MIDI_NOTE_G_3`             |`MI_G3`           |G octave 3                       |
+|`QK_MIDI_NOTE_G_SHARP_3`       |`MI_Gs3`, `MI_Ab3`|G♯/A♭ octave 3                   |
+|`QK_MIDI_NOTE_A_3`             |`MI_A3`           |A octave 3                       |
+|`QK_MIDI_NOTE_A_SHARP_3`       |`MI_As3`, `MI_Bb3`|A♯/B♭ octave 3                   |
+|`QK_MIDI_NOTE_B_3`             |`MI_B3`           |B octave 3                       |
+|`QK_MIDI_NOTE_C_4`             |`MI_C4`           |C octave 4                       |
+|`QK_MIDI_NOTE_C_SHARP_4`       |`MI_Cs4`, `MI_Db4`|C♯/D♭ octave 4                   |
+|`QK_MIDI_NOTE_D_4`             |`MI_D4`           |D octave 4                       |
+|`QK_MIDI_NOTE_D_SHARP_4`       |`MI_Ds4`, `MI_Eb4`|D♯/E♭ octave 4                   |
+|`QK_MIDI_NOTE_E_4`             |`MI_E4`           |E octave 4                       |
+|`QK_MIDI_NOTE_F_4`             |`MI_F4`           |F octave 4                       |
+|`QK_MIDI_NOTE_F_SHARP_4`       |`MI_Fs4`, `MI_Gb4`|F♯/G♭ octave 4                   |
+|`QK_MIDI_NOTE_G_4`             |`MI_G4`           |G octave 4                       |
+|`QK_MIDI_NOTE_G_SHARP_4`       |`MI_Gs4`, `MI_Ab4`|G♯/A♭ octave 4                   |
+|`QK_MIDI_NOTE_A_4`             |`MI_A4`           |A octave 4                       |
+|`QK_MIDI_NOTE_A_SHARP_4`       |`MI_As4`, `MI_Bb4`|A♯/B♭ octave 4                   |
+|`QK_MIDI_NOTE_B_4`             |`MI_B4`           |B octave 4                       |
+|`QK_MIDI_NOTE_C_5`             |`MI_C5`           |C octave 5                       |
+|`QK_MIDI_NOTE_C_SHARP_5`       |`MI_Cs5`, `MI_Db5`|C♯/D♭ octave 5                   |
+|`QK_MIDI_NOTE_D_5`             |`MI_D5`           |D octave 5                       |
+|`QK_MIDI_NOTE_D_SHARP_5`       |`MI_Ds5`, `MI_Eb5`|D♯/E♭ octave 5                   |
+|`QK_MIDI_NOTE_E_5`             |`MI_E5`           |E octave 5                       |
+|`QK_MIDI_NOTE_F_5`             |`MI_F5`           |F octave 5                       |
+|`QK_MIDI_NOTE_F_SHARP_5`       |`MI_Fs5`, `MI_Gb5`|F♯/G♭ octave 5                   |
+|`QK_MIDI_NOTE_G_5`             |`MI_G5`           |G octave 5                       |
+|`QK_MIDI_NOTE_G_SHARP_5`       |`MI_Gs5`, `MI_Ab5`|G♯/A♭ octave 5                   |
+|`QK_MIDI_NOTE_A_5`             |`MI_A5`           |A octave 5                       |
+|`QK_MIDI_NOTE_A_SHARP_5`       |`MI_As5`, `MI_Bb5`|A♯/B♭ octave 5                   |
+|`QK_MIDI_NOTE_B_5`             |`MI_B5`           |B octave 5                       |
+|`QK_MIDI_OCTAVE_N2`            |`MI_OCN2`         |Set octave to -2                 |
+|`QK_MIDI_OCTAVE_N1`            |`MI_OCN1`         |Set octave to -1                 |
+|`QK_MIDI_OCTAVE_0`             |`MI_OC0`          |Set octave to 0                  |
+|`QK_MIDI_OCTAVE_1`             |`MI_OC1`          |Set octave to 1                  |
+|`QK_MIDI_OCTAVE_2`             |`MI_OC2`          |Set octave to 2                  |
+|`QK_MIDI_OCTAVE_3`             |`MI_OC3`          |Set octave to 3                  |
+|`QK_MIDI_OCTAVE_4`             |`MI_OC4`          |Set octave to 4                  |
+|`QK_MIDI_OCTAVE_5`             |`MI_OC5`          |Set octave to 5                  |
+|`QK_MIDI_OCTAVE_6`             |`MI_OC6`          |Set octave to 6                  |
+|`QK_MIDI_OCTAVE_7`             |`MI_OC7`          |Set octave to 7                  |
+|`QK_MIDI_OCTAVE_DOWN`          |`MI_OCTD`         |Move down an octave              |
+|`QK_MIDI_OCTAVE_UP`            |`MI_OCTU`         |Move up an octave                |
+|`QK_MIDI_TRANSPOSE_N6`         |`MI_TRN6`         |Set transposition to -6 semitones|
+|`QK_MIDI_TRANSPOSE_N5`         |`MI_TRN5`         |Set transposition to -5 semitones|
+|`QK_MIDI_TRANSPOSE_N4`         |`MI_TRN4`         |Set transposition to -4 semitones|
+|`QK_MIDI_TRANSPOSE_N3`         |`MI_TRN3`         |Set transposition to -3 semitones|
+|`QK_MIDI_TRANSPOSE_N2`         |`MI_TRN2`         |Set transposition to -2 semitones|
+|`QK_MIDI_TRANSPOSE_N1`         |`MI_TRN1`         |Set transposition to -1 semitone |
+|`QK_MIDI_TRANSPOSE_0`          |`MI_TR0`          |No transposition                 |
+|`QK_MIDI_TRANSPOSE_1`          |`MI_TR1`          |Set transposition to +1 semitone |
+|`QK_MIDI_TRANSPOSE_2`          |`MI_TR2`          |Set transposition to +2 semitones|
+|`QK_MIDI_TRANSPOSE_3`          |`MI_TR3`          |Set transposition to +3 semitones|
+|`QK_MIDI_TRANSPOSE_4`          |`MI_TR4`          |Set transposition to +4 semitones|
+|`QK_MIDI_TRANSPOSE_5`          |`MI_TR5`          |Set transposition to +5 semitones|
+|`QK_MIDI_TRANSPOSE_6`          |`MI_TR6`          |Set transposition to +6 semitones|
+|`QK_MIDI_TRANSPOSE_DOWN`       |`MI_TRSD`         |Decrease transposition           |
+|`QK_MIDI_TRANSPOSE_UP`         |`MI_TRSU`         |Increase transposition           |
+|`QK_MIDI_VELOCITY_0`           |`MI_VL0`          |Set velocity to 0                |
+|`QK_MIDI_VELOCITY_1`           |`MI_VL1`          |Set velocity to 12               |
+|`QK_MIDI_VELOCITY_2`           |`MI_VL2`          |Set velocity to 25               |
+|`QK_MIDI_VELOCITY_3`           |`MI_VL3`          |Set velocity to 38               |
+|`QK_MIDI_VELOCITY_4`           |`MI_VL4`          |Set velocity to 51               |
+|`QK_MIDI_VELOCITY_5`           |`MI_VL5`          |Set velocity to 64               |
+|`QK_MIDI_VELOCITY_6`           |`MI_VL6`          |Set velocity to 76               |
+|`QK_MIDI_VELOCITY_7`           |`MI_VL7`          |Set velocity to 89               |
+|`QK_MIDI_VELOCITY_8`           |`MI_VL8`          |Set velocity to 102              |
+|`QK_MIDI_VELOCITY_9`           |`MI_VL9`          |Set velocity to 114              |
+|`QK_MIDI_VELOCITY_10`          |`MI_VL10`         |Set velocity to 127              |
+|`QK_MIDI_VELOCITY_DOWN`        |`MI_VELD`         |Decrease velocity                |
+|`QK_MIDI_VELOCITY_UP`          |`MI_VELU`         |Increase velocity                |
+|`QK_MIDI_CHANNEL_1`            |`MI_CH1`          |Set channel to 1                 |
+|`QK_MIDI_CHANNEL_2`            |`MI_CH2`          |Set channel to 2                 |
+|`QK_MIDI_CHANNEL_3`            |`MI_CH3`          |Set channel to 3                 |
+|`QK_MIDI_CHANNEL_4`            |`MI_CH4`          |Set channel to 4                 |
+|`QK_MIDI_CHANNEL_5`            |`MI_CH5`          |Set channel to 5                 |
+|`QK_MIDI_CHANNEL_6`            |`MI_CH6`          |Set channel to 6                 |
+|`QK_MIDI_CHANNEL_7`            |`MI_CH7`          |Set channel to 7                 |
+|`QK_MIDI_CHANNEL_8`            |`MI_CH8`          |Set channel to 8                 |
+|`QK_MIDI_CHANNEL_9`            |`MI_CH9`          |Set channel to 9                 |
+|`QK_MIDI_CHANNEL_10`           |`MI_CH10`         |Set channel to 10                |
+|`QK_MIDI_CHANNEL_11`           |`MI_CH11`         |Set channel to 11                |
+|`QK_MIDI_CHANNEL_12`           |`MI_CH12`         |Set channel to 12                |
+|`QK_MIDI_CHANNEL_13`           |`MI_CH13`         |Set channel to 13                |
+|`QK_MIDI_CHANNEL_14`           |`MI_CH14`         |Set channel to 14                |
+|`QK_MIDI_CHANNEL_15`           |`MI_CH15`         |Set channel to 15                |
+|`QK_MIDI_CHANNEL_16`           |`MI_CH16`         |Set channel to 16                |
+|`QK_MIDI_CHANNEL_DOWN`         |`MI_CHND`         |Decrease channel                 |
+|`QK_MIDI_CHANNEL_UP`           |`MI_CHNU`         |Increase channel                 |
+|`QK_MIDI_ALL_NOTES_OFF`        |`MI_AOFF`         |Stop all notes                   |
+|`QK_MIDI_SUSTAIN`              |`MI_SUST`         |Sustain                          |
+|`QK_MIDI_PORTAMENTO`           |`MI_PORT`         |Portmento                        |
+|`QK_MIDI_SOSTENUTO`            |`MI_SOST`         |Sostenuto                        |
+|`QK_MIDI_SOFT`                 |`MI_SOFT`         |Soft Pedal                       |
+|`QK_MIDI_LEGATO`               |`MI_LEG`          |Legato                           |
+|`QK_MIDI_MODULATION`           |`MI_MOD`          |Modulation                       |
+|`QK_MIDI_MODULATION_SPEED_DOWN`|`MI_MODD`         |Decrease modulation speed        |
+|`QK_MIDI_MODULATION_SPEED_UP`  |`MI_MODU`         |Increase modulation speed        |
+|`QK_MIDI_PITCH_BEND_DOWN`      |`MI_BNDD`         |Bend pitch down                  |
+|`QK_MIDI_PITCH_BEND_UP`        |`MI_BNDU`         |Bend pitch up                    |
 
 ## Mouse Keys :id=mouse-keys
 
diff --git a/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c b/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
index b4e8572f79..b1ded193fe 100644
--- a/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
@@ -25,45 +25,45 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_IONIAN] = LAYOUT_ortho_3x10(
-    MI_C_1,  MI_F_1,  MI_B_1,  MI_E_2,  MI_A_2,  MI_D_3,  MI_G_3,  MI_C_4,  MI_OCTD,  MI_OCTU,
-    MI_D_1,  MI_G_1,  MI_C_2,  MI_F_2,  MI_B_2,  MI_E_3,  MI_A_3,  MI_D_4,  MI_TRNSD, MI_TRNSU,
-    MI_E_1,  MI_A_1,  MI_D_2,  MI_G_2,  MI_C_3,  MI_F_3,  MI_B_3,  MI_E_4,  MI_SUS, MENU
+    MI_C1,  MI_F1,  MI_B1,  MI_E2,  MI_A2,  MI_D3,  MI_G3,  MI_C4,  MI_OCTD, MI_OCTU,
+    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_B2,  MI_E3,  MI_A3,  MI_D4,  MI_TRSD, MI_TRSU,
+    MI_E1,  MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_B3,  MI_E4,  MI_SUST, MENU
   ),
 
   [_DORIAN] = LAYOUT_ortho_3x10(
-    MI_C_1,  MI_F_1,  MI_As_1, MI_Ds_2, MI_A_2,  MI_D_3,  MI_G_3,  MI_C_4,  _______, _______,
-    MI_D_1,  MI_G_1,  MI_C_2,  MI_F_2,  MI_As_2, MI_Ds_3, MI_A_3,  MI_D_4,  _______, _______,
-    MI_Ds_1, MI_A_1,  MI_D_2,  MI_G_2,  MI_C_3,  MI_F_3,  MI_As_3, MI_Ds_4, _______, _______
+    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_A2,  MI_D3,  MI_G3,  MI_C4,  _______, _______,
+    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_A3,  MI_D4,  _______, _______,
+    MI_Ds1, MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
   ),
 
   [_PHRYGIAN] = LAYOUT_ortho_3x10(
-    MI_C_1,  MI_F_1,  MI_As_1, MI_Ds_2, MI_Gs_2, MI_Cs_3, MI_G_3,  MI_C_4,  _______, _______,
-    MI_Cs_1, MI_G_1,  MI_C_2,  MI_F_2,  MI_As_2, MI_Ds_3, MI_Gs_3, MI_Cs_4, _______, _______,
-    MI_Ds_1, MI_Gs_1, MI_Cs_2, MI_G_2,  MI_C_3,  MI_F_3,  MI_As_3, MI_Ds_4, _______, _______
+    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_Gs2, MI_Cs3, MI_G3,  MI_C4,  _______, _______,
+    MI_Cs1, MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_Gs3, MI_Cs4, _______, _______,
+    MI_Ds1, MI_Gs1, MI_Cs2, MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
   ),
 
   [_LYDIAN] = LAYOUT_ortho_3x10(
-    MI_C_1,  MI_Fs_1, MI_B_1,  MI_E_2,  MI_A_2,  MI_D_3,  MI_G_3,  MI_C_4,  _______, _______,
-    MI_D_1,  MI_G_1,  MI_C_2,  MI_Fs_2, MI_B_2,  MI_E_3,  MI_A_3,  MI_D_4,  _______, _______,
-    MI_E_1,  MI_A_1,  MI_D_2,  MI_G_2,  MI_C_3,  MI_Fs_3, MI_B_3,  MI_E_4,  _______, _______
+    MI_C1,  MI_Fs1, MI_B1,  MI_E2,  MI_A2,  MI_D3,  MI_G3,  MI_C4,  _______, _______,
+    MI_D1,  MI_G1,  MI_C2,  MI_Fs2, MI_B2,  MI_E3,  MI_A3,  MI_D4,  _______, _______,
+    MI_E1,  MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_Fs3, MI_B3,  MI_E4,  _______, _______
   ),
 
   [_MIXOLYDIAN] = LAYOUT_ortho_3x10(
-    MI_C_1,  MI_F_1,  MI_As_1, MI_E_2,  MI_A_2,  MI_D_3,  MI_G_3,  MI_C_4,  _______, _______,
-    MI_D_1,  MI_G_1,  MI_C_2,  MI_F_2,  MI_As_2, MI_E_3,  MI_A_3,  MI_D_4,  _______, _______,
-    MI_E_1,  MI_A_1,  MI_D_2,  MI_G_2,  MI_C_3,  MI_F_3,  MI_As_3, MI_E_4,  _______, _______
+    MI_C1,  MI_F1,  MI_As1, MI_E2,  MI_A2,  MI_D3,  MI_G3,  MI_C4,  _______, _______,
+    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_E3,  MI_A3,  MI_D4,  _______, _______,
+    MI_E1,  MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_E4,  _______, _______
   ),
 
   [_AEOLIAN] = LAYOUT_ortho_3x10(
-    MI_C_1,  MI_F_1,  MI_As_1, MI_Ds_2, MI_Gs_2, MI_D_3,  MI_G_3,  MI_C_4,  _______, _______,
-    MI_D_1,  MI_G_1,  MI_C_2,  MI_F_2,  MI_As_2, MI_Ds_3, MI_Gs_3, MI_D_4,  _______, _______,
-    MI_Ds_1, MI_Gs_1, MI_D_2,  MI_G_2,  MI_C_3,  MI_F_3,  MI_As_3, MI_Ds_4, _______, _______
+    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_Gs2, MI_D3,  MI_G3,  MI_C4,  _______, _______,
+    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_Gs3, MI_D4,  _______, _______,
+    MI_Ds1, MI_Gs1, MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
   ),
 
   [_LOCRIAN] = LAYOUT_ortho_3x10(
-    MI_C_1,  MI_F_1,  MI_As_1, MI_Ds_2, MI_Gs_2, MI_Cs_3, MI_Fs_3, MI_C_4,  _______, _______,
-    MI_Cs_1, MI_Fs_1, MI_C_2,  MI_F_2,  MI_As_2, MI_Ds_3, MI_Gs_3, MI_Cs_4, _______, _______,
-    MI_Ds_1, MI_Gs_1, MI_Cs_2, MI_Fs_2, MI_C_3,  MI_F_3,  MI_As_3, MI_Ds_4, _______, _______
+    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_Gs2, MI_Cs3, MI_Fs3, MI_C4,  _______, _______,
+    MI_Cs1, MI_Fs1, MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_Gs3, MI_Cs4, _______, _______,
+    MI_Ds1, MI_Gs1, MI_Cs2, MI_Fs2, MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
   ),
 
   [_MENU] = LAYOUT_ortho_3x10(
diff --git a/keyboards/bandominedoni/keymaps/default/keymap.c b/keyboards/bandominedoni/keymaps/default/keymap.c
index 90e3f3417e..880dc4bcc0 100644
--- a/keyboards/bandominedoni/keymaps/default/keymap.c
+++ b/keyboards/bandominedoni/keymaps/default/keymap.c
@@ -34,33 +34,33 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_OPEN] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Cs_2, MI_F_2, MI_Gs_3,
-       MI_E_1, MI_A_1, MI_G_2, MI_Ds_2, MI_F_3, MI_As_2, MI_F_1,
-         MI_D_2, MI_A_2, MI_C_3, MI_E_3, MI_C_2, MI_G_1, TG_SWAP,
-       MI_E_2, MI_Gs_2, MI_B_2, MI_D_3, MI_Fs_3, MI_Cs_3, MI_Fs_1,
-     MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
+                  MI_Gs1, MI_As1, MI_Cs2, MI_F2, MI_Gs3,
+       MI_E1, MI_A1, MI_G2, MI_Ds2, MI_F3, MI_As2, MI_F1,
+         MI_D2, MI_A2, MI_C3, MI_E3, MI_C2, MI_G1, TG_SWAP,
+       MI_E2, MI_Gs2, MI_B2, MI_D3, MI_Fs3, MI_Cs3, MI_Fs1,
+     MI_D1, MI_B1, MI_G3, MI_A3, MI_Ds3, MI_Fs2, MI_Ds1, MI_C1,
 
-     MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
-        MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
-     TG_SWAP, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
-       MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_Ds_4, MI_Fs_4, MI_A_4, MI_Cs_5, MI_G_4
+     MO_SWAP,    MI_B5, MI_Gs5, MI_G5, MI_F5,     FN_MUTE,
+         MI_Cs3, MI_A5, MI_Fs5, MI_E5, MI_Ds5,
+        MI_C3, MI_D3, MI_G3, MI_As4, MI_C5, MI_D5,
+     TG_SWAP, MI_B2, MI_E3, MI_Cs4, MI_Fs3, MI_A3, MI_C4, MI_E4,
+       MI_A2, MI_F3, MI_As3, MI_Gs3, MI_B3, MI_D4, MI_Gs4, MI_B4,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_Ds4, MI_Fs4, MI_A4, MI_Cs5, MI_G4
     ),
 
     [_CLOSE] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Ds_2, MI_Ds_3, MI_G_3,
-       MI_D_1, MI_D_2, MI_As_2, MI_C_3, MI_Cs_2, MI_C_2, MI_Fs_1,
-         MI_G_1, MI_G_2, MI_B_2, MI_D_3, MI_F_3, MI_Fs_2, TG_SWAP,
-       MI_A_1, MI_E_2, MI_A_2, MI_Cs_3, MI_E_3, MI_Gs_2, MI_B_1,
-     MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
+                  MI_Gs1, MI_As1, MI_Ds2, MI_Ds3, MI_G3,
+       MI_D1, MI_D2, MI_As2, MI_C3, MI_Cs2, MI_C2, MI_Fs1,
+         MI_G1, MI_G2, MI_B2, MI_D3, MI_F3, MI_Fs2, TG_SWAP,
+       MI_A1, MI_E2, MI_A2, MI_Cs3, MI_E3, MI_Gs2, MI_B1,
+     MI_E1, MI_E2, MI_Fs3, MI_Gs3, MI_B3, MI_F2, MI_Cs1, MI_F1,
 
-     MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
-        MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
-     TG_SWAP, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
-       MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_E_4, MI_Gs_4, MI_B_4, MI_E_5, MI_Ds_4
+     MO_SWAP,    MI_A5, MI_Gs5, MI_Fs5, MI_F5,     FN_MUTE,
+         MI_C3, MI_G5, MI_As4, MI_C5, MI_Ds5,
+        MI_D3, MI_Cs3, MI_Gs3, MI_As3, MI_C4, MI_D5,
+     TG_SWAP, MI_B2, MI_Fs3, MI_Fs4, MI_G3, MI_B3, MI_D4, MI_G4,
+       MI_A2, MI_F3, MI_E3, MI_A3, MI_Cs4, MI_E4, MI_A4, MI_Cs5,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_E4, MI_Gs4, MI_B4, MI_E5, MI_Ds4
     ),
 
     [_FN] = LAYOUT(
@@ -88,8 +88,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void keyboard_post_init_user(void) {
-    //  Set octave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 6629900ceb..5ef921a6d4 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -64,33 +64,33 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_OPEN] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Cs_2, MI_F_2, MI_Gs_3,
-       MI_E_1, MI_A_1, MI_G_2, MI_Ds_2, MI_F_3, MI_As_2, MI_F_1,
-         MI_D_2, MI_A_2, MI_C_3, MI_E_3, MI_C_2, MI_G_1, TG_SWAP,
-       MI_E_2, MI_Gs_2, MI_B_2, MI_D_3, MI_Fs_3, MI_Cs_3, MI_Fs_1,
-     MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
+                  MI_Gs1, MI_As1, MI_Cs2, MI_F2, MI_Gs3,
+       MI_E1, MI_A1, MI_G2, MI_Ds2, MI_F3, MI_As2, MI_F1,
+         MI_D2, MI_A2, MI_C3, MI_E3, MI_C2, MI_G1, TG_SWAP,
+       MI_E2, MI_Gs2, MI_B2, MI_D3, MI_Fs3, MI_Cs3, MI_Fs1,
+     MI_D1, MI_B1, MI_G3, MI_A3, MI_Ds3, MI_Fs2, MI_Ds1, MI_C1,
 
-     MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
-        MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
-     TG_SWAP, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
-       MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_Ds_4, MI_Fs_4, MI_A_4, MI_Cs_5, MI_G_4
+     MO_SWAP,    MI_B5, MI_Gs5, MI_G5, MI_F5,     FN_MUTE,
+         MI_Cs3, MI_A5, MI_Fs5, MI_E5, MI_Ds5,
+        MI_C3, MI_D3, MI_G3, MI_As4, MI_C5, MI_D5,
+     TG_SWAP, MI_B2, MI_E3, MI_Cs4, MI_Fs3, MI_A3, MI_C4, MI_E4,
+       MI_A2, MI_F3, MI_As3, MI_Gs3, MI_B3, MI_D4, MI_Gs4, MI_B4,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_Ds4, MI_Fs4, MI_A4, MI_Cs5, MI_G4
     ),
 
     [_CLOSE] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Ds_2, MI_Ds_3, MI_G_3,
-       MI_D_1, MI_D_2, MI_As_2, MI_C_3, MI_Cs_2, MI_C_2, MI_Fs_1,
-         MI_G_1, MI_G_2, MI_B_2, MI_D_3, MI_F_3, MI_Fs_2, TG_SWAP,
-       MI_A_1, MI_E_2, MI_A_2, MI_Cs_3, MI_E_3, MI_Gs_2, MI_B_1,
-     MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
+                  MI_Gs1, MI_As1, MI_Ds2, MI_Ds3, MI_G3,
+       MI_D1, MI_D2, MI_As2, MI_C3, MI_Cs2, MI_C2, MI_Fs1,
+         MI_G1, MI_G2, MI_B2, MI_D3, MI_F3, MI_Fs2, TG_SWAP,
+       MI_A1, MI_E2, MI_A2, MI_Cs3, MI_E3, MI_Gs2, MI_B1,
+     MI_E1, MI_E2, MI_Fs3, MI_Gs3, MI_B3, MI_F2, MI_Cs1, MI_F1,
 
-     MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
-        MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
-     TG_SWAP, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
-       MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_E_4, MI_Gs_4, MI_B_4, MI_E_5, MI_Ds_4
+     MO_SWAP,    MI_A5, MI_Gs5, MI_Fs5, MI_F5,     FN_MUTE,
+         MI_C3, MI_G5, MI_As4, MI_C5, MI_Ds5,
+        MI_D3, MI_Cs3, MI_Gs3, MI_As3, MI_C4, MI_D5,
+     TG_SWAP, MI_B2, MI_Fs3, MI_Fs4, MI_G3, MI_B3, MI_D4, MI_G4,
+       MI_A2, MI_F3, MI_E3, MI_A3, MI_Cs4, MI_E4, MI_A4, MI_Cs5,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_E4, MI_Gs4, MI_B4, MI_E5, MI_Ds4
     ),
 
     [_QWERTY] = LAYOUT_wrapper(
@@ -166,8 +166,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void my_init(void){
-    //  Set octave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
diff --git a/keyboards/bandominedoni/keymaps/lednotg/keymap.c b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
index b98d9a18b8..4ffe7dae6d 100644
--- a/keyboards/bandominedoni/keymaps/lednotg/keymap.c
+++ b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
@@ -64,33 +64,33 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_OPEN] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Cs_2, MI_F_2, MI_Gs_3,
-       MI_E_1, MI_A_1, MI_G_2, MI_Ds_2, MI_F_3, MI_As_2, MI_F_1,
-         MI_D_2, MI_A_2, MI_C_3, MI_E_3, MI_C_2, MI_G_1, MI_B,
-       MI_E_2, MI_Gs_2, MI_B_2, MI_D_3, MI_Fs_3, MI_Cs_3, MI_Fs_1,
-     MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
+                  MI_Gs1, MI_As1, MI_Cs2, MI_F2, MI_Gs3,
+       MI_E1, MI_A1, MI_G2, MI_Ds2, MI_F3, MI_As2, MI_F1,
+         MI_D2, MI_A2, MI_C3, MI_E3, MI_C2, MI_G1, MI_B,
+       MI_E2, MI_Gs2, MI_B2, MI_D3, MI_Fs3, MI_Cs3, MI_Fs1,
+     MI_D1, MI_B1, MI_G3, MI_A3, MI_Ds3, MI_Fs2, MI_Ds1, MI_C1,
 
-     MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
-        MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
-     MI_G_2, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
-       MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_Ds_4, MI_Fs_4, MI_A_4, MI_Cs_5, MI_G_4
+     MO_SWAP,    MI_B5, MI_Gs5, MI_G5, MI_F5,     FN_MUTE,
+         MI_Cs3, MI_A5, MI_Fs5, MI_E5, MI_Ds5,
+        MI_C3, MI_D3, MI_G3, MI_As4, MI_C5, MI_D5,
+     MI_G2, MI_B2, MI_E3, MI_Cs4, MI_Fs3, MI_A3, MI_C4, MI_E4,
+       MI_A2, MI_F3, MI_As3, MI_Gs3, MI_B3, MI_D4, MI_Gs4, MI_B4,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_Ds4, MI_Fs4, MI_A4, MI_Cs5, MI_G4
     ),
 
     [_CLOSE] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Ds_2, MI_Ds_3, MI_G_3,
-       MI_D_1, MI_D_2, MI_As_2, MI_C_3, MI_Cs_2, MI_C_2, MI_Fs_1,
-         MI_G_1, MI_G_2, MI_B_2, MI_D_3, MI_F_3, MI_Fs_2, MI_B,
-       MI_A_1, MI_E_2, MI_A_2, MI_Cs_3, MI_E_3, MI_Gs_2, MI_B_1,
-     MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
+                  MI_Gs1, MI_As1, MI_Ds2, MI_Ds3, MI_G3,
+       MI_D1, MI_D2, MI_As2, MI_C3, MI_Cs2, MI_C2, MI_Fs1,
+         MI_G1, MI_G2, MI_B2, MI_D3, MI_F3, MI_Fs2, MI_B,
+       MI_A1, MI_E2, MI_A2, MI_Cs3, MI_E3, MI_Gs2, MI_B1,
+     MI_E1, MI_E2, MI_Fs3, MI_Gs3, MI_B3, MI_F2, MI_Cs1, MI_F1,
 
-     MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
-        MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
-     MI_G_2, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
-       MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_E_4, MI_Gs_4, MI_B_4, MI_E_5, MI_Ds_4
+     MO_SWAP,    MI_A5, MI_Gs5, MI_Fs5, MI_F5,     FN_MUTE,
+         MI_C3, MI_G5, MI_As4, MI_C5, MI_Ds5,
+        MI_D3, MI_Cs3, MI_Gs3, MI_As3, MI_C4, MI_D5,
+     MI_G2, MI_B2, MI_Fs3, MI_Fs4, MI_G3, MI_B3, MI_D4, MI_G4,
+       MI_A2, MI_F3, MI_E3, MI_A3, MI_Cs4, MI_E4, MI_A4, MI_Cs5,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_E4, MI_Gs4, MI_B4, MI_E5, MI_Ds4
     ),
 
     [_QWERTY] = LAYOUT_wrapper(
@@ -166,8 +166,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void my_init(void){
-    //  Set octave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index 8273140e4c..859c74e33a 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -35,33 +35,33 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_OPEN] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Cs_2, MI_F_2, MI_Gs_3,
-       MI_E_1, MI_A_1, MI_G_2, MI_Ds_2, MI_F_3, MI_As_2, MI_F_1,
-         MI_D_2, MI_A_2, MI_C_3, MI_E_3, MI_C_2, MI_G_1, TG_SWAP,
-       MI_E_2, MI_Gs_2, MI_B_2, MI_D_3, MI_Fs_3, MI_Cs_3, MI_Fs_1,
-     MI_D_1, MI_B_1, MI_G_3, MI_A_3, MI_Ds_3, MI_Fs_2, MI_Ds_1, MI_C_1,
+                  MI_Gs1, MI_As1, MI_Cs2, MI_F2, MI_Gs3,
+       MI_E1, MI_A1, MI_G2, MI_Ds2, MI_F3, MI_As2, MI_F1,
+         MI_D2, MI_A2, MI_C3, MI_E3, MI_C2, MI_G1, TG_SWAP,
+       MI_E2, MI_Gs2, MI_B2, MI_D3, MI_Fs3, MI_Cs3, MI_Fs1,
+     MI_D1, MI_B1, MI_G3, MI_A3, MI_Ds3, MI_Fs2, MI_Ds1, MI_C1,
 
-     MO_SWAP,    MI_B_5, MI_Gs_5, MI_G_5, MI_F_5,     FN_MUTE,
-         MI_Cs_3, MI_A_5, MI_Fs_5, MI_E_5, MI_Ds_5,
-        MI_C_3, MI_D_3, MI_G_3, MI_As_4, MI_C_5, MI_D_5,
-     TG_SWAP, MI_B_2, MI_E_3, MI_Cs_4, MI_Fs_3, MI_A_3, MI_C_4, MI_E_4,
-       MI_A_2, MI_F_3, MI_As_3, MI_Gs_3, MI_B_3, MI_D_4, MI_Gs_4, MI_B_4,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_Ds_4, MI_Fs_4, MI_A_4, MI_Cs_5, MI_G_4
+     MO_SWAP,    MI_B5, MI_Gs5, MI_G5, MI_F5,     FN_MUTE,
+         MI_Cs3, MI_A5, MI_Fs5, MI_E5, MI_Ds5,
+        MI_C3, MI_D3, MI_G3, MI_As4, MI_C5, MI_D5,
+     TG_SWAP, MI_B2, MI_E3, MI_Cs4, MI_Fs3, MI_A3, MI_C4, MI_E4,
+       MI_A2, MI_F3, MI_As3, MI_Gs3, MI_B3, MI_D4, MI_Gs4, MI_B4,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_Ds4, MI_Fs4, MI_A4, MI_Cs5, MI_G4
     ),
 
     [_CLOSE] = LAYOUT(
-                  MI_Gs_1, MI_As_1, MI_Ds_2, MI_Ds_3, MI_G_3,
-       MI_D_1, MI_D_2, MI_As_2, MI_C_3, MI_Cs_2, MI_C_2, MI_Fs_1,
-         MI_G_1, MI_G_2, MI_B_2, MI_D_3, MI_F_3, MI_Fs_2, TG_SWAP,
-       MI_A_1, MI_E_2, MI_A_2, MI_Cs_3, MI_E_3, MI_Gs_2, MI_B_1,
-     MI_E_1, MI_E_2, MI_Fs_3, MI_Gs_3, MI_B_3, MI_F_2, MI_Cs_1, MI_F_1,
+                  MI_Gs1, MI_As1, MI_Ds2, MI_Ds3, MI_G3,
+       MI_D1, MI_D2, MI_As2, MI_C3, MI_Cs2, MI_C2, MI_Fs1,
+         MI_G1, MI_G2, MI_B2, MI_D3, MI_F3, MI_Fs2, TG_SWAP,
+       MI_A1, MI_E2, MI_A2, MI_Cs3, MI_E3, MI_Gs2, MI_B1,
+     MI_E1, MI_E2, MI_Fs3, MI_Gs3, MI_B3, MI_F2, MI_Cs1, MI_F1,
 
-     MO_SWAP,    MI_A_5, MI_Gs_5, MI_Fs_5, MI_F_5,     FN_MUTE,
-         MI_C_3, MI_G_5, MI_As_4, MI_C_5, MI_Ds_5,
-        MI_D_3, MI_Cs_3, MI_Gs_3, MI_As_3, MI_C_4, MI_D_5,
-     TG_SWAP, MI_B_2, MI_Fs_3, MI_Fs_4, MI_G_3, MI_B_3, MI_D_4, MI_G_4,
-       MI_A_2, MI_F_3, MI_E_3, MI_A_3, MI_Cs_4, MI_E_4, MI_A_4, MI_Cs_5,
-     MI_Gs_2, MI_As_2, MI_Ds_3, MI_F_4, MI_E_4, MI_Gs_4, MI_B_4, MI_E_5, MI_Ds_4
+     MO_SWAP,    MI_A5, MI_Gs5, MI_Fs5, MI_F5,     FN_MUTE,
+         MI_C3, MI_G5, MI_As4, MI_C5, MI_Ds5,
+        MI_D3, MI_Cs3, MI_Gs3, MI_As3, MI_C4, MI_D5,
+     TG_SWAP, MI_B2, MI_Fs3, MI_Fs4, MI_G3, MI_B3, MI_D4, MI_G4,
+       MI_A2, MI_F3, MI_E3, MI_A3, MI_Cs4, MI_E4, MI_A4, MI_Cs5,
+     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_E4, MI_Gs4, MI_B4, MI_E5, MI_Ds4
     ),
 
     [_MISC] = LAYOUT(
@@ -105,8 +105,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void my_init(void){
-    //  Set octave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
diff --git a/keyboards/chromatonemini/keymaps/default/keymap.c b/keyboards/chromatonemini/keymaps/default/keymap.c
index 0316ebc247..b657ace9b8 100644
--- a/keyboards/chromatonemini/keymaps/default/keymap.c
+++ b/keyboards/chromatonemini/keymaps/default/keymap.c
@@ -33,16 +33,16 @@ enum custom_keycodes {
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,          MI_SUS,
-            MI_BENDU,
-        MI_TRNSD, MI_TRNSU,  MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+            FN_MUTE,          MI_SUST,
+            MI_BNDU,
+        MI_TRSD,  MI_TRSU,   MI_C2, MI_D2, MI_E2,  MI_Fs2, MI_Ab2, MI_Bb2, MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            MI_BNDD,            MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2, MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* RESERVE */
@@ -71,8 +71,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
-    //  Set octave to MI_OCT_1
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
     default_layer_set(1UL << _BASE);
diff --git a/keyboards/chromatonemini/keymaps/led/keymap.c b/keyboards/chromatonemini/keymaps/led/keymap.c
index bd24306271..c1187a7b10 100644
--- a/keyboards/chromatonemini/keymaps/led/keymap.c
+++ b/keyboards/chromatonemini/keymaps/led/keymap.c
@@ -206,7 +206,7 @@ static uint8_t my_tone_status[MY_TONE_COUNT];
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 static bool is_trans_mode = false;     //  By default, shift mode is chosen.
 
@@ -215,57 +215,57 @@ static uint8_t key_separator_col = _KEY01;  //  (_KEY01 .. _KEY37).     By defau
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUS,
-            MI_BENDU,
-        SHIFT_L, SHIFT_R,    MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+            FN_MUTE,         MI_SUST,
+            MI_BNDU,
+        SHIFT_L, SHIFT_R,    MI_C2, MI_D2, MI_E2,  MI_Fs2, MI_Ab2, MI_Bb2, MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            MI_BNDD,            MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2, MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* 1 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPALEFTOCT] = LAYOUT(
             _______,          _______,
             _______,
-        SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+        SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* Half ch2, half ch1 (normal) */
     [_SEPAHALF] = LAYOUT(
             _______,           _______,
             _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* 2 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPARIGHTOCT] = LAYOUT(
             _______,           _______,
             _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* TRANS   This layer must locate 1 layer below _FN layer. */
     [_TRANS] = LAYOUT(
             _______,           _______,
             _______,
-        MI_TRNSD, MI_TRNSU,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        MI_TRSD,  MI_TRSU,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
     /* Flip Base    SFIFTUP and SHIFT_L are swapped. */
     [_FLIPBASE] = LAYOUT(
-            FN_MUTE,          MI_SUS,
-            MI_BENDU,
-        SHIFT_L, SHIFT_R,     MI_C_5, MI_Bb_4, MI_Ab_4,  MI_Fs_4, MI_E_4, MI_D_4, MI_C_4, MI_Bb_3, MI_Ab_3, MI_Fs_3, MI_E_3, MI_D_3, MI_C_3,  MI_Bb_2,  MI_Ab_2, MI_Fs_2, MI_E_2, MI_D_2, MI_C_2,
-            MI_BENDD,           MI_B_4, MI_A_4, MI_G_4,  MI_F_4,  MI_Eb_4,  MI_Db_4, MI_B_3, MI_A_3, MI_G_3,  MI_F_3, MI_Eb_3,  MI_Db_3, MI_B_2, MI_A_2, MI_G_2,  MI_F_2,  MI_Eb_2,  MI_Db_2
+            FN_MUTE,          MI_SUST,
+            MI_BNDU,
+        SHIFT_L, SHIFT_R,     MI_C5, MI_Bb4, MI_Ab4,  MI_Fs4, MI_E4, MI_D4, MI_C4, MI_Bb3, MI_Ab3, MI_Fs3, MI_E3, MI_D3, MI_C3,  MI_Bb2,  MI_Ab2, MI_Fs2, MI_E2, MI_D2, MI_C2,
+            MI_BNDD,            MI_B4, MI_A4, MI_G4,  MI_F4,  MI_Eb4,  MI_Db4, MI_B3, MI_A3, MI_G3,  MI_F3, MI_Eb3,  MI_Db3, MI_B2, MI_A2, MI_G2,  MI_F2,  MI_Eb2,  MI_Db2
     ),
 
-    /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRNSU and MI_TRNSD are swapped. */
+    /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRSU and MI_TRSD are swapped. */
     [_FLIPTRANS] = LAYOUT(
             _______,          _______,
             _______,
-        MI_TRNSU, MI_TRNSD,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        MI_TRSU,  MI_TRSD,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
@@ -292,8 +292,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
-    //  Set octave to MI_OCT_1
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
     default_layer_set(_LS_BASE);
diff --git a/keyboards/chromatonemini/keymaps/party/keymap.c b/keyboards/chromatonemini/keymaps/party/keymap.c
index b5ae0244df..4c8a0316c4 100644
--- a/keyboards/chromatonemini/keymaps/party/keymap.c
+++ b/keyboards/chromatonemini/keymaps/party/keymap.c
@@ -206,7 +206,7 @@ static uint8_t my_tone_status[MY_TONE_COUNT];
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 static bool is_trans_mode = false;     //  By default, shift mode is chosen.
 
@@ -215,57 +215,57 @@ static uint8_t key_separator_col = _KEY01;  //  (_KEY01 .. _KEY37).     By defau
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUS,
-            MI_BENDU,
-        SHIFT_L, SHIFT_R,    MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+            FN_MUTE,         MI_SUST,
+            MI_BNDU,
+        SHIFT_L, SHIFT_R,    MI_C2, MI_D2, MI_E2,  MI_Fs2, MI_Ab2, MI_Bb2, MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            MI_BNDD,            MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2, MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* 1 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPALEFTOCT] = LAYOUT(
             _______,          _______,
             _______,
-        SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+        SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* Half ch2, half ch1 (normal) */
     [_SEPAHALF] = LAYOUT(
             _______,           _______,
             _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* 2 octave on the left side is ch2, others are ch1 (normal) */
     [_SEPARIGHTOCT] = LAYOUT(
             _______,           _______,
             _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* TRANS   This layer must locate 1 layer below _FN layer. */
     [_TRANS] = LAYOUT(
             _______,           _______,
             _______,
-        MI_TRNSD, MI_TRNSU,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        MI_TRSD,  MI_TRSU,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
     /* Flip Base    SFIFTUP and SHIFT_L are swapped. */
     [_FLIPBASE] = LAYOUT(
-            FN_MUTE,          MI_SUS,
-            MI_BENDU,
-        SHIFT_L, SHIFT_R,     MI_C_5, MI_Bb_4, MI_Ab_4,  MI_Fs_4, MI_E_4, MI_D_4, MI_C_4, MI_Bb_3, MI_Ab_3, MI_Fs_3, MI_E_3, MI_D_3, MI_C_3,  MI_Bb_2,  MI_Ab_2, MI_Fs_2, MI_E_2, MI_D_2, MI_C_2,
-            MI_BENDD,           MI_B_4, MI_A_4, MI_G_4,  MI_F_4,  MI_Eb_4,  MI_Db_4, MI_B_3, MI_A_3, MI_G_3,  MI_F_3, MI_Eb_3,  MI_Db_3, MI_B_2, MI_A_2, MI_G_2,  MI_F_2,  MI_Eb_2,  MI_Db_2
+            FN_MUTE,          MI_SUST,
+            MI_BNDU,
+        SHIFT_L, SHIFT_R,     MI_C5, MI_Bb4, MI_Ab4,  MI_Fs4, MI_E4, MI_D4, MI_C4, MI_Bb3, MI_Ab3, MI_Fs3, MI_E3, MI_D3, MI_C3,  MI_Bb2,  MI_Ab2, MI_Fs2, MI_E2, MI_D2, MI_C2,
+            MI_BNDD,            MI_B4, MI_A4, MI_G4,  MI_F4,  MI_Eb4,  MI_Db4, MI_B3, MI_A3, MI_G3,  MI_F3, MI_Eb3,  MI_Db3, MI_B2, MI_A2, MI_G2,  MI_F2,  MI_Eb2,  MI_Db2
     ),
 
-    /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRNSU and MI_TRNSD are swapped. */
+    /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRSU and MI_TRSD are swapped. */
     [_FLIPTRANS] = LAYOUT(
             _______,          _______,
             _______,
-        MI_TRNSU, MI_TRNSD,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        MI_TRSU,  MI_TRSD,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
@@ -293,8 +293,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
-    //  Set octave to MI_OCT_1
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
     default_layer_set(_LS_BASE);
diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c
index 3a3a5f415e..9269448567 100644
--- a/keyboards/chromatonemini/keymaps/via/keymap.c
+++ b/keyboards/chromatonemini/keymaps/via/keymap.c
@@ -54,24 +54,24 @@ enum custom_keycodes {
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 static bool is_trans_mode = false;     //  By default, shift mode is chosen.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUS,
-            MI_BENDU,
-        SHIFT_L, SHIFT_R,    MI_C_2, MI_D_2, MI_E_2,  MI_Fs_2, MI_Ab_2, MI_Bb_2, MI_C_3, MI_D_3, MI_E_3, MI_Fs_3, MI_Ab_3, MI_Bb_3, MI_C_4,  MI_D_4,  MI_E_4, MI_Fs_4, MI_Ab_4, MI_Bb_4, MI_C_5,
-            MI_BENDD,           MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2, MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3, MI_A_3,  MI_B_3, MI_Db_4, MI_Eb_4, MI_F_4,  MI_G_4,  MI_A_4,  MI_B_4
+            FN_MUTE,         MI_SUST,
+            MI_BNDU,
+        SHIFT_L, SHIFT_R,    MI_C2, MI_D2, MI_E2,  MI_Fs2, MI_Ab2, MI_Bb2, MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
+            MI_BNDD,            MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2, MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
     ),
 
     /* TRANS   This layer must locate 1 layer below _FN layer. */
     [_TRANS] = LAYOUT(
             _______,           _______,
             _______,
-        MI_TRNSD, MI_TRNSU,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        MI_TRSD,  MI_TRSU,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
@@ -102,8 +102,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 void my_init(void){
-    //  Set octave to MI_OCT_1
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
     default_layer_set(_LS_BASE);
diff --git a/keyboards/ckeys/thedora/keymaps/default/keymap.c b/keyboards/ckeys/thedora/keymaps/default/keymap.c
index 0c36008bd8..7699fda766 100755
--- a/keyboards/ckeys/thedora/keymaps/default/keymap.c
+++ b/keyboards/ckeys/thedora/keymaps/default/keymap.c
@@ -97,10 +97,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
 
     [_MIDI] = LAYOUT(
-                 MI_Ds_3, MI_E_3,  MI_F_3,  MI_Fs_3, MI_G_3,
-                 MI_As_2, MI_B_2,  MI_C_3,  MI_Cs_3, MI_D_3,
-                 MI_F_2,  MI_Fs_2, MI_G_2,  MI_Gs_2, TG(_MIDI),
-        _______, MI_C_2,  MI_Cs_2, MI_D_2,  MI_Ds_2, MI_E_2
+                 MI_Ds3, MI_E3,  MI_F3,  MI_Fs3, MI_G3,
+                 MI_As2, MI_B2,  MI_C3,  MI_Cs3, MI_D3,
+                 MI_F2,  MI_Fs2, MI_G2,  MI_Gs2, TG(_MIDI),
+        _______, MI_C2,  MI_Cs2, MI_D2,  MI_Ds2, MI_E2
     ),
 
     // MOUSE LAYER
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index a537a36d2e..238147537d 100644
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
   /* Keymap _MI: MIDI layer (Advanced)*/
   [_MI] = LAYOUT(
-    TO_BASE,MI_VEL_1,MI_VEL_2,MI_VEL_3,MI_VEL_4,MI_VEL_5,MI_VEL_6,MI_VEL_7,MI_VEL_8,MI_VEL_9,MI_VEL_10,  MI_CHD,   MI_CHU, XXXXXXX, XXXXXXX,          XXXXXXX,
-    XXXXXXX, XXXXXXX,   MI_Cs,   MI_Ds, XXXXXXX,   MI_Fs,   MI_Gs,   MI_As, XXXXXXX, MI_Cs_1,  MI_Ds_1, XXXXXXX,  MI_Fs_1, XXXXXXX,                   XXXXXXX,
-     MI_MOD,    MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,  MI_C_1,  MI_D_1,   MI_E_1,  MI_F_1,   MI_G_1, XXXXXXX,
-     MI_SUS, XXXXXXX, MI_OCTD, MI_OCTU,MI_MODSD,MI_MODSU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MI_TRNSD,MI_TRNSU,MI_TRNS_0,  MI_SUS,          XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,                 MI_ALLOFF, MI_ALLOFF,                   XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
+    TO_BASE,  MI_VL1,  MI_VL2,  MI_VL3,  MI_VL4,  MI_VL5,  MI_VL6,  MI_VL7,  MI_VL8,  MI_VL9,  MI_VL10, MI_CHND,  MI_CHNU, XXXXXXX, XXXXXXX,          XXXXXXX,
+    XXXXXXX, XXXXXXX,   MI_Cs,   MI_Ds, XXXXXXX,   MI_Fs,   MI_Gs,   MI_As, XXXXXXX, MI_Cs1,  MI_Ds1, XXXXXXX,  MI_Fs1, XXXXXXX,                   XXXXXXX,
+     MI_MOD,    MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,  MI_C1,  MI_D1,   MI_E1,  MI_F1,   MI_G1, XXXXXXX,
+    MI_SUST, XXXXXXX, MI_OCTD, MI_OCTU, MI_MODD, MI_MODU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  MI_TRSD, MI_TRSU,   MI_TR0, MI_SUST,          XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   MI_AOFF, MI_AOFF,                    XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
 #elif defined(MIDI_ENABLE) && defined(MIDI_BASIC)
   /* Keymap _MI: MIDI layer (Basic)*/
   [_MI] = LAYOUT(
diff --git a/keyboards/contra/keymaps/dana/keymap.c b/keyboards/contra/keymaps/dana/keymap.c
index 51fa9f75fb..3f4f44182e 100644
--- a/keyboards/contra/keymaps/dana/keymap.c
+++ b/keyboards/contra/keymaps/dana/keymap.c
@@ -19,10 +19,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------'
    */
   [0] = LAYOUT_ortho_4x12(
-      MI_C_4, MI_Cs_4, MI_D_4, MI_Ds_4, MI_E_4, MI_F_4, MI_Fs_4, MI_G_4, MI_Gs_4, MI_A_4, MI_As_4, MI_B_4,
-      MI_C_3, MI_Cs_3, MI_D_3, MI_Ds_3, MI_E_3, MI_F_3, MI_Fs_3, MI_G_3, MI_Gs_3, MI_A_3, MI_As_3, MI_B_3,
-      MI_C_2, MI_Cs_2, MI_D_2, MI_Ds_2, MI_E_2, MI_F_2, MI_Fs_2, MI_G_2, MI_Gs_2, MI_A_2, MI_As_2, MI_B_2,
-      MI_C_1, MI_Cs_1, MI_D_1, MI_Ds_1, MI_E_1, MI_F_1, MI_Fs_1, MI_G_1, MI_Gs_1, MI_A_1, MI_As_1, MI_B_1
+      MI_C4, MI_Cs4, MI_D4, MI_Ds4, MI_E4, MI_F4, MI_Fs4, MI_G4, MI_Gs4, MI_A4, MI_As4, MI_B4,
+      MI_C3, MI_Cs3, MI_D3, MI_Ds3, MI_E3, MI_F3, MI_Fs3, MI_G3, MI_Gs3, MI_A3, MI_As3, MI_B3,
+      MI_C2, MI_Cs2, MI_D2, MI_Ds2, MI_E2, MI_F2, MI_Fs2, MI_G2, MI_Gs2, MI_A2, MI_As2, MI_B2,
+      MI_C1, MI_Cs1, MI_D1, MI_Ds1, MI_E1, MI_F1, MI_Fs1, MI_G1, MI_Gs1, MI_A1, MI_As1, MI_B1
   )
 
 };
diff --git a/keyboards/gh60/satan/keymaps/midi/keymap.c b/keyboards/gh60/satan/keymaps/midi/keymap.c
index 141bef3d64..6cc762525e 100644
--- a/keyboards/gh60/satan/keymaps/midi/keymap.c
+++ b/keyboards/gh60/satan/keymaps/midi/keymap.c
@@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------------'
    */
   [_ML] = LAYOUT_60_ansi(
-    TG(_ML), MI_VEL_1, MI_VEL_2, MI_VEL_3,  MI_VEL_4, MI_VEL_5, MI_VEL_6, MI_VEL_7, MI_VEL_8, MI_VEL_9, MI_VEL_10, XXXXXXX,   XXXXXXX, XXXXXXX,
-    MI_CHU,  XXXXXXX,  MI_Cs,    MI_Ds,     XXXXXXX,  MI_Fs,    MI_Gs,    MI_As,    XXXXXXX,  MI_Cs_1,  MI_Ds_1,   XXXXXXX,   XXXXXXX, XXXXXXX,
-    MI_MOD,  MI_C,     MI_D,     MI_E,      MI_F,     MI_G,     MI_A,     MI_B,     MI_C_1,   MI_D_1,   MI_E_1,    MI_F_1,             _______,
-    MI_SUS,            MI_OCTD,  MI_OCTU,   MI_MODSD, MI_MODSU, XXXXXXX,  XXXXXXX,  XXXXXXX,  MI_TRNSD, MI_TRNSU,  MI_TRNS_0,          MI_SUS,
-    _______, _______,  _______,                       MI_ALLOFF,                                        _______,   _______,   _______, _______
+    TG(_ML), MI_VL1,   MI_VL2,   MI_VL3,    MI_VL4,   MI_VL5,   MI_VL6,   MI_VL7,   MI_VL8,   MI_VL9,   MI_VL10,   XXXXXXX,   XXXXXXX, XXXXXXX,
+    MI_CHU,  XXXXXXX,  MI_Cs,    MI_Ds,     XXXXXXX,  MI_Fs,    MI_Gs,    MI_As,    XXXXXXX,  MI_Cs1,  MI_Ds1,   XXXXXXX,   XXXXXXX, XXXXXXX,
+    MI_MOD,  MI_C,     MI_D,     MI_E,      MI_F,     MI_G,     MI_A,     MI_B,     MI_C1,   MI_D1,   MI_E1,    MI_F1,             _______,
+    MI_SUST,           MI_OCTD,  MI_OCTU,   MI_MODD,  MI_MODU,  XXXXXXX,  XXXXXXX,  XXXXXXX,  MI_TRSD,  MI_TRSU,   MI_TR0,             MI_SUST,
+    _______, _______,  _______,                       MI_AOFF,                                          _______,   _______,   _______, _______
   ),
   #elif defined(MIDI_ENABLE) && defined(MIDI_BASIC)
   /* Keymap _ML: MIDI Layer (Advanced)
diff --git a/keyboards/giabalanai/keymaps/2firmware/keymap.c b/keyboards/giabalanai/keymaps/2firmware/keymap.c
index cfd4d38e3b..34eb2299a7 100644
--- a/keyboards/giabalanai/keymaps/2firmware/keymap.c
+++ b/keyboards/giabalanai/keymaps/2firmware/keymap.c
@@ -30,7 +30,7 @@
 #define ADJ_EIS  LT(_ADJUST,KC_LNG2)
 #define MIS_KAN  LT(_MISC,KC_LNG1)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -205,10 +205,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* fake B-system */
@@ -219,10 +219,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-    MI_Ab_2,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Gb_3, MI_A_3, MI_C_4,  MI_Eb_4, MI_Gb_4, MI_A_4, MI_C_5,  MI_Eb_5, MI_Gb_5,     _______,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3, MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4, MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3, MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4, MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5
+    MI_Ab2,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Gb3, MI_A3, MI_C4,  MI_Eb4, MI_Gb4, MI_A4, MI_C5,  MI_Eb5, MI_Gb5,     _______,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3, MI_Bb3, MI_Db4, MI_E4,  MI_G4, MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3, MI_Ab3, MI_B3,  MI_D4,  MI_F4, MI_Ab4, MI_B4,  MI_D5,  MI_F5
   ),
 
   /* BASS2row */
@@ -233,38 +233,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
             MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    _______,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    _______,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* C-system entirely */
   [_C_SYSTEM_ENTIRELY] = LAYOUT(
-    MI_BENDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
-      MI_BENDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
-        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
-          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
-            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+    MI_BNDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2,
+      MI_BNDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D1,  MI_F1,  MI_Ab1, MI_B1,  MI_D2,  MI_F2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2, MI_E2,  MI_G2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2, MI_Fs2, MI_A2,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* Chromatone */
   [_CHROMATONE] = LAYOUT(
-    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,
-      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,
-        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2,
-          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,  MI_D_2,
-            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2, MI_Eb_2,
+    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,
+      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,
+        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2,
+          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,  MI_D2,
+            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2, MI_Eb2,
 
-    MI_C_2,
-      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3,    FN_MUTE,
-    MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3, MI_C_4,
-      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3
+    MI_C2,
+      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3,    FN_MUTE,
+    MI_C2,  MI_D2,  MI_E2,  MI_Gb2, MI_Ab2, MI_Bb2, MI_C3,  MI_D3,  MI_E3,  MI_Gb3, MI_Ab3, MI_Bb3, MI_C4,
+      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3
   ),
 
   [_CFLIP_BASS2ROW] = LAYOUT(
@@ -274,10 +274,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
             MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
 
-    MI_G_5,
-      MI_F_5,  MI_D_5,  MI_B_4,  MI_Ab_4, MI_F_4,  MI_D_4,  MI_B_3,  MI_Ab_3, MI_F_3,  MI_D_3,  MI_B_2,  MI_Ab_2,   FN_MUTE,
-    MI_Fs_5, MI_Eb_5, MI_C_5,  MI_A_4,  MI_Fs_4, MI_Eb_4, MI_C_4,  MI_A_3,  MI_Fs_3, MI_Eb_3, MI_C_3,  MI_A_2,  MI_Fs_2,
-      MI_E_5,  MI_Db_5, MI_Bb_4, MI_G_4,  MI_E_4,  MI_Db_4, MI_Bb_3, MI_G_3,  MI_E_3,  MI_Db_3, MI_Bb_2, MI_G_2
+    MI_G5,
+      MI_F5,  MI_D5,  MI_B4,  MI_Ab4, MI_F4,  MI_D4,  MI_B3,  MI_Ab3, MI_F3,  MI_D3,  MI_B2,  MI_Ab2,   FN_MUTE,
+    MI_Fs5, MI_Eb5, MI_C5,  MI_A4,  MI_Fs4, MI_Eb4, MI_C4,  MI_A3,  MI_Fs3, MI_Eb3, MI_C3,  MI_A2,  MI_Fs2,
+      MI_E5,  MI_Db5, MI_Bb4, MI_G4,  MI_E4,  MI_Db4, MI_Bb3, MI_G3,  MI_E3,  MI_Db3, MI_Bb2, MI_G2
   ),
 
   /* QWERTY */
@@ -332,7 +332,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
     XXXXXXX,
-      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
+      MI_OCN2, MI_OCN1, MI_OC0,  MI_OC1,  MI_OC2,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
     CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, XXXXXXX, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
       XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
@@ -428,8 +428,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 #endif  //  RGBLIGHT_ENABLE
 
 void my_init(void){
-    //  Set octave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
 }
@@ -438,7 +438,7 @@ void eeconfig_init_user(void) {
     midi_init();
     my_init();
 
-    // Used to set octave to MI_OCT_0
+    // Used to set octave to 0
     midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
     // UNISON flags
@@ -646,7 +646,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, IS_SINGLE_BASS());
 #ifdef RGBLIGHT_ENABLE
             switch_keylight_color4bass(record, keylocation);
@@ -654,7 +654,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -663,7 +663,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -672,7 +672,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
 #ifdef RGBLIGHT_ENABLE
@@ -681,7 +681,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/giabalanai/keymaps/3araht/keymap.c b/keyboards/giabalanai/keymaps/3araht/keymap.c
index 9e487f81c9..b766d37058 100644
--- a/keyboards/giabalanai/keymaps/3araht/keymap.c
+++ b/keyboards/giabalanai/keymaps/3araht/keymap.c
@@ -29,7 +29,7 @@
 #define ADJ_EIS  LT(_ADJUST,KC_LNG2)
 #define MIS_KAN  LT(_MISC,KC_LNG1)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -206,10 +206,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* fake B-system */
@@ -220,10 +220,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-    MI_Ab_2,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Gb_3, MI_A_3, MI_C_4,  MI_Eb_4, MI_Gb_4, MI_A_4, MI_C_5,  MI_Eb_5, MI_Gb_5,     _______,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3, MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4, MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3, MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4, MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5
+    MI_Ab2,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Gb3, MI_A3, MI_C4,  MI_Eb4, MI_Gb4, MI_A4, MI_C5,  MI_Eb5, MI_Gb5,     _______,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3, MI_Bb3, MI_Db4, MI_E4,  MI_G4, MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3, MI_Ab3, MI_B3,  MI_D4,  MI_F4, MI_Ab4, MI_B4,  MI_D5,  MI_F5
   ),
 
   /* BASS2row */
@@ -234,52 +234,52 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
             MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    _______,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    _______,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* C-system entirely */
   [_C_SYSTEM_ENTIRELY] = LAYOUT(
-    MI_BENDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
-      MI_BENDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
-        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
-          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
-            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+    MI_BNDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2,
+      MI_BNDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D1,  MI_F1,  MI_Ab1, MI_B1,  MI_D2,  MI_F2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2, MI_E2,  MI_G2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2, MI_Fs2, MI_A2,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* C-system free bass */
   [_C_SYSTEM_FREEBASS] = LAYOUT(
-    MI_Db_3,  MI_Bb_2,  MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,   MI_E_1,  MI_Db_1,  MI_Bb,  MI_G,  MI_E,
-      MI_C_3,   MI_A_2,   MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,  MI_Eb_1,  MI_C_1,  MI_A,   MI_Fs, MI_Eb,
-        MI_B_2,   MI_Ab_2,  MI_F_2,   MI_D_2,   MI_B_1,  MI_Ab_1,   MI_F_1,  MI_D_1,   MI_B,    MI_Ab,  MI_F,  MI_D,
-          MI_Bb_2, MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,    MI_E_1,  MI_Db_1,   MI_Bb,  MI_G,   MI_E,  MI_Db,
-            MI_A_2,  MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,   MI_Eb_1,  MI_C_1,   MI_A,   MI_Fs,  MI_Eb, MI_C,
+    MI_Db3,  MI_Bb2,  MI_G2,   MI_E2,   MI_Db2,  MI_Bb1, MI_G1,   MI_E1,  MI_Db1,  MI_Bb,  MI_G,  MI_E,
+      MI_C3,   MI_A2,   MI_Fs2,  MI_Eb2,  MI_C2,   MI_A1,  MI_Fs1,  MI_Eb1,  MI_C1,  MI_A,   MI_Fs, MI_Eb,
+        MI_B2,   MI_Ab2,  MI_F2,   MI_D2,   MI_B1,  MI_Ab1,   MI_F1,  MI_D1,   MI_B,    MI_Ab,  MI_F,  MI_D,
+          MI_Bb2, MI_G2,   MI_E2,   MI_Db2,  MI_Bb1, MI_G1,    MI_E1,  MI_Db1,   MI_Bb,  MI_G,   MI_E,  MI_Db,
+            MI_A2,  MI_Fs2,  MI_Eb2,  MI_C2,   MI_A1,  MI_Fs1,   MI_Eb1,  MI_C1,   MI_A,   MI_Fs,  MI_Eb, MI_C,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* Chromatone */
   [_CHROMATONE] = LAYOUT(
-    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,
-      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,
-        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2,
-          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,  MI_D_2,
-            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2, MI_Eb_2,
+    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,
+      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,
+        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2,
+          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,  MI_D2,
+            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2, MI_Eb2,
 
-    MI_C_2,
-      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3,    FN_MUTE,
-    MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3, MI_C_4,
-      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3
+    MI_C2,
+      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3,    FN_MUTE,
+    MI_C2,  MI_D2,  MI_E2,  MI_Gb2, MI_Ab2, MI_Bb2, MI_C3,  MI_D3,  MI_E3,  MI_Gb3, MI_Ab3, MI_Bb3, MI_C4,
+      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3
   ),
 
   [_CFLIP_BASS2ROW] = LAYOUT(
@@ -289,10 +289,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
             MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
 
-    MI_G_5,
-      MI_F_5,  MI_D_5,  MI_B_4,  MI_Ab_4, MI_F_4,  MI_D_4,  MI_B_3,  MI_Ab_3, MI_F_3,  MI_D_3,  MI_B_2,  MI_Ab_2,   FN_MUTE,
-    MI_Fs_5, MI_Eb_5, MI_C_5,  MI_A_4,  MI_Fs_4, MI_Eb_4, MI_C_4,  MI_A_3,  MI_Fs_3, MI_Eb_3, MI_C_3,  MI_A_2,  MI_Fs_2,
-      MI_E_5,  MI_Db_5, MI_Bb_4, MI_G_4,  MI_E_4,  MI_Db_4, MI_Bb_3, MI_G_3,  MI_E_3,  MI_Db_3, MI_Bb_2, MI_G_2
+    MI_G5,
+      MI_F5,  MI_D5,  MI_B4,  MI_Ab4, MI_F4,  MI_D4,  MI_B3,  MI_Ab3, MI_F3,  MI_D3,  MI_B2,  MI_Ab2,   FN_MUTE,
+    MI_Fs5, MI_Eb5, MI_C5,  MI_A4,  MI_Fs4, MI_Eb4, MI_C4,  MI_A3,  MI_Fs3, MI_Eb3, MI_C3,  MI_A2,  MI_Fs2,
+      MI_E5,  MI_Db5, MI_Bb4, MI_G4,  MI_E4,  MI_Db4, MI_Bb3, MI_G3,  MI_E3,  MI_Db3, MI_Bb2, MI_G2
   ),
 
   /* QWERTY */
@@ -347,7 +347,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
     XXXXXXX,
-      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
+      MI_OCN2, MI_OCN1, MI_OC0,  MI_OC1,  MI_OC2,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
     CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
       XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
@@ -442,8 +442,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 #endif  //  RGBLIGHT_ENABLE
 
 void my_init(void){
-    //  Set octave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
 }
@@ -452,7 +452,7 @@ void eeconfig_init_user(void) {
     midi_init();
     my_init();
 
-    // Used to set octave to MI_OCT_0
+    // Used to set octave to 0
     midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
     // UNISON flags
@@ -661,7 +661,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, IS_SINGLE_BASS());
 #ifdef RGBLIGHT_ENABLE
             switch_keylight_color4bass(record, keylocation);
@@ -669,7 +669,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -678,7 +678,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -687,7 +687,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
 #ifdef RGBLIGHT_ENABLE
@@ -696,7 +696,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/giabalanai/keymaps/default/keymap.c b/keyboards/giabalanai/keymaps/default/keymap.c
index a7b3a6b6a0..1cc7ee5077 100644
--- a/keyboards/giabalanai/keymaps/default/keymap.c
+++ b/keyboards/giabalanai/keymaps/default/keymap.c
@@ -24,7 +24,7 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -156,10 +156,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* QWERTY */
@@ -200,8 +200,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void keyboard_post_init_user(void) {
-    //  Set otave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
@@ -227,30 +227,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
             break;
 
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
             break;
 
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
             break;
 
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
             break;
 
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
             break;
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
index 06749a4f8a..3ed4754df4 100644
--- a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c
@@ -24,7 +24,7 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -156,11 +156,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
-      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
-        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
-          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
-            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+    MI_Db2,      MI_E2,       MI_G2,       MI_Bb2,      MI_Db3,     MI_E3,      MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,
+      MI_Eb2,      MI_Fs2,      MI_A2,       MI_C3,       MI_Eb3,     MI_Fs3,     MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,
+        MI_F2,       MI_Ab2,      MI_B2,       MI_D3,       MI_F3,      MI_Ab3,     MI_B3,      MI_D4,      MI_F4,      MI_Ab4,     MI_B4,      MI_D5,
+          MI_G2,       MI_Bb2,      MI_Db3,      MI_E3,       MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,     MI_Db5,     MI_E5,
+            MI_A2,       MI_C3,       MI_Eb3,      MI_Fs3,      MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,      MI_Eb5,     FN_MUTE
   ),
 
   /* QWERTY */
@@ -203,8 +203,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void keyboard_post_init_user(void) {
-    //  Set otave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
@@ -230,30 +230,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
             break;
 
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
             break;
 
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
             break;
 
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
             break;
 
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
             break;
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
index dfedd981d9..e28a78b016 100644
--- a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c
@@ -24,7 +24,7 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -168,11 +168,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
-      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
-        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
-          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
-            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+    MI_Db2,      MI_E2,       MI_G2,       MI_Bb2,      MI_Db3,     MI_E3,      MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,
+      MI_Eb2,      MI_Fs2,      MI_A2,       MI_C3,       MI_Eb3,     MI_Fs3,     MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,
+        MI_F2,       MI_Ab2,      MI_B2,       MI_D3,       MI_F3,      MI_Ab3,     MI_B3,      MI_D4,      MI_F4,      MI_Ab4,     MI_B4,      MI_D5,
+          MI_G2,       MI_Bb2,      MI_Db3,      MI_E3,       MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,     MI_Db5,     MI_E5,
+            MI_A2,       MI_C3,       MI_Eb3,      MI_Fs3,      MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,      MI_Eb5,     FN_MUTE
   ),
 
   /* BASS2row */
@@ -184,41 +184,41 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
 
 
-    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
-      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
-        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
-          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
-            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+    MI_Db2,      MI_E2,       MI_G2,       MI_Bb2,      MI_Db3,     MI_E3,      MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,
+      MI_Eb2,      MI_Fs2,      MI_A2,       MI_C3,       MI_Eb3,     MI_Fs3,     MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,
+        MI_F2,       MI_Ab2,      MI_B2,       MI_D3,       MI_F3,      MI_Ab3,     MI_B3,      MI_D4,      MI_F4,      MI_Ab4,     MI_B4,      MI_D5,
+          MI_G2,       MI_Bb2,      MI_Db3,      MI_E3,       MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,     MI_Db5,     MI_E5,
+            MI_A2,       MI_C3,       MI_Eb3,      MI_Fs3,      MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,      MI_Eb5,     FN_MUTE
   ),
 
   /* C-system entirely */
   [_C_SYSTEM_ENTIRELY] = LAYOUT_giabarinaix2(
-    XXXXXXX, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
-      XXXXXXX, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
-        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
-          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
-            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+    XXXXXXX, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2,
+      XXXXXXX, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D1,  MI_F1,  MI_Ab1, MI_B1,  MI_D2,  MI_F2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2, MI_E2,  MI_G2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2, MI_Fs2, MI_A2,
 
-    MI_E_2,  MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,   MI_G_4, MI_Bb_4, MI_Db_5,
-      MI_Fs_2, MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4,  MI_A_4, MI_C_5,  MI_Eb_5,
-        MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,
-          MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-            MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5,  FN_MUTE
+    MI_E2,  MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,   MI_G4, MI_Bb4, MI_Db5,
+      MI_Fs2, MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4,  MI_A4, MI_C5,  MI_Eb5,
+        MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,
+          MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+            MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5,  FN_MUTE
   ),
 
   /* Chromatone */
   [_CHROMATONE] = LAYOUT_giabarinaix2(
-    XXXXXXX, XXXXXXX, MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1,  MI_Eb_1,  MI_F_1,   MI_G_1,
-        XXXXXXX,  MI_C,    MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1,
-             XXXXXXX, MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1,  MI_Eb_1,  MI_F_1,   MI_G_1,   MI_A_1,
-                  MI_C,    MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1,
-                      MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1,  MI_Eb_1,  MI_F_1,   MI_G_1,   MI_A_1,  MI_B_1,
+    XXXXXXX, XXXXXXX, MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1,  MI_Eb1,  MI_F1,   MI_G1,
+        XXXXXXX,  MI_C,    MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1,
+             XXXXXXX, MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1,  MI_Eb1,  MI_F1,   MI_G1,   MI_A1,
+                  MI_C,    MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1,
+                      MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1,  MI_Eb1,  MI_F1,   MI_G1,   MI_A1,  MI_B1,
 
-    MI_A_1,  MI_B_1, MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3,  MI_Eb_3,  MI_F_3,   MI_G_3,
-         MI_Bb_1, MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3,
-             MI_B_1, MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3,  MI_Eb_3,  MI_F_3,   MI_G_3,   MI_A_3,
-                  MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3,
-                     MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3,  MI_Eb_3,  MI_F_3,   MI_G_3,   MI_A_3,  FN_MUTE
+    MI_A1,  MI_B1, MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3,  MI_Eb3,  MI_F3,   MI_G3,
+         MI_Bb1, MI_C2,  MI_D2,  MI_E2,  MI_Gb2, MI_Ab2, MI_Bb2, MI_C3,  MI_D3,  MI_E3,  MI_Gb3, MI_Ab3,
+             MI_B1, MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3,  MI_Eb3,  MI_F3,   MI_G3,   MI_A3,
+                  MI_C2,  MI_D2,  MI_E2,  MI_Gb2, MI_Ab2, MI_Bb2, MI_C3,  MI_D3,  MI_E3,  MI_Gb3, MI_Ab3, MI_Bb3,
+                     MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3,  MI_Eb3,  MI_F3,   MI_G3,   MI_A3,  FN_MUTE
   ),
 
   /* QWERTY */
@@ -291,8 +291,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
 #endif  //  RGBLIGHT_ENABLE
 void keyboard_post_init_user(void) {
-    //  Set otave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
@@ -404,14 +404,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
 #ifdef RGBLIGHT_ENABLE
             switch_keylight_color4bass(record, keylocation);
 #endif
             break;
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -419,7 +419,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #endif
             break;
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -427,7 +427,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #endif
             break;
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
 #ifdef RGBLIGHT_ENABLE
@@ -435,7 +435,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #endif
             break;
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
index 873a25acde..913bf056d2 100644
--- a/keyboards/giabalanai/keymaps/party/keymap.c
+++ b/keyboards/giabalanai/keymaps/party/keymap.c
@@ -29,7 +29,7 @@
 #define ADJ_EIS  LT(_ADJUST,KC_LNG2)
 #define MIS_KAN  LT(_MISC,KC_LNG1)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -206,10 +206,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* fake B-system */
@@ -220,10 +220,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-    MI_Ab_2,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Gb_3, MI_A_3, MI_C_4,  MI_Eb_4, MI_Gb_4, MI_A_4, MI_C_5,  MI_Eb_5, MI_Gb_5,     _______,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3, MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4, MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3, MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4, MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5
+    MI_Ab2,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Gb3, MI_A3, MI_C4,  MI_Eb4, MI_Gb4, MI_A4, MI_C5,  MI_Eb5, MI_Gb5,     _______,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3, MI_Bb3, MI_Db4, MI_E4,  MI_G4, MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3, MI_Ab3, MI_B3,  MI_D4,  MI_F4, MI_Ab4, MI_B4,  MI_D5,  MI_F5
   ),
 
   /* BASS2row */
@@ -234,52 +234,52 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
             MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    _______,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    _______,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* C-system entirely */
   [_C_SYSTEM_ENTIRELY] = LAYOUT(
-    MI_BENDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2,
-      MI_BENDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2,
-        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D_1,  MI_F_1,  MI_Ab_1, MI_B_1,  MI_D_2,  MI_F_2,
-          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db_1, MI_E_1,  MI_G_1,  MI_Bb_1, MI_Db_2, MI_E_2,  MI_G_2,
-            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C_1,  MI_Eb_1, MI_Fs_1, MI_A_1,  MI_C_2,  MI_Eb_2, MI_Fs_2, MI_A_2,
+    MI_BNDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2,
+      MI_BNDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2,
+        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D1,  MI_F1,  MI_Ab1, MI_B1,  MI_D2,  MI_F2,
+          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2, MI_E2,  MI_G2,
+            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2, MI_Fs2, MI_A2,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* C-system free bass */
   [_C_SYSTEM_FREEBASS] = LAYOUT(
-    MI_Db_3,  MI_Bb_2,  MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,   MI_E_1,  MI_Db_1,  MI_Bb,  MI_G,  MI_E,
-      MI_C_3,   MI_A_2,   MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,  MI_Eb_1,  MI_C_1,  MI_A,   MI_Fs, MI_Eb,
-        MI_B_2,   MI_Ab_2,  MI_F_2,   MI_D_2,   MI_B_1,  MI_Ab_1,   MI_F_1,  MI_D_1,   MI_B,    MI_Ab,  MI_F,  MI_D,
-          MI_Bb_2, MI_G_2,   MI_E_2,   MI_Db_2,  MI_Bb_1, MI_G_1,    MI_E_1,  MI_Db_1,   MI_Bb,  MI_G,   MI_E,  MI_Db,
-            MI_A_2,  MI_Fs_2,  MI_Eb_2,  MI_C_2,   MI_A_1,  MI_Fs_1,   MI_Eb_1,  MI_C_1,   MI_A,   MI_Fs,  MI_Eb, MI_C,
+    MI_Db3,  MI_Bb2,  MI_G2,   MI_E2,   MI_Db2,  MI_Bb1, MI_G1,   MI_E1,  MI_Db1,  MI_Bb,  MI_G,  MI_E,
+      MI_C3,   MI_A2,   MI_Fs2,  MI_Eb2,  MI_C2,   MI_A1,  MI_Fs1,  MI_Eb1,  MI_C1,  MI_A,   MI_Fs, MI_Eb,
+        MI_B2,   MI_Ab2,  MI_F2,   MI_D2,   MI_B1,  MI_Ab1,   MI_F1,  MI_D1,   MI_B,    MI_Ab,  MI_F,  MI_D,
+          MI_Bb2, MI_G2,   MI_E2,   MI_Db2,  MI_Bb1, MI_G1,    MI_E1,  MI_Db1,   MI_Bb,  MI_G,   MI_E,  MI_Db,
+            MI_A2,  MI_Fs2,  MI_Eb2,  MI_C2,   MI_A1,  MI_Fs1,   MI_Eb1,  MI_C1,   MI_A,   MI_Fs,  MI_Eb, MI_C,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* Chromatone */
   [_CHROMATONE] = LAYOUT(
-    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,
-      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,
-        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2,
-          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C_1,  MI_D_1,  MI_E_1,  MI_Fs_1, MI_Ab_1, MI_Bb_1, MI_C_2,  MI_D_2,
-            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db_1, MI_Eb_1, MI_F_1,  MI_G_1,  MI_A_1,  MI_B_1,  MI_Db_2, MI_Eb_2,
+    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,
+      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,
+        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2,
+          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,  MI_D2,
+            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2, MI_Eb2,
 
-    MI_C_2,
-      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3,    FN_MUTE,
-    MI_C_2,  MI_D_2,  MI_E_2,  MI_Gb_2, MI_Ab_2, MI_Bb_2, MI_C_3,  MI_D_3,  MI_E_3,  MI_Gb_3, MI_Ab_3, MI_Bb_3, MI_C_4,
-      MI_Db_2, MI_Eb_2, MI_F_2,  MI_G_2,  MI_A_2,  MI_B_2,  MI_Db_3, MI_Eb_3, MI_F_3,  MI_G_3,  MI_A_3,  MI_B_3
+    MI_C2,
+      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3,    FN_MUTE,
+    MI_C2,  MI_D2,  MI_E2,  MI_Gb2, MI_Ab2, MI_Bb2, MI_C3,  MI_D3,  MI_E3,  MI_Gb3, MI_Ab3, MI_Bb3, MI_C4,
+      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3
   ),
 
   [_CFLIP_BASS2ROW] = LAYOUT(
@@ -289,10 +289,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
             MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
 
-    MI_G_5,
-      MI_F_5,  MI_D_5,  MI_B_4,  MI_Ab_4, MI_F_4,  MI_D_4,  MI_B_3,  MI_Ab_3, MI_F_3,  MI_D_3,  MI_B_2,  MI_Ab_2,   FN_MUTE,
-    MI_Fs_5, MI_Eb_5, MI_C_5,  MI_A_4,  MI_Fs_4, MI_Eb_4, MI_C_4,  MI_A_3,  MI_Fs_3, MI_Eb_3, MI_C_3,  MI_A_2,  MI_Fs_2,
-      MI_E_5,  MI_Db_5, MI_Bb_4, MI_G_4,  MI_E_4,  MI_Db_4, MI_Bb_3, MI_G_3,  MI_E_3,  MI_Db_3, MI_Bb_2, MI_G_2
+    MI_G5,
+      MI_F5,  MI_D5,  MI_B4,  MI_Ab4, MI_F4,  MI_D4,  MI_B3,  MI_Ab3, MI_F3,  MI_D3,  MI_B2,  MI_Ab2,   FN_MUTE,
+    MI_Fs5, MI_Eb5, MI_C5,  MI_A4,  MI_Fs4, MI_Eb4, MI_C4,  MI_A3,  MI_Fs3, MI_Eb3, MI_C3,  MI_A2,  MI_Fs2,
+      MI_E5,  MI_Db5, MI_Bb4, MI_G4,  MI_E4,  MI_Db4, MI_Bb3, MI_G3,  MI_E3,  MI_Db3, MI_Bb2, MI_G2
   ),
 
   /* QWERTY */
@@ -347,7 +347,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
     XXXXXXX,
-      MI_OCT_N2, MI_OCT_N1, MI_OCT_0, MI_OCT_1, MI_OCT_2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
+      MI_OCN2, MI_OCN1, MI_OC0,  MI_OC1,  MI_OC2,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
     CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, RGB_MOD, RGB_TOG,
       XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
@@ -442,8 +442,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 #endif  //  RGBLIGHT_ENABLE
 
 void my_init(void){
-    //  Set octave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
 }
@@ -452,7 +452,7 @@ void eeconfig_init_user(void) {
     midi_init();
     my_init();
 
-    // Used to set octave to MI_OCT_0
+    // Used to set octave to 0
     midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
     // UNISON flags
@@ -710,7 +710,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, IS_SINGLE_BASS());
 #ifdef RGBLIGHT_ENABLE
             keylight_manager(record, HSV_GOLDENROD, keylocation);
@@ -718,7 +718,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -727,7 +727,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
 #ifdef RGBLIGHT_ENABLE
@@ -736,7 +736,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
 #ifdef RGBLIGHT_ENABLE
@@ -745,7 +745,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
 
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c
index dbb575f89d..06fa10d67c 100644
--- a/keyboards/giabalanai/keymaps/via/keymap.c
+++ b/keyboards/giabalanai/keymaps/via/keymap.c
@@ -24,7 +24,7 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -156,10 +156,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Fs_2,
-      MI_Ab_2, MI_B_2,  MI_D_3,  MI_F_3,  MI_Ab_3, MI_B_3,  MI_D_4,  MI_F_4,  MI_Ab_4, MI_B_4,  MI_D_5,  MI_F_5,    FN_MUTE,
-    MI_G_2,  MI_Bb_2, MI_Db_3, MI_E_3,  MI_G_3,  MI_Bb_3, MI_Db_4, MI_E_4,  MI_G_4,  MI_Bb_4, MI_Db_5, MI_E_5,  MI_G_5,
-      MI_A_2,  MI_C_3,  MI_Eb_3, MI_Fs_3, MI_A_3,  MI_C_4,  MI_Eb_4, MI_Fs_4, MI_A_4,  MI_C_5,  MI_Eb_5, MI_Fs_5
+    MI_Fs2,
+      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
+    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
+      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
   ),
 
   /* QWERTY */
@@ -200,8 +200,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void keyboard_post_init_user(void) {
-    //  Set otave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
@@ -228,30 +228,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
             break;
 
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
             break;
 
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
             break;
 
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
             break;
 
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
             break;
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
index a9da9c82e7..512084f1dd 100644
--- a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
@@ -24,7 +24,7 @@
 // Long press: go to _FN layer, tap: MUTE
 #define FN_MUTE LT(_FN, KC_MUTE)
 
-// Used to set octave to MI_OCT_0
+// Used to set octave to 0
 extern midi_config_t midi_config;
 uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
 
@@ -156,11 +156,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
             MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
 
-    MI_Db_2,      MI_E_2,       MI_G_2,       MI_Bb_2,      MI_Db_3,     MI_E_3,      MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,
-      MI_Eb_2,      MI_Fs_2,      MI_A_2,       MI_C_3,       MI_Eb_3,     MI_Fs_3,     MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,
-        MI_F_2,       MI_Ab_2,      MI_B_2,       MI_D_3,       MI_F_3,      MI_Ab_3,     MI_B_3,      MI_D_4,      MI_F_4,      MI_Ab_4,     MI_B_4,      MI_D_5,
-          MI_G_2,       MI_Bb_2,      MI_Db_3,      MI_E_3,       MI_G_3,      MI_Bb_3,     MI_Db_4,     MI_E_4,      MI_G_4,      MI_Bb_4,     MI_Db_5,     MI_E_5,
-            MI_A_2,       MI_C_3,       MI_Eb_3,      MI_Fs_3,      MI_A_3,      MI_C_4,      MI_Eb_4,     MI_Fs_4,     MI_A_4,      MI_C_5,      MI_Eb_5,     FN_MUTE
+    MI_Db2,      MI_E2,       MI_G2,       MI_Bb2,      MI_Db3,     MI_E3,      MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,
+      MI_Eb2,      MI_Fs2,      MI_A2,       MI_C3,       MI_Eb3,     MI_Fs3,     MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,
+        MI_F2,       MI_Ab2,      MI_B2,       MI_D3,       MI_F3,      MI_Ab3,     MI_B3,      MI_D4,      MI_F4,      MI_Ab4,     MI_B4,      MI_D5,
+          MI_G2,       MI_Bb2,      MI_Db3,      MI_E3,       MI_G3,      MI_Bb3,     MI_Db4,     MI_E4,      MI_G4,      MI_Bb4,     MI_Db5,     MI_E5,
+            MI_A2,       MI_C3,       MI_Eb3,      MI_Fs3,      MI_A3,      MI_C4,      MI_Eb4,     MI_Fs4,     MI_A4,      MI_C5,      MI_Eb5,     FN_MUTE
   ),
 
   /* QWERTY */
@@ -203,8 +203,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 #endif
 
 void keyboard_post_init_user(void) {
-    //  Set otave to MI_OCT_0
-    midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
+    //  Set octave to 0
+    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
@@ -230,30 +230,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         // MIDI Chord Keycodes, on the left side.
         case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C_1;
+            root_note = keycode - MI_CH_Cr + MI_C1;
             my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, false);
             break;
 
         case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C_2;
+            root_note = keycode - MI_CH_C + MI_C2;
             // Root, Major Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
             break;
 
         case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C_2;
+            root_note = keycode - MI_CH_Cm + MI_C2;
             // Root, Minor Third, and Fifth Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
             break;
 
         case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C_2;
+            root_note = keycode - MI_CH_CDom7 + MI_C2;
             // Major Third, Major Fifth, and Minor Seventh Notes
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
             break;
 
         case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C_2;
+            root_note = keycode - MI_CH_CDim7 + MI_C2;
             // Root, Minor Third, and Diminished 5th Note
             my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
             break;
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
index 025266669c..904250fdaf 100644
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
@@ -91,10 +91,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_MIDI] = LAYOUT( \
-  QWERTY,   MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,    MI_C_1,  MI_C_2,  MI_C_3,  QWERTY, \
-  MI_A_3,   MI_As_3, MI_B_3,  MI_C_3,  MI_Cs_3, MI_D_3,  MI_Ds_3, MI_E_3,  MI_F_3,  MI_Fs_3, MI_G_3,  MI_Gs_3, \
-  MI_A_2,   MI_As_2, MI_B_2,  MI_C_2,  MI_Cs_2, MI_D_2,  MI_Ds_2, MI_E_2,  MI_F_2,  MI_Fs_2, MI_G_2,  MI_Gs_2, \
-  MI_A_1,   MI_As_1, MI_B_1,  MI_C_1,  MI_Cs_1, MI_D_1,  MI_Ds_1, MI_E_1,  MI_F_1,  MI_Fs_1, MI_G_1,  MI_Gs_1, \
+  QWERTY,   MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,    MI_C1,   MI_C2,   MI_C3,   QWERTY, \
+  MI_A3,    MI_As3,  MI_B3,   MI_C3,   MI_Cs3,  MI_D3,   MI_Ds3,  MI_E3,   MI_F3,   MI_Fs3,  MI_G3,   MI_Gs3, \
+  MI_A2,    MI_As2,  MI_B2,   MI_C2,   MI_Cs2,  MI_D2,   MI_Ds2,  MI_E2,   MI_F2,   MI_Fs2,  MI_G2,   MI_Gs2, \
+  MI_A1,    MI_As1,  MI_B1,   MI_C1,   MI_Cs1,  MI_D1,   MI_Ds1,  MI_E1,   MI_F1,   MI_Fs1,  MI_G1,   MI_Gs1, \
   MI_A,     MI_As,   MI_B,    MI_C,    MI_Cs,   MI_D,    MI_Ds,   MI_E,    MI_F,    MI_Fs,   MI_G,    MI_Gs \
 ),
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
index 1b24651ec4..5845b8f944 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_mit(
     QK_BOOT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______,
     KC_CAPS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, QWERTY,  DVORAK,  COLEMAK, WORKMAN, MIDI,
-    _______, MI_ON,   MI_OFF,  MI_TOG,  MU_ON,   MU_OFF,  MU_TOG,  MU_MOD,  AU_ON,   AU_OFF,  _______, _______,
+    _______, MI_ON,   MI_OFF,  MI_TOGG, MU_ON,   MU_OFF,  MU_TOG,  MU_MOD,  AU_ON,   AU_OFF,  _______, _______,
     RGB_TOG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 ),
 
@@ -123,8 +123,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MIDI] = LAYOUT_planck_mit(
     MI_Cs,   MI_Ds,   _______, MI_Fs,   MI_Gs,   MI_As,   _______, MI_Cs,   MI_Ds,   _______, MI_Fs,   MI_Gs,
     MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,    MI_C,    MI_D,    MI_E,    MI_F,    MI_G,
-    MI_BENDU,MI_OCTU, MI_TRNSU,MI_VELU, _______, _______, _______, _______, _______, MI_ON,   MI_CHU,  MI_TOG,
-    MI_BENDD,MI_OCTD, MI_TRNSD,MI_VELD, MYNAV,       MI_SUS,       MYNUM, _______,   MI_OFF,  MI_CHD,  MI_ALLOFF
+    MI_BNDU, MI_OCTU, MI_TRSU, MI_VELU, _______, _______, _______, _______, _______, MI_ON,   MI_CHNU, MI_TOG,
+    MI_BNDD, MI_OCTD, MI_TRSD, MI_VELD, MYNAV,       MI_SUST,      MYNUM, _______,   MI_OFF,  MI_CHND, MI_AOFF
 )
 };
 
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c b/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
index bae9ed4f4a..7d347edb66 100644
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
+++ b/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
@@ -114,9 +114,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------------------------------------------------------------------------------------|
      */
   [6] = LAYOUT(
-    MI_C_1,  MI_E_1,  MI_G_1,   MI_B_1,   MI_D_2,  MI_F_2, MI_A_2, MI_C_3, MI_E_3, MI_G_3, KC_NO,
-    MI_D_1,  MI_F_1,  MI_A_1,   MI_C_2,   MI_E_2,  MI_G_2, MI_B_2, MI_D_3, MI_F_3, MI_A_3, TG(6),
-    MI_OCTD, MI_OCTU, MI_TRNSD, MI_TRNSU,          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
+    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
   )
 };
 
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index 7ec473985a..8761bfed13 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
-  MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
+  MI_TOGG, RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_TOG,     _______, XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
 )
 
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index 3b6202b01d..f9e305e4f9 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -207,7 +207,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
-  MI_TOG,  RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
+  MI_TOGG, RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     _______,          _______,      XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
 )
 
diff --git a/keyboards/sofle/keymaps/michal/keymap.c b/keyboards/sofle/keymaps/michal/keymap.c
index 564ef06454..9c89468a89 100644
--- a/keyboards/sofle/keymaps/michal/keymap.c
+++ b/keyboards/sofle/keymaps/michal/keymap.c
@@ -86,11 +86,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            `----------------------------------'           '------''---------------------------'
  */
 [_MIDI] = LAYOUT(
-  MI_ALLOFF, MI_OCT_0, MI_OCT_1, MI_OCT_2, MI_OCT_3, MI_OCT_4,                      MI_OCT_5, MI_OCT_6, MI_OCT_7, _______, _______, MI_TOG,
-  _______,   MI_Gs,    MI_As,    _______,  MI_Cs_1,  MI_Ds_1,                       _______,  MI_Fs_1,  MI_Gs_1,  MI_As_1, _______, _______,
-  _______,   MI_A,     MI_B,     MI_C_1,   MI_D_1,   MI_E_1,                        MI_F_1,   MI_G_1,   MI_A_1,   MI_B_1,  MI_C_2,  KC_WORKMAN,
-  _______,   _______,  _______,  _______,  MI_TRNSD, MI_TRNSU, _______,    _______, MI_BENDD, MI_BENDU, _______,  _______, _______, _______,
-                       _______,  _______,  _______,  MI_SUS,   MI_OCTD,    MI_OCTU, _______,  _______,  _______,  _______
+  MI_AOFF,   MI_OC0,   MI_OC1,   MI_OC2,   MI_OC3,   MI_OC4,                        MI_OC5,   MI_OC6,   MI_OC7,   _______, _______, MI_TOGG,
+  _______,   MI_Gs,    MI_As,    _______,  MI_Cs1,   MI_Ds1,                        _______,  MI_Fs1,   MI_Gs1,   MI_As1,  _______, _______,
+  _______,   MI_A,     MI_B,     MI_C1,    MI_D1,    MI_E1,                         MI_F1,    MI_G1,    MI_A1,    MI_B1,   MI_C2,  KC_WORKMAN,
+  _______,   _______,  _______,  _______,  MI_TRSD,  MI_TRSU,  _______,    _______, MI_BNDD,  MI_BNDU,  _______,  _______, _______, _______,
+                       _______,  _______,  _______,  MI_SUST,  MI_OCTD,    MI_OCTU, _______,  _______,  _______,  _______
 ),
 
 /* LOWER
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/4brad/keymap.c b/keyboards/tempo_turtle/bradpad/keymaps/4brad/keymap.c
index 4c5e988ed5..4c9da96a2b 100644
--- a/keyboards/tempo_turtle/bradpad/keymaps/4brad/keymap.c
+++ b/keyboards/tempo_turtle/bradpad/keymaps/4brad/keymap.c
@@ -128,7 +128,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NATURAL] = LAYOUT(
-        MI_C, MI_BENDD,   MI_BENDU,  MI_G,
+        MI_C, MI_BNDD,    MI_BNDU,   MI_G,
         MI_D, MIDI_CC80,  MIDI_CC81, MI_A,
         MI_E, MIDI_CC82,  MIDI_CC83, MI_B,
         MI_F, MI_OCTD,    MI_OCTU,   MI_C,
@@ -137,12 +137,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MI_Cs, KC_TRNS,  KC_TRNS,  MI_Gs,
         MI_Ds, KC_TRNS,  KC_TRNS,  MI_As,
         MI_F , KC_TRNS,  KC_TRNS,  MI_C ,
-        MI_Fs, MI_TRNSD, MI_TRNSU, MI_Cs,
+        MI_Fs, MI_TRSD,  MI_TRSU,  MI_Cs,
                KC_TRNS,  KC_TRNS),
     [_FLAT] = LAYOUT(
         MI_B , KC_TRNS,  KC_TRNS,  MI_Gb,
         MI_Db, KC_TRNS,  KC_TRNS,  MI_Ab,
         MI_Eb, KC_TRNS,  KC_TRNS,  MI_Bb,
-        MI_E , MI_TRNSD, MI_TRNSU, MI_B,
+        MI_E , MI_TRSD,  MI_TRSU,  MI_B,
                KC_TRNS,  KC_TRNS),
 };
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/keymap.c b/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/keymap.c
index 714e64ba80..ed489780ce 100644
--- a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/keymap.c
+++ b/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/keymap.c
@@ -22,9 +22,9 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_NATURAL] = LAYOUT(
-        MI_C, MI_BENDD, MI_BENDU, MI_G,
+        MI_C, MI_BNDD,  MI_BNDU,  MI_G,
         MI_D, MI_VELD,  MI_VELU,  MI_A,
-        MI_E, MI_TRNSD, MI_TRNSU, MI_B,
+        MI_E, MI_TRSD,  MI_TRSU,  MI_B,
         MI_F, MI_OCTD,  MI_OCTU,  MI_C,
              MO(_SHARP), MO(_FLAT)),
     [_SHARP] = LAYOUT(
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index db4d373234..deb3565262 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -346,150 +346,150 @@ enum qk_keycode_defines {
     MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020,
     MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021,
     MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022,
-    MI_ON = 0x7100,
-    MI_OFF = 0x7101,
-    MI_TOG = 0x7102,
-    MI_C = 0x7110,
-    MI_Cs = 0x7111,
-    MI_D = 0x7112,
-    MI_Ds = 0x7113,
-    MI_E = 0x7114,
-    MI_F = 0x7115,
-    MI_Fs = 0x7116,
-    MI_G = 0x7117,
-    MI_Gs = 0x7118,
-    MI_A = 0x7119,
-    MI_As = 0x711A,
-    MI_B = 0x711B,
-    MI_C_1 = 0x7120,
-    MI_Cs_1 = 0x7121,
-    MI_D_1 = 0x7122,
-    MI_Ds_1 = 0x7123,
-    MI_E_1 = 0x7124,
-    MI_F_1 = 0x7125,
-    MI_Fs_1 = 0x7126,
-    MI_G_1 = 0x7127,
-    MI_Gs_1 = 0x7128,
-    MI_A_1 = 0x7129,
-    MI_As_1 = 0x712A,
-    MI_B_1 = 0x712B,
-    MI_C_2 = 0x7130,
-    MI_Cs_2 = 0x7131,
-    MI_D_2 = 0x7132,
-    MI_Ds_2 = 0x7133,
-    MI_E_2 = 0x7134,
-    MI_F_2 = 0x7135,
-    MI_Fs_2 = 0x7136,
-    MI_G_2 = 0x7137,
-    MI_Gs_2 = 0x7138,
-    MI_A_2 = 0x7139,
-    MI_As_2 = 0x713A,
-    MI_B_2 = 0x713B,
-    MI_C_3 = 0x7140,
-    MI_Cs_3 = 0x7141,
-    MI_D_3 = 0x7142,
-    MI_Ds_3 = 0x7143,
-    MI_E_3 = 0x7144,
-    MI_F_3 = 0x7145,
-    MI_Fs_3 = 0x7146,
-    MI_G_3 = 0x7147,
-    MI_Gs_3 = 0x7148,
-    MI_A_3 = 0x7149,
-    MI_As_3 = 0x714A,
-    MI_B_3 = 0x714B,
-    MI_C_4 = 0x7150,
-    MI_Cs_4 = 0x7151,
-    MI_D_4 = 0x7152,
-    MI_Ds_4 = 0x7153,
-    MI_E_4 = 0x7154,
-    MI_F_4 = 0x7155,
-    MI_Fs_4 = 0x7156,
-    MI_G_4 = 0x7157,
-    MI_Gs_4 = 0x7158,
-    MI_A_4 = 0x7159,
-    MI_As_4 = 0x715A,
-    MI_B_4 = 0x715B,
-    MI_C_5 = 0x7160,
-    MI_Cs_5 = 0x7161,
-    MI_D_5 = 0x7162,
-    MI_Ds_5 = 0x7163,
-    MI_E_5 = 0x7164,
-    MI_F_5 = 0x7165,
-    MI_Fs_5 = 0x7166,
-    MI_G_5 = 0x7167,
-    MI_Gs_5 = 0x7168,
-    MI_A_5 = 0x7169,
-    MI_As_5 = 0x716A,
-    MI_B_5 = 0x716B,
-    MI_OCT_N2 = 0x7170,
-    MI_OCT_N1 = 0x7171,
-    MI_OCT_0 = 0x7172,
-    MI_OCT_1 = 0x7173,
-    MI_OCT_2 = 0x7174,
-    MI_OCT_3 = 0x7175,
-    MI_OCT_4 = 0x7176,
-    MI_OCT_5 = 0x7177,
-    MI_OCT_6 = 0x7178,
-    MI_OCT_7 = 0x7179,
-    MI_OCTD = 0x717A,
-    MI_OCTU = 0x717B,
-    MI_TRNS_N6 = 0x7180,
-    MI_TRNS_N5 = 0x7181,
-    MI_TRNS_N4 = 0x7182,
-    MI_TRNS_N3 = 0x7183,
-    MI_TRNS_N2 = 0x7184,
-    MI_TRNS_N1 = 0x7185,
-    MI_TRNS_0 = 0x7186,
-    MI_TRNS_1 = 0x7187,
-    MI_TRNS_2 = 0x7188,
-    MI_TRNS_3 = 0x7189,
-    MI_TRNS_4 = 0x718A,
-    MI_TRNS_5 = 0x718B,
-    MI_TRNS_6 = 0x718C,
-    MI_TRNSD = 0x718D,
-    MI_TRNSU = 0x718E,
-    MI_VEL_0 = 0x7190,
-    MI_VEL_1 = 0x7191,
-    MI_VEL_2 = 0x7192,
-    MI_VEL_3 = 0x7193,
-    MI_VEL_4 = 0x7194,
-    MI_VEL_5 = 0x7195,
-    MI_VEL_6 = 0x7196,
-    MI_VEL_7 = 0x7197,
-    MI_VEL_8 = 0x7198,
-    MI_VEL_9 = 0x7199,
-    MI_VEL_10 = 0x719A,
-    MI_VELD = 0x719B,
-    MI_VELU = 0x719C,
-    MI_CH1 = 0x71A0,
-    MI_CH2 = 0x71A1,
-    MI_CH3 = 0x71A2,
-    MI_CH4 = 0x71A3,
-    MI_CH5 = 0x71A4,
-    MI_CH6 = 0x71A5,
-    MI_CH7 = 0x71A6,
-    MI_CH8 = 0x71A7,
-    MI_CH9 = 0x71A8,
-    MI_CH10 = 0x71A9,
-    MI_CH11 = 0x71AA,
-    MI_CH12 = 0x71AB,
-    MI_CH13 = 0x71AC,
-    MI_CH14 = 0x71AD,
-    MI_CH15 = 0x71AE,
-    MI_CH16 = 0x71AF,
-    MI_CHD = 0x71B0,
-    MI_CHU = 0x71B1,
-    MI_ALLOFF = 0x71C0,
-    MI_SUS = 0x71C1,
-    MI_PORT = 0x71C2,
-    MI_SOST = 0x71C3,
-    MI_SOFT = 0x71C4,
-    MI_LEG = 0x71C5,
-    MI_MOD = 0x71C6,
-    MI_MODSD = 0x71C7,
-    MI_MODSU = 0x71C8,
-    MI_BENDD = 0x71C9,
-    MI_BENDU = 0x71CA,
+    QK_MIDI_ON = 0x7100,
+    QK_MIDI_OFF = 0x7101,
+    QK_MIDI_TOGGLE = 0x7102,
+    QK_MIDI_NOTE_C_0 = 0x7110,
+    QK_MIDI_NOTE_C_SHARP_0 = 0x7111,
+    QK_MIDI_NOTE_D_0 = 0x7112,
+    QK_MIDI_NOTE_D_SHARP_0 = 0x7113,
+    QK_MIDI_NOTE_E_0 = 0x7114,
+    QK_MIDI_NOTE_F_0 = 0x7115,
+    QK_MIDI_NOTE_F_SHARP_0 = 0x7116,
+    QK_MIDI_NOTE_G_0 = 0x7117,
+    QK_MIDI_NOTE_G_SHARP_0 = 0x7118,
+    QK_MIDI_NOTE_A_0 = 0x7119,
+    QK_MIDI_NOTE_A_SHARP_0 = 0x711A,
+    QK_MIDI_NOTE_B_0 = 0x711B,
+    QK_MIDI_NOTE_C_1 = 0x7120,
+    QK_MIDI_NOTE_C_SHARP_1 = 0x7121,
+    QK_MIDI_NOTE_D_1 = 0x7122,
+    QK_MIDI_NOTE_D_SHARP_1 = 0x7123,
+    QK_MIDI_NOTE_E_1 = 0x7124,
+    QK_MIDI_NOTE_F_1 = 0x7125,
+    QK_MIDI_NOTE_F_SHARP_1 = 0x7126,
+    QK_MIDI_NOTE_G_1 = 0x7127,
+    QK_MIDI_NOTE_G_SHARP_1 = 0x7128,
+    QK_MIDI_NOTE_A_1 = 0x7129,
+    QK_MIDI_NOTE_A_SHARP_1 = 0x712A,
+    QK_MIDI_NOTE_B_1 = 0x712B,
+    QK_MIDI_NOTE_C_2 = 0x7130,
+    QK_MIDI_NOTE_C_SHARP_2 = 0x7131,
+    QK_MIDI_NOTE_D_2 = 0x7132,
+    QK_MIDI_NOTE_D_SHARP_2 = 0x7133,
+    QK_MIDI_NOTE_E_2 = 0x7134,
+    QK_MIDI_NOTE_F_2 = 0x7135,
+    QK_MIDI_NOTE_F_SHARP_2 = 0x7136,
+    QK_MIDI_NOTE_G_2 = 0x7137,
+    QK_MIDI_NOTE_G_SHARP_2 = 0x7138,
+    QK_MIDI_NOTE_A_2 = 0x7139,
+    QK_MIDI_NOTE_A_SHARP_2 = 0x713A,
+    QK_MIDI_NOTE_B_2 = 0x713B,
+    QK_MIDI_NOTE_C_3 = 0x7140,
+    QK_MIDI_NOTE_C_SHARP_3 = 0x7141,
+    QK_MIDI_NOTE_D_3 = 0x7142,
+    QK_MIDI_NOTE_D_SHARP_3 = 0x7143,
+    QK_MIDI_NOTE_E_3 = 0x7144,
+    QK_MIDI_NOTE_F_3 = 0x7145,
+    QK_MIDI_NOTE_F_SHARP_3 = 0x7146,
+    QK_MIDI_NOTE_G_3 = 0x7147,
+    QK_MIDI_NOTE_G_SHARP_3 = 0x7148,
+    QK_MIDI_NOTE_A_3 = 0x7149,
+    QK_MIDI_NOTE_A_SHARP_3 = 0x714A,
+    QK_MIDI_NOTE_B_3 = 0x714B,
+    QK_MIDI_NOTE_C_4 = 0x7150,
+    QK_MIDI_NOTE_C_SHARP_4 = 0x7151,
+    QK_MIDI_NOTE_D_4 = 0x7152,
+    QK_MIDI_NOTE_D_SHARP_4 = 0x7153,
+    QK_MIDI_NOTE_E_4 = 0x7154,
+    QK_MIDI_NOTE_F_4 = 0x7155,
+    QK_MIDI_NOTE_F_SHARP_4 = 0x7156,
+    QK_MIDI_NOTE_G_4 = 0x7157,
+    QK_MIDI_NOTE_G_SHARP_4 = 0x7158,
+    QK_MIDI_NOTE_A_4 = 0x7159,
+    QK_MIDI_NOTE_A_SHARP_4 = 0x715A,
+    QK_MIDI_NOTE_B_4 = 0x715B,
+    QK_MIDI_NOTE_C_5 = 0x7160,
+    QK_MIDI_NOTE_C_SHARP_5 = 0x7161,
+    QK_MIDI_NOTE_D_5 = 0x7162,
+    QK_MIDI_NOTE_D_SHARP_5 = 0x7163,
+    QK_MIDI_NOTE_E_5 = 0x7164,
+    QK_MIDI_NOTE_F_5 = 0x7165,
+    QK_MIDI_NOTE_F_SHARP_5 = 0x7166,
+    QK_MIDI_NOTE_G_5 = 0x7167,
+    QK_MIDI_NOTE_G_SHARP_5 = 0x7168,
+    QK_MIDI_NOTE_A_5 = 0x7169,
+    QK_MIDI_NOTE_A_SHARP_5 = 0x716A,
+    QK_MIDI_NOTE_B_5 = 0x716B,
+    QK_MIDI_OCTAVE_N2 = 0x7170,
+    QK_MIDI_OCTAVE_N1 = 0x7171,
+    QK_MIDI_OCTAVE_0 = 0x7172,
+    QK_MIDI_OCTAVE_1 = 0x7173,
+    QK_MIDI_OCTAVE_2 = 0x7174,
+    QK_MIDI_OCTAVE_3 = 0x7175,
+    QK_MIDI_OCTAVE_4 = 0x7176,
+    QK_MIDI_OCTAVE_5 = 0x7177,
+    QK_MIDI_OCTAVE_6 = 0x7178,
+    QK_MIDI_OCTAVE_7 = 0x7179,
+    QK_MIDI_OCTAVE_DOWN = 0x717A,
+    QK_MIDI_OCTAVE_UP = 0x717B,
+    QK_MIDI_TRANSPOSE_N6 = 0x7180,
+    QK_MIDI_TRANSPOSE_N5 = 0x7181,
+    QK_MIDI_TRANSPOSE_N4 = 0x7182,
+    QK_MIDI_TRANSPOSE_N3 = 0x7183,
+    QK_MIDI_TRANSPOSE_N2 = 0x7184,
+    QK_MIDI_TRANSPOSE_N1 = 0x7185,
+    QK_MIDI_TRANSPOSE_0 = 0x7186,
+    QK_MIDI_TRANSPOSE_1 = 0x7187,
+    QK_MIDI_TRANSPOSE_2 = 0x7188,
+    QK_MIDI_TRANSPOSE_3 = 0x7189,
+    QK_MIDI_TRANSPOSE_4 = 0x718A,
+    QK_MIDI_TRANSPOSE_5 = 0x718B,
+    QK_MIDI_TRANSPOSE_6 = 0x718C,
+    QK_MIDI_TRANSPOSE_DOWN = 0x718D,
+    QK_MIDI_TRANSPOSE_UP = 0x718E,
+    QK_MIDI_VELOCITY_0 = 0x7190,
+    QK_MIDI_VELOCITY_1 = 0x7191,
+    QK_MIDI_VELOCITY_2 = 0x7192,
+    QK_MIDI_VELOCITY_3 = 0x7193,
+    QK_MIDI_VELOCITY_4 = 0x7194,
+    QK_MIDI_VELOCITY_5 = 0x7195,
+    QK_MIDI_VELOCITY_6 = 0x7196,
+    QK_MIDI_VELOCITY_7 = 0x7197,
+    QK_MIDI_VELOCITY_8 = 0x7198,
+    QK_MIDI_VELOCITY_9 = 0x7199,
+    QK_MIDI_VELOCITY_10 = 0x719A,
+    QK_MIDI_VELOCITY_DOWN = 0x719B,
+    QK_MIDI_VELOCITY_UP = 0x719C,
+    QK_MIDI_CHANNEL_1 = 0x71A0,
+    QK_MIDI_CHANNEL_2 = 0x71A1,
+    QK_MIDI_CHANNEL_3 = 0x71A2,
+    QK_MIDI_CHANNEL_4 = 0x71A3,
+    QK_MIDI_CHANNEL_5 = 0x71A4,
+    QK_MIDI_CHANNEL_6 = 0x71A5,
+    QK_MIDI_CHANNEL_7 = 0x71A6,
+    QK_MIDI_CHANNEL_8 = 0x71A7,
+    QK_MIDI_CHANNEL_9 = 0x71A8,
+    QK_MIDI_CHANNEL_10 = 0x71A9,
+    QK_MIDI_CHANNEL_11 = 0x71AA,
+    QK_MIDI_CHANNEL_12 = 0x71AB,
+    QK_MIDI_CHANNEL_13 = 0x71AC,
+    QK_MIDI_CHANNEL_14 = 0x71AD,
+    QK_MIDI_CHANNEL_15 = 0x71AE,
+    QK_MIDI_CHANNEL_16 = 0x71AF,
+    QK_MIDI_CHANNEL_DOWN = 0x71B0,
+    QK_MIDI_CHANNEL_UP = 0x71B1,
+    QK_MIDI_ALL_NOTES_OFF = 0x71C0,
+    QK_MIDI_SUSTAIN = 0x71C1,
+    QK_MIDI_PORTAMENTO = 0x71C2,
+    QK_MIDI_SOSTENUTO = 0x71C3,
+    QK_MIDI_SOFT = 0x71C4,
+    QK_MIDI_LEGATO = 0x71C5,
+    QK_MIDI_MODULATION = 0x71C6,
+    QK_MIDI_MODULATION_SPEED_DOWN = 0x71C7,
+    QK_MIDI_MODULATION_SPEED_UP = 0x71C8,
+    QK_MIDI_PITCH_BEND_DOWN = 0x71C9,
+    QK_MIDI_PITCH_BEND_UP = 0x71CA,
     SQ_ON = 0x7200,
     SQ_OFF = 0x7201,
     SQ_TOG = 0x7202,
@@ -898,36 +898,180 @@ enum qk_keycode_defines {
     EC_SWAP    = MAGIC_SWAP_ESCAPE_CAPSLOCK,
     EC_NORM    = MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
     EC_TOGG    = MAGIC_TOGGLE_ESCAPE_CAPSLOCK,
-    MI_Db      = MI_Cs,
-    MI_Eb      = MI_Ds,
-    MI_Gb      = MI_Fs,
-    MI_Ab      = MI_Gs,
-    MI_Bb      = MI_As,
-    MI_Db_1    = MI_Cs_1,
-    MI_Eb_1    = MI_Ds_1,
-    MI_Gb_1    = MI_Fs_1,
-    MI_Ab_1    = MI_Gs_1,
-    MI_Bb_1    = MI_As_1,
-    MI_Db_2    = MI_Cs_2,
-    MI_Eb_2    = MI_Ds_2,
-    MI_Gb_2    = MI_Fs_2,
-    MI_Ab_2    = MI_Gs_2,
-    MI_Bb_2    = MI_As_2,
-    MI_Db_3    = MI_Cs_3,
-    MI_Eb_3    = MI_Ds_3,
-    MI_Gb_3    = MI_Fs_3,
-    MI_Ab_3    = MI_Gs_3,
-    MI_Bb_3    = MI_As_3,
-    MI_Db_4    = MI_Cs_4,
-    MI_Eb_4    = MI_Ds_4,
-    MI_Gb_4    = MI_Fs_4,
-    MI_Ab_4    = MI_Gs_4,
-    MI_Bb_4    = MI_As_4,
-    MI_Db_5    = MI_Cs_5,
-    MI_Eb_5    = MI_Ds_5,
-    MI_Gb_5    = MI_Fs_5,
-    MI_Ab_5    = MI_Gs_5,
-    MI_Bb_5    = MI_As_5,
+    MI_ON      = QK_MIDI_ON,
+    MI_OFF     = QK_MIDI_OFF,
+    MI_TOGG    = QK_MIDI_TOGGLE,
+    MI_C       = QK_MIDI_NOTE_C_0,
+    MI_Cs      = QK_MIDI_NOTE_C_SHARP_0,
+    MI_Db      = QK_MIDI_NOTE_C_SHARP_0,
+    MI_D       = QK_MIDI_NOTE_D_0,
+    MI_Ds      = QK_MIDI_NOTE_D_SHARP_0,
+    MI_Eb      = QK_MIDI_NOTE_D_SHARP_0,
+    MI_E       = QK_MIDI_NOTE_E_0,
+    MI_F       = QK_MIDI_NOTE_F_0,
+    MI_Fs      = QK_MIDI_NOTE_F_SHARP_0,
+    MI_Gb      = QK_MIDI_NOTE_F_SHARP_0,
+    MI_G       = QK_MIDI_NOTE_G_0,
+    MI_Gs      = QK_MIDI_NOTE_G_SHARP_0,
+    MI_Ab      = QK_MIDI_NOTE_G_SHARP_0,
+    MI_A       = QK_MIDI_NOTE_A_0,
+    MI_As      = QK_MIDI_NOTE_A_SHARP_0,
+    MI_Bb      = QK_MIDI_NOTE_A_SHARP_0,
+    MI_B       = QK_MIDI_NOTE_B_0,
+    MI_C1      = QK_MIDI_NOTE_C_1,
+    MI_Cs1     = QK_MIDI_NOTE_C_SHARP_1,
+    MI_Db1     = QK_MIDI_NOTE_C_SHARP_1,
+    MI_D1      = QK_MIDI_NOTE_D_1,
+    MI_Ds1     = QK_MIDI_NOTE_D_SHARP_1,
+    MI_Eb1     = QK_MIDI_NOTE_D_SHARP_1,
+    MI_E1      = QK_MIDI_NOTE_E_1,
+    MI_F1      = QK_MIDI_NOTE_F_1,
+    MI_Fs1     = QK_MIDI_NOTE_F_SHARP_1,
+    MI_Gb1     = QK_MIDI_NOTE_F_SHARP_1,
+    MI_G1      = QK_MIDI_NOTE_G_1,
+    MI_Gs1     = QK_MIDI_NOTE_G_SHARP_1,
+    MI_Ab1     = QK_MIDI_NOTE_G_SHARP_1,
+    MI_A1      = QK_MIDI_NOTE_A_1,
+    MI_As1     = QK_MIDI_NOTE_A_SHARP_1,
+    MI_Bb1     = QK_MIDI_NOTE_A_SHARP_1,
+    MI_B1      = QK_MIDI_NOTE_B_1,
+    MI_C2      = QK_MIDI_NOTE_C_2,
+    MI_Cs2     = QK_MIDI_NOTE_C_SHARP_2,
+    MI_Db2     = QK_MIDI_NOTE_C_SHARP_2,
+    MI_D2      = QK_MIDI_NOTE_D_2,
+    MI_Ds2     = QK_MIDI_NOTE_D_SHARP_2,
+    MI_Eb2     = QK_MIDI_NOTE_D_SHARP_2,
+    MI_E2      = QK_MIDI_NOTE_E_2,
+    MI_F2      = QK_MIDI_NOTE_F_2,
+    MI_Fs2     = QK_MIDI_NOTE_F_SHARP_2,
+    MI_Gb2     = QK_MIDI_NOTE_F_SHARP_2,
+    MI_G2      = QK_MIDI_NOTE_G_2,
+    MI_Gs2     = QK_MIDI_NOTE_G_SHARP_2,
+    MI_Ab2     = QK_MIDI_NOTE_G_SHARP_2,
+    MI_A2      = QK_MIDI_NOTE_A_2,
+    MI_As2     = QK_MIDI_NOTE_A_SHARP_2,
+    MI_Bb2     = QK_MIDI_NOTE_A_SHARP_2,
+    MI_B2      = QK_MIDI_NOTE_B_2,
+    MI_C3      = QK_MIDI_NOTE_C_3,
+    MI_Cs3     = QK_MIDI_NOTE_C_SHARP_3,
+    MI_Db3     = QK_MIDI_NOTE_C_SHARP_3,
+    MI_D3      = QK_MIDI_NOTE_D_3,
+    MI_Ds3     = QK_MIDI_NOTE_D_SHARP_3,
+    MI_Eb3     = QK_MIDI_NOTE_D_SHARP_3,
+    MI_E3      = QK_MIDI_NOTE_E_3,
+    MI_F3      = QK_MIDI_NOTE_F_3,
+    MI_Fs3     = QK_MIDI_NOTE_F_SHARP_3,
+    MI_Gb3     = QK_MIDI_NOTE_F_SHARP_3,
+    MI_G3      = QK_MIDI_NOTE_G_3,
+    MI_Gs3     = QK_MIDI_NOTE_G_SHARP_3,
+    MI_Ab3     = QK_MIDI_NOTE_G_SHARP_3,
+    MI_A3      = QK_MIDI_NOTE_A_3,
+    MI_As3     = QK_MIDI_NOTE_A_SHARP_3,
+    MI_Bb3     = QK_MIDI_NOTE_A_SHARP_3,
+    MI_B3      = QK_MIDI_NOTE_B_3,
+    MI_C4      = QK_MIDI_NOTE_C_4,
+    MI_Cs4     = QK_MIDI_NOTE_C_SHARP_4,
+    MI_Db4     = QK_MIDI_NOTE_C_SHARP_4,
+    MI_D4      = QK_MIDI_NOTE_D_4,
+    MI_Ds4     = QK_MIDI_NOTE_D_SHARP_4,
+    MI_Eb4     = QK_MIDI_NOTE_D_SHARP_4,
+    MI_E4      = QK_MIDI_NOTE_E_4,
+    MI_F4      = QK_MIDI_NOTE_F_4,
+    MI_Fs4     = QK_MIDI_NOTE_F_SHARP_4,
+    MI_Gb4     = QK_MIDI_NOTE_F_SHARP_4,
+    MI_G4      = QK_MIDI_NOTE_G_4,
+    MI_Gs4     = QK_MIDI_NOTE_G_SHARP_4,
+    MI_Ab4     = QK_MIDI_NOTE_G_SHARP_4,
+    MI_A4      = QK_MIDI_NOTE_A_4,
+    MI_As4     = QK_MIDI_NOTE_A_SHARP_4,
+    MI_Bb4     = QK_MIDI_NOTE_A_SHARP_4,
+    MI_B4      = QK_MIDI_NOTE_B_4,
+    MI_C5      = QK_MIDI_NOTE_C_5,
+    MI_Cs5     = QK_MIDI_NOTE_C_SHARP_5,
+    MI_Db5     = QK_MIDI_NOTE_C_SHARP_5,
+    MI_D5      = QK_MIDI_NOTE_D_5,
+    MI_Ds5     = QK_MIDI_NOTE_D_SHARP_5,
+    MI_Eb5     = QK_MIDI_NOTE_D_SHARP_5,
+    MI_E5      = QK_MIDI_NOTE_E_5,
+    MI_F5      = QK_MIDI_NOTE_F_5,
+    MI_Fs5     = QK_MIDI_NOTE_F_SHARP_5,
+    MI_Gb5     = QK_MIDI_NOTE_F_SHARP_5,
+    MI_G5      = QK_MIDI_NOTE_G_5,
+    MI_Gs5     = QK_MIDI_NOTE_G_SHARP_5,
+    MI_Ab5     = QK_MIDI_NOTE_G_SHARP_5,
+    MI_A5      = QK_MIDI_NOTE_A_5,
+    MI_As5     = QK_MIDI_NOTE_A_SHARP_5,
+    MI_Bb5     = QK_MIDI_NOTE_A_SHARP_5,
+    MI_B5      = QK_MIDI_NOTE_B_5,
+    MI_OCN2    = QK_MIDI_OCTAVE_N2,
+    MI_OCN1    = QK_MIDI_OCTAVE_N1,
+    MI_OC0     = QK_MIDI_OCTAVE_0,
+    MI_OC1     = QK_MIDI_OCTAVE_1,
+    MI_OC2     = QK_MIDI_OCTAVE_2,
+    MI_OC3     = QK_MIDI_OCTAVE_3,
+    MI_OC4     = QK_MIDI_OCTAVE_4,
+    MI_OC5     = QK_MIDI_OCTAVE_5,
+    MI_OC6     = QK_MIDI_OCTAVE_6,
+    MI_OC7     = QK_MIDI_OCTAVE_7,
+    MI_OCTD    = QK_MIDI_OCTAVE_DOWN,
+    MI_OCTU    = QK_MIDI_OCTAVE_UP,
+    MI_TRN6    = QK_MIDI_TRANSPOSE_N6,
+    MI_TRN5    = QK_MIDI_TRANSPOSE_N5,
+    MI_TRN4    = QK_MIDI_TRANSPOSE_N4,
+    MI_TRN3    = QK_MIDI_TRANSPOSE_N3,
+    MI_TRN2    = QK_MIDI_TRANSPOSE_N2,
+    MI_TRN1    = QK_MIDI_TRANSPOSE_N1,
+    MI_TR0     = QK_MIDI_TRANSPOSE_0,
+    MI_TR1     = QK_MIDI_TRANSPOSE_1,
+    MI_TR2     = QK_MIDI_TRANSPOSE_2,
+    MI_TR3     = QK_MIDI_TRANSPOSE_3,
+    MI_TR4     = QK_MIDI_TRANSPOSE_4,
+    MI_TR5     = QK_MIDI_TRANSPOSE_5,
+    MI_TR6     = QK_MIDI_TRANSPOSE_6,
+    MI_TRSD    = QK_MIDI_TRANSPOSE_DOWN,
+    MI_TRSU    = QK_MIDI_TRANSPOSE_UP,
+    MI_VL0     = QK_MIDI_VELOCITY_0,
+    MI_VL1     = QK_MIDI_VELOCITY_1,
+    MI_VL2     = QK_MIDI_VELOCITY_2,
+    MI_VL3     = QK_MIDI_VELOCITY_3,
+    MI_VL4     = QK_MIDI_VELOCITY_4,
+    MI_VL5     = QK_MIDI_VELOCITY_5,
+    MI_VL6     = QK_MIDI_VELOCITY_6,
+    MI_VL7     = QK_MIDI_VELOCITY_7,
+    MI_VL8     = QK_MIDI_VELOCITY_8,
+    MI_VL9     = QK_MIDI_VELOCITY_9,
+    MI_VL10    = QK_MIDI_VELOCITY_10,
+    MI_VELD    = QK_MIDI_VELOCITY_DOWN,
+    MI_VELU    = QK_MIDI_VELOCITY_UP,
+    MI_CH1     = QK_MIDI_CHANNEL_1,
+    MI_CH2     = QK_MIDI_CHANNEL_2,
+    MI_CH3     = QK_MIDI_CHANNEL_3,
+    MI_CH4     = QK_MIDI_CHANNEL_4,
+    MI_CH5     = QK_MIDI_CHANNEL_5,
+    MI_CH6     = QK_MIDI_CHANNEL_6,
+    MI_CH7     = QK_MIDI_CHANNEL_7,
+    MI_CH8     = QK_MIDI_CHANNEL_8,
+    MI_CH9     = QK_MIDI_CHANNEL_9,
+    MI_CH10    = QK_MIDI_CHANNEL_10,
+    MI_CH11    = QK_MIDI_CHANNEL_11,
+    MI_CH12    = QK_MIDI_CHANNEL_12,
+    MI_CH13    = QK_MIDI_CHANNEL_13,
+    MI_CH14    = QK_MIDI_CHANNEL_14,
+    MI_CH15    = QK_MIDI_CHANNEL_15,
+    MI_CH16    = QK_MIDI_CHANNEL_16,
+    MI_CHND    = QK_MIDI_CHANNEL_DOWN,
+    MI_CHNU    = QK_MIDI_CHANNEL_UP,
+    MI_AOFF    = QK_MIDI_ALL_NOTES_OFF,
+    MI_SUST    = QK_MIDI_SUSTAIN,
+    MI_PORT    = QK_MIDI_PORTAMENTO,
+    MI_SOST    = QK_MIDI_SOSTENUTO,
+    MI_SOFT    = QK_MIDI_SOFT,
+    MI_LEG     = QK_MIDI_LEGATO,
+    MI_MOD     = QK_MIDI_MODULATION,
+    MI_MODD    = QK_MIDI_MODULATION_SPEED_DOWN,
+    MI_MODU    = QK_MIDI_MODULATION_SPEED_UP,
+    MI_BNDD    = QK_MIDI_PITCH_BEND_DOWN,
+    MI_BNDU    = QK_MIDI_PITCH_BEND_UP,
     JS_0       = QK_JOYSTICK_BUTTON_0,
     JS_1       = QK_JOYSTICK_BUTTON_1,
     JS_2       = QK_JOYSTICK_BUTTON_2,
@@ -1151,7 +1295,7 @@ enum qk_keycode_defines {
 #define IS_MODIFIERS_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI)
 #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= SH_TG && (code) <= SH_OS)
 #define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK)
-#define IS_MIDI_KEYCODE(code) ((code) >= MI_ON && (code) <= MI_BENDU)
+#define IS_MIDI_KEYCODE(code) ((code) >= QK_MIDI_ON && (code) <= QK_MIDI_PITCH_BEND_UP)
 #define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR)
 #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31)
 #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32)
@@ -1161,4 +1305,3 @@ enum qk_keycode_defines {
 #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING)
 #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
 #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE)
-
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index c49c31a525..ce62559849 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -52,7 +52,7 @@ inline uint8_t compute_velocity(uint8_t setting) {
 }
 
 void midi_init(void) {
-    midi_config.octave              = MI_OCT_2 - MIDI_OCTAVE_MIN;
+    midi_config.octave              = QK_MIDI_OCTAVE_2 - MIDI_OCTAVE_MIN;
     midi_config.transpose           = 0;
     midi_config.velocity            = 127;
     midi_config.channel             = 0;
@@ -103,13 +103,13 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
                 dprintf("midi octave %d\n", midi_config.octave);
             }
             return false;
-        case MI_OCTD:
+        case QK_MIDI_OCTAVE_DOWN:
             if (record->event.pressed && midi_config.octave > 0) {
                 midi_config.octave--;
                 dprintf("midi octave %d\n", midi_config.octave);
             }
             return false;
-        case MI_OCTU:
+        case QK_MIDI_OCTAVE_UP:
             if (record->event.pressed && midi_config.octave < (MIDI_OCTAVE_MAX - MIDI_OCTAVE_MIN)) {
                 midi_config.octave++;
                 dprintf("midi octave %d\n", midi_config.octave);
@@ -117,18 +117,18 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
             return false;
         case MIDI_TRANSPOSE_MIN ... MIDI_TRANSPOSE_MAX:
             if (record->event.pressed) {
-                midi_config.transpose = keycode - MI_TRNS_0;
+                midi_config.transpose = keycode - QK_MIDI_TRANSPOSE_0;
                 dprintf("midi transpose %d\n", midi_config.transpose);
             }
             return false;
-        case MI_TRNSD:
-            if (record->event.pressed && midi_config.transpose > (MIDI_TRANSPOSE_MIN - MI_TRNS_0)) {
+        case QK_MIDI_TRANSPOSE_DOWN:
+            if (record->event.pressed && midi_config.transpose > (MIDI_TRANSPOSE_MIN - QK_MIDI_TRANSPOSE_0)) {
                 midi_config.transpose--;
                 dprintf("midi transpose %d\n", midi_config.transpose);
             }
             return false;
-        case MI_TRNSU:
-            if (record->event.pressed && midi_config.transpose < (MIDI_TRANSPOSE_MAX - MI_TRNS_0)) {
+        case QK_MIDI_TRANSPOSE_UP:
+            if (record->event.pressed && midi_config.transpose < (MIDI_TRANSPOSE_MAX - QK_MIDI_TRANSPOSE_0)) {
                 const bool positive = midi_config.transpose > 0;
                 midi_config.transpose++;
                 if (positive && midi_config.transpose < 0) midi_config.transpose--;
@@ -141,7 +141,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
                 dprintf("midi velocity %d\n", midi_config.velocity);
             }
             return false;
-        case MI_VELD:
+        case QK_MIDI_VELOCITY_DOWN:
             if (record->event.pressed && midi_config.velocity > 0) {
                 if (midi_config.velocity == 127) {
                     midi_config.velocity -= 10;
@@ -154,7 +154,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
                 dprintf("midi velocity %d\n", midi_config.velocity);
             }
             return false;
-        case MI_VELU:
+        case QK_MIDI_VELOCITY_UP:
             if (record->event.pressed && midi_config.velocity < 127) {
                 if (midi_config.velocity < 115) {
                     midi_config.velocity += 13;
@@ -170,48 +170,48 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
                 dprintf("midi channel %d\n", midi_config.channel);
             }
             return false;
-        case MI_CHD:
+        case QK_MIDI_CHANNEL_DOWN:
             if (record->event.pressed) {
                 midi_config.channel--;
                 dprintf("midi channel %d\n", midi_config.channel);
             }
             return false;
-        case MI_CHU:
+        case QK_MIDI_CHANNEL_UP:
             if (record->event.pressed) {
                 midi_config.channel++;
                 dprintf("midi channel %d\n", midi_config.channel);
             }
             return false;
-        case MI_ALLOFF:
+        case QK_MIDI_ALL_NOTES_OFF:
             if (record->event.pressed) {
                 midi_send_cc(&midi_device, midi_config.channel, 0x7B, 0);
                 dprintf("midi all notes off\n");
             }
             return false;
-        case MI_SUS:
+        case QK_MIDI_SUSTAIN:
             midi_send_cc(&midi_device, midi_config.channel, 0x40, record->event.pressed ? 127 : 0);
             dprintf("midi sustain %d\n", record->event.pressed);
             return false;
-        case MI_PORT:
+        case QK_MIDI_PORTAMENTO:
             midi_send_cc(&midi_device, midi_config.channel, 0x41, record->event.pressed ? 127 : 0);
             dprintf("midi portamento %d\n", record->event.pressed);
             return false;
-        case MI_SOST:
+        case QK_MIDI_SOSTENUTO:
             midi_send_cc(&midi_device, midi_config.channel, 0x42, record->event.pressed ? 127 : 0);
             dprintf("midi sostenuto %d\n", record->event.pressed);
             return false;
-        case MI_SOFT:
+        case QK_MIDI_SOFT:
             midi_send_cc(&midi_device, midi_config.channel, 0x43, record->event.pressed ? 127 : 0);
             dprintf("midi soft %d\n", record->event.pressed);
             return false;
-        case MI_LEG:
-            midi_send_cc(&midi_device, midi_config.channel, 0x43, record->event.pressed ? 127 : 0);
+        case QK_MIDI_LEGATO:
+            midi_send_cc(&midi_device, midi_config.channel, 0x44, record->event.pressed ? 127 : 0);
             dprintf("midi legato %d\n", record->event.pressed);
             return false;
-        case MI_MOD:
+        case QK_MIDI_MODULATION:
             midi_modulation_step = record->event.pressed ? 1 : -1;
             return false;
-        case MI_MODSD:
+        case QK_MIDI_MODULATION_SPEED_DOWN:
             if (record->event.pressed) {
                 midi_config.modulation_interval++;
                 // prevent overflow
@@ -219,13 +219,13 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
                 dprintf("midi modulation interval %d\n", midi_config.modulation_interval);
             }
             return false;
-        case MI_MODSU:
+        case QK_MIDI_MODULATION_SPEED_UP:
             if (record->event.pressed && midi_config.modulation_interval > 0) {
                 midi_config.modulation_interval--;
                 dprintf("midi modulation interval %d\n", midi_config.modulation_interval);
             }
             return false;
-        case MI_BENDD:
+        case QK_MIDI_PITCH_BEND_DOWN:
             if (record->event.pressed) {
                 midi_send_pitchbend(&midi_device, midi_config.channel, -0x2000);
                 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, -0x2000);
@@ -234,7 +234,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
                 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0);
             }
             return false;
-        case MI_BENDU:
+        case QK_MIDI_PITCH_BEND_UP:
             if (record->event.pressed) {
                 midi_send_pitchbend(&midi_device, midi_config.channel, 0x1fff);
                 dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0x1fff);
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index 950aec22f9..ee697a0cc6 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -120,17 +120,17 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
 
-    if (keycode == MI_ON && record->event.pressed) {
+    if (keycode == QK_MIDI_ON && record->event.pressed) {
         midi_on();
         return false;
     }
 
-    if (keycode == MI_OFF && record->event.pressed) {
+    if (keycode == QK_MIDI_OFF && record->event.pressed) {
         midi_off();
         return false;
     }
 
-    if (keycode == MI_TOG && record->event.pressed) {
+    if (keycode == QK_MIDI_TOGGLE && record->event.pressed) {
         if (midi_activated) {
             midi_off();
         } else {
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 6b0e890792..688fb892eb 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -193,16 +193,16 @@
 #define QK_SWAP_HANDS_GET_TAP_KEYCODE(kc) ((kc)&0xFF)
 
 // MIDI aliases
-#define MIDI_TONE_MIN MI_C
-#define MIDI_TONE_MAX MI_B_5
-#define MIDI_OCTAVE_MIN MI_OCT_N2
-#define MIDI_OCTAVE_MAX MI_OCT_7
-#define MIDI_TRANSPOSE_MIN MI_TRNS_N6
-#define MIDI_TRANSPOSE_MAX MI_TRNS_6
-#define MIDI_VELOCITY_MIN MI_VEL_0
-#define MIDI_VELOCITY_MAX MI_VEL_10
-#define MIDI_CHANNEL_MIN MI_CH1
-#define MIDI_CHANNEL_MAX MI_CH16
+#define MIDI_TONE_MIN QK_MIDI_NOTE_C_0
+#define MIDI_TONE_MAX QK_MIDI_NOTE_B_5
+#define MIDI_OCTAVE_MIN QK_MIDI_OCTAVE_N2
+#define MIDI_OCTAVE_MAX QK_MIDI_OCTAVE_7
+#define MIDI_TRANSPOSE_MIN QK_MIDI_TRANSPOSE_N6
+#define MIDI_TRANSPOSE_MAX QK_MIDI_TRANSPOSE_6
+#define MIDI_VELOCITY_MIN QK_MIDI_VELOCITY_0
+#define MIDI_VELOCITY_MAX QK_MIDI_VELOCITY_10
+#define MIDI_CHANNEL_MIN QK_MIDI_CHANNEL_1
+#define MIDI_CHANNEL_MAX QK_MIDI_CHANNEL_16
 
 // TODO: somehow migrate sequencer to DD?
 #include "sequencer.h"
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index e2133513bd..04bf687561 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -138,6 +138,136 @@
 #define MUV_IN QK_AUDIO_VOICE_NEXT
 #define MUV_DE QK_AUDIO_VOICE_PREVIOUS
 
+#define MI_TOG QK_MIDI_TOGGLE
+#define MI_C_1 QK_MIDI_NOTE_C_1
+#define MI_Cs_1 QK_MIDI_NOTE_C_SHARP_1
+#define MI_Db_1 QK_MIDI_NOTE_C_SHARP_1
+#define MI_D_1 QK_MIDI_NOTE_D_1
+#define MI_Ds_1 QK_MIDI_NOTE_D_SHARP_1
+#define MI_Eb_1 QK_MIDI_NOTE_D_SHARP_1
+#define MI_E_1 QK_MIDI_NOTE_E_1
+#define MI_F_1 QK_MIDI_NOTE_F_1
+#define MI_Fs_1 QK_MIDI_NOTE_F_SHARP_1
+#define MI_Gb_1 QK_MIDI_NOTE_F_SHARP_1
+#define MI_G_1 QK_MIDI_NOTE_G_1
+#define MI_Gs_1 QK_MIDI_NOTE_G_SHARP_1
+#define MI_Ab_1 QK_MIDI_NOTE_G_SHARP_1
+#define MI_A_1 QK_MIDI_NOTE_A_1
+#define MI_As_1 QK_MIDI_NOTE_A_SHARP_1
+#define MI_Bb_1 QK_MIDI_NOTE_A_SHARP_1
+#define MI_B_1 QK_MIDI_NOTE_B_1
+#define MI_C_2 QK_MIDI_NOTE_C_2
+#define MI_Cs_2 QK_MIDI_NOTE_C_SHARP_2
+#define MI_Db_2 QK_MIDI_NOTE_C_SHARP_2
+#define MI_D_2 QK_MIDI_NOTE_D_2
+#define MI_Ds_2 QK_MIDI_NOTE_D_SHARP_2
+#define MI_Eb_2 QK_MIDI_NOTE_D_SHARP_2
+#define MI_E_2 QK_MIDI_NOTE_E_2
+#define MI_F_2 QK_MIDI_NOTE_F_2
+#define MI_Fs_2 QK_MIDI_NOTE_F_SHARP_2
+#define MI_Gb_2 QK_MIDI_NOTE_F_SHARP_2
+#define MI_G_2 QK_MIDI_NOTE_G_2
+#define MI_Gs_2 QK_MIDI_NOTE_G_SHARP_2
+#define MI_Ab_2 QK_MIDI_NOTE_G_SHARP_2
+#define MI_A_2 QK_MIDI_NOTE_A_2
+#define MI_As_2 QK_MIDI_NOTE_A_SHARP_2
+#define MI_Bb_2 QK_MIDI_NOTE_A_SHARP_2
+#define MI_B_2 QK_MIDI_NOTE_B_2
+#define MI_C_3 QK_MIDI_NOTE_C_3
+#define MI_Cs_3 QK_MIDI_NOTE_C_SHARP_3
+#define MI_Db_3 QK_MIDI_NOTE_C_SHARP_3
+#define MI_D_3 QK_MIDI_NOTE_D_3
+#define MI_Ds_3 QK_MIDI_NOTE_D_SHARP_3
+#define MI_Eb_3 QK_MIDI_NOTE_D_SHARP_3
+#define MI_E_3 QK_MIDI_NOTE_E_3
+#define MI_F_3 QK_MIDI_NOTE_F_3
+#define MI_Fs_3 QK_MIDI_NOTE_F_SHARP_3
+#define MI_Gb_3 QK_MIDI_NOTE_F_SHARP_3
+#define MI_G_3 QK_MIDI_NOTE_G_3
+#define MI_Gs_3 QK_MIDI_NOTE_G_SHARP_3
+#define MI_Ab_3 QK_MIDI_NOTE_G_SHARP_3
+#define MI_A_3 QK_MIDI_NOTE_A_3
+#define MI_As_3 QK_MIDI_NOTE_A_SHARP_3
+#define MI_Bb_3 QK_MIDI_NOTE_A_SHARP_3
+#define MI_B_3 QK_MIDI_NOTE_B_3
+#define MI_C_4 QK_MIDI_NOTE_C_4
+#define MI_Cs_4 QK_MIDI_NOTE_C_SHARP_4
+#define MI_Db_4 QK_MIDI_NOTE_C_SHARP_4
+#define MI_D_4 QK_MIDI_NOTE_D_4
+#define MI_Ds_4 QK_MIDI_NOTE_D_SHARP_4
+#define MI_Eb_4 QK_MIDI_NOTE_D_SHARP_4
+#define MI_E_4 QK_MIDI_NOTE_E_4
+#define MI_F_4 QK_MIDI_NOTE_F_4
+#define MI_Fs_4 QK_MIDI_NOTE_F_SHARP_4
+#define MI_Gb_4 QK_MIDI_NOTE_F_SHARP_4
+#define MI_G_4 QK_MIDI_NOTE_G_4
+#define MI_Gs_4 QK_MIDI_NOTE_G_SHARP_4
+#define MI_Ab_4 QK_MIDI_NOTE_G_SHARP_4
+#define MI_A_4 QK_MIDI_NOTE_A_4
+#define MI_As_4 QK_MIDI_NOTE_A_SHARP_4
+#define MI_Bb_4 QK_MIDI_NOTE_A_SHARP_4
+#define MI_B_4 QK_MIDI_NOTE_B_4
+#define MI_C_5 QK_MIDI_NOTE_C_5
+#define MI_Cs_5 QK_MIDI_NOTE_C_SHARP_5
+#define MI_Db_5 QK_MIDI_NOTE_C_SHARP_5
+#define MI_D_5 QK_MIDI_NOTE_D_5
+#define MI_Ds_5 QK_MIDI_NOTE_D_SHARP_5
+#define MI_Eb_5 QK_MIDI_NOTE_D_SHARP_5
+#define MI_E_5 QK_MIDI_NOTE_E_5
+#define MI_F_5 QK_MIDI_NOTE_F_5
+#define MI_Fs_5 QK_MIDI_NOTE_F_SHARP_5
+#define MI_Gb_5 QK_MIDI_NOTE_F_SHARP_5
+#define MI_G_5 QK_MIDI_NOTE_G_5
+#define MI_Gs_5 QK_MIDI_NOTE_G_SHARP_5
+#define MI_Ab_5 QK_MIDI_NOTE_G_SHARP_5
+#define MI_A_5 QK_MIDI_NOTE_A_5
+#define MI_As_5 QK_MIDI_NOTE_A_SHARP_5
+#define MI_Bb_5 QK_MIDI_NOTE_A_SHARP_5
+#define MI_B_5 QK_MIDI_NOTE_B_5
+#define MI_OCT_N2 QK_MIDI_OCTAVE_N2
+#define MI_OCT_N1 QK_MIDI_OCTAVE_N1
+#define MI_OCT_0 QK_MIDI_OCTAVE_0
+#define MI_OCT_1 QK_MIDI_OCTAVE_1
+#define MI_OCT_2 QK_MIDI_OCTAVE_2
+#define MI_OCT_3 QK_MIDI_OCTAVE_3
+#define MI_OCT_4 QK_MIDI_OCTAVE_4
+#define MI_OCT_5 QK_MIDI_OCTAVE_5
+#define MI_OCT_6 QK_MIDI_OCTAVE_6
+#define MI_OCT_7 QK_MIDI_OCTAVE_7
+#define MI_TRNS_N6 QK_MIDI_TRANSPOSE_N6
+#define MI_TRNS_N5 QK_MIDI_TRANSPOSE_N5
+#define MI_TRNS_N4 QK_MIDI_TRANSPOSE_N4
+#define MI_TRNS_N3 QK_MIDI_TRANSPOSE_N3
+#define MI_TRNS_N2 QK_MIDI_TRANSPOSE_N2
+#define MI_TRNS_N1 QK_MIDI_TRANSPOSE_N1
+#define MI_TRNS_0 QK_MIDI_TRANSPOSE_0
+#define MI_TRNS_1 QK_MIDI_TRANSPOSE_1
+#define MI_TRNS_2 QK_MIDI_TRANSPOSE_2
+#define MI_TRNS_3 QK_MIDI_TRANSPOSE_3
+#define MI_TRNS_4 QK_MIDI_TRANSPOSE_4
+#define MI_TRNS_5 QK_MIDI_TRANSPOSE_5
+#define MI_TRNS_6 QK_MIDI_TRANSPOSE_6
+#define MI_TRNSD QK_MIDI_TRANSPOSE_DOWN
+#define MI_TRNSU QK_MIDI_TRANSPOSE_UP
+#define MI_VEL_0 QK_MIDI_VELOCITY_0
+#define MI_VEL_1 QK_MIDI_VELOCITY_1
+#define MI_VEL_2 QK_MIDI_VELOCITY_2
+#define MI_VEL_3 QK_MIDI_VELOCITY_3
+#define MI_VEL_4 QK_MIDI_VELOCITY_4
+#define MI_VEL_5 QK_MIDI_VELOCITY_5
+#define MI_VEL_6 QK_MIDI_VELOCITY_6
+#define MI_VEL_7 QK_MIDI_VELOCITY_7
+#define MI_VEL_8 QK_MIDI_VELOCITY_8
+#define MI_VEL_9 QK_MIDI_VELOCITY_9
+#define MI_VEL_10 QK_MIDI_VELOCITY_10
+#define MI_CHD QK_MIDI_CHANNEL_DOWN
+#define MI_CHU QK_MIDI_CHANNEL_UP
+#define MI_ALLOFF QK_MIDI_ALL_NOTES_OFF
+#define MI_MODSD QK_MIDI_MODULATION_SPEED_DOWN
+#define MI_MODSU QK_MIDI_MODULATION_SPEED_UP
+#define MI_BENDD QK_MIDI_PITCH_BEND_DOWN
+#define MI_BENDU QK_MIDI_PITCH_BEND_UP
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")
diff --git a/quantum/sequencer/tests/sequencer_tests.cpp b/quantum/sequencer/tests/sequencer_tests.cpp
index 05e58e4111..79ec10cabf 100644
--- a/quantum/sequencer/tests/sequencer_tests.cpp
+++ b/quantum/sequencer/tests/sequencer_tests.cpp
@@ -371,14 +371,14 @@ void setUpMatrixScanSequencerTest(void) {
     sequencer_config.resolution = SQ_RES_16;
 
     // Configure the notes for each track
-    sequencer_config.track_notes[0] = MI_C;
-    sequencer_config.track_notes[1] = MI_D;
-    sequencer_config.track_notes[2] = MI_E;
-    sequencer_config.track_notes[3] = MI_F;
-    sequencer_config.track_notes[4] = MI_G;
-    sequencer_config.track_notes[5] = MI_A;
-    sequencer_config.track_notes[6] = MI_B;
-    sequencer_config.track_notes[7] = MI_C;
+    sequencer_config.track_notes[0] = QK_MIDI_NOTE_C_0;
+    sequencer_config.track_notes[1] = QK_MIDI_NOTE_D_0;
+    sequencer_config.track_notes[2] = QK_MIDI_NOTE_E_0;
+    sequencer_config.track_notes[3] = QK_MIDI_NOTE_F_0;
+    sequencer_config.track_notes[4] = QK_MIDI_NOTE_G_0;
+    sequencer_config.track_notes[5] = QK_MIDI_NOTE_A_0;
+    sequencer_config.track_notes[6] = QK_MIDI_NOTE_B_0;
+    sequencer_config.track_notes[7] = QK_MIDI_NOTE_C_0;
 
     // Turn on some steps
     sequencer_config.steps[0] = (1 << 0);
@@ -389,7 +389,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackFirstTrackOfFirstStep)
     setUpMatrixScanSequencerTest();
 
     sequencer_task();
-    EXPECT_EQ(last_noteon, MI_C);
+    EXPECT_EQ(last_noteon, QK_MIDI_NOTE_C_0);
     EXPECT_EQ(last_noteoff, 0);
 }
 
@@ -499,7 +499,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldReleaseFirstTrackFirstStep) {
 
     sequencer_task();
     EXPECT_EQ(last_noteon, 0);
-    EXPECT_EQ(last_noteoff, MI_C);
+    EXPECT_EQ(last_noteoff, QK_MIDI_NOTE_C_0);
 }
 
 TEST_F(SequencerTest, TestMatrixScanSequencerShouldEnterPausePhaseAfterRelease) {
@@ -565,7 +565,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessSecondTrackOnTime) {
     advance_time(SEQUENCER_TRACK_THROTTLE);
 
     sequencer_task();
-    EXPECT_EQ(last_noteon, MI_D);
+    EXPECT_EQ(last_noteon, QK_MIDI_NOTE_D_0);
     EXPECT_EQ(last_noteoff, 0);
 }
 
diff --git a/users/muppetjones/wrappers.h b/users/muppetjones/wrappers.h
index be17f121a1..7a6d702dad 100644
--- a/users/muppetjones/wrappers.h
+++ b/users/muppetjones/wrappers.h
@@ -140,19 +140,19 @@
  */
 // Not sure why, but this does not work (possibly due to the lowercase 's'?)
 // #ifdef MIDI_ADVANCED
-// #define __GUITAR_1E_L______________________________ MI_E_1,  MI_F_1,  MI_Fs_1, MI_G_1,  MI_Gs_1
-// #define __GUITAR_2A_L______________________________ MI_A_1,  MI_As_1, MI_B_1,  MI_C_2,  MI_Cs_2
-// #define __GUITAR_3D_L______________________________ MI_D_2,  MI_Ds_2, MI_E_2,  MI_F_2,  MI_Fs_2
-// #define __GUITAR_4G_L______________________________ MI_G_2,  MI_Gs_2, MI_A_2,  MI_As_2, MI_B_2
-// #define __GUITAR_5B_L______________________________ MI_B_2,  MI_C_3,  MI_Cs_3, MI_D_3,  MI_Ds_3
-// #define __GUITAR_6E_L______________________________ MI_E_3,  MI_F_3,  MI_Fs_3, MI_G_3,  MI_Gs_3
+// #define __GUITAR_1E_L______________________________ MI_E1,  MI_F1,  MI_Fs1, MI_G1,  MI_Gs1
+// #define __GUITAR_2A_L______________________________ MI_A1,  MI_As1, MI_B1,  MI_C2,  MI_Cs2
+// #define __GUITAR_3D_L______________________________ MI_D2,  MI_Ds2, MI_E2,  MI_F2,  MI_Fs2
+// #define __GUITAR_4G_L______________________________ MI_G2,  MI_Gs2, MI_A2,  MI_As2, MI_B2
+// #define __GUITAR_5B_L______________________________ MI_B2,  MI_C3,  MI_Cs3, MI_D3,  MI_Ds3
+// #define __GUITAR_6E_L______________________________ MI_E3,  MI_F3,  MI_Fs3, MI_G3,  MI_Gs3
 //
-// #define __GUITAR_1E_R______________________________ MI_A_1,  MI_As_1, MI_B_1,  MI_C_2,  MI_Cs_2
-// #define __GUITAR_2A_R______________________________ MI_D_2,  MI_Ds_2, MI_E_2,  MI_F_2,  MI_Fs_2
-// #define __GUITAR_3D_R______________________________ MI_G_2,  MI_Gs_2, MI_A_2,  MI_As_2, MI_B_2
-// #define __GUITAR_4G_R______________________________ MI_C_3,  MI_Cs_3, MI_D_3,  MI_Ds_3, MI_E_3
-// #define __GUITAR_5B_R______________________________ MI_E_3,  MI_F_3,  MI_Fs_3, MI_G_3,  MI_Gs_3
-// #define __GUITAR_6E_R______________________________ MI_A_3,  MI_As_3, MI_B_3,  MI_C_4,  MI_Cs_4
+// #define __GUITAR_1E_R______________________________ MI_A1,  MI_As1, MI_B1,  MI_C2,  MI_Cs2
+// #define __GUITAR_2A_R______________________________ MI_D2,  MI_Ds2, MI_E2,  MI_F2,  MI_Fs2
+// #define __GUITAR_3D_R______________________________ MI_G2,  MI_Gs2, MI_A2,  MI_As2, MI_B2
+// #define __GUITAR_4G_R______________________________ MI_C3,  MI_Cs3, MI_D3,  MI_Ds3, MI_E3
+// #define __GUITAR_5B_R______________________________ MI_E3,  MI_F3,  MI_Fs3, MI_G3,  MI_Gs3
+// #define __GUITAR_6E_R______________________________ MI_A3,  MI_As3, MI_B3,  MI_C4,  MI_Cs4
 // #endif
 
 

From e4d2ba9a4d98a8ff7327156ff45cc6339cb40c95 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 7 Nov 2022 02:43:53 +0000
Subject: [PATCH 807/959] Align haptic feedback keycode names (#18964)

---
 .../keycodes/keycodes_0.0.1_quantum.hjson     | 65 +++++++++++++++----
 docs/feature_haptic_feedback.md               | 36 +++++-----
 quantum/keycodes.h                            | 39 +++++++----
 quantum/process_keycode/process_haptic.c      | 26 ++++----
 quantum/quantum_keycodes_legacy.h             | 14 ++++
 5 files changed, 123 insertions(+), 57 deletions(-)

diff --git a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
index e3db45be71..a4b60cfc61 100644
--- a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
@@ -214,55 +214,94 @@
 
         "0x7C40": {
             "group": "quantum",
-            "key": "HPT_ON"
+            "key": "QK_HAPTIC_ON",
+            "aliases": [
+                "HF_ON"
+            ]
         },
         "0x7C41": {
             "group": "quantum",
-            "key": "HPT_OFF"
+            "key": "QK_HAPTIC_OFF",
+            "aliases": [
+                "HF_OFF"
+            ]
         },
         "0x7C42": {
             "group": "quantum",
-            "key": "HPT_TOG"
+            "key": "QK_HAPTIC_TOGGLE",
+            "aliases": [
+                "HF_TOGG"
+            ]
         },
         "0x7C43": {
             "group": "quantum",
-            "key": "HPT_RST"
+            "key": "QK_HAPTIC_RESET",
+            "aliases": [
+                "HF_RST"
+            ]
         },
         "0x7C44": {
             "group": "quantum",
-            "key": "HPT_FBK"
+            "key": "QK_HAPTIC_FEEDBACK_TOGGLE",
+            "aliases": [
+                "HF_FDBK"
+            ]
         },
         "0x7C45": {
             "group": "quantum",
-            "key": "HPT_BUZ"
+            "key": "QK_HAPTIC_BUZZ_TOGGLE",
+            "aliases": [
+                "HF_BUZZ"
+            ]
         },
         "0x7C46": {
             "group": "quantum",
-            "key": "HPT_MODI"
+            "key": "QK_HAPTIC_MODE_NEXT",
+            "aliases": [
+                "HF_NEXT"
+            ]
         },
         "0x7C47": {
             "group": "quantum",
-            "key": "HPT_MODD"
+            "key": "QK_HAPTIC_MODE_PREVIOUS",
+            "aliases": [
+                "HF_PREV"
+            ]
         },
         "0x7C48": {
             "group": "quantum",
-            "key": "HPT_CONT"
+            "key": "QK_HAPTIC_CONTINUOUS_TOGGLE",
+            "aliases": [
+                "HF_CONT"
+            ]
         },
         "0x7C49": {
             "group": "quantum",
-            "key": "HPT_CONI"
+            "key": "QK_HAPTIC_CONTINUOUS_UP",
+            "aliases": [
+                "HF_CONU"
+            ]
         },
         "0x7C4A": {
             "group": "quantum",
-            "key": "HPT_COND"
+            "key": "QK_HAPTIC_CONTINUOUS_DOWN",
+            "aliases": [
+                "HF_COND"
+            ]
         },
         "0x7C4B": {
             "group": "quantum",
-            "key": "HPT_DWLI"
+            "key": "QK_HAPTIC_DWELL_UP",
+            "aliases": [
+                "HF_DWLU"
+            ]
         },
         "0x7C4C": {
             "group": "quantum",
-            "key": "HPT_DWLD"
+            "key": "QK_HAPTIC_DWELL_DOWN",
+            "aliases": [
+                "HF_DWLD"
+            ]
         },
 
         "0x7C50": {
diff --git a/docs/feature_haptic_feedback.md b/docs/feature_haptic_feedback.md
index f4546b6914..b456bad736 100644
--- a/docs/feature_haptic_feedback.md
+++ b/docs/feature_haptic_feedback.md
@@ -32,21 +32,21 @@ The following `config.h` settings are available for all types of haptic feedback
 
 Not all keycodes below will work depending on which haptic mechanism you have chosen.
 
-| Name      | Description                                           |
-|-----------|-------------------------------------------------------|
-|`HPT_ON`   | Turn haptic feedback on                               |
-|`HPT_OFF`  | Turn haptic feedback off                              |
-|`HPT_TOG`  | Toggle haptic feedback on/off                         |
-|`HPT_RST`  | Reset haptic feedback config to default               |
-|`HPT_FBK`  | Toggle feedback to occur on keypress, release or both |
-|`HPT_BUZ`  | Toggle solenoid buzz on/off                           |
-|`HPT_MODI` | Go to next DRV2605L waveform                          |
-|`HPT_MODD` | Go to previous DRV2605L waveform                      |
-|`HPT_CONT` | Toggle continuous haptic mode on/off                  |
-|`HPT_CONI` | Increase DRV2605L continous haptic strength           |
-|`HPT_COND` | Decrease DRV2605L continous haptic strength           |
-|`HPT_DWLI` | Increase Solenoid dwell time                          |
-|`HPT_DWLD` | Decrease Solenoid dwell time                          |
+| Key                         | Aliases | Description                                           |
+|-----------------------------|---------|-------------------------------------------------------|
+|`QK_HAPTIC_ON`               |`HF_ON`  | Turn haptic feedback on                               |
+|`QK_HAPTIC_OFF`              |`HF_OFF` | Turn haptic feedback off                              |
+|`QK_HAPTIC_TOGGLE`           |`HF_TOGG`| Toggle haptic feedback on/off                         |
+|`QK_HAPTIC_RESET`            |`HF_RST` | Reset haptic feedback config to default               |
+|`QK_HAPTIC_FEEDBACK_TOGGLE`  |`HF_FDBK`| Toggle feedback to occur on keypress, release or both |
+|`QK_HAPTIC_BUZZ_TOGGLE`      |`HF_BUZZ`| Toggle solenoid buzz on/off                           |
+|`QK_HAPTIC_MODE_NEXT`        |`HF_NEXT`| Go to next DRV2605L waveform                          |
+|`QK_HAPTIC_MODE_PREVIOUS`    |`HF_PREV`| Go to previous DRV2605L waveform                      |
+|`QK_HAPTIC_CONTINUOUS_TOGGLE`|`HF_CONT`| Toggle continuous haptic mode on/off                  |
+|`QK_HAPTIC_CONTINUOUS_UP`    |`HF_CONU`| Increase DRV2605L continous haptic strength           |
+|`QK_HAPTIC_CONTINUOUS_DOWN`  |`HF_COND`| Decrease DRV2605L continous haptic strength           |
+|`QK_HAPTIC_DWELL_UP`         |`HF_DWLU`| Increase Solenoid dwell time                          |
+|`QK_HAPTIC_DWELL_DOWN`       |`HF_DWLD`| Decrease Solenoid dwell time                          |
 
 ### Solenoids
 
@@ -68,8 +68,8 @@ For relay switches, the hardware may already contain all of that ciruitry, and j
 |`SOLENOID_DEFAULT_DWELL`    | `12` ms              |Configures the default dwell time for the switch.             |
 |`SOLENOID_MIN_DWELL`        | `4` ms               |Sets the lower limit for the dwell.                           |
 |`SOLENOID_MAX_DWELL`        | `100` ms             |Sets the upper limit for the dwell.                           |
-|`SOLENOID_DWELL_STEP_SIZE`  | `1` ms               |The step size to use when `HPT_DWL*` keycodes are sent.       |
-|`SOLENOID_DEFAULT_BUZZ`     | `0` (disabled)       |On HPT_RST buzz is set "on" if this is "1"                    |
+|`SOLENOID_DWELL_STEP_SIZE`  | `1` ms               |The step size to use when `HF_DWL*` keycodes are sent.        |
+|`SOLENOID_DEFAULT_BUZZ`     | `0` (disabled)       |On `HF_RST` buzz is set "on" if this is "1"                   |
 |`SOLENOID_BUZZ_ACTUATED`    | `SOLENOID_MIN_DWELL` |Actuated-time when the switch is in buzz mode.                |
 |`SOLENOID_BUZZ_NONACTUATED` | `SOLENOID_MIN_DWELL` |Non-Actuated-time when the switch is in buzz mode.            |
 
@@ -178,7 +178,7 @@ If haptic feedback is enabled, the keyboard will vibrate to a specific sequence
 ```
 #define DRV_MODE_DEFAULT *sequence name or number*
 ```
-This will set what sequence HPT_RST will set as the active mode. If not defined, mode will be set to 1 when HPT_RST is pressed.
+This will set what sequence `HF_RST` will set as the active mode. If not defined, mode will be set to 1 when `HF_RST` is pressed.
 
 ### DRV2605L Continuous Haptic Mode
 
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index deb3565262..2b81261519 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -673,19 +673,19 @@ enum qk_keycode_defines {
     QK_UNICODE_MODE_BSD = 0x7C35,
     QK_UNICODE_MODE_WINCOMPOSE = 0x7C36,
     QK_UNICODE_MODE_EMACS = 0x7C37,
-    HPT_ON = 0x7C40,
-    HPT_OFF = 0x7C41,
-    HPT_TOG = 0x7C42,
-    HPT_RST = 0x7C43,
-    HPT_FBK = 0x7C44,
-    HPT_BUZ = 0x7C45,
-    HPT_MODI = 0x7C46,
-    HPT_MODD = 0x7C47,
-    HPT_CONT = 0x7C48,
-    HPT_CONI = 0x7C49,
-    HPT_COND = 0x7C4A,
-    HPT_DWLI = 0x7C4B,
-    HPT_DWLD = 0x7C4C,
+    QK_HAPTIC_ON = 0x7C40,
+    QK_HAPTIC_OFF = 0x7C41,
+    QK_HAPTIC_TOGGLE = 0x7C42,
+    QK_HAPTIC_RESET = 0x7C43,
+    QK_HAPTIC_FEEDBACK_TOGGLE = 0x7C44,
+    QK_HAPTIC_BUZZ_TOGGLE = 0x7C45,
+    QK_HAPTIC_MODE_NEXT = 0x7C46,
+    QK_HAPTIC_MODE_PREVIOUS = 0x7C47,
+    QK_HAPTIC_CONTINUOUS_TOGGLE = 0x7C48,
+    QK_HAPTIC_CONTINUOUS_UP = 0x7C49,
+    QK_HAPTIC_CONTINUOUS_DOWN = 0x7C4A,
+    QK_HAPTIC_DWELL_UP = 0x7C4B,
+    QK_HAPTIC_DWELL_DOWN = 0x7C4C,
     QK_COMBO_ON = 0x7C50,
     QK_COMBO_OFF = 0x7C51,
     QK_COMBO_TOGGLE = 0x7C52,
@@ -1229,6 +1229,19 @@ enum qk_keycode_defines {
     UC_BSD     = QK_UNICODE_MODE_BSD,
     UC_WINC    = QK_UNICODE_MODE_WINCOMPOSE,
     UC_EMAC    = QK_UNICODE_MODE_EMACS,
+    HF_ON      = QK_HAPTIC_ON,
+    HF_OFF     = QK_HAPTIC_OFF,
+    HF_TOGG    = QK_HAPTIC_TOGGLE,
+    HF_RST     = QK_HAPTIC_RESET,
+    HF_FDBK    = QK_HAPTIC_FEEDBACK_TOGGLE,
+    HF_BUZZ    = QK_HAPTIC_BUZZ_TOGGLE,
+    HF_NEXT    = QK_HAPTIC_MODE_NEXT,
+    HF_PREV    = QK_HAPTIC_MODE_PREVIOUS,
+    HF_CONT    = QK_HAPTIC_CONTINUOUS_TOGGLE,
+    HF_CONU    = QK_HAPTIC_CONTINUOUS_UP,
+    HF_COND    = QK_HAPTIC_CONTINUOUS_DOWN,
+    HF_DWLU    = QK_HAPTIC_DWELL_UP,
+    HF_DWLD    = QK_HAPTIC_DWELL_DOWN,
     CM_ON      = QK_COMBO_ON,
     CM_OFF     = QK_COMBO_OFF,
     CM_TOGG    = QK_COMBO_TOGGLE,
diff --git a/quantum/process_keycode/process_haptic.c b/quantum/process_keycode/process_haptic.c
index 0f07f9ac75..21d4c5ce30 100644
--- a/quantum/process_keycode/process_haptic.c
+++ b/quantum/process_keycode/process_haptic.c
@@ -87,43 +87,43 @@ __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t
 bool process_haptic(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
-            case HPT_ON:
+            case QK_HAPTIC_ON:
                 haptic_enable();
                 break;
-            case HPT_OFF:
+            case QK_HAPTIC_OFF:
                 haptic_disable();
                 break;
-            case HPT_TOG:
+            case QK_HAPTIC_TOGGLE:
                 haptic_toggle();
                 break;
-            case HPT_RST:
+            case QK_HAPTIC_RESET:
                 haptic_reset();
                 break;
-            case HPT_FBK:
+            case QK_HAPTIC_FEEDBACK_TOGGLE:
                 haptic_feedback_toggle();
                 break;
-            case HPT_BUZ:
+            case QK_HAPTIC_BUZZ_TOGGLE:
                 haptic_buzz_toggle();
                 break;
-            case HPT_MODI:
+            case QK_HAPTIC_MODE_NEXT:
                 haptic_mode_increase();
                 break;
-            case HPT_MODD:
+            case QK_HAPTIC_MODE_PREVIOUS:
                 haptic_mode_decrease();
                 break;
-            case HPT_DWLI:
+            case QK_HAPTIC_DWELL_UP:
                 haptic_dwell_increase();
                 break;
-            case HPT_DWLD:
+            case QK_HAPTIC_DWELL_DOWN:
                 haptic_dwell_decrease();
                 break;
-            case HPT_CONT:
+            case QK_HAPTIC_CONTINUOUS_TOGGLE:
                 haptic_toggle_continuous();
                 break;
-            case HPT_CONI:
+            case QK_HAPTIC_CONTINUOUS_UP:
                 haptic_cont_increase();
                 break;
-            case HPT_COND:
+            case QK_HAPTIC_CONTINUOUS_DOWN:
                 haptic_cont_decrease();
                 break;
         }
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 04bf687561..305b89a569 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -268,6 +268,20 @@
 #define MI_BENDD QK_MIDI_PITCH_BEND_DOWN
 #define MI_BENDU QK_MIDI_PITCH_BEND_UP
 
+#define HPT_ON QK_HAPTIC_ON
+#define HPT_OFF QK_HAPTIC_OFF
+#define HPT_TOG QK_HAPTIC_TOGGLE
+#define HPT_RST QK_HAPTIC_RESET
+#define HPT_FBK QK_HAPTIC_FEEDBACK_TOGGLE
+#define HPT_BUZ QK_HAPTIC_BUZZ_TOGGLE
+#define HPT_MODI QK_HAPTIC_MODE_NEXT
+#define HPT_MODD QK_HAPTIC_MODE_PREVIOUS
+#define HPT_CONT QK_HAPTIC_CONTINUOUS_TOGGLE
+#define HPT_CONI QK_HAPTIC_CONTINUOUS_UP
+#define HPT_COND QK_HAPTIC_CONTINUOUS_DOWN
+#define HPT_DWLI QK_HAPTIC_DWELL_UP
+#define HPT_DWLD QK_HAPTIC_DWELL_DOWN
+
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
 // #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")

From 4deaa58016be57184af5e3148b5322e58a0a9ffb Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 7 Nov 2022 16:16:41 +1100
Subject: [PATCH 808/959] `cannonkeys/db60/hotswap`: fix layouts (#18982)

---
 keyboards/cannonkeys/db60/hotswap/info.json   | 141 ++++++++++++
 keyboards/cannonkeys/db60/info.json           |  14 +-
 keyboards/cannonkeys/db60/j02/info.json       | 211 ++++++++++++++++++
 .../db60/{ => j02}/keymaps/iso/keymap.c       |   0
 keyboards/cannonkeys/db60/rev2/info.json      | 211 ++++++++++++++++++
 .../cannonkeys/db60/rev2/keymaps/iso/keymap.c |  45 ++++
 .../miryoku_layer_alternatives.h              |   4 +-
 7 files changed, 611 insertions(+), 15 deletions(-)
 rename keyboards/cannonkeys/db60/{ => j02}/keymaps/iso/keymap.c (100%)
 create mode 100644 keyboards/cannonkeys/db60/rev2/keymaps/iso/keymap.c

diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/info.json
index e0ced428b2..867c333e79 100644
--- a/keyboards/cannonkeys/db60/hotswap/info.json
+++ b/keyboards/cannonkeys/db60/hotswap/info.json
@@ -2,5 +2,146 @@
     "keyboard_name": "DB60 Hotswap",
     "usb": {
         "pid": "0xDB62"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
     }
 }
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index bba9427caf..9acffd83ed 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -5,17 +5,5 @@
     "usb": {
         "vid": "0xCA04",
         "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
-        }
     }
-
-  }
+}
diff --git a/keyboards/cannonkeys/db60/j02/info.json b/keyboards/cannonkeys/db60/j02/info.json
index 9f5c817112..462e243a81 100644
--- a/keyboards/cannonkeys/db60/j02/info.json
+++ b/keyboards/cannonkeys/db60/j02/info.json
@@ -2,5 +2,216 @@
     "keyboard_name": "DB60",
     "usb": {
         "pid": "0xDB60"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label":"\u00ac", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"\"", "x":2, "y":0},
+                {"label":"\u00a3", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"@", "x":11.75, "y":2},
+                {"label":"~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"label":"AltGr", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/cannonkeys/db60/keymaps/iso/keymap.c b/keyboards/cannonkeys/db60/j02/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/cannonkeys/db60/keymaps/iso/keymap.c
rename to keyboards/cannonkeys/db60/j02/keymaps/iso/keymap.c
diff --git a/keyboards/cannonkeys/db60/rev2/info.json b/keyboards/cannonkeys/db60/rev2/info.json
index f5f3c8530d..3e012930c8 100644
--- a/keyboards/cannonkeys/db60/rev2/info.json
+++ b/keyboards/cannonkeys/db60/rev2/info.json
@@ -2,5 +2,216 @@
     "keyboard_name": "DB60v2",
     "usb": {
         "pid": "0xDB61"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"~", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label":"\u00ac", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"\"", "x":2, "y":0},
+                {"label":"\u00a3", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"@", "x":11.75, "y":2},
+                {"label":"~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"label":"AltGr", "x":10, "y":4, "w":1.25},
+                {"label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/cannonkeys/db60/rev2/keymaps/iso/keymap.c b/keyboards/cannonkeys/db60/rev2/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..a0cacca0f5
--- /dev/null
+++ b/keyboards/cannonkeys/db60/rev2/keymaps/iso/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_60_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, MO(_FN1), KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT_60_iso(
+    QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
+    BL_UP,   _______, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
+  )
+};
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
index 33619a9e8f..4d3bf0e2a7 100644
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
@@ -371,13 +371,13 @@ U_NP,              U_NP,              KC_LPRN,           KC_RPRN,           KC_U
 
 #define MIRYOKU_ALTERNATIVES_FUN_FLIP \
 QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SLCK,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SCRL,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
 U_NA,              KC_ALGR,           DF(U_MEDIA),       DF(U_FUN),         U_NA,              KC_PAUS,           KC_F1,             KC_F2,             KC_F3,             KC_F10,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_TAB,            KC_SPC,            KC_APP,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_FUN \
 KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
-KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SLCK,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SCRL,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
 KC_F10,            KC_F1,             KC_F2,             KC_F3,             KC_PAUS,           U_NA,              DF(U_FUN),         DF(U_MEDIA),       KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_APP,            KC_SPC,            KC_TAB,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 

From ce80a3ad46b951e6c7021b43e43e63074d8234f8 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 7 Nov 2022 15:16:05 -0700
Subject: [PATCH 809/959] Fixup hotdox76v2 on develop (#18991)

---
 keyboards/hotdox76v2/config.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/hotdox76v2/config.h b/keyboards/hotdox76v2/config.h
index 8a1bdb0288..5a3d53d447 100644
--- a/keyboards/hotdox76v2/config.h
+++ b/keyboards/hotdox76v2/config.h
@@ -25,8 +25,7 @@
     { 43, 43 }
 
 #define RGB_DI_PIN D3
-#define RGBLED_NUM 86
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 86
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define RGB_DISABLE_WHEN_USB_SUSPENDED

From 479d8de622674b6667295bda344145a69aa042bd Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 8 Nov 2022 12:05:08 +1100
Subject: [PATCH 810/959] Format DD mappings and schemas (#18924)

---
 .../{defaults.json => defaults.hjson}         |    0
 .../{info_config.json => info_config.hjson}   |   24 +-
 .../{info_rules.json => info_rules.hjson}     |   24 +-
 data/mappings/keyboard_aliases.hjson          | 1252 ++++++++++++++++
 data/mappings/keyboard_aliases.json           | 1285 -----------------
 data/schemas/keyboard.jsonschema              |    5 +-
 docs/data_driven_config.md                    |    2 +-
 lib/python/qmk/cli/generate/api.py            |    2 +-
 lib/python/qmk/cli/generate/config_h.py       |    2 +-
 lib/python/qmk/cli/generate/rules_mk.py       |    2 +-
 lib/python/qmk/cli/new/keyboard.py            |    2 +-
 lib/python/qmk/commands.py                    |    2 +-
 lib/python/qmk/info.py                        |    6 +-
 lib/python/qmk/keyboard.py                    |    2 +-
 14 files changed, 1290 insertions(+), 1320 deletions(-)
 rename data/mappings/{defaults.json => defaults.hjson} (100%)
 rename data/mappings/{info_config.json => info_config.hjson} (90%)
 rename data/mappings/{info_rules.json => info_rules.hjson} (68%)
 create mode 100644 data/mappings/keyboard_aliases.hjson
 delete mode 100644 data/mappings/keyboard_aliases.json

diff --git a/data/mappings/defaults.json b/data/mappings/defaults.hjson
similarity index 100%
rename from data/mappings/defaults.json
rename to data/mappings/defaults.hjson
diff --git a/data/mappings/info_config.json b/data/mappings/info_config.hjson
similarity index 90%
rename from data/mappings/info_config.json
rename to data/mappings/info_config.hjson
index 01f39540d0..a013e98b34 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.hjson
@@ -1,15 +1,15 @@
-# This file maps keys between `config.h` and `info.json`. It is used by QMK
-# to correctly and consistently map back and forth between the two systems.
+// This file maps keys between `config.h` and `info.json`. It is used by QMK
+// to correctly and consistently map back and forth between the two systems.
 {
-    # Format:
-    # <config.h key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
-    # value_type: one of "array", "array.int", "bool", "int", "hex", "list", "mapping", "str", "raw"
-    # to_json: Default `true`. Set to `false` to exclude this mapping from info.json
-    # to_c: Default `true`. Set to `false` to exclude this mapping from config.h
-    # warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
-    # deprecated: Default `false`. Set to `true` to turn on warning when a value exists
-    # invalid: Default `false`. Set to `true` to generate errors when a value exists
-    # replace_with: use with a key marked deprecated or invalid to designate a replacement
+    // Format:
+    // <config.h key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
+    // value_type: one of "array", "array.int", "bool", "int", "hex", "list", "mapping", "str", "raw"
+    // to_json: Default `true`. Set to `false` to exclude this mapping from info.json
+    // to_c: Default `true`. Set to `false` to exclude this mapping from config.h
+    // warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
+    // deprecated: Default `false`. Set to `true` to turn on warning when a value exists
+    // invalid: Default `false`. Set to `true` to generate errors when a value exists
+    // replace_with: use with a key marked deprecated or invalid to designate a replacement
     "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
     "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
     "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
@@ -118,7 +118,7 @@
     "USB_POLLING_INTERVAL_MS": {"info_key": "usb.polling_interval", "value_type": "int"},
     "USB_SUSPEND_WAKEUP_DELAY": {"info_key": "usb.suspend_wakeup_delay", "value_type": "int"},
 
-    # Items we want flagged in lint
+    // Items we want flagged in lint
     "NO_ACTION_MACRO": {"info_key": "_invalid.no_action_macro", "invalid": true},
     "NO_ACTION_FUNCTION": {"info_key": "_invalid.no_action_function", "invalid": true},
     "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true},
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.hjson
similarity index 68%
rename from data/mappings/info_rules.json
rename to data/mappings/info_rules.hjson
index 6bf933bfb8..2f8656c4bf 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.hjson
@@ -1,15 +1,15 @@
-# This file maps keys between `rules.mk` and `info.json`. It is used by QMK
-# to correctly and consistently map back and forth between the two systems.
+// This file maps keys between `rules.mk` and `info.json`. It is used by QMK
+// to correctly and consistently map back and forth between the two systems.
 {
-    # Format:
-    # <rules.mk key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
-    # value_type: one of "array", "array.int", "bool", "int", "list", "hex", "mapping", "str", "raw"
-    # to_json: Default `true`. Set to `false` to exclude this mapping from info.json
-    # to_c: Default `true`. Set to `false` to exclude this mapping from rules.mk
-    # warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
-    # deprecated: Default `false`. Set to `true` to turn on warning when a value exists
-    # invalid: Default `false`. Set to `true` to generate errors when a value exists
-    # replace_with: use with a key marked deprecated or invalid to designate a replacement
+    // Format:
+    // <rules.mk key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
+    // value_type: one of "array", "array.int", "bool", "int", "list", "hex", "mapping", "str", "raw"
+    // to_json: Default `true`. Set to `false` to exclude this mapping from info.json
+    // to_c: Default `true`. Set to `false` to exclude this mapping from rules.mk
+    // warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
+    // deprecated: Default `false`. Set to `true` to turn on warning when a value exists
+    // invalid: Default `false`. Set to `true` to generate errors when a value exists
+    // replace_with: use with a key marked deprecated or invalid to designate a replacement
     "BOARD": {"info_key": "board"},
     "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
     "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
@@ -37,7 +37,7 @@
     "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
     "PS2_DRIVER": {"info_key": "ps2.driver"},
 
-    # Items we want flagged in lint
+    // Items we want flagged in lint
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
     "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
     "VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true}
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
new file mode 100644
index 0000000000..78a85ef6e7
--- /dev/null
+++ b/data/mappings/keyboard_aliases.hjson
@@ -0,0 +1,1252 @@
+{
+    // Format for each entry:
+    // "<alias>": {
+    //     "target": "<keyboard_folder>",
+    //     "layouts": {
+    //         "<layout_alias>": "<layout_target>"
+    //     }
+    // }
+    //
+    // Both target and layouts are optional.
+    "2_milk": {
+        "target": "spaceman/2_milk"
+    },
+    "absinthe": {
+        "target": "keyhive/absinthe"
+    },
+    "aeboards/constellation": {
+        "target": "aeboards/constellation/rev1"
+    },
+    "aeboards/ext65": {
+        "target": "aeboards/ext65/rev1"
+    },
+    "ai03/equinox": {
+        "target": "ai03/equinox/rev1"
+    },
+    "alice": {
+        "target": "tgr/alice"
+    },
+    "amj40": {
+        "target": "amjkeyboard/amj40"
+    },
+    "amj60": {
+        "target": "amjkeyboard/amj60"
+    },
+    "amj96": {
+        "target": "amjkeyboard/amj96"
+    },
+    "amjpad": {
+        "target": "amjkeyboard/amjpad"
+    },
+    "angel64": {
+        "target": "angel64/alpha"
+    },
+    "at101_blackheart": {
+        "target": "viktus/at101_bh"
+    },
+    "at101_bh": {
+        "target": "viktus/at101_bh"
+    },
+    "atom47/rev2": {
+        "target": "maartenwut/atom47/rev2"
+    },
+    "atom47/rev3": {
+        "target": "maartenwut/atom47/rev3"
+    },
+    "bakeneko60": {
+        "target": "kkatano/bakeneko60"
+    },
+    "bakeneko65": {
+        "target": "kkatano/bakeneko65/rev2"
+    },
+    "bakeneko80": {
+        "target": "kkatano/bakeneko80"
+    },
+    "bear_face": {
+        "target": "bear_face/v1"
+    },
+    "bm16a": {
+        "target": "kprepublic/bm16a"
+    },
+    "bm16s": {
+        "target": "kprepublic/bm16s"
+    },
+    "bm40hsrgb": {
+        "target": "kprepublic/bm40hsrgb"
+    },
+    "bm43a": {
+        "target": "kprepublic/bm43a"
+    },
+    "bm60poker": {
+        "target": "kprepublic/bm60poker"
+    },
+    "bm60rgb": {
+        "target": "kprepublic/bm60rgb"
+    },
+    "bm60rgb_iso": {
+        "target": "kprepublic/bm60rgb_iso"
+    },
+    "bm68rgb": {
+        "target": "kprepublic/bm68rgb"
+    },
+    "bpiphany/pegasushoof": {
+        "target": "bpiphany/pegasushoof/2013"
+    },
+    "chavdai40": {
+        "target": "chavdai40/rev1"
+    },
+    "candybar/lefty": {
+        "target": "tkc/candybar/lefty"
+    },
+    "candybar/righty": {
+        "target": "tkc/candybar/righty"
+    },
+    "canoe": {
+        "target": "percent/canoe"
+    },
+    "clawsome/gamebuddy": {
+        "target": "clawsome/gamebuddy/v1_0"
+    },
+    "cmm_studio/saka68": {
+        "target": "cmm_studio/saka68/solder"
+    },
+    "cospad": {
+        "target": "kprepublic/cospad"
+    },
+    "crkbd/rev1/legacy": {
+        "target": "crkbd/rev1"
+    },
+    "crkbd/rev1/common": {
+        "target": "crkbd/rev1"
+    },
+    "custommk/genesis": {
+        "target": "custommk/genesis/rev1"
+    },
+    "daisy": {
+        "target": "ktec/daisy"
+    },
+    "doro67/multi": {
+        "layouts": {
+            "LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
+        }
+    },
+    "doro67/regular": {
+        "layouts": {
+            "LAYOUT": "LAYOUT_65_ansi_blocker"
+        }
+    },
+    "doro67/rgb": {
+        "layouts": {
+            "LAYOUT": "LAYOUT_65_ansi_blocker"
+        }
+    },
+    "drakon": {
+        "target": "jagdpietr/drakon"
+    },
+    "durgod/k320": {
+        "target": "durgod/k3x0/k320"
+    },
+    "dztech/dz60rgb": {
+        "target": "dztech/dz60rgb/v1"
+    },
+    "dztech/dz60rgb_ansi": {
+        "target": "dztech/dz60rgb_ansi/v1"
+    },
+    "dztech/dz60rgb_wkl": {
+        "target": "dztech/dz60rgb_wkl/v1"
+    },
+    "dztech/dz65rgb": {
+        "target": "dztech/dz65rgb/v1"
+    },
+    "dztech/volcano660": {
+        "target": "ilumkb/volcano660"
+    },
+    "eek": {
+        "target": "eek/silk_down"
+    },
+    "ergodone": {
+        "target": "ktec/ergodone"
+    },
+    "ergoinu": {
+        "target": "dm9records/ergoinu"
+    },
+    "ergosaurus": {
+        "target": "keyhive/ergosaurus"
+    },
+    "exclusive/e85": {
+        "target": "exclusive/e85/hotswap"
+    },
+    "gh60": {
+        "target": "gh60/revc"
+    },
+    "gmmk/pro": {
+        "target": "gmmk/pro/rev1/ansi"
+    },
+    "gmmk/pro/ansi": {
+        "target": "gmmk/pro/rev1/ansi"
+    },
+    "gmmk/pro/iso": {
+        "target": "gmmk/pro/rev1/iso"
+    },
+    "handwired/ferris": {
+        "target": "ferris/0_1"
+    },
+    "handwired/p1800fl": {
+        "target": "team0110/p1800fl"
+    },
+    "helix/pico/sc/back": {
+        "target": "helix/pico/sc"
+    },
+    "helix/pico/sc/under": {
+        "target": "helix/pico/sc"
+    },
+    "helix/rev2/back/oled": {
+        "target": "helix/rev2/back"
+    },
+    "helix/rev2/oled": {
+        "target": "helix/rev2"
+    },
+    "helix/rev2/oled/back": {
+        "target": "helix/rev2/back"
+    },
+    "helix/rev2/oled/under": {
+        "target": "helix/rev2/under"
+    },
+    "helix/rev2/sc/back": {
+        "target": "helix/rev2/sc"
+    },
+    "helix/rev2/sc/oled": {
+        "target": "helix/rev2/sc"
+    },
+    "helix/rev2/sc/oledback": {
+        "target": "helix/rev2/sc"
+    },
+    "helix/rev2/sc/oledunder": {
+        "target": "helix/rev2/sc"
+    },
+    "helix/rev2/sc/under": {
+        "target": "helix/rev2/sc"
+    },
+    "helix/rev2/under": {
+        "target": "helix/rev2/sc"
+    },
+    "helix/rev2/under/oled": {
+        "target": "helix/rev2/under"
+    },
+    "honeycomb": {
+        "target": "keyhive/honeycomb"
+    },
+    "idb_60": {
+        "target": "idb/idb_60",
+        "layouts": {
+            "LAYOUT": "LAYOUT_all"
+        }
+    },
+    "idobo": {
+        "target": "idobao/id75"
+    },
+    "jj40": {
+        "target": "kprepublic/jj40"
+    },
+    "jj4x4": {
+        "target": "kprepublic/jj4x4"
+    },
+    "jj50": {
+        "target": "kprepublic/jj50"
+    },
+    "jones": {
+        "target": "jones/v03_1"
+    },
+    "katana60": {
+        "target": "rominronin/katana60/rev1"
+    },
+    "kbdfans/kbd67mkiirgb": {
+        "target": "kbdfans/kbd67/mkiirgb",
+        "layouts": {
+            "LAYOUT": "LAYOUT_65_ansi_blocker"
+        }
+    },
+    "kbdfans/kbd67/mkiirgb": {
+        "target": "kbdfans/kbd67/mkiirgb/v1"
+    },
+    "keebio/dsp40": {
+        "target": "keebio/dsp40/rev1"
+    },
+    "keycapsss/plaid_pad": {
+        "target": "keycapsss/plaid_pad/rev1"
+    },
+    "kudox": {
+        "target": "kudox/rev1"
+    },
+    "kyria": {
+        "target": "splitkb/kyria"
+    },
+    "lattice60": {
+        "target": "keyhive/lattice60"
+    },
+    "lazydesigners/the60": {
+        "target": "lazydesigners/the60/rev1"
+    },
+    "lfkeyboards/lfk78": {
+        "target": "lfkeyboards/lfk78/revj"
+    },
+    "lfkeyboards/smk65": {
+        "target": "lfkeyboards/smk65/revb"
+    },
+    "m3v3van": {
+        "target": "matthewdias/m3n3van"
+    },
+    "maartenwut/atom47/rev2": {
+        "target": "evyd13/atom47/rev2"
+    },
+    "maartenwut/atom47/rev3": {
+        "target": "evyd13/atom47/rev3"
+    },
+    "maartenwut/eon40": {
+        "target": "evyd13/eon40"
+    },
+    "maartenwut/eon65": {
+        "target": "evyd13/eon65"
+    },
+    "maartenwut/eon75": {
+        "target": "evyd13/eon75"
+    },
+    "maartenwut/eon87": {
+        "target": "evyd13/eon87"
+    },
+    "maartenwut/eon95": {
+        "target": "evyd13/eon95"
+    },
+    "maartenwut/gh80_1800": {
+        "target": "evyd13/gh80_1800"
+    },
+    "maartenwut/gh80_3700": {
+        "target": "evyd13/gh80_3700"
+    },
+    "maartenwut/minitomic": {
+        "target": "evyd13/minitomic"
+    },
+    "maartenwut/mx5160": {
+        "target": "evyd13/mx5160"
+    },
+    "maartenwut/nt660": {
+        "target": "evyd13/nt660"
+    },
+    "maartenwut/omrontkl": {
+        "target": "evyd13/omrontkl"
+    },
+    "maartenwut/plain60": {
+        "target": "evyd13/plain60"
+    },
+    "maartenwut/pockettype": {
+        "target": "evyd13/pockettype"
+    },
+    "maartenwut/quackfire": {
+        "target": "evyd13/quackfire"
+    },
+    "maartenwut/solheim68": {
+        "target": "evyd13/solheim68"
+    },
+    "maartenwut/ta65": {
+        "target": "evyd13/ta65"
+    },
+    "maartenwut/wasdat": {
+        "target": "evyd13/wasdat"
+    },
+    "maartenwut/wasdat_code": {
+        "target": "evyd13/wasdat_code"
+    },
+    "maartenwut/wonderland": {
+        "target": "evyd13/wonderland"
+    },
+    "matrix/m12og": {
+        "target": "matrix/m12og/rev1"
+    },
+    "mechlovin/hannah910": {
+        "target": "mechlovin/hannah910/rev1"
+    },
+    "mechlovin/adelais/rgb_led": {
+        "target": "mechlovin/adelais/rgb_led/rev1"
+    },
+    "mechlovin/adelais/standard_led": {
+        "target": "mechlovin/adelais/standard_led/rev2"
+    },
+    "mechlovin/delphine": {
+        "target": "mechlovin/delphine/mono_led"
+    },
+    "mechlovin/hannah60rgb": {
+        "target": "mechlovin/hannah60rgb/rev1"
+    },
+    "mechlovin/hannah65/mechlovin9": {
+        "target": "mechlovin/mechlovin9/rev1"
+    },
+    "mechlovin/hex4b": {
+        "target": "mechlovin/hex4b/rev1"
+    },
+    "melgeek/z70ultra": {
+        "target": "melgeek/z70ultra/rev1"
+    },
+    "mechlovin/hannah65": {
+        "target": "mechlovin/hannah65/rev1"
+    },
+    "minim": {
+        "target": "matthewdias/minim"
+    },
+    "model01": {
+        "target": "keyboardio/model01"
+    },
+    "model_v": {
+        "target": "matthewdias/model_v"
+    },
+    "m0lly": {
+        "target": "tkc/m0lly"
+    },
+    "montsinger/rebound": {
+        "target": "montsinger/rebound/rev1"
+    },
+    "noxary/268_2": {
+        "layouts": {
+            "LAYOUT": "LAYOUT_65_ansi_blocker"
+        }
+    },
+    "oddball": {
+        "target": "oddball/v1"
+    },
+    "omnikey_blackheart": {
+        "target": "viktus/omnikey_bh"
+    },
+    "omnikey_bh": {
+        "target": "viktus/omnikey_bh"
+    },
+    "opus": {
+        "target": "keyhive/opus"
+    },
+    "pabile/p20": {
+        "target": "pabile/p20/ver1"
+    },
+    "pancake/feather": {
+        "target": "spaceman/pancake/feather"
+    },
+    "pancake/promicro": {
+        "target": "spaceman/pancake/promicro"
+    },
+    "peiorisboards/ixora": {
+        "target": "coarse/ixora"
+    },
+    "percent/canoe": {
+        "layouts": {
+            "LAYOUT_iso": "LAYOUT_65_iso_blocker"
+        }
+    },
+    "plaid": {
+        "target": "dm9records/plaid"
+    },
+    "plain60": {
+        "target": "maartenwut/plain60"
+    },
+    "ploopyco/trackball": {
+        "target": "ploopyco/trackball/rev1_005"
+    },
+    "polilla": {
+        "target": "polilla/rev1"
+    },
+    "preonic/rev1": {
+        "layouts": {
+            "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+        }
+    },
+    "preonic/rev2": {
+        "layouts": {
+            "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+        }
+    },
+    "preonic/rev3": {
+        "layouts": {
+            "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+        }
+    },
+    "primekb/prime_l": {
+        "target": "primekb/prime_l/v1"
+    },
+    "primekb/prime_l_v2": {
+        "target": "primekb/prime_l/v2"
+    },
+    "projectkb/alice": {
+        "target": "projectkb/alice/rev1"
+    },
+    "rama/koyu": {
+        "target": "wilba_tech/rama_works_koyu"
+    },
+    "rama/m6_a": {
+        "target": "wilba_tech/rama_works_m6_a"
+    },
+    "rama/m6_b": {
+        "target": "wilba_tech/rama_works_m6_b"
+    },
+    "rama/m10_b": {
+        "target": "wilba_tech/rama_works_m10_b"
+    },
+    "rama/m60_a": {
+        "target": "wilba_tech/rama_works_m60_a"
+    },
+    "rama/u80_a": {
+        "target": "wilba_tech/rama_works_u80_a"
+    },
+    "ramonimbao/herringbone": {
+        "target": "ramonimbao/herringbone/v1"
+    },
+    "ramonimbao/mona": {
+        "target": "ramonimbao/mona/v1"
+    },
+    "rgbkb/pan": {
+        "target": "rgbkb/pan/rev1/32a"
+    },
+    "rgbkb/pan/rev1": {
+        "target": "rgbkb/pan/rev1/32a"
+    },
+    "romac": {
+        "target": "kingly_keys/romac"
+    },
+    "ropro": {
+        "target": "kingly_keys/ropro"
+    },
+    "satan": {
+        "target": "gh60/satan"
+    },
+    "skog": {
+        "target": "percent/skog"
+    },
+    "smallice": {
+        "target": "keyhive/smallice"
+    },
+    "southpole": {
+        "target": "keyhive/southpole"
+    },
+    "speedo": {
+        "target": "cozykeys/speedo/v2"
+    },
+    "staryu": {
+        "target": "ktec/staryu"
+    },
+    "stoutgat": {
+        "target": "tkw/stoutgat/v1"
+    },
+    "suihankey": {
+        "target": "suihankey/split/alpha"
+    },
+    "ta65": {
+        "target": "maartenwut/ta65"
+    },
+    "tartan": {
+        "target": "dm9records/tartan"
+    },
+    "tkc1800": {
+        "target": "tkc/tkc1800"
+    },
+    "tkw/stoutgat/v2": {
+        "target": "tkw/stoutgat/v2/f411"
+    },
+    "tokyo60": {
+        "target": "tokyokeyboard/tokyo60"
+    },
+    "txuu": {
+        "target": "matthewdias/txuu"
+    },
+    "underscore33": {
+        "target": "underscore33/rev1"
+    },
+    "vinta": {
+        "target": "coarse/vinta",
+        "layouts": {
+            "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
+        }
+    },
+    "wasdat": {
+        "target": "maartenwut/wasdat"
+    },
+    "westfoxtrot/cypher": {
+        "target": "westfoxtrot/cypher/rev1"
+    },
+    "whale/sk": {
+        "target": "whale/sk/v3"
+    },
+    "xd002": {
+        "target": "xiudi/xd002"
+    },
+    "xd004": {
+        "target": "xiudi/xd004"
+    },
+    "xd60": {
+        "target": "xiudi/xd60"
+    },
+    "xd68": {
+        "target": "xiudi/xd68"
+    },
+    "xd75": {
+        "target": "xiudi/xd75"
+    },
+    "xd84": {
+        "target": "xiudi/xd84"
+    },
+    "xd84pro": {
+        "target": "xiudi/xd84pro"
+    },
+    "xd87": {
+        "target": "xiudi/xd87"
+    },
+    "xd96": {
+        "target": "xiudi/xd96"
+    },
+    "xelus/dawn60": {
+        "target": "xelus/dawn60/rev1"
+    },
+    "xelus/valor": {
+        "target": "xelus/valor/rev1"
+    },
+    "z150_blackheart": {
+        "target": "viktus/z150_bh"
+    },
+    "z150_bh":{
+        "target": "viktus/z150_bh"
+    },
+    "zeal60": {
+        "target": "wilba_tech/zeal60"
+    },
+    "zeal65": {
+        "target": "wilba_tech/zeal65"
+    },
+    // Moved during 2022 Q1 cycle
+    "6ball": {
+        "target": "maple_computing/6ball"
+    },
+    "7skb": {
+        "target": "salicylic_acid3/7skb"
+    },
+    "7splus": {
+        "target": "salicylic_acid3/7splus"
+    },
+    "acr60": {
+        "target": "mechkeys/acr60"
+    },
+    "adalyn": {
+        "target": "tominabox1/adalyn"
+    },
+    "ajisai74": {
+        "target": "salicylic_acid3/ajisai74"
+    },
+    "aleth42": {
+        "target": "25keys/aleth42"
+    },
+    "alicia_cook": {
+        "target": "ibnuda/alicia_cook"
+    },
+    "allison": {
+        "target": "prototypist/allison"
+    },
+    "allison_numpad": {
+        "target": "prototypist/allison_numpad"
+    },
+    "alu84": {
+        "target": "mechkeys/alu84"
+    },
+    "angel17": {
+        "target": "kakunpc/angel17"
+    },
+    "angel64/alpha": {
+        "target": "kakunpc/angel64/alpha"
+    },
+    "angel64/rev1": {
+        "target": "kakunpc/angel64/rev1"
+    },
+    "arch_36": {
+        "target": "obosob/arch_36"
+    },
+    "bakeneko65/rev2": {
+        "target": "kkatano/bakeneko65/rev2"
+    },
+    "bakeneko65/rev3": {
+        "target": "kkatano/bakeneko65/rev3"
+    },
+    "barleycorn": {
+        "target": "yiancardesigns/barleycorn"
+    },
+    "bat43/rev1": {
+        "target": "dailycraft/bat43/rev1"
+    },
+    "bat43/rev2": {
+        "target": "dailycraft/bat43/rev2"
+    },
+    "bigseries/1key": {
+        "target": "woodkeys/bigseries/1key"
+    },
+    "bigseries/2key": {
+        "target": "woodkeys/bigseries/2key"
+    },
+    "bigseries/3key": {
+        "target": "woodkeys/bigseries/3key"
+    },
+    "bigseries/4key": {
+        "target": "woodkeys/bigseries/4key"
+    },
+    "bkf": {
+        "target": "drhigsby/bkf"
+    },
+    "business_card/alpha": {
+        "target": "kakunpc/business_card/alpha"
+    },
+    "business_card/beta": {
+        "target": "kakunpc/business_card/beta"
+    },
+    "butterstick": {
+        "target": "gboards/butterstick"
+    },
+    "c39": {
+        "target": "maple_computing/c39"
+    },
+    "cassette42": {
+        "target": "25keys/cassette42"
+    },
+    "chidori": {
+        "target": "kagizaraya/chidori"
+    },
+    "chili": {
+        "target": "ydkb/chili"
+    },
+    "chimera_ergo": {
+        "target": "glenpickle/chimera_ergo"
+    },
+    "chimera_ls": {
+        "target": "glenpickle/chimera_ls"
+    },
+    "chimera_ortho": {
+        "target": "glenpickle/chimera_ortho"
+    },
+    "chimera_ortho_plus": {
+        "target": "glenpickle/chimera_ortho_plus"
+    },
+    "choc_taro": {
+        "target": "kakunpc/choc_taro"
+    },
+    "choco60": {
+        "target": "recompile_keys/choco60"
+    },
+    "christmas_tree": {
+        "target": "maple_computing/christmas_tree"
+    },
+    "claw44/rev1": {
+        "target": "dailycraft/claw44/rev1"
+    },
+    "cocoa40": {
+        "target": "recompile_keys/cocoa40"
+    },
+    "comet46": {
+        "target": "satt/comet46"
+    },
+    "cu24": {
+        "target": "capsunlocked/cu24"
+    },
+    "cu75": {
+        "target": "capsunlocked/cu75"
+    },
+    "cu80": {
+        "target": "capsunlocked/cu80/v1"
+    },
+    "delilah": {
+        "target": "rainkeebs/delilah"
+    },
+    "diverge3": {
+        "target": "unikeyboard/diverge3"
+    },
+    "divergetm2": {
+        "target": "unikeyboard/divergetm2"
+    },
+    "dozen0": {
+        "target": "yynmt/dozen0"
+    },
+    "dubba175": {
+        "target": "drhigsby/dubba175"
+    },
+    "eggman": {
+        "target": "qpockets/eggman"
+    },
+    "ergo42": {
+        "target": "biacco42/ergo42"
+    },
+    "ergoarrows": {
+        "target": "salicylic_acid3/ergoarrows"
+    },
+    "ergodash/mini": {
+        "target": "omkbd/ergodash/mini"
+    },
+    "ergodash/rev1": {
+        "target": "omkbd/ergodash/rev1"
+    },
+    "ergodox_infinity": {
+        "target": "input_club/ergodox_infinity"
+    },
+    "ergotaco": {
+        "target": "gboards/ergotaco"
+    },
+    "espectro": {
+        "target": "mechkeys/espectro"
+    },
+    "felix": {
+        "target": "unikeyboard/felix"
+    },
+    "four_banger": {
+        "target": "bpiphany/four_banger"
+    },
+    "freyr": {
+        "target": "hnahkb/freyr"
+    },
+    "geminate60": {
+        "target": "weirdo/geminate60"
+    },
+    "gentleman65": {
+        "target": "jkeys_design/gentleman65"
+    },
+    "georgi": {
+        "target": "gboards/georgi"
+    },
+    "gergo": {
+        "target": "gboards/gergo"
+    },
+    "getta25": {
+        "target": "salicylic_acid3/getta25"
+    },
+    "gingham": {
+        "target": "yiancardesigns/gingham"
+    },
+    "gurindam": {
+        "target": "ibnuda/gurindam"
+    },
+    "halberd": {
+        "target": "kagizaraya/halberd"
+    },
+    "handwired/hillside/0_1": {
+        "target": "handwired/hillside/48"
+    },
+    "hecomi/alpha": {
+        "target": "takashiski/hecomi/alpha"
+    },
+    "hid_liber": {
+        "target": "bpiphany/hid_liber"
+    },
+    "id67/default_rgb": {
+        "target": "idobao/id67/default_rgb"
+    },
+    "id67/rgb": {
+        "target": "idobao/id67/rgb"
+    },
+    "id80": {
+        "target": "idobao/id80/v2/ansi"
+    },
+    "idobao/id80/v1/ansi": {
+        "target": "idobao/id80/v2/ansi"
+    },
+    "idobao/id80/v1/iso": {
+        "target": "idobao/id80/v2/iso"
+    },
+    "id87": {
+        "target": "idobao/id87/v1"
+    },
+    "infinity60": {
+        "target": "input_club/infinity60"
+    },
+    "ivy/rev1": {
+        "target": "maple_computing/ivy/rev1"
+    },
+    "jisplit89": {
+        "target": "salicylic_acid3/jisplit89"
+    },
+    "jnao": {
+        "target": "maple_computing/jnao"
+    },
+    "just60": {
+        "target": "ydkb/just60"
+    },
+    "k_type": {
+        "target": "input_club/k_type"
+    },
+    "kagamidget": {
+        "target": "yynmt/kagamidget"
+    },
+    "kelowna/rgb64": {
+        "target": "weirdo/kelowna/rgb64"
+    },
+    "kprepublic/bm65hsrgb_iso": {
+        "target": "kprepublic/bm65hsrgb_iso/rev1"
+    },
+    "kprepublic/bm68hsrgb": {
+        "target": "kprepublic/bm68hsrgb/rev1"
+    },
+    "latin17rgb": {
+        "target": "latincompass/latin17rgb"
+    },
+    "latin47ble": {
+        "target": "latincompass/latin47ble"
+    },
+    "latin60rgb": {
+        "target": "latincompass/latin60rgb"
+    },
+    "latin64ble": {
+        "target": "latincompass/latin64ble"
+    },
+    "latin6rgb": {
+        "target": "latincompass/latin6rgb"
+    },
+    "latinpad": {
+        "target": "latincompass/latinpad"
+    },
+    "latinpadble": {
+        "target": "latincompass/latinpadble"
+    },
+    "launchpad/rev1": {
+        "target": "maple_computing/launchpad/rev1"
+    },
+    "lck75": {
+        "target": "lyso1/lck75"
+    },
+    "le_chiffre": {
+        "target": "tominabox1/le_chiffre"
+    },
+    "lefishe": {
+        "target": "lyso1/lefishe"
+    },
+    "lets_split_eh/eh": {
+        "target": "maple_computing/lets_split_eh/eh"
+    },
+    "ls_60": {
+        "target": "weirdo/ls_60"
+    },
+    "m3n3van": {
+        "target": "matthewdias/m3n3van"
+    },
+    "mechmini/v1": {
+        "target": "mechkeys/mechmini/v1"
+    },
+    "mechmini/v2": {
+        "target": "mechkeys/mechmini/v2"
+    },
+    "meira": {
+        "target": "woodkeys/meira"
+    },
+    "meishi": {
+        "target": "biacco42/meishi"
+    },
+    "meishi2": {
+        "target": "biacco42/meishi2"
+    },
+    "melody96": {
+        "target": "ymdk/melody96"
+    },
+    "minidox/rev1": {
+        "target": "maple_computing/minidox/rev1"
+    },
+    "mio": {
+        "target": "recompile_keys/mio"
+    },
+    "montex": {
+        "target": "idobao/montex/v1"
+    },
+    "mt40": {
+        "target": "mt/mt40"
+    },
+    "mt64rgb": {
+        "target": "mt/mt64rgb"
+    },
+    "mt84": {
+        "target": "mt/mt84"
+    },
+    "mt980": {
+        "target": "mt/mt980"
+    },
+    "nafuda": {
+        "target": "salicylic_acid3/nafuda"
+    },
+    "naiping/np64": {
+        "target": "weirdo/naiping/np64"
+    },
+    "naiping/nphhkb": {
+        "target": "weirdo/naiping/nphhkb"
+    },
+    "naiping/npminila": {
+        "target": "weirdo/naiping/npminila"
+    },
+    "naked48": {
+        "target": "salicylic_acid3/naked48"
+    },
+    "naked60": {
+        "target": "salicylic_acid3/naked60"
+    },
+    "naked64": {
+        "target": "salicylic_acid3/naked64"
+    },
+    "namecard2x4": {
+        "target": "takashiski/namecard2x4"
+    },
+    "navi10": {
+        "target": "keyhive/navi10"
+    },
+    "nebula12": {
+        "target": "spaceholdings/nebula12"
+    },
+    "nebula68": {
+        "target": "spaceholdings/nebula68"
+    },
+    "nebula68b": {
+        "target": "spaceholdings/nebula68b"
+    },
+    "niu_mini": {
+        "target": "kbdfans/niu_mini"
+    },
+    "nk1": {
+        "target": "novelkeys/nk1"
+    },
+    "nk65": {
+        "target": "novelkeys/nk65"
+    },
+    "nk87": {
+        "target": "novelkeys/nk87"
+    },
+    "nknl7en": {
+        "target": "salicylic_acid3/nknl7en"
+    },
+    "nknl7jp": {
+        "target": "salicylic_acid3/nknl7jp"
+    },
+    "nomu30": {
+        "target": "recompile_keys/nomu30"
+    },
+    "novelpad": {
+        "target": "novelkeys/novelpad"
+    },
+    "ogurec": {
+        "target": "drhigsby/ogurec"
+    },
+    "otaku_split/rev0": {
+        "target": "takashiski/otaku_split/rev0"
+    },
+    "otaku_split/rev1": {
+        "target": "takashiski/otaku_split/rev1"
+    },
+    "owl8": {
+        "target": "dailycraft/owl8"
+    },
+    "packrat": {
+        "target": "drhigsby/packrat"
+    },
+    "pistachio": {
+        "target": "rate/pistachio"
+    },
+    "pistachio_mp": {
+        "target": "rate/pistachio_mp"
+    },
+    "pistachio_pro": {
+        "target": "rate/pistachio_pro"
+    },
+    "plexus75": {
+        "target": "checkerboards/plexus75"
+    },
+    "pursuit40": {
+        "target": "checkerboards/pursuit40"
+    },
+    "qaz": {
+        "target": "tominabox1/qaz"
+    },
+    "quark": {
+        "target": "checkerboards/quark"
+    },
+    "rabbit_capture_plan": {
+        "target": "kakunpc/rabbit_capture_plan"
+    },
+    "rainkeeb": {
+        "target": "rainkeebs/rainkeeb"
+    },
+    "reviung33": {
+        "target": "reviung/reviung33"
+    },
+    "reviung34": {
+        "target": "reviung/reviung34"
+    },
+    "reviung39": {
+        "target": "reviung/reviung39"
+    },
+    "reviung41": {
+        "target": "reviung/reviung41"
+    },
+    "reviung5": {
+        "target": "reviung/reviung5"
+    },
+    "reviung53": {
+        "target": "reviung/reviung53"
+    },
+    "reviung61": {
+        "target": "reviung/reviung61"
+    },
+    "runner3680/3x6": {
+        "target": "omkbd/runner3680/3x6"
+    },
+    "runner3680/3x7": {
+        "target": "omkbd/runner3680/3x7"
+    },
+    "runner3680/3x8": {
+        "target": "omkbd/runner3680/3x8"
+    },
+    "runner3680/4x6": {
+        "target": "omkbd/runner3680/4x6"
+    },
+    "runner3680/4x7": {
+        "target": "omkbd/runner3680/4x7"
+    },
+    "runner3680/4x8": {
+        "target": "omkbd/runner3680/4x8"
+    },
+    "runner3680/5x6": {
+        "target": "omkbd/runner3680/5x6"
+    },
+    "runner3680/5x6_5x8": {
+        "target": "omkbd/runner3680/5x6_5x8"
+    },
+    "runner3680/5x7": {
+        "target": "omkbd/runner3680/5x7"
+    },
+    "runner3680/5x8": {
+        "target": "omkbd/runner3680/5x8"
+    },
+    "scarletbandana": {
+        "target": "woodkeys/scarletbandana"
+    },
+    "scythe": {
+        "target": "kagizaraya/scythe"
+    },
+    "seigaiha": {
+        "target": "yiancardesigns/seigaiha"
+    },
+    "setta21": {
+        "target": "salicylic_acid3/setta21"
+    },
+    "space_space/rev1": {
+        "target": "qpockets/space_space/rev1"
+    },
+    "space_space/rev2": {
+        "target": "qpockets/space_space/rev2"
+    },
+    "spiderisland/winry25tc": {
+        "target": "winry/winry25tc"
+    },
+    "splitreus62": {
+        "target": "nacly/splitreus62"
+    },
+    "squiggle/rev1": {
+        "target": "ibnuda/squiggle/rev1"
+    },
+    "standaside": {
+        "target": "edi/standaside"
+    },
+    "steal_this_keyboard": {
+        "target": "obosob/steal_this_keyboard"
+    },
+    "stella": {
+        "target": "hnahkb/stella"
+    },
+    "suihankey/alpha": {
+        "target": "kakunpc/suihankey/alpha"
+    },
+    "suihankey/rev1": {
+        "target": "kakunpc/suihankey/rev1"
+    },
+    "suihankey/split": {
+        "target": "kakunpc/suihankey/split"
+    },
+    "the_ruler": {
+        "target": "maple_computing/the_ruler"
+    },
+    "thedogkeyboard": {
+        "target": "kakunpc/thedogkeyboard"
+    },
+    "tiger910": {
+        "target": "weirdo/tiger910"
+    },
+    "treadstone32": {
+        "target": "marksard/treadstone32"
+    },
+    "treadstone48/rev1": {
+        "target": "marksard/treadstone48/rev1"
+    },
+    "treadstone48/rev2": {
+        "target": "marksard/treadstone48/rev2"
+    },
+    "ua62": {
+        "target": "nacly/ua62"
+    },
+    "underscore33/rev1": {
+        "target": "tominabox1/underscore33/rev1"
+    },
+    "underscore33/rev2": {
+        "target": "tominabox1/underscore33/rev2"
+    },
+    "uno": {
+        "target": "keyhive/uno"
+    },
+    "ut472": {
+        "target": "keyhive/ut472"
+    },
+    "vn66": {
+        "target": "hnahkb/vn66"
+    },
+    "wallaby": {
+        "target": "kkatano/wallaby"
+    },
+    "wanten": {
+        "target": "qpockets/wanten"
+    },
+    "wheatfield/blocked65": {
+        "target": "mt/blocked65"
+    },
+    "wheatfield/split75": {
+        "target": "mt/split75"
+    },
+    "whitefox": {
+        "target": "input_club/whitefox"
+    },
+    "wings42/rev1": {
+        "target": "dailycraft/wings42/rev1"
+    },
+    "wings42/rev1_extkeys": {
+        "target": "dailycraft/wings42/rev1_extkeys"
+    },
+    "wings42/rev2": {
+        "target": "dailycraft/wings42/rev2"
+    },
+    "yasui": {
+        "target": "rainkeebs/yasui"
+    },
+    "yd60mq": {
+        "target": "ymdk/yd60mq"
+    },
+    "yd68": {
+        "target": "ydkb/yd68"
+    },
+    "ymd75": {
+        "target": "ymdk/ymd75"
+    },
+    "ymd96": {
+        "target": "ymdk/ymd96"
+    },
+    "ymdk_np21": {
+        "target": "ymdk/np21"
+    },
+    "yurei": {
+        "target": "kkatano/yurei"
+    },
+    "zinc": {
+        "target": "25keys/zinc"
+    },
+    "zinc/rev1": {
+        "target": "25keys/zinc/rev1"
+    },
+    "zinc/reva": {
+        "target": "25keys/zinc/reva"
+    }
+}
diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
deleted file mode 100644
index 3e96451086..0000000000
--- a/data/mappings/keyboard_aliases.json
+++ /dev/null
@@ -1,1285 +0,0 @@
-{
-    # Format for each entry:
-    # <alias>: {
-    #     target: <keyboard_folder>,
-    #     layouts: {
-    #         <layout_alias>: <layout_target>
-    #     }
-    # }
-    #
-    # Both target and layouts are optional.
-    '2_milk': {
-          target: 'spaceman/2_milk'
-    },
-    'absinthe': {
-        target: 'keyhive/absinthe'
-    },
-    'aeboards/constellation': {
-          target: 'aeboards/constellation/rev1'
-    },
-    'aeboards/ext65': {
-          target: 'aeboards/ext65/rev1'
-    },
-    'ai03/equinox': {
-          target: 'ai03/equinox/rev1'
-    },
-    aleth42: {
-          target: 'aleth42/rev1'
-    },
-    alice: {
-          target: 'tgr/alice'
-    },
-    amj40: {
-        target: 'amjkeyboard/amj40'
-    },
-    amj60: {
-        target: 'amjkeyboard/amj60'
-    },
-    amj96: {
-        target: 'amjkeyboard/amj96'
-    },
-    amjpad: {
-        target: 'amjkeyboard/amjpad'
-    },
-    angel17: {
-          target: 'angel17/alpha'
-    },
-    angel64: {
-          target: 'angel64/alpha'
-    },
-    at101_blackheart: {
-          target: 'viktus/at101_bh'
-    },
-    at101_bh: {
-        target: 'viktus/at101_bh'
-    },
-    'atom47/rev2': {
-          target: 'maartenwut/atom47/rev2'
-    },
-    'atom47/rev3': {
-          target: 'maartenwut/atom47/rev3'
-    },
-    bakeneko60: {
-          target: 'kkatano/bakeneko60'
-    },
-    bakeneko65: {
-          target: 'kkatano/bakeneko65/rev2'
-    },
-    bakeneko80: {
-          target: 'kkatano/bakeneko80'
-    },
-    bear_face: {
-          target: 'bear_face/v1'
-    },
-    bm16a: {
-          target: 'kprepublic/bm16a'
-    },
-    bm16s: {
-          target: 'kprepublic/bm16s'
-    },
-    bm40hsrgb: {
-          target: 'kprepublic/bm40hsrgb'
-    },
-    bm43a: {
-          target: 'kprepublic/bm43a'
-    },
-    bm60poker: {
-          target: 'kprepublic/bm60poker'
-    },
-    bm60rgb: {
-          target: 'kprepublic/bm60rgb'
-    },
-    bm60rgb_iso: {
-          target: 'kprepublic/bm60rgb_iso'
-    },
-    bm68rgb: {
-          target: 'kprepublic/bm68rgb'
-    },
-    'bpiphany/pegasushoof': {
-          target: 'bpiphany/pegasushoof/2013'
-    },
-    chavdai40: {
-          target: 'chavdai40/rev1'
-    },
-    'candybar/lefty': {
-          target: 'tkc/candybar/lefty'
-    },
-    'candybar/righty': {
-          target: 'tkc/candybar/righty'
-    },
-    canoe: {
-          target: 'percent/canoe'
-    },
-    'clawsome/gamebuddy': {
-          target: 'clawsome/gamebuddy/v1_0'
-    },
-    'cmm_studio/saka68': {
-          target: 'cmm_studio/saka68/solder'
-    },
-    'cospad': {
-          target: 'kprepublic/cospad'
-    },
-    'crkbd/rev1/legacy': {
-          target: 'crkbd/rev1'
-    },
-    'crkbd/rev1/common': {
-          target: 'crkbd/rev1'
-    },
-    'custommk/genesis': {
-          target: 'custommk/genesis/rev1'
-    },
-    'daisy': {
-          target: 'ktec/daisy'
-    },
-    'doro67/multi': {
-          layouts: {
-                  LAYOUT_ansi: 'LAYOUT_65_ansi_blocker'
-          }
-    },
-    'doro67/regular': {
-          layouts: {
-                  LAYOUT: 'LAYOUT_65_ansi_blocker'
-          }
-    },
-    'doro67/rgb': {
-          layouts: {
-                  LAYOUT: 'LAYOUT_65_ansi_blocker'
-          }
-    },
-    drakon: {
-          target: 'jagdpietr/drakon'
-    },
-    'durgod/k320': {
-          target: 'durgod/k3x0/k320'
-    },
-    'dztech/dz60rgb': {
-          target: 'dztech/dz60rgb/v1'
-    },
-    'dztech/dz60rgb_ansi': {
-          target: 'dztech/dz60rgb_ansi/v1'
-    },
-    'dztech/dz60rgb_wkl': {
-          target: 'dztech/dz60rgb_wkl/v1'
-    },
-    'dztech/dz65rgb': {
-          target: 'dztech/dz65rgb/v1'
-    },
-    'dztech/volcano660': {
-          target: 'ilumkb/volcano660'
-    },
-    eek: {
-          target: 'eek/silk_down'
-    },
-    'ergodone': {
-          target: 'ktec/ergodone'
-    },
-    ergoinu: {
-          target: 'dm9records/ergoinu'
-    },
-    ergosaurus: {
-        target: 'keyhive/ergosaurus'
-    },
-    'exclusive/e85': {
-          target: 'exclusive/e85/hotswap'
-    },
-    gh60: {
-          target: 'gh60/revc'
-    },
-    'gmmk/pro': {
-          target: 'gmmk/pro/rev1/ansi'
-    },
-    'gmmk/pro/ansi': {
-        target: 'gmmk/pro/rev1/ansi'
-    },
-    'gmmk/pro/iso': {
-        target: 'gmmk/pro/rev1/iso'
-    },
-    'handwired/ferris': {
-          target: 'ferris/0_1'
-    },
-    'handwired/p1800fl': {
-          target: 'team0110/p1800fl'
-    },
-    'helix/pico/sc/back': {
-          target: 'helix/pico/sc'
-    },
-    'helix/pico/sc/under': {
-          target: 'helix/pico/sc'
-    },
-    'helix/rev2/back/oled': {
-          target: 'helix/rev2/back'
-    },
-    'helix/rev2/oled': {
-          target: 'helix/rev2'
-    },
-    'helix/rev2/oled/back': {
-          target: 'helix/rev2/back'
-    },
-    'helix/rev2/oled/under': {
-          target: 'helix/rev2/under'
-    },
-    'helix/rev2/sc/back': {
-          target: 'helix/rev2/sc'
-    },
-    'helix/rev2/sc/oled': {
-          target: 'helix/rev2/sc'
-    },
-    'helix/rev2/sc/oledback': {
-          target: 'helix/rev2/sc'
-    },
-    'helix/rev2/sc/oledunder': {
-          target: 'helix/rev2/sc'
-    },
-    'helix/rev2/sc/under': {
-          target: 'helix/rev2/sc'
-    },
-    'helix/rev2/under': {
-          target: 'helix/rev2/sc'
-    },
-    'helix/rev2/under/oled': {
-          target: 'helix/rev2/under'
-    },
-    honeycomb: {
-        target: 'keyhive/honeycomb'
-    },
-    idb_60: {
-          target: 'idb/idb_60',
-          layouts: {
-                  LAYOUT: 'LAYOUT_all'
-          }
-    },
-    idobo: {
-        target: 'idobao/id75'
-    },
-    'jj40': {
-          target: 'kprepublic/jj40'
-    },
-    'jj4x4': {
-          target: 'kprepublic/jj4x4'
-    },
-    'jj50': {
-          target: 'kprepublic/jj50'
-    },
-    jones: {
-          target: 'jones/v03_1'
-    },
-    katana60: {
-          target: 'rominronin/katana60/rev1'
-    },
-    'kbdfans/kbd67mkiirgb': {
-          target: 'kbdfans/kbd67/mkiirgb',
-          layouts: {
-                  LAYOUT: 'LAYOUT_65_ansi_blocker'
-          }
-    },
-    'kbdfans/kbd67/mkiirgb': {
-          target: 'kbdfans/kbd67/mkiirgb/v1'
-    },
-    'keebio/dsp40': {
-          target: 'keebio/dsp40/rev1'
-    },
-    'keycapsss/plaid_pad': {
-          target: 'keycapsss/plaid_pad/rev1'
-    },
-    kudox: {
-          target: 'kudox/rev1'
-    },
-    'kyria': {
-          target: 'splitkb/kyria'
-    },
-    lattice60: {
-        target: 'keyhive/lattice60'
-    },
-    'lazydesigners/the60': {
-          target: 'lazydesigners/the60/rev1'
-    },
-    'lfkeyboards/lfk78': {
-          target: 'lfkeyboards/lfk78/revj'
-    },
-    'lfkeyboards/smk65': {
-          target: 'lfkeyboards/smk65/revb'
-    },
-    m3v3van: {
-          target: 'matthewdias/m3n3van'
-    },
-    'maartenwut/atom47/rev2': {
-          target: 'evyd13/atom47/rev2'
-    },
-    'maartenwut/atom47/rev3': {
-          target: 'evyd13/atom47/rev3'
-    },
-    'maartenwut/eon40': {
-          target: 'evyd13/eon40'
-    },
-    'maartenwut/eon65': {
-          target: 'evyd13/eon65'
-    },
-    'maartenwut/eon75': {
-          target: 'evyd13/eon75'
-    },
-    'maartenwut/eon87': {
-          target: 'evyd13/eon87'
-    },
-    'maartenwut/eon95': {
-          target: 'evyd13/eon95'
-    },
-    'maartenwut/gh80_1800': {
-          target: 'evyd13/gh80_1800'
-    },
-    'maartenwut/gh80_3700': {
-          target: 'evyd13/gh80_3700'
-    },
-    'maartenwut/minitomic': {
-          target: 'evyd13/minitomic'
-    },
-    'maartenwut/mx5160': {
-          target: 'evyd13/mx5160'
-    },
-    'maartenwut/nt660': {
-          target: 'evyd13/nt660'
-    },
-    'maartenwut/omrontkl': {
-          target: 'evyd13/omrontkl'
-    },
-    'maartenwut/plain60': {
-          target: 'evyd13/plain60'
-    },
-    'maartenwut/pockettype': {
-          target: 'evyd13/pockettype'
-    },
-    'maartenwut/quackfire': {
-          target: 'evyd13/quackfire'
-    },
-    'maartenwut/solheim68': {
-          target: 'evyd13/solheim68'
-    },
-    'maartenwut/ta65': {
-          target: 'evyd13/ta65'
-    },
-    'maartenwut/wasdat': {
-          target: 'evyd13/wasdat'
-    },
-    'maartenwut/wasdat_code': {
-          target: 'evyd13/wasdat_code'
-    },
-    'maartenwut/wonderland': {
-          target: 'evyd13/wonderland'
-    },
-    'matrix/m12og': {
-          target: 'matrix/m12og/rev1'
-    },
-    'mechlovin/hannah910': {
-          target: 'mechlovin/hannah910/rev1'
-    },
-    'mechlovin/adelais/rgb_led': {
-          target: 'mechlovin/adelais/rgb_led/rev1'
-    },
-    'mechlovin/adelais/standard_led': {
-          target: 'mechlovin/adelais/standard_led/rev2'
-    },
-    'mechlovin/delphine': {
-          target: 'mechlovin/delphine/mono_led'
-    },
-    'mechlovin/hannah60rgb': {
-          target: 'mechlovin/hannah60rgb/rev1'
-    },
-    'mechlovin/hannah65/mechlovin9': {
-          target: 'mechlovin/mechlovin9/rev1'
-    },
-    'mechlovin/hex4b': {
-          target: 'mechlovin/hex4b/rev1'
-    },
-    'melgeek/z70ultra': {
-          target: 'melgeek/z70ultra/rev1'
-    },
-    'mechlovin/hannah65': {
-          target: 'mechlovin/hannah65/rev1'
-    },
-    minim: {
-          target: 'matthewdias/minim'
-    },
-    model01: {
-          target: 'keyboardio/model01'
-    },
-    model_v: {
-          target: 'matthewdias/model_v'
-    },
-    m0lly: {
-          target: 'tkc/m0lly'
-    },
-    'montsinger/rebound': {
-          target: 'montsinger/rebound/rev1'
-    },
-    nomu30: {
-          target: 'nomu30/rev1'
-    },
-    'noxary/268_2': {
-          layouts: {
-                  LAYOUT: 'LAYOUT_65_ansi_blocker'
-          }
-    },
-    oddball: {
-          target: 'oddball/v1'
-    },
-    omnikey_blackheart: {
-          target: 'viktus/omnikey_bh'
-    },
-    omnikey_bh: {
-        target: 'viktus/omnikey_bh'
-    },
-    opus: {
-        target: 'keyhive/opus'
-    },
-    'pabile/p20': {
-          target: 'pabile/p20/ver1'
-    },
-    'pancake/feather': {
-          target: 'spaceman/pancake/feather'
-    },
-    'pancake/promicro': {
-          target: 'spaceman/pancake/promicro'
-    },
-    'peiorisboards/ixora': {
-          target: 'coarse/ixora'
-    },
-    'percent/canoe': {
-          layouts: {
-                  LAYOUT_iso: 'LAYOUT_65_iso_blocker'
-          }
-    },
-    plaid: {
-          target: 'dm9records/plaid'
-    },
-    plain60: {
-          target: 'maartenwut/plain60'
-    },
-    'ploopyco/trackball': {
-          target: 'ploopyco/trackball/rev1_005'
-    },
-    polilla: {
-          target: 'polilla/rev1'
-    },
-    'preonic/rev1': {
-          layouts: {
-                  LAYOUT_preonic_grid: 'LAYOUT_ortho_5x12'
-          }
-    },
-    'preonic/rev2': {
-          layouts: {
-                  LAYOUT_preonic_grid: 'LAYOUT_ortho_5x12'
-          }
-    },
-    'preonic/rev3': {
-          layouts: {
-                  LAYOUT_preonic_grid: 'LAYOUT_ortho_5x12'
-          }
-    },
-    'primekb/prime_l': {
-          target: 'primekb/prime_l/v1'
-    },
-    'primekb/prime_l_v2': {
-          target: 'primekb/prime_l/v2'
-    },
-    'projectkb/alice': {
-          target: 'projectkb/alice/rev1'
-    },
-    'rama/koyu': {
-          target: 'wilba_tech/rama_works_koyu'
-    },
-    'rama/m6_a': {
-          target: 'wilba_tech/rama_works_m6_a'
-    },
-    'rama/m6_b': {
-          target: 'wilba_tech/rama_works_m6_b'
-    },
-    'rama/m10_b': {
-          target: 'wilba_tech/rama_works_m10_b'
-    },
-    'rama/m60_a': {
-          target: 'wilba_tech/rama_works_m60_a'
-    },
-    'rama/u80_a': {
-          target: 'wilba_tech/rama_works_u80_a'
-    },
-    'ramonimbao/herringbone': {
-          target: 'ramonimbao/herringbone/v1'
-    },
-    'ramonimbao/mona': {
-          target: 'ramonimbao/mona/v1'
-    },
-    'rgbkb/pan': {
-          target: 'rgbkb/pan/rev1/32a'
-    },
-    'rgbkb/pan/rev1': {
-          target: 'rgbkb/pan/rev1/32a'
-    },
-    romac: {
-          target: 'kingly_keys/romac'
-    },
-    ropro: {
-          target: 'kingly_keys/ropro'
-    },
-    satan: {
-          target: 'gh60/satan'
-    },
-    skog: {
-          target: 'percent/skog'
-    },
-    smallice: {
-        target: 'keyhive/smallice'
-    },
-    southpole: {
-        target: 'keyhive/southpole'
-    },
-    speedo: {
-          target: 'cozykeys/speedo/v2'
-    },
-    'staryu': {
-          target: 'ktec/staryu'
-    },
-    stoutgat: {
-          target: 'tkw/stoutgat/v1'
-    },
-    suihankey: {
-          target: 'suihankey/split/alpha'
-    },
-    ta65: {
-          target: 'maartenwut/ta65'
-    },
-    tartan: {
-          target: 'dm9records/tartan'
-    },
-    tkc1800: {
-          target: 'tkc/tkc1800'
-    },
-    'tkw/stoutgat/v2': {
-          target: 'tkw/stoutgat/v2/f411'
-    },
-    'tokyo60': {
-          target: 'tokyokeyboard/tokyo60'
-    },
-    'txuu': {
-          target: 'matthewdias/txuu'
-    },
-    underscore33: {
-          target: 'underscore33/rev1'
-    },
-    vinta: {
-          target: 'coarse/vinta',
-          layouts: {
-                  LAYOUT_67_ansi: 'LAYOUT_65_ansi_blocker'
-          }
-    },
-    wasdat: {
-          target: 'maartenwut/wasdat'
-    },
-    'westfoxtrot/cypher': {
-          target: 'westfoxtrot/cypher/rev1'
-    },
-    'whale/sk': {
-          target: 'whale/sk/v3'
-    },
-    'xd002': {
-          target: 'xiudi/xd002'
-    },
-    'xd004': {
-          target: 'xiudi/xd004'
-    },
-    'xd60': {
-          target: 'xiudi/xd60'
-    },
-    'xd68': {
-          target: 'xiudi/xd68'
-    },
-    'xd75': {
-          target: 'xiudi/xd75'
-    },
-    'xd84': {
-          target: 'xiudi/xd84'
-    },
-    'xd84pro': {
-          target: 'xiudi/xd84pro'
-    },
-    'xd87': {
-          target: 'xiudi/xd87'
-    },
-    'xd96': {
-          target: 'xiudi/xd96'
-    },
-    'xelus/dawn60': {
-          target: 'xelus/dawn60/rev1'
-    },
-    'xelus/valor': {
-          target: 'xelus/valor/rev1'
-    },
-    yd60mq: {
-          target: 'ymdk/yd60mq/12led'
-    },
-    ymd75: {
-          target: 'ymd75/rev1'
-    },
-    z150_blackheart: {
-          target: 'viktus/z150_bh'
-    },
-    z150_bh:{
-        target: 'viktus/z150_bh'
-    },
-    zeal60: {
-          target: 'wilba_tech/zeal60'
-    },
-    zeal65: {
-          target: 'wilba_tech/zeal65'
-    },
-    # Moved during 2022 Q1 cycle
-    6ball: {
-        target: 'maple_computing/6ball'
-    },
-    7skb: {
-        target: 'salicylic_acid3/7skb'
-    },
-    7splus: {
-        target: 'salicylic_acid3/7splus'
-    },
-    acr60: {
-        target: 'mechkeys/acr60'
-    },
-    adalyn: {
-        target: 'tominabox1/adalyn'
-    },
-    ajisai74: {
-        target: 'salicylic_acid3/ajisai74'
-    },
-    aleth42: {
-        target: '25keys/aleth42'
-    },
-    alicia_cook: {
-        target: 'ibnuda/alicia_cook'
-    },
-    allison: {
-        target: 'prototypist/allison'
-    },
-    allison_numpad: {
-        target: 'prototypist/allison_numpad'
-    },
-    alu84: {
-        target: 'mechkeys/alu84'
-    },
-    angel17: {
-        target: 'kakunpc/angel17'
-    },
-    angel64/alpha: {
-        target: 'kakunpc/angel64/alpha'
-    },
-    angel64/rev1: {
-        target: 'kakunpc/angel64/rev1'
-    },
-    arch_36: {
-        target: 'obosob/arch_36'
-    },
-    bakeneko60: {
-        target: 'kkatano/bakeneko60'
-    },
-    bakeneko65/rev2: {
-        target: 'kkatano/bakeneko65/rev2'
-    },
-    bakeneko65/rev3: {
-        target: 'kkatano/bakeneko65/rev3'
-    },
-    bakeneko80: {
-        target: 'kkatano/bakeneko80'
-    },
-    barleycorn: {
-        target: 'yiancardesigns/barleycorn'
-    },
-    bat43/rev1: {
-        target: 'dailycraft/bat43/rev1'
-    },
-    bat43/rev2: {
-        target: 'dailycraft/bat43/rev2'
-    },
-    bigseries/1key: {
-        target: 'woodkeys/bigseries/1key'
-    },
-    bigseries/2key: {
-        target: 'woodkeys/bigseries/2key'
-    },
-    bigseries/3key: {
-        target: 'woodkeys/bigseries/3key'
-    },
-    bigseries/4key: {
-        target: 'woodkeys/bigseries/4key'
-    },
-    bkf: {
-        target: 'drhigsby/bkf'
-    },
-    business_card/alpha: {
-        target: 'kakunpc/business_card/alpha'
-    },
-    business_card/beta: {
-        target: 'kakunpc/business_card/beta'
-    },
-    butterstick: {
-        target: 'gboards/butterstick'
-    },
-    c39: {
-        target: 'maple_computing/c39'
-    },
-    cassette42: {
-        target: '25keys/cassette42'
-    },
-    chidori: {
-        target: 'kagizaraya/chidori'
-    },
-    chili: {
-        target: 'ydkb/chili'
-    },
-    chimera_ergo: {
-        target: 'glenpickle/chimera_ergo'
-    },
-    chimera_ls: {
-        target: 'glenpickle/chimera_ls'
-    },
-    chimera_ortho: {
-        target: 'glenpickle/chimera_ortho'
-    },
-    chimera_ortho_plus: {
-        target: 'glenpickle/chimera_ortho_plus'
-    },
-    choc_taro: {
-        target: 'kakunpc/choc_taro'
-    },
-    choco60: {
-        target: 'recompile_keys/choco60'
-    },
-    christmas_tree: {
-        target: 'maple_computing/christmas_tree'
-    },
-    claw44/rev1: {
-        target: 'dailycraft/claw44/rev1'
-    },
-    cocoa40: {
-        target: 'recompile_keys/cocoa40'
-    },
-    comet46: {
-        target: 'satt/comet46'
-    },
-    cu24: {
-        target: 'capsunlocked/cu24'
-    },
-    cu75: {
-        target: 'capsunlocked/cu75'
-    },
-    cu80: {
-        target: 'capsunlocked/cu80/v1'
-    },
-    delilah: {
-        target: 'rainkeebs/delilah'
-    },
-    diverge3: {
-        target: 'unikeyboard/diverge3'
-    },
-    divergetm2: {
-        target: 'unikeyboard/divergetm2'
-    },
-    dozen0: {
-        target: 'yynmt/dozen0'
-    },
-    dubba175: {
-        target: 'drhigsby/dubba175'
-    },
-    eggman: {
-        target: 'qpockets/eggman'
-    },
-    ergo42: {
-        target: 'biacco42/ergo42'
-    },
-    ergoarrows: {
-        target: 'salicylic_acid3/ergoarrows'
-    },
-    ergodash/mini: {
-        target: 'omkbd/ergodash/mini'
-    },
-    ergodash/rev1: {
-        target: 'omkbd/ergodash/rev1'
-    },
-    ergodox_infinity: {
-        target: 'input_club/ergodox_infinity'
-    },
-    ergotaco: {
-        target: 'gboards/ergotaco'
-    },
-    espectro: {
-        target: 'mechkeys/espectro'
-    },
-    felix: {
-        target: 'unikeyboard/felix'
-    },
-    four_banger: {
-        target: 'bpiphany/four_banger'
-    },
-    freyr: {
-        target: 'hnahkb/freyr'
-    },
-    geminate60: {
-        target: 'weirdo/geminate60'
-    },
-    gentleman65: {
-        target: 'jkeys_design/gentleman65'
-    },
-    georgi: {
-        target: 'gboards/georgi'
-    },
-    gergo: {
-        target: 'gboards/gergo'
-    },
-    getta25: {
-        target: 'salicylic_acid3/getta25'
-    },
-    gingham: {
-        target: 'yiancardesigns/gingham'
-    },
-    gurindam: {
-        target: 'ibnuda/gurindam'
-    },
-    halberd: {
-        target: 'kagizaraya/halberd'
-    },
-    handwired/hillside/0_1: {
-        target: 'handwired/hillside/48'
-    }
-    hecomi/alpha: {
-        target: 'takashiski/hecomi/alpha'
-    },
-    hid_liber: {
-        target: 'bpiphany/hid_liber'
-    },
-    id67/default_rgb: {
-        target: 'idobao/id67/default_rgb'
-    },
-    id67/rgb: {
-        target: 'idobao/id67/rgb'
-    },
-    id80: {
-        target: 'idobao/id80/v2/ansi'
-    },
-    idobao/id80/v1/ansi: {
-        target: 'idobao/id80/v2/ansi'
-    },
-    idobao/id80/v1/iso: {
-        target: 'idobao/id80/v2/iso'
-    },
-    id87: {
-        target: 'idobao/id87/v1'
-    },
-    idobo: {
-        target: 'idobao/id75/v1'
-    },
-    infinity60: {
-        target: 'input_club/infinity60'
-    },
-    ivy/rev1: {
-        target: 'maple_computing/ivy/rev1'
-    },
-    jisplit89: {
-        target: 'salicylic_acid3/jisplit89'
-    },
-    jnao: {
-        target: 'maple_computing/jnao'
-    },
-    just60: {
-        target: 'ydkb/just60'
-    },
-    k_type: {
-        target: 'input_club/k_type'
-    },
-    kagamidget: {
-        target: 'yynmt/kagamidget'
-    },
-    kelowna/rgb64: {
-        target: 'weirdo/kelowna/rgb64'
-    },
-    kprepublic/bm65hsrgb_iso: {
-        target: 'kprepublic/bm65hsrgb_iso/rev1'
-    },
-    kprepublic/bm68hsrgb: {
-        target: 'kprepublic/bm68hsrgb/rev1'
-    },
-    latin17rgb: {
-        target: 'latincompass/latin17rgb'
-    },
-    latin47ble: {
-        target: 'latincompass/latin47ble'
-    },
-    latin60rgb: {
-        target: 'latincompass/latin60rgb'
-    },
-    latin64ble: {
-        target: 'latincompass/latin64ble'
-    },
-    latin6rgb: {
-        target: 'latincompass/latin6rgb'
-    },
-    latinpad: {
-        target: 'latincompass/latinpad'
-    },
-    latinpadble: {
-        target: 'latincompass/latinpadble'
-    },
-    launchpad/rev1: {
-        target: 'maple_computing/launchpad/rev1'
-    },
-    lck75: {
-        target: 'lyso1/lck75'
-    },
-    le_chiffre: {
-        target: 'tominabox1/le_chiffre'
-    },
-    lefishe: {
-        target: 'lyso1/lefishe'
-    },
-    lets_split_eh/eh: {
-        target: 'maple_computing/lets_split_eh/eh'
-    },
-    ls_60: {
-        target: 'weirdo/ls_60'
-    },
-    m3n3van: {
-        target: 'matthewdias/m3n3van'
-    },
-    mechmini/v1: {
-        target: 'mechkeys/mechmini/v1'
-    },
-    mechmini/v2: {
-        target: 'mechkeys/mechmini/v2'
-    },
-    meira: {
-        target: 'woodkeys/meira'
-    },
-    meishi: {
-        target: 'biacco42/meishi'
-    },
-    meishi2: {
-        target: 'biacco42/meishi2'
-    },
-    melody96: {
-        target: 'ymdk/melody96'
-    },
-    minidox/rev1: {
-        target: 'maple_computing/minidox/rev1'
-    },
-    minim: {
-        target: 'matthewdias/minim'
-    },
-    mio: {
-        target: 'recompile_keys/mio'
-    },
-    model_v: {
-        target: 'matthewdias/model_v'
-    },
-    montex: {
-        target: 'idobao/montex/v1'
-    },
-    mt40: {
-        target: 'mt/mt40'
-    },
-    mt64rgb: {
-        target: 'mt/mt64rgb'
-    },
-    mt84: {
-        target: 'mt/mt84'
-    },
-    mt980: {
-        target: 'mt/mt980'
-    },
-    nafuda: {
-        target: 'salicylic_acid3/nafuda'
-    },
-    naiping/np64: {
-        target: 'weirdo/naiping/np64'
-    },
-    naiping/nphhkb: {
-        target: 'weirdo/naiping/nphhkb'
-    },
-    naiping/npminila: {
-        target: 'weirdo/naiping/npminila'
-    },
-    naked48: {
-        target: 'salicylic_acid3/naked48'
-    },
-    naked60: {
-        target: 'salicylic_acid3/naked60'
-    },
-    naked64: {
-        target: 'salicylic_acid3/naked64'
-    },
-    namecard2x4: {
-        target: 'takashiski/namecard2x4'
-    },
-    navi10: {
-        target: 'keyhive/navi10'
-    },
-    nebula12: {
-        target: 'spaceholdings/nebula12'
-    },
-    nebula68: {
-        target: 'spaceholdings/nebula68'
-    },
-    nebula68b: {
-        target: 'spaceholdings/nebula68b'
-    },
-    niu_mini: {
-        target: 'kbdfans/niu_mini'
-    },
-    nk1: {
-        target: 'novelkeys/nk1'
-    },
-    nk65: {
-        target: 'novelkeys/nk65'
-    },
-    nk87: {
-        target: 'novelkeys/nk87'
-    },
-    nknl7en: {
-        target: 'salicylic_acid3/nknl7en'
-    },
-    nknl7jp: {
-        target: 'salicylic_acid3/nknl7jp'
-    },
-    nomu30: {
-        target: 'recompile_keys/nomu30'
-    },
-    novelpad: {
-        target: 'novelkeys/novelpad'
-    },
-    ogurec: {
-        target: 'drhigsby/ogurec'
-    },
-    otaku_split/rev0: {
-        target: 'takashiski/otaku_split/rev0'
-    },
-    otaku_split/rev1: {
-        target: 'takashiski/otaku_split/rev1'
-    },
-    owl8: {
-        target: 'dailycraft/owl8'
-    },
-    packrat: {
-        target: 'drhigsby/packrat'
-    },
-    pistachio: {
-        target: 'rate/pistachio'
-    },
-    pistachio_mp: {
-        target: 'rate/pistachio_mp'
-    },
-    pistachio_pro: {
-        target: 'rate/pistachio_pro'
-    },
-    plexus75: {
-        target: 'checkerboards/plexus75'
-    },
-    pursuit40: {
-        target: 'checkerboards/pursuit40'
-    },
-    qaz: {
-        target: 'tominabox1/qaz'
-    },
-    quark: {
-        target: 'checkerboards/quark'
-    },
-    rabbit_capture_plan: {
-        target: 'kakunpc/rabbit_capture_plan'
-    },
-    rainkeeb: {
-        target: 'rainkeebs/rainkeeb'
-    },
-    reviung33: {
-        target: 'reviung/reviung33'
-    },
-    reviung34: {
-        target: 'reviung/reviung34'
-    },
-    reviung39: {
-        target: 'reviung/reviung39'
-    },
-    reviung41: {
-        target: 'reviung/reviung41'
-    },
-    reviung5: {
-        target: 'reviung/reviung5'
-    },
-    reviung53: {
-        target: 'reviung/reviung53'
-    },
-    reviung61: {
-        target: 'reviung/reviung61'
-    },
-    runner3680/3x6: {
-        target: 'omkbd/runner3680/3x6'
-    },
-    runner3680/3x7: {
-        target: 'omkbd/runner3680/3x7'
-    },
-    runner3680/3x8: {
-        target: 'omkbd/runner3680/3x8'
-    },
-    runner3680/4x6: {
-        target: 'omkbd/runner3680/4x6'
-    },
-    runner3680/4x7: {
-        target: 'omkbd/runner3680/4x7'
-    },
-    runner3680/4x8: {
-        target: 'omkbd/runner3680/4x8'
-    },
-    runner3680/5x6: {
-        target: 'omkbd/runner3680/5x6'
-    },
-    runner3680/5x6_5x8: {
-        target: 'omkbd/runner3680/5x6_5x8'
-    },
-    runner3680/5x7: {
-        target: 'omkbd/runner3680/5x7'
-    },
-    runner3680/5x8: {
-        target: 'omkbd/runner3680/5x8'
-    },
-    scarletbandana: {
-        target: 'woodkeys/scarletbandana'
-    },
-    scythe: {
-        target: 'kagizaraya/scythe'
-    },
-    seigaiha: {
-        target: 'yiancardesigns/seigaiha'
-    },
-    setta21: {
-        target: 'salicylic_acid3/setta21'
-    },
-    space_space/rev1: {
-        target: 'qpockets/space_space/rev1'
-    },
-    space_space/rev2: {
-        target: 'qpockets/space_space/rev2'
-    },
-    spiderisland/winry25tc: {
-        target: 'winry/winry25tc'
-    },
-    splitreus62: {
-        target: 'nacly/splitreus62'
-    },
-    squiggle/rev1: {
-        target: 'ibnuda/squiggle/rev1'
-    },
-    standaside: {
-        target: 'edi/standaside'
-    },
-    steal_this_keyboard: {
-        target: 'obosob/steal_this_keyboard'
-    },
-    stella: {
-        target: 'hnahkb/stella'
-    },
-    suihankey/alpha: {
-        target: 'kakunpc/suihankey/alpha'
-    },
-    suihankey/rev1: {
-        target: 'kakunpc/suihankey/rev1'
-    },
-    suihankey/split: {
-        target: 'kakunpc/suihankey/split'
-    },
-    the_ruler: {
-        target: 'maple_computing/the_ruler'
-    },
-    thedogkeyboard: {
-        target: 'kakunpc/thedogkeyboard'
-    },
-    tiger910: {
-        target: 'weirdo/tiger910'
-    },
-    treadstone32: {
-        target: 'marksard/treadstone32'
-    },
-    treadstone48/rev1: {
-        target: 'marksard/treadstone48/rev1'
-    },
-    treadstone48/rev2: {
-        target: 'marksard/treadstone48/rev2'
-    },
-    txuu: {
-        target: 'matthewdias/txuu'
-    },
-    ua62: {
-        target: 'nacly/ua62'
-    },
-    underscore33/rev1: {
-        target: 'tominabox1/underscore33/rev1'
-    },
-    underscore33/rev2: {
-        target: 'tominabox1/underscore33/rev2'
-    },
-    uno: {
-        target: 'keyhive/uno'
-    },
-    ut472: {
-        target: 'keyhive/ut472'
-    },
-    vn66: {
-        target: 'hnahkb/vn66'
-    },
-    wallaby: {
-        target: 'kkatano/wallaby'
-    },
-    wanten: {
-        target: 'qpockets/wanten'
-    },
-    'wheatfield/blocked65': {
-        target: 'mt/blocked65'
-    },
-    'wheatfield/split75': {
-        target: 'mt/split75'
-    },
-    whitefox: {
-        target: 'input_club/whitefox'
-    },
-    wings42/rev1: {
-        target: 'dailycraft/wings42/rev1'
-    },
-    wings42/rev1_extkeys: {
-        target: 'dailycraft/wings42/rev1_extkeys'
-    },
-    wings42/rev2: {
-        target: 'dailycraft/wings42/rev2'
-    },
-    yasui: {
-        target: 'rainkeebs/yasui'
-    },
-    yd60mq: {
-        target: 'ymdk/yd60mq'
-    },
-    yd68: {
-        target: 'ydkb/yd68'
-    },
-    ymd75: {
-        target: 'ymdk/ymd75'
-    },
-    ymd96: {
-        target: 'ymdk/ymd96'
-    },
-    ymdk_np21: {
-        target: 'ymdk/np21'
-    },
-    yurei: {
-        target: 'kkatano/yurei'
-    },
-    zinc: {
-        target: '25keys/zinc'
-    },
-    zinc/rev1: {
-        target: '25keys/zinc/rev1'
-    },
-    zinc/reva: {
-        target: '25keys/zinc/reva'
-    }
-}
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index bc07eaf5fb..daf54141a8 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -601,7 +601,10 @@
             "type": "object",
             "additionalProperties": false,
             "properties": {
-                "device_ver": {"$ref": "qmk.definitions.v1#/hex_number_4d"}, # Deprecated
+                "device_ver": {
+                    "$ref": "qmk.definitions.v1#/hex_number_4d",
+                    "$comment": "Deprecated: use device_version instead"
+                },
                 "device_version": {"$ref": "qmk.definitions.v1#/bcd_version"},
                 "force_nkro": {"type": "boolean"},
                 "pid": {"$ref": "qmk.definitions.v1#/hex_number_4d"},
diff --git a/docs/data_driven_config.md b/docs/data_driven_config.md
index 1a2e4ca54a..ba287f5688 100644
--- a/docs/data_driven_config.md
+++ b/docs/data_driven_config.md
@@ -41,7 +41,7 @@ In other cases you should group like options together in an `object`. This is pa
 
 ### Add a mapping
 
-In most cases you can add a simple mapping. These are maintained as JSON files in `data/mappings/info_config.json` and `data/mappings/info_rules.json`, and control mapping for `config.h` and `rules.mk`, respectively. Each mapping is keyed by the `config.h` or `rules.mk` variable, and the value is a hash with the following keys:
+In most cases you can add a simple mapping. These are maintained as JSON files in `data/mappings/info_config.hjson` and `data/mappings/info_rules.hjson`, and control mapping for `config.h` and `rules.mk`, respectively. Each mapping is keyed by the `config.h` or `rules.mk` variable, and the value is a hash with the following keys:
 
 * `info_key`: (required) The location within `info.json` for this value. See below.
 * `value_type`: (optional) Default `raw`. The format for this variable's value. See below.
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 0f29cd2327..ddb3a0772e 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -98,7 +98,7 @@ def generate_api(cli):
 
     # Generate data for the global files
     keyboard_list = sorted(kb_all)
-    keyboard_aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
+    keyboard_aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
     keyboard_metadata = {
         'last_updated': current_datetime(),
         'keyboards': keyboard_list,
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index f64daba134..31b8d70635 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -70,7 +70,7 @@ def generate_matrix_size(kb_info_json, config_h_lines):
 def generate_config_items(kb_info_json, config_h_lines):
     """Iterate through the info_config map to generate basic config values.
     """
-    info_config_map = json_load(Path('data/mappings/info_config.json'))
+    info_config_map = json_load(Path('data/mappings/info_config.hjson'))
 
     for config_key, info_dict in info_config_map.items():
         info_key = info_dict['info_key']
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 1d708f371e..fc272da6c6 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -62,7 +62,7 @@ def generate_rules_mk(cli):
         cli.subcommands['generate-rules-mk'].print_help()
         return False
 
-    info_rules_map = json_load(Path('data/mappings/info_rules.json'))
+    info_rules_map = json_load(Path('data/mappings/info_rules.hjson'))
     rules_mk_lines = [GPL2_HEADER_SH_LIKE, GENERATED_HEADER_SH_LIKE]
 
     # Iterate through the info_rules map to generate basic rules
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 8d4def1bef..251ad919dd 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -210,7 +210,7 @@ def new_keyboard(cli):
 
     # Preprocess any development_board presets
     if mcu in dev_boards:
-        defaults_map = json_load(Path('data/mappings/defaults.json'))
+        defaults_map = json_load(Path('data/mappings/defaults.hjson'))
         board = defaults_map['development_board'][mcu]
 
         mcu = board['processor']
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 07826a4866..5561a354c5 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -214,7 +214,7 @@ def parse_configurator_json(configurator_file):
         exit(1)
 
     orig_keyboard = user_keymap['keyboard']
-    aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
+    aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
 
     if orig_keyboard in aliases:
         if 'target' in aliases[orig_keyboard]:
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 5ca282b2d3..5dc8b9c5fe 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -483,7 +483,7 @@ def _extract_config_h(info_data, config_c):
     """
     # Pull in data from the json map
     dotty_info = dotty(info_data)
-    info_config_map = json_load(Path('data/mappings/info_config.json'))
+    info_config_map = json_load(Path('data/mappings/info_config.hjson'))
 
     for config_key, info_dict in info_config_map.items():
         info_key = info_dict['info_key']
@@ -529,7 +529,7 @@ def _extract_config_h(info_data, config_c):
 def _process_defaults(info_data):
     """Process any additional defaults based on currently discovered information
     """
-    defaults_map = json_load(Path('data/mappings/defaults.json'))
+    defaults_map = json_load(Path('data/mappings/defaults.hjson'))
     for default_type in defaults_map.keys():
         thing_map = defaults_map[default_type]
         if default_type in info_data:
@@ -555,7 +555,7 @@ def _extract_rules_mk(info_data, rules):
 
     # Pull in data from the json map
     dotty_info = dotty(info_data)
-    info_rules_map = json_load(Path('data/mappings/info_rules.json'))
+    info_rules_map = json_load(Path('data/mappings/info_rules.hjson'))
 
     for rules_key, info_dict in info_rules_map.items():
         info_key = info_dict['info_key']
diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index 686d4fc403..6ddbba8fa5 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -69,7 +69,7 @@ def keyboard_folder(keyboard):
 
     This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard.
     """
-    aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
+    aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
 
     if keyboard in aliases:
         keyboard = aliases[keyboard].get('target', keyboard)

From 7666c966d54522aabad8be135a5793bd432e78eb Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 8 Nov 2022 03:03:02 +0000
Subject: [PATCH 811/959] Publish hjson files as json (#18996)

---
 lib/python/qmk/cli/generate/api.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index ddb3a0772e..a98a12b628 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -27,6 +27,23 @@ def _resolve_keycode_specs(output_folder):
         output_file = output_folder / f'constants/keycodes_{version}.json'
         output_file.write_text(json.dumps(overall, indent=4), encoding='utf-8')
 
+    # Purge files consumed by 'load_spec'
+    shutil.rmtree(output_folder / 'constants/keycodes/')
+
+
+def _filtered_copy(src, dst):
+    src = Path(src)
+    dst = Path(dst)
+
+    if dst.suffix == '.hjson':
+        data = json_load(src)
+
+        dst = dst.with_suffix('.json')
+        dst.write_text(json.dumps(data, indent=4), encoding='utf-8')
+        return dst
+
+    return shutil.copy2(src, dst)
+
 
 def _filtered_keyboard_list():
     """Perform basic filtering of list_keyboards
@@ -58,7 +75,7 @@ def generate_api(cli):
         shutil.rmtree(BUILD_API_PATH)
 
     shutil.copytree(TEMPLATE_PATH, BUILD_API_PATH)
-    shutil.copytree(DATA_PATH, v1_dir)
+    shutil.copytree(DATA_PATH, v1_dir, copy_function=_filtered_copy)
 
     # Filter down when required
     keyboard_list = _filtered_keyboard_list()

From 15143654b9e49ef07fad8eb3b0e6a40cb313303e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 8 Nov 2022 14:17:46 +1100
Subject: [PATCH 812/959] `mechlovin/adelais/standard_led/avr/rev1`: fix layout
 (#18997)

---
 keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
index 7cc7add2c6..71bb49409d 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
@@ -64,7 +64,7 @@
     K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
     K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K4C, K3C, K3D, \
+         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K4C, K3C,      \
          K40,      K42,      K44,      K46,              K48,      K4A,                K4D  \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \

From 4b12bd05ea195fbe20a66ead86c97bb8a17728ef Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 8 Nov 2022 14:25:34 +1100
Subject: [PATCH 813/959] `pizzakeyboards/pizza65`: fix layouts (#18979)

---
 keyboards/pizzakeyboards/pizza65/info.json    |  11 +-
 .../keymap.c                                  |   4 +-
 .../keymap.c                                  |   4 +-
 keyboards/pizzakeyboards/pizza65/pizza65.h    | 110 +++++++++---------
 4 files changed, 62 insertions(+), 67 deletions(-)
 rename keyboards/pizzakeyboards/pizza65/keymaps/{ansi_blocker_doublebs => ansi_blocker_split_bs}/keymap.c (96%)
 rename keyboards/pizzakeyboards/pizza65/keymaps/{iso_blocker_doublebs => iso_blocker_split_bs}/keymap.c (96%)

diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json
index 9a0fdb3370..0407653596 100644
--- a/keyboards/pizzakeyboards/pizza65/info.json
+++ b/keyboards/pizzakeyboards/pizza65/info.json
@@ -115,8 +115,7 @@
                 {"label": "r2_11", "x": 10.5, "y": 1},
                 {"label": "r2_12", "x": 11.5, "y": 1},
                 {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"label": "r2_14", "x": 15, "y": 1},
 
                 {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
                 {"label": "r3_02", "x": 1.75, "y": 2},
@@ -134,7 +133,6 @@
                 {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
                 {"label": "r3_15", "x": 15, "y": 2},
 
-
                 {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
                 {"label": "r4_02", "x": 1.25, "y": 3},
                 {"label": "r4_03", "x": 2.25, "y": 3},
@@ -162,7 +160,7 @@
                 {"label": "r4_09", "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_blocker_doublebs": {
+        "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
                 {"label": "r1_01", "x": 0, "y": 0},
                 {"label": "r1_02", "x": 1, "y": 0},
@@ -238,7 +236,7 @@
                 {"label": "r4_09", "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_iso_blocker_doublebs": {
+        "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
                 {"label": "r1_01", "x": 0, "y": 0},
                 {"label": "r1_02", "x": 1, "y": 0},
@@ -270,7 +268,7 @@
                 {"label": "r2_11", "x": 10.5, "y": 1},
                 {"label": "r2_12", "x": 11.5, "y": 1},
                 {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"label": "r2_14", "x": 15, "y": 1},
 
                 {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
                 {"label": "r3_02", "x": 1.75, "y": 2},
@@ -288,7 +286,6 @@
                 {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
                 {"label": "r3_15", "x": 15, "y": 2},
 
-
                 {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
                 {"label": "r4_02", "x": 1.25, "y": 3},
                 {"label": "r4_03", "x": 2.25, "y": 3},
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_split_bs/keymap.c
similarity index 96%
rename from keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
rename to keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_split_bs/keymap.c
index 06ea26ca3f..7f7a56eb02 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_split_bs/keymap.c
@@ -17,14 +17,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi_blocker_doublebs(
+    [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_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_65_ansi_blocker_doublebs(
+    [1] = LAYOUT_65_ansi_blocker_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_DEL,  KC_INS,
         KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_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,
diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_split_bs/keymap.c
similarity index 96%
rename from keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
rename to keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_split_bs/keymap.c
index 707ede3d68..36cac8018f 100644
--- a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
+++ b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_split_bs/keymap.c
@@ -17,14 +17,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_iso_blocker_doublebs(
+    [0] = LAYOUT_65_iso_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_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT,   MO(1),          KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_65_iso_blocker_doublebs(
+    [1] = LAYOUT_65_iso_blocker_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_DEL,  KC_INS,
         KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUHS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/pizzakeyboards/pizza65/pizza65.h b/keyboards/pizzakeyboards/pizza65/pizza65.h
index 27b8f37483..74f1223be2 100644
--- a/keyboards/pizzakeyboards/pizza65/pizza65.h
+++ b/keyboards/pizzakeyboards/pizza65/pizza65.h
@@ -27,60 +27,58 @@
  * represents the switch matrix.
  */
 
- #define LAYOUT_65_ansi_blocker( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F  \
- ) \
- { \
-  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
-  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
-  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C, KC_NO, K2E, K2F }, \
-  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
-  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B, KC_NO,   K4D, K4E, K4F }, \
- }
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
+}
 
- #define LAYOUT_65_iso_blocker( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   KC_NO,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,     K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C,   KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,     K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO,     K4D,   K4E, K4F }, \
- }
- #define LAYOUT_65_ansi_blocker_doublebs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-     { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-     { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F }, \
- }
-#define LAYOUT_65_iso_blocker_doublebs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,   K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C, KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,   K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO,   K4D,   K4E, K4F }, \
- }
+#define LAYOUT_65_iso_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
+}
+
+#define LAYOUT_65_ansi_blocker_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
+}
+
+#define LAYOUT_65_iso_blocker_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
+    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
+    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
+}

From a1cc41e1aff3302261da25f809b0216641a2ce19 Mon Sep 17 00:00:00 2001
From: Kevin Ohlin <kevin.ohlin@gmail.com>
Date: Mon, 7 Nov 2022 21:50:41 -0700
Subject: [PATCH 814/959] [Keymap] KO Kyria (#18413)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../splitkb/kyria/keymaps/ohlin/config.h      |  29 ++
 .../splitkb/kyria/keymaps/ohlin/keymap.c      | 260 ++++++++++++++++++
 .../splitkb/kyria/keymaps/ohlin/readme.md     |  65 +++++
 .../splitkb/kyria/keymaps/ohlin/rules.mk      |   5 +
 4 files changed, 359 insertions(+)
 create mode 100644 keyboards/splitkb/kyria/keymaps/ohlin/config.h
 create mode 100644 keyboards/splitkb/kyria/keymaps/ohlin/keymap.c
 create mode 100644 keyboards/splitkb/kyria/keymaps/ohlin/readme.md
 create mode 100644 keyboards/splitkb/kyria/keymaps/ohlin/rules.mk

diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/config.h b/keyboards/splitkb/kyria/keymaps/ohlin/config.h
new file mode 100644
index 0000000000..238206a49e
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/ohlin/config.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Kevin Ohlin (@ohlin)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LIMIT_VAL 150
+#define RGBLIGHT_LED_MAP {0,1,2,9,8,7,4,3,5,6,19,18,17,10,11,12,15,16,14,13} // Orients Kyria LEDs to a circle around both halves.
+// #define RBGLIGHT_LED_MAP {9,8,6,7,5,3,2,4,1,0,10,12,13,11,14,16,17,15,18,19} // Orients Kyria LEDs for a left half-right half columnar progression.
+// #define RBGLIGHT_LED_MAP {8,9,2,3,4,5,1,0,6,7,17,16,10,11,15,14,13,12,19,18} // Another attempt at an LED mapping
+
+#define OLED_FADE_OUT
+#define OLED_FADE_OUT_INTERVAL 6
+
+// Configure the global tapping term (default: 200ms)
+#define TAPPING_TERM 175
+// Prevent normal rollover on alphas from accidentally triggering mods.
+#define IGNORE_MOD_TAP_INTERRUPT
+// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
+#define TAPPING_FORCE_HOLD
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/keymap.c b/keyboards/splitkb/kyria/keymaps/ohlin/keymap.c
new file mode 100644
index 0000000000..e2d95d3a48
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/ohlin/keymap.c
@@ -0,0 +1,260 @@
+// Copyright 2022 Kevin Ohlin (@ohlin)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY = 0,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+
+// Layers
+#define QWERTY   DF(_QWERTY)
+#define LOWER    MO(_LOWER)
+#define RAISE    MO(_RAISE)
+// Home row mods
+#define CTL_A    LCTL_T(KC_A)
+#define OPT_S    LOPT_T(KC_S)
+#define CMD_D    LCMD_T(KC_D)
+#define SFT_F    LSFT_T(KC_F)
+#define SFT_J    RSFT_T(KC_J)
+#define CMD_K    RCMD_T(KC_K)
+#define OPT_L    LOPT_T(KC_L)
+#define CTL_SCLN RCTL_T(KC_SCLN)
+// Other
+#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
+#define CTL_QUOT MT(MOD_RCTL, KC_QUOTE)
+#define CTL_MINS MT(MOD_RCTL, KC_MINUS)
+#define OPT_ENT  MT(MOD_LALT, KC_ENT)
+#define SFT_SPC  MT(MOD_LSFT, KC_SPC)
+#define YTC      LOPT(KC_C)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * Base Layer: QWERTY
+ *
+ * ,-------------------------------------------.                                               ,-------------------------------------------.
+ * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                                               |   Y  |   U  |   I  |   O  |   P  |   F3   |
+ * |--------+------+------+------+------+------|                                               |------+------+------+------+------+--------|
+ * |Ctrl/Esc| CTL/A| OPT/S| CMD/D| SFT/F|   G  |                                               |   H  | SFT/J| CMD/K| OPT/L| CTL/;| RClick |
+ * |--------+------+------+------+------+------+-------------.                   ,-------------+------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  | [ {  | Hyper|                   | Hyper|  ] } |   N  |   M  | ,  < | . >  |  / ? | LClick |
+ * `----------------------+------+------+------+------+------|                   |------+------+------+------+------+----------------------'
+ *                        |      | LCMD | LOPT/|Shift/| Lower|                   | Raise|Shift/| Bcksp| RCMD |Scroll|
+ *                        |      |      | Enter| Space|      |                   |      | Space|      |      |      |
+ *                        `----------------------------------'                   `----------------------------------'
+ */
+    [_QWERTY] = LAYOUT(
+     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,     KC_F3,
+     CTL_ESC,  CTL_A,   OPT_S,   CMD_D,   SFT_F,   KC_G,                                           KC_H,    SFT_J,   CMD_K,   OPT_L,  CTL_SCLN, KC_BTN2,
+     KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC, KC_HYPR,    KC_HYPR, KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH,  KC_BTN1,
+                                 _______, KC_LCMD, OPT_ENT, SFT_SPC, LOWER,      RAISE,   SFT_SPC, KC_BSPC, KC_RCMD, KC_BTN5
+    ),
+
+/*
+ * Lower Layer
+ *
+ * ,-----------------------------------------.                                                  ,-------------------------------------------.
+ * |  (   |  )   |  7   |  8   |  9   |  0   |                                                  | VolUp|      |   ↑  |      |      |        |
+ * |------|------+------+------+------+------+                                                  |------+------+------+------+------+--------|
+ * |  [   |  ]   |  4   |  5   |  6   |  +   |                                                  | VolDn|  ←   |   ↓  |   →  |      |        |
+ * |------+------+------+------+------+------+-------------.                      ,-------------+------+------+------+------+------+--------|
+ * |  {   |  }   |  1   |  2   |  3   |  -   |      |      |                      |      |      |VolMut|      |      |      |      |        |
+ * `--------------------+------+------+------+------+------|                      |------+------+------+------+------+----------------------'
+ *                      |      |      |      |      |xxxxxx|                      |      |      |      |      |      |
+ *                      |      |      |      |      |xxxxxx|                      |      |      |      |      |      |
+ *                      `----------------------------------'                      `----------------------------------'
+ */
+    [_LOWER] = LAYOUT(
+      KC_LPRN, KC_RPRN, KC_7,   KC_8,    KC_9,    KC_0,                                            KC_VOLU, _______, KC_UP,   _______, _______, _______,
+      KC_LBRC, KC_RBRC, KC_4,   KC_5,    KC_6,    KC_EQL,                                          KC_VOLD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+      KC_LCBR, KC_RCBR, KC_1,   KC_2,    KC_3,    KC_MINUS, _______, KC_LSFT,    _______, _______, KC_MUTE, _______, _______, _______, _______, _______,
+                                KC_BTN5, KC_BTN2, KC_BTN1,  _______, _______,    _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Raise Layer
+ *
+ * ,-------------------------------------------.                                              ,-------------------------------------------.
+ * |    `   |      |      |      |      |      |                                              | VolUp|      |   ↑  |      |      |        |
+ * |--------+------+------+------+------+------|                                              |------+------+------+------+------+--------|
+ * |    ~   |  !   |  @   |  #   |  $   |  %   |                                              | VolDn|  ←   |   ↓  |   →  |      |Ctrl/' "|
+ * |--------+------+------+------+------+------+-------------.                  ,-------------+------+------+------+------+------+--------|
+ * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |      |                  |      |      |VolMut| Opt+C|  <   |   >  |      |        |
+ * `----------------------+------+------+------+------+------|                  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |                  |xxxxxx|      |      |      |      |
+ *                        |      |      |      |      |      |                  |xxxxxx|      |      |      |      |
+ *                        `----------------------------------'                  `----------------------------------'
+ */
+    [_RAISE] = LAYOUT(
+     KC_GRV,  _______, _______, _______, _______, _______,                                        KC_VOLU, _______, KC_UP,   _______, _______, _______,
+     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                        KC_VOLD, KC_LEFT, KC_DOWN, KC_RGHT, _______, CTL_QUOT,
+     KC_PIPE, KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, _______,    _______, _______, KC_MUTE, YTC,     KC_LT,   KC_GT,   _______, _______,
+                                _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Adjust Layer: RGB
+ *
+ * ,-------------------------------------------.                                              ,-------------------------------------------.
+ * |        |      |      |      |      |      |                                              |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|                                              |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |                                              | TOG  | SAI  | HUI  | VAI  | MOD  |        |
+ * |--------+------+------+------+------+------+-------------.                  ,-------------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |      |                  |      |      |      | SAD  | HUD  | VAD  | RMOD |        |
+ * `----------------------+------+------+------+------+------|                  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |xxxxxx|                  |xxxxxx|      |      |      |      |
+ *                        |      |      |      |      |xxxxxx|                  |xxxxxx|      |      |      |      |
+ *                        `----------------------------------'                  `----------------------------------'
+ */
+    [_ADJUST] = LAYOUT(
+      _______, _______, _______, _______, _______, _______,                                       _______, _______, _______, _______, _______,  _______,
+      _______, _______, _______, _______, _______, _______,                                       RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_M_P,  _______,
+      _______, _______, _______, _______, _______, _______,_______, _______,    _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_SW, _______,
+                                 _______, _______, _______,_______, _______,    _______, _______, _______, _______, _______
+    ),
+
+// /*
+//  * Layer template
+//  *
+//  * ,-------------------------------------------.                                               ,-------------------------------------------.
+//  * |        |      |      |      |      |      |                                               |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------|                                               |------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |                                               |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------+-------------.                   ,-------------+------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |      |      |                   |      |      |      |      |      |      |      |        |
+//  * `----------------------+------+------+------+------+------|                   |------+------+------+------+------+----------------------'
+//  *                        |      |      |      |      |      |                   |      |      |      |      |      |
+//  *                        |      |      |      |      |      |                   |      |      |      |      |      |
+//  *                        `----------------------------------'                   `----------------------------------'
+//  */
+//     [_LAYERINDEX] = LAYOUT(
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+//                                  _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______
+//     ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        // QMK Logo and version information
+        // clang-format off
+        static const char PROGMEM qmk_logo[] = {
+            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+        // clang-format on
+
+        oled_write_P(qmk_logo, false);
+        oled_write_P(PSTR("\nKyria rev2.1\n\n"), false);
+
+        // Host Keyboard Layer Status
+        oled_write_P(PSTR("Layer: "), false);
+        switch (get_highest_layer(layer_state|default_layer_state)) {
+            case _QWERTY:
+                oled_write_P(PSTR("QWERTY\n"), false);
+                break;
+            case _LOWER:
+                oled_write_P(PSTR("Lower\n"), false);
+                break;
+            case _RAISE:
+                oled_write_P(PSTR("Raise\n"), false);
+                break;
+            case _ADJUST:
+                oled_write_P(PSTR("Adjust\n"), false);
+                break;
+            default:
+                oled_write_P(PSTR("Undefined\n"), false);
+        }
+
+        // Write host Keyboard LED Status to OLEDs
+        led_t led_usb_state = host_keyboard_led_state();
+        oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
+    } else {
+        // clang-format off
+        static const char PROGMEM ko_logo[] = {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 
+            0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x18, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+            0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 
+            0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 
+            0x30, 0x18, 0x8c, 0xe6, 0x73, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 
+            0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+            0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xe0, 0x80, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
+            0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 
+            0x07, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x01, 0xc0, 0xf0, 
+            0x78, 0x1e, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+            0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 
+            0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x07, 0x01, 0x00, 0x80, 0xc0, 0x60, 
+            0x30, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0e, 0x0f, 0x0f, 0x0d, 
+            0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x8d, 0xcd, 0xed, 0x7d, 
+            0x3d, 0xbd, 0xdd, 0xed, 0xf5, 0xf1, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 
+            0x07, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf1, 0xc7, 0x86, 0x06, 
+            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x86, 0xe6, 0xfe, 0x7e, 
+            0x1e, 0x0e, 0x02, 0x80, 0xc0, 0xc0, 0x60, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0xf3, 0xf9, 0xfc, 0xfe, 
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 
+            0xfc, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x78, 0xbc, 0xcf, 0xc7, 0xe3, 0x70, 0x38, 
+            0x1c, 0x0e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+            0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 
+            0x7f, 0x9f, 0xcf, 0xf3, 0xf8, 0x7e, 0xbf, 0xdf, 0x8f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 
+            0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
+            0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x11, 0x0d, 
+            0x06, 0x03, 0x03, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+            0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+        // clang-format on
+        oled_write_raw_P(ko_logo, sizeof(ko_logo));
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/readme.md b/keyboards/splitkb/kyria/keymaps/ohlin/readme.md
new file mode 100644
index 0000000000..0db8d2d976
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/ohlin/readme.md
@@ -0,0 +1,65 @@
+# @ohlin's Kyria Keymap
+###### _This keymap is a work in progress._ 
+
+I am a Product Manager and QA Lead, not a developer, so I spend a lot of my time doing things that require a mouse, so one handed keyboard shortcuts are very useful to me.
+
+This keymap is used on a Mac in conjunction with a [Ploopy Nano](https://github.com/ploopyco/nano-trackball) trackball.
+
+```
+,-----------------------------.                      ,-----------------------------.   .--------------.
+|    |    |    |    |    |    |                      |    |    |    |    |    |    |  |      ----      |
+|----+----+----+----+----+----|                      |----|----+----+----+----+----|  |   PL°°°°°°PY   |
+|    |    |    |    |    |    |                      |    |    |    |    |    |    |  |  PL°°°°°°°°PY  |
+|----+----+----+----+----+----+---------.  ,---------+----+----+----+----+----+----|  |  PL°°°°°°°°PY  |
+|    |    |    |    |    |    |    |    |  |    |    |    |    |    |    |    |    |  |   PL°°°°°°PY   |
+`-------------------+----+----+----+----|  |----+----+----+----+----+----+---------'  |      ----      |
+               |    |    |    |    |    |  |    |    |    |    |    |                  '--------------'
+               `------------------------'  `------------------------'
+```
+
+## Home Row Mods
+Home row mods help came from @precondition's in-depth article, [_A guide to home row mods_](https://precondition.github.io/home-row-mods). `CAGS` makes the most sense to me as a Mac user.
+
+## Karabiner Elements
+Karabiner Elements has been a part of my Mac workflow for years now, so when I switched from a Planck to this Kyria, it fit neatly around this keymap to make things easier. Karabiner serves two primary functions here:
+
+- Change `Caps Lock` to `Hyper` (`ctrl + opt + cmd + shift`)
+- Hold mouse button 5 to enable `mouse_motion_to_scroll`
+
+### Caps Lock to Hyper
+Years ago, following Brett Terpstra's article [_A useful Caps Lock key_](https://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/), I swapped caps lock for hyper, then mapped a number of system-wide keyboard shortcuts to `Hyper` + `[key]`, such as launching apps using [Alfred](https://www.alfredapp.com/) workflows, resizing and moving windows using [Rectangle](https://github.com/rxhanson/Rectangle), and changing all of my montiors' brightness levels together using [Display Buddy](https://displaybuddy.app/). 
+
+Remapping the Caps Lock key in Karabiner ensures I can still easily use these shortcuts with the built-in keyboard on my laptop as well as with any QMK keyboard (where I use the `KC_HYPR` key code directly).
+### Scrolling with the Ploopy Nano
+Initially, I tried using the NumLock scroll developed by [@zealws](https://github.com/zealws/qmk_firmware/commit/293d3c211d9e93c127b628ac9ef9e4cb201a01da) ([Reddit post here](https://old.reddit.com/r/ploopy/comments/nlvgkq/how_to_scroll_with_the_trackball_nano/)), but had some difficulty making it work on Mac. Since I was already using Karabiner for the Caps Lock to Hyper Switch, I decided to just use it for [mouse motion to scroll](https://karabiner-elements.pqrs.org/docs/json/complex-modifications-manipulator-definition/other-types/mouse-motion-to-scroll/) as well by holding Mouse Button 5. Easily done.
+
+Despite not being able to make the NumLock scroll work, I did keep the [Ploopy Acceleration](https://github.com/zealws/qmk_firmware/commit/293d3c211d9e93c127b628ac9ef9e4cb201a01da#diff-d9cdae01e54acdc5c6ec6f6b28f48a676287d2f9cc2c9c3aaf63724fa625f520R90-R96) from @zealws' code, as it made using the Nano much easier when moving across the 3 monitors I typically use for work.
+## OLED Logo
+I created my own OLED logo in [Figma](https://www.figma.com/), converted it with @javl's [image2cpp](https://javl.github.io/image2cpp), and cleaned up the result with @joric's [QMK Logo Editor](https://joric.github.io/qle/).
+```
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡/1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡! ,‡‡‡‡‡‡‡‡‡z!!!!!!!!!!!!r‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡!       .1‡‡‡‡‡‡‡@!  '&‡‡‡‡‡‡_"                ';1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡'       `‡‡‡‡‡‡‡BI ` `‡‡‡‡‡‡<                      `‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡?        ;‡‡‡‡‡‡@l.;j'>‡‡‡‡‡&'         .""""`         .j‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡!       `‡‡‡‡‡‡@I ,‡r ,‡‡‡‡‡‡l        `M‡‡‡‡‡‡‡(         M‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡1.       "#‡‡‡‡z>';j‡; '&‡‡‡‡‡‡.       i‡‡‡‡‡‡‡‡‡‡l        .‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡^       ;8‡‡‡‡('.;#‡‡" >‡‡‡‡‡‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡/        )‡‡‡‡r`.{‡‡‡‡` M‡‡‡‡‡‡‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ""       "j‡‡‡j".;#‡‡‡c  .""""""""""""""""1/‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡                 ,‡‡‡1' ,‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡<  `!  ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡                 'M‡`.;j‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡1'',;'   ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡                   \<                .‡‡‡‡(  /!      ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡;        >‡‡‡‡‡‡‡‡‡‡‡‡1 '1‡‡j;''1‡'       ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡M        !‡‡‡‡‡‡‡‡‡‡' ^‡‡‡` .<‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡r        .(‡‡‡‡‡‡‡' ;‡1" ,j‡‡‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡l        >‡‡‡‡; `jl."1@‡‡‡‡‡‡‡        >‡‡‡‡‡‡‡‡‡‡-         ‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡B.       I‡z  "^  t‡‡‡‡‡‡‡‡‡‡;        I‡‡‡‡‡‡‡‡t         c‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡x       ./'   ^/‡‡‡‡‡‡‡‡‡‡‡‡z.         `""""".         (‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡`    `<   Ir‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡!                      `‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡,  "^  ""1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡i`                ."1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡!!!!!!!!!‡‡‡‡‡‡‡‡‡‡‡‡!{` !‡!!!!‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡x!!!!!!!!!!!!?M‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡>';#‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡u8‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
+```
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/rules.mk b/keyboards/splitkb/kyria/keymaps/ohlin/rules.mk
new file mode 100644
index 0000000000..90846dfb53
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/ohlin/rules.mk
@@ -0,0 +1,5 @@
+ENCODER_ENABLE = no
+MOUSEKEY_ENABLE = yes
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE = no
+SPACE_CADET_ENABLE = no
\ No newline at end of file

From 9daf77b59373196839d022d621f015e074aa427a Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 9 Nov 2022 02:47:07 +1100
Subject: [PATCH 815/959] Add raw output option for QGF/QFF files. (#18998)

---
 docs/quantum_painter.md                        | 10 ++++++----
 lib/python/qmk/cli/painter/convert_graphics.py |  7 +++++++
 lib/python/qmk/cli/painter/make_font.py        | 12 ++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/docs/quantum_painter.md b/docs/quantum_painter.md
index ed9cec171b..781b467a45 100644
--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -55,10 +55,11 @@ This command converts images to a format usable by QMK, i.e. the QGF File Format
 **Usage**:
 
 ```
-usage: qmk painter-convert-graphics [-h] [-d] [-r] -f FORMAT [-o OUTPUT] -i INPUT [-v]
+usage: qmk painter-convert-graphics [-h] [-w] [-d] [-r] -f FORMAT [-o OUTPUT] -i INPUT [-v]
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
+  -w, --raw             Writes out the QGF file as raw data instead of c/h combo.
   -d, --no-deltas       Disables the use of delta frames when encoding animations.
   -r, --no-rle          Disables the use of RLE when encoding images.
   -f FORMAT, --format FORMAT
@@ -146,10 +147,11 @@ This command expects an image that conforms to the following format:
 **Usage**:
 
 ```
-usage: qmk painter-convert-font-image [-h] [-r] -f FORMAT [-u UNICODE_GLYPHS] [-n] [-o OUTPUT] [-i INPUT]
+usage: qmk painter-convert-font-image [-h] [-w] [-r] -f FORMAT [-u UNICODE_GLYPHS] [-n] [-o OUTPUT] [-i INPUT]
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
+  -w, --raw             Writes out the QFF file as raw data instead of c/h combo.
   -r, --no-rle          Disable the use of RLE to minimise converted image size.
   -f FORMAT, --format FORMAT
                         Output format, valid types: pal256, pal16, pal4, pal2, mono256, mono16, mono4, mono2
diff --git a/lib/python/qmk/cli/painter/convert_graphics.py b/lib/python/qmk/cli/painter/convert_graphics.py
index bbc30d26ff..2519c49b25 100644
--- a/lib/python/qmk/cli/painter/convert_graphics.py
+++ b/lib/python/qmk/cli/painter/convert_graphics.py
@@ -15,6 +15,7 @@ from PIL import Image
 @cli.argument('-f', '--format', required=True, help='Output format, valid types: %s' % (', '.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.')
 @cli.subcommand('Converts an input image to something QMK understands')
 def painter_convert_graphics(cli):
     """Converts an image file to a format that Quantum Painter understands.
@@ -53,6 +54,12 @@ def painter_convert_graphics(cli):
     input_img.save(out_data, "QGF", use_deltas=(not cli.args.no_deltas), use_rle=(not cli.args.no_rle), qmk_format=format, verbose=cli.args.verbose)
     out_bytes = out_data.getvalue()
 
+    if cli.args.raw:
+        raw_file = cli.args.output / (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 = {
         'generated_type': 'image',
diff --git a/lib/python/qmk/cli/painter/make_font.py b/lib/python/qmk/cli/painter/make_font.py
index 0762843fd3..c0189920d2 100644
--- a/lib/python/qmk/cli/painter/make_font.py
+++ b/lib/python/qmk/cli/painter/make_font.py
@@ -33,6 +33,7 @@ def painter_make_font_image(cli):
 @cli.argument('-u', '--unicode-glyphs', default='', help='Also generate the specified unicode glyphs.')
 @cli.argument('-f', '--format', required=True, help='Output format, valid types: %s' % (', '.join(valid_formats.keys())))
 @cli.argument('-r', '--no-rle', arg_only=True, action='store_true', help='Disable the use of RLE to minimise converted image size.')
+@cli.argument('-w', '--raw', arg_only=True, action='store_true', help='Writes out the QFF file as raw data instead of c/h combo.')
 @cli.subcommand('Converts an input font image to something QMK firmware understands')
 def painter_convert_font_image(cli):
     # Work out the format
@@ -53,6 +54,13 @@ def painter_convert_font_image(cli):
     # Render out the data
     out_data = BytesIO()
     font.save_to_qff(format, (False if cli.args.no_rle else True), out_data)
+    out_bytes = out_data.getvalue()
+
+    if cli.args.raw:
+        raw_file = cli.args.output / (cli.args.input.stem + ".qff")
+        with open(raw_file, 'wb') as raw:
+            raw.write(out_bytes)
+        return
 
     # Work out the text substitutions for rendering the output data
     subs = {
@@ -62,8 +70,8 @@ def painter_convert_font_image(cli):
         'year': datetime.date.today().strftime("%Y"),
         'input_file': cli.args.input.name,
         'sane_name': re.sub(r"[^a-zA-Z0-9]", "_", cli.args.input.stem),
-        'byte_count': out_data.getbuffer().nbytes,
-        'bytes_lines': render_bytes(out_data.getbuffer().tobytes()),
+        'byte_count': len(out_bytes),
+        'bytes_lines': render_bytes(out_bytes),
         'format': cli.args.format,
     }
 

From d11676566ed452ea3d6f819acec33ba374b15e68 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 9 Nov 2022 02:49:50 +1100
Subject: [PATCH 816/959] `gboards/gergoplex`: fix matrix pins (#18999)

---
 keyboards/gboards/gergoplex/config.h |  4 ++--
 keyboards/gboards/gergoplex/matrix.c | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index bd8c075190..68e6abdab7 100644
--- a/keyboards/gboards/gergoplex/config.h
+++ b/keyboards/gboards/gergoplex/config.h
@@ -33,8 +33,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * COLS: AVR pins used for columns, left to right
  * ROWS: AVR pins used for rows, top to bottom
  */
-#define MATRIX_ROW_PINS { F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { B1, B2, B3, D2, D3 }
+#define MATRIX_COL_PINS { F6, F5, F4, F1 }
+#define MATRIX_ROW_PINS { B1, B2, B3, D2, D3 }
 #define IGNORE_MOD_TAP_INTERRUPT
 
 #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c
index d5b046fe40..df2b2dde15 100644
--- a/keyboards/gboards/gergoplex/matrix.c
+++ b/keyboards/gboards/gergoplex/matrix.c
@@ -38,10 +38,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 // ATmega pin defs
-#define ROW1 (1 << 6)
-#define ROW2 (1 << 5)
-#define ROW3 (1 << 4)
-#define ROW4 (1 << 1)
+#define COL1 (1 << 6)
+#define COL2 (1 << 5)
+#define COL3 (1 << 4)
+#define COL4 (1 << 1)
 
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -51,9 +51,9 @@ static matrix_row_t matrix[MATRIX_ROWS];
  */
 static matrix_row_t raw_matrix[MATRIX_ROWS];
 
-static const pin_t row_pins[MATRIX_COLS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 // Right-hand side only pins, the left side is controlled my MCP
-static const pin_t col_pins[MATRIX_ROWS_PER_SIDE] = MATRIX_COL_PINS;
+static const pin_t row_pins[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS;
 
 // Debouncing: store for each key the number of scans until it's eligible to
 // change.  When scanning the matrix, ignore any changes in keys that have
@@ -167,8 +167,8 @@ void matrix_print(void) {
 
 // Remember this means ROWS
 static void init_cols(void) {
-    for (uint8_t row = 0; row < MATRIX_COLS; row++) {
-      setPinInputHigh(row_pins[row]);
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+      setPinInputHigh(col_pins[col]);
     }
 }
 
@@ -193,7 +193,7 @@ static matrix_row_t read_cols(uint8_t row) {
             return data;
         }
     } else {
-        return ~((((PINF & ROW4) >> 1) | ((PINF & (ROW1 | ROW2 | ROW3)) >> 3)) & 0xF);
+        return ~((((PINF & COL4) >> 1) | ((PINF & (COL1 | COL2 | COL3)) >> 3)) & 0xF);
     }
 }
 
@@ -202,9 +202,9 @@ static void unselect_rows(void) {
     // no need to unselect on mcp23018, because the select step sets all
     // the other row bits high, and it's not changing to a different direction
 
-    for (uint8_t col = 0; col < MATRIX_ROWS_PER_SIDE; col++) {
-      setPinInput(col_pins[col]);
-      writePinLow(col_pins[col]);
+    for (uint8_t row = 0; row < MATRIX_ROWS_PER_SIDE; row++) {
+      setPinInput(row_pins[row]);
+      writePinLow(row_pins[row]);
     }
 }
 
@@ -223,7 +223,7 @@ static void select_row(uint8_t row) {
             i2c_stop();
         }
     } else {
-        setPinOutput(col_pins[row - MATRIX_ROWS_PER_SIDE]);
-        writePinLow(col_pins[row - MATRIX_ROWS_PER_SIDE]);
+        setPinOutput(row_pins[row - MATRIX_ROWS_PER_SIDE]);
+        writePinLow(row_pins[row - MATRIX_ROWS_PER_SIDE]);
     }
 }

From 2acb2e696aff1365449d2d7b928a84d23c6223a1 Mon Sep 17 00:00:00 2001
From: Ryan Anderson <ryan@michonline.com>
Date: Tue, 8 Nov 2022 08:21:35 -0800
Subject: [PATCH 817/959] [Keymap] Add model01 and doio/kb16 keymaps (#18681)

---
 .../doio/kb16/rev1/keymaps/pugmajere/keymap.c | 135 ++++++++++++
 .../kb16/rev1/keymaps/pugmajere/readme.md     |  10 +
 .../doio/kb16/rev1/keymaps/pugmajere/rules.mk |   2 +
 .../model01/keymaps/pugmajere/config.h        |  54 +++++
 .../model01/keymaps/pugmajere/keymap.c        | 192 ++++++++++++++++++
 .../model01/keymaps/pugmajere/readme.md       |  20 ++
 .../model01/keymaps/pugmajere/rules.mk        |   1 +
 7 files changed, 414 insertions(+)
 create mode 100644 keyboards/doio/kb16/rev1/keymaps/pugmajere/keymap.c
 create mode 100644 keyboards/doio/kb16/rev1/keymaps/pugmajere/readme.md
 create mode 100644 keyboards/doio/kb16/rev1/keymaps/pugmajere/rules.mk
 create mode 100644 keyboards/keyboardio/model01/keymaps/pugmajere/config.h
 create mode 100644 keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
 create mode 100644 keyboards/keyboardio/model01/keymaps/pugmajere/readme.md
 create mode 100644 keyboards/keyboardio/model01/keymaps/pugmajere/rules.mk

diff --git a/keyboards/doio/kb16/rev1/keymaps/pugmajere/keymap.c b/keyboards/doio/kb16/rev1/keymaps/pugmajere/keymap.c
new file mode 100644
index 0000000000..6206e6860c
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keymaps/pugmajere/keymap.c
@@ -0,0 +1,135 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ * Copyright 2022 Ryan Anderson <ryan@michonline.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// OLED animation
+#include "lib/layer_status/layer_status.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE = 0,
+    _FN,
+    _FN1,
+    _FN2,
+};
+
+// enum layer_keycodes { };
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /*
+           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+           │C-D│C-E│M-D│M-E│   │Ply│ │TO1│
+           ├───┼───┼───┼───┤   └───┘ └───┘
+           │ 5 │ 6 │ 7 │ 8 │
+           ├───┼───┼───┼───┤
+           │ 9 │ 0 │ ↑ │Ent│      ┌───┐
+           ├───┼───┼───┼───┤      │Mut│
+           │Fn2│ ← │ ↓ │ → │      └───┘
+           └───┴───┴───┴───┘
+           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+           │ ! │ @ │ # │ $ │   │   │ │   │
+           ├───┼───┼───┼───┤   └───┘ └───┘
+           │ % │ ^ │ & │ * │
+           ├───┼───┼───┼───┤
+           │ ( │ ) │   │   │      ┌───┐
+           ├───┼───┼───┼───┤      │   │
+           │   │   │   │   │      └───┘
+           └───┴───┴───┴───┘
+    */
+    /*  Row:    0         1        2        3         4        5        6      */
+    [_BASE] = LAYOUT(C(KC_D), C(KC_E), LCMD(KC_D), LCMD(KC_E), KC_MPLY,
+                     KC_5, KC_6, LCTL(LCMD(KC_H)), KC_8, TO(_FN),
+                     KC_9, KC_0, KC_UP, KC_ENT, KC_MUTE,
+                     MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    /*
+           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+           │   │   │   │   │   │   │ │   │
+           ├───┼───┼───┼───┤   └───┘ └───┘
+           │   │   │   │   │
+           ├───┼───┼───┼───┤
+           │   │   │   │   │      ┌───┐
+           ├───┼───┼───┼───┤      │   │
+           │   │   │   │   │      └───┘
+           └───┴───┴───┴───┘
+    */
+    /*  Row:    0        1        2        3        4        5         6      */
+    [_FN] = LAYOUT(_______, _______, _______, _______, _______,
+                   _______, _______, _______, _______, TO(_FN1),
+                   _______, _______, _______, _______, _______,
+                   _______, _______, _______, _______),
+
+    /*
+           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+           │   │   │   │   │   │   │ │   │
+           ├───┼───┼───┼───┤   └───┘ └───┘
+           │   │   │   │   │
+           ├───┼───┼───┼───┤
+           │   │   │   │   │      ┌───┐
+           ├───┼───┼───┼───┤      │   │
+           │   │   │   │   │      └───┘
+           └───┴───┴───┴───┘
+    */
+    /*  Row:    0        1        2        3        4        5         6      */
+    [_FN1] = LAYOUT(_______, _______, _______, _______, _______,
+                    _______, _______, _______, _______, TO(_FN2),
+                    _______, _______, _______, _______, _______,
+                    _______, _______, _______, _______),
+
+    /*
+           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
+           │Spi│Spd│   │   │   │   │ │TO0│
+           ├───┼───┼───┼───┤   └───┘ └───┘
+           │Sai│Sad│   │   │
+           ├───┼───┼───┼───┤
+           │Tog│Mod│Hui│   │      ┌───┐
+           ├───┼───┼───┼───┤      │   │
+           │   │Vai│Hud│Vad│      └───┘
+           └───┴───┴───┴───┘
+    */
+    /*  Row:    0        1        2        3        4        5          6      */
+    [_FN2] = LAYOUT(RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                    RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                    RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
+                    _______, RGB_VAI, RGB_HUD, RGB_VAD),
+};
+// clang-format on
+
+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    render_layer_status();
+
+    return true;
+}
+#endif
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_FN]   = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_FN2]  = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_BASE] = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+};
+#endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/pugmajere/readme.md b/keyboards/doio/kb16/rev1/keymaps/pugmajere/readme.md
new file mode 100644
index 0000000000..f88901c623
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keymaps/pugmajere/readme.md
@@ -0,0 +1,10 @@
+# pugmajere's Google Meet optimized version of the default keymap
+
+A lightly modified version of the default keymap.
+
+The top row is converted to keys used for muting audio and video in
+Google Meet, in both Linux and MacOS. (Yes, they annoyingly have
+different conventions.)
+
+The ASCII-art depiction uses "C-E" to mean "ctrl-e", and "M-E" to mean
+CMD(GUI) and "e", roughly following Emacs naming conventions.
diff --git a/keyboards/doio/kb16/rev1/keymaps/pugmajere/rules.mk b/keyboards/doio/kb16/rev1/keymaps/pugmajere/rules.mk
new file mode 100644
index 0000000000..00003ba11b
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keymaps/pugmajere/rules.mk
@@ -0,0 +1,2 @@
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/config.h b/keyboards/keyboardio/model01/keymaps/pugmajere/config.h
new file mode 100644
index 0000000000..ef75a034de
--- /dev/null
+++ b/keyboards/keyboardio/model01/keymaps/pugmajere/config.h
@@ -0,0 +1,54 @@
+// Copyright 2022 Ryan Anderson <ryan@michonline.com> (@pugmajere)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define USB_MAX_POWER_CONSUMPTION 500
+
+#define RGBLIGHT_LIMIT_VAL 175
+
+#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
+#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#undef ENABLE_RGB_MATRIX_BREATHING
+#undef ENABLE_RGB_MATRIX_BAND_SAT
+#undef ENABLE_RGB_MATRIX_BAND_VAL
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#undef ENABLE_RGB_MATRIX_CYCLE_ALL
+#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+/* #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON */
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+/* #undef ENABLE_RGB_MATRIX_DUAL_BEACON */
+/* #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON */
+/* #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS */
+#undef ENABLE_RGB_MATRIX_RAINDROPS
+#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#undef ENABLE_RGB_MATRIX_HUE_BREATHING
+#undef ENABLE_RGB_MATRIX_HUE_PENDULUM
+#undef ENABLE_RGB_MATRIX_HUE_WAVE
+#undef ENABLE_RGB_MATRIX_PIXEL_RAIN
+#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
+#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is undefd
+#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is undefd
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_MULTISPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c b/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
new file mode 100644
index 0000000000..b7043ef640
--- /dev/null
+++ b/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
@@ -0,0 +1,192 @@
+/* Copyright 2022 Ryan Anderson <ryan@michonline.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+/* layer constants */
+enum {
+    DEF = 0,
+    FUN,
+};
+
+enum custom_keycode {
+    MACRO_CTRL_PAGE_UP = SAFE_RANGE,
+    KC_MT_LCBRC,
+    KC_MT_RCBRC,
+    KC_MT_LPAR,
+    KC_MT_RPAR,
+    MACRO_KVM_1,
+    MACRO_KVM_2,
+    MACRO_KVM_3,
+    MACRO_KVM_4,
+    MACRO_KVM_TG,
+};
+
+// Work around limitations in mod-tapping
+static uint16_t space_cadet_control_timer    = 0;
+static bool     space_cadet_key_pressed_flag = false;
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[DEF] = LAYOUT(
+  QK_BOOT  , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , MACRO_CTRL_PAGE_UP,
+  KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , RGB_MOD,    MACRO_KVM_TG, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_EQL ,
+  LCTL_T(KC_PGUP), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_TAB ,    KC_ENT , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+  KC_PGDN, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_ESC ,    KC_RALT, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
+                                  LCTL_T(KC_LBRC),                                 RCTL_T(KC_RBRC),
+                                            KC_BSPC,                                     KC_SPC ,
+                                          KC_MT_LCBRC,                              KC_MT_RCBRC,
+                                             KC_MT_LPAR,                           KC_MT_RPAR,
+                                                   MO(FUN),                         MO(FUN)
+  ),
+[FUN] = LAYOUT(
+  _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
+  KC_TAB , _______, KC_MS_U, KC_WH_U, KC_BTN3, MACRO_KVM_1, RGB_TOG,    KC_MPRV, KC_MNXT, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_F12 ,
+  KC_HOME, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, MACRO_KVM_2, RGB_SPI,    KC_MPLY, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
+  KC_END , KC_PSCR, KC_INS , KC_WH_D, KC_BTN2, MACRO_KVM_4, RGB_SPD,    _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BSLS, KC_PIPE,
+                                         _______,                                 _______,
+                                            KC_DEL ,                           KC_ENT ,
+                                               _______,                     _______,
+                                                  _______,               _______,
+                                      _______,                                        _______
+  )
+};
+
+/* template for new layouts:
+LAYOUT(
+  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+                                         _______,                                 _______,
+                                            _______,                           _______,
+                                               _______,                     _______,
+                                                  _______,               _______,
+                                      _______,                                        _______
+  )
+*/
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        space_cadet_key_pressed_flag = true;
+    }
+    switch (keycode) {
+        case MACRO_CTRL_PAGE_UP:
+            if (record->event.pressed) {
+                // send some data
+                SEND_STRING(SS_LCTL(SS_TAP(X_PGUP)));
+            } else {
+                // when keycode MACRO_CTRL_PAGE_UP is pressed
+            }
+            break;
+
+            // These next two cases duplicate mod-tap functionality by hand to
+            // work around the lack of support for shifted/modded keys as
+            // "tap" side of things.
+        case KC_MT_LCBRC:
+            if (record->event.pressed) {
+                space_cadet_control_timer    = timer_read();
+                space_cadet_key_pressed_flag = false;
+                register_mods(MOD_BIT(KC_LGUI));
+            } else {
+                unregister_mods(MOD_BIT(KC_LGUI));
+                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
+                    tap_code16(LSFT(KC_LBRC));
+                }
+            }
+            return false;
+            break;
+        case KC_MT_RCBRC:
+            if (record->event.pressed) {
+                space_cadet_control_timer    = timer_read();
+                space_cadet_key_pressed_flag = false;
+                register_mods(MOD_BIT(KC_LALT));
+            } else {
+                unregister_mods(MOD_BIT(KC_LALT));
+                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
+                    tap_code16(LSFT(KC_RBRC));
+                }
+            }
+            return false;
+            break;
+        case KC_MT_LPAR:
+            if (record->event.pressed) {
+                space_cadet_control_timer    = timer_read();
+                space_cadet_key_pressed_flag = false;
+                register_mods(MOD_BIT(KC_LSFT));
+            } else {
+                unregister_mods(MOD_BIT(KC_LSFT));
+                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
+                    tap_code16(LSFT(KC_9));
+                }
+            }
+            return false;
+            break;
+        case KC_MT_RPAR:
+            if (record->event.pressed) {
+                space_cadet_control_timer    = timer_read();
+                space_cadet_key_pressed_flag = false;
+                register_mods(MOD_BIT(KC_RSFT));
+            } else {
+                unregister_mods(MOD_BIT(KC_RSFT));
+                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
+                    tap_code16(LSFT(KC_0));
+                }
+            }
+            return false;
+            break;
+        case MACRO_KVM_1:
+            if (record->event.pressed) {
+                tap_code(KC_SCRL);
+                tap_code(KC_SCRL);
+                tap_code(KC_1);
+            }
+            break;
+        case MACRO_KVM_2:
+            if (record->event.pressed) {
+                tap_code(KC_SCRL);
+                tap_code(KC_SCRL);
+                tap_code(KC_2);
+            }
+            break;
+        case MACRO_KVM_3:
+            if (record->event.pressed) {
+                tap_code(KC_SCRL);
+                tap_code(KC_SCRL);
+                tap_code(KC_3);
+            }
+            break;
+        case MACRO_KVM_4:
+            if (record->event.pressed) {
+                tap_code(KC_SCRL);
+                tap_code(KC_SCRL);
+                tap_code(KC_4);
+            }
+            break;
+        case MACRO_KVM_TG:
+            if (record->event.pressed) {
+                register_code(KC_LSFT);
+                tap_code(KC_NUMLOCK);
+                tap_code(KC_NUMLOCK);
+                unregister_code(KC_LSFT);
+                tap_code(KC_LCTL);
+            }
+            break;
+    }
+    return true;
+};
+
+/* vim: set ts=2 sw=2 et: */
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/readme.md b/keyboards/keyboardio/model01/keymaps/pugmajere/readme.md
new file mode 100644
index 0000000000..a985158c5b
--- /dev/null
+++ b/keyboards/keyboardio/model01/keymaps/pugmajere/readme.md
@@ -0,0 +1,20 @@
+# pugmajere's fairly modified version of the default keymap
+
+This is fairly modified, but roughly follows the original default
+keymap in spirit.
+
+- The num lock layer is removed.
+- The "any" key is replace with RALT.
+- The thumb keys are converted into combo keys.
+- Page-Up is a combo key with LCTRL.
+- The NUMLOCK key is replaced with LCTRL-PGUP (for bouncing through
+  browser tabs)
+- Mouse scroll keys are added.
+- Some KVM control sequences are worked into a few open slots in the
+  keymap. (FN-[tgb])
+- QMK-standard debouncing is enabled.
+- A bunch of RGB Matrix modes are turned off to save space.
+
+Quite possibly something else that I'm forgetting about.
+
+
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/rules.mk b/keyboards/keyboardio/model01/keymaps/pugmajere/rules.mk
new file mode 100644
index 0000000000..4db69c92e2
--- /dev/null
+++ b/keyboards/keyboardio/model01/keymaps/pugmajere/rules.mk
@@ -0,0 +1 @@
+DEBOUNCE_TYPE = sym_defer_pk

From a25e5ce1b3bc16e0846bc7c328e2d29561c7d849 Mon Sep 17 00:00:00 2001
From: adophoxia <100170946+adophoxia@users.noreply.github.com>
Date: Tue, 8 Nov 2022 08:21:51 -0800
Subject: [PATCH 818/959] [Keyboard] Add ISO Encoder variant of Keychron Q1v1
 (#18829)

---
 keyboards/keychron/q1/config.h                |  14 +-
 keyboards/keychron/q1/iso_encoder/config.h    |  41 +++++
 keyboards/keychron/q1/iso_encoder/info.json   | 105 ++++++++++++
 .../keychron/q1/iso_encoder/iso_encoder.c     | 150 ++++++++++++++++++
 .../keychron/q1/iso_encoder/iso_encoder.h     |  19 +++
 .../q1/iso_encoder/keymaps/default/keymap.c   |  68 ++++++++
 .../q1/iso_encoder/keymaps/default/rules.mk   |   1 +
 .../q1/iso_encoder/keymaps/keychron/keymap.c  |  78 +++++++++
 .../q1/iso_encoder/keymaps/keychron/rules.mk  |   5 +
 .../q1/iso_encoder/keymaps/via/keymap.c       |  69 ++++++++
 .../q1/iso_encoder/keymaps/via/rules.mk       |   2 +
 keyboards/keychron/q1/iso_encoder/readme.md   |   5 +
 keyboards/keychron/q1/iso_encoder/rules.mk    |  25 +++
 keyboards/keychron/q1/q1.h                    |   2 +
 14 files changed, 572 insertions(+), 12 deletions(-)
 create mode 100644 keyboards/keychron/q1/iso_encoder/config.h
 create mode 100644 keyboards/keychron/q1/iso_encoder/info.json
 create mode 100644 keyboards/keychron/q1/iso_encoder/iso_encoder.c
 create mode 100644 keyboards/keychron/q1/iso_encoder/iso_encoder.h
 create mode 100644 keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q1/iso_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q1/iso_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q1/iso_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q1/iso_encoder/readme.md
 create mode 100644 keyboards/keychron/q1/iso_encoder/rules.mk

diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index cda8799a79..50a5b70cc3 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -37,17 +37,9 @@
 /* Disable DIP switch in matrix data */
 #define MATRIX_MASKED
 
-/* NKRO */
-#define FORCE_NKRO
-
 /* Disable RGB lighting when PC is in suspend */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
-/* Allow VIA to edit lighting */
-#ifdef VIA_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
-#endif
-
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -97,7 +89,5 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-/* Allow VIA to edit lighting */
-#ifdef VIA_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
-#endif
+// #define RGB_MATRIX_KEYPRESSES
+// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/config.h b/keyboards/keychron/q1/iso_encoder/config.h
new file mode 100644
index 0000000000..089ea19973
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/config.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID  { {0,1} }
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_ADDR_2 0b1011111
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 59
+#define DRIVER_2_LED_TOTAL 24
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { E6 }
+#define ENCODERS_PAD_B { B7 }
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 44
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
new file mode 100644
index 0000000000..fc5dc7abc4
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "Keychron Q1",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0103",
+        "device_version": "1.0.2"
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 2], "x":1.25, "y":0},
+                {"matrix":[0, 3], "x":2.25, "y":0},
+                {"matrix":[0, 4], "x":3.25, "y":0},
+                {"matrix":[0, 5], "x":4.25, "y":0},
+                {"matrix":[0, 6], "x":5.5, "y":0},
+                {"matrix":[0, 7], "x":6.5, "y":0},
+                {"matrix":[0, 8], "x":7.5, "y":0},
+                {"matrix":[0, 9], "x":8.5, "y":0},
+                {"matrix":[0,10], "x":9.75, "y":0},
+                {"matrix":[0,11], "x":10.75, "y":0},
+                {"matrix":[0,12], "x":11.75, "y":0},
+                {"matrix":[0,13], "x":12.75, "y":0},
+                {"matrix":[4,14], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,14], "x":15.25, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[3,12], "x":14.25, "y":4.5},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[4,12], "x":14.25, "y":5.5},
+                {"matrix":[5,14], "x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
new file mode 100644
index 0000000000..0106084973
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
@@ -0,0 +1,150 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iso_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, 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, 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, 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, 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},
+
+    {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, 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}
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        { 0,  __, 1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 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, 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},                     {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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
+        9, 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
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.h b/keyboards/keychron/q1/iso_encoder/iso_encoder.h
new file mode 100644
index 0000000000..d62d707b4a
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..840db80a5b
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD ,                               KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,            KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..d78878d5e9
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..2d17902f98
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..052fe8c58a
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD ,                               KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,            KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..4253f570f0
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/readme.md b/keyboards/keychron/q1/iso_encoder/readme.md
new file mode 100644
index 0000000000..66db24a197
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ISO variant of the Keychron Q1
+
+- Enables EC11 rotary encoder.
+- Turn clockwise to increase volume and turn counter-clockwise to decrease volume.
+- Press top right button to mute.
diff --git a/keyboards/keychron/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk
new file mode 100644
index 0000000000..1dce5c5390
--- /dev/null
+++ b/keyboards/keychron/q1/iso_encoder/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3733
+RAW_ENABLE = yes
+LTO_ENABLE = yes
+
diff --git a/keyboards/keychron/q1/q1.h b/keyboards/keychron/q1/q1.h
index cf6d196213..393eeb7fb2 100644
--- a/keyboards/keychron/q1/q1.h
+++ b/keyboards/keychron/q1/q1.h
@@ -24,4 +24,6 @@
 #    include "rev_0101.h"
 #elif defined(KEYBOARD_keychron_q1_rev_0102)
 #    include "rev_0102.h"
+#elif defined(KEYBOARD_keychron_q1_iso_encoder)
+#    include "iso_encoder.h"
 #endif

From 421448cd4108b973d9a55c94f241ee0ec7ef0f09 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Tue, 8 Nov 2022 23:22:38 +0700
Subject: [PATCH 819/959] [Keyboard] Refactor chinese PCB folder (#18923)

---
 .../chinese_pcb/black_e65/config.h            |  6 +-
 .../chinese_pcb/black_e65/info.json           |  2 +-
 .../black_e65/keymaps/default/keymap.c        |  4 +-
 .../black_e65/keymaps/via/keymap.c            |  4 +-
 .../chinese_pcb/black_e65/readme.md           |  5 +-
 .../chinese_pcb/devil68_pro/config.h          | 17 +++--
 .../chinese_pcb/devil68_pro/info.json         |  2 +-
 .../devil68_pro/keymaps/default/keymap.c      | 74 ++++---------------
 .../devil68_pro/keymaps/default/readme.md     |  3 -
 .../devil68_pro/keymaps/via/config.h          |  6 +-
 .../devil68_pro/keymaps/via/keymap.c          | 74 ++++---------------
 .../devil68_pro/keymaps/via/readme.md         |  3 -
 .../chinese_pcb/devil68_pro/readme.md         |  7 +-
 keyboards/horrortroll/chinese_pcb/readme.md   | 14 ----
 keyboards/horrortroll/readme.md               | 46 ++++++------
 15 files changed, 81 insertions(+), 186 deletions(-)
 delete mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md
 delete mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md
 delete mode 100644 keyboards/horrortroll/chinese_pcb/readme.md

diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index 28f0aa4756..6ee3311f22 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 
 #include "config_common.h"
 
-/* key matrix size */
+/* Key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* key matrix pins */
+/* Key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
 
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index f08cdf109f..59d3f70aef 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
@@ -5,7 +5,7 @@
     "maintainer": "HorrorTroll",
     "usb": {
         "vid": "0x7516",
-        "pid": "0x6003",
+        "pid": "0x7000",
         "device_version": "0.0.1"
     },
     "layouts": {
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
index 064eaaefd6..a4ba3656ef 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c
@@ -54,13 +54,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15      */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_BASE] = LAYOUT_all(
                 KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
                 KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
                 KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN,
                 KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(_FN),
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
             ),
 
 /*
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
index 66ea1efa24..49b066a369 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c
@@ -56,13 +56,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15      */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_BASE] = LAYOUT_all(
                 KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
                 KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
                 KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN,
                 KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(_FN),
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
             ),
 
 /*
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/readme.md b/keyboards/horrortroll/chinese_pcb/black_e65/readme.md
index 47abcdd928..e2f96e6da8 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/readme.md
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/readme.md
@@ -1,9 +1,10 @@
 # Black E6.5
 
-A chinese PCB clone of Exclusive E6.5.
+A Exclusive E6.5 clone keyboard made by Chinese maker, which controlled by an ATMEGA32U4 chipset. The keyboard features per-key backlight, RGB underglow.
 
 * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
-* Hardware Supported: Atmega32u4
+* Hardware Supported: ATMEGA32U4
+* Hardware Availability: Unknown
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index 8a227f3c49..d04e480043 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,16 +18,16 @@
 
 #include "config_common.h"
 
-/* key matrix size */
+/* Key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
 
-/* key matrix pins */
+/* Key matrix pins */
 #define MATRIX_ROW_PINS { B7, B3, B2, F6, F7 }
 #define MATRIX_COL_PINS { B1, B0, B5, B6, C6, C7, E2, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
 
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 6
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
@@ -43,6 +43,7 @@
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
     /* RGB Matrix config */
     #define RGB_DI_PIN E6
@@ -75,8 +76,12 @@
     #define ENABLE_RGB_MATRIX_HUE_PENDULUM
     #define ENABLE_RGB_MATRIX_HUE_WAVE
     #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+    #define ENABLE_RGB_MATRIX_PIXEL_FLOW
     #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+
+    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index ff541f7ef2..36f776b62c 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -5,7 +5,7 @@
     "maintainer": "HorrorTroll",
     "usb": {
         "vid": "0x7516",
-        "pid": "0x6001",
+        "pid": "0x7001",
         "device_version": "0.0.1"
     },
     "layouts": {
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
index 3a91494536..8030dc393d 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,26 +27,10 @@
 // entirely and just use numbers.
 
 enum layer_names {
-    _BASE = 0,
-    _FN = 1
+    _BASE,
+    _FN,
 };
 
-enum user_rgb_mode {
-    RGB_MODE_ALL,
-    RGB_MODE_KEYLIGHT,
-    RGB_MODE_UNDERGLOW,
-    RGB_MODE_NONE,
-};
-
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t rgb_mode :8;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
 // enum layer_keycodes { };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -75,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4     5     6       7     8     9        10       11       12       13       14       15     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_BASE] = LAYOUT_65_ansi(
-                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
-                KC_TAB,           KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-                KC_CAPS,          KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
-                         KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
-                KC_LCTL, KC_LGUI,          KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
+                KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+                KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+                         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
             ),
 
 /*
@@ -97,38 +81,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │App│Spd│Vad│Spi│
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_FN]   = LAYOUT_65_ansi(
-                _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, QK_BOOT,
-                _______,          _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD,
-                _______,          KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME,
-                         _______, _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END,
-                _______, _______,          _______,                    _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI
+                _______, 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_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD,
+                _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME,
+                         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END,
+                _______, _______,          _______,                   _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI
             ),
 };
 
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-    switch (user_config.rgb_mode) {
-        case RGB_MODE_ALL:
-            rgb_matrix_set_flags(LED_FLAG_ALL);
-            rgb_matrix_enable_noeeprom();
-            break;
-        case RGB_MODE_KEYLIGHT:
-            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-        case RGB_MODE_UNDERGLOW:
-            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-        case RGB_MODE_NONE:
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-    }
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case RGB_TOG:
@@ -137,33 +99,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     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);
-                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
                     }
                     break;
                     case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
                         rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                         rgb_matrix_set_color_all(0, 0, 0);
-                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
                     }
                     break;
                     case (LED_FLAG_UNDERGLOW): {
                         rgb_matrix_set_flags(LED_FLAG_NONE);
                         rgb_matrix_set_color_all(0, 0, 0);
-                        user_config.rgb_mode = RGB_MODE_NONE;
                     }
                     break;
                     default: {
                         rgb_matrix_set_flags(LED_FLAG_ALL);
                         rgb_matrix_enable_noeeprom();
-                        user_config.rgb_mode = RGB_MODE_ALL;
                     }
                     break;
                 }
-                eeconfig_update_user(user_config.raw);
             }
             return false;
 	}
-
     return true;
 }
 
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md
deleted file mode 100644
index 820d3551c3..0000000000
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default Layout
-
-Keymap is default 68 qwerty, 65% layout
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h
index fe6aa8c1f7..4a9ae9bdc2 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,3 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
-#ifdef RGB_MATRIX_ENABLE
-    #define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
index 3a91494536..8030dc393d 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,26 +27,10 @@
 // entirely and just use numbers.
 
 enum layer_names {
-    _BASE = 0,
-    _FN = 1
+    _BASE,
+    _FN,
 };
 
-enum user_rgb_mode {
-    RGB_MODE_ALL,
-    RGB_MODE_KEYLIGHT,
-    RGB_MODE_UNDERGLOW,
-    RGB_MODE_NONE,
-};
-
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t rgb_mode :8;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
 // enum layer_keycodes { };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -75,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │   │   │   │   │
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4     5     6       7     8     9        10       11       12       13       14       15     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_BASE] = LAYOUT_65_ansi(
-                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
-                KC_TAB,           KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-                KC_CAPS,          KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
-                         KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
-                KC_LCTL, KC_LGUI,          KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
+                KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+                KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+                         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
             ),
 
 /*
@@ -97,38 +81,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │   │   │App│Spd│Vad│Spi│
        └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
     [_FN]   = LAYOUT_65_ansi(
-                _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, QK_BOOT,
-                _______,          _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD,
-                _______,          KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME,
-                         _______, _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END,
-                _______, _______,          _______,                    _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI
+                _______, 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_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD,
+                _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME,
+                         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END,
+                _______, _______,          _______,                   _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI
             ),
 };
 
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-    switch (user_config.rgb_mode) {
-        case RGB_MODE_ALL:
-            rgb_matrix_set_flags(LED_FLAG_ALL);
-            rgb_matrix_enable_noeeprom();
-            break;
-        case RGB_MODE_KEYLIGHT:
-            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-        case RGB_MODE_UNDERGLOW:
-            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-        case RGB_MODE_NONE:
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-    }
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case RGB_TOG:
@@ -137,33 +99,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     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);
-                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
                     }
                     break;
                     case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
                         rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                         rgb_matrix_set_color_all(0, 0, 0);
-                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
                     }
                     break;
                     case (LED_FLAG_UNDERGLOW): {
                         rgb_matrix_set_flags(LED_FLAG_NONE);
                         rgb_matrix_set_color_all(0, 0, 0);
-                        user_config.rgb_mode = RGB_MODE_NONE;
                     }
                     break;
                     default: {
                         rgb_matrix_set_flags(LED_FLAG_ALL);
                         rgb_matrix_enable_noeeprom();
-                        user_config.rgb_mode = RGB_MODE_ALL;
                     }
                     break;
                 }
-                eeconfig_update_user(user_config.raw);
             }
             return false;
 	}
-
     return true;
 }
 
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md
deleted file mode 100644
index af924c17b7..0000000000
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default Layout with VIA
-
-Keymap is default 68 qwerty, 65% layout
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md
index 0d486832b3..78cc43e74f 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md
@@ -1,9 +1,10 @@
 # Devil68 Pro
 
-Support Atmega32u4 keyboard.
+A 65% keyboard made by Chinese maker, which controlled by an ATMEGA32U4 chipset. The keyboard features per-key RGB, RGB underglow.
 
 * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
-* Hardware Supported: Atmega32u4
+* Hardware Supported: ATMEGA32U4
+* Hardware Availability: Unknown
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -19,6 +20,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 Enter the bootloader in 3 ways:
 
-* **Bootmagic reset**: Hold down the key at (3,6) in the matrix (B key) and plug in the keyboard
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
 * **Reset by wire**: Using a wire, 1 head to GND hole and other one to Reset pin on MCU
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/horrortroll/chinese_pcb/readme.md b/keyboards/horrortroll/chinese_pcb/readme.md
deleted file mode 100644
index cb73d8a43b..0000000000
--- a/keyboards/horrortroll/chinese_pcb/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# A folder for some Chinese PCB without source code
-
-This is a folder for collection code of Chinese PCB, where they only sold one-time limited on Taobao and no source code or contact info of Maker. Everything was re-write by using multimeter and sometimes with ISP/ICP flashing!
-
-## List for those keyboard in here:
-<details>
-  <summary>Click to expand!</summary>
-
-  | Keyboard name | MCU           | Layout        | Hotswap | LED                      | OLED | Other |
-  | ------------- | ------------- | ------------- | ------- | ------------------------ | ---- | ----- |
-  | Black E6.5    | Atmega32U4    | 68 Keys (65%) | No      | Backlight & RGB Lighting | No   | No    |
-  | Devil68 Pro   | Atmega32U4    | 68 Keys (65%) | Yes     | RGB Matrix               | No   | No    |
-  |               |               |               |         |                          |      |       |
-</details>
diff --git a/keyboards/horrortroll/readme.md b/keyboards/horrortroll/readme.md
index 45e4510b6d..4da9469544 100644
--- a/keyboards/horrortroll/readme.md
+++ b/keyboards/horrortroll/readme.md
@@ -1,32 +1,32 @@
-# Welcome to my keyboard folder
+# Welcome to my Keyboard Firmwares
 
-In here, you can find:
-- Chinese PCB that doesn't have source code (lost contact of Maker, can't found on Taobao, ... etc)
-- My keyboard
+## Keyboards Released by me:
+  | Keyboard name    | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
+  | ---------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- |
+  | Handwired K552   | STM32F103RCT6 | TKL          | 0x7516    | 0x5000     | Hotswap, RGB Underglow, OLED 128x32          |
+  | Paws 60          | ATMEGA32U4    | 60%          | 0x7516    | 0x5001     | Hotswap                                      |
 
-## List for my keyboard in here:
-<details>
-  <summary>Click to expand!</summary>
+## Keyboards Completed has Collaboration with me:
+  | Keyboard name    | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
+  | ---------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- |
+  | Lemon40          | ATMEGA32U4    | 40% Alice    | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32           |
 
-  | Keyboard name  | MCU           | Layout        | Hotswap | LED          | OLED | Other |
-  | -------------- | ------------- | ------------- | ------- | ------------ | ---- | ----- |
-  | Handwired K552 | STM32F103RCT6 | 87 Keys (TKL) | Yes     | RGB Lighting | Yes  | No    |
-  | Paws 60        | Atmega32U4    | 68 Keys (65%) | Yes     | No           | No   | No    |
-  |                |               |               |         |              |      |       |
-</details>
+## Keyboard Rewrited by me:
+  | Keyboard name                                                                               | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
+  | ------------------------------------------------------------------------------------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- |
+  | Black E6.5                                                                                  | ATMEGA32U4    | 65%          | 0x7516    | 0x7000     | Solder, Backlight, RGB Underglow             |
+  | Devil68 Pro                                                                                 | ATMEGA32U4    | 65%          | 0x7516    | 0x7001     | Hotswap, RGB Matrix & Underglow              |
+  | [IK75](https://github.com/qmk/qmk_firmware/blob/master/keyboards/feker/ik75)                | ATMEGA32U4    | 75% Exploded | 0xF2E7    | 0x1226     | Hotswap, RGB Matrix & Underglow, 1 Encoder   |
+  | [Gas75](https://github.com/qmk/qmk_firmware/blob/master/keyboards/ml/gas75)                 | ATMEGA32U4    | 75% Exploded | 0xC0B0    | 0x6060     | Hotswap, RGB Matrix, 1 Encoder               |
+  | [GG86](https://github.com/qmk/qmk_firmware/tree/master/keyboards/gopolar/gg86)              | ATMEGA32U4    | TKL          | 0x0007    | 0x0007     | Hotswap, RGB Matrix & Underglow, OLED 128x32 |
+  | [KB16-01 (Rev 1)](https://github.com/qmk/qmk_firmware/tree/master/keyboards/doio/kb16/rev1) | ATMEGA32U4    | TKL          | 0xD010    | 0x1601     | Hotswap, RGB Matrix, 3 Encoder, OLED 128x32  |
+  | [KB16-01 (Rev 2)](https://github.com/qmk/qmk_firmware/tree/master/keyboards/doio/kb16/rev2) | APM32F103CBT6 | TKL          | 0xD010    | 0x1601     | Hotswap, RGB Matrix, 3 Encoder, OLED 128x32  |
+  | [M63 RGB](https://github.com/qmk/qmk_firmware/blob/master/keyboards/mss_studio/m63_rgb)     | STM32F072CBU6 | 60%          | 0x4D4B    | 0x6063     | Hotswap, RGB Matrix & Underglow              |
+  | [M64 RGB](https://github.com/qmk/qmk_firmware/blob/master/keyboards/mss_studio/m64_rgb)     | STM32F072CBU6 | 60%          | 0x4D4B    | 0x6064     | Hotswap, RGB Matrix & Underglow              |
 
-## List for my collab keyboard in here:
-<details>
-  <summary>Click to expand!</summary>
-
-  | Keyboard name  | MCU           | Layout              | Hotswap | LED          | OLED | Other |
-  | -------------- | ------------- | ------------------- | ------- | ------------ | ---- | ----- |
-  | Lemon40        | Atmega32U4    | 47 Keys (40% Alice) | No      | RGB Lighting | Yes  | No    |
-  |                |               |                     |         |              |      |       |
-</details>
 
 ## Contact me if you have any problem
 
 **Discord:** HorrorTroll#0975  
 **Facebook:** https://www.facebook.com/PhamChonChe.Duc/  
-**Email:** sonicvipduc@gmail.com
+**Email:** sonicvipduc@gmail.com
\ No newline at end of file

From 011355006664b8b804c740d81c7eb04b39e08c2c Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@klaviyo.com>
Date: Tue, 8 Nov 2022 11:23:37 -0500
Subject: [PATCH 820/959] [Keyboard] Add Brutal v2 1800 PCB to QMK (#18891)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cannonkeys/brutalv2_1800/config.h   |  25 +++
 keyboards/cannonkeys/brutalv2_1800/info.json  | 142 ++++++++++++++++++
 .../brutalv2_1800/keymaps/default/keymap.c    |  48 ++++++
 .../brutalv2_1800/keymaps/via/keymap.c        |  58 +++++++
 .../brutalv2_1800/keymaps/via/rules.mk        |   1 +
 keyboards/cannonkeys/brutalv2_1800/readme.md  |  22 +++
 keyboards/cannonkeys/brutalv2_1800/rules.mk   |   2 +
 7 files changed, 298 insertions(+)
 create mode 100644 keyboards/cannonkeys/brutalv2_1800/config.h
 create mode 100644 keyboards/cannonkeys/brutalv2_1800/info.json
 create mode 100644 keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/brutalv2_1800/readme.md
 create mode 100644 keyboards/cannonkeys/brutalv2_1800/rules.mk

diff --git a/keyboards/cannonkeys/brutalv2_1800/config.h b/keyboards/cannonkeys/brutalv2_1800/config.h
new file mode 100644
index 0000000000..9ac66b5624
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_1800/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2015 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
+
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json
new file mode 100644
index 0000000000..cbb19b3b3f
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_1800/info.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "Brutal v2 1800",
+    "maintainer": "awkannan",
+    "manufacturer": "CannonKeys",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0xCA04",
+        "pid": "0x000D",
+        "device_version": "0.0.1"
+    },
+    "url": "https://cannonkeys.com",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP9", "GP6", "GP5", "GP4", "GP3"],
+        "rows": ["GP13", "GP12", "GP11", "GP10", "GP8", "GP7"]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+    },
+    "indicators": {
+        "caps_lock": "GP29",
+        "num_lock": "GP2",
+        "on_state": 0
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk",
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
+                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
+                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
+                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
+                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
+                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
+                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
+                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
+                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
+                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
+                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
+                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
+                { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
+                { "matrix": [0, 14], "x": 15.5, "y": 0.0 },
+                { "matrix": [0, 15], "x": 16.5, "y": 0.0 },
+                { "matrix": [0, 16], "x": 17.5, "y": 0.0 },
+                { "matrix": [0, 17], "x": 18.5, "y": 0.0 },
+                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
+                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
+                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
+                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
+                { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+                { "label": "Insert", "matrix": [1, 14], "x": 15.5, "y": 1.25 },
+                { "label": "Home", "matrix": [1, 15], "x": 16.5, "y": 1.25 },
+                { "label": "PgUp", "matrix": [1, 16], "x": 17.5, "y": 1.25 },
+                { "matrix": [1, 17], "x": 18.5, "y": 1.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "label": "Delete", "matrix": [2, 14], "x": 15.5, "y": 2.25 },
+                { "label": "End", "matrix": [2, 15], "x": 16.5, "y": 2.25 },
+                { "label": "PgDn", "matrix": [2, 16], "x": 17.5, "y": 2.25 },
+                { "matrix": [2, 17], "x": 18.5, "y": 2.25 },
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
+                { "matrix": [3, 14], "x": 15.5, "y": 3.25 },
+                { "matrix": [3, 15], "x": 16.5, "y": 3.25 },
+                { "matrix": [3, 16], "x": 17.5, "y": 3.25 },
+                { "matrix": [3, 17], "x": 18.5, "y": 3.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "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], "w": 1.75, "x": 12.25, "y": 4.25 },
+                { "label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.25 },
+                { "matrix": [4, 14], "x": 15.5, "y": 4.25 },
+                { "matrix": [4, 15], "x": 16.5, "y": 4.25 },
+                { "matrix": [4, 16], "x": 17.5, "y": 4.25 },
+                { "matrix": [4, 17], "x": 18.5, "y": 4.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
+                { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10.0, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.25 },
+                { "label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.25 },
+                { "label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.25 },
+                { "label": "\u2192", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+                { "matrix": [5, 15], "x": 16.5, "y": 5.25 },
+                { "matrix": [5, 16], "x": 17.5, "y": 5.25 },
+                { "matrix": [5, 17], "x": 18.5, "y": 5.25 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c b/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c
new file mode 100644
index 0000000000..78607d6a60
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_BASE] = LAYOUT_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_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_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_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [_FN1] = LAYOUT_all(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,
+		BL_INC, BL_DEC, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		KC_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/cannonkeys/brutalv2_1800/keymaps/via/keymap.c b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c
new file mode 100644
index 0000000000..7b3aecc4e0
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_BASE] = LAYOUT_all(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_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_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_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [_FN1] = LAYOUT_all(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,
+		BL_INC, BL_DEC, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		KC_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_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/brutalv2_1800/readme.md b/keyboards/cannonkeys/brutalv2_1800/readme.md
new file mode 100644
index 0000000000..971454e9ca
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_1800/readme.md
@@ -0,0 +1,22 @@
+# Brutal v2 1800
+
+Brutal v2 1800 Keyboard
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: RP2040
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/brutalv2_1800: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 "Rcovery" 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/brutalv2_1800/rules.mk b/keyboards/cannonkeys/brutalv2_1800/rules.mk
new file mode 100644
index 0000000000..59f8593f18
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_1800/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = rp2040_flash

From d810878d5e36e032ec99fb309b66caf3ea57e4ba Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 9 Nov 2022 06:03:31 +1100
Subject: [PATCH 821/959] Normalise output selection (Bluetooth) keycodes
 (#19004)

---
 .../keycodes/keycodes_0.0.1_quantum.hjson         | 15 ++++++++++++---
 docs/feature_bluetooth.md                         | 10 +++++-----
 docs/keycodes.md                                  | 10 +++++-----
 keyboards/atreus/keymaps/clash/keymap.c           |  8 ++++----
 .../dtisaac/dosa40rgb/keymaps/default/keymap.c    |  2 +-
 keyboards/handwired/42/keymaps/default/keymap.c   |  2 +-
 .../handwired/bdn9_ble/keymaps/default/keymap.c   |  6 +++---
 .../hacked_motospeed/keymaps/german/keymap.c      |  2 +-
 .../hacked_motospeed/keymaps/german/layers.json   |  2 +-
 .../handwired/promethium/keymaps/default/keymap.c |  7 ++-----
 .../handwired/promethium/keymaps/priyadi/keymap.c |  7 ++-----
 .../latin47ble/keymaps/default/keymap.c           |  8 ++++----
 .../latincompass/latin47ble/keymaps/via/keymap.c  |  8 ++++----
 keyboards/signum/3_0/keymaps/default/layout.py    |  2 +-
 keyboards/woodkeys/meira/keymaps/cole/keymap.c    |  7 +------
 layouts/community/ortho_5x15/wanleg/keymap.c      |  2 +-
 quantum/keycodes.h                                |  9 ++++++---
 quantum/quantum.c                                 |  6 +++---
 .../miryoku_babel/miryoku_layer_alternatives.h    | 10 +++++-----
 19 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
index a4b60cfc61..a623bd678d 100644
--- a/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
+++ b/data/constants/keycodes/keycodes_0.0.1_quantum.hjson
@@ -144,15 +144,24 @@
 
         "0x7C20": {
             "group": "quantum",
-            "key": "OUT_AUTO"
+            "key": "QK_OUTPUT_AUTO",
+            "aliases": [
+                "OU_AUTO"
+            ]
         },
         "0x7C21": {
             "group": "quantum",
-            "key": "OUT_USB"
+            "key": "QK_OUTPUT_USB",
+            "aliases": [
+                "OU_USB"
+            ]
         },
         "0x7C22": {
             "group": "quantum",
-            "key": "OUT_BT"
+            "key": "QK_OUTPUT_BLUETOOTH",
+            "aliases": [
+                "OU_BT"
+            ]
         },
 
         "0x7C30": {
diff --git a/docs/feature_bluetooth.md b/docs/feature_bluetooth.md
index d4ed494053..f7ded84d86 100644
--- a/docs/feature_bluetooth.md
+++ b/docs/feature_bluetooth.md
@@ -39,8 +39,8 @@ BLUETOOTH_DRIVER = BluefruitLE # or RN42
 
 This is used when multiple keyboard outputs can be selected. Currently this only allows for switching between USB and Bluetooth on keyboards that support both.
 
-|Name      |Description                                   |
-|----------|----------------------------------------------|
-|`OUT_AUTO`|Automatically switch between USB and Bluetooth|
-|`OUT_USB` |USB only                                      |
-|`OUT_BT`  |Bluetooth only                                |
+|Key                  |Aliases  |Description                                   |
+|---------------------|---------|----------------------------------------------|
+|`QK_OUTPUT_AUTO`     |`OU_AUTO`|Automatically switch between USB and Bluetooth|
+|`QK_OUTPUT_USB`      |`OU_USB` |USB only                                      |
+|`QK_OUTPUT_BLUETOOTH`|`OU_BT`  |Bluetooth only                                |
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 6ec4e28978..79861ef3b8 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -292,11 +292,11 @@ See also: [Backlighting](feature_backlight.md)
 
 See also: [Bluetooth](feature_bluetooth.md)
 
-|Key       |Description                                   |
-|----------|----------------------------------------------|
-|`OUT_AUTO`|Automatically switch between USB and Bluetooth|
-|`OUT_USB` |USB only                                      |
-|`OUT_BT`  |Bluetooth only                                |
+|Key                  |Aliases  |Description                                   |
+|---------------------|---------|----------------------------------------------|
+|`QK_OUTPUT_AUTO`     |`OU_AUTO`|Automatically switch between USB and Bluetooth|
+|`QK_OUTPUT_USB`      |`OU_USB` |USB only                                      |
+|`QK_OUTPUT_BLUETOOTH`|`OU_BT`  |Bluetooth only                                |
 
 ## Caps Word :id=caps-word
 
diff --git a/keyboards/atreus/keymaps/clash/keymap.c b/keyboards/atreus/keymaps/clash/keymap.c
index 6e65f360d1..449f816f79 100644
--- a/keyboards/atreus/keymaps/clash/keymap.c
+++ b/keyboards/atreus/keymaps/clash/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * auto  voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
    */
   [_LW] = LAYOUT( /* [> LOWER <] */
-    KC_INS,   KC_HOME, KC_MS_U, KC_END,  KC_PGUP,                   KC_BTN1, KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
-    OUT_USB,  KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN,                   KC_BTN2, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-    OUT_BT,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_BTN3, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    OUT_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
+    KC_INS,  KC_HOME, KC_MS_U, KC_END,  KC_PGUP,                   KC_BTN1, KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
+    OU_USB,  KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN,                   KC_BTN2, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
+    OU_BT,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_BTN3, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
+    OU_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
 };
diff --git a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
index 9c27225bc2..92a10afc34 100644
--- a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
+++ b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_TRNS,         KC_TRNS,  KC_TRNS,   			  KC_TRNS,            KC_TRNS,   		  KC_TRNS,  KC_TRNS,  KC_TRNS
 	),
     [_L2] = LAYOUT(
-                 RGB_TOG,         RGB_RMOD, KC_UP,     RGB_MOD,   RGB_HUI,  RGB_VAI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  OUT_USB,  OUT_BT,  KC_TRNS,
+                 RGB_TOG,         RGB_RMOD, KC_UP,     RGB_MOD,   RGB_HUI,  RGB_VAI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  OU_USB,   OU_BT,   KC_TRNS,
                  KC_TRNS,         KC_LEFT,  KC_DOWN,   KC_RGHT,   RGB_HUD,  RGB_VAD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_BSLS,
                  KC_TRNS,         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
                  KC_TRNS,         KC_TRNS,  KC_TRNS,   			  KC_TAB,             KC_TRNS,  		  KC_TRNS,  KC_TRNS,  KC_TRNS
diff --git a/keyboards/handwired/42/keymaps/default/keymap.c b/keyboards/handwired/42/keymaps/default/keymap.c
index 099e1fa012..3c31ef89d1 100644
--- a/keyboards/handwired/42/keymaps/default/keymap.c
+++ b/keyboards/handwired/42/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,       KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_EQL ,
     KC_INS , S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5),       S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_MINS,
     KC_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, OUT_USB, OUT_BT ,       _______, _______, _______
+                               KC_CAPS, OU_USB , OU_BT  ,       _______, _______, _______
   ),
   // Navigation Layer
   LAYOUT(
diff --git a/keyboards/handwired/bdn9_ble/keymaps/default/keymap.c b/keyboards/handwired/bdn9_ble/keymaps/default/keymap.c
index 4c92dc3dd4..8fa53aec13 100644
--- a/keyboards/handwired/bdn9_ble/keymaps/default/keymap.c
+++ b/keyboards/handwired/bdn9_ble/keymaps/default/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ------------------------------------------------------------------------
      */
     [1] = LAYOUT(
-        _______, OUT_AUTO, QK_BOOT,
-        BL_STEP, OUT_USB, _______,
-        BL_TOGG, OUT_BT,  _______
+        _______, OU_AUTO, QK_BOOT,
+        BL_STEP, OU_USB,  _______,
+        BL_TOGG, OU_BT,   _______
     )
 };
diff --git a/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c b/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c
index d0e5c4260e..56e1084ed5 100644
--- a/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c
+++ b/keyboards/handwired/hacked_motospeed/keymaps/german/keymap.c
@@ -3,7 +3,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT(KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LSFT(KC_8), LSFT(KC_9), KC_PEQL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LSFT(KC_MINS), MO(2), MO(6), KC_TAB, KC_BSPC, KC_SPC, MO(1), KC_LCTL, KC_LALT, MO(4), KC_LGUI, MO(2)),
 [1] = LAYOUT(LALT(KC_F4), LSFT(KC_Q), LSFT(KC_W), LSFT(KC_E), LSFT(KC_R), LSFT(KC_T), LSFT(KC_Y), LSFT(KC_U), LSFT(KC_I), LSFT(KC_O), LSFT(KC_P), LSFT(KC_A), LSFT(KC_S), LSFT(KC_D), LSFT(KC_F), LSFT(KC_G), LSFT(KC_H), LSFT(KC_J), LSFT(KC_K), LSFT(KC_L), RALT(KC_7), RALT(KC_0), KC_NUHS, LSFT(KC_Z), LSFT(KC_X), LSFT(KC_C), LSFT(KC_V), LSFT(KC_B), LSFT(KC_N), LSFT(KC_M), LSFT(KC_COMM), LSFT(KC_DOT), LSFT(KC_1), MO(3), TG(6), LSFT(KC_TAB), KC_DEL, KC_ENT, KC_TRNS, LSFT(KC_LCTL), LSFT(KC_LALT), LSFT(KC_RALT), LSFT(KC_LGUI), MO(3)),
-[2] = LAYOUT(LSFT(KC_GRV), RALT(KC_Q), KC_INT3, RALT(KC_E), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), KC_LBRC, KC_UP, KC_SCLN, KC_PSCR, KC_QUOT, KC_MINS, LSFT(KC_7), LSFT(KC_2), LSFT(KC_NUHS), LSFT(KC_3), KC_LEFT, KC_DOWN, KC_RGHT, KC_NUBS, LSFT(KC_NUBS), RALT(KC_RBRC), KC_GRV, LSFT(KC_RBRC), KC_SLSH, KC_RBRC, RALT(KC_NUBS), KC_HOME, KC_PGDN, KC_PGUP, KC_END, RALT(KC_6), KC_TRNS, KC_CAPS, KC_TAB, KC_DEL, KC_ENT, MO(3), OUT_BT, OUT_USB, OUT_AUTO, BL_STEP, KC_TRNS),
+[2] = LAYOUT(LSFT(KC_GRV), RALT(KC_Q), KC_INT3, RALT(KC_E), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), KC_LBRC, KC_UP, KC_SCLN, KC_PSCR, KC_QUOT, KC_MINS, LSFT(KC_7), LSFT(KC_2), LSFT(KC_NUHS), LSFT(KC_3), KC_LEFT, KC_DOWN, KC_RGHT, KC_NUBS, LSFT(KC_NUBS), RALT(KC_RBRC), KC_GRV, LSFT(KC_RBRC), KC_SLSH, KC_RBRC, RALT(KC_NUBS), KC_HOME, KC_PGDN, KC_PGUP, KC_END, RALT(KC_6), KC_TRNS, KC_CAPS, KC_TAB, KC_DEL, KC_ENT, MO(3), OU_BT, OU_USB, OU_AUTO, BL_STEP, KC_TRNS),
 [3] = LAYOUT(LSFT(KC_GRV), RALT(KC_Q), KC_INT3, RALT(KC_E), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_LBRC), KC_UP, LSFT(KC_SCLN), KC_PSCR, LSFT(KC_QUOT), KC_MINS, RALT(KC_MINS), LSFT(KC_EQL), KC_EQL, LSFT(KC_3), KC_LEFT, KC_DOWN, KC_RGHT, RALT(KC_8), RALT(KC_9), RALT(KC_RBRC), KC_GRV, LSFT(KC_RBRC), LSFT(KC_SLSH), KC_RBRC, RALT(KC_NUBS), KC_HOME, KC_PGDN, KC_PGUP, KC_END, RALT(KC_6), KC_TRNS, KC_CAPS, LSFT(KC_TAB), LSFT(KC_DEL), LSFT(KC_ENT), KC_TRNS, RSFT(KC_RCTL), RSFT(KC_LALT), RSFT(KC_RALT), RSFT(KC_RGUI), KC_TRNS),
 [4] = LAYOUT(RALT(KC_ESC), RALT(KC_Q), RALT(KC_W), RALT(KC_E), RALT(KC_R), RALT(KC_T), RALT(KC_Y), RALT(KC_U), RALT(KC_I), RALT(KC_O), RALT(KC_P), RALT(KC_A), RALT(KC_S), RALT(KC_D), RALT(KC_F), RALT(KC_G), RALT(KC_H), RALT(KC_J), RALT(KC_K), RALT(KC_L), RALT(KC_8), RALT(KC_9), LSFT(KC_0), RALT(KC_Z), RALT(KC_X), RALT(KC_C), RALT(KC_V), RALT(KC_B), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), RALT(KC_6), KC_NO, RALT(KC_ENT), RALT(KC_TAB), RALT(KC_DEL), RALT(KC_SPC), RALT(KC_LSFT), RALT(KC_LCTL), RALT(KC_LALT), KC_TRNS, RALT(KC_LGUI), KC_NO),
 [5] = LAYOUT(KC_0, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_NO, KC_TRNS, KC_TAB, KC_BSPC, KC_SPC, KC_LSFT, KC_LCTL, KC_LALT, KC_RALT, KC_LGUI, KC_NO)
diff --git a/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json b/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json
index 56f3750ece..7bbd3cd438 100644
--- a/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json
+++ b/keyboards/handwired/hacked_motospeed/keymaps/german/layers.json
@@ -1 +1 @@
-[["KC_ESC", "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", "LSFT(KC_8)", "LSFT(KC_9)", "KC_PEQL", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "LSFT(KC_MINS)", "MO(2)", "MO(6)", "KC_TAB", "KC_BSPC", "KC_SPC", "MO(1)", "KC_LCTL", "KC_LALT", "MO(4)", "KC_LGUI", "MO(2)"], ["LALT(KC_F4)", "LSFT(KC_Q)", "LSFT(KC_W)", "LSFT(KC_E)", "LSFT(KC_R)", "LSFT(KC_T)", "LSFT(KC_Y)", "LSFT(KC_U)", "LSFT(KC_I)", "LSFT(KC_O)", "LSFT(KC_P)", "LSFT(KC_A)", "LSFT(KC_S)", "LSFT(KC_D)", "LSFT(KC_F)", "LSFT(KC_G)", "LSFT(KC_H)", "LSFT(KC_J)", "LSFT(KC_K)", "LSFT(KC_L)", "RALT(KC_7)", "RALT(KC_0)", "KC_NUHS", "LSFT(KC_Z)", "LSFT(KC_X)", "LSFT(KC_C)", "LSFT(KC_V)", "LSFT(KC_B)", "LSFT(KC_N)", "LSFT(KC_M)", "LSFT(KC_COMM)", "LSFT(KC_DOT)", "LSFT(KC_1)", "MO(3)", "TG(6)", "LSFT(KC_TAB)", "KC_DEL", "KC_ENT", "KC_TRNS", "LSFT(KC_LCTL)", "LSFT(KC_LALT)", "LSFT(KC_RALT)", "LSFT(KC_LGUI)", "MO(3)"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_INT3", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "KC_LBRC", "KC_UP", "KC_SCLN", "KC_PSCR", "KC_QUOT", "KC_MINS", "LSFT(KC_7)", "LSFT(KC_2)", "LSFT(KC_NUHS)", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NUBS", "LSFT(KC_NUBS)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "KC_SLSH", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "KC_TAB", "KC_DEL", "KC_ENT", "MO(3)", "OUT_BT", "OUT_USB", "OUT_AUTO", "BL_STEP", "KC_TRNS"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_INT3", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "LSFT(KC_LBRC)", "KC_UP", "LSFT(KC_SCLN)", "KC_PSCR", "LSFT(KC_QUOT)", "KC_MINS", "RALT(KC_MINS)", "LSFT(KC_EQL)", "KC_EQL", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "RALT(KC_8)", "RALT(KC_9)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "LSFT(KC_SLSH)", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "LSFT(KC_TAB)", "LSFT(KC_DEL)", "LSFT(KC_ENT)", "KC_TRNS", "RSFT(KC_RCTL)", "RSFT(KC_LALT)", "RSFT(KC_RALT)", "RSFT(KC_RGUI)", "KC_TRNS"], ["RALT(KC_ESC)", "RALT(KC_Q)", "RALT(KC_W)", "RALT(KC_E)", "RALT(KC_R)", "RALT(KC_T)", "RALT(KC_Y)", "RALT(KC_U)", "RALT(KC_I)", "RALT(KC_O)", "RALT(KC_P)", "RALT(KC_A)", "RALT(KC_S)", "RALT(KC_D)", "RALT(KC_F)", "RALT(KC_G)", "RALT(KC_H)", "RALT(KC_J)", "RALT(KC_K)", "RALT(KC_L)", "RALT(KC_8)", "RALT(KC_9)", "LSFT(KC_0)", "RALT(KC_Z)", "RALT(KC_X)", "RALT(KC_C)", "RALT(KC_V)", "RALT(KC_B)", "RALT(KC_N)", "RALT(KC_M)", "RALT(KC_COMM)", "RALT(KC_DOT)", "RALT(KC_6)", "KC_NO", "RALT(KC_ENT)", "RALT(KC_TAB)", "RALT(KC_DEL)", "RALT(KC_SPC)", "RALT(KC_LSFT)", "RALT(KC_LCTL)", "RALT(KC_LALT)", "KC_TRNS", "RALT(KC_LGUI)", "KC_NO"], ["KC_0", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_F11", "KC_F12", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_NO", "KC_TRNS", "KC_TAB", "KC_BSPC", "KC_SPC", "KC_LSFT", "KC_LCTL", "KC_LALT", "KC_RALT", "KC_LGUI", "KC_NO"]]
\ No newline at end of file
+[["KC_ESC", "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", "LSFT(KC_8)", "LSFT(KC_9)", "KC_PEQL", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "LSFT(KC_MINS)", "MO(2)", "MO(6)", "KC_TAB", "KC_BSPC", "KC_SPC", "MO(1)", "KC_LCTL", "KC_LALT", "MO(4)", "KC_LGUI", "MO(2)"], ["LALT(KC_F4)", "LSFT(KC_Q)", "LSFT(KC_W)", "LSFT(KC_E)", "LSFT(KC_R)", "LSFT(KC_T)", "LSFT(KC_Y)", "LSFT(KC_U)", "LSFT(KC_I)", "LSFT(KC_O)", "LSFT(KC_P)", "LSFT(KC_A)", "LSFT(KC_S)", "LSFT(KC_D)", "LSFT(KC_F)", "LSFT(KC_G)", "LSFT(KC_H)", "LSFT(KC_J)", "LSFT(KC_K)", "LSFT(KC_L)", "RALT(KC_7)", "RALT(KC_0)", "KC_NUHS", "LSFT(KC_Z)", "LSFT(KC_X)", "LSFT(KC_C)", "LSFT(KC_V)", "LSFT(KC_B)", "LSFT(KC_N)", "LSFT(KC_M)", "LSFT(KC_COMM)", "LSFT(KC_DOT)", "LSFT(KC_1)", "MO(3)", "TG(6)", "LSFT(KC_TAB)", "KC_DEL", "KC_ENT", "KC_TRNS", "LSFT(KC_LCTL)", "LSFT(KC_LALT)", "LSFT(KC_RALT)", "LSFT(KC_LGUI)", "MO(3)"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_INT3", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "KC_LBRC", "KC_UP", "KC_SCLN", "KC_PSCR", "KC_QUOT", "KC_MINS", "LSFT(KC_7)", "LSFT(KC_2)", "LSFT(KC_NUHS)", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_NUBS", "LSFT(KC_NUBS)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "KC_SLSH", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "KC_TAB", "KC_DEL", "KC_ENT", "MO(3)", "OU_BT", "OU_USB", "OU_AUTO", "BL_STEP", "KC_TRNS"], ["LSFT(KC_GRV)", "RALT(KC_Q)", "KC_INT3", "RALT(KC_E)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "LSFT(KC_LBRC)", "KC_UP", "LSFT(KC_SCLN)", "KC_PSCR", "LSFT(KC_QUOT)", "KC_MINS", "RALT(KC_MINS)", "LSFT(KC_EQL)", "KC_EQL", "LSFT(KC_3)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "RALT(KC_8)", "RALT(KC_9)", "RALT(KC_RBRC)", "KC_GRV", "LSFT(KC_RBRC)", "LSFT(KC_SLSH)", "KC_RBRC", "RALT(KC_NUBS)", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "RALT(KC_6)", "KC_TRNS", "KC_CAPS", "LSFT(KC_TAB)", "LSFT(KC_DEL)", "LSFT(KC_ENT)", "KC_TRNS", "RSFT(KC_RCTL)", "RSFT(KC_LALT)", "RSFT(KC_RALT)", "RSFT(KC_RGUI)", "KC_TRNS"], ["RALT(KC_ESC)", "RALT(KC_Q)", "RALT(KC_W)", "RALT(KC_E)", "RALT(KC_R)", "RALT(KC_T)", "RALT(KC_Y)", "RALT(KC_U)", "RALT(KC_I)", "RALT(KC_O)", "RALT(KC_P)", "RALT(KC_A)", "RALT(KC_S)", "RALT(KC_D)", "RALT(KC_F)", "RALT(KC_G)", "RALT(KC_H)", "RALT(KC_J)", "RALT(KC_K)", "RALT(KC_L)", "RALT(KC_8)", "RALT(KC_9)", "LSFT(KC_0)", "RALT(KC_Z)", "RALT(KC_X)", "RALT(KC_C)", "RALT(KC_V)", "RALT(KC_B)", "RALT(KC_N)", "RALT(KC_M)", "RALT(KC_COMM)", "RALT(KC_DOT)", "RALT(KC_6)", "KC_NO", "RALT(KC_ENT)", "RALT(KC_TAB)", "RALT(KC_DEL)", "RALT(KC_SPC)", "RALT(KC_LSFT)", "RALT(KC_LCTL)", "RALT(KC_LALT)", "KC_TRNS", "RALT(KC_LGUI)", "KC_NO"], ["KC_0", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_F11", "KC_F12", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_NO", "KC_TRNS", "KC_TAB", "KC_BSPC", "KC_SPC", "KC_LSFT", "KC_LCTL", "KC_LALT", "KC_RALT", "KC_LGUI", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index ff95655242..b72d54f175 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -136,9 +136,6 @@ enum planck_keycodes {
   // stub
 #ifndef FAUXCLICKY_ENABLE
   FC_TOG,
-#endif
-#ifndef BLUETOOTH_BLUEFRUIT_LE
-  OUT_BT,
 #endif
   RGBDEMO,
   KEYCODE_END
@@ -940,9 +937,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_SYS] = LAYOUT(
-  DB_TOGG, QWERTY,  WIN,     XXXXXXX, QK_BOOT,   XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
+  DB_TOGG, QWERTY,  WIN,     XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, OU_USB,  XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
   XXXXXXX, FC_TOG,  XXXXXXX, DVORAK,  XXXXXXX, GLOW,    XXXXXXX, XXXXXXX, WORKMAN, LINUX,   XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT,  NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OU_BT,   NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
                                            _______, _______, _______
 ),
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 9d3f01b812..11fd8ed74d 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -139,9 +139,6 @@ enum planck_keycodes {
   // stub
 #ifndef FAUXCLICKY_ENABLE
   FC_TOG,
-#endif
-#ifndef BLUETOOTH_BLUEFRUIT_LE
-  OUT_BT,
 #endif
   RGBDEMO,
   KEYCODE_END
@@ -943,9 +940,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_SYS] = LAYOUT(
-  DB_TOGG, QWERTY,  WIN,     XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
+  DB_TOGG, QWERTY,  WIN,     XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, OU_USB,  XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
   XXXXXXX, FC_TOG,  XXXXXXX, DVORAK,  XXXXXXX, GLOW,    XXXXXXX, XXXXXXX, WORKMAN, LINUX,   XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT,  NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OU_BT,   NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
                                            _______, _______, _______
 ),
diff --git a/keyboards/latincompass/latin47ble/keymaps/default/keymap.c b/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
index 69507401bd..950783d13f 100644
--- a/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
@@ -33,10 +33,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   KC_1,    KC_2,    KC_3,    KC_4
     ),
     [_FN1] = LAYOUT_planck_mit(
-        OUT_AUTO, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
-        KC_X0,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
-        KC_LCTL,  KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
+        OU_AUTO, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
+        KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
     ),
     [_FN2] = LAYOUT_planck_mit(
         KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
diff --git a/keyboards/latincompass/latin47ble/keymaps/via/keymap.c b/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
index 831f11cf2c..2983718bfe 100644
--- a/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
@@ -34,10 +34,10 @@ enum layers {
         KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   KC_1,    KC_2,    KC_3,    KC_4
     ),
     [_FN1] = LAYOUT_planck_mit(
-        OUT_AUTO, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
-        KC_X0,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
-        KC_LCTL,  KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
+        OU_AUTO, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
+        KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
     ),
     [_FN2] = LAYOUT_planck_mit(
         KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index 71f592b061..68f08ef212 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -376,7 +376,7 @@ qmk_dict = {
     "Led 0": "BL_TOGG", "Led +": "BL_UP", "Led -": "BL_DOWN", "Led ~": "BL_BRTG",
     # Bootmagic missing
     # Bluetooth
-    "OUT_AUTO": "OUT_AUTO", "OUT_USB": "OUT_USB", "OUT_BT": "OUT_BT",
+    "OU_AUTO": "OU_AUTO", "OU_USB": "OU_USB", "OU_BT": "OU_BT",
     # Layer Switching missing, Lx -> MO(x), Tx -> TG(x)
     "qwertz": "DF(0)", "neo": "DF(2)",
     # Mouse Keys
diff --git a/keyboards/woodkeys/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
index a4c6fbfc10..91e0aaec75 100644
--- a/keyboards/woodkeys/meira/keymaps/cole/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
@@ -28,11 +28,6 @@ extern rgblight_config_t rgblight_config;
 #define _RAISE 4
 #define _ADJUST 16
 
-
-#ifndef BLUETOOTH_ENABLE
-#define OUT_BT KC_TRNS
-#endif
-
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
   LOWER,
@@ -114,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 QK_BOOT, _______,   _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
                 BL_STEP, RGB_MOD, _______, AU_ON,   AU_OFF,  _______, _______, _______,  _______, _______,  _______, _______, \
                 BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-                _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, OUT_AUTO, OUT_USB, OUT_BT \
+                _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, OU_AUTO, OU_USB, OU_BT \
         )
 };
 
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c
index 7f238010d0..b54562c701 100644
--- a/layouts/community/ortho_5x15/wanleg/keymap.c
+++ b/layouts/community/ortho_5x15/wanleg/keymap.c
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #if defined(BLUEFRUIT)
 [PAD] = LAYOUT_ortho_5x5_wrapper(
-  _______, _______, _______, OUT_BT, OUT_USB,
+  _______, _______, _______, OU_BT, OU_USB,
   _______________NUMPAD_Row__0_______________, _______,
   _______________NUMPAD_Row__1_______________, _______,
   _______________NUMPAD_Row__2_______________, _______,
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index 2b81261519..c013858e78 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -662,9 +662,9 @@ enum qk_keycode_defines {
     QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN = 0x7C1C,
     QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE = 0x7C1D,
     QK_SPACE_CADET_RIGHT_SHIFT_ENTER = 0x7C1E,
-    OUT_AUTO = 0x7C20,
-    OUT_USB = 0x7C21,
-    OUT_BT = 0x7C22,
+    QK_OUTPUT_AUTO = 0x7C20,
+    QK_OUTPUT_USB = 0x7C21,
+    QK_OUTPUT_BLUETOOTH = 0x7C22,
     QK_UNICODE_MODE_NEXT = 0x7C30,
     QK_UNICODE_MODE_PREVIOUS = 0x7C31,
     QK_UNICODE_MODE_MACOS = 0x7C32,
@@ -1221,6 +1221,9 @@ enum qk_keycode_defines {
     SC_LAPO    = QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN,
     SC_RAPC    = QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE,
     SC_SENT    = QK_SPACE_CADET_RIGHT_SHIFT_ENTER,
+    OU_AUTO    = QK_OUTPUT_AUTO,
+    OU_USB     = QK_OUTPUT_USB,
+    OU_BT      = QK_OUTPUT_BLUETOOTH,
     UC_NEXT    = QK_UNICODE_MODE_NEXT,
     UC_PREV    = QK_UNICODE_MODE_PREVIOUS,
     UC_MAC     = QK_UNICODE_MODE_MACOS,
diff --git a/quantum/quantum.c b/quantum/quantum.c
index c60ec22d8b..e7dc71e5d7 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -381,13 +381,13 @@ bool process_record_quantum(keyrecord_t *record) {
                 return false;
 #endif
 #ifdef BLUETOOTH_ENABLE
-            case OUT_AUTO:
+            case QK_OUTPUT_AUTO:
                 set_output(OUTPUT_AUTO);
                 return false;
-            case OUT_USB:
+            case QK_OUTPUT_USB:
                 set_output(OUTPUT_USB);
                 return false;
-            case OUT_BT:
+            case QK_OUTPUT_BLUETOOTH:
                 set_output(OUTPUT_BLUETOOTH);
                 return false;
 #endif
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
index 4d3bf0e2a7..15ad2a567a 100644
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
@@ -315,31 +315,31 @@ U_NP,              U_NP,              U_NA,              U_NA,              U_NA
 #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \
 RGB_HUI,           RGB_SAI,           KC_VOLU,           RGB_VAI,           RGB_TOG,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
 RGB_MOD,           KC_MPRV,           KC_VOLD,           KC_MNXT,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_NU,              U_NU,              U_NU,              U_NU,              OUT_AUTO,          U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
+U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_FLIP \
 RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
 KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_NU,              U_NU,              U_NU,              U_NU,              OUT_AUTO,          U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
+U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT \
 QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_TOG,           RGB_MOD,           KC_VOLU,           RGB_HUI,           RGB_SAI,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MPRV,           KC_VOLD,           KC_MNXT,           RGB_VAI,           \
-U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OUT_AUTO,          U_NU,              U_NU,              U_NU,              U_NU,              \
+U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OU_AUTO,           U_NU,              U_NU,              U_NU,              U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_VI \
 QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           U_NU,              \
-U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              OUT_AUTO,          \
+U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA \
 QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           \
-U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OUT_AUTO,          U_NU,              U_NU,              U_NU,              U_NU,              \
+U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OU_AUTO,           U_NU,              U_NU,              U_NU,              U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 

From b567622d59b393ae0afc0a87b3a185c39aa07755 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 9 Nov 2022 06:11:09 +1100
Subject: [PATCH 822/959] `handwired/swiftrax/cowfish`: fix layouts (#18984)

---
 .../handwired/swiftrax/cowfish/cowfish.h      | 120 +++--
 .../handwired/swiftrax/cowfish/info.json      | 428 +++++++++++++++++-
 .../swiftrax/cowfish/keymaps/default/keymap.c |  37 +-
 .../swiftrax/cowfish/keymaps/via/keymap.c     |  47 +-
 4 files changed, 519 insertions(+), 113 deletions(-)

diff --git a/keyboards/handwired/swiftrax/cowfish/cowfish.h b/keyboards/handwired/swiftrax/cowfish/cowfish.h
index 31165b0767..6ae6747f59 100644
--- a/keyboards/handwired/swiftrax/cowfish/cowfish.h
+++ b/keyboards/handwired/swiftrax/cowfish/cowfish.h
@@ -5,82 +5,68 @@
 // readability
 #define XXX KC_NO
 
-#define LAYOUT( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                         \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,             K413,             K416,       \
-    K500, K501, K502,             K505,             K508, K509,       K511,       K513,       K515, K516, K517  \
+#define LAYOUT_tkl_f13_ansi( \
+    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
+    K50, K51, K52,                K55,                K58, K59, K5B, K5D,        K5F, K5G, K5H \
 ) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  XXX, K015,  K016,  K017 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  XXX, K214,  K215,  K216,  K217 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  XXX, K313,  XXX, XXX, XXX, XXX }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  XXX, XXX, K413,  XXX, XXX, K416,  XXX }, \
-    { K500,  K501,  K502,  XXX, XXX, K505,  XXX, XXX, K508,  K509,  XXX, K511,  XXX, K513,  XXX, K515,  K516,  K517 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, K59, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
 }
 
-#define LAYOUT_all( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                         \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,             K413,             K416,       \
-    K500, K501, K502,             K505,             K508, K509,       K511,       K513,       K515, K516, K517  \
+#define LAYOUT_tkl_f13_ansi_split_bs( \
+    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
+    K50, K51, K52,                K55,                K58, K59, K5B, K5D,        K5F, K5G, K5H \
 ) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  XXX, K015,  K016,  K017 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  XXX, K214,  K215,  K216,  K217 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  XXX, K313,  XXX, XXX, XXX, XXX }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  XXX, XXX, K413,  XXX, XXX, K416,  XXX }, \
-    { K500,  K501,  K502,  XXX, XXX, K505,  XXX, XXX, K508,  K509,  XXX, K511,  XXX, K513,  XXX, K515,  K516,  K517 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, K59, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
 }
 
-#define LAYOUT_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                         \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,             K413,             K416,       \
-    K500, K501, K502,             K505,             K508, K509,       K511,       K513,       K515, K516, K517  \
+#define LAYOUT_tkl_f13_ansi_tsangan( \
+    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
+    K50, K51, K52,                K55,                     K58, K5B, K5D,        K5F, K5G, K5H \
 ) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  XXX, K015,  K016,  K017 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  XXX, K214,  K215,  K216,  K217 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  XXX, K313,  XXX, XXX, XXX, XXX }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  XXX, XXX, K413,  XXX, XXX, K416,  XXX }, \
-    { K500,  K501,  K502,  XXX, XXX, K505,  XXX, XXX, K508,  K509,  XXX, K511,  XXX, K513,  XXX, K515,  K516,  K517 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, XXX, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
 }
 
-#define LAYOUT_split_bs_tsangan( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                         \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,             K413,             K416,       \
-    K500, K501, K502,             K505,             K508,             K511,       K513,       K515, K516, K517  \
+#define LAYOUT_tkl_f13_ansi_tsangan_split_bs( \
+    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K1F, K1G, K1H, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
+    K50, K51, K52,                K55,                     K58, K5B, K5D,        K5F, K5G, K5H \
 ) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  XXX, K015,  K016,  K017 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  XXX, K214,  K215,  K216,  K217 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  XXX, K313,  XXX, XXX, XXX, XXX }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  XXX, XXX, K413,  XXX, XXX, K416,  XXX }, \
-    { K500,  K501,  K502,  XXX, XXX, K505,  XXX, XXX,  K508,    XXX,   XXX,  K511,  XXX, K513,  XXX, K515,  K516,  K517 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, XXX, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
 }
 
-#define LAYOUT_tsangan( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, K016, K017, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, K116, K117, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                         \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,             K413,             K416,       \
-    K500, K501, K502,             K505,             K508,             K511,       K513,       K515, K516, K517  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  XXX, K015,  K016,  K017 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  XXX, K115,  K116,  K117 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  XXX, K214,  K215,  K216,  K217 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  XXX, K313,  XXX, XXX, XXX, XXX }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  XXX, XXX, K413,  XXX, XXX, K416,  XXX }, \
-    { K500,  K501,  K502,  XXX, XXX, K505,  XXX, XXX,  K508,    XXX,   XXX,  K511,  XXX, K513,  XXX, K515,  K516,  K517 }  \
-}
+#define LAYOUT_all LAYOUT_tkl_f13_ansi_split_bs
diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/info.json
index 9dd2fde67d..0b1833d9d1 100644
--- a/keyboards/handwired/swiftrax/cowfish/info.json
+++ b/keyboards/handwired/swiftrax/cowfish/info.json
@@ -9,17 +9,429 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25, "w":1.25},
+                {"x":11.25, "y":5.25, "w":1.25},
+                {"x":12.5, "y":5.25, "w":1.25},
+                {"x":13.75, "y":5.25, "w":1.25},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_tsangan": {
-            "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi_split_bs": {
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25, "w":1.25},
+                {"x":11.25, "y":5.25, "w":1.25},
+                {"x":12.5, "y":5.25, "w":1.25},
+                {"x":13.75, "y":5.25, "w":1.25},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_full_bs": {
-            "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":12.5, "y":5.25},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_split_bs_tsangan": {
-            "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs": {
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":12.5, "y":5.25},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
index 4f0b98ab9d..0118335e52 100644
--- a/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/cowfish/keymaps/default/keymap.c
@@ -4,26 +4,29 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // 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 {
-  _MA,
-  _FN
+enum layer_names {
+    _MA,
+    _FN
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MA] = LAYOUT_tkl_f13_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SCRL, KC_PAUS,
 
-[_MA] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_P1, 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_BSLS, KC_INS,  KC_HOME, KC_PGUP,
-  KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-  KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-  KC_LSFT, KC_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_MENU,  KC_RCTL,         KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                     KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-[_FN] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
-  KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSLS, KC_INS,  KC_HOME, KC_PGUP,
-  KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-  KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-  KC_LSFT, KC_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_MENU,  KC_RCTL,         KC_LEFT, KC_DOWN, KC_RGHT)
+    [_FN] = LAYOUT_tkl_f13_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                     KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    )
 };
diff --git a/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
index 1e116563fe..afca849084 100644
--- a/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/cowfish/keymaps/via/keymap.c
@@ -1,28 +1,33 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SCRL, KC_PAUS,
 
-[0] = LAYOUT_all(
-  KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SCRL, KC_PAUS,
-  KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSLS, KC_INS,  KC_HOME, KC_PGUP,
-  KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-  KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH, KC_RSFT,                                      KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSLS,   KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                     KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-[1] = LAYOUT_all(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  _______,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                      _______,
-  _______, _______, _______,                            _______,                            _______, _______, _______,  _______,          _______, _______, _______),
+    [1] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
 
-[2] = LAYOUT_all(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  _______,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                      _______,
-  _______, _______, _______,                            _______,                            _______, _______, _______,  _______,          _______, _______, _______)
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                     _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______
+    ),
+
+    [2] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                     _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______
+    )
 };

From f7df771e703d47b88a099c1ef6624be6b3b29219 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 8 Nov 2022 12:51:04 -0700
Subject: [PATCH 823/959] Fixup keychron/q1/iso_encoder (#19006)

---
 keyboards/keychron/q1/iso_encoder/config.h      | 2 +-
 keyboards/keychron/q1/iso_encoder/iso_encoder.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/keychron/q1/iso_encoder/config.h b/keyboards/keychron/q1/iso_encoder/config.h
index 089ea19973..984b3c77d0 100644
--- a/keyboards/keychron/q1/iso_encoder/config.h
+++ b/keyboards/keychron/q1/iso_encoder/config.h
@@ -31,7 +31,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 24
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { E6 }
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
index 0106084973..c6563ad318 100644
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -147,4 +147,4 @@ led_config_t g_led_config = {
     }
 };
 
-#endif // RGB_MATRIX_ENABLE
\ No newline at end of file
+#endif // RGB_MATRIX_ENABLE

From d789b4b7d9872112dc3389c9f6afe39f537c3723 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 10 Nov 2022 01:02:44 +1100
Subject: [PATCH 824/959] Improve LED config parsing error messages (#19007)

---
 lib/python/qmk/c_parse.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py
index c14eb490fa..3d73e66091 100644
--- a/lib/python/qmk/c_parse.py
+++ b/lib/python/qmk/c_parse.py
@@ -216,9 +216,9 @@ def _validate_led_config(matrix, matrix_rows, matrix_indexes, position, position
     if len(matrix) != matrix_rows and len(matrix) != (matrix_rows / 2):
         raise ValueError("Unable to parse g_led_config matrix data")
     if len(position) != len(flags):
-        raise ValueError("Unable to parse g_led_config position data")
+        raise ValueError(f"Number of g_led_config physical positions ({len(position)}) does not match number of flags ({len(flags)})")
     if len(matrix_indexes) and (max(matrix_indexes) >= len(flags)):
-        raise ValueError("OOB within g_led_config matrix data")
+        raise ValueError(f"LED index {max(matrix_indexes)} is OOB in g_led_config - should be < {len(flags)}")
     if not all(isinstance(n, int) for n in matrix_indexes):
         raise ValueError("matrix indexes are not all ints")
     if (len(position_raw) % 2) != 0:

From c231c5fa4fb8c91dcaf7dca70461e24ffa4aceb5 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 10 Nov 2022 01:03:06 +1100
Subject: [PATCH 825/959] `bolsa/bolsalice`: fix layout (#19009)

---
 keyboards/bolsa/bolsalice/bolsalice.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/bolsa/bolsalice/bolsalice.h b/keyboards/bolsa/bolsalice/bolsalice.h
index 871b047f3c..475b5b101d 100644
--- a/keyboards/bolsa/bolsalice/bolsalice.h
+++ b/keyboards/bolsa/bolsalice/bolsalice.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	     K31, K32, K33, K34, K35, K36,          K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
 	     K41,      K43, K45, K46,               K48, K4A,                          K4E \
 ){ \
-	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E},\
-	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX},\
+	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},\
+	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E},\
 	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
 	{XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
 	{XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\

From dc9162438d8b16c7534b82b6ead42d104f823ffb Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 9 Nov 2022 15:50:43 +0000
Subject: [PATCH 826/959] Reject json with duplicate keys? (#18108)

---
 lib/python/qmk/json_schema.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index 01175146b5..934e2f841f 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -10,7 +10,18 @@ import jsonschema
 from milc import cli
 
 
-def json_load(json_file):
+def _dict_raise_on_duplicates(ordered_pairs):
+    """Reject duplicate keys."""
+    d = {}
+    for k, v in ordered_pairs:
+        if k in d:
+            raise ValueError("duplicate key: %r" % (k,))
+        else:
+            d[k] = v
+    return d
+
+
+def json_load(json_file, strict=True):
     """Load a json file from disk.
 
     Note: file must be a Path object.
@@ -20,7 +31,7 @@ def json_load(json_file):
         # Not necessary if the data is provided via stdin
         if isinstance(json_file, Path):
             json_file = json_file.open(encoding='utf-8')
-        return hjson.load(json_file)
+        return hjson.load(json_file, object_pairs_hook=_dict_raise_on_duplicates if strict else None)
 
     except (json.decoder.JSONDecodeError, hjson.HjsonDecodeError) as e:
         cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)

From af52a9f8add3c1cef1b71c96fb3ee8f73485a26d Mon Sep 17 00:00:00 2001
From: Christopher Hoage <iam@chrishoage.com>
Date: Wed, 9 Nov 2022 09:48:46 -0800
Subject: [PATCH 827/959] Fix jump in report value when scale changes during
 cirque get report (#18992)

Fixes undefined
---
 quantum/pointing_device/pointing_device_drivers.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/quantum/pointing_device/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
index 172c9f36d7..d6f29c062e 100644
--- a/quantum/pointing_device/pointing_device_drivers.c
+++ b/quantum/pointing_device/pointing_device_drivers.c
@@ -123,9 +123,11 @@ bool auto_mouse_activation(report_mouse_t mouse_report) {
 #        endif
 
 report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
+    uint16_t          scale     = cirque_pinnacle_get_scale();
     pinnacle_data_t   touchData = cirque_pinnacle_read_data();
     mouse_xy_report_t report_x = 0, report_y = 0;
-    static uint16_t   x = 0, y = 0;
+    static uint16_t   x = 0, y = 0, last_scale = 0;
+
 #        if defined(CIRQUE_PINNACLE_TAP_ENABLE)
     mouse_report.buttons        = pointing_device_handle_buttons(mouse_report.buttons, false, POINTING_DEVICE_BUTTON1);
 #        endif
@@ -157,15 +159,16 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
 #        endif
 
     // Scale coordinates to arbitrary X, Y resolution
-    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());
+    cirque_pinnacle_scale_data(&touchData, scale, scale);
 
     if (!cirque_pinnacle_gestures(&mouse_report, touchData)) {
-        if (x && y && touchData.xValue && touchData.yValue) {
+        if (last_scale && scale == last_scale && x && y && touchData.xValue && touchData.yValue) {
             report_x = CONSTRAIN_HID_XY((int16_t)(touchData.xValue - x));
             report_y = CONSTRAIN_HID_XY((int16_t)(touchData.yValue - y));
         }
-        x = touchData.xValue;
-        y = touchData.yValue;
+        x          = touchData.xValue;
+        y          = touchData.yValue;
+        last_scale = scale;
 
 #        ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
         if (cursor_glide_enable) {

From 575b0e33fa47034f5cfaf6f7cd98570268efa0a2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 10 Nov 2022 07:43:51 +1100
Subject: [PATCH 828/959] Rollback unrelated changes from previous PR. (#19015)

---
 keyboards/keychron/q1/config.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index 50a5b70cc3..cda8799a79 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -37,9 +37,17 @@
 /* Disable DIP switch in matrix data */
 #define MATRIX_MASKED
 
+/* NKRO */
+#define FORCE_NKRO
+
 /* Disable RGB lighting when PC is in suspend */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
+/* Allow VIA to edit lighting */
+#ifdef VIA_ENABLE
+#define VIA_QMK_RGBLIGHT_ENABLE
+#endif
+
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -89,5 +97,7 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-// #define RGB_MATRIX_KEYPRESSES
-// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
\ No newline at end of file
+/* Allow VIA to edit lighting */
+#ifdef VIA_ENABLE
+#define VIA_QMK_RGBLIGHT_ENABLE
+#endif

From bc6f8dc8b0822e5e03893eacffa42a7badb4c2fa Mon Sep 17 00:00:00 2001
From: Wilba <wilba@wilba.tech>
Date: Thu, 10 Nov 2022 07:46:44 +1100
Subject: [PATCH 829/959] VIA V3 - The Custom UI Update (#18222)

---
 keyboards/cannonkeys/satisfaction75/config.h  |   3 -
 .../satisfaction75/satisfaction75.c           | 211 ++++----
 .../satisfaction75/satisfaction75.h           |   4 +-
 keyboards/durgod/dgk6x/config.h               |   3 -
 .../frooastboard/walnut/keymaps/via/config.h  |   1 -
 .../frooastboard/walnut/keymaps/via/keymap.c  | 113 +----
 .../macropad_v2/keymaps/via/config.h          |   2 -
 .../handwired_k552/keymaps/via/config.h       |   4 -
 keyboards/hs60/v2/ansi/config.h               |   3 -
 keyboards/hs60/v2/hhkb/config.h               |   3 -
 keyboards/hs60/v2/iso/config.h                |   3 -
 keyboards/keebio/iris/keymaps/via/rules.mk    |   1 +
 keyboards/keebwerk/mega/ansi/config.h         |   3 -
 keyboards/keychron/q1/config.h                |  10 -
 keyboards/keychron/q2/config.h                |   5 -
 .../infinity875/keymaps/via/config.h          |  24 -
 keyboards/ml/gas75/keymaps/via/config.h       |  23 -
 .../monstargear/xo87/rgb/keymaps/via/config.h |  17 -
 .../xo87/solderable/keymaps/via/config.h      |  18 -
 .../mss_studio/m63_rgb/keymaps/via/config.h   |   4 -
 keyboards/novelkeys/nk65/config.h             |   3 -
 keyboards/novelkeys/nk87/config.h             |   3 -
 keyboards/rgbkb/mun/keymaps/via/config.h      |   2 -
 .../rgbkb/sol3/keymaps/kageurufu/config.h     |   2 -
 keyboards/rgbkb/sol3/keymaps/via/config.h     |   2 -
 keyboards/spaceholdings/nebula12/config.h     |   4 -
 keyboards/spaceholdings/nebula68/config.h     |   4 -
 keyboards/spaceholdings/nebula68b/config.h    |   3 -
 keyboards/spaceholdings/nebula68b/nebula68b.c |  69 ---
 keyboards/tkc/portico/config.h                |   2 -
 .../tkc/portico68v2/keymaps/via/config.h      |  19 -
 .../tkc/portico68v2/keymaps/via/keymap.c      |  72 ---
 keyboards/tkc/portico75/config.h              |   3 -
 keyboards/wilba_tech/rama_works_kara/config.h |   3 -
 keyboards/wilba_tech/rama_works_koyu/config.h |   3 -
 .../wilba_tech/rama_works_m10_c/config.h      |   3 -
 .../wilba_tech/rama_works_m50_a/config.h      |   3 -
 .../wilba_tech/rama_works_m60_a/config.h      |   3 -
 .../wilba_tech/rama_works_m65_b/config.h      |   3 -
 .../wilba_tech/rama_works_m65_bx/config.h     |   3 -
 keyboards/wilba_tech/rama_works_m6_a/config.h |   3 -
 keyboards/wilba_tech/rama_works_m6_b/config.h |   3 -
 .../wilba_tech/rama_works_u80_a/config.h      |   3 -
 keyboards/wilba_tech/via_test.c               | 133 +++++
 keyboards/wilba_tech/wt60_a/config.h          |   3 -
 keyboards/wilba_tech/wt60_b/config.h          |   3 -
 keyboards/wilba_tech/wt60_bx/config.h         |   3 -
 keyboards/wilba_tech/wt60_c/config.h          |   3 -
 keyboards/wilba_tech/wt60_xt/wt60_xt.c        |   7 +
 keyboards/wilba_tech/wt65_a/config.h          |   3 -
 keyboards/wilba_tech/wt65_b/config.h          |   3 -
 keyboards/wilba_tech/wt75_a/config.h          |   3 -
 keyboards/wilba_tech/wt75_b/config.h          |   3 -
 keyboards/wilba_tech/wt75_c/config.h          |   3 -
 keyboards/wilba_tech/wt80_a/config.h          |   3 -
 keyboards/wilba_tech/wt_main.c                |  61 ++-
 keyboards/wilba_tech/zeal60/config.h          |   3 -
 keyboards/wilba_tech/zeal65/config.h          |   3 -
 keyboards/winry/winry315/keymaps/via/config.h |   9 -
 keyboards/winry/winry315/winry315.c           |  54 --
 keyboards/xelus/dawn60/rev1/config.h          |   3 -
 keyboards/xelus/la_plus/keymaps/via/config.h  |  20 -
 .../xelus/pachi/rgb/keymaps/via/config.h      |   3 -
 .../xelus/valor/rev2/keymaps/via/config.h     |   3 -
 quantum/dynamic_keymap.c                      |  56 +-
 quantum/dynamic_keymap.h                      |   6 +
 quantum/via.c                                 | 479 ++++++++++++------
 quantum/via.h                                 |  94 +++-
 68 files changed, 751 insertions(+), 886 deletions(-)
 delete mode 100644 keyboards/geekboards/macropad_v2/keymaps/via/config.h
 delete mode 100644 keyboards/mechlovin/infinity875/keymaps/via/config.h
 delete mode 100644 keyboards/ml/gas75/keymaps/via/config.h
 delete mode 100644 keyboards/monstargear/xo87/rgb/keymaps/via/config.h
 delete mode 100644 keyboards/monstargear/xo87/solderable/keymaps/via/config.h
 delete mode 100644 keyboards/tkc/portico68v2/keymaps/via/config.h
 create mode 100644 keyboards/wilba_tech/via_test.c
 delete mode 100644 keyboards/xelus/la_plus/keymaps/via/config.h

diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index 615ad1d056..a650a362c0 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -82,9 +82,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // 6 for 3x custom encoder settings, left, right, and press (18 bytes)
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 21
 
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index 3cd52d5f23..13b44b85db 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -102,113 +102,142 @@ void backlight_set_value( uint8_t *data )
   }
 }
 
-void raw_hid_receive_kb( uint8_t *data, uint8_t length )
-{
-  uint8_t *command_id = &(data[0]);
-  uint8_t *command_data = &(data[1]);
-  switch ( *command_id )
-  {
-    case id_get_keyboard_value:
-    {
-            switch( command_data[0])
-            {
-                case id_oled_default_mode:
-                {
-                    uint8_t default_oled = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
-                    command_data[1] = default_oled;
-                    break;
-                }
-                case id_oled_mode:
-                {
-                    command_data[1] = oled_mode;
-                    break;
-                }
-                case id_encoder_modes:
-                {
-                    command_data[1] = enabled_encoder_modes;
-                    break;
-                }
-                case id_encoder_custom:
-                {
-                    uint8_t custom_encoder_idx = command_data[1];
-                    uint16_t keycode = retrieve_custom_encoder_config(custom_encoder_idx, ENC_CUSTOM_CW);
-                    command_data[2] =  keycode >> 8;
-                    command_data[3] = keycode & 0xFF;
-                    keycode = retrieve_custom_encoder_config(custom_encoder_idx, ENC_CUSTOM_CCW);
-                    command_data[4] =  keycode >> 8;
-                    command_data[5] = keycode & 0xFF;
-                    keycode = retrieve_custom_encoder_config(custom_encoder_idx, ENC_CUSTOM_PRESS);
-                    command_data[6] =  keycode >> 8;
-                    command_data[7] = keycode & 0xFF;
-                    break;
-                }
-                default:
-                {
-                    *command_id = id_unhandled;
-                    break;
-                }
-            }
-      break;
-    }
-    case id_set_keyboard_value:
-    {
-      switch(command_data[0]){
+void custom_set_value(uint8_t *data) {
+    uint8_t *value_id = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    
+    switch ( *value_id ) {
         case id_oled_default_mode:
         {
-          eeprom_update_byte((uint8_t*)EEPROM_DEFAULT_OLED, command_data[1]);
-          break;
+            eeprom_update_byte((uint8_t*)EEPROM_DEFAULT_OLED, value_data[0]);
+            break;
         }
         case id_oled_mode:
         {
-          oled_mode = command_data[1];
-          oled_request_wakeup();
-          break;
+            oled_mode = value_data[0];
+            oled_request_wakeup();
+            break;
         }
         case id_encoder_modes:
         {
-          enabled_encoder_modes = command_data[1];
-          eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, enabled_encoder_modes);
-          break;
+            uint8_t index = value_data[0];
+            uint8_t enable = value_data[1];
+            enabled_encoder_modes = (enabled_encoder_modes & ~(1<<index)) | (enable<<index);
+            eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, enabled_encoder_modes);
+            break;
         }
         case id_encoder_custom:
         {
-          uint8_t custom_encoder_idx = command_data[1];
-          uint8_t encoder_behavior = command_data[2];
-          uint16_t keycode = (command_data[3] << 8) | command_data[4];
-          set_custom_encoder_config(custom_encoder_idx, encoder_behavior, keycode);
-          break;
+            uint8_t custom_encoder_idx = value_data[0];
+            uint8_t encoder_behavior = value_data[1];
+            uint16_t keycode = (value_data[2] << 8) | value_data[3];
+            set_custom_encoder_config(custom_encoder_idx, encoder_behavior, keycode);
+            break;
         }
-        default:
+    }
+}
+
+void custom_get_value(uint8_t *data) {
+    uint8_t *value_id = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    
+    switch ( *value_id ) {
+        case id_oled_default_mode:
         {
-          *command_id = id_unhandled;
-          break;
+            uint8_t default_oled = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
+            value_data[0] = default_oled;
+            break;
+        }
+        case id_oled_mode:
+        {
+            value_data[0] = oled_mode;
+            break;
+        }
+        case id_encoder_modes:
+        {
+            uint8_t index = value_data[0];
+            value_data[1] = (enabled_encoder_modes & (1<<index)) ? 1 : 0;
+            break;
+        }
+        case id_encoder_custom:
+        {
+            uint8_t custom_encoder_idx = value_data[0];
+            uint8_t encoder_behavior = value_data[1];
+            uint16_t keycode = retrieve_custom_encoder_config(custom_encoder_idx, encoder_behavior);
+            value_data[2] = keycode >> 8;
+            value_data[3] = keycode & 0xFF;
+            break;
         }
-      }
-      break;
     }
-    case id_lighting_set_value:
-    {
-      backlight_set_value(command_data);
-      break;
+}
+
+// TODO
+// Refactor so this keyboard uses QMK Core backlight code,
+// then change this to via_custom_value_command_kb() so it
+// only handles the custom values not the backlight
+// (i.e. use QMK Core default handler for backlight values).
+//
+void via_custom_value_command(uint8_t *data, uint8_t length) {
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if ( *channel_id == id_qmk_backlight_channel ) {
+        switch ( *command_id )
+        {
+            case id_custom_set_value:
+            {
+                backlight_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value:
+            {
+                backlight_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save:
+            {
+                backlight_config_save();
+                break;
+            }
+            default:
+            {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+    } else if ( *channel_id == id_custom_channel ) {
+        switch ( *command_id )
+        {
+            case id_custom_set_value:
+            {
+                custom_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value:
+            {
+                custom_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save:
+            {
+                // values are saved in custom_set_value()
+                break;
+            }
+            default:
+            {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
     }
-    case id_lighting_get_value:
-    {
-      backlight_get_value(command_data);
-      break;
-    }
-    case id_lighting_save:
-    {
-      backlight_config_save();
-      break;
-    }
-    default:
-    {
-      // Unhandled message.
-      *command_id = id_unhandled;
-      break;
-    }
-  }
-  // DO NOT call raw_hid_send(data,length) here, let caller do this
+
+    *command_id = id_unhandled;
+
+    // DO NOT call raw_hid_send(data,length) here, let caller do this
 }
 #endif
 
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
index ea71345a38..ec852eef6c 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
@@ -30,8 +30,8 @@ enum my_keycodes {
   OLED_TOGG
 };
 
-enum s75_keyboard_value_id {
-  id_encoder_modes = 0x80,
+enum s75_custom_value_id {
+  id_encoder_modes = 1,
   id_oled_default_mode,
   id_encoder_custom,
   id_oled_mode
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 70247fd745..fe4ca58072 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -130,7 +130,4 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-// This allows VIA to control RGB Matrix settings in the 'Lighting' section.
-#define VIA_QMK_RGBLIGHT_ENABLE
-
 #endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/frooastboard/walnut/keymaps/via/config.h b/keyboards/frooastboard/walnut/keymaps/via/config.h
index 0ef255fb51..e1f0fc0db6 100644
--- a/keyboards/frooastboard/walnut/keymaps/via/config.h
+++ b/keyboards/frooastboard/walnut/keymaps/via/config.h
@@ -3,5 +3,4 @@
 
 #pragma once
 
-#define VIA_CUSTOM_LIGHTING_ENABLE
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/frooastboard/walnut/keymaps/via/keymap.c b/keyboards/frooastboard/walnut/keymaps/via/keymap.c
index 84b73e2186..f502205761 100644
--- a/keyboards/frooastboard/walnut/keymaps/via/keymap.c
+++ b/keyboards/frooastboard/walnut/keymaps/via/keymap.c
@@ -17,115 +17,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
 		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
-};
-
-#if defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
-
-// VIA supports only 4 discrete values for effect speed; map these to some
-// useful speed values for RGB Matrix.
-enum speed_values {
-    RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects
-    RGBLIGHT_SPEED_1 = UINT8_MAX / 4,
-    RGBLIGHT_SPEED_2 = UINT8_MAX / 2,     // matches the default value
-    RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast
-};
-
-static uint8_t speed_from_rgblight(uint8_t rgblight_speed) {
-    switch (rgblight_speed) {
-        case 0:
-            return RGBLIGHT_SPEED_0;
-        case 1:
-            return RGBLIGHT_SPEED_1;
-        case 2:
-        default:
-            return RGBLIGHT_SPEED_2;
-        case 3:
-            return RGBLIGHT_SPEED_3;
-    }
-}
-
-static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) {
-    if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) {
-        return 0;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) {
-        return 1;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) {
-        return 2;
-    } else {
-        return 3;
-    }
-}
-
-void via_qmk_rgblight_get_value(uint8_t *data) {
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-    switch (*value_id) {
-        case id_qmk_rgblight_brightness: {
-            value_data[0] = rgb_matrix_get_val();
-            break;
-        }
-        case id_qmk_rgblight_effect: {
-            value_data[0] = rgb_matrix_is_enabled() ? rgb_matrix_get_mode() : 0;
-            break;
-        }
-        case id_qmk_rgblight_effect_speed: {
-            value_data[0] = speed_to_rgblight(rgb_matrix_get_speed());
-            break;
-        }
-        case id_qmk_rgblight_color: {
-            value_data[0] = rgb_matrix_get_hue();
-            value_data[1] = rgb_matrix_get_sat();
-            break;
-        }
-    }
-}
-
-void via_qmk_rgblight_set_value(uint8_t *data) {
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-    switch (*value_id) {
-        case id_qmk_rgblight_brightness: {
-            rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
-            break;
-        }
-        case id_qmk_rgblight_effect: {
-            if (value_data[0] == 0) {
-                rgb_matrix_disable_noeeprom();
-            } else {
-                rgb_matrix_enable_noeeprom();
-                rgb_matrix_mode_noeeprom(value_data[0]);
-            }
-            break;
-        }
-        case id_qmk_rgblight_effect_speed: {
-            rgb_matrix_set_speed_noeeprom(speed_from_rgblight(value_data[0]));
-            break;
-        }
-        case id_qmk_rgblight_color: {
-            rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val());
-            break;
-        }
-    }
-}
-
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
-    uint8_t *command_id   = &(data[0]);
-    uint8_t *command_data = &(data[1]);
-    switch (*command_id) {
-        case id_lighting_set_value:
-            via_qmk_rgblight_set_value(command_data);
-            break;
-        case id_lighting_get_value:
-            via_qmk_rgblight_get_value(command_data);
-            break;
-        case id_lighting_save:
-            eeconfig_update_rgb_matrix();
-            break;
-        default:
-            // Unhandled message.
-            *command_id = id_unhandled;
-            break;
-    }
-}
-
-#endif // defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
+};
\ No newline at end of file
diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/config.h b/keyboards/geekboards/macropad_v2/keymaps/via/config.h
deleted file mode 100644
index 9d75edbe74..0000000000
--- a/keyboards/geekboards/macropad_v2/keymaps/via/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define DYNAMIC_KEYMAP_LAYER_COUNT 4
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/horrortroll/handwired_k552/keymaps/via/config.h b/keyboards/horrortroll/handwired_k552/keymaps/via/config.h
index ba3e8e9a03..a36ce468bc 100644
--- a/keyboards/horrortroll/handwired_k552/keymaps/via/config.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/config.h
@@ -17,7 +17,3 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-#ifdef RGB_MATRIX_ENABLE
-    #define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/hs60/v2/ansi/config.h b/keyboards/hs60/v2/ansi/config.h
index 509661db8d..4211e7ce94 100644
--- a/keyboards/hs60/v2/ansi/config.h
+++ b/keyboards/hs60/v2/ansi/config.h
@@ -135,6 +135,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/hs60/v2/hhkb/config.h b/keyboards/hs60/v2/hhkb/config.h
index 46090673db..ac1e9aa012 100644
--- a/keyboards/hs60/v2/hhkb/config.h
+++ b/keyboards/hs60/v2/hhkb/config.h
@@ -135,6 +135,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/hs60/v2/iso/config.h b/keyboards/hs60/v2/iso/config.h
index cf43e3dd94..22e2c3fbfe 100644
--- a/keyboards/hs60/v2/iso/config.h
+++ b/keyboards/hs60/v2/iso/config.h
@@ -133,6 +133,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/keebio/iris/keymaps/via/rules.mk b/keyboards/keebio/iris/keymaps/via/rules.mk
index 1189f4ad19..873ff6cdfc 100644
--- a/keyboards/keebio/iris/keymaps/via/rules.mk
+++ b/keyboards/keebio/iris/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
+CONSOLE_ENABLE = no
diff --git a/keyboards/keebwerk/mega/ansi/config.h b/keyboards/keebwerk/mega/ansi/config.h
index 43bc368925..0322bf3e64 100755
--- a/keyboards/keebwerk/mega/ansi/config.h
+++ b/keyboards/keebwerk/mega/ansi/config.h
@@ -133,6 +133,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index cda8799a79..669e9ef7ba 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -43,11 +43,6 @@
 /* Disable RGB lighting when PC is in suspend */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
-/* Allow VIA to edit lighting */
-#ifdef VIA_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
-#endif
-
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -96,8 +91,3 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* Allow VIA to edit lighting */
-#ifdef VIA_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index 511cc4f5ac..5961b62929 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -110,8 +110,3 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* Allow VIA to edit lighting */
-#ifdef VIA_ENABLE
-#    define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/config.h b/keyboards/mechlovin/infinity875/keymaps/via/config.h
deleted file mode 100644
index 74ee03f3f9..0000000000
--- a/keyboards/mechlovin/infinity875/keymaps/via/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Mechlovin' Studio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define VIA_QMK_RGBLIGHT_ENABLE
-
-#endif
diff --git a/keyboards/ml/gas75/keymaps/via/config.h b/keyboards/ml/gas75/keymaps/via/config.h
deleted file mode 100644
index 18d8c180ba..0000000000
--- a/keyboards/ml/gas75/keymaps/via/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 ML
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
-#ifdef RGB_MATRIX_ENABLE
-    #define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/monstargear/xo87/rgb/keymaps/via/config.h b/keyboards/monstargear/xo87/rgb/keymaps/via/config.h
deleted file mode 100644
index 45b4ab9d22..0000000000
--- a/keyboards/monstargear/xo87/rgb/keymaps/via/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 datafx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/monstargear/xo87/solderable/keymaps/via/config.h b/keyboards/monstargear/xo87/solderable/keymaps/via/config.h
deleted file mode 100644
index 54dda96c49..0000000000
--- a/keyboards/monstargear/xo87/solderable/keymaps/via/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 datafx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/mss_studio/m63_rgb/keymaps/via/config.h b/keyboards/mss_studio/m63_rgb/keymaps/via/config.h
index db20f3b87b..188407396a 100644
--- a/keyboards/mss_studio/m63_rgb/keymaps/via/config.h
+++ b/keyboards/mss_studio/m63_rgb/keymaps/via/config.h
@@ -18,7 +18,3 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
-#ifdef RGB_MATRIX_ENABLE
-    #define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/novelkeys/nk65/config.h b/keyboards/novelkeys/nk65/config.h
index 9640704b48..e1597c9da6 100755
--- a/keyboards/novelkeys/nk65/config.h
+++ b/keyboards/novelkeys/nk65/config.h
@@ -134,9 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
 
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
-
 /* Custom EEPROM start addressing. This is to support
  * both 128kb and 256kb versions of F303.
  * Register 0x1FFFF7CC holds the size of the flash memory.
diff --git a/keyboards/novelkeys/nk87/config.h b/keyboards/novelkeys/nk87/config.h
index 0320f35d84..4481f6283f 100755
--- a/keyboards/novelkeys/nk87/config.h
+++ b/keyboards/novelkeys/nk87/config.h
@@ -134,6 +134,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/rgbkb/mun/keymaps/via/config.h b/keyboards/rgbkb/mun/keymaps/via/config.h
index 01dc6f1c7d..002081a1c8 100644
--- a/keyboards/rgbkb/mun/keymaps/via/config.h
+++ b/keyboards/rgbkb/mun/keymaps/via/config.h
@@ -25,6 +25,4 @@
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
 
-#define VIA_QMK_RGBLIGHT_ENABLE
-
 #define STM32_ONBOARD_EEPROM_SIZE 2048
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
index b1a8fce865..b6416d9bf8 100644
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
@@ -26,7 +26,5 @@
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
 
-#define VIA_QMK_RGBLIGHT_ENABLE
-
 #define STM32_ONBOARD_EEPROM_SIZE 2048
 
diff --git a/keyboards/rgbkb/sol3/keymaps/via/config.h b/keyboards/rgbkb/sol3/keymaps/via/config.h
index e6aa2bd87b..ff1ff77472 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/via/config.h
@@ -26,7 +26,5 @@
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
 
-#define VIA_QMK_RGBLIGHT_ENABLE
-
 #define STM32_ONBOARD_EEPROM_SIZE 2048
 
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 73cc391726..abda9af7af 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -174,7 +174,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index 8bae468783..14a4eedb90 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -158,7 +158,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
index b95adb0508..30bf59e7dc 100755
--- a/keyboards/spaceholdings/nebula68b/config.h
+++ b/keyboards/spaceholdings/nebula68b/config.h
@@ -122,6 +122,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// // VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/nebula68b.c
index 4d4f878c6b..f7b292ded9 100755
--- a/keyboards/spaceholdings/nebula68b/nebula68b.c
+++ b/keyboards/spaceholdings/nebula68b/nebula68b.c
@@ -42,72 +42,3 @@ led_config_t g_led_config = { {
 // clang-format on
 #endif
 #endif
-
-#if defined(RGB_MATRIX_ENABLE) && defined(VIA_ENABLE)
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
-    uint8_t *command_id = &(data[0]);
-    uint8_t *command_data = &(data[1]);
-    switch (*command_id) {
-        case id_lighting_set_value: {
-            uint8_t *value_id   = &(command_data[0]);
-            uint8_t *value_data = &(command_data[1]);
-            switch (*value_id) {
-                case id_qmk_rgblight_brightness: {
-                    rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), scale8(value_data[0], RGB_MATRIX_MAXIMUM_BRIGHTNESS));
-                    break;
-                }
-                case id_qmk_rgblight_effect: {
-                    rgb_matrix_mode_noeeprom(value_data[0]);
-                    if (value_data[0] == 0) {
-                        rgb_matrix_disable_noeeprom();
-                    } else {
-                        rgb_matrix_enable_noeeprom();
-                    }
-                    break;
-                }
-                case id_qmk_rgblight_effect_speed: {
-                    rgb_matrix_set_speed_noeeprom(value_data[0] * 85);
-                    break;
-                }
-                case id_qmk_rgblight_color: {
-                    rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgb_matrix_get_val());
-                    break;
-                }
-            }
-            break;
-        }
-        case id_lighting_get_value: {
-            uint8_t *value_id   = &(command_data[0]);
-            uint8_t *value_data = &(command_data[1]);
-            switch (*value_id) {
-                case id_qmk_rgblight_brightness: {
-                    value_data[0] = ((uint16_t)rgb_matrix_get_val() * 255) / RGB_MATRIX_MAXIMUM_BRIGHTNESS;
-                    break;
-                }
-                case id_qmk_rgblight_effect: {
-                    value_data[0] = rgb_matrix_get_mode();
-                    break;
-                }
-                case id_qmk_rgblight_effect_speed: {
-                    value_data[0] = rgb_matrix_get_speed() / 85;
-                    break;
-                }
-                case id_qmk_rgblight_color: {
-                    value_data[0] = rgb_matrix_get_hue();
-                    value_data[1] = rgb_matrix_get_sat();
-                    break;
-                }
-            }
-            break;
-        }
-        case id_lighting_save: {
-            eeconfig_update_rgb_matrix();
-            break;
-        }
-        default: {
-            *command_id         = id_unhandled;
-            break;
-        }
-    }
-}
-#endif
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index a0ad0c1652..3268b3511b 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -114,6 +114,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
 
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
 #endif
diff --git a/keyboards/tkc/portico68v2/keymaps/via/config.h b/keyboards/tkc/portico68v2/keymaps/via/config.h
deleted file mode 100644
index 39b11550cf..0000000000
--- a/keyboards/tkc/portico68v2/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2022 Terry Mathews
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/tkc/portico68v2/keymaps/via/keymap.c b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
index 1b3cfa0f99..9ab3d016ca 100644
--- a/keyboards/tkc/portico68v2/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
@@ -47,75 +47,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
     )
 };
-
-void via_qmk_rgblight_get_value(uint8_t *data) {
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-    switch (*value_id) {
-        case id_qmk_rgblight_brightness: {
-            value_data[0] = rgb_matrix_get_val();
-            break;
-        }
-        case id_qmk_rgblight_effect: {
-            value_data[0] = rgb_matrix_get_flags() ? rgb_matrix_get_mode() : 0;
-            break;
-        }
-        case id_qmk_rgblight_effect_speed: {
-            value_data[0] = rgb_matrix_get_speed();
-            break;
-        }
-        case id_qmk_rgblight_color: {
-            value_data[0] = rgb_matrix_get_hue();
-            value_data[1] = rgb_matrix_get_sat();
-            break;
-        }
-    }
-}
-
-void via_qmk_rgblight_set_value(uint8_t *data) {
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-    switch (*value_id) {
-        case id_qmk_rgblight_brightness: {
-            rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
-            break;
-        }
-        case id_qmk_rgblight_effect: {
-            if (value_data[0] == 0) {
-                rgb_matrix_set_flags(LED_FLAG_NONE);
-            } else {
-                rgb_matrix_mode_noeeprom(value_data[0]);
-                rgb_matrix_set_flags(LED_FLAG_MODIFIER|LED_FLAG_UNDERGLOW|LED_FLAG_KEYLIGHT);
-            }
-            break;
-        }
-        case id_qmk_rgblight_effect_speed: {
-            rgb_matrix_set_speed_noeeprom(value_data[0]);
-            break;
-        }
-        case id_qmk_rgblight_color: {
-            rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val());
-            break;
-        }
-    }
-}
-
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
-    uint8_t *command_id = &(data[0]);
-    uint8_t *command_data = &(data[1]);
-    switch (*command_id) {
-        case id_lighting_set_value:
-            via_qmk_rgblight_set_value(command_data);
-            break;
-        case id_lighting_get_value:
-            via_qmk_rgblight_get_value(command_data);
-            break;
-        case id_lighting_save:
-            eeconfig_update_rgb_matrix();
-            break;
-        default:
-            // Unhandled message.
-            *command_id = id_unhandled;
-            break;
-    }
-}
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index 36bd7b3ed5..57089653e1 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -161,7 +161,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #    define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#    define VIA_CUSTOM_LIGHTING_ENABLE
 #endif
diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h
index 7c9489e922..d713c41bb9 100644
--- a/keyboards/wilba_tech/rama_works_kara/config.h
+++ b/keyboards/wilba_tech/rama_works_kara/config.h
@@ -108,6 +108,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h
index 9b5048d11a..de2d4aafba 100644
--- a/keyboards/wilba_tech/rama_works_koyu/config.h
+++ b/keyboards/wilba_tech/rama_works_koyu/config.h
@@ -109,6 +109,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h
index 456023d414..9c893ac1b3 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/config.h
@@ -103,6 +103,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 51
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h
index 6284a4027a..47d47fae18 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_a/config.h
@@ -101,6 +101,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h
index 22abe6ee60..05f12caaf2 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/config.h
@@ -108,6 +108,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h
index 1982b2e8e1..ba99a20f97 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_b/config.h
@@ -101,6 +101,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h
index 83c2be2001..7e2a0ce122 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h
@@ -101,6 +101,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_m6_a/config.h b/keyboards/wilba_tech/rama_works_m6_a/config.h
index d77613628e..e964bcf21b 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_a/config.h
@@ -100,6 +100,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 43
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_m6_b/config.h b/keyboards/wilba_tech/rama_works_m6_b/config.h
index d6978c8a16..9f29bcb38a 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_b/config.h
@@ -143,6 +143,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 43
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h
index 4653556190..9cfc23c8f8 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/config.h
+++ b/keyboards/wilba_tech/rama_works_u80_a/config.h
@@ -153,6 +153,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/via_test.c b/keyboards/wilba_tech/via_test.c
new file mode 100644
index 0000000000..6a74df5164
--- /dev/null
+++ b/keyboards/wilba_tech/via_test.c
@@ -0,0 +1,133 @@
+// Copyright 2022 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This is a test harness for VIA custom UI.
+//
+// It handles channel IDs 0-7, value IDs 0-7.
+//
+// It's useful for testing custom UI on a PCB without compiling in
+// features, especially features that will cause firmware to freeze
+// if the PCB doesn't have support.
+// 
+// To use:
+// - add `SRC = keyboards/wilba_tech/via_test.c` to rules.mk
+// - add `#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 128` to config.h
+//   (or change to match CHANNELS*VALUES*2)
+
+#include "quantum.h"
+#include "via.h"
+
+#ifdef VIA_ENABLE
+
+#define CHANNELS 8
+#define VALUES 8
+uint8_t g_value[CHANNELS][VALUES][2];
+
+void values_init(void)
+{
+    for ( uint8_t channel_id = 0; channel_id < CHANNELS; channel_id++ ) {
+        for ( uint8_t value_id = 0; value_id < VALUES; value_id++ ) {
+            g_value[channel_id][value_id][0] = 0x00;
+            g_value[channel_id][value_id][1] = 0x00;
+        }
+    }
+}
+
+void values_load(void)
+{
+    eeprom_read_block( g_value, ((void*)VIA_EEPROM_CUSTOM_CONFIG_ADDR), VIA_EEPROM_CUSTOM_CONFIG_SIZE );
+}
+
+void values_save(void)
+{
+    eeprom_update_block( g_value, ((void*)VIA_EEPROM_CUSTOM_CONFIG_ADDR), VIA_EEPROM_CUSTOM_CONFIG_SIZE );
+}
+
+// We do this to test if VIA is sending save commands per channel
+// Not relevant for real situations
+void values_save_on_channel(uint8_t channel_id)
+{
+    uint16_t offset = channel_id * VALUES * 2;
+    eeprom_update_block( ((void*)g_value) + offset,
+        ((void*)VIA_EEPROM_CUSTOM_CONFIG_ADDR) + offset,
+        VALUES * 2 );
+}
+
+void via_init_kb(void)
+{
+    values_init();
+
+    // If the EEPROM has the magic, the data is good.
+    // OK to load from EEPROM
+    if (via_eeprom_is_valid()) {
+        values_load();
+    } else	{
+        values_save();
+        // DO NOT set EEPROM valid here, let caller do this
+    }
+}
+
+void set_value( uint8_t channel_id, uint8_t *data )
+{
+    // data = [ value_id, value_data ]
+    uint8_t *value_id = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    if ( *value_id >= 0 && *value_id < VALUES ) {
+        g_value[channel_id][*value_id][0] = value_data[0];
+        g_value[channel_id][*value_id][1] = value_data[1];
+    }
+}
+
+void get_value( uint8_t channel_id, uint8_t *data )
+{
+    // data = [ value_id, value_data ]
+    uint8_t *value_id = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    if ( *value_id >= 0 && *value_id < VALUES ) {
+        value_data[0] = g_value[channel_id][*value_id][0];
+        value_data[1] = g_value[channel_id][*value_id][1];
+    }
+}
+
+void via_custom_value_command(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 >= 0 && *channel_id < CHANNELS ) {
+        switch ( *command_id )
+        {
+            case id_custom_set_value:
+            {
+                set_value(*channel_id,value_id_and_data);
+                break;
+            }
+            case id_custom_get_value:
+            {
+                get_value(*channel_id,value_id_and_data);
+                break;
+            }
+            case id_custom_save:
+            {
+                //for ( uint8_t i=0; i<CHANNELS; i++) {
+                    values_save_on_channel(*channel_id);
+                //}
+                break;
+            }
+            default:
+            {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+    else {
+        *command_id = id_unhandled;
+    }
+
+    // DO NOT call raw_hid_send(data,length) here, let caller do this
+}
+#endif // VIA_ENABLE
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h
index c2b85fee76..c9079bcb83 100644
--- a/keyboards/wilba_tech/wt60_a/config.h
+++ b/keyboards/wilba_tech/wt60_a/config.h
@@ -121,6 +121,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h
index 43a10844da..2ae153b13f 100644
--- a/keyboards/wilba_tech/wt60_b/config.h
+++ b/keyboards/wilba_tech/wt60_b/config.h
@@ -104,6 +104,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h
index d26b3a02ba..75d0bfbf42 100644
--- a/keyboards/wilba_tech/wt60_bx/config.h
+++ b/keyboards/wilba_tech/wt60_bx/config.h
@@ -104,6 +104,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h
index 489207d56c..85beba49c7 100644
--- a/keyboards/wilba_tech/wt60_c/config.h
+++ b/keyboards/wilba_tech/wt60_c/config.h
@@ -105,6 +105,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt60_xt/wt60_xt.c b/keyboards/wilba_tech/wt60_xt/wt60_xt.c
index f575b032df..4413140513 100644
--- a/keyboards/wilba_tech/wt60_xt/wt60_xt.c
+++ b/keyboards/wilba_tech/wt60_xt/wt60_xt.c
@@ -26,6 +26,7 @@ float tone_numlk_on[][2]   = SONG(NUM_LOCK_ON_SOUND);
 float tone_numlk_off[][2]  = SONG(NUM_LOCK_OFF_SOUND);
 float tone_scroll_on[][2]  = SONG(SCROLL_LOCK_ON_SOUND);
 float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
+float tone_device_indication[][2] = SONG(FANTASIE_IMPROMPTU);
 
 #endif
 
@@ -95,3 +96,9 @@ bool led_update_kb(led_t led_state) {
 
     return true;
 }
+
+void via_set_device_indication(uint8_t value) {
+    if ( value == 0 ) {
+        PLAY_SONG(tone_device_indication);
+    }
+}
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h
index 062e2d8564..0d8dd5a0d1 100644
--- a/keyboards/wilba_tech/wt65_a/config.h
+++ b/keyboards/wilba_tech/wt65_a/config.h
@@ -121,6 +121,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h
index 8320daef0a..4bfbcdcb08 100644
--- a/keyboards/wilba_tech/wt65_b/config.h
+++ b/keyboards/wilba_tech/wt65_b/config.h
@@ -121,6 +121,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h
index 415774aa17..627069ca09 100644
--- a/keyboards/wilba_tech/wt75_a/config.h
+++ b/keyboards/wilba_tech/wt75_a/config.h
@@ -121,6 +121,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h
index 98b3d937f9..6d2c9fa17c 100644
--- a/keyboards/wilba_tech/wt75_b/config.h
+++ b/keyboards/wilba_tech/wt75_b/config.h
@@ -121,6 +121,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h
index d8cf5a1a95..fcaa9622d4 100644
--- a/keyboards/wilba_tech/wt75_c/config.h
+++ b/keyboards/wilba_tech/wt75_c/config.h
@@ -121,6 +121,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h
index 2bc81b2fa5..500d4bc797 100644
--- a/keyboards/wilba_tech/wt80_a/config.h
+++ b/keyboards/wilba_tech/wt80_a/config.h
@@ -121,6 +121,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index bc1a1d3c87..3f89066a6c 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -132,36 +132,45 @@ void suspend_wakeup_init_kb(void)
 // Moving this to the bottom of this source file is a workaround
 // for an intermittent compiler error for Atmel compiler.
 #ifdef VIA_ENABLE
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
-    uint8_t *command_id = &(data[0]);
-    uint8_t *command_data = &(data[1]);
-    switch ( *command_id )
-    {
+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 RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
-        case id_lighting_set_value:
+    if ( *channel_id == id_custom_channel ) {
+        switch ( *command_id )
         {
-            backlight_config_set_value(command_data);
-            break;
-        }
-        case id_lighting_get_value:
-        {
-            backlight_config_get_value(command_data);
-            break;
-        }
-        case id_lighting_save:
-        {
-            backlight_config_save();
-            break;
-        }
-#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
-        default:
-        {
-            // Unhandled message.
-            *command_id = id_unhandled;
-            *command_data = *command_data; // force use of variable
-            break;
+            case id_custom_set_value:
+            {
+                backlight_config_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value:
+            {
+                backlight_config_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save:
+            {
+                backlight_config_save();
+                break;
+            }
+            default:
+            {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
         }
+        return;
     }
+#else
+        *command_id = id_unhandled;
+        *channel_id = *channel_id; // force use of variable
+        *value_id_and_data = *value_id_and_data; // force use of variable
+#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
+
     // DO NOT call raw_hid_send(data,length) here, let caller do this
 }
 #endif // VIA_ENABLE
diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h
index eaf7b76504..94a8a599f4 100644
--- a/keyboards/wilba_tech/zeal60/config.h
+++ b/keyboards/wilba_tech/zeal60/config.h
@@ -107,6 +107,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h
index d5e83a11e3..4cbd12c0a5 100644
--- a/keyboards/wilba_tech/zeal65/config.h
+++ b/keyboards/wilba_tech/zeal65/config.h
@@ -107,6 +107,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/winry/winry315/keymaps/via/config.h b/keyboards/winry/winry315/keymaps/via/config.h
index 5fc0e02531..de1f70c160 100644
--- a/keyboards/winry/winry315/keymaps/via/config.h
+++ b/keyboards/winry/winry315/keymaps/via/config.h
@@ -4,12 +4,3 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
-
-// Enable a limited form of RGB Matrix support in VIA (requires redefining the
-// effect list in the VIA JSON, which then becomes not 100% compatible with the
-// RGBLIGHT firmwares).
-#define VIA_QMK_RGBLIGHT_ENABLE
-
-// Enable the workaround for the speed parameter mismatch between RGBLIGHT and
-// RGB Matrix, so that the speed slider in VIA behaves in a more useful way.
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/winry/winry315/winry315.c b/keyboards/winry/winry315/winry315.c
index d8042606c0..e7901a2e00 100644
--- a/keyboards/winry/winry315/winry315.c
+++ b/keyboards/winry/winry315/winry315.c
@@ -164,60 +164,6 @@ uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t
     return 0;
 }
 
-#    if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
-
-// VIA supports only 4 discrete values for effect speed; map these to some
-// useful speed values for RGB Matrix.
-enum speed_values {
-    RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects
-    RGBLIGHT_SPEED_1 = UINT8_MAX / 4,
-    RGBLIGHT_SPEED_2 = UINT8_MAX / 2,     // matches the default value
-    RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast
-};
-
-static uint8_t speed_from_rgblight(uint8_t rgblight_speed) {
-    switch (rgblight_speed) {
-        case 0:
-            return RGBLIGHT_SPEED_0;
-        case 1:
-            return RGBLIGHT_SPEED_1;
-        case 2:
-        default:
-            return RGBLIGHT_SPEED_2;
-        case 3:
-            return RGBLIGHT_SPEED_3;
-    }
-}
-
-static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) {
-    if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) {
-        return 0;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) {
-        return 1;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) {
-        return 2;
-    } else {
-        return 3;
-    }
-}
-
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
-    switch (data[0]) {
-        case id_lighting_get_value:
-            if (data[1] == id_qmk_rgblight_effect_speed) {
-                data[2] = speed_to_rgblight(rgb_matrix_get_speed());
-            }
-            break;
-        case id_lighting_set_value:
-            if (data[1] == id_qmk_rgblight_effect_speed) {
-                rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2]));
-            }
-            break;
-    }
-}
-
-#    endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
-
 #endif // defined(RGB_MATRIX_ENABLE)
 
 void winry315_set_orientation(uint8_t orientation) {
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index af4c31e478..6aeef780bb 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -128,6 +128,3 @@
 // Backlight config starts after VIA's EEPROM usage,
 // dynamic keymaps start after this.
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/xelus/la_plus/keymaps/via/config.h b/keyboards/xelus/la_plus/keymaps/via/config.h
deleted file mode 100644
index 43760bd281..0000000000
--- a/keyboards/xelus/la_plus/keymaps/via/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Enable RGB Matrix
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/config.h b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
index 0e34ad2c1a..47bbf2bf81 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
@@ -18,6 +18,3 @@
 
 // 3 layers or else it will not fit in EEPROM
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-// Enable RGB Matrix
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/xelus/valor/rev2/keymaps/via/config.h b/keyboards/xelus/valor/rev2/keymaps/via/config.h
index e7fb31cb23..8c0ed0c6e3 100644
--- a/keyboards/xelus/valor/rev2/keymaps/via/config.h
+++ b/keyboards/xelus/valor/rev2/keymaps/via/config.h
@@ -15,8 +15,5 @@
  */
 #pragma once
 
-// RGB Matrix
-#define VIA_QMK_RGBLIGHT_ENABLE
-
 // More layers
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index e9529ed14e..c406be4585 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -279,9 +279,8 @@ void dynamic_keymap_macro_send(uint8_t id) {
     p         = (void *)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR);
     void *end = (void *)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE);
     while (id > 0) {
-        // If we are past the end of the buffer, then the buffer
-        // contents are garbage, i.e. there were not DYNAMIC_KEYMAP_MACRO_COUNT
-        // nulls in the buffer.
+        // If we are past the end of the buffer, then there is
+        // no Nth macro in the buffer.
         if (p == end) {
             return;
         }
@@ -291,9 +290,8 @@ void dynamic_keymap_macro_send(uint8_t id) {
         ++p;
     }
 
-    // Send the macro string one or three chars at a time
-    // by making temporary 1 or 3 char strings
-    char data[4] = {0, 0, 0, 0};
+    // Send the macro string by making a temporary string.
+    char data[8] = {0};
     // We already checked there was a null at the end of
     // the buffer, so this cannot go past the end
     while (1) {
@@ -303,14 +301,44 @@ void dynamic_keymap_macro_send(uint8_t id) {
         if (data[0] == 0) {
             break;
         }
-        // If the char is magic (tap, down, up),
-        // add the next char (key to use) and send a 3 char string.
-        if (data[0] == SS_TAP_CODE || data[0] == SS_DOWN_CODE || data[0] == SS_UP_CODE) {
-            data[1] = data[0];
-            data[0] = SS_QMK_PREFIX;
-            data[2] = eeprom_read_byte(p++);
-            if (data[2] == 0) {
-                break;
+        if (data[0] == SS_QMK_PREFIX) {
+            // Get the code
+            data[1] = eeprom_read_byte(p++);
+            // Unexpected null, abort.
+            if (data[1] == 0) {
+                return;
+            }
+            if (data[1] == SS_TAP_CODE || data[1] == SS_DOWN_CODE || data[1] == SS_UP_CODE) {
+                // Get the keycode
+                data[2] = eeprom_read_byte(p++);
+                // Unexpected null, abort.
+                if (data[2] == 0) {
+                    return;
+                }
+                // Null terminate
+                data[3] = 0;
+            } else if (data[1] == SS_DELAY_CODE) {
+                // Get the number and '|'
+                // At most this is 4 digits plus '|'
+                uint8_t i = 2;
+                while (1) {
+                    data[i] = eeprom_read_byte(p++);
+                    // Unexpected null, abort
+                    if (data[i] == 0) {
+                        return;
+                    }
+                    // Found '|', send it
+                    if (data[i] == '|') {
+                        data[i + 1] = 0;
+                        break;
+                    }
+                    // If haven't found '|' by i==6 then
+                    // number too big, abort
+                    if (i == 6) {
+                        return;
+                    }
+                    ++i;
+                }
             }
         }
         send_string_with_delay(data, DYNAMIC_KEYMAP_MACRO_DELAY);
diff --git a/quantum/dynamic_keymap.h b/quantum/dynamic_keymap.h
index 459b48d07a..806342efa3 100644
--- a/quantum/dynamic_keymap.h
+++ b/quantum/dynamic_keymap.h
@@ -54,6 +54,12 @@ void dynamic_keymap_set_buffer(uint16_t offset, uint16_t size, uint8_t *data);
 // strings, the last byte must be a null when at maximum capacity,
 // and it not being null means the buffer can be considered in an
 // invalid state.
+//
+// The buffer *may* contain less macro strings than the maximum.
+// This allows a higher maximum number of macros without requiring that
+// number of nulls to be in the buffer.
+// Note: dynamic_keymap_macro_get_count() returns the maximum that *can* be
+// stored, not the current count of macros in the buffer.
 
 uint8_t  dynamic_keymap_macro_get_count(void);
 uint16_t dynamic_keymap_macro_get_buffer_size(void);
diff --git a/quantum/via.c b/quantum/via.c
index 5afbee5a30..12ef6c6b2f 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -22,26 +22,6 @@
 #    error "DYNAMIC_KEYMAP_ENABLE is not enabled"
 #endif
 
-// If VIA_CUSTOM_LIGHTING_ENABLE is not defined, then VIA_QMK_BACKLIGHT_ENABLE is set
-// if BACKLIGHT_ENABLE is set, so handling of QMK Backlight values happens here by default.
-// if VIA_CUSTOM_LIGHTING_ENABLE is defined, then VIA_QMK_BACKLIGHT_ENABLE must be explicitly
-// set in keyboard-level config.h, so handling of QMK Backlight values happens here
-#if defined(BACKLIGHT_ENABLE) && !defined(VIA_CUSTOM_LIGHTING_ENABLE)
-#    define VIA_QMK_BACKLIGHT_ENABLE
-#endif
-
-// If VIA_CUSTOM_LIGHTING_ENABLE is not defined, then VIA_QMK_RGBLIGHT_ENABLE is set
-// if RGBLIGHT_ENABLE is set, so handling of QMK RGBLIGHT values happens here by default.
-// If VIA_CUSTOM_LIGHTING_ENABLE is defined, then VIA_QMK_RGBLIGHT_ENABLE must be explicitly
-// set in keyboard-level config.h, so handling of QMK RGBLIGHT values happens here
-#if defined(RGBLIGHT_ENABLE) && !defined(VIA_CUSTOM_LIGHTING_ENABLE)
-#    define VIA_QMK_RGBLIGHT_ENABLE
-#endif
-
-#if defined(RGB_MATRIX_ENABLE) && !defined(VIA_QMK_RGBLIGHT_ENABLE) && !defined(VIA_CUSTOM_LIGHTING_ENABLE)
-#    define VIA_QMK_RGB_MATRIX_ENABLE
-#endif
-
 #include "quantum.h"
 
 #include "via.h"
@@ -51,22 +31,8 @@
 #include "eeprom.h"
 #include "version.h" // for QMK_BUILDDATE used in EEPROM magic
 
-// Forward declare some helpers.
-#if defined(VIA_QMK_BACKLIGHT_ENABLE)
-void via_qmk_backlight_set_value(uint8_t *data);
-void via_qmk_backlight_get_value(uint8_t *data);
-#endif
-
-#if defined(VIA_QMK_RGBLIGHT_ENABLE)
-void via_qmk_rgblight_set_value(uint8_t *data);
-void via_qmk_rgblight_get_value(uint8_t *data);
-#endif
-
-#if defined(VIA_QMK_RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
 #    include <lib/lib8tion/lib8tion.h>
-void via_qmk_rgb_matrix_set_value(uint8_t *data);
-void via_qmk_rgb_matrix_get_value(uint8_t *data);
-void eeconfig_update_rgb_matrix(void);
 #endif
 
 // Can be called in an overriding via_init_kb() to test if keyboard level code usage of
@@ -155,6 +121,34 @@ void via_set_layout_options(uint32_t value) {
     }
 }
 
+#if defined(AUDIO_ENABLE)
+float via_device_indication_song[][2] = SONG(STARTUP_SOUND);
+#endif // AUDIO_ENABLE
+
+// Used by VIA to tell a device to flash LEDs (or do something else) when that
+// device becomes the active device being configured, on startup or switching
+// between devices. This function will be called six times, at 200ms interval,
+// with an incrementing value starting at zero. Since this function is called
+// an even number of times, it can call a toggle function and leave things in
+// the original state.
+__attribute__((weak)) void via_set_device_indication(uint8_t value) {
+#if defined(BACKLIGHT_ENABLE)
+    backlight_toggle();
+#endif // BACKLIGHT_ENABLE
+#if defined(RGBLIGHT_ENABLE)
+    rgblight_toggle_noeeprom();
+#endif // RGBLIGHT_ENABLE
+#if defined(RGB_MATRIX_ENABLE)
+    rgb_matrix_toggle_noeeprom();
+#endif // RGB_MATRIX_ENABLE
+#if defined(AUDIO_ENABLE)
+    if (value == 0) {
+        wait_ms(10);
+        PLAY_SONG(via_device_indication_song);
+    }
+#endif // AUDIO_ENABLE
+}
+
 // Called by QMK core to process VIA-specific keycodes.
 bool process_record_via(uint16_t keycode, keyrecord_t *record) {
     // Handle macros
@@ -194,24 +188,96 @@ bool process_record_via(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-// Keyboard level code can override this to handle custom messages from VIA.
-// See raw_hid_receive() implementation.
+//
+// via_custom_value_command() has the default handling of custom values for Core modules.
+// If a keyboard is using the default Core modules, it does not need to be overridden,
+// the VIA keyboard definition will have matching channel/IDs.
+//
+// If a keyboard has some extra custom values, then via_custom_value_command_kb() can be
+// overridden to handle the extra custom values, leaving via_custom_value_command() to
+// handle the custom values for Core modules.
+//
+// If a keyboard has custom values and code that are overlapping with Core modules,
+// then via_custom_value_command() can be overridden and call the same functions
+// as the default implementation, or do whatever else is required.
+//
 // DO NOT call raw_hid_send() in the override function.
-__attribute__((weak)) void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+//
+
+// This is the default handler for "extra" custom values, i.e. keyboard-specific custom values
+// that are not handled by via_custom_value_command().
+__attribute__((weak)) 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]);
-    *command_id         = id_unhandled;
+    // Return the unhandled state
+    *command_id = id_unhandled;
 }
 
-// VIA handles received HID messages first, and will route to
-// raw_hid_receive_kb() for command IDs that are not handled here.
-// This gives the keyboard code level the ability to handle the command
-// specifically.
+// This is the default handler for custom value commands.
+// It routes commands with channel IDs to command handlers as such:
 //
-// raw_hid_send() is called at the end, with the same buffer, which was
-// possibly modified with returned values.
+//      id_qmk_backlight_channel    ->  via_qmk_backlight_command()
+//      id_qmk_rgblight_channel     ->  via_qmk_rgblight_command()
+//      id_qmk_rgb_matrix_channel   ->  via_qmk_rgb_matrix_command()
+//      id_qmk_audio_channel        ->  via_qmk_audio_command()
+//
+__attribute__((weak)) void via_custom_value_command(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *channel_id = &(data[1]);
+
+#if defined(BACKLIGHT_ENABLE)
+    if (*channel_id == id_qmk_backlight_channel) {
+        via_qmk_backlight_command(data, length);
+        return;
+    }
+#endif // BACKLIGHT_ENABLE
+
+#if defined(RGBLIGHT_ENABLE)
+    if (*channel_id == id_qmk_rgblight_channel) {
+        via_qmk_rgblight_command(data, length);
+        return;
+    }
+#endif // RGBLIGHT_ENABLE
+
+#if defined(RGB_MATRIX_ENABLE)
+    if (*channel_id == id_qmk_rgb_matrix_channel) {
+        via_qmk_rgb_matrix_command(data, length);
+        return;
+    }
+#endif // RGBLIGHT_ENABLE
+
+#if defined(AUDIO_ENABLE)
+    if (*channel_id == id_qmk_audio_channel) {
+        via_qmk_audio_command(data, length);
+        return;
+    }
+#endif // AUDIO_ENABLE
+
+    (void)channel_id; // force use of variable
+
+    // If we haven't returned before here, then let the keyboard level code
+    // handle this, if it is overridden, otherwise by default, this will
+    // return the unhandled state.
+    via_custom_value_command_kb(data, length);
+}
+
+// Keyboard level code can override this, but shouldn't need to.
+// Controlling custom features should be done by overriding
+// via_custom_value_command_kb() instead.
+__attribute__((weak)) bool via_command_kb(uint8_t *data, uint8_t length) {
+    return false;
+}
+
 void raw_hid_receive(uint8_t *data, uint8_t length) {
     uint8_t *command_id   = &(data[0]);
     uint8_t *command_data = &(data[1]);
+
+    // If via_command_kb() returns true, the command was fully
+    // handled, including calling raw_hid_send()
+    if (via_command_kb(data, length)) {
+        return;
+    }
+
     switch (*command_id) {
         case id_get_protocol_version: {
             command_data[0] = VIA_PROTOCOL_VERSION >> 8;
@@ -237,7 +303,10 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
                     break;
                 }
                 case id_switch_matrix_state: {
-#if ((MATRIX_COLS / 8 + 1) * MATRIX_ROWS <= 28)
+// Round up to the nearest number of bytes required to hold row state.
+// Multiply by number of rows to get the required size in bytes.
+// Guard against this being too big for the HID message.
+#if (((MATRIX_COLS + 7) / 8) * MATRIX_ROWS <= 28)
                     uint8_t i = 1;
                     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
                         matrix_row_t value = matrix_get_row(row);
@@ -255,8 +324,18 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
 #endif
                     break;
                 }
+                case id_firmware_version: {
+                    uint32_t value  = VIA_FIRMWARE_VERSION;
+                    command_data[1] = (value >> 24) & 0xFF;
+                    command_data[2] = (value >> 16) & 0xFF;
+                    command_data[3] = (value >> 8) & 0xFF;
+                    command_data[4] = value & 0xFF;
+                    break;
+                }
                 default: {
-                    raw_hid_receive_kb(data, length);
+                    // The value ID is not known
+                    // Return the unhandled state
+                    *command_id = id_unhandled;
                     break;
                 }
             }
@@ -269,8 +348,15 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
                     via_set_layout_options(value);
                     break;
                 }
+                case id_device_indication: {
+                    uint8_t value = command_data[1];
+                    via_set_device_indication(value);
+                    break;
+                }
                 default: {
-                    raw_hid_receive_kb(data, length);
+                    // The value ID is not known
+                    // Return the unhandled state
+                    *command_id = id_unhandled;
                     break;
                 }
             }
@@ -290,61 +376,10 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
             dynamic_keymap_reset();
             break;
         }
-        case id_lighting_set_value: {
-#if defined(VIA_QMK_BACKLIGHT_ENABLE)
-            via_qmk_backlight_set_value(command_data);
-#endif
-#if defined(VIA_QMK_RGBLIGHT_ENABLE)
-            via_qmk_rgblight_set_value(command_data);
-#endif
-#if defined(VIA_QMK_RGB_MATRIX_ENABLE)
-            via_qmk_rgb_matrix_set_value(command_data);
-#endif
-#if defined(VIA_CUSTOM_LIGHTING_ENABLE)
-            raw_hid_receive_kb(data, length);
-#endif
-#if !defined(VIA_QMK_BACKLIGHT_ENABLE) && !defined(VIA_QMK_RGBLIGHT_ENABLE) && !defined(VIA_CUSTOM_LIGHTING_ENABLE) && !defined(VIA_QMK_RGB_MATRIX_ENABLE)
-            // Return the unhandled state
-            *command_id = id_unhandled;
-#endif
-            break;
-        }
-        case id_lighting_get_value: {
-#if defined(VIA_QMK_BACKLIGHT_ENABLE)
-            via_qmk_backlight_get_value(command_data);
-#endif
-#if defined(VIA_QMK_RGBLIGHT_ENABLE)
-            via_qmk_rgblight_get_value(command_data);
-#endif
-#if defined(VIA_QMK_RGB_MATRIX_ENABLE)
-            via_qmk_rgb_matrix_get_value(command_data);
-#endif
-#if defined(VIA_CUSTOM_LIGHTING_ENABLE)
-            raw_hid_receive_kb(data, length);
-#endif
-#if !defined(VIA_QMK_BACKLIGHT_ENABLE) && !defined(VIA_QMK_RGBLIGHT_ENABLE) && !defined(VIA_CUSTOM_LIGHTING_ENABLE) && !defined(VIA_QMK_RGB_MATRIX_ENABLE)
-            // Return the unhandled state
-            *command_id = id_unhandled;
-#endif
-            break;
-        }
-        case id_lighting_save: {
-#if defined(VIA_QMK_BACKLIGHT_ENABLE)
-            eeconfig_update_backlight_current();
-#endif
-#if defined(VIA_QMK_RGBLIGHT_ENABLE)
-            eeconfig_update_rgblight_current();
-#endif
-#if defined(VIA_QMK_RGB_MATRIX_ENABLE)
-            eeconfig_update_rgb_matrix();
-#endif
-#if defined(VIA_CUSTOM_LIGHTING_ENABLE)
-            raw_hid_receive_kb(data, length);
-#endif
-#if !defined(VIA_QMK_BACKLIGHT_ENABLE) && !defined(VIA_QMK_RGBLIGHT_ENABLE) && !defined(VIA_CUSTOM_LIGHTING_ENABLE) && !defined(VIA_QMK_RGB_MATRIX_ENABLE)
-            // Return the unhandled state
-            *command_id = id_unhandled;
-#endif
+        case id_custom_set_value:
+        case id_custom_get_value:
+        case id_custom_save: {
+            via_custom_value_command(data, length);
             break;
         }
 #ifdef VIA_EEPROM_ALLOW_RESET
@@ -421,13 +456,39 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
     raw_hid_send(data, length);
 }
 
-#if defined(VIA_QMK_BACKLIGHT_ENABLE)
+#if defined(BACKLIGHT_ENABLE)
+
+void via_qmk_backlight_command(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    switch (*command_id) {
+        case id_custom_set_value: {
+            via_qmk_backlight_set_value(value_id_and_data);
+            break;
+        }
+        case id_custom_get_value: {
+            via_qmk_backlight_get_value(value_id_and_data);
+            break;
+        }
+        case id_custom_save: {
+            via_qmk_backlight_save();
+            break;
+        }
+        default: {
+            *command_id = id_unhandled;
+            break;
+        }
+    }
+}
 
 #    if BACKLIGHT_LEVELS == 0
 #        error BACKLIGHT_LEVELS == 0
 #    endif
 
 void via_qmk_backlight_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) {
@@ -448,6 +509,7 @@ void via_qmk_backlight_get_value(uint8_t *data) {
 }
 
 void via_qmk_backlight_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) {
@@ -469,14 +531,44 @@ void via_qmk_backlight_set_value(uint8_t *data) {
     }
 }
 
-#endif // #if defined(VIA_QMK_BACKLIGHT_ENABLE)
+void via_qmk_backlight_save(void) {
+    eeconfig_update_backlight_current();
+}
 
-#if defined(VIA_QMK_RGBLIGHT_ENABLE)
+#endif // BACKLIGHT_ENABLE
+
+#if defined(RGBLIGHT_ENABLE)
 #    ifndef RGBLIGHT_LIMIT_VAL
 #        define RGBLIGHT_LIMIT_VAL 255
 #    endif
 
+void via_qmk_rgblight_command(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    switch (*command_id) {
+        case id_custom_set_value: {
+            via_qmk_rgblight_set_value(value_id_and_data);
+            break;
+        }
+        case id_custom_get_value: {
+            via_qmk_rgblight_get_value(value_id_and_data);
+            break;
+        }
+        case id_custom_save: {
+            via_qmk_rgblight_save();
+            break;
+        }
+        default: {
+            *command_id = id_unhandled;
+            break;
+        }
+    }
+}
+
 void via_qmk_rgblight_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) {
@@ -485,7 +577,7 @@ void via_qmk_rgblight_get_value(uint8_t *data) {
             break;
         }
         case id_qmk_rgblight_effect: {
-            value_data[0] = rgblight_get_mode();
+            value_data[0] = rgblight_is_enabled() ? rgblight_get_mode() : 0;
             break;
         }
         case id_qmk_rgblight_effect_speed: {
@@ -501,6 +593,7 @@ void via_qmk_rgblight_get_value(uint8_t *data) {
 }
 
 void via_qmk_rgblight_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) {
@@ -509,11 +602,11 @@ void via_qmk_rgblight_set_value(uint8_t *data) {
             break;
         }
         case id_qmk_rgblight_effect: {
-            rgblight_mode_noeeprom(value_data[0]);
             if (value_data[0] == 0) {
                 rgblight_disable_noeeprom();
             } else {
                 rgblight_enable_noeeprom();
+                rgblight_mode_noeeprom(value_data[0]);
             }
             break;
         }
@@ -528,92 +621,168 @@ void via_qmk_rgblight_set_value(uint8_t *data) {
     }
 }
 
-#endif // #if defined(VIA_QMK_RGBLIGHT_ENABLE)
+void via_qmk_rgblight_save(void) {
+    eeconfig_update_rgblight_current();
+}
 
-#if defined(VIA_QMK_RGB_MATRIX_ENABLE)
+#endif // QMK_RGBLIGHT_ENABLE
+
+#if defined(RGB_MATRIX_ENABLE)
 
 #    if !defined(RGB_MATRIX_MAXIMUM_BRIGHTNESS) || RGB_MATRIX_MAXIMUM_BRIGHTNESS > UINT8_MAX
 #        undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS UINT8_MAX
 #    endif
 
-// VIA supports only 4 discrete values for effect speed; map these to some
-// useful speed values for RGB Matrix.
-enum speed_values {
-    RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects
-    RGBLIGHT_SPEED_1 = UINT8_MAX / 4,
-    RGBLIGHT_SPEED_2 = UINT8_MAX / 2,     // matches the default value
-    RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast
-};
+void via_qmk_rgb_matrix_command(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *value_id_and_data = &(data[2]);
 
-static uint8_t speed_from_rgblight(uint8_t rgblight_speed) {
-    switch (rgblight_speed) {
-        case 0:
-            return RGBLIGHT_SPEED_0;
-        case 1:
-            return RGBLIGHT_SPEED_1;
-        case 2:
-        default:
-            return RGBLIGHT_SPEED_2;
-        case 3:
-            return RGBLIGHT_SPEED_3;
-    }
-}
-
-static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) {
-    if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) {
-        return 0;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) {
-        return 1;
-    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) {
-        return 2;
-    } else {
-        return 3;
+    switch (*command_id) {
+        case id_custom_set_value: {
+            via_qmk_rgb_matrix_set_value(value_id_and_data);
+            break;
+        }
+        case id_custom_get_value: {
+            via_qmk_rgb_matrix_get_value(value_id_and_data);
+            break;
+        }
+        case id_custom_save: {
+            via_qmk_rgb_matrix_save();
+            break;
+        }
+        default: {
+            *command_id = id_unhandled;
+            break;
+        }
     }
 }
 
 void via_qmk_rgb_matrix_get_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
     uint8_t *value_id   = &(data[0]);
     uint8_t *value_data = &(data[1]);
+
     switch (*value_id) {
-        case id_qmk_rgblight_brightness:
+        case id_qmk_rgb_matrix_brightness: {
             value_data[0] = ((uint16_t)rgb_matrix_get_val() * UINT8_MAX) / RGB_MATRIX_MAXIMUM_BRIGHTNESS;
             break;
-        case id_qmk_rgblight_effect:
-            value_data[0] = rgb_matrix_get_mode();
+        }
+        case id_qmk_rgb_matrix_effect: {
+            value_data[0] = rgb_matrix_is_enabled() ? rgb_matrix_get_mode() : 0;
             break;
-        case id_qmk_rgblight_effect_speed:
-            value_data[0] = speed_to_rgblight(rgb_matrix_get_speed());
+        }
+        case id_qmk_rgb_matrix_effect_speed: {
+            value_data[0] = rgb_matrix_get_speed();
             break;
-        case id_qmk_rgblight_color:
+        }
+        case id_qmk_rgb_matrix_color: {
             value_data[0] = rgb_matrix_get_hue();
             value_data[1] = rgb_matrix_get_sat();
             break;
+        }
     }
 }
 
 void via_qmk_rgb_matrix_set_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
     uint8_t *value_id   = &(data[0]);
     uint8_t *value_data = &(data[1]);
     switch (*value_id) {
-        case id_qmk_rgblight_brightness:
+        case id_qmk_rgb_matrix_brightness: {
             rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), scale8(value_data[0], RGB_MATRIX_MAXIMUM_BRIGHTNESS));
             break;
-        case id_qmk_rgblight_effect:
-            rgb_matrix_mode_noeeprom(value_data[0]);
+        }
+        case id_qmk_rgb_matrix_effect: {
             if (value_data[0] == 0) {
                 rgb_matrix_disable_noeeprom();
             } else {
                 rgb_matrix_enable_noeeprom();
+                rgb_matrix_mode_noeeprom(value_data[0]);
             }
             break;
-        case id_qmk_rgblight_effect_speed:
-            rgb_matrix_set_speed_noeeprom(speed_from_rgblight(value_data[0]));
+        }
+        case id_qmk_rgb_matrix_effect_speed: {
+            rgblight_set_speed_noeeprom(value_data[0]);
             break;
-        case id_qmk_rgblight_color:
-            rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgb_matrix_get_val());
+        }
+        case id_qmk_rgb_matrix_color: {
+            rgblight_sethsv_noeeprom(value_data[0], value_data[1], rgb_matrix_get_val());
             break;
+        }
     }
 }
 
-#endif // #if defined(VIA_QMK_RGB_MATRIX_ENABLE)
+void via_qmk_rgb_matrix_save(void) {
+    eeconfig_update_rgb_matrix();
+}
+
+#endif // RGB_MATRIX_ENABLE
+
+#if defined(AUDIO_ENABLE)
+
+extern audio_config_t audio_config;
+
+void via_qmk_audio_command(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    switch (*command_id) {
+        case id_custom_set_value: {
+            via_qmk_audio_set_value(value_id_and_data);
+            break;
+        }
+        case id_custom_get_value: {
+            via_qmk_audio_get_value(value_id_and_data);
+            break;
+        }
+        case id_custom_save: {
+            via_qmk_audio_save();
+            break;
+        }
+        default: {
+            *command_id = id_unhandled;
+            break;
+        }
+    }
+}
+
+void via_qmk_audio_get_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_audio_enable: {
+            value_data[0] = audio_config.enable ? 1 : 0;
+            break;
+        }
+        case id_qmk_audio_clicky_enable: {
+            value_data[0] = audio_config.clicky_enable ? 1 : 0;
+            break;
+        }
+    }
+}
+
+void via_qmk_audio_set_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_audio_enable: {
+            audio_config.enable = value_data[0] ? 1 : 0;
+            break;
+        }
+        case id_qmk_audio_clicky_enable: {
+            audio_config.clicky_enable = value_data[0] ? 1 : 0;
+            break;
+        }
+    }
+}
+
+void via_qmk_audio_save(void) {
+    eeconfig_update_audio(audio_config.raw);
+}
+
+#endif // QMK_AUDIO_ENABLE
diff --git a/quantum/via.h b/quantum/via.h
index 84b264903f..eca0733525 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -60,6 +60,16 @@
 // so VIA Configurator can detect compatible firmware.
 #define VIA_PROTOCOL_VERSION 0x000B
 
+// This is a version number for the firmware for the keyboard.
+// It can be used to ensure the VIA keyboard definition and the firmware
+// have the same version, especially if there are changes to custom values.
+// Define this in config.h to override and bump this number.
+// This is *not* required if the keyboard is only using basic functionality
+// and not using custom values for lighting, rotary encoders, etc.
+#ifndef VIA_FIRMWARE_VERSION
+#    define VIA_FIRMWARE_VERSION 0x00000000
+#endif
+
 enum via_command_id {
     id_get_protocol_version                 = 0x01, // always 0x01
     id_get_keyboard_value                   = 0x02,
@@ -67,9 +77,9 @@ enum via_command_id {
     id_dynamic_keymap_get_keycode           = 0x04,
     id_dynamic_keymap_set_keycode           = 0x05,
     id_dynamic_keymap_reset                 = 0x06,
-    id_lighting_set_value                   = 0x07,
-    id_lighting_get_value                   = 0x08,
-    id_lighting_save                        = 0x09,
+    id_custom_set_value                     = 0x07,
+    id_custom_get_value                     = 0x08,
+    id_custom_save                          = 0x09,
     id_eeprom_reset                         = 0x0A,
     id_bootloader_jump                      = 0x0B,
     id_dynamic_keymap_macro_get_count       = 0x0C,
@@ -86,21 +96,43 @@ enum via_command_id {
 };
 
 enum via_keyboard_value_id {
-    id_uptime              = 0x01, //
+    id_uptime              = 0x01,
     id_layout_options      = 0x02,
-    id_switch_matrix_state = 0x03
+    id_switch_matrix_state = 0x03,
+    id_firmware_version    = 0x04,
+    id_device_indication   = 0x05,
 };
 
-enum via_lighting_value {
-    // QMK BACKLIGHT
-    id_qmk_backlight_brightness = 0x09,
-    id_qmk_backlight_effect     = 0x0A,
+enum via_channel_id {
+    id_custom_channel         = 0,
+    id_qmk_backlight_channel  = 1,
+    id_qmk_rgblight_channel   = 2,
+    id_qmk_rgb_matrix_channel = 3,
+    id_qmk_audio_channel      = 4,
+};
 
-    // QMK RGBLIGHT
-    id_qmk_rgblight_brightness   = 0x80,
-    id_qmk_rgblight_effect       = 0x81,
-    id_qmk_rgblight_effect_speed = 0x82,
-    id_qmk_rgblight_color        = 0x83,
+enum via_qmk_backlight_value {
+    id_qmk_backlight_brightness = 1,
+    id_qmk_backlight_effect     = 2,
+};
+
+enum via_qmk_rgblight_value {
+    id_qmk_rgblight_brightness   = 1,
+    id_qmk_rgblight_effect       = 2,
+    id_qmk_rgblight_effect_speed = 3,
+    id_qmk_rgblight_color        = 4,
+};
+
+enum via_qmk_rgb_matrix_value {
+    id_qmk_rgb_matrix_brightness   = 1,
+    id_qmk_rgb_matrix_effect       = 2,
+    id_qmk_rgb_matrix_effect_speed = 3,
+    id_qmk_rgb_matrix_color        = 4,
+};
+
+enum via_qmk_audio_value {
+    id_qmk_audio_enable        = 1,
+    id_qmk_audio_clicky_enable = 2,
 };
 
 enum via_keycodes {
@@ -160,5 +192,39 @@ uint32_t via_get_layout_options(void);
 void     via_set_layout_options(uint32_t value);
 void     via_set_layout_options_kb(uint32_t value);
 
+// Used by VIA to tell a device to flash LEDs (or do something else) when that
+// device becomes the active device being configured, on startup or switching
+// between devices.
+void via_set_device_indication(uint8_t value);
+
 // Called by QMK core to process VIA-specific keycodes.
 bool process_record_via(uint16_t keycode, keyrecord_t *record);
+
+// These are made external so that keyboard level custom value handlers can use them.
+#if defined(BACKLIGHT_ENABLE)
+void via_qmk_backlight_command(uint8_t *data, uint8_t length);
+void via_qmk_backlight_set_value(uint8_t *data);
+void via_qmk_backlight_get_value(uint8_t *data);
+void via_qmk_backlight_save(void);
+#endif
+
+#if defined(RGBLIGHT_ENABLE)
+void via_qmk_rgblight_command(uint8_t *data, uint8_t length);
+void via_qmk_rgblight_set_value(uint8_t *data);
+void via_qmk_rgblight_get_value(uint8_t *data);
+void via_qmk_rgblight_save(void);
+#endif
+
+#if defined(RGB_MATRIX_ENABLE)
+void via_qmk_rgb_matrix_command(uint8_t *data, uint8_t length);
+void via_qmk_rgb_matrix_set_value(uint8_t *data);
+void via_qmk_rgb_matrix_get_value(uint8_t *data);
+void via_qmk_rgb_matrix_save(void);
+#endif
+
+#if defined(AUDIO_ENABLE)
+void via_qmk_audio_command(uint8_t *data, uint8_t length);
+void via_qmk_audio_set_value(uint8_t *data);
+void via_qmk_audio_get_value(uint8_t *data);
+void via_qmk_audio_save(void);
+#endif
\ No newline at end of file

From 27dec8d16d8e47da246ce68827c8ce5a433dcb91 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Wed, 9 Nov 2022 21:58:15 +0100
Subject: [PATCH 830/959] [Core] Allow custom timings for WS2812 PIO driver
 (#18006)

---
 docs/ws2812_driver.md                         |   2 +-
 .../drivers/vendor/RP/RP2040/ws2812_vendor.c  | 248 ++++++++++++------
 2 files changed, 172 insertions(+), 78 deletions(-)

diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index 54e6e77d81..5942da28d1 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -175,7 +175,7 @@ Configure the hardware via your config.h:
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
 ```
 
-The WS2812 PIO programm uses 1 state machine, 4 instructions and does not use any interrupt handlers. 
+The WS2812 PIO programm uses 1 state machine, 6 instructions and one DMA interrupt handler callback. Due to the implementation the time resolution for this drivers is 50ns, any value not specified in this interval will be rounded to the next matching interval.
 
 ### Push Pull and Open Drain Configuration
 The default configuration is a push pull on the defined pin.
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
index 4470e2c826..ca130e39f5 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -1,4 +1,4 @@
-// Copyright 2022 Stefan Kerkmann
+// Copyright 2022 Stefan Kerkmann (@KarlK90)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "quantum.h"
@@ -17,53 +17,156 @@ static const PIO pio = pio0;
 #endif
 
 #if !defined(RP_DMA_PRIORITY_WS2812)
-#    define RP_DMA_PRIORITY_WS2812 12
+#    define RP_DMA_PRIORITY_WS2812 3
 #endif
 
-static int state_machine = -1;
-
-#define WS2812_WRAP_TARGET 0
-#define WS2812_WRAP 3
-
-#define WS2812_T1 2
-#define WS2812_T2 5
-#define WS2812_T3 3
-
 #if defined(WS2812_EXTERNAL_PULLUP)
-
 #    pragma message "The GPIOs of the RP2040 are NOT 5V tolerant! Make sure to NOT apply any voltage over 3.3V to the RGB data pin."
-
-// clang-format off
-static const uint16_t ws2812_program_instructions[] = {
-            //     .wrap_target
-    0x7221, //  0: out    x, 1            side 1 [2]
-    0x0123, //  1: jmp    !x, 3           side 0 [1]
-    0x0400, //  2: jmp    0               side 0 [4]
-    0xb442, //  3: nop                    side 1 [4]
-            //     .wrap
-};
-
-#else
-
-static const uint16_t ws2812_program_instructions[] = {
-             //     .wrap_target
-    0x6221,  //  0: out    x, 1            side 0 [2]
-    0x1123,  //  1: jmp    !x, 3           side 1 [1]
-    0x1400,  //  2: jmp    0               side 1 [4]
-    0xa442,  //  3: nop                    side 0 [4]
-             //     .wrap
-};
-// clang-format on
 #endif
 
+/*================== WS2812 PIO TIMINGS =================*/
+
+// WS2812_T1L rounded to 50ns intervals and split into two wait timings
+#define PIO_T1L (WS2812_T1L / 50)
+#define PIO_T1L_A (MAX(CEILING(PIO_T1L, 2) - 1, 0))
+#define PIO_T1L_B (MAX(PIO_T1L / 2 - 1, 0))
+
+// WS2812_T0L rounded to 50ns intervals
+#define PIO_T0L (MAX(WS2812_T0L / 50 - PIO_T1L, 0))
+#define PIO_T0L_A (MAX(PIO_T0L - 1, 0))
+
+// WS2812_T0H rounded to 50ns intervals
+#define PIO_T0H (WS2812_T0H / 50)
+#define PIO_T0H_A MAX(PIO_T0H - 1, 0)
+
+// WS2812_T1H rounded to 50ns intervals and split into two wait timings
+#define PIO_T1H (MAX(WS2812_T1H / 50 - PIO_T0H, 0))
+#define PIO_T1H_A (MAX((CEILING(PIO_T1H, 2) - 1), 0))
+#define PIO_T1H_B (MAX((PIO_T1H / 2) - 1, 0))
+
+#if (WS2812_T0L % 50) != 0
+#    pragma message "WS2812_T0L is not given in an 50ns interval, it will be rounded to the next 50ns"
+#endif
+
+#if (WS2812_T0H % 50) != 0
+#    pragma message "WS2812_T0H is not given in an 50ns interval, it will be rounded to the next 50ns"
+#endif
+
+#if (WS2812_T1L % 50) != 0
+#    pragma message "WS2812_T0L is not given in an 50ns interval, it will be rounded to the next 50ns"
+#endif
+
+#if (WS2812_T1H % 50) != 0
+#    pragma message "WS2812_T0H is not given in an 50ns interval, it will be rounded to the next 50ns"
+#endif
+
+#if WS2812_T0L < WS2812_T1L
+#    error WS2812_T0L is shorter than WS2812_T1L, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T1H < WS2812_T0H
+#    error WS2812_T1H is shorter than WS2812_T0H, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T0L > (850 + WS2812_T1L)
+#    error WS2812_T0L is longer than 850ns + WS2812_T1L, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T0H > 850
+#    error WS2812_T0H is longer than 850ns, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T1H > (1700 + WS2812_T0H)
+#    error WS2812_T1H is longer than 1700ns + WS2812_T0H, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T1L > 1700
+#    error WS2812_T1L is longer than 1700ns, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T0L < (50 + WS2812_T1L)
+#    error WS2812_T0L is shorter than 50ns + WS2812_T1L, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T0H < 50
+#    error WS2812_T0H is shorter than 50ns, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T1H < (100 + WS2812_T0H)
+#    error WS2812_T1H is longer than 100ns + WS2812_T0H, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+#if WS2812_T1L < 100
+#    error WS2812_T1L is longer than 1700ns, this is impossible to express in the RP2040 PIO driver. Please correct your timings.
+#endif
+
+/**
+ * @brief Helper macro to binary patch the delay part of an per-compiled PIO
+ * opcode.
+ */
+#define PIO_DELAY(delay, opcode) (((delay & 0xF) << 8U) | opcode)
+
+#define WS2812_WRAP_TARGET 0
+#define WS2812_WRAP 5
+
+static const uint16_t ws2812_program_instructions[] = {
+    //     .wrap_target
+    PIO_DELAY(PIO_T1L_A, 0x6021), //  0: out    x, 1            side 0  // T1L (max. 1700ns)
+    PIO_DELAY(PIO_T1L_B, 0xa042), //  1: nop                    side 0  // T1L
+    PIO_DELAY(PIO_T0H_A, 0x1025), //  2: jmp    !x, 5           side 1  // T0H (max. 850ns)
+    PIO_DELAY(PIO_T1H_A, 0xb042), //  3: nop                    side 1  // T1H (max. 1700ns + T0H)
+    PIO_DELAY(PIO_T1H_B, 0x1000), //  4: jmp    0               side 1  // T1H
+    PIO_DELAY(PIO_T0L_A, 0xa042), //  5: nop                    side 0  // T0L (max. 850ns + T1L)
+    //     .wrap
+};
+
 static const pio_program_t ws2812_program = {
     .instructions = ws2812_program_instructions,
-    .length       = 4,
+    .length       = ARRAY_SIZE(ws2812_program_instructions),
     .origin       = -1,
 };
 
 static uint32_t                WS2812_BUFFER[WS2812_LED_COUNT];
 static const rp_dma_channel_t* WS2812_DMA_CHANNEL;
+static uint32_t                RP_DMA_MODE_WS2812;
+static int                     STATE_MACHINE = -1;
+
+static SEMAPHORE_DECL(TRANSFER_COUNTER, 1);
+static rtcnt_t LAST_TRANSFER;
+
+/**
+ * @brief Convert RGBW value into WS2812 compatible 32-bit data word.
+ */
+__always_inline static uint32_t rgbw8888_to_u32(uint8_t red, uint8_t green, uint8_t blue, uint8_t white) {
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
+    return ((uint32_t)green << 24) | ((uint32_t)red << 16) | ((uint32_t)blue << 8) | ((uint32_t)white);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+    return ((uint32_t)red << 24) | ((uint32_t)green << 16) | ((uint32_t)blue << 8) | ((uint32_t)white);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR)
+    return ((uint32_t)blue << 24) | ((uint32_t)green << 16) | ((uint32_t)red << 8) | ((uint32_t)white);
+#endif
+}
+
+static void ws2812_dma_callback(void* p, uint32_t ct) {
+    // We assume that there is at least one frame left in the OSR even if the TX
+    // FIFO is already empty.
+    rtcnt_t time_to_completion = (pio_sm_get_tx_fifo_level(pio, STATE_MACHINE) + 1) * MAX(WS2812_T1H + WS2812_T1L, WS2812_T0H + WS2812_T0L);
+
+#if defined(RGBW)
+    time_to_completion *= 32;
+#else
+    time_to_completion *= 24;
+#endif
+
+    // Convert from ns to us
+    time_to_completion /= 1000;
+
+    LAST_TRANSFER = chSysGetRealtimeCounterX() + time_to_completion + WS2812_TRST_US;
+
+    osalSysLockFromISR();
+    chSemSignalI(&TRANSFER_COUNTER);
+    osalSysUnlockFromISR();
+}
 
 bool ws2812_init(void) {
     uint pio_idx = pio_get_index(pio);
@@ -73,20 +176,23 @@ bool ws2812_init(void) {
     // clang-format off
     iomode_t rgb_pin_mode = PAL_RP_PAD_SLEWFAST |
                             PAL_RP_GPIO_OE |
+#if defined(WS2812_EXTERNAL_PULLUP)
+                            PAL_RP_IOCTRL_OEOVER_DRVINVPERI |
+#endif
                             (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1);
     // clang-format on
 
     palSetLineMode(RGB_DI_PIN, rgb_pin_mode);
 
-    state_machine = pio_claim_unused_sm(pio, true);
-    if (state_machine < 0) {
+    STATE_MACHINE = pio_claim_unused_sm(pio, true);
+    if (STATE_MACHINE < 0) {
         dprintln("ERROR: Failed to acquire state machine for WS2812 output!");
         return false;
     }
 
     uint offset = pio_add_program(pio, &ws2812_program);
 
-    pio_sm_set_consecutive_pindirs(pio, state_machine, RGB_DI_PIN, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, STATE_MACHINE, RGB_DI_PIN, 1, true);
 
     pio_sm_config config = pio_get_default_sm_config();
     sm_config_set_wrap(&config, offset + WS2812_WRAP_TARGET, offset + WS2812_WRAP);
@@ -113,57 +219,44 @@ bool ws2812_init(void) {
     sm_config_set_out_shift(&config, false, true, 24);
 #endif
 
-    int   cycles_per_bit = WS2812_T1 + WS2812_T2 + WS2812_T3;
-    float div            = clock_get_hz(clk_sys) / (800.0f * KHZ * cycles_per_bit);
+    // Every instruction takes 50ns to execute with a clock speed of 20 MHz,
+    // giving the WS2812 PIO driver its time resolution
+    float div = clock_get_hz(clk_sys) / (20.0f * MHZ);
     sm_config_set_clkdiv(&config, div);
 
-    pio_sm_init(pio, state_machine, offset, &config);
-    pio_sm_set_enabled(pio, state_machine, true);
+    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, NULL, NULL);
+    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]);
 
     // clang-format off
-    uint32_t mode = DMA_CTRL_TRIG_INCR_READ |
-                    DMA_CTRL_TRIG_DATA_SIZE_WORD |
-                    DMA_CTRL_TRIG_IRQ_QUIET |
-                    DMA_CTRL_TRIG_TREQ_SEL(pio_idx == 0 ? state_machine : state_machine + 8);
+    RP_DMA_MODE_WS2812 = DMA_CTRL_TRIG_INCR_READ |
+                         DMA_CTRL_TRIG_DATA_SIZE_WORD |
+                         DMA_CTRL_TRIG_TREQ_SEL(pio == pio0 ? STATE_MACHINE : STATE_MACHINE + 8) |
+                         DMA_CTRL_TRIG_PRIORITY(RP_DMA_PRIORITY_WS2812);
     // clang-format on
 
-    dmaChannelSetModeX(WS2812_DMA_CHANNEL, mode);
-    dmaChannelSetDestinationX(WS2812_DMA_CHANNEL, (uint32_t)&pio->txf[state_machine]);
     return true;
 }
 
-/**
- * @brief Convert RGBW value into WS2812 compatible 32-bit data word.
- */
-__always_inline static uint32_t rgbw8888_to_u32(uint8_t red, uint8_t green, uint8_t blue, uint8_t white) {
-#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
-    return ((uint32_t)green << 24) | ((uint32_t)red << 16) | ((uint32_t)blue << 8) | ((uint32_t)white);
-#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
-    return ((uint32_t)red << 24) | ((uint32_t)green << 16) | ((uint32_t)blue << 8) | ((uint32_t)white);
-#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR)
-    return ((uint32_t)blue << 24) | ((uint32_t)green << 16) | ((uint32_t)red << 8) | ((uint32_t)white);
-#endif
-}
-
 static inline void sync_ws2812_transfer(void) {
-    if (unlikely(dmaChannelIsBusyX(WS2812_DMA_CHANNEL) || !pio_sm_is_tx_fifo_empty(pio, state_machine))) {
-        fast_timer_t start = timer_read_fast();
-        do {
-            // Abort the synchronization if we have to wait longer than the total
-            // count of LEDs in millisecounds. This is safely much longer than it
-            // would take to push all the data out.
-            if (unlikely(timer_elapsed_fast(start) > WS2812_LED_COUNT)) {
-                dprintln("ERROR: WS2812 DMA transfer has stalled, aborting!");
-                dmaChannelDisableX(WS2812_DMA_CHANNEL);
-                return;
-            }
-
-        } while (dmaChannelIsBusyX(WS2812_DMA_CHANNEL) || !pio_sm_is_tx_fifo_empty(pio, state_machine));
-        // We wait for the WS2812 chain to reset after all data has been pushed
-        // out.
+    if (chSemWaitTimeout(&TRANSFER_COUNTER, TIME_MS2I(RGBLED_NUM)) == MSG_TIMEOUT) {
+        // Abort the synchronization if we have to wait longer than the total
+        // 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);
+        pio_sm_clear_fifos(pio, STATE_MACHINE);
+        pio_sm_restart(pio, STATE_MACHINE);
+        chSemReset(&TRANSFER_COUNTER, 0);
         wait_us(WS2812_TRST_US);
+        return;
+    }
+
+    // Busy wait until last transfer has finished
+    while (unlikely(!timer_expired32(chSysGetRealtimeCounterX(), LAST_TRANSFER))) {
     }
 }
 
@@ -185,5 +278,6 @@ void ws2812_setleds(LED_TYPE* ledarray, uint16_t leds) {
 
     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);
 }

From 84920ff5f4c1dfb3c84ca175899f81804be30396 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Thu, 10 Nov 2022 08:26:43 +1100
Subject: [PATCH 831/959] Addition of the Binepad BN006 6-key macropad (#18810)

---
 keyboards/binepad/bn006/config.h              | 79 +++++++++++++++++++
 keyboards/binepad/bn006/info.json             | 52 ++++++++++++
 .../binepad/bn006/keymaps/default/keymap.c    | 18 +++++
 keyboards/binepad/bn006/keymaps/via/keymap.c  | 33 ++++++++
 keyboards/binepad/bn006/keymaps/via/rules.mk  |  4 +
 keyboards/binepad/bn006/readme.md             | 26 ++++++
 keyboards/binepad/bn006/rules.mk              |  5 ++
 7 files changed, 217 insertions(+)
 create mode 100755 keyboards/binepad/bn006/config.h
 create mode 100755 keyboards/binepad/bn006/info.json
 create mode 100755 keyboards/binepad/bn006/keymaps/default/keymap.c
 create mode 100755 keyboards/binepad/bn006/keymaps/via/keymap.c
 create mode 100644 keyboards/binepad/bn006/keymaps/via/rules.mk
 create mode 100755 keyboards/binepad/bn006/readme.md
 create mode 100755 keyboards/binepad/bn006/rules.mk

diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h
new file mode 100755
index 0000000000..9a06ef50ee
--- /dev/null
+++ b/keyboards/binepad/bn006/config.h
@@ -0,0 +1,79 @@
+/* Copyright 2022 Binepad (@binpad) */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+/*
+ * Wear Leveling EEPROM Emulation
+ */
+
+#define WEAR_LEVELING_LOGICAL_SIZE 2048                              // Number of bytes "exposed" to the rest of QMK and denotes the size of the usable EEPROM.
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)  // Number of bytes used by the wear-leveling algorithm for its underlying storage, and needs to be a multiple of the logical size.
+
+
+/*
+ * RGB Matrix
+ */
+
+#ifdef RGB_MATRIX_ENABLE
+    /* ===========================================================================================
+     * PLEASE NOTE:  Because the BN006 only has 6 keys, not all the animations are visually viable
+     * =========================================================================================== */
+
+    #define RGB_DI_PIN B15
+    #define DRIVER_LED_TOTAL 6
+    #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_BREATHING // Sets the default mode, if none has been set
+    #define RGB_TRIGGER_ON_KEYDOWN      // Triggers RGB keypress events on key down. This makes RGB control feel more responsive. This may cause RGB to not function properly on some boards
+
+    // RGB Matrix Animation modes. Explicitly enabled
+    // For full list of effects, see: https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+    #define ENABLE_RGB_MATRIX_SOLID_COLOR
+    // #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    // #define ENABLE_RGB_MATRIX_BAND_SAT
+    // #define ENABLE_RGB_MATRIX_BAND_VAL
+    // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+    // #define ENABLE_RGB_MATRIX_CYCLE_ALL
+    // #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    // #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    // #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+    // #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    // #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+    // #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    // #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    // #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    // #define ENABLE_RGB_MATRIX_RAINDROPS
+    // #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    // #define ENABLE_RGB_MATRIX_HUE_BREATHING
+    // #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+    // #define ENABLE_RGB_MATRIX_HUE_WAVE
+    // #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+    // #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+    // #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+    // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+    // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_SPLASH
+    // #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+    // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/info.json
new file mode 100755
index 0000000000..c0147a564e
--- /dev/null
+++ b/keyboards/binepad/bn006/info.json
@@ -0,0 +1,52 @@
+{
+    "manufacturer": "Binepad",
+    "keyboard_name": "BN006",
+    "maintainer": "Binepad",
+    "bootloader": "stm32duino",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4"],
+        "rows": ["A8", "C14"]
+    },
+    "processor": "STM32F103",
+    "url": "https://binepad.com",
+    "usb": {
+        "vid": "0x4249",
+        "pid": "0x426E",
+        "device_version": "1.0.0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 112, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 224, "y": 0 },
+            { "flags": 4, "matrix": [1, 0], "x": 0, "y": 64 },
+            { "flags": 4, "matrix": [1, 1], "x": 112, "y": 64 },
+            { "flags": 4, "matrix": [1, 2], "x": 224, "y": 64 }
+        ]
+    },
+    "community_layouts": ["ortho_2x3"],
+    "layouts": {
+        "LAYOUT_ortho_2x3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/binepad/bn006/keymaps/default/keymap.c b/keyboards/binepad/bn006/keymaps/default/keymap.c
new file mode 100755
index 0000000000..a79ff505a1
--- /dev/null
+++ b/keyboards/binepad/bn006/keymaps/default/keymap.c
@@ -0,0 +1,18 @@
+/* Copyright 2022 Binepad (@binpad) */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┐
+     * │ A │ B │ C │
+     * ├───┼───┼───┤
+     * │ D │ E │ F │
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_2x3(
+        KC_MPLY, KC_MUTE, KC_VOLU,
+        KC_MPRV, KC_MNXT, KC_VOLD
+    )
+};
diff --git a/keyboards/binepad/bn006/keymaps/via/keymap.c b/keyboards/binepad/bn006/keymaps/via/keymap.c
new file mode 100755
index 0000000000..1ee98f890c
--- /dev/null
+++ b/keyboards/binepad/bn006/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Binepad (@binpad) */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┐
+     * │ A │ B │ C │
+     * ├───┼───┼───┤
+     * │ D │ E │ F │
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_2x3(
+        KC_MPLY, KC_MUTE, KC_VOLU,
+        KC_MPRV, KC_MNXT, KC_VOLD
+    ),
+
+    [1] = LAYOUT_ortho_2x3(
+        _______, _______, _______,
+        _______, _______, _______
+    ),
+
+    [2] = LAYOUT_ortho_2x3(
+        _______, _______, _______,
+        _______, _______, _______
+    ),
+
+    [3] = LAYOUT_ortho_2x3(
+        _______, _______, _______,
+        _______, _______, _______
+    )
+};
diff --git a/keyboards/binepad/bn006/keymaps/via/rules.mk b/keyboards/binepad/bn006/keymaps/via/rules.mk
new file mode 100644
index 0000000000..78ee487f45
--- /dev/null
+++ b/keyboards/binepad/bn006/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2022 Binepad (@binpad)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+VIA_ENABLE = yes
diff --git a/keyboards/binepad/bn006/readme.md b/keyboards/binepad/bn006/readme.md
new file mode 100755
index 0000000000..1964b5dced
--- /dev/null
+++ b/keyboards/binepad/bn006/readme.md
@@ -0,0 +1,26 @@
+# BINEPAD BN006
+
+The BN006 is a CNC machined 6-key macropad
+
+* Keyboard Maintainer: [Binepad](https://github.com/binepad)
+* Hardware Supported: BN006
+* Hardware Availability: [Binepad.com](https://www.binepad.com/bn006)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make binepad/bn006:default
+
+Flashing example for this keyboard:
+
+    make binepad/bn006:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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) 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` *(or `RESET`)* if it is available
diff --git a/keyboards/binepad/bn006/rules.mk b/keyboards/binepad/bn006/rules.mk
new file mode 100755
index 0000000000..58561c984b
--- /dev/null
+++ b/keyboards/binepad/bn006/rules.mk
@@ -0,0 +1,5 @@
+# Copyright 2022 Binepad (@binpad)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+EPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash

From bc269702ee5e9317deb18eb9c7f2717454f6740f Mon Sep 17 00:00:00 2001
From: ForsakenRei <23041178+ForsakenRei@users.noreply.github.com>
Date: Wed, 9 Nov 2022 20:27:09 -0500
Subject: [PATCH 832/959] KC_GESC -> QK_GESC and better alignment (#19018)

---
 .../gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c |  6 +++---
 .../gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c |  4 ++--
 .../gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c     |  6 +++---
 .../gmmk/gmmk2/p65/iso/keymaps/default/keymap.c  |  2 +-
 .../gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c | 10 +++++-----
 .../gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c     | 16 ++++++++--------
 .../gmmk/gmmk2/p96/iso/keymaps/default/keymap.c  |  4 ++--
 .../gmmk/gmmk2/p96/iso/keymaps/via/keymap.c      |  8 ++++----
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
index 7b84bca595..49a1882851 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
@@ -28,15 +28,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_BL] = LAYOUT(
   QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
-  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_PGUP,
-  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,            KC_PGDN,
+  KC_TAB,   KC_Q,     KC_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,
+  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,    _______,  KC_INS,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
   _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  KC_HOME,
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
index 69ad291c08..c5f90e3fee 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
    */
 [_BL] = LAYOUT(
-  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+  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,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-   KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,  KC_INS,
+  KC_GRV,   KC_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,
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
index 38f89379e6..cf6200adc7 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
@@ -22,15 +22,15 @@ 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_DEL,
-  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_PGUP,
-  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,            KC_PGDN,
+  KC_TAB,   KC_Q,     KC_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
    */
 [1] = LAYOUT(
-   KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,  KC_INS,
+  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,    _______,  KC_INS,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
   _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  KC_HOME,
diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
index 03cdcfc10e..1ab85d7f0a 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_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_INS,
+  _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,    _______,  KC_INS,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
   _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  KC_HOME,
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
index 27d1d74c9f..2fc12c4f03 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
@@ -29,18 +29,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT(
   QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
-  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_P4,    KC_P5,    KC_P6,
   KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
   KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT),
 
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,   _______,  _______,  _______,  _______,  _______,
+  QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-	_______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
+  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_VAI,   _______,  _______,  _______,  _______,
+  _______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD,  _______,  _______)
 };
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
index 15c2b2b3b9..bc2699b137 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
@@ -29,25 +29,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT(
   QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,   KC_INS,   KC_PGUP,  KC_PGDN,
   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
-  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,   KC_P4,    KC_P5,    KC_P6,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_P4,    KC_P5,    KC_P6,
   KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
   KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT),
 
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+  QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-	_______,  UC_WIN,  _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
+  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_VAI,   _______,  _______,  _______,  _______,
+  _______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD,  _______,  _______),
 [2] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
-	_______,  _______,  _______,                      _______,                                _______,  _______,  _______, _______,   _______,  _______,  _______,  _______)
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,
+  _______,  _______,  _______,                      _______,                                _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______)
 };
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
index 8662bdf630..0f56355d09 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/keymap.c
@@ -35,10 +35,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+  QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
   _______,  _______,  RGB_SAI,  RGB_SAD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-  _______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______)
+  _______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD,  _______,  _______)
 };
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
index 1b73959bce..f3b4336001 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/keymap.c
@@ -35,17 +35,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _FL: Function Layer
    */
 [_FL] = LAYOUT(
-    QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
+  QK_BOOT,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MRWD,  KC_MPLY,  KC_MSTP,  KC_MUTE,  KC_VOLU,  KC_VOLD,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
   _______,  _______,  RGB_SAI,  RGB_SAD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   RGB_VAI,  _______,  _______,  _______,  _______,
-	_______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______, RGB_RMOD,   RGB_VAD,  RGB_MOD,  _______,  _______),
+  _______,  UC_WIN,   _______,                      _______,                                _______,  _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD,  _______,  _______),
 [2] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,
-	_______,  _______,  _______,                      _______,                                _______,  _______,  _______, _______,   _______,  _______,  _______,  _______)
+  _______,  _______,  _______,                      _______,                                _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______)
 };

From f6baf916a9ac14cd150f65054573cd1a0e732c5a Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Thu, 10 Nov 2022 04:27:40 -0500
Subject: [PATCH 833/959] Avoid repeated calls to rgblight_set() in tight
 succession when setting lighting layers (#18338)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
---
 quantum/rgblight/rgblight.c | 38 ++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 37cd7a66ab..f832854c5f 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -127,6 +127,8 @@ LED_TYPE led[RGBLED_NUM];
 
 #ifdef RGBLIGHT_LAYERS
 rgblight_segment_t const *const *rgblight_layers = NULL;
+
+static bool deferred_set_layer_state = false;
 #endif
 
 rgblight_ranges_t rgblight_ranges = {0, RGBLED_NUM, 0, RGBLED_NUM, RGBLED_NUM};
@@ -748,17 +750,13 @@ void rgblight_set_layer_state(uint8_t layer, bool enabled) {
         rgblight_status.enabled_layer_mask &= ~mask;
     }
     RGBLIGHT_SPLIT_SET_CHANGE_LAYERS;
-    // Static modes don't have a ticker running to update the LEDs
-    if (rgblight_status.timer_enabled == false) {
-        rgblight_mode_noeeprom(rgblight_config.mode);
-    }
 
-#    ifdef RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-    // If not enabled, then nothing else will actually set the LEDs...
-    if (!rgblight_config.enable) {
-        rgblight_set();
-    }
-#    endif
+    // Calling rgblight_set() here (directly or indirectly) could
+    // potentially cause timing issues when there are multiple
+    // successive calls to rgblight_set_layer_state(). Instead,
+    // set a flag and do it the next time rgblight_task() runs.
+
+    deferred_set_layer_state = true;
 }
 
 bool rgblight_get_layer_state(uint8_t layer) {
@@ -1154,8 +1152,26 @@ void rgblight_task(void) {
         }
     }
 
-#    ifdef RGBLIGHT_LAYER_BLINK
+#    ifdef RGBLIGHT_LAYERS
+#        ifdef RGBLIGHT_LAYER_BLINK
     rgblight_blink_layer_repeat_helper();
+#        endif
+
+    if (deferred_set_layer_state) {
+        deferred_set_layer_state = false;
+
+        // Static modes don't have a ticker running to update the LEDs
+        if (rgblight_status.timer_enabled == false) {
+            rgblight_mode_noeeprom(rgblight_config.mode);
+        }
+
+#        ifdef RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+        // If not enabled, then nothing else will actually set the LEDs...
+        if (!rgblight_config.enable) {
+            rgblight_set();
+        }
+#        endif
+    }
 #    endif
 }
 

From 6562c5a940fc469413c0cc7e9c6b19a18ca4988e Mon Sep 17 00:00:00 2001
From: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com>
Date: Thu, 10 Nov 2022 13:36:55 -0700
Subject: [PATCH 834/959] Adding Synth and Keys' Debit Card (#18995)

* Adding Synth and Keys' Debit Card

Initial Commit

* Add files via upload

* Delete config.h

* Update keyboards/synthandkeys/the_debit_card/info.json

Co-authored-by: Joel Challis <git@zvecr.com>
---
 .../synthandkeys/the_debit_card/info.json     | 44 +++++++++++++++++++
 .../the_debit_card/keymaps/default/keymap.c   | 22 ++++++++++
 .../synthandkeys/the_debit_card/readme.md     | 27 ++++++++++++
 .../synthandkeys/the_debit_card/rules.mk      |  1 +
 4 files changed, 94 insertions(+)
 create mode 100644 keyboards/synthandkeys/the_debit_card/info.json
 create mode 100644 keyboards/synthandkeys/the_debit_card/keymaps/default/keymap.c
 create mode 100644 keyboards/synthandkeys/the_debit_card/readme.md
 create mode 100644 keyboards/synthandkeys/the_debit_card/rules.mk

diff --git a/keyboards/synthandkeys/the_debit_card/info.json b/keyboards/synthandkeys/the_debit_card/info.json
new file mode 100644
index 0000000000..3902859e37
--- /dev/null
+++ b/keyboards/synthandkeys/the_debit_card/info.json
@@ -0,0 +1,44 @@
+{
+    "manufacturer": "Synth and Keys",
+    "keyboard_name": "synthandkeys/the_debit_card",
+    "maintainer": "Synth-and-Keys",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP6", "GP7", "GP0", null],
+            ["GP27", "GP28", "GP29", null],
+            ["GP1", "GP2", "GP4", "GP3"]
+        ]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 1.5, "h": 1.5 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/synthandkeys/the_debit_card/keymaps/default/keymap.c b/keyboards/synthandkeys/the_debit_card/keymaps/default/keymap.c
new file mode 100644
index 0000000000..aa5468c45c
--- /dev/null
+++ b/keyboards/synthandkeys/the_debit_card/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2022 Synth and Keys (@Synth-and-Keys)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * -------------
+     * | 1 | 2 | 3 |
+     * -------------
+     * | 4 | 5 | 6 |
+     * -----------------
+     * | 7 | 8 | 9 | 0 |
+     * -----------------
+
+     */
+    [0] = LAYOUT(
+        KC_P1,   KC_P2,   KC_P3,
+        KC_P4,   KC_P5,   KC_P6,
+        KC_P7,   KC_P8,   KC_P9,   KC_P0
+    )
+};
\ No newline at end of file
diff --git a/keyboards/synthandkeys/the_debit_card/readme.md b/keyboards/synthandkeys/the_debit_card/readme.md
new file mode 100644
index 0000000000..db2fb14cf6
--- /dev/null
+++ b/keyboards/synthandkeys/the_debit_card/readme.md
@@ -0,0 +1,27 @@
+# synthandkeys/the_debit_card
+
+![synthandkeys/the_debit_card](https://i.imgur.com/8dpEv73.jpeg)
+
+The Debit Card is a 10-key programmable mechanical keyboard that could fit in your wallet. The ultra-thin, ultra-portable macropad is powered by the XIAO RP2040 and can support KMK, QMK, or VIAL open-source keyboard firmware.
+
+* Keyboard Maintainer: [Synth and Keys](https://github.com/Synth-and-Keys)
+* Hardware Supported: The Debit Card PCB, Seeed XIAO MCU
+* Hardware Availability: https://etsy.me/3UslJQF, https://www.seeedstudio.com/XIAO-RP2040-v1-0-p-5026.html
+
+Make example for this keyboard (after setting up your build environment):
+
+    make synthandkeys/the_debit_card:default
+
+Flashing example for this keyboard:
+
+    make synthandkeys/the_debit_card:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Press the button on the Seeed XIAO microcontroller twice.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/synthandkeys/the_debit_card/rules.mk b/keyboards/synthandkeys/the_debit_card/rules.mk
new file mode 100644
index 0000000000..c281ae9f6c
--- /dev/null
+++ b/keyboards/synthandkeys/the_debit_card/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 81625e5091c8e4b0e204b1f90cdff28522910d90 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Thu, 10 Nov 2022 12:42:16 -0800
Subject: [PATCH 835/959] Format code according to conventions (#19026)

---
 .../synthandkeys/the_debit_card/info.json     | 86 +++++++++----------
 .../synthandkeys/the_debit_card/readme.md     | 54 ++++++------
 .../synthandkeys/the_debit_card/rules.mk      |  2 +-
 3 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/keyboards/synthandkeys/the_debit_card/info.json b/keyboards/synthandkeys/the_debit_card/info.json
index 3902859e37..bf255b76eb 100644
--- a/keyboards/synthandkeys/the_debit_card/info.json
+++ b/keyboards/synthandkeys/the_debit_card/info.json
@@ -1,44 +1,44 @@
-{
-    "manufacturer": "Synth and Keys",
-    "keyboard_name": "synthandkeys/the_debit_card",
-    "maintainer": "Synth-and-Keys",
-    "bootloader": "rp2040",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "direct": [
-            ["GP6", "GP7", "GP0", null],
-            ["GP27", "GP28", "GP29", null],
-            ["GP1", "GP2", "GP4", "GP3"]
-        ]
-    },
-    "processor": "RP2040",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 1.5, "h": 1.5 }
-            ]
-        }
-    }
+{
+    "manufacturer": "Synth and Keys",
+    "keyboard_name": "synthandkeys/the_debit_card",
+    "maintainer": "Synth-and-Keys",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP6", "GP7", "GP0", null],
+            ["GP27", "GP28", "GP29", null],
+            ["GP1", "GP2", "GP4", "GP3"]
+        ]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 1.5, "h": 1.5 }
+            ]
+        }
+    }
 }
\ No newline at end of file
diff --git a/keyboards/synthandkeys/the_debit_card/readme.md b/keyboards/synthandkeys/the_debit_card/readme.md
index db2fb14cf6..6e1b2e0ac3 100644
--- a/keyboards/synthandkeys/the_debit_card/readme.md
+++ b/keyboards/synthandkeys/the_debit_card/readme.md
@@ -1,27 +1,27 @@
-# synthandkeys/the_debit_card
-
-![synthandkeys/the_debit_card](https://i.imgur.com/8dpEv73.jpeg)
-
-The Debit Card is a 10-key programmable mechanical keyboard that could fit in your wallet. The ultra-thin, ultra-portable macropad is powered by the XIAO RP2040 and can support KMK, QMK, or VIAL open-source keyboard firmware.
-
-* Keyboard Maintainer: [Synth and Keys](https://github.com/Synth-and-Keys)
-* Hardware Supported: The Debit Card PCB, Seeed XIAO MCU
-* Hardware Availability: https://etsy.me/3UslJQF, https://www.seeedstudio.com/XIAO-RP2040-v1-0-p-5026.html
-
-Make example for this keyboard (after setting up your build environment):
-
-    make synthandkeys/the_debit_card:default
-
-Flashing example for this keyboard:
-
-    make synthandkeys/the_debit_card:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-## Bootloader
-
-Enter the bootloader in 3 ways:
-
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
-* **Physical reset button**: Press the button on the Seeed XIAO microcontroller twice.
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+# synthandkeys/the_debit_card
+
+![synthandkeys/the_debit_card](https://i.imgur.com/8dpEv73.jpeg)
+
+The Debit Card is a 10-key programmable mechanical keyboard that could fit in your wallet. The ultra-thin, ultra-portable macropad is powered by the XIAO RP2040 and can support KMK, QMK, or VIAL open-source keyboard firmware.
+
+* Keyboard Maintainer: [Synth and Keys](https://github.com/Synth-and-Keys)
+* Hardware Supported: The Debit Card PCB, Seeed XIAO MCU
+* Hardware Availability: https://etsy.me/3UslJQF, https://www.seeedstudio.com/XIAO-RP2040-v1-0-p-5026.html
+
+Make example for this keyboard (after setting up your build environment):
+
+    make synthandkeys/the_debit_card:default
+
+Flashing example for this keyboard:
+
+    make synthandkeys/the_debit_card:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Press the button on the Seeed XIAO microcontroller twice.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/synthandkeys/the_debit_card/rules.mk b/keyboards/synthandkeys/the_debit_card/rules.mk
index c281ae9f6c..6e7633bfe0 100644
--- a/keyboards/synthandkeys/the_debit_card/rules.mk
+++ b/keyboards/synthandkeys/the_debit_card/rules.mk
@@ -1 +1 @@
-# This file intentionally left blank
+# This file intentionally left blank

From dbd5a1d82149ced34661480ba3471aa1c2bba94a Mon Sep 17 00:00:00 2001
From: Sid Quinsaat <37809009+sharkby7e@users.noreply.github.com>
Date: Thu, 10 Nov 2022 13:52:24 -0800
Subject: [PATCH 836/959] [Keymap] sharkby7e keymap updates (#18906)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/crkbd/keymaps/sharkby7e/config.h |  51 ++++++
 keyboards/crkbd/keymaps/sharkby7e/keymap.c | 176 +++++++++++++++++++++
 keyboards/crkbd/keymaps/sharkby7e/rules.mk |   6 +
 3 files changed, 233 insertions(+)
 create mode 100644 keyboards/crkbd/keymaps/sharkby7e/config.h
 create mode 100644 keyboards/crkbd/keymaps/sharkby7e/keymap.c
 create mode 100644 keyboards/crkbd/keymaps/sharkby7e/rules.mk

diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h
new file mode 100644
index 0000000000..b1896bea90
--- /dev/null
+++ b/keyboards/crkbd/keymaps/sharkby7e/config.h
@@ -0,0 +1,51 @@
+/*
+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 TAPPING_FORCE_HOLD
+#define TAPPING_TERM 200
+#define IGNORE_MOD_TAP_INTERRUPT
+
+#ifdef RGBLIGHT_ENABLE
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_ALTERNATING
+    #define RGBLIGHT_EFFECT_TWINKLE
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
+#endif
+
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/sharkby7e/keymap.c b/keyboards/crkbd/keymaps/sharkby7e/keymap.c
new file mode 100644
index 0000000000..e37ef9881b
--- /dev/null
+++ b/keyboards/crkbd/keymaps/sharkby7e/keymap.c
@@ -0,0 +1,176 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include <stdio.h>
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split_3x6_3(
+  // \--------------------------------------------------------------------|  |---------------------------------------------------------------------/
+       XXXXXXX,   KC_Q,   KC_W,        KC_F,          KC_P,       KC_B,        KC_J,        KC_L,          KC_U,       KC_Y,    KC_BSPC,  XXXXXXX,
+  // \----------+-------+-------+---------------+---------------+---------|  |--------+---------------+---------------+--------+---------+---------/
+       XXXXXXX,   KC_A,   KC_R,   LCTL_T(KC_S),   LGUI_T(KC_T),   KC_G,        KC_M,    RGUI_T(KC_N),   RCTL_T(KC_E),   KC_I,     KC_O,   XXXXXXX,
+  // \----------+-------+-------+---------------+---------------+---------|  |--------+---------------+---------------+--------+---------+---------/
+       XXXXXXX,   KC_Z,   KC_X,        KC_C,          KC_D,       KC_V,        KC_K,        KC_H,         KC_COMM,     KC_DOT,  KC_SLSH,  XXXXXXX,
+  // \----------+-------+-------+---------------+---------------+---------|  |--------+---------------+---------------+--------+---------+---------/
+                                      KC_ESC,         MO(1),      KC_LSPO,     KC_SPC,      MO(2),        KC_TAB
+//                              \---------------+---------------+---------|  |--------+---------------+---------------/
+
+  ),
+
+  [1] = LAYOUT_split_3x6_3(
+  //,------------------------------------------------------.         ,-----------------------------------------------------.
+       KC_NO,  KC_GRV,  KC_TILD, KC_PEQL, KC_UNDS, KC_PIPE,            KC_PPLS,    KC_7,    KC_8,    KC_9,    KC_BSPC, KC_NO,
+  //|--------+--------+--------+--------+--------+--------|         |--------+--------+--------+--------+--------+--------|
+      KC_NO , KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_RPRN,           KC_PMNS, RGUI_T(KC_4),   RCTL_T(KC_5), KC_6, KC_QUOT, KC_NO,
+  //|--------+--------+--------+--------+--------+--------|         |--------+--------+--------+--------+--------+--------|
+      KC_NO, KC_NO, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS,               KC_SCLN, KC_1, KC_2, KC_3, KC_DQUO, KC_NO,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_TRNS,     KC_RSFT,   MO(3), KC_0
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.            ,-----------------------------------------------------.
+       KC_NO,   KC_ESC,  KC_NO,   KC_NO,  KC_NO,   KC_NO,                 KC_NO,   KC_NO,  KC_ENT,  KC_NO,   KC_DEL, KC_NO,
+  //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------|
+      KC_NO, KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                KC_LEFT,  KC_DOWN, KC_UP, KC_RIGHT, KC_NO,  KC_NO,
+  //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------|
+      KC_NO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3),  KC_LSFT,     KC_TRNS, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+  return rotation;
+}
+
+#define L_BASE 0
+#define L_LOWER 2
+#define L_RAISE 4
+#define L_ADJUST 8
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("Layer: "), false);
+    switch (layer_state) {
+        case L_BASE:
+            oled_write_ln_P(PSTR("Default"), false);
+            break;
+        case L_LOWER:
+            oled_write_ln_P(PSTR("Lower"), false);
+            break;
+        case L_RAISE:
+            oled_write_ln_P(PSTR("Raise"), false);
+            break;
+        case L_ADJUST:
+        case L_ADJUST|L_LOWER:
+        case L_ADJUST|L_RAISE:
+        case L_ADJUST|L_LOWER|L_RAISE:
+            oled_write_ln_P(PSTR("Adjust"), false);
+            break;
+    }
+}
+
+
+char keylog_str[24] = {};
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+  if (keycode < 60) {
+    name = code_to_name[keycode];
+  }
+
+  // update keylog
+  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
+}
+
+void oled_render_keylog(void) {
+    oled_write(keylog_str, false);
+}
+
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+void oled_render_logo(void) {
+    static const char PROGMEM crkbd_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0};
+    oled_write_P(crkbd_logo, false);
+}
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_layer_state();
+        oled_render_keylog();
+    } else {
+        oled_render_logo();
+    }
+    return false;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    set_keylog(keycode, record);
+  }
+  return true;
+}
+#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/sharkby7e/rules.mk b/keyboards/crkbd/keymaps/sharkby7e/rules.mk
new file mode 100644
index 0000000000..38a8cf1bdb
--- /dev/null
+++ b/keyboards/crkbd/keymaps/sharkby7e/rules.mk
@@ -0,0 +1,6 @@
+MOUSEKEY_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
+LTO_ENABLE      = yes
+BOOTLOADER = caterina

From 159ec766f79f640bb05b212f8d7f99b05f8a7af3 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 10 Nov 2022 15:37:10 -0700
Subject: [PATCH 837/959] Fixup bn006 on develop (#19029)

---
 keyboards/binepad/bn006/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h
index 9a06ef50ee..50129afa9e 100755
--- a/keyboards/binepad/bn006/config.h
+++ b/keyboards/binepad/bn006/config.h
@@ -21,7 +21,7 @@
      * =========================================================================================== */
 
     #define RGB_DI_PIN B15
-    #define DRIVER_LED_TOTAL 6
+    #define RGB_MATRIX_LED_COUNT 6
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
     #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255

From dad5262425c311b3e14cf886a29c312e3edf7dd4 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 10 Nov 2022 15:38:13 -0700
Subject: [PATCH 838/959] Fixup WS2812 vendor driver (#19028)

---
 platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
index ca130e39f5..bc03213f3b 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -242,7 +242,7 @@ bool ws2812_init(void) {
 }
 
 static inline void sync_ws2812_transfer(void) {
-    if (chSemWaitTimeout(&TRANSFER_COUNTER, TIME_MS2I(RGBLED_NUM)) == MSG_TIMEOUT) {
+    if (chSemWaitTimeout(&TRANSFER_COUNTER, TIME_MS2I(WS2812_LED_COUNT)) == MSG_TIMEOUT) {
         // Abort the synchronization if we have to wait longer than the total
         // count of LEDs in milliseconds. This is safely much longer than it
         // would take to push all the data out.

From 20ed138236a88c8b1fc3924f4b883618f6e01920 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 11 Nov 2022 12:15:19 +1100
Subject: [PATCH 839/959] LED config fixes (#18973)

---
 keyboards/handwired/hnah108/config.h         |  2 +-
 keyboards/handwired/hnah108/hnah108.c        |  8 +-
 keyboards/kbdfans/odin/rgb/config.h          |  4 +-
 keyboards/kbdfans/odin/rgb/rgb.c             | 52 ++++++-------
 keyboards/keybee/keybee65/config.h           |  2 +-
 keyboards/keybee/keybee65/keybee65.c         | 48 ++++++------
 keyboards/linworks/fave84h/config.h          |  4 +-
 keyboards/linworks/fave84h/fave84h.c         | 32 ++++----
 keyboards/linworks/fave87h/config.h          |  4 +-
 keyboards/linworks/fave87h/fave87h.c         | 33 ++++-----
 keyboards/mechlovin/hannah60rgb/rev2/rev2.c  | 78 ++++++++++++--------
 keyboards/melgeek/mj64/rev1/rev1.c           | 45 ++++++-----
 keyboards/opendeck/32/rev1/rev1.c            | 27 +++----
 keyboards/ryanskidmore/rskeys100/config.h    |  2 +-
 keyboards/ryanskidmore/rskeys100/rskeys100.c | 48 ++++++------
 keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c   | 10 +--
 keyboards/xelus/pachi/rgb/rev1/rev1.c        | 12 +--
 keyboards/xelus/pachi/rgb/rev2/rev2.c        | 24 +++---
 18 files changed, 218 insertions(+), 217 deletions(-)

diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index 913b19af5a..27fa0fd23c 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 4
 
 #define RGB_DI_PIN E2
-#define RGB_MATRIX_LED_COUNT 31
+#define RGB_MATRIX_LED_COUNT 30
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/handwired/hnah108/hnah108.c b/keyboards/handwired/hnah108/hnah108.c
index f8e8c7a3b2..20cbe941fd 100644
--- a/keyboards/handwired/hnah108/hnah108.c
+++ b/keyboards/handwired/hnah108/hnah108.c
@@ -32,10 +32,10 @@ led_config_t g_led_config = {
         { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      2 }
     }, {
         // LED Index to Physical Position
-        {   0,   0 }, {  18,   0 }, {  37,   0 }, {  56,   0 }, {  74,   0 }, {  93,   0 }, { 112,   0 }, { 130,   0 }, { 149,   0 }, { 168,   0 }, { 186,   0 }, { 205,   0 },
-        {   0,  25 },                                                                                                                                             { 205,  25 },
-        {   0,  51 },                                                                                                                                             { 205,  51 },
-        {   0,  63 }, {  18,  63 }, {  37,  63 }, {  56,  63 }, {  74,  63 }, {  93,  63 }, { 112,  63 }, { 130,  63 }, { 149,  63 }, { 168,  63 }, { 186,  63 }, { 205,  63 }
+        {   0,   0 }, {  18,   0 }, {  37,   0 }, {  56,   0 }, {  74,   0 }, {  93,   0 }, { 112,   0 }, { 130,   0 }, { 149,   0 }, { 168,   0 }, { 186,   0 }, { 205,   0 }, { 224,   0 },
+        {   0,  25 },                                                                                                                                                           { 224,  25 },
+        {   0,  51 },                                                                                                                                                           { 224,  51 },
+        {   0,  63 }, {  18,  63 }, {  37,  63 }, {  56,  63 }, {  74,  63 }, {  93,  63 }, { 112,  63 }, { 130,  63 }, { 149,  63 }, { 168,  63 }, { 186,  63 }, { 205,  63 }, { 224,  63 }
     }, {
         // LED Index to Flag
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 9f15473877..b0629454b0 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -24,8 +24,8 @@
 #define DIODE_DIRECTION COL2ROW
 
 #define DEBOUNCE 5
-#define RGBLED_NUM 110
-#define RGB_MATRIX_LED_COUNT 110
+#define RGBLED_NUM 104
+#define RGB_MATRIX_LED_COUNT 104
 #define RGB_DI_PIN B15
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kbdfans/odin/rgb/rgb.c b/keyboards/kbdfans/odin/rgb/rgb.c
index 5c7d3caf0d..9bd1a3bd3e 100644
--- a/keyboards/kbdfans/odin/rgb/rgb.c
+++ b/keyboards/kbdfans/odin/rgb/rgb.c
@@ -17,35 +17,29 @@
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
-{
-    { 0,  NO_LED, 1,   2,      3,      4,      NO_LED,  5,      6,      7,      8,  9,  10,     11, 12,     13,     14, 15, 16, 17 },
-    { 36, 35,     34,  33,     32,     31,     30,      29,     28,     27,     26, 25, 24,     23, NO_LED, 22,     21, 20, 19, 18 },
-    { 37, 38,     39,  40,     41,     42,     43,      44,     45,     46,     47, 48, 49,     50, NO_LED, 51,     52, 53, 54, 55 },
-    { 75, 74,     73,  72,     71,     70,     69,      68,     67,     66,     65,  64, NO_LED, 63, NO_LED, NO_LED, 58, 57, 56, NO_LED },
-    { 76, NO_LED, 77,  78,     79,     80,     81,      82,     83,     84,     85,  86, NO_LED, 87, NO_LED, 88,     89, 90, 91, 92 },
-    { 103,102,    101, NO_LED, NO_LED, NO_LED, 100,     NO_LED, NO_LED, NO_LED, NO_LED, 99, NO_LED,     98, 97,     96,     95, 94, 93, NO_LED }
-},
-{
-    {   12*0,  0 }, {  12*2,  0 }, {  12*3,  0 }, {  12*4,  0 }, {  12*5,  0 }, { 12*7,  0 }, { 12*8,  0 }, { 12*9,  0 }, { 12*10,  0 }, { 12*11,  0 },    { 12*12,  0 }, { 12*13,  0 }, { 12*14,  0 }, { 12*15,  0 }, { 12*16,  0 }, { 12*17,  0 }, { 12*18,  0 }, { 224,  0 },
-
-    { 224,  14 }, { 12*18,  14 },  { 12*17,  14 }, { 12*16,  14 },{ 12*15,  14 },{ 12*13,  14 },  { 12*12,  14 },  { 12*11,  14 },  { 12*10,  14 }, { 12*9,  14 },{ 12*8, 14},{ 12*7,  14},  {  12*6, 14 },  {  12*5,  14 }, {  12*4,  14 },{  12*3,  14 },{  12*2,  14 }, {12,  14},  {   12*0,  14 },
-
-    {   12*0,  26.8 }, {12,  26.8}, {  12*2,  26.8 }, {  12*3,  26.8 }, {  12*4,  26.8 }, {  12*5,  26.8 }, {  12*6, 26.8 }, { 12*7,  26.8}, { 12*8, 26.8}, { 12*9,  26.8 }, { 12*10,  26.8 }, { 12*11,  26.8 },    { 12*12,  26.8 }, { 12*13,  26.8 },  { 12*15,  26.8 }, { 12*16,  26.8 }, { 12*17,  26.8 }, { 12*18,  26.8 }, { 224,  33.2 },
-
- { 12*18,  39.6 }, { 12*17,  39.6 },{ 12*16,  39.6 }, {224,0},{0,0},{0,64},{224,64 },   { 12*13,  39.6 }, { 12*11,  39.6 }, { 12*10,  39.6 }, { 12*9,  39.6 },{ 12*8, 39.6},  { 12*7,  39.6},  {  12*6, 39.6 },  {  12*5,  39.6 },{  12*4,  39.6 },{  12*3,  39.6 },  {  12*2,  39.6 }, {12,  39.6},  {   12*0,  39.6 },
-
-    {   12*0,  52 },{  12*2,  52 }, {  12*3,  52 }, {  12*4,  52 }, {  12*5,  52 }, {  12*6, 52 }, { 12*7,  52}, { 12*8, 52}, { 12*9,  52 }, { 12*10,  52 }, { 12*11,  52 },   { 12*13,  52 },  { 12*15,  52 }, { 12*16,  52 }, { 12*17,  52 }, { 12*18,  52 }, { 224,  58 },
-
- { 12*18,  64 },  { 12*17,  64 },  { 12*16,  64 },  { 12*15,  64 },{ 12*14,  64 }, { 12*13,  64 },  { 12*11,  64 },   {  12*6, 64 }, {  12*2,  64 }, {12,  64},    {   12*0,  64 }
-},
-{
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4
-}};
+    {
+        { 0,   NO_LED,   1,      2,      3,      4, NO_LED,      5,      6,      7,      8,  9,     10, 11,     12,     13, 14, 15, 16,     17 },
+        { 36,      35,  34,     33,     32,     31,     30,     29,     28,     27,     26, 25,     24, 23, NO_LED,     22, 21, 20, 19,     18 },
+        { 37,      38,  39,     40,     41,     42,     43,     44,     45,     46,     47, 48,     49, 50, NO_LED,     51, 52, 53, 54,     55 },
+        { 75,      74,  73,     72,     71,     70,     69,     68,     67,     66,     65, 64, NO_LED, 63, NO_LED, NO_LED, 58, 57, 56, NO_LED },
+        { 76,  NO_LED,  77,     78,     79,     80,     81,     82,     83,     84,     85, 86, NO_LED, 87, NO_LED,     88, 89, 90, 91,     92 },
+        { 103,    102, 101, NO_LED, NO_LED, NO_LED,    100, NO_LED, NO_LED, NO_LED, NO_LED, 99, NO_LED, 98,     97,     96, 95, 94, 93, NO_LED }
+    }, {
+        {   0,  0 }, {  24,  0 }, {  36,  0 }, {  48,  0 }, {  60,  0 }, {  84,  0 }, {  96,  0 }, { 108,  0 }, { 120,  0 }, { 132,  0 }, { 144,  0 }, { 156,  0 }, { 168,  0 }, { 180,  0 }, { 192,  0 }, { 204,  0 }, { 216,  0 }, { 224,  0 },
+        { 224, 14 }, { 216, 14 }, { 204, 14 }, { 192, 14 }, { 180, 14 }, { 156, 14 }, { 144, 14 }, { 132, 14 }, { 120, 14 }, { 108, 14 }, { 96,  14 }, {  84, 14 }, {  72, 14 }, {  60, 14 }, {  48, 14 }, {  36, 14 }, {  24, 14 }, { 12,  14 }, {   0, 14 },
+        {   0, 27 }, {  12, 27 }, {  24, 27 }, {  36, 27 }, {  48, 27 }, {  60, 27 }, {  72, 27 }, {  84, 27 }, {  96, 27 }, { 108, 27 }, { 120, 27 }, { 132, 27 }, { 144, 27 }, { 156, 27 }, { 180, 27 }, { 192, 27 }, { 204, 27 }, { 216, 27 }, { 224, 33 },
+        { 216, 40 }, { 204, 40 }, { 192, 40 }, { 224,  0 }, {   0,  0 }, {   0, 64 }, { 224, 64 }, { 156, 40 }, { 132, 40 }, { 120, 40 }, { 108, 40 }, {  96, 40 }, {  84, 40 }, {  72, 40 }, {  60, 40 }, {  48, 40 }, {  36, 40 }, {  24, 40 }, {  12, 40 }, {   0, 40 },
+        {   0, 52 }, {  24, 52 }, {  36, 52 }, {  48, 52 }, {  60, 52 }, {  72, 52 }, { 84,  52 }, {  96, 52 }, { 108, 52 }, { 120, 52 }, { 132, 52 }, { 156, 52 }, { 180, 52 }, { 192, 52 }, { 204, 52 }, { 216, 52 }, { 224, 58 },
+        { 216, 64 }, { 204, 64 }, { 192, 64 }, { 180, 64 }, { 168, 64 }, { 156, 64 }, { 132, 64 }, {  72, 64 }, {  24, 64 }, { 12,  64 }, {   0, 64 }
+    }, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+    }
+};
 
 bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {
diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index e9d50a65cc..0b3c790584 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/config.h
@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN B0
 // The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 80
+#define RGB_MATRIX_LED_COUNT 68
 // Limit the Brithness of the LEDs
 #define RGBLIGHT_LIMIT_VAL 96
 #define RGB_VAL_STEP 12
diff --git a/keyboards/keybee/keybee65/keybee65.c b/keyboards/keybee/keybee65/keybee65.c
index 12422f0889..1dea6d084a 100644
--- a/keyboards/keybee/keybee65/keybee65.c
+++ b/keyboards/keybee/keybee65/keybee65.c
@@ -13,27 +13,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "keybee65.h"
 
-led_config_t g_led_config  = { {
-  // Key Matrix to LED Index
-  {  0,       1,      2,      3,      4,      5,  6,      7,      8,      9, 10, 11, 12, NO_LED, 13, 14  },
-  {  29, NO_LED,     28,     27,     26,     25, 24,     23,     22,     21, 20, 19, 18,     17, 16, 15  },
-  {  30, NO_LED,     31,     32,     33,     34, 35,     36,     37,     38, 39, 40, 41, NO_LED, 42, 43  },
-  {  57, NO_LED,     56,     55,     54,     53, 52,     51,     50,     49, 48, 47, 46, NO_LED, 45, 44  },
-  {  58,     59,     60, NO_LED, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64,     65, 66, 67  }
-}, {
-  // LED Index to Physical Position
-    {6,  2}, {20, 2},  {35, 11}, {49, 11}, {64, 11}, {78, 11}, {92, 11}, {107, 11}, {120, 11}, {135, 11}, {148, 11}, {164, 11}, {177, 11},            {198, 11}, {220, 11},
-    {9, 24},           {26, 24}, {42, 24}, {56, 24}, {70, 24}, {85, 24}, {100, 24}, {113, 24}, {128, 24}, {143, 24}, {156, 24}, {170, 24}, {184, 24}, {202, 24}, {220, 24},
-    {11, 38},          {29, 38}, {46, 38}, {60, 38}, {74, 38}, {88, 38}, {103, 38}, {118, 38}, {132, 38}, {146, 38}, {160, 38}, {174, 38},            {198, 38}, {220, 38},
-    {16, 53},          {37, 53}, {52, 53}, {66, 53}, {80, 53}, {96, 53}, {110, 53}, {125, 53}, {140, 53}, {153, 53}, {168, 53}, {187, 53},            {207, 53}, {220, 53},
-    {6, 68}, {25, 68}, {44, 68}, 
-}, {
-  // LED Index to Flag
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,     
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4,
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 
-
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-} };
\ No newline at end of file
+led_config_t g_led_config  = {
+    {
+        // Key Matrix to LED Index
+        {  0,      1,  2,      3,      4,      5,      6,  7,      8,      9, 10, 11, 12, NO_LED, 13, 14 },
+        { 29, NO_LED, 28,     27,     26,     25,     24, 23,     22,     21, 20, 19, 18,     17, 16, 15 },
+        { 30, NO_LED, 31,     32,     33,     34,     35, 36,     37,     38, 39, 40, 41, NO_LED, 42, 43 },
+        { 57, NO_LED, 56,     55,     54,     53,     52, 51,     50,     49, 48, 47, 46, NO_LED, 45, 44 },
+        { 58,     59, 60, NO_LED, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64,     65, 66, 67 }
+    }, {
+        // LED Index to Physical Position
+        {  6,  2 }, { 20,  2 }, { 35, 11 }, { 49, 11 }, { 64, 11 }, { 78, 11 }, {  92, 11 }, { 107, 11 }, { 120, 11 }, { 135, 11 }, { 148, 11 }, { 164, 11 }, { 177, 11 }, { 198, 11 }, { 220, 11 },
+        {  9, 24 }, { 26, 24 }, { 42, 24 }, { 56, 24 }, { 70, 24 }, { 85, 24 }, { 100, 24 }, { 113, 24 }, { 128, 24 }, { 143, 24 }, { 156, 24 }, { 170, 24 }, { 184, 24 }, { 202, 24 }, { 220, 24 },
+        { 11, 38 }, { 29, 38 }, { 46, 38 }, { 60, 38 }, { 74, 38 }, { 88, 38 }, { 103, 38 }, { 118, 38 }, { 132, 38 }, { 146, 38 }, { 160, 38 }, { 174, 38 },              { 198, 38 }, { 220, 38 },
+        { 16, 53 },             { 37, 53 }, { 52, 53 }, { 66, 53 }, { 80, 53 }, {  96, 53 }, { 110, 53 }, { 125, 53 }, { 140, 53 }, { 153, 53 }, { 168, 53 }, { 187, 53 }, { 207, 53 }, { 220, 53 },
+        {  6, 68 }, { 25, 68 }, { 44, 68 },                                     {  96, 68 },                           { 148, 68 }, { 164, 68 }, { 180, 68 }, { 192, 68 }, { 207, 68 }, { 220, 68 }
+    }, {
+        // LED Index to Flag
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4,
+        4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4,          4,       4, 4, 4, 4, 4, 4
+    }
+};
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index 0980a742d1..34c40c83f5 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -45,8 +45,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define DEBOUNCE 5
 
 /* Define RGB */
-#define RGBLED_NUM 126
-#define RGB_MATRIX_LED_COUNT 126
+#define RGBLED_NUM 86
+#define RGB_MATRIX_LED_COUNT 86
 #define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave84h/fave84h.c b/keyboards/linworks/fave84h/fave84h.c
index 2a0d7760df..4a17096df6 100644
--- a/keyboards/linworks/fave84h/fave84h.c
+++ b/keyboards/linworks/fave84h/fave84h.c
@@ -14,7 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "fave84h.h"
 
 #ifdef RGB_MATRIX_ENABLE
-    led_config_t g_led_config = {
+led_config_t g_led_config = {
     {
         // Key Matrix to LED Index
         { 47, NO_LED, 48,     49,     50, 51,     52,     53,     54,     55, 56,     57,     58,     59,     60,     61,     62 },
@@ -25,26 +25,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         { 72,     71, 70, NO_LED, NO_LED, 69, NO_LED, NO_LED, NO_LED, NO_LED, 68, NO_LED,     67,     66,     65,     64,     63 },
     }, {
         // LED Index to Physical Position
-        {0, 0}, {28, 0}, {42, 0}, {57, 0}, {71, 0}, {92, 0}, {106, 0}, {120, 0}, {134, 0}, {156, 0}, 
-        {170, 0}, {184, 0}, {198, 0}, {216, 0}, {230, 0}, {244, 0}, {0, 15}, {14, 15}, {28, 15}, {42, 15}, 
-        {57, 15}, {71, 15}, {85, 15}, {99, 15}, {113, 15}, {127, 15}, {141, 15}, {156, 15}, {170, 15}, {191, 17}, 
-        {216, 15}, {230, 15}, {244, 15}, {4, 27}, {21, 27}, {35, 27}, {50, 27}, {64, 27}, {78, 27}, {92, 27}, 
-        {106, 27}, {120, 27}, {134, 27}, {149, 27}, {163, 27}, {177, 27}, {194, 27}, {216, 27}, {230, 27}, {244, 27}, 
-        {10, 40}, {25, 40}, {39, 40}, {53, 40}, {67, 40}, {81, 40}, {95, 40}, {110, 40}, {124, 40}, {138, 40}, 
-        {152, 40}, {166, 40}, {189, 40}, {9, 52}, {32, 52}, {46, 52}, {60, 52}, {74, 52}, {88, 52}, {103, 52}, 
-        {117, 52}, {131, 52}, {145, 52}, {159, 52}, {186, 52}, {230, 52}, {4, 64}, {21, 64}, {39, 64}, {99, 64}, 
-        {159, 64}, {177, 64}, {194, 64}, {216, 64}, {230, 64}, {244, 64}
+        {   0,  0 },              {  28,  0 }, {  42,  0 }, {  57,  0 }, {  71,  0 }, {  92,  0 }, { 106,  0 }, { 120,  0 }, { 134,  0 }, { 156,  0 }, { 170,  0 }, { 184,  0 }, { 198,  0 },     { 216,  0 }, { 230,  0 }, { 244,  0 },
+        {   0, 15 }, {  14, 15 }, {  28, 15 }, {  42, 15 }, {  57, 15 }, {  71, 15 }, {  85, 15 }, {  99, 15 }, { 113, 15 }, { 127, 15 }, { 141, 15 }, { 156, 15 }, { 170, 15 }, { 191, 17 },     { 216, 15 }, { 230, 15 }, { 244, 15 },
+        {   4, 27 }, {  21, 27 }, {  35, 27 }, {  50, 27 }, {  64, 27 }, {  78, 27 }, {  92, 27 }, { 106, 27 }, { 120, 27 }, { 134, 27 }, { 149, 27 }, { 163, 27 }, { 177, 27 }, { 194, 27 },     { 216, 27 }, { 230, 27 }, { 244, 27 },
+        {  10, 40 }, {  25, 40 }, {  39, 40 }, {  53, 40 }, {  67, 40 }, {  81, 40 }, {  95, 40 }, { 110, 40 }, { 124, 40 }, { 138, 40 }, { 152, 40 }, { 166, 40 },              { 189, 40 },
+        {   9, 52 },              {  32, 52 }, {  46, 52 }, {  60, 52 }, {  74, 52 }, {  88, 52 }, { 103, 52 }, { 117, 52 }, { 131, 52 }, { 145, 52 }, { 159, 52 },              { 186, 52 },                  { 230, 52 },
+        {   4, 64 }, {  21, 64 }, {  39, 64 },                           {  99, 64 },                                                     { 159, 64 },              { 177, 64 }, { 194, 64 },     { 216, 64 }, { 230, 64 }, { 244, 64 }
     }, {
         // LED Index to Flag
-        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4,    1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1, 
-        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,          1,
-        1, 1, 1,       4,             1,    1, 1,    1, 1, 1,
-
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4,    1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1,
+        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,       1,
+        1, 1, 1,       4,             1,    1, 1,    1, 1, 1
     }
 };
 #endif
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 17d19fb2e1..6ec87d541e 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -34,8 +34,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define DEBOUNCE 5
 
 /* Define RGB */
-#define RGBLED_NUM 127
-#define RGB_MATRIX_LED_COUNT 127
+#define RGBLED_NUM 87
+#define RGB_MATRIX_LED_COUNT 87
 #define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave87h/fave87h.c b/keyboards/linworks/fave87h/fave87h.c
index bf65ce87e2..6883214db3 100644
--- a/keyboards/linworks/fave87h/fave87h.c
+++ b/keyboards/linworks/fave87h/fave87h.c
@@ -23,29 +23,26 @@ led_config_t g_led_config = {
         { 13,     14, 15,     16,     17, 18,     19,     20,     21, 22, 23,     24,     25,     26,     27,     28,     29 },
         { 12,     11, 10,      9,      8,  7,      6,      5,      4,  3,  2,      1, NO_LED,      0, NO_LED, NO_LED, NO_LED },
         { 74,     75, 76,     77,     78, 79,     80,     81,     82, 83, 84, NO_LED,     85, NO_LED, NO_LED,     86, NO_LED },
-        { 73,     72, 71, NO_LED, NO_LED, 70, NO_LED, NO_LED, NO_LED, 69, 68, NO_LED,     67,     66,     65,     64,     63 },
+        { 73,     72, 71, NO_LED, NO_LED, 70, NO_LED, NO_LED, NO_LED, 69, 68, NO_LED,     67,     66,     65,     64,     63 }
     }, {
         // LED Index to Physical Position
-        {190, 40},  {167, 40},  {153, 40},  {139, 40},  {125, 40},  {111, 40},  {97, 40},   {83, 40},   {69, 40},   {55, 40}, 
-        {40, 40},   {26, 40},   {0, 41},    {5, 27},    {23, 27},   {37, 27},   {51, 27},   {65, 27},   {79, 27},   {93, 27}, 
-        {107, 27},  {121, 27},  {135, 27},  {149, 27},  {163, 27},  {177, 27},  {195, 27},  {216, 27},  {230, 27},  {244, 27}, 
-        {244, 15},  {230, 15},  {216, 15},  {191, 17},  {170, 15},  {156, 15},  {142, 15},  {128, 15},  {114, 15},  {100, 15}, 
-        {86, 15},   {72, 15},   {58, 15},   {44, 15},   {30, 15},   {16, 15},   {2, 15},    {2, 0},     {30, 0},    {44, 0}, 
-        {58, 0},    {72, 0},    {93, 0},    {107, 0},   {121, 0},   {135, 0},   {156, 0},   {170, 0},   {184, 0},   {198, 0}, 
-        {216, 0},   {230, 0},   {244, 0},   {244, 64},  {230, 64},  {216, 64},  {197, 64},  {179, 64},  {162, 64},  {144, 64}, 
-        {91, 64},   {39, 64},   {21, 64},   {4, 64},    {11, 52},   {33, 52},   {47, 52},   {62, 52},   {76, 52},   {90, 52}, 
-        {104, 52},  {118, 52},  {132, 52},  {146, 52},  {160, 52},  {186, 52},  {230, 52}
+        { 190, 40 }, { 167, 40 }, { 153, 40 }, { 139, 40 }, { 125, 40 }, { 111, 40 }, {  97, 40 }, {  83, 40 }, {  69, 40 }, {  55, 40 },
+        {  40, 40 }, {  26, 40 }, {   0, 41 }, {   5, 27 }, {  23, 27 }, {  37, 27 }, {  51, 27 }, {  65, 27 }, {  79, 27 }, {  93, 27 },
+        { 107, 27 }, { 121, 27 }, { 135, 27 }, { 149, 27 }, { 163, 27 }, { 177, 27 }, { 195, 27 }, { 216, 27 }, { 230, 27 }, { 244, 27 },
+        { 244, 15 }, { 230, 15 }, { 216, 15 }, { 191, 17 }, { 170, 15 }, { 156, 15 }, { 142, 15 }, { 128, 15 }, { 114, 15 }, { 100, 15 },
+        {  86, 15 }, {  72, 15 }, {  58, 15 }, {  44, 15 }, {  30, 15 }, {  16, 15 }, {   2, 15 }, {   2,  0 }, {  30,  0 }, {  44,  0 },
+        {  58,  0 }, {  72,  0 }, {  93,  0 }, { 107,  0 }, { 121,  0 }, { 135,  0 }, { 156,  0 }, { 170,  0 }, { 184,  0 }, { 198,  0 },
+        { 216,  0 }, { 230,  0 }, { 244,  0 }, { 244, 64 }, { 230, 64 }, { 216, 64 }, { 197, 64 }, { 179, 64 }, { 162, 64 }, { 144, 64 },
+        {  91, 64 }, {  39, 64 }, {  21, 64 }, {   4, 64 }, {  11, 52 }, {  33, 52 }, {  47, 52 }, {  62, 52 }, {  76, 52 }, {  90, 52 },
+        { 104, 52 }, { 118, 52 }, { 132, 52 }, { 146, 52 }, { 160, 52 }, { 186, 52 }, { 230, 52 }
     }, {
         // LED Index to Flag
-        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 
-        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 
+        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
         1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,       4,
-        1, 1, 1,       4,          1, 1,    1, 1, 1, 1, 1,
-
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+        1, 1, 1,       4,          1, 1,    1, 1, 1, 1, 1
     }
 };
 #endif
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
index a2812aa41d..e8b1c89f32 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
@@ -110,39 +110,53 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, C9_16,  C9_11,  C7_12},//INDICATOR LED-77
 };
 
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  {0,          1,          2,          3,          18,          19,        20,         21,         36,         37,          38,        39,          40,           41},
-  {4,           5,         6,           7,         22,          23,        24,         25,         43,         44,          45,        46,          47,           69},
-  {8,           9,         10,         11,         26,          27,        28,         29,         50,         51,          52,        53,          54,           55},
-  {13,         14,         15,         30,         31,          32,        33,         56,         57,         58,          59,        60,          62,           63},
-  {16,         17,         34,         NO_LED,     NO_LED,      NO_LED,    35,         NO_LED,     NO_LED,     NO_LED,      65,        66,          67,           68},
-    },
+led_config_t g_led_config = {
     {
-  //LED Index to Physical Positon
-  {  0,  0},  { 16,  0},  { 32, 0 },  { 48,  0}, //9-59-68-76
-  {  0, 16},  { 16, 16},  { 32, 16},  { 48, 16}, //10-60-72-77
-  {  0, 32},  { 16, 32},  { 32, 32},  { 48, 32}, //46-61-73-78
-  {  0, 48},  {  0, 48},  { 12, 48},  { 16, 48}, //126-51-63-74
-  {  0, 64},  { 16, 64}, //56-67
-  { 64,  0},  { 80,  0},   { 96, 0},  { 112, 0}, //80-84-89-94
-  { 64, 16},  { 80, 16},   { 96,16},  { 112,16}, //81-85-90-95
-  { 64, 32},  { 80, 32},   { 96,32},  { 112,32}, //82-86-91-96
-  { 32, 48},  { 48, 48},   { 64,48},  {  80,48}, //79-83-87-92
-  { 32, 64},  { 80, 64}, //75-93
-  { 128, 0},  { 144, 0},  { 160, 0},  { 176, 0},    {192,  0},   {220,  0},   {210, 0}, //98-102-106-111-116-121-130
-  { 128,16},   {144,16},   {160,16},  {176, 16},    {192, 16},   {220, 16},   {220,16}, //99-103-107-112-117-129-122
-  { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {220, 32}, //100-104-108-113-118-123
-  {  96,48},   {112,48},  {128, 48},  {144, 48},    {160, 48},   {200, 48},   {220,48},   {220,48}, //97-101-105-109-114-119-128-124
-  {  96,64},   {144,64},   {160,64},   {176,64},    {220, 64}, //127-110-115-120-125
-  { 220, 0},   //140
-}, {
-  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,          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,
-} };
+        // Key Matrix to LED Index
+        { 0,   1,  2,      3,     18,     19, 20,     21,     36,     37, 38, 39, 40, 41 },
+        { 4,   5,  6,      7,     22,     23, 24,     25,     43,     44, 45, 46, 47, 69 },
+        { 8,   9, 10,     11,     26,     27, 28,     29,     50,     51, 52, 53, 54, 55 },
+        { 13, 14, 15,     30,     31,     32, 33,     56,     57,     58, 59, 60, 62, 63 },
+        { 16, 17, 34, NO_LED, NO_LED, NO_LED, 35, NO_LED, NO_LED, NO_LED, 65, 66, 67, 68 }
+    }, {
+        //LED Index to Physical Positon
+        {   0,  0 }, {  16,  0 }, {  32,  0 }, { 48,  0 }, //9-59-68-76
+        {   0, 16 }, {  16, 16 }, {  32, 16 }, { 48, 16 }, //10-60-72-77
+        {   0, 32 }, {  16, 32 }, {  32, 32 }, { 48, 32 }, //46-61-73-78
+        {   0, 48 }, {   0, 48 }, {  12, 48 }, { 16, 48 }, //126-51-63-74
+        {   0, 64 }, {  16, 64 }, //56-67
+        {  64,  0 }, {  80,  0 }, {  96,  0 }, { 112,  0 }, //80-84-89-94
+        {  64, 16 }, {  80, 16 }, {  96, 16 }, { 112, 16 }, //81-85-90-95
+        {  64, 32 }, {  80, 32 }, {  96, 32 }, { 112, 32 }, //82-86-91-96
+        {  32, 48 }, {  48, 48 }, {  64, 48 }, {  80, 48 }, //79-83-87-92
+        {  32, 64 }, {  80, 64 }, //75-93
+        { 128,  0 }, { 144,  0 }, { 160,  0 }, { 176,  0 }, { 192,  0 }, { 220,  0 }, { 210,  0 }, //98-102-106-111-116-121-130
+        { 128, 16 }, { 144, 16 }, { 160, 16 }, { 176, 16 }, { 192, 16 }, { 220, 16 }, { 220, 16 }, //99-103-107-112-117-129-122
+        { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 }, { 192, 32 }, { 220, 32 }, //100-104-108-113-118-123
+        {  96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 160, 48 }, { 200, 48 }, { 220, 48 }, { 220, 48 }, //97-101-105-109-114-119-128-124
+        {  96, 64 }, { 144, 64 }, { 160, 64 }, { 176, 64 }, { 220, 64 }, //127-110-115-120-125
+        { 220,  0 }, //140
+        {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }
+    }, {
+        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, 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,
+        9, 9, 9, 9, 9, 9, 9, 9
+    }
+};
 
 bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {
diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c
index 5bfbe73e2f..5fd0ba6d7a 100644
--- a/keyboards/melgeek/mj64/rev1/rev1.c
+++ b/keyboards/melgeek/mj64/rev1/rev1.c
@@ -65,17 +65,17 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {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_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_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_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 */
@@ -86,26 +86,25 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 };
 
 led_config_t g_led_config = {
-	{
-		/* C0     C1         C2        C3        C4        C5        C6        C7        C8          C9        C10         C11        C12        C13  */
-		{  0,      1,         2,        3,        4,        5,        6,        7,        8,          9,        10,         11,       12,        13     }, /* R0 */
-		{ 27,     26,        25,       24,       23,       22,       21,       20,       19,         18,        17,         16,       15,        14     }, /* R1 */
-		{ 28,     29,        30,       31,       32,       33,       34,       35,       36,         37,        38,         39,       40,        NO_LED }, /* R2 */
-		{ 54,     53,        52,       51,       50,       49,       48,       47,       46,         45,        44,         43,       42,        41     }, /* R3 */
-		{ 62,     61,        60,       NO_LED,   64,       63,       65,       NO_LED,   NO_LED,     59,        58,         57,       56,        55     }, /* R4 */
+    {
+        {  0,  1,  2,      3,      4,  5,      6,      7,      8,  9, 10, 11, 12,     13 },
+        { 27, 26, 25,     24,     23, 22,     21,     20,     19, 18, 17, 16, 15,     14 },
+        { 28, 29, 30,     31,     32, 33,     34,     35,     36, 37, 38, 39, 40, NO_LED },
+        { 54, 53, 52,     51,     50, 49,     48,     47,     46, 45, 44, 43, 42,     41 },
+        { 62, 61, 60, NO_LED, NO_LED, 63, NO_LED, NO_LED, NO_LED, 59, 58, 57, 56,     55 }
     }, {
-        {0, 0},   {16, 0},   {32, 0},  {48, 0},  {64, 0},  {80, 0},  {96, 0},  {112, 0},  {128, 0},  {144, 0},  {160, 0},  {176, 0},  {192, 0},  {208, 0},
-		{0, 16},  {16, 16},  {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
-		{0, 32},  {16, 32},  {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32},
-		{0, 48},  {16, 48},  {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
-		{0, 64},  {16, 64},  {32, 64},                     {48, 64},                                  {64, 64}, {96, 64},  {112, 64}, {128, 64}, {144, 64}, 
-	}, {
-	       4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4, 
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,
-		   4,      4,         4,                            4,                                        4,         4,          4,        4,        4,
-	}
+        { 0,  0 }, { 16,  0 }, { 32,  0 }, { 48,  0 }, { 64,  0 }, { 80,  0 }, { 96,  0 }, { 112,  0 }, { 128,  0 }, { 144,  0 }, { 160,  0 }, { 176,  0 }, { 192,  0 }, { 208,  0 },
+        { 0, 16 }, { 16, 16 }, { 32, 16 }, { 48, 16 }, { 64, 16 }, { 80, 16 }, { 96, 16 }, { 112, 16 }, { 128, 16 }, { 144, 16 }, { 160, 16 }, { 176, 16 }, { 192, 16 }, { 208, 16 },
+        { 0, 32 }, { 16, 32 }, { 32, 32 }, { 48, 32 }, { 64, 32 }, { 80, 32 }, { 96, 32 }, { 112, 32 }, { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 },              { 192, 32 },
+        { 0, 48 }, { 16, 48 }, { 32, 48 }, { 48, 48 }, { 64, 48 }, { 80, 48 }, { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 160, 48 }, { 176, 48 }, { 192, 48 }, { 208, 48 },
+        { 0, 64 }, { 16, 64 }, { 32, 64 },                         { 48, 64 },                                       {  64, 64 }, {  96, 64 }, { 112, 64 }, { 128, 64 }, { 144, 64 }
+    }, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4,       4,          4, 4, 4, 4, 4
+    }
 };
 
 void suspend_power_down_kb(void) {
diff --git a/keyboards/opendeck/32/rev1/rev1.c b/keyboards/opendeck/32/rev1/rev1.c
index 34862873d0..b803682b7d 100644
--- a/keyboards/opendeck/32/rev1/rev1.c
+++ b/keyboards/opendeck/32/rev1/rev1.c
@@ -63,27 +63,28 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     // clang-format on
 };
 
-#define P(x,y) {(x*224 / (MATRIX_COLS - 1)), (y*64 / (MATRIX_ROWS - 1))}
 // clang-format off
 led_config_t g_led_config = {
-    // Key Matrix to LED Index
     {
-        {0,  1,  2,  3,  4,  5,  6,  7},
-        {8,  9,  10, 11, 12, 13, 14, 15},
-        {16, 17, 18, 19, 20, 21, 22, 23},
-        {24, 25, 26, 27, 28, 29, 30, 31}
+        // 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 }
     }, {
         // LED Index to Physical Position
-        P(0, 0), P(1, 0), P(2, 0), P(3, 0), P(4, 0), P(5, 0), P(6, 0), P(7, 0),
-        P(0, 1), P(1, 1), P(2, 1), P(3, 1), P(4, 1), P(5, 1), P(6, 1), P(7, 1),
-        P(0, 2), P(1, 2), P(2, 2), P(3, 2), P(4, 2), P(5, 2), P(6, 2), P(7, 2),
-        P(0, 3), P(1, 3), P(2, 3), P(3, 3), P(4, 3), P(5, 3), P(6, 3), P(7, 3),
+        { 0,  0 }, { 32,  0 }, { 64,  0 }, { 96,  0 }, { 128,  0 }, { 160,  0 }, { 192,  0 }, { 224,  0 },
+        { 0, 21 }, { 32, 21 }, { 64, 21 }, { 96, 21 }, { 128, 21 }, { 160, 21 }, { 192, 21 }, { 224, 21 },
+        { 0, 43 }, { 32, 43 }, { 64, 43 }, { 96, 43 }, { 128, 43 }, { 160, 43 }, { 192, 43 }, { 224, 43 },
+        { 0, 64 }, { 32, 64 }, { 64, 64 }, { 96, 64 }, { 128, 64 }, { 160, 64 }, { 192, 64 }, { 224, 64 }
     }, {
         // LED Index to Flag
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+        4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4
     }
 };
-#undef P
 
 // clang-format on
 
@@ -112,7 +113,7 @@ void keyboard_post_init_user() {
 static uint8_t g_key_wrapper_tracker = 0;
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_user(keycode, record) { return false; }
+    if (!process_record_user(keycode, record)) { return false; }
     if (record->event.pressed && keycode != KC_WRAPPER_KEY) {
         register_code(KC_WRAPPER_KEY);
         register_code(keycode);
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index e80efaef64..24106a4ef1 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -31,7 +31,7 @@
 /* RGB Data Pin */
 #define RGB_DI_PIN C7
 /* The number of RGB LEDs connected */
-#define RGB_MATRIX_LED_COUNT 118
+#define RGB_MATRIX_LED_COUNT 105
 /* Set the maximum brightness to 110 to avoid going over 500 mA.
  * At full brightness with all three indicator LEDs on, the power draw is about 450 mA. */
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 110
diff --git a/keyboards/ryanskidmore/rskeys100/rskeys100.c b/keyboards/ryanskidmore/rskeys100/rskeys100.c
index ec98ae62cc..242ca8641d 100644
--- a/keyboards/ryanskidmore/rskeys100/rskeys100.c
+++ b/keyboards/ryanskidmore/rskeys100/rskeys100.c
@@ -5,26 +5,28 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-         {     0,     1,     2,     3,     4,     5,     6,     7,     8,     9,    10,    11,    12,NO_LED,    14,    15,    16,NO_LED,NO_LED,NO_LED,NO_LED},
-         {    37,    36,    35,    34,    33,    32,    31,    30,    29,    28,    27,    26,    24,    24,    23,    22,    21,    20,    19,    18,    17},
-         {    40,    41,    42,    43,    44,    45,    46,    47,    48,    49,    50,    51,    52,    53,    54,    55,    56,    57,    58,    59,    60},
-         {    78,    77,    76,    75,    74,    73,    72,    71,    70,    69,    68,    67,    66,NO_LED,NO_LED,NO_LED,NO_LED,    64,    63,    62,NO_LED},
-         {    79,    80,    81,    82,    83,    84,    85,    86,    87,    88,    89,    90,    91,NO_LED,NO_LED,    93,NO_LED,    94,    95,    96,    97},
-         {   117,NO_LED,   116,   115,NO_LED,NO_LED,   112,NO_LED,NO_LED,NO_LED,   109,   108,   107,   106,   105,   103,   102,   101,NO_LED,    99,NO_LED}
-     }, {
-         {0, 0}, {21, 0}, {32, 0}, {43, 0}, {53, 0}, {64, 0}, {75, 0}, {85, 0}, {96, 0}, {117, 0}, {128, 0}, {139, 0}, {149, 0}, {160, 0}, {171, 0}, {181, 0},
-         {0, 13}, {11, 13}, {21, 13}, {32, 13}, {42, 13}, {53, 13}, {64, 13}, {75, 13}, {85, 13}, {96, 13}, {107, 13}, {117, 13}, {128, 13}, {139, 13}, {160, 13}, {171, 13}, {181, 13}, {192, 13}, {203, 13}, {213, 13}, {224, 13},
-         {0, 26}, {11, 26}, {21, 26}, {32, 26}, {42, 26}, {53, 26}, {64, 26}, {75, 26}, {85, 26}, {96, 26}, {107, 26}, {117, 26}, {128, 26}, {149, 26}, {160, 26}, {171, 26}, {181, 26}, {192, 26}, {203, 26}, {213, 26}, {224, 26},
-         {0, 38}, {11, 38}, {21, 38}, {32, 38}, {42, 38}, {53, 38}, {64, 38}, {75, 38}, {85, 38}, {96, 38}, {117, 38}, {128, 38}, {149, 38}, {192, 38}, {203, 38}, {213, 38},
-         {0, 51}, {11, 51}, {21, 51}, {32, 51}, {42, 51}, {53, 51}, {64, 51}, {75, 51}, {85, 51}, {96, 51}, {107, 51}, {117, 51}, {139, 51}, {171, 51}, {192, 51}, {203, 51}, {213, 51}, {224, 51},
-         {0, 64}, {11, 64}, {21, 64}, {64, 64}, {107, 64}, {117, 64}, {128, 64}, {149, 64}, {160, 64}, {171, 64}, {181, 64}, {192, 64}, {213, 64}
-     }, {
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-     } };
-#endif
\ No newline at end of file
+led_config_t g_led_config = {
+    {
+        {   0,      1,   2,   3,      4,      5,   6,      7,      8,      9,  10, 11, 12, NO_LED,     13,     14,     15, NO_LED, NO_LED, NO_LED, NO_LED },
+        {  36,     35,  34,  33,     32,     31,  30,     29,     28,     27,  26, 25, 24,     23,     22,     21,     20,     19,     18,     17,     16 },
+        {  37,     38,  39,  40,     41,     42,  43,     44,     45,     46,  47, 48, 49,     50,     51,     52,     53,     54,     55,     56,     57 },
+        {  73,     72,  71,  70,     69,     68,  67,     66,     65,     64,  63, 62, 61, NO_LED, NO_LED, NO_LED, NO_LED,     60,     59,     58, NO_LED },
+        {  74,     75,  76,  77,     78,     79,  80,     81,     82,     83,  84, 85, 86, NO_LED, NO_LED,     87, NO_LED,     88,     89,     90,     91 },
+        { 104, NO_LED, 103, 102, NO_LED, NO_LED, 101, NO_LED, NO_LED, NO_LED, 100, 99, 98,     97,     96,     95,    94,     93, NO_LED,     92, NO_LED }
+    }, {
+        { 0,  0 }, { 21,  0 }, { 32,  0 }, { 43,  0 }, {  53,  0 }, {  64,  0 }, {  75,  0 }, {  85,  0 }, {  96,  0 }, { 117,  0 }, { 128,  0 }, { 139,  0 }, { 149,  0 }, { 160,  0 }, { 171,  0 }, { 181,  0 },
+        { 0, 13 }, { 11, 13 }, { 21, 13 }, { 32, 13 }, {  42, 13 }, {  53, 13 }, {  64, 13 }, {  75, 13 }, {  85, 13 }, {  96, 13 }, { 107, 13 }, { 117, 13 }, { 128, 13 }, { 139, 13 }, { 160, 13 }, { 171, 13 }, { 181, 13 }, { 192, 13 }, { 203, 13 }, { 213, 13 }, { 224, 13 },
+        { 0, 26 }, { 11, 26 }, { 21, 26 }, { 32, 26 }, {  42, 26 }, {  53, 26 }, {  64, 26 }, {  75, 26 }, {  85, 26 }, {  96, 26 }, { 107, 26 }, { 117, 26 }, { 128, 26 }, { 149, 26 }, { 160, 26 }, { 171, 26 }, { 181, 26 }, { 192, 26 }, { 203, 26 }, { 213, 26 }, { 224, 26 },
+        { 0, 38 }, { 11, 38 }, { 21, 38 }, { 32, 38 }, {  42, 38 }, {  53, 38 }, {  64, 38 }, {  75, 38 }, {  85, 38 }, {  96, 38 }, { 117, 38 }, { 128, 38 }, { 149, 38 }, { 192, 38 }, { 203, 38 }, { 213, 38 },
+        { 0, 51 }, { 11, 51 }, { 21, 51 }, { 32, 51 }, {  42, 51 }, {  53, 51 }, {  64, 51 }, {  75, 51 }, {  85, 51 }, {  96, 51 }, { 107, 51 }, { 117, 51 }, { 139, 51 }, { 171, 51 }, { 192, 51 }, { 203, 51 }, { 213, 51 }, { 224, 51 },
+        { 0, 64 }, { 11, 64 }, { 21, 64 }, { 64, 64 }, { 107, 64 }, { 117, 64 }, { 128, 64 }, { 149, 64 }, { 160, 64 }, { 171, 64 }, { 181, 64 }, { 192, 64 }, { 213, 64 }
+    }, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+    }
+};
+#endif
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index 203ad4b5c6..c17160a659 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -125,11 +125,11 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 __attribute__ ((weak))
 led_config_t g_led_config = { {
-    { -1+16, -1+15, -1+14, -1+13, -1+12, -1+11, -1+10, -1+9 , 15+1 , 15+2 , 15+3 , 15+4 , 15+5 , 15+6 },
-    { -1+7 , -1+6 , -1+5 , -1+4 , -1+3 , -1+2 , -1 +1, 15+9 , 15+10, 15+11, 15+12, 15+13, 15+14, 15+15},
-    { -1+8 , 31+14, 31+13, 31+12, 31+11, 31+10, 31+9 , 47+1 , 47+2 , 47+3 , 47+4 , 47+5 , 15+8 , 15+7 },
-    { 31+15, 31+5 , 31+4 , 31+3 , 31+2 , 31+1 , 47+9 , 47+10, 47+11, 47+12, NO_LED  ,47+6 , 47+7 , 15+16},
-    { 31+16, 31+8 , 31+7 , NO_LED, NO_LED  , 31+6 , NO_LED  , NO_LED  , NO_LED  , 47+13, 47+14, 47+15, 47+16, 47+8 }
+    { 15, 14, 13,     12,     11, 10,      9,      8,     16, 17,     18, 19, 20, 21 },
+    {  6,  5,  4,      3,      2,  1,      0,     24,     25, 26,     27, 28, 29, 30 },
+    {  7, 45, 44,     43,     42, 41,     40,     48,     49, 50,     51, 52, 23, 22 },
+    { 46, 36, 35,     34,     33, 32,     56,     57,     58, 59, NO_LED, 53, 54, 31 },
+    { 47, 39, 38, NO_LED, NO_LED, 37, NO_LED, NO_LED, NO_LED, 60,     61, 62, 63, 55 }
 }, {
     // LA1..LA16
     {104, 16}, {88 , 16}, {72 , 16}, {56 , 16}, {40 , 16}, {24 , 16}, {4  , 16}, {6  , 32},
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index 7dd446a41e..e2b342dcb5 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -158,12 +158,12 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 __attribute__ ((weak))
 led_config_t g_led_config = { {
-    { -1+00+3 , NO_LED,   -1+26+3 , -1+39+3 , -1+52+3 , -1+65+3 , -1+78+3 , -1+91+3 , -1+104+3 , -1+00+1 , -1+13+1 , -1+26+1 , -1+39+1 , -1+52+1 , -1+65+1 , -1+78+1 , -1+91+1 },
-    { -1+00+4 , -1+13+4 , -1+26+4 , -1+39+4 , -1+52+4 , -1+65+4 , -1+78+4 , -1+91+4 , -1+104+4 , -1+00+2 , -1+13+2 , -1+26+2 , -1+39+2 , -1+52+2 , -1+65+2 , -1+78+2 , -1+91+2 },
-    { -1+00+6 , -1+13+6 , -1+26+6 , -1+39+6 , -1+52+6 , -1+65+6 , -1+78+6 , -1+91+6 , -1+104+6 , -1+00+5 , -1+13+5 , -1+26+5 , -1+39+5 , -1+52+5 , -1+65+5 , -1+78+5 , -1+91+6 },
-    { -1+00+8 , -1+13+8 , -1+26+8 , -1+39+8 , -1+52+8 , -1+65+8 , -1+78+8 , -1+91+8 , -1+104+8 , -1+00+7 , -1+13+7 , -1+26+7 , NO_LED  , -1+52+7 , NO_LED  , NO_LED  , NO_LED  },
-    { -1+00+11, -1+13+11, -1+26+11, -1+39+11, -1+52+11, -1+65+11, -1+78+11, -1+91+11, -1+104+11, -1+00+10, -1+13+10, NO_LED  , -1+52+10, NO_LED  , NO_LED  , -1+78+10, NO_LED  },
-    { -1+00+9 , -1+13+9 , -1+26+9 , NO_LED  , NO_LED  , -1+65+9 , NO_LED  , NO_LED  , NO_LED   , NO_LED  , -1+13+12, NO_LED  , -1+39+12, -1+52+12, -1+65+12, -1+78+12, -1+91+12}
+    {  2, NO_LED, 28,     41,     54, 67,     80,     93,    106,      0, 13,     26,     39,     52,     65,     78,     91 },
+    {  3,     16, 29,     42,     55, 68,     81,     94,    107,      1, 14,     27,     40,     53,     66,     79,     92 },
+    {  5,     18, 31,     44,     57, 70,     83,     96,    109,      4, 17,     30,     43,     56,     69,     82,     96 },
+    {  7,     20, 33,     46,     59, 72,     85,     98,    111,      6, 19,     32, NO_LED,     58, NO_LED, NO_LED, NO_LED },
+    { 10,     23, 36,     49,     62, 75,     88,    101,    114,      9, 22, NO_LED,     61, NO_LED, NO_LED,     87, NO_LED },
+    {  8,     21, 34, NO_LED, NO_LED, 73, NO_LED, NO_LED, NO_LED, NO_LED, 24, NO_LED,     50,     63,     76,     89,    102 }
 }, {
     {123,  0}, {117, 15}, {0  ,  0}, {0  , 15}, {123, 27}, {3  , 27}, {127, 40}, {5  , 40}, {2  , 64}, {133, 52}, {8  , 52}, {131, 64}, {255,255},
     {143,  0}, {130, 15}, {255,255}, {13 , 15}, {136, 27}, {19 , 27}, {140, 40}, {23 , 40}, {18 , 64}, {146, 52}, {29 , 52}, {148, 64}, {255,255},
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index 53552d2909..c35d940ed4 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -158,18 +158,18 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 __attribute__ ((weak))
 led_config_t g_led_config = { {
-    { -1+00+3 , -1+26+3 , -1+52+3 , -1+78+3 , -1+104+3, -1+13+1 , -1+39+1 , -1+65+1 , -1+91+1  },
-    { NO_LED  , -1+39+3 , -1+65+3 , -1+91+3 , -1+00+1 , -1+26+1 , -1+52+1 , -1+78+1 , NO_LED   },
-    { -1+00+4 , -1+26+4 , -1+52+4 , -1+78+4 , -1+104+4, -1+13+2 , -1+39+2 , -1+65+2 , -1+91+2  },
-    { -1+13+4 , -1+39+4 , -1+65+4 , -1+91+4 , -1+00+2 , -1+26+2 , -1+52+2 , -1+78+2 , NO_LED   },
-    { -1+00+6 , -1+26+6 , -1+52+6 , -1+78+6 , -1+104+6, -1+13+5 , -1+39+5 , -1+65+5 , -1+91+5  },
-    { -1+13+6 , -1+39+6 , -1+65+6 , -1+91+6 , -1+00+5 , -1+26+5 , -1+52+5 , -1+78+5 , NO_LED   },
-    { -1+00+8 , -1+26+8 , -1+52+8 , -1+78+8 , -1+104+8, -1+13+7 , NO_LED  , NO_LED  , NO_LED   },
-    { -1+13+8 , -1+39+8 , -1+65+8 , -1+91+8 , -1+00+7 , -1+26+7 , -1+52+7 , NO_LED  , NO_LED   },
-    { -1+00+11, -1+26+11, -1+52+11, -1+78+11,-1+104+11, -1+13+10, -1+52+10, NO_LED  , NO_LED   },
-    { -1+13+11, -1+39+11, -1+65+11, -1+91+11, -1+00+10, NO_LED  , NO_LED  , -1+78+10, NO_LED   },
-    { -1+00+9 , -1+26+9 , NO_LED  , NO_LED  , NO_LED  , -1+13+12, -1+39+12, -1+65+12, -1+91+12 },
-    { -1+13+9 , NO_LED  , -1+65+9 , NO_LED  , NO_LED  , NO_LED  , -1+52+12, -1+78+12, NO_LED   }
+    {      2,     28,     54,     80,    106,     13,     39,     65,     91 },
+    { NO_LED,     41,     67,     93,      0,     26,     52,     78, NO_LED },
+    {      3,     29,     55,     81,    107,     14,     40,     66,     92 },
+    {     16,     42,     68,     94,      1,     27,     53,     79, NO_LED },
+    {      5,     31,     57,     83,    109,     17,     43,     69,     95 },
+    {     18,     44,     70,     96,      4,     31,     56,     82, NO_LED },
+    {      7,     33,     59,     85,    111,     19, NO_LED, NO_LED, NO_LED },
+    {     20,     46,     72,     98,      6,     32,     58, NO_LED, NO_LED },
+    {     10,     36,     62,     88,    114,     22,     61, NO_LED, NO_LED },
+    {     23,     49,     75,    101,      9, NO_LED, NO_LED,     87, NO_LED },
+    {      8,     34, NO_LED, NO_LED, NO_LED,     24,     50,     76,    102 },
+    {     21, NO_LED,     73, NO_LED, NO_LED, NO_LED,     63,     89, NO_LED }
 }, {
     {123,  0}, {117, 15}, {0  ,  0}, {0  , 15}, {123, 27}, {3  , 27}, {127, 40}, {5  , 40}, {2  , 64}, {133, 52}, {8  , 52}, {131, 64}, {255,255},
     {143,  0}, {130, 15}, {255,255}, {13 , 15}, {136, 27}, {19 , 27}, {140, 40}, {23 , 40}, {18 , 64}, {146, 52}, {29 , 52}, {148, 64}, {255,255},

From 49a78b81145213e2883e6c3beab6d9c136c10085 Mon Sep 17 00:00:00 2001
From: IFo Hancroft <contact@ifohancroft.com>
Date: Sat, 12 Nov 2022 01:07:20 +0200
Subject: [PATCH 840/959] Ifohancroft HotDox76v2 keymap (#19030)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../hotdox76v2/keymaps/ifohancroft/README.md  |  20 +++
 .../hotdox76v2/keymaps/ifohancroft/config.h   |  23 +++
 .../hotdox76v2/keymaps/ifohancroft/keymap.c   | 145 ++++++++++++++++++
 .../hotdox76v2/keymaps/ifohancroft/rules.mk   |   6 +
 4 files changed, 194 insertions(+)
 create mode 100644 keyboards/hotdox76v2/keymaps/ifohancroft/README.md
 create mode 100644 keyboards/hotdox76v2/keymaps/ifohancroft/config.h
 create mode 100644 keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
 create mode 100644 keyboards/hotdox76v2/keymaps/ifohancroft/rules.mk

diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/README.md b/keyboards/hotdox76v2/keymaps/ifohancroft/README.md
new file mode 100644
index 0000000000..d51eda066f
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/ifohancroft/README.md
@@ -0,0 +1,20 @@
+![IFo Hancroft HotDox76v2 Layout Image](https://i.imgur.com/AqUHXYXh.png)
+
+# IFo Hancroft's HotDox76v2 Layout
+
+- Layer 0: A QWERTY Layer.
+- Layer 1: A Function Layer.
+- Layer 2: Empty Layer.
+- Layer 3: Empty Layer.
+
+This keymap also does the following:
+
+- Forces NKRO on
+- Enables:
+    - The Command Feature
+    - VIA
+    - The Swap Hands feature
+- Disables:
+    - Mouse Key
+    - Extra Key
+    - RGB Matrix
diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/config.h b/keyboards/hotdox76v2/keymaps/ifohancroft/config.h
new file mode 100644
index 0000000000..1cd6c6fc2d
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/ifohancroft/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2022 IFo Hancroft
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+// place overrides here
+#define FORCE_NKRO
+#ifdef TAPPING_TOGGLE
+#    undef TAPPING_TOGGLE
+#endif
+#define TAPPING_TOGGLE 3
diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c b/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
new file mode 100644
index 0000000000..58ef43e037
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
@@ -0,0 +1,145 @@
+/* Copyright 2022 IFo Hancroft
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Default Layer
+    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
+    * | `       | 1       | 2       | 3       | 4       | 5       | -       |                             | =       | 6       | 7       | 8       | 9       | 0       | Del     |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * | Tab     | Q       | W       | E       | R       | T       | [       |                             | ]       | Y       | U       | I       | O       | P       | \       |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * | Esc     | A       | S       | D       | F       | G       |         |                             |         | H       | J       | K       | L       | ;       | '       |
+    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
+    * | Shift   | Z       | X       | C       | V       | B       |                                                 | N       | M       | ,       | .       | /       | Shift   |
+    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
+    * | Ctrl    | Super   | Alt     |         | OSL(1)  |                                                                     | TT(1)   |         | Alt     | Super   | Ctrl    |
+    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
+    *
+    *                                                             *-------------------*         *-------------------*
+    *                                                             |         |         |         |         |         |
+    *                                                   *---------+---------+---------|         |---------+---------+---------*
+    *                                                   |         |         |         |         |         |         |         |
+    *                                                   | Bckspc  | Enter   |---------|         |---------| Enter   | Space   |
+    *                                                   |         |         | SH_OS   |         |         |         |         |
+    *                                                   *---------+---------+---------*         *---------+---------+---------*
+    */
+
+    LAYOUT_ergodox_pretty(
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_MINS,                                KC_EQL,   KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,                                KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+        KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                                                       KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_NO,                                  KC_NO,    KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_NO,    OSL(1),                                                                         TT(1),    KC_NO,    KC_RALT,  KC_RGUI,  KC_RCTL,
+
+                                                                    KC_NO,    KC_NO,              KC_NO,    KC_NO,
+                                                                              KC_NO,              KC_NO,
+                                                          KC_BSPC,  KC_ENT,   SH_OS,              KC_NO,    KC_ENT,   KC_SPC 
+    ),
+
+    /* Function Keys Layer
+    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
+    * | NumLock | F1      | F2      | F3      | F4      | F5      | F11     |                             | F12     | F6      | F7      | F8      | F9      | F10     |         |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * |         | +       | 7       | 8       | 9       | *       |         |                             |         |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * |         | -       | 4       | 5       | 6       | /       |         |                             |         | Left    | Down    | Up      | Right   |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
+    * |         | 0       | 1       | 2       | 3       | .       |                                                 | NK_TOGG |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
+    * |         |         |         |         |         |                                                                     |         | Left    | Down    | Up      | Right   |
+    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
+    *
+    *                                                             *-------------------*         *-------------------*
+    *                                                             |         |         |         |         |         |
+    *                                                   *---------+---------+---------|         |---------+---------+---------*
+    *                                                   |         |         |         |         |         |         |         |
+    *                                                   |         | Enter   |---------|         |---------|         |         |
+    *                                                   | PgUp    |         |         |         |         |         | PgDn    |
+    *                                                   *---------+---------+---------*         *---------+---------+---------*
+    */
+
+    LAYOUT_ergodox_pretty(
+        KC_NUM,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,                                 KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
+        _______,  KC_PPLS,  KC_P7,    KC_P8,    KC_P9,    KC_PAST,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  KC_PMNS,  KC_P4,    KC_P5,    KC_P6,    KC_PSLS,                                                    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
+        _______,  KC_P0,    KC_P1,    KC_P2,    KC_P3,    KC_PDOT,  _______,                                _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          KC_PGUP,  KC_PENT,  _______,            _______,  _______,  KC_PGDN   
+    ),
+
+    /* Empty Layer */
+    LAYOUT_ergodox_pretty(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          _______,  _______,  _______,            _______,  _______,  _______ 
+    ),
+
+    /* Empty Layer */
+    LAYOUT_ergodox_pretty(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          _______,  _______,  _______,            _______,  _______,  _______ 
+    )
+};
+
+    /* Swap Hands
+    * *---------------------------------------------------------------------*
+    * | Delete  | 0       | 9       | 8       | 7       | 6       | =       |
+    * |---------+---------+---------+---------+---------+---------+---------|
+    * | \       | P       | O       | I       | U       | Y       | ]       |
+    * |---------+---------+---------+---------+---------+---------+---------|
+    * | '       | ;       | L       | K       | J       | H       |         |
+    * |---------+---------+---------+---------+---------+---------+---------*
+    * | R Shift | /       | .       | ,       | M       | N       |
+    * |---------+---------+---------+---------+---------+---------*
+    * | R Ctrl  | R Super | R Alt   |         | TT(1)   |
+    * *-------------------------------------------------*
+    *
+    *                                                             *-------------------*
+    *                                                             |         |         |
+    *                                                   *---------+---------+---------|
+    *                                                   |         |         |         |
+    *                                                   | Space   |         |---------|
+    *                                                   |         |         |         |
+    *                                                   *---------+---------+---------*
+    */
+
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    {{0,  6}, {1,  6}, {2,  6}, {3,  6}, {4,  6}, {5,  6}, {6,  6}},
+    {{0,  7}, {1,  7}, {2,  7}, {3,  7}, {4,  7}, {5,  7}, {6,  7}}, 
+    {{0,  8}, {1,  8}, {2,  8}, {3,  8}, {4,  8}, {5,  8}, {6,  8}},
+    {{0,  9}, {1,  9}, {2,  9}, {3,  9}, {4,  9}, {5,  9}, {6,  9}},
+    {{0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10}, {6, 10}},
+    {{0, 11}, {1, 11}, {2, 11}, {3, 11}, {4, 11}, {5, 11}, {6, 11}}
+};
diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/rules.mk b/keyboards/hotdox76v2/keymaps/ifohancroft/rules.mk
new file mode 100644
index 0000000000..fb3efc2f48
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/ifohancroft/rules.mk
@@ -0,0 +1,6 @@
+COMMAND_ENABLE = yes
+EXTRAKEY_ENABLE = no
+MOUSEKEY_ENABLE = no
+RGB_MATRIX_ENABLE = no
+SWAP_HANDS_ENABLE = yes
+VIA_ENABLE = yes

From 050472a4d07d07c1d9ae17d2fd26d44e9d95d950 Mon Sep 17 00:00:00 2001
From: Eric Gebhart <e.a.gebhart@gmail.com>
Date: Sat, 12 Nov 2022 00:09:41 +0100
Subject: [PATCH 841/959] Eric Gebhart user space and keymaps (#17487)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/crkbd/keymaps/ericgebhart/keymap.c  |   46 +-
 .../ergodox_ez/keymaps/ericgebhart/keymap.c   |   34 +-
 .../ergodox_ez/keymaps/ericgebhart/layouts.h  |  139 --
 .../viterbi/keymaps/ericgebhart/keymap.c      |   34 +-
 .../kinesis/keymaps/ericgebhart/keymap.c      |   39 +-
 .../kinesis/keymaps/ericgebhart/rules.mk      |    3 +-
 .../rebound/rev4/keymaps/ericgebhart/keymap.c |   87 +-
 .../rev4/keymaps/ericgebhart/layouts.h        |  113 --
 .../rebound/rev4/keymaps/ericgebhart/rules.mk |    2 +
 .../kyria/keymaps/ericgebhart/config.h        |   25 +
 .../kyria/keymaps/ericgebhart/keymap.c        |   18 +
 .../kyria/keymaps/ericgebhart/rules.mk        |    3 +
 .../xiudi/xd75/keymaps/ericgebhart/keymap.c   |  125 +-
 .../xiudi/xd75/keymaps/ericgebhart/readme.md  |    1 -
 .../xiudi/xd75/keymaps/ericgebhart/rules.mk   |    2 +-
 users/ericgebhart/altlocal_keys.c             |   94 -
 users/ericgebhart/base_layers/accents.h       |   90 +
 users/ericgebhart/base_layers/alt.h           |  150 ++
 users/ericgebhart/base_layers/base_layers.h   |   58 +
 users/ericgebhart/base_layers/beakl.h         |  158 ++
 users/ericgebhart/base_layers/bepo.h          |  114 ++
 users/ericgebhart/base_layers/carpalx.h       |   46 +
 users/ericgebhart/base_layers/dvorak.h        |   73 +
 users/ericgebhart/base_layers/gap.h           |   67 +
 users/ericgebhart/base_layers/hands_down.h    |  147 ++
 users/ericgebhart/base_layers/keymaps.txt     |  300 +++
 users/ericgebhart/base_layers/maks.h          |   61 +
 users/ericgebhart/base_layers/qwerty.h        |   69 +
 users/ericgebhart/base_layers/toprows.h       |   56 +
 users/ericgebhart/caps_word.c                 |   81 -
 users/ericgebhart/caps_word.h                 |   35 -
 users/ericgebhart/combos.def                  |   10 -
 users/ericgebhart/config.h                    |  275 ++-
 users/ericgebhart/core_keys.h                 |  280 ---
 users/ericgebhart/core_keysets.h              |  345 ----
 users/ericgebhart/defs/accented_keys.def      |  101 +
 users/ericgebhart/defs/alt_shift.def          |    6 +
 users/ericgebhart/defs/altlocal_keys.def      |  208 ++
 users/ericgebhart/defs/combos.def             |  139 ++
 users/ericgebhart/defs/custom_keys.def        |   86 +
 users/ericgebhart/defs/encoders.def           |   65 +
 users/ericgebhart/defs/key_overrides.def      |   23 +
 users/ericgebhart/defs/mod_lock.def           |   19 +
 users/ericgebhart/defs/not_dead.def           |   19 +
 users/ericgebhart/defs/nshot.def              |   45 +
 users/ericgebhart/defs/oneshot.def            |   17 +
 users/ericgebhart/defs/send_string.def        |    7 +
 users/ericgebhart/defs/smart_lock.def         |  123 ++
 users/ericgebhart/defs/swapper.def            |    3 +
 users/ericgebhart/defs/tap_hold.def           |   68 +
 users/ericgebhart/defs/unicode.def            |    5 +
 users/ericgebhart/edge_keys.h                 |  238 ---
 users/ericgebhart/ericgebhart.c               |    8 +-
 users/ericgebhart/ericgebhart.h               |   52 +-
 users/ericgebhart/extensions/accented_keys.c  |   50 +
 .../accented_keys.h}                          |    7 +-
 users/ericgebhart/extensions/alt_shift.c      |   99 +
 users/ericgebhart/extensions/altlocal_keys.c  |   82 +
 users/ericgebhart/extensions/altlocal_keys.h  |   56 +
 .../extensions/console_key_logger.c           |   38 +
 .../extensions/console_key_logger.h           |   19 +
 users/ericgebhart/extensions/encoders.c       |   83 +
 users/ericgebhart/extensions/encoders.h       |   46 +
 users/ericgebhart/extensions/extensions.c     |   91 +
 users/ericgebhart/extensions/extensions.h     |   22 +
 users/ericgebhart/extensions/key_overrides.h  |   53 +
 users/ericgebhart/extensions/keycodes.h       |  523 +++++
 users/ericgebhart/extensions/keymap_combo.h   |  139 ++
 users/ericgebhart/extensions/mod_lock.c       |   81 +
 users/ericgebhart/extensions/mod_lock.h       |   39 +
 users/ericgebhart/extensions/not_dead.c       |   36 +
 users/ericgebhart/extensions/nshot_mod.c      |  154 ++
 users/ericgebhart/extensions/nshot_mod.h      |   45 +
 users/ericgebhart/extensions/oneshot.c        |  217 +++
 users/ericgebhart/extensions/oneshot.h        |   37 +
 .../ericgebhart/extensions/process_locales.h  |   29 +
 users/ericgebhart/extensions/process_nshot.h  |   21 +
 .../extensions/process_smart_lock.h           |   19 +
 users/ericgebhart/extensions/quick_tap.c      |   37 +
 users/ericgebhart/extensions/send_string.c    |   40 +
 users/ericgebhart/extensions/smart_lock.c     |  117 ++
 users/ericgebhart/extensions/smart_lock.h     |  103 +
 users/ericgebhart/extensions/swapper.c        |   58 +
 users/ericgebhart/extensions/swapper.h        |   37 +
 .../ericgebhart/{ => extensions}/tap_dances.c |   14 +-
 .../ericgebhart/{ => extensions}/tap_dances.h |    2 +-
 users/ericgebhart/extensions/tap_hold.c       |  165 ++
 users/ericgebhart/extensions/tap_hold.h       |   20 +
 .../{altlocal_keys.h => extensions/unicode.c} |   34 +-
 users/ericgebhart/extensions/unicode.h        |   24 +
 users/ericgebhart/flash-ergodox               |    1 -
 users/ericgebhart/keyboards/keyboards.h       |  115 ++
 users/ericgebhart/keyboards/layouts.h         |  771 ++++++++
 users/ericgebhart/keymap/keymap.c             |  142 ++
 users/ericgebhart/keymap/map_accented.h       |   26 +
 users/ericgebhart/keymap/map_alt.h            |   69 +
 users/ericgebhart/keymap/map_beakl.h          |   48 +
 users/ericgebhart/keymap/map_bepo.h           |   40 +
 users/ericgebhart/keymap/map_carpalx.h        |   25 +
 users/ericgebhart/keymap/map_dvorak.h         |   31 +
 users/ericgebhart/keymap/map_funcs.h          |  127 ++
 users/ericgebhart/keymap/map_gap.h            |   31 +
 users/ericgebhart/keymap/map_hd.h             |  117 ++
 users/ericgebhart/keymap/map_keypads.h        |   66 +
 users/ericgebhart/keymap/map_maks.h           |   34 +
 users/ericgebhart/keymap/map_qwerty.h         |   25 +
 users/ericgebhart/keymap/map_symbols.h        |   56 +
 users/ericgebhart/keymap/map_toprows.h        |   45 +
 users/ericgebhart/lang/lang.h                 |  106 ++
 users/ericgebhart/lang/lang_map.h             |   78 +
 users/ericgebhart/lang/locale_layers.h        |   27 +
 users/ericgebhart/lang/locales.c              |   60 +
 users/ericgebhart/lang/locales.h              |   42 +
 users/ericgebhart/layer_names/base_names.h    |  173 ++
 users/ericgebhart/layer_names/func_names.h    |   38 +
 users/ericgebhart/layer_names/layer_names.h   |   75 +
 users/ericgebhart/layer_names/util_names.h    |   59 +
 users/ericgebhart/layers.h                    |  677 -------
 users/ericgebhart/layers/edge_keys.h          |  420 +++++
 users/ericgebhart/layers/keypads.h            |  236 +++
 users/ericgebhart/layers/layers.h             |  112 ++
 users/ericgebhart/layers/nav.h                |  199 ++
 users/ericgebhart/layers/symbols.h            |  225 +++
 users/ericgebhart/layers/thumbs.h             |  276 +++
 users/ericgebhart/layers/toprows.h            |   80 +
 users/ericgebhart/layers/utility.h            |  125 ++
 users/ericgebhart/layouts.h                   |  720 -------
 users/ericgebhart/listen_keylogger.sh         |    1 +
 users/ericgebhart/miryoku_hd_gold_config.h    |  325 ++++
 users/ericgebhart/mod_layer.h                 |  178 --
 users/ericgebhart/mod_layers/alt_mods.h       |  129 ++
 users/ericgebhart/mod_layers/hrm_gacs.h       |  130 ++
 .../ericgebhart/mod_layers/hrm_gacs_miryoku.h |  130 ++
 users/ericgebhart/mod_layers/hrm_gasc.h       |  130 ++
 users/ericgebhart/mod_layers/hrm_sacg.h       |  130 ++
 users/ericgebhart/mod_layers/hrs_nav.h        |  126 ++
 users/ericgebhart/mod_layers/mod_layer.h      |  155 ++
 users/ericgebhart/mod_layers/trns_mods.h      |  129 ++
 users/ericgebhart/oled/oled_cartes.c          |  325 ++++
 users/ericgebhart/oled/oled_layers.c          |  252 +++
 users/ericgebhart/oled/oled_stuff.c           |  192 ++
 users/ericgebhart/oled/oled_stuff.h           |   61 +
 users/ericgebhart/oled_stuff.c                |  303 ---
 users/ericgebhart/process_records.c           |  216 +--
 users/ericgebhart/readme.md                   | 1678 +++++++++++++++--
 users/ericgebhart/rules.mk                    |   69 +-
 users/ericgebhart/switch-kbd                  |   74 -
 147 files changed, 13177 insertions(+), 4102 deletions(-)
 mode change 100755 => 100644 keyboards/crkbd/keymaps/ericgebhart/keymap.c
 delete mode 100644 keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h
 delete mode 100644 keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h
 create mode 100755 keyboards/splitkb/kyria/keymaps/ericgebhart/config.h
 create mode 100644 keyboards/splitkb/kyria/keymaps/ericgebhart/keymap.c
 create mode 100644 keyboards/splitkb/kyria/keymaps/ericgebhart/rules.mk
 delete mode 100644 keyboards/xiudi/xd75/keymaps/ericgebhart/readme.md
 delete mode 100755 users/ericgebhart/altlocal_keys.c
 create mode 100644 users/ericgebhart/base_layers/accents.h
 create mode 100644 users/ericgebhart/base_layers/alt.h
 create mode 100644 users/ericgebhart/base_layers/base_layers.h
 create mode 100644 users/ericgebhart/base_layers/beakl.h
 create mode 100644 users/ericgebhart/base_layers/bepo.h
 create mode 100644 users/ericgebhart/base_layers/carpalx.h
 create mode 100644 users/ericgebhart/base_layers/dvorak.h
 create mode 100644 users/ericgebhart/base_layers/gap.h
 create mode 100644 users/ericgebhart/base_layers/hands_down.h
 create mode 100644 users/ericgebhart/base_layers/keymaps.txt
 create mode 100644 users/ericgebhart/base_layers/maks.h
 create mode 100644 users/ericgebhart/base_layers/qwerty.h
 create mode 100644 users/ericgebhart/base_layers/toprows.h
 delete mode 100644 users/ericgebhart/caps_word.c
 delete mode 100644 users/ericgebhart/caps_word.h
 delete mode 100644 users/ericgebhart/combos.def
 mode change 100755 => 100644 users/ericgebhart/config.h
 delete mode 100755 users/ericgebhart/core_keys.h
 delete mode 100755 users/ericgebhart/core_keysets.h
 create mode 100644 users/ericgebhart/defs/accented_keys.def
 create mode 100644 users/ericgebhart/defs/alt_shift.def
 create mode 100644 users/ericgebhart/defs/altlocal_keys.def
 create mode 100644 users/ericgebhart/defs/combos.def
 create mode 100644 users/ericgebhart/defs/custom_keys.def
 create mode 100644 users/ericgebhart/defs/encoders.def
 create mode 100644 users/ericgebhart/defs/key_overrides.def
 create mode 100644 users/ericgebhart/defs/mod_lock.def
 create mode 100644 users/ericgebhart/defs/not_dead.def
 create mode 100644 users/ericgebhart/defs/nshot.def
 create mode 100644 users/ericgebhart/defs/oneshot.def
 create mode 100644 users/ericgebhart/defs/send_string.def
 create mode 100644 users/ericgebhart/defs/smart_lock.def
 create mode 100644 users/ericgebhart/defs/swapper.def
 create mode 100644 users/ericgebhart/defs/tap_hold.def
 create mode 100644 users/ericgebhart/defs/unicode.def
 delete mode 100644 users/ericgebhart/edge_keys.h
 create mode 100644 users/ericgebhart/extensions/accented_keys.c
 rename users/ericgebhart/{oled_stuff.h => extensions/accented_keys.h} (78%)
 mode change 100755 => 100644
 create mode 100644 users/ericgebhart/extensions/alt_shift.c
 create mode 100644 users/ericgebhart/extensions/altlocal_keys.c
 create mode 100644 users/ericgebhart/extensions/altlocal_keys.h
 create mode 100644 users/ericgebhart/extensions/console_key_logger.c
 create mode 100644 users/ericgebhart/extensions/console_key_logger.h
 create mode 100644 users/ericgebhart/extensions/encoders.c
 create mode 100644 users/ericgebhart/extensions/encoders.h
 create mode 100644 users/ericgebhart/extensions/extensions.c
 create mode 100644 users/ericgebhart/extensions/extensions.h
 create mode 100644 users/ericgebhart/extensions/key_overrides.h
 create mode 100755 users/ericgebhart/extensions/keycodes.h
 create mode 100644 users/ericgebhart/extensions/keymap_combo.h
 create mode 100644 users/ericgebhart/extensions/mod_lock.c
 create mode 100644 users/ericgebhart/extensions/mod_lock.h
 create mode 100644 users/ericgebhart/extensions/not_dead.c
 create mode 100644 users/ericgebhart/extensions/nshot_mod.c
 create mode 100644 users/ericgebhart/extensions/nshot_mod.h
 create mode 100644 users/ericgebhart/extensions/oneshot.c
 create mode 100644 users/ericgebhart/extensions/oneshot.h
 create mode 100644 users/ericgebhart/extensions/process_locales.h
 create mode 100644 users/ericgebhart/extensions/process_nshot.h
 create mode 100644 users/ericgebhart/extensions/process_smart_lock.h
 create mode 100644 users/ericgebhart/extensions/quick_tap.c
 create mode 100644 users/ericgebhart/extensions/send_string.c
 create mode 100644 users/ericgebhart/extensions/smart_lock.c
 create mode 100644 users/ericgebhart/extensions/smart_lock.h
 create mode 100644 users/ericgebhart/extensions/swapper.c
 create mode 100644 users/ericgebhart/extensions/swapper.h
 rename users/ericgebhart/{ => extensions}/tap_dances.c (97%)
 rename users/ericgebhart/{ => extensions}/tap_dances.h (96%)
 create mode 100644 users/ericgebhart/extensions/tap_hold.c
 create mode 100644 users/ericgebhart/extensions/tap_hold.h
 rename users/ericgebhart/{altlocal_keys.h => extensions/unicode.c} (50%)
 create mode 100644 users/ericgebhart/extensions/unicode.h
 delete mode 100755 users/ericgebhart/flash-ergodox
 create mode 100644 users/ericgebhart/keyboards/keyboards.h
 create mode 100644 users/ericgebhart/keyboards/layouts.h
 create mode 100644 users/ericgebhart/keymap/keymap.c
 create mode 100644 users/ericgebhart/keymap/map_accented.h
 create mode 100644 users/ericgebhart/keymap/map_alt.h
 create mode 100644 users/ericgebhart/keymap/map_beakl.h
 create mode 100644 users/ericgebhart/keymap/map_bepo.h
 create mode 100644 users/ericgebhart/keymap/map_carpalx.h
 create mode 100644 users/ericgebhart/keymap/map_dvorak.h
 create mode 100644 users/ericgebhart/keymap/map_funcs.h
 create mode 100644 users/ericgebhart/keymap/map_gap.h
 create mode 100644 users/ericgebhart/keymap/map_hd.h
 create mode 100644 users/ericgebhart/keymap/map_keypads.h
 create mode 100644 users/ericgebhart/keymap/map_maks.h
 create mode 100644 users/ericgebhart/keymap/map_qwerty.h
 create mode 100644 users/ericgebhart/keymap/map_symbols.h
 create mode 100644 users/ericgebhart/keymap/map_toprows.h
 create mode 100644 users/ericgebhart/lang/lang.h
 create mode 100644 users/ericgebhart/lang/lang_map.h
 create mode 100644 users/ericgebhart/lang/locale_layers.h
 create mode 100644 users/ericgebhart/lang/locales.c
 create mode 100644 users/ericgebhart/lang/locales.h
 create mode 100644 users/ericgebhart/layer_names/base_names.h
 create mode 100644 users/ericgebhart/layer_names/func_names.h
 create mode 100644 users/ericgebhart/layer_names/layer_names.h
 create mode 100644 users/ericgebhart/layer_names/util_names.h
 delete mode 100755 users/ericgebhart/layers.h
 create mode 100644 users/ericgebhart/layers/edge_keys.h
 create mode 100644 users/ericgebhart/layers/keypads.h
 create mode 100755 users/ericgebhart/layers/layers.h
 create mode 100644 users/ericgebhart/layers/nav.h
 create mode 100644 users/ericgebhart/layers/symbols.h
 create mode 100644 users/ericgebhart/layers/thumbs.h
 create mode 100644 users/ericgebhart/layers/toprows.h
 create mode 100644 users/ericgebhart/layers/utility.h
 delete mode 100644 users/ericgebhart/layouts.h
 create mode 100755 users/ericgebhart/listen_keylogger.sh
 create mode 100644 users/ericgebhart/miryoku_hd_gold_config.h
 delete mode 100644 users/ericgebhart/mod_layer.h
 create mode 100644 users/ericgebhart/mod_layers/alt_mods.h
 create mode 100644 users/ericgebhart/mod_layers/hrm_gacs.h
 create mode 100644 users/ericgebhart/mod_layers/hrm_gacs_miryoku.h
 create mode 100644 users/ericgebhart/mod_layers/hrm_gasc.h
 create mode 100644 users/ericgebhart/mod_layers/hrm_sacg.h
 create mode 100644 users/ericgebhart/mod_layers/hrs_nav.h
 create mode 100644 users/ericgebhart/mod_layers/mod_layer.h
 create mode 100644 users/ericgebhart/mod_layers/trns_mods.h
 create mode 100644 users/ericgebhart/oled/oled_cartes.c
 create mode 100644 users/ericgebhart/oled/oled_layers.c
 create mode 100755 users/ericgebhart/oled/oled_stuff.c
 create mode 100755 users/ericgebhart/oled/oled_stuff.h
 delete mode 100755 users/ericgebhart/oled_stuff.c
 delete mode 100755 users/ericgebhart/switch-kbd

diff --git a/keyboards/crkbd/keymaps/ericgebhart/keymap.c b/keyboards/crkbd/keymaps/ericgebhart/keymap.c
old mode 100755
new mode 100644
index e893ec596b..c534fe3c6d
--- a/keyboards/crkbd/keymaps/ericgebhart/keymap.c
+++ b/keyboards/crkbd/keymaps/ericgebhart/keymap.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -14,47 +14,5 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "ericgebhart.h"
 
-#define Crkbd_base(...)        Base_3x6_3(__VA_ARGS__)
-#define Crkbd_bepo(...)        Base_bepo_3x6_3(__VA_ARGS__)
-#define Crkbd_bepo6(...)       Base_bepo6_3x6_3(__VA_ARGS__)
-#define Crkbd_transient(...)   Transient6_3x6_3(__VA_ARGS__)
-
-/*
- * The `Crkbd_base` macro is a template to allow the use of identical
- * modifiers for the default layouts (eg QWERTY, Colemak, Dvorak, etc), so
- * that there is no need to set them up for each layout, and modify all of
- * them if I want to change them.  This helps to keep consistency and ease
- * of use. K## is a placeholder to pass through the individual keycodes
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Qwerty based Base layers
-    [_DVORAK]  = Crkbd_base(___DVORAK___),
-    [_BEAKL]   = Crkbd_base(___BEAKL15___),
-    [_COLEMAK] = Crkbd_base(___COLEMAK_DH___),
-    [_QWERTY]  = Crkbd_base(___QWERTY___),
-
-    // Bepo base layers
-    [_BEAKL_BP]  = Crkbd_bepo(___BEAKL15_FR___),
-    [_DVORAK_BP] = Crkbd_bepo(___DVORAK_FR___),
-    [_BEPO]      = Crkbd_bepo6(___BEPO6___),
-
-    // Transient layers.
-    [_SYMB]    = Crkbd_transient(___SYMB_BEAKLB_3x12___),
-    [_SYMB_BP] = Crkbd_transient(___SYMB_BEAKLB_BP_3x12___),
-
-    [_KEYPAD]    = Crkbd_transient(___KP_C_3x12___),
-    [_KEYPAD_BP] = Crkbd_transient(___KP_C_BP_3x12___),
-
-    [_TOPROWS]    = Crkbd_transient(___TOPROWS_3x12___),
-    [_TOPROWS_BP] = Crkbd_transient(___TOPROWS_BP_3x12___),
-
-    [_NAV] = Crkbd_transient(___NAV_3x12___),
-
-    [_LAYERS] = Crkbd_transient(___LAYERS_3x12___),
-    //[_RGB] = Crkbd_transient(___RGB_3x12___),
-    [_ADJUST] = Crkbd_transient(___ADJUST_3x12___),
-    ///HPT_TOG, KC_NUKE, ___,        ___, TG_MODS, HPT_FBK
-};
+// See: users/ericgebhart.
diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
index e76e3296bf..c534fe3c6d 100644
--- a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -14,35 +14,5 @@
   You 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_bepo.h"
-#include "ericgebhart.h"
-#include "layouts.h"
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // Qwerty Base layers
-    [_DVORAK]  = Dox_base(___NUMS___, ___DVORAK___),
-    [_QWERTY]  = Dox_base(___NUMS___, ___QWERTY___),
-    [_COLEMAK] = Dox_base(___NUMS___, ___COLEMAK_DH___),
-    [_BEAKL]   = Dox_base(___NUMS___, ___BEAKL15___),
-    // Bepo Base layers
-    [_DVORAK_BP] = Dox_bepo_base(___NUMS_BP___,    ___DVORAK_FR___),
-    [_BEAKL_BP]  = Dox_bepo_base(___BKLNUMS_BP___, ___BEAKL15_FR___),
-    [_BEPO]      = Dox_bepo_base6(___BEPO6___),
-
-
-    // transient layers.
-    // Switch to using a transient layer macro
-    [_SYMB]    = Dox_transient(___12_FUNC___, ___SYMB_BEAKLA_3x12___),
-    [_SYMB_BP] = Dox_transient(___12_FUNC___, ___SYMB_BEAKLA_BP_3x12___),
-
-    [_TOPROWS]    = Dox_transient(___12___, ___TOPROWS_3x12___),
-    [_TOPROWS_BP] = Dox_transient(___12___, ___TOPROWS_BP_3x12___),
-
-    [_KEYPAD]    = Dox_transient(___KEYPAD_BKL_FUNC_4x12___),
-    [_KEYPAD_BP] = Dox_transient(___KEYPAD_BKL_FUNC_BP_4x12___),
-
-    [_NAV]    = Dox_transient(___12___, ___NAV_3x12___),
-    [_LAYERS] = Dox_transient(___12___, ___LAYERS_3x12___),
-    [_RGB]    = Dox_transient(___12___, ___RGB_3x12___),
-};
+// See: users/ericgebhart.
diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h b/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h
deleted file mode 100644
index dd8f193dfc..0000000000
--- a/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/********************************************************************/
-/* Ergodox EZ                                                       */
-/********************************************************************/
-// This one is is set up to pass in the number row.
-// Beakl and bepo both change the number row.
-// Left, middle, right, bottom, and thumbs all stay the same.
-#define Base_dox(                                                       \
-                 K01, K02, K03, K04, K05,                               \
-                 K06, K07, K08, K09, K0A,                               \
-                 K11, K12, K13, K14, K15,                               \
-                 K16, K17, K18, K19, K1A,                               \
-                 K21, K22, K23, K24, K25,                               \
-                 K26, K27, K28, K29, K2A,                               \
-                 K31, K32, K33, K34, K35,                               \
-                 K36, K37, K38, K39, K3A                                \
-                                                                        ) \
-  LVARG_edox(                                                           \
-             ROW0_LEFT(K01, K02, K03, K04, K05),                        \
-             ___2_MIDDLE_1___,                                          \
-             ROW0_RIGHT(K06, K07, K08, K09, K0A),                       \
-                                                                        \
-             ROW1_LEFT(K11, K12, K13, K14, K15),                        \
-             ___2_MIDDLE_2___,                                          \
-             ROW1_RIGHT(K16, K17, K18, K19, K1A),                       \
-                                                                        \
-             ROW2_LEFT(K21, K22, K23, K24, K25),                        \
-             ROW2_RIGHT(K26, K27, K28, K29, K2A),                       \
-                                                                        \
-             ROW3_LEFT(K31, K32, K33, K34, K35),                        \
-             ___2_MIDDLE_3___,                                          \
-             ROW3_RIGHT(K36, K37, K38, K39, K3A),                       \
-             ___5_BOTTOM_LEFT___,   ___5_BOTTOM_RIGHT___,               \
-             ___12_DOX_ALL_THUMBS___                                    \
-                                                                        )
-
-#define Base_dox_bepo(                                                  \
-                      K01, K02, K03, K04, K05,                          \
-                      K06, K07, K08, K09, K0A,                          \
-                      K11, K12, K13, K14, K15,                          \
-                      K16, K17, K18, K19, K1A,                          \
-                      K21, K22, K23, K24, K25,                          \
-                      K26, K27, K28, K29, K2A,                          \
-                      K31, K32, K33, K34, K35,                          \
-                      K36, K37, K38, K39, K3A                           \
-                                                                        ) \
-  LVARG_edox(                                                           \
-             ROW0_LEFT(K01, K02, K03, K04, K05),                        \
-             ___2_MIDDLE_1___,                                          \
-             ROW0_RIGHT(K06, K07, K08, K09, K0A),                       \
-                                                                        \
-             ROW1_LEFT(K11, K12, K13, K14, K15),                        \
-             ___2_MIDDLE_2___,                                          \
-             ROW1_RIGHT(K16, K17, K18, K19, K1A),                       \
-                                                                        \
-             ROW2_LEFT(K21, K22, K23, K24, K25),                        \
-             ROW2_RIGHT(K26, K27, K28, K29, K2A),                       \
-                                                                        \
-             ROW3_LEFT(K31, K32, K33, K34, K35),                        \
-             ___2_MIDDLE_3___,                                          \
-             ROW3_RIGHT(K36, K37, K38, K39, K3A),                       \
-             ___5_BOTTOM_LEFT___, ___5_BOTTOM_RIGHT___,                 \
-             ___12_DOX_ALL_THUMBS_BP___                                 \
-                                                                        )
-
-
-#define Base_dox_bepo6(                                                 \
-                       K01, K02, K03, K04, K05, K06,                    \
-                       K07, K08, K09, K0A, K0B, K0C,                    \
-                       K11, K12, K13, K14, K15, K16,                    \
-                       K17, K18, K19, K1A, K1B, K1C,                    \
-                       K21, K22, K23, K24, K25, K26,                    \
-                       K27, K28, K29, K2A, K2B, K2C                     \
-                                                                        ) \
-  LVARG_edox(                                                           \
-             ___6SYMBOL_BEPO_L___,                                      \
-             ___2_MIDDLE_T_BP___,                                       \
-             ___6SYMBOL_BEPO_R___,                                      \
-             ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),               \
-             ___2_MIDDLE_2_BP___,                                       \
-             ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),              \
-                                                                        \
-             ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),               \
-             ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),              \
-                                                                        \
-             ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),               \
-             ___2_MIDDLE_3_BP___,                                       \
-             ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),              \
-                                                                        \
-             ___5_BOTTOM_LEFT_BP___, ___5_BOTTOM_RIGHT_BP___,           \
-             ___12_DOX_ALL_THUMBS_BP___                                 \
-                                                                        )
-
-#define Transient_dox6(                                                 \
-                       K01, K02, K03, K04, K05, K06,                    \
-                       K07, K08, K09, K0A, K0B, K0C,                    \
-                       K11, K12, K13, K14, K15, K16,                    \
-                       K17, K18, K19, K1A, K1B, K1C,                    \
-                       K21, K22, K23, K24, K25, K26,                    \
-                       K27, K28, K29, K2A, K2B, K2C,                    \
-                       K31, K32, K33, K34, K35, K36,                    \
-                       K37, K38, K39, K3A, K3B, K3C                     \
-                                                                        ) \
-  LVARG_edox(                                                           \
-             K01, K02, K03, K04, K05, K06,                              \
-             ___2___,                                                   \
-             K07, K08, K09, K0A, K0B, K0C,                              \
-             K11, K12, K13, K14, K15, K16,                              \
-             ___2___,                                                   \
-             K17, K18, K19, K1A, K1B, K1C,                              \
-             K21, K22, K23, K24, K25, K26,                              \
-             K27, K28, K29, K2A, K2B, K2C,                              \
-             K31, K32, K33, K34, K35, K36,                              \
-             ___2___,                                                   \
-             K37, K38, K39, K3A, K3B, K3C,                              \
-             ___5___, ___5___,                                          \
-             ___12___                                                   \
-                                                                        )
-
-#define Dox_base(...)        Base_dox(__VA_ARGS__)
-#define Dox_bepo_base(...)   Base_dox_bepo(__VA_ARGS__)
-#define Dox_bepo_base6(...)  Base_dox_bepo6(__VA_ARGS__)
-#define Dox_transient(...)   Transient_dox6(__VA_ARGS__)
diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c
index 60f7b74bc0..c534fe3c6d 100644
--- a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,34 +15,4 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "keymap_bepo.h"
-#include "ericgebhart.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // 4x10
-  [_DVORAK]  = BASE_5x14(___NUMS___, ___DVORAK___),
-  [_QWERTY]  = BASE_5x14(___NUMS___, ___QWERTY___),
-  [_COLEMAK] = BASE_5x14(___NUMS___, ___COLEMAK_DH___),
-  [_BEAKL]   = BASE_5x14(___BKLNUMS___, ___BEAKL15___),
-
-  //[_DVORAK_BP] = BASE_5x14_bepo(___DVORAK_FR___),
-  //[_BEAKL_BP]  = BASE_5x14_bepo(___BEAKL15_FR___),
-
-  // 4x12
-  //[_BEPO]      = BASE_5x14_bepo6(___BEPO6_FR___),
-
-  // transient macro takes a 3x12 for args
-  [_SYMB]    = TRANSIENT_5x14(___12___, ___SYMB_BEAKLA_3x12___),
-  //[_SYMB_BP] = TRANSIENT_5x14(___SYMB_BEAKLA_BP_3x12___),
-
-  [_TOPROWS]    = TRANSIENT_5x14(___12___, ___TOPROWS_3x12___),
-  //[_TOPROWS_BP] = TRANSIENT_5x14(___TOPROWS_BP_3x12___),
-
-  [_KEYPAD]    = TRANSIENT_5x14(___12___, ___KP_C_3x12___),
-  //[_KEYPAD_BP] = TRANSIENT_5x14(___KP_C_BP_3x12___),
-
-  // Navigation and control
-  [_NAV]    = TRANSIENT_5x14(___12___, ___NAV_3x12___),
-  [_LAYERS] = TRANSIENT_5x14(___12___, ___LAYERS_3x12___),
-  //[_RGB]  = TRANSIENT_5x14(___12___, ___RGB_3x12___),
-};
+// See: users/ericgebhart.
diff --git a/keyboards/kinesis/keymaps/ericgebhart/keymap.c b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
index 731e257b05..c534fe3c6d 100644
--- a/keyboards/kinesis/keymaps/ericgebhart/keymap.c
+++ b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -14,40 +14,5 @@
   You 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_bepo.h"
-#include "ericgebhart.h"
 
-#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
-
-#define Kinesis_base(...)        Base_4x6_4_6(__VA_ARGS__)
-#define Kinesis_bepo_base(...)   Base_bepo_4x6_4_6(__VA_ARGS__)
-#define Kinesis_bepo_base6(...)  Base_bepo6_4x6_4_6(__VA_ARGS__)
-#define Kinesis_transient(...)   Transient6_4x6_4_6(__VA_ARGS__)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // Qwerty Base layers
-  [_DVORAK]  = Kinesis_base(___NUMS___, ___DVORAK___),
-  [_QWERTY]  = Kinesis_base(___NUMS___, ___QWERTY___),
-  [_COLEMAK] = Kinesis_base(___NUMS___, ___COLEMAK_DH___),
-  [_BEAKL]   = Kinesis_base(___BKLNUMS___, ___BEAKL15___),
-  // Bepo Base layers
-  [_DVORAK_BP] = Kinesis_bepo_base(___NUMS_BP___, ___DVORAK_FR___),
-  [_BEAKL_BP]  = Kinesis_bepo_base(___BKLNUMS_BP___,   ___BEAKL15_FR___),
-
-  [_BEPO]      = Kinesis_bepo_base6(___BEPO6___),
-
-  // transient layers.
-  // Switch to using a transient layer macro
-  [_SYMB]    = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_3x12___),
-  [_SYMB_BP] = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_BP_3x12___),
-
-  [_TOPROWS]    = Kinesis_transient(___12___, ___TOPROWS_3x12___),
-  [_TOPROWS_BP] = Kinesis_transient(___12___, ___TOPROWS_BP_3x12___),
-
-  [_NAV]    = Kinesis_transient(___12___, ___NAV_3x12___),
-  [_LAYERS] = Kinesis_transient(___12___, ___LAYERS_3x12___),
-  [_ADJUST] = Kinesis_transient(___12___, ___ADJUST_3x12___),
-  //[_RGB]    = Kinesis_transient(___12___, ___RGB_3x12___),
-};
+// See: users/ericgebhart.
diff --git a/keyboards/kinesis/keymaps/ericgebhart/rules.mk b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
index 61115e927a..dd62550343 100644
--- a/keyboards/kinesis/keymaps/ericgebhart/rules.mk
+++ b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = no         # Unicode
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
index 59f2a23733..c534fe3c6d 100644
--- a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
+++ b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -14,88 +14,5 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "ericgebhart.h"
-#include "layouts.h"
 
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Qwerty based Base layers
-  [_DVORAK]  = Rebound_base(___DVORAK___),
-  [_BEAKL]   = Rebound_base(___BEAKL15___),
-  [_COLEMAK] = Rebound_base(___COLEMAK_DH___),
-  [_QWERTY]  = Rebound_base(___QWERTY___),
-
-  // Bepo base layers
-  [_BEAKL_BP]  = Rebound_base_bepo(___BEAKL15_FR___),
-  [_DVORAK_BP] = Rebound_base_bepo(___DVORAK_FR___),
-  [_BEPO]      = Rebound_base_bepo6(___BEPO6___),
-
-  // Transient layers.
-  [_SYMB]    = Rebound_transient(___SYMB_BEAKLA_3x12___),
-  [_SYMB_BP] = Rebound_transient(___SYMB_BEAKLA_BP_3x12___),
-
-  [_KEYPAD]    = Rebound_transient(___KP_C_3x12___),
-  [_KEYPAD_BP] = Rebound_transient(___KP_C_BP_3x12___),
-
-  [_TOPROWS]    = Rebound_transient(___TOPROWS_3x12___),
-  [_TOPROWS_BP] = Rebound_transient(___TOPROWS_BP_3x12___),
-  [_NAV]    = Rebound_transient(___NAV_3x12___),
-  [_LAYERS] = Rebound_transient(___LAYERS_3x12___),
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  switch(get_highest_layer(layer_state)){
-  case _DVORAK:
-    if (clockwise) {
-      tap_code16(KC_VOLD);
-    } else {
-      tap_code16(KC_VOLU);
-    }
-    break;
-
-  case _NAV:
-    if (clockwise) {
-      tap_code16(S(KC_TAB));
-    } else {
-      tap_code16(KC_TAB);
-    }
-    break;
-  }
-  return true;
-}
-
-#ifdef OLED_ENABLE
-void oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_P(PSTR(""), false);
-
-  switch (get_highest_layer(layer_state)) {
-  case _BASE:
-    oled_write_P(PSTR("Rebound\n"), false);
-    oled_write_P(PSTR("Rev4\n"), false);
-    break;
-  case _NAV:
-    oled_write_P(PSTR("Nav\n"), false);
-    break;
-  case _SYMB_BEAKL:
-  case _SYMB:
-    oled_write_P(PSTR("Symbols\n"), false);
-    break;
-  case _KEYPAD:
-    oled_write_P(PSTR("Top Rows\n"), false);
-    break;
-  default:
-    // Or use the write_ln shortcut over adding '\n' to the end of your string
-    oled_write_ln_P(PSTR("Undefined"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-
-}
-
-#endif
+// See: users/ericgebhart.
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h
deleted file mode 100644
index f6b7fc1513..0000000000
--- a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/********************************************************************/
-/* Rebound 4 rows, 1x12, 3x13  */
-/********************************************************************/
-
-#define LVARG_rebound(...)    LAYOUT_all(__VA_ARGS__)
-#define LAYOUT_rebound_base(                                            \
-                            K01, K02, K03, K04, K05,                    \
-                            K06, K07, K08, K09, K0A,                    \
-                            K11, K12, K13, K14, K15,                    \
-                            K16, K17, K18, K19, K1A,                    \
-                            K21, K22, K23, K24, K25,                    \
-                            K26, K27, K28, K29, K2A                     \
-                                                                        ) \
-  LVARG_rebound(                                                        \
-                ROW1_LEFT(K01, K02, K03, K04, K05),                     \
-                ROW1_RIGHT(K06, K07, K08, K09, K0A),                    \
-                                                                        \
-                ROW2_LEFT(K11, K12, K13, K14, K15),                     \
-                KC_CCCV,                                                \
-                ROW2_RIGHT(K16, K17, K18, K19, K1A),                    \
-                                                                        \
-                ROW3_LEFT(K21, K22, K23, K24, K25),                     \
-                MO(_ADJUST),                                            \
-                ROW3_RIGHT(K26, K27, K28, K29, K2A),                    \
-                ___13_BOTTOM___                                         \
-                                                                        )
-
-#define LAYOUT_rebound_base_bepo(                                       \
-                                 K01, K02, K03, K04, K05,               \
-                                 K06, K07, K08, K09, K0A,               \
-                                 K11, K12, K13, K14, K15,               \
-                                 K16, K17, K18, K19, K1A,               \
-                                 K21, K22, K23, K24, K25,               \
-                                 K26, K27, K28, K29, K2A                \
-                                                                        ) \
-  LVARG_rebound(                                                        \
-                ROW1_LEFT_BP(K01, K02, K03, K04, K05),                  \
-                ROW1_RIGHT_BP(K06, K07, K08, K09, K0A),                 \
-                                                                        \
-                ROW2_LEFT_BP(K11, K12, K13, K14, K15),                  \
-                KC_CCCV,                                                \
-                ROW2_RIGHT_BP(K16, K17, K18, K19, K1A),                 \
-                                                                        \
-                ROW3_LEFT_BP(K21, K22, K23, K24, K25),                  \
-                MO(_ADJUST),                                            \
-                ROW3_RIGHT_BP(K26, K27, K28, K29, K2A),                 \
-                ___13_BOTTOM_BP___                                      \
-                                                                        )
-
-// Just for bepo because it's a 3x6 matrix on each side.
-// So 3 pairs of 6 keys, left and right.
-#define LAYOUT_rebound_base_bepo6(                                      \
-                                  K01, K02, K03, K04, K05, K06,         \
-                                  K07, K08, K09, K0A, K0B, K0C,         \
-                                  K11, K12, K13, K14, K15, K16,         \
-                                  K17, K18, K19, K1A, K1B, K1C,         \
-                                  K21, K22, K23, K24, K25, K26,         \
-                                  K27, K28, K29, K2A, K2B, K2C          \
-                                                                        ) \
-  LVARG_rebound(                                                        \
-                ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),            \
-                ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),           \
-                                                                        \
-                ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),            \
-                KC_CCCV,                                                \
-                ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),           \
-                                                                        \
-                ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),            \
-                MO(_ADJUST),                                            \
-                ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),           \
-                ___13_BOTTOM_BP___                                      \
-                                                                        )
-
-#define LAYOUT_rebound_transient(                                       \
-                                 K01, K02, K03, K04, K05, K06,          \
-                                 K07, K08, K09, K0A, K0B, K0C,          \
-                                 K11, K12, K13, K14, K15, K16,          \
-                                 K17, K18, K19, K1A, K1B, K1C,          \
-                                 K21, K22, K23, K24, K25, K26,          \
-                                 K27, K28, K29, K2A, K2B, K2C           \
-                                                                        ) \
-  LVARG_rebound(                                                        \
-                K01, K02, K03, K04, K05, K06,                           \
-                K07, K08, K09, K0A, K0B, K0C,                           \
-                K11, K12, K13, K14, K15, K16,                           \
-                ___,                                                    \
-                K17, K18, K19, K1A, K1B, K1C,                           \
-                K21, K22, K23, K24, K25, K26,                           \
-                ___,                                                    \
-                K27, K28, K29, K2A, K2B, K2C,                           \
-                ___, ___12___)
-
-#define Rebound_base(...)       LAYOUT_rebound_base(__VA_ARGS__)
-#define Rebound_base_bepo(...)  LAYOUT_rebound_base_bepo(__VA_ARGS__)
-#define Rebound_base_bepo6(...) LAYOUT_rebound_base_bepo6(__VA_ARGS__)
-#define Rebound_transient(...)  LAYOUT_rebound_transient(__VA_ARGS__)
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
index cf27df39b8..28b8714100 100644
--- a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
+++ b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
@@ -1,6 +1,7 @@
 # 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
@@ -11,6 +12,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes      # Enable the tap dance feature.
diff --git a/keyboards/splitkb/kyria/keymaps/ericgebhart/config.h b/keyboards/splitkb/kyria/keymaps/ericgebhart/config.h
new file mode 100755
index 0000000000..6f7578aa5d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/ericgebhart/config.h
@@ -0,0 +1,25 @@
+/*
+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
+
+// otherwise the other promicro v3 isn't found
+#define SPLIT_USB_DETECT
+#define OLED_DISPLAY_128X64
diff --git a/keyboards/splitkb/kyria/keymaps/ericgebhart/keymap.c b/keyboards/splitkb/kyria/keymaps/ericgebhart/keymap.c
new file mode 100644
index 0000000000..c534fe3c6d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/ericgebhart/keymap.c
@@ -0,0 +1,18 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// See: users/ericgebhart.
diff --git a/keyboards/splitkb/kyria/keymaps/ericgebhart/rules.mk b/keyboards/splitkb/kyria/keymaps/ericgebhart/rules.mk
new file mode 100644
index 0000000000..1946c18729
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/ericgebhart/rules.mk
@@ -0,0 +1,3 @@
+EXTRAKEY_ENABLE = no      # Audio control and System control
+ENCODER_ENABLE = no       # Enables the use of one or more encoders
+RGBLIGHT_ENABLE = no      # Enable keyboard RGB underglow
diff --git a/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c b/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
index a500e4b682..c534fe3c6d 100644
--- a/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,125 +15,4 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "keymap_bepo.h"
-#include "ericgebhart.h"
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // 4x10
-  [_DVORAK]  = BASE_5x15(___NUMS___, ___DVORAK___),
-  [_QWERTY]  = BASE_5x15(___NUMS___, ___QWERTY___),
-  [_COLEMAK] = BASE_5x15(___NUMS___, ___COLEMAK_DH___),
-  [_BEAKL]   = BASE_5x15(___BKLNUMS___, ___BEAKL15___),
-
-  //[_DVORAK_BP] = BASE_5x15_bepo(___DVORAK_FR___),
-  //[_BEAKL_BP]  = BASE_5x15_bepo(___BEAKL15_FR___),
-
-  // 4x12
-  //[_BEPO]      = BASE_5x15_bepo6(___BEPO6_FR___),
-
-  // transient macro takes a 4x12 for args
-  [_SYMB]    = TRANSIENT_5x15(___12___, ___SYMB_BEAKLA_3x12___),
-  //[_SYMB_BP] = TRANSIENT_5x15(___12___, ___SYMB_BEAKLA_BP_3x12___),
-
-  [_TOPROWS]    = TRANSIENT_5x15(___12___, ___TOPROWS_3x12___),
-  //[_TOPROWS_BP] = TRANSIENT_5x15(___12___, ___TOPROWS_BP_3x12___),
-
-  [_KEYPAD]    = TRANSIENT_5x15(___12___, ___KP_C_3x12___),
-  //[_KEYPAD_BP] = TRANSIENT_5x15(___12___, ___KP_C_BP_3x12___),
-
-  // Navigation and control
-  [_NAV]    = TRANSIENT_5x15(___12___, ___NAV_3x12___),
-  [_LAYERS] = TRANSIENT_5x15(___12___, ___LAYERS_3x12___),
-  //[_RGB]  = TRANSIENT_5x15(___12___, ___RGB_3x12___),
-  [_ADJUST]    = TRANSIENT_5x15(___12___, ___ADJUST_3x12___),
-};
-
-
-/********************************************************************************/
-/* Using layers to do RGB underlighting */
-/********************************************************************************/
-
-const rgblight_segment_t PROGMEM on_bepo[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                     {0, 2, HSV_AZURE}
-                                                                     );
-
-const rgblight_segment_t PROGMEM bepo[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                  {3, 2, HSV_MAGENTA}
-                                                                  );
-
-const rgblight_segment_t PROGMEM dvorak[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                    {3, 2, HSV_AZURE}
-                                                                    );
-
-const rgblight_segment_t PROGMEM media[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                   {5, 1, HSV_GREEN}
-                                                                   );
-
-const rgblight_segment_t PROGMEM symbol[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                    {4, 2, HSV_GOLD}
-                                                                    );
-
-const rgblight_segment_t PROGMEM keypad[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                    {4, 2, HSV_BLUE}
-                                                                    );
-
-const rgblight_segment_t PROGMEM layers[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                    {5, 1, HSV_RED}
-                                                                    );
-
-const rgblight_segment_t PROGMEM rgb[] = RGBLIGHT_LAYER_SEGMENTS(
-                                                                 {5, 1, HSV_ORANGE}
-                                                                 );
-
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(on_bepo, bepo, dvorak, media, symbol,
-                                                                            keypad, layers, rgb);
-
-void keyboard_post_init_user(void) {
-  rgblight_sethsv_noeeprom(HSV_PURPLE);
-  rgblight_layers = rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  // rgblight_set_layer_state(0, !on_qwerty());
-  rgblight_set_layer_state(0, layer_state_cmp(state, _DVORAK));
-
-  rgblight_set_layer_state(1, layer_state_cmp(state, _BEPO));
-  rgblight_set_layer_state(2, layer_state_cmp(state, _DVORAK));
-  //|| layer_state_cmp(state, DVORAK_ON_BEPO)));
-  rgblight_set_layer_state(3, layer_state_cmp(state, _NAV));
-  rgblight_set_layer_state(4, layer_state_cmp(state, _SYMB) );
-
-  //(layer_state_cmp(state, SYMB) || (layer_state_cmp(state, SYMB_ON_BEPO))));
-  rgblight_set_layer_state(5, layer_state_cmp(state, _KEYPAD) );
-  ///(layer_state_cmp(state, KEYPAD) || (layer_state_cmp(state, KEYPAD_ON_BEPO))));
-  rgblight_set_layer_state(6, layer_state_cmp(state, _LAYERS));
-  rgblight_set_layer_state(7, layer_state_cmp(state, _RGB));
-  return state;
-}
-
-/* void suspend_power_down_user(void) { */
-/*   rgblight_disable(); */
-/* } */
-
-/* void suspend_wakeup_init_user(void) { */
-/*   rgblight_enable(); */
-/* } */
-
-/* bool is_shift_pressed = false; */
-
-/* bool led_update_user(led_t led_state) { */
-/*   rgblight_set_layer_state(2, is_shift_pressed != led_state.caps_lock); */
-/*   return true; */
-/* } */
-
-/* bool process_record_user(uint16_t keycode, keyrecord_t* record) { */
-/*   switch (keycode) { */
-/*   case KC_LSFT: */
-/*   case KC_RSFT: */
-/*     is_shift_pressed = record->event.pressed; */
-/*     rgblight_set_layer_state(2, is_shift_pressed != host_keyboard_led_state().caps_lock); */
-/*   default: */
-/*     return true; */
-/*   } */
-/* } */
+// See: users/ericgebhart.
diff --git a/keyboards/xiudi/xd75/keymaps/ericgebhart/readme.md b/keyboards/xiudi/xd75/keymaps/ericgebhart/readme.md
deleted file mode 100644
index a1c0236ed9..0000000000
--- a/keyboards/xiudi/xd75/keymaps/ericgebhart/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for xd75, with led controls
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/ericgebhart/rules.mk b/keyboards/xiudi/xd75/keymaps/ericgebhart/rules.mk
index 11871f9c9d..f171387f29 100644
--- a/keyboards/xiudi/xd75/keymaps/ericgebhart/rules.mk
+++ b/keyboards/xiudi/xd75/keymaps/ericgebhart/rules.mk
@@ -1,3 +1,3 @@
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_ANIMATION = yes
+RGBLIGHT_ANIMATION = no
 # BACKLIGHT_ENABLE = yes
diff --git a/users/ericgebhart/altlocal_keys.c b/users/ericgebhart/altlocal_keys.c
deleted file mode 100755
index 285041b418..0000000000
--- a/users/ericgebhart/altlocal_keys.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ericgebhart.h"
-#include "altlocal_keys.h"
-
-#include "keymap_bepo.h"
-
-// These are the keys for dvorak on bepo.  column one is the keycode and mods for
-// the unshifted key, the second column is the keycode and mods for the shifted key.
-// GR is Good Range.  It subtracts SAFE_RANGE from the keycode so we can make a
-// reasnably sized array without difficulties. The macro is for the constant declarations
-// the function is for when we use it.
-const uint16_t key_translations[][2][2] = {
-  [GR(DB_1)] =      {{BP_DQUO, MOD_LSFT},      {BP_DCIR, MOD_LSFT}},
-  [GR(DB_2)] =      {{BP_LDAQ, MOD_LSFT},      {BP_AT, MOD_NONE}},
-  [GR(DB_3)] =      {{BP_RDAQ, MOD_LSFT},      {BP_DLR, MOD_LSFT}},
-  [GR(DB_4)] =      {{BP_LPRN, MOD_LSFT},      {BP_DLR, MOD_NONE}},
-  [GR(DB_5)] =      {{BP_RPRN, MOD_LSFT},      {BP_PERC, MOD_NONE}},
-  [GR(DB_6)] =      {{BP_AT, MOD_LSFT},        {BP_AT, MOD_BIT(KC_RALT)}},
-  [GR(DB_7)] =      {{BP_PLUS, MOD_LSFT},      {BP_P, MOD_BIT(KC_RALT)}},
-  [GR(DB_8)] =      {{BP_MINS, MOD_LSFT},      {BP_ASTR, MOD_NONE}},
-  [GR(DB_9)] =      {{BP_SLSH, MOD_LSFT},     {BP_LPRN, MOD_NONE}},
-  [GR(DB_0)] =      {{BP_ASTR, MOD_LSFT},      {BP_RPRN, MOD_NONE}},
-  [GR(DB_GRV)] =    {{BP_PERC, MOD_LSFT},      {BP_K, MOD_BIT(KC_RALT)}},
-  [GR(DB_SCOLON)] = {{BP_COMM, MOD_LSFT},      {BP_DOT, MOD_LSFT}},
-  [GR(DB_SLASH)] =  {{BP_SLSH, MOD_NONE},     {BP_QUOT, MOD_LSFT}},
-  [GR(DB_BACKSLASH)] = {{BP_AGRV, MOD_BIT(KC_RALT)}, {BP_B, MOD_BIT(KC_RALT)}},
-  [GR(DB_EQL)] =    {{BP_EQL, MOD_NONE},       {BP_PLUS, MOD_NONE}},
-  [GR(DB_COMM)] =   {{BP_COMM, MOD_NONE},     {BP_LDAQ, MOD_BIT(KC_RALT)}},
-  [GR(DB_DOT)] =    {{BP_DOT, MOD_NONE},       {BP_RDAQ, MOD_BIT(KC_RALT)}},
-  [GR(DB_QUOT)] =   {{BP_QUOT, MOD_NONE},      {BP_DQUO, MOD_NONE}},
-  [GR(DB_MINUS)] =  {{BP_MINS, MOD_NONE},     {KC_SPC, MOD_BIT(KC_RALT)}},
-  [GR(DB_LPRN)] =   {{BP_LPRN, MOD_NONE},      {BP_LPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_RPRN)] =   {{BP_RPRN, MOD_NONE},      {BP_RPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_LBRC)] =   {{BP_Y, MOD_BIT(KC_RALT)}, {BP_LPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_RBRC)] =   {{BP_X, MOD_BIT(KC_RALT)}, {BP_RPRN, MOD_BIT(KC_RALT)}},
-  // For the symbol layer
-  [GR(DB_HASH)] =   {{BP_DLR, MOD_LSFT},          {BP_DLR, MOD_LSFT}},
-  [GR(DB_LCBR)] =   {{BP_LPRN, MOD_BIT(KC_RALT)}, {BP_LPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_RCBR)] =   {{BP_LPRN, MOD_BIT(KC_RALT)}, {BP_RPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_PIPE)] =   {{BP_B, MOD_BIT(KC_RALT)},    {BP_B, MOD_BIT(KC_RALT)}},
-  [GR(DB_TILD)] =   {{BP_K, MOD_BIT(KC_RALT)},    {BP_K, MOD_BIT(KC_RALT)}},
-  [GR(DB_CIRC)] =   {{BP_AT, MOD_BIT(KC_RALT)},   {BP_AT, MOD_BIT(KC_RALT)}},
-  [GR(DB_LESS)] =   {{BP_LDAQ, MOD_BIT(KC_RALT)}, {BP_LDAQ, MOD_BIT(KC_RALT)}},
-  [GR(DB_GRTR)] =   {{BP_RDAQ, MOD_BIT(KC_RALT)}, {BP_RDAQ, MOD_BIT(KC_RALT)}},
-  // Keys for BEAKL on Qwerty
-  [GR(BQ_COMM)] =   {{KC_COMMA, MOD_NONE},    {KC_1, MOD_LSFT}},
-  [GR(BQ_DOT)]  =   {{KC_DOT, MOD_NONE},      {KC_2, MOD_LSFT}},
-  [GR(BQ_QUOT)] =   {{KC_QUOT, MOD_NONE},     {KC_GRV, MOD_NONE}},
-};
-
-
-uint8_t gr(uint16_t kc){
-    return (kc - SAFE_RANGE);
-}
-// send the right keycode for the right mod.
-// remove the mods we are taking care of,
-// send our keycodes then restore them.
-// all so we can make dvorak keys from bepo keycodes.
-void send_keycode(uint16_t kc){
-    uint8_t tmp_mods = get_mods();
-    bool is_shifted = ( tmp_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
-    //uint8_t key[2][2] = key_translations[GR(kc)];
-    // need to turn of the shift if it is on.
-    unregister_mods((MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)));
-    if(is_shifted){
-        register_mods(SHIFTED_MODS(kc));
-        register_code(SHIFTED_KEY(kc));
-        unregister_code(SHIFTED_KEY(kc));
-        unregister_mods(SHIFTED_MODS(kc));
-    } else{
-        register_mods(UNSHIFTED_MODS(kc));
-        register_code(UNSHIFTED_KEY(kc));
-        unregister_code(UNSHIFTED_KEY(kc));
-        unregister_mods(UNSHIFTED_MODS(kc));
-    }
-    clear_mods();
-  register_mods(tmp_mods);
-}
diff --git a/users/ericgebhart/base_layers/accents.h b/users/ericgebhart/base_layers/accents.h
new file mode 100644
index 0000000000..ad575da65c
--- /dev/null
+++ b/users/ericgebhart/base_layers/accents.h
@@ -0,0 +1,90 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// probably best to have e and é on different fingers.
+
+// doesnt work, oled displays garbage
+/* #define CARTE_ACCENTED                          \ */
+/*   carte_de_map(" æœêùì  ¿ïüöë ",                \ */
+/*                " àôèéî  ûçñß^",                 \ */
+/*                " âöíúí       ") */
+
+// need to figure out a better way to display these on the oled.
+#define CARTE_ACCENTED                          \
+  carte_de_map(" aoeui  ?iuoe ",                \
+               " aoeei  ucnS^",                 \
+               " aoiúi       ")
+
+#define ___ACCENTED___                                                  \
+  LANG_MAP(_AE,   _OE,   _ECIR, _UGRV, _IGRV,   _IQUE, _IIAE, _UIAE, _OIAE, _EIAE, \
+           _AGRV, _OCIR, _EGRV, _EACU, _ICIR,   _UCIR, _CCED, _NTIL, _SS,   _DCIR, \
+           _AACU, _ODIA, _IACU, _UACU, _IACU,   _SPC,  _SPC,  _SPC , _SPC,  _SPC)
+
+
+// A dead key layer, optimized for Most common,
+// western european.
+#define CARTE_MORTE                             \
+  carte_de_map(" ˝˘̉   ̛ ˙° ",                    \
+               "/`^´  ¸¨~¤",                    \
+               " ,ˇ.  ˛µ¯")
+
+#define ___MORTE___                                                     \
+  LANG_MAP(_,     _DACU, _BREV, _HOKA, _,   _, _HORN, _DOTA, _RNGA, _,  \
+           _DSLS, _DGRV, _DCIR, _ACUT, _,   _, _CEDL, _DIAE, _DTIL, _CURR, \
+           _,     _DCMM, _CARN, _DOTB, _,   _, _OGON, _DGRK, _MACR, _)
+
+// Just taking a guess and putting the things I know are most
+// used in easy to use places., not sure about ntil and ss, put
+// them in their dvorak spots on the home row.
+
+/* #define CARTE_ACCENTS_MORTE                     \ */
+/*   carte_de_map(" æœêùì  ¿`^´ë ",                \ */
+/*                " àôèéî  ¸çñß~",                 \ */
+/*                " âö,úí   ¨ˇ°   ") */
+
+#define CARTE_ACCENTS_MORTE                     \
+  carte_de_map(" aoeui  ?`^'e ",                \
+               " aoeei  ,cnS~",                 \
+               " ao,ui   \"^o")
+
+#define ___ACCENTS_MORTE___                                             \
+  LANG_MAP(_AE,   _OE,    _ECIR,  _UGRV,  _IGRV,    _IQUE, _DGRV, _DCIR, _ACUT, _EIAE, \
+           _AGRV, _OCIR,  _EGRV,  _EACU,  _ICIR,    _CEDL, _CCED, _NTIL, _SS,   _DTIL, \
+           _AACU, _OIAE,  _DCMM,  _UACU,  _IACU,    _OGON, _DIAE, _CARN, _RNGA, _HORN)
+
+/* // DEAD layer. */
+/* BP_DCIR // ^ (dead) */
+/* BP_ACUT // ´ (dead) */
+/* BP_DGRV // ` (dead) */
+/* BP_CARN // ˇ (dead) */
+/* BP_DSLS // / (dead) */
+/* BP_BREV // ˘ (dead) */
+/* BP_DIAE // ¨ (dead) */
+/* BP_DTIL // ~ (dead) */
+/* BP_MACR // ¯ (dead) */
+/* BP_CEDL // ¸ (dead) */
+/* BP_RNGA // ° (dead) */
+/* BP_DGRK // µ (dead Greek key) */
+/* BP_OGON // ˛ (dead) */
+/* BP_DACU // ˝ (dead) */
+/* BP_DOTA // ˙ (dead) */
+/* BP_CURR // ¤ (dead) */
+/* BP_HORN // ̛  (dead) */
+/* BP_DCMM // , (dead) */
+/* BP_HOKA // ̉  (dead) */
+/* BP_DOTB // ̣  (dead) */
diff --git a/users/ericgebhart/base_layers/alt.h b/users/ericgebhart/base_layers/alt.h
new file mode 100644
index 0000000000..28cf5ab738
--- /dev/null
+++ b/users/ericgebhart/base_layers/alt.h
@@ -0,0 +1,150 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// e goes on the left thumb
+#define CARTE_MALTRON                           \
+  carte_de_map("   qpycb  vmuzl",               \
+               "   anisf  ctdor",               \
+               "   ;/jg,  .wk-x e")
+
+#define ___MALTRON___                                                   \
+  LANG_MAP(_Q,      _P,      _Y, _C, _B,       _V,     _M, _U, _Z,      _L, \
+           _A,      _N,      _I, _S, _F,       _D,     _T, _D, _O,      _R, \
+           TL_SCLN, TL_SLSH, _J, _G, TL_COMM,  TL_DOT, _W, _K, TL_MINS, _X)
+
+#define CARTE_EUCALYN                           \
+  carte_de_map("   /,.fq  aoeiu",               \
+               "   zxcvw  mrdyp",               \
+               "   gtksn  bhjl;")
+
+#define ___EUCALYN___                                                   \
+  LANG_MAP(TL_SLSH, TL_COMM, TL_DOT, _F, _Q,   _A, _O, _E, _I, _U,      \
+           _Z,      _X,      _C,     _V, _W,   _M, _R, _D, _Y, _P,      \
+           _G,      _T,      _K,     _S, _N,   _B, _H, _J, _L, TL_SCLN)
+
+
+
+// RSTHD
+/* j c y f k | z l , u q = */
+/* r s t h d | m n a i o - */
+/* / v g p b | x w . ; ' */
+/* e */
+
+// need a thumb cluster for this.
+// removed = and -, edge keys if you've got them.
+// e goes on left thumb
+
+#define CARTE_RSTHD                           \
+  carte_de_map("   jcyfk  zl,uq",             \
+               "   rsthd  mnaio",             \
+               "   /vgpb  xw.;' e")
+
+#define ___RSTHD___                                                     \
+  LANG_MAP(_J, _C, _Y, _F, _K,   _Z, _L, TL_COMM, _U,      _Q,          \
+           _R, _S, _T, _H, _D,   _M, _N, _A,      _I,      _O,          \
+           _/, _V, _G, _P, _B,   _X, _W, TL_DOT,  TL_SCLN, TL_QUOT)
+
+#define CARTE_HANDS_UP                    \
+  carte_de_map("  fyou,  kwclp",          \
+               "  hiea.  dtsrn",          \
+               "  bj'z;  vmgxq")
+
+#define ___HANDS_UP___                                         \
+  LANG_MAP(_F, _Y, _O,      _U, TL_COMM,   _K, _W, _C, _L, _P, \
+           _H, _I, _E,      _A, TL_DOT ,   _D, _T, _S, _R, _N, \
+           _B, _J, TL_QUOT, _Z, TL_SCLN,   _V, _M, _G, _X, _Q)
+
+#define CARTE_WHITE                             \
+  carte_de_map("  vyd,'  jmlu-",                \
+               "  atheb  csnoi",                \
+               "  pkgwq  xrf.z")
+
+#define ___WHITE___                                                     \
+  LANG_MAP(_V, _Y, _D, TL_COMM, TL_QUOT,   _J, _M, _L, _U,     _MINS,   \
+           _A, _T, _H, _E,      _B,        _C, _S, _N, _O,     _I,      \
+           _P, _K, _G, _W,      _Q,        _X, _R, _F, TL_DOT, _Z)
+
+
+#define CARTE_ISRT                              \
+  carte_de_map("  yclmk  zfu,'",                \
+               "  isrtg  pneao",                \
+               "  qvwdj  bh/.x")
+
+#define ___ISRT___                                                      \
+  LANG_MAP(_Y, _C, _L, _M, _K,   _Z, _F, _U,      TL_COMM, TL_QUOT,     \
+           _I, _S, _R, _T, _G,   _P, _N, _E,      _A,      _O,          \
+           _Q, _V, _W, _D, _J,   _B, _H, TL_SLSH, TL_DOT,  _X)
+
+#define CARTE_SOUL                              \
+  carte_de_map("  qwldp  kmuy;",                \
+               "  srtg   fneio",                \
+               "  zxcvj  bh,./")
+
+#define ___SOUL___                                                      \
+  LANG_MAP(_Q, _W, _L, _D, _P,   _K, _M, _U,      _Y,     TL_SCLN,      \
+           _A, _S, _R, _T, _G,   _F, _N, _E,      _I,     _O,           \
+           _Z, _X, _C, _V, _J,   _B, _H, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_NIRO                              \
+  carte_de_map("  qwudp  jfyl;",                \
+               "  asetg  hniro",                \
+               "  zxcvb  km,./")
+
+#define ___NIRO___                                                      \
+  LANG_MAP(_Q, _W, _U, _D, _P,   _J, _F, _Y,      _L,     TL_SCLN,      \
+           _A, _S, _E, _T, _G,   _H, _N, _I,      _R,     _O,           \
+           _Z, _X, _C, _V, _B,   _K, _M, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_ASSET                             \
+  carte_de_map("  qwjfg   ypul;",               \
+               "  asetd   hnior",               \
+               "  zxcvb   km,./")
+
+#define ___Asset___                                                     \
+  LANG_MAP(_Q, _W, _J, _F, _G,    _Y, _P, _U,      _L,     TL_SCLN,     \
+           _A, _S, _E, _T, _D,    _H, _N, _I,      _O,     _R,          \
+           _Z, _X, _C, _V, _B,    _K, _M, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_WHORF                             \
+  carte_de_map("flhdm  vwou,",                  \
+               "srntk  gyaei",                  \
+               "xjbzq  pc';. ")
+
+#define ___WHORF___                                                    \
+  LANG_MAP(_F, _L, _H, _D, _M,   _V, _W, _O,      _U,      TL_COMM,    \
+           _S, _R, _N, _T, _K,   _G, _Y, _A,      _E,      _I,         \
+           _X, _J, _B, _Z, _Q,   _P, _C, TL_QUOT, TL_SCLN, TL_DOT )
+
+#define CARTE_WHORF6                            \
+  carte_de_map("vlhkj  gwou.",                  \
+               "srntk  ydeai",                  \
+               "xqbfz  pc',; ")
+
+#define ___WHORF6___                                                    \
+  LANG_MAP(_V, _L, _H, _D, _M,   _G, _W, _O,      _U,      TL_DOT,      \
+           _S, _R, _N, _T, _K,   _Y, _D, _E,      _A,      _I,          \
+           _X, _Q, _B, _F, _Z,   _P, _C, TL_QUOT, TL_COMM, TL_SCLN )
+
+/* rsht/iena */
+/* jfldv @uopq */
+/* zrshtg   .iena: */
+/* xcmwk  /y,b?       */
+
+// pine
+/* y l r d w  j m o u ,  */
+/* c s n t g  p h a e i  */
+/* x z q v k  b f ' / .  */
diff --git a/users/ericgebhart/base_layers/base_layers.h b/users/ericgebhart/base_layers/base_layers.h
new file mode 100644
index 0000000000..ee784473fb
--- /dev/null
+++ b/users/ericgebhart/base_layers/base_layers.h
@@ -0,0 +1,58 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "keycodes.h"
+#include "lang_map.h"
+#include "oled_stuff.h"
+
+
+// an empty template.
+
+/* #define CARTE_EMPTY                \ */
+/*   carte_de_map("  ",               \ */
+/*                "  ",               \ */
+/*                "  ") */
+/*                      */
+/* #define ___EMPTY___                             \ */
+/*   LANG_MAP(_, _, _, _, _,   _, _, _, _, _,      \ */
+/*            _, _, _, _, _,   _, _, _, _, _,      \ */
+/*            _, _, _, _, _,   _, _, _, _, _)        */
+
+
+// dvorak, capewell-dvorak, ahei, and boo.
+#include "dvorak.h"
+//qwerty, workman, norman,
+#include "qwerty.h"
+// Colemak, halmak, minimak, etc.
+#include "maks.h"
+// eucalyn, maltron
+#include "alt.h"
+// mtgap, ctgap, apt
+#include "gap.h"
+// some hands down.
+#include "hands_down.h"
+// some beakls.
+#include "beakl.h"
+// bepo, optimot, beakl19bis, godox-fr?.
+#include "bepo.h"
+// some carpalxs.
+#include "carpalx.h"
+// The symbol, number function rows for all the above.
+#include "toprows.h"
+// some layers with accents and dead keys.
+#include "accents.h"
diff --git a/users/ericgebhart/base_layers/beakl.h b/users/ericgebhart/base_layers/beakl.h
new file mode 100644
index 0000000000..58b5fa4371
--- /dev/null
+++ b/users/ericgebhart/base_layers/beakl.h
@@ -0,0 +1,158 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// beakl, balanced effort key layout.
+// Beakl 15 and 19 are somewhat more related.
+// Beakl-wi is the latest. It feels a little bit more like a system.
+
+
+// Remember the - and ; outside pinky keys.
+// Or use the 6 size.
+// Both are on the symbol layer too. So you
+// wont lose them at least.
+// KC_BK_COMM, KC_BK_QUOT, KC_BK_DOT - Beakl->Qwerty
+// BP_BK_COMM, BP_BK_QUOT, BP_BK_DOT - Beakl->Bepo
+// take care of the different shifted chars.
+
+
+/* BEAKL 27 (main layer): */
+/* // altered shifted pairs: dot = .`  comma = ,?   dquot = !" */
+/* Alt target is BK2 */
+
+/* 32104 76598 */
+/* qhoux gcmrv */
+/* yiea. dstnb */
+/* j",k' wflpz */
+
+/* BEAKL 27 (shift layer): */
+/*   !@$#% ^(*)& */
+/*   QHOUX GCMRV */
+/*   YIEA` DSTNB */
+/*   J!?K' WFLPZ */
+
+
+#define CARTE_BEAKL27                           \
+  carte_de_map(" qhoux gcmrz ",                 \
+               " yiea. dstnb ",                 \
+               " j\",k' wflpv ")
+
+// Alt target is BK
+#define ___BEAKL27___                                                   \
+  LANG_MAP(_Q, _H,      _O,      _U, _X,      _G, _C, _M, _R, _Z,       \
+           _Y, _I,      _E,      _A, TL_DOT,  _D, _S, _T, _N, _B,       \
+           _J, TL_EXLM, TL_COMM, _K, TL_QUOT, _W, _F, _L, _P, _V)
+
+/* BEAKL 15 (main layer): */
+// altered shifted pairs: quot = '`  comma = ,!   dot = .@
+/*   40123 76598   */
+#define CARTE_BEAKL15                           \
+  carte_de_map(" qhoux gcrfz ",                 \
+               " yiea. dstnb ",                 \
+               " j/,k' wmlpv ")
+
+// Alt target is BK
+#define ___BEAKL15___                                           \
+  LANG_MAP(_Q, _H,    _O,      _U, _X,      _G, _C, _R, _F, _Z, \
+           _Y, _I,    _E,      _A, TL_DOT,  _D, _S, _T, _N, _B, \
+           _J, _SLSH, TL_COMM, _K, TL_QUOT, _W, _M, _L, _P, _V)
+
+/* BEAKL 19    */
+// Beakl 19.  scores better than 15, better in french also.
+// Both are lots better than dvorak or bepo.
+
+/* same symbols and keypad as 15 */
+/* number row is different */
+/*  32104 76598  */
+
+// Alt target is BK
+#define CARTE_BEAKL19                           \
+  carte_de_map(" q.ouj wdnm, ",                 \
+               " haeik gsrtp ",                 \
+               " z'/yx bclfv ")
+
+#define ___BEAKL19___                                                   \
+  LANG_MAP(_Q, _DOT,  _O,    _U, _J, _W,    _D, _N, _M, TL_COMM,        \
+           _H, _A,    _E,    _I, _K, _G,    _S, _R, _T, _P,             \
+           _Z, _QUOT, _SLSH, _Y, _X, _B,    _C, _L, _F, _V)
+
+//BEAKL 19bis - original.
+// the é and è were simply added for analysis not real use.
+// even so, this layout scores well for french, better than
+// bepo and mtgap
+/*  qyouz  wdnck   */
+/* -hiea,  gtrsp; */
+/* èj'é.x  vmlfb   */
+
+// A 3x12
+//BEAKL 19bis mod z.
+// French optimised with some english.
+// This version rearranges things a little based on fequency.
+// Since it needs 3x12, I filled in the corners and removed ;.
+// Leaving y where it is. the o and the e might cause sfbs.
+// Put é on a different finger from e.
+// swap z, e's, add à, ^, and ê, swap ; for -.
+// it might be beneficial to swap w and à, as à is much more frequent than w
+#define CARTE_BEAKL19bis                        \
+  carte_de_map(" àqyoué  wdnck^ ",              \
+               " ;hiea,  gtrsp- ",              \
+               " zj'è.x  vmlfbê  ")
+
+#define ___BEAKL19bis_3x12___                                           \
+  LANG_MAP6(                                                            \
+            _AGRV, _Q, _Y,    _O,    _U,   _EACU,   _W, _D, _N, _C, _K, _DCIR, \
+            _SCLN, _H, _I,    _E,    _A,   _COMM,   _G, _T, _R, _S, _P, _MINS, \
+            _Z,    _J, _QUOT, _EGRV, _DOT, _X,      _V, _M, _L, _F, _B, _ECIR)
+
+
+// Beakl Wi.   This is the most current beakl this size. 18/01/2022.
+// Nothing on the 6th outer columns but layer toggle buttons. All 6.
+// altered shifted pairs: dot = .` comma = ,~  colon = :;
+// i is on the left thumb.
+/* ;you- ctrsv */
+/* qheaw gdnmz */
+/* j,.k' bplfx */
+/*    i        */
+
+#define CARTE_BEAKLWI                           \
+  carte_de_map(" ;you- ctrsv ",                 \
+               " qheaw gdnmz ",                 \
+               " j,.k' bplfx i")
+
+#define ___BEAKLWI___                                                   \
+  LANG_MAP(TL_COLN, _Y,      _O,     _U, _MINS,   _C, _T, _R, _S, _V,   \
+           _Q,      _H,      _E,     _A, _W,      _G, _D, _N, _M, _Z,   \
+           _J,      TL_COMM, TL_DOT, _K, _QUOT,   _B, _P, _L, _F, _X)
+
+// Thumbs.
+#define ___BEAKLWI_CRKBD_THUMBS___ LT_ESC, LT_I, LT_TAB,  LT_ENT, LT_SPC, LT_BSPC
+
+// My version, loses KC_mins, because it's easier on my symbol layer.
+// put I in it's dvorak spot instead of thumbs, move W up to make room for I.
+// I'd rather have w and i on different fingers. One domino...
+
+// beakl-wi - mod iw-
+
+#define CARTE_BEAKLWIa                          \
+  carte_de_map(" ;youw ctrsv ",                 \
+               " qheai gdnmz ",                 \
+               " j,.k' bplfx ")
+
+// Alt target is BKW
+#define ___BEAKLWIa___                                                  \
+  LANG_MAP(TL_COLN, _Y,      _O,     _U, _W,      _C, _T, _R, _S, _V,   \
+           _Q,      _H,      _E,     _A, _I,      _G, _D, _N, _M, _Z,   \
+           _J,      TL_COMM, TL_DOT, _K, _QUOT,   _B, _P, _L, _F, _X)
diff --git a/users/ericgebhart/base_layers/bepo.h b/users/ericgebhart/base_layers/bepo.h
new file mode 100644
index 0000000000..64f56ec9ab
--- /dev/null
+++ b/users/ericgebhart/base_layers/bepo.h
@@ -0,0 +1,114 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Maps based on BEPO  Mostly 3x12
+
+// BEAKL 19bis - English with French optimisations.
+// Least used letters in french xzykw QJÀ are fairly high.
+// XZ are good choices for pushing out, from english and french,
+// or using chords in both languages.
+
+// Note: The percentages came from different sources so do not
+// match between languages.
+// French
+/* Q	0.89 % */
+/* J	0.71 % */
+/* À	0.54 % */
+/*-------------*/
+/* X	0.42 % */
+/* È	0.35 % */
+/* Ê	0.24 % */
+/* Z	0.21 % */
+/* Y	0.19 % */
+/* K	0.16 % */
+/* Ô	0.07 % */
+/* Û	0.05 % */
+/* W	0.04 % */
+
+/* Least used letters in english. */
+/* X	0.2902%	1.48 */
+/* Z	0.2722%	1.39 */
+/* J	0.1965%	1.00 */
+/* Q	0.1962%	(1) */
+
+
+// OPtimot by @Pyjam.
+/*  àjoéb fdl’qxz */
+/*  aieu, ptsrn^ç */
+/* êkyè.w gcmhvz */
+
+// -- rearranged z, and ç to get 3x12
+#define CARTE_OPTIMOT                           \
+  carte_de_map(" çàjoéb fdl’qx ",               \
+               "  aieu, ptsrn^ ",               \
+               " êkyè.w gcmhvz ")
+
+#define ___OPTIMOT_3x12___                                              \
+  LANG_MAP6(                                                            \
+            _CCED, _AGRV, _J, _O,    _EACU, _B,     _F, _D, _L, _QUOT, _Q,  _X, \
+            _TAB,  _A,    _I, _E,    _U,    _COMM,  _P, _T, _S, _R,    _N,  _DCIR, \
+            _ECIR, _K,    _Y, _EGRV, _DOT,  _W,     _G, _C, _M, _H,    _V,  _Z)
+
+// no z or x. combos exist for them.
+#define CARTE_OPTIMOT_COMPACT                  \
+  carte_de_map(" àjoéb fdl’q ",                \
+               " aieu, ptsrn ",                \
+               " kyè.w gcmhv ")
+
+#define ___OPTIMOT_3x10___                                             \
+  LANG_MAP6(                                                           \
+            _AGRV, _J, _O,    _EACU, _B,     _F, _D, _L, _QUOT, _Q,    \
+            _A,    _I, _E,    _U,    _COMM,  _P, _T, _S, _R,    _N,    \
+            _K,    _Y, _EGRV, _DOT,  _W,     _G, _C, _M, _H,    _V,)
+
+// Maybe Use this for C
+//BP_C_CCED = MT(BP_CCED, BP_C)
+
+// BEPO
+
+// No quot, à or ç
+/* bépoè vdljz */
+/* auie, ctsrn */
+/* myx.k qghfw */
+#define CARTE_BEPOc                             \
+  carte_de_map("   bépoè  vdljz",               \
+               "   auie,  ctsrn",               \
+               "   myx.k  qghfw")
+
+#define ___BEPOc_3x10___                                        \
+  LANG_MAP(                                                     \
+           _B, _EACU, _P, _O,   _EGRV,    _V, _D, _L, _J, _Z,   \
+           _A, _U,    _I, _E,   _COMM,    _C, _T, _S, _R, _N,   \
+           _M, _Y,    _X, _DOT, _K,       _Q, _G, _H, _F, _W)
+
+
+#define CARTE_BEPO                              \
+  carte_de_map(" çbépoè ^vdljz ",               \
+               "  auie, ctsrnm ",               \
+               " êàyx.k ’qghfw ")
+
+#define ___BEPO_3x12___                                                 \
+  LANG_MAP6(_CCED, _B,    _EACU, _P, _O,   _EGRV,    _DCIR, _V, _D, _L, _J, _Z, \
+            _TAB,  _A,    _U,    _I, _E,   _COMM,    _C,    _T, _S, _R, _N, _M, \
+            _ECIR, _AGRV, _Y,    _X, _DOT, _K,       _QUOT, _Q, _G, _H, _F, _W)
+
+// dont like this one much.
+/* #define ___GODOX_3x12___                                                \ */
+/*   LANG_MAP6(___, _AGRV, _B, _EACU, _dot, _mins,    _DCIR, _V, _L,  _M, _X, _CCED, \ */
+/*             ___,  _O,   _U, _I,    _A,   _J,       _G,    _T, _S,  _N, _R, _F, \ */
+/*             ___, _Q,    _Y, _EGRV, _P,   _K,       _W,    _D, _UP, _H, _C, _Z) */
+/* // E goes on left thumb. */
diff --git a/users/ericgebhart/base_layers/carpalx.h b/users/ericgebhart/base_layers/carpalx.h
new file mode 100644
index 0000000000..ae2ed708a5
--- /dev/null
+++ b/users/ericgebhart/base_layers/carpalx.h
@@ -0,0 +1,46 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  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 CARTE_CARPALX_QFMLWY                    \
+  carte_de_map("   qfmlw  yuobj",               \
+               "   dstnr  iaeh;",               \
+               "   zvgcx  pk,./")
+
+#define ___CARPALX_QFMLWY___                                            \
+  LANG_MAP(_Q, _F, _M, _L, _W,   _Y, _U, _O,      _B,     _J,           \
+           _D, _S, _T, _N, _R,   _I, _A, _E,      _H,     TL_SCLN,      \
+           _Z, _V, _G, _C, _X,   _P, _K, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_CARPALX_QFMLWB                    \
+  carte_de_map("   qgmlw  byuv;",               \
+               "   dstnr  iaeoh",               \
+               "   zxcfj  kp,./")
+
+#define ___CARPALX_QGMLWB___                                            \
+  LANG_MAP(_Q, _G, _M, _L, _W,   _B, _Y, _U,      _V,     TL_SCLN,      \
+           _D, _S, _T, _N, _R,   _I, _A, _E,      _O,     _H,           \
+           _Z, _X, _C, _F, _J,   _K, _P, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_CARPALX_QGMLWY                    \
+  carte_de_map("   qgmlw  yfub;",               \
+               "   dstnr  iaeoh",               \
+               "   zxcvj  kp,./")
+
+#define ___CARPALX_QGMLWY___                                            \
+  LANG_MAP(_Q, _G, _M, _L, _W,   _Y, _F, _U,      _B,     TL_SCLN,      \
+           _D, _S, _T, _N, _R,   _I, _A, _E,      _O,     _H,           \
+           _Z, _X, _C, _V, _J,   _K, _P, TL_COMM, TL_DOT, TL_SLSH)
diff --git a/users/ericgebhart/base_layers/dvorak.h b/users/ericgebhart/base_layers/dvorak.h
new file mode 100644
index 0000000000..8deee2005c
--- /dev/null
+++ b/users/ericgebhart/base_layers/dvorak.h
@@ -0,0 +1,73 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  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 CARTE_DVORAK                            \
+  carte_de_map(" ',.py fgcrl ",                 \
+               " aoeui dhtns ",                 \
+               " ;qjkx bmwvz ")
+
+#define ___DVORAK___                                                    \
+  LANG_MAP(TL_QUOT,  TL_COMM, TL_DOT, _P,  _Y,   _F, _G, _C, _R, _L,    \
+           _A,       _O,      _E,     _U,  _I,   _D, _H, _T, _N, _S,    \
+           TL_SCLN,  _Q,      _J,     _K,  _X,   _B, _M, _W, _V, _Z)
+
+#define CARTE_DVORAK_RLC_IU                     \
+  carte_de_map(" ',.py fgrlc ",                 \
+               " aoeiu dhtns ",                 \
+               " ;qjkx bmwvz ")
+
+#define ___DVORAK_RLC_IU___                                             \
+  LANG_MAP(TL_QUOT,  TL_COMM, TL_DOT, _P,  _Y,   _F, _G, _R, _L, _C,    \
+           _A,       _O,      _E,     _I,  _U,   _D, _H, _T, _N, _S,    \
+           TL_SCLN,  _Q,      _J,     _K,  _X,   _B, _M, _W, _V, _Z)
+
+#define CARTE_BOO                               \
+  carte_de_map("  ,.ucv  qfdly",                \
+               "  aoesg  bntri",                \
+               "  ;x'wz  phmkj")
+
+#define ___BOO___                                                       \
+  LANG_MAP( TL_COMM, TL_DOT, _U,      _C, _V,   _Q, _F, _D, _L, _Y,     \
+            _A,      _O,     _E,      _S, _G,   _B, _N, _T, _R, _I,     \
+            TL_SCLN, _X,     TL_QUOT, _W, _Z,   _P, _H, _M, _K, _J)
+
+#define CARTE_CAPEWELL_DVORAK                   \
+  carte_de_map( "  ',.py  qfgrk",               \
+                "  oaeiu  dhtns",               \
+                "  zxcvj  lmwb;")
+
+#define ___CAPEWELL_DVORAK___                                           \
+  LANG_MAP(TL_QUOT, TL_COMM, TL_DOT, _P, _Y,   _Q, _F, _G, _R, _K,      \
+           _O,      _A,      _E,     _I, _U,   _D, _H, _T, _N, _S,      \
+           _Z,      _X,      _C,     _V, _J,   _L, _M, _W, _B, TL_SCLN)
+
+//ahei - derived from dvorak.
+// x moved to left side. j on pinky.
+/*;pouyq gdlm/= */
+/* ahei, fstnr- */
+/* j'k.x bcwvz */
+
+#define CARTE_AHEI                              \
+  carte_de_map("pouyq  gdlm/",                  \
+               "ahei,  fstnr",                  \
+               "j'k.x  bcwvz")
+
+#define ___AHEI___                                                      \
+LANG_MAP(_P, _O,      _U, _Y,     _Q,       _G, _D, _L, _M, TL_SLSH, \
+         _A, _H,      _E, _I,     TL_COMM,  _F, _S, _T, _N, _R,      \
+         _J, TL_QUOT, _K, TL_DOT, _X,       _B, _C, _W, _V, _Z)
diff --git a/users/ericgebhart/base_layers/gap.h b/users/ericgebhart/base_layers/gap.h
new file mode 100644
index 0000000000..76310bc6f9
--- /dev/null
+++ b/users/ericgebhart/base_layers/gap.h
@@ -0,0 +1,67 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// an alternate I found.
+/* Reference: MTGAP */
+/* y p o u - | b d l c k j */
+/* i n e a , | m h t s r v */
+/* ( " ' . _ | ) f w g x */
+/*   z */
+
+#define CARTE_MTGAP                             \
+  carte_de_map("   ypouj  kdlcw",               \
+               "   inea,  mhtsr",               \
+               "   qz/.;  bfgvx")
+
+#define ___MTGAP___                                                     \
+  LANG_MAP(_Y, _P, _O,      _U,     _J,        _K, _D, _L, _C, _W,      \
+           _I, _N, _E,      _A,     TL_COMM,   _M, _H, _T, _S, _R,      \
+           _Q, _Z, TL_SLSH, TL_DOT, TL_SCLN,   _B, _F, _G, _V, _X)
+
+/* //APT v3*/
+/* https://github.com/Apsu/APT */
+#define CARTE_APT                               \
+  carte_de_map("   wgdfb  qluoy",               \
+               "   rsthk  jneai; ",             \
+               "   xcmpv  z,.'/")
+
+#define ___APT___                                                       \
+  LANG_MAP(_W, _G, _D, _F, _B,    _Q, _L, _U, _O, _Y,                   \
+           _R, _S, _T, _H, _K,    _J, _N, _E, _A, _I, TL_SCLN,          \
+           _X, _C, _M, _P, _V,    _Z, TL_COMM, TL_DOT, TL_QUOT, TL_SLSH)
+
+
+#define CARTE_CTGAP                             \
+  carte_de_map("  vplcf  kuoyj",                \
+               "  rntsd  'aeih",                \
+               "  zbmgw  x,.;q")
+
+#define ___CTGAP___                                                     \
+  LANG_MAP(_V, _P, _L, _C, _F,   _K,      _U,      _O,     _Y,      _J, \
+           _R, _N, _T, _S, _D,   TL_QUOT, _A,      _E,     _I,      _H, \
+           _Z, _B, _M, _G, _W,   _X,      TL_COMM, TL_DOT, TL_SCLN, _Q)
+
+#define CARTE_CANARY                                           \
+  carte_de_map( "  wlypb   zfou'",                                 \
+                "  crstg   mneia",                                 \
+                "  qjvd    kxh/,.")
+
+#define ___CANARY___                                                    \
+  LANG_MAP(_W, _L, _Y, _P, _B, _Z, _F, _O,      _U,      TL_QUOT,       \
+           _C, _R, _S, _T, _G, _M, _N, _E,      _I,      _A,            \
+           _Q, _J, _V, _D, _K, _X, _H, TL_SLSH, TL_COMM, TL_DOT)
diff --git a/users/ericgebhart/base_layers/hands_down.h b/users/ericgebhart/base_layers/hands_down.h
new file mode 100644
index 0000000000..0841a358d2
--- /dev/null
+++ b/users/ericgebhart/base_layers/hands_down.h
@@ -0,0 +1,147 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// https://sites.google.com/alanreiser.com/handsdown/home
+
+// The only 3x12 layout. The rest are 3x10.
+#define CARTE_HD_NEU                            \
+  carte_de_map( "  wfmpv  /.q\"'z",            \
+                "  rsntb  ,aeihj",             \
+                "  xcldg  -uoykK")
+
+#define ___HD_NEU___                                                    \
+  LANG_MAP(_SML_NAV,   _W, _F, _M, _P, _V , TL_SLSH, TL_DOT, _Q, TL_DQUO, TL_QUOT, _Z, \
+           _TAB,       _R, _S, _N, _T, _B , TL_COMM, _A,     _E, _I,      _H,    _J, \
+           _OS_ACCENT, _X, _C, _L, _D, _G , TL_MINS, _U,     _O, _Y,      _K, _SML_KEYPAD)
+
+
+// modified to fit 3x10.
+#define CARTE_HD_NEU_NARROW                     \
+  carte_de_map("   xcldb  zuoyq",               \
+               "   rsntg  ,aeih",               \
+               "   wfmpv  ;./jk")
+
+#define ___HD_NEU_NARROW___                                             \
+  LANG_MAP(_X, _C, _L, _D, _B,   _Z,      _U,     _O,      _Y, _Q,      \
+           _R, _S, _N, _T, _G,   TL_COMM, _A,     _E,      _I, _H,      \
+           _W, _F, _M, _P, _V,   _SCLN, TL_DOT, TL_SLSH, _J, _K)
+
+
+#define CARTE_HD_REF                            \
+  carte_de_map("    qchpv   kyoj/",             \
+               "    rsntg   wueia",             \
+               "    xmldb   zf',.")
+
+#define ___HD_REF___                                                    \
+  LANG_MAP(_Q, _C, _H, _P, _V,   _K, _Y, _O,      _J,       TL_SLSH,    \
+           _R, _S, _N, _T, _G,   _W, _U, _E,      _I,       _A,         \
+           _X, _M, _L, _D, _B,   _Z, _F, TL_QUOT, TL_COMM,  TL_DOT )
+
+
+// All of these have a consonant or vowel on the thumb keys.
+
+/* alt shift keys "? '!  dash and elan */
+/* (< {[  - elan                       */
+/* dash has thumbs of ,; and .:        */
+/* dash and the rest get these too.    */
+/* alt shifts   ;: .& /\* '? "! ,| -+  */
+/* COMBOS - z = jg, z=vg, q=uk, q=mp.  */
+
+
+// no z or q, use combos.
+#define CARTE_HD_TITANIUM                       \
+  carte_de_map("  jgmpv  ;./\"' ",              \
+               "  csntw  ,aeih ",               \
+               "  xfldb  -uoyk  r")
+
+#define ___HD_TITANIUM___                                               \
+  LANG_MAP(_J, _G, _M, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_DQUO, TL_QUOT, \
+           _C, _S, _N, _T, _W , TL_COMM, _A, _E, _I, _H,                \
+           _X, _F, _L, _D, _B , TL_MINS, _U, _O, _Y, _K)
+
+
+#define CARTE_HD_GOLD                                           \
+  carte_de_map("  jgmpv  ;./\"' ",                              \
+               "  rsndb  ,aeih ",                               \
+               "  xflcw  -uoyk  t")
+
+#define ___HD_GOLD___                                                   \
+  LANG_MAP(_J, _G, _M, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_DQUO, TL_QUOT, \
+           _R, _S, _N, _D, _B , TL_COMM, _A, _E, _I, _H,                \
+           _X, _F, _L, _C, _W , TL_MINS, _U, _O, _Y, _K)
+/* t, ␣ */
+
+/* jz pq alt shifts   ;: .& /\* '? "! ,| -+ */
+
+#define CARTE_HD_PLATINUM                       \
+  carte_de_map( "jghpv   ;./'\"",               \
+                "rsntb   ,aeic",                \
+                "xfmdk   -uowy  l")
+/* l   ␣   */
+
+#define ___HD_PLATINUM___                                               \
+  LANG_MAP(_J, _G, _H, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_QUOT, TL_DQUO, \
+           _R, _S, _N, _T, _B,  TL_COMM, _A, _E, _I, _C,                \
+           _X, _F, _M, _D, _K,  TL_MINS, _U, _O, _W, _Y)
+
+#define CARTE_HD_SILVER                         \
+  carte_de_map("jgmpv   ;./'\"",                \
+               "rshtb   ,aeic",                 \
+               "xfldk   -uowy  n")
+/* n   ␣   */
+
+#define ___HD_SILVER___                                 \
+  LANG_MAP(_J, _G, _M, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_QUOT, TL_DQUO, \
+           _R, _S, _H, _T, _B,  TL_COMM, _A, _E, _I, _C,                \
+           _X, _F, _L, _D, _K,  TL_MINS, _U, _O, _W, _Y)
+
+#define CARTE_HD_BRONZE                         \
+  carte_de_map("jgmpv   ;./'\"",                \
+               "rsntb   ,aeic",                 \
+               "xfldk   -uowy  h")
+/* h   ␣   */
+
+#define ___HD_BRONZE___                                 \
+  LANG_MAP(_J, _G , _M, _P, _V , TL_SCLN, TL_DOT, TL_SLSH , TL_QUOT, TL_DQUO, \
+           _R, _S, _N, _T, _B , TL_COMM, _A, _E, _I, _C,                \
+           _X, _F, _L, _D, _K , TL_MINS, _U, _O, _W, _Y)
+
+#define CARTE_HD_ELAN                          \
+  carte_de_map("vghpk   /({'\"",               \
+               "rsntf   jaeci",                \
+               "xmldb   -uowy")
+/* ,; .:  ␣  ⏎ */
+
+/* vz g  h  p  kq  /\* (< {[ '! "? */
+/* TL_COMM; TL_DOT:  _␣  ⏎ */
+#define ___HD_ELAN___                                                   \
+  LANG_MAP(_V, _G, _H, _P, _K,   TL_SLSH, TL_LPRN, TL_LCBR, TL_QUOT, TL_DQUO, \
+           _R, _S, _N, _T, _F,   _J, _A, _E, _C, _I,                    \
+           _X, _M, _L, _D, _B,   TL_MINS, _U, _O, _W, _Y)
+
+
+#define CARTE_HD_DASH                          \
+    carte_de_map("jgmpv   ;.'\"/",             \
+                 "rsntb   ,haoi",              \
+                 "xcldw   -fuky  e")
+    /*   e   ␣   */
+
+#define ___HD_DASH___                                                   \
+  LANG_MAP(_J, _G, _M, _P, _V , TL_SCLN, TL_DOT, TL_QUOT, TL_DQUO, TL_SLSH, \
+           _R, _S, _N, _T, _B , TL_COMM, _H, _A, _O, _I,                \
+           _X, _C, _L, _D, _W , TL_MINS, _F, _U, _K, _Y)
diff --git a/users/ericgebhart/base_layers/keymaps.txt b/users/ericgebhart/base_layers/keymaps.txt
new file mode 100644
index 0000000000..56dc7d79e3
--- /dev/null
+++ b/users/ericgebhart/base_layers/keymaps.txt
@@ -0,0 +1,300 @@
+/*
+This file can be commented by blocks or single lines using //
+Blank lines are ignored
+*/
+/*
+Bigram frequencies in stats.csv
+*/
+
+[keys]
+L21 L22 L23 L24 L25 L26 R26 R25 R24 R23 R22 R21
+L31 L32 L33 L34 L35 L36 R36 R35 R34 R33 R32 R31
+L41 L42 L43 L44 L45 L46 R46 R45 R44 R43 R42 R41
+
+[weights]
+5.0 3.6 2.4 1.8 2.2 3.5 3.5 2.2 1.8 2.4 3.6 5.0
+4.0 1.6 1.2 1.0 1.0 3.0 3.0 1.0 1.0 1.2 1.6 4.0
+5.0 3.4 2.6 2.2 1.8 4.0 4.0 1.8 2.2 2.6 3.4 5.0
+
+/*
+Weights should:
+- limit weak fingers
+- limit bottom row
+- increase home row
+- limit finger travel distance
+
+https://colemakmods.github.io/mod-dh/compare.html
+*/
+
+[penalties]
+  ,same_row,row_jump1,row_jump2
+ii,      2.5,     3.5,      4.5  // same finger
+im,      0.5,     1.0,      2.0
+ir,      0.5,     0.8,      1.5
+ip,      0.5,     0.8,      1.1
+mi,     -1.5,    -0.5,      1.5  // inward roll
+mm,      2.5,     3.5,      4.5  // same finger
+mr,      0.5,     1.0,      2.0
+mp,      0.5,     0.8,      1.5
+ri,     -1.5,    -0.5,      1.5  // inward roll
+rm,     -2.0,    -0.5,      1.2  // inward roll
+rr,      2.5,     3.5,      4.5  // same finger
+rp,      1.0,     1.5,      2.5
+pi,     -1.0,     0.0,      1.0  // inward roll
+pm,     -1.0,     0.0,      1.5  // inward roll
+pr,     -1.0,     0.0,      1.5  // inward roll
+pp,      3.0,     4.0,      5.5  // same finger
+
+/*
+Only apply if not the same letter, and both letters on the same hand.
+
+i, m, r, and p refer to the fingers (index, middle, ring, pinky)
+The columns refer to how many rows separate the two keys
+
+Penalties should:
+- limit same finger typing (except same key twice)
+- balance hands
+- favor inward rolling
+(last 2 in opposition with each other)
+*/
+
+[layouts]
+
+>>Qwerty
+# q w e r t y i o u p #
+é a s d f g h j k l ; '
+è z x c v b n m , . / -
+
+>>Azerty
+è a z e r t y u i o p ^
+' q s d f g h j k l m ù
+é w x c v b n , . : ! -
+
+>>Qwertz
+# q w e r t z u i o p ü
+é a s d f g h j k l ö ä
+è y x c v b n m , . - '
+
+>>Bépo 40%
+# b é p o è ^ v d l j z
+- a u i e , c t s r n m
+ç à y x . k ' q g h f w
+
+// https://github.com/TeXitoi/keyberon#whats-the-layout
+>>Bépo keyberon
+# b é p o è ^ v d l j z
+w a u i e , c t s r n m
+- à y x . k ' q g h f ç
+
+>>Dvorak
+- ' , . p y f g c r l #
+é a o e u i d h t n s #
+è ; q j k x b m w v z #
+
+>>Colemak
+# q w f p g j l u y ; #
+é a r s t d h n e i o '
+è z x c v b k m , . / -
+
+>>Colemak DH
+# q w f p b j l u y ; #
+é a r s t g m n e i o '
+è z x c d v k h , . / -
+
+>>Colemak DH mod
+# q w f p b j l u y é è
+# a r s t g m n e i o -
+# z x c d v k h , . ' /
+
+>>Workman
+# q d r w b j f u p ; #
+é a s h t g y n e o i '
+è z x m c v k l , . / -
+
+>>Norman
+# 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 , . / -
+
+>>Carpalx
+# q g m l w b y u v ; é
+è d s t n r i a e o h '
+# z x c f j k p , . / -
+
+>>Neo
+- x v l c w k h g f q ß
+é u i a e o s n r t d y
+è ü ö ä p z b m , . j '
+
+// http://mkweb.bcgsc.ca/carpalx/?full_optimization
+>>qgmlwyfub
+# q g m l w y f u b ; é
+è d s t n r i a e o h '
+# z x c v j k p , . / -
+
+// https://mathematicalmulticore.wordpress.com/the-keyboard-layout-project/
+>>MTGAP
+# y p o u j k d l c w #
+é i n e a , m h t s r '
+è q z / . : b f g v x -
+
+// http://mtgap.bilfo.com/official_keyboard.html
+// http://mtgap.bilfo.com/completed_keyboard.html
+>>MTGAP 2.0
+# , f h d k j c u l . #
+é o a n t g m s e r i -
+è q x b p z y w ' v ; #
+
+>>MTGAP "Easy"
+# q w l d b j f u k p #
+é a s r t g h n e o i -
+è z x c v ; y m , . / '
+
+>>MTGAP "shortcuts"
+# k g l d b j h u f . #
+é r o t s w m n e a i -
+è z x v c q y p , ' ; #
+
+>>MTGAP "standard"
+# k l h c b j d u f . #
+é o r n s g w t e a i -
+è x q v m z y p , ' ; #
+
+>>MTGAP "ergonomic"
+# . f u d j q h c w k #
+é i a e t p l n s r o -
+è ' , y g z - m b v x #
+
+// https://geekhack.org/index.php?topic=67604.0
+>>Oneproduct
+# p l d w g j x o y q è
+- n r s t m u a e i h '
+# z c f v b , . ? ; k é
+
+// https://bepo.fr/wiki/Utilisateur:Bibidibop
+>>Coeur
+# é w o p y b ' d l j z
+x a u e i , c t s r n h
+# - à è . k g m f q v #
+
+// https://geekhack.org/index.php?topic=98275.0
+>>Kaehi
+# q w l d g j u o p / é
+è n r s t m k a e h i '
+# z x c v b y f , . ; -
+
+// https://deskthority.net/wiki/BEAKL
+>>BEAKL 15
+é q h o u x g c r f z #
+- y i e a . d s t n b ;
+è j / , k ' w m l p v #
+
+// https://web.archive.org/web/20190906220509/http://shenafu.com/smf/index.php?topic=89.msg2566#msg2566
+>>BEAKL 19
+é q . o u j w d n m , #
+- h a e i k g s r t p ;
+è z ' / y x b c l f v #
+
+// https://www.reddit.com/r/ErgoDoxEZ/comments/gsvpug/layout_of_the_month_beakl_15/ftcan68/?context=3
+>>BEAKL 19bis
+# q y o u z w d n c k #
+- h i e a , g t r s p ;
+è j ' é . x v m l f b #
+
+// https://www.reddit.com/r/ErgoMechKeyboards/comments/j1eopm/hands_down_layout_is_ready_for_daily_use/g7bjmr7/?context=3
+>>BEAKL 19 Opt French
+# w m r d v y u o q x #
+# g s n t p , i e a h -
+# k f l c b j é ' . z è
+
+// http://millikeys.sourceforge.net/asset/
+>>ASSET
+# q w j f g y p u l ; #
+é a s e t d h n i o r '
+è z x c v b k m , . / -
+
+// https://sourceforge.net/projects/qwpr/
+>>Qwpr
+# q w p r f y u k l ; #
+é a s d t g h n i o e '
+è z x c v b j m , . / -
+
+// http://www.minimak.org/
+>>Minimak-8key
+# q w d r k y u i l p #
+é a s t f g h n e o ; '
+è z x c v b j m , . / -
+
+// https://github.com/mw8/white_keyboard_layout
+// adapted to ergo keyboard
+>>White
+# v y d , ' j m l u ( )
+é a t h e b c s n o i -
+è p k g w q x r f . z #
+
+// https://github.com/jackrosenthal/threelayout
+>>Three
+# q f u y z x k c w b #
+é o h e a i d r t n s -
+è , m . j ; g l p v ' #
+
+//https://sites.google.com/alanreiser.com/handsdown
+>>Hands down
+# q c h g j y f o b ' #
+é s n r t p w u e i a #
+è x m l d z v k . , ; -
+
+//https://sites.google.com/alanreiser.com/handsdown
+>>Notarize
+# q w d f p y u k l ' #
+é a s t e g h n i o r #
+è z x c v b j m . , ; -
+
+// http://kennetchaz.github.io/symmetric-typing/soul.html
+>>Soul mod
+# q w l d p k m u y ; '
+è a s r t g f n e i o é
+# j z x c v b h , . / -
+
+// http://kennetchaz.github.io/symmetric-typing/niro.html
+>>Niro mod
+# q w u d p j f y l ; #
+é a s e t g h n i r o '
+è b z x c v k m , . / -
+
+// https://docs.google.com/document/d/1yiCnIi1oagV1D8ZouMt-TRFRG8d6AfSBIwQkBvSflvY/edit
+>>The-1
+# k m l u ? v d r ' q #
+é a t h e . c s n o i -
+è z p f j , b g w x y /
+
+// https://engram.dev
+>>Engram 2.0
+# b y o u ' " l d w v z
+é c i e a , . h t s n q
+è g x j k - ? r m f p #
+
+// https://github.com/MadRabbit/halmak
+>>Halmak
+# w l r b z ; q u d j #
+é s h n t , . a e o i '
+è f m v c / g p x k y -
+
+// https://keyboard-design.com/letterlayout.html?layout=optimal-digram.en.ansi
+>>Optimal digram
+# q y u . , f m l d p z
+é s i e a o h n r t c g
+è j ) ' ? ( x v w k b -
+
+// https://keyboard-design.com/letterlayout.html?layout=uciea-keyboard.en.ansi
+>>Uciea
+# p y u o - k d h f x q
+é c i e a ' g t n s r v
+è z " , . ; w m l b j -
+
+// https://keyboard-design.com/letterlayout.html?layout=x1.en.ergodox
+// . and , moved
+>>x1
+# k y o ' ! f c l p q z
+é h i e a u d s t n r v
+è j ? . , # w g m b x -
diff --git a/users/ericgebhart/base_layers/maks.h b/users/ericgebhart/base_layers/maks.h
new file mode 100644
index 0000000000..6f78819421
--- /dev/null
+++ b/users/ericgebhart/base_layers/maks.h
@@ -0,0 +1,61 @@
+#define CARTE_COLEMAK                           \
+  carte_de_map("   qwfpg  jluy;",               \
+               "   arstd  hneio",               \
+               "   zxcvb  km,./")
+
+#define ___COLEMAK___                                                   \
+  LANG_MAP(_Q, _W, _F, _P, _G,    _J, _L,  _U,      _Y,     TL_SCLN,    \
+           _A, _R, _S, _T, _D,    _H, _N,  _E,      _I,     _O,         \
+           _Z, _X, _C, _V, _B,    _K, _M,  TL_COMM, TL_DOT, TL_SLSH)
+
+
+#define CARTE_COLEMAK_DH                        \
+  carte_de_map("   qwfpb  jluy;",               \
+               "   arstg  mneio",               \
+               "   zxcdv  kh,./")
+
+#define ___COLEMAK_DH___                                                \
+  LANG_MAP(_Q, _W, _F, _P, _B,    _J, _L, _U,      _Y,     TL_SCLN,     \
+           _A, _R, _S, _T, _G,    _M, _N, _E,      _I,     _O,          \
+           _Z, _X, _C, _D, _V,    _K, _H, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_HALMAK                            \
+  carte_de_map("  wlrbz  ;qudj",                \
+               "  shnt,  .aeoi",                \
+               "  fmvc/  gpxky")
+
+#define ___HALMAK___                                            \
+  LANG_MAP(_W, _L, _R, _B, _Z,        TL_SCLN, _Q, _U, _D, _J,  \
+           _S, _H, _N, _T, TL_COMM,   _DOT,    _A, _E, _O, _I,  \
+           _F, _M, _V, _C, TL_SLSH,   _G,      _P, _X, _K, _Y)
+
+#define CARTE_MINIMAK                           \
+  carte_de_map("  qwdrk  yuiop",                \
+               "  astfg  hjel;",                \
+               "  zxcvb  nm,./")
+
+#define ___MINIMAK___                                                   \
+  LANG_MAP(_Q, _W, _D, _R, _K,   _Y, _U, _I,      _O,     _P,           \
+           _A, _S, _T, _F, _G,   _H, _J, _E,      _L,     TL_SCLN,      \
+           _Z, _X, _C, _V, _B,   _N, _M, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_MINIMAK_8                         \
+  carte_de_map("  qwdrk  yuilp",                \
+               "  astfg  hneo;",                \
+               "  zxcvb  jm,./")
+
+#define ___MINIMAK_8___                                                 \
+  LANG_MAP(_Q, _W, _D, _R, _K,   _Y, _U, _I,      _L,     _P,           \
+           _A, _S, _T, _F, _G,   _H, _N, _E,      _O,     TL_SCLN,      \
+           _Z, _X, _C, _V, _B,   _J, _M, TL_COMM, TL_DOT, TL_SLSH)
+
+
+#define CARTE_MINIMAK_12                        \
+  carte_de_map("  qwdfk  yuil;",                \
+               "  astrg  hneop",                \
+               "  zxcvb  jm,./")
+
+#define ___MINIMAK_12___                                                \
+  LANG_MAP(_Q, _W, _D, _F, _K,   _Y, _U, _I,      _L,     _SCLN,        \
+           _A, _S, _T, _R, _G,   _H, _N, _E,      _O,     _P,           \
+           _Z, _X, _C, _V, _B,   _J, _M, TL_COMM, TL_DOT, TL_SLSH)
diff --git a/users/ericgebhart/base_layers/qwerty.h b/users/ericgebhart/base_layers/qwerty.h
new file mode 100644
index 0000000000..47aead197c
--- /dev/null
+++ b/users/ericgebhart/base_layers/qwerty.h
@@ -0,0 +1,69 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  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 for combo reference. Make more than one by changing lang is.
+#define ___COMBO_REF___                                                 \
+  LANG_MAP(_1L1,  _1L2, _1L3, _1L4,  _1L5,   _1R1, _1R2, _1R3, _1R4, _1R5, \
+           _2L1,  _2L2, _2L3, _2L4,  _2L5,   _2R1, _2R2, _2R3, _2R4, _2R5, \
+           _3L1,  _3L2, _3L3, _3L4,  _3L5,   _3R1, _3R2, _3R3, _3R4, _3R5)
+
+
+#define CARTE_QWERTY                            \
+  carte_de_map("   qwert  yuiop",               \
+               "   asdfg  hjkl;",               \
+               "   zxcvb  nm,./")
+
+// Need TLKC around comm, dot, and quot, and scln
+// Qwerty based layers that I don't really use.
+#define ___QWERTY___                                                    \
+  LANG_MAP(_Q, _W, _E, _R, _T, _Y,  _U,  _I,      _O,     _P,           \
+           _A, _S, _D, _F, _G, _H,  _J,  _K,      _L,     TL_SCLN,      \
+           _Z, _X, _C, _V, _B, _N,  _M,  TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_AZERTY                           \
+  carte_de_map("   azert  yuiop",               \
+               "   qsdfg  hjkl;",               \
+               "   wxcvb  nm,./")
+
+// Need TLKC around comm, dot, and quot, and scln
+// Qwerty based layers that I don't really use.
+#define ___AZERTY___                                                    \
+  LANG_MAP(_A, _Z, _E, _R, _T, _Y,  _U,  _I,      _O,     _P,           \
+           _Q, _S, _D, _F, _G, _H,  _J,  _K,      _L,     TL_SCLN,      \
+           _W, _X, _C, _V, _B, _N,  _M,  TL_COMM, TL_DOT, TL_SLSH)
+
+
+
+#define CARTE_WORKMAN                           \
+  carte_de_map("   qdrwb  jfup;",               \
+               "   ashtg  yneio",               \
+               "   zxmcv  kl,./")
+
+#define ___WORKMAN___                                                   \
+  LANG_MAP(_Q, _D, _R, _W, _B,   _J, _F, _U,      _P,     _SCLN,        \
+           _A, _S, _H, _T, _G,   _Y, _N, _E,      _O,     _I,           \
+           _Z, _X, _M, _C, _V,   _K, _L, TL_COMM, TL_DOT, TL_SLSH)
+
+#define CARTE_NORMAN                            \
+  carte_de_map("   qwdfk  jurl;",               \
+               "   asetg  yniou",               \
+               "   zxcvb  pm,./")
+#define ___NORMAN___                                                    \
+  LANG_MAP(_Q, _W, _D, _F, _K,   _J, _U, _R,      _L,     TL_SCLN,      \
+           _A, _S, _E, _T, _G,   _Y, _N, _I,      _O,     _U,           \
+           _Z, _X, _C, _V, _B,   _P, _M, TL_COMM, TL_DOT, TL_SLSH)
diff --git a/users/ericgebhart/base_layers/toprows.h b/users/ericgebhart/base_layers/toprows.h
new file mode 100644
index 0000000000..ba32118537
--- /dev/null
+++ b/users/ericgebhart/base_layers/toprows.h
@@ -0,0 +1,56 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/*******************************************************************/
+/** TOP ROWS  Func,Symbols, Numbers you find there.               **/
+/*******************************************************************/
+// ltkc  language target keycode DV, BK, BKW, NONE
+//   _1 = DV_1 or _1 = BP_DV_1 or KC_1
+#define ___10_NUMBERS___                                \
+  LANG_ROW(_1, _2, _3, _4, _5, _6, _7, _8, _9, _0)
+
+/*  40123 76598  */
+#define ___10_NUMBERS_BEAKL15___                        \
+  LANG_ROW(_4, _0, _1, _2, _3, _7, _6, _5, _9, _8)
+
+/*  32104 76598  */
+#define ___10_NUMBERS_BEAKL19___                        \
+  LANG_ROW(_3, _2, _1, _0, _4, _7, _6, _5, _9, _8)
+
+// a top symbol row if someone wants it.
+#define ___10_SYMBOLS___                                                \
+  LANG_ROW(_EXLM, _AT, _HASH, _DLR, _PERC, _CIRC, _AMPR, _ASTR, _LPRN, _RPRN)
+
+// standard bepo top row
+#define ___10_SYMBOLS_BEPO___                                           \
+  LANG_ROW(_DQUO, _LDAQ, _RDAQ, _LPRN, _RPRN, _AT, _PLUS, _MINS, _SLSH, _ASTR)
+
+#define ___12_SYMBOLS_BEPO___                           \
+  LANG_ROW12(_DLR, _DQUO, _LDAQ, _RDAQ, _LPRN, _RPRN,   \
+             _AT,  _PLUS, _MINS, _SLSH, _ASTR, _EQL)
+
+// function key rows work for everyone.
+#define ___10_FUNCS___                                                  \
+  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
+
+#define ___12_FUNCS___ ___10_FUNCS___, KC_F11, KC_F12
+
+#define ___10_FUNCS_BEAKL15___                  \
+  KC_F4,   KC_F10,   KC_F1,   KC_F2,   KC_F3,   \
+    KC_F7,   KC_F6,   KC_F5,   KC_F9,   KC_F8
+
+#define ___12_FUNCS_BEAKL15___ KC_F11, ___10_FUNCS_BEAKL15___, KC_F12
diff --git a/users/ericgebhart/caps_word.c b/users/ericgebhart/caps_word.c
deleted file mode 100644
index ba81c15d66..0000000000
--- a/users/ericgebhart/caps_word.c
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-// For full documentation, see
-// https://getreuer.info/posts/keyboards/caps-word
-
-#include "caps_word.h"
-
-bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
-  static bool caps_word_enabled = false;
-  static bool shifted = false;
-#ifndef NO_ACTION_ONESHOT
-  const uint8_t mods = get_mods() | get_oneshot_mods();
-#else
-  const uint8_t mods = get_mods();
-#endif  // NO_ACTION_ONESHOT
-
-  if (!caps_word_enabled) {
-    // Pressing both shift keys at the same time enables caps word.
-    if ((mods & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
-      clear_mods();
-#ifndef NO_ACTION_ONESHOT
-      clear_oneshot_mods();
-#endif  // NO_ACTION_ONESHOT
-      shifted = false;
-      caps_word_enabled = true;
-      return false;
-    }
-    return true;
-  }
-
-  if (!record->event.pressed) { return true; }
-
-  if (!(mods & ~MOD_MASK_SHIFT)) {
-    switch (keycode) {
-    case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-    case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
-      // Earlier return if this has not been considered tapped yet.
-      if (record->tap.count == 0) { return true; }
-      // Get the base tapping keycode of a mod- or layer-tap key.
-      keycode &= 0xff;
-    }
-
-    switch (keycode) {
-      // Letter keys should be shifted.
-    case KC_A ... KC_Z:
-      if (!shifted) { register_code(KC_LSFT); }
-      shifted = true;
-      return true;
-
-      // Keycodes that continue caps word but shouldn't get shifted.
-    case KC_1 ... KC_0:
-    case KC_BSPC:
-    case KC_MINS:
-    case KC_UNDS:
-      if (shifted) { unregister_code(KC_LSFT); }
-      shifted = false;
-      return true;
-
-      // Any other keycode disables caps word.
-    }
-  }
-
-  // Disable caps word.
-  caps_word_enabled = false;
-  if (shifted) { unregister_code(KC_LSFT); }
-  shifted = false;
-  return true;
-}
diff --git a/users/ericgebhart/caps_word.h b/users/ericgebhart/caps_word.h
deleted file mode 100644
index a59b2e4338..0000000000
--- a/users/ericgebhart/caps_word.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-// Caps Word, activated by pressing both shift keys at the same time.
-//
-// This library implements "Caps Word", which is like conventional Caps Lock,
-// but automatically disables itself at the end of the word. This is useful for
-// typing all-caps identifiers like `MOD_MASK_ALT`.
-//
-// Caps Word is activated by pressing the left and right shift keys at the same
-// time. This way you don't need a dedicated key for using Caps Word. I've
-// tested that this works as expected with one-shot mods and Space Cadet Shift.
-// If your shift keys are mod-taps, activate Caps Word by holding both shift
-// mod-tap keys until the tapping term, release them, then begin typing.
-//
-// For full documentation, see
-// https://getreuer.info/posts/keyboards/caps-word
-
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-bool process_caps_word(uint16_t keycode, keyrecord_t* record);
diff --git a/users/ericgebhart/combos.def b/users/ericgebhart/combos.def
deleted file mode 100644
index 9b5f2c8a9e..0000000000
--- a/users/ericgebhart/combos.def
+++ /dev/null
@@ -1,10 +0,0 @@
-//   name      result           chord keys
-COMB(LNAV,      TG(_NAV),       SPC_TOPR, ENT_NAV)
-COMB(OSLSYM,    OSL(_SYMB),     ESC_TOPR, BSPC_SYMB)
-COMB(OSLSYMBP,  OSL(_SYMB_BP),  ESC_TOPR_BP, BSPC_SYMB_BP)
-COMB(LKEYPAD,   TG(_KEYPAD),    SPC_TOPR, BSPC_SYMB)
-COMB(LKEYPADBP, TG(_KEYPAD_BP), SPC_TOPR_BP, BSPC_SYMB_BP)
-COMB(LLAYERS,   OSL(_LAYERS),    KC_TAB, ENT_NAV)
-
-//COMB(JKL_SPC,  KC_SPC,   KC_J,  KC_X)
-//SUBS(TH_THE,   "the",    KC_T, KC_H) // SUBS uses SEND_STRING to output the given string.
diff --git a/users/ericgebhart/config.h b/users/ericgebhart/config.h
old mode 100755
new mode 100644
index 116d48f4ab..6cd983b37b
--- a/users/ericgebhart/config.h
+++ b/users/ericgebhart/config.h
@@ -18,12 +18,11 @@
 #ifndef USERSPACE_CONFIG_H
 #define USERSPACE_CONFIG_H
 
-#include "../../config.h"
+// pro-micro v3's don't always detect otherwise.
+/* #define SPLIT_USB_DETECT */
 
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
-#define COMBO_MUST_HOLD_MODS
-#define COMBO_HOLD_TERM 150
 // Sets good default for the speed of the mouse.
 #undef MOUSEKEY_INTERVAL
 #undef MOUSEKEY_DELAY
@@ -51,4 +50,274 @@
 #define TAPPING_TERM    200
 #define IGNORE_MOD_TAP_INTERRUPT
 
+
+#define TAP_HOLD_TERM    200
+#define COMBO_MUST_HOLD_MODS
+#define COMBO_HOLD_TERM 150
+#define TAP_CODE_DELAY 5  // for send string with delay
+
+// change the behavior of Mod taps for HRMs.
+// #define GLOBAL_QUICK_TAP
+
+ /* Control switches for my keymaps. */
+ /* if needed, this goes in the keyboard's config.h */
+ /* Alternately, fix the number row in the layout template. */
+/* #define BASE_NUMBER_ROW    // turn on 4 row base templates. */
+
+// Extensions, turn them on and off.
+#define USERSPACE_H "ericgebhart.h"
+
+// Layout definitions, which language, thumb cluster, mod layer.
+// Columns in and out.
+
+// the default. set it, use it, set it back.
+// US_INT // EN, BEPO, US_INT
+#define LANG_IS US_INT
+#define DEFAULT_LANG US_INT
+#define DEFAULT_LANG_NAME " us"
+
+// Enable a second locale, for another set of layers.
+// This will add bepo versions of all layers chosen.
+/* #define SECOND_LOCALE BEPO */
+/* #define SECOND_LOCALE_NAME " bepo" */
+
+// Choose a mod layer. Can be changed per layer.
+// TRNS, ALT, HRS_NAV HRM_GACS, HRM_SCAG, HRM_GASC, MIRYOKU_HRM_GASC
+#define MODS_ARE HRS_NAV
+#define DEFAULT_MODS MODS_ARE
+
+// Choose a thumb cluster.
+// WI, WIa, DEFAULT, TEST, TRNS, MODS, LAYERS, MODS_LAYERS,
+// MIRYOKU, MIRYOKU_TR, MODS_LAYERS_NAV,
+// The following use THUMB_LETTER to place a letter on the Thumbs.
+// for use with the hands down metals, maltron, and rsthd.
+// HD, HDA, HD_SIMPLE, TH_LTR, HD_DASH,
+// MIRYOKU_TR_LTR, MIRYOKU_LTR
+#define THUMBS_ARE DEFAULT
+#define DEFAULT_THUMBS DEFAULT
+
+// pick the edge key set. normie, no kc, smart locks or test.
+// NORM, NOKC, SML, TEST
+#define EDGE_KEY_SET_IS SML
+#define DEFAULT_EDGE_SET SML
+
+// for the base layers which need a thumb cluster which takes a letter.
+#define HANDS_DOWN_LTR_THUMBS_ARE TH_LTR
+#define MALTRON_LTR_THUMBS_ARE TH_LTR
+#define RSTHD_LTR_THUMBS_ARE TH_LTR
+
+// layout io, matrix size.
+// a reasonable default for most keyboards.
+// give a 3x10 and get a 3x12, managed in keyboards/keyboards.h
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+// OLED STUFF.
+#define OLED_CUSTOM_ENABLE // custom oled here.
+//#define OLED_LOGO_ENABLE // turn on/off the logo.
+#define KEYLOGGER_ENABLE // 1500 bytes, track and print keypress info to oled.
+//#define SPLIT_LAYER_STATE_ENABLE  // to sync state between sides.
+
+// EXTENSIONS
+
+// Combos
+#define COMBO_REF_LAYER_ENABLE
+// #define COMBO_REF_LAYER_TWO_ENABLE
+// works if you know the number of your layer.
+// otherwise set and use them later.
+// #define COMBO_ONLY_FROM_LAYER 2
+// #define COMBO_REF_DEFAULT 2
+
+
+// Console key logging for creation of heatmaps, etc.
+// CONSOLE must be enabled for this to work.
+// To create Precondition's heat maps, from console key logging
+// with hid_listen or qmk console
+//#define CONSOLE_KEY_LOGGER_ENABLE  // turn on keylogging for heat maps.
+
+#define ALT_LOCAL_ENABLE // alternate key combinations, with mods as needed.
+#define ACCENTED_KEYS_ENABLE // direct access to altgr keys.
+
+#define SMART_LOCK_ENABLE // smart lock layers and mods.
+//#define MOD_LOCK_ENABLE  // smart lock mods, similar/overlapping with Smart lock.
+#define NSHOT_ENABLE // smart n-shot for count.
+//#define ONESHOT_MOD_ENABLE  // oneshot mods, similar/overlapping with nshots
+
+#define TAP_HOLD_ENABLE // tap for one thing, hold for tapping term to get another.
+//#define SWAPPER_ENABLE // enable swapper keys.
+#define NOT_DEAD_ENABLE // make undead versions (US_DQUO_ND) of dead keys.
+//#define ALT_SHIFT_ENABLE // alternate shift behaviors for existing keys.
+//#define SEND_STRING_ENABLE // Turn on send string keys
+//#define SEND_UNICODE_ENABLE // Unicode must be enabled for this to work.
+
+
+// Turn on the base layers do not exceed 4 if doing two locales.
+// That will likely push a layer past 15 and then it will
+// no longer work with the LT macro.
+
+// dvorak and relatives
+#define DVORAK_LAYER_ENABLE
+//#define DVORAK_RLC_IU_LAYER_ENABLE
+//#define CAPEWELL_DVORAK_LAYER_ENABLE
+//#define AHEI_LAYER_ENABLE
+//#define BOO_LAYER_ENABLE
+
+// qwerty and derivitives
+//#define QWERTY_LAYER_ENABLE
+//#define AZERTY_LAYER_ENABLE
+//#define WORKMAN_LAYER_ENABLE
+//#define NORMAN_LAYER_ENABLE
+
+// COLEMAK and relatives
+//#define COLEMAK_LAYER_ENABLE
+//#define COLEMAK_DH_LAYER_ENABLE
+//#define HALMAK_LAYER_ENABLE
+//#define MINIMAK_LAYER_ENABLE
+//#define MINIMAK_8_LAYER_ENABLE
+//#define MINIMAK_12_LAYER_ENABLE
+
+// BEAKL
+// #define BEAKL15_LAYER_ENABLE
+//#define BEAKL19_LAYER_ENABLE
+//#define BEAKL27_LAYER_ENABLE
+//#define BEAKLWI_LAYER_ENABLE
+
+// carpalx layouts
+//#define CARPALX_QFMLWY_LAYER_ENABLE
+//#define CARPALX_QGMLWB_LAYER_ENABLE
+//#define CARPALX_QGMLWY_LAYER_ENABLE
+
+// alternate layouts
+//#define MALTRON_LAYER_ENABLE
+//#define EUCALYN_LAYER_ENABLE
+//#define HANDS_UP_LAYER_ENABLE
+//#define RSTHD_LAYER_ENABLE
+//#define HANDS_UP_LAYER_ENABLE
+//#define WHITE_LAYER_ENABLE
+//#define ISRT_LAYER_ENABLE
+//#define SOUL_LAYER_ENABLE
+//#define NIRO_LAYER_ENABLE
+//#define ASSET_LAYER_ENABLE
+//#define WHORF_LAYER_ENABLE
+//#define WHORF6_LAYER_ENABLE
+
+// mtgap and relatives
+//#define MTGAP_LAYER_ENABLE
+//#define CTGAP_LAYER_ENABLE
+//#define APT_LAYER_ENABLE
+//#define CANARY_LAYER_ENABLE
+
+// Hands down
+#define HD_NEU_NARROW_LAYER_ENABLE
+//#define HD_REF_LAYER_ENABLE
+//#define HD_DASH_LAYER_ENABLE
+//#define HD_ELAN_LAYER_ENABLE
+//#define HD_BRONZE_LAYER_ENABLE
+//#define HD_SILVER_LAYER_ENABLE
+//#define HD_PLATINUM_LAYER_ENABLE
+//#define HD_GOLD_LAYER_ENABLE
+//#define HD_TITANIUM_LAYER_ENABLE
+
+// A compact optimot for 3x10.
+// requires accent characters.
+//#define OPTIMOT_COMPACT_LAYER_ENABLE
+
+// 3x12 sized base layers
+//--------------------------
+//#define HD_NEU_LAYER_ENABLE
+
+// Optimized for french
+// All these have accent characters on base layer.
+// so these dont work for En, but do for US-international and Bepo.
+
+//#define BEPO_LAYER_ENABLE
+//#define OPTIMOT_LAYER_ENABLE
+//#define BEAKL19bis_LAYER_ENABLE
+
+
+// enable transient function layers.
+#define SYMBOL_LAYER_ENABLE
+#define NAV_LAYER_ENABLE
+// #define MOUSE_LAYER_ENABLE
+#define TOPROWS_LAYER_ENABLE
+// #define LAYERS_LAYER_ENABLE - defunct. always on.
+#define KEYPAD_LAYER_ENABLE
+//#define ADJUST_LAYER_ENABLE
+//#define RGB_LAYER_ENABLE
+//#define MEDIA_LAYER_ENABLE
+//#define FUNC_LAYER_ENABLE
+
+
+// define alternate thumb definitions for the transient layers.
+#define MEDIA_LAYER_THUMBS MEDIA_THUMBS
+#define MOUSE_LAYER_THUMBS MOUSE_THUMBS
+#define NAV_LAYER_THUMBS TRNS_THUMBS
+#define KEYPAD_LAYER_THUMBS KEYPAD_THUMBS
+#define SYMB_LAYER_THUMBS SYMB_THUMBS
+#define TOPROWS_LAYER_THUMBS DEFAULT
+
+// Extra character layers.
+// Bepo has dead keys (altgr) and accented keycodes
+// A layer of accented keys
+// #define ACCENTS_LAYER_ENABLE
+// A layer of dead keys
+// #define MORTE_LAYER_ENABLE
+// A layer of the most popular accented keys and dead keys
+#define ACCENTS_MORTE_LAYER_ENABLE
+
+// Functional layer choices.
+/* configure the function layers. */
+/* They have to be turned on above. */
+/* Choose one of each as desired. */
+/* There are reasonable defaults */
+/* for each if nothing is defined. */
+
+/* nav */
+//#define NAV_FULL  // monolithic, two sided nav with mouse and arrows.
+#define NAV_FULL_LOCK_MODS // Replace left mouse buttons with lockmods.
+
+// Just the non mouse bits, with lock mods, n-shot mods on the left.
+// if mousekeys enabled, adds a mouse layer accessible via smart lock.
+// #define NAV_NO_MOUSE
+// #define NAV_MIRYOKU
+// #define NAV_MOUSE_MIRYOKU
+
+
+/* keypads */
+// beakl keypads are usual, if not chosen, regular keypads will be used.
+// left side is the default.
+// Beakl, except for WI, is only on the left side.
+// Miryoku is on the left also.
+
+//#define KEYPAD_RIGHT
+#define KEYPAD_BEAKL        // beakl doesn't have a rightside, swap hands?
+//#define KEYPAD_MODS      //  give mods on the other side instead of funcs.
+//#define KEYPAD_BEAKL_WI  //  right side with hexpad on left.
+//#define KEYPAD_MIRYOKU   //  use the miryoku keypad
+// the default if nothing chosen,
+// is a functionpad on the left and normal keypad on the right.
+
+// funcpad from miryoku
+// #define FUNCPAD_MIRYOKU
+
+
+/* symbols */
+// pick one of these or get the default.
+//#define SYMBOL_BEAKL         // original - the default if nothing else.
+//#define SYMBOL_BEAKL_EXT     // extended for non beakl base layers.
+//#define SYMBOL_BEAKL_EXT_VI  // extended with vi keybinding in mind.
+#define SYMBOL_BEAKL_C         // more alterations by frequency
+// #define SYMBOL_NEO             // The symbol layer from the Neo layout.
+// #define SYMBOL_MIRYOKU      // minimalist symbols after miryoku
+//#define SYMBOL_BEAKL_WI      // original wi
+
+
+/* toprows. */
+// The default, if not defined, is a standard qwerty set of rows.
+// symbols, numbers, function keys. Numbers on the home row.
+
+// #define TOPROWS_BKL_15_NUMS  // center row with Beakl15 order. 40123 76598.
+// #define TOPROWS_BKL_19_NUMS // Beakl 19 order: 32104  76598
+#define TOPROWS_MOD  // beakl 15 nums, oneshot and smart lock mods. no Fkeys.
+
+
 #endif
diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h
deleted file mode 100755
index 73beaaf7ab..0000000000
--- a/users/ericgebhart/core_keys.h
+++ /dev/null
@@ -1,280 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "quantum.h"
-#include "process_keycode/process_tap_dance.h"
-#include "eeconfig.h"
-#include "keymap_bepo.h"
-#include "altlocal_keys.h"
-
-//#define ONESHOT_TAP_TOGGLE 2  /* Tapping this number of times holds the key until tapped once again. */
-
-bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
-
-enum userspace_custom_keycodes {
-  // keep the keycodes using the send_key function close to SAFE_RANGE
-  // so the array of keycodes remains a reasonbale size.
-  DB_1 = SAFE_RANGE,  // can always be here
-  DB_2,
-  DB_3,
-  DB_4,
-  DB_5,
-  DB_6,
-  DB_7,
-  DB_8,
-  DB_9,
-  DB_0,
-  DB_GRV,
-  DB_SCOLON,
-  DB_SLASH,
-  DB_BACKSLASH,
-  DB_EQL,
-  DB_DOT,
-  DB_COMM,
-  DB_QUOT,
-  DB_MINUS,
-  DB_RPRN,
-  DB_LPRN,
-  DB_RBRC,
-  DB_LBRC,
-  // for symbols layer
-  DB_HASH,
-  DB_LCBR,
-  DB_RCBR,
-  DB_PIPE,
-  DB_TILD,
-  DB_CIRC,
-  DB_LESS,
-  DB_GRTR,
-  // End of dvorak on bepo translation keys.
-  // BEAKL on Qwerty..
-  BQ_DOT,
-  BQ_COMM,
-  BQ_QUOT,
-  // End of beakl on qwerty
-  BB_DOT,
-  BB_COMM,
-  BB_QUOT,
-  // End of beakl on Bepo
-
-  EPRM,
-  VRSN,
-  // Default keyboard layouts - Same order as enum.
-  KC_DVORAK,
-  KC_QWERTY,
-  KC_COLEMAK,
-  KC_BEAKL,
-  // KC_WORKMAN,
-  // KC_NORMAN,
-  // KC_MALTRON,
-  // KC_EUCALYN,
-  // KC_CARPLAX,
-  KC_DVORAK_BP,
-  KC_BEAKL_BP,
-  KC_BEPO,
-  KC_LAYERS,
-
-  // Misc.
-  KC_MAKE,
-  KC_RESET,
-  KC_RGB_T,
-  RGB_IDL,
-  KC_SECRET_1,
-  KC_SECRET_2,
-  KC_SECRET_3,
-  KC_SECRET_4,
-  KC_SECRET_5,
-  KC_CCCV,      // Ctrl-C V in one key.
-  BP_CCCV,
-  KC_CTCN,      // Ctrl-T N in one key.
-  BP_CTCN,
-  KC_CWCQ,      // Ctrl-W Q in one key.
-  BP_CWCQ,
-  KC_XM_PORD,   // Xmonad gui-e, gui-t for the scratchpads or desktops.
-  BP_XM_PORD,
-  KC_OCPRN,   // Open, or open and close, cursor in the middle with hold.
-  BP_OCPRN,
-  KC_OCBRC,
-  BP_OCBRC,
-  KC_OCCBR,
-  BP_OCCBR,
-  KC_OCDQUO,
-  BP_OCDQUO,
-  KC_OCQUOT,
-  BP_OCQUOT,
-  KC_OCGRV,
-  BP_OCGRV,
-  KC_OCLTGT,
-  BP_OCLTGT,
-  UC_FLIP,
-  UC_TABL,
-  UC_SHRG,
-  UC_DISA,
-  KC_SPACETEST,
-  NEW_SAFE_RANGE
-};
-
-#define CTLGUI_T(kc) MT(MOD_LGUI | MOD_LCTL, kc)
-#define SFTGUI_T(kc) MT(MOD_LGUI | MOD_LSFT, kc)
-#define ALTGUI_T(kc) MT(MOD_LGUI | MOD_LALT, kc)
-
-#define ALT_ENT     ALT_T(KC_ENT)       // Alt or enter
-#define CTL_SPC     CTL_T(KC_SPC)       // ctrl or space
-#define CTL_BSPC    CTL_T(KC_BSPC)      // ctrl or backspace
-#define ALT_DEL     ALT_T(KC_DEL)       // Alt or delete
-#define GUI_ESC     GUI_T(KC_ESC)       // Gui or escape
-#define ALGR_SYMB   ALGR_T(TG(_SYMB))    // Alt gre or toggle symbol layer
-
-#define ENT_NAV LT(_NAV, KC_ENT)
-#define ENT_TOPR LT(_TOPROWS, KC_ENT)
-#define ENT_TOPR_BP LT(_TOPROWS_BP, KC_ENT)
-#define ESC_TOPR LT(_TOPROWS, KC_ESC)
-#define ESC_TOPR_BP LT(_TOPROWS_BP, KC_ESC)
-#define ESC_SYMB LT(_SYMB, KC_ESC)
-#define ESC_SYMB_BP LT(_SYMB_BP, KC_ESC)
-#define SPC_NAV LT(_NAV, KC_SPC)
-#define SPC_TOPR LT(_TOPROWS, KC_SPC)
-#define SPC_TOPR_BP LT(_TOPROWS_BP, KC_SPC)
-#define SPC_LAYR LT(_LAYERS, KC_SPC)
-#define SPC_LAYR_BP LT(_LAYERS, KC_SPC)
-#define SPC_ADJ LT(_ADJUST, KC_SPC)
-#define SPC_ADJ_BP LT(_ADJUST, KC_SPC)
-#define BSPC_SYMB LT(_SYMB, KC_BSPC)
-#define BSPC_SYMB_BP LT(_SYMB_BP, KC_BSPC)
-#define BSPC_TOPR LT(_TOPROWS, KC_BSPC)
-#define BSPC_TOPR_BP LT(_TOPROWS_BP, KC_BSPC)
-#define SPC_NUM LT(_KEYPAD, KC_SPC)
-#define SPC_NUM_BP LT(_KEYPAD_BP, KC_SPC)
-#define BSPC_NUM LT(_KEYPAD, KC_BSPC)
-#define BSPC_NUM_BP LT(_KEYPAD_BP, KC_BSPC)
-
-// OSM keycodes, to keep things clean and easy to change
-#define KC_MLSF OSM(MOD_LSFT)
-#define KC_MRSF OSM(MOD_RSFT)
-#define OS_LGUI OSM(MOD_LGUI)
-#define OS_RGUI OSM(MOD_RGUI)
-#define OS_LSFT OSM(MOD_LSFT)
-#define OS_RSFT OSM(MOD_RSFT)
-#define OS_LCTL OSM(MOD_LCTL)
-#define OS_RCTL OSM(MOD_RCTL)
-#define OS_LALT OSM(MOD_LALT)
-#define OS_RALT OSM(MOD_RALT)
-#define ALT_APP ALT_T(KC_APP)
-
-#define MG_NKRO MAGIC_TOGGLE_NKRO
-
-#define UC_IRNY UC(0x2E2E)
-#define UC_CLUE UC(0x203D)
-
-
-////  TAP DANCE
-
-  typedef struct {
-    bool is_press_action;
-    int state;
-  } tdtap;
-
-enum {
-      SINGLE_TAP = 1,
-      SINGLE_HOLD = 2,
-      DOUBLE_TAP = 3,
-      DOUBLE_HOLD = 4,
-      DOUBLE_SINGLE_TAP = 5, //send two single taps
-      TRIPLE_TAP = 6,
-      TRIPLE_HOLD = 7
-};
-
-//Tap Dance Declarations
-enum {
-      TD_ESC_CAPS = 0,
-      TD_TAB_BKTAB = 1,
-      TD_MDIA_SYMB = 2,
-      TD_HOME_END = 3,
-      TD_XMONAD_ESC = 4,
-      TD_DEF_LAYER_SW = 5,
-      TD_DEF_OS_LAYER_SW = 6,
-      TD_MOUSE_BTNS = 7,
-      TD_DVORAK_BEPO = 8,
-      TD_UP_HOME = 9,
-      TD_DOWN_END = 10,
-      TD_RIGHT_TAB = 11,
-      TD_LEFT_BACKTAB = 12
-};
-
-
-// Tap dance
-#define KC_BKTAB       LSFT(KC_TAB)
-#define TAB_BKTAB       TD(TD_TAB_BKTAB)  // Tab or backtab tapdance.
-#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB)  // MDIA, symb, keypad, layouts layer tapdance toggle.
-#define DEF_LAYER_SW    TD(TD_DEF_LAYER_SW)  // dvorak, dvorak_on_bepo, bepo default layer
-#define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW)  // dvorak, dvorak_on_bepo, bepo default layer
-#define HOME_END        TD(TD_HOME_END)  // home or end tapdance.
-#define XMONAD_ESC      TD(TD_XMONAD_ESC)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
-#define DVORAK_ET_BEPO  TD(TD_DVORAK_BEPO)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
-#define TDMOUSE_BTNS    TD(TD_MOUSE_BTNS)  // hmmm. 1-5
-#define RIGHT_TAB       TD(TD_RIGHT_TAB)   // Bad idea these 4. Maybe with good timing...
-#define LEFT_BACKTAB    TD(TD_LEFT_BACKTAB)
-#define UP_HOME         TD(TD_UP_HOME)
-#define DOWN_END        TD(TD_DOWN_END)  //  No! Down Down Not End....
-
-// HOME ROW LAYER TOGGLE (LT) and Shift.
-// both sides of the home row have  "shift, ___, media , symb, ___"  and  "___, symb, media, ___, shift".
-// so pinky fingers are shift when held and the index and second fingers are symbol and
-// media layers when held.
-
-// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators).
-// The KC_CCCV key takes care of the last two...
-#define MK_CUT    LSFT(KC_DEL)  // shift + delete
-#define MK_COPY   LCTL(KC_INS)  // ctrl + insert
-#define MK_PASTE  LSFT(KC_INS)  // shift + insert
-
-#undef ___ //kint defines it as KC_NO
-#define ___ KC_TRNS
-#define XXX KC_NO
-
-// Blocking keys
-#define _X_ XXX
-#define ___X___ XXX
-#define ___X2___ XXX, XXX
-#define ___X3___ ___X2___, XXX
-#define ___X5___ ___X3___, XXX, XXX
-#define ___X6___ ___X5___, XXX
-#define ___X12___ ___X6___, ___X6___
-#define ___X15___ ___X5___, ___X5___,  ___X5___
-
-// Transparent keys
-#define ___2___ ___, ___
-#define ___3___ ___2___, ___
-#define ___4___ ___3___, ___
-#define ___5___ ___4___, ___
-#define ___6___ ___5___, ___
-#define ___12___ ___6___, ___6___
-#define ___14___ ___5___, ___4___,  ___5___
-#define ___15___ ___5___, ___5___,  ___5___
-#define ___16___ ___15___, ___
-
-int on_qwerty(void);
-int get_xmonad_layer(void);
-
-#ifdef TAP_DANCES_ENABLE
-int cur_dance (qk_tap_dance_state_t *state);
-
-//for the x tap dance. Put it here so it can be used in any keymap
-void x_finished (qk_tap_dance_state_t *state, void *user_data);
-void x_reset (qk_tap_dance_state_t *state, void *user_data);
-#endif
diff --git a/users/ericgebhart/core_keysets.h b/users/ericgebhart/core_keysets.h
deleted file mode 100755
index f51f743921..0000000000
--- a/users/ericgebhart/core_keysets.h
+++ /dev/null
@@ -1,345 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "core_keys.h"
-/********************************************************************/
-/**  The Core rows of each given layout.                           **/
-/********************************************************************/
-//Dvorak on a qwerty software layer in the OS
-#define ___DVORAK_L1___ KC_QUOT,  KC_COMM, KC_DOT, KC_P,  KC_Y
-#define ___DVORAK_L2___ KC_A,     KC_O,    KC_E,   KC_U,  KC_I
-#define ___DVORAK_L3___ KC_SCLN,  KC_Q,    KC_J,   KC_K,  KC_X
-
-#define ___DVORAK_R1___ KC_F, KC_G,  KC_C, KC_R, KC_L
-#define ___DVORAK_R2___ KC_D, KC_H,  KC_T, KC_N, KC_S
-#define ___DVORAK_R3___ KC_B, KC_M,  KC_W, KC_V, KC_Z
-
-#define ___DVORAK___ ___DVORAK_L1___, ___DVORAK_R1___,  \
-        ___DVORAK_L2___, ___DVORAK_R2___,  \
-        ___DVORAK_L3___, ___DVORAK_R3___
-
-/* BEAKL 15 (main layer): */
-/*   40123 76598   */
-/*   qhoux gcrfz   */
-/* - yiea. dstnb ; */
-/*   j/,k' wmlpv   */
-
-// Remember the - and ; outside pinky keys.
-// Or use the 6 size.
-// Both are on the symbol layer too. So you
-// wont lose them at least.
-// BQ_COMM, BQ_QUOT, BQ_DOT - Beakl->Qwerty
-// BB_COMM, BB_QUOT, BB_DOT - Beakl->Bepo
-// take care of the different shifted chars.
-/* BEAKL 15 (shift layer): */
-/*   QHOUX GCRFZ   */
-/* - YIEA@ DSTNB ; */
-/*   J?!K` WMLPV   */
-#define ___BEAKL15_L1___ KC_Q, KC_H,     KC_O,    KC_U, KC_X
-#define ___BEAKL15_L2___ KC_Y, KC_I,     KC_E,    KC_A, BQ_DOT
-#define ___BEAKL15_L3___ KC_J, KC_SLASH, BQ_COMM, KC_K, BQ_QUOT
-
-#define ___BEAKL15_R1___ KC_G, KC_C,     KC_R,    KC_F, KC_Z
-#define ___BEAKL15_R2___ KC_D, KC_S,     KC_T,    KC_N, KC_B
-#define ___BEAKL15_R3___ KC_W, KC_M,     KC_L,    KC_P, KC_V
-
-#define ___BEAKL15___ ___BEAKL15_L1___, ___BEAKL15_R1___,       \
-        ___BEAKL15_L2___, ___BEAKL15_R2___,                     \
-        ___BEAKL15_L3___, ___BEAKL15_R3___
-
-#define ___6BEAKL15_L1___ ___,     KC_Q, KC_H,     KC_O,    KC_U, KC_X
-#define ___6BEAKL15_L2___ KC_MINS, KC_Y, KC_I,     KC_E,    KC_A, BQ_DOT
-#define ___6BEAKL15_L3___ ___,     KC_J, KC_SLASH, BQ_COMM, KC_K, BQ_QUOT
-
-#define ___6BEAKL15_R1___ KC_G, KC_C,     KC_R,    KC_F, KC_Z, ___
-#define ___6BEAKL15_R2___ KC_D, KC_S,     KC_T,    KC_N, KC_B, KC_SCLN
-#define ___6BEAKL15_R3___ KC_W, KC_M,     KC_L,    KC_P, KC_V, ___
-
-#define ___6BEAKL15___ ___6BEAKL15_L1___, ___6BEAKL15_R1___,    \
-        ___6BEAKL15_L2___, ___6BEAKL15_R2___,                   \
-        ___6BEAKL15_L3___, ___6BEAKL15_R3___
-
-// Qwerty based layers that I don't really use.
-#define ___QWERTY_L1___ KC_Q,  KC_W,  KC_E,    KC_R,   KC_T
-#define ___QWERTY_L2___ KC_A,  KC_S,  KC_D,    KC_F,   KC_G
-#define ___QWERTY_L3___ KC_Z,  KC_X,  KC_C,    KC_V,   KC_B
-
-#define ___QWERTY_R1___ KC_Y,  KC_U,  KC_I,    KC_O,   KC_P
-#define ___QWERTY_R2___ KC_H,  KC_J,  KC_K,    KC_L,   KC_SCLN
-#define ___QWERTY_R3___ KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH
-
-#define ___QWERTY___ ___QWERTY_L1___, ___QWERTY_R1___,          \
-        ___QWERTY_L2___, ___QWERTY_R2___,                       \
-        ___QWERTY_L3___, ___QWERTY_R3___
-
-// Qwerty based layers that I don't really use.
-
-// COLEMAK
-#define ___COLEMAK_L1___ KC_Q, KC_W,  KC_F,    KC_P,   KC_G
-#define ___COLEMAK_L2___ KC_A, KC_R,  KC_S,    KC_T,   KC_D
-#define ___COLEMAK_L3___ KC_Z, KC_X,  KC_C,    KC_V,   KC_B
-
-#define ___COLEMAK_R1___ KC_J, KC_L,  KC_U,    KC_Y,   KC_SCLN
-#define ___COLEMAK_R2___ KC_H, KC_N,  KC_E,    KC_I,   KC_O
-#define ___COLEMAK_R3___ KC_K, KC_M,  KC_COMM, KC_DOT, KC_SLASH
-
-#define ___COLEMAK___ ___COLEMAK_L1___, ___COLEMAK_R1___,       \
-        ___COLEMAK_L2___, ___COLEMAK_R2___,                     \
-        ___COLEMAK_L3___, ___COLEMAK_R3___
-
-// COLEMAK-DH
-#define ___COLEMAK_DH_L1___ KC_Q,  KC_W,  KC_F,  KC_P,  KC_B
-#define ___COLEMAK_DH_L2___ KC_A,  KC_R,  KC_S,  KC_T,  KC_G
-#define ___COLEMAK_DH_L3___ KC_Z,  KC_X,  KC_C,  KC_D,  KC_V
-
-#define ___COLEMAK_DH_R1___ KC_J,  KC_L,  KC_U,    KC_Y,    KC_SCLN
-#define ___COLEMAK_DH_R2___ KC_M,  KC_N,  KC_E,    KC_I,    KC_O
-#define ___COLEMAK_DH_R3___ KC_K,  KC_H,  KC_COMM, KC_DOT,  KC_SLASH
-
-#define ___COLEMAK_DH___ ___COLEMAK_DH_L1___, ___COLEMAK_DH_R1___,      \
-        ___COLEMAK_DH_L2___, ___COLEMAK_DH_R2___,                       \
-        ___COLEMAK_DH_L3___, ___COLEMAK_DH_R3___
-
-
-// WORKMAN
-#define ___WORKMAN_L1___ KC_Q,  KC_D,  KC_R,  KC_W,  KC_B
-#define ___WORKMAN_L2___ KC_A,  KC_S,  KC_H,  KC_T,  KC_G
-#define ___WORKMAN_L3___ KC_Z,  KC_X,  KC_M,  KC_C,  KC_V
-
-#define ___WORKMAN_R1___ KC_J,  KC_F,  KC_U,     KC_P,    KC_SCLN
-#define ___WORKMAN_R2___ KC_Y,  KC_N,  KC_E,     KC_O,    KC_I
-#define ___WORKMAN_R3___ KC_K,  KC_L,  KC_COMM,  KC_DOT,  KC_SLASH
-
-#define ___WORKMAN___ ___WORKMAN_L1___, ___WORKMAN_R1___,       \
-        ___WORKMAN_L2___, ___WORKMAN_R2___,                     \
-        ___WORKMAN_L3___, ___WORKMAN_R3___
-
-
-// NORMAN
-#define ___NORMAN_L1___ KC_Q,  KC_W,   KC_D,  KC_F,  KC_K
-#define ___NORMAN_L2___ KC_A,  KC_S,   KC_E,  KC_T,  KC_G
-#define ___NORMAN_L3___ KC_Z,  KC_X,   KC_C,  KC_V,  KC_B
-
-#define ___NORMAN_R1___ KC_J,   KC_U,  KC_R,     KC_L,    KC_SCLN
-#define ___NORMAN_R2___ KC_Y,   KC_N,  KC_I,     KC_O,    KC_U
-#define ___NORMAN_R3___ KC_P,   KC_M,  KC_COMM,  KC_DOT,  KC_SLASH
-
-#define ___NORMAN___ ___NORMAN_L1___, ___NORMAN_R1___,     \
-        ___NORMAN_L2___, ___NORMAN_R2___,                  \
-        ___NORMAN_L3___, ___NORMAN_R3___
-
-
-#define ___MALTRON_L1___ KC_Q,    KC_P,    KC_Y,    KC_C,    KC_B
-#define ___MALTRON_L2___ KC_A,    KC_N,    KC_I,    KC_S,    KC_F
-#define ___MALTRON_L3___ KC_SCLN, KC_SLSH, KC_J,    KC_G,    KC_COMM
-
-#define ___MALTRON_R1___ KC_V,    KC_M,    KC_U,    KC_Z,    KC_L
-#define ___MALTRON_R2___ KC_D,    KC_T,    KC_D,    KC_O,    KC_R
-#define ___MALTRON_R3___ KC_DOT,  KC_W,    KC_K,    KC_MINS, KC_X
-
-#define ___MALTRON___ ___MALTRON_L1___, ___MALTRON_R1___,       \
-        ___MALTRON_L2___, ___MALTRON_R2___,                     \
-        ___MALTRON_L3___, ___MALTRON_R3___
-
-
-#define ___EUCALYN_L1___ KC_SLSH, KC_COMM, KC_DOT,  KC_F,    KC_Q
-#define ___EUCALYN_L2___ KC_A,    KC_O,    KC_E,    KC_I,    KC_U
-#define ___EUCALYN_L3___ KC_Z,    KC_X,    KC_C,    KC_V,    KC_W
-
-#define ___EUCALYN_R1___ KC_M,    KC_R,    KC_D,    KC_Y,    KC_P
-#define ___EUCALYN_R2___ KC_G,    KC_T,    KC_K,    KC_S,    KC_N
-#define ___EUCALYN_R3___ KC_B,    KC_H,    KC_J,    KC_L,    KC_SCLN
-
-#define ___EUCALYN___ ___EUCALYN_L1___, ___EUCALYN_R1___,       \
-        ___EUCALYN_L2___, ___EUCALYN_R2___,                     \
-        ___EUCALYN_L3___, ___EUCALYN_R3___
-
-
-#define ___CARPLAX_QFMLWY_L1___ KC_Q,    KC_F,    KC_M,    KC_L,    KC_W
-#define ___CARPLAX_QFMLWY_L2___ KC_D,    KC_S,    KC_T,    KC_N,    KC_R
-#define ___CARPLAX_QFMLWY_L3___ KC_Z,    KC_V,    KC_G,    KC_C,    KC_X
-
-#define ___CARPLAX_QFMLWY_R1___ KC_Y,    KC_U,    KC_O,    KC_B,    KC_J
-#define ___CARPLAX_QFMLWY_R2___ KC_I,    KC_A,    KC_E,    KC_H,    KC_SCLN
-#define ___CARPLAX_QFMLWY_R3___ KC_P,    KC_K,    KC_COMM, KC_DOT,  KC_SLSH
-
-#define ___CARPLAX_QFMLWY___ ___CARPLAX_QFMLWY_L1___, ___CARPLAX_QFMLWY_R1___, \
-        ___CARPLAX_QFMLWY_L2___, ___CARPLAX_QFMLWY_R2___,               \
-        ___CARPLAX_QFMLWY_L3___, ___CARPLAX_QFMLWY_R3___
-
-
-#define ___CARPLAX_QGMLWB_L1___ KC_Q,    KC_G,    KC_M,    KC_L,    KC_W
-#define ___CARPLAX_QGMLWB_L2___ KC_D,    KC_S,    KC_T,    KC_N,    KC_R
-#define ___CARPLAX_QGMLWB_L3___ KC_Z,    KC_X,    KC_C,    KC_F,    KC_J
-
-#define ___CARPLAX_QGMLWB_R1___ KC_B,    KC_Y,    KC_U,    KC_V,    KC_SCLN
-#define ___CARPLAX_QGMLWB_R2___ KC_I,    KC_A,    KC_E,    KC_O,    KC_H
-#define ___CARPLAX_QGMLWB_R3___ KC_K,    KC_P,    KC_COMM, KC_DOT,  KC_SLSH
-
-#define ___CARPLAX_QGMLWB___ ___CARPLAX_QGMLWB_L1___, ___CARPLAX_QGMLWB_R1___, \
-        ___CARPLAX_QGMLWB_L2___, ___CARPLAX_QGMLWB_R2___,               \
-        ___CARPLAX_QGMLWB_L3___, ___CARPLAX_QGMLWB_R3___
-
-
-#define ___CARPLAX_QGMLWY_L1___ KC_Q,    KC_G,    KC_M,    KC_L,    KC_W
-#define ___CARPLAX_QGMLWY_L2___ KC_D,    KC_S,    KC_T,    KC_N,    KC_R
-#define ___CARPLAX_QGMLWY_L3___ KC_Z,    KC_X,    KC_C,    KC_V,    KC_J
-
-#define ___CARPLAX_QGMLWY_R1___ KC_Y,    KC_F,    KC_U,    KC_B,    KC_SCLN
-#define ___CARPLAX_QGMLWY_R2___ KC_I,    KC_A,    KC_E,    KC_O,    KC_H
-#define ___CARPLAX_QGMLWY_R3___ KC_K,    KC_P,    KC_COMM, KC_DOT,  KC_SLSH
-
-#define ___CARPLAX_QGMLWY___ ___CARPLAX_QGMLWY_L1___, ___CARPLAX_QGMLWY_R1___, \
-        ___CARPLAX_QGMLWY_L2___, ___CARPLAX_QGMLWY_R2___,               \
-        ___CARPLAX_QGMLWY_L3___, ___CARPLAX_QGMLWY_R3___
-
-
-// BEPO Based Layouts.
-// Bepo, Dvorak and Beakl on fr-bepo software layer in the OS.
-// for dvorak and all the other qwerty like keyboards on bepo
-#define ___DVORAK_FR_L1___ DB_QUOT,    DB_COMM,  DB_DOT,  BP_P,  BP_Y
-#define ___DVORAK_FR_L2___ BP_A,       BP_O,     BP_E,    BP_U,  BP_I
-#define ___DVORAK_FR_L3___ DB_SCOLON,    BP_Q,     BP_J,    BP_K,  BP_X
-
-#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C,  BP_R,  BP_L
-#define ___DVORAK_FR_R2___ BP_D, BP_H, BP_T,  BP_N,  BP_S
-#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W,  BP_V,  BP_Z
-
-#define ___DVORAK_FR___ ___DVORAK_FR_L1___, ___DVORAK_FR_R1___, \
-        ___DVORAK_FR_L2___, ___DVORAK_FR_R2___,                 \
-        ___DVORAK_FR_L3___, ___DVORAK_FR_R3___
-
-/* BEAKL 15 (main layer): */
-
-#define ___DVORAK6_FR_L1___ DB_GRV,    ___DVORAK_FR_L1___
-#define ___DVORAK6_FR_L2___ TAB_BKTAB, ___DVORAK_FR_L2___
-#define ___DVORAK6_FR_L3___ ___,       ___DVORAK_FR_L3___
-
-#define ___DVORAK6_FR_R1___ ___DVORAK_FR_R1___,  BP_MIN
-#define ___DVORAK6_FR_R2___ ___DVORAK_FR_R2___,  BP_SLSH
-#define ___DVORAK6_FR_R3___ ___DVORAK_FR_R3___,  DB_BACKSLASH
-
-#define ___6DVORAK_FR___ ___6DVORAK_FR_L1___, ___6DVORAK_FR_R1___,      \
-        ___6DVORAK_FR_L2___, ___6DVORAK_FR_R2___,                       \
-        ___6DVORAK_FR_L3___, ___6DVORAK_FR_R3___
-
-// dont forget ; and -.  the 'a' home row is official placement.
-#define ___BEAKL15_FR_L1___          BP_Q, BP_H,     BP_O,    BP_U, BP_X
-#define ___BEAKL15_FR_L2___          BP_Y, BP_I,     BP_E,    BP_A, BB_DOT
-#define ___BEAKL15_FR_L2a___ BP_MIN, BP_Y, BP_I,     BP_E,    BP_A, BB_DOT
-#define ___BEAKL15_FR_L3___          BP_J, BP_SLSH, BB_COMM, BP_K, BB_QUOT
-
-#define ___BEAKL15_FR_R1___  BP_G, BP_C, BP_R, BP_F, BP_Z
-#define ___BEAKL15_FR_R2___  BP_D, BP_S, BP_T, BP_N, BP_B
-#define ___BEAKL15_FR_R2a___ BP_D, BP_S, BP_T, BP_N, BP_B, DB_SCLN
-#define ___BEAKL15_FR_R3___  BP_W, BP_M, BP_L, BP_P, BP_V
-
-#define ___6BEAKL15_FR___ ___, ___BEAKL15_FR_L1___, ___BEAKL15_FR_R1___, ___, \
-        ___BEAKL15_FR_L2a___, ___BEAKL15_FR_R2a___,                     \
-        ___, ___BEAKL15_FR_L3___, ___BEAKL15_FR_R3___, ___
-
-#define ___BEAKL15_FR___ ___BEAKL15_FR_L1___, ___BEAKL15_FR_R1___, \
-        ___BEAKL15_FR_L2___, ___BEAKL15_FR_R2___,                \
-        ___BEAKL15_FR_L3___, ___BEAKL15_FR_R3___
-
-#define ___BEPO_L1___             BP_B,    BP_EACU, BP_P,   BP_O,   BP_EGRV
-#define ___BEPO_L2___             BP_A,    BP_U,    BP_I,   BP_E,   BP_COMM
-#define ___BEPO_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y,    BP_X,   BP_DOT, BP_K
-
-#define ___BEPO_R1___  /* BP_DCRC,*/  BP_V,     BP_D,  BP_L,  BP_J,  BP_Z
-#define ___BEPO_R2___  /* BP_C,   */  BP_T,     BP_S,  BP_R,  BP_N,  BP_M  //BP_CCED
-#define ___BEPO_R3___                 BP_QUOT,  BP_Q,  BP_G,  BP_H,  BP_F //BP_SFT_T_W
-
-// Bepo for a 3x6 split.  CCED switched hands. :-(  'Altgr-c c'  does the same.
-// W has to drop down to the bottom. Silly unbalanced layout.
-#define ___BEPO6_L1___  BP_CCED,   ___BEPO_L1___
-#define ___BEPO6_L2___  TAB_BKTAB, ___BEPO_L2___
-#define ___BEPO6_L3___  BP_ECIR,   ___BEPO_L3___
-
-#define ___BEPO6_R1___   ___BEPO_R1___, BP_PERC
-#define ___BEPO6_R2___   ___BEPO_R2___,  BP_C
-#define ___BEPO6_R3___   ___BEPO_R3___, BP_W
-
-#define ___BEPO6___ ___BEPO6_L1___, ___BEPO6_R1___,  \
-        ___BEPO6_L2___, ___BEPO6_R2___,              \
-        ___BEPO6_L3___, ___BEPO6_R3___
-
-#define ___BEPO___ ___BEPO_L1___, ___BEPO_R1___,  \
-        ___BEPO_L2___, ___BEPO_R2___,             \
-        ___BEPO_L3___, ___BEPO_R3___
-
-
-/*******************************************************************/
-/** TOP ROWS  Func,Symbols, Numbers you find there.               **/
-/*******************************************************************/
-// for everything on qwerty.
-#define ___NUMBER_L___ KC_1,    KC_2,    KC_3,    KC_4,    KC_5
-#define ___NUMBER_R___ KC_6,    KC_7,    KC_8,    KC_9,    KC_0
-
-#define ___NUMBER_BEAKL15_L___ KC_4, KC_0, KC_1, KC_2, KC_3
-#define ___NUMBER_BEAKL15_R___ KC_7, KC_6, KC_5, KC_9, KC_8
-
-// a top symbol row if someone wants it.
-#define ___SYMB_L___   KC_EXLM,   KC_AT,    KC_HASH,  KC_DLR,   KC_PERC
-#define ___SYMB_R___   KC_CIRC,   KC_AMPR,  KC_ASTR,   KC_LPRN,  KC_RPRN
-
-/// BEPO ////
-// For numbers on bepo. Bepo has numbers on shifted keys, the
-// reverse of many layouts.
-#define ___NUMBER_BEPO_L___ DB_1,   DB_2,   DB_3,   DB_4,   DB_5
-#define ___NUMBER_BEPO_R___ DB_6,   DB_7,   DB_8,   DB_9,   DB_0
-
-// In case you want to try BEAKL 15 Numbers
-#define ___NUMBER_BEAKL15_BP_L___ DB_4, DB_0, DB_1, DB_2, DB_3
-#define ___NUMBER_BEAKL15_BP_R___ DB_7, DB_6, DB_5, DB_9, DB_8
-
-// The top row.  Bepo has symbols not numbers. Numbers are the shifted values.
-// There are actually 13 keys specified for bepo.
-#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQUO,  BP_LDAQ,   BP_RDAQ,   BP_LPRN,   BP_RPRN
-#define ___SYMBOL_BEPO_R___    BP_AT,    BP_PLUS,  BP_MINS,   BP_SLSH,  BP_ASTR /* BP_EQL,  BP_PERC */
-
-#define ___6SYMBOL_BEPO_L___  BP_DLR, ___SYMBOL_BEPO_L___
-#define ___6SYMBOL_BEPO_R___  ___SYMBOL_BEPO_R___, BP_EQL  /*  BP_PERC */
-
-// a top qwerty style symbol row if someone wants it.
-#define ___SYMB_L_FR___   DB_EXLM,   BP_AT,    BP_HASH,  BP_DLR,   BP_PERC
-#define ___SYMB_R_FR___   DB_CIRC,   BP_AMPR,  BP_ASTR,  BP_LPRN,  BP_RPRN
-
-
-// function key rows, works for everyone.
-#define ___FUNC_L___   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
-#define ___FUNC_R___   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
-
-#define ___FUNC_1_6___   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6
-#define ___FUNC_7_12___  KC_F7,   KC_F8,   KC_F9,   KC_F10, KC_F11, KC_F12
-
-#define ___FUNC_BEAKL_L___ KC_F4, KC_F10, KC_F1, KC_F2, KC_F3
-#define ___FUNC_BEAKL_R___ KC_F7, KC_F6, KC_F5, KC_F9, KC_F8
-
-#define ___12_FUNC_BEAKL___ KC_F11, ___FUNC_BEAKL_L___, ___FUNC_BEAKL_R___, KC_F12
-
-// Altogether. Defines all the various top rows that
-// are present with all these layouts.
-// All together as blocks of 10
-#define ___NUMS___      ___NUMBER_L___,         ___NUMBER_R___
-#define ___SYMS___      ___SYMB_L___,           ___SYMB_R___
-#define ___BKLNUMS___   ___NUMBER_BEAKL15_L___, ___NUMBER_BEAKL15_R___
-#define ___NUMS_BP___    ___NUMBER_BEPO_L___,    ___NUMBER_BEPO_R___
-#define ___SYMS_BEPO___ ___SYMBOL_BEPO_L___,    ___SYMBOL_BEPO_L___
-#define ___BKLNUMS_BP___  ___NUMBER_BEAKL15_BP_L___, ___NUMBER_BEAKL15_BP_R___
-#define ___FUNCS_1_10___ ___FUNC_L___, ___FUNC_R___
diff --git a/users/ericgebhart/defs/accented_keys.def b/users/ericgebhart/defs/accented_keys.def
new file mode 100644
index 0000000000..a0b203be93
--- /dev/null
+++ b/users/ericgebhart/defs/accented_keys.def
@@ -0,0 +1,101 @@
+// Accented keys.
+// add them to the custom keys enum.
+// List them here, with their keycode and the accent keycode
+// that are needed to create them.
+
+
+// Last, most frequent letters in french.
+// é is further up.
+// 24	x	3 588 990	0.38%
+// 25	j	3 276 064	0.34%
+// 26	è	2 969 466	0.31%
+// 27	à	2 966 029	0.31%
+// 28	k	2 747 547	0.29%
+// 29	w	1 653 435	0.17%
+// 30	z	1 433 913	0.15%
+// 31	ê	802 211	0.08%
+// 32	ç	544 509	0.06%
+// 33	ô	357 197	0.04%
+// 34	â	320 837	0.03%
+// 35	î	280 201	0.03%
+// 36	û	164 516	0.02%
+// 37	ù	151 236	0.02%
+// 38	ï	138 221	0.01%
+// 39	á	73 751	0.01%	 - absent.
+// 79	ü	55 172	0.01%
+// 82	ë	53 862	0.01%
+//absent.
+// 83	ö	51 020	0.01%
+// 84	í	48 391	0.01%
+
+ // ACCENT
+// Custom key code,  Keycode, altgr accent keycode.
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+ACCENTED(BP_OCIR, BP_O, BP_DCIR)
+ACCENTED(BP_ACIR, BP_A, BP_DCIR)
+ACCENTED(BP_ICIR, BP_I, BP_DCIR)
+ACCENTED(BP_UCIR, BP_U, BP_DCIR)
+//ACCENTED(BP_CCIR, BP_C, BP_DCIR)
+//ACCENTED(BP_GCIR, BP_G, BP_DCIR)
+//ACCENTED(BP_HCIR, BP_H, BP_DCIR)
+#endif
+
+ACCENTED(US_OCIR, US_O, US_DCIR)
+ACCENTED(US_ACIR, US_A, US_DCIR)
+ACCENTED(US_ICIR, US_I, US_DCIR)
+ACCENTED(US_UCIR, US_U, US_DCIR)
+ACCENTED(US_ECIR, US_E, US_DCIR)
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+ACCENTED(BP_AACU, BP_A, BP_ACUT)
+ACCENTED(BP_OACU, BP_O, BP_ACUT)
+ACCENTED(BP_IACU, BP_I, BP_ACUT)
+ACCENTED(BP_UACU, BP_U, BP_ACUT)
+
+//ACCENTED(BP_OGRV, BP_O, BP_DGRV)
+ACCENTED(BP_IGRV, BP_I, BP_DGRV)
+#endif
+
+ACCENTED(US_IGRV, US_I, US_DGRV)
+ACCENTED(US_UGRV, US_U, US_DGRV)
+ACCENTED(US_EGRV, US_E, US_DGRV)
+ACCENTED(US_AGRV, US_A, US_DGRV)
+
+// ACCENTED(BP_NTIL, BP_N, BP_DTIL)
+// ACCENTED(BP_ATIL, BP_A, BP_DTIL)
+// ACCENTED(BP_OTIL, BP_O, BP_DTIL)
+// ACCENTED(BP_UTIL, BP_U, BP_DTIL)
+
+ACCENTED(US_IIAE, US_I, US_DIAE)
+ACCENTED(US_UIAE, US_U, US_DIAE)
+ACCENTED(US_EIAE, US_E, US_DIAE)
+ACCENTED(US_OIAE, US_O, US_DIAE)
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+ACCENTED(BP_IIAE, BP_I, BP_DIAE)
+ACCENTED(BP_UIAE, BP_U, BP_DIAE)
+ACCENTED(BP_EIAE, BP_E, BP_DIAE)
+ACCENTED(BP_OIAE, BP_O, BP_DIAE)
+// ACCENTED(BP_AIAE, BP_A, BP_DIAE)
+#endif
+
+  // ACCENTED(E_ACUTE, SK_E, SK_ACUT)
+  // ACCENTED(R_ACUTE, SK_R, SK_ACUT)
+  // ACCENTED(U_ACUTE, SK_U, SK_ACUT)
+  // ACCENTED(I_ACUTE, SK_I, SK_ACUT)
+  // ACCENTED(O_ACUTE, SK_O, SK_ACUT)
+  // ACCENTED(A_ACUTE, SK_A, SK_ACUT)
+  // ACCENTED(L_ACUTE, SK_L, SK_ACUT)
+  // ACCENTED(Y_ACUTE, SK_Z, SK_ACUT)
+  // ACCENTED(T_CARON, SK_T, SK_CARN)
+  // ACCENTED(Z_CARON, SK_Y, SK_CARN)
+  // ACCENTED(O_CARON, SK_O, SK_CARN)
+  // ACCENTED(S_CARON, SK_S, SK_CARN)
+  // ACCENTED(D_CARON, SK_D, SK_CARN)
+  // ACCENTED(L_CARON, SK_L, SK_CARN)
+  // ACCENTED(C_CARON, SK_C, SK_CARN)
+  // ACCENTED(N_CARON, SK_N, SK_CARN)
+  // ACCENTED(U_UMLAU, SK_U, SK_DIAE
+  // ACCENTED(O_UMLAU,SK_O, SK_DIAE)
+  // // napis o s vokanom cez vokan rather than normalne aby sa dalo velke uo
+  // ACCENTED(O_CCIRC, SK_O, SK_CIRC)
diff --git a/users/ericgebhart/defs/alt_shift.def b/users/ericgebhart/defs/alt_shift.def
new file mode 100644
index 0000000000..52d9cf11f4
--- /dev/null
+++ b/users/ericgebhart/defs/alt_shift.def
@@ -0,0 +1,6 @@
+// alt shift. Give an existing key code,
+// and maybe an alternate shift keycode.
+
+ALT_SHIFT(US_EXLM, US_PERC)
+SHIFT_FOR_2(US_AT)
+SHIFT_FOR_3(US_DLR)
diff --git a/users/ericgebhart/defs/altlocal_keys.def b/users/ericgebhart/defs/altlocal_keys.def
new file mode 100644
index 0000000000..20d1e99b40
--- /dev/null
+++ b/users/ericgebhart/defs/altlocal_keys.def
@@ -0,0 +1,208 @@
+// These are to create keys which don't exist in a locale.
+// so that we can create alternate maps to qwerty, azerty, or whatever.
+// Key name,
+// unshifted key and it's required mods.
+// the desired shifted keys and it's required mods.
+
+// for dvorak on bepo
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+  MK_KEY(BP_DV_1,    BP_DQUO, MOD_LSFT,      BP_DCIR, MOD_LSFT)
+  MK_KEY(BP_DV_2,    BP_LDAQ, MOD_LSFT,      BP_AT, MOD_NONE)
+  MK_KEY(BP_DV_3,    BP_RDAQ, MOD_LSFT,      BP_DLR, MOD_LSFT)
+  MK_KEY(BP_DV_4,    BP_LPRN, MOD_LSFT,      BP_DLR, MOD_NONE)
+  MK_KEY(BP_DV_5,    BP_RPRN, MOD_LSFT,      BP_PERC, MOD_NONE)
+  MK_KEY(BP_DV_6,    BP_AT, MOD_LSFT,        BP_AT, MOD_BIT(KC_RALT))
+  MK_KEY(BP_DV_7,    BP_PLUS, MOD_LSFT,      BP_P, MOD_BIT(KC_RALT))
+  MK_KEY(BP_DV_8,    BP_MINS, MOD_LSFT,      BP_ASTR, MOD_NONE)
+  MK_KEY(BP_DV_9,    BP_SLSH, MOD_LSFT,      BP_LPRN, MOD_NONE)
+  MK_KEY(BP_DV_0,    BP_ASTR, MOD_LSFT,      BP_RPRN, MOD_NONE)
+
+  MK_KEY(BP_DV_GRV,  BP_PERC, MOD_LSFT,      BP_K, MOD_BIT(KC_RALT))
+  MK_KEY(BP_DV_SCLN, BP_COMM, MOD_LSFT,      BP_DOT, MOD_LSFT)
+  MK_KEY(BP_DV_SLSH, BP_SLSH, MOD_NONE,     BP_QUOT, MOD_LSFT)
+  //MK_KEY(BP_DV_BSLS, BP_AGRV, MOD_BIT(KC_RALT), BP_B, MOD_BIT(KC_RALT))
+  MK_KEY(BP_DV_EQL,  BP_EQL, MOD_NONE,       BP_PLUS, MOD_NONE)
+  MK_KEY(BP_DV_COMM, BP_COMM, MOD_NONE,      BP_LDAQ, MOD_BIT(KC_RALT))
+  MK_KEY(BP_DV_DOT,  BP_DOT, MOD_NONE,       BP_RDAQ, MOD_BIT(KC_RALT))
+  MK_KEY(BP_DV_QUOT, BP_QUOT, MOD_NONE,      BP_DQUO, MOD_NONE)
+  MK_KEY(BP_DV_MINS, BP_MINS, MOD_NONE,      KC_SPC, MOD_BIT(KC_RALT))
+#endif
+
+#if defined(BEAKL15_LAYER_ENABLE) || defined(BEAKL19_LAYER_ENABLE)
+  // Keys for BEAKL 15, 19 on Qwerty
+  MK_KEY(KC_BK_DOT,  KC_DOT, MOD_NONE,    KC_2, MOD_LSFT)
+  MK_KEY(KC_BK_COMM, KC_COMM, MOD_NONE,  KC_1, MOD_LSFT)
+  MK_KEY(KC_BK_QUOT, KC_QUOT, MOD_NONE,   KC_GRV, MOD_NONE)
+
+  MK_KEY(US_BK_DOT,  KC_DOT, MOD_NONE,    KC_2, MOD_LSFT)
+  MK_KEY(US_BK_COMM, KC_COMM, MOD_NONE,  KC_1, MOD_LSFT)
+  MK_KEY(US_BK_QUOT, KC_QUOT, MOD_NONE,   KC_GRV, MOD_NONE)
+
+  // Keys for BEAKL WI on Qwerty
+  MK_KEY(KC_BKW_DOT,  KC_DOT, MOD_NONE,   KC_GRV, MOD_NONE)
+  MK_KEY(KC_BKW_COMM, KC_COMM, MOD_NONE,  KC_TILD, MOD_NONE)
+  MK_KEY(KC_BKW_COLN, KC_SCLN, MOD_LSFT,  KC_SCLN, MOD_NONE)
+
+#  if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
+  // Keys for BEAKL on BEPO
+  MK_KEY(BP_BK_DOT,  BP_DOT, MOD_NONE,    BP_AT, MOD_NONE)
+  MK_KEY(BP_BK_COMM, BP_COMM, MOD_NONE,   BP_EXLM, MOD_NONE)
+  MK_KEY(BP_BK_QUOT, BP_QUOT, MOD_NONE,   BP_PERC, MOD_LSFT)
+
+
+#    ifdef BEAKLWI_LAYER_ENABLE
+  // Keys for BEAKL WI on BEPO
+  MK_KEY(BP_BKW_DOT,  BP_DOT, MOD_NONE,   BP_GRV, MOD_NONE)
+  MK_KEY(BP_BKW_COMM, BP_COMM, MOD_NONE,  BP_TILD, MOD_NONE)
+  MK_KEY(BP_BKW_COLN, BP_COLN, MOD_LSFT,  BP_SCLN, MOD_NONE)
+#    endif
+
+  // Keys for BEAKL 27 on BEPO
+#    ifdef BEAKL27_LAYER_ENABLE
+  MK_KEY(BP_BK2_DOT,  BP_DOT, MOD_NONE,    BP_GRV, MOD_NONE)
+  MK_KEY(BP_BK2_COMM, BP_COMM, MOD_NONE,   BP_QUES, MOD_NONE)
+  MK_KEY(BP_BK2_EXLM, BP_EXLM, MOD_NONE,   BP_PERC, MOD_LSFT)
+  MK_KEY(BP_BK2_QUOT, BP_QUOT, MOD_NONE,   BP_QUOT, MOD_NONE)
+#    endif
+#  endif
+#endif
+
+#ifdef BEAKL27_LAYER_ENABLE
+  // Keys for BEAKL 27 on Qwerty
+  /* // altered shifted pairs: dot = .`  comma = ,?   dquot = "! */
+  MK_KEY(KC_BK2_DOT, KC_DOT, MOD_NONE,    KC_GRV, MOD_NONE)
+  MK_KEY(KC_BK2_COMM, KC_COMM, MOD_NONE,  KC_QUES, MOD_NONE)
+  MK_KEY(KC_BK2_EXLM, KC_EXLM, MOD_NONE,   KC_DQUO, MOD_NONE)
+  MK_KEY(KC_BK2_QUOT, KC_QUOT, MOD_NONE,   KC_QUOT, MOD_NONE)
+
+  MK_KEY(US_BK2_DOT, US_DOT, MOD_NONE,    US_GRV, MOD_NONE)
+  MK_KEY(US_BK2_COMM, US_COMM, MOD_NONE,  US_QUES, MOD_NONE)
+  MK_KEY(US_BK2_EXLM, US_EXLM, MOD_NONE,   US_DQUO, MOD_NONE)
+  MK_KEY(US_BK2_QUOT, US_QUOT, MOD_NONE,   US_QUOT, MOD_NONE)
+#endif
+
+
+// shifted pairs: dot = .` comma = ,~  colon = :;
+
+#if defined(HD_NEU_LAYER_ENABLE) ||        \
+    defined(HD_NEU_NARROW_LAYER_ENABLE) || \
+    defined(HD_GOLD_LAYER_ENABLE) ||       \
+    defined(HD_SILVER_LAYER_ENABLE) ||     \
+    defined(HD_BRONZE_LAYER_ENABLE) ||     \
+    defined(HD_PLATINUM_LAYER_ENABLE) ||   \
+    defined(HD_REF_LAYER_ENABLE)
+
+// hands down alterations.
+/* alt shifts   ;: .& /\* '? "! ,| -+ */
+// for en qwerty
+  MK_KEY(KC_HD_DQUO, KC_QUOT, MOD_LSFT, KC_1,     MOD_LSFT) // "!
+  MK_KEY(KC_HD_QUOT, KC_QUOT, MOD_NONE, KC_SLSH,  MOD_LSFT) // '?
+
+  MK_KEY(KC_HD_DOT,  KC_DOT,  MOD_NONE, KC_7,     MOD_LSFT) // .&
+  MK_KEY(KC_HD_SCLN, KC_SCLN, MOD_NONE, KC_SCLN,     MOD_LSFT) // ;:
+  MK_KEY(KC_HD_COMM, KC_COMM, MOD_NONE, KC_BSLS,  MOD_LSFT) // ,|
+  MK_KEY(KC_HD_MINS, KC_MINS, MOD_NONE, KC_EQL, MOD_LSFT) // -+
+  MK_KEY(KC_HD_SLSH, KC_SLSH, MOD_NONE, KC_8,     MOD_LSFT) // /*
+
+  // for us international
+  MK_KEY(US_HD_DQUO, US_QUOT, MOD_LSFT, US_1,     MOD_LSFT)
+  MK_KEY(US_HD_QUOT, US_QUOT, MOD_NONE, KC_SLSH,  MOD_LSFT)
+
+  MK_KEY(US_HD_DOT,  US_DOT,  MOD_NONE, US_7,     MOD_LSFT)
+  MK_KEY(US_HD_SCLN, KC_SCLN, MOD_NONE, KC_SCLN,  MOD_LSFT) // ;:
+  MK_KEY(US_HD_COMM, US_COMM, MOD_NONE, US_BSLS,  MOD_LSFT)
+  MK_KEY(US_HD_MINS, US_MINS, MOD_NONE, US_EQL, MOD_LSFT)
+  MK_KEY(US_HD_SLSH, US_SLSH, MOD_NONE, US_8,     MOD_LSFT)
+
+// for bepo
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
+  MK_KEY(BP_HD_DQUO, BP_DQUO, MOD_NONE, BP_QUES, MOD_NONE)
+  MK_KEY(BP_HD_QUOT, BP_QUOT, MOD_NONE, BP_EXLM, MOD_NONE)
+  MK_KEY(BP_HD_SCLN, BP_SCLN, MOD_NONE, BP_COLN, MOD_NONE) // ;:
+
+  MK_KEY(BP_HD_DOT,  BP_DOT,  MOD_NONE, BP_AMPR, MOD_NONE)
+  MK_KEY(BP_HD_COMM, BP_COMM, MOD_NONE, BP_PIPE, MOD_NONE)
+  MK_KEY(BP_HD_MINS, BP_MINS, MOD_NONE, BP_PLUS, MOD_NONE)
+  MK_KEY(BP_HD_SLSH, BP_SLSH, MOD_NONE, BP_ASTR, MOD_NONE)
+#endif
+
+#endif
+
+
+/* alt shifts   ;: .& /\* '? "! ,| -+  */
+#ifdef HD_DASH_LAYER_ENABLE
+// DASH and Elan have these reversed from the metals.
+/* //alt shift keys. "? '! */
+  MK_KEY(KC_HD_D_DQUO, KC_DQUO, MOD_NONE, KC_SLSH, MOD_LSFT) // "?
+  MK_KEY(KC_HD_D_QUOT, KC_QUOT, MOD_NONE, KC_1,    MOD_LSFT) // '!
+
+  MK_KEY(KC_HD_D_DOT,  KC_DOT,  MOD_NONE, KC_7,     MOD_LSFT) // .&
+  MK_KEY(KC_HD_D_COMM, KC_COMM, MOD_NONE, KC_BSLS,  MOD_LSFT) // ,|
+  MK_KEY(KC_HD_D_MINS, KC_MINS, MOD_NONE, KC_EQL, MOD_LSFT) // -+
+  MK_KEY(KC_HD_D_SLSH, KC_SLSH, MOD_NONE, KC_8,     MOD_LSFT) // /*
+
+  // for us international
+  MK_KEY(US_HD_D_DQUO, US_QUOT, MOD_LSFT, KC_SLSH,  MOD_LSFT)
+  MK_KEY(US_HD_D_QUOT, US_QUOT, MOD_NONE, US_1,     MOD_LSFT)
+
+  MK_KEY(US_HD_D_DOT,  US_DOT,  MOD_NONE, US_7,     MOD_LSFT)
+  MK_KEY(US_HD_D_COMM, US_COMM, MOD_NONE, US_BSLS,  MOD_LSFT)
+  MK_KEY(US_HD_D_MINS, US_MINS, MOD_NONE, US_EQL, MOD_LSFT)
+  MK_KEY(US_HD_D_SLSH, US_SLSH, MOD_NONE, US_8,     MOD_LSFT)
+
+// for bepo
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
+  MK_KEY(BP_HD_D_DQUO, BP_DQUO, MOD_NONE, BP_QUES, MOD_NONE)
+  MK_KEY(BP_HD_D_QUOT, BP_QUOT, MOD_NONE, BP_EXLM, MOD_NONE)
+
+  MK_KEY(BP_HD_D_DOT,  BP_DOT,  MOD_NONE, BP_AMPR, MOD_NONE)
+  MK_KEY(BP_HD_D_COMM, BP_COMM, MOD_NONE, BP_PIPE, MOD_NONE)
+  MK_KEY(BP_HD_D_MINS, BP_MINS, MOD_NONE, BP_PLUS, MOD_NONE)
+  MK_KEY(BP_HD_D_SLSH, BP_SLSH, MOD_NONE, BP_ASTR, MOD_NONE)
+#endif
+
+#endif
+
+#ifdef HD_ELAN_LAYER_ENABLE
+// Elan has alt shift of comma and dot on the thumb.
+// en
+  MK_KEY(KC_HD_E_DQUO, KC_QUOT, MOD_LSFT, KC_SLSH, MOD_LSFT)
+  MK_KEY(KC_HD_E_QUOT, KC_QUOT, MOD_NONE, KC_1, MOD_LSFT)
+// the rest is the same
+  MK_KEY(KC_HD_E_MINS,    KC_MINS, MOD_NONE, KC_EQL, MOD_LSFT) // -+
+  MK_KEY(KC_HD_E_SLSH,    KC_SLSH, MOD_NONE, KC_8,     MOD_LSFT) // /*
+// until .: and ,;
+  MK_KEY(KC_HD_E_DOT,   KC_DOT,  MOD_NONE, KC_SCLN, MOD_LSFT) // .:
+  MK_SKEY(KC_HD_E_COMM, KC_COMM, KC_SCLN) // ,;
+/* (< {[ */
+  MK_KEY(KC_HD_E_LPRN, KC_LPRN, MOD_NONE, KC_COMM, MOD_LSFT)
+  MK_KEY(KC_HD_E_LCBR, KC_LCBR, MOD_NONE, KC_LBRC, MOD_NONE )
+
+// US-intl
+  MK_KEY(US_HD_E_DQUO, US_QUOT, MOD_LSFT, KC_SLSH, MOD_LSFT)
+  MK_KEY(US_HD_E_QUOT, US_QUOT, MOD_NONE, US_1, MOD_LSFT)
+// the rest is the same
+  MK_KEY(US_HD_E_MINS,    US_MINS, MOD_NONE, US_EQL, MOD_LSFT) // -+
+  MK_KEY(US_HD_E_SLSH,    US_SLSH, MOD_NONE, US_8,     MOD_LSFT) // /*
+// until .: and ,;
+  MK_KEY(US_HD_E_DOT,   KC_DOT,  MOD_NONE, US_SCLN, MOD_LSFT) // .:
+  MK_SKEY(US_HD_E_COMM, US_COMM, US_SCLN) // ,;
+/* (< {[ */
+  MK_KEY(US_HD_E_LPRN, US_LPRN, MOD_NONE, US_COMM, MOD_LSFT)
+  MK_KEY(US_HD_E_LCBR, US_LCBR, MOD_NONE, US_LBRC, MOD_NONE )
+
+// bepo
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
+  MK_KEY(BP_HD_E_DQUO, BP_DQUO, MOD_NONE, BP_SLSH, MOD_NONE)
+  MK_KEY(BP_HD_E_QUOT, BP_QUOT, MOD_NONE, BP_EXLM, MOD_NONE)
+// the rest is the same
+  MK_KEY(BP_HD_E_MINS,    BP_MINS, MOD_NONE,   BP_EQL, MOD_NONE) // -+
+  MK_KEY(BP_HD_E_SLSH,    BP_SLSH, MOD_NONE,   BP_ASTR,  MOD_NONE) // /*
+// until .: and ,;
+  MK_KEY(BP_HD_E_DOT,   KC_DOT,  MOD_NONE, BP_SCLN, MOD_LSFT) // .:
+  MK_SKEY(BP_HD_E_COMM, BP_COMM, BP_SCLN) // ,;
+/* (< {[ */
+  MK_KEY(BP_HD_E_LPRN, BP_LPRN, MOD_NONE, BP_COMM, MOD_LSFT)
+  MK_KEY(BP_HD_E_LCBR, BP_LCBR, MOD_NONE, BP_LBRC, MOD_NONE )
+#endif
+#endif
diff --git a/users/ericgebhart/defs/combos.def b/users/ericgebhart/defs/combos.def
new file mode 100644
index 0000000000..85b5d2d588
--- /dev/null
+++ b/users/ericgebhart/defs/combos.def
@@ -0,0 +1,139 @@
+// Per layer combo reference layers.
+// Default is current layer, or COMBO_REF_DEFAULT if set.
+// _COMBO_REF is the default if enabled.
+
+//COMBO_REF_LAYER(_DVORAK_BP, _COMBO_REF2)
+COMBO_REF_LAYER(_NAV, _NAV)
+
+
+// COMBOS
+//   name      result           chord keys
+
+// sml nav, sml keypad, zqxj, onshot accents, oneshot symbols
+// home, end, caps word, accents? -> aeeecio oe, ao,
+
+
+// reference COMBO_REF
+COMB(TSCTL,      TS_LCTL,       CB_1L3, CB_1L4)
+COMB(SMLNAV1,    SML_NAV,       CB_1L2, CB_1L3)
+COMB(OSACCENTMT, SML_KEYPAD,    CB_1L2, CB_1R4)
+
+#ifdef TOPROWS_LAYER_ENABLE
+COMB(OSTOPROWS,  SML_TOPROWS,   CB_1L3, CB_1R3)
+#endif
+
+//COMB(OSlsftT,    OS_LSFT,       CB_1L4, CB_1R2)
+COMB(OSSFT,      OS_LSFT,        CB_2L4, CB_2R2)
+COMB(TSCTL2,     TS_LCTL,       CB_1L4, CB_1R2)
+
+// COMB(SMLNAV,  SML_NAV,        CB_2L4, CB_2R2)
+COMB(OSCTL,      OS_LCTL,        CB_2L2, CB_2R4)
+
+COMB(OSACCENTM, OSL_ACCENTS_MORTE,  CB_2L3, CB_2R3)
+
+COMB(capsword,  CAPS_WORD,      CB_3L4, CB_3R2)
+COMB(OSRALT,    OS_RALT,        CB_3L3, CB_3R3)
+COMB(OSLALT2,   OS_LALT,        CB_3L2, CB_3R4)
+
+COMB(OSLAYER,   LAYER_OSL,      CB_3L1, CB_3R5)
+COMB(OSLSYMB,   OSL_SYMB,       CB_TH2, CB_TH5)
+COMB(LNAV,      SML_NAV,        CB_TH3, CB_TH4)
+
+COMB(_Q,  KC_Q, CB_3L2, CB_3L3)
+COMB(_X,  KC_X, CB_3L3, CB_3L4)
+COMB(_Z,  KC_Z, CB_3R3, CB_3R4)
+
+// vertical thumb combos for the kyria
+//COMB(xxx,      xxx,            CB_TH2, CB_0TH1)
+
+#ifdef MEDIA_LAYER_ENABLE
+COMB(SMLMEDIA,      SML_MEDIA,            CB_TH3, CB_0TH2)
+#endif
+
+COMB(OSLACCENT2,    OSL_ACCENTS_MORTE,        CB_TH4, CB_0TH3)
+COMB(KEYPAD,   SML_KEYPAD,     CB_TH5, CB_0TH4)
+
+
+
+// reference COMBO_REF2
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+COMB(TSCTL_BP,     TS_LCTL,        CB_1L3, CB_1L4)
+COMB(SMLNAV1_bp,   SML_NAV,        CB_1L2, CB_1L3)
+
+#ifdef ACCENTS_MORTE_LAYER_ENABLE
+COMB(OSLACCENT_bp, OSL(_ACCENTS_MORTE_BP),  CB2_2L1, CB2_2L2)
+#endif
+
+COMB(SMLNAV_BP,    SML_NAV,        CB2_2L2, CB2_2L3)
+COMB(OSCTL_BP,     OS_LCTL,        CB2_2L3, CB2_2L4)
+
+COMB(OSSFT_BP,     OS_LSFT,        CB2_2R2, CB2_2R3)
+// COMB(SMLKEYPAD_BP, SML_KEYPAD_BP,  CB2_2R3, CB2_2R4)
+
+COMB(capsword_BP,  CAPS_WORD_ON,   CB2_3L4, CB2_3R2)
+
+// COMB(OSLSYMBP_BP,  OSL(_SYMB_BP),  CB2_TH2, CB2_TH5)
+COMB(LNAV_BP,      SML_NAV,        CB2_TH3, CB2_TH4)
+
+COMB(_Qbp,  BP_Q, CB2_3L2, CB2_3L3)
+COMB(_Xbp,  BP_X, CB2_3L3, CB2_3L4)
+COMB(_Zbp,  BP_Z, CB2_3R3, CB2_3R4)
+#endif
+
+
+// Reference nav layer
+COMB(END_nav,   KC_END,  KC_PGUP, KC_PGDN)
+COMB(HOME_nav,  KC_HOME, KC_UP,   KC_DOWN)
+
+
+//COMB(JKL_SPC,  KC_SPC,   KC_J,  KC_X)
+//SUBS(TH_THE,   "the",    KC_T,  KC_H) // SUBS uses SEND_STRING to output the given string.
+
+// from possum vibes to review.
+/*    COMBO NAME       | OUTPUT    | PARAMS    */
+
+// /*---- TOP ROW ----*/
+// COMB(turbonav,          NAV_TG,     KC_W, KC_R)         // Nav access
+// COMB(save,              S_SAVE,     KC_E, KC_R)         // Save
+// COMB(back_fwd,          BCK_FWD,    KC_R, KC_T)         // Back/Fwd (shifted)
+
+// COMB(undo_redo,         UND_RED,    KC_Y, KC_U)         // Undo/Redo (shifted)
+// COMB(esc,               KC_ESC,     KC_U, KC_O)         // Esc
+
+// #ifdef IS_PINKY_CLUSTER
+// COMB(delete,            KC_DEL,     KC_A, KC_SCLN)
+// COMB(caps,              KC_CAPS,    KC_Q, KC_P)
+// #endif
+
+// /*---- HOME ROW ----*/
+// COMB(cut,               S_CUT,      KC_S, KC_F)         // Shift+Del (cut)
+// COMB(copy,              S_COPY,     KC_S, KC_D)         // Ctrl+Ins (copy)
+// COMB(paste,             S_PASTE,    KC_D, KC_F)         // Shift+Del (paste)
+// COMB(panic,             PANIC,      KC_D, KC_K)         // panic!
+
+// COMB(nummode,           NUMMODE,    KC_J, KC_K)         // Nummode toggle
+// COMB(symmode,           SYM_TG,     KC_K, KC_L)         // Sym layer
+// COMB(tab,               KC_TAB,     KC_K, KC_M)         // Tab
+
+
+// /*---- BOTTOM ROW ----*/
+// COMB(hash,              KC_HASH,    KC_X, KC_C)         // #
+// COMB(fslash,            KC_SLSH,    KC_C, KC_V)         // /
+
+// COMB(dash,              KC_MINS,    KC_M, KC_COMM)      // -
+// COMB(asterisk,          KC_ASTR,    KC_COMM, KC_DOT)    // *
+// COMB(at,                KC_AT,      KC_M, KC_DOT)       // @
+
+
+// /*---- THUMBS ----*/
+// COMB(sys_lthm,          SYS_OSL,    KC_B, KC_ENT)       // Sys OSL
+
+// COMB(space_shift,       SPC_SFT,    KC_TAB, KC_SPC)     // space and activate oss
+
+// COMB(underscore_rthm,   KC_UNDS,    KC_SPC, KC_N)       // _
+
+// /*---- THUMB+ALPHAS ----*/
+// // COMB(os_fun,            FUN_OSL,    KC_ENT, KC_C)       // OS Func
+// // COMB(os_num,            NUM_OSL,    KC_A, KC_F)         // OSL num
+// // COMB(os_sym,            SYM_OSL,    KC_SPC, KC_M)       // OSL sym
diff --git a/users/ericgebhart/defs/custom_keys.def b/users/ericgebhart/defs/custom_keys.def
new file mode 100644
index 0000000000..075b7de0c1
--- /dev/null
+++ b/users/ericgebhart/defs/custom_keys.def
@@ -0,0 +1,86 @@
+// custom key codes.
+  EPRM,
+  //VRSN,
+  CAPS_WORD_ON,
+
+  // LAYERStuff.
+  KC_NEXT_LOCALE,
+  KC_NEXT_BASE_LAYER,
+  KC_SET_BASE,
+  // Misc.
+  KC_MAKE,
+  KC_RESET,
+  KC_RGB_T,
+  RGB_IDL,
+  KC_SECRET_1,
+  KC_SECRET_2,
+  KC_SECRET_3,
+  KC_SECRET_4,
+  KC_SECRET_5,
+
+  KC_SPACETEST,
+
+  /// Need to evaluate which to keep.
+  BCK_FWD,  // Alt left and right
+  CLEAR,    // Clears all mods, does not change layers.
+  LOCKSCR,  // locks screen per is_windows value
+  PANIC,    // Clears all One-Shot keys and returns to base layer.
+  UND_RED,  // Ctrl Z and Y
+
+  // macros
+  QMKCOMP,  // qmk compile
+  QMKFLSH,  // qmk flash
+
+  // Swapper keys - just the swapper key, maybe gets reused.
+  SW_REV,  // Dead key, reverse direction for swapper
+
+// for the combo ref layers.
+  CB_0M1, CB_0M2, CB_0M3,
+  CB_1M1, CB_1M2, CB_1M3,
+  CB_2M1, CB_2M2, CB_2M3,
+  CB_3M1, CB_3M2, CB_3M3,
+  CB_4M1, CB_4M2, CB_4M3, CB_4M4, CB_4M5,
+
+  CB_1,  CB_2, CB_3, CB_4, CB_5, CB_6, CB_7, CB_8, CB_9, CB_0,
+
+  CB_1R1, CB_1R2, CB_1R3, CB_1R4, CB_1R5,
+  CB_1L1, CB_1L2, CB_1L3, CB_1L4, CB_1L5,
+  CB_2R1, CB_2R2, CB_2R3, CB_2R4, CB_2R5,
+  CB_2L1, CB_2L2, CB_2L3, CB_2L4, CB_2L5,
+  CB_3R1, CB_3R2, CB_3R3, CB_3R4, CB_3R5,
+  CB_3L1, CB_3L2, CB_3L3, CB_3L4, CB_3L5,
+  CB_4L1, CB_4L2, CB_4L3, CB_4L4, CB_4L5,
+  CB_4R1, CB_4R2, CB_4R3, CB_4R4, CB_4R5,
+
+  CB2_0M1, CB2_0M2, CB2_0M3,
+  CB2_1M1, CB2_1M2, CB2_1M3,
+  CB2_2M1, CB2_2M2, CB2_2M3,
+  CB2_3M1, CB2_3M2, CB2_3M3,
+  CB2_4M1, CB2_4M2, CB2_4M3, CB2_4M4, CB2_4M5,
+
+  CB2_1, CB2_2, CB2_3, CB2_4, CB2_5, CB2_6, CB2_7, CB2_8, CB2_9, CB2_0,
+
+  CB2_1R1, CB2_1R2, CB2_1R3, CB2_1R4, CB2_1R5,
+  CB2_1L1, CB2_1L2, CB2_1L3, CB2_1L4, CB2_1L5,
+  CB2_2R1, CB2_2R2, CB2_2R3, CB2_2R4, CB2_2R5,
+  CB2_2L1, CB2_2L2, CB2_2L3, CB2_2L4, CB2_2L5,
+  CB2_3R1, CB2_3R2, CB2_3R3, CB2_3R4, CB2_3R5,
+  CB2_3L1, CB2_3L2, CB2_3L3, CB2_3L4, CB2_3L5,
+  CB2_4L1, CB2_4L2, CB2_4L3, CB2_4L4, CB2_4L5,
+  CB2_4R1, CB2_4R2, CB2_4R3, CB2_4R4, CB2_4R5,
+
+// core 6 thumb keys for combo reference layer
+ CB_TH1, CB_TH2, CB_TH3, CB_TH4, CB_TH5, CB_TH6,
+ CB2_TH1, CB2_TH2, CB2_TH3, CB2_TH4, CB2_TH5, CB2_TH6,
+ CB_1TH1,  CB_1TH2, CB_1TH3, CB_1TH4, CB_1TH5, CB_1TH6,
+ CB2_1TH1, CB2_1TH2, CB2_1TH3, CB2_1TH4, CB2_1TH5, CB2_1TH6,
+
+ // for the extra thumb keys on the kyria
+ CB_0TH1 , CB_0TH2, CB_0TH3, CB_0TH4,
+ CB_THA, CB_THB, CB_THC, CB_THD,
+
+// edge keys for the combo reference layer
+ L0_CB, L1_CB, L2_CB, L3_CB,
+ R0_CB, R1_CB, R2_CB, R3_CB,
+ L0_CB2, L1_CB2, L2_CB2, L3_CB2,
+ R0_CB2, R1_CB2, R2_CB2, R3_CB2,
diff --git a/users/ericgebhart/defs/encoders.def b/users/ericgebhart/defs/encoders.def
new file mode 100644
index 0000000000..638d3fbf4b
--- /dev/null
+++ b/users/ericgebhart/defs/encoders.def
@@ -0,0 +1,65 @@
+// Layer/none, encoder index 0/1, CW_KC, CCW_KC, Qualifying mod or none
+// LAYER_NONE and MOD_NONE for a single use.
+// LEFT and RIGHT for index. 0 and 1...
+
+// default encoders, all layers no mods.
+ENCODER_ACTION(LAYER_NONE, RIGHT,  KC_PGDN, KC_PGUP, MOD_NONE)
+ENCODER_ACTION(LAYER_NONE, LEFT,   KC_DOWN, KC_UP,   MOD_NONE)
+ENCODER_ACTION(LAYER_NONE, LEFT,   KC_PGDN, KC_PGUP, MOD_LSFT)
+
+// Symbol layer encoders.
+// left and right.
+ENCODER_ACTION(_SYMB_EN, LEFT, KC_LEFT,       KC_RIGHT,       MOD_NONE)
+// word left or right.
+ENCODER_ACTION(_SYMB_EN, LEFT, LCTL(KC_LEFT), LCTL(KC_RIGHT), MOD_NONE)
+
+// Nav layer encoders.
+ENCODER_ACTION(_NAV, LEFT, KC_TAB,  S(KC_TAB), MOD_NONE)
+ENCODER_ACTION(_NAV, RIGHT, A(KC_TAB),  A(S(KC_TAB)), MOD_NONE)
+ENCODER_ACTION(_NAV, RIGHT, KC_VOLU, KC_VOLD,   MOD_NONE)
+
+// RGB functions for the RGB layer.
+#ifdef RGB_MATRIX_ENABLE
+    ENCODER_FUNCTION(_RGB, LEFT,
+                rgb_matrix_increase_speed_noeeprom,
+                rgb_matrix_decrease_speed_noeeprom, MOD_NONE)
+
+    ENCODER_FUNCTION(_RGB, RIGHT,
+                rgb_matrix_increase_hue_noeeprom,
+                rgb_matrix_decrease_hue_noeeprom, MOD_NONE)
+
+    ENCODER_FUNCTION(_RGB, LEFT,
+                rgb_matrix_increase_sat_noeeprom,
+                rgb_matrix_decrease_sat_noeeprom, MOD_LSFT)
+
+    ENCODER_FUNCTION(_RGB, RIGHT,
+                rgb_matrix_increase_val_noeeprom,
+                rgb_matrix_decrease_val_noeeprom, MOD_LSFT)
+
+    ENCODER_FUNCTION(_RGB, LEFT,
+                rgb_matrix_step_noeeprom;
+                rgb_matrix_step_reverse_noeeprom, MOD_LCTL)
+
+#elif defined(RGBLIGHT_ENABLE)
+
+    ENCODER_FUNCTION(_RGB, LEFT,
+                rgblight_increase_speed_noeeprom,
+                rgblight_decrease_speed_noeeprom, MOD_NONE)
+
+    ENCODER_FUNCTION(_RGB, RIGHT,
+                rgblight_increase_hue_noeeprom,
+                rgblight_decrease_hue_noeeprom, MOD_NONE)
+
+    ENCODER_FUNCTION(_RGB, LEFT,
+                rgblight_increase_sat_noeeprom,
+                rgblight_decrease_sat_noeeprom, MOD_LSFT)
+
+    ENCODER_FUNCTION(_RGB, RIGHT,
+                rgblight_increase_val_noeeprom,
+                rgblight_decrease_val_noeeprom, MOD_LSFT)
+
+
+    ENCODER_FUNCTION(_RGB, LEFT,
+                rgblight_step_noeeprom,
+                rgblight_step_reverse_noeeprom, MOD_LCTL)
+    #endif // RGB_MATRIX_ENABLE || RGBLIGHT_ENABLE
diff --git a/users/ericgebhart/defs/key_overrides.def b/users/ericgebhart/defs/key_overrides.def
new file mode 100644
index 0000000000..159e02e87e
--- /dev/null
+++ b/users/ericgebhart/defs/key_overrides.def
@@ -0,0 +1,23 @@
+//KOL -> name, mod_mask, keycode, sendkeycode, layer to apply.
+
+// // these are actually handled by alt_local_keys, in a more universal
+// // and adaptable way.
+// KOL(slash_pipe,      MOD_MASK_SHIFT, KC_SLSH, KC_PIPE, _DVORAK_EN)
+
+// this one is interesting.
+KOL(slash_backslash, MOD_MASK_ALT,   KC_SLSH, KC_BSLS, _DVORAK_EN)
+
+// KOL(N2_dot,          MOD_MASK_SHIFT, KC_2,    KC_DOT,   _KEYPAD_EN)
+// KOL(N3_comma,        MOD_MASK_SHIFT, KC_3,    KC_COMMA, _KEYPAD_EN)
+
+// KOL(hash_at,         MOD_MASK_SHIFT, KC_HASH,    KC_AT,          _CDH)
+// KOL(dot_colon,       MOD_MASK_SHIFT, KC_DOT,     KC_COLN,        _CDH)
+// KOL(comma_semicolon, MOD_MASK_SHIFT, KC_COMMA,   KC_SCLN,        _CDH)
+// KOL(space_unds,      MOD_MASK_SHIFT, KC_SPACE,   KC_UNDS,        _CDH)
+// KOL(mins_exlm,       MOD_MASK_SHIFT, KC_MINS,    KC_EXLM,        _CDH)
+
+// KOL(bspc_del,        MOD_MASK_SHIFT, KC_BSPC,    KC_DEL,         _NAV)
+
+// KOL(zero_degree,     MOD_MASK_SHIFT, KC_0,       DEGREE,         _KEYPAD_EN)
+
+// KOL(eur_pnd,         MOD_MASK_SHIFT, KC_EUR,     KC_PND,         _SYMB_EN)
diff --git a/users/ericgebhart/defs/mod_lock.def b/users/ericgebhart/defs/mod_lock.def
new file mode 100644
index 0000000000..da53ea0503
--- /dev/null
+++ b/users/ericgebhart/defs/mod_lock.def
@@ -0,0 +1,19 @@
+// mod lock keys. takes keymods not mods.
+// keycode should be defined in custom_keys.def.
+// custom key,  modkey to activate
+MODL(ML_LSFT, KC_LSFT)
+MODL(ML_LCTL, KC_LCTL)
+MODL(ML_LALT, KC_LALT)
+MODL(ML_LGUI, KC_LGUI)
+
+// Keycodes which will NOT cancel mod lock mode.
+IGNORE_KC( KC_LEFT)
+IGNORE_KC( KC_RGHT)
+IGNORE_KC( KC_UP)
+IGNORE_KC( KC_DOWN)
+IGNORE_KC( KC_HOME)
+IGNORE_KC( KC_END)
+IGNORE_KC( ML_LALT)
+IGNORE_KC( ML_LCTL)
+IGNORE_KC( ML_LGUI)
+IGNORE_KC( ML_LSFT)
diff --git a/users/ericgebhart/defs/not_dead.def b/users/ericgebhart/defs/not_dead.def
new file mode 100644
index 0000000000..66023ec523
--- /dev/null
+++ b/users/ericgebhart/defs/not_dead.def
@@ -0,0 +1,19 @@
+// Make not dead keys from dead keys.
+// Not dead keycode, dead key
+NOT_DEAD(KC_DQUO_ND, KC_DQUO)
+NOT_DEAD(KC_GRV_ND,  KC_GRV)
+NOT_DEAD(KC_QUOT_ND, KC_QUOT)
+NOT_DEAD(KC_CIRC_ND, KC_CIRC)
+NOT_DEAD(KC_TILD_ND, KC_TILD)
+
+NOT_DEAD(US_DQUO_ND, US_DQUO)
+NOT_DEAD(US_GRV_ND,  US_GRV)
+NOT_DEAD(US_QUOT_ND, US_QUOT)
+NOT_DEAD(US_CIRC_ND, US_CIRC)
+NOT_DEAD(US_TILD_ND, US_TILD)
+
+NOT_DEAD(BP_DQUO_ND, BP_DQUO)
+NOT_DEAD(BP_GRV_ND,  BP_GRV)
+NOT_DEAD(BP_QUOT_ND, BP_QUOT)
+NOT_DEAD(BP_CIRC_ND, BP_CIRC)
+NOT_DEAD(BP_TILD_ND, BP_TILD)
diff --git a/users/ericgebhart/defs/nshot.def b/users/ericgebhart/defs/nshot.def
new file mode 100644
index 0000000000..79559534c7
--- /dev/null
+++ b/users/ericgebhart/defs/nshot.def
@@ -0,0 +1,45 @@
+// Define keycodes in custom keys.
+// KEYCode, mod keycode, to set for n-shot.
+// ONESHOT is for one.
+// NSHOT takes a count.
+
+// oneshots
+ONESHOT(OS_LSFT, KC_LSFT)
+ONESHOT(OS_LCTL, KC_LCTL)
+ONESHOT(OS_LALT, KC_LALT)
+ONESHOT(OS_LGUI, KC_LGUI)
+
+ONESHOT(OS_RSFT, KC_RSFT)
+ONESHOT(OS_RCTL, KC_RCTL)
+ONESHOT(OS_RALT, KC_RALT)
+ONESHOT(OS_RGUI, KC_RGUI)
+
+// N-Shots
+NSHOT(TS_LCTL, KC_LCTL, 2)
+NSHOT(TS_RCTL, KC_RCTL, 2)
+
+// Keys which will cancel the n-shots.
+CANCEL_KEY( PANIC)
+CANCEL_KEY( CLEAR)
+//CANCEL_KEY( THM_LH0)
+//CANCEL_KEY( THM_LH1)
+//CANCEL_KEY( THM_RH0)
+//CANCEL_KEY( THM_RH1)
+
+// inherited from @possumvibes, keeping for now.
+// Keys which will be ignored by n-shots.
+//IGNORE_KEY( THM_LH0)
+//IGNORE_KEY( THM_LH1)
+//IGNORE_KEY( THM_RH0)
+//IGNORE_KEY( THM_RH1)
+//IGNORE_KEY( SYM_OSL)
+//IGNORE_KEY( SYM_TG)
+//IGNORE_KEY( NAV_TG)
+//IGNORE_KEY( NUM_OSL)
+//IGNORE_KEY( NUM_TO)
+//IGNORE_KEY( FUN_OSL)
+//IGNORE_KEY( ALPHA)
+IGNORE_KEY( SML_NAV)
+IGNORE_KEY( SPC_TOPR)
+// IGNORE_KEY( SML_KEYPAD)
+//IGNORE_KEY( SML_TOPROWS)
diff --git a/users/ericgebhart/defs/oneshot.def b/users/ericgebhart/defs/oneshot.def
new file mode 100644
index 0000000000..c54215234f
--- /dev/null
+++ b/users/ericgebhart/defs/oneshot.def
@@ -0,0 +1,17 @@
+// custom-key, Oneshot name.
+  ONESHOT( OS_LSFT, ONESHOT_LSFT)
+  ONESHOT( OS_LCTL, ONESHOT_LCTL)
+  ONESHOT( OS_LALT, ONESHOT_LALT)
+  ONESHOT( OS_LGUI, ONESHOT_LGUI)
+
+// keys to cancel
+  CANCEL_KEY( KC_ESC)
+
+//  CANCEL_KEY( KC_FNAV)
+//  CANCEL_KEY( KC_FNUM)
+//  CANCEL_KEY( KC_FCAPS)
+
+// keys to ignore.
+IGNORE_KEY( SPC_NAV)
+//  IGNORE_KEY( KC_FNAV)
+//  IGNORE_KEY( KC_FSYM)
diff --git a/users/ericgebhart/defs/send_string.def b/users/ericgebhart/defs/send_string.def
new file mode 100644
index 0000000000..455d25bfb1
--- /dev/null
+++ b/users/ericgebhart/defs/send_string.def
@@ -0,0 +1,7 @@
+// key to be defined and string to send.
+
+//SEND_STR(MYKEY, "this is a test")
+//SEND_STR_DELAY(MYKEY4, "this is another test")
+
+SEND_STR_DELAY(VRSN, QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE)
+// SEND_STR_DELAY(VRSN, QMK_KEYBOARD ":" QMK_KEYMAP " # @ " QMK_VERSION)
diff --git a/users/ericgebhart/defs/smart_lock.def b/users/ericgebhart/defs/smart_lock.def
new file mode 100644
index 0000000000..8202feb0d9
--- /dev/null
+++ b/users/ericgebhart/defs/smart_lock.def
@@ -0,0 +1,123 @@
+// Define smart layers here.
+// SMLL = smart lock layer.
+// SMLM = smart lock mod.
+
+// Keycode, layer/mod.
+// list of keycodes to ignore.
+
+SMLM(SMLM_LSFT, MOD_LSFT,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLM(SMLM_LCTL, MOD_LCTL,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLM(SMLM_LALT, MOD_LALT,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLM(SMLM_LGUI, MOD_LGUI,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLM(SMLM_RSFT, MOD_RSFT,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLM(SMLM_RCTL, MOD_RCTL,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLM(SMLM_RALT, MOD_RALT,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLM(SMLM_RGUI, MOD_RGUI,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLL(SML_NAV, _NAV, ___NAV_3x10___)
+
+#ifdef MEDIA_LAYER_ENABLE
+SMLL(SML_MEDIA, _MEDIA, ___MEDIA_3x10___)
+#endif
+
+#ifdef MOUSEKEY_ENABLE
+SMLL(SML_NAVm, _NAVm, ___NAVm_3x10___)
+#endif
+
+SMLL(SML_KEYPAD, _KEYPAD_EN,
+  KC_1,
+  KC_2,
+  KC_3,
+  KC_4,
+  KC_5,
+  KC_6,
+  KC_7,
+  KC_8,
+  KC_9,
+  KC_0,
+  KC_PERC,
+  KC_DLR,
+  KC_COMM,
+  KC_DOT,
+  KC_SLSH,
+  KC_MINS,
+  KC_ASTR,
+  KC_PLUS,
+  KC_COLN,
+  KC_SCLN,
+  KC_EQL,
+  // KC_UNDS,
+  KC_BSPC,
+  KC_X,
+  SYM_MO)
+
+// SMLL(SML_KEYPAD_BP, _KEYPAD_BP,
+//   BP_1,
+//   BP_2,
+//   BP_3,
+//   BP_4,
+//   BP_5,
+//   BP_6,
+//   BP_7,
+//   BP_8,
+//   BP_9,
+//   BP_0,
+//   BP_PERC,
+//   BP_DLR,
+//   BP_COMM,
+//   BP_DOT,
+//   BP_SLSH,
+//   BP_MINS,
+//   BP_ASTR,
+//   BP_PLUS,
+//   BP_COLN,
+//   BP_SCLN,
+//   BP_EQL,
+//   // KC_UNDS,
+//   KC_BSPC,
+//   BP_X,
+//   SYM_MO)
+
+#ifdef TOPROWS_LAYER_ENABLE
+SMLL(SML_TOPROWS, _TOPROWS_EN, ___10_SYMBOLS___, ___10_NUMBERS___)
+#endif
+//SMLL(SML_SYMB, _SYMB_EN, ___SYMB_BEAKLB_3x10___)
diff --git a/users/ericgebhart/defs/swapper.def b/users/ericgebhart/defs/swapper.def
new file mode 100644
index 0000000000..64a51910cb
--- /dev/null
+++ b/users/ericgebhart/defs/swapper.def
@@ -0,0 +1,3 @@
+// KEYCODE, Reverseit kc, KC to send, KC to send in reverse, MODs to apply.
+SWAPPER_KEY(SW_WIN, SW_REV, KC_TAB, S(KC_TAB), KC_LALT)
+SWAPPER_KEY(SW_TAB, SW_REV, KC_TAB, S(KC_TAB), KC_LCTL)
diff --git a/users/ericgebhart/defs/tap_hold.def b/users/ericgebhart/defs/tap_hold.def
new file mode 100644
index 0000000000..54140b99f8
--- /dev/null
+++ b/users/ericgebhart/defs/tap_hold.def
@@ -0,0 +1,68 @@
+// tap or long tap for different key.
+
+// One key copy/paste
+TP_TPL(KC_CCCV, LCTL(KC_C), LCTL(KC_V))
+// New TaB/Window
+TP_TPL(KC_CTCN, LCTL(KC_T), LCTL(KC_N))
+// Close Tab-window/Quit
+TP_TPL(KC_CWCQ, LCTL(KC_W), LCTL(KC_Q))
+// Xmonad scratch pads or desktop
+//TP_TPL(KC_XM_PORD, LGUI(KC_E), LGUI(KC_T))
+
+//TP_SML(ENTNAV, KC_ENTER, SML_NAV)
+
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
+TP_TPL(BP_CCCV, LCTL(BP_C), LCTL(BP_V))
+TP_TPL(BP_CTCN, LCTL(BP_T), LCTL(BP_N))
+TP_TPL(BP_CWCQ, LCTL(BP_W), LCTL(BP_Q))
+TP_TPL(BP_XM_PORD, LGUI(BP_E), LGUI(BP_T))
+
+TP_TPL(BP_C_CCED, BP_C, BP_CCED)
+#endif
+
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == US_INT) || (DEFAULT_LANG == US_INT)
+TP_TPL(US_CCCV, LCTL(US_C), LCTL(US_V))
+TP_TPL(US_CTCN, LCTL(US_T), LCTL(US_N))
+TP_TPL(US_CWCQ, LCTL(US_W), LCTL(US_Q))
+TP_TPL(US_XM_PORD, LGUI(US_E), LGUI(US_T))
+
+TP_TPL(US_C_CCED, US_C, US_CCED)
+#endif
+
+// Open on tap and Open with close and back arrow on hold.
+// (){}[]""''``<>
+#  if defined(SECOND_LOCALE) && (SECOND_LOCALE == EN) || (DEFAULT_LANG == EN)
+OPEN_OCL(KC_OCPRN, KC_LPRN, KC_RPRN)
+OPEN_OCL(KC_OCBRC, KC_LBRC, KC_RBRC)
+OPEN_OCL(KC_OCCBR, KC_LCBR, KC_RCBR)
+OPEN_OCL(KC_OCDQUO, KC_DQUO, KC_DQUO)
+OPEN_OCL(KC_OCQUOT, KC_QUOT, KC_QUOT)
+OPEN_OCL(KC_OCGRV, KC_GRAVE, KC_GRAVE)
+OPEN_OCL(KC_OCLTGT, KC_LT, KC_GT)
+#endif
+
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
+OPEN_OCL(BP_OCPRN, BP_LPRN, BP_RPRN)
+OPEN_OCL(BP_OCBRC, BP_LBRC, BP_RBRC)
+OPEN_OCL(BP_OCCBR, BP_LCBR, BP_RCBR)
+OPEN_OCL(BP_OCDQUO, BP_DQUO, BP_DQUO)
+OPEN_OCL_ND(BP_OCQUOT, BP_QUOT, BP_QUOT)
+OPEN_OCL(BP_OCGRV, BP_GRV, BP_GRV)
+OPEN_OCL(BP_OCLTGT, BP_LT, BP_GT)
+#endif
+
+
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == US_INT) || (DEFAULT_LANG == US_INT)
+OPEN_OCL(US_OCPRN, US_LPRN, US_RPRN)
+OPEN_OCL(US_OCBRC, US_LBRC, US_RBRC)
+OPEN_OCL(US_OCCBR, US_LCBR, US_RCBR)
+OPEN_OCL(US_OCDQUO, US_DQUO, US_DQUO)
+
+OPEN_OCL_ND(US_OCQUOT, US_QUOT, US_QUOT)
+OPEN_OCL(US_OCGRV, US_GRV, US_GRV)
+OPEN_OCL(US_OCLTGT, US_LT, US_GT)
+#endif
diff --git a/users/ericgebhart/defs/unicode.def b/users/ericgebhart/defs/unicode.def
new file mode 100644
index 0000000000..ee8dbecead
--- /dev/null
+++ b/users/ericgebhart/defs/unicode.def
@@ -0,0 +1,5 @@
+// define keys to send unicode strings.
+ UC_STR(UC_FLIP, "(ノಠ痊ಠ)ノ彡┻━┻")
+ UC_STR(UC_TABL, "┬─┬ノ( º _ ºノ)")
+ UC_STR(UC_SHRG, "¯\\_(ツ)_/¯")
+ UC_STR(UC_DISA, "ಠ_ಠ")
diff --git a/users/ericgebhart/edge_keys.h b/users/ericgebhart/edge_keys.h
deleted file mode 100644
index f37425322c..0000000000
--- a/users/ericgebhart/edge_keys.h
+++ /dev/null
@@ -1,238 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "core_keysets.h"
-
-/******************************************************************/
-/* This is where I put my Keyboard layouts, Everything on the     */
-/* edges, the functions on keys like LT() and SFT_T()             */
-/* can be applied here. The physical shape of the keyboard is     */
-/* also accounted for here. This makes it very simple to add a    */
-/* new keyboard and reuse all of my layouts and layers            */
-/*                                                                */
-/* The particular pieces we define here (as needed) are:          */
-/*     * Edge pinky keys, */
-/*     * Middle section keys */
-/*     * Bottom/5th row */
-/*     * Thumbkeys */
-/*     * Any functional additions to wrap the keys. ie. LT()      */
-/*                                                                */
-/* With all of that in hand, we then create a LAYOUT wrapper      */
-/* macro that takes a list of keys, to create a keyboard matrix   */
-/* that fits the keyboard. Simple.                                */
-/*                                                                */
-/* The thumb keys, the bottom rows, etc.                          */
-/*                                                                */
-/* An attempt has been made to adapt the kinesis and ergodox      */
-/* Thumb keys to the rectangular shapes of the xd75 and viterbi.  */
-/* which are 15x and 14x matrices respectively.                   */
-/* The Corne was a perfect fit                                    */
-/******************************************************************/
-
-/******************************************************************/
-/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
-/*       keys inbetween the usual left and right hand keys        */
-/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
-/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
-/*       thumbkeys. It is missing middle keys on (home) row 3.    */
-/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
-/*       extra middle keys                                        */
-/*                                                                */
-/******************************************************************/
-
-
-/******************************************************************/
-/*   In all cases these keyboards are defined in a matrix which is */
-/*   a set of rows. Maybe like so, or not.                         */
-/*                                                                 */
-/*   -------------------------|------------------------ */
-/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
-/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
-/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
-/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
-/*   | Row5L                  |                    Row5R | */
-/*   |               ThumbsL  | ThumbsR                  | */
-/*   -------------------------|------------------------ */
-
-/* Generally speaking, the keys on the right and left don't change. */
-/* Neither does the bottom row or the thumbs. Frequently the numbers */
-/* row is identical across layers. Mostly, we want our Base layers to */
-/* be predctable.                                                     */
-
-// EDGES
-// outside pinky keys row 0-3.
-// Qwerty and Bepo, - Applies
-// to foreign layouts on bepo. dvorak_bp, beakl_bp.
-#define LEFT0 KC_GRV
-#define LEFT1 KC_GRV
-#define LEFT2 KC_TAB
-#define LEFT3 KC_BSLASH
-//#define LEFT3 KC_COLN
-
-#define LEFT0_BP DB_GRV
-#define LEFT1_BP DB_GRV
-#define LEFT2_BP KC_TAB
-#define LEFT3_BP DB_BACKSLASH
-//#define LEFT3_BP BP_COLN
-
-#define RIGHT0 KC_EQL
-#define RIGHT1 KC_SLASH
-#define RIGHT2 KC_MINS
-#define RIGHT3 KC_SCLN
-
-#define RIGHT0_BP BP_EQL
-#define RIGHT1_BP BP_SLSH
-#define RIGHT2_BP BP_MINS
-#define RIGHT3_BP BP_SCLN
-
-/******************************************************************/
-/* Middle Keysets for various keyboards                           */
-// MIDDLES
-/// Middle left and right keys.
-/******************************************************************/
-#define ___MIDDLE_LT___ OSL(_LAYERS)
-#define ___MIDDLE_L1___ KC_CCCV
-#define ___MIDDLE_L2___ TO(_SYMB)
-#define ___MIDDLE_L3___ TO(_NAV)
-
-#define ___MIDDLE_RT___ _X_
-#define ___MIDDLE_R1___ KC_CCCV
-#define ___MIDDLE_R2___ TO(_TOPROWS)
-#define ___MIDDLE_R3___ OSL(_KEYPAD)
-
-#define ___MIDDLE_L1_BP___ BP_CCCV
-#define ___MIDDLE_L2_BP___  TO(_SYMB_BP)
-
-#define ___MIDDLE_R1_BP___ BP_CCCV
-#define ___MIDDLE_R2_BP___ TO(_KEYPAD_BP)
-#define ___MIDDLE_R3_BP___ OSL(_KEYPAD_BP)
-
-// 3 keys in the middle of a 15x matrix
-#define ___3_MIDDLE_T___ ___MIDDLE_LT___,    LCTL(KC_A),        ___MIDDLE_RT___
-#define ___3_MIDDLE_1___ ___MIDDLE_L1___,    LCTL(KC_X),        ___MIDDLE_R1___
-#define ___3_MIDDLE_2___ ___MIDDLE_L2___,    TO(_RGB),          ___MIDDLE_R2___
-#define ___3_MIDDLE_3___ ___MIDDLE_L3___,    TO(_SYMB),   ___MIDDLE_R3___
-
-// The same, for BEPO
-#define ___3_MIDDLE_T_BP___ ___MIDDLE_LT___,     LCTL(BP_A),         ___MIDDLE_RT___
-#define ___3_MIDDLE_1_BP___ ___MIDDLE_L1_BP___,  LCTL(BP_X),         ___MIDDLE_R1_BP___
-#define ___3_MIDDLE_2_BP___ ___MIDDLE_L2_BP___,  TO(_RGB),           ___MIDDLE_R2_BP___
-#define ___3_MIDDLE_3_BP___ ___MIDDLE_L3___,     TO(_SYMB_BP), ___MIDDLE_R3_BP___
-
-// 2 keys in the middle of a 14x matrix  - For viterbi and ergodox.
-#define ___2_MIDDLE_T___ ___MIDDLE_LT___,    ___MIDDLE_RT___
-#define ___2_MIDDLE_1___ ___MIDDLE_L1___,    ___MIDDLE_R1___
-#define ___2_MIDDLE_2___ ___MIDDLE_L2___,    ___MIDDLE_R2___
-#define ___2_MIDDLE_3___ ___MIDDLE_L3___,    ___MIDDLE_R3___
-
-// The same, for BEPO
-#define ___2_MIDDLE_T_BP___ ___MIDDLE_LT___,     ___MIDDLE_RT___
-#define ___2_MIDDLE_1_BP___ ___MIDDLE_L1_BP___,  ___MIDDLE_R1_BP___
-#define ___2_MIDDLE_2_BP___ ___MIDDLE_L2_BP___,  ___MIDDLE_R2_BP___
-#define ___2_MIDDLE_3_BP___ ___MIDDLE_L3___,     ___MIDDLE_R3_BP___
-
-/********************************************************************/
-/* THUMBS  */
-/* Define the thumb clusters for all the keyboards.                 */
-/********************************************************************/
-
-// for xd75 or other layouts with a center column.
-// #define ___5_MIDDLE_THUMBS___ CTL_BSPC,    ALT_DEL,     XMONAD_ESC,  ALT_ENT,   CTL_SPC
-#define ___5_MIDDLE_THUMBS___ ALT_DEL, BSPC_TOPR, ESC_SYMB, ENT_NAV, SPC_TOPR
-#define ___5_MIDDLE_THUMBS_BP___ ALT_DEL, BSPC_TOPR_BP, ESC_SYMB_BP, ENT_NAV, SPC_TOPR_BP
-
-// for a last, 4th thumb row. for rebound.
-// backtab, home end, ----, pgup, pgdn, tab ?
-#define ___13_BOTTOM___                                           \
-  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB, ESC_TOPR,      \
-    OSL(_LAYERS),                                               \
-    ENT_NAV, SPC_TOPR, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
-
-#define ___13_BOTTOM_BP___                                \
-  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB_BP, ESC_TOPR_BP, \
-    OSL(_LAYERS),                                                  \
-    ENT_NAV, SPC_TOPR_BP, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
-
-// becomes the upper thumbs, the real 4th row if we throw away
-// the number row at the top.
-// this is the 4th row on the viterbi above the thumbrow if the number
-// row is not used for numbers.
-#define ___4_MIDDLE_4___    LSFT(KC_TAB),    HOME_END,    KC_PGDN, KC_TAB
-#define ___4_MIDDLE_4b___   TAB_BKTAB,       HOME_END,    KC_PGDN, KC_PGUP
-
-/********************************************************************/
-/**  The bottom row and thumbs as needed.                          **/
-/********************************************************************/
-// I do not use those pinky keys. I had useful things there but there
-// are better more useful ways than those pinkys.
-#define ___5_BOTTOM_LEFT___  ___X2___,  KC_INS,  KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLASH, ___X2___
-
-#define ___4_BOTTOM_LEFT___  LCTL(KC_V),  KC_INS,  KC_LEFT,   KC_RIGHT
-#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLASH, LCTL(KC_C)
-
-// the bottom rows  for keyboards on bepo.
-// bepo on bepo - not enough space to go around....
-#define ___5_BOTTOM_LEFT_BP___  _X_,    BP_EACU,  _X_,           KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN,  DB_BACKSLASH,  BP_CCED,  BP_PERC
-
-#define ___4_BOTTOM_LEFT_BP___  LCTL(BP_C),  BP_EACU,  KC_LEFT, KC_RIGHT
-#define ___4_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN, DB_BACKSLASH,  BP_CCED
-
-// for dvorak and beakl on bepo
-#define ___5_BOTTOM_LEFT_FR___  ___X3___,  KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT_FR___ KC_UP,  KC_DOWN,  DB_BACKSLASH, ___X2___
-
-// basically a 5th row in a 5x matrix. but maybe a 4th if there isnt a number row.
-#define ___15_BOTTOM___     ___5_BOTTOM_LEFT___,    ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT___
-#define ___15_BOTTOM_FR___  ___5_BOTTOM_LEFT_FR___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_FR___
-#define ___15_BOTTOM_BP___  ___5_BOTTOM_LEFT_BP___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_BP___
-
-#define ___14_BOTTOM___    ___5_BOTTOM_LEFT___,    ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT___
-#define ___14_BOTTOM_FR___ ___5_BOTTOM_LEFT_FR___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_FR___
-#define ___14_BOTTOM_BP___ ___5_BOTTOM_LEFT_BP___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_BP___
-#define ___14_THUMBS_BOTTOM___   ___X4___, ___6_MIDDLE_THUMBS___, ___X4___
-
-// bottom row of ergodox thumbs, bottom middle of all layouts.
-// start with the minimilist thumb row of 6, like the Corne, 2x3.
-
-#define ___THUMBS_1___    TT(_KEYPAD),    MO(_ADJUST), MO(_LAYERS), OSL(_TOPROWS)
-#define ___THUMBS_1_BP___ TT(_KEYPAD_BP), MO(_ADJUST), MO(_LAYERS), OSL(_TOPROWS_BP)
-#define ___THUMBS_2___                      HOME_END,      KC_PGUP
-#define ___THUMBS_3___                         ___6_ERGO_THUMBS___
-
-#define ___4_THUMBS_1_BP___      TT(_KEYPAD_BP), KC_HOME, KC_PGUP, OSL(_TOPROWS_BP)
-#define ___4_THUMBS_1___           TT(_KEYPAD), KC_HOME, KC_PGUP, OSL(_TOPROWS)
-#define ___6_THUMBS_2___  KC_LSFT,    KC_BKTAB, KC_END,  KC_PGDN, KC_TAB, KC_RSFT
-
-#define ___6_THUMBS_2b___    BSPC_SYMB, ESC_TOPR, KC_END,  KC_PGUP, ENT_NAV, SPC_TOPR
-#define ___6_ERGO_THUMBSb___ TT(_LAYERS), BSPC_SYMB, KC_XM_PORD, KC_PGDN, TT(_NAV), KC_XM_PORD
-#define ___6_THUMBS_2b_BP___ BSPC_SYMB_BP, ESC_TOPR_BP, KC_END,  KC_PGDN, ENT_TOPR_BP, SPC_NAV
-
-#define ___6_ERGO_THUMBS___ TT(_NAV), BSPC_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, KC_XM_PORD
-#define ___6_ERGO_THUMBS_BP___ TT(_NAV), BSPC_SYMB_BP, ESC_TOPR, ENT_NAV, SPC_TOPR_BP, BP_XM_PORD
-
-#define ___6_MIDDLE_THUMBS___ ___6_ERGO_THUMBS___
-
-#define ___12_DOX_ALL_THUMBS___    ___THUMBS_1___,    ___THUMBS_2___, ___THUMBS_3___
-#define ___12_DOX_ALL_THUMBS_BP___ ___THUMBS_1_BP___, ___THUMBS_2___, ___THUMBS_3___
-
-#define ___16_ALL_THUMBSb___  ___4_THUMBS_1___,   ___6_THUMBS_2b___, ___6_ERGO_THUMBSb___
-#define ___16_ALL_THUMBS___   ___4_THUMBS_1___,    ___6_THUMBS_2___, ___6_ERGO_THUMBS___
-#define ___16_ALL_THUMBSb_BP___ ___4_THUMBS_1_BP___, ___6_THUMBS_2b_BP___, ___6_ERGO_THUMBS___
-#define ___16_ALL_THUMBS_BP___ ___4_THUMBS_1_BP___, ___6_THUMBS_2_BP___, ___6_ERGO_THUMBS_BP___
diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c
index a071fb8c2e..965456e56c 100755
--- a/users/ericgebhart/ericgebhart.c
+++ b/users/ericgebhart/ericgebhart.c
@@ -22,12 +22,6 @@
 #include "action.h"
 #include "action_layer.h"
 #include "process_keycode/process_tap_dance.h"
-#include "keymap_bepo.h"
-
-float tone_copy[][2]            = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_paste[][2]           = SONG(SCROLL_LOCK_OFF_SOUND);
-
-userspace_config_t userspace_config;
 
 // Add reconfigurable functions here, for keymap customization
 // This allows for a global, userspace functions, and continued
@@ -40,7 +34,7 @@ __attribute__ ((weak))
 void matrix_scan_keymap(void) {}
 
 __attribute__ ((weak))
-layer_state_t layer_state_set_keymap (layer_state_t state) {
+uint32_t layer_state_set_keymap (uint32_t state) {
   return state;
 }
 
diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h
index 92f8f22d29..4721b85ebd 100755
--- a/users/ericgebhart/ericgebhart.h
+++ b/users/ericgebhart/ericgebhart.h
@@ -19,54 +19,10 @@
 #ifndef ericgebhart
 #define ericgebhart
 
-#include QMK_KEYBOARD_H
-#include "core_keysets.h"
-#include "layouts.h"
-#include "layers.h"
-#if defined(OLED_ENABLE)
-#    include "oled_stuff.h"
+#include "layer_names.h"
+
+#ifdef CONSOLE_ENABLE
+#include "print.h"
 #endif
 
-
-//#define ONESHOT_TAP_TOGGLE 2  /* Tapping this number of times holds the key until tapped once again. */
-/* Define layer names */
-enum userspace_layers {
-    _DVORAK = 0,
-    _QWERTY,
-    _COLEMAK,
-    _BEAKL,
-    //_WORKMAN,
-    //_NORMAN,
-    //_MALTRON,
-    //_EUCALYN,
-    //_CARPLAX,
-    _DVORAK_BP, // beginning of Bepo
-    _BEAKL_BP,
-    _BEPO,
-    _LAYERS,
-    _NAV,   // transient layers
-    _SYMB,
-    _SYMB_BP,
-    _KEYPAD,
-    _KEYPAD_BP,
-    _TOPROWS,
-    _TOPROWS_BP,
-    _RGB,
-    _ADJUST,
-};
-
-// clang-format off
-typedef union {
-  uint32_t raw;
-  struct {
-    bool    rgb_layer_change     :1;
-    bool    is_overwatch         :1;
-    bool    nuke_switch          :1;
-    bool    swapped_numbers      :1;
-    bool    rgb_matrix_idle_anim :1;
-  };
-} userspace_config_t;
-// clang-format on
-extern userspace_config_t userspace_config;
-
 #endif
diff --git a/users/ericgebhart/extensions/accented_keys.c b/users/ericgebhart/extensions/accented_keys.c
new file mode 100644
index 0000000000..2569bffea8
--- /dev/null
+++ b/users/ericgebhart/extensions/accented_keys.c
@@ -0,0 +1,50 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include USERSPACE_H
+#include "accented_keys.h"
+#include <stdint.h>
+#include <stdbool.h>
+
+static inline void tap_accented_letter(uint16_t letter, uint16_t dead_key) {
+    uint8_t mod_state = get_mods();
+    uint8_t oneshot_mod_state = get_oneshot_mods();
+    del_mods(MOD_MASK_SHIFT);
+    del_oneshot_mods(MOD_MASK_SHIFT);
+    tap_code16(dead_key);
+    set_mods(mod_state);
+    set_oneshot_mods(oneshot_mod_state);
+    tap_code(letter);
+}
+
+#undef ACCENTED
+#define ACCENTED(KC, K1, DEAD_KEY)              \
+  case KC:                                      \
+  if (record->event.pressed) {                  \
+    tap_accented_letter(K1, DEAD_KEY);          \
+  }                                             \
+  return false;
+
+
+bool process_accent_keys(uint16_t keycode, keyrecord_t* record) {
+  switch(keycode){
+#ifdef ACCENTED_KEYS_ENABLE
+#include "accented_keys.def"
+#endif
+  }
+  return true;
+}
diff --git a/users/ericgebhart/oled_stuff.h b/users/ericgebhart/extensions/accented_keys.h
old mode 100755
new mode 100644
similarity index 78%
rename from users/ericgebhart/oled_stuff.h
rename to users/ericgebhart/extensions/accented_keys.h
index df1f50985f..017c6fa312
--- a/users/ericgebhart/oled_stuff.h
+++ b/users/ericgebhart/extensions/accented_keys.h
@@ -16,9 +16,4 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
-#include "oled_driver.h"
-
-void oled_render_mod_lock_status(void);
-void oled_driver_render_logo(void);
-bool process_record_user_oled(uint16_t keycode, keyrecord_t *record);
+bool process_accent_keys(uint16_t keycode, keyrecord_t* record);
diff --git a/users/ericgebhart/extensions/alt_shift.c b/users/ericgebhart/extensions/alt_shift.c
new file mode 100644
index 0000000000..002adec230
--- /dev/null
+++ b/users/ericgebhart/extensions/alt_shift.c
@@ -0,0 +1,99 @@
+#include USERSPACE_H
+#include <stdbool.h>
+#include <stdint.h>
+
+bool shift_for_two(uint16_t keycode, keyrecord_t *record){
+  uint16_t mod_state = get_mods();
+
+  bool is_shifted = (get_mods() & MOD_MASK_SHIFT) ||
+    (get_oneshot_mods() & MOD_MASK_SHIFT);
+
+  if(record ->event.pressed) {
+    // If shifted, double these common punctuation marks.
+    if(is_shifted){
+      // clear shift temporarily
+      del_mods(MOD_MASK_SHIFT);
+      del_oneshot_mods(MOD_MASK_SHIFT);
+
+      tap_code16(keycode);
+      tap_code16(keycode);
+
+      // restore previous shift state
+      set_mods(mod_state);
+      return false;
+    }
+  }
+  return true;
+}
+
+bool shift_for_three(uint16_t keycode, keyrecord_t *record){
+  uint16_t mod_state = get_mods();
+
+  bool is_shifted = (get_mods() & MOD_MASK_SHIFT) ||
+    (get_oneshot_mods() & MOD_MASK_SHIFT);
+
+  if(record ->event.pressed) {
+    // If shifted, double these common punctuation marks.
+    if(is_shifted){
+      // clear shift temporarily
+      del_mods(MOD_MASK_SHIFT);
+      del_oneshot_mods(MOD_MASK_SHIFT);
+
+      tap_code16(keycode);
+      tap_code16(keycode);
+      tap_code16(keycode);
+
+      // restore previous shift state
+      set_mods(mod_state);
+      return false;
+    }
+  }
+  return true;
+  }
+
+bool override_shift(uint16_t keycode,
+                    uint16_t shift_keycode,
+                    keyrecord_t *record
+                    ) {
+
+  bool is_shifted = (get_mods() & MOD_MASK_SHIFT) ||
+    (get_oneshot_mods() & MOD_MASK_SHIFT);
+
+  if (record->event.pressed) {
+    if (is_shifted) {
+      uint8_t mod_state = get_mods();
+      del_mods(MOD_MASK_SHIFT);
+      del_oneshot_mods(MOD_MASK_SHIFT);
+
+      tap_code16(shift_keycode);
+
+      set_mods(mod_state);
+    } else {
+      //tap_code16(keycode);
+    }
+  }
+  return false;
+}
+
+// macros for use in alt_shift.defs.
+#define ALT_SHIFT(KCKEY, KC01)            \
+  case KCKEY:                                   \
+  return override_shift(KCKEY, KC01, record);   \
+  break;
+
+#define SHIFT_FOR_2(KCKEY)                      \
+  case KCKEY:                                   \
+  return shift_for_two(KCKEY, record);          \
+  break;
+
+#define SHIFT_FOR_3(KCKEY)                \
+  case KCKEY:                                   \
+  return shift_for_three(KCKEY, record);        \
+  break;
+
+bool process_alt_shift_user(uint16_t keycode, keyrecord_t *record) {
+  switch(keycode){
+#include "alt_shift.def"
+  }
+  return true;
+}
diff --git a/users/ericgebhart/extensions/altlocal_keys.c b/users/ericgebhart/extensions/altlocal_keys.c
new file mode 100644
index 0000000000..569a2076b5
--- /dev/null
+++ b/users/ericgebhart/extensions/altlocal_keys.c
@@ -0,0 +1,82 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Create custom keycodes with arbitrary shifted and unshifted keys.
+// originally for dvorak on bepo. But used by beakl on qwerty now too.
+
+// Why?: Because the keycodes are actually defined on the computer. So
+// if you are trying to have dvorak, or beakl on bepo-fr, the shifted keys
+// are wrong. But, I want my dvorak, so this allows the pairing of keys into
+// a keycode that has shifted and non shifted behavior, outside of what the
+// locale map says on the computer.
+//
+// These are the keys for dvorak on bepo.  column one is the keycode and mods for
+// the unshifted key, the second column is the keycode and mods for the shifted key.
+// GR is Good Range.  It subtracts SAFE_RANGE from the keycode so we can make a
+// reasonably sized array without difficulties. The macro is for the constant declarations
+// the function is for when we use it.
+
+//make an alt_local_keys.def   - see the example.
+// Include this file where you have your process_record_user function,
+// call process_alt_local_key inside your process_record_user.
+
+#include USERSPACE_H
+#include "altlocal_keys.h"
+
+const uint16_t key_translations[][2][2] = {
+#include "altlocal_keys.def"
+};
+
+uint8_t gr(uint16_t kc){
+  return (kc - SAFE_RANGE);
+}
+
+// send the right keycode for the right mod.
+// remove the mods we are taking care of,
+// send our keycodes then restore them.
+// all so we can make dvorak keys from bepo keycodes.
+void send_keycode(uint16_t kc){
+  uint8_t tmp_mods = get_mods();
+  bool is_shifted = ( tmp_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
+
+  // need to turn of the shift if it is on.
+  unregister_mods((MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)));
+  if(is_shifted){
+    register_mods(SHIFTED_MODS(kc));
+    register_code16(SHIFTED_KEY(kc));
+    unregister_code16(SHIFTED_KEY(kc));
+    unregister_mods(SHIFTED_MODS(kc));
+  } else{
+    register_mods(UNSHIFTED_MODS(kc));
+    register_code16(UNSHIFTED_KEY(kc));
+    unregister_code16(UNSHIFTED_KEY(kc));
+    unregister_mods(UNSHIFTED_MODS(kc));
+  }
+  clear_mods();
+  register_mods(tmp_mods);
+}
+
+bool process_alt_local_key(uint16_t keycode, keyrecord_t* record) {
+  switch(keycode){
+  case ALT_LOCAL_KEYS_START ... ALT_LOCAL_KEYS_END:
+    if(record->event.pressed)
+      send_keycode(keycode);
+    unregister_code(keycode);
+    break;
+  }
+  return (true);
+}
diff --git a/users/ericgebhart/extensions/altlocal_keys.h b/users/ericgebhart/extensions/altlocal_keys.h
new file mode 100644
index 0000000000..8e30472081
--- /dev/null
+++ b/users/ericgebhart/extensions/altlocal_keys.h
@@ -0,0 +1,56 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Create custom keycodes with arbitrary shifted and unshifted keys.
+// originally for dvorak on bepo. But used by beakl on qwerty now too.
+
+// Why?: Because the keycodes are actually defined on the computer. So
+// if you are trying to have dvorak, or beakl on bepo-fr, the shifted keys
+// are wrong. But, I want my dvorak, so this allows the pairing of keys into
+// a keycode that has shifted and non shifted behavior, outside of what the
+// locale map says on the computer.
+//
+// These are the keys for dvorak on bepo.  column one is the keycode and mods for
+// the unshifted key, the second column is the keycode and mods for the shifted key.
+// GR is Good Range.  It subtracts SAFE_RANGE from the keycode so we can make a
+// reasonably sized array without difficulties. The macro is for the constant declarations
+// the function is for when we use it.
+
+//make an alt_local_keys.def   - see the example.
+// Include this file where you have your process_record_user function,
+// call process_alt_local_key inside your process_record_user.
+
+uint8_t gr(uint16_t);
+void send_keycode(uint16_t);
+bool process_alt_local_key(uint16_t keycode, keyrecord_t* record);
+
+#define MOD_NONE 0x00
+
+#define GR(x) (x-SAFE_RANGE)
+// indexs for the keycode translation table.
+
+#define MK_KEY(KCNAME, KC1, MOD1, KC2, MOD2)    \
+  [GR(KCNAME)] = {{KC1, MOD1}, {KC2, MOD2}},
+
+#define MK_SKEY(KCNAME, KC1, KC2)   \
+  [GR(KCNAME)] = {{KC1, MOD_NONE}, {KC2, MOD_NONE}},
+
+#define UNSHIFTED_KEY(key)  key_translations[gr(key)][0][0]
+#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1]
+#define SHIFTED_KEY(key)    key_translations[gr(key)][1][0]
+#define SHIFTED_MODS(key)   key_translations[gr(key)][1][1]
diff --git a/users/ericgebhart/extensions/console_key_logger.c b/users/ericgebhart/extensions/console_key_logger.c
new file mode 100644
index 0000000000..074673bd06
--- /dev/null
+++ b/users/ericgebhart/extensions/console_key_logger.c
@@ -0,0 +1,38 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#if defined( CONSOLE_ENABLE) && defined(CONSOLE_KEY_LOGGER_ENABLE)
+
+#include USERSPACE_H
+#include "print.h"
+#include "console_key_logger.h"
+
+void process_console_key_logger(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    uprintf("0x%04X,%u,%u,%u,%b,0x%02X,0x%02X,%u\n",
+            keycode,
+            record->event.key.row,
+            record->event.key.col,
+            get_highest_layer(layer_state),
+            record->event.pressed,
+            get_mods(),
+            get_oneshot_mods(),
+            record->tap.count
+            );
+  }
+}
+#endif
diff --git a/users/ericgebhart/extensions/console_key_logger.h b/users/ericgebhart/extensions/console_key_logger.h
new file mode 100644
index 0000000000..5e7e2d5bc0
--- /dev/null
+++ b/users/ericgebhart/extensions/console_key_logger.h
@@ -0,0 +1,19 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+void process_console_key_logger(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/extensions/encoders.c b/users/ericgebhart/extensions/encoders.c
new file mode 100644
index 0000000000..9a3d90b82f
--- /dev/null
+++ b/users/ericgebhart/extensions/encoders.c
@@ -0,0 +1,83 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef ENCODER_ENABLE
+#include "encoders.h"
+#include USERSPACE_H
+
+encoder_action_t encoder_actions[] = {
+#include "encoders.def"
+};
+uint8_t  NUM_ENCODER_ACTIONS = sizeof(encoder_actions) / sizeof(encoder_action_t);
+
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  // do it twice, once for layer actions, once for non layer specific actions.
+  if (!do_encoder_action(index, clockwise, true)){
+    do_encoder_action(index, clockwise, false);
+  }
+  return false;
+}
+
+bool do_encoder_action(uint8_t index, bool clockwise, bool layer_actions) {
+  uint8_t mods = get_mods();
+  encoder_action_t *action;
+
+  // look for a match.
+  // on the layer, not on any layer.
+  // with the mods, or no mods.
+  for (int i = 0; i < NUM_ENCODER_ACTIONS; ++i) {
+    action = &encoder_actions[i];
+
+    // this encoder, or another.
+    if (action->index != index)
+              continue;
+
+    // skip non layer specific actions and visa versa
+    // two pass system, once for layers, again for
+    // actions without layers.
+    if (layer_actions){
+      if (action->layer == LAYER_NONE ||
+          action->layer != biton32(layer_state)){
+        continue;
+      }
+    }else if (action->layer != LAYER_NONE)
+      continue;
+
+    // no mods, or these mods.
+    if ((mods && (action->mods == MOD_NONE)) ||
+        (mods && (mods != action->mods)))
+    continue;
+
+    // found one.
+    if (clockwise) {
+      if (action->clockwise != 0) {
+        tap_code16(action->clockwise);
+      } else if (action->cw_func != NULL) {
+        action->cw_func();
+      }
+    } else {
+      if (action->counter_clockwise != 0) {
+        tap_code16(action->counter_clockwise);
+      } else if (action->ccw_func != NULL) {
+        action->ccw_func();
+      }
+    }
+  }
+  return false;
+}
+
+#endif
diff --git a/users/ericgebhart/extensions/encoders.h b/users/ericgebhart/extensions/encoders.h
new file mode 100644
index 0000000000..458c5c541d
--- /dev/null
+++ b/users/ericgebhart/extensions/encoders.h
@@ -0,0 +1,46 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+typedef struct {
+  uint16_t layer;
+  uint16_t index;  // 0 or 1, left/right.
+  uint16_t clockwise;
+  uint16_t counter_clockwise;
+  uint16_t mods;
+  void (*cw_func)(void);
+  void (*ccw_func)(void);
+} encoder_action_t;
+extern encoder_action_t encoder_actions[];
+extern uint8_t         NUM_ENCODER_ACTIONS;
+
+// haven't looked at the real values for index, but I know
+// 0 and 1 are left and right on my kyria.
+#define LEFT 0
+#define RIGHT 1
+#define LAYER_NONE -1
+#define MOD_NONE 0x00
+
+#define ENCODER_ACTION(LAYER, INDEX, CW_KC, CCW_KC, MOD)        \
+  {LAYER, INDEX, CW_KC, CCW_KC, MOD, NULL, NULL},
+
+#define ENCODER_FUNCTION(LAYER, INDEX, CW_FUNC, CCW_FUNC, MOD)  \
+  {LAYER, INDEX, 0, 0, MOD, CW_FUNC, CCW_FUNC},
+
+bool do_encoder_action(uint8_t index, bool clockwise, bool layer_actions);
diff --git a/users/ericgebhart/extensions/extensions.c b/users/ericgebhart/extensions/extensions.c
new file mode 100644
index 0000000000..f71e615a00
--- /dev/null
+++ b/users/ericgebhart/extensions/extensions.c
@@ -0,0 +1,91 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include USERSPACE_H
+
+#include "extensions.h"
+#include "keymap_combo.h"
+#include "altlocal_keys.h"
+#include "tap_hold.h"
+#include "accented_keys.h"
+#include "process_smart_lock.h"
+#include "mod_lock.h"
+#include "oneshot.h"
+#include "process_nshot.h"
+#include "process_locales.h"
+#include "unicode.h"
+#include "key_overrides.h"
+#include "console_key_logger.h"
+
+// should make header files maybe. being lazy.
+void process_not_dead(uint16_t keycode, keyrecord_t *record);
+bool process_alt_shift_user(uint16_t keycode, keyrecord_t *record);
+void process_send_strs(uint16_t keycode, keyrecord_t *record);
+//bool process_alt_local_key(uint16_t keycode, keyrecord_t* record);
+bool process_global_quick_tap(uint16_t keycode, keyrecord_t *record);
+
+// call this from the top of process records before the switch.
+
+bool process_extensions(uint16_t keycode, keyrecord_t *record){
+  if (!process_locales(keycode, record)) { return false; }
+
+#ifdef GLOBAL_QUICK_TAP_ENABLE
+  if (!process_global_quick_tap(keycode, record)) {return false; }
+#endif
+#ifdef CAPS_WORD_ENABLE
+ if (!process_caps_word(keycode, record)) { return false; }
+#endif
+#ifdef ALT_LOCAL_ENABLE
+  if (!process_alt_local_key(keycode, record)) { return false; }
+#endif
+#ifdef ACCENTED_KEYS_ENABLE
+  if (!process_accent_keys(keycode, record)) { return false; }
+#endif
+#ifdef TAP_HOLD_ENABLE
+  process_tap_hold_user(keycode, record);
+#endif
+#ifdef SMART_LOCK_ENABLE
+  process_smart_lock(keycode, record);
+#endif
+#ifdef MOD_LOCK_ENABLE
+  process_mod_lock(keycode, record);
+#endif
+#ifdef NSHOT_ENABLE
+  if(!process_nshot_state(keycode, record)) {return false;}
+#endif
+#ifdef SEND_UNICODE_ENABLE
+  process_unicode_strs(keycode, record);
+#endif
+#ifdef SEND_STRING_ENABLE
+  process_send_strs(keycode, record);
+#endif
+#ifdef NOT_DEAD_ENABLE
+  process_not_dead(keycode, record);
+#endif
+#ifdef ALT_SHIFT_ENABLE
+  if(!process_alt_shift_user(keycode, record)) {return false;}
+#endif
+#if defined( CONSOLE_ENABLE) && defined(CONSOLE_KEY_LOGGER_ENABLE)
+  process_console_key_logger(keycode, record);
+#endif
+#ifdef ONESHOT_MOD_ENABLE
+  int8_t keycode_consumed = 0;
+  keycode_consumed += update_oneshot_modifiers(keycode, record, keycode_consumed);
+#endif
+  return true;
+
+}
diff --git a/users/ericgebhart/extensions/extensions.h b/users/ericgebhart/extensions/extensions.h
new file mode 100644
index 0000000000..899dbdd3d6
--- /dev/null
+++ b/users/ericgebhart/extensions/extensions.h
@@ -0,0 +1,22 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+bool process_extensions(uint16_t keycode, keyrecord_t *record);
+
+#define PROCESS_EXTENSIONS                                      \
+  if (!process_extensions(keycode, record)) {return false;}
diff --git a/users/ericgebhart/extensions/key_overrides.h b/users/ericgebhart/extensions/key_overrides.h
new file mode 100644
index 0000000000..3fb0c9a5bb
--- /dev/null
+++ b/users/ericgebhart/extensions/key_overrides.h
@@ -0,0 +1,53 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef KEY_OVERRIDE_ENABLE
+
+#define KO_NAME(name, ...) &name,
+#define KO_T(name) const key_override_t name
+
+#undef KOL
+#define KOL(name, mods, modded_key, replacement, layer)                 \
+  KO_T(name) = ko_make_with_layers(mods, modded_key, replacement, (1 << layer));
+
+#define KO(name, mods, key, replacement)                \
+  KO_T(name) = ko_make_basic(mods, key, replacement)
+
+#define KOLN(name, mods, key, replacement, layers, neg_mods)            \
+  KO_T(name) = ko_make_with_layers_and_negmods(mods, key, replacement, layers, neg_mods)
+
+#define KOLNO(name, mods, key, replacement, layers, neg_mods, options)  \
+  KO_T(name) = ko_make_with_layers_negmods_and_options                  \
+    (mods, key, replacement, layers, neg_mods, options)
+
+#include "key_overrides.def"
+
+#undef KO
+#undef KOL
+#undef KOLN
+#undef KOLNO
+#define KO KO_NAME
+#define KOL KO_NAME
+#define KOLN KO_NAME
+#define KOLNO KO_NAME
+
+// This globally defines all key overrides to be used
+const key_override_t **key_overrides = (const key_override_t *[]){
+#include "key_overrides.def"
+  NULL // Null terminate the array of overrides!
+};
+#endif
diff --git a/users/ericgebhart/extensions/keycodes.h b/users/ericgebhart/extensions/keycodes.h
new file mode 100755
index 0000000000..a3c5d72a09
--- /dev/null
+++ b/users/ericgebhart/extensions/keycodes.h
@@ -0,0 +1,523 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "quantum.h"
+#include "process_keycode/process_tap_dance.h"
+#include "eeconfig.h"
+#include "keymap_bepo.h"
+//#include "keymap_us_international.h"
+#include "keymap_us_international_linux.h"
+#include "lang.h"
+#include "ericgebhart.h"
+
+//#define ONESHOT_TAP_TOGGLE 2  /* Tapping this number of times holds the key until tapped once again. */
+
+// #define DEFAULT_LANG EN // US_INT // EN, BEPO, US_INT, EURkey
+
+#define KEY_NAME(NAME, ...) NAME,
+#define BLANK(...)
+
+bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
+
+enum userspace_custom_keycodes {
+  // Get all the custom keys from the defs if we can.
+  ALT_LOCAL_KEYS_START = SAFE_RANGE,
+#ifdef ALT_LOCAL_ENABLE
+#undef MK_KEY
+#define MK_KEY KEY_NAME
+#undef MK_SKEY
+#define MK_SKEY KEY_NAME
+#include "altlocal_keys.def"
+#undef MK_KEY
+#undef MK_SKEY
+#endif
+  ALT_LOCAL_KEYS_END,
+
+#ifdef ACCENTED_KEYS_ENABLE
+#undef ACCENTED
+#define ACCENTED KEY_NAME
+#include "accented_keys.def"
+#undef ACCENTED
+#endif
+
+#ifdef TAP_HOLD_ENABLE
+#undef TP_TPL
+#define TP_TPL KEY_NAME
+#undef TP_SML
+#define TP_SML KEY_NAME
+#undef OPEN_OCL
+#define OPEN_OCL KEY_NAME
+#undef OPEN_OCL_ND
+#define OPEN_OCL_ND KEY_NAME
+#include "tap_hold.def"
+#undef OPEN_OCL
+#undef OPEN_OCL_ND
+#undef TP_TPL
+#undef TP_SML
+#endif
+
+#ifdef UNICODE_ENABLE
+#undef UC_STR
+#define UC_STR KEY_NAME
+#include "unicode.def"
+#undef UC_STR
+#endif
+
+#ifdef SEND_STRING_ENABLE
+#undef SEND_STR
+#define SEND_STR KEY_NAME
+#undef SEND_STR_DELAY
+#define SEND_STR_DELAY KEY_NAME
+#include "send_string.def"
+#undef SEND_STR
+#undef SEND_STR_DELAY
+#endif
+
+#ifdef SMART_LOCK_ENABLE
+#undef SMLM
+#define SMLM KEY_NAME
+#undef SMLL
+#define SMLL KEY_NAME
+#include "smart_lock.def"
+#undef SMLM
+#undef SMLL
+#endif
+
+#ifdef MOD_LOCK_ENABLE
+#undef IGNORE_KC
+#define IGNORE_KC BLANK
+#undef MODL
+#define MODL KEY_NAME
+#include "mod_lock.def"
+#undef IGNORE_KC
+#undef MODL
+#endif
+
+
+#undef IGNORE_KEY
+#define IGNORE_KEY BLANK
+#undef CANCEL_KEY
+#define CANCEL_KEY BLANK
+#undef ONESHOT
+#undef NSHOT
+#define ONESHOT KEY_NAME
+#define NSHOT KEY_NAME
+
+#ifdef NSHOT_ENABLE
+#include "nshot.def"
+#else
+  TS_RCTL,
+  TS_LCTL,
+#endif
+
+#ifdef ONESHOT_MOD_ENABLE
+#include "oneshot.def"
+#endif
+
+#undef IGNORE_KEY
+#undef CANCEL_KEY
+#undef ONESHOT
+#undef NSHOT
+
+#ifdef SWAPPER_ENABLE
+#undef SWAPPER_KEY
+#define SWAPPER_KEY KEY_NAME
+#include "swapper.def"
+#undef SWAPPER_KEY
+#endif
+
+#ifdef NOT_DEAD_ENABLE
+#undef NOT_DEAD
+#define NOT_DEAD KEY_NAME
+#include "not_dead.def"
+#undef NOT_DEAD
+#endif
+
+#include "custom_keys.def"
+  NEW_SAFE_RANGE
+};
+
+#define FIRST_LAYER (BEGINNING_OF_BASE_LAYERS + 1)
+
+#define TL_DQUO TLKC(_DQUO)
+#define TL_QUOT TLKC(_QUOT)
+#define TL_COMM TLKC(_COMM)
+#define TL_DOT  TLKC(_DOT)
+#define TL_SCLN TLKC(_SCLN)
+#define TL_SLSH TLKC(_SLSH)
+#define TL_EXLM TLKC(_EXLM)
+#define TL_MINS TLKC(_MINS)
+#define TL_LPRN TLKC(_LPRN)
+#define TL_LCBR TLKC(_LCBR)
+#ifdef SYMBOL_LAYER_ENABLE
+#define TL_DOT_SYMB LT(LN_SYMB, LANG_KC(TL_DOT))
+#endif
+
+
+#define BP_LT BP_LABK
+#define BP_GT BP_RABK
+#define BP_TAB KC_TAB
+#define US_GT US_RABK
+#define US_LT US_LABK
+#define US_TAB KC_TAB
+#define US_DCMM KC_COMM // us doesn't have this dead key.
+
+// this is odd, there is interplay between this and
+// the not-dead extension. - and tap-hold not-dead.
+#undef US_TILD
+#define US_TILD KC_TILD
+// redefine us_circ so we actually get a circ.
+#undef US_CIRC
+#define US_CIRC KC_CIRC
+#define US_EQUAL KC_EQUAL
+// redefine us_quote so we actually get a quote.
+#undef US_QUOT
+#define US_QUOT KC_QUOT
+
+#define US_PRINT_SCREEN KC_PRINT_SCREEN
+#define US_SCROLL_LOCK KC_SCROLL_LOCK
+#define US_PAUSE KC_PAUSE
+#define BP_PRINT_SCREEN KC_PRINT_SCREEN
+#define BP_SCROLL_LOCK KC_SCROLL_LOCK
+#define BP_PAUSE KC_PAUSE
+
+#define BP_F1 KC_F1
+#define BP_F2 KC_F2
+#define BP_F3 KC_F3
+#define BP_F4 KC_F4
+#define BP_F5 KC_F5
+#define BP_F6 KC_F6
+#define BP_F7 KC_F7
+#define BP_F8 KC_F8
+#define BP_F9 KC_F9
+#define BP_F10 KC_F10
+#define BP_F11 KC_F11
+#define BP_F12 KC_F12
+#define BP_TRNS KC_TRNS
+
+#define US_F1 KC_F1
+#define US_F2 KC_F2
+#define US_F3 KC_F3
+#define US_F4 KC_F4
+#define US_F5 KC_F5
+#define US_F6 KC_F6
+#define US_F7 KC_F7
+#define US_F8 KC_F8
+#define US_F9 KC_F9
+#define US_F10 KC_F10
+#define US_F11 KC_F11
+#define US_F12 KC_F12
+#define US_TRNS KC_TRNS
+
+#ifdef KEYPAD_LAYER_ENABLE
+#define TT_KEYPAD TT(LANG_N(_KEYPAD))
+#define MO_KEYPAD MO(LANG_N(_KEYPAD))
+#else
+#define TT_KEYPAD ___
+#define MO_KEYPAD ___
+#endif
+
+#ifdef SYMBOL_LAYER_ENABLE
+#define TT_SYMB TT(LANG_N(_SYMB))
+#define MO_SYMB MO(LANG_N(_SYMB))
+#define OSL_SYMB OSL(LANG_N(_SYMB))
+#else
+#define TT_SYMB ___
+#define MO_SYMB ___
+#define OSL_SYMB ___
+#endif
+
+#ifdef TOPROWS_LAYER_ENABLE
+#define TT_TOPROWS TT(LANG_N(_TOPROWS))
+#define MO_TOPROWS MO(LANG_N(_TOPROWS))
+#else
+#define TT_TOPROWS ___
+#define MO_TOPROWS ___
+#endif
+
+#ifdef RGB_LAYER_ENABLE
+#define MO_RGB MO(_RGB)
+#else
+#define MO_RGB ___
+#endif
+
+#ifdef ADJUST_LAYER_ENABLE
+#define MO_ADJUST MO(_ADJUST)
+#else
+#define MO_ADJUST ___
+#endif
+
+#ifdef ACCENTS_MORTE_LAYER_ENABLE
+//#define LN_ACCENTS_MORTE LANG_N(_ACCENTS_MORTE)
+#define OSL_ACCENTS_MORTE OSL(LANG_N(_ACCENTS_MORTE))
+#else
+#define OSL_ACCENTS_MORTE ___
+#endif
+
+#ifdef ACCENTS_LAYER_ENABLE
+#define LN_ACCENTS LANG_N(_ACCENTS)
+#define OSL_ACCENTS OSL(LN_ACCENTS)
+#else
+#define OSL_ACCENTS ___
+#endif
+
+#ifdef MORTE_LAYER_ENABLE
+#define LN_MORTE LANG_N(_MORTE)
+#define OSL_MORTE OSL(LN_MORTE)
+#else
+#define OSL_MORTE ___
+#endif
+
+#define CTLGUI_T(kc) MT(MOD_LGUI | MOD_LCTL, kc)
+#define SFTGUI_T(kc) MT(MOD_LGUI | MOD_LSFT, kc)
+#define ALTGUI_T(kc) MT(MOD_LGUI | MOD_LALT, kc)
+
+#define ALT_ENT     ALGR_T(KC_ENT)       // Alt oor nter
+#define CTL_ENT     CTL_T(KC_ENT)       // ctrl or space
+#define CTL_SPC     CTL_T(KC_SPC)       // ctrl or space
+#define CTL_BSPC    CTL_T(KC_BSPC)      // ctrl or backspace
+#define ALT_DEL     ALT_T(KC_DEL)       // Alt or delete
+#define GUI_ESC     GUI_T(KC_ESC)       // Gui or escape
+#define ALGR_SYMB   ALGR_T(TG(LANG_N(_SYMB))) // Alt gre or toggle symbol layer
+
+// one shot on tap, or hold like usual
+#define OSLCTL_CTL CTL_T(OS_LCTL)
+#define OSLSFT_SFT SFT_T(OS_LSFT)
+#define OSLALT_ALT ALT_T(OS_LALT)
+#define OSLGUI_GUI GUI_T(OS_LGUI)
+
+/* miryoku */
+/*   esc_media, space_navnm, tab_navm,  ENT_SYM, BSPC_TOPR, del_fun */
+/* hands down */
+/* TL_COMM, TL_DOT_SYMB, GUI_ESC, ALT_ENT, SPC_TOPR, BSPC */
+
+// Lots of LT options.  My thumb keys.
+#ifdef TOPROWS_LAYER_ENABLE
+#define LN_TOPROWS LANG_N(_TOPROWS)
+#else
+#define LN_TOPROWS KC_NO
+#endif
+
+#ifdef SYMBOL_LAYER_ENABLE
+#  define LN_SYMB LANG_N(_SYMB)
+#  define TH_LTR_SYM LT(LN_SYMB, THUMB_LETTER)
+#else
+#  define TH_LTR_SYM THUMB_LETTER
+#endif
+
+#define TH_LTR_NAV LT(_NAV, THUMB_LETTER)
+
+#define LN_KEYPAD LANG_N(_KEYPAD)
+
+#define ACCENTS_RALT MT(MOD_RALT, OSL_ACCENTS)
+#define ACCENTS_CTL MT(MOD_LCTL, OSL_ACCENTS)
+#define ENT_SYM LT(LN_SYMB, KC_ENT)
+#define ENT_NAV LT(_NAV, KC_ENT)
+#define ENT_TOPR LT(LN_TOPROWS, KC_ENT)
+
+#define ESC_TOPR LT(LN_TOPROWS, KC_ESC)
+#define ESC_SYMB LT(LN_SYMB, KC_ESC)
+#define ESC_NUM LT(LN_KEYPAD, KC_ESC)
+#define ESC_MEDIA LT(_MEDIA, KC_ESC)
+
+#define DEL_FUN LT(_FUN, KC_DEL)
+#define TAB_NAVM LT(_NAVm, KC_TAB)
+#define TAB_NUM LT(LN_KEYPAD, KC_TAB)
+#define I_SYMB LT(LN_SYMB, KC_I)
+
+#define SPC_NAVm   LT(_NAVm, KC_SPC)
+#define SPC_NAVnm  LT(_NAVnm, KC_SPC)
+#define SPC_NAV    LT(_NAV, KC_SPC)
+#define SPC_SYMB   LT(LN_SYMB, KC_SPC)
+#define SPC_TOPR   LT(LN_TOPROWS, KC_SPC)
+#define SPC_LAYR   LT(_LAYERS, KC_SPC)
+#define SPC_ADJ    LT(_ADJUST, KC_SPC)
+#define SPC_NUM    LT(LN_KEYPAD, KC_SPC)
+
+#define BSPC_NAVm  LT(_NAVm, KC_BSPC)
+#define BSPC_NAV   LT(_NAV, KC_BSPC)
+#ifdef SYMBOL_LAYER_ENABLE
+#define BSPC_SYMB  LT(LN_SYMB, KC_BSPC)
+#else
+#define BSPC_SYMB  KC_BSPC
+#endif
+#define BSPC_TOPR  LT(LN_TOPROWS, KC_BSPC)
+#define BSPC_NUM   LT(LN_KEYPAD, KC_BSPC)
+#define BSPC_ALT   MT(MOD_LALT, KC_BSPC)
+#define BSPC_MEDIA LT(_MEDIA, KC_BSPC)
+
+#define KC_BKTAB    LSFT(KC_TAB)
+
+// layer toggles
+#define LAYER_OSL   OSL(_LAYERS)
+#define SYM_OSL     OSL(LN_SYMB)
+#define SYM_TG      TG(LN_SYMB)
+#define SYM_MO      MO(LN_SYMB)
+#define NAV_TG      TG(_NAV)
+#define COMBO_REF_TG_EN TG(_COMBO_REF)
+#define NUM_OSL     OSL(LN_KEYPAD)
+#define NUM_TO      TO(LN_KEYPAD)
+#define FUN_OSL     OSL(LN_FUNC)
+#define SYS_OSL     OSL(LN_SYSTEM)
+#define SYS_TG      TG(LN_SYSTEM)
+
+// Shortcuts
+#define S_CUT       S(KC_DEL)
+#define S_COPY      C(KC_INS)
+#define S_PASTE     S(KC_INS)
+#define S_UNDO      C(KC_Z)
+#define S_REDO      C(KC_Y)
+#define S_SAVE      C(KC_S)
+#define S_ALL       C(KC_A)
+#define S_BACK      A(KC_LEFT)
+#define S_FWD       A(KC_RIGHT)
+#define C_BSPC      C(KC_BSPC)
+#define SCREEN      S(C(KC_PSCR))
+
+// One Shot Mods keycodes,
+#define KC_MLSF OSM(MOD_LSFT)
+#define KC_MRSF OSM(MOD_RSFT)
+#define OS_LGUI OSM(MOD_LGUI)
+#define OS_RGUI OSM(MOD_RGUI)
+#define OS_LSFT OSM(MOD_LSFT)
+#define OS_RSFT OSM(MOD_RSFT)
+#define OS_LCTL OSM(MOD_LCTL)
+#define OS_RCTL OSM(MOD_RCTL)
+#define OS_LALT OSM(MOD_LALT)
+#define OS_RALT OSM(MOD_RALT)
+#define ALT_APP ALT_T(KC_APP)
+
+#define MG_NKRO MAGIC_TOGGLE_NKRO
+
+#define UC_IRNY UC(0x2E2E)
+#define UC_CLUE UC(0x203D)
+
+
+////  TAP DANCE
+
+typedef struct {
+  bool is_press_action;
+  int state;
+} tdtap;
+
+enum {
+  SINGLE_TAP = 1,
+  SINGLE_HOLD = 2,
+  DOUBLE_TAP = 3,
+  DOUBLE_HOLD = 4,
+  DOUBLE_SINGLE_TAP = 5, //send two single taps
+  TRIPLE_TAP = 6,
+  TRIPLE_HOLD = 7
+};
+
+//Tap Dance Declarations
+enum {
+  TD_ESC_CAPS = 0,
+  TD_TAB_BKTAB = 1,
+  TD_MDIA_SYMB = 2,
+  TD_HOME_END = 3,
+  TD_XMONAD_ESC = 4,
+  TD_DEF_LAYER_SW = 5,
+  TD_DEF_OS_LAYER_SW = 6,
+  TD_MOUSE_BTNS = 7,
+  TD_DVORAK_BEPO = 8,
+  TD_UP_HOME = 9,
+  TD_DOWN_END = 10,
+  TD_RIGHT_TAB = 11,
+  TD_LEFT_BACKTAB = 12
+};
+
+
+// Tap dance
+#define TAB_BKTAB       TD(TD_TAB_BKTAB)  // Tab or backtab tapdance.
+#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB)  // MDIA, symb, keypad, layouts layer tapdance toggle.
+#define DEF_LAYER_SW    TD(TD_DEF_LAYER_SW)  // dvorak, dvorak_on_bepo, bepo default layer
+#define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW)  // dvorak, dvorak_on_bepo, bepo default layer
+#define HOME_END        TD(TD_HOME_END)  // home or end tapdance.
+#define XMONAD_ESC      TD(TD_XMONAD_ESC)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
+#define DVORAK_ET_BEPO  TD(TD_DVORAK_BEPO)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
+#define TDMOUSE_BTNS    TD(TD_MOUSE_BTNS)  // hmmm. 1-5
+#define RIGHT_TAB       TD(TD_RIGHT_TAB)   // Bad idea these 4. Maybe with good timing...
+#define LEFT_BACKTAB    TD(TD_LEFT_BACKTAB)
+#define UP_HOME         TD(TD_UP_HOME)
+#define DOWN_END        TD(TD_DOWN_END)  //  No! Down Down Not End....
+
+// HOME ROW LAYER TOGGLE (LT) and Shift.
+// both sides of the home row have  "shift, ___, media , symb, ___"  and  "___, symb, media, ___, shift".
+// so pinky fingers are shift when held and the index and second fingers are symbol and
+// media layers when held.
+
+// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators).
+// The KC_CCCV key takes care of the last two...
+#define MK_CUT    LSFT(KC_DEL)  // shift + delete
+#define MK_COPY   LCTL(KC_INS)  // ctrl + insert
+#define MK_PASTE  LSFT(KC_INS)  // shift + insert
+#define EOT     LCTL(KC_D)
+#define NAK     LCTL(KC_U)
+#define XPASTE   LCTL(LSFT(KC_V))
+#define UNDO    LCTL(KC_Z)
+#define XCOPY   LCTL(LSFT(KC_C))
+
+#undef ___ //kint defines it as KC_NO
+#define ___ KC_TRNS
+#define XXX KC_NO
+#define ____ _TRNS
+
+// Blocking keys
+#define _X_ XXX
+#define ___X___ XXX
+#define ___X2___ XXX, XXX
+#define ___X3___ ___X2___, XXX
+#define ___X4___ ___X3___, XXX
+#define ___X5___ ___X4___, XXX
+#define ___X6___ ___X5___, XXX
+#define ___X12___ ___X6___, ___X6___
+#define ___X15___ ___X5___, ___X5___,  ___X5___
+
+// Transparent keys
+#define ___2___ ___, ___
+#define ___3___ ___2___, ___
+#define ___4___ ___3___, ___
+#define ___5___ ___4___, ___
+#define ___6___ ___5___, ___
+#define ___10___ ___6___, ___4___
+#define ___12___ ___6___, ___6___
+#define ___14___ ___5___, ___4___,  ___5___
+#define ___15___ ___5___, ___5___,  ___5___
+#define ___16___ ___15___, ___
+
+#define ____2_ ____, ____
+#define ____3_ ____2_, ____
+#define ____4_ ____3_, ____
+#define ____5_ ____4_, ____
+#define ____6_ ____5_, ____
+#define ____10_ ____6_, ____4_
+#define ____12_ ____6_, ____6_
+#define ____14_ ____5_, ____4_,  ____5_
+#define ____15_ ____5_, ____5_,  ____5_
+#define ____16_ ____15_, ____
+
+int on_qwerty(void);
+
+#ifdef TAP_DANCES_ENABLE
+int cur_dance (qk_tap_dance_state_t *state);
+
+//for the x tap dance. Put it here so it can be used in any keymap
+void x_finished (qk_tap_dance_state_t *state, void *user_data);
+void x_reset (qk_tap_dance_state_t *state, void *user_data);
+#endif
diff --git a/users/ericgebhart/extensions/keymap_combo.h b/users/ericgebhart/extensions/keymap_combo.h
new file mode 100644
index 0000000000..cd9684e601
--- /dev/null
+++ b/users/ericgebhart/extensions/keymap_combo.h
@@ -0,0 +1,139 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Keymap helpers
+void process_combo_event(uint16_t combo_index, bool pressed);
+
+
+// define reference layers per layer.
+#define REF_LAYER(LAYER, REF_LAYER)             \
+  case LAYER: return REF_LAYER;
+
+#define K_ENUM(name, key, ...) name,
+#define K_DATA(name, key, ...) const uint16_t PROGMEM cmb_##name[] = {__VA_ARGS__, COMBO_END};
+#define K_COMB(name, key, ...) [name] = COMBO(cmb_##name, key),
+
+#define A_ENUM(name, string, ...) name,
+#define A_DATA(name, string, ...) const uint16_t PROGMEM cmb_##name[] = {__VA_ARGS__, COMBO_END};
+#define A_COMB(name, string, ...) [name] = COMBO_ACTION(cmb_##name),
+#define A_ACTI(name, string, ...)         \
+    case name:                            \
+        if (pressed) SEND_STRING(string); \
+        break;
+
+#define A_TOGG(name, layer, ...)          \
+    case name:                            \
+        if (pressed) layer_invert(layer); \
+        break;
+
+#define BLANK(...)
+// Generate data needed for combos/actions
+// Create Enum
+#define COMBO_REF_LAYER BLANK
+#undef COMB
+#undef SUBS
+#undef TOGG
+#define COMB K_ENUM
+#define SUBS A_ENUM
+#define TOGG A_ENUM
+enum combos {
+#include "combos.def"
+    COMBO_LENGTH
+};
+// Export length to combo module
+uint16_t COMBO_LEN = COMBO_LENGTH;
+
+// Bake combos into mem
+#undef COMB
+#undef SUBS
+#undef TOGG
+#define COMB K_DATA
+#define SUBS A_DATA
+#define TOGG A_DATA
+#include "combos.def"
+#undef COMB
+#undef SUBS
+#undef TOGG
+
+// Fill combo array
+#define COMB K_COMB
+#define SUBS A_COMB
+#define TOGG A_COMB
+combo_t key_combos[] = {
+#include "combos.def"
+};
+#undef COMB
+#undef SUBS
+#undef TOGG
+
+// Fill QMK hook
+#define COMB BLANK
+#define SUBS A_ACTI
+#define TOGG A_TOGG
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+#if defined( CONSOLE_ENABLE) && defined(CONSOLE_KEY_LOGGER_ENABLE)
+  if (pressed) {
+    combo_t *combo = &key_combos[combo_index];
+    uint8_t idx = 0;
+    uint16_t combo_keycode;
+    while ((combo_keycode = pgm_read_word(&combo->keys[idx])) != COMBO_END) {
+      uprintf("0x%04X,NA,NA,%u,%u,0x%02X,0x%02X,0\n",
+              combo_keycode,
+              /* <missing row information> */
+              /* <missing column information> */
+              get_highest_layer(layer_state),
+              pressed,
+              get_mods(),
+              get_oneshot_mods()
+              );
+      idx++;
+    }
+  }
+#endif
+  switch (combo_index) {
+#include "combos.def"
+  }
+
+  // Allow user overrides per keymap
+#if __has_include("inject.h")
+# include "inject.h"
+#endif
+}
+
+#undef COMB
+#undef SUBS
+#undef TOGG
+
+#define COMB BLANK
+#define SUBS BLANK
+#define TOGG BLANK
+
+#undef COMBO_REF_LAYER
+#define COMBO_REF_LAYER REF_LAYER
+
+uint16_t combo_ref_from_layer(uint16_t layer){
+  switch (biton32(layer_state)){
+#include "combos.def"
+
+#ifdef COMBO_REF_DEFAULT
+  default: return COMBO_REF_DEFAULT;
+#else
+  default: return layer;
+#endif
+  }
+}
diff --git a/users/ericgebhart/extensions/mod_lock.c b/users/ericgebhart/extensions/mod_lock.c
new file mode 100644
index 0000000000..c78f7cdfe8
--- /dev/null
+++ b/users/ericgebhart/extensions/mod_lock.c
@@ -0,0 +1,81 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>, @possumvibes
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Derived from mod_lock by @possumvibes.
+
+#include "mod_lock.h"
+
+#undef MODL
+#define MODL(KEYCODE, MODKC)                    \
+  {false, MODKC, KEYCODE},
+
+#define A_KEY(KEYCODE) case KEYCODE:
+#define BLANK(...)
+
+#undef IGNORE_KC
+#define IGNORE_KC BLANK
+
+mod_lock_state_t modlock_states[] = {
+#ifdef MOD_LOCK_ENABLE
+#include "mod_lock.def"
+#endif
+};
+uint8_t        NUM_MODLOCK_STATES = sizeof(modlock_states) / sizeof(mod_lock_state_t);
+
+void process_mod_lock(uint16_t keycode, keyrecord_t *record) {
+#ifdef MOD_LOCK_ENABLE
+  mod_lock_state_t *curr_state = NULL;
+
+  for (int i = 0; i < NUM_MODLOCK_STATES; ++i) {
+    curr_state = &modlock_states[i];
+
+    if (keycode == curr_state->trigger) {
+      if (record->event.pressed) {
+        if (curr_state->locking) {
+          unregister_code(curr_state->mod);
+        } else {
+          register_code(curr_state->mod);
+        }
+
+        curr_state->locking = !curr_state->locking;
+      }
+    } else {
+      // check for cancel condition on keydown and keyup
+      if (curr_state->locking && is_mod_lock_cancel_key(keycode)) {
+        unregister_code(curr_state->mod);
+        curr_state->locking = false;
+      }
+    }
+  }
+#endif
+}
+
+#undef MODL
+#undef IGNORE_KC
+#define MODL BLANK
+#define IGNORE_KC A_KEY
+bool is_mod_lock_cancel_key(uint16_t keycode) {
+    // Mod locks are exclusively used on the nav layer.
+    // any key besides nav keys should cancel the lock.
+    switch (keycode) {
+#ifdef MOD_LOCK_ENABLE
+#include "mod_lock.def"
+#endif
+      return false;
+    default:
+            return true;
+    }
+}
diff --git a/users/ericgebhart/extensions/mod_lock.h b/users/ericgebhart/extensions/mod_lock.h
new file mode 100644
index 0000000000..d9e6106c4e
--- /dev/null
+++ b/users/ericgebhart/extensions/mod_lock.h
@@ -0,0 +1,39 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include USERSPACE_H
+
+typedef struct {
+    bool          locking;
+    uint16_t      mod;
+    uint16_t      trigger;
+} mod_lock_state_t;
+
+extern mod_lock_state_t mod_lock_states[];
+extern uint8_t          NUM_MODLOCK_STATES;
+
+// Custom mod-locking functionality that registers the mod and
+// keeps it registered until the trigger key is tapped again
+// or until a specified cancel key is tapped.
+void process_mod_lock(uint16_t keycode, keyrecord_t *record);
+
+bool is_mod_lock_cancel_key(uint16_t keycode);
+
+#undef IGNORE_KC
+#define IGNORE_KC(KC)                           \
+  case KC:
diff --git a/users/ericgebhart/extensions/not_dead.c b/users/ericgebhart/extensions/not_dead.c
new file mode 100644
index 0000000000..8369edd52d
--- /dev/null
+++ b/users/ericgebhart/extensions/not_dead.c
@@ -0,0 +1,36 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include USERSPACE_H
+
+inline void not_dead(uint16_t kc1, keyrecord_t *record) {
+  if (record->event.pressed) {
+    tap_code16(kc1);
+    tap_code16(KC_SPACE);
+  }
+}
+
+#define NOT_DEAD(KCKEY, KC01)             \
+  case KCKEY:                             \
+  not_dead(KC01, record);                 \
+  break;                                  \
+
+void process_not_dead(uint16_t keycode, keyrecord_t *record) {
+  switch(keycode){
+#include "not_dead.def"
+  }
+}
diff --git a/users/ericgebhart/extensions/nshot_mod.c b/users/ericgebhart/extensions/nshot_mod.c
new file mode 100644
index 0000000000..1346f7eba6
--- /dev/null
+++ b/users/ericgebhart/extensions/nshot_mod.c
@@ -0,0 +1,154 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>, @possumvibes
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Derived from nshot_mod by @possumvibes.
+// Derived from one shot_mod by @Callum.
+
+#include "nshot_mod.h"
+#include USERSPACE_H
+
+#undef NSHOT
+#define NSHOT(KEYCODE, MOD, COUNT)              \
+  {KEYCODE, MOD, COUNT, os_up_unqueued, 0},
+
+#undef ONESHOT
+#define ONESHOT(KEYCODE, MOD) NSHOT(KEYCODE, MOD, 1)
+#define A_KEY(KEYCODE) case KEYCODE:
+#define BLANK(...)
+
+#define CANCEL_KEY BLANK
+#define IGNORE_KEY BLANK
+nshot_state_t  nshot_states[] = {
+#include "nshot.def"
+};
+uint8_t        NUM_NSHOT_STATES = sizeof(nshot_states) / sizeof(nshot_state_t);
+
+bool process_nshot_state(uint16_t keycode, keyrecord_t *record) {
+  nshot_state_t *curr_state = NULL;
+
+  switch(keycode){
+  case CLEAR: {
+    clear_oneshot_mods();
+    clear_mods();
+    return false;
+  }
+  case PANIC: {
+    clear_oneshot_mods();
+    clear_mods();
+    if (get_oneshot_layer() != 0) {
+      clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+    }
+    layer_move(0);
+    return false;
+  }
+  }
+
+  for (int i = 0; i < NUM_NSHOT_STATES; ++i) {
+    curr_state = &nshot_states[i];
+
+    if (keycode == curr_state->trigger) {
+      if (record->event.pressed) {
+        // Trigger keydown
+        if (curr_state->state == os_up_unqueued) {
+          register_code(curr_state->mod);
+        }
+        curr_state->state = os_down_unused;
+        curr_state->count = 0;
+      } else {
+        // Trigger keyup
+        switch (curr_state->state) {
+        case os_down_unused:
+          // If we didn't use the mod while trigger was held, queue it.
+          curr_state->state = os_up_queued;
+          break;
+        case os_down_used:
+          // If we did use the mod while trigger was held, unregister it.
+          curr_state->state = os_up_unqueued;
+          unregister_code(curr_state->mod);
+          break;
+        default:
+          break;
+        }
+      }
+} else {
+       if (record->event.pressed) {
+         if (is_nshot_cancel_key(keycode) && curr_state->state != os_up_unqueued) {
+           // Cancel oneshot on designated cancel keydown.
+           curr_state->state = os_up_unqueued;
+           curr_state->count = 0;
+           unregister_code(curr_state->mod);
+         }
+       } else {
+         if (!is_nshot_ignored_key(keycode)) {
+           // On non-ignored keyup, consider the oneshot used.
+           switch (curr_state->state) {
+           case os_down_unused:
+             // The mod key is being held as a normal mod.
+             curr_state->state = os_down_used;
+             break;
+           case os_up_queued:
+             // The mod key is being used as an n-shot.
+             // Increment the keys-used count.
+             curr_state->count = curr_state->count + 1;
+
+             // If the n-shot max has been reached, complete the n-shot.
+             if (curr_state->count == curr_state->max_count) {
+               curr_state->state = os_up_unqueued;
+               curr_state->count = 0;
+               unregister_code(curr_state->mod);
+             }
+             break;
+           default:
+             break;
+           }
+         }
+       }
+     }
+   }
+  return true;
+}
+
+// turn off the nshot/oneshot macros
+#undef ONESHOT
+#undef NSHOT
+#define ONESHOT BLANK
+#define NSHOT BLANK
+
+#undef CANCEL_KEY
+#undef IGNORE_KEY
+#define IGNORE_KEY BLANK
+#define CANCEL_KEY A_KEY
+bool is_nshot_cancel_key(uint16_t keycode) {
+  switch (keycode) {
+#include "nshot.def"
+    return true;
+  default:
+    return false;
+  }
+}
+
+#undef CANCEL_KEY
+#undef IGNORE_KEY
+#define CANCEL_KEY BLANK
+#define IGNORE_KEY A_KEY
+bool is_nshot_ignored_key(uint16_t keycode) {
+    switch (keycode) {
+#include "nshot.def"
+      return true;
+    default:
+            return false;
+    }
+}
diff --git a/users/ericgebhart/extensions/nshot_mod.h b/users/ericgebhart/extensions/nshot_mod.h
new file mode 100644
index 0000000000..c5840e6bef
--- /dev/null
+++ b/users/ericgebhart/extensions/nshot_mod.h
@@ -0,0 +1,45 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Represents the four states an n-shot key can be in (from users/callum)
+typedef enum {
+    os_up_unqueued,
+    os_up_queued,
+    os_down_unused,
+    os_down_used,
+} oneshot_state;
+
+typedef struct {
+    uint16_t      trigger;
+    uint16_t      mod;
+    uint8_t       max_count;
+    oneshot_state state;
+    uint8_t       count;
+} nshot_state_t;
+
+extern nshot_state_t nshot_states[];
+extern uint8_t             NUM_NSHOT_STATES;
+
+
+// Keys that should cancel the n-shot mod if tapped
+bool is_nshot_cancel_key(uint16_t keycode);
+
+// Keys that should not count towards n-shot usage (e.g., layer toggles)
+bool is_nshot_ignored_key(uint16_t keycode);
diff --git a/users/ericgebhart/extensions/oneshot.c b/users/ericgebhart/extensions/oneshot.c
new file mode 100644
index 0000000000..83c8a04363
--- /dev/null
+++ b/users/ericgebhart/extensions/oneshot.c
@@ -0,0 +1,217 @@
+#include QMK_KEYBOARD_H
+#include USERSPACE_H
+#include "oneshot.h"
+
+#ifdef ONESHOT_MOD_ENABLE
+
+/* -------------------------------------------- */
+// Add to process_record_user.
+/* int8_t keycode_consumed = 0; */
+
+/* #ifdef ONESHOT_ENABLE */
+/* keycode_consumed += update_oneshot_modifiers(keycode, record, keycode_consumed); */
+/* #endif */
+/* -------------------------------------------- */
+
+#define ONESHOT(KEYCODE, MOD) case KEYCODE: return MOD;
+
+#define A_KEY(KEYCODE) case KEYCODE:
+#define BLANK(...)
+
+#define CANCEL_KEY BLANK
+#define IGNORE_KEY BLANK
+
+// the basic states a oneshot modifier can be in
+typedef enum {
+    ONESHOT_STATE_OFF          = 0,
+    ONESHOT_STATE_PRESSED      = 1,
+    ONESHOT_STATE_QUEUED       = 2,
+    ONESHOT_STATE_CAPSWORD     = 3,
+    ONESHOT_STATE_LOCK         = 4,
+    ONESHOT_STATE_END_PRESSED  = 5,
+} oneshot_state;
+
+oneshot_state modifiers_state_transitions_normal[5] = {ONESHOT_STATE_PRESSED, ONESHOT_STATE_QUEUED, ONESHOT_STATE_LOCK, ONESHOT_STATE_END_PRESSED, ONESHOT_STATE_END_PRESSED};
+
+static oneshot_state modifiers_with_state[ONESHOT_MOD_COUNT] = {
+    ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF,
+};
+
+// oneshot mods always get registered immediately to the operating system, but we also
+// need to keep track if the mod(s) got combined with a normal key (applied)
+static bool unapplied_mods_present = false;
+
+// keycode of the last pressed 'normal' key which haven't been released yet
+static uint16_t repeating_normal_key = 0;
+
+// utility functions (implemented at the bottom of this file)
+static void          set_modifier_state(oneshot_mod osmod, oneshot_state new_state);
+static int8_t        set_modifier_state_all(oneshot_state new_state);
+static void          set_modifier_state_all_from_to(oneshot_state oneshot_state_from, oneshot_state oneshot_state_to);
+static bool          all_modifiers_are_off(void);
+
+int8_t turnoff_oneshot_modifiers() {
+    return set_modifier_state_all(ONESHOT_STATE_OFF);
+}
+
+// see comment in corresponding headerfile
+int8_t update_oneshot_modifiers(uint16_t keycode, keyrecord_t *record, int8_t keycode_consumed) {
+
+    // cancel keys
+  if (is_oneshot_modifier_cancel_key(keycode) && record->event.pressed) {
+    if (keycode_consumed == 0) {
+      unapplied_mods_present = false;
+      keycode_consumed += set_modifier_state_all(ONESHOT_STATE_OFF);
+    } else {
+      keycode_consumed = 0;
+    }
+    return keycode_consumed;
+  }
+
+  // ignored keys
+  if (is_oneshot_modifier_ignored_key(keycode)) {
+    return keycode_consumed;
+  }
+
+  oneshot_mod osmod = get_modifier_for_trigger_key(keycode);
+
+  // trigger keys
+  if (osmod != ONESHOT_NONE) {
+    oneshot_state state = modifiers_with_state[osmod];
+    if (record->event.pressed) {
+      if (state == ONESHOT_STATE_OFF) {
+        unapplied_mods_present = (repeating_normal_key == 0);
+      }
+      oneshot_state tostate = modifiers_state_transitions_normal[state];
+      set_modifier_state(osmod, tostate);
+    } else {
+      if (state == ONESHOT_STATE_PRESSED) {
+        if (!unapplied_mods_present) {
+          set_modifier_state(osmod, ONESHOT_STATE_OFF);
+        } else {
+          set_modifier_state(osmod, ONESHOT_STATE_QUEUED);
+        }
+      } else if (state == ONESHOT_STATE_END_PRESSED) {
+        set_modifier_state(osmod, ONESHOT_STATE_OFF);
+      }
+    }
+  }
+  // normal keys
+  else {
+    if (record->event.pressed) {
+      if (!all_modifiers_are_off()) {
+        if (unapplied_mods_present) {
+          unapplied_mods_present = false;
+        } else {
+          unregister_code(repeating_normal_key);
+          set_modifier_state_all_from_to(ONESHOT_STATE_QUEUED, ONESHOT_STATE_OFF);
+        }
+      }
+      repeating_normal_key = keycode;
+    } else {
+      if (!all_modifiers_are_off()) {
+        unregister_code(keycode);
+        set_modifier_state_all_from_to(ONESHOT_STATE_QUEUED, ONESHOT_STATE_OFF);
+      }
+      repeating_normal_key = 0;
+    }
+  }
+
+  return 0;
+}
+
+// implementation of utility functions
+
+// registers/unregisters a mod to the operating system on state change if necessary
+void update_modifier(oneshot_mod osmod, oneshot_state previous_state, oneshot_state current_state) {
+    if (previous_state == ONESHOT_STATE_OFF) {
+        register_code(KC_LCTRL + osmod);
+    } else {
+        if (current_state == ONESHOT_STATE_OFF) {
+            unregister_code(KC_LCTRL + osmod);
+        }
+    }
+}
+
+void set_modifier_state(oneshot_mod osmod, oneshot_state new_state) {
+    oneshot_state previous_state = modifiers_with_state[osmod];
+    if (previous_state != new_state) {
+        modifiers_with_state[osmod] = new_state;
+        update_modifier(osmod, previous_state, new_state);
+    }
+}
+
+int8_t set_modifier_state_all(oneshot_state new_state) {
+    int8_t c = 0;
+    for (int8_t i = 0; i < ONESHOT_MOD_COUNT; i++) {
+        oneshot_state previous_state = modifiers_with_state[i];
+        if (previous_state != new_state) {
+            modifiers_with_state[i] = new_state;
+            update_modifier(i, previous_state, new_state);
+            c += 1;
+        }
+    }
+    return c;
+}
+
+void set_modifier_state_all_from_to(oneshot_state oneshot_state_from, oneshot_state oneshot_state_to) {
+    for (int8_t i = 0; i < ONESHOT_MOD_COUNT; i++) {
+        if (modifiers_with_state[i] == oneshot_state_from) {
+            modifiers_with_state[i] = oneshot_state_to;
+            update_modifier(i, oneshot_state_from, oneshot_state_to);
+        }
+    }
+}
+
+bool all_modifiers_are_off() {
+    for (int8_t i = 0; i < ONESHOT_MOD_COUNT; i++) {
+        if (modifiers_with_state[i] != ONESHOT_STATE_OFF) {
+            return false;
+        }
+    }
+    return true;
+}
+
+oneshot_mod get_modifier_for_trigger_key(uint16_t keycode)
+{
+  switch (keycode)
+    {
+#include "oneshot.def"
+      return true;
+    default:
+      return ONESHOT_NONE;
+    }
+}
+
+// turn off the oneshot macros
+#undef ONESHOT
+#define ONESHOT BLANK
+#define NSHOT BLANK
+
+#undef CANCEL_KEY
+#undef IGNORE_KEY
+#define CANCEL_KEY A_KEY
+#define IGNORE_KEY BLANK
+bool is_oneshot_modifier_cancel_key(uint16_t keycode) {
+  switch (keycode) {
+#include "oneshot.def"
+    return true;
+  default:
+    return false;
+  }
+}
+
+#undef CANCEL_KEY
+#undef IGNORE_KEY
+#define CANCEL_KEY BLANK
+#define IGNORE_KEY A_KEY
+bool is_oneshot_modifier_ignored_key(uint16_t keycode) {
+  switch (keycode) {
+#include "oneshot.def"
+    return true;
+  default:
+    return false;
+  }
+}
+
+#endif
diff --git a/users/ericgebhart/extensions/oneshot.h b/users/ericgebhart/extensions/oneshot.h
new file mode 100644
index 0000000000..774dc4ab39
--- /dev/null
+++ b/users/ericgebhart/extensions/oneshot.h
@@ -0,0 +1,37 @@
+#define ENABLE_ONESHOT
+#ifdef ENABLE_ONESHOT
+#pragma once
+
+typedef enum {
+  ONESHOT_LCTL = 0,
+  ONESHOT_LSFT = 1,
+  ONESHOT_LALT = 2,
+  ONESHOT_LGUI = 3,
+  ONESHOT_RCTL = 4,
+  ONESHOT_RSFT = 5,
+  ONESHOT_RALT = 6,
+  ONESHOT_RGUI = 7,
+  ONESHOT_NONE = 8,
+  ONESHOT_MOD_COUNT = 8,
+} oneshot_mod;
+
+
+// This function should be called inside proces_record_user and does everything needed to get one shot modifiers working.
+// Returns true if the keycode needs further handling, false otherwise.
+int8_t update_oneshot_modifiers(uint16_t keycode, keyrecord_t *record, int8_t keycode_consumed);
+int8_t turnoff_oneshot_modifiers(void);
+
+// TO BE IMPLEMENTED BY THE USER
+// This function should return one of the oneshot_mod enumerations (see keymap.c implementation)
+oneshot_mod get_modifier_for_trigger_key(uint16_t keycode);
+
+// TO BE IMPLEMENTED BY THE USER
+// This function should return true for keycodes that must be ignored in the oneshot modifier behaviour.
+// You probably want to ignore layer keys. Trigger keys don't need to be specified here.
+bool is_oneshot_modifier_ignored_key(uint16_t keycode);
+
+// TO BE IMPLEMENTED BY THE USER
+// This function should return true for keycodes that should reset all oneshot modifiers.
+bool is_oneshot_modifier_cancel_key(uint16_t keycode);
+
+#endif
diff --git a/users/ericgebhart/extensions/process_locales.h b/users/ericgebhart/extensions/process_locales.h
new file mode 100644
index 0000000000..d0f7af53bf
--- /dev/null
+++ b/users/ericgebhart/extensions/process_locales.h
@@ -0,0 +1,29 @@
+#pragma once
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include USERSPACE_H
+
+// Stuff we need for locale and layer switching
+// there can be more but we need to know where they start and end.
+// remember there's limitations on layers.
+// Our locales. so it's easy to switch between them.
+
+bool process_locales(uint16_t keycode, keyrecord_t *record);
+
+#define PROCESS_LOCALES                                         \
+  if (!process_locales(keycode, record)) { return false; }
diff --git a/users/ericgebhart/extensions/process_nshot.h b/users/ericgebhart/extensions/process_nshot.h
new file mode 100644
index 0000000000..1ec42db478
--- /dev/null
+++ b/users/ericgebhart/extensions/process_nshot.h
@@ -0,0 +1,21 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Custom one-or-more-shot implementation that does not rely on timers
+// and persists across layer changes. Based on the users/callum implementation
+// at https://github.com/callum-oakley/qmk_firmware/tree/master/users/callum
+bool process_nshot_state(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/extensions/process_smart_lock.h b/users/ericgebhart/extensions/process_smart_lock.h
new file mode 100644
index 0000000000..b8e2fb2735
--- /dev/null
+++ b/users/ericgebhart/extensions/process_smart_lock.h
@@ -0,0 +1,19 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+///* -------- Process Record -------- */
+void process_smart_lock(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/extensions/quick_tap.c b/users/ericgebhart/extensions/quick_tap.c
new file mode 100644
index 0000000000..8c25f153bd
--- /dev/null
+++ b/users/ericgebhart/extensions/quick_tap.c
@@ -0,0 +1,37 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>, @possumvibes
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// written by @dnaq.
+#if defined( global_quick_tap) && defined(CONSOLE_KEY_LOGGER_ENABLE)
+    bool process_global_quick_tap(uint16_t keycode, keyrecord_t *record) {
+      static uint16_t global_quick_tap_timer = 0;
+      if (keycode < QK_MOD_TAP || keycode > QK_MOD_TAP_MAX) {
+        global_quick_tap_timer = timer_read();
+        return true;
+      }
+      if (timer_elapsed(global_quick_tap_timer) > TAPPING_TERM) {
+        return true;
+      }
+      if (record->event.pressed) {
+        keycode = keycode & 0xFF;
+        global_quick_tap_timer = timer_read();
+        tap_code(keycode);
+        return false;
+      }
+      return true;
+    }
+#endif
diff --git a/users/ericgebhart/extensions/send_string.c b/users/ericgebhart/extensions/send_string.c
new file mode 100644
index 0000000000..50237f5143
--- /dev/null
+++ b/users/ericgebhart/extensions/send_string.c
@@ -0,0 +1,40 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include USERSPACE_H
+#include "version.h"
+
+#define SEND_STR(KEYC, STRING)                  \
+  case KEYC:                                    \
+  if (record->event.pressed) {                  \
+    SEND_STRING(STRING);                        \
+  }                                             \
+  break;
+
+#define SEND_STR_DELAY(KEYC, STRING)                    \
+  case KEYC:                                            \
+  if (record->event.pressed) {                          \
+    SEND_STRING_DELAY(STRING, TAP_CODE_DELAY);     \
+  }                                                \
+  break;
+
+void process_send_strs(uint16_t keycode, keyrecord_t *record){
+#ifdef SEND_STRING_ENABLE
+  switch (keycode) {
+#include "send_string.def"
+  }
+#endif
+}
diff --git a/users/ericgebhart/extensions/smart_lock.c b/users/ericgebhart/extensions/smart_lock.c
new file mode 100644
index 0000000000..5b3dc0ecb2
--- /dev/null
+++ b/users/ericgebhart/extensions/smart_lock.c
@@ -0,0 +1,117 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Derived from smart_layers by @Possumvibes
+// Derived from one shot_mod by @Callum.
+
+#include "smart_lock.h"
+#include USERSPACE_H
+
+/* print("string"): Print a simple string. */
+/* uprintf("%s string", var) */
+
+bool ignore_key(uint16_t keycode,
+                const uint16_t *cond_keys){
+
+  // look for non-cancel condition.
+  // look for keys to ignore, if we match, we do nothing.
+  for (; pgm_read_word(cond_keys) != COND_KEYS_END ; ++cond_keys){
+    if (pgm_read_word(cond_keys) == keycode){
+      return true;
+    }
+  }
+  return false;
+}
+
+void deactivate_sml_layer(smart_lock_t *sml){
+  layer_off(sml->thing);
+    sml->active = false;
+}
+void deactivate_sml_mod(smart_lock_t *sml){
+  unregister_mods(sml->thing);
+  sml->active = false;
+}
+
+void deactivate_sml(smart_lock_t *sml){
+  switch(sml->type){
+  case sml_layer:
+    deactivate_sml_layer(sml);
+  case sml_mod:
+    deactivate_sml_mod(sml);
+  }
+}
+
+
+void sml_activate_layer(smart_lock_t *sml){
+  sml->active = true;
+  layer_on(sml->thing);
+}
+
+void sml_maybe_activate_mod(smart_lock_t *sml ){
+  if (sml->active) {
+    unregister_mods(sml->thing);
+  } else {
+    register_mods(sml->thing);
+  }
+  sml->active = !sml->active;
+}
+
+void sml_activate(smart_lock_t *sml){
+  switch(sml->type){
+  case sml_layer:
+    sml_activate_layer(sml);
+    break;
+  case sml_mod:
+sml_maybe_activate_mod(sml);
+      break;
+    }
+}
+
+
+
+void update_smart_lock(uint16_t keycode) {
+
+#ifdef SMART_LOCK_ENABLE
+  bool deactivate = false;
+  smart_lock_t *sml;
+
+    for (int i = 0; i < SML_LEN; ++i){
+      sml = &smart_locks[i];
+
+      // if it's a match,
+      // maybe activate/deactivate it if we got it's keycode.
+      if (sml->keycode == keycode){
+        sml_activate(sml);
+        return;
+      }
+
+      // deactivate what we need to.
+      if(sml->active){
+        deactivate = !ignore_key(keycode,  &sml->keys[0]);
+        if (deactivate){
+          deactivate_sml(sml);
+        }
+      }
+  }
+#endif
+  return;
+}
+
+void process_smart_lock(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    update_smart_lock(keycode);
+  }
+}
diff --git a/users/ericgebhart/extensions/smart_lock.h b/users/ericgebhart/extensions/smart_lock.h
new file mode 100644
index 0000000000..0102d611cd
--- /dev/null
+++ b/users/ericgebhart/extensions/smart_lock.h
@@ -0,0 +1,103 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received 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 USERSPACE_H
+
+#ifdef SMART_LOCK_ENABLE
+typedef enum {
+  sml_layer,
+  sml_mod
+} smart_lock_type;
+
+typedef struct {
+  bool     active;
+  const uint16_t *keys;
+  uint16_t keycode;
+  uint16_t thing;
+  smart_lock_type type;
+} smart_lock_t;
+
+
+// smart layer, smart mods
+#undef SMLL
+#undef SMLM
+#define SMLL(key, layer, ...)
+#define SMLM(key, mod, ...)  // to replace mod_lock..
+#define COND_KEYS_END 0
+
+#define CONCATENATE_SA(a, ...) a ## __VA_ARGS__
+#define CONCATENATE_S(a, ...) a ## __VA_ARGS__
+#define CAT_S(a, ...) CONCATENATE_S(a, __VA_ARGS__)
+#define MK_SKEY(KC) CONCATENATE_S(sml_, KC)
+#define MK_ARRAY(KC)                                    \
+  const uint16_t PROGMEM CONCATENATE_SA(sml_, KC)[]
+
+// to create an enum and find how many...
+#define S_ENUM(kc, layer, ...) CAT_S(sml__, kc),
+// create a const array of the condkeys for each SML
+#define S_DATA(kc, thing, ...) MK_ARRAY(kc) = {__VA_ARGS__, COND_KEYS_END};
+
+// create a list of smart_lock structs. Two names, one for mod one for layer to be concise.
+#define S_SMART_LOCK(kc, layer, ...) {false, MK_SKEY(kc), kc, layer, sml_layer},
+#define M_SMART_LOCK(kc, mod, ...)   {false, MK_SKEY(kc), kc, mod,   sml_mod},
+
+#define SML(sk, sa, st, stype)                                          \
+  { .keys = &(sk)[0], .keycode = (sa), .thing = (st), .smart_lock_type = stype}
+#define K_SMLM(key, mod...)   [MK_SKEY(key)] = SML(MK_SKEY(key), key, mod, sml_mod),
+#define K_SMLL(key, layer...) [MK_SKEY(key)] = SML(MK_SKEY(key), key, layer, sml_layer),
+
+// Set everything up
+// - Create enum of names, (sml_keycode). Used as indexes in the arrays.
+//    avoids using the keycodes which would create a sparse/large array.
+// - Create array of conditional locks..
+// - Create array of the conditional keys for the locks, by name.
+
+// Create Enum
+#undef SMLL
+#undef SMLM
+#define SMLL S_ENUM
+#define SMLM S_ENUM
+
+// find how many
+enum smart_locks {
+#include "smart_lock.def"
+  SML_LENGTH
+};
+uint16_t SML_LEN = SML_LENGTH;
+
+// Bake locks into mem, name, ignore/cancel keys
+#undef SMLL
+#undef SMLM
+#undef TOGG
+#define SMLL S_DATA
+#define SMLM S_DATA
+#include "smart_lock.def"
+#undef SMLL
+#undef SMLM
+
+// Fill array of locks by name, kc, layer/mod.
+#define SMLL S_SMART_LOCK
+#define SMLM M_SMART_LOCK
+
+smart_lock_t smart_locks[] = {
+#include "smart_lock.def"
+};
+#undef SMLL
+#undef SMLM
+
+#endif
diff --git a/users/ericgebhart/extensions/swapper.c b/users/ericgebhart/extensions/swapper.c
new file mode 100644
index 0000000000..988a99e602
--- /dev/null
+++ b/users/ericgebhart/extensions/swapper.c
@@ -0,0 +1,58 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com, @possumvibes,@Callum.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Derived from swapper by @Possumvibes and @Callum
+
+#include "swapper.h"
+
+swapper_state_t swapper_states[] = {
+#ifdef SWAPPER_ENABLE
+#include "swapper.def"
+#endif
+};
+uint8_t         NUM_SWAPPER_STATES = sizeof(swapper_states) / sizeof(swapper_state_t);
+
+// Based on https://github.com/callum-oakley/qmk_firmware/tree/master/users/callum
+void process_swappers(uint16_t keycode, keyrecord_t *record) {
+#ifdef SWAPPER_ENABLE
+  swapper_state_t *curr_state = NULL;
+  for (int i = 0; i < NUM_SWAPPER_STATES; ++i) {
+    curr_state = &swapper_states[i];
+
+    if (keycode == curr_state->forward_trigger) {
+      if (record->event.pressed) {
+        if (!curr_state->active) {
+          curr_state->active = true;
+          register_code16(curr_state->mod);
+        }
+        register_code16(curr_state->forward);
+      } else {
+        unregister_code16(curr_state->forward);
+        // Don't unregister curr_state->mod until some other key is hit or released.
+      }
+    } else if (curr_state->active && keycode == curr_state->reverse_trigger) {
+      if (record->event.pressed) {
+        register_code16(curr_state->reverse);
+      } else {
+        unregister_code16(curr_state->reverse);
+      }
+    } else if (curr_state->active) {
+      unregister_code16(curr_state->mod);
+      curr_state->active = false;
+    }
+  }
+#endif
+}
diff --git a/users/ericgebhart/extensions/swapper.h b/users/ericgebhart/extensions/swapper.h
new file mode 100644
index 0000000000..fb7774f37a
--- /dev/null
+++ b/users/ericgebhart/extensions/swapper.h
@@ -0,0 +1,37 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received 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 USERSPACE_H
+
+typedef struct {
+    bool     active;
+    uint16_t mod;
+    uint16_t forward;
+    uint16_t reverse;
+    uint16_t forward_trigger;
+    uint16_t reverse_trigger;
+} swapper_state_t;
+extern swapper_state_t swapper_states[];
+extern uint8_t         NUM_SWAPPER_STATES;
+
+#undef SWAPPER_KEY
+#define SWAPPER_KEY(KC, REVERSE_IT_KC, FWD_KC, REV_KC, MOD)     \
+  {false, MOD, FWD_KC, REV_KC, KC, REVERSE_IT_KC},
+
+void process_swappers(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/tap_dances.c b/users/ericgebhart/extensions/tap_dances.c
similarity index 97%
rename from users/ericgebhart/tap_dances.c
rename to users/ericgebhart/extensions/tap_dances.c
index 8f9503a261..b292dab678 100755
--- a/users/ericgebhart/tap_dances.c
+++ b/users/ericgebhart/extensions/tap_dances.c
@@ -47,8 +47,16 @@ void tap_dance_mouse_btns (qk_tap_dance_state_t *state, void *user_data) {
 
 // counting on all the qwerty layers to be less than dvorak_on_bepo
 int on_qwerty(){
-    uint8_t deflayer = (get_highest_layer(default_layer_state));
-    return (deflayer < _DVORAK_BP);
+    uint8_t deflayer = (biton32(default_layer_state));
+    switch(deflayer){
+    case _DVORAK_BP:
+    case _BEAKL_BP:
+    case _BEPO:
+      return (false);
+    default:
+      break;
+    }
+    return (true);
 }
 
 static void switch_default_layer(uint8_t layer) {
@@ -58,7 +66,7 @@ static void switch_default_layer(uint8_t layer) {
 
 // so the keyboard remembers which layer it's in after power disconnect.
 /*
-  layer_state_t default_layer_state_set_kb(layer_state_t state) {
+  uint32_t default_layer_state_set_kb(uint32_t state) {
   eeconfig_update_default_layer(state);
   return state;
   }
diff --git a/users/ericgebhart/tap_dances.h b/users/ericgebhart/extensions/tap_dances.h
similarity index 96%
rename from users/ericgebhart/tap_dances.h
rename to users/ericgebhart/extensions/tap_dances.h
index 11978467a7..745446756e 100755
--- a/users/ericgebhart/tap_dances.h
+++ b/users/ericgebhart/extensions/tap_dances.h
@@ -16,4 +16,4 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ericgebhart.h"
+#include USERSPACE_H
diff --git a/users/ericgebhart/extensions/tap_hold.c b/users/ericgebhart/extensions/tap_hold.c
new file mode 100644
index 0000000000..041b961e11
--- /dev/null
+++ b/users/ericgebhart/extensions/tap_hold.c
@@ -0,0 +1,165 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* This is variations on custom tap hold functionality. It makes it easy */
+/* to maintain tap_hold keys and combinations. These combinations go into */
+/* the file "tap_hold.def". Here are two examples. */
+/*  */
+/* This example is tap or tap for TAP_HOLD_TERM, It defines a key */
+/* KC_CCCV, which sends Control-c on tap, and Control-v on hold. */
+/*  */
+/*  TP_TPL(KC_CCCV, LCTL(KC_C), LCTL(KC_V)) */
+/*  */
+/* This is an example of Open - Open and Close. */
+/* It defines a key, KC_OCPRN which when tapped gives an '(' and */
+/* when held gives '()' followed by a backarrow. */
+/* Which places the cursor between them.*/
+/*  */
+/* OPEN_OCL(KC_OCPRN, KC_LPRN, KC_RPRN) */
+/*  */
+/* To use this, add it to your src in rules.mk, and include */
+/* tap_hold.h in your code above process_record_user. */
+/*  */
+/* Add a call like this to use it. */
+/* process_tap_hold_user(keycode, record); */
+/*  */
+/* Note: You must add any custom keycodes to your keycodes enum */
+/* otherwise they will not exist. */
+
+
+#include USERSPACE_H
+#include "stdint.h"
+#include "tap_hold.h"
+void update_smart_lock(uint16_t keycode);
+
+
+void tap_taplong(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
+  if (record->event.pressed) {
+    tap_taplong_timer = timer_read();
+  } else {
+    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
+      tap_code16(kc2);
+    } else {
+      tap_code16(kc1);
+    }
+  }
+}
+
+void tap_sml(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
+  if (record->event.pressed) {
+    tap_taplong_timer = timer_read();
+  } else {
+    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
+      update_smart_lock(kc2);
+    } else {
+      tap_code16(kc1);
+    }
+  }
+}
+
+/* for (){}[]""''<>``. tap for open. Hold for open and close, ending inbetween. */
+/* Assumes a one character length.                                              */
+void open_openclose(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
+  if (record->event.pressed) {
+    tap_taplong_timer = timer_read();
+  }else{
+    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
+      tap_code16(kc1);
+      tap_code16(kc2);
+      tap_code16(KC_LEFT);
+
+    } else {
+      // is shifted
+      uint16_t mod_state = get_mods();
+      if ((mod_state & MOD_MASK_SHIFT) ||
+          (get_oneshot_mods() & MOD_MASK_SHIFT)){
+        del_mods(MOD_MASK_SHIFT);
+        del_oneshot_mods(MOD_MASK_SHIFT);
+
+        tap_code16(kc1);
+        tap_code16(kc1);
+        tap_code16(kc1);
+
+        set_mods(mod_state);
+      }else{
+        tap_code16(kc1);
+      }
+    }
+  }
+}
+
+// open and open close for dead keys.
+void open_openclose_not_dead(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
+  if (record->event.pressed) {
+    tap_taplong_timer = timer_read();
+  }else{
+    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
+      tap_code16(kc1);
+      tap_code16(KC_SPACE);
+      tap_code16(kc2);
+      tap_code16(KC_SPACE);
+      tap_code16(KC_LEFT);
+    } else {
+      // is shifted - give a triple
+      uint16_t mod_state = get_mods();
+      if ((mod_state & MOD_MASK_SHIFT) ||
+          (get_oneshot_mods() & MOD_MASK_SHIFT)){
+        del_mods(MOD_MASK_SHIFT);
+        del_oneshot_mods(MOD_MASK_SHIFT);
+
+        tap_code16(kc1);
+        tap_code16(KC_SPACE);
+        tap_code16(kc1);
+        tap_code16(KC_SPACE);
+        tap_code16(kc1);
+        tap_code16(KC_SPACE);
+
+        set_mods(mod_state);
+      }else{
+        tap_code16(kc1);
+        tap_code16(KC_SPACE);
+      }
+    }
+  }
+}
+
+// macros for use in tap_hold.defs.
+#define TP_TPL(KCKEY, KC01, KC02)               \
+  case KCKEY:                                   \
+  tap_taplong(KC01, KC02, record);              \
+  break;
+
+#define TP_SML(KCKEY, KC01, KC02)        \
+  case KCKEY:                            \
+  tap_sml(KC01, KC02, record);           \
+  break;
+
+#define OPEN_OCL(KCKEY, KC01, KC02)             \
+  case KCKEY:                                   \
+  open_openclose(KC01, KC02, record);           \
+  break;
+
+#define OPEN_OCL_ND(KCKEY, KC01, KC02)          \
+  case KCKEY:                                   \
+  open_openclose_not_dead(KC01, KC02, record);  \
+  break;
+
+void process_tap_hold_user(uint16_t keycode, keyrecord_t *record) {
+  switch(keycode){
+#include "tap_hold.def"
+  }
+}
diff --git a/users/ericgebhart/extensions/tap_hold.h b/users/ericgebhart/extensions/tap_hold.h
new file mode 100644
index 0000000000..e5b3c42d8a
--- /dev/null
+++ b/users/ericgebhart/extensions/tap_hold.h
@@ -0,0 +1,20 @@
+#pragma once
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+void process_tap_hold_user(uint16_t keycode, keyrecord_t* record);
+uint16_t tap_taplong_timer;
diff --git a/users/ericgebhart/altlocal_keys.h b/users/ericgebhart/extensions/unicode.c
similarity index 50%
rename from users/ericgebhart/altlocal_keys.h
rename to users/ericgebhart/extensions/unicode.c
index b7fa977b92..fe44c69b1c 100644
--- a/users/ericgebhart/altlocal_keys.h
+++ b/users/ericgebhart/extensions/unicode.c
@@ -1,4 +1,3 @@
-#pragma once
 /*
   Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
 
@@ -15,22 +14,21 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include USERSPACE_H
+#include "process_unicode_common.h"
 
-// for the creation of dvorak keys on an Bepo keyboard at the OS layer.
-// so we can create an array of reasonable size
-// for our translation keys. We have to create a
-// good range of numbers
-#define GR(x) (x-SAFE_RANGE)
+#undef UC_STR
+#define UC_STR(KEYC, STRING)                    \
+  case KEYC:                                    \
+  if (record->event.pressed) {                  \
+    send_unicode_string(STRING);                \
+  }                                             \
+  break;
 
-// void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); };
-
-uint8_t gr(uint16_t);
-void send_keycode(uint16_t);
-
-#define MOD_NONE 0x00
-
-// indexs for the keycode translation table.
-#define UNSHIFTED_KEY(key)  key_translations[gr(key)][0][0]
-#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1]
-#define SHIFTED_KEY(key)    key_translations[gr(key)][1][0]
-#define SHIFTED_MODS(key)   key_translations[gr(key)][1][1]
+void process_unicode_strs(uint16_t keycode, keyrecord_t *record){
+#if defined(UNICODE_ENABLE) && defined(SEND_UNICODE_ENABLE)
+  switch (keycode) {
+#include "unicode.def"
+      }
+#endif
+}
diff --git a/users/ericgebhart/extensions/unicode.h b/users/ericgebhart/extensions/unicode.h
new file mode 100644
index 0000000000..eecf05d1bc
--- /dev/null
+++ b/users/ericgebhart/extensions/unicode.h
@@ -0,0 +1,24 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Custom one-or-more-shot implementation that does not rely on timers
+// and persists across layer changes. Based on the users/callum implementation
+// at https://github.com/callum-oakley/qmk_firmware/tree/master/users/callum
+// make it easy to put unicode keys into process_record
+
+
+void process_unicode_strs(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/flash-ergodox b/users/ericgebhart/flash-ergodox
deleted file mode 100755
index 945b2b605a..0000000000
--- a/users/ericgebhart/flash-ergodox
+++ /dev/null
@@ -1 +0,0 @@
-teensy-loader-cli -mmcu=atmega32u4 -w $1
diff --git a/users/ericgebhart/keyboards/keyboards.h b/users/ericgebhart/keyboards/keyboards.h
new file mode 100644
index 0000000000..8a6371af5e
--- /dev/null
+++ b/users/ericgebhart/keyboards/keyboards.h
@@ -0,0 +1,115 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+// Kyria
+#ifdef KEYBOARD_splitkb_kyria
+#define BASE Base_2x6_8_5
+#define BASEt6 Base_2x6_8_5t6
+#define TRANS Transient_2x6_8_5
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+#endif
+
+// Corne
+#ifdef KEYBOARD_crkbd
+#define BASE Base_3x6_3
+#define BASEt6 Base_3x6_3t6
+#define TRANS Transient_3x6_3
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+#endif
+
+// Ergodox ez.
+#ifdef KEYBOARD_ergodox_ez
+#define BASE Base_dox
+#define BASEt6 Base_doxt6
+#define TRANS Transient_dox
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+// tell the keymap we want to specify number rows.
+// 4x10 input instead 3x10.
+#define BASE_NUMBER_ROW    // turn on 4 row base templates.
+#endif
+
+// XD75
+#ifdef KEYBOARD_xiudi_xd75
+#define BASE Base_5x15
+#define BASEt6 Base_5x15t6
+#define TRANS Transient_5x15
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+// tell the keymap we want to specify number rows.
+// 4x10 input instead 3x10.
+#define BASE_NUMBER_ROW    // turn on 4 row base templates.
+#endif
+
+// Viterbi
+#ifdef KEYBOARD_keebio_viterbi
+#define BASE Base_5x14
+#define BASEt6 Base_5x14t6
+#define TRANS Transient_5x14
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+// tell the keymap we want to specify number rows.
+// 4x10 input instead 3x10.
+#define BASE_NUMBER_ROW    // turn on 4 row base templates.
+#endif
+
+// Rebound
+#ifdef KEYBOARD_montsinger_rebound
+#define BASE Base_rebound
+#define BASEt6 Base_reboundt6
+#define TRANS Rebound_transient
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+#endif
+
+// Kinesis
+#if defined(KEYBOARD_kinesis_alvicstep)         \
+  || defined(KEYBOARD_kinesis_stapelberg)       \
+  || defined(KEYBOARD_kinesis_kint2pp)          \
+  || defined(KEYBOARD_kinesis_nguyenvietyen)    \
+  || defined(KEYBOARD_kinesis_kint36)           \
+  || defined(KEYBOARD_kinesis_kint41)           \
+  || defined(KEYBOARD_kinesis_kintlc)
+
+#undef LAYOUT_PVARG
+#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
+// Base layers 4x10, so numbers are enabled, and a 3x10 for the keymap.
+// Transient function layers are all 3x10.
+#define BASE Base_4x6_4_6
+#define BASEt6 Base_4x6_4_6t6
+#define TRANS Transient_4x6_4_6
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+// tell the keymap we want to specify number rows.
+// 4x10 input instead 3x10.
+#define BASE_NUMBER_ROW    // turn on 4 row base templates.
+#endif
+
+// My Morpho Dactyl
+#ifdef KEYBOARD_gebhart_morpho
+#undef LAYOUT_PVARG
+#define LAYOUT_PVARG(...)  LAYOUT_split_4x6_5_8(__VA_ARGS__)
+
+#define BASE Base_4x6_5_8
+#define BASEt6 Base_4x6_5_8t6
+#define TRANS Transient_4x6_5_8
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+// tell the keymap we want to specify number rows.
+// 4x10 input instead 3x10.
+#define BASE_NUMBER_ROW    // turn on 4 row base templates.
+#endif
diff --git a/users/ericgebhart/keyboards/layouts.h b/users/ericgebhart/keyboards/layouts.h
new file mode 100644
index 0000000000..b77d5a3de6
--- /dev/null
+++ b/users/ericgebhart/keyboards/layouts.h
@@ -0,0 +1,771 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "base_layers.h"
+#include "mod_layer.h"
+#include "edge_keys.h"
+#include "thumbs.h"
+#include QMK_KEYBOARD_H
+
+/******************************************************************/
+/* This is where I put my Keyboard layouts.                       */
+/* The mod layer can be modified in mod_layer.h                   */
+/* can be applied here. The physical shape of the keyboard is     */
+/* also accounted for here. This makes it very simple to add a    */
+/* new keyboard and reuse all of my layouts and layers            */
+/*                                                                */
+/* With all of that in hand, we then create a LAYOUT wrapper      */
+/* macro that takes a list of keys, to create a keyboard matrix   */
+/* that fits the keyboard. Simple.                                */
+/*                                                                */
+/* The thumb keys, the bottom rows, etc.                          */
+/*                                                                */
+/* An attempt has been made to adapt the kinesis and ergodox      */
+/* Thumb keys to the rectangular shapes of the xd75, viterbi,     */
+/* and rebound.                                                   */
+/******************************************************************/
+
+/******************************************************************/
+/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
+/*       keys inbetween the usual left and right hand keys        */
+/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
+/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
+/*       thumbkeys. It is missing middle keys on (home) row 3.    */
+/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
+/*       extra middle keys                                        */
+/* * The Kinesis is 4x6 + 4 and 6 thumb keys.                     */
+/* * My Dactyl is 4x6 + 5 and 8 thumb keys.                     */
+/******************************************************************/
+
+
+/******************************************************************/
+/*   In all cases these keyboards are defined in a matrix which is */
+/*   a set of rows. Maybe like so, or not.                         */
+/*                                                                 */
+/*   -------------------------|------------------------ */
+/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
+/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
+/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
+/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
+/*   | Row5L                  |                    Row5R | */
+/*   |               ThumbsL  | ThumbsR                  | */
+/*   -------------------------|------------------------ */
+
+/* Generally speaking, the keys on the right and left don't change. */
+/* Neither does the bottom row or the thumbs. Frequently the numbers */
+/* row is identical across layers. Mostly, we want our Base layers to */
+/* be predctable.                                                     */
+
+
+// Since our quirky block definitions are basically a list of comma separated
+// arguments, we need a wrapper in order for these definitions to be
+// expanded before being used as arguments to the LAYOUT_xxx macro.
+#if (!defined(LAYOUT) && defined(KEYMAP))
+#define LAYOUT KEYMAP
+#endif
+
+// every keyboard has it's Layout. We start there and make a var args
+// out of it.
+
+#define LVARG_ergodox(...)    LAYOUT_ergodox(__VA_ARGS__)
+#define LVARG_edox(...)       LAYOUT_ergodox_pretty(__VA_ARGS__)
+#define LAYOUT_VARG(...)      LAYOUT(__VA_ARGS__)
+#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
+
+#define LVARG_4x12(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
+#define LVARG_5x12(...)       LAYOUT_ortho_5x12(__VA_ARGS__)
+#define LVARG_5x14(...)       LAYOUT_ortho_5x14(__VA_ARGS__)
+#define LVARG_5x15(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
+
+/*
+  | Left | Numbers L | middle | numbers R | Right |
+  | Left | keys0-5   | middle | Keys6-10  | Right |
+  | Left | keys11-15 | middle | Keys16-20 | Right |
+  | Left | keys20-25 | middle | Keys25-30 | Right |
+  |Row5L                                  Row5R   |
+  |ThumbsL                                ThumbsR |
+*/
+
+/* Assuming that left, midddle, right, row5, and thumbs stay the same, */
+/* numbers, no numbers, numbers never change, whatever.                */
+/*   we can have a layout macro that takes a nice rectangle of keys.   */
+
+
+/*Some keyboards need number rows, some don't. there is a setting for that */
+/* the keymap will give number rows if BASE_NUMBER_ROW is defined.*/
+/* in that case, the layout should take 4 rows of 10. */
+/* If all the layouts you might ever want would have the same top row,*/
+/* Then it could be defined like that here, and it could take 3x10.*/
+/* All layouts are relatively simple to make. */
+/* The ROW macros add a universal mod layer so that mods can be defined once */
+/* and used everywhere. No matter the keymap or layer. this allows actual maps */
+/* like dvorak, qwerty, colemak, beakl, etc., to be defined simply. */
+
+
+/* Additional, usage examples can be found in keyboards.*/
+/* crkbd/keymaps/ericgebhart */
+/* kinesis/keymaps/ericgebhart */
+/* ergodox_ez/keymaps/ericgebhart */
+/* keebio/viterbi/keymaps/ericgebhart */
+/* xiudi/xd75/keymaps/ericgebhart */
+/* montsinger/rebound/rev4/keymaps/ericgebhart */
+
+
+
+/********************************************************************/
+/* xiudi/xd75  - Ortholinear 5x15  */
+/********************************************************************/
+/// These first two base layout templates take sets of 5 keys, left and right.
+// Using 4 sets allows for changing the number row if you have one.
+// if you never change the number row, then use 3 sets of left and right.
+// and define the number row here.
+#define Base_5x15(                                                \
+                  K01, K02, K03, K04, K05,                        \
+                  K06, K07, K08, K09, K0A,                        \
+                  K11, K12, K13, K14, K15,                        \
+                  K16, K17, K18, K19, K1A,                        \
+                  K21, K22, K23, K24, K25,                        \
+                  K26, K27, K28, K29, K2A,                        \
+                  K31, K32, K33, K34, K35,                        \
+                  K36, K37, K38, K39, K3A)                        \
+  LVARG_5x15(                                                     \
+             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                   \
+             MAP_CHUNK(___3_MIDDLE_T),                               \
+             MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                   \
+                                                                        \
+             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15),                   \
+             MAP_CHUNK(___3_MIDDLE_1),                                \
+             MOD_ROW(ROW1R)(K16, K17, K18, K19, K1A),                   \
+                                                                        \
+             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25),                   \
+             MAP_CHUNK(___3_MIDDLE_2),                                \
+             MOD_ROW(ROW2R)(K26, K27, K28, K29, K2A),                   \
+                                                                        \
+             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35),                   \
+             MAP_CHUNK(___3_MIDDLE_3),                                  \
+             MOD_ROW(ROW3R)(K36, K37, K38, K39, K3A),                   \
+             MAP_CHUNK(___15_BOTTOM)                                    \
+                                                                  )
+
+#define Base_5x15t6(                                                    \
+                    K01, K02, K03, K04, K05, K06,                       \
+                    K07, K08, K09, K0A, K0B, K0C,                       \
+                    K11, K12, K13, K14, K15, K16,                       \
+                    K17, K18, K19, K1A, K1B, K1C,                       \
+                    K21, K22, K23, K24, K25, K26,                       \
+                    K27, K28, K29, K2A, K2B, K2C,                       \
+                    K31, K32, K33, K34, K35, K36,                       \
+                    K37, K38, K39, K3A, K3B, K3C)                  \
+  LVARG_5x15(                                                           \
+             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),              \
+             MAP_CHUNK(___3_MIDDLE_T),                               \
+             MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),              \
+             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15, K16),              \
+             MAP_CHUNK(___3_MIDDLE_1),                                  \
+             MOD_ROW(ROW1R)(K17, K18, K19, K1A, K1B, K1C),              \
+             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25, K26),              \
+             MAP_CHUNK(___3_MIDDLE_2),                                  \
+             MOD_ROW(ROW2R)(K27, K28, K29, K2A, K2B, K2C),              \
+             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35, K36),              \
+             MAP_CHUNK(___3_MIDDLE_3),                                  \
+             MOD_ROW(ROW3R)(K37, K38, K39, K3A, K3B, K3C),              \
+             MAP_CHUNK(___15_BOTTOM)                                    \
+                                                                        )
+
+// 4  rows of 12. 3 columns transparent in the middle.
+#define Transient_5x15(                                             \
+                       K01, K02, K03, K04, K05,                     \
+                       K07, K08, K09, K0A, K0B,                     \
+                       K11, K12, K13, K14, K15,                     \
+                       K17, K18, K19, K1A, K1B,                 \
+                       K21, K22, K23, K24, K25,                     \
+                       K27, K28, K29, K2A, K2B                     \
+                                                              )    \
+  LVARG_5x15(                                                      \
+             ___15___,                                             \
+             ___, K01, K02, K03, K04, K05,                         \
+             ___3___,                                              \
+             K07, K08, K09, K0A, K0B, ___,                         \
+             ___, K11, K12, K13, K14, K15,                         \
+             ___3___,                                              \
+             K17, K18, K19, K1A, K1B, ___,                         \
+             ___, K21, K22, K23, K24, K25,                         \
+             ___3___,                                              \
+             K27, K28, K29, K2A, K2B, ___,                         \
+             MAP_CHUNK(___15_BOTTOM)                                    \
+             )                                                  \
+
+/********************************************************************/
+
+
+/********************************************************************/
+/* viterbi  - Ortholinear 5x14  */
+/********************************************************************/
+#define Base_5x14(                                                 \
+                  K01, K02, K03, K04, K05,                              \
+                        K06, K07, K08, K09, K0A,                        \
+                        K11, K12, K13, K14, K15,                        \
+                        K16, K17, K18, K19, K1A,                        \
+                        K21, K22, K23, K24, K25,                        \
+                        K26, K27, K28, K29, K2A,                        \
+                        K31, K32, K33, K34, K35,                        \
+                        K36, K37, K38, K39, K3A)                        \
+  LVARG_5x14(                                                           \
+             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                   \
+             MAP_CHUNK(___2_MIDDLE_T),                                  \
+             MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                   \
+                                                                       \
+             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15),                   \
+             MAP_CHUNK(___2_MIDDLE_1),                                  \
+             MOD_ROW(ROW1R)(K16, K17, K18, K19, K1A),                   \
+                                                                        \
+             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25),                   \
+             MAP_CHUNK(___2_MIDDLE_2),              \
+             MOD_ROW(ROW2R)(K26, K27, K28, K29, K2A),                   \
+                                                                        \
+             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35),                   \
+             MAP_CHUNK(___2_MIDDLE_3),    \
+             MOD_ROW(ROW3R)(K36, K37, K38, K39, K3A),                   \
+             MAP_CHUNK(___14_BOTTOM)                                    \
+                                                                        )
+#define Base_5x14t6(                                    \
+                    K01, K02, K03, K04, K05, K06,       \
+                    K07, K08, K09, K0A, K0B, K0C,       \
+                    K11, K12, K13, K14, K15, K16,       \
+                    K17, K18, K19, K1A, K1B, K1C,       \
+                    K21, K22, K23, K24, K25, K26,       \
+                    K27, K28, K29, K2A, K2B, K2C,       \
+                    K31, K32, K33, K34, K35, K36,       \
+                    K37, K38, K39, K3A, K3B, K3C)       \
+  LVARG_5x15(                                           \
+    MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),         \
+    MAP_CHUNK(___2_MIDDLE_T),                             \
+    MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),       \
+    MOD_ROW(ROW1L)(K11, K12, K13, K14, K15, K16),       \
+    MAP_CHUNK(___2_MIDDLE_1),                                           \
+    MOD_ROW(ROW1R)(K17, K18, K19, K1A, K1B, K1C),       \
+    MOD_ROW(ROW2L)(K21, K22, K23, K24, K25, K26),       \
+    MAP_CHUNK(___2_MIDDLE_2),                           \
+    MOD_ROW(ROW2R)(K27, K28, K29, K2A, K2B, K2C),       \
+    MOD_ROW(ROW3L)(K31, K32, K33, K34, K35, K36),       \
+    MAP_CHUNK(___2_MIDDLE_3),                                   \
+    MOD_ROW(ROW3R)(K37, K38, K39, K3A, K3B, K3C),               \
+    MAP_CHUNK(___14_BOTTOM)                                     \
+                                                        )
+
+// 4  rows of 12. 2 columns transparent in the middle.
+#define Transient_5x14(                                            \
+                       K01, K02, K03, K04, K05,                    \
+                       K07, K08, K09, K0A, K0B,                    \
+                       K11, K12, K13, K14, K15,                         \
+                       K17, K18, K19, K1A, K1B,                         \
+                       K21, K22, K23, K24, K25,                     \
+                       K27, K28, K29, K2A, K2B                     \
+                                                              )         \
+  LVARG_5x14(                                                           \
+             ___14___,                                                  \
+             ___, K01, K02, K03, K04, K05,                              \
+             ___2___,                                                   \
+             K07, K08, K09, K0A, K0B, ___,                              \
+                                                                        \
+             ___, K11, K12, K13, K14, K15,                              \
+             ___2___,                                                   \
+             K17, K18, K19, K1A, K1B, ___,                              \
+                                                                        \
+             ___, K21, K22, K23, K24, K25,                              \
+             ___2___,                                                   \
+             K27, K28, K29, K2A, K2B, ___,                              \
+             MAP_CHUNK(___14_BOTTOM)                                    \
+                                                                        ) \
+
+/********************************************************************/
+/* Ortholinear 4x12  */
+/********************************************************************/
+#define LAYOUT_4x12_base(                                               \
+                         K01, K02, K03, K04, K05,                       \
+                         K06, K07, K08, K09, K0A,                       \
+                         K11, K12, K13, K14, K15,                       \
+                         K16, K17, K18, K19, K1A,                       \
+                         K21, K22, K23, K24, K25,                       \
+                         K26, K27, K28, K29, K2A                        \
+                                                                        ) \
+  LVARG_4x12(                                                     \
+             MOD_CORE_3x5(K01, K02, K03, K04, K05,                \
+                          K06, K07, K08, K09, K0A,                \
+                          K11, K12, K13, K14, K15,                \
+                          K16, K17, K18, K19, K1A,                \
+                          K21, K22, K23, K24, K25,                \
+                          K26, K27, K28, K29, K2A),               \
+             ___12_BOTTOM___                                            \
+                                                                  )
+
+// Just for bepo because it's a 3x6 matrix on each side.
+// So 3 pairs of 6 keys, left and right.
+
+// takes 3 makes 4  rows of 12.
+#define LAYOUT_4x12_transient(                                          \
+                              K01, K02, K03, K04, K05, K06,             \
+                              K07, K08, K09, K0A, K0B, K0C,             \
+                              K11, K12, K13, K14, K15, K16,             \
+                              K17, K18, K19, K1A, K1B, K1C,             \
+                              K21, K22, K23, K24, K25, K26,             \
+                              K27, K28, K29, K2A, K2B, K2C              \
+                                                                        ) \
+  LVARG_4x12(                                                           \
+             K01, K02, K03, K04, K05, K06,                              \
+             K07, K08, K09, K0A, K0B, K0C,                              \
+             K11, K12, K13, K14, K15, K16,                              \
+             K17, K18, K19, K1A, K1B, K1C,                              \
+             K21, K22, K23, K24, K25, K26,                              \
+             K27, K28, K29, K2A, K2B, K2C,                              \
+             ___12_BOTTOM___                                            \
+             )                                                  \
+
+/********************************************************************/
+/* CRKBD  Corne or any other 3x5/6 with 3 thumbs on each side.      */
+/*    The Corne has  3x6 matrix on both sides with 6 thumbs total   */
+/* This Macro takes 2x3x5 and gives it pinkies, and thumbs.         */
+/* Arg chunks are in the middle with the passthrough modifiers as   */
+/* needed.  Sama Sama apres cette fois.                             */
+/********************************************************************/
+
+#define Base_3x6_3(                                                     \
+                   K01, K02, K03, K04, K05,                             \
+                   K06, K07, K08, K09, K0A,                             \
+                   K11, K12, K13, K14, K15,                             \
+                   K16, K17, K18, K19, K1A,                             \
+                   K21, K22, K23, K24, K25,                             \
+                   K26, K27, K28, K29, K2A)                             \
+  LAYOUT_VARG(                                                          \
+              MOD_CORE_3x5(K01, K02, K03, K04, K05,                     \
+                           K06, K07, K08, K09, K0A,                     \
+                           K11, K12, K13, K14, K15,                     \
+                           K16, K17, K18, K19, K1A,                     \
+                           K21, K22, K23, K24, K25,                     \
+                           K26, K27, K28, K29, K2A),                    \
+              ___6_ERGO_THUMBS___                                       \
+                                                                        )
+
+#define Base_3x6_3t6(                                                   \
+                     K01, K02, K03, K04, K05, K06,                      \
+                     K07, K08, K09, K0A, K0B, K0C,                      \
+                     K11, K12, K13, K14, K15, K16,                      \
+                     K17, K18, K19, K1A, K1B, K1C,                      \
+                     K21, K22, K23, K24, K25, K26,                      \
+                     K27, K28, K29, K2A, K2B, K2C)                      \
+  LAYOUT_VARG(                                                          \
+              MOD_CORE_3x6(                                             \
+                           K01, K02, K03, K04, K05, K06,                \
+                           K07, K08, K09, K0A, K0B, K0C,                \
+                           K11, K12, K13, K14, K15, K16,                \
+                           K17, K18, K19, K1A, K1B, K1C,                \
+                           K21, K22, K23, K24, K25, K26,                \
+                           K27, K28, K29, K2A, K2B, K2C),               \
+              ___6_ERGO_THUMBS___                                       \
+                                                        )
+
+  // All we really need is to add the see through thumbs to the end.
+#define Transient_3x6_3(                                                \
+                        K01, K02, K03, K04, K05,                        \
+                        K07, K08, K09, K0A, K0B,                        \
+                        K11, K12, K13, K14, K15,                        \
+                        K17, K18, K19, K1A, K1B,                        \
+                        K21, K22, K23, K24, K25,                        \
+                        K27, K28, K29, K2A, K2B                         \
+                                                                        ) \
+  LAYOUT_VARG(                                                          \
+              ___, K01, K02, K03, K04, K05,                             \
+              K07, K08, K09, K0A, K0B, ___,                             \
+              ___, K11, K12, K13, K14, K15,                             \
+              K17, K18, K19, K1A, K1B, ___,                             \
+              ___, K21, K22, K23, K24, K25,                             \
+              K27, K28, K29, K2A, K2B, ___,                             \
+              ___6_ERGO_THUMBS___                                       \
+                                                                        )
+
+//___6_ERGO_THUMBS___
+
+/********************************************************************/
+/* Kinesis*/
+/********************************************************************/
+// A 4x6 on each side, with a 4 column fifth row, and 6 thumbs on
+// each side.  - 4x6_4_6.
+// Then a giant row up top, 9 keys on each side, for function keys.
+#define Base_4x6_4_6(                                                   \
+                     K01, K02, K03, K04, K05, \
+                     K06, K07, K08, K09, K0A,                           \
+                     K11, K12, K13, K14, K15,                           \
+                     K16, K17, K18, K19, K1A,                           \
+                     K21, K22, K23, K24, K25,                           \
+                     K26, K27, K28, K29, K2A,                           \
+                     K31, K32, K33, K34, K35,                           \
+                     K36, K37, K38, K39, K3A                            \
+                                                                        ) \
+  LAYOUT_PVARG(                                                         \
+               ___KINTFUNC_L___, ___KINTFUNC_R___, \
+               MOD_CORE_4x5(K01, K02, K03, K04, K05,                    \
+                            K06, K07, K08, K09, K0A,                    \
+                            K11, K12, K13, K14, K15,                    \
+                            K16, K17, K18, K19, K1A,                    \
+                            K21, K22, K23, K24, K25,                    \
+                            K26, K27, K28, K29, K2A,                    \
+                            K31, K32, K33, K34, K35,                    \
+                            K36, K37, K38, K39, K3A),                   \
+               MAP_CHUNK(___4_BOTTOM_LEFT),                             \
+               MAP_CHUNK(___4_BOTTOM_RIGHT),                            \
+               MAP_CHUNK(___12_DOX_ALL_THUMBS)                          \
+                                                                        )
+
+
+#define Base_4x6_4_6t6(                                                 \
+                       K01, K02, K03, K04, K05, K06,                    \
+                       K07, K08, K09, K0A, K0B, K0C,                    \
+                       K11, K12, K13, K14, K15, K16,                    \
+                       K17, K18, K19, K1A, K1B, K1C,                    \
+                       K21, K22, K23, K24, K25, K26,                    \
+                       K27, K28, K29, K2A, K2B, K2C,                    \
+                       K31, K32, K33, K34, K35, K36,                    \
+                       K37, K38, K39, K3A, K3B, K3C)                    \
+  LAYOUT_PVARG(                                                         \
+               MOD_CORE_4x6(                                            \
+                            K01, K02, K03, K04, K05, K06,              \
+                            K07, K08, K09, K0A, K0B, K0C,              \
+                            K11, K12, K13, K14, K15, K16,              \
+                            K17, K18, K19, K1A, K1B, K1C,              \
+                            K21, K22, K23, K24, K25, K26,              \
+                            K27, K28, K29, K2A, K2B, K2C,             \
+                            K31, K32, K33, K34, K35, K36,               \
+                            K37, K38, K39, K3A, K3B, K3C),              \
+                MAP_CHUNK(___4_BOTTOM_LEFT),                            \
+                MAP_CHUNK(___4_BOTTOM_RIGHT),                           \
+                MAP_CHUNK(___12_DOX_ALL_THUMBS)                         \
+                                                                        )
+
+#define Transient_4x6_4_6(                                         \
+                          K01, K02, K03, K04, K05,                 \
+                          K07, K08, K09, K0A, K0B,                 \
+                          K11, K12, K13, K14, K15,                 \
+                          K17, K18, K19, K1A, K1B,                 \
+                          K21, K22, K23, K24, K25,                 \
+                          K27, K28, K29, K2A, K2B                 \
+                                                                       ) \
+                LAYOUT_PVARG(                                           \
+            ___12___, ___6___,                                                  \
+            ___12___,                                                   \
+            ___, K01, K02, K03, K04, K05,                               \
+            K07, K08, K09, K0A, K0B, ___,                               \
+            ___, K11, K12, K13, K14, K15,                               \
+            K17, K18, K19, K1A, K1B, ___,                               \
+            ___, K21, K22, K23, K24, K25,                               \
+            K27, K28, K29, K2A, K2B, ___,                               \
+            ___4___, ___4___,                                           \
+            MAP_CHUNK(___12_DOX_ALL_THUMBS)                             \
+                                                                        )
+
+/* ___KINTFUNC_L___, ___KINTFUNC_R___,                      \ */
+
+/* This keyboard is a split, 4x6 + a row of 5 and a thumb cluster of 8. */
+/* So We need Base_4x6_5_8 As a layout template to add mods, and fill */
+/* out the perimeter keys of the keyboard. Perimeter keys being the */
+/* number row, outside pinky keys, the 5th row, and thumbs. */
+
+/********************************************************************/
+/* Dactyl with 8 thumb keys*/
+/********************************************************************/
+// Basically an ergodox ez without the 3 pairs of middle keys.
+// electrically 7 columns in the 5th row. 6 in the rest.
+// Left, right, bottom, and thumbs all stay the same.
+
+#define Base_4x6_5_8(                                                   \
+                     K01, K02, K03, K04, K05,                           \
+                     K06, K07, K08, K09, K0A,                           \
+                     K11, K12, K13, K14, K15,                           \
+                     K16, K17, K18, K19, K1A,                           \
+                     K21, K22, K23, K24, K25,                           \
+                     K26, K27, K28, K29, K2A,                           \
+                     K31, K32, K33, K34, K35,                           \
+                     K36, K37, K38, K39, K3A                            \
+                                                                      ) \
+  LAYOUT_PVARG(                                                         \
+  MOD_CORE_4x5(K01, K02, K03, K04, K05,                           \
+               K06, K07, K08, K09, K0A,                           \
+               K11, K12, K13, K14, K15,                           \
+               K16, K17, K18, K19, K1A,                           \
+               K21, K22, K23, K24, K25,                           \
+               K26, K27, K28, K29, K2A,                           \
+               K31, K32, K33, K34, K35,                           \
+               K36, K37, K38, K39, K3A                            \
+               ),                                                       \
+  MAP_CHUNK(___5_BOTTOM_LEFT), MAP_CHUNK(___5_BOTTOM_RIGHT),            \
+  MAP_CHUNK(___16_ALL_THUMBSa)                                          \
+                                                                        )
+
+#define Base_4x6_5_8t6(                                                 \
+                       K01, K02, K03, K04, K05, K06,                    \
+                       K07, K08, K09, K0A, K0B, K0C,                    \
+                       K11, K12, K13, K14, K15, K16,                    \
+                       K17, K18, K19, K1A, K1B, K1C,                    \
+                       K21, K22, K23, K24, K25, K26,                    \
+                       K27, K28, K29, K2A, K2B, K2C,                    \
+                       K31, K32, K33, K34, K35, K36,                    \
+                       K37, K38, K39, K3A, K3B, K3C)                    \
+  LAYOUT_PVARG(                                                         \
+               MOD_CORE_4x6(                                            \
+                            K01, K02, K03, K04, K05, K06,               \
+                            K07, K08, K09, K0A, K0B, K0C,               \
+                            K11, K12, K13, K14, K15, K16,               \
+                            K17, K18, K19, K1A, K1B, K1C,               \
+                            K21, K22, K23, K24, K25, K26,               \
+                            K27, K28, K29, K2A, K2B, K2C,               \
+                            K31, K32, K33, K34, K35, K36,               \
+                            K37, K38, K39, K3A, K3B, K3C),              \
+               MAP_CHUNK(___5_BOTTOM_LEFT), MAP_CHUNK(___5_BOTTOM_RIGHT), \
+               MAP_CHUNK(___16_ALL_THUMBSa)                             \
+                                                                        )
+
+
+// so far no need for mods on the transient layers.
+// switching to 3x5 transients. 10 column defines.
+// I like 3x10 maps even on big keyboards.
+# define Transient_4x6_5_8(                                             \
+                           K01, K02, K03, K04, K05,                     \
+                           K06, K07, K08, K09, K0A,                     \
+                           K11, K12, K13, K14, K15,                     \
+                           K16, K17, K18, K19, K1A,                \
+                           K21, K22, K23, K24, K25,                 \
+                           K26, K27, K28, K29, K2A                 \
+                                                                        ) \
+  LAYOUT_PVARG(                                                         \
+               ___6___, ___6___,                                        \
+               ___, K01, K02, K03, K04, K05,                            \
+               K06, K07, K08, K09, K0A, ___,                       \
+               ___, K11, K12, K13, K14, K15,                            \
+               K16, K17, K18, K19, K1A, ___,                       \
+               ___, K21, K22, K23, K24, K25,                            \
+               K26, K27, K28, K29, K2A, ___,                       \
+               ___5___, ___5___,                                        \
+               MAP_CHUNK(___16_ALL_THUMBSa)                          \
+                                                                        )
+
+/********************************************************************/
+/* Ergodox EZ                                                       */
+/********************************************************************/
+// This one is is set up to pass in the number row.
+// Beakl and bepo both change the number row.
+// Left, middle, right, bottom, and thumbs all stay the same.
+#define Base_dox(                                                       \
+                 K01, K02, K03, K04, K05,                               \
+                 K06, K07, K08, K09, K0A,                               \
+                 K11, K12, K13, K14, K15,                               \
+                 K16, K17, K18, K19, K1A,                               \
+                 K21, K22, K23, K24, K25,                               \
+                 K26, K27, K28, K29, K2A,                               \
+                 K31, K32, K33, K34, K35,                               \
+                 K36, K37, K38, K39, K3A                                \
+                                                                        ) \
+  LVARG_edox(                                                           \
+             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                   \
+               MAP_CHUNK(___2_MIDDLE_1),                                \
+               MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                 \
+                                                                        \
+             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15),                   \
+               MAP_CHUNK(___2_MIDDLE_2),                                \
+               MOD_ROW(ROW1R)(K16, K17, K18, K19, K1A),                 \
+                                                                        \
+             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25),                   \
+             MOD_ROW(ROW2R)(K26, K27, K28, K29, K2A),                   \
+                                                                        \
+             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35),                   \
+             MAP_CHUNK(___2_MIDDLE_3),                                  \
+             MOD_ROW(ROW3R)(K36, K37, K38, K39, K3A),                   \
+             MAP_CHUNK(___5_BOTTOM_LEFT), MAP_CHUNK(___5_BOTTOM_RIGHT), \
+             MAP_CHUNK(___12_DOX_ALL_THUMBS)                           \
+                                                                        )
+
+#define Base_doxt6(                                                     \
+                   K01, K02, K03, K04, K05, K06, \
+                   K07, K08, K09, K0A, K0B, K0C,                        \
+                   K11, K12, K13, K14, K15, K16,                        \
+                   K17, K18, K19, K1A, K1B, K1C,                        \
+                   K21, K22, K23, K24, K25, K26,                        \
+                   K27, K28, K29, K2A, K2B, K2C,                        \
+                   K31, K32, K33, K34, K35, K36,                        \
+                   K37, K38, K39, K3A, K3B, K3C)                        \
+  LVARG_edox(MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),              \
+             MAP_CHUNK(___2_MIDDLE_1),                                  \
+             MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),              \
+             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15, K16),              \
+             MAP_CHUNK(___2_MIDDLE_2),                                  \
+             MOD_ROW(ROW1R)(K17, K18, K19, K1A, K1B, K1C),              \
+             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25, K26),              \
+             MOD_ROW(ROW2R)(K27, K28, K29, K2A, K2B, K2C),              \
+             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35, K36),              \
+             MAP_CHUNK(___2_MIDDLE_3),                                  \
+             MOD_ROW(ROW3R)(K37, K38, K39, K3A, K3B, K3C),              \
+             MAP_CHUNK(___5_BOTTOM_LEFT),                              \
+             MAP_CHUNK(___5_BOTTOM_RIGHT),                             \
+             MAP_CHUNK(___12_DOX_ALL_THUMBS))
+
+#define Transient_dox(                                                  \
+                      K01, K02, K03, K04, K05,                          \
+                      K07, K08, K09, K0A, K0B,                          \
+                      K11, K12, K13, K14, K15,                          \
+                      K17, K18, K19, K1A, K1B,                          \
+                      K21, K22, K23, K24, K25,                          \
+                      K27, K28, K29, K2A, K2B)                          \
+  LVARG_edox(                                                           \
+             ___14___,                                                  \
+             ___, K01, K02, K03, K04, K05,                              \
+             ___2___,                                                   \
+             K07, K08, K09, K0A, K0B, ___,                              \
+             ___, K11, K12, K13, K14, K15,                              \
+             K17, K18, K19, K1A, K1B, ___,                              \
+             ___, K21, K22, K23, K24, K25,                              \
+             ___2___,                                                   \
+             K27, K28, K29, K2A, K2B, ___,                              \
+             ___5___, ___5___,                                          \
+             MAP_CHUNK(___12_DOX_ALL_THUMBS)                            \
+                                                                        )
+
+
+/********************************************************************/
+/* Rebound 4 rows, 1x12, 3x13  */
+/********************************************************************/
+#define LVARG_rebound(...)    LAYOUT_all(__VA_ARGS__)
+#define Base_rebound(                                                   \
+                     K01, K02, K03, K04, K05,                           \
+                     K06, K07, K08, K09, K0A,                           \
+                     K11, K12, K13, K14, K15,                           \
+                     K16, K17, K18, K19, K1A,                           \
+                     K21, K22, K23, K24, K25,                           \
+                     K26, K27, K28, K29, K2A                            \
+                                                                        ) \
+  LVARG_rebound(                                                        \
+                MOD_ROW(ROW1L)(K01, K02, K03, K04, K05),                \
+                MOD_ROW(ROW1R)(K06, K07, K08, K09, K0A),                \
+                                                                        \
+                MOD_ROW(ROW2L)(K11, K12, K13, K14, K15),                \
+                KC_CCCV,                                                \
+                MOD_ROW(ROW2R)(K16, K17, K18, K19, K1A),                \
+                                                                        \
+                MOD_ROW(ROW3L)(K21, K22, K23, K24, K25),                \
+                MO_ADJUST,                                              \
+                MOD_ROW(ROW3R)(K26, K27, K28, K29, K2A),                \
+                MAP_CHUNK(___13_BOTTOM)                                 \
+                                                                        )
+#define Base_reboundt6(                                                 \
+                       K01, K02, K03, K04, K05, K06,                    \
+                       K07, K08, K09, K0A, K0B, K0C,                    \
+                       K11, K12, K13, K14, K15, K16,                    \
+                       K17, K18, K19, K1A, K1B, K1C,                    \
+                       K21, K22, K23, K24, K25, K26,                    \
+                       K27, K28, K29, K2A, K2B, K2C                     \
+                                                                        ) \
+  LVARG_rebound(                                                        \
+                MOD_ROW(ROW1L)(K01, K02, K03, K04, K05, K06),           \
+                MOD_ROW(ROW1R)(K07, K08, K09, K0A, K0B, K0C),           \
+                MOD_ROW(ROW2L)(K11, K12, K13, K14, K15, K16),           \
+                KC_CCCV,                                                \
+                MOD_ROW(ROW2R)(K17, K18, K19, K1A, K1B, K1C),           \
+                MOD_ROW(ROW3L)(K21, K22, K23, K24, K25, K26),           \
+                MO_ADJUST,                                              \
+                MOD_ROW(ROW3R)(K27, K28, K29, K2A, K2B, K2C),              \
+                MAP_CHUNK(___13_BOTTOM)                                 \
+                                                                        )
+
+#define Rebound_transient(                                              \
+                          K01, K02, K03, K04, K05,                      \
+                          K07, K08, K09, K0A, K0B,                      \
+                          K11, K12, K13, K14, K15,                      \
+                          K17, K18, K19, K1A, K1B,                      \
+                          K21, K22, K23, K24, K25,                      \
+                          K27, K28, K29, K2A, K2B                       \
+                                                                       ) \
+  LVARG_rebound(                                                        \
+                ___, K01, K02, K03, K04, K05,                           \
+                K07, K08, K09, K0A, K0B, ___,                           \
+                ___, K11, K12, K13, K14, K15,                           \
+                ___,                                                    \
+                K17, K18, K19, K1A, K1B, ___,                           \
+                ___, K21, K22, K23, K24, K25,                           \
+                ___,                                                    \
+                K27, K28, K29, K2A, K2B, ___,                           \
+                MAP_CHUNK(___13_BOTTOM)                            \
+                                                                        )
+
+/********************************************************************/
+/* Kyria  or any other 3x5/6 with 4 keys in the middle of the last  */
+/* Row. Followed by 5 thumb keys on each side. 7 thumb keys total.  */
+/********************************************************************/
+#define Base_2x6_8_5(                                                   \
+                     K01, K02, K03, K04, K05, \
+                     K06, K07, K08, K09, K0A,                           \
+                     K11, K12, K13, K14, K15,                           \
+                     K16, K17, K18, K19, K1A,                           \
+                     K21, K22, K23, K24, K25,                           \
+                     K26, K27, K28, K29, K2A)                           \
+  LAYOUT_VARG(                                                          \
+              MOD_ROW(ROW1L)(K01, K02, K03, K04, K05),                  \
+              MOD_ROW(ROW1R)(K06, K07, K08, K09, K0A),                  \
+                                                                        \
+              MOD_ROW(ROW2L)(K11, K12, K13, K14, K15),                  \
+              MOD_ROW(ROW2R)(K16, K17, K18, K19, K1A),                  \
+                                                                        \
+              MOD_ROW(ROW3L)(K21, K22, K23, K24, K25),                  \
+              MAP_CHUNK(___4_THUMBS),                                   \
+              MOD_ROW(ROW3R)(K26, K27, K28, K29, K2A),                  \
+              MAP_CHUNK(___10_ERGO_THUMBS)                              \
+                                                                        )
+
+#define Base_2x6_8_5t6(                                                \
+                       K01, K02, K03, K04, K05, K06,                    \
+                       K07, K08, K09, K0A, K0B, K0C,                    \
+                       K11, K12, K13, K14, K15, K16,                    \
+                       K17, K18, K19, K1A, K1B, K1C,                    \
+                       K21, K22, K23, K24, K25, K26,                    \
+                       K27, K28, K29, K2A, K2B, K2C)                    \
+  LAYOUT_VARG(                                                          \
+              MOD_ROW(ROW1L)(K01, K02, K03, K04, K05, K06),            \
+              MOD_ROW(ROW1R)(K07, K08, K09, K0A, K0B, K0C),            \
+              MOD_ROW(ROW2L)(K11, K12, K13, K14, K15, K16),            \
+              MOD_ROW(ROW2R)(K17, K18, K19, K1A, K1B, K1C),            \
+              MOD_ROW(ROW3L)(K21, K22, K23, K24, K25, K26),            \
+              MAP_CHUNK(___4_THUMBS),                                   \
+              MOD_ROW(ROW3R)(K27, K28, K29, K2A, K2B, K2C),             \
+              MAP_CHUNK(___10_ERGO_THUMBS)                              \
+              )
+
+// All we really need is to add the see through thumbs to the end.
+#define Transient_2x6_8_5(                                              \
+                          K01, K02, K03, K04, K05,                      \
+                          K07, K08, K09, K0A, K0B,                      \
+                          K11, K12, K13, K14, K15,                      \
+                          K17, K18, K19, K1A, K1B,                      \
+                          K21, K22, K23, K24, K25,                      \
+                          K27, K28, K29, K2A, K2B                       \
+                                                                        ) \
+  LAYOUT_VARG(                                                          \
+              ___, K01, K02, K03, K04, K05,                             \
+              K07, K08, K09, K0A, K0B, ___,                             \
+              ___, K11, K12, K13, K14, K15,                             \
+              K17, K18, K19, K1A, K1B, ___,                             \
+              ___, K21, K22, K23, K24, K25,                             \
+              ___4___,                                                \
+              K27, K28, K29, K2A, K2B, ___,                           \
+              MAP_CHUNK(___10_ERGO_THUMBS)                             \
+                                                                        )
diff --git a/users/ericgebhart/keymap/keymap.c b/users/ericgebhart/keymap/keymap.c
new file mode 100644
index 0000000000..bee8538e26
--- /dev/null
+++ b/users/ericgebhart/keymap/keymap.c
@@ -0,0 +1,142 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* This is my keymap. Enable the layers you want in config.h. */
+
+#include QMK_KEYBOARD_H
+#include "ericgebhart.h"
+#include "layouts.h"
+
+#include "keyboards.h"
+
+// set up the wrapper macros.
+#define BASE_LAYER(NAME, ...)  [NAME] = BASE(__VA_ARGS__)
+#define BASE_LAYERt6(NAME, ...)  [NAME] = BASEt6(__VA_ARGS__)
+#define T_LAYER(LNAME, ...)  [LNAME] = TRANS(__VA_ARGS__)
+
+
+// One that takes 5 and one that takes 6 for bepo and other big maps
+// that need 3x12 instead of 3x10.
+#ifdef BASE_NUMBER_ROW
+#define B_LAYER(LNAME, NUMS, LAYOUT) BASE_LAYER(LNAME, NUMS, LAYOUT)
+#define B_LAYERt6(LNAME, NUMS, LAYOUT) BASE_LAYERt6(LNAME, NUMS, LAYOUT)
+#else
+// if there is no number row, don't give it one.
+#define B_LAYER(LNAME, NUMS, LAYOUT) BASE_LAYER(LNAME, LAYOUT)
+#define B_LAYERt6(LNAME, NUMS, LAYOUT) BASE_LAYERt6(LNAME, LAYOUT)
+#endif
+
+// Find alt local key definitions.
+// DV for dvorak/qwerty maps on bepo.
+// BK, BKW for beakl maps on en-qwerty and bepo.
+// BKW is automatic in map_beakl.h
+#define ALT_TARGET_IS NONE // NONE, DV=dvorak, BK=Beakl, BK2, BKW=Beaklwi.
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  // Default lang, Base layers
+#include "map_dvorak.h"
+#include "map_maks.h"
+#include "map_qwerty.h"
+#include "map_beakl.h"
+#include "map_alt.h"
+#include "map_gap.h"
+#include "map_carpalx.h"
+#include "map_hd.h"
+#include "map_bepo.h"
+
+  // create a set of layers for a second locale.
+#ifdef SECOND_LOCALE
+#undef LANG_IS
+#define LANG_IS SECOND_LOCALE
+
+  // changes alt target for us, because both en-qwerty and fr-bepo
+  // need a beakl alt target.
+#include "map_beakl.h"
+
+  // Qwerty based layers. Need a DV alt target to get the right shifted keys.
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS DV // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
+
+#include "map_dvorak.h"
+#include "map_maks.h"
+#include "map_qwerty.h"
+#include "map_alt.h"
+#include "map_gap.h"
+#include "map_carpalx.h"
+#include "map_hd.h"
+
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS NONE // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
+
+#include "map_bepo.h"
+
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#endif // bepo
+
+
+// SYMBOL LAYER
+#include "map_symbols.h"
+
+#ifdef SECOND_LOCALE
+#undef LANG_IS
+#define LANG_IS SECOND_LOCALE
+
+#include "map_symbols.h"
+
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#endif
+
+
+  // KEYPAD LAYER
+#include "map_keypads.h"
+
+#ifdef SECOND_LOCALE
+#undef LANG_IS
+#define LANG_IS SECOND_LOCALE
+
+#include "map_keypads.h"
+
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#endif
+
+
+// TOPROWS LAYER
+#include "map_toprows.h"
+
+#include "map_accented.h"
+
+#ifdef SECOND_LOCALE
+#undef LANG_IS
+#define LANG_IS SECOND_LOCALE
+
+#include "map_toprows.h"
+
+#include "map_accented.h"
+
+#undef LANG_IS
+#define LANG_IS EN
+#endif
+
+// functional non language based layers.
+#include "map_funcs.h"
+
+};
diff --git a/users/ericgebhart/keymap/map_accented.h b/users/ericgebhart/keymap/map_accented.h
new file mode 100644
index 0000000000..98ff8a34f1
--- /dev/null
+++ b/users/ericgebhart/keymap/map_accented.h
@@ -0,0 +1,26 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Accented character and dead key layers.
+#ifdef ACCENTS_LAYER_ENABLE
+  T_LAYER(LANG_N(_ACCENTS), ___ACCENTS___),
+#endif
+#ifdef MORTE_LAYER_ENABLE
+  T_LAYER(LANG_N(_MORTE), ___MORTE___),
+#endif
+#ifdef ACCENTS_MORTE_LAYER_ENABLE
+  T_LAYER(LANG_N(_ACCENTS_MORTE), ___ACCENTS_MORTE___),
+#endif
diff --git a/users/ericgebhart/keymap/map_alt.h b/users/ericgebhart/keymap/map_alt.h
new file mode 100644
index 0000000000..5fb0a12135
--- /dev/null
+++ b/users/ericgebhart/keymap/map_alt.h
@@ -0,0 +1,69 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef MALTRON_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE MALTRON_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_E)
+    B_LAYER(LANG_N(_MALTRON), ___10_NUMBERS___, ___MALTRON___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef THUMB_LETTER
+#endif
+
+
+
+#ifdef RSTHD_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE RSTHD_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_E)
+    B_LAYER(LANG_N(_RSTHD), ___10_NUMBERS___, ___RSTHD___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef THUMB_LETTER
+#endif
+
+#ifdef EUCALYN_LAYER_ENABLE
+    B_LAYER(LANG_N(_EUCALYN), ___10_NUMBERS___, ___EUCALYN___),
+#endif
+
+#ifdef HANDS_UP_LAYER_ENABLE
+    B_LAYER(LANG_N(_HANDS_UP), ___10_NUMBERS___, ___HANDS_UP___),
+#endif
+#ifdef WHITE_LAYER_ENABLE
+    B_LAYER(LANG_N(_WHITE), ___10_NUMBERS___, ___WHITE___),
+#endif
+#ifdef ISRT_LAYER_ENABLE
+    B_LAYER(LANG_N(_ISRT), ___10_NUMBERS___, ___ISRT___),
+#endif
+#ifdef SOUL_LAYER_ENABLE
+    B_LAYER(LANG_N(_SOUL), ___10_NUMBERS___, ___SOUL___),
+#endif
+#ifdef NIRO_LAYER_ENABLE
+    B_LAYER(LANG_N(_NIRO), ___10_NUMBERS___, ___NIRO___),
+#endif
+#ifdef ASSET_LAYER_ENABLE
+    B_LAYER(LANG_N(_ASSET), ___10_NUMBERS___, ___ASSET___),
+#endif
+#ifdef WHORF_LAYER_ENABLE
+    B_LAYER(LANG_N(_WHORF), ___10_NUMBERS___, ___WHORF___),
+#endif
+#ifdef WHORF6_LAYER_ENABLE
+    B_LAYER(LANG_N(_WHORF6), ___10_NUMBERS___, ___WHORF6___),
+#endif
diff --git a/users/ericgebhart/keymap/map_beakl.h b/users/ericgebhart/keymap/map_beakl.h
new file mode 100644
index 0000000000..e477790fbc
--- /dev/null
+++ b/users/ericgebhart/keymap/map_beakl.h
@@ -0,0 +1,48 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// choose your beakl,
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS BK // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
+
+#ifdef BEAKL15_LAYER_ENABLE
+B_LAYER(LANG_N(_BEAKL15), ___10_NUMBERS_BEAKL15___, ___BEAKL15___),
+#endif
+
+#ifdef BEAKL19_LAYER_ENABLE
+  B_LAYER(LANG_N(_BEAKL19), ___10_NUMBERS_BEAKL19___, ___BEAKL19___),
+#endif
+
+#ifdef BEAKL27_LAYER_ENABLE
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS BK2 // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
+
+  B_LAYER(LANG_N(_BEAKL27), ___10_NUMBERS_BEAKL19___, ___BEAKL27___),
+#endif
+
+#ifdef BEAKLWI_LAYER_ENABLE
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS BKW // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
+
+#undef THUMBS_ARE   // change the default thumbs to WI.
+#define THUMBS_ARE WIa
+  B_LAYER(LANG_N(_BEAKLWI), ___10_NUMBERS_BEAKL19___, ___BEAKLWI___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#endif
+
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS NONE // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
diff --git a/users/ericgebhart/keymap/map_bepo.h b/users/ericgebhart/keymap/map_bepo.h
new file mode 100644
index 0000000000..8371096053
--- /dev/null
+++ b/users/ericgebhart/keymap/map_bepo.h
@@ -0,0 +1,40 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// beginning of 3x12 base layers.
+
+#undef BASE_COLS_IN_OUT
+#define BASE_COLS_IN_OUT 6 // 5, 5_6, 6
+
+#ifdef BEPO_LAYER_ENABLE
+    B_LAYERt6(LANG_N(_BEPO), ___12_SYMBOLS_BEPO___, ___BEPO_3x12___),
+#endif
+
+#ifdef OPTIMOT_LAYER_ENABLE
+    B_LAYERt6(LANG_N(_OPTIMOT), ___12_SYMBOLS_BEPO___, ___OPTIMOT_3x12___),
+#endif
+
+#ifdef OPTIMOT_COMPACT_LAYER_ENABLE
+      B_LAYER(LANG_N(_OPTIMOT), ___10_SYMBOLS_BEPO___, ___OPTIMOT_3x10___),
+#endif
+
+#ifdef BEAKL19bis_LAYER_ENABLE
+    B_LAYERt6(LANG_N(_BEAKL19bis), ___12_SYMBOLS_BEPO___, ___BEAKL19bis_3x12___),
+#endif
+
+// end of 3x12 base layers.
+#undef BASE_COLS_IN_OUT
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
diff --git a/users/ericgebhart/keymap/map_carpalx.h b/users/ericgebhart/keymap/map_carpalx.h
new file mode 100644
index 0000000000..e36ca1caef
--- /dev/null
+++ b/users/ericgebhart/keymap/map_carpalx.h
@@ -0,0 +1,25 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef CARPALX_QFMLWY_LAYER_ENABLE
+B_LAYER(LANG_N(_CARPALX_QFMLWY), ___10_NUMBERS___, ___CARPALX_QFMLWY___),
+#endif
+#ifdef CARPALX_QGMLWB_LAYER_ENABLE
+  B_LAYER(LANG_N(_CARPALX_QGMLWB), ___10_NUMBERS___, ___CARPALX_QGMLWB___),
+#endif
+#ifdef CARPALX_QGMLWY_LAYER_ENABLE
+  B_LAYER(LANG_N(_CARPALX_QGMLWY), ___10_NUMBERS___, ___CARPALX_QGMLWY___),
+#endif
diff --git a/users/ericgebhart/keymap/map_dvorak.h b/users/ericgebhart/keymap/map_dvorak.h
new file mode 100644
index 0000000000..40afe827cc
--- /dev/null
+++ b/users/ericgebhart/keymap/map_dvorak.h
@@ -0,0 +1,31 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef DVORAK_LAYER_ENABLE
+B_LAYER(LANG_N(_DVORAK), ___10_NUMBERS___, ___DVORAK___),
+#endif
+#ifdef DVORAK_RLC_IU_LAYER_ENABLE
+  B_LAYER(LANG_N(_DVORAK_RLC_IU), ___10_NUMBERS___, ___DVORAK_RLC_IU___),
+#endif
+#ifdef BOO_LAYER_ENABLE
+  B_LAYER(LANG_N(_BOO), ___10_NUMBERS___, ___BOO___),
+#endif
+#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
+  B_LAYER(LANG_N(_CAPEWELL_DVORAK), ___10_NUMBERS___, ___CAPEWELL_DVORAK___),
+#endif
+#ifdef AHEI_LAYER_ENABLE
+  B_LAYER(LANG_N(_AHEI), ___10_NUMBERS___, ___AHEI___),
+#endif
diff --git a/users/ericgebhart/keymap/map_funcs.h b/users/ericgebhart/keymap/map_funcs.h
new file mode 100644
index 0000000000..0bf20610f3
--- /dev/null
+++ b/users/ericgebhart/keymap/map_funcs.h
@@ -0,0 +1,127 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// navigation.  Mouse keys, arrows, home,end, etc.
+#ifdef NAV_LAYER_ENABLE
+#  ifdef MOUSEKEY_ENABLE
+#      undef THUMBS_ARE
+#      define THUMBS_ARE MOUSE_LAYER_THUMBS
+
+#    ifdef NAV_FULL_LOCK_MODS
+T_LAYER(_NAV, ___NAVA_3x10___),
+#    endif
+
+#    ifdef NAV_FULL
+  T_LAYER(_NAV, ___NAV_3x10___),
+#    endif
+
+#    ifdef NAV_NO_MOUSE
+  T_LAYER(_NAV, ___NAVnm_3x10___),
+  T_LAYER(_NAVm, ___NAVm_3x10___),
+#    endif
+
+// give a default
+#    if !defined(NAV_FULL) &&           \
+        !defined(NAV_NO_MOUSE) &&       \
+        !defined(NAV_FULL_LOCK_MODS)    \
+
+  T_LAYER(_NAV, ___NAVA_3x10___),
+#    endif
+
+#    ifdef MOUSE_LAYER_ENABLE
+  T_LAYER(_NAVm, ___NAVm_3x10___),
+#    endif
+
+#    undef THUMBS_ARE
+#    define THUMBS_ARE DEFAULT_THUMBS
+
+#  else // no mouse enable.
+  T_LAYER(_NAV, ___NAVnm_3x10___),
+#  endif // mousekey end.
+#endif //nav end.
+
+#ifdef MEDIA_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE MEDIA_LAYER_THUMBS
+  T_LAYER(_MEDIA, ___MEDIA_3x10___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#endif
+
+#ifdef FUN_LAYER_ENABLE
+
+#ifdef FUNCPAD_MIRYOKU_ENABLE
+  T_LAYER(_FUN, ___FUN_3x10___),
+#else
+  T_LAYER(_FUN, ___FUN_MIRYOKU_3x10___),
+#endif
+
+#endif
+
+// A layer for layers. to set the default, etc.
+  T_LAYER(_LAYERS, ___LAYERS_3x10___),
+
+// control the RGB if there are any.
+#ifdef RGB_LAYER_ENABLE
+  T_LAYER(_RGB, ___RGB_3x10___),
+#endif
+
+// control and adjust stuff.
+#ifdef ADJUST_LAYER_ENABLE
+  T_LAYER(_ADJUST, ___ADJUST_3x10___),
+#endif
+
+
+// put the combo reference layers at the end.
+#ifdef COMBO_REF_LAYER_ENABLE
+#undef LANG_IS
+#define LANG_IS COMBO
+#undef EDGE_KEY_SET_IS
+#define EDGE_KEY_SET_IS REF1
+#undef THUMBS_ARE
+#define THUMBS_ARE COMBO
+#undef MODS_ARE
+#define MODS_ARE TRNS
+  B_LAYER(_COMBO_REF, ___10_NUMBERS___, ___COMBO_REF___),
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#undef EDGE_KEY_SET_IS
+#define EDGE_KEY_SET_IS DEFAULT_EDGE_SET
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef MODS_ARE
+#define MODS_ARE DEFAULT_MODS
+#endif
+
+#ifdef COMBO_REF_LAYER_TWO_ENABLE
+#undef LANG_IS
+#define LANG_IS COMBO2
+#undef EDGE_KEY_SET_IS
+#define EDGE_KEY_SET_IS REF2
+#undef THUMBS_ARE
+#define THUMBS_ARE COMBO2
+#undef MODS_ARE
+#define MODS_ARE TRNS
+  B_LAYER(_COMBO_REF2, ___10_NUMBERS___, ___COMBO_REF___),
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#undef EDGE_KEY_SET_IS
+#define EDGE_KEY_SET_IS DEFAULT_EDGE_SET
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef MODS_ARE
+#define MODS_ARE DEFAULT_MODS
+#endif
diff --git a/users/ericgebhart/keymap/map_gap.h b/users/ericgebhart/keymap/map_gap.h
new file mode 100644
index 0000000000..af0855c983
--- /dev/null
+++ b/users/ericgebhart/keymap/map_gap.h
@@ -0,0 +1,31 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef MTGAP_LAYER_ENABLE
+B_LAYER(LANG_N(_MTGAP), ___10_NUMBERS___, ___MTGAP___),
+#endif
+
+#ifdef CTGAP_LAYER_ENABLE
+  B_LAYER(LANG_N(_CTGAP), ___10_NUMBERS___, ___CTGAP___),
+#endif
+
+#ifdef APT_LAYER_ENABLE
+  B_LAYER(LANG_N(_APT), ___10_NUMBERS___, ___APT___),
+#endif
+
+#ifdef CANARY_LAYER_ENABLE
+  B_LAYER(LANG_N(_CANARY), ___10_NUMBERS___, ___CANARY___),
+#endif
diff --git a/users/ericgebhart/keymap/map_hd.h b/users/ericgebhart/keymap/map_hd.h
new file mode 100644
index 0000000000..1123e88074
--- /dev/null
+++ b/users/ericgebhart/keymap/map_hd.h
@@ -0,0 +1,117 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS HD
+// NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi, HD=Hands down.
+// HD_ELAN,
+
+#ifdef HD_NEU_LAYER_ENABLE
+B_LAYERt6(LANG_N(_HD_NEU), ___12_NUMBERS___, ___HD_NEU___),
+#endif
+
+#ifdef HD_NEU_NARROW_LAYER_ENABLE
+  B_LAYER(LANG_N(_HD_NEU_NARROW), ___10_NUMBERS___, ___HD_NEU_NARROW___),
+#endif
+
+#ifdef HD_REF_LAYER_ENABLE
+  B_LAYER(LANG_N(_HD_REF), ___10_NUMBERS___, ___HD_REF___),
+#endif
+
+#ifdef HD_TITANIUM_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_R)
+  B_LAYER(LANG_N(_HD_TITANIUM), ___10_NUMBERS___, ___HD_TITANIUM___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef THUMB_LETTER
+#endif
+
+#ifdef HD_GOLD_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_T)
+  B_LAYER(LANG_N(_HD_GOLD), ___10_NUMBERS___, ___HD_GOLD___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef THUMB_LETTER
+#endif
+
+#ifdef HD_PLATINUM_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_L)
+  B_LAYER(LANG_N(_HD_PLATINUM), ___10_NUMBERS___, ___HD_PLATINUM___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef THUMB_LETTER
+#endif
+
+#ifdef HD_SILVER_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_N)
+  B_LAYER(LANG_N(_HD_SILVER), ___10_NUMBERS___, ___HD_SILVER___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef THUMB_LETTER
+#endif
+
+#ifdef HD_BRONZE_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_H)
+  B_LAYER(LANG_N(_HD_BRONZE), ___10_NUMBERS___, ___HD_BRONZE___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef THUMB_LETTER
+#endif
+
+#ifdef HD_ELAN_LAYER_ENABLE
+#undef THUMBS_ARE
+#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(TL_DOT)
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS HD_ELAN
+  B_LAYER(LANG_N(_HD_ELAN), ___10_NUMBERS___, ___HD_ELAN___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS NONE
+#undef THUMB_LETTER
+#endif
+
+#ifdef HD_DASH_LAYER_ENABLE
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS HD_DASH
+#undef THUMBS_ARE
+#define THUMBS_ARE HD_DASH
+#undef THUMB_LETTER
+#define THUMB_LETTER LANG_KC(_E)
+  B_LAYER(LANG_N(_HD_DASH), ___10_NUMBERS___, ___HD_DASH___),
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#undef ALT_TARGET_IS
+#define ALT_TARGET_IS NONE
+#undef THUMB_LETTER
+#endif
diff --git a/users/ericgebhart/keymap/map_keypads.h b/users/ericgebhart/keymap/map_keypads.h
new file mode 100644
index 0000000000..7b76731b83
--- /dev/null
+++ b/users/ericgebhart/keymap/map_keypads.h
@@ -0,0 +1,66 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef KEYPAD_LAYER_ENABLE
+#  undef THUMBS_ARE
+#  define THUMBS_ARE KEYPAD_LAYER_THUMBS
+
+#  ifdef KEYPAD_BEAKL
+#    ifdef KEYPAD_BEAKL_WI
+T_LAYER(LANG_N(_KEYPAD), ___KP_BKL_WI_3x10___),
+#    else
+#      ifdef KEYPAD_MODS
+  T_LAYER(LANG_N(_KEYPAD), ___KP_BKL_MODS_3x10___),
+#      else
+  T_LAYER(LANG_N(_KEYPAD), ___KP_BKL_FUNC_3x10___),
+#      endif
+#    endif
+
+#  else  //not beakl
+
+#    ifdef KEYPAD_MIRYOKU
+  T_LAYER(LANG_N(_KEYPAD), ___KP_MIRYOKU_3x10___),
+#    else
+
+#      ifdef KEYPAD_RIGHT
+#        ifdef KEYPAD_MODS
+  T_LAYER(LANG_N(_KEYPAD), ___MODS_KP_3x10___),
+#        else
+  T_LAYER(LANG_N(_KEYPAD), ___FP_KP_3x10___),
+#        endif
+
+#      else // kp Left
+#        ifdef KEYPAD_MODS
+  T_LAYER(LANG_N(_KEYPAD), ___KP_MODS_3x10___),
+#        else
+  T_LAYER(LANG_N(_KEYPAD), ___KP_FP_3x10___),
+#        endif
+#      endif
+#    endif
+
+#  endif // not beakl
+
+#undef THUMBS_ARE
+#define THUMBS_ARE DEFAULT_THUMBS
+#endif
+
+#ifdef FUNC_LAYER_ENABLE
+#  ifdef FUNCPAD_MIRYOKU
+  T_LAYER(_FUN, ___FP_MIRYOKU_3x10___),
+#  else
+  T_LAYER(_FUN, ___FUN_3x10___),
+#  endif
+#endif
diff --git a/users/ericgebhart/keymap/map_maks.h b/users/ericgebhart/keymap/map_maks.h
new file mode 100644
index 0000000000..3290b2b772
--- /dev/null
+++ b/users/ericgebhart/keymap/map_maks.h
@@ -0,0 +1,34 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef COLEMAK_LAYER_ENABLE
+B_LAYER(LANG_N(_COLEMAK), ___10_NUMBERS___, ___COLEMAK___),
+#endif
+#ifdef COLEMAK_DH_LAYER_ENABLE
+  B_LAYER(LANG_N(_COLEMAK_DH), ___10_NUMBERS___, ___COLEMAK_DH___),
+#endif
+#ifdef HALMAK_LAYER_ENABLE
+  B_LAYER(LANG_N(_HALMAK), ___10_NUMBERS___, ___HALMAK___),
+#endif
+#ifdef MINIMAK_LAYER_ENABLE
+  B_LAYER(LANG_N(_MINIMAK), ___10_NUMBERS___, ___MINIMAK___),
+#endif
+#ifdef MINIMAK_8_LAYER_ENABLE
+  B_LAYER(LANG_N(_MINIMAK_8), ___10_NUMBERS___, ___MINIMAK___),
+#endif
+#ifdef MINIMAK_12_LAYER_ENABLE
+  B_LAYER(LANG_N(_MINIMAK_12), ___10_NUMBERS___, ___MINIMAK___),
+#endif
diff --git a/users/ericgebhart/keymap/map_qwerty.h b/users/ericgebhart/keymap/map_qwerty.h
new file mode 100644
index 0000000000..db74bdeb39
--- /dev/null
+++ b/users/ericgebhart/keymap/map_qwerty.h
@@ -0,0 +1,25 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef QWERTY_LAYER_ENABLE
+B_LAYER(LANG_N(_QWERTY), ___10_NUMBERS___, ___QWERTY___),
+#endif
+#ifdef NORMAN_LAYER_ENABLE
+  B_LAYER(LANG_N(_NORMAN), ___10_NUMBERS___, ___NORMAN___),
+#endif
+#ifdef WORKMAN_LAYER_ENABLE
+  B_LAYER(LANG_N(_WORKMAN), ___10_NUMBERS___, ___WORKMAN___),
+#endif
diff --git a/users/ericgebhart/keymap/map_symbols.h b/users/ericgebhart/keymap/map_symbols.h
new file mode 100644
index 0000000000..7908e95262
--- /dev/null
+++ b/users/ericgebhart/keymap/map_symbols.h
@@ -0,0 +1,56 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef SYMBOL_LAYER_ENABLE
+#  undef THUMBS_ARE
+#  define THUMBS_ARE SYMB_LAYER_THUMBS
+
+#  ifdef SYMBOL_BEAKL_C
+T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKLC_3x10___),
+#  else
+
+#    ifdef SYMBOL_BEAKL_EXT_VI
+      T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKLB_3x10___),
+#    else
+
+#      ifdef SYMBOL_BEAKL_EXT
+      T_LAYER(LANG_N(_SYMB ), ___SYMB_BEAKLA_3x10___),
+#      else
+
+#        ifdef SYMBOL_BEAKL_WI
+  T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKLWI_3x10___),
+#        else
+
+#          ifdef SYMBOL_MIRYOKU
+  T_LAYER(LANG_N(_SYMB), ___SYMB_MIRYOKU_3x10___),
+#          else
+
+#            ifdef SYMBOL_NEO
+  T_LAYER(LANG_N(_SYMB), ___SYMB_NEO_3x10___),
+#            else
+
+// basic beakl, the default if nothing chosen.
+           T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKL_3x10___),
+
+#            endif //neo
+#          endif //miryoku
+#        endif //beakl wi
+#      endif //beakl ext
+#    endif //beakl ext vi
+#  endif //beaklc
+#  undef THUMBS_ARE
+#  define THUMBS_ARE DEFAULT_THUMBS
+#endif
diff --git a/users/ericgebhart/keymap/map_toprows.h b/users/ericgebhart/keymap/map_toprows.h
new file mode 100644
index 0000000000..893541e8a0
--- /dev/null
+++ b/users/ericgebhart/keymap/map_toprows.h
@@ -0,0 +1,45 @@
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Top Rows  commonly called Raise
+#ifdef TOPROWS_LAYER_ENABLE
+
+#  undef THUMBS_ARE
+#  define THUMBS_ARE TOPROWS_LAYER_THUMBS
+
+#  ifdef TOPROWS_BKL_15_NUMS
+T_LAYER(LANG_N(_TOPROWS), ___TOPROWS_3x10___),
+#  endif
+
+#  ifdef TOPROWS_BKL_19_NUMS
+  T_LAYER(LANG_N(_TOPROWS), ___TOPROWS_BKL19_3x10___),
+#  endif
+
+#  ifdef TOPROWS_MOD
+  T_LAYER(LANG_N(_TOPROWS), ___TOPROWS_MOD_3x10___),
+#  endif
+
+// Not beakl numbers. Give a basic en-qwerty toprows layer.
+#if !defined(TOPROWS_BKL_15_NUMS) &&            \
+  !defined(TOPROWS_BKL_19_NUMS) &&              \
+  !defined(TOPROWS_MOD)
+
+  T_LAYER(LANG_N(_TOPROWS), ___RAISE_3x10___),
+#endif
+
+#  undef THUMBS_ARE
+#  define THUMBS_ARE DEFAULT_THUMBS
+#endif // toprows.
diff --git a/users/ericgebhart/lang/lang.h b/users/ericgebhart/lang/lang.h
new file mode 100644
index 0000000000..32172a935e
--- /dev/null
+++ b/users/ericgebhart/lang/lang.h
@@ -0,0 +1,106 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Language macros to change the names of things to
+// match the value of LANG_IS, and EDGE_COLS.
+// it would be nice to have consistency, but there isn't.
+// Keys need a prefix, layer chunks need a different suffix,
+// defines that are are opposite, of keys.
+//
+// In order to change layer and other names to match lang.
+// foo --> foo_bp or foo.
+
+// A new language just needs entries to match so
+// that it will create the proper names when LANG_IS
+// set to the appropriate values.
+// sonly the pfx and sfx functions need additions for
+// another language.
+// The rest is making sure there are keymap chunks
+// defined as needed.
+#define COMMA ,
+
+#define CONCATENATE(a, ...) a ## __VA_ARGS__
+#define CAT(a, ...) CONCATENATE(a, __VA_ARGS__)
+
+// We need another one with a different name.
+// The macros are painted blue otherwise.
+// Cat gets used at a low level, around keys, or layers basically.
+// Cat 2 is used for thumb cluster choices, any of which can contain
+// a number of CATS down at the bottom. -- nested macros of the same
+// name get painted blue.  So here we are. :-).  look in edge_keys.h
+// for THUMBS
+#define CONCATENATE2(a, ...) a ## __VA_ARGS__
+#define CAT2(a, ...) CONCATENATE2(a, __VA_ARGS__)
+
+#define CONCATENATE3(a, ...) a ## __VA_ARGS__
+#define CAT3(a, ...) CONCATENATE3(a, __VA_ARGS__)
+
+
+#define EMPTY()
+#define DEFER(id) id EMPTY()
+#define OBSTRUCT(...) __VA_ARGS__ DEFER(EMPTY)()
+#define EXPAND(...) __VA_ARGS__
+
+// Give the right keycode prefix by LANG_IS
+#define LANG_PFX CAT(LANG_IS, KC)
+#define COMBOKC CB
+#define COMBO2KC CB2
+#define BEPOKC BP
+#define ENKC KC
+#define US_INTKC US
+
+// Give the right symbol suffix by LANG_IS
+#define LANG_SFX CAT(CAT(LANG_IS, _), SFX)
+#define LOCALE_LAYERS_SFX _LL // for counting the base layers.
+#define COMBO_SFX _CB
+#define COMBO2_SFX _CB2
+#define BEPO_SFX _BP
+#define EN_SFX _EN
+#define US_INT_SFX _EN
+
+// Give the right map chunk suffix by LANG_IS
+#define LANG_MAPSFX CAT(CAT(LANG_IS, _), MAPSFX)
+#define COMBO_MAPSFX _CB___
+#define COMBO2_MAPSFX _CB2___
+#define BEPO_MAPSFX _BP___
+#define EN_MAPSFX _EN___
+#define US_INT_MAPSFX _EN___
+
+// These use the mapping above to get their job done.
+
+// In order to create keycode names to match lang.
+// A  --> BP_A or KC_A,US_A
+#define LANG_KC(NAME) CAT(LANG_PFX, NAME)
+
+// _SYMB -> _SYMB_EN
+// _SYMB -> _SYMB_BP
+#define LANG_N(NAME) CAT(NAME, LANG_SFX)
+
+// In order to map chunk names to match lang.
+// MAP_CHUNK(___15_BOTTOM) --> ___15_BOTTOM_EN___ or ___15_BOTTOM_BP___
+#define MAP_CHUNK(NAME) CAT3(NAME, LANG_MAPSFX)
+
+
+// for the oled layer map switch
+#ifdef SECOND_LOCALE
+#define LCASE(NAME)                          \
+  case CAT2(NAME, _EN):                      \
+  case CAT2(NAME, _BP):
+#else
+#define LCASE(NAME)                          \
+  case CAT2(NAME, _EN):
+#endif
diff --git a/users/ericgebhart/lang/lang_map.h b/users/ericgebhart/lang/lang_map.h
new file mode 100644
index 0000000000..16226f64fd
--- /dev/null
+++ b/users/ericgebhart/lang/lang_map.h
@@ -0,0 +1,78 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  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 CONCATENATEKC(a, ...) a ## __VA_ARGS__
+#define CATKC(a, ...) CONCATENATEKC(a, __VA_ARGS__)
+#define LKC(NAME) CATKC(LANG_PFX, NAME)
+
+// NONE, DV = dvorak, BK=Beakl, BK2=Beakl27, BKW=Beaklwi.
+// Give the right keycode prefix by Alt target _IS
+#define ALT_TARGET_IS NONE
+#define TARGET_PFX CATKC(ALT_TARGET_IS, KC)
+#define NONEKC
+#define DVKC _DV
+#define BKKC _BK
+#define BKWKC _BKW
+#define BK2KC _BK2
+#define HDKC _HD
+#define HD_ELANKC _HD_E
+#define HD_DASHKC _HD_D
+
+#define CONCATENATETKC(a, ...) a ## __VA_ARGS__
+#define CATTKC(a, ...) CONCATENATETKC(a, __VA_ARGS__)
+
+// depending on the value of ALT_TARGET_IS and LANG_IS.
+// TL_COMM -> TLKC(_COMM)
+// TLKC(_COMM) -> _BK_COMM, _DV_COMM, _BK2_COMM, _BK_COMM, _HD_COMM...
+#define TLKC(NAME) CATTKC(TARGET_PFX, NAME)
+
+#define LANG_ROW(K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A)      \
+  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05),                     \
+    LKC(K06), LKC(K07), LKC(K08), LKC(K09), LKC(K0A)                    \
+
+#define LANG_ROW12(K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C) \
+  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05), LKC(K06),           \
+    LKC(K07), LKC(K08), LKC(K09), LKC(K0A), LKC(K0B), LKC(K0C)          \
+
+// takes a 3x10
+#define LANG_MAP(K01, K02, K03, K04, K05,               \
+                 K06, K07, K08, K09, K0A,               \
+                 K11, K12, K13, K14, K15,               \
+                 K16, K17, K18, K19, K1A,               \
+                 K21, K22, K23, K24, K25,               \
+                 K26, K27, K28, K29, K2A)               \
+  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05),     \
+    LKC(K06), LKC(K07), LKC(K08), LKC(K09), LKC(K0A),   \
+    LKC(K11), LKC(K12), LKC(K13), LKC(K14), LKC(K15),   \
+    LKC(K16), LKC(K17), LKC(K18), LKC(K19), LKC(K1A),   \
+    LKC(K21), LKC(K22), LKC(K23), LKC(K24), LKC(K25),   \
+    LKC(K26), LKC(K27), LKC(K28), LKC(K29), LKC(K2A)
+
+
+// takes a 3x12
+#define LANG_MAP6(K01, K02, K03, K04, K05, K06,                 \
+                  K07, K08, K09, K0A, K0B, K0C,                 \
+                  K11, K12, K13, K14, K15, K16,                 \
+                  K17, K18, K19, K1A, K1B, K1C,                 \
+                  K21, K22, K23, K24, K25, K26,                 \
+                  K27, K28, K29, K2A, K2B, K2C)                 \
+  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05), LKC(K06),   \
+    LKC(K07), LKC(K08), LKC(K09), LKC(K0A), LKC(K0B), LKC(K0C), \
+    LKC(K11), LKC(K12), LKC(K13), LKC(K14), LKC(K15), LKC(K16), \
+    LKC(K18), LKC(K18), LKC(K19), LKC(K1A), LKC(K1B), LKC(K1C), \
+    LKC(K21), LKC(K22), LKC(K23), LKC(K24), LKC(K25), LKC(K26), \
+    LKC(K27), LKC(K28), LKC(K29), LKC(K2A), LKC(K2B), LKC(K2C)
diff --git a/users/ericgebhart/lang/locale_layers.h b/users/ericgebhart/lang/locale_layers.h
new file mode 100644
index 0000000000..103c1c4ed9
--- /dev/null
+++ b/users/ericgebhart/lang/locale_layers.h
@@ -0,0 +1,27 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  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 LOCALE_DEFAULT CAT(LOCALE_, DEFAULT_LANG)
+#define LOCALE_TWO CAT(LOCALE_, SECOND_LOCALE)
+
+enum locales {
+  LOCALE_DEFAULT = 0,
+#ifdef SECOND_LOCALE
+  LOCALE_TWO,
+#endif
+  LOCALES_END,
+};
diff --git a/users/ericgebhart/lang/locales.c b/users/ericgebhart/lang/locales.c
new file mode 100644
index 0000000000..560dec13b7
--- /dev/null
+++ b/users/ericgebhart/lang/locales.c
@@ -0,0 +1,60 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ericgebhart.h"
+#include "locales.h"
+
+bool process_locales(uint16_t keycode, keyrecord_t *record) {
+
+  switch (keycode) {
+  case KC_SET_BASE:
+    // set the current default base to eeprom.
+    if (record->event.pressed) {
+      set_single_persistent_default_layer(get_highest_layer(default_layer_state));
+    }
+    break;
+
+    // choose a different set of default layers based on locales.
+  case KC_NEXT_LOCALE:
+    // choose another locale and set the default base to the first layer.
+    if (!record->event.pressed) {
+      if (current_locale + 1 < LOCALES_END){
+        current_locale++;
+      }else{
+        current_locale = 0;
+      }
+      default_layer_set(1UL << LOCALE_LAYER_RANGE[0]);
+    }
+    return false;
+    break;
+
+    // choose a different base layer based on locales.
+    // simply iterates over the list and sets the default layer.
+  case KC_NEXT_BASE_LAYER:
+    if (!record->event.pressed) {
+      uint8_t current = get_highest_layer(default_layer_state);
+      if (current < LOCALE_LAYER_RANGE[1]){
+        current++;
+      }else{
+        current = LOCALE_LAYER_RANGE[0];
+      }
+      default_layer_set(1UL << current);
+    }
+    return false;
+    break;
+  }
+  return true;
+}
diff --git a/users/ericgebhart/lang/locales.h b/users/ericgebhart/lang/locales.h
new file mode 100644
index 0000000000..e38f5aeb72
--- /dev/null
+++ b/users/ericgebhart/lang/locales.h
@@ -0,0 +1,42 @@
+#pragma once
+/*
+  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "ericgebhart.h"
+
+// Stuff we need for locale and layer switching
+// there can be more but we need to know where they start and end.
+// remember there's limitations on layers.
+// Our locales. so it's easy to switch between them.
+
+
+const uint16_t base_layer_count = BASE_NAME_COUNT - 1;
+
+const uint16_t locale_layers[][2] = {
+  [LOCALE_DEFAULT] =      {0, base_layer_count},
+#ifdef SECOND_LOCALE
+  [LOCALE_TWO] =    {BASE_NAME_COUNT, BASE_NAME_COUNT + base_layer_count},
+#endif
+};
+
+uint32_t current_locale = LOCALE_DEFAULT;
+#define LOCALE_LAYER_RANGE locale_layers[current_locale]
+
+bool process_locales(uint16_t keycode, keyrecord_t *record);
+
+#define PROCESS_LOCALES                                         \
+  if (!process_locales(keycode, record)) { return false; }
diff --git a/users/ericgebhart/layer_names/base_names.h b/users/ericgebhart/layer_names/base_names.h
new file mode 100644
index 0000000000..1fef1efed0
--- /dev/null
+++ b/users/ericgebhart/layer_names/base_names.h
@@ -0,0 +1,173 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef DVORAK_LAYER_ENABLE
+    LANG_N(_DVORAK),
+#endif
+#ifdef DVORAK_RLC_IU_LAYER_ENABLE
+      LANG_N(_DVORAK_RLC_IU_),
+#endif
+#ifdef BOO_LAYER_ENABLE
+        LANG_N(_BOO),
+#endif
+#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
+        LANG_N(_CAPEWELL_DVORAK),
+#endif
+#ifdef AHEI_LAYER_ENABLE
+        LANG_N(_AHEI),
+#endif
+
+
+#ifdef QWERTY_LAYER_ENABLE
+      LANG_N(_QWERTY),
+#endif
+#ifdef WORKMAN_LAYER_ENABLE
+      LANG_N(_WORKMAN),
+#endif
+#ifdef NORMAN_LAYER_ENABLE
+      LANG_N(_NORMAN),
+#endif
+
+
+#ifdef COLEMAK_LAYER_ENABLE
+      LANG_N(_COLEMAK),
+#endif
+#ifdef COLEMAK_DH_LAYER_ENABLE
+      LANG_N(_COLEMAK_DH),
+#endif
+#ifdef HALMAK_LAYER_ENABLE
+      LANG_N(_COLEMAK),
+#endif
+#ifdef MINIMAK_LAYER_ENABLE
+      LANG_N(_MINIMAK),
+#endif
+#ifdef MINIMAK_8_LAYER_ENABLE
+      LANG_N(_MINIMAK_8),
+#endif
+#ifdef MINIMAK_12_LAYER_ENABLE
+      LANG_N(_MINIMAK_12),
+#endif
+
+
+#ifdef BEAKL15_LAYER_ENABLE
+      LANG_N(_BEAKL15),
+#endif
+#ifdef BEAKL19_LAYER_ENABLE
+      LANG_N(_BEAKL19),
+#endif
+#ifdef BEAKL27_LAYER_ENABLE
+      LANG_N(_BEAKL27),
+#endif
+#ifdef BEAKLWI_LAYER_ENABLE
+      LANG_N(_BEAKLWI),
+#endif
+
+#ifdef MALTRON_LAYER_ENABLE
+        LANG_N(_MALTRON),
+#endif
+#ifdef EUCALYN_LAYER_ENABLE
+        LANG_N(_EUCALYN),
+#endif
+#ifdef RSTHD_LAYER_ENABLE
+        LANG_N(_RSTHD),
+#endif
+#ifdef HANDS_UP_LAYER_ENABLE
+        LANG_N(_HANDS_UP),
+#endif
+#ifdef WHITE_LAYER_ENABLE
+        LANG_N(_WHITE),
+#endif
+#ifdef ISRT_LAYER_ENABLE
+        LANG_N(_ISRT),
+#endif
+#ifdef SOUL_LAYER_ENABLE
+        LANG_N(_SOUL),
+#endif
+#ifdef NIRO_LAYER_ENABLE
+        LANG_N(_NIRO),
+#endif
+#ifdef ASSET_LAYER_ENABLE
+        LANG_N(_ASSET),
+#endif
+#ifdef WHORF_LAYER_ENABLE
+        LANG_N(_WHORF),
+#endif
+#ifdef WHORF6_LAYER_ENABLE
+        LANG_N(_WHORF6),
+#endif
+
+#ifdef CARPALX_QFMLWY_LAYER_ENABLE
+        LANG_N(_CARPALX_QFMLWY),
+#endif
+#ifdef CARPALX_QGMLWB_LAYER_ENABLE
+        LANG_N(_CARPALX_QGMLWB),
+#endif
+#ifdef CARPALX_QGMLWY_LAYER_ENABLE
+        LANG_N(_CARPALX_QGMLWY),
+#endif
+
+
+#ifdef MTGAP_LAYER_ENABLE
+        LANG_N(_MTGAP),
+#endif
+#ifdef CTGAP_LAYER_ENABLE
+        LANG_N(_CTGAP),
+#endif
+#ifdef APT_LAYER_ENABLE
+        LANG_N(_APT),
+#endif
+#ifdef CANARY_LAYER_ENABLE
+        LANG_N(_CANARY),
+#endif
+
+
+#ifdef HD_NEU_LAYER_ENABLE
+        LANG_N(_HD_NEU),
+#endif
+#ifdef HD_NEU_NARROW_LAYER_ENABLE
+        LANG_N(_HD_NEU_NARROW),
+#endif
+#ifdef HD_GOLD_LAYER_ENABLE
+        LANG_N(_HD_GOLD),
+#endif
+#ifdef HD_PLATINUM_LAYER_ENABLE
+        LANG_N(_HD_PLATINUM),
+#endif
+#ifdef HD_SILVER_LAYER_ENABLE
+        LANG_N(_HD_SILVER),
+#endif
+#ifdef HD_BRONZE_LAYER_ENABLE
+        LANG_N(_HD_BRONZE),
+#endif
+#ifdef HD_ELAN_LAYER_ENABLE
+        LANG_N(_HD_ELAN),
+#endif
+#ifdef HD_DASH_LAYER_ENABLE
+        LANG_N(_HD_DASH),
+#endif
+#ifdef HD_REF_LAYER_ENABLE
+        LANG_N(_HD_REF),
+#endif
+
+#ifdef BEPO_LAYER_ENABLE
+        LANG_N(_BEPO),
+#endif
+#ifdef OPTIMOT_LAYER_ENABLE
+        LANG_N(_OPTIMOT),
+#endif
+#ifdef BEAKL19bis_LAYER_ENABLE
+        LANG_N(_BEAKL19bis),
+#endif
diff --git a/users/ericgebhart/layer_names/func_names.h b/users/ericgebhart/layer_names/func_names.h
new file mode 100644
index 0000000000..e1b061a145
--- /dev/null
+++ b/users/ericgebhart/layer_names/func_names.h
@@ -0,0 +1,38 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// functional layers that would be different by language
+
+#ifdef ACCENTS_LAYER_ENABLE
+LANG_N(_ACCENTS),
+#endif
+#ifdef MORTE_LAYER_ENABLE
+  LANG_N(_MORTE),
+#endif
+#ifdef ACCENTS_MORTE_LAYER_ENABLE
+    LANG_N(_ACCENTS_MORTE),
+#endif
+
+#ifdef SYMBOL_LAYER_ENABLE
+  LANG_N(_SYMB),
+#endif
+#ifdef KEYPAD_LAYER_ENABLE
+  LANG_N(_KEYPAD),
+#endif
+#ifdef TOPROWS_LAYER_ENABLE
+  LANG_N(_TOPROWS),
+#endif
diff --git a/users/ericgebhart/layer_names/layer_names.h b/users/ericgebhart/layer_names/layer_names.h
new file mode 100644
index 0000000000..69d9d50d32
--- /dev/null
+++ b/users/ericgebhart/layer_names/layer_names.h
@@ -0,0 +1,75 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received 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 "base_layers.h"
+#include "layouts.h"
+#include "layers.h"
+#if defined(OLED_CUSTOM_ENABLE)
+#    include "oled_stuff.h"
+#endif
+
+#define MO_LAYERS MO(_LAYERS)
+
+#undef LANG_IS
+#define LANG_IS LOCALE_LAYERS
+
+enum base_layer_names{
+#include "base_names.h"
+  BASE_NAME_COUNT
+};
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+
+
+// Get the enums for the layers.
+enum userspace_layers {
+
+#include "base_names.h"
+
+  // get them again if we have another locale.
+#ifdef SECOND_LOCALE
+#undef LANG_IS
+#define LANG_IS SECOND_LOCALE
+
+#include "base_names.h"
+
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#endif
+
+  _LAYERS,
+
+#include "func_names.h"
+
+  // get them again if we have another locale.
+#ifdef SECOND_LOCALE
+#undef LANG_IS
+#define LANG_IS SECOND_LOCALE
+
+#include "func_names.h"
+
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#endif
+
+#include "util_names.h"
+
+};
+
+
+// find the beginning and end of each locale.
+#include "locale_layers.h"
diff --git a/users/ericgebhart/layer_names/util_names.h b/users/ericgebhart/layer_names/util_names.h
new file mode 100644
index 0000000000..55597385fe
--- /dev/null
+++ b/users/ericgebhart/layer_names/util_names.h
@@ -0,0 +1,59 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// transient layers which are language agnostic.
+
+
+#ifdef NAV_LAYER_ENABLE
+  _NAV,
+#ifdef MOUSEKEY_ENABLE
+  _NAVm,
+#endif
+#endif
+
+#ifdef MEDIA_LAYER_ENABLE
+  _MEDIA,
+#endif
+
+#ifdef FUNC_LAYER_ENABLE
+    _FUN,
+#endif
+
+#ifdef RGB_LAYER_ENABLE
+  _RGB,
+#define TO_RGB MO(_RGB)
+#else
+#define TO_RGB ___
+#endif
+
+#ifdef ADJUST_LAYER_ENABLE
+  _ADJUST,
+#define MO_ADJUST MO(_ADJUST)
+#else
+#define MO_ADJUST ___
+#endif
+
+
+#ifdef COMBO_REF_LAYER_ENABLE
+  _COMBO_REF,
+// set the combo reference layer if we have one.
+#undef COMBO_REF_DEFAULT
+#define COMBO_REF_DEFAULT _COMBO_REF
+#endif
+#ifdef COMBO_REF_LAYER_TWO_ENABLE
+  _COMBO_REF2,
+#endif
diff --git a/users/ericgebhart/layers.h b/users/ericgebhart/layers.h
deleted file mode 100755
index 5faaf01736..0000000000
--- a/users/ericgebhart/layers.h
+++ /dev/null
@@ -1,677 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "core_keys.h"
-/*********************************************************************/
-/* Non-Base Layer Definitions.                                       */
-/*                                                                   */
-/* Keypads, sympads, funcpads, symbols, RGB, Layers, Controls, etc.  */
-/* Qwerty and Bepo versions exist as needed.                         */
-/*                                                                   */
-/* This file defines every auxillary layer I use on every keyboard   */
-/* Ergodox, keebio/viterbi, xd75, rebound, crkbd, morpho, dactyl,..  */
-/*********************************************************************/
-/********************************************************************************/
-/* The following Transient/Non-Base Layers are provided within.                 */
-/* Each layer is named with the size of Keymatrix it has entries for.           */
-/* 3x12 or 4x12 are usual for these. Splitting is managed in the macros as      */
-/* needed. BP indicates the Bepo equivalent to the Qwerty layer when needed.    */
-/********************************************************************************/
-/*                                                                              */
-/* Explore below to see what they all are.                                      */
-/* Naming gives the sizes of things, a prefix number is the length.             */
-/* BP is the bepo version of things.                                            */
-/* BKL is the beakl 15 version of a layout or chunk.                            */
-/* C on the end of a name means its a compact version of something.             */
-/* Compact meaning for use on a 3 row layout.                                   */
-/*                                                                              */
-/* TOPROWS - numbers, symbols, functions, all on one layer.                     */
-/* ___TOPROWS_3x12___                                                           */
-/* ___TOPROWS_BP_3x12___                                                        */
-/*    // just numbers on the home row                                           */
-/* ___NUM_HOME_BEAKL_3x12___                                                    */
-/* ___NUM_HOME_BEAKL_BP_3x12___                                                 */
-/* ___NUM_HOME_3x12___                                                          */
-/* ___NUM_HOME_BP_3x12___                                                       */
-/*                                                                              */
-/* KEYPADS/FUNCPADS.                                                            */
-/* ___KEY_BKL_FUNC_4x12___   -- The BEAKL15 Keypad with a Funcpad on the right  */
-/* ___KEY_BKL_FUNC_BP_4x12___                                                   */
-/* ___FUNC_KEYPAD_4x12___    -- A Funcpad and a keypad                          */
-/* ___FUNC_KEYPAD_BP_4x12___ -- For Bepo                                        */
-/*                                                                              */
-/* // Compact Funcpad and keypad, 3x12                                          */
-/* ___KP_C_3x12___                                                              */
-/* ___KP_C_BP_3x12___                                                           */
-/* ___KP_C_BKL_FUNC_3x12___  -- BEAKL key/func pads.                            */
-/* ___KP_C_BKL_FUNC_BP_3x12___                                                  */
-/*                                                                              */
-/* SYMBOLS   -Beakl or Beakl extended                                           */
-/* ___SYMB_BEAKL_3x12___                                                        */
-/* ___SYMB_BEAKL_BP_3x12___                                                     */
-/*                                                                              */
-/* Beakl extended symbol layer with additional corner symbols.                  */
-/* For use with non-beakl base layers.                                          */
-/* ___SYMB_BEAKLA_3x12___                                                       */
-/* ___SYMB_BEAKLA_BP_3x12___                                                    */
-/* For use with vi bindings optimized                                           */
-/* ___SYMB_BEAKLB_3x12___                                                       */
-/* ___SYMB_BEAKLB_BP_3x12___                                                    */
-/*                                                                              */
-/* NAVIGATION                                                                   */
-/* ___NAV_3x12___                                                               */
-/* ___NAV_4x12___                                                               */
-/*                                                                              */
-/* CONTROLS                                                                     */
-/* ___RGB_3x12___                                                               */
-/* ___ADJUST_3x12___                                                            */
-/* ___LAYERS_3x12___                                                            */
-/********************************************************************************/
-/*********************************************************************/
-/* XXXXXX Layer chunk  -- These are the final layers.                */
-/*                                                                   */
-/* Each section defines the necessary pieces to create a layer.      */
-/* It builds them up into consistently shaped lists for the layout   */
-/* wrapper.                                                          */
-/*                                                                   */
-/* Each Section ends with a _Layer Chunk_. This is so the            */
-/* layer can be easily given to the Layout Wrapper macros which      */
-/* takes a list of keys in lengths of 2x3x5, 2x3x6, 2x4x5, or 2x4x6. */
-/*                                                                   */
-/* All of my keyboard definitions use these same chunks with similar */
-/* macros. The differences between keyboards are all managed in the  */
-/* macro. Here we just have nice rectangular sets of keys to         */
-/* complete a layout.                                                */
-/*********************************************************************/
-
-
-/*******************************************************************/
-/* A Top Rows layer.  Pick your parts.  Bepo and Qwerty            */
-/*                                                                 */
-/* This is, to me, a stop gap layer. If I need symbols, numbers or */
-/* function keys these rows are nicely predictable to most people. */
-/* I currently use the beakl number row with regular symbols.      */
-/* I never use function keys for anything.                         */
-/*******************************************************************/
-#define ___12_SYMB___        ___, ___SYMS___, ___
-#define ___12_SYMB_BP___       ___12_SYMS_BEPO___,
-
-#define ___12_NUM___         ___, ___NUMS___, ___
-#define ___12_NUM_BP___        ___, ___NUMS_BP___, ___
-#define ___12_NUM_BEAKL___   ___, ___BKLNUMS___, ___
-#define ___12_NUM_BEAKL_BP___ ___, ___BKLNUMS_BP___, ___
-
-#define ___12_FUNC___        ___FUNC_1_6___, ___FUNC_7_12___
-#define ___12_SYMS_BEPO___   ___6SYMBOL_BEPO_L___, ___6SYMBOL_BEPO_R___
-#define ___12_SYMS_FR___     ___SYMB_L_FR___, ___SYMB_R_FR___
-
-// Kinesis function key row. I don't use them. but might as well define them.
-#define ___KINTFUNC_L___ KC_ESC, ___FUNC_1_6___, KC_F7, KC_F8
-// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET
-#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, RESET
-
-// A TOPROWS Layer.
-// set it how you like it, if you like it.
-#define ___TOPROW_1___    ___12_SYMB___
-#define ___TOPROW_2___    ___12_NUM_BEAKL___
-#define ___TOPROW_3___    ___12_FUNC___
-
-#define ___TOPROW_1_BP___ ___12_SYMS_BEPO___
-#define ___TOPROW_2_BP___ ___12_NUM_BEAKL_BP___
-#define ___TOPROW_3_BP___ ___12_FUNC___
-
-/********************************************************************************/
-/* TOPROWS Layer chunk                                                          */
-/********************************************************************************/
-// altogether in a chunk.
-#define ___TOPROWS_3x12___     ___TOPROW_1___,    ___TOPROW_2___,    ___TOPROW_3___
-#define ___TOPROWS_BP_3x12___ ___TOPROW_1_BP___, ___TOPROW_2_BP___, ___TOPROW_3_BP___
-
-// Some layers with just a home row of numbers.
-// The beakl ones, r the usual ones.
-#define ___NUM_HOME_BEAKL_3x12___    ___12___, ___12_NUM_BEAKL___,    ___12___
-#define ___NUM_HOME_BEAKL_BP_3x12___ ___12___, ___12_NUM_BEAKL_BP___, ___12___
-#define ___NUM_HOME_3x12___          ___12___, ___12_NUM___,          ___12___
-#define ___NUM_HOME_BP_3x12___       ___12___, ___12_NUM_BP___,       ___12___
-
-
-/********************************************************************************/
-/*  KEYPADS.  Mostly all in Bepo and Qwerty versions                            */
-/*      4 row Pads:                                                             */
-/*         * The BEAKL 15 Number pad, for the left hand.                        */
-/*         * Regular Number pad, for the right hand.                            */
-/*         * 12 Function pad.                                                   */
-/*      3 row pads:                                                             */
-/*         keypad                                                               */
-/*         function pad                                                         */
-/*                                                                              */
-/*  LAYERS:                                                                     */
-/*      4 Row:                                                                  */
-/*         * BEAKL with a compact FuncPad on the right.                         */
-/*         * Funcpad on the left, keypad on the right.                          */
-/*      3 Row:                                                                  */
-/*         * Funcpad on the left, keypad on the right.                          */
-/*         * BEAKL with a compact FuncPad on the right.                         */
-/*                                                                              */
-/********************************************************************************/
-
-// BEAKL 15 (numpad layer):
-/*    +=*   ^%~ */
-/*   ↹523:      */
-/* - 7.104      */
-/*   /698,      */
-
-// Keypads
-#define ___6KEYPAD_BEAKL_L1___     ___, _X_,        KC_PLUS,  KC_PEQL,  KC_ASTR, _X_
-#define ___6KEYPAD_BEAKL_L2___     ___, TAB_BKTAB,  KC_5,     KC_2,     KC_3,   KC_COLON
-#define ___6KEYPAD_BEAKL_L3___ KC_MINS, KC_7,       KC_DOT,   KC_1,     KC_0,   KC_4
-#define ___6KEYPAD_BEAKL_L4___     ___, KC_SLASH,   KC_6,     KC_9,     KC_8,   KC_COMM
-
-#define ___5KEYPAD_BEAKL_R1___     ___, KC_CIRC,  KC_PERC,  KC_TILD, ___
-
-#define ___6KEYPAD_BEAKL_L1_BP___     ___, _X_,        BP_PLUS,  BP_EQL,  BP_ASTR, _X_
-#define ___6KEYPAD_BEAKL_L2_BP___     ___, TAB_BKTAB,  BP_5,     BP_2,     BP_3,   BP_COLN
-#define ___6KEYPAD_BEAKL_L3_BP___ BP_MINS, BP_7,       BP_DOT,   BP_1,     BP_0,   BP_4
-#define ___6KEYPAD_BEAKL_L4_BP___     ___, BP_SLSH,   BP_6,     BP_9,     BP_8,   BP_COMM
-
-#define ___5KEYPAD_BEAKL_R1_BP___     ___, BP_CIRC,  BP_PERC,  BP_TILD, ___
-
-#define ___5KEYPAD_1___ _X_, KC_7,  KC_8,    KC_9,     KC_PSLS
-#define ___5KEYPAD_2___ _X_, KC_4,  KC_5,    KC_6,     KC_PAST
-#define ___5KEYPAD_3___ _X_, KC_1,  KC_2,    KC_3,     KC_PMNS
-#define ___5KEYPAD_4___ _X_, KC_0,  KC_DOT,  KC_PEQL,  KC_PPLS
-// For Bepo
-#define ___5KEYPAD_1_BP___ _X_, DB_7,  DB_8,    DB_9,     BP_SLSH
-#define ___5KEYPAD_2_BP___ _X_, DB_4,  DB_5,    DB_6,     BP_ASTR
-#define ___5KEYPAD_3_BP___ _X_, DB_1,  DB_2,    DB_3,     DB_MINUS
-#define ___5KEYPAD_4_BP___ _X_, DB_0,  DB_DOT,  DB_EQL,   BP_PLUS
-
-// Keypad from the default keymap.c of the xd75
-#define ___4KEYPAD_1_ALT___ _X_, KC_P7, KC_P8,  KC_P9,   KC_MINS
-#define ___4KEYPAD_2_ALT___ _X_, KC_P4, KC_P5,  KC_P6,   KC_PLUS
-#define ___4KEYPAD_3_ALT___ _X_, KC_P1, KC_P2,  KC_P3,   KC_PENT
-#define ___4KEYPAD_4_ALT___ _X_, KC_P0, KC_DOT, KC_PENT, KC_PENT
-
-// Function pad.  Same idea as above, but for function keys.
-// For the left side.
-#define ___5FUNCPAD_T___   _X_, KC_F10,  KC_F11,  KC_F12, _X_
-#define ___5FUNCPAD_1___   _X_, KC_F7,   KC_F8,   KC_F9, _X_
-#define ___5FUNCPAD_2___   _X_, KC_F4,   KC_F5,   KC_F6, _X_
-#define ___5FUNCPAD_3___   _X_, KC_F1,   KC_F2,   KC_F3, _X_
-
-
-// Put them together for complete left and right layers.
-// Beakl keypad with a funcpad
-#define ___12_KEYPAD_BKL_FUNCPAD_1___ ___6KEYPAD_BEAKL_L1___, _X_, ___5KEYPAD_BEAKL_R1___
-#define ___12_KEYPAD_BKL_FUNCPAD_2___ ___6KEYPAD_BEAKL_L2___, _X_, ___5_FUNCPADC_1___
-#define ___12_KEYPAD_BKL_FUNCPAD_3___ ___6KEYPAD_BEAKL_L3___, _X_, ___5_FUNCPADC_2___
-#define ___12_KEYPAD_BKL_FUNCPAD_4___ ___6KEYPAD_BEAKL_L4___, _X_, ___5_FUNCPADC_3___
-
-#define ___12_KEYPAD_BKL_FUNCPAD_1_BP___ ___6KEYPAD_BEAKL_L1_BP___, _X_, ___5KEYPAD_BEAKL_R1_BP___
-#define ___12_KEYPAD_BKL_FUNCPAD_2_BP___ ___6KEYPAD_BEAKL_L2_BP___, _X_, ___5_FUNCPADC_1___
-#define ___12_KEYPAD_BKL_FUNCPAD_3_BP___ ___6KEYPAD_BEAKL_L3_BP___, _X_, ___5_FUNCPADC_2___
-#define ___12_KEYPAD_BKL_FUNCPAD_4_BP___ ___6KEYPAD_BEAKL_L4_BP___, _X_, ___5_FUNCPADC_3___
-
-// Funcpad and keypad layer for Qwerty based layers.
-#define ___12_FUNCPAD_KEYPAD_1___ ___,  ___5FUNCPAD_T___,  ___5KEYPAD_1___,  ___
-#define ___12_FUNCPAD_KEYPAD_2___ ___,  ___5FUNCPAD_1___,  ___5KEYPAD_2___,  ___
-#define ___12_FUNCPAD_KEYPAD_3___ ___,  ___5FUNCPAD_2___,  ___5KEYPAD_3___,  KC_PENT
-#define ___12_FUNCPAD_KEYPAD_4___ ___,  ___5FUNCPAD_3___,  ___5KEYPAD_4___,  ___
-
-// Funcpad and keypad layer for BEPO
-#define ___12_FUNCPAD_KEYPAD_BP_1___    ___,  ___5FUNCPAD_T_BP___,  ___5KEYPAD_1_BP___,  ___
-#define ___12_FUNCPAD_KEYPAD_BP_2___    ___,  ___5FUNCPAD_1_BP___,  ___5KEYPAD_2_BP___,  ___
-#define ___12_FUNCPAD_KEYPAD_BP_3___    ___,  ___5FUNCPAD_2_BP___,  ___5KEYPAD_3_BP___,  KC_PENT
-#define ___12_FUNCPAD_KEYPAD_BP_4___    ___,  ___5FUNCPAD_3_BP___,  ___5KEYPAD_4_BP___,  ___
-
-/********************************************************************************/
-/* COMPACT - KEYPAD and FUNCPAD.  3 Rows.                                       */
-/********************************************************************************/
-// Compact versions of each. 3 rows.
-//Compact keypad, 3 rows.
-#define ___6KEYPADC_1___ ___,    KC_7,  KC_8,    KC_9,     KC_PSLS, ___
-#define ___6KEYPADC_2___ KC_DOT, KC_4,  KC_5,    KC_6,     KC_PAST, KC_PEQL
-#define ___6KEYPADC_3___ KC_0,   KC_1,  KC_2,    KC_3,     KC_PMNS, KC_PPLS
-// For Bepo
-#define ___6KEYPADC_1_BP___ ___,    DB_7,  DB_8,    DB_9,  BP_SLSH
-#define ___6KEYPADC_2_BP___ DB_DOT, DB_4,  DB_5,    DB_6,  BP_ASTR,  DB_EQL
-#define ___6KEYPADC_3_BP___ DB_0,   DB_1,  DB_2,    DB_3,  DB_MINUS, DB_PLUS
-
-// compact 1-12 funcpad for 3 row keyboards.
-#define ___5_FUNCPADC_1___   KC_F9, KC_F10, KC_F11, KC_F12, ___
-#define ___5_FUNCPADC_2___   KC_F5, KC_F6,  KC_F7,  KC_F8,  ___
-#define ___5_FUNCPADC_3___   KC_F1, KC_F2,  KC_F3,  KC_F4,  ___
-
-// Compact funcpads/keypad Layer
-#define ___12_KP_1C___ ___,  ___5_FUNCPADC_1___,   ___5KEYPAD_1___, ___
-#define ___12_KP_2C___ ___,  ___5_FUNCPADC_2___,   ___5KEYPAD_2___, ___
-#define ___12_KP_3C___ ___,  ___5_FUNCPADC_3___,   ___5KEYPAD_3___, ___
-// Reversed
-#define ___12_KP_FP_1C___ ___,  ___5KEYPAD_1___,   ___5_FUNCPADC_1___, ___
-#define ___12_KP_FP_2C___ ___,  ___5KEYPAD_2___,   ___5_FUNCPADC_2___, ___
-#define ___12_KP_FP_3C___ ___,  ___5KEYPAD_3___,   ___5_FUNCPADC_3___, ___
-
-//Bepo funcpad and keypad Layer
-#define ___12_KP_1_BP___ ___,  ___5_FUNCPADC_1___, ___5KEYPAD_1_BP___, ___
-#define ___12_KP_2_BP___ ___,  ___5_FUNCPADC_2___, ___5KEYPAD_2_BP___, ___
-#define ___12_KP_3_BP___ ___,  ___5_FUNCPADC_3___, ___5KEYPAD_3_BP___, ___
-
-/********************************************************************************/
-/* FUNCPAD and Keypad Layer chunks                                              */
-/********************************************************************************/
-// Full size, 4x12
-#define ___KEYPAD_BKL_FUNC_4x12___ \
-  ___12_KEYPAD_BKL_FUNCPAD_1___,                                        \
-    ___12_KEYPAD_BKL_FUNCPAD_2___,                                      \
-    ___12_KEYPAD_BKL_FUNCPAD_3___, \
-    ___12_KEYPAD_BKL_FUNCPAD_4___
-#define ___KEYPAD_BKL_FUNC_BP_4x12___                                   \
-   ___12_KEYPAD_BKL_FUNCPAD_1_BP___,                                    \
-     ___12_KEYPAD_BKL_FUNCPAD_2_BP___,                                  \
-     ___12_KEYPAD_BKL_FUNCPAD_3_BP___,                                  \
-     ___12_KEYPAD_BKL_FUNCPAD_4_BP___
-#define ___FUNC_KEYPAD_4x12___ \
-  ___12_FUNCPAD_KEYPAD_1___,                                    \
-    ___12_FUNCPAD_KEYPAD_2___,                                  \
-    ___12_FUNCPAD_KEYPAD_3___,                                \
-    ___12_FUNCPAD_KEYPAD_4___
-#define ___FUNC_KEYPAD_BP_4x12___ \
-    ___12_FUNCPAD_KEYPAD_BP_1___,                                       \
-      ___12_FUNCPAD_KEYPAD_BP_2___,                                     \
-      ___12_FUNCPAD_KEYPAD_BP_3___,                                     \
-      ___12_FUNCPAD_KEYPAD_BP_4___
-
-// Compact, 3x12
-#define ___KP_C_BKL_FUNC_3x12___                \
-  ___12_KEYPAD_BKL_FUNCPAD_2___,                \
-    ___12_KEYPAD_BKL_FUNCPAD_3___,              \
-    ___12_KEYPAD_BKL_FUNCPAD_4___
-#define ___KP_C_BKL_FUNC_BP_3x12___             \
-  ___12_KEYPAD_BKL_FUNCPAD_2_BP___,             \
-    ___12_KEYPAD_BKL_FUNCPAD_3_BP___,           \
-    ___12_KEYPAD_BKL_FUNCPAD_4_BP___
-
-#define ___KP_C_3x12___    ___12_KP_1C___,   ___12_KP_2C___,   ___12_KP_3C___
-#define ___KP_FP_C_3x12___  ___12_KP_FP_1C___,   ___12_KP_FP_2C___,   ___12_KP_FP_3C___
-#define ___KP_C_BP_3x12___ ___12_KP_1_BP___, ___12_KP_2_BP___, ___12_KP_3_BP___
-
-
-
-/********************************************************************************/
-/* SYMBOLS.  The BEAKL15 Symbol layer with or without additions.  */
-/*                                                                */
-/* Symbol layers:                                                 */
-/*                                                                */
-/*     BEAKL symbol layer                                         */
-/*         <$>   [_]                                              */
-/*      - \(")# %{=}| ;                                           */
-/*         :*+   &^~                                              */
-/*                                                                */
-/*     BEAKL Extended symbol layer                                */
-/*        `<$>' ?[_]                                              */
-/*      - \(")# %{=}| ;                                           */
-/*        @:*+; !&^~/                                             */
-/*                                                                */
-/* This layer has replaced my former Symbol pad and Symbols       */
-/* layer. The Sympad was nice, But this incorporates the matching */
-/* (){}[] that I had and at the same time provides an easily      */
-/* Learnable layer that makes sense. It was also easy to          */
-/* Supplement with new keys that other layouts might need.        */
-/*                                                                */
-/* The first Layer defined is the "Official" version.             */
-/* The second Layer defined only adds to the original by          */
-/* Placing 8 keys in the pinky and index corners                  */
-/* at the edges of the, 3x3, BEAKL home Region.                   */
-/*                                                                */
-/* Namely these: !?@`'/-;                                         */
-/*                                                                */
-/* Beakl has these keys in it's base layer which isn't the case   */
-/* for other layouts like dvorak, colemak, etc.                   */
-/*                                                                */
-/******************************************************************/
-
-/******************************************************************/
-/* Official BEAKL15 Symbol layer. */
-/* BEAKL 15 (punctuation layer): */
-/*                 */
-/*    <$>   [_]    */
-/* - \(")# %{=}| ; */
-/*    :*+   &^~    */
-/******************************************************************/
-/********************************************************************************/
-/* The expanded Beakl Symbol Layer                                              */
-/*                                                                              */
-/* Expanded with: !?@`'/-;                                                      */
-/*                                                                              */
-/* This insures access to all common symbols, regardless of availabilily on     */
-/* other layers. All the extra characters are added to the pinky and index      */
-/* corners which are empty in the BEAKL symbol layer.                           */
-/*                                                                              */
-/* Both ; and ' could find their dvorak positions.                              */
-/* Analysis showed that only caused pinky overuse. Rotating the symbols around  */
-/* Put better keys on the index finger which showed a huge improvement          */
-/* in efficiency.  The same is true of the exclamation point.                   */
-/*                                                                              */
-/* A:                                                                           */
-/*   `<$>' ?[_]                                              */
-/* - \(")# %{=}| ;                                           */
-/*   @:*+; !&^~/                                             */
-/*                                                                              */
-/* B:                                                                           */
-/*  With vi bindings /:? and a leader key for vi/emacs.*/
-/*  ; is popular, I use , it's easy in dvorak.:   */
-/*                                                                              */
-/*   `<$>' ?[_]-                                             */
-/* - \(")# !{:}/ ;                                           */
-/*   @=*+; %&^~|                                             */
-/********************************************************************************/
-// Left
-#define ___SB_L1___               KC_OCLTGT,     KC_DLR,   KC_GT
-#define ___SB_L2___   KC_BACKSLASH,  KC_OCPRN,   KC_OCDQUO,   KC_RPRN,  KC_HASH
-#define ___SB_L3___               KC_COLON,  KC_ASTR,  KC_PLUS
-#define ___SB_L3b___              KC_EQL,  KC_ASTR,  KC_PLUS
-
-// Bepo
-#define ___SB_L1_BP___                BP_OCLTGT,   BP_DLR,   DB_GRTR
-#define ___SB_L2_BP___  DB_BACKSLASH, DB_LPRN,   BP_OCDQUO,  DB_RPRN,  DB_HASH
-#define ___SB_L3_BP___                KC_COLON,  BP_ASTR,  BP_PLUS
-#define ___SB_L3b_BP___               BP_EQL,  BP_ASTR,  BP_PLUS
-
-// Right
-#define ___SB_R1___               KC_OCBRC,   KC_UNDS,  KC_RBRC
-#define ___SB_R2___    KC_PERC,   KC_OCCBR,   KC_EQL,   KC_RCBR,  KC_PIPE
-#define ___SB_R3___               KC_AMPR,   KC_CIRC,  KC_TILD
-
-#define ___SB_R2a___   KC_PERC, KC_OCCBR,   KC_EXLM,   KC_RCBR,  KC_PIPE
-#define ___SB_R2b___   KC_EXLM,   KC_OCCBR,   KC_COLN,  KC_RCBR,  KC_SLASH
-
-// Bepo
-#define ___SB_R1_BP___            BP_OCBRC,   BP_UNDS,  DB_RBRC
-#define ___SB_R2_BP___  BP_PERC, BP_OCCBR,   BP_EQL,   DB_RCBR,  DB_PIPE
-#define ___SB_R3_BP___            BP_AMPR,   DB_CIRC,  DB_TILD
-
-#define ___SB_R2a_BP___ BP_PERC, BP_OCCBR,   BP_EXLM,   DB_RCBR,  DB_PIPE
-#define ___SB_R2b_BP___ BP_EXLM, BP_OCCBR,   KC_COLON,   DB_RCBR,  DB_SLASH
-
-// ---------------------------
-// ---------------------------
-
-// Square it to 6, Add in the - and ;.
-#define ___6SYMBOLS_BEAKL_L1___  ___,     ___,  ___SB_L1___, ___
-#define ___6SYMBOLS_BEAKL_L2___  KC_MINS, ___SB_L2___
-#define ___6SYMBOLS_BEAKL_L3___  ___,     ___,  ___SB_L3___, ___
-
-#define ___6SYMBOLS_BEAKL_R1___  ___, ___SB_R1___,  ___, ___
-#define ___6SYMBOLS_BEAKL_R2___  ___SB_R2___,            KC_SCLN
-#define ___6SYMBOLS_BEAKL_R3___  ___, ___SB_R3___,  ___, ___
-// ---------------------------
-#define ___6SYMBOLS_BEAKL_L1a___  ___, KC_OCGRV,  ___SB_L1___,  KC_OCQUOT
-#define ___6SYMBOLS_BEAKL_L2a___  ___6SYMBOLS_BEAKL_L2___
-#define ___6SYMBOLS_BEAKL_L3a___  ___, KC_AT,  ___SB_L3___,  KC_SCLN
-
-#define ___6SYMBOLS_BEAKL_R1a___  LSFT(KC_SLASH), ___SB_R1___,  KC_MINS, ___
-#define ___6SYMBOLS_BEAKL_R2a___  ___SB_R2a___, KC_SCLN
-#define ___6SYMBOLS_BEAKL_R3a___  KC_EXLM, ___SB_R3___,  KC_SLASH,    ___
-// ---------------------------
-#define ___6SYMBOLS_BEAKL_L1b___  ___, KC_OCGRV,  ___SB_L1___,  KC_OCQUOT
-#define ___6SYMBOLS_BEAKL_L2b___  ___6SYMBOLS_BEAKL_L2___
-#define ___6SYMBOLS_BEAKL_L3b___  ___, KC_AT,  ___SB_L3b___,  KC_SCLN
-
-#define ___6SYMBOLS_BEAKL_R1b___ ___6SYMBOLS_BEAKL_R1a___
-#define ___6SYMBOLS_BEAKL_R2b___  ___SB_R2b___,            KC_SCLN
-#define ___6SYMBOLS_BEAKL_R3b___  KC_PERC, ___SB_R3___,  KC_PIPE,    ___
-
-// ---------------------------
-// ---------------------------
-// Bepo
-#define ___6SYMBOLS_BEAKL_L1_BP___    ___,     ___,  ___SB_L1_BP___, ___
-#define ___6SYMBOLS_BEAKL_L2_BP___    BP_MINS, ___SB_L2_BP___
-#define ___6SYMBOLS_BEAKL_L3_BP___    ___,     ___,  ___SB_L3_BP___, ___
-
-#define ___6SYMBOLS_BEAKL_R1_BP___   ___,     ___SB_R1_BP___,  ___, ___
-#define ___6SYMBOLS_BEAKL_R2_BP___   ___SB_R2_BP___,                BP_SCLN
-#define ___6SYMBOLS_BEAKL_R3_BP___   ___,     ___SB_R3_BP___,  ___, ___
-// ---------------------------
-#define ___6SYMBOLS_BEAKL_L1a_BP___  ___, BP_GRV, ___SB_L1_BP___,  BP_AT
-#define ___6SYMBOLS_BEAKL_L2a_BP___  ___6SYMBOLS_BEAKL_L2_BP___
-#define ___6SYMBOLS_BEAKL_L3a_BP___  ___, BP_AT, ___SB_L3_BP___,  BP_SCLN
-
-#define ___6SYMBOLS_BEAKL_R1a_BP___  BP_QUES, ___SB_R1_BP___,  BP_MINS, ___
-#define ___6SYMBOLS_BEAKL_R2a_BP___  ___SB_R2a_BP___, BP_SCLN
-#define ___6SYMBOLS_BEAKL_R3a_BP___  BP_EXLM, ___SB_R3_BP___,  BP_SLSH, ___
-// ---------------------------
-#define ___6SYMBOLS_BEAKL_L1b_BP___  ___, BP_GRV,  ___SB_L1___,  BP_OCQUOT
-#define ___6SYMBOLS_BEAKL_L2b_BP___  ___6SYMBOLS_BEAKL_L2_BP___
-#define ___6SYMBOLS_BEAKL_L3b_BP___  ___, BP_AT,  ___SB_L3b_BP___,  BP_SCLN
-
-#define ___6SYMBOLS_BEAKL_R1b_BP___  ___, ___SB_R1_BP___,  BP_MINS, ___
-#define ___6SYMBOLS_BEAKL_R2b_BP___  ___SB_R2b_BP___,            BP_SCLN
-#define ___6SYMBOLS_BEAKL_R3b_BP___  BP_PERC, ___SB_R3_BP___,  BP_PIPE, ___
-// ---------------------------
-
-// Some 12 column rows.
-#define ___12_SYM_BKL_1_BP___ ___6SYMBOLS_BEAKL_L1_BP___,  ___6SYMBOLS_BEAKL_R1_BP___
-#define ___12_SYM_BKL_2_BP___ ___6SYMBOLS_BEAKL_L2_BP___,  ___6SYMBOLS_BEAKL_R2_BP___
-#define ___12_SYM_BKL_3_BP___ ___6SYMBOLS_BEAKL_L3_BP___,  ___6SYMBOLS_BEAKL_R3_BP___
-
-#define ___12_SYM_BKL_1___    ___6SYMBOLS_BEAKL_L1___,  ___6SYMBOLS_BEAKL_R1___
-#define ___12_SYM_BKL_2___    ___6SYMBOLS_BEAKL_L2___,  ___6SYMBOLS_BEAKL_R2___
-#define ___12_SYM_BKL_3___    ___6SYMBOLS_BEAKL_L3___,  ___6SYMBOLS_BEAKL_R3___
-
-// Some 12 column rows.
-#define ___12_SYM_BKL_A1_BP___ ___6SYMBOLS_BEAKL_L1a_BP___,  ___6SYMBOLS_BEAKL_R1a_BP___
-#define ___12_SYM_BKL_A2_BP___ ___6SYMBOLS_BEAKL_L2a_BP___,  ___6SYMBOLS_BEAKL_R2a_BP___
-#define ___12_SYM_BKL_A3_BP___ ___6SYMBOLS_BEAKL_L3a_BP___,  ___6SYMBOLS_BEAKL_R3a_BP___
-
-#define ___12_SYM_BKL_A1___ ___6SYMBOLS_BEAKL_L1a___,  ___6SYMBOLS_BEAKL_R1a___
-#define ___12_SYM_BKL_A2___ ___6SYMBOLS_BEAKL_L2a___,  ___6SYMBOLS_BEAKL_R2a___
-#define ___12_SYM_BKL_A3___ ___6SYMBOLS_BEAKL_L3a___,  ___6SYMBOLS_BEAKL_R3a___
-
-#define ___12_SYM_BKL_B1_BP___ ___6SYMBOLS_BEAKL_L1b_BP___, ___6SYMBOLS_BEAKL_R1b_BP___
-#define ___12_SYM_BKL_B2_BP___ ___6SYMBOLS_BEAKL_L2b_BP___, ___6SYMBOLS_BEAKL_R2b_BP___
-#define ___12_SYM_BKL_B3_BP___ ___6SYMBOLS_BEAKL_L3b_BP___, ___6SYMBOLS_BEAKL_R3b_BP___
-
-#define ___12_SYM_BKL_B1___ ___6SYMBOLS_BEAKL_L1b___, ___6SYMBOLS_BEAKL_R1b___
-#define ___12_SYM_BKL_B2___ ___6SYMBOLS_BEAKL_L2b___, ___6SYMBOLS_BEAKL_R2b___
-#define ___12_SYM_BKL_B3___ ___6SYMBOLS_BEAKL_L3b___, ___6SYMBOLS_BEAKL_R3b___
-
-/********************************************************************************/
-/* The BEAKL and BEAKL-A SYMBOL LAYER Chunks                                    */
-/********************************************************************************/
-// The Official beakl symbol layer as a chunk, Bepo and Qwerty
-#define ___SYMB_BEAKL_BP_3x12___ ___12_SYM_BKL_1_BP___, \
-    ___12_SYM_BKL_2_BP___,                              \
-    ___12_SYM_BKL_3_BP___
-
-#define ___SYMB_BEAKL_3x12___    ___12_SYM_BKL_1___,    \
-    ___12_SYM_BKL_2___,                                 \
-    ___12_SYM_BKL_3___
-
-// Alternate Beakle symbol layer with additional corner symbols.
-#define ___SYMB_BEAKLA_BP_3x12___ ___12_SYM_BKL_A1_BP___, \
-    ___12_SYM_BKL_A2_BP___,                               \
-    ___12_SYM_BKL_A3_BP___
-
-#define ___SYMB_BEAKLA_3x12___    ___12_SYM_BKL_A1___,  \
-    ___12_SYM_BKL_A2___,                                \
-    ___12_SYM_BKL_A3___
-
-#define ___SYMB_BEAKLB_BP_3x12___ ___12_SYM_BKL_B1_BP___,       \
-    ___12_SYM_BKL_B2_BP___,                                     \
-    ___12_SYM_BKL_B3_BP___
-
-#define ___SYMB_BEAKLB_3x12___    ___12_SYM_BKL_B1___,  \
-    ___12_SYM_BKL_B2___,                                \
-    ___12_SYM_BKL_B3___
-
-/********************************************************************************/
-/* NAVIGATION  - MOUSE, Scroll, Buttons, Arrows, Tab, Home, page up/down, End   */
-/* Navigation layers:                                                           */
-/*    3 row Layer                                                               */
-/*    4 Row Layer with repeated and swapped VI arrows, and Scroll wheel.        */
-/********************************************************************************/
-/*                                                                              */
-/* Navigation layer with optional 4th Row....                                   */
-/*                                                                              */
-/* M = Mouse                                                                    */
-/* B = Button                                                                   */
-/* W = Wheel                                                                    */
-/* AC   = Acceleration                                                          */
-/* CCCV = Tap -> Ctrl-C, hold for double tap duration -> Ctrl-V                 */
-/* CTCN = Tap -> Ctrl-T, hold for double tap duration -> Ctrl-N                 */
-/* CWCQ = Tap -> Ctrl-W, hold for double tap duration -> Ctrl-Q                 */
-/* TAB  = Tap -> Tab,    Double-tap -> Back Tab                                 */
-/* HOME = Tap -> Home,   Double-tap -> End                                      */
-/*                                                                              */
-/* MB5  MB4    MB3    MB2  MB1     MAC0  |  CTCN  MB1    MB2    MB3  MB4   MB5 */
-/* TAB  MLeft  MDown  MUp  MRight  MAC1  |  CCCV  Left   Down   UP   Right TAB */
-/*      WLeft  WDown  WUp  WRight  MAC2  |  CWCQ  HOME   PGDN   PGUP END       */
-/*                                                                              */
-/*      Left   Down   Up   Right   CCCV  |  CCCV   MLeft  MDown  MUp  MRight    */
-/*                                                                              */
-/********************************************************************************/
-
-#define ___MOUSE_LDUR___      KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R
-#define ___MWHEEL_LDUR___     KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R
-//  really BTN 1, 2, 3, 8, 9 - according to xev.
-#define ___MOUSE_BTNS_R___    KC_BTN1,  KC_BTN3,  KC_BTN2,  KC_BTN4,  KC_BTN5
-//  really BTN 9, 8, 3, 2, 1 - according to xev
-#define ___MOUSE_BTNS_L___    KC_BTN5,  KC_BTN4,  KC_BTN2,  KC_BTN3,  KC_BTN1
-#define ___MOUSE_ACCL_012___  KC_ACL0,  KC_ACL1,  KC_ACL2
-#define ___MACCL___ ___MOUSE_ACCL_012___
-
-
-#define ___VI_ARROWS___          KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-#define ___HOME_PGDN_PGUP_END___ KC_HOME, KC_PGDN, KC_PGUP, KC_END
-
-#define ___6NAV_L_1___ ___MOUSE_BTNS_L___,           KC_ACL0
-#define ___6NAV_L_2___ TAB_BKTAB, ___MOUSE_LDUR___,  KC_ACL1
-#define ___6NAV_L_3___ ___,       ___MWHEEL_LDUR___, KC_ACL2
-#define ___6NAV_L_4___ ___,       ___VI_ARROWS___,   KC_CCCV
-
-#define ___6NAV_R_1___ KC_CTCN, ___MOUSE_BTNS_R___
-#define ___6NAV_R_2___ KC_CCCV, ___VI_ARROWS___,          TAB_BKTAB
-#define ___6NAV_R_3___ KC_CWCQ, ___HOME_PGDN_PGUP_END___, ___
-#define ___6NAV_R_4___ KC_CCCV, ___MOUSE_LDUR___, ___
-
-  // compact. Initially for corne. So 3x12 per layer.
-#define ___12_NAV_1___ ___6NAV_L_1___, ___6NAV_R_1___
-#define ___12_NAV_2___ ___6NAV_L_2___, ___6NAV_R_2___
-#define ___12_NAV_3___ ___6NAV_L_3___, ___6NAV_R_3___
-
-#define ___12_NAV_4___ ___6NAV_L_4___, ___6NAV_R_4___
-
-/********************************************************************************/
-/* The Navigation LAYER Chunks                                                  */
-/********************************************************************************/
-// A Navigation Layer
-#define ___NAV_3x12___ ___12_NAV_1___, ___12_NAV_2___, ___12_NAV_3___
-#define ___NAV_4x12___ ___NAV_3x12___, ___12_NAV_4___
-
-
-/********************************************************************************/
-/* MEDIA  - Mute, Vol, play, pause, stop, next, prev, etc.   */
-/********************************************************************************/
-#define ___PRV_PLAY_NXT_STOP___ KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU
-
-#define ___MUTE_PRV_PLAY_NXT_STOP___  KC_MUTE,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-#define ___MUTE_PLAY_STOP___  KC_MUTE,  KC_MPLY,  KC_MSTP
-
-
-/********************************************************************************/
-/* RGB  - Control those lights.                                                 */
-
-/* ___, HUE SAT_INT MOD (UP),            | */
-/* ___, HUE SAT INT MOD (DOWN), RGB_TOG  | P_B_R_SW_SN___, ___ */
-/* ___6___,                              | ___, ___RGB_KXGT___, ___ */
-/********************************************************************************/
-// RGB FUNCTION Keysets
-// RGB row for the _FN layer from the redo of the default keymap.c
-#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD
-#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD
-#define ___RGB_MODE_PRV_NXT___   RGB_RMOD, RGB_MOD
-#define ___RGB_TOGGLE___         RGB_TOG
-#define ___RGB_P_B_R_SW_SN___    RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN
-#define ___RGB_KXGT___           RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T
-
-/// An RGB Layer
-#define ___12_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___, ___,     ___6___
-#define ___12_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___RGB_P_B_R_SW_SN___, ___
-#define ___12_RGB_3___ ___6___,                                ___, ___RGB_KXGT___, ___
-
-/********************************************************************************/
-/* The RGB LAYER Chunk                                                          */
-/********************************************************************************/
-#define ___RGB_3x12___ ___12_RGB_1___, ___12_RGB_2___, ___12_RGB_3___
-
-
-/********************************************************************************/
-/* ADJUST - Miscellaneous Melange.                                              */
-/********************************************************************************/
-// For an Adjust layer. Like RBB with audio, flash, etc.
-#define ___6_ADJUST_L1___ KC_MAKE,  ___RGB_HUE_SAT_INT_UP___,       RGB_TOG
-#define ___6_ADJUST_L2___ VRSN,     MU_TOG, CK_TOGG, AU_ON, AU_OFF, CG_NORM
-#define ___6_ADJUST_L3___ MG_NKRO,  ___RGB_HUE_SAT_INT_DN___,        KC_RGB_T
-
-#define ___6_ADJUST_R1___  ___5___,                          KC_RESET
-#define ___6_ADJUST_R2___  ___,     ___PRV_PLAY_NXT_STOP___, EEP_RST
-#define ___6_ADJUST_R3___  MG_NKRO, ___VDN_MUTE_VUP___, ___, RGB_IDL
-
-/********************************************************************************/
-/* The Adjust LAYER Chunks                                                      */
-/********************************************************************************/
-#define ___ADJUST_3x12___  ___6_ADJUST_L1___, ___6_ADJUST_R1___,    \
-                           ___6_ADJUST_L2___, ___6_ADJUST_R2___,       \
-                           ___6_ADJUST_L3___, ___6_ADJUST_R3___
-
-
-/********************************************************************************/
-/* LAYERS - Define a base layer, switch to any layer. Get around. Experiment.   */
-/*                                                                              */
-/* Base Layers on the left hand,                                                */
-/* transient layers on the right. Centered on the home region.                  */
-/* A good place to attach an experimental layer.                                */
-/*                                                                              */
-/********************************************************************************/
-//  Base Layers
-#define ___5_LAYERS_B1___ ___,        KC_BEPO,    KC_DVORAK_BP, KC_BEAKL_BP, ___
-#define ___5_LAYERS_B2___ KC_QWERTY,  KC_COLEMAK, KC_DVORAK,    KC_BEAKL, ___
-
-#define ___5_LAYERS_B3___ ___, KC_QWERTY,    KC_NORMAN,    KC_WORKMAN, ___
-#define ___5_LAYERS_B4___ ___, DF(_MALTRON), DF(_EUCALYN), DF(_CARPLAX), ___
-
-#define ___5_LAYERS_B1b___ DF(_NORMAN),  DF(_MALTRON), DF(_CARPLAX), DF(_COLEMAK), ___
-#define ___5_LAYERS_B2b___ DF(_EUCALYN), DF(_WORKMAN), DF(_QWERTY),  DF(_DVORAK), ___
-#define ___5_LAYERS_B3b___ ___,          DF(_BEAKL),   DF(_BEPO),    DF(_DVORAK_BP), ___
-
-// transient layers.
-#define ___5_LAYERS_T___     ___, MO(_NAV),  MO(_SYMB),     MO(_KEYPAD),       MO(_TOPROWS)
-#define ___5_LAYERS_T_BP___  ___, MO(_NAV),  MO(_SYMB_BP),  MO(_KEYPAD_BP),    MO(_TOPROWS_BP)
-#define ___5_LAYERS_T_CTL___ ___, MO(_RGB),  ___,                 ___, MO(_ADJUST)
-
-
-/// A Layers Layer
-#define ___12_LAYERS_1___ ___, ___5_LAYERS_B1___,  ___5_LAYERS_T_BP___,  ___
-#define ___12_LAYERS_2___ ___, ___5_LAYERS_B2___,  ___5_LAYERS_T___,     ___
-#define ___12_LAYERS_3___ KC_SPACETEST, ___5___,            ___5_LAYERS_T_CTL___, ___
-
-/********************************************************************************/
-/* The LAYERS LAYER Chunk                                                       */
-/********************************************************************************/
-#define ___LAYERS_3x12___ ___12_LAYERS_1___, ___12_LAYERS_2___, ___12_LAYERS_3___
diff --git a/users/ericgebhart/layers/edge_keys.h b/users/ericgebhart/layers/edge_keys.h
new file mode 100644
index 0000000000..0794b91a02
--- /dev/null
+++ b/users/ericgebhart/layers/edge_keys.h
@@ -0,0 +1,420 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/******************************************************************/
+/* This is where I put my Keyboard layouts, Everything on the     */
+/* edges, the functions on keys like LT() and SFT_T()             */
+/* can be applied here. The physical shape of the keyboard is     */
+/* also accounted for here. This makes it very simple to add a    */
+/* new keyboard and reuse all of my layouts and layers            */
+/*                                                                */
+/* The particular pieces we define here (as needed) are:          */
+/*     * Edge pinky keys, */
+/*     * Middle section keys */
+/*     * Bottom/5th row */
+/*     * Thumbkeys */
+/*     * Any functional additions to wrap the keys. ie. LT()      */
+/*                                                                */
+/* With all of that in hand, we then create a LAYOUT wrapper      */
+/* macro that takes a list of keys, to create a keyboard matrix   */
+/* that fits the keyboard. Simple.                                */
+/*                                                                */
+/* The thumb keys, the bottom rows, etc.                          */
+/*                                                                */
+/* An attempt has been made to adapt the kinesis and ergodox      */
+/* Thumb keys to the rectangular shapes of the xd75 and viterbi.  */
+/* which are 15x and 14x matrices respectively.                   */
+/* The Corne was a perfect fit                                    */
+/******************************************************************/
+
+/******************************************************************/
+/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
+/*       keys inbetween the usual left and right hand keys        */
+/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
+/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
+/*       thumbkeys. It is missing middle keys on (home) row 3.    */
+/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
+/*       extra middle keys                                        */
+/*                                                                */
+/******************************************************************/
+
+
+/******************************************************************/
+/*   In all cases these keyboards are defined in a matrix which is */
+/*   a set of rows. Maybe like so, or not.                         */
+/*                                                                 */
+/*   -------------------------|------------------------ */
+/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
+/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
+/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
+/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
+/*   | Row5L                  |                    Row5R | */
+/*   |               ThumbsL  | ThumbsR                  | */
+/*   -------------------------|------------------------ */
+
+/* Generally speaking, the keys on the right and left don't change. */
+/* Neither does the bottom row or the thumbs. Frequently the numbers */
+/* row is identical across layers. Mostly, we want our Base layers to */
+/* be predctable.                                                     */
+
+// Edge columns. N rows by 6 columns per side.
+// Outside pinky keys are 'yes'
+// Should be undef/def'd by the keyboard's keymap if no.
+//#define EDGE_COLS yes
+
+// BEPO or EN. Used in map.h
+//#define LANG_IS EN
+
+
+#define CONCATENATEE(a, ...) a ## __VA_ARGS__
+#define CATE(a, ...) CONCATENATEE(a, __VA_ARGS__)
+// EDGES
+// outside pinky keys row 0-3.
+// Qwerty and Bepo, - Applies
+// to foreign layouts on bepo. dvorak_bp, beakl_bp.
+// Use by Wrapping the root like so. LANG_N(LEFT0)
+// Add more languages by adding more definitions.
+#define EDGE_KEY(KNAME) CATE(LANG_N(KNAME), EDGE_KEY_SFX)
+#define LEFT_0 EDGE_KEY(LEFT0)
+#define LEFT_1 EDGE_KEY(LEFT1)
+#define LEFT_2 EDGE_KEY(LEFT2)
+#define LEFT_3 EDGE_KEY(LEFT3)
+#define RIGHT_0 EDGE_KEY(RIGHT0)
+#define RIGHT_1 EDGE_KEY(RIGHT1)
+#define RIGHT_2 EDGE_KEY(RIGHT2)
+#define RIGHT_3 EDGE_KEY(RIGHT3)
+
+
+#define EDGE_KEY_SFX CATE(CATE(EDGE_KEY_SET_IS, _), SFX)
+#define SML_SFX _sml
+#define NOKC_SFX _nokc
+#define NORM_SFX _norm
+#define TEST_SFX _test
+#define REF1_SFX _ref1
+#define REF2_SFX _ref2
+
+// Edge key sets
+// a mostly normalish set of edge keys.
+#define LEFT0_EN_norm KC_GRV
+#define LEFT1_EN_norm KC_GRV
+#define LEFT2_EN_norm KC_TAB
+#define LEFT3_EN_norm KC_BSLS
+
+#define RIGHT0_EN_norm KC_EQL
+#define RIGHT1_EN_norm KC_EQL
+#define RIGHT2_EN_norm KC_MINS
+#define RIGHT3_EN_norm KC_SLSH
+
+// smart lock edges mostly
+#define LEFT0_EN_sml SML_NAV
+#define LEFT1_EN_sml SML_NAV
+#define LEFT2_EN_sml KC_TAB
+#ifdef ACCENTS_MORTE_LAYER_ENABLE
+#define LEFT3_EN_sml TT(_ACCENTS_MORTE_EN)
+#else
+#define LEFT3_EN_sml ___
+#endif
+
+#define RIGHT0_EN_sml SML_KEYPAD
+#define RIGHT1_EN_sml SML_KEYPAD
+#define RIGHT2_EN_sml KC_MINS
+#define RIGHT3_EN_sml TT(_LAYERS)
+
+// empty no kc edges
+#define LEFT0_EN_nokc KC_NO
+#define LEFT1_EN_nokc KC_NO
+#define LEFT2_EN_nokc KC_NO
+#define LEFT3_EN_nokc KC_NO
+
+#define RIGHT0_EN_nokc KC_NO
+#define RIGHT1_EN_nokc KC_NO
+#define RIGHT2_EN_nokc KC_NO
+#define RIGHT3_EN_nokc KC_NO
+
+//test edge keys
+#define LEFT0_EN_test KC_NO
+#define LEFT1_EN_test KC_NO
+#define LEFT2_EN_test KC_NO
+#define LEFT3_EN_test KC_NO
+
+#define RIGHT0_EN_test KC_NO
+#define RIGHT1_EN_test KC_NO
+#define RIGHT2_EN_test KC_NO
+#define RIGHT3_EN_test KC_NO
+
+// bepo
+// mostly normal expected things
+#define LEFT0_BP_norm BP_GRV
+#define LEFT1_BP_norm BP_GRV
+#define LEFT2_BP_norm BP_TAB
+#define LEFT3_BP_norm BP_BSLS
+
+#define RIGHT0_BP_norm BP_EQL
+#define RIGHT1_BP_norm BP_EQL
+#define RIGHT2_BP_norm BP_DV_MINS
+#define RIGHT3_BP_norm BP_SLSH
+
+// smart locks mostly, tab, mins
+#define LEFT0_BP_sml SML_NAV
+#define LEFT1_BP_sml SML_NAV
+#define LEFT2_BP_sml KC_TAB
+#define LEFT3_BP_sml TT(_ACCENTS_MORTE_BP)
+
+#define RIGHT0_BP_sml SML_KEYPAD_BP
+#define RIGHT1_BP_sml SML_KEYPAD_BP
+#define RIGHT2_BP_sml BP_MINS
+#define RIGHT3_BP_sml TT(_LAYERS)
+
+// empty nokc edges
+#define LEFT0_BP_nokc KC_NO
+#define LEFT1_BP_nokc KC_NO
+#define LEFT2_BP_nokc KC_NO
+#define LEFT3_BP_nokc KC_NO
+
+#define RIGHT0_BP_nokc KC_NO
+#define RIGHT1_BP_nokc KC_NO
+#define RIGHT2_BP_nokc KC_NO
+#define RIGHT3_BP_nokc KC_NO
+
+// test edges
+#define LEFT0_BP_test KC_NO
+#define LEFT1_BP_test KC_NO
+#define LEFT2_BP_test KC_NO
+#define LEFT3_BP_test KC_NO
+
+#define RIGHT0_BP_test KC_NO
+#define RIGHT1_BP_test KC_NO
+#define RIGHT2_BP_test KC_NO
+#define RIGHT3_BP_test KC_NO
+
+
+// Edges for the combo reference layers.
+#define LEFT0_CB_ref1 L0_CB
+#define LEFT1_CB_ref1 L1_CB
+#define LEFT2_CB_ref1 L2_CB
+#define LEFT3_CB_ref1 L3_CB
+
+#define RIGHT0_CB_ref1 R0_CB
+#define RIGHT1_CB_ref1 R1_CB
+#define RIGHT2_CB_ref1 R2_CB
+#define RIGHT3_CB_ref1 R3_CB
+
+#define LEFT0_CB_ref2 L0_CB2
+#define LEFT1_CB_ref2 L1_CB2
+#define LEFT2_CB_ref2 L2_CB2
+#define LEFT3_CB_ref2 L3_CB2
+
+#define RIGHT0_CB_ref2 R0_CB2
+#define RIGHT1_CB_ref2 R1_CB2
+#define RIGHT2_CB_ref2 R2_CB2
+#define RIGHT3_CB_ref2 R3_CB2
+
+/******************************************************************/
+/* Middle Keysets for various keyboards                           */
+// MIDDLES
+/// Middle left and right keys.
+/******************************************************************/
+#define ___MIDDLE_LT___ OSL(_LAYERS)
+#define ___MIDDLE_L1___ LANG_KC(_CCCV)
+#define ___MIDDLE_L2___ TO(LN_SYMB)
+#define ___MIDDLE_L3___ TO(_NAV)
+
+#define ___MIDDLE_RT___ _X_
+#define ___MIDDLE_R1___ LANG_KC(_CCCV)
+#define ___MIDDLE_R2___ TO(LN_TOPROWS)
+#define ___MIDDLE_R3___ ___
+
+// 3 keys in the middle of a 15x matrix
+#define ___3_MIDDLE_T___ ___MIDDLE_LT___,    LCTL(LANG_KC(_A)), ___MIDDLE_RT___
+#define ___3_MIDDLE_1___ ___MIDDLE_L1___,    LCTL(LANG_KC(_X)), ___MIDDLE_R1___
+#define ___3_MIDDLE_2___ ___MIDDLE_L2___,    TO_RGB,            ___MIDDLE_R2___
+#define ___3_MIDDLE_3___ ___MIDDLE_L3___,    TO(LN_SYMB),       ___MIDDLE_R3___
+
+// 2 keys in the middle of a 14x matrix  - For viterbi and ergodox.
+#define ___2_MIDDLE_T___ ___MIDDLE_LT___,    ___MIDDLE_RT___
+#define ___2_MIDDLE_1___ ___MIDDLE_L1___,    ___MIDDLE_R1___
+#define ___2_MIDDLE_2___ ___MIDDLE_L2___,    ___MIDDLE_R2___
+#define ___2_MIDDLE_3___ ___MIDDLE_L3___,    ___MIDDLE_R3___
+
+// 2 keys in the middle of a 14x matrix  - For viterbi and ergodox.
+#define ___3_MIDDLE_T_EN___ ___3_MIDDLE_T___
+#define ___3_MIDDLE_1_EN___ ___3_MIDDLE_1___
+#define ___3_MIDDLE_2_EN___ ___3_MIDDLE_2___
+#define ___3_MIDDLE_3_EN___ ___3_MIDDLE_3___
+
+#define ___2_MIDDLE_T_EN___ ___2_MIDDLE_T___
+#define ___2_MIDDLE_1_EN___ ___2_MIDDLE_1___
+#define ___2_MIDDLE_2_EN___ ___2_MIDDLE_2___
+#define ___2_MIDDLE_3_EN___ ___2_MIDDLE_3___
+
+#define ___3_MIDDLE_T_BP___ ___3_MIDDLE_T___
+#define ___3_MIDDLE_1_BP___ ___3_MIDDLE_1___
+#define ___3_MIDDLE_2_BP___ ___3_MIDDLE_2___
+#define ___3_MIDDLE_3_BP___ ___3_MIDDLE_3___
+
+#define ___2_MIDDLE_T_BP___ ___2_MIDDLE_T___
+#define ___2_MIDDLE_1_BP___ ___2_MIDDLE_1___
+#define ___2_MIDDLE_2_BP___ ___2_MIDDLE_2___
+#define ___2_MIDDLE_3_BP___ ___2_MIDDLE_3___
+
+#define ___2_MIDDLE_T_CB___ CB_0M1, CB_0M2
+#define ___2_MIDDLE_1_CB___ CB_1M1, CB_1M2
+#define ___2_MIDDLE_2_CB___ CB_2M1, CB_2M2
+#define ___2_MIDDLE_3_CB___ CB_3M1, CB_3M2
+#define ___2_MIDDLE_4_CB___ CB_4M1, CB_4M2
+
+#define ___3_MIDDLE_T_CB___ CB_0M1, CB_0M2, CB_0M3
+#define ___3_MIDDLE_1_CB___ CB_1M1, CB_1M2, CB_1M3
+#define ___3_MIDDLE_2_CB___ CB_2M1, CB_2M2, CB_2M3
+#define ___3_MIDDLE_3_CB___ CB_3M1, CB_3M2, CB_3M3
+#define ___3_MIDDLE_4_CB___ CB_4M1, CB_4M2, CB_4M3
+
+#define ___4_MIDDLE_4_CB___ CB_4M1, CB_4M2, CB_4M3, CB_4M4
+#define ___5_MIDDLE_4_CB___ CB_4M1, CB_4M2, CB_4M3, CB_4M4, CB_4M5
+
+#define ___2_MIDDLE_T_CB2___ CB2_0M1, CB2_0M2
+#define ___2_MIDDLE_1_CB2___ CB2_1M1, CB2_1M2
+#define ___2_MIDDLE_2_CB2___ CB2_2M1, CB2_2M2
+#define ___2_MIDDLE_3_CB2___ CB2_3M1, CB2_3M2
+#define ___2_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2
+
+#define ___3_MIDDLE_T_CB2___ CB2_0M1, CB2_0M2, CB2_0M3
+#define ___3_MIDDLE_1_CB2___ CB2_1M1, CB2_1M2, CB2_1M3
+#define ___3_MIDDLE_2_CB2___ CB2_2M1, CB2_2M2, CB2_2M3
+#define ___3_MIDDLE_3_CB2___ CB2_3M1, CB2_3M2, CB2_3M3
+#define ___3_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2, CB2_4M3
+
+#define ___4_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2, CB2_4M3, CB2_4M4
+#define ___5_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2, CB2_4M3, CB2_4M4, CB2_4M5
+
+#define ___4_LEFT_4_CB___  CB_4L1, CB_4L2, CB_4L3, CB_4L4
+#define ___4_RIGHT_4_CB___ CB_4R1, CB_4R2, CB_4R3, CB_4R4
+
+#define ___4_LEFT_4_CB2___ CB2_4L1, CB2_4L2, CB2_4L3, CB2_4L4
+#define ___4_RIGHT_4_CB2___ CB2_4R1, CB2_4R2, CB2_4R3, CB2_4R4
+
+#define ___5_LEFT_4_CB___  CB_4L1, CB_4L2, CB_4L3, CB_4L4, CB_4L5
+#define ___5_RIGHT_4_CB___ CB_4R1, CB_4R2, CB_4R3, CB_4R4, CB_4R5
+
+#define ___5_LEFT_4_CB2___ CB2_4L1, CB2_4L2, CB2_4L3, CB2_4L4, CB2_4L5
+#define ___5_RIGHT_4_CB2___ CB2_4R1, CB2_4R2, CB2_4R3, CB2_4R4, CB2_4R5
+
+#define ___13_BOTTOM_CB___ ___5_LEFT_4_CB___,    \
+    ___3_MIDDLE_4_CB___,                         \
+    ___5_RIGHT_4_CB___
+
+#define ___12_BOTTOM_CB___ ___5_LEFT_4_CB___,    \
+    ___2_MIDDLE_4_CB___,                         \
+    ___5_RIGHT_4_CB___
+
+#define ___13_BOTTOM_CB2___ ___5_LEFT_4_CB2___,  \
+    ___3_MIDDLE_4_CB2___,                        \
+    ___5_RIGHT_4_CB2___
+
+#define ___12_BOTTOM_CB2___ ___5_LEFT_4_CB2___,  \
+    ___2_MIDDLE_4_CB2___,                 \
+    ___5_RIGHT_4_CB2___
+
+/* BOTTOMS, sorta like THUMBS                                       */
+/********************************************************************/
+// for xd75 or other layouts with a center column.
+// #define ___5_MIDDLE_THUMBS___ CTL_BSPC,    ALT_DEL,     XMONAD_ESC,  ALT_ENT,   CTL_SPC
+#define ___5_MIDDLE_THUMBS___ ALT_DEL, BSPC_TOPR, ESC_SYMB, ENT_NAV, SPC_TOPR
+
+  // for a last, 4th thumb row. for rebound.
+  // backtab, home end, ----, pgup, pgdn, tab ?
+#define ___13_BOTTOM___                                           \
+  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB, ESC_TOPR,      \
+    OSL(_LAYERS),                                               \
+    ENT_NAV, SPC_TOPR, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
+
+#define ___13_BOTTOM_EN___ ___13_BOTTOM___
+#define ___13_BOTTOM_BP___ ___13_BOTTOM___
+
+#define ___12_BOTTOM___                                         \
+  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB, ESC_TOPR,    \
+    ENT_NAV, SPC_TOPR, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
+
+#define ___12_BOTTOM_EN___ ___12_BOTTOM___
+#define ___12_BOTTOM_BP___ ___12_BOTTOM___
+
+// becomes the upper thumbs, the real 4th row if we throw away
+// the number row at the top.
+// this is the 4th row on the viterbi above the thumbrow if the number
+// row is not used for numbers.
+#define ___4_MIDDLE_4___    LSFT(KC_TAB),    HOME_END,    KC_PGDN, KC_TAB
+#define ___4_MIDDLE_4b___   TAB_BKTAB,       HOME_END,    KC_PGDN, KC_PGUP
+
+/********************************************************************/
+/*  The bottom row and thumbs as needed.                            */
+/********************************************************************/
+// Only the 14 and 15 wide bottom rows have bepo versions.
+// all others are handled through macros.
+
+#define ___5_BOTTOM_LEFT___  ___X2___,  KC_INS,  KC_LEFT, KC_RIGHT
+#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLASH, ___X2___
+
+#define ___5_BOTTOM_LEFT_EN___  ___5_BOTTOM_LEFT___
+#define ___5_BOTTOM_RIGHT_EN___  ___5_BOTTOM_RIGHT___
+
+#define ___4_BOTTOM_LEFT___  LCTL(KC_V),  KC_INS,  KC_LEFT,   KC_RIGHT
+#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLASH, LCTL(KC_C)
+
+#define ___4_BOTTOM_LEFT_EN___  ___4___ //___4_BOTTOM_LEFT___
+#define ___4_BOTTOM_RIGHT_EN___  ___4___ //___4_BOTTOM_RIGHT___
+
+// the bottom rows  for keyboards on bepo.
+// bepo on bepo - not enough space to go around....
+#define ___5_BOTTOM_LEFT_BP___  _X_,    BP_EACU,  _X_,           KC_LEFT, KC_RIGHT
+#define ___5_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN,  BP_BSLS,  BP_CCED,  BP_PERC
+
+#define ___4_BOTTOM_LEFT_BP___  LCTL(BP_C),  BP_EACU,  KC_LEFT, KC_RIGHT
+#define ___4_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN, BP_BSLS,  BP_CCED
+
+// for combo ref layers for kinesis, dactyl and kinesis.
+#define ___5_BOTTOM_LEFT_FR___  ___X3___,  KC_LEFT, KC_RIGHT
+#define ___5_BOTTOM_RIGHT_FR___ KC_UP,  KC_DOWN,  BP_BSLS, ___X2___
+
+#define ___4_BOTTOM_LEFT_CB___ ___4_LEFT_4_CB___
+#define ___4_BOTTOM_RIGHT_CB___ ___4_RIGHT_4_CB___
+
+#define ___4_BOTTOM_LEFT_CB2___ ___4_LEFT_4_CB2___
+#define ___4_BOTTOM_RIGHT_CB2___ ___4_RIGHT_4_CB2___
+
+#define ___5_BOTTOM_LEFT_CB___ ___5_LEFT_4_CB___
+#define ___5_BOTTOM_RIGHT_CB___ ___5_RIGHT_4_CB___
+
+#define ___5_BOTTOM_LEFT_CB2___ ___5_LEFT_4_CB2___
+#define ___5_BOTTOM_RIGHT_CB2___ ___5_RIGHT_4_CB2___
+
+// basically a 5th row in a 5x matrix. but maybe a 4th if there isnt a number row.
+// need an en, because we a have a BP and we used it directly in the layout.
+#define ___15_BOTTOM_EN___  ___5_BOTTOM_LEFT___,    ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT___
+#define ___15_BOTTOM_FR___  ___5_BOTTOM_LEFT_FR___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_FR___
+#define ___15_BOTTOM_BP___  ___5_BOTTOM_LEFT_BP___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_BP___
+#define ___15_BOTTOM_CB___  ___5_LEFT_4_CB___,    ___5_MIDDLE_4_CB___, ___5_RIGHT_4_CB___
+#define ___15_BOTTOM_CB2___  ___5_LEFT_4_CB2___,    ___5_MIDDLE_4_CB2___, ___5_RIGHT_4_CB2___
+
+// need an en, because we a have a BP and we used it directly in the layout.
+#define ___14_BOTTOM_EN___    ___5_BOTTOM_LEFT___,    ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT___
+#define ___14_BOTTOM_FR___ ___5_BOTTOM_LEFT_FR___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_FR___
+#define ___14_BOTTOM_BP___ ___5_BOTTOM_LEFT_BP___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_BP___
+#define ___14_BOTTOM_CB___ ___5_LEFT_4_CB___, ___4_MIDDLE_4_CB___, ___5_RIGHT_4_CB___
+#define ___14_BOTTOM_CB2___ ___5_LEFT_4_CB2___, ___4_MIDDLE_4_CB2___, ___5_RIGHT_4_CB2___
+
+#define ___14_THUMBS_BOTTOM___   ___X4___, ___6_ERGO_THUMBS___, ___X4___
diff --git a/users/ericgebhart/layers/keypads.h b/users/ericgebhart/layers/keypads.h
new file mode 100644
index 0000000000..ab4100594d
--- /dev/null
+++ b/users/ericgebhart/layers/keypads.h
@@ -0,0 +1,236 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**********************************************_**********************************/
+/*  KEYPADS.  Mostly all in Bepo and Qwerty versions                            */
+/*      4 row Pads:                                                             */
+/*         * The BEAKL 15,19 Number pad, for the left hand.                     */
+/*         * The BEAKL Wi hex pad, Number pad.                                  */
+/*         * Regular Number pad, for the right hand.                            */
+/*         * 12 Function pad.                                                   */
+/*      3 row pads:                                                             */
+/*         keypad                                                               */
+/*         function pad - 3x4, 12 function keys.                                */
+/*                                                                              */
+/*  LAYERS:                                                                     */
+/*      4 Row:                                                                  */
+/*         * BEAKL with a compact FuncPad on the right.                         */
+/*         * Funcpad on the left, keypad on the right.                          */
+/*      3 Row:                                                                  */
+/*         * Funcpad on the left, keypad on the right.                          */
+/*         * BEAKL with a compact FuncPad on the right.                         */
+/*                                                                              */
+/********************************************************************************/
+
+// BEAKL 15 (numpad layer):
+/*    +=*   ^%~ */
+/*   ↹523:      */
+/* - 7.104      */
+/*   /698,      */
+
+/* BEAKL27 (numpad layer): */
+/*   ↹+/\*=  yxz */
+/*    -523: ~FED */
+/*    7.104 {CBA} */
+/*    ,698⏎  []% */
+
+// Keypads
+#define ___KEYPAD_BEAKL_L1___  ___,    _PLUS,  _SLSH,  _ASTR, _EQL
+#define ___KEYPAD_BEAKL_L2___  _MINS,  _5,     _2,     _3,   _COLN
+#define ___KEYPAD_BEAKL_L3___  _7,     _DOT,   _1,     _0,   _4
+#define ___KEYPAD_BEAKL_L4___  _COMM,  _6,     _9,     _8,   _COMM
+
+#define ___6KEYPAD_BEAKL_L1___     ___, KEYPAD_BEAKL_L1
+#define ___6KEYPAD_BEAKL_L2___     ___, KEYPAD_BEAKL_L2
+#define ___6KEYPAD_BEAKL_L3___ KC_MINS, KEYPAD_BEAKL_L3
+#define ___6KEYPAD_BEAKL_L4___     ___, KEYPAD_BEAKL_L4
+
+// if there's room. the top row on the right.
+#define ___KEYPAD_BEAKL_R1___     ___, KC_CIRC,  KC_PERC,  KC_TILD, ___
+
+
+
+/// parts is parts.
+
+#define ___KP_BKL_WI_L1___ _X_,    HEX_A,  HEX_B,  HEX_C,   _X_
+#define ___KP_BKL_WI_L2___ _X_,    HEX_D,  HEX_E,  HEX_F,   _X_
+#define ___KP_BKL_WI_L3___ _X_,    L_BRKT, R_BRKT, DELIM,   _X_
+
+#define ___KP_BKL_WI_R1___ _SLSH, _4, _5, _9, _ASTR
+#define ___KP_BKL_WI_R2___ _DOT , _1, _2, _3, _MINS
+#define ___KP_BKL_WI_R3___ _COMM, _8, _6, _7, _PLUS
+
+#define ___KEYPAD_1___ ___,  _7,  _8,    _9,     _PSLS
+#define ___KEYPAD_2___ _DOT, _4,  _5,    _6,     _PAST
+#define ___KEYPAD_3___ _0,   _1,  _2,    _3,     _PMNS
+
+#define ___KEYPAD_miryoku_1___ _LBRC, _7,  _8,  _9,  _RBRC, ____5_
+#define ___KEYPAD_miryoku_2___ _SCLN, _4,  _5,  _6,  _EQUAL, ____5_
+#define ___KEYPAD_miryoku_3___ _GRV,  _1,  _2,  _3,  _BSLS, ____5_
+
+// 4 Row keypads
+#define ___5KEYPAD_1___ _X_, ___KEYPAD_1___
+#define ___5KEYPAD_2___ _X_, ___KEYPAD_2___
+#define ___5KEYPAD_3___ _X_, ___KEYPAD_3___
+#define ___5KEYPAD_4___ _X_, _0,  _DOT,  _PEQL,  _PPLS
+
+// Function pad.  Same idea as above, but for function keys.
+
+// Funcpads are a bit weird. THey are KC values, so for
+// this to work, there are BP_ versions of the F keys.
+// I don't really use this, so maybe it'll go away in favor
+// of something more useful.
+// 4x3 and 3x4 funcpads.
+// Only 4 columns, so the fifth can be added to either end.
+#define ___4_FUNCPAD_1___   _F9, _F10, _F11, _F12
+#define ___4_FUNCPAD_2___   _F5, _F6,  _F7,  _F8
+#define ___4_FUNCPAD_3___   _F1, _F2,  _F3,  _F4
+
+#define ___FUNCPAD_miryoku_1___   KC_F12, KC_F7, KC_F8, KC_F9, KC_PRINT_SCREEN
+#define ___FUNCPAD_miryoku_2___   KC_F11, KC_F4, KC_F5, KC_F6, KC_SCROLL_LOCK
+#define ___FUNCPAD_miryoku_3___   KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUSE
+
+// For the left or right side.
+#define ___5x4_FUNCPAD_T___   _TRNS, _F10,  _F11,  _F12, _TRNS
+#define ___5x4_FUNCPAD_1___   _TRNS, _F7,   _F8,   _F9,  _TRNS
+#define ___5x4_FUNCPAD_2___   _TRNS, _F4,   _F5,   _F6,  _TRNS
+#define ___5x4_FUNCPAD_3___   _TRNS, _F1,   _F2,   _F3,  _TRNS
+
+
+/********************************************************************************/
+/* FUNCPAD and Keypad Layer chunks                                              */
+/********************************************************************************/
+// beakl wi is a hexpad numpad.
+/* Beakle Wi, Hexpad and keypad - needs a zero somewhere.*/
+#define CARTE_KP_BKL_WI                         \
+  carte_de_map( "  ABC  /459* ",                \
+                "  DEF  .123- ",                \
+                "  {}|  ,867+ ")
+
+#define ___KP_BKL_WI_3x10___                                    \
+  CHUNK_LANG_MAP(___KP_BKL_WI_L1___, ___KP_BKL_WI_R1___,        \
+                 ___KP_BKL_WI_L2___, ___KP_BKL_WI_R2___,        \
+                 ___KP_BKL_WI_L3___, ___KP_BKL_WI_R3___)
+
+
+// BEAKL 15 and a f1-f12 funcpad
+#define CARTE_KP_BKL_FUNC                       \
+  carte_de_map("    523:  F9-12",               \
+               "  -7.104  F5-8",                \
+               "   /798,  F1-4")
+
+#define ___KP_BKL_FUNC_3x10___                                          \
+  CHUNK_LANG_MAP(___KEYPAD_BEAKL_L2___, _TRNS, ___4_FUNCPAD_1___,       \
+                 ___KEYPAD_BEAKL_L3___, _TRNS, ___4_FUNCPAD_2___,       \
+                 ___KEYPAD_BEAKL_L4___, _TRNS, ___4_FUNCPAD_3___)
+
+// BEAKL 15 and mods.
+#define CARTE_KP_BKL_MODS                          \
+  carte_de_map("    523:  SL Mods",                \
+               "  -7.104  OS Mods",                \
+               "   /798,   Enter")
+
+
+#define ___KP_BKL_MODS_3x10___                                          \
+  CHUNK_LANG_MAP(___KEYPAD_BEAKL_L2___, _TRNS, ___SML_MODS_R___,        \
+                 ___KEYPAD_BEAKL_L3___, ___OS_MODS_R___,                \
+                 ___KEYPAD_BEAKL_L4___, _TRNS, _ENT, _ENT, _ENT, _TRNS)
+
+// 4 rows, BEAKL 15 and a f1-f12 funcpad
+#define ___KP_BKL_FUNC_4x10___                                  \
+  CHUNK_LANG_ROW(___KEYPAD_BEAKL_L1___, ___KEYPAD_BEAKL_R1___), \
+    CHUNK_LANG_MAP(___KP_BKL_FUNC_3x10___)
+
+// 4 rows, funcpad, regular keypad on right.
+#define ___FP_KP_4x10___                                        \
+  CHUNK_LANG_ROW(___5x4_FUNCPAD_T___,  ___5KEYPAD_1___),        \
+    CHUNK_LANG_MAP(___5x4_FUNCPAD_1___,  ___5KEYPAD_2___,       \
+                   ___5x4_FUNCPAD_2___,  ___5KEYPAD_3___,       \
+                   ___5x4_FUNCPAD_3___,  ___5KEYPAD_4___)
+
+#define CARTE_FP_KP                             \
+  carte_de_map("  F9-12   789+",                \
+               "  F5-8   .456*",                \
+               "  F1-4   0123-")
+
+// funcpad, regular keypad on right.
+#define ___FP_KP_3x10___                                        \
+  CHUNK_LANG_MAP(___4_FUNCPAD_1___, ___, ___5KEYPAD_1___,       \
+                 ___4_FUNCPAD_2___, ___,  ___5KEYPAD_2___,      \
+                 ___4_FUNCPAD_3___, ___,  ___5KEYPAD_3___)
+
+#define CARTE_KP_FP                             \
+  carte_de_map("   789+  F9-12",                \
+               "  .456*  F5-8",                 \
+               "  0123-  F1-4")
+// regular keypad on left.
+#define ___KP_FP_3x10___                                        \
+  CHUNK_LANG_MAP(___5KEYPAD_1___,  ___, ___4_FUNCPAD_1___,      \
+                 ___5KEYPAD_2___,  ___, ___4_FUNCPAD_2___,      \
+                 ___5KEYPAD_3___,  ___, ___4_FUNCPAD_3___)
+
+#define CARTE_MODS_KP                           \
+  carte_de_map("  SMods   789+",                \
+               "  OSMods .456*",                \
+               "  F1-4   0123-")
+
+// funcpad, regular keypad on right.
+#define ___MODS_KP_3x10___                                    \
+  CHUNK_LANG_MAP(___SML_MODS_L___, ___, ___5KEYPAD_1___,        \
+                 ___OS_MODS_L___,       ___5KEYPAD_2___,     \
+                 ___5___,               ___5KEYPAD_3___)
+
+#define CARTE_KP_MODS                           \
+  carte_de_map("   789+  SMods",                \
+               "  .456*  OSMods",                 \
+               "  0123-  ")
+
+// regular keypad on left.
+#define ___KP_MODS_3x10___                                      \
+  CHUNK_LANG_MAP(___5KEYPAD_1___,  ___, ___SML_MODS_R___,       \
+                 ___5KEYPAD_2___,  ___OS_MODS_L___,        \
+                 ___5KEYPAD_3___,  ___, ___4___)
+
+#define CARTE_FUN                           \
+  carte_de_map("  F9-F12  SMods",                \
+               "  F5-F8   OSMods",               \
+               "  F1-F4   ")
+
+#define ___FUN_3x10___                                                  \
+  CHUNK_LANG_MAP(___4_FUNCPAD_1___, ___,  ___, ___SML_MODS_R___,        \
+                 ___4_FUNCPAD_2___, ___,  ___OS_MODS_R___,              \
+                 ___4_FUNCPAD_3___, ___,  ___5___)
+
+#define CARTE_FUN_MIRYOKU                       \
+  carte_de_map("F12 F7-F9 prt  SMods",          \
+               "F11 F4-F6 scr  OSMods",         \
+               "F10 F1-F3 pse  ")
+
+#define ___FP_MIRYOKU_3x10___                           \
+  ___FUNCPAD_miryoku_1___,  ___, ___SML_MODS_R___,     \
+    ___FUNCPAD_miryoku_2___,  ___OS_MODS_R___,         \
+    ___FUNCPAD_miryoku_3___,  ___5___
+
+// wants . and 0 on left thumb.
+#define CARTE_KP_MIRYOKU      \
+  carte_de_map(" [789]",      \
+               " ;456=",      \
+               " `123\\")
+
+#define ___KP_MIRYOKU_3x10___                                     \
+  CHUNK_LANG_MAP(___KEYPAD_miryoku_1___,                          \
+                 ___KEYPAD_miryoku_2___,                             \
+                 ___KEYPAD_miryoku_3___)
diff --git a/users/ericgebhart/layers/layers.h b/users/ericgebhart/layers/layers.h
new file mode 100755
index 0000000000..0f09d0cfc3
--- /dev/null
+++ b/users/ericgebhart/layers/layers.h
@@ -0,0 +1,112 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "keycodes.h"
+/*********************************************************************/
+/* Non-Base Layer Definitions.                                       */
+/*                                                                   */
+/* Keypads, sympads, funcpads, symbols, RGB, Layers, Controls, etc.  */
+/* Qwerty and Bepo versions exist as needed.                         */
+/*                                                                   */
+/* This file defines every auxillary layer I use on every keyboard   */
+/* Ergodox, keebio/viterbi, xd75, rebound, crkbd, morpho, dactyl,..  */
+/*********************************************************************/
+/********************************************************************************/
+/* The following Transient/Non-Base Layers are provided within.                 */
+/* Each layer is named with the size of Keymatrix it has entries for.           */
+/* 3x10 are usual for these.  I had 3x12's but I didn't need the edges really.  */
+/* It was an attempt to accommodate Bepo which is 13 columns wide.              */
+/* Even in a 3x12 Bepo is wonky. So I gave up on it. I also gave up on 4 row    */
+/* layers, I really want my keys in that 3x5 space. Everything on the edges can */
+/* stay as it is.  Splitting is managed in the macros as                        */
+/* needed. BP indicates the Bepo equivalent to the Qwerty layer when needed.    */
+/********************************************************************************/
+/*                                                                              */
+/* Explore below to see what they all are.                                      */
+/* Naming gives the sizes of things, a prefix number is the length.             */
+/* BP is the bepo version of things.                                            */
+/* BKL is the beakl 15 version of a layout or chunk.                            */
+/* C on the end of a name means its a compact version of something.             */
+/* Compact meaning for use on a 3 row layout.                                   */
+/*                                                                              */
+/* TOPROWS - numbers, symbols, functions, all on one layer.                     */
+/* ___TOPROWS_3x10___                                                           */
+/* ___TOPROWS_BP_3x10___                                                        */
+/*                                                                              */
+/* KEYPADS/FUNCPADS.                                                            */
+/* ___KP_C_3x10___                                                              */
+/* ___KP_C_BP_3x10___                                                           */
+/* ___KP_C_BKL_FUNC_3x10___  -- BEAKL key/func pads.                            */
+/* ___KP_C_BKL_FUNC_BP_3x10___                                                  */
+/*                                                                              */
+/* SYMBOLS   -Beakl or Beakl extended                                           */
+/* ___SYMB_BEAKL_3x10___                                                        */
+/* ___SYMB_BEAKL_BP_3x10___                                                     */
+/*                                                                              */
+/* Beakl extended symbol layer with additional corner symbols.                  */
+/* For use with non-beakl base layers.                                          */
+/* ___SYMB_BEAKLA_3x10___                                                       */
+/* ___SYMB_BEAKLA_BP_3x10___                                                    */
+/* For use with vi bindings optimized                                           */
+/* ___SYMB_BEAKLB_3x10___                                                       */
+/* ___SYMB_BEAKLB_BP_3x10___                                                    */
+/*                                                                              */
+/* NAVIGATION                                                                   */
+/* ___NAV_3x10___                                                               */
+/*                                                                              */
+/* CONTROLS                                                                     */
+/* ___RGB_3x10___                                                               */
+/* ___ADJUST_3x10___                                                            */
+ /* ___LAYERS_3x10___                                                            */
+ /********************************************************************************/
+ /*********************************************************************/
+ /* XXXXXX Layer chunk  -- These are the final layers.                */
+ /*                                                                   */
+/* Each section defines the necessary pieces to create a layer.      */
+/* It builds them up into consistently shaped lists for the layout   */
+/* wrapper.                                                          */
+/*                                                                   */
+/* Each Section ends with a _Layer Chunk_. This is so the            */
+/* layer can be easily given to the Layout Wrapper macros which      */
+/* takes a list of keys in lengths of 2x3x5, 2x3x6, 2x4x5, or 2x4x6. */
+/*                                                                   */
+/* All of my keyboard definitions use these same chunks with similar */
+/* macros. The differences between keyboards are all managed in the  */
+/* macro. Here we just have nice rectangular sets of keys to         */
+/* complete a layout.                                                */
+/*********************************************************************/
+
+// these are needed so that groups of defined keys will unravel
+// into their values. The Base layers don't need them becuse the
+// keys are explicit in their passing. Here, chunks are made for
+// convenience and reuse. They don't unravel unless we wrap these
+// in var args.
+#define CHUNK_LANG_MAP(...) LANG_MAP(__VA_ARGS__)
+#define CHUNK_LANG_ROW(...) LANG_ROW(__VA_ARGS__)
+
+// 5 wide, with the two shot control.
+#define ___OS_MODS_L___   OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, TS_LCTL
+#define ___OS_MODS_R___   TS_RCTL, OS_RSFT, OS_RCTL, OS_RALT, OS_RGUI
+// 4 wide.
+#define ___SML_MODS_L___  SMLM_LGUI, SMLM_LALT, SMLM_LCTL, SMLM_LSFT
+#define ___SML_MODS_R___  SMLM_RSFT, SMLM_RCTL, SMLM_RALT, SMLM_RGUI
+
+#include "keypads.h"
+#include "nav.h"
+#include "symbols.h"
+#include "toprows.h"
+#include "utility.h"
diff --git a/users/ericgebhart/layers/nav.h b/users/ericgebhart/layers/nav.h
new file mode 100644
index 0000000000..97243872e2
--- /dev/null
+++ b/users/ericgebhart/layers/nav.h
@@ -0,0 +1,199 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/********************************************************************************/
+/* NAVIGATION  - MOUSE, Scroll, Buttons, Arrows, Tab, Home, page up/down, End   */
+/* Navigation layers:                                                           */
+/*    3 row Layer                                                               */
+/*    4 Row Layer with repeated and swapped VI arrows, and Scroll wheel.        */
+/********************************************************************************/
+/*                                                                              */
+/* Navigation layer with optional 4th Row....                                   */
+/*                                                                              */
+/* M = Mouse                                                                    */
+/* B = Button                                                                   */
+/* W = Wheel                                                                    */
+/* AC   = Acceleration                                                          */
+/* CCCV = Tap -> Ctrl-C, hold for double tap duration -> Ctrl-V                 */
+/* CTCN = Tap -> Ctrl-T, hold for double tap duration -> Ctrl-N                 */
+/* CWCQ = Tap -> Ctrl-W, hold for double tap duration -> Ctrl-Q                 */
+/* HOME = TAB & PGDN                                                            */
+/* END =  BKTAB & PGUP -- See combos.                                           */
+/*                                                                              */
+/* MB5  MB4    MB3    MB2  MB1     MAC0  |  CTCN  MB1    MB2    MB3  MB4   MB5 */
+/* TAB  MLeft  MDown  MUp  MRight  MAC1  |  CCCV  Left   Down   UP   Right TAB */
+/*      WLeft  WDown  WUp  WRight  MAC2  |  CWCQ  TAB    PGDN   PGUP BKTAB       */
+/*                                                                              */
+/*      Left   Down   Up   Right   CCCV  |  CCCV   MLeft  MDown  MUp  MRight    */
+/*                                                                              */
+/********************************************************************************/
+
+#ifdef MOUSEKEY_ENABLE
+#define ___MOUSE_LDUR___      KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R
+#define ___MWHEEL_LDUR___     KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R
+//  really BTN 1, 2, 3, 8, 9 - according to xev.
+#define ___MOUSE_BTNS_R___    KC_BTN1,  KC_BTN3,  KC_BTN2,  KC_BTN4,  KC_BTN5
+#define ___4MOUSE_BTNS_R___   KC_BTN1,  KC_BTN3,  KC_BTN2,  KC_BTN4
+#define ___3MOUSE_BTNS_R___   KC_BTN1,  KC_BTN3,  KC_BTN2
+//  really BTN 9, 8, 3, 2, 1 - according to xev
+#define ___4MOUSE_BTNS_L___   KC_BTN4,  KC_BTN2,  KC_BTN3,  KC_BTN1
+#define ___MOUSE_BTNS_L___    KC_BTN5,  KC_BTN4,  KC_BTN2,  KC_BTN3,  KC_BTN1
+#define ___MOUSE_ACCL_012___  KC_ACL0,  KC_ACL1,  KC_ACL2
+#define ___MACCL___ ___MOUSE_ACCL_012___
+#endif
+
+#define ___VI_ARROWS___           KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
+#define ___HOME_PGDN_PGUP_END___  KC_HOME,  KC_PGDN, KC_PGUP, KC_END
+#define ___TAB_PGDN_PGUP_BKTAB___ KC_TAB,  KC_PGDN, KC_PGUP, KC_BKTAB
+// home and end are combos.  tab/pgdn = home, bktab/pgup = end.
+
+#define ___REDO_CUT_COPY_PASTE_UNDO___ S_REDO, S_CUT, S_COPY, S_PASTE, S_UNDO
+
+#ifdef MOUSEKEY_ENABLE
+#define ___NAV_La_1___ ___SML_MODS_L___, KC_ACL0
+#define ___NAV_L_1___ ___4MOUSE_BTNS_L___, KC_ACL0
+#define ___NAV_L_2___ ___MOUSE_LDUR___,  KC_ACL1
+#define ___NAV_L_3___ ___MWHEEL_LDUR___, KC_ACL2
+#define ___NAV_L_4___ ___VI_ARROWS___,   KC_CCCV
+
+#define ___NAV_R_1___  KC_CTCN, ___4MOUSE_BTNS_R___
+#define ___NAV_R_4___  KC_CCCV, ___MOUSE_LDUR___
+
+#else
+
+#define ___NAV_La_1___ ___NAV_L_1___
+#define ___NAV_L_1___  ___OS_MODS_L___
+#define ___NAV_L_2___  ___SML_MODS_L___, ___
+#define ___NAV_L_3___  ___5___
+#define ___NAV_L_4___  ___VI_ARROWS___,   KC_CCCV
+
+#define ___NAV_R_1___  KC_CTCN, ___SML_MODS_R___
+#define ___NAV_R_4___  KC_CCCV, ___4___
+
+#endif // end mousekey
+
+#define ___NAV_R_2___  KC_CCCV, ___VI_ARROWS___
+#define ___NAV_R_3___  KC_CWCQ, ___HOME_PGDN_PGUP_END___
+#define ___NAV_Ra_3___ KC_CWCQ, ___TAB_PGDN_PGUP_BKTAB___
+
+#ifdef MOUSEKEY_ENABLE
+
+#define ___6NAV_L_1___ ___MOUSE_BTNS_L___,           KC_ACL0
+#define ___6NAV_L_2___ TAB_BKTAB, ___MOUSE_LDUR___,  KC_ACL1
+#define ___6NAV_L_3___ ___,       ___MWHEEL_LDUR___, KC_ACL2
+#define ___6NAV_L_4___ ___,       ___VI_ARROWS___,   KC_CCCV
+
+#define ___6NAV_R_1___ KC_CTCN, ___MOUSE_BTNS_R___
+#define ___6NAV_R_4___ KC_CCCV, ___MOUSE_LDUR___, ___
+
+#else
+
+#define ___6NAV_L_1___ ___6___
+#define ___6NAV_L_2___ TAB_BKTAB, ___SML_MODS_L___, ___
+
+#define ___6NAV_L_3___ ___,       ___5___
+#define ___6NAV_L_4___ ___,       ___VI_ARROWS___,   KC_CCCV
+
+#define ___6NAV_R_1___ KC_CTCN, ___SML_MODS_R___
+#define ___6NAV_R_4___ KC_CCCV, ___4___, ___
+
+#endif // end mousekey
+
+#define ___6NAV_R_2___ KC_CCCV, ___VI_ARROWS___,          TAB_BKTAB
+#define ___6NAV_R_3___ KC_CWCQ, ___HOME_PGDN_PGUP_END___, ___
+
+// compact. 3x10 per layer.
+#define ___10_NAV_1a___ ___NAV_La_1___, ___NAV_R_1___
+#define ___10_NAV_1___ ___NAV_L_1___, ___NAV_R_1___
+#define ___10_NAV_2___ ___NAV_L_2___, ___NAV_R_2___
+#define ___10_NAV_3___ ___NAV_L_3___, ___NAV_Ra_3___
+
+// designed without mouse, mods on left.
+#define ___NAVnm_La_1___ ___NAV_L_1___
+#define ___NAVnm_L_1___  ___SML_MODS_L___
+#define ___NAVnm_L_2___  ___OS_MODS_L___, ___
+#ifdef MOUSEKEY_ENABLE
+#define ___NAVnm_L_3___  ___2___, SML_NAVm, ___2___  // get to mouse layer if enabled.
+#else
+#define ___NAVnm_L_3___  ___5___
+#endif
+
+#define ___10_NAVnm_1___ ___SML_MODS_L___, ___, ___NAV_R_1___
+#define ___10_NAVnm_2___ ___OS_MODS_L___, ___NAV_R_2___
+#define ___10_NAVnm_3___ ___NAVnm_L_3___, ___NAV_R_3___
+
+#ifdef MOUSEKEY_ENABLE
+// Mouse layer only. mods on right.
+#define ___10_NAVm_1___ ___NAV_L_1___, ___NAV_R_1___
+#define ___10_NAVm_2___ ___NAV_L_2___, ___NAV_R_2___
+#define ___10_NAVm_3___ ___NAV_L_3___, ___NAV_R_3___
+#endif
+
+/********************************************************************************/
+/* The Navigation LAYER Chunks                                                  */
+/********************************************************************************/
+// A Navigation Layer
+#define CARTE_NAV                               \
+  carte_de_map("54321 0  ctn 12345",            \
+               " ldur 1  ccv ldur",             \
+               " ldur 2  cwq tdubt")
+
+#define CARTE_NAVA                              \
+  carte_de_map(" gacs 0  ctn 12345",             \
+               " ldur 1  ccv ldur",              \
+               " ldur 2  cwq tdubt")
+
+#define CARTE_NAVnm                             \
+  carte_de_map(" gacsc2 ctn cscag ",            \
+               " gacs   ccv ldur",              \
+               " __M_   cwq tdubt")
+
+// currently the same as NAVA
+#define CARTE_NAVm                                 \
+  carte_de_map(" gacs 0  ctn 12345",               \
+               " ldur 1  ccv ldur",                \
+               " ldur 2  cwq tdubt")
+
+#define CARTE_NAV_miryoku                       \
+  carte_de_map("  rdo  ccp undo",               \
+               "  Caps ldur",                   \
+               "  Ins  HDUE")
+
+#define CARTE_NAVm_miryoku                      \
+  carte_de_map("  rdo ccp undo",               \
+               "      ldur",                   \
+               "      ldur")
+
+
+#ifdef MOUSEKEY_ENABLE
+#define ___NAVm_3x10___ ___10_NAVm_1___, ___10_NAVm_2___, ___10_NAVm_3___
+#endif
+
+#define ___NAVnm_3x10___ ___10_NAVnm_1___, ___10_NAVnm_2___, ___10_NAVnm_3___
+#define ___NAVA_3x10___ ___10_NAV_1a___, ___10_NAV_2___, ___10_NAV_3___
+#define ___NAV_3x10___ ___10_NAV_1___, ___10_NAV_2___, ___10_NAV_3___
+#define ___NAV_3x12___ ___12_NAV_1___, ___12_NAV_2___, ___12_NAV_3___
+#define ___NAV_miryoku___ \
+  ___5___, ___redo_cut_copy_paste_undo___,                              \
+    ___5___, KC_CAPS, ___VI_ARROWS___,                                  \
+    ___5___, KC_INSERT, ___HOME_PGDN_PGUP_END___
+
+#ifdef MOUSEKEY_ENABLE
+#define ___NAVm_miryoku___                                              \
+  ___5___, ___redo_cut_copy_paste_undo___,                              \
+    ___5___, ___, ___MOUSE_LDUR___,                                     \
+    ___5___, ___, ___MWHEEL_LDUR___,
+#endif
diff --git a/users/ericgebhart/layers/symbols.h b/users/ericgebhart/layers/symbols.h
new file mode 100644
index 0000000000..272bd9b850
--- /dev/null
+++ b/users/ericgebhart/layers/symbols.h
@@ -0,0 +1,225 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/******************************************************************/
+/*                                                                */
+/* Symbol layers:                                                 */
+/*                                                                */
+/* The BEAKL15 Symbol layer with or without additions.            */
+/*                                                                */
+/* There is the offical beakl symbol layer, an extended symbol    */
+/* layer which is expanded with: !?@`'/-;.                        */
+/*                                                                */
+/* Placing these 8 keys in the pinky and index corners            */
+/* at the edges of the, 3x3, BEAKL home Region.                   */
+/*                                                                */
+/* Beakl has these keys in it's base layer which isn't the case   */
+/* for other layouts like dvorak, colemak, etc.                   */
+/*                                                                */
+/* The third layer moves /:? to more accessible places.           */
+/* to make vi keybindings more accessible.                        */
+/*                                                                */
+/* Note that there are 2 widths. 12 and 10. The wider layer adds  */
+/* - and ; to the middle row edges.                               */
+/*                                                                */
+/* Official:                                                      */
+/*         <$>   [_]                                              */
+/*      - \(")# %{=}| ;                                           */
+/*         :*+   &^~                                              */
+/*                                                                */
+/*   not yet implemented                                          */
+/* BEAKL27 (punctuation layer):                                   */
+/*   ↹@$#↹  ~^`                                                  */
+/*   ↹<=>   [_]                                                   */
+/*   \(-)+ %{;}!                                                  */
+/*    *:/⏎  |~&                                                   */
+/*                                                                */
+/*                                                                */
+/* BEAKL Extended symbol layer                                    */
+/* Expanded with: !?@`'/-;                                        */
+/*                                                                */
+/* A:                                                             */
+/*        `<$>' ?[_]-                                             */
+/*      - \(")# %{=}| ;                                           */
+/*        @:*+; !&^~/                                             */
+/*                                                                */
+/* Optimized for Vi.                                              */
+/* B:                                                             */
+/*                                                                */
+/*        `<$>' ?[_]-                                             */
+/*      - \(")# !{:}/ ;                                           */
+/*        @=*+; %&^~|                                             */
+/*                                                                */
+/* C:                                                             */
+/*                                                                */
+/*        `<$>' ?[_-]                                             */
+/*      - \("#) !{:/} ;                                           */
+/*        @=*+; %&^~|                                             */
+/*                                                                */
+/*                                                                */
+/* Both ; and ' could have found their dvorak positions. Analysis showed */
+/* that only caused pinky overuse. Rotating the symbols around Put better */
+/* keys on the index finger which showed a huge improvement in efficiency. */
+/* The same is true of the exclamation point.                     */
+/*                                                                */
+
+/* Beakl Wi */
+
+/* This Symbol layer does not improve on the above extended symbol */
+/* layers in my opinon, for my usage. */
+
+/* The original symbol was the Left side with defined/but/transparent */
+/* right. The regex layer was the opposite. I combined them into one, I am */
+/* not sure of the functionality that might be lost due to that, but they */
+/* are defined as original sans extra tap dance functions. It would be easy to */
+/* make two layers with transparent right and left. There is duplication */
+/* of | and *. */
+
+/* Symbols on the left */
+/* .*&+ */
+/* ?!/| */
+/* <>%@ */
+
+// regex on the right
+/* *[^] */
+/* ?($) */
+/* |{#} */
+
+// Altogether
+/* .*&+  *[^] */
+/* ?!/|  ?($) */
+/* <>%@  |{#} */
+/******************************************************************/
+
+// Left
+#define ___SB_L1___          _OCLTGT, _DLR,    _GT
+#define ___SB_L2___  _BSLS,  _OCPRN,  _OCDQUO, _RPRN, _HASH
+#define ___SB_L2c___ _BSLS,  _OCPRN,  _OCDQUO, _HASH, _RPRN
+#define ___SB_L3___          _COLN,   _ASTR,   _PLUS
+
+// Right
+#define ___SB_R1___          _OCBRC,   _UNDS,     _RBRC
+#define ___SB_R1c___         _OCBRC,   _UNDS,     _MINS
+#define ___SB_R2___  _PERC,  _OCCBR,   _EQL,      _RCBR,  _PIPE
+#define ___SB_R3___          _AMPR,    _CIRC_ND,  _TILD_ND
+
+// a and b... left and right.
+#define ___SB_L3b___          _EQL,    _ASTR,   _PLUS
+
+#define ___SB_R2a___ _PERC,  _OCCBR,   _EXLM,  _RCBR,  _PIPE
+#define ___SB_R2b___ _EXLM,  _OCCBR,   _COLN,  _RCBR,  _SLSH
+#define ___SB_R2c___ _EXLM,  _OCCBR,   _COLN,  _SLSH,  _RCBR
+
+// ---------------------------
+// ---------------------------
+#define CARTE_SYMB_BEAKL                        \
+  carte_de_map("  <$>   [_]   ",                \
+               "-\\(\")# %{=}|;",               \
+               "  :*+   &^~   ")
+
+#define ___SYMB_BEAKL_3x10___                                           \
+  CHUNK_LANG_MAP(_TRNS,   ___SB_L1___, _TRNS,    _TRNS,  ___SB_R1___, _TRNS, \
+                 ___SB_L2___,                    ___SB_R2___,           \
+                 _TRNS,   ___SB_L3___, _TRNS,    _TRNS, ___SB_R3___, _TRNS)
+
+// ---------------------------
+// A: Extended.
+#define CARTE_SYMB_BEAKLA                       \
+  carte_de_map("   `<$>'  ?[_]-",               \
+               "  -\\(\")#  %{:}|;",            \
+               "   @=*+;  !&^~/")
+
+#define ___SYMB_BEAKLA_3x10___                                          \
+  CHUNK_LANG_MAP(_OCGRV, ___SB_L1___, _OCQUOT,   _QUES,  ___SB_R1___, _MINS, \
+                 ___SB_L2___,                    ___SB_R2a___,          \
+                 _AT,    ___SB_L3___, _SCLN,     _EXLM, ___SB_R3___, _SLSH)
+
+// ---------------------------
+// B: Extended & Vi
+#define CARTE_SYMB_BEAKLB                       \
+  carte_de_map("   `<$>'  ?[_]-",               \
+               "  -\\(\")#  !{:}/;",            \
+               "   @=*+;  %&^~|")
+
+#define ___SYMB_BEAKLB_3x10___                                          \
+  CHUNK_LANG_MAP(_OCGRV, ___SB_L1___,  _OCQUOT,   _QUES,  ___SB_R1___, _MINS, \
+                 ___SB_L2___,                     ___SB_R2b___,         \
+                 _AT,    ___SB_L3b___, _SCLN,     _PERC, ___SB_R3___, _PIPE)
+
+// ---------------------------
+// C: Extended & Vi, move closing braces to pinky, seldom used.
+// because of tap hold - open_openclose feature.
+// Also emacs which mostly closes them.
+#define CARTE_SYMB_BEAKLC                       \
+  carte_de_map("   `<$>'  ?[_-]",               \
+               "  -\\(\"#)  !{:/};",            \
+               "   @=*+;  %&^~|")
+
+#define ___SYMB_BEAKLC_3x10___                                          \
+  CHUNK_LANG_MAP(_OCGRV, ___SB_L1___,  _OCQUOT,   _QUES,  ___SB_R1c___, _RBRC, \
+                 ___SB_L2c___,                     ___SB_R2c___,        \
+                 _AT,    ___SB_L3b___, _SCLN,     _PERC, ___SB_R3___, _PIPE)
+
+// wants ( and ) on the left thumb.
+#define CARTE_SYMB_MIRYOKU                                  \
+  carte_de_map("  {&.(} ",                                  \
+               "  :$%^+ ",                                  \
+               "  ~!@#| ")
+
+#define ___SYMB_MIRYOKU_3x10___                         \
+  CHUNK_LANG_MAP(_OCCBR,   _AMPR, _DOT,  _OCPRN,   _RCBR, ____5_,     \
+                 _COLN,    _DLR,  _PERC, _CIRC_ND, _PLUS, ____5_,     \
+                 _TILD_ND, _EXLM, _AT,   _HASH,    _PIPE, ____5_)
+
+// ---------------------------
+// WI: the Beakl Wi definition.
+#define ___SYMB_BKL_WI_L1___ ___,   _DOT,  _ASTR, _AMPR, _PLUS
+#define ___SYMB_BKL_WI_L2___ ___,   _QUES, _EXLM, _SLSH, _PIPE
+#define ___SYMB_BKL_WI_L3___ ___,   _LT,   _GT,   _PERC, _AT
+
+#define ___SYMB_BKL_WI_R1___ _ASTR, _OCBRC, _CIRC_ND, _RBRC, ___
+#define ___SYMB_BKL_WI_R2___ _QUES, _OCPRN, _DLR ,    _RPRN, ___
+#define ___SYMB_BKL_WI_R3___ _PIPE, _OCCBR, _HASH,    _RCBR, ___
+
+#define CARTE_SYMB_BEAKLWI                      \
+  carte_de_map(" .*&+  *[^] ",                  \
+               " ?!/|  ?($) ",                  \
+               " <>%@  |{#} ")
+
+#define ___SYMB_BEAKL_WI_3x10___                                \
+  CHUNK_LANG_MAP(___SYMB_BKL_WI_L1___, ___SYMB_BKL_WI_R1___,    \
+                 ___SYMB_BKL_WI_L2___, ___SYMB_BKL_WI_R2___,    \
+                 ___SYMB_BKL_WI_L3___, ___SYMB_BKL_WI_R3___)
+
+// ---------------------------
+// Neo symbol layer
+#define ___SYMB_NEO_L1___ ___,  _OCDQUOT, _UNDS,  _OCLBRC, _RBRC, _CIRC_ND
+#define ___SYMB_NEO_L2___ ___,  _SLSH,  _MINS,  _OCLCBR, _RCBR, _ASTR
+#define ___SYMB_NEO_L3___ ___,  _HASH,  _DLR,   _PIPE, _TILD_ND, _OCGRV
+
+#define ___SYMB_NEO_R1___ _EXLM, _LT,    _GT,    _EQL,  _AMPR
+#define ___SYMB_NEO_R2___ _QUES, _OCPRN, _RPRN , _QUOT, _COLN
+#define ___SYMB_NEO_R3___ _PLUS, _PERC,  _BSLS,  _AT,   ___
+
+#define CARTE_SYMB_NEO                          \
+  carte_de_map("\"_[]^  !<>=&",                 \
+               "/-{}*  ?()':",                  \
+               "#$|~`  +%\@")
+
+#define ___SYMB_NEO_3x10___                                     \
+  CHUNK_LANG_MAP(___SYMB_NEO_L1___, ___SYMB_NEO_R1___,          \
+                 ___SYMB_NEO_L2___, ___SYMB_NEO_R2___,          \
+                 ___SYMB_NEO_L3___, ___SYMB_NEO_R3___)
diff --git a/users/ericgebhart/layers/thumbs.h b/users/ericgebhart/layers/thumbs.h
new file mode 100644
index 0000000000..a78b3a9532
--- /dev/null
+++ b/users/ericgebhart/layers/thumbs.h
@@ -0,0 +1,276 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Split thumbs.
+
+// Split these down the middle to think in left and right hand.
+// Top row on kinesis, ergodox, etc.
+#define ___THUMBS_1___                                  \
+  ___X___  , MO_ADJUST,   MO_LAYERS, OSL(LN_TOPROWS)
+
+// Middle row on kinesis, ergodox, etc.
+#define ___THUMBS_2___   HOME_END,   KC_PGUP
+
+#define ___4_THUMBS_1___  ___X___, KC_HOME, KC_PGUP, OSL(LN_TOPROWS)
+#define ___6_THUMBS_2___  KC_LSFT,    KC_BKTAB, KC_END,  KC_PGDN, KC_TAB, KC_RSFT
+#define ___6_THUMBS_2_CB___  KC_LSFT,    KC_BKTAB, KC_END,  KC_PGDN, KC_TAB, KC_RSFT
+
+#define ___6_THUMBS_2a___ BSPC_SYMB, ESC_TOPR, ESC_TOPR, ENT_NAV, ENT_NAV, SPC_TOPR
+#define ___6_THUMBS_2a_CB___ BSPC_SYMB, ESC_TOPR, ESC_TOPR, ENT_NAV, ENT_NAV, SPC_TOPR
+
+
+// This has become the default center group of thumbs for all
+// So here's the beakl wi thumbs adapted to this combined layer system.
+//
+#define ___6_ERGO_THUMBS_WI___                                  \
+  ESC_TOPR, I_SYMB, TAB_NUM,  ENT_NAV, SPC_SYMB, BSPC_NAV
+
+// Like my other thumb rows. With an I.
+#define ___6_ERGO_THUMBS_WIa___                                 \
+  BSPC_NAV, I_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, TAB_NUM
+
+#define ___6_ERGO_THUMBS_layers___                              \
+  SML_NAV, BSPC_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, ACCCENTS_RALT
+
+#define ___6_ERGO_THUMBS_COMBO___ CB_TH1, CB_TH2, CB_TH3, CB_TH4, CB_TH5, CB_TH6
+#define ___6_ERGO_THUMBS_COMBO2___ CB2_TH1, CB2_TH2, CB2_TH3, CB2_TH4, CB2_TH5, CB2_TH6
+
+// Transparent.
+#define ___6_ERGO_THUMBS_trns___ ___6___
+
+// A place to test stuff.
+#define ___6_ERGO_THUMBS_tst___                                 \
+  TT_KEYPAD, BSPC_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, KC_XM_PORD
+
+#define ___6_ERGO_THUMBS_mods___                                \
+  ALT_DEL, CTL_BSPC, GUI_ESC,  ALT_ENT, CTL_SPC, XC_XM_PORD
+
+#define ___6_ERGO_THUMBS_mod_layers___                          \
+  ALT_DEL, BSPC_SYMB, GUI_ESC,  CTL_ENT, SPC_TOPR, ACCENTS_RALT
+
+#define ___6_ERGO_THUMBS_mod_layers_nav___                      \
+  ALT_DEL, BSPC_SYMB, GUI_ESC,  ENT_NAV, SPC_TOPR, ACCENTS_RALT
+
+// for keymaps that need a letter on the thumb.
+#define ___6_ERGO_THUMBS_left_letter___                                 \
+  BSPC_ALT, TH_LTR_SYM, GUI_ESC,  ENT_NAV, SPC_TOPR, KC_TAB
+
+// an attempt at an approximation of the HD thumbs as they are on the site.
+// really should be expected to be a starting point that doesnt strand you.
+#define ___6_ERGO_THUMBS_hd___                                  \
+  BSPC_ALT, TH_LTR_SYM, GUI_ESC, ENT_NAV, SPC_TOPR, ACCENTS_CTL
+#define ___6_ERGO_THUMBS_hd_a___                                        \
+  OS_LSHIFT, TH_LTR_SYM, GUI_ESC, BSPC_ALT, SPC_TOPR, ACCENTS_CTL
+#define ___6_ERGO_THUMBS_hd_simple___                   \
+  MO_SYMB, THUMB_LETTER, KC_ENT, KC_BSPC, KC_SPC, MO_TOPROWS
+/* HD dash has thumbs of ,; and .:        */
+#define ___6_ERGO_THUMBS_hd_dash___                                     \
+  LANG_KC(TL_COMM), TL_DOT_SYMB, GUI_ESC, ENT_NAV, SPC_TOPR, BSPC_NUM
+
+#define ___6_ERGO_THUMBS_media___ ___3___, ___STOP_PLAY_MUTE___
+#define ___6_ERGO_THUMBS_mouse___ ___3___, ___3MOUSE_BTNS_R___
+#define ___6_ERGO_THUMBS_keypad___ \
+  LANG_KC(_DOT), LANG_KC(_0), LANG_KC(_MINS), ___3___
+#define ___6_ERGO_THUMBS_symb___                                \
+  LANG_KC(_OCPRN), LANG_KC(_RPRN), LANG_KC(_UNDS), ___3___
+
+// miryoku thumbs, either its toprows or keypad for numbers.
+#define ___6_ERGO_THUMBS_miryoku_tr___                          \
+  ESC_MEDIA, SPACE_NAV, TAB_NAVM,  ENT_SYM, BSPC_TOPR, DEL_FUN
+#define ___6_ERGO_THUMBS_miryoku___                             \
+  ESC_MEDIA, SPACE_NAV, TAB_NAVM,  ENT_SYM, BSPC_NUM, DEL_FUN
+// lose the tab key, put a letter where space was.
+// move space to the right side, put backspace where tab was.
+#define ___6_ERGO_THUMBS_miryoku_ltr___                         \
+  ESC_MEDIA, TH_LTR_NAV, BSPC_NAVm,  ENT_SYM, SPC_NUM, DEL_FUN
+#define ___6_ERGO_THUMBS_miryoku_tr_ltr___                      \
+  ESC_MEDIA, TH_LTR_NAV, BSPC_NAVm,  ENT_SYM, SPC_TOPR, DEL_FUN
+
+#define ___6_ERGO_THUMBS_miryoku_ltr_tab___                      \
+  BSPC_MEDIA, TH_LTR_NAV, TAB_NAVM,    ENT_SYM, SPC_NUM, DEL_FUN
+
+#define ___6_ERGO_THUMBS_miryoku_tr_ltr_tab___                   \
+  BSPC_MEDIA, TH_LTR_NAV, TAB_NAVM,    ENT_SYM, SPC_TOPR, DEL_FUN
+
+// Give the right symbol suffix by the value of THUMBS_ARE
+// Basically we choose the right cluster here, so the layout
+// level doesn't know or care.
+//
+// ___foo  --> ___foo_WI___, or ___foo_WIa___, or ___foo_def___.
+// THUMBS_ARE = WI, or WIa, or DEFAULT, TEST, TRNS, MOD_LAYERS, etc.
+// the value of THUMB_LETTER is the key used when needed.
+#define THUMB_EXT CAT(THUMBS_ARE, _EXT)
+#define WI_EXT _WI___
+#define WIa_EXT _WIa___
+#define DEFAULT_EXT _mod_layers_nav___  //change this to change the default.
+#define TEST_EXT _tst___
+#define TRNS_EXT _trns___
+#define MODS_EXT _mods___
+#define LAYERS_EXT _layers___
+#define MODS_LAYERS_EXT _mod_layers___
+#define MODS_LAYERS_NAV_EXT _mod_layers_nav___
+#define MIRYOKU_EXT _miryoku___
+#define MIRYOKU_TR_EXT _miryoku_tr___
+#define MIRYOKU_LTR_EXT _miryoku_ltr___  // miryoku versions with a letter
+#define MIRYOKU_LTR_TAB_EXT _miryoku_ltr_tab___
+#define MIRYOKU_TR_LTR_EXT _miryoku_tr_ltr___
+#define MIRYOKU_TR_LTR_TAB_EXT _miryoku_tr_ltr_tab___
+#define TH_LTR_EXT _left_letter___ // takes a letter for the left thumb.
+#define HD_DASH_EXT _hd_dash___
+#define HD_EXT _hd___  // takes a letter for the left thumb.
+#define HDA_EXT _hd_a___  // relocate backspace
+#define HD_SIMPLE_EXT _hd_simple___  // no LTs or MT´s.
+// for the function layers
+#define COMBO_EXT _COMBO___
+#define COMBO2_EXT _COMBO2___
+#define MEDIA_THUMBS_EXT _media___
+#define MOUSE_THUMBS_EXT _mouse___
+#define KEYPAD_THUMBS_EXT _keypad___
+#define SYMB_THUMBS_EXT _symb___
+
+#define ___6_ERGO_THUMBS___ CAT2(___6_ERGO_THUMBS, THUMB_EXT)
+// for the kyria, mostly for the combo reference layers.
+#define ___10_ERGO_THUMBS___ CATR(___10_ERGO_THUMBS, EXP_THUMB_EXT)
+#define ___4_THUMBS___ CAT2(___4_THUMBS, EXP_THUMB_EXT)
+
+/* #define ___6_ERGO_THUMBS___ ___6_ERGO_THUMBS_def___ */
+
+/* #define ___ERGODOX_THUMB_LEFT___                \ */
+/*   OSL(SYMB), OSM(KC_LGUI),                      \ */
+/*     HOME_END,                                   \ */
+/*     CTL_BSPC, ALT_DEL, XMONAD_ESC */
+
+/* #define ___ERGODOX_THUMB_RIGHT___               \ */
+/*   XXX, OSL(KEYPAD),                             \ */
+/*     KC_PGUP,                                    \ */
+/*     KC_PGDN, ALT_ENT, CTL_SPC */
+
+// Translation of LT thumb keys from beakl wi where function layers
+// have separate left and right to here, where I'm defining left and right in
+// one layer and using it that way. I don't feel that having both halves
+// on one layer hurts, if I invoke a layer, I'm not trying to use a non
+// layer part of the keyboard. I don't have an edit layer, might be a good idea.
+// have most of it on the Navigation layer.
+// use the keycodes on that original layer, so It's not defined here.
+// The wi keypad has a hexpad instead of a funcpad. All the other keypads
+// have a funcpad on the opposite side.
+
+// translation of the original wi layers to those here.
+// BSPC_NAV
+// SPC_SYMB
+// TAB_NUM
+// ESC_func ->  ESC_TOPR
+// I_regex   -> I_SYMB
+// ENT_edit  -> ENT_NAV
+
+/* // consolidated for kinesis, ergodox, and dactyl */
+/* //for the ergodox and kinesis. */
+/* #define ___12_DOX_ALL_THUMBS___                 \ */
+/*   ___4___,                                      \ */
+/*     ___2___,                                    \ */
+/*     ___6___ */
+
+#define ___12_DOX_ALL_THUMBS___ ___12___
+
+/* ___THUMBS_1___,                             \ */
+/* ___xTHUMBS_2___,                            \ */
+/* ___6_ERGO_THUMBS___ */
+
+#define ___12_DOX_ALL_THUMBS_EN___ ___12_DOX_ALL_THUMBS___
+#define ___12_DOX_ALL_THUMBS_BP___ ___12_DOX_ALL_THUMBS___
+
+#define ___16_ALL_THUMBS___                     \
+  ___4_THUMBS_1___,                             \
+    ___6_THUMBS_2___,                           \
+    ___6_ERGO_THUMBS___
+
+#define ___16_ALL_THUMBS_EN___ ___16_ALL_THUMBS___
+#define ___16_ALL_THUMBS_BP___ ___16_ALL_THUMBS___
+#define ___16_ALL_THUMBSa___                    \
+  ___4_THUMBS_1___,                             \
+    ___6_THUMBS_2a___,                          \
+    ___6_ERGO_THUMBS___
+
+#define ___16_ALL_THUMBSa_EN___ ___16_ALL_THUMBSa___
+#define ___16_ALL_THUMBSa_BP___ ___16_ALL_THUMBSa___
+
+
+// For the Kyria
+#define ___4_THUMBS_def___       OS_LALT, OS_LCTL, SML_NAV, OS_LSFT
+#define ___10_ERGO_THUMBS_def___ _X_, _X_, ___6_ERGO_THUMBS___, _X_, _X_
+
+#define ___4_THUMBS_EN___ ___4_THUMBS_def___
+#define ___4_THUMBS_BP___ ___4_THUMBS_def___
+#define ___10_ERGO_THUMBS_EN___ ___10_ERGO_THUMBS_def___
+#define ___10_ERGO_THUMBS_BP___ ___10_ERGO_THUMBS_def___
+
+// combo reference layer thumbs for the kyria.
+// for the kyria, note the odd numbering...a 0 row, and a,b,c,d for the extras
+// on either side of the central 6 thumbs.
+#define ___2_THUMBS_CB___       CB_1TH1,   CB_1TH2
+#define ___4_THUMBS_CB___       CB_0TH1,   CB_0TH2, CB_0TH3, CB_0TH4
+#define ___6_THUMBS_CB___       CB_1TH1,   CB_1TH2, CB_1TH3, CB_1TH4, CB_1TH5, CB_1TH6
+#define ___10_ERGO_THUMBS_CB___ CB_THA,    CB_THB,      \
+    ___6_ERGO_THUMBS___, CB_THC, CB_THD
+#define ___12_ERGO_THUMBS_CB___ ___2_THUMBS_CB___,              \
+    CB_THA,    CB_THB,  ___6_ERGO_THUMBS___, CB_THC, CB_THD
+#define ___12_DOX_ALL_THUMBS_CB___ ___4_THUMBS_CB___, ___2_THUMBS_CB___, ___6_ERGO_THUMBS___
+#define ___16_DOX_ALL_THUMBS_CB___ ___4_THUMBS_CB___, ___6_THUMBS_2_CB___, ___6_ERGO_THUMBS___
+#define ___16_DOX_ALL_THUMBSa_CB___ ___4_THUMBS_CB___, ___6_THUMBS_2a_CB___, ___6_ERGO_THUMBS___
+
+
+#define ___2_THUMBS_CB2___       CB2_1TH1, CB2_1TH2
+#define ___4_THUMBS_CB2___       CB2_0TH1, CB2_0TH2, CB2_0TH3, CB2_0TH4
+#define ___6_THUMBS_CB2___       CB2_1TH1, CB2_1TH2, CB2_1TH3, CB2_1TH4, CB2_1TH5, CB2_1TH6
+#define ___10_ERGO_THUMBS_CB2___ CB2_THA,  CB2_THB,     \
+    ___6_ERGO_THUMBS___, CB2_THC, CB2_THD
+#define ___12_ERGO_THUMBS_CB2___ ___2_THUMBS_CB2___,      \
+    CB2_THA,  CB2_THB, ___6_ERGO_THUMBS___, CB2_THC, CB2_THD
+#define ___12_DOX_ALL_THUMBS_CB2___ ___4_THUMBS_CB2___, ___2_THUMBS_CB2___, ___6_ERGO_THUMBS___
+#define ___16_DOX_ALL_THUMBS_CB2___ ___4_THUMBS_CB2___, ___6_THUMBS_2_CB2___, ___6_ERGO_THUMBS___
+#define ___16_DOX_ALL_THUMBSa_CB2___ ___4_THUMBS_CB2___, ___6_THUMBS_2a_CB2___, ___6_ERGO_THUMBS___
+
+// Basically give the same 4 top thumbs and bottom outer 4 thumbs for everyone.
+// Could be different for every one, but the core 6 is enough for now I think.
+// Everyone is the same except the combo reference layers.
+// Let 6 ERGO_THUMBS do it´s thing inside.
+#define EXP_THUMB_EXT CAT(THUMBS_ARE, _EXP_EXT)
+#define WI_EXP_EXT _def___
+#define WIa_EXP_EXT _def___
+#define DEFAULT_EXP_EXT _def___
+#define TEST_EXP_EXT _def___
+#define TRNS_EXP_EXT _def___
+#define MODS_EXP_EXT _def___
+#define LAYERS_EXP_EXT _def___
+#define MODS_LAYERS_EXP_EXT _def___
+#define MODS_LAYERS_NAV_EXP_EXT _def___
+#define MIRYOKU_EXP_EXT _def___
+#define MIRYOKU_TR_EXP_EXT _def___
+#define MIRYOKU_LTR_EXP_EXT _def___
+#define MIRYOKU_TR_LTR_EXP_EXT _def___
+#define TH_LTR_EXP_EXT _def___
+#define HD_DASH_EXP_EXT _def___
+#define HD_EXP_EXT _def___
+#define HDA_EXP_EXT _def___
+#define HD_SIMPLE_EXP_EXT _def___
+// for the function layers
+#define COMBO_EXP_EXT _COMBO___
+#define COMBO2_EXT _COMBO2___
+#define MEDIA_THUMBS_EXP_EXT _def___
+#define MOUSE_THUMBS_EXP_EXT _def___
+#define KEYPAD_THUMBS_EXP_EXT _def___
+#define SYMB_THUMBS_EXP_EXT _def___
diff --git a/users/ericgebhart/layers/toprows.h b/users/ericgebhart/layers/toprows.h
new file mode 100644
index 0000000000..351df442ed
--- /dev/null
+++ b/users/ericgebhart/layers/toprows.h
@@ -0,0 +1,80 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "keycodes.h"
+/*******************************************************************/
+/* A Top Rows layer.  Pick your parts.  Bepo and Qwerty            */
+/*                                                                 */
+/* This is, to me, a stop gap layer. If I need symbols, numbers or */
+/* function keys these rows are nicely predictable to most people. */
+/* I currently use the beakl number row with regular symbols.      */
+/* I never use function keys for anything.                         */
+/*******************************************************************/
+// Kinesis function key row. I don't use them. but might as well define them.
+#define ___KINTFUNC_L___ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8
+// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET
+#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, RESET
+
+// A TOPROWS Layer.
+// set it how you like it, if you like it.
+
+
+//#define ___MODS_ROW___ ___OS_MODS_L___, ___, ___SML_MODS_R___
+#define ___MODS_ROW___ ___SML_MODS_L___, ___, ___OS_MODS_R___
+/********************************************************************************/
+/* TOPROWS Layer chunk                                                          */
+/********************************************************************************/
+// These rows have already been langed, at their creation.
+// altogether in a chunk.
+#define CARTE_TOPROWS                           \
+  carte_de_map("   !@#$%  ^&*()",               \
+               "   40123  76598",               \
+               " F1-    --    -F12")
+
+#define ___TOPROWS_3x10___                      \
+  ___10_SYMBOLS___,                             \
+    ___10_NUMBERS_BEAKL15___,                   \
+    ___10_FUNCS___
+
+#define CARTE_TOPROWS_MOD                       \
+  carte_de_map("   !@#$%  ^&*()",               \
+               "   40123  76598",               \
+               "  SLMods  OSMods")
+
+#define ___TOPROWS_MOD_3x10___                  \
+  ___10_SYMBOLS___,                             \
+    ___10_NUMBERS_BEAKL15___,                   \
+    ___MODS_ROW___
+
+#define CARTE_TOPROWS_BKL19                     \
+  carte_de_map("   !@#$%  ^&*()",               \
+               "   32104  76598",               \
+               " F1-    --    -F12")
+
+#define ___TOPROWS_BKL19_3x10___                \
+  ___10_SYMBOLS___,                             \
+    ___10_NUMBERS_BEAKL19___,                   \
+    ___10_FUNCS___
+
+#define CARTE_RAISE                             \
+  carte_de_map("   !@#$%  ^&*()",               \
+               "   12345  67890",               \
+               " F1-    --    -F12")
+
+#define ___RAISE_3x10___                        \
+  ___10_SYMBOLS___,                             \
+    ___10_NUMBERS___,                           \
+    ___10_FUNCS___
diff --git a/users/ericgebhart/layers/utility.h b/users/ericgebhart/layers/utility.h
new file mode 100644
index 0000000000..a688f8196d
--- /dev/null
+++ b/users/ericgebhart/layers/utility.h
@@ -0,0 +1,125 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/********************************************************************************/
+/* MEDIA  - Mute, Vol, play, pause, stop, next, prev, etc.   */
+/********************************************************************************/
+#define ___PRV_PLAY_NXT_STOP___ KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
+#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU
+
+#define ___PRV_VDN_VUP_NXT___ KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
+#define ___STOP_PLAY_MUTE___ KC_MSTP, KC_MPLY, KC_MUTE
+
+#define ___MUTE_PRV_PLAY_NXT_STOP___  KC_MUTE,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
+#define ___MUTE_PLAY_STOP___  KC_MUTE,  KC_MPLY,  KC_MSTP
+
+#define CARTE_MEDIA                      \
+  carte_de_map(" ",                      \
+               "  < vdn vup >",          \
+               "  stp play mute")
+
+// miryoku, to be used with stop play mute on thumbs. - MEDIA thumbs.
+#define ___MEDIA_3x10___                        \
+  ___5___, ___5___,                             \
+    ___5___, ___, ___PRV_VDN_VUP_NXT___,        \
+    ___5___, ___5___
+
+
+/********************************************************************************/
+/* RGB  - Control those lights.                                                 */
+
+/* ___, HUE SAT_INT MOD (UP),            | */
+/* ___, HUE SAT INT MOD (DOWN), RGB_TOG  | P_B_R_SW_SN___, ___ */
+/* ___6___,                              | ___, ___RGB_KXGT___, ___ */
+/********************************************************************************/
+// RGB FUNCTION Keysets
+// RGB row for the _FN layer from the redo of the default keymap.c
+#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD
+#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD
+#define ___RGB_MODE_PRV_NXT___   RGB_RMOD, RGB_MOD
+#define ___RGB_TOGGLE___         RGB_TOG
+#define ___RGB_P_B_R_SW_SN___    RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN
+#define ___RGB_KXGT___           RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T
+
+/// An RGB Layer
+#define ___10_RGB_1___ ___RGB_HUE_SAT_INT_UP___, ___,     ___5___
+#define ___10_RGB_2___ ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___RGB_P_B_R_SW_SN___
+#define ___10_RGB_3___ ___5___,                                ___, ___RGB_KXGT___
+
+/********************************************************************************/
+/* The RGB LAYER Chunk                                                          */
+/********************************************************************************/
+#define ___RGB_3x10___ ___10_RGB_1___, ___10_RGB_2___, ___10_RGB_3___
+
+
+/********************************************************************************/
+/* ADJUST - Miscellaneous Melange.                                              */
+/********************************************************************************/
+// For an Adjust layer. Like RBB with audio, flash, etc.
+#define ___ADJUST_L1___ ___RGB_HUE_SAT_INT_UP___,       RGB_TOG
+#define ___ADJUST_L2___ MU_TOG, CK_TOGG, AU_ON, AU_OFF, CG_NORM
+#define ___ADJUST_L3___ ___RGB_HUE_SAT_INT_DN___,       KC_RGB_T
+
+#define ___ADJUST_R1___  ___, KC_MAKE, VRSN, MG_NKRO, KC_RESET
+#define ___ADJUST_R2___  EEP_RST, ___PRV_PLAY_NXT_STOP___,
+#define ___ADJUST_R3___  MG_NKRO, ___VDN_MUTE_VUP___, RGB_IDL
+/********************************************************************************/
+/* The Adjust LAYER Chunks                                                      */
+/********************************************************************************/
+#define ___ADJUST_3x10___  ___ADJUST_L1___, ___ADJUST_R1___,    \
+    ___ADJUST_L2___, ___ADJUST_R2___,                           \
+    ___ADJUST_L3___, ___ADJUST_R3___
+
+
+/********************************************************************************/
+/* LAYERS - Define a base layer, switch to any layer. Get around. Experiment.   */
+/*                                                                              */
+/* Base Layers on the left hand,                                                */
+/* transient layers on the right. Centered on the home region.                  */
+/* A good place to attach an experimental layer.                                */
+/*                                                                              */
+/********************************************************************************/
+//  Base Layers
+// this was kc_dvorak et al. But since its configurable as to who would be here
+// that no longer makes sense. So next keys for locale and base layer. and a set to
+// make it permanent. Cycling of layers is based on current locale.
+#define ___BASE_LAYERS___ ___, KC_SET_BASE, KC_NEXT_BASE_LAYER, KC_NEXT_LOCALE, ___
+
+// transient layers.
+#define ___5_LAYERS_T___     ___, MO(_NAV),  MO_SYMB,  MO_KEYPAD,  MO_TOPROWS
+#ifdef SECOND_LOCALE
+#undef LANG_IS
+#define LANG_IS SECOND_LOCALE
+#define ___5_LAYERS_T_BP___  ___, MO(_NAV),  MO_SYMB,  MO_KEYPAD,  MO_TOPROWS
+#undef LANG_IS
+#define LANG_IS DEFAULT_LANG
+#else
+#define ___5_LAYERS_T_BP___  ___, MO(_NAV),  ___3___
+#endif
+
+#define ___5_LAYERS_T_CTL___ ___, MO_RGB, ___, ___, MO_ADJUST
+
+
+#define CARTE_LAYERS                            \
+  carte_de_map("          |Nv S K TR",          \
+               "  EE Bs Ln|Nv S K TR",          \
+               " ")
+
+/// A Layers Layer
+#define ___LAYERS_3x10___                       \
+  ___5___,            ___5_LAYERS_T_BP___,      \
+    ___BASE_LAYERS___,  ___5_LAYERS_T___,       \
+    ___5___,            ___5_LAYERS_T_CTL___
diff --git a/users/ericgebhart/layouts.h b/users/ericgebhart/layouts.h
deleted file mode 100644
index 5ca9b00e6e..0000000000
--- a/users/ericgebhart/layouts.h
+++ /dev/null
@@ -1,720 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "core_keysets.h"
-#include "mod_layer.h"
-#include "edge_keys.h"
-
-/******************************************************************/
-/* This is where I put my Keyboard layouts.                       */
-/* The mod layer can be modified in mod_layer.h                   */
-/* can be applied here. The physical shape of the keyboard is     */
-/* also accounted for here. This makes it very simple to add a    */
-/* new keyboard and reuse all of my layouts and layers            */
-/*                                                                */
-/* With all of that in hand, we then create a LAYOUT wrapper      */
-/* macro that takes a list of keys, to create a keyboard matrix   */
-/* that fits the keyboard. Simple.                                */
-/*                                                                */
-/* The thumb keys, the bottom rows, etc.                          */
-/*                                                                */
-/* An attempt has been made to adapt the kinesis and ergodox      */
-/* Thumb keys to the rectangular shapes of the xd75, viterbi,     */
-/* and rebound.                                                   */
-/******************************************************************/
-
-/******************************************************************/
-/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
-/*       keys inbetween the usual left and right hand keys        */
-/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
-/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
-/*       thumbkeys. It is missing middle keys on (home) row 3.    */
-/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
-/*       extra middle keys                                        */
-/*                                                                */
-/******************************************************************/
-
-
-/******************************************************************/
-/*   In all cases these keyboards are defined in a matrix which is */
-/*   a set of rows. Maybe like so, or not.                         */
-/*                                                                 */
-/*   -------------------------|------------------------ */
-/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
-/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
-/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
-/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
-/*   | Row5L                  |                    Row5R | */
-/*   |               ThumbsL  | ThumbsR                  | */
-/*   -------------------------|------------------------ */
-
-/* Generally speaking, the keys on the right and left don't change. */
-/* Neither does the bottom row or the thumbs. Frequently the numbers */
-/* row is identical across layers. Mostly, we want our Base layers to */
-/* be predctable.                                                     */
-
-
-// Since our quirky block definitions are basically a list of comma separated
-// arguments, we need a wrapper in order for these definitions to be
-// expanded before being used as arguments to the LAYOUT_xxx macro.
-#if (!defined(LAYOUT) && defined(KEYMAP))
-#define LAYOUT KEYMAP
-#endif
-
-// every keyboard has it's Layout. We start there and make a var args
-// out of it.
-
-#define LVARG_ergodox(...)    LAYOUT_ergodox(__VA_ARGS__)
-#define LVARG_edox(...)       LAYOUT_ergodox_pretty(__VA_ARGS__)
-#define LAYOUT_VARG(...)      LAYOUT(__VA_ARGS__)
-#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
-
-#define LVARG_4x12(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
-#define LVARG_5x12(...)       LAYOUT_ortho_5x12(__VA_ARGS__)
-#define LVARG_5x14(...)       LAYOUT_ortho_5x14(__VA_ARGS__)
-#define LVARG_5x15(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
-
-/*
-  | Left | Numbers L | middle | numbers R | Right |
-  | Left | keys0-5   | middle | Keys6-10  | Right |
-  | Left | keys11-15 | middle | Keys16-20 | Right |
-  | Left | keys20-25 | middle | Keys25-30 | Right |
-  |Row5L                                  Row5R   |
-  |ThumbsL                                ThumbsR |
-*/
-
-/* Assuming that left, midddle, right, row5, and thumbs stay the same, */
-/* numbers, no numbers, numbers never change, whatever.                */
-/*   we can have a layout macro that takes a nice rectangle of keys.   */
-
-/* Actually, because of Bepo, each keyboard currently requires four of */
-/* these macros. One for Qwerty, One for foreign layouts on bepo like */
-/* dvorak and beakl on bepo instead of on Qwerty. Then another for the Bepo */
-/* layout because unlike the rest of the layouts Bepo doesn't fit in */
-/* 3x10. It wants 3x12. So there are potentially 4 macros per keyboard here. */
-/* XXXX_base, XXXX_base_bepo, XXXX_base_bepo6, The 4th macro */
-/* is XXXXX_transient and generally works for all other */
-/* non base layers.                                       */
-/* The base and transient versions are all that is necessary, if bepo is */
-/*   not needed. */
-
-
-/* All layouts are relatively simple to make. */
-/* The ROW macros add a universal mod layer so that mods can be defined once */
-/* and used everywhere. No matter the keymap or layer. this allows actual maps */
-/* like dvorak, qwerty, colemak, beakl, etc., to be defined simply. */
-
-
-/* Additional, more complicated layouts can be found here.*/
-/* examples can be found in crkbd/keymaps/ericgebhart */
-/* examples can be found in kinesis/keymaps/ericgebhart */
-/* examples can be found in ergodox/keymaps/ericgebhart */
-/* examples can be found in montsinger/rebound/rev4/keymaps/ericgebhart */
-
-
-
-/********************************************************************/
-/* xiudi/xd75  - Ortholinear 5x15  */
-/********************************************************************/
-/// These first two base layout templates take sets of 5 keys, left and right.
-// Using 4 sets allows for changing the number row if you have one.
-// if you never change the number row, then use 3 sets of left and right.
-// and define the number row here.
-#define LAYOUT_5x15_base(                                         \
-                         K01, K02, K03, K04, K05,                 \
-                         K06, K07, K08, K09, K0A,                 \
-                         K11, K12, K13, K14, K15,                 \
-                         K16, K17, K18, K19, K1A,                 \
-                         K21, K22, K23, K24, K25,                 \
-                         K26, K27, K28, K29, K2A,                 \
-                         K31, K32, K33, K34, K35,                 \
-                         K36, K37, K38, K39, K3A)                 \
-  LVARG_5x15(                                                     \
-            ROW0_LEFT(K01, K02, K03, K04, K05), \
-            ___3_MIDDLE_T___,                                           \
-            ROW0_RIGHT(K06, K07, K08, K09, K0A),                        \
-                                                                        \
-            ROW1_LEFT(K11, K12, K13, K14, K15),                         \
-            ___3_MIDDLE_1___,                                           \
-            ROW1_RIGHT(K16, K17, K18, K19, K1A),                        \
-                                                                        \
-            ROW2_LEFT(K21, K22, K23, K24, K25),                         \
-            ___3_MIDDLE_2___,                                           \
-            ROW2_RIGHT(K26, K27, K28, K29, K2A),                        \
-                                                                        \
-            ROW3_LEFT(K31, K32, K33, K34, K35),                         \
-            ___3_MIDDLE_3___,                                           \
-            ROW3_RIGHT(K36, K37, K38, K39, K3A),                        \
-            ___15_BOTTOM___                                             \
-    )
-
-#define LAYOUT_5x15_base_bepo(                                          \
-                         K01, K02, K03, K04, K05,                       \
-                         K06, K07, K08, K09, K0A,                       \
-                         K11, K12, K13, K14, K15,                       \
-                         K16, K17, K18, K19, K1A,                       \
-                         K21, K22, K23, K24, K25,                   \
-                         K26, K27, K28, K29, K2A,                   \
-                         K31, K32, K33, K34, K35,                   \
-                         K36, K37, K38, K39, K3A)                   \
-  LVARG_5x15(                                                           \
-             ROW0_LEFT_BP(K01, K02, K03, K04, K05),                   \
-             ___3_MIDDLE_T___,                                          \
-             ROW0_RIGHT_BP(K06, K07, K08, K09, K0A),                    \
-                                                                        \
-             ROW1_LEFT_BP(K11, K12, K13, K14, K15),                     \
-             ___3_MIDDLE_1_BP___,                                       \
-             ROW1_RIGHT_BP(K16, K17, K18, K19, K1A),                    \
-                                                                        \
-             ROW2_LEFT_BP(K21, K22, K23, K24, K25),                     \
-             ___3_MIDDLE_2_BP___,                                       \
-             ROW2_RIGHT_BP(K26, K27, K28, K29, K2A),                    \
-                                                                        \
-             ROW3_LEFT_BP(K31, K32, K33, K34, K35),                     \
-             ___3_MIDDLE_3_BP___,                                       \
-             ROW3_RIGHT_BP(K36, K37, K38, K39, K3A),                    \
-             ___15_BOTTOM_BP___                                         \
-                                                                        )
-
-// Just for bepo because it's a 3x6 matrix on each side.
-// So 3 pairs of 6 keys, left and right.
-#define Layout_5x15_base_bepo6(                                         \
-                               K01, K02, K03, K04, K05, K06,            \
-                               K07, K08, K09, K0A, K0B, K0C,            \
-                               K11, K12, K13, K14, K15, K16,            \
-                               K17, K18, K19, K1A, K1B, K1C,            \
-                               K21, K22, K23, K24, K25, K26,            \
-                               K27, K28, K29, K2A, K2B, K2C             \
-                                                   )                    \
-     LVARG_5x15(                                                        \
-                ___15_B_SYMB___,                                  \
-                ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),            \
-                ___3_MIDDLE_1_BP___,                                    \
-                ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),           \
-                                                                        \
-                ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),            \
-                ___3_MIDDLE_2___,                                       \
-                ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),           \
-                                                                        \
-                ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),            \
-                ___3_MIDDLE_3___,                                       \
-                ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),           \
-                ___15_BOTTOM_BP___                                      \
-                                                                        )
-
-     // 4  rows of 12. 3 columns transparent in the middle.
-#define LAYOUT_5x15_transient(                                          \
-                              K01, K02, K03, K04, K05, K06,             \
-                              K07, K08, K09, K0A, K0B, K0C,           \
-                              K11, K12, K13, K14, K15, K16,             \
-                              K17, K18, K19, K1A, K1B, K1C,             \
-                              K21, K22, K23, K24, K25, K26,             \
-                              K27, K28, K29, K2A, K2B, K2C,             \
-                              K31, K32, K33, K34, K35, K36,             \
-                              K37, K38, K39, K3A, K3B, K3C              \
-                                                                        ) \
-     LVARG_5x15(                                                  \
-                K01, K02, K03, K04, K05, K06,                           \
-                ___3___,                                                \
-                K07, K08, K09, K0A, K0B, K0C,                           \
-                K11, K12, K13, K14, K15, K16,                           \
-                ___3___,                                                \
-                K17, K18, K19, K1A, K1B, K1C,                           \
-                K21, K22, K23, K24, K25, K26,                           \
-                ___3___,                                                \
-                K27, K28, K29, K2A, K2B, K2C,                           \
-                K31, K32, K33, K34, K35, K36,                           \
-                ___3___,                                                \
-                K37, K38, K39, K3A, K3B, K3C,                           \
-                ___15___)                                               \
-
-#define BASE_5x15(...)       LAYOUT_5x15_base(__VA_ARGS__)
-#define BASE_5x15_bepo(...)  LAYOUT_5x15_base_bepo(__VA_ARGS__)
-#define BASE_5x15_bepo6(...) LAYOUT_5x15_base_bepo6(__VA_ARGS__)
-#define TRANSIENT_5x15(...)  LAYOUT_5x15_transient(__VA_ARGS__)
-
-/********************************************************************/
-
-
-/********************************************************************/
-/* viterbi  - Ortholinear 5x14  */
-/********************************************************************/
-#define LAYOUT_5x14_base(                                               \
-                         K01, K02, K03, K04, K05,                       \
-                         K06, K07, K08, K09, K0A,                       \
-                         K11, K12, K13, K14, K15,                       \
-                         K16, K17, K18, K19, K1A,                       \
-                         K21, K22, K23, K24, K25,                       \
-                         K26, K27, K28, K29, K2A,                       \
-                         K31, K32, K33, K34, K35,                       \
-                         K36, K37, K38, K39, K3A)                       \
-  LVARG_5x14(                                                           \
-             ROW0_LEFT(K01, K02, K03, K04, K05),                        \
-             ___2_MIDDLE_T___,                                          \
-             ROW0_RIGHT(K06, K07, K08, K09, K0A),                       \
-                                                                        \
-             ROW1_LEFT(K11, K12, K13, K14, K15),                        \
-             ___2_MIDDLE_1___,                                          \
-             ROW1_RIGHT(K16, K17, K18, K19, K1A),                       \
-                                                                        \
-             ROW2_LEFT(K21, K22, K23, K24, K25),                        \
-             ___2_MIDDLE_2___,                                          \
-             ROW2_RIGHT(K26, K27, K28, K29, K2A),                       \
-                                                                        \
-             ROW3_LEFT(K31, K32, K33, K34, K35),                        \
-             ___2_MIDDLE_3___,                                          \
-             ROW3_RIGHT(K36, K37, K38, K39, K3A),                       \
-             ___14_BOTTOM___                                            \
-                                                                        )
-
-#define LAYOUT_5x14_base_bepo(                                          \
-                              K01, K02, K03, K04, K05,                  \
-                              K06, K07, K08, K09, K0A,                  \
-                              K11, K12, K13, K14, K15,                  \
-                              K16, K17, K18, K19, K1A,                  \
-                              K21, K22, K23, K24, K25,                  \
-                              K26, K27, K28, K29, K2A,                  \
-                              K31, K32, K33, K34, K35,                  \
-                              K36, K37, K38, K39, K3A)                  \
-  LVARG_5x14(                                                           \
-            ROW0_LEFT_BP(K01, K02, K03, K04, K05),                      \
-            ___2_MIDDLE_T___,                                           \
-            ROW0_RIGHT_BP(K06, K07, K08, K09, K0A),                     \
-                                                                        \
-            ROW1_LEFT_BP(K11, K12, K13, K14, K15),                      \
-            ___2_MIDDLE_1_BP___,                                        \
-            ROW1_RIGHT_BP(K16, K17, K18, K19, K1A),                     \
-                                                                        \
-            ROW2_LEFT_BP(K21, K22, K23, K24, K25),                      \
-            ___2_MIDDLE_2_BP___,                                        \
-            ROW2_RIGHT_BP(K26, K27, K28, K29, K2A),                     \
-                                                                        \
-            ROW3_LEFT_BP(K31, K32, K33, K34, K35),                      \
-            ___2_MIDDLE_3_BP___,                                        \
-            ROW3_RIGHT_BP(K36, K37, K38, K39, K3A),                     \
-            ___14_BOTTOM_BP___                                          \
-    )
-
-  // Just for bepo because it's a 3x6 matrix on each side.
-// So 3 pairs of 6 keys, left and right.
-#define LAYOUT_5x14_base_bepo6(                                 \
-                               K01, K02, K03, K04, K05, K06,    \
-                               K07, K08, K09, K0A, K0B, K0C,    \
-                               K11, K12, K13, K14, K15, K16,    \
-                               K17, K18, K19, K1A, K1B, K1C,        \
-                               K21, K22, K23, K24, K25, K26,        \
-                               K27, K28, K29, K2A, K2B, K2C             \
-                                                   )                    \
-  LVARG_5x14(                                                           \
-             ___14_B_SYMB___,                                           \
-             ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),               \
-             ___2_MIDDLE_1_BP___,                                       \
-             ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),              \
-                                                                        \
-             ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),               \
-             ___2_MIDDLE_2___,                                          \
-             ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),              \
-                                                                        \
-             ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),               \
-             ___2_MIDDLE_3___,                                          \
-             ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),              \
-             ___14_BOTTOM_BP___                                         \
-                                                                        )
-
-// 4  rows of 12. 2 columns transparent in the middle.
-#define LAYOUT_5x14_transient(                                          \
-                              K01, K02, K03, K04, K05, K06,             \
-                              K07, K08, K09, K0A, K0B, K0C,             \
-                              K11, K12, K13, K14, K15, K16,             \
-                              K17, K18, K19, K1A, K1B, K1C,             \
-                              K21, K22, K23, K24, K25, K26,             \
-                              K27, K28, K29, K2A, K2B, K2C,             \
-                              K31, K32, K33, K34, K35, K36,             \
-                              K37, K38, K39, K3A, K3B, K3C              \
-                                                                        ) \
-  LVARG_5x14(                                                           \
-             K01, K02, K03, K04, K05, K06,                              \
-             ___2___,                                                   \
-             K07, K08, K09, K0A, K0B, K0C,                              \
-             K11, K12, K13, K14, K15, K16,                              \
-             ___2___,                                                   \
-             K17, K18, K19, K1A, K1B, K1C,                              \
-             K21, K22, K23, K24, K25, K26,                              \
-             ___2___,                                                   \
-             K27, K28, K29, K2A, K2B, K2C,                              \
-             K31, K32, K33, K34, K35, K36,                              \
-             ___2___,                                                   \
-             K37, K38, K39, K3A, K3B, K3C,                              \
-             ___14___                                                   \
-                                                                        ) \
-
-#define BASE_5x14(...)       LAYOUT_5x14_base(__VA_ARGS__)
-#define BASE_5x14_bepo(...)  LAYOUT_5x14_base_bepo(__VA_ARGS__)
-#define BASE_5x14_bepo6(...) LAYOUT_5x14_base_bepo6(__VA_ARGS__)
-#define TRANSIENT_5x14(...)  LAYOUT_5x14_transient(__VA_ARGS__)
-
-/********************************************************************/
-/* Ortholinear 4x12  */
-/********************************************************************/
-#define LAYOUT_4x12_base(                                               \
-                         K01, K02, K03, K04, K05,                       \
-                         K06, K07, K08, K09, K0A,                       \
-                         K11, K12, K13, K14, K15,                       \
-                         K16, K17, K18, K19, K1A,                       \
-                         K21, K22, K23, K24, K25,                       \
-                         K26, K27, K28, K29, K2A                        \
-                                                                        ) \
-  LVARG_4x12(                                                     \
-             ROW1_LEFT(K01, K02, K03, K04, K05),                  \
-             ROW1_RIGHT(K06, K07, K08, K09, K0A),                 \
-                                                                  \
-             ROW2_LEFT(K11, K12, K13, K14, K15),                  \
-             ROW2_RIGHT(K16, K17, K18, K19, K1A),                 \
-                                                                  \
-             ROW3_LEFT(K21, K22, K23, K24, K25),                  \
-             ROW3_RIGHT(K26, K27, K28, K29, K2A),                 \
-                                                                        \
-             ___12_BOTTOM___                                            \
-                                                                  )
-
-#define LAYOUT_4x12_base_bepo(                                          \
-                              K01, K02, K03, K04, K05,                  \
-                              K06, K07, K08, K09, K0A,                  \
-                              K11, K12, K13, K14, K15,                  \
-                              K16, K17, K18, K19, K1A,                  \
-                              K21, K22, K23, K24, K25,                  \
-                              K26, K27, K28, K29, K2A                  \
-                                                                        ) \
-     LVARG_4x12(                                                  \
-                ROW1_LEFT_BP(K01, K02, K03, K04, K05),              \
-                ROW1_RIGHT_BP(K06, K07, K08, K09, K0A),             \
-                                                                    \
-                ROW2_LEFT_BP(K11, K12, K13, K14, K15),              \
-                ROW2_RIGHT_BP(K16, K17, K18, K19, K1A),             \
-                                                                        \
-                ROW3_LEFT_BP(K21, K22, K23, K24, K25),                    \
-                ROW3_RIGHT_BP(K26, K27, K28, K29, K2A),                 \
-                                                                        \
-                ___12_BOTTOM_BP___                                      \
-                                                                  )
-
-     // Just for bepo because it's a 3x6 matrix on each side.
-     // So 3 pairs of 6 keys, left and right.
-#define Layout_4x12_base_bepo6(                                 \
-                               K01, K02, K03, K04, K05, K06,    \
-                               K07, K08, K09, K0A, K0B, K0C,    \
-                               K11, K12, K13, K14, K15, K16,           \
-                               K17, K18, K19, K1A, K1B, K1C,           \
-                               K21, K22, K23, K24, K25, K26,           \
-                               K27, K28, K29, K2A, K2B, K2C             \
-                                                                           ) \
-     LVARG_4x12(                                                        \
-                ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),            \
-                ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),           \
-                                                                        \
-                ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),            \
-                ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),           \
-                                                                        \
-                ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),            \
-                ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),           \
-                ___12_BOTTOM_BP___                                      \
-                                                                        )
-
-// takes 3 makes 4  rows of 12.
-#define LAYOUT_4x12_transient(                                          \
-                              K01, K02, K03, K04, K05, K06,             \
-                              K07, K08, K09, K0A, K0B, K0C,             \
-                              K11, K12, K13, K14, K15, K16,             \
-                              K17, K18, K19, K1A, K1B, K1C,             \
-                              K21, K22, K23, K24, K25, K26,             \
-                              K27, K28, K29, K2A, K2B, K2C              \
-                                                                        ) \
-  LVARG_4x12(                                                           \
-             K01, K02, K03, K04, K05, K06,                              \
-             K07, K08, K09, K0A, K0B, K0C,                              \
-             K11, K12, K13, K14, K15, K16,                              \
-             K17, K18, K19, K1A, K1B, K1C,                              \
-             K21, K22, K23, K24, K25, K26,                              \
-             K27, K28, K29, K2A, K2B, K2C,                              \
-             ___12___)                                                  \
-
-#define BASE_4x12(...)       LAYOUT_4x12_base(__VA_ARGS__)
-#define BASE_4x12_bepo(...)  LAYOUT_4x12_base_bepo(__VA_ARGS__)
-#define BASE_4x12_bepo6(...) LAYOUT_4x12_base_bepo6(__VA_ARGS__)
-#define TRANSIENT_4x12(...)  LAYOUT_4x12_transient(__VA_ARGS__)
-
-/********************************************************************/
-/* CRKBD  Corne                                                     */
-/*    The Corne has  3x6 matrix on both sides with 6 thumbs total   */
-/* This Macro takes 2x3x5 and gives it pinkies, and thumbs.         */
-/* Arg chunks are in the middle with the passthrough modifiers as   */
-/* needed.  Sama Sama apres cette fois.                             */
-/********************************************************************/
-#define Base_3x6_3(                                                     \
-                   K01, K02, K03, K04, K05,                             \
-                   K06, K07, K08, K09, K0A,                             \
-                   K11, K12, K13, K14, K15,                             \
-                   K16, K17, K18, K19, K1A,                             \
-                   K21, K22, K23, K24, K25,                             \
-                   K26, K27, K28, K29, K2A)                             \
-  LAYOUT_VARG(                                                          \
-              ROW1_LEFT(K01, K02, K03, K04, K05),                       \
-              ROW1_RIGHT(K06, K07, K08, K09, K0A),                      \
-                                                                        \
-              ROW2_LEFT(K11, K12, K13, K14, K15),                       \
-              ROW2_RIGHT(K16, K17, K18, K19, K1A),                      \
-                                                                        \
-              ROW3_LEFT(K21, K22, K23, K24, K25),                       \
-              ROW3_RIGHT(K26, K27, K28, K29, K2A),                      \
-              ___6_ERGO_THUMBS___                                       \
-                                                                        )
-
-// So we can have different transient layers for symbols and numbers on bepo.
-// for layouts like dvorak on bepo.
-#define Base_bepo_3x6_3(                                                \
-                        K01, K02, K03, K04, K05,                        \
-                        K06, K07, K08, K09, K0A,                        \
-                        K11, K12, K13, K14, K15,                        \
-                        K16, K17, K18, K19, K1A,                        \
-                        K21, K22, K23, K24, K25,                        \
-                        K26, K27, K28, K29, K2A                         \
-                                                                        ) \
-  LAYOUT_VARG(                                                          \
-              ROW1_LEFT_BP(K01, K02, K03, K04, K05),                    \
-              ROW1_RIGHT_BP(K06, K07, K08, K09, K0A),                   \
-                                                                        \
-              ROW2_LEFT_BP(K11, K12, K13, K14, K15),                    \
-              ROW2_RIGHT_BP(K16, K17, K18, K19, K1A),                   \
-                                                                        \
-              ROW3_LEFT_BP(K21, K22, K23, K24, K25),                    \
-              ROW3_RIGHT_BP(K26, K27, K28, K29, K2A),                   \
-              ___6_ERGO_THUMBS_BP___                                    \
-                                                                        )
-
-// No room for pinkies.
-// Just for bepo because it's a 3x6 matrix on each side.
-// So 3 pairs of 6 keys, And we lose our left and right.
-// Except it keeps the layer toggles along with the keycode
-// on the bottom.
-#define Base_bepo6_3x6_3(                                               \
-                         K01, K02, K03, K04, K05, K06,                  \
-                         K07, K08, K09, K0A, K0B, K0C,                  \
-                         K11, K12, K13, K14, K15, K16,                  \
-                         K17, K18, K19, K1A, K1B, K1C,                  \
-                         K21, K22, K23, K24, K25, K26,                  \
-                         K27, K28, K29, K2A, K2B, K2C                   \
-                                                                        ) \
-  LAYOUT_VARG(                                                          \
-              ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),              \
-              ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),             \
-                                                                        \
-              ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),              \
-              ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),             \
-                                                                        \
-              ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),              \
-              ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),             \
-              ___6_ERGO_THUMBS_BP___                                    \
-                                                                        )
-
-// All we really need is to add the see through thumbs to the end.
-#define Transient6_3x6_3(                                               \
-                         K01, K02, K03, K04, K05, K06,                  \
-                         K07, K08, K09, K0A, K0B, K0C,                  \
-                         K11, K12, K13, K14, K15, K16,                  \
-                         K17, K18, K19, K1A, K1B, K1C,                  \
-                         K21, K22, K23, K24, K25, K26,                  \
-                         K27, K28, K29, K2A, K2B, K2C                   \
-                                                                        ) \
-  LAYOUT_VARG(                                                          \
-              K01, K02, K03, K04, K05, K06,                             \
-              K07, K08, K09, K0A, K0B, K0C,                             \
-              K11, K12, K13, K14, K15, K16,                             \
-              K17, K18, K19, K1A, K1B, K1C,                             \
-              K21, K22, K23, K24, K25, K26,                             \
-              K27, K28, K29, K2A, K2B, K2C,                             \
-              ___6___)
-
-//---------------------------------------------------------
-//  3x5
-#define Base_3x5_3(                                                     \
-                   K01, K02, K03, K04, K05,                             \
-                   K06, K07, K08, K09, K0A,                             \
-                   K11, K12, K13, K14, K15,                             \
-                   K16, K17, K18, K19, K1A,                             \
-                   K21, K22, K23, K24, K25,                             \
-                   K26, K27, K28, K29, K2A)                             \
-  LAYOUT_VARG(                                                          \
-              ROW1_LEFT5(K01, K02, K03, K04, K05),                      \
-              ROW1_RIGHT5(K06, K07, K08, K09, K0A),                     \
-                                                                        \
-              ROW2_LEFT5(K11, K12, K13, K14, K15),                      \
-              ROW2_RIGHT5(K16, K17, K18, K19, K1A),                     \
-                                                                        \
-              ROW3_LEFT5(K21, K22, K23, K24, K25),                      \
-              ROW3_RIGHT5(K26, K27, K28, K29, K2A),                     \
-              ___6_ERGO_THUMBS___                                       \
-                                                                        )
-
-// So we can have different transient layers for symbols and numbers on bepo.
-// for layouts like dvorak on bepo.
-#define Base_bepo_3x5_3(                                                \
-                        K01, K02, K03, K04, K05,                        \
-                        K06, K07, K08, K09, K0A,                        \
-                        K11, K12, K13, K14, K15,                        \
-                        K16, K17, K18, K19, K1A,                        \
-                        K21, K22, K23, K24, K25,                        \
-                        K26, K27, K28, K29, K2A                         \
-                                                                        ) \
-  LAYOUT_VARG(                                                          \
-              ROW1_LEFT5_BP(K01, K02, K03, K04, K05),                   \
-              ROW1_RIGHT5_BP(K06, K07, K08, K09, K0A),                  \
-                                                                        \
-              ROW2_LEFT5_BP(K11, K12, K13, K14, K15),                   \
-              ROW2_RIGHT5_BP(K16, K17, K18, K19, K1A),                  \
-                                                                        \
-              ROW3_LEFT5_BP(K21, K22, K23, K24, K25),                   \
-              ROW3_RIGHT5_BP(K26, K27, K28, K29, K2A),                  \
-              ___6_ERGO_THUMBS_BP___                                    \
-                                                                        )
-
-// All we really need is to add the see through thumbs to the end.
-#define Transient5_3x5_3(                                               \
-                         K01, K02, K03, K04, K05,                       \
-                         K07, K08, K09, K0A, K0B,                       \
-                         K11, K12, K13, K14, K15,                       \
-                         K17, K18, K19, K1A, K1B,                       \
-                         K21, K22, K23, K24, K25,                       \
-                         K27, K28, K29, K2A, K2B                        \
-                                                                    )   \
-  LAYOUT_VARG(                                                          \
-              K01, K02, K03, K04, K05,                               \
-              K07, K08, K09, K0A, K0B,                              \
-              K11, K12, K13, K14, K15,                              \
-              K17, K18, K19, K1A, K1B,                              \
-              K21, K22, K23, K24, K25,                              \
-              K27, K28, K29, K2A, K2B,                          \
-              ___6___)
-
-/********************************************************************/
-/* Kinesis*/
-/********************************************************************/
-// Basically an ergodox ez without the 3 pairs of middle keys.
-// Left, right, bottom, and thumbs all stay the same.
-#define Base_4x6_4_6(                                                   \
-                     K01, K02, K03, K04, K05,                           \
-                     K06, K07, K08, K09, K0A,                           \
-                     K11, K12, K13, K14, K15,                           \
-                     K16, K17, K18, K19, K1A,                           \
-                     K21, K22, K23, K24, K25,                           \
-                     K26, K27, K28, K29, K2A,                           \
-                     K31, K32, K33, K34, K35,                           \
-                     K36, K37, K38, K39, K3A                            \
-                                                                        ) \
-  LAYOUT_PVARG(                                                         \
-               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
-               ROW0_LEFT(K01, K02, K03, K04, K05),                      \
-               ROW0_RIGHT(K06, K07, K08, K09, K0A),                     \
-                                                                        \
-               ROW1_LEFT(K11, K12, K13, K14, K15),                      \
-               ROW1_RIGHT(K16, K17, K18, K19, K1A),                     \
-                                                                        \
-               ROW2_LEFT(K21, K22, K23, K24, K25),                      \
-               ROW2_RIGHT(K26, K27, K28, K29, K2A),                     \
-                                                                        \
-               ROW3_LEFT(K31, K32, K33, K34, K35),                      \
-               ROW3_RIGHT(K36, K37, K38, K39, K3A),                     \
-               ___4_BOTTOM_LEFT___, ___4_BOTTOM_RIGHT___,               \
-               ___12_DOX_ALL_THUMBS___                                  \
-                                                                        )
-
-#define Base_bepo_4x6_4_6(                                              \
-                          K01, K02, K03, K04, K05,                      \
-                          K06, K07, K08, K09, K0A,                      \
-                          K11, K12, K13, K14, K15,                      \
-                          K16, K17, K18, K19, K1A,                      \
-                          K21, K22, K23, K24, K25,                      \
-                          K26, K27, K28, K29, K2A,                      \
-                          K31, K32, K33, K34, K35,                      \
-                          K36, K37, K38, K39, K3A                       \
-                                                                       ) \
-  LAYOUT_PVARG(                                                         \
-               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
-               ROW0_LEFT(K01, K02, K03, K04, K05),                      \
-               ROW0_RIGHT(K06, K07, K08, K09, K0A),                     \
-                                                                        \
-               ROW1_LEFT(K11, K12, K13, K14, K15),                      \
-               ROW1_RIGHT(K16, K17, K18, K19, K1A),                     \
-                                                                        \
-               ROW2_LEFT(K21, K22, K23, K24, K25),                      \
-               ROW2_RIGHT(K26, K27, K28, K29, K2A),                     \
-                                                                        \
-               ROW3_LEFT(K31, K32, K33, K34, K35),                      \
-               ROW3_RIGHT(K36, K37, K38, K39, K3A),                     \
-               ___4_BOTTOM_LEFT___, ___4_BOTTOM_RIGHT___,               \
-               ___12_DOX_ALL_THUMBS_BP___                               \
-                                                                        )
-
-
-// So 3 pairs of 6 keys, left and right.
-#define Base_bepo6_4x6_4_6(                                             \
-                           K01, K02, K03, K04, K05, K06,                \
-                           K07, K08, K09, K0A, K0B, K0C,                \
-                           K11, K12, K13, K14, K15, K16,                \
-                           K17, K18, K19, K1A, K1B, K1C,                \
-                           K21, K22, K23, K24, K25, K26,                \
-                           K27, K28, K29, K2A, K2B, K2C                 \
-                                                                   )    \
-  LAYOUT_PVARG(                                                         \
-               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
-               ___6SYMBOL_BEPO_L___,                                    \
-               ___6SYMBOL_BEPO_R___,                                    \
-               ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),             \
-               ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),            \
-                                                                        \
-               ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),             \
-               ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),            \
-                                                                        \
-               ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),             \
-               ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),            \
-               ___4_BOTTOM_LEFT_BP___, ___4_BOTTOM_RIGHT_BP___,         \
-               ___12_DOX_ALL_THUMBS_BP___                               \
-                                                                        )
-
-#define Transient6_4x6_4_6(                                             \
-                           K01, K02, K03, K04, K05, K06,                \
-                           K07, K08, K09, K0A, K0B, K0C,                \
-                           K11, K12, K13, K14, K15, K16,                \
-                           K17, K18, K19, K1A, K1B, K1C,                \
-                           K21, K22, K23, K24, K25, K26,                \
-                           K27, K28, K29, K2A, K2B, K2C,                \
-                           K31, K32, K33, K34, K35, K36,                \
-                           K37, K38, K39, K3A, K3B, K3C                 \
-                                                                        ) \
-  LAYOUT_PVARG(                                                         \
-               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
-               K01, K02, K03, K04, K05, K06,                            \
-               K07, K08, K09, K0A, K0B, K0C,                            \
-               K11, K12, K13, K14, K15, K16,                            \
-               K17, K18, K19, K1A, K1B, K1C,                            \
-               K21, K22, K23, K24, K25, K26,                            \
-               K27, K28, K29, K2A, K2B, K2C,                            \
-               K31, K32, K33, K34, K35, K36,                            \
-               K37, K38, K39, K3A, K3B, K3C,                            \
-               ___4___, ___4___,                                        \
-               ___12___                                                 \
-                                                                        )
diff --git a/users/ericgebhart/listen_keylogger.sh b/users/ericgebhart/listen_keylogger.sh
new file mode 100755
index 0000000000..71773d19af
--- /dev/null
+++ b/users/ericgebhart/listen_keylogger.sh
@@ -0,0 +1 @@
+sudo ./hid_listen | egrep --line-buffered "(0x[A-F0-9]+,)?(NA|[0-9]+),(NA|[0-9]+),[0-9]{1,2}" | tee -a keylog.csv
diff --git a/users/ericgebhart/miryoku_hd_gold_config.h b/users/ericgebhart/miryoku_hd_gold_config.h
new file mode 100644
index 0000000000..8b5d06da3a
--- /dev/null
+++ b/users/ericgebhart/miryoku_hd_gold_config.h
@@ -0,0 +1,325 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+/* This configuration creates a miryoku system with */
+/* Qwerty and Hands Down Gold. as base layers. */
+
+/* It also usess layers which are the same or very closely resemble */
+/* the layers of miryoku. These can be swapped out for other choices */
+/* as desired. */
+
+/* The language is set to EN, so KC_ keycodes are used.  */
+/* The oled is on, rgb is off, see below. */
+
+
+#ifndef USERSPACE_CONFIG_H
+#define USERSPACE_CONFIG_H
+
+// pro-micro v3's don't always detect otherwise.
+/* #define SPLIT_USB_DETECT */
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+// Sets good default for the speed of the mouse.
+#undef MOUSEKEY_INTERVAL
+#undef MOUSEKEY_DELAY
+#undef MOUSEKEY_TIME_TO_MAX
+#undef MOUSEKEY_MAX_SPEED
+
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          100
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+
+#undef MOUSEKEY_WHEEL_MAX_SPEED
+#undef MOUSEKEY_WHEEL_TIME_TO_MAX
+#undef MOUSEKEY_WHEEL_DELAY
+
+#define MOUSEKEY_WHEEL_MAX_SPEED    5
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  60
+#define MOUSEKEY_WHEEL_DELAY        100
+
+#undef TAPPING_TOGGLE
+#undef TAPPING_TERM
+#undef IGNORE_MOD_TAP_INTERRUPT
+
+#define TAPPING_TOGGLE  2
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT
+
+
+#define TAP_HOLD_TERM    200
+#define COMBO_MUST_HOLD_MODS
+#define COMBO_HOLD_TERM 150
+#define TAP_CODE_DELAY 5  // for send string with delay
+
+
+/* Control switches for my keymaps. */
+/* if needed, this goes in the keyboard's config.h */
+/* Alternately, fix the number row in the layout template. */
+/* #define BASE_NUMBER_ROW    // turn on 4 row base templates. */
+
+// Extensions, turn them on and off.
+#define USERSPACE_H "ericgebhart.h"
+
+// Layout definitions, which language, thumb cluster, mod layer.
+// Columns in and out.
+
+// the default. set it, use it, set it back.
+// US_INT // EN, BEPO, US_INT
+#define LANG_IS EN
+#define DEFAULT_LANG EN
+#define DEFAULT_LANG_NAME " en"
+
+// Enable a second locale, for another set of layers.
+// This will add bepo versions of all layers chosen.
+/* #define SECOND_LOCALE BEPO */
+/* #define SECOND_LOCALE_NAME " bepo" */
+
+// Choose a mod layer. Can be changed per layer.
+// TRNS, ALT, HRS_NAV HRM_GACS, HRM_SCAG, HRM_GASC, MIRYOKU_HRM_GASC
+#define MODS_ARE MIRYOKU_HRM_GACS
+#define DEFAULT_MODS MODS_ARE
+
+// Choose a thumb cluster.
+// WI, WIa, DEFAULT, TEST, TRNS, MODS, LAYERS, MODS_LAYERS,
+// MIRYOKU, MIRYOKU_TR, MODS_LAYERS_NAV,
+// The following use THUMB_LETTER to place a letter on the Thumbs.
+// for use with the hands down metals, maltron, and rsthd.
+// HD, HDA, HD_SIMPLE, TH_LTR, HD_DASH,
+// MIRYOKU_TR_LTR, MIRYOKU_LTR
+// MIRYOKU_TR_LTR_TAB, MIRYOKU_LTR_TAB
+#define THUMBS_ARE DEFAULT
+#define DEFAULT_THUMBS DEFAULT
+
+// pick the edge key set. normie, no kc, smart locks or test.
+// NORM, NOKC, SML, TEST
+#define EDGE_KEY_SET_IS SML
+#define DEFAULT_EDGE_SET SML
+
+// for the base layers which need a thumb cluster which takes a letter.
+#define HANDS_DOWN_LTR_THUMBS_ARE MIRYOKU_LTR_TAB
+#define MALTRON_LTR_THUMBS_ARE TH_LTR
+#define RSTHD_LTR_THUMBS_ARE TH_LTR
+
+// layout io, matrix size.
+// a reasonable default for most keyboards.
+// give a 3x10 and get a 3x12, managed in keyboards/keyboards.h
+#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+// OLED STUFF.
+#define OLED_CUSTOM_ENABLE // custom oled here.
+//#define OLED_LOGO_ENABLE // turn on/off the logo.
+//#define KEYLOGGER_ENABLE // 1500 bytes, track and print keypress info to oled.
+//#define SPLIT_LAYER_STATE_ENABLE  // to sync state between sides.
+
+// EXTENSIONS
+
+// Combos
+#define COMBO_REF_LAYER_ENABLE
+// #define COMBO_REF_LAYER_TWO_ENABLE
+// works if you know the number of your layer.
+// otherwise set and use them later.
+// #define COMBO_ONLY_FROM_LAYER 2
+// #define COMBO_REF_DEFAULT 2
+
+
+// Console key logging for creation of heatmaps, etc.
+// CONSOLE must be enabled for this to work.
+// To create Precondition's heat maps, from console key logging
+// with hid_listen or qmk console
+//#define CONSOLE_KEY_LOGGER_ENABLE  // turn on keylogging for heat maps.
+
+#define ALT_LOCAL_ENABLE // alternate key combinations, with mods as needed.
+//#define ACCENTED_KEYS_ENABLE // direct access to altgr keys.
+
+#define SMART_LOCK_ENABLE // smart lock layers and mods.
+//#define MOD_LOCK_ENABLE  // smart lock mods, similar/overlapping with Smart lock.
+#define NSHOT_ENABLE // smart n-shot for count.
+//#define ONESHOT_MOD_ENABLE  // oneshot mods, similar/overlapping with nshots
+
+#define CAPS_WORD_ENABLE // caps word. both shifts to caps a word.
+#define TAP_HOLD_ENABLE // tap for one thing, hold for tapping term to get another.
+//#define SWAPPER_ENABLE // enable swapper keys.
+#define NOT_DEAD_ENABLE // make undead versions (US_DQUO_ND) of dead keys.
+//#define ALT_SHIFT_ENABLE // alternate shift behaviors for existing keys.
+//#define SEND_STRING_ENABLE // Turn on send string keys
+//#define SEND_UNICODE_ENABLE // Unicode must be enabled for this to work.
+
+
+// Turn on the base layers do not exceed 4 if doing two locales.
+// That will likely push a layer past 15 and then it will
+// no longer work with the LT macro.
+
+// dvorak and relatives
+//#define DVORAK_LAYER_ENABLE
+//#define CAPEWELL_DVORAK_LAYER_ENABLE
+//#define AHEI_LAYER_ENABLE
+//#define BOO_LAYER_ENABLE
+
+// qwerty and derivitives
+#define QWERTY_LAYER_ENABLE
+//#define AZERTY_LAYER_ENABLE
+//#define WORKMAN_LAYER_ENABLE
+//#define NORMAN_LAYER_ENABLE
+
+// COLEMAK and relatives
+//#define COLEMAK_LAYER_ENABLE
+//#define COLEMAK_DH_LAYER_ENABLE
+//#define HALMAK_LAYER_ENABLE
+//#define MINIMAK_LAYER_ENABLE
+//#define MINIMAK_8_LAYER_ENABLE
+//#define MINIMAK_12_LAYER_ENABLE
+
+// BEAKL
+// #define BEAKL15_LAYER_ENABLE
+//#define BEAKL19_LAYER_ENABLE
+//#define BEAKL27_LAYER_ENABLE
+//#define BEAKLWI_LAYER_ENABLE
+
+// carpalx layouts
+//#define CARPALX_QFMLWY_LAYER_ENABLE
+//#define CARPALX_QGMLWB_LAYER_ENABLE
+//#define CARPALX_QGMLWY_LAYER_ENABLE
+
+// alternate layouts
+//#define MALTRON_LAYER_ENABLE
+//#define EUCALYN_LAYER_ENABLE
+//#define HANDS_UP_LAYER_ENABLE
+//#define RSTHD_LAYER_ENABLE
+//#define HANDS_UP_LAYER_ENABLE
+//#define WHITE_LAYER_ENABLE
+//#define ISRT_LAYER_ENABLE
+//#define SOUL_LAYER_ENABLE
+//#define NIRO_LAYER_ENABLE
+//#define ASSET_LAYER_ENABLE
+//#define WHORF_LAYER_ENABLE
+//#define WHORF6_LAYER_ENABLE
+
+// mtgap and relatives
+//#define MTGAP_LAYER_ENABLE
+//#define CTGAP_LAYER_ENABLE
+//#define APT_LAYER_ENABLE
+
+// Hands down
+//#define HD_NEU_NARROW_LAYER_ENABLE
+//#define HD_REF_LAYER_ENABLE
+//#define HD_DASH_LAYER_ENABLE
+//#define HD_ELAN_LAYER_ENABLE
+//#define HD_BRONZE_LAYER_ENABLE
+//#define HD_SILVER_LAYER_ENABLE
+//#define HD_PLATINUM_LAYER_ENABLE
+#define HD_GOLD_LAYER_ENABLE
+
+// 3x12 sized base layers
+//--------------------------
+//#define HD_NEU_LAYER_ENABLE
+
+// additionally all these have accent characters on base layer.
+//#define BEPO_LAYER_ENABLE
+//#define OPTIMOT_LAYER_ENABLE
+//#define BEAKL19bis_LAYER_ENABLE
+
+
+// enable transient function layers.
+#define SYMBOL_LAYER_ENABLE
+#define NAV_LAYER_ENABLE
+// #define MOUSE_LAYER_ENABLE
+//#define TOPROWS_LAYER_ENABLE
+// #define LAYERS_LAYER_ENABLE - defunct. always on.
+#define KEYPAD_LAYER_ENABLE
+//#define ADJUST_LAYER_ENABLE
+//#define RGB_LAYER_ENABLE
+#define MEDIA_LAYER_ENABLE
+#define FUNC_LAYER_ENABLE
+
+
+// define alternate thumb definitions for the transient layers.
+#define MEDIA_LAYER_THUMBS MEDIA_THUMBS
+#define MOUSE_LAYER_THUMBS MOUSE_THUMBS
+#define NAV_LAYER_THUMBS TRNS_THUMBS
+#define KEYPAD_LAYER_THUMBS KEYPAD_THUMBS
+#define SYMB_LAYER_THUMBS SYMB_THUMBS
+#define TOPROWS_LAYER_THUMBS DEFAULT
+
+// Extra character layers.
+// Bepo has dead keys (altgr) and accented keycodes
+// A layer of accented keys
+// #define ACCENTS_LAYER_ENABLE
+// A layer of dead keys
+// #define MORTE_LAYER_ENABLE
+// A layer of the most popular accented keys and dead keys
+// #define ACCENTS_MORTE_LAYER_ENABLE
+
+// Functional layer choices.
+/* configure the function layers. */
+/* They have to be turned on above. */
+/* Choose one of each as desired. */
+/* There are reasonable defaults */
+/* for each if nothing is defined. */
+
+/* nav */
+//#define NAV_FULL  // monolithic, two sided nav with mouse and arrows.
+//#define NAV_FULL_LOCK_MODS // Replace left mouse buttons with lockmods.
+
+// Just the non mouse bits, with lock mods, n-shot mods on the left.
+// if mousekeys enabled, adds a mouse layer accessible via smart lock.
+// #define NAV_NO_MOUSE
+#define NAV_MIRYOKU
+#define NAV_MOUSE_MIRYOKU
+
+
+/* keypads */
+// beakl keypads are usual, if not chosen, regular keypads will be used.
+// left side is the default.
+// Beakl, except for WI, is only on the left side.
+// Miryoku is on the left also.
+
+//#define KEYPAD_RIGHT
+//#define KEYPAD_BEAKL        // beakl doesn't have a rightside, swap hands?
+//#define KEYPAD_MODS      //  give mods on the other side instead of funcs.
+//#define KEYPAD_BEAKL_WI  //  right side with hexpad on left.
+#define KEYPAD_MIRYOKU   //  use the miryoku keypad
+// the default if nothing chosen,
+// is a functionpad on the left and normal keypad on the right.
+
+// funcpad from miryoku
+#define FUNCPAD_MIRYOKU
+
+
+/* symbols */
+// pick one of these or get the default.
+//#define SYMBOL_BEAKL         // original - the default if nothing else.
+//#define SYMBOL_BEAKL_EXT     // extended for non beakl base layers.
+//#define SYMBOL_BEAKL_EXT_VI  // extended with vi keybinding in mind.
+//#define SYMBOL_BEAKL_C         // more alterations by frequency
+// #define SYMBOL_NEO             // The symbol layer from the Neo layout.
+#define SYMBOL_MIRYOKU      // minimalist symbols after miryoku
+//#define SYMBOL_BEAKL_WI      // original wi
+
+
+/* toprows. */
+// The default, if not defined, is a standard qwerty set of rows.
+// symbols, numbers, function keys. Numbers on the home row.
+
+// #define TOPROWS_BKL_15_NUMS  // center row with Beakl15 order. 40123 76598.
+// #define TOPROWS_BKL_19_NUMS // Beakl 19 order: 32104  76598
+//#define TOPROWS_MOD  // beakl 15 nums, oneshot and smart lock mods. no Fkeys.
+
+
+#endif
diff --git a/users/ericgebhart/mod_layer.h b/users/ericgebhart/mod_layer.h
deleted file mode 100644
index a3c64b0bf7..0000000000
--- a/users/ericgebhart/mod_layer.h
+++ /dev/null
@@ -1,178 +0,0 @@
-#pragma once
-
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  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 our rows for the mod layer
-// takes 5 keycodes, adds mods, and left and right
-// so we get keycodes in groups of 6.
-// There are 3 sets of 4 rows.
-// 1 for normal 6 columns, qwerty, dvorak etc.
-// 1 for bepo/normal 6 columns, qwerty, dvorak etc. on bepo.
-// 1 for bepo 6 columns provided instead of a 5, for bepo which needs 3x12.
-// A 5 column keyboard would need another set of MACROS.
-
-// These macros are used in the layout wrapper macros to introduce a mod
-// layer.  HomeRow mods and other things like that go here.
-
-
-#include "core_keys.h"
-
-//number row.
-#define ROW0_LEFT(K01, K02, K03, K04, K05)      \
-  LEFT0, K01, K02, K03, K04, K05
-
-#define ROW0_RIGHT(K01, K02, K03, K04, K05)     \
-  K01, K02, K03, K04, K05, RIGHT0
-
-#define ROW1_LEFT(K01, K02, K03, K04, K05)      \
-  LEFT1, K01, K02, K03, LT(_NAV, K04), K05
-
-#define ROW1_RIGHT(K01, K02, K03, K04, K05)     \
-  K01, K02, K03, K04, K05, RIGHT1
-
-// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
-// using MT so we can specify left and right.
-// caps_word needs left and right shift.
-#define ROW2_LEFT(K01, K02, K03, K04, K05)                              \
-  LEFT2, MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
-
-#define ROW2_RIGHT(K01, K02, K03, K04, K05)                             \
-  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05), RIGHT2 \
-
-#define ROW3_LEFT(K01, K02, K03, K04, K05)                              \
-  LEFT3, K01, LT(_TOPROWS, K02), K03, LT(_SYMB, K04), K05
-
-#define ROW3_RIGHT(K01, K02, K03, K04, K05)                             \
-  K01, LT(_SYMB, K02), LT(_NAV, K03), LT(_TOPROWS, K04), K05, RIGHT3
-
-
-//-----------------------------------------------y
-// For a 5 column keyboard - no edges added.
-//number row.
-#define ROW0_LEFT5(K01, K02, K03, K04, K05)     \
-  K01, K02, K03, K04, K05
-
-#define ROW0_RIGHT5(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-
-#define ROW1_LEFT5(K01, K02, K03, K04, K05)             \
-  LT(_LAYERS, K01), K02, LT(_KEYPAD, K03), K04, K05
-
-#define ROW1_RIGHT5(K01, K02, K03, K04, K05)            \
-  K01, K02, LT(_KEYPAD, K03), K04, LT(_LAYERS, K05)
-
-// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
-// using MT so we can specify left and right.
-// caps_word needs left and right shift.
-#define ROW2_LEFT5(K01, K02, K03, K04, K05)                             \
-  MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
-
-#define ROW2_RIGHT5(K01, K02, K03, K04, K05)                            \
-  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05)
-
-#define ROW3_LEFT5(K01, K02, K03, K04, K05)                     \
-  K01, LT(_TOPROWS, K02), LT(_NAV, K03), LT(_SYMB, K04), K05
-
-#define ROW3_RIGHT5(K01, K02, K03, K04, K05)                    \
-  K01, LT(_SYMB, K02), LT(_NAV, K03), LT(_TOPROWS, K04), K05
-
-
-//--------------------------------------------
-//bepo
-#define ROW0_LEFT_BP(K01, K02, K03, K04, K05)   \
-  LEFT0_BP, K01, K02, K03, K04, K05
-
-#define ROW0_RIGHT_BP(K01, K02, K03, K04, K05)  \
-  K01, K02, K03, K04, K05, RIGHT0_BP
-
-#define ROW1_LEFT_BP(K01, K02, K03, K04, K05)           \
-  LEFT1_BP, K01, K02, K03, LT(_KEYPAD, K04), K05
-
-#define ROW1_RIGHT_BP(K01, K02, K03, K04, K05)          \
-  K01, K02, LT(_KEYPAD, K03), K04, K05, RIGHT1_BP
-
-#define ROW2_LEFT_BP(K01, K02, K03, K04, K05)                           \
-  LEFT2_BP, MT(MOD_RSFT, K01), MT(MOD_LALT,K02), MT(MOD_RCTL, K03), \
-    MT(MOD_LGUI, K04), K05
-
-#define ROW2_RIGHT_BP(K01, K02, K03, K04, K05)                   \
-  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), \
-    MT(MOD_RSFT, K05), RIGHT2_BP                                 \
-
-#define ROW3_LEFT_BP(K01, K02, K03, K04, K05)                           \
-  LEFT3_BP, K01, LT(_SYMB_BP, K02), LT(_NAV, K03), LT(_TOPROWS_BP, K04), K05
-
-#define ROW3_RIGHT_BP(K01, K02, K03, K04, K05)                          \
-  K01, LT(_SYMB_BP, K02), LT(_NAV, K03), LT(_TOPROWS_BP, K04), K05, RIGHT3_BP
-
-
-//-------------------------------------------------
-//bepo - 6 args, no left or right added.
-#define ROW0_LEFT_BP6(K01, K02, K03, K04, K05, K06)     \
-  K01, K02, K03, K04, K05, K06
-
-#define ROW0_RIGHT_BP6(K01, K02, K03, K04, K05, K06 )   \
-  K01, K02, K03, K04, K05, K06
-
-#define ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06)     \
-  K01, K02, K03, K04, K05, K06
-
-#define ROW1_RIGHT_BP6(K01, K02, K03, K04, K05, K06 )   \
-  K01, K02, K03, K04, K05, K06
-
-#define ROW2_LEFT_BP6(K01, K02, K03, K04, K05, K06)             \
-  K01, SFT_T(K02), ALT_T(K03), CTL_T(K04), GUI_T(K05), K06
-
-#define ROW2_RIGHT_BP6(K01, K02, K03, K04, K05, K06)            \
-  K01, GUI_T(K02), RCTL_T(K03), RALT_T(K04), RSFT_T(K05), K06
-
-#define ROW3_LEFT_BP6(K01, K02, K03, K04, K05, K06)     \
-  K01, K02, K03, K04, K05, K06
-
-#define ROW3_RIGHT_BP6(K01, K02, K03, K04, K05, K06 )   \
-  K01, K02, K03, K04, K05, K06
-
-
-//-------------------------------------------------
-// For a 5 column keyboard - no edges added.
-//number row.
-#define ROW0_LEFT5_BP(K01, K02, K03, K04, K05)  \
-  K01, K02, K03, K04, K05
-
-#define ROW0_RIGHT5_BP(K01, K02, K03, K04, K05) \
-  K01, K02, K03, K04, K05
-
-#define ROW1_LEFT5_BP(K01, K02, K03, K04, K05)          \
-  LT(_LAYERS, K01), K02, K03, LT(_KEYPAD_BP, K04), K05
-
-#define ROW1_RIGHT5_BP(K01, K02, K03, K04, K05)         \
-  K01, LT(_KEYPAD_BP, K02), K03, K04, K05
-
-// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
-// using MT so we can specify left and right.
-// caps_word needs left and right shift.
-#define ROW2_LEFT5_BP(K01, K02, K03, K04, K05)                          \
-  MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
-
-#define ROW2_RIGHT5_BP(K01, K02, K03, K04, K05)                         \
-  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05)
-
-#define ROW3_LEFT5_BP(K01, K02, K03, K04, K05)                  \
-  K01, LT(_TOPROWS_BP, K02), LT(_NAV, K03), LT(_SYMB_BP, K04), K05
-
-#define ROW3_RIGHT5_BP(K01, K02, K03, K04, K05)                         \
-  K01, LT(_SYMB_BP, K02), LT(_NAV, K03), LT(_TOPROWS_BP, K04), K05
diff --git a/users/ericgebhart/mod_layers/alt_mods.h b/users/ericgebhart/mod_layers/alt_mods.h
new file mode 100644
index 0000000000..db13ee041d
--- /dev/null
+++ b/users/ericgebhart/mod_layers/alt_mods.h
@@ -0,0 +1,129 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+//
+// non Home row mods, mod layer.
+
+// MOD_ROW variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// L_5  Left                 R_5 Right.
+// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
+// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW0L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW0L_6_alt(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_alt(K01, K02, K03, K04, K05, K06)       \
+  ROW0R_5_alt(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW0R_6_alt(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW1L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW1L_6_alt(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_alt(K01, K02, K03, K04, K05)                            \
+  K01, K02, K03, K04, K05                                               \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_alt(K01, K02, K03, K04, K05, K06)       \
+  ROW1R_5_alt(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW1R_6_alt(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+// HOME ROW - ROW2
+// LEFT.
+#define ROW2L_5_alt(K01, K02, K03, K04, K05)            \
+  K01, K02, LT(_NAV, K03), MT(MOD_LSFT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW2L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW2L_6_alt(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_alt(K01, K02, K03, K04, K05)                            \
+  K01, MT(MOD_LSFT, K02),  LT(_NAV, K03), K04, K05                      \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_alt(K01, K02, K03, K04, K05, K06)       \
+  ROW2R_5_alt(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW2R_6_alt(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_alt(K01, K02, K03, K04, K05)            \
+  K01, K02, LT(_NAV, K03), K04, MT(MOD_LSFT, K05)
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW3L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW3L_6_alt(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW3R_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW3R_6_alt(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gacs.h b/users/ericgebhart/mod_layers/hrm_gacs.h
new file mode 100644
index 0000000000..4bcf092732
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_gacs.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0L_6_hrm_gacs(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1L_6_hrm_gacs(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LSFT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2L_6_hrm_gacs(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RSFT, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RGUI, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_hrm_gacs(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3L_6_hrm_gacs(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h b/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h
new file mode 100644
index 0000000000..0238e9a567
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0L_6_miryoku_hrm_gacs(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1L_6_miryoku_hrm_gacs(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LSFT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2L_6_miryoku_hrm_gacs(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RSFT, K02),  MT(MOD_RCTL, K03), MT(MOD_LALT, K04), MT(MOD_RGUI, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, MT(MOD_RALT, K02), K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3L_6_miryoku_hrm_gacs(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, MT(MOD_RALT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gasc.h b/users/ericgebhart/mod_layers/hrm_gasc.h
new file mode 100644
index 0000000000..6eacb13ad6
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_gasc.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW0L_6_hrm_gasc(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_hrm_gasc(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW0R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW1L_6_hrm_gasc(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_hrm_gasc(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW1R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LSFT, K03), MT(MOD_LCTL, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW2L_6_hrm_gasc(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RCTL, K02),  MT(MOD_RSFT, K03), MT(MOD_RALT, K04), MT(MOD_RGUI, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_hrm_gasc(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW2R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW3L_6_hrm_gasc(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW3R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_sacg.h b/users/ericgebhart/mod_layers/hrm_sacg.h
new file mode 100644
index 0000000000..f4408f78fb
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_sacg.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW0L_6_hrm_sacg(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_hrm_sacg(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW0R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW1L_6_hrm_sacg(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_hrm_sacg(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW1R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW2L_6_hrm_sacg(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_hrm_sacg(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW2R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW3L_6_hrm_sacg(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW3R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrs_nav.h b/users/ericgebhart/mod_layers/hrs_nav.h
new file mode 100644
index 0000000000..3075a37768
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrs_nav.h
@@ -0,0 +1,126 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+//
+// shift on home row pinkies, nav on home row middle finger.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// L_5  Left                 R_5 Right.
+// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
+// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrs_nav(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW0L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW0L_6_hrs_nav(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrs_nav(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
+  ROW0R_5_hrs_nav(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW0R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrs_nav(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW1L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW1L_6_hrs_nav(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrs_nav(K01, K02, K03, K04, K05)                            \
+  K01, K02, K03, K04, K05                                               \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
+  ROW1R_5_hrs_nav(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW1R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+// HOME ROW - ROW2
+// LEFT.
+#define ROW2L_5_hrs_nav(K01, K02, K03, K04, K05)            \
+  MT(MOD_LSFT, K01), K02, LT(_NAV, K03), K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW2L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW2L_6_hrs_nav(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrs_nav(K01, K02, K03, K04, K05)                            \
+  K01, K02,  LT(_NAV, K03), K04, MT(MOD_LSFT, K05)                      \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
+  ROW2R_5_hrs_nav(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW2R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrs_nav(K01, K02, K03, K04, K05)        \
+  K01, K02, LT(_NAV, K03), K04, MT(MOD_LSFT, K05)
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01,     \
+    ROW3L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrs_nav(K01, K02, K03, K04, K05)      \
+  ROW3L_6_hrs_nav(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrs_nav(K01, K02, K03, K04, K05)        \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01,     \
+    ROW3R_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrs_nav(K01, K02, K03, K04, K05)      \
+  ROW3R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/mod_layer.h b/users/ericgebhart/mod_layers/mod_layer.h
new file mode 100644
index 0000000000..2345d30c5b
--- /dev/null
+++ b/users/ericgebhart/mod_layers/mod_layer.h
@@ -0,0 +1,155 @@
+#pragma once
+
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  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 our rows for the mod layer
+// takes 5 keycodes, adds mods, and left and right edge keys.
+// So we get keycodes in groups of 6.
+//
+// #define LANG_IS BEPO // to get Bepo substititions for keys and LTs.
+// #define NO_EDGE_COL  // for 5 column keyboards with no sixth column.
+//
+// wrap layers that have alternates for other locales with LANG_N
+// this will change the name, from _SYMB to _SYMB_BP as needed.
+//
+// Home Row mods and other things like that go here.
+
+#include "keycodes.h"
+#include "alt_mods.h"
+#include "hrm_sacg.h"
+#include "hrm_gacs.h"
+#include "hrm_gacs_miryoku.h"
+#include "hrm_gasc.h"
+#include "hrs_nav.h"
+#include "trns_mods.h"
+
+// redefined by the map as needed.
+//#base_cols_in_out 5_6 // 5, 5_6, 6
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+#define CONCATENATER(a, ...) a ## __VA_ARGS__
+#define CATR(a, ...) CONCATENATER(a, __VA_ARGS__)
+#define CONCATENATER2(a, ...) a ## __VA_ARGS__
+#define CATR2(a, ...) CONCATENATER2(a, __VA_ARGS__)
+#define CONCATENATER3(a, ...) a ## __VA_ARGS__
+#define CATR3(a, ...) CONCATENATER3(a, __VA_ARGS__)
+
+// mod layer name construction. add new layer extensions here.
+// TRNS, ALT, HRM_GACS, HRM_SCAG, HRM_GASC, MIRYOKU_HRM_GASC
+#define MOD_EXT CATR3(MODS_ARE, _MOD)
+#define TRNS_MOD _trns
+#define HRM_SCAG_MOD _hrm_scag
+#define HRM_GACS_MOD _hrm_gacs
+#define HRM_GASC_MOD _hrm_gasc
+#define MIRYOKU_HRM_GACS_MOD _miryoku_hrm_gacs
+#define ALT_MOD _alt
+#define HRS_NAV_MOD _hrs_nav
+
+// MOD_COL_NAME(ROW0L) -- > ROW0L_5, ROW0L_6, ROW0L_5_6
+#define MOD_COL_NAME(NAME) CATR2(CATR(NAME, _), BASE_COLS_IN_OUT)
+// MOD_ROW(ROW0L) -- > ROW0L_5_alt, ROW0L_6_alt, ROW0L_5_6_alt
+#define MOD_ROW(NAME) CATR3(MOD_COL_NAME(NAME), MOD_EXT)
+
+// change the columns in/out according to the map and the keyboard.
+//#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+
+// These make it easier to create base layer layouts.
+// They take 3x10, or 3x12 and make a 3x12 with mods.
+// this isnt always useful, sometimes rows need to be
+// specified explicitly in the layout. ie. layouts with
+// extra keys in the middle.
+
+
+#define MOD_CORE_3x5(                           \
+                     K01, K02, K03, K04, K05,   \
+                     K06, K07, K08, K09, K0A,   \
+                     K11, K12, K13, K14, K15,   \
+                     K16, K17, K18, K19, K1A,   \
+                     K21, K22, K23, K24, K25,   \
+                     K26, K27, K28, K29, K2A)   \
+  MOD_ROW(ROW1L)(K01, K02, K03, K04, K05),      \
+    MOD_ROW(ROW1R)(K06, K07, K08, K09, K0A),     \
+    MOD_ROW(ROW2L)(K11, K12, K13, K14, K15),     \
+    MOD_ROW(ROW2R)(K16, K17, K18, K19, K1A),     \
+    MOD_ROW(ROW3L)(K21, K22, K23, K24, K25),     \
+    MOD_ROW(ROW3R)(K26, K27, K28, K29, K2A)
+
+
+#define MOD_CORE_3x6(K01, K02, K03, K04, K05, K06,      \
+                     K07, K08, K09, K0A, K0B, K0C,      \
+                     K11, K12, K13, K14, K15, K16,      \
+                     K17, K18, K19, K1A, K1B, K1C,      \
+                     K21, K22, K23, K24, K25, K26,      \
+                     K27, K28, K29, K2A, K2B, K2C)      \
+  MOD_ROW(ROW1L)(K01, K02, K03, K04, K05, K06),         \
+    MOD_ROW(ROW1R)(K07, K08, K09, K0A, K0B, K0C),       \
+    MOD_ROW(ROW2L)(K11, K12, K13, K14, K15, K16),       \
+    MOD_ROW(ROW2R)(K17, K18, K19, K1A, K1B, K1C),       \
+    MOD_ROW(ROW3L)(K21, K22, K23, K24, K25, K26),       \
+    MOD_ROW(ROW3R)(K27, K28, K29, K2A, K2B, K2C)
+
+
+/// 4 rows for keyboards with number rows.
+#define MOD_CORE_4x5(                                   \
+                     K01, K02, K03, K04, K05,           \
+                     K06, K07, K08, K09, K0A,           \
+                     K11, K12, K13, K14, K15,           \
+                     K16, K17, K18, K19, K1A,           \
+                     K21, K22, K23, K24, K25,           \
+                     K26, K27, K28, K29, K2A,           \
+                     K31, K32, K33, K34, K35,           \
+                     K36, K37, K38, K39, K3A)           \
+  MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                              \
+    MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                            \
+    MOD_CORE_3x5(K11, K12, K13, K14, K15,                               \
+                 K16, K17, K18, K19, K1A,                               \
+                 K21, K22, K23, K24, K25,                               \
+                 K26, K27, K28, K29, K2A,                               \
+                 K31, K32, K33, K34, K35,                               \
+                 K36, K37, K38, K39, K3A)
+
+
+
+#define MOD_CORE_4x6(K01, K02, K03, K04, K05, K06,                      \
+                     K07, K08, K09, K0A, K0B, K0C,                      \
+                     K11, K12, K13, K14, K15, K16,                      \
+                     K17, K18, K19, K1A, K1B, K1C,                      \
+                     K21, K22, K23, K24, K25, K26,                      \
+                     K27, K28, K29, K2A, K2B, K2C,                      \
+                     K31, K32, K33, K34, K35, K36,                      \
+                     K37, K38, K39, K3A, K3B, K3C                       \
+                     )                                                  \
+    MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),                       \
+      MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),                     \
+      MOD_CORE_3x6(K11, K12, K13, K14, K15, K16,                        \
+                   K17, K18, K19, K1A, K1B, K1C,                        \
+                   K21, K22, K23, K24, K25, K26,                        \
+                   K27, K28, K29, K2A, K2B, K2C,                        \
+                   K31, K32, K33, K34, K35, K36,                        \
+                   K37, K38, K39, K3A, K3B, K3C)
diff --git a/users/ericgebhart/mod_layers/trns_mods.h b/users/ericgebhart/mod_layers/trns_mods.h
new file mode 100644
index 0000000000..06dfb06edd
--- /dev/null
+++ b/users/ericgebhart/mod_layers/trns_mods.h
@@ -0,0 +1,129 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+//
+// non Home row mods, mod layer.
+
+// MOD_ROW variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// L_5  Left                 R_5 Right.
+// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
+// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_trns(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_trns(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW0L_5_trns(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_trns(K01, K02, K03, K04, K05)          \
+  ROW0L_6_trns(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_trns(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_trns(K01, K02, K03, K04, K05, K06)       \
+  ROW0R_5_trns(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_trns(K01, K02, K03, K04, K05)          \
+  ROW0R_6_trns(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_trns(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_trns(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW1L_5_trns(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_trns(K01, K02, K03, K04, K05)          \
+  ROW1L_6_trns(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_trns(K01, K02, K03, K04, K05)                            \
+  K01, K02, K03, K04, K05                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_trns(K01, K02, K03, K04, K05, K06)       \
+  ROW1R_5_trns(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_trns(K01, K02, K03, K04, K05)          \
+  ROW1R_6_trns(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+// HOME ROW - ROW2
+// LEFT.
+#define ROW2L_5_trns(K01, K02, K03, K04, K05)            \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_trns(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW2L_5_trns(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_trns(K01, K02, K03, K04, K05)          \
+  ROW2L_6_trns(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_trns(K01, K02, K03, K04, K05)                            \
+  K01, K02,  K03, K04, K05                      \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_trns(K01, K02, K03, K04, K05, K06)       \
+  ROW2R_5_trns(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_trns(K01, K02, K03, K04, K05)          \
+  ROW2R_6_trns(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_trns(K01, K02, K03, K04, K05)           \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_trns(K01, K02, K03, K04, K05, K06)  K01,        \
+    ROW3L_5_trns(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_trns(K01, K02, K03, K04, K05)         \
+  ROW3L_6_trns(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_trns(K01, K02, K03, K04, K05)   \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_trns(K01, K02, K03, K04, K05, K06)  K01,        \
+    ROW3R_5_trns(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_trns(K01, K02, K03, K04, K05)         \
+  ROW3R_6_trns(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/oled/oled_cartes.c b/users/ericgebhart/oled/oled_cartes.c
new file mode 100644
index 0000000000..8ab88e969e
--- /dev/null
+++ b/users/ericgebhart/oled/oled_cartes.c
@@ -0,0 +1,325 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef OLED_CUSTOM_ENABLE
+
+#include "ericgebhart.h"
+
+void oled_render_layer_map(void) {
+  uint8_t lyr = get_highest_layer(layer_state);
+  if (lyr < _LAYERS) {
+    switch (get_highest_layer(default_layer_state)) {
+
+#ifdef QWERTY_LAYER_ENABLE
+      SHOW_MAP(_QWERTY)
+#endif
+
+#ifdef COLEMAK_DH_LAYER_ENABLE
+        SHOW_MAP(_COLEMAK_DH)
+#endif
+
+#ifdef COLEMAK_LAYER_ENABLE
+        SHOW_MAP(_COLEMAK)
+#endif
+#ifdef HALMAK_LAYER_ENABLE
+        SHOW_MAP(_HALMAK)
+#endif
+#ifdef MINIMAK_LAYER_ENABLE
+        SHOW_MAP(_MINIMAK)
+#endif
+#ifdef MINIMAK_8_LAYER_ENABLE
+        SHOW_MAP(_MINIMAK_8)
+#endif
+#ifdef MINIMAK_12_LAYER_ENABLE
+        SHOW_MAP(_MINIMAK_12)
+#endif
+
+#ifdef DVORAK_LAYER_ENABLE
+        SHOW_MAP(_DVORAK)
+#endif
+#ifdef DVORAK_RLC_IU_LAYER_ENABLE
+        SHOW_MAP(_DVORAK_RLC_IU)
+#endif
+#ifdef BOO_LAYER_ENABLE
+        SHOW_MAP(_BOO)
+#endif
+#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
+        SHOW_MAP(_CAPEWELL_DVORAK)
+#endif
+#ifdef AHEI_LAYER_ENABLE
+        SHOW_MAP(_AHEI)
+#endif
+
+#ifdef BEAKL27_LAYER_ENABLE
+        SHOW_MAP(_BEAKL27)
+#endif
+
+#ifdef BEAKL15_LAYER_ENABLE
+        SHOW_MAP(_BEAKL15)
+#endif
+
+#ifdef BEAKL19_LAYER_ENABLE
+        SHOW_MAP(_BEAKL19)
+#endif
+
+#ifdef BEAKLWI_LAYER_ENABLE
+        SHOW_MAP(_BEAKLWI)
+#endif
+
+#ifdef CARPALX_QFMLWY_LAYER_ENABLE
+        SHOW_MAP(_CARPALX_QFMLWY)
+#endif
+
+#ifdef CARPALX_QGMLWB_LAYER_ENABLE
+        SHOW_MAP(_CARPALX_QGMLWB)
+#endif
+
+#ifdef CARPALX_QGMLWY_LAYER_ENABLE
+        SHOW_MAP(_CARPALX_QGMLWY)
+#endif
+
+#ifdef MTGAP_LAYER_ENABLE
+        SHOW_MAP(_MTGAP)
+#endif
+
+#ifdef CTGAP_LAYER_ENABLE
+        SHOW_MAP(_CTGAP)
+#endif
+
+#ifdef APT_LAYER_ENABLE
+        SHOW_MAP(_APT)
+#endif
+
+#ifdef CANARY_LAYER_ENABLE
+        SHOW_MAP(_CANARY)
+#endif
+
+
+#ifdef HD_NEU_LAYER_ENABLE
+        SHOW_MAP(_HD_NEU)
+#endif
+
+#ifdef HD_NEU_NARROW_LAYER_ENABLE
+        SHOW_MAP(_HD_NEU_NARROW)
+#endif
+
+#ifdef HD_TITANIUM_LAYER_ENABLE
+        SHOW_MAP(_HD_TITANIUM)
+#endif
+
+#ifdef HD_GOLD_LAYER_ENABLE
+        SHOW_MAP(_HD_GOLD)
+#endif
+
+#ifdef HD_PLATINUM_LAYER_ENABLE
+        SHOW_MAP(_HD_PLATINUM)
+#endif
+
+#ifdef HD_SILVER_LAYER_ENABLE
+        SHOW_MAP(_HD_SILVER)
+#endif
+
+#ifdef HD_BRONZE_LAYER_ENABLE
+        SHOW_MAP(_HD_BRONZE)
+#endif
+
+#ifdef HD_ELAN_LAYER_ENABLE
+        SHOW_MAP(_HD_ELAN)
+#endif
+
+#ifdef HD_DASH_LAYER_ENABLE
+        SHOW_MAP(_HD_DASH)
+#endif
+
+#ifdef HD_REF_LAYER_ENABLE
+        SHOW_MAP(_HD_REF)
+#endif
+
+#ifdef RSTHD_LAYER_ENABLE
+        SHOW_MAP(_RSTHD)
+#endif
+
+#ifdef HANDS_UP_LAYER_ENABLE
+        SHOW_MAP(_HANDS_UP)
+#endif
+#ifdef WHITE_LAYER_ENABLE
+        SHOW_MAP(_WHITE)
+#endif
+#ifdef ISRT_LAYER_ENABLE
+        SHOW_MAP(_ISRT)
+#endif
+#ifdef SOUL_LAYER_ENABLE
+        SHOW_MAP(_SOUL)
+#endif
+#ifdef NIRO_LAYER_ENABLE
+        SHOW_MAP(_NIRO)
+#endif
+#ifdef ASSET_LAYER_ENABLE
+        SHOW_MAP(_ASSET)
+#endif
+#ifdef WHORF_LAYER_ENABLE
+        SHOW_MAP(_WHORF)
+#endif
+#ifdef WHORF6_LAYER_ENABLE
+        SHOW_MAP(_WHORF6)
+#endif
+
+#ifdef BEPO_LAYER_ENABLE
+        SHOW_MAP(_BEPO)
+#endif
+
+#ifdef OPTIMOT_LAYER_ENABLE
+        SHOW_MAP(_OPTIMOT)
+#endif
+
+#ifdef OPTIMOT_COMPACT_LAYER_ENABLE
+        SHOW_MAP(_OPTIMOT_COMPACT)
+#endif
+
+#ifdef BEAKL19bis_LAYER_ENABLE
+        SHOW_MAP(_BEAKL19bis)
+#endif
+
+        }
+
+  } else {
+
+    switch (lyr) {
+#ifdef TOPROWS_LAYER_ENABLE
+      LCASE(_TOPROWS)
+#  ifdef TOPROWS_BKL_NUMS
+#    ifdef TOPROWS_MOD
+        CARTE_TOPROWS_MOD
+#    else
+#      ifdef TOPROWS_BKL_19_NUMS
+        CARTE_TOPROWS_BKL19
+#      else
+        CARTE_TOPROWS
+#      endif
+#    endif
+#  else // not beakl nums.
+        CARTE_RAISE
+#  endif
+        break;
+#endif
+
+
+    case _NAV:
+#ifdef NAV_FULL_LOCK_MODS
+      CARTE_NAVA
+#endif
+#ifdef NAV_FULL
+        CARTE_NAV
+#endif
+#ifdef NAV_NO_MOUSE
+        CARTE_NAVnm
+#endif
+#ifdef NAV_MIRYOKU
+        CARTE_NAV_miryoku
+#endif
+    break;
+
+#ifdef MOUSE_LAYER_ENABLE
+    case _NAVm:
+#  ifdef NAV_MOUSE_MIRYOKU
+        CARTE_NAVm_miryoku
+#  else
+      CARTE_NAVm
+#  endif
+      break;
+#endif
+
+#ifdef MEDIA_LAYER_ENABLE
+          SHOW_MAP_S(_MEDIA)
+#endif
+          SHOW_MAP_S(_LAYERS)
+
+#ifdef SYMBOL_LAYER_ENABLE
+            LCASE(_SYMB)
+#  ifdef SYMBOL_BEAKL
+            CARTE_SYMB_BEAKL
+#  endif
+#  ifdef SYMBOL_BEAKL_EXT
+            CARTE_SYMB_BEAKLA
+#  endif
+#  ifdef SYMBOL_BEAKL_EXT_VI
+            CARTE_SYMB_BEAKLB
+#  endif
+#  ifdef SYMBOL_BEAKL_C
+            CARTE_SYMB_BEAKLC
+#  endif
+#  ifdef SYMBOL_MIRYOKU
+            CARTE_SYMB_MIRYOKU
+#  endif
+#  ifdef SYMBOL_BEAKL_WI
+            CARTE_SYMB_BEAKL_WI
+#  endif
+#  ifdef SYMBOL_BEAKL_WI
+            CARTE_SYMB_NEO
+#  endif
+            break;
+#endif
+
+#ifdef KEYAD_LAYER_ENABLE
+          LCASE(_KEYPAD)
+#ifdef KEYPAD_BEAKL
+#ifdef KEYPAD_BEAKL_WI
+      CARTE_KP_BKL_WI
+#endif
+#ifdef KEYPAD_MODS
+        CARTE_KP_BKL_MODS
+#endif
+#if !defined(KEYPAD_MODS) && !defined(KEYPAD_BEAKL_WI)
+        CARTE_KP_BKL_FUNC
+#endif
+#ifdef KEYPAD_MIRYOKU
+        CARTE_KP_MIRYOKU
+#endif
+
+#else // not beakl.
+#ifdef KEYPAD_RIGHT
+#ifdef KEYPAD_MODS
+        CARTE_MODS_KP
+#else
+        CARTE_FP_KP
+#endif
+
+#else // not keypad right.
+#ifdef KEYPAD_MODS
+        CARTE_KP_MODS
+#else
+        CARTE_KP_FP  // the final default.
+#endif
+#endif // end not keypad right.
+#endif // end not beakl
+        break;
+#endif // end keypad.
+
+#ifdef MORTE_LAYER_ENABLE
+         SHOW_MAP(_MORTE)
+#endif
+
+#ifdef ACCENTS_MORTE_LAYER_ENABLE
+         SHOW_MAP(_ACCENTS_MORTE)
+#endif
+
+#ifdef ACCENTS_LAYER_ENABLE
+         SHOW_MAP(_CARTE_ACCENTS)
+#endif
+          }
+  }
+}
+#endif
diff --git a/users/ericgebhart/oled/oled_layers.c b/users/ericgebhart/oled/oled_layers.c
new file mode 100644
index 0000000000..57424d1d6c
--- /dev/null
+++ b/users/ericgebhart/oled/oled_layers.c
@@ -0,0 +1,252 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ericgebhart.h"
+#include <stdio.h>
+
+#ifdef OLED_CUSTOM_ENABLE
+
+void oled_render_default_layer_state(void) {
+  //oled_write_P(PSTR("Layout: "), false);
+  uint16_t layer = get_highest_layer(default_layer_state);
+  char layer_str[8];
+  snprintf(layer_str, sizeof(layer_str), "%u ",layer);
+  oled_write(layer_str , false);
+  switch (layer) {
+#ifdef DVORAK_LAYER_ENABLE
+    WRITE_STR_LAYER(_DVORAK, "Dvorak")
+#endif
+#ifdef DVORAK_RLC_IU_LAYER_ENABLE
+      WRITE_STR_LAYER(_DVORAK_RLC_IU_, "Dvorak-rlc")
+#endif
+#ifdef BOO_LAYER_ENABLE
+      WRITE_STR_LAYER(_BOO, "Boo")
+#endif
+#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
+      WRITE_STR_LAYER(_CAPEWELL_DVORAK, "Capewell Dvorak")
+#endif
+#ifdef AHEI_LAYER_ENABLE
+      WRITE_STR_LAYER(_AHEI, "Ahei")
+#endif
+
+#ifdef QWERTY_LAYER_ENABLE
+      WRITE_STR_LAYER(_QWERTY, "Qwerty")
+#endif
+#ifdef WORKMAN_LAYER_ENABLE
+      WRITE_STR_LAYER(_WORKMAN, "Workman")
+#endif
+#ifdef NORMAN_LAYER_ENABLE
+      WRITE_STR_LAYER(_NORMAN, "Norman")
+#endif
+
+#ifdef COLEMAK_LAYER_ENABLE
+      WRITE_STR_LAYER(_COLEMAK, "Colemak")
+#endif
+#ifdef COLEMAK_DH_LAYER_ENABLE
+      WRITE_STR_LAYER(_COLEMAK_DH, "Colemak")
+#endif
+#ifdef HALMAK_LAYER_ENABLE
+      WRITE_STR_LAYER(_HALMAK, "Halmak")
+#endif
+#ifdef MINIMAK_LAYER_ENABLE
+      WRITE_STR_LAYER(_MINIMAK, "Minimak")
+#endif
+#ifdef MINIMAK_8_LAYER_ENABLE
+      WRITE_STR_LAYER(_MINIMAK_8, "Minimak 8")
+#endif
+#ifdef MINIMAK_12_LAYER_ENABLE
+      WRITE_STR_LAYER(_MINIMAK_12, "Minimak 12")
+#endif
+
+#ifdef BEAKL15_LAYER_ENABLE
+      WRITE_STR_LAYER(_BEAKL15, "Beakl")
+#endif
+#ifdef BEAKL19_LAYER_ENABLE
+      WRITE_STR_LAYER(_BEAKL19, "Beakl19")
+#endif
+#ifdef BEAKL27_LAYER_ENABLE
+      WRITE_STR_LAYER(_BEAKL27, "Beakl27")
+#endif
+#ifdef BEAKLWI_LAYER_ENABLE
+      WRITE_STR_LAYER(_BEAKLWI, "BeaklWi")
+#endif
+
+#ifdef CARPALX_QFMLWY_LAYER_ENABLE
+      WRITE_STR_LAYER(_CARPALX_QFMLWY, "Carpalx qfmlwy")
+#endif
+
+#ifdef CARPALX_QGMLWB_LAYER_ENABLE
+      WRITE_STR_LAYER(_CARPALX_QGMLWB, "Carpalx qgmlwb")
+#endif
+
+#ifdef CARPALX_QGMLWY_LAYER_ENABLE
+      WRITE_STR_LAYER(_CARPALX_QGMLWY, "Carpalx qgmlwy")
+#endif
+
+#ifdef HD_NEU_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_NEU, "HD Neu")
+#endif
+#ifdef HD_NEU_NARROW_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_NEU_NARROW, "HD Neu N")
+#endif
+#ifdef HD_TITANIUM_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_TITANIUM, "HD Titanium")
+#endif
+#ifdef HD_GOLD_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_GOLD, "HD Gold")
+#endif
+#ifdef HD_SILVER_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_SILVER, "HD Silver")
+#endif
+#ifdef HD_PLATINUM_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_PLATINUM, "HD Platinum")
+#endif
+#ifdef HD_BRONZE_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_BRONZE, "HD Bronze")
+#endif
+#ifdef HD_ELAN_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_ELAN, "HD Elan")
+#endif
+#ifdef HD_DASH_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_DASH, "HD Dash")
+#endif
+#ifdef HD_REF_LAYER_ENABLE
+      WRITE_STR_LAYER(_HD_REF, "HD Ref")
+#endif
+
+#ifdef MTGAP_LAYER_ENABLE
+      WRITE_STR_LAYER(_MTGAP, "Mtgap")
+#endif
+#ifdef CTGAP_LAYER_ENABLE
+      WRITE_STR_LAYER(_CTGAP, "Ctgap")
+#endif
+#ifdef APT_LAYER_ENABLE
+      WRITE_STR_LAYER(_APT, "Apt")
+#endif
+#ifdef CANARY_LAYER_ENABLE
+      WRITE_STR_LAYER(_CANARY, "Canary")
+#endif
+
+#ifdef MALTRON_LAYER_ENABLE
+      WRITE_STR_LAYER(_MALTRON, "Maltron")
+#endif
+#ifdef EUCALYN_LAYER_ENABLE
+      WRITE_STR_LAYER(_EUCALYN, "Eucalyn")
+#endif
+#ifdef RSTHD_LAYER_ENABLE
+      WRITE_STR_LAYER(_RSTHD, "Rsthd")
+#endif
+#ifdef HAND_UP_LAYER_ENABLE
+      WRITE_STR_LAYER(_HANDS_UP, "Hands up")
+#endif
+#ifdef WHITE_LAYER_ENABLE
+      WRITE_STR_LAYER(_WHITE, "White")
+#endif
+#ifdef ISRT_LAYER_ENABLE
+      WRITE_STR_LAYER(_ISRT, "Isrt")
+#endif
+#ifdef SOUL_LAYER_ENABLE
+      WRITE_STR_LAYER(_SOUL, "Soul")
+#endif
+#ifdef NIRO_LAYER_ENABLE
+      WRITE_STR_LAYER(_NIRO, "Niro")
+#endif
+#ifdef ASSET_LAYER_ENABLE
+      WRITE_STR_LAYER(_ASSET, "Asset")
+#endif
+#ifdef WHORF_LAYER_ENABLE
+      WRITE_STR_LAYER(_WHORF, "Whorf")
+#endif
+#ifdef WHORF6_LAYER_ENABLE
+      WRITE_STR_LAYER(_WHORF6, "Whorf 6")
+#endif
+
+#ifdef OPTIMOT_LAYER_ENABLE
+      WRITE_STR_LAYER(_OPTIMOT, "Optimot")
+#endif
+#ifdef OPTIMOT_COMPACT_LAYER_ENABLE
+      WRITE_STR_LAYER(_OPTIMOT_COMPACT, "Optimot")
+#endif
+#ifdef BEAKL19bis_LAYER_ENABLE
+      WRITE_STR_LAYER(_BEAKL19bis, "Beakl19bis")
+#endif
+#ifdef BEPO_LAYER_ENABLE  // Bepo only works on bepo.
+      WRITE_STR_LAYER(_BEPO, "Bepo")
+#endif
+      }
+}
+
+void oled_render_layer_state(void) {
+  uint16_t layer = get_highest_layer(layer_state);
+  char layer_str[8];
+  snprintf(layer_str, sizeof(layer_str), "%u ",layer);
+  oled_write_P(PSTR(""), false);
+  if (layer > 0)
+    oled_write(layer_str , false);
+
+  switch (layer) {
+    // language variant layers.
+#ifdef TOPROWS_LAYER_ENABLE
+    WRITE_STR_LAYER(_TOPROWS, "TopRows");
+#endif
+
+#ifdef SYMBOL_LAYER_ENABLE
+    WRITE_STR_LAYER(_SYMB, "Symbols");
+#endif
+
+#ifdef KEYPAD_LAYER_ENABLE
+    WRITE_STR_LAYER(_KEYPAD, "Keypad");
+#endif
+
+    // single case, BP or no suffix.
+#ifdef ACCENTS_MORTE_LAYER_ENABLE
+    WRITE_STR_LAYER(_ACCENTS_MORTE, "Accents Morte");
+#endif
+#ifdef ACCENTS_LAYER_ENABLE
+    WRITE_STR_LAYER(_ACCENTS, "Accents");
+#endif
+#ifdef MORTE_LAYER_ENABLE
+    WRITE_STR_LAYER(_MORTE, "Morte");
+#endif
+
+
+    // language agnostic layers.
+#ifdef NAV_LAYER_ENABLE
+    WRITE_STR_CASE(_NAV, "Navigation");
+    WRITE_STR_CASE(_NAVm, "Mouse");
+#endif
+#ifdef MEDIA_LAYER_ENABLE
+    WRITE_STR_CASE(_MEDIA, "Media");
+#endif
+#ifdef FUNC_LAYER_ENABLE
+    WRITE_STR_CASE(_FUN, "Func");
+#endif
+
+    WRITE_STR_CASE(_LAYERS, "Layers");
+
+#ifdef RGB_LAYER_ENABLE
+    WRITE_STR_CASE(_RGB, "RGB");
+#endif
+#ifdef ADJUST_LAYER_ENABLE
+    WRITE_STR_CASE(_ADJUST, "Adjust");
+#endif
+#ifdef COMBO_REF_LAYER_ENABLE
+    WRITE_STR_CASE(_COMBO_REF, "COMBO Ref");
+#endif
+
+  }
+}
+#endif
diff --git a/users/ericgebhart/oled/oled_stuff.c b/users/ericgebhart/oled/oled_stuff.c
new file mode 100755
index 0000000000..a73b5b174d
--- /dev/null
+++ b/users/ericgebhart/oled/oled_stuff.c
@@ -0,0 +1,192 @@
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ericgebhart.h"
+#include <string.h>
+#include <stdio.h>
+
+#ifdef OLED_CUSTOM_ENABLE
+
+extern uint32_t current_locale;
+
+void oled_render_locale(void) {
+  // oled_write_P(PSTR("Layout: "), false);
+  switch (current_locale) {
+    WRITE_STR_CASE(LOCALE_DEFAULT, DEFAULT_LANG_NAME)
+#ifdef SECOND_LOCALE
+      WRITE_STR_CASE(LOCALE_TWO, SECOND_LOCALE_NAME)
+#endif
+    }
+}
+
+void oled_render_keylock_status(uint8_t led_usb_state) {
+  oled_write_P(PSTR(" Lock:"), false);
+  oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
+  oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
+  oled_write_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+}
+
+void oled_render_mod_status(uint8_t modifiers) {
+  oled_write_P(PSTR("Mods:"), false);
+  oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
+  oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL));
+  oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT));
+  oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI));
+}
+
+void oled_render_mod_lock_status(){
+  oled_render_mod_status(get_mods() | get_oneshot_mods());
+  oled_render_keylock_status(host_keyboard_leds());
+}
+
+
+#ifdef KEYLOGGER_ENABLE
+char mkeylog_str[22] = {};
+
+const char mcode_to_name[60] = {
+  ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+  'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+  'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+  '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+  'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+  '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+
+void oled_render_keylog(void) {
+  oled_write_ln(mkeylog_str, false);
+}
+
+
+void add_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+      (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
+    keycode = keycode & 0xFF;
+  }
+  if (keycode < 60) {
+    name = mcode_to_name[keycode];
+  }
+
+  // update keylog
+  memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1);
+  snprintf(mkeylog_str, sizeof(mkeylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
+}
+#endif
+
+__attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; }
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+
+  // for the big screen.
+#ifdef OLED_DISPLAY_128X64
+  return OLED_ROTATION_180;
+#endif
+  // rotate the slave side of the corne to be bottom side in.
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;
+  }
+
+  return oled_init_keymap(rotation);
+}
+
+/* oled_rotation_t oled_init_user(oled_rotation_t rotation) { */
+/* memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1); */
+/*   if (is_keyboard_master()) { */
+/*     return OLED_ROTATION_270; */
+/*   } else { */
+/*     return OLED_ROTATION_180; */
+/*   } */
+/* } */
+
+
+void render_bootmagic_status(bool status) {
+  /* Show Ctrl-Gui Swap options */
+  static const char PROGMEM logo[][2][3] = {
+    {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+    {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+  };
+  if (status) {
+    oled_write_ln_P(logo[0][0], false);
+    oled_write_ln_P(logo[0][1], false);
+  } else {
+    oled_write_ln_P(logo[1][0], false);
+    oled_write_ln_P(logo[1][1], false);
+  }
+}
+
+
+__attribute__((weak)) void oled_render_logo(void) {
+  // clang-format off
+  static const char PROGMEM qmk_logo[] = {
+    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+  // clang-format on
+  oled_write_P(qmk_logo, false);
+}
+
+
+bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
+#ifdef KEYLOGGER_ENABLE
+  if (record->event.pressed) {
+    //oled_timer = timer_read32();
+    add_keylog(keycode, record);
+    //add_keylog(keycode);
+  }
+#endif
+  return true;
+}
+
+bool oled_task_user(void) {
+  //oled_clear();
+  if (is_keyboard_master()) {
+    oled_render_mod_lock_status();
+    oled_advance_page(false);
+    oled_render_default_layer_state();
+    oled_render_locale();
+    oled_write_ln_P(PSTR(" "), false);
+    oled_render_layer_state();
+    oled_write_ln_P(PSTR(" "), false);
+#ifdef OLED_DISPLAY_128X64
+    oled_render_layer_map();
+#endif
+#ifdef KEYLOGGER_ENABLE
+    oled_render_keylog();
+#endif
+
+  // slave side display.
+  } else {
+    oled_clear();
+#ifdef OLED_LOGO_ENABLE
+    oled_render_logo();
+#endif
+    oled_render_default_layer_state();
+    oled_render_locale();
+    oled_write_ln_P(PSTR(" "), false);
+#ifdef SPLIT_LAYER_STATE_ENABLE
+    oled_render_layer_state();
+    oled_render_layer_map();
+#endif
+  }
+  return(false);
+
+}
+#endif
+
+/* oled_render_keylock_status(host_keyboard_leds()); */
+/* oled_render_mod_status(get_mods() | get_oneshot_mods()); */
diff --git a/users/ericgebhart/oled/oled_stuff.h b/users/ericgebhart/oled/oled_stuff.h
new file mode 100755
index 0000000000..7824ec7d84
--- /dev/null
+++ b/users/ericgebhart/oled/oled_stuff.h
@@ -0,0 +1,61 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef OLED_CUSTOM_ENABLE
+
+#include "quantum.h"
+//#include "oled_driver.h"
+
+void oled_render_mod_lock_status(void);
+void oled_driver_render_logo(void);
+bool process_record_user_oled(uint16_t keycode, keyrecord_t *record);
+void oled_render_layer_map(void);
+void oled_render_default_layer_state(void);
+void oled_render_layer_state(void);
+
+#define WRITE_STR_CASE(CASE, STRING)            \
+  case CASE:                                    \
+  oled_write_P(PSTR(STRING), false);            \
+  break;                                        \
+
+// kinda hacky for the moment.
+// assume bepo is enabled.
+#define WRITE_STR_LAYER(CASE, STRING)           \
+  LCASE(CASE)                                   \
+    oled_write_P(PSTR(STRING), false);          \
+  break;
+
+// make maps for the oled. code doc.
+#define carte_de_map(ROW1, ROW2, ROW3)          \
+  oled_write_ln_P(PSTR(ROW1), false);           \
+  oled_write_ln_P(PSTR(ROW2), false);           \
+  oled_write_ln_P(PSTR(ROW3), false);
+
+// generate Case for all locales for this map.
+#define SHOW_MAP(LAYER)                         \
+  LCASE(LAYER)                                  \
+    CAT(CARTE, LAYER)                           \
+    break;
+
+// a single case, for single locale layers.
+#define SHOW_MAP_S(LAYER)                       \
+  case LAYER:                                   \
+  CAT(CARTE, LAYER)                             \
+  break;
+
+#endif
diff --git a/users/ericgebhart/oled_stuff.c b/users/ericgebhart/oled_stuff.c
deleted file mode 100755
index 99a752ec2f..0000000000
--- a/users/ericgebhart/oled_stuff.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ericgebhart.h"
-#include <string.h>
-#include <stdio.h>
-
-void oled_render_default_layer_state(void) {
-  oled_write_P(PSTR("Layout: "), false);
-  switch (get_highest_layer(default_layer_state)) {
-    case _QWERTY:
-      oled_write_ln_P(PSTR("Qwerty"), false);
-      break;
-    case _COLEMAK:
-      oled_write_ln_P(PSTR("Colemak"), false);
-      break;
-    case _DVORAK_BP:
-    case _DVORAK:
-      oled_write_ln_P(PSTR("Dvorak"), false);
-      break;
-
-
-      /* case _WORKMAN: */
-      // oled_write_ln_P(PSTR("Workman\n"), false);
-      /*         break; */
-      /*     case _NORMAN: */
-      // oled_write_ln_P(PSTR("Norman\n"), false);
-      /*         break; */
-      /*     case _MALTRON: */
-      // oled_write_ln_P(PSTR("Maltron\n"), false);
-      /*         break; */
-
-      /* case _EUCALYN: */
-      // oled_write_ln_P(PSTR("Eucalyn\n"), false);
-      /*   break; */
-      /* case _CARPLAX: */
-      // oled_write_ln_P(PSTR("Carplax\n"), false);
-      /*   break; */
-
-    case _BEAKL:
-    case _BEAKL_BP:
-      oled_write_ln_P(PSTR("Beakl"), false);
-      break;
-    case _BEPO:
-      oled_write_ln_P(PSTR("Bepo"), false);
-      break;
-    }
-}
-
-void oled_render_layer_state(void) {
-  oled_write_P(PSTR("Layer: "), false);
-  switch (get_highest_layer(layer_state)) {
-    case _NAV:
-      oled_write_P(PSTR("Navigation"), false);
-      break;
-    case _LAYERS:
-      oled_write_P(PSTR("Layers"), false);
-      break;
-    case _RGB:
-      oled_write_P(PSTR("RGB"), false);
-      break;
-    case _TOPROWS:
-    case _TOPROWS_BP:
-      oled_write_P(PSTR("TopRows"), false);
-      break;
-    case _SYMB:
-    case _SYMB_BP:
-      oled_write_P(PSTR("Symbols"), false);
-      break;
-    case _KEYPAD:
-    case _KEYPAD_BP:
-      oled_write_P(PSTR("Keypad"), false);
-      break;
-    case _ADJUST:
-      oled_write_P(PSTR("Adjust"), false);
-      break;
-    }
-  oled_write_ln_P(PSTR(" "), false);
-}
-
-// this is part of my answer to a challenge.
-// My friend Ross thinks that the only use of an oled
-// is to say which layer.
-// I think there is more. this is just a beginning.
-void oled_render_layer_map(void) {
-  uint8_t lyr = get_highest_layer(layer_state);
-  if (lyr <= _BEPO) {
-    switch (get_highest_layer(default_layer_state)) {
-    case _QWERTY:
-      oled_write_ln_P(PSTR("   qwert  yuiop"), false);
-      oled_write_ln_P(PSTR("   asdfg  hjkl;"), false);
-      oled_write_ln_P(PSTR("   zxcvb  nm,./"), false);
-      break;
-    case _COLEMAK:
-      oled_write_ln_P(PSTR("   qwfpb  jluy;"), false);
-      oled_write_ln_P(PSTR("   arstg  mneio"), false);
-      oled_write_ln_P(PSTR("   zxcdv  kh,./"), false);
-      break;
-    case _DVORAK_BP:
-    case _DVORAK:
-      oled_write_ln_P(PSTR("   \",.py  fgcrl"), false);
-      oled_write_ln_P(PSTR("   aoeui  dhtns"), false);
-      oled_write_ln_P(PSTR("   ;qjkx  bmwvz "), false);
-      break;
-
-    case _BEAKL:
-    case _BEAKL_BP:
-      oled_write_ln_P(PSTR("   qhoux  gcrfz"), false);
-      oled_write_ln_P(PSTR("   yiea.  dstnb"), false);
-      oled_write_ln_P(PSTR("   j/,k'  wmlpv"), false);
-      break;
-
-    case _BEPO:
-      oled_write_P(PSTR("   cbe'po`e  vdljz %"), false);
-      oled_write_P(PSTR("    auie,    tsrnmc"), false);
-      oled_write_P(PSTR("   e^a'yx.k  'qghfw"), false);
-      break;
-    }
-
-  } else {
-
-    switch (lyr) {
-    case _TOPROWS:
-    case _TOPROWS_BP:
-      oled_write_ln_P(PSTR("   !@#$%  ^&*()"), false);
-      oled_write_ln_P(PSTR("   40123  76598"), false);
-      oled_write_ln_P(PSTR(" F1-    --    -F12"), false);
-      break;
-
-    case _SYMB:
-    case _SYMB_BP:
-      oled_write_ln_P(PSTR("   `<$>'  ?[_]-"), false);
-      oled_write_ln_P(PSTR("  -\\(\")#  !{:}/;"), false);
-      oled_write_ln_P(PSTR("   @=*+;  %&^~|"), false);
-      break;
-
-    case _NAV:
-      oled_write_ln_P(PSTR("54321 0  ctn 12345"), false);
-      oled_write_ln_P(PSTR(" ldur 1  ccv ldur"), false);
-      oled_write_ln_P(PSTR(" ldur 2  cwq hdue"), false);
-      break;
-
-    case _KEYPAD:
-      oled_write_ln_P(PSTR("     523:   F9-F12"), false);
-      oled_write_ln_P(PSTR("   -7.104   F5-F8"), false);
-      oled_write_ln_P(PSTR("    /698,   F1-F4"), false);
-      break;
-
-    case _LAYERS:
-      oled_write_ln_P(PSTR("  Bp Dv Bk|Nv S K TR"), false);
-      oled_write_ln_P(PSTR("Q Cl Dv Bk|Nv S K TR"), false);
-      oled_write_P(PSTR(" "), false);
-      //oled_write_ln_P(PSTR("Ctrls?-> RGB ___ ___ Adjust"), false);
-      break;
-    }
-  }
-}
-
-void oled_render_keylock_status(uint8_t led_usb_state) {
-  oled_write_P(PSTR("  Lock:"), false);
-  oled_write_P(PSTR(" "), false);
-  oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
-  oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
-  oled_write_ln_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
-}
-
-void oled_render_mod_status(uint8_t modifiers) {
-  oled_write_P(PSTR("Mods:"), false);
-  oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
-  oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL));
-  oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT));
-  oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI));
-}
-
-void oled_render_mod_lock_status(){
-  oled_render_mod_status(get_mods() | get_oneshot_mods());
-  oled_render_keylock_status(host_keyboard_leds());
-}
-
-
-char mkeylog_str[22] = {};
-
-const char mcode_to_name[60] = {
-  ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-  'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-  'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-  '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-  'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-  '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-
-void oled_render_keylog(void) {
-  oled_write_ln(mkeylog_str, false);
-  // sometimes there's an extra row. this is because sometimes it drops
-  // to the last line. and this clears it.
-  oled_write_ln_P(PSTR(" "), false);
-}
-
-
-void add_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-      (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-    keycode = keycode & 0xFF;
-  }
-  if (keycode < 60) {
-    name = mcode_to_name[keycode];
-  }
-
-  // update keylog
-  memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1);
-  snprintf(mkeylog_str, sizeof(mkeylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-__attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; }
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-
-  // for the big screen.
-#ifdef OLED_DISPLAY_128X64
-  return OLED_ROTATION_180;
-#endif
-
-  return oled_init_keymap(rotation);
-}
-
-/* oled_rotation_t oled_init_user(oled_rotation_t rotation) { */
-/* memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1); */
-/*   if (is_keyboard_master()) { */
-/*     return OLED_ROTATION_270; */
-/*   } else { */
-/*     return OLED_ROTATION_180; */
-/*   } */
-/* } */
-
-bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    //oled_timer = timer_read32();
-    add_keylog(keycode, record);
-    //add_keylog(keycode);
-  }
-  return true;
-}
-
-void render_bootmagic_status(bool status) {
-  /* Show Ctrl-Gui Swap options */
-  static const char PROGMEM logo[][2][3] = {
-    {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-    {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-  };
-  if (status) {
-    oled_write_ln_P(logo[0][0], false);
-    oled_write_ln_P(logo[0][1], false);
-  } else {
-    oled_write_ln_P(logo[1][0], false);
-    oled_write_ln_P(logo[1][1], false);
-  }
-}
-
-
-__attribute__((weak)) void oled_render_logo(void) {
-  // clang-format off
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-  // clang-format on
-  oled_write_P(qmk_logo, false);
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    oled_render_mod_lock_status();
-    oled_render_default_layer_state();
-    oled_render_layer_state();
-#ifdef OLED_DISPLAY_128X64
-    oled_render_layer_map();
-#endif
-    oled_render_keylog();
-  } else {
-    oled_render_logo();
-    oled_render_default_layer_state();
-  }
-  return(true);
-
-}
-/* oled_render_keylock_status(host_keyboard_leds()); */
-/* oled_render_mod_status(get_mods() | get_oneshot_mods()); */
diff --git a/users/ericgebhart/process_records.c b/users/ericgebhart/process_records.c
index c1036c7f07..bb4bc2563b 100755
--- a/users/ericgebhart/process_records.c
+++ b/users/ericgebhart/process_records.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,80 +15,26 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ericgebhart.h"
-#include "caps_word.h"
-#include "g/keymap_combo.h"
+#include "extensions.h"
 
 __attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
 
 __attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
 
-
-uint16_t tap_taplong_timer;
-
-inline void tap_taplong(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tap_taplong_timer = timer_read();
-  } else {
-    if (timer_elapsed(tap_taplong_timer) > TAPPING_TERM) {
-      tap_code16(kc2);
-    } else {
-      tap_code16(kc1);
-    }
-  }
-}
-
-/* for (){}[]""''<>``. tap for open. Hold for open and close, ending inbetween. */
-/* Assumes a one character length.                                              */
-inline void open_openclose(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tap_taplong_timer = timer_read();
-  }else{
-    if (timer_elapsed(tap_taplong_timer) > TAPPING_TERM) {
-      tap_code16(kc1);
-      tap_code16(kc2);
-      tap_code16(KC_LEFT);
-    } else {
-      tap_code16(kc1);
-    }
-  }
-}
-
 // Defines actions for my global custom keycodes. Defined in ericgebhart.h file
 // Then runs the _keymap's record handier if not processed here
 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 OLED_ENABLE
+#ifdef OLED_CUSTOM_ENABLE
   process_record_user_oled(keycode, record);
-#endif  // OLED
+#endif
 
-  if (!process_caps_word(keycode, record)) { return false; }
+  PROCESS_EXTENSIONS
 
   if (process_record_keymap(keycode, record) && process_record_secrets(keycode, record)) {
     switch (keycode) {
 
-      // Handle the key translations for Dvorak on bepo. It's best if these are the first
-      // enums after SAFE_RANGE.
-    case DB_1 ... BB_QUOT:
-      if(record->event.pressed)
-        send_keycode(keycode);
-      unregister_code(keycode);
-      break;
-
-      // Set the default layer. eeprom if shifted.
-    case KC_DVORAK ... KC_BEPO:
-      if (record->event.pressed) {
-        uint8_t mods = mod_config(get_mods() | get_oneshot_mods());
-        if (!mods) {
-          default_layer_set(1UL << (keycode - KC_DVORAK));
-        } else if (mods & MOD_MASK_SHIFT) {
-          set_single_persistent_default_layer(1UL << (keycode - KC_DVORAK));
-        }
-      }
-      break;
-
-
-    case KC_RESET: // Custom RESET code
+    case KC_RESET:
       if (!record->event.pressed) {
         reset_keyboard();
       }
@@ -99,156 +45,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       // default_layer_set(1UL << _BEAKL);
       // tap_code16(LSFT(KC_SPACE));
       break;
-
-
-      // tap or long tap for different key.
-    case KC_CCCV:  // One key copy/paste
-      tap_taplong(LCTL(KC_C), LCTL(KC_V), record);
-      break;
-
-    case BP_CCCV:  // One key copy/paste
-      tap_taplong(LCTL(BP_C), LCTL(BP_V), record);
-      break;
-
-    case KC_CTCN:  // New TaB/Window
-      tap_taplong(LCTL(KC_T), LCTL(KC_N), record);
-      break;
-
-    case BP_CTCN:  // New TaB/Window
-        tap_taplong(LCTL(BP_T), LCTL(BP_N), record);
-        break;
-
-    case KC_CWCQ:  // Close Tab-window/Quit
-      tap_taplong(LCTL(KC_W), LCTL(KC_Q), record);
-      break;
-
-    case BP_CWCQ:  // Close Tab-window/Quit
-      tap_taplong(LCTL(BP_W), LCTL(BP_Q), record);
-      break;
-
-    case KC_XM_PORD:  // Xmonad scratch pads or desktop
-      tap_taplong(LGUI(KC_E), LGUI(KC_T), record);
-      break;
-
-    case BP_XM_PORD:  // Xmonad scratch pads or desktop
-      tap_taplong(LGUI(BP_E), LGUI(BP_T), record);
-      break;
-
-
-      // Open on tap and Open with close and back arrow on hold.
-    case KC_OCPRN:
-      open_openclose(KC_LPRN, KC_RPRN, record);
-      break;
-
-    case BP_OCPRN:
-      open_openclose(DB_LPRN, DB_RPRN, record);
-      break;
-
-    case KC_OCBRC:
-      open_openclose(KC_LBRC, KC_RBRC, record);
-      break;
-
-    case BP_OCBRC:
-      open_openclose(KC_RBRC, KC_LBRC, record);
-      break;
-
-    case KC_OCCBR:
-      open_openclose(KC_LCBR, KC_RCBR, record);
-      break;
-
-    case BP_OCCBR:
-      open_openclose(BP_LCBR, BP_RCBR, record);
-      break;
-
-    case KC_OCDQUO:
-      open_openclose(KC_DQUO, KC_DQUO, record);
-      break;
-
-    case BP_OCDQUO:
-      open_openclose(BP_DQUO, BP_DQUO, record);
-      break;
-
-    case KC_OCQUOT:
-      open_openclose(KC_QUOT, KC_QUOT, record);
-      break;
-
-    case BP_OCQUOT:
-      open_openclose(BP_QUOT, BP_QUOT, record);
-      break;
-
-    case KC_OCGRV:
-      open_openclose(KC_GRAVE, KC_GRAVE, record);
-      break;
-
-    case BP_OCGRV:
-      open_openclose(BP_GRV, BP_GRV, record);
-      break;
-
-    case KC_OCLTGT:
-      open_openclose(KC_LT, KC_GT, record);
-      break;
-
-    case BP_OCLTGT:
-      open_openclose(BP_LDAQ, BP_RDAQ, record);
-      break;
-
-
-      //Turn shift backspace into delete.
-      /* case KC_BSPC: */
-      /*   { */
-      /*     // Initialize a boolean variable that keeps track */
-      /*     // of the delete key status: registered or not? */
-      /*     static bool delkey_registered; */
-      /*     if (record->event.pressed) { */
-      /*       uint8_t mod_state = get_mods(); */
-      /*       // Detect the activation of either shift keys */
-      /*       if (mod_state & MOD_MASK_SHIFT) { */
-      /*         // First temporarily canceling both shifts so that */
-      /*         // shift isn't applied to the KC_DEL keycode */
-      /*         del_mods(MOD_MASK_SHIFT); */
-      /*         register_code(KC_DEL); */
-      /*         // Update the boolean variable to reflect the status of KC_DEL */
-      /*         delkey_registered = true; */
-      /*         // Reapplying modifier state so that the held shift key(s) */
-      /*         // still work even after having tapped the Backspace/Delete key. */
-      /*         set_mods(mod_state); */
-      /*         return false; */
-      /*       } */
-      /*     } else { // on release of KC_BSPC */
-      /*       // In case KC_DEL is still being sent even after the release of KC_BSPC */
-      /*       if (delkey_registered) { */
-      /*         unregister_code(KC_DEL); */
-      /*         delkey_registered = false; */
-      /*         return false; */
-      /*       } */
-      /*     } */
-      /*     // Let QMK process the KC_BSPC keycode as usual outside of shift */
-      /*     return true; */
-      /*   } */
-
-
-#ifdef UNICODE_ENABLE
-    case UC_FLIP:  // (ノಠ痊ಠ)ノ彡┻━┻
-      if (record->event.pressed) {
-        send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
-      }
-      break;
-    case UC_TABL:  // ┬─┬ノ( º _ ºノ)
-      if (record->event.pressed) {
-        send_unicode_string("┬─┬ノ( º _ ºノ)");
-      }
-      break;
-    case UC_SHRG:  // ¯\_(ツ)_/¯
-      if (record->event.pressed) {
-        send_unicode_string("¯\\_(ツ)_/¯");
-      }
-      break;
-    case UC_DISA:  // ಠ_ಠ
-      if (record->event.pressed) {
-        send_unicode_string("ಠ_ಠ");
-      }
-      break;
-#endif
     }
   }
   return true;
diff --git a/users/ericgebhart/readme.md b/users/ericgebhart/readme.md
index 4a081bd344..446a1411b4 100755
--- a/users/ericgebhart/readme.md
+++ b/users/ericgebhart/readme.md
@@ -1,212 +1,1584 @@
 Overview
 ========
 
-Warning: dvorak touch typist, that uses qwerty and bepo locales on my
-computer.  40+ years of vi, 30 years of vi in Emacs.
+This is as much a keymap framework as it is a keymap. It can take many
+shapes with just a few configuration choices. Base layers, Mods, thumb clusters, 
+edge_keys, all can be changed with just a configuration option.
+There are over 50 base layouts to choose from, as well as multiple 
+choices of navigation, mouse, media, 
+symbols, and keypads. Home row mods come in a few flavors or none,
+in a mod layer which is easily understandable and can be turned on
+or off, or switched. There are Miryoku options for everything if
+that is your thing.
 
-Recent years I have gone minimal, I don't use most of the keys on my ergodox,
-or original edition dactyl. These maps work great on large and small keyboards,
-my preference seems to be 40% split ergo keyboards like the corne.
+If there is a oled of 64x128 the maps of each layer will be displayed, which
+helps a lot in remembering and learning.
 
-I think that what is special here is the layouts. I don't worry too
-much about leds, or RGB, although I do like oled.  But really its mod_layer.h,
-all the simple layer chunks and definitions, and the ability to apply that
-to any keyboard with minimal effort. The other thing is the example it
-provides for defining keymaps based on different OS locales. I use both
-dvorak on Qwerty, and bepo/dvorak on bepo.  That means I must change my
-locale on my OS to match my keyboard which can do qwerty or bepo locales.
+This is an easily configurable keymap for keymap exploration. It is for
+primarily for minimalist, ortho split keyboards but does support some rectangles.
+It´s first keyboard was an Ergodox-ez many years ago. My daily driver
+is now a Kyria or a Corne, but I still use an original dactyl, rebound 
+and ergodox-ez regularly although most of the love goes to the Kyria and Corne.
 
-It is possible, as I do, to send a keycode invoking xmonad, to execute my
-qwerty - bepo switch on my computer. 
+The framework is Language
+agnostic, it supports having layers for different locales which can be
+cycled through.
+There are multiple mods layers to choose or
+not, home row mods or not, a variety of thumb layouts, mouse/no mouse,
+smart lock layers and mods, N-Shot mods like callum's, swapper. Combos,
+tap_hold, accented keys, alternate shifted keys, automatic custom
+keys, key overrides. Minimal or no C-code required for most things. 
+Language, mods, layouts and extensions are encapsulated, so that they 
+do not interact in the configuration which makes it much easier to modify 
+and grow. Mods and combos are by key location rather than specific key codes.
 
-Besides using dvorak, another thing that colors my keyboard code is that I 
-have used the kinesis
-advantage for for more than 2 decades. I have used the ergodox ez for several years 
-as well, so the evolution of my keymaps starts there with space, enter, backspace 
-and delete keys on the thumbs.
+Quick start
+-------------
 
-Layouts
------------
-This evolved from the old layout...wrapper code. Calling everything a wrapper seems
-silly. So I took a step back. 
+Everything is encapsulated here. Base layers, functional layers, mods,
+or no mods, even the language. This means that anything can change 
+independently and easily.
 
-Also, with all these layers it was a real pain to apply mods consistently and 
-easily. So I changed the way I use keymap macro wrappers and added in my own
-mod layer. The only thing it has is the mods to apply. No more editing keymaps
-to apply mods.  I do it once, and it works everywhere I want.
+If you don't mind dvorak, beakl or hands down, you can probably 
+just use what is configured. Or just change it to a base layer
+of your choice. The fastest way to get started is to just change
+the base layers to the ones you want, compile and flash. 
 
-All layouts, almost, boil down to a 3x5 x 2 matrix. Bepo is 3x6. Mostly, I want 
-my controls to stay the same. As we have been conditioned, these are the keys on 
-the edges, or middle. Not that they can't change but I don't usually change them
-much, except the side edges, - the extra pinky columns.
-the F keys, the columns to the left and right and the row on the bottom. 
-Thumb keys if you have them. Even the number row is practically the same.
+Edit _config.h_,
+  * Set the lang_is, probably to EN.
+    * US international and BEPO are also supported out of the box.
+  * Uncomment the base layers you wish to have.
+    * comment the ones you don't.
+    * keep the number below 5 if you enable a second locale.
+  * Set the thumb clusters
+  * Choose a mod layer
+  * Choose an edge key set if you need one.
+  * Choose the layer flavors that you want.
+  * For Miryoku, copy the `miryoku_hd_gold_config.h` over `config.h`
+    It is a complete config with miryoku choices. Choose the base
+    layers you wish if Hands Down Gold and Qwerty is not your thing.
+  
+  ** do not turn off extensions until you know them **
+  It will likely cause a stream of errors for the keycodes that
+  go missing when something is turned off. There are known
+  interactions between combos, smart locks, not_dead, and alt local keys.
+  Turning encoders or oled on and off certainly won´t break
+  anything.
+  
+  There are other interactions between your choices.
+  Edge keys, thumbs, combos, other extensions, 
+  may use the extensions that are enabled.
+  
+### Look here to see the parts
+  * Everything can be turned on and off in *config.h*
+  * Base layers are in *base_layers/*
+  * Edge keys are in *layers/edge_keys.h*
+  * Thumbs can be reviewed in *layers/thumbs.h*
+  * Mods are in *mod_layers/*
+  * All other layers are also in *layers/*
 
-With that in mind, reducing my layouts to 3x10 or 12 matrices would be great.
-At the same time extracting my mods so they are easy to apply to any matrix.
-So that's what is here. 
 
-At the bottom is the LAYOUT, needed by the keeb you have. Then I have my Layouts
-to feed it with my ROWS macros which are my MOD layer. At the end of it all,
-I give a 3x10 or 12 to a layout and I have a complete keyboard definition.
-Creating a new keyboard map is super simple.
+The long version
+-----------------
 
-  * mod_layer.h is the place for home row mods or any other mods.
-  * layouts.h is where I define a new matrix using the ROW macros when I need one. 
-  * core_keys.h - where I define my custom keys. Ya know, the big enum.
-  * altlocal_keys.c - Alternate key/shift keys for emulation on other locales.
-  * core_keysets.h - Base layers; qwerty, dvorak, beakl, colemak, norman, carplax...
-  * edge_keys.h - defines the edges and bottom/thumb keys of a keyboard.
-  * layers.h - defines actual layers for navigation, symbols, keypad, layers, top rows, etc.
+All can be turned on or off in the config. 
+supports en-us and fr-bepo Support for other languages is easily added.
 
-Process_records.c
---------------------
-This is where the keycodes are processed...
+Layouts are human readable, all extensions are defined with def files.
+If an 128x64 oled is available, a map of the current layer is shown if enabled.
 
-Custom keys
--------------------
-I have a lot of custom keys because of bepo. It is somewhat confusing this interaction
-between a keyboard and the software that receives it.
+I'm an Xmonad, emacs in vi emulation programmer, that 
+just means that _Gui, Esc, :/?!% and ._ are all easy access and I like my
+arrow and mouse keys in a 4 column row.
 
-A lot of my pain is invoked by my desire to have dvorak on bepo. Which works just fine,
-although an english/cyrillic situation may not work so well. Currently I have
-dvorak and beakl on bepo in addition to bepo it's self. 
+I have also become minimalist in my keyboard choices. I don't use
+number rows, not even on my kinesis, dactyl, or ergodox_ez, which have them. 
+Although my maps do reasonably support these bigger keyboards as that is where
+it all started for me and I do still use them. My preference for keyboards 
+is more in line with the Kyria and Corne. I still use 6 columns, but have been
+looking to use only 5.
 
-Alternate keycodes for emulating a layout on another locale/language.
------------------------------
-Because of wanting dvorak and beakl on bepo there was the necessity to create keys
-from keycodes which were not combined. For this I have a special function that
-takes a keycode and gives a proper shifted character for it. It is only a 2 keycode
-definition, but it does the basic non-shifted and shifted characters as you define them.
+Note: Combos at QMK master do not currently support multiple reference layers which this
+configuration uses. Combos still work as always, but do not support all the features
+found here. To get fully functioning multi-reference combos, see my *ericgebhart_dev*
+branch and pull request below.
 
-Combos/Chords
-----------------------------
-This is recently new to me. I'm using them on my thumb keys which are all LT's.
-the combos allow for layer locking for the Nav layer, and a oneshot for symbols 
-among other things.
+Actually, at the moment, the fix is in my ericgebhart branch, since I accidently
+pushed it.  I'll remedy that soon.
 
-I followed the simple example at the end of the doc than uses the 
-combos.def file to define the combos.
+A more current version of my QMK user can be found here in
+A sparse tree [of my QMK User Space ](https://github.com/EricGebhart/MyQMK/users/ericgebhart)
 
-Tap-mods
+For full multi-lingual combo functionality you will need my [pull request for fully functioning multi-reference combos which can found here.](https://github.com/qmk/qmk_firmware/pull/16699)
+
+Things which effect the thinking.
+  * No mouse. 
+  * Preference for 3x10 layouts. Corne, Kyria, etc.
+  * Still works with bigger keyboards like xd75, kinesis, dactyl, ergodox, viterbi.
+  * Change mods without changing any maps.
+  * No number row preference. - all layouts have them if needed.
+  * Xmonad window manager, GUI key is the entrance to the Xmonad world.
+  * Typing in other languages.
+  * Curious about keyboard layouts and experimenting.
+  * Must be easy to maintain, extend and modify.
+  * Minimize digging in code to add new things, or change old ones.
+  * Minimize process record user.
+  * Easy to add enums for keys and layers, as well as oled display.
+  * Easy to support multiple languages regardless of maps.
+  * Minimize the need to write C code.
+  * Encapsulate C code, so that it is extensible through data.
+
+
+Features:
+  * Everything is configurable from config.h and .def files.
+  * Def files for most things.
+  * Custom key codes are mostly defined automatically.
+  * Everything is chosen or turned on and off in config.h
+  * Lots of macros to make it easy to redefine things without a refactor.
+  * Multiple edge/outer pinky column sets.
+  * Multiple thumb clusters to choose from.
+  * Thumb clusters and mods can be changed on a map by map basis.
+  * Easily define thumb clusters with an alpha letter.
+  * Easily define thumb clusters for non-base layer.
+  * Multiple base layers to choose from.
+  * Several variations of function layers to choose from
+  * Miryoku layers, thumbs and mods if desired
+  * Miryoku hands down gold config can be swapped with config.h
+  * Navigation and mouse layers
+  * A selection of symbol, keypads, and other layers.
+  * Regular and Beakl keypad and number rows
+  * Multi language support, (locales in the code).
+  * Multiple mod layers to choose from. Easy to add more.
+    * home row mods - a selection 
+    * no mods
+    * alt mods 
+    * miryoku mods
+  * Extensions are easily defined in def files.
+    * N-shot mods
+    * One-shot mods
+    * swapper
+    * Smart lock mods 
+    * Smart lock layers.
+    * Accent keys
+    * Alternate shift keys
+    * Alternate local keys
+    * key overrides
+    * Tap hold
+    * Not dead keys
+    * Send unicode
+    * Send string
+    * Encoders
+  * Display a map of the current layer on the oled.
+  * Adding a new layer is painless.
+  * Adding or changing most things, is not difficult.
+  * Console key logging for [heatmap analysis.](https://precondition.github.io/qmk-heatmap)
+  
+  
+Layout shape and keyboard choices.
 -------------------------------------
-I had been using MT on my thumbs for GUI,CTRL,ALT on hold along with 
-Escape, Enter, space and backspace, my thumb keys. I then added shift to my home row pinky key.
-I had layer shifts to symbols, numbers, navigation all on the home row of both hands.
-It worked nicely but choppy I think, switching hands for the holder of the layer is
-a little like having no caps lock. It was a lot of work adding them to all my maps.
-This is what prompted my mod_layer.  So much easier. No maps to modify.
 
-Then I moved to all home row mods with layers on my thumb keys.
+   In all cases these keyboards are defined in a matrix which is
+   a set of rows. Maybe like so, or less. Kinesis has one more row.
+                                                       
+``` 
+   -------------------------|------------------------ */
+   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 |
+   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 |
+   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 |
+   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 |
+   | Row5L                  |                    Row5R |
+   |               ThumbsL  | ThumbsR                  |
+   -------------------------|------------------------ 
+```
 
-This does allow for more rolls, and I have found chord/rolls simply from having my
-xmonad controls be GUI-some-home-row-key-or-close. When Gui is your index finger,
-everything gets easier. 
+Generally speaking, the keys on the right and left and middle don't change.
+Neither do the bottom row or the thumbs, unless asked. Frequently the numbers 
+row is identical across layers. 
 
-Somewhere along the way I got a corne, and everything had to be small. and I realized
-that everything really was small. My layers are blending back, with LTs near the
-home row, and all the thumbs. On my dactyl I currently have 8 thumb keys per thumb, 
-I don't know what to do with them all. Remembering a time I thought that would be 
-awesome.
+For automatic edge columns set EDGE_COLS. 
+Outside pinky keys are 'yes'.  This is on by default.
+N rows by 6 columns per side.
+Should be undef/def'd by the keyboard's keymap if no.
+#define EDGE_COLS yes. this is all taken care of for supported keyboards.
 
-### tap_taplong and open_openclose
-In process_records.c I have a nice couple of functions,
-tap_taplong(), and open_openclose() for my non MT/LT functionality.
+Thumbs and Edge keys are grouped into sets so that different sets can be chosen in
+the config. 
 
-  * I have home row mods for Shift, Ctrl, Alt, and Gui on both hands.
-  * I have a number of LT mods to raise layers nearby. Nav, toprows, symbol, keypad
- are on both hands on the first and third rows around home row.
-  * Xmonad tap_taplong to pull up desktops or terminals with tap or hold.
-  * C-c/C-v, C-t/C-n, C-w/C-q are all on my Navigation layer as custom keys with tap_taplong.
-  * My thumbs are Enter/space and Esc/backspace which are also Navigation and toprows and symbol layers.  They used to be GUI,CTRL,ALT,SFT. but all that's on the home row now.
-  * All of the paired characters on my symbol layer have a hold which closes them, and moves the cursor back between.
+All layer macros take 3x10 or 3x12 as needed. Edge columns are
+added as needed, and middle keys fill up the gap.
+Thumb keys are added as asked.
 
-### caps word
-Holding both pinkies on home row for double tapping term, is effectively 
-right-shift and left-shift, invokes caps-word. The next word will be capitalized. 
-It continues until it shouldn't.
+keyboard shapes: 
+Matrix size + 5th row + thumbs.
+Matrix size + thumbs.
 
-BEPO vs Qwerty Locale/language/Layers
+ * kinesis
+   4x6 + 4 + 6 - 18 func keys.
+ * dactyl - Morpho handwire
+   4x6 + 5 + 6
+ * ergodox_ez
+   4x6 + 5 + 6 & 3 pairs of center keys.
+ * crkbd - corne
+   3x6 + 3 or 3x5 + 3
+ * xiudi/xd75
+   5x15
+ * keebio/viterbi
+   5x14
+ * montsinger/rebound/rev4
+   4x12 + 3 center keys.
+ * -- 4x12
+ * splitkb/kyria
+   3x6 + 7 or 3x5 + 7
+ 
+The parts of a keymap
 ---------------------
-Essentially they are different keycode sets. So anything that needs them, causes a layer.
+
+  * keymap
+    * defined in _keymap/keymap.c_. 
+    * Completely configurable from config.h
+    * Separated into logical chunks.
+    * Uses a language setting to create all maps.
+    * Creates the same maps in multiple languages.
+    * More than one language simultaneously on one keyboard.
+    * Currently provides these languag settings and keycodes. 
+      * US - US-intl (US_)
+      * EN - US-en (KC_), 
+      * BEPO - fr-bepo (BP_).
+    * Choosing dvorak, and enabling bepo as the second locale, 
+    will produce two base layers to choose from on the keyboard. 
+    Dvorak on US and BEPO.
+   
+ * Base layers
+   * Simple and compact definitions.
+   * Base layers are pure.
+   * Mods are defined separately.
+   * OLED Maps for 128x64 sized oleds.
+   * Language agnostic.
+   * Core layer chunks are 3x10.
+     * Except for few exceptions which are 3x12
+   * More than 50 base layers to choose from.
+   
+   **Caution: Choosing too many base layers will result in toprows or keypad layer LT's 
+   to stop working. If bepo is enabled, all base layers are doubled so it's
+   easy to hit the 16 layer limit for LT.**
+
+ * Locales
+    * Locales, defines a set of layers for a locale.
+    * Layer definitions are language agnostic. - see lang.h.
+
+ * Extensions - Defs.
+    * Can be selected in config.h
+    * Defined in easy to read .def files.
+    * Correspondance between *extensions/* and *defs/*
+
+    * accented_keys.def - direct access to altgr keys
+    * altlocal_keys.def - alternate un/shifted pairs.
+    * alt_shift.def - alternate shifting behaviors for existing keycodes.
+    * not_dead.def - definitions for non-dead dead keys.
+    * caps_word - no def file.
+    * combos.def - 
+    * custom_keys.def  - list of custom keys.
+    * encoders.def - encoder behaviors by mod/layer.
+    * key_overrides.def - Bigger more complex alt keys.
+    * mod_lock.def - smart locking mods with a set of ignore keys.
+    * nshot.def - N-shot locking mods
+    * oneshot.def - One-shot locking mods
+    * smart_lock.def - Smart lock layers and mods.
+    * swapper.def - key substitution, reverser.
+      * eg. toggle between tab, backtab on a key, with a reverse key.
+    * tap_hold.def - Define key for tap and hold for tapping term for qqc autre.
+    * unicode.def - keycodes to send unicode strings.
+    * send_string.def - keycodes to send strings.
+
+
+ * Layers 
+    * Multiple selections of the Transient layers.
+    * Layer chunks are 3x10, with some options.
+    * Full Navigation layer - stable and well used.
+    * Mouse keys or without.
+    * 1 or 2 layer nav, 2nd for mouse. or all on one. - choices.
+    * Multiple choices of an easy to use _top rows_ layer similar 
+      to `raise` and `lower`. 
+    * A fully complete symbol layer, Used for coding and writing.
+    * Accented letters and dead key layers.
+    * Keypads and function pads.
+    * Beakl keypads and symbol layers.
+    * Control layers.
+        * Layers
+        * Adjust
+        * RGB
+   
+ * OLED A simple, configurable implementation.
+   * Current base layer
+   * Current locale
+   * Current transient layer
+   * Last key, matrix location and value.
+   * Mods and locks
+   * Map of the current layer. (Oled 128x64)
+   * key logger
+
+ * Keyboards
+    * nothing is needed in keymaps/*/keymap.c
+    * Layouts - keyboard matrix adaptation.
+        * Adaptive. Usually taking 3x10 maps and filling the edges and thumbs.
+        * 4x10 or whatever is possible. 
+        * 3 versions, thinking in a split kb, way.
+            * 5 columns in, 5 out. 
+            * 5 columns in, 6 out. 
+            * 6 columns in, 6 out. 
+   * per keyboard shape.
+   * There are layouts per keyboard.
+     * Base layout with mods and thumbs and edges added.
+     * Transient layout which can be KC_TRANS, in those same places.
+   * The number row addition can be turned on and off as needed by the layout.
+   * Layouts can hard code the number row, negating the need for giving one.
+     
+ * Multiple edge key sets
+ 
+ * Multiple Thumb clusters - see config or thumbs.h for up to date choices.
+   * Support for multiple definitions. 
+     * mods
+     * layers
+     * mods_layers
+     * mods_layers_nav
+     * beakl wi
+     * beakl wi - official.
+     * test  - to play with.
+     * trans - transparent, could be used in the transient layout to allow alternates.
+     * miryoku with keypad
+     * miryoku with toprows
+     * mods_layers with left thumb letter
+     * hands down approximation with left thumb letter
+     * miryoku with keypad, letter on left, space on right. - no tab.
+     * miryoku with toprows, letter on left, space on right. - no tab.
+     
+ * Mod Layers
+   * Completely independent of any layer or base layer definition.
+   * Easy to create a new one by copying the transparent version.
+   * Can be changed on a layer per layer basis.
+   * Based on position in the matrix.
+   * Chosen in config.
+   * Multiple choices.
+     * Home Row Mods. sacg, gacs, gasc
+       Left and right mods on left and right.
+     * Transparent - the default if not chosen.
+     * Alt - Non home row mod variant.
+     * miryoku HRMS is sacg plus right alt/altgr on third row.
+
+ * Alternate language/locale support
+   * Happens at the lowest level
+   * All maps work with any of the [keymap extras.](https://docs.qmk.fm/#/reference_keymap_extras)
+   * Language support is simple to add with just a new, very simple macro.
+   
+The language keycodes can be found 
+[here.](https://github.com/qmk/qmk_firmware/tree/master/quantum/keymap_extras)
+
+
+Architecture
+-----------------
+The idea here is that most things don't change, and the things that do are
+easy to understand and change. The defs directory is where all the extras are,
+tap_hold, alternate shift keys, combos, keycodes, smart lock, one shot mods,etc.
+
+If layers exist that you want and like, then all other behaviors are defined in
+def files which are much nicer than working directly with C code. If there is
+need there is always the copy pasta way too.
+
+Things that are likely to be changed when adapting a layout to personal preferences
+are *layers/thumbs.h* and *mod_layers/*.  The function layers are all in the
+layers folder and should be easy to understand. Once added, it is only necessary to
+add the appropriate defines in _config.h_
+
+Adding new layers requires changes in layer_names, *oled/oled_layers.h* and *oled/oled_cartes.h* and the appropriate *keymap/ .h* file.
+
+Adding a new keyboard is done in keyboards and should be fairly obvious.
+```
+.
+├── base_layers
+│   ├── accents.h
+│   ├── alt.h
+│   ├── base_layers.h
+│   ├── beakl.h
+│   ├── bepo.h
+│   ├── carpalx.h
+│   ├── dvorak.h
+│   ├── gap.h
+│   ├── hands_down.h
+│   ├── keymaps.txt
+│   ├── maks.h
+│   ├── qwerty.h
+│   └── toprows.h
+├── config.h
+├── defs
+│   ├── accented_keys.def
+│   ├── altlocal_keys.def
+│   ├── alt_shift.def
+│   ├── combos.def
+│   ├── custom_keys.def
+│   ├── encoders.def
+│   ├── key_overrides.def
+│   ├── mod_lock.def
+│   ├── not_dead.def
+│   ├── nshot.def
+│   ├── oneshot.def
+│   ├── send_string.def
+│   ├── smart_lock.def
+│   ├── swapper.def
+│   ├── tap_hold.def
+│   └── unicode.def
+├── ericgebhart.c
+├── ericgebhart.h
+├── extensions
+│   ├── accented_keys.c
+│   ├── accented_keys.h
+│   ├── altlocal_keys.c
+│   ├── altlocal_keys.h
+│   ├── alt_shift.c
+│   ├── caps_word.c
+│   ├── caps_word.h
+│   ├── console_key_logger.c
+│   ├── console_key_logger.h
+│   ├── encoders.c
+│   ├── encoders.h
+│   ├── extensions.h
+│   ├── keycodes.h
+│   ├── keymap_combo.h
+│   ├── key_overrides.h
+│   ├── mod_lock.c
+│   ├── mod_lock.h
+│   ├── not_dead.c
+│   ├── nshot_mod.c
+│   ├── nshot_mod.h
+│   ├── oneshot.c
+│   ├── oneshot.h
+│   ├── process_locales.h
+│   ├── process_nshot.h
+│   ├── process_smart_lock.h
+│   ├── send_string.c
+│   ├── smart_lock.c
+│   ├── smart_lock.h
+│   ├── swapper.c
+│   ├── swapper.h
+│   ├── tap_dances.c
+│   ├── tap_dances.h
+│   ├── tap_hold.c
+│   ├── tap_hold.h
+│   ├── unicode.c
+│   └── unicode.h
+├── keyboards
+│   ├── keyboards.h
+│   └── layouts.h
+├── keymap
+│   ├── keymap.c
+│   ├── map_accented.h
+│   ├── map_alt.h
+│   ├── map_beakl.h
+│   ├── map_bepo.h
+│   ├── map_carpalx.h
+│   ├── map_dvorak.h
+│   ├── map_funcs.h
+│   ├── map_gap.h
+│   ├── map_hd.h
+│   ├── map_keypads.h
+│   ├── map_maks.h
+│   ├── map_qwerty.h
+│   ├── map_symbols.h
+│   └── map_toprows.h
+├── lang
+│   ├── lang.h
+│   ├── lang_map.h
+│   ├── locale_layers.h
+│   ├── locales.c
+│   └── locales.h
+├── layer_names
+│   ├── base_names.h
+│   ├── func_names.h
+│   ├── layer_names.h
+│   └── util_names.h
+├── layers
+│   ├── edge_keys.h
+│   ├── keypads.h
+│   ├── layers.h
+│   ├── nav.h
+│   ├── symbols.h
+│   ├── thumbs.h
+│   ├── toprows.h
+│   └── utility.h
+├── listen_keylogger.sh
+├── mod_layers
+│   ├── alt_mods.h
+│   ├── hrm_gacs.h
+│   ├── hrm_gacs_miryoku.h
+│   ├── hrm_gasc.h
+│   ├── hrm_sacg.h
+│   ├── hrs_nav.h
+│   ├── mod_layer.h
+│   └── trns_mods.h
+├── oled
+│   ├── oled_cartes.c
+│   ├── oled_layers.c
+│   ├── oled_stuff.c
+│   └── oled_stuff.h
+├── process_records.c
+├── readme.md
+└── rules.mk
+
+10 directories, 118 files
+```
+
+Locales
+-------------------
+There are currently three locales.  LANG_IS defines the one in use.
+The map changes this value as it goes, to get the maps that are asked for.
+I have recently renamed some variables, such that it seems that only 2 locales
+are possible. It seems more than two might be too many. And keeping at 2 is
+a little easier.
+
+ * EN - en-us, **KC_** keycodes.
+ * US-INT - us-international variant, **US_** keycodes.
+ * BEPO - bepo-fr, **BP_** keycodes.
+
+Switching LANG_IS before adding a new map will cause that map to 
+use LANG keycodes and keymap chunks when building the map.
+
+Enabling a second locale to bepo, will cause bepo versions of the chosen layers to
+be added to the keymap.
+
+### defining a locale.
+
+This is to manage BEPO and Qwerty Locale/language/Layers
+Each locale is defined with a start and end layer from the layers enum.
+
+This is only necessary to give contextual base layer choices based on
+the current locale setting, which the keyboard tracks.
+
+The first and last defines are all done with the magic of defines in 
+ericgebhart.h where the layers enum is defined.
+
+This could potentially hold multiple locales, The map turns on off the layers 
+and their enums if they are not enabled so that the layer array does not 
+fill up with too many base layers, or other layers because LT only works 
+up to layer 15.
+
+What this does is allow the keyboard to know which locales it has, and which
+layers go with them.
+
+If you have an oled, the locale will be displayed after the layout name. Currently
+en-us and bepo-fr are there.
+
+Locales are tracked, as to the layer ranges which belong to them in the layers enum.
+This allows for a `KC_NEXT_LOCALE` key and a `KC_NEXT_BASE_LAYER` key, on the _layers_
+layer. 
+`KC_SET_BASE` sets the default layer in the eeprom.
+
+When cycling through layers only the layers for the chosen local will appear.
+
+The layers are different keycode sets. 
 So there are two symbol layers, two toprows layers, two keypad layers. 
-One for Qwerty and one for bepo. The Navigation layer is not affected.
+One for Qwerty and one for bepo. The Navigation layer is not affected because
+it has only control keycodes which are independent of locale. 
 
-I only have bepo, dvorak and beakl on bepo.  There are a bunch for Qwerty.
-I have a ton of basic layers. I'm most interested in beakl at the moment, but I've used Dvorak for more than 20 years. There is also qwerty, colemak, norman, carplax, etc.
 
-The navigation/mouse layer is not affected by bepo/qwerty, but symbols and numbers are. 
-There are bepo versions of everything that needs it.
+### Locales, how they work in layouts.
 
-Navigation Layer
------------------------
+This is done through consistent naming patterns and macros.
+Here are the macros that support creation of layout parts by locale.
+All are defined in **lang.h**
+
+ * Keycode Prefix - KC or BP, etc. 
+    `LANG_KC(_A) -> KC_A or BP_A`
+
+ * Defined key/layer Suffix - SYMB_EN, SYMB_BP, ... 
+    `LANG_N(NAME) -> NAME_EN, NAME_BP`
+ 
+ * Map chunk Suffix - _EN, SYMB_BP, etc.
+    `MAP_CHUNK(15_BOTTOM) --> ___15_BOTTOM_EN___ or ___15_BOTTOM_BP___`
+
+_lang.h_ has the macro definitions used in the keymap resolution,
+A new locale, will need a new set of macros that match the others.
+They use LANG_IS, Follow the patterns. It should be reasonably obvious.
+
+It is only necessary to create new base level macros that are used by these
+macros.  All of them are similar.
+
+**LANG_KC** uses these macros to resolve it's values.
+```
+    // Give the right keycode prefix by LANG_IS
+    #define LANG_PFX CAT(LANG_IS_, KC)
+    #define BEPO_KC BP_
+    #define EN_KC KC_
+```
+
+Adding a new one is just a matter of adding the a macro named with
+this format. `LANG_IS _Keycode prefix`.
+for Slovak, if the **LANG_IS** value is `SK` that would be,
+
+    `#define SK_KC SK_`
+
+LANG_N macro uses these similar macros for it's resolution.
+
+```
+    // Give the right symbol suffix by LANG_IS
+    #define LANG_SFX CAT(CAT(LANG_IS, _), SFX)
+    #define BEPO_SFX _BP
+    #define EN_SFX _EN
+```
+Adding Slovak support to the LANG_N macro looks like this.
+
+    `#define SK_SFX _SK`
+
+
+### Thumb clusters.
+
+Thumb clusters can be chosen by layer with the value of **THUMBS_ARE**.
+
+The easiest way to see them is to look in *layers/thumbs.h*.
+
+At the core of the thumb clusters are a set of six keys which
+can be changed to a one of a set of keys, with settings in the config. 
+Supporting a 4 key thumb cluster would just need a similar set.
+
+The newer Hands down variants also have need of thumb clusters which
+can take a letter.  A default can be given in config.h.
+Each keymap layer entry can give it's letter to change the thumb cluster.
+This is needed for hands down, maltron, rsthd, and beakl wi.
+
+These layouts use a special thumb cluster variant which will use the value
+of *THUMB_LETTER* to place a letter on one of the thumb keys.
+
+It is reasonably easy to add a new thumb cluster and use it. Add it to
+thumbs.h, add to the list of macros for it's suffix, and turn it on 
+by setting it to *THUMBS_ARE* in config.h
+
+Additionally a thumb cluster can be set for the various function layers as
+well. The transparent thumbs can be used, or something else. The nav and 
+mouse layers have the mouse buttons if mouse keys are enabled.
+
+It is also possible to use a Miryoku thumb cluster and layers 
+or mix the other layers in as desired.
+
+The language of thumb clusters is managed at the lowest level.
+These keys are mostly not language specific.
+
+Here is the definition for my space and symbol layer key. 
+This changes the name of the layer given like this.
+
+_SYMB becomes *_SYMB_EN* or *_SYMB_BP*. Depending on the value of *LANG_IS*
+
+    `#define SPC_SYMB LT(LANG_N(_SYMB), KC_SPC)`
+
+
+Edge key sets
+----------------
+Edge keys, or the 6th, and outer pinky column are often not specified
+in base keymaps and are not strictly necessary. There are a few sets
+to choose from here. A NOKC set with no keys, NORM which is sorta normal
+with grave, equal, tab, -, and \/. There is also a smart lock set
+which gives access to smart lock layers tab and -. Last there is 
+test, so its easy to try new things. Edge keys are defined in
+*layers/edge_keys.h*.
+
+
+Base Layers
+-----------------
+I like to experiment with layouts. So I have a few. 
+They can be turned on in config.h.
+
+To switch base layers there is a combo to raise the layers layer.
+Hold both pinkies on their lower row keys to get the layer.
+Tap the home row left middle finger to change layers.
+Tap the ring finger to set it to eeprom if you want it to stick.
+
+The left index finger will cycle through locales if you have them.
+
+Here is a list of some of the base layers..
+
+ * Dvorakish
+    * Dvorak
+    * Capewell-Dvorak
+    * Ahei
+    * Boo
+    * Dvorak RLC-UI
+ * Beakl
+    * 15
+    * 19
+    * 27
+    * WI
+ * Qwertyish
+    * Qwerty
+    * Azerty
+    * Workman
+    * Norman
+ * Maks
+    * Colemak
+    * Colemak_DH
+    * Halmak
+    * Minimak
+    * Minimak 8
+    * Minimak 12
+ * Carpalx 
+    * QFMLWY
+    * QGMLWB
+    * QGMLWY
+ * Hands Down
+    * Neu
+    * Neu narrow
+    * Titanium
+    * Gold
+    * Platinum
+    * Silver
+    * Bronze
+    * Elan
+    * Dash
+    * Ref
+ * MTGAP
+    * Mtgap
+    * Ctgap
+    * Apt
+    * Canary
+ * Others
+    * Maltron
+    * Eucalyn
+    * Rsthd
+    * Isrt
+    * Hands Up
+    * White
+    * Soul
+    * Niro
+    * Asset
+    * Whorf
+    * Whorf6
+ * Bepo, layers with accented letters.
+    * Bepo
+    * Optimot
+    * Optimot compact
+    * Beakl19bis
+
+### Adding a new base layer, or any layer 
+
+Adding a new base layer is easy. They all live in *base_layers/*. A base layer
+entry looks like this. There is an empty template in *base_layers.h* which collects
+all the other maps. The name of the carte  de map, should be **CARTE** followed by
+the layer name that will be used. Layer names are usually an underscore followed by
+the name.  For dvorak, that is *_DVORAK*, which because of the language layer ultimately
+and magically becomes *_DVORAK_EN*, *_DVORAK_US*, *_DVORAK_BP* as needed. 
+
+```
+#define CARTE_DVORAK                            \
+  carte_de_map(" ',.py fgcrl ",                 \
+               " aoeui dhtns ",                 \
+               " ;qjkx bmwvz ")
+
+#define ___DVORAK___                                                    \
+  LANG_MAP(TL_QUOT,  TL_COMM, TL_DOT, _P,  _Y,   _F, _G, _C, _R, _L,               \
+           _A,       _O,      _E,     _U,  _I,   _D, _H, _T, _N, _S,    \
+           TL_SCLN,  _Q,      _J,     _K,  _X,   _B, _M, _W, _V, _Z)
+```
+
+#### TL_ keycodes 
+
+Use TL_ keycodes for any punctuation, this allows for targeting
+of these keys by language and by target layout as needed.
+for instance *TL_COMM* -> TLKC(_COMM). The *Target-Language-comma*, 
+becomes BP_BK_COMM, or KC_DV_COMM, US_HD_COMM, or whatever it
+needs to be based on current language and target layout. If your layer has special
+puncuation needs, 
+
+  * Add key entries to *altlocal_keys.def* 
+  * Edit to *lang/lang_map.h* to add the new *TARGET_PFX* entry.
+  * Set the appropriate value to *ALT_TARGET_IS* in the layer's keymap entry.
+
+#### Integration
+
+Integrating the new map into the rest of the framework is just a simple entry
+in a few places. 
+  * *layer_names* needs to know about the new name so we can use it, 
+  * The oled needs to know about it so it can display it.
+  * The config needs to know about it so we can turn it on.
+
+Follow these steps. Everything is very simple, and just one to 3 lines. 
+Just follow the same patterns as all the rest. 
+
+  * Add the layer definition and map of the definition in *base_layers/<appropiate>.h*.
+  * Add the layer name to *layer_names/base_names.h*
+  * Add the layer name to *keymap/<appropiate>.h*
+  * Add the layer entry to *oled/oled_layers.c*
+  * Add the layer map entry to *oled/oled_cartes.c*
+  * Add the define for the layer enable to *config.h*
+
+Adding a new functional layer follows the same patterns, although their
+keymap and oled entries may be more complex, since it is usually trying
+to pick one from a set of choices.
+
+### Adding a new thumb cluster configuration
+
+Adding a new thumb keys definition is done in *layers/thumbs.h*.
+The keys that change are just 6 and they all have the name of *___6_ERGO_THUMBS_...*.
+
+  * Define a new thumb definition with a nice suffix like all the rest.
+  * Add an entry to the *THUMB_EXT* list with the nice new suffix.
+  * Set the appropriate *THUMBS_ARE* defines in config.h to it's 
+  new thumb extension name.
+  
+### Adding a new mod layer
+
+This is also easy. Mod layers live in the mod_layers folder. Each file
+there is a separate mod layer, which is tracked in *mod_layers.h*
+The file, *trns_mods.h* is the transparent mods layer and by definition has
+no modifiers applied, providing a clean slate. 
+
+The steps are these:
+  * Make a new copy of an existing mod layer.
+  * Edit the new file and change the names to your new name.
+      * ie. *_trns* changes to *_my_new_mods*
+  * Add the mods you want. MT's and LT's, tap holds, etc. 
+  * Edit  *mod_layers/mod_layer.h*
+    * Add the include for the new mods file*
+    * Add the *MOD_EXT* entry for the new name
+  * Define *MODS_ARE* in _config.h_ to use the new name.
+
+
+Keymaps
+-----------
+I only have one. It's in keymap/keymap.c.  
+My config.h has all the current usable settings.
+Turn on the layers by enabling and choosing them in config.h. 
+Most keyboards don't need a keymap.c. 
+
+There are corresponding Bepo layers, as needed, which will arrive if *SECOND_LOCALE* is
+set to _BEPO_.
+This essentially doubles the number of keymaps.  
+Nav, mouse, media, layers, RGB, and Adjust are not duplicated as there is no 
+current need.
+
+## Mods, home row and otherwise.
+With all these layers it was a real pain to apply mods consistently and 
+easily with the old wrapper code. So I changed the way I use keymap macro 
+wrappers and added in my own mod layer. The only thing it has is the mods 
+to apply. No more editing keymaps to apply mods.  I do it once, and it 
+works everywhere I want by location.
+
+Multiple versions are possible. Just copy the trns_mod_layer.h to a new
+name and modify it with a new extension name, (replace '_trns'). Then add it's include to mod_layer.h, to be used when the config says.
+
+The defines for *MODS_ARE* and *DEFAULT_MODS* determine which mods are applied
+to a given keymap layer. 
+
+Keyboard matrix Layouts
+-----------
+This is where the keymap of the
+keyboard meets the mods and all the edge, middle and thumb keys, and makes 
+it easy to give just a 3x10 definition for most layers regardless of which 
+keyboard it is going to.
+
+To use an existing layout for a different keyboard, simply make an entry
+in *keyboards.h* to assign the proper layouts that fit that keyboard.
+So a planck could use the 4x12 layout out of the box. In the keyboards 
+keymap there is only a need for config.h or rules.mk if something needs
+changing. For the keyboard an empty keymap.c will do.
+
+The base layout can be anything really.
+The base layer sets the thumbs and anything outside of the 3x10.
+The mod layer is wrapped in the base layout and adds the mods, and a 6th 
+outer pinky column as needed.
+
+Some layouts take an extra number row.
+Layouts can be any shape, all of these take a 3x10, 3x12, 4x10 or 4x12, 
+and make it fit the keyboard.
+
+The layouts defined in _layouts.h_ take a list of keys. and give them
+to the keyboard's layout.  The Corne (crkbd), uses a layout called
+  `LAYOUT_split_3x6_3`. So for the corne, I have a `Base_3x6_6` that
+  is the same shape, in its resolution.
+  
+There are layouts for Corne, ergodox, kinesis, dactyl, viterbi, xd75, rebound.
+
+Currently, 3 layouts are needed per keyboard. 
+ * A Base layout, for default/base layers, 
+ * A transient layout for the function layers.
+ * A version which takes 3x12 for the larger bepo base layers.
+
+The base layouts can take 3 or 4 rows by 10 columns as desired.
+They add in the mods, and any pieces of matrix outside of
+the 3x10 center, function, numbers, lower rows, outside pinky keys,
+and thumb clusters. 
+
+
+Functional layers
+--------------------
+There are quite a few of these to choose from. The easiest way to see
+them all is to go look at them in _layers/_. They are logically divided
+into files, and their cartes/maps are easy to look at. There are 
+minimalist Miryoku versions as needed.
+
+## Navigation Layer
 I do not use a mouse. I use Xmonad as my window manager, and I have
 practically no use for one.  They are necessary however. So I have
 a Navigation layer which is all mouse, arrows, home, end, tab, page
 up, down,  5 mouse buttons and so on. 
-This layer is not affected by bepo/qwerty, but symbols and numbers are. 
-There are bepo versions of everything that needs it.
 
-Arrow combos work just fine, in emacs I use SFT(arrows) to move between windows.
-To do this; shift is my left pinky home, Nav is right thumb Enter, and one of the four
-home keys of my left hand are the arrows. Home row mods allow this to work well.
+There are a growing number of choices, left and right sided mouse layers
+right side arrows etc, and some monolithic nav layers like the one shown
+below.
 
-I don't use the arrows on the dactyl and kinesis, even though they are there.
+There is also a split layer, with arrows etc on the right, and smart mods
+and N-shots on the other. A left side mouse layer is accessible from
+the first nav layer.  There are various choices at this point. It is
+best to look at the config.h for clues. 
+
+The miryoku nav and mouse layers are somewhat but not terribly different.
+
+
+#### One of the Navigation layers.
+                                                       
+```
+M = Mouse
+B = Button
+W = Wheel
+AC   = Acceleration
+CCCV = Tap -> Ctrl-C, hold for double tap duration -> Ctrl-V
+CTCN = Tap -> Ctrl-T, hold for double tap duration -> Ctrl-N
+CWCQ = Tap -> Ctrl-W, hold for double tap duration -> Ctrl-Q
+HOME = TAB & PGDN
+END = BKTAB & PGUP
+Lock/Unlock LAYER = PGDN & PGUP
+ 
+MB5  MB4    MB3    MB2  MB1     MAC0  |  CTCN  MB1    MB2    MB3  MB4   MB5 
+TAB  MLeft  MDown  MUp  MRight  MAC1  |  CCCV  Left   Down   UP   Right TAB 
+     WLeft  WDown  WUp  WRight  MAC2  |  CWCQ  TAB    PGDN   PGUP BKTAB
+                                                                             
+     Left   Down   Up   Right   CCCV  |  CCCV  MLeft  MDown  MUp  MRight
+     
+     
+```
+                                                                            
+
+## Symbol Layer
+
+The symbol layer is based on the Beakl15 symbol layer. It was very similar to a symbol
+layer that I had before beakl, but this felt better, and has been through a few 
+iterations at this point. Vi likes using :/?! a lot. The = is not that important to
+me, as the : for the vi ex: command. The ! is very satisfying in this location.
+
+For US-intl and Bepo which have dead keys, the symbol layer uses the *not_dead* extension
+to give _'`"^~_ which are not dead.
 
-Symbol Layer
--------------------
-The symbol layer is based on the Beakl15 symbol layer.
 The beakl symbol layer is intuitive and fairly easy to remember. There are 3 versions.
-The original, an extended called A, and an extended and enhanced for vi, called B.
+The original, an extended, and an extended and enhanced for vi.
 The primary purpose of the extension was to provide keys which might not be available
-elsewhere on the default layer. B, takes this further and moves :/? to better places.
+elsewhere on the default layer. The vi version takes this further and moves :/? 
+to better places.
 
-TopRows Layer
---------------------
+I prefer a modified beakl15 symbol layer. here it is, left and right.
+This layer has some extra characters so it works with non-beakl base layouts.
+The beakl wi symbol layer is not an improvement on this IMO.
+Miryoku symbols layer is only left sided, and minimalist as well.
+This might be a little vi centric, with the : in the middle. ymmv.
+
+There are a few choices, this is one.
+
+```
+        `<$>'  ?[_-] 
+      - \("#)  !{:/} ;
+        @=*+;  %&^~|
+```
+
+
+## TopRows Layer
+
+The toprows layer is a nice way to transition to small keyboards.
 I think, truly this is the layer that makes tiny keyboards accessible in the beginning.
-This is basically the number row, the shifted number row and the function key row.
-I have them so it is numbers on the home row, shifted keys above and functions below.
-There are multiple choices, I currently use the beakl number row, with everything 
-else as you would expect. 
+Everything can remain familiar. I use this one with a beakl number row.
+The default, if no choices are made, aside from enabling toprows, will  
+have a normal qwerty number row, as in the second map.
 
-Keypad Layer
---------------
-There are several variations of keypads and function key pads in various sizes. 
-Currently I am using a Beakl Keypad on the left hand and 3x4 funcpad on the right.
+I do not use F keys, The latest addition has _smart_ and _nshot mods_ in the third row.
+There is a miryoku thumb cluster which uses this layer instead of a keypad.
+
+    ```
+    !@#$%   ^&*()
+    40123   76598
+    F1   ---  F10
+    ```
+ or
+
+    ```
+    !@#$%   ^&*()
+    12345   67890
+    F1   ---  F10
+    ```
+
+## Keypad and Funcpad Layers
+
+There are several variations of keypads and function key pads in various sizes,
+and left and right. 
+There are also versions with smart and nshot mods instead of F-keys.
+There are monolithic, left and right, and also half keyboard left mostly...
+A miryoku version also exists.
+The keypad can be chosen in config.h.
+
+```
+    523:  F9-12 
+   7.104  F5-8
+   /698,  F1-4
+```
+## Media Layer
+
+A simple Miryoku, media layer, controls on the right.
 
 OLED
 --------------------
-It shows the basic stuff I could find in most places. The 
-default layer, the current layer, the mods, the locks, the last key pressed, and
-a map of the current layer as simply as possible. I'm sure there is more that could
-be done. @Drashna has some fancy stuff. If the display is big enough, there is even 
-a display of the current layer's keymap.  
+The oled shows the basic stuff I could find in most places. 
+* Default layer
+* Current layer
+* Locale
+* Mods 
+* Locks 
+* Last key pressed
+* Map of the current layer as simply as possible. (128x64)
 
-XMonad
+Process_records.c
+--------------------
+This is where the keycodes are processed...
+It tends to be where cruft gathers. Mostly I try to keep it empty
+and do all my processing with the extensions.  The file, _extensions.h_ 
+takes care of inserting them in process_records with it's macro.
+
+
+Extensions
 ---------------------
-I use xmonad. Gui is my hot key for that.  With home row mods I have home
-row chords which give me access to my desktops, my scratchpads/terminals,
-custom key KC_XM_PORD, among others. It sometimes feels that I am playing
-an instrument when I invoke xmonad to do something.
+Extensions are all in the extensions directory and have a single 
+entry point via extensions.h which provides a macro to place in **process_record_user**. 
+The intention is that they are easy to copy and use as is without digging around
+in the C code. Custom keys are also defined there. Any keycodes defined by
+an extension are automatically added to the custom keys enumeration so there is no need to define them manually.
 
-I had an xmonad layer at one time, it was basically dvorak, I would invoke it
-with a GUI mod, so that even on bepo, or colemak, my xmonad commands remain the same.
+A new extension can be added with a process record entry in
+extensions.h. Just follow the same code pattern. If an extension defines keycodes, 
+add it's include entry in *keycodes.h* so that they are automatically added to the enum. 
+Keycodes.h is also where all the miscellaneous short cut key defines are done. 
 
-I'm going to need to revisit that, as things are, all the commands move when I change
-to a different default layer from dvorak.
+To copy all the extensions, 
+  * Copy the extensions and defs folders, 
+  * Copy process_records.c file or adapt yours.
+  * Adapt your custom keycodes to custom_keys.def.
+  * Copy the pertinant parts of config.h so that everything can be enabled.
+  * Define _USERSPACE_H such that all the extensions can find your stuff.
 
-Combo's can alleviate some of this pain. More to play with.
+To adapt to your own process_record_user do this;
+Include extensions.h in your process_record_user,then add this 
+above the switch.
+```
+PROCESS_EXTENSIONS
+```
+This will cause process records to use whatever extensions are turned on.
 
+Many extensions have a _.def_ file in _/defs_ for any data that is needed.
+
+Because many of them use custom keycodes or layers in their definitions, 
+it is necessary to include your userspace .h such that keycodes and layer
+codes can be found. To simplify this, simply add a define to config.h
+to point at your .h or wherever your custom codes can be found.
+
+In my case;
+```c
+#define USERSPACE_H "ericgebhart.h"
+```
+
+
+Custom keys
+-------------------
+The Custom keys are in __custom_keys.def__.
+
+__keycodes.h__ is an extension of sorts. It is the custom keys enumeration.
+The __custom_keys.def__ has a few random keycodes in it.
+
+All other keys are automatically generated from the other def files.
+
+For the extensions that have key definitions those keys are enumerated
+automatically. The keys are defined in the def files so there is no need
+to add them to the enumeration manually.
+
+It will complain as usual if there are duplicates.
+
+Mostly, __keycodes.h__ is key defines to make shortcuts, since the enumeration
+is done almost completely automatically. When adding a new extension
+which defines keycodes, that extension will also need an entry in 
+keycodes.h in order to automatically define the new key enumerations
+it´s def file creates.
+
+
+Accent keys
+-----------------
+This is a way to create keycodes which access keys
+which are normally only accessible with an Altgr/Ralt and a dead key.
+
+Each definition takes a keycode, the key to modify, and the dead key
+to apply to it.
+
+```
+ACCENTED(BP_OCIR, BP_O, BP_DCIR)
+ACCENTED(BP_ACIR, BP_A, BP_DCIR)
+```
+
+
+Alternate keycodes 
+-----------------------------
+Normally, a keycode has unshifted and shifted key values. These are defined
+by the OS and it's locale, not the keyboard. This feature allows a keycode 
+to be defined that uses arbitrary unshifted and shifted keycodes and their modifiers. 
+This is necessary, because, for instance, qwerty has , and ; paired. Other
+locales may not. Bepo, and Beakl both have different pairings as do many other
+layouts.
+
+Because of wanting dvorak and beakl on bepo there was the necessity to create keys
+from keycodes which were not combined. key overrides were not 
+sufficient because some keys are not actually keys that can be accessed
+without modifiers. Each keycode for the new key specifies it's own
+modifiers making any character available as an unshifted or shifted key.
+
+Alternate keys for a locale, are defined in **altlocal_keys.def**.
+These are to emulate a key, from 2 keycodes. 
+
+This is for emulating keys on another locale/language.
+Dvorak on Bepo-fr, or Qwerty on sk-SK, or de_DE.
+
+It is also good for alternate shifted and unshifted pairs like
+what is needed for beakl or hands down on en-us/qwerty.
+
+This feature is usually only needed for punctuation keys 
+and the top row number keys. Where the unshifted and shifted keys
+are not the same character as the keyboard local on the OS.
+
+It has turned out that most of these keys have a destination language,
+and a target language/layout. 
+The target is to emulate something on some language. QMK uses keycode prefixes,
+so this works pretty well and the names stay consistent with all the others,
+but with a middle name.
+
+The pattern is Language prefix, target language prefix, name.
+The target prefix is made up. BK -> beakl, DV -> dvorak, HD -> hands down, etc.
+
+The naming pattern is only important in that it works with all of the Lang
+macros elsewhere in this userspace. A macro is provided on a per key 
+basis, which can be used at the base layer definition, such that *TL_COMM*; 
+target-language-comma, becomes BP_BK_COMM, or KC_BK_COMM, or whatever it 
+needs to be based on 
+current language and target layout.
+
+Here is a def entry to create the 1/! keycode for dvorak in the Bepo-fr locale
+in *altlocal_keys.def*.
+```
+  MK_KEY(BP_DV_1,    BP_DQUO, MOD_LSFT,      BP_DCIR, MOD_LSFT)
+```
+
+Here is what some Beakl keys look like for en-us/qwerty.
+Beakl has dot with @, comma with ! and " with `.
+
+In *altlocal_keys.def*.
+```
+  // Keys for BEAKL on Qwerty
+  MK_KEY(KC_BK_DOT,  KC_DOT, MOD_NONE,    KC_2, MOD_LSFT)
+  MK_KEY(KC_BK_COMM, KC_COMMA, MOD_NONE,  KC_1, MOD_LSFT)
+  MK_KEY(KC_BK_QUOT, KC_QUOT, MOD_NONE,   KC_GRV, MOD_NONE)
+```
+
+Not Dead keys
+--------------------
+As a writer dead keys give me access to accented letters in other languages,
+As a programmer they are a pain, especially for a vi user. This problem is
+limited to a few characters; "'`^ and ~. This extension helps to fix these
+characters and make them accessible as non-dead keys. It does this by adding
+a space afterward. The space is eaten by the OS keyboard driver and the letter
+emerges as needed. Here are some non dead keys for US-Intl.
+In use, I put these on the symbol layer, and let all the others remain dead.
+
+```
+NOT_DEAD(US_DQUO_ND, US_DQUO)
+NOT_DEAD(US_GRV_ND,  US_GRV)
+NOT_DEAD(US_QUOT_ND, US_QUOT)
+NOT_DEAD(US_CIRC_ND, US_CIRC)
+NOT_DEAD(US_TILD_ND, US_TILD)
+```
+
+Alternate shifts
+---------------------
+The alt shift extension is very simple, it uses a usual keycode, it does
+not define custom keys. It allows for an existing key like dot or semi-colon 
+to have a different letter on its shifted value. 
+
+There are currently three types of shift mods.
+  * Give a different character than usual on shift.
+  * Give two of the usual character instead of one.
+  * Give three of the usual character instead of one.
+
+They are all defined in *defs/alt_shift.def*.
+Here are some silly examples.
+
+```
+ALT_SHIFT(US_EXLM, US_PERC)
+SHIFT_FOR_2(US_AT)
+SHIFT_FOR_3(US_DLR)
+```
+
+
+Key Overrides
+-------------------
+These are the standard QMK key overrides. For un/shifted pair keys *altlocal_keys* is
+much, +3x, smaller and direct in that it makes keycodes that can be placed anywhere.
+However, if ko's are desired, this extension is an easy place to start.
+
+There are nice macros which take care of defining everything that is possible
+with the ?_ko() functions
+
+This first example is better done with **altlocal_keys**.
+
+```
+// KOL(slash_pipe,      MOD_MASK_SHIFT, KC_SLSH, KC_PIPE, _DVORAK_EN)
+```
+
+Other key overrides can be defined with these.
+
+```
+KO(name, mods, key, replacement)
+
+KOL(name, mods, modded_key, replacement, layer)
+
+KOLN(name, mods, key, replacement, layer, neg_mods)
+
+KOLNO(name, mods, key, replacement, layer, neg_mods, options)
+```
+
+Combos/Chords
+----------------------------
+
+The combos here use multiple reference layers which is a pending
+pull request in the dev branch of QMK. The combos here will still work
+to an extent if *COMBO_ONLY_FROM_LAYER* is set to the correct layer number.
+
+[See my pull request to enhance combos here](https://github.com/qmk/qmk_firmware/pull/16699)
+
+This pull request defines a hook function for combos to determine the
+reference layer for the current layer.  This allows for multiple reference
+layers to be used depending on the situation.
+
+Reference layers will be created and used according to the following
+defines. 
+If the reference layer is enabled, it will automatically be assigned to
+COMBO_REF_DEFAULT and that will be the default reference if none
+is specified. If not specified, the reference will be the current layer.
+
+  * #define COMBO_REF_LAYER_ENABLE // enable a reference layer.
+  * #define COMBO_REF_LAYER_TWO_ENABLE // enable a second reference layer
+  * #define COMBO_ONLY_FROM_LAYER 2
+  * #define COMBO_REF_DEFAULT 2
+    Works in config.h if you know the number of your layer.
+    Automatically set if ref layer is enabled.
+
+Defining layer specific combo reference layers by layer in combos.def
+In this case, the default will be _COMBO_REF, the NAV layer will
+reference it's self, while bepo dvorak will reference the second
+combo reference layer. Keys start or end with CB or CB2.
+    
+```
+COMBO_REF_LAYER(_DVORAK_BP, _COMBO_REF2)
+COMBO_REF_LAYER(_NAV, _NAV)
+```
+
+The combo reference layers follow an easy to remember keycode naming
+convention so that it is easy to define combos based on position.
+Keycodes are prefixed by CB or CB2, the first number is the row,
+followed by L or R for left and right, then the column number,
+for each hand left to right.
+
+Row 0 is the number row, there are 4 rows possible.
+
+`CB_1L1` is the left pinky, `CB_1R1` is the inside right hand index column.
+
+```
+  _1L1,  _1L2, _1L3, _1L4,  _1L5,   _1R1, _1R2, _1R3, _1R4, _1R5, 
+```
+
+If there are edge keys, they are named accordingly, left and right.
+
+```
+L0_CB, L1_CB, L2_CB, L3_CB
+R0_CB, R1_CB, R2_CB, R3_CB
+```
+
+Thumb keys use the COMBO and COMBO2 thumb settings which give keycodes
+like this.
+
+```
+#define ___6_ERGO_THUMBS_COMBO___  CB_TH1, CB_TH2, CB_TH3, CB_TH4, CB_TH5, CB_TH6
+#define ___6_ERGO_THUMBS_COMBO2___ CB2_TH1, CB2_TH2, CB2_TH3, CB2_TH4, CB2_TH5, CB2_TH6
+```
+
+Tap-Hold
+-----------------------
+
+Tap hold currently has *tap_taplong* and *open_openclose* functions.
+These are in *tap_hold.c*, *tap_hold.h* and *tap_hold.defs*.
+Both use **TAP_HOLD_TERM** as the hold duration.
+
+Tap_taplong sends one keycode on tap, and another after a hold of tapping term.
+Open_openclose, sends one keycode on tap, hold sends that, plus the second, 
+followed by a back arrow.
+
+Additionally, open_openclose will send a triple of the open keycode when tapped with
+the shift modifier on.
+
+There as also a __not dead__ version of open_openclose that accomodates using
+dead keys like quote so that the functionalty behaves as if the key were not
+a dead key, giving a quote, a pair of quotes or a triple of quotes.
+
+The file _tap_hold.defs_ contains all the definitions. Like combos,
+these entries are processed with a function call from **process_user_record**
+`process_tap_hold_user(keycode, record);`
+
+Define your keys in *tap_hold.defs*.
+
+Here is Ctrl-C, Ctrl-V, as tap and long tap.
+```
+TP_TPL(KC_CCCV, LCTL(KC_C), LCTL(KC_V))
+```
+
+For tap open, hold for open and close then a back arrow.
+Here is __(__ or __()__ with tap and long tap.
+
+```
+OPEN_OCL(KC_OCPRN, KC_LPRN, KC_RPRN)
+
+OPEN_OCL(KC_OCQUOT, KC_QUOT, KC_QUOT)
+// non dead version of quote.
+OPEN_OCL_ND(BP_OCQUOT, BP_QUOT, BP_QUOT)
+OPEN_OCL_ND(US_OCQUOT, US_QUOT, US_QUOT)
+```
+
+It is also possible to trigger a smart lock with a hold.
+This example creates a keycode, `ENTNAV` which can be used
+to type enter, or smart lock the nav layer.
+Note that `SML_NAV` should be defined in `smart_lock.defs`.
+
+__Caveat:__
+This does have the unfortunate behavior of delaying the action
+until key up. So it may not be that useful. I did not like it
+for this particular example.
+
+```
+TP_SML(ENTNAV, KC_ENTER, SML_NAV)
+```
+
+Caps Word
+-------------
+This is a slightly modified version of caps word which adds a *CAPS_WORD_ON* keycode
+which can be used to turn caps word on explicitly. This is useful for mapping a
+single key or creating a combo.
+
+[As documented in here.](https://getreuer.info/posts/keyboards/caps-word/index.html)
+Holding both pinkies on home row for double tapping term, is effectively 
+right-shift and left-shift, invokes caps-word. The next word will be capitalized. 
+It continues until it shouldn't.
+
+Smart lock
+----------------
+They are defined in *smart_lock.def*. They need
+a custom keycode, and a layer or mods, not mod keycode, to apply, 
+followed by a list of keycodes to ignore and stay active. 
+This allows popping to layer which will stick until it doesn't. 
+Or to apply mods until it shouldn't. Each definition has it's
+own list of key codes to ignore. Derived from _smart_layers_
+by @possumvibes.
+
+Add a keycode to custom_keys.def then assign it to it's action in smart_lock.def.
+```
+// SMLL = smart lock layer.
+// SMLM = smart lock mod.
+
+// Keycode, layer/mod.
+// list of keycodes to ignore.
+
+SMLM(SMLM_LSFT, MOD_LSFT,
+  ___VI_ARROWS___,
+  ___HOME_PGDN_PGUP_END___,
+  ___TAB_PGDN_PGUP_BKTAB___,
+  ___SML_MODS_L___)
+
+SMLL(SML_NAV, _NAV, ___NAVA_3x10___)
+
+```
+
+Mod lock
+----------------
+Mod lock is originally from @possumvibes, it has ignore keys as well,
+but these keys apply to all locks defined. which gives a slightly smaller 
+memory footprint than smart locks. The mods, are keycodes, rather than mod codes.
+
+The behavior is the same as smart lock mods, but less flexible, and smaller.
+First create a keycode in custom_keys.def, then assign it to the mod you want.
+
+Ignore keys are universal for all mod locks.
+
+```
+// mod lock keys. takes keymods not mods.
+// keycode should be defined in custom_keys.def.
+// custom key,  modkey to activate
+MODL(ML_LSFT, KC_LSFT)
+MODL(ML_LCTL, KC_LCTL)
+MODL(ML_LALT, KC_LALT)
+MODL(ML_LGUI, KC_LGUI)
+
+// Keycodes which will NOT cancel mod lock mode.
+IGNORE_KC( KC_LEFT)
+IGNORE_KC( KC_RGHT)
+```
+
+N-shot mods
+----------------
+I simply modified N-shots to use a def file. This is essentially @possumvibes
+fancier version of @callum's one shot mods. It has ignore and cancel keys,
+and there are one shot mods or N shot mods. Ignore and cancel keys apply
+to all oneshot and n-shots.
+
+```
+// Define keycodes in custom keys.
+// KEYCode, mod keycode, to set for n-shot.
+// ONESHOT is for one.
+// NSHOT takes a count.
+
+// oneshots
+ONESHOT(OS_LSFT, KC_LSFT)
+
+// N-Shots
+NSHOT(TS_LCTL, KC_LCTL, 2)
+
+// Keys which will cancel the n-shots.
+CANCEL_KEY( PANIC)
+
+// Keys which will be ignored by n-shots.
+IGNORE_KEY( SML_NAV)
+```
+
+One-shot mods
+----------------
+This code came by way of @jurgen-kluft, I encapsulated the code and made 
+the user functions definable with a .def file. This is similar to N-shots. 
+This one keeps track of the last key consumed which helps it's decision making. 
+It also has cancel and ignore keys like N-shots.
+
+Essentially the same as n-shots, but with less elegant C code. Choose one or
+the other. 
+
+In evaluation.  The code for nshots is better.
+
+```
+// custom-key, Oneshot name.
+ONESHOT( OS_LSFT, ONESHOT_LSFT)
+
+// keys to cancel
+CANCEL_KEY( KC_ESC)
+
+// keys to ignore.
+IGNORE_KEY( SPC_NAV)
+```
+
+Swapper
+----------------
+I added the defs code so they are easy to define. This is a way to
+alternate between 2 keycodes for a key by sending another keycode. An
+example is tab or backtab on one key, which reverses when you press a
+second key. It also allows for mods to be applied. The following defines
+SW_WIN, which sends left alt-tab and shift- left alt- tab, when reversed
+by SW_REV.
+
+```
+SWAPPER_KEY(SW_WIN, SW_REV, KC_TAB, S(KC_TAB), KC_LALT)
+```
+Note: The switch key is not automatically defined in the custom keys enum in
+_keycodes.h_. It is convenient to use the same one which causes problems
+for automatically adding it. Add it to *custom_keys.def*
+
+Encoders
+----------------
+This is basic encoder stuff, modified to use a def file which makes it a lot easier
+to define and use. It can switch the encoder functions based on layers and mods.
+Give it a layer name and/or mods to match on, and the clockwise and counter 
+clockwise keycodes to send.
+
+I used LEFT and RIGHT, but really it's just 0-N, but I happen to have one
+on the left and one on the right. If you have one, use 0 or LEFT.
+
+The code scans the entries for matches on layer first, checking for a match for
+mods. If an encoder entry is not found it then scans for entries with
+layer set to LAYER_NONE.
+
+RGB light controls require calling the functions directly, for this
+there is a special macro and function that does this. The functions
+should take no arguments.
+
+```
+// Layer/none, encoder index 0/1, CW_KC, CCW_KC, Qualifying mod or none
+// LAYER_NONE and MOD_NONE for a single use.
+// LEFT and RIGHT for index. they go on from there, 2, 3, etc
+// if one encoder, LEFT/0, is the first one, on the master side.
+
+// default encoders, all layers no mods.
+ENCODER_ACTION(LAYER_NONE, RIGHT,  KC_PGDN, KC_PGUP, MOD_NONE)
+ENCODER_ACTION(LAYER_NONE, LEFT,  KC_DOWN, KC_UP, MOD_NONE)
+ENCODER_ACTION(LAYER_NONE, LEFT,  KC_PGDN, KC_PGUP, MOD_LSFT)
+
+// Symbol layer encoders.
+ENCODER_ACTION(_SYMB, LEFT, KC_LEFT, KC_RIGHT, MOD_NONE)
+
+// RGB function encoders
+ENCODER_FUNCTION(_RGB, LEFT,
+                rgb_matrix_increase_speed_noeeprom,
+                rgb_matrix_decrease_speed_noeeprom, MOD_NONE)
+```
+
+
+Unicode
+----------------
+This is just the basic unicode example everyone seems to have.
+Add your keys to send unicode strings like so.
+
+```
+ UC_STR(UC_DISA, "ಠ_ಠ")
+```
+
+Send_string
+--------------
+This is just basic send string functionality using *SEND_STRING* and 
+*SEND_STRING_DELAY*. Each entry defines a key to send a string.
+
+```
+SEND_STR(MYKEY, "this is a test")
+SEND_STR_DELAY(VRSN, QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE)
+```
+
+Console key logging - for heat maps.
+----------------------
+Both CONSOLE_ENABLE and CONSOLE_KEY_LOGGER_ENABLE must be enabled for this to work.
+
+This is a console key logger which can save keys typed for analysis of keymaps
+using Vlad/Precondition's heat map tool. The code for the logger came from
+[here](https://precondition.github.io/qmk-heatmap#how-to-collect-the-required-data)
+The explanation and use of the heatmap is [here](https://precondition.github.io/qmk-heatmap)
+
+There is a script ```listen_keylogger.sh``` which should be run to collect
+the keylogger data. 
+
+This does require **hid_listen** to be installed on the computer.
+On Arch linux this can by installed from the AUR with ```yay -S hid_listen```
+
+The output can also be seen just by using ```qmk console```.
+
+Note: _print.h_ is automatically included when CONSOLE_ENABLE is set. This allows 
+for debug messages anwhere in the code base as needed to see what might be going
+on.
 
 Tap Dance
 --------------------
-I have a lot of tap dance, It's turned off. It's big. tap-hold works pretty well most of the time, instead.
+I had a lot of tap dance, It's turned off. It's big. tap-hold works pretty well most of the time, instead.
 My favorites were tab-backtab,  home-end.
 
-Switching the OS keyboard
--------------------------
-This varies from system to system.  I use Arch Linux, so I use ```setxkbmap```.
-I've included a helper script which makes it easy to switch between EN and FR Bepo,
-called switch-kbd. In xmonad I invoke this with a keystroke. so, same deal. just map
-the keystroke to a key.
-
diff --git a/users/ericgebhart/rules.mk b/users/ericgebhart/rules.mk
index 8afaeb7808..2a30bb7756 100755
--- a/users/ericgebhart/rules.mk
+++ b/users/ericgebhart/rules.mk
@@ -1,26 +1,73 @@
+INTROSPECTION_KEYMAP_C = keymap/keymap.c # keymaps
 SRC += ericgebhart.c
-SRC += tap_dances.c
 SRC += process_records.c
-SRC += caps_word.c
-SRC += altlocal_keys.c
+SRC += $(USER_PATH)/lang/locales.c
+SRC += $(USER_PATH)/extensions/extensions.c
+SRC += $(USER_PATH)/extensions/tap_hold.c
+SRC += $(USER_PATH)/extensions/accented_keys.c
+SRC += $(USER_PATH)/extensions/altlocal_keys.c
+SRC += $(USER_PATH)/extensions/tap_dances.c
+SRC += $(USER_PATH)/extensions/encoders.c
+SRC += $(USER_PATH)/extensions/swapper.c
+SRC += $(USER_PATH)/extensions/mod_lock.c
+SRC += $(USER_PATH)/extensions/smart_lock.c
+SRC += $(USER_PATH)/extensions/nshot_mod.c
+SRC += $(USER_PATH)/extensions/oneshot.c
+SRC += $(USER_PATH)/extensions/unicode.c
+SRC += $(USER_PATH)/extensions/send_string.c
+SRC += $(USER_PATH)/extensions/console_key_logger.c
+SRC += $(USER_PATH)/extensions/not_dead.c
+SRC += $(USER_PATH)/extensions/alt_shift.c
+SRC += $(USER_PATH)/extensions/quick_tap.c
+SRC += $(USER_PATH)/oled/oled_stuff.c
+SRC += $(USER_PATH)/oled/oled_cartes.c
+SRC += $(USER_PATH)/oled/oled_layers.c
 
-VPATH += keyboards/gboards
+VPATH += $(USER_PATH)/layer_names
+VPATH += $(USER_PATH)/oled
+VPATH += $(USER_PATH)/extensions
+VPATH += $(USER_PATH)/base_layers
+VPATH += $(USER_PATH)/defs
+VPATH += $(USER_PATH)/keyboards
+VPATH += $(USER_PATH)/keymap
+VPATH += $(USER_PATH)/lang
+VPATH += $(USER_PATH)/layers
+VPATH += $(USER_PATH)/mod_layers
+VPATH += $(USER_PATH)/oled
 
+# MCU=STM32F411
+# BOARD=QMK_PROTON_C
+# SOFT_SERIAL_PIN=D2
+# # Bootloader selection
+# BOOTLOADER = stm32-dfu
+
+# WS2812_DRIVER = pwm
+# SERIAL_DRIVER = usart
+# AUDIO_ENABLE = no
+# LTO_ENABLE = no
+# CONVERT_TO_PROTON_C = yes
+
+# so the keyboard's code doesn't add stuff we don't need.
+# when we use our own oled renders.
+# oled_custom_enable should also be set in config.h.
 OLED_ENABLE = yes
+OLED_CUSTOM_ENABLE = yes
 
-ifeq ($(strip $(OLED_ENABLE)), yes)
-        SRC += $(USER_PATH)/oled_stuff.c
+ifeq ($(strip $(OLED_CUSTOM_ENABLE)), yes)
+        SRC += $(USER_PATH)/oled/oled_stuff.c
 endif
 
 
 MOUSEKEY_ENABLE  = yes # Mouse keys
-EXTRAKEY_ENABLE  = yes # Audio control and System control
+EXTRAKEY_ENABLE  = no # Audio control and System control
 COMMAND_ENABLE   = no # Commands for debug and configuration
 NKRO_ENABLE      = no # Enable N-Key Rollover
 SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
 KEY_LOCK_ENABLE  = no # Enable the KC_LOCK key
 TAP_DANCE_ENABLE = no # Enable the tap dance feature.
-CONSOLE_ENABLE   = no  # Console for debug
+KEY_OVERRIDE_ENABLE = no
+CONSOLE_ENABLE   = no  # Console for debug or keylogging.
+
 
 BOOTMAGIC_ENABLE = no  # Enable Bootmagic Lite
 UNICODE_ENABLE   = no
@@ -32,3 +79,9 @@ SPACE_CADET_ENABLE = no
 GRAVE_ESC_ENABLE = no
 MAGIC_ENABLE = no
 COMBO_ENABLE = yes
+CAPS_WORD_ENABLE = yes
+
+ENCODER_ENABLE = no
+RGBLIGHT_ENABLE = no
+BACKLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = no
diff --git a/users/ericgebhart/switch-kbd b/users/ericgebhart/switch-kbd
deleted file mode 100755
index 4401967a0f..0000000000
--- a/users/ericgebhart/switch-kbd
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env zsh
-
-# Switch the keyboard to en-us by default, bepo, or en-dvorak.
-
-help(){
-    print 'switch-kbd - helper for setxkbmap'
-    print ' '
-    print 'Change the keyboard to en-us, fr-bepo, or en-dvorak.'
-    print 'Uses setxkbmap, so the change only affects the current'
-    print 'session.  This mainly to avoid using a toggle key.'
-    print ' '
-    print ' -b           Bepo'
-    print ' -d           Dvorak'
-    print ' -n           do not execute'
-    print ' -h           help text.'
-    print ' '
-    print ' The default is to set the keyboard to en-us.'
-    exit
-}
-
-layout="-layout us"
-variant=""
-let "execute = 1"
-let "verose = 0"
-
-# $opt will hold the current option
-local opt
-while getopts bdnvh opt; do
-    # loop continues till options finished
-    # see which pattern $opt matches...
-    case $opt in
-        (b)
-            layout="-layout fr"
-            variant="-variant bepo"
-            ;;
-
-        (d)
-            layout="-layout en"
-            variant="-variant dvorak"
-            ;;
-        (n) 
-            let "execute = 0"
-	    ;;
-        (v) 
-            let "verbose = 1"
-	    ;;
-        (h)
-            help
-            ;;
-	# matches a question mark
-	# (and nothing else, see text)
-        (\?)
-            print "Bad option:" $*
-            print " "
-            help
-            return 1
-            ;;
-    esac
-done
-(( OPTIND > 1 )) && shift $(( OPTIND - 1 ))
-##print Remaining arguments are: $*
-
-mycommand='setxkbmap '${layout}' '${variant}
-
-if [[ ( $verbose -ne 0 ) ]]; then;
-	print "setxkbmap Command:" $mycommand
-fi
-
-if [[ ( $execute -ne 0 ) ]]
-then;
-	eval $mycommand
-else;
-        print "did not execute"
-fi

From 092228571c40a31d88940055b4d2fa749f135314 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 12 Nov 2022 10:57:44 +1100
Subject: [PATCH 842/959] Move EFL wear-leveling driver to be default for F1,
 F3, F4, L4, G4, WB32, GD32V. (#19020)

---
 builddefs/common_features.mk                  | 23 ++++++++++++++-----
 builddefs/mcu_selection.mk                    |  7 +++---
 keyboards/acheron/apollo/87h/delta/rules.mk   |  2 --
 keyboards/acheron/apollo/87h/gamma/rules.mk   |  2 --
 keyboards/acheron/apollo/87htsc/rules.mk      |  2 --
 keyboards/acheron/apollo/88htsc/rules.mk      |  3 ---
 keyboards/matrix/m12og/rev1/rules.mk          |  1 +
 keyboards/mechlovin/hex6c/config.h            |  4 +++-
 keyboards/rgbkb/mun/config.h                  |  3 +++
 keyboards/rgbkb/sol3/config.h                 |  3 +++
 keyboards/yugo_m/model_m_101/config.h         |  5 ++--
 .../wear_leveling/wear_leveling_efl_config.h  |  4 +++-
 12 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index e597924469..c6a67ee87d 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -177,7 +177,7 @@ ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
     include $(QUANTUM_DIR)/painter/rules.mk
 endif
 
-VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling
+VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
 EEPROM_DRIVER ?= vendor
 ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
   $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
@@ -204,6 +204,12 @@ else
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
     QUANTUM_LIB_SRC += spi_master.c
     SRC += eeprom_driver.c eeprom_spi.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
+    # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+    COMMON_VPATH += $(DRIVER_PATH)/flash
+    SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
   else ifeq ($(strip $(EEPROM_DRIVER)), transient)
     # Transient EEPROM implementation -- no data storage but provides runtime area for it
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
@@ -214,20 +220,25 @@ else
     ifeq ($(PLATFORM),AVR)
       # Automatically provided by avr-libc, nothing required
     else ifeq ($(PLATFORM),CHIBIOS)
-      ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
-        # Emulated EEPROM
+      ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+        # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
         COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
         COMMON_VPATH += $(DRIVER_PATH)/flash
         SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
+      else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx GD32VF103),)
+        # Wear-leveling EEPROM implementation, backed by MCU flash
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
+        WEAR_LEVELING_DRIVER = embedded_flash
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
         # True EEPROM on STM32L0xx, L1xx
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
         SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
       else ifneq ($(filter $(MCU_SERIES),RP2040),)
-		# Wear-leveling EEPROM implementation, backed by RP2040 flash
-		OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-		SRC += eeprom_driver.c eeprom_wear_leveling.c
+        # Wear-leveling EEPROM implementation, backed by RP2040 flash
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
         WEAR_LEVELING_DRIVER = rp2040_flash
       else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
         # Teensy EEPROM implementations
diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index 0ea9630d59..de919bd263 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -348,8 +348,6 @@ ifneq ($(findstring STM32F401, $(MCU)),)
   #   or <keyboard_dir>/ld/
   ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
-    EEPROM_DRIVER ?= wear_leveling
-    WEAR_LEVELING_DRIVER ?= legacy
   else
     MCU_LDSCRIPT ?= STM32F401xC
   endif
@@ -465,8 +463,6 @@ ifneq ($(findstring STM32F411, $(MCU)),)
   #   or <keyboard_dir>/ld/
   ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
-    EEPROM_DRIVER ?= wear_leveling
-    WEAR_LEVELING_DRIVER ?= legacy
   else
     MCU_LDSCRIPT ?= STM32F411xE
   endif
@@ -520,6 +516,9 @@ ifneq ($(findstring STM32F446, $(MCU)),)
 
   # Bootloader address for STM32 DFU
   STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
+
+  # Default as no chibios efl config
+  EEPROM_DRIVER ?= transient
 endif
 
 ifneq ($(findstring STM32G431, $(MCU)),)
diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk
index 814a3f15f0..4fa4db5450 100644
--- a/keyboards/acheron/apollo/87h/delta/rules.mk
+++ b/keyboards/acheron/apollo/87h/delta/rules.mk
@@ -19,8 +19,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = legacy
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
index c05ab3c41a..5b419929d5 100644
--- a/keyboards/acheron/apollo/87h/gamma/rules.mk
+++ b/keyboards/acheron/apollo/87h/gamma/rules.mk
@@ -20,8 +20,6 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = IS31FL3741
 KEYBOARD_SHARED_EP = yes
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = legacy
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk
index f2becf4db4..4fa4db5450 100644
--- a/keyboards/acheron/apollo/87htsc/rules.mk
+++ b/keyboards/acheron/apollo/87htsc/rules.mk
@@ -20,7 +20,5 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = legacy
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk
index 18e8b33b07..4fa4db5450 100644
--- a/keyboards/acheron/apollo/88htsc/rules.mk
+++ b/keyboards/acheron/apollo/88htsc/rules.mk
@@ -20,8 +20,5 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = legacy
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk
index d9733e8c5e..136d07cbaa 100644
--- a/keyboards/matrix/m12og/rev1/rules.mk
+++ b/keyboards/matrix/m12og/rev1/rules.mk
@@ -20,6 +20,7 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # HAS TO BE ON! Otherwise the custom matrix doesn't work
 AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
 
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
index c3125f217f..5f88d8ee70 100644
--- a/keyboards/mechlovin/hex6c/config.h
+++ b/keyboards/mechlovin/hex6c/config.h
@@ -54,4 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODER_RESOLUTION 4
 
 #define TAP_CODE_DELAY 10
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
\ No newline at end of file
+
+#define WEAR_LEVELING_BACKING_SIZE 4096
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index bcf4c59b65..345f701e7f 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -154,3 +154,6 @@
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
 #define TAP_CODE_DELAY 5
+
+#define WEAR_LEVELING_BACKING_SIZE 4096
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 1ab4cddc9b..195953f7ae 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -172,3 +172,6 @@
 #define AUDIO_CLICKY
 #define AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
 #define AUDIO_DAC_OFF_VALUE 0
+
+#define WEAR_LEVELING_BACKING_SIZE 4096
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/yugo_m/model_m_101/config.h
index c22bc610c3..0a9349aac1 100644
--- a/keyboards/yugo_m/model_m_101/config.h
+++ b/keyboards/yugo_m/model_m_101/config.h
@@ -91,5 +91,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* redefine available (emulated) EEPROM as 4 kB rather than the default 1 kB to let VIA use more of the 8 kB of on-chip Flash of the STM32F303 to store 4 layers (since 4 layers * 8 rows * 16 columns * 2 = 1024 bytes but the default max available is 1023 bytes due to ATMEGA32U4 etc. only having 1 kB of EEPROM) */
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
+/* redefine available (emulated) EEPROM as 4 kB rather than the default 2 kB to let VIA use more of the on-chip Flash of the STM32F303 to store 4 layers (since 4 layers * 8 rows * 16 columns * 2 = 1024 bytes but the default max available is 1023 bytes due to ATMEGA32U4 etc. only having 1 kB of EEPROM) */
+#define WEAR_LEVELING_BACKING_SIZE 4096
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
index 244c87cb7f..e74cf85efd 100644
--- a/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_efl_config.h
@@ -20,7 +20,9 @@
 #        if defined(STM32_FLASH_LINE_SIZE) // from some family's stm32_registry.h file
 #            define BACKING_STORE_WRITE_SIZE (STM32_FLASH_LINE_SIZE)
 #        else
-#            if defined(QMK_MCU_SERIES_STM32F1XX)
+#            if defined(QMK_MCU_SERIES_STM32F0XX)
+#                define BACKING_STORE_WRITE_SIZE 2 // from hal_efl_lld.c
+#            elif defined(QMK_MCU_SERIES_STM32F1XX)
 #                define BACKING_STORE_WRITE_SIZE 2 // from hal_efl_lld.c
 #            elif defined(QMK_MCU_SERIES_STM32F3XX)
 #                define BACKING_STORE_WRITE_SIZE 2 // from hal_efl_lld.c

From 1caedd10c45adef49724f5aa0967e23286f4dd38 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 11 Nov 2022 18:11:50 -0800
Subject: [PATCH 843/959] Don't clear keys on layer change unless
 STRICT_LAYER_RELEASE is enabled (#18577)

* Don't clear mousekeys unless clearing keys

* Revert "Don't clear mousekeys unless clearing keys"

This reverts commit 29a0c06b547d72b80d416a8b6fab478c77fbd247.

* Just don't clear anything on layer set

* Fix lint

* Enable test?
---
 quantum/action_layer.c            | 8 ++++----
 tests/basic/test_action_layer.cpp | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index 8ef337a690..31cfdfe13a 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -45,9 +45,9 @@ static void default_layer_state_set(layer_state_t state) {
     default_layer_state = state;
     default_layer_debug();
     debug("\n");
-#ifdef STRICT_LAYER_RELEASE
+#if defined(STRICT_LAYER_RELEASE)
     clear_keyboard_but_mods(); // To avoid stuck keys
-#else
+#elif defined(SEMI_STRICT_LAYER_RELEASE)
     clear_keyboard_but_mods_and_keys(); // Don't reset held keys
 #endif
 }
@@ -125,9 +125,9 @@ void layer_state_set(layer_state_t state) {
     layer_state = state;
     layer_debug();
     dprintln();
-#    ifdef STRICT_LAYER_RELEASE
+#    if defined(STRICT_LAYER_RELEASE)
     clear_keyboard_but_mods(); // To avoid stuck keys
-#    else
+#    elif defined(SEMI_STRICT_LAYER_RELEASE)
     clear_keyboard_but_mods_and_keys(); // Don't reset held keys
 #    endif
 }
diff --git a/tests/basic/test_action_layer.cpp b/tests/basic/test_action_layer.cpp
index fa339a3375..d0a28d42c0 100644
--- a/tests/basic/test_action_layer.cpp
+++ b/tests/basic/test_action_layer.cpp
@@ -360,7 +360,6 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
 }
 
 TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
-    GTEST_SKIP() << "TODO: Modifiers are erroneously discarded on layer changes, although a key that introduced the modifier is still held.";
     TestDriver driver;
     InSequence s;
 

From 8cecf7fad8614de2defd43f225250186cc517f38 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 12 Nov 2022 14:20:44 +1100
Subject: [PATCH 844/959] onekey: disable NKRO and mousekeys by default
 (#19038)

---
 keyboards/handwired/onekey/bluepill_f103c6/rules.mk | 4 ----
 keyboards/handwired/onekey/info.json                | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index c76a8ebe6e..208165ab31 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -13,10 +13,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 # LTO is required to fit the firmware into the available 24K of flash
 LTO_ENABLE = yes
 
-# Disable some features which still don't fit into flash even with LTO
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = no
-
 # EEPROM emulation not supported yet (need to implement a proper firmware size
 # check first, otherwise the chance of the EEPROM backing store overwriting
 # some part of the firmware code is really high).
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 605e73e726..0639ec99fd 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -10,11 +10,11 @@
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": false,
-        "mousekey": true,
+        "mousekey": false,
         "extrakey": true,
         "console": true,
         "command": false,
-        "nkro": true,
+        "nkro": false,
         "backlight": false,
         "rgblight": false,
         "audio": false

From b7c6d6d79faddf06e0d3471ad7cbcbd2a98a2e5e Mon Sep 17 00:00:00 2001
From: jels <66403163+Jels02@users.noreply.github.com>
Date: Sun, 13 Nov 2022 08:56:21 +1000
Subject: [PATCH 845/959] [Keyboard] Add pumpkin pad (#18897)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/laser_ninja/pumpkin_pad/config.h    | 60 ++++++++++++++
 keyboards/laser_ninja/pumpkin_pad/info.json   | 78 +++++++++++++++++++
 .../pumpkin_pad/keymaps/default/keymap.c      | 31 ++++++++
 .../pumpkin_pad/keymaps/via/keymap.c          | 41 ++++++++++
 .../pumpkin_pad/keymaps/via/rules.mk          |  1 +
 keyboards/laser_ninja/pumpkin_pad/readme.md   | 23 ++++++
 keyboards/laser_ninja/pumpkin_pad/rules.mk    |  1 +
 7 files changed, 235 insertions(+)
 create mode 100644 keyboards/laser_ninja/pumpkin_pad/config.h
 create mode 100644 keyboards/laser_ninja/pumpkin_pad/info.json
 create mode 100644 keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c
 create mode 100644 keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c
 create mode 100644 keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk
 create mode 100644 keyboards/laser_ninja/pumpkin_pad/readme.md
 create mode 100644 keyboards/laser_ninja/pumpkin_pad/rules.mk

diff --git a/keyboards/laser_ninja/pumpkin_pad/config.h b/keyboards/laser_ninja/pumpkin_pad/config.h
new file mode 100644
index 0000000000..926d8788c1
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkin_pad/config.h
@@ -0,0 +1,60 @@
+/* Copyright 2022 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_DI_PIN A10
+#    define RGBLED_NUM 28
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define BACKLIGHT_LIMIT_VAL 200
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#endif
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/laser_ninja/pumpkin_pad/info.json b/keyboards/laser_ninja/pumpkin_pad/info.json
new file mode 100644
index 0000000000..cf37ffd9a5
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkin_pad/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "Pumpkin Pad",
+    "manufacturer": "Laser Ninja",
+    "url": "",
+    "maintainer": "Jels",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["A9", "B3", "B9", "NO_PIN"],
+            ["A8", "B12", "A2", "A1"],
+            ["B15", "B14", "B13", "NO_PIN"]
+        ]
+    },
+    "usb": {
+        "vid": "0x6C6E",
+        "pid": "0x7070",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0.5, "y": 0 },
+                { "matrix": [0, 1], "x": 1.5, "y": 0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [2, 0], "x": 0.5, "y": 2 },
+                { "matrix": [2, 1], "x": 1.5, "y": 2 },
+                { "matrix": [2, 2], "x": 2.5, "y": 2 }
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 2, "x": 36, "y": 3 },
+            { "flags": 2, "x": 86, "y": 2 },
+            { "flags": 2, "x": 138, "y": 2 },
+            { "flags": 2, "x": 188, "y": 2 },
+            { "flags": 2, "x": 215, "y": 16 },
+            { "flags": 2, "x": 215, "y": 16 },
+            { "flags": 4, "matrix": [0, 2], "x": 167, "y": 17 },
+            { "flags": 4, "matrix": [0, 1], "x": 112, "y": 17 },
+            { "flags": 4, "matrix": [0, 0], "x": 57, "y": 17 },
+            { "flags": 2, "x": 9, "y": 15 },
+            { "flags": 2, "x": 9, "y": 15 },
+            { "flags": 2, "x": 6, "y": 34 },
+            { "flags": 2, "x": 9, "y": 48 },
+            { "flags": 2, "x": 9, "y": 48 },
+            { "flags": 4, "matrix": [1, 0], "x": 29, "y": 38 },
+            { "flags": 4, "matrix": [1, 1], "x": 84, "y": 38 },
+            { "flags": 4, "matrix": [1, 2], "x": 140, "y": 38 },
+            { "flags": 2, "x": 218, "y": 34 },
+            { "flags": 2, "x": 215, "y": 48 },
+            { "flags": 2, "x": 215, "y": 48 },
+            { "flags": 2, "x": 188, "y": 61 },
+            { "flags": 4, "matrix": [2, 2], "x": 167, "y": 59 },
+            { "flags": 2, "x": 138, "y": 61 },
+            { "flags": 4, "matrix": [2, 1], "x": 112, "y": 59 },
+            { "flags": 2, "x": 86, "y": 61 },
+            { "flags": 4, "matrix": [2, 0], "x": 57, "y": 59 },
+            { "flags": 2, "x": 36, "y": 61 }
+        ]
+    }
+}
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c b/keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8b60519b90
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+    KC_F1, KC_F2, KC_F3,
+    KC_F4, KC_F5, KC_F6, KC_F7,
+    KC_F8, MO(1), KC_F10
+),
+[1] = LAYOUT(
+    RGB_TOG, RGB_MOD, RGB_RMOD,
+    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,
+    RGB_VAI, RGB_VAD, _______
+)
+};
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c b/keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a63a5a0047
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+    KC_F1, KC_F2, KC_F3,
+    KC_F4, KC_F5, KC_F6, KC_F7,
+    KC_F8, MO(1), KC_F10
+),
+[1] = LAYOUT(
+    RGB_TOG, RGB_MOD, RGB_RMOD,
+    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,
+    RGB_VAI, RGB_VAD, _______
+),
+[2] = LAYOUT(
+    _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______
+),
+[3] = LAYOUT(
+    _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______
+)
+};
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk b/keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/laser_ninja/pumpkin_pad/readme.md b/keyboards/laser_ninja/pumpkin_pad/readme.md
new file mode 100644
index 0000000000..452f4f6723
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkin_pad/readme.md
@@ -0,0 +1,23 @@
+# Pumpkin Pad
+
+![pumpkin-pad](https://i.imgur.com/jFkl9rwh.jpg)
+
+A 60% PCB
+
+-   Keyboard Maintainer: [Jels](https://github.com/Jels02)
+-   Hardware Supported: Pumpkin Pad PCB
+-   Hardware Availabililty: [Laser_Ninja](https://kennui.com/w/Laser_Ninja)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make laser_ninja/pumpkin_pad:default
+
+Flashing example for this keyboard:
+
+    make laser_ninja/pumpkin_pad:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+-   **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+-   **Physical reset button**: Briefly press the button on the back of the PCB
+-   **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/laser_ninja/pumpkin_pad/rules.mk b/keyboards/laser_ninja/pumpkin_pad/rules.mk
new file mode 100644
index 0000000000..08a1c1568c
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkin_pad/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank.

From 6cc9513ab0cd5e21354c51ab83a89af9f2eb517e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 13 Nov 2022 10:28:11 +1100
Subject: [PATCH 846/959] Digitizer feature improvements (#19034)

---
 docs/feature_digitizer.md                     | 118 +++++++++++++++---
 .../onekey/keymaps/digitizer/keymap.c         |  72 +++++++----
 quantum/digitizer.c                           |  64 ++++++++--
 quantum/digitizer.h                           |  67 ++++++++--
 quantum/keyboard.c                            |   7 --
 quantum/quantum.h                             |   4 +
 tmk_core/protocol/host.c                      |   9 +-
 tmk_core/protocol/report.h                    |   7 +-
 tmk_core/protocol/usb_descriptor.c            |  44 ++++---
 tmk_core/protocol/vusb/vusb.c                 |  24 ++--
 10 files changed, 298 insertions(+), 118 deletions(-)

diff --git a/docs/feature_digitizer.md b/docs/feature_digitizer.md
index ac2d64f977..2e9e37cd5f 100644
--- a/docs/feature_digitizer.md
+++ b/docs/feature_digitizer.md
@@ -1,35 +1,117 @@
-## Digitizer
+# Digitizer :id=digitizer
 
-The digitizer HID interface allows setting the mouse cursor position at absolute coordinates, unlike the Pointing Device feature that applies relative displacements.
+Digitizers allow the mouse cursor to be placed at absolute coordinates, unlike the [Pointing Device](feature_pointing_device.md) feature which applies relative displacements.
 
-To enable the digitizer interface, add the following line to your rules.mk: 
+This feature implements a stylus device with a tip switch and barrel switch (generally equivalent to the primary and secondary mouse buttons respectively). Tip pressure is not currently implemented.
+
+## Usage :id=usage
+
+Add the following to your `rules.mk`:
 
 ```make
 DIGITIZER_ENABLE = yes
 ```
 
-In order to change the mouse cursor position from your keymap.c file, include the digitizer header : 
+## Positioning :id=positioning
+
+The X and Y coordinates are normalized, meaning their value must be set between 0 and 1. For the X component, the value `0` is the leftmost position, whereas the value `1` is the rightmost position. Similarly for the Y component, `0` is at the top and `1` at the bottom.
+
+?> Since there is no display attached, the OS will likely map these coordinates to the virtual desktop. This may be important to know if you have multiple monitors.
+
+## Examples :id=examples
+
+This example simply places the cursor in the middle of the screen:
 
 ```c
-#include "digitizer.h"
+digitizer_in_range_on();
+digitizer_set_position(0.5, 0.5);
 ```
 
-This gives you access to the `digitizer` structure which members allow you to change the cursor position.
+The "in range" indicator is required to be on for the change in coordinates to be taken. It can then be turned off again to signal the end of the digitizer interaction, but it is not strictly required.
 
-The coordinates are normalized, meaning there value must be set between 0 and 1. For the `x` coordinate, the value `0` is the leftmost position, whereas the value `1` is the rightmost position.
-For the `y` coordinate, `0` is at the top and `1` at the bottom.
-
-Here is an example setting the cursor in the middle of the screen:
+You can also modify the digitizer state directly, if you need to change multiple fields in a single report:
 
 ```c
-digitizer_t digitizer;
-digitizer.x = 0.5;
-digitizer.y = 0.5;
-digitizer.tipswitch = 0;
-digitizer.inrange = 1;
-digitizer_set_report(digitizer);
+digitizer_state.in_range = true;
+digitizer_state.dirty = true;
+digitizer_flush();
 ```
 
-The `tipswitch` member triggers what equates to a click when set to `1`. The `inrange` member is required for the change in coordinates to be taken. It can then be set to `0` in a new report to signal the end of the digitizer interaction, but it is not strictly required.
+`digitizer_state` is a struct of type `digitizer_t`.
 
-Once all members are set to the desired value, the `status` member needs its bitmask `DZ_UPDATED` to be set so the report is sent during the next main loop iteration.
+
+## API :id=api
+
+### `struct digitizer_t` :id=api-digitizer-t
+
+Contains the state of the digitizer.
+
+#### Members :id=api-digitizer-t-members
+
+ - `bool in_range`  
+   Indicates to the host that the contact is within range (ie. close to or in contact with the digitizer surface).
+ - `bool tip`  
+   The state of the tip switch.
+ - `bool barrel`  
+   The state of the barrel switch.
+ - `float x`  
+   The X coordinate of the digitizer contact.
+ - `float y`  
+   The Y coordinate of the digitizer contact.
+ - `bool dirty`  
+   Whether the current state needs to be sent to the host.
+
+---
+
+### `void digitizer_flush(void)` :id=api-digitizer-flush
+
+Send the digitizer report to the host if it is marked as dirty.
+
+---
+
+### `void digitizer_in_range_on(void)` :api-digitizer-in-range-on
+
+Assert the "in range" indicator, and flush the report.
+
+---
+
+### `void digitizer_in_range_off(void)` :api-digitizer-in-range-off
+
+Deassert the "in range" indicator, and flush the report.
+
+---
+
+### `void digitizer_tip_switch_on(void)` :api-digitizer-tip-switch-on
+
+Assert the tip switch, and flush the report.
+
+---
+
+### `void digitizer_tip_switch_off(void)` :api-digitizer-tip-switch-off
+
+Deassert the tip switch, and flush the report.
+
+---
+
+### `void digitizer_barrel_switch_on(void)` :api-digitizer-barrel-switch-on
+
+Assert the barrel switch, and flush the report.
+
+---
+
+### `void digitizer_barrel_switch_off(void)` :api-digitizer-barrel-switch-off
+
+Deassert the barrel switch, and flush the report.
+
+---
+
+### `void digitizer_set_position(float x, float y)` :api-digitizer-set-position
+
+Set the absolute X and Y position of the digitizer contact, and flush the report.
+
+#### Arguments :id=api-digitizer-set-position-arguments
+
+ - `float x`  
+   The X value of the contact position, from 0 to 1.
+ - `float y`  
+   The Y value of the contact position, from 0 to 1.
diff --git a/keyboards/handwired/onekey/keymaps/digitizer/keymap.c b/keyboards/handwired/onekey/keymaps/digitizer/keymap.c
index 6b304e86fe..dcc0adc59b 100644
--- a/keyboards/handwired/onekey/keymaps/digitizer/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/digitizer/keymap.c
@@ -1,38 +1,58 @@
- /* Copyright 2021 QMK 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include QMK_KEYBOARD_H
 
-#include "digitizer.h"
+#include <math.h>
 
-#include "math.h"
+enum custom_keycodes {
+    DG_TIP = SAFE_RANGE,
+};
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {LAYOUT_ortho_1x1(KC_A)};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ortho_1x1(DG_TIP)
+};
 
 uint32_t timer = 0;
 
+void keyboard_post_init_user(void) {
+    digitizer_in_range_on();
+}
+
 void matrix_scan_user() {
     if (timer_elapsed32(timer) < 200) {
         return;
     }
-    
-    timer               = timer_read32();
-    digitizer_t digitizer;
-    digitizer.x         = 0.5 - 0.2 * cos(timer_read() / 250. / 6.28);
-    digitizer.y         = 0.5 - 0.2 * sin(timer_read() / 250. / 6.28);
-    digitizer.tipswitch = 0;
-    digitizer.inrange   = 1;
-    digitizer_set_report(digitizer);
+
+    timer = timer_read32();
+
+    float x = 0.5 - 0.2 * cos(timer / 250. / 6.28);
+    float y = 0.5 - 0.2 * sin(timer / 250. / 6.28);
+    digitizer_set_position(x, y);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case DG_TIP:
+            if (record->event.pressed) {
+                digitizer_tip_switch_on();
+            } else {
+                digitizer_tip_switch_off();
+            }
+            return false;
+    }
+    return true;
 }
diff --git a/quantum/digitizer.c b/quantum/digitizer.c
index 7925129d0c..f1b926181e 100644
--- a/quantum/digitizer.c
+++ b/quantum/digitizer.c
@@ -13,26 +13,64 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "digitizer.h"
 
-digitizer_t digitizerReport = {.tipswitch = 0, .inrange = 0, .id = 0, .x = 0, .y = 0, .status = DZ_INITIALIZED};
+digitizer_t digitizer_state = {
+    .in_range = false,
+    .tip      = false,
+    .barrel   = false,
+    .x        = 0,
+    .y        = 0,
+    .dirty    = false,
+};
 
-__attribute__((weak)) void digitizer_send(void) {
-    if (digitizerReport.status & DZ_UPDATED) {
-        host_digitizer_send(&digitizerReport);
-        digitizerReport.status &= ~DZ_UPDATED;
+void digitizer_flush(void) {
+    if (digitizer_state.dirty) {
+        host_digitizer_send(&digitizer_state);
+        digitizer_state.dirty = false;
     }
 }
 
-__attribute__((weak)) void digitizer_task(void) {
-    digitizer_send();
+void digitizer_in_range_on(void) {
+    digitizer_state.in_range = true;
+    digitizer_state.dirty    = true;
+    digitizer_flush();
 }
 
-digitizer_t digitizer_get_report(void) {
-    return digitizerReport;
+void digitizer_in_range_off(void) {
+    digitizer_state.in_range = false;
+    digitizer_state.dirty    = true;
+    digitizer_flush();
 }
 
-void digitizer_set_report(digitizer_t newDigitizerReport) {
-    digitizerReport = newDigitizerReport;
-    digitizerReport.status |= DZ_UPDATED;
-}
\ No newline at end of file
+void digitizer_tip_switch_on(void) {
+    digitizer_state.tip   = true;
+    digitizer_state.dirty = true;
+    digitizer_flush();
+}
+
+void digitizer_tip_switch_off(void) {
+    digitizer_state.tip   = false;
+    digitizer_state.dirty = true;
+    digitizer_flush();
+}
+
+void digitizer_barrel_switch_on(void) {
+    digitizer_state.barrel = true;
+    digitizer_state.dirty  = true;
+    digitizer_flush();
+}
+
+void digitizer_barrel_switch_off(void) {
+    digitizer_state.barrel = false;
+    digitizer_state.dirty  = true;
+    digitizer_flush();
+}
+
+void digitizer_set_position(float x, float y) {
+    digitizer_state.x     = x;
+    digitizer_state.y     = y;
+    digitizer_state.dirty = true;
+    digitizer_flush();
+}
diff --git a/quantum/digitizer.h b/quantum/digitizer.h
index cef551567e..b826ba8ac8 100644
--- a/quantum/digitizer.h
+++ b/quantum/digitizer.h
@@ -17,25 +17,70 @@
 
 #include "quantum.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 
-enum digitizer_status { DZ_INITIALIZED = 1, DZ_UPDATED = 2 };
+/**
+ * \defgroup digitizer
+ *
+ * HID Digitizer
+ * \{
+ */
 
 typedef struct {
-    int8_t  tipswitch;
-    int8_t  inrange;
-    uint8_t id;
-    float   x;
-    float   y;
-    uint8_t status : 2;
+    bool  in_range : 1;
+    bool  tip : 1;
+    bool  barrel : 1;
+    float x;
+    float y;
+    bool  dirty;
 } digitizer_t;
 
-extern digitizer_t digitizer;
+extern digitizer_t digitizer_state;
 
-digitizer_t digitizer_get_report(void);
+/**
+ * \brief Send the digitizer report to the host if it is marked as dirty.
+ */
+void digitizer_flush(void);
 
-void digitizer_set_report(digitizer_t newDigitizerReport);
+/**
+ * \brief Assert the "in range" indicator, and flush the report.
+ */
+void digitizer_in_range_on(void);
 
-void digitizer_task(void);
+/**
+ * \brief Deassert the "in range" indicator, and flush the report.
+ */
+void digitizer_in_range_off(void);
+
+/**
+ * \brief Assert the tip switch, and flush the report.
+ */
+void digitizer_tip_switch_on(void);
+
+/**
+ * \brief Deassert the tip switch, and flush the report.
+ */
+void digitizer_tip_switch_off(void);
+
+/**
+ * \brief Assert the barrel switch, and flush the report.
+ */
+void digitizer_barrel_switch_on(void);
+
+/**
+ * \brief Deassert the barrel switch, and flush the report.
+ */
+void digitizer_barrel_switch_off(void);
+
+/**
+ * \brief Set the absolute X and Y position of the digitizer contact, and flush the report.
+ *
+ * \param x The X value of the contact position, from 0 to 1.
+ * \param y The Y value of the contact position, from 0 to 1.
+ */
+void digitizer_set_position(float x, float y);
 
 void host_digitizer_send(digitizer_t *digitizer);
+
+/** \} */
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index eb5e4b583a..83ade7829a 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -90,9 +90,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if defined(CRC_ENABLE)
 #    include "crc.h"
 #endif
-#ifdef DIGITIZER_ENABLE
-#    include "digitizer.h"
-#endif
 #ifdef VIRTSER_ENABLE
 #    include "virtser.h"
 #endif
@@ -662,10 +659,6 @@ void keyboard_task(void) {
     joystick_task();
 #endif
 
-#ifdef DIGITIZER_ENABLE
-    digitizer_task();
-#endif
-
 #ifdef BLUETOOTH_ENABLE
     bluetooth_task();
 #endif
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 4192b3fb16..c8dfdeca75 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -207,6 +207,10 @@ extern layer_state_t layer_state;
 #    include "joystick.h"
 #endif
 
+#ifdef DIGITIZER_ENABLE
+#    include "digitizer.h"
+#endif
+
 #ifdef VIA_ENABLE
 #    include "via.h"
 #endif
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index b441d2d5d9..5fee872326 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -217,10 +217,11 @@ void host_digitizer_send(digitizer_t *digitizer) {
 #    ifdef DIGITIZER_SHARED_EP
         .report_id = REPORT_ID_DIGITIZER,
 #    endif
-        .tip     = digitizer->tipswitch & 0x1,
-        .inrange = digitizer->inrange & 0x1,
-        .x       = (uint16_t)(digitizer->x * 0x7FFF),
-        .y       = (uint16_t)(digitizer->y * 0x7FFF),
+        .in_range = digitizer->in_range,
+        .tip      = digitizer->tip,
+        .barrel   = digitizer->barrel,
+        .x        = (uint16_t)(digitizer->x * 0x7FFF),
+        .y        = (uint16_t)(digitizer->y * 0x7FFF),
     };
 
     send_digitizer(&report);
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 8bc4a57c0c..543c44e33c 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -226,9 +226,10 @@ typedef struct {
 #ifdef DIGITIZER_SHARED_EP
     uint8_t report_id;
 #endif
-    uint8_t  tip : 1;
-    uint8_t  inrange : 1;
-    uint8_t  pad2 : 6;
+    bool     in_range : 1;
+    bool     tip : 1;
+    bool     barrel : 1;
+    uint8_t  reserved : 5;
     uint16_t x;
     uint16_t y;
 } __attribute__((packed)) report_digitizer_t;
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index 7117d2fc11..3c170f1112 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -181,39 +181,37 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM DigitizerReport[] = {
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
 #        define SHARED_REPORT_STARTED
 #    endif
-    HID_RI_USAGE_PAGE(8, 0x0D),      // Digitizers
-    HID_RI_USAGE(8, 0x01),           // Digitizer
-    HID_RI_COLLECTION(8, 0x01),      // Application
+    HID_RI_USAGE_PAGE(8, 0x0D),            // Digitizers
+    HID_RI_USAGE(8, 0x01),                 // Digitizer
+    HID_RI_COLLECTION(8, 0x01),            // Application
 #    ifdef DIGITIZER_SHARED_EP
         HID_RI_REPORT_ID(8, REPORT_ID_DIGITIZER),
 #    endif
-        HID_RI_USAGE(8, 0x20),       // Stylus
-        HID_RI_COLLECTION(8, 0x00),  // Physical
-            // Tip Switch (1 bit)
-            HID_RI_USAGE(8, 0x42),   // Tip Switch
+        HID_RI_USAGE(8, 0x20),             // Stylus
+        HID_RI_COLLECTION(8, 0x00),        // Physical
+            // In Range, Tip Switch & Barrel Switch (3 bits)
+            HID_RI_USAGE(8, 0x32),         // In Range
+            HID_RI_USAGE(8, 0x42),         // Tip Switch
+            HID_RI_USAGE(8, 0x44),         // Barrel Switch
             HID_RI_LOGICAL_MINIMUM(8, 0x00),
             HID_RI_LOGICAL_MAXIMUM(8, 0x01),
+            HID_RI_REPORT_COUNT(8, 0x03),
             HID_RI_REPORT_SIZE(8, 0x01),
-            HID_RI_REPORT_COUNT(8, 0x01),
-            HID_RI_INPUT(8, HID_IOF_VARIABLE),
-            // In Range (1 bit)
-            HID_RI_USAGE(8, 0x32),  // In Range
-            HID_RI_INPUT(8, HID_IOF_VARIABLE),
-            // Padding (6 bits)
-            HID_RI_REPORT_COUNT(8, 0x06),
-            HID_RI_INPUT(8, HID_IOF_CONSTANT | HID_IOF_VARIABLE),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+            // Padding (5 bits)
+            HID_RI_REPORT_COUNT(8, 0x05),
+            HID_RI_INPUT(8, HID_IOF_CONSTANT),
 
             // X/Y Position (4 bytes)
-            HID_RI_USAGE_PAGE(8, 0x01),     // Generic Desktop
+            HID_RI_USAGE_PAGE(8, 0x01),    // Generic Desktop
+            HID_RI_USAGE(8, 0x30),         // X
+            HID_RI_USAGE(8, 0x31),         // Y
             HID_RI_LOGICAL_MAXIMUM(16, 0x7FFF),
+            HID_RI_REPORT_COUNT(8, 0x02),
             HID_RI_REPORT_SIZE(8, 0x10),
-            HID_RI_REPORT_COUNT(8, 0x01),
-            HID_RI_UNIT(8, 0x33),           // Inch, English Linear
-            HID_RI_UNIT_EXPONENT(8, 0x0E),  // -2
-            HID_RI_USAGE(8, 0x30),          // X
-            HID_RI_INPUT(8, HID_IOF_VARIABLE),
-            HID_RI_USAGE(8, 0x31),          // Y
-            HID_RI_INPUT(8, HID_IOF_VARIABLE),
+            HID_RI_UNIT(8, 0x33),          // Inch, English Linear
+            HID_RI_UNIT_EXPONENT(8, 0x0E), // -2
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
         HID_RI_END_COLLECTION(0),
     HID_RI_END_COLLECTION(0),
 #    ifndef DIGITIZER_SHARED_EP
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 84b01b203e..ac35043e2a 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -532,32 +532,30 @@ const PROGMEM uchar shared_hid_report[] = {
     0x09, 0x01,                // Usage (Digitizer)
     0xA1, 0x01,                // Collection (Application)
     0x85, REPORT_ID_DIGITIZER, //   Report ID
-    0x09, 0x22,                //   Usage (Finger)
+    0x09, 0x20,                //   Usage (Stylus)
     0xA1, 0x00,                //   Collection (Physical)
-    // Tip Switch (1 bit)
+    // In Range, Tip Switch & Barrel Switch (3 bits)
+    0x09, 0x32, //     Usage (In Range)
     0x09, 0x42, //     Usage (Tip Switch)
+    0x09, 0x44, //     Usage (Barrel Switch)
     0x15, 0x00, //     Logical Minimum
     0x25, 0x01, //     Logical Maximum
-    0x95, 0x01, //     Report Count (1)
-    0x75, 0x01, //     Report Size (16)
+    0x95, 0x03, //     Report Count (3)
+    0x75, 0x01, //     Report Size (1)
     0x81, 0x02, //     Input (Data, Variable, Absolute)
-    // In Range (1 bit)
-    0x09, 0x32, //     Usage (In Range)
-    0x81, 0x02, //     Input (Data, Variable, Absolute)
-    // Padding (6 bits)
-    0x95, 0x06, //     Report Count (6)
+    // Padding (5 bits)
+    0x95, 0x05, //     Report Count (5)
     0x81, 0x03, //     Input (Constant)
 
     // X/Y Position (4 bytes)
     0x05, 0x01,       //     Usage Page (Generic Desktop)
+    0x09, 0x30,       //     Usage (X)
+    0x09, 0x31,       //     Usage (Y)
     0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
-    0x95, 0x01,       //     Report Count (1)
+    0x95, 0x02,       //     Report Count (2)
     0x75, 0x10,       //     Report Size (16)
     0x65, 0x33,       //     Unit (Inch, English Linear)
     0x55, 0x0E,       //     Unit Exponent (-2)
-    0x09, 0x30,       //     Usage (X)
-    0x81, 0x02,       //     Input (Data, Variable, Absolute)
-    0x09, 0x31,       //     Usage (Y)
     0x81, 0x02,       //     Input (Data, Variable, Absolute)
     0xC0,             //   End Collection
     0xC0,             // End Collection

From cd682ad8b768db9f5c470d9de90ee158e72f6720 Mon Sep 17 00:00:00 2001
From: Ethan Johnston <rocketstrong600@gmail.com>
Date: Sun, 13 Nov 2022 10:58:56 +1000
Subject: [PATCH 847/959] [Keyboard] Add Handwired alcor dactyl (#18586)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/alcor_dactyl/config.h     |  33 +++++
 keyboards/handwired/alcor_dactyl/info.json    | 130 ++++++++++++++++++
 .../alcor_dactyl/keymaps/colemak_dh/keymap.c  | 100 ++++++++++++++
 .../alcor_dactyl/keymaps/default/keymap.c     |  43 ++++++
 keyboards/handwired/alcor_dactyl/readme.md    |  28 ++++
 keyboards/handwired/alcor_dactyl/rules.mk     |   2 +
 6 files changed, 336 insertions(+)
 create mode 100644 keyboards/handwired/alcor_dactyl/config.h
 create mode 100644 keyboards/handwired/alcor_dactyl/info.json
 create mode 100644 keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c
 create mode 100644 keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/alcor_dactyl/readme.md
 create mode 100644 keyboards/handwired/alcor_dactyl/rules.mk

diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h
new file mode 100644
index 0000000000..f8ffe4d6a3
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/config.h
@@ -0,0 +1,33 @@
+// Copyright 2022 Ethan (@rocketstrong)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP10
+#define SERIAL_USART_RX_PIN GP9
+#define RGB_DI_PIN GP16
+#define DRIVER_LED_TOTAL 2
+#define RGB_MATRIX_SPLIT { 1, 1 }
+#define RGBLED_NUM 1
+#define EE_HANDS
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
new file mode 100644
index 0000000000..7bdde8550c
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -0,0 +1,130 @@
+{
+    "manufacturer": "Ethan",
+    "keyboard_name": "alcor_dactyl",
+    "maintainer": "rocketstrong",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "features": {
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "split": {
+        "enabled": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP15", "GP14", "GP13"],
+        "rows": ["GP5", "GP4", "GP3", "GP2", "GP1", "GP0"]
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            {"x":0, "y":0.375},
+            {"x":16.5, "y":0.38}
+        ]
+    },
+    "layouts": {
+        "LAYOUT":{
+            "layout":[
+                {"matrix":[0,0], "x":0, "y":0.375, "w":1.5},
+                {"matrix":[0,1], "x":1.5, "y":0.38},
+                {"matrix":[0,2], "x":2.5, "y":0.125},
+                {"matrix":[0,3], "x":3.5, "y":0.25},
+                {"matrix":[0,4], "x":4.5, "y":0.25},
+                {"matrix":[0,5], "x":5.5, "y":0.25},
+                {"matrix":[0,6], "x":6.5, "y":0.25},
+
+                {"matrix":[6,6], "x":10.5, "y":0.25},
+                {"matrix":[6,5], "x":11.5, "y":0.25},
+                {"matrix":[6,4], "x":12.5, "y":0.25},
+                {"matrix":[6,3], "x":13.5, "y":0.25},
+                {"matrix":[6,2], "x":14.5, "y":0.13},
+                {"matrix":[6,1], "x":15.5, "y":0.38},
+                {"matrix":[6,0], "x":16.5, "y":0.38, "w":1.5},
+
+                {"matrix":[1,0], "x":0, "y":1.375, "w":1.5},
+                {"matrix":[1,1], "x":1.5, "y":1.375},
+                {"matrix":[1,2], "x":2.5, "y":1.125},
+                {"matrix":[1,3], "x":3.5, "y":1.25},
+                {"matrix":[1,4], "x":4.5, "y":1.25},
+                {"matrix":[1,5], "x":5.5, "y":1.25},
+                {"matrix":[1,6], "x":6.5, "y":1.25},
+
+                {"matrix":[7,6], "x":10.5, "y":1.25},
+                {"matrix":[7,5], "x":11.5, "y":1.25},
+                {"matrix":[7,4], "x":12.5, "y":1.25},
+                {"matrix":[7,3], "x":13.5, "y":1.25},
+                {"matrix":[7,2], "x":14.5, "y":1.13},
+                {"matrix":[7,1], "x":15.5, "y":1.38},
+                {"matrix":[7,0], "x":16.5, "y":1.38, "w":1.5},
+
+                {"matrix":[2,0], "x":0, "y":2.375, "w":1.5},
+                {"matrix":[2,1], "x":1.5, "y":2.375},
+                {"matrix":[2,2], "x":2.5, "y":2.125},
+                {"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":[8,6], "x":10.5, "y":2.25},
+                {"matrix":[8,5], "x":11.5, "y":2.25},
+                {"matrix":[8,4], "x":12.5, "y":2.25},
+                {"matrix":[8,3], "x":13.5, "y":2.25},
+                {"matrix":[8,2], "x":14.5, "y":2.13},
+                {"matrix":[8,1], "x":15.5, "y":2.38},
+                {"matrix":[8,0], "x":16.5, "y":2.38, "w":1.5},
+
+                {"matrix":[3,0], "x":0, "y":3.375, "w":1.5},
+                {"matrix":[3,1], "x":1.5, "y":3.375},
+                {"matrix":[3,2], "x":2.5, "y":3.125},
+                {"matrix":[3,3], "x":3.5, "y":3.25},
+                {"matrix":[3,4], "x":4.5, "y":3.25},
+                {"matrix":[3,5], "x":5.5, "y":3.25},
+
+                {"matrix":[9,5], "x":11.5, "y":3.25},
+                {"matrix":[9,4], "x":12.5, "y":3.25},
+                {"matrix":[9,3], "x":13.5, "y":3.25},
+                {"matrix":[9,2], "x":14.5, "y":3.13},
+                {"matrix":[9,1], "x":15.5, "y":3.38},
+                {"matrix":[9,0], "x":16.5, "y":3.38, "w":1.5},
+
+                {"matrix":[4,0], "x":0.5, "y":4.375},
+                {"matrix":[4,1], "x":1.5, "y":4.375},
+                {"matrix":[4,2], "x":2.5, "y":4.125},
+                {"matrix":[4,3], "x":3.5, "y":4.25},
+
+                {"matrix":[10,3], "x":13.5, "y":4.25},
+                {"matrix":[10,2], "x":14.5, "y":4.13},
+                {"matrix":[10,1], "x":15.5, "y":4.38},
+                {"matrix":[10,0], "x":16.5, "y":4.38},
+
+                {"matrix":[4,4], "x":5, "y":4.5, "h":2},
+                {"matrix":[4,5], "x":6.25, "y":4.5, "h":1.5},
+                {"matrix":[10,5], "x":10.75, "y":4.5, "h":1.5},
+                {"matrix":[10,4], "x":12, "y":4.5, "h":2},
+
+                {"matrix":[5,4], "x":6.25, "y":6.25},
+                {"matrix":[5,5], "x":7.5, "y":6.25},
+
+                {"matrix":[11,5], "x":9.5, "y":6.25},
+                {"matrix":[11,4], "x":10.75, "y":6.25},
+
+                {"matrix":[5,2], "x":6.25, "y":7.25},
+                {"matrix":[5,3], "x":7.25, "y":7.25},
+
+                {"matrix":[11,3], "x":9.75, "y":7.25},
+                {"matrix":[11,2], "x":10.75, "y":7.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c b/keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c
new file mode 100644
index 0000000000..8d41611402
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c
@@ -0,0 +1,100 @@
+// Copyright 2022 Ethan (@rocketstrong)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+/*
+ *          ┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐                    ┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  │                    │  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘                    └──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐                                    ┌──┐┌──┐└──┘└────┘
+ *  ┌──┐┌──┐│  ││  │  ┌──┐ ┌──┐              ┌──┐ ┌──┐  │  ││  │┌──┐┌──┐
+ *  │  ││  │└──┘└──┘  │  │ │  │              │  │ │  │  └──┘└──┘│  ││  │
+ *  └──┘└──┘          │  │ │  │              │  │ │  │          └──┘└──┘
+ *                    │  │ └──┘              └──┘ │  │
+ *                    └──┘ ┌──┐ ┌──┐    ┌──┐ ┌──┐ └──┘
+ *                         │  │ │  │    │  │ │  │
+ *                         └──┘ └──┘    └──┘ └──┘
+ *                         ┌──┐┌──┐      ┌──┐┌──┐
+ *                         │  ││  │      │  ││  │
+ *                         └──┘└──┘      └──┘└──┘
+ */
+
+enum Colemaklayers {
+  _ARSTG,
+  _NUMPAD,
+  _SYMBOLS
+};
+
+enum custom_keycodes {
+    AD_DDS = SAFE_RANGE,
+    AD_SCOPE
+};
+
+#define TT_NUM TT(_NUMPAD)
+#define TT_SYM TT(_SYMBOLS)
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case AD_DDS:
+            if (!record->event.pressed) {
+                // when keycode AD_DDS is pressed
+                SEND_STRING("../");
+            } else {
+                // when keycode AD_DDS is released
+            }
+            break;
+        case AD_SCOPE:
+            if (!record->event.pressed) {
+                // when keycode AD_DDS is pressed
+                SEND_STRING("::");
+            } else {
+                // when keycode AD_DDS is released
+            }
+            break;
+    }
+    return true;
+}
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_ARSTG] = 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_ESC  ,
+        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_SCLN , KC_BSLS ,
+        KC_ESC  , KC_A    , KC_R    , KC_S    , KC_T    , KC_G    , KC_PSCR ,       KC_PAUS , KC_M    , KC_N    , KC_E    , KC_I    , KC_O    , KC_QUOT ,
+        KC_LSFT , KC_Z    , KC_X    , KC_C    , KC_D    , KC_V    ,                           KC_K    , KC_H    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT ,
+        KC_LCTL , KC_LGUI , KC_LALT , KC_DEL  ,                                                                   KC_LEFT , KC_UP   , KC_DOWN , KC_RIGHT,
+                                                        KC_SPC  , KC_BSPC ,           KC_TAB  , KC_ENT  ,
+                                                          TT_NUM  , KC_LSFT ,       KC_RSFT , TT_SYM  ,
+                                                          KC_LCTL , KC_LALT ,       KC_RALT , KC_RCTL
+    ),
+    [_NUMPAD] = LAYOUT(
+        KC_NO   , KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F6   ,       KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_NO   ,
+        KC_TRNS , KC_PGUP , KC_HOME , KC_UP   , KC_END  , KC_NO   , KC_NO   ,       KC_NO   , KC_NUM  , KC_P7   , KC_P8   , KC_P9   , KC_PMNS , KC_NO   ,
+        KC_TRNS , KC_PGDN , KC_LEFT , KC_DOWN , KC_RIGHT, KC_NO   , KC_TRNS ,       KC_TRNS , KC_PSLS , KC_P4   , KC_P5   , KC_P6   , KC_PPLS , KC_NO   ,
+        KC_TRNS , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   ,                           KC_PAST , KC_P1   , KC_P2   , KC_P3   , KC_PEQL , KC_NO   ,
+        KC_TRNS , KC_NO   , KC_NO   , KC_NO   ,                                                                   KC_P0   , KC_PDOT , KC_PCMM , KC_NO   ,
+                                                        KC_TRNS , KC_TRNS ,           KC_TRNS , KC_PENT ,
+                                                          KC_TRNS , KC_TRNS ,       KC_TRNS , KC_TRNS ,
+                                                          KC_TRNS , QK_BOOT ,       KC_TRNS , KC_TRNS
+    ),
+    [_SYMBOLS] = LAYOUT(
+        KC_NO   , KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F6   ,       KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_NO   ,
+        KC_TRNS , KC_QUOT , KC_LT   , KC_GT   , KC_DQT  , KC_DOT  , KC_NO   ,       KC_NO   , KC_AMPR , AD_SCOPE, KC_LBRC , KC_RBRC , KC_PERC , KC_NO   ,
+        KC_TRNS , KC_EXLM , KC_MINS , KC_PLUS , KC_EQL  , KC_HASH , KC_NO   ,       KC_NO   , KC_PIPE , KC_COLN , KC_LPRN , KC_RPRN , KC_QUES , KC_NO   ,
+        KC_TRNS , KC_CIRC , KC_SLSH , KC_ASTR , KC_BSLS , AD_DDS  ,                           KC_TILD , KC_DLR  , KC_LCBR , KC_RCBR , KC_AT   , KC_NO   ,
+        KC_TRNS , KC_NO   , KC_NO   , KC_NO   ,                                                                   KC_NO   , KC_NO   , KC_NO   , KC_NO   ,
+                                                        KC_TRNS , KC_TRNS ,           KC_TRNS , KC_PENT ,
+                                                          KC_TRNS , KC_TRNS ,       KC_TRNS , KC_TRNS ,
+                                                          KC_TRNS , KC_TRNS ,       QK_BOOT , KC_TRNS
+    )
+};
diff --git a/keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c b/keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..55ddb29888
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2022 Ethan (@rocketstrong)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+/*
+ *          ┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐                    ┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  │                    │  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘                    └──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐                                    ┌──┐┌──┐└──┘└────┘
+ *  ┌──┐┌──┐│  ││  │  ┌──┐ ┌──┐              ┌──┐ ┌──┐  │  ││  │┌──┐┌──┐
+ *  │  ││  │└──┘└──┘  │  │ │  │              │  │ │  │  └──┘└──┘│  ││  │
+ *  └──┘└──┘          │  │ │  │              │  │ │  │          └──┘└──┘
+ *                    │  │ └──┘              └──┘ │  │
+ *                    └──┘ ┌──┐ ┌──┐    ┌──┐ ┌──┐ └──┘
+ *                         │  │ │  │    │  │ │  │
+ *                         └──┘ └──┘    └──┘ └──┘
+ *                         ┌──┐┌──┐      ┌──┐┌──┐
+ *                         │  ││  │      │  ││  │
+ *                         └──┘└──┘      └──┘└──┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = 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
+    )
+};
diff --git a/keyboards/handwired/alcor_dactyl/readme.md b/keyboards/handwired/alcor_dactyl/readme.md
new file mode 100644
index 0000000000..3c18faf247
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/readme.md
@@ -0,0 +1,28 @@
+# alcor_dactyl
+
+![alcor_dactyl](https://i.imgur.com/F0E1JCQh.jpg)
+
+This is a handwired dactyl manufor utalising an RP2040-zero
+
+* Keyboard Maintainer: [Ethan](https://github.com/rocketstrong)
+* Hardware Supported: Waveshare RP2040-Zero
+* Hardware Availability: https://www.waveshare.com/wiki/RP2040-Zero
+* 3D Print File Source: https://dactyl.mbugert.de/manuform
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/alcor_dactyl:default
+
+Flashing example for this keyboard:
+
+    make handwired/alcor_dactyl:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/alcor_dactyl/rules.mk b/keyboards/handwired/alcor_dactyl/rules.mk
new file mode 100644
index 0000000000..8fb51ec82d
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/rules.mk
@@ -0,0 +1,2 @@
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor

From ddcb8dd7caa067bdd7a9e0b88b0c9e74a87fe969 Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@klaviyo.com>
Date: Sat, 12 Nov 2022 19:59:17 -0500
Subject: [PATCH 848/959] [Keyboard] Add Serenity PCB (#18705)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cannonkeys/serenity/config.h        |  27 +++
 keyboards/cannonkeys/serenity/halconf.h       |  29 ++++
 keyboards/cannonkeys/serenity/info.json       | 156 ++++++++++++++++++
 .../serenity/keymaps/default/keymap.c         |  41 +++++
 .../cannonkeys/serenity/keymaps/via/keymap.c  |  59 +++++++
 .../cannonkeys/serenity/keymaps/via/rules.mk  |   1 +
 keyboards/cannonkeys/serenity/mcuconf.h       |  31 ++++
 keyboards/cannonkeys/serenity/readme.md       |  25 +++
 keyboards/cannonkeys/serenity/rules.mk        |   2 +
 9 files changed, 371 insertions(+)
 create mode 100644 keyboards/cannonkeys/serenity/config.h
 create mode 100644 keyboards/cannonkeys/serenity/halconf.h
 create mode 100644 keyboards/cannonkeys/serenity/info.json
 create mode 100644 keyboards/cannonkeys/serenity/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/serenity/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/serenity/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/serenity/mcuconf.h
 create mode 100644 keyboards/cannonkeys/serenity/readme.md
 create mode 100644 keyboards/cannonkeys/serenity/rules.mk

diff --git a/keyboards/cannonkeys/serenity/config.h b/keyboards/cannonkeys/serenity/config.h
new file mode 100644
index 0000000000..4b06e24a1c
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/config.h
@@ -0,0 +1,27 @@
+/*
+Copyright 2015 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
+
+#define WS2812_SPI SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PAL_MODE 0
+#define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/serenity/halconf.h b/keyboards/cannonkeys/serenity/halconf.h
new file mode 100644
index 0000000000..7a5b2d4de4
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/halconf.h
@@ -0,0 +1,29 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json
new file mode 100644
index 0000000000..cd154a3003
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/info.json
@@ -0,0 +1,156 @@
+{
+    "keyboard_name": "Serenity",
+    "usb": {
+        "vid": "0xCA04",
+        "pid": "0x0017",
+        "device_version": "0.0.1"
+    },
+    "url": "https://cannonkeys.com",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "processor": "STM32F072",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "debounce": 5,
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"],
+        "rows": ["A15", "B3", "B5", "A4", "A5", "F1"]
+    },
+    "backlight": {
+        "breathing": true,
+        "breathing_period": 5,
+        "levels": 15,
+        "pin": "A6"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "pin": "B15",
+        "hue_steps": 24,
+        "saturation_steps": 16,
+        "brightness_steps": 16,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "B9",
+        "scroll_lock": "F0",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
+                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
+                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
+                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
+                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
+                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
+                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
+                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
+                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
+                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
+                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
+                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
+                { "label": "F13", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
+                { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0.0 },
+                { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0.0 },
+                { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0.0 },
+                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
+                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
+                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
+                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
+                { "label": "Bksp", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
+                { "label": "Del", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+                { "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
+                { "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "label": "|", "matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 },
+                { "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 },
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
+                { "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.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], "w": 1.75, "x": 14.75, "y": 4.25 },
+                { "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 },
+                { "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
+                { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+                { "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
+                { "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
+                { "label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/serenity/keymaps/default/keymap.c b/keyboards/cannonkeys/serenity/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f142a629dc
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+enum layer_names {
+    _BASE,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_MPLY,                    KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_TRNS,                          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  MO(1),      KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_FN1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_MPLY, 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_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/cannonkeys/serenity/keymaps/via/keymap.c b/keyboards/cannonkeys/serenity/keymaps/via/keymap.c
new file mode 100644
index 0000000000..bd79ecc05f
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPLY,               KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                        KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_FN1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS,               BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_MPLY, 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_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        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_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [_FN3] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/cannonkeys/serenity/keymaps/via/rules.mk b/keyboards/cannonkeys/serenity/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/serenity/mcuconf.h b/keyboards/cannonkeys/serenity/mcuconf.h
new file mode 100644
index 0000000000..d0920a6660
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/mcuconf.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
+
diff --git a/keyboards/cannonkeys/serenity/readme.md b/keyboards/cannonkeys/serenity/readme.md
new file mode 100644
index 0000000000..730fa084c9
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/readme.md
@@ -0,0 +1,25 @@
+# Serenity
+
+A calming F13 TKL from HoodrowThrillson
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+* Hardware Availability: [CannonKeys](https://cannonkeys.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/serenity:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/serenity:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cannonkeys/serenity/rules.mk b/keyboards/cannonkeys/serenity/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/cannonkeys/serenity/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

From 317b800bbb28c5ae91f413cfd17471a06de76c2f Mon Sep 17 00:00:00 2001
From: Rocco Meli <r.meli@bluemail.ch>
Date: Sun, 13 Nov 2022 02:00:13 +0100
Subject: [PATCH 849/959] [Keymap] Update/refactor userspace and add keymaps
 for rmeli (#18398)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Elliot Powell <johnp8727@gmail.com>
---
 .../boardsource/lulu/keymaps/rmeli/config.h   |  45 ++++
 .../boardsource/lulu/keymaps/rmeli/keymap.c   | 108 ++++++++
 .../boardsource/lulu/keymaps/rmeli/rules.mk   |   9 +
 keyboards/crkbd/keymaps/rmeli/config.h        |  25 +-
 keyboards/crkbd/keymaps/rmeli/keymap.c        | 101 ++++----
 keyboards/crkbd/keymaps/rmeli/rules.mk        |   6 +-
 keyboards/preonic/keymaps/rmeli/config.h      |  45 ++++
 keyboards/preonic/keymaps/rmeli/keymap.c      | 231 ++++++++++++++++++
 keyboards/preonic/keymaps/rmeli/readme.md     |   1 +
 keyboards/preonic/keymaps/rmeli/rules.mk      |  12 +
 users/rmeli/.gitignore                        |   2 +
 users/rmeli/config.h                          |  44 ++++
 users/rmeli/keyrecords/tap_dances.h           |   7 +-
 users/rmeli/keyrecords/unicode.h              |  41 ++--
 users/rmeli/keyrecords/wrappers.h             | 178 ++++++++++++++
 users/rmeli/oled/oled.c                       |   6 +
 users/rmeli/rmeli.h                           |   6 +-
 users/rmeli/rules.mk                          |  10 +-
 18 files changed, 777 insertions(+), 100 deletions(-)
 create mode 100644 keyboards/boardsource/lulu/keymaps/rmeli/config.h
 create mode 100644 keyboards/boardsource/lulu/keymaps/rmeli/keymap.c
 create mode 100644 keyboards/boardsource/lulu/keymaps/rmeli/rules.mk
 create mode 100644 keyboards/preonic/keymaps/rmeli/config.h
 create mode 100644 keyboards/preonic/keymaps/rmeli/keymap.c
 create mode 100644 keyboards/preonic/keymaps/rmeli/readme.md
 create mode 100644 keyboards/preonic/keymaps/rmeli/rules.mk
 create mode 100644 users/rmeli/.gitignore
 create mode 100644 users/rmeli/config.h
 create mode 100644 users/rmeli/keyrecords/wrappers.h

diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/config.h b/keyboards/boardsource/lulu/keymaps/rmeli/config.h
new file mode 100644
index 0000000000..4d8823d785
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/rmeli/config.h
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have 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 // Left side is the master
+#define SPLIT_LED_STATE_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+// Configure RGB Matrix
+#    define RGB_MATRIX_KEYPRESSES // enable keypress effects
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_MATRIX_STARTUP_HUE 10
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+// Disable RGB Matrix effects (from lulu/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
+// Enable RGB Matrix effects
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_COLOR
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#endif
diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/keymap.c b/keyboards/boardsource/lulu/keymaps/rmeli/keymap.c
new file mode 100644
index 0000000000..f9be18ee2d
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/rmeli/keymap.c
@@ -0,0 +1,108 @@
+/*
+Copyright 2022 Cole Smith <cole@boadsource.xyz>
+Copyright 2022 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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 "rmeli.h"
+
+enum layers {
+    _QWERTY,
+    _COLEMAK_DH,
+    _RAISE,
+    _LOWER,
+    _ADJUST,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+#define QWY_DF DF(_QWERTY)
+#define CMK_DF DF(_COLEMAK_DH)
+
+// clang-format off
+#define __________THUMB_LEFT_x4___________ KC_LALT, KC_LGUI,   LOWER,  KC_SPC
+#define __________THUMB_RIGHT_x4__________  KC_ENT,   RAISE, KC_LCTL, KC_RGUI
+// clang-format on
+
+/* LAYOUT
+ *
+ * ,-----------------------------.                ,-----------------------------.
+ * |    |    |    |    |    |    |                |    |    |    |    |    |    |
+ * |----+----+----+----+----+----|                |----+----+----+----+----+----|
+ * |    |    |    |    |    |    |                |    |    |    |    |    |    |
+ * |----+----+----+----+----+----|                |----+----+----+----+----+----|
+ * |    |    |    |    |    |    |-----.    ,-----|    |    |    |    |    |    |
+ * |----+----+----+----+----+----|     |    |     |----+----+----+----+----+----|
+ * |    |    |    |    |    |    |-----|    |-----|    |    |    |    |    |    |
+ * `----------------------------/     /      \     \----------------------------'
+ *            |    |    |    | /     /        \     \  |    |    |    |
+ *            |    |    |    |/     /          \     \ |    |    |    |
+ *            `--------------''-----'          '------''--------------'
+ */
+
+// Define wrapper for standard LULU layout
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_wrapper(
+  ___________________NUMBER_LEFT_x6___________________,                   ___________________NUMBER_RIGHT_x6__________________,
+  ___________________QWERTY_L1_x6_____________________,                   ___________________QWERTY_R1_x6_____________________,
+  ___________________QWERTY_L2_x6_____________________,                   ___________________QWERTY_R2_x6_____________________,
+  ___________________QWERTY_L3_x6_____________________, KC_LBRC, KC_RBRC, ___________________QWERTY_R3_x6_____________________,
+                             __________THUMB_LEFT_x4___________,  __________THUMB_RIGHT_x4__________
+  ),
+
+  [_COLEMAK_DH] = LAYOUT_wrapper(
+  ___________________NUMBER_LEFT_x6___________________,                   ___________________NUMBER_RIGHT_x6__________________,
+  ________________COLEMAK_MOD_DH_L1_x6________________,                   ________________COLEMAK_MOD_DH_R1_x6________________,
+  ________________COLEMAK_MOD_DH_L2_x6________________,                   ________________COLEMAK_MOD_DH_R2_x6________________,
+  ________________COLEMAK_MOD_DH_L3_x6________________, KC_LBRC, KC_RBRC, ________________COLEMAK_MOD_DH_R3_x6________________,
+                             __________THUMB_LEFT_x4___________,  __________THUMB_RIGHT_x4__________
+  ),
+
+  [_LOWER] = LAYOUT_wrapper(
+  ____________________FUNC_LEFT_x6____________________,                   ____________________FUNC_RIGHT_x6___________________,
+  _______, ______________NUMBER_LEFT_x5_______________,                   ______________NUMBER_RIGHT_x5______________, _______,
+  _______, ______________UNICODE_L2_x5________________,                   ________________NAV_R2_x5__________________, XXXXXXX,
+  _______, ______________UNICODE_L3_x5________________, _______, _______, ________________NAV_R3_x5__________________, _______,
+                             _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  [_RAISE] = LAYOUT_wrapper(
+  ___________________NUMBER_LEFT_x6___________________,                   ___________________NUMBER_RIGHT_x6__________________,
+  ___________________SYMBOL_LEFT_x6___________________,                   ___________________SYMBOL_RIGHT_x6__________________,
+  _______, ____________NAV_VIM_x4____________, XXXXXXX,                   ____________________SYMBOL_R2_x6____________________,
+  _______, _________________NONE_5x___________________, _______, _______, ____________________SYMBOL_R3_x6____________________,
+                             _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+  [_ADJUST] = LAYOUT_wrapper(
+  QK_BOOT, _________________NONE_5x___________________,                   ______________________NONE_6x_______________________,
+  XXXXXXX, _________________NONE_5x___________________,                   _______________CONFIG_R1_x5________________,  QWY_DF,
+  RGB_TOG, ________________RGB_L2_x5__________________,                   _______________CONFIG_R2_x5________________, XXXXXXX,
+  XXXXXXX, ________________RGB_L3_x5__________________, _______, _______, _______________CONFIG_R3_x5________________,  CMK_DF,
+                             _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
+// clang-format on
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/rules.mk b/keyboards/boardsource/lulu/keymaps/rmeli/rules.mk
new file mode 100644
index 0000000000..035e9814e2
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/rmeli/rules.mk
@@ -0,0 +1,9 @@
+TAP_DANCE_ENABLE = yes
+AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods
+
+UNICODEMAP_ENABLE = yes
+NKRO_ENABLE = yes
+MAGIC_ENABLE = yes
+
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/rmeli/config.h b/keyboards/crkbd/keymaps/rmeli/config.h
index 36fb755d00..2f06b82cc1 100644
--- a/keyboards/crkbd/keymaps/rmeli/config.h
+++ b/keyboards/crkbd/keymaps/rmeli/config.h
@@ -21,32 +21,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MASTER_LEFT  // Left side is the master
+#define MASTER_LEFT // Left side is the master
 #define SPLIT_LED_STATE_ENABLE
 
-#define TAPPING_TERM 200
-
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
-
-#define AUTO_SHIFT_REPEAT
-
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_LIMIT_VAL 120
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
 // RGB matrix options
-#    define RGB_MATRIX_KEYPRESSES  // enable keypress effects
+#    define RGB_MATRIX_KEYPRESSES // enable keypress effects
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 // Disable unwanted R2G effects (from r2g/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
+#    define ENABLE_RGB_MATRIX_BREATHING
 #    undef ENABLE_RGB_MATRIX_BAND_SAT
 #    undef ENABLE_RGB_MATRIX_BAND_VAL
 #    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
@@ -57,8 +44,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef ENABLE_RGB_MATRIX_RAINDROPS
 #    undef ENABLE_RGB_MATRIX_HUE_BREATHING
 #    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-//#   undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 #    undef ENABLE_RGB_MATRIX_SPLASH
@@ -77,4 +64,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 #define NO_MUSIC_MODE
-#define LAYER_STATE_8BIT  // Limit to 8 layers
+#define LAYER_STATE_8BIT // Limit to 8 layers
diff --git a/keyboards/crkbd/keymaps/rmeli/keymap.c b/keyboards/crkbd/keymaps/rmeli/keymap.c
index f8d298bbdd..efef3c3d70 100644
--- a/keyboards/crkbd/keymaps/rmeli/keymap.c
+++ b/keyboards/crkbd/keymaps/rmeli/keymap.c
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
+Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
 Copyright 2021 Rocco Meli <@RMeli>
 
 This program is free software: you can redistribute it and/or modify
@@ -68,64 +68,61 @@ enum layer_names {
 #define _CMK 1
 #define _CFG 4
 
+#define ______THUMB_LEFT_x3______ KC_LGUI, MO(_DWN), KC_SPC
+#define ______THUMB_RIGHT_x3_____ KC_ENT, MO(_UP), KC_RCTL
+
+// LAYOUT
+//
+// |-----------------------------|            |-----------------------------|
+// |    |    |    |    |    |    |            |    |    |    |    |    |    |
+// |----+----+----+----+----+----|            |----+----+----+----+----+----|
+// |    |    |    |    |    |    |            |    |    |    |    |    |    |
+// |----+----+----+----+----+----|            |----+----+----+----+----+----|
+// |    |    |    |    |    |    |            |    |    |    |    |    |    |
+// |----+----+----+----+----+----+----|  |----+----+----+----+----+----+----|
+//                     |    |    |    |  |    |    |    |
+//                     |--------------|  |--------------|
+
+// Define wrapper for standard CRKB layout
+#define LAYOUT_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
+
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        TD_ED,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TD_LSPC,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, TD_RSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,MO(_DWN),  KC_SPC,     KC_ENT,MO(_UP),  KC_RCTL
-                                      //|--------------------------|  |--------------------------|
+
+  [_QWERTY] = LAYOUT_wrapper(
+    // clang-format off
+    ___________________QWERTY_L1_x6_____________________,                      ___________________QWERTY_R1_x6_____________________,
+    ___________________QWERTY_L2_x6_____________________,                      ___________________QWERTY_R2_x6_____________________,
+    ___________________QWERTY_L3_x6_____________________,                      ___________________QWERTY_R3_x6_____________________,
+                                        ______THUMB_LEFT_x3______,     ______THUMB_RIGHT_x3_____
   ),
 
-  [_COLEMAK_DH] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                         KC_J,    KC_L,    KC_U, KC_SCLN,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        TD_ED,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                         KC_M,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TD_LSPC,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                         KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, TD_RSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,MO(_DWN),  KC_SPC,     KC_ENT,MO(_UP),  KC_RCTL
-                                      //|--------------------------|  |--------------------------|
+  [_COLEMAK_DH] = LAYOUT_wrapper(
+    ________________COLEMAK_MOD_DH_L1_x6________________,                      ________________COLEMAK_MOD_DH_R1_x6________________,
+    ________________COLEMAK_MOD_DH_L2_x6________________,                      ________________COLEMAK_MOD_DH_R2_x6________________,
+    ________________COLEMAK_MOD_DH_L3_x6________________,                      ________________COLEMAK_MOD_DH_R3_x6________________,
+                                        ______THUMB_LEFT_x3______,     ______THUMB_RIGHT_x3_____
   ),
 
-  [_DWN] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______,   A_GRV,   E_GRV,   I_GRV,   O_GRV,   U_GRV,                      XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______,   A_UML,   E_ACT,   I_CIR,   O_UML,   U_UML,                      XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_PGDN, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______, _______,    _______,MO(_CFG), _______
-                                      //|--------------------------|  |--------------------------|
+  [_DWN] = LAYOUT_wrapper(
+    _______, ______________NUMBER_LEFT_x5_______________,                      ______________NUMBER_RIGHT_x5______________, _______,
+    _______, ______________UNICODE_L2_x5________________,                      ________________NAV_R2_x5__________________, XXXXXXX,
+    _______, ______________UNICODE_L3_x5________________,                      ________________NAV_R3_x5__________________, _______,
+                                        KC_LGUI, _______, _______,     _______,MO(_CFG), _______
   ),
 
-  [_UP] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_LEFT, KC_DOWN,  KC_UP, KC_RIGHT, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,MO(_CFG), _______,   _______, _______, _______
-                                      //|--------------------------|  |--------------------------|
+  [_UP] = LAYOUT_wrapper(
+    ___________________SYMBOL_LEFT_x6___________________,                      ___________________SYMBOL_RIGHT_x6__________________,
+    _______, ____________NAV_VIM_x4____________, XXXXXXX,                      ____________________SYMBOL_R2_x6____________________,
+    _______, _________________NONE_5x___________________,                      ____________________SYMBOL_R3_x6____________________,
+                                        _______,MO(_CFG), _______,    _______, _______, _______
   ),
 
-  [_CONFIG] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      UC_MOD,  KC_ASUP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, KC_ASTG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      UC_RMOD, KC_ASDN,  NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,   _______, _______, _______
-                                      //|--------------------------|  |--------------------------|
+  [_CONFIG] = LAYOUT_wrapper(
+    QK_BOOT, _________________NONE_5x___________________,                      _______________CONFIG_R1_x5________________,DF(_QWY),
+    RGB_TOG, ________________RGB_L2_x5__________________,                      _______________CONFIG_R2_x5________________, XXXXXXX,
+    XXXXXXX, ________________RGB_L3_x5__________________,                      _______________CONFIG_R3_x5________________,DF(_CMK),
+                                        _______, _______, _______,   _______, _______, _______
   )
-};
\ No newline at end of file
+};
+// clang-format on
diff --git a/keyboards/crkbd/keymaps/rmeli/rules.mk b/keyboards/crkbd/keymaps/rmeli/rules.mk
index 8e9dbbf8cf..58a00ed6ba 100644
--- a/keyboards/crkbd/keymaps/rmeli/rules.mk
+++ b/keyboards/crkbd/keymaps/rmeli/rules.mk
@@ -2,11 +2,11 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
 TAP_DANCE_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
+AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods
 
 UNICODEMAP_ENABLE = yes
+NKRO_ENABLE = yes
+MAGIC_ENABLE = yes
 
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-
-NKRO_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/rmeli/config.h b/keyboards/preonic/keymaps/rmeli/config.h
new file mode 100644
index 0000000000..6f8b8b6c70
--- /dev/null
+++ b/keyboards/preonic/keymaps/rmeli/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2015-2021 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef AUDIO_ENABLE
+#    define STARTUP_SONG SONG(PREONIC_SOUND)
+// #define STARTUP_SONG SONG(NO_SOUND)
+
+#    define DEFAULT_LAYER_SONGS \
+        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
+#endif
+
+#define MUSIC_MASK (keycode != KC_NO)
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
diff --git a/keyboards/preonic/keymaps/rmeli/keymap.c b/keyboards/preonic/keymaps/rmeli/keymap.c
new file mode 100644
index 0000000000..da6269129e
--- /dev/null
+++ b/keyboards/preonic/keymaps/rmeli/keymap.c
@@ -0,0 +1,231 @@
+/* Copyright 2015-2021 Jack Humbert
+ * Copyright 2022 Rocco Meli <@RMeli>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "muse.h"
+
+#include "rmeli.h"
+
+enum preonic_layers { _QWERTY, _COLEMAK, _LOWER, _RAISE, _ADJUST };
+enum preonic_keycodes { QWERTY = SAFE_RANGE, COLEMAK, LOWER, RAISE, BACKLIT };
+
+#define ____________________BOTTOM_L_x6_____________________ BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC
+#define ____________________BOTTOM_R_x6_____________________ KC_ENT, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+
+/* LAYOUT
+ *
+ * ,-----------------------------------------------------------.
+ * |    |    |    |    |    |    |    |    |    |    |    |    |
+ * |----+----+----+----+----+----+----+----+----+----+----+----|
+ * |    |    |    |    |    |    |    |    |    |    |    |    |
+ * |----+----+----+----+----+----+----+----+----+----+----+----|
+ * |    |    |    |    |    |    |    |    |    |    |    |    |
+ * |----+----+----+----+----+----+----+----+----+----+----+----|
+ * |    |    |    |    |    |    |    |    |    |    |    |    |
+ * |----+----+----+----+----+----+----+----+----+----+----+----|
+ * |    |    |    |    |    |    |    |    |    |    |    |    |
+ * `----+----+----+----+----+----+----+----+----+----+----+----'
+ */
+
+// Define wrapper for standard CRKB layout
+#define LAYOUT_wrapper(...) LAYOUT_preonic_grid(__VA_ARGS__)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = LAYOUT_wrapper(
+    ___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________,
+    ___________________QWERTY_L1_x6_____________________, ___________________QWERTY_R1_x6_____________________,
+    ___________________QWERTY_L2_x6_____________________, ___________________QWERTY_R2_x6_____________________,
+    ___________________QWERTY_L3_x6_____________________, ___________________QWERTY_R3_x6_____________________,
+    ____________________BOTTOM_L_x6_____________________, ____________________BOTTOM_R_x6_____________________
+),
+
+[_COLEMAK] = LAYOUT_wrapper(
+    ___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________,
+    ________________COLEMAK_MOD_DH_L1_x6________________, ________________COLEMAK_MOD_DH_R1_x6________________,
+    ________________COLEMAK_MOD_DH_L2_x6________________, ________________COLEMAK_MOD_DH_R2_x6________________,
+    ________________COLEMAK_MOD_DH_L3_x6________________, ________________COLEMAK_MOD_DH_R3_x6________________,
+    ____________________BOTTOM_L_x6_____________________, ____________________BOTTOM_R_x6_____________________
+),
+
+[_LOWER] = LAYOUT_wrapper(
+  ____________________FUNC_LEFT_x6____________________, ____________________FUNC_RIGHT_x6___________________,
+  ___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________,
+  _______, ______________UNICODE_L2_x5________________, ________________NAV_R2_x5__________________, XXXXXXX,
+  _______, ______________UNICODE_L3_x5________________, ________________NAV_R3_x5__________________, _______,
+  ______________________BLANK_6x______________________, ______________________BLANK_6x______________________
+),
+
+[_RAISE] = LAYOUT_wrapper(
+  ___________________NUMBER_LEFT_x6___________________, ___________________NUMBER_RIGHT_x6__________________,
+  ___________________SYMBOL_LEFT_x6___________________, ___________________SYMBOL_RIGHT_x6__________________,
+  _______, ____________NAV_VIM_x4____________, XXXXXXX, ____________________SYMBOL_R2_x6____________________,
+  _______, _________________NONE_5x___________________, ____________________SYMBOL_R3_x6____________________,
+  ______________________BLANK_6x______________________, ______________________BLANK_6x______________________
+),
+
+[_ADJUST] = LAYOUT_wrapper(
+  QK_BOOT, _________________NONE_5x___________________, ______________________NONE_6x_______________________,
+  XXXXXXX, MU_ON,   AU_ON,   MI_ON,   XXXXXXX, XXXXXXX, _______________CONFIG_R1_x5________________,  QWERTY,
+  RESET,   MU_MOD,  AU_TOG,  MI_TOG,  XXXXXXX, XXXXXXX, _______________CONFIG_R2_x5________________, XXXXXXX,
+  XXXXXXX, MU_OFF,  AU_OFF,  MI_OFF,  XXXXXXX, XXXXXXX, _______________CONFIG_R3_x5________________, COLEMAK,
+  ______________________BLANK_6x______________________, ______________________BLANK_6x______________________
+)
+};
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QWERTY:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWERTY);
+            }
+            return false;
+            break;
+        case COLEMAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_COLEMAK);
+            }
+            return false;
+            break;
+        case LOWER:
+            if (record->event.pressed) {
+                layer_on(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+            break;
+        case RAISE:
+            if (record->event.pressed) {
+                layer_on(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+            break;
+        case BACKLIT:
+            if (record->event.pressed) {
+                register_code(KC_RSFT);
+#ifdef BACKLIGHT_ENABLE
+                backlight_step();
+#endif
+#ifdef RGBLIGHT_ENABLE
+                rgblight_step();
+#endif
+#ifdef __AVR__
+                writePinLow(E6);
+#endif
+            } else {
+                unregister_code(KC_RSFT);
+#ifdef __AVR__
+                writePinHigh(E6);
+#endif
+            }
+            return false;
+            break;
+    }
+    return true;
+};
+
+bool     muse_mode      = false;
+uint8_t  last_muse_note = 0;
+uint16_t muse_counter   = 0;
+uint8_t  muse_offset    = 70;
+uint16_t muse_tempo     = 50;
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (muse_mode) {
+        if (IS_LAYER_ON(_RAISE)) {
+            if (clockwise) {
+                muse_offset++;
+            } else {
+                muse_offset--;
+            }
+        } else {
+            if (clockwise) {
+                muse_tempo += 1;
+            } else {
+                muse_tempo -= 1;
+            }
+        }
+    } else {
+        if (clockwise) {
+            register_code(KC_PGDN);
+            unregister_code(KC_PGDN);
+        } else {
+            register_code(KC_PGUP);
+            unregister_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+    switch (index) {
+        case 0:
+            if (active) {
+                layer_on(_ADJUST);
+            } else {
+                layer_off(_ADJUST);
+            }
+            break;
+        case 1:
+            if (active) {
+                muse_mode = true;
+            } else {
+                muse_mode = false;
+            }
+    }
+    return true;
+}
+
+void matrix_scan_user(void) {
+#ifdef AUDIO_ENABLE
+    if (muse_mode) {
+        if (muse_counter == 0) {
+            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+            if (muse_note != last_muse_note) {
+                stop_note(compute_freq_for_midi_note(last_muse_note));
+                play_note(compute_freq_for_midi_note(muse_note), 0xF);
+                last_muse_note = muse_note;
+            }
+        }
+        muse_counter = (muse_counter + 1) % muse_tempo;
+    } else {
+        if (muse_counter) {
+            stop_all_notes();
+            muse_counter = 0;
+        }
+    }
+#endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+    switch (keycode) {
+        case RAISE:
+        case LOWER:
+            return false;
+        default:
+            return true;
+    }
+}
diff --git a/keyboards/preonic/keymaps/rmeli/readme.md b/keyboards/preonic/keymaps/rmeli/readme.md
new file mode 100644
index 0000000000..e911968dd9
--- /dev/null
+++ b/keyboards/preonic/keymaps/rmeli/readme.md
@@ -0,0 +1 @@
+# The default Preonic layout - largely based on the Planck's
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/rmeli/rules.mk b/keyboards/preonic/keymaps/rmeli/rules.mk
new file mode 100644
index 0000000000..3903cc1228
--- /dev/null
+++ b/keyboards/preonic/keymaps/rmeli/rules.mk
@@ -0,0 +1,12 @@
+TAP_DANCE_ENABLE = yes
+AUTO_SHIFT_ENABLE = no
+
+MAGIC_ENABLE = yes
+
+UNICODEMAP_ENABLE = yes
+
+# Turn off rev3_drop options
+RGBLIGHT_ENABLE = no
+MOUSEKEY_ENABLE = no
+
+SRC += muse.c
diff --git a/users/rmeli/.gitignore b/users/rmeli/.gitignore
new file mode 100644
index 0000000000..799fc4adc1
--- /dev/null
+++ b/users/rmeli/.gitignore
@@ -0,0 +1,2 @@
+# Ignore symlinks to keymaps
+km_*
\ No newline at end of file
diff --git a/users/rmeli/config.h b/users/rmeli/config.h
new file mode 100644
index 0000000000..1a6db91d1b
--- /dev/null
+++ b/users/rmeli/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have 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
+
+#ifdef UNICODEMAP_ENABLE
+#    define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
+#endif
+
+#ifdef AUTO_SHIFT_ENABLED
+#    define AUTO_SHIFT_REPEAT
+#endif
+
+#ifdef HOME_ROW_MODS_ENABLED
+#    define IGNORE_MOD_TAP_INTERRUPT
+#endif
+
+#ifdef CAPS_WORD_ENABLE
+#    define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
+//#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_LIMIT_VAL 120
+#    define RGBLIGHT_HUE_STEP 10
+#    define RGBLIGHT_SAT_STEP 17
+#    define RGBLIGHT_VAL_STEP 17
+#endif
diff --git a/users/rmeli/keyrecords/tap_dances.h b/users/rmeli/keyrecords/tap_dances.h
index fa749a17f4..1d3018441e 100644
--- a/users/rmeli/keyrecords/tap_dances.h
+++ b/users/rmeli/keyrecords/tap_dances.h
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
+
 #include QMK_KEYBOARD_H
 
 // https://beta.docs.qmk.fm/using-qmk/software-features/feature_tap_dance#example-4-quad-function-tap-dance-id-example-4
@@ -26,9 +27,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Tap dance enums
 enum {
-    TD_LSPO_CAPS,  // Tap once for (, hold once for LSFT, tap twice for CAPS
-    TD_RSPC_CAPS,  // Tap once for ), hold once for RSFT, tap twice for CAPS
-    TD_ESC_DEL,    // Tap once for KC_ESC, twice for KC_DEL
+    TD_LSPO_CAPS, // Tap once for (, hold once for LSFT, tap twice for CAPS
+    TD_RSPC_CAPS, // Tap once for ), hold once for RSFT, tap twice for CAPS
+    TD_ESC_DEL,   // Tap once for KC_ESC, twice for KC_DEL
 };
 
 // Rename tap dances for keymap with shortcuts
diff --git a/users/rmeli/keyrecords/unicode.h b/users/rmeli/keyrecords/unicode.h
index 8e0c02d278..d818af02ee 100644
--- a/users/rmeli/keyrecords/unicode.h
+++ b/users/rmeli/keyrecords/unicode.h
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
+
 #include QMK_KEYBOARD_H
 
 // Needs to be active on the OS side as well
@@ -46,30 +47,30 @@ enum unicode_names {
 
 const uint32_t PROGMEM unicode_map[] = {
     // KC_A
-    [aGRV] = 0x00E0,  // à
-    [AGRV] = 0x00C0,  // À
-    [aUML] = 0x00E4,  // ä
-    [AUML] = 0x00C4,  // Ä
+    [aGRV] = 0x00E0, // à
+    [AGRV] = 0x00C0, // À
+    [aUML] = 0x00E4, // ä
+    [AUML] = 0x00C4, // Ä
     // KC_E
-    [eGRV] = 0x00E8,  // è
-    [EGRV] = 0x00C8,  // È
-    [eACT] = 0x00E9,  // é
-    [EACT] = 0x00C9,  // É
+    [eGRV] = 0x00E8, // è
+    [EGRV] = 0x00C8, // È
+    [eACT] = 0x00E9, // é
+    [EACT] = 0x00C9, // É
     // KC_I
-    [iGRV] = 0x00EC,  // ì
-    [IGRV] = 0x00CC,  // Ì
-    [iCIR] = 0x00EE,  // î
-    [ICIR] = 0x00CE,  // Î
+    [iGRV] = 0x00EC, // ì
+    [IGRV] = 0x00CC, // Ì
+    [iCIR] = 0x00EE, // î
+    [ICIR] = 0x00CE, // Î
     // KC_O
-    [oGRV] = 0x00F2,  // ò
-    [OGRV] = 0x00D2,  // Ò
-    [oUML] = 0x00F6,  // ö
-    [OUML] = 0x00D6,  // Ö
+    [oGRV] = 0x00F2, // ò
+    [OGRV] = 0x00D2, // Ò
+    [oUML] = 0x00F6, // ö
+    [OUML] = 0x00D6, // Ö
     // KC_U
-    [uGRV] = 0x00F9,  // ù
-    [UGRV] = 0x00D9,  // Ù
-    [uUML] = 0x00FC,  // ü
-    [UUML] = 0x00DC,  // Ü
+    [uGRV] = 0x00F9, // ù
+    [UGRV] = 0x00D9, // Ù
+    [uUML] = 0x00FC, // ü
+    [UUML] = 0x00DC, // Ü
 };
 
 // Accents
diff --git a/users/rmeli/keyrecords/wrappers.h b/users/rmeli/keyrecords/wrappers.h
new file mode 100644
index 0000000000..70ec4878bf
--- /dev/null
+++ b/users/rmeli/keyrecords/wrappers.h
@@ -0,0 +1,178 @@
+/*
+Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+Copyright 2020 @jola5
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 UNICODEMAP_ENABLE
+#    include "keyrecords/unicode.h"
+#endif
+
+// + ------------- +
+// + HOME ROW MODS |
+// + ------------- +
+
+// https://precondition.github.io/home-row-mods
+
+// Left, QWERTY
+#define HM_A LCTL_T(KC_A)
+#define HM_S LALT_T(KC_S)
+#define HM_D LGUI_T(KC_D)
+#define HM_F LSFT_T(KC_F)
+
+// Left, COLEMAK
+#define HMCMK_A LCTL_T(KC_A)
+#define HMCMK_R LALT_T(KC_R)
+#define HMCMK_S LGUI_T(KC_S)
+#define HMCMK_T LSFT_T(KC_T)
+
+// Right, QWERTY
+#define HM_J RSFT_T(KC_J)
+#define HM_K RGUI_T(KC_K)
+#define HM_L LALT_T(KC_L) // LALT, not RALT
+#define HM_SCLN RCTL_T(KC_SCLN)
+
+// Right, COLEMAK
+#define HMCMK_N RSFT_T(KC_N)
+#define HMCMK_E RGUI_T(KC_E)
+#define HMCMK_I LALT_T(KC_I) // LALT, not RALT
+#define HMCMK_O RCTL_T(KC_O)
+
+// clang-format off
+
+// + ------ +
+// + QWERTY |
+// + ------ +
+
+#define _________QWERTY_HRM_LEFT__________    HM_A,    HM_S,    HM_D,    HM_F
+#define _________QWERTY_HRM_RIGHT_________    HM_J,    HM_K,    HM_L, HM_SCLN
+
+#define _______________QWERTY_L1_x5________________    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
+#ifdef HOME_ROW_MODS_ENABLED
+#define _______________QWERTY_L2_x5________________ _________QWERTY_HRM_LEFT__________,    KC_G
+#else
+#define _______________QWERTY_L2_x5________________    KC_A,    KC_S,    KC_D,    KC_F,    KC_G
+#endif
+#define _______________QWERTY_L3_x5________________    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
+
+#define _______________QWERTY_R1_x5________________    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
+#ifdef HOME_ROW_MODS_ENABLED
+#define _______________QWERTY_R2_x5________________    KC_H, _________QWERTY_HRM_RIGHT_________
+#else
+#define _______________QWERTY_R2_x5________________    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN
+#endif
+#define _______________QWERTY_R3_x5________________    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH
+
+// + ------ +
+
+#define ___________________QWERTY_L1_x6_____________________  KC_TAB, _______________QWERTY_L1_x5________________
+#define ___________________QWERTY_L2_x6_____________________   TD_ED, _______________QWERTY_L2_x5________________
+#define ___________________QWERTY_L3_x6_____________________ TD_LSPC, _______________QWERTY_L3_x5________________
+#define ___________________QWERTY_R1_x6_____________________ _______________QWERTY_R1_x5________________, KC_BSPC
+#define ___________________QWERTY_R2_x6_____________________ _______________QWERTY_R2_x5________________, KC_QUOT
+#define ___________________QWERTY_R3_x6_____________________ _______________QWERTY_R3_x5________________, TD_RSPC
+
+// + -------------- +
+// + COLEMAK_MOD_DH |
+// + -------------- +
+
+#define _____COLEMAK_MOD_DH_HRM_LEFT______ HMCMK_A, HMCMK_R, HMCMK_S, HMCMK_T
+#define _____COLEMAK_MOD_DH_HMR_RIGHT_____ HMCMK_N, HMCMK_E, HMCMK_I, HMCMK_O
+
+#define ____________COLEMAK_MOD_DH_L1_x5___________    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B
+#ifdef HOME_ROW_MODS_ENABLED
+#define ____________COLEMAK_MOD_DH_L2_x5___________ _____COLEMAK_MOD_DH_HRM_LEFT______,    KC_G
+#else
+#define ____________COLEMAK_MOD_DH_L2_x5___________    KC_A,    KC_R,    KC_S,    KC_T,    KC_G
+#endif
+#define ____________COLEMAK_MOD_DH_L3_x5___________    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V
+
+#define ____________COLEMAK_MOD_DH_R1_x5___________    KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN
+#ifdef HOME_ROW_MODS_ENABLED
+#define ____________COLEMAK_MOD_DH_R2_x5___________    KC_M, _____COLEMAK_MOD_DH_HMR_RIGHT_____
+#else
+#define ____________COLEMAK_MOD_DH_R2_x5___________    KC_M,    KC_N,    KC_E,    KC_I,    KC_O
+#endif
+#define ____________COLEMAK_MOD_DH_R3_x5___________    KC_K,    KC_H, KC_COMM,  KC_DOT,KC_SLASH
+
+// + ------- +
+
+#define ________________COLEMAK_MOD_DH_L1_x6________________  KC_TAB, ____________COLEMAK_MOD_DH_L1_x5___________
+#define ________________COLEMAK_MOD_DH_L2_x6________________   TD_ED, ____________COLEMAK_MOD_DH_L2_x5___________
+#define ________________COLEMAK_MOD_DH_L3_x6________________ TD_LSPC, ____________COLEMAK_MOD_DH_L3_x5___________
+#define ________________COLEMAK_MOD_DH_R1_x6________________ ____________COLEMAK_MOD_DH_R1_x5___________, KC_BSPC
+#define ________________COLEMAK_MOD_DH_R2_x6________________ ____________COLEMAK_MOD_DH_R2_x5___________, KC_QUOT
+#define ________________COLEMAK_MOD_DH_R3_x6________________ ____________COLEMAK_MOD_DH_R3_x5___________, TD_RSPC
+
+// + --------------- +
+// + NUMBERS/SYMBOLS |
+// + --------------- +
+
+#define ______________NUMBER_LEFT_x5_______________    KC_1,    KC_2,    KC_3,    KC_4,    KC_5
+#define ______________NUMBER_RIGHT_x5______________    KC_6,    KC_7,    KC_8,    KC_9,    KC_0
+#define ___________________NUMBER_LEFT_x6___________________  KC_GRV, ______________NUMBER_LEFT_x5_______________
+#define ___________________NUMBER_RIGHT_x6__________________ ______________NUMBER_RIGHT_x5______________, KC_MINS
+
+#define ______________SYMBOL_LEFT_x5_______________ KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC
+#define ______________SYMBOL_RIGHT_x5______________ KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN
+#define ___________________SYMBOL_LEFT_x6___________________  KC_GRV, ______________SYMBOL_LEFT_x5_______________
+#define ___________________SYMBOL_RIGHT_x6__________________ ______________SYMBOL_RIGHT_x5______________, KC_TILD
+
+#define ____________________SYMBOL_R2_x6____________________ KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV
+#define ____________________SYMBOL_R3_x6____________________ KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD
+
+// + ------- +
+// + UNICODE |
+// + ------- +
+
+#ifdef UNICODEMAP_ENABLE
+#define ______________UNICODE_L2_x5________________   A_GRV,   E_GRV,   I_GRV,   O_GRV,   U_GRV
+#define ______________UNICODE_L3_x5________________   A_UML,   E_ACT,   I_CIR,   O_UML,   U_UML
+#endif
+
+// + ---- +
+// + FUNC |
+// + ---- +
+
+#define ______________FUNC_LEFT_5x_________________   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
+#define ______________FUNC_RIGHT_5x________________   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
+#define ____________________FUNC_LEFT_x6____________________ ______________FUNC_LEFT_5x_________________, KC_F6
+#define ____________________FUNC_RIGHT_x6___________________ KC_F7, ______________FUNC_RIGHT_5x________________
+
+// + ---- +
+// + MISC |
+// + ---- +
+
+#define _________________BLANK_5x__________________ _______, _______, _______, _______, _______
+#define ______________________BLANK_6x______________________ _________________BLANK_5x__________________, _______
+
+#define _________________NONE_5x___________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+#define ______________________NONE_6x_______________________ _________________NONE_5x___________________, XXXXXXX
+
+#define ________________NAV_R2_x5__________________ XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP
+#define ________________NAV_R3_x5__________________ XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
+#define ____________NAV_VIM_x4____________ KC_LEFT, KC_DOWN,  KC_UP, KC_RIGHT
+
+#define _______________CONFIG_R1_x5________________ UC_MOD,  KC_ASUP,   NK_ON, XXXXXXX, XXXXXXX
+#define _______________CONFIG_R2_x5________________ XXXXXXX, KC_ASTG, NK_TOGG, CG_TOGG, XXXXXXX
+#define _______________CONFIG_R3_x5________________ UC_RMOD, KC_ASDN,  NK_OFF, CG_NORM, XXXXXXX
+
+#define ________________RGB_L2_x5__________________  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI
+#define ________________RGB_L3_x5__________________ RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD
+
+// clang-format on
diff --git a/users/rmeli/oled/oled.c b/users/rmeli/oled/oled.c
index d6d4b2c43c..27c1e9c600 100644
--- a/users/rmeli/oled/oled.c
+++ b/users/rmeli/oled/oled.c
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "oled/oled.h"
 
 void oled_render_rocco(void) {
+    // clang-format off
     static const char PROGMEM rocco[] = {
         // 'rocco', 128x32px
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xf8, 0xf8, 0x18, 
@@ -53,10 +54,13 @@ void oled_render_rocco(void) {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0e, 0x1c, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 
         0x1c, 0x0e, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     };
+    // clang-format on
+
     oled_write_raw_P(rocco, sizeof(rocco));
 }
 
 void oled_render_meli(void) {
+    // clang-format off
     static const char PROGMEM meli[] = {
         // 'meli', 128x32px
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -92,5 +96,7 @@ void oled_render_meli(void) {
         0x18, 0x1f, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     };
+    // clang-format on
+
     oled_write_raw_P(meli, sizeof(meli));
 }
diff --git a/users/rmeli/rmeli.h b/users/rmeli/rmeli.h
index e6f51d4908..d3533db7c3 100644
--- a/users/rmeli/rmeli.h
+++ b/users/rmeli/rmeli.h
@@ -15,6 +15,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
+
+#include "keyrecords/wrappers.h"
+
 #ifdef UNICODEMAP_ENABLE
 #    include "keyrecords/unicode.h"
 #endif
@@ -25,4 +29,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef TAP_DANCE_ENABLE
 #    include "keyrecords/tap_dances.h"
-#endif
\ No newline at end of file
+#endif
diff --git a/users/rmeli/rules.mk b/users/rmeli/rules.mk
index 293685e08b..db68d6326c 100644
--- a/users/rmeli/rules.mk
+++ b/users/rmeli/rules.mk
@@ -1,11 +1,12 @@
 # https://github.com/qmk/qmk_firmware/blob/develop/docs/squeezing_avr.md
 CONSOLE_ENABLE = no
-COMMAND_ENABLE = no # Needed for Space Cadet Shift
+COMMAND_ENABLE = no # Turned off for Space Cadet Shift and Caps Word
 MOUSEKEY_ENABLE = no
 SPACE_CADET_ENABLE = no # Implemented with tap dance
 GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
 MUSIC_ENABLE = no
+CAPS_WORD_ENABLE = yes
+HOME_ROW_MODS_ENABLE = yes
 
 # VIA only support 4 layers by default
 # Use "#define DYNAMIC_KEYMAP_LAYER_COUNT" in config.h to change the limit
@@ -17,4 +18,9 @@ endif
 
 ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
     SRC += $(USER_PATH)/keyrecords/tap_dances.c
+endif
+
+ifeq ($(strip $(HOME_ROW_MODS_ENABLE)), yes)
+    # Define custom variable
+    OPT_DEFS += -DHOME_ROW_MODS_ENABLED
 endif
\ No newline at end of file

From d4b6678e9949980e94d097e452912b04a9e6af20 Mon Sep 17 00:00:00 2001
From: Brandon Burgess <siphayne@gmail.com>
Date: Sat, 12 Nov 2022 18:00:35 -0700
Subject: [PATCH 850/959] [Keyboard] Add Dayoff60 (#17640)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/nixkeyboards/day_off/config.h       | 43 +++++++++
 keyboards/nixkeyboards/day_off/day_off.c      | 16 ++++
 keyboards/nixkeyboards/day_off/day_off.h      | 32 +++++++
 keyboards/nixkeyboards/day_off/info.json      | 87 +++++++++++++++++++
 .../day_off/keymaps/default/keymap.c          | 60 +++++++++++++
 keyboards/nixkeyboards/day_off/readme.md      | 23 +++++
 keyboards/nixkeyboards/day_off/rules.mk       | 19 ++++
 7 files changed, 280 insertions(+)
 create mode 100644 keyboards/nixkeyboards/day_off/config.h
 create mode 100755 keyboards/nixkeyboards/day_off/day_off.c
 create mode 100755 keyboards/nixkeyboards/day_off/day_off.h
 create mode 100755 keyboards/nixkeyboards/day_off/info.json
 create mode 100644 keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
 create mode 100644 keyboards/nixkeyboards/day_off/readme.md
 create mode 100755 keyboards/nixkeyboards/day_off/rules.mk

diff --git a/keyboards/nixkeyboards/day_off/config.h b/keyboards/nixkeyboards/day_off/config.h
new file mode 100644
index 0000000000..1ed4ea91e3
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B3, B7, F5, F4, F1 }
+#define MATRIX_COL_PINS \
+    { F0, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#define DIODE_DIRECTION COL2ROW
+
+/* encoder */
+#define ENCODERS_PAD_A \
+    { B0 }
+#define ENCODERS_PAD_B \
+    { B1 }
+#define ENCODER_RESOLUTION 4
+
+/* Debounce reduces chatter */
+#define DEBOUNCE 5
+
+/* Set the Bootmagic key to the escape key (default key doesn't exist 0,0) */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/nixkeyboards/day_off/day_off.c b/keyboards/nixkeyboards/day_off/day_off.c
new file mode 100755
index 0000000000..2694682f09
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/day_off.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "day_off.h"
diff --git a/keyboards/nixkeyboards/day_off/day_off.h b/keyboards/nixkeyboards/day_off/day_off.h
new file mode 100755
index 0000000000..f890b837e6
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/day_off.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all(K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,\
+	       K011, K012, K013, K014, K101, K102, K103, K104, K105, K106, \
+	       K107, K108, K109, K110, K111, K112, K113, K114, K200, K201, \
+	       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	       K212, K213, K214, K300, K301, K302, K303, K304, K305, K306, \
+	       K307, K308, K309, K310, K311, K312, K313, K314, K400, K401, \
+	       K402, K403, K405, K407, K408, K410, K411, K412, K413, K414) \
+    {   {KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
+      	{KC_NO, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114}, \
+        {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \
+	{K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314}, \
+	{K400, K401, K402, K403, KC_NO, K405, KC_NO, K407, K408, KC_NO, K410, K411, K412, K413, KC_NO} \
+    }
diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json
new file mode 100755
index 0000000000..0c57be6e82
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/info.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "DayOff",
+    "manufacturer": "NixKeyboards",
+    "url": "nixkeyboards.com",
+    "maintainer": "Schrobie",
+    "usb": {
+        "vid": "0x6E6B",
+        "pid": "0x444F",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"~", "x":1.5, "y":0},
+                {"label":"!", "x":2.5, "y":0},
+                {"label":"@", "x":3.5, "y":0},
+                {"label":"#", "x":4.5, "y":0},
+                {"label":"$", "x":5.5, "y":0},
+                {"label":"%", "x":6.5, "y":0},
+                {"label":"^", "x":7.5, "y":0},
+                {"label":"&", "x":8.5, "y":0},
+                {"label":"*", "x":9.5, "y":0},
+                {"label":"(", "x":10.5, "y":0},
+                {"label":")", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Bksp", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":8, "y":1},
+                {"label":"U", "x":9, "y":1},
+                {"label":"I", "x":10, "y":1},
+                {"label":"O", "x":11, "y":1},
+                {"label":"P", "x":12, "y":1},
+                {"label":"{", "x":13, "y":1},
+                {"label":"}", "x":14, "y":1},
+                {"label":"|", "x":15, "y":1, "w":1.5},
+                {"label":"M1", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
+                {"label":"A", "x":3.25, "y":2},
+                {"label":"S", "x":4.25, "y":2},
+                {"label":"D", "x":5.25, "y":2},
+                {"label":"F", "x":6.25, "y":2},
+                {"label":"G", "x":7.25, "y":2},
+                {"label":"H", "x":8.25, "y":2},
+                {"label":"J", "x":9.25, "y":2},
+                {"label":"K", "x":10.25, "y":2},
+                {"label":"L", "x":11.25, "y":2},
+                {"label":":", "x":12.25, "y":2},
+                {"label":"\"", "x":13.25, "y":2},
+                {"label":"Enter", "x":14.25, "y":2, "w":2.25},
+                {"label":"M2", "x":0, "y":3},
+                {"label":"", "x":1.5, "y":3, "w":1.25},
+                {"label":"Shift", "x":2.75, "y":3},
+                {"label":"Z", "x":3.75, "y":3},
+                {"label":"X", "x":4.75, "y":3},
+                {"label":"C", "x":5.75, "y":3},
+                {"label":"V", "x":6.75, "y":3},
+                {"label":"B", "x":7.75, "y":3},
+                {"label":"N", "x":8.75, "y":3},
+                {"label":"M", "x":9.75, "y":3},
+                {"label":"<", "x":10.75, "y":3},
+                {"label":">", "x":11.75, "y":3},
+                {"label":"?", "x":12.75, "y":3},
+                {"label":"Shift", "x":13.75, "y":3, "w":1.75},
+                {"label":"", "x":15.5, "y":3},
+                {"label":"M3", "x":0, "y":4},
+                {"label":"Ctrl", "x":1.5, "y":4, "w":1.25},
+                {"label":"Win", "x":2.75, "y":4, "w":1.25},
+                {"label":"Alt", "x":4, "y":4, "w":1.25},
+                {"label":"Space", "x":5.25, "y":4, "w":6.25},
+                {"label":"Space", "x":5.25, "y":4, "w":2.25},
+                {"label":"Mod", "x":7.5, "y":4, "w":1.25},
+                {"label":"Space", "x":8.75, "y":4, "w":2.25},
+                {"label":"Alt", "x":11.5, "y":4, "w":1.25},
+                {"label":"Win", "x":12.75, "y":4, "w":1.25},
+                {"label":"Menu", "x":14, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
new file mode 100644
index 0000000000..61e879eb4f
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                  KC_GESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+                  KC_TAB,    KC_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_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
+      KC_MNXT,    KC_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_BSLS,
+      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+    ),
+    
+    [1] = LAYOUT_all(
+                  RESET,     KC_1,    KC_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_BSPC,
+      KC_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
+      KC_MNXT,    KC_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_BSLS,
+      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+    ),
+    
+    [2] = LAYOUT_all(
+                     KC_GESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+                     KC_TAB,    KC_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_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
+         KC_MNXT,    KC_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_BSLS,
+         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+    ),
+    
+    [3] = LAYOUT_all(
+                     KC_GESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+                     KC_TAB,    KC_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_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
+         KC_MNXT,    KC_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_BSLS,
+         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+    ),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } 
+    else {
+        tap_code(KC_VOLD);
+    }
+    return false;
+}
diff --git a/keyboards/nixkeyboards/day_off/readme.md b/keyboards/nixkeyboards/day_off/readme.md
new file mode 100644
index 0000000000..5525de91cf
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/readme.md
@@ -0,0 +1,23 @@
+# Day Off Vial Support
+
+[More info at nixkeyboards.com](https://nixkeyboards.com/)
+
+* Keyboard Maintainer: [Schrobie](https://github.com/schrobie)
+* Hardware Supported: Day Off PCBs, both solderable and hotswap
+* Hardware Availability: [Nix Keyboards](https://nixkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nixkeyboards/day_off:default
+
+Flashing example for this keyboard:
+
+    make nixkeyboards/day_off:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/nixkeyboards/day_off/rules.mk b/keyboards/nixkeyboards/day_off/rules.mk
new file mode 100755
index 0000000000..05e63bf5b8
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From f3ea6591db9d233aeb66a0762ec2242b6bb26adc Mon Sep 17 00:00:00 2001
From: fgoodwin <finngoodwin@gmail.com>
Date: Sat, 12 Nov 2022 20:01:38 -0500
Subject: [PATCH 851/959] [Keyboard] Add Dactyl Manuform 5x6 with 6 thumb
 cluster (#18845)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../handwired/dactyl_manuform/5x6_6/5x6_6.c   | 18 ++++
 .../handwired/dactyl_manuform/5x6_6/5x6_6.h   | 47 ++++++++++
 .../handwired/dactyl_manuform/5x6_6/config.h  | 34 +++++++
 .../handwired/dactyl_manuform/5x6_6/info.json | 93 +++++++++++++++++++
 .../5x6_6/keymaps/default/keymap.c            | 39 ++++++++
 .../handwired/dactyl_manuform/5x6_6/readme.md | 22 +++++
 .../handwired/dactyl_manuform/5x6_6/rules.mk  | 19 ++++
 7 files changed, 272 insertions(+)
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/info.json
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/readme.md
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/rules.mk

diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c
new file mode 100644
index 0000000000..dbfb96ce40
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2022 fgoodwin <fgoodwin@north-tech.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 "5x6_6.h"
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
new file mode 100644
index 0000000000..1392cb0b18
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2022 fgoodwin <fgoodwin@north-tech.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 "quantum.h"
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT_split_5x6_6( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+              L42, L43, L44, L45,                          R40, R41, R42, R43, \
+                        L54, L55,                          R50, R51, \
+                        L64, L65,                          R60, R61 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { XXX, XXX, L42, L43, L44, L45 }, \
+    { XXX, XXX, XXX, XXX, L54, L55 }, \
+    { XXX, XXX, XXX, XXX, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, XXX, XXX }, \
+    { R50, R51, XXX, XXX, XXX, XXX }, \
+    { R60, R61, XXX, XXX, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/config.h b/keyboards/handwired/dactyl_manuform/5x6_6/config.h
new file mode 100644
index 0000000000..3571a6d979
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/config.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 fgoodwin <fgoodwin@north-tech.net>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_COLS 6
+#define MATRIX_ROWS 14
+
+#undef SOFT_SERIAL_PIN
+#define SOFT_SERIAL_PIN D3
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
new file mode 100644
index 0000000000..2774cec118
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
@@ -0,0 +1,93 @@
+{
+    "keyboard_name": "Dactyl Manuform 5x6+6",
+    "url": "https://github.com/fgoodwin/dactyl-manuform-5x6_6/tree/main/5x6_6",
+    "maintainer": "fgoodwin",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.3"
+    },
+    "layouts": {
+        "LAYOUT_split_5x6_6": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4},
+
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 5},
+                {"x": 7, "y": 5},
+
+                {"x": 5, "y": 5},
+                {"x": 9, "y": 5},
+                {"x": 10, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..74fe44702e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2022 fgoodwin <fgoodwin@north-tech.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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_split_5x6_6(
+        KC_ESC,    KC_1,      KC_2,      KC_3,     KC_4,       KC_5,         KC_6,      KC_7,    KC_8,     KC_9,     KC_0,    KC_BSLS,
+        KC_GRV,    KC_Q,      KC_W,      KC_E,     KC_R,       KC_T,         KC_Y,      KC_U,    KC_I,     KC_O,     KC_P,    KC_EQL,
+        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_MINS,
+                              KC_NO,     KC_LGUI,  KC_LCTL,    KC_SPC,       KC_RSFT,   KC_ENT,  KC_LBRC,     KC_RBRC,
+                                                   MO(1),      LCTL(KC_C),   KC_BSPC,   MO(1),
+                                                   KC_LALT,    LCTL(KC_V),   KC_DEL,    KC_RSFT
+    ),
+    [1] = LAYOUT_split_5x6_6(
+        KC_TRNS,   KC_F1,     KC_F2,     KC_F3,    KC_F4,         KC_F5,     KC_F6,       KC_F7,      KC_F8,       KC_F9,       KC_F10,     KC_F11,
+        KC_TRNS,   KC_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_PSCR,   KC_DOWN,  KC_UP,         KC_HOME,   KC_END,      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_TRNS,     KC_TRNS,     KC_BSLS,    KC_TRNS,
+                   RESET,     KC_TRNS,   KC_TRNS,  KC_TRNS,       KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,
+                                         MO(1),    LCTL(KC_C),    KC_TRNS,   MO(1),
+                                         KC_TRNS,  LCTL(KC_V),    KC_TRNS,   KC_TRNS
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/readme.md b/keyboards/handwired/dactyl_manuform/5x6_6/readme.md
new file mode 100644
index 0000000000..78107a183d
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/readme.md
@@ -0,0 +1,22 @@
+# Dactyl Manuform (5x6) with 6 thumb cluster
+
+The [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) is a split curved keyboard based on the design of [adereth dactyl](https://github.com/adereth/dactyl-keyboard) and thumb cluster design of the [manuform](https://geekhack.org/index.php?topic=46015.0) keyboard, the hardware is similar to the let's split keyboard. All information needed for making one is in the first link.
+
+![Imgur](https://i.imgur.com/MvtMG1vh.png)
+
+* Keyboard Maintainer: fgoodwin
+* Hardware Supported: Pro Micro Micro Micro USB or USB C
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dactyl_manuform/5x6_6:default
+
+Flashing example for this keyboard:
+
+    make handwired/dactyl_manuform/5x6_6:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+Enter the bootloader in 2 ways:
+**Physical reset button**: Briefly press the reset button on the bottom of the case, or bridge the reset and ground pins momentarily on the pro micro
+**Keycode in layout**: Press the key mapped to `QK_BOOT` (by default hold down `MO(1)` and press the left most key in row 5 on the left hand half of the keyboard)
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
new file mode 100644
index 0000000000..1d413868d4
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
\ No newline at end of file

From 2e39647618295e4a2ba685cfb8e3ab36622e92ee Mon Sep 17 00:00:00 2001
From: arcmags <c.magyar.ec@gmail.com>
Date: Sat, 12 Nov 2022 19:02:18 -0600
Subject: [PATCH 852/959] [Keyboard] add 60_ansi layout to dz60rgb_ansi
 rules.mk (#18664)

---
 keyboards/dztech/dz60rgb_ansi/v1/rules.mk   | 2 ++
 keyboards/dztech/dz60rgb_ansi/v2/rules.mk   | 2 ++
 keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
index 22ecf071a7..5ccc498903 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
@@ -5,6 +5,8 @@ BOARD = QMK_PROTON_C
 # Bootloader selection
 BOOTLOADER = stm32-dfu
 
+LAYOUTS = 60_ansi
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
index d538e324f3..2c2f9a060a 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
@@ -4,6 +4,8 @@ MCU = atmega32u4
 # Bootloader selection
 BOOTLOADER = atmel-dfu
 
+LAYOUTS = 60_ansi
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
index 800fb47256..f25230516c 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
@@ -5,6 +5,8 @@ MCU = atmega32u4
 BOOTLOADER = lufa-ms
 BOOTLOADER_SIZE = 6144
 
+LAYOUTS = 60_ansi
+
 # Build Options
 #   change yes to no to disable
 #

From 6c4e6a86f75e39babc4679813f3bad7bbc1d653e Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Sun, 13 Nov 2022 09:12:20 +0800
Subject: [PATCH 853/959] [Keyboard] Keychron Q6 (#18288)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/keychron/q6/ansi/ansi.c             | 177 ++++++++++++++
 keyboards/keychron/q6/ansi/ansi.h             |  19 ++
 keyboards/keychron/q6/ansi/config.h           |  36 +++
 keyboards/keychron/q6/ansi/info.json          | 130 +++++++++++
 .../keychron/q6/ansi/keymaps/default/keymap.c |  57 +++++
 .../q6/ansi/keymaps/keychron/keymap.c         |  72 ++++++
 .../q6/ansi/keymaps/keychron/rules.mk         |   4 +
 .../keychron/q6/ansi/keymaps/via/keymap.c     |  57 +++++
 .../keychron/q6/ansi/keymaps/via/rules.mk     |   1 +
 keyboards/keychron/q6/ansi/readme.md          |   1 +
 keyboards/keychron/q6/ansi/rules.mk           |  32 +++
 .../keychron/q6/ansi_encoder/ansi_encoder.c   | 177 ++++++++++++++
 .../keychron/q6/ansi_encoder/ansi_encoder.h   |  19 ++
 keyboards/keychron/q6/ansi_encoder/config.h   |  43 ++++
 keyboards/keychron/q6/ansi_encoder/info.json  | 131 +++++++++++
 .../q6/ansi_encoder/keymaps/default/keymap.c  |  66 ++++++
 .../q6/ansi_encoder/keymaps/default/rules.mk  |   1 +
 .../q6/ansi_encoder/keymaps/keychron/keymap.c |  81 +++++++
 .../q6/ansi_encoder/keymaps/keychron/rules.mk |   5 +
 .../q6/ansi_encoder/keymaps/via/keymap.c      |  66 ++++++
 .../q6/ansi_encoder/keymaps/via/rules.mk      |   2 +
 keyboards/keychron/q6/ansi_encoder/readme.md  |   5 +
 keyboards/keychron/q6/ansi_encoder/rules.mk   |  33 +++
 keyboards/keychron/q6/config.h                | 100 ++++++++
 keyboards/keychron/q6/halconf.h               |  21 ++
 keyboards/keychron/q6/iso/config.h            |  36 +++
 keyboards/keychron/q6/iso/info.json           | 131 +++++++++++
 keyboards/keychron/q6/iso/iso.c               | 178 ++++++++++++++
 keyboards/keychron/q6/iso/iso.h               |  19 ++
 .../keychron/q6/iso/keymaps/default/keymap.c  |  57 +++++
 .../keychron/q6/iso/keymaps/keychron/keymap.c |  72 ++++++
 .../keychron/q6/iso/keymaps/keychron/rules.mk |   4 +
 .../keychron/q6/iso/keymaps/via/keymap.c      |  57 +++++
 .../keychron/q6/iso/keymaps/via/rules.mk      |   1 +
 keyboards/keychron/q6/iso/readme.md           |   1 +
 keyboards/keychron/q6/iso/rules.mk            |  33 +++
 keyboards/keychron/q6/iso_encoder/config.h    |  43 ++++
 keyboards/keychron/q6/iso_encoder/info.json   | 132 +++++++++++
 .../keychron/q6/iso_encoder/iso_encoder.c     | 178 ++++++++++++++
 .../keychron/q6/iso_encoder/iso_encoder.h     |  19 ++
 .../q6/iso_encoder/keymaps/default/keymap.c   |  66 ++++++
 .../q6/iso_encoder/keymaps/default/rules.mk   |   1 +
 .../q6/iso_encoder/keymaps/keychron/keymap.c  |  82 +++++++
 .../q6/iso_encoder/keymaps/keychron/rules.mk  |   5 +
 .../q6/iso_encoder/keymaps/via/keymap.c       |  66 ++++++
 .../q6/iso_encoder/keymaps/via/rules.mk       |   2 +
 keyboards/keychron/q6/iso_encoder/readme.md   |   5 +
 keyboards/keychron/q6/iso_encoder/rules.mk    |  34 +++
 keyboards/keychron/q6/matrix.c                | 219 ++++++++++++++++++
 keyboards/keychron/q6/mcuconf.h               |  22 ++
 keyboards/keychron/q6/q6.c                    |  92 ++++++++
 keyboards/keychron/q6/q6.h                    |  29 +++
 keyboards/keychron/q6/readme.md               |  19 ++
 53 files changed, 2939 insertions(+)
 create mode 100644 keyboards/keychron/q6/ansi/ansi.c
 create mode 100644 keyboards/keychron/q6/ansi/ansi.h
 create mode 100644 keyboards/keychron/q6/ansi/config.h
 create mode 100644 keyboards/keychron/q6/ansi/info.json
 create mode 100644 keyboards/keychron/q6/ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q6/ansi/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q6/ansi/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q6/ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q6/ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q6/ansi/readme.md
 create mode 100644 keyboards/keychron/q6/ansi/rules.mk
 create mode 100644 keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
 create mode 100644 keyboards/keychron/q6/ansi_encoder/ansi_encoder.h
 create mode 100644 keyboards/keychron/q6/ansi_encoder/config.h
 create mode 100644 keyboards/keychron/q6/ansi_encoder/info.json
 create mode 100644 keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q6/ansi_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q6/ansi_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q6/ansi_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q6/ansi_encoder/readme.md
 create mode 100644 keyboards/keychron/q6/ansi_encoder/rules.mk
 create mode 100644 keyboards/keychron/q6/config.h
 create mode 100644 keyboards/keychron/q6/halconf.h
 create mode 100644 keyboards/keychron/q6/iso/config.h
 create mode 100644 keyboards/keychron/q6/iso/info.json
 create mode 100644 keyboards/keychron/q6/iso/iso.c
 create mode 100644 keyboards/keychron/q6/iso/iso.h
 create mode 100644 keyboards/keychron/q6/iso/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q6/iso/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q6/iso/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q6/iso/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q6/iso/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q6/iso/readme.md
 create mode 100644 keyboards/keychron/q6/iso/rules.mk
 create mode 100644 keyboards/keychron/q6/iso_encoder/config.h
 create mode 100644 keyboards/keychron/q6/iso_encoder/info.json
 create mode 100644 keyboards/keychron/q6/iso_encoder/iso_encoder.c
 create mode 100644 keyboards/keychron/q6/iso_encoder/iso_encoder.h
 create mode 100644 keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q6/iso_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q6/iso_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q6/iso_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q6/iso_encoder/readme.md
 create mode 100644 keyboards/keychron/q6/iso_encoder/rules.mk
 create mode 100644 keyboards/keychron/q6/matrix.c
 create mode 100644 keyboards/keychron/q6/mcuconf.h
 create mode 100644 keyboards/keychron/q6/q6.c
 create mode 100644 keyboards/keychron/q6/q6.h
 create mode 100644 keyboards/keychron/q6/readme.md

diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c
new file mode 100644
index 0000000000..dc27c9a82d
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/ansi.c
@@ -0,0 +1,177 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_5,    J_5,    K_5},
+    {0, L_6,    J_6,    K_6},
+    {0, L_7,    J_7,    K_7},
+    {0, L_8,    J_8,    K_8},
+    {0, L_4,    J_4,    K_4},
+
+    {0, 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, 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, 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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,  12,  __,  13,  14,  15,  39,  40, 16 },
+        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38, 17 },
+        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  54,  55,  56,  57,  58,  59, 18 },
+        { 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,  __,  73,  60,  77,  76,  74,  75, 19 },
+        { 78, __, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,  __,  89,  93,  90, 107,  91,  92, __ },
+        { 94, 95, 96, __, __, __, 97, __, __, __, 98, 99, 100, 101, 102, 103, 104, 105, 106, __ },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {21,0},  {31,0},  {42,0},  {52,0},  {68,0},  {78,0},  {89,0},   {99,0},   {115,0},  {125,0},  {136,0},  {146,0},  {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
+        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15},  {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
+        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27},  {99,27},  {109,27}, {120,27}, {130,27}, {143,27}, {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
+        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40},  {102,40}, {112,40}, {123,40},           {139,40},                               {193,40}, {203,40}, {214,40}, {224,34},
+        {7,52},          {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52},  {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
+        {1,64}, {14,64}, {27,64},                            {66,64},                              {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
+    },
+    {
+        // 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,          4, 4, 4, 4,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
+        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/ansi/ansi.h b/keyboards/keychron/q6/ansi/ansi.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/ansi.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q6/ansi/config.h b/keyboards/keychron/q6/ansi/config.h
new file mode 100644
index 0000000000..148f8d4c45
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/config.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+    { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, C14 }
+#define NO_PIN_START 11
+#define NO_PIN_OFFSET 1
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 60
+#define DRIVER_2_LED_TOTAL 48
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Enable caps-lock LED*/
+#define CAPS_LOCK_LED_INDEX 61
+
+/* Enable NUM_LOCK_LED_INDEX */
+// #define NUM_LOCK_LED_INDEX 37
diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json
new file mode 100644
index 0000000000..a104096a6f
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/info.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0160",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_108": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,19], "x":18.5, "y":0},
+                {"matrix":[1,19], "x":19.5, "y":0},
+                {"matrix":[2,19], "x":20.5, "y":0},
+                {"matrix":[3,19], "x":21.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[0,17], "x":20.5, "y":1.25},
+                {"matrix":[0,18], "x":21.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[3,14], "x":20.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,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,16], "x":20.5, "y":3.25},
+                {"matrix":[3,15], "x":21.5, "y":2.25, "h":2},
+
+                {"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":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,14], "x":20.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.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,18], "x":20.5, "y":5.25},
+                {"matrix":[4,16], "x":21.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/ansi/keymaps/default/keymap.c b/keyboards/keychron/q6/ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..19bab1ee37
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_108(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_108(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_108(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_108(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
diff --git a/keyboards/keychron/q6/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q6/ansi/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..2ae53ecb63
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/keymaps/keychron/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_108(
+        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_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_108(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_108(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_108(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q6/ansi/keymaps/keychron/rules.mk b/keyboards/keychron/q6/ansi/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..495e8907b4
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q6/ansi/keymaps/via/keymap.c b/keyboards/keychron/q6/ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..19bab1ee37
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_108(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_108(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_108(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_108(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
diff --git a/keyboards/keychron/q6/ansi/keymaps/via/rules.mk b/keyboards/keychron/q6/ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q6/ansi/readme.md b/keyboards/keychron/q6/ansi/readme.md
new file mode 100644
index 0000000000..d4075e9159
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/readme.md
@@ -0,0 +1 @@
+# The ANSI variant of the Keychron Q6
diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk
new file mode 100644
index 0000000000..d7ee4abddd
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
new file mode 100644
index 0000000000..bb1044bd09
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,177 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_5,    J_5,    K_5},
+    {0, L_6,    J_6,    K_6},
+    {0, L_7,    J_7,    K_7},
+    {0, L_8,    J_8,    K_8},
+    {0, L_4,    J_4,    K_4},
+
+    {0, 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, 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, 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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,  12,  __,  13,  14,  15,  39,  40, 16 },
+        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38, 17 },
+        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  54,  55,  56,  57,  58,  59, 18 },
+        { 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,  __,  73,  60,  77,  76,  74,  75, 19 },
+        { 78, __, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,  __,  89,  93,  90, 107,  91,  92, __ },
+        { 94, 95, 96, __, __, __, 97, __, __, __, 98, 99, 100, 101, 102, 103, 104, 105, 106, __ },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},  {13,0},  {24,0},  {34,0},  {45,0},  {57,0},  {68,0},  {78,0},  {89,0},  {102,0},  {112,0},  {123,0},  {133,0},            {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
+        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15}, {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
+        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27}, {99,27},  {109,27}, {120,27}, {130,27}, {143,27}, {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
+        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40}, {102,40}, {112,40}, {123,40},           {139,40},                               {193,40}, {203,40}, {214,40}, {224,34},
+        {7,52},          {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52}, {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
+        {1,64}, {14,64}, {27,64},                            {66,64},                             {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
+    },
+    {
+        // 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,          4, 4, 4, 4,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
+        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q6/ansi_encoder/config.h b/keyboards/keychron/q6/ansi_encoder/config.h
new file mode 100644
index 0000000000..31d801430f
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+    { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
+#define NO_PIN_START 10
+#define NO_PIN_NUM 10
+#define CLR_REG_VAL 0x3FF
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 60
+#define DRIVER_2_LED_TOTAL 48
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { C14 }
+#define ENCODERS_PAD_B { A2 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED*/
+#define CAPS_LOCK_LED_INDEX 61
+
+/* Enable NUM_LOCK_LED_INDEX */
+// #define NUM_LOCK_LED_INDEX 37
diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json
new file mode 100644
index 0000000000..7449c191cf
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/info.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0161",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_109": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[4,19], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,19], "x":18.5, "y":0},
+                {"matrix":[1,19], "x":19.5, "y":0},
+                {"matrix":[2,19], "x":20.5, "y":0},
+                {"matrix":[3,19], "x":21.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[0,17], "x":20.5, "y":1.25},
+                {"matrix":[0,18], "x":21.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[3,14], "x":20.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,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,16], "x":20.5, "y":3.25},
+                {"matrix":[3,15], "x":21.5, "y":2.25, "h":2},
+
+                {"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":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,14], "x":20.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.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,18], "x":20.5, "y":5.25},
+                {"matrix":[4,16], "x":21.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..73b2b7984d
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_109(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_109(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_109(
+        KC_ESC,   KC_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_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_109(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q6/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..4183212305
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,81 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_109(
+        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_MUTE,    KC_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_109(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                  _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_109(
+        KC_ESC,   KC_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_CRTA,  RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_109(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                  _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..dfe2bd5e07
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_109(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,    KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_109(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                  _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_109(
+        KC_ESC,   KC_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_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_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_CAPS,  KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_109(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                  _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q6/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q6/ansi_encoder/readme.md b/keyboards/keychron/q6/ansi_encoder/readme.md
new file mode 100644
index 0000000000..f63e1c1648
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ANSI variant of the Keychron Q6
+
+- Enable rotary encoder support.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top right key pushbutton to mute.
diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk
new file mode 100644
index 0000000000..4b277f6d9e
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q6/config.h b/keyboards/keychron/q6/config.h
new file mode 100644
index 0000000000..5578aed0c5
--- /dev/null
+++ b/keyboards/keychron/q6/config.h
@@ -0,0 +1,100 @@
+/* Copyright 2022 @ Keychron(https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 20
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110111
+#define DRIVER_ADDR_2 0b1110100
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52 }
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* turn off effects when suspended */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* EEPROM Driver Configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q6/halconf.h b/keyboards/keychron/q6/halconf.h
new file mode 100644
index 0000000000..41bddcb279
--- /dev/null
+++ b/keyboards/keychron/q6/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q6/iso/config.h b/keyboards/keychron/q6/iso/config.h
new file mode 100644
index 0000000000..3c1164be6d
--- /dev/null
+++ b/keyboards/keychron/q6/iso/config.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+    { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, C14 }
+#define NO_PIN_START 11
+#define NO_PIN_OFFSET 1
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 60
+#define DRIVER_2_LED_TOTAL 49
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Enable caps-lock LED*/
+#define CAPS_LOCK_LED_INDEX 60
+
+/* Enable NUM_LOCK_LED_INDEX */
+// #define NUM_LOCK_LED_INDEX 37
diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json
new file mode 100644
index 0000000000..fd83c3baf8
--- /dev/null
+++ b/keyboards/keychron/q6/iso/info.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0162",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_109": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,19], "x":18.5, "y":0},
+                {"matrix":[1,19], "x":19.5, "y":0},
+                {"matrix":[2,19], "x":20.5, "y":0},
+                {"matrix":[3,19], "x":21.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[0,17], "x":20.5, "y":1.25},
+                {"matrix":[0,18], "x":21.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[3,14], "x":20.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,16], "x":20.5, "y":3.25},
+                {"matrix":[3,15], "x":21.5, "y":2.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,14], "x":20.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.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,18], "x":20.5, "y":5.25},
+                {"matrix":[4,16], "x":21.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c
new file mode 100644
index 0000000000..497efc2d11
--- /dev/null
+++ b/keyboards/keychron/q6/iso/iso.c
@@ -0,0 +1,178 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iso.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_5,    J_5,    K_5},
+    {0, L_6,    J_6,    K_6},
+    {0, L_7,    J_7,    K_7},
+    {0, L_8,    J_8,    K_8},
+    {0, L_4,    J_4,    K_4},
+
+    {0, 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, 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},
+
+    {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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,  12,  __,  13,  14,  15,  39,  40,  16 },
+        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38,  17 },
+        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  73,  54,  55,  56,  57,  58,  18 },
+        { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,  __,  72,  59,  77,  76,  74,  75,  19 },
+        { 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,  __,  90,  94,  91,  108, 92,  93,  __ },
+        { 95, 96, 97, __, __, __, 98, __, __, __, 99, 100, 101, 102, 103, 104, 105, 106, 107, __ },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {21,0},  {31,0},  {42,0},  {52,0},  {68,0},  {78,0},  {89,0},  {99,0},   {115,0},  {125,0},  {136,0},  {146,0},  {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
+        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15}, {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
+        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27}, {99,27},  {109,27}, {120,27}, {130,27},           {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
+        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40}, {102,40}, {112,40}, {123,40}, {133,40}, {147,36},                               {193,40}, {203,40}, {214,40}, {224,34},
+        {1,52}, {13,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52}, {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
+        {1,64}, {14,64}, {27,64},                            {66,64},                             {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
+    },
+    {
+        // 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1, 4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,          4, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
+        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/iso/iso.h b/keyboards/keychron/q6/iso/iso.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q6/iso/iso.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q6/iso/keymaps/default/keymap.c b/keyboards/keychron/q6/iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cf376b8904
--- /dev/null
+++ b/keyboards/keychron/q6/iso/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_109(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_109(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_109(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_109(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
diff --git a/keyboards/keychron/q6/iso/keymaps/keychron/keymap.c b/keyboards/keychron/q6/iso/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..363b10e92e
--- /dev/null
+++ b/keyboards/keychron/q6/iso/keymaps/keychron/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_109(
+        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_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_109(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_109(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_109(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q6/iso/keymaps/keychron/rules.mk b/keyboards/keychron/q6/iso/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..495e8907b4
--- /dev/null
+++ b/keyboards/keychron/q6/iso/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q6/iso/keymaps/via/keymap.c b/keyboards/keychron/q6/iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cf376b8904
--- /dev/null
+++ b/keyboards/keychron/q6/iso/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_109(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_109(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_109(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_109(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
diff --git a/keyboards/keychron/q6/iso/keymaps/via/rules.mk b/keyboards/keychron/q6/iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q6/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q6/iso/readme.md b/keyboards/keychron/q6/iso/readme.md
new file mode 100644
index 0000000000..05fced2017
--- /dev/null
+++ b/keyboards/keychron/q6/iso/readme.md
@@ -0,0 +1 @@
+# The ISO variant of the Keychron Q6
diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk
new file mode 100644
index 0000000000..878a067c9f
--- /dev/null
+++ b/keyboards/keychron/q6/iso/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+RAW_ENABLE = yes
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q6/iso_encoder/config.h b/keyboards/keychron/q6/iso_encoder/config.h
new file mode 100644
index 0000000000..442fd35efd
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+    { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
+#define NO_PIN_START 10
+#define NO_PIN_NUM 10
+#define CLR_REG_VAL 0x3FF
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 60
+#define DRIVER_2_LED_TOTAL 49
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { C14 }
+#define ENCODERS_PAD_B { A2 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED*/
+#define CAPS_LOCK_LED_INDEX 60
+
+/* Enable NUM_LOCK_LED_INDEX */
+// #define NUM_LOCK_LED_INDEX 37
diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json
new file mode 100644
index 0000000000..d368ffee28
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/info.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0163",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_110": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[4,19], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,19], "x":18.5, "y":0},
+                {"matrix":[1,19], "x":19.5, "y":0},
+                {"matrix":[2,19], "x":20.5, "y":0},
+                {"matrix":[3,19], "x":21.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[0,17], "x":20.5, "y":1.25},
+                {"matrix":[0,18], "x":21.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[3,14], "x":20.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,16], "x":20.5, "y":3.25},
+                {"matrix":[3,15], "x":21.5, "y":2.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":2.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,14], "x":20.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.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,18], "x":20.5, "y":5.25},
+                {"matrix":[4,16], "x":21.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
new file mode 100644
index 0000000000..3ad47b7b0f
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
@@ -0,0 +1,178 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iso_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_5,    J_5,    K_5},
+    {0, L_6,    J_6,    K_6},
+    {0, L_7,    J_7,    K_7},
+    {0, L_8,    J_8,    K_8},
+    {0, L_4,    J_4,    K_4},
+
+    {0, 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, 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},
+
+    {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, 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, 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},
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,  12,  __,  13,  14,  15,  39,  40,  16 },
+        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38,  17 },
+        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  73,  54,  55,  56,  57,  58,  18 },
+        { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,  __,  72,  59,  77,  76,  74,  75,  19 },
+        { 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,  __,  90,  94,  91,  108, 92,  93,  __ },
+        { 95, 96, 97, __, __, __, 98, __, __, __, 99, 100, 101, 102, 103, 104, 105, 106, 107, __ },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},  {13,0},  {24,0},  {34,0},  {45,0},  {57,0},  {68,0},  {78,0},  {89,0},  {102,0},  {112,0},  {123,0},  {133,0},            {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
+        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15}, {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
+        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27}, {99,27},  {109,27}, {120,27}, {130,27}, {159,27},           {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
+        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40}, {102,40}, {112,40}, {123,40}, {133,40}, {147,36},                               {193,40}, {203,40}, {214,40}, {224,34},
+        {1,52}, {13,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52}, {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
+        {1,64}, {14,64}, {27,64},                            {66,64},                             {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
+    },
+    {
+        // 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1, 4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,          4, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
+        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.h b/keyboards/keychron/q6/iso_encoder/iso_encoder.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..69f8c96a0d
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_110(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LOPT,  KC_LCMD ,                               KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_110(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_110(
+        KC_ESC,   KC_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_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,              KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_110(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q6/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..fbe314a2c3
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_110(
+        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_MUTE,    KC_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_110(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_110(
+        KC_ESC,   KC_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_CRTA,  RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_110(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q6/iso_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..dfb6751854
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_110(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,    KC_NO,    KC_NO,    RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_110(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_110(
+        KC_ESC,   KC_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_NO,    RGB_MOD,  _______,  _______,  _______,  _______,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,
+        KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_110(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                                  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q6/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q6/iso_encoder/readme.md b/keyboards/keychron/q6/iso_encoder/readme.md
new file mode 100644
index 0000000000..b68e340149
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ISO variant of the Keychron Q6
+
+- Enable rotary encoder support.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top right key pushbutton to mute.
diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk
new file mode 100644
index 0000000000..a4a0e8b758
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+RAW_ENABLE = yes
+LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q6/matrix.c b/keyboards/keychron/q6/matrix.c
new file mode 100644
index 0000000000..11f3432e6b
--- /dev/null
+++ b/keyboards/keychron/q6/matrix.c
@@ -0,0 +1,219 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "matrix.h"
+#include "quantum.h"
+
+// Pin connected to DS of 74HC595
+#define DATA_PIN C15
+// Pin connected to SH_CP of 74HC595
+#define CLOCK_PIN A1
+// Pin connected to ST_CP of 74HC595
+#define LATCH_PIN A0
+
+#ifdef MATRIX_ROW_PINS
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+#endif // MATRIX_ROW_PINS
+#ifdef MATRIX_COL_PINS
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif // MATRIX_COL_PINS
+
+#define ROWS_PER_HAND (MATRIX_ROWS)
+
+#ifndef NO_PIN_NUM
+#    define NO_PIN_NUM 8
+#endif
+
+#ifndef NO_PIN_OFFSET
+#    define NO_PIN_OFFSET 0
+#endif
+
+#ifndef CLR_REG_VAL
+#    define CLR_REG_VAL 0xFF
+#endif
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinInputHigh(pin);
+    }
+}
+
+static inline uint8_t readMatrixPin(pin_t pin) {
+    if (pin != NO_PIN) {
+        return readPin(pin);
+    } else {
+        return 1;
+    }
+}
+
+static void shiftOut(uint16_t dataOut) {
+    for (uint8_t i = 0; i < NO_PIN_NUM; i++) {
+        if (dataOut & 0x1) {
+            setPinOutput_writeHigh(DATA_PIN);
+        } else {
+            setPinOutput_writeLow(DATA_PIN);
+        }
+        dataOut = dataOut >> 1;
+        setPinOutput_writeHigh(CLOCK_PIN);
+        setPinOutput_writeLow(CLOCK_PIN);
+    }
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static void shiftout_single(uint8_t data) {
+    if (data & 0x1) {
+        setPinOutput_writeHigh(DATA_PIN);
+    } else {
+        setPinOutput_writeLow(DATA_PIN);
+    }
+    setPinOutput_writeHigh(CLOCK_PIN);
+    setPinOutput_writeLow(CLOCK_PIN);
+
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static bool select_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+        setPinOutput_writeLow(pin);
+        return true;
+    } else {
+        if (col == NO_PIN_START) {
+            shiftout_single(0x00);
+        } else {
+            shiftout_single(0x01);
+        }
+        return true;
+    }
+    return false;
+}
+
+static void unselect_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#else
+        setPinInputHigh_atomic(pin);
+#endif
+    } else {
+        if (col == (MATRIX_COLS - NO_PIN_OFFSET - 1))
+        setPinOutput_writeHigh(CLOCK_PIN);
+        setPinOutput_writeLow(CLOCK_PIN);
+        setPinOutput_writeHigh(LATCH_PIN);
+        setPinOutput_writeLow(LATCH_PIN);
+    }
+}
+
+static void unselect_cols(void) {
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        pin_t pin = col_pins[x];
+        if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+            setPinOutput_writeHigh(pin);
+#else
+            setPinInputHigh_atomic(pin);
+#endif
+        }
+        if (x == (MATRIX_COLS - NO_PIN_OFFSET - 1))
+            // unselect shift Register
+            shiftOut(CLR_REG_VAL);
+    }
+}
+
+static void matrix_init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        if (row_pins[x] != NO_PIN) {
+            setPinInputHigh_atomic(row_pins[x]);
+        }
+    }
+}
+
+static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
+    bool key_pressed = false;
+
+    // Select col
+    if (!select_col(current_col)) { // select col
+        return;                     // skip NO_PIN col
+    }
+
+    if (current_col < 10) {
+        matrix_output_select_delay();
+    } else {
+        for (int8_t cycle = 4; cycle > 0; cycle--) {
+            matrix_output_select_delay(); // 0.25us
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+        }
+    }
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
+        // Check row pin state
+        if (readMatrixPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= row_shifter;
+            key_pressed = true;
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~row_shifter;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    matrix_init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
+
+    // Set col, read rows
+    matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
+        matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
+    }
+
+    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+
+    return changed;
+}
diff --git a/keyboards/keychron/q6/mcuconf.h b/keyboards/keychron/q6/mcuconf.h
new file mode 100644
index 0000000000..0ca8c64850
--- /dev/null
+++ b/keyboards/keychron/q6/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c
new file mode 100644
index 0000000000..85018004e0
--- /dev/null
+++ b/keyboards/keychron/q6/q6.c
@@ -0,0 +1,92 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "q6.h"
+
+const matrix_row_t matrix_mask[] = {
+    0b11111111111111111111,
+    0b11111111111111111111,
+    0b11111111111111111111,
+    0b11111111111111111111,
+    0b11111111111111111111,
+    0b11111111111111101111,
+};
+
+#ifdef DIP_SWITCH_ENABLE
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) {
+        return false;
+    }
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    return true;
+}
+
+#endif // DIP_SWITCH_ENABLE
+
+#if defined(RGB_MATRIX_ENABLE) && (defined(CAPS_LOCK_LED_INDEX) || defined(NUM_LOCK_LED_INDEX))
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+    }
+    return true;
+}
+
+__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+#    if defined(CAPS_LOCK_LED_INDEX)
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+#    endif // CAPS_LOCK_LED_INDEX
+#    if defined(NUM_LOCK_LED_INDEX)
+    if (host_keyboard_led_state().num_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+#    endif // NUM_LOCK_LED_INDEX
+}
+
+#endif // RGB_MATRIX_ENABLE...
diff --git a/keyboards/keychron/q6/q6.h b/keyboards/keychron/q6/q6.h
new file mode 100644
index 0000000000..9e878e700c
--- /dev/null
+++ b/keyboards/keychron/q6/q6.h
@@ -0,0 +1,29 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if   defined(KEYBOARD_keychron_q6_ansi)
+#    include "ansi.h"
+#elif defined(KEYBOARD_keychron_q6_ansi_encoder)
+#    include "ansi_encoder.h"
+#elif defined(KEYBOARD_keychron_q6_iso)
+#    include "iso.h"
+#elif defined(KEYBOARD_keychron_q6_iso_encoder)
+#    include "iso_encoder.h"
+#endif
diff --git a/keyboards/keychron/q6/readme.md b/keyboards/keychron/q6/readme.md
new file mode 100644
index 0000000000..a2056c57ae
--- /dev/null
+++ b/keyboards/keychron/q6/readme.md
@@ -0,0 +1,19 @@
+# Keychron Q6
+
+A customizable 100% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q6
+* Hardware Availability: [Keychron](https://www.keychron.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keychron/q6/ansi:default
+
+Flashing example for this keyboard:
+
+    make keychron/q6/ansi:default:flash
+
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

From 4c1d8a0eb33e5738f305191dfb7a56f8b0275827 Mon Sep 17 00:00:00 2001
From: Richard Nash <rvnash@gmail.com>
Date: Sun, 13 Nov 2022 10:49:59 -0500
Subject: [PATCH 854/959] Fix oled_render to render all dirty blocks. (#18887)

---
 drivers/oled/ssd1306_sh1106.c | 100 +++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/drivers/oled/ssd1306_sh1106.c b/drivers/oled/ssd1306_sh1106.c
index 30cfeb5648..9fc8c2d2ad 100644
--- a/drivers/oled/ssd1306_sh1106.c
+++ b/drivers/oled/ssd1306_sh1106.c
@@ -291,65 +291,63 @@ static void rotate_90(const uint8_t *src, uint8_t *dest) {
 }
 
 void oled_render(void) {
-    if (!oled_initialized) {
-        return;
-    }
-
     // Do we have work to do?
     oled_dirty &= OLED_ALL_BLOCKS_MASK;
-    if (!oled_dirty || oled_scrolling) {
+    if (!oled_dirty || !oled_initialized || oled_scrolling) {
         return;
     }
 
-    // Find first dirty block
-    uint8_t update_start = 0;
-    while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) {
-        ++update_start;
-    }
-
-    // Set column & page position
-    static uint8_t display_start[] = {I2C_CMD, COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
-    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
-        calc_bounds(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
-    } else {
-        calc_bounds_90(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
-    }
-
-    // Send column & page position
-    if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) {
-        print("oled_render offset command failed\n");
-        return;
-    }
-
-    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
-        // Send render data chunk as is
-        if (I2C_WRITE_REG(I2C_DATA, &oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) {
-            print("oled_render data failed\n");
-            return;
-        }
-    } else {
-        // Rotate the render chunks
-        const static uint8_t source_map[] = OLED_SOURCE_MAP;
-        const static uint8_t target_map[] = OLED_TARGET_MAP;
-
-        static uint8_t temp_buffer[OLED_BLOCK_SIZE];
-        memset(temp_buffer, 0, sizeof(temp_buffer));
-        for (uint8_t i = 0; i < sizeof(source_map); ++i) {
-            rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]);
-        }
-
-        // Send render data chunk after rotating
-        if (I2C_WRITE_REG(I2C_DATA, &temp_buffer[0], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) {
-            print("oled_render90 data failed\n");
-            return;
-        }
-    }
-
     // Turn on display if it is off
     oled_on();
 
-    // Clear dirty flag
-    oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start);
+    uint8_t update_start = 0;
+    while (oled_dirty) { // render all dirty blocks
+        // Find next dirty block
+        while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) {
+            ++update_start;
+        }
+
+        // Set column & page position
+        static uint8_t display_start[] = {I2C_CMD, COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
+        if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+            calc_bounds(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
+        } else {
+            calc_bounds_90(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
+        }
+
+        // Send column & page position
+        if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) {
+            print("oled_render offset command failed\n");
+            return;
+        }
+
+        if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+            // Send render data chunk as is
+            if (I2C_WRITE_REG(I2C_DATA, &oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) {
+                print("oled_render data failed\n");
+                return;
+            }
+        } else {
+            // Rotate the render chunks
+            const static uint8_t source_map[] = OLED_SOURCE_MAP;
+            const static uint8_t target_map[] = OLED_TARGET_MAP;
+
+            static uint8_t temp_buffer[OLED_BLOCK_SIZE];
+            memset(temp_buffer, 0, sizeof(temp_buffer));
+            for (uint8_t i = 0; i < sizeof(source_map); ++i) {
+                rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]);
+            }
+
+            // Send render data chunk after rotating
+            if (I2C_WRITE_REG(I2C_DATA, &temp_buffer[0], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) {
+                print("oled_render90 data failed\n");
+                return;
+            }
+        }
+
+        // Clear dirty flag of just rendered block
+        oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start);
+    }
 }
 
 void oled_set_cursor(uint8_t col, uint8_t line) {

From 8812872794b5fb09e6bbbe47a58cc7dbcaca18a7 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 13 Nov 2022 07:51:19 -0800
Subject: [PATCH 855/959] Only trigger encoder callbacks on primary side
 (#18467)

Co-authored-by: zvecr <git@zvecr.com>
---
 quantum/encoder.c                             |  14 +-
 .../encoder/tests/config_mock_split_role.h    |  26 ++++
 .../tests/encoder_tests_split_role.cpp        | 122 ++++++++++++++++++
 quantum/encoder/tests/mock.c                  |   4 +
 quantum/encoder/tests/mock_split.c            |   4 +
 quantum/encoder/tests/rules.mk                |  10 ++
 quantum/encoder/tests/testlist.mk             |   3 +-
 7 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 quantum/encoder/tests/config_mock_split_role.h
 create mode 100644 quantum/encoder/tests/encoder_tests_split_role.cpp

diff --git a/quantum/encoder.c b/quantum/encoder.c
index 1393e34868..3aee340249 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -80,6 +80,10 @@ __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
     return encoder_update_user(index, clockwise);
 }
 
+__attribute__((weak)) bool should_process_encoder(void) {
+    return is_keyboard_master();
+}
+
 void encoder_init(void) {
 #ifdef SPLIT_KEYBOARD
     thisHand  = isLeftHand ? 0 : NUM_ENCODERS_LEFT;
@@ -179,8 +183,11 @@ static bool encoder_update(uint8_t index, uint8_t state) {
 
             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);
+                encoder_exec_mapping(index, ENCODER_COUNTER_CLOCKWISE);
 #else  // ENCODER_MAP_ENABLE
         encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
 #endif // ENCODER_MAP_ENABLE
@@ -193,8 +200,11 @@ static bool encoder_update(uint8_t index, uint8_t state) {
 #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);
+                encoder_exec_mapping(index, ENCODER_CLOCKWISE);
 #else  // ENCODER_MAP_ENABLE
         encoder_update_kb(index, ENCODER_CLOCKWISE);
 #endif // ENCODER_MAP_ENABLE
diff --git a/quantum/encoder/tests/config_mock_split_role.h b/quantum/encoder/tests/config_mock_split_role.h
new file mode 100644
index 0000000000..c80ac4d519
--- /dev/null
+++ b/quantum/encoder/tests/config_mock_split_role.h
@@ -0,0 +1,26 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/* Here, "pins" from 0 to 31 are allowed. */
+#define ENCODERS_PAD_A \
+    { 0, 2 }
+#define ENCODERS_PAD_B \
+    { 1, 3 }
+#define ENCODERS_PAD_A_RIGHT \
+    { 4, 6 }
+#define ENCODERS_PAD_B_RIGHT \
+    { 5, 7 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mock_split.h"
+
+#ifdef __cplusplus
+};
+#endif
diff --git a/quantum/encoder/tests/encoder_tests_split_role.cpp b/quantum/encoder/tests/encoder_tests_split_role.cpp
new file mode 100644
index 0000000000..02264067f4
--- /dev/null
+++ b/quantum/encoder/tests/encoder_tests_split_role.cpp
@@ -0,0 +1,122 @@
+/* Copyright 2021 Balz Guenat
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include <vector>
+#include <algorithm>
+#include <stdio.h>
+
+extern "C" {
+#include "encoder.h"
+#include "encoder/tests/mock_split.h"
+}
+
+struct update {
+    int8_t index;
+    bool   clockwise;
+};
+
+uint8_t num_updates = 0;
+
+bool isMaster;
+bool isLeftHand;
+
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!isMaster) {
+        ADD_FAILURE() << "We shouldn't get here.";
+    }
+    num_updates++;
+    return true;
+}
+
+bool setAndRead(pin_t pin, bool val) {
+    setPin(pin, val);
+    return encoder_read();
+}
+
+class EncoderSplitTestRole : public ::testing::Test {
+   protected:
+    void SetUp() override {
+        num_updates = 0;
+        for (int i = 0; i < 32; i++) {
+            pinIsInputHigh[i] = 0;
+            pins[i]           = 0;
+        }
+    }
+};
+
+TEST_F(EncoderSplitTestRole, TestPrimaryLeft) {
+    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);
+
+    EXPECT_EQ(num_updates, 1); // one update received
+}
+
+TEST_F(EncoderSplitTestRole, TestPrimaryRight) {
+    isMaster   = true;
+    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);
+
+    uint8_t slave_state[32] = {0};
+    encoder_state_raw(slave_state);
+
+    EXPECT_EQ(num_updates, 1); // one update received
+}
+
+TEST_F(EncoderSplitTestRole, TestNotPrimaryLeft) {
+    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);
+
+    EXPECT_EQ(num_updates, 0); // zero updates received
+}
+
+TEST_F(EncoderSplitTestRole, TestNotPrimaryRight) {
+    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);
+
+    uint8_t slave_state[32] = {0};
+    encoder_state_raw(slave_state);
+
+    EXPECT_EQ(num_updates, 0); // zero updates received
+}
diff --git a/quantum/encoder/tests/mock.c b/quantum/encoder/tests/mock.c
index 10a00cb8f2..61f2f8294d 100644
--- a/quantum/encoder/tests/mock.c
+++ b/quantum/encoder/tests/mock.c
@@ -34,3 +34,7 @@ bool setPin(pin_t pin, bool val) {
     pins[pin] = val;
     return val;
 }
+
+__attribute__((weak)) bool is_keyboard_master(void) {
+    return true;
+}
diff --git a/quantum/encoder/tests/mock_split.c b/quantum/encoder/tests/mock_split.c
index dd3c26d958..5cc6cd19e1 100644
--- a/quantum/encoder/tests/mock_split.c
+++ b/quantum/encoder/tests/mock_split.c
@@ -36,3 +36,7 @@ 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/rules.mk b/quantum/encoder/tests/rules.mk
index 6a2611952c..d01c1c66ee 100644
--- a/quantum/encoder/tests/rules.mk
+++ b/quantum/encoder/tests/rules.mk
@@ -56,3 +56,13 @@ encoder_split_no_right_SRC := \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_no_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
+
+encoder_split_role_DEFS := -DENCODER_TESTS -DENCODER_ENABLE -DENCODER_MOCK_SPLIT
+encoder_split_role_INC := $(QUANTUM_PATH)/split_common
+encoder_split_role_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_split_role.h
+
+encoder_split_role_SRC := \
+	platforms/test/timer.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/encoder/tests/testlist.mk b/quantum/encoder/tests/testlist.mk
index 6b2fd84d96..a407f1fadd 100644
--- a/quantum/encoder/tests/testlist.mk
+++ b/quantum/encoder/tests/testlist.mk
@@ -4,4 +4,5 @@ TEST_LIST += \
 	encoder_split_left_gt_right \
 	encoder_split_left_lt_right \
 	encoder_split_no_left \
-	encoder_split_no_right
+	encoder_split_no_right \
+	encoder_split_role \

From d3073ef4943c70a3942ac91bb46fdc1a90f9e566 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 13 Nov 2022 08:05:46 -0800
Subject: [PATCH 856/959] Add pointing device support to data driven config
 (#18215)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 data/mappings/info_config.hjson         | 18 +++++++
 data/mappings/info_rules.hjson          |  2 +
 data/schemas/keyboard.jsonschema        | 63 +++++++++++++++++++++++++
 lib/python/qmk/cli/generate/config_h.py | 13 +++++
 4 files changed, 96 insertions(+)

diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index a013e98b34..a80d5cff6f 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -11,6 +11,10 @@
     // invalid: Default `false`. Set to `true` to generate errors when a value exists
     // replace_with: use with a key marked deprecated or invalid to designate a replacement
     "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
+    "AUTO_MOUSE_DEFAULT_LAYER": {"info_key": "pointing_device.auto_mouse.default_layer"},
+    "AUTO_MOUSE_TIME": {"info_key": "pointing_device.auto_mouse.time"},
+    "AUTO_MOUSE_DELAY": {"info_key": "pointing_device.auto_mouse.delay"},
+    "AUTO_MOUSE_DEBOUNCE": {"info_key": "pointing_device.auto_mouse.debounce"},
     "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
     "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
     "BACKLIGHT_LEVELS": {"info_key": "backlight.levels", "value_type": "int"},
@@ -87,6 +91,19 @@
     "RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
     "RGB_MATRIX_SPD_STEP": {"info_key": "rgb_matrix.speed_steps", "value_type": "int"},
     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
+    "POINTING_DEVICE_AUTO_MOUSE_ENABLE": {"info_key": "pointing_device.auto_mouse.enabled"},
+    "POINTING_DEVICE_CS_PIN": {"info_key": "pointing_device.pins.cs"},
+    "POINTING_DEVICE_INVERT_X": {"info_key": "pointing_device.invert_x", "value_type": "bool"},
+    "POINTING_DEVICE_INVERT_X_RIGHT": {"info_key": "split.pointing_device.right.invert_x", "value_type": "bool"},
+    "POINTING_DEVICE_INVERT_Y": {"info_key": "pointing_device.invert_y", "value_type": "bool"},
+    "POINTING_DEVICE_INVERT_Y_RIGHT": {"info_key": "split.pointing_device.right.invert_y", "value_type": "bool"},
+    "POINTING_DEVICE_MOTION_PIN": {"info_key": "pointing_device.pins.motion"},
+    "POINTING_DEVICE_SDIO_PIN": {"info_key": "pointing_device.pins.sdio"},
+    "POINTING_DEVICE_SCLK_PIN": {"info_key": "pointing_device.pins.sclk"},
+    "POINTING_DEVICE_TASK_THROTTLE_MS": {"info_key": "pointing_device.throttle", "value_type": "int"},
+    "POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE": {"info_key": "pointing_device.gestures.cursor_glide", "value_type": "bool"},
+    "POINTING_DEVICE_GESTURES_SCROLL_ENABLE": {"info_key": "pointing_device.gestures.scroll", "value_type": "bool"},
+
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"},
@@ -99,6 +116,7 @@
     "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
     "SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "bool"},
     "SPLIT_MODS_ENABLE": {"info_key": "split.transport.sync_modifiers", "value_type": "bool"},
+    "SPLIT_POINTING_ENABLE": {"info_key": "split.transport.sync_pointing", "value_type": "bool"},
     "SPLIT_TRANSPORT_MIRROR": {"info_key": "split.transport.sync_matrix_state", "value_type": "bool"},
     "SPLIT_USB_DETECT": {"info_key": "split.usb_detect.enabled", "value_type": "bool"},
     "SPLIT_USB_TIMEOUT": {"info_key": "split.usb_detect.timeout", "value_type": "int"},
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index 2f8656c4bf..2cc465f30d 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -36,6 +36,8 @@
     "PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
     "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
     "PS2_DRIVER": {"info_key": "ps2.driver"},
+    "POINTING_DEVICE_ENABLE": {"info_key": "pointing_device.enabled", "value_type": "bool"},
+    "POINTING_DEVICE_DRIVER": {"info_key": "pointing_device.driver"},
 
     // Items we want flagged in lint
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index daf54141a8..d5f4f392d7 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -363,6 +363,48 @@
                 }
             }
         },
+        "pointing_device": {
+            "type": "object",
+            "properties": {
+                "enabled": {"type": "boolean"},
+                "driver": {"type": "string"},
+                "auto_mouse":  {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {"type": "boolean"},
+                        "default_layer": {"type":  "qmk.definitions.v1#/unsigned_int_8"},
+                        "time": {"type":  "qmk.definitions.v1#/unsigned_int"},
+                        "delay": {"type":  "qmk.definitions.v1#/unsigned_int"},
+                        "debounce": {"type":  "qmk.definitions.v1#/unsigned_int"}
+                    }
+                }
+                "pins": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "motion": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                        "cs": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                        "sdio": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                        "sclk": {"$ref": "qmk.definitions.v1#/mcu_pin"}
+                    }
+                },
+                "throttle": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
+                "invert_x": {"type": "boolean"},
+                "invert_y": {"type": "boolean"},
+                "gestures": {
+                    "type": "object",
+                    "properties": {
+                        "cursor_glide": {"type": "boolean"},
+                        "scroll": {"type": "boolean"}
+                    }
+                },
+                "rotation": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "enum": [0, 90, 180, 270]
+                }
+            }
+        },
         "rgb_matrix": {
             "type": "object",
             "properties": {
@@ -544,6 +586,26 @@
                     "type": "string",
                     "enum": ["eeprom", "left", "matrix_grid", "pin", "right"]
                 },
+                "pointing_device": {
+                    "right": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "type": "object",
+                        "properties": {
+                            "side": {
+                                "type": "string",
+                                "enum": ["left", "right", "combined"]
+                            },
+                            "invert_x": {"type": "boolean"},
+                            "invert_y": {"type": "boolean"},
+                            "rotation": {
+                                "type": "integer",
+                                "minimum": 0,
+                                "enum": [0, 90, 180, 270]
+                            }
+                        }
+                    }
+                },
                 "soft_serial_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "soft_serial_speed": {
                     "type": "integer",
@@ -560,6 +622,7 @@
                         },
                         "sync_matrix_state": {"type": "boolean"},
                         "sync_modifiers": {"type": "boolean"},
+                        "sync_pointing": {"type": "boolean"},
                         "watchdog": {"type": "boolean"},
                         "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
                     }
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 31b8d70635..51051ef610 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -126,6 +126,13 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
         config_h_lines.append(generate_define(f'ENCODER_RESOLUTIONS{postfix}', f'{{ {", ".join(map(str,resolutions))} }}'))
 
 
+def generate_pointing_device_config(pointing_device_json, config_h_lines, postfix=''):
+
+    rotation = pointing_device_json.get('rotation', 0)
+
+    generate_define(f'POINTING_DEVICE_ROTATION_{rotation}{postfix}')
+
+
 def generate_split_config(kb_info_json, config_h_lines):
     """Generate the config.h lines for split boards."""
     if 'primary' in kb_info_json['split']:
@@ -156,6 +163,9 @@ def generate_split_config(kb_info_json, config_h_lines):
     if 'right' in kb_info_json['split'].get('encoder', {}):
         generate_encoder_config(kb_info_json['split']['encoder']['right'], config_h_lines, '_RIGHT')
 
+    if 'right' in kb_info_json['split'].get('pointing_device', {}):
+        generate_pointing_device_config(kb_info_json['split']['pointing_device']['right'], config_h_lines, '_RIGHT')
+
 
 def generate_led_animations_config(led_feature_json, config_h_lines, prefix):
     for animation in led_feature_json.get('animations', {}):
@@ -207,5 +217,8 @@ def generate_config_h(cli):
     if 'rgblight' in kb_info_json:
         generate_led_animations_config(kb_info_json['rgblight'], config_h_lines, 'RGBLIGHT_EFFECT_')
 
+    if 'pointing_device' in kb_info_json:
+        generate_pointing_device_config(kb_info_json['pointing_device'], config_h_lines)
+
     # Show the results
     dump_lines(cli.args.output, config_h_lines, cli.args.quiet)

From 133fe1c013d712522fc8ae159567629ef7760ed6 Mon Sep 17 00:00:00 2001
From: Klesh Wong <klesh@qq.com>
Date: Mon, 14 Nov 2022 00:07:08 +0800
Subject: [PATCH 857/959] fix: mousekey doesn't work with trackpoint (#18474)

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 drivers/ps2/ps2_mouse.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c
index 66b48bb3c3..b32ad1e222 100644
--- a/drivers/ps2/ps2_mouse.c
+++ b/drivers/ps2/ps2_mouse.c
@@ -80,7 +80,7 @@ void ps2_mouse_task(void) {
     uint8_t rcv;
     rcv = ps2_host_send(PS2_MOUSE_READ_DATA);
     if (rcv == PS2_ACK) {
-        mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
+        mouse_report.buttons = ps2_host_recv_response();
         mouse_report.x       = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
         mouse_report.y       = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
 #    ifdef PS2_MOUSE_ENABLE_SCROLLING
@@ -88,11 +88,10 @@ void ps2_mouse_task(void) {
 #    endif
     } else {
         if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
-        return;
     }
 #else
     if (pbuf_has_data()) {
-        mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
+        mouse_report.buttons = ps2_host_recv_response();
         mouse_report.x       = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
         mouse_report.y       = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
 #    ifdef PS2_MOUSE_ENABLE_SCROLLING
@@ -100,10 +99,10 @@ void ps2_mouse_task(void) {
 #    endif
     } else {
         if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
-        return;
     }
 #endif
 
+    mouse_report.buttons |= tp_buttons;
     /* if mouse moves or buttons state changes */
     if (mouse_report.x || mouse_report.y || mouse_report.v || ((mouse_report.buttons ^ buttons_prev) & PS2_MOUSE_BTN_MASK)) {
 #ifdef PS2_MOUSE_DEBUG_RAW

From e273df8b93b743bce0b25688373d40945e6556fd Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 13 Nov 2022 16:31:29 +0000
Subject: [PATCH 858/959] Fix duplicate key in keyboard.jsonschema (#19058)

---
 data/schemas/keyboard.jsonschema | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index d5f4f392d7..353d9469d1 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -590,7 +590,6 @@
                     "right": {
                         "type": "object",
                         "additionalProperties": false,
-                        "type": "object",
                         "properties": {
                             "side": {
                                 "type": "string",

From d627609f5e7a1a810b5cd492222754f5b2e65030 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 14 Nov 2022 03:31:47 +1100
Subject: [PATCH 859/959] Fixup. (#19059)


From c1ef943ce0dccacd222b66cffaac43417c840373 Mon Sep 17 00:00:00 2001
From: nicknimchuk <32887909+nicknimchuk@users.noreply.github.com>
Date: Sun, 13 Nov 2022 10:34:59 -0600
Subject: [PATCH 860/959] Add missing prototype for get_hold_on_other_key_press
 to resolve #18855 (#19056)

Closes undefined
---
 quantum/action_tapping.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/action_tapping.h b/quantum/action_tapping.h
index 9b64c93120..bcccc7ac45 100644
--- a/quantum/action_tapping.h
+++ b/quantum/action_tapping.h
@@ -40,6 +40,7 @@ bool     get_permissive_hold(uint16_t keycode, keyrecord_t *record);
 bool     get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record);
 bool     get_tapping_force_hold(uint16_t keycode, keyrecord_t *record);
 bool     get_retro_tapping(uint16_t keycode, keyrecord_t *record);
+bool     get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record);
 
 #ifdef DYNAMIC_TAPPING_TERM_ENABLE
 extern uint16_t g_tapping_term;

From 9a488a44f665eeaf7e34f5c5a0dcca186fe21ba6 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 13 Nov 2022 16:37:07 +0000
Subject: [PATCH 861/959] Fix up laser_ninja/pumpkin_pad (#19060)

---
 keyboards/laser_ninja/pumpkin_pad/config.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keyboards/laser_ninja/pumpkin_pad/config.h b/keyboards/laser_ninja/pumpkin_pad/config.h
index 926d8788c1..7dbd24e341 100644
--- a/keyboards/laser_ninja/pumpkin_pad/config.h
+++ b/keyboards/laser_ninja/pumpkin_pad/config.h
@@ -20,9 +20,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DI_PIN A10
-#    define RGBLED_NUM 28
-#    define DRIVER_LED_TOTAL RGBLED_NUM
-#    define BACKLIGHT_LIMIT_VAL 200
+#    define RGB_MATRIX_LED_COUNT 28
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #    define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT

From 3f579c5ef369d177547c6a68bd4c7658c4175e10 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 14 Nov 2022 03:58:37 +1100
Subject: [PATCH 862/959] Cleanup. (#19061)

---
 keyboards/nixkeyboards/day_off/readme.md        | 2 +-
 keyboards/synthandkeys/the_debit_card/readme.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/nixkeyboards/day_off/readme.md b/keyboards/nixkeyboards/day_off/readme.md
index 5525de91cf..78871fe49d 100644
--- a/keyboards/nixkeyboards/day_off/readme.md
+++ b/keyboards/nixkeyboards/day_off/readme.md
@@ -1,4 +1,4 @@
-# Day Off Vial Support
+# Day Off Support
 
 [More info at nixkeyboards.com](https://nixkeyboards.com/)
 
diff --git a/keyboards/synthandkeys/the_debit_card/readme.md b/keyboards/synthandkeys/the_debit_card/readme.md
index 6e1b2e0ac3..e6812bba89 100644
--- a/keyboards/synthandkeys/the_debit_card/readme.md
+++ b/keyboards/synthandkeys/the_debit_card/readme.md
@@ -2,7 +2,7 @@
 
 ![synthandkeys/the_debit_card](https://i.imgur.com/8dpEv73.jpeg)
 
-The Debit Card is a 10-key programmable mechanical keyboard that could fit in your wallet. The ultra-thin, ultra-portable macropad is powered by the XIAO RP2040 and can support KMK, QMK, or VIAL open-source keyboard firmware.
+The Debit Card is a 10-key programmable mechanical keyboard that could fit in your wallet. The ultra-thin, ultra-portable macropad is powered by the XIAO RP2040 and can support KMK, or QMK open-source keyboard firmware.
 
 * Keyboard Maintainer: [Synth and Keys](https://github.com/Synth-and-Keys)
 * Hardware Supported: The Debit Card PCB, Seeed XIAO MCU

From a30964b3c5680a92154a9fe682a1d85e3ccd700e Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 13 Nov 2022 15:40:51 -0700
Subject: [PATCH 863/959] Add missing `manufacturer` fields (#19065)

---
 keyboards/cannonkeys/serenity/info.json                         | 1 +
 keyboards/handwired/dactyl_manuform/5x6_6/info.json             | 1 +
 .../handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json
index cd154a3003..281defab6e 100644
--- a/keyboards/cannonkeys/serenity/info.json
+++ b/keyboards/cannonkeys/serenity/info.json
@@ -1,4 +1,5 @@
 {
+    "manufacturer": "Cannon Keys",
     "keyboard_name": "Serenity",
     "usb": {
         "vid": "0xCA04",
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
index 2774cec118..dc2a78f4db 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
@@ -1,4 +1,5 @@
 {
+    "manufacturer": "QMK",
     "keyboard_name": "Dactyl Manuform 5x6+6",
     "url": "https://github.com/fgoodwin/dactyl-manuform-5x6_6/tree/main/5x6_6",
     "maintainer": "fgoodwin",
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
index 74fe44702e..013c986738 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,       KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,    KC_F12,
         KC_TRNS,   KC_TRNS,   KC_PSCR,   KC_DOWN,  KC_UP,         KC_HOME,   KC_END,      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_TRNS,     KC_TRNS,     KC_BSLS,    KC_TRNS,
-                   RESET,     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,
                                          MO(1),    LCTL(KC_C),    KC_TRNS,   MO(1),
                                          KC_TRNS,  LCTL(KC_V),    KC_TRNS,   KC_TRNS
     )

From ee7426e7b19c25ddfc53d0b50db68a457d8f992b Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 13 Nov 2022 15:48:31 -0700
Subject: [PATCH 864/959] Fixup day_off (#19067)

---
 keyboards/nixkeyboards/day_off/day_off.c         |  0
 keyboards/nixkeyboards/day_off/day_off.h         |  0
 keyboards/nixkeyboards/day_off/info.json         |  0
 .../day_off/keymaps/default/keymap.c             | 16 ++++++++--------
 keyboards/nixkeyboards/day_off/readme.md         |  2 +-
 keyboards/nixkeyboards/day_off/rules.mk          |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 keyboards/nixkeyboards/day_off/day_off.c
 mode change 100755 => 100644 keyboards/nixkeyboards/day_off/day_off.h
 mode change 100755 => 100644 keyboards/nixkeyboards/day_off/info.json
 mode change 100755 => 100644 keyboards/nixkeyboards/day_off/rules.mk

diff --git a/keyboards/nixkeyboards/day_off/day_off.c b/keyboards/nixkeyboards/day_off/day_off.c
old mode 100755
new mode 100644
diff --git a/keyboards/nixkeyboards/day_off/day_off.h b/keyboards/nixkeyboards/day_off/day_off.h
old mode 100755
new mode 100644
diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json
old mode 100755
new mode 100644
diff --git a/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
index 61e879eb4f..4718f49798 100644
--- a/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
+++ b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
@@ -17,35 +17,35 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-                  KC_GESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+                  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_BSPC,
       KC_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
       KC_MNXT,    KC_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_BSLS,
-      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
     ),
     
     [1] = LAYOUT_all(
-                  RESET,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+                  QK_BOOT,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
                   KC_TAB,    KC_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_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
       KC_MNXT,    KC_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_BSLS,
-      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
     ),
     
     [2] = LAYOUT_all(
-                     KC_GESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+                     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_BSPC,
          KC_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
          KC_MNXT,    KC_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_BSLS,
-         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
     ),
     
     [3] = LAYOUT_all(
-                     KC_GESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+                     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_BSPC,
          KC_MPLY,    KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
          KC_MNXT,    KC_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_BSLS,
-         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  RESET
+         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
     ),
 };
 
diff --git a/keyboards/nixkeyboards/day_off/readme.md b/keyboards/nixkeyboards/day_off/readme.md
index 78871fe49d..74d48ca60e 100644
--- a/keyboards/nixkeyboards/day_off/readme.md
+++ b/keyboards/nixkeyboards/day_off/readme.md
@@ -20,4 +20,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,1) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/nixkeyboards/day_off/rules.mk b/keyboards/nixkeyboards/day_off/rules.mk
old mode 100755
new mode 100644

From 7901ba431a4a6248aeb4b16c570e96ce44e56a42 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 13 Nov 2022 15:49:06 -0700
Subject: [PATCH 865/959] Fixup keychron/q6 (#19066)

---
 keyboards/keychron/q6/ansi/ansi.c                 | 2 +-
 keyboards/keychron/q6/ansi/config.h               | 2 +-
 keyboards/keychron/q6/ansi_encoder/ansi_encoder.c | 2 +-
 keyboards/keychron/q6/ansi_encoder/config.h       | 2 +-
 keyboards/keychron/q6/iso/config.h                | 2 +-
 keyboards/keychron/q6/iso/iso.c                   | 2 +-
 keyboards/keychron/q6/iso_encoder/config.h        | 2 +-
 keyboards/keychron/q6/iso_encoder/iso_encoder.c   | 2 +-
 keyboards/keychron/q6/q6.c                        | 6 +++++-
 9 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c
index dc27c9a82d..982996d347 100644
--- a/keyboards/keychron/q6/ansi/ansi.c
+++ b/keyboards/keychron/q6/ansi/ansi.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q6/ansi/config.h b/keyboards/keychron/q6/ansi/config.h
index 148f8d4c45..703da35636 100644
--- a/keyboards/keychron/q6/ansi/config.h
+++ b/keyboards/keychron/q6/ansi/config.h
@@ -27,7 +27,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 60
 #define DRIVER_2_LED_TOTAL 48
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 61
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
index bb1044bd09..6cf593dd25 100644
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q6/ansi_encoder/config.h b/keyboards/keychron/q6/ansi_encoder/config.h
index 31d801430f..1949be399b 100644
--- a/keyboards/keychron/q6/ansi_encoder/config.h
+++ b/keyboards/keychron/q6/ansi_encoder/config.h
@@ -28,7 +28,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 60
 #define DRIVER_2_LED_TOTAL 48
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { C14 }
diff --git a/keyboards/keychron/q6/iso/config.h b/keyboards/keychron/q6/iso/config.h
index 3c1164be6d..46c9e1c33a 100644
--- a/keyboards/keychron/q6/iso/config.h
+++ b/keyboards/keychron/q6/iso/config.h
@@ -27,7 +27,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 60
 #define DRIVER_2_LED_TOTAL 49
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 60
diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c
index 497efc2d11..d8c4add867 100644
--- a/keyboards/keychron/q6/iso/iso.c
+++ b/keyboards/keychron/q6/iso/iso.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q6/iso_encoder/config.h b/keyboards/keychron/q6/iso_encoder/config.h
index 442fd35efd..63fe3a83c1 100644
--- a/keyboards/keychron/q6/iso_encoder/config.h
+++ b/keyboards/keychron/q6/iso_encoder/config.h
@@ -28,7 +28,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 60
 #define DRIVER_2_LED_TOTAL 49
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { C14 }
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
index 3ad47b7b0f..c6a21a6223 100644
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c
index 85018004e0..d2f9d2aa4e 100644
--- a/keyboards/keychron/q6/q6.c
+++ b/keyboards/keychron/q6/q6.c
@@ -67,7 +67,10 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
     // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
 #    if defined(CAPS_LOCK_LED_INDEX)
     if (host_keyboard_led_state().caps_lock) {
@@ -87,6 +90,7 @@ __attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min,
         }
     }
 #    endif // NUM_LOCK_LED_INDEX
+    return true;
 }
 
 #endif // RGB_MATRIX_ENABLE...

From a42ab90220ce01c2aebdebb09aa458f383d26892 Mon Sep 17 00:00:00 2001
From: David Hoelscher <infinityis@users.noreply.github.com>
Date: Sun, 13 Nov 2022 17:59:01 -0600
Subject: [PATCH 866/959] Add Bonsai C4 as a platform board file (#18901)

* Set up Bonsai C4 as a platform board file

* corrections and improvements based on testing and feedback

* Added VBUS sensing as default capability for improved split support using Bonsai C4

* Update clock divisor for SPI flash

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 data/mappings/defaults.hjson                  |   2 +-
 docs/feature_converters.md                    |   2 -
 .../bonsai_c4_template/bonsai_c4_template.c   |  23 --
 .../custommk/bonsai_c4_template/config.h      |  79 ------
 .../custommk/bonsai_c4_template/halconf.h     |  35 ---
 .../custommk/bonsai_c4_template/mcuconf.h     |  35 ---
 .../custommk/bonsai_c4_template/readme.md     |  10 -
 .../chibios/boards/BONSAI_C4/board/board.mk   |   9 +
 .../chibios/boards/BONSAI_C4/configs/board.h  |  20 ++
 .../chibios/boards/BONSAI_C4/configs/config.h |  92 +++++++
 .../boards/BONSAI_C4/configs/halconf.h        |  49 ++++
 .../boards/BONSAI_C4/configs/mcuconf.h        | 249 ++++++++++++++++++
 .../promicro_to_bonsai_c4/converter.mk        |   4 +-
 .../promicro_to_bonsai_c4/post_converter.mk   |   5 +
 14 files changed, 427 insertions(+), 187 deletions(-)
 delete mode 100644 keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c
 delete mode 100644 keyboards/custommk/bonsai_c4_template/config.h
 delete mode 100644 keyboards/custommk/bonsai_c4_template/halconf.h
 delete mode 100644 keyboards/custommk/bonsai_c4_template/mcuconf.h
 delete mode 100644 keyboards/custommk/bonsai_c4_template/readme.md
 create mode 100644 platforms/chibios/boards/BONSAI_C4/board/board.mk
 create mode 100644 platforms/chibios/boards/BONSAI_C4/configs/board.h
 create mode 100644 platforms/chibios/boards/BONSAI_C4/configs/config.h
 create mode 100644 platforms/chibios/boards/BONSAI_C4/configs/halconf.h
 create mode 100644 platforms/chibios/boards/BONSAI_C4/configs/mcuconf.h
 create mode 100644 platforms/chibios/converters/promicro_to_bonsai_c4/post_converter.mk

diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson
index ea9f6972c5..10657e5aa0 100644
--- a/data/mappings/defaults.hjson
+++ b/data/mappings/defaults.hjson
@@ -70,7 +70,7 @@
         "bonsai_c4": {
             "processor": "STM32F411",
             "bootloader": "stm32-dfu",
-            "board": "GENERIC_STM32_F411XE",
+            "board": "BONSAI_C4",
             "pin_compatible": "promicro"
         }
     }
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 3dabae915d..0fa677f873 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -157,8 +157,6 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro
 #define B0 PAL_LINE(GPIOA, 9)
 ```
 
-No peripherals are enabled by default at this time, but example code to enable SPI, I2C, PWM, and Serial communications can be found [here](/keyboards/custommk/bonsai_c4_template).
-
 ## Elite-C
 
 If a board currently supported in QMK uses an [Elite-C](https://keeb.io/products/elite-c-low-profile-version-usb-c-pro-micro-replacement-atmega32u4), the supported alternative controllers are:
diff --git a/keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c b/keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c
deleted file mode 100644
index 2129a712cf..0000000000
--- a/keyboards/custommk/bonsai_c4_template/bonsai_c4_template.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Set up SPI slave select pin
-void keyboard_post_init_kb(void) {
-    #ifdef EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN
-        setPinOutput(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN);
-        writePinHigh(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN);
-    #endif
-}
diff --git a/keyboards/custommk/bonsai_c4_template/config.h b/keyboards/custommk/bonsai_c4_template/config.h
deleted file mode 100644
index 192e9b0755..0000000000
--- a/keyboards/custommk/bonsai_c4_template/config.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2022 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-// This file includes example #defines to enable commonly-used functionality 
-// (SPI, PWM backlight, etc.) on specific pins. Capabilities you want to include
-// should be added to the config.h for your keyboard. Not all capabilities are
-// shown; for example:
-// I2C is not shown because the QMK defaults are sufficient for SCL on B6 and SDA on B7
-// Serial communications (for split keyboards) is not shown because QMK defaults work
-// for either pins A15 or B6
-
-// If you need to change pins for PWM, SPI, I2C, or Serial communications, be aware that
-// doing this may require changing the driver, channel, PAL (Pin ALternate function) mode, 
-// DMA stream, and/or DMA channel.
-
-
-// Bonsai C4 wires up pin A9 for Vbus sensing pin by default. For spilt keyboards, this
-// can be used to determine which half of the keyboard is plugged into USB.
-// For boards using Bonsai C4 merely as a reference design, the VBUS sense pin A9
-// can be used for purposes other than Vbus sensing (e.g. the switch
-// matrix).
-//
-// If A9 is needed for Vbus sensing, uncomment the line
-// below. Most keyboards using Bonsai C4 can leave the line below
-// commented out.
-//
-// #undef BOARD_OTG_NOVBUSSENS 
-
-// FRAM configuration
-#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A0
-#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 8 // 96MHz / 8 = 12MHz; max supported by MB85R64 is 20MHz
-#define EXTERNAL_EEPROM_PAGE_SIZE 64 // does not matter for FRAM, just sets the RAM buffer size in STM32F chip
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
-
-// External flash configuration
-#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B12
-#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 1  // 96MHz; max supported by W25Q128JV is 133MHz
-#define EXTERNAL_FLASH_BYTE_COUNT (16 * 1024 * 1024)  //128Mbit or 16MByte
-#define EXTERNAL_FLASH_PAGE_SIZE 256
-#define EXTERNAL_FLASH_SPI_TIMEOUT 200000 //datasheet max is 200 seconds for flash chip erase
-
-// SPI Configuration (needed for FRAM and FLASH)
-#define SPI_DRIVER SPID1
-#define SPI_SCK_PIN B3
-#define SPI_MOSI_PIN B5
-#define SPI_MISO_PIN B4
-
-// Example code to set up PWM backlight on pin A6
-// If a different pin is used, a different PWM driver/channel settings may be necessary
-#define BACKLIGHT_PIN A6
-#define BACKLIGHT_PWM_DRIVER PWMD3
-#define BACKLIGHT_PWM_CHANNEL 1
-
-// Example code for WS2812 underglow
-// Only pin A10 is wired to send 5V signals to the WS2812
-// This also usually requires adding special wiring during board assembly
-#define RGB_DI_PIN A10
-#define WS2812_PWM_DRIVER PWMD1
-#define WS2812_PWM_CHANNEL 3
-#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
diff --git a/keyboards/custommk/bonsai_c4_template/halconf.h b/keyboards/custommk/bonsai_c4_template/halconf.h
deleted file mode 100644
index a90ea163f3..0000000000
--- a/keyboards/custommk/bonsai_c4_template/halconf.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// If you are using I2C (e.g. for OLED), include this line
-#define HAL_USE_I2C TRUE
-
-// If you are using PWM (e.g. for WS2812, backlight, etc.) include this line
-#define HAL_USE_PWM TRUE
-
-// If you are using serial comms for split communications, include these lines
-#define HAL_USE_SERIAL TRUE
-#define SERIAL_BUFFERS_SIZE 256
-
-// If you are using SPI (e.g. for FRAM, flash, etc.) include these lines
-#define HAL_USE_SPI TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
-#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/custommk/bonsai_c4_template/mcuconf.h b/keyboards/custommk/bonsai_c4_template/mcuconf.h
deleted file mode 100644
index 4f926bd7de..0000000000
--- a/keyboards/custommk/bonsai_c4_template/mcuconf.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-// Used for underglow in example code
-#undef STM32_PWM_USE_TIM1 //timer 1 channel 3
-#define STM32_PWM_USE_TIM1 TRUE
-
-// Used for backlight in examples
-#undef STM32_PWM_USE_TIM3 //timer 3 channel 1
-#define STM32_PWM_USE_TIM3 TRUE
-
-// Used for FRAM and flash in example code
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
-// Used for Split comms in example code
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 TRUE
\ No newline at end of file
diff --git a/keyboards/custommk/bonsai_c4_template/readme.md b/keyboards/custommk/bonsai_c4_template/readme.md
deleted file mode 100644
index 0c0fd8ed0c..0000000000
--- a/keyboards/custommk/bonsai_c4_template/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Bonsai C4 template code
-
-Currently, the converter for Pro Micro to Bonsai C4 only does pin mapping. This is sufficient for simple keyboards and also a good start for
-incorporating into more advanced keyboards with other features (like RGB, OLED, backlighting, split communiciations, etc.). However, to make
-use of the more advanced features--including using the FRAM and flash memory chip included on Bonsai C4--various peripheral hardware must
-be configured. Pro Micro does not requrie such configuration because such functionality is more limited and hard-wired to specific pins.
-
-The code here provides examples that can be used to operate SPI, I2C, PWM, and Serial comms. In addition to using the converter, you will
-need to take code (as-needed) and add it to existing config.h files, or add in new halconf.h and mcuconf.h files. If you are changing which 
-pins are used for certain functions, you should verify the new pins support that functionality, and check all assingments to ensure the correct settings are used (including as-applicable driver, channel, PAL (Pin ALternate function) mode, DMA stream, and/or DMA channel).
diff --git a/platforms/chibios/boards/BONSAI_C4/board/board.mk b/platforms/chibios/boards/BONSAI_C4/board/board.mk
new file mode 100644
index 0000000000..bb00b1a2b0
--- /dev/null
+++ b/platforms/chibios/boards/BONSAI_C4/board/board.mk
@@ -0,0 +1,9 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F411RE/board.c
+
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F411RE
+
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/boards/BONSAI_C4/configs/board.h b/platforms/chibios/boards/BONSAI_C4/configs/board.h
new file mode 100644
index 0000000000..f1ee51c91f
--- /dev/null
+++ b/platforms/chibios/boards/BONSAI_C4/configs/board.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSE_BYPASS
\ No newline at end of file
diff --git a/platforms/chibios/boards/BONSAI_C4/configs/config.h b/platforms/chibios/boards/BONSAI_C4/configs/config.h
new file mode 100644
index 0000000000..e412f73d3d
--- /dev/null
+++ b/platforms/chibios/boards/BONSAI_C4/configs/config.h
@@ -0,0 +1,92 @@
+/* Copyright 2022 David Hoelscher, customMK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 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
+
+// Bonsai C4 includes Vbus sensing; derived designs that use PA9 for other purposes
+// may disable Vbus sensing with #define BOARD_OTG_NOVBUSSENS 1
+
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
+
+// FRAM configuration
+#ifndef EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN
+#    define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN PAL_LINE(GPIOA, 0)
+#    define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 8 // 96MHz / 8 = 12MHz; max supported by MB85R64 is 20MHz
+#    define EXTERNAL_EEPROM_BYTE_COUNT 8192
+#    define EXTERNAL_EEPROM_PAGE_SIZE 64 // does not matter for FRAM, just sets the RAM buffer size in STM32F chip
+#    define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
+#endif
+
+// External flash configuration
+#ifndef EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN
+#    define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN PAL_LINE(GPIOB, 12)
+#    define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 2  // 48MHz; max supported by W25Q128JV is 133MHz
+#    define EXTERNAL_FLASH_BYTE_COUNT (16 * 1024 * 1024)  //128Mbit or 16MByte
+#    define EXTERNAL_FLASH_PAGE_SIZE 256
+#    define EXTERNAL_FLASH_SPI_TIMEOUT 200000 //datasheet max is 200 seconds for flash chip erase
+#endif
+
+// SPI Configuration (needed for FRAM and FLASH)
+#ifndef SPI_DRIVER
+#    define SPI_DRIVER SPID1
+#endif
+#ifndef SPI_SCK_PIN
+#    define SPI_SCK_PIN PAL_LINE(GPIOB, 3)
+#endif
+#ifndef SPI_MOSI_PIN
+#    define SPI_MOSI_PIN PAL_LINE(GPIOB, 5)
+#endif
+#ifndef SPI_MISO_PIN
+#    define SPI_MISO_PIN PAL_LINE(GPIOB, 4)
+#endif
+
+
+// I2C Configuration
+#ifdef CONVERT_TO_BONSAI_C4
+#    ifndef I2C1_SCL_PIN
+#        define I2C1_SCL_PIN PAL_LINE(GPIOB, 6)
+#    endif
+#    ifndef I2C1_SDA_PIN
+#        define I2C1_SDA_PIN PAL_LINE(GPIOB, 9)
+#    endif
+#endif
+
+// WS2812-style LED control on pin A10
+#ifdef WS2812_DRIVER_PWM
+#    ifndef RGB_DI_PIN
+#        define RGB_DI_PIN PAL_LINE(GPIOA, 10)
+#    endif
+#    ifndef WS2812_PWM_DRIVER
+#        define WS2812_PWM_DRIVER PWMD1
+#    endif
+#    ifndef WS2812_PWM_CHANNEL
+#        define WS2812_PWM_CHANNEL 3
+#    endif
+#    ifndef WS2812_PWM_PAL_MODE
+#        define WS2812_PWM_PAL_MODE 1
+#    endif
+#    ifndef WS2812_DMA_STREAM
+#        define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#    endif
+#    ifndef WS2812_DMA_CHANNEL
+#        define WS2812_DMA_CHANNEL 6
+#    endif
+#endif
+
+#ifndef USB_VBUS_PIN
+#    define USB_VBUS_PIN PAL_LINE(GPIOA, 9)
+#endif
\ No newline at end of file
diff --git a/platforms/chibios/boards/BONSAI_C4/configs/halconf.h b/platforms/chibios/boards/BONSAI_C4/configs/halconf.h
new file mode 100644
index 0000000000..7887e7c9ba
--- /dev/null
+++ b/platforms/chibios/boards/BONSAI_C4/configs/halconf.h
@@ -0,0 +1,49 @@
+/* Copyright 2022 David Hoelscher, customMK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 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
+
+#ifndef HAL_USE_SPI
+#    define HAL_USE_SPI TRUE
+#endif
+
+#ifndef HAL_USE_I2C
+#    define HAL_USE_I2C TRUE
+#endif
+
+#ifdef SPLIT_KEYBOARD
+#    ifndef HAL_USE_SERIAL
+#        define HAL_USE_SERIAL TRUE
+#    endif
+#    ifndef SERIAL_BUFFERS_SIZE
+#        define SERIAL_BUFFERS_SIZE 256
+#    endif
+#endif
+
+#ifdef WS2812_DRIVER_PWM
+#    ifndef HAL_USE_PWM
+#        define HAL_USE_PWM TRUE
+#    endif
+#endif
+
+#ifndef SPI_SELECT_MODE
+#    define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#endif
+
+#ifndef SPI_USE_WAIT
+#    define SPI_USE_WAIT TRUE
+#endif
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/platforms/chibios/boards/BONSAI_C4/configs/mcuconf.h b/platforms/chibios/boards/BONSAI_C4/configs/mcuconf.h
new file mode 100644
index 0000000000..2f9e627c7e
--- /dev/null
+++ b/platforms/chibios/boards/BONSAI_C4/configs/mcuconf.h
@@ -0,0 +1,249 @@
+/*
+    ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * STM32F4xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F4xx_MCUCONF
+#define STM32F411_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_CLOCK48_REQUIRED              TRUE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLM_VALUE                    4
+#define STM32_PLLN_VALUE                    96
+#define STM32_PLLP_VALUE                    2
+#define STM32_PLLQ_VALUE                    4
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV1
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+#define STM32_RTCPRE_VALUE                  8
+#define STM32_MCO1SEL                       STM32_MCO1SEL_HSI
+#define STM32_MCO1PRE                       STM32_MCO1PRE_DIV1
+#define STM32_MCO2SEL                       STM32_MCO2SEL_SYSCLK
+#define STM32_MCO2PRE                       STM32_MCO2PRE_DIV5
+#define STM32_I2SSRC                        STM32_I2SSRC_CKIN
+#define STM32_PLLI2SN_VALUE                 192
+#define STM32_PLLI2SR_VALUE                 5
+
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           15
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           6
+#define STM32_IRQ_EXTI20_PRIORITY           6
+#define STM32_IRQ_EXTI21_PRIORITY           15
+#define STM32_IRQ_EXTI22_PRIORITY           15
+
+#define STM32_IRQ_TIM1_BRK_TIM9_PRIORITY    7
+#define STM32_IRQ_TIM1_UP_TIM10_PRIORITY    7
+#define STM32_IRQ_TIM1_TRGCO_TIM11_PRIORITY 7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+#define STM32_IRQ_TIM2_PRIORITY             7
+#define STM32_IRQ_TIM3_PRIORITY             7
+#define STM32_IRQ_TIM4_PRIORITY             7
+#define STM32_IRQ_TIM5_PRIORITY             7
+
+#define STM32_IRQ_USART1_PRIORITY           12
+#define STM32_IRQ_USART2_PRIORITY           12
+#define STM32_IRQ_USART6_PRIORITY           12
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(2, 4)
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              6
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     6
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM9                  FALSE
+#define STM32_GPT_USE_TIM10                 FALSE
+#define STM32_GPT_USE_TIM11                 FALSE
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_USE_I2C3                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C3_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_I2C3_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * I2S driver system settings.
+ */
+#define STM32_I2S_USE_SPI2                  FALSE
+#define STM32_I2S_USE_SPI3                  FALSE
+#define STM32_I2S_SPI2_IRQ_PRIORITY         10
+#define STM32_I2S_SPI3_IRQ_PRIORITY         10
+#define STM32_I2S_SPI2_DMA_PRIORITY         1
+#define STM32_I2S_SPI3_DMA_PRIORITY         1
+#define STM32_I2S_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_I2S_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_I2S_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_I2S_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2S_DMA_ERROR_HOOK(i2sp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM9                  FALSE
+#define STM32_ICU_USE_TIM10                 FALSE
+#define STM32_ICU_USE_TIM11                 FALSE
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_TIM1                  TRUE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  TRUE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM9                  FALSE
+#define STM32_PWM_USE_TIM10                 FALSE
+#define STM32_PWM_USE_TIM11                 FALSE
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             TRUE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART6             FALSE
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  TRUE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 0)
+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 3)
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 0)
+#define STM32_SPI_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART6               FALSE
+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 5)
+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 5)
+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)
+#define STM32_UART_USART6_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 2)
+#define STM32_UART_USART6_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART6_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_OTG1                  TRUE
+#define STM32_USB_OTG1_IRQ_PRIORITY         14
+#define STM32_USB_OTG1_RX_FIFO_SIZE         512
+#define STM32_USB_HOST_WAKEUP_DURATION      2
+
+/*
+ * WDG driver system settings.
+ */
+#define STM32_WDG_USE_IWDG                  FALSE
+
+#endif /* MCUCONF_H */
\ No newline at end of file
diff --git a/platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk b/platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk
index 7410209b67..005b7a8160 100644
--- a/platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk
+++ b/platforms/chibios/converters/promicro_to_bonsai_c4/converter.mk
@@ -1,4 +1,4 @@
 # Proton C MCU settings for converting AVR projects
 MCU := STM32F411
-BOARD := GENERIC_STM32_F411XE
-BOOTLOADER := stm32-dfu
\ No newline at end of file
+BOARD := BONSAI_C4
+BOOTLOADER := stm32-dfu
diff --git a/platforms/chibios/converters/promicro_to_bonsai_c4/post_converter.mk b/platforms/chibios/converters/promicro_to_bonsai_c4/post_converter.mk
new file mode 100644
index 0000000000..5f49b17f8a
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_bonsai_c4/post_converter.mk
@@ -0,0 +1,5 @@
+BACKLIGHT_DRIVER ?= pwm
+WS2812_DRIVER ?= pwm
+SERIAL_DRIVER ?= usart
+FLASH_DRIVER ?= spi
+EEPROM_DRIVER ?= spi
\ No newline at end of file

From 0719d68b205ecffd8f93dee07b7dd07d8bc8c615 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 14 Nov 2022 01:49:58 +0000
Subject: [PATCH 867/959] Add default limit to OLED dirty processing (#19068)

---
 drivers/oled/oled_driver.h    | 4 ++++
 drivers/oled/ssd1306_sh1106.c | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
index e9b8c5b4e8..291049e36b 100644
--- a/drivers/oled/oled_driver.h
+++ b/drivers/oled/oled_driver.h
@@ -170,6 +170,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define OLED_UPDATE_INTERVAL 50
 #endif
 
+#if !defined(OLED_UPDATE_PROCESS_LIMIT)
+#    define OLED_UPDATE_PROCESS_LIMIT 1
+#endif
+
 typedef struct __attribute__((__packed__)) {
     uint8_t *current_element;
     uint16_t remaining_element_count;
diff --git a/drivers/oled/ssd1306_sh1106.c b/drivers/oled/ssd1306_sh1106.c
index 9fc8c2d2ad..342920572e 100644
--- a/drivers/oled/ssd1306_sh1106.c
+++ b/drivers/oled/ssd1306_sh1106.c
@@ -300,8 +300,9 @@ void oled_render(void) {
     // Turn on display if it is off
     oled_on();
 
-    uint8_t update_start = 0;
-    while (oled_dirty) { // render all dirty blocks
+    uint8_t update_start  = 0;
+    uint8_t num_processed = 0;
+    while (oled_dirty && num_processed++ < OLED_UPDATE_PROCESS_LIMIT) { // render all dirty blocks (up to the configured limit)
         // Find next dirty block
         while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) {
             ++update_start;

From 05540eb6681dab073f61a7d81e4e36e426e8a1aa Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 14 Nov 2022 08:44:07 -0700
Subject: [PATCH 868/959]  Fixup handwired/alcor_dactyl (#19072)

---
 keyboards/handwired/alcor_dactyl/config.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h
index f8ffe4d6a3..58a4ec558e 100644
--- a/keyboards/handwired/alcor_dactyl/config.h
+++ b/keyboards/handwired/alcor_dactyl/config.h
@@ -27,7 +27,6 @@
 #define SERIAL_USART_TX_PIN GP10
 #define SERIAL_USART_RX_PIN GP9
 #define RGB_DI_PIN GP16
-#define DRIVER_LED_TOTAL 2
+#define RGB_MATRIX_LED_COUNT 2
 #define RGB_MATRIX_SPLIT { 1, 1 }
-#define RGBLED_NUM 1
 #define EE_HANDS

From 1a3f2130d5feeeccada90ebb1d96cde5232459e0 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 14 Nov 2022 22:44:09 -0800
Subject: [PATCH 869/959] Revert "Add pointing device support to data driven
 config (#18215)" (#19063)

---
 data/mappings/info_config.hjson         | 18 -------
 data/mappings/info_rules.hjson          |  2 -
 data/schemas/keyboard.jsonschema        | 62 -------------------------
 lib/python/qmk/cli/generate/config_h.py | 13 ------
 4 files changed, 95 deletions(-)

diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index a80d5cff6f..a013e98b34 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -11,10 +11,6 @@
     // invalid: Default `false`. Set to `true` to generate errors when a value exists
     // replace_with: use with a key marked deprecated or invalid to designate a replacement
     "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
-    "AUTO_MOUSE_DEFAULT_LAYER": {"info_key": "pointing_device.auto_mouse.default_layer"},
-    "AUTO_MOUSE_TIME": {"info_key": "pointing_device.auto_mouse.time"},
-    "AUTO_MOUSE_DELAY": {"info_key": "pointing_device.auto_mouse.delay"},
-    "AUTO_MOUSE_DEBOUNCE": {"info_key": "pointing_device.auto_mouse.debounce"},
     "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
     "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
     "BACKLIGHT_LEVELS": {"info_key": "backlight.levels", "value_type": "int"},
@@ -91,19 +87,6 @@
     "RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
     "RGB_MATRIX_SPD_STEP": {"info_key": "rgb_matrix.speed_steps", "value_type": "int"},
     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
-    "POINTING_DEVICE_AUTO_MOUSE_ENABLE": {"info_key": "pointing_device.auto_mouse.enabled"},
-    "POINTING_DEVICE_CS_PIN": {"info_key": "pointing_device.pins.cs"},
-    "POINTING_DEVICE_INVERT_X": {"info_key": "pointing_device.invert_x", "value_type": "bool"},
-    "POINTING_DEVICE_INVERT_X_RIGHT": {"info_key": "split.pointing_device.right.invert_x", "value_type": "bool"},
-    "POINTING_DEVICE_INVERT_Y": {"info_key": "pointing_device.invert_y", "value_type": "bool"},
-    "POINTING_DEVICE_INVERT_Y_RIGHT": {"info_key": "split.pointing_device.right.invert_y", "value_type": "bool"},
-    "POINTING_DEVICE_MOTION_PIN": {"info_key": "pointing_device.pins.motion"},
-    "POINTING_DEVICE_SDIO_PIN": {"info_key": "pointing_device.pins.sdio"},
-    "POINTING_DEVICE_SCLK_PIN": {"info_key": "pointing_device.pins.sclk"},
-    "POINTING_DEVICE_TASK_THROTTLE_MS": {"info_key": "pointing_device.throttle", "value_type": "int"},
-    "POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE": {"info_key": "pointing_device.gestures.cursor_glide", "value_type": "bool"},
-    "POINTING_DEVICE_GESTURES_SCROLL_ENABLE": {"info_key": "pointing_device.gestures.scroll", "value_type": "bool"},
-
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"},
@@ -116,7 +99,6 @@
     "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
     "SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "bool"},
     "SPLIT_MODS_ENABLE": {"info_key": "split.transport.sync_modifiers", "value_type": "bool"},
-    "SPLIT_POINTING_ENABLE": {"info_key": "split.transport.sync_pointing", "value_type": "bool"},
     "SPLIT_TRANSPORT_MIRROR": {"info_key": "split.transport.sync_matrix_state", "value_type": "bool"},
     "SPLIT_USB_DETECT": {"info_key": "split.usb_detect.enabled", "value_type": "bool"},
     "SPLIT_USB_TIMEOUT": {"info_key": "split.usb_detect.timeout", "value_type": "int"},
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index 2cc465f30d..2f8656c4bf 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -36,8 +36,6 @@
     "PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
     "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
     "PS2_DRIVER": {"info_key": "ps2.driver"},
-    "POINTING_DEVICE_ENABLE": {"info_key": "pointing_device.enabled", "value_type": "bool"},
-    "POINTING_DEVICE_DRIVER": {"info_key": "pointing_device.driver"},
 
     // Items we want flagged in lint
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 353d9469d1..daf54141a8 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -363,48 +363,6 @@
                 }
             }
         },
-        "pointing_device": {
-            "type": "object",
-            "properties": {
-                "enabled": {"type": "boolean"},
-                "driver": {"type": "string"},
-                "auto_mouse":  {
-                    "type": "object",
-                    "properties": {
-                        "enabled": {"type": "boolean"},
-                        "default_layer": {"type":  "qmk.definitions.v1#/unsigned_int_8"},
-                        "time": {"type":  "qmk.definitions.v1#/unsigned_int"},
-                        "delay": {"type":  "qmk.definitions.v1#/unsigned_int"},
-                        "debounce": {"type":  "qmk.definitions.v1#/unsigned_int"}
-                    }
-                }
-                "pins": {
-                    "type": "object",
-                    "additionalProperties": false,
-                    "properties": {
-                        "motion": {"$ref": "qmk.definitions.v1#/mcu_pin"},
-                        "cs": {"$ref": "qmk.definitions.v1#/mcu_pin"},
-                        "sdio": {"$ref": "qmk.definitions.v1#/mcu_pin"},
-                        "sclk": {"$ref": "qmk.definitions.v1#/mcu_pin"}
-                    }
-                },
-                "throttle": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
-                "invert_x": {"type": "boolean"},
-                "invert_y": {"type": "boolean"},
-                "gestures": {
-                    "type": "object",
-                    "properties": {
-                        "cursor_glide": {"type": "boolean"},
-                        "scroll": {"type": "boolean"}
-                    }
-                },
-                "rotation": {
-                    "type": "integer",
-                    "minimum": 0,
-                    "enum": [0, 90, 180, 270]
-                }
-            }
-        },
         "rgb_matrix": {
             "type": "object",
             "properties": {
@@ -586,25 +544,6 @@
                     "type": "string",
                     "enum": ["eeprom", "left", "matrix_grid", "pin", "right"]
                 },
-                "pointing_device": {
-                    "right": {
-                        "type": "object",
-                        "additionalProperties": false,
-                        "properties": {
-                            "side": {
-                                "type": "string",
-                                "enum": ["left", "right", "combined"]
-                            },
-                            "invert_x": {"type": "boolean"},
-                            "invert_y": {"type": "boolean"},
-                            "rotation": {
-                                "type": "integer",
-                                "minimum": 0,
-                                "enum": [0, 90, 180, 270]
-                            }
-                        }
-                    }
-                },
                 "soft_serial_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "soft_serial_speed": {
                     "type": "integer",
@@ -621,7 +560,6 @@
                         },
                         "sync_matrix_state": {"type": "boolean"},
                         "sync_modifiers": {"type": "boolean"},
-                        "sync_pointing": {"type": "boolean"},
                         "watchdog": {"type": "boolean"},
                         "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
                     }
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 51051ef610..31b8d70635 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -126,13 +126,6 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
         config_h_lines.append(generate_define(f'ENCODER_RESOLUTIONS{postfix}', f'{{ {", ".join(map(str,resolutions))} }}'))
 
 
-def generate_pointing_device_config(pointing_device_json, config_h_lines, postfix=''):
-
-    rotation = pointing_device_json.get('rotation', 0)
-
-    generate_define(f'POINTING_DEVICE_ROTATION_{rotation}{postfix}')
-
-
 def generate_split_config(kb_info_json, config_h_lines):
     """Generate the config.h lines for split boards."""
     if 'primary' in kb_info_json['split']:
@@ -163,9 +156,6 @@ def generate_split_config(kb_info_json, config_h_lines):
     if 'right' in kb_info_json['split'].get('encoder', {}):
         generate_encoder_config(kb_info_json['split']['encoder']['right'], config_h_lines, '_RIGHT')
 
-    if 'right' in kb_info_json['split'].get('pointing_device', {}):
-        generate_pointing_device_config(kb_info_json['split']['pointing_device']['right'], config_h_lines, '_RIGHT')
-
 
 def generate_led_animations_config(led_feature_json, config_h_lines, prefix):
     for animation in led_feature_json.get('animations', {}):
@@ -217,8 +207,5 @@ def generate_config_h(cli):
     if 'rgblight' in kb_info_json:
         generate_led_animations_config(kb_info_json['rgblight'], config_h_lines, 'RGBLIGHT_EFFECT_')
 
-    if 'pointing_device' in kb_info_json:
-        generate_pointing_device_config(kb_info_json['pointing_device'], config_h_lines)
-
     # Show the results
     dump_lines(cli.args.output, config_h_lines, cli.args.quiet)

From 30b2dbe369b3a61d1d6681b0a689dbcdd41fc221 Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Tue, 15 Nov 2022 17:51:44 +0900
Subject: [PATCH 870/959] Bastard Keyboards: upstream recent changes (#18903)

* bastardkb: cleanup blackpill configuration

Fixes #17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes #15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes #20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
---
 .../charybdis/3x5/blackpill/config.h          |   2 +-
 .../charybdis/3x5/blackpill/halconf.h         |   4 +-
 .../charybdis/3x5/blackpill/mcuconf.h         |  16 --
 .../charybdis/3x5/blackpill/rules.mk          |   4 +-
 .../keymaps/bstiq/{README.md => readme.md}    |   0
 .../charybdis/3x5/keymaps/default/keymap.c    |   1 +
 .../charybdis/3x5/v1/elitec/config.h          |   2 +-
 .../charybdis/3x5/v2/elitec/config.h          |   2 +-
 .../charybdis/3x5/v2/splinky/config.h         |  70 +++++-
 .../charybdis/3x5/v2/splinky/readme.md        |   6 +
 .../3x5/v2/splinky/v2/config.h}               |  22 +-
 .../charybdis/3x5/v2/splinky/v2/rules.mk      |   2 +
 .../charybdis/3x5/v2/splinky/v3/config.h      |  27 +++
 .../charybdis/3x5/v2/splinky/v3/rules.mk      |   2 +
 .../charybdis/3x5/v2/stemcell/config.h        |  63 +++++
 .../charybdis/3x5/v2/stemcell/halconf.h       |  24 ++
 .../charybdis/3x5/v2/stemcell/info.json       |   6 +
 .../charybdis/3x5/v2/stemcell/mcuconf.h       |  32 +++
 .../charybdis/3x5/v2/stemcell/rules.mk        |  38 +++
 .../charybdis/3x6/blackpill/config.h          |   2 +-
 .../charybdis/3x6/blackpill/halconf.h         |   3 +-
 .../charybdis/3x6/blackpill/mcuconf.h         |   2 +
 .../charybdis/3x6/v1/elitec/config.h          |   2 +-
 .../charybdis/3x6/v2/elitec/config.h          |   2 +-
 .../charybdis/3x6/v2/splinky/config.h         |   5 -
 .../charybdis/3x6/v2/splinky/readme.md        |   6 +
 .../charybdis/3x6/v2/splinky/v2/config.h      |  27 +++
 .../charybdis/3x6/v2/splinky/v2/rules.mk      |   2 +
 .../charybdis/3x6/v2/splinky/v3/config.h      |  27 +++
 .../charybdis/3x6/v2/splinky/v3/rules.mk      |   2 +
 .../charybdis/3x6/v2/stemcell/config.h        |  63 +++++
 .../charybdis/3x6/v2/stemcell/halconf.h       |  24 ++
 .../charybdis/3x6/v2/stemcell/info.json       |   6 +
 .../charybdis/3x6/v2/stemcell/mcuconf.h       |  32 +++
 .../charybdis/3x6/v2/stemcell/rules.mk        |  38 +++
 .../charybdis/4x6/blackpill/config.h          |   2 +-
 .../charybdis/4x6/blackpill/halconf.h         |   4 +-
 .../charybdis/4x6/blackpill/mcuconf.h         |  16 --
 .../charybdis/4x6/blackpill/rules.mk          |   2 -
 .../charybdis/4x6/v1/elitec/config.h          |   2 +-
 .../charybdis/4x6/v2/elitec/config.h          |   2 +-
 .../charybdis/4x6/v2/splinky/config.h         |   5 -
 .../charybdis/4x6/v2/splinky/readme.md        |   6 +
 .../charybdis/4x6/v2/splinky/v2/config.h      |  27 +++
 .../charybdis/4x6/v2/splinky/v2/rules.mk      |   2 +
 .../charybdis/4x6/v2/splinky/v3/config.h      |  27 +++
 .../charybdis/4x6/v2/splinky/v3/rules.mk      |   2 +
 .../charybdis/4x6/v2/stemcell/config.h        |  63 +++++
 .../charybdis/4x6/v2/stemcell/halconf.h       |  24 ++
 .../charybdis/4x6/v2/stemcell/info.json       |   6 +
 .../charybdis/4x6/v2/stemcell/mcuconf.h       |  32 +++
 .../charybdis/4x6/v2/stemcell/rules.mk        |  37 +++
 keyboards/bastardkb/charybdis/readme.md       |  19 +-
 keyboards/bastardkb/dilemma/3x5_2/3x5_2.h     |  37 +++
 .../dilemma/3x5_2/assembled/config.h          |  46 ++++
 .../dilemma/3x5_2/assembled/halconf.h         |  22 ++
 .../dilemma/3x5_2/assembled/info.json         |   4 +
 .../dilemma/3x5_2/assembled/mcuconf.h         |  23 ++
 .../dilemma/3x5_2/assembled/rules.mk          |  34 +++
 keyboards/bastardkb/dilemma/3x5_2/info.json   |  46 ++++
 .../{ => 3x5_2}/keymaps/bstiq/config.h        |   0
 .../{ => 3x5_2}/keymaps/bstiq/keymap.c        |   0
 .../keymaps/bstiq/readme.md}                  |   0
 .../{ => 3x5_2}/keymaps/default/keymap.c      |   0
 .../{ => 3x5_2}/keymaps/drashna/config.h      |   0
 .../{ => 3x5_2}/keymaps/drashna/keymap.c      |   0
 .../{ => 3x5_2}/keymaps/drashna/rules.mk      |   0
 .../dilemma/3x5_2/keymaps/via/config.h        |  91 +++++++
 .../dilemma/3x5_2/keymaps/via/keymap.c        | 229 ++++++++++++++++++
 .../dilemma/3x5_2/keymaps/via/readme.md       |  67 +++++
 .../dilemma/3x5_2/keymaps/via/rules.mk        |   1 +
 .../dilemma/{ => 3x5_2}/splinky/config.h      |   2 +-
 .../dilemma/{ => 3x5_2}/splinky/halconf.h     |   0
 .../bastardkb/dilemma/3x5_2/splinky/info.json |   3 +
 .../dilemma/{ => 3x5_2}/splinky/mcuconf.h     |   0
 .../dilemma/{ => 3x5_2/splinky}/rules.mk      |  13 +-
 keyboards/bastardkb/dilemma/3x5_3/3x5_3.c     |  83 +++++++
 keyboards/bastardkb/dilemma/3x5_3/3x5_3.h     |  39 +++
 keyboards/bastardkb/dilemma/3x5_3/config.h    |  71 ++++++
 keyboards/bastardkb/dilemma/3x5_3/halconf.h   |  23 ++
 keyboards/bastardkb/dilemma/3x5_3/info.json   |  49 ++++
 .../dilemma/3x5_3/keymaps/bstiq/config.h      | 145 +++++++++++
 .../dilemma/3x5_3/keymaps/bstiq/keymap.c      | 223 +++++++++++++++++
 .../dilemma/3x5_3/keymaps/bstiq/readme.md     |   3 +
 .../dilemma/3x5_3/keymaps/default/keymap.c    |  84 +++++++
 keyboards/bastardkb/dilemma/3x5_3/mcuconf.h   |  26 ++
 keyboards/bastardkb/dilemma/3x5_3/readme.md   |   5 +
 keyboards/bastardkb/dilemma/3x5_3/rules.mk    |  36 +++
 keyboards/bastardkb/dilemma/config.h          |   1 +
 keyboards/bastardkb/dilemma/dilemma.c         |  18 +-
 keyboards/bastardkb/dilemma/dilemma.h         |  27 +--
 keyboards/bastardkb/dilemma/elitec/info.json  |   6 -
 keyboards/bastardkb/dilemma/elitec/rules.mk   |   5 -
 keyboards/bastardkb/dilemma/info.json         |  43 ----
 keyboards/bastardkb/dilemma/readme.md         |   8 +-
 keyboards/bastardkb/dilemma/splinky/info.json |   6 -
 keyboards/bastardkb/dilemma/splinky/rules.mk  |   9 -
 .../bastardkb/scylla/blackpill/halconf.h      |   4 +-
 .../bastardkb/scylla/blackpill/mcuconf.h      |  28 +--
 keyboards/bastardkb/scylla/readme.md          |  25 +-
 .../bastardkb/scylla/v2/splinky/config.h      |   2 -
 .../bastardkb/scylla/v2/splinky/readme.md     |   6 +
 .../bastardkb/scylla/v2/splinky/v2/config.h   |  22 ++
 .../bastardkb/scylla/v2/splinky/v2/rules.mk   |   2 +
 .../bastardkb/scylla/v2/splinky/v3/config.h   |  22 ++
 .../bastardkb/scylla/v2/splinky/v3/rules.mk   |   2 +
 .../bastardkb/scylla/v2/stemcell/config.h     |  48 ++++
 .../bastardkb/scylla/v2/stemcell/halconf.h    |  23 ++
 .../bastardkb/scylla/v2/stemcell/info.json    |   6 +
 .../bastardkb/scylla/v2/stemcell/mcuconf.h    |  29 +++
 .../bastardkb/scylla/v2/stemcell/rules.mk     |  32 +++
 .../bastardkb/skeletyl/blackpill/halconf.h    |   4 +-
 .../bastardkb/skeletyl/blackpill/mcuconf.h    |  28 +--
 keyboards/bastardkb/skeletyl/readme.md        |  20 +-
 .../bastardkb/skeletyl/v2/splinky/config.h    |   2 -
 .../bastardkb/skeletyl/v2/splinky/readme.md   |   6 +
 .../bastardkb/skeletyl/v2/splinky/v2/config.h |  22 ++
 .../bastardkb/skeletyl/v2/splinky/v2/rules.mk |   2 +
 .../bastardkb/skeletyl/v2/splinky/v3/config.h |  22 ++
 .../bastardkb/skeletyl/v2/splinky/v3/rules.mk |   2 +
 .../elitec => skeletyl/v2/stemcell}/config.h  |  25 +-
 .../bastardkb/skeletyl/v2/stemcell/halconf.h  |  23 ++
 .../bastardkb/skeletyl/v2/stemcell/info.json  |   6 +
 .../bastardkb/skeletyl/v2/stemcell/mcuconf.h  |  29 +++
 .../bastardkb/skeletyl/v2/stemcell/rules.mk   |  33 +++
 .../bastardkb/tbkmini/blackpill/halconf.h     |   4 +-
 .../bastardkb/tbkmini/blackpill/mcuconf.h     |  28 +--
 keyboards/bastardkb/tbkmini/readme.md         |  20 +-
 .../bastardkb/tbkmini/v2/splinky/config.h     |   2 -
 .../bastardkb/tbkmini/v2/splinky/readme.md    |   6 +
 .../bastardkb/tbkmini/v2/splinky/v2/config.h  |  22 ++
 .../bastardkb/tbkmini/v2/splinky/v2/rules.mk  |   2 +
 .../bastardkb/tbkmini/v2/splinky/v3/config.h  |  22 ++
 .../bastardkb/tbkmini/v2/splinky/v3/rules.mk  |   2 +
 .../bastardkb/tbkmini/v2/stemcell/config.h    |  48 ++++
 .../bastardkb/tbkmini/v2/stemcell/halconf.h   |  23 ++
 .../bastardkb/tbkmini/v2/stemcell/info.json   |   6 +
 .../bastardkb/tbkmini/v2/stemcell/mcuconf.h   |  29 +++
 .../bastardkb/tbkmini/v2/stemcell/rules.mk    |  33 +++
 139 files changed, 2793 insertions(+), 301 deletions(-)
 rename keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/{README.md => readme.md} (100%)
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md
 rename keyboards/bastardkb/{dilemma/splinky/splinky.c => charybdis/3x5/v2/splinky/v2/config.h} (58%)
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/stemcell/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/stemcell/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/info.json
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/keymaps/bstiq/config.h (100%)
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/keymaps/bstiq/keymap.c (100%)
 rename keyboards/bastardkb/dilemma/{keymaps/bstiq/README.md => 3x5_2/keymaps/bstiq/readme.md} (100%)
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/keymaps/default/keymap.c (100%)
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/keymaps/drashna/config.h (100%)
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/keymaps/drashna/keymap.c (100%)
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/keymaps/drashna/rules.mk (100%)
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/keymaps/via/readme.md
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/keymaps/via/rules.mk
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/splinky/config.h (99%)
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/splinky/halconf.h (100%)
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
 rename keyboards/bastardkb/dilemma/{ => 3x5_2}/splinky/mcuconf.h (100%)
 rename keyboards/bastardkb/dilemma/{ => 3x5_2/splinky}/rules.mk (78%)
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/config.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/halconf.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/info.json
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/readme.md
 create mode 100644 keyboards/bastardkb/dilemma/3x5_3/rules.mk
 delete mode 100644 keyboards/bastardkb/dilemma/elitec/info.json
 delete mode 100644 keyboards/bastardkb/dilemma/elitec/rules.mk
 delete mode 100644 keyboards/bastardkb/dilemma/splinky/info.json
 delete mode 100644 keyboards/bastardkb/dilemma/splinky/rules.mk
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/readme.md
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/v2/config.h
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/v3/config.h
 create mode 100644 keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk
 create mode 100644 keyboards/bastardkb/scylla/v2/stemcell/config.h
 create mode 100644 keyboards/bastardkb/scylla/v2/stemcell/halconf.h
 create mode 100644 keyboards/bastardkb/scylla/v2/stemcell/info.json
 create mode 100644 keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h
 create mode 100644 keyboards/bastardkb/scylla/v2/stemcell/rules.mk
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/readme.md
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
 create mode 100644 keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk
 rename keyboards/bastardkb/{dilemma/elitec => skeletyl/v2/stemcell}/config.h (69%)
 create mode 100644 keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h
 create mode 100644 keyboards/bastardkb/skeletyl/v2/stemcell/info.json
 create mode 100644 keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h
 create mode 100644 keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/readme.md
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
 create mode 100644 keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk
 create mode 100644 keyboards/bastardkb/tbkmini/v2/stemcell/config.h
 create mode 100644 keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h
 create mode 100644 keyboards/bastardkb/tbkmini/v2/stemcell/info.json
 create mode 100644 keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h
 create mode 100644 keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk

diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
index ddd5e83318..ef99f3b631 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
@@ -58,5 +58,5 @@
 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN B14
+#define POINTING_DEVICE_CS_PIN B14
 #define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
index a89dff0cd3..0e5caa9f9a 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2020 Nick Brassel (tzarc)
  * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
@@ -20,10 +20,8 @@
 
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
-//#define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-//#define HAL_USE_GPT TRUE
 
 #include_next "halconf.h"
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
index 1615d1bf46..3b9c9056f8 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
@@ -21,14 +21,6 @@
 
 #include_next "mcuconf.h"
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
-
-#undef STM32_I2C_I2C1_RX_DMA_STREAM
-#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-#undef STM32_I2C_I2C1_TX_DMA_STREAM
-#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
-
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
@@ -46,14 +38,6 @@
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
 
-// #undef STM32_SERIAL_USE_USART2
-// #define STM32_SERIAL_USE_USART2 TRUE
-
-// #undef STM32_UART_USART2_RX_DMA_STREAM
-// #define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-// #undef STM32_UART_USART2_TX_DMA_STREAM
-// #define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-
 #undef STM32_GPT_USE_TIM4
 #define STM32_GPT_USE_TIM4 TRUE
 
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index 0f732c2cbd..a21fd9e7ff 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -24,10 +24,8 @@ RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by def
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812
 
-# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
-# the trackball side).
 SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout
+LAYOUTS = split_3x5_3
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/README.md b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/readme.md
similarity index 100%
rename from keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/README.md
rename to keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/readme.md
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
index 148f026740..aa7f1bb329 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
@@ -14,6 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include QMK_KEYBOARD_H
 
 enum charybdis_keymap_layers {
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
index 3e3d95174c..8a9d40ac63 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
@@ -39,4 +39,4 @@
 #define RGB_DI_PIN D3
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN B0
+#define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
index 5c11fa3145..2667ee9e7e 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
@@ -33,4 +33,4 @@
 #define RGB_DI_PIN D3
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN F0
+#define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
index 2929d3dd1e..d4688aef92 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
@@ -20,8 +20,6 @@
 /* Key matrix configuration. */
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP28, GP15, GP6, GP7, GP8 }
 
 /* Handedness. */
 #define MASTER_RIGHT
@@ -39,12 +37,74 @@
 
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
-#define SPI_SCK_PIN GP18
-#define SPI_MOSI_PIN GP19
 #define SPI_MISO_PIN GP20
-#define PMW33XX_CS_PIN GP14
 
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+/** RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Enable all animations on ARM boards since they have plenty of memory
+// available for it.
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md
new file mode 100644
index 0000000000..22df77bbaa
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md
@@ -0,0 +1,6 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See https://github.com/plut0nium/0xB2/#releases to figure out the right version
+for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/dilemma/splinky/splinky.c b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
similarity index 58%
rename from keyboards/bastardkb/dilemma/splinky/splinky.c
rename to keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
index 0100ae06ae..70b65a97c7 100644
--- a/keyboards/bastardkb/dilemma/splinky/splinky.c
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
@@ -15,19 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#pragma once
 
-// Forward declare RP2040 SDK declaration.
-void gpio_init(uint gpio);
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP28, GP15, GP6, GP7, GP8 }
 
-void keyboard_pre_init_kb(void) {
-    // Ensures that GP26 through GP29 are initialized as digital inputs (as
-    // opposed to analog inputs).  These GPIOs are shared with A0 through A3,
-    // respectively.  On RP2040-B2 and later, the digital inputs are disabled by
-    // default (see RP2040-E6).
-    gpio_init(GP26);
-    gpio_init(GP27);
-    gpio_init(GP28);
-    gpio_init(GP29);
-    keyboard_pre_init_user();
-}
+/* SPI & PMW3360 settings. */
+#define SPI_SCK_PIN GP18
+#define SPI_MOSI_PIN GP19
+#define POINTING_DEVICE_CS_PIN GP14
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
new file mode 100644
index 0000000000..d53c5a3c41
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP28, GP21, GP6, GP7, GP8 }
+
+/* SPI & PMW3360 settings. */
+#define SPI_SCK_PIN GP22
+#define SPI_MOSI_PIN GP23
+#define POINTING_DEVICE_CS_PIN GP16
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
new file mode 100644
index 0000000000..a06859b215
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define A0 PAL_LINE(GPIOA, 0)
+// #define SPLIT_HAND_PIN A0
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+#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
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for pmw3360 sensor. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B1
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN B2
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN B3
+#define SPI_MISO_PAL_MODE 5
+
+/* PMW3360 settings. */
+#define A1 PAL_LINE(GPIOA, 1)
+#define POINTING_DEVICE_CS_PIN A1
+#define PMW3360_CS_MODE 3
+#define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/halconf.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/halconf.h
new file mode 100644
index 0000000000..0397de50b7
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/halconf.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
new file mode 100644
index 0000000000..2aee1fe40b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) STeMCell",
+    "usb": {
+      "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/mcuconf.h
new file mode 100644
index 0000000000..17a46d8f95
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/mcuconf.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 FALSE
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
new file mode 100644
index 0000000000..e4a9ce289c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -0,0 +1,38 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+CONVERT_TO = stemcell
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+SERIAL_DRIVER = usart
+WS2812_DRIVER = pwm
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
index 1b90a3076b..93d897a4fe 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
@@ -56,5 +56,5 @@
 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN B14
+#define POINTING_DEVICE_CS_PIN B14
 #define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
index 42d7499907..78885b6870 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
@@ -1,4 +1,5 @@
-/*
+/**
+ * Copyright 2020 Nick Brassel (tzarc)
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
index 26645d8c1a..7adcb837de 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2021 Stefan Kerkmann (@KarlK90)
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
index 05746cf17e..fa1a1c01f7 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
@@ -38,4 +38,4 @@
 #define RGB_DI_PIN D3
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN B0
+#define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
index edd167446b..e9d45e6796 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
@@ -33,4 +33,4 @@
 #define RGB_DI_PIN D3
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN F0
+#define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
index 9c4ced817a..e68bf722e4 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
@@ -20,8 +20,6 @@
 /* Key matrix configuration. */
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
 
 /* Handedness. */
 #define MASTER_RIGHT
@@ -39,10 +37,7 @@
 
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
-#define SPI_SCK_PIN GP18
-#define SPI_MOSI_PIN GP19
 #define SPI_MISO_PIN GP20
-#define PMW33XX_CS_PIN GP14
 
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md
new file mode 100644
index 0000000000..22df77bbaa
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md
@@ -0,0 +1,6 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See https://github.com/plut0nium/0xB2/#releases to figure out the right version
+for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
new file mode 100644
index 0000000000..7b7d94b320
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* SPI & PMW3360 settings. */
+#define SPI_SCK_PIN GP18
+#define SPI_MOSI_PIN GP19
+#define POINTING_DEVICE_CS_PIN GP14
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
new file mode 100644
index 0000000000..0e9f2257f0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP21, GP6, GP7, GP8 }
+
+/* SPI & PMW3360 settings. */
+#define SPI_SCK_PIN GP22
+#define SPI_MOSI_PIN GP23
+#define POINTING_DEVICE_CS_PIN GP16
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
new file mode 100644
index 0000000000..81c7e737a7
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define A0 PAL_LINE(GPIOA, 0)
+// #define SPLIT_HAND_PIN A0
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+#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
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for pmw3360 sensor. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B1
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN B2
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN B3
+#define SPI_MISO_PAL_MODE 5
+
+/* PMW3360 settings. */
+#define A1 PAL_LINE(GPIOA, 1)
+#define POINTING_DEVICE_CS_PIN A1
+#define PMW3360_CS_MODE 3
+#define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h
new file mode 100644
index 0000000000..8141e0cf4b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
new file mode 100644
index 0000000000..516eb7dde3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) STeMCell",
+    "usb": {
+      "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h
new file mode 100644
index 0000000000..1a3c4433db
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 FALSE
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
new file mode 100644
index 0000000000..94cd8a0deb
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -0,0 +1,38 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+CONVERT_TO = stemcell
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+SERIAL_DRIVER = usart
+WS2812_DRIVER = pwm
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
index 2514a52fb0..e37df487fd 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -58,5 +58,5 @@
 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN B14
+#define POINTING_DEVICE_CS_PIN B14
 #define PMW33XX_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
index a89dff0cd3..0e5caa9f9a 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2020 Nick Brassel (tzarc)
  * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
@@ -20,10 +20,8 @@
 
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
-//#define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-//#define HAL_USE_GPT TRUE
 
 #include_next "halconf.h"
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
index 1615d1bf46..3b9c9056f8 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
@@ -21,14 +21,6 @@
 
 #include_next "mcuconf.h"
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
-
-#undef STM32_I2C_I2C1_RX_DMA_STREAM
-#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-#undef STM32_I2C_I2C1_TX_DMA_STREAM
-#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
-
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
@@ -46,14 +38,6 @@
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
 
-// #undef STM32_SERIAL_USE_USART2
-// #define STM32_SERIAL_USE_USART2 TRUE
-
-// #undef STM32_UART_USART2_RX_DMA_STREAM
-// #define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-// #undef STM32_UART_USART2_TX_DMA_STREAM
-// #define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-
 #undef STM32_GPT_USE_TIM4
 #define STM32_GPT_USE_TIM4 TRUE
 
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index 6123ec58b7..9015f3a8b2 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -24,8 +24,6 @@ RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by def
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 RGB_MATRIX_DRIVER = WS2812
 
-# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
-# trackball side).
 SPLIT_KEYBOARD = yes
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
index 15044ef645..710c4c3587 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
@@ -39,4 +39,4 @@
 #define RGB_DI_PIN D3
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN B0
+#define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
index 891e511ccb..692a28b7be 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
@@ -33,4 +33,4 @@
 #define RGB_DI_PIN D3
 
 /* PMW3360 settings. */
-#define PMW33XX_CS_PIN F0
+#define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
index e17ec49726..010de7c480 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
@@ -20,8 +20,6 @@
 /* Key matrix configuration. */
 #define MATRIX_ROW_PINS \
     { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
 
 /* Handedness. */
 #define MASTER_RIGHT
@@ -39,10 +37,7 @@
 
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
-#define SPI_SCK_PIN GP18
-#define SPI_MOSI_PIN GP19
 #define SPI_MISO_PIN GP20
-#define PMW33XX_CS_PIN GP14
 
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md
new file mode 100644
index 0000000000..22df77bbaa
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md
@@ -0,0 +1,6 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See https://github.com/plut0nium/0xB2/#releases to figure out the right version
+for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
new file mode 100644
index 0000000000..7b7d94b320
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* SPI & PMW3360 settings. */
+#define SPI_SCK_PIN GP18
+#define SPI_MOSI_PIN GP19
+#define POINTING_DEVICE_CS_PIN GP14
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
new file mode 100644
index 0000000000..0e9f2257f0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP21, GP6, GP7, GP8 }
+
+/* SPI & PMW3360 settings. */
+#define SPI_SCK_PIN GP22
+#define SPI_MOSI_PIN GP23
+#define POINTING_DEVICE_CS_PIN GP16
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
new file mode 100644
index 0000000000..b1b432c330
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F4, F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define A0 PAL_LINE(GPIOA, 0)
+// #define SPLIT_HAND_PIN A0
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+#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
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* SPI config for pmw3360 sensor. */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B1
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN B2
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN B3
+#define SPI_MISO_PAL_MODE 5
+
+/* PMW3360 settings. */
+#define A1 PAL_LINE(GPIOA, 1)
+#define POINTING_DEVICE_CS_PIN A1
+#define PMW3360_CS_MODE 3
+#define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h
new file mode 100644
index 0000000000..0397de50b7
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
new file mode 100644
index 0000000000..7d687319b3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Charybdis (4x6) STeMCell",
+    "usb": {
+      "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h
new file mode 100644
index 0000000000..17a46d8f95
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 FALSE
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
new file mode 100644
index 0000000000..0847e9ce1f
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+CONVERT_TO = stemcell
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
+KEYBOARD_SHARED_EP = yes
+
+SERIAL_DRIVER = usart
+WS2812_DRIVER = pwm
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/readme.md b/keyboards/bastardkb/charybdis/readme.md
index c112c1150e..dd0fca0015 100644
--- a/keyboards/bastardkb/charybdis/readme.md
+++ b/keyboards/bastardkb/charybdis/readme.md
@@ -21,6 +21,7 @@ Check out the [keyboard build guides](https://docs.bastardkb.com) for the Charyb
 **You must specify the shield version when compiling/flashing the firmware.**
 
 The template is:
+
 ```shell
 qmk compile -kb bastardkb/charybdis/{LAYOUT}/{VERSION}/elitec -km {KEYMAP}
 ```
@@ -33,16 +34,16 @@ Check out the `via` layout if you're looking for VIA support.
 
 ### Charybdis (4x6)
 
-| Shield Version | default                                                         | via                                                             |
-|----------------|-----------------------------------------------------------------|-----------------------------------------------------------------|
-| v1             | `qmk compile -kb bastardkb/charybdis/4x6/v1/elitec -km default` | `qmk compile -kb bastardkb/charybdis/4x6/v1/elitec -km via`     |
+| Shield Version | default                                                         | via                                                         |
+| -------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
+| v1             | `qmk compile -kb bastardkb/charybdis/4x6/v1/elitec -km default` | `qmk compile -kb bastardkb/charybdis/4x6/v1/elitec -km via` |
 | v2             | `qmk compile -kb bastardkb/charybdis/4x6/v2/elitec -km default` | `qmk compile -kb bastardkb/charybdis/4x6/v2/elitec -km via` |
 
 ### Charybdis (3x5)
 
-| Shield Version | default                                                         | via                                                             |
-|----------------|-----------------------------------------------------------------|-----------------------------------------------------------------|
-| v1             | `qmk compile -kb bastardkb/charybdis/3x5/v1/elitec -km default` | `qmk compile -kb bastardkb/charybdis/3x5/v1/elitec -km via`     |
+| Shield Version | default                                                         | via                                                         |
+| -------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
+| v1             | `qmk compile -kb bastardkb/charybdis/3x5/v1/elitec -km default` | `qmk compile -kb bastardkb/charybdis/3x5/v1/elitec -km via` |
 | v2             | `qmk compile -kb bastardkb/charybdis/3x5/v2/elitec -km default` | `qmk compile -kb bastardkb/charybdis/3x5/v2/elitec -km via` |
 
 ## Customizing the firmware
@@ -164,17 +165,17 @@ To disable the custom keycodes, and reduce binary size, simply add a definition
 
 ### Configuration Syncing
 
-If you want/need to enable syncing of the charybdis config, such as to read the sniping or drag scroll modes on the other half (such as for displaying the status via rgb matrix, or added on screens, or what not), you can enabled this.  To do so, add this to your `config.h`: 
+If you want/need to enable syncing of the charybdis config, such as to read the sniping or drag scroll modes on the other half (such as for displaying the status via rgb matrix, or added on screens, or what not), you can enabled this. To do so, add this to your `config.h`:
 
 ```c
 #define CHARYBDIS_CONFIG_SYNC
 ```
 
-Note that you will need to reflash both sides when enabling this. 
+Note that you will need to reflash both sides when enabling this.
 
 ### Enable Large Mouse Reports
 
-By default, the X and Y motion for the pointing device/mouse reports is -127 to 127.  You can definitely hit the limit for that with the sensors.  You can enable support for -32767 to 32767 by adding this to your `config.h`:
+By default, the X and Y motion for the pointing device/mouse reports is -127 to 127. You can definitely hit the limit for that with the sensors. You can enable support for -32767 to 32767 by adding this to your `config.h`:
 
 ```c
 #define MOUSE_EXTENDED_REPORT
diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
new file mode 100644
index 0000000000..7deb32d917
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// clang-format off
+#define LAYOUT_split_3x5_2(                             \
+  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
+                 k30, k32,     k72, k70                 \
+)                                                       \
+{                                                       \
+  {   k00,   k01,   k02,   k03,   k04 },                \
+  {   k10,   k11,   k12,   k13,   k14 },                \
+  {   k20,   k21,   k22,   k23,   k24 },                \
+  {   k30, KC_NO,   k32, KC_NO, KC_NO },                \
+  {   k40,   k41,   k42,   k43,   k44 },                \
+  {   k50,   k51,   k52,   k53,   k54 },                \
+  {   k60,   k61,   k62,   k63,   k64 },                \
+  {   k70, KC_NO,   k72, KC_NO, KC_NO },                \
+}
+// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
new file mode 100644
index 0000000000..8420898f4e
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP4, GP5, GP28, GP26 }
+#define MATRIX_COL_PINS \
+    { GP8, GP9, GP7, GP6, GP27 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN GP29
+#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* Cirque trackpad. */
+#define SPI_SCK_PIN GP22
+#define SPI_MOSI_PIN GP23
+#define SPI_MISO_PIN GP20
+#define POINTING_DEVICE_CS_PIN GP21
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
new file mode 100644
index 0000000000..7a79bec953
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
@@ -0,0 +1,22 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
new file mode 100644
index 0000000000..aae8dfc179
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -0,0 +1,4 @@
+{
+    "keyboard_name": "Dilemma (3x5+2) Assembled"
+}
+
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
new file mode 100644
index 0000000000..b54d705b54
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
new file mode 100644
index 0000000000..df2f94792d
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = no   # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = no      # Enable keyboard RGB matrix functionality
+
+SERIAL_DRIVER = vendor
+
+POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_2
+
+# RP2040-specific options
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
new file mode 100644
index 0000000000..5aa89bcded
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -0,0 +1,46 @@
+{
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1835"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0},
+                {"label":"L01", "x":1, "y":0},
+                {"label":"L02", "x":2, "y":0},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"R00", "x":11, "y":0},
+                {"label":"R01", "x":12, "y":0},
+                {"label":"R02", "x":13, "y":0},
+                {"label":"R03", "x":14, "y":0},
+                {"label":"R04", "x":15, "y":0},
+                {"label":"L10", "x":0, "y":1},
+                {"label":"L11", "x":1, "y":1},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"R10", "x":11, "y":1},
+                {"label":"R11", "x":12, "y":1},
+                {"label":"R12", "x":13, "y":1},
+                {"label":"R13", "x":14, "y":1},
+                {"label":"R14", "x":15, "y":1},
+                {"label":"L20", "x":0, "y":2},
+                {"label":"L21", "x":1, "y":2},
+                {"label":"L22", "x":2, "y":2},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"R20", "x":11, "y":2},
+                {"label":"R21", "x":12, "y":2},
+                {"label":"R22", "x":13, "y":2},
+                {"label":"R23", "x":14, "y":2},
+                {"label":"R24", "x":15, "y":2},
+                {"label":"L30", "x":4, "y":3},
+                {"label":"L32", "x":5, "y":3},
+                {"label":"R32", "x":10, "y":3},
+                {"label":"R30", "x":11, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
similarity index 100%
rename from keyboards/bastardkb/dilemma/keymaps/bstiq/config.h
rename to keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/keymap.c
similarity index 100%
rename from keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c
rename to keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/keymap.c
diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/README.md b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/readme.md
similarity index 100%
rename from keyboards/bastardkb/dilemma/keymaps/bstiq/README.md
rename to keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/readme.md
diff --git a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bastardkb/dilemma/keymaps/default/keymap.c
rename to keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.c
diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h
similarity index 100%
rename from keyboards/bastardkb/dilemma/keymaps/drashna/config.h
rename to keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h
diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
similarity index 100%
rename from keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c
rename to keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk
similarity index 100%
rename from keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
rename to keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
new file mode 100644
index 0000000000..fbe61df03b
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifdef VIA_ENABLE
+/* VIA configuration. */
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 6
+#endif // VIA_ENABLE
+
+/* Disable unused features. */
+#define NO_ACTION_ONESHOT
+
+#ifndef TAPPING_TERM
+/**
+ * \brief Configure the global tapping term (default: 200ms).
+ *
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#    define TAPPING_TERM 200
+#endif // TAPPING_TERM
+
+/**
+ * \brief Enable rapid switch from tap to hold.
+ *
+ * Note that a side-effect of this setting is to disable auto-repeat when
+ * pressing key twice, except for one-shot keys.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
+ */
+#define TAPPING_FORCE_HOLD
+
+/*
+ * Tap-or-Hold decision modes.
+ *
+ * Note that the following flags behave differently when combined (ie. when 2 or
+ * more are enabled).
+ *
+ * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
+ * decision modes.
+ */
+
+/**
+ * \brief Faster tap-hold trigger.
+ *
+ * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
+ * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
+ */
+#define PERMISSIVE_HOLD
+
+/**
+ * \brief Prevent normal rollover on alphas from accidentally triggering mods.
+ *
+ * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
+ *
+ * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
+ * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
+ */
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Charybdis-specific features. */
+
+#ifdef POINTING_DEVICE_ENABLE
+// Automatically enable the pointer layer when moving the trackball.  See also:
+// - `DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
+// - `DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
+// #define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#endif // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..082a151674
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
@@ -0,0 +1,229 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+#ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#    include "timer.h"
+#endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+enum dilemma_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_FUNCTION,
+    LAYER_NAVIGATION,
+    LAYER_POINTER,
+    LAYER_NUMERAL,
+    LAYER_SYMBOLS,
+};
+
+// Automatically enable sniping-mode on the pointer layer.
+#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+
+#ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+static uint16_t auto_pointer_layer_timer = 0;
+
+#    ifndef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+#        define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+#    endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+
+#    ifndef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#        define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+#    endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#endif     // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC)
+#define TAB_FUN LT(LAYER_FUNCTION, KC_TAB)
+#define ENT_SYM LT(LAYER_SYMBOLS, KC_ENT)
+#define BSP_NUM LT(LAYER_NUMERAL, KC_BSPC)
+#define _L_PTR(KC) LT(LAYER_POINTER, KC)
+
+#ifndef POINTING_DEVICE_ENABLE
+#    define DRGSCRL KC_NO
+#    define DPI_MOD KC_NO
+#    define S_D_MOD KC_NO
+#    define SNIPING KC_NO
+#endif // !POINTING_DEVICE_ENABLE
+
+// clang-format off
+/** \brief QWERTY layout (3 rows, 10 columns). */
+#define LAYOUT_LAYER_BASE                                                                     \
+       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, \
+       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_QUOT, \
+       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, \
+                               TAB_FUN, SPC_NAV, ENT_SYM, BSP_NUM
+
+/** Convenience row shorthands. */
+#define _______________DEAD_HALF_ROW_______________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+#define ______________HOME_ROW_GACS_L______________ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX
+#define ______________HOME_ROW_GACS_R______________ XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI
+
+/*
+ * Layers used on the Dilemma.
+ *
+ * These layers started off heavily inspired by the Miryoku layout, but trimmed
+ * down and tailored for a stock experience that is meant to be fundation for
+ * further personalization.
+ *
+ * See https://github.com/manna-harbour/miryoku for the original layout.
+ */
+
+/**
+ * \brief Function layer.
+ *
+ * Secondary right-hand layer has function keys mirroring the numerals on the
+ * primary layer with extras on the pinkie column, plus system keys on the inner
+ * column. App is on the tertiary thumb key and other thumb keys are duplicated
+ * from the base layer to enable auto-repeat.
+ */
+#define LAYOUT_LAYER_FUNCTION                                                                 \
+    _______________DEAD_HALF_ROW_______________, KC_PSCR,   KC_F7,   KC_F8,   KC_F9,  KC_F12, \
+    ______________HOME_ROW_GACS_L______________, KC_SLCK,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \
+    _______________DEAD_HALF_ROW_______________, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,  KC_F10, \
+                               _______, XXXXXXX, XXXXXXX, XXXXXXX
+
+/** \brief Mouse emulation and pointer functions. */
+#define LAYOUT_LAYER_POINTER                                                                  \
+    QK_BOOT, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, QK_BOOT, \
+    ______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
+    _______, DRGSCRL, SNIPING, KC_BTN3, XXXXXXX, XXXXXXX, KC_BTN3, SNIPING, DRGSCRL, _______, \
+                               KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2
+
+/**
+ * \brief Navigation layer.
+ *
+ * Primary right-hand layer (left home thumb) is navigation and editing. Cursor
+ * keys are on the home position, line and page movement below, clipboard above,
+ * caps lock and insert on the inner column. Thumb keys are duplicated from the
+ * base layer to avoid having to layer change mid edit and to enable auto-repeat.
+ */
+#define LAYOUT_LAYER_NAVIGATION                                                               \
+    _______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \
+    ______________HOME_ROW_GACS_L______________, KC_CLCK, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
+    _______________DEAD_HALF_ROW_______________,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
+                               XXXXXXX, _______,  KC_ENT, KC_BSPC
+
+/**
+ * \brief Numeral layout.
+ *
+ * Primary left-hand layer (right home thumb) is numerals and symbols. Numerals
+ * are in the standard numpad locations with symbols in the remaining positions.
+ * `KC_DOT` is duplicated from the base layer.
+ */
+#define LAYOUT_LAYER_NUMERAL                                                                  \
+    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, _______________DEAD_HALF_ROW_______________, \
+    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GACS_R______________, \
+     KC_DOT,    KC_1,    KC_2,    KC_3, KC_BSLS, _______________DEAD_HALF_ROW_______________, \
+                               KC_MINS,    KC_0, XXXXXXX, _______
+
+/**
+ * \brief Symbols layer.
+ *
+ * Secondary left-hand layer has shifted symbols in the same locations to reduce
+ * chording when using mods with shifted symbols. `KC_LPRN` is duplicated next to
+ * `KC_RPRN`.
+ */
+#define LAYOUT_LAYER_SYMBOLS                                                                  \
+    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, _______________DEAD_HALF_ROW_______________, \
+    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GACS_R______________, \
+    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_PIPE, _______________DEAD_HALF_ROW_______________, \
+                                KC_GRV, KC_UNDS, _______, XXXXXXX
+
+/**
+ * \brief Add Home Row mod to a layout.
+ *
+ * Expects a 10-key per row layout.  Adds support for GACS (Gui, Alt, Ctl, Shift)
+ * home row.  The layout passed in parameter must contain at least 20 keycodes.
+ *
+ * This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.:
+ *
+ *     HOME_ROW_MOD_GACS(LAYER_ALPHAS_QWERTY)
+ */
+#define _HOME_ROW_MOD_GACS(                                            \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
+    ...)                                                               \
+             L00,         L01,         L02,         L03,         L04,  \
+             R05,         R06,         R07,         R08,         R09,  \
+      LGUI_T(L10), LALT_T(L11), LCTL_T(L12), LSFT_T(L13),        L14,  \
+             R15,  RSFT_T(R16), RCTL_T(R17), LALT_T(R18), RGUI_T(R19), \
+      __VA_ARGS__
+#define HOME_ROW_MOD_GACS(...) _HOME_ROW_MOD_GACS(__VA_ARGS__)
+
+/**
+ * \brief Add pointer layer keys to a layout.
+ *
+ * Expects a 10-key per row layout.  The layout passed in parameter must contain
+ * at least 30 keycodes.
+ *
+ * This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.:
+ *
+ *     POINTER_MOD(LAYER_ALPHAS_QWERTY)
+ */
+#define _POINTER_MOD(                                                  \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
+    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,                  \
+    ...)                                                               \
+             L00,         L01,         L02,         L03,         L04,  \
+             R05,         R06,         R07,         R08,         R09,  \
+             L10,         L11,         L12,         L13,         L14,  \
+             R15,         R16,         R17,         R18,         R19,  \
+      _L_PTR(L20),        L21,         L22,         L23,         L24,  \
+             R25,         R26,         R27,         R28,  _L_PTR(R29), \
+      __VA_ARGS__
+#define POINTER_MOD(...) _POINTER_MOD(__VA_ARGS__)
+
+#define LAYOUT_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_wrapper(
+    POINTER_MOD(HOME_ROW_MOD_GACS(LAYOUT_LAYER_BASE))
+  ),
+  [LAYER_FUNCTION] = LAYOUT_wrapper(LAYOUT_LAYER_FUNCTION),
+  [LAYER_NAVIGATION] = LAYOUT_wrapper(LAYOUT_LAYER_NAVIGATION),
+  [LAYER_NUMERAL] = LAYOUT_wrapper(LAYOUT_LAYER_NUMERAL),
+  [LAYER_POINTER] = LAYOUT_wrapper(LAYOUT_LAYER_POINTER),
+  [LAYER_SYMBOLS] = LAYOUT_wrapper(LAYOUT_LAYER_SYMBOLS),
+};
+// clang-format on
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    if (abs(mouse_report.x) > DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD || abs(mouse_report.y) > DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD) {
+        if (auto_pointer_layer_timer == 0) {
+            layer_on(LAYER_POINTER);
+        }
+        auto_pointer_layer_timer = timer_read();
+    }
+    return mouse_report;
+}
+
+void matrix_scan_user(void) {
+    if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
+        auto_pointer_layer_timer = 0;
+        layer_off(LAYER_POINTER);
+    }
+}
+#    endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#    ifdef DILEMMA_AUTO_SNIPING_ON_LAYER
+layer_state_t layer_state_set_user(layer_state_t state) {
+    dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#    endif // DILEMMA_AUTO_SNIPING_ON_LAYER
+#endif     // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/readme.md b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/readme.md
new file mode 100644
index 0000000000..df40677f4d
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/readme.md
@@ -0,0 +1,67 @@
+# Dilemma `via` keymap
+
+The Dilemma `via` keymap is based on a QWERTY layout with [home row mods](https://precondition.github.io/home-row-mods) and [Miryoku-inspired layers](https://github.com/manna-harbour/miryoku), and some features and changes specific to the Dilemma.
+
+This layout also supports VIA.
+
+## Customizing the keymap
+
+### Dynamic DPI scaling
+
+Use the following keycodes to change the default DPI:
+
+-   `POINTER_DEFAULT_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_DEFAULT_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 16 possible values for the sniping mode DPI. See the [Dilemma documentation](../../README.md) for more information.
+
+Use the following keycodes to change the sniping mode DPI:
+
+-   `POINTER_SNIPING_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_SNIPING_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 4 possible values for the sniping mode DPI. See the [Dilemma documentation](../../README.md) for more information.
+
+### Drag-scroll
+
+Use the `DRAGSCROLL_MODE` keycode to enable drag-scroll on hold. Use the `DRAGSCROLL_TOGGLE` keycode to enable/disable drag-scroll on key press.
+
+### Circular scroll
+
+By default, the firmware is configured to enable the circular scroll feature on Cirque trackpad.
+
+To disable this, add the following to your keymap:
+
+```c
+#undef POINTING_DEVICE_GESTURES_SCROLL_ENABLE
+```
+
+### Sniping
+
+Use the `SNIPING_MODE` keycode to enable sniping mode on hold. Use the `SNIPING_TOGGLE` keycode to enable/disable sniping mode on key press.
+
+Change the value of `DILEMMA_AUTO_SNIPING_ON_LAYER` to automatically enable sniping mode on layer change. By default, sniping mode is enabled on the pointer layer:
+
+```c
+#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+```
+
+### Auto pointer layer
+
+The pointer layer can be automatically enabled when moving the trackball. To enable or disable this behavior, add or remove the following define:
+
+```c
+#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+```
+
+By default, the layer is turned off 1 second after the last registered trackball movement:
+
+```c
+#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+```
+
+The trigger sensibility can also be tuned. The lower the value, the more sensible the trigger:
+
+```c
+#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+```
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bastardkb/dilemma/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
similarity index 99%
rename from keyboards/bastardkb/dilemma/splinky/config.h
rename to keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
index 80c9e42224..4ac28ed1f9 100644
--- a/keyboards/bastardkb/dilemma/splinky/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/keyboards/bastardkb/dilemma/splinky/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
similarity index 100%
rename from keyboards/bastardkb/dilemma/splinky/halconf.h
rename to keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
new file mode 100644
index 0000000000..38ce4738f9
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Dilemma (3x5+2) Splinky"
+}
diff --git a/keyboards/bastardkb/dilemma/splinky/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
similarity index 100%
rename from keyboards/bastardkb/dilemma/splinky/mcuconf.h
rename to keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
diff --git a/keyboards/bastardkb/dilemma/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
similarity index 78%
rename from keyboards/bastardkb/dilemma/rules.mk
rename to keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
index 499eadfdfb..292b71fe8b 100644
--- a/keyboards/bastardkb/dilemma/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
@@ -1,3 +1,9 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
 # Build Options
 #   change yes to no to disable
 #
@@ -16,10 +22,13 @@ RGB_MATRIX_SUPPORTED = no   # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = no      # Enable keyboard RGB matrix functionality
 
+SERIAL_DRIVER = vendor
+
 POINTING_DEVICE_ENABLE = yes
-POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
+POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
 
 SPLIT_KEYBOARD = yes
 LAYOUTS = split_3x5_2
 
-DEFAULT_FOLDER = bastardkb/dilemma/splinky
+# RP2040-specific options
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
new file mode 100644
index 0000000000..0b6c657fda
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "3x5_3.h"
+
+/**
+ * LEDs index.
+ *
+ * ╭────────────────────╮                 ╭────────────────────╮
+ *    2   3   8   9  12                     30  27  26  21  20
+ * ├────────────────────┤                 ├────────────────────┤
+ *    1   4   7  10  13                     31  28  25  22  19
+ * ├────────────────────┤                 ├────────────────────┤
+ *    0   5   6  11  14                     32  29  24  23  18
+ * ╰────────────────────╯                 ╰────────────────────╯
+ *                   15  16  17     35  34  33
+ *                 ╰────────────╯ ╰────────────╯
+ */
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    /* Key Matrix to LED index. */
+    // Left split.
+    {      2,      3,      8,      9,     12 }, // Top row
+    {      1,      4,      7,     10,     13 }, // Middle row
+    {      0,      5,      6,     11,     14 }, // Bottom row
+    {     17, NO_LED,     15,     16, NO_LED }, // Thumb cluster
+    // Right split.
+    {     20,     21,     26,     27,     30 }, // Top row
+    {     19,     22,     25,     28,     31 }, // Middle row
+    {     18,     23,     24,     29,     32 }, // Bottom row
+    {     35, NO_LED,     33,     34, NO_LED }, // Thumb cluster
+}, {
+    /* LED index to physical position. */
+    // Left split.
+    /* index=0  */ {   0,  42 }, {   0,  21 }, {   0,   0 }, // col 1 (left most)
+    /* index=3  */ {  18,   0 }, {  18,  21 }, {  18,  42 }, // col 2
+    /* index=6  */ {  36,  42 }, {  36,  21 }, {  36,   0 },
+    /* index=9  */ {  54,   0 }, {  54,  21 }, {  54,  42 },
+    /* index=12 */ {  72,   0 }, {  72,  21 }, {  72,  42 },
+    /* index=15 */ {  72,  64 }, {  90,  64 }, { 108,  64 }, // Thumb cluster
+    // Right split.
+    /* index=18 */ { 224,  42 }, { 224,  21 }, { 224,   0 }, // col 10 (right most)
+    /* index=21 */ { 206,   0 }, { 206,  21 }, { 206,  42 }, // col 9
+    /* index=24 */ { 188,  42 }, { 188,  21 }, { 188,   0 },
+    /* index=27 */ { 170,   0 }, { 170,  21 }, { 170,  42 },
+    /* index=30 */ { 152,   0 }, { 152,  21 }, { 152,  42 },
+    /* index=33 */ { 152,  64 }, { 134,  64 }, { 116,  64 }, // Thumb cluster
+}, {
+    /* LED index to flag. */
+    // Left split.
+    /* index=0  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
+    /* index=3  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
+    /* index=6  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=9  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=15 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
+    // Right split.
+    /* index=18 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 10
+    /* index=21 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 9
+    /* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=33 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
+} };
+#endif
+// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
new file mode 100644
index 0000000000..566d5b81d2
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "dilemma.h"
+
+// clang-format off
+#define LAYOUT_split_3x5_3(                             \
+  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
+            k32, k30, k31,     k71, k70, k72            \
+)                                                       \
+{                                                       \
+  {   k00,   k01,   k02,   k03,   k04 },                \
+  {   k10,   k11,   k12,   k13,   k14 },                \
+  {   k20,   k21,   k22,   k23,   k24 },                \
+  {   k30,   k31,   k32, KC_NO, KC_NO },                \
+  {   k40,   k41,   k42,   k43,   k44 },                \
+  {   k50,   k51,   k52,   k53,   k54 },                \
+  {   k60,   k61,   k62,   k63,   k64 },                \
+  {   k70,   k71,   k72, KC_NO, KC_NO },                \
+}
+// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
new file mode 100644
index 0000000000..30bce4369b
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { GP4, GP5, GP27, GP26 }
+#define MATRIX_COL_PINS \
+    { GP8, GP9, GP7, GP6, GP28 }
+
+/* Handedness. */
+#define SPLIT_HAND_PIN GP29
+#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN GP1
+
+/* RGB settings. */
+#define RGB_DI_PIN GP0  // Per-key.
+// #define RGB_DI_PIN GP10 // Underglow.
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* Cirque trackpad over SPI. */
+#define SPI_SCK_PIN GP22
+#define SPI_MOSI_PIN GP23
+#define SPI_MISO_PIN GP20
+#define POINTING_DEVICE_CS_PIN GP21
+
+/* OLED over i2c. */
+#define I2C1_CLOCK_SPEED 400000
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
+#define OLED_DISPLAY_HEIGHT 128
+
+/* Reset. */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+/* RGB settings. */
+#define RGBLED_NUM 36
+#define RGBLED_SPLIT \
+    { 18, 18 }
+
+/* RGB matrix support. */
+#ifdef RGB_MATRIX_ENABLE
+#    define SPLIT_TRANSPORT_MIRROR
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_KEYPRESSES
+#endif
diff --git a/keyboards/bastardkb/dilemma/3x5_3/halconf.h b/keyboards/bastardkb/dilemma/3x5_3/halconf.h
new file mode 100644
index 0000000000..a3774605a8
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/halconf.h
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
new file mode 100644
index 0000000000..2c1a68888b
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -0,0 +1,49 @@
+{
+    "keyboard_name": "Dilemma (3x5+3) Assembled",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x1835"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "L32", "x": 4, "y": 3 },
+                { "label": "L33", "x": 5, "y": 3 },
+                { "label": "L34", "x": 6, "y": 3 },
+                { "label": "R32", "x": 11, "y": 3 },
+                { "label": "R33", "x": 10, "y": 3 },
+                { "label": "R34", "x":  9, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
new file mode 100644
index 0000000000..507cd6a225
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
@@ -0,0 +1,145 @@
+/**
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifdef VIA_ENABLE
+/* Via configuration. */
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 8
+#endif // VIA_ENABLE
+
+/**
+ * Configure the global tapping term (default: 200ms).
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ */
+#ifndef TAPPING_TERM
+#    define TAPPING_TERM 160
+#endif // TAPPING_TERM
+
+// disable trackpad taps
+// #define CIRQUE_PINNACLE_TAPPING_TERM 0
+
+/**
+ * Enable rapid switch from tap to hold.  Disable auto-repeat when pressing key
+ * twice, except for one-shot keys.
+ */
+#define TAPPING_FORCE_HOLD
+
+/*
+ * Tap-or-Hold decision modes.
+ *
+ * Note that the following flags behave differently when combined (ie. when 2 or
+ * more are enabled).
+ *
+ * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
+ * decision modes.
+ */
+
+/**
+ * Faster tap-hold trigger.
+ *
+ * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
+ * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
+ */
+#define PERMISSIVE_HOLD
+
+/**
+ * Prevent normal rollover on alphas from accidentally triggering mods.
+ *
+ * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
+ *
+ * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
+ * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
+ */
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/** Dilemma-specific features. */
+
+#ifdef POINTING_DEVICE_ENABLE
+// Flip horizontal direction for drag-scroll.
+#    define DILEMMA_DRAGSCROLL_REVERSE_X
+// #define DILEMMA_DRAGSCROLL_REVERSE_Y
+#endif // POINTING_DEVICE_ENABLE
+
+/** RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Enable all animations on ARM boards since they have plenty of memory
+// available for it.
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
new file mode 100644
index 0000000000..e8e5ccd83b
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
@@ -0,0 +1,223 @@
+/**
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum bstiq_layers {
+    LAYER_BASE = 0,
+    LAYER_MBO,
+    LAYER_MEDIA,
+    LAYER_NAV,
+    LAYER_MOUSE,
+    LAYER_SYM,
+    LAYER_NUM,
+    LAYER_FUN,
+};
+
+// Automatically enable sniping when the mouse layer is on.
+#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_MOUSE
+
+#define BSP_NAV LT(LAYER_NAV, KC_BSPC)
+#define ENT_MBO LT(LAYER_MBO, KC_ENT)
+#define TAB_MED LT(LAYER_MEDIA, KC_TAB)
+#define ESC_SYM LT(LAYER_SYM, KC_ESC)
+#define SPC_NUM LT(LAYER_NUM, KC_SPC)
+#define SPC_MBO LT(LAYER_MBO, KC_SPC)
+#define MOUSE(KC) LT(LAYER_MOUSE, KC)
+
+#define USR_RDO KC_AGAIN
+#define USR_PST S(KC_INS)
+#define USR_CPY C(KC_INS)
+#define USR_CUT S(KC_DEL)
+#define USR_UND KC_UNDO
+
+#define MS_L KC_MS_LEFT
+#define MS_R KC_MS_RIGHT
+#define MS_D KC_MS_DOWN
+#define MS_U KC_MS_UP
+
+#define WH_L KC_MS_WH_LEFT
+#define WH_R KC_MS_WH_RIGHT
+#define WH_D KC_MS_WH_DOWN
+#define WH_U KC_MS_WH_UP
+
+// clang-format off
+/** Convenience macro. */
+#define _KC_LAYOUT_wrapper(                                                                             \
+         k00,      k01,      k02,      k03,      k04,      k05,      k06,      k07,      k08,      k09, \
+         k10,      k11,      k12,      k13,      k14,      k15,      k16,      k17,      k18,      k19, \
+         k20,      k21,      k22,      k23,      k24,      k25,      k26,      k27,      k28,      k29, \
+         ...)                                                                                           \
+    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, \
+    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, \
+    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, \
+    __VA_ARGS__
+#define KC_LAYOUT_wrapper(...) _KC_LAYOUT_wrapper(__VA_ARGS__)
+
+/** Base layer with BÉPO layout. */
+#define LAYOUT_LAYER_BASE_BEPO KC_LAYOUT_wrapper(               \
+       B,    W,    P,    O, QUOT,  DOT,    V,    D,    L,    J, \
+       A,    U,    I,    E, COMM,    C,    T,    S,    R,    N, \
+       Z,    Y,    X, SLSH,    K,    M,    Q,    G,    H,    F, \
+          KC_A, SPC_MBO, TAB_MED, ESC_SYM, SPC_NUM, KC_A)
+
+/** Convenience key shorthands. */
+#define U_NA KC_NO // Present but not available for use.
+#define U_NU KC_NO // Available but not used.
+
+/** Convenience row shorthands. */
+#define ________________HOME_ROW_NA________________    U_NA,    U_NA,    U_NA,    U_NA,    U_NA
+#define ______________HOME_ROW_GASC_L______________ KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL,    U_NA
+#define ______________HOME_ROW_ALGR_L______________    U_NA, KC_ALGR,    U_NA,    U_NA,    U_NA
+#define ______________HOME_ROW_GASC_R______________    U_NA, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI
+#define ______________HOME_ROW_ALGR_R______________    U_NA,    U_NA,    U_NA, KC_ALGR,    U_NA
+
+/** Layers. */
+
+// Buttons.
+#define LAYOUT_LAYER_MBO                                                                      \
+    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    ______________HOME_ROW_GASC_L______________, KC_BSPC, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
+    KC_BTN3, KC_ALGR, KC_BTN2, KC_BTN1,    U_NA,  KC_DEL, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
+                         U_NA,    U_NA,    U_NA,  KC_ENT,  KC_ENT,  KC_ENT
+
+// Media.
+#define LAYOUT_LAYER_MEDIA                                                                    \
+    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    ______________HOME_ROW_GASC_L______________,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
+    ______________HOME_ROW_ALGR_L______________,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
+                        U_NA,     U_NA,    U_NA, KC_BTN1, KC_BTN3, KC_BTN2
+
+// Navigation.
+#define LAYOUT_LAYER_NAV                                                                      \
+    ________________HOME_ROW_NA________________, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, \
+    ______________HOME_ROW_GASC_L______________,    U_NU, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, \
+    ______________HOME_ROW_ALGR_L______________,    U_NU,    U_NU,    U_NU,    U_NU,    U_NU, \
+                        U_NA,     U_NA,    U_NA, KC_MSTP, KC_MPLY,    U_NA
+
+// Mouse.
+#define LAYOUT_LAYER_MOUSE                                                                    \
+    S_D_MOD, USR_PST, USR_CPY, USR_CUT, USR_UND, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
+    DPI_MOD, DRGSCRL, KC_LSFT, DRGSCRL, _______,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
+    USR_RDO, USR_PST, USR_CPY, KC_BTN3, USR_UND,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
+                      KC_BTN3, KC_BTN1, KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN2
+
+// Symbols.
+#define LAYOUT_LAYER_SYM                                                                      \
+    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, ________________HOME_ROW_NA________________, \
+    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GASC_R______________, \
+    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_MINS, ______________HOME_ROW_ALGR_R______________, \
+                         U_NA, KC_RPRN, KC_LPRN,    U_NA,    U_NA,    U_NA
+
+// Numerals.
+#define LAYOUT_LAYER_NUM                                                                      \
+    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, ________________HOME_ROW_NA________________, \
+    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GASC_R______________, \
+     KC_GRV,    KC_1,    KC_2,    KC_3, KC_UNDS, ______________HOME_ROW_ALGR_R______________, \
+                         U_NA,    KC_0, KC_MINS,    U_NA,    U_NA,    U_NA
+
+// Function keys.
+#define LAYOUT_LAYER_FUN                                                                      \
+     KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \
+     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \
+     KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
+                         U_NA,  KC_APP,  KC_TAB,    U_NA,    U_NA,    U_NA
+
+/**
+ * Add Home Row mod to a layout.
+ *
+ * Expects a 10-key per row layout.  Adds support for GASC (Gui, Alt, Shift, Ctl)
+ * home row.  The layout passed in parameter must contain at least 20 keycodes.
+ *
+ * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
+ *
+ *     HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO)
+ */
+#define _HOME_ROW_MOD_GASC(                                            \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
+    ...)                                                               \
+             L00,         L01,         L02,         L03,         L04,  \
+             R05,         R06,         R07,         R08,         R09,  \
+      LGUI_T(L10), LALT_T(L11), LSFT_T(L12), LCTL_T(L13),        L14,  \
+             R15,  RCTL_T(R16), RSFT_T(R17), LALT_T(R18), RGUI_T(R19), \
+      __VA_ARGS__
+#define HOME_ROW_MOD_GASC(...) _HOME_ROW_MOD_GASC(__VA_ARGS__)
+
+/**
+ * Add mouse layer keys to a layout.
+ *
+ * Expects a 10-key per row layout.  The layout passed in parameter must contain
+ * at least 30 keycodes.
+ *
+ * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
+ *
+ *     MOUSE_MOD(LAYOUT_LAYER_BASE_BEPO)
+ */
+#define _MOUSE_MOD(                                               \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,             \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,             \
+    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,             \
+    ...)                                                          \
+            L00,        L01,        L02,        L03,        L04,  \
+            R05,        R06,        R07,        R08,        R09,  \
+            L10,        L11,        L12,        L13,        L14,  \
+            R15,        R16,        R17,        R18,        R19,  \
+            L20, MOUSE(L21),        L22,        L23,        L24,  \
+            R25,        R26,        R27,        R28,  MOUSE(R29), \
+      __VA_ARGS__
+#define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__)
+
+#define LAYOUT_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_wrapper(
+    MOUSE_MOD(HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO))
+  ),
+  [LAYER_MBO] = LAYOUT_wrapper(LAYOUT_LAYER_MBO),
+  [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA),
+  [LAYER_NAV] = LAYOUT_wrapper(LAYOUT_LAYER_NAV),
+  [LAYER_MOUSE] = LAYOUT_wrapper(LAYOUT_LAYER_MOUSE),
+  [LAYER_SYM] = LAYOUT_wrapper(LAYOUT_LAYER_SYM),
+  [LAYER_NUM] = LAYOUT_wrapper(LAYOUT_LAYER_NUM),
+  [LAYER_FUN] = LAYOUT_wrapper(LAYOUT_LAYER_FUN),
+};
+// clang-format on
+
+#if defined(POINTING_DEVICE_ENABLE) && defined(DILEMMA_AUTO_SNIPING_ON_LAYER)
+layer_state_t layer_state_set_user(layer_state_t state) {
+    dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#endif // POINTING_DEVICE_ENABLE && DILEMMA_AUTO_SNIPING_ON_LAYER
+
+#ifdef RGB_MATRIX_ENABLE
+// Forward-declare this helper function since it is defined in rgb_matrix.c.
+void rgb_matrix_update_pwm_buffers(void);
+#endif
+
+void shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgblight_setrgb_red();
+#endif // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(RGB_RED);
+    rgb_matrix_update_pwm_buffers();
+#endif // RGB_MATRIX_ENABLE
+}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md
new file mode 100644
index 0000000000..df1f43cbcb
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md
@@ -0,0 +1,3 @@
+# Dilemma @bstiq keymap
+
+Inspired from Miryoku, using home-rows.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cbee085f26
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum dilemma_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_NAV,
+    LAYER_SYM,
+    LAYER_NUM,
+};
+
+#define NAV MO(LAYER_NAV)
+#define SYM MO(LAYER_SYM)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_split_3x5_3(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+          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_A,     NAV, CAPSWRD,     KC_SPC,     SYM,    KC_A
+  //                   ╰───────────────────────────╯ ╰──────────────────────────╯
+  ),
+
+  [LAYER_NAV] = LAYOUT_split_3x5_3(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+        KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,    XXXXXXX, KC_HOME,   KC_UP,  KC_END,  KC_DEL,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD,    XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       QK_BOOT, EEP_RST, KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                            KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A
+  //                   ╰───────────────────────────╯ ╰──────────────────────────╯
+  ),
+
+  [LAYER_SYM] = LAYOUT_split_3x5_3(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+        KC_ESC, KC_LBRC, KC_LCBR, KC_LPRN, KC_TILD,    KC_CIRC, KC_RPRN, KC_RCBR, KC_RBRC,  KC_GRV,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_MINS, KC_ASTR,  KC_EQL, KC_UNDS,  KC_DLR,    KC_HASH, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_PLUS, KC_PIPE,   KC_AT, KC_SLSH, KC_PERC,    _______, KC_BSLS, KC_AMPR, KC_QUES, KC_EXLM,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                            KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A
+  //                   ╰───────────────────────────╯ ╰──────────────────────────╯
+  ),
+
+  [LAYER_NUM] = 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_LSFT, KC_LCTL, KC_LALT, KC_LGUI,  KC_F11,     KC_F12, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                            KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A
+  //                   ╰───────────────────────────╯ ╰──────────────────────────╯
+  ),
+};
+// clang-format on
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, LAYER_NAV, LAYER_SYM, LAYER_NUM);
+}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
new file mode 100644
index 0000000000..f9aa894665
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/readme.md b/keyboards/bastardkb/dilemma/3x5_3/readme.md
new file mode 100644
index 0000000000..bfddbc9efc
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/readme.md
@@ -0,0 +1,5 @@
+# Next generation Dilemma keyboard
+
+This keyboard is an updated version of the [3x5+2 Dilemma](../3x5_2/).
+
+This is still under active development, and not available publicly yet.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
new file mode 100644
index 0000000000..73ee4ab1e0
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
+
+POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
+
+# RP2040-specific options
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
index af59efb709..7f0b5c266f 100644
--- a/keyboards/bastardkb/dilemma/config.h
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -47,3 +47,4 @@
 // Configure for the Cirque model used on the Dilemma.
 #define CIRQUE_PINNACLE_DIAMETER_MM 35
 #define CIRQUE_PINNACLE_CURVED_OVERLAY
+#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE // Circular scroll.
diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c
index e710f3aab7..793f27d2b5 100644
--- a/keyboards/bastardkb/dilemma/dilemma.c
+++ b/keyboards/bastardkb/dilemma/dilemma.c
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
@@ -316,7 +316,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
 
 void eeconfig_init_kb(void) {
     g_dilemma_config.raw                 = 0;
-    g_dilemma_config.pointer_default_dpi = 4;
+    g_dilemma_config.pointer_default_dpi = 3; // DPI=1000
     write_dilemma_config_to_eeprom(&g_dilemma_config);
     maybe_update_pointing_device_cpi(&g_dilemma_config);
     eeconfig_init_user();
@@ -327,3 +327,17 @@ void matrix_init_kb(void) {
     matrix_init_user();
 }
 #endif // POINTING_DEVICE_ENABLE
+
+// Forward declare RP2040 SDK declaration.
+void gpio_init(uint gpio);
+
+void keyboard_pre_init_user(void) {
+    // Ensures that GP26 through GP29 are initialized as digital inputs (as
+    // opposed to analog inputs).  These GPIOs are shared with A0 through A3,
+    // respectively.  On RP2040-B2 and later, the digital inputs are disabled by
+    // default (see RP2040-E6).
+    gpio_init(GP26);
+    gpio_init(GP27);
+    gpio_init(GP28);
+    gpio_init(GP29);
+}
diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h
index fbf54c804b..68d86b03ce 100644
--- a/keyboards/bastardkb/dilemma/dilemma.h
+++ b/keyboards/bastardkb/dilemma/dilemma.h
@@ -17,27 +17,18 @@
 
 #pragma once
 
-#include "quantum.h"
-
 // clang-format off
-#define LAYOUT_split_3x5_2(                             \
-  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
-                 k30, k32,     k72, k70                 \
-)                                                       \
-{                                                       \
-  {   k00,   k01,   k02,   k03,   k04 },                \
-  {   k10,   k11,   k12,   k13,   k14 },                \
-  {   k20,   k21,   k22,   k23,   k24 },                \
-  {   k30, KC_NO,   k32, KC_NO, KC_NO },                \
-  {   k40,   k41,   k42,   k43,   k44 },                \
-  {   k50,   k51,   k52,   k53,   k54 },                \
-  {   k60,   k61,   k62,   k63,   k64 },                \
-  {   k70, KC_NO,   k72, KC_NO, KC_NO },                \
-}
+#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled)
+#    include "3x5_2.h"
+#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3)
+#    include "3x5_3.h"
+#else
+#    error "Unsuported format"
+#endif
 // clang-format on
 
+#include "quantum.h"
+
 #ifdef POINTING_DEVICE_ENABLE
 #    ifndef NO_DILEMMA_KEYCODES
 enum dilemma_keycodes {
diff --git a/keyboards/bastardkb/dilemma/elitec/info.json b/keyboards/bastardkb/dilemma/elitec/info.json
deleted file mode 100644
index f5916f3ab1..0000000000
--- a/keyboards/bastardkb/dilemma/elitec/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Dilemma Elite-C",
-    "usb": {
-      "device_version": "1.0.0",
-    },
-}
diff --git a/keyboards/bastardkb/dilemma/elitec/rules.mk b/keyboards/bastardkb/dilemma/elitec/rules.mk
deleted file mode 100644
index e8326bcf09..0000000000
--- a/keyboards/bastardkb/dilemma/elitec/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/bastardkb/dilemma/info.json b/keyboards/bastardkb/dilemma/info.json
index 6764219969..989d66a177 100644
--- a/keyboards/bastardkb/dilemma/info.json
+++ b/keyboards/bastardkb/dilemma/info.json
@@ -1,46 +1,3 @@
 {
     "url": "https://bastardkb.com/dilemma",
-    "usb": {
-        "pid": "0x1835",
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"L30", "x":4, "y":3},
-                {"label":"L32", "x":5, "y":3},
-                {"label":"R32", "x":10, "y":3},
-                {"label":"R30", "x":11, "y":3}
-            ]
-        }
-    }
 }
diff --git a/keyboards/bastardkb/dilemma/readme.md b/keyboards/bastardkb/dilemma/readme.md
index ecd1f9f1c9..ac3c818bd6 100644
--- a/keyboards/bastardkb/dilemma/readme.md
+++ b/keyboards/bastardkb/dilemma/readme.md
@@ -3,12 +3,14 @@
 A very small keyboard made for ergonomic enthusiasts.
 
 -   Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
--   Hardware Supported: elite-C V4, Splinky
+-   Hardware Supported: RP2040-based controller (_eg._ Splinky, Elite-c, ...)
 -   Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
 
+A pre-assembled version (with embedded controller) is also available.
+
 Make example for this keyboard (after setting up your build environment):
 
-    make bastardkb/dilemma/elitec:default
-    make bastardkb/dilemma/splinky:default
+    make bastardkb/dilemma/3x5_2/splinky:default
+    make bastardkb/dilemma/3x5_2/assembled:default
 
 See the [keyboard build instructions](http://docs.bastardkb.com/)
diff --git a/keyboards/bastardkb/dilemma/splinky/info.json b/keyboards/bastardkb/dilemma/splinky/info.json
deleted file mode 100644
index 07ee320bb9..0000000000
--- a/keyboards/bastardkb/dilemma/splinky/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Dilemma Splinky",
-    "usb": {
-      "device_version": "1.0.0",
-    },
-}
diff --git a/keyboards/bastardkb/dilemma/splinky/rules.mk b/keyboards/bastardkb/dilemma/splinky/rules.mk
deleted file mode 100644
index 9c593c6ed8..0000000000
--- a/keyboards/bastardkb/dilemma/splinky/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
-# RP2040-specific options
-PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/blackpill/halconf.h b/keyboards/bastardkb/scylla/blackpill/halconf.h
index 0d4b7b5dc5..1ba700a80f 100644
--- a/keyboards/bastardkb/scylla/blackpill/halconf.h
+++ b/keyboards/bastardkb/scylla/blackpill/halconf.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2020 Nick Brassel (tzarc)
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
@@ -20,10 +20,8 @@
 
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
-//#define HAL_USE_I2C     TRUE
 #define HAL_USE_SPI TRUE
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#define HAL_USE_GPT TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/scylla/blackpill/mcuconf.h b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
index e7cf3681fd..2b3f30cbfe 100644
--- a/keyboards/bastardkb/scylla/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
@@ -21,39 +21,15 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 FALSE
-
-//#undef STM32_I2C_I2C1_RX_DMA_STREAM
-//#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-//#undef STM32_I2C_I2C1_TX_DMA_STREAM
-//#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
 
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
-//#undef STM32_PWM_USE_TIM3
-//#define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
-//#undef STM32_SPI_SPI1_RX_DMA_STREAM
-//#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-//#undef STM32_SPI_SPI1_TX_DMA_STREAM
-//#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
 
-//#undef STM32_SERIAL_USE_USART2
-//#define STM32_SERIAL_USE_USART2 TRUE
-
-//#undef STM32_UART_USART2_RX_DMA_STREAM
-//#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-//#undef STM32_UART_USART2_TX_DMA_STREAM
-//#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-
 #undef STM32_GPT_USE_TIM3
 #define STM32_GPT_USE_TIM3 TRUE
 
diff --git a/keyboards/bastardkb/scylla/readme.md b/keyboards/bastardkb/scylla/readme.md
index 5a83083b96..830b8eacda 100644
--- a/keyboards/bastardkb/scylla/readme.md
+++ b/keyboards/bastardkb/scylla/readme.md
@@ -6,17 +6,24 @@ A modern, low-profile split ergonomic keyboard
 * Hardware Supported: elite-C V4
 * Hardware Availability: [Bastard Keyboards](https://bastardkb.com/)
 
-Make example for this keyboard (after setting up your build environment):
+## Building the firmware
 
-    make bastardkb/scylla:default
+**You must specify the shield version when compiling/flashing the firmware.**
+
+The template is:
+
+```shell
+qmk compile -kb bastardkb/scylla/{VERSION}/elitec -km {KEYMAP}
+```
+
+| Shield Version  | default                                                       | via                                                       |
+| --------------- | ------------------------------------------------------------- | --------------------------------------------------------- |
+| v1 (Elite-C)    | `qmk compile -kb bastardkb/scylla/v1/elitec -km default`      | `qmk compile -kb bastardkb/scylla/v1/elitec -km via`      |
+| v2 (Elite-C)    | `qmk compile -kb bastardkb/scylla/v2/elitec -km default`      | `qmk compile -kb bastardkb/scylla/v2/elitec -km via`      |
+| v2 (Splinky v2) | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km default`  | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km via`  |
+| v2 (Splinky v3) | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km default`  | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km via`  |
+| v2 (STeMCell)   | `qmk compile -kb bastardkb/scylla/v2/stemcell -km default`    | `qmk compile -kb bastardkb/scylla/v2/stemcell -km via`    |
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
 See the [keyboard build instructions](https://docs.bastardkb.com)
-
-
-## Important information regarding the reset
-
-If you modify this firmware, make sure to always have a `QK_BOOT` key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
-
-Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/config.h b/keyboards/bastardkb/scylla/v2/splinky/config.h
index 5f678fb331..8bfd59d28c 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky/config.h
@@ -20,8 +20,6 @@
 /* Key matrix configuration. */
 #define MATRIX_ROW_PINS \
     { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
 
 /* Handedness. */
 #define MASTER_RIGHT
diff --git a/keyboards/bastardkb/scylla/v2/splinky/readme.md b/keyboards/bastardkb/scylla/v2/splinky/readme.md
new file mode 100644
index 0000000000..22df77bbaa
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/readme.md
@@ -0,0 +1,6 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See https://github.com/plut0nium/0xB2/#releases to figure out the right version
+for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v2/config.h b/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
new file mode 100644
index 0000000000..be0e2fb959
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v3/config.h b/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
new file mode 100644
index 0000000000..72f5c0ffa8
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP21, GP6, GP7, GP8 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
new file mode 100644
index 0000000000..578e23f40a
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F4, F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define A0 PAL_LINE(GPIOA, 0)
+// #define SPLIT_HAND_PIN A0
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+#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
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/halconf.h b/keyboards/bastardkb/scylla/v2/stemcell/halconf.h
new file mode 100644
index 0000000000..dbeb6aeaa0
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/stemcell/halconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
new file mode 100644
index 0000000000..46e33a828c
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Scylla STeMCell",
+    "usb": {
+      "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h b/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h
new file mode 100644
index 0000000000..6afebade36
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 FALSE
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
new file mode 100644
index 0000000000..39fc183e1d
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+CONVERT_TO = stemcell
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+SERIAL_DRIVER = usart
+WS2812_DRIVER = pwm
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/skeletyl/blackpill/halconf.h b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
index 0d4b7b5dc5..1ba700a80f 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/halconf.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2020 Nick Brassel (tzarc)
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
@@ -20,10 +20,8 @@
 
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
-//#define HAL_USE_I2C     TRUE
 #define HAL_USE_SPI TRUE
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#define HAL_USE_GPT TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h b/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
index e7cf3681fd..2b3f30cbfe 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
@@ -21,39 +21,15 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 FALSE
-
-//#undef STM32_I2C_I2C1_RX_DMA_STREAM
-//#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-//#undef STM32_I2C_I2C1_TX_DMA_STREAM
-//#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
 
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
-//#undef STM32_PWM_USE_TIM3
-//#define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
-//#undef STM32_SPI_SPI1_RX_DMA_STREAM
-//#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-//#undef STM32_SPI_SPI1_TX_DMA_STREAM
-//#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
 
-//#undef STM32_SERIAL_USE_USART2
-//#define STM32_SERIAL_USE_USART2 TRUE
-
-//#undef STM32_UART_USART2_RX_DMA_STREAM
-//#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-//#undef STM32_UART_USART2_TX_DMA_STREAM
-//#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-
 #undef STM32_GPT_USE_TIM3
 #define STM32_GPT_USE_TIM3 TRUE
 
diff --git a/keyboards/bastardkb/skeletyl/readme.md b/keyboards/bastardkb/skeletyl/readme.md
index 6c36b58356..5a595d338f 100644
--- a/keyboards/bastardkb/skeletyl/readme.md
+++ b/keyboards/bastardkb/skeletyl/readme.md
@@ -6,10 +6,24 @@ A very small keyboard made for ergonomic enthusiasts.
 * Hardware Supported: elite-C V4
 * Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
 
-Make example for this keyboard (after setting up your build environment):
+## Building the firmware
+
+**You must specify the shield version when compiling/flashing the firmware.**
+
+The template is:
+
+```shell
+qmk compile -kb bastardkb/skeletyl/{VERSION}/elitec -km {KEYMAP}
+```
+
+| Shield Version  | default                                                         | via                                                         |
+| --------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
+| v1 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km via`      |
+| v2 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km via`      |
+| v2 (Splinky v2) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km via`  |
+| v2 (Splinky v3) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km via`  |
+| v2 (STeMCell)   | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km default`    | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km via`    |
 
-    make bastardkb/skeletyl:default
-    
 This keyboard is made to be used with the Miryoku layout, do not use the default keymap.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/bastardkb/skeletyl/v2/splinky/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
index 02a8bd6551..c4e5b3ff90 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
@@ -20,8 +20,6 @@
 /* Key matrix configuration. */
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP28, GP15, GP6, GP7, GP8 }
 
 /* Handedness. */
 #define MASTER_RIGHT
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/readme.md b/keyboards/bastardkb/skeletyl/v2/splinky/readme.md
new file mode 100644
index 0000000000..22df77bbaa
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/readme.md
@@ -0,0 +1,6 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See https://github.com/plut0nium/0xB2/#releases to figure out the right version
+for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
new file mode 100644
index 0000000000..ac86fa83e6
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP28, GP15, GP6, GP7, GP8 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
new file mode 100644
index 0000000000..d78a36c97f
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP28, GP21, GP6, GP7, GP8 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/dilemma/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
similarity index 69%
rename from keyboards/bastardkb/dilemma/elitec/config.h
rename to keyboards/bastardkb/skeletyl/v2/stemcell/config.h
index 0f26e46fdb..44acd40e7b 100644
--- a/keyboards/bastardkb/dilemma/elitec/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
@@ -19,19 +19,30 @@
 
 /* Key matrix configuration. */
 #define MATRIX_ROW_PINS \
-    { D4, C6, F5, F7 }
+    { F7, C6, D4, B5 }
 #define MATRIX_COL_PINS \
-    { B4, B5, E6, D7, F6 }
+    { F5, B6, D7, E6, B4 }
 
 /* Handedness. */
 #define MASTER_RIGHT
 
-// To use the handedness pin, resistors need to be installed on the PCB.
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
 // If so, uncomment the following code, and undefine MASTER_RIGHT above.
-//#define SPLIT_HAND_PIN F4
-// If you've soldered the handedness pull-up on the upper side instead of the
-// left one, uncomment the following line.
-//#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
+// #define A0 PAL_LINE(GPIOA, 0)
+// #define SPLIT_HAND_PIN A0
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
 /* serial.c configuration (for split keyboard). */
 #define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+#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
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h b/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h
new file mode 100644
index 0000000000..dbeb6aeaa0
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
new file mode 100644
index 0000000000..df805a6229
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Skeletyl STeMCell",
+    "usb": {
+      "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h b/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h
new file mode 100644
index 0000000000..6afebade36
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 FALSE
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
new file mode 100644
index 0000000000..ff20b0c742
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+CONVERT_TO = stemcell
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3
+
+SERIAL_DRIVER = usart
+WS2812_DRIVER = pwm
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/tbkmini/blackpill/halconf.h b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
index 0d4b7b5dc5..1ba700a80f 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/halconf.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2020 Nick Brassel (tzarc)
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
  *
@@ -20,10 +20,8 @@
 
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
-//#define HAL_USE_I2C     TRUE
 #define HAL_USE_SPI TRUE
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#define HAL_USE_GPT TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h b/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
index e7cf3681fd..2b3f30cbfe 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
@@ -21,39 +21,15 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 FALSE
-
-//#undef STM32_I2C_I2C1_RX_DMA_STREAM
-//#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-//#undef STM32_I2C_I2C1_TX_DMA_STREAM
-//#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
 
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
-//#undef STM32_PWM_USE_TIM3
-//#define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
-//#undef STM32_SPI_SPI1_RX_DMA_STREAM
-//#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-//#undef STM32_SPI_SPI1_TX_DMA_STREAM
-//#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
 
-//#undef STM32_SERIAL_USE_USART2
-//#define STM32_SERIAL_USE_USART2 TRUE
-
-//#undef STM32_UART_USART2_RX_DMA_STREAM
-//#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-//#undef STM32_UART_USART2_TX_DMA_STREAM
-//#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-
 #undef STM32_GPT_USE_TIM3
 #define STM32_GPT_USE_TIM3 TRUE
 
diff --git a/keyboards/bastardkb/tbkmini/readme.md b/keyboards/bastardkb/tbkmini/readme.md
index 8be8200ff9..74e24ff506 100644
--- a/keyboards/bastardkb/tbkmini/readme.md
+++ b/keyboards/bastardkb/tbkmini/readme.md
@@ -6,10 +6,24 @@ A split, compact ergonomic keyboard.
 * Hardware Supported: elite-C V4
 * Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
 
-Make example for this keyboard (after setting up your build environment):
+## Building the firmware
 
-    make bastardkb/tbkmini:default
+**You must specify the shield version when compiling/flashing the firmware.**
+
+The template is:
+
+```shell
+qmk compile -kb bastardkb/tbkmini/{VERSION}/elitec -km {KEYMAP}
+```
+
+| Shield Version  | default                                                        | via                                                        |
+| --------------- | -------------------------------------------------------------- | ---------------------------------------------------------- |
+| v1 (Elite-C)    | `qmk compile -kb bastardkb/tbkmini/v1/elitec -km default`      | `qmk compile -kb bastardkb/tbkmini/v1/elitec -km via`      |
+| v2 (Elite-C)    | `qmk compile -kb bastardkb/tbkmini/v2/elitec -km default`      | `qmk compile -kb bastardkb/tbkmini/v2/elitec -km via`      |
+| v2 (Splinky v2) | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v2 -km default`  | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v2 -km via`  |
+| v2 (Splinky v3) | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v3 -km default`  | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v3 -km via`  |
+| v2 (STeMCell)   | `qmk compile -kb bastardkb/tbkmini/v2/stemcell -km default`    | `qmk compile -kb bastardkb/tbkmini/v2/stemcell -km via`    |
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-See the [keyboard build instructions](http://docs.bastardkb.com/)
\ No newline at end of file
+See the [keyboard build instructions](http://docs.bastardkb.com/)
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
index ed0b4a6a54..c4e5b3ff90 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
@@ -20,8 +20,6 @@
 /* Key matrix configuration. */
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
 
 /* Handedness. */
 #define MASTER_RIGHT
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/readme.md b/keyboards/bastardkb/tbkmini/v2/splinky/readme.md
new file mode 100644
index 0000000000..22df77bbaa
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/readme.md
@@ -0,0 +1,6 @@
+# Splinky controller
+
+The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
+
+See https://github.com/plut0nium/0xB2/#releases to figure out the right version
+for you (v2 and v3) supported.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
new file mode 100644
index 0000000000..be0e2fb959
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP15, GP6, GP7, GP8 }
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v2/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
new file mode 100644
index 0000000000..72f5c0ffa8
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_COL_PINS \
+    { GP27, GP28, GP21, GP6, GP7, GP8 }
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk
new file mode 100644
index 0000000000..c9c50319db
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v3/rules.mk
@@ -0,0 +1,2 @@
+# Intentionally blank so that QMK detects this folder as a valid keyboard
+# parameter.
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
new file mode 100644
index 0000000000..0c66a8075b
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix configuration. */
+#define MATRIX_ROW_PINS \
+    { F7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { F6, F5, B6, D7, E6, B4 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define A0 PAL_LINE(GPIOA, 0)
+// #define SPLIT_HAND_PIN A0
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
+
+/* serial.c configuration (for split keyboard). */
+#define SOFT_SERIAL_PIN D2
+
+/* RGB settings. */
+#define RGB_DI_PIN D3
+#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
+
+/* CRC. */
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h b/keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h
new file mode 100644
index 0000000000..dbeb6aeaa0
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
new file mode 100644
index 0000000000..b56c455ae3
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "TBK Mini STeMCell",
+    "usb": {
+      "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h b/keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h
new file mode 100644
index 0000000000..6afebade36
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 FALSE
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
new file mode 100644
index 0000000000..9b36bf7ed5
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+CONVERT_TO = stemcell
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x6_3
+
+SERIAL_DRIVER = usart
+WS2812_DRIVER = pwm
+
+DEBOUNCE_TYPE = asym_eager_defer_pk

From ed70f42638284449b95786479e16c0bd8026331d Mon Sep 17 00:00:00 2001
From: Sean Jasin <seangotskillz@gmail.com>
Date: Tue, 15 Nov 2022 03:33:37 -0600
Subject: [PATCH 871/959] [Keyboard] change BT LEDs so no longer hard coded in
 Anne Pro (#18934)

---
 keyboards/annepro2/annepro2.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
index 4edafe0702..b4dc03db6e 100644
--- a/keyboards/annepro2/annepro2.c
+++ b/keyboards/annepro2/annepro2.c
@@ -155,22 +155,22 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             case KC_AP2_BT1:
                 annepro2_ble_broadcast(0);
                 /* FIXME: This hardcodes col/row position */
-                ap2_led_blink(0, 1, blue, 8, 50);
+                ap2_led_blink(record->event.key.row, record->event.key.col, blue, 8, 50);
                 return false;
 
             case KC_AP2_BT2:
                 annepro2_ble_broadcast(1);
-                ap2_led_blink(0, 2, blue, 8, 50);
+                ap2_led_blink(record->event.key.row, record->event.key.col, blue, 8, 50);
                 return false;
 
             case KC_AP2_BT3:
                 annepro2_ble_broadcast(2);
-                ap2_led_blink(0, 3, blue, 8, 50);
+                ap2_led_blink(record->event.key.row, record->event.key.col, blue, 8, 50);
                 return false;
 
             case KC_AP2_BT4:
                 annepro2_ble_broadcast(3);
-                ap2_led_blink(0, 4, blue, 8, 50);
+                ap2_led_blink(record->event.key.row, record->event.key.col, blue, 8, 50);
                 return false;
 
             case KC_AP2_USB:

From 4e7f533998a3b2caefb1d12e86b29b07e285a1ce Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Tue, 15 Nov 2022 20:33:58 +1100
Subject: [PATCH 872/959] [Keyboard] Add Constellation Rev3 (#18868)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../aeboards/constellation/constellation.h    |  2 +
 .../aeboards/constellation/rev3/config.h      | 40 +++++++++
 .../aeboards/constellation/rev3/info.json     | 89 +++++++++++++++++++
 .../aeboards/constellation/rev3/readme.md     | 18 ++++
 keyboards/aeboards/constellation/rev3/rev3.c  | 18 ++++
 keyboards/aeboards/constellation/rev3/rev3.h  | 36 ++++++++
 .../aeboards/constellation/rev3/rules.mk      | 18 ++++
 7 files changed, 221 insertions(+)
 create mode 100755 keyboards/aeboards/constellation/rev3/config.h
 create mode 100644 keyboards/aeboards/constellation/rev3/info.json
 create mode 100755 keyboards/aeboards/constellation/rev3/readme.md
 create mode 100755 keyboards/aeboards/constellation/rev3/rev3.c
 create mode 100755 keyboards/aeboards/constellation/rev3/rev3.h
 create mode 100755 keyboards/aeboards/constellation/rev3/rules.mk

diff --git a/keyboards/aeboards/constellation/constellation.h b/keyboards/aeboards/constellation/constellation.h
index a467327712..3724b29d6a 100755
--- a/keyboards/aeboards/constellation/constellation.h
+++ b/keyboards/aeboards/constellation/constellation.h
@@ -23,4 +23,6 @@
     #include "rev1.h"
 #elif defined(KEYBOARD_aeboards_constellation_rev2)
     #include "rev2.h"
+#elif defined(KEYBOARD_aeboards_constellation_rev3)
+    #include "rev3.h"
 #endif
diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h
new file mode 100755
index 0000000000..bd4614f8b2
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/config.h
@@ -0,0 +1,40 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ * Copyright 2021 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
+#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json
new file mode 100644
index 0000000000..d6fbbac789
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/info.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "Constellation Rev3",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x065D",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.5},
+                {"x":11.5, "y":4, "w":1.5},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/constellation/rev3/readme.md b/keyboards/aeboards/constellation/rev3/readme.md
new file mode 100755
index 0000000000..06c3593e07
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/readme.md
@@ -0,0 +1,18 @@
+# CONSTELLATION REV3
+
+A gasket 65% keyboard by [aeboards](https://aeboards.com/)
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: CONSTELLATION
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aeboards/constellation/rev3:default
+
+Reset your keyboard in 3 ways:
+* Software reset on Fn + Backspace
+* Bootmagic reset: hold down the top left key (usually escape) and plugin the keyboard
+* Physical reset: on the back of the PCB, there is a ISP header which you should short the RST and GND together
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/aeboards/constellation/rev3/rev3.c b/keyboards/aeboards/constellation/rev3/rev3.c
new file mode 100755
index 0000000000..5c4257c9b9
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/rev3.c
@@ -0,0 +1,18 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ * Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev3.h"
diff --git a/keyboards/aeboards/constellation/rev3/rev3.h b/keyboards/aeboards/constellation/rev3/rev3.h
new file mode 100755
index 0000000000..15f37b7c20
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/rev3.h
@@ -0,0 +1,36 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ * Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ____ KC_NO
+
+#define LAYOUT_all( \
+  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, K014,  \
+  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
+  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
+  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312,             K313, K314, \
+  K400, K401, K402,             K405,                   K409, K410,             K412, K413, K414  \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
+  { K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414 } \
+}
diff --git a/keyboards/aeboards/constellation/rev3/rules.mk b/keyboards/aeboards/constellation/rev3/rules.mk
new file mode 100755
index 0000000000..d2950ac2b2
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = 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
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes

From de66797705ef0e490e5deca0545f009c351f5f45 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 16 Nov 2022 03:52:01 +1100
Subject: [PATCH 873/959] Fix some old keycodes (#19086)

---
 keyboards/a_dux/keymaps/daliusd/keymap.c                    | 4 ++--
 keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c      | 4 ++--
 keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c    | 2 +-
 keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c  | 2 +-
 keyboards/crkbd/keymaps/nimishgautam/keymap.c               | 2 +-
 keyboards/crkbd/keymaps/sharkby7e/keymap.c                  | 2 +-
 keyboards/crkbd/keymaps/thunderbird2086/layers_block.h      | 2 +-
 keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h    | 2 +-
 keyboards/handwired/twig/twig50/keymaps/default/keymap.c    | 2 +-
 keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c     | 4 ++--
 .../mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c  | 2 +-
 keyboards/planck/keymaps/rennerom/keymap.c                  | 2 +-
 keyboards/preonic/keymaps/rmeli/keymap.c                    | 2 +-
 keyboards/rocketboard_16/keycode_lookup.c                   | 2 +-
 .../minivan/keymaps/talljoe-minivan/config.h                | 4 ++--
 users/callum/callum.c                                       | 2 +-
 users/curry/process_records.h                               | 2 +-
 users/cwebster2/my_miryoku.h                                | 2 +-
 users/ericgebhart/extensions/oneshot.c                      | 4 ++--
 users/ericgebhart/layers/edge_keys.h                        | 4 ++--
 users/ericgebhart/layers/toprows.h                          | 4 ++--
 users/ericgebhart/layers/utility.h                          | 2 +-
 users/gary/gary.h                                           | 2 +-
 users/jarred/jarred.h                                       | 2 +-
 users/jjerrell/wrappers.h                                   | 2 +-
 users/kageurufu/layouts.h                                   | 2 +-
 users/kuchosauronad0/process_records.h                      | 2 +-
 users/mattly/mattly.c                                       | 2 +-
 users/miles2go/milestogo.h                                  | 2 +-
 users/muppetjones/wrappers.h                                | 2 +-
 users/pdl/pdl.h                                             | 2 +-
 users/ridingqwerty/wrappers.h                               | 2 +-
 users/rmeli/config.h                                        | 2 +-
 users/romus/romus.h                                         | 2 +-
 users/rs/rs.h                                               | 2 +-
 users/rupa/wrappers.h                                       | 6 +++---
 users/talljoe/talljoe.h                                     | 6 +++---
 users/tominabox1/wrappers.h                                 | 2 +-
 users/wanleg/wanleg.c                                       | 2 +-
 users/wanleg/wanleg.h                                       | 4 ++--
 users/xulkal/layouts.h                                      | 4 ++--
 users/xulkal/process_records.c                              | 2 +-
 users/yet-another-developer/process_records.h               | 2 +-
 43 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c
index 3da9b76057..72f2417278 100644
--- a/keyboards/a_dux/keymaps/daliusd/keymap.c
+++ b/keyboards/a_dux/keymaps/daliusd/keymap.c
@@ -189,9 +189,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MISC] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     RESET   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,KC_PSCR ,XXXXXXX ,K_PRINT ,
+     QK_BOOT ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,KC_PSCR ,XXXXXXX ,K_PRINT ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,DEBUG   ,LT_OSLNX,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,KC_MNXT ,XXXXXXX ,K_VIDEO ,
+     XXXXXXX ,XXXXXXX ,DB_TOGG ,LT_OSLNX,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,KC_MNXT ,XXXXXXX ,K_VIDEO ,
   //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_VOLD ,KC_VOLU ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
index 082a151674..b3aeaf014f 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
@@ -90,7 +90,7 @@ static uint16_t auto_pointer_layer_timer = 0;
  */
 #define LAYOUT_LAYER_FUNCTION                                                                 \
     _______________DEAD_HALF_ROW_______________, KC_PSCR,   KC_F7,   KC_F8,   KC_F9,  KC_F12, \
-    ______________HOME_ROW_GACS_L______________, KC_SLCK,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \
+    ______________HOME_ROW_GACS_L______________, KC_SCRL,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \
     _______________DEAD_HALF_ROW_______________, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,  KC_F10, \
                                _______, XXXXXXX, XXXXXXX, XXXXXXX
 
@@ -111,7 +111,7 @@ static uint16_t auto_pointer_layer_timer = 0;
  */
 #define LAYOUT_LAYER_NAVIGATION                                                               \
     _______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \
-    ______________HOME_ROW_GACS_L______________, KC_CLCK, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
+    ______________HOME_ROW_GACS_L______________, KC_CAPS, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
     _______________DEAD_HALF_ROW_______________,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
                                XXXXXXX, _______,  KC_ENT, KC_BSPC
 
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
index e8e5ccd83b..2c262521bc 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
@@ -133,7 +133,7 @@ enum bstiq_layers {
 // Function keys.
 #define LAYOUT_LAYER_FUN                                                                      \
      KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \
-     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \
+     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SCRL, ______________HOME_ROW_GASC_R______________, \
      KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
                          U_NA,  KC_APP,  KC_TAB,    U_NA,    U_NA,    U_NA
 
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
index cbee085f26..461976b276 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
        KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD,    XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       QK_BOOT, EEP_RST, KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
+       QK_BOOT, EE_CLR,  KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
                             KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A
   //                   ╰───────────────────────────╯ ╰──────────────────────────╯
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
index 508388d442..e8a476cfc5 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c
+++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_TEXT_NAV] = LAYOUT_split_3x6_3( //text nav and special navigation (lock screen, adjust layer, etc)
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      LOCK_SCREEN, KC_PSCR, SELECT_LEFT_LINE, KC_UP, SELECT_RIGHT_LINE, TD(TD_MOVE_BEGIN_LINE),                    TD(TD_MOVE_END_LINE), KC_MS_WH_UP, EMOJI_KBD, KC_TRANSPARENT, KC_TRANSPARENT, RESET,
+      LOCK_SCREEN, KC_PSCR, SELECT_LEFT_LINE, KC_UP, SELECT_RIGHT_LINE, TD(TD_MOVE_BEGIN_LINE),                    TD(TD_MOVE_END_LINE), KC_MS_WH_UP, EMOJI_KBD, KC_TRANSPARENT, KC_TRANSPARENT, QK_BOOT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       TO(_BASE), SELECT_LEFT_WD, KC_LEFT, KC_DOWN, KC_RIGHT,SELECT_RIGHT_WD,              KC_MS_WH_LEFT, KC_RGUI, KC_RSFT, KC_RALT,KC_RCTL, KC_CAPS,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/sharkby7e/keymap.c b/keyboards/crkbd/keymaps/sharkby7e/keymap.c
index e37ef9881b..9f483a27a4 100644
--- a/keyboards/crkbd/keymaps/sharkby7e/keymap.c
+++ b/keyboards/crkbd/keymaps/sharkby7e/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [3] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h b/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
index f182a1a6d8..ba41cd9223 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
+++ b/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
@@ -44,7 +44,7 @@
 #define ________________________SYMBOL_R2________________________ XXXXXXX , KC_LCBR , KC_RCBR , KC_LBRC , KC_RBRC , KC_PLUS
 
 
-#define ________________________ADJUST_L1________________________ RESET   , XXXXXXX , KC_PWR  , KC_WAKE , KC_SLEP , XXXXXXX
+#define ________________________ADJUST_L1________________________ QK_BOOT , XXXXXXX , KC_PWR  , KC_WAKE , KC_SLEP , XXXXXXX
 
 #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
 #   define ________________________ADJUST_L2________________________ RGBRST  , XXXXXXX , RGB_SPI , RGB_SAI , RGB_HUI , RGB_VAI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
index 30b1b389bc..b35ad7590d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
@@ -90,7 +90,7 @@ enum combos {
 
 #define KC_LINX KC_LINUX
 
-#define KC_RESET RESET
+#define KC_RESET QK_BOOT
 #define KC_RST KC_RESET
 
 #define OS_GIT OSL(GIT)
diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
index 3d4b29e621..1fb29d5a4a 100644
--- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
+++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // Layer 1, Space-modifiers: Basic keys
   LAYOUT_diag_4x14(
-    RESET,            KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP,      KC_BTN2, KC_INT1, KC_MINS, KC_EQL,  KC_INT3, SFT_LBR, KC_TRNS,
+    QK_BOOT,          KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP,      KC_BTN2, KC_INT1, KC_MINS, KC_EQL,  KC_INT3, SFT_LBR, KC_TRNS,
     KC_TRNS,          KC_AGIN, KC_FIND, KC_PGUP, KC_PGDN, KC_F19,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_ENT,  SFT_7,   SFT_2,
     KC_TRNS, KC_TRNS, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, KC_APP,       KC_BSPC, KC_DEL,  KC_RBRC, KC_BSLS, KC_HOME,          KC_END,
     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,               RCT_IN7, RGU_IN8, KC_TRNS, KC_INT2, KC_INT4,          MU_MOD
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c b/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
index b7043ef640..9520a116fd 100644
--- a/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
@@ -179,8 +179,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case MACRO_KVM_TG:
             if (record->event.pressed) {
                 register_code(KC_LSFT);
-                tap_code(KC_NUMLOCK);
-                tap_code(KC_NUMLOCK);
+                tap_code(KC_NUM);
+                tap_code(KC_NUM);
                 unregister_code(KC_LSFT);
                 tap_code(KC_LCTL);
             }
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
index d4f49b209d..3412a843a2 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [0] = LAYOUT_65_iso_blocker_tsangan_split_bs(
-        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_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,
diff --git a/keyboards/planck/keymaps/rennerom/keymap.c b/keyboards/planck/keymaps/rennerom/keymap.c
index 6423d848ab..67394b8964 100644
--- a/keyboards/planck/keymaps/rennerom/keymap.c
+++ b/keyboards/planck/keymaps/rennerom/keymap.c
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 [_ADJUST] = LAYOUT_planck_grid(
-    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DB_TOGG,  RESET,
+    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DB_TOGG,  QK_BOOT,
     _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    RGB_RMOD, RGB_MOD,  RGB_SAD,  RGB_SAI,  _______,  _______,  _______,
     _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   RGB_SPD,  RGB_SPI,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
diff --git a/keyboards/preonic/keymaps/rmeli/keymap.c b/keyboards/preonic/keymaps/rmeli/keymap.c
index da6269129e..b12dffe4b0 100644
--- a/keyboards/preonic/keymaps/rmeli/keymap.c
+++ b/keyboards/preonic/keymaps/rmeli/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_wrapper(
   QK_BOOT, _________________NONE_5x___________________, ______________________NONE_6x_______________________,
   XXXXXXX, MU_ON,   AU_ON,   MI_ON,   XXXXXXX, XXXXXXX, _______________CONFIG_R1_x5________________,  QWERTY,
-  RESET,   MU_MOD,  AU_TOG,  MI_TOG,  XXXXXXX, XXXXXXX, _______________CONFIG_R2_x5________________, XXXXXXX,
+  QK_BOOT, MU_MOD,  AU_TOG,  MI_TOG,  XXXXXXX, XXXXXXX, _______________CONFIG_R2_x5________________, XXXXXXX,
   XXXXXXX, MU_OFF,  AU_OFF,  MI_OFF,  XXXXXXX, XXXXXXX, _______________CONFIG_R3_x5________________, COLEMAK,
   ______________________BLANK_6x______________________, ______________________BLANK_6x______________________
 )
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 59de0e64f3..3b9257068f 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -287,7 +287,7 @@ lookup_table_t lookup_table[333] =
  {"KC_LT", KC_LT},
  {"KC_GT", KC_GT},
  {"KC_QUES", KC_QUES},
- {"RESET", QK_BOOT},
+ {"QK_BOOT", QK_BOOT},
  {"DB_TOGG", DB_TOGG},
  {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},
  {"QK_GESC", QK_GESC},
diff --git a/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
index 89980614e1..7ecb2353dd 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
@@ -59,7 +59,7 @@
 )
 
 #define TEMPLATE_RESET LAYOUT_arrow( \
-    RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, \
+    QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, \
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-    KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, RESET)
+    KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, QK_BOOT)
diff --git a/users/callum/callum.c b/users/callum/callum.c
index b3254a9cfa..73367e8e57 100644
--- a/users/callum/callum.c
+++ b/users/callum/callum.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [NAV] = LAYOUT_callum(
-        KC_TAB,  SW_WIN,  TABL,    TABR,    KC_VOLU, RESET,   HOME,    KC_UP,   END,     KC_DEL,
+        KC_TAB,  SW_WIN,  TABL,    TABR,    KC_VOLU, QK_BOOT, HOME,    KC_UP,   END,     KC_DEL,
         OS_SHFT, OS_CTRL, OS_ALT,  OS_CMD,  KC_VOLD, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
         SPCL,    SPC_R,   BACK,    FWD,     KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT,
                                    _______, _______, _______, _______
diff --git a/users/curry/process_records.h b/users/curry/process_records.h
index 605abdfae2..4db25c34e1 100644
--- a/users/curry/process_records.h
+++ b/users/curry/process_records.h
@@ -62,7 +62,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 #   define WORKMAN KC_WORKMAN
 #endif
 
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 
 #if defined(SWAP_HANDS_ENABLE)
 #    define KC_C1R3 SH_T(KC_TAB)
diff --git a/users/cwebster2/my_miryoku.h b/users/cwebster2/my_miryoku.h
index 8b167cd619..c4b4b59a1d 100644
--- a/users/cwebster2/my_miryoku.h
+++ b/users/cwebster2/my_miryoku.h
@@ -35,7 +35,7 @@
 #define _______NAKED_R___T____ KC_ENT,   KC_BSPC,  KC_DEL
 #define _______NAKED_L___T____ KC_ESC,   KC_SPC,   KC_TAB
 
-#define _______INACTIVE_R1____ KC_LOCK,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RESET
+#define _______INACTIVE_R1____ KC_LOCK,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT
 #define _______INACTIVE_R2____ KC_TRNS,  KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI
 #define _______INACTIVE_R3____ KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_RALT,  KC_TRNS
 
diff --git a/users/ericgebhart/extensions/oneshot.c b/users/ericgebhart/extensions/oneshot.c
index 83c8a04363..55c2fa1ae3 100644
--- a/users/ericgebhart/extensions/oneshot.c
+++ b/users/ericgebhart/extensions/oneshot.c
@@ -125,10 +125,10 @@ int8_t update_oneshot_modifiers(uint16_t keycode, keyrecord_t *record, int8_t ke
 // registers/unregisters a mod to the operating system on state change if necessary
 void update_modifier(oneshot_mod osmod, oneshot_state previous_state, oneshot_state current_state) {
     if (previous_state == ONESHOT_STATE_OFF) {
-        register_code(KC_LCTRL + osmod);
+        register_code(KC_LCTL + osmod);
     } else {
         if (current_state == ONESHOT_STATE_OFF) {
-            unregister_code(KC_LCTRL + osmod);
+            unregister_code(KC_LCTL + osmod);
         }
     }
 }
diff --git a/users/ericgebhart/layers/edge_keys.h b/users/ericgebhart/layers/edge_keys.h
index 0794b91a02..107434750b 100644
--- a/users/ericgebhart/layers/edge_keys.h
+++ b/users/ericgebhart/layers/edge_keys.h
@@ -367,13 +367,13 @@
 // all others are handled through macros.
 
 #define ___5_BOTTOM_LEFT___  ___X2___,  KC_INS,  KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLASH, ___X2___
+#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLS, ___X2___
 
 #define ___5_BOTTOM_LEFT_EN___  ___5_BOTTOM_LEFT___
 #define ___5_BOTTOM_RIGHT_EN___  ___5_BOTTOM_RIGHT___
 
 #define ___4_BOTTOM_LEFT___  LCTL(KC_V),  KC_INS,  KC_LEFT,   KC_RIGHT
-#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLASH, LCTL(KC_C)
+#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLS, LCTL(KC_C)
 
 #define ___4_BOTTOM_LEFT_EN___  ___4___ //___4_BOTTOM_LEFT___
 #define ___4_BOTTOM_RIGHT_EN___  ___4___ //___4_BOTTOM_RIGHT___
diff --git a/users/ericgebhart/layers/toprows.h b/users/ericgebhart/layers/toprows.h
index 351df442ed..3ae1c4665b 100644
--- a/users/ericgebhart/layers/toprows.h
+++ b/users/ericgebhart/layers/toprows.h
@@ -25,8 +25,8 @@
 /*******************************************************************/
 // Kinesis function key row. I don't use them. but might as well define them.
 #define ___KINTFUNC_L___ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8
-// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET
-#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, RESET
+// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_FN0, QK_BOOT
+#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, QK_BOOT
 
 // A TOPROWS Layer.
 // set it how you like it, if you like it.
diff --git a/users/ericgebhart/layers/utility.h b/users/ericgebhart/layers/utility.h
index a688f8196d..dab0bb4f41 100644
--- a/users/ericgebhart/layers/utility.h
+++ b/users/ericgebhart/layers/utility.h
@@ -74,7 +74,7 @@
 #define ___ADJUST_L3___ ___RGB_HUE_SAT_INT_DN___,       KC_RGB_T
 
 #define ___ADJUST_R1___  ___, KC_MAKE, VRSN, MG_NKRO, KC_RESET
-#define ___ADJUST_R2___  EEP_RST, ___PRV_PLAY_NXT_STOP___,
+#define ___ADJUST_R2___  EE_CLR, ___PRV_PLAY_NXT_STOP___,
 #define ___ADJUST_R3___  MG_NKRO, ___VDN_MUTE_VUP___, RGB_IDL
 /********************************************************************************/
 /* The Adjust LAYER Chunks                                                      */
diff --git a/users/gary/gary.h b/users/gary/gary.h
index ce920cf776..adf25b9a75 100644
--- a/users/gary/gary.h
+++ b/users/gary/gary.h
@@ -16,7 +16,7 @@ enum custom_keycodes {
   RAISE,
 };
 
-#define KC_RST RESET
+#define KC_RST QK_BOOT
 #define KC_ KC_TRNS
 
 #define KC_LOWR MO(_LOWER) // Lower layer
diff --git a/users/jarred/jarred.h b/users/jarred/jarred.h
index 49b1253be5..cec407da7f 100644
--- a/users/jarred/jarred.h
+++ b/users/jarred/jarred.h
@@ -110,7 +110,7 @@ enum {
 #define NUMPAD_L3  _______, _______, _______, _______, RGB_VAD, RGB_VAI
 #define NUMPAD_L4  _______, _______, _______, _______, RGB_SPD, RGB_SPI
 
-#define NUMPAD_R1                                                        DF(_QW),DF(_GAME), _______, _______, _______,   RESET
+#define NUMPAD_R1                                                        DF(_QW),DF(_GAME), _______, _______, _______, QK_BOOT
 #define NUMPAD_R2                                                        _______, _______, _______, _______, _______, _______
 #define NUMPAD_R3                                                           VRSN, _______, _______, _______, _______, _______ 
 #define NUMPAD_R4                                                        _______, _______, _______, _______, _______, _______ 
diff --git a/users/jjerrell/wrappers.h b/users/jjerrell/wrappers.h
index 87aa8e250f..39e579cbfa 100644
--- a/users/jjerrell/wrappers.h
+++ b/users/jjerrell/wrappers.h
@@ -319,7 +319,7 @@
 #define __________________RAISE_R3___________________   KC_AT,   KC_QUOT, KC_DQUO, KC_PLUS, KC_CIRC
 
 // Adjust
-#define __________________ADJUST_L1__________________   KC_MAKE, DB_TOGG, RESET,   XXXXXXX, XXXXXXX
+#define __________________ADJUST_L1__________________   KC_MAKE, DB_TOGG, QK_BOOT, XXXXXXX, XXXXXXX
 #define __________________ADJUST_L2__________________   KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT
 #define __________________ADJUST_L3__________________   KC_VRSN, AU_ON,   AU_OFF,  CG_SWAP, CG_NORM
 
diff --git a/users/kageurufu/layouts.h b/users/kageurufu/layouts.h
index eccfa0700e..edf64c0b39 100644
--- a/users/kageurufu/layouts.h
+++ b/users/kageurufu/layouts.h
@@ -46,7 +46,7 @@
 
 
 #define _________________ADJUST_L1_________________     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6
-#define _________________ADJUST_L2_________________     _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET,   _______
+#define _________________ADJUST_L2_________________     _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______
 #define _________________ADJUST_L3_________________     _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST,  _______
 #define _________________ADJUST_L4_________________     _______, _______, _______, _______, _______, _______
 #define _________________ADJUST_L5_________________     _______, _______, _______, _______, _______, _______
diff --git a/users/kuchosauronad0/process_records.h b/users/kuchosauronad0/process_records.h
index d3d4c4fe83..0e1c1ceadd 100644
--- a/users/kuchosauronad0/process_records.h
+++ b/users/kuchosauronad0/process_records.h
@@ -84,7 +84,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 #define WORKMAN  KC_WORKMAN
 #define PLOVER   KC_PLOVER
 
-#define KC_RESET RESET
+#define KC_RESET QK_BOOT
 #define KC_RST   KC_RESET
 
 #define UC_IRNY  UC(0x2E2E)
diff --git a/users/mattly/mattly.c b/users/mattly/mattly.c
index d097c8cd7b..eb6536a7f1 100644
--- a/users/mattly/mattly.c
+++ b/users/mattly/mattly.c
@@ -57,7 +57,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             set_lights_default();
             #endif
             return true;
-        case RESET:
+        case QK_BOOT:
             #ifdef RGBLIGHT_ENABLE
             rgblight_sethsv_noeeprom(HSV_RESET);
             #endif
diff --git a/users/miles2go/milestogo.h b/users/miles2go/milestogo.h
index 81fc02ded1..c57c0cf7a2 100644
--- a/users/miles2go/milestogo.h
+++ b/users/miles2go/milestogo.h
@@ -69,7 +69,7 @@ enum userspace_custom_keycodes {
 
 #define QWERTY KC_QWERTY
 #define COLEMAK KC_CDH
-#define KC_RESET RESET
+#define KC_RESET QK_BOOT
 
 #if (!defined(LAYOUT) && defined(KEYMAP))
 #    define LAYOUT KEYMAP
diff --git a/users/muppetjones/wrappers.h b/users/muppetjones/wrappers.h
index 7a6d702dad..9bcf81857c 100644
--- a/users/muppetjones/wrappers.h
+++ b/users/muppetjones/wrappers.h
@@ -65,7 +65,7 @@
  * `----------------------------------' `----------------------------------'
  */
  // NOTE: The "BACKLIT" keycode is planck specific
-#define __ADJUST_L1________________________________ RESET,   DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX
+#define __ADJUST_L1________________________________ QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX
 #define __ADJUST_L2________________________________ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD
 #define __ADJUST_L3________________________________ XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX
 
diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h
index 394f79f2f3..4079ba9d33 100644
--- a/users/pdl/pdl.h
+++ b/users/pdl/pdl.h
@@ -128,7 +128,7 @@ enum userspace_layers {
 
 #define _________________FUNCTN_L1_________________  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   MY_AF4
 #define _________________FUNCTN_L2_________________  KC_APP,  KC_F4,   KC_F5,   KC_F6,   MY_CF5
-#define _________________FUNCTN_L3_________________  RESET,   KC_F7,   KC_F8,   KC_F9,   MY_CF4
+#define _________________FUNCTN_L3_________________  QK_BOOT, KC_F7,   KC_F8,   KC_F9,   MY_CF4
 
 #define _________________FUNCTN_R1_________________  KC_VOLU, KC_F10,  KC_F11,  KC_F12,  KC_INS
 #define _________________FUNCTN_R2_________________  KC_VOLD, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT
diff --git a/users/ridingqwerty/wrappers.h b/users/ridingqwerty/wrappers.h
index f4f3de91f1..dbfd8ea050 100644
--- a/users/ridingqwerty/wrappers.h
+++ b/users/ridingqwerty/wrappers.h
@@ -98,7 +98,7 @@
 #define ________________DEBUG_L3___________________        _______, _______, _______, VERSION, _______
 
 #define ________________DEBUG_R1___________________        VPRWAVE, STRAYA,  _______, TESTING, _______
-#define ________________DEBUG_R2___________________        _______, _______, EE_CLR,  RESET,   MAKE
+#define ________________DEBUG_R2___________________        _______, _______, EE_CLR,  QK_BOOT, MAKE
 #define ________________DEBUG_R3___________________        QWERTY,  DVORAK,  COLEMAK, _______, _______
 
 
diff --git a/users/rmeli/config.h b/users/rmeli/config.h
index 1a6db91d1b..5c31462d35 100644
--- a/users/rmeli/config.h
+++ b/users/rmeli/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 200
 
 #ifdef UNICODEMAP_ENABLE
-#    define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
+#    define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
 #endif
 
 #ifdef AUTO_SHIFT_ENABLED
diff --git a/users/romus/romus.h b/users/romus/romus.h
index f79777d91b..a3d6db9523 100644
--- a/users/romus/romus.h
+++ b/users/romus/romus.h
@@ -231,7 +231,7 @@ enum {
  * |Musir|     |     |     |     |Vol +||Vol -| Prev| Stop|TogMu| Next|     |
  * `------------------------------------------------------------------------' */
 #define SETTINGS \
-    BL_STEP,KC_F1,  KC_F2,  KC_F3,  KC_F4,  UNI_LI, UNI_WN, KC_WAKE,_______,RGB_HUD,RGB_HUI,RESET  , \
+    BL_STEP,KC_F1,  KC_F2,  KC_F3,  KC_F4,  UNI_LI, UNI_WN, KC_WAKE,_______,RGB_HUD,RGB_HUI,QK_BOOT, \
     _______,KC_F5,  KC_F6,  KC_F7,  KC_F8,  _______,KC_MUTE,_______,RGB_TOG,RGB_SAD,RGB_SAI,_______, \
     K_GAMES,KC_F9,  KC_F10, KC_F11, KC_F12, KC_MUTE,_______,KC_PSCR,RGB_MOD,RGB_VAD,RGB_VAI,_______, \
     MU_TOG, _______,_______,_______,_______,KC_VOLU,KC_VOLD,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,_______
diff --git a/users/rs/rs.h b/users/rs/rs.h
index d19b887f48..ecd9a06de6 100644
--- a/users/rs/rs.h
+++ b/users/rs/rs.h
@@ -27,7 +27,7 @@ enum custom_keycodes {
 #define KC_CODE MO(_CODE)
 #define KC_BCOD LT(_CODE, KC_BSPC)
 #define KC_FN   MO(_FN)
-#define KC_RST  RESET
+#define KC_RST  QK_BOOT
 #define KC_CTRA LCTL(KC_A)
 #define KC_CTRE LCTL(KC_E)
 #define KC_BLTG BL_TOGG
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h
index b5794c8fad..dfc00b5120 100644
--- a/users/rupa/wrappers.h
+++ b/users/rupa/wrappers.h
@@ -109,14 +109,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
  */
 #define ____65_ADJUST______________ROW1    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______
-#define ____65_ADJUST______________ROW2    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______
+#define ____65_ADJUST______________ROW2    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______
 #define ____65_ADJUST______________ROW3    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______
 #define ____65_ADJUST______________ROW4    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_NEXT, _______, _______
 #define ____65_ADJUST______________ROW5    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
 
-#define ____65_ADJUST__________RGB_ROW2    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, RESET,   _______
+#define ____65_ADJUST__________RGB_ROW2    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, QK_BOOT, _______
 #define ____65_ADJUST__________RGB_ROW3    _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______
 
-#define ____65_ADJUST___________BL_ROW2    _______, BL_TOGG, BL_BRTG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______
+#define ____65_ADJUST___________BL_ROW2    _______, BL_TOGG, BL_BRTG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______
 
 // clang-format on
diff --git a/users/talljoe/talljoe.h b/users/talljoe/talljoe.h
index cdb01a9744..23dabdd883 100644
--- a/users/talljoe/talljoe.h
+++ b/users/talljoe/talljoe.h
@@ -176,9 +176,9 @@ enum layers {
 
 #ifndef TEMPLATE_RESET
   #define TEMPLATE_RESET TEMPLATE_ALT( \
-      RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  ,  \
-      RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  ,           \
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,  \
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,           \
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,           \
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,           \
-      RESET  , XXXXXXX, XXXXXXX,                   XXXXXXX, RESET  , XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX)
+      QK_BOOT, XXXXXXX, XXXXXXX,                   XXXXXXX, QK_BOOT, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX)
 #endif
diff --git a/users/tominabox1/wrappers.h b/users/tominabox1/wrappers.h
index c5aeadae38..f7f4c7fd23 100644
--- a/users/tominabox1/wrappers.h
+++ b/users/tominabox1/wrappers.h
@@ -49,7 +49,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
 #define ___________________FKEY4___________________       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_TRNS,   KC_NO, KC_NO
 
 // Dimple Adjust layer
-#define ___________________ADJST1__________________       RESET,RGBRST,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+#define ___________________ADJST1__________________       QK_BOOT,RGBRST,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
 #define ___________________ADJST2__________________       RGB_M_P,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
 #define ___________________ADJST3__________________       RGB_MOD,   RGB_HUI,   RGB_HUD,   RGB_M_SN,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
 #define ___________________ADJST4__________________       RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_TRNS,   KC_NO,   KC_NO
diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c
index b056f5dd96..c8ca77676b 100644
--- a/users/wanleg/wanleg.c
+++ b/users/wanleg/wanleg.c
@@ -124,7 +124,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
   //on RESET, underglow red if present
-  case RESET:
+  case QK_BOOT:
       if (record->event.pressed) {
 		  #if defined(RGBLIGHT_ENABLE)
 		  rgblight_enable_noeeprom(); // enables Rgb, without saving settings
diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h
index 3c5901de41..a9d1bbf6a6 100644
--- a/users/wanleg/wanleg.h
+++ b/users/wanleg/wanleg.h
@@ -169,7 +169,7 @@ enum {
  * | Sft//Cp| CAPS   |        |        |        | C-A-D  | mScrL  | mScrR  | ALT    |  DEL   |
  * '-----------------------------------------------------------------------------------------'
  */
-#define _______________Gherkin_ETC_0_______________			KC_GRV, 		KC_MS_U, _______,KC_ESC,  RESET,   KC_RSFT, 			KC_WH_D, KC_WH_U, _______, KC_BSLS
+#define _______________Gherkin_ETC_0_______________			KC_GRV, 		KC_MS_U, _______,KC_ESC,  QK_BOOT, KC_RSFT, 			KC_WH_D, KC_WH_U, _______, KC_BSLS
 #define _______________Gherkin_ETC_1_______________			KC_MS_L, 		KC_MS_D, KC_MS_R,_______, KC_LSFT, KC_BTN3, 			KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT
 #define _______________Gherkin_ETC_2_______________			TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)),	KC_WH_L, KC_WH_R, KC_LALT, KC_DEL
 
@@ -219,7 +219,7 @@ enum {
  * |        |        |        |        |        |        |        |        |        |        |        |        |
  * '-----------------------------------------------------------------------------------------------------------'
  */
-#define ________________SUPRA_Row_0________________   RESET,   KC_TAB,  KC_UP,   _______, KC_INS,  KC_LCTL, KC_RSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL,  KC_DEL
+#define ________________SUPRA_Row_0________________   QK_BOOT, KC_TAB,  KC_UP,   _______, KC_INS,  KC_LCTL, KC_RSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL,  KC_DEL
 #define ________________SUPRA_Row_1________________   _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_RCTL, KC_PGDN, KC_END,  KC_LBRC, KC_RBRC, KC_BSLS
 #define ________________SUPRA_Row_2________________   _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______
 #define ________________SUPRA_Row_3________________   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index ccf466166e..9eec97ac6e 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -81,7 +81,7 @@
   */
 
 #define __________________LOWER_L1_________________ _______,  RGB_RMOD, RGB_MOD,  RGB_TOG,  _______,  _______
-#define __________________LOWER_L2_________________ RGB_SPI,  RGB_SAI,  RGB_VAI,  RGB_HUI,  RESET,    _______
+#define __________________LOWER_L2_________________ RGB_SPI,  RGB_SAI,  RGB_VAI,  RGB_HUI,  QK_BOOT,  _______
 #define __________________LOWER_L3_________________ RGB_SPD,  RGB_SAD,  RGB_VAD,  RGB_HUD,  RGBRST,   _______
 #define __________________LOWER_L4_________________ _______,  _______,  _______,  _______,  _______,  _______
 #define __________________LOWER_L5_________________ _______,  _______,  _______,  _______,  _______,  _______
@@ -107,7 +107,7 @@
   */
 
 #define _________________ADJUST_L1_________________ _______,  _______,  _______,  _______,  _______,  _______
-#define _________________ADJUST_L2_________________ _______,  RESET,    DB_TOGG,  _______,  _______,  _______
+#define _________________ADJUST_L2_________________ _______,  QK_BOOT,  DB_TOGG,  _______,  _______,  _______
 #define _________________ADJUST_L3_________________ _______,  _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM
 #define _________________ADJUST_L4_________________ _______,  MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON
 #define _________________ADJUST_L5_________________ _______,  _______,  _______,  _______,  _______,  _______
diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c
index 47996110bb..804dd4677a 100644
--- a/users/xulkal/process_records.c
+++ b/users/xulkal/process_records.c
@@ -29,7 +29,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
                 rgb_reset();
 #endif
             return false;
-        case RESET:
+        case QK_BOOT:
             {
                 if (record->event.pressed)
                     reset_timer = timer_read() + 500;
diff --git a/users/yet-another-developer/process_records.h b/users/yet-another-developer/process_records.h
index d4576f541e..d4b9e21326 100644
--- a/users/yet-another-developer/process_records.h
+++ b/users/yet-another-developer/process_records.h
@@ -80,7 +80,7 @@ bool process_record_keymap( uint16_t keycode, keyrecord_t *record);
 #define WORKMAN KC_WORKMAN
 #define UNICODE KC_UNICODE
 
-#define KC_RESET RESET
+#define KC_RESET QK_BOOT
 #define KC_RST KC_RESET
 
 #define BK_LWER LT(_LOWER, KC_BSPC)

From c21b77fbd2ef72c04894006fb16d6fd6f511114d Mon Sep 17 00:00:00 2001
From: David Kosorin <david@kosorin.net>
Date: Tue, 15 Nov 2022 17:53:57 +0100
Subject: [PATCH 874/959] Fix typo (#19035)

Swap Hands on/off - it's `SH_ON/OFF` not `SW_ON/OFF`
---
 docs/keycodes.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index d0ba8e25bf..b172e13306 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -763,8 +763,8 @@ See also: [Swap Hands](feature_swap_hands.md)
 |Key        |Description                                                              |
 |-----------|-------------------------------------------------------------------------|
 |`SH_T(key)`|Sends `key` with a tap; momentary swap when held.                        |
-|`SW_ON`    |Turns on swapping and leaves it on.                                      |
-|`SW_OFF`   |Turn off swapping and leaves it off. Good for returning to a known state.|
+|`SH_ON`    |Turns on swapping and leaves it on.                                      |
+|`SH_OFF`   |Turn off swapping and leaves it off. Good for returning to a known state.|
 |`SH_MON`   |Swaps hands when pressed, returns to normal when released (momentary).   |
 |`SH_MOFF`  |Momentarily turns off swap.                                              |
 |`SH_TG`    |Toggles swap on and off with every key press.                            |

From 7e843d0eca7c9189425b9ee9660d23b03342d03c Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Tue, 15 Nov 2022 18:54:45 +0200
Subject: [PATCH 875/959] keyboards/anavi: Add ANAVI Knob 1 (#18623)

ANAVI Knob 1 is a mini mechanical keyboard with a clickable rotary
encoder, USB-C, RP2040 microcontroller and I2C slot for a display.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 keyboards/anavi/knob1/config.h                | 34 +++++++++++
 keyboards/anavi/knob1/info.json               | 60 +++++++++++++++++++
 .../anavi/knob1/keymaps/default/keymap.c      | 16 +++++
 keyboards/anavi/knob1/knob1.c                 | 59 ++++++++++++++++++
 keyboards/anavi/knob1/knob1.h                 | 30 ++++++++++
 keyboards/anavi/knob1/mcuconf.h               | 12 ++++
 keyboards/anavi/knob1/readme.md               | 21 +++++++
 keyboards/anavi/knob1/rules.mk                |  6 ++
 8 files changed, 238 insertions(+)
 create mode 100644 keyboards/anavi/knob1/config.h
 create mode 100644 keyboards/anavi/knob1/info.json
 create mode 100644 keyboards/anavi/knob1/keymaps/default/keymap.c
 create mode 100644 keyboards/anavi/knob1/knob1.c
 create mode 100644 keyboards/anavi/knob1/knob1.h
 create mode 100644 keyboards/anavi/knob1/mcuconf.h
 create mode 100644 keyboards/anavi/knob1/readme.md
 create mode 100644 keyboards/anavi/knob1/rules.mk

diff --git a/keyboards/anavi/knob1/config.h b/keyboards/anavi/knob1/config.h
new file mode 100644
index 0000000000..f677aa9b23
--- /dev/null
+++ b/keyboards/anavi/knob1/config.h
@@ -0,0 +1,34 @@
+// Copyright 2022 Leon Anavi <leon@anavi.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/* Keyboard Matrix Assignments */
+// clang-format off
+#define DIRECT_PINS { \
+    { GP26 }  \
+}
+
+#define RGBLIGHT_DEFAULT_MODE 9
+
+/* Double tap reset button to enter bootloader */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+
+#define I2C_DRIVER I2CD2
+#define I2C1_SDA_PIN GP6
+#define I2C1_SCL_PIN GP7
+
+#ifdef OLED_ENABLE
+#   define OLED_DISPLAY_128X64
+#   define OLED_TIMEOUT 60000
+#   define OLED_BRIGHTNESS 128
+#endif
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
new file mode 100644
index 0000000000..7ed1767a24
--- /dev/null
+++ b/keyboards/anavi/knob1/info.json
@@ -0,0 +1,60 @@
+{
+    "keyboard_name": "Knob 1",
+    "manufacturer": "ANAVI",
+    "url": "https://github.com/AnaviTechnology/anavi-knob-1",
+    "maintainer": "leon-anavi",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "debounce": 5,
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+	"rgblight": true
+    },
+    "rgblight": {
+        "pin": "GP12",
+        "led_count": 1,
+	"hue_steps": 10,
+	"saturation_steps": 17,
+        "brightness_steps": 17,
+	"max_brightness": 255,
+	"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
+        }
+    },
+    "encoder": {
+	"enabled": true,
+        "rotary": [
+            {
+		    "pin_a": "GP27",
+		    "pin_b": "GP28",
+		    "resolution": 2
+	    }
+        ]
+    },
+    "layouts": {
+        "LAYOUT_k1": {
+            "layout": [
+                { "label":"Mute", "x": 0, "y": 0 }
+            ]
+        }
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x9A25",
+        "vid": "0xFEED"
+    }
+}
diff --git a/keyboards/anavi/knob1/keymaps/default/keymap.c b/keyboards/anavi/knob1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a17be455e4
--- /dev/null
+++ b/keyboards/anavi/knob1/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2022 Leon Anavi <leon@anavi.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+//#include <stdio.h>
+
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_k1(
+        KC_MUTE
+    )
+};
diff --git a/keyboards/anavi/knob1/knob1.c b/keyboards/anavi/knob1/knob1.c
new file mode 100644
index 0000000000..cfc3ac8a65
--- /dev/null
+++ b/keyboards/anavi/knob1/knob1.c
@@ -0,0 +1,59 @@
+// Copyright 2022 Leon Anavi <leon@anavi.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "encoder.h"
+#include <stdio.h>
+
+void keyboard_post_init_kb(void) {
+    // Enable RGB LED
+    setPinOutput(GP11);
+    writePinHigh(GP11);
+    rgblight_enable();
+
+    // Offload to the user func
+    keyboard_post_init_user();
+}
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return true;
+}
+#endif
+
+#ifdef OLED_ENABLE
+
+bool oled_task_kb(void) {
+
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    // Host Keyboard Layer Status
+    oled_write_ln_P(PSTR("ANAVI Knob 1"), false);
+    oled_write_ln_P(PSTR("Keymap: Default"), false);
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(PSTR("Num Lock: "), false);
+    oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
+    oled_write_P(PSTR("Caps Lock: "), false);
+    oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
+    oled_write_P(PSTR("Scroll Lock: "), false);
+    oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false);
+#ifdef RGBLIGHT_ENABLE
+    static char rgbStatusLine1[26] = {0};
+    snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
+    oled_write_ln(rgbStatusLine1, false);
+    static char rgbStatusLine2[26] = {0};
+    snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
+    oled_write_ln(rgbStatusLine2, false);
+#endif
+    return false;
+}
+#endif
diff --git a/keyboards/anavi/knob1/knob1.h b/keyboards/anavi/knob1/knob1.h
new file mode 100644
index 0000000000..c48170928c
--- /dev/null
+++ b/keyboards/anavi/knob1/knob1.h
@@ -0,0 +1,30 @@
+/* Copyright 2022 Leon Anavi <leon@anavi.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+// clang-format off
+ #define LAYOUT_k1(  \
+   K02 \
+ ) \
+ { \
+   { K02 } \
+ }
+// clang-format on
diff --git a/keyboards/anavi/knob1/mcuconf.h b/keyboards/anavi/knob1/mcuconf.h
new file mode 100644
index 0000000000..eb1c98372f
--- /dev/null
+++ b/keyboards/anavi/knob1/mcuconf.h
@@ -0,0 +1,12 @@
+// Copyright 2022 Leon Anavi (@leon-anavi)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 FALSE
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/anavi/knob1/readme.md b/keyboards/anavi/knob1/readme.md
new file mode 100644
index 0000000000..08f8f92197
--- /dev/null
+++ b/keyboards/anavi/knob1/readme.md
@@ -0,0 +1,21 @@
+# ANAVI Knob 1
+
+Mini mechanical keyboard with a clickable rotary encoder, USB-C, RP2040 microcontroller and I2C slot.
+
+* Keyboard Maintainer: [Leon Anavi](https://github.com/leon-anavi)
+* Hardware Supported: ANAVI Knob 1
+* Hardware Availability: [Crowd Supply](https://www.crowdsupply.com/anavi-technology/anavi-macro-pad-10), [GitHub repository](https://github.com/AnaviTechnology/anavi-knob-1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb anavi/knob1 -km default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key on the left half, or top right key on the right half, and then plug in the USB cable on that keyboard half.
+* **Physical reset button**: Double tap the reset button on the XIAO RP2040.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
new file mode 100644
index 0000000000..ed8acbe4ac
--- /dev/null
+++ b/keyboards/anavi/knob1/rules.mk
@@ -0,0 +1,6 @@
+WS2812_DRIVER = vendor
+
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
+
+OPT_DEFS += -DHAL_USE_I2C=TRUE

From cadf18c6d3c59c42cf717d56cfd9ccc829be59e1 Mon Sep 17 00:00:00 2001
From: trguhq <93248917+trguhq@users.noreply.github.com>
Date: Tue, 15 Nov 2022 11:57:09 -0500
Subject: [PATCH 876/959] Planck unicode rune layout (#18674)

* Furthark layout
---
 layouts/community/ortho_4x12/trguhq/config.h  |  27 ++
 layouts/community/ortho_4x12/trguhq/keymap.c  |  29 ++
 layouts/community/ortho_4x12/trguhq/readme.md |  36 ++
 layouts/community/ortho_4x12/trguhq/rules.mk  |   1 +
 .../community/ortho_4x12/trguhq/trguhq.json   | 361 ++++++++++++++++++
 5 files changed, 454 insertions(+)
 create mode 100644 layouts/community/ortho_4x12/trguhq/config.h
 create mode 100644 layouts/community/ortho_4x12/trguhq/keymap.c
 create mode 100644 layouts/community/ortho_4x12/trguhq/readme.md
 create mode 100644 layouts/community/ortho_4x12/trguhq/rules.mk
 create mode 100644 layouts/community/ortho_4x12/trguhq/trguhq.json

diff --git a/layouts/community/ortho_4x12/trguhq/config.h b/layouts/community/ortho_4x12/trguhq/config.h
new file mode 100644
index 0000000000..476141e232
--- /dev/null
+++ b/layouts/community/ortho_4x12/trguhq/config.h
@@ -0,0 +1,27 @@
+/* Ortho 4x12 Unicode Rune Layout
+ *
+ * Copyright 2021 trguhq
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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 UC_MAC, UC_LNX, UC_WIN, UC_WINC
+
+// #define UNICODE_SONG_MAC  AUDIO_ON_SOUND
+// #define UNICODE_SONG_LNX  UNICODE_LINUX
+// #define UNICODE_SONG_BSD  TERMINAL_SOUND
+// #define UNICODE_SONG_WIN  UNICODE_WINDOWS
+// #define UNICODE_SONG_WINC UNICODE_WINDOWS
diff --git a/layouts/community/ortho_4x12/trguhq/keymap.c b/layouts/community/ortho_4x12/trguhq/keymap.c
new file mode 100644
index 0000000000..fecf0157b8
--- /dev/null
+++ b/layouts/community/ortho_4x12/trguhq/keymap.c
@@ -0,0 +1,29 @@
+/* Ortho 4x12 Unicode Rune Layout
+ *
+ * Copyright 2021 trguhq
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_ortho_4x12(KC_ESC, KC_GRV, UC(0x16A0), UC(0x16A2), UC(0x16A6), UC(0x16A8), UC(0x16B1), UC(0x16B2), UC(0x16B7), UC(0x16B9), KC_QUOT, KC_BSPC, KC_TAB, KC_SCLN, UC(0x16BA), UC(0x16BE), UC(0x16C1), UC(0x16C3), UC(0x16C7), UC(0x16C8), UC(0x16C9), UC(0x16CA), KC_COMM, KC_DOT, KC_LSFT, KC_BSLS, UC(0x16CF), UC(0x16D2), UC(0x16D6), UC(0x16D7), UC(0x16DA), UC(0x16DC), UC(0x16DF), UC(0x16DE), KC_UP, KC_ENT, BL_STEP, KC_LCTL, KC_LALT, KC_LGUI, MO(3), KC_SPC, KC_SPC, MO(4), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT),
+	[1] = LAYOUT_ortho_4x12(KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, BL_STEP, KC_LCTL, KC_LALT, KC_LGUI, MO(3), KC_SPC, KC_SPC, MO(4), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+	[2] = LAYOUT_ortho_4x12(KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, BL_STEP, KC_LCTL, KC_LALT, KC_LGUI, MO(3), KC_SPC, KC_SPC, MO(4), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+	[3] = LAYOUT_ortho_4x12(KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, LSFT(KC_NUHS), LSFT(KC_NUBS), KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(6), KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
+	[4] = LAYOUT_ortho_4x12(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(6), KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
+	[5] = LAYOUT_ortho_4x12(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_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, TO(0), KC_NO, KC_NO, KC_C, KC_V, KC_NO, KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO),
+	[6] = LAYOUT_ortho_4x12(UNICODE_MODE_MAC, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL, UNICODE_MODE_LNX, KC_TRNS, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DF(0), DF(1), DF(2), TO(5), KC_TRNS, UNICODE_MODE_WIN, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, /* TERM_ON */ KC_TRNS, /* TERM_OFF */ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, UNICODE_MODE_WINC, 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/layouts/community/ortho_4x12/trguhq/readme.md b/layouts/community/ortho_4x12/trguhq/readme.md
new file mode 100644
index 0000000000..e0f5025a09
--- /dev/null
+++ b/layouts/community/ortho_4x12/trguhq/readme.md
@@ -0,0 +1,36 @@
+# Planck Ortho 4x12 Unicode Futhark Rune layout
+
+![Planck Futhark Layout Image](https://i.imgur.com/ocILTZ3.png)
+
+* Layout Maintainer: [trguhq](https://github.com/trguhq)
+
+Types unicode runes on ortholinear QMK keyboard. Legacy Latin letter
+layers left for user but have been marked red as irrelevant.
+
+## OS specific
+
+With both modifiers (either side of spacebar) selected, layer 6
+lets you select which OS mode to use with the first vertical column
+of keys:
+
+1. macOS
+2. Linux
+3. Windows Unicode
+4. Windows WinCompose
+
+See [QMK docs](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_unicode.md) for details.
+
+### macOS
+
+On macOS this will have to be enabled in keyboard settings as a 
+Unicode Hex Input Keyboard Source and selected under the
+keyboard layouts icon on the menu bar.
+
+### Linux
+
+Uses IBus or GTK.
+
+### Windows
+
+Either create the needed EnableHexNumpad registry key for Windows Unicode
+entry, or (recommended) install WinCompose.
diff --git a/layouts/community/ortho_4x12/trguhq/rules.mk b/layouts/community/ortho_4x12/trguhq/rules.mk
new file mode 100644
index 0000000000..039f07c8e3
--- /dev/null
+++ b/layouts/community/ortho_4x12/trguhq/rules.mk
@@ -0,0 +1 @@
+UNICODE_ENABLE = yes
diff --git a/layouts/community/ortho_4x12/trguhq/trguhq.json b/layouts/community/ortho_4x12/trguhq/trguhq.json
new file mode 100644
index 0000000000..cade25899a
--- /dev/null
+++ b/layouts/community/ortho_4x12/trguhq/trguhq.json
@@ -0,0 +1,361 @@
+{
+  "version": 1,
+  "notes": "",
+  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+  "keyboard": "planck/rev6_drop",
+  "keymap": "trguhq",
+  "layout": "LAYOUT_ortho_4x12",
+  "layers": [
+    [
+      "KC_ESC",
+      "KC_GRV",
+      "ANY(UC(0x16A0))",
+      "ANY(UC(0x16A2))",
+      "ANY(UC(0x16A6))",
+      "ANY(UC(0x16A8))",
+      "ANY(UC(0x16B1))",
+      "ANY(UC(0x16B2))",
+      "ANY(UC(0x16B7))",
+      "ANY(UC(0x16B9))",
+      "KC_QUOT",
+      "KC_BSPC",
+      "KC_TAB",
+      "KC_SCLN",
+      "ANY(UC(0x16BA))",
+      "ANY(UC(0x16BE))",
+      "ANY(UC(0x16C1))",
+      "ANY(UC(0x16C3))",
+      "ANY(UC(0x16C7))",
+      "ANY(UC(0x16C8))",
+      "ANY(UC(0x16C9))",
+      "ANY(UC(0x16CA))",
+      "KC_COMM",
+      "KC_DOT",
+      "KC_LSFT",
+      "KC_BSLS",
+      "ANY(UC(0x16CF))",
+      "ANY(UC(0x16D2))",
+      "ANY(UC(0x16D6))",
+      "ANY(UC(0x16D7))",
+      "ANY(UC(0x16DA))",
+      "ANY(UC(0x16DC))",
+      "ANY(UC(0x16DF))",
+      "ANY(UC(0x16DE))",
+      "KC_UP",
+      "KC_ENT",
+      "BL_STEP",
+      "KC_LCTL",
+      "KC_LALT",
+      "KC_LGUI",
+      "MO(3)",
+      "KC_SPC",
+      "KC_SPC",
+      "MO(4)",
+      "KC_SLSH",
+      "KC_LEFT",
+      "KC_DOWN",
+      "KC_RGHT"
+    ],
+    [
+      "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",
+      "BL_STEP",
+      "KC_LCTL",
+      "KC_LALT",
+      "KC_LGUI",
+      "MO(3)",
+      "KC_SPC",
+      "KC_SPC",
+      "MO(4)",
+      "KC_LEFT",
+      "KC_DOWN",
+      "KC_UP",
+      "KC_RGHT"
+    ],
+    [
+      "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",
+      "BL_STEP",
+      "KC_LCTL",
+      "KC_LALT",
+      "KC_LGUI",
+      "MO(3)",
+      "KC_SPC",
+      "KC_SPC",
+      "MO(4)",
+      "KC_LEFT",
+      "KC_DOWN",
+      "KC_UP",
+      "KC_RGHT"
+    ],
+    [
+      "KC_TILD",
+      "KC_EXLM",
+      "KC_AT",
+      "KC_HASH",
+      "KC_DLR",
+      "KC_PERC",
+      "KC_CIRC",
+      "KC_AMPR",
+      "KC_ASTR",
+      "KC_LPRN",
+      "KC_RPRN",
+      "KC_BSPC",
+      "KC_DEL",
+      "KC_F1",
+      "KC_F2",
+      "KC_F3",
+      "KC_F4",
+      "KC_F5",
+      "KC_F6",
+      "KC_UNDS",
+      "KC_PLUS",
+      "KC_LCBR",
+      "KC_RCBR",
+      "KC_PIPE",
+      "KC_TRNS",
+      "KC_F7",
+      "KC_F8",
+      "KC_F9",
+      "KC_F10",
+      "KC_F11",
+      "KC_F12",
+      "LSFT(KC_NUHS)",
+      "LSFT(KC_NUBS)",
+      "KC_HOME",
+      "KC_END",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "MO(6)",
+      "KC_MNXT",
+      "KC_VOLD",
+      "KC_VOLU",
+      "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_BSPC",
+      "KC_DEL",
+      "KC_F1",
+      "KC_F2",
+      "KC_F3",
+      "KC_F4",
+      "KC_F5",
+      "KC_F6",
+      "KC_MINS",
+      "KC_EQL",
+      "KC_LBRC",
+      "KC_RBRC",
+      "KC_BSLS",
+      "KC_TRNS",
+      "KC_F7",
+      "KC_F8",
+      "KC_F9",
+      "KC_F10",
+      "KC_F11",
+      "KC_F12",
+      "KC_NUHS",
+      "KC_NUBS",
+      "KC_PGUP",
+      "KC_PGDN",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "MO(6)",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_MNXT",
+      "KC_VOLD",
+      "KC_VOLU",
+      "KC_MPLY"
+    ],
+    [
+      "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_NO",
+      "KC_Q",
+      "KC_W",
+      "KC_E",
+      "KC_R",
+      "KC_T",
+      "KC_Y",
+      "KC_U",
+      "KC_I",
+      "KC_O",
+      "KC_P",
+      "KC_LBRC",
+      "KC_NO",
+      "KC_A",
+      "KC_S",
+      "KC_D",
+      "KC_F",
+      "KC_G",
+      "KC_H",
+      "KC_J",
+      "KC_K",
+      "KC_L",
+      "KC_SCLN",
+      "KC_QUOT",
+      "TO(0)",
+      "KC_NO",
+      "KC_NO",
+      "KC_C",
+      "KC_V",
+      "KC_NO",
+      "KC_NO",
+      "KC_N",
+      "KC_M",
+      "KC_NO",
+      "KC_NO",
+      "KC_NO"
+    ],
+    [
+      "ANY(UNICODE_MODE_MAC)",
+      "QK_BOOT",
+      "DEBUG",
+      "RGB_TOG",
+      "RGB_MOD",
+      "RGB_HUI",
+      "RGB_HUD",
+      "RGB_SAI",
+      "RGB_SAD",
+      "RGB_VAI",
+      "RGB_VAD",
+      "KC_DEL",
+      "ANY(UNICODE_MODE_LNX)",
+      "KC_TRNS",
+      "ANY(MU_MOD)",
+      "ANY(AU_ON)",
+      "ANY(AU_OFF)",
+      "AG_NORM",
+      "AG_SWAP",
+      "DF(0)",
+      "DF(1)",
+      "DF(2)",
+      "TO(5)",
+      "KC_TRNS",
+      "ANY(UNICODE_MODE_WIN)",
+      "ANY(MUV_DE)",
+      "ANY(MUV_IN)",
+      "ANY(MU_ON)",
+      "ANY(MU_OFF)",
+      "ANY(MI_ON)",
+      "ANY(MI_OFF)",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "ANY(UNICODE_MODE_WINC)",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS",
+      "KC_TRNS"
+    ]
+  ],
+  "author": ""
+}

From 538dbb5b8ebf70063a5228068aa6a65e806ce639 Mon Sep 17 00:00:00 2001
From: bghull <35785950+bghull@users.noreply.github.com>
Date: Tue, 15 Nov 2022 17:23:03 +0000
Subject: [PATCH 877/959] Personal keymap updates (#18763)

* Latest updates

* Aligning and cleaning up planck and babyv layouts

* Added license, cleaned up errors
---
 .../babyv/keymaps/bghull/combos.def           |  14 ++
 .../babyv/keymaps/bghull/config.h             |   7 +
 .../babyv/keymaps/bghull/keymap.c             | 122 ++++++++++++++++++
 .../babyv/keymaps/bghull/rules.mk             |   8 ++
 keyboards/planck/keymaps/bghull/combos.def    |  14 ++
 keyboards/planck/keymaps/bghull/config.h      |   7 +
 keyboards/planck/keymaps/bghull/keymap.c      | 120 ++++++++---------
 keyboards/planck/keymaps/bghull/rules.mk      |   5 +-
 8 files changed, 235 insertions(+), 62 deletions(-)
 create mode 100644 keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def
 create mode 100644 keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h
 create mode 100644 keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c
 create mode 100644 keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk
 create mode 100644 keyboards/planck/keymaps/bghull/combos.def
 create mode 100644 keyboards/planck/keymaps/bghull/config.h

diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def b/keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def
new file mode 100644
index 0000000000..a525113a09
--- /dev/null
+++ b/keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def
@@ -0,0 +1,14 @@
+//   name     result    chord keys
+COMB(QW_ESC,	KC_ESC,   	KC_Q, KC_W)
+COMB(CV_DEL,	KC_DEL,   	KC_C, KC_V)
+COMB(XC_BSPC,	KC_BSPC,   	KC_X, KC_C)
+COMB(WE_LBRC,	KC_LBRC, 	KC_W, KC_E)
+COMB(ER_RBRC, 	KC_RBRC,	KC_E, KC_R)
+COMB(SD_LPRN, 	KC_LPRN,	KC_S, KC_D)
+COMB(DF_RPRN, 	KC_RPRN,	KC_D, KC_F)
+COMB(FG_BSLS, 	KC_BSLS,	KC_F, KC_G)
+COMB(HJ_SLSH, 	KC_SLSH,	KC_H, KC_J)
+COMB(DQ_LGUI, 	KC_LGUI,	KC_DOT, KC_QUOT)
+COMB(CD_LALT, 	KC_LALT,	KC_COMM, KC_DOT)
+COMB(MC_LSFT, 	KC_LSFT,	KC_M, KC_COMM)
+COMB(NM_LCTL, 	KC_LCTL,	KC_N, KC_M)
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h b/keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h
new file mode 100644
index 0000000000..96a6aefb0e
--- /dev/null
+++ b/keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h
@@ -0,0 +1,7 @@
+// Copyright 2021 Your Name (@bghull)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#define AUTO_SHIFT_TIMEOUT 135
+#define ONESHOT_TIMEOUT 1000
+#define COMBO_TERM 20
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c
new file mode 100644
index 0000000000..21a0200925
--- /dev/null
+++ b/keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c
@@ -0,0 +1,122 @@
+/* Copyright 2020 Eye Oh! Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_steno.h"
+#include "g/keymap_combo.h"
+
+
+#define COMBO_ONLY_FROM_LAYER QWERTY
+
+enum layer_names {
+  QWERTY,
+  COLMAK,
+  NAVNUM,
+  FUNC,
+  STENO
+};
+
+#define BspNAV LT(NAVNUM, KC_BSPC)
+#define SpcFUN LT(FUNC, KC_SPC)
+#define OneSFT OSM(MOD_LSFT)
+#define OneALT OSM(MOD_LALT)
+#define OneCTL OSM(MOD_LCTL)
+#define OneWIN OSM(MOD_LGUI)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 
+/* QWERTY
+ * ,-----------------------------------------------------------------------------------.
+ * |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |  ; : |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  | ,  < | .  > |  ' " |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |                    | Ctrl |NAVNUM|             |Space |BspNAV|                    |
+ * `-----------------------------------------------------------------------------------'
+ */
+[QWERTY] = LAYOUT_2u(
+    KC_Q,   KC_W,    KC_E,     KC_R,    KC_T,	   _______, _______, KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,
+    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,	   _______, _______, KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,
+    KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,	   _______, _______, KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_QUOT,
+    _______,                   KC_LCTL, MO(NAVNUM),                     KC_SPC, BspNAV,                   _______
+),
+
+[COLMAK] = LAYOUT_2u(
+    KC_Q,   KC_W,    KC_F,     KC_P,    KC_B,	   _______, _______, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN,
+    KC_A,   KC_R,    KC_S,     KC_T,    KC_G,	   _______, _______, KC_M,   KC_N,   KC_E,    KC_I,    KC_O,
+    KC_Z,   KC_X,    KC_C,     KC_D,    KC_V,	   _______, _______, KC_K,   KC_H,   KC_COMM, KC_DOT,  KC_QUOT,
+    _______,                   KC_LCTL, MO(NAVNUM),                     KC_SPC, BspNAV,                   _______
+
+),
+/* NAVNUM
+ * ,-----------------------------------------------------------------------------------.
+ * |Enter | Home |  Up  | End  |      |         RST |  -   |   7  |   8  |   9  |   0  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |OneSFT| Left | Down |Right | ` ~  |        CLMK |  +   |   4  |   5  |   6  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |OneCTL|OneALT| Tab  |   _  |OneWIN|        QWER |  =   |   1  |   2  |   3  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |                    |      |      |             |SpcFUN| Ctrl |                    |
+ * `-----------------------------------------------------------------------------------'
+ */
+[NAVNUM] = LAYOUT_2u(
+  KC_ENT,  KC_HOME, KC_UP,   KC_END,  _______, _______, RESET,      KC_PMNS, KC_7,    KC_8,   KC_9,     KC_0,
+  OneSFT,  KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV,  _______, DF(COLMAK), KC_PPLS, KC_4,    KC_5,   KC_6,     KC_ENT,
+  OneCTL,   OneALT, KC_TAB,  KC_UNDS, OneWIN,  _______, DF(QWERTY), KC_EQL,  KC_1,    KC_2,   KC_3,     _______,
+  _______,                   _______, _______,                      SpcFUN,  KC_LCTL,                   _______
+),
+/* FUNC: Mousekeys + F keys
+ * ,-----------------------------------------------------------------------------------.
+ * |      |Rclick| MsUp |Lclick| WhUp |             |      |  F7  |  F8  |  F9  |  F10 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | MsLt | MsDn | MsRt | WhDn |             |OneALT|  F4  |  F5  |  F6  |  F11 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |Mclick|      |      |             |      |  F1  |  F2  |  F3  |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |                    |      |      |             |      |      |                    |
+ * `-----------------------------------------------------------------------------------'
+ */
+[FUNC] = LAYOUT_2u(
+  _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
+  _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, OneALT , KC_F4,   KC_F5,   KC_F6,   KC_F11,
+  _______, _______, KC_BTN3, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
+  _______,                  _______, _______,                   _______, _______,                   DF(STENO)
+),
+
+/* STENO
+ * ,----------------------------------------------------------------------------------------.
+ * |      |   #  |   #  |   #  |   #  |   #    / \    #  |   #  |   #  |   #  |   #  |      |
+ * |------+------+------+------+------+--------   -------+------+------+------+------+------|
+ * |      |   S  |   T  |   P  !   H  !   *   /   \   *  !   F  !   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+-------     ------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  /     \  *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------       -----+------+------+------+------+------|
+ * |      |             |   A  |      O     |       |     E     |   U  |             |QWERTY|
+ * `----------------------------------------------------------------------------------------'
+*/
+[STENO] = LAYOUT_2u(
+  STN_N1,  STN_N2,  STN_N3,     STN_N4,      STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
+  STN_FN,  STN_S1,  STN_TL,     STN_PL,      STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
+  XXXXXXX, STN_S2,  STN_KL,     STN_WL,      STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
+  XXXXXXX,                    STN_A, STN_O,                             STN_E,   STN_U,   DF(QWERTY)
+  ),
+};
+
+
+void matrix_init_user() {
+  steno_set_mode(STENO_MODE_GEMINI);
+};
+
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk b/keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk
new file mode 100644
index 0000000000..db78b5957b
--- /dev/null
+++ b/keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk
@@ -0,0 +1,8 @@
+NKRO_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+STENO_ENABLE = yes
+COMBO_ENABLE = yes
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = no
+VPATH += keyboards/gboards
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/bghull/combos.def b/keyboards/planck/keymaps/bghull/combos.def
new file mode 100644
index 0000000000..a525113a09
--- /dev/null
+++ b/keyboards/planck/keymaps/bghull/combos.def
@@ -0,0 +1,14 @@
+//   name     result    chord keys
+COMB(QW_ESC,	KC_ESC,   	KC_Q, KC_W)
+COMB(CV_DEL,	KC_DEL,   	KC_C, KC_V)
+COMB(XC_BSPC,	KC_BSPC,   	KC_X, KC_C)
+COMB(WE_LBRC,	KC_LBRC, 	KC_W, KC_E)
+COMB(ER_RBRC, 	KC_RBRC,	KC_E, KC_R)
+COMB(SD_LPRN, 	KC_LPRN,	KC_S, KC_D)
+COMB(DF_RPRN, 	KC_RPRN,	KC_D, KC_F)
+COMB(FG_BSLS, 	KC_BSLS,	KC_F, KC_G)
+COMB(HJ_SLSH, 	KC_SLSH,	KC_H, KC_J)
+COMB(DQ_LGUI, 	KC_LGUI,	KC_DOT, KC_QUOT)
+COMB(CD_LALT, 	KC_LALT,	KC_COMM, KC_DOT)
+COMB(MC_LSFT, 	KC_LSFT,	KC_M, KC_COMM)
+COMB(NM_LCTL, 	KC_LCTL,	KC_N, KC_M)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/bghull/config.h b/keyboards/planck/keymaps/bghull/config.h
new file mode 100644
index 0000000000..96a6aefb0e
--- /dev/null
+++ b/keyboards/planck/keymaps/bghull/config.h
@@ -0,0 +1,7 @@
+// Copyright 2021 Your Name (@bghull)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#define AUTO_SHIFT_TIMEOUT 135
+#define ONESHOT_TIMEOUT 1000
+#define COMBO_TERM 20
diff --git a/keyboards/planck/keymaps/bghull/keymap.c b/keyboards/planck/keymaps/bghull/keymap.c
index 8abdc884dd..cae278e3e2 100644
--- a/keyboards/planck/keymaps/bghull/keymap.c
+++ b/keyboards/planck/keymaps/bghull/keymap.c
@@ -16,86 +16,86 @@
 
 #include QMK_KEYBOARD_H
 #include "keymap_steno.h"
+#include "g/keymap_combo.h"
+#include "muse.h"
+
+#define COMBO_ONLY_FROM_LAYER QWERTY
 
 enum planck_layers {
-  _QWERTY,
-  _STENO,
-  _NUMPAD,
-  _FUNC
+  QWERTY,
+  COLMAK,
+  NAVNUM,
+  FUNC
+  
 };
 
+#define BspNAV LT(NAVNUM, KC_BSPC)
+#define SpcFUN LT(FUNC, KC_SPC)
+#define OneSFT OSM(MOD_LSFT)
+#define OneALT OSM(MOD_LALT)
+#define OneCTL OSM(MOD_LCTL)
+#define OneWIN OSM(MOD_LGUI)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
+/* QWERTY
  * ,-----------------------------------------------------------------------------------.
- * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |NUMPAD|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | ;  : | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  | ,  < | .  > |  up  | /  ? |
+ * |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |  ; : |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  | ,  < | .  > |  ' " |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Es/Ctl|MACROS|STENO |  Alt | Bspc |    Space    | Ctrl | '  " |  lt  |  dn  |  rt  |
+ * |                    | Ctrl |NAVNUM|             |Space |BspNAV|                    |
  * `-----------------------------------------------------------------------------------'
  */
-[_QWERTY] = LAYOUT_planck_grid(
-    LGUI_T(KC_TAB),             KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P, KC_DEL,
-    MO(_NUMPAD),        KC_A,      KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L, KC_SCLN, KC_ENT,
-    KC_LSFT,            KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,   KC_DOT,   KC_UP, KC_SLSH,
-    LCTL_T(KC_ESC),MO(_FUNC),DF(_STENO), KC_LALT, KC_BSPC, KC_SPC ,_______ , KC_LCTL, KC_QUOT,  KC_LEFT, KC_DOWN, KC_RGHT
+[QWERTY] = LAYOUT_planck_grid(
+    KC_Q,   KC_W,    KC_E,     KC_R,    KC_T,	   _______, _______, KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,
+    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,	   _______, _______, KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,
+    KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,	   _______, _______, KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_QUOT,
+    _______, _______, _______, KC_LCTL, MO(NAVNUM),_______, _______, KC_SPC, BspNAV, _______, _______, _______
 ),
 
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |QWERTY|   A  |   O  |             |   E  |   U  |  PWR | RES1 | RES2 |
- * `-----------------------------------------------------------------------------------'
- */
-[_STENO] = LAYOUT_planck_grid(
-  STN_N1,  STN_N2,  STN_N3,     STN_N4,      STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-  STN_FN,  STN_S1,  STN_TL,     STN_PL,      STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-  XXXXXXX, STN_S2,  STN_KL,     STN_WL,      STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-  XXXXXXX, XXXXXXX, DF(_QWERTY),STN_A,STN_O, XXXXXXX, XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
-),
+[COLMAK] = LAYOUT_planck_grid(
+    KC_Q,   KC_W,    KC_F,     KC_P,    KC_B,	   _______, _______, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN,
+    KC_A,   KC_R,    KC_S,     KC_T,    KC_G,	   _______, _______, KC_M,   KC_N,   KC_E,    KC_I,    KC_O,
+    KC_Z,   KC_X,    KC_C,     KC_D,    KC_V,	   _______, _______, KC_K,   KC_H,   KC_COMM, KC_DOT,  KC_QUOT,
+    _______, _______, _______, KC_LCTL, MO(NAVNUM),_______, _______, KC_SPC, BspNAV, _______, _______, _______
 
-/* 
- * ,-----------------------------------------------------------------------------------.
- * |      |RClick|  MsU |LClick|WheelU|   (  |  )   |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  MsL |  MsD |  MsR |WheelD|  [{  |  ]}  |   4  |   5  |   6  |   +  |  -_  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Mute | VolD | VolU |  `~  |   _  |  =   |   1  |   2  |   3  | PgUp | \  | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |QK_BOOT |      |      |             |      |   .  | Home | PgDn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_grid(
-  _______, KC_BTN2, KC_MS_U, KC_BTN1,  KC_WH_U, KC_LPRN, KC_RPRN,    KC_7,     KC_8,    KC_9,    KC_0, _______,
-  _______, KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D, KC_LBRC, KC_RBRC,    KC_4,     KC_5,    KC_6, KC_PPLS, KC_MINS,
-  _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_GRAVE, KC_UNDS,  KC_EQL,    KC_1,     KC_2,    KC_3, KC_PGUP, KC_BSLS,
-  _______, XXXXXXX,   QK_BOOT, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
 ),
-
-/* Dynamic macros + Winkey combos
+/* NAVNUM
  * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |Enter | Home |  Up  | End  |      |         RST |  -   |   7  |   8  |   9  |   0  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  W2  |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
+ * |OneSFT| Left | Down |Right | ` ~  |        CLMK |  +   |   4  |   5  |   6  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  W3  |      |      |      |      |      |      |      |      |      |      |      |
+ * |OneCTL|OneALT| Tab  |   _  |OneWIN|        QWER |  =   |   1  |   2  |   3  |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  W4  |      |      |      |      |             |      |      |      |      |      |
+ * |                    |      |      |             |SpcFUN| Ctrl |                    |
  * `-----------------------------------------------------------------------------------'
  */
-[_FUNC] = LAYOUT_planck_grid(
-     KC_F1  ,  KC_F2 ,  KC_F3 ,  KC_F4  , KC_F5  , KC_F6 ,  KC_F7 ,  KC_F8 ,  KC_F9 ,  KC_F10 , KC_F11 , KC_F12,
-  LGUI(KC_2), _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, QK_BOOT,
-  LGUI(KC_3), _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-  LGUI(KC_4), _______, DM_REC1, DM_PLY1, DM_RSTP, _______, _______, _______, _______,  _______, _______, _______
+[NAVNUM] = LAYOUT_planck_grid(
+  KC_ENT,  KC_HOME, KC_UP,   KC_END, _______,  _______, RESET,      KC_PMNS, KC_7,    KC_8,   KC_9,     KC_0,
+  OneSFT,  KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV,  _______, DF(COLMAK), KC_PPLS, KC_4,    KC_5,   KC_6,     KC_ENT,
+  OneCTL,   OneALT, KC_TAB,  KC_UNDS, OneWIN,  _______, DF(QWERTY), KC_EQL,  KC_1,    KC_2,   KC_3,     _______,
+  _______, _______, _______, _______, _______, _______, _______,    SpcFUN,  KC_LCTL, _______, _______, _______
+),
+/* FUNC: Mousekeys + F keys
+ * ,-----------------------------------------------------------------------------------.
+ * |      |Rclick| MsUp |Lclick| WhUp |             |      |  F7  |  F8  |  F9  |  F10 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | MsLt | MsDn | MsRt | WhDn |             |OneALT|  F4  |  F5  |  F6  |  F11 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |Mclick|      |      |             |      |  F1  |  F2  |  F3  |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |                    |      |      |             |      |      |                    |
+ * `-----------------------------------------------------------------------------------'
+ */
+[FUNC] = LAYOUT_planck_grid(
+  _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
+  _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, OneALT , KC_F4,   KC_F5,   KC_F6,   KC_F11,
+  _______, _______, KC_BTN3, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
 };
+
diff --git a/keyboards/planck/keymaps/bghull/rules.mk b/keyboards/planck/keymaps/bghull/rules.mk
index 9711c485d7..664ed74078 100644
--- a/keyboards/planck/keymaps/bghull/rules.mk
+++ b/keyboards/planck/keymaps/bghull/rules.mk
@@ -1,5 +1,6 @@
 SRC += muse.c
 AUTO_SHIFT_ENABLE = yes
 MOUSEKEY_ENABLE = yes
-STENO_ENABLE = yes
-AUDIO_ENABLE = no
\ No newline at end of file
+AUDIO_ENABLE = no
+COMBO_ENABLE = yes
+VPATH += keyboards/gboards
\ No newline at end of file

From df5689ed06cc08713f1d097de7436c466f4c0261 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Wed, 16 Nov 2022 02:40:28 +0800
Subject: [PATCH 878/959] [Docs] Note default value for TAP_CODE_DELAY (#19078)

---
 docs/config_options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/config_options.md b/docs/config_options.md
index cc732de7d2..676db3b62d 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -207,7 +207,7 @@ If you define these options you will enable the associated feature, which may in
 * `#define COMBO_NO_TIMER`
   * Disable the combo timer completely for relaxed combos.
 * `#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.
+  * 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 and defaults to `0`.
 * `#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 KEY_OVERRIDE_REPEAT_DELAY 500`

From 81a6407dcaf32e4b2115daccc7c0658add4de7d4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 16 Nov 2022 05:59:09 +1100
Subject: [PATCH 879/959] Update more `DRIVER_LED_TOTAL` defines to
 `RGB_MATRIX_LED_COUNT` (#19089)

---
 keyboards/bastardkb/dilemma/3x5_3/config.h                | 2 +-
 keyboards/controllerworks/mini36/keymaps/default/config.h | 2 +-
 keyboards/controllerworks/mini36/keymaps/via/config.h     | 2 +-
 keyboards/controllerworks/mini42/keymaps/default/config.h | 2 +-
 keyboards/controllerworks/mini42/keymaps/via/config.h     | 4 +---
 keyboards/crkbd/keymaps/nimishgautam/config.h             | 2 +-
 keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c    | 2 +-
 keyboards/tzarc/ghoul/config.h                            | 3 +--
 keyboards/work_louder/numpad/config.h                     | 3 +--
 keyboards/yandrstudio/buff67v3/config.h                   | 1 -
 keyboards/yandrstudio/eau_r2/config.h                     | 1 -
 keyboards/yandrstudio/nightstar75/config.h                | 1 -
 keyboards/yandrstudio/yr6095/config.h                     | 1 -
 13 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index 30bce4369b..d89f250063 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -62,7 +62,7 @@
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/controllerworks/mini36/keymaps/default/config.h b/keyboards/controllerworks/mini36/keymaps/default/config.h
index e1d162ef3e..77da61828c 100644
--- a/keyboards/controllerworks/mini36/keymaps/default/config.h
+++ b/keyboards/controllerworks/mini36/keymaps/default/config.h
@@ -23,7 +23,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/controllerworks/mini36/keymaps/via/config.h b/keyboards/controllerworks/mini36/keymaps/via/config.h
index e1d162ef3e..77da61828c 100644
--- a/keyboards/controllerworks/mini36/keymaps/via/config.h
+++ b/keyboards/controllerworks/mini36/keymaps/via/config.h
@@ -23,7 +23,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/controllerworks/mini42/keymaps/default/config.h b/keyboards/controllerworks/mini42/keymaps/default/config.h
index e1d162ef3e..77da61828c 100644
--- a/keyboards/controllerworks/mini42/keymaps/default/config.h
+++ b/keyboards/controllerworks/mini42/keymaps/default/config.h
@@ -23,7 +23,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/controllerworks/mini42/keymaps/via/config.h b/keyboards/controllerworks/mini42/keymaps/via/config.h
index 94eb482c86..e11d5aa37f 100644
--- a/keyboards/controllerworks/mini42/keymaps/via/config.h
+++ b/keyboards/controllerworks/mini42/keymaps/via/config.h
@@ -16,8 +16,6 @@
  */
 #pragma once
 #ifdef RGB_MATRIX_ENABLE
-#    define RGBLED_NUM       54 // Number of LEDs
-#    define DRIVER_LED_TOTAL RGBLED_NUM
 #    define RGB_MATRIX_SPLIT \
         { 27, 27 }
 //#    define SPLIT_TRANSPORT_MIRROR
@@ -26,7 +24,7 @@
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #    define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h
index 38146abb43..b09d858898 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/config.h
+++ b/keyboards/crkbd/keymaps/nimishgautam/config.h
@@ -61,7 +61,7 @@
     #define RGB_MATRIX_VAL_STEP 8
     #define RGB_MATRIX_SPD_STEP 10
     #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-    #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+    #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
     #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 
     #define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
index f988956451..1949eeb150 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
     #ifdef UNDERGLOW_DISABLE
     void keyboard_pre_init_user(void) {
 
-        for (int key_id = 0; key_id < DRIVER_LED_TOTAL; key_id++ ) {
+        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;
             }
diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
index c3897e7ada..57068ef6cb 100644
--- a/keyboards/tzarc/ghoul/config.h
+++ b/keyboards/tzarc/ghoul/config.h
@@ -15,5 +15,4 @@
 
 // RGB configuration
 #define RGB_MATRIX_LED_COUNT 40
-#define RGBLED_NUM 40       // TBD: Once convergence with these defines occurs, remove.
-#define DRIVER_LED_TOTAL 40 // TBD: Once convergence with these defines occurs, remove.
+#define RGBLED_NUM 40
diff --git a/keyboards/work_louder/numpad/config.h b/keyboards/work_louder/numpad/config.h
index 7cf84a7d18..762e5e654b 100644
--- a/keyboards/work_louder/numpad/config.h
+++ b/keyboards/work_louder/numpad/config.h
@@ -21,8 +21,7 @@
 
 
 // #define RGB_DI_PIN D1
-#define DRIVER_LED_TOTAL 16
-#define RGB_MATRIX_LED_COUNT DRIVER_LED_TOTAL
+#define RGB_MATRIX_LED_COUNT 16
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_DISABLE_KEYCODES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index 81d5654e57..0e7392f0e6 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -35,7 +35,6 @@
 
 #    define RGB_DI_PIN B4
 #    define RGBLED_NUM 1
-#    define DRIVER_LED_TOTAL RGBLED_NUM
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index 3fdb79256e..28cb9106bc 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -33,7 +33,6 @@
 
 #    define RGB_DI_PIN A8
 #    define RGBLED_NUM 12
-#    define DRIVER_LED_TOTAL RGBLED_NUM
 #    define RGBLIGHT_SLEEP
 #    define RGBLIGHT_VAL_STEP 5
 #    define RGBLIGHT_LIMIT_VAL 200
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 767628fc3f..6f2942042a 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -30,7 +30,6 @@
 
 #    define RGB_DI_PIN A7
 #    define RGBLED_NUM 4
-#    define DRIVER_LED_TOTAL RGBLED_NUM
 #    define RGBLIGHT_LIMIT_VAL 180
 
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index 3905967b9e..1e51826d94 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -31,7 +31,6 @@
 
 #    define RGB_DI_PIN B5
 #    define RGBLED_NUM 1
-#    define DRIVER_LED_TOTAL RGBLED_NUM
 
 #    define RGBLIGHT_LAYERS
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF

From 57ac917b4366cbd25044ed59496e6b4f3bb9a17a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 16 Nov 2022 07:06:49 +0000
Subject: [PATCH 880/959] Extend eeconfig kb/user datablock API (#19094)

---
 quantum/eeconfig.c | 42 ++++++++++++++++++++++++++++++++++--------
 quantum/eeconfig.h |  4 ++++
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 3b4d690e42..21bcce2654 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -71,15 +71,11 @@ void eeconfig_init_quantum(void) {
 #endif
 
 #if (EECONFIG_KB_DATA_SIZE) > 0
-    eeprom_update_dword(EECONFIG_KEYBOARD, (EECONFIG_KB_DATA_VERSION));
-    uint8_t dummy_kb[(EECONFIG_KB_DATA_SIZE)] = {0};
-    eeprom_update_block(EECONFIG_KB_DATABLOCK, dummy_kb, (EECONFIG_KB_DATA_SIZE));
+    eeconfig_init_kb_datablock();
 #endif
 
 #if (EECONFIG_USER_DATA_SIZE) > 0
-    eeprom_update_dword(EECONFIG_USER, (EECONFIG_USER_DATA_VERSION));
-    uint8_t dummy_user[(EECONFIG_USER_DATA_SIZE)] = {0};
-    eeprom_update_block(EECONFIG_USER_DATABLOCK, dummy_user, (EECONFIG_USER_DATA_SIZE));
+    eeconfig_init_user_datablock();
 #endif
 
 #if defined(VIA_ENABLE)
@@ -273,12 +269,19 @@ void eeconfig_update_handedness(bool val) {
 }
 
 #if (EECONFIG_KB_DATA_SIZE) > 0
+/** \brief eeconfig assert keyboard data block version
+ *
+ * FIXME: needs doc
+ */
+bool eeconfig_is_kb_datablock_valid(void) {
+    return eeprom_read_dword(EECONFIG_KEYBOARD) == (EECONFIG_KB_DATA_VERSION);
+}
 /** \brief eeconfig read keyboard data block
  *
  * FIXME: needs doc
  */
 void eeconfig_read_kb_datablock(void *data) {
-    if (eeprom_read_dword(EECONFIG_KEYBOARD) == (EECONFIG_KB_DATA_VERSION)) {
+    if (eeconfig_is_kb_datablock_valid()) {
         eeprom_read_block(data, EECONFIG_KB_DATABLOCK, (EECONFIG_KB_DATA_SIZE));
     } else {
         memset(data, 0, (EECONFIG_KB_DATA_SIZE));
@@ -292,15 +295,30 @@ void eeconfig_update_kb_datablock(const void *data) {
     eeprom_update_dword(EECONFIG_KEYBOARD, (EECONFIG_KB_DATA_VERSION));
     eeprom_update_block(data, EECONFIG_KB_DATABLOCK, (EECONFIG_KB_DATA_SIZE));
 }
+/** \brief eeconfig init keyboard data block
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void eeconfig_init_kb_datablock(void) {
+    uint8_t dummy_kb[(EECONFIG_KB_DATA_SIZE)] = {0};
+    eeconfig_update_kb_datablock(dummy_kb);
+}
 #endif // (EECONFIG_KB_DATA_SIZE) > 0
 
 #if (EECONFIG_USER_DATA_SIZE) > 0
+/** \brief eeconfig assert user data block version
+ *
+ * FIXME: needs doc
+ */
+bool eeconfig_is_user_datablock_valid(void) {
+    return eeprom_read_dword(EECONFIG_USER) == (EECONFIG_USER_DATA_VERSION);
+}
 /** \brief eeconfig read user data block
  *
  * FIXME: needs doc
  */
 void eeconfig_read_user_datablock(void *data) {
-    if (eeprom_read_dword(EECONFIG_USER) == (EECONFIG_USER_DATA_VERSION)) {
+    if (eeconfig_is_user_datablock_valid()) {
         eeprom_read_block(data, EECONFIG_USER_DATABLOCK, (EECONFIG_USER_DATA_SIZE));
     } else {
         memset(data, 0, (EECONFIG_USER_DATA_SIZE));
@@ -314,4 +332,12 @@ void eeconfig_update_user_datablock(const void *data) {
     eeprom_update_dword(EECONFIG_USER, (EECONFIG_USER_DATA_VERSION));
     eeprom_update_block(data, EECONFIG_USER_DATABLOCK, (EECONFIG_USER_DATA_SIZE));
 }
+/** \brief eeconfig init user data block
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void eeconfig_init_user_datablock(void) {
+    uint8_t dummy_user[(EECONFIG_USER_DATA_SIZE)] = {0};
+    eeconfig_update_user_datablock(dummy_user);
+}
 #endif // (EECONFIG_USER_DATA_SIZE) > 0
diff --git a/quantum/eeconfig.h b/quantum/eeconfig.h
index 9fc563d09c..ee8e9add8b 100644
--- a/quantum/eeconfig.h
+++ b/quantum/eeconfig.h
@@ -134,13 +134,17 @@ bool eeconfig_read_handedness(void);
 void eeconfig_update_handedness(bool val);
 
 #if (EECONFIG_KB_DATA_SIZE) > 0
+bool eeconfig_is_kb_datablock_valid(void);
 void eeconfig_read_kb_datablock(void *data);
 void eeconfig_update_kb_datablock(const void *data);
+void eeconfig_init_kb_datablock(void);
 #endif // (EECONFIG_KB_DATA_SIZE) > 0
 
 #if (EECONFIG_USER_DATA_SIZE) > 0
+bool eeconfig_is_user_datablock_valid(void);
 void eeconfig_read_user_datablock(void *data);
 void eeconfig_update_user_datablock(const void *data);
+void eeconfig_init_user_datablock(void);
 #endif // (EECONFIG_USER_DATA_SIZE) > 0
 
 // Any "checked" debounce variant used requires implementation of:

From d6956668e33ef993d9114a31c0b6c79bebc9ad2c Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Wed, 16 Nov 2022 16:07:51 +0900
Subject: [PATCH 881/959] Specify `DEFAULT_FOLDER` for `v2/splinky` (#19093)

---
 keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk | 2 ++
 keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk | 2 ++
 keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk | 2 ++
 keyboards/bastardkb/scylla/v2/splinky/rules.mk        | 2 ++
 keyboards/bastardkb/skeletyl/v2/splinky/rules.mk      | 2 ++
 keyboards/bastardkb/tbkmini/v2/splinky/rules.mk       | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk
index 21a9506077..7e38f33d5d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk
@@ -35,3 +35,5 @@ POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
+
+DEFAULT_FOLDER = bastardkb/charybdis/3x5/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk
index 6ab474a76f..4dfff6dfd6 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk
@@ -35,3 +35,5 @@ POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
+
+DEFAULT_FOLDER = bastardkb/charybdis/3x6/v2/splinky/v3
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk
index 13c1b39961..34ef782d2f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk
@@ -34,3 +34,5 @@ POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
+
+DEFAULT_FOLDER = bastardkb/charybdis/4x6/v2/splinky/v3
diff --git a/keyboards/bastardkb/scylla/v2/splinky/rules.mk b/keyboards/bastardkb/scylla/v2/splinky/rules.mk
index 8dfc0256ab..67846c1ab3 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky/rules.mk
@@ -31,3 +31,5 @@ SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
+
+DEFAULT_FOLDER = bastardkb/scylla/v2/splinky/v3
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk
index 1ce16352dd..2749d4fc2c 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk
@@ -32,3 +32,5 @@ LAYOUTS = split_3x5_3
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
+
+DEFAULT_FOLDER = bastardkb/skeletyl/v2/splinky/v3
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk
index 6b55f6e595..7bf3459d04 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk
@@ -32,3 +32,5 @@ LAYOUTS = split_3x6_3
 
 SERIAL_DRIVER = vendor
 WS2812_DRIVER = vendor
+
+DEFAULT_FOLDER = bastardkb/tbkmini/v2/splinky/v3

From d86c0d372312dc72a384e166d4cc8653de670610 Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Thu, 17 Nov 2022 02:23:21 +0900
Subject: [PATCH 882/959] Use `keyboard_pre_init_kb(void)` at keyboard level
 (#19091)

---
 keyboards/bastardkb/dilemma/dilemma.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c
index 793f27d2b5..b474a24e7f 100644
--- a/keyboards/bastardkb/dilemma/dilemma.c
+++ b/keyboards/bastardkb/dilemma/dilemma.c
@@ -331,7 +331,7 @@ void matrix_init_kb(void) {
 // Forward declare RP2040 SDK declaration.
 void gpio_init(uint gpio);
 
-void keyboard_pre_init_user(void) {
+void keyboard_pre_init_kb(void) {
     // Ensures that GP26 through GP29 are initialized as digital inputs (as
     // opposed to analog inputs).  These GPIOs are shared with A0 through A3,
     // respectively.  On RP2040-B2 and later, the digital inputs are disabled by
@@ -340,4 +340,6 @@ void keyboard_pre_init_user(void) {
     gpio_init(GP27);
     gpio_init(GP28);
     gpio_init(GP29);
+
+    keyboard_pre_init_user();
 }

From 31fb55ae7b495508c2fd3d56616d11564a0c3f0c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper <ToyKeeper@users.noreply.github.com>
Date: Wed, 16 Nov 2022 14:46:11 -0700
Subject: [PATCH 883/959] fixed MOUSEKEY_INERTIA on AVR (#19096)

Co-authored-by: Selene ToyKeeper <git@toykeeper.net>
---
 quantum/mousekey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/mousekey.c b/quantum/mousekey.c
index b91db80de6..703fb39fa6 100644
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -129,7 +129,7 @@ static int8_t move_unit(uint8_t axis) {
 
         // x**2 acceleration (quadratic, more precise for short movements)
         int16_t percent = (inertia << 8) / mk_time_to_max;
-        percent         = (percent * percent) >> 8;
+        percent         = ((int32_t)percent * percent) >> 8;
         if (inertia < 0) percent = -percent;
 
         // unit = sign(inertia) + (percent of max speed)

From 5d882ab6ef6bc3cf384046f409a86cbb7550153c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 18 Nov 2022 02:16:38 +0000
Subject: [PATCH 884/959] Disable onekey console by default (#19104)

---
 keyboards/handwired/onekey/bluepill_f103c6/config.h     | 2 +-
 keyboards/handwired/onekey/info.json                    | 2 +-
 keyboards/handwired/onekey/keymaps/console/keymap.c     | 8 ++++++++
 keyboards/handwired/onekey/keymaps/console/rules.mk     | 2 ++
 keyboards/handwired/onekey/keymaps/hardware_id/rules.mk | 1 +
 keyboards/handwired/onekey/keymaps/oled/rules.mk        | 1 +
 6 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/handwired/onekey/keymaps/console/rules.mk
 create mode 100644 keyboards/handwired/onekey/keymaps/hardware_id/rules.mk

diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h
index 8b62ed86f2..e243d8685f 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/config.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h
@@ -27,7 +27,7 @@
 
 // This code does not fit into the really small flash of STM32F103x6 together
 // with CONSOLE_ENABLE=yes, and the debugging console is probably more
-// important for the "okeney" testing firmware.  In a real firmware you may be
+// important for the "onekey" testing firmware.  In a real firmware you may be
 // able to use these features if you keep the debugging console disabled.
 #define NO_ACTION_LAYER
 #define NO_ACTION_TAPPING
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 605e73e726..90bbf3476f 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -12,7 +12,7 @@
         "bootmagic": false,
         "mousekey": true,
         "extrakey": true,
-        "console": true,
+        "console": false,
         "command": false,
         "nkro": true,
         "backlight": false,
diff --git a/keyboards/handwired/onekey/keymaps/console/keymap.c b/keyboards/handwired/onekey/keymaps/console/keymap.c
index b47fb59d17..3f5d0664f5 100644
--- a/keyboards/handwired/onekey/keymaps/console/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/console/keymap.c
@@ -18,3 +18,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 }
+
+void keyboard_post_init_user(void) {
+  // Customise these values to desired behaviour
+  debug_enable=true;
+  debug_matrix=true;
+  //debug_keyboard=true;
+  //debug_mouse=true;
+}
diff --git a/keyboards/handwired/onekey/keymaps/console/rules.mk b/keyboards/handwired/onekey/keymaps/console/rules.mk
new file mode 100644
index 0000000000..7c83606d2d
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/console/rules.mk
@@ -0,0 +1,2 @@
+CONSOLE_ENABLE = yes
+DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
diff --git a/keyboards/handwired/onekey/keymaps/hardware_id/rules.mk b/keyboards/handwired/onekey/keymaps/hardware_id/rules.mk
new file mode 100644
index 0000000000..15b7f725b2
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/hardware_id/rules.mk
@@ -0,0 +1 @@
+CONSOLE_ENABLE = yes
diff --git a/keyboards/handwired/onekey/keymaps/oled/rules.mk b/keyboards/handwired/onekey/keymaps/oled/rules.mk
index 6b69e50dbb..83757b1909 100644
--- a/keyboards/handwired/onekey/keymaps/oled/rules.mk
+++ b/keyboards/handwired/onekey/keymaps/oled/rules.mk
@@ -1,3 +1,4 @@
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 TAP_DANCE_ENABLE = yes
+CONSOLE_ENABLE = yes

From fe652e624712ceec25c004398685c1ac9fe95f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Mart=C3=ADnez?=
 <58857054+elpekenin@users.noreply.github.com>
Date: Fri, 18 Nov 2022 16:19:45 +0100
Subject: [PATCH 885/959] Fix references to `mouse_report_t` (which doesnt
 exist) (#19107)

---
 docs/feature_pointing_device.md                      | 10 +++++-----
 keyboards/ploopyco/mouse/mouse.c                     |  2 +-
 keyboards/ploopyco/trackball/trackball.c             |  2 +-
 keyboards/ploopyco/trackball_mini/trackball_mini.c   |  2 +-
 keyboards/ploopyco/trackball_thumb/trackball_thumb.c |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 0771203cdd..be984dd5a5 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -332,10 +332,10 @@ The following configuration options are only available when using `SPLIT_POINTIN
 | `pointing_device_handle_buttons(buttons, pressed, button)` | Callback to handle hardware button presses. Returns a `uint8_t`.                                              |
 | `pointing_device_get_cpi(void)`                            | Gets the current CPI/DPI setting from the sensor, if supported.                                               |
 | `pointing_device_set_cpi(uint16_t)`                        | Sets the CPI/DPI, if supported.                                                                               |
-| `pointing_device_get_report(void)`                         | Returns the current mouse report (as a `mouse_report_t` data structure).                                      |
-| `pointing_device_set_report(mouse_report)`                 | Sets the mouse report to the assigned `mouse_report_t` data structured passed to the function.                |
+| `pointing_device_get_report(void)`                         | Returns the current mouse report (as a `report_mouse_t` data structure).                                      |
+| `pointing_device_set_report(mouse_report)`                 | Sets the mouse report to the assigned `report_mouse_t` data structured passed to the function.                |
 | `pointing_device_send(void)`                               | Sends the current mouse report to the host system.  Function can be replaced.                                 |
-| `has_mouse_report_changed(new_report, old_report)`         | Compares the old and new `mouse_report_t` data and returns true only if it has changed.                       |
+| `has_mouse_report_changed(new_report, old_report)`         | Compares the old and new `report_mouse_t` data and returns true only if it has changed.                       |
 | `pointing_device_adjust_by_defines(mouse_report)`          | Applies rotations and invert configurations to a raw mouse report.                                            |
 
 
@@ -345,9 +345,9 @@ The combined functions below are only available when using `SPLIT_POINTING_ENABL
 
 | Function                                                        | Description                                                                                                              |
 | --------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `pointing_device_set_shared_report(mouse_report)`               | Sets the shared mouse report to the assigned `mouse_report_t` data structured passed to the function.                    |
+| `pointing_device_set_shared_report(mouse_report)`               | Sets the shared mouse report to the assigned `report_mouse_t` data structured passed to the function.                    |
 | `pointing_device_set_cpi_on_side(bool, uint16_t)`               | Sets the CPI/DPI of one side, if supported. Passing `true` will set the left and `false` the right                       |
-| `pointing_device_combine_reports(left_report, right_report)`    | Returns a combined mouse_report of left_report and right_report (as a `mouse_report_t` data structure)                   |
+| `pointing_device_combine_reports(left_report, right_report)`    | Returns a combined mouse_report of left_report and right_report (as a `report_mouse_t` data structure)                   |
 | `pointing_device_task_combined_kb(left_report, right_report)`   | Callback, so keyboard code can intercept and modify the data. Returns a combined mouse report.                           |
 | `pointing_device_task_combined_user(left_report, right_report)` | Callback, so user code can intercept and modify. Returns a combined mouse report using `pointing_device_combine_reports` |
 | `pointing_device_adjust_by_defines_right(mouse_report)`         | Applies right side rotations and invert configurations to a raw mouse report.                                            |
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index 72535bf546..275c02214e 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -75,7 +75,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 #ifdef MOUSEKEY_ENABLE
     tap_code(clockwise ? KC_WH_U : KC_WH_D);
 #else
-    mouse_report_t mouse_report = pointing_device_get_report();
+    report_mouse_t mouse_report = pointing_device_get_report();
     mouse_report.v = clockwise ? 1 : -1;
     pointing_device_set_report(mouse_report);
     pointing_device_send();
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c
index 6dbb73e8f8..8fd5b8650d 100644
--- a/keyboards/ploopyco/trackball/trackball.c
+++ b/keyboards/ploopyco/trackball/trackball.c
@@ -75,7 +75,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 #ifdef MOUSEKEY_ENABLE
     tap_code(clockwise ? KC_WH_U : KC_WH_D);
 #else
-    mouse_report_t mouse_report = pointing_device_get_report();
+    report_mouse_t mouse_report = pointing_device_get_report();
     mouse_report.v = clockwise ? 1 : -1;
     pointing_device_set_report(mouse_report);
     pointing_device_send();
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.c b/keyboards/ploopyco/trackball_mini/trackball_mini.c
index 1e8212814c..a3d8cf99ab 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.c
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.c
@@ -83,7 +83,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 #ifdef MOUSEKEY_ENABLE
     tap_code(clockwise ? KC_WH_U : KC_WH_D);
 #else
-    mouse_report_t mouse_report = pointing_device_get_report();
+    report_mouse_t mouse_report = pointing_device_get_report();
     mouse_report.v = clockwise ? 1 : -1;
     pointing_device_set_report(mouse_report);
     pointing_device_send();
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
index 123ee57151..4a90ced8eb 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
@@ -67,7 +67,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 #ifdef MOUSEKEY_ENABLE
     tap_code(clockwise ? KC_WH_U : KC_WH_D);
 #else
-    mouse_report_t mouse_report = pointing_device_get_report();
+    report_mouse_t mouse_report = pointing_device_get_report();
     mouse_report.v              = clockwise ? 1 : -1;
     pointing_device_set_report(mouse_report);
     pointing_device_send();

From 0bf72e4fe52c7458a0c1376647af2aa53901f6ee Mon Sep 17 00:00:00 2001
From: nopunin10did <w.alex.ronke@gmail.com>
Date: Sat, 19 Nov 2022 14:35:35 -0500
Subject: [PATCH 886/959] [Keyboard] Add Jabberwocky v2 and reorganize (#19014)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../jabberwocky/keymaps/via/keymap.c          |  46 ----
 .../jabberwocky/{ => v1}/config.h             |   0
 .../jabberwocky/{ => v1}/info.json            |   4 +-
 .../{ => v1}/keymaps/default/keymap.c         |   8 +-
 .../{ => v1}/keymaps/nopunin10did/keymap.c    |  13 +-
 .../jabberwocky/v1/keymaps/via/keymap.c       |  46 ++++
 .../nopunin10did => v1/keymaps/via}/rules.mk  |   0
 .../jabberwocky/{ => v1}/readme.md            |   8 +-
 .../jabberwocky/{ => v1}/rules.mk             |   0
 .../jabberwocky/{jabberwocky.c => v1/v1.c}    |   4 +-
 .../jabberwocky/{jabberwocky.h => v1/v1.h}    |   6 +-
 .../nopunin10did/jabberwocky/v2/config.h      |  50 ++++
 .../nopunin10did/jabberwocky/v2/info.json     | 257 ++++++++++++++++++
 .../jabberwocky/v2/keymaps/default/keymap.c   |  38 +++
 .../v2/keymaps/nopunin10did/keymap.c          |  51 ++++
 .../jabberwocky/v2/keymaps/via/keymap.c       |  46 ++++
 .../jabberwocky/{ => v2}/keymaps/via/rules.mk |   0
 .../nopunin10did/jabberwocky/v2/readme.md     |  35 +++
 .../nopunin10did/jabberwocky/v2/rules.mk      |  19 ++
 keyboards/nopunin10did/jabberwocky/v2/v2.c    |  17 ++
 keyboards/nopunin10did/jabberwocky/v2/v2.h    |  65 +++++
 21 files changed, 647 insertions(+), 66 deletions(-)
 delete mode 100644 keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
 rename keyboards/nopunin10did/jabberwocky/{ => v1}/config.h (100%)
 rename keyboards/nopunin10did/jabberwocky/{ => v1}/info.json (99%)
 rename keyboards/nopunin10did/jabberwocky/{ => v1}/keymaps/default/keymap.c (94%)
 rename keyboards/nopunin10did/jabberwocky/{ => v1}/keymaps/nopunin10did/keymap.c (92%)
 create mode 100644 keyboards/nopunin10did/jabberwocky/v1/keymaps/via/keymap.c
 rename keyboards/nopunin10did/jabberwocky/{keymaps/nopunin10did => v1/keymaps/via}/rules.mk (100%)
 rename keyboards/nopunin10did/jabberwocky/{ => v1}/readme.md (78%)
 rename keyboards/nopunin10did/jabberwocky/{ => v1}/rules.mk (100%)
 rename keyboards/nopunin10did/jabberwocky/{jabberwocky.c => v1/v1.c} (88%)
 rename keyboards/nopunin10did/jabberwocky/{jabberwocky.h => v1/v1.h} (97%)
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/config.h
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/info.json
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/keymaps/default/keymap.c
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/keymaps/nopunin10did/keymap.c
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/keymaps/via/keymap.c
 rename keyboards/nopunin10did/jabberwocky/{ => v2}/keymaps/via/rules.mk (100%)
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/readme.md
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/rules.mk
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/v2.c
 create mode 100644 keyboards/nopunin10did/jabberwocky/v2/v2.h

diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c b/keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
deleted file mode 100644
index bf727c9b1f..0000000000
--- a/keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[0] = LAYOUT_rh_any(
-
-KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_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_INT3,KC_BSPC,        KC_NLCK,KC_PSLS,KC_PAST,KC_PAUS,
-        KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS,                KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
-        KC_CAPS,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT ,                KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
-KC_LSFT,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,MO(1),  MO(1),  KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_INT1,KC_RSFT,KC_UP  ,                KC_P1  ,KC_P2  ,KC_P3  ,KC_PENT,
-        KC_LCTL,KC_LGUI,        KC_LALT,KC_MENU,KC_SPC ,                KC_SPC ,        KC_ALGR,        KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0  ,KC_P0  ,KC_PDOT,KC_PENT),
-
-
-[1] = LAYOUT_rh_any(
-QK_BOOT  ,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,
-        _______,_______,_______,_______,QK_BOOT  ,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,
-        _______,_______,        _______,_______,_______,                _______,        _______,        _______,_______,_______,_______,_______,        _______,_______,_______,_______),
-
-[2] = LAYOUT_rh_any(
-_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,
-_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,
-        _______,_______,        _______,_______,_______,                _______,        _______,        _______,_______,_______,_______,_______,        _______,_______,_______,_______),
-};
diff --git a/keyboards/nopunin10did/jabberwocky/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h
similarity index 100%
rename from keyboards/nopunin10did/jabberwocky/config.h
rename to keyboards/nopunin10did/jabberwocky/v1/config.h
diff --git a/keyboards/nopunin10did/jabberwocky/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
similarity index 99%
rename from keyboards/nopunin10did/jabberwocky/info.json
rename to keyboards/nopunin10did/jabberwocky/v1/info.json
index 7744716a13..8145f282d7 100644
--- a/keyboards/nopunin10did/jabberwocky/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Jabberwocky",
     "manufacturer": "NoPunIn10Did",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/railroad",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/jabberwocky/v1",
     "maintainer": "NoPunIn10Did",
     "usb": {
         "vid": "0x4E50",
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT_rh_any": {
+        "LAYOUT_rh": {
             "layout": [
                 {"x":0.75,   "y":0.25,  "label":"Esc"},
                 {"x":2.25,   "y":0.25,  "label":"F1"},
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/default/keymap.c b/keyboards/nopunin10did/jabberwocky/v1/keymaps/default/keymap.c
similarity index 94%
rename from keyboards/nopunin10did/jabberwocky/keymaps/default/keymap.c
rename to keyboards/nopunin10did/jabberwocky/v1/keymaps/default/keymap.c
index 0fa6955d27..40481d717c 100644
--- a/keyboards/nopunin10did/jabberwocky/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/jabberwocky/v1/keymaps/default/keymap.c
@@ -18,17 +18,17 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_rh_any(
+[0] = LAYOUT_rh(
 
-KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,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_BSPC,        KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,    
+KC_ESC ,KC_F1  ,KC_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_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_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_ENT ,                KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,     
 KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,MO(1),  MO(1),  KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                KC_P1  ,KC_P2  ,KC_P3  ,KC_PENT,     
         KC_LCTL,KC_LGUI,        KC_LALT,KC_MENU,KC_SPC ,                KC_SPC ,        KC_ALGR,        KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0  ,KC_P0  ,KC_PDOT,KC_PENT),   
     
     
-[1] = LAYOUT_rh_any(
+[1] = LAYOUT_rh(
 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,QK_BOOT  ,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/v1/keymaps/nopunin10did/keymap.c
similarity index 92%
rename from keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
rename to keyboards/nopunin10did/jabberwocky/v1/keymaps/nopunin10did/keymap.c
index 0ce0ba6156..2d579b39cb 100644
--- a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/keymap.c
+++ b/keyboards/nopunin10did/jabberwocky/v1/keymaps/nopunin10did/keymap.c
@@ -21,15 +21,16 @@
 #define RWINEND RGUI_T(KC_END)
 #define RCTLEND RCTL_T(KC_END)
 #define LSHNUBS LSFT_T(KC_NUBS)
-#define RSHF_RO RSFT_T(KC_RO)
+#define RSHF_RO RSFT_T(KC_INT1)
 #define FN_CALC LT(1,KC_CALC)
 #define FN_MENU LT(1,KC_MENU)
 #define FN_PENT LT(1,KC_PENT)
 #define CTALDEL LCA(KC_DEL)
+#define JPYEN   KC_INT3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_rh_any(
+[0] = LAYOUT_rh(
 
 KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_HOME,KC_END ,KC_PGUP,KC_PGDN,KC_DEL ,KC_INS ,KC_PSCR,KC_BSPC,    
         KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_BSPC,        KC_EQL ,KC_PSLS,KC_PAST,KC_PMNS,    
@@ -39,11 +40,11 @@ KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,LSA_DEL,FN_CALC,KC_N   ,
         KC_LCTL,KC_LGUI,        KC_LALT,FN_MENU,KC_SPC ,                RALTHOM,        RALTHOM,        RWINEND,RCTLEND,KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0  ,KC_P0  ,KC_PDOT,FN_PENT),   
     
     
-[1] = LAYOUT_rh_any(
+[1] = LAYOUT_rh(
 QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NLCK,XXXXXXX,XXXXXXX,XXXXXXX,    
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_JYEN,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
-        KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SLCK,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
+        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NUM ,XXXXXXX,XXXXXXX,XXXXXXX,    
+        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,JPYEN  ,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
+        KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SCRL,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
 LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,_______,     
         _______,_______,        _______,_______,XXXXXXX,                _______,        _______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,KC_PCMM,_______)
 };
diff --git a/keyboards/nopunin10did/jabberwocky/v1/keymaps/via/keymap.c b/keyboards/nopunin10did/jabberwocky/v1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..14ce6dd374
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v1/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_lh(
+
+KC_HOME,KC_END ,KC_PGUP,KC_PGDN,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_INS ,KC_DEL ,
+KC_NUM ,KC_PSLS,KC_PAST,KC_PMNS,        KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_BSPC,        
+KC_P7  ,KC_P8  ,KC_P9  ,KC_PPLS,        KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS,                
+KC_P4  ,KC_P5  ,KC_P6  ,KC_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_ENT ,                
+KC_P1  ,KC_P2  ,KC_P3  ,KC_PENT,KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,MO(1),  MO(1),  KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                
+KC_P0  ,KC_P0  ,KC_PDOT,KC_PENT,        KC_LCTL,KC_LGUI,        KC_LALT,KC_MENU,KC_SPC ,                KC_SPC ,        KC_ALGR,        KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT)        ,
+
+
+[1] = LAYOUT_lh(
+_______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,        
+_______,_______,_______,_______,        _______,_______,_______,_______,QK_BOOT,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,        _______,_______,_______,                _______,        _______,        _______,_______,_______,_______,_______)        ,
+
+[2] = LAYOUT_lh(
+_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,        
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,        _______,_______,_______,                _______,        _______,        _______,_______,_______,_______,_______)
+};
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/rules.mk b/keyboards/nopunin10did/jabberwocky/v1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nopunin10did/jabberwocky/keymaps/nopunin10did/rules.mk
rename to keyboards/nopunin10did/jabberwocky/v1/keymaps/via/rules.mk
diff --git a/keyboards/nopunin10did/jabberwocky/readme.md b/keyboards/nopunin10did/jabberwocky/v1/readme.md
similarity index 78%
rename from keyboards/nopunin10did/jabberwocky/readme.md
rename to keyboards/nopunin10did/jabberwocky/v1/readme.md
index 98c514caa8..8c845064de 100644
--- a/keyboards/nopunin10did/jabberwocky/readme.md
+++ b/keyboards/nopunin10did/jabberwocky/v1/readme.md
@@ -6,14 +6,16 @@ A full-size, columnar-staggered, Alice-style keyboard. The Jabberwocky comes in
 * Dexterous (with numpad on the right side, pictured above)
 * Sinister (with numpad on the left side)
 
-Both the Dexterous and Sinister use the same firmware.  The numpad and the four keys above it are simply transposed from the right to the left side of the board.
+Both the v1 Dexterous and v1 Sinister use the same firmware.  The numpad and the four keys above it are simply transposed from the right to the left side of the board.
 
 For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
 
 * Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did)
-* Hardware Supported: Dexterous Jabberwocky and Sinister Jabberwocky (2021 March)
+* Hardware Supported: Dexterous Jabberwocky and Sinister Jabberwocky v1 (2021 March)
 * Hardware Availability: Currently by request only
 
+**The v1 firmware is not compatible with any of the second-generation v2 Jabberwocky PCBs. Please use the [v2 firmware](../v2/readme.md) instead.**
+
 To reset the board into bootloader mode, do one of the following:
 
 * If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)*
@@ -23,6 +25,6 @@ To reset the board into bootloader mode, do one of the following:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nopunin10did/jabberwocky:default
+    make nopunin10did/jabberwocky/v1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/nopunin10did/jabberwocky/rules.mk b/keyboards/nopunin10did/jabberwocky/v1/rules.mk
similarity index 100%
rename from keyboards/nopunin10did/jabberwocky/rules.mk
rename to keyboards/nopunin10did/jabberwocky/v1/rules.mk
diff --git a/keyboards/nopunin10did/jabberwocky/jabberwocky.c b/keyboards/nopunin10did/jabberwocky/v1/v1.c
similarity index 88%
rename from keyboards/nopunin10did/jabberwocky/jabberwocky.c
rename to keyboards/nopunin10did/jabberwocky/v1/v1.c
index daf85248c5..bea87aa889 100644
--- a/keyboards/nopunin10did/jabberwocky/jabberwocky.c
+++ b/keyboards/nopunin10did/jabberwocky/v1/v1.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "jabberwocky.h"
+#include "v1.h"
diff --git a/keyboards/nopunin10did/jabberwocky/jabberwocky.h b/keyboards/nopunin10did/jabberwocky/v1/v1.h
similarity index 97%
rename from keyboards/nopunin10did/jabberwocky/jabberwocky.h
rename to keyboards/nopunin10did/jabberwocky/v1/v1.h
index 901b1e23ab..7abec1bf1a 100644
--- a/keyboards/nopunin10did/jabberwocky/jabberwocky.h
+++ b/keyboards/nopunin10did/jabberwocky/v1/v1.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_rh_any( \
+#define LAYOUT_rh( \
 	K0007, K0101, K0100, K0201, K0200, K0301, K0300,               K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0000, K0001, K0800, K0801, K0900, K0901, \
            K0004, K0102, K0103, K0202, K0203, K0302,               K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0002,        K0802, K0803, K0902, K0903, \
            K0006, K0104, K0105, K0204, K0205, K0304,               K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705,               K0804, K0805, K0904, K0905, \
@@ -41,7 +41,7 @@
 	{ KC_NO, KC_NO, KC_NO, K0311, K0411, K0511, K0611, K0711, K0811, K0911 }  \
 }
 
-#define LAYOUT_lh_any( \
+#define LAYOUT_lh( \
 	K0800, K0801, K0900, K0901, K0007, K0101, K0100, K0201, K0200, K0301, K0300,               K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0000, K0001,  \
     K0802, K0803, K0902, K0903,        K0004, K0102, K0103, K0202, K0203, K0302,               K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0002,         \
     K0804, K0805, K0904, K0905,        K0006, K0104, K0105, K0204, K0205, K0304,               K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705,                \
diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h
new file mode 100644
index 0000000000..b339209402
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
@@ -0,0 +1,50 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS         12
+#define MATRIX_COLS         10
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS     { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 }
+#define MATRIX_COL_PINS     { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 }
+
+/* LED Configuration */
+#define BACKLIGHT_PINS          {D6}
+// To have all lights shine uniformly, add C6 and B7 to the list above, then undefine the constants below.
+#define LED_NUM_LOCK_PIN        C6
+#define LED_CAPS_LOCK_PIN       B7
+
+#define BACKLIGHT_LEVELS        6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION     COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE            5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Reducing layer count to 3 for via support */
+#define DYNAMIC_KEYMAP_LAYER_COUNT  3
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
new file mode 100644
index 0000000000..10e6e28500
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -0,0 +1,257 @@
+{
+    "keyboard_name": "Jabberwocky",
+    "manufacturer": "NoPunIn10Did",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/jabberwocky/v2",
+    "maintainer": "NoPunIn10Did",
+    "usb": {
+        "vid": "0x4E50",
+        "pid": "0x4A57",
+        "device_version": "0.2.0"
+    },
+    "layouts": {
+        "LAYOUT_lh": {
+            "layout": [
+                {"x":0,      "y":0.25,  "label":"Home"},
+                {"x":1,      "y":0.25,  "label":"End"},
+                {"x":2,      "y":0.25,  "label":"PgUp"},
+                {"x":3,      "y":0.25,  "label":"PgDn"},
+                {"x":5,      "y":0.25,  "label":"Esc"},
+                {"x":6.5,    "y":0.25,  "label":"F1"},
+                {"x":7.5,    "y":0.25,  "label":"F2"},
+                {"x":8.5,    "y":0.25,  "label":"F3"},
+                {"x":9.5,    "y":0.125, "label":"F4"},
+                {"x":10.5,   "y":0.25,  "label":"F5"},
+                {"x":11.5,   "y":0.375, "label":"F6"},
+                {"x":14.75,  "y":0.375, "label":"F7"},
+                {"x":15.75,  "y":0.25,  "label":"F8"},
+                {"x":16.75,  "y":0.125, "label":"F9"},
+                {"x":17.75,  "y":0.25,  "label":"F10"},
+                {"x":18.75,  "y":0.25,  "label":"F11"},
+                {"x":19.75,  "y":0.25,  "label":"F12"},
+                {"x":21,     "y":0.25,  "label":"Print"},
+                {"x":22,     "y":0.25,  "label":"Scroll"},
+                {"x":23,     "y":0.25,  "label":"Ins"},
+                {"x":24,     "y":0.25,  "label":"Del"},
+                
+                {"x":0,      "y":1.5,   "label":"NumLock"},
+                {"x":1,      "y":1.5,   "label":"P-Div"},
+                {"x":2,      "y":1.5,   "label":"P-Mult"},
+                {"x":3,      "y":1.5,   "label":"P-Minus"},
+                {"x":6.25,   "y":1.5,   "label":"Grave"},
+                {"x":7.25,   "y":1.5,   "label":"1"},
+                {"x":8.5,    "y":1.5,   "label":"2"},
+                {"x":9.5,    "y":1.375, "label":"3"},
+                {"x":10.5,   "y":1.5,   "label":"4"},
+                {"x":11.5,   "y":1.625, "label":"5"},
+                {"x":14.75,  "y":1.625, "label":"6"},
+                {"x":15.75,  "y":1.5,   "label":"7"},
+                {"x":16.75,  "y":1.375, "label":"8"},
+                {"x":17.75,  "y":1.5,   "label":"9"},
+                {"x":19,     "y":1.5,   "label":"0"},
+                {"x":20,     "y":1.5,   "label":"Dash"},
+                {"x":21,     "y":1.5,   "label":"Equals"},
+                {"x":22,     "y":1.5,   "label":"Backspace"},
+                {"x":23,     "y":1.5,   "label":"Backspace"},
+                
+                {"x":0,      "y":2.5,   "label":"P-7"},
+                {"x":1,      "y":2.5,   "label":"P-8"},
+                {"x":2,      "y":2.5,   "label":"P-9"},
+                {"x":3,      "y":2.5,   "label":"P-Plus"},
+                {"x":5.5,    "y":2.5,   "w":1.5, "label":"Tab"},
+                {"x":7,      "y":2.5,   "label":"Q"},
+                {"x":8.5,    "y":2.5,   "label":"W"},
+                {"x":9.5,    "y":2.375, "label":"E"},
+                {"x":10.5,   "y":2.5,   "label":"R"},
+                {"x":11.5,   "y":2.625, "label":"T"},
+                {"x":14.75,  "y":2.625, "label":"Y"},
+                {"x":15.75,  "y":2.5,   "label":"U"},
+                {"x":16.75,  "y":2.375, "label":"I"},
+                {"x":17.75,  "y":2.5,   "label":"O"},
+                {"x":19.25,  "y":2.5,   "label":"P"},
+                {"x":20.25,  "y":2.5,   "label":"L bracket"},
+                {"x":21.25,  "y":2.5,   "label":"R bracket"},
+                {"x":22.25,  "y":2.5,   "w":1.5, "label":"ANSI Backslash"},
+                
+                {"x":0,      "y":3.5,   "label":"P-4"},
+                {"x":1,      "y":3.5,   "label":"P-5"},
+                {"x":2,      "y":3.5,   "label":"P-6"},
+                {"x":3,      "y":3.5,   "label":"P-Plus"},
+                {"x":5,      "y":3.5,   "w":1.75, "label":"Caps Lock"},
+                {"x":6.75,   "y":3.5,   "label":"A"},
+                {"x":8.5,    "y":3.5,   "label":"S"},
+                {"x":9.5,    "y":3.375, "label":"D"},
+                {"x":10.5,   "y":3.5,   "label":"F"},
+                {"x":11.5,   "y":3.625, "label":"G"},
+                {"x":14.75,  "y":3.625, "label":"H"},
+                {"x":15.75,  "y":3.5,   "label":"J"},
+                {"x":16.75,  "y":3.375, "label":"K"},
+                {"x":17.75,  "y":3.5,   "label":"L"},
+                {"x":19.5,   "y":3.5,   "label":"Semicolon"},
+                {"x":20.5,   "y":3.5,   "label":"Quote"},
+                {"x":21.5,   "y":3.5,   "label":"Non-US Hash"},
+                {"x":22.5,   "y":3.5,   "w":1.25, "label":"Enter"},
+                
+                {"x":0,      "y":4.5,   "label":"P-1"},
+                {"x":1,      "y":4.5,   "label":"P-2"},
+                {"x":2,      "y":4.5,   "label":"P-3"},
+                {"x":3,      "y":4.5,   "label":"P-Enter"},
+                {"x":4.25,   "y":4.5,   "w":1.25, "label":"Left Shift"},
+                {"x":5.25,   "y":4.5,   "label":"Non-US Backslash"},
+                {"x":6.25,   "y":4.5,   "label":"Z"},
+                {"x":8.5,    "y":4.5,   "label":"X"},
+                {"x":9.5,    "y":4.375, "label":"C"},
+                {"x":10.5,   "y":4.5,   "label":"V"},
+                {"x":11.5,   "y":4.625, "label":"B"},
+                {"x":12.5,   "y":4.625, "label":"Layer"},
+                {"x":13.75,  "y":4.625, "label":"Layer"},
+                {"x":14.75,  "y":4.625, "label":"N"},
+                {"x":15.75,  "y":4.5,   "label":"M"},
+                {"x":16.75,  "y":4.375, "label":"Comma"},
+                {"x":17.75,  "y":4.5,   "label":"Period"},
+                {"x":19.75,  "y":4.5,   "label":"Slash"},
+                {"x":20.75,  "y":4.5,   "label":"JIS Ro"},
+                {"x":21.75,  "y":4.5,   "w":1.25, "label":"Right Shift"},
+                {"x":23,     "y":4.5,   "label":"Up"},
+                
+                {"x":0,      "y":5.5,   "label":"P-0"},
+                {"x":1,      "y":5.5,   "label":"P-00"},
+                {"x":2,      "y":5.5,   "label":"P-Decimal"},
+                {"x":3,      "y":5.5,   "label":"P-Enter"},
+                {"x":4.75,   "y":5.5,   "w":1.25, "label":"Left Ctrl"},
+                {"x":6,      "y":5.5,   "w":1.25, "label":"Left GUI"},
+                {"x":9,      "y":5.5,   "w":1.25, "label":"Left Alt"},
+                {"x":10.25,  "y":5.5,   "w":1.25, "label":"Menu"},
+                {"x":11.5,   "y":5.625, "w":2,    "label":"Space"},
+                {"x":13.75,  "y":5.625, "w":2.75, "label":"Space"},
+                {"x":16.5,   "y":5.5,   "w":1.25, "label":"Right Alt"},
+                {"x":19.5,   "y":5.5,   "w":1.25, "label":"Right GUI"},
+                {"x":20.75,  "y":5.5,   "w":1.25, "label":"Right Ctrl"},
+                {"x":22,     "y":5.5,   "label":"Left"},
+                {"x":23,     "y":5.5,   "label":"Down"},
+                {"x":24,     "y":5.5,   "label":"Right"}
+            ]
+        },
+        "LAYOUT_rh": {
+            "layout": [
+                {"x":0.75,      "y":0.25,  "label":"Esc"},
+                {"x":2.25,    "y":0.25,  "label":"F1"},
+                {"x":3.25,   "y":0.25,  "label":"F2"},
+                {"x":4.25,   "y":0.25,  "label":"F3"},
+                {"x":5.25,   "y":0.125, "label":"F4"},
+                {"x":6.25,   "y":0.25,  "label":"F5"},
+                {"x":7.25,   "y":0.375, "label":"F6"},
+                {"x":10.5,   "y":0.375, "label":"F7"},
+                {"x":11.5,   "y":0.25,  "label":"F8"},
+                {"x":12.5,   "y":0.125, "label":"F9"},
+                {"x":13.5,   "y":0.25,  "label":"F10"},
+                {"x":14.5,   "y":0.25,  "label":"F11"},
+                {"x":15.5,   "y":0.25,  "label":"F12"},
+                {"x":16.75,  "y":0.25,  "label":"Print"},
+                {"x":17.75,  "y":0.25,  "label":"Scroll"},
+                {"x":18.75,  "y":0.25,  "label":"Ins"},
+                {"x":19.75,  "y":0.25,  "label":"Del"},
+                {"x":21,     "y":0.25,  "label":"Home"},
+                {"x":22,     "y":0.25,  "label":"End"},
+                {"x":23,     "y":0.25,  "label":"PgUp"},
+                {"x":24,     "y":0.25,  "label":"PgDn"},
+                
+                {"x":2,      "y":1.5,   "label":"Grave"},
+                {"x":3,      "y":1.5,   "label":"1"},
+                {"x":4.25,   "y":1.5,   "label":"2"},
+                {"x":5.25,   "y":1.375, "label":"3"},
+                {"x":6.25,   "y":1.5,   "label":"4"},
+                {"x":7.25,   "y":1.625, "label":"5"},
+                {"x":10.5,   "y":1.625, "label":"6"},
+                {"x":11.5,   "y":1.5,   "label":"7"},
+                {"x":12.5,   "y":1.375, "label":"8"},
+                {"x":13.5,   "y":1.5,   "label":"9"},
+                {"x":14.75,  "y":1.5,   "label":"0"},
+                {"x":15.75,  "y":1.5,   "label":"Dash"},
+                {"x":16.75,  "y":1.5,   "label":"Equals"},
+                {"x":17.75,  "y":1.5,   "label":"Backspace"},
+                {"x":18.75,  "y":1.5,   "label":"Backspace"},
+                {"x":21,     "y":1.5,   "label":"NumLock"},
+                {"x":22,     "y":1.5,   "label":"P-Div"},
+                {"x":23,     "y":1.5,   "label":"P-Mult"},
+                {"x":24,     "y":1.5,   "label":"P-Minus"},
+                
+                {"x":1.25,   "y":2.5,   "w":1.5, "label":"Tab"},
+                {"x":2.75,   "y":2.5,   "label":"Q"},
+                {"x":4.25,   "y":2.5,   "label":"W"},
+                {"x":5.25,   "y":2.375, "label":"E"},
+                {"x":6.25,   "y":2.5,   "label":"R"},
+                {"x":7.25,   "y":2.625, "label":"T"},
+                {"x":10.5,   "y":2.625, "label":"Y"},
+                {"x":11.5,   "y":2.5,   "label":"U"},
+                {"x":12.5,   "y":2.375, "label":"I"},
+                {"x":13.5,   "y":2.5,   "label":"O"},
+                {"x":15,     "y":2.5,   "label":"P"},
+                {"x":16,     "y":2.5,   "label":"L bracket"},
+                {"x":17,     "y":2.5,   "label":"R bracket"},
+                {"x":18,     "y":2.5,   "w":1.5, "label":"ANSI Backslash"},
+                {"x":21,     "y":2.5,   "label":"P-7"},
+                {"x":22,     "y":2.5,   "label":"P-8"},
+                {"x":23,     "y":2.5,   "label":"P-9"},
+                {"x":24,     "y":2.5,   "label":"P-Plus"},
+                
+                {"x":0.75,   "y":3.5,   "w":1.75, "label":"Caps Lock"},
+                {"x":2.5,    "y":3.5,   "label":"A"},
+                {"x":4.25,   "y":3.5,   "label":"S"},
+                {"x":5.25,   "y":3.375, "label":"D"},
+                {"x":6.25,   "y":3.5,   "label":"F"},
+                {"x":7.25,   "y":3.625, "label":"G"},
+                {"x":10.5,   "y":3.625, "label":"H"},
+                {"x":11.5,   "y":3.5,   "label":"J"},
+                {"x":12.5,   "y":3.375, "label":"K"},
+                {"x":13.5,   "y":3.5,   "label":"L"},
+                {"x":15.25,  "y":3.5,   "label":"Semicolon"},
+                {"x":16.25,  "y":3.5,   "label":"Quote"},
+                {"x":17.25,  "y":3.5,   "label":"Non-US Hash"},
+                {"x":18.25,  "y":3.5,   "w":1.25, "label":"Enter"},
+                {"x":21,     "y":3.5,   "label":"P-4"},
+                {"x":22,     "y":3.5,   "label":"P-5"},
+                {"x":23,     "y":3.5,   "label":"P-6"},
+                {"x":24,     "y":3.5,   "label":"P-Plus"},
+                
+                {"x":0,      "y":4.5,   "w":1.25, "label":"Left Shift"},
+                {"x":1.25,   "y":4.5,   "label":"Non-US Backslash"},
+                {"x":2.25,   "y":4.5,   "label":"Z"},
+                {"x":4.25,   "y":4.5,   "label":"X"},
+                {"x":5.25,   "y":4.375, "label":"C"},
+                {"x":6.25,   "y":4.5,   "label":"V"},
+                {"x":7.25,   "y":4.625, "label":"B"},
+                {"x":8.25,   "y":4.625, "label":"Layer"},
+                {"x":9.5,    "y":4.625, "label":"Layer"},
+                {"x":10.5,   "y":4.625, "label":"N"},
+                {"x":11.5,   "y":4.5,   "label":"M"},
+                {"x":12.5,   "y":4.375, "label":"Comma"},
+                {"x":13.5,   "y":4.5,   "label":"Period"},
+                {"x":15.5,   "y":4.5,   "label":"Slash"},
+                {"x":16.5,   "y":4.5,   "label":"JIS Ro"},
+                {"x":17.5,   "y":4.5,   "w":1.25, "label":"Right Shift"},
+                {"x":18.75,  "y":4.5,   "label":"Up"},
+                {"x":21,     "y":4.5,   "label":"P-1"},
+                {"x":22,     "y":4.5,   "label":"P-2"},
+                {"x":23,     "y":4.5,   "label":"P-3"},
+                {"x":24,     "y":4.5,   "label":"P-Enter"},
+                
+                {"x":0.5,    "y":5.5,   "w":1.25, "label":"Left Ctrl"},
+                {"x":1.75,   "y":5.5,   "w":1.25, "label":"Left GUI"},
+                {"x":4.75,   "y":5.5,   "w":1.25, "label":"Left Alt"},
+                {"x":6,      "y":5.5,   "w":1.25, "label":"Menu"},
+                {"x":7.25,   "y":5.625, "w":2,    "label":"Space"},
+                {"x":9.5,    "y":5.625, "w":2.75, "label":"Space"},
+                {"x":12.25,  "y":5.5,   "w":1.25, "label":"Right Alt"},
+                {"x":15.25,  "y":5.5,   "w":1.25, "label":"Right GUI"},
+                {"x":16.5,   "y":5.5,   "w":1.25, "label":"Right Ctrl"},
+                {"x":17.75,  "y":5.5,   "label":"Left"},
+                {"x":18.75,  "y":5.5,   "label":"Down"},
+                {"x":19.75,  "y":5.5,   "label":"Right"},
+                {"x":21,     "y":5.5,   "label":"P-0"},
+                {"x":22,     "y":5.5,   "label":"P-00"},
+                {"x":23,     "y":5.5,   "label":"P-Decimal"},
+                {"x":24,     "y":5.5,   "label":"P-Enter"}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nopunin10did/jabberwocky/v2/keymaps/default/keymap.c b/keyboards/nopunin10did/jabberwocky/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..84fe9586ee
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_lh(
+
+KC_HOME,KC_END ,KC_PGUP,KC_PGDN, KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_INS ,KC_DEL ,   
+KC_NUM ,KC_PSLS,KC_PAST,KC_PMNS,         KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_BSPC,           
+KC_P7  ,KC_P8  ,KC_P9  ,KC_PPLS,         KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS,                    
+KC_P4  ,KC_P5  ,KC_P6  ,KC_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_ENT ,                    
+KC_P1  ,KC_P2  ,KC_P3  ,KC_PENT, KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,MO(1),  MO(1),  KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                    
+KC_P0  ,KC_P0  ,KC_PDOT,KC_PENT,         KC_LCTL,KC_LGUI,        KC_LALT,KC_APP ,KC_SPC ,                KC_SPC ,KC_ALGR,        KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
+    
+    
+[1] = LAYOUT_lh(
+XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
+XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,            
+XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                   
+XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                     
+XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_PAUS,_______,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,_______,XXXXXXX,                     
+XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        _______,_______,        _______,XXXXXXX,XXXXXXX,                XXXXXXX,_______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX)
+};
diff --git a/keyboards/nopunin10did/jabberwocky/v2/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/v2/keymaps/nopunin10did/keymap.c
new file mode 100644
index 0000000000..d7f4c95d48
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/keymaps/nopunin10did/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define LSA_DEL LSA_T(KC_DEL)
+#define RALTHOM RALT_T(KC_HOME)
+#define SHAGHOM SAGR_T(KC_HOME)
+#define RWINEND RGUI_T(KC_END)
+#define RCTLEND RCTL_T(KC_END)
+#define LSHNUBS LSFT_T(KC_NUBS)
+#define RSHF_RO RSFT_T(KC_INT1)
+#define FN_CALC LT(1,KC_CALC)
+#define FN_MUTE LT(1,KC_F16)
+#define FN_PENT LT(1,KC_PENT)
+#define CTALDEL LCA(KC_DEL)
+#define JPYEN   KC_INT3
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_rh(
+
+KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_HOME,KC_END ,KC_PGUP,KC_PGDN,KC_DEL ,KC_INS ,KC_PSCR,KC_BSPC,    
+        KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_BSPC,        KC_EQL ,KC_PSLS,KC_PAST,KC_PMNS,    
+        KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS,                KC_P7  ,KC_P8  ,KC_P9  ,KC_PPLS,     
+        KC_LCTL,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT ,KC_ENT ,                KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,     
+KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,LSA_DEL,FN_CALC,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                KC_P1  ,KC_P2  ,KC_P3  ,FN_PENT,     
+        KC_LCTL,KC_LGUI,        KC_LALT,FN_MUTE,KC_SPC ,                SHAGHOM,        RALTHOM,        RWINEND,RCTLEND,KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0  ,KC_P0  ,KC_PDOT,FN_PENT),   
+    
+    
+[1] = LAYOUT_rh(
+QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
+        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NLCK,XXXXXXX,XXXXXXX,XXXXXXX,    
+        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,JPYEN  ,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
+        KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SLCK,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
+LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,_______,     
+        _______,_______,        _______,_______,XXXXXXX,                _______,        _______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,KC_PCMM,_______)
+};
diff --git a/keyboards/nopunin10did/jabberwocky/v2/keymaps/via/keymap.c b/keyboards/nopunin10did/jabberwocky/v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5827bd963c
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_lh(
+
+KC_HOME,KC_END ,KC_PGUP,KC_PGDN,KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_INS ,KC_DEL ,
+KC_NUM ,KC_PSLS,KC_PAST,KC_PMNS,        KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL ,KC_BSPC,KC_BSPC,        
+KC_P7  ,KC_P8  ,KC_P9  ,KC_PPLS,        KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_RBRC,KC_BSLS,                
+KC_P4  ,KC_P5  ,KC_P6  ,KC_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_ENT ,                
+KC_P1  ,KC_P2  ,KC_P3  ,KC_PENT,KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,MO(1),  MO(1),  KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                
+KC_P0  ,KC_P0  ,KC_PDOT,KC_PENT,        KC_LCTL,KC_LGUI,        KC_LALT,KC_APP ,KC_SPC ,                KC_SPC ,        KC_ALGR,        KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT)        ,
+
+
+[1] = LAYOUT_lh(
+_______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,        
+_______,_______,_______,_______,        _______,_______,_______,_______,QK_BOOT,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,        _______,_______,_______,                _______,        _______,        _______,_______,_______,_______,_______)        ,
+
+[2] = LAYOUT_lh(
+_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,_______,        
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                
+_______,_______,_______,_______,        _______,_______,        _______,_______,_______,                _______,        _______,        _______,_______,_______,_______,_______)
+};
diff --git a/keyboards/nopunin10did/jabberwocky/keymaps/via/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nopunin10did/jabberwocky/keymaps/via/rules.mk
rename to keyboards/nopunin10did/jabberwocky/v2/keymaps/via/rules.mk
diff --git a/keyboards/nopunin10did/jabberwocky/v2/readme.md b/keyboards/nopunin10did/jabberwocky/v2/readme.md
new file mode 100644
index 0000000000..a9e440fcd6
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/readme.md
@@ -0,0 +1,35 @@
+# Jabberwocky Gen. 2
+
+![Jabberwocky v2 CNC Edition](https://i.imgur.com/xfpl9H2h.jpg)
+
+A full-size, columnar-staggered, Alice-style keyboard. Specifically, this firmware is for the second generation (v2) of Jabberwocky PCBs, all of which use the same MCU (Atmega 32u4) and firmware.
+
+| PCB Variant   | Numpad Side       | Daughterboard | Soldered / Hotswap        | In-switch LEDs        |
+| ------------- | ----------------- | ------------- | ------------------------- | --------------------- |
+| Blue          | Left (Sinister)   | Elite C       | Soldered (SMD DIY kit)    | Caps & Num Indicators |
+| Red           | Right (Dexterous) | Elite C       | Soldered (SMD DIY kit)    | Caps & Num Indicators |
+| Green\*       | Left (Sinister)   | Unified DB    | Soldered (switches only)  | Backlit + Indicators  |
+| Yellow        | Right (Dexterous) | Unified DB    | Soldered (switches only)  | Backlit + Indicators  |
+| Black\*       | Left (Sinister)   | Unified DB    | Hotswap Hybrid            | None                  |
+| White         | Right (Dexterous) | Unified DB    | Hotswap Hybrid            | None                  |
+
+\* *Only the Green and Black PCBs will be compatible with the upcoming Sinister Jabberwocky CNC case.*
+
+
+For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
+
+- Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did)
+- Hardware Supported: Jabberwocky 2nd Generation PCBs
+- Hardware Availability: Currently by request only
+
+To reset the board into bootloader mode, do one of the following:
+
+- If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)*
+- If using the Blue or Red PCBs, use the onboard Reset button on your Elite C
+- If using any of the other PCBs, use the onboard Reset button on the PCB itself
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nopunin10did/jabberwocky/v2: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/nopunin10did/jabberwocky/v2/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/rules.mk
new file mode 100644
index 0000000000..9d065177d4
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+BACKLIGHT_DRIVER = software # Software-driven backlight driver
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/nopunin10did/jabberwocky/v2/v2.c b/keyboards/nopunin10did/jabberwocky/v2/v2.c
new file mode 100644
index 0000000000..792093997b
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/v2.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "v2.h"
diff --git a/keyboards/nopunin10did/jabberwocky/v2/v2.h b/keyboards/nopunin10did/jabberwocky/v2/v2.h
new file mode 100644
index 0000000000..f319eb2240
--- /dev/null
+++ b/keyboards/nopunin10did/jabberwocky/v2/v2.h
@@ -0,0 +1,65 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_lh( \
+    K0000, K0001, K0100, K0101, K0200, K0201, K0300, K0301, K0400, K0401, K0500,               K0501, K0600, K0601, K0700, K0701, K0800, K0801, K0900, K0901, K0905,    \
+    K0002, K0003, K0102, K0103,        K0203, K0302, K0303, K0402, K0403, K0502,               K0503, K0602, K0603, K0702, K0703, K0802, K0803, K0902, K0903,           \
+    K0004, K0005, K0104, K0105,        K0205, K0304, K0305, K0404, K0405, K0504,               K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904,                  \
+    K0006, K0007, K0106, K0107,        K0207, K0306, K0307, K0406, K0407, K0506,               K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0907,                  \
+    K0008, K0009, K0108, K0109, K0208, K0209, K0308, K0309, K0408, K0409, K0508, K0510, K0511, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908,                  \
+    K0010, K0011, K0110, K0111,        K0211, K0310,        K0311, K0410, K0411,               K0610,        K0611,        K0711, K0810, K0811, K0910, K0911            \
+) \
+{ \
+    { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
+    { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
+    { K0002, K0102, KC_NO, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
+    { K0003, K0103, K0203, K0303, K0403, K0503, K0603, K0703, K0803, K0903 }, \
+    { K0004, K0104, KC_NO, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
+    { K0005, K0105, K0205, K0305, K0405, K0505, K0605, K0705, K0805, K0905 }, \
+    { K0006, K0106, KC_NO, K0306, K0406, K0506, K0606, K0706, K0806, KC_NO }, \
+    { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
+    { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
+    { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, KC_NO }, \
+    { K0010, K0110, KC_NO, K0310, K0410, K0510, K0610, KC_NO, K0810, K0910 }, \
+    { K0011, K0111, K0211, K0311, K0411, K0511, K0611, K0711, K0811, K0911 }  \
+}
+
+#define LAYOUT_rh( \
+    K0200, K0201, K0300, K0301, K0400, K0401, K0500,               K0501, K0600, K0601, K0700, K0701, K0800, K0801, K0900, K0901, K0905, K0000, K0001, K0100, K0101,     \
+           K0203, K0302, K0303, K0402, K0403, K0502,               K0503, K0602, K0603, K0702, K0703, K0802, K0803, K0902, K0903,        K0002, K0003, K0102, K0103,     \
+           K0205, K0304, K0305, K0404, K0405, K0504,               K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904,               K0004, K0005, K0104, K0105,     \
+           K0207, K0306, K0307, K0406, K0407, K0506,               K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0907,               K0006, K0007, K0106, K0107,     \
+    K0208, K0209, K0308, K0309, K0408, K0409, K0508, K0510, K0511, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908,               K0008, K0009, K0108, K0109,     \
+           K0211, K0310,        K0311, K0410, K0411,               K0610,        K0611,        K0711, K0810, K0811, K0910, K0911,        K0010, K0011, K0110, K0111      \
+) \
+{ \
+    { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
+    { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
+    { K0002, K0102, KC_NO, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
+    { K0003, K0103, K0203, K0303, K0403, K0503, K0603, K0703, K0803, K0903 }, \
+    { K0004, K0104, KC_NO, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
+    { K0005, K0105, K0205, K0305, K0405, K0505, K0605, K0705, K0805, K0905 }, \
+    { K0006, K0106, KC_NO, K0306, K0406, K0506, K0606, K0706, K0806, KC_NO }, \
+    { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
+    { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
+    { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, KC_NO }, \
+    { K0010, K0110, KC_NO, K0310, K0410, K0510, K0610, KC_NO, K0810, K0910 }, \
+    { K0011, K0111, K0211, K0311, K0411, K0511, K0611, K0711, K0811, K0911 }  \
+}

From e16540795751c744a957ed3774eec99e587fd8db Mon Sep 17 00:00:00 2001
From: jels <66403163+Jels02@users.noreply.github.com>
Date: Sun, 20 Nov 2022 05:43:59 +1000
Subject: [PATCH 887/959] [Keyboard] Add Boaty (#17378)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jels02 <joah@Joah-Big-PC.localdomain>
---
 keyboards/jels/boaty/config.h                 | 23 +++++
 keyboards/jels/boaty/info.json                | 97 +++++++++++++++++++
 keyboards/jels/boaty/keymaps/default/keymap.c | 47 +++++++++
 keyboards/jels/boaty/keymaps/via/keymap.c     | 47 +++++++++
 keyboards/jels/boaty/keymaps/via/rules.mk     |  1 +
 keyboards/jels/boaty/readme.md                | 27 ++++++
 keyboards/jels/boaty/rules.mk                 |  1 +
 7 files changed, 243 insertions(+)
 create mode 100644 keyboards/jels/boaty/config.h
 create mode 100644 keyboards/jels/boaty/info.json
 create mode 100644 keyboards/jels/boaty/keymaps/default/keymap.c
 create mode 100644 keyboards/jels/boaty/keymaps/via/keymap.c
 create mode 100644 keyboards/jels/boaty/keymaps/via/rules.mk
 create mode 100644 keyboards/jels/boaty/readme.md
 create mode 100644 keyboards/jels/boaty/rules.mk

diff --git a/keyboards/jels/boaty/config.h b/keyboards/jels/boaty/config.h
new file mode 100644
index 0000000000..d78952f261
--- /dev/null
+++ b/keyboards/jels/boaty/config.h
@@ -0,0 +1,23 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/info.json
new file mode 100644
index 0000000000..43065a895a
--- /dev/null
+++ b/keyboards/jels/boaty/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "Boaty",
+    "manufacurer": "Jels",
+    "usb": {
+        "vid": "0x6A6B",
+        "pid": "0x000B",
+        "device_version": "1.0.0"
+    },
+    "url": "",
+    "maintainer": "Jels",
+    "processor":"atmega328p",
+    "bootloader":"usbasploader",
+    "features":
+    {
+        "bootmagic": true,
+        "nkro": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "backlight": false
+    },
+    "matrix_pins": {
+        "cols": [ "B1", "C0", "C1", "C2", "D4", "D1", "D0", "C5", "C4", "C3", "D5" ],
+        "rows": ["D6", "B0", "D7", "B5", "B3", "B4", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Num Lock", "matrix": [2, 10], "x":6.75, "y": 0 },
+                { "label": "-", "matrix": [1, 10],  "x":6.75, "y": 1 },
+                { "label": "*", "matrix": [1, 9], "x":7.75, "y": 1 },
+                { "label": "7", "matrix": [0, 8], "x":6.75, "y": 2 },
+                { "label": "8", "matrix": [0, 9], "x":7.75, "y": 2 },
+                { "label": "9", "matrix": [0, 10], "x":8.75, "y": 2 },
+                { "label": "4", "matrix": [0, 4], "x":6.75, "y": 3 },
+                { "label": "5", "matrix": [0, 5], "x":7.75, "y": 3 },
+                { "label": "6", "matrix": [0, 6], "x":8.75, "y": 3 },
+                { "label": "+", "matrix": [0, 7], "x":9.75, "y": 3 },
+                { "label": "1", "matrix": [1, 4], "x":6.75, "y": 4 },
+                { "label": "2", "matrix": [1, 5], "x":7.75, "y": 4 },
+                { "label": "3", "matrix": [1, 6], "x":8.75, "y": 4 },
+                { "label": "Ent", "matrix": [1, 7], "x":9.75, "y": 4 },
+                { "label": "/", "matrix": [1, 8], "x":10.75, "y": 4 },
+                { "label": "0", "matrix": [2, 4], "x":6.75, "y": 5 },
+                { "label": "00", "matrix": [2, 5], "x":7.75, "y": 5 },
+                { "label": ".", "matrix": [2, 6], "x":8.75, "y": 5 },
+                { "label": "Ent", "matrix": [2, 7], "x":9.75, "y": 5 },
+                { "label": "=", "matrix": [2, 8], "x":10.75, "y": 5 },
+                { "label": "Back", "matrix": [2, 9], "x":11.75, "y": 5 },
+                { "label": "Esc", "matrix": [6, 0], "x":0, "y": 7.25 },
+                { "label": "Tab", "matrix": [4, 0], "x":1, "y": 7.25 },
+                { "label": "Q", "matrix": [5, 0], "x":2, "y": 7.25 },
+                { "label": "W", "matrix": [5, 1], "x":3, "y": 7.25 },
+                { "label": "E", "matrix": [5, 2], "x":4, "y": 7.25 },
+                { "label": "R", "matrix": [5, 3], "x":5, "y": 7.25 },
+                { "label": "T", "matrix": [5, 4], "x":6, "y": 7.25 },
+                { "label": "Y", "matrix": [3, 5], "x":7, "y": 7.25 },
+                { "label": "U", "matrix": [3, 6], "x":8, "y": 7.25 },
+                { "label": "I", "matrix": [3, 7], "x":9, "y": 7.25 },
+                { "label": "O", "matrix": [3, 8], "x":10, "y": 7.25 },
+                { "label": "P", "matrix": [3, 9], "x":11, "y": 7.25 },
+                { "label": "Back", "matrix": [3, 10], "x":12, "y": 7.25 },
+                { "label": "Del", "matrix": [5, 10], "x":13, "y": 7.25 },
+                { "label": "Caps", "matrix": [6, 1], "x":1, "y": 8.25 },
+                { "label": "A", "matrix": [3, 0], "x":2, "y": 8.25 },
+                { "label": "S", "matrix": [3, 1], "x":3, "y": 8.25 },
+                { "label": "D", "matrix": [3, 2], "x":4, "y": 8.25 },
+                { "label": "F", "matrix": [3, 3], "x":5, "y": 8.25 },
+                { "label": "G", "matrix": [3, 4], "x":6, "y": 8.25 },
+                { "label": "H", "matrix": [4, 5], "x":7, "y": 8.25 },
+                { "label": "J", "matrix": [4, 6], "x":8, "y": 8.25 },
+                { "label": "K", "matrix": [4, 7], "x":9, "y": 8.25 },
+                { "label": "L", "matrix": [4, 8], "x":10, "y": 8.25 },
+                { "label": ":", "matrix": [4, 9], "x":11, "y": 8.25 },
+                { "label": "Enter", "matrix": [4, 10], "x":12, "y": 8.25 },
+                { "label": "Shift", "matrix": [6, 2], "x":2, "y": 9.25 },
+                { "label": "Z", "matrix": [4, 1], "x":3, "y": 9.25 },
+                { "label": "X", "matrix": [4, 2], "x":4, "y": 9.25 },
+                { "label": "C", "matrix": [4, 3], "x":5, "y": 9.25 },
+                { "label": "V", "matrix": [4, 4], "x":6, "y": 9.25 },
+                { "label": "B", "matrix": [5, 5], "x":7, "y": 9.25 },
+                { "label": "N", "matrix": [5, 6], "x":8, "y": 9.25 },
+                { "label": "M", "matrix": [5, 7], "x":9, "y": 9.25 },
+                { "label": "<", "matrix": [5, 8], "x":10, "y": 9.25 },
+                { "label": "Shift", "matrix": [5, 9], "x":11, "y": 9.25 },
+                { "label": "Ctl", "matrix": [6, 3], "x":4, "y": 10.25 },
+                { "label": "Alt", "matrix": [6, 4], "x":5, "y": 10.25 },
+                { "matrix": [6, 6], "x":6, "y": 10.25 },
+                { "matrix": [6, 7], "x":7, "y": 10.25 },
+                { "label": "Alt", "matrix": [6, 8], "x":8, "y": 10.25 },
+                { "label": "Ctl", "matrix": [6, 9], "x":9, "y": 10.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/jels/boaty/keymaps/default/keymap.c b/keyboards/jels/boaty/keymaps/default/keymap.c
new file mode 100644
index 0000000000..885056246d
--- /dev/null
+++ b/keyboards/jels/boaty/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+/*  Copyright 2022 Joah Nelson (jels)
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+                                            KC_NUM,
+                                            KC_PAST, KC_PSLS,
+                                            KC_P7,   KC_P8,   KC_P9,
+                                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+                                            KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
+                                            KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
+
+KC_1, KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_BSPC, KC_DEL,
+        KC_1, KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,    KC_J,    KC_K,   KC_L,    KC_ENT,
+            KC_1,  KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   KC_RSFT,
+                          KC_LCTL, KC_LALT, KC_SPC, KC_1, KC_RALT, KC_RCTL
+),
+[1] = LAYOUT_all(
+                                            KC_F2,
+                                            KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/jels/boaty/keymaps/via/keymap.c b/keyboards/jels/boaty/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f88a3774da
--- /dev/null
+++ b/keyboards/jels/boaty/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/*  Copyright 2022 Joah Nelson (jels)
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+                                            KC_NUM,
+                                            KC_PAST, KC_PSLS,
+                                            KC_P7,   KC_P8,   KC_P9,
+                                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+                                            KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
+                                            KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
+
+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_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_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,    KC_COMM, KC_RSFT,
+                          KC_LCTL, KC_LALT, KC_SPC,  MO(1), KC_RALT, KC_RCTL
+),
+[1] = LAYOUT_all(
+                                            KC_F2,
+                                            KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/jels/boaty/keymaps/via/rules.mk b/keyboards/jels/boaty/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/jels/boaty/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jels/boaty/readme.md b/keyboards/jels/boaty/readme.md
new file mode 100644
index 0000000000..d5084b1098
--- /dev/null
+++ b/keyboards/jels/boaty/readme.md
@@ -0,0 +1,27 @@
+# Boaty
+
+![Boaty](https://i.imgur.com/6LEaYxSh.jpg)
+
+* Keyboard Maintainer: [jels](https://github.com/JoahNelson)
+* Hardware Supported: Boaty
+* Hardware Availabililty: Limited Group buy from: [jels](https://jels.au)
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make jels/boaty:default
+    
+Flashing example for this keyboard:
+
+    make jels/boaty:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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 leftmost key (ESC) and plug in the keyboard
+* **USBASPLoader**: Press down the BOOT switch and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+* **Exit Bootloader**: To exit the bootloader, press the RESET switch (Left of BOOT).
diff --git a/keyboards/jels/boaty/rules.mk b/keyboards/jels/boaty/rules.mk
new file mode 100644
index 0000000000..837f4bffb5
--- /dev/null
+++ b/keyboards/jels/boaty/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank

From ede2b4155d3b6c1ea58b3d68f2dd5a50ccbdca48 Mon Sep 17 00:00:00 2001
From: Elliot Powell <32494740+e11i0t23@users.noreply.github.com>
Date: Sat, 19 Nov 2022 21:39:16 +0000
Subject: [PATCH 888/959] [Keyboard] Add keebsforall freebird75 (#18653)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebsforall/freebird75/info.json    | 463 ++++++++++++++++++
 .../freebird75/keymaps/default/keymap.c       |  17 +
 .../freebird75/keymaps/via/keymap.c           |  44 ++
 .../freebird75/keymaps/via/rules.mk           |   1 +
 keyboards/keebsforall/freebird75/readme.md    |  27 +
 keyboards/keebsforall/freebird75/rules.mk     |   1 +
 6 files changed, 553 insertions(+)
 create mode 100644 keyboards/keebsforall/freebird75/info.json
 create mode 100644 keyboards/keebsforall/freebird75/keymaps/default/keymap.c
 create mode 100644 keyboards/keebsforall/freebird75/keymaps/via/keymap.c
 create mode 100644 keyboards/keebsforall/freebird75/keymaps/via/rules.mk
 create mode 100644 keyboards/keebsforall/freebird75/readme.md
 create mode 100644 keyboards/keebsforall/freebird75/rules.mk

diff --git a/keyboards/keebsforall/freebird75/info.json b/keyboards/keebsforall/freebird75/info.json
new file mode 100644
index 0000000000..9088f2c0f3
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/info.json
@@ -0,0 +1,463 @@
+{
+    "manufacturer": "KeebsForAll",
+    "keyboard_name": "freebird75",
+    "maintainer": "Elliot Powell",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "B7"],
+        "rows": ["C7", "C6", "B6", "B5", "B4", "D7"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x7575",
+        "vid": "0x6B66"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "matrix": [0,0],
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,1],
+                    "x": 1.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,2],
+                    "x": 2.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,3],
+                    "x": 3.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,4],
+                    "x": 4.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,5],
+                    "x": 5.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,6],
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,7],
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,8],
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,9],
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,10],
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,11],
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,12],
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,13],
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,14],
+                    "x": 15.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [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": [4,14],
+                    "x": 14,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,14],
+                    "x": 15.25,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [2,0],
+                    "x": 0,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [2,1],
+                    "x": 1.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,2],
+                    "x": 2.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,3],
+                    "x": 3.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,4],
+                    "x": 4.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,5],
+                    "x": 5.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,6],
+                    "x": 6.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,7],
+                    "x": 7.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,8],
+                    "x": 8.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,9],
+                    "x": 9.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,10],
+                    "x": 10.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,11],
+                    "x": 11.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,12],
+                    "x": 12.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,13],
+                    "x": 13.5,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [2,14],
+                    "x": 15.25,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [3,0],
+                    "x": 0,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "matrix": [3,1],
+                    "x": 1.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,2],
+                    "x": 2.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,3],
+                    "x": 3.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,4],
+                    "x": 4.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,5],
+                    "x": 5.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,6],
+                    "x": 6.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,7],
+                    "x": 7.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,8],
+                    "x": 8.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,9],
+                    "x": 9.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,10],
+                    "x": 10.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,11],
+                    "x": 11.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,13],
+                    "x": 12.75,
+                    "y": 3.25,
+                    "w": 2.25
+                },
+                {
+                    "matrix": [3,14],
+                    "x": 15.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [4,0],
+                    "x": 0,
+                    "y": 4.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [4,1],
+                    "x": 1.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,2],
+                    "x": 2.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,3],
+                    "x": 3.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,4],
+                    "x": 4.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,5],
+                    "x": 5.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,6],
+                    "x": 6.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,7],
+                    "x": 7.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,8],
+                    "x": 8.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,9],
+                    "x": 9.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,10],
+                    "x": 10.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,11],
+                    "x": 11.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,12],
+                    "x": 12.25,
+                    "y": 4.25,
+                    "w": 1.75
+                },
+                {
+                    "matrix": [4,13],
+                    "x": 14.25,
+                    "y": 4.5
+                },
+                {
+                    "matrix": [5,0],
+                    "x": 0,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [5,1],
+                    "x": 1.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [5,2],
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [5,6],
+                    "x": 3.75,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "matrix": [5,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,14],
+                    "x": 15.25,
+                    "y": 5.5
+                }
+            ]
+
+        }
+    }
+}
diff --git a/keyboards/keebsforall/freebird75/keymaps/default/keymap.c b/keyboards/keebsforall/freebird75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..45540d525f
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/keymaps/default/keymap.c
@@ -0,0 +1,17 @@
+// Copyright 2022 Elliot Powell (@Elliot Powell)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+     */
+    [0] = LAYOUT(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_SCRL,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/keebsforall/freebird75/keymaps/via/keymap.c b/keyboards/keebsforall/freebird75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9908b1f762
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+// Copyright 2022 Elliot Powell (@Elliot Powell)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+     */
+[0] = LAYOUT( /* Base */
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_SCRL,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT(  /* 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),
+
+[2] = LAYOUT( /* 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),
+
+[3] = LAYOUT( /* 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)
+};
diff --git a/keyboards/keebsforall/freebird75/keymaps/via/rules.mk b/keyboards/keebsforall/freebird75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keebsforall/freebird75/readme.md b/keyboards/keebsforall/freebird75/readme.md
new file mode 100644
index 0000000000..80be9266b0
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/readme.md
@@ -0,0 +1,27 @@
+# Freebird 75
+
+![fb75](https://i.imgur.com/fGRQZ2gh.jpg)
+
+The Freebird75 is the latest addition to the Freebird line at KeebsForAll, a series aiming to provide a set of good quality keyboards at an affordable price
+
+* Keyboard Maintainer: [Elliot Powell](https://github.com/e11i0t23)
+* Hardware Supported: Freebird75
+* Hardware Availability: [KeebsForAll](https://keebsforall.com/products/freebird75)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb keebsforall/freebird75 -km via
+
+Flashing example for this keyboard:
+
+    qmk flash -kb keebsforall/freebird75 -km via
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## 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/keebsforall/freebird75/rules.mk b/keyboards/keebsforall/freebird75/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From becd7e5975a3696f7ab7c00088a78143ea84698e Mon Sep 17 00:00:00 2001
From: Yizhen Liu <62583086+edwardslau@users.noreply.github.com>
Date: Sat, 19 Nov 2022 14:51:59 -0700
Subject: [PATCH 889/959] [Keyboard] GrayStudio Aero75 Hotswap (#18883)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/gray_studio/aero75/aero75.c         |  3 +
 keyboards/gray_studio/aero75/aero75.h         | 19 +++++
 keyboards/gray_studio/aero75/chconf.h         | 29 +++++++
 keyboards/gray_studio/aero75/config.h         | 76 +++++++++++++++++++
 keyboards/gray_studio/aero75/halconf.h        | 25 ++++++
 keyboards/gray_studio/aero75/info.json        | 16 ++++
 .../aero75/keymaps/default/keymap.c           | 58 ++++++++++++++
 .../gray_studio/aero75/keymaps/via/keymap.c   | 58 ++++++++++++++
 .../gray_studio/aero75/keymaps/via/rules.mk   |  2 +
 keyboards/gray_studio/aero75/mcuconf.h        | 27 +++++++
 keyboards/gray_studio/aero75/readme.md        |  1 +
 keyboards/gray_studio/aero75/rules.mk         | 21 +++++
 12 files changed, 335 insertions(+)
 create mode 100644 keyboards/gray_studio/aero75/aero75.c
 create mode 100644 keyboards/gray_studio/aero75/aero75.h
 create mode 100644 keyboards/gray_studio/aero75/chconf.h
 create mode 100644 keyboards/gray_studio/aero75/config.h
 create mode 100644 keyboards/gray_studio/aero75/halconf.h
 create mode 100644 keyboards/gray_studio/aero75/info.json
 create mode 100644 keyboards/gray_studio/aero75/keymaps/default/keymap.c
 create mode 100644 keyboards/gray_studio/aero75/keymaps/via/keymap.c
 create mode 100644 keyboards/gray_studio/aero75/keymaps/via/rules.mk
 create mode 100644 keyboards/gray_studio/aero75/mcuconf.h
 create mode 100644 keyboards/gray_studio/aero75/readme.md
 create mode 100644 keyboards/gray_studio/aero75/rules.mk

diff --git a/keyboards/gray_studio/aero75/aero75.c b/keyboards/gray_studio/aero75/aero75.c
new file mode 100644
index 0000000000..f026786c90
--- /dev/null
+++ b/keyboards/gray_studio/aero75/aero75.c
@@ -0,0 +1,3 @@
+// Copyright 2022 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+#include "aero75.h"
diff --git a/keyboards/gray_studio/aero75/aero75.h b/keyboards/gray_studio/aero75/aero75.h
new file mode 100644
index 0000000000..3432b30f76
--- /dev/null
+++ b/keyboards/gray_studio/aero75/aero75.h
@@ -0,0 +1,19 @@
+// Copyright 2022 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+#pragma once
+#include "quantum.h"
+#define LAYOUT_all( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011,       K013,       K015, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
+	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, K415, \
+	K500, K501,       K503,                   K507,             K510, K511,       K513, K514, K515  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  KC_NO, K013,  KC_NO, K015 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO,  K115 }, \
+	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
+	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  K415 }, \
+	{ K500,  K501,  KC_NO, K503,  KC_NO, KC_NO, KC_NO, K507,  KC_NO, KC_NO, K510,  K511,  KC_NO, K513,  K514,  K515 }  \
+}
diff --git a/keyboards/gray_studio/aero75/chconf.h b/keyboards/gray_studio/aero75/chconf.h
new file mode 100644
index 0000000000..c92d2a276d
--- /dev/null
+++ b/keyboards/gray_studio/aero75/chconf.h
@@ -0,0 +1,29 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h
new file mode 100644
index 0000000000..a403257e00
--- /dev/null
+++ b/keyboards/gray_studio/aero75/config.h
@@ -0,0 +1,76 @@
+// Copyright 2022 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { A7, A6, B12, A2, A1, A0 }
+#define MATRIX_COL_PINS { A3, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15, B1, A8, B15, B14, B13 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define RGB_DI_PIN B10
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#ifdef RGB_DI_PIN 
+#define RGBLED_NUM 1
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
diff --git a/keyboards/gray_studio/aero75/halconf.h b/keyboards/gray_studio/aero75/halconf.h
new file mode 100644
index 0000000000..2be6631ff7
--- /dev/null
+++ b/keyboards/gray_studio/aero75/halconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#include_next <halconf.h>
+
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
new file mode 100644
index 0000000000..728277a389
--- /dev/null
+++ b/keyboards/gray_studio/aero75/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Aero 75", 
+    "url": "https://graystudio.site/en/aero75/", 
+    "maintainer": "edwardslau", 
+    "manufacturer":"GrayStudio",
+    "usb": {
+    	"vid": "0x4753",
+    	"pid": "0x3075",
+    	"device_version": "0.0.1",
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":14, "y":1.25, "w":2}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Fn", "x":11.25, "y":5.25, "w":1.25}, {"label":"Left", "x":13, "y":5.25}, {"label":"Down", "x":14, "y":5.25}, {"label":"Right", "x":15, "y":5.25}]
+        }
+    }
+}
diff --git a/keyboards/gray_studio/aero75/keymaps/default/keymap.c b/keyboards/gray_studio/aero75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..38aae7b026
--- /dev/null
+++ b/keyboards/gray_studio/aero75/keymaps/default/keymap.c
@@ -0,0 +1,58 @@
+// Copyright 2022 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,             KC_F12,             KC_DEL,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_HOME,
+    KC_TAB,             KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+    KC_CAPS,            KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,             KC_PGDN,
+    KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,    KC_END,
+    KC_LCTL,  KC_LGUI,            KC_LALT,                                KC_SPC,                       KC_RALT,  MO(1),              KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            RESET,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,            _______,                                _______,                      _______,  _______,            _______,  _______,  _______
+  ),
+
+  [2] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,            _______,                                _______,                      _______,  _______,            _______,  _______,  _______
+  ),
+ 
+  [3] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,            _______,                                _______,                      _______,  _______,            _______,  _______,  _______
+  ),    
+};
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0,1, HSV_WHITE}
+);     
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
diff --git a/keyboards/gray_studio/aero75/keymaps/via/keymap.c b/keyboards/gray_studio/aero75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..38aae7b026
--- /dev/null
+++ b/keyboards/gray_studio/aero75/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+// Copyright 2022 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,             KC_F12,             KC_DEL,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_HOME,
+    KC_TAB,             KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+    KC_CAPS,            KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,             KC_PGDN,
+    KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,    KC_END,
+    KC_LCTL,  KC_LGUI,            KC_LALT,                                KC_SPC,                       KC_RALT,  MO(1),              KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            RESET,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,            _______,                                _______,                      _______,  _______,            _______,  _______,  _______
+  ),
+
+  [2] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,            _______,                                _______,                      _______,  _______,            _______,  _______,  _______
+  ),
+ 
+  [3] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+    _______,  _______,            _______,                                _______,                      _______,  _______,            _______,  _______,  _______
+  ),    
+};
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0,1, HSV_WHITE}
+);     
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
diff --git a/keyboards/gray_studio/aero75/keymaps/via/rules.mk b/keyboards/gray_studio/aero75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..96d2d189b2
--- /dev/null
+++ b/keyboards/gray_studio/aero75/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
diff --git a/keyboards/gray_studio/aero75/mcuconf.h b/keyboards/gray_studio/aero75/mcuconf.h
new file mode 100644
index 0000000000..394edbdc12
--- /dev/null
+++ b/keyboards/gray_studio/aero75/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+
+
diff --git a/keyboards/gray_studio/aero75/readme.md b/keyboards/gray_studio/aero75/readme.md
new file mode 100644
index 0000000000..fbab90c9ed
--- /dev/null
+++ b/keyboards/gray_studio/aero75/readme.md
@@ -0,0 +1 @@
+# Gray Studio Aero 75
diff --git a/keyboards/gray_studio/aero75/rules.mk b/keyboards/gray_studio/aero75/rules.mk
new file mode 100644
index 0000000000..c369290cf9
--- /dev/null
+++ b/keyboards/gray_studio/aero75/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes      # Mouse keys
+EXTRAKEY_ENABLE = yes      # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = no           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output

From 37c271460a537cb395c3bb9fbf84419b54aa00a8 Mon Sep 17 00:00:00 2001
From: coffeeyy <coffeeyy@gmail.com>
Date: Sun, 20 Nov 2022 07:40:52 +0800
Subject: [PATCH 890/959] [Keyboard] annepro2: fix bluetooth multi-pairing
 issue (#17483)

---
 keyboards/annepro2/annepro2_ble.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/keyboards/annepro2/annepro2_ble.c b/keyboards/annepro2/annepro2_ble.c
index 0336d6a76c..ed7021299d 100644
--- a/keyboards/annepro2/annepro2_ble.c
+++ b/keyboards/annepro2/annepro2_ble.c
@@ -37,12 +37,12 @@ static host_driver_t ap2_ble_driver = {
 
 static uint8_t ble_mcu_wakeup[11] = {0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x01, 0x7d, 0x02, 0x01, 0x02};
 
-static uint8_t ble_mcu_start_broadcast[11] = {
-    0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x01, 0x00  // Broadcast ID[0-3]
+static uint8_t ble_mcu_start_broadcast[10] = {
+    0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x01,  // Broadcast ID[0-3]
 };
 
-static uint8_t ble_mcu_connect[11] = {
-    0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x04, 0x00  // Connect ID [0-3]
+static uint8_t ble_mcu_connect[10] = {
+    0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x04,  // Connect ID [0-3]
 };
 
 static uint8_t ble_mcu_send_report[10] = {
@@ -77,6 +77,7 @@ void annepro2_ble_broadcast(uint8_t port) {
     // sdPut(&SD1, 0x00);
     sdWrite(&SD1, ble_mcu_start_broadcast, sizeof(ble_mcu_start_broadcast));
     sdPut(&SD1, port);
+    sdPut(&SD1, 0x00);
     static int lastBroadcast = -1;
     if (lastBroadcast == port) {
         annepro2_ble_connect(port);
@@ -90,6 +91,7 @@ void annepro2_ble_connect(uint8_t port) {
     }
     sdWrite(&SD1, ble_mcu_connect, sizeof(ble_mcu_connect));
     sdPut(&SD1, port);
+    sdPut(&SD1, 0x00);
     ap2_ble_swtich_ble_driver();
 }
 

From e5e186c5169c8efde8350d01272ca01793eab96f Mon Sep 17 00:00:00 2001
From: Sleepdealer <35879391+Sleepdealr@users.noreply.github.com>
Date: Sat, 19 Nov 2022 22:46:12 -0500
Subject: [PATCH 891/959] [Keyboard] Add WITF (#18922)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/ramlord/witf/info.json              | 161 ++++++++++++++++++
 .../ramlord/witf/keymaps/default/keymap.c     |  26 +++
 keyboards/ramlord/witf/keymaps/via/keymap.c   |  26 +++
 keyboards/ramlord/witf/keymaps/via/rules.mk   |   1 +
 keyboards/ramlord/witf/readme.md              |  23 +++
 keyboards/ramlord/witf/rules.mk               |   1 +
 6 files changed, 238 insertions(+)
 create mode 100644 keyboards/ramlord/witf/info.json
 create mode 100644 keyboards/ramlord/witf/keymaps/default/keymap.c
 create mode 100644 keyboards/ramlord/witf/keymaps/via/keymap.c
 create mode 100644 keyboards/ramlord/witf/keymaps/via/rules.mk
 create mode 100644 keyboards/ramlord/witf/readme.md
 create mode 100644 keyboards/ramlord/witf/rules.mk

diff --git a/keyboards/ramlord/witf/info.json b/keyboards/ramlord/witf/info.json
new file mode 100644
index 0000000000..e74343a072
--- /dev/null
+++ b/keyboards/ramlord/witf/info.json
@@ -0,0 +1,161 @@
+{
+    "manufacturer": "Ramlord",
+    "keyboard_name": "WITF",
+    "maintainer": "Sleepdealr",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B14", "B13", "B12", "B11", "B10", "B2",  "B1", "B0", "A7", "A6"],
+        "rows": ["A1", "A2", "B15", "A8",  "A9",  "A10", "A14", "A15", "B3", "B6", "B7", "B8"]
+    },
+    "indicators": {
+        "num_lock": "A5",
+        "caps_lock": "A3",
+        "scroll_lock": "A4"
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x343F",
+        "vid": "0x1EF5"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "matrix": [1, 0], "x": 1.0, "y": 0.0 },
+                { "matrix": [0, 1], "x": 2.0, "y": 0.0 },
+                { "matrix": [1, 1], "x": 3.0, "y": 0.0 },
+                { "matrix": [0, 2], "x": 5.25, "y": 0.0 },
+                { "matrix": [1, 2], "x": 6.75, "y": 0.0 },
+                { "matrix": [0, 3], "x": 7.75, "y": 0.0 },
+                { "matrix": [1, 3], "x": 8.75, "y": 0.0 },
+                { "matrix": [0, 4], "x": 9.75, "y": 0.0 },
+                { "matrix": [1, 5], "x": 11.0, "y": 0.0 },
+                { "matrix": [0, 6], "x": 12.0, "y": 0.0 },
+                { "matrix": [1, 6], "x": 14.5, "y": 0.0 },
+                { "matrix": [0, 7], "x": 15.5, "y": 0.0 },
+                { "matrix": [1, 7], "x": 17.25, "y": 0.0 },
+                { "matrix": [0, 8], "x": 18.25, "y": 0.0 },
+                { "matrix": [1, 8], "x": 19.25, "y": 0.0 },
+                { "matrix": [0, 9], "x": 20.25, "y": 0.0 },
+                { "matrix": [1, 9], "x": 22.25, "y": 0.0 },
+                { "matrix": [0, 10], "x": 23.25, "y": 0.0 },
+                { "matrix": [1, 10], "x": 24.25, "y": 0.0 },
+                { "matrix": [0, 11], "x": 25.5, "y": 0.0 },
+                { "matrix": [1, 11], "x": 26.5, "y": 0.0 },
+                { "matrix": [2, 0], "x": 0.0, "y": 1.5 },
+                { "matrix": [3, 0], "x": 1.0, "y": 1.5 },
+                { "matrix": [2, 1], "x": 2.0, "y": 1.5 },
+                { "matrix": [3, 1], "x": 3.0, "y": 1.5 },
+                { "matrix": [2, 2], "x": 5.25, "y": 1.5 },
+                { "matrix": [3, 2], "x": 6.25, "y": 1.5 },
+                { "matrix": [2, 3], "x": 7.25, "y": 1.5 },
+                { "matrix": [3, 3], "x": 8.25, "y": 1.5 },
+                { "matrix": [2, 4], "x": 9.25, "y": 1.5 },
+                { "matrix": [3, 4], "x": 10.25, "y": 1.5 },
+                { "matrix": [2, 5], "x": 11.25, "y": 1.5 },
+                { "matrix": [3, 5], "x": 13.25, "y": 1.5 },
+                { "matrix": [2, 6], "x": 14.25, "y": 1.5 },
+                { "matrix": [3, 6], "x": 15.25, "y": 1.5 },
+                { "matrix": [2, 7], "x": 16.25, "y": 1.5 },
+                { "matrix": [3, 7], "x": 17.25, "y": 1.5 },
+                { "matrix": [2, 8], "x": 18.25, "y": 1.5 },
+                { "matrix": [3, 8], "x": 19.25, "y": 1.5 },
+                { "matrix": [2, 9], "x": 20.25, "y": 1.5 },
+                { "matrix": [3, 9], "x": 22.25, "y": 1.5 },
+                { "matrix": [2, 10], "x": 23.25, "y": 1.5 },
+                { "matrix": [3, 10], "x": 24.25, "y": 1.5 },
+                { "matrix": [2, 11], "x": 25.5, "y": 1.5 },
+                { "matrix": [3, 11], "x": 26.5, "y": 1.5 },
+                { "matrix": [4, 0], "x": 0.0, "y": 2.5 },
+                { "matrix": [5, 0], "x": 1.0, "y": 2.5 },
+                { "matrix": [4, 1], "x": 2.0, "y": 2.5 },
+                { "h": 2.0, "matrix": [5, 1], "x": 3.0, "y": 2.5 },
+                { "matrix": [4, 2], "w": 1.5, "x": 5.0, "y": 2.5 },
+                { "matrix": [5, 2], "x": 6.5, "y": 2.5 },
+                { "matrix": [4, 3], "x": 7.5, "y": 2.5 },
+                { "matrix": [5, 3], "x": 8.5, "y": 2.5 },
+                { "matrix": [4, 4], "x": 9.5, "y": 2.5 },
+                { "matrix": [5, 4], "x": 10.5, "y": 2.5 },
+                { "matrix": [4, 5], "x": 13.0, "y": 2.5 },
+                { "matrix": [4, 6], "x": 14.0, "y": 2.5 },
+                { "matrix": [5, 6], "x": 15.0, "y": 2.5 },
+                { "matrix": [4, 7], "x": 16.0, "y": 2.5 },
+                { "matrix": [5, 7], "x": 17.0, "y": 2.5 },
+                { "matrix": [4, 8], "x": 18.0, "y": 2.5 },
+                { "matrix": [5, 8], "x": 19.0, "y": 2.5 },
+                { "matrix": [4, 9], "w": 1.5, "x": 20.0, "y": 2.5 },
+                { "matrix": [5, 9], "x": 22.25, "y": 2.5 },
+                { "matrix": [4, 10], "x": 23.25, "y": 2.5 },
+                { "matrix": [5, 10], "x": 24.25, "y": 2.5 },
+                { "matrix": [4, 11], "x": 25.5, "y": 2.5 },
+                { "matrix": [5, 11], "x": 26.5, "y": 2.5 },
+                { "matrix": [6, 0], "x": 0.0, "y": 3.5 },
+                { "matrix": [7, 0], "x": 1.0, "y": 3.5 },
+                { "matrix": [6, 1], "x": 2.0, "y": 3.5 },
+                { "matrix": [6, 2], "w": 1.75, "x": 4.75, "y": 3.5 },
+                { "matrix": [7, 2], "x": 6.5, "y": 3.5 },
+                { "matrix": [6, 3], "x": 7.5, "y": 3.5 },
+                { "matrix": [7, 3], "x": 8.5, "y": 3.5 },
+                { "matrix": [6, 4], "x": 9.5, "y": 3.5 },
+                { "matrix": [7, 4], "x": 10.5, "y": 3.5 },
+                { "matrix": [6, 5], "x": 13.25, "y": 3.5 },
+                { "matrix": [6, 6], "x": 14.25, "y": 3.5 },
+                { "matrix": [7, 6], "x": 15.25, "y": 3.5 },
+                { "matrix": [6, 7], "x": 16.25, "y": 3.5 },
+                { "matrix": [7, 7], "x": 17.25, "y": 3.5 },
+                { "matrix": [6, 8], "x": 18.25, "y": 3.5 },
+                { "matrix": [6, 9], "w": 2.25, "x": 19.25, "y": 3.5 },
+                { "matrix": [6, 11], "x": 25.5, "y": 3.5 },
+                { "matrix": [7, 11], "x": 26.5, "y": 3.5 },
+                { "matrix": [8, 0], "x": 0.0, "y": 4.5 },
+                { "matrix": [9, 0], "x": 1.0, "y": 4.5 },
+                { "matrix": [8, 1], "x": 2.0, "y": 4.5 },
+                { "h": 2.0, "matrix": [9, 1], "x": 3.0, "y": 4.5 },
+                { "matrix": [8, 2], "w": 2.25, "x": 4.5, "y": 4.5 },
+                { "matrix": [9, 2], "x": 6.75, "y": 4.5 },
+                { "matrix": [8, 3], "x": 7.75, "y": 4.5 },
+                { "matrix": [9, 3], "x": 8.75, "y": 4.5 },
+                { "matrix": [8, 4], "x": 9.75, "y": 4.5 },
+                { "matrix": [9, 4], "x": 10.75, "y": 4.5 },
+                { "matrix": [9, 5], "x": 13.0, "y": 4.5 },
+                { "matrix": [8, 6], "x": 14.0, "y": 4.5 },
+                { "matrix": [9, 6], "x": 15.0, "y": 4.5 },
+                { "matrix": [8, 7], "x": 16.0, "y": 4.5 },
+                { "matrix": [9, 7], "x": 17.0, "y": 4.5 },
+                { "matrix": [8, 8], "x": 18.0, "y": 4.5 },
+                { "matrix": [8, 9], "w": 1.75, "x": 19.0, "y": 4.5 },
+                { "matrix": [9, 8], "x": 20.75, "y": 4.5 },
+                { "matrix": [8, 10], "x": 23.25, "y": 4.5 },
+                { "matrix": [8, 11], "x": 25.5, "y": 4.5 },
+                { "matrix": [9, 11], "x": 26.5, "y": 4.5 },
+                { "matrix": [10, 0], "x": 0.0, "y": 5.5 },
+                { "matrix": [11, 0], "x": 1.0, "y": 5.5 },
+                { "matrix": [10, 1], "x": 2.0, "y": 5.5 },
+                { "matrix": [11, 1], "x": 3.0, "y": 5.5 },
+                { "matrix": [10, 2], "w": 1.5, "x": 4.5, "y": 5.5 },
+                { "matrix": [10, 3], "w": 1.5, "x": 7.75, "y": 5.5 },
+                { "matrix": [10, 4], "w": 2.25, "x": 9.25, "y": 5.5 },
+                { "matrix": [11, 4], "x": 11.5, "y": 5.5 },
+                { "matrix": [10, 6], "w": 2.75, "x": 13.0, "y": 5.5 },
+                { "matrix": [10, 7], "w": 1.5, "x": 15.75, "y": 5.5 },
+                { "matrix": [10, 9], "w": 1.5, "x": 20.25, "y": 5.5 },
+                { "matrix": [11, 9], "x": 22.25, "y": 5.5 },
+                { "matrix": [10, 10], "x": 23.25, "y": 5.5 },
+                { "matrix": [11, 10], "x": 24.25, "y": 5.5 },
+                { "matrix": [10, 11], "x": 25.5, "y": 5.5 },
+                { "matrix": [11, 11], "x": 26.5, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/ramlord/witf/keymaps/default/keymap.c b/keyboards/ramlord/witf/keymaps/default/keymap.c
new file mode 100644
index 0000000000..280fe8b647
--- /dev/null
+++ b/keyboards/ramlord/witf/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+// Copyright 2022 Sleepdealer (@Sleepdealr)
+// 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
+
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,  KC_TRNS, KC_TRNS,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,  KC_TRNS, KC_TRNS,
+        KC_P4,   KC_P5,   KC_P6,                 KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                         KC_TRNS, KC_TRNS,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,      KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),              KC_UP,             KC_TRNS, KC_TRNS,
+        KC_P0,   KC_PDOT, KC_PDOT, KC_P0,        KC_LCTL,          KC_LALT,                   KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                            KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT,  KC_TRNS, KC_TRNS
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                        KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      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/ramlord/witf/keymaps/via/keymap.c b/keyboards/ramlord/witf/keymaps/via/keymap.c
new file mode 100644
index 0000000000..280fe8b647
--- /dev/null
+++ b/keyboards/ramlord/witf/keymaps/via/keymap.c
@@ -0,0 +1,26 @@
+// Copyright 2022 Sleepdealer (@Sleepdealr)
+// 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
+
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,  KC_TRNS, KC_TRNS,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,  KC_TRNS, KC_TRNS,
+        KC_P4,   KC_P5,   KC_P6,                 KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                         KC_TRNS, KC_TRNS,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,      KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),              KC_UP,             KC_TRNS, KC_TRNS,
+        KC_P0,   KC_PDOT, KC_PDOT, KC_P0,        KC_LCTL,          KC_LALT,                   KC_SPC,  MO(1),            KC_SPC,  KC_RALT,                            KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT,  KC_TRNS, KC_TRNS
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                        KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      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/ramlord/witf/keymaps/via/rules.mk b/keyboards/ramlord/witf/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/ramlord/witf/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ramlord/witf/readme.md b/keyboards/ramlord/witf/readme.md
new file mode 100644
index 0000000000..a59b6f069f
--- /dev/null
+++ b/keyboards/ramlord/witf/readme.md
@@ -0,0 +1,23 @@
+# Ramlord WITF
+
+* Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr)
+* Hardware Supported: WITF PCB(s)
+* Hardware Availability: During GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ramlord/witf:default
+
+Flashing example for this keyboard:
+
+    make ramlord/witf:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/ramlord/witf/rules.mk b/keyboards/ramlord/witf/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/ramlord/witf/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 525b472d88c8dd4eb2cbdd6d429d6c95772b5480 Mon Sep 17 00:00:00 2001
From: Patrick Muldoon <doon@labratsoftware.com>
Date: Sat, 19 Nov 2022 21:15:16 -0800
Subject: [PATCH 892/959] Fix Typo in Saevus Cor Matrix (#19073)

---
 keyboards/saevus/cor/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/saevus/cor/info.json b/keyboards/saevus/cor/info.json
index 3f129518d9..9ccd546026 100644
--- a/keyboards/saevus/cor/info.json
+++ b/keyboards/saevus/cor/info.json
@@ -14,7 +14,7 @@
     },
     "matrix_pins": {
         "rows": ["F0", "F1", "F4", "B3", "B6"],
-        "cols": ["F5", "F6", "F7", "C6", "C7", "B1", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "D2", "D1", "D0"]
+        "cols": ["F5", "F6", "F7", "C6", "C7", "B1", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
     },
     "processor": "atmega32u4",
     "url": "",

From 0f6a4edfb2c3d274547476a1209fa9617d3423f8 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:37:23 +0800
Subject: [PATCH 893/959] [Keyboard] Keychron Q5 (#18283)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keychron/q5/ansi/ansi.c             | 167 ++++++++++++++
 keyboards/keychron/q5/ansi/ansi.h             |  19 ++
 keyboards/keychron/q5/ansi/config.h           |  28 +++
 keyboards/keychron/q5/ansi/info.json          | 122 ++++++++++
 .../keychron/q5/ansi/keymaps/default/keymap.c |  57 +++++
 .../q5/ansi/keymaps/keychron/keymap.c         |  68 ++++++
 .../q5/ansi/keymaps/keychron/rules.mk         |   4 +
 .../keychron/q5/ansi/keymaps/via/keymap.c     |  57 +++++
 .../keychron/q5/ansi/keymaps/via/rules.mk     |   1 +
 keyboards/keychron/q5/ansi/readme.md          |   1 +
 keyboards/keychron/q5/ansi/rules.mk           |  31 +++
 .../keychron/q5/ansi_encoder/ansi_encoder.c   | 169 ++++++++++++++
 .../keychron/q5/ansi_encoder/ansi_encoder.h   |  19 ++
 keyboards/keychron/q5/ansi_encoder/config.h   |  34 +++
 keyboards/keychron/q5/ansi_encoder/info.json  | 120 ++++++++++
 .../q5/ansi_encoder/keymaps/default/keymap.c  |  66 ++++++
 .../q5/ansi_encoder/keymaps/default/rules.mk  |   1 +
 .../q5/ansi_encoder/keymaps/keychron/keymap.c |  77 +++++++
 .../q5/ansi_encoder/keymaps/keychron/rules.mk |   5 +
 .../q5/ansi_encoder/keymaps/via/keymap.c      |  66 ++++++
 .../q5/ansi_encoder/keymaps/via/rules.mk      |   2 +
 keyboards/keychron/q5/ansi_encoder/readme.md  |   5 +
 keyboards/keychron/q5/ansi_encoder/rules.mk   |  32 +++
 keyboards/keychron/q5/config.h                | 106 +++++++++
 keyboards/keychron/q5/halconf.h               |  21 ++
 keyboards/keychron/q5/iso/config.h            |  28 +++
 keyboards/keychron/q5/iso/info.json           | 123 +++++++++++
 keyboards/keychron/q5/iso/iso.c               | 170 ++++++++++++++
 keyboards/keychron/q5/iso/iso.h               |  19 ++
 .../keychron/q5/iso/keymaps/default/keymap.c  |  59 +++++
 .../keychron/q5/iso/keymaps/keychron/keymap.c |  68 ++++++
 .../keychron/q5/iso/keymaps/keychron/rules.mk |   4 +
 .../keychron/q5/iso/keymaps/via/keymap.c      |  57 +++++
 .../keychron/q5/iso/keymaps/via/rules.mk      |   1 +
 keyboards/keychron/q5/iso/readme.md           |   1 +
 keyboards/keychron/q5/iso/rules.mk            |  31 +++
 keyboards/keychron/q5/iso_encoder/config.h    |  34 +++
 keyboards/keychron/q5/iso_encoder/info.json   | 121 ++++++++++
 .../keychron/q5/iso_encoder/iso_encoder.c     | 168 ++++++++++++++
 .../keychron/q5/iso_encoder/iso_encoder.h     |  19 ++
 .../q5/iso_encoder/keymaps/default/keymap.c   |  66 ++++++
 .../q5/iso_encoder/keymaps/default/rules.mk   |   1 +
 .../q5/iso_encoder/keymaps/keychron/keymap.c  |  77 +++++++
 .../q5/iso_encoder/keymaps/keychron/rules.mk  |   5 +
 .../q5/iso_encoder/keymaps/via/keymap.c       |  66 ++++++
 .../q5/iso_encoder/keymaps/via/rules.mk       |   2 +
 keyboards/keychron/q5/iso_encoder/readme.md   |   5 +
 keyboards/keychron/q5/iso_encoder/rules.mk    |  32 +++
 keyboards/keychron/q5/matrix.c                | 209 ++++++++++++++++++
 keyboards/keychron/q5/mcuconf.h               |  22 ++
 keyboards/keychron/q5/q5.c                    |  94 ++++++++
 keyboards/keychron/q5/q5.h                    |  29 +++
 keyboards/keychron/q5/readme.md               |  19 ++
 53 files changed, 2808 insertions(+)
 create mode 100644 keyboards/keychron/q5/ansi/ansi.c
 create mode 100644 keyboards/keychron/q5/ansi/ansi.h
 create mode 100644 keyboards/keychron/q5/ansi/config.h
 create mode 100644 keyboards/keychron/q5/ansi/info.json
 create mode 100644 keyboards/keychron/q5/ansi/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q5/ansi/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q5/ansi/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q5/ansi/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q5/ansi/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q5/ansi/readme.md
 create mode 100644 keyboards/keychron/q5/ansi/rules.mk
 create mode 100644 keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
 create mode 100644 keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
 create mode 100644 keyboards/keychron/q5/ansi_encoder/config.h
 create mode 100644 keyboards/keychron/q5/ansi_encoder/info.json
 create mode 100644 keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q5/ansi_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q5/ansi_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q5/ansi_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q5/ansi_encoder/readme.md
 create mode 100644 keyboards/keychron/q5/ansi_encoder/rules.mk
 create mode 100644 keyboards/keychron/q5/config.h
 create mode 100644 keyboards/keychron/q5/halconf.h
 create mode 100644 keyboards/keychron/q5/iso/config.h
 create mode 100644 keyboards/keychron/q5/iso/info.json
 create mode 100644 keyboards/keychron/q5/iso/iso.c
 create mode 100644 keyboards/keychron/q5/iso/iso.h
 create mode 100644 keyboards/keychron/q5/iso/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q5/iso/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q5/iso/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q5/iso/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q5/iso/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q5/iso/readme.md
 create mode 100644 keyboards/keychron/q5/iso/rules.mk
 create mode 100644 keyboards/keychron/q5/iso_encoder/config.h
 create mode 100644 keyboards/keychron/q5/iso_encoder/info.json
 create mode 100644 keyboards/keychron/q5/iso_encoder/iso_encoder.c
 create mode 100644 keyboards/keychron/q5/iso_encoder/iso_encoder.h
 create mode 100644 keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q5/iso_encoder/keymaps/default/rules.mk
 create mode 100644 keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c
 create mode 100644 keyboards/keychron/q5/iso_encoder/keymaps/keychron/rules.mk
 create mode 100644 keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q5/iso_encoder/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q5/iso_encoder/readme.md
 create mode 100644 keyboards/keychron/q5/iso_encoder/rules.mk
 create mode 100644 keyboards/keychron/q5/matrix.c
 create mode 100644 keyboards/keychron/q5/mcuconf.h
 create mode 100644 keyboards/keychron/q5/q5.c
 create mode 100644 keyboards/keychron/q5/q5.h
 create mode 100644 keyboards/keychron/q5/readme.md

diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
new file mode 100644
index 0000000000..8efed462f7
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -0,0 +1,167 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_12,   J_12,   K_12},
+    {0, L_13,   J_13,   K_13},
+    {0, L_14,   J_14,   K_14},
+
+    {0, 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, 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},
+
+    {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, 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, F_16,   D_16,   E_16},
+    {1, F_15,   D_15,   E_15},
+    {1, F_14,   D_14,   E_14},
+    {1, F_10,   D_10,   E_10},
+    {1, F_6,    D_6,    E_6},
+    {1, F_5,    D_5,    E_5},
+    {1, F_4,    D_4,    E_4},
+    {1, F_3,    D_3,    E_3},
+    {1, F_2,    D_2,    E_2},
+    {1, F_1,    D_1,    E_1},
+    {1, L_1,    J_1,    K_1},
+    {1, L_2,    J_2,    K_2},
+    {1, L_7,    J_7,    K_7}
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17 },
+        { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, __, 33, 34, 35 },
+        { 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 70, 51, 52, 53 },
+        { 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 18, 66, 36, 67, 68, 69 },
+        { 71, __, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, __, 82, 83, 84, 85, 86 },
+        { 87, 88, 89, __, __, 99, 90, __, __, __, 91, 92, 93, 94, 95, 96, 97, 98 }
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},  {12,0},  {24,0},  {36,0},  {48,0},  {60,0},  {72,0},  {84,0},  {97,0},   {109,0},  {121,0},  {133,0},  {145,0},  {157,0},  {169,0},  {188,0},  {200,0},  {212,0},  {224,0},
+        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {84,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
+        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26},           {188,26}, {200,26}, {212,26},
+        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38},           {161,38},           {188,38}, {200,38}, {212,38}, {224,32},
+        {8,49},          {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
+        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
+    },
+    {
+        // RGB LED Index to Flag
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    4, 4, 4, 4,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
+        1, 1, 1,          1,          1, 1, 1, 1, 1, 1, 1, 1, 1
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi/ansi.h b/keyboards/keychron/q5/ansi/ansi.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/ansi.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q5/ansi/config.h b/keyboards/keychron/q5/ansi/config.h
new file mode 100644
index 0000000000..55e4ec41ca
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 55
+#define DRIVER_2_LED_TOTAL 45
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 54
+
+/* Enable num-lock LED */
+// #define NUM_LOCK_LED_INDEX 33
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
new file mode 100644
index 0000000000..4d5f1be85e
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -0,0 +1,122 @@
+{
+    "keyboard_name": "Keychron Q5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0150",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_100": {
+            "layout": [
+                {"matrix":[0,  0], "x":0, "y":0},
+                {"matrix":[0,  1], "x":1, "y":0},
+                {"matrix":[0,  2], "x":2, "y":0},
+                {"matrix":[0,  3], "x":3, "y":0},
+                {"matrix":[0,  4], "x":4, "y":0},
+                {"matrix":[0,  5], "x":5, "y":0},
+                {"matrix":[0,  6], "x":6, "y":0},
+                {"matrix":[0,  7], "x":7, "y":0},
+                {"matrix":[0,  8], "x":8, "y":0},
+                {"matrix":[0,  9], "x":9, "y":0},
+                {"matrix":[0, 10], "x":10, "y":0},
+                {"matrix":[0, 11], "x":11, "y":0},
+                {"matrix":[0, 12], "x":12, "y":0},
+                {"matrix":[0, 13], "x":13, "y":0},
+                {"matrix":[0, 14], "x":14, "y":0},
+                {"matrix":[0, 15], "x":15.5, "y":0},
+                {"matrix":[0, 16], "x":16.5, "y":0},
+                {"matrix":[0, 17], "x":17.5, "y":0},
+                {"matrix":[3, 12], "x":18.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"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.25},
+                {"matrix":[1,16], "x":16.5, "y":1.25},
+                {"matrix":[1,17], "x":17.5, "y":1.25},
+                {"matrix":[3,14], "x":18.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"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":[2,16], "x":16.5, "y":2.25},
+                {"matrix":[2,17], "x":17.5, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"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":[3,16], "x":16.5, "y":3.25},
+                {"matrix":[3,17], "x":17.5, "y":3.25},
+                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+                {"matrix":[4,15], "x":15.5, "y":4.25},
+                {"matrix":[4,16], "x":16.5, "y":4.25},
+                {"matrix":[4,17], "x":17.5, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5},
+                {"matrix":[5,16], "x":16.5, "y":5.25},
+                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q5/ansi/keymaps/default/keymap.c b/keyboards/keychron/q5/ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c747bf4ae1
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_100(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_100(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_100(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_100(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q5/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q5/ansi/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..82cc9bda12
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/keymaps/keychron/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_100(
+        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_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_100(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_100(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_100(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q5/ansi/keymaps/keychron/rules.mk b/keyboards/keychron/q5/ansi/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..495e8907b4
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q5/ansi/keymaps/via/keymap.c b/keyboards/keychron/q5/ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c747bf4ae1
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_100(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_100(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_100(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_100(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q5/ansi/keymaps/via/rules.mk b/keyboards/keychron/q5/ansi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q5/ansi/readme.md b/keyboards/keychron/q5/ansi/readme.md
new file mode 100644
index 0000000000..225978d183
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/readme.md
@@ -0,0 +1 @@
+# The ANSI variant of the Keychron Q5
diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk
new file mode 100644
index 0000000000..a98845acc1
--- /dev/null
+++ b/keyboards/keychron/q5/ansi/rules.mk
@@ -0,0 +1,31 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
new file mode 100644
index 0000000000..1f11ae4143
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,169 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    // {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    // {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_12,   J_12,   K_12},
+    {0, L_13,   J_13,   K_13},
+    {0, L_14,   J_14,   K_14},
+
+    {0, 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, 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},
+
+    {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, 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, F_16,   D_16,   E_16},
+    {1, F_15,   D_15,   E_15},
+    {1, F_14,   D_14,   E_14},
+    {1, F_10,   D_10,   E_10},
+    {1, F_6,    D_6,    E_6},
+    {1, F_5,    D_5,    E_5},
+    {1, F_4,    D_4,    E_4},
+    {1, F_3,    D_3,    E_3},
+    {1, F_2,    D_2,    E_2},
+    {1, F_1,    D_1,    E_1},
+    {1, L_1,    J_1,    K_1},
+    {1, L_2,    J_2,    K_2},
+    {1, L_7,    J_7,    K_7}
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0, __,  1,  2,  3,  4, __,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
+        { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, __, 31, 32, 33 },
+        { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 68, 49, 50, 51 },
+        { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 16, 64, 34, 65, 66, 67 },
+        { 69, __, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, __, 80, 81, 82, 83, 84 },
+        { 85, 86, 87, __, __, 97, 88, __, __, __, 89, 90, 91, 92, 93, 94, 95, 96 }
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {24,0},  {36,0},  {48,0},  {60,0},  {78,0},  {90,0},  {103,0},  {115,0},  {133,0},  {145,0},  {157,0},  {169,0},            {184,0},  {196,0},  {208,0},  {224,0},
+        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
+        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26},           {188,26}, {200,26}, {212,26},
+        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38},           {161,38},           {188,38}, {200,38}, {212,38}, {224,32},
+        {8,49},          {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
+        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
+    },
+    {
+        // RGB LED Index to Flag
+        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    4, 4, 4, 4,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
+        1, 1, 1,          4,          1, 1, 1, 1, 1, 4, 4, 4, 1
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q5/ansi_encoder/config.h b/keyboards/keychron/q5/ansi_encoder/config.h
new file mode 100644
index 0000000000..b96104d0c0
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 53
+#define DRIVER_2_LED_TOTAL 45
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { C14 }
+#define ENCODERS_PAD_B { A2 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 52
+
+/* Enable num-lock LED */
+// #define NUM_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
new file mode 100644
index 0000000000..ed7bbc5987
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "Keychron Q5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0151",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_98": {
+            "layout": [
+                {"matrix":[0,  0], "x":0, "y":0},
+                {"matrix":[0,  2], "x":2, "y":0},
+                {"matrix":[0,  3], "x":3, "y":0},
+                {"matrix":[0,  4], "x":4, "y":0},
+                {"matrix":[0,  5], "x":5, "y":0},
+                {"matrix":[0,  7], "x":6.5, "y":0},
+                {"matrix":[0,  8], "x":7.5, "y":0},
+                {"matrix":[0,  9], "x":8.5, "y":0},
+                {"matrix":[0, 10], "x":9.5, "y":0},
+                {"matrix":[0, 11], "x":11, "y":0},
+                {"matrix":[0, 12], "x":12, "y":0},
+                {"matrix":[0, 13], "x":13, "y":0},
+                {"matrix":[0, 14], "x":14, "y":0},
+                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"matrix":[0, 16], "x":16.25, "y":0},
+                {"matrix":[0, 17], "x":17.25, "y":0},
+                {"matrix":[3, 12], "x":18.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"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.25},
+                {"matrix":[1,16], "x":16.5, "y":1.25},
+                {"matrix":[1,17], "x":17.5, "y":1.25},
+                {"matrix":[3,14], "x":18.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"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":[2,16], "x":16.5, "y":2.25},
+                {"matrix":[2,17], "x":17.5, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"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":[3,16], "x":16.5, "y":3.25},
+                {"matrix":[3,17], "x":17.5, "y":3.25},
+                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+                {"matrix":[4,15], "x":15.5, "y":4.25},
+                {"matrix":[4,16], "x":16.5, "y":4.25},
+                {"matrix":[4,17], "x":17.5, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5},
+                {"matrix":[5,16], "x":16.5, "y":5.25},
+                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c897aecf73
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_98(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_LSFT,            KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_98(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_98(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             KC_DEL,   KC_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_LSFT,            KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_98(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q5/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..d516c2da4b
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,77 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_98(
+        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_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_LSFT,            KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_98(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_98(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             KC_DEL,   KC_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_LSFT,            KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_98(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
+
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c897aecf73
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_98(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_LSFT,            KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_ansi_98(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_ansi_98(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             KC_DEL,   KC_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+        KC_LSFT,            KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_ansi_98(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q5/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q5/ansi_encoder/readme.md b/keyboards/keychron/q5/ansi_encoder/readme.md
new file mode 100644
index 0000000000..0f7018b084
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ANSI variant of the Keychron Q5
+
+- Enable EC11 rotary encoder.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top right key pushbutton to mute.
diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk
new file mode 100644
index 0000000000..359346625e
--- /dev/null
+++ b/keyboards/keychron/q5/ansi_encoder/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q5/config.h b/keyboards/keychron/q5/config.h
new file mode 100644
index 0000000000..a501092482
--- /dev/null
+++ b/keyboards/keychron/q5/config.h
@@ -0,0 +1,106 @@
+/* Copyright 2022 @ Keychron(https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 18
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+    { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110111
+#define DRIVER_ADDR_2 0b1110100
+
+#define CKLED2001_CURRENT_TUNE \
+    { 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56 }
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* turn off effects when suspended */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* EEPROM Driver Configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q5/halconf.h b/keyboards/keychron/q5/halconf.h
new file mode 100644
index 0000000000..41bddcb279
--- /dev/null
+++ b/keyboards/keychron/q5/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q5/iso/config.h b/keyboards/keychron/q5/iso/config.h
new file mode 100644
index 0000000000..751a45711f
--- /dev/null
+++ b/keyboards/keychron/q5/iso/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 55
+#define DRIVER_2_LED_TOTAL 46
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 53
+
+/* Enable num-lock LED */
+// #define NUM_LOCK_LED_INDEX 33
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
new file mode 100644
index 0000000000..ea3ff899bb
--- /dev/null
+++ b/keyboards/keychron/q5/iso/info.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "Keychron Q5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0152",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_101": {
+            "layout": [
+                {"matrix":[0,  0], "x":0, "y":0},
+                {"matrix":[0,  1], "x":1, "y":0},
+                {"matrix":[0,  2], "x":2, "y":0},
+                {"matrix":[0,  3], "x":3, "y":0},
+                {"matrix":[0,  4], "x":4, "y":0},
+                {"matrix":[0,  5], "x":5, "y":0},
+                {"matrix":[0,  6], "x":6, "y":0},
+                {"matrix":[0,  7], "x":7, "y":0},
+                {"matrix":[0,  8], "x":8, "y":0},
+                {"matrix":[0,  9], "x":9, "y":0},
+                {"matrix":[0, 10], "x":10, "y":0},
+                {"matrix":[0, 11], "x":11, "y":0},
+                {"matrix":[0, 12], "x":12, "y":0},
+                {"matrix":[0, 13], "x":13, "y":0},
+                {"matrix":[0, 14], "x":14, "y":0},
+                {"matrix":[0, 15], "x":15.5, "y":0},
+                {"matrix":[0, 16], "x":16.5, "y":0},
+                {"matrix":[0, 17], "x":17.5, "y":0},
+                {"matrix":[3, 12], "x":18.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"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.25},
+                {"matrix":[1,16], "x":16.5, "y":1.25},
+                {"matrix":[1,17], "x":17.5, "y":1.25},
+                {"matrix":[3,14], "x":18.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"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":[2,16], "x":16.5, "y":2.25},
+                {"matrix":[2,17], "x":17.5, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.5, "y":3.25},
+                {"matrix":[3,16], "x":16.5, "y":3.25},
+                {"matrix":[3,17], "x":17.5, "y":3.25},
+                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+                {"matrix":[4,15], "x":15.5, "y":4.25},
+                {"matrix":[4,16], "x":16.5, "y":4.25},
+                {"matrix":[4,17], "x":17.5, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5},
+                {"matrix":[5,16], "x":16.5, "y":5.25},
+                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
new file mode 100644
index 0000000000..221dd7b78a
--- /dev/null
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -0,0 +1,170 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iso.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_12,   J_12,   K_12},
+    {0, L_13,   J_13,   K_13},
+    {0, L_14,   J_14,   K_14},
+
+    {0, 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, 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},
+
+    {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, 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, F_16,   D_16,   E_16},
+    {1, F_15,   D_15,   E_15},
+    {1, F_14,   D_14,   E_14},
+    {1, F_10,   D_10,   E_10},
+    {1, F_6,    D_6,    E_6},
+    {1, F_5,    D_5,    E_5},
+    {1, F_4,    D_4,    E_4},
+    {1, F_3,    D_3,    E_3},
+    {1, F_2,    D_2,    E_2},
+    {1, F_1,    D_1,    E_1},
+    {1, L_1,    J_1,    K_1},
+    {1, L_2,    J_2,    K_2},
+    {1, L_7,    J_7,    K_7}
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,   6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17 },
+        { 19, 20, 21, 22, 23, 24,  25, 26, 27, 28, 29, 30, 31, 32, __, 33, 34, 35 },
+        { 37, 38, 39, 40, 41, 42,  43, 44, 45, 46, 47, 48, 49, 66, 70, 50, 51, 52 },
+        { 53, 54, 55, 56, 57, 58,  59, 60, 61, 62, 63, 64, 18, 65, 36, 67, 68, 69 },
+        { 71, 72, 73, 74, 75, 76,  77, 78, 79, 80, 81, 82, __, 83, 84, 85, 86, 87 },
+        { 88, 89, 90, __, __, 100, 91, __, __, __, 92, 93, 94, 95, 96, 97, 98, 99 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},  {12,0},  {24,0},  {36,0},  {48,0},  {60,0},  {72,0},  {85,0},  {97,0},   {109,0},  {121,0},  {133,0},  {145,0},  {157,0},  {169,0},  {188,0},  {200,0},  {212,0},  {224,0},
+        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
+        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26},                     {188,26}, {200,26}, {212,26},
+        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {154,38}, {170,34},           {188,38}, {200,38}, {212,38}, {224,32},
+        {3,49}, {15,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
+        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
+    },
+    {
+        // RGB LED Index to Flag
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
+        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 4, 4, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso/iso.h b/keyboards/keychron/q5/iso/iso.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q5/iso/iso.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso/keymaps/default/keymap.c b/keyboards/keychron/q5/iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6b0214d4d6
--- /dev/null
+++ b/keyboards/keychron/q5/iso/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_101(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_101(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_101(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_101(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
+
+// clang-format on
diff --git a/keyboards/keychron/q5/iso/keymaps/keychron/keymap.c b/keyboards/keychron/q5/iso/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..a96063512f
--- /dev/null
+++ b/keyboards/keychron/q5/iso/keymaps/keychron/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_101(
+        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_HOME, KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_101(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_101(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_101(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q5/iso/keymaps/keychron/rules.mk b/keyboards/keychron/q5/iso/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..495e8907b4
--- /dev/null
+++ b/keyboards/keychron/q5/iso/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q5/iso/keymaps/via/keymap.c b/keyboards/keychron/q5/iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ae1d483cf7
--- /dev/null
+++ b/keyboards/keychron/q5/iso/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_101(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_101(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_101(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  RGB_MOD,
+        KC_GRV,   KC_1,     KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_101(
+        _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q5/iso/keymaps/via/rules.mk b/keyboards/keychron/q5/iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/q5/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q5/iso/readme.md b/keyboards/keychron/q5/iso/readme.md
new file mode 100644
index 0000000000..01ca9b20d4
--- /dev/null
+++ b/keyboards/keychron/q5/iso/readme.md
@@ -0,0 +1 @@
+# The ISO variant of the Keychron Q5
diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk
new file mode 100644
index 0000000000..a98845acc1
--- /dev/null
+++ b/keyboards/keychron/q5/iso/rules.mk
@@ -0,0 +1,31 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q5/iso_encoder/config.h b/keyboards/keychron/q5/iso_encoder/config.h
new file mode 100644
index 0000000000..58cda94781
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 53
+#define DRIVER_2_LED_TOTAL 46
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { C14 }
+#define ENCODERS_PAD_B { A2 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 51
+
+/* Enable num-lock LED */
+// #define NUM_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
new file mode 100644
index 0000000000..e628e1d059
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Keychron Q5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0153",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_99": {
+            "layout": [
+                {"matrix":[0,  0], "x":0, "y":0},
+                {"matrix":[0,  2], "x":2, "y":0},
+                {"matrix":[0,  3], "x":3, "y":0},
+                {"matrix":[0,  4], "x":4, "y":0},
+                {"matrix":[0,  5], "x":5, "y":0},
+                {"matrix":[0,  7], "x":6.5, "y":0},
+                {"matrix":[0,  8], "x":7.5, "y":0},
+                {"matrix":[0,  9], "x":8.5, "y":0},
+                {"matrix":[0, 10], "x":9.5, "y":0},
+                {"matrix":[0, 11], "x":11, "y":0},
+                {"matrix":[0, 12], "x":12, "y":0},
+                {"matrix":[0, 13], "x":13, "y":0},
+                {"matrix":[0, 14], "x":14, "y":0},
+                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"matrix":[0, 16], "x":16.25, "y":0},
+                {"matrix":[0, 17], "x":17.25, "y":0},
+                {"matrix":[3, 12], "x":18.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"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.25},
+                {"matrix":[1,16], "x":16.5, "y":1.25},
+                {"matrix":[1,17], "x":17.5, "y":1.25},
+                {"matrix":[3,14], "x":18.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"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":[2,16], "x":16.5, "y":2.25},
+                {"matrix":[2,17], "x":17.5, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.5, "y":3.25},
+                {"matrix":[3,16], "x":16.5, "y":3.25},
+                {"matrix":[3,17], "x":17.5, "y":3.25},
+                {"matrix":[2,14], "x":18.5, "y":2.25, "h":2},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+                {"matrix":[4,15], "x":15.5, "y":4.25},
+                {"matrix":[4,16], "x":16.5, "y":4.25},
+                {"matrix":[4,17], "x":17.5, "y":4.25},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5},
+                {"matrix":[5,16], "x":16.5, "y":5.25},
+                {"matrix":[5,17], "x":17.5, "y":5.25},
+                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
new file mode 100644
index 0000000000..75387ad4b6
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -0,0 +1,168 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iso_encoder.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {0, L_12,   J_12,   K_12},
+    {0, L_13,   J_13,   K_13},
+    {0, L_14,   J_14,   K_14},
+
+    {0, 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, 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},
+
+    {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, 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, F_16,   D_16,   E_16},
+    {1, F_15,   D_15,   E_15},
+    {1, F_14,   D_14,   E_14},
+    {1, F_10,   D_10,   E_10},
+    {1, F_6,    D_6,    E_6},
+    {1, F_5,    D_5,    E_5},
+    {1, F_4,    D_4,    E_4},
+    {1, F_3,    D_3,    E_3},
+    {1, F_2,    D_2,    E_2},
+    {1, F_1,    D_1,    E_1},
+    {1, L_1,    J_1,    K_1},
+    {1, L_2,    J_2,    K_2},
+    {1, L_7,    J_7,    K_7}
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  0, __,  1,  2,  3,  4, __,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
+        { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, __, 31, 32, 33 },
+        { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 64, 68, 48, 49, 50 },
+        { 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 16, 63, 34, 65, 66, 67 },
+        { 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, __, 81, 82, 83, 84, 85 },
+        { 86, 87, 88, __, __, 98, 89, __, __, __, 90, 91, 92, 93, 94, 95, 96, 97 },
+    },
+    {
+        // LED Index to Physical Position
+        {0,0},           {24,0},  {36,0},  {48,0},  {60,0},  {78,0},  {90,0},  {103,0},  {115,0},  {133,0},  {145,0},  {157,0},  {169,0},            {184,0},  {196,0},  {208,0},  {224,0},
+        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
+        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26},                     {188,26}, {200,26}, {212,26},
+        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {154,38}, {170,34},           {188,38}, {200,38}, {212,38}, {224,32},
+        {3,49}, {15,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49}, {152,49},           {172,52}, {188,49}, {200,49}, {212,49},
+        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
+    },
+    {
+        // RGB LED Index to Flag
+        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       4, 4, 4,
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4, 4, 4, 4,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
+        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 4, 4, 1,
+    }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.h b/keyboards/keychron/q5/iso_encoder/iso_encoder.h
new file mode 100644
index 0000000000..de5b0aedb1
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a570031a0b
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_99(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [MAC_FN] = LAYOUT_iso_99(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [WIN_BASE] = LAYOUT_iso_99(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             KC_DEL,   KC_HOME,  KC_END,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT),
+    [WIN_FN] = LAYOUT_iso_99(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            _______,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q5/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..85efa63759
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,77 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_99(
+        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_HOME,  KC_END,     KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,    KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,    KC_PENT),
+    [MAC_FN] = LAYOUT_iso_99(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             _______,  _______,  _______,    RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,    _______),
+    [WIN_BASE] = LAYOUT_iso_99(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             KC_DEL,   KC_HOME,  KC_END,     KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,    KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,    KC_PENT),
+    [WIN_FN] = LAYOUT_iso_99(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            _______,  _______,  _______,    RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,    _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
+
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..324f24e90e
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_99(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            KC_DEL,   KC_HOME,  KC_END,     KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,    KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,    KC_PENT),
+    [MAC_FN] = LAYOUT_iso_99(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             _______,  _______,  _______,    RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,    _______),
+    [WIN_BASE] = LAYOUT_iso_99(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,             KC_DEL,   KC_HOME,  KC_END,     KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,    KC_PMNS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,    KC_PENT),
+    [WIN_FN] = LAYOUT_iso_99(
+        _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,            _______,  _______,  _______,    RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,  _______,  _______,    _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,    _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][1][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q5/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q5/iso_encoder/readme.md b/keyboards/keychron/q5/iso_encoder/readme.md
new file mode 100644
index 0000000000..f628460b30
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ISO variant of the Keychron Q5
+
+- Enable EC11 rotary encoder.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top right key pushbutton to mute.
diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk
new file mode 100644
index 0000000000..359346625e
--- /dev/null
+++ b/keyboards/keychron/q5/iso_encoder/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q5/matrix.c b/keyboards/keychron/q5/matrix.c
new file mode 100644
index 0000000000..28ef877504
--- /dev/null
+++ b/keyboards/keychron/q5/matrix.c
@@ -0,0 +1,209 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "matrix.h"
+#include "quantum.h"
+
+// Pin connected to DS of 74HC595
+#define DATA_PIN C15
+// Pin connected to SH_CP of 74HC595
+#define CLOCK_PIN A1
+// Pin connected to ST_CP of 74HC595
+#define LATCH_PIN A0
+
+#ifdef MATRIX_ROW_PINS
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+#endif // MATRIX_ROW_PINS
+#ifdef MATRIX_COL_PINS
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif // MATRIX_COL_PINS
+
+#define ROWS_PER_HAND (MATRIX_ROWS)
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinInputHigh(pin);
+    }
+}
+
+static inline uint8_t readMatrixPin(pin_t pin) {
+    if (pin != NO_PIN) {
+        return readPin(pin);
+    } else {
+        return 1;
+    }
+}
+
+static void shiftOut(uint8_t dataOut) {
+    for (uint8_t i = 0; i < 8; i++) {
+        if (dataOut & 0x1) {
+            setPinOutput_writeHigh(DATA_PIN);
+        } else {
+            setPinOutput_writeLow(DATA_PIN);
+        }
+        dataOut = dataOut >> 1;
+        setPinOutput_writeHigh(CLOCK_PIN);
+        setPinOutput_writeLow(CLOCK_PIN);
+    }
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static void shiftout_single(uint8_t data) {
+    if (data & 0x1) {
+        setPinOutput_writeHigh(DATA_PIN);
+    } else {
+        setPinOutput_writeLow(DATA_PIN);
+    }
+    setPinOutput_writeHigh(CLOCK_PIN);
+    setPinOutput_writeLow(CLOCK_PIN);
+
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static bool select_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+        setPinOutput_writeLow(pin);
+        return true;
+    } else {
+        if (col == 10) {
+            shiftout_single(0x00);
+        } else {
+            shiftout_single(0x01);
+        }
+        return true;
+    }
+    return false;
+}
+
+static void unselect_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#else
+        setPinInputHigh_atomic(pin);
+#endif
+    } else {
+        if (col == (MATRIX_COLS - 1))
+        setPinOutput_writeHigh(CLOCK_PIN);
+        setPinOutput_writeLow(CLOCK_PIN);
+        setPinOutput_writeHigh(LATCH_PIN);
+        setPinOutput_writeLow(LATCH_PIN);
+    }
+}
+
+static void unselect_cols(void) {
+    // unselect column pins
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        pin_t pin = col_pins[x];
+        if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+            setPinOutput_writeHigh(pin);
+#else
+            setPinInputHigh_atomic(pin);
+#endif
+        }
+        if (x == (MATRIX_COLS - 1))
+            // unselect shift Register
+            shiftOut(0xFF);
+    }
+}
+
+static void matrix_init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        if (row_pins[x] != NO_PIN) {
+            setPinInputHigh_atomic(row_pins[x]);
+        }
+    }
+}
+
+static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
+    bool key_pressed = false;
+
+    // Select col
+    if (!select_col(current_col)) { // select col
+        return;                     // skip NO_PIN col
+    }
+
+    if (current_col < 10) {
+        matrix_output_select_delay();
+    } else {
+        for (int8_t cycle = 4; cycle > 0; cycle--) {
+            matrix_output_select_delay(); // 0.25us
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+        }
+    }
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
+        // Check row pin state
+        if (readMatrixPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= row_shifter;
+            key_pressed = true;
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~row_shifter;
+        }
+
+    }
+
+    // // Unselect col
+    unselect_col(current_col);
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    matrix_init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
+
+    // Set col, read rows
+    matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
+        matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
+    }
+
+    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+
+    return changed;
+}
diff --git a/keyboards/keychron/q5/mcuconf.h b/keyboards/keychron/q5/mcuconf.h
new file mode 100644
index 0000000000..0ca8c64850
--- /dev/null
+++ b/keyboards/keychron/q5/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c
new file mode 100644
index 0000000000..d1127d1908
--- /dev/null
+++ b/keyboards/keychron/q5/q5.c
@@ -0,0 +1,94 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "q5.h"
+
+const matrix_row_t matrix_mask[] = {
+    0b111111111111111111,
+    0b111111111111111111,
+    0b111111111111111111,
+    0b111111111111111111,
+    0b111111111111111111,
+    0b111111111111101111,
+};
+
+#ifdef DIP_SWITCH_ENABLE
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) {
+        return false;
+    }
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    return true;
+}
+
+#endif  // DIP_SWITCH_ENABLE
+
+#if defined(RGB_MATRIX_ENABLE) && (defined(CAPS_LOCK_LED_INDEX) || defined(NUM_LOCK_LED_INDEX))
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+#    ifdef RGB_MATRIX_ENABLE
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+#    endif
+    }
+    return true;
+}
+
+__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+#    if defined(CAPS_LOCK_LED_INDEX)
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+#    endif // CAPS_LOCK_LED_INDEX
+#    if defined(NUM_LOCK_LED_INDEX)
+    if (host_keyboard_led_state().num_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+#    endif // NUM_LOCK_LED_INDEX
+}
+
+#endif // RGB_MATRIX_ENABLE...
diff --git a/keyboards/keychron/q5/q5.h b/keyboards/keychron/q5/q5.h
new file mode 100644
index 0000000000..70ccc8dcfa
--- /dev/null
+++ b/keyboards/keychron/q5/q5.h
@@ -0,0 +1,29 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if   defined(KEYBOARD_keychron_q5_ansi)
+#    include "ansi.h"
+#elif defined(KEYBOARD_keychron_q5_ansi_encoder)
+#    include "ansi_encoder.h"
+#elif defined(KEYBOARD_keychron_q5_iso)
+#    include "iso.h"
+#elif defined(KEYBOARD_keychron_q5_iso_encoder)
+#    include "iso_encoder.h"
+#endif
diff --git a/keyboards/keychron/q5/readme.md b/keyboards/keychron/q5/readme.md
new file mode 100644
index 0000000000..ac59839258
--- /dev/null
+++ b/keyboards/keychron/q5/readme.md
@@ -0,0 +1,19 @@
+# Keychron Q5
+
+A customizable 96% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q5
+* Hardware Availability: [Keychron](https://www.keychron.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+  make keychron/q5/ansi:default
+
+Flashing example for this keyboard:
+
+  make keychron/q5/ansi:default:flash
+
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

From e172148e466830af974bfc4d036323b2bc194dbc Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Sun, 20 Nov 2022 18:31:02 +1100
Subject: [PATCH 894/959] [Keyboard] Add XS108 (#19112)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/xelus/xs108/config.h                |  57 ++++++++
 keyboards/xelus/xs108/halconf.h               |  21 +++
 keyboards/xelus/xs108/info.json               | 130 ++++++++++++++++++
 .../xelus/xs108/keymaps/default/keymap.c      |  59 ++++++++
 keyboards/xelus/xs108/keymaps/via/config.h    |   2 +
 keyboards/xelus/xs108/keymaps/via/keymap.c    |  59 ++++++++
 keyboards/xelus/xs108/keymaps/via/rules.mk    |   1 +
 keyboards/xelus/xs108/mcuconf.h               |  22 +++
 keyboards/xelus/xs108/readme.md               |  12 ++
 keyboards/xelus/xs108/rules.mk                |  22 +++
 keyboards/xelus/xs108/xs108.c                 |  17 +++
 keyboards/xelus/xs108/xs108.h                 |  56 ++++++++
 12 files changed, 458 insertions(+)
 create mode 100644 keyboards/xelus/xs108/config.h
 create mode 100644 keyboards/xelus/xs108/halconf.h
 create mode 100644 keyboards/xelus/xs108/info.json
 create mode 100644 keyboards/xelus/xs108/keymaps/default/keymap.c
 create mode 100644 keyboards/xelus/xs108/keymaps/via/config.h
 create mode 100644 keyboards/xelus/xs108/keymaps/via/keymap.c
 create mode 100644 keyboards/xelus/xs108/keymaps/via/rules.mk
 create mode 100644 keyboards/xelus/xs108/mcuconf.h
 create mode 100644 keyboards/xelus/xs108/readme.md
 create mode 100644 keyboards/xelus/xs108/rules.mk
 create mode 100644 keyboards/xelus/xs108/xs108.c
 create mode 100644 keyboards/xelus/xs108/xs108.h

diff --git a/keyboards/xelus/xs108/config.h b/keyboards/xelus/xs108/config.h
new file mode 100644
index 0000000000..c2643fa3c4
--- /dev/null
+++ b/keyboards/xelus/xs108/config.h
@@ -0,0 +1,57 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 21
+
+#define MATRIX_ROW_PINS { C14, C13, A10, A3, A1, A0 }
+#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, B6, B5, B4, B3, A15, A14 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+// LED defines
+#define LED_CAPS_LOCK_PIN A2
+#define LED_SCROLL_LOCK_PIN A13
+#define LED_NUM_LOCK_PIN B7
+#define LED_PIN_ON_STATE 1
+
+// I2C setup
+#define I2C1_SCL_PIN        B8
+#define I2C1_SDA_PIN        B9
+#define I2C1_SCL_PAL_MODE   4
+#define I2C1_SDA_PAL_MODE   4
+#define I2C1_TIMINGR_PRESC  0U
+#define I2C1_TIMINGR_SCLDEL 7U
+#define I2C1_TIMINGR_SDADEL 0U
+#define I2C1_TIMINGR_SCLH   45U
+#define I2C1_TIMINGR_SCLL   149U
+
+// I2C EEPROM
+#define EEPROM_I2C_24LC64
+
+// More EEPROM for layers
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
diff --git a/keyboards/xelus/xs108/halconf.h b/keyboards/xelus/xs108/halconf.h
new file mode 100644
index 0000000000..33448dcbad
--- /dev/null
+++ b/keyboards/xelus/xs108/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/xelus/xs108/info.json b/keyboards/xelus/xs108/info.json
new file mode 100644
index 0000000000..c24b00b011
--- /dev/null
+++ b/keyboards/xelus/xs108/info.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "XS108",
+    "manufacturer": "Xelus",
+    "url": "",
+    "maintainer": "xelus22",
+    "usb": {
+        "vid": "0x5845",
+        "pid": "0x0108",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_108_ansi": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+                { "label": "Num Lock", "x": 18.5, "y": 0 },
+                { "label": "MUTE", "x": 19.5, "y": 0 },
+                { "label": "VOLD", "x": 20.5, "y": 0 },
+                { "label": "VOLU", "x": 21.5, "y": 0 },
+                { "label": "~", "x": 0, "y": 1.25 },
+                { "label": "!", "x": 1, "y": 1.25 },
+                { "label": "@", "x": 2, "y": 1.25 },
+                { "label": "#", "x": 3, "y": 1.25 },
+                { "label": "$", "x": 4, "y": 1.25 },
+                { "label": "%", "x": 5, "y": 1.25 },
+                { "label": "^", "x": 6, "y": 1.25 },
+                { "label": "&", "x": 7, "y": 1.25 },
+                { "label": "*", "x": 8, "y": 1.25 },
+                { "label": "(", "x": 9, "y": 1.25 },
+                { "label": ")", "x": 10, "y": 1.25 },
+                { "label": "_", "x": 11, "y": 1.25 },
+                { "label": "+", "x": 12, "y": 1.25 },
+                { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Backspace", "x": 14, "y": 1.25 },
+                { "label": "Insert", "x": 15.25, "y": 1.25 },
+                { "label": "Home", "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "x": 17.25, "y": 1.25 },
+                { "label": "Num Lock", "x": 18.5, "y": 1.25 },
+                { "label": "/", "x": 19.5, "y": 1.25 },
+                { "label": "*", "x": 20.5, "y": 1.25 },
+                { "label": "-", "x": 21.5, "y": 1.25 },
+                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "{", "x": 11.5, "y": 2.25 },
+                { "label": "}", "x": 12.5, "y": 2.25 },
+                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.25 },
+                { "label": "End", "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "x": 17.25, "y": 2.25 },
+                { "label": "7", "x": 18.5, "y": 2.25 },
+                { "label": "8", "x": 19.5, "y": 2.25 },
+                { "label": "9", "x": 20.5, "y": 2.25 },
+                { "label": "+", "x": 21.5, "y": 2.25 },
+                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": ":", "x": 10.75, "y": 3.25 },
+                { "label": "\"", "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+                { "label": "4", "x": 18.5, "y": 3.25 },
+                { "label": "5", "x": 19.5, "y": 3.25 },
+                { "label": "6", "x": 20.5, "y": 3.25 },
+                { "label": "+", "x": 21.5, "y": 3.25 },
+                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": "<", "x": 9.25, "y": 4.25 },
+                { "label": ">", "x": 10.25, "y": 4.25 },
+                { "label": "?", "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "label": "Shift", "x": 14, "y": 4.25 },
+                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+                { "label": "1", "x": 18.5, "y": 4.25 },
+                { "label": "2", "x": 19.5, "y": 4.25 },
+                { "label": "3", "x": 20.5, "y": 4.25 },
+                { "label": "Enter", "x": 21.5, "y": 4.25 },
+                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "\u2190", "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "x": 17.25, "y": 5.25 },
+                { "label": "0", "x": 18.5, "y": 5.25 },
+                { "label": "0", "x": 19.5, "y": 5.25 },
+                { "label": ".", "x": 20.5, "y": 5.25 },
+                { "label": "Enter", "x": 21.5, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/xs108/keymaps/default/keymap.c b/keyboards/xelus/xs108/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8990a6d6cc
--- /dev/null
+++ b/keyboards/xelus/xs108/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_108_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_MUTE, KC_MUTE, KC_VOLU, KC_VOLD,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_SLSH,            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_PPLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSLS,          KC_RSFT, MO(1),                       KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_108_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                         _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                     _______,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______
+    ),
+
+    [2] = LAYOUT_108_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                         _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                     _______,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_108_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                         _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                     _______,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/xelus/xs108/keymaps/via/config.h b/keyboards/xelus/xs108/keymaps/via/config.h
new file mode 100644
index 0000000000..227af87cd6
--- /dev/null
+++ b/keyboards/xelus/xs108/keymaps/via/config.h
@@ -0,0 +1,2 @@
+// 3 layers or else it will not fit in EEPROM
+// #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/xelus/xs108/keymaps/via/keymap.c b/keyboards/xelus/xs108/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8990a6d6cc
--- /dev/null
+++ b/keyboards/xelus/xs108/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_108_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_MUTE, KC_MUTE, KC_VOLU, KC_VOLD,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_SLSH,            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_PPLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSLS,          KC_RSFT, MO(1),                       KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_108_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                         _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                     _______,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______
+    ),
+
+    [2] = LAYOUT_108_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                         _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                     _______,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_108_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                         _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                     _______,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/xelus/xs108/keymaps/via/rules.mk b/keyboards/xelus/xs108/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/xelus/xs108/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/xelus/xs108/mcuconf.h b/keyboards/xelus/xs108/mcuconf.h
new file mode 100644
index 0000000000..fbc11f575f
--- /dev/null
+++ b/keyboards/xelus/xs108/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/xelus/xs108/readme.md b/keyboards/xelus/xs108/readme.md
new file mode 100644
index 0000000000..a7f529378c
--- /dev/null
+++ b/keyboards/xelus/xs108/readme.md
@@ -0,0 +1,12 @@
+# XS108
+
+XS108 Full-Size Keyboard.
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/xs108: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/xelus/xs108/rules.mk b/keyboards/xelus/xs108/rules.mk
new file mode 100644
index 0000000000..b02554d542
--- /dev/null
+++ b/keyboards/xelus/xs108/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = STM32L412
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = 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
+EEPROM_DRIVER = i2c
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/xs108/xs108.c b/keyboards/xelus/xs108/xs108.c
new file mode 100644
index 0000000000..41084d7be1
--- /dev/null
+++ b/keyboards/xelus/xs108/xs108.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "xs108.h"
diff --git a/keyboards/xelus/xs108/xs108.h b/keyboards/xelus/xs108/xs108.h
new file mode 100644
index 0000000000..765f5ea68d
--- /dev/null
+++ b/keyboards/xelus/xs108/xs108.h
@@ -0,0 +1,56 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ____ KC_NO
+
+/* hotswap
+ #define LAYOUT_108_ansi( \
+    K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,   K014, K015, K016,   K017, K018, K019, K020, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,   K114, K115, K116,   K117, K118, K119, K120, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,   K214, K215, K216,   K217, K218, K219, K320, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                       K317, K318, K319,       \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,       K412,               K415,         K417, K418, K419, K520, \
+    K500, K501, K502,             K505,                   K509, K510,       K512, K513,   K514, K515, K516,   K518,       K519        \
+) { \
+    { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, ____ }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, ____, ____, ____, K317, K318, K319, K320 }, \
+    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, ____, K412, ____, ____, K415, ____, K417, K418, K419, ____ }, \
+    { K500, K501, K502, ____, ____, K505, ____, ____, ____, K509, K510, ____, K512, K513, K514, K515, K516, ____, K518, K519, K520 }  \
+}
+*/
+
+// soldered
+#define LAYOUT_108_ansi( \
+    K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,         K014, K015, K016,   K017, K018, K019, K020, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K313,   K114, K115, K116,   K117, K118, K119, K120, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,         K214, K215, K216,   K217, K218, K219, K220, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312,                             K317, K318, K319, K320, \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,       K412, K413,               K415,         K417, K418, K419, K420, \
+    K500, K501, K502,             K505,                   K509, K510,       K512, K513,         K514, K515, K516,   K517, K518, K519, K520  \
+) { \
+    { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, ____, ____, K317, K318, K319, K320 }, \
+    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, ____, K412, K413, ____, K415, ____, K417, K418, K419, K420 }, \
+    { K500, K501, K502, ____, ____, K505, ____, ____, ____, K509, K510, ____, K512, K513, K514, K515, K516, K517, K518, K519, K520 }  \
+}

From 41399b1779eaa83df48fab780030c2f118993ff3 Mon Sep 17 00:00:00 2001
From: TW59420 <40019210+TW59420@users.noreply.github.com>
Date: Sun, 20 Nov 2022 16:15:16 +0800
Subject: [PATCH 895/959] [Keyboard] add mw660 keyboard (#18849)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/mwstudio/mw660/config.h             |  35 ++++++
 keyboards/mwstudio/mw660/halconf.h            |  22 ++++
 keyboards/mwstudio/mw660/info.json            | 104 ++++++++++++++++++
 .../mwstudio/mw660/keymaps/default/keymap.c   |  35 ++++++
 keyboards/mwstudio/mw660/keymaps/via/keymap.c |  35 ++++++
 keyboards/mwstudio/mw660/keymaps/via/rules.mk |   2 +
 keyboards/mwstudio/mw660/mcuconf.h            |  23 ++++
 keyboards/mwstudio/mw660/readme.md            |  22 ++++
 keyboards/mwstudio/mw660/rules.mk             |   1 +
 9 files changed, 279 insertions(+)
 create mode 100644 keyboards/mwstudio/mw660/config.h
 create mode 100644 keyboards/mwstudio/mw660/halconf.h
 create mode 100644 keyboards/mwstudio/mw660/info.json
 create mode 100644 keyboards/mwstudio/mw660/keymaps/default/keymap.c
 create mode 100644 keyboards/mwstudio/mw660/keymaps/via/keymap.c
 create mode 100644 keyboards/mwstudio/mw660/keymaps/via/rules.mk
 create mode 100644 keyboards/mwstudio/mw660/mcuconf.h
 create mode 100644 keyboards/mwstudio/mw660/readme.md
 create mode 100644 keyboards/mwstudio/mw660/rules.mk

diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h
new file mode 100644
index 0000000000..eb9fb1c473
--- /dev/null
+++ b/keyboards/mwstudio/mw660/config.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+#define FORCE_NKRO
+
+
+#define RGB_DI_PIN B8
+#define DRIVER_LED_TOTAL 34
+#define RGBLED_NUM 34
+
+#define WS2812_PWM_DRIVER PWMD4               // default: PWMD2
+#define WS2812_PWM_CHANNEL 3                  // default: 2
+//#define WS2812_PWM_COMPLEMENTARY_OUTPUT       // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
+#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
diff --git a/keyboards/mwstudio/mw660/halconf.h b/keyboards/mwstudio/mw660/halconf.h
new file mode 100644
index 0000000000..0af31c5735
--- /dev/null
+++ b/keyboards/mwstudio/mw660/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json
new file mode 100644
index 0000000000..7e7b9609ff
--- /dev/null
+++ b/keyboards/mwstudio/mw660/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "MWStudio",
+    "keyboard_name": "MW660",
+    "maintainer": "TW59420",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7" ],
+        "rows": ["A3", "A4", "A5", "A6", "A2" ]
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6601",
+        "vid": "0x7BA1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+				{ "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
+                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
+                { "matrix": [1, 14], "x": 15.25, "y": 1 },
+
+                { "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25 },
+
+                { "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                { "matrix": [3, 2], "x": 2.25, "y": 3},
+                { "matrix": [3, 3], "x": 3.25, "y": 3},
+                { "matrix": [3, 4], "x": 4.25, "y": 3},
+                { "matrix": [3, 5], "x": 5.25, "y": 3},
+                { "matrix": [3, 6], "x": 6.25, "y": 3},
+                { "matrix": [3, 7], "x": 7.25, "y": 3},
+                { "matrix": [3, 8], "x": 8.25, "y": 3},
+                { "matrix": [3, 9], "x": 9.25, "y": 3},
+                { "matrix": [3, 10], "x": 10.25, "y": 3},
+                { "matrix": [3, 11], "x": 11.25, "y": 3},
+                { "matrix": [3, 12], "x": 12.25, "y": 3, "w":2},
+                { "matrix": [3, 13], "x": 14.25, "y": 3},
+
+                { "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                { "matrix": [4, 1], "x": 1.5, "y": 4},
+                { "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                { "matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+                { "matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
+                { "matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
+                { "matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.5},
+                { "matrix": [4, 11], "x": 11.75, "y": 4},
+                { "matrix": [4, 12], "x": 13.25, "y": 4},
+                { "matrix": [4, 13], "x": 14.25, "y": 4},
+                { "matrix": [4, 14], "x": 15.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mwstudio/mw660/keymaps/default/keymap.c b/keyboards/mwstudio/mw660/keymaps/default/keymap.c
new file mode 100644
index 0000000000..237469c6ee
--- /dev/null
+++ b/keyboards/mwstudio/mw660/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#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_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE,                  KC_SPACE,          KC_SPACE,         KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_HUI,
+        RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, 
+        _______, _______, _______, _______,                   _______,          _______,          RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
diff --git a/keyboards/mwstudio/mw660/keymaps/via/keymap.c b/keyboards/mwstudio/mw660/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f77fb773a2
--- /dev/null
+++ b/keyboards/mwstudio/mw660/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#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_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE,                  KC_SPACE,          KC_SPACE,         KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_HUI,
+        RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, 
+        _______, _______, _______, _______,                   _______,          _______,          RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
\ No newline at end of file
diff --git a/keyboards/mwstudio/mw660/keymaps/via/rules.mk b/keyboards/mwstudio/mw660/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mwstudio/mw660/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mwstudio/mw660/mcuconf.h b/keyboards/mwstudio/mw660/mcuconf.h
new file mode 100644
index 0000000000..75d5b91837
--- /dev/null
+++ b/keyboards/mwstudio/mw660/mcuconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2022 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+
diff --git a/keyboards/mwstudio/mw660/readme.md b/keyboards/mwstudio/mw660/readme.md
new file mode 100644
index 0000000000..8cfba1a52a
--- /dev/null
+++ b/keyboards/mwstudio/mw660/readme.md
@@ -0,0 +1,22 @@
+# MW660
+
+![MW660](https://i.imgur.com/kJx0mpih.png)
+
+Support STM32F103 keyboard.
+
+* Keyboard Maintainer: [TW59420](https://github.com/TW59420)
+* Hardware Supported: STM32F103
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mwstudio/mw660:default 
+
+Flashing example for this keyboard:
+
+    make mwstudio/mw660:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware
+* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available
diff --git a/keyboards/mwstudio/mw660/rules.mk b/keyboards/mwstudio/mw660/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/mwstudio/mw660/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From f0454c968200d95d7bdeb9098092b1d334ed0c84 Mon Sep 17 00:00:00 2001
From: Joe Scotto <me@joescotto.com>
Date: Sun, 20 Nov 2022 03:24:11 -0500
Subject: [PATCH 896/959] [Keyboard] Add ScottoStarter Keyboard (#18626)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../handwired/jscotto/scottostarter/info.json | 96 +++++++++++++++++++
 .../scottostarter/keymaps/default/config.h    | 24 +++++
 .../scottostarter/keymaps/default/keymap.c    | 52 ++++++++++
 .../handwired/jscotto/scottostarter/readme.md | 25 +++++
 .../handwired/jscotto/scottostarter/rules.mk  |  1 +
 5 files changed, 198 insertions(+)
 create mode 100644 keyboards/handwired/jscotto/scottostarter/info.json
 create mode 100644 keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
 create mode 100644 keyboards/handwired/jscotto/scottostarter/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/jscotto/scottostarter/readme.md
 create mode 100644 keyboards/handwired/jscotto/scottostarter/rules.mk

diff --git a/keyboards/handwired/jscotto/scottostarter/info.json b/keyboards/handwired/jscotto/scottostarter/info.json
new file mode 100644
index 0000000000..5bc3c14cc7
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottostarter/info.json
@@ -0,0 +1,96 @@
+{
+    "manufacturer": "Joe Scotto",
+    "keyboard_name": "ScottoStarter",
+    "maintainer": "joe-scotto",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        // RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1, TX0
+        "cols": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "D3"],
+
+        // A0, 15, 14, 16, 10
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x11_8": {
+            "layout": [
+                // Row 1
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+
+                // Row 2
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+
+                // Row 3
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+
+                // Row 4
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "x": 5, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 },
+                { "matrix": [3, 9], "x": 9, "y": 3 },
+                { "matrix": [3, 10], "x": 10, "y": 3 },
+
+                // Row 5
+                { "matrix": [4, 0], "x": 0, "y": 4},
+                { "matrix": [4, 1], "x": 1, "y": 4},
+                { "matrix": [4, 2], "x": 2, "y": 4},
+                { "matrix": [4, 4], "x": 4, "y": 4},
+                { "matrix": [4, 7], "x": 7, "y": 4},
+                { "matrix": [4, 8], "x": 8, "y": 4 }
+                { "matrix": [4, 9], "x": 9, "y": 4 }
+                { "matrix": [4, 10], "x": 10, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
new file mode 100644
index 0000000000..8723c294cb
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Define options
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scottostarter/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fb47637f18
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottostarter/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2022 Joe Scotto
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x11_8( 
+        KC_1,         KC_2,    KC_3,    KC_4,    KC_5,   KC_6,  KC_7,  KC_8,     KC_9,   KC_0,            KC_BSPC,
+        KC_Q,         KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,  KC_U,  KC_I,     KC_O,   KC_P,            KC_TAB,
+        KC_A,         KC_S,    KC_D,    KC_F,    KC_G,   KC_H,  KC_J,  KC_K,     KC_L,   KC_SCLN,         KC_QUOT,
+        LSFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_ENT,
+        KC_LCTL,      KC_LGUI, KC_LALT,          KC_SPC,               MO(1),    MO(2),  KC_ESC,         KC_CAPS
+    ),
+    [1] = LAYOUT_ortho_4x11_8(
+        KC_NO,           KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_DEL,
+        KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN,  KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_NO,           KC_TAB,
+        KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE,  KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,         KC_QUOT,
+        LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN,  KC_TILD, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), KC_ENT,
+        KC_LCTL,         KC_LGUI, KC_LALT,          KC_SPC,                      KC_TRNS, KC_TRNS, KC_ESC,          KC_CAPS
+    ),
+    [2] = LAYOUT_ortho_4x11_8(
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_BSPC,
+        KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,         KC_TAB,
+        KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,            KC_QUOT,
+        KC_LSFT, KC_NO,   KC_NO,   KC_NO,  MO(3),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_ENT,
+        KC_LCTL, KC_LGUI, KC_LALT,         KC_SPC,                    KC_TRNS, KC_TRNS, KC_ESC,          KC_CAPS
+    ),
+    [3] = LAYOUT_ortho_4x11_8(
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,  KC_BSPC,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,   TO(4),  KC_TAB,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7, KC_F8,   KC_F9,   KC_F10, KC_QUOT,
+        KC_F11,  KC_NO,   KC_NO,   QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_F12, KC_ENT,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                KC_TRNS, KC_TRNS, KC_ESC, KC_CAPS
+    )
+};
+
+
+
diff --git a/keyboards/handwired/jscotto/scottostarter/readme.md b/keyboards/handwired/jscotto/scottostarter/readme.md
new file mode 100644
index 0000000000..5886bc9d3b
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottostarter/readme.md
@@ -0,0 +1,25 @@
+# ScottoStarter
+
+![ScottoStarter](https://i.imgur.com/bspbVPah.jpg)
+
+A 52 key ortholinear keyboard that is designed to help transition you into smaller layouts. Case files available [here](https://github.com/joe-scotto/keyboards.git).
+
+-   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+-   Hardware Supported: ATmega32U4
+-   Hardware Availability: [Amazon](https://amazon.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/jscotto/scottostarter:default
+
+Flashing example for this keyboard:
+
+    make handwired/jscotto/scottostarter:default
+
+# Bootloader
+
+Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (0, 0) when plugging the board in to enter bootloader mode.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/jscotto/scottostarter/rules.mk b/keyboards/handwired/jscotto/scottostarter/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/handwired/jscotto/scottostarter/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 0420a74d4cbcde4881b2fa08862dad825a60d5e7 Mon Sep 17 00:00:00 2001
From: bwprobably <bwolf457@gmail.com>
Date: Sun, 20 Nov 2022 00:27:10 -0800
Subject: [PATCH 897/959] [Keyboard] Add hardwired Dactyl macropad (#18761)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/dactylmacropad/config.h   |  25 ++++
 keyboards/handwired/dactylmacropad/info.json  |  45 +++++++
 .../dactylmacropad/keymaps/default/keymap.c   | 123 ++++++++++++++++++
 keyboards/handwired/dactylmacropad/readme.md  |  26 ++++
 keyboards/handwired/dactylmacropad/rules.mk   |   1 +
 .../nyquist/keymaps/bwprobably/config.h       |  30 +++++
 .../nyquist/keymaps/bwprobably/keymap.c       |  31 +++++
 .../nyquist/keymaps/bwprobably/rules.mk       |   1 +
 8 files changed, 282 insertions(+)
 create mode 100644 keyboards/handwired/dactylmacropad/config.h
 create mode 100644 keyboards/handwired/dactylmacropad/info.json
 create mode 100644 keyboards/handwired/dactylmacropad/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/dactylmacropad/readme.md
 create mode 100644 keyboards/handwired/dactylmacropad/rules.mk
 create mode 100644 keyboards/keebio/nyquist/keymaps/bwprobably/config.h
 create mode 100644 keyboards/keebio/nyquist/keymaps/bwprobably/keymap.c
 create mode 100644 keyboards/keebio/nyquist/keymaps/bwprobably/rules.mk

diff --git a/keyboards/handwired/dactylmacropad/config.h b/keyboards/handwired/dactylmacropad/config.h
new file mode 100644
index 0000000000..e69ceac331
--- /dev/null
+++ b/keyboards/handwired/dactylmacropad/config.h
@@ -0,0 +1,25 @@
+// Copyright 2022 bwprobably
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define ENCODERS_PAD_A { D1 }
+#define ENCODERS_PAD_B { D0 }
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 100
diff --git a/keyboards/handwired/dactylmacropad/info.json b/keyboards/handwired/dactylmacropad/info.json
new file mode 100644
index 0000000000..b56174caa2
--- /dev/null
+++ b/keyboards/handwired/dactylmacropad/info.json
@@ -0,0 +1,45 @@
+{
+    "manufacturer": "bwprobably",
+    "keyboard_name": "DactylMacropad",
+    "maintainer": "bwprobably",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder":true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["F6", "B4", "B5"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c b/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..468d944935
--- /dev/null
+++ b/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c
@@ -0,0 +1,123 @@
+// Copyright 2022 bwprobably
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+enum layer_names {
+    _BASE,
+    _MTG,
+    _MAC
+};
+
+enum custom_keycodes {
+  pvt = SAFE_RANGE,
+  snap,
+  ALT_TAB
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	/*
+     * ┌───┬───┬───┬───┐
+     * │pvt│pst│ up│cpy│
+     * ├───┼───┼───┤───│
+     * │sft│ lf│ dn│rt │
+     * ├───┼───┼───┼───┤───┤
+     * │[1]│ctr│wtb│app│bt3│
+     * ├───┴───┼───┤───│───│
+     */
+	[_BASE] = LAYOUT
+		(pvt, LCTL(KC_V), KC_UP, LCTL(KC_C),
+		LSFT_T(KC_ESC), KC_LEFT, KC_DOWN, KC_RGHT,
+		TO(1),   KC_LCTL,   ALT_TAB,  KC_APP, KC_BTN3),
+	/*
+		 * ┌────┬────┬────┬────┐
+		 * │mte │ BI │ up │pgu │
+		 * ├────┼────┼────┤────│
+		 * │snp │ lf │ dn │ rt │
+		 * ├────┼────┼────┼────┤───┤
+		 * │[1] │mut │min │pgd │ply│
+		 * ├────┴────┼────┤────│───│
+		 */
+	[_MTG] = LAYOUT (
+		LCTL(LSFT(KC_H)), LCTL(KC_F6), KC_TRNS, KC_PGUP,
+		snap,  KC_TRNS, KC_TRNS, KC_TRNS,
+		TO(2), KC_MUTE, LGUI(KC_M), KC_PGDN, KC_MPLY),
+		/*
+			 * ┌────┬────┬────┬────┐
+			 * │sdbr│past│ up │ cpy│
+			 * ├────┼────┼────┤────│
+			 * │snp │ lf │ dn │ rt │
+			 * ├────┼────┼────┤─────│────┤
+			 * │[1] |qkfl│ min│focus│ ply│
+			 * ├────┴────┼────┤─────│────│
+			 */
+	[_MAC] = LAYOUT (
+	 LSFT(LGUI(KC_L)), LGUI(KC_V), KC_TRNS, LGUI(KC_C),
+		LGUI(LCTL(LSFT(KC_4))), KC_TRNS, KC_TRNS, KC_TRNS,
+		TO(0),   LSFT(LGUI(KC_O)), LCTL(LALT(KC_F3)), LCTL(LSFT(KC_1)), KC_TRNS)
+};
+
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+      if (IS_LAYER_ON(_MTG)) {
+              if (clockwise) {
+                  tap_code(KC_VOLU);
+              } else {
+                  tap_code16(S(KC_VOLD));
+              }
+          } else {
+              if (clockwise) {
+                  tap_code(KC_WH_D);
+              } else {
+                  tap_code(KC_WH_U);
+              }
+          }
+          return false;
+      }
+
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+    case pvt:
+        if (record->event.pressed) {
+            // creates pivot table in excel
+            SEND_STRING(SS_LALT("nvt"));
+        } else {
+            // when keycode QMKBEST is released
+        }
+        break;
+    case snap:
+        if (record->event.pressed) {
+           SEND_STRING(SS_TAP(X_LGUI)SS_DELAY(500)"snip"SS_DELAY(500)SS_TAP(X_ENTER)SS_LALT("n")); // opens snipping and creates new snip
+        }
+        break;
+
+    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 housekeeping_task_user(void) {
+  if (is_alt_tab_active) {
+    if (timer_elapsed(alt_tab_timer) > 1000) {
+      unregister_code(KC_LALT);
+      is_alt_tab_active = false;
+    }
+  }
+}
diff --git a/keyboards/handwired/dactylmacropad/readme.md b/keyboards/handwired/dactylmacropad/readme.md
new file mode 100644
index 0000000000..97c6fdebd7
--- /dev/null
+++ b/keyboards/handwired/dactylmacropad/readme.md
@@ -0,0 +1,26 @@
+# DactylMacropad
+
+[Glamour shot](https://i.imgur.com/ONvbIbmh.jpg)
+
+* Keyboard Maintainer: [bwprobably](https://github.com/bwprobably)
+* Hardware Supported: ProMicro (Atmega32U4), EC11 Rotary Encoder
+* Hardware Availability: [Example Encoder](https://www.amazon.com/dp/B07D3DF8TK/)
+[ProMicro](https://www.sparkfun.com/products/12640)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make default:default
+
+Flashing example for this keyboard:
+
+    make default:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/dactylmacropad/rules.mk b/keyboards/handwired/dactylmacropad/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/dactylmacropad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keebio/nyquist/keymaps/bwprobably/config.h b/keyboards/keebio/nyquist/keymaps/bwprobably/config.h
new file mode 100644
index 0000000000..51befaac14
--- /dev/null
+++ b/keyboards/keebio/nyquist/keymaps/bwprobably/config.h
@@ -0,0 +1,30 @@
+/*
+Copyright 2017 Danny Nguyen <danny@hexwire.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define USE_I2C
+
+/* Select hand configuration */
+#define MASTER_RIGHT
+// #define EE_HANDS
+
+#undef RGBLED_NUM
+#define RGBLED_NUM 12
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/bwprobably/keymap.c b/keyboards/keebio/nyquist/keymaps/bwprobably/keymap.c
new file mode 100644
index 0000000000..c0586ba327
--- /dev/null
+++ b/keyboards/keebio/nyquist/keymaps/bwprobably/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2022 bwprobably
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+enum custom_layer {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+enum custom_keycodes {
+    LAYER0 = SAFE_RANGE,
+    LAYER1,
+    LAYER2,
+    LAYER3,
+};
+
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_LAYER0] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, LT(3,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_LALT, KC_LGUI, KC_DEL, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+
+[_LAYER1] = LAYOUT(KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TAB, KC_Q, KC_UP, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_CALC, KC_HOME, KC_ESC, KC_LEFT, KC_DOWN, KC_RGHT, KC_T, KC_D, KC_H, KC_N, KC_TRNS, KC_I, KC_MUTE, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_MNXT, KC_MPLY, KC_VOLU, KC_PGDN, MO(3), KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_MPRV, KC_MSTP, KC_VOLD, KC_END),
+
+[_LAYER2] = LAYOUT(KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_TRNS, KC_RCBR, KC_PIPE, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, LSFT(KC_NUHS), LSFT(KC_BSLS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
+
+[_LAYER3] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_TRNS, RESET, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_DEL, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, AG_NORM, KC_NO, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS) 
+
+};
diff --git a/keyboards/keebio/nyquist/keymaps/bwprobably/rules.mk b/keyboards/keebio/nyquist/keymaps/bwprobably/rules.mk
new file mode 100644
index 0000000000..1e3cebb145
--- /dev/null
+++ b/keyboards/keebio/nyquist/keymaps/bwprobably/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes

From 26db668878d07c0f9947169f867659a27909eb24 Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Sun, 20 Nov 2022 19:27:24 +1100
Subject: [PATCH 898/959] [Keyboard] EXT65 rev3 support (#18873)

---
 keyboards/aeboards/ext65/.noci                |   0
 keyboards/aeboards/ext65/ext65.c              |   1 -
 keyboards/aeboards/ext65/ext65.h              |   9 -
 keyboards/aeboards/ext65/info.json            | 106 +----
 keyboards/aeboards/ext65/rev1/.noci           |   0
 keyboards/aeboards/ext65/rev1/info.json       | 115 ++++-
 .../ext65/{ => rev1}/keymaps/default/keymap.c |  42 +-
 .../{ => rev1}/keymaps/default/readme.md      |   0
 .../ext65/{ => rev1}/keymaps/via/keymap.c     |  42 +-
 .../ext65/{ => rev1}/keymaps/via/readme.md    |   0
 .../ext65/{ => rev1}/keymaps/via/rules.mk     |   0
 keyboards/aeboards/ext65/rev1/rev1.c          |  16 +
 keyboards/aeboards/ext65/rev1/rev1.h          |   1 -
 keyboards/aeboards/ext65/rev2/config.h        |  50 +-
 keyboards/aeboards/ext65/rev2/info.json       | 115 ++++-
 .../ext65/rev2/keymaps/default/keymap.c       |  63 +++
 .../ext65/rev2/keymaps/default/readme.md      |   2 +
 .../aeboards/ext65/rev2/keymaps/via/keymap.c  |  63 +++
 .../aeboards/ext65/rev2/keymaps/via/readme.md |   2 +
 .../aeboards/ext65/rev2/keymaps/via/rules.mk  |   3 +
 keyboards/aeboards/ext65/rev2/rev2.c          |  49 ++
 keyboards/aeboards/ext65/rev2/rev2.h          |   1 -
 keyboards/aeboards/ext65/{ => rev3}/config.h  |  10 +-
 keyboards/aeboards/ext65/rev3/info.json       | 440 ++++++++++++++++++
 .../ext65/rev3/keymaps/default/keymap.c       |  63 +++
 .../ext65/rev3/keymaps/default/readme.md      |   2 +
 .../aeboards/ext65/rev3/keymaps/via/keymap.c  |  63 +++
 .../aeboards/ext65/rev3/keymaps/via/readme.md |   2 +
 .../aeboards/ext65/rev3/keymaps/via/rules.mk  |   1 +
 .../ext65/{rev1/config.h => rev3/rev3.c}      |  41 +-
 keyboards/aeboards/ext65/rev3/rev3.h          |  40 ++
 keyboards/aeboards/ext65/rev3/rules.mk        |  19 +
 32 files changed, 1106 insertions(+), 255 deletions(-)
 delete mode 100644 keyboards/aeboards/ext65/.noci
 delete mode 100644 keyboards/aeboards/ext65/ext65.c
 delete mode 100644 keyboards/aeboards/ext65/ext65.h
 delete mode 100644 keyboards/aeboards/ext65/rev1/.noci
 rename keyboards/aeboards/ext65/{ => rev1}/keymaps/default/keymap.c (81%)
 rename keyboards/aeboards/ext65/{ => rev1}/keymaps/default/readme.md (100%)
 rename keyboards/aeboards/ext65/{ => rev1}/keymaps/via/keymap.c (81%)
 rename keyboards/aeboards/ext65/{ => rev1}/keymaps/via/readme.md (100%)
 rename keyboards/aeboards/ext65/{ => rev1}/keymaps/via/rules.mk (100%)
 create mode 100644 keyboards/aeboards/ext65/rev2/keymaps/default/keymap.c
 create mode 100644 keyboards/aeboards/ext65/rev2/keymaps/default/readme.md
 create mode 100644 keyboards/aeboards/ext65/rev2/keymaps/via/keymap.c
 create mode 100644 keyboards/aeboards/ext65/rev2/keymaps/via/readme.md
 create mode 100644 keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
 rename keyboards/aeboards/ext65/{ => rev3}/config.h (78%)
 create mode 100644 keyboards/aeboards/ext65/rev3/info.json
 create mode 100644 keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c
 create mode 100644 keyboards/aeboards/ext65/rev3/keymaps/default/readme.md
 create mode 100644 keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c
 create mode 100644 keyboards/aeboards/ext65/rev3/keymaps/via/readme.md
 create mode 100644 keyboards/aeboards/ext65/rev3/keymaps/via/rules.mk
 rename keyboards/aeboards/ext65/{rev1/config.h => rev3/rev3.c} (50%)
 create mode 100644 keyboards/aeboards/ext65/rev3/rev3.h
 create mode 100644 keyboards/aeboards/ext65/rev3/rules.mk

diff --git a/keyboards/aeboards/ext65/.noci b/keyboards/aeboards/ext65/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/aeboards/ext65/ext65.c b/keyboards/aeboards/ext65/ext65.c
deleted file mode 100644
index 5f824b7210..0000000000
--- a/keyboards/aeboards/ext65/ext65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ext65.h"
diff --git a/keyboards/aeboards/ext65/ext65.h b/keyboards/aeboards/ext65/ext65.h
deleted file mode 100644
index 571ed05518..0000000000
--- a/keyboards/aeboards/ext65/ext65.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_aeboards_ext65_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_aeboards_ext65_rev2)
-    #include "rev2.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/aeboards/ext65/info.json b/keyboards/aeboards/ext65/info.json
index 09056ce1f4..3f4b0bbc00 100644
--- a/keyboards/aeboards/ext65/info.json
+++ b/keyboards/aeboards/ext65/info.json
@@ -4,110 +4,6 @@
     "url": "",
     "maintainer": "qmk",
     "usb": {
-        "vid": "0x4145",
-        "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_ext65": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0},
-                {"x": 13.5, "y": 0},
-                {"x": 14.5, "y": 0},
-                {"x": 15.5, "y": 0},
-                {"x": 16.5, "y": 0},
-                {"x": 17.5, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-
-                {"x": 4.5, "y": 1, "w": 1.5},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1, "w": 1.5},
-                {"x": 19.5, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-
-                {"x": 4.5, "y": 2, "w": 1.75},
-                {"x": 6.25, "y": 2},
-                {"x": 7.25, "y": 2},
-                {"x": 8.25, "y": 2},
-                {"x": 9.25, "y": 2},
-                {"x": 10.25, "y": 2},
-                {"x": 11.25, "y": 2},
-                {"x": 12.25, "y": 2},
-                {"x": 13.25, "y": 2},
-                {"x": 14.25, "y": 2},
-                {"x": 15.25, "y": 2},
-                {"x": 16.25, "y": 2},
-                {"x": 17.25, "y": 2, "w": 2.25},
-                {"x": 19.5, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-
-                {"x": 4.5, "y": 3, "w": 2.25},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3},
-                {"x": 13.75, "y": 3},
-                {"x": 14.75, "y": 3},
-                {"x": 15.75, "y": 3},
-                {"x": 16.75, "y": 3, "w": 1.75},
-                {"x": 18.5, "y": 3},
-                {"x": 19.5, "y": 3},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4.5, "y": 4, "w": 1.5},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4, "w": 1.5},
-                {"x": 8.5, "y": 4, "w": 6.25},
-                {"x": 14.75, "y": 4, "w": 1.25},
-                {"x": 16, "y": 4},
-
-                {"x": 17.5, "y": 4},
-                {"x": 18.5, "y": 4},
-                {"x": 19.5, "y": 4}
-            ]
-        }
+        "vid": "0x4145"
     }
 }
diff --git a/keyboards/aeboards/ext65/rev1/.noci b/keyboards/aeboards/ext65/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json
index bb472fcf7f..250521412b 100644
--- a/keyboards/aeboards/ext65/rev1/info.json
+++ b/keyboards/aeboards/ext65/rev1/info.json
@@ -1,5 +1,118 @@
 {
+    "keyboard_name": "Ext65 Rev1",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "qmk",
     "usb": {
-        "pid": "0xAE65"
+        "pid": "0xAE65",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "B0", "F7", "F0", "F1", "F4", "F5", "F6"],
+        "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "B7", "E6"]
+    },
+    "layouts": {
+        "LAYOUT_ext65": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+
+                {"x": 4.5, "y": 0},
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 10.5, "y": 0},
+                {"x": 11.5, "y": 0},
+                {"x": 12.5, "y": 0},
+                {"x": 13.5, "y": 0},
+                {"x": 14.5, "y": 0},
+                {"x": 15.5, "y": 0},
+                {"x": 16.5, "y": 0},
+                {"x": 17.5, "y": 0},
+                {"x": 18.5, "y": 0},
+                {"x": 19.5, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+
+                {"x": 4.5, "y": 1, "w": 1.5},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1, "w": 1.5},
+                {"x": 19.5, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+
+                {"x": 4.5, "y": 2, "w": 1.75},
+                {"x": 6.25, "y": 2},
+                {"x": 7.25, "y": 2},
+                {"x": 8.25, "y": 2},
+                {"x": 9.25, "y": 2},
+                {"x": 10.25, "y": 2},
+                {"x": 11.25, "y": 2},
+                {"x": 12.25, "y": 2},
+                {"x": 13.25, "y": 2},
+                {"x": 14.25, "y": 2},
+                {"x": 15.25, "y": 2},
+                {"x": 16.25, "y": 2},
+                {"x": 17.25, "y": 2, "w": 2.25},
+                {"x": 19.5, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+
+                {"x": 4.5, "y": 3, "w": 2.25},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3},
+                {"x": 13.75, "y": 3},
+                {"x": 14.75, "y": 3},
+                {"x": 15.75, "y": 3},
+                {"x": 16.75, "y": 3, "w": 1.75},
+                {"x": 18.5, "y": 3},
+                {"x": 19.5, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4.5, "y": 4, "w": 1.5},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4, "w": 1.5},
+                {"x": 8.5, "y": 4, "w": 6.25},
+                {"x": 14.75, "y": 4, "w": 1.25},
+                {"x": 16, "y": 4},
+
+                {"x": 17.5, "y": 4},
+                {"x": 18.5, "y": 4},
+                {"x": 19.5, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/aeboards/ext65/keymaps/default/keymap.c b/keyboards/aeboards/ext65/rev1/keymaps/default/keymap.c
similarity index 81%
rename from keyboards/aeboards/ext65/keymaps/default/keymap.c
rename to keyboards/aeboards/ext65/rev1/keymaps/default/keymap.c
index e73a74bf1e..c931729258 100644
--- a/keyboards/aeboards/ext65/keymaps/default/keymap.c
+++ b/keyboards/aeboards/ext65/rev1/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------------------------------'
    */
   [0] = LAYOUT_ext65(
-    KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_ESC , KC_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_PMNS, KC_PAST, KC_PSLS, KC_NUM,  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
     KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
     KC_PPLS, KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                   KC_UP  , KC_PGDN,
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_ext65(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DEBUG,
+    KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
     KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
   ),
@@ -61,39 +61,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
   )
 };
-
-#ifdef OLED_ENABLE
-
-void render_layer_state(void) {
-    oled_write_ln(PSTR("LAYER"), false);
-    oled_write_ln(PSTR("L1"), layer_state_is(1));
-    oled_write_ln(PSTR("L2"), layer_state_is(2));
-    oled_write_ln(PSTR("L3"), layer_state_is(3));
-    oled_write_ln(PSTR(" "), false);
-}
-
-void render_keylock_status(led_t led_state) {
-    oled_write_ln(PSTR("Lock:"), false);
-    oled_write(PSTR("N"), led_state.num_lock);
-    oled_write(PSTR("C"), led_state.caps_lock);
-    oled_write_ln(PSTR("S"), led_state.scroll_lock);
-    oled_write_ln(PSTR(" "), false);
-}
-
-void render_mod_status(uint8_t modifiers) {
-    oled_write_ln(PSTR("Mods:"), false);
-    oled_write(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
-    oled_write(PSTR("C"), (modifiers & MOD_MASK_CTRL));
-    oled_write(PSTR("A"), (modifiers & MOD_MASK_ALT));
-    oled_write_ln(PSTR("G"), (modifiers & MOD_MASK_GUI));
-    oled_write_ln(PSTR(" "), false);
-}
-
-bool oled_task_user(void) {
-    render_layer_state();
-    render_keylock_status(host_keyboard_led_state());
-    render_mod_status(get_mods()|get_oneshot_mods());
-    return false;
-}
-
-#endif
diff --git a/keyboards/aeboards/ext65/keymaps/default/readme.md b/keyboards/aeboards/ext65/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/aeboards/ext65/keymaps/default/readme.md
rename to keyboards/aeboards/ext65/rev1/keymaps/default/readme.md
diff --git a/keyboards/aeboards/ext65/keymaps/via/keymap.c b/keyboards/aeboards/ext65/rev1/keymaps/via/keymap.c
similarity index 81%
rename from keyboards/aeboards/ext65/keymaps/via/keymap.c
rename to keyboards/aeboards/ext65/rev1/keymaps/via/keymap.c
index e73a74bf1e..c931729258 100644
--- a/keyboards/aeboards/ext65/keymaps/via/keymap.c
+++ b/keyboards/aeboards/ext65/rev1/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `------------------------------------------------------------------------------------------'
    */
   [0] = LAYOUT_ext65(
-    KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_ESC , KC_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_PMNS, KC_PAST, KC_PSLS, KC_NUM,  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
     KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
     KC_PPLS, KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                   KC_UP  , KC_PGDN,
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_ext65(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EEP_RST,
-    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DEBUG,
+    KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
     KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
   ),
@@ -61,39 +61,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
   )
 };
-
-#ifdef OLED_ENABLE
-
-void render_layer_state(void) {
-    oled_write_ln(PSTR("LAYER"), false);
-    oled_write_ln(PSTR("L1"), layer_state_is(1));
-    oled_write_ln(PSTR("L2"), layer_state_is(2));
-    oled_write_ln(PSTR("L3"), layer_state_is(3));
-    oled_write_ln(PSTR(" "), false);
-}
-
-void render_keylock_status(led_t led_state) {
-    oled_write_ln(PSTR("Lock:"), false);
-    oled_write(PSTR("N"), led_state.num_lock);
-    oled_write(PSTR("C"), led_state.caps_lock);
-    oled_write_ln(PSTR("S"), led_state.scroll_lock);
-    oled_write_ln(PSTR(" "), false);
-}
-
-void render_mod_status(uint8_t modifiers) {
-    oled_write_ln(PSTR("Mods:"), false);
-    oled_write(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
-    oled_write(PSTR("C"), (modifiers & MOD_MASK_CTRL));
-    oled_write(PSTR("A"), (modifiers & MOD_MASK_ALT));
-    oled_write_ln(PSTR("G"), (modifiers & MOD_MASK_GUI));
-    oled_write_ln(PSTR(" "), false);
-}
-
-bool oled_task_user(void) {
-    render_layer_state();
-    render_keylock_status(host_keyboard_led_state());
-    render_mod_status(get_mods()|get_oneshot_mods());
-    return false;
-}
-
-#endif
diff --git a/keyboards/aeboards/ext65/keymaps/via/readme.md b/keyboards/aeboards/ext65/rev1/keymaps/via/readme.md
similarity index 100%
rename from keyboards/aeboards/ext65/keymaps/via/readme.md
rename to keyboards/aeboards/ext65/rev1/keymaps/via/readme.md
diff --git a/keyboards/aeboards/ext65/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/aeboards/ext65/keymaps/via/rules.mk
rename to keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
diff --git a/keyboards/aeboards/ext65/rev1/rev1.c b/keyboards/aeboards/ext65/rev1/rev1.c
index 1d69a6897a..c1e81204db 100644
--- a/keyboards/aeboards/ext65/rev1/rev1.c
+++ b/keyboards/aeboards/ext65/rev1/rev1.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "rev1.h"
 
 void keyboard_pre_init_user(void) {
diff --git a/keyboards/aeboards/ext65/rev1/rev1.h b/keyboards/aeboards/ext65/rev1/rev1.h
index a8efc48ac3..fadfef6ddc 100644
--- a/keyboards/aeboards/ext65/rev1/rev1.h
+++ b/keyboards/aeboards/ext65/rev1/rev1.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "ext65.h"
 #include "quantum.h"
 
 #define ____ KC_NO
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 0ccbc6353a..f5f5023a08 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -1,41 +1,21 @@
-/*
-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 2020 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
-/* key matrix size */
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A10, A9, A8, B7, A2, A1, B12, B11, B10, B2 }
-#define MATRIX_COL_PINS { B14, B6, A0, B1, B0, A7, A6, A5, A4, A3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE    5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 //RGB Underglow WS2812
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 24
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
index cacde3b019..8ef7f8d748 100644
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ b/keyboards/aeboards/ext65/rev2/info.json
@@ -1,5 +1,118 @@
 {
+    "keyboard_name": "Ext65 Rev2",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "qmk",
     "usb": {
-        "pid": "0xA652"
+        "pid": "0xA652",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B14", "B6", "A0", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["A10", "A9", "A8", "B7", "A2", "A1", "B12", "B11", "B10", "B2"]
+    },
+    "layouts": {
+        "LAYOUT_ext65": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+
+                {"x": 4.5, "y": 0},
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 10.5, "y": 0},
+                {"x": 11.5, "y": 0},
+                {"x": 12.5, "y": 0},
+                {"x": 13.5, "y": 0},
+                {"x": 14.5, "y": 0},
+                {"x": 15.5, "y": 0},
+                {"x": 16.5, "y": 0},
+                {"x": 17.5, "y": 0},
+                {"x": 18.5, "y": 0},
+                {"x": 19.5, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+
+                {"x": 4.5, "y": 1, "w": 1.5},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1, "w": 1.5},
+                {"x": 19.5, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+
+                {"x": 4.5, "y": 2, "w": 1.75},
+                {"x": 6.25, "y": 2},
+                {"x": 7.25, "y": 2},
+                {"x": 8.25, "y": 2},
+                {"x": 9.25, "y": 2},
+                {"x": 10.25, "y": 2},
+                {"x": 11.25, "y": 2},
+                {"x": 12.25, "y": 2},
+                {"x": 13.25, "y": 2},
+                {"x": 14.25, "y": 2},
+                {"x": 15.25, "y": 2},
+                {"x": 16.25, "y": 2},
+                {"x": 17.25, "y": 2, "w": 2.25},
+                {"x": 19.5, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+
+                {"x": 4.5, "y": 3, "w": 2.25},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3},
+                {"x": 13.75, "y": 3},
+                {"x": 14.75, "y": 3},
+                {"x": 15.75, "y": 3},
+                {"x": 16.75, "y": 3, "w": 1.75},
+                {"x": 18.5, "y": 3},
+                {"x": 19.5, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4.5, "y": 4, "w": 1.5},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4, "w": 1.5},
+                {"x": 8.5, "y": 4, "w": 6.25},
+                {"x": 14.75, "y": 4, "w": 1.25},
+                {"x": 16, "y": 4},
+
+                {"x": 17.5, "y": 4},
+                {"x": 18.5, "y": 4},
+                {"x": 19.5, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/aeboards/ext65/rev2/keymaps/default/keymap.c b/keyboards/aeboards/ext65/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c931729258
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev2/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------------.
+   * |-   | *  | /  |NmLK|  |Esc| 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|pipe| ~  | Pscr|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| BSPC  | Del |
+   * |  + |--------------|  |-------------------------------------------------------------------|
+   * |    | 6  | 5  | 4  |  |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   | Pgup|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 3  | 2  | 1  |  |Shift    |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up | Pgdn|
+   * | ENT|-------------------------------------------------------------------------------------|
+   * |    | .  | 0       |  | Ctrl | Win | Alt |    Space        | FN | Ctrl |  |Left| Dn | Rght|
+   * `------------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_ext65(
+    KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
+    KC_PPLS, KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                   KC_UP  , KC_PGDN,
+    KC_PENT, KC_PDOT, KC_P0  , KC_P0  , KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   MO(1)  , KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_ext65(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
+    KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT_ext65(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
+    KC_TRNS, 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_ext65(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
+    KC_TRNS, 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/aeboards/ext65/rev2/keymaps/default/readme.md b/keyboards/aeboards/ext65/rev2/keymaps/default/readme.md
new file mode 100644
index 0000000000..3a3bb66d67
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev2/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The Default Ext65Rev2 Layout
+
diff --git a/keyboards/aeboards/ext65/rev2/keymaps/via/keymap.c b/keyboards/aeboards/ext65/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c931729258
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev2/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------------.
+   * |-   | *  | /  |NmLK|  |Esc| 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|pipe| ~  | Pscr|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| BSPC  | Del |
+   * |  + |--------------|  |-------------------------------------------------------------------|
+   * |    | 6  | 5  | 4  |  |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   | Pgup|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 3  | 2  | 1  |  |Shift    |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up | Pgdn|
+   * | ENT|-------------------------------------------------------------------------------------|
+   * |    | .  | 0       |  | Ctrl | Win | Alt |    Space        | FN | Ctrl |  |Left| Dn | Rght|
+   * `------------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_ext65(
+    KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
+    KC_PPLS, KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,                   KC_UP  , KC_PGDN,
+    KC_PENT, KC_PDOT, KC_P0  , KC_P0  , KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   MO(1)  , KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_ext65(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   DB_TOGG,
+    KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT_ext65(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
+    KC_TRNS, 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_ext65(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
+    KC_TRNS, 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/aeboards/ext65/rev2/keymaps/via/readme.md b/keyboards/aeboards/ext65/rev2/keymaps/via/readme.md
new file mode 100644
index 0000000000..4be6efb9e7
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev2/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The VIA Ext65Rev2 Layout
+
diff --git a/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..e9a8bec879
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+OLED_ENABLE = yes
+# OLED_DRIVER = not a real thing
diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c
index f303a122e9..998a91ccfc 100644
--- a/keyboards/aeboards/ext65/rev2/rev2.c
+++ b/keyboards/aeboards/ext65/rev2/rev2.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "rev2.h"
 
 // Tested and verified working on ext65rev2
@@ -13,6 +29,38 @@ oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
     return OLED_ROTATION_90;  // rotates the display 90 degrees
 }
 
+void render_layer_state(void) {
+    oled_write_ln(PSTR("LAYER"), false);
+    oled_write_ln(PSTR("L1"), layer_state_is(1));
+    oled_write_ln(PSTR("L2"), layer_state_is(2));
+    oled_write_ln(PSTR("L3"), layer_state_is(3));
+    oled_write_ln(PSTR(" "), false);
+}
+
+void render_keylock_status(led_t led_state) {
+    oled_write_ln(PSTR("Lock:"), false);
+    oled_write(PSTR("N"), led_state.num_lock);
+    oled_write(PSTR("C"), led_state.caps_lock);
+    oled_write_ln(PSTR("S"), led_state.scroll_lock);
+    oled_write_ln(PSTR(" "), false);
+}
+
+void render_mod_status(uint8_t modifiers) {
+    oled_write_ln(PSTR("Mods:"), false);
+    oled_write(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
+    oled_write(PSTR("C"), (modifiers & MOD_MASK_CTRL));
+    oled_write(PSTR("A"), (modifiers & MOD_MASK_ALT));
+    oled_write_ln(PSTR("G"), (modifiers & MOD_MASK_GUI));
+    oled_write_ln(PSTR(" "), false);
+}
+
+bool oled_task_kb(void) {
+    render_layer_state();
+    render_keylock_status(host_keyboard_led_state());
+    render_mod_status(get_mods()|get_oneshot_mods());
+    return false;
+}
+
 #else
 
 void keyboard_pre_init_user(void) {
@@ -46,3 +94,4 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
     return layer_state_set_user(state);
 }
 #endif
+
diff --git a/keyboards/aeboards/ext65/rev2/rev2.h b/keyboards/aeboards/ext65/rev2/rev2.h
index a8efc48ac3..fadfef6ddc 100644
--- a/keyboards/aeboards/ext65/rev2/rev2.h
+++ b/keyboards/aeboards/ext65/rev2/rev2.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "ext65.h"
 #include "quantum.h"
 
 #define ____ KC_NO
diff --git a/keyboards/aeboards/ext65/config.h b/keyboards/aeboards/ext65/rev3/config.h
similarity index 78%
rename from keyboards/aeboards/ext65/config.h
rename to keyboards/aeboards/ext65/rev3/config.h
index ff2ace9236..8de4e44837 100644
--- a/keyboards/aeboards/ext65/config.h
+++ b/keyboards/aeboards/ext65/rev3/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 Harrison Chan (Xelus)
+/* Copyright 2018 Jason Williams (Wilba)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,4 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config_common.h"
+#pragma once
+
+// Locks
+#define LED_NUM_LOCK_PIN F5
+#define LED_CAPS_LOCK_PIN F4
+#define LED_SCROLL_LOCK_PIN F1
+#define LED_LAYERS_PIN F0
diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json
new file mode 100644
index 0000000000..e07f51f817
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/info.json
@@ -0,0 +1,440 @@
+{
+    "keyboard_name": "Ext65 Rev3",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "pid": "0xA653",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B5", "B6", "C6", "C7", "E6", "B0", "B4", "D7", "D4", "D6"]
+    },
+    "layouts": {
+        "LAYOUT_ext65_hotswap": {
+            "layout": [
+                {
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "Esc",
+                    "x": 4.5,
+                    "y": 0
+                },
+                {
+                    "label": "!",
+                    "x": 5.5,
+                    "y": 0
+                },
+                {
+                    "label": "@",
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "label": "#",
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "label": "$",
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "label": "%",
+                    "x": 9.5,
+                    "y": 0
+                },
+                {
+                    "label": "^",
+                    "x": 10.5,
+                    "y": 0
+                },
+                {
+                    "label": "&",
+                    "x": 11.5,
+                    "y": 0
+                },
+                {
+                    "label": "*",
+                    "x": 12.5,
+                    "y": 0
+                },
+                {
+                    "label": "(",
+                    "x": 13.5,
+                    "y": 0
+                },
+                {
+                    "label": ")",
+                    "x": 14.5,
+                    "y": 0
+                },
+                {
+                    "label": "_",
+                    "x": 15.5,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 16.5,
+                    "y": 0
+                },
+                {
+                    "label": "Backspace",
+                    "x": 17.5,
+                    "y": 0,
+                    "w": 2
+                },
+                {
+                    "label": "Home",
+                    "x": 19.5,
+                    "y": 0
+                },
+                {
+                    "x": 0,
+                    "y": 1,
+                    "h": 2
+                },
+                {
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "Tab",
+                    "x": 4.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "Q",
+                    "x": 6,
+                    "y": 1
+                },
+                {
+                    "label": "W",
+                    "x": 7,
+                    "y": 1
+                },
+                {
+                    "label": "E",
+                    "x": 8,
+                    "y": 1
+                },
+                {
+                    "label": "R",
+                    "x": 9,
+                    "y": 1
+                },
+                {
+                    "label": "T",
+                    "x": 10,
+                    "y": 1
+                },
+                {
+                    "label": "Y",
+                    "x": 11,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 12,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 13,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 14,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 15,
+                    "y": 1
+                },
+                {
+                    "label": "{",
+                    "x": 16,
+                    "y": 1
+                },
+                {
+                    "label": "}",
+                    "x": 17,
+                    "y": 1
+                },
+                {
+                    "label": "|",
+                    "x": 18,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "PgUp",
+                    "x": 19.5,
+                    "y": 1
+                },
+                {
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "label": "Caps Lock",
+                    "x": 4.5,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "label": "A",
+                    "x": 6.25,
+                    "y": 2
+                },
+                {
+                    "label": "S",
+                    "x": 7.25,
+                    "y": 2
+                },
+                {
+                    "label": "D",
+                    "x": 8.25,
+                    "y": 2
+                },
+                {
+                    "label": "F",
+                    "x": 9.25,
+                    "y": 2
+                },
+                {
+                    "label": "G",
+                    "x": 10.25,
+                    "y": 2
+                },
+                {
+                    "label": "H",
+                    "x": 11.25,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 12.25,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 13.25,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 14.25,
+                    "y": 2
+                },
+                {
+                    "label": ":",
+                    "x": 15.25,
+                    "y": 2
+                },
+                {
+                    "label": "\"",
+                    "x": 16.25,
+                    "y": 2
+                },
+                {
+                    "label": "Enter",
+                    "x": 17.25,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "label": "PgDn",
+                    "x": 19.5,
+                    "y": 2
+                },
+                {
+                    "x": 0,
+                    "y": 3,
+                    "h": 2
+                },
+                {
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "label": "Shift",
+                    "x": 4.5,
+                    "y": 3,
+                    "w": 2.25
+                },
+                {
+                    "label": "Z",
+                    "x": 6.75,
+                    "y": 3
+                },
+                {
+                    "label": "X",
+                    "x": 7.75,
+                    "y": 3
+                },
+                {
+                    "label": "C",
+                    "x": 8.75,
+                    "y": 3
+                },
+                {
+                    "label": "V",
+                    "x": 9.75,
+                    "y": 3
+                },
+                {
+                    "label": "B",
+                    "x": 10.75,
+                    "y": 3
+                },
+                {
+                    "label": "N",
+                    "x": 11.75,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 12.75,
+                    "y": 3
+                },
+                {
+                    "label": "<",
+                    "x": 13.75,
+                    "y": 3
+                },
+                {
+                    "label": ">",
+                    "x": 14.75,
+                    "y": 3
+                },
+                {
+                    "label": "?",
+                    "x": 15.75,
+                    "y": 3
+                },
+                {
+                    "label": "Shift",
+                    "x": 16.75,
+                    "y": 3,
+                    "w": 1.75
+                },
+                {
+                    "label": "\u2191",
+                    "x": 18.5,
+                    "y": 3
+                },
+                {
+                    "label": "End",
+                    "x": 19.5,
+                    "y": 3
+                },
+                {
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "x": 2,
+                    "y": 4,
+                    "w": 2
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 4.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 5.75,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 7,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "Space",
+                    "x": 8.25,
+                    "y": 4,
+                    "w": 6.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 14.5,
+                    "y": 4,
+                    "w": 1.5
+                },
+                {
+                    "label": "Fn",
+                    "x": 16,
+                    "y": 4,
+                    "w": 1.5
+                },
+                {
+                    "label": "\u2190",
+                    "x": 17.5,
+                    "y": 4
+                },
+                {
+                    "label": "\u2193",
+                    "x": 18.5,
+                    "y": 4
+                },
+                {
+                    "label": "\u2192",
+                    "x": 19.5,
+                    "y": 4
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c b/keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..72a10cae1b
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------------.
+   * |-   | *  | /  |NmLK|  |Esc| 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  BSPC   | Pscr|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|   \|  | Del |
+   * |  + |--------------|  |-------------------------------------------------------------------|
+   * |    | 6  | 5  | 4  |  |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   | Pgup|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 3  | 2  | 1  |  |Shift    |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up | Pgdn|
+   * | ENT|-------------------------------------------------------------------------------------|
+   * |    | .  | 0       |  | Ctrl | Win | Alt |    Space        | FN | Ctrl |  |Left| Dn | Rght|
+   * `------------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_ext65_hotswap(
+    KC_PMNS, KC_PAST, KC_PSLS, KC_NUM, KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_PSCR,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
+             KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_PGDN,
+             KC_PDOT, KC_P0  ,          KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   MO(1)  , KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_ext65_hotswap(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
+             RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          DB_TOGG,
+    KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT_ext65_hotswap(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 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_ext65_hotswap(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 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/aeboards/ext65/rev3/keymaps/default/readme.md b/keyboards/aeboards/ext65/rev3/keymaps/default/readme.md
new file mode 100644
index 0000000000..301a72857a
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The Default Ext65 Rev3 Layout
+
diff --git a/keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c b/keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..72a10cae1b
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------------.
+   * |-   | *  | /  |NmLK|  |Esc| 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  BSPC   | Pscr|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|   \|  | Del |
+   * |  + |--------------|  |-------------------------------------------------------------------|
+   * |    | 6  | 5  | 4  |  |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   | Pgup|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 3  | 2  | 1  |  |Shift    |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up | Pgdn|
+   * | ENT|-------------------------------------------------------------------------------------|
+   * |    | .  | 0       |  | Ctrl | Win | Alt |    Space        | FN | Ctrl |  |Left| Dn | Rght|
+   * `------------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_ext65_hotswap(
+    KC_PMNS, KC_PAST, KC_PSLS, KC_NUM, KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_PSCR,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
+             KC_P6  , KC_P5  , KC_P4  , KC_CAPS, KC_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_PENT, KC_P3  , KC_P2  , KC_P1  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_PGDN,
+             KC_PDOT, KC_P0  ,          KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   MO(1)  , KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_ext65_hotswap(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
+             RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          DB_TOGG,
+    KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT_ext65_hotswap(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 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_ext65_hotswap(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 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/aeboards/ext65/rev3/keymaps/via/readme.md b/keyboards/aeboards/ext65/rev3/keymaps/via/readme.md
new file mode 100644
index 0000000000..3cb1d92b95
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The VIA Ext65 Rev3 Layout
+
diff --git a/keyboards/aeboards/ext65/rev3/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/aeboards/ext65/rev1/config.h b/keyboards/aeboards/ext65/rev3/rev3.c
similarity index 50%
rename from keyboards/aeboards/ext65/rev1/config.h
rename to keyboards/aeboards/ext65/rev3/rev3.c
index 94c932e44d..14523afe35 100644
--- a/keyboards/aeboards/ext65/rev1/config.h
+++ b/keyboards/aeboards/ext65/rev3/rev3.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 Jason Williams (Wilba)
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,26 +14,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#include "rev3.h"
 
-#include "config_common.h"
+// Tested and verified working on EXT65 Rev3
+void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
 
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
+void keyboard_pre_init_user(void) {
+  // Call the keyboard pre init code.
+  // Set our LED pins as output
+  setPinOutput(LED_LAYERS_PIN);
+}
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, C7, B5, B6, D7, B4, D4, D6, B7, E6 }
-#define MATRIX_COL_PINS { B2, B3, B1, B0, F7, F0, F1, F4, F5, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+      case 1:
+        writePinHigh(LED_LAYERS_PIN);
+        break;
+      default: //  for any other layers, or the default layer
+        writePinLow(LED_LAYERS_PIN);
+        break;
+      }
+    return layer_state_set_user(state);
+}
diff --git a/keyboards/aeboards/ext65/rev3/rev3.h b/keyboards/aeboards/ext65/rev3/rev3.h
new file mode 100644
index 0000000000..7f1525bb40
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/rev3.h
@@ -0,0 +1,40 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ____ KC_NO
+
+#define LAYOUT_ext65_hotswap( \
+  K000, K100, K001, K101,  K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K009, \
+  K200, K300, K201, K301,  K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \
+        K500, K401, K501,  K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408,       K409, \
+  K600, K700, K601, K701,  K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708,       K608, K709, \
+        K900, K801,        K802, K902, K803,                   K805,             K906, K807,       K908, K808, K909  \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \
+  { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \
+  { ____, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \
+  { K500, K501, K502, K503, K504, K505, K506, K507, ____, ____ }, \
+  { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \
+  { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \
+  { ____, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \
+  { K900, ____, K902, ____, ____, ____, K906, ____, K908, K909 } \
+}
diff --git a/keyboards/aeboards/ext65/rev3/rules.mk b/keyboards/aeboards/ext65/rev3/rules.mk
new file mode 100644
index 0000000000..cc07ce5924
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+OPT = 3
+LTO_ENABLE = yes

From 6de4870ee0dbd14eb592195334eb70423ae88136 Mon Sep 17 00:00:00 2001
From: Daniel Shields <1530706+shieldsd@users.noreply.github.com>
Date: Sun, 20 Nov 2022 08:27:45 +0000
Subject: [PATCH 899/959] [Keyboard] Add layer tap keys to dshields keymaps.
 (#18953)

---
 .../atreus/keymaps/dshields/keymap.c          |  2 +-
 .../model01/keymaps/dshields/keymap.c         |  2 +-
 keyboards/planck/keymaps/dshields/keymap.c    |  2 +-
 users/dshields/config.h                       |  4 ++++
 users/dshields/dshields.h                     | 23 +++++++++++++++----
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
index 0077c4d836..eb8312387f 100644
--- a/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/dshields/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [DEF] = LAYOUT(
         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
-        MT_A,    MT_S,    MT_D,    MT_F,    KC_G,                      KC_H,    MT_J,    MT_K,    MT_L,    MT_SCLN,
+        MT_A,    MT_S,    MT_D,    MT_F,    LT_G,                      LT_H,    MT_J,    MT_K,    MT_L,    MT_SCLN,
         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_TAB,  KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
         OSMLCTL, MT_ESC,  OSMLALT, OSL_FUN, MT_BSPC, OSL_LWR, OSL_RSE, MT_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
diff --git a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
index 2d257fe371..3bd739e513 100644
--- a/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/dshields/keymap.c
@@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [DEF] = LAYOUT(
     QK_BOOT, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
     KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , RGB_TOG,    DM_REC1, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_EQL ,
-    KC_PGUP, MT_A   , MT_S   , MT_D   , MT_F   , KC_G   , KC_TAB ,    KC_ENT , KC_H   , MT_J   , MT_K   , MT_L   , MT_SCLN, KC_QUOT,
+    KC_PGUP, MT_A   , MT_S   , MT_D   , MT_F   , LT_G   , KC_TAB ,    KC_ENT , LT_H   , MT_J   , MT_K   , MT_L   , MT_SCLN, KC_QUOT,
     KC_PGDN, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_ESC ,    DM_PLY1, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
                                            OSMLCTL,                                 OSMRCTL,
                                               KC_BSPC,                           KC_SPC ,
diff --git a/keyboards/planck/keymaps/dshields/keymap.c b/keyboards/planck/keymaps/dshields/keymap.c
index 538c41922a..cc23e73977 100644
--- a/keyboards/planck/keymaps/dshields/keymap.c
+++ b/keyboards/planck/keymaps/dshields/keymap.c
@@ -4,7 +4,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [DEF] = LAYOUT_planck_grid(
         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_ESC,  KC_BSPC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
-        MT_A,    MT_S,    MT_D,    MT_F,    KC_G,    KC_TAB,  KC_ENT,  KC_H,    MT_J,    MT_K,    MT_L,    MT_SCLN,
+        MT_A,    MT_S,    MT_D,    MT_F,    LT_G,    KC_TAB,  KC_ENT,  LT_H,    MT_J,    MT_K,    MT_L,    MT_SCLN,
         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    OSMLSFT, DM_PLY1, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
         OSMLCTL, KC_LGUI, OSMLALT, OSL_FUN, OSL_LWR, MT_SPC,  MT_SPC,  OSL_RSE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
     ),
diff --git a/users/dshields/config.h b/users/dshields/config.h
index 21a5c3500d..1420a9178f 100644
--- a/users/dshields/config.h
+++ b/users/dshields/config.h
@@ -13,9 +13,13 @@
 
 #define MOUSEKEY_INTERVAL         20
 #define MOUSEKEY_DELAY            0
+#ifndef MOUSEKEY_TIME_TO_MAX
 #define MOUSEKEY_TIME_TO_MAX      40
+#endif
 #define MOUSEKEY_MAX_SPEED        7
+#ifndef MOUSEKEY_WHEEL_DELAY
 #define MOUSEKEY_WHEEL_DELAY      0
+#endif
 
 #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
 #undef ENABLE_RGB_MATRIX_BREATHING
diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h
index 34544b0260..9ed0310645 100644
--- a/users/dshields/dshields.h
+++ b/users/dshields/dshields.h
@@ -26,22 +26,35 @@
 #define MT_L    RALT_T(KC_L)
 #define MT_SCLN RGUI_T(KC_SCLN)
 
+// layer-tap keys
+#if defined KEYBOARD_planck_light \
+    || defined KEYBOARD_planck_rev3 \
+    || defined KEYBOARD_planck_rev6 \
+    || defined KEYBOARD_keyboardio_atreus
+    #define LT_G    LT(LWR, KC_G)
+    #define LT_H    LT(RSE, KC_H)
+#elif defined KEYBOARD_keyboardio_model01
+    #define LT_G    LT(FUN, KC_G)
+    #define LT_H    LT(FUN, KC_H)
+#else
+    #define LT_G    KC_G
+    #define LT_H    KC_H
+#endif
+
 // LED/RGB controls
-#ifdef KEYBOARD_planck_light
+#if defined KEYBOARD_planck_light
     #define LGT_TOG RGB_TOG
     #define LGT_MOD RGB_MOD
     #define LGT_BRT _______
     #define LGT_INC RGB_HUI
     #define LGT_DEC RGB_HUD
-#endif
-#ifdef KEYBOARD_planck_rev3
+#elif defined KEYBOARD_planck_rev3
     #define LGT_TOG BL_TOGG
     #define LGT_MOD BL_STEP
     #define LGT_BRT BL_BRTG
     #define LGT_INC BL_INC
     #define LGT_DEC BL_DEC
-#endif
-#ifdef KEYBOARD_planck_rev6
+#else
     #define LGT_TOG _______
     #define LGT_MOD _______
     #define LGT_BRT _______

From 66e4add9725bac525f9ca6e9e44ccbab2ded5412 Mon Sep 17 00:00:00 2001
From: Lex Brugman <lexbrugman@users.noreply.github.com>
Date: Sun, 20 Nov 2022 09:28:35 +0100
Subject: [PATCH 900/959] [Keyboard] Add support for KBDfans Odin V2 (#18910)

---
 keyboards/kbdfans/odin/v2/config.h            |  51 ++++++++
 keyboards/kbdfans/odin/v2/info.json           | 117 ++++++++++++++++++
 .../kbdfans/odin/v2/keymaps/default/keymap.c  |  37 ++++++
 .../kbdfans/odin/v2/keymaps/via/config.h      |  18 +++
 .../kbdfans/odin/v2/keymaps/via/keymap.c      |  37 ++++++
 .../kbdfans/odin/v2/keymaps/via/rules.mk      |   1 +
 keyboards/kbdfans/odin/v2/readme.md           |  21 ++++
 keyboards/kbdfans/odin/v2/rules.mk            |  21 ++++
 keyboards/kbdfans/odin/v2/v2.c                |  17 +++
 keyboards/kbdfans/odin/v2/v2.h                |  36 ++++++
 10 files changed, 356 insertions(+)
 create mode 100644 keyboards/kbdfans/odin/v2/config.h
 create mode 100644 keyboards/kbdfans/odin/v2/info.json
 create mode 100644 keyboards/kbdfans/odin/v2/keymaps/default/keymap.c
 create mode 100644 keyboards/kbdfans/odin/v2/keymaps/via/config.h
 create mode 100644 keyboards/kbdfans/odin/v2/keymaps/via/keymap.c
 create mode 100644 keyboards/kbdfans/odin/v2/keymaps/via/rules.mk
 create mode 100644 keyboards/kbdfans/odin/v2/readme.md
 create mode 100644 keyboards/kbdfans/odin/v2/rules.mk
 create mode 100644 keyboards/kbdfans/odin/v2/v2.c
 create mode 100644 keyboards/kbdfans/odin/v2/v2.h

diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
new file mode 100644
index 0000000000..11350c611e
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2022 lexbrugman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config_common.h"
+
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 20
+
+#define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
+#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
+
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+#define LED_NUM_LOCK_PIN B9
+#define LED_CAPS_LOCK_PIN B10
+#define LED_PIN_ON_STATE 0
+
+#define RGB_DI_PIN B15
+
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 4
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_BREATHING
+
+    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
+
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 180
+    #define RGBLIGHT_SLEEP
+#endif
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
new file mode 100644
index 0000000000..2a2c71fa2e
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "Odin V2",
+    "manufacturer": "KBDFans",
+    "url": "",
+    "maintainer": "lexbrugman",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0101",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "Scroll Lock", "x": 15.25, "y": 0 },
+                { "x": 16.5, "y": 0 },
+                { "x": 17.5, "y": 0 },
+                { "x": 18.5, "y": 0 },
+                { "x": 19.5, "y": 0 },
+                { "label": "~", "x": 0, "y": 1.5 },
+                { "label": "!", "x": 1, "y": 1.5 },
+                { "label": "@", "x": 2, "y": 1.5 },
+                { "label": "#", "x": 3, "y": 1.5 },
+                { "label": "$", "x": 4, "y": 1.5 },
+                { "label": "%", "x": 5, "y": 1.5 },
+                { "label": "^", "x": 6, "y": 1.5 },
+                { "label": "&", "x": 7, "y": 1.5 },
+                { "label": "*", "x": 8, "y": 1.5 },
+                { "label": "(", "x": 9, "y": 1.5 },
+                { "label": ")", "x": 10, "y": 1.5 },
+                { "label": "_", "x": 11, "y": 1.5 },
+                { "label": "+", "x": 12, "y": 1.5 },
+                { "label": "Backspace", "w": 2, "x": 13, "y": 1.5 },
+                { "label": "Insert", "x": 15.25, "y": 1.5 },
+                { "label": "Num Lock", "x": 16.5, "y": 1.5 },
+                { "label": "/", "x": 17.5, "y": 1.5 },
+                { "label": "*", "x": 18.5, "y": 1.5 },
+                { "label": "-", "x": 19.5, "y": 1.5 },
+                { "label": "Tab", "w": 1.5, "x": 0, "y": 2.5 },
+                { "label": "Q", "x": 1.5, "y": 2.5 },
+                { "label": "W", "x": 2.5, "y": 2.5 },
+                { "label": "E", "x": 3.5, "y": 2.5 },
+                { "label": "R", "x": 4.5, "y": 2.5 },
+                { "label": "T", "x": 5.5, "y": 2.5 },
+                { "label": "Y", "x": 6.5, "y": 2.5 },
+                { "label": "U", "x": 7.5, "y": 2.5 },
+                { "label": "I", "x": 8.5, "y": 2.5 },
+                { "label": "O", "x": 9.5, "y": 2.5 },
+                { "label": "P", "x": 10.5, "y": 2.5 },
+                { "label": "{", "x": 11.5, "y": 2.5 },
+                { "label": "}", "x": 12.5, "y": 2.5 },
+                { "label": "|", "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.5 },
+                { "label": "7", "x": 16.5, "y": 2.5 },
+                { "label": "8", "x": 17.5, "y": 2.5 },
+                { "label": "9", "x": 18.5, "y": 2.5 },
+                { "h": 2, "label": "+", "x": 19.5, "y": 2.5 },
+                { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.5 },
+                { "label": "A", "x": 1.75, "y": 3.5 },
+                { "label": "S", "x": 2.75, "y": 3.5 },
+                { "label": "D", "x": 3.75, "y": 3.5 },
+                { "label": "F", "x": 4.75, "y": 3.5 },
+                { "label": "G", "x": 5.75, "y": 3.5 },
+                { "label": "H", "x": 6.75, "y": 3.5 },
+                { "label": "J", "x": 7.75, "y": 3.5 },
+                { "label": "K", "x": 8.75, "y": 3.5 },
+                { "label": "L", "x": 9.75, "y": 3.5 },
+                { "label": ":", "x": 10.75, "y": 3.5 },
+                { "label": "\"", "x": 11.75, "y": 3.5 },
+                { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "label": "4", "x": 16.5, "y": 3.5 },
+                { "label": "5", "x": 17.5, "y": 3.5 },
+                { "label": "6", "x": 18.5, "y": 3.5 },
+                { "label": "Shift", "w": 2.25, "x": 0, "y": 4.5 },
+                { "label": "Z", "x": 2.25, "y": 4.5 },
+                { "label": "X", "x": 3.25, "y": 4.5 },
+                { "label": "C", "x": 4.25, "y": 4.5 },
+                { "label": "V", "x": 5.25, "y": 4.5 },
+                { "label": "B", "x": 6.25, "y": 4.5 },
+                { "label": "N", "x": 7.25, "y": 4.5 },
+                { "label": "M", "x": 8.25, "y": 4.5 },
+                { "label": "<", "x": 9.25, "y": 4.5 },
+                { "label": ">", "x": 10.25, "y": 4.5 },
+                { "label": "?", "x": 11.25, "y": 4.5 },
+                { "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "label": "\u2191", "x": 15.25, "y": 4.75 },
+                { "label": "1", "x": 16.5, "y": 4.5 },
+                { "label": "2", "x": 17.5, "y": 4.5 },
+                { "label": "3", "x": 18.5, "y": 4.5 },
+                { "h": 2, "label": "Enter", "x": 19.5, "y": 4.5 },
+                { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.5 },
+                { "label": "Win", "w": 1.25, "x": 1.25, "y": 5.5 },
+                { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.5 },
+                { "w": 7, "x": 3.75, "y": 5.5 },
+                { "label": "Alt", "w": 1.5, "x": 10.75, "y": 5.5 },
+                { "label": "Win", "w": 1.5, "x": 12.25, "y": 5.5 },
+                { "label": "\u2190", "x": 14.25, "y": 5.75 },
+                { "label": "\u2193", "x": 15.25, "y": 5.75 },
+                { "label": "\u2192", "x": 16.25, "y": 5.75 },
+                { "label": "0", "x": 17.5, "y": 5.5 },
+                { "label": ".", "x": 18.5, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/odin/v2/keymaps/default/keymap.c b/keyboards/kbdfans/odin/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0ea803cd38
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 lexbrugman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#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_SCRL, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+    ),
+
+    [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_SCRL, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+    ),
+};
diff --git a/keyboards/kbdfans/odin/v2/keymaps/via/config.h b/keyboards/kbdfans/odin/v2/keymaps/via/config.h
new file mode 100644
index 0000000000..56a86dc997
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/keymaps/via/config.h
@@ -0,0 +1,18 @@
+/* Copyright 2022 lexbrugman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/kbdfans/odin/v2/keymaps/via/keymap.c b/keyboards/kbdfans/odin/v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ce12d6fedb
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 lexbrugman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#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_SCRL, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+    ),
+
+    [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_SCRL, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+    ),
+};
diff --git a/keyboards/kbdfans/odin/v2/keymaps/via/rules.mk b/keyboards/kbdfans/odin/v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kbdfans/odin/v2/readme.md b/keyboards/kbdfans/odin/v2/readme.md
new file mode 100644
index 0000000000..52ac9ad699
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/readme.md
@@ -0,0 +1,21 @@
+# ODIN V2
+
+A customizable HOTSWAP keyboard.
+
+* Keyboard Maintainer: [lexbrugman](https://github.com/lexbrugman)
+* Hardware Supported: KBDFANS
+* Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/odin/v2:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
+* **Physical reset button**:press and hold the button on the back of the PCB, then plugin to PC
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbdfans/odin/v2/rules.mk b/keyboards/kbdfans/odin/v2/rules.mk
new file mode 100644
index 0000000000..8728fe0a37
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kbdfans/odin/v2/v2.c b/keyboards/kbdfans/odin/v2/v2.c
new file mode 100644
index 0000000000..42cbbc301a
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/v2.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 lexbrugman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "v2.h"
diff --git a/keyboards/kbdfans/odin/v2/v2.h b/keyboards/kbdfans/odin/v2/v2.h
new file mode 100644
index 0000000000..9e183e4498
--- /dev/null
+++ b/keyboards/kbdfans/odin/v2/v2.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 lexbrugman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    k00,      k02, k03, k04, k05,      k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, k1G, k1H, k1I, k1J, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, k2G, k2H, k2I, k2J, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,           k3G, k3H, k3I,      \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,      k4F, k4G, k4H, k4I, k4J, \
+    k50, k51, k52,                k56,                     k5B,      k5D, k5E, k5F, k5G, k5H, k5I       \
+) \
+{ \
+    {k00, KC_NO, k02, k03,   k04,   k05,   KC_NO, k07,   k08,   k09,   k0A,   k0B, k0C,   k0D, k0E,   k0F,   k0G, k0H, k0I, k0J  }, \
+    {k10, k11,   k12, k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B, k1C,   k1D, KC_NO, k1F,   k1G, k1H, k1I, k1J  }, \
+    {k20, k21,   k22, k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B, k2C,   k2D, KC_NO, k2F,   k2G, k2H, k2I, k2J  }, \
+    {k30, k31,   k32, k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B, KC_NO, k3D, KC_NO, KC_NO, k3G, k3H, k3I, KC_NO}, \
+    {k40, KC_NO, k42, k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B, KC_NO, k4D, KC_NO, k4F,   k4G, k4H, k4I, k4J  }, \
+    {k50, k51,   k52, KC_NO, KC_NO, KC_NO, k56,   KC_NO, KC_NO, KC_NO, KC_NO, k5B, KC_NO, k5D, k5E,   k5F,   k5G, k5H, k5I, KC_NO}  \
+}

From f5ca82854b11ba1f7ed99b88f082ebe6f214673c Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Sun, 20 Nov 2022 16:29:02 +0800
Subject: [PATCH 901/959] [Keyboard] Add YR80 (#18945)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/yandrstudio/yr80/board.h            | 28 +++++++
 keyboards/yandrstudio/yr80/config.h           | 48 ++++++++++++
 keyboards/yandrstudio/yr80/halconf.h          | 21 ++++++
 keyboards/yandrstudio/yr80/info.json          | 19 +++++
 .../yandrstudio/yr80/keymaps/default/keymap.c | 34 +++++++++
 .../yandrstudio/yr80/keymaps/via/keymap.c     | 48 ++++++++++++
 .../yandrstudio/yr80/keymaps/via/rules.mk     |  1 +
 keyboards/yandrstudio/yr80/mcuconf.h          | 25 +++++++
 keyboards/yandrstudio/yr80/readme.md          | 22 ++++++
 keyboards/yandrstudio/yr80/rules.mk           | 16 ++++
 keyboards/yandrstudio/yr80/yr80.c             | 73 +++++++++++++++++++
 keyboards/yandrstudio/yr80/yr80.h             | 56 ++++++++++++++
 12 files changed, 391 insertions(+)
 create mode 100644 keyboards/yandrstudio/yr80/board.h
 create mode 100644 keyboards/yandrstudio/yr80/config.h
 create mode 100644 keyboards/yandrstudio/yr80/halconf.h
 create mode 100644 keyboards/yandrstudio/yr80/info.json
 create mode 100644 keyboards/yandrstudio/yr80/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/yr80/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/yr80/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/yr80/mcuconf.h
 create mode 100644 keyboards/yandrstudio/yr80/readme.md
 create mode 100644 keyboards/yandrstudio/yr80/rules.mk
 create mode 100644 keyboards/yandrstudio/yr80/yr80.c
 create mode 100644 keyboards/yandrstudio/yr80/yr80.h

diff --git a/keyboards/yandrstudio/yr80/board.h b/keyboards/yandrstudio/yr80/board.h
new file mode 100644
index 0000000000..0723a9c6b5
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/board.h
@@ -0,0 +1,28 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
+
+#undef VAL_GPIOCCRH
+#define VAL_GPIOCCRH 0x88888888
+
+#undef VAL_GPIOBCRH
+#define VAL_GPIOBCRH 0x88888888
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
new file mode 100644
index 0000000000..ced858fafd
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -0,0 +1,48 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "config_common.h"
+
+#ifdef RGBLIGHT_ENABLE
+
+#    define RGB_DI_PIN A7
+#    define RGBLED_NUM 1
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+
+#    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#    define RGBLIGHT_LAYERS_RETAIN_VAL
+
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+
+#   define WS2812_PWM_DRIVER PWMD3
+#   define WS2812_PWM_CHANNEL 2
+#   define WS2812_PWM_PAL_MODE 2
+#   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#   define WS2812_DMA_CHANNEL 3
+
+#endif
diff --git a/keyboards/yandrstudio/yr80/halconf.h b/keyboards/yandrstudio/yr80/halconf.h
new file mode 100644
index 0000000000..d5d6543fc6
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM    TRUE
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
new file mode 100644
index 0000000000..a393cb7aaf
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "YR80",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA0D",
+        "device_version": "1.0.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "A15", "B3", "B4", "B5", "B0", "A5", "A4", "A3", "A1", "A2", "B11", "B1", "B2", "B10"],
+        "rows": ["B15", "B6", "B7", "B8", "B9", "A6"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":2.75}, {"label":"4,16", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,7", "x":10, "y":5.25, "w":1.25}, {"label":"5,8", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,9", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,10", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/yr80/keymaps/default/keymap.c b/keyboards/yandrstudio/yr80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..23927f71cd
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_MUTE, KC_VOLU, KC_VOLD,
+        KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_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_RIGHT),
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/yr80/keymaps/via/keymap.c b/keyboards/yandrstudio/yr80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..82817faec2
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_MUTE, KC_VOLU, KC_VOLD,
+        KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_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_RIGHT),
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/yr80/keymaps/via/rules.mk b/keyboards/yandrstudio/yr80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/yr80/mcuconf.h b/keyboards/yandrstudio/yr80/mcuconf.h
new file mode 100644
index 0000000000..005e1001a4
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/yr80/readme.md b/keyboards/yandrstudio/yr80/readme.md
new file mode 100644
index 0000000000..5c2ed16c1b
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/readme.md
@@ -0,0 +1,22 @@
+# yr80
+
+![yr80](https://i.imgur.com/bNsbo0qh.png)
+A 80% multi-layout keyboard with 1 RGB in F13 key.
+This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: yr80
+- Hardware Availability: [TaoBao-5162](https://item.taobao.com/item.htm?id=673317975633)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/yr80:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/yr80/rules.mk b/keyboards/yandrstudio/yr80/rules.mk
new file mode 100644
index 0000000000..43a4366a1f
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/rules.mk
@@ -0,0 +1,16 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+WS2812_DRIVER = pwm         # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/yr80/yr80.c b/keyboards/yandrstudio/yr80/yr80.c
new file mode 100644
index 0000000000..16415bf9ab
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/yr80.c
@@ -0,0 +1,73 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "yr80.h"
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+bool led_update_kb(led_t led_state) {
+    if (!led_update_user(led_state)) { return false; }
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+#endif
+
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    switch(keycode) {
+        case KC_LG:
+            if (record->event.pressed) {
+                process_magic(GUI_TOG, record);
+            }
+            return false;
+        case KC_MACOS:
+            if (record->event.pressed) {
+                process_magic(CG_TOGG, record);
+            }
+            return false;
+        case KC_MCTL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+        case KC_LPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;
+        default:
+            return true;
+    }
+    return true;
+}
diff --git a/keyboards/yandrstudio/yr80/yr80.h b/keyboards/yandrstudio/yr80/yr80.h
new file mode 100644
index 0000000000..11cec853c3
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/yr80.h
@@ -0,0 +1,56 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,                         \
+    K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                   K416, \
+    K500, K501, K502,                   K506, K507, K508, K509, K510,                   K514, K515, K516  \
+    )\
+    { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216 }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, KC_NO, KC_NO, K416 }, \
+    { K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  K507,  K508,  K509,  K510,  KC_NO, KC_NO, KC_NO, K514,  K515,  K516 }  \
+}
+
+enum keyboard_keycodes {
+#ifdef VIA_ENABLE
+    LOCK_GUI = USER00,
+    TOG_MACOS_KEYMAP,
+    KC_MISSION_CONTROL,
+    KC_LAUNCHPAD,
+    NEW_SAFE_RANGE = SAFE_RANGE  // Important!
+#else
+    LOCK_GUI = SAFE_RANGE,
+    TOG_MACOS_KEYMAP,
+    KC_MISSION_CONTROL,
+    KC_LAUNCHPAD,
+    NEW_SAFE_RANGE   // Important!
+#endif
+};
+
+#define KC_LG    LOCK_GUI
+#define KC_MACOS TOG_MACOS_KEYMAP
+#define KC_MCTL  KC_MISSION_CONTROL
+#define KC_LPAD  KC_LAUNCHPAD

From 04897393518d97a42f571f0d19b690affd54ee55 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 20 Nov 2022 08:49:34 +0000
Subject: [PATCH 902/959] [Keyboard] Fix up Boaty (#19117)

---
 keyboards/jels/boaty/info.json                |  2 +-
 keyboards/jels/boaty/keymaps/default/keymap.c | 50 ++++++-------
 keyboards/jels/boaty/keymaps/via/keymap.c     | 74 ++++++++++++-------
 3 files changed, 75 insertions(+), 51 deletions(-)

diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/info.json
index 43065a895a..5d9e6bd54b 100644
--- a/keyboards/jels/boaty/info.json
+++ b/keyboards/jels/boaty/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Boaty",
-    "manufacurer": "Jels",
+    "manufacturer": "Jels",
     "usb": {
         "vid": "0x6A6B",
         "pid": "0x000B",
diff --git a/keyboards/jels/boaty/keymaps/default/keymap.c b/keyboards/jels/boaty/keymaps/default/keymap.c
index 885056246d..9c2dfc1d44 100644
--- a/keyboards/jels/boaty/keymaps/default/keymap.c
+++ b/keyboards/jels/boaty/keymaps/default/keymap.c
@@ -18,30 +18,30 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-//base layer
-[0] = LAYOUT_all(
-                                            KC_NUM,
-                                            KC_PAST, KC_PSLS,
-                                            KC_P7,   KC_P8,   KC_P9,
-                                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-                                            KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
-                                            KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
+  //base layer
+  [0] = LAYOUT_all(
+                                              KC_NUM,
+                                              KC_PAST, KC_PSLS,
+                                              KC_P7,   KC_P8,   KC_P9,
+                                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+                                              KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
+                                              KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
 
-KC_1, KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_BSPC, KC_DEL,
-        KC_1, KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,    KC_J,    KC_K,   KC_L,    KC_ENT,
-            KC_1,  KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   KC_RSFT,
-                          KC_LCTL, KC_LALT, KC_SPC, KC_1, KC_RALT, KC_RCTL
-),
-[1] = LAYOUT_all(
-                                            KC_F2,
-                                            KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
+  KC_1, KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_BSPC, KC_DEL,
+          KC_1, KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,    KC_J,    KC_K,   KC_L,    KC_ENT,
+              KC_1,  KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   KC_RSFT,
+                            KC_LCTL, KC_LALT, KC_SPC, KC_1, KC_RALT, KC_RCTL
+  ),
+  [1] = LAYOUT_all(
+                                              KC_F2,
+                                              KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/jels/boaty/keymaps/via/keymap.c b/keyboards/jels/boaty/keymaps/via/keymap.c
index f88a3774da..a2e557086b 100644
--- a/keyboards/jels/boaty/keymaps/via/keymap.c
+++ b/keyboards/jels/boaty/keymaps/via/keymap.c
@@ -18,30 +18,54 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-//base layer
-[0] = LAYOUT_all(
-                                            KC_NUM,
-                                            KC_PAST, KC_PSLS,
-                                            KC_P7,   KC_P8,   KC_P9,
-                                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-                                            KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
-                                            KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
+  //base layer
+  [0] = LAYOUT_all(
+                                              KC_NUM,
+                                              KC_PAST, KC_PSLS,
+                                              KC_P7,   KC_P8,   KC_P9,
+                                              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+                                              KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
+                                              KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
 
-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_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_ENT,
-                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,    KC_COMM, KC_RSFT,
-                          KC_LCTL, KC_LALT, KC_SPC,  MO(1), KC_RALT, KC_RCTL
-),
-[1] = LAYOUT_all(
-                                            KC_F2,
-                                            KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
+  KC_ESC, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    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_ENT,
+                   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,    KC_COMM, KC_RSFT,
+                            KC_LCTL, KC_LALT, KC_SPC,  MO(1), KC_RALT, KC_RCTL
+  ),
+  [1] = LAYOUT_all(
+                                              KC_F2,
+                                              KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+  [2] = LAYOUT_all(
+                                              KC_F2,
+                                              KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+  [3] = LAYOUT_all(
+                                              KC_F2,
+                                              KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  )
 };

From 543a863766192eab626492ec4f48641743ffc797 Mon Sep 17 00:00:00 2001
From: mmccoyd <mmccoyd@users.noreply.github.com>
Date: Sun, 20 Nov 2022 00:50:09 -0800
Subject: [PATCH 903/959] [Keyboard] Move Hillside out of handwired (#18751)

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
---
 .../hillside/48/keymaps/json2hill48.py        | 146 ------------------
 keyboards/handwired/hillside/readme.md        |  14 --
 .../46/46.c => hillside/46/0_1/0_1.c}         |   2 +-
 .../46/46.h => hillside/46/0_1/0_1.h}         |   0
 .../hillside/46 => hillside/46/0_1}/config.h  |   0
 keyboards/hillside/46/0_1/info.json           |  34 ++++
 .../hillside/46 => hillside/46/0_1}/rules.mk  |   0
 .../{handwired => }/hillside/46/info.json     |  33 ----
 .../hillside/46/keymaps/default/config.h      |   0
 .../hillside/46/keymaps/default/keymap.json   |   2 +-
 .../hillside/46/keymaps/default/readme.md     |   8 +-
 .../hillside/46/keymaps/default/rules.mk      |   0
 .../46/keymaps/default_dot_c/config.h         |   0
 .../46/keymaps/default_dot_c/keymap.c         |   0
 .../46/keymaps/default_dot_c/readme.md        |   6 +-
 .../46/keymaps/default_dot_c/rules.mk         |   0
 .../46/keymaps/manna-harbour_miryoku/config.h |   0
 .../46/keymaps/manna-harbour_miryoku/keymap.c |   0
 .../hillside/46/keymaps/via/keymap.c          |   0
 .../hillside/46/keymaps/via/rules.mk          |   0
 .../{handwired => }/hillside/46/readme.md     |   4 +-
 keyboards/hillside/46/rules.mk                |   1 +
 .../48/48.c => hillside/48/0_1/0_1.c}         |   2 +-
 .../48/48.h => hillside/48/0_1/0_1.h}         |   0
 .../hillside/48 => hillside/48/0_1}/config.h  |   0
 keyboards/hillside/48/0_1/info.json           |  35 +++++
 .../hillside/48 => hillside/48/0_1}/rules.mk  |   0
 .../{handwired => }/hillside/48/info.json     |  34 ----
 .../hillside/48/keymaps/default/config.h      |   0
 .../hillside/48/keymaps/default/keymap.json   |   2 +-
 .../hillside/48/keymaps/default/readme.md     |  54 ++++---
 .../hillside/48/keymaps/default/rules.mk      |   0
 .../48/keymaps/manna-harbour_miryoku/config.h |   0
 .../48/keymaps/manna-harbour_miryoku/keymap.c |   0
 .../hillside/48/keymaps/via/keymap.json       |   2 +-
 .../{handwired => }/hillside/48/readme.md     |   4 +-
 keyboards/hillside/48/rules.mk                |   1 +
 .../52/52.c => hillside/52/0_1/0_1.c}         |   2 +-
 .../52/52.h => hillside/52/0_1/0_1.h}         |   0
 .../hillside/52 => hillside/52/0_1}/config.h  |   0
 keyboards/hillside/52/0_1/info.json           |  34 ++++
 .../hillside/52 => hillside/52/0_1}/rules.mk  |   0
 .../{handwired => }/hillside/52/info.json     |  33 ----
 .../hillside/52/keymaps/default/config.h      |   0
 .../hillside/52/keymaps/default/keymap.json   |   2 +-
 .../hillside/52/keymaps/default/readme.md     |   8 +-
 .../hillside/52/keymaps/default/rules.mk      |   0
 .../52/keymaps/default_dot_c/config.h         |   0
 .../52/keymaps/default_dot_c/keymap.c         |   0
 .../52/keymaps/default_dot_c/readme.md        |   6 +-
 .../52/keymaps/default_dot_c/rules.mk         |   0
 .../52/keymaps/manna-harbour_miryoku/config.h |   0
 .../52/keymaps/manna-harbour_miryoku/keymap.c |   0
 .../hillside/52/keymaps/via/keymap.c          |   0
 .../hillside/52/keymaps/via/rules.mk          |   0
 .../{handwired => }/hillside/52/readme.md     |   4 +-
 keyboards/hillside/52/rules.mk                |   1 +
 keyboards/hillside/readme.md                  |  17 ++
 58 files changed, 180 insertions(+), 311 deletions(-)
 delete mode 100755 keyboards/handwired/hillside/48/keymaps/json2hill48.py
 delete mode 100644 keyboards/handwired/hillside/readme.md
 rename keyboards/{handwired/hillside/46/46.c => hillside/46/0_1/0_1.c} (95%)
 rename keyboards/{handwired/hillside/46/46.h => hillside/46/0_1/0_1.h} (100%)
 rename keyboards/{handwired/hillside/46 => hillside/46/0_1}/config.h (100%)
 create mode 100644 keyboards/hillside/46/0_1/info.json
 rename keyboards/{handwired/hillside/46 => hillside/46/0_1}/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/46/info.json (81%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default/config.h (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default/keymap.json (99%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default/readme.md (96%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default_dot_c/config.h (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default_dot_c/keymap.c (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default_dot_c/readme.md (82%)
 rename keyboards/{handwired => }/hillside/46/keymaps/default_dot_c/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/manna-harbour_miryoku/config.h (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/manna-harbour_miryoku/keymap.c (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/via/keymap.c (100%)
 rename keyboards/{handwired => }/hillside/46/keymaps/via/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/46/readme.md (92%)
 create mode 100644 keyboards/hillside/46/rules.mk
 rename keyboards/{handwired/hillside/48/48.c => hillside/48/0_1/0_1.c} (84%)
 rename keyboards/{handwired/hillside/48/48.h => hillside/48/0_1/0_1.h} (100%)
 rename keyboards/{handwired/hillside/48 => hillside/48/0_1}/config.h (100%)
 create mode 100644 keyboards/hillside/48/0_1/info.json
 rename keyboards/{handwired/hillside/48 => hillside/48/0_1}/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/48/info.json (80%)
 rename keyboards/{handwired => }/hillside/48/keymaps/default/config.h (100%)
 rename keyboards/{handwired => }/hillside/48/keymaps/default/keymap.json (99%)
 rename keyboards/{handwired => }/hillside/48/keymaps/default/readme.md (84%)
 rename keyboards/{handwired => }/hillside/48/keymaps/default/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/48/keymaps/manna-harbour_miryoku/config.h (100%)
 rename keyboards/{handwired => }/hillside/48/keymaps/manna-harbour_miryoku/keymap.c (100%)
 rename keyboards/{handwired => }/hillside/48/keymaps/via/keymap.json (98%)
 rename keyboards/{handwired => }/hillside/48/readme.md (92%)
 create mode 100644 keyboards/hillside/48/rules.mk
 rename keyboards/{handwired/hillside/52/52.c => hillside/52/0_1/0_1.c} (95%)
 rename keyboards/{handwired/hillside/52/52.h => hillside/52/0_1/0_1.h} (100%)
 rename keyboards/{handwired/hillside/52 => hillside/52/0_1}/config.h (100%)
 create mode 100644 keyboards/hillside/52/0_1/info.json
 rename keyboards/{handwired/hillside/52 => hillside/52/0_1}/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/52/info.json (82%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default/config.h (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default/keymap.json (99%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default/readme.md (96%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default_dot_c/config.h (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default_dot_c/keymap.c (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default_dot_c/readme.md (82%)
 rename keyboards/{handwired => }/hillside/52/keymaps/default_dot_c/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/manna-harbour_miryoku/config.h (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/manna-harbour_miryoku/keymap.c (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/via/keymap.c (100%)
 rename keyboards/{handwired => }/hillside/52/keymaps/via/rules.mk (100%)
 rename keyboards/{handwired => }/hillside/52/readme.md (92%)
 create mode 100644 keyboards/hillside/52/rules.mk
 create mode 100644 keyboards/hillside/readme.md

diff --git a/keyboards/handwired/hillside/48/keymaps/json2hill48.py b/keyboards/handwired/hillside/48/keymaps/json2hill48.py
deleted file mode 100755
index c4fb5b1037..0000000000
--- a/keyboards/handwired/hillside/48/keymaps/json2hill48.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2020-2022 Pierre Viseu Chevalier, Michael McCoyd (@pierrechevalier83, @mmccoyd)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-"""Pretty print keymap json in more readable row/side organized format, based on ROW_SIZES."""
-
-import argparse
-import json
-import sys
-from typing import NamedTuple
-
-"""Print keymap json in row and side format, though as still re-readable json.
-
-For example, for one layer:
-
- ["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_GRV",
-  "KC_ESC" , "KC_N"   , "KC_M"   , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT",
-
-  "KC_ENT" , "KC_LGUI", "KC_LALT", "MO(5)"  , "MO(3)",
-  "MO(4)"  , "KC_SPC" , "KC_LALT", "KC_RGUI", "KC_APP"
- ],
-"""
-
-# The structure of the keymap. Tuples describing row sizes.
-# (<Keys upto and including (one-indexed) keycount x> <are in half rows of y>)
-ROW_SIZES = [(24, 6),
-             (38, 7),
-             (48, 5),
-             ]
-
-###
-### Below here should not need to changed for different keyboards
-###
-
-LAST_KEY = ROW_SIZES[-1][0] - 1
-
-indent_level=4 # number of spaces of initial indent per output line
-
-def parse_cli():
-    parser = argparse.ArgumentParser(description='Hillside keymap formatter')
-    parser.add_argument("--input", type=argparse.FileType('r'),
-        default=sys.stdin, help="Input keymap "
-                        "(json file produced by qmk configurator)")
-    return parser.parse_args()
-
-class Column(NamedTuple):
-    """Column number within keymap side, if it ends side, and ends row.
-
-    Position within a keyboard row runs from 0 to n and again 0 to n"""
-    num: int
-    ends_side: bool
-    ends_row: bool
-
-def get_col(key_index):
-    """Return Column for key_index."""
-    index_prior = 0 # index of last key in rows of the prior size
-    for keys_upto, num_cols in ROW_SIZES: # For row sizes from top
-        if key_index < keys_upto: # Find range key_index is in
-            col_num = (key_index - index_prior) % num_cols
-            return Column(col_num, # Return column plus side and row ends flags
-                          ends_side=col_num == num_cols - 1,
-                          ends_row=(keys_upto - 1 - key_index) %
-                          (2 * num_cols) == 0)
-        index_prior = keys_upto # Big O: row ranges * keys, but range is small
-
-def format_layers(layers):
-    formatted = indent_level * " " + "\"layers\": [\n"
-
-    # Find max key length per column
-    max_key_length = {}
-    for layer in layers:
-        for (index, keycode) in enumerate(layer):
-            col = get_col(index)
-            max_length = max_key_length.get(col.num)
-            if (not max_length) or len(keycode) > max_length:
-                max_key_length.update({col.num: len(keycode)})
-    # Format each layer
-    for (layer_index, layer) in enumerate(layers):
-        # Opening [
-        formatted += 2 * indent_level * " "
-        formatted += "["
-
-        # Split keys into pairs of left and right rows by key row length
-        for (index, keycode) in enumerate(layer):
-            col = get_col(index)
-
-            # Indent for rows past first
-            if col.num == 0 and index != 0:
-                formatted += (1 + 2 * indent_level) * " "
-
-            # Print key
-            formatted += json.dumps(keycode)
-
-            # End layer, or end side, or space to next key
-            if index == LAST_KEY:
-                formatted += "\n"
-            elif col.ends_side:
-                formatted += ",\n"
-            else:
-                n_spaces = max_key_length[get_col(index).num] - len(keycode)
-                formatted += n_spaces * " "
-                formatted += ", "
-
-            # Split groups of row sides
-            if col.ends_row:
-                formatted += "\n"
-
-        # Closing ] with , or without
-        formatted += 2 * indent_level * " "
-        if layer_index < len(layers) - 1:
-            formatted += "],\n"
-        else:
-            formatted += "]\n"
-
-    formatted += indent_level * " "
-    formatted += "]"
-
-    return formatted
-
-def format_keymap(keymap_json):
-    formatted = "{"
-    for (index, k) in enumerate(keymap_json):
-        if k == "layers":
-            formatted += format_layers(keymap_json[k])
-        else:
-            formatted += f"{indent_level * ' '}{json.dumps(k)}: {json.dumps(keymap_json[k])}"
-        if index < len(keymap_json) - 1:
-            formatted += ","
-        formatted += "\n"
-    formatted += "}"
-    return formatted
-
-def main():
-    args=parse_cli()
-    keymap_json = json.loads(args.input.read())
-    print(format_keymap(keymap_json))
-
-if __name__ == "__main__":
-    main()
diff --git a/keyboards/handwired/hillside/readme.md b/keyboards/handwired/hillside/readme.md
deleted file mode 100644
index b2ea11d420..0000000000
--- a/keyboards/handwired/hillside/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Hillside
-
-![hillside](https://imgur.com/4POduewh.png)
-
-[Hillside](https://github.com/mmccoyd/hillside)
- is a small family of split ergonomic keyboards.
-Inside this directory is support for the two smaller models, 
-  the 52 and 48.
-
-* Keyboard Maintainer: [Michael McCoyd](https://github.com/mmccoyd)
-* Hardware Supported:
-    * [Hillside 52](https://github.com/qmk/qmk_firmware/blob/master/keyboards/handwired/hillside/52): ProMicro/Elite-C and compatible
-    * [Hillside 48](https://github.com/qmk/qmk_firmware/blob/master/keyboards/handwired/hillside/48): ProMicro/Elite-C and compatible
-* Hardware Availability: [https://github.com/mmccoyd/hillside](https://github.com/mmccoyd/hillside)
diff --git a/keyboards/handwired/hillside/46/46.c b/keyboards/hillside/46/0_1/0_1.c
similarity index 95%
rename from keyboards/handwired/hillside/46/46.c
rename to keyboards/hillside/46/0_1/0_1.c
index 9a3bd3abc8..d958056801 100644
--- a/keyboards/handwired/hillside/46/46.c
+++ b/keyboards/hillside/46/0_1/0_1.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Michael McCoyd (@mmccoyd)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "46.h"
+#include "0_1.h"
 
 // Keymatrix spots to ignore, as one signals handedness and others have no key
 const matrix_row_t matrix_mask[] = {
diff --git a/keyboards/handwired/hillside/46/46.h b/keyboards/hillside/46/0_1/0_1.h
similarity index 100%
rename from keyboards/handwired/hillside/46/46.h
rename to keyboards/hillside/46/0_1/0_1.h
diff --git a/keyboards/handwired/hillside/46/config.h b/keyboards/hillside/46/0_1/config.h
similarity index 100%
rename from keyboards/handwired/hillside/46/config.h
rename to keyboards/hillside/46/0_1/config.h
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
new file mode 100644
index 0000000000..29a23aad80
--- /dev/null
+++ b/keyboards/hillside/46/0_1/info.json
@@ -0,0 +1,34 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+
+    "matrix_pins": {
+        "rows": ["C6", "D7", "E6", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },
+    "diode_direction": "COL2ROW",
+
+    "usb": {
+      "vid": "0x4D4D",
+      "pid": "0x4846",
+      "device_version": "0.0.1"
+    },
+
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
+
+    "rgblight": {
+        "led_count": 4,
+        "pin": "D3",
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    }
+}
diff --git a/keyboards/handwired/hillside/46/rules.mk b/keyboards/hillside/46/0_1/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/46/rules.mk
rename to keyboards/hillside/46/0_1/rules.mk
diff --git a/keyboards/handwired/hillside/46/info.json b/keyboards/hillside/46/info.json
similarity index 81%
rename from keyboards/handwired/hillside/46/info.json
rename to keyboards/hillside/46/info.json
index 9c69b54d7b..5af9add00f 100644
--- a/keyboards/handwired/hillside/46/info.json
+++ b/keyboards/hillside/46/info.json
@@ -7,39 +7,6 @@
 
     "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
 
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-
-    "matrix_pins": {
-        "rows": ["C6", "D7", "E6", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },
-    "diode_direction": "COL2ROW",
-
-    "usb": {
-      "vid": "0x4D4D",
-      "pid": "0x4846",
-      "device_version": "0.0.1"
-    },
-
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-
-    "rgblight": {
-        "led_count": 4,
-        "pin": "D3",
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8
-    },
-
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/hillside/46/keymaps/default/config.h b/keyboards/hillside/46/keymaps/default/config.h
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/default/config.h
rename to keyboards/hillside/46/keymaps/default/config.h
diff --git a/keyboards/handwired/hillside/46/keymaps/default/keymap.json b/keyboards/hillside/46/keymaps/default/keymap.json
similarity index 99%
rename from keyboards/handwired/hillside/46/keymaps/default/keymap.json
rename to keyboards/hillside/46/keymaps/default/keymap.json
index f5171564d1..b24aafa32b 100644
--- a/keyboards/handwired/hillside/46/keymaps/default/keymap.json
+++ b/keyboards/hillside/46/keymaps/default/keymap.json
@@ -1,7 +1,7 @@
 {    "version": 1,
     "notes": "",
     "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "handwired/hillside/46",
+    "keyboard": "hillside/46",
     "keymap": "default",
     "layout": "LAYOUT",
     "layers": [
diff --git a/keyboards/handwired/hillside/46/keymaps/default/readme.md b/keyboards/hillside/46/keymaps/default/readme.md
similarity index 96%
rename from keyboards/handwired/hillside/46/keymaps/default/readme.md
rename to keyboards/hillside/46/keymaps/default/readme.md
index aacdc92aad..64356ebaa7 100644
--- a/keyboards/handwired/hillside/46/keymaps/default/readme.md
+++ b/keyboards/hillside/46/keymaps/default/readme.md
@@ -1,6 +1,6 @@
 # Hillside 46 Default Keymap
 
-For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/46/LAYOUT).
+For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/hillside/46/LAYOUT).
 
 Some of its key features are:
 
@@ -76,7 +76,7 @@ If you are coming from a traditional keyboard,
 This default layout tries to simplify that adjustment by keeping things in the expected spots when possible.
 
 Yet this layout is only a decent compromise and is not optimal for each user.
-The online configurator makes it easy to tweak this layout to your needs.
+The online [configurator](https://config.qmk.fm/#/hillside/46/LAYOUT) makes it easy to tweak this layout to your needs.
 You can add additional layers or completely switch around what these do.
 
 A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
@@ -110,8 +110,8 @@ If you wish, you can edit the ```keymap.json``` directly in a text editor,  comp
 
 Or, you can use the graphical configurator to edit the keymap. To do that:
 
-- Open the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/46/LAYOUT)
-- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/handwired/hillside/46/keymaps/default/keymap.json```
+- Open the [QMK configurator](https://config.qmk.fm/#/hillside/46/LAYOUT)
+- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/hillside/46/keymaps/default/keymap.json```
 - Make the changes you wish to the layout
 - Save the keymap using the green down arrow button.
 - Move the downloaded keymap back into your QMK repository 
diff --git a/keyboards/handwired/hillside/46/keymaps/default/rules.mk b/keyboards/hillside/46/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/default/rules.mk
rename to keyboards/hillside/46/keymaps/default/rules.mk
diff --git a/keyboards/handwired/hillside/46/keymaps/default_dot_c/config.h b/keyboards/hillside/46/keymaps/default_dot_c/config.h
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/default_dot_c/config.h
rename to keyboards/hillside/46/keymaps/default_dot_c/config.h
diff --git a/keyboards/handwired/hillside/46/keymaps/default_dot_c/keymap.c b/keyboards/hillside/46/keymaps/default_dot_c/keymap.c
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/default_dot_c/keymap.c
rename to keyboards/hillside/46/keymaps/default_dot_c/keymap.c
diff --git a/keyboards/handwired/hillside/46/keymaps/default_dot_c/readme.md b/keyboards/hillside/46/keymaps/default_dot_c/readme.md
similarity index 82%
rename from keyboards/handwired/hillside/46/keymaps/default_dot_c/readme.md
rename to keyboards/hillside/46/keymaps/default_dot_c/readme.md
index 564691d611..713a4f383b 100644
--- a/keyboards/handwired/hillside/46/keymaps/default_dot_c/readme.md
+++ b/keyboards/hillside/46/keymaps/default_dot_c/readme.md
@@ -2,14 +2,14 @@
 
 This layout is for those who prefer defining their layout in a keymap.c,
   instead of graphically with a keymap.json.
-It is the same as the [default keymap.json layout](https://github.com/qmk/qmk_firmware/blob/master/keyboards/handwired/hillside/46/keymaps/default),
+It is the same as the [default keymap.json layout](https://github.com/qmk/qmk_firmware/blob/master/keyboards/hillside/46/keymaps/default),
   except for having only a QWERTY base layer.
   
 The make and flash commands are
 
 ```
-make handwired/hillside/46:default_dot_c
-make handwired/hillside/46:default_doc_c:flash
+make hillside/46:default_dot_c
+make hillside/46:default_doc_c:flash
 
 ```
 
diff --git a/keyboards/handwired/hillside/46/keymaps/default_dot_c/rules.mk b/keyboards/hillside/46/keymaps/default_dot_c/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/default_dot_c/rules.mk
rename to keyboards/hillside/46/keymaps/default_dot_c/rules.mk
diff --git a/keyboards/handwired/hillside/46/keymaps/manna-harbour_miryoku/config.h b/keyboards/hillside/46/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/hillside/46/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/handwired/hillside/46/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/hillside/46/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/hillside/46/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/handwired/hillside/46/keymaps/via/keymap.c b/keyboards/hillside/46/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/via/keymap.c
rename to keyboards/hillside/46/keymaps/via/keymap.c
diff --git a/keyboards/handwired/hillside/46/keymaps/via/rules.mk b/keyboards/hillside/46/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/46/keymaps/via/rules.mk
rename to keyboards/hillside/46/keymaps/via/rules.mk
diff --git a/keyboards/handwired/hillside/46/readme.md b/keyboards/hillside/46/readme.md
similarity index 92%
rename from keyboards/handwired/hillside/46/readme.md
rename to keyboards/hillside/46/readme.md
index f1c9483cab..4a02982843 100644
--- a/keyboards/handwired/hillside/46/readme.md
+++ b/keyboards/hillside/46/readme.md
@@ -13,11 +13,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/hillside/46:default
+    make hillside/46/0_1:default
 
 Flashing example for this keyboard:
 
-    make handwired/hillside/46:default:flash
+    make hillside/46/0_1:default:flash
 
 ## Bootloader
 
diff --git a/keyboards/hillside/46/rules.mk b/keyboards/hillside/46/rules.mk
new file mode 100644
index 0000000000..f3e926a8dc
--- /dev/null
+++ b/keyboards/hillside/46/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = hillside/46/0_1
\ No newline at end of file
diff --git a/keyboards/handwired/hillside/48/48.c b/keyboards/hillside/48/0_1/0_1.c
similarity index 84%
rename from keyboards/handwired/hillside/48/48.c
rename to keyboards/hillside/48/0_1/0_1.c
index a1d2c2f6e4..34659eb424 100644
--- a/keyboards/handwired/hillside/48/48.c
+++ b/keyboards/hillside/48/0_1/0_1.c
@@ -1,4 +1,4 @@
 // Copyright 2022 Michael McCoyd (@mmccoyd)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "48.h"
+#include "0_1.h"
diff --git a/keyboards/handwired/hillside/48/48.h b/keyboards/hillside/48/0_1/0_1.h
similarity index 100%
rename from keyboards/handwired/hillside/48/48.h
rename to keyboards/hillside/48/0_1/0_1.h
diff --git a/keyboards/handwired/hillside/48/config.h b/keyboards/hillside/48/0_1/config.h
similarity index 100%
rename from keyboards/handwired/hillside/48/config.h
rename to keyboards/hillside/48/0_1/config.h
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
new file mode 100644
index 0000000000..943982d65e
--- /dev/null
+++ b/keyboards/hillside/48/0_1/info.json
@@ -0,0 +1,35 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+
+    "matrix_pins": {
+        "rows": ["D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },    
+    "diode_direction": "COL2ROW",
+
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x67C0",
+      "device_version": "0.0.1"
+    },
+
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "main": "left"
+    },
+
+    "rgblight": {
+        "led_count": 5,
+        "pin": "D3",
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    }
+}
diff --git a/keyboards/handwired/hillside/48/rules.mk b/keyboards/hillside/48/0_1/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/48/rules.mk
rename to keyboards/hillside/48/0_1/rules.mk
diff --git a/keyboards/handwired/hillside/48/info.json b/keyboards/hillside/48/info.json
similarity index 80%
rename from keyboards/handwired/hillside/48/info.json
rename to keyboards/hillside/48/info.json
index 1b6d5a6828..a488671008 100644
--- a/keyboards/handwired/hillside/48/info.json
+++ b/keyboards/hillside/48/info.json
@@ -7,40 +7,6 @@
 
     "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
 
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-
-    "matrix_pins": {
-        "rows": ["D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },    
-    "diode_direction": "COL2ROW",
-
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x67C0",
-      "device_version": "0.0.1"
-    },
-
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "main": "left"
-    },
-
-    "rgblight": {
-        "led_count": 5,
-        "pin": "D3",
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8
-    },
-
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/hillside/48/keymaps/default/config.h b/keyboards/hillside/48/keymaps/default/config.h
similarity index 100%
rename from keyboards/handwired/hillside/48/keymaps/default/config.h
rename to keyboards/hillside/48/keymaps/default/config.h
diff --git a/keyboards/handwired/hillside/48/keymaps/default/keymap.json b/keyboards/hillside/48/keymaps/default/keymap.json
similarity index 99%
rename from keyboards/handwired/hillside/48/keymaps/default/keymap.json
rename to keyboards/hillside/48/keymaps/default/keymap.json
index 268fa51839..e5351b5f1a 100644
--- a/keyboards/handwired/hillside/48/keymaps/default/keymap.json
+++ b/keyboards/hillside/48/keymaps/default/keymap.json
@@ -1,7 +1,7 @@
 {    "version": 1,
     "notes": "",
     "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "handwired/hillside/48",
+    "keyboard": "hillside/48",
     "keymap": "default",
     "layout": "LAYOUT",
     "layers": [
diff --git a/keyboards/handwired/hillside/48/keymaps/default/readme.md b/keyboards/hillside/48/keymaps/default/readme.md
similarity index 84%
rename from keyboards/handwired/hillside/48/keymaps/default/readme.md
rename to keyboards/hillside/48/keymaps/default/readme.md
index 9bf294eff0..bfa720f57a 100644
--- a/keyboards/handwired/hillside/48/keymaps/default/readme.md
+++ b/keyboards/hillside/48/keymaps/default/readme.md
@@ -1,8 +1,9 @@
-# Default Keymap
+# Hillside 48 Default Keymap
 
-For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/48/LAYOUT).
+For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/hillside/48/LAYOUT).
 
 Some of its key features are:
+
 - Numbers and symbols along the top row of their layers for familiarity.
 - Comfortable combination of modifier and function or symbol on the non-base layers
   using modifiers on the home row of the symbol and number/function layers.
@@ -97,20 +98,21 @@ Simultaneously holding down the Sym and Nav/Edit keys enables keys to adjust key
 ## Make it Yours
 
 If you are coming from a traditional keyboard,
-  with a row-staggered layout and a large set of physical keys,
+  with a large set of physical keys,
   learning to use a column staggered (ergo) and layer-based keyboard,
   which uses layers instead of finger reaches to access numbers, symbols and functions,
   will be an adjustment for your muscle memory and your mental keyboard map.
 This default layout tries to simplify that adjustment by keeping things in the expected spots when possible.
 
 Yet this layout is only a decent compromise and is not optimal for each user.
-The online configurator makes it easy to tweak this layout to your needs.
+The online [configurator](https://config.qmk.fm/#/hillside/48/LAYOUT) makes it easy to tweak this layout to your needs.
 You can add additional layers or completely switch around what these do.
 
 A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
   in response to ideas of how it might serve you better.
-
+  
 Some changes you might consider making:
+
 - If you are on a mac, switch the editing keys from ctrl-x to cmd-x.
 - Change the shift keys to one-shot shift keys,
   where pressing and releasing them shifts the next key pressed.
@@ -122,6 +124,7 @@ Some changes you might consider making:
   You would still be able to hold it down instead.
 
 Here are some other keymaps for inspiration and ideas:
+
 - The [Ferris default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default) uses more advanced features as it has far fewer keys.
 - The [Miryoku](https://github.com/manna-harbour/miryoku/tree/master/docs/reference) keymap ensures that all modifiers are comfortably available with each character key.
 - The [Kyria default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/default) has different keymap choices and a couple more keys.
@@ -130,30 +133,33 @@ Here are some other keymaps for inspiration and ideas:
 
 ## Why no keymap.c
 
-The online configurator provides a straightforward visual way to work with a simple layout
-  and uses a .json keymap format.
-So this default ```keymap.json``` was created with the online configurator
-  and formatted for easier reading and editing.
+The online configurator provides a straightforward visual way
+   to work with a simple layout and uses a .json keymap format.
+So this default ```keymap.json``` was created with the online configurator.
 
-If you wish, you can edit the ```keymap.json``` directly in a text editor, optionally use the below ```json2hill48.py``` to restore the spacing, and then compile and flash it.
+If you wish, you can edit the ```keymap.json``` directly in a text editor,  compile it and flash it.
 
 Or, you can use the graphical configurator to edit the keymap. To do that:
 
-- Open the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/48/LAYOUT)
-- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/handwired/hillside/48/keymaps/default/keymap.json```
+- Open the [QMK configurator](https://config.qmk.fm/#/hillside/48/LAYOUT)
+- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/hillside/48/keymaps/default/keymap.json```
 - Make the changes you wish to the layout
 - Save the keymap using the green down arrow button.
-- Copy those changes back into your QMK repository and reformat for easy reading using the format script:
-```
-./keyboards/handwired/hillside/48/keymaps/json2hill48.py \
-    --input <Your download directory>/default.json \
-    > ./keyboards/handwired/hillside/48/keymaps/default/keymap.json
-```
-   You may need to make that script executable with ```chmod +x```. After your keymap is safely copied and formatted, you may want to remove the keymap from your download directory so later downloads will automatically receive the same file name.
+- Move the downloaded keymap back into your QMK repository 
+     at the same location as above.
+- Rename it back to keymap.json
+- Compile and flash the firmware.
 
-After either method of editing, compile and flash the keymap as usual.
-
-You can combine a .json based keymap with more advanced features specified in .c files
-  with a bit more complexity.
+You can combine a .json based keymap with more advanced features
+  specified in .c files with a bit more complexity.
 For example, see
-[pierrec83's Kyria map](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/pierrec83).
\ No newline at end of file
+ [pierrec83's Kyria map](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/pierrec83).
+ 
+### Pretty Printing
+ 
+The QMK configurator's .json download has only one key per line,
+so it is hard to visualize the keymap if editing manually.
+If you want, the Hillside git repo has a pretty-printing script for the keymap.json file.
+ 
+As with anything downloaded from the internet, you should take some steps to assure yourself that the script will not harm your computer nor steal your data. The script is short, so reading it should at least convince you it is rearranging and printing the keymap provided, not reading your banking data.
+See the [Hillside wiki](https://github.com/mmccoyd/hillside/wiki) for the script.
diff --git a/keyboards/handwired/hillside/48/keymaps/default/rules.mk b/keyboards/hillside/48/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/48/keymaps/default/rules.mk
rename to keyboards/hillside/48/keymaps/default/rules.mk
diff --git a/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/config.h b/keyboards/hillside/48/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/hillside/48/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/hillside/48/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/handwired/hillside/48/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/hillside/48/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/handwired/hillside/48/keymaps/via/keymap.json b/keyboards/hillside/48/keymaps/via/keymap.json
similarity index 98%
rename from keyboards/handwired/hillside/48/keymaps/via/keymap.json
rename to keyboards/hillside/48/keymaps/via/keymap.json
index b4848a72ee..1405f5d2f0 100644
--- a/keyboards/handwired/hillside/48/keymaps/via/keymap.json
+++ b/keyboards/hillside/48/keymaps/via/keymap.json
@@ -1,6 +1,6 @@
 {    "version": 1,
     "notes": "",
-    "keyboard": "handwired/hillside/48",
+    "keyboard": "hillside/48",
     "keymap": "via",
     "layout": "LAYOUT",
     "layers": [
diff --git a/keyboards/handwired/hillside/48/readme.md b/keyboards/hillside/48/readme.md
similarity index 92%
rename from keyboards/handwired/hillside/48/readme.md
rename to keyboards/hillside/48/readme.md
index e65deed9c8..c23702fdfa 100644
--- a/keyboards/handwired/hillside/48/readme.md
+++ b/keyboards/hillside/48/readme.md
@@ -13,11 +13,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/hillside/48:default
+    make hillside/48/0_1:default
 
 Flashing example for this keyboard:
 
-    make handwired/hillside/48:default:flash
+    make hillside/48/0_1:default:flash
 
 ## Bootloader
 
diff --git a/keyboards/hillside/48/rules.mk b/keyboards/hillside/48/rules.mk
new file mode 100644
index 0000000000..d8d69d9ec1
--- /dev/null
+++ b/keyboards/hillside/48/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = hillside/48/0_1
diff --git a/keyboards/handwired/hillside/52/52.c b/keyboards/hillside/52/0_1/0_1.c
similarity index 95%
rename from keyboards/handwired/hillside/52/52.c
rename to keyboards/hillside/52/0_1/0_1.c
index b4d6b4629d..9a9808da8c 100644
--- a/keyboards/handwired/hillside/52/52.c
+++ b/keyboards/hillside/52/0_1/0_1.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Michael McCoyd (@mmccoyd)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "52.h"
+#include "0_1.h"
 
 // Keymatrix spots to ignore, as one signals handedness and others have no key
 const matrix_row_t matrix_mask[] = {
diff --git a/keyboards/handwired/hillside/52/52.h b/keyboards/hillside/52/0_1/0_1.h
similarity index 100%
rename from keyboards/handwired/hillside/52/52.h
rename to keyboards/hillside/52/0_1/0_1.h
diff --git a/keyboards/handwired/hillside/52/config.h b/keyboards/hillside/52/0_1/config.h
similarity index 100%
rename from keyboards/handwired/hillside/52/config.h
rename to keyboards/hillside/52/0_1/config.h
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json
new file mode 100644
index 0000000000..f5cf4486d5
--- /dev/null
+++ b/keyboards/hillside/52/0_1/info.json
@@ -0,0 +1,34 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+
+    "matrix_pins": {
+        "rows": ["C6", "D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },    
+    "diode_direction": "COL2ROW",
+
+    "usb": {
+      "vid": "0x4D4D",
+      "pid": "0x4852",
+      "device_version": "0.0.1"
+    },
+
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
+
+    "rgblight": {
+        "led_count": 5,
+        "pin": "D3",
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    }
+}
diff --git a/keyboards/handwired/hillside/52/rules.mk b/keyboards/hillside/52/0_1/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/52/rules.mk
rename to keyboards/hillside/52/0_1/rules.mk
diff --git a/keyboards/handwired/hillside/52/info.json b/keyboards/hillside/52/info.json
similarity index 82%
rename from keyboards/handwired/hillside/52/info.json
rename to keyboards/hillside/52/info.json
index 107162024c..0f2dad336e 100644
--- a/keyboards/handwired/hillside/52/info.json
+++ b/keyboards/hillside/52/info.json
@@ -7,39 +7,6 @@
 
     "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
 
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-
-    "matrix_pins": {
-        "rows": ["C6", "D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },    
-    "diode_direction": "COL2ROW",
-
-    "usb": {
-      "vid": "0x4D4D",
-      "pid": "0x4852",
-      "device_version": "0.0.1"
-    },
-
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-
-    "rgblight": {
-        "led_count": 5,
-        "pin": "D3",
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8
-    },
-
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/hillside/52/keymaps/default/config.h b/keyboards/hillside/52/keymaps/default/config.h
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/default/config.h
rename to keyboards/hillside/52/keymaps/default/config.h
diff --git a/keyboards/handwired/hillside/52/keymaps/default/keymap.json b/keyboards/hillside/52/keymaps/default/keymap.json
similarity index 99%
rename from keyboards/handwired/hillside/52/keymaps/default/keymap.json
rename to keyboards/hillside/52/keymaps/default/keymap.json
index a49daf6b2c..0c9853810c 100644
--- a/keyboards/handwired/hillside/52/keymaps/default/keymap.json
+++ b/keyboards/hillside/52/keymaps/default/keymap.json
@@ -1,7 +1,7 @@
 {    "version": 1,
     "notes": "",
     "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "handwired/hillside/52",
+    "keyboard": "hillside/52",
     "keymap": "default",
     "layout": "LAYOUT",
     "layers": [
diff --git a/keyboards/handwired/hillside/52/keymaps/default/readme.md b/keyboards/hillside/52/keymaps/default/readme.md
similarity index 96%
rename from keyboards/handwired/hillside/52/keymaps/default/readme.md
rename to keyboards/hillside/52/keymaps/default/readme.md
index 1617b0d431..cb09d5852d 100644
--- a/keyboards/handwired/hillside/52/keymaps/default/readme.md
+++ b/keyboards/hillside/52/keymaps/default/readme.md
@@ -1,6 +1,6 @@
 # Hillside 52 Default Keymap
 
-For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/52/LAYOUT).
+For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/hillside/52/LAYOUT).
 
 Some of its key features are:
 
@@ -77,7 +77,7 @@ If you are coming from a traditional keyboard,
 This default layout tries to simplify that adjustment by keeping things in the expected spots when possible.
 
 Yet this layout is only a decent compromise and is not optimal for each user.
-The online [configurator](https://config.qmk.fm/#/handwired/hillside/52/LAYOUT) makes it easy to tweak this layout to your needs.
+The online [configurator](https://config.qmk.fm/#/hillside/52/LAYOUT) makes it easy to tweak this layout to your needs.
 You can add additional layers or completely switch around what these do.
 
 A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
@@ -130,8 +130,8 @@ If you wish, you can edit the ```keymap.json``` directly in a text editor,  comp
 
 Or, you can use the graphical configurator to edit the keymap. To do that:
 
-- Open the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/52/LAYOUT)
-- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/handwired/hillside/52/keymaps/default/keymap.json```
+- Open the [QMK configurator](https://config.qmk.fm/#/hillside/52/LAYOUT)
+- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/hillside/52/keymaps/default/keymap.json```
 - Make the changes you wish to the layout
 - Save the keymap using the green down arrow button.
 - Move the downloaded keymap back into your QMK repository 
diff --git a/keyboards/handwired/hillside/52/keymaps/default/rules.mk b/keyboards/hillside/52/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/default/rules.mk
rename to keyboards/hillside/52/keymaps/default/rules.mk
diff --git a/keyboards/handwired/hillside/52/keymaps/default_dot_c/config.h b/keyboards/hillside/52/keymaps/default_dot_c/config.h
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/default_dot_c/config.h
rename to keyboards/hillside/52/keymaps/default_dot_c/config.h
diff --git a/keyboards/handwired/hillside/52/keymaps/default_dot_c/keymap.c b/keyboards/hillside/52/keymaps/default_dot_c/keymap.c
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/default_dot_c/keymap.c
rename to keyboards/hillside/52/keymaps/default_dot_c/keymap.c
diff --git a/keyboards/handwired/hillside/52/keymaps/default_dot_c/readme.md b/keyboards/hillside/52/keymaps/default_dot_c/readme.md
similarity index 82%
rename from keyboards/handwired/hillside/52/keymaps/default_dot_c/readme.md
rename to keyboards/hillside/52/keymaps/default_dot_c/readme.md
index 2963e3452d..f21d13f5f8 100644
--- a/keyboards/handwired/hillside/52/keymaps/default_dot_c/readme.md
+++ b/keyboards/hillside/52/keymaps/default_dot_c/readme.md
@@ -2,14 +2,14 @@
 
 This layout is for those who prefer defining their layout in a keymap.c,
   instead of graphically with a keymap.json.
-It is the same as the [default keymap.json layout](https://github.com/qmk/qmk_firmware/blob/master/keyboards/handwired/hillside/52/keymaps/default),
+It is the same as the [default keymap.json layout](https://github.com/qmk/qmk_firmware/blob/master/keyboards/hillside/52/keymaps/default),
   except for having only a QWERTY base layer.
   
 The make and flash commands are
 
 ```
-make handwired/hillside/52:default_dot_c
-make handwired/hillside/52:default_doc_c:flash
+make hillside/52:default_dot_c
+make hillside/52:default_doc_c:flash
 
 ```
 
diff --git a/keyboards/handwired/hillside/52/keymaps/default_dot_c/rules.mk b/keyboards/hillside/52/keymaps/default_dot_c/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/default_dot_c/rules.mk
rename to keyboards/hillside/52/keymaps/default_dot_c/rules.mk
diff --git a/keyboards/handwired/hillside/52/keymaps/manna-harbour_miryoku/config.h b/keyboards/hillside/52/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/hillside/52/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/handwired/hillside/52/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/hillside/52/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/hillside/52/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/handwired/hillside/52/keymaps/via/keymap.c b/keyboards/hillside/52/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/via/keymap.c
rename to keyboards/hillside/52/keymaps/via/keymap.c
diff --git a/keyboards/handwired/hillside/52/keymaps/via/rules.mk b/keyboards/hillside/52/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/handwired/hillside/52/keymaps/via/rules.mk
rename to keyboards/hillside/52/keymaps/via/rules.mk
diff --git a/keyboards/handwired/hillside/52/readme.md b/keyboards/hillside/52/readme.md
similarity index 92%
rename from keyboards/handwired/hillside/52/readme.md
rename to keyboards/hillside/52/readme.md
index 3878bc062a..be4727083c 100644
--- a/keyboards/handwired/hillside/52/readme.md
+++ b/keyboards/hillside/52/readme.md
@@ -13,11 +13,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/hillside/52:default
+    make hillside/52/0_1:default
 
 Flashing example for this keyboard:
 
-    make handwired/hillside/52:default:flash
+    make hillside/52/0_1:default:flash
 
 ## Bootloader
 
diff --git a/keyboards/hillside/52/rules.mk b/keyboards/hillside/52/rules.mk
new file mode 100644
index 0000000000..402bc6bb95
--- /dev/null
+++ b/keyboards/hillside/52/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = hillside/52/0_1
diff --git a/keyboards/hillside/readme.md b/keyboards/hillside/readme.md
new file mode 100644
index 0000000000..a1ca944d3a
--- /dev/null
+++ b/keyboards/hillside/readme.md
@@ -0,0 +1,17 @@
+# Hillside
+
+| Hillside 52 and 48|![hillside](https://imgur.com/bvzLZz4h.png)|
+|:-----------|:----------------|
+| **Hillside 46** | ![hillside](https://imgur.com/pIVrKSgh.png)|
+
+[Hillside](https://github.com/mmccoyd/hillside)
+ is a small family of split ergonomic keyboards.
+Inside this directory is support for the three smaller models: 
+  the 52, 48 and 46.
+
+* Keyboard Maintainer: [Michael McCoyd](https://github.com/mmccoyd)
+* Hardware Supported:
+    * [Hillside 52](https://github.com/qmk/qmk_firmware/blob/master/keyboards/hillside/52): ProMicro/Elite-C and compatible
+    * [Hillside 48](https://github.com/qmk/qmk_firmware/blob/master/keyboards/hillside/48): ProMicro/Elite-C and compatible
+    * [Hillside 46/40](https://github.com/qmk/qmk_firmware/blob/master/keyboards/hillside/46): ProMicro/Elite-C and compatible
+* Hardware Availability: [https://github.com/mmccoyd/hillside](https://github.com/mmccoyd/hillside)

From 62160193f09013f7f15558b4661d42a6886d3e1b Mon Sep 17 00:00:00 2001
From: spbgzh <72414103+spbgzh@users.noreply.github.com>
Date: Sun, 20 Nov 2022 11:53:38 +0300
Subject: [PATCH 904/959] [Keyboard] change RGBLED_NUM to 20 for zoom87
 (#18930)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/meletrix/zoom87/config.h  | 2 +-
 keyboards/meletrix/zoom87/readme.md | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
index 89e8cf5611..4c395e8af4 100644
--- a/keyboards/meletrix/zoom87/config.h
+++ b/keyboards/meletrix/zoom87/config.h
@@ -35,7 +35,7 @@
 
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
-    #define RGBLED_NUM 10
+    #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/meletrix/zoom87/readme.md b/keyboards/meletrix/zoom87/readme.md
index 9ad821387a..aa2051bb1f 100644
--- a/keyboards/meletrix/zoom87/readme.md
+++ b/keyboards/meletrix/zoom87/readme.md
@@ -1,5 +1,7 @@
 # zoom87
 
+![Zoom87](https://i.imgur.com/BfoEUQBh.jpeg)
+
 More Info at [meletrix](https://meletrix.com/)
 ​
 

From eb63857237c778f8736395161b331dcc19e283ae Mon Sep 17 00:00:00 2001
From: Hayley <hayley@foxes.systems>
Date: Sun, 20 Nov 2022 19:54:48 +1100
Subject: [PATCH 905/959] [Keymap] Fix ducky one 2 sf fn layer mappings
 (#18955)

---
 .../ducky/one2sf/keymaps/default/keymap.c     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/keyboards/ducky/one2sf/keymaps/default/keymap.c b/keyboards/ducky/one2sf/keymaps/default/keymap.c
index e78667c9ad..6d4afecc7b 100644
--- a/keyboards/ducky/one2sf/keymaps/default/keymap.c
+++ b/keyboards/ducky/one2sf/keymaps/default/keymap.c
@@ -29,19 +29,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_QWERTY] = LAYOUT_all(
         //       2        3        4        5        6        7        8        9        10       11       12       13       14         15
-        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-        KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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(1) ,   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_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_DEL,  KC_DEL,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ENT,  KC_PGDN,
-        _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_MUTE, KC_VOLD, KC_VOLU, MO(2),   _______, KC_PGUP,
-        _______, _______, _______,                            _______,                   _______, _______, _______, KC_HOME, KC_PGDN, KC_END
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUSE, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_HOME,
+        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_END,  _______, _______, KC_END,
+        _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_MUTE, KC_VOLD,  KC_VOLU, _______, _______, _______,
+        _______, _______, _______,                            _______,                   MO(2),    _______, _______, _______, _______, _______
     ),
 
     [_COLOUR] = LAYOUT_all(

From 6f8bbb16329d87eacb5bc4091b11a127630bdb06 Mon Sep 17 00:00:00 2001
From: Jesus Climent <climent@gmail.com>
Date: Sun, 20 Nov 2022 03:57:13 -0500
Subject: [PATCH 906/959] [Keyboard] Small fixes for the Atreyu rev1 keyboard
 (#19098)

---
 keyboards/atreyu/rev1/info.json |  2 +-
 keyboards/atreyu/rev1/rev1.c    | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json
index d0b3c0eb42..27a5bc2a82 100644
--- a/keyboards/atreyu/rev1/info.json
+++ b/keyboards/atreyu/rev1/info.json
@@ -70,7 +70,7 @@
                 {"x":11, "y":4.25},
                 {"x":12, "y":4.15},
                 {"x":13, "y":4.125},
-                {"x": 14.5, "y": 4.5}
+                {"x": 15.5, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/atreyu/rev1/rev1.c b/keyboards/atreyu/rev1/rev1.c
index 3d6829fbd5..8228f7ede6 100644
--- a/keyboards/atreyu/rev1/rev1.c
+++ b/keyboards/atreyu/rev1/rev1.c
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "rev1.h"
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
@@ -28,18 +30,10 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
       }
     }
     if (index == 0) {
-      if (IS_LAYER_ON(_LOWER)) {
-        if (clockwise) {
-            tap_code(KC_WH_U);
-        } else {
-            tap_code(KC_WH_D);
-        }
+      if (clockwise) {
+          tap_code(KC_WH_U);
       } else {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
+          tap_code(KC_WH_D);
       }
     }
     return true;

From 6c40a4605793d29d1bae07401006287300c8349d Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 20 Nov 2022 14:30:40 +0000
Subject: [PATCH 907/959] Fixup keychron/q5 (#19119)

---
 keyboards/keychron/q5/ansi/ansi.c                 | 2 +-
 keyboards/keychron/q5/ansi/config.h               | 2 +-
 keyboards/keychron/q5/ansi_encoder/ansi_encoder.c | 2 +-
 keyboards/keychron/q5/ansi_encoder/config.h       | 2 +-
 keyboards/keychron/q5/iso/config.h                | 2 +-
 keyboards/keychron/q5/iso/iso.c                   | 2 +-
 keyboards/keychron/q5/iso_encoder/config.h        | 2 +-
 keyboards/keychron/q5/iso_encoder/iso_encoder.c   | 2 +-
 keyboards/keychron/q5/q5.c                        | 4 +++-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 8efed462f7..6aeb46c07d 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q5/ansi/config.h b/keyboards/keychron/q5/ansi/config.h
index 55e4ec41ca..9ed58dd522 100644
--- a/keyboards/keychron/q5/ansi/config.h
+++ b/keyboards/keychron/q5/ansi/config.h
@@ -19,7 +19,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 55
 #define DRIVER_2_LED_TOTAL 45
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 54
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index 1f11ae4143..43c27433b2 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q5/ansi_encoder/config.h b/keyboards/keychron/q5/ansi_encoder/config.h
index b96104d0c0..6aecac619e 100644
--- a/keyboards/keychron/q5/ansi_encoder/config.h
+++ b/keyboards/keychron/q5/ansi_encoder/config.h
@@ -19,7 +19,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 53
 #define DRIVER_2_LED_TOTAL 45
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { C14 }
diff --git a/keyboards/keychron/q5/iso/config.h b/keyboards/keychron/q5/iso/config.h
index 751a45711f..df775f11f1 100644
--- a/keyboards/keychron/q5/iso/config.h
+++ b/keyboards/keychron/q5/iso/config.h
@@ -19,7 +19,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 55
 #define DRIVER_2_LED_TOTAL 46
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 53
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index 221dd7b78a..b57474f535 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q5/iso_encoder/config.h b/keyboards/keychron/q5/iso_encoder/config.h
index 58cda94781..3c9eee8d49 100644
--- a/keyboards/keychron/q5/iso_encoder/config.h
+++ b/keyboards/keychron/q5/iso_encoder/config.h
@@ -19,7 +19,7 @@
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 53
 #define DRIVER_2_LED_TOTAL 46
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { C14 }
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 75387ad4b6..8ae11bc36b 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -20,7 +20,7 @@
 
 // clang-format off
 
-const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c
index d1127d1908..f1ccf48214 100644
--- a/keyboards/keychron/q5/q5.c
+++ b/keyboards/keychron/q5/q5.c
@@ -69,7 +69,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-__attribute__((weak)) 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) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; }
     // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
 #    if defined(CAPS_LOCK_LED_INDEX)
     if (host_keyboard_led_state().caps_lock) {
@@ -89,6 +90,7 @@ __attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min,
         }
     }
 #    endif // NUM_LOCK_LED_INDEX
+    return true;
 }
 
 #endif // RGB_MATRIX_ENABLE...

From ca693d7f9b56862c7fecc583637dc5e0265afc99 Mon Sep 17 00:00:00 2001
From: CoffeeIsLife <36961653+CoffeeIsLife87@users.noreply.github.com>
Date: Sun, 20 Nov 2022 11:22:25 -0600
Subject: [PATCH 908/959] [Keymap] Add home and end keys to coffee's bm40hsrgb
 keymap (#19108)

Co-authored-by: Fae <faenkhauser@gmail.com>
---
 keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c  | 2 +-
 keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
index 9130bd678e..61f3693d74 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
     [_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, XXXXXXX, XXXXXXX, KC_BSLS, KC_PGDN,
+        _______, 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(
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md
index 2fb004cece..66c518e347 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md
@@ -16,7 +16,7 @@ The secondary layer ( `_SUB` ) is for syntax, F keys, and number keys
 ```
 grv |   1   |  2   |  3    | 4    | 5    | 6   | 7    | 8    | 9    | 0  | del
     |   F1  |  F2  |  F3   | F4   | F5   | F6  | -    | =    | [    | ]  | pgup
- _  |   F7  |  F8  |  F9   | F10  | F11  | F12 |      |      |      | \  | pgdn
+ _  |   F7  |  F8  |  F9   | F10  | F11  | F12 |      | home | end  | \  | pgdn
  _  |   _   |      |  _    | _    |      _     | _    |      |      |    |
 ```
 

From 852952cfd8e3631177c51a096f793fe9cda679cc Mon Sep 17 00:00:00 2001
From: rafal0p <rafal0p@outlook.com>
Date: Sun, 20 Nov 2022 18:23:41 +0100
Subject: [PATCH 909/959] Use modern solution for tri-layer in sofle default
 layout (#19113)

---
 keyboards/sofle/keymaps/default/keymap.c | 36 ++++--------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c
index 5729d80271..d4eb0cdcf3 100644
--- a/keyboards/sofle/keymaps/default/keymap.c
+++ b/keyboards/sofle/keymaps/default/keymap.c
@@ -12,9 +12,6 @@ enum sofle_layers {
 enum custom_keycodes {
     KC_QWERTY = SAFE_RANGE,
     KC_COLEMAK,
-    KC_LOWER,
-    KC_RAISE,
-    KC_ADJUST,
     KC_PRVWD,
     KC_NXTWD,
     KC_LSTRT,
@@ -45,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSPC,
   KC_TAB,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     XXXXXXX,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL, KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTRL, MO(_LOWER), KC_ENT,     KC_SPC, MO(_RAISE), KC_RCTRL, KC_RALT, KC_RGUI
 ),
 /*
  * COLEMAK
@@ -68,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,  KC_BSPC,
   KC_TAB,   KC_A,   KC_R,    KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O,  KC_QUOT,
   KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,      XXXXXXX,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTRL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTRL, MO(_LOWER), KC_ENT,     KC_SPC, MO(_RAISE), KC_RCTRL, KC_RALT, KC_RGUI
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
@@ -211,6 +208,10 @@ bool oled_task_user(void) {
 
 #endif
 
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case KC_QWERTY:
@@ -223,31 +224,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 set_single_persistent_default_layer(_COLEMAK);
             }
             return false;
-        case KC_LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
         case KC_PRVWD:
             if (record->event.pressed) {
                 if (keymap_config.swap_lctl_lgui) {

From 127a70b6ca6273257030b581e9f7a9656d7e9e4d Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Mon, 21 Nov 2022 05:24:25 +1100
Subject: [PATCH 910/959] [Keyboard] Add Satellite Rev1 (#18869)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../satellite/keymaps/default/keymap.c        |  52 +++++
 .../satellite/keymaps/default/readme.md       |   2 +
 .../aeboards/satellite/keymaps/via/keymap.c   |  52 +++++
 .../aeboards/satellite/keymaps/via/readme.md  |   2 +
 .../aeboards/satellite/keymaps/via/rules.mk   |   1 +
 keyboards/aeboards/satellite/readme.md        |  13 ++
 keyboards/aeboards/satellite/rev1/config.h    |  82 ++++++++
 keyboards/aeboards/satellite/rev1/info.json   |  93 +++++++++
 keyboards/aeboards/satellite/rev1/readme.md   |  19 ++
 keyboards/aeboards/satellite/rev1/rev1.c      | 182 ++++++++++++++++++
 keyboards/aeboards/satellite/rev1/rev1.h      |  35 ++++
 keyboards/aeboards/satellite/rev1/rules.mk    |  28 +++
 keyboards/aeboards/satellite/rules.mk         |   1 +
 keyboards/aeboards/satellite/satellite.c      |  19 ++
 keyboards/aeboards/satellite/satellite.h      |  23 +++
 15 files changed, 604 insertions(+)
 create mode 100755 keyboards/aeboards/satellite/keymaps/default/keymap.c
 create mode 100755 keyboards/aeboards/satellite/keymaps/default/readme.md
 create mode 100755 keyboards/aeboards/satellite/keymaps/via/keymap.c
 create mode 100755 keyboards/aeboards/satellite/keymaps/via/readme.md
 create mode 100755 keyboards/aeboards/satellite/keymaps/via/rules.mk
 create mode 100755 keyboards/aeboards/satellite/readme.md
 create mode 100755 keyboards/aeboards/satellite/rev1/config.h
 create mode 100644 keyboards/aeboards/satellite/rev1/info.json
 create mode 100755 keyboards/aeboards/satellite/rev1/readme.md
 create mode 100755 keyboards/aeboards/satellite/rev1/rev1.c
 create mode 100755 keyboards/aeboards/satellite/rev1/rev1.h
 create mode 100755 keyboards/aeboards/satellite/rev1/rules.mk
 create mode 100755 keyboards/aeboards/satellite/rules.mk
 create mode 100755 keyboards/aeboards/satellite/satellite.c
 create mode 100755 keyboards/aeboards/satellite/satellite.h

diff --git a/keyboards/aeboards/satellite/keymaps/default/keymap.c b/keyboards/aeboards/satellite/keymaps/default/keymap.c
new file mode 100755
index 0000000000..d48d918ca5
--- /dev/null
+++ b/keyboards/aeboards/satellite/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[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_HOME,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/aeboards/satellite/keymaps/default/readme.md b/keyboards/aeboards/satellite/keymaps/default/readme.md
new file mode 100755
index 0000000000..f369959a37
--- /dev/null
+++ b/keyboards/aeboards/satellite/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The Default Satellite Layout
+
diff --git a/keyboards/aeboards/satellite/keymaps/via/keymap.c b/keyboards/aeboards/satellite/keymaps/via/keymap.c
new file mode 100755
index 0000000000..d48d918ca5
--- /dev/null
+++ b/keyboards/aeboards/satellite/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[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_HOME,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/aeboards/satellite/keymaps/via/readme.md b/keyboards/aeboards/satellite/keymaps/via/readme.md
new file mode 100755
index 0000000000..cce6dfd595
--- /dev/null
+++ b/keyboards/aeboards/satellite/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The VIA Satellite Layout
+
diff --git a/keyboards/aeboards/satellite/keymaps/via/rules.mk b/keyboards/aeboards/satellite/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/aeboards/satellite/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/aeboards/satellite/readme.md b/keyboards/aeboards/satellite/readme.md
new file mode 100755
index 0000000000..1de19abade
--- /dev/null
+++ b/keyboards/aeboards/satellite/readme.md
@@ -0,0 +1,13 @@
+# SATELLITE
+
+A RGB 65% keyboard by [aeboards](https://aeboards.com/)
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: Satellite
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aeboards/satellite/rev1:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/aeboards/satellite/rev1/config.h b/keyboards/aeboards/satellite/rev1/config.h
new file mode 100755
index 0000000000..b11d3a2e98
--- /dev/null
+++ b/keyboards/aeboards/satellite/rev1/config.h
@@ -0,0 +1,82 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 defines
+#define DRIVER_ADDR_1 0x74
+#define DRIVER_ADDR_2 0x76
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 36
+#define DRIVER_2_LED_TOTAL 36
+#define ISSI_DRIVER_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define DRIVER_LED_TOTAL ISSI_DRIVER_TOTAL
+
+#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json
new file mode 100644
index 0000000000..4af84ee055
--- /dev/null
+++ b/keyboards/aeboards/satellite/rev1/info.json
@@ -0,0 +1,93 @@
+{
+    "keyboard_name": "Satellite Rev1",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x6553",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "B7", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F4", "F1"]
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.5},
+                {"x":11.5, "y":4, "w":1.5},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/satellite/rev1/readme.md b/keyboards/aeboards/satellite/rev1/readme.md
new file mode 100755
index 0000000000..e3f311f6a6
--- /dev/null
+++ b/keyboards/aeboards/satellite/rev1/readme.md
@@ -0,0 +1,19 @@
+# Satellite Rev1
+
+A gasket 65% keyboard by [aeboards](https://aeboards.com/)
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: Satellite
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aeboards/satellite/rev1:default
+    make aeboards/satellite/rev1:via
+
+Reset your keyboard in 3 ways:
+* Software reset on Fn + Backspace
+* Bootmagic reset: hold down the top left key (usually escape) and plugin the keyboard
+* Physical reset: on the back of the PCB, there is a ISP header which you should short the RST and GND together
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/aeboards/satellite/rev1/rev1.c b/keyboards/aeboards/satellite/rev1/rev1.c
new file mode 100755
index 0000000000..bb66eda6fa
--- /dev/null
+++ b/keyboards/aeboards/satellite/rev1/rev1.c
@@ -0,0 +1,182 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "rev1.h"
+#include "i2c_master.h"
+#include "drivers/led/issi/is31fl3731.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |      G location
+ *   |  |      |      B location
+ *   |  |      |      | */
+    {0, C2_1,   C3_1,   C4_1}, //A0
+    {0, C1_1,   C3_2,   C4_2}, //A1
+    {0, C1_2,   C2_2,   C4_3}, //A2
+    {0, C1_3,   C2_3,   C3_3}, //A3
+    {0, C1_4,   C2_4,   C3_4}, //A4
+    {0, C1_5,   C2_5,   C3_5}, //A5
+    {0, C1_6,   C2_6,   C3_6}, //A6
+    {0, C1_7,   C2_7,   C3_7}, //A7
+    {0, C1_8,   C2_8,   C3_8}, //A8
+    {0, C9_1,   C8_1,   C7_1}, //A9
+    {0, C9_2,   C8_2,   C7_2}, //A10
+    {0, C9_3,   C8_3,   C7_3}, //A11
+    {0, C9_4,   C8_4,   C7_4}, //A12
+    {0, C9_5,   C8_5,   C7_5}, //A13
+    {0, C9_6,   C8_6,   C7_6}, //A14
+    {0, C9_7,   C8_7,   C6_6}, //A15
+    {0, C9_8,   C7_7,   C6_7}, //A16
+    {0, C8_8,   C7_8,   C6_8}, //A17
+
+    {0, C2_9,   C3_9,   C4_9},  //B0
+    {0, C1_9,   C3_10,  C4_10}, //B1
+    {0, C1_10,  C2_10,  C4_11}, //B2
+    {0, C1_11,  C2_11,  C3_11}, //B3
+    {0, C1_12,  C2_12,  C3_12}, //B4
+    {0, C1_13,  C2_13,  C3_13}, //B5
+    {0, C1_14,  C2_14,  C3_14}, //B6
+    {0, C1_15,  C2_15,  C3_15}, //B7
+    {0, C1_16,  C2_16,  C3_16}, //B8
+    {0, C9_9,   C8_9,   C7_9},  //B9
+    {0, C9_10,  C8_10,  C7_10}, //B10
+    {0, C9_11,  C8_11,  C7_11}, //B11
+    {0, C9_12,  C8_12,  C7_12}, //B12
+    {0, C9_13,  C8_13,  C7_13}, //B13
+    {0, C9_14,  C8_14,  C7_14}, //B14
+    {0, C9_15,  C8_15,  C6_14}, //B15
+    {0, C9_16,  C7_15,  C6_15}, //B16
+    {0, C8_16,  C7_16,  C6_16}, //B17
+
+    {1, C2_1,   C3_1,   C4_1}, //C0
+    {1, C1_1,   C3_2,   C4_2}, //C1
+    {1, C1_2,   C2_2,   C4_3}, //C2
+    {1, C1_3,   C2_3,   C3_3}, //C3
+    {1, C1_4,   C2_4,   C3_4}, //C4
+    {1, C1_5,   C2_5,   C3_5}, //C5
+    {1, C1_6,   C2_6,   C3_6}, //C6
+    {1, C1_7,   C2_7,   C3_7}, //C7
+    {1, C1_8,   C2_8,   C3_8}, //C8
+    {1, C9_1,   C8_1,   C7_1}, //C9
+    {1, C9_2,   C8_2,   C7_2}, //C10
+    {1, C9_3,   C8_3,   C7_3}, //C11
+    {1, C9_4,   C8_4,   C7_4}, //C12
+    {1, C9_5,   C8_5,   C7_5}, //C13
+    {1, C9_6,   C8_6,   C7_6}, //C14
+    {1, C9_7,   C8_7,   C6_6}, //C15
+    {1, C9_8,   C7_7,   C6_7}, //C16
+    {1, C8_8,   C7_8,   C6_8}, //C17
+
+    {1, C2_9,   C3_9,   C4_9},  //D0
+    {1, C1_9,   C3_10,  C4_10}, //D1
+    {1, C1_10,  C2_10,  C4_11}, //D2
+    {1, C1_11,  C2_11,  C3_11}, //D3
+    {1, C1_12,  C2_12,  C3_12}, //D4
+    {1, C1_13,  C2_13,  C3_13}, //D5
+    {1, C1_14,  C2_14,  C3_14}, //D6
+    {1, C1_15,  C2_15,  C3_15}, //D7
+    {1, C1_16,  C2_16,  C3_16}, //D8
+    {1, C9_9,    C8_9,   C7_9}, //D9
+    {1, C9_10,  C8_10,  C7_10}, //D10
+    {1, C9_11,  C8_11,  C7_11}, //D11
+    {1, C9_12,  C8_12,  C7_12}, //D12
+    {1, C9_13,  C8_13,  C7_13}, //D13
+    {1, C9_14,  C8_14,  C7_14}, //D14
+    {1, C9_15,  C8_15,  C6_14}, //D15
+    {1, C9_16,  C7_15,  C6_15}, //D16
+    {1, C8_16,  C7_16,  C6_16}  //D17
+};
+
+led_config_t g_led_config = { {
+    {   0+17,   0+16,   0+15,   0+14,   0+13,   0+12,   0+11,   0+10,   0+ 9,  18+ 0,  18+ 1,  18+ 2,  18+ 3,  18+ 4,  18+ 6 },
+    {   0+ 7,   0+ 6,   0+ 5,   0+ 4,   0+ 3,   0+ 2,   0+ 1,   0+ 0,  18+ 9,  18+10,  18+11,  18+12,  18+13,  18+14,  18+ 7 },
+    {   0+ 8,  36+14,  36+13,  36+12,  36+11,  36+10,  36+ 9,  54+ 0,  54+ 1,  54+ 2,  54+ 3,  54+ 4,  54+ 5, NO_LED,  18+ 8 },
+    {  36+15,  36+ 5,  36+ 4,  36+ 3,  36+ 2,  36+ 1,  54+ 9,  54+10,  54+11,  54+12,  54+ 6, NO_LED,  54+ 7,  54+ 8,  18+15 },
+    {  36+16,  36+ 8,  36+ 7, NO_LED, NO_LED,  36+ 0, NO_LED, NO_LED, NO_LED,  54+15,  54+16, NO_LED,  54+17,  18+17,  18+16 },
+}, {
+    //A0 .. A17
+    {112,16 }, { 97,16 }, { 82,16 }, { 67,16 }, { 52,16 }, { 37,16 }, { 22,16 }, {  4,16 }, {  6,32 },
+    {119,0  }, {105,0  }, { 90,0  }, { 75,0  }, { 60,0  }, { 45,0  }, { 30,0  }, { 15,0  }, {  0,0  },
+
+    //B0 .. B17
+    {134,0  }, {149,0  }, {164,0  }, {179,0  }, {202,0  }, {255,255}, {224,0  }, {224,16 }, {224,32 },
+    {127,16 }, {142,16 }, {157,16 }, {172,16 }, {187,16 }, {205,16 }, {224,48 }, {224,64 }, {209,64 },
+
+    //C0 .. C17
+    { 95,64 }, { 93,48 }, { 78,48 }, { 63,48 }, { 49,48 }, { 34,48 }, { 67,56 }, { 39,64 }, { 21,64 },
+    {101,32 }, { 86,32 }, { 71,32 }, { 56,32 }, { 41,32 }, { 26,32 }, {  9,48 }, {  2,64 }, {255,255},
+
+    //D0 .. D17
+    {116,32 }, {131,32 }, {146,32 }, {161,32 }, {175,32 }, {200,32 }, {168,48 }, {189,48 }, {209,48 },
+    {108,48 }, {123,48 }, {138,48 }, {153,48 }, {255,255}, {120,56 }, {153,64 }, {175,64 }, {194,64 }
+}, {
+    //A0 .. A17
+    4, 4, 4, 4, 4, 4, 4, 1, 1,
+    4, 4, 4, 4, 4, 4, 4, 4, 4,
+
+    //B0 .. B17
+    4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 1, 1,
+
+    //C0 .. C17
+    4, 4, 4, 4, 4, 4, 4, 1, 1,
+    4, 4, 4, 4, 4, 4, 1, 1, 4,
+
+    //D0 .. D17
+    4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 1, 1, 1
+} };
+
+// Custom Driver
+static void init(void) {
+    i2c_init();
+    IS31FL3731_init(DRIVER_ADDR_1);
+    IS31FL3731_init(DRIVER_ADDR_2);
+    for (int index = 0; index < ISSI_DRIVER_TOTAL; index++) {
+        bool enabled = !(   ( index == 18+5) || //B5
+                            ( index == 36+17) || //C17
+                            ( index == 54+13) //D13
+                        );
+        IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+    }
+    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+}
+
+static void flush(void) {
+    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+}
+
+static void set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    IS31FL3731_set_color(index, red, green, blue);
+}
+
+static void set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    IS31FL3731_set_color_all( red, green, blue );
+}
+
+
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init = init,
+    .flush = flush,
+    .set_color = set_color,
+    .set_color_all = set_color_all
+};
+
+#endif
diff --git a/keyboards/aeboards/satellite/rev1/rev1.h b/keyboards/aeboards/satellite/rev1/rev1.h
new file mode 100755
index 0000000000..939adc6edb
--- /dev/null
+++ b/keyboards/aeboards/satellite/rev1/rev1.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ____ KC_NO
+
+#define LAYOUT_all( \
+  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,  \
+  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
+  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312,       K313, K314, \
+  K400, K401, K402,             K405,                   K409, K410,       K412, K413, K414  \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
+  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
+  { K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414 } \
+}
diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk
new file mode 100755
index 0000000000..f59ff57871
--- /dev/null
+++ b/keyboards/aeboards/satellite/rev1/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
+
+RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
+RGB_MATRIX_DRIVER = custom  # Enable RGB matrix effects.
+
+COMMON_VPATH += $(DRIVER_PATH)/issi
+
+# project specific files
+SRC +=  drivers/led/issi/is31fl3731.c
+
+QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/aeboards/satellite/rules.mk b/keyboards/aeboards/satellite/rules.mk
new file mode 100755
index 0000000000..bc32615d2b
--- /dev/null
+++ b/keyboards/aeboards/satellite/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = aeboards/satellite/rev1
diff --git a/keyboards/aeboards/satellite/satellite.c b/keyboards/aeboards/satellite/satellite.c
new file mode 100755
index 0000000000..97750559db
--- /dev/null
+++ b/keyboards/aeboards/satellite/satellite.c
@@ -0,0 +1,19 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Nothing to see here, move along... ;-)
+
+#include "satellite.h"
diff --git a/keyboards/aeboards/satellite/satellite.h b/keyboards/aeboards/satellite/satellite.h
new file mode 100755
index 0000000000..fcd03d72e4
--- /dev/null
+++ b/keyboards/aeboards/satellite/satellite.h
@@ -0,0 +1,23 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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"
+
+#if defined(KEYBOARD_aeboards_satellite_rev1)
+    #include "rev1.h"
+#endif

From 2b0a3cd2f13ca4719cf4bba96ee7ec5ed7c1aabd Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Mon, 21 Nov 2022 05:34:42 +0900
Subject: [PATCH 911/959] Bastard Keyboards: upstream recent changes (#19083)

Co-authored-by: Simian <alex@Mandelbrot>
Co-authored-by: Charly Delay <0xcharly@users.noreply.github.com>
Co-authored-by: Alex Baldwin <alexbaldwin42@gmail.com>
---
 .../charybdis/3x5/blackpill/info.json         |   4 +-
 keyboards/bastardkb/charybdis/3x5/config.h    |  13 +-
 keyboards/bastardkb/charybdis/3x5/info.json   |   4 +-
 .../charybdis/3x5/keymaps/default/config.h    |  54 ------
 .../charybdis/3x5/keymaps/via/config.h        |  67 -------
 .../charybdis/3x5/v1/elitec/info.json         |   4 +-
 .../charybdis/3x5/v2/elitec/info.json         |   4 +-
 .../charybdis/3x5/v2/splinky/config.h         |  73 --------
 .../charybdis/3x5/v2/splinky/info.json        |   4 +-
 .../charybdis/3x5/v2/splinky/v2/config.h      |   8 +
 .../charybdis/3x5/v2/splinky/v3/config.h      |   8 +
 .../charybdis/3x5/v2/stemcell/info.json       |   2 +-
 .../charybdis/3x6/blackpill/info.json         |   4 +-
 keyboards/bastardkb/charybdis/3x6/config.h    |  15 +-
 keyboards/bastardkb/charybdis/3x6/info.json   | 168 +++++++++---------
 .../charybdis/3x6/keymaps/default/config.h    |  54 ------
 .../charybdis/3x6/keymaps/via/config.h        |  37 ----
 .../charybdis/3x6/v1/elitec/info.json         |   4 +-
 .../charybdis/3x6/v2/elitec/info.json         |   4 +-
 .../charybdis/3x6/v2/splinky/config.h         |   8 -
 .../charybdis/3x6/v2/splinky/info.json        |   4 +-
 .../charybdis/3x6/v2/splinky/v2/config.h      |   8 +
 .../charybdis/3x6/v2/splinky/v3/config.h      |   8 +
 .../charybdis/3x6/v2/stemcell/info.json       |   2 +-
 .../charybdis/4x6/blackpill/info.json         |   4 +-
 keyboards/bastardkb/charybdis/4x6/config.h    |  13 +-
 keyboards/bastardkb/charybdis/4x6/info.json   |   4 +-
 .../charybdis/4x6/keymaps/default/config.h    |  39 ----
 .../charybdis/4x6/keymaps/via/config.h        |  33 ----
 .../charybdis/4x6/v1/elitec/info.json         |   4 +-
 .../charybdis/4x6/v2/elitec/info.json         |   4 +-
 .../charybdis/4x6/v2/splinky/config.h         |   8 -
 .../charybdis/4x6/v2/splinky/info.json        |   4 +-
 .../charybdis/4x6/v2/splinky/v2/config.h      |   8 +
 .../charybdis/4x6/v2/splinky/v3/config.h      |   8 +
 .../charybdis/4x6/v2/stemcell/info.json       |   2 +-
 keyboards/bastardkb/charybdis/config.h        |  74 +++++++-
 .../dilemma/3x5_2/assembled/info.json         |   1 -
 keyboards/bastardkb/dilemma/3x5_2/info.json   |  68 +++----
 .../dilemma/3x5_2/keymaps/via/config.h        |  48 -----
 keyboards/bastardkb/dilemma/3x5_3/info.json   |   2 +-
 keyboards/bastardkb/dilemma/info.json         |   2 +-
 keyboards/bastardkb/info.json                 |   6 +-
 .../bastardkb/scylla/blackpill/info.json      |   4 +-
 keyboards/bastardkb/scylla/info.json          | 118 ++++++------
 keyboards/bastardkb/scylla/scylla.c           |   4 +-
 .../bastardkb/scylla/v1/elitec/info.json      |   4 +-
 .../bastardkb/scylla/v2/elitec/info.json      |   4 +-
 .../bastardkb/scylla/v2/splinky/config.h      |   8 -
 .../bastardkb/scylla/v2/splinky/info.json     |   4 +-
 .../bastardkb/scylla/v2/splinky/v2/config.h   |   8 +
 .../bastardkb/scylla/v2/splinky/v3/config.h   |   8 +
 .../bastardkb/scylla/v2/stemcell/info.json    |   2 +-
 .../bastardkb/skeletyl/blackpill/info.json    |   4 +-
 keyboards/bastardkb/skeletyl/info.json        |  74 ++++----
 .../bastardkb/skeletyl/v1/elitec/info.json    |   4 +-
 keyboards/bastardkb/skeletyl/v1/info.json     |   4 +-
 .../bastardkb/skeletyl/v2/elitec/info.json    |   4 +-
 .../bastardkb/skeletyl/v2/splinky/config.h    |   8 -
 .../bastardkb/skeletyl/v2/splinky/info.json   |   4 +-
 .../bastardkb/skeletyl/v2/splinky/v2/config.h |   8 +
 .../bastardkb/skeletyl/v2/splinky/v3/config.h |   8 +
 .../bastardkb/skeletyl/v2/stemcell/info.json  |   2 +-
 keyboards/bastardkb/tbk/config.h              |   3 +-
 keyboards/bastardkb/tbk/info.json             | 120 ++++++-------
 keyboards/bastardkb/tbk/tbk.c                 |   2 +-
 keyboards/bastardkb/tbk/tbk.h                 |  42 ++---
 .../bastardkb/tbkmini/blackpill/info.json     |   4 +-
 keyboards/bastardkb/tbkmini/info.json         |  86 ++++-----
 keyboards/bastardkb/tbkmini/tbkmini.c         |   4 +-
 .../bastardkb/tbkmini/v1/elitec/info.json     |   4 +-
 .../bastardkb/tbkmini/v2/elitec/info.json     |   4 +-
 .../bastardkb/tbkmini/v2/splinky/config.h     |   8 -
 .../bastardkb/tbkmini/v2/splinky/info.json    |   4 +-
 .../bastardkb/tbkmini/v2/splinky/v2/config.h  |   8 +
 .../bastardkb/tbkmini/v2/splinky/v3/config.h  |   8 +
 .../bastardkb/tbkmini/v2/stemcell/info.json   |   2 +-
 77 files changed, 587 insertions(+), 889 deletions(-)
 delete mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
 delete mode 100644 keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
 delete mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h

diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index 1e347df9b2..c2ff6d458a 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Nano (3x5) Blackpill",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index 6e3b8a7124..2022b1cee6 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -31,17 +31,10 @@
 #define ROTATIONAL_TRANSFORM_ANGLE -25
 
 /* RGB settings. */
-#define RGBLED_NUM 36
-#define RGBLED_SPLIT \
-    { 18, 18 }
-
-/* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
+#    define RGBLED_NUM 36
+#    define RGBLED_SPLIT \
+        { 18, 18 }
 #    define DRIVER_LED_TOTAL RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
index 41c80b457f..efa863ea4b 100644
--- a/keyboards/bastardkb/charybdis/3x5/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -1,9 +1,9 @@
 {
-    "url": "https://bastardkb.com/charybdis-nano",
     "manufacturer": "Bastard Keyboards",
+    "url": "https://bastardkb.com/charybdis-nano",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1832",
+        "vid": "0xA8F8"
     },
     "layouts": {
         "LAYOUT_charybdis_3x5": {
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
deleted file mode 100644
index f2dd86c653..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifndef TAPPING_TERM
-/**
- * \brief Configure the global tapping term (default: 200ms).
- *
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#    define TAPPING_TERM 200
-#endif  // TAPPING_TERM
-
-/* RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Disable control of RGB matrix by keycodes (must use firmware implementation
-// to control the feature).
-#    define RGB_MATRIX_DISABLE_KEYCODES
-
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
index d20131e9cf..5d9d4662f0 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
@@ -24,49 +24,6 @@
 /* Disable unused features. */
 #define NO_ACTION_ONESHOT
 
-#ifndef TAPPING_TERM
-/**
- * \brief Configure the global tapping term (default: 200ms).
- *
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#    define TAPPING_TERM 200
-#endif // TAPPING_TERM
-
-/**
- * \brief Enable rapid switch from tap to hold.
- *
- * Note that a side-effect of this setting is to disable auto-repeat when
- * pressing key twice, except for one-shot keys.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
- */
-#define TAPPING_FORCE_HOLD
-
-/*
- * Tap-or-Hold decision modes.
- *
- * Note that the following flags behave differently when combined (ie. when 2 or
- * more are enabled).
- *
- * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
- * decision modes.
- */
-
-/**
- * \brief Faster tap-hold trigger.
- *
- * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
- * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
- */
-#define PERMISSIVE_HOLD
-
 /**
  * \brief Prevent normal rollover on alphas from accidentally triggering mods.
  *
@@ -76,8 +33,6 @@
  *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
  * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
  *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
  */
 #define IGNORE_MOD_TAP_INTERRUPT
 
@@ -89,25 +44,3 @@
 // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
 // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 #endif // POINTING_DEVICE_ENABLE
-
-/* RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index 9071212f33..b83dc6c3f8 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Nano (3x5) Elite-C",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index 7c90e5d5a3..78453c44ff 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Nano (3x5) Elite-C",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
index d4688aef92..8e4a2de892 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
@@ -21,14 +21,6 @@
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
-
 /* serial.c configuration (for split keyboard). */
 #define SOFT_SERIAL_PIN GP1
 
@@ -43,68 +35,3 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
-
-/** RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Enable all animations on ARM boards since they have plenty of memory
-// available for it.
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
index 1aa1e8811d..98f436f52b 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Nano (3x5) Splinky",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
index 70b65a97c7..516f3d9df7 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP18
 #define SPI_MOSI_PIN GP19
 #define POINTING_DEVICE_CS_PIN GP14
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
index d53c5a3c41..09165a8e97 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP22
 #define SPI_MOSI_PIN GP23
 #define POINTING_DEVICE_CS_PIN GP16
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP15
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index 2aee1fe40b..b344c1cbfc 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Nano (3x5) STeMCell",
     "usb": {
-      "device_version": "2.0.0"
+        "device_version": "2.0.0"
     }
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index 73a1359e00..54eda1eadf 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Mini (3x6) Blackpill",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index 6b31a773fc..647a02d8fa 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 /* Key matrix configuration. */
 #define MATRIX_ROWS 8 // Rows are doubled-up.
 #define MATRIX_COLS 6
@@ -33,17 +31,10 @@
 #define ROTATIONAL_TRANSFORM_ANGLE -25
 
 /* RGB settings. */
-#define RGBLED_NUM 42
-#define RGBLED_SPLIT \
-    { 21, 21 }
-
-/* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
+#    define RGBLED_NUM 42
+#    define RGBLED_SPLIT \
+        { 21, 21 }
 #    define DRIVER_LED_TOTAL RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
index 0b4428cdbe..4851da1d53 100644
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -1,98 +1,98 @@
 {
     "url": "https://bastardkb.com",
     "usb": {
-        "pid": "0x1834",
+        "pid": "0x1834"
     },
     "layouts": {
         "LAYOUT_charybdis_3x6": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L33", "x":5, "y":3},
-                {"label":"L34", "x":6, "y":3},
-                {"label":"L31", "x":7, "y":3},
-                {"label":"R31", "x":9, "y":3},
-                {"label":"R33", "x":10, "y":3}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "L05", "x": 5, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "R05", "x": 16, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "L15", "x": 5, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "R15", "x": 16, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "L25", "x": 5, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "R25", "x": 16, "y": 2 },
+                { "label": "L33", "x": 5, "y": 3 },
+                { "label": "L34", "x": 6, "y": 3 },
+                { "label": "L31", "x": 7, "y": 3 },
+                { "label": "R31", "x": 9, "y": 3 },
+                { "label": "R33", "x": 10, "y": 3 }
             ]
         },
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L33", "x":5, "y":3},
-                {"label":"L34", "x":6, "y":3},
-                {"label":"L31", "x":7, "y":3},
-                {"label":"R33", "x":9, "y":3},
-                {"label":"R34", "x":10, "y":3},
-                {"label":"R31", "x":11, "y":3}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "L05", "x": 5, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "R05", "x": 16, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "L15", "x": 5, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "R15", "x": 16, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "L25", "x": 5, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "R25", "x": 16, "y": 2 },
+                { "label": "L33", "x": 5, "y": 3 },
+                { "label": "L34", "x": 6, "y": 3 },
+                { "label": "L31", "x": 7, "y": 3 },
+                { "label": "R33", "x": 9, "y": 3 },
+                { "label": "R34", "x": 10, "y": 3 },
+                { "label": "R31", "x": 11, "y": 3 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h b/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
deleted file mode 100644
index 4b1bae3ca0..0000000000
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/default/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifndef TAPPING_TERM
-/**
- * \brief Configure the global tapping term (default: 200ms).
- *
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#    define TAPPING_TERM 200
-#endif // TAPPING_TERM
-
-/* RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Disable control of RGB matrix by keycodes (must use firmware implementation
-// to control the feature).
-#    define RGB_MATRIX_DISABLE_KEYCODES
-
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
index abbf492089..7c850d5e0e 100644
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
@@ -24,17 +24,6 @@
 /* Disable unused features. */
 #define NO_ACTION_ONESHOT
 
-#ifndef TAPPING_TERM
-/**
- * \brief Configure the global tapping term (default: 200ms).
- *
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#    define TAPPING_TERM 200
-#endif // TAPPING_TERM
-
 /* Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
@@ -43,29 +32,3 @@
 // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
 // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 #endif // POINTING_DEVICE_ENABLE
-
-/* RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Disable control of RGB matrix by keycodes (must use firmware implementation
-// to control the feature).
-#    define RGB_MATRIX_DISABLE_KEYCODES
-
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index bf7f1a35f2..7edaf111a9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Mini (3x6) Elite-C",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index 239a10f8a3..02fe2e9ef3 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Mini (3x6) Elite-C",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
index e68bf722e4..8e4a2de892 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
@@ -21,14 +21,6 @@
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
-
 /* serial.c configuration (for split keyboard). */
 #define SOFT_SERIAL_PIN GP1
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
index 7f3997158f..64c663c7c9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Mini (3x6) Splinky",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
index 7b7d94b320..f3d3e982e3 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP18
 #define SPI_MOSI_PIN GP19
 #define POINTING_DEVICE_CS_PIN GP14
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
index 0e9f2257f0..5f5476b1f7 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP22
 #define SPI_MOSI_PIN GP23
 #define POINTING_DEVICE_CS_PIN GP16
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP15
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 516eb7dde3..8aa7bf24c9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis Mini (3x6) STeMCell",
     "usb": {
-      "device_version": "2.0.0"
+        "device_version": "2.0.0"
     }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index 788783c679..a42035157b 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) Blackpill",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index f557089073..aea184d57c 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -31,17 +31,10 @@
 #define ROTATIONAL_TRANSFORM_ANGLE -25
 
 /* RGB settings. */
-#define RGBLED_NUM 58
-#define RGBLED_SPLIT \
-    { 29, 29 }
-
-/* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
+#    define RGBLED_NUM 58
+#    define RGBLED_SPLIT \
+        { 29, 29 }
 #    define DRIVER_LED_TOTAL RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
index c95bf07516..0b929a2188 100644
--- a/keyboards/bastardkb/charybdis/4x6/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -1,9 +1,9 @@
 {
-    "url": "https://bastardkb.com/charybdis",
     "manufacturer": "Bastard Keyboards",
+    "url": "https://bastardkb.com/charybdis",
     "usb": {
-        "vid": "0xA8F8",
         "pid": "0x1833",
+        "vid": "0xA8F8"
     },
     "layouts": {
         "LAYOUT_charybdis_4x6": {
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
deleted file mode 100644
index 383b3f9dc3..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-/* RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
index c31e39261e..cb9013dbd1 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
@@ -24,17 +24,6 @@
 /* Disable unused features. */
 #define NO_ACTION_ONESHOT
 
-#ifndef TAPPING_TERM
-/**
- * \brief Configure the global tapping term (default: 200ms).
- *
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#    define TAPPING_TERM 200
-#endif // TAPPING_TERM
-
 /* Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
@@ -43,25 +32,3 @@
 // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
 // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 #endif // POINTING_DEVICE_ENABLE
-
-/* RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index 4ea658a7d9..e3924b49b2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) Elite-C",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 151c0e1ca3..3acba65a6b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) Elite-C",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
index 010de7c480..7d4ed86e84 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
@@ -21,14 +21,6 @@
 #define MATRIX_ROW_PINS \
     { GP29, GP26, GP5, GP4, GP9 }
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
-
 /* serial.c configuration (for split keyboard). */
 #define SOFT_SERIAL_PIN GP1
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
index 0004eb81c9..928a850860 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) Splinky",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
index 7b7d94b320..f3d3e982e3 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP18
 #define SPI_MOSI_PIN GP19
 #define POINTING_DEVICE_CS_PIN GP14
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
index 0e9f2257f0..5f5476b1f7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP22
 #define SPI_MOSI_PIN GP23
 #define POINTING_DEVICE_CS_PIN GP16
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP15
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 7d687319b3..932bf09a32 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) STeMCell",
     "usb": {
-      "device_version": "2.0.0"
+        "device_version": "2.0.0"
     }
 }
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h
index c88451335e..2d2e09e403 100644
--- a/keyboards/bastardkb/charybdis/config.h
+++ b/keyboards/bastardkb/charybdis/config.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 /* Pointing device configuration. */
 
 // Enable use of pointing device on slave split.
@@ -31,5 +29,75 @@
 // Limits the frequency that the sensor is polled for motion.
 #define POINTING_DEVICE_TASK_THROTTLE_MS 1
 
-/** \brief Invert X axis on mouse reports. */
+// Invert X axis on mouse reports.
 #define POINTING_DEVICE_INVERT_X
+
+/* RGB matrix support. */
+#ifdef RGB_MATRIX_ENABLE
+#    define SPLIT_TRANSPORT_MIRROR
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_KEYPRESSES
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL 64
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+#    ifndef __arm__
+// Disable control of RGB matrix by keycodes (must use firmware implementation
+// to control the feature).
+#        define RGB_MATRIX_DISABLE_KEYCODES
+#    else // __arm__
+// Enable all animations on ARM boards since they have plenty of memory
+// available for it.
+#        define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_BREATHING
+#        define ENABLE_RGB_MATRIX_BAND_SAT
+#        define ENABLE_RGB_MATRIX_BAND_VAL
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#        define ENABLE_RGB_MATRIX_CYCLE_ALL
+#        define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#        define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#        define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#        define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#        define ENABLE_RGB_MATRIX_DUAL_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#        define ENABLE_RGB_MATRIX_RAINDROPS
+#        define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#        define ENABLE_RGB_MATRIX_HUE_BREATHING
+#        define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#        define ENABLE_RGB_MATRIX_HUE_WAVE
+#        define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#        define ENABLE_RGB_MATRIX_SPLASH
+#        define ENABLE_RGB_MATRIX_MULTISPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#    endif // !__arm__
+#endif
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index aae8dfc179..59f3b0d071 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -1,4 +1,3 @@
 {
     "keyboard_name": "Dilemma (3x5+2) Assembled"
 }
-
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index 5aa89bcded..bbbecd7efa 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -6,40 +6,40 @@
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"L30", "x":4, "y":3},
-                {"label":"L32", "x":5, "y":3},
-                {"label":"R32", "x":10, "y":3},
-                {"label":"R30", "x":11, "y":3}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "L30", "x": 4, "y": 3 },
+                { "label": "L32", "x": 5, "y": 3 },
+                { "label": "R32", "x": 10, "y": 3 },
+                { "label": "R30", "x": 11, "y": 3 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
index fbe61df03b..5bfac4b6c5 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
@@ -21,52 +21,6 @@
 #    define DYNAMIC_KEYMAP_LAYER_COUNT 6
 #endif // VIA_ENABLE
 
-/* Disable unused features. */
-#define NO_ACTION_ONESHOT
-
-#ifndef TAPPING_TERM
-/**
- * \brief Configure the global tapping term (default: 200ms).
- *
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#    define TAPPING_TERM 200
-#endif // TAPPING_TERM
-
-/**
- * \brief Enable rapid switch from tap to hold.
- *
- * Note that a side-effect of this setting is to disable auto-repeat when
- * pressing key twice, except for one-shot keys.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
- */
-#define TAPPING_FORCE_HOLD
-
-/*
- * Tap-or-Hold decision modes.
- *
- * Note that the following flags behave differently when combined (ie. when 2 or
- * more are enabled).
- *
- * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
- * decision modes.
- */
-
-/**
- * \brief Faster tap-hold trigger.
- *
- * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
- * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
- */
-#define PERMISSIVE_HOLD
-
 /**
  * \brief Prevent normal rollover on alphas from accidentally triggering mods.
  *
@@ -76,8 +30,6 @@
  *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
  * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
  *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
  */
 #define IGNORE_MOD_TAP_INTERRUPT
 
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 2c1a68888b..777367903d 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -42,7 +42,7 @@
                 { "label": "L34", "x": 6, "y": 3 },
                 { "label": "R32", "x": 11, "y": 3 },
                 { "label": "R33", "x": 10, "y": 3 },
-                { "label": "R34", "x":  9, "y": 3 }
+                { "label": "R34", "x": 9, "y": 3 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/dilemma/info.json b/keyboards/bastardkb/dilemma/info.json
index 989d66a177..ef6a5dd42d 100644
--- a/keyboards/bastardkb/dilemma/info.json
+++ b/keyboards/bastardkb/dilemma/info.json
@@ -1,3 +1,3 @@
 {
-    "url": "https://bastardkb.com/dilemma",
+    "url": "https://bastardkb.com/dilemma"
 }
diff --git a/keyboards/bastardkb/info.json b/keyboards/bastardkb/info.json
index 2791a78b77..0a9cb94fef 100644
--- a/keyboards/bastardkb/info.json
+++ b/keyboards/bastardkb/info.json
@@ -1,8 +1,8 @@
 {
-    "url": "https://bastardkb.com",
     "manufacturer": "Bastard Keyboards",
     "maintainer": "Quentin Lebastard",
+    "url": "https://bastardkb.com",
     "usb": {
-        "vid": "0xA8F8",
-    },
+        "vid": "0xA8F8"
+    }
 }
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index 587cc2bc04..8e09212116 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Scylla Blackpill",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 026b0f742e..d8120f5070 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,69 +1,69 @@
 {
     "url": "https://bastardkb.com/scylla",
     "usb": {
-        "pid": "0x1829",
+        "pid": "0x1829"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L30", "x":0, "y":3},
-                {"label":"L31", "x":1, "y":3},
-                {"label":"L32", "x":2, "y":3},
-                {"label":"L33", "x":3, "y":3},
-                {"label":"L34", "x":4, "y":3},
-                {"label":"L35", "x":5, "y":3},
-                {"label":"R30", "x":11, "y":3},
-                {"label":"R31", "x":12, "y":3},
-                {"label":"R32", "x":13, "y":3},
-                {"label":"R33", "x":14, "y":3},
-                {"label":"R34", "x":15, "y":3},
-                {"label":"R35", "x":16, "y":3},
-                {"label":"L43", "x":5, "y":4},
-                {"label":"L44", "x":6, "y":4},
-                {"label":"L45", "x":7, "y":4},
-                {"label":"R40", "x":9, "y":4},
-                {"label":"R41", "x":10, "y":4},
-                {"label":"R40", "x":11, "y":4},
-                {"label":"L52", "x":6, "y":5},
-                {"label":"L53", "x":7, "y":5},
-                {"label":"R52", "x":9, "y":5},
-                {"label":"R53", "x":10, "y":5}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "L05", "x": 5, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "R05", "x": 16, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "L15", "x": 5, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "R15", "x": 16, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "L25", "x": 5, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "R25", "x": 16, "y": 2 },
+                { "label": "L30", "x": 0, "y": 3 },
+                { "label": "L31", "x": 1, "y": 3 },
+                { "label": "L32", "x": 2, "y": 3 },
+                { "label": "L33", "x": 3, "y": 3 },
+                { "label": "L34", "x": 4, "y": 3 },
+                { "label": "L35", "x": 5, "y": 3 },
+                { "label": "R30", "x": 11, "y": 3 },
+                { "label": "R31", "x": 12, "y": 3 },
+                { "label": "R32", "x": 13, "y": 3 },
+                { "label": "R33", "x": 14, "y": 3 },
+                { "label": "R34", "x": 15, "y": 3 },
+                { "label": "R35", "x": 16, "y": 3 },
+                { "label": "L43", "x": 5, "y": 4 },
+                { "label": "L44", "x": 6, "y": 4 },
+                { "label": "L45", "x": 7, "y": 4 },
+                { "label": "R40", "x": 9, "y": 4 },
+                { "label": "R41", "x": 10, "y": 4 },
+                { "label": "R40", "x": 11, "y": 4 },
+                { "label": "L52", "x": 6, "y": 5 },
+                { "label": "L53", "x": 7, "y": 5 },
+                { "label": "R52", "x": 9, "y": 5 },
+                { "label": "R53", "x": 10, "y": 5 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c
index b110d7ff5a..504cb0a219 100644
--- a/keyboards/bastardkb/scylla/scylla.c
+++ b/keyboards/bastardkb/scylla/scylla.c
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,6 +17,7 @@
 
 #include "scylla.h"
 
+// clang-format off
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
     // left
@@ -59,3 +60,4 @@ led_config_t g_led_config = { {
     2, 2, 2, 2, 2
 } };
 #endif
+// clang-format on
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index 57b36e1e2a..a4949aaf5f 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Scylla Elite-C",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 213bb9a79c..8488a2e337 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Scylla Elite-C",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky/config.h b/keyboards/bastardkb/scylla/v2/splinky/config.h
index 8bfd59d28c..1628340822 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky/config.h
@@ -21,14 +21,6 @@
 #define MATRIX_ROW_PINS \
     { GP29, GP26, GP5, GP4, GP9 }
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
-
 /* serial.c configuration (for split keyboard). */
 #define SOFT_SERIAL_PIN GP1
 
diff --git a/keyboards/bastardkb/scylla/v2/splinky/info.json b/keyboards/bastardkb/scylla/v2/splinky/info.json
index 614e22eefa..e6bcc6ca2f 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Scylla Splinky",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v2/config.h b/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
index be0e2fb959..8397b931c5 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky/v2/config.h
@@ -20,3 +20,11 @@
 /* Key matrix configuration. */
 #define MATRIX_COL_PINS \
     { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/scylla/v2/splinky/v3/config.h b/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
index 72f5c0ffa8..36b25dffff 100644
--- a/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky/v3/config.h
@@ -20,3 +20,11 @@
 /* Key matrix configuration. */
 #define MATRIX_COL_PINS \
     { GP27, GP28, GP21, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP15
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index 46e33a828c..7963834a79 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Scylla STeMCell",
     "usb": {
-      "device_version": "2.0.0"
+        "device_version": "2.0.0"
     }
 }
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index 16106f2f82..2e0f758704 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Skeletyl Blackpill",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 55f68dc9b2..799f630124 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -1,47 +1,47 @@
 {
     "url": "https://www.bastardkb.com/skeletyl",
     "usb": {
-        "pid": "0x1830",
+        "pid": "0x1830"
     },
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"L33", "x":4, "y":3},
-                {"label":"L34", "x":5, "y":3},
-                {"label":"L31", "x":6, "y":3},
-                {"label":"R33", "x":9, "y":3},
-                {"label":"R34", "x":10, "y":3},
-                {"label":"R31", "x":11, "y":3}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "L33", "x": 4, "y": 3 },
+                { "label": "L34", "x": 5, "y": 3 },
+                { "label": "L31", "x": 6, "y": 3 },
+                { "label": "R33", "x": 9, "y": 3 },
+                { "label": "R34", "x": 10, "y": 3 },
+                { "label": "R31", "x": 11, "y": 3 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index f784c9423d..0d20c14c3d 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Skeletyl Elite-C",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/skeletyl/v1/info.json b/keyboards/bastardkb/skeletyl/v1/info.json
index 2443086ddf..ad889c2304 100644
--- a/keyboards/bastardkb/skeletyl/v1/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/info.json
@@ -1,5 +1,5 @@
 {
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index 0b50c1faa1..b339ca877c 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Skeletyl Elite-C",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
index c4e5b3ff90..b5539989b4 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/config.h
@@ -21,14 +21,6 @@
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
-
 /* serial.c configuration (for split keyboard). */
 #define SOFT_SERIAL_PIN GP1
 
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/info.json b/keyboards/bastardkb/skeletyl/v2/splinky/info.json
index b90334c78d..cdcf967c35 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Skeletyl Splinky",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
index ac86fa83e6..825370337d 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h
@@ -20,3 +20,11 @@
 /* Key matrix configuration. */
 #define MATRIX_COL_PINS \
     { GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
index d78a36c97f..bb1de74d3c 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h
@@ -20,3 +20,11 @@
 /* Key matrix configuration. */
 #define MATRIX_COL_PINS \
     { GP28, GP21, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP15
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index df805a6229..34e40c9b38 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Skeletyl STeMCell",
     "usb": {
-      "device_version": "2.0.0"
+        "device_version": "2.0.0"
     }
 }
diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 9ce37939b5..cf420223e1 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -1,4 +1,4 @@
-/* 
+/**
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,6 @@
  */
 
 #pragma once
-#include "config_common.h"
 
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index d25ccd5cf6..9529c1305b 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -2,70 +2,70 @@
     "keyboard_name": "The Bastard Keyboard",
     "url": "https://bastardkb.com/",
     "usb": {
-        "pid": "0x1828",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "pid": "0x1828"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L30", "x":0, "y":3},
-                {"label":"L31", "x":1, "y":3},
-                {"label":"L32", "x":2, "y":3},
-                {"label":"L33", "x":3, "y":3},
-                {"label":"L34", "x":4, "y":3},
-                {"label":"L35", "x":5, "y":3},
-                {"label":"R30", "x":11, "y":3},
-                {"label":"R31", "x":12, "y":3},
-                {"label":"R32", "x":13, "y":3},
-                {"label":"R33", "x":14, "y":3},
-                {"label":"R34", "x":15, "y":3},
-                {"label":"R35", "x":16, "y":3},
-                {"label":"L43", "x":5, "y":4},
-                {"label":"L44", "x":6, "y":4},
-                {"label":"L45", "x":7, "y":4},
-                {"label":"R40", "x":9, "y":4},
-                {"label":"R41", "x":10, "y":4},
-                {"label":"R40", "x":11, "y":4},
-                {"label":"L52", "x":6, "y":5},
-                {"label":"L53", "x":7, "y":5},
-                {"label":"R52", "x":9, "y":5},
-                {"label":"R53", "x":10, "y":5}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "L05", "x": 5, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "R05", "x": 16, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "L15", "x": 5, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "R15", "x": 16, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "L25", "x": 5, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "R25", "x": 16, "y": 2 },
+                { "label": "L30", "x": 0, "y": 3 },
+                { "label": "L31", "x": 1, "y": 3 },
+                { "label": "L32", "x": 2, "y": 3 },
+                { "label": "L33", "x": 3, "y": 3 },
+                { "label": "L34", "x": 4, "y": 3 },
+                { "label": "L35", "x": 5, "y": 3 },
+                { "label": "R30", "x": 11, "y": 3 },
+                { "label": "R31", "x": 12, "y": 3 },
+                { "label": "R32", "x": 13, "y": 3 },
+                { "label": "R33", "x": 14, "y": 3 },
+                { "label": "R34", "x": 15, "y": 3 },
+                { "label": "R35", "x": 16, "y": 3 },
+                { "label": "L43", "x": 5, "y": 4 },
+                { "label": "L44", "x": 6, "y": 4 },
+                { "label": "L45", "x": 7, "y": 4 },
+                { "label": "R40", "x": 9, "y": 4 },
+                { "label": "R41", "x": 10, "y": 4 },
+                { "label": "R40", "x": 11, "y": 4 },
+                { "label": "L52", "x": 6, "y": 5 },
+                { "label": "L53", "x": 7, "y": 5 },
+                { "label": "R52", "x": 9, "y": 5 },
+                { "label": "R53", "x": 10, "y": 5 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/tbk/tbk.c b/keyboards/bastardkb/tbk/tbk.c
index dabfcf35c7..4cebec2a54 100644
--- a/keyboards/bastardkb/tbk/tbk.c
+++ b/keyboards/bastardkb/tbk/tbk.c
@@ -1,4 +1,4 @@
-/* 
+/**
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h
index 196982952f..3f9cd9915d 100644
--- a/keyboards/bastardkb/tbk/tbk.h
+++ b/keyboards/bastardkb/tbk/tbk.h
@@ -1,4 +1,4 @@
-/* 
+/**
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,26 +17,26 @@
 
 
 #pragma once
-#include "quantum.h"
 
-// SWITCHED 91 and 95 - check on left ?
+// clang-format off
 #define LAYOUT_split_4x6_5( \
-	k00, k01, k02, k03, k04, k05,			k55, k54, k53, k52, k51, k50, \
-	k10, k11, k12, k13, k14, k15,			k65, k64, k63, k62, k61, k60, \
-	k20, k21, k22, k23, k24, k25,			k75, k74, k73, k72, k71, k70, \
-	k30, k31, k32, k33, k34, k35,			k85, k84, k83, k82, k81, k80, \
-		       k43, k44, k41,		        k91, k94, k93, \
-		            k45, k42,                   k92, k95 \
-)\
-{\
-	{ k00, k01, k02, k03, k04, k05 }, \
-	{ k10, k11, k12, k13, k14, k15 }, \
-	{ k20, k21, k22, k23, k24, k25 }, \
-	{ k30, k31, k32, k33, k34, k35 }, \
-	{ KC_NO, k41, k42, k43, k44, k45 }, \
-	{ k50, k51, k52, k53, k54, k55 }, \
-	{ k60, k61, k62, k63, k64, k65 }, \
-	{ k70, k71, k72, k73, k74, k75 }, \
-	{ k80, k81, k82, k83, k84, k85 }, \
-	{ KC_NO, k91, k92, k93, k94, k95 }, \
+    k00, k01, k02, k03, k04, k05,            k55, k54, k53, k52, k51, k50, \
+    k10, k11, k12, k13, k14, k15,            k65, k64, k63, k62, k61, k60, \
+    k20, k21, k22, k23, k24, k25,            k75, k74, k73, k72, k71, k70, \
+    k30, k31, k32, k33, k34, k35,            k85, k84, k83, k82, k81, k80, \
+                   k43, k44, k41,            k91, k94, k93, \
+                        k45, k42,            k92, k95 \
+) \
+{ \
+    {   k00, k01, k02, k03, k04, k05 }, \
+    {   k10, k11, k12, k13, k14, k15 }, \
+    {   k20, k21, k22, k23, k24, k25 }, \
+    {   k30, k31, k32, k33, k34, k35 }, \
+    { KC_NO, k41, k42, k43, k44, k45 }, \
+    {   k50, k51, k52, k53, k54, k55 }, \
+    {   k60, k61, k62, k63, k64, k65 }, \
+    {   k70, k71, k72, k73, k74, k75 }, \
+    {   k80, k81, k82, k83, k84, k85 }, \
+    { KC_NO, k91, k92, k93, k94, k95 }, \
 }
+// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index d4f15e44f1..24664f13ef 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "TBK Mini Blackpill",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 4233599432..cb4d3378bc 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -1,53 +1,53 @@
 {
     "url": "https://www.bastardkb.com/tbk-mini",
     "usb": {
-        "pid": "0x1828",
+        "pid": "0x1828"
     },
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L33", "x":5, "y":3},
-                {"label":"L34", "x":6, "y":3},
-                {"label":"L31", "x":7, "y":3},
-                {"label":"R33", "x":9, "y":3},
-                {"label":"R34", "x":10, "y":3},
-                {"label":"R31", "x":11, "y":3}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "L05", "x": 5, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "R05", "x": 16, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "L15", "x": 5, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "R15", "x": 16, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "L25", "x": 5, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "R25", "x": 16, "y": 2 },
+                { "label": "L33", "x": 5, "y": 3 },
+                { "label": "L34", "x": 6, "y": 3 },
+                { "label": "L31", "x": 7, "y": 3 },
+                { "label": "R33", "x": 9, "y": 3 },
+                { "label": "R34", "x": 10, "y": 3 },
+                { "label": "R31", "x": 11, "y": 3 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c
index 7bbd374c01..34b42951a0 100644
--- a/keyboards/bastardkb/tbkmini/tbkmini.c
+++ b/keyboards/bastardkb/tbkmini/tbkmini.c
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,6 +17,7 @@
 
 #include "tbkmini.h"
 
+// clang-format off
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
     // left
@@ -57,3 +58,4 @@ led_config_t g_led_config = { {
     2, 2, 2
 } };
 #endif
+// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index 83a9e799e1..f9ebb18069 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "TBK Mini Elite-C",
     "usb": {
-      "device_version": "1.0.0",
-    },
+        "device_version": "1.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index 50cfe860dd..a0ef2767f9 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "TBK Mini Elite-C",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
index c4e5b3ff90..b5539989b4 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/config.h
@@ -21,14 +21,6 @@
 #define MATRIX_ROW_PINS \
     { GP26, GP5, GP4, GP9 }
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
-
 /* serial.c configuration (for split keyboard). */
 #define SOFT_SERIAL_PIN GP1
 
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/info.json b/keyboards/bastardkb/tbkmini/v2/splinky/info.json
index ca66bceeff..b0b05fba8a 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "TBK Mini Splinky",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
index be0e2fb959..8397b931c5 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h
@@ -20,3 +20,11 @@
 /* Key matrix configuration. */
 #define MATRIX_COL_PINS \
     { GP27, GP28, GP15, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
index 72f5c0ffa8..36b25dffff 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h
@@ -20,3 +20,11 @@
 /* Key matrix configuration. */
 #define MATRIX_COL_PINS \
     { GP27, GP28, GP21, GP6, GP7, GP8 }
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP15
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index b56c455ae3..7595dab436 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "TBK Mini STeMCell",
     "usb": {
-      "device_version": "2.0.0"
+        "device_version": "2.0.0"
     }
 }

From e451703680a10322b7a6e74d1e3778f1776fb561 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 21 Nov 2022 02:03:17 +0000
Subject: [PATCH 912/959] Merge API update workflow (#19121)

---
 .github/workflows/api.yml         | 12 ++++++---
 .github/workflows/develop_api.yml | 43 -------------------------------
 2 files changed, 9 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/develop_api.yml

diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index dd3fbdaa92..0cff4f6e75 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - master
+    - develop
     paths:
     - 'keyboards/**'
     - 'layouts/community/**'
@@ -17,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     container: qmkfm/qmk_cli
 
-    # protect against those who develop with their fork on master
+    # protect against those who work in their fork on 'important' branches
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
@@ -26,15 +27,20 @@ jobs:
         fetch-depth: 1
         persist-credentials: false
 
+    - name: Install dependencies
+      run: |
+        pip3 install -r requirements-dev.txt
+
     - name: Generate API Data
-      run: qmk generate-api
+      run: |
+        qmk generate-api
 
     - name: Upload API Data
       uses: jakejarvis/s3-sync-action@master
       with:
         args: --acl public-read --follow-symlinks --delete
       env:
-        AWS_S3_BUCKET: ${{ secrets.API_SPACE_MASTER }}
+        AWS_S3_BUCKET: ${{ github.ref == 'refs/heads/develop' && secrets['API_SPACE_DEVELOP'] || secrets['API_SPACE_MASTER'] }}
         AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
         AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
diff --git a/.github/workflows/develop_api.yml b/.github/workflows/develop_api.yml
deleted file mode 100644
index 194305e730..0000000000
--- a/.github/workflows/develop_api.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Update Develop API Data
-
-on:
-  push:
-    branches:
-    - develop
-    paths:
-    - 'keyboards/**'
-    - 'layouts/community/**'
-    - 'lib/python/**'
-    - 'data/**'
-    - '.github/workflows/develop_api.yml'
-  workflow_dispatch:
-
-jobs:
-  api_data:
-    runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
-
-    # protect against those who work in their fork on develop
-    if: github.repository == 'qmk/qmk_firmware'
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 1
-        persist-credentials: false
-
-    - name: Generate API Data
-      run: |
-        python3 -m pip install -r requirements-dev.txt
-        qmk generate-api
-
-    - name: Upload API Data
-      uses: jakejarvis/s3-sync-action@master
-      with:
-        args: --acl public-read --follow-symlinks --delete
-      env:
-        AWS_S3_BUCKET: ${{ secrets.API_SPACE_DEVELOP }}
-        AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
-        AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
-        SOURCE_DIR: '.build/api_data'

From fe577daf966f34ae056f685c5a260473635c5ec8 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 21 Nov 2022 02:03:38 +0000
Subject: [PATCH 913/959] Remove .noci functionality (#19122)

---
 Makefile                                         |  2 +-
 keyboards/10bleoledhub/.noci                     |  0
 keyboards/1upkeyboards/sweet16/.noci             |  0
 keyboards/25keys/zinc/.noci                      |  0
 keyboards/25keys/zinc/rev1/.noci                 |  0
 keyboards/25keys/zinc/reva/.noci                 |  0
 keyboards/4pplet/waffling60/rev_a/.noci          |  0
 keyboards/8pack/.noci                            |  0
 keyboards/8pack/rev11/.noci                      |  0
 keyboards/adkb96/.noci                           |  0
 keyboards/ai03/equinox/rev0/.noci                |  0
 keyboards/akegata_denki/device_one/.noci         |  0
 keyboards/arabica37/rev1/.noci                   |  0
 keyboards/basekeys/slice/rev1/.noci              |  0
 keyboards/bear_face/.noci                        |  0
 keyboards/bear_face/v1/.noci                     |  0
 keyboards/bemeier/bmek/rev1/.noci                |  0
 keyboards/bemeier/bmek/rev2/.noci                |  0
 keyboards/biacco42/ergo42/.noci                  |  0
 keyboards/bpiphany/pegasushoof/.noci             |  0
 keyboards/bpiphany/pegasushoof/2013/.noci        |  0
 keyboards/bthlabs/geekpad/.noci                  |  0
 keyboards/cannonkeys/satisfaction75/.noci        |  0
 .../cannonkeys/satisfaction75/prototype/.noci    |  0
 keyboards/chavdai40/rev1/.noci                   |  0
 keyboards/clueboard/17/.noci                     |  0
 keyboards/clueboard/2x1800/2018/.noci            |  0
 keyboards/clueboard/2x1800/2021/.noci            |  0
 keyboards/clueboard/60/.noci                     |  0
 keyboards/clueboard/66/rev1/.noci                |  0
 keyboards/clueboard/66/rev2/.noci                |  0
 keyboards/clueboard/66_hotswap/prototype/.noci   |  0
 keyboards/clueboard/card/.noci                   |  0
 keyboards/converter/modelm101/.noci              |  0
 keyboards/converter/sun_usb/.noci                |  0
 keyboards/converter/sun_usb/type3/.noci          |  0
 keyboards/cozykeys/speedo/v2/.noci               |  0
 keyboards/crkbd/.noci                            |  0
 keyboards/crkbd/rev1/common/.noci                |  0
 keyboards/crkbd/rev1/legacy/.noci                |  0
 keyboards/dailycraft/bat43/.noci                 |  0
 keyboards/dailycraft/bat43/rev1/.noci            |  0
 keyboards/dailycraft/bat43/rev2/.noci            |  0
 keyboards/dailycraft/claw44/.noci                |  0
 keyboards/dailycraft/claw44/rev1/.noci           |  0
 keyboards/dm9records/ergoinu/.noci               |  0
 keyboards/duck/octagon/.noci                     |  0
 keyboards/duck/octagon/v1/.noci                  |  0
 keyboards/duck/orion/.noci                       |  0
 keyboards/dztech/dz60rgb/v1/.noci                |  0
 keyboards/dztech/dz60rgb_ansi/v1/.noci           |  0
 keyboards/dztech/dz60rgb_wkl/v1/.noci            |  0
 keyboards/dztech/dz65rgb/v1/.noci                |  0
 keyboards/eco/.noci                              |  0
 keyboards/eco/rev1/.noci                         |  0
 keyboards/emptystring/nqg/.noci                  |  0
 keyboards/ergoslab/.noci                         |  0
 keyboards/ergotravel/.noci                       |  0
 keyboards/evyd13/atom47/.noci                    |  0
 keyboards/evyd13/atom47/rev2/.noci               |  0
 keyboards/evyd13/mx5160/.noci                    |  0
 keyboards/fluorite/.noci                         |  0
 keyboards/fortitude60/.noci                      |  0
 keyboards/gmmk/.noci                             |  0
 keyboards/hadron/.noci                           |  0
 keyboards/hadron/ver2/.noci                      |  0
 keyboards/handwired/ortho5x14/.noci              |  0
 keyboards/handwired/pytest/.noci                 |  0
 keyboards/handwired/pytest/basic/.noci           |  0
 keyboards/handwired/pytest/has_community/.noci   |  0
 keyboards/handwired/pytest/has_template/.noci    |  0
 .../handwired/pytest/has_template/keymaps/.noci  |  0
 keyboards/handwired/pytest/macro/.noci           |  0
 keyboards/helix/.noci                            |  0
 keyboards/helix/pico/.noci                       |  0
 keyboards/helix/pico/sc/.noci                    |  0
 keyboards/helix/pico/under/.noci                 |  0
 keyboards/helix/rev2/.noci                       |  0
 keyboards/helix/rev2/back/.noci                  |  0
 keyboards/helix/rev2/qmk_conf/.noci              |  0
 keyboards/helix/rev2/sc/.noci                    |  0
 keyboards/helix/rev2/under/.noci                 |  0
 keyboards/helix/rev3_4rows/.noci                 |  0
 keyboards/hifumi/.noci                           |  0
 keyboards/hs60/v1/.noci                          |  0
 keyboards/ibnuda/squiggle/rev1/.noci             |  0
 keyboards/jian/.noci                             |  0
 keyboards/jian/handwired/.noci                   |  0
 keyboards/jian/rev1/.noci                        |  0
 keyboards/jiran/.noci                            |  0
 keyboards/jiran/rev1/.noci                       |  0
 keyboards/jiran/rev2/.noci                       |  0
 keyboards/kagizaraya/chidori/.noci               |  0
 keyboards/kakunpc/angel17/.noci                  |  0
 keyboards/kakunpc/angel17/alpha/.noci            |  0
 keyboards/kakunpc/angel64/.noci                  |  0
 keyboards/kakunpc/angel64/alpha/.noci            |  0
 keyboards/kakunpc/business_card/.noci            |  0
 keyboards/kakunpc/business_card/alpha/.noci      |  0
 keyboards/kakunpc/suihankey/split/.noci          |  0
 keyboards/kakunpc/suihankey/split/alpha/.noci    |  0
 keyboards/kbdfans/kbd67/hotswap/.noci            |  0
 keyboards/kbdfans/kbd67/mkii_soldered/.noci      |  0
 keyboards/kbdfans/kbd67/rev1/.noci               |  0
 keyboards/kbdfans/kbd75/.noci                    |  0
 keyboards/kbdfans/kbd75/rev1/.noci               |  0
 keyboards/kbdfans/kbdpad/mk1/.noci               |  0
 keyboards/keebio/bdn9/.noci                      |  0
 keyboards/keebio/bdn9/rev1/.noci                 |  0
 keyboards/keebio/foldkb/.noci                    |  0
 keyboards/keebio/iris/rev1/.noci                 |  0
 keyboards/keebio/iris/rev1_led/.noci             |  0
 keyboards/keebio/iris/rev2/.noci                 |  0
 keyboards/keebio/iris/rev3/.noci                 |  0
 keyboards/keebio/kbo5000/.noci                   |  0
 keyboards/keebio/levinson/.noci                  |  0
 keyboards/keebio/levinson/rev1/.noci             |  0
 keyboards/keebio/levinson/rev2/.noci             |  0
 keyboards/keebio/nyquist/rev1/.noci              |  0
 keyboards/keebio/nyquist/rev2/.noci              |  0
 keyboards/keebio/quefrency/.noci                 |  0
 keyboards/keebio/quefrency/rev1/.noci            |  0
 keyboards/keebio/rorschach/.noci                 |  0
 keyboards/keebio/viterbi/.noci                   |  0
 keyboards/keebio/viterbi/rev1/.noci              |  0
 keyboards/keycapsss/plaid_pad/.noci              |  0
 keyboards/keycapsss/plaid_pad/rev1/.noci         |  0
 keyboards/keyhive/navi10/.noci                   |  0
 keyboards/keyhive/navi10/rev0/.noci              |  0
 keyboards/keyhive/navi10/rev2/.noci              |  0
 keyboards/kinesis/.noci                          |  0
 keyboards/kudox/.noci                            |  0
 keyboards/kudox/columner/.noci                   |  0
 keyboards/kudox/rev1/.noci                       |  0
 keyboards/kudox/rev2/.noci                       |  0
 keyboards/kudox_game/.noci                       |  0
 keyboards/kudox_game/rev1/.noci                  |  0
 keyboards/leeku/finger65/.noci                   |  0
 keyboards/lets_split/.noci                       |  0
 keyboards/lets_split/rev1/.noci                  |  0
 keyboards/lfkeyboards/lfk65_hs/.noci             |  0
 keyboards/lfkeyboards/lfk78/.noci                |  0
 keyboards/lfkeyboards/lfk78/revb/.noci           |  0
 keyboards/lfkeyboards/lfk78/revc/.noci           |  0
 keyboards/lfkeyboards/mini1800/.noci             |  0
 keyboards/lfkeyboards/smk65/.noci                |  0
 keyboards/lfkeyboards/smk65/revb/.noci           |  0
 keyboards/lily58/.noci                           |  0
 keyboards/lily58/rev1/.noci                      |  0
 keyboards/maple_computing/christmas_tree/.noci   |  0
 keyboards/maple_computing/ivy/.noci              |  0
 keyboards/maple_computing/launchpad/.noci        |  0
 keyboards/maple_computing/lets_split_eh/.noci    |  0
 keyboards/maple_computing/minidox/.noci          |  0
 keyboards/marksard/rhymestone/.noci              |  0
 keyboards/marksard/rhymestone/rev1/.noci         |  0
 keyboards/marksard/treadstone32/lite/.noci       |  0
 keyboards/marksard/treadstone32/rev1/.noci       |  0
 keyboards/marksard/treadstone48/.noci            |  0
 keyboards/marksard/treadstone48/rev1/.noci       |  0
 keyboards/mechkeys/mechmini/v1/.noci             |  0
 keyboards/mechllama/g35/.noci                    |  0
 keyboards/mechllama/g35/v1/.noci                 |  0
 keyboards/mechlovin/adelais/.noci                |  0
 keyboards/mechlovin/adelais/rgb_led/.noci        |  0
 keyboards/mechlovin/adelais/rgb_led/rev1/.noci   |  0
 .../mechlovin/adelais/standard_led/arm/.noci     |  0
 .../adelais/standard_led/arm/rev2/.noci          |  0
 .../mechlovin/adelais/standard_led/avr/.noci     |  0
 keyboards/mechlovin/delphine/.noci               |  0
 keyboards/mechlovin/hannah60rgb/.noci            |  0
 keyboards/mechlovin/hannah60rgb/rev1/.noci       |  0
 keyboards/mechlovin/hannah65/.noci               |  0
 keyboards/mechlovin/hannah910/.noci              |  0
 keyboards/mechlovin/hannah910/rev1/.noci         |  0
 keyboards/mechlovin/hannah910/rev2/.noci         |  0
 keyboards/melgeek/mj64/rev1/.noci                |  0
 keyboards/melgeek/z70ultra/.noci                 |  0
 keyboards/miniaxe/.noci                          |  0
 keyboards/mint60/.noci                           |  0
 keyboards/montsinger/rebound/.noci               |  0
 keyboards/montsinger/rebound/rev1/.noci          |  0
 keyboards/montsinger/rebound/rev2/.noci          |  0
 keyboards/montsinger/rebound/rev3/.noci          |  0
 keyboards/murcielago/.noci                       |  0
 keyboards/ogre/ergo_single/.noci                 |  0
 keyboards/ogre/ergo_split/.noci                  |  0
 keyboards/omkbd/ergodash/.noci                   |  0
 keyboards/omkbd/ergodash/mini/.noci              |  0
 keyboards/omkbd/ergodash/rev1/.noci              |  0
 keyboards/omkbd/runner3680/3x6/.noci             |  0
 keyboards/omkbd/runner3680/3x7/.noci             |  0
 keyboards/omkbd/runner3680/3x8/.noci             |  0
 keyboards/omkbd/runner3680/4x6/.noci             |  0
 keyboards/omkbd/runner3680/4x7/.noci             |  0
 keyboards/omkbd/runner3680/4x8/.noci             |  0
 keyboards/omkbd/runner3680/5x6/.noci             |  0
 keyboards/omkbd/runner3680/5x6_5x8/.noci         |  0
 keyboards/omkbd/runner3680/5x7/.noci             |  0
 keyboards/omkbd/runner3680/5x8/.noci             |  0
 keyboards/orthodox/.noci                         |  0
 keyboards/orthodox/rev1/.noci                    |  0
 keyboards/pabile/p20/ver1/.noci                  |  0
 keyboards/percent/canoe/.noci                    |  0
 keyboards/pimentoso/paddino02/rev1/.noci         |  0
 keyboards/pinky/3/.noci                          |  0
 keyboards/pinky/4/.noci                          |  0
 keyboards/planck/rev1/.noci                      |  0
 keyboards/planck/rev2/.noci                      |  0
 keyboards/planck/rev3/.noci                      |  0
 keyboards/planck/rev4/.noci                      |  0
 keyboards/planck/rev5/.noci                      |  0
 keyboards/ploopyco/trackball/.noci               |  0
 keyboards/polilla/.noci                          |  0
 keyboards/polilla/rev1/.noci                     |  0
 keyboards/preonic/rev1/.noci                     |  0
 keyboards/preonic/rev2/.noci                     |  0
 keyboards/primekb/prime_e/.noci                  |  0
 keyboards/primekb/prime_l/.noci                  |  0
 keyboards/primekb/prime_l/v1/.noci               |  0
 keyboards/projectkb/alice/.noci                  |  0
 keyboards/projectkb/alice/rev1/.noci             |  0
 keyboards/puck/.noci                             |  0
 keyboards/qwertyydox/.noci                       |  0
 keyboards/qwertyydox/rev1/.noci                  |  0
 keyboards/recompile_keys/choco60/rev1/.noci      |  0
 keyboards/recompile_keys/cocoa40/.noci           |  0
 keyboards/recompile_keys/nomu30/.noci            |  0
 keyboards/recompile_keys/nomu30/rev1/.noci       |  0
 keyboards/recompile_keys/nomu30/rev2/.noci       |  0
 keyboards/redox/.noci                            |  0
 keyboards/redscarf_iiplus/verb/.noci             |  0
 keyboards/redscarf_iiplus/verc/.noci             |  0
 keyboards/reviung/reviung33/.noci                |  0
 keyboards/reviung/reviung61/.noci                |  0
 keyboards/rgbkb/mun/.noci                        |  0
 keyboards/rgbkb/pan/.noci                        |  0
 keyboards/rgbkb/pan/rev1/.noci                   |  0
 keyboards/rgbkb/sol/.noci                        |  0
 keyboards/rgbkb/sol/rev1/.noci                   |  0
 keyboards/rgbkb/sol3/.noci                       |  0
 keyboards/rgbkb/zen/.noci                        |  0
 keyboards/rgbkb/zen/rev1/.noci                   |  0
 keyboards/rgbkb/zygomorph/.noci                  |  0
 keyboards/rominronin/katana60/rev1/.noci         |  0
 keyboards/salicylic_acid3/7skb/.noci             |  0
 keyboards/salicylic_acid3/getta25/.noci          |  0
 keyboards/salicylic_acid3/jisplit89/.noci        |  0
 keyboards/salicylic_acid3/naked48/.noci          |  0
 keyboards/salicylic_acid3/naked64/.noci          |  0
 keyboards/salicylic_acid3/setta21/rev1/.noci     |  0
 keyboards/sirius/uni660/rev1/.noci               |  0
 keyboards/sirius/uni660/rev2/.noci               |  0
 keyboards/sirius/uni660/rev2/ansi/.noci          |  0
 keyboards/sirius/uni660/rev2/iso/.noci           |  0
 keyboards/sixkeyboard/.noci                      |  0
 keyboards/sofle/.noci                            |  0
 keyboards/spacetime/.noci                        |  0
 keyboards/spacetime/rev1/.noci                   |  0
 keyboards/splitkb/kyria/.noci                    |  0
 keyboards/takashiski/namecard2x4/.noci           |  0
 keyboards/takashiski/namecard2x4/rev1/.noci      |  0
 keyboards/takashiski/otaku_split/rev0/.noci      |  0
 keyboards/tkw/stoutgat/v1/.noci                  |  0
 keyboards/tominabox1/underscore33/.noci          |  0
 keyboards/tominabox1/underscore33/rev1/.noci     |  0
 keyboards/uzu42/rev1/.noci                       |  0
 keyboards/vitamins_included/.noci                |  0
 keyboards/vitamins_included/rev1/.noci           |  0
 keyboards/whale/sk/.noci                         |  0
 keyboards/woodkeys/bigseries/1key/.noci          |  0
 keyboards/woodkeys/bigseries/2key/.noci          |  0
 keyboards/woodkeys/bigseries/3key/.noci          |  0
 keyboards/xelus/valor_frl_tkl/rev2_0/.noci       |  0
 keyboards/xiaomi/mk02/.noci                      |  0
 keyboards/xiudi/xd002/.noci                      |  0
 keyboards/xiudi/xd60/rev2/.noci                  |  0
 keyboards/yatara/drink_me/.noci                  |  0
 keyboards/ymdk/ymd75/.noci                       |  0
 keyboards/ymdk/ymd75/rev1/.noci                  |  0
 keyboards/ymdk/ymd75/rev2/.noci                  |  0
 util/list_keyboards.sh                           | 16 ++--------------
 282 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 keyboards/10bleoledhub/.noci
 delete mode 100644 keyboards/1upkeyboards/sweet16/.noci
 delete mode 100644 keyboards/25keys/zinc/.noci
 delete mode 100644 keyboards/25keys/zinc/rev1/.noci
 delete mode 100644 keyboards/25keys/zinc/reva/.noci
 delete mode 100644 keyboards/4pplet/waffling60/rev_a/.noci
 delete mode 100644 keyboards/8pack/.noci
 delete mode 100644 keyboards/8pack/rev11/.noci
 delete mode 100644 keyboards/adkb96/.noci
 delete mode 100644 keyboards/ai03/equinox/rev0/.noci
 delete mode 100644 keyboards/akegata_denki/device_one/.noci
 delete mode 100644 keyboards/arabica37/rev1/.noci
 delete mode 100644 keyboards/basekeys/slice/rev1/.noci
 delete mode 100644 keyboards/bear_face/.noci
 delete mode 100644 keyboards/bear_face/v1/.noci
 delete mode 100644 keyboards/bemeier/bmek/rev1/.noci
 delete mode 100644 keyboards/bemeier/bmek/rev2/.noci
 delete mode 100644 keyboards/biacco42/ergo42/.noci
 delete mode 100644 keyboards/bpiphany/pegasushoof/.noci
 delete mode 100644 keyboards/bpiphany/pegasushoof/2013/.noci
 delete mode 100644 keyboards/bthlabs/geekpad/.noci
 delete mode 100644 keyboards/cannonkeys/satisfaction75/.noci
 delete mode 100644 keyboards/cannonkeys/satisfaction75/prototype/.noci
 delete mode 100644 keyboards/chavdai40/rev1/.noci
 delete mode 100644 keyboards/clueboard/17/.noci
 delete mode 100644 keyboards/clueboard/2x1800/2018/.noci
 delete mode 100644 keyboards/clueboard/2x1800/2021/.noci
 delete mode 100644 keyboards/clueboard/60/.noci
 delete mode 100644 keyboards/clueboard/66/rev1/.noci
 delete mode 100644 keyboards/clueboard/66/rev2/.noci
 delete mode 100644 keyboards/clueboard/66_hotswap/prototype/.noci
 delete mode 100644 keyboards/clueboard/card/.noci
 delete mode 100644 keyboards/converter/modelm101/.noci
 delete mode 100644 keyboards/converter/sun_usb/.noci
 delete mode 100644 keyboards/converter/sun_usb/type3/.noci
 delete mode 100644 keyboards/cozykeys/speedo/v2/.noci
 delete mode 100644 keyboards/crkbd/.noci
 delete mode 100644 keyboards/crkbd/rev1/common/.noci
 delete mode 100644 keyboards/crkbd/rev1/legacy/.noci
 delete mode 100644 keyboards/dailycraft/bat43/.noci
 delete mode 100644 keyboards/dailycraft/bat43/rev1/.noci
 delete mode 100644 keyboards/dailycraft/bat43/rev2/.noci
 delete mode 100644 keyboards/dailycraft/claw44/.noci
 delete mode 100644 keyboards/dailycraft/claw44/rev1/.noci
 delete mode 100644 keyboards/dm9records/ergoinu/.noci
 delete mode 100644 keyboards/duck/octagon/.noci
 delete mode 100644 keyboards/duck/octagon/v1/.noci
 delete mode 100644 keyboards/duck/orion/.noci
 delete mode 100644 keyboards/dztech/dz60rgb/v1/.noci
 delete mode 100644 keyboards/dztech/dz60rgb_ansi/v1/.noci
 delete mode 100644 keyboards/dztech/dz60rgb_wkl/v1/.noci
 delete mode 100644 keyboards/dztech/dz65rgb/v1/.noci
 delete mode 100644 keyboards/eco/.noci
 delete mode 100644 keyboards/eco/rev1/.noci
 delete mode 100644 keyboards/emptystring/nqg/.noci
 delete mode 100644 keyboards/ergoslab/.noci
 delete mode 100644 keyboards/ergotravel/.noci
 delete mode 100644 keyboards/evyd13/atom47/.noci
 delete mode 100644 keyboards/evyd13/atom47/rev2/.noci
 delete mode 100644 keyboards/evyd13/mx5160/.noci
 delete mode 100644 keyboards/fluorite/.noci
 delete mode 100644 keyboards/fortitude60/.noci
 delete mode 100644 keyboards/gmmk/.noci
 delete mode 100644 keyboards/hadron/.noci
 delete mode 100644 keyboards/hadron/ver2/.noci
 delete mode 100644 keyboards/handwired/ortho5x14/.noci
 delete mode 100644 keyboards/handwired/pytest/.noci
 delete mode 100644 keyboards/handwired/pytest/basic/.noci
 delete mode 100644 keyboards/handwired/pytest/has_community/.noci
 delete mode 100644 keyboards/handwired/pytest/has_template/.noci
 delete mode 100644 keyboards/handwired/pytest/has_template/keymaps/.noci
 delete mode 100644 keyboards/handwired/pytest/macro/.noci
 delete mode 100644 keyboards/helix/.noci
 delete mode 100644 keyboards/helix/pico/.noci
 delete mode 100644 keyboards/helix/pico/sc/.noci
 delete mode 100644 keyboards/helix/pico/under/.noci
 delete mode 100644 keyboards/helix/rev2/.noci
 delete mode 100644 keyboards/helix/rev2/back/.noci
 delete mode 100644 keyboards/helix/rev2/qmk_conf/.noci
 delete mode 100644 keyboards/helix/rev2/sc/.noci
 delete mode 100644 keyboards/helix/rev2/under/.noci
 delete mode 100644 keyboards/helix/rev3_4rows/.noci
 delete mode 100644 keyboards/hifumi/.noci
 delete mode 100644 keyboards/hs60/v1/.noci
 delete mode 100644 keyboards/ibnuda/squiggle/rev1/.noci
 delete mode 100644 keyboards/jian/.noci
 delete mode 100644 keyboards/jian/handwired/.noci
 delete mode 100644 keyboards/jian/rev1/.noci
 delete mode 100644 keyboards/jiran/.noci
 delete mode 100644 keyboards/jiran/rev1/.noci
 delete mode 100644 keyboards/jiran/rev2/.noci
 delete mode 100644 keyboards/kagizaraya/chidori/.noci
 delete mode 100644 keyboards/kakunpc/angel17/.noci
 delete mode 100644 keyboards/kakunpc/angel17/alpha/.noci
 delete mode 100644 keyboards/kakunpc/angel64/.noci
 delete mode 100644 keyboards/kakunpc/angel64/alpha/.noci
 delete mode 100644 keyboards/kakunpc/business_card/.noci
 delete mode 100644 keyboards/kakunpc/business_card/alpha/.noci
 delete mode 100644 keyboards/kakunpc/suihankey/split/.noci
 delete mode 100644 keyboards/kakunpc/suihankey/split/alpha/.noci
 delete mode 100644 keyboards/kbdfans/kbd67/hotswap/.noci
 delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/.noci
 delete mode 100644 keyboards/kbdfans/kbd67/rev1/.noci
 delete mode 100644 keyboards/kbdfans/kbd75/.noci
 delete mode 100644 keyboards/kbdfans/kbd75/rev1/.noci
 delete mode 100644 keyboards/kbdfans/kbdpad/mk1/.noci
 delete mode 100644 keyboards/keebio/bdn9/.noci
 delete mode 100644 keyboards/keebio/bdn9/rev1/.noci
 delete mode 100644 keyboards/keebio/foldkb/.noci
 delete mode 100644 keyboards/keebio/iris/rev1/.noci
 delete mode 100644 keyboards/keebio/iris/rev1_led/.noci
 delete mode 100644 keyboards/keebio/iris/rev2/.noci
 delete mode 100644 keyboards/keebio/iris/rev3/.noci
 delete mode 100644 keyboards/keebio/kbo5000/.noci
 delete mode 100644 keyboards/keebio/levinson/.noci
 delete mode 100644 keyboards/keebio/levinson/rev1/.noci
 delete mode 100644 keyboards/keebio/levinson/rev2/.noci
 delete mode 100644 keyboards/keebio/nyquist/rev1/.noci
 delete mode 100644 keyboards/keebio/nyquist/rev2/.noci
 delete mode 100644 keyboards/keebio/quefrency/.noci
 delete mode 100644 keyboards/keebio/quefrency/rev1/.noci
 delete mode 100644 keyboards/keebio/rorschach/.noci
 delete mode 100644 keyboards/keebio/viterbi/.noci
 delete mode 100644 keyboards/keebio/viterbi/rev1/.noci
 delete mode 100644 keyboards/keycapsss/plaid_pad/.noci
 delete mode 100644 keyboards/keycapsss/plaid_pad/rev1/.noci
 delete mode 100644 keyboards/keyhive/navi10/.noci
 delete mode 100644 keyboards/keyhive/navi10/rev0/.noci
 delete mode 100644 keyboards/keyhive/navi10/rev2/.noci
 delete mode 100644 keyboards/kinesis/.noci
 delete mode 100644 keyboards/kudox/.noci
 delete mode 100644 keyboards/kudox/columner/.noci
 delete mode 100644 keyboards/kudox/rev1/.noci
 delete mode 100644 keyboards/kudox/rev2/.noci
 delete mode 100644 keyboards/kudox_game/.noci
 delete mode 100644 keyboards/kudox_game/rev1/.noci
 delete mode 100644 keyboards/leeku/finger65/.noci
 delete mode 100644 keyboards/lets_split/.noci
 delete mode 100644 keyboards/lets_split/rev1/.noci
 delete mode 100644 keyboards/lfkeyboards/lfk65_hs/.noci
 delete mode 100644 keyboards/lfkeyboards/lfk78/.noci
 delete mode 100644 keyboards/lfkeyboards/lfk78/revb/.noci
 delete mode 100644 keyboards/lfkeyboards/lfk78/revc/.noci
 delete mode 100644 keyboards/lfkeyboards/mini1800/.noci
 delete mode 100644 keyboards/lfkeyboards/smk65/.noci
 delete mode 100644 keyboards/lfkeyboards/smk65/revb/.noci
 delete mode 100644 keyboards/lily58/.noci
 delete mode 100644 keyboards/lily58/rev1/.noci
 delete mode 100644 keyboards/maple_computing/christmas_tree/.noci
 delete mode 100644 keyboards/maple_computing/ivy/.noci
 delete mode 100644 keyboards/maple_computing/launchpad/.noci
 delete mode 100644 keyboards/maple_computing/lets_split_eh/.noci
 delete mode 100644 keyboards/maple_computing/minidox/.noci
 delete mode 100644 keyboards/marksard/rhymestone/.noci
 delete mode 100644 keyboards/marksard/rhymestone/rev1/.noci
 delete mode 100644 keyboards/marksard/treadstone32/lite/.noci
 delete mode 100644 keyboards/marksard/treadstone32/rev1/.noci
 delete mode 100644 keyboards/marksard/treadstone48/.noci
 delete mode 100644 keyboards/marksard/treadstone48/rev1/.noci
 delete mode 100644 keyboards/mechkeys/mechmini/v1/.noci
 delete mode 100644 keyboards/mechllama/g35/.noci
 delete mode 100644 keyboards/mechllama/g35/v1/.noci
 delete mode 100644 keyboards/mechlovin/adelais/.noci
 delete mode 100644 keyboards/mechlovin/adelais/rgb_led/.noci
 delete mode 100644 keyboards/mechlovin/adelais/rgb_led/rev1/.noci
 delete mode 100644 keyboards/mechlovin/adelais/standard_led/arm/.noci
 delete mode 100644 keyboards/mechlovin/adelais/standard_led/arm/rev2/.noci
 delete mode 100644 keyboards/mechlovin/adelais/standard_led/avr/.noci
 delete mode 100644 keyboards/mechlovin/delphine/.noci
 delete mode 100644 keyboards/mechlovin/hannah60rgb/.noci
 delete mode 100644 keyboards/mechlovin/hannah60rgb/rev1/.noci
 delete mode 100644 keyboards/mechlovin/hannah65/.noci
 delete mode 100644 keyboards/mechlovin/hannah910/.noci
 delete mode 100644 keyboards/mechlovin/hannah910/rev1/.noci
 delete mode 100644 keyboards/mechlovin/hannah910/rev2/.noci
 delete mode 100644 keyboards/melgeek/mj64/rev1/.noci
 delete mode 100644 keyboards/melgeek/z70ultra/.noci
 delete mode 100644 keyboards/miniaxe/.noci
 delete mode 100644 keyboards/mint60/.noci
 delete mode 100644 keyboards/montsinger/rebound/.noci
 delete mode 100644 keyboards/montsinger/rebound/rev1/.noci
 delete mode 100644 keyboards/montsinger/rebound/rev2/.noci
 delete mode 100644 keyboards/montsinger/rebound/rev3/.noci
 delete mode 100644 keyboards/murcielago/.noci
 delete mode 100644 keyboards/ogre/ergo_single/.noci
 delete mode 100644 keyboards/ogre/ergo_split/.noci
 delete mode 100644 keyboards/omkbd/ergodash/.noci
 delete mode 100644 keyboards/omkbd/ergodash/mini/.noci
 delete mode 100644 keyboards/omkbd/ergodash/rev1/.noci
 delete mode 100644 keyboards/omkbd/runner3680/3x6/.noci
 delete mode 100644 keyboards/omkbd/runner3680/3x7/.noci
 delete mode 100644 keyboards/omkbd/runner3680/3x8/.noci
 delete mode 100644 keyboards/omkbd/runner3680/4x6/.noci
 delete mode 100644 keyboards/omkbd/runner3680/4x7/.noci
 delete mode 100644 keyboards/omkbd/runner3680/4x8/.noci
 delete mode 100644 keyboards/omkbd/runner3680/5x6/.noci
 delete mode 100644 keyboards/omkbd/runner3680/5x6_5x8/.noci
 delete mode 100644 keyboards/omkbd/runner3680/5x7/.noci
 delete mode 100644 keyboards/omkbd/runner3680/5x8/.noci
 delete mode 100644 keyboards/orthodox/.noci
 delete mode 100644 keyboards/orthodox/rev1/.noci
 delete mode 100644 keyboards/pabile/p20/ver1/.noci
 delete mode 100644 keyboards/percent/canoe/.noci
 delete mode 100644 keyboards/pimentoso/paddino02/rev1/.noci
 delete mode 100644 keyboards/pinky/3/.noci
 delete mode 100644 keyboards/pinky/4/.noci
 delete mode 100644 keyboards/planck/rev1/.noci
 delete mode 100644 keyboards/planck/rev2/.noci
 delete mode 100644 keyboards/planck/rev3/.noci
 delete mode 100644 keyboards/planck/rev4/.noci
 delete mode 100644 keyboards/planck/rev5/.noci
 delete mode 100644 keyboards/ploopyco/trackball/.noci
 delete mode 100644 keyboards/polilla/.noci
 delete mode 100644 keyboards/polilla/rev1/.noci
 delete mode 100644 keyboards/preonic/rev1/.noci
 delete mode 100644 keyboards/preonic/rev2/.noci
 delete mode 100644 keyboards/primekb/prime_e/.noci
 delete mode 100644 keyboards/primekb/prime_l/.noci
 delete mode 100644 keyboards/primekb/prime_l/v1/.noci
 delete mode 100644 keyboards/projectkb/alice/.noci
 delete mode 100644 keyboards/projectkb/alice/rev1/.noci
 delete mode 100644 keyboards/puck/.noci
 delete mode 100644 keyboards/qwertyydox/.noci
 delete mode 100644 keyboards/qwertyydox/rev1/.noci
 delete mode 100644 keyboards/recompile_keys/choco60/rev1/.noci
 delete mode 100644 keyboards/recompile_keys/cocoa40/.noci
 delete mode 100644 keyboards/recompile_keys/nomu30/.noci
 delete mode 100644 keyboards/recompile_keys/nomu30/rev1/.noci
 delete mode 100644 keyboards/recompile_keys/nomu30/rev2/.noci
 delete mode 100644 keyboards/redox/.noci
 delete mode 100644 keyboards/redscarf_iiplus/verb/.noci
 delete mode 100644 keyboards/redscarf_iiplus/verc/.noci
 delete mode 100644 keyboards/reviung/reviung33/.noci
 delete mode 100644 keyboards/reviung/reviung61/.noci
 delete mode 100644 keyboards/rgbkb/mun/.noci
 delete mode 100644 keyboards/rgbkb/pan/.noci
 delete mode 100644 keyboards/rgbkb/pan/rev1/.noci
 delete mode 100644 keyboards/rgbkb/sol/.noci
 delete mode 100644 keyboards/rgbkb/sol/rev1/.noci
 delete mode 100644 keyboards/rgbkb/sol3/.noci
 delete mode 100644 keyboards/rgbkb/zen/.noci
 delete mode 100644 keyboards/rgbkb/zen/rev1/.noci
 delete mode 100644 keyboards/rgbkb/zygomorph/.noci
 delete mode 100644 keyboards/rominronin/katana60/rev1/.noci
 delete mode 100644 keyboards/salicylic_acid3/7skb/.noci
 delete mode 100644 keyboards/salicylic_acid3/getta25/.noci
 delete mode 100644 keyboards/salicylic_acid3/jisplit89/.noci
 delete mode 100644 keyboards/salicylic_acid3/naked48/.noci
 delete mode 100644 keyboards/salicylic_acid3/naked64/.noci
 delete mode 100644 keyboards/salicylic_acid3/setta21/rev1/.noci
 delete mode 100644 keyboards/sirius/uni660/rev1/.noci
 delete mode 100644 keyboards/sirius/uni660/rev2/.noci
 delete mode 100644 keyboards/sirius/uni660/rev2/ansi/.noci
 delete mode 100644 keyboards/sirius/uni660/rev2/iso/.noci
 delete mode 100644 keyboards/sixkeyboard/.noci
 delete mode 100644 keyboards/sofle/.noci
 delete mode 100644 keyboards/spacetime/.noci
 delete mode 100644 keyboards/spacetime/rev1/.noci
 delete mode 100644 keyboards/splitkb/kyria/.noci
 delete mode 100644 keyboards/takashiski/namecard2x4/.noci
 delete mode 100644 keyboards/takashiski/namecard2x4/rev1/.noci
 delete mode 100644 keyboards/takashiski/otaku_split/rev0/.noci
 delete mode 100644 keyboards/tkw/stoutgat/v1/.noci
 delete mode 100644 keyboards/tominabox1/underscore33/.noci
 delete mode 100644 keyboards/tominabox1/underscore33/rev1/.noci
 delete mode 100644 keyboards/uzu42/rev1/.noci
 delete mode 100644 keyboards/vitamins_included/.noci
 delete mode 100644 keyboards/vitamins_included/rev1/.noci
 delete mode 100644 keyboards/whale/sk/.noci
 delete mode 100644 keyboards/woodkeys/bigseries/1key/.noci
 delete mode 100644 keyboards/woodkeys/bigseries/2key/.noci
 delete mode 100644 keyboards/woodkeys/bigseries/3key/.noci
 delete mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/.noci
 delete mode 100644 keyboards/xiaomi/mk02/.noci
 delete mode 100644 keyboards/xiudi/xd002/.noci
 delete mode 100644 keyboards/xiudi/xd60/rev2/.noci
 delete mode 100644 keyboards/yatara/drink_me/.noci
 delete mode 100644 keyboards/ymdk/ymd75/.noci
 delete mode 100644 keyboards/ymdk/ymd75/rev1/.noci
 delete mode 100644 keyboards/ymdk/ymd75/rev2/.noci

diff --git a/Makefile b/Makefile
index 4a9bba603f..99339192e1 100644
--- a/Makefile
+++ b/Makefile
@@ -241,7 +241,7 @@ endef
 # if we are going to compile all keyboards, match the rest of the rule
 # for each of them
 define PARSE_ALL_KEYBOARDS
-    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh noci | sort -u)))
+    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh | sort -u)))
 endef
 
 # Prints a list of all known keymaps for the given keyboard
diff --git a/keyboards/10bleoledhub/.noci b/keyboards/10bleoledhub/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/1upkeyboards/sweet16/.noci b/keyboards/1upkeyboards/sweet16/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/25keys/zinc/.noci b/keyboards/25keys/zinc/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/25keys/zinc/rev1/.noci b/keyboards/25keys/zinc/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/25keys/zinc/reva/.noci b/keyboards/25keys/zinc/reva/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/4pplet/waffling60/rev_a/.noci b/keyboards/4pplet/waffling60/rev_a/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/8pack/.noci b/keyboards/8pack/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/8pack/rev11/.noci b/keyboards/8pack/rev11/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/adkb96/.noci b/keyboards/adkb96/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ai03/equinox/rev0/.noci b/keyboards/ai03/equinox/rev0/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/akegata_denki/device_one/.noci b/keyboards/akegata_denki/device_one/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/arabica37/rev1/.noci b/keyboards/arabica37/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/basekeys/slice/rev1/.noci b/keyboards/basekeys/slice/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/bear_face/.noci b/keyboards/bear_face/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/bear_face/v1/.noci b/keyboards/bear_face/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/bemeier/bmek/rev1/.noci b/keyboards/bemeier/bmek/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/bemeier/bmek/rev2/.noci b/keyboards/bemeier/bmek/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/biacco42/ergo42/.noci b/keyboards/biacco42/ergo42/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/bpiphany/pegasushoof/.noci b/keyboards/bpiphany/pegasushoof/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/bpiphany/pegasushoof/2013/.noci b/keyboards/bpiphany/pegasushoof/2013/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/bthlabs/geekpad/.noci b/keyboards/bthlabs/geekpad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/cannonkeys/satisfaction75/.noci b/keyboards/cannonkeys/satisfaction75/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/.noci b/keyboards/cannonkeys/satisfaction75/prototype/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/chavdai40/rev1/.noci b/keyboards/chavdai40/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/17/.noci b/keyboards/clueboard/17/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/2x1800/2018/.noci b/keyboards/clueboard/2x1800/2018/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/2x1800/2021/.noci b/keyboards/clueboard/2x1800/2021/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/60/.noci b/keyboards/clueboard/60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/66/rev1/.noci b/keyboards/clueboard/66/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/66/rev2/.noci b/keyboards/clueboard/66/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/66_hotswap/prototype/.noci b/keyboards/clueboard/66_hotswap/prototype/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/clueboard/card/.noci b/keyboards/clueboard/card/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/converter/modelm101/.noci b/keyboards/converter/modelm101/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/converter/sun_usb/.noci b/keyboards/converter/sun_usb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/converter/sun_usb/type3/.noci b/keyboards/converter/sun_usb/type3/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/cozykeys/speedo/v2/.noci b/keyboards/cozykeys/speedo/v2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/crkbd/.noci b/keyboards/crkbd/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/crkbd/rev1/common/.noci b/keyboards/crkbd/rev1/common/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/crkbd/rev1/legacy/.noci b/keyboards/crkbd/rev1/legacy/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dailycraft/bat43/.noci b/keyboards/dailycraft/bat43/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dailycraft/bat43/rev1/.noci b/keyboards/dailycraft/bat43/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dailycraft/bat43/rev2/.noci b/keyboards/dailycraft/bat43/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dailycraft/claw44/.noci b/keyboards/dailycraft/claw44/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dailycraft/claw44/rev1/.noci b/keyboards/dailycraft/claw44/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dm9records/ergoinu/.noci b/keyboards/dm9records/ergoinu/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/duck/octagon/.noci b/keyboards/duck/octagon/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/duck/octagon/v1/.noci b/keyboards/duck/octagon/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/duck/orion/.noci b/keyboards/duck/orion/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dztech/dz60rgb/v1/.noci b/keyboards/dztech/dz60rgb/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/.noci b/keyboards/dztech/dz60rgb_ansi/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/.noci b/keyboards/dztech/dz60rgb_wkl/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/dztech/dz65rgb/v1/.noci b/keyboards/dztech/dz65rgb/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/eco/.noci b/keyboards/eco/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/eco/rev1/.noci b/keyboards/eco/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/emptystring/nqg/.noci b/keyboards/emptystring/nqg/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ergoslab/.noci b/keyboards/ergoslab/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ergotravel/.noci b/keyboards/ergotravel/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/evyd13/atom47/.noci b/keyboards/evyd13/atom47/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/evyd13/atom47/rev2/.noci b/keyboards/evyd13/atom47/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/evyd13/mx5160/.noci b/keyboards/evyd13/mx5160/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/fluorite/.noci b/keyboards/fluorite/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/fortitude60/.noci b/keyboards/fortitude60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/gmmk/.noci b/keyboards/gmmk/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/hadron/.noci b/keyboards/hadron/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/hadron/ver2/.noci b/keyboards/hadron/ver2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/handwired/ortho5x14/.noci b/keyboards/handwired/ortho5x14/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/handwired/pytest/.noci b/keyboards/handwired/pytest/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/handwired/pytest/basic/.noci b/keyboards/handwired/pytest/basic/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/handwired/pytest/has_community/.noci b/keyboards/handwired/pytest/has_community/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/handwired/pytest/has_template/.noci b/keyboards/handwired/pytest/has_template/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/handwired/pytest/has_template/keymaps/.noci b/keyboards/handwired/pytest/has_template/keymaps/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/handwired/pytest/macro/.noci b/keyboards/handwired/pytest/macro/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/.noci b/keyboards/helix/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/pico/.noci b/keyboards/helix/pico/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/pico/sc/.noci b/keyboards/helix/pico/sc/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/pico/under/.noci b/keyboards/helix/pico/under/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/rev2/.noci b/keyboards/helix/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/rev2/back/.noci b/keyboards/helix/rev2/back/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/rev2/qmk_conf/.noci b/keyboards/helix/rev2/qmk_conf/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/rev2/sc/.noci b/keyboards/helix/rev2/sc/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/rev2/under/.noci b/keyboards/helix/rev2/under/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/rev3_4rows/.noci b/keyboards/helix/rev3_4rows/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/hifumi/.noci b/keyboards/hifumi/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/hs60/v1/.noci b/keyboards/hs60/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ibnuda/squiggle/rev1/.noci b/keyboards/ibnuda/squiggle/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/jian/.noci b/keyboards/jian/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/jian/handwired/.noci b/keyboards/jian/handwired/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/jian/rev1/.noci b/keyboards/jian/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/jiran/.noci b/keyboards/jiran/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/jiran/rev1/.noci b/keyboards/jiran/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/jiran/rev2/.noci b/keyboards/jiran/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kagizaraya/chidori/.noci b/keyboards/kagizaraya/chidori/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/angel17/.noci b/keyboards/kakunpc/angel17/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/angel17/alpha/.noci b/keyboards/kakunpc/angel17/alpha/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/angel64/.noci b/keyboards/kakunpc/angel64/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/angel64/alpha/.noci b/keyboards/kakunpc/angel64/alpha/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/business_card/.noci b/keyboards/kakunpc/business_card/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/business_card/alpha/.noci b/keyboards/kakunpc/business_card/alpha/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/suihankey/split/.noci b/keyboards/kakunpc/suihankey/split/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kakunpc/suihankey/split/alpha/.noci b/keyboards/kakunpc/suihankey/split/alpha/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kbdfans/kbd67/hotswap/.noci b/keyboards/kbdfans/kbd67/hotswap/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/.noci b/keyboards/kbdfans/kbd67/mkii_soldered/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kbdfans/kbd67/rev1/.noci b/keyboards/kbdfans/kbd67/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kbdfans/kbd75/.noci b/keyboards/kbdfans/kbd75/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kbdfans/kbd75/rev1/.noci b/keyboards/kbdfans/kbd75/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kbdfans/kbdpad/mk1/.noci b/keyboards/kbdfans/kbdpad/mk1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/bdn9/.noci b/keyboards/keebio/bdn9/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/bdn9/rev1/.noci b/keyboards/keebio/bdn9/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/foldkb/.noci b/keyboards/keebio/foldkb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/iris/rev1/.noci b/keyboards/keebio/iris/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/iris/rev1_led/.noci b/keyboards/keebio/iris/rev1_led/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/iris/rev2/.noci b/keyboards/keebio/iris/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/iris/rev3/.noci b/keyboards/keebio/iris/rev3/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/kbo5000/.noci b/keyboards/keebio/kbo5000/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/levinson/.noci b/keyboards/keebio/levinson/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/levinson/rev1/.noci b/keyboards/keebio/levinson/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/levinson/rev2/.noci b/keyboards/keebio/levinson/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/nyquist/rev1/.noci b/keyboards/keebio/nyquist/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/nyquist/rev2/.noci b/keyboards/keebio/nyquist/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/quefrency/.noci b/keyboards/keebio/quefrency/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/quefrency/rev1/.noci b/keyboards/keebio/quefrency/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/rorschach/.noci b/keyboards/keebio/rorschach/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/viterbi/.noci b/keyboards/keebio/viterbi/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/viterbi/rev1/.noci b/keyboards/keebio/viterbi/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keycapsss/plaid_pad/.noci b/keyboards/keycapsss/plaid_pad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keycapsss/plaid_pad/rev1/.noci b/keyboards/keycapsss/plaid_pad/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keyhive/navi10/.noci b/keyboards/keyhive/navi10/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keyhive/navi10/rev0/.noci b/keyboards/keyhive/navi10/rev0/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keyhive/navi10/rev2/.noci b/keyboards/keyhive/navi10/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kinesis/.noci b/keyboards/kinesis/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox/.noci b/keyboards/kudox/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox/columner/.noci b/keyboards/kudox/columner/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox/rev1/.noci b/keyboards/kudox/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox/rev2/.noci b/keyboards/kudox/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox_game/.noci b/keyboards/kudox_game/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox_game/rev1/.noci b/keyboards/kudox_game/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/leeku/finger65/.noci b/keyboards/leeku/finger65/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lets_split/.noci b/keyboards/lets_split/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lets_split/rev1/.noci b/keyboards/lets_split/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/lfk65_hs/.noci b/keyboards/lfkeyboards/lfk65_hs/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/lfk78/.noci b/keyboards/lfkeyboards/lfk78/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/lfk78/revb/.noci b/keyboards/lfkeyboards/lfk78/revb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/lfk78/revc/.noci b/keyboards/lfkeyboards/lfk78/revc/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/mini1800/.noci b/keyboards/lfkeyboards/mini1800/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/smk65/.noci b/keyboards/lfkeyboards/smk65/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/smk65/revb/.noci b/keyboards/lfkeyboards/smk65/revb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lily58/.noci b/keyboards/lily58/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lily58/rev1/.noci b/keyboards/lily58/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/maple_computing/christmas_tree/.noci b/keyboards/maple_computing/christmas_tree/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/maple_computing/ivy/.noci b/keyboards/maple_computing/ivy/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/maple_computing/launchpad/.noci b/keyboards/maple_computing/launchpad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/maple_computing/lets_split_eh/.noci b/keyboards/maple_computing/lets_split_eh/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/maple_computing/minidox/.noci b/keyboards/maple_computing/minidox/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/marksard/rhymestone/.noci b/keyboards/marksard/rhymestone/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/marksard/rhymestone/rev1/.noci b/keyboards/marksard/rhymestone/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/marksard/treadstone32/lite/.noci b/keyboards/marksard/treadstone32/lite/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/marksard/treadstone32/rev1/.noci b/keyboards/marksard/treadstone32/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/marksard/treadstone48/.noci b/keyboards/marksard/treadstone48/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/marksard/treadstone48/rev1/.noci b/keyboards/marksard/treadstone48/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechkeys/mechmini/v1/.noci b/keyboards/mechkeys/mechmini/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechllama/g35/.noci b/keyboards/mechllama/g35/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechllama/g35/v1/.noci b/keyboards/mechllama/g35/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/adelais/.noci b/keyboards/mechlovin/adelais/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/adelais/rgb_led/.noci b/keyboards/mechlovin/adelais/rgb_led/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/.noci b/keyboards/mechlovin/adelais/rgb_led/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/.noci b/keyboards/mechlovin/adelais/standard_led/arm/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/.noci b/keyboards/mechlovin/adelais/standard_led/arm/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/.noci b/keyboards/mechlovin/adelais/standard_led/avr/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/delphine/.noci b/keyboards/mechlovin/delphine/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/hannah60rgb/.noci b/keyboards/mechlovin/hannah60rgb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/.noci b/keyboards/mechlovin/hannah60rgb/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/hannah65/.noci b/keyboards/mechlovin/hannah65/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/hannah910/.noci b/keyboards/mechlovin/hannah910/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/hannah910/rev1/.noci b/keyboards/mechlovin/hannah910/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mechlovin/hannah910/rev2/.noci b/keyboards/mechlovin/hannah910/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/melgeek/mj64/rev1/.noci b/keyboards/melgeek/mj64/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/melgeek/z70ultra/.noci b/keyboards/melgeek/z70ultra/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/miniaxe/.noci b/keyboards/miniaxe/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/mint60/.noci b/keyboards/mint60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/montsinger/rebound/.noci b/keyboards/montsinger/rebound/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/montsinger/rebound/rev1/.noci b/keyboards/montsinger/rebound/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/montsinger/rebound/rev2/.noci b/keyboards/montsinger/rebound/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/montsinger/rebound/rev3/.noci b/keyboards/montsinger/rebound/rev3/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/murcielago/.noci b/keyboards/murcielago/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ogre/ergo_single/.noci b/keyboards/ogre/ergo_single/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ogre/ergo_split/.noci b/keyboards/ogre/ergo_split/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/ergodash/.noci b/keyboards/omkbd/ergodash/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/ergodash/mini/.noci b/keyboards/omkbd/ergodash/mini/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/ergodash/rev1/.noci b/keyboards/omkbd/ergodash/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/3x6/.noci b/keyboards/omkbd/runner3680/3x6/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/3x7/.noci b/keyboards/omkbd/runner3680/3x7/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/3x8/.noci b/keyboards/omkbd/runner3680/3x8/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/4x6/.noci b/keyboards/omkbd/runner3680/4x6/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/4x7/.noci b/keyboards/omkbd/runner3680/4x7/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/4x8/.noci b/keyboards/omkbd/runner3680/4x8/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/5x6/.noci b/keyboards/omkbd/runner3680/5x6/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/.noci b/keyboards/omkbd/runner3680/5x6_5x8/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/5x7/.noci b/keyboards/omkbd/runner3680/5x7/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/omkbd/runner3680/5x8/.noci b/keyboards/omkbd/runner3680/5x8/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/orthodox/.noci b/keyboards/orthodox/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/orthodox/rev1/.noci b/keyboards/orthodox/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/pabile/p20/ver1/.noci b/keyboards/pabile/p20/ver1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/percent/canoe/.noci b/keyboards/percent/canoe/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/pimentoso/paddino02/rev1/.noci b/keyboards/pimentoso/paddino02/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/pinky/3/.noci b/keyboards/pinky/3/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/pinky/4/.noci b/keyboards/pinky/4/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/planck/rev1/.noci b/keyboards/planck/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/planck/rev2/.noci b/keyboards/planck/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/planck/rev3/.noci b/keyboards/planck/rev3/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/planck/rev4/.noci b/keyboards/planck/rev4/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/planck/rev5/.noci b/keyboards/planck/rev5/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ploopyco/trackball/.noci b/keyboards/ploopyco/trackball/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/polilla/.noci b/keyboards/polilla/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/polilla/rev1/.noci b/keyboards/polilla/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/preonic/rev1/.noci b/keyboards/preonic/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/preonic/rev2/.noci b/keyboards/preonic/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/primekb/prime_e/.noci b/keyboards/primekb/prime_e/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/primekb/prime_l/.noci b/keyboards/primekb/prime_l/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/primekb/prime_l/v1/.noci b/keyboards/primekb/prime_l/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/projectkb/alice/.noci b/keyboards/projectkb/alice/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/projectkb/alice/rev1/.noci b/keyboards/projectkb/alice/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/puck/.noci b/keyboards/puck/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/qwertyydox/.noci b/keyboards/qwertyydox/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/qwertyydox/rev1/.noci b/keyboards/qwertyydox/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/recompile_keys/choco60/rev1/.noci b/keyboards/recompile_keys/choco60/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/recompile_keys/cocoa40/.noci b/keyboards/recompile_keys/cocoa40/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/recompile_keys/nomu30/.noci b/keyboards/recompile_keys/nomu30/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/recompile_keys/nomu30/rev1/.noci b/keyboards/recompile_keys/nomu30/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/recompile_keys/nomu30/rev2/.noci b/keyboards/recompile_keys/nomu30/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/redox/.noci b/keyboards/redox/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/redscarf_iiplus/verb/.noci b/keyboards/redscarf_iiplus/verb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/redscarf_iiplus/verc/.noci b/keyboards/redscarf_iiplus/verc/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/reviung/reviung33/.noci b/keyboards/reviung/reviung33/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/reviung/reviung61/.noci b/keyboards/reviung/reviung61/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/mun/.noci b/keyboards/rgbkb/mun/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/pan/.noci b/keyboards/rgbkb/pan/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/pan/rev1/.noci b/keyboards/rgbkb/pan/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/sol/.noci b/keyboards/rgbkb/sol/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/sol/rev1/.noci b/keyboards/rgbkb/sol/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/sol3/.noci b/keyboards/rgbkb/sol3/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/zen/.noci b/keyboards/rgbkb/zen/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/zen/rev1/.noci b/keyboards/rgbkb/zen/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rgbkb/zygomorph/.noci b/keyboards/rgbkb/zygomorph/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/rominronin/katana60/rev1/.noci b/keyboards/rominronin/katana60/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/salicylic_acid3/7skb/.noci b/keyboards/salicylic_acid3/7skb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/salicylic_acid3/getta25/.noci b/keyboards/salicylic_acid3/getta25/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/salicylic_acid3/jisplit89/.noci b/keyboards/salicylic_acid3/jisplit89/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/salicylic_acid3/naked48/.noci b/keyboards/salicylic_acid3/naked48/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/salicylic_acid3/naked64/.noci b/keyboards/salicylic_acid3/naked64/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/salicylic_acid3/setta21/rev1/.noci b/keyboards/salicylic_acid3/setta21/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/sirius/uni660/rev1/.noci b/keyboards/sirius/uni660/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/sirius/uni660/rev2/.noci b/keyboards/sirius/uni660/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/sirius/uni660/rev2/ansi/.noci b/keyboards/sirius/uni660/rev2/ansi/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/sirius/uni660/rev2/iso/.noci b/keyboards/sirius/uni660/rev2/iso/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/sixkeyboard/.noci b/keyboards/sixkeyboard/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/sofle/.noci b/keyboards/sofle/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/spacetime/.noci b/keyboards/spacetime/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/spacetime/rev1/.noci b/keyboards/spacetime/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/splitkb/kyria/.noci b/keyboards/splitkb/kyria/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/takashiski/namecard2x4/.noci b/keyboards/takashiski/namecard2x4/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/takashiski/namecard2x4/rev1/.noci b/keyboards/takashiski/namecard2x4/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/takashiski/otaku_split/rev0/.noci b/keyboards/takashiski/otaku_split/rev0/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/tkw/stoutgat/v1/.noci b/keyboards/tkw/stoutgat/v1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/tominabox1/underscore33/.noci b/keyboards/tominabox1/underscore33/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/tominabox1/underscore33/rev1/.noci b/keyboards/tominabox1/underscore33/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/uzu42/rev1/.noci b/keyboards/uzu42/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/vitamins_included/.noci b/keyboards/vitamins_included/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/vitamins_included/rev1/.noci b/keyboards/vitamins_included/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/whale/sk/.noci b/keyboards/whale/sk/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/woodkeys/bigseries/1key/.noci b/keyboards/woodkeys/bigseries/1key/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/woodkeys/bigseries/2key/.noci b/keyboards/woodkeys/bigseries/2key/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/woodkeys/bigseries/3key/.noci b/keyboards/woodkeys/bigseries/3key/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/.noci b/keyboards/xelus/valor_frl_tkl/rev2_0/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/xiaomi/mk02/.noci b/keyboards/xiaomi/mk02/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/xiudi/xd002/.noci b/keyboards/xiudi/xd002/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/xiudi/xd60/rev2/.noci b/keyboards/xiudi/xd60/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/yatara/drink_me/.noci b/keyboards/yatara/drink_me/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ymdk/ymd75/.noci b/keyboards/ymdk/ymd75/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ymdk/ymd75/rev1/.noci b/keyboards/ymdk/ymd75/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/ymdk/ymd75/rev2/.noci b/keyboards/ymdk/ymd75/rev2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/util/list_keyboards.sh b/util/list_keyboards.sh
index aa6ed1c6af..0d1dae888f 100755
--- a/util/list_keyboards.sh
+++ b/util/list_keyboards.sh
@@ -1,18 +1,6 @@
 #!/bin/sh
 # Temporary shell script to find keyboards
 #
-# This allows us to exclude keyboards by including a .noci file.
+# This allows us to include DEFAULT_FOLDER targets.
 
-find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | while read keyboard; do
-	if [ "$1" = "noci" ]; then
-		case "$keyboard" in
-			handwired/*)
-				;;
-			*)
-				test -e "keyboards/${keyboard}/.noci" || echo "$keyboard"
-				;;
-		esac
-	else
-		echo "$keyboard"
-	fi
-done
+find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!'

From 9291c8f8679433c0c5dd3a2102a633145e029d79 Mon Sep 17 00:00:00 2001
From: dztech <moyi4681@users.noreply.github.com>
Date: Mon, 21 Nov 2022 12:17:09 +0800
Subject: [PATCH 914/959] [Keyboard] add og60 keyboard (#19114)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/dztech/og60/info.json               | 426 ++++++++++++++++++
 .../dztech/og60/keymaps/default/keymap.c      |  50 ++
 keyboards/dztech/og60/keymaps/via/keymap.c    |  50 ++
 keyboards/dztech/og60/keymaps/via/rules.mk    |   1 +
 keyboards/dztech/og60/readme.md               |  22 +
 keyboards/dztech/og60/rules.mk                |   0
 6 files changed, 549 insertions(+)
 create mode 100644 keyboards/dztech/og60/info.json
 create mode 100644 keyboards/dztech/og60/keymaps/default/keymap.c
 create mode 100644 keyboards/dztech/og60/keymaps/via/keymap.c
 create mode 100644 keyboards/dztech/og60/keymaps/via/rules.mk
 create mode 100644 keyboards/dztech/og60/readme.md
 create mode 100644 keyboards/dztech/og60/rules.mk

diff --git a/keyboards/dztech/og60/info.json b/keyboards/dztech/og60/info.json
new file mode 100644
index 0000000000..6da1094cd1
--- /dev/null
+++ b/keyboards/dztech/og60/info.json
@@ -0,0 +1,426 @@
+{
+    "manufacturer": "KBDFans",
+    "keyboard_name": "Og60",
+    "maintainer": "moyi4681",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP28",
+        "on_state": 1
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP18", "GP19", "GP20", "GP21", "GP22", "GP23"],
+        "rows": ["GP4", "GP3", "GP17", "GP24", "GP25"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6071",
+        "vid": "0x4B42"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "Backspace", "matrix": [2, 12], "w": 1, "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "@", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "~", "matrix": [1, 13], "w": 1, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "AltGr", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "Backspace", "matrix": [2, 12], "w": 1, "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [2, 12], "w": 1, "x": 13, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/dztech/og60/keymaps/default/keymap.c b/keyboards/dztech/og60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0bf690aab0
--- /dev/null
+++ b/keyboards/dztech/og60/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_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_DEL, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_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_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [2] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_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_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+     [3] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_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_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+};
+
+
diff --git a/keyboards/dztech/og60/keymaps/via/keymap.c b/keyboards/dztech/og60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0bf690aab0
--- /dev/null
+++ b/keyboards/dztech/og60/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_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_DEL, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_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_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [2] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_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_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+     [3] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_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_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+};
+
+
diff --git a/keyboards/dztech/og60/keymaps/via/rules.mk b/keyboards/dztech/og60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/dztech/og60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dztech/og60/readme.md b/keyboards/dztech/og60/readme.md
new file mode 100644
index 0000000000..07d6e6a658
--- /dev/null
+++ b/keyboards/dztech/og60/readme.md
@@ -0,0 +1,22 @@
+# OG60
+A customizable 60% HotSwap keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: OG60
+* Hardware Availability: [KBDfans](https://kbdfans.com/)
+
+## Bootloader mode
+
+Enter the bootloader in 3 ways:
+
+* Bootmagic reset: Hold down the left top key then plug in the USB cable.
+* Physical reset button: Double tap the reset button.
+* Keycode in layout: Press the key mapped to QK_BOOT if it is available.
+
+## Making firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dztech/og60:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/dztech/og60/rules.mk b/keyboards/dztech/og60/rules.mk
new file mode 100644
index 0000000000..e69de29bb2

From 08805cada0b935cafffeb4e402c8ee24b1a946fa Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Tue, 22 Nov 2022 01:27:15 +0000
Subject: [PATCH 915/959] Stub next develop dates

---
 docs/ChangeLog/20221126.md       | 24 ++++++++++++++++++++++++
 docs/_summary.md                 |  2 +-
 docs/breaking_changes.md         | 19 ++++++++++---------
 docs/breaking_changes_history.md |  1 +
 4 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 docs/ChangeLog/20221126.md

diff --git a/docs/ChangeLog/20221126.md b/docs/ChangeLog/20221126.md
new file mode 100644
index 0000000000..87f1fd2332
--- /dev/null
+++ b/docs/ChangeLog/20221126.md
@@ -0,0 +1,24 @@
+# QMK Breaking Changes - 2022 November 26 Changelog
+
+## Notable Features :id=notable-features
+
+## Changes Requiring User Action :id=changes-requiring-user-action
+
+### Updated Keyboard Codebases :id=updated-keyboard-codebases
+
+The following keyboards have had their source moved within QMK:
+
+| Old Keyboard Name                    | New Keyboard Name                    |
+|--------------------------------------|--------------------------------------|
+| converter/numeric_keypad_IIe         | converter/numeric_keypad_iie         |
+| durgod/k3x0/k310                     | durgod/k310                          |
+| durgod/k3x0/k320                     | durgod/k320                          |
+| emptystring/NQG                      | emptystring/nqg                      |
+| handwired/hillside/46                | hillside/46                          |
+| handwired/hillside/48                | hillside/48                          |
+| handwired/hillside/52                | hillside/52                          |
+| maple_computing/christmas_tree/V2017 | maple_computing/christmas_tree/v2017 |
+
+## Notable core changes :id=notable-core
+
+## Full changelist :id=full-changelist
diff --git a/docs/_summary.md b/docs/_summary.md
index 97b7e8a2ec..738c24ee42 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -136,7 +136,7 @@
   * Breaking Changes
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
-    * [Most Recent ChangeLog](ChangeLog/20220827.md "QMK v0.18.0 - 2022 Aug 27")
+    * [Most Recent ChangeLog](ChangeLog/20221126.md "QMK v0.19.0 - 2022 Nov 26")
     * [Past Breaking Changes](breaking_changes_history.md)
 
   * C Development
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index b701a70eeb..8bceb39409 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -8,6 +8,7 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## What has been included in past Breaking Changes?
 
+* [2022 Nov 26](ChangeLog/20221126.md)
 * [2022 Aug 27](ChangeLog/20220827.md)
 * [2022 May 28](ChangeLog/20220528.md)
 * [2022 Feb 26](ChangeLog/20220226.md)
@@ -23,18 +24,18 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for November 26, 2022.
+The next Breaking Change is scheduled for February 26, 2023.
 
 ### Important Dates
 
-* 2022 Aug 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2022 Oct 29 - `develop` closed to new PR's.
-* 2022 Oct 29 - Call for testers.
-* 2022 Nov 12 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2022 Nov 19 - `develop` is locked, only critical bugfix PR's merged.
-* 2022 Nov 24 - `master` is locked, no PR's merged.
-* 2022 Nov 26 - Merge `develop` to `master`.
-* 2022 Nov 26 - `master` is unlocked. PR's can be merged again.
+* 2022 Nov 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2022 Jan 29 - `develop` closed to new PR's.
+* 2022 Jan 29 - Call for testers.
+* 2022 Feb 12 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2022 Feb 19 - `develop` is locked, only critical bugfix PR's merged.
+* 2022 Feb 24 - `master` is locked, no PR's merged.
+* 2022 Feb 26 - Merge `develop` to `master`.
+* 2023 Feb 26 - `master` is unlocked. PR's can be merged again.
 
 ## What changes will be included?
 
diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
index 38af505701..df94b81e04 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.
 
+* [2022 Nov 26](ChangeLog/20221126.md) - version 0.19.0
 * [2022 Aug 27](ChangeLog/20220827.md) - version 0.18.0
 * [2022 May 28](ChangeLog/20220528.md) - version 0.17.0
 * [2022 Feb 26](ChangeLog/20220226.md) - version 0.16.0

From 06a3801a27881d7a409ea1749002393d765294f9 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 22 Nov 2022 13:32:36 +1100
Subject: [PATCH 916/959] Update .gitignore (#19132)

---
 .gitignore | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitignore b/.gitignore
index 51b0a38e0a..2aacfe02e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,9 +67,20 @@ CMakeLists.txt
 tags
 
 # Ignore image/font files
+*.bmp
+*.wbmp
 *.gif
 *.jpg
+*.jpeg
 *.png
+*.apng
+*.mng
+*.svg
+*.webp
+*.webm
+*.avi
+*.mp4
+*.mpeg
 *.ttf
 *.otf
 

From 3b11e98215f1528287a28158837125408cbf3d9b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 22 Nov 2022 11:07:47 +0000
Subject: [PATCH 917/959] Update use of legacy keycodes (#19120)

---
 .../40percentclub/gherkin/keymaps/mjt/keymap.c |  2 +-
 .../shisaku/keymaps/solenoid/keymap.c          |  2 +-
 .../ai03/lunar_ii/keymaps/default/keymap.c     |  2 +-
 keyboards/ai03/lunar_ii/keymaps/via/keymap.c   |  2 +-
 .../amjkeyboard/amj40/keymaps/fabian/keymap.c  |  4 ++--
 .../2019/keymaps/default/keymap.c              |  6 +++---
 .../handwire_101/keymaps/default/keymap.c      |  2 +-
 .../ckeys/obelus/keymaps/default/keymap.c      |  2 +-
 .../ckeys/thedora/keymaps/default/keymap.c     |  4 ++--
 keyboards/contra/keymaps/alper/keymap.c        |  4 ++--
 keyboards/contra/keymaps/default/keymap.c      |  4 ++--
 keyboards/crkbd/keymaps/gotham/keymap.c        |  6 +++---
 .../plaid/keymaps/brickbots/keymap.c           |  4 ++--
 .../dm9records/plaid/keymaps/default/keymap.c  |  4 ++--
 .../plaid/keymaps/gipsy-king/keymap.c          |  4 ++--
 keyboards/ein_60/keymaps/klackygears/keymap.c  |  6 +++---
 .../evyd13/plain60/keymaps/audio/keymap.c      |  2 +-
 keyboards/fractal/keymaps/default/keymap.c     |  6 +++---
 keyboards/hadron/ver2/keymaps/default/keymap.c |  2 +-
 .../hadron/ver2/keymaps/side_numpad/keymap.c   |  2 +-
 keyboards/hadron/ver3/keymaps/default/keymap.c |  4 ++--
 keyboards/hadron/ver3/keymaps/ishtob/keymap.c  |  4 ++--
 .../handwired/aranck/keymaps/default/keymap.c  |  8 ++++----
 .../aranck/keymaps/turkishish/keymap.c         |  6 +++---
 .../atreus50/keymaps/default/keymap.c          |  4 ++--
 .../heisenberg/keymaps/default/keymap.c        |  8 ++++----
 .../heisenberg/keymaps/turkishish/keymap.c     |  8 ++++----
 .../handwired/ibm122m/keymaps/lukaus/keymap.c  |  8 ++++----
 .../ortho5x13/keymaps/default/keymap.c         |  2 +-
 .../handwired/ortho5x14/keymaps/2u/keymap.c    |  4 ++--
 .../ortho5x14/keymaps/default/keymap.c         |  2 +-
 .../ortho5x14/keymaps/split1/keymap.c          |  2 +-
 .../ortho_brass/keymaps/default/keymap.c       |  4 ++--
 .../riblee_f401/keymaps/default/keymap.c       |  4 ++--
 .../riblee_f411/keymaps/default/keymap.c       |  4 ++--
 .../4x6_right/keymaps/drashna/keymap.c         |  4 ++--
 .../twig/twig50/keymaps/default/keymap.c       |  4 ++--
 .../handwired/xealous/keymaps/default/keymap.c |  2 +-
 keyboards/helix/pico/keymaps/default/keymap.c  |  4 ++--
 .../jones/v03_1/keymaps/default_ansi/keymap.c  |  4 ++--
 .../jones/v03_1/keymaps/default_jp/keymap.c    |  4 ++--
 keyboards/jones/v1/keymaps/default/keymap.c    |  4 ++--
 keyboards/jones/v1/keymaps/via/keymap.c        |  2 +-
 .../kbdfans/niu_mini/keymaps/framtava/keymap.c |  4 ++--
 .../kbdfans/niu_mini/keymaps/planck/keymap.c   |  4 ++--
 keyboards/keebio/iris/keymaps/blucky/keymap.c  |  4 ++--
 .../keebio/levinson/keymaps/dcompact/keymap.c  |  2 +-
 .../nyquist/keymaps/default_4x12/keymap.c      |  2 +-
 .../keebio/nyquist/keymaps/pjanx/keymap.c      |  4 ++--
 .../keebio/viterbi/keymaps/drashna/keymap.c    |  2 +-
 .../o4l_5x12/keymaps/default/keymap.c          |  6 +++---
 .../keyprez/rhino/keymaps/default/keymap.c     |  2 +-
 .../keyprez/rhino/keymaps/default_7u/keymap.c  |  2 +-
 .../rhino/keymaps/default_ergo/keymap.c        |  2 +-
 .../twokey/keymaps/default/keymap.c            |  2 +-
 .../little_foot/keymaps/yanfali/keymap.c       |  2 +-
 .../ropro/keymaps/jdayton3/keymap.c            |  4 ++--
 .../bm40hsrgb/keymaps/wolff_abnt2/keymap.c     |  2 +-
 keyboards/lets_split/keymaps/fabian/keymap.c   |  4 ++--
 keyboards/lets_split/keymaps/poker/keymap.c    |  4 ++--
 .../lfk65_hs/keymaps/default/keymap.c          |  6 +++---
 .../lfkeyboards/lfk78/keymaps/default/keymap.c |  6 +++---
 .../lfkeyboards/lfk78/keymaps/iso/keymap.c     |  6 +++---
 .../lfk78/keymaps/split_bs_osx/keymap.c        |  6 +++---
 .../lfkeyboards/lfk78/keymaps/via/keymap.c     | 12 ++++++------
 .../lfk87/keymaps/ca178858/keymap.c            |  8 ++++----
 .../lfkeyboards/lfk87/keymaps/default/keymap.c |  6 +++---
 .../lfkeyboards/lfk87/keymaps/gbchk/keymap.c   |  6 +++---
 .../lfkeyboards/lfk87/keymaps/iso/keymap.c     |  6 +++---
 .../mini1800/keymaps/ca178858/keymap.c         |  6 +++---
 .../mini1800/keymaps/default/keymap.c          |  6 +++---
 .../lfkeyboards/smk65/keymaps/default/keymap.c |  6 +++---
 .../lfkeyboards/smk65/keymaps/iso/keymap.c     |  6 +++---
 .../jnao/keymaps/default/keymap.c              |  2 +-
 .../jnao/keymaps/default_4x12/keymap.c         |  2 +-
 .../maple_computing/jnao/keymaps/via/keymap.c  |  2 +-
 .../mechwild/clunker/keymaps/default/keymap.c  |  2 +-
 .../mechwild/clunker/keymaps/via/keymap.c      |  2 +-
 .../mechwild/waka60/keymaps/audio/keymap.c     |  6 +++---
 keyboards/mechwild/waka60/keymaps/via/keymap.c |  6 +++---
 keyboards/mitosis/keymaps/datagrok/keymap.c    |  4 ++--
 keyboards/mlego/m48/keymaps/default/keymap.c   |  4 ++--
 keyboards/mlego/m48/keymaps/via/keymap.c       |  4 ++--
 keyboards/moonlander/moonlander.c              |  2 +-
 keyboards/nack/keymaps/default/keymap.c        |  2 +-
 .../nack/keymaps/farfalleflickan/keymap.c      |  2 +-
 .../n87/keymaps/default/keymap.c               |  6 +++---
 .../n87/keymaps/symmetric_standard/keymap.c    |  6 +++---
 .../n87/keymaps/tsangan/keymap.c               |  6 +++---
 .../nightly_boards/n87/keymaps/via/keymap.c    |  6 +++---
 keyboards/orthodox/keymaps/default/keymap.c    |  4 ++--
 .../pearlboards/atlas/keymaps/default/keymap.c |  4 ++--
 .../pearlboards/atlas/keymaps/via/keymap.c     |  4 ++--
 .../pearlboards/pearl/keymaps/default/keymap.c |  4 ++--
 .../pearlboards/pearl/keymaps/via/keymap.c     |  4 ++--
 .../pearlboards/zeus/keymaps/default/keymap.c  |  6 +++---
 .../pearlboards/zeus/keymaps/via/keymap.c      |  6 +++---
 keyboards/planck/ez/ez.c                       |  2 +-
 keyboards/planck/keymaps/abhixec/keymap.c      |  8 ++++----
 keyboards/planck/keymaps/abishalom/keymap.c    |  8 ++++----
 keyboards/planck/keymaps/am/keymap.c           |  2 +-
 keyboards/planck/keymaps/ariccb/keymap.c       |  2 +-
 keyboards/planck/keymaps/aviator/keymap.c      |  2 +-
 keyboards/planck/keymaps/buhearns/keymap.c     |  4 ++--
 .../planck/keymaps/charlesrocket/keymap.c      |  4 ++--
 keyboards/planck/keymaps/coloneljesus/keymap.c |  4 ++--
 keyboards/planck/keymaps/corvec/keymap.c       |  4 ++--
 keyboards/planck/keymaps/dbroqua/keymap.c      |  2 +-
 keyboards/planck/keymaps/dcompact/keymap.c     |  2 +-
 .../planck/keymaps/dear_vehicle_owner/keymap.c |  4 ++--
 keyboards/planck/keymaps/default/keymap.c      |  8 ++++----
 keyboards/planck/keymaps/dodger/keymap.c       |  4 ++--
 keyboards/planck/keymaps/dr0ck/keymap.c        |  4 ++--
 keyboards/planck/keymaps/dr_notsokind/keymap.c |  4 ++--
 .../planck/keymaps/dudeofawesome/keymap.c      |  4 ++--
 keyboards/planck/keymaps/dvz/keymap.c          |  4 ++--
 keyboards/planck/keymaps/emiller/keymap.c      |  4 ++--
 keyboards/planck/keymaps/emilyh/keymap.c       |  2 +-
 keyboards/planck/keymaps/eshesh2/keymap.c      |  4 ++--
 keyboards/planck/keymaps/experimental/keymap.c |  2 +-
 keyboards/planck/keymaps/fabian/keymap.c       |  4 ++--
 .../planck/keymaps/foreveranapple/keymap.c     |  4 ++--
 keyboards/planck/keymaps/fsck/keymap.c         |  4 ++--
 keyboards/planck/keymaps/gitdrik/keymap.c      |  2 +-
 keyboards/planck/keymaps/grahampheath/keymap.c |  4 ++--
 keyboards/planck/keymaps/gunp/keymap.c         |  2 +-
 .../keymaps/handwired_binaryplease/keymap.c    |  2 +-
 keyboards/planck/keymaps/hvp/keymap.c          |  8 ++++----
 keyboards/planck/keymaps/impossible/keymap.c   |  4 ++--
 keyboards/planck/keymaps/ishtob/keymap.c       |  2 +-
 keyboards/planck/keymaps/jasperla/keymap.c     |  4 ++--
 keyboards/planck/keymaps/jdelkins/keymap.c     |  8 ++++----
 .../planck/keymaps/jetpacktuxedo/keymap.c      |  4 ++--
 keyboards/planck/keymaps/jhenahan/keymap.c     |  2 +-
 keyboards/planck/keymaps/jimmysjolund/keymap.c |  8 ++++----
 keyboards/planck/keymaps/jirgn/keymap.c        |  4 ++--
 keyboards/planck/keymaps/jweickm/keymap.c      |  8 ++++----
 keyboards/planck/keymaps/jweickm/readme.md     |  4 ++--
 keyboards/planck/keymaps/kelorean/keymap.c     |  4 ++--
 keyboards/planck/keymaps/kloki/keymap.c        |  4 ++--
 keyboards/planck/keymaps/kmontag42/keymap.c    |  4 ++--
 keyboards/planck/keymaps/kuatsure/keymap.c     |  2 +-
 keyboards/planck/keymaps/lja83/keymap.c        |  4 ++--
 keyboards/planck/keymaps/mgalisa/keymap.c      |  4 ++--
 keyboards/planck/keymaps/mikethetiger/keymap.c |  4 ++--
 keyboards/planck/keymaps/mjt/keymap.c          |  6 +++---
 keyboards/planck/keymaps/mjtnumsym/keymap.c    |  6 +++---
 keyboards/planck/keymaps/mjuma/keymap.c        |  4 ++--
 keyboards/planck/keymaps/mjuma/readme.md       |  6 +++---
 keyboards/planck/keymaps/msiu/keymap.c         |  4 ++--
 keyboards/planck/keymaps/muppetjones/keymap.c  |  6 +++---
 keyboards/planck/keymaps/muzfuz/keymap.c       |  4 ++--
 keyboards/planck/keymaps/mwpeterson/keymap.c   |  2 +-
 keyboards/planck/keymaps/myoung34/keymap.c     |  4 ++--
 keyboards/planck/keymaps/narze/keymap.c        |  2 +-
 .../planck/keymaps/not-quite-neo/keymap.c      |  2 +-
 keyboards/planck/keymaps/originerd/keymap.c    |  2 +-
 keyboards/planck/keymaps/oryx/keymap.c         |  4 ++--
 keyboards/planck/keymaps/pascamel/keymap.c     |  4 ++--
 keyboards/planck/keymaps/pevecyan/keymap.c     |  4 ++--
 keyboards/planck/keymaps/pickle_jr/README.md   |  2 +-
 keyboards/planck/keymaps/pickle_jr/keymap.c    |  6 +++---
 keyboards/planck/keymaps/pjanx/keymap.c        |  4 ++--
 keyboards/planck/keymaps/pok3r/keymap.c        |  4 ++--
 keyboards/planck/keymaps/premek/keymap.c       |  2 +-
 .../planck/keymaps/prog_qgmlwb/src/special.h   |  4 ++--
 keyboards/planck/keymaps/ptillemans/keymap.c   |  4 ++--
 keyboards/planck/keymaps/raffle/keymap.c       |  4 ++--
 keyboards/planck/keymaps/rodhaene/keymap.c     |  4 ++--
 keyboards/planck/keymaps/rootiest/keymap.c     | 12 ++++++------
 keyboards/planck/keymaps/sgoodwin/keymap.c     |  2 +-
 keyboards/planck/keymaps/sigul/keymap.c        |  4 ++--
 keyboards/planck/keymaps/skank/keymap.c        |  4 ++--
 keyboards/planck/keymaps/skug/keymap.c         |  4 ++--
 keyboards/planck/keymaps/smittey/keymap.c      |  2 +-
 keyboards/planck/keymaps/smt/keymap.c          |  2 +-
 .../planck/keymaps/spacebarracecar/keymap.c    |  2 +-
 keyboards/planck/keymaps/steno/keymap.c        |  4 ++--
 keyboards/planck/keymaps/stuartfong1/keymap.c  |  4 ++--
 keyboards/planck/keymaps/synth_sample/keymap.c |  4 ++--
 .../planck/keymaps/synth_wavetable/keymap.c    |  4 ++--
 .../planck/keymaps/that_canadian/keymap.c      |  2 +-
 keyboards/planck/keymaps/tk/keymap.c           |  4 ++--
 keyboards/planck/keymaps/tom/keymap.c          |  4 ++--
 keyboards/planck/keymaps/tomkonidas/keymap.c   |  4 ++--
 keyboards/planck/keymaps/unagi/keymap.c        |  4 ++--
 keyboards/planck/keymaps/vaire/keymap.c        |  2 +-
 keyboards/preonic/keymaps/0xdec/keymap.c       |  2 +-
 keyboards/preonic/keymaps/AlexDaigre/keymap.c  |  6 +++---
 keyboards/preonic/keymaps/arkag/keymap.c       |  4 ++--
 keyboards/preonic/keymaps/badger/keymap.c      |  2 +-
 .../preonic/keymaps/blake-newman/keymap.c      |  4 ++--
 keyboards/preonic/keymaps/boy314/keymap.c      |  6 +++---
 keyboards/preonic/keymaps/choromanski/config.h |  2 +-
 keyboards/preonic/keymaps/choromanski/keymap.c |  2 +-
 keyboards/preonic/keymaps/cranium/keymap.c     |  4 ++--
 keyboards/preonic/keymaps/default/keymap.c     |  4 ++--
 keyboards/preonic/keymaps/drasbeck/keymap.c    |  4 ++--
 .../preonic/keymaps/dudeofawesome/keymap.c     |  4 ++--
 keyboards/preonic/keymaps/ekis_isa/keymap.c    |  4 ++--
 keyboards/preonic/keymaps/elisiano/keymap.c    |  4 ++--
 keyboards/preonic/keymaps/fig-r/keymap.c       |  4 ++--
 keyboards/preonic/keymaps/fsck/keymap.c        |  4 ++--
 keyboards/preonic/keymaps/jpe230/keymap.c      |  4 ++--
 keyboards/preonic/keymaps/keelhauler/keymap.c  |  4 ++--
 keyboards/preonic/keymaps/kjwon15/keymap.c     |  4 ++--
 keyboards/preonic/keymaps/kuatsure/keymap.c    |  2 +-
 .../preonic/keymaps/laurentlaurent/keymap.c    |  6 +++---
 .../preonic/keymaps/mechmaster48/keymap.c      |  4 ++--
 keyboards/preonic/keymaps/mguterl/keymap.c     |  4 ++--
 .../preonic/keymaps/mikethetiger/keymap.c      |  4 ++--
 keyboards/preonic/keymaps/muzfuz/keymap.c      |  4 ++--
 keyboards/preonic/keymaps/mverteuil/keymap.c   |  4 ++--
 .../preonic/keymaps/mverteuil_2x2u/keymap.c    |  4 ++--
 keyboards/preonic/keymaps/nikchi/keymap.c      |  2 +-
 keyboards/preonic/keymaps/pezhore/keymap.c     |  4 ++--
 keyboards/preonic/keymaps/pitty/keymap.c       |  4 ++--
 keyboards/preonic/keymaps/pvillano/keymap.c    |  2 +-
 keyboards/preonic/keymaps/rmeli/keymap.c       |  2 +-
 keyboards/preonic/keymaps/senseored/keymap.c   |  4 ++--
 keyboards/preonic/keymaps/smt/keymap.c         |  2 +-
 .../preonic/keymaps/that_canadian/keymap.c     |  4 ++--
 keyboards/preonic/keymaps/via/keymap.c         |  2 +-
 keyboards/preonic/keymaps/zach/keymap.c        | 10 +++++-----
 keyboards/redox/keymaps/jeherve/keymap.c       |  2 +-
 keyboards/rgbkb/sol3/keymaps/default/keymap.c  |  2 +-
 keyboards/rgbkb/sol3/keymaps/via/keymap.c      |  2 +-
 keyboards/rocketboard_16/keycode_lookup.c      | 18 +++++++++---------
 keyboards/silverbullet44/keymaps/FKML/keymap.c |  4 ++--
 .../silverbullet44/keymaps/default/keymap.c    |  4 ++--
 .../splitkb/kyria/keymaps/drashna/keymap.c     |  2 +-
 .../splitkb/zima/keymaps/default/keymap.c      |  2 +-
 .../splitkb/zima/keymaps/drashna/keymap.c      |  2 +-
 keyboards/splitkb/zima/keymaps/via/keymap.c    |  2 +-
 keyboards/subatomic/keymaps/default/keymap.c   |  4 ++--
 keyboards/unison/keymaps/via/keymap.c          |  4 ++--
 .../work_board/keymaps/default/keymap.c        |  4 ++--
 .../work_board/keymaps/via/keymap.c            |  2 +-
 keyboards/xiudi/xd75/keymaps/fabian/keymap.c   |  4 ++--
 keyboards/xw60/keymaps/default/keymap.c        |  2 +-
 keyboards/xw60/keymaps/pingjunior/keymap.c     |  2 +-
 .../yanghu/unicorne/keymaps/bcat/keymap.c      |  4 ++--
 .../lunakey_macro/keymaps/via/keymap.c         |  4 ++--
 243 files changed, 484 insertions(+), 484 deletions(-)

diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
index b43a13d976..f17cc50a7b 100644
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [_ADJUST] = LAYOUT_ortho_3x10(
     QK_BOOT,  _______,  _______,  _______,  _______,  QWERTY,   NUMBERS,  SYMBOLS,  PLOVER,    SONGS,
-    MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   _______,  _______,  _______,  _______,  MACSLEEP,  _______,
+    AU_PREV,  AU_NEXT,  MU_ON,    MU_OFF,   _______,  _______,  _______,  _______,  MACSLEEP,  _______,
     BACKLIT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______
   )
 };
diff --git a/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c b/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c
index c3955bf0b1..a41895d1e9 100644
--- a/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c
+++ b/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT_all(
-        KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, HPT_TOG,
+        KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, HF_TOGG,
         KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/ai03/lunar_ii/keymaps/default/keymap.c b/keyboards/ai03/lunar_ii/keymaps/default/keymap.c
index 261c999da7..222a8f99a5 100644
--- a/keyboards/ai03/lunar_ii/keymaps/default/keymap.c
+++ b/keyboards/ai03/lunar_ii/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
 		KC_CAPS, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______,
 		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
-		_______,          HPT_TOG, HPT_FBK, HPT_DWLI, HPT_DWLD, _______, _______, _______, _______, _______, _______,                 _______,
+		_______,          HF_TOGG, HF_FDBK, HF_DWLU, HF_DWLD, _______, _______, _______, _______, _______, _______,                   _______,
 		_______, _______, _______,                                     _______,                                     _______, _______, _______
     )
 };
diff --git a/keyboards/ai03/lunar_ii/keymaps/via/keymap.c b/keyboards/ai03/lunar_ii/keymaps/via/keymap.c
index 58fe4c7ecb..644a637584 100644
--- a/keyboards/ai03/lunar_ii/keymaps/via/keymap.c
+++ b/keyboards/ai03/lunar_ii/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
 		KC_CAPS, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______,
 		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
-		_______,          HPT_TOG, HPT_FBK, HPT_DWLI, HPT_DWLD, _______, _______, _______, _______, _______, _______,                 _______,
+		_______,          HF_TOGG, HF_FDBK, HF_DWLU, HF_DWLD, _______, _______, _______, _______, _______, _______,                   _______,
 		_______, _______, _______,                                     _______,                                     _______, _______, _______
     ),
 	[2] = LAYOUT(
diff --git a/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
index f3fa391105..6e439a6286 100755
--- a/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
@@ -162,8 +162,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT( \
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL, \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______,          _______,          _______,          _______, _______, _______ \
 )
 };
diff --git a/keyboards/boston_meetup/2019/keymaps/default/keymap.c b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
index 87ca92f02f..b4d7280640 100644
--- a/keyboards/boston_meetup/2019/keymaps/default/keymap.c
+++ b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
@@ -97,9 +97,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT(
   QK_BOOT,
-  HPT_TOG, HPT_FBK,  HPT_RST, KC_BSPC,
-  _______, HPT_MODI, XXXXXXX, XXXXXXX,
-  _______, HPT_MODD, CK_TOGG, KC_DEL
+  HF_TOGG, HF_FDBK, HF_RST,  KC_BSPC,
+  _______, HF_NEXT, XXXXXXX, XXXXXXX,
+  _______, HF_PREV, CK_TOGG, KC_DEL
 ),
 
 
diff --git a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
index 3f5ebc8655..aa4bfdf9b7 100755
--- a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
+++ b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______, _______, _______,
         _______,  _______, _______, TG(_MUSIC_4_LIFE),
         MU_OFF,   _______, _______, _______,
-        MU_ON,    _______, _______, MU_MOD
+        MU_ON,    _______, _______, MU_NEXT
     ),
     /* MUSIC_4_LIFE
      * ,-----------------------.
diff --git a/keyboards/ckeys/obelus/keymaps/default/keymap.c b/keyboards/ckeys/obelus/keymaps/default/keymap.c
index aca0966855..4ee9a5f710 100644
--- a/keyboards/ckeys/obelus/keymaps/default/keymap.c
+++ b/keyboards/ckeys/obelus/keymaps/default/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    MU_TOG,   MU_MOD, XXXXXXX, TO(0)
+    MU_TOGG, MU_NEXT, XXXXXXX, TO(0)
   ),
 };
 
diff --git a/keyboards/ckeys/thedora/keymaps/default/keymap.c b/keyboards/ckeys/thedora/keymaps/default/keymap.c
index 7699fda766..afe2e02793 100755
--- a/keyboards/ckeys/thedora/keymaps/default/keymap.c
+++ b/keyboards/ckeys/thedora/keymaps/default/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_P7,    KC_P8  , KC_P9  , KC_PSLS, MO(_ADMIN),
                 KC_P4,    KC_P5  , KC_P6  , KC_PAST, TG(_MOUSE),
                 KC_P1,    KC_P2  , KC_P3  , KC_PMNS, TG(_MIDI),
-        MU_TOG, KC_P0,    KC_PDOT, KC_PEQL, KC_PPLS, MO(_MUSIC)
+        MU_TOGG,KC_P0,    KC_PDOT, KC_PEQL, KC_PPLS, MO(_MUSIC)
     ),
 
     // MUSIC LAYER
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MUSIC] = LAYOUT(
                  _______, _______, _______, _______, _______,
                  _______, _______, _______, _______, _______,
-                 _______, _______, _______, _______, MU_MOD,
+                 _______, _______, _______, _______, MU_NEXT,
         _______, KC_LCTL, KC_LALT, _______, KC_LGUI, _______
     ),
 
diff --git a/keyboards/contra/keymaps/alper/keymap.c b/keyboards/contra/keymaps/alper/keymap.c
index 6cfe83ffe6..1ffa892dfd 100644
--- a/keyboards/contra/keymaps/alper/keymap.c
+++ b/keyboards/contra/keymaps/alper/keymap.c
@@ -138,8 +138,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] = LAYOUT_planck_mit(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
   )
 
diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c
index 60fbe4ba8b..e8e967b0d6 100644
--- a/keyboards/contra/keymaps/default/keymap.c
+++ b/keyboards/contra/keymaps/default/keymap.c
@@ -162,8 +162,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] = LAYOUT_planck_mit(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
   )
 
diff --git a/keyboards/crkbd/keymaps/gotham/keymap.c b/keyboards/crkbd/keymaps/gotham/keymap.c
index c58e7b10ec..4e8dd5e9b3 100644
--- a/keyboards/crkbd/keymaps/gotham/keymap.c
+++ b/keyboards/crkbd/keymaps/gotham/keymap.c
@@ -51,11 +51,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_split_3x6_3(
   //|-----------------------------------------------------|                    |-----------------------------------------------------|
-     XXXXXXX, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG, RGB_TOG,                       MU_TOG, KC_F12,  KC_F7,   KC_F8,   KC_F9,   XXXXXXX,\
+     XXXXXXX, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG, RGB_TOG,                      MU_TOGG, KC_F12,  KC_F7,   KC_F8,   KC_F9,   XXXXXXX,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,                       MU_MOD, KC_F11,  KC_F4,   KC_F5,   KC_F6,   QK_BOOT,  \
+     XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,                      MU_NEXT, KC_F11,  KC_F4,   KC_F5,   KC_F6,   QK_BOOT,  \
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGBRST,                        AU_TOG, KC_F10,  KC_F1,   KC_F2,   KC_F3,   _______,\
+     XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGBRST,                       AU_TOGG, KC_F10,  KC_F1,   KC_F2,   KC_F3,   _______,\
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                          _______, _______, _______,    _______, KC_VOLD, KC_VOLU \
                                       //|--------------------------|  |--------------------------|
diff --git a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
index e1ed2c0749..975eacaebc 100644
--- a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
@@ -195,8 +195,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_plaid_grid(
     QK_BOOT,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/dm9records/plaid/keymaps/default/keymap.c b/keyboards/dm9records/plaid/keymaps/default/keymap.c
index aa0bd8b093..1c58053eba 100644
--- a/keyboards/dm9records/plaid/keymaps/default/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/default/keymap.c
@@ -194,8 +194,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_plaid_grid(
     QK_BOOT,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
index 4d26c7adc7..0d1ec2b762 100644
--- a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
@@ -92,8 +92,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_LOWER] = LAYOUT_plaid_grid( // F, media keys, reset
     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, QK_BOOT,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, QK_BOOT,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, AUTOCLICK
 )
 };
diff --git a/keyboards/ein_60/keymaps/klackygears/keymap.c b/keyboards/ein_60/keymaps/klackygears/keymap.c
index 345b420c6f..ab5a31ee9f 100644
--- a/keyboards/ein_60/keymaps/klackygears/keymap.c
+++ b/keyboards/ein_60/keymaps/klackygears/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_WINBASE] = LAYOUT_wrapper(
       KC_ESC,  _______________DVORAK_L1___________________,   KC_MUTE,  _______________DVORAK_R1___________________, KC_BSPC,
-      AU_TOG,  _______________DVORAK_L2___________________,             _______________DVORAK_R2___________________, RGB_TOG,
+      AU_TOGG, _______________DVORAK_L2___________________,             _______________DVORAK_R2___________________, RGB_TOG,
       CK_TOGG, _______________WINDVK_L3___________________,             _______________WINDVK_R3___________________, RGB_MOD,
       KC_1,    KC_2,    KC_3,    ________WIN_THUMB_L______,   KC_SPC,   ________WIN_THUMB_R______,    KC_1,    KC_2, KC_GAMER
     ),
@@ -79,8 +79,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_MDIA] = LAYOUT_wrapper(
       _______, _________________LYOUT_____________________,    _______,  _________________RGB_1_____________________, RGB_TOG,
-      _______, MU_TOG, _______, _______, _______,    CK_UP,              _________________RGB_2_____________________, _______,
-      RGB_MOD, MU_MOD,  MU_TOG,  CK_TOGG,  CK_RST, CK_DOWN,              _________________MEDIA_____________________, _______,
+      _______, MU_TOGG, _______, _______, _______,   CK_UP,              _________________RGB_2_____________________, _______,
+      RGB_MOD, MU_NEXT, MU_TOGG, CK_TOGG,  CK_RST, CK_DOWN,              _________________MEDIA_____________________, _______,
       _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______, _______, _______, _______
     )
 
diff --git a/keyboards/evyd13/plain60/keymaps/audio/keymap.c b/keyboards/evyd13/plain60/keymaps/audio/keymap.c
index f6d71f63de..8383caeb07 100644
--- a/keyboards/evyd13/plain60/keymaps/audio/keymap.c
+++ b/keyboards/evyd13/plain60/keymaps/audio/keymap.c
@@ -23,5 +23,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
-  AU_TOG,  MU_TOG,  MU_MOD,                             CK_TOGG,                            _______, _______, _______, _______)
+  AU_TOGG, MU_TOGG, MU_NEXT,                            CK_TOGG,                            _______, _______, _______, _______)
 };
diff --git a/keyboards/fractal/keymaps/default/keymap.c b/keyboards/fractal/keymaps/default/keymap.c
index d720f85509..ec54dfb78d 100644
--- a/keyboards/fractal/keymaps/default/keymap.c
+++ b/keyboards/fractal/keymaps/default/keymap.c
@@ -158,9 +158,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/hadron/ver2/keymaps/default/keymap.c b/keyboards/hadron/ver2/keymaps/default/keymap.c
index 535db7e2ee..44291f46ca 100644
--- a/keyboards/hadron/ver2/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/default/keymap.c
@@ -189,7 +189,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   QK_BOOT,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
index 3c7e5f8a8d..d302d125cd 100644
--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -192,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   QK_BOOT,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, \
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,  KC_DEL, _______, _______, _______, \
   _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP,  QWERTY, _______, _______, _______, _______, _______, _______, _______, \
-  _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
 )
 
diff --git a/keyboards/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c
index 5b96da8356..41af0d1aa1 100644
--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
@@ -182,10 +182,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-  QK_BOOT,   HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST , _______, _______, _______, _______, _______, EE_CLR,
+  QK_BOOT, HF_TOGG, HF_FDBK, HF_NEXT, HF_PREV, HF_RST,  _______, _______, _______, _______, _______, EE_CLR,
   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG
 )
 
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index 673531f7c7..fae3630039 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -165,10 +165,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_wrapper(
-  _______, HPT_TOG, HPT_FBK, HPT_MODI, HPT_MODD, HPT_RST, _______, _______, _______, _______, _______, EE_CLR, \
+  _______, HF_TOGG, HF_FDBK, HF_NEXT, HF_PREV, HF_RST,  _______, _______, _______, _______, _______, EE_CLR, \
   QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
   _______, MAGIC_TOGGLE_NKRO, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF, _______, _______, _______,  _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG\
 )
 
diff --git a/keyboards/handwired/aranck/keymaps/default/keymap.c b/keyboards/handwired/aranck/keymaps/default/keymap.c
index 9e732dd0b4..fd0798b3c3 100644
--- a/keyboards/handwired/aranck/keymaps/default/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/default/keymap.c
@@ -154,10 +154,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, EE_CLR,  _______, _______, _______, _______, _______, _______,  _______, _______,  KC_DEL,
-    _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
-    _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
+    _______, QK_BOOT, EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
index 496cde905a..ea44b75094 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/aranck/keymaps/turkishish/keymap.c
@@ -207,9 +207,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_mit(
     _______, QK_BOOT, EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
-    _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c
index 52a450c3a0..6feed5e070 100644
--- a/keyboards/handwired/atreus50/keymaps/default/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/default/keymap.c
@@ -85,9 +85,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------'
  */
   [_ADJUST] = LAYOUT(
-    _______, QK_BOOT,   RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,                   RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL,
+    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,                   RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL,
     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,                     MI_OFF,  _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,                     MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
 
diff --git a/keyboards/handwired/heisenberg/keymaps/default/keymap.c b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
index cc214f98f0..91e6f8a24f 100644
--- a/keyboards/handwired/heisenberg/keymaps/default/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/default/keymap.c
@@ -154,10 +154,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, EE_CLR,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
-    _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
+    _______, QK_BOOT, EE_CLR,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
index 0aa6e56a06..0ce2b947d7 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c
@@ -206,10 +206,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, EE_CLR,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON, AU_OFF, _______, _______, _______,  _______,  _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF, _______, _______, _______, _______, _______,  _______,  _______,
-    _______, _______, _______, _______, _______,      _______,     _______, _______,  _______, _______, _______
+    _______, QK_BOOT, EE_CLR,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
index 714491d305..8b99267650 100644
--- a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
@@ -74,8 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [3] = LAYOUT(
                       KC_F1,    KC_F2,  KC_F3,                KC_F4,                KC_F5,                KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,
                       KC_F13,   KC_F14, KC_F15,               KC_F16,               KC_F17,               KC_F18,   KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,     KC_F24,
-    MU_TOG, KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
-    MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,  KC_NO,    KC_NO,    KC_PGUP,  KC_DEL,   KC_NO,    KC_NO,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
+    MU_TOGG,KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
+    MU_NEXT,KC_NO,    KC_TAB,   KC_NO,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,  KC_NO,    KC_NO,    KC_PGUP,  KC_DEL,   KC_NO,    KC_NO,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,      KC_AUDIO_MUTE,        KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_SCLN,    KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
     KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
     KC_NO,  KC_NO,    KC_LCTL,  KC_LGUI,                                                                            KC_SPC,                                 KC_RALT,    KC_CAPS,                               KC_DOWN,             LSFT(KC_A),             KC_PDOT
@@ -97,8 +97,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [4] = LAYOUT(
                       KC_F13,   KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22,   KC_F23, KC_F24,
                       KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_F11, KC_F12,
-    MU_TOG, TO(0),    KC_DLR,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
-    MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
+    MU_TOGG,TO(0),    KC_DLR,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
+    MU_NEXT,KC_NO,    KC_TAB,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
     KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_COMMA, KC_DOT, KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
     KC_NO,  KC_LGUI,  KC_LCTL,  KC_LALT,                                                  KC_SPC,                 KC_RALT,  KC_RCTL,                     KC_DOWN,             LSFT(KC_A),             KC_PDOT
diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
index aeecfa1d8e..f043bd1be2 100644
--- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12 , _______,
   _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
index 092422f065..cfd176a9d5 100644
--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -519,8 +519,8 @@ KC_PAUS
 [_ADJUST] = LAYOUT(
   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,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,  AU_OFF, AG_NORM, AG_SWAP, QWERTY,    XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,  MU_OFF,   MI_ON,  MI_OFF,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,    XXXXXXX, XXXXXXX, XXXXXXX, _______,
+  XXXXXXX, XXXXXXX, XXXXXXX, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, _______, _______, _______, _______,     _______,        _______,       _______, _______, _______, _______, _______
 )
 ,
diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
index 73ac314853..25ae840b79 100644
--- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
@@ -200,7 +200,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, _______, _______, _______, _______,     _______,            _______,    _______,_______,_______, _______, _______
 )
 
diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
index 728f4540b8..a5bb69ef24 100644
--- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
@@ -455,7 +455,7 @@ KC_PAUS
   _______, _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, AU_PREV,  AU_NEXT,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   XXXXXXX, _______, _______, _______, _______,     _______,            _______,    _______,_______,_______, _______, _______
 )
 ,
diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
index a79aa62902..4101bb7b02 100644
--- a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
@@ -161,8 +161,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_4x12_1x2uC(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______,  _______, _______, _______,
     _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
 )
 
diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
index 5bb4b4a666..d3fadcace2 100644
--- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
@@ -158,8 +158,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______,  _______, KC_DEL,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
     _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
 )
diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
index 4a298fb480..c1ff5682fc 100644
--- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
@@ -158,8 +158,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______,  _______, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
+    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______,  _______, KC_DEL,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
     _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
 )
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
index bb873a33f7..1ea0eba7d3 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
@@ -108,8 +108,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         QK_MAKE, _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, QK_BOOT,
         VRSN,    _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, EE_CLR,
         UC_NEXT, _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, TG_MODS,
-                          HPT_DWLI, HPT_DWLD,                                                        TG_GAME, TG_DBLO,
-                                            HPT_TOG, HPT_BUZ,                               KC_NUKE,
+                          HF_DWLU, HF_DWLD,                                                        TG_GAME, TG_DBLO,
+                                            HF_TOGG, HF_BUZZ,                               KC_NUKE,
                                                      _______, _______,             _______,
                                                      _______, _______,    KC_NUKE, _______
     ),
diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
index 1fb29d5a4a..9cdbc872ae 100644
--- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
+++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
@@ -42,7 +42,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_BSPC,
     KC_LCTL,          KC_A,    KC_S,    KC_D,    LT2_F,   KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    RSF_SCL, LT3_QOT, KC_ENT,
     KC_LSFT, TG4,     KC_Z,    KC_X,    KC_C,    LT3_V,   KC_B,         LT2_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-    KC_BTN1, KC_BTN2, KC_LALT,          LGU_NCV, LT1_SPC,               RCT_ESC, RGU_ENT, RAL_CNV, KC_INT1, KC_DEL,           MU_TOG
+    KC_BTN1, KC_BTN2, KC_LALT,          LGU_NCV, LT1_SPC,               RCT_ESC, RGU_ENT, RAL_CNV, KC_INT1, KC_DEL,           MU_TOGG
   ),
 
   // Layer 1, Space-modifiers: Basic keys
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     QK_BOOT,          KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP,      KC_BTN2, KC_INT1, KC_MINS, KC_EQL,  KC_INT3, SFT_LBR, KC_TRNS,
     KC_TRNS,          KC_AGIN, KC_FIND, KC_PGUP, KC_PGDN, KC_F19,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_ENT,  SFT_7,   SFT_2,
     KC_TRNS, KC_TRNS, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, KC_APP,       KC_BSPC, KC_DEL,  KC_RBRC, KC_BSLS, KC_HOME,          KC_END,
-    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,               RCT_IN7, RGU_IN8, KC_TRNS, KC_INT2, KC_INT4,          MU_MOD
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,               RCT_IN7, RGU_IN8, KC_TRNS, KC_INT2, KC_INT4,          MU_NEXT
   ),
 
   // Layer 2, F,N-modifiers: Number keys and symbols
diff --git a/keyboards/handwired/xealous/keymaps/default/keymap.c b/keyboards/handwired/xealous/keymaps/default/keymap.c
index debf43e1a2..88aa4ddfc9 100644
--- a/keyboards/handwired/xealous/keymaps/default/keymap.c
+++ b/keyboards/handwired/xealous/keymaps/default/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_GRV,    KC_F1,    KC_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_PGUP,    KC_UP,  KC_PGDN,    KC_PSCR, KC_SCRL,  KC_PAUS,  _______,
     _______,  KC_LEFT,  KC_DOWN,KC_RIGHT,  _______,  KC_HOME,  KC_HOME,  KC_LEFT,  KC_DOWN, KC_RIGHT,    KC_INS,  KC_DEL,             _______,
-    _______,  _______,  _______, _______,  _______,  KC_END,   KC_END,   AU_TOG,  KC_VOLD,  KC_VOLU,    KC_MUTE,                     _______,
+    _______,  _______,  _______, _______,  _______,  KC_END,   KC_END,   AU_TOGG,  KC_VOLD,  KC_VOLU,    KC_MUTE,                     _______,
     _______,  _______,  _______, _______,           _______,             _______,  _______,              _______, _______,  _______
   )
 
diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c
index bc56dffb85..21418f2d2f 100644
--- a/keyboards/helix/pico/keymaps/default/keymap.c
+++ b/keyboards/helix/pico/keymaps/default/keymap.c
@@ -157,8 +157,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------------------------------------------------------------------------------------'
    */
   [_ADJUST] =  LAYOUT(
-      _______, QK_BOOT,   RGBRST, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-      _______, AU_ON,   AU_OFF,  MU_TOG,  MU_MOD,  AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+      _______, QK_BOOT,   RGBRST, _______, _______, _______,                  _______, _______, _______, _______, _______, _______,
+      _______, AU_ON,   AU_OFF,  MU_TOGG, MU_NEXT, AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
       _______, CK_TOGG, CK_RST,  CK_UP,   CK_DOWN, _______,                   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
       )
diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
index cca79fd7ed..962acc1810 100644
--- a/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_ansi/keymap.c
@@ -127,8 +127,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJUST] = LAYOUT_ansi(
         _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,    _______,WIN,    _______,QK_BOOT,  _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,_______,   _______,_______,
-        _______,    AU_TOG, CK_TOGG,MU_TOG, MU_MOD, _______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,_______,            _______,
+        _______,    _______,WIN,    _______,QK_BOOT,_______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,_______,   _______,_______,
+        _______,    AU_TOGG,CK_TOGG,MU_TOGG,MU_NEXT,_______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,_______,            _______,
         _______,        CK_RST, CK_DOWN,CK_UP  ,_______,_______,NUM,     MAC,   _______,_______,_______,_______,_______,_______,
         _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,_______,_______,_______
     )
diff --git a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
index c4b92353de..6e06dfe897 100644
--- a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
+++ b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c
@@ -129,8 +129,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJUST] = LAYOUT_jp(
         _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,    _______,WIN,    _______,QK_BOOT,  _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,           _______,_______,
-        _______,    AU_TOG, CK_TOGG,MU_TOG, MU_MOD, _______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,_______,    _______,_______,
+        _______,    _______,WIN,    _______,QK_BOOT,_______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,           _______,_______,
+        _______,    AU_TOGG,CK_TOGG,MU_TOGG,MU_NEXT,_______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,_______,    _______,_______,
         _______,        CK_RST, CK_DOWN,CK_UP  ,_______,_______,NUM,     MAC,   _______,_______,_______,_______,_______,_______,
         _______,_______,_______,_______,        _______,        _______,        _______,_______,_______,_______,_______,_______
     )
diff --git a/keyboards/jones/v1/keymaps/default/keymap.c b/keyboards/jones/v1/keymaps/default/keymap.c
index 32dfd00180..04da840a77 100644
--- a/keyboards/jones/v1/keymaps/default/keymap.c
+++ b/keyboards/jones/v1/keymaps/default/keymap.c
@@ -56,8 +56,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT(
         _______,   RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,
             _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
-            _______,    AU_TOG,   CK_TOGG,  MU_TOG,   MU_MOD,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
-        KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    MUV_DE,   MUV_IN,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+            _______,    AU_TOGG,  CK_TOGG,  MU_TOGG,  MU_NEXT,  _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
+        KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    AU_PREV,  AU_NEXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
         _______,  _______,                                                                                                                _______,  _______
     )
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
index 68abc04e3d..00277bb7b1 100644
--- a/keyboards/jones/v1/keymaps/via/keymap.c
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT(
         _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,
             _______,    DF(_BASE1),DF(_BASE2),DF(_BASE3),_______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
-            _______,    AU_TOG,   CK_TOGG,  MU_TOG,   MU_MOD,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
+            _______,    AU_TOGG,   CK_TOGG,  MU_TOGG,   MU_NEXT,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
         KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
         _______,  _______,                                                                                                                _______,  _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
index ed43442307..3735744368 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
@@ -164,8 +164,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_mit(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, 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,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
index f8bb3388fd..fb82d320a4 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
@@ -163,8 +163,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_mit(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, 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,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/keebio/iris/keymaps/blucky/keymap.c b/keyboards/keebio/iris/keymaps/blucky/keymap.c
index b81e840769..2736048b4b 100644
--- a/keyboards/keebio/iris/keymaps/blucky/keymap.c
+++ b/keyboards/keebio/iris/keymaps/blucky/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_NO,    KC_NO, C(KC_LEFT), KC_NO, C(KC_RGHT), KC_NO,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_NO,   KC_INS,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_RSFT,  KC_NO,    WM_5,    WM_4,    WM_3,    WM_2,   MU_TOG,            AU_TOG,  KC_NO,  KC_NO,   KC_LBRC, KC_RBRC, KC_BSLS, KC_NO,
+     KC_RSFT,  KC_NO,    WM_5,    WM_4,    WM_3,    WM_2,   MU_TOGG,           AU_TOGG, KC_NO,  KC_NO,   KC_LBRC, KC_RBRC, KC_BSLS, KC_NO,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                       WM_1,  KC_LGUI,  KC_PIPE,                   KC_UNDS, KC_RCTL, KC_RALT
   //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
       KC_NO,   KC_NO,   KC_NO,   KC_NO,    CS_D,  S(KC_PGDN),                         RGB_VAD, RGB_HUD, RGB_SAD,  KC_NO,   KC_NO,   KC_NO,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_VOLD, KC_VOLU, KC_MUTE, KC_BRID, KC_BRIU,  MU_MOD,           AU_OFF,  KC_RCTL, KC_LCTL, KC_RALT, KC_LALT, KC_DEL,  KC_NO,
+     KC_LSFT, KC_VOLD, KC_VOLU, KC_MUTE, KC_BRID, KC_BRIU,  MU_NEXT,          AU_OFF,  KC_RCTL, KC_LCTL, KC_RALT, KC_LALT, KC_DEL,  KC_NO,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                       WM_6,  VK_TOGG, RGB_MOD,                   RGB_TOG, BL_TOGG,  BL_STEP
   //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/levinson/keymaps/dcompact/keymap.c b/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
index 74b554ba34..150f610492 100644
--- a/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] =  LAYOUT_ortho_4x12( \
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
   _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP, RGB_TOG, RGB_MOD, _______, _______, _______, \
-  _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 
diff --git a/keyboards/keebio/nyquist/keymaps/default_4x12/keymap.c b/keyboards/keebio/nyquist/keymaps/default_4x12/keymap.c
index da2b79e3c2..ac270cdc50 100644
--- a/keyboards/keebio/nyquist/keymaps/default_4x12/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/default_4x12/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12(
   TSKMGR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
index 78ccf0b6ed..7c2e4eaae0 100644
--- a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
@@ -101,8 +101,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
 )
 
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
index a34d28ee47..cc9f3f82eb 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_MEDIA] = LAYOUT_ortho_5x7(
-      QK_MAKE, QK_BOOT, MU_TOG,  AU_ON,   AU_OFF,  CK_TOGG, RGB_SAD,
+      QK_MAKE, QK_BOOT, MU_TOGG, AU_ON,   AU_OFF,  CK_TOGG, RGB_SAD,
       _______, EE_CLR, KC_RGB_T,RGB_M_P, RGB_M_B, RGB_M_R, RGB_SAI,
       RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_HUD,
       KC_MPLY, KC_MPRV, KC_MNXT, RGB_M_X, RGB_M_G, RGB_M_P, RGB_HUI,
diff --git a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
index 0b09ba64ee..6cf4560e31 100644
--- a/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/o4l_5x12/keymaps/default/keymap.c
@@ -92,9 +92,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_ADJUST] = LAYOUT_ortho_5x12(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,_______, _______, KC_DEL,
-        _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-        _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+        _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+        _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+        _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/keyprez/rhino/keymaps/default/keymap.c b/keyboards/keyprez/rhino/keymaps/default/keymap.c
index 51602218ea..3644b8c9f4 100644
--- a/keyboards/keyprez/rhino/keymaps/default/keymap.c
+++ b/keyboards/keyprez/rhino/keymaps/default/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, KC_DEL,  KC_PSCR,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-                 MU_TOG,  MU_MOD,  _______, _______,     _______,           _______,     KC_MUTE, KC_VOLU, KC_VOLD, KC_MPLY
+                 MU_TOGG, MU_NEXT, _______, _______,     _______,           _______,     KC_MUTE, KC_VOLU, KC_VOLD, KC_MPLY
     ),
 
     /* LOWER Layer
diff --git a/keyboards/keyprez/rhino/keymaps/default_7u/keymap.c b/keyboards/keyprez/rhino/keymaps/default_7u/keymap.c
index 1748d4590a..dc284d9a33 100644
--- a/keyboards/keyprez/rhino/keymaps/default_7u/keymap.c
+++ b/keyboards/keyprez/rhino/keymaps/default_7u/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, _______, KC_UP,   _______, _______, _______,
         _______,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_PSCR,
         _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-                  MU_TOG,  MU_MOD,                             _______,                                   _______, _______
+                  MU_TOGG, MU_NEXT,                            _______,                                   _______, _______
     ),
 
     /* LOWER Layer
diff --git a/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c b/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
index 8a384607ae..d9f4c178f0 100644
--- a/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
+++ b/keyboards/keyprez/rhino/keymaps/default_ergo/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, KC_PSCR,
         _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, QK_BOOT,
-                 MU_TOG,  MU_MOD,  _______, _______,     _______,           _______,     KC_MUTE, KC_VOLU, KC_VOLD, KC_MPLY
+                 MU_TOGG, MU_NEXT, _______, _______,     _______,           _______,     KC_MUTE, KC_VOLU, KC_VOLD, KC_MPLY
     ),
 
     /* LOWER Layer
diff --git a/keyboards/keysofkings/twokey/keymaps/default/keymap.c b/keyboards/keysofkings/twokey/keymaps/default/keymap.c
index b01d1798b2..d23f85971a 100644
--- a/keyboards/keysofkings/twokey/keymaps/default/keymap.c
+++ b/keyboards/keysofkings/twokey/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	LAYOUT(
 		TO(0),
-		CK_TOGG, MU_TOG),
+		CK_TOGG, MU_TOGG),
 
 	LAYOUT(
 		TO(0),
diff --git a/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c b/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
index 29df5f5713..44b561d642 100644
--- a/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
+++ b/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LT(_LN, KC_ESC), _______, _______, _______, _______, _______, _______,  _______, KC_MINS, QK_BOOT,
     KC_TAB,  _______, _______, _______, _______, _______, _______, _______, LSFT(KC_MINS),    KC_BSLS,
     KC_LSFT, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC,          KC_QUOT,
-    AU_TOG,  CK_TOGG , _______, _______, _______, _______, _______, _______, _______,          _______,
+    AU_TOGG, CK_TOGG, _______, _______, _______, _______, _______, _______, _______,          _______,
                   _______,            KC_LALT,        RGB_MOD,              _______
   ),
 
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
index 318cc7f9e2..22e037b6f7 100644
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
@@ -205,8 +205,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_F1,     KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_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_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,    PLOVER,   _______,
-    KC_HOME,  _______,   MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,   _______,  _______,
+    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,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______
   )
 };
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
index 5845b8f944..813c801f57 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_mit(
     QK_BOOT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______,
     KC_CAPS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, QWERTY,  DVORAK,  COLEMAK, WORKMAN, MIDI,
-    _______, MI_ON,   MI_OFF,  MI_TOGG, MU_ON,   MU_OFF,  MU_TOG,  MU_MOD,  AU_ON,   AU_OFF,  _______, _______,
+    _______, MI_ON,   MI_OFF,  MI_TOGG, MU_ON,   MU_OFF,  MU_TOGG, MU_NEXT, AU_ON,   AU_OFF,  _______, _______,
     RGB_TOG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/lets_split/keymaps/fabian/keymap.c b/keyboards/lets_split/keymaps/fabian/keymap.c
index fde91d1fe0..bad1f491ef 100644
--- a/keyboards/lets_split/keymaps/fabian/keymap.c
+++ b/keyboards/lets_split/keymaps/fabian/keymap.c
@@ -172,8 +172,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT( \
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL , \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, 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,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
 )
 
diff --git a/keyboards/lets_split/keymaps/poker/keymap.c b/keyboards/lets_split/keymaps/poker/keymap.c
index 3d07c473e3..2f6b24f40b 100644
--- a/keyboards/lets_split/keymaps/poker/keymap.c
+++ b/keyboards/lets_split/keymaps/poker/keymap.c
@@ -148,8 +148,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  [_ADJUST] = LAYOUT( \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______,  _______, \
-  KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  KC_CAPS, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
  )
 
diff --git a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
index d2c1f9db6b..30928d73da 100644
--- a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
@@ -42,9 +42,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [FUNC] = LAYOUT_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_F14,
-        MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
-        AU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          QK_BOOT,   RGB_MOD,
-        _______,          _______, _______, _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
+        MU_NEXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
+        AU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          QK_BOOT, RGB_MOD,
+        _______,          _______, _______, _______, _______, _______, _______, MU_TOGG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
index e82e456dab..4b0a7e2196 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [SETTINGS] = LAYOUT(
         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, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RGB_MOD, RGB_VAD,
-        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
+        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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
+        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,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
index b44b73a298..7db914604d 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [SETTINGS] = LAYOUT_iso(
         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, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RGB_MOD, RGB_VAD,
-        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
+        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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
index 1cfc6a7d1e..00e292d61f 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [SETTINGS] = LAYOUT_split_bs(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX,          RGB_TOG, RGB_VAI,
-        XXXXXXX, XXXXXXX, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG,                   RGB_MOD, RGB_VAD,
-        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                   RGB_HUI,
+        XXXXXXX, XXXXXXX, MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG,                   RGB_MOD, RGB_VAD,
+        XXXXXXX, XXXXXXX, AU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
+        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,                   RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
index 401e2b9d5c..88aa97da70 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
@@ -49,16 +49,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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, BL_DOWN, BL_UP,   BL_TOGG,          RGB_TOG, RGB_VAI,
-        KC_TRNS, KC_TRNS, MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_MOD, RGB_VAD,
-        KC_TRNS, KC_TRNS, AU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
+        KC_TRNS, KC_TRNS, MU_NEXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_MOD, RGB_VAD,
+        KC_TRNS, KC_TRNS, AU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
     ),
     [3] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_UP,   BL_TOGG,          RGB_TOG, RGB_VAI,
-        KC_TRNS, KC_TRNS, MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_MOD, RGB_VAD,
-        KC_TRNS, KC_TRNS, AU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
+        KC_TRNS, KC_TRNS, MU_NEXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_MOD, RGB_VAD,
+        KC_TRNS, KC_TRNS, AU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
index f38ae5127e..b483bf730b 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
@@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----------------------------------------------------------|    |-------------|
      * |Debug|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
      * |-----------------------------------------------------------|    `-------------'
-     * |AU_TOG |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
+     * |AU_TOGG|Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
      * |-----------------------------------------------------------|  ,----.
      * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
      * |------------------------------------------------------------------------.
@@ -148,9 +148,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
+        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
     )
 };
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
index e008e6000c..2b1860fab3 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
@@ -83,9 +83,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
+        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
     )
 };
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
index 797381b40c..48726503ab 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
@@ -83,9 +83,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOG,  KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
+        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
     )
 };
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
index 484c8ae77b..56ca013b0d 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
@@ -83,9 +83,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [SETTINGS] = LAYOUT_tkl_iso(
         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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,               RGB_HUI,
+        MU_NEXT, 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, XXXXXXX, QK_BOOT,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,               RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
index 83c0cd76c0..f8985bf537 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
@@ -86,9 +86,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
-        AU_TOG,  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_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, 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
     )
 };
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index 301e7c66b6..7341bdc053 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -80,9 +80,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [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_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
-        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, 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, XXXXXXX, 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
     )
 };
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
index 87cfcccdc1..244abee8e2 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
@@ -57,9 +57,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FN] = LAYOUT_65_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_F14,
-        MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
-        AU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          QK_BOOT,   RGB_MOD,
-        _______, _______, _______, _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______,          RGB_HUI, _______,
+        MU_NEXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
+        AU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          QK_BOOT, RGB_MOD,
+        _______, _______, _______, _______, _______, _______, _______, MU_TOGG, RGB_VAD, RGB_VAI, _______, _______,          RGB_HUI, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
index a93112c017..e806d3c9dd 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
@@ -57,9 +57,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [_FN] = 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_F13,  KC_F14,
-        MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
-        AU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,   RGB_MOD,
-        _______, _______, _______, _______, _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
+        MU_NEXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
+        AU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_MOD,
+        _______, _______, _______, _______, _______, _______, _______, _______, MU_TOGG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
diff --git a/keyboards/maple_computing/jnao/keymaps/default/keymap.c b/keyboards/maple_computing/jnao/keymaps/default/keymap.c
index 12155650a5..3e86fd7c12 100644
--- a/keyboards/maple_computing/jnao/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/jnao/keymaps/default/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   LALT(KC_F4), KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   TSKMGR,  _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CALTDEL,
   _______, _______, _______, AU_ON,   AU_OFF,      AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
diff --git a/keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c b/keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
index 5cffdedb54..2bb2568f87 100644
--- a/keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
+++ b/keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12(
   TSKMGR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
diff --git a/keyboards/maple_computing/jnao/keymaps/via/keymap.c b/keyboards/maple_computing/jnao/keymaps/via/keymap.c
index feb0fd0f2c..15b2c7f3e9 100644
--- a/keyboards/maple_computing/jnao/keymaps/via/keymap.c
+++ b/keyboards/maple_computing/jnao/keymaps/via/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   LALT(KC_F4), KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   TSKMGR,  _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CALTDEL,
   _______, _______, _______, AU_ON,   AU_OFF,      AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, QK_BOOT
 )
 };
diff --git a/keyboards/mechwild/clunker/keymaps/default/keymap.c b/keyboards/mechwild/clunker/keymaps/default/keymap.c
index e6b5db9011..688db2cbb3 100644
--- a/keyboards/mechwild/clunker/keymaps/default/keymap.c
+++ b/keyboards/mechwild/clunker/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,                    KC_RALT, MO(_FN2), KC_RCTL
     ),
     [_FN1] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   HPT_TOG,
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   HF_TOGG,
     _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
     _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN,          KC_QUOT,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_UP,   KC_SLSH,
diff --git a/keyboards/mechwild/clunker/keymaps/via/keymap.c b/keyboards/mechwild/clunker/keymaps/via/keymap.c
index e6b5db9011..688db2cbb3 100644
--- a/keyboards/mechwild/clunker/keymaps/via/keymap.c
+++ b/keyboards/mechwild/clunker/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,                    KC_RALT, MO(_FN2), KC_RCTL
     ),
     [_FN1] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   HPT_TOG,
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   HF_TOGG,
     _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
     _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN,          KC_QUOT,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_UP,   KC_SLSH,
diff --git a/keyboards/mechwild/waka60/keymaps/audio/keymap.c b/keyboards/mechwild/waka60/keymaps/audio/keymap.c
index 69e79c7ffd..79d4725610 100644
--- a/keyboards/mechwild/waka60/keymaps/audio/keymap.c
+++ b/keyboards/mechwild/waka60/keymaps/audio/keymap.c
@@ -35,9 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
     KC_TRNS, KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    KC_TRNS, AU_TOG,  RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_TOG,  RGB_MOD,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_MOD,  RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, AU_TOGG, RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, MU_TOGG, RGB_MOD,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, MU_NEXT, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_FN2] = LAYOUT(
diff --git a/keyboards/mechwild/waka60/keymaps/via/keymap.c b/keyboards/mechwild/waka60/keymaps/via/keymap.c
index 17fe246fc5..86e3afd4fd 100644
--- a/keyboards/mechwild/waka60/keymaps/via/keymap.c
+++ b/keyboards/mechwild/waka60/keymaps/via/keymap.c
@@ -35,9 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
     KC_TRNS, KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    KC_TRNS, AU_TOG,  RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_TOG,  RGB_MOD,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_MOD,  RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, AU_TOGG, RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, MU_TOGG, RGB_MOD,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, MU_NEXT, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [_FN2] = LAYOUT(
diff --git a/keyboards/mitosis/keymaps/datagrok/keymap.c b/keyboards/mitosis/keymaps/datagrok/keymap.c
index da8d9cf927..9a177a7b8d 100644
--- a/keyboards/mitosis/keymaps/datagrok/keymap.c
+++ b/keyboards/mitosis/keymaps/datagrok/keymap.c
@@ -85,8 +85,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       QK_BOOT, KC_INS,     KC_PGUP, DB_TOGG, KC_VOLU,        KC_PPLS, KC_P7,   KC_P8,   KC_P9,    KC_PMNS,
       CK_TOGG, KC_HOME,    KC_PGDN, KC_END,  KC_VOLD,        KC_NUM,  KC_P4,   KC_P5,   KC_P6,    KC_PENT,
       KC_LAYO, KC_MPRV,    KC_MPLY, KC_MNXT, KC_MUTE,        KC_PAST, KC_P1,   KC_P2,   KC_P3,    KC_PSLS,
-      /*,      */ CK_UP,   MU_TOG,  _______, _______,        _______, _______, KC_P0,   KC_PDOT,
-      /*,      */ CK_DOWN, MU_MOD,  _______, _______,        _______, _______, _______, _______),
+      /*,      */ CK_UP,   MU_TOGG, _______, _______,        _______, _______, KC_P0,   KC_PDOT,
+      /*,      */ CK_DOWN, MU_NEXT, _______, _______,        _______, _______, _______, _______),
 };
 const bool defaultlayers[] = {
   [_xQ] = true,
diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c
index 3b901190c2..d07f193526 100644
--- a/keyboards/mlego/m48/keymaps/default/keymap.c
+++ b/keyboards/mlego/m48/keymaps/default/keymap.c
@@ -107,8 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJ] =  LAYOUT_ortho_4x12(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/mlego/m48/keymaps/via/keymap.c b/keyboards/mlego/m48/keymaps/via/keymap.c
index 9f3c846f97..91649631dc 100644
--- a/keyboards/mlego/m48/keymaps/via/keymap.c
+++ b/keyboards/mlego/m48/keymaps/via/keymap.c
@@ -107,8 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJ] =  LAYOUT_ortho_4x12(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 29d13af3ee..2d6b1f037b 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -326,7 +326,7 @@ bool music_mask_kb(uint16_t keycode) {
         case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
         case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-        case AU_ON ... MUV_DE:
+        case AU_ON ... AU_PREV:
         case QK_BOOT:
         case QK_CLEAR_EEPROM:
             return false;
diff --git a/keyboards/nack/keymaps/default/keymap.c b/keyboards/nack/keymaps/default/keymap.c
index c09ab70fd3..79ff514e8c 100644
--- a/keyboards/nack/keymaps/default/keymap.c
+++ b/keyboards/nack/keymaps/default/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  | |-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,       KC_NO,
 //  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
-       MU_TOG,      KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
+       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 -|------------|
diff --git a/keyboards/nack/keymaps/farfalleflickan/keymap.c b/keyboards/nack/keymaps/farfalleflickan/keymap.c
index e0478f2e3c..ec0b2434fa 100644
--- a/keyboards/nack/keymaps/farfalleflickan/keymap.c
+++ b/keyboards/nack/keymaps/farfalleflickan/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  | |-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_TOG,      KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
+       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 -|------------|
diff --git a/keyboards/nightly_boards/n87/keymaps/default/keymap.c b/keyboards/nightly_boards/n87/keymaps/default/keymap.c
index d6826782cc..b46b3dd1c3 100644
--- a/keyboards/nightly_boards/n87/keymaps/default/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/default/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   MO(1),   KC_LALT,                       KC_SPC,                              KC_LALT,   KC_LGUI,   KC_MENU,   KC_LCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_tkl_ansi_split_bs_rshift(
-        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CLICKY_UP, CLICKY_RESET, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CLICKY_DOWN, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        CLICKY_TOGGLE, _______, _______,
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CK_UP,  CK_RST,  QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CK_DOWN, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        CK_TOGG, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,        _______,            KC_VOLU,
         _______,   _______, _______,                      _______,                                _______,   _______,   _______,   _______,      KC_BRID, KC_VOLD, KC_BRIU
diff --git a/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c b/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
index fb8a1d14fc..cb0a07e428 100644
--- a/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/symmetric_standard/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   MO(1),   KC_LALT,                       KC_SPC,                              KC_LALT,   KC_LGUI,   		         KC_LCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_tkl_ansi_split_bs_rshift_symmetric(
-        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CLICKY_UP, CLICKY_RESET, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CLICKY_DOWN, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        CLICKY_TOGGLE, _______, _______,
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CK_UP,   CK_RST,  QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CK_DOWN, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        CK_TOGG, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,        _______,            KC_VOLU,
         _______,   _______,   _______,                      _______,                              _______,   _______,   			  _______,   KC_BRID, KC_VOLD, KC_BRIU
diff --git a/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c b/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c
index 9047d6e2f3..1b1e48656e 100644
--- a/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/tsangan/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                                         KC_LALT,   KC_LGUI,   KC_LCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_tkl_ansi_split_bs_rshift_tsangan(
-        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CLICKY_UP, CLICKY_RESET, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CLICKY_DOWN, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        CLICKY_TOGGLE, _______, _______,
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   CK_UP,   CK_RST,  QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CK_DOWN, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        CK_TOGG, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,        _______,            KC_VOLU,
         _______,   _______,   _______,                      _______,                                         _______,   _______,   _______,      KC_BRID, KC_VOLD, KC_BRIU
diff --git a/keyboards/nightly_boards/n87/keymaps/via/keymap.c b/keyboards/nightly_boards/n87/keymaps/via/keymap.c
index e5450c84de..39f251411a 100644
--- a/keyboards/nightly_boards/n87/keymaps/via/keymap.c
+++ b/keyboards/nightly_boards/n87/keymaps/via/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,   MO(1),   KC_LALT,                       KC_SPC,                              KC_LALT,   KC_LGUI,   KC_MENU,   KC_LCTL,        KC_LEFT, KC_DOWN, KC_RGHT
     ),
 	[1] = LAYOUT_tkl_ansi_split_bs_rshift(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   CLICKY_UP,    CLICKY_RESET, 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,   CLICKY_DOWN,   KC_TRNS, KC_TRNS,
-        KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        CLICKY_TOGGLE, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   CK_UP,   CK_RST,  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,   CK_DOWN, KC_TRNS, KC_TRNS,
+        KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        CK_TOGG, KC_TRNS, KC_TRNS,
         KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,            RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,            KC_VOLU,
         KC_TRNS,   KC_TRNS, KC_TRNS,                      KC_TRNS,                                KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,      KC_BRID, KC_VOLD, KC_BRIU
diff --git a/keyboards/orthodox/keymaps/default/keymap.c b/keyboards/orthodox/keymaps/default/keymap.c
index 3ad20a288a..d9826c9288 100644
--- a/keyboards/orthodox/keymaps/default/keymap.c
+++ b/keyboards/orthodox/keymaps/default/keymap.c
@@ -77,8 +77,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_ADJUST] =  LAYOUT(
-    _______, QK_BOOT,   _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM,          _______, _______,          _______, _______,          AG_SWAP, QWERTY , COLEMAK, DVORAK,  _______, _______,
+    _______, QK_BOOT, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_DEL,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM,          _______, _______,          _______, _______,          AG_SWAP, QWERTY , COLEMAK, DVORAK,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY
   )
 
diff --git a/keyboards/pearlboards/atlas/keymaps/default/keymap.c b/keyboards/pearlboards/atlas/keymaps/default/keymap.c
index af7b9831db..c67fbc32d1 100644
--- a/keyboards/pearlboards/atlas/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/atlas/keymaps/default/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,                   KC_SPC,                             KC_RALT,  KC_LEFT,  KC_DOWN,            KC_RIGHT),
 
 	LAYOUT_all(
-		QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_TRNS,  KC_TRNS,
+		QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_TRNS,  KC_TRNS,
 		KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
-		KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  HF_FDBK,  HF_TOGG,  HF_ON,    CK_ON,    CK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
 		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
 		KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS)
 };
diff --git a/keyboards/pearlboards/atlas/keymaps/via/keymap.c b/keyboards/pearlboards/atlas/keymaps/via/keymap.c
index 6fb385869b..f0eb50e010 100644
--- a/keyboards/pearlboards/atlas/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/atlas/keymaps/via/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,                   KC_SPC,                             KC_RALT,  KC_LEFT,  KC_DOWN,            KC_RIGHT),
 
 	[1] = LAYOUT_all(
-		QK_BOOT,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_TRNS,  KC_TRNS,
+		QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_TRNS,  KC_TRNS,
 		KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
-		KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  HF_FDBK,  HF_TOGG,  HF_ON,    CK_ON,    CK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
 		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
 		KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS),
 
diff --git a/keyboards/pearlboards/pearl/keymaps/default/keymap.c b/keyboards/pearlboards/pearl/keymaps/default/keymap.c
index 56b4f54469..e05da00443 100644
--- a/keyboards/pearlboards/pearl/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/pearl/keymaps/default/keymap.c
@@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  KC_BSPC,  KC_APP,  MO(1)),
 
 	LAYOUT_all(
-		QK_BOOT,    KC_1,     KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_EQL,   KC_DEL,
+		QK_BOOT,  KC_1,     KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_EQL,   KC_DEL,
 		KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_BSLS,
-		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,
+		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  HF_FDBK,  HF_TOGG,  HF_ON,    CK_ON,    CK_TOGG,
 		RGB_MOD,  RGB_HUI,  KC_TRNS,  RGB_TOG,   KC_TRNS,  KC_TRNS,  KC_TRNS)
 };
diff --git a/keyboards/pearlboards/pearl/keymaps/via/keymap.c b/keyboards/pearlboards/pearl/keymaps/via/keymap.c
index 7da48bdabc..6e11fb1e03 100644
--- a/keyboards/pearlboards/pearl/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/pearl/keymaps/via/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  KC_BSPC,  KC_APP,  MO(1)),
 
 	[1] = LAYOUT_all(
-		QK_BOOT,    KC_1,     KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_EQL,   KC_DEL,
+		QK_BOOT,  KC_1,     KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_EQL,   KC_DEL,
 		KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_BSLS,
-		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,
+		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  HF_FDBK,  HF_TOGG,  HF_ON,    CK_ON,    CK_TOGG,
 		RGB_MOD,  RGB_HUI,  KC_TRNS,  RGB_TOG,   KC_TRNS,  KC_TRNS,  KC_TRNS),
 
 	[2] = LAYOUT_all(
diff --git a/keyboards/pearlboards/zeus/keymaps/default/keymap.c b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
index 5d560ecefc..9f77d9ae9b 100644
--- a/keyboards/pearlboards/zeus/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
@@ -30,10 +30,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
                                    KC_TRNS,
-        QK_BOOT,            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        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, RGB_TOG, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, HPT_TOG, HPT_FBK, HPT_MODI, HPT_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, CK_ON,   CK_TOGG, MU_TOG,   MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, HF_TOGG, HF_FDBK, HF_NEXT,  HF_RST,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, CK_ON,   CK_TOGG, MU_TOGG,  MU_NEXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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/pearlboards/zeus/keymaps/via/keymap.c b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
index c36f486f58..a4537dc1c0 100644
--- a/keyboards/pearlboards/zeus/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
@@ -30,10 +30,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
                                    KC_TRNS,
-        QK_BOOT,            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        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, RGB_TOG, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, HPT_TOG, HPT_FBK, HPT_MODI, HPT_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, CK_ON,   CK_TOGG, MU_TOG,   MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, HF_TOGG, HF_FDBK, HF_NEXT,  HF_RST,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, CK_ON,   CK_TOGG, MU_TOGG,  MU_NEXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     ),
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 84eb725c90..8572818de2 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -328,7 +328,7 @@ bool music_mask_kb(uint16_t keycode) {
     case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
     case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
     case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-    case AU_ON ... MUV_DE:
+    case AU_ON ... AU_PREV:
     case QK_BOOT:
     case QK_CLEAR_EEPROM:
         return false;
diff --git a/keyboards/planck/keymaps/abhixec/keymap.c b/keyboards/planck/keymaps/abhixec/keymap.c
index cfaef27e73..f8f5731ce2 100644
--- a/keyboards/planck/keymaps/abhixec/keymap.c
+++ b/keyboards/planck/keymaps/abhixec/keymap.c
@@ -122,10 +122,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/abishalom/keymap.c b/keyboards/planck/keymaps/abishalom/keymap.c
index 2d5d33389f..87af1d75e3 100644
--- a/keyboards/planck/keymaps/abishalom/keymap.c
+++ b/keyboards/planck/keymaps/abishalom/keymap.c
@@ -144,10 +144,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______,  _______,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/am/keymap.c b/keyboards/planck/keymaps/am/keymap.c
index 757e56bc2d..000aeed1d6 100644
--- a/keyboards/planck/keymaps/am/keymap.c
+++ b/keyboards/planck/keymaps/am/keymap.c
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index 4a3d30508d..c507a6fe5e 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -247,7 +247,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid( /* ADJUST LAYER */
   RGB_TOG, KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QK_BOOT,
   RGB_MOD, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, GAMING,  KC_NO,       AU_ON,   AU_OFF,  MU_ON,   MU_OFF,  DB_TOGG,
-  KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, QWERTY,  COLEMAK_VCP, MI_ON,   MI_OFF,  KC_TRNS, KC_TRNS, MU_MOD,
+  KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, QWERTY,  COLEMAK_VCP, MI_ON,   MI_OFF,  KC_TRNS, KC_TRNS, MU_NEXT,
   KC_NO,   KC_NO,   KC_NO,   KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO
 )
 };
diff --git a/keyboards/planck/keymaps/aviator/keymap.c b/keyboards/planck/keymaps/aviator/keymap.c
index e318a6db16..6b0308c6c6 100644
--- a/keyboards/planck/keymaps/aviator/keymap.c
+++ b/keyboards/planck/keymaps/aviator/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   KC_ESC,  QK_BOOT, DB_TOGG, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_DEL,
   _______, ___x___, ___x___, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DATA,    ___x___, ___x___, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  ___x___, ___x___, ___x___, ___x___, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  ___x___, ___x___, ___x___, ___x___, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
index d20ebbe5b9..ea7e516e34 100644
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ b/keyboards/planck/keymaps/buhearns/keymap.c
@@ -44,8 +44,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [4] = LAYOUT_planck_grid(
-  KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_MOD,  MUV_IN,  MU_ON,   AU_ON,    KC_EJCT,
-  KC_TRNS, EE_CLR,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   MUV_DE,  MU_OFF,  AU_OFF,   KC_TRNS,
+  KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_NEXT, AU_NEXT, MU_ON,   AU_ON,    KC_EJCT,
+  KC_TRNS, EE_CLR,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   AU_PREV, MU_OFF,  AU_OFF,   KC_TRNS,
   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MUTE, KC_MPRV, KC_MNXT,  KC_NO,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_VOLU,  KC_MPLY
 ),
diff --git a/keyboards/planck/keymaps/charlesrocket/keymap.c b/keyboards/planck/keymaps/charlesrocket/keymap.c
index aa507abe5a..a85042ef66 100644
--- a/keyboards/planck/keymaps/charlesrocket/keymap.c
+++ b/keyboards/planck/keymaps/charlesrocket/keymap.c
@@ -57,8 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_planck_grid(
     _______,   CK_UP,   _______, _______, _______, _______, _______, _______, _______,_______,  _______, _______,
-    KC_DELETE, CK_TOGG, AU_ON,   AU_OFF,  AU_TOG,  _______, _______, _______, RGB_VAI,RGB_VAD , _______, QK_BOOT,
-    _______,   CK_DOWN, MU_ON,   MU_OFF,  MU_TOG,  _______, _______, _______, _______, _______, _______, _______,
+    KC_DELETE, CK_TOGG, AU_ON,   AU_OFF,  AU_TOGG, _______, _______, _______, RGB_VAI,RGB_VAD , _______, QK_BOOT,
+    _______,   CK_DOWN, MU_ON,   MU_OFF,  MU_TOGG, _______, _______, _______, _______, _______, _______, _______,
     _______,   _______, _______, _______, _______, _______, KC_NO,   _______, _______, _______, _______, _______
   ),
 
diff --git a/keyboards/planck/keymaps/coloneljesus/keymap.c b/keyboards/planck/keymaps/coloneljesus/keymap.c
index 832287f224..0ccc932cb0 100644
--- a/keyboards/planck/keymaps/coloneljesus/keymap.c
+++ b/keyboards/planck/keymaps/coloneljesus/keymap.c
@@ -163,8 +163,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, 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,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/corvec/keymap.c b/keyboards/planck/keymaps/corvec/keymap.c
index ecd7456c97..dda349b2a6 100644
--- a/keyboards/planck/keymaps/corvec/keymap.c
+++ b/keyboards/planck/keymaps/corvec/keymap.c
@@ -134,8 +134,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_planck_grid(
   COLEMAK, _______, DB_TOGG,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QWERTY ,
-  _______, _______, MU_MOD,   AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, AS_ON,   AS_UP,
-  _______, MUV_DE,  MUV_IN,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, AS_RPT,  AS_OFF,  AS_DOWN,
+  _______, _______, MU_NEXT,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, AS_ON,   AS_UP,
+  _______, AU_PREV, AU_NEXT,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, AS_RPT,  AS_OFF,  AS_DOWN,
   _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
 )
 
diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c
index 1d425ea3d1..6096b51dde 100644
--- a/keyboards/planck/keymaps/dbroqua/keymap.c
+++ b/keyboards/planck/keymaps/dbroqua/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/dcompact/keymap.c b/keyboards/planck/keymaps/dcompact/keymap.c
index 0c0f23d85b..0e09d21efb 100644
--- a/keyboards/planck/keymaps/dcompact/keymap.c
+++ b/keyboards/planck/keymaps/dcompact/keymap.c
@@ -250,7 +250,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
    _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
    _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP, RGB_TOG, RGB_MOD, _______, _______, _______,
-   _______,  MUV_DE,  MUV_IN,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______,
+   _______, AU_PREV, AU_NEXT,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
index bcf84e3365..4138889025 100644
--- a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
@@ -165,8 +165,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 39a3315b56..93ee919923 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -165,10 +165,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/dodger/keymap.c b/keyboards/planck/keymaps/dodger/keymap.c
index a47f94f2c7..1ef2645395 100644
--- a/keyboards/planck/keymaps/dodger/keymap.c
+++ b/keyboards/planck/keymaps/dodger/keymap.c
@@ -118,8 +118,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   EE_CLR,  QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/dr0ck/keymap.c b/keyboards/planck/keymaps/dr0ck/keymap.c
index 1060d6dbd0..78adb7533f 100644
--- a/keyboards/planck/keymaps/dr0ck/keymap.c
+++ b/keyboards/planck/keymaps/dr0ck/keymap.c
@@ -165,8 +165,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+  KC_CAPS, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
index f02292beee..901c7cc23e 100644
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -198,8 +198,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNCTN] = LAYOUT_planck_grid(
 	KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,
 	KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-	XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, MUV_IN,  KC_SYRQ,
-	QK_BOOT, XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE,  AG_SWAP
+	XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, AU_NEXT, KC_SYRQ,
+	QK_BOOT, XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, AU_PREV, AG_SWAP
 )
 
 };
diff --git a/keyboards/planck/keymaps/dudeofawesome/keymap.c b/keyboards/planck/keymaps/dudeofawesome/keymap.c
index ab4f4ccf50..054a76c071 100644
--- a/keyboards/planck/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/planck/keymaps/dudeofawesome/keymap.c
@@ -162,8 +162,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-    KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
+    KC_CAPS, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
 
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index 85a516b96e..d69bf18620 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -148,8 +148,8 @@ LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    KC_PWR,  _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    KC_PWR,  _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/emiller/keymap.c b/keyboards/planck/keymaps/emiller/keymap.c
index d40b4ddc33..3b0e2c285b 100644
--- a/keyboards/planck/keymaps/emiller/keymap.c
+++ b/keyboards/planck/keymaps/emiller/keymap.c
@@ -167,8 +167,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 /* VIM
diff --git a/keyboards/planck/keymaps/emilyh/keymap.c b/keyboards/planck/keymaps/emilyh/keymap.c
index fd71b0e905..91e5c5fb37 100644
--- a/keyboards/planck/keymaps/emilyh/keymap.c
+++ b/keyboards/planck/keymaps/emilyh/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/eshesh2/keymap.c b/keyboards/planck/keymaps/eshesh2/keymap.c
index 8cb553f4e7..ccb1db659a 100644
--- a/keyboards/planck/keymaps/eshesh2/keymap.c
+++ b/keyboards/planck/keymaps/eshesh2/keymap.c
@@ -124,8 +124,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, NUMPAD,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, NUMPAD,  _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c
index d0a45529c1..ecb13848d1 100644
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ b/keyboards/planck/keymaps/experimental/keymap.c
@@ -169,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/fabian/keymap.c b/keyboards/planck/keymaps/fabian/keymap.c
index af7be74672..1569ed5e98 100644
--- a/keyboards/planck/keymaps/fabian/keymap.c
+++ b/keyboards/planck/keymaps/fabian/keymap.c
@@ -173,8 +173,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/foreveranapple/keymap.c b/keyboards/planck/keymaps/foreveranapple/keymap.c
index f91b71837e..c9d9c9f6ad 100644
--- a/keyboards/planck/keymaps/foreveranapple/keymap.c
+++ b/keyboards/planck/keymaps/foreveranapple/keymap.c
@@ -204,8 +204,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NIXQWERTY, OSX,     PLOVER,  COLEMAK,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,   DVORAK,  _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NIXQWERTY, OSX,     PLOVER,  COLEMAK,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,   DVORAK,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/fsck/keymap.c b/keyboards/planck/keymaps/fsck/keymap.c
index b18e943891..b05d0e9859 100644
--- a/keyboards/planck/keymaps/fsck/keymap.c
+++ b/keyboards/planck/keymaps/fsck/keymap.c
@@ -101,8 +101,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/gitdrik/keymap.c b/keyboards/planck/keymaps/gitdrik/keymap.c
index 68e1e5da83..8d9e39b9f4 100644
--- a/keyboards/planck/keymaps/gitdrik/keymap.c
+++ b/keyboards/planck/keymaps/gitdrik/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_RIGHTER] = LAYOUT_planck_grid(
     KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO, KC_NO, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, KC_WH_U,
     KC_TRNS, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_WH_D,
-    KC_TRNS, KC_TRNS, MU_MOD,  MU_ON,   MU_OFF,  KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_BTN3, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, MU_NEXT, MU_ON,   MU_OFF,  KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_BTN3, KC_TRNS, KC_TRNS,
     KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_NO
 ),
 
diff --git a/keyboards/planck/keymaps/grahampheath/keymap.c b/keyboards/planck/keymaps/grahampheath/keymap.c
index 91e239270c..5704f869ae 100644
--- a/keyboards/planck/keymaps/grahampheath/keymap.c
+++ b/keyboards/planck/keymaps/grahampheath/keymap.c
@@ -214,8 +214,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
index 0731595767..555b073839 100644
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MC(KC_W), KC_DELETE,    KC_APP
 ),
 [LY_1101] = LAYOUT_gunp(
-  SANDBOX,   XXXXXXX,    AU_TOG,       QK_LOCK,    RGB_TOG,       QK_BOOT,
+  SANDBOX,   XXXXXXX,    AU_TOGG,      QK_LOCK,    RGB_TOG,       QK_BOOT,
   KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DB_TOGG,
   KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EE_CLR,
   KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
index abc31a2ee6..b5e8484bdd 100644
--- a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
+++ b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, QWERTY,  COLEMAK,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/hvp/keymap.c b/keyboards/planck/keymaps/hvp/keymap.c
index e6a742b49b..bd0c2cadec 100644
--- a/keyboards/planck/keymaps/hvp/keymap.c
+++ b/keyboards/planck/keymaps/hvp/keymap.c
@@ -72,10 +72,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_planck_grid( /* Tab */
-  _______, _______,  AG_NORM, AG_SWAP, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______,
-  _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, KC_4, KC_5, KC_6, _______, _______,
-  KC_PSCR, MUV_DE, MUV_IN, MU_ON, MU_OFF, _______, _______,  KC_0, KC_1, KC_2, KC_3, _______,
-  QK_BOOT, _______, _______, _______, MI_ON, MI_OFF, _______, _______, _______, _______, _______, DB_TOGG
+  _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, KC_7,    KC_8,    KC_9,   KC_0,     _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, KC_4,    KC_5,    KC_6,   _______,  _______,
+  KC_PSCR, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  _______, _______, KC_0,    KC_1,    KC_2,   KC_3,     _______,
+  QK_BOOT, _______, _______, _______, MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, DB_TOGG
 )};
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/impossible/keymap.c b/keyboards/planck/keymaps/impossible/keymap.c
index 72c4da3791..07872d0d7f 100644
--- a/keyboards/planck/keymaps/impossible/keymap.c
+++ b/keyboards/planck/keymaps/impossible/keymap.c
@@ -132,8 +132,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJ] = LAYOUT_planck_grid(
   _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_PSCR, KC_PAUSE, QK_BOOT,
-  _______, _______, _______, _______, _______, _______, _______, KC_CAPS, MUV_IN,  AU_TOG,  MI_OFF,   _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_SCRL, MUV_DE,  MU_TOG,  MI_ON,    _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_CAPS, AU_NEXT, AU_TOGG, MI_OFF,   _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_SCRL, AU_PREV, MU_TOGG, MI_ON,    _______,
   _______, _______, _______, _______, _______, _______, _______, KC_NUM,  WORKMAN, QWERTY,  PLOVER,   _______
 )
 
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c
index a2bf1b208f..48cce59420 100644
--- a/keyboards/planck/keymaps/ishtob/keymap.c
+++ b/keyboards/planck/keymaps/ishtob/keymap.c
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12_wrapper(
   DFU, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_DEL,
   _______, MAGIC_TOGGLE_NKRO, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, BL_DOWN,BL_UP,  BL_STEP, BL_TOGG,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, BL_DOWN,BL_UP,  BL_STEP, BL_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, CK_RST, CK_DOWN, CK_UP, CK_TOGG
 )
  
diff --git a/keyboards/planck/keymaps/jasperla/keymap.c b/keyboards/planck/keymaps/jasperla/keymap.c
index 6bad2d530c..06f43b7410 100644
--- a/keyboards/planck/keymaps/jasperla/keymap.c
+++ b/keyboards/planck/keymaps/jasperla/keymap.c
@@ -123,8 +123,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, _______, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/jdelkins/keymap.c b/keyboards/planck/keymaps/jdelkins/keymap.c
index 48f25e895f..521ade05b9 100644
--- a/keyboards/planck/keymaps/jdelkins/keymap.c
+++ b/keyboards/planck/keymaps/jdelkins/keymap.c
@@ -160,15 +160,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-    KC_RCTL, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, TG(_KP), KC_BRID, KC_BRIU, KC_MUTE,
+    KC_RCTL, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, TG(_KP), KC_BRID, KC_BRIU, KC_MUTE,
     _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS,  _______, _______, _______, KC_MPLY,
     KC_RCTL, _______, _______, _______,      _______,          _______,     KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
 )
 
 /* [_ADJUST] = LAYOUT( */
-/*     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL , */
-/*     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______, */
-/*     _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, */
+/*     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , */
+/*     _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______, */
+/*     _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, */
 /*     _______, _______, _______, _______,      _______,          _______,     _______, _______, _______,  _______ */
 /* ) */
 
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
index c5d2df86ce..443164aba4 100644
--- a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
@@ -124,8 +124,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  QK_BOOT,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/jhenahan/keymap.c b/keyboards/planck/keymaps/jhenahan/keymap.c
index c05f678576..92b3d16e2e 100644
--- a/keyboards/planck/keymaps/jhenahan/keymap.c
+++ b/keyboards/planck/keymaps/jhenahan/keymap.c
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, PLOVER,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
index 426f264b92..02766bb125 100644
--- a/keyboards/planck/keymaps/jimmysjolund/keymap.c
+++ b/keyboards/planck/keymaps/jimmysjolund/keymap.c
@@ -188,10 +188,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/jirgn/keymap.c b/keyboards/planck/keymaps/jirgn/keymap.c
index 38108f8eef..1bfb1e5e9d 100644
--- a/keyboards/planck/keymaps/jirgn/keymap.c
+++ b/keyboards/planck/keymaps/jirgn/keymap.c
@@ -149,8 +149,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  PLOVER,  _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  PLOVER,  _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
index eeafcfe23b..b2c317f039 100644
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ b/keyboards/planck/keymaps/jweickm/keymap.c
@@ -201,17 +201,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ,-----------------------------------------------------------------------------------.
      * | A-SFT| Boot | Debug|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
      * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | A-GRV|EEPRST|MU_MOD| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
+     * | A-GRV|EEPRST|MUNEXT| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
      * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | ____ |MUV_DE|MUV_IN| MU_ON|MU_OFF| MI_ON|MI_OFF| Vol- | MPLY | Vol+ | ____ | ____ |
+     * | ____ |AU_REV|AUNEXT| MU_ON|MU_OFF| MI_ON|MI_OFF| Vol- | MPLY | Vol+ | ____ | ____ |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
      * | ____ | ____ | ____ | ____ | ____ |     ____    | ____ | ____ | ____ | ____ |EEPRST|
      * `-----------------------------------------------------------------------------------'
      */
     [_ADJUST] = LAYOUT_planck_grid(
         LALT(KC_LSFT), QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DE_SWITCH, 
-        LALT(KC_GRV), EE_CLR, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, HRWIDECOLEMAK, WIDECOLEMAK, LALT(KC_GRV), LANG_SWITCH, GAMING, 
-        KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_SVD_BD, KC_MPLY, KC_SVU_BU, KC_TRNS, KC_TRNS,
+        LALT(KC_GRV), EE_CLR, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, HRWIDECOLEMAK, WIDECOLEMAK, LALT(KC_GRV), LANG_SWITCH, GAMING, 
+        KC_TRNS, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_SVD_BD, KC_MPLY, KC_SVU_BU, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR
     ),
 
diff --git a/keyboards/planck/keymaps/jweickm/readme.md b/keyboards/planck/keymaps/jweickm/readme.md
index c3373bbfb5..dd34822b42 100644
--- a/keyboards/planck/keymaps/jweickm/readme.md
+++ b/keyboards/planck/keymaps/jweickm/readme.md
@@ -101,9 +101,9 @@ Navigation layer on space.
 * ,-----------------------------------------------------------------------------------.
 * | A-SFT| RESET| Debug|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
-* | A-GRV|EEPRST|MU_MOD| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
+* | A-GRV|EEPRST|MUNEXT| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
-* | ____ |MUV_DE|MUV_IN| MU_ON|MU_OFF| MI_ON|MI_OFF| Vol- | MPLY | Vol+ | ____ | ____ |
+* | ____ |AUPREV|AUNEXT| MU_ON|MU_OFF| MI_ON|MI_OFF| Vol- | MPLY | Vol+ | ____ | ____ |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * | ____ | ____ | ____ | ____ | ____ |     ____    | ____ | ____ | ____ | ____ |EEPRST|
 * `-----------------------------------------------------------------------------------'
diff --git a/keyboards/planck/keymaps/kelorean/keymap.c b/keyboards/planck/keymaps/kelorean/keymap.c
index 9f0553fce1..0091a10f9b 100644
--- a/keyboards/planck/keymaps/kelorean/keymap.c
+++ b/keyboards/planck/keymaps/kelorean/keymap.c
@@ -163,8 +163,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, 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,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/kloki/keymap.c b/keyboards/planck/keymaps/kloki/keymap.c
index 15e688a6c6..9ba40f318b 100644
--- a/keyboards/planck/keymaps/kloki/keymap.c
+++ b/keyboards/planck/keymaps/kloki/keymap.c
@@ -96,8 +96,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, _______, QWERTY,  WORKMAN, _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, QWERTY,  WORKMAN, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
diff --git a/keyboards/planck/keymaps/kmontag42/keymap.c b/keyboards/planck/keymaps/kmontag42/keymap.c
index be1f40249b..51e7149ce6 100644
--- a/keyboards/planck/keymaps/kmontag42/keymap.c
+++ b/keyboards/planck/keymaps/kmontag42/keymap.c
@@ -123,8 +123,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/kuatsure/keymap.c b/keyboards/planck/keymaps/kuatsure/keymap.c
index b43392f9bb..db78f1138e 100644
--- a/keyboards/planck/keymaps/kuatsure/keymap.c
+++ b/keyboards/planck/keymaps/kuatsure/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid_wrapper(
     _______, KB_MAKE, KB_FLSH, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
     _______, QK_BOOT, DB_TOGG, _______, _______, AU_ON,   AU_OFF,  GAME,    MOUSE,   _______, _______, _______,
-    _______, KB_VRSN, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______,
+    _______, KB_VRSN, _______, _______, MU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/lja83/keymap.c b/keyboards/planck/keymaps/lja83/keymap.c
index d05c3713cc..33e8f93e96 100644
--- a/keyboards/planck/keymaps/lja83/keymap.c
+++ b/keyboards/planck/keymaps/lja83/keymap.c
@@ -167,8 +167,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/mgalisa/keymap.c b/keyboards/planck/keymaps/mgalisa/keymap.c
index 250845083b..8816bf4090 100644
--- a/keyboards/planck/keymaps/mgalisa/keymap.c
+++ b/keyboards/planck/keymaps/mgalisa/keymap.c
@@ -195,8 +195,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/mikethetiger/keymap.c b/keyboards/planck/keymaps/mikethetiger/keymap.c
index 3ea2633552..c0964f1dee 100644
--- a/keyboards/planck/keymaps/mikethetiger/keymap.c
+++ b/keyboards/planck/keymaps/mikethetiger/keymap.c
@@ -164,8 +164,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/mjt/keymap.c b/keyboards/planck/keymaps/mjt/keymap.c
index 3410fa4b1a..2b5ce9d206 100644
--- a/keyboards/planck/keymaps/mjt/keymap.c
+++ b/keyboards/planck/keymaps/mjt/keymap.c
@@ -118,9 +118,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______ , QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
-  _______ , _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,  PLOVER, _______,
-  _______ , MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
+  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,PLOVER,  _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 [_DYN] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/mjtnumsym/keymap.c b/keyboards/planck/keymaps/mjtnumsym/keymap.c
index e7ae02397d..81ba8d9ee0 100644
--- a/keyboards/planck/keymaps/mjtnumsym/keymap.c
+++ b/keyboards/planck/keymaps/mjtnumsym/keymap.c
@@ -117,9 +117,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______ , QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
-  _______ , _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,  PLOVER, _______,
-  _______ , MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
+  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,PLOVER,  _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ) /*,
 [_DYN] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/keymaps/mjuma/keymap.c b/keyboards/planck/keymaps/mjuma/keymap.c
index 4d0209a91b..d449b28e51 100644
--- a/keyboards/planck/keymaps/mjuma/keymap.c
+++ b/keyboards/planck/keymaps/mjuma/keymap.c
@@ -171,8 +171,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG,   _______,   _______,  _______, _______, DM_REC1, DM_REC2,   _______,   _______,   _______,
     _______, TG(_GAMING), ___,   _______,   _______,  _______, _______, DM_PLY1, DM_PLY2,   AU_OFF,    AU_ON,     _______,
-    _______, _______, _______,   _______,   _______,  _______, _______, DM_RSTP, _______,   MU_OFF,    MU_ON,     MU_MOD,
-    _______, _______, _______,   AG_TOGG,   _______,  _______, _______, _______, _______,   MUV_DE,    MUV_IN,    _______
+    _______, _______, _______,   _______,   _______,  _______, _______, DM_RSTP, _______,   MU_OFF,    MU_ON,     MU_NEXT,
+    _______, _______, _______,   AG_TOGG,   _______,  _______, _______, _______, _______,   AU_PREV,   AU_NEXT,    _______
 )
 
 };
diff --git a/keyboards/planck/keymaps/mjuma/readme.md b/keyboards/planck/keymaps/mjuma/readme.md
index b30ea4e4de..ee1299b878 100644
--- a/keyboards/planck/keymaps/mjuma/readme.md
+++ b/keyboards/planck/keymaps/mjuma/readme.md
@@ -146,11 +146,11 @@ DM_RSTP:     Finish the macro that is currently being recorded.
 
 AU_ON:   Audio mode on
 AU_OFF:  Audio mode off
-AU_TOG:  Toggles Audio mode
+AU_TOGG: Toggles Audio mode
 MU_ON:   Turn music mode on
 MU_OFF:  Turn music mode off
-MU_TOG:  Toggle music mode
-MU_MOD:  Cycle through the music modes:
+MU_TOGG: Toggle music mode
+MU_NEXT: Cycle through the music modes:
     CHROMATIC_MODE:  Chromatic scale, row changes the octave
     GUITAR_MODE:     Chromatic scale, but the row changes the string (+5 st)
     VIOLIN_MODE:     Chromatic scale, but the row changes the string (+7 st)
diff --git a/keyboards/planck/keymaps/msiu/keymap.c b/keyboards/planck/keymaps/msiu/keymap.c
index ba154582c0..6e5301bcfd 100644
--- a/keyboards/planck/keymaps/msiu/keymap.c
+++ b/keyboards/planck/keymaps/msiu/keymap.c
@@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_ADJUST] = LAYOUT_planck_grid(
     _______, _______, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
diff --git a/keyboards/planck/keymaps/muppetjones/keymap.c b/keyboards/planck/keymaps/muppetjones/keymap.c
index 5fb6f717e9..a5609e5711 100644
--- a/keyboards/planck/keymaps/muppetjones/keymap.c
+++ b/keyboards/planck/keymaps/muppetjones/keymap.c
@@ -190,9 +190,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_wrapper(
-    __ADJUST_L1________________________________, MUV_IN,  PLOVER,  __MEDIA_R1_________________________________,
-    __ADJUST_L2________________________________, MUV_DE,  CLMK_DH, __MEDIA_R2_________________________________,
-    __ADJUST_L3________________________________, MU_MOD,  QWERTY,  __MEDIA_R3_________________________________,
+    __ADJUST_L1________________________________, AU_NEXT, PLOVER,  __MEDIA_R1_________________________________,
+    __ADJUST_L2________________________________, AU_PREV, CLMK_DH, __MEDIA_R2_________________________________,
+    __ADJUST_L3________________________________, MU_NEXT, QWERTY,  __MEDIA_R3_________________________________,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 )
 
diff --git a/keyboards/planck/keymaps/muzfuz/keymap.c b/keyboards/planck/keymaps/muzfuz/keymap.c
index b02ce149f4..0126ffdf25 100644
--- a/keyboards/planck/keymaps/muzfuz/keymap.c
+++ b/keyboards/planck/keymaps/muzfuz/keymap.c
@@ -107,8 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [_ADJUST] = LAYOUT_planck_grid(
         _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-        _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
-        _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
+        _______, _______, MU_NEXT, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
+        _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
 
 };
diff --git a/keyboards/planck/keymaps/mwpeterson/keymap.c b/keyboards/planck/keymaps/mwpeterson/keymap.c
index 2828192100..630b4f5767 100644
--- a/keyboards/planck/keymaps/mwpeterson/keymap.c
+++ b/keyboards/planck/keymaps/mwpeterson/keymap.c
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [ADJUST_LAYER] = LAYOUT_planck_grid(
     XXXXXXX, QK_BOOT, SEND_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SEND_VERSION, XXXXXXX,
     QWERTY,  XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,
-    XXXXXXX, MUV_DE,  MUV_IN,    MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,       XXXXXXX,
+    XXXXXXX, AU_PREV, AU_NEXT,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,       XXXXXXX,
     STENO,   XXXXXXX, AG_SWAP,   AG_NORM, LOWER,   XXXXXXX, XXXXXXX, RAISE,   XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX
   )
 };
diff --git a/keyboards/planck/keymaps/myoung34/keymap.c b/keyboards/planck/keymaps/myoung34/keymap.c
index e529113745..1142ab8cb0 100644
--- a/keyboards/planck/keymaps/myoung34/keymap.c
+++ b/keyboards/planck/keymaps/myoung34/keymap.c
@@ -101,8 +101,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
 
diff --git a/keyboards/planck/keymaps/narze/keymap.c b/keyboards/planck/keymaps/narze/keymap.c
index 4ff3502a03..8706905968 100644
--- a/keyboards/planck/keymaps/narze/keymap.c
+++ b/keyboards/planck/keymaps/narze/keymap.c
@@ -210,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, QWOC,    PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  SDTOGG,  _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  SDTOGG,  _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BACKLIT
 )
 
diff --git a/keyboards/planck/keymaps/not-quite-neo/keymap.c b/keyboards/planck/keymaps/not-quite-neo/keymap.c
index 20a0e07e10..2248c7a2b9 100644
--- a/keyboards/planck/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/planck/keymaps/not-quite-neo/keymap.c
@@ -124,6 +124,6 @@ L06 -> <TBD>: UNSPECIFIED
   QK_BOOT,                L06_LEFT_01,                                 L06_RIGHT_01,                 KC_BSPC,
   _______,                L06_LEFT_02,                                 L06_RIGHT_02,                 KC_INS,
   _______,                L06_LEFT_03,                                 L06_RIGHT_03,                 KC_DEL,
-  MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  _______, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______
+  AU_PREV,  AU_NEXT,  MU_ON,   MU_OFF,  _______, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______
 )
 };
diff --git a/keyboards/planck/keymaps/originerd/keymap.c b/keyboards/planck/keymaps/originerd/keymap.c
index 17e6124280..917e59f0bb 100644
--- a/keyboards/planck/keymaps/originerd/keymap.c
+++ b/keyboards/planck/keymaps/originerd/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, NERD,    _______, _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 0cdd3bbb83..035fd3d98b 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -56,8 +56,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_planck_grid(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_DEL,  _______, AU_ON,   AU_OFF,  AU_TOG,  _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, LED_LEVEL, QK_BOOT,
-    _______, _______, MU_ON,   MU_OFF,  MU_TOG,  _______, _______, RGB_MOD, RGB_HUI, RGB_HUD, TOGGLE_LAYER_COLOR, _______,
+    KC_DEL,  _______, AU_ON,   AU_OFF,  AU_TOGG, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, LED_LEVEL, QK_BOOT,
+    _______, _______, MU_ON,   MU_OFF,  MU_TOGG, _______, _______, RGB_MOD, RGB_HUI, RGB_HUD, TOGGLE_LAYER_COLOR, _______,
     _______, _______, _______, _______, _______, _______, KC_NO,   _______, _______, _______, _______, _______
   ),
 
diff --git a/keyboards/planck/keymaps/pascamel/keymap.c b/keyboards/planck/keymaps/pascamel/keymap.c
index 392651d97b..779cb5f2d0 100644
--- a/keyboards/planck/keymaps/pascamel/keymap.c
+++ b/keyboards/planck/keymaps/pascamel/keymap.c
@@ -105,8 +105,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/pevecyan/keymap.c b/keyboards/planck/keymaps/pevecyan/keymap.c
index 0569ec9535..e630b12d28 100644
--- a/keyboards/planck/keymaps/pevecyan/keymap.c
+++ b/keyboards/planck/keymaps/pevecyan/keymap.c
@@ -116,8 +116,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/pickle_jr/README.md b/keyboards/planck/keymaps/pickle_jr/README.md
index 64e9c23c1f..c26a97f2e5 100644
--- a/keyboards/planck/keymaps/pickle_jr/README.md
+++ b/keyboards/planck/keymaps/pickle_jr/README.md
@@ -93,7 +93,7 @@ Adjust (Lower + Raise)
   ,-------------------------------------------------------------------------------------------.
   |      | Reset|      |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD|RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD|  Del |
   |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
-  |      |      |MU_MOD|Aud on |Audoff |AGnorm |AGswap |       |       |       |       |      |
+  |      |      |MuNext|Aud on |Audoff |AGnorm |AGswap |       |       |       |       |      |
   |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
   |      |Voice-|Voice+|Mus on |Musoff |MIDIon |MIDIof |TERMon |TERMof |       |       |      |
   |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
diff --git a/keyboards/planck/keymaps/pickle_jr/keymap.c b/keyboards/planck/keymaps/pickle_jr/keymap.c
index 3fbf1b2836..92da3c50bd 100644
--- a/keyboards/planck/keymaps/pickle_jr/keymap.c
+++ b/keyboards/planck/keymaps/pickle_jr/keymap.c
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-------------------------------------------------------------------------------------------.
  * |      | Reset|      |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD|RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD|  Del |
  * |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
- * |      |      |MU_MOD|Aud on |Audoff |AGnorm |AGswap |       |       |       |       |      |
+ * |      |      |MUNEXT|Aud on |Audoff |AGnorm |AGswap |       |       |       |       |      |
  * |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
  * |      |Voice-|Voice+|Mus on |Musoff |MIDIon |MIDIof |TERMon |TERMof |       |       |      |
  * |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
@@ -168,8 +168,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, KC_TRNS, KC_TRNS, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/pjanx/keymap.c b/keyboards/planck/keymaps/pjanx/keymap.c
index 6ee7f98695..a491a34f96 100644
--- a/keyboards/planck/keymaps/pjanx/keymap.c
+++ b/keyboards/planck/keymaps/pjanx/keymap.c
@@ -165,8 +165,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
 )
 
diff --git a/keyboards/planck/keymaps/pok3r/keymap.c b/keyboards/planck/keymaps/pok3r/keymap.c
index d012d3045d..b5340db4ab 100644
--- a/keyboards/planck/keymaps/pok3r/keymap.c
+++ b/keyboards/planck/keymaps/pok3r/keymap.c
@@ -165,8 +165,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  KC_CAPS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+  KC_CAPS, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/premek/keymap.c b/keyboards/planck/keymaps/premek/keymap.c
index 72fa2faa03..402a603ece 100644
--- a/keyboards/planck/keymaps/premek/keymap.c
+++ b/keyboards/planck/keymaps/premek/keymap.c
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/prog_qgmlwb/src/special.h b/keyboards/planck/keymaps/prog_qgmlwb/src/special.h
index 3645b3603b..bff1e4c5ab 100644
--- a/keyboards/planck/keymaps/prog_qgmlwb/src/special.h
+++ b/keyboards/planck/keymaps/prog_qgmlwb/src/special.h
@@ -19,8 +19,8 @@
 */
 #define adjust_map LAYOUT_ortho_4x12(\
     QK_RBT,  QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD,    RGB_SAI,     RGB_VAD,    RGB_VAI,       KC_DEL,\
-    QK_MAKE, XXXXXXX, MU_MOD,  AU_OFF,  AU_ON,   AG_NORM, AG_SWAP, DF(DVORAK), DF(COLEMAK), DF(QWERTY), DF(QGMLWB_EN), DF(QGMLWB_NO),\
-    _______, MUV_IN,  MUV_DE,  MU_OFF,  MU_ON,   MI_OFF,  MI_ON,   _______,    _______,     KC_T0,      KC_T1,         KC_T2,\
+    QK_MAKE, XXXXXXX, MU_NEXT, AU_OFF,  AU_ON,   AG_NORM, AG_SWAP, DF(DVORAK), DF(COLEMAK), DF(QWERTY), DF(QGMLWB_EN), DF(QGMLWB_NO),\
+    _______, AU_NEXT, AU_PREV, MU_OFF,  MU_ON,   MI_OFF,  MI_ON,   _______,    _______,     KC_T0,      KC_T1,         KC_T2,\
     _______, _______, _______, _______, _______, _______, _______, _______,    XXXXXXX,     XXXXXXX,    XXXXXXX,       XXXXXXX\
 )
 
diff --git a/keyboards/planck/keymaps/ptillemans/keymap.c b/keyboards/planck/keymaps/ptillemans/keymap.c
index 4ea17cd247..6d55617f7f 100644
--- a/keyboards/planck/keymaps/ptillemans/keymap.c
+++ b/keyboards/planck/keymaps/ptillemans/keymap.c
@@ -147,8 +147,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  QWERTY, DVORAK,  PLOVER,  _______,
-    BACKLIT, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  QWERTY, DVORAK,  PLOVER,  _______,
+    BACKLIT, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
diff --git a/keyboards/planck/keymaps/raffle/keymap.c b/keyboards/planck/keymaps/raffle/keymap.c
index ec07a1d3fc..08059e1d40 100644
--- a/keyboards/planck/keymaps/raffle/keymap.c
+++ b/keyboards/planck/keymaps/raffle/keymap.c
@@ -116,8 +116,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
diff --git a/keyboards/planck/keymaps/rodhaene/keymap.c b/keyboards/planck/keymaps/rodhaene/keymap.c
index b2c40a57c6..2cf441bf16 100644
--- a/keyboards/planck/keymaps/rodhaene/keymap.c
+++ b/keyboards/planck/keymaps/rodhaene/keymap.c
@@ -122,8 +122,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NUMPAD, _______, _______,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NUMPAD,  _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 68b19e5eba..097f313cca 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -379,17 +379,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_FEATURS] = LAYOUT_planck_mit(                                                                                                         //
         LCTL(LALT(KC_DEL)), DO_RESET, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, TD(TD_DEG_DEGF), TD(TD_SMILEY), KC_DEL,  //
-        RGB_VAI, RGB_VAD, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DF(_BASE), DF(_COLEMAK), DF(_DVORAK), TO(_PLOVER), MY_RGBCON,            //
-        KC_TRNS, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_TRNS, KC_TRNS, CK_ON, CK_OFF, KC_ENTER,                                  //
+        RGB_VAI, RGB_VAD, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DF(_BASE), DF(_COLEMAK), DF(_DVORAK), TO(_PLOVER), MY_RGBCON,            //
+        KC_TRNS, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_TRNS, KC_TRNS, CK_ON, CK_OFF, KC_ENTER,                                  //
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(_MOUSY), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     /*
     Special Features Layer [6]
     * ,-----------------------------------------------------------------------------------.
     * |C+A+DL| Reset| Debug|RGBTog|RGBMod| Hue+ | Hue- | Sat+ | Sat- |Unicod| Emoji|Delete|
     * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |RGBVAI|RGBVAD|MU_MOD| AU_ON|AU_OFF|RALTGU|SALTGU| Base |Colemk|Dvorak|Plover|RGBCON|
+    * |RGBVAI|RGBVAD|MUNEXT| AU_ON|AU_OFF|RALTGU|SALTGU| Base |Colemk|Dvorak|Plover|RGBCON|
     * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |------|MUV_DE|MUV_IN| MU_ON|MU_OFF| MI_ON|MI_OFF|------|------|CLK-ON|CLKOFF|Enter |
+    * |------|AUPREV|AU_EXT| MU_ON|MU_OFF| MI_ON|MI_OFF|------|------|CLK-ON|CLKOFF|Enter |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |------|------|------|------|------|    TG(8)    |------|------|------|------|------|
     * `-----------------------------------------------------------------------------------'
@@ -480,9 +480,9 @@ const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(m
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (musical_mode) {
         if (clockwise) {
-            tap_code16(MU_MOD);
+            tap_code16(MU_NEXT);
         } else {
-            tap_code16(MU_MOD);
+            tap_code16(MU_NEXT);
         }
     } else {
         if (muse_mode) {
diff --git a/keyboards/planck/keymaps/sgoodwin/keymap.c b/keyboards/planck/keymaps/sgoodwin/keymap.c
index ad380ce6ab..1b88afd952 100644
--- a/keyboards/planck/keymaps/sgoodwin/keymap.c
+++ b/keyboards/planck/keymaps/sgoodwin/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
   _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, QWERTY,  COLEMAK, _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/sigul/keymap.c b/keyboards/planck/keymaps/sigul/keymap.c
index 111e8e49c9..2f5044cda0 100644
--- a/keyboards/planck/keymaps/sigul/keymap.c
+++ b/keyboards/planck/keymaps/sigul/keymap.c
@@ -105,8 +105,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_4x12(
     _______, DF(QWERTY), _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
     _______, _______,    _______, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______,    _______, _______, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______,
-    _______, _______,    _______, _______, _______, _______, _______, _______, MUV_DE,  AU_ON,   AU_OFF,  MUV_IN
+    _______, _______,    _______, _______, _______, _______, MU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______,
+    _______, _______,    _______, _______, _______, _______, _______, _______, AU_PREV, AU_ON,   AU_OFF,  AU_NEXT
 ),
 
 
diff --git a/keyboards/planck/keymaps/skank/keymap.c b/keyboards/planck/keymaps/skank/keymap.c
index 7eaeb98134..fa933dca27 100644
--- a/keyboards/planck/keymaps/skank/keymap.c
+++ b/keyboards/planck/keymaps/skank/keymap.c
@@ -119,8 +119,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,   QWERTY, COLEMAK, _______, _______, _______, _______,   QK_BOOT,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,   MI_ON,   MI_OFF, _______, _______, _______, _______, _______,
+    _______, _______, _______, AU_ON,   AU_OFF,   QWERTY, COLEMAK, _______, _______, _______, _______, QK_BOOT,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,   MI_ON,   MI_OFF, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/skug/keymap.c b/keyboards/planck/keymaps/skug/keymap.c
index 86638eb5e3..05fcf93e75 100644
--- a/keyboards/planck/keymaps/skug/keymap.c
+++ b/keyboards/planck/keymaps/skug/keymap.c
@@ -130,8 +130,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_planck_grid(
-    KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9   , KC_F10 , KC_F11 , KC_F12 ,
-    _______, QK_BOOT, MU_MOD , AU_ON  , AU_OFF , AG_NORM, AG_SWAP, DEFAULT, XXXXXXX , XXXXXXX, UTILITY, _______,
+    KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
+    _______, QK_BOOT, MU_NEXT, AU_ON  , AU_OFF , AG_NORM, AG_SWAP, DEFAULT, XXXXXXX, XXXXXXX, UTILITY, _______,
     _______, SE_PIPE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/planck/keymaps/smittey/keymap.c b/keyboards/planck/keymaps/smittey/keymap.c
index f00a487c00..d65f0ffd3e 100644
--- a/keyboards/planck/keymaps/smittey/keymap.c
+++ b/keyboards/planck/keymaps/smittey/keymap.c
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       QK_BOOT, QWERTY,  XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MI_OFF,   MI_ON,   KC_DEL,
       XXXXXXX, XXXXXXX, XXXXXXX,   DVORAK,    XXXXXXX,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX,   AU_OFF,   AU_ON,   XXXXXXX,
       XXXXXXX, XXXXXXX, XXXXXXX,   COLEMAK,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MU_OFF,   MU_ON,   XXXXXXX,
-      PLOVER,  XXXXXXX, XXXXXXX,   XXXXXXX,   _______,  XXXXXXX, XXXXXXX, _______, XXXXXXX,   MUV_DE,   MUV_IN,  XXXXXXX
+      PLOVER,  XXXXXXX, XXXXXXX,   XXXXXXX,   _______,  XXXXXXX, XXXXXXX, _______, XXXXXXX,   AU_PREV,  AU_NEXT, XXXXXXX
   ),
 
 
diff --git a/keyboards/planck/keymaps/smt/keymap.c b/keyboards/planck/keymaps/smt/keymap.c
index ff71e99377..3c6eb6e74c 100644
--- a/keyboards/planck/keymaps/smt/keymap.c
+++ b/keyboards/planck/keymaps/smt/keymap.c
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/spacebarracecar/keymap.c b/keyboards/planck/keymaps/spacebarracecar/keymap.c
index 5b9f0eb444..f8bd8d7182 100644
--- a/keyboards/planck/keymaps/spacebarracecar/keymap.c
+++ b/keyboards/planck/keymaps/spacebarracecar/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-  KC_LCTL,  KC_LALT,  KC_LGUI,  KC_DOWN,  KC_UP,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  MU_MOD,   MU_OFF
+  KC_LCTL,  KC_LALT,  KC_LGUI,  KC_DOWN,  KC_UP,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  MU_NEXT,  MU_OFF
 ),
 
 /* Deadkey
diff --git a/keyboards/planck/keymaps/steno/keymap.c b/keyboards/planck/keymaps/steno/keymap.c
index aac974f6a6..9de27e47bf 100644
--- a/keyboards/planck/keymaps/steno/keymap.c
+++ b/keyboards/planck/keymaps/steno/keymap.c
@@ -167,8 +167,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, ST_BOLT, ST_GEM,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, ST_BOLT, ST_GEM,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/stuartfong1/keymap.c b/keyboards/planck/keymaps/stuartfong1/keymap.c
index f9081ab0a8..8d770ae83b 100644
--- a/keyboards/planck/keymaps/stuartfong1/keymap.c
+++ b/keyboards/planck/keymaps/stuartfong1/keymap.c
@@ -175,8 +175,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
      */
     [_ADJUST] = LAYOUT_planck_grid(
         XXXXXXX, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, 
-        XXXXXXX, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,  XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+        XXXXXXX, XXXXXXX, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,  XXXXXXX, XXXXXXX, XXXXXXX, 
+        XXXXXXX, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
     )
 };
diff --git a/keyboards/planck/keymaps/synth_sample/keymap.c b/keyboards/planck/keymaps/synth_sample/keymap.c
index 9d0a4b40f2..4b6c53c3a8 100644
--- a/keyboards/planck/keymaps/synth_sample/keymap.c
+++ b/keyboards/planck/keymaps/synth_sample/keymap.c
@@ -161,8 +161,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/synth_wavetable/keymap.c b/keyboards/planck/keymaps/synth_wavetable/keymap.c
index 6da82ec2f7..f23c426014 100644
--- a/keyboards/planck/keymaps/synth_wavetable/keymap.c
+++ b/keyboards/planck/keymaps/synth_wavetable/keymap.c
@@ -161,8 +161,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/that_canadian/keymap.c b/keyboards/planck/keymaps/that_canadian/keymap.c
index a9762e6e88..bb9ff261ee 100644
--- a/keyboards/planck/keymaps/that_canadian/keymap.c
+++ b/keyboards/planck/keymaps/that_canadian/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_planck_grid(
   TSKMGR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),
 
diff --git a/keyboards/planck/keymaps/tk/keymap.c b/keyboards/planck/keymaps/tk/keymap.c
index 668099538e..68f0f82a3d 100644
--- a/keyboards/planck/keymaps/tk/keymap.c
+++ b/keyboards/planck/keymaps/tk/keymap.c
@@ -181,8 +181,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
     [_HYPER] = LAYOUT_planck_grid(
         R_MODES, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  QK_BOOT,
-        AU_TOG,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  MU_TOG,
-        CK_TOGG, KC_F21,  KC_F22,  KC_F23,  KC_F24,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_MOD,
+        AU_TOGG, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  MU_TOGG,
+        CK_TOGG, KC_F21,  KC_F22,  KC_F23,  KC_F24,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_NEXT,
         XXXXXXX, KC_WAKE, KC_SLEP, KC_PSCR, XXXXXXX, BASE,    BASE,    XXXXXXX, _______, _______, _______, _______
     ),
 
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
index cdbddf4b55..1190502e2c 100644
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ b/keyboards/planck/keymaps/tom/keymap.c
@@ -104,8 +104,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     C(G(S(KC_4))), QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/tomkonidas/keymap.c b/keyboards/planck/keymaps/tomkonidas/keymap.c
index 2cbd93d791..9f9464280f 100644
--- a/keyboards/planck/keymaps/tomkonidas/keymap.c
+++ b/keyboards/planck/keymaps/tomkonidas/keymap.c
@@ -164,8 +164,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/unagi/keymap.c b/keyboards/planck/keymaps/unagi/keymap.c
index ba3a49b03f..0424c5b520 100644
--- a/keyboards/planck/keymaps/unagi/keymap.c
+++ b/keyboards/planck/keymaps/unagi/keymap.c
@@ -170,8 +170,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_planck_grid(
     _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    _______, _______, 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,  _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/planck/keymaps/vaire/keymap.c b/keyboards/planck/keymaps/vaire/keymap.c
index fb2f3c1770..3b411e6185 100644
--- a/keyboards/planck/keymaps/vaire/keymap.c
+++ b/keyboards/planck/keymaps/vaire/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TILD,    DESK_LEFT,  	WIN_LEFT,       KC_F4,          WIN_RIGHT,      DESK_RIGHT,     DOCS,       	SNAP_LEFT, 	SNAP_UP,     	SNAP_RIGHT,     SNAP_DOWN,      KC_DEL, 
     KC_CAPS,    KC_QUOT,    	KC_LBRC,        KC_LCBR,        KC_LPRN,        KC_BSLS,        KC_SLSH,    	KC_RPRN, 	KC_RCBR,     	KC_RBRC,    	KC_DQUO,        KC_QUOT, 
     KC_PWR,     KC_SLEP,    	KC_WAKE,        KC_HOME,        BL_BRTG,        BL_STEP,        KC_TRNS,    	KC_CALC, 	KC_LT,     	    KC_GT,     	    KC_COLON,   	KC_LSFT, 
-    TO(0),      KC_LCTL,    	KC_LALT,        KC_LGUI,        KC_LALT,        KC_LCTL,        KC_TRNS,    	KC_TRNS, 	AU_TOG,      	MU_TOG,     	MU_MOD,     	LCTL(KC_RGHT)),
+    TO(0),      KC_LCTL,    	KC_LALT,        KC_LGUI,        KC_LALT,        KC_LCTL,        KC_TRNS,    	KC_TRNS, 	AU_TOGG,      	MU_TOGG,     	MU_NEXT,     	LCTL(KC_RGHT)),
 
   LAYOUT_planck_grid(
     TO(0),      KC_LSCR,    	WIN_LEFT,       KC_MS_WH_UP,    WIN_RIGHT,  	KC_TRNS,        KC_TRNS,    	KC_MS_BTN1, 	KC_MS_U,    	KC_MS_BTN2,    	KC_TRNS,        KC_TRNS, 
diff --git a/keyboards/preonic/keymaps/0xdec/keymap.c b/keyboards/preonic/keymaps/0xdec/keymap.c
index 2a4b1bdc0c..9d184b2734 100644
--- a/keyboards/preonic/keymaps/0xdec/keymap.c
+++ b/keyboards/preonic/keymaps/0xdec/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_RAISE] = LAYOUT_preonic_grid( \
   KC_SLEP,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_PSCR, \
-  XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_UP  ,COLEMAK,GAME   ,MU_TOG ,KC_MENU,KC_SCRL, \
+  XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOGG,KC_VOLU,BL_UP  ,COLEMAK,GAME   ,MU_TOGG,KC_MENU,KC_SCRL, \
   KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DOWN,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_PAUS, \
   XXXXXXX,KC_WBAK,KC_WSTP,KC_WREF,KC_WFWD,KC_MUTE,BL_TOGG,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_INS,  \
   QK_BOOT,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______  \
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
index 24d02f1edd..1f9fe6d9eb 100644
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
@@ -159,9 +159,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
 )
 
diff --git a/keyboards/preonic/keymaps/arkag/keymap.c b/keyboards/preonic/keymaps/arkag/keymap.c
index 3b6a32682f..a355925895 100644
--- a/keyboards/preonic/keymaps/arkag/keymap.c
+++ b/keyboards/preonic/keymaps/arkag/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, M_AEST,  _______, _______, _______, _______, M_OS   ),
 
   [_KEEB] = LAYOUT_preonic_grid(
-    CK_TOGG, AU_TOG,  MU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    CK_TOGG, AU_TOGG, MU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     M_USSR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, BL_TOGG, BL_STEP, BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______,
     RGB_M_P, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______,
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef AUDIO_ENABLE
 bool music_mask_user(uint16_t keycode) {
     switch (keycode) {
-    case MU_TOG:
+    case MU_TOGG:
     case SYMBOL:
     case KEEB:
       return false;
diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c
index 662ff030eb..e6f505015f 100644
--- a/keyboards/preonic/keymaps/badger/keymap.c
+++ b/keyboards/preonic/keymaps/badger/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______,  KC_0,     KC_DOT,   KC_ENT,   _______,            _______,            _______,  _______,  _______,  _______),
 
   [_ADJUST_ORTHO]   = LAYOUT_preonic_2x2u(
-      KC_ESC,   AU_ON,    AU_OFF,   CK_TOGG,  CK_UP,    CK_DOWN,  CK_RST,   MU_ON,    MU_OFF,   MU_TOG,   MU_MOD,   KC_DEL,  \
+      KC_ESC,   AU_ON,    AU_OFF,   CK_TOGG,  CK_UP,    CK_DOWN,  CK_RST,   MU_ON,    MU_OFF,   MU_TOGG,  MU_NEXT,  KC_DEL,  \
       _______,  NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
       _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
       _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
diff --git a/keyboards/preonic/keymaps/blake-newman/keymap.c b/keyboards/preonic/keymaps/blake-newman/keymap.c
index 9c6db3777e..172fdcadca 100644
--- a/keyboards/preonic/keymaps/blake-newman/keymap.c
+++ b/keyboards/preonic/keymaps/blake-newman/keymap.c
@@ -181,8 +181,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] = LAYOUT_preonic_1x2uC( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
     _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,  \
-    KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  NUMPAD,  KC_INS,  \
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+    KC_CAPS, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  NUMPAD,  KC_INS,  \
+    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
     _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
   )
 
diff --git a/keyboards/preonic/keymaps/boy314/keymap.c b/keyboards/preonic/keymaps/boy314/keymap.c
index de5b59a025..1f581d3a5e 100644
--- a/keyboards/preonic/keymaps/boy314/keymap.c
+++ b/keyboards/preonic/keymaps/boy314/keymap.c
@@ -162,9 +162,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  DVORAK,  _______, _______, _______, _______, \
-  _______, ARROWS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  DVORAK,  _______, _______, _______, _______, \
+  _______, ARROWS,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 
 };
diff --git a/keyboards/preonic/keymaps/choromanski/config.h b/keyboards/preonic/keymaps/choromanski/config.h
index 163afaed93..c89c4d1024 100644
--- a/keyboards/preonic/keymaps/choromanski/config.h
+++ b/keyboards/preonic/keymaps/choromanski/config.h
@@ -17,7 +17,7 @@
                                 }
 #endif
 
-#define MUSIC_MASK (keycode != MU_TOG)
+#define MUSIC_MASK (keycode != MU_TOGG)
 
 
 /*
diff --git a/keyboards/preonic/keymaps/choromanski/keymap.c b/keyboards/preonic/keymaps/choromanski/keymap.c
index 0f8339662a..dd4a151980 100644
--- a/keyboards/preonic/keymaps/choromanski/keymap.c
+++ b/keyboards/preonic/keymaps/choromanski/keymap.c
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_NO,			KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO, \
 	KC_NO,			KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO, \
 	KC_NO,			KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO, \
-	TO(_COLEMAK),	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	MU_MOD,	MU_TOG \
+	TO(_COLEMAK),	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	MU_NEXT,	MU_TOGG \
 )
 
 };
diff --git a/keyboards/preonic/keymaps/cranium/keymap.c b/keyboards/preonic/keymaps/cranium/keymap.c
index 347b1f6431..7b81774027 100644
--- a/keyboards/preonic/keymaps/cranium/keymap.c
+++ b/keyboards/preonic/keymaps/cranium/keymap.c
@@ -110,8 +110,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP,
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, KC_PSCR
 )
 
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c
index 0d4e193b6b..12bec41a85 100644
--- a/keyboards/preonic/keymaps/default/keymap.c
+++ b/keyboards/preonic/keymaps/default/keymap.c
@@ -158,8 +158,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/preonic/keymaps/drasbeck/keymap.c b/keyboards/preonic/keymaps/drasbeck/keymap.c
index 81566d33dc..f6844beabb 100644
--- a/keyboards/preonic/keymaps/drasbeck/keymap.c
+++ b/keyboards/preonic/keymaps/drasbeck/keymap.c
@@ -88,8 +88,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/preonic/keymaps/dudeofawesome/keymap.c b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
index f6f190e282..159c844c7f 100644
--- a/keyboards/preonic/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/preonic/keymaps/dudeofawesome/keymap.c
@@ -181,8 +181,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  KC_CAPS, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  KC_CAPS, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, DVORAK,  COLEMAK, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______  \
 ),
 
diff --git a/keyboards/preonic/keymaps/ekis_isa/keymap.c b/keyboards/preonic/keymaps/ekis_isa/keymap.c
index 715fc0ea0c..53d9a8987a 100644
--- a/keyboards/preonic/keymaps/ekis_isa/keymap.c
+++ b/keyboards/preonic/keymaps/ekis_isa/keymap.c
@@ -157,8 +157,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_1x2uC( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______  \
 )
 
diff --git a/keyboards/preonic/keymaps/elisiano/keymap.c b/keyboards/preonic/keymaps/elisiano/keymap.c
index 72757e9214..5728894c43 100644
--- a/keyboards/preonic/keymaps/elisiano/keymap.c
+++ b/keyboards/preonic/keymaps/elisiano/keymap.c
@@ -160,8 +160,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______,    _______, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,     COLEMAK, DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TG(_MOUSE), _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,     COLEMAK, DVORAK,  _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TG(_MOUSE), _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______
 ),
 
diff --git a/keyboards/preonic/keymaps/fig-r/keymap.c b/keyboards/preonic/keymaps/fig-r/keymap.c
index 4232adc68d..6f930130c3 100644
--- a/keyboards/preonic/keymaps/fig-r/keymap.c
+++ b/keyboards/preonic/keymaps/fig-r/keymap.c
@@ -135,8 +135,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid( \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 ),
 
diff --git a/keyboards/preonic/keymaps/fsck/keymap.c b/keyboards/preonic/keymaps/fsck/keymap.c
index 09cc5b6a96..1eeb102462 100644
--- a/keyboards/preonic/keymaps/fsck/keymap.c
+++ b/keyboards/preonic/keymaps/fsck/keymap.c
@@ -112,8 +112,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 
diff --git a/keyboards/preonic/keymaps/jpe230/keymap.c b/keyboards/preonic/keymaps/jpe230/keymap.c
index 43aa42aaf1..a5f459b587 100644
--- a/keyboards/preonic/keymaps/jpe230/keymap.c
+++ b/keyboards/preonic/keymaps/jpe230/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------------------------------------------------------------.
        KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-       KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CK_UP,  AU_TOG,
+       KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CK_UP, AU_TOGG,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
       KC_CAPS, _______, _______, _______, _______, _______, _______,   KC_UP, _______, _______, CK_DOWN, _______,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
       KC_VOLD, KC_MPRV, KC_MNXT,   KC_F1,   KC_F2,   KC_F3, KC_LSRS,    KC_1,    KC_2,    KC_3, _______, DB_TOGG,
   //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-       MU_TOG,  MU_MOD, _______, _______, _______, KC_LSRE, _______, KC_LERS, _______, _______, _______,  EE_CLR
+      MU_TOGG, MU_NEXT, _______, _______, _______, KC_LSRE, _______, KC_LERS, _______, _______, _______,  EE_CLR
   //`-----------------------------------------------------------------------------------------------------------'
   )
 };
diff --git a/keyboards/preonic/keymaps/keelhauler/keymap.c b/keyboards/preonic/keymaps/keelhauler/keymap.c
index c542abf2c5..3fb64c081f 100644
--- a/keyboards/preonic/keymaps/keelhauler/keymap.c
+++ b/keyboards/preonic/keymaps/keelhauler/keymap.c
@@ -162,8 +162,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 
diff --git a/keyboards/preonic/keymaps/kjwon15/keymap.c b/keyboards/preonic/keymaps/kjwon15/keymap.c
index 8e828aed19..f419ddfae4 100644
--- a/keyboards/preonic/keymaps/kjwon15/keymap.c
+++ b/keyboards/preonic/keymaps/kjwon15/keymap.c
@@ -160,9 +160,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  QK_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
+  QK_LOCK, QK_BOOT, CK_TOGG, MU_NEXT, QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
   _______, AU_ON,   AU_OFF,  KC_BTN2, KC_BTN1, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_ACL0, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_ACL1, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_ACL1, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL2  \
 ),
 
diff --git a/keyboards/preonic/keymaps/kuatsure/keymap.c b/keyboards/preonic/keymaps/kuatsure/keymap.c
index 5594f6391e..08a74f15b6 100644
--- a/keyboards/preonic/keymaps/kuatsure/keymap.c
+++ b/keyboards/preonic/keymaps/kuatsure/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ____________FUNCTION_1____________, ____________FUNCTION_2____________, ____________FUNCTION_3____________, \
   _______, KB_MAKE, KB_FLSH, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, \
-  _______, KB_VRSN, _______, _______, MU_MOD,  MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, \
+  _______, KB_VRSN, _______, _______, MU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,  GAME,    _______, _______  \
 ),
 
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
index 0e12012517..756488f617 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
@@ -278,9 +278,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_preonic_grid( \
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,
         KC_TAB,  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
-    /*_______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,	 QWERTY,  COLEMAK, DVORAK,  _______, _______, \ Remove this if adding Colemak and Dvorak*/
-        _______, _______, MU_MOD,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,   QWERTY,  QWWIN,   _______, _______, KC_F12,
-        _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+    /*_______, _______, MU_NEXT,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,	 QWERTY,  COLEMAK, DVORAK,  _______, _______, \ Remove this if adding Colemak and Dvorak*/
+        _______, _______, MU_NEXT, AU_ON,   AU_OFF,  QWERTY,  QWWIN,   QWERTY,  QWWIN,   _______, _______, KC_F12,
+        _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LLSWIT
     ),
 
diff --git a/keyboards/preonic/keymaps/mechmaster48/keymap.c b/keyboards/preonic/keymaps/mechmaster48/keymap.c
index b7959a170a..7aa88267fd 100644
--- a/keyboards/preonic/keymaps/mechmaster48/keymap.c
+++ b/keyboards/preonic/keymaps/mechmaster48/keymap.c
@@ -112,8 +112,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/preonic/keymaps/mguterl/keymap.c b/keyboards/preonic/keymaps/mguterl/keymap.c
index 2a56a75309..4544965361 100644
--- a/keyboards/preonic/keymaps/mguterl/keymap.c
+++ b/keyboards/preonic/keymaps/mguterl/keymap.c
@@ -165,8 +165,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   TG_GAME, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
+  _______, AU_PREV,  AU_NEXT,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/preonic/keymaps/mikethetiger/keymap.c b/keyboards/preonic/keymaps/mikethetiger/keymap.c
index 347e982612..5161214e51 100644
--- a/keyboards/preonic/keymaps/mikethetiger/keymap.c
+++ b/keyboards/preonic/keymaps/mikethetiger/keymap.c
@@ -158,8 +158,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 
diff --git a/keyboards/preonic/keymaps/muzfuz/keymap.c b/keyboards/preonic/keymaps/muzfuz/keymap.c
index fb8a908b17..f1befddb83 100644
--- a/keyboards/preonic/keymaps/muzfuz/keymap.c
+++ b/keyboards/preonic/keymaps/muzfuz/keymap.c
@@ -116,8 +116,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_preonic_grid(
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
         _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-        _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
-        _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
+        _______, _______, MU_NEXT, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
+        _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
 
 };
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index 8761bfed13..c54eff71d5 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -228,9 +228,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_1x2uC (
-  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
+  AU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
+  MU_TOGG, AU_PREV, AU_NEXT, XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOGG, RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_TOG,     _______, XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
 )
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index f9e305e4f9..a269519339 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -204,9 +204,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_preonic_2x2u (
-  AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
+  AU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
   CK_TOGG, CK_DOWN, CK_UP,   XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  MU_TOG,  MUV_DE,  MUV_IN,  XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
+  MU_TOGG, AU_PREV, AU_NEXT, XXXXXXX, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP,
   MI_TOGG, RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_SPI, KC_LSFT,
   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     _______,          _______,      XXXXXXX,RGB_RMOD, RGB_SPD, RGB_MOD
 )
diff --git a/keyboards/preonic/keymaps/nikchi/keymap.c b/keyboards/preonic/keymaps/nikchi/keymap.c
index 861c2ae03b..37b3aef65b 100644
--- a/keyboards/preonic/keymaps/nikchi/keymap.c
+++ b/keyboards/preonic/keymaps/nikchi/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 
diff --git a/keyboards/preonic/keymaps/pezhore/keymap.c b/keyboards/preonic/keymaps/pezhore/keymap.c
index 5470a8542d..ec7cd73172 100644
--- a/keyboards/preonic/keymaps/pezhore/keymap.c
+++ b/keyboards/preonic/keymaps/pezhore/keymap.c
@@ -162,8 +162,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
   _______,  QK_BOOT,  DB_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
-  _______,  _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  _______,  _______,  _______,  _______,  _______,
-  _______,  MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  MU_NEXT,  AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  _______,  _______,  _______,  _______,  _______,
+  _______,  AU_PREV,  AU_NEXT,  MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,  _______,  _______,
   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
 )
 
diff --git a/keyboards/preonic/keymaps/pitty/keymap.c b/keyboards/preonic/keymaps/pitty/keymap.c
index 5705ae97b8..8ccac460a0 100644
--- a/keyboards/preonic/keymaps/pitty/keymap.c
+++ b/keyboards/preonic/keymaps/pitty/keymap.c
@@ -138,8 +138,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
 )
 
diff --git a/keyboards/preonic/keymaps/pvillano/keymap.c b/keyboards/preonic/keymaps/pvillano/keymap.c
index ff5124b076..01cec1f80b 100644
--- a/keyboards/preonic/keymaps/pvillano/keymap.c
+++ b/keyboards/preonic/keymaps/pvillano/keymap.c
@@ -94,7 +94,7 @@
       _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, _______, _______, KC_DEL,
       _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______, _______, _______, QK_BOOT, _______,
       _______, KC_F9,   KC_F10,  KC_F11,  KC_F12, TG(_GAME),_______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, KC_NUM,  MU_TOG,  _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, KC_NUM,  MU_TOGG, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
   };
diff --git a/keyboards/preonic/keymaps/rmeli/keymap.c b/keyboards/preonic/keymaps/rmeli/keymap.c
index b12dffe4b0..66af180144 100644
--- a/keyboards/preonic/keymaps/rmeli/keymap.c
+++ b/keyboards/preonic/keymaps/rmeli/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_wrapper(
   QK_BOOT, _________________NONE_5x___________________, ______________________NONE_6x_______________________,
   XXXXXXX, MU_ON,   AU_ON,   MI_ON,   XXXXXXX, XXXXXXX, _______________CONFIG_R1_x5________________,  QWERTY,
-  QK_BOOT, MU_MOD,  AU_TOG,  MI_TOG,  XXXXXXX, XXXXXXX, _______________CONFIG_R2_x5________________, XXXXXXX,
+  QK_BOOT, MU_NEXT, AU_TOGG, MI_TOG,  XXXXXXX, XXXXXXX, _______________CONFIG_R2_x5________________, XXXXXXX,
   XXXXXXX, MU_OFF,  AU_OFF,  MI_OFF,  XXXXXXX, XXXXXXX, _______________CONFIG_R3_x5________________, COLEMAK,
   ______________________BLANK_6x______________________, ______________________BLANK_6x______________________
 )
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
index 8e0d5c330a..1780fa659a 100644
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ b/keyboards/preonic/keymaps/senseored/keymap.c
@@ -165,8 +165,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
   TO(_GAMEMODE), QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  \
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)  \
 ),
 
diff --git a/keyboards/preonic/keymaps/smt/keymap.c b/keyboards/preonic/keymaps/smt/keymap.c
index 3600a15e66..2cf52e43e4 100644
--- a/keyboards/preonic/keymaps/smt/keymap.c
+++ b/keyboards/preonic/keymaps/smt/keymap.c
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/preonic/keymaps/that_canadian/keymap.c b/keyboards/preonic/keymaps/that_canadian/keymap.c
index 5b5e8266a9..515624e1db 100644
--- a/keyboards/preonic/keymaps/that_canadian/keymap.c
+++ b/keyboards/preonic/keymaps/that_canadian/keymap.c
@@ -106,8 +106,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_F1,   KC_F2,   KC_F3,   LALT(KC_F4), KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  \
   TSKMGR,  _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CALTDEL, \
   _______, _______, _______, AU_ON,   AU_OFF,      AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______, \
-  _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, QK_BOOT    \
+  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, QK_BOOT  \
 ),
 
 /* Function
diff --git a/keyboards/preonic/keymaps/via/keymap.c b/keyboards/preonic/keymaps/via/keymap.c
index 0074373d08..e9c5c32c73 100644
--- a/keyboards/preonic/keymaps/via/keymap.c
+++ b/keyboards/preonic/keymaps/via/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_preonic_grid(
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
   _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
diff --git a/keyboards/preonic/keymaps/zach/keymap.c b/keyboards/preonic/keymaps/zach/keymap.c
index 49f465f2ee..6ed653dd61 100644
--- a/keyboards/preonic/keymaps/zach/keymap.c
+++ b/keyboards/preonic/keymaps/zach/keymap.c
@@ -37,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_ADJUST] = LAYOUT_preonic_1x2uC(  /* ADJUST - Macros, Layer Switching, Function Keys */
-  UNIWIN,  XXXXXXX, XXXXXXX, RANDIG,  RANDIG,  KC_INS,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, AU_TOG, MU_TOG,  \
-  UNILIN,  SUPA2,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,    KC_F2,   KC_F3,   KC_F4,  XXXXXXX, \
-  XXXXXXX, DEGREE,  IBANG,   LAROW,   RAROW,   SWCOLE,  COLEMAK, KC_F5,    KC_F6,   KC_F7,   KC_F8,  BL_UP,   \
-  _______, CADKEY,  MICRO,   WOMEGA,  OMEGA,   XXXXXXX, XXXXXXX, KC_F9,    KC_F10,  KC_F11,  KC_F12, BL_DOWN, \
-  _______, _______, _______, _______, _______,      QK_BOOT,     _______,  XXXXXXX, MUV_DE,  MUV_IN, BL_TOGG  \
+  UNIWIN,  XXXXXXX, XXXXXXX, RANDIG,  RANDIG,  KC_INS,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, AU_TOGG, MU_TOGG, \
+  UNILIN,  SUPA2,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,    KC_F2,   KC_F3,   KC_F4,   XXXXXXX, \
+  XXXXXXX, DEGREE,  IBANG,   LAROW,   RAROW,   SWCOLE,  COLEMAK, KC_F5,    KC_F6,   KC_F7,   KC_F8,   BL_UP,   \
+  _______, CADKEY,  MICRO,   WOMEGA,  OMEGA,   XXXXXXX, XXXXXXX, KC_F9,    KC_F10,  KC_F11,  KC_F12,  BL_DOWN, \
+  _______, _______, _______, _______, _______,      QK_BOOT,     _______,  XXXXXXX, AU_PREV, AU_NEXT, BL_TOGG  \
 ),
 
 [_UNICODES] = LAYOUT_preonic_1x2uC(  /* UNICODES - Extra layer for unicode stuff */
diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c
index 85707be9d6..35958221bb 100644
--- a/keyboards/redox/keymaps/jeherve/keymap.c
+++ b/keyboards/redox/keymaps/jeherve/keymap.c
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,QK_BOOT ,DB_TOGG ,AU_TOG  ,XXXXXXX ,_______ ,
+     _______ ,XXXXXXX ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,QK_BOOT ,DB_TOGG ,AU_TOGG ,XXXXXXX ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
diff --git a/keyboards/rgbkb/sol3/keymaps/default/keymap.c b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
index 31fb3ac5f1..19499ab3c3 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
         _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______,                   _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PSCR, KC_PGUP,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,                   _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_PGDN,
-        _______,  AU_TOG,  MU_TOG,  MU_MOD, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, AU_TOGG, MU_TOGG, MU_NEXT, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
         _______, CK_TOGG,   CK_UP, CK_DOWN, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
 
         _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/rgbkb/sol3/keymaps/via/keymap.c b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
index cb7ce63a8d..1147925908 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
         _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______,                   _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PSCR, KC_PGUP,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,                   _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_PGDN,
-        _______,  AU_TOG,  MU_TOG,  MU_MOD, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, AU_TOGG, MU_TOGG, MU_NEXT, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
         _______, CK_TOGG,   CK_UP, CK_DOWN, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
 
         _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 3b9257068f..e744aee527 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -293,17 +293,17 @@ lookup_table_t lookup_table[333] =
  {"QK_GESC", QK_GESC},
  {"AU_ON", AU_ON},
  {"AU_OFF", AU_OFF},
- {"AU_TOG", AU_TOG},
- {"CLICKY_TOGGLE", CLICKY_TOGGLE},
- {"CLICKY_ENABLE", CLICKY_ENABLE},
- {"CLICKY_DISABLE", CLICKY_DISABLE},
- {"CLICKY_UP", CLICKY_UP},
- {"CLICKY_DOWN", CLICKY_DOWN},
- {"CLICKY_RESET", CLICKY_RESET},
+ {"AU_TOGG", AU_TOGG},
+ {"CK_TOGG", CK_TOGG},
+ {"CK_ON", CK_ON},
+ {"CK_OFF", CK_OFF},
+ {"CK_UP", CK_UP},
+ {"CK_DOWN", CK_DOWN},
+ {"CK_RST", CK_RST},
  {"MU_ON", MU_ON},
  {"MU_OFF", MU_OFF},
- {"MU_TOG", MU_TOG},
- {"MU_MOD", MU_MOD},
+ {"MU_TOGG", MU_TOGG},
+ {"MU_NEXT", MU_NEXT},
  {"BL_ON", BL_ON},
  {"BL_OFF", BL_OFF},
  {"BL_DOWN", BL_DOWN},
diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c
index ca455e8853..8c3933525c 100644
--- a/keyboards/silverbullet44/keymaps/FKML/keymap.c
+++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c
@@ -98,8 +98,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [_ADJUST] = LAYOUT(
     _______, XXXXXXX, XXXXXXX, CK_RST,  XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    XXXXXXX, XXXXXXX, MU_TOG,  CK_UP,   AU_TOG,  XXXXXXX,                      RGB_SPI, RGB_MOD,  RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX,
-    XXXXXXX, XXXXXXX, MU_MOD,  CK_DOWN, XXXXXXX, XXXXXXX,                      RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX,
+    XXXXXXX, XXXXXXX, MU_TOGG, CK_UP,   AU_TOGG, XXXXXXX,                      RGB_SPI, RGB_MOD,  RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX,
+    XXXXXXX, XXXXXXX, MU_NEXT, CK_DOWN, XXXXXXX, XXXXXXX,                      RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX,
                                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
   )
 };
diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c
index e930cf9adf..61718b9e58 100644
--- a/keyboards/silverbullet44/keymaps/default/keymap.c
+++ b/keyboards/silverbullet44/keymaps/default/keymap.c
@@ -110,8 +110,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT(
   _______, XXXXXXX, XXXXXXX, CK_RST,  XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  XXXXXXX, XXXXXXX, MU_TOG,  CK_UP,   AU_TOG,  XXXXXXX,                      RGB_SPI, RGB_MOD,  RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX,
-  XXXXXXX, XXXXXXX, MU_MOD,  CK_DOWN, XXXXXXX, XXXXXXX,                      RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX,
+  XXXXXXX, XXXXXXX, MU_TOGG, CK_UP,   AU_TOGG, XXXXXXX,                      RGB_SPI, RGB_MOD,  RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX,
+  XXXXXXX, XXXXXXX, MU_NEXT, CK_DOWN, XXXXXXX, XXXXXXX,                      RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX,
                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
   )
 };
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
index 6e403595a1..6b18e7c3bc 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT_wrapper(
         QK_MAKE, _________________ADJUST_L1_________________,                                       _________________ADJUST_R1_________________, QK_BOOT,
         VRSN,    _________________ADJUST_L2_________________,                                       _________________ADJUST_R2_________________, EE_CLR,
-        UC_NEXT, _________________ADJUST_L3_________________, HPT_TOG, HPT_FBK,   MG_NKRO, UC_NEXT, _________________ADJUST_R3_________________, TG_MODS,
+        UC_NEXT, _________________ADJUST_L3_________________, HF_TOGG, HF_FDBK,   MG_NKRO, UC_NEXT, _________________ADJUST_R3_________________, TG_MODS,
                                    QK_RBT,  _______, KEYLOCK, KC_NUKE, _______,   _______, _______, _______, _______, AUTO_CTN
     ),
 //     [_LAYERINDEX] = LAYOUT_wrapper(
diff --git a/keyboards/splitkb/zima/keymaps/default/keymap.c b/keyboards/splitkb/zima/keymaps/default/keymap.c
index fba4ad3b1b..2bf4c3700f 100644
--- a/keyboards/splitkb/zima/keymaps/default/keymap.c
+++ b/keyboards/splitkb/zima/keymaps/default/keymap.c
@@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_TOG, RGB_MOD, _______,
         RGB_HUI, RGB_SAI, RGB_VAI,
         RGB_HUD, RGB_SAD, RGB_VAD,
-        HPT_TOG, HPT_FBK, HPT_CONT
+        HF_TOGG, HF_FDBK, HF_CONT
     )
 };
diff --git a/keyboards/splitkb/zima/keymaps/drashna/keymap.c b/keyboards/splitkb/zima/keymaps/drashna/keymap.c
index e0511f75d3..1b4f269c05 100644
--- a/keyboards/splitkb/zima/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/zima/keymaps/drashna/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_TOG, RGB_MOD, _______,
         RGB_HUI, RGB_SAI, RGB_VAI,
         RGB_HUD, RGB_SAD, RGB_VAD,
-        HPT_TOG, HPT_FBK, HPT_CONT
+        HF_TOGG, HF_FDBK, HF_CONT
     )
 };
 
diff --git a/keyboards/splitkb/zima/keymaps/via/keymap.c b/keyboards/splitkb/zima/keymaps/via/keymap.c
index 3a360cd9f7..7d29c05fdc 100644
--- a/keyboards/splitkb/zima/keymaps/via/keymap.c
+++ b/keyboards/splitkb/zima/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_TOG, RGB_MOD, _______,
         RGB_HUI, RGB_SAI, RGB_VAI,
         RGB_HUD, RGB_SAD, RGB_VAD,
-        HPT_TOG, HPT_FBK, HPT_CONT
+        HF_TOGG, HF_FDBK, HF_CONT
     ),
     [3] = LAYOUT_ortho_4x3(
         _______, _______, _______,
diff --git a/keyboards/subatomic/keymaps/default/keymap.c b/keyboards/subatomic/keymaps/default/keymap.c
index 00a60bc2a0..9d579ac937 100644
--- a/keyboards/subatomic/keymaps/default/keymap.c
+++ b/keyboards/subatomic/keymaps/default/keymap.c
@@ -144,9 +144,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   [_ADJUST] = LAYOUT_ortho_5x14_1x2uC(
     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, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_TRNS,
+    KC_TRNS, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_TRNS,
     KC_TRNS, _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, KC_TRNS,
-    KC_TRNS, _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, KC_TRNS,
+    KC_TRNS, _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, KC_TRNS,
     KC_TRNS, _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______, KC_TRNS
   )
 
diff --git a/keyboards/unison/keymaps/via/keymap.c b/keyboards/unison/keymaps/via/keymap.c
index 4e14bb59ce..fe3ff4e82f 100644
--- a/keyboards/unison/keymaps/via/keymap.c
+++ b/keyboards/unison/keymaps/via/keymap.c
@@ -47,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJ] = LAYOUT_all(
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,    _______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,   _______,
-        _______,    AU_TOG, CK_TOGG,MU_TOG, MU_MOD, _______,_______,_______,_______,_______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,    _______,
+        _______,    _______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD,   _______,
+        _______,    AU_TOGG,CK_TOGG,MU_TOGG,MU_NEXT,_______,_______,_______,_______,_______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,    _______,
         KC_CAPS,_______,CK_RST, CK_DOWN,CK_UP,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
     )
diff --git a/keyboards/work_louder/work_board/keymaps/default/keymap.c b/keyboards/work_louder/work_board/keymaps/default/keymap.c
index 3489274fea..14fb5014c7 100644
--- a/keyboards/work_louder/work_board/keymaps/default/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/default/keymap.c
@@ -53,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT(
-        _______, QK_BOOT,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , R_M_TOG,
-        _______, _______, MU_MOD,  R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______,
+        _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , R_M_TOG,
+        _______, _______, MU_NEXT, R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index 0ffdd8b494..9ae3b36262 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJUST] = LAYOUT(
         _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,  R_M_TOG,
-        _______, _______, MU_MOD,  R_M_TOG, R_M_MOD, _______, _______, _______, _______, R_M_SAI, R_M_HUI, R_M_MOD,
+        _______, _______, MU_NEXT, R_M_TOG, R_M_MOD, _______, _______, _______, _______, R_M_SAI, R_M_HUI, R_M_MOD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, R_M_SAD, R_M_HUD, R_M_RMOD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
diff --git a/keyboards/xiudi/xd75/keymaps/fabian/keymap.c b/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
index a88790048f..32ecb77f86 100644
--- a/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
@@ -195,8 +195,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_ADJUST] = LAYOUT_ortho_5x15(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   _______, _______, _______, MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, 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,  _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
diff --git a/keyboards/xw60/keymaps/default/keymap.c b/keyboards/xw60/keymaps/default/keymap.c
index 1a4d7fb3da..8b807292ac 100644
--- a/keyboards/xw60/keymaps/default/keymap.c
+++ b/keyboards/xw60/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
     KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, KC_DEL,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, HPT_TOG,HPT_DWLI,HPT_DWLD, _______, _______, KC_DOWN, _______, _______,
+    _______, _______, _______, _______, _______, _______, HF_TOGG, HF_DWLU, HF_DWLD, _______, _______, KC_DOWN, _______, _______,
     _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______
   ),
 
diff --git a/keyboards/xw60/keymaps/pingjunior/keymap.c b/keyboards/xw60/keymaps/pingjunior/keymap.c
index 51767b56f0..5c49e174ef 100644
--- a/keyboards/xw60/keymaps/pingjunior/keymap.c
+++ b/keyboards/xw60/keymaps/pingjunior/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
     KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, KC_DEL,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, _______,
-             _______, _______, _______, _______, _______, HPT_TOG,HPT_DWLI,HPT_DWLD, _______, _______, KC_DOWN, _______, _______,
+             _______, _______, _______, _______, _______, HF_TOGG, HF_DWLU, HF_DWLD, _______, _______, KC_DOWN, _______, _______,
     _______, _______, _______,                            _______,                                     _______, _______, _______
   ),
 
diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
index b60e438327..4cffd9c32e 100644
--- a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
@@ -47,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/7eb0f1c437169f30cc18eac271ad2302 */
     [LAYER_ADJUST] = LAYOUT(
-        _______,  MU_TOG,   KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,
-        _______,  MU_MOD,   KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
+        _______,  MU_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,
+        _______,  MU_NEXT,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
                                       _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______
     ),
diff --git a/keyboards/yoichiro/lunakey_macro/keymaps/via/keymap.c b/keyboards/yoichiro/lunakey_macro/keymaps/via/keymap.c
index 1fd0ce709c..83672c3a66 100644
--- a/keyboards/yoichiro/lunakey_macro/keymaps/via/keymap.c
+++ b/keyboards/yoichiro/lunakey_macro/keymaps/via/keymap.c
@@ -35,8 +35,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_ADJUST] = LAYOUT(
         RGB_TOG,      RGB_MOD,    RGB_VAI,     RGB_VAD,
-        AU_TOG,       CK_TOGG,    MU_TOG,      MU_MOD,
-        QK_BOOT,        KC_NO,      DF(_NUMBERS)
+        AU_TOGG,      CK_TOGG,    MU_TOGG,     MU_NEXT,
+        QK_BOOT,      KC_NO,      DF(_NUMBERS)
     )
 };
 

From bfdc76181980545b18d9e4d909b62d09895bca9d Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 22 Nov 2022 12:19:38 +0000
Subject: [PATCH 918/959] initial (#19137)

---
 .../aeboards/satellite/keymaps/default/keymap.c      |  0
 .../aeboards/satellite/keymaps/default/readme.md     |  2 --
 keyboards/aeboards/satellite/keymaps/via/keymap.c    |  0
 keyboards/aeboards/satellite/keymaps/via/readme.md   |  2 --
 keyboards/aeboards/satellite/keymaps/via/rules.mk    |  0
 keyboards/aeboards/satellite/readme.md               |  0
 keyboards/aeboards/satellite/rev1/config.h           |  2 +-
 keyboards/aeboards/satellite/rev1/readme.md          |  0
 keyboards/aeboards/satellite/rev1/rev1.c             | 12 ++++++------
 keyboards/aeboards/satellite/rev1/rev1.h             |  0
 keyboards/aeboards/satellite/rev1/rules.mk           |  0
 keyboards/aeboards/satellite/rules.mk                |  0
 keyboards/aeboards/satellite/satellite.c             |  0
 keyboards/aeboards/satellite/satellite.h             |  0
 14 files changed, 7 insertions(+), 11 deletions(-)
 mode change 100755 => 100644 keyboards/aeboards/satellite/keymaps/default/keymap.c
 delete mode 100755 keyboards/aeboards/satellite/keymaps/default/readme.md
 mode change 100755 => 100644 keyboards/aeboards/satellite/keymaps/via/keymap.c
 delete mode 100755 keyboards/aeboards/satellite/keymaps/via/readme.md
 mode change 100755 => 100644 keyboards/aeboards/satellite/keymaps/via/rules.mk
 mode change 100755 => 100644 keyboards/aeboards/satellite/readme.md
 mode change 100755 => 100644 keyboards/aeboards/satellite/rev1/config.h
 mode change 100755 => 100644 keyboards/aeboards/satellite/rev1/readme.md
 mode change 100755 => 100644 keyboards/aeboards/satellite/rev1/rev1.c
 mode change 100755 => 100644 keyboards/aeboards/satellite/rev1/rev1.h
 mode change 100755 => 100644 keyboards/aeboards/satellite/rev1/rules.mk
 mode change 100755 => 100644 keyboards/aeboards/satellite/rules.mk
 mode change 100755 => 100644 keyboards/aeboards/satellite/satellite.c
 mode change 100755 => 100644 keyboards/aeboards/satellite/satellite.h

diff --git a/keyboards/aeboards/satellite/keymaps/default/keymap.c b/keyboards/aeboards/satellite/keymaps/default/keymap.c
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/keymaps/default/readme.md b/keyboards/aeboards/satellite/keymaps/default/readme.md
deleted file mode 100755
index f369959a37..0000000000
--- a/keyboards/aeboards/satellite/keymaps/default/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Satellite Layout
-
diff --git a/keyboards/aeboards/satellite/keymaps/via/keymap.c b/keyboards/aeboards/satellite/keymaps/via/keymap.c
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/keymaps/via/readme.md b/keyboards/aeboards/satellite/keymaps/via/readme.md
deleted file mode 100755
index cce6dfd595..0000000000
--- a/keyboards/aeboards/satellite/keymaps/via/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The VIA Satellite Layout
-
diff --git a/keyboards/aeboards/satellite/keymaps/via/rules.mk b/keyboards/aeboards/satellite/keymaps/via/rules.mk
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/readme.md b/keyboards/aeboards/satellite/readme.md
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/rev1/config.h b/keyboards/aeboards/satellite/rev1/config.h
old mode 100755
new mode 100644
index b11d3a2e98..d714b939a9
--- a/keyboards/aeboards/satellite/rev1/config.h
+++ b/keyboards/aeboards/satellite/rev1/config.h
@@ -24,7 +24,7 @@
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36
 #define ISSI_DRIVER_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#define DRIVER_LED_TOTAL ISSI_DRIVER_TOTAL
+#define RGB_MATRIX_LED_COUNT ISSI_DRIVER_TOTAL
 
 #define RGB_MATRIX_STARTUP_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/aeboards/satellite/rev1/readme.md b/keyboards/aeboards/satellite/rev1/readme.md
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/rev1/rev1.c b/keyboards/aeboards/satellite/rev1/rev1.c
old mode 100755
new mode 100644
index bb66eda6fa..2858175bd9
--- a/keyboards/aeboards/satellite/rev1/rev1.c
+++ b/keyboards/aeboards/satellite/rev1/rev1.c
@@ -18,7 +18,7 @@
 #include "drivers/led/issi/is31fl3731.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -103,11 +103,11 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 };
 
 led_config_t g_led_config = { {
-    {   0+17,   0+16,   0+15,   0+14,   0+13,   0+12,   0+11,   0+10,   0+ 9,  18+ 0,  18+ 1,  18+ 2,  18+ 3,  18+ 4,  18+ 6 },
-    {   0+ 7,   0+ 6,   0+ 5,   0+ 4,   0+ 3,   0+ 2,   0+ 1,   0+ 0,  18+ 9,  18+10,  18+11,  18+12,  18+13,  18+14,  18+ 7 },
-    {   0+ 8,  36+14,  36+13,  36+12,  36+11,  36+10,  36+ 9,  54+ 0,  54+ 1,  54+ 2,  54+ 3,  54+ 4,  54+ 5, NO_LED,  18+ 8 },
-    {  36+15,  36+ 5,  36+ 4,  36+ 3,  36+ 2,  36+ 1,  54+ 9,  54+10,  54+11,  54+12,  54+ 6, NO_LED,  54+ 7,  54+ 8,  18+15 },
-    {  36+16,  36+ 8,  36+ 7, NO_LED, NO_LED,  36+ 0, NO_LED, NO_LED, NO_LED,  54+15,  54+16, NO_LED,  54+17,  18+17,  18+16 },
+    { 17, 16, 15, 14,     13,     12, 11,     10,     9,      18, 19, 20,     21, 22,     24 },
+    { 7,  6,  6,  4,      4,      2,  1,      0,      27,     18, 29, 30,     31, 32,     25 },
+    { 8,  50, 49, 48,     47,     46, 45,     54,     55,     56, 57, 8,      59, NO_LED, 26 },
+    { 51, 41, 40, 39,     38,     37, 63,     64,     65,     66, 60, NO_LED, 61, 62,     33 },
+    { 52, 44, 43, NO_LED, NO_LED, 36, NO_LED, NO_LED, NO_LED, 69, 70, NO_LED, 71, 35,     34 },
 }, {
     //A0 .. A17
     {112,16 }, { 97,16 }, { 82,16 }, { 67,16 }, { 52,16 }, { 37,16 }, { 22,16 }, {  4,16 }, {  6,32 },
diff --git a/keyboards/aeboards/satellite/rev1/rev1.h b/keyboards/aeboards/satellite/rev1/rev1.h
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/rules.mk b/keyboards/aeboards/satellite/rules.mk
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/satellite.c b/keyboards/aeboards/satellite/satellite.c
old mode 100755
new mode 100644
diff --git a/keyboards/aeboards/satellite/satellite.h b/keyboards/aeboards/satellite/satellite.h
old mode 100755
new mode 100644

From 8b1069f15aa2c9b2cc666bc9955efb0b0998ec9f Mon Sep 17 00:00:00 2001
From: spbgzh <72414103+spbgzh@users.noreply.github.com>
Date: Tue, 22 Nov 2022 23:56:48 +0300
Subject: [PATCH 919/959] [Add function] add 'Split Space and ISO and delete
 RGUI for Promise 87 (#18929)

* add split space and ISO

* Update wkl.h

* update ISO

* update

* change KC_LGUI to KC_RGUI

* delete RGUI

* format

* update promise87 readme.md

* update promise87 wkl readme.md

* Update readme.md

* Update readme.md

* change KC_SLCK to KC_SCRL

* wuque/promise87/ansi: standardize Layout Macro names

- rename `LAYOUT_tkl_f13_ansi` to `LAYOUT_tkl_f13_ansi_tsangan`
- convert `LAYOUT_tkl_f13_ansi_iso` to `LAYOUT_tkl_f13_iso_tsangan` (adds position `K41`)
- rename `LAYOUT_tkl_f13_ansi_split_space` to `LAYOUT_tkl_f13_ansi_tsangan_split_space`
- rename `LAYOUT_tkl_f13_ansi_split_bs` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs`
- rename `LAYOUT_tkl_f13_ansi_split_lshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_lshift`
- rename `LAYOUT_tkl_f13_ansi_split_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_rshift`
- rename `LAYOUT_tkl_f13_ansi_split_bs_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift`

* wuque/promise87/wkl: refactor LAYOUT_tkl_f13_ansi_wkl_iso

Refactors `LAYOUT_tkl_f13_ansi_wkl_iso` into `LAYOUT_tkl_f13_iso_wkl` by adding position `K41` (Non-US Backslash) to the layout macro.

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/wuque/promise87/ansi/ansi.h         |  158 +-
 keyboards/wuque/promise87/ansi/info.json      | 1344 ++++++++++-------
 .../promise87/ansi/keymaps/default/keymap.c   |   14 +-
 .../keymaps/default_tkl_f13_ansi/readme.md    |    1 -
 .../default_tkl_f13_ansi_split_bs/readme.md   |    1 -
 .../readme.md                                 |    1 -
 .../readme.md                                 |    1 -
 .../readme.md                                 |    1 -
 .../keymap.c                                  |   10 +-
 .../default_tkl_f13_ansi_tsangan/readme.md    |    1 +
 .../keymap.c                                  |   10 +-
 .../readme.md                                 |    1 +
 .../keymap.c                                  |   10 +-
 .../readme.md                                 |    1 +
 .../keymap.c                                  |   10 +-
 .../readme.md                                 |    1 +
 .../keymap.c                                  |   10 +-
 .../readme.md                                 |    1 +
 .../keymap.c                                  |   36 +
 .../readme.md                                 |    1 +
 .../default_tkl_f13_iso_tsangan/keymap.c      |   36 +
 .../default_tkl_f13_iso_tsangan/readme.md     |    1 +
 .../wuque/promise87/ansi/keymaps/via/keymap.c |   10 +-
 .../wuque/promise87/ansi/keymaps/via/rules.mk |    2 +-
 keyboards/wuque/promise87/ansi/readme.md      |    6 +-
 keyboards/wuque/promise87/ansi/rules.mk       |    2 +-
 keyboards/wuque/promise87/wkl/info.json       | 1309 +++++++++-------
 .../promise87/wkl/keymaps/default/keymap.c    |    6 +-
 .../keymaps/default_tkl_f13_ansi_wkl/keymap.c |    2 +-
 .../keymap.c                                  |    2 +-
 .../keymap.c                                  |    2 +-
 .../keymap.c                                  |    2 +-
 .../keymap.c                                  |    2 +-
 .../keymap.c                                  |   36 +
 .../readme.md                                 |    1 +
 .../keymaps/default_tkl_f13_iso_wkl/keymap.c  |   36 +
 .../keymaps/default_tkl_f13_iso_wkl/readme.md |    1 +
 .../wuque/promise87/wkl/keymaps/via/keymap.c  |   10 +-
 keyboards/wuque/promise87/wkl/readme.md       |    6 +-
 keyboards/wuque/promise87/wkl/wkl.h           |   88 +-
 40 files changed, 1924 insertions(+), 1249 deletions(-)
 delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/readme.md
 delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/readme.md
 delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/readme.md
 delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/readme.md
 delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/readme.md
 rename keyboards/wuque/promise87/ansi/keymaps/{default_tkl_f13_ansi => default_tkl_f13_ansi_tsangan}/keymap.c (91%)
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md
 rename keyboards/wuque/promise87/ansi/keymaps/{default_tkl_f13_ansi_split_bs => default_tkl_f13_ansi_tsangan_split_bs}/keymap.c (90%)
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md
 rename keyboards/wuque/promise87/ansi/keymaps/{default_tkl_f13_ansi_split_bs_rshift => default_tkl_f13_ansi_tsangan_split_bs_rshift}/keymap.c (90%)
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md
 rename keyboards/wuque/promise87/ansi/keymaps/{default_tkl_f13_ansi_split_lshift => default_tkl_f13_ansi_tsangan_split_lshift}/keymap.c (90%)
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md
 rename keyboards/wuque/promise87/ansi/keymaps/{default_tkl_f13_ansi_split_rshift => default_tkl_f13_ansi_tsangan_split_rshift}/keymap.c (90%)
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/keymap.c
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/keymap.c
 create mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md
 create mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/keymap.c
 create mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md
 create mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/keymap.c
 create mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md

diff --git a/keyboards/wuque/promise87/ansi/ansi.h b/keyboards/wuque/promise87/ansi/ansi.h
index 513c3a8d2a..24b8d69978 100644
--- a/keyboards/wuque/promise87/ansi/ansi.h
+++ b/keyboards/wuque/promise87/ansi/ansi.h
@@ -24,16 +24,16 @@
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │        ISO
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      ┌─────┐
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │      │2d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐    │
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │                │3c │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
  * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │51 │52   │55         │56 │57         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘└───┴───┴───┘
  */
 
 #define LAYOUT_all( \
@@ -42,18 +42,18 @@
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                        \
     K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
+    K50, K51, K52,           K55, K56, K57,                K5B, K5C, K5D,        K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
     { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
 
 
-/* LAYOUT_tkl_f13_ansi
+/* LAYOUT_tkl_f13_ansi_tsangan
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -65,28 +65,94 @@
  * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
  * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
  */
-#define LAYOUT_tkl_f13_ansi( \
+#define LAYOUT_tkl_f13_ansi_tsangan( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
     K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
     { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
 
 
-/* LAYOUT_tkl_f13_ansi_split_bs
+/* LAYOUT_tkl_f13_iso_tsangan
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+#define LAYOUT_tkl_f13_iso_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2D,                 \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+}
+
+
+/* LAYOUT_tkl_f13_ansi_tsangan_split_space
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │55         │56 │57         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+#define LAYOUT_tkl_f13_ansi_tsangan_split_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
+    K50, K51, K52,           K55, K56, K57,                K5B, K5C, K5D, K5E, K5F, K5G   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+}
+
+
+/* LAYOUT_tkl_f13_ansi_tsangan_split_bs
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -98,28 +164,28 @@
  * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
  * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬────┬────┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
  */
-#define LAYOUT_tkl_f13_ansi_split_bs( \
+#define LAYOUT_tkl_f13_ansi_tsangan_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G,  \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                   \
     K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D,        K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
     { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
 
 
-/* LAYOUT_tkl_f13_ansi_split_lshift
+/* LAYOUT_tkl_f13_ansi_tsangan_split_lshift
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -131,28 +197,28 @@
  * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
  * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
  */
-#define LAYOUT_tkl_f13_ansi_split_lshift( \
+#define LAYOUT_tkl_f13_ansi_tsangan_split_lshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
     K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
     { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
 
 
-/* LAYOUT_tkl_f13_ansi_split_rshift
+/* LAYOUT_tkl_f13_ansi_tsangan_split_rshift
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -164,28 +230,28 @@
  * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
  * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
  */
-#define LAYOUT_tkl_f13_ansi_split_rshift( \
+#define LAYOUT_tkl_f13_ansi_tsangan_split_rshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
     K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
     { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
 
 
-/* LAYOUT_tkl_f13_ansi_split_bs_rshift
+/* LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -197,22 +263,22 @@
  * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
  * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
  */
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
+#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G, \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                       \
     K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G  \
+    K50, K51, K52,                K56,                     K5B, K5C, K5D,        K5E, K5F, K5G  \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
     { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index acd4d7d6d9..ee01854bfd 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -1,609 +1,805 @@
 {
-    "keyboard_name": "promise87",
-    "manufacturer": "wuque",
-    "url": "https://shop.wuquestudio.com/",
-    "maintainer": "spbgzh",
-    "usb": {
-        "vid": "0x906D",
-        "pid": "0x0005",
-        "device_version": "0.0.1"
+  "keyboard_name": "promise87",
+  "manufacturer": "wuque",
+  "url": "https://shop.wuquestudio.com/",
+  "maintainer": "spbgzh",
+  "usb": {
+    "vid": "0x906D",
+    "pid": "0x0005",
+    "device_version": "0.0.1"
+  },
+  "layout_aliases": {
+    "LAYOUT_87_ansi": "LAYOUT_tkl_f13_ansi_tsangan",
+    "LAYOUT_87_ansi_split_bs": "LAYOUT_tkl_f13_ansi_tsangan_split_bs",
+    "LAYOUT_87_ansi_split_lshift": "LAYOUT_tkl_f13_ansi_tsangan_split_lshift",
+    "LAYOUT_87_ansi_split_rshift": "LAYOUT_tkl_f13_ansi_tsangan_split_rshift",
+    "LAYOUT_tkl_f13_ansi": "LAYOUT_tkl_f13_ansi_tsangan",
+    "LAYOUT_tkl_f13_ansi_split_bs": "LAYOUT_tkl_f13_ansi_tsangan_split_bs",
+    "LAYOUT_tkl_f13_ansi_split_lshift": "LAYOUT_tkl_f13_ansi_tsangan_split_lshift",
+    "LAYOUT_tkl_f13_ansi_split_rshift": "LAYOUT_tkl_f13_ansi_tsangan_split_rshift",
+    "LAYOUT_tkl_f13_ansi_split_bs_rshift": "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift"
+  },
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25 },
+        { "label": "Backspace1", "x": 14, "y": 1.25 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
+
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
+
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "Shift2", "x": 1.25, "y": 4.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "label": "Shift2", "x": 14, "y": 4.25 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
+        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
+        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
     },
-    "layout_aliases": {
-        "LAYOUT_87_ansi": "LAYOUT_tkl_f13_ansi",
-        "LAYOUT_87_ansi_split_bs": "LAYOUT_tkl_f13_ansi_split_bs",
-        "LAYOUT_87_ansi_split_lshift": "LAYOUT_tkl_f13_ansi_split_lshift",
-        "LAYOUT_87_ansi_split_rshift": "LAYOUT_tkl_f13_ansi_split_rshift"
+    "LAYOUT_tkl_f13_ansi_tsangan": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
+
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
+
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
     },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+    "LAYOUT_tkl_f13_iso_tsangan": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 },
+        { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
 
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "\\", "x": 1.25, "y": 4.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_tsangan_split_space": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_bs": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
+        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
+        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_tsangan_split_bs": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25 },
+        { "label": "Backspace1", "x": 14, "y": 1.25 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_lshift": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_tsangan_split_lshift": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "Shift2", "x": 1.25, "y": 4.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_rshift": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_tsangan_split_rshift": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "label": "Shift2", "x": 14, "y": 4.25 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25 },
+        { "label": "Backspace1", "x": 14, "y": 1.25 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "label": "Shift2", "x": 14, "y": 4.25 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        }
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
     }
+  }
 }
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
index 1ba2583670..788651becd 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
@@ -18,12 +18,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -31,6 +31,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+        _______, _______, _______,                   _______, _______, _______,                            _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/readme.md
deleted file mode 100644
index 63cbbfc568..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The tkl_f13_ansi keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/readme.md
deleted file mode 100644
index e61fd5af62..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default_tkl_f13_ansi_split_bs keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/readme.md
deleted file mode 100644
index f7f7ee4eed..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default_tkl_f13_ansi_split_bs_rshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/readme.md
deleted file mode 100644
index 17ed054145..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default_tkl_f13_ansi_split_lshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/readme.md
deleted file mode 100644
index d0f6cbe57a..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The tkl_f13_ansi_split_rshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/keymap.c
similarity index 91%
rename from keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c
rename to keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/keymap.c
index a27c3c5969..ccd1fbf513 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/keymap.c
@@ -17,20 +17,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT_tkl_f13_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    [0] = LAYOUT_tkl_f13_ansi_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [1] = LAYOUT_tkl_f13_ansi(
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md
new file mode 100644
index 0000000000..f4a469688d
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md
@@ -0,0 +1 @@
+# The tkl_f13_ansi_tsangan keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/keymap.c
similarity index 90%
rename from keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c
rename to keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/keymap.c
index 31055a6a0a..2ee516351b 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/keymap.c
@@ -17,20 +17,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT_tkl_f13_ansi_split_bs(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+    [0] = LAYOUT_tkl_f13_ansi_tsangan_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_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [1] = LAYOUT_tkl_f13_ansi_split_bs(
+    [1] = LAYOUT_tkl_f13_ansi_tsangan_split_bs(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                      _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+        _______, _______, _______,                            _______,                                     _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md
new file mode 100644
index 0000000000..151db6f9c1
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md
@@ -0,0 +1 @@
+# The default_tkl_f13_ansi_tsangan_split_bs keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/keymap.c
similarity index 90%
rename from keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/keymap.c
rename to keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/keymap.c
index 36b48cebb8..b9f4496fe8 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs_rshift/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/keymap.c
@@ -17,20 +17,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+    [0] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [1] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+    [1] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+        _______, _______, _______,                            _______,                                     _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md
new file mode 100644
index 0000000000..1d28f51599
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md
@@ -0,0 +1 @@
+# The default_tkl_f13_ansi_tsangan_split_bs_rshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/keymap.c
similarity index 90%
rename from keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/keymap.c
rename to keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/keymap.c
index 181ee17c64..3dbcdb3cb2 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_lshift/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/keymap.c
@@ -17,20 +17,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT_tkl_f13_ansi_split_lshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    [0] = LAYOUT_tkl_f13_ansi_tsangan_split_lshift(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT, KC_LSFT, KC_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_LGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [1] = LAYOUT_tkl_f13_ansi_split_lshift(
+    [1] = LAYOUT_tkl_f13_ansi_tsangan_split_lshift(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md
new file mode 100644
index 0000000000..63ffd4279f
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md
@@ -0,0 +1 @@
+# The default_tkl_f13_ansi_tsangan_split_lshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/keymap.c
similarity index 90%
rename from keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/keymap.c
rename to keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/keymap.c
index 91ddaa8d0e..0dd19f0e58 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_rshift/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/keymap.c
@@ -17,20 +17,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT_tkl_f13_ansi_split_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
+    [0] = LAYOUT_tkl_f13_ansi_tsangan_split_rshift(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,          KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-     [1] = LAYOUT_tkl_f13_ansi_split_rshift(
+     [1] = LAYOUT_tkl_f13_ansi_tsangan_split_rshift(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md
new file mode 100644
index 0000000000..db444badf0
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md
@@ -0,0 +1 @@
+# The tkl_f13_ansi_tsangan_split_rshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/keymap.c
new file mode 100644
index 0000000000..a6a8d09ebd
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 wuque
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
+    [0] = LAYOUT_tkl_f13_ansi_tsangan_split_space(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan_split_space(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______,                   _______, _______, _______,                            _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md
new file mode 100644
index 0000000000..d36f76419f
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md
@@ -0,0 +1 @@
+# The tkl_f13_ansi_tsangan_split_space keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/keymap.c
new file mode 100644
index 0000000000..c5af2e8f7e
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 wuque
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
+    [0] = LAYOUT_tkl_f13_iso_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_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_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_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_tkl_f13_iso_tsangan(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md
new file mode 100644
index 0000000000..9c9e2a9c42
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md
@@ -0,0 +1 @@
+# The tkl_f13_iso_tsangan keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c
index 110e3f4639..48efbb30d2 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/via/keymap.c
@@ -18,12 +18,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
 		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
+		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+        _______, _______, _______,                   _______, _______, _______,                            _______, _______, _______,             _______, _______, _______
     ),
     [2] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+        _______, _______, _______,                   _______, _______, _______,                            _______, _______, _______,             _______, _______, _______
     ),
     [3] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -47,6 +47,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+        _______, _______, _______,                   _______, _______, _______,                            _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/via/rules.mk b/keyboards/wuque/promise87/ansi/keymaps/via/rules.mk
index 43061db1dd..36b7ba9cbc 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/via/rules.mk
+++ b/keyboards/wuque/promise87/ansi/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/wuque/promise87/ansi/readme.md b/keyboards/wuque/promise87/ansi/readme.md
index a5c5591de9..08ad5875c6 100644
--- a/keyboards/wuque/promise87/ansi/readme.md
+++ b/keyboards/wuque/promise87/ansi/readme.md
@@ -1,11 +1,13 @@
 # promise87
 
-More Info at [promise87](https://shop.wuquestudio.com/)
+![Promise87](https://i.imgur.com/0gtouZ2.png)
+
+More Info at [promise87](https://promisetkl.com/)
 ​
 
 * Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
 * Hardware Supported: promise 87
-* Hardware Availability: [promise87](https://shop.wuquestudio.com/)  
+* Hardware Availability: [promise87](https://promisetkl.com/)  
 ​
 
 Make example for this keyboard (after setting up your build environment):  
diff --git a/keyboards/wuque/promise87/ansi/rules.mk b/keyboards/wuque/promise87/ansi/rules.mk
index ffe655b21f..9fcf2a93ae 100644
--- a/keyboards/wuque/promise87/ansi/rules.mk
+++ b/keyboards/wuque/promise87/ansi/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift
+LAYOUTS = tkl_f13_ansi_tsangan tkl_f13_ansi_tsangan_split_bs_rshift
diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index 5445f2eb36..1331b6266e 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -1,592 +1,787 @@
 {
-    "keyboard_name": "promise87",
-    "manufacturer": "wuque",
-    "url": "https://shop.wuquestudio.com/",
-    "maintainer": "spbgzh",
-    "usb": {
-        "vid": "0x906D",
-        "pid": "0x0006",
-        "device_version": "0.0.1"
+  "keyboard_name": "promise87",
+  "manufacturer": "wuque",
+  "url": "https://shop.wuquestudio.com/",
+  "maintainer": "spbgzh",
+  "usb": {
+    "vid": "0x906D",
+    "pid": "0x0006",
+    "device_version": "0.0.1"
+  },
+  "layout_aliases": {
+    "LAYOUT_all_wkl": "LAYOUT_all",
+    "LAYOUT_87_wkl": "LAYOUT_tkl_f13_ansi_wkl",
+    "LAYOUT_87_wkl_iso": "LAYOUT_tkl_f13_iso_wkl",
+    "LAYOUT_87_wkl_split_space": "LAYOUT_tkl_f13_ansi_wkl_split_space",
+    "LAYOUT_87_wkl_split_bs": "LAYOUT_tkl_f13_ansi_wkl_split_bs",
+    "LAYOUT_87_wkl_split_lshift": "LAYOUT_tkl_f13_ansi_wkl_split_lshift",
+    "LAYOUT_87_wkl_split_rshift": "LAYOUT_tkl_f13_ansi_wkl_split_rshift"
+  },
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25 },
+        { "label": "Backspace1", "x": 14, "y": 1.25 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
+
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
+
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "Shift2", "x": 1.25, "y": 4.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "label": "Shift2", "x": 14, "y": 4.25 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
+        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
+        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
     },
-    "layout_aliases": {
-        "LAYOUT_all_wkl": "LAYOUT_all",
-        "LAYOUT_87_wkl": "LAYOUT_tkl_f13_ansi_wkl",
-        "LAYOUT_87_wkl_split_bs": "LAYOUT_tkl_f13_ansi_wkl_split_bs",
-        "LAYOUT_87_wkl_split_lshift": "LAYOUT_tkl_f13_ansi_wkl_split_lshift",
-        "LAYOUT_87_wkl_split_rshift": "LAYOUT_tkl_f13_ansi_wkl_split_rshift"
+    "LAYOUT_tkl_f13_ansi_wkl": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
+
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
+
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
     },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+    "LAYOUT_tkl_f13_iso_wkl": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 },
+        { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
 
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "\\", "x": 1.25, "y": 4.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "Space","x": 4, "y": 5.25, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_wkl": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_wkl_split_space": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "Space","x": 4, "y": 5.25, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_wkl_split_bs": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
+        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
+        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_wkl_split_bs": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25 },
+        { "label": "Backspace1", "x": 14, "y": 1.25 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "Space","x": 4, "y": 5.25, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_wkl_split_lshift": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_wkl_split_lshift": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "Shift2", "x": 1.25, "y": 4.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "Space","x": 4, "y": 5.25, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_wkl_split_rshift": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_wkl_split_rshift": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "label": "Shift2", "x": 14, "y": 4.25 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "Space","x": 4, "y": 5.25, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 1.25, "y": 0 },
+        { "label": "F2", "x": 2.25, "y": 0 },
+        { "label": "F3", "x": 3.25, "y": 0 },
+        { "label": "F4", "x": 4.25, "y": 0 },
+        { "label": "F5", "x": 5.5, "y": 0 },
+        { "label": "F6", "x": 6.5, "y": 0 },
+        { "label": "F7", "x": 7.5, "y": 0 },
+        { "label": "F8", "x": 8.5, "y": 0 },
+        { "label": "F9", "x": 9.75, "y": 0 },
+        { "label": "F10", "x": 10.75, "y": 0 },
+        { "label": "F11", "x": 11.75, "y": 0 },
+        { "label": "F12", "x": 12.75, "y": 0 },
+        { "label": "F13", "x": 14, "y": 0 },
+        { "label": "Print", "x": 15.25, "y": 0 },
+        { "label": "Scroll", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+        { "label": "~", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25 },
+        { "label": "Backspace1", "x": 14, "y": 1.25 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PageUp", "x": 17.25, "y": 1.25 },
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PageDown", "x": 17.25, "y": 2.25 },
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "label": "Shift2", "x": 14, "y": 4.25 },
+        { "label": "\u2191", "x": 16.25, "y": 4.25 },
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "Space","x": 4, "y": 5.25, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
-            ]
-        }
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.25 },
+        { "label": "\u2193", "x": 16.25, "y": 5.25 },
+        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+      ]
     }
+  }
 }
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c
index d56749b9cb..be7f7ca54c 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default/keymap.c
@@ -18,12 +18,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
-        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          MO(1),               KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL,          KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                             KC_RALT,          MO(1),               KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -31,6 +31,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______,          _______,                            _______,                                     _______,          _______,             _______, _______, _______
+        _______,          _______,                   _______, _______, _______,                            _______,          _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c
index 842da351e5..722ae7a1d5 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c
index ccd8e35487..6809eab847 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_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_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
index a751bdea30..9b5958f7a6 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c
index 1b5806b2cf..75fbe88df4 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_split_lshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c
index 28834dcb03..9980f8d60c 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
     [0] = LAYOUT_tkl_f13_ansi_wkl_split_rshift(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/keymap.c
new file mode 100644
index 0000000000..82c82a5b81
--- /dev/null
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 wuque
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
+    [0] = LAYOUT_tkl_f13_ansi_wkl_split_space(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+        KC_LCTL,          KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                             KC_RALT,          MO(1),      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_wkl_split_space(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______,          _______,                   _______, _______, _______,                            _______,          _______,    _______, _______, _______
+    ),
+};
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md
new file mode 100644
index 0000000000..e27a9b424c
--- /dev/null
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md
@@ -0,0 +1 @@
+# The default_tkl_f13_ansi_wkl_split_space keymap for promise87
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/keymap.c
new file mode 100644
index 0000000000..670c1f4e53
--- /dev/null
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 wuque
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
+    [0] = LAYOUT_tkl_f13_iso_wkl(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_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_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_UP,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          MO(1),      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_f13_iso_wkl(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______,          _______,                            _______,                                     _______,          _______,    _______, _______, _______
+    ),
+};
diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md
new file mode 100644
index 0000000000..628c945300
--- /dev/null
+++ b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md
@@ -0,0 +1 @@
+# The default_tkl_f13_iso_wkl keymap for promise87
diff --git a/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c b/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c
index 6ae4f5398b..95024ea01b 100644
--- a/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c
+++ b/keyboards/wuque/promise87/wkl/keymaps/via/keymap.c
@@ -18,12 +18,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
-        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          MO(1),               KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL,          KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                             KC_RALT,          MO(1),               KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______,          _______,                            _______,                                     _______,          _______,             _______, _______, _______
+        _______,          _______,                   _______, _______, _______,                            _______,          _______,             _______, _______, _______
     ),
     [2] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______,          _______,                            _______,                                     _______,          _______,             _______, _______, _______
+        _______,          _______,                   _______, _______, _______,                            _______,          _______,             _______, _______, _______
     ),
     [3] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
@@ -47,6 +47,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______,          _______,                            _______,                                     _______,          _______,             _______, _______, _______
+        _______,          _______,                   _______, _______, _______,                            _______,          _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/wkl/readme.md b/keyboards/wuque/promise87/wkl/readme.md
index f4562164bd..8629c75291 100644
--- a/keyboards/wuque/promise87/wkl/readme.md
+++ b/keyboards/wuque/promise87/wkl/readme.md
@@ -1,11 +1,13 @@
 # promise87
 
-More Info at [promise87](https://shop.wuquestudio.com/)
+![Promise87](https://i.imgur.com/0gtouZ2.png)
+
+More Info at [promise87](https://promisetkl.com/)
 ​
 
 * Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
 * Hardware Supported: promise 87
-* Hardware Availability: [promise87](https://shop.wuquestudio.com/)  
+* Hardware Availability: [promise87](https://promisetkl.com/)
 ​
 
 Make example for this keyboard (after setting up your build environment):  
diff --git a/keyboards/wuque/promise87/wkl/wkl.h b/keyboards/wuque/promise87/wkl/wkl.h
index 913ed9f881..fa670967d5 100644
--- a/keyboards/wuque/promise87/wkl/wkl.h
+++ b/keyboards/wuque/promise87/wkl/wkl.h
@@ -24,16 +24,16 @@
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │        ISO
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      ┌─────┐
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │      │2d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐    │
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │                │3c │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
  * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
- * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │   │52   │55         │56 │57         │5b   │   │5d   ││5e │5f │5g │
+ * └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘└───┴───┴───┘
  */
 #define LAYOUT_all( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
@@ -41,14 +41,14 @@
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                        \
     K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D,        K5E, K5F, K5G   \
+    K50,      K52,           K55, K56, K57,                K5B,      K5D,        K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
     { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
+    { K50,   KC_NO, K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
 }
 
 
@@ -85,6 +85,72 @@
 }
 
 
+/* LAYOUT_tkl_f13_iso_wkl
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
+ * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
+ */
+#define LAYOUT_tkl_f13_iso_wkl( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2D,                 \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
+    K50,      K52,                K56,                     K5B,      K5D, K5E, K5F, K5G   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
+    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
+}
+
+
+/* LAYOUT_tkl_f13_ansi_wkl_split_space
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │   │52   │55         │56 │57         │5b   │   │5d   ││5e │5f │5g │
+ * └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘└───┴───┴───┘
+ */
+#define LAYOUT_tkl_f13_ansi_wkl_split_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
+    K50,      K52,           K55, K56, K57,                K5B,      K5D, K5E, K5F, K5G   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
+    { K50,   KC_NO, K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
+}
+
+
 /* LAYOUT_tkl_f13_ansi_wkl_split_bs
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │

From bebfdad795add9fbc8c6c1393d1b817d542474ed Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 23 Nov 2022 19:50:19 +1100
Subject: [PATCH 920/959] NVRAM refactor, phase 1. (#18969)

* Rename `eeprom_stm32` to `eeprom_legacy_emulated_flash`.

* Rename `flash_stm32` to `legacy_flash_ops`.

* Rename `eeprom_teensy` to `eeprom_kinetis_flexram`.
---
 builddefs/common_features.mk                  | 10 ++++----
 ...prom_teensy.c => eeprom_kinetis_flexram.c} |  2 +-
 ...prom_teensy.h => eeprom_kinetis_flexram.h} |  0
 ...stm32.c => eeprom_legacy_emulated_flash.c} |  6 ++---
 ...stm32.h => eeprom_legacy_emulated_flash.h} |  0
 ....h => eeprom_legacy_emulated_flash_defs.h} |  0
 .../{flash_stm32.c => legacy_flash_ops.c}     |  2 +-
 .../{flash_stm32.h => legacy_flash_ops.h}     |  2 +-
 .../wear_leveling/wear_leveling_legacy.c      |  2 +-
 platforms/eeprom.h                            | 12 +++++-----
 ...=> eeprom_legacy_emulated_flash_tests.cpp} |  0
 ...h => eeprom_legacy_emulated_flash_tests.h} |  4 ++--
 ...h_stm32_mock.c => legacy_flash_ops_mock.c} |  2 +-
 platforms/test/rules.mk                       | 24 +++++++++----------
 platforms/test/testlist.mk                    |  2 +-
 15 files changed, 34 insertions(+), 34 deletions(-)
 rename platforms/chibios/drivers/eeprom/{eeprom_teensy.c => eeprom_kinetis_flexram.c} (99%)
 rename platforms/chibios/drivers/eeprom/{eeprom_teensy.h => eeprom_kinetis_flexram.h} (100%)
 rename platforms/chibios/drivers/eeprom/{eeprom_stm32.c => eeprom_legacy_emulated_flash.c} (99%)
 rename platforms/chibios/drivers/eeprom/{eeprom_stm32.h => eeprom_legacy_emulated_flash.h} (100%)
 rename platforms/chibios/drivers/eeprom/{eeprom_stm32_defs.h => eeprom_legacy_emulated_flash_defs.h} (100%)
 rename platforms/chibios/drivers/flash/{flash_stm32.c => legacy_flash_ops.c} (99%)
 rename platforms/chibios/drivers/flash/{flash_stm32.h => legacy_flash_ops.h} (97%)
 rename platforms/test/{eeprom_stm32_tests.cpp => eeprom_legacy_emulated_flash_tests.cpp} (100%)
 rename platforms/test/{eeprom_stm32_tests.h => eeprom_legacy_emulated_flash_tests.h} (69%)
 rename platforms/test/{flash_stm32_mock.c => legacy_flash_ops_mock.c} (98%)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index c6a67ee87d..63814bbfae 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -222,10 +222,10 @@ else
     else ifeq ($(PLATFORM),CHIBIOS)
       ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
         # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
         COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
         COMMON_VPATH += $(DRIVER_PATH)/flash
-        SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
+        SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
       else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx GD32VF103),)
         # Wear-leveling EEPROM implementation, backed by MCU flash
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
@@ -242,8 +242,8 @@ else
         WEAR_LEVELING_DRIVER = rp2040_flash
       else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
         # Teensy EEPROM implementations
-        OPT_DEFS += -DEEPROM_TEENSY
-        SRC += eeprom_teensy.c
+        OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
+        SRC += eeprom_kinetis_flexram.c
       else
         # Fall back to transient, i.e. non-persistent
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
@@ -287,7 +287,7 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
       POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_PATH)/wear_leveling/wear_leveling_rp2040_flash_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), legacy)
       COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-      SRC += flash_stm32.c wear_leveling_legacy.c
+      SRC += legacy_flash_ops.c wear_leveling_legacy.c
       POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_legacy_config.h
     endif
   endif
diff --git a/platforms/chibios/drivers/eeprom/eeprom_teensy.c b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c
similarity index 99%
rename from platforms/chibios/drivers/eeprom/eeprom_teensy.c
rename to platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c
index c8777febde..6468cbf3fa 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_teensy.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c
@@ -1,7 +1,7 @@
 #include <ch.h>
 #include <hal.h>
 
-#include "eeprom_teensy.h"
+#include "eeprom_kinetis_flexram.h"
 #include "eeconfig.h"
 
 /*************************************/
diff --git a/platforms/chibios/drivers/eeprom/eeprom_teensy.h b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.h
similarity index 100%
rename from platforms/chibios/drivers/eeprom/eeprom_teensy.h
rename to platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.h
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.c b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
similarity index 99%
rename from platforms/chibios/drivers/eeprom/eeprom_stm32.c
rename to platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
index 1a354dc213..a81fe3353c 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include "util.h"
 #include "debug.h"
-#include "eeprom_stm32.h"
-#include "flash_stm32.h"
+#include "eeprom_legacy_emulated_flash.h"
+#include "legacy_flash_ops.h"
 
 /*
  * We emulate eeprom by writing a snapshot compacted view of eeprom contents,
@@ -132,7 +132,7 @@
  *
  */
 
-#include "eeprom_stm32_defs.h"
+#include "eeprom_legacy_emulated_flash_defs.h"
 /* These bits are used for optimizing encoding of bytes, 0 and 1 */
 #define FEE_WORD_ENCODING 0x8000
 #define FEE_VALUE_NEXT 0x6000
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.h b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.h
similarity index 100%
rename from platforms/chibios/drivers/eeprom/eeprom_stm32.h
rename to platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.h
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash_defs.h
similarity index 100%
rename from platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h
rename to platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash_defs.h
diff --git a/platforms/chibios/drivers/flash/flash_stm32.c b/platforms/chibios/drivers/flash/legacy_flash_ops.c
similarity index 99%
rename from platforms/chibios/drivers/flash/flash_stm32.c
rename to platforms/chibios/drivers/flash/legacy_flash_ops.c
index 72c41b8b78..fe5ad64764 100644
--- a/platforms/chibios/drivers/flash/flash_stm32.c
+++ b/platforms/chibios/drivers/flash/legacy_flash_ops.c
@@ -17,7 +17,7 @@
  */
 
 #include <hal.h>
-#include "flash_stm32.h"
+#include "legacy_flash_ops.h"
 
 #if defined(STM32F1XX)
 #    define FLASH_SR_WRPERR FLASH_SR_WRPRTERR
diff --git a/platforms/chibios/drivers/flash/flash_stm32.h b/platforms/chibios/drivers/flash/legacy_flash_ops.h
similarity index 97%
rename from platforms/chibios/drivers/flash/flash_stm32.h
rename to platforms/chibios/drivers/flash/legacy_flash_ops.h
index 6c66642ec5..ef80764055 100644
--- a/platforms/chibios/drivers/flash/flash_stm32.h
+++ b/platforms/chibios/drivers/flash/legacy_flash_ops.h
@@ -24,7 +24,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#ifdef FLASH_STM32_MOCKED
+#ifdef LEGACY_FLASH_OPS_MOCKED
 extern uint8_t FlashBuf[MOCK_FLASH_SIZE];
 #endif
 
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
index 87126c4467..7c6fd2d808 100644
--- a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
@@ -5,7 +5,7 @@
 #include "timer.h"
 #include "wear_leveling.h"
 #include "wear_leveling_internal.h"
-#include "flash_stm32.h"
+#include "legacy_flash_ops.h"
 
 bool backing_store_init(void) {
     bs_dprintf("Init\n");
diff --git a/platforms/eeprom.h b/platforms/eeprom.h
index 8cb7e342dc..fbfef20334 100644
--- a/platforms/eeprom.h
+++ b/platforms/eeprom.h
@@ -41,11 +41,11 @@ void     eeprom_update_block(const void *__src, void *__dst, size_t __n);
 #elif defined(EEPROM_STM32_L0_L1)
 #    include "eeprom_stm32_L0_L1.h"
 #    define TOTAL_EEPROM_BYTE_COUNT (STM32_ONBOARD_EEPROM_SIZE)
-#elif defined(EEPROM_TEENSY)
-#    include "eeprom_teensy.h"
+#elif defined(EEPROM_KINETIS_FLEXRAM)
+#    include "eeprom_kinetis_flexram.h"
 #    define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
-#elif defined(EEPROM_STM32_FLASH_EMULATED)
-#    include "eeprom_stm32_defs.h"
+#elif defined(EEPROM_LEGACY_EMULATED_FLASH)
+#    include "eeprom_legacy_emulated_flash_defs.h"
 #    define TOTAL_EEPROM_BYTE_COUNT (FEE_DENSITY_BYTES)
 #elif defined(EEPROM_SAMD)
 #    include "eeprom_samd.h"
@@ -59,12 +59,12 @@ void     eeprom_update_block(const void *__src, void *__dst, size_t __n);
 #elif defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
 #    define TOTAL_EEPROM_BYTE_COUNT 4096
 #elif defined(EEPROM_TEST_HARNESS)
-#    ifndef FLASH_STM32_MOCKED
+#    ifndef LEGACY_FLASH_OPS_MOCKED
 // Normal tests
 #        define TOTAL_EEPROM_BYTE_COUNT 32
 #    else
 // Flash wear-leveling testing
-#        include "eeprom_stm32_tests.h"
+#        include "eeprom_legacy_emulated_flash_tests.h"
 #        define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
 #    endif
 #else
diff --git a/platforms/test/eeprom_stm32_tests.cpp b/platforms/test/eeprom_legacy_emulated_flash_tests.cpp
similarity index 100%
rename from platforms/test/eeprom_stm32_tests.cpp
rename to platforms/test/eeprom_legacy_emulated_flash_tests.cpp
diff --git a/platforms/test/eeprom_stm32_tests.h b/platforms/test/eeprom_legacy_emulated_flash_tests.h
similarity index 69%
rename from platforms/test/eeprom_stm32_tests.h
rename to platforms/test/eeprom_legacy_emulated_flash_tests.h
index 35ed885e52..467ec96d74 100644
--- a/platforms/test/eeprom_stm32_tests.h
+++ b/platforms/test/eeprom_legacy_emulated_flash_tests.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "flash_stm32.h"
-#include "eeprom_stm32.h"
+#include "legacy_flash_ops.h"
+#include "eeprom_legacy_emulated_flash.h"
 
 #define EEPROM_SIZE (FEE_PAGE_SIZE * FEE_PAGE_COUNT / 2)
diff --git a/platforms/test/flash_stm32_mock.c b/platforms/test/legacy_flash_ops_mock.c
similarity index 98%
rename from platforms/test/flash_stm32_mock.c
rename to platforms/test/legacy_flash_ops_mock.c
index b6ab170f95..b9d805cb47 100644
--- a/platforms/test/flash_stm32_mock.c
+++ b/platforms/test/legacy_flash_ops_mock.c
@@ -16,7 +16,7 @@
 
 #include <string.h>
 #include <stdbool.h>
-#include "flash_stm32.h"
+#include "legacy_flash_ops.h"
 
 uint8_t FlashBuf[MOCK_FLASH_SIZE] = {0};
 
diff --git a/platforms/test/rules.mk b/platforms/test/rules.mk
index a2baa283d0..43898db07e 100644
--- a/platforms/test/rules.mk
+++ b/platforms/test/rules.mk
@@ -1,25 +1,25 @@
-eeprom_stm32_DEFS  := -DEEPROM_TEST_HARNESS -DFLASH_STM32_MOCKED -DNO_PRINT -DFEE_FLASH_BASE=FlashBuf
-eeprom_stm32_tiny_DEFS := $(eeprom_stm32_DEFS) \
+eeprom_legacy_emulated_flash_DEFS  := -DEEPROM_TEST_HARNESS -DLEGACY_FLASH_OPS_MOCKED -DNO_PRINT -DFEE_FLASH_BASE=FlashBuf
+eeprom_legacy_emulated_flash_tiny_DEFS := $(eeprom_legacy_emulated_flash_DEFS) \
 	-DFEE_MCU_FLASH_SIZE=1 \
 	-DMOCK_FLASH_SIZE=1024 \
 	-DFEE_PAGE_SIZE=512 \
 	-DFEE_PAGE_COUNT=1
-eeprom_stm32_large_DEFS := $(eeprom_stm32_DEFS) \
+eeprom_legacy_emulated_flash_large_DEFS := $(eeprom_legacy_emulated_flash_DEFS) \
 	-DFEE_MCU_FLASH_SIZE=64 \
 	-DMOCK_FLASH_SIZE=65536 \
 	-DFEE_PAGE_SIZE=2048 \
 	-DFEE_PAGE_COUNT=16
 
-eeprom_stm32_INC := \
+eeprom_legacy_emulated_flash_INC := \
 	$(PLATFORM_PATH)/chibios/drivers/eeprom/ \
 	$(PLATFORM_PATH)/chibios/drivers/flash/
-eeprom_stm32_tiny_INC := $(eeprom_stm32_INC)
-eeprom_stm32_large_INC := $(eeprom_stm32_INC)
+eeprom_legacy_emulated_flash_tiny_INC := $(eeprom_legacy_emulated_flash_INC)
+eeprom_legacy_emulated_flash_large_INC := $(eeprom_legacy_emulated_flash_INC)
 
-eeprom_stm32_SRC := \
+eeprom_legacy_emulated_flash_SRC := \
 	$(TOP_DIR)/drivers/eeprom/eeprom_driver.c \
-	$(PLATFORM_PATH)/$(PLATFORM_KEY)/eeprom_stm32_tests.cpp \
-	$(PLATFORM_PATH)/$(PLATFORM_KEY)/flash_stm32_mock.c \
-	$(PLATFORM_PATH)/chibios/drivers/eeprom/eeprom_stm32.c
-eeprom_stm32_tiny_SRC := $(eeprom_stm32_SRC)
-eeprom_stm32_large_SRC := $(eeprom_stm32_SRC)
+	$(PLATFORM_PATH)/$(PLATFORM_KEY)/eeprom_legacy_emulated_flash_tests.cpp \
+	$(PLATFORM_PATH)/$(PLATFORM_KEY)/legacy_flash_ops_mock.c \
+	$(PLATFORM_PATH)/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
+eeprom_legacy_emulated_flash_tiny_SRC := $(eeprom_legacy_emulated_flash_SRC)
+eeprom_legacy_emulated_flash_large_SRC := $(eeprom_legacy_emulated_flash_SRC)
diff --git a/platforms/test/testlist.mk b/platforms/test/testlist.mk
index 51a9638bb9..b8ec68e7d3 100644
--- a/platforms/test/testlist.mk
+++ b/platforms/test/testlist.mk
@@ -1 +1 @@
-TEST_LIST += eeprom_stm32_tiny eeprom_stm32_large
+TEST_LIST += eeprom_legacy_emulated_flash_tiny eeprom_legacy_emulated_flash_large

From 535dd84691abe2c93e6d286e82ab0006598cfe62 Mon Sep 17 00:00:00 2001
From: leah-splitkb <103112489+leah-splitkb@users.noreply.github.com>
Date: Wed, 23 Nov 2022 10:12:50 +0100
Subject: [PATCH 921/959] [Keyboard] Add splitkb.com's Aurora Corne (#18880)

---
 keyboards/splitkb/aurora/corne/config.h       |  22 ++
 keyboards/splitkb/aurora/corne/corne.c        | 308 ++++++++++++++++++
 keyboards/splitkb/aurora/corne/glcdfont.c     | 234 +++++++++++++
 keyboards/splitkb/aurora/corne/info.json      |  16 +
 .../aurora/corne/keymaps/debug/config.h       |  21 ++
 .../aurora/corne/keymaps/debug/keymap.c       |  73 +++++
 .../aurora/corne/keymaps/debug/readme.md      |  24 ++
 .../aurora/corne/keymaps/debug/rules.mk       |  23 ++
 .../aurora/corne/keymaps/default/keymap.json  |  49 +++
 .../aurora/corne/keymaps/default/readme.md    |  88 +++++
 keyboards/splitkb/aurora/corne/readme.md      |  48 +++
 keyboards/splitkb/aurora/corne/rev1/config.h  |  45 +++
 keyboards/splitkb/aurora/corne/rev1/info.json | 167 ++++++++++
 keyboards/splitkb/aurora/corne/rev1/rev1.c    |  35 ++
 keyboards/splitkb/aurora/corne/rev1/rules.mk  |  17 +
 keyboards/splitkb/aurora/corne/rules.mk       |  16 +
 16 files changed, 1186 insertions(+)
 create mode 100644 keyboards/splitkb/aurora/corne/config.h
 create mode 100644 keyboards/splitkb/aurora/corne/corne.c
 create mode 100644 keyboards/splitkb/aurora/corne/glcdfont.c
 create mode 100644 keyboards/splitkb/aurora/corne/info.json
 create mode 100644 keyboards/splitkb/aurora/corne/keymaps/debug/config.h
 create mode 100644 keyboards/splitkb/aurora/corne/keymaps/debug/keymap.c
 create mode 100644 keyboards/splitkb/aurora/corne/keymaps/debug/readme.md
 create mode 100644 keyboards/splitkb/aurora/corne/keymaps/debug/rules.mk
 create mode 100644 keyboards/splitkb/aurora/corne/keymaps/default/keymap.json
 create mode 100644 keyboards/splitkb/aurora/corne/keymaps/default/readme.md
 create mode 100644 keyboards/splitkb/aurora/corne/readme.md
 create mode 100644 keyboards/splitkb/aurora/corne/rev1/config.h
 create mode 100644 keyboards/splitkb/aurora/corne/rev1/info.json
 create mode 100644 keyboards/splitkb/aurora/corne/rev1/rev1.c
 create mode 100644 keyboards/splitkb/aurora/corne/rev1/rules.mk
 create mode 100644 keyboards/splitkb/aurora/corne/rules.mk

diff --git a/keyboards/splitkb/aurora/corne/config.h b/keyboards/splitkb/aurora/corne/config.h
new file mode 100644
index 0000000000..a4a4441950
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// Not yet available in `info.json`
+#ifdef OLED_ENABLE
+#   define OLED_FONT_H "keyboards/splitkb/aurora/corne/glcdfont.c"
+#endif
diff --git a/keyboards/splitkb/aurora/corne/corne.c b/keyboards/splitkb/aurora/corne/corne.c
new file mode 100644
index 0000000000..11ed0500ad
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/corne.c
@@ -0,0 +1,308 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// The first four layers gets a name for readability, which is then used in the OLED below.
+enum layers {
+  _DEFAULT,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#ifdef OLED_ENABLE
+// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne,
+// and has been copied directly from `crkbd/soundmonster/keymap.c`
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+static void render_space(void) {
+    oled_write_P(PSTR("     "), false);
+}
+
+static void render_mod_status_gui_alt(uint8_t modifiers) {
+    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
+    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
+    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
+    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
+
+    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
+    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
+    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
+    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[] = {0xc7, 0};
+    static const char PROGMEM on_off_2[] = {0xc8, 0};
+    static const char PROGMEM off_on_1[] = {0xc9, 0};
+    static const char PROGMEM off_on_2[] = {0xca, 0};
+    static const char PROGMEM on_on_1[] = {0xcb, 0};
+    static const char PROGMEM on_on_2[] = {0xcc, 0};
+
+    if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_1, false);
+    } else {
+        oled_write_P(gui_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
+        oled_write_P(on_on_1, false);
+    } else if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_1, false);
+    } else if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_1, false);
+    } else {
+        oled_write_P(alt_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_2, false);
+    } else {
+        oled_write_P(gui_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
+        oled_write_P(on_on_2, false);
+    } else if(modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_2, false);
+    } else if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if(modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_2, false);
+    } else {
+        oled_write_P(alt_off_2, false);
+    }
+}
+
+static void render_mod_status_ctrl_shift(uint8_t modifiers) {
+    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
+    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
+    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
+    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
+
+    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
+    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
+    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
+    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[] = {0xc7, 0};
+    static const char PROGMEM on_off_2[] = {0xc8, 0};
+    static const char PROGMEM off_on_1[] = {0xc9, 0};
+    static const char PROGMEM off_on_2[] = {0xca, 0};
+    static const char PROGMEM on_on_1[] = {0xcb, 0};
+    static const char PROGMEM on_on_2[] = {0xcc, 0};
+
+    if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_1, false);
+    } else {
+        oled_write_P(ctrl_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
+        oled_write_P(on_on_1, false);
+    } else if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_1, false);
+    } else if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_1, false);
+    } else {
+        oled_write_P(shift_off_1, false);
+    }
+
+    if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_2, false);
+    } else {
+        oled_write_P(ctrl_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
+        oled_write_P(on_on_2, false);
+    } else if(modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_2, false);
+    } else if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if(modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_2, false);
+    } else {
+        oled_write_P(shift_off_2, false);
+    }
+}
+
+static void render_logo(void) {
+    static const char PROGMEM aurora_logo[] = {
+        0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, 
+        0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, 
+        0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, 
+        0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, 
+        0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, 
+        0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, 
+        0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, 
+        0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28
+    };
+    oled_write_raw_P(aurora_logo, sizeof(aurora_logo));
+    oled_set_cursor(0, 4);
+}
+
+static void render_logo_text(void) {
+    oled_write_P(PSTR("corne"), false);
+}
+
+static void render_kb_LED_state(void) {
+    // Host Keyboard LED Status
+    led_t led_usb_state = host_keyboard_led_state();
+    oled_write_P(led_usb_state.num_lock ? PSTR("N ") : PSTR("  "), false);
+    oled_write_P(led_usb_state.caps_lock ? PSTR("C ") : PSTR("  "), false);
+    oled_write_P(led_usb_state.scroll_lock ? PSTR("S ") : PSTR("  "), false);
+}
+
+static void render_layer_state(void) {
+    static const char PROGMEM default_layer[] = {
+        0x20, 0x94, 0x95, 0x96, 0x20,
+        0x20, 0xb4, 0xb5, 0xb6, 0x20,
+        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
+    static const char PROGMEM raise_layer[] = {
+        0x20, 0x97, 0x98, 0x99, 0x20,
+        0x20, 0xb7, 0xb8, 0xb9, 0x20,
+        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
+    static const char PROGMEM lower_layer[] = {
+        0x20, 0x9a, 0x9b, 0x9c, 0x20,
+        0x20, 0xba, 0xbb, 0xbc, 0x20,
+        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
+    static const char PROGMEM adjust_layer[] = {
+        0x20, 0x9d, 0x9e, 0x9f, 0x20,
+        0x20, 0xbd, 0xbe, 0xbf, 0x20,
+        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
+    if(layer_state_is(_LOWER)) {
+        oled_write_P(lower_layer, false);
+    } else if(layer_state_is(_RAISE)) {
+        oled_write_P(raise_layer, false);
+    } else if(layer_state_is(_DEFAULT)) {
+        oled_write_P(default_layer, false);
+    } else {
+        oled_write_P(adjust_layer, false);
+    }
+}
+
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        // Renders the current keyboard state (layers and mods)
+        render_logo();
+        render_logo_text();
+        render_space();
+        render_layer_state();
+        render_space();
+        render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
+        render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
+        render_kb_LED_state();
+    } else {
+        // clang-format off
+        static const char PROGMEM aurora_art[] = {
+            0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, 
+            0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 
+            0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 
+            0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, 
+            0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, 
+            0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, 
+            0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, 
+            0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, 
+            0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, 
+            0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, 
+            0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, 
+            0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 
+            0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, 
+            0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, 
+            0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, 
+            0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, 
+            0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, 
+            0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, 
+            0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, 
+            0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, 
+            0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, 
+            0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, 
+            0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, 
+            0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, 
+            0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, 
+            0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, 
+            0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, 
+            0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00
+        };
+        // clang-format on
+        oled_write_raw_P(aurora_art, sizeof(aurora_art));
+    }
+    return false;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    // 0 is left-half encoder,
+    // 1 is right-half encoder
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/splitkb/aurora/corne/glcdfont.c b/keyboards/splitkb/aurora/corne/glcdfont.c
new file mode 100644
index 0000000000..d6a58634d1
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/glcdfont.c
@@ -0,0 +1,234 @@
+#include "progmem.h"
+
+// NOTE: This file is a copy of `crkbd/soundmonster/glcdfont.c`
+
+// Corne 8x6 font with QMK Firmware Logo
+// Online editor: https://helixfonteditor.netlify.com/
+// See also: https://github.com/soundmonster/glcdfont_converter
+
+const unsigned char font[] PROGMEM = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
+0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
+0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC,
+0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00,
+0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2,
+0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
+0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
+0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
+0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
+0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
+0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
+0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
+0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
+0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
+0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
+0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
+0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
+0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
+0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
+0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
+0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
+0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
+0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
+0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
+0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
+0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
+0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
+0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
+0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
+0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0,
+0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
+0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
+0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
+0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
+0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
+0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
+0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
+0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
+0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
+0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
+0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
+0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
+0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
+0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
+0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
+0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
+0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
+0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
+0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
+0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
+0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
+0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
+0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
+0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
+0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
+0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
+0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F,
+0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F,
+0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F,
+0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C,
+0x78, 0x78, 0x38, 0x1C, 0x0F, 0x00,
+0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
+0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
+0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
+0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
+0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
+0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
+0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
+0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
+0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
+0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
+0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
+0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
+0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
+0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
+0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
+0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
+0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
+0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
+0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
+0x03, 0x02, 0x01, 0x01, 0x00, 0x00
+};
diff --git a/keyboards/splitkb/aurora/corne/info.json b/keyboards/splitkb/aurora/corne/info.json
new file mode 100644
index 0000000000..e5501e0a9c
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/info.json
@@ -0,0 +1,16 @@
+{
+    "manufacturer": "splitkb.com",
+    "url": "https://splitkb.com/products/aurora-corne-pcb-kit",
+    "maintainer": "splitkb",
+    "usb": {
+        "vid": "0x8D1D",
+        "device_version": "1.0.0"
+    },
+    "development_board": "elite_c",
+    "split": {
+        "enabled": true
+    },
+    "build": {
+        "lto": true
+    }
+}
diff --git a/keyboards/splitkb/aurora/corne/keymaps/debug/config.h b/keyboards/splitkb/aurora/corne/keymaps/debug/config.h
new file mode 100644
index 0000000000..9e639dbc35
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/keymaps/debug/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#   define RGBLIGHT_EFFECT_BREATHING
+#endif
diff --git a/keyboards/splitkb/aurora/corne/keymaps/debug/keymap.c b/keyboards/splitkb/aurora/corne/keymaps/debug/keymap.c
new file mode 100644
index 0000000000..dc145ee042
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/keymaps/debug/keymap.c
@@ -0,0 +1,73 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _DEFAULT = 0,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT] = LAYOUT_split_3x6_3(
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F,                    S(KC_F), S(KC_E), S(KC_D), S(KC_C), S(KC_B), S(KC_A),
+        KC_G, KC_H, KC_I, KC_J, KC_K, KC_L,                    S(KC_L), S(KC_K), S(KC_J), S(KC_I), S(KC_H), S(KC_G),
+        KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R,                    S(KC_R), S(KC_Q), S(KC_P), S(KC_O), S(KC_N), S(KC_M),
+                                KC_S, KC_T, KC_U,     S(KC_U), S(KC_T), S(KC_S)
+    )
+};
+
+#ifdef RGBLIGHT_ENABLE
+void keyboard_post_init_user(void) {
+  rgblight_enable_noeeprom(); // enables RGB, without saving settings
+  rgblight_sethsv_noeeprom(HSV_RED); // sets the color to red without saving
+  rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); // sets mode to Fast breathing without saving
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    // 0 is left-half encoder,
+    // 1 is right-half encoder
+    if (index == 0) {
+        tap_code(KC_0);
+    } else if (index == 1) {
+        tap_code(KC_1);
+    }
+
+    if (clockwise) {
+        tap_code16(KC_PLUS);
+    } else {
+        tap_code(KC_MINUS);
+    }
+
+    return false;
+}
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    // A 128x32 OLED rotated 90 degrees is 5 characters wide and 16 characters tall
+    // This example string should fill that neatly
+    const char *text = PSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789!@#$%^&*()[]{}-=_+?");
+
+    if (is_keyboard_master()) {
+        oled_write_P(text, false);
+    } else {
+        oled_write_P(text, false);
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/splitkb/aurora/corne/keymaps/debug/readme.md b/keyboards/splitkb/aurora/corne/keymaps/debug/readme.md
new file mode 100644
index 0000000000..5384fdaacf
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/keymaps/debug/readme.md
@@ -0,0 +1,24 @@
+# Aurora Corne's Debug Keymap
+
+To make debugging your build as easy as possible, we have provided a special debugging keymap. It is not intended to actually type on, it is just here to make sure that your hardware is working correctly.
+
+## Keys
+
+![Keys](https://i.imgur.com/y5zWjsZh.png)
+
+The left side uses lowercase letters, the right side uses uppercase ones.
+
+## Encoders
+
+Encoders output a number of 0 or 1, depending on the installed position.
+These correspond to the index used for custom encoder code.
+
+The number is followed by either a `+` or a `-`, depending on the direction turned.
+
+## LEDs
+
+Both underglow and per-key RGB should be fading between red and off.
+
+## OLEDs
+
+Both the primary and secondary side should be filled with characters.
diff --git a/keyboards/splitkb/aurora/corne/keymaps/debug/rules.mk b/keyboards/splitkb/aurora/corne/keymaps/debug/rules.mk
new file mode 100644
index 0000000000..c8a3944323
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/keymaps/debug/rules.mk
@@ -0,0 +1,23 @@
+# Copyright 2022 splitkb.com <support@splitkb.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# NOTE: These are already enabled by default at the revision level
+#ENCODER_ENABLE = yes
+#OLED_ENABLE = yes
+
+# RGB Matrix is enabled at the revision level,
+# while we use the regular RGB underglow for testing
+RGB_MATRIX_ENABLE = no
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/splitkb/aurora/corne/keymaps/default/keymap.json b/keyboards/splitkb/aurora/corne/keymaps/default/keymap.json
new file mode 100644
index 0000000000..af5667b568
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/keymaps/default/keymap.json
@@ -0,0 +1,49 @@
+{
+    "keyboard": "splitkb/aurora/corne",
+    "keymap": "default",
+    "version": 1,
+    "layout": "LAYOUT_split_3x6_3",
+    "layers": [
+        [
+            "KC_TAB"  , "KC_Q"    , "KC_W"    , "KC_E"    , "KC_R"    , "KC_T"    , "KC_Y"    , "KC_U"    , "KC_I"    , "KC_O"    , "KC_P"    , "KC_BSPC" ,
+            "KC_LCTL" , "KC_A"    , "KC_S"    , "KC_D"    , "KC_F"    , "KC_G"    , "KC_H"    , "KC_J"    , "KC_K"    , "KC_L"    , "KC_SCLN" , "KC_QUOT" ,
+            "KC_LSFT" , "KC_Z"    , "KC_X"    , "KC_C"    , "KC_V"    , "KC_B"    , "KC_N"    , "KC_M"    , "KC_COMM" , "KC_DOT"  , "KC_SLSH" , "KC_ESC"  ,
+                                                "KC_LGUI" , "MO(1)"   , "KC_SPC"  , "KC_ENT"  , "MO(2)"   , "KC_RALT"
+        ],
+        [
+            "KC_TAB"  , "KC_1"    , "KC_2"    , "KC_3"    , "KC_4"    , "KC_5"    , "KC_6"    , "KC_7"    , "KC_8"    , "KC_9"    , "KC_0"    , "KC_BSPC" ,
+            "KC_LCTL" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_LEFT" , "KC_DOWN" , "KC_UP"   , "KC_RIGHT", "XXXXXXX" , "XXXXXXX" ,
+            "KC_LSFT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" ,
+                                                "KC_LGUI" , "_______" , "KC_SPC"  , "KC_ENT"  , "MO(3)"   , "KC_RALT"
+        ],
+        [
+            "KC_TAB"  , "KC_EXLM" , "KC_AT"   , "KC_HASH" , "KC_DLR"  , "KC_PERC" , "KC_CIRC" , "KC_AMPR" , "KC_ASTR" , "KC_LPRN" , "KC_RPRN" , "KC_BSPC" ,
+            "KC_LCTL" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_MINS" , "KC_EQL"  , "KC_LBRC" , "KC_RBRC" , "KC_BSLS" , "KC_GRV"  ,
+            "KC_LSFT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_UNDS" , "KC_PLUS" , "KC_LCBR" , "KC_RCBR" , "KC_PIPE" , "KC_TILD" ,
+                                                "KC_LGUI" , "MO(3)"   , "KC_SPC"  , "KC_ENT"  , "_______" , "KC_RALT"
+        ],
+        [
+            "QK_BOOT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" ,
+            "RGB_TOG" , "RGB_HUI" , "RGB_SAI" , "RGB_VAI" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" ,
+            "RGB_MOD" , "RGB_HUD" , "RGB_SAD" , "RGB_VAD" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" ,
+                                                "KC_LGUI" , "_______" , "KC_SPC"  , "KC_ENT"  , "_______" , "KC_RALT"
+        ]
+
+    ],
+    "config": {
+        "features": {
+            "oled": true,
+            "rgb_matrix": true,
+            "rgblight": false
+        },
+        "encoder": {
+            "enabled": true
+        },
+        "rgblight": {
+            "hue_steps": 8,
+            "saturation_steps": 8,
+            "brightness_steps": 8,
+            "sleep": true
+        }
+    }
+}
diff --git a/keyboards/splitkb/aurora/corne/keymaps/default/readme.md b/keyboards/splitkb/aurora/corne/keymaps/default/readme.md
new file mode 100644
index 0000000000..9599d51996
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/keymaps/default/readme.md
@@ -0,0 +1,88 @@
+# Aurora Corne's Default Keymap
+_This keymap is a copy of the [Corne default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/crkbd/keymaps/default), with modified OLED code._
+
+A simple default keymap for the Aurora Corne
+============================================
+
+Keymaps in general are quite personal, so it is difficult to come up with a default that will suit every user. We hope this keymap serves as a good starting point for your own - although it should be fairly usable out-of-the-box.
+
+What do all these layers do?
+----------------------------
+
+### Layer 0: Base layer
+
+![Layer 0](https://i.imgur.com/Ri5cTHqh.png)
+
+This is where your basic letters live.
+
+The homing thumb fingers are used to access the different layers.
+
+* The homing left thumb finger gives access to the Numbers (or lower) layer
+* The homing right thumb finger gives access to the Symbols (or raise) layer
+* Pressing both homing thumb fingers gives access to the Adjust layer
+
+### Layer 1: Lower
+
+![Layer 1](https://i.imgur.com/9h6ZRQLh.png)
+
+The Lower layer gives access to your number keys on the top row. It also exposes the arrow keys in the usual Vim-style layout.
+
+### Layer 2: Raise
+
+![Layer 2](https://i.imgur.com/U1pf7pJh.png)
+
+The Raise layer gives access to the symbols. In addition to shifted number keys on the top row, the right hand also exposes the remaining symbol keys, both as shifted and non-shifted variants.
+
+### Layer 3: Adjust
+
+![Layer 3](https://i.imgur.com/A6z1DCbh.png)
+
+The Adjust layer exposes RGB adjustment keys on the left hand.
+
+Where is the keymap.c?
+----------------------
+
+The keymap.c file is not published to the repository. It is generated from `keymap.json` by the build system.
+
+This avoids duplicating information and allow users to edit their keymap from the QMK Configurator web interface.
+
+How do I edit and update the keymap?
+------------------------------------
+
+The `keymap.json` file is generated from the QMK Configurator interface and formatted for better readability in the context of the Ferris keyboard.
+
+To edit it, you may:
+* Edit it directly from a text editor.
+* Edit it from the QMK Configurator.
+
+If you decide to use the latter workflow, here are the steps to follow:
+
+* From the [QMK Configurator](https://config.qmk.fm/#/splitkb/aurora/corne/rev1/LAYOUT_split_3x5_2), hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it).
+* Browse to the location of your keymap (for example, `<your qmk repo>/keyboards/splitkb/aurora/corne/keymaps/default/keymap.json`)
+* Perform any modification to the keymap in the web UI
+* Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it)
+* Replace your original keymap with the one you just downloaded
+
+_**Note:** At the time of writing (the 24th of October 2022), not every feature used in the default keymap is supported by the QMK Configurator. You cannot yet upload the default `keymap.json` due to a file format mismatch - use the "Load Default" button to load the default keymap instead. Additionally, custom configuration options are still being worked on: if your keymap depends on them, please compile your firmware offline for now._
+
+I want to do more than the JSON format supports!
+-------------------------------------------------
+
+While the `json` format is easy to use, it does lack certain functionality - most notably custom OLED or encoder behaviour.
+
+To add this, you need to convert it to the `c` format. Do keep in mind that this is generally a one-way operation.
+
+First, from the root of your qmk repo, move to your keymap folder
+
+```bash
+cd ./keymaps/splitkb/aurora/corne/my_personal_keymap
+```
+
+Next, convert your `keymap.json` to a `keymap.c`
+
+```bash
+qmk json2c -o keymap.c keymap.json
+```
+
+You can add custom C code to the newly generated `keymap.c` file. Do note that you have to use **either** a C file **or** a JSON file - you cannot do both!  
+**If a JSON file is present, the C file is ignored.**
diff --git a/keyboards/splitkb/aurora/corne/readme.md b/keyboards/splitkb/aurora/corne/readme.md
new file mode 100644
index 0000000000..1341e819ae
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/readme.md
@@ -0,0 +1,48 @@
+![Aurora Corne](https://i.imgur.com/t4EQ77Lh.jpg)
+
+# Aurora Corne
+The Aurora Corne is a redesign by splitkb.com of the popular Corne keyboard (also known as the crkbd or the Helidox) by Foostan.
+
+Keyboard Maintainer: [splitkb.com](https://github.com/splitkb)  
+Hardware Supported: Pro Micro 5V/16MHz and compatible.  
+Hardware Availability: [splitkb.com](https://splitkb.com).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make splitkb/aurora/corne/rev1:default
+
+Example of flashing this keyboard:
+
+    make splitkb/aurora/corne/rev1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+You can enter the bootloader in 3 ways:
+
+* **Physical reset button**: Briefly press the button on the side of the PCB, next to the TRRS socket.
+* **Bootmagic reset**: Hold down the bootmagic key and plug in the keyboard. For the left half, this is the top-left button. For the right half, this is the top-right button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
+
+# Assembly
+A build guide for the entire Aurora series will become available soon at [docs.splitkb.com](https://docs.splitkb.com).
+
+# Features
+The Aurora Corne supports the following features:
+
+- Support for MX or Kailh Choc (v1 sold at splitkb.com, not v2) switches;
+- Top mounted controllers for a lower profile;
+- Up to two 128×32 pixel OLED displays;
+- Up to one EC11 rotary encoders per half in one of two possible positions;
+- Per-key RGB backlight by individual RGB LEDs;
+- Underglow by individual RGB LEDs;
+- Support for a power switch for wireless controllers;
+- Support for the splitkb.com tenting puck.
+
+# What is the Aurora Series?
+
+The Aurora series were designed as a homage to open source keyboard kits that have carved their space into the community. Kits that provided something new and unique, kits that resonated with the community and that have both received and have given a lot of love in return.
+
+With the Aurora series, we aim to make these kits available to the community in a way that both honors the original, while also offering the best possible feature set and a consistent, well-documented build experience.
+
+For each kit sold, we give back to the community by donating €1 across [the firmware projects we support](https://opencollective.com/splitkb). This way we support open source projects and benefit everyone using keyboards, whether they use our kits or their own.
diff --git a/keyboards/splitkb/aurora/corne/rev1/config.h b/keyboards/splitkb/aurora/corne/rev1/config.h
new file mode 100644
index 0000000000..0d4af3b8cc
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/rev1/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2022 splitkb.com <support@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// `SPLIT_HAND_PIN` can currently be defined in `info.json`,
+// but can't yet be given a value
+#define SPLIT_HAND_PIN F4
+
+// Not yet available in `info.json`
+#ifdef OLED_ENABLE
+#    define OLED_DISPLAY_128X32
+#    define SPLIT_OLED_ENABLE
+#endif
+
+// Not yet available in `info.json`
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define SPLIT_TRANSPORT_MIRROR
+#endif
+
+// Not yet available in `info.json`
+#ifdef BOOTMAGIC_ENABLE
+     // Top left key on left half
+#    define BOOTMAGIC_LITE_ROW 0
+#    define BOOTMAGIC_LITE_COLUMN 5
+     // Top right key on right half
+#    define BOOTMAGIC_LITE_ROW_RIGHT    4
+#    define BOOTMAGIC_LITE_COLUMN_RIGHT 5
+#endif
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
new file mode 100644
index 0000000000..4c5e5458de
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -0,0 +1,167 @@
+{
+    "keyboard_name": "Aurora Corne rev1",
+    "usb": {
+        "pid": "0x343A"
+    },
+    "features": {
+        "mousekey": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "oled": true,
+        "rgb_matrix": true
+    },
+    "community_layouts": [
+        "split_3x6_3"
+    ],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"label": "L06", "matrix": [0, 0], "x":  0, "y": 0.3},
+                {"label": "L05", "matrix": [0, 1], "x":  1, "y": 0.3},
+                {"label": "L04", "matrix": [0, 2], "x":  2, "y": 0.1},
+                {"label": "L03", "matrix": [0, 3], "x":  3, "y": 0},
+                {"label": "L02", "matrix": [0, 4], "x":  4, "y": 0.1},
+                {"label": "L01", "matrix": [0, 5], "x":  5, "y": 0.2},
+                {"label": "R01", "matrix": [4, 5], "x":  9, "y": 0.2},
+                {"label": "R02", "matrix": [4, 4], "x": 10, "y": 0.1},
+                {"label": "R03", "matrix": [4, 3], "x": 11, "y": 0},
+                {"label": "R04", "matrix": [4, 2], "x": 12, "y": 0.1},
+                {"label": "R05", "matrix": [4, 1], "x": 13, "y": 0.3},
+                {"label": "R06", "matrix": [4, 0], "x": 14, "y": 0.3},
+
+                {"label": "L12", "matrix": [1, 0], "x":  0, "y": 1.3},
+                {"label": "L11", "matrix": [1, 1], "x":  1, "y": 1.3},
+                {"label": "L10", "matrix": [1, 2], "x":  2, "y": 1.1},
+                {"label": "L09", "matrix": [1, 3], "x":  3, "y": 1},
+                {"label": "L08", "matrix": [1, 4], "x":  4, "y": 1.1},
+                {"label": "L07", "matrix": [1, 5], "x":  5, "y": 1.2},
+                {"label": "R07", "matrix": [5, 5], "x":  9, "y": 1.2},
+                {"label": "R08", "matrix": [5, 4], "x": 10, "y": 1.1},
+                {"label": "R09", "matrix": [5, 3], "x": 11, "y": 1},
+                {"label": "R10", "matrix": [5, 2], "x": 12, "y": 1.1},
+                {"label": "R11", "matrix": [5, 1], "x": 13, "y": 1.3},
+                {"label": "R12", "matrix": [5, 0], "x": 14, "y": 1.3},
+
+                {"label": "L18", "matrix": [2, 0], "x":  0, "y": 2.3},
+                {"label": "L17", "matrix": [2, 1], "x":  1, "y": 2.3},
+                {"label": "L16", "matrix": [2, 2], "x":  2, "y": 2.1},
+                {"label": "L15", "matrix": [2, 3], "x":  3, "y": 2},
+                {"label": "L14", "matrix": [2, 4], "x":  4, "y": 2.1},
+                {"label": "L13", "matrix": [2, 5], "x":  5, "y": 2.2},
+                {"label": "R13", "matrix": [6, 5], "x":  9, "y": 2.2},
+                {"label": "R14", "matrix": [6, 4], "x": 10, "y": 2.1},
+                {"label": "R15", "matrix": [6, 3], "x": 11, "y": 2},
+                {"label": "R16", "matrix": [6, 2], "x": 12, "y": 2.1},
+                {"label": "R17", "matrix": [6, 1], "x": 13, "y": 2.3},
+                {"label": "R18", "matrix": [6, 0], "x": 14, "y": 2.3},
+
+                {"label": "L21", "matrix": [3, 3], "x":  4, "y": 3.7},
+                {"label": "L20", "matrix": [3, 4], "x":  5, "y": 3.7},
+                {"label": "L19", "matrix": [3, 5], "x":  6, "y": 3.2},
+                {"label": "R19", "matrix": [7, 5], "x":  8, "y": 3.2},
+                {"label": "R20", "matrix": [7, 4], "x":  9, "y": 3.7},
+                {"label": "R21", "matrix": [7, 3], "x": 10, "y": 3.7}
+            ]
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["D7", "E6", "B4", "B5"],
+        "cols": ["B2", "B6", "B3", "B1", "F7", "F6"]
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {
+                "pin_a": "D4",
+                "pin_b": "C6"
+            }
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "main": "pin",
+        "matrix_pins": {
+            "right": {
+                "rows": ["B1", "B3", "B2", "B6"],
+                "cols": ["D4", "C6", "D7", "E6", "B4", "B5"]
+            }
+        },
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {
+                        "pin_a": "F6",
+                        "pin_b": "F7"
+                    }
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "pin": "D3",
+        "led_count": 54,
+        "split": true,
+        "split_count": [27, 27],
+        "max_brightness": 128
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            {"flags": 2, "x":  93, "y": 17},                   // L RGB1
+            {"flags": 2, "x":  59, "y":  3},                   // L RGB2
+            {"flags": 2, "x":  25, "y":  7},                   // L RGB3
+            {"flags": 2, "x":  29, "y": 49},                   // L RGB4
+            {"flags": 2, "x":  70, "y": 51},                   // L RGB5
+            {"flags": 2, "x": 104, "y": 55},                   // L RGB6
+            {"flags": 4, "matrix": [3, 2], "x":  95, "y": 63}, // L SW19
+            {"flags": 4, "matrix": [3, 1], "x":  80, "y": 58}, // L SW20
+            {"flags": 4, "matrix": [3, 0], "x":  60, "y": 55}, // L SW21
+            {"flags": 4, "matrix": [2, 5], "x":  85, "y": 39}, // L SW13
+            {"flags": 4, "matrix": [2, 4], "x":  68, "y": 37}, // L SW14
+            {"flags": 4, "matrix": [2, 3], "x":  50, "y": 35}, // L SW15
+            {"flags": 4, "matrix": [2, 2], "x":  33, "y": 37}, // L SW16
+            {"flags": 4, "matrix": [2, 1], "x":  16, "y": 42}, // L SW17
+            {"flags": 4, "matrix": [1, 5], "x":  85, "y": 21}, // L SW07
+            {"flags": 4, "matrix": [1, 4], "x":  68, "y": 19}, // L SW08
+            {"flags": 4, "matrix": [1, 3], "x":  50, "y": 13}, // L SW09
+            {"flags": 4, "matrix": [1, 2], "x":  33, "y": 20}, // L SW10
+            {"flags": 4, "matrix": [1, 1], "x":  16, "y": 24}, // L SW11
+            {"flags": 4, "matrix": [0, 5], "x":  85, "y":  4}, // L SW01
+            {"flags": 4, "matrix": [0, 4], "x":  68, "y":  2}, // L SW02
+            {"flags": 4, "matrix": [0, 3], "x":  50, "y":  0}, // L SW03
+            {"flags": 4, "matrix": [0, 2], "x":  33, "y":  3}, // L SW04
+            {"flags": 4, "matrix": [0, 1], "x":  16, "y":  7}, // L SW05
+            {"flags": 4, "matrix": [0, 0], "x":   0, "y":  7}, // L SW06
+            {"flags": 4, "matrix": [1, 0], "x":   0, "y": 24}, // L SW12
+            {"flags": 4, "matrix": [2, 0], "x":   0, "y": 41}, // L SW18
+            {"flags": 2, "x": 131, "y": 17},                   // R RGB1
+            {"flags": 2, "x": 165, "y":  3},                   // R RGB2
+            {"flags": 2, "x": 199, "y":  7},                   // R RGB3
+            {"flags": 2, "x": 195, "y": 49},                   // R RGB4
+            {"flags": 2, "x": 154, "y": 51},                   // R RGB5
+            {"flags": 2, "x": 120, "y": 55},                   // R RGB6
+            {"flags": 4, "matrix": [7, 2], "x": 129, "y": 63}, // R SW19
+            {"flags": 4, "matrix": [7, 1], "x": 144, "y": 58}, // R SW20
+            {"flags": 4, "matrix": [7, 0], "x": 164, "y": 55}, // R SW21
+            {"flags": 4, "matrix": [6, 5], "x": 139, "y": 39}, // R SW13
+            {"flags": 4, "matrix": [6, 4], "x": 156, "y": 37}, // R SW14
+            {"flags": 4, "matrix": [6, 3], "x": 174, "y": 35}, // R SW15
+            {"flags": 4, "matrix": [6, 2], "x": 191, "y": 37}, // R SW16
+            {"flags": 4, "matrix": [6, 1], "x": 208, "y": 42}, // R SW17
+            {"flags": 4, "matrix": [5, 5], "x": 139, "y": 21}, // R SW07
+            {"flags": 4, "matrix": [5, 4], "x": 156, "y": 19}, // R SW08
+            {"flags": 4, "matrix": [5, 3], "x": 174, "y": 13}, // R SW09
+            {"flags": 4, "matrix": [5, 2], "x": 191, "y": 20}, // R SW10
+            {"flags": 4, "matrix": [5, 1], "x": 208, "y": 24}, // R SW11
+            {"flags": 4, "matrix": [4, 5], "x": 139, "y":  4}, // R SW01
+            {"flags": 4, "matrix": [4, 4], "x": 156, "y":  2}, // R SW02
+            {"flags": 4, "matrix": [4, 3], "x": 174, "y":  0}, // R SW03
+            {"flags": 4, "matrix": [4, 2], "x": 191, "y":  3}, // R SW04
+            {"flags": 4, "matrix": [4, 1], "x": 208, "y":  7}, // R SW05
+            {"flags": 4, "matrix": [4, 0], "x": 224, "y":  7}, // R SW06
+            {"flags": 4, "matrix": [5, 0], "x": 224, "y": 24}, // R SW12
+            {"flags": 4, "matrix": [6, 0], "x": 224, "y": 41}  // R SW18
+        ]
+    }
+}
diff --git a/keyboards/splitkb/aurora/corne/rev1/rev1.c b/keyboards/splitkb/aurora/corne/rev1/rev1.c
new file mode 100644
index 0000000000..1fdbbf93f1
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/rev1/rev1.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 Leah Post <leah@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#ifdef SWAP_HANDS_ENABLE
+// clang-format off
+    __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+        {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}},
+        {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}},
+        {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}},
+        {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}},
+        {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}},
+        {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}},
+        {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}},
+        {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}}
+    };
+// clang-format on
+#    ifdef ENCODER_MAP_ENABLE
+        const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1,0};
+#    endif
+#endif
diff --git a/keyboards/splitkb/aurora/corne/rev1/rules.mk b/keyboards/splitkb/aurora/corne/rev1/rules.mk
new file mode 100644
index 0000000000..dd52338283
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/rev1/rules.mk
@@ -0,0 +1,17 @@
+# Copyright 2022 splitkb.com <support@splitkb.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Although no rules are defined,
+# presence of this file is required for QMK to compile it.
diff --git a/keyboards/splitkb/aurora/corne/rules.mk b/keyboards/splitkb/aurora/corne/rules.mk
new file mode 100644
index 0000000000..9b4b90e972
--- /dev/null
+++ b/keyboards/splitkb/aurora/corne/rules.mk
@@ -0,0 +1,16 @@
+# Copyright 2022 splitkb.com <support@splitkb.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+DEFAULT_FOLDER = splitkb/aurora/corne/rev1

From dfa53900dcc7e67db70c9ef7bdb14e4a423349f9 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 23 Nov 2022 18:01:07 +0000
Subject: [PATCH 922/959] Publish constants metadata to API (#19143)

* Publish metadata

* Ensure content is sorted
---
 lib/python/qmk/cli/generate/api.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index a98a12b628..8650a36b84 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -18,6 +18,23 @@ TEMPLATE_PATH = DATA_PATH / 'templates/api/'
 BUILD_API_PATH = Path('.build/api_data/')
 
 
+def _list_constants(output_folder):
+    """Produce a map of available constants
+    """
+    ret = {}
+    for file in (output_folder / 'constants').glob('**/*_[0-9].[0-9].[0-9].json'):
+        name, version = file.stem.rsplit('_', 1)
+        if name not in ret:
+            ret[name] = []
+        ret[name].append(version)
+
+    # Ensure content is sorted
+    for name in ret:
+        ret[name] = sorted(ret[name])
+
+    return ret
+
+
 def _resolve_keycode_specs(output_folder):
     """To make it easier for consumers, publish pre-merged spec files
     """
@@ -69,6 +86,7 @@ def generate_api(cli):
     keyboard_list_file = v1_dir / 'keyboard_list.json'  # A simple list of keyboard targets
     keyboard_aliases_file = v1_dir / 'keyboard_aliases.json'  # A list of historical keyboard names and their new name
     keyboard_metadata_file = v1_dir / 'keyboard_metadata.json'  # All the data configurator/via needs for initialization
+    constants_metadata_file = v1_dir / 'constants_metadata.json'  # Metadata for available constants
     usb_file = v1_dir / 'usb.json'  # A mapping of USB VID/PID -> keyboard target
 
     if BUILD_API_PATH.exists():
@@ -132,6 +150,7 @@ def generate_api(cli):
     keyboard_list_json = json.dumps({'last_updated': current_datetime(), 'keyboards': keyboard_list}, cls=InfoJSONEncoder)
     keyboard_aliases_json = json.dumps({'last_updated': current_datetime(), 'keyboard_aliases': keyboard_aliases}, cls=InfoJSONEncoder)
     keyboard_metadata_json = json.dumps(keyboard_metadata, cls=InfoJSONEncoder)
+    constants_metadata_json = json.dumps({'last_updated': current_datetime(), 'constants': _list_constants(v1_dir)})
 
     if not cli.args.dry_run:
         keyboard_all_file.write_text(keyboard_all_json)
@@ -139,3 +158,4 @@ def generate_api(cli):
         keyboard_list_file.write_text(keyboard_list_json)
         keyboard_aliases_file.write_text(keyboard_aliases_json)
         keyboard_metadata_file.write_text(keyboard_metadata_json)
+        constants_metadata_file.write_text(constants_metadata_json)

From 558ab18611665c3b447c27bac82fac2224eadaef Mon Sep 17 00:00:00 2001
From: Adam Price <komidore64@gmail.com>
Date: Wed, 23 Nov 2022 13:12:36 -0500
Subject: [PATCH 923/959] [Keymap] komidore64 planck rev6 (#19036)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/planck/keymaps/komidore64/config.h  | 28 ++++++++
 keyboards/planck/keymaps/komidore64/keymap.c  | 66 +++++++++++++++++++
 keyboards/planck/keymaps/komidore64/readme.md | 10 +++
 3 files changed, 104 insertions(+)
 create mode 100644 keyboards/planck/keymaps/komidore64/config.h
 create mode 100644 keyboards/planck/keymaps/komidore64/keymap.c
 create mode 100644 keyboards/planck/keymaps/komidore64/readme.md

diff --git a/keyboards/planck/keymaps/komidore64/config.h b/keyboards/planck/keymaps/komidore64/config.h
new file mode 100644
index 0000000000..25d63b30c7
--- /dev/null
+++ b/keyboards/planck/keymaps/komidore64/config.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 M. Adam Price
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config_common.h"
+
+// QMK configuration /////////
+#define TAPPING_TERM 400
+#define PERMISSIVE_HOLD
+//////////////////////////////
+
+// k64 keymap configuration //
+#define KEYMAP_REVISION "11"
+#define VER_NEWLINE_WAIT 200 // in milliseconds
+//////////////////////////////
diff --git a/keyboards/planck/keymaps/komidore64/keymap.c b/keyboards/planck/keymaps/komidore64/keymap.c
new file mode 100644
index 0000000000..6897f6c81a
--- /dev/null
+++ b/keyboards/planck/keymaps/komidore64/keymap.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2022 M. Adam Price
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "version.h"
+
+enum custom_keycodes {
+    VER_STR = SAFE_RANGE,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case VER_STR:
+            if (record->event.pressed) {
+                SEND_STRING("# qmk " QMK_VERSION "\n");
+                wait_ms(VER_NEWLINE_WAIT);
+                SEND_STRING("# " QMK_KEYBOARD "/" QMK_KEYMAP " version " KEYMAP_REVISION "\n");
+                wait_ms(VER_NEWLINE_WAIT);
+                SEND_STRING("# built on: " QMK_BUILDDATE "\n");
+            }
+            break;
+    }
+    return true;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_planck_1x2uC(
+            KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+            LCTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+            KC_LSFT,        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+            XXXXXXX,        KC_ALGR, KC_LGUI, KC_LALT, MO(1),   KC_SPC,           MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [1] = LAYOUT_planck_1x2uC(
+            KC_GRV,         KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+            _______,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+            _______,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+            KC_INS,         _______, _______, _______, _______, _______,          MO(3),   KC_HOME, KC_PGDN, KC_PGUP, KC_END
+    ),
+    [2] = LAYOUT_planck_1x2uC(
+            KC_TILD,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+            _______,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            _______,        KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            KC_INS,         _______, _______, _______, MO(3),   _______,          _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+    ),
+    [3] = LAYOUT_planck_1x2uC(
+            QK_BOOT,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_DEL,
+            XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, XXXXXXX, XXXXXXX,
+            KC_CAPS,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, VER_STR,
+            _______,        XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX,          _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    )
+};
diff --git a/keyboards/planck/keymaps/komidore64/readme.md b/keyboards/planck/keymaps/komidore64/readme.md
new file mode 100644
index 0000000000..85b632530f
--- /dev/null
+++ b/keyboards/planck/keymaps/komidore64/readme.md
@@ -0,0 +1,10 @@
+# komidore64 OLKB Plank rev6
+
+The fanciest change in this keymap compared to the default is I've added a
+version string output command.
+
+```
+# qmk 0.7.151-13-ga942ac
+# planck/rev6/komidore64 version 11
+# built on: 2020-02-12-12:21:46
+```

From af6aa225ebfc64caf571601b3e3390614daad54f Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 23 Nov 2022 18:48:22 +0000
Subject: [PATCH 924/959] Additional DD backlight config (#19124)

* Additional dd backlight config

* Update docs
---
 data/mappings/info_config.hjson  | 2 ++
 data/schemas/keyboard.jsonschema | 2 ++
 docs/reference_info_json.md      | 7 +++++++
 lib/python/qmk/info.py           | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index a013e98b34..a576df892e 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -14,8 +14,10 @@
     "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
     "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
     "BACKLIGHT_LEVELS": {"info_key": "backlight.levels", "value_type": "int"},
+    "BACKLIGHT_LIMIT_VAL": {"info_key": "backlight.max_brightness", "value_type": "int"},
     "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"},
     "BACKLIGHT_PIN": {"info_key": "backlight.pin"},
+    "BACKLIGHT_PINS": {"info_key": "backlight.pins", "value_type": "array"},
     "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
     "CAPS_WORD_IDLE_TIMEOUT": {"info_key": "caps_word.idle_timeout", "value_type": "int"},
     "COMBO_COUNT": {"info_key": "combo.count", "value_type": "int"},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index daf54141a8..91110b06a0 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -115,7 +115,9 @@
                     "minimum": 1,
                     "maximum": 31
                 },
+                "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
                 "on_state": {"$ref": "qmk.definitions.v1#/bit"}
             }
         },
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index 05d4ef1113..c872bcb696 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -132,8 +132,15 @@ Enable by setting
     * The length of one backlight “breath” in seconds
 * `levels`
     * The number of brightness levels (maximum 31, excluding off)
+* `max_brightness`
+    * The maximum duty cycle of the backlight LED(s) (0-255)
 * `pin`
     * The pin that controls the backlight LED(s)
+* `pins`
+    * Array of pins that controls the backlight LED(s) (See [Multiple Backlight Pins](feature_backlight.md#multiple-backlight-pins))
+* `on_state`
+    * The state of the indicator pins when the LED is "on" - `1` for high, `0` for low
+    * Default: `1`
 
 Example:
 
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 5dc8b9c5fe..51b7fb6421 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -451,7 +451,7 @@ def _config_to_json(key_type, config_value):
         if array_type == 'int':
             return list(map(int, config_value.split(',')))
         else:
-            return config_value.split(',')
+            return list(map(str.strip, config_value.split(',')))
 
     elif key_type == 'bool':
         return config_value in true_values

From 3209c7a42c4d70b5f59eda93bf227d89de9fc872 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 24 Nov 2022 07:50:17 +0000
Subject: [PATCH 925/959] Fixup aurora/corne on develop (#19144)

---
 keyboards/splitkb/aurora/corne/rev1/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/splitkb/aurora/corne/rev1/config.h b/keyboards/splitkb/aurora/corne/rev1/config.h
index 0d4af3b8cc..f5925787bf 100644
--- a/keyboards/splitkb/aurora/corne/rev1/config.h
+++ b/keyboards/splitkb/aurora/corne/rev1/config.h
@@ -29,7 +29,7 @@
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
-#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define SPLIT_TRANSPORT_MIRROR
 #endif

From 59443fa970332106872a906d923f5b0fd9eb116b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 25 Nov 2022 02:47:02 +0000
Subject: [PATCH 926/959] jsonify some info.json (#19146)

---
 keyboards/ai03/lunar_ii/info.json             |   2 +-
 keyboards/annepro2/info.json                  |   2 +-
 keyboards/blockboy/ac980mini/info.json        |   2 +-
 keyboards/cannonkeys/brutalv2_1800/info.json  |   4 +-
 keyboards/cannonkeys/db60/hotswap/info.json   |   2 +-
 keyboards/cannonkeys/ellipse/info.json        |   2 +-
 keyboards/cannonkeys/moment/info.json         |   2 +-
 keyboards/chaos65/info.json                   |  10 +-
 keyboards/fjlabs/sinanjuwk/info.json          |   2 +-
 keyboards/gopolar/gg86/info.json              |   4 +-
 keyboards/gray_studio/aero75/info.json        |   6 +-
 .../onekey/stm32f405_feather/info.json        |   2 +-
 keyboards/idobao/id80/v2/ansi/info.json       |   2 +-
 keyboards/idobao/id80/v2/iso/info.json        |   2 +-
 keyboards/idobao/montex/v2/info.json          |   2 +-
 keyboards/ingrained/info.json                 |   2 +-
 keyboards/keebio/sinc/info.json               |   6 +-
 keyboards/keebio/sinc/rev1/info.json          |  22 ++--
 keyboards/keebio/sinc/rev2/info.json          |  22 ++--
 keyboards/mincedshon/ecila/info.json          |   2 +-
 keyboards/mini_ten_key_plus/info.json         |   2 +-
 keyboards/nyhxis/nfr_70/info.json             |  20 ++--
 keyboards/tweetydabird/lbs4/info.json         | 106 +++++++++---------
 keyboards/tweetydabird/lbs6/info.json         |  98 ++++++++--------
 24 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
index 5d86a13ad1..d276e7fa2f 100644
--- a/keyboards/ai03/lunar_ii/info.json
+++ b/keyboards/ai03/lunar_ii/info.json
@@ -6,7 +6,7 @@
     "usb": {
         "vid": "0xA103",
         "pid": "0x0016",
-        "device_version": "1.0.0",
+        "device_version": "1.0.0"
     },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json
index 52282c0ad8..dbeaf6faed 100644
--- a/keyboards/annepro2/info.json
+++ b/keyboards/annepro2/info.json
@@ -75,7 +75,7 @@
                 {"label":"Menu", "x":12.5, "y":4, "w":1.25},
                 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
             ]
-        }
+        },
         "LAYOUT_60_iso": {
             "layout": [
                 {"label":"~", "x":0, "y":0},
diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json
index 9fdf3212ae..b26d5fa630 100644
--- a/keyboards/blockboy/ac980mini/info.json
+++ b/keyboards/blockboy/ac980mini/info.json
@@ -102,7 +102,7 @@
                 { "matrix": [4, 14], "x": 15.25, "y": 4.25 },
                 { "matrix": [4, 15], "x": 16.5, "y": 4 },
                 { "matrix": [4, 16], "x": 17.5, "y": 4 },
-				{ "h": 2, "matrix": [4, 17], "x": 18.5, "y": 3 },
+				{ "h": 2, "matrix": [4, 17], "x": 18.5, "y": 3 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json
index cbb19b3b3f..0515152901 100644
--- a/keyboards/cannonkeys/brutalv2_1800/info.json
+++ b/keyboards/cannonkeys/brutalv2_1800/info.json
@@ -21,7 +21,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
+        "nkro": true
     },
     "indicators": {
         "caps_lock": "GP29",
@@ -29,7 +29,7 @@
         "on_state": 0
     },
     "build": {
-        "debounce_type": "asym_eager_defer_pk",
+        "debounce_type": "asym_eager_defer_pk"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/info.json
index 867c333e79..61e94803a9 100644
--- a/keyboards/cannonkeys/db60/hotswap/info.json
+++ b/keyboards/cannonkeys/db60/hotswap/info.json
@@ -142,6 +142,6 @@
                 {"label":"Win", "x":12.5, "y":4},
                 {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
             ]
-        },
+        }
     }
 }
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/info.json
index f313dd96d7..68ded154b1 100644
--- a/keyboards/cannonkeys/ellipse/info.json
+++ b/keyboards/cannonkeys/ellipse/info.json
@@ -11,7 +11,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "backlight": true,
+        "backlight": true
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/info.json
index 1ef45f4d8a..2ac2028dfa 100644
--- a/keyboards/cannonkeys/moment/info.json
+++ b/keyboards/cannonkeys/moment/info.json
@@ -11,7 +11,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "backlight": true,
+        "backlight": true
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
diff --git a/keyboards/chaos65/info.json b/keyboards/chaos65/info.json
index 0118705c5f..a714cb9acb 100644
--- a/keyboards/chaos65/info.json
+++ b/keyboards/chaos65/info.json
@@ -83,7 +83,7 @@
                 {"label":"Fn", "x":11.25, "y":4, "w":1.25},
                 {"label":"\u2190", "x":13, "y":4},
                 {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192" "x":15, "y":4}
+                {"label":"\u2192", "x":15, "y":4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
@@ -158,7 +158,7 @@
                 {"label":"Fn", "x":11.25, "y":4, "w":1.25},
                 {"label":"\u2190", "x":13, "y":4},
                 {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192" "x":15, "y":4}
+                {"label":"\u2192", "x":15, "y":4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
@@ -232,7 +232,7 @@
                 {"label":"Fn", "x":11, "y":4, "w":1.5},
                 {"label":"\u2190", "x":13, "y":4},
                 {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192" "x":15, "y":4}
+                {"label":"\u2192", "x":15, "y":4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
@@ -308,7 +308,7 @@
                 {"label":"Fn", "x":11.25, "y":4, "w":1.25},
                 {"label":"\u2190", "x":13, "y":4},
                 {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192" "x":15, "y":4}
+                {"label":"\u2192", "x":15, "y":4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
@@ -383,7 +383,7 @@
                 {"label":"Fn", "x":11, "y":4, "w":1.5},
                 {"label":"\u2190", "x":13, "y":4},
                 {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192" "x":15, "y":4}
+                {"label":"\u2192", "x":15, "y":4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json
index 3f1d7b4463..53bbd3f026 100644
--- a/keyboards/fjlabs/sinanjuwk/info.json
+++ b/keyboards/fjlabs/sinanjuwk/info.json
@@ -71,7 +71,7 @@
                 {"x":14, "y":3},
 
                 {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25}
+                {"x":1.25, "y":4, "w":1.25},
                 {"x":2.5, "y":4, "w":1.25},
                 {"x":3.75, "y":4, "w":6.25},
                 {"x":10, "y":4, "w":1.25},
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
index 9fbca5b36d..6659127976 100644
--- a/keyboards/gopolar/gg86/info.json
+++ b/keyboards/gopolar/gg86/info.json
@@ -105,7 +105,7 @@
                 {"label":"\u2193", "x":16.25, "y":5.5},
                 {"label":"\u2192", "x":17.25, "y":5.5}
             ]
-        }
+        },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
@@ -200,7 +200,7 @@
                 {"label":"\u2193", "x":16.25, "y":5.5},
                 {"label":"\u2192", "x":17.25, "y":5.5}
             ]
-        }
+        },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
index 728277a389..733ba2ae44 100644
--- a/keyboards/gray_studio/aero75/info.json
+++ b/keyboards/gray_studio/aero75/info.json
@@ -4,9 +4,9 @@
     "maintainer": "edwardslau", 
     "manufacturer":"GrayStudio",
     "usb": {
-    	"vid": "0x4753",
-    	"pid": "0x3075",
-    	"device_version": "0.0.1",
+        "vid": "0x4753",
+        "pid": "0x3075",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/handwired/onekey/stm32f405_feather/info.json b/keyboards/handwired/onekey/stm32f405_feather/info.json
index 5135873576..80e41cddf2 100644
--- a/keyboards/handwired/onekey/stm32f405_feather/info.json
+++ b/keyboards/handwired/onekey/stm32f405_feather/info.json
@@ -4,6 +4,6 @@
     "bootloader": "stm32-dfu",
     "matrix_pins": {
         "cols": ["C2"],
-        "rows": ["C3"],
+        "rows": ["C3"]
     }
 }
diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/info.json
index e44e5f8b00..09ddaa1b5f 100644
--- a/keyboards/idobao/id80/v2/ansi/info.json
+++ b/keyboards/idobao/id80/v2/ansi/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "ID80 ANSI",
     "usb": {
-        "pid": "0x0080",
+        "pid": "0x0080"
     }
 }
diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/info.json
index 7512d696e2..5825c27da2 100644
--- a/keyboards/idobao/id80/v2/iso/info.json
+++ b/keyboards/idobao/id80/v2/iso/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "ID80 ISO",
     "usb": {
-        "pid": "0x0081",
+        "pid": "0x0081"
     }
 }
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
index 62715ec00a..7bbda8f9a2 100755
--- a/keyboards/idobao/montex/v2/info.json
+++ b/keyboards/idobao/montex/v2/info.json
@@ -25,7 +25,7 @@
         "device_version": "2.0.0",
         "pid": "0x0227",
         "vid": "0x6964"
-    }
+    },
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json
index 1db1c930f6..b49e03da3e 100644
--- a/keyboards/ingrained/info.json
+++ b/keyboards/ingrained/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "ingrained",
-    "manufacturer": "s8erdude"
+    "manufacturer": "s8erdude",
     "url": "https://github.com/jpuerto96",
     "maintainer": "jpuerto96 (s8erdude)",
     "usb": {
diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index d7d7faadd2..1cb88fb39f 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -13,13 +13,13 @@
         "extrakey": true,
         "mousekey": false,
         "nkro": false,
-        "unicode": false,
+        "unicode": false
     },
     "split": {
-        "enabled": true,
+        "enabled": true
     },
     "build": {
-        "lto": true,
+        "lto": true
     },
     "layouts": {
         "LAYOUT_75": {
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 7e43746bfd..2f5ec5429a 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -10,7 +10,7 @@
     "diode_direction": "COL2ROW",
     "features": {
         "rgblight": true,
-        "backlight": true,
+        "backlight": true
     },
     "indicators": {
         "caps_lock": "B6"
@@ -24,29 +24,29 @@
         "encoder": {
             "right": {
                 "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4" },
-                ],
-            },
+                    {"pin_a": "D6", "pin_b": "D4" }
+                ]
+            }
         },
         "matrix_pins": {
             "right":{
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"],
-            },
-        },
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
+            }
+        }
     },
     "matrix_pins": {
         "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
     },
     "encoder": {
         "enabled": true,
         "rotary": [
-            {"pin_a": "F5", "pin_b": "F6" },
-        ],
+            {"pin_a": "F5", "pin_b": "F6" }
+        ]
     },
     "backlight":{
-        "pin": "B5",
+        "pin": "B5"
     },
     "rgblight": {
         "pin": "E6",
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 72a3555351..107703d583 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -10,7 +10,7 @@
     "diode_direction": "COL2ROW",
     "features": {
         "rgblight": true,
-        "backlight": true,
+        "backlight": true
     },
     "indicators": {
         "caps_lock": "B6"
@@ -24,29 +24,29 @@
         "encoder": {
             "right": {
                 "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4" },
-                ],
-            },
+                    {"pin_a": "D6", "pin_b": "D4" }
+                ]
+            }
         },
         "matrix_pins": {
             "right":{
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"],
-            },
-        },
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
+            }
+        }
     },
     "matrix_pins": {
         "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
     },
     "encoder": {
         "enabled": true,
         "rotary": [
-            {"pin_a": "F5", "pin_b": "F6" },
-        ],
+            {"pin_a": "F5", "pin_b": "F6" }
+        ]
     },
     "backlight":{
-        "pin": "B5",
+        "pin": "B5"
     },
     "rgblight": {
         "pin": "E6",
diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/info.json
index 277cb6f9b9..d34168f247 100644
--- a/keyboards/mincedshon/ecila/info.json
+++ b/keyboards/mincedshon/ecila/info.json
@@ -31,7 +31,7 @@
                 {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0, "w":2},
                 {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5},
                 {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2}, {"x":14.75, "y":2}, {"x":15.75, "y":2, "w":2.25},
-                {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3}, {"x":14.25, "y":3}, {"x":15.65, "y":3.25}, {"x":17, "y":3}
+                {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3}, {"x":14.25, "y":3}, {"x":15.65, "y":3.25}, {"x":17, "y":3},
                 {"x":1.25, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4}, {"x":9.25, "y":4, "w":2.75}, {"x":12, "y":4}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
             ]
         }
diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/info.json
index b596fe5f48..7bbbf6accc 100644
--- a/keyboards/mini_ten_key_plus/info.json
+++ b/keyboards/mini_ten_key_plus/info.json
@@ -24,7 +24,7 @@
                 {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},{"label":"+", "x":4, "y":1, "h":2},
                 {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},
                 {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},{"label":"Enter", "x":4, "y":3, "h":2},
-                {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,                            {"label":".", "x":3, "y":4},
+                {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,                            {"label":".", "x":3, "y":4}
             ]
         }
     }
diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json
index 32109b7012..4ec5bde08f 100644
--- a/keyboards/nyhxis/nfr_70/info.json
+++ b/keyboards/nyhxis/nfr_70/info.json
@@ -30,14 +30,14 @@
                 { "label": "F7", "x": 7.5, "y": 0 },
                 { "label": "F9", "x": 9.75, "y": 0 },
                 { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 }
+                { "label": "F13", "x": 14, "y": 0 },
                 { "label": "1", "x": 1, "y": 1.25 },
                 { "label": "3", "x": 3, "y": 1.25 },
                 { "label": "5", "x": 5, "y": 1.25 },
                 { "label": "7", "x": 7, "y": 1.25 },
                 { "label": "9", "x": 9, "y": 1.25 },
                 { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 }
+                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 },
                 { "label": "`", "x": 0, "y": 1.25 },
                 { "label": "2", "x": 2, "y": 1.25 },
                 { "label": "4", "x": 4, "y": 1.25 },
@@ -58,7 +58,7 @@
                 { "label": "U", "x": 7.5, "y": 2.25 },
                 { "label": "O", "x": 9.5, "y": 2.25 },
                 { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 }
+                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
                 { "label": "A", "x": 1.75, "y": 3.25 },
                 { "label": "D", "x": 3.75, "y": 3.25 },
                 { "label": "G", "x": 5.75, "y": 3.25 },
@@ -72,14 +72,14 @@
                 { "label": "H", "x": 6.75, "y": 3.25 },
                 { "label": "K", "x": 8.75, "y": 3.25 },
                 { "label": ";", "x": 11.75, "y": 3.25 },
-                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 }
+                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 },
                 { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
                 { "label": "Z", "x": 2.25, "y": 4.25 },
                 { "label": "C", "x": 4.25, "y": 4.25 },
                 { "label": "B", "x": 6.25, "y": 4.25 },
                 { "label": "M", "x": 8.25, "y": 4.25 },
                 { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 }
+                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 },
                 { "label": "NUBS", "x": 1.25, "y": 4.25 },
                 { "label": "X", "x": 3.25, "y": 4.25 },
                 { "label": "V", "x": 5.25, "y": 4.25 },
@@ -112,14 +112,14 @@
                 { "label": "F7", "x": 7.5, "y": 0 },
                 { "label": "F9", "x": 9.75, "y": 0 },
                 { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 }
+                { "label": "F13", "x": 14, "y": 0 },
                 { "label": "1", "x": 1, "y": 1.25 },
                 { "label": "3", "x": 3, "y": 1.25 },
                 { "label": "5", "x": 5, "y": 1.25 },
                 { "label": "7", "x": 7, "y": 1.25 },
                 { "label": "9", "x": 9, "y": 1.25 },
                 { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 }
+                { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 },
                 { "label": "`", "x": 0, "y": 1.25 },
                 { "label": "2", "x": 2, "y": 1.25 },
                 { "label": "4", "x": 4, "y": 1.25 },
@@ -140,7 +140,7 @@
                 { "label": "U", "x": 7.5, "y": 2.25 },
                 { "label": "O", "x": 9.5, "y": 2.25 },
                 { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 }
+                { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
                 { "label": "A", "x": 1.75, "y": 3.25 },
                 { "label": "D", "x": 3.75, "y": 3.25 },
                 { "label": "G", "x": 5.75, "y": 3.25 },
@@ -154,14 +154,14 @@
                 { "label": "H", "x": 6.75, "y": 3.25 },
                 { "label": "K", "x": 8.75, "y": 3.25 },
                 { "label": ";", "x": 11.75, "y": 3.25 },
-                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 }
+                { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 },
                 { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
                 { "label": "Z", "x": 2.25, "y": 4.25 },
                 { "label": "C", "x": 4.25, "y": 4.25 },
                 { "label": "B", "x": 6.25, "y": 4.25 },
                 { "label": "M", "x": 8.25, "y": 4.25 },
                 { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 }
+                { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 },
                 { "label": "NUBS", "x": 1.25, "y": 4.25 },
                 { "label": "X", "x": 3.25, "y": 4.25 },
                 { "label": "V", "x": 5.25, "y": 4.25 },
diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json
index 4d495e8b22..ef96714671 100644
--- a/keyboards/tweetydabird/lbs4/info.json
+++ b/keyboards/tweetydabird/lbs4/info.json
@@ -1,78 +1,78 @@
 {
-	"keyboard_name": "Little Big Scroll 4",
-	"manufacturer": "Tweetys Wild Thinking",
-	"url": "https://lectronz.com/stores/tweetys-wild-thinking",
-	"maintainer": "TweetyDaBird",	
-	
-	"development_board": "promicro",
-	"bootloader_instructions": "Short marked pads on PCB, or hold top left key when plugging in.",
-	
-	"features": {
-		"bootmagic": true,
-		"command": false,
-		"console": false,
-		"extrakey": true,
-		"mousekey": false,
-		"nkro": false,
-		"rgblight": true,
-		"encoder": true
-	},
+    "keyboard_name": "Little Big Scroll 4",
+    "manufacturer": "Tweetys Wild Thinking",
+    "url": "https://lectronz.com/stores/tweetys-wild-thinking",
+    "maintainer": "TweetyDaBird",
+    
+    "development_board": "promicro",
+    "bootloader_instructions": "Short marked pads on PCB, or hold top left key when plugging in.",
+    
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true,
+        "encoder": true
+    },
 
-	"build": {
-		"lto": true
-	},
-	
-	"debounce": 5,
-	
-	"usb": {
-		"vid": "0xFEED",
+    "build": {
+        "lto": true
+    },
+    
+    "debounce": 5,
+    
+    "usb": {
+        "vid": "0xFEED",
         "pid": "0x23B0",
-		"device_version": "1.1.0"
-	},
+        "device_version": "1.1.0"
+    },
 
-	"matrix_pins": {
+    "matrix_pins": {
         "direct": [
-			["E6", "D7", "F4"],
-			["B5", "B4", null]
+            ["E6", "D7", "F4"],
+            ["B5", "B4", null]
         ]
     },
 
-	"encoder": {
+    "encoder": {
         "rotary": [
             { 
-				"pin_a": "B1", 
-				"pin_b": "F7",
-				"resolution": 2
-			}
+                "pin_a": "B1", 
+                "pin_b": "F7",
+                "resolution": 2
+            }
         ]
     },
-	
-	"rgblight": {
+    
+    "rgblight": {
         "led_count": 6,
         "pin": "D2",
         "hue_steps": 8,
         "saturation_steps": 17,
         "brightness_steps": 17,
-		"max_brightness": 175,
+        "max_brightness": 175,
         "animations": {
-            "alternating": true
+            "alternating": true,
             "breathing": true,
             "rainbow_mood": true,
-            "static_gradient": true,
+            "static_gradient": true
         }
     },
 
-	"layouts": {
+    "layouts": {
         "LAYOUT": {
-            "layout": [	
-			{ "label": "Play", 	"matrix": [0, 2], "x": 2, "y": 0, "w": 2, "h": 2 }, 
-			
-			{ "label": "F1", 	"matrix": [0, 0], "x": 0, "y": 0, "w": 1, "h": 1 }, 
-			{ "label": "F2", 	"matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
-			
-			{ "label": "F3", 	"matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 },
-			{ "label": "F4", 	"matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 },
-			]
-		}
-	}	
+            "layout": [
+            { "label": "Play", "matrix": [0, 2], "x": 2, "y": 0, "w": 2, "h": 2 }, 
+            
+            { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0, "w": 1, "h": 1 }, 
+            { "label": "F2", "matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
+            
+            { "label": "F3", "matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 },
+            { "label": "F4", "matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }
+            ]
+        }
+    }
 }
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json
index ac1b574220..a35f78b6c9 100644
--- a/keyboards/tweetydabird/lbs6/info.json
+++ b/keyboards/tweetydabird/lbs6/info.json
@@ -1,76 +1,76 @@
 {
-	"keyboard_name": "Little Big Scroll 6",
-	"manufacturer": "Tweetys Wild Thinking",
-	"url": "https://lectronz.com/stores/tweetys-wild-thinking",
-	"maintainer": "TweetyDaBird",	
-	
-	"development_board": "promicro",
-	
-	"features": {
-		"bootmagic": true,
-		"command": false,
-		"console": false,
-		"extrakey": true,
-		"mousekey": true,
-		"nkro": false,
-		"rgblight": true,
-		"encoder": true
-	},
+    "keyboard_name": "Little Big Scroll 6",
+    "manufacturer": "Tweetys Wild Thinking",
+    "url": "https://lectronz.com/stores/tweetys-wild-thinking",
+    "maintainer": "TweetyDaBird",
+    
+    "development_board": "promicro",
+    
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true,
+        "encoder": true
+    },
 
-  "build": {
-    "lto": true
-  },
+    "build": {
+        "lto": true
+    },
 
-	"usb": {
-		"vid": "0xFEED",
+    "usb": {
+        "vid": "0xFEED",
         "pid": "0x23B0",
-		"device_version": "1.1.0"
-	},
-	
-	"debounce": 5,
-	
-	"matrix_pins": {
+        "device_version": "1.1.0"
+    },
+    
+    "debounce": 5,
+    
+    "matrix_pins": {
         "direct": [
-			[null, "F5", null],
+            [null, "F5", null],
             ["D4", "D7", "B4"],
-			["C6", "E6", "B5"]
+            ["C6", "E6", "B5"]
         ]
     },
 
-	"encoder": {
+    "encoder": {
         "rotary": [
             { "pin_a": "F7", "pin_b": "F6", "resolution": 2 }
         ]
     },
 
-	"rgblight": {
+    "rgblight": {
         "led_count": 8,
         "pin": "D2",
         "hue_steps": 8,
         "saturation_steps": 17,
         "brightness_steps": 17,
-		"max_brightness": 200,
+        "max_brightness": 200,
         "animations": {
             "alternating": true,
             "breathing": true,
             "rainbow_mood": true,
-            "static_gradient": true,
+            "static_gradient": true
         }
     },
-	
-	"layouts": {
+    
+    "layouts": {
         "LAYOUT": {
-            "layout": [	
-			{ "label": "Play", 	"matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
-			
-			{ "label": "F1", 	"matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 }, 
-			{ "label": "F2", 	"matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }, 
-			{ "label": "F3", 	"matrix": [1, 2], "x": 2, "y": 1, "w": 1, "h": 1 },
-			
-			{ "label": "F4", 	"matrix": [2, 0], "x": 0, "y": 2, "w": 1, "h": 1 },
-			{ "label": "F5", 	"matrix": [2, 1], "x": 1, "y": 2, "w": 1, "h": 1 },
-			{ "label": "F6", 	"matrix": [2, 2], "x": 2, "y": 2, "w": 1, "h": 1 },
-			]
-		}
-	}
+            "layout": [
+            { "label": "Play", "matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
+            
+            { "label": "F1", "matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 }, 
+            { "label": "F2", "matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }, 
+            { "label": "F3", "matrix": [1, 2], "x": 2, "y": 1, "w": 1, "h": 1 },
+            
+            { "label": "F4", "matrix": [2, 0], "x": 0, "y": 2, "w": 1, "h": 1 },
+            { "label": "F5", "matrix": [2, 1], "x": 1, "y": 2, "w": 1, "h": 1 },
+            { "label": "F6", "matrix": [2, 2], "x": 2, "y": 2, "w": 1, "h": 1 }
+            ]
+        }
+    }
 }
\ No newline at end of file

From 6ed605a614595bf01721070e7ed6407e8e19585e Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 25 Nov 2022 04:29:20 +0000
Subject: [PATCH 927/959] Fix annepro2/c18:iso_default (#19147)

---
 .../annepro2/keymaps/iso_default/config.h     | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 keyboards/annepro2/keymaps/iso_default/config.h

diff --git a/keyboards/annepro2/keymaps/iso_default/config.h b/keyboards/annepro2/keymaps/iso_default/config.h
deleted file mode 100644
index 5b9f0ebdda..0000000000
--- a/keyboards/annepro2/keymaps/iso_default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
- /* Copyright 2022 OpenAnnePro community
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-#undef PRODUCT
-// C18 is a macro
-#define PRODUCT Anne Pro 2 c18-iso (QMK)

From 8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 26 Nov 2022 04:31:58 +1100
Subject: [PATCH 928/959] Fix build failures for `bastardkb/tbk` and
 `jels/boaty` (#19152)

---
 keyboards/bastardkb/tbk/tbk.h | 3 ++-
 lib/python/qmk/info.py        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h
index 3f9cd9915d..5958097880 100644
--- a/keyboards/bastardkb/tbk/tbk.h
+++ b/keyboards/bastardkb/tbk/tbk.h
@@ -15,9 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
 
+#include "quantum.h"
+
 // clang-format off
 #define LAYOUT_split_4x6_5( \
     k00, k01, k02, k03, k04, k05,            k55, k54, k53, k52, k51, k50, \
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 7460d84ad3..98505c1c8e 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -773,7 +773,7 @@ def avr_processor_rules(info_data, rules):
     """
     info_data['processor_type'] = 'avr'
     info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown'
-    info_data['protocol'] = 'V-USB' if rules.get('MCU') in VUSB_PROCESSORS else 'LUFA'
+    info_data['protocol'] = 'V-USB' if info_data['processor'] in VUSB_PROCESSORS else 'LUFA'
 
     if 'bootloader' not in info_data:
         info_data['bootloader'] = 'atmel-dfu'

From a5a20cc792540c0de61f064bd8dafcdc5815d4cc Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 27 Nov 2022 03:14:35 +1100
Subject: [PATCH 929/959] Change `LED_MATRIX_STARTUP_*` defines to
 `LED_MATRIX_DEFAULT_*` (#19080)

---
 docs/feature_led_matrix.md                     |  6 +++---
 .../ergodox_infinity/ergodox_infinity.c        |  6 +++---
 keyboards/input_club/whitefox/whitefox.c       |  6 +++---
 quantum/led_matrix/led_matrix.c                | 18 +++++++++---------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index b468507424..b91a47ae43 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -369,9 +369,9 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 #define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define LED_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define LED_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs
-#define LED_MATRIX_STARTUP_MODE LED_MATRIX_SOLID // Sets the default mode, if none has been set
-#define LED_MATRIX_STARTUP_VAL LED_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
-#define LED_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
+#define LED_MATRIX_DEFAULT_MODE LED_MATRIX_SOLID // Sets the default mode, if none has been set
+#define LED_MATRIX_DEFAULT_VAL LED_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define LED_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
 #define LED_MATRIX_SPLIT { X, Y }   // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
                                     // If LED_MATRIX_KEYPRESSES or LED_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 ```
diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
index d699d76333..6f7de7ff29 100644
--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
@@ -117,10 +117,10 @@ void matrix_init_kb(void) {
      * Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c),
      * and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot.
      */
-#    if !defined(LED_MATRIX_STARTUP_SPD)
-#        define LED_MATRIX_STARTUP_SPD UINT8_MAX / 2
+#    if !defined(LED_MATRIX_DEFAULT_SPD)
+#        define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2
 #    endif
-    led_matrix_set_speed(LED_MATRIX_STARTUP_SPD);
+    led_matrix_set_speed(LED_MATRIX_DEFAULT_SPD);
     led_matrix_set_flags(LED_FLAG_ALL);
 #endif
 
diff --git a/keyboards/input_club/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c
index 8d92aa8d2f..168eccbb12 100644
--- a/keyboards/input_club/whitefox/whitefox.c
+++ b/keyboards/input_club/whitefox/whitefox.c
@@ -83,10 +83,10 @@ void matrix_init_kb(void) {
      * Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c),
      * and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot.
      */
-#    if !defined(LED_MATRIX_STARTUP_SPD)
-#        define LED_MATRIX_STARTUP_SPD UINT8_MAX / 2
+#    if !defined(LED_MATRIX_DEFAULT_SPD)
+#        define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2
 #    endif
-    led_matrix_set_speed(LED_MATRIX_STARTUP_SPD),
+    led_matrix_set_speed(LED_MATRIX_DEFAULT_SPD),
     led_matrix_set_flags(LED_FLAG_ALL);
 #endif
 
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index e215c2c2c3..577331d916 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -71,16 +71,16 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER;
 #    define LED_MATRIX_SPD_STEP 16
 #endif
 
-#if !defined(LED_MATRIX_STARTUP_MODE)
-#    define LED_MATRIX_STARTUP_MODE LED_MATRIX_SOLID
+#if !defined(LED_MATRIX_DEFAULT_MODE)
+#    define LED_MATRIX_DEFAULT_MODE LED_MATRIX_SOLID
 #endif
 
-#if !defined(LED_MATRIX_STARTUP_VAL)
-#    define LED_MATRIX_STARTUP_VAL LED_MATRIX_MAXIMUM_BRIGHTNESS
+#if !defined(LED_MATRIX_DEFAULT_VAL)
+#    define LED_MATRIX_DEFAULT_VAL LED_MATRIX_MAXIMUM_BRIGHTNESS
 #endif
 
-#if !defined(LED_MATRIX_STARTUP_SPD)
-#    define LED_MATRIX_STARTUP_SPD UINT8_MAX / 2
+#if !defined(LED_MATRIX_DEFAULT_SPD)
+#    define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2
 #endif
 
 // globals
@@ -123,9 +123,9 @@ void eeconfig_update_led_matrix(void) {
 void eeconfig_update_led_matrix_default(void) {
     dprintf("eeconfig_update_led_matrix_default\n");
     led_matrix_eeconfig.enable = 1;
-    led_matrix_eeconfig.mode   = LED_MATRIX_STARTUP_MODE;
-    led_matrix_eeconfig.val    = LED_MATRIX_STARTUP_VAL;
-    led_matrix_eeconfig.speed  = LED_MATRIX_STARTUP_SPD;
+    led_matrix_eeconfig.mode   = LED_MATRIX_DEFAULT_MODE;
+    led_matrix_eeconfig.val    = LED_MATRIX_DEFAULT_VAL;
+    led_matrix_eeconfig.speed  = LED_MATRIX_DEFAULT_SPD;
     led_matrix_eeconfig.flags  = LED_FLAG_ALL;
     eeconfig_flush_led_matrix(true);
 }

From 1e95f7be8f214c544bf99f415916a4a5f07a1e9b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 27 Nov 2022 03:14:45 +1100
Subject: [PATCH 930/959] Joystick feature improvements (#19052)

---
 docs/feature_joystick.md                      | 187 ++++++++++++------
 .../battleship_gamepad/battleship_gamepad.c   |   2 +-
 .../handwired/battleship_gamepad/config.h     |   4 +-
 .../misterdeck/keymaps/default/config.h       |   2 +-
 .../misterdeck/keymaps/default/keymap.c       |   2 +-
 .../misterdeck/keymaps/nobuttons/config.h     |   2 +-
 .../misterdeck/keymaps/nobuttons/keymap.c     |   2 +-
 .../onekey/keymaps/joystick/config.h          |   2 +-
 .../onekey/keymaps/joystick/keymap.c          |   2 +-
 keyboards/handwired/onekey/proton_c/halconf.h |  26 +++
 keyboards/handwired/onekey/proton_c/mcuconf.h |  22 +++
 keyboards/lime/keymaps/default/keymap.c       |   2 +-
 keyboards/lime/rev1/config.h                  |   4 +-
 keyboards/synthlabs/solo/config.h             |   4 +-
 .../synthlabs/solo/keymaps/gamepad/keymap.c   |   2 +-
 quantum/joystick.c                            |  55 +++---
 quantum/joystick.h                            |  77 ++++++--
 tmk_core/protocol.mk                          |  13 ++
 tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c |  24 +--
 tmk_core/protocol/chibios/usb_main.c          |   4 +-
 tmk_core/protocol/host.c                      |  15 +-
 tmk_core/protocol/lufa/lufa.c                 |   2 +-
 tmk_core/protocol/report.h                    |  11 +-
 tmk_core/protocol/usb_descriptor.c            | 134 +++++++------
 tmk_core/protocol/usb_descriptor.h            |   8 +-
 tmk_core/protocol/usb_descriptor_common.h     |   5 +-
 tmk_core/protocol/vusb/vusb.c                 |  77 +++++++-
 27 files changed, 475 insertions(+), 215 deletions(-)
 create mode 100644 keyboards/handwired/onekey/proton_c/halconf.h
 create mode 100644 keyboards/handwired/onekey/proton_c/mcuconf.h

diff --git a/docs/feature_joystick.md b/docs/feature_joystick.md
index a5e4921f9b..e60046a3c3 100644
--- a/docs/feature_joystick.md
+++ b/docs/feature_joystick.md
@@ -1,85 +1,72 @@
-## Joystick
+# Joystick :id=joystick
 
-The keyboard can be made to be recognized as a joystick HID device by the operating system.
+This feature provides game controller input as a joystick device supporting up to 6 axes and 32 buttons. Axes can be read either from an [ADC-capable input pin](adc_driver.md), or can be virtual, so that its value is provided by your code.
 
-!> Joystick support is not currently available on V-USB devices.
+An analog device such as a [potentiometer](https://en.wikipedia.org/wiki/Potentiometer) found on an analog joystick's axes is based on a voltage divider, where adjusting the movable wiper controls the output voltage which can then be read by the microcontroller's ADC.
 
-The joystick feature provides two services:
- * reading analog input devices (eg. potentiometers)
- * sending gamepad HID reports
+## Usage :id=usage
 
-Both services can be used without the other, depending on whether you just want to read a device but not send gamepad reports (for volume control for instance)
-or send gamepad reports based on values computed by the keyboard.
-
-### Analog Input
-
-To use analog input you must first enable it in `rules.mk`:
+Add the following to your `rules.mk`:
 
 ```make
 JOYSTICK_ENABLE = yes
-JOYSTICK_DRIVER = analog # or 'digital'
 ```
 
-An analog device such as a potentiometer found on a gamepad's analog axes is based on a [voltage divider](https://en.wikipedia.org/wiki/Voltage_divider).
-It is composed of three connectors linked to the ground, the power input and power output (usually the middle one). The power output holds the voltage that varies based on the position of the cursor,
-which value will be read using your MCU's [ADC](https://en.wikipedia.org/wiki/Analog-to-digital_converter).
-Depending on which pins are already used by your keyboard's matrix, the rest of the circuit can get a little bit more complicated,
-feeding the power input and ground connection through pins and using diodes to avoid bad interactions with the matrix scanning procedures.
+By default the joystick driver is `analog`, but you can change this with:
 
-### Configuring the Joystick
+```make
+JOYSTICK_DRIVER = digital
+```
 
-By default, two axes and eight buttons are defined. This can be changed in your `config.h`:
+## Configuration :id=configuration
+
+By default, two axes and eight buttons are defined, with a reported resolution of 8 bits (-127 to +127). This can be changed in your `config.h`:
 
 ```c
-// Max 32
+// Min 0, max 32
 #define JOYSTICK_BUTTON_COUNT 16
-// Max 6: X, Y, Z, Rx, Ry, Rz
-#define JOYSTICK_AXES_COUNT 3
+// Min 0, max 6: X, Y, Z, Rx, Ry, Rz
+#define JOYSTICK_AXIS_COUNT 3
+// Min 8, max 16
+#define JOYSTICK_AXIS_RESOLUTION 10
 ```
 
-When defining axes for your joystick, you have to provide a definition array. You can do this from your keymap.c file.
-A joystick will either be read from an input pin that allows the use of the ADC, or can be virtual, so that its value is provided by your code.
-You have to define an array of type ''joystick_config_t'' and of proper size.
+?> You must define at least one button or axis. Also note that the maximum ADC resolution of the supported AVR MCUs is 10-bit, and 12-bit for most STM32 MCUs.
 
-There are three ways for your circuit to work with the ADC, that relies on the use of 1, 2 or 3 pins of the MCU:
- * 1 pin: your analog device is directly connected to your device GND and VCC. The only pin used is the ADC pin of your choice.
- * 2 pins: your analog device is powered through a pin that allows toggling it on or off. The other pin is used to read the input value through the ADC.
- * 3 pins: both the power input and ground are connected to pins that must be set to a proper state before reading and restored afterwards.
+### Axes :id=axes
 
-The configuration of each axis is performed using one of four macros:
- * `JOYSTICK_AXIS_VIRTUAL`: no ADC reading must be performed, that value will be provided by keyboard/keymap-level code
- * `JOYSTICK_AXIS_IN(INPUT_PIN, LOW, REST, HIGH)`: a voltage will be read on the provided pin, which must be an ADC-capable pin.
- * `JOYSTICK_AXIS_IN_OUT(INPUT_PIN, OUTPUT_PIN, LOW, REST, HIGH)`: the provided `OUTPUT_PIN` will be set high before `INPUT_PIN` is read.
- * `JOYSTICK_AXIS_IN_OUT_GROUND(INPUT_PIN, OUTPUT_PIN, GROUND_PIN, LOW, REST, HIGH)`: the `OUTPUT_PIN` will be set high and `GROUND_PIN` will be set low before reading from `INPUT_PIN`.
+When defining axes for your joystick, you must provide a definition array typically in your `keymap.c`.
 
-In any case where an ADC reading takes place (when `INPUT_PIN` is provided), additional `LOW`, `REST` and `HIGH` parameters are used.
-These implement the calibration of the analog device by defining the range of read values that will be mapped to the lowest, resting position and highest possible value for the axis (-127 to 127).
-In practice, you have to provide the lowest/highest raw ADC reading, and the raw reading at resting position, when no deflection is applied. You can provide inverted `LOW` and `HIGH` to invert the axis.
-
-For instance, an axes configuration can be defined in the following way:
+For instance, the below example configures two axes. The X axis is read from the `A4` pin. With the default axis resolution of 8 bits, the range of values between 900 and 575 are scaled to -127 through 0, and values 575 to 285 are scaled to 0 through 127. The Y axis is configured as a virtual axis, and its value is not read from any pin. Instead, the user must update the axis value programmatically.
 
 ```c
-//joystick config
 joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
-    [0] = JOYSTICK_AXIS_IN_OUT_GROUND(A4, B0, A7, 900, 575, 285),
-    [1] = JOYSTICK_AXIS_VIRTUAL
+    JOYSTICK_AXIS_IN(A4, 900, 575, 285),
+    JOYSTICK_AXIS_VIRTUAL
 };
 ```
 
-When the ADC reads 900 or higher, the returned axis value will be -127, whereas it will be 127 when the ADC reads 285 or lower. Zero is returned when 575 is read.
+Axes can be configured using one of the following macros:
 
-In this example, the first axis will be read from the `A4` pin while `B0` is set high and `A7` is set low, using `analogReadPin()`, whereas the second axis will not be read.
+ * `JOYSTICK_AXIS_IN(input_pin, low, rest, high)`  
+   The ADC samples the provided pin. `low`, `high` and `rest` correspond to the minimum, maximum, and resting (or centered) analog values of the axis, respectively.
+ * `JOYSTICK_AXIS_IN_OUT(input_pin, output_pin, low, rest, high)`  
+   Same as `JOYSTICK_AXIS_IN()`, but the provided `output_pin` will be pulled high before `input_pin` is read.
+ * `JOYSTICK_AXIS_IN_OUT_GROUND(input_pin, output_pin, ground_pin, low, rest, high)`  
+   Same as `JOYSTICK_AXIS_IN_OUT()`, but the provided `ground_pin` will be pulled low before reading from `input_pin`.
+ * `JOYSTICK_AXIS_VIRTUAL`  
+   No ADC reading is performed. The value should be provided by user code.
 
-#### Virtual Axes
+The `low` and `high` values can be swapped to effectively invert the axis.
 
-To give a value to virtual axes, call `joystick_set_axis(axis, value)`.
+#### Virtual Axes :id=virtual-axes
 
-The following example adjusts two virtual axes (X and Y) based on keypad presses, with `KC_P5` as a precision modifier:
+The following example adjusts two virtual axes (X and Y) based on keypad presses, with `KC_P0` as a precision modifier:
 
 ```c
 joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
-    [0] = JOYSTICK_AXIS_VIRTUAL, // x
-    [1] = JOYSTICK_AXIS_VIRTUAL  // y
+    JOYSTICK_AXIS_VIRTUAL, // x
+    JOYSTICK_AXIS_VIRTUAL  // y
 };
 
 static bool precision = false;
@@ -105,7 +92,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case KC_P6:
             joystick_set_axis(0, record->event.pressed ? precision_val : 0);
             return false;
-        case KC_P5:
+        case KC_P0:
             precision = record->event.pressed;
             return false;
     }
@@ -113,13 +100,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
-### Axis Resolution
-
-By default, the resolution of each axis is 8 bit, giving a range of -127 to +127. If you need higher precision, you can increase it by defining eg. `JOYSTICK_AXES_RESOLUTION 12` in your `config.h`. The resolution must be between 8 and 16.
-
-Note that the supported AVR MCUs have a 10-bit ADC, and 12-bit for most STM32 MCUs.
-
-### Keycodes
+## Keycodes :id=keycodes
 
 |Key                    |Aliases|Description|
 |-----------------------|-------|-----------|
@@ -156,4 +137,92 @@ Note that the supported AVR MCUs have a 10-bit ADC, and 12-bit for most STM32 MC
 |`QK_JOYSTICK_BUTTON_30`|`JS_30`|Button 30  |
 |`QK_JOYSTICK_BUTTON_31`|`JS_31`|Button 31  |
 
-You can also trigger joystick buttons in code with `register_joystick_button(button)` and `unregister_joystick_button(button)`, where `button` is the 0-based button index (0 = button 1).
+## API :id=api
+
+### `struct joystick_t` :id=api-joystick-t
+
+Contains the state of the joystick.
+
+#### Members :id=api-joystick-t-members
+
+ - `uint8_t buttons[]`  
+   A bit-packed array containing the joystick button states. The size is calculated as `(JOYSTICK_BUTTON_COUNT - 1) / 8 + 1`.
+ - `int16_t axes[]`  
+   An array of analog values for each defined axis.
+ - `bool dirty`  
+   Whether the current state needs to be sent to the host.
+
+---
+
+### `struct joystick_config_t` :id=api-joystick-config-t
+
+Describes a single axis.
+
+#### Members :id=api-joystick-config-t-members
+
+ - `pin_t output_pin`  
+   A pin to set as output high when reading the analog value, or `JS_VIRTUAL_AXIS`.
+ - `pin_t input_pin`  
+   The pin to read the analog value from, or `JS_VIRTUAL_AXIS`.
+ - `pin_t ground_pin`  
+   A pin to set as output low when reading the analog value, or `JS_VIRTUAL_AXIS`.
+ - `uint16_t min_digit`  
+   The minimum analog value.
+ - `uint16_t mid_digit`  
+   The resting or midpoint analog value.
+ - `uint16_t max_digit`  
+   The maximum analog value.
+
+---
+
+### `void joystick_flush(void)` :id=api-joystick-flush
+
+Send the joystick report to the host, if it has been marked as dirty.
+
+---
+
+### `void register_joystick_button(uint8_t button)` :id=api-register-joystick-button
+
+Set the state of a button, and flush the report.
+
+#### Arguments :id=api-register-joystick-button-arguments
+
+ - `uint8_t button`  
+   The index of the button to press, from 0 to 31.
+
+---
+
+### `void register_joystick_button(uint8_t button)` :id=api-unregister-joystick-button
+
+Reset the state of a button, and flush the report.
+
+#### Arguments :id=api-unregister-joystick-button-arguments
+
+ - `uint8_t button`  
+   The index of the button to release, from 0 to 31.
+
+---
+
+### `int16_t joystick_read_axis(uint8_t axis)` :id=api-joystick-read-axis
+
+Sample and process the analog value of the given axis.
+
+#### Arguments :id=api-joystick-read-axis-arguments
+
+ - `uint8_t axis`  
+   The axis to read.
+
+#### Return Value :id=api-joystick-read-axis-return
+
+A signed 16-bit integer, where 0 is the resting or mid point.
+
+### `void joystick_set_axis(uint8_t axis, int16_t value)` :id=api-joystick-set-axis
+
+Set the value of the given axis.
+
+#### Arguments :id=api-joystick-set-axis-arguments
+
+ - `uint8_t axis`  
+   The axis to set the value of.
+ - `int16_t value`  
+   The value to set.
diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
index 2c9de15a9f..faec437f36 100644
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
+++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
@@ -17,7 +17,7 @@
 #include "battleship_gamepad.h"
 
 /* joystick config */
-joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
     [0] = JOYSTICK_AXIS_IN(F5, 1023, 512, 0),
     [1] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023)
 };
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
index 25389c0245..a1ebc585de 100644
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ b/keyboards/handwired/battleship_gamepad/config.h
@@ -28,8 +28,8 @@
 
 /* joystick configuration */
 #define JOYSTICK_BUTTON_COUNT 25
-#define JOYSTICK_AXES_COUNT 2
-#define JOYSTICK_AXES_RESOLUTION 10
+#define JOYSTICK_AXIS_COUNT 2
+#define JOYSTICK_AXIS_RESOLUTION 10
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/misterdeck/keymaps/default/config.h b/keyboards/handwired/misterdeck/keymaps/default/config.h
index 92157a0938..f96ac1468b 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/config.h
+++ b/keyboards/handwired/misterdeck/keymaps/default/config.h
@@ -17,5 +17,5 @@
 
 #pragma once
 
-#define JOYSTICK_AXES_COUNT 4
+#define JOYSTICK_AXIS_COUNT 4
 #define JOYSTICK_BUTTON_COUNT 4
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
index 0992e06f87..2da6737e17 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
     [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
     [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
     [2] = JOYSTICK_AXIS_IN(F6, 0, 512, 1023),
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
index f609bf2962..59fdfc3e7a 100644
--- a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
@@ -17,5 +17,5 @@
 
 #pragma once
 
-#define JOYSTICK_AXES_COUNT 4
+#define JOYSTICK_AXIS_COUNT 4
 #define JOYSTICK_BUTTON_COUNT 0
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
index 5c69d2bc21..51a75fe204 100644
--- a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
     [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
     [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
     [2] = JOYSTICK_AXIS_IN(F6, 0, 512, 1023),
diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h
index a3b5858ad2..8a4e461b27 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/config.h
+++ b/keyboards/handwired/onekey/keymaps/joystick/config.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define JOYSTICK_AXES_COUNT 2
+#define JOYSTICK_AXIS_COUNT 2
 #define JOYSTICK_BUTTON_COUNT 1
diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index 96115aa496..6463900b7b 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -14,7 +14,7 @@ void matrix_scan_user() {
 }
 
 // Joystick config
-joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
     [0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023),
     [1] = JOYSTICK_AXIS_VIRTUAL
 };
diff --git a/keyboards/handwired/onekey/proton_c/halconf.h b/keyboards/handwired/onekey/proton_c/halconf.h
new file mode 100644
index 0000000000..4c66e56bba
--- /dev/null
+++ b/keyboards/handwired/onekey/proton_c/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/proton_c/mcuconf.h b/keyboards/handwired/onekey/proton_c/mcuconf.h
new file mode 100644
index 0000000000..935056eb6a
--- /dev/null
+++ b/keyboards/handwired/onekey/proton_c/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/lime/keymaps/default/keymap.c b/keyboards/lime/keymaps/default/keymap.c
index 5760bd9359..9dd2894879 100644
--- a/keyboards/lime/keymaps/default/keymap.c
+++ b/keyboards/lime/keymaps/default/keymap.c
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     }
 
     /* Joystick axes settings */
-    joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+    joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
         [0] = JOYSTICK_AXIS_IN(JOYSTICK_X_PIN, 268, 514, 813),
         [1] = JOYSTICK_AXIS_IN(JOYSTICK_Y_PIN, 865, 519, 260)
     };
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index 942cb9c7b8..70f1cc419b 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -40,9 +40,9 @@
 
 /* joystick support */
 #ifdef JOYSTICK_ENABLE
-#   define JOYSTICK_AXES_COUNT 2
+#   define JOYSTICK_AXIS_COUNT 2
 #   define JOYSTICK_BUTTON_COUNT 1
-#   define JOYSTICK_AXES_RESOLUTION 8
+#   define JOYSTICK_AXIS_RESOLUTION 8
 #endif
 
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h
index e8d9870e46..2352ba2972 100644
--- a/keyboards/synthlabs/solo/config.h
+++ b/keyboards/synthlabs/solo/config.h
@@ -54,5 +54,5 @@
 #define BOOTMAGIC_LITE_COLUMN 1
 
 #define JOYSTICK_BUTTON_COUNT 13
-#define JOYSTICK_AXES_COUNT 1
-#define JOYSTICK_AXES_RESOLUTION 16
+#define JOYSTICK_AXIS_COUNT 1
+#define JOYSTICK_AXIS_RESOLUTION 16
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
index e6f9678fbb..f450769b43 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 int16_t joystick_position = 0;
 int16_t pulses_per_revolution = 24;     // Depends on encoder model. Usually 18ppr or 24ppr for Bourns EC11s.
 int16_t full_joystick_value = 32767;    // Equivalent to max value of int16. +full_joystick_value is +1.0 axis output. -full_joystick_value is -1.0 axis output.
-joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
     [0] = JOYSTICK_AXIS_VIRTUAL
 };
 
diff --git a/quantum/joystick.c b/quantum/joystick.c
index d285dcdb5e..057a018dff 100644
--- a/quantum/joystick.c
+++ b/quantum/joystick.c
@@ -19,45 +19,48 @@
 #include "analog.h"
 #include "wait.h"
 
-// clang-format off
-joystick_t joystick_status = {
+joystick_t joystick_state = {
     .buttons = {0},
-    .axes = {
-#if JOYSTICK_AXES_COUNT > 0
-        0
+    .axes =
+        {
+#if JOYSTICK_AXIS_COUNT > 0
+            0
 #endif
-    },
-    .status = 0
+        },
+    .dirty = false,
 };
-// clang-format on
 
 // array defining the reading of analog values for each axis
-__attribute__((weak)) joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {};
+__attribute__((weak)) joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {};
 
 __attribute__((weak)) void joystick_task(void) {
     joystick_read_axes();
 }
 
 void joystick_flush(void) {
-    if ((joystick_status.status & JS_UPDATED) > 0) {
-        host_joystick_send(&joystick_status);
-        joystick_status.status &= ~JS_UPDATED;
+    if (joystick_state.dirty) {
+        host_joystick_send(&joystick_state);
+        joystick_state.dirty = false;
     }
 }
 
 void register_joystick_button(uint8_t button) {
-    joystick_status.buttons[button / 8] |= 1 << (button % 8);
-    joystick_status.status |= JS_UPDATED;
+    if (button >= JOYSTICK_BUTTON_COUNT) return;
+    joystick_state.buttons[button / 8] |= 1 << (button % 8);
+    joystick_state.dirty = true;
     joystick_flush();
 }
 
 void unregister_joystick_button(uint8_t button) {
-    joystick_status.buttons[button / 8] &= ~(1 << (button % 8));
-    joystick_status.status |= JS_UPDATED;
+    if (button >= JOYSTICK_BUTTON_COUNT) return;
+    joystick_state.buttons[button / 8] &= ~(1 << (button % 8));
+    joystick_state.dirty = true;
     joystick_flush();
 }
 
 int16_t joystick_read_axis(uint8_t axis) {
+    if (axis >= JOYSTICK_AXIS_COUNT) return 0;
+
     // disable pull-up resistor
     writePinLow(joystick_axes[axis].input_pin);
 
@@ -93,24 +96,24 @@ int16_t joystick_read_axis(uint8_t axis) {
     // test the converted value against the lower range
     int32_t ref        = joystick_axes[axis].mid_digit;
     int32_t range      = joystick_axes[axis].min_digit;
-    int32_t ranged_val = ((axis_val - ref) * -JOYSTICK_RESOLUTION) / (range - ref);
+    int32_t ranged_val = ((axis_val - ref) * -JOYSTICK_MAX_VALUE) / (range - ref);
 
     if (ranged_val > 0) {
         // the value is in the higher range
         range      = joystick_axes[axis].max_digit;
-        ranged_val = ((axis_val - ref) * JOYSTICK_RESOLUTION) / (range - ref);
+        ranged_val = ((axis_val - ref) * JOYSTICK_MAX_VALUE) / (range - ref);
     }
 
     // clamp the result in the valid range
-    ranged_val = ranged_val < -JOYSTICK_RESOLUTION ? -JOYSTICK_RESOLUTION : ranged_val;
-    ranged_val = ranged_val > JOYSTICK_RESOLUTION ? JOYSTICK_RESOLUTION : ranged_val;
+    ranged_val = ranged_val < -JOYSTICK_MAX_VALUE ? -JOYSTICK_MAX_VALUE : ranged_val;
+    ranged_val = ranged_val > JOYSTICK_MAX_VALUE ? JOYSTICK_MAX_VALUE : ranged_val;
 
     return ranged_val;
 }
 
 void joystick_read_axes() {
-#if JOYSTICK_AXES_COUNT > 0
-    for (int i = 0; i < JOYSTICK_AXES_COUNT; ++i) {
+#if JOYSTICK_AXIS_COUNT > 0
+    for (int i = 0; i < JOYSTICK_AXIS_COUNT; ++i) {
         if (joystick_axes[i].input_pin == JS_VIRTUAL_AXIS) {
             continue;
         }
@@ -123,8 +126,10 @@ void joystick_read_axes() {
 }
 
 void joystick_set_axis(uint8_t axis, int16_t value) {
-    if (value != joystick_status.axes[axis]) {
-        joystick_status.axes[axis] = value;
-        joystick_status.status |= JS_UPDATED;
+    if (axis >= JOYSTICK_AXIS_COUNT) return;
+
+    if (value != joystick_state.axes[axis]) {
+        joystick_state.axes[axis] = value;
+        joystick_state.dirty      = true;
     }
 }
diff --git a/quantum/joystick.h b/quantum/joystick.h
index ee966fdb1a..0ac99aa590 100644
--- a/quantum/joystick.h
+++ b/quantum/joystick.h
@@ -16,32 +16,41 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include <stdint.h>
+
 #include "gpio.h"
 
+/**
+ * \defgroup joystick
+ *
+ * HID Joystick
+ * \{
+ */
+
 #ifndef JOYSTICK_BUTTON_COUNT
 #    define JOYSTICK_BUTTON_COUNT 8
 #elif JOYSTICK_BUTTON_COUNT > 32
 #    error Joystick feature only supports up to 32 buttons
 #endif
 
-#ifndef JOYSTICK_AXES_COUNT
-#    define JOYSTICK_AXES_COUNT 4
-#elif JOYSTICK_AXES_COUNT > 6
+#ifndef JOYSTICK_AXIS_COUNT
+#    define JOYSTICK_AXIS_COUNT 2
+#elif JOYSTICK_AXIS_COUNT > 6
 #    error Joystick feature only supports up to 6 axes
 #endif
 
-#if JOYSTICK_AXES_COUNT == 0 && JOYSTICK_BUTTON_COUNT == 0
+#if JOYSTICK_AXIS_COUNT == 0 && JOYSTICK_BUTTON_COUNT == 0
 #    error Joystick feature requires at least one axis or button
 #endif
 
-#ifndef JOYSTICK_AXES_RESOLUTION
-#    define JOYSTICK_AXES_RESOLUTION 8
-#elif JOYSTICK_AXES_RESOLUTION < 8 || JOYSTICK_AXES_RESOLUTION > 16
-#    error JOYSTICK_AXES_RESOLUTION must be between 8 and 16
+#ifndef JOYSTICK_AXIS_RESOLUTION
+#    define JOYSTICK_AXIS_RESOLUTION 8
+#elif JOYSTICK_AXIS_RESOLUTION < 8 || JOYSTICK_AXIS_RESOLUTION > 16
+#    error JOYSTICK_AXIS_RESOLUTION must be between 8 and 16
 #endif
 
-#define JOYSTICK_RESOLUTION ((1L << (JOYSTICK_AXES_RESOLUTION - 1)) - 1)
+#define JOYSTICK_MAX_VALUE ((1L << (JOYSTICK_AXIS_RESOLUTION - 1)) - 1)
 
 // configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS
 // to prevent it from being read from the ADC. This allows outputing forged axis value.
@@ -68,30 +77,56 @@ typedef struct {
     uint16_t max_digit;
 } joystick_config_t;
 
-extern joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT];
-
-enum joystick_status {
-    JS_INITIALIZED = 1,
-    JS_UPDATED,
-};
+extern joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT];
 
 typedef struct {
     uint8_t buttons[(JOYSTICK_BUTTON_COUNT - 1) / 8 + 1];
-
-    int16_t axes[JOYSTICK_AXES_COUNT];
-    uint8_t status : 2;
+    int16_t axes[JOYSTICK_AXIS_COUNT];
+    bool    dirty;
 } joystick_t;
 
-extern joystick_t joystick_status;
+extern joystick_t joystick_state;
 
 void joystick_task(void);
+
+/**
+ * \brief Send the joystick report to the host, if it has been marked as dirty.
+ */
 void joystick_flush(void);
 
+/**
+ * \brief Set the state of a button, and flush the report.
+ *
+ * \param button The index of the button to press, from 0 to 31.
+ */
 void register_joystick_button(uint8_t button);
+
+/**
+ * \brief Reset the state of a button, and flush the report.
+ *
+ * \param button The index of the button to release, from 0 to 31.
+ */
 void unregister_joystick_button(uint8_t button);
 
+/**
+ * \brief Sample and process the analog value of the given axis.
+ *
+ * \param axis The axis to read.
+ *
+ * \return A signed 16-bit integer, where 0 is the resting or mid point.
+ */
 int16_t joystick_read_axis(uint8_t axis);
-void    joystick_read_axes(void);
-void    joystick_set_axis(uint8_t axis, int16_t value);
+
+void joystick_read_axes(void);
+
+/**
+ * \brief Set the value of the given axis.
+ *
+ * \param axis The axis to set the value of.
+ * \param value The value to set.
+ */
+void joystick_set_axis(uint8_t axis, int16_t value);
 
 void host_joystick_send(joystick_t *joystick);
+
+/** \} */
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 19fd7d2425..d3f15c4588 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -68,6 +68,19 @@ ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
     TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
+ifeq ($(strip $(JOYSTICK_SHARED_EP)), yes)
+    TMK_COMMON_DEFS += -DJOYSTICK_SHARED_EP
+    SHARED_EP_ENABLE = yes
+endif
+
+ifeq ($(strip $(JOYSTICK_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DJOYSTICK_ENABLE
+    ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
+        TMK_COMMON_DEFS += -DJOYSTICK_SHARED_EP
+        SHARED_EP_ENABLE = yes
+    endif
+endif
+
 ifeq ($(strip $(DIGITIZER_SHARED_EP)), yes)
     TMK_COMMON_DEFS += -DDIGITIZER_SHARED_EP
     SHARED_EP_ENABLE = yes
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
index 5d681a8b71..bf190b1f18 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
@@ -637,20 +637,20 @@ static uint8_t udi_hid_raw_report_recv[UDI_HID_RAW_REPORT_SIZE];
 
 COMPILER_WORD_ALIGNED
 UDC_DESC_STORAGE udi_hid_raw_report_desc_t udi_hid_raw_report_desc = {{
-    0x06, RAW_USAGE_PAGE_LO, RAW_USAGE_PAGE_HI,  // Usage Page (Vendor Defined)
-    0x09, RAW_USAGE_ID,        // Usage (Vendor Defined)
-    0xA1, 0x01,        // Collection (Application)
-    0x75, 0x08,        //   Report Size (8)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x25, 0xFF,        //   Logical Maximum (255)
+    0x06, HID_VALUE_16(RAW_USAGE_PAGE),  // Usage Page (Vendor Defined)
+    0x09, RAW_USAGE_ID,                  // Usage (Vendor Defined)
+    0xA1, 0x01,                          // Collection (Application)
+    0x75, 0x08,                          //   Report Size (8)
+    0x15, 0x00,                          //   Logical Minimum (0)
+    0x25, 0xFF,                          //   Logical Maximum (255)
     // Data to host
-    0x09, 0x62,        //     Usage (Vendor Defined)
-    0x95, RAW_EPSIZE,  //     Report Count
-    0x81, 0x02,        //     Input (Data, Variable, Absolute)
+    0x09, 0x62,        //   Usage (Vendor Defined)
+    0x95, RAW_EPSIZE,  //   Report Count
+    0x81, 0x02,        //   Input (Data, Variable, Absolute)
     // Data from host
-    0x09, 0x63,        //     Usage (Vendor Defined)
-    0x95, RAW_EPSIZE,  //     Report Count
-    0x91, 0x02,        //     Output (Data, Variable, Absolute)
+    0x09, 0x63,        //   Usage (Vendor Defined)
+    0x95, RAW_EPSIZE,  //   Report Count
+    0x91, 0x02,        //   Output (Data, Variable, Absolute)
     0xC0               // End Collection
 }};
 
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index fb3d575846..62a11faff7 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -183,7 +183,7 @@ static const USBEndpointConfig shared_ep_config = {
 };
 #endif
 
-#ifdef JOYSTICK_ENABLE
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
 /* joystick endpoint state structure */
 static USBInEndpointState joystick_ep_state;
 
@@ -507,7 +507,7 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
 #ifdef SHARED_EP_ENABLE
             usbInitEndpointI(usbp, SHARED_IN_EPNUM, &shared_ep_config);
 #endif
-#ifdef JOYSTICK_ENABLE
+#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)
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 5fee872326..2c6654e9a6 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -164,24 +164,27 @@ void host_joystick_send(joystick_t *joystick) {
     if (!driver) return;
 
     report_joystick_t report = {
-#    if JOYSTICK_AXES_COUNT > 0
+#    ifdef JOYSTICK_SHARED_EP
+        .report_id = REPORT_ID_JOYSTICK,
+#    endif
+#    if JOYSTICK_AXIS_COUNT > 0
         .axes =
             {
                 joystick->axes[0],
 
-#        if JOYSTICK_AXES_COUNT >= 2
+#        if JOYSTICK_AXIS_COUNT >= 2
                 joystick->axes[1],
 #        endif
-#        if JOYSTICK_AXES_COUNT >= 3
+#        if JOYSTICK_AXIS_COUNT >= 3
                 joystick->axes[2],
 #        endif
-#        if JOYSTICK_AXES_COUNT >= 4
+#        if JOYSTICK_AXIS_COUNT >= 4
                 joystick->axes[3],
 #        endif
-#        if JOYSTICK_AXES_COUNT >= 5
+#        if JOYSTICK_AXIS_COUNT >= 5
                 joystick->axes[4],
 #        endif
-#        if JOYSTICK_AXES_COUNT >= 6
+#        if JOYSTICK_AXIS_COUNT >= 6
                 joystick->axes[5],
 #        endif
             },
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index af49ed5909..8f36e02b9a 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -404,7 +404,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) {
     ConfigSuccess &= Endpoint_ConfigureEndpoint((CDC_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, CDC_EPSIZE, 1);
 #endif
 
-#ifdef JOYSTICK_ENABLE
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
     /* Setup joystick endpoint */
     ConfigSuccess &= Endpoint_ConfigureEndpoint((JOYSTICK_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_INTERRUPT, JOYSTICK_EPSIZE, 1);
 #endif
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 543c44e33c..e4526e4ee6 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -235,11 +235,14 @@ typedef struct {
 } __attribute__((packed)) report_digitizer_t;
 
 typedef struct {
-#if JOYSTICK_AXES_COUNT > 0
-#    if JOYSTICK_AXES_RESOLUTION > 8
-    int16_t axes[JOYSTICK_AXES_COUNT];
+#ifdef JOYSTICK_SHARED_EP
+    uint8_t report_id;
+#endif
+#if JOYSTICK_AXIS_COUNT > 0
+#    if JOYSTICK_AXIS_RESOLUTION > 8
+    int16_t axes[JOYSTICK_AXIS_COUNT];
 #    else
-    int8_t axes[JOYSTICK_AXES_COUNT];
+    int8_t axes[JOYSTICK_AXIS_COUNT];
 #    endif
 #endif
 
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index 3c170f1112..99c52952a0 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -174,6 +174,75 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
 #    endif
 #endif
 
+#ifdef JOYSTICK_ENABLE
+#    ifndef JOYSTICK_SHARED_EP
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = {
+#    elif !defined(SHARED_REPORT_STARTED)
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
+#        define SHARED_REPORT_STARTED
+#    endif
+    HID_RI_USAGE_PAGE(8, 0x01),     // Generic Desktop
+    HID_RI_USAGE(8, 0x04),          // Joystick
+    HID_RI_COLLECTION(8, 0x01),     // Application
+#    ifdef JOYSTICK_SHARED_EP
+        HID_RI_REPORT_ID(8, REPORT_ID_JOYSTICK),
+#    endif
+        HID_RI_COLLECTION(8, 0x00), // Physical
+#    if JOYSTICK_AXIS_COUNT > 0
+            HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
+            HID_RI_USAGE(8, 0x30),      // X
+#        if JOYSTICK_AXIS_COUNT > 1
+            HID_RI_USAGE(8, 0x31),      // Y
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 2
+            HID_RI_USAGE(8, 0x32),      // Z
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 3
+            HID_RI_USAGE(8, 0x33),      // Rx
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 4
+            HID_RI_USAGE(8, 0x34),      // Ry
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 5
+            HID_RI_USAGE(8, 0x35),      // Rz
+#        endif
+#        if JOYSTICK_AXIS_RESOLUTION == 8
+            HID_RI_LOGICAL_MINIMUM(8, -JOYSTICK_MAX_VALUE),
+            HID_RI_LOGICAL_MAXIMUM(8, JOYSTICK_MAX_VALUE),
+            HID_RI_REPORT_COUNT(8, JOYSTICK_AXIS_COUNT),
+            HID_RI_REPORT_SIZE(8, 0x08),
+#        else
+            HID_RI_LOGICAL_MINIMUM(16, -JOYSTICK_MAX_VALUE),
+            HID_RI_LOGICAL_MAXIMUM(16, JOYSTICK_MAX_VALUE),
+            HID_RI_REPORT_COUNT(8, JOYSTICK_AXIS_COUNT),
+            HID_RI_REPORT_SIZE(8, 0x10),
+#        endif
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+#    endif
+
+#    if JOYSTICK_BUTTON_COUNT > 0
+            HID_RI_USAGE_PAGE(8, 0x09), // Button
+            HID_RI_USAGE_MINIMUM(8, 0x01),
+            HID_RI_USAGE_MAXIMUM(8, JOYSTICK_BUTTON_COUNT),
+            HID_RI_LOGICAL_MINIMUM(8, 0x00),
+            HID_RI_LOGICAL_MAXIMUM(8, 0x01),
+            HID_RI_REPORT_COUNT(8, JOYSTICK_BUTTON_COUNT),
+            HID_RI_REPORT_SIZE(8, 0x01),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+#        if (JOYSTICK_BUTTON_COUNT % 8) != 0
+            HID_RI_REPORT_COUNT(8, 8 - (JOYSTICK_BUTTON_COUNT % 8)),
+            HID_RI_REPORT_SIZE(8, 0x01),
+            HID_RI_INPUT(8, HID_IOF_CONSTANT),
+#        endif
+#    endif
+        HID_RI_END_COLLECTION(0),
+    HID_RI_END_COLLECTION(0),
+#    ifndef JOYSTICK_SHARED_EP
+};
+#    endif
+#endif
+
 #ifdef DIGITIZER_ENABLE
 #    ifndef DIGITIZER_SHARED_EP
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM DigitizerReport[] = {
@@ -360,65 +429,6 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = {
 };
 #endif
 
-#ifdef JOYSTICK_ENABLE
-const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = {
-    HID_RI_USAGE_PAGE(8, 0x01),     // Generic Desktop
-    HID_RI_USAGE(8, 0x04),          // Joystick
-    HID_RI_COLLECTION(8, 0x01),     // Application
-        HID_RI_COLLECTION(8, 0x00), // Physical
-#    if JOYSTICK_AXES_COUNT > 0
-            HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
-            HID_RI_USAGE(8, 0x30),      // X
-#        if JOYSTICK_AXES_COUNT > 1
-            HID_RI_USAGE(8, 0x31),      // Y
-#        endif
-#        if JOYSTICK_AXES_COUNT > 2
-            HID_RI_USAGE(8, 0x32),      // Z
-#        endif
-#        if JOYSTICK_AXES_COUNT > 3
-            HID_RI_USAGE(8, 0x33),      // Rx
-#        endif
-#        if JOYSTICK_AXES_COUNT > 4
-            HID_RI_USAGE(8, 0x34),      // Ry
-#        endif
-#        if JOYSTICK_AXES_COUNT > 5
-            HID_RI_USAGE(8, 0x35),      // Rz
-#        endif
-#        if JOYSTICK_AXES_RESOLUTION == 8
-            HID_RI_LOGICAL_MINIMUM(8, -JOYSTICK_RESOLUTION),
-            HID_RI_LOGICAL_MAXIMUM(8, JOYSTICK_RESOLUTION),
-            HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT),
-            HID_RI_REPORT_SIZE(8, 0x08),
-#        else
-            HID_RI_LOGICAL_MINIMUM(16, -JOYSTICK_RESOLUTION),
-            HID_RI_LOGICAL_MAXIMUM(16, JOYSTICK_RESOLUTION),
-            HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT),
-            HID_RI_REPORT_SIZE(8, 0x10),
-#        endif
-            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-#    endif
-
-#    if JOYSTICK_BUTTON_COUNT > 0
-            HID_RI_USAGE_PAGE(8, 0x09), // Button
-            HID_RI_USAGE_MINIMUM(8, 0x01),
-            HID_RI_USAGE_MAXIMUM(8, JOYSTICK_BUTTON_COUNT),
-            HID_RI_LOGICAL_MINIMUM(8, 0x00),
-            HID_RI_LOGICAL_MAXIMUM(8, 0x01),
-            HID_RI_REPORT_COUNT(8, JOYSTICK_BUTTON_COUNT),
-            HID_RI_REPORT_SIZE(8, 0x01),
-            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-#        if (JOYSTICK_BUTTON_COUNT % 8) != 0
-            HID_RI_REPORT_COUNT(8, 8 - (JOYSTICK_BUTTON_COUNT % 8)),
-            HID_RI_REPORT_SIZE(8, 0x01),
-            HID_RI_INPUT(8, HID_IOF_CONSTANT),
-#        endif
-#    endif
-        HID_RI_END_COLLECTION(0),
-    HID_RI_END_COLLECTION(0)
-};
-#endif
-
 /*
  * Device descriptor
  */
@@ -958,10 +968,10 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
     },
 #endif
 
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
     /*
      * Joystick
      */
-#ifdef JOYSTICK_ENABLE
     .Joystick_Interface = {
         .Header = {
             .Size               = sizeof(USB_Descriptor_Interface_t),
@@ -1169,7 +1179,7 @@ uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const
 
                     break;
 #endif
-#ifdef JOYSTICK_ENABLE
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
                 case JOYSTICK_INTERFACE:
                     Address = &ConfigurationDescriptor.Joystick_HID;
                     Size    = sizeof(USB_HID_Descriptor_HID_t);
@@ -1226,7 +1236,7 @@ uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const
 
                     break;
 #endif
-#ifdef JOYSTICK_ENABLE
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
                 case JOYSTICK_INTERFACE:
                     Address = &JoystickReport;
                     Size    = sizeof(JoystickReport);
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index 6e842f6984..bc5e84e586 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -132,7 +132,7 @@ typedef struct {
     USB_Descriptor_Endpoint_t  CDC_DataInEndpoint;
 #endif
 
-#ifdef JOYSTICK_ENABLE
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
     // Joystick HID Interface
     USB_Descriptor_Interface_t Joystick_Interface;
     USB_HID_Descriptor_HID_t   Joystick_HID;
@@ -187,7 +187,7 @@ enum usb_interfaces {
     CDI_INTERFACE,
 #endif
 
-#if defined(JOYSTICK_ENABLE)
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
     JOYSTICK_INTERFACE,
 #endif
 
@@ -267,7 +267,11 @@ enum usb_endpoints {
 #endif
 
 #ifdef JOYSTICK_ENABLE
+#    if !defined(JOYSTICK_SHARED_EP)
     JOYSTICK_IN_EPNUM = NEXT_EPNUM,
+#    else
+#        define JOYSTICK_IN_EPNUM SHARED_IN_EPNUM
+#    endif
 #endif
 
 #ifdef DIGITIZER_ENABLE
diff --git a/tmk_core/protocol/usb_descriptor_common.h b/tmk_core/protocol/usb_descriptor_common.h
index ce0cf09763..909c230a99 100644
--- a/tmk_core/protocol/usb_descriptor_common.h
+++ b/tmk_core/protocol/usb_descriptor_common.h
@@ -20,6 +20,8 @@
 #define USBCONCAT(a, b) a##b
 #define USBSTR(s) USBCONCAT(L, s)
 
+#define HID_VALUE_16(v) ((uint8_t)(v & 0xFF)), ((uint8_t)(v >> 8))
+
 /////////////////////
 // RAW Usage page and ID configuration
 
@@ -30,6 +32,3 @@
 #ifndef RAW_USAGE_ID
 #    define RAW_USAGE_ID 0x61
 #endif
-
-#define RAW_USAGE_PAGE_HI ((uint8_t)(RAW_USAGE_PAGE >> 8))
-#define RAW_USAGE_PAGE_LO ((uint8_t)(RAW_USAGE_PAGE & 0xFF))
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index ac35043e2a..2d17761978 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -35,6 +35,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "raw_hid.h"
 #endif
 
+#ifdef JOYSTICK_ENABLE
+#    include "joystick.h"
+#endif
+
 #if defined(CONSOLE_ENABLE)
 #    define RBUF_SIZE 128
 #    include "ring_buffer.h"
@@ -275,6 +279,14 @@ static void send_extra(report_extra_t *report) {
 #endif
 }
 
+void send_joystick(report_joystick_t *report) {
+#ifdef JOYSTICK_ENABLE
+    if (usbInterruptIsReadyShared()) {
+        usbSetInterruptShared((void *)report, sizeof(report_joystick_t));
+    }
+#endif
+}
+
 void send_digitizer(report_digitizer_t *report) {
 #ifdef DIGITIZER_ENABLE
     if (usbInterruptIsReadyShared()) {
@@ -526,6 +538,65 @@ const PROGMEM uchar shared_hid_report[] = {
     0xC0,                     // End Collection
 #endif
 
+#ifdef JOYSTICK_ENABLE
+    // Joystick report descriptor
+    0x05, 0x01,               // Usage Page (Generic Desktop)
+    0x09, 0x04,               // Usage (Joystick)
+    0xA1, 0x01,               // Collection (Application)
+    0x85, REPORT_ID_JOYSTICK, //   Report ID
+    0xA1, 0x00,               //   Collection (Physical)
+#    if JOYSTICK_AXIS_COUNT > 0
+    0x05, 0x01, //     Usage Page (Generic Desktop)
+    0x09, 0x30, //     Usage (X)
+#        if JOYSTICK_AXIS_COUNT > 1
+    0x09, 0x31, //     Usage (Y)
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 2
+    0x09, 0x32, //     Usage (Z)
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 3
+    0x09, 0x33, //     Usage (Rx)
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 4
+    0x09, 0x34, //     Usage (Ry)
+#        endif
+#        if JOYSTICK_AXIS_COUNT > 5
+    0x09, 0x35, //     Usage (Rz)
+#        endif
+#        if JOYSTICK_AXIS_RESOLUTION == 8
+    0x15, -JOYSTICK_MAX_VALUE, //     Logical Minimum
+    0x25, JOYSTICK_MAX_VALUE,  //     Logical Maximum
+    0x95, JOYSTICK_AXIS_COUNT, //     Report Count
+    0x75, 0x08,                //     Report Size (8)
+#        else
+    0x16, HID_VALUE_16(-JOYSTICK_MAX_VALUE), //     Logical Minimum
+    0x26, HID_VALUE_16(JOYSTICK_MAX_VALUE),  //     Logical Maximum
+    0x95, JOYSTICK_AXIS_COUNT,               //     Report Count
+    0x75, 0x10,                              //     Report Size (16)
+#        endif
+    0x81, 0x02, //     Input (Data, Variable, Absolute)
+#    endif
+
+#    if JOYSTICK_BUTTON_COUNT > 0
+    0x05, 0x09,                  //     Usage Page (Button)
+    0x19, 0x01,                  //     Usage Minimum (Button 1)
+    0x29, JOYSTICK_BUTTON_COUNT, //     Usage Maximum
+    0x15, 0x00,                  //     Logical Minimum (0)
+    0x25, 0x01,                  //     Logical Maximum (1)
+    0x95, JOYSTICK_BUTTON_COUNT, //     Report Count
+    0x75, 0x01,                  //     Report Size (1)
+    0x81, 0x02,                  //     Input (Data, Variable, Absolute)
+
+#        if (JOYSTICK_BUTTON_COUNT % 8) != 0
+    0x95, 8 - (JOYSTICK_BUTTON_COUNT % 8), //     Report Count
+    0x75, 0x01,                            //     Report Size (1)
+    0x81, 0x03,                            //     Input (Constant)
+#        endif
+#    endif
+    0xC0, //   End Collection
+    0xC0, // End Collection
+#endif
+
 #ifdef DIGITIZER_ENABLE
     // Digitizer report descriptor
     0x05, 0x0D,                // Usage Page (Digitizers)
@@ -587,9 +658,9 @@ const PROGMEM uchar shared_hid_report[] = {
 
 #ifdef RAW_ENABLE
 const PROGMEM uchar raw_hid_report[] = {
-    0x06, RAW_USAGE_PAGE_LO, RAW_USAGE_PAGE_HI, // Usage Page (Vendor Defined)
-    0x09, RAW_USAGE_ID,                         // Usage (Vendor Defined)
-    0xA1, 0x01,                                 // Collection (Application)
+    0x06, HID_VALUE_16(RAW_USAGE_PAGE), // Usage Page (Vendor Defined)
+    0x09, RAW_USAGE_ID,                 // Usage (Vendor Defined)
+    0xA1, 0x01,                         // Collection (Application)
     // Data to host
     0x09, 0x62,            //   Usage (Vendor Defined)
     0x15, 0x00,            //   Logical Minimum (0)

From ad7b095da6b2a51a310725c1c0fcb6571b46e7e7 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 27 Nov 2022 04:16:08 +1100
Subject: [PATCH 931/959] Fixup installation procedure for different Fedora
 versions. (#19159)

---
 util/install/fedora.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index 6380f6d33f..03e05a42fe 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -8,7 +8,12 @@ _qmk_install() {
         clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
         make unzip wget zip python3 avr-binutils avr-gcc avr-gcc-c++ avr-libc \
         arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++ \
-        arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi libusb-devel
+        arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi
+
+    # Handle discrepancies between different Fedora versions
+    sudo dnf $SKIP_PROMPT install libusb-devel \
+        || sudo dnf $SKIP_PROMPT install libusb1-devel libusb-compat-0.1-devel \
+        || sudo dnf $SKIP_PROMPT install libusb0-devel
 
     python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
 }

From e12ca14af8fc1799357bbfffd156d53b4a51001c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 27 Nov 2022 04:18:24 +1100
Subject: [PATCH 932/959] Change `RGB_MATRIX_STARTUP_*` defines to
 `RGB_MATRIX_DEFAULT_*` (#19079)

---
 docs/feature_rgb_matrix.md                    | 10 +++---
 keyboards/3keyecosystem/2key2/config.h        |  8 ++---
 keyboards/4pplet/perk60_iso/rev_a/config.h    |  2 +-
 keyboards/acheron/apollo/87h/delta/config.h   |  4 +--
 keyboards/acheron/apollo/87h/gamma/config.h   |  4 +--
 keyboards/acheron/apollo/87htsc/config.h      |  4 +--
 keyboards/acheron/apollo/88htsc/config.h      |  4 +--
 keyboards/adm42/rev4/config.h                 |  2 +-
 keyboards/aeboards/satellite/rev1/config.h    |  4 +--
 keyboards/atlantis/ak81_ve/config.h           |  6 ++--
 keyboards/bandominedoni/config.h              |  2 +-
 keyboards/bandominedoni/keymaps/led/keymap.c  |  2 +-
 .../bandominedoni/keymaps/lednotg/keymap.c    |  2 +-
 keyboards/bandominedoni/keymaps/via/keymap.c  |  2 +-
 .../charybdis/3x5/keymaps/bstiq/config.h      | 11 +++---
 .../charybdis/3x5/keymaps/via/keymap.c        |  2 +-
 .../charybdis/3x6/keymaps/via/keymap.c        |  2 +-
 .../charybdis/4x6/keymaps/via/keymap.c        |  2 +-
 keyboards/bastardkb/charybdis/config.h        | 11 +++---
 .../dilemma/3x5_2/keymaps/bstiq/config.h      | 11 +++---
 keyboards/bastardkb/dilemma/3x5_3/config.h    |  2 +-
 .../dilemma/3x5_3/keymaps/bstiq/config.h      | 11 +++---
 keyboards/bastardkb/scylla/config.h           |  2 +-
 keyboards/bastardkb/skeletyl/config.h         |  2 +-
 keyboards/bastardkb/tbkmini/config.h          |  2 +-
 keyboards/binepad/bn006/config.h              |  2 +-
 .../boardsource/lulu/keymaps/rmeli/config.h   |  8 ++---
 keyboards/chromatonemini/config.h             |  2 +-
 keyboards/chromatonemini/keymaps/led/keymap.c |  2 +-
 .../chromatonemini/keymaps/party/keymap.c     |  2 +-
 keyboards/chromatonemini/keymaps/via/keymap.c |  2 +-
 keyboards/crkbd/keymaps/davidrambo/config.h   |  2 +-
 keyboards/crkbd/keymaps/devdev/config.h       |  2 +-
 keyboards/crkbd/keymaps/dsanchezseco/config.h |  2 +-
 keyboards/crkbd/keymaps/gotham/config.h       |  2 +-
 keyboards/crkbd/keymaps/jpe230/config.h       |  6 ++--
 keyboards/crkbd/keymaps/rmeli/config.h        |  8 ++---
 .../crkbd/keymaps/thunderbird2086/config.h    |  2 +-
 keyboards/dekunukem/duckypad/config.h         |  4 +--
 keyboards/doio/kb16/rev1/config.h             |  4 +--
 keyboards/doio/kb16/rev2/config.h             |  4 +--
 keyboards/drop/sense75/config.h               |  2 +-
 keyboards/dtisaac/dosa40rgb/config.h          |  2 +-
 .../dztech/dz60rgb/keymaps/kgreulich/config.h |  2 +-
 .../dz60rgb/keymaps/matthewrobo/config.h      |  2 +-
 keyboards/dztech/dz60rgb/v1/config.h          |  2 +-
 keyboards/dztech/dz60rgb_ansi/v1/config.h     |  2 +-
 keyboards/dztech/dz60rgb_wkl/v1/config.h      |  2 +-
 keyboards/dztech/dz64rgb/config.h             |  2 +-
 .../dztech/dz65rgb/keymaps/drootz/config.h    | 12 +++----
 .../dztech/dz65rgb/keymaps/jumper149/config.h |  2 +-
 .../dz65rgb/keymaps/matthewrobo/config.h      |  2 +-
 .../dztech/dz65rgb/keymaps/yuannan/config.h   |  4 +--
 keyboards/dztech/dz65rgb/v1/config.h          |  2 +-
 keyboards/dztech/dz65rgb/v2/config.h          |  2 +-
 keyboards/dztech/dz65rgb/v3/config.h          |  2 +-
 keyboards/eek/config.h                        |  2 +-
 keyboards/ein_60/config.h                     |  2 +-
 keyboards/feker/ik75/config.h                 |  2 +-
 keyboards/frooastboard/walnut/config.h        | 10 +++---
 keyboards/geekboards/macropad_v2/config.h     |  8 ++---
 keyboards/gizmo_engineering/gk6/config.h      |  6 ++--
 .../j73gl/keymaps/via_rgb_matrix/config.h     | 10 +++---
 .../rev1/ansi/keymaps/andrewcharnley/config.h |  2 +-
 .../pro/rev1/ansi/keymaps/gigahawk/config.h   |  4 +--
 .../pro/rev1/ansi/keymaps/gourdo1/config.h    | 10 +++---
 .../pro/rev1/ansi/keymaps/jonavin/config.h    |  2 +-
 .../gmmk/pro/rev1/ansi/keymaps/macos/config.h |  2 +-
 .../pro/rev1/ansi/keymaps/mattgauf/config.h   |  2 +-
 .../pro/rev1/ansi/keymaps/paddlegame/config.h |  2 +-
 .../rev1/ansi/keymaps/stickandgum/config.h    |  2 +-
 .../pro/rev1/iso/keymaps/gourdo1/config.h     | 10 +++---
 .../pro/rev1/iso/keymaps/jonavin/config.h     |  2 +-
 .../gmmk/pro/rev1/iso/keymaps/vitoni/config.h |  2 +-
 keyboards/gopolar/gg86/config.h               |  2 +-
 .../5x6/keymaps/thattolleyguy/config.h        |  2 +-
 keyboards/handwired/hnah40rgb/config.h        |  2 +-
 .../chinese_pcb/devil68_pro/config.h          |  2 +-
 keyboards/horrortroll/handwired_k552/config.h |  2 +-
 keyboards/ilumkb/simpler61/config.h           |  2 +-
 keyboards/ilumkb/simpler64/config.h           |  2 +-
 keyboards/input_club/k_type/k_type.c          |  6 ++--
 .../k_type/keymaps/andrew-fahmy/config.h      |  2 +-
 keyboards/jadookb/jkb65/config.h              |  2 +-
 keyboards/kbdfans/baguette66/rgb/config.h     |  2 +-
 keyboards/kbdfans/bella/rgb/config.h          |  4 +--
 keyboards/kbdfans/bella/rgb_iso/config.h      |  4 +--
 keyboards/kbdfans/boop65/rgb/config.h         |  4 +--
 .../kbd67/mkiirgb/keymaps/jonavin/config.h    |  6 ++--
 .../kbd67/mkiirgb/keymaps/spx01/config.h      |  4 +--
 keyboards/kbdfans/kbd67/mkiirgb/v1/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v2/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v3/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h   |  2 +-
 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h  |  2 +-
 keyboards/kbdfans/kbd75rgb/config.h           |  2 +-
 keyboards/kbdfans/maja/config.h               |  2 +-
 keyboards/kbdfans/odin/rgb/config.h           |  2 +-
 keyboards/keebio/bamfk4/config.h              |  2 +-
 keyboards/keebio/iris/rev6/config.h           |  2 +-
 keyboards/keebio/iris/rev6a/config.h          |  2 +-
 keyboards/keebio/iris/rev6b/config.h          |  2 +-
 keyboards/keebio/iris/rev7/config.h           |  2 +-
 keyboards/keebio/sinc/rev3/config.h           |  2 +-
 .../q1/rev_0100/keymaps/teimor/config.h       |  4 +--
 .../q1/rev_0102/keymaps/victorsavu3/config.h  |  2 +-
 .../bm40hsrgb/keymaps/34keys/config.h         |  2 +-
 .../bm40hsrgb/keymaps/gabustoledo/config.h    |  2 +-
 .../bm40hsrgb/keymaps/signynt/config.h        |  4 +--
 .../bm40hsrgb/keymaps/signynt_2_loud/config.h |  4 +--
 .../keymaps/signynt_2_quiet/config.h          |  4 +--
 .../kprepublic/bm60hsrgb_iso/rev2/config.h    |  2 +-
 .../kprepublic/bm65hsrgb_iso/rev1/config.h    |  2 +-
 .../bm68hsrgb/rev1/keymaps/peepeetee/config.h |  2 +-
 keyboards/kprepublic/bm80hsrgb/config.h       | 10 +++---
 .../bm80hsrgb/keymaps/peepeetee/config.h      |  2 +-
 keyboards/kprepublic/bm80v2/config.h          |  2 +-
 keyboards/kprepublic/bm80v2_iso/config.h      |  2 +-
 .../labbeminiv1/keymaps/rgbmatrix/config.h    |  2 +-
 keyboards/linworks/fave65h/config.h           |  2 +-
 keyboards/linworks/fave84h/config.h           |  2 +-
 keyboards/linworks/fave87h/config.h           |  2 +-
 keyboards/marksard/rhymestone/rev1/config.h   |  2 +-
 keyboards/massdrop/alt/keymaps/b_/config.h    | 22 ++++++------
 .../massdrop/alt/keymaps/jdelkins/config.h    |  2 +-
 .../massdrop/alt/keymaps/jdelkins_ss/config.h |  2 +-
 .../massdrop/alt/keymaps/pregame/config.h     | 22 ++++++------
 .../massdrop/ctrl/keymaps/endgame/config.h    |  2 +-
 .../massdrop/ctrl/keymaps/foxx1337/config.h   |  8 ++---
 .../ctrl/keymaps/matthewrobo/config.h         |  2 +-
 .../massdrop/ctrl/keymaps/r-pufky/config.h    |  4 +--
 .../massdrop/ctrl/keymaps/xanimos/config.h    |  2 +-
 .../mechlovin/adelais/rgb_led/rev1/config.h   |  2 +-
 .../mechlovin/adelais/rgb_led/rev2/config.h   |  2 +-
 .../mechlovin/adelais/rgb_led/rev3/config.h   |  2 +-
 keyboards/mechlovin/delphine/rgb_led/config.h |  2 +-
 keyboards/mechlovin/hannah60rgb/rev1/config.h |  2 +-
 keyboards/mechlovin/hannah60rgb/rev2/config.h |  2 +-
 .../mechlovin/infinity87/rgb_rev1/config.h    |  6 ++--
 keyboards/melgeek/mach80/config.h             |  4 +--
 keyboards/melgeek/mj61/config.h               |  4 +--
 keyboards/melgeek/mj63/config.h               |  4 +--
 keyboards/melgeek/mj64/config.h               |  4 +--
 keyboards/melgeek/mj65/config.h               |  4 +--
 keyboards/melgeek/mojo68/config.h             |  4 +--
 keyboards/melgeek/mojo75/config.h             |  6 ++--
 keyboards/melgeek/tegic/config.h              |  4 +--
 keyboards/melgeek/z70ultra/config.h           |  4 +--
 keyboards/ml/gas75/config.h                   |  2 +-
 keyboards/mss_studio/m63_rgb/config.h         |  2 +-
 keyboards/mss_studio/m64_rgb/config.h         |  2 +-
 keyboards/mt/mt64rgb/config.h                 |  2 +-
 keyboards/mt/mt84/config.h                    |  2 +-
 keyboards/mwstudio/alicekk/config.h           |  2 +-
 keyboards/mwstudio/mw65_rgb/config.h          |  2 +-
 keyboards/mwstudio/mw75/config.h              |  2 +-
 keyboards/mwstudio/mw75r2/config.h            |  2 +-
 keyboards/nack/config.h                       |  2 +-
 keyboards/opendeck/32/rev1/config.h           |  2 +-
 keyboards/owlab/voice65/hotswap/config.h      |  2 +-
 keyboards/owlab/voice65/soldered/config.h     |  2 +-
 keyboards/percent/canoe_gen2/config.h         | 10 +++---
 keyboards/planck/keymaps/oryx/config.h        |  2 +-
 keyboards/playkbtw/pk64rgb/config.h           |  2 +-
 keyboards/pom_keyboards/tnln95/config.h       |  2 +-
 keyboards/ryanskidmore/rskeys100/config.h     |  2 +-
 .../s_ol/0xc_pad/keymaps/default/config.h     |  2 +-
 .../naked48/keymaps/via_rgb_matrix/config.h   | 10 +++---
 keyboards/sawnsprojects/satxri6key/config.h   |  2 +-
 keyboards/senselessclay/ck60/config.h         |  2 +-
 keyboards/silverbullet44/config.h             |  2 +-
 keyboards/sofle/keymaps/devdev/config.h       |  2 +-
 keyboards/sofle/keymaps/rgb_default/config.h  |  2 +-
 keyboards/system76/launch_1/config.h          | 10 +++---
 keyboards/system76/system76_ec.c              | 34 +++++++++----------
 keyboards/ungodly/launch_pad/config.h         |  2 +-
 keyboards/wekey/we27/config.h                 | 10 +++---
 keyboards/work_louder/loop/config.h           |  2 +-
 keyboards/work_louder/work_board/config.h     |  4 +--
 keyboards/xbows/knight/config.h               |  2 +-
 keyboards/xbows/knight_plus/config.h          |  2 +-
 keyboards/xbows/nature/config.h               |  4 +--
 keyboards/xbows/numpad/config.h               |  2 +-
 keyboards/xbows/ranger/config.h               |  2 +-
 keyboards/xelus/dawn60/rev1_qmk/config.h      |  2 +-
 keyboards/xelus/la_plus/config.h              |  4 +--
 keyboards/xelus/pachi/rgb/rev1/config.h       |  4 +--
 keyboards/xelus/pachi/rgb/rev2/config.h       |  4 +--
 keyboards/xelus/valor/rev2/config.h           |  2 +-
 keyboards/yncognito/batpad/config.h           |  2 +-
 keyboards/yushakobo/quick17/config.h          |  6 ++--
 quantum/rgb_matrix/rgb_matrix.c               | 28 +++++++--------
 users/cedrikl/config.h                        |  6 ++--
 users/drashna/post_config.h                   |  2 +-
 users/jonavin/config.h                        |  6 ++--
 users/tominabox1/config.h                     |  2 +-
 196 files changed, 373 insertions(+), 377 deletions(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index bac49b75ff..f5653b99e0 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -798,11 +798,11 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
 #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
-#define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
-#define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
+#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
 #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
 #define RGB_MATRIX_SPLIT { X, Y } 	// (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
                               		// If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index bb0a591610..07385ec0ca 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -36,10 +36,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B2
 #define RGB_MATRIX_LED_COUNT 2
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE
-#define RGB_MATRIX_STARTUP_HUE 90
-#define RGB_MATRIX_STARTUP_SPD 20
-#define RGB_MATRIX_STARTUP_VAL 128
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE
+#define RGB_MATRIX_DEFAULT_HUE 90
+#define RGB_MATRIX_DEFAULT_SPD 20
+#define RGB_MATRIX_DEFAULT_VAL 128
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h
index 7403803f5d..233d8e7d36 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_LED_COUNT 62
 #define ISSI_PWM_FREQUENCY 0b010
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_KEYPRESSES
 
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 8f6e3a87db..8b92c3f4b2 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -50,11 +50,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
 
-#define RGB_MATRIX_STARTUP_VAL 60
+#define RGB_MATRIX_DEFAULT_VAL 60
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 7adcf7a75b..f18733c333 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -48,11 +48,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #define ISSI_DRIVER_TOTAL RGB_MATRIX_LED_COUNT
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_HUE_WAVE
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_HUE_WAVE
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 7e2060ab2d..918546f3d3 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -50,11 +50,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
 
-#define RGB_MATRIX_STARTUP_VAL 60
+#define RGB_MATRIX_DEFAULT_VAL 60
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 8f6e3a87db..8b92c3f4b2 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -50,11 +50,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
 
-#define RGB_MATRIX_STARTUP_VAL 60
+#define RGB_MATRIX_DEFAULT_VAL 60
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index 2a8f9927cd..9ad330d8f7 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -26,7 +26,7 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_LED_PROCESS_LIMIT 21
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/aeboards/satellite/rev1/config.h b/keyboards/aeboards/satellite/rev1/config.h
index d714b939a9..508689faf5 100644
--- a/keyboards/aeboards/satellite/rev1/config.h
+++ b/keyboards/aeboards/satellite/rev1/config.h
@@ -26,11 +26,11 @@
 #define ISSI_DRIVER_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #define RGB_MATRIX_LED_COUNT ISSI_DRIVER_TOTAL
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index baf1b14e7d..cdffe637a4 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -58,10 +58,10 @@
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true
 #define RGB_MATRIX_LED_COUNT 96
-#define RGB_MATRIX_STARTUP_HUE 170
-#define RGB_MATRIX_STARTUP_SAT 255
+#define RGB_MATRIX_DEFAULT_HUE 170
+#define RGB_MATRIX_DEFAULT_SAT 255
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
 #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
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 5992f004e6..55608af85e 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -88,7 +88,7 @@
 #   define LED_HITS_TO_REMEMBER 10
 
 #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#   define RGB_MATRIX_STARTUP_SPD 127
+#   define RGB_MATRIX_DEFAULT_SPD 127
 // the above brighness setting has no effect on rgb_matrix_set_color().
 // Use darker colors instead.
 /*              RGB darker COLORS             */
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 5ef921a6d4..b0f0e95528 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -178,7 +178,7 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
     my_init();
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
     rgb_matrix_sethsv(HSV_BLUE);
 
     rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
diff --git a/keyboards/bandominedoni/keymaps/lednotg/keymap.c b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
index 4ffe7dae6d..80410eadac 100644
--- a/keyboards/bandominedoni/keymaps/lednotg/keymap.c
+++ b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
@@ -178,7 +178,7 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
     my_init();
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
     rgb_matrix_sethsv(HSV_BLUE);
 
     rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index 859c74e33a..b600cb0be4 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -117,7 +117,7 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
     my_init();
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
     rgb_matrix_sethsv(HSV_BLUE);
 
     rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
index 699a700063..cceba7c1fb 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
@@ -153,14 +153,13 @@
 
 // Rainbow swirl as startup mode.
 #    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 // Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
+#    define RGB_MATRIX_DEFAULT_SPD 32
 
 // Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#    define RGB_MATRIX_DEFAULT_HUE 0
+#    define RGB_MATRIX_DEFAULT_SAT 255
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
index d3fdfef14a..ec93cec627 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -236,7 +236,7 @@ void matrix_scan_user(void) {
         auto_pointer_layer_timer = 0;
         layer_off(LAYER_POINTER);
 #        ifdef RGB_MATRIX_ENABLE
-        rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
 #        endif // RGB_MATRIX_ENABLE
     }
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
index 39b05b9234..7f6eb6a911 100644
--- a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
@@ -116,7 +116,7 @@ void matrix_scan_user(void) {
         auto_pointer_layer_timer = 0;
         layer_off(LAYER_POINTER);
 #        ifdef RGB_MATRIX_ENABLE
-        rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
 #        endif // RGB_MATRIX_ENABLE
     }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
index 92a861e91a..1050974212 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
@@ -139,7 +139,7 @@ void matrix_scan_user(void) {
         auto_pointer_layer_timer = 0;
         layer_off(LAYER_POINTER);
 #        ifdef RGB_MATRIX_ENABLE
-        rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
 #        endif // RGB_MATRIX_ENABLE
     }
 }
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h
index 2d2e09e403..bc5ea15d29 100644
--- a/keyboards/bastardkb/charybdis/config.h
+++ b/keyboards/bastardkb/charybdis/config.h
@@ -40,17 +40,16 @@
 #    define RGB_MATRIX_KEYPRESSES
 
 // Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL 64
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#    define RGB_MATRIX_DEFAULT_HUE 0
+#    define RGB_MATRIX_DEFAULT_SAT 255
+#    define RGB_MATRIX_DEFAULT_VAL 64
 
 // Rainbow swirl as startup mode.
 #    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 // Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
+#    define RGB_MATRIX_DEFAULT_SPD 32
 
 #    ifndef __arm__
 // Disable control of RGB matrix by keycodes (must use firmware implementation
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
index b2e49c8c6e..cbe8e7bba7 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
@@ -140,14 +140,13 @@
 
 // Rainbow swirl as startup mode.
 #    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 // Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
+#    define RGB_MATRIX_DEFAULT_SPD 32
 
 // Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#    define RGB_MATRIX_DEFAULT_HUE 0
+#    define RGB_MATRIX_DEFAULT_SAT 255
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index d89f250063..985d622fb6 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -65,7 +65,7 @@
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
index 507cd6a225..139b1f06ea 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
@@ -132,14 +132,13 @@
 
 // Rainbow swirl as startup mode.
 #    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 // Slow swirl at startup.
-#    define RGB_MATRIX_STARTUP_SPD 32
+#    define RGB_MATRIX_DEFAULT_SPD 32
 
 // Startup values.
-#    define RGB_MATRIX_STARTUP_HUE 0
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#    define RGB_MATRIX_DEFAULT_HUE 0
+#    define RGB_MATRIX_DEFAULT_SAT 255
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 84b559a26b..043547be52 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -40,7 +40,7 @@
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index f887d8e0f0..82a07c5921 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -40,7 +40,7 @@
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index 867f69319b..5b508842fe 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -40,7 +40,7 @@
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h
index 50129afa9e..200251cd1c 100755
--- a/keyboards/binepad/bn006/config.h
+++ b/keyboards/binepad/bn006/config.h
@@ -25,7 +25,7 @@
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
     #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_BREATHING // Sets the default mode, if none has been set
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING // Sets the default mode, if none has been set
     #define RGB_TRIGGER_ON_KEYDOWN      // Triggers RGB keypress events on key down. This makes RGB control feel more responsive. This may cause RGB to not function properly on some boards
 
     // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/boardsource/lulu/keymaps/rmeli/config.h b/keyboards/boardsource/lulu/keymaps/rmeli/config.h
index 4d8823d785..171eaed0db 100644
--- a/keyboards/boardsource/lulu/keymaps/rmeli/config.h
+++ b/keyboards/boardsource/lulu/keymaps/rmeli/config.h
@@ -25,10 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_KEYPRESSES // enable keypress effects
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#    define RGB_MATRIX_STARTUP_HUE 10
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_MATRIX_DEFAULT_HUE 10
+#    define RGB_MATRIX_DEFAULT_SAT 255
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 // Disable RGB Matrix effects (from lulu/config.h)
 #    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
 #    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h
index 119f9dac5d..b8bf416d8a 100644
--- a/keyboards/chromatonemini/config.h
+++ b/keyboards/chromatonemini/config.h
@@ -64,7 +64,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define LED_HITS_TO_REMEMBER 10
 
 #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#   define RGB_MATRIX_STARTUP_SPD 127
+#   define RGB_MATRIX_DEFAULT_SPD 127
 #   define RGB_MATRIX_CENTER { 124, 32 }
 // the above brighness setting has no effect on rgb_matrix_set_color().
 // Use darker colors instead.
diff --git a/keyboards/chromatonemini/keymaps/led/keymap.c b/keyboards/chromatonemini/keymaps/led/keymap.c
index c1187a7b10..22fc25d253 100644
--- a/keyboards/chromatonemini/keymaps/led/keymap.c
+++ b/keyboards/chromatonemini/keymaps/led/keymap.c
@@ -310,7 +310,7 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
 
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
 #endif  // RGB_MATRIX_ENABLE
     my_init(); // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 }
diff --git a/keyboards/chromatonemini/keymaps/party/keymap.c b/keyboards/chromatonemini/keymaps/party/keymap.c
index 4c8a0316c4..a26250e1a8 100644
--- a/keyboards/chromatonemini/keymaps/party/keymap.c
+++ b/keyboards/chromatonemini/keymaps/party/keymap.c
@@ -313,7 +313,7 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
 
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
 #endif  // RGB_MATRIX_ENABLE
     my_init(); // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
 }
diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c
index 9269448567..185e4a37a7 100644
--- a/keyboards/chromatonemini/keymaps/via/keymap.c
+++ b/keyboards/chromatonemini/keymaps/via/keymap.c
@@ -119,7 +119,7 @@ void eeconfig_init_user(void) {  // EEPROM is getting reset!
 
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
     rgb_matrix_sethsv(HSV_BLUE);
 #endif  // RGB_MATRIX_ENABLE
     my_init(); // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
diff --git a/keyboards/crkbd/keymaps/davidrambo/config.h b/keyboards/crkbd/keymaps/davidrambo/config.h
index 9fb4348802..15ed448cae 100644
--- a/keyboards/crkbd/keymaps/davidrambo/config.h
+++ b/keyboards/crkbd/keymaps/davidrambo/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PERMISSIVE_HOLD
 
 #ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_STARTUP_HUE 231
+    #define RGB_MATRIX_DEFAULT_HUE 231
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
     #define RGB_MATRIX_TYPING_MEATMAP_DECREASE_DELAY_MS 50
     // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/crkbd/keymaps/devdev/config.h b/keyboards/crkbd/keymaps/devdev/config.h
index 0fe7e90385..14067d1e74 100644
--- a/keyboards/crkbd/keymaps/devdev/config.h
+++ b/keyboards/crkbd/keymaps/devdev/config.h
@@ -75,7 +75,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
 
 #    define RGB_MATRIX_HUE_STEP 8
 #    define RGB_MATRIX_SAT_STEP 8
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/config.h b/keyboards/crkbd/keymaps/dsanchezseco/config.h
index 4fd8fc94c4..229e26e010 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/config.h
+++ b/keyboards/crkbd/keymaps/dsanchezseco/config.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // lower maximum brightness to lower power usage and prevent unresponsiveness
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/crkbd/keymaps/gotham/config.h b/keyboards/crkbd/keymaps/gotham/config.h
index f7144fb008..3f56ef92a5 100644
--- a/keyboards/crkbd/keymaps/gotham/config.h
+++ b/keyboards/crkbd/keymaps/gotham/config.h
@@ -49,7 +49,7 @@
 #    define RGB_MATRIX_SAT_STEP 64
 #    define RGB_MATRIX_VAL_STEP 64
 #    define RGB_MATRIX_SPD_STEP 20
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 
 /* Disable the animations you don't want/need.  You will need to disable a good number of these    *
  * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
diff --git a/keyboards/crkbd/keymaps/jpe230/config.h b/keyboards/crkbd/keymaps/jpe230/config.h
index 57a0271e27..815cb90706 100644
--- a/keyboards/crkbd/keymaps/jpe230/config.h
+++ b/keyboards/crkbd/keymaps/jpe230/config.h
@@ -30,9 +30,9 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_DISABLE_TIMEOUT CUSTOM_OLED_TIMEOUT
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-#define RGB_MATRIX_STARTUP_HUE 215
-#define RGB_MATRIX_STARTUP_SAT 255
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_HUE 215
+#define RGB_MATRIX_DEFAULT_SAT 255
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
 /* ---------------------------
  * Common other Configuration
diff --git a/keyboards/crkbd/keymaps/rmeli/config.h b/keyboards/crkbd/keymaps/rmeli/config.h
index 2f06b82cc1..86104fbacb 100644
--- a/keyboards/crkbd/keymaps/rmeli/config.h
+++ b/keyboards/crkbd/keymaps/rmeli/config.h
@@ -54,10 +54,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_COLOR
 #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
 // Default effect
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#    define RGB_MATRIX_STARTUP_HUE 10
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_MATRIX_DEFAULT_HUE 10
+#    define RGB_MATRIX_DEFAULT_SAT 255
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #endif
 
 // https://github.com/qmk/qmk_firmware/blob/develop/docs/squeezing_avr.md
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/config.h b/keyboards/crkbd/keymaps/thunderbird2086/config.h
index 36afd9b469..41e5c3ff43 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/config.h
+++ b/keyboards/crkbd/keymaps/thunderbird2086/config.h
@@ -52,7 +52,7 @@
 #    define RGB_MATRIX_SAT_STEP 64
 #    define RGB_MATRIX_VAL_STEP 64
 #    define RGB_MATRIX_SPD_STEP 20
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 
 /* Disable the animations you don't want/need.  You will need to disable a good number of these    *
  * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
index 2a92a2b205..04364e405a 100644
--- a/keyboards/dekunukem/duckypad/config.h
+++ b/keyboards/dekunukem/duckypad/config.h
@@ -34,8 +34,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define RGB_MATRIX_STARTUP_HUE 221
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define RGB_MATRIX_DEFAULT_HUE 221
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index 5187354513..b9dbd1d46b 100644
--- a/keyboards/doio/kb16/rev1/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -48,8 +48,8 @@
     #define RGB_DI_PIN F6
     #define RGB_MATRIX_LED_COUNT 16
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
     #define RGB_MATRIX_KEYPRESSES
 
     /* RGB Matrix effect */
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index d75c69c9a2..e0884004da 100644
--- a/keyboards/doio/kb16/rev2/config.h
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -55,8 +55,8 @@
     #define RGB_DI_PIN A10
     #define RGB_MATRIX_LED_COUNT 16
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
     #define RGB_MATRIX_KEYPRESSES
 
     /* RGB Matrix effect */
diff --git a/keyboards/drop/sense75/config.h b/keyboards/drop/sense75/config.h
index 53fea6b103..908c465f6a 100644
--- a/keyboards/drop/sense75/config.h
+++ b/keyboards/drop/sense75/config.h
@@ -18,7 +18,7 @@
 
 #    define RGB_DISABLE_TIMEOUT 0
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #    define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 72ff80088f..7a931c998c 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
index e3250acef1..7b408ba7bd 100644
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
@@ -27,7 +27,7 @@
 #undef DISABLE_RGB_MATRIX_SPLASH
 #undef DISABLE_RGB_MATRIX_MULTISPLASH
 #undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#undef RGB_MATRIX_STARTUP_MODE
+#undef RGB_MATRIX_DEFAULT_MODE
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #undef ENABLE_RGB_MATRIX_SOLID_COLOR
 #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
index ca64eeb69b..786360c5a2 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
@@ -10,7 +10,7 @@
 #undef DISABLE_RGB_MATRIX_SPLASH
 #undef DISABLE_RGB_MATRIX_MULTISPLASH
 #undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#undef RGB_MATRIX_STARTUP_MODE
+#undef RGB_MATRIX_DEFAULT_MODE
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
 // #undef ENABLE_RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index 92ee0f31ae..a9577a7408 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -77,7 +77,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 63
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 08af978348..1ab871a1b2 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -77,7 +77,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 61
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index c3a6cca1c0..e3d0597d39 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -77,7 +77,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 62
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index f99bb835a9..724a6f456a 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -55,7 +55,7 @@
 #define ENABLE_RGB_MATRIX_PIXEL_FLOW
 #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b1010000
 #define DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 64
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/config.h b/keyboards/dztech/dz65rgb/keymaps/drootz/config.h
index 109aa3d07e..51fd5c6871 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/config.h
@@ -9,16 +9,16 @@
 #	undef DISABLE_RGB_MATRIX_SPLASH
 #	undef DISABLE_RGB_MATRIX_SOLID_SPLASH
 #	undef RGB_MATRIX_LED_FLUSH_LIMIT
-#	undef RGB_MATRIX_STARTUP_MODE
+#	undef RGB_MATRIX_DEFAULT_MODE
 #	undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #	define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #	define RGB_MATRIX_LED_FLUSH_LIMIT 16 // default: 26
-#	define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP
+#	define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
 #	define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#	define RGB_MATRIX_STARTUP_HUE 10
-#	define RGB_MATRIX_STARTUP_SAT 255
-#	define RGB_MATRIX_STARTUP_VAL 200
-#	define RGB_MATRIX_STARTUP_SPD 75
+#	define RGB_MATRIX_DEFAULT_HUE 10
+#	define RGB_MATRIX_DEFAULT_SAT 255
+#	define RGB_MATRIX_DEFAULT_VAL 200
+#	define RGB_MATRIX_DEFAULT_SPD 75
 /* Active RBG Modes */
 /* #	undef ENABLE_RGB_MATRIX_TYPING_HEATMAP   		// How hot is your WPM! */
 /* #	undef ENABLE_RGB_MATRIX_SPLASH           		// Full gradient & value pulse away from a single key hit then fades value out */
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/config.h b/keyboards/dztech/dz65rgb/keymaps/jumper149/config.h
index 504fc7f4f3..081b2d8b41 100644
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/jumper149/config.h
@@ -58,6 +58,6 @@
 
 // Fix RGB_MATRIX_STARTUP, because RGB_MATRIX_CYCLE_ALL is disabled.
 // The actual handling of RGB_EFFECTs is done in keymap.c
-#undef RGB_MATRIX_STARTUP_MODE
+#undef RGB_MATRIX_DEFAULT_MODE
 
 #endif
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
index 25842ac186..6586ab58e4 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
@@ -6,7 +6,7 @@
 #define TAPPING_TERM 150
 
 #define TAP_HOLD_CAPS_DELAY 0
-#undef RGB_MATRIX_STARTUP_MODE
+#undef RGB_MATRIX_DEFAULT_MODE
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
 // #undef ENABLE_RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h b/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
index ef5023f8c6..e0c5522cb0 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
@@ -22,8 +22,8 @@
 #undef ENABLE_RGB_MATRIX_RAINDROPS
 #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 
-#undef RGB_MATRIX_STARTUP_MODE
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#undef RGB_MATRIX_DEFAULT_MODE
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_OUT_IN_DUAL
 
 #define RGB_MATRIX_HUE_STEP 8
 #define RGB_MATRIX_SAT_STEP 8
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index c28bcdecc2..97b61473ad 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -90,7 +90,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1110100
 #    define DRIVER_ADDR_2 0b1110111
 #    define DRIVER_COUNT 2
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index a470a7badd..44616090b9 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -90,7 +90,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b1110100
 #    define DRIVER_ADDR_2 0b1110111
 #    define DRIVER_COUNT 2
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 9925c1bf6c..a3ea0973ee 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -85,7 +85,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b0110000
 #    define DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 68
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index d4fed5139b..56e0a3a73e 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -59,7 +59,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 36
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16
-  #define RGB_MATRIX_STARTUP_VAL 150
+  #define RGB_MATRIX_DEFAULT_VAL 150
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
  #endif
 
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index ad62eb96df..2833ed0b8e 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -75,7 +75,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT              38
 #    define RGB_MATRIX_LED_FLUSH_LIMIT    16
-#    define RGB_MATRIX_STARTUP_VAL        150
+#    define RGB_MATRIX_DEFAULT_VAL        150
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #endif
 
diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h
index 1c086b3551..6b11cca284 100644
--- a/keyboards/feker/ik75/config.h
+++ b/keyboards/feker/ik75/config.h
@@ -48,7 +48,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/frooastboard/walnut/config.h b/keyboards/frooastboard/walnut/config.h
index 3015201d42..5bdb16e5ec 100644
--- a/keyboards/frooastboard/walnut/config.h
+++ b/keyboards/frooastboard/walnut/config.h
@@ -48,8 +48,8 @@
 #define ENABLE_RGB_MATRIX_PIXEL_FLOW
 
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#define RGB_MATRIX_STARTUP_HUE 0
-#define RGB_MATRIX_STARTUP_SAT 255
-#define RGB_MATRIX_STARTUP_SPD 191
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define RGB_MATRIX_DEFAULT_HUE 0
+#define RGB_MATRIX_DEFAULT_SAT 255
+#define RGB_MATRIX_DEFAULT_SPD 191
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index b9096da1d7..151c74bc37 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -84,10 +84,10 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
-#    define RGB_MATRIX_STARTUP_SAT 255
-#    define RGB_MATRIX_STARTUP_VAL 192
-#    define RGB_MATRIX_STARTUP_SPD 30
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
+#    define RGB_MATRIX_DEFAULT_SAT 255
+#    define RGB_MATRIX_DEFAULT_VAL 192
+#    define RGB_MATRIX_DEFAULT_SPD 30
 #endif //RGB_MATRIX_ENABLE
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
index 3fa2d120bc..2f2ee9aea7 100755
--- a/keyboards/gizmo_engineering/gk6/config.h
+++ b/keyboards/gizmo_engineering/gk6/config.h
@@ -52,9 +52,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGB_MATRIX_STARTUP_SPD 127
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_SPD 127
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
index 4a87c1b09c..b0360ac95d 100644
--- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
@@ -35,11 +35,11 @@
   #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-//  #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-  #define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
-  #define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
-  #define RGB_MATRIX_STARTUP_VAL 50 // Sets the default brightness value, if none has been set
-  #define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
+//  #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+  #define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
+  #define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+  #define RGB_MATRIX_DEFAULT_VAL 50 // Sets the default brightness value, if none has been set
+  #define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
 //  #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
 //  #define RGB_MATRIX_SPLIT { X, Y }     // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
                                         // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
index aee1ba39d5..dc3dfefab0 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
@@ -19,6 +19,6 @@
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_SAT 0
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h
index 9ba8a7b1b7..a4e1173e4f 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h
@@ -2,5 +2,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_SPD 0
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_SPD 0
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h
index a37fb08d31..a0fbedde49 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h
@@ -52,11 +52,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 17             // The number of steps to increment the brightness by (default 17)
 
     // Startup values, when none have been set
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
-    #define RGB_MATRIX_STARTUP_HUE 24                         // Sets the default hue value, if none has been set
-    #define RGB_MATRIX_STARTUP_SAT 255                        // Sets the default saturation value, if none has been set
-    #define RGB_MATRIX_STARTUP_VAL 127                        // Sets the default brightness value, if none has been set
-    #define RGB_MATRIX_STARTUP_SPD 127                        // Sets the default animation speed, if none has been set
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
+    #define RGB_MATRIX_DEFAULT_HUE 24                         // Sets the default hue value, if none has been set
+    #define RGB_MATRIX_DEFAULT_SAT 255                        // Sets the default saturation value, if none has been set
+    #define RGB_MATRIX_DEFAULT_VAL 127                        // Sets the default brightness value, if none has been set
+    #define RGB_MATRIX_DEFAULT_SPD 127                        // Sets the default animation speed, if none has been set
 
     // Uncomment any #undef line below to turn OFF any default enabled RGB background effect (enabled in keyboards/gmmk/pro/config.h).
     #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                      // Solid color (seems redundant; seems same as RGB_MATRIX_SOLID_COLOR?)
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h
index ed78f99eca..52f82bd60e 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h
@@ -28,7 +28,7 @@
 #define TAPPING_TERM 180
 
 #ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
index a462b569f9..f37ff59c44 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
@@ -20,7 +20,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
 
-// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 
 // Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h
index 26417b8234..0a10e8c8cf 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h
@@ -26,7 +26,7 @@
 
 /* RGB Matrix Features */
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true
 
 /* RGB Matrix Framebuffer Config */
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
index 4f83c6af1f..8d8c35af49 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
index 78ff96f8b7..91d731faca 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
@@ -22,7 +22,7 @@
 // At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best.
 #ifdef RGB_MATRIX_ENABLE
 
-// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 
 // Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/config.h
index a37fb08d31..a0fbedde49 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/config.h
@@ -52,11 +52,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 17             // The number of steps to increment the brightness by (default 17)
 
     // Startup values, when none have been set
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
-    #define RGB_MATRIX_STARTUP_HUE 24                         // Sets the default hue value, if none has been set
-    #define RGB_MATRIX_STARTUP_SAT 255                        // Sets the default saturation value, if none has been set
-    #define RGB_MATRIX_STARTUP_VAL 127                        // Sets the default brightness value, if none has been set
-    #define RGB_MATRIX_STARTUP_SPD 127                        // Sets the default animation speed, if none has been set
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default effect mode, if none has been set (was RGB_MATRIX_SOLID_COLOR)
+    #define RGB_MATRIX_DEFAULT_HUE 24                         // Sets the default hue value, if none has been set
+    #define RGB_MATRIX_DEFAULT_SAT 255                        // Sets the default saturation value, if none has been set
+    #define RGB_MATRIX_DEFAULT_VAL 127                        // Sets the default brightness value, if none has been set
+    #define RGB_MATRIX_DEFAULT_SPD 127                        // Sets the default animation speed, if none has been set
 
     // Uncomment any #undef line below to turn OFF any default enabled RGB background effect (enabled in keyboards/gmmk/pro/config.h).
     #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                      // Solid color (seems redundant; seems same as RGB_MATRIX_SOLID_COLOR?)
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h
index fa7ebec7e5..539f78874a 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h
@@ -28,7 +28,7 @@
 #define TAPPING_TERM 180
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
 
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
index 105efad960..91fce71359 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #if defined(RGB_MATRIX_ENABLE)
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
      // number of milliseconds to wait until turning off RGB automatically
     #define RGB_MATRIX_TIMEOUT 300000 // 300 seconds / 5 min
     // start fading out before getting disabled
diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h
index d1c75d0c79..cbbb859114 100644
--- a/keyboards/gopolar/gg86/config.h
+++ b/keyboards/gopolar/gg86/config.h
@@ -43,7 +43,7 @@
     #define RGB_DI_PIN E2
     #define RGB_MATRIX_LED_COUNT 100
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
 
     /* RGB Matrix effect */
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
index c598952e94..5d740986fb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         { 32, 32  }
 #define SPLIT_TRANSPORT_MIRROR
 
-// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP // Sets the default mode, if none has been set
+// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP // Sets the default mode, if none has been set
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
 
diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h
index 40c3daf584..d1d16c8571 100644
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index 9381b678c6..3c972e748c 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -41,7 +41,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 86
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 227fad06ec..b26e7489a6 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -64,7 +64,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 24
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
     /* RGB Matrix config */
     #define RGB_DI_PIN C14
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index 4e952e2775..67ae5a9dd3 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -35,7 +35,7 @@
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 61
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 565e4126ca..94865caac0 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -35,7 +35,7 @@
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 64
diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index 3f67b4b10d..1a38a939f2 100644
--- a/keyboards/input_club/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
@@ -224,10 +224,10 @@ void matrix_init_kb(void) {
      * Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c),
      * and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot.
      */
-#    if !defined(RGB_MATRIX_STARTUP_SPD)
-#        define RGB_MATRIX_STARTUP_SPD UINT8_MAX / 2
+#    if !defined(RGB_MATRIX_DEFAULT_SPD)
+#        define RGB_MATRIX_DEFAULT_SPD UINT8_MAX / 2
 #    endif
-    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD),
+    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD),
     rgb_matrix_set_flags(LED_FLAG_ALL);
 #endif
 
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
index 31e4bff4b6..c40495c8de 100644
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
+++ b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
@@ -20,7 +20,7 @@
 #ifdef RGB_MATRIX_ENABLE
 // #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINDROPS
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINDROPS
 
 // #    define DEBUG_MATRIX_SCAN_RATE
 
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index 206b971aa3..f7e7f79a58 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -33,7 +33,7 @@
 #define RGB_MATRIX_TIMEOUT 90000
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
  // RGB Matrix Animation modes. Explicitly enabled
  // For full list of effects, see:
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index 2dd8182ddd..3116c774a0 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -75,7 +75,7 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspendedz
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define RGB_MATRIX_HUE_STEP 8
 #define RGB_MATRIX_SAT_STEP 8
 #define RGB_MATRIX_VAL_STEP 8
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index 9cfc6702b4..91ca6be4bc 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -81,8 +81,8 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 108
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index 3dc2f28b50..87d0bb51c7 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -81,8 +81,8 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 109
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index 63100696e9..2438b4a16e 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -38,8 +38,8 @@
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DRIVER_ADDR_1 0b0110000
 #    define DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 83
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
index 4955c0b136..2b0947ace5 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
@@ -28,10 +28,10 @@
 #define TAPPING_TERM 180
 
 #ifdef RGB_MATRIX_ENABLE
-    #ifdef RGB_MATRIX_STARTUP_MODE
-        #undef RGB_MATRIX_STARTUP_MODE
+    #ifdef RGB_MATRIX_DEFAULT_MODE
+        #undef RGB_MATRIX_DEFAULT_MODE
     #endif
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h
index 2d2dc00132..c66f49213a 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h
@@ -37,5 +37,5 @@
 #define RETRO_TAPPING
 #define PERMISSIVE_HOLD
 
-#undef RGB_MATRIX_STARTUP_MODE
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CUSTOM_RGB_STATIC
+#undef RGB_MATRIX_DEFAULT_MODE
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CUSTOM_RGB_STATIC
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
index 929946a231..db00e5ee7f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@@ -62,7 +62,7 @@
 // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
 #define DRIVER_COUNT 2
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
index 94f8500f98..a3e81a9622 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@@ -12,7 +12,7 @@
 #define DEBOUNCE 3
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index 86ab159e3e..f623d028b8 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -85,7 +85,7 @@
 
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 67
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 4d3d08a513..bd5ee4f9c7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -50,7 +50,7 @@
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define RGB_MATRIX_HUE_STEP 8
 #    define RGB_MATRIX_SAT_STEP 8
 #    define RGB_MATRIX_VAL_STEP 8
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index afca6e996b..00311ab2a7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -39,7 +39,7 @@
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define RGB_MATRIX_HUE_STEP 8
 #    define RGB_MATRIX_SAT_STEP 8
 #    define RGB_MATRIX_VAL_STEP 8
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index ba2b1e96b8..7b0b538493 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -75,7 +75,7 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspendedz
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define RGB_MATRIX_HUE_STEP 8
 #define RGB_MATRIX_SAT_STEP 8
 #define RGB_MATRIX_VAL_STEP 8
diff --git a/keyboards/kbdfans/maja/config.h b/keyboards/kbdfans/maja/config.h
index 3ae0403cf3..50043a5c68 100755
--- a/keyboards/kbdfans/maja/config.h
+++ b/keyboards/kbdfans/maja/config.h
@@ -62,7 +62,7 @@
 // #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110110
 #define DRIVER_COUNT 2
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index b0629454b0..b9910a9842 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -33,7 +33,7 @@
 #define RGB_MATRIX_KEYPRESSES 
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index afac3376a4..1da88b0013 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -80,7 +80,7 @@
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
-#        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 2f6d18efcd..5742bf4566 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
-#        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 632514e87e..69ea7556fe 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 632514e87e..69ea7556fe 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index ee55576d8c..7c683a19c9 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -112,7 +112,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 //#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h
index 664ad11535..14ce6d29f1 100644
--- a/keyboards/keebio/sinc/rev3/config.h
+++ b/keyboards/keebio/sinc/rev3/config.h
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGB_DI_PIN GP18
 #define RGB_MATRIX_LED_COUNT 113
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/teimor/config.h b/keyboards/keychron/q1/rev_0100/keymaps/teimor/config.h
index c3c10a1c2b..4378af4f58 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/teimor/config.h
+++ b/keyboards/keychron/q1/rev_0100/keymaps/teimor/config.h
@@ -27,6 +27,6 @@
 #    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
 #    define CAPS_LOCK_INDICATOR_LIGHT_60
 #    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR        // Sets the default mode, if none has been set
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS  // Sets the default brightness value, if none has been set
+#    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/q1/rev_0102/keymaps/victorsavu3/config.h b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
index 4019f83429..02f08db4a7 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
+++ b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
@@ -56,7 +56,7 @@
 #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
 #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
 
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
index 2534ffd554..7618683d10 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
@@ -51,6 +51,6 @@
 #    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 #    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef RGB_MATRIX_STARTUP_MODE
+#    undef RGB_MATRIX_DEFAULT_MODE
 // #    define RGBLIGHT_HUE_STEP 20
 #endif
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
index e71078415a..cbadc54901 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
@@ -77,7 +77,7 @@
 #    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
 #    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 
-#    undef RGB_MATRIX_STARTUP_MODE
+#    undef RGB_MATRIX_DEFAULT_MODE
 
 #    define RGBLIGHT_HUE_STEP 20
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
index 31a316da6d..40ba18a293 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/config.h
@@ -32,7 +32,7 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 
 
-//#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+//#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
 
 #ifdef RGB_MATRIX_ENABLE
@@ -79,7 +79,7 @@
 //#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 //#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    undef RGB_MATRIX_STARTUP_MODE
+#    undef RGB_MATRIX_DEFAULT_MODE
 
 #    define RGBLIGHT_HUE_STEP 20
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
index 5879e4b08c..508f98c053 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/config.h
@@ -32,7 +32,7 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 
 
-//#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+//#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
 
 #ifdef RGB_MATRIX_ENABLE
@@ -79,7 +79,7 @@
 //#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 //#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    undef RGB_MATRIX_STARTUP_MODE
+#    undef RGB_MATRIX_DEFAULT_MODE
 
 #    define RGBLIGHT_HUE_STEP 20
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
index a7290df6b3..70f92bafde 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/config.h
@@ -32,7 +32,7 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 
 
-//#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+//#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLIGHT_LIMIT_VAL 10
 
 #ifdef RGB_MATRIX_ENABLE
@@ -79,7 +79,7 @@
 //#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 //#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    undef RGB_MATRIX_STARTUP_MODE
+#    undef RGB_MATRIX_DEFAULT_MODE
 
 #    define RGBLIGHT_HUE_STEP 20
 
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index d6cdad742d..39294b15ed 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -63,7 +63,7 @@
 
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
 #    define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
 #    define DISABLE_RGB_MATRIX_RAINDROPS
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index 9f5a68ca94..764bce8919 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -99,7 +99,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_BAND_SAT
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BAND_SAT
 /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_SLEEP 
 /*== all animations enable ==*/
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index 183d226d8c..e464db1e36 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -58,7 +58,7 @@
 #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_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
+#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)
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index 7b2fff263c..865f5d502b 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -59,11 +59,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
-#define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
-#define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
+#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
 // #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index 7a5269c3da..6062ebbbbb 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
@@ -43,7 +43,7 @@
 // #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_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
+// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
 // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/kprepublic/bm80v2/config.h b/keyboards/kprepublic/bm80v2/config.h
index dfca28c93d..1326eae3e1 100644
--- a/keyboards/kprepublic/bm80v2/config.h
+++ b/keyboards/kprepublic/bm80v2/config.h
@@ -29,7 +29,7 @@
 #define DEBOUNCE 5
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/kprepublic/bm80v2_iso/config.h b/keyboards/kprepublic/bm80v2_iso/config.h
index f20519553e..283a077382 100644
--- a/keyboards/kprepublic/bm80v2_iso/config.h
+++ b/keyboards/kprepublic/bm80v2_iso/config.h
@@ -29,7 +29,7 @@
 #define DEBOUNCE 5
 /* disable these deprecated features by default */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
index b34a8a7b17..a4f340ba5f 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
@@ -23,4 +23,4 @@
 #define RGB_MATRIX_KEYPRESSES
 
 #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_MULTISPLASH
\ No newline at end of file
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_MULTISPLASH
\ No newline at end of file
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 008a171724..e366a62668 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index 34c40c83f5..6a75578801 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -56,7 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 6ec87d541e..5bf82d9f5a 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 05c2ec8a46..d98ce30652 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -133,7 +133,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 //   #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
index 2d786af9b7..7dec786b79 100644
--- a/keyboards/massdrop/alt/keymaps/b_/config.h
+++ b/keyboards/massdrop/alt/keymaps/b_/config.h
@@ -50,28 +50,28 @@
 
 
 //Teal and Blue
-//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 47 			// Used to determine the color for the modifiers
+//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 47 			// Used to determine the color for the modifiers
 
 //Teal and Blue
-//#define RGB_MATRIX_STARTUP_HUE 120 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 50 			//Used to determine the color for the modifiers
+//#define RGB_MATRIX_DEFAULT_HUE 120 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 50 			//Used to determine the color for the modifiers
 
 
 //QMK HSV is based on 255 value wheel rather than 360
 
 //Cyan and Yellow
-//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 177
+//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 177
 
 //Cyan and Green
-//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 215
+//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 215
 
-// #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+// #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
-#define RGB_MATRIX_STARTUP_HUE 180  //purple  alphas with green background when pressed.
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_HUE 180  //purple  alphas with green background when pressed.
 
 // This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins/config.h b/keyboards/massdrop/alt/keymaps/jdelkins/config.h
index 29c35ccc57..6efa3dbaee 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins/config.h
+++ b/keyboards/massdrop/alt/keymaps/jdelkins/config.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#define RGB_MATRIX_STARTUP_SPD 20
+#define RGB_MATRIX_DEFAULT_SPD 20
 #define AUTO_SHIFT_TIMEOUT 160
 #define LEADER_TIMEOUT 400
 #define LEADER_PER_KEY_TIMING
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins_ss/config.h b/keyboards/massdrop/alt/keymaps/jdelkins_ss/config.h
index a768f8bd22..20efebec16 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins_ss/config.h
+++ b/keyboards/massdrop/alt/keymaps/jdelkins_ss/config.h
@@ -17,4 +17,4 @@
 
 #pragma once
 
-#define RGB_MATRIX_STARTUP_SPD 20
+#define RGB_MATRIX_DEFAULT_SPD 20
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 0a3fa733e1..90892cc802 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -62,28 +62,28 @@
 
 
 //Teal and Blue
-//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 47 			// Used to determine the color for the modifiers
+//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 47 			// Used to determine the color for the modifiers
 
 //Teal and Blue
-//#define RGB_MATRIX_STARTUP_HUE 120 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 50 			//Used to determine the color for the modifiers
+//#define RGB_MATRIX_DEFAULT_HUE 120 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 50 			//Used to determine the color for the modifiers
 
 
 //QMK HSV is based on 255 value wheel rather than 360
 
 //Cyan and Yellow
-//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 177
+//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 177
 
 //Cyan and Green
-//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
-//#define RGB_MATRIX_STARTUP_SPD 215
+//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
+//#define RGB_MATRIX_DEFAULT_SPD 215
 
-// #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+// #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
-#define RGB_MATRIX_STARTUP_HUE 180  //purple  alphas with green background when pressed.
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_HUE 180  //purple  alphas with green background when pressed.
 // #define RGBLIGHT_HUE_STEP 12        						// Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        						// Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        						// Units to step when in/decreasing value (brightness)
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 7dd870bd2b..1a7c77b90e 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -43,7 +43,7 @@
 #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_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
+#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)
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
index e4eddc0fff..9b9d199f08 100644
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
@@ -25,10 +25,10 @@
 #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_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default mode, if none has been set
-#define RGB_MATRIX_STARTUP_HUE 12
-#define RGB_MATRIX_STARTUP_SPD (UINT8_MAX / 2 + 32)
-#define RGB_MATRIX_STARTUP_VAL 96
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_HUE 12
+#define RGB_MATRIX_DEFAULT_SPD (UINT8_MAX / 2 + 32)
+#define RGB_MATRIX_DEFAULT_VAL 96
 // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
 // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
 // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index 3050314bdd..deb40efb7d 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS  // Sets the default mode, if none has been set
+#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)
diff --git a/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h b/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
index e536ebdd85..1db01e90cb 100644
--- a/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define FORCE_NKRO
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_VAL 100
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_VAL 100
 #define HSV_BACKLIGHT_COLOR HSV_BLUE
 #define HSV_GAME_COLOR      170, 255, 192 // darker blue
 #define HSV_CONTROL_COLOR   0,   255, 192 // darker red
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index f36cd7b809..767fbaffca 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -59,7 +59,7 @@
 #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_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
+#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)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index 76ebe5fd3a..cb8a0687f8 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -11,7 +11,7 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index f17e1f9303..6a50274f58 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -39,7 +39,7 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 65a189b9de..92fa229523 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -59,7 +59,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index d314f17125..0f91dd6efa 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -35,7 +35,7 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h
index bf8172b994..9033ee59b2 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h
@@ -9,7 +9,7 @@
 // #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index 4f10622c85..aff3a43340 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -37,7 +37,7 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
index 868ea8a291..a609587210 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -83,9 +83,9 @@
 #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define DRIVER_ADDR_1 0b0110010
 #define DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 91
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
index 878319836c..18d7eb8dfa 100755
--- a/keyboards/melgeek/mach80/config.h
+++ b/keyboards/melgeek/mach80/config.h
@@ -32,8 +32,8 @@
 #define DISABLE_RGB_MATRIX_SPLASH
 #define DISABLE_RGB_MATRIX_MULTISPLASH
 #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 
diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h
index 368538666b..a72c6c67a2 100644
--- a/keyboards/melgeek/mj61/config.h
+++ b/keyboards/melgeek/mj61/config.h
@@ -77,7 +77,7 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mj63/config.h b/keyboards/melgeek/mj63/config.h
index 368538666b..a72c6c67a2 100644
--- a/keyboards/melgeek/mj63/config.h
+++ b/keyboards/melgeek/mj63/config.h
@@ -77,7 +77,7 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mj64/config.h b/keyboards/melgeek/mj64/config.h
index 368538666b..a72c6c67a2 100644
--- a/keyboards/melgeek/mj64/config.h
+++ b/keyboards/melgeek/mj64/config.h
@@ -77,7 +77,7 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/config.h
index 85dd49a4ca..0351d27b9c 100644
--- a/keyboards/melgeek/mj65/config.h
+++ b/keyboards/melgeek/mj65/config.h
@@ -77,7 +77,7 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/mojo68/config.h
index 058c8eeccb..58d5d0c5a5 100755
--- a/keyboards/melgeek/mojo68/config.h
+++ b/keyboards/melgeek/mojo68/config.h
@@ -76,7 +76,7 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h
index e354fcb40e..328410cc0b 100644
--- a/keyboards/melgeek/mojo75/config.h
+++ b/keyboards/melgeek/mojo75/config.h
@@ -77,8 +77,8 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h
index 9a5a5ed2ce..8f7ca63201 100755
--- a/keyboards/melgeek/tegic/config.h
+++ b/keyboards/melgeek/tegic/config.h
@@ -29,8 +29,8 @@
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h
index 357f67e691..2483426f88 100644
--- a/keyboards/melgeek/z70ultra/config.h
+++ b/keyboards/melgeek/z70ultra/config.h
@@ -76,8 +76,8 @@
 // #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 69
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h
index ee7a07fd20..8ddeca7a71 100644
--- a/keyboards/ml/gas75/config.h
+++ b/keyboards/ml/gas75/config.h
@@ -45,7 +45,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 3
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
 
     /* RGB Matrix config */
diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
index 792cdcc6b3..4c2e15a38f 100644
--- a/keyboards/mss_studio/m63_rgb/config.h
+++ b/keyboards/mss_studio/m63_rgb/config.h
@@ -39,7 +39,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 75
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h
index 90b5ae5130..4bb1a889fd 100644
--- a/keyboards/mss_studio/m64_rgb/config.h
+++ b/keyboards/mss_studio/m64_rgb/config.h
@@ -39,7 +39,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 76
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index dc03c26724..06a38ee389 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -40,7 +40,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 #define RGB_MATRIX_LED_PROCESS_LIMIT 20
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index 043152d12a..27d6ad9e94 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -41,7 +41,7 @@
 	#define RGB_MATRIX_KEYPRESSES
 	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 	#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 	#define RGB_MATRIX_LED_PROCESS_LIMIT 20
 	#define RGB_MATRIX_LED_FLUSH_LIMIT 26
 	#define DRIVER_ADDR_1 0b1010000
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h
index 7c0f4e087b..9657eea13c 100644
--- a/keyboards/mwstudio/alicekk/config.h
+++ b/keyboards/mwstudio/alicekk/config.h
@@ -41,7 +41,7 @@
 #define RGB_DI_PIN B1
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLED_NUM 87
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h
index 1da7c25390..e5c5e62e11 100644
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ b/keyboards/mwstudio/mw65_rgb/config.h
@@ -45,7 +45,7 @@
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 83
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
 
     /* RGB Matrix effect */
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index b5a8f15804..c08ce5018b 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -39,7 +39,7 @@
 #define RGBLIGHT_SLEEP
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGB_MATRIX_LED_COUNT 97
 #define RGBLED_NUM 97
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index 1fd6a345d1..692ed3cd73 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -39,7 +39,7 @@
 #define RGBLIGHT_SLEEP
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGB_MATRIX_LED_COUNT 21
 #define RGBLED_NUM 21
 
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index d5e2d8a58e..ad7c7d423f 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLED_NUM 52
     #define RGB_MATRIX_LED_COUNT RGBLED_NUM
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
-    #define RGB_MATRIX_STARTUP_VAL 64
+    #define RGB_MATRIX_DEFAULT_VAL 64
     #define RGB_MATRIX_HUE_STEP 10
     #define RGB_MATRIX_SAT_STEP 10
     #define RGB_MATRIX_VAL_STEP 10
diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h
index 87b153c736..ba07576ee2 100644
--- a/keyboards/opendeck/32/rev1/config.h
+++ b/keyboards/opendeck/32/rev1/config.h
@@ -31,7 +31,7 @@
 #define DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT (4 * 8 * 3)
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_SPIRAL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_SPIRAL
 #define RGB_MATRIX_DISABLE_KEYCODES
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index a20294ce32..e80d241392 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_LED_PROCESS_LIMIT  4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT    26
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_STARTUP_VAL        128
+#    define RGB_MATRIX_DEFAULT_VAL        128
 #    define DRIVER_ADDR_1                 0b0110000
 #    define DRIVER_COUNT                  1
 #    define RGB_MATRIX_LED_COUNT              67
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index a4d828e889..d31e727dfc 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -66,7 +66,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_LED_PROCESS_LIMIT  4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT    26
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_STARTUP_VAL        128
+#    define RGB_MATRIX_DEFAULT_VAL        128
 #    define DRIVER_ADDR_1                 0b0110000
 #    define DRIVER_COUNT                  1
 #    define RGB_MATRIX_LED_COUNT              71
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index aec0cdfe5e..ce49b57c9f 100644
--- a/keyboards/percent/canoe_gen2/config.h
+++ b/keyboards/percent/canoe_gen2/config.h
@@ -51,11 +51,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_LED_COUNT 77
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define RGB_MATRIX_STARTUP_HUE 0
-#define RGB_MATRIX_STARTUP_SAT 255
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGB_MATRIX_STARTUP_SPD 127
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_HUE 0
+#define RGB_MATRIX_DEFAULT_SAT 255
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_DEFAULT_SPD 127
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/planck/keymaps/oryx/config.h b/keyboards/planck/keymaps/oryx/config.h
index e6250bb39a..d00398621d 100644
--- a/keyboards/planck/keymaps/oryx/config.h
+++ b/keyboards/planck/keymaps/oryx/config.h
@@ -32,7 +32,7 @@
 #define ORYX_CONFIGURATOR
 #define USB_SUSPEND_WAKEUP_DELAY 0
 #define FIRMWARE_VERSION u8"vAxxa/ZlQEV"
-#define RGB_MATRIX_STARTUP_SPD 60
+#define RGB_MATRIX_DEFAULT_SPD 60
 
 #define PLANCK_EZ_LED_LOWER 1
 #define PLANCK_EZ_LED_RAISE 2
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index c6f03af638..f0cb26520e 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -41,7 +41,7 @@
 #ifdef RGB_MATRIX_ENABLE
 	#define RGB_MATRIX_KEYPRESSES
 	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-	#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+	#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 	#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 	#define RGB_MATRIX_LED_PROCESS_LIMIT 20
 	#define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index 943423d0eb..d01da81268 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -79,5 +79,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //    #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 //    #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 //    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 225 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-//    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
+//    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
 #endif
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index 24106a4ef1..0d67c4e9ea 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -39,7 +39,7 @@
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 /* Enable the cycle left right animation and set it as the startup mode */
 #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/s_ol/0xc_pad/keymaps/default/config.h b/keyboards/s_ol/0xc_pad/keymaps/default/config.h
index 194cb5a200..d17fe2a521 100644
--- a/keyboards/s_ol/0xc_pad/keymaps/default/config.h
+++ b/keyboards/s_ol/0xc_pad/keymaps/default/config.h
@@ -15,4 +15,4 @@
  */
 #pragma once
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CUSTOM_RGB_TESTING
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CUSTOM_RGB_TESTING
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
index d1cb2f50d5..6106dc4e3d 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
@@ -35,11 +35,11 @@
   #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-//  #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-  #define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
-  #define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
-  #define RGB_MATRIX_STARTUP_VAL 50 // Sets the default brightness value, if none has been set
-  #define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
+//  #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+  #define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
+  #define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+  #define RGB_MATRIX_DEFAULT_VAL 50 // Sets the default brightness value, if none has been set
+  #define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
 //  #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
 //  #define RGB_MATRIX_SPLIT { X, Y }     // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
                                         // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index 7c118e2928..eb9193b317 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -64,7 +64,7 @@
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Sets the default mode, if none has been set
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index 6035973a03..c29891b1f1 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160   // limit brightness to not overamp the USB
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
 #define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index da8fcef7f8..f11599c525 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
   #else
     #define RGBLIGHT_LED_MAP { 0,1,2,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,3,4,5,6, \
                               26,27,28,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,29,30,31,32 }
diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h
index 508e4e1eff..c3694d1292 100644
--- a/keyboards/sofle/keymaps/devdev/config.h
+++ b/keyboards/sofle/keymaps/devdev/config.h
@@ -88,7 +88,7 @@
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
 
 #    define RGB_MATRIX_HUE_STEP 8
 #    define RGB_MATRIX_SAT_STEP 8
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index 508e4e1eff..c3694d1292 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -88,7 +88,7 @@
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
 
 #    define RGB_MATRIX_HUE_STEP 8
 #    define RGB_MATRIX_SAT_STEP 8
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 739a3c78f8..0431b9ab17 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -51,11 +51,11 @@
 // Limit brightness to support USB-A at 0.5 A
 // TODO: Do this dynamically based on power source
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 176                          // Limits maximum brightness of LEDs to 176 out of 255. If not defined, maximum brightness is set to 255
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Sets the default mode, if none has been set
-#    define RGB_MATRIX_STARTUP_HUE 142                                 // Sets the default hue value, if none has been set
-#    define RGB_MATRIX_STARTUP_SAT 255                                 // Sets the default saturation value, if none has been set
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS       // Sets the default brightness value, if none has been set
-#    define RGB_MATRIX_STARTUP_SPD 127                                 // Sets the default animation speed, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_HUE 142                                 // Sets the default hue value, if none has been set
+#    define RGB_MATRIX_DEFAULT_SAT 255                                 // Sets the default saturation value, if none has been set
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS       // Sets the default brightness value, if none has been set
+#    define RGB_MATRIX_DEFAULT_SPD 127                                 // Sets the default animation speed, if none has been set
 #    define RGB_MATRIX_DISABLE_KEYCODES                                // Disables control of rgb matrix by keycodes (must use code functions to control the feature)
 
 #    define ENABLE_RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/system76/system76_ec.c b/keyboards/system76/system76_ec.c
index 5474181eca..6301659072 100644
--- a/keyboards/system76/system76_ec.c
+++ b/keyboards/system76/system76_ec.c
@@ -136,13 +136,13 @@ rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {
     // Layer 0
     {
         .enable = 1,
-        .mode = RGB_MATRIX_STARTUP_MODE,
+        .mode = RGB_MATRIX_DEFAULT_MODE,
         .hsv = {
-            .h = RGB_MATRIX_STARTUP_HUE,
-            .s = RGB_MATRIX_STARTUP_SAT,
-            .v = RGB_MATRIX_STARTUP_VAL,
+            .h = RGB_MATRIX_DEFAULT_HUE,
+            .s = RGB_MATRIX_DEFAULT_SAT,
+            .v = RGB_MATRIX_DEFAULT_VAL,
         },
-        .speed = RGB_MATRIX_STARTUP_SPD,
+        .speed = RGB_MATRIX_DEFAULT_SPD,
         .flags = LED_FLAG_KEYLIGHT,
     },
     // Layer 1
@@ -150,11 +150,11 @@ rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {
         .enable = 1,
         .mode = RGB_MATRIX_CUSTOM_active_keys,
         .hsv = {
-            .h = RGB_MATRIX_STARTUP_HUE,
-            .s = RGB_MATRIX_STARTUP_SAT,
-            .v = RGB_MATRIX_STARTUP_VAL,
+            .h = RGB_MATRIX_DEFAULT_HUE,
+            .s = RGB_MATRIX_DEFAULT_SAT,
+            .v = RGB_MATRIX_DEFAULT_VAL,
         },
-        .speed = RGB_MATRIX_STARTUP_SPD,
+        .speed = RGB_MATRIX_DEFAULT_SPD,
         .flags = LED_FLAG_KEYLIGHT,
     },
     // Layer 2
@@ -162,11 +162,11 @@ rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {
         .enable = 1,
         .mode = RGB_MATRIX_CUSTOM_active_keys,
         .hsv = {
-            .h = RGB_MATRIX_STARTUP_HUE,
-            .s = RGB_MATRIX_STARTUP_SAT,
-            .v = RGB_MATRIX_STARTUP_VAL,
+            .h = RGB_MATRIX_DEFAULT_HUE,
+            .s = RGB_MATRIX_DEFAULT_SAT,
+            .v = RGB_MATRIX_DEFAULT_VAL,
         },
-        .speed = RGB_MATRIX_STARTUP_SPD,
+        .speed = RGB_MATRIX_DEFAULT_SPD,
         .flags = LED_FLAG_KEYLIGHT,
     },
     // Layer 3
@@ -174,11 +174,11 @@ rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {
         .enable = 1,
         .mode = RGB_MATRIX_CUSTOM_active_keys,
         .hsv = {
-            .h = RGB_MATRIX_STARTUP_HUE,
-            .s = RGB_MATRIX_STARTUP_SAT,
-            .v = RGB_MATRIX_STARTUP_VAL,
+            .h = RGB_MATRIX_DEFAULT_HUE,
+            .s = RGB_MATRIX_DEFAULT_SAT,
+            .v = RGB_MATRIX_DEFAULT_VAL,
         },
-        .speed = RGB_MATRIX_STARTUP_SPD,
+        .speed = RGB_MATRIX_DEFAULT_SPD,
         .flags = LED_FLAG_KEYLIGHT,
     },
 };
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index 328aafc6e4..27c237ad75 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -57,7 +57,7 @@
 #    define RGB_MATRIX_SAT_STEP 8
 #    define RGB_MATRIX_VAL_STEP 8
 #    define RGB_MATRIX_SPD_STEP 10
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL  // default mode
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL  // default mode
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index bdee171b25..de94e2f662 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -52,11 +52,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_STARTUP_HUE 108 // Sets the default hue value, if none has been set
-#define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
-#define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_HUE 108 // Sets the default hue value, if none has been set
+#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index fc1ce6c902..9ad0e83a2c 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -82,7 +82,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_LED_COUNT 9
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index de72eaf20a..6dea07c518 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -124,8 +124,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
-#define RGB_MATRIX_STARTUP_HUE 191 // Sets the default hue value, if none has been set
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
+#define RGB_MATRIX_DEFAULT_HUE 191 // Sets the default hue value, if none has been set
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index f47695ea91..90199e77cd 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -36,7 +36,7 @@
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
 #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
 #    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 6f999e0e07..68cb778e56 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -36,7 +36,7 @@
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
 #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
 #    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index e38f0b61e1..d04d2c1f1e 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -33,12 +33,12 @@
 #    define RGB_MATRIX_CENTER \
         { 92, 33 }
 
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
 #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
 #    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 6c6a86c5d6..8adae138df 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -36,7 +36,7 @@
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
 #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
 #    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index c8627fd2da..d492e27e4a 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -35,7 +35,7 @@
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
 #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
 #    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index 755e2c9000..421243cead 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -50,7 +50,7 @@
 #define ISSI_DRIVER_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + WS2812_LED_TOTAL)
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_KEYPRESSES
 
 // enable/disable LEDs based on layout
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 9561596fd0..c3dbc5fcca 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -44,9 +44,9 @@
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 32
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
 
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 9b14fbcbf5..2cc2506866 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -61,11 +61,11 @@
 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #define ISSI_DRIVER_TOTAL RGB_MATRIX_LED_COUNT
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 52a8331867..f72a9e1945 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -58,11 +58,11 @@
 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 #define ISSI_DRIVER_TOTAL RGB_MATRIX_LED_COUNT
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 875d8e988f..4599546149 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -77,7 +77,7 @@
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CUSTOM_test_mode
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CUSTOM_test_mode
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h
index d1a40a4dce..f223e89b75 100644
--- a/keyboards/yncognito/batpad/config.h
+++ b/keyboards/yncognito/batpad/config.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index ea5a4b5739..f4d5b167e2 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -61,9 +61,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 //      HSV_TEAL
-//        #define RGB_MATRIX_STARTUP_HUE 128
-//        #define RGB_MATRIX_STARTUP_SAT 255
-        #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+//        #define RGB_MATRIX_DEFAULT_HUE 128
+//        #define RGB_MATRIX_DEFAULT_SAT 255
+        #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_MATRIX_HUE_STEP 8
 #    define RGB_MATRIX_SAT_STEP 8
 #    define RGB_MATRIX_VAL_STEP 8
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 539ca0e100..e7125bb87f 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -81,29 +81,29 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
 #    define RGB_MATRIX_SPD_STEP 16
 #endif
 
-#if !defined(RGB_MATRIX_STARTUP_MODE)
+#if !defined(RGB_MATRIX_DEFAULT_MODE)
 #    ifdef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#        define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#        define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 #    else
 // fallback to solid colors if RGB_MATRIX_CYCLE_LEFT_RIGHT is disabled in userspace
-#        define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#        define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 #    endif
 #endif
 
-#if !defined(RGB_MATRIX_STARTUP_HUE)
-#    define RGB_MATRIX_STARTUP_HUE 0
+#if !defined(RGB_MATRIX_DEFAULT_HUE)
+#    define RGB_MATRIX_DEFAULT_HUE 0
 #endif
 
-#if !defined(RGB_MATRIX_STARTUP_SAT)
-#    define RGB_MATRIX_STARTUP_SAT UINT8_MAX
+#if !defined(RGB_MATRIX_DEFAULT_SAT)
+#    define RGB_MATRIX_DEFAULT_SAT UINT8_MAX
 #endif
 
-#if !defined(RGB_MATRIX_STARTUP_VAL)
-#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#if !defined(RGB_MATRIX_DEFAULT_VAL)
+#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #endif
 
-#if !defined(RGB_MATRIX_STARTUP_SPD)
-#    define RGB_MATRIX_STARTUP_SPD UINT8_MAX / 2
+#if !defined(RGB_MATRIX_DEFAULT_SPD)
+#    define RGB_MATRIX_DEFAULT_SPD UINT8_MAX / 2
 #endif
 
 // globals
@@ -146,9 +146,9 @@ void eeconfig_update_rgb_matrix(void) {
 void eeconfig_update_rgb_matrix_default(void) {
     dprintf("eeconfig_update_rgb_matrix_default\n");
     rgb_matrix_config.enable = 1;
-    rgb_matrix_config.mode   = RGB_MATRIX_STARTUP_MODE;
-    rgb_matrix_config.hsv    = (HSV){RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL};
-    rgb_matrix_config.speed  = RGB_MATRIX_STARTUP_SPD;
+    rgb_matrix_config.mode   = RGB_MATRIX_DEFAULT_MODE;
+    rgb_matrix_config.hsv    = (HSV){RGB_MATRIX_DEFAULT_HUE, RGB_MATRIX_DEFAULT_SAT, RGB_MATRIX_DEFAULT_VAL};
+    rgb_matrix_config.speed  = RGB_MATRIX_DEFAULT_SPD;
     rgb_matrix_config.flags  = LED_FLAG_ALL;
     eeconfig_flush_rgb_matrix(true);
 }
diff --git a/users/cedrikl/config.h b/users/cedrikl/config.h
index 741a2fe470..8df38348d2 100644
--- a/users/cedrikl/config.h
+++ b/users/cedrikl/config.h
@@ -18,8 +18,8 @@
 #pragma once
 
 #ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-    //#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+    //#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
-    #define RGB_MATRIX_STARTUP_VAL 120
+    #define RGB_MATRIX_DEFAULT_VAL 120
 #endif
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index 029ffd65ad..59b8cd7e42 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -43,7 +43,7 @@
 #            define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN
 #        endif
 #    endif
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_REST_MODE
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_REST_MODE
 #endif
 
 #ifdef MOUSEKEY_ENABLE
diff --git a/users/jonavin/config.h b/users/jonavin/config.h
index d694bc5371..8c5451075c 100644
--- a/users/jonavin/config.h
+++ b/users/jonavin/config.h
@@ -26,9 +26,9 @@
 #define TAPPING_TERM_PER_KEY
 
 #ifdef RGB_MATRIX_ENABLE
-    #ifdef RGB_MATRIX_STARTUP_MODE
-        #undef RGB_MATRIX_STARTUP_MODE
+    #ifdef RGB_MATRIX_DEFAULT_MODE
+        #undef RGB_MATRIX_DEFAULT_MODE
     #endif
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
     #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
diff --git a/users/tominabox1/config.h b/users/tominabox1/config.h
index cf5d317fb7..7d338005f1 100644
--- a/users/tominabox1/config.h
+++ b/users/tominabox1/config.h
@@ -45,7 +45,7 @@
   #define RGB_MATRIX_SAT_STEP 8
   #define RGB_MATRIX_VAL_STEP 8
   #define RGB_MATRIX_SPD_STEP 10
-  #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+  #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
   /* Disable the animations you don't want/need.  You will need to disable a good number of these
     because they take up a lot of space.  Disable until you can successfully compile your firmware. */
 // #undef ENABLE_RGB_MATRIX_ALPHAS_MODS

From 9b51f02f45f72758a61d761c2d8e1b1696cce6e8 Mon Sep 17 00:00:00 2001
From: Christopher Hoage <iam@chrishoage.com>
Date: Sat, 26 Nov 2022 15:07:35 -0800
Subject: [PATCH 933/959] Fix encoder_init call order in keyboard_init (#19140)

---
 quantum/keyboard.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 83ade7829a..37675ded0b 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -353,6 +353,9 @@ void keyboard_init(void) {
 #endif
 #ifdef SPLIT_KEYBOARD
     split_pre_init();
+#endif
+#ifdef ENCODER_ENABLE
+    encoder_init();
 #endif
     matrix_init();
     quantum_init();
@@ -374,9 +377,6 @@ void keyboard_init(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_init();
 #endif
-#ifdef ENCODER_ENABLE
-    encoder_init();
-#endif
 #ifdef STENO_ENABLE_ALL
     steno_init();
 #endif

From cb57ec9c02ffebe5abeba266eb9eaa3dfc2089d3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 27 Nov 2022 02:05:04 +0000
Subject: [PATCH 934/959] Revert lib/usbhost changes (#19165)

---
 lib/usbhost/USB_Host_Shield_2.0/SPP.cpp                         | 2 +-
 .../examples/Bluetooth/PS3Multi/PS3Multi.ino                    | 2 +-
 .../examples/Bluetooth/WiiMulti/WiiMulti.ino                    | 2 +-
 .../USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h    | 2 +-
 .../USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp b/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp
index 8169707661..0f4ee5e981 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp
+++ b/lib/usbhost/USB_Host_Shield_2.0/SPP.cpp
@@ -757,7 +757,7 @@ size_t SPP::write(const uint8_t *data, size_t size) {
 void SPP::write(const uint8_t *data, size_t size) {
 #endif
         for(uint8_t i = 0; i < size; i++) {
-                if(sppIndex >= ARRAY_SIZE(sppOutputBuffer))
+                if(sppIndex >= sizeof (sppOutputBuffer) / sizeof (sppOutputBuffer[0]))
                         send(); // Send the current data in the buffer
                 sppOutputBuffer[sppIndex++] = data[i]; // All the bytes are put into a buffer and then send using the send() function
         }
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino
index 11833334d0..5ebfd7819c 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/PS3Multi/PS3Multi.ino
@@ -19,7 +19,7 @@ USB Usb;
 
 BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 PS3BT *PS3[2]; // We will use this pointer to store the two instance, you can easily make it larger if you like, but it will use a lot of RAM!
-const uint8_t length = ARRAY_SIZE(PS3); // Get the lenght of the array
+const uint8_t length = sizeof(PS3) / sizeof(PS3[0]); // Get the lenght of the array
 bool printAngle[length];
 bool oldControllerState[length];
 
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino
index 93cd084651..07c6f13d2b 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/Bluetooth/WiiMulti/WiiMulti.ino
@@ -19,7 +19,7 @@ USB Usb;
 
 BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 WII *Wii[2]; // We will use this pointer to store the two instance, you can easily make it larger if you like, but it will use a lot of RAM!
-const uint8_t length = ARRAY_SIZE(Wii); // Get the lenght of the array
+const uint8_t length = sizeof(Wii) / sizeof(Wii[0]); // Get the lenght of the array
 bool printAngle[length];
 bool oldControllerState[length];
 
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h
index 05dab14afe..2400364e65 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/le3dp/le3dp_rptparser.h
@@ -25,7 +25,7 @@ public:
 	virtual void OnGamePadChanged(const GamePadEventData *evt);
 };
 
-#define RPT_GAMEPAD_LEN	sizeof(GamePadEventData)
+#define RPT_GAMEPAD_LEN	sizeof(GamePadEventData)/sizeof(uint8_t)
 
 class JoystickReportParser : public HIDReportParser
 {
diff --git a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h
index 7af18b88f7..57fbb033bf 100644
--- a/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h
+++ b/lib/usbhost/USB_Host_Shield_2.0/examples/HID/scale/scale_rptparser.h
@@ -38,7 +38,7 @@ public:
 	virtual void OnScaleChanged(const ScaleEventData *evt);
 };
 
-#define RPT_SCALE_LEN	sizeof(ScaleEventData)
+#define RPT_SCALE_LEN	sizeof(ScaleEventData)/sizeof(uint8_t)
 
 class ScaleReportParser : public HIDReportParser
 {

From 0ab03f8fbcd16306258beff1ff814931d48c93eb Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 27 Nov 2022 02:07:07 +0000
Subject: [PATCH 935/959] Fix API errors in
 handwired/tractyl_manuform/5x6_right/arduinomicro (#19166)

---
 .../handwired/tractyl_manuform/5x6_right/arduinomicro/config.h | 2 --
 .../tractyl_manuform/5x6_right/arduinomicro/info.json          | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
index e43361cf64..396508380e 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define PRODUCT "Tractyl Manuform(5x6) Aruino Micro (r)/ Pro Micro (l)"
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
new file mode 100644
index 0000000000..63663f337d
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)"
+}

From 9e78e65a566487b2f4fe7b663971a01deb6ddad2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 28 Nov 2022 07:33:55 +1100
Subject: [PATCH 936/959] 2022 Nov 26 changelog. (#19164)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 data/mappings/info_config.hjson |  14 +-
 docs/ChangeLog/20221126.md      | 486 ++++++++++++++++++++++++++++++++
 docs/api_docs.md                |  38 +++
 docs/breaking_changes.md        |   2 +-
 docs/pr_checklist.md            |   3 +-
 readme.md                       |   4 -
 6 files changed, 535 insertions(+), 12 deletions(-)

diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index a576df892e..c1c01ff70f 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -23,7 +23,6 @@
     "COMBO_COUNT": {"info_key": "combo.count", "value_type": "int"},
     "COMBO_TERM": {"info_key": "combo.term", "value_type": "int"},
     "DEBOUNCE": {"info_key": "debounce", "value_type": "int"},
-    "DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"},
     "DIODE_DIRECTION": {"info_key": "diode_direction"},
     "DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.double_tap_shift_turns_on", "value_type": "bool"},
     "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "bool"},
@@ -51,7 +50,6 @@
     "LED_MATRIX_SAT_STEP": {"info_key": "led_matrix.sat_steps", "value_type": "int"},
     "LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"},
     "LED_MATRIX_SPD_STEP": {"info_key": "led_matrix.speed_steps", "value_type": "int"},
-    "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str"},
     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
     "MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"},
@@ -89,9 +87,6 @@
     "RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
     "RGB_MATRIX_SPD_STEP": {"info_key": "rgb_matrix.speed_steps", "value_type": "int"},
     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
-    "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"},
-    "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
-    "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"},
     "QMK_ESC_OUTPUT": {"info_key": "qmk_lufa_bootloader.esc_output"},
     "QMK_ESC_INPUT": {"info_key": "qmk_lufa_bootloader.esc_input"},
     "QMK_LED": {"info_key": "qmk_lufa_bootloader.led"},
@@ -128,5 +123,12 @@
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
     "UNUSED_PINS": {"info_key": "_invalid.unused_pins", "deprecated": true},
     "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool", "deprecated": true},
-    "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}
+    "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
+
+    // USB params, need to mark as failure when specified in config.h, rather than deprecated
+    "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"},
+    "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.vid` in info.json"},
+    "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"},
+    "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str", "deprecated": true, "replace_with": "`manufacturer` in info.json"},
+    "DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version", "deprecated": true, "replace_with": "`usb.device_version` in info.json"}
 }
diff --git a/docs/ChangeLog/20221126.md b/docs/ChangeLog/20221126.md
index 87f1fd2332..82aa4a499e 100644
--- a/docs/ChangeLog/20221126.md
+++ b/docs/ChangeLog/20221126.md
@@ -2,6 +2,10 @@
 
 ## Notable Features :id=notable-features
 
+### Autocorrect ([#15699](https://github.com/qmk/qmk_firmware/pull/15699)) :id=autocorrect
+
+_@getreuer_ in their infinite wisdom decided that autocorrect was a feature needed by QMK. As is customary, _@drashna_ adapted it to core and got it into a state that everyone else can use it. See [Feature: Autocorrect](feature_autocorrect.md) for more ifnormation (grin).
+
 ## Changes Requiring User Action :id=changes-requiring-user-action
 
 ### Updated Keyboard Codebases :id=updated-keyboard-codebases
@@ -19,6 +23,488 @@ The following keyboards have had their source moved within QMK:
 | handwired/hillside/52                | hillside/52                          |
 | maple_computing/christmas_tree/V2017 | maple_computing/christmas_tree/v2017 |
 
+### Keycodes refactoring :id=keycodes-overhaul-user-action
+
+QMK's keycodes got a very significant overhaul this breaking changes cycle, with the bulk of the work done by _@zvecr_ and _@fauxpark_ -- renaming, reordering, removing has been their focus in this area. In an attempt to standardise interoperation with host applications, keycode values now have strong versioning so that any connected application has confidence that the keys it thinks exist on the board actually match up with what's compiled in. These strongly-versioned keycode definitions are now published online and will not change, so tools that remap keycodes have a reference to work with. In future versions of QMK, any new or changed keycodes will result in a new version specification. See [API docs](api_docs.md#qmk-constants) for more information on the published versions if you're writing a tool to manage keycodes.
+
+In most cases user keymaps in the repository have already been updated to reflect the new naming scheme. In some cases user keymaps outside the repository may strike a missing keycode with the old name -- it's highly likely that the name had already been deprecated for some time, and should have been updated previously.
+
+See below for the full list of changesets.
+
+!> Keycode aliases have been put in place in most cases to cater for "old names" being mapped to "new names" -- the documentation already reflects all the new naming of keys.
+
+### Configuration Item Refactoring :id=config-refactoring
+
+A number of configuration items have been renamed for consistency.
+
+RGB Matrix configuration:
+
+| Old Config              | New Config              |
+|-------------------------|-------------------------|
+| DRIVER_LED_COUNT        | RGB_MATRIX_LED_COUNT    |
+| RGB_DISABLE_TIMEOUT     | RGB_MATRIX_TIMEOUT      |
+| RGB_MATRIX_STARTUP_HUE  | RGB_MATRIX_DEFAULT_HUE  |
+| RGB_MATRIX_STARTUP_MODE | RGB_MATRIX_DEFAULT_MODE |
+| RGB_MATRIX_STARTUP_SAT  | RGB_MATRIX_DEFAULT_SAT  |
+| RGB_MATRIX_STARTUP_SPD  | RGB_MATRIX_DEFAULT_SPD  |
+| RGB_MATRIX_STARTUP_VAL  | RGB_MATRIX_DEFAULT_VAL  |
+
+LED Matrix configuration:
+
+| Old Config              | New Config              |
+|-------------------------|-------------------------|
+| DRIVER_LED_COUNT        | LED_MATRIX_LED_COUNT    |
+| LED_DISABLE_TIMEOUT     | LED_MATRIX_TIMEOUT      |
+| LED_MATRIX_STARTUP_MODE | LED_MATRIX_DEFAULT_MODE |
+| LED_MATRIX_STARTUP_SPD  | LED_MATRIX_DEFAULT_SPD  |
+| LED_MATRIX_STARTUP_VAL  | LED_MATRIX_DEFAULT_VAL  |
+
+Joystick configuration:
+
+| Old Config               | New Config               |
+|--------------------------|--------------------------|
+| JOYSTICK_AXES_COUNT      | JOYSTICK_AXIS_COUNT      |
+| JOYSTICK_AXES_RESOLUTION | JOYSTICK_AXIS_RESOLUTION |
+
+### Data-driven USB IDs Refactoring ([#18152](https://github.com/qmk/qmk_firmware/pull/18152)) :id=usb-ids-Refactoring
+
+QMK has decided to deprecate the specification of USB IDs inside `config.h` in favour of `info.json`, leaving data-driven as the only method to specify USB information. As per the deprecation schedule put forward last breaking changes cycle, USB information must be specified in `info.json` instead.
+
+Previously in `config.h`:
+```c
+#define VENDOR_ID    0x1234
+#define PRODUCT_ID   0x5678
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Me
+#define PRODUCT      MyKeyboard
+```
+
+Replaced by `info.json`:
+```json
+{
+    "keyboard_name": "MyKeyboard",
+    "manufacturer": "Me",
+    "usb": {
+        "vid": "0x1234",
+        "pid": "0x5678",
+        "device_version": "0.0.1"
+    }
+}
+```
+
+### LED Indicator callback refactoring ([#14864](https://github.com/qmk/qmk_firmware/pull/18450)) :id=led-callback-refactor
+
+_RGB Matrix_ and _LED Matrix_ Indicator display code was traditionally difficult to override in keymaps as they did not follow the standard pattern of `bool *_kb()` deferring to `bool *_user()` functions, allowing signalling to the higher level that processing had already been done.
+
+This changes the standard callback model to allow for a base implementation to be provided by a keyboard, but also still allow for keymap-level overrides without needing to modify the keyboard's code.
+
+The old RGB Matrix keymap code went something like this:
+
+```c
+void rgb_matrix_indicators_user(void) {
+    // keymap LED code
+}
+```
+
+...but the new RGB Matrix keymap code looks like this:
+```c
+bool rgb_matrix_indicators_user(void) {
+    // keymap LED code
+    return false;
+}
+```
+
+Keyboard designers should now structure their keyboard-level routines like the following, in order to allow for keymap overrides:
+
+```c
+bool rgb_matrix_indicators_kb(void) {
+    // Defer to the keymap if they want to override
+    if (!rgb_matrix_indicators_user()) { return false; }
+
+    // keyboard LED code
+    return true;
+}
+```
+
+The equivalent transformations should be done for LED Matrix boards.
+
+### Unicode mode refactoring :id=unicode-mode-renaming
+
+Unicode modes were renamed in order to prevent collision with equivalent keycodes. The available values for `UNICODE_SELECTED_MODES` changed -- see [Feature: Unicode](feature_unicode.md#setting-the-input-mode) for the new list of values and how to configure them.
+
 ## Notable core changes :id=notable-core
 
+This breaking changes cycle, a lot of the core changes are related to cleanup and refactoring -- commonly called "tech debt".
+
+### Keycodes refactoring :id=keycodes-overhaul-core-changes
+
+We aren't going to list each and every change -- they're far too numerous -- instead, we'll just list the related PRs in order to convey just how wide-reaching these changes were:
+
+* Align audio keycode names ([#18962](https://github.com/qmk/qmk_firmware/pull/18962))
+* Align dynamic tapping term keycode names ([#18963](https://github.com/qmk/qmk_firmware/pull/18963))
+* Align haptic feedback keycode names ([#18964](https://github.com/qmk/qmk_firmware/pull/18964))
+* Deprecate `CAPS_WORD`/`CAPSWRD` for `CW_TOGG` ([#18834](https://github.com/qmk/qmk_firmware/pull/18834))
+* Deprecate `KC_LEAD` for `QK_LEAD` ([#18792](https://github.com/qmk/qmk_firmware/pull/18792))
+* Deprecate `KC_LOCK` for `QK_LOCK` ([#18796](https://github.com/qmk/qmk_firmware/pull/18796))
+* Deprecate `KEY_OVERRIDE_*` keycodes for `KO_*` ([#18843](https://github.com/qmk/qmk_firmware/pull/18843))
+* Deprecate `ONESHOT_*` keycodes for `QK_ONE_SHOT_*` ([#18844](https://github.com/qmk/qmk_firmware/pull/18844))
+* Deprecate `SECURE_*` keycodes for `QK_SECURE_*` ([#18847](https://github.com/qmk/qmk_firmware/pull/18847))
+* Deprecate `VLK_TOG` for `VK_TOGG` ([#18807](https://github.com/qmk/qmk_firmware/pull/18807))
+* Initial DD keycode migration ([#18643](https://github.com/qmk/qmk_firmware/pull/18643))
+* Macro keycode name refactoring ([#18958](https://github.com/qmk/qmk_firmware/pull/18958))
+* Move mousekey keycodes into newly freed up keycode block ([#16076](https://github.com/qmk/qmk_firmware/pull/16076))
+* Normalise Auto Shift keycodes ([#18892](https://github.com/qmk/qmk_firmware/pull/18892))
+* Normalise Autocorrect keycodes ([#18893](https://github.com/qmk/qmk_firmware/pull/18893))
+* Normalise Combo keycodes ([#18877](https://github.com/qmk/qmk_firmware/pull/18877))
+* Normalise Dynamic Macro keycodes ([#18939](https://github.com/qmk/qmk_firmware/pull/18939))
+* Normalise Joystick and Programmable Button keycodes ([#18832](https://github.com/qmk/qmk_firmware/pull/18832))
+* Normalise MIDI keycodes ([#18972](https://github.com/qmk/qmk_firmware/pull/18972))
+* Normalise output selection (Bluetooth) keycodes ([#19004](https://github.com/qmk/qmk_firmware/pull/19004))
+* Normalise Space Cadet keycodes ([#18864](https://github.com/qmk/qmk_firmware/pull/18864))
+* Normalise Unicode keycodes ([#18898](https://github.com/qmk/qmk_firmware/pull/18898))
+* Publish constants metadata to API ([#19143](https://github.com/qmk/qmk_firmware/pull/19143))
+* Relocate US ANSI shifted keycode aliases ([#18634](https://github.com/qmk/qmk_firmware/pull/18634))
+* Remove `KC_DELT` ([#18882](https://github.com/qmk/qmk_firmware/pull/18882))
+* Remove `UNICODE_KEY_OSX` and `UC_OSX` ([#18290](https://github.com/qmk/qmk_firmware/pull/18290))
+* Remove deprecated RESET keycode alias ([#18271](https://github.com/qmk/qmk_firmware/pull/18271))
+* Remove legacy Debug keycode ([#18769](https://github.com/qmk/qmk_firmware/pull/18769))
+* Remove legacy EEPROM clear keycodes ([#18782](https://github.com/qmk/qmk_firmware/pull/18782))
+* Remove legacy fauxclicky and unicode keycodes ([#18800](https://github.com/qmk/qmk_firmware/pull/18800))
+* Remove legacy Grave Escape keycodes ([#18787](https://github.com/qmk/qmk_firmware/pull/18787))
+* Remove legacy international keycodes ([#18588](https://github.com/qmk/qmk_firmware/pull/18588))
+* Remove legacy keycodes, part 2 ([#18660](https://github.com/qmk/qmk_firmware/pull/18660))
+* Remove legacy keycodes, part 3 ([#18669](https://github.com/qmk/qmk_firmware/pull/18669))
+* Remove legacy keycodes, part 4 ([#18683](https://github.com/qmk/qmk_firmware/pull/18683))
+* Remove legacy keycodes, part 5 ([#18710](https://github.com/qmk/qmk_firmware/pull/18710))
+* Remove legacy keycodes, part 6 ([#18740](https://github.com/qmk/qmk_firmware/pull/18740))
+* Remove legacy locking caps/num/scroll keycodes ([#18601](https://github.com/qmk/qmk_firmware/pull/18601))
+* Remove legacy sendstring keycodes ([#18749](https://github.com/qmk/qmk_firmware/pull/18749))
+* Reworked backlight keycodes. ([#18961](https://github.com/qmk/qmk_firmware/pull/18961))
+
+### Board Converters :id=board-converters
+
+There was additional work in the space of board converters -- historically QMK allowed for "converting" a Pro Micro build to a QMK Proton-C build. The last few versions of QMK have added support for replacement boards much like the Proton-C, and this quarter was no exception:
+
+* Add Bonsai C4 as a platform board file ([#18901](https://github.com/qmk/qmk_firmware/pull/18901))
+* Add converter support to keymap.json ([#18776](https://github.com/qmk/qmk_firmware/pull/18776))
+* Add Elite-C to converters ([#18309](https://github.com/qmk/qmk_firmware/pull/18309))
+* Add Elite-Pi converter ([#18236](https://github.com/qmk/qmk_firmware/pull/18236))
+* Allow QK_MAKE to work with converters ([#18637](https://github.com/qmk/qmk_firmware/pull/18637))
+
+See [Feature: Converters](feature_converters.md) for the full list of board conversions available.
+
+### Pointing and Digitizer device updates :id=pointing-and-digitizer
+
+Both pointing devices and digitizer got a host of updates this cycle. Inertia, automatic mouse layers, fixes for preventing sleep... you even get more buttons with digitizers!
+
+* add "inertia" mode for mouse keys ([#18774](https://github.com/qmk/qmk_firmware/pull/18774))
+* Digitizer feature improvements ([#19034](https://github.com/qmk/qmk_firmware/pull/19034))
+* Enabling Pointing Device support in register code functions ([#18363](https://github.com/qmk/qmk_firmware/pull/18363))
+* Feature: pointing device automatic mouse layer ([#17962](https://github.com/qmk/qmk_firmware/pull/17962))
+* Fix mouse report comparison failing on shared EP (fixes KB preventing sleep) ([#18060](https://github.com/qmk/qmk_firmware/pull/18060))
+* Fix mouse use within send_string ([#18659](https://github.com/qmk/qmk_firmware/pull/18659))
+* Handle mouse keys more consistently ([#18513](https://github.com/qmk/qmk_firmware/pull/18513))
+* Invert pointing device motion pin for cirque touchpads ([#18404](https://github.com/qmk/qmk_firmware/pull/18404))
+* Refactor more host code (programmable button & digitizer) ([#18565](https://github.com/qmk/qmk_firmware/pull/18565))
+
 ## Full changelist :id=full-changelist
+
+Core:
+* quantum: led: split out led_update_ports() for customization of led behaviour ([#14452](https://github.com/qmk/qmk_firmware/pull/14452))
+* Add getreuer's Autocorrect feature to core ([#15699](https://github.com/qmk/qmk_firmware/pull/15699))
+* Move mousekey keycodes into newly freed up keycode block ([#16076](https://github.com/qmk/qmk_firmware/pull/16076))
+* Introduce pointing device specific debug messages ([#17663](https://github.com/qmk/qmk_firmware/pull/17663))
+* PWM Backlight for RP2040 ([#17706](https://github.com/qmk/qmk_firmware/pull/17706))
+* Adjust PWM hardware audio driver for RP2040 ([#17723](https://github.com/qmk/qmk_firmware/pull/17723))
+* Prevent tap dance from wiping dynamic macros ([#17880](https://github.com/qmk/qmk_firmware/pull/17880))
+* Feature: pointing device automatic mouse layer ([#17962](https://github.com/qmk/qmk_firmware/pull/17962))
+* Allow custom timings for WS2812 PIO driver ([#18006](https://github.com/qmk/qmk_firmware/pull/18006))
+* Use `TAP_CODE_DELAY` for encoder mapping by default. Add docs. ([#18098](https://github.com/qmk/qmk_firmware/pull/18098))
+* Move Oneshot mod callbacks to after mods are set ([#18101](https://github.com/qmk/qmk_firmware/pull/18101))
+* mcp23018: add return status to init ([#18178](https://github.com/qmk/qmk_firmware/pull/18178))
+* Switch over MANUFACTURER and PRODUCT to string literals ([#18183](https://github.com/qmk/qmk_firmware/pull/18183))
+* Remove deprecated USBasp and bootloadHID bootloader types ([#18195](https://github.com/qmk/qmk_firmware/pull/18195))
+* Chromeos keycodes ([#18212](https://github.com/qmk/qmk_firmware/pull/18212))
+* VIA V3 - The Custom UI Update ([#18222](https://github.com/qmk/qmk_firmware/pull/18222))
+* Move bootloader.mk to platforms ([#18228](https://github.com/qmk/qmk_firmware/pull/18228))
+* Simplify extrakeys sending at the host driver level ([#18230](https://github.com/qmk/qmk_firmware/pull/18230))
+* Add unicode mode change callbacks ([#18235](https://github.com/qmk/qmk_firmware/pull/18235))
+* Add Elite-Pi converter ([#18236](https://github.com/qmk/qmk_firmware/pull/18236))
+* Better handle EEPROM reset keycode ([#18244](https://github.com/qmk/qmk_firmware/pull/18244))
+* Work around WinCompose issue for U+Axxx or U+Exxx ([#18260](https://github.com/qmk/qmk_firmware/pull/18260))
+* Remove deprecated RESET keycode alias ([#18271](https://github.com/qmk/qmk_firmware/pull/18271))
+* Move Bluetooth-related function calls up to host/keyboard level ([#18274](https://github.com/qmk/qmk_firmware/pull/18274))
+* Added analog support for WB32 MCU. ([#18289](https://github.com/qmk/qmk_firmware/pull/18289))
+* Remove `UNICODE_KEY_OSX` and `UC_OSX` ([#18290](https://github.com/qmk/qmk_firmware/pull/18290))
+* Add Elite-C to converters ([#18309](https://github.com/qmk/qmk_firmware/pull/18309))
+* RN42 driver: small cleanups ([#18310](https://github.com/qmk/qmk_firmware/pull/18310))
+* Reboot wb32 devices after flashing ([#18323](https://github.com/qmk/qmk_firmware/pull/18323))
+* Refactor Unicode feature ([#18333](https://github.com/qmk/qmk_firmware/pull/18333))
+* Move fake EE_HANDS from EEPROM init. ([#18352](https://github.com/qmk/qmk_firmware/pull/18352))
+* Enabling Pointing Device support in register code functions ([#18363](https://github.com/qmk/qmk_firmware/pull/18363))
+* Start Bluetooth API ([#18366](https://github.com/qmk/qmk_firmware/pull/18366))
+* Add UART support for Kinetis boards ([#18370](https://github.com/qmk/qmk_firmware/pull/18370))
+* [QP] Add RGB565 surface. Docs clarification, cleanup, tabsification, and reordering. ([#18396](https://github.com/qmk/qmk_firmware/pull/18396))
+* Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` ([#18399](https://github.com/qmk/qmk_firmware/pull/18399))
+* Invert pointing device motion pin for cirque touchpads ([#18404](https://github.com/qmk/qmk_firmware/pull/18404))
+* Change `{LED,RGB}_DISABLE_TIMEOUT` to `{LED,RGB}_MATRIX_TIMEOUT` ([#18415](https://github.com/qmk/qmk_firmware/pull/18415))
+* rewrite locking in split transaction handlers ([#18417](https://github.com/qmk/qmk_firmware/pull/18417))
+* remove busy waiting from rgblight functions ([#18418](https://github.com/qmk/qmk_firmware/pull/18418))
+* Serial-protocol: always clear receive queue on main half of split keyboard ([#18419](https://github.com/qmk/qmk_firmware/pull/18419))
+* Stabilize RP2040 Half-duplex PIO split comms take 2 ([#18421](https://github.com/qmk/qmk_firmware/pull/18421))
+* Copy RP2040 vector table to RAM on startup ([#18424](https://github.com/qmk/qmk_firmware/pull/18424))
+* Further refactoring of joystick feature ([#18437](https://github.com/qmk/qmk_firmware/pull/18437))
+* Start moving towards introspection-based data retrieval ([#18441](https://github.com/qmk/qmk_firmware/pull/18441))
+* RP2040: use built-in integer hardware divider and optimized i64 multiplication ([#18464](https://github.com/qmk/qmk_firmware/pull/18464))
+* Only trigger encoder callbacks on primary side ([#18467](https://github.com/qmk/qmk_firmware/pull/18467))
+* Handle mouse keys more consistently ([#18513](https://github.com/qmk/qmk_firmware/pull/18513))
+* Gentoo install script — build newlib with `nano` USE flag ([#18527](https://github.com/qmk/qmk_firmware/pull/18527))
+* Small un/register_code() cleanups ([#18544](https://github.com/qmk/qmk_firmware/pull/18544))
+* Refactor more host code (programmable button & digitizer) ([#18565](https://github.com/qmk/qmk_firmware/pull/18565))
+* Don't clear keys on layer change unless STRICT_LAYER_RELEASE is enabled ([#18577](https://github.com/qmk/qmk_firmware/pull/18577))
+* Remove legacy international keycodes ([#18588](https://github.com/qmk/qmk_firmware/pull/18588))
+* onekey: Enable ADC for STM32F072 Discovery ([#18592](https://github.com/qmk/qmk_firmware/pull/18592))
+* Implement split comms watchdog ([#18599](https://github.com/qmk/qmk_firmware/pull/18599))
+* Remove legacy locking caps/num/scroll keycodes ([#18601](https://github.com/qmk/qmk_firmware/pull/18601))
+* Use `get_u16_str` instead of `snprintf` in `autoshift_timer_report` ([#18606](https://github.com/qmk/qmk_firmware/pull/18606))
+* Refactor `send_extra` ([#18615](https://github.com/qmk/qmk_firmware/pull/18615))
+* LUFA: Consolidate report sending code ([#18629](https://github.com/qmk/qmk_firmware/pull/18629))
+* Relocate US ANSI shifted keycode aliases ([#18634](https://github.com/qmk/qmk_firmware/pull/18634))
+* Allow QK_MAKE to work with converters ([#18637](https://github.com/qmk/qmk_firmware/pull/18637))
+* Programmable Button API refactor and improve docs ([#18641](https://github.com/qmk/qmk_firmware/pull/18641))
+* Initial DD keycode migration ([#18643](https://github.com/qmk/qmk_firmware/pull/18643))
+* Remove legacy keycodes, part 2 ([#18660](https://github.com/qmk/qmk_firmware/pull/18660))
+* Remove legacy keycodes, part 3 ([#18669](https://github.com/qmk/qmk_firmware/pull/18669))
+* Remove legacy keycodes, part 4 ([#18683](https://github.com/qmk/qmk_firmware/pull/18683))
+* Revert "mcp23018: add return status to init" ([#18709](https://github.com/qmk/qmk_firmware/pull/18709))
+* Remove legacy keycodes, part 5 ([#18710](https://github.com/qmk/qmk_firmware/pull/18710))
+* Make QP driver init functions weak. ([#18717](https://github.com/qmk/qmk_firmware/pull/18717))
+* Add unit tests for HOLD_ON_OTHER_KEY_PRESS ([#18721](https://github.com/qmk/qmk_firmware/pull/18721))
+* Remove legacy keycodes, part 6 ([#18740](https://github.com/qmk/qmk_firmware/pull/18740))
+* Remove legacy sendstring keycodes ([#18749](https://github.com/qmk/qmk_firmware/pull/18749))
+* 4 Driver support for IS31FL3737 ([#18750](https://github.com/qmk/qmk_firmware/pull/18750))
+* Remove quantum/audio from global VPATH ([#18753](https://github.com/qmk/qmk_firmware/pull/18753))
+* Widen the ARM Cortex-M family support. Allow USB peripheral change. ([#18767](https://github.com/qmk/qmk_firmware/pull/18767))
+* Remove legacy Debug keycode ([#18769](https://github.com/qmk/qmk_firmware/pull/18769))
+* add "inertia" mode for mouse keys ([#18774](https://github.com/qmk/qmk_firmware/pull/18774))
+* Remove legacy EEPROM clear keycodes ([#18782](https://github.com/qmk/qmk_firmware/pull/18782))
+* Remove legacy Grave Escape keycodes ([#18787](https://github.com/qmk/qmk_firmware/pull/18787))
+* Deprecate `KC_LEAD` for `QK_LEAD` ([#18792](https://github.com/qmk/qmk_firmware/pull/18792))
+* Deprecate `KC_LOCK` for `QK_LOCK` ([#18796](https://github.com/qmk/qmk_firmware/pull/18796))
+* Remove legacy fauxclicky and unicode keycodes ([#18800](https://github.com/qmk/qmk_firmware/pull/18800))
+* Generalise CTPC logic from common_features ([#18803](https://github.com/qmk/qmk_firmware/pull/18803))
+* Deprecate `VLK_TOG` for `VK_TOGG` ([#18807](https://github.com/qmk/qmk_firmware/pull/18807))
+* ChibiOS USB: Add a dummy IN callback to work around LLD bugs ([#18811](https://github.com/qmk/qmk_firmware/pull/18811))
+* Normalise Joystick and Programmable Button keycodes ([#18832](https://github.com/qmk/qmk_firmware/pull/18832))
+* Deprecate `CAPS_WORD`/`CAPSWRD` for `CW_TOGG` ([#18834](https://github.com/qmk/qmk_firmware/pull/18834))
+* added BS_TOGG so BS_SWAP and BS_NORM can be on a single key ([#18837](https://github.com/qmk/qmk_firmware/pull/18837))
+* Remove some assumptions on sequential keycode ranges ([#18838](https://github.com/qmk/qmk_firmware/pull/18838))
+* Deprecate `KEY_OVERRIDE_*` keycodes for `KO_*` ([#18843](https://github.com/qmk/qmk_firmware/pull/18843))
+* Deprecate `ONESHOT_*` keycodes for `QK_ONE_SHOT_*` ([#18844](https://github.com/qmk/qmk_firmware/pull/18844))
+* Deprecate `SECURE_*` keycodes for `QK_SECURE_*` ([#18847](https://github.com/qmk/qmk_firmware/pull/18847))
+* Normalise Space Cadet keycodes ([#18864](https://github.com/qmk/qmk_firmware/pull/18864))
+* Allow overriding of dynamic keymap start address. ([#18867](https://github.com/qmk/qmk_firmware/pull/18867))
+* Formalise keyboard- and user-specific EEPROM blocks ([#18874](https://github.com/qmk/qmk_firmware/pull/18874))
+* Normalise Combo keycodes ([#18877](https://github.com/qmk/qmk_firmware/pull/18877))
+* Remove rgblight_list.h ([#18878](https://github.com/qmk/qmk_firmware/pull/18878))
+* Remove `KC_DELT` ([#18882](https://github.com/qmk/qmk_firmware/pull/18882))
+* Simplify Keymap Config EEPROM ([#18886](https://github.com/qmk/qmk_firmware/pull/18886))
+* Normalise Auto Shift keycodes ([#18892](https://github.com/qmk/qmk_firmware/pull/18892))
+* Normalise Autocorrect keycodes ([#18893](https://github.com/qmk/qmk_firmware/pull/18893))
+* Normalise Unicode keycodes ([#18898](https://github.com/qmk/qmk_firmware/pull/18898))
+* Add Bonsai C4 as a platform board file ([#18901](https://github.com/qmk/qmk_firmware/pull/18901))
+* Normalise Dynamic Macro keycodes ([#18939](https://github.com/qmk/qmk_firmware/pull/18939))
+* Reduce includes for sequencer header ([#18946](https://github.com/qmk/qmk_firmware/pull/18946))
+* Reduce includes for crc header ([#18947](https://github.com/qmk/qmk_firmware/pull/18947))
+* Reduce includes for caps_word header ([#18948](https://github.com/qmk/qmk_firmware/pull/18948))
+* Reduce includes for wpm header ([#18949](https://github.com/qmk/qmk_firmware/pull/18949))
+* Reduce includes for dip_switch header ([#18951](https://github.com/qmk/qmk_firmware/pull/18951))
+* Reduce includes for send_string header ([#18952](https://github.com/qmk/qmk_firmware/pull/18952))
+* Macro keycode name refactoring ([#18958](https://github.com/qmk/qmk_firmware/pull/18958))
+* Remove thermal printer. ([#18959](https://github.com/qmk/qmk_firmware/pull/18959))
+* Reworked backlight keycodes. ([#18961](https://github.com/qmk/qmk_firmware/pull/18961))
+* Align audio keycode names ([#18962](https://github.com/qmk/qmk_firmware/pull/18962))
+* Align dynamic tapping term keycode names ([#18963](https://github.com/qmk/qmk_firmware/pull/18963))
+* Align haptic feedback keycode names ([#18964](https://github.com/qmk/qmk_firmware/pull/18964))
+* NVRAM refactor, phase 1. ([#18969](https://github.com/qmk/qmk_firmware/pull/18969))
+* Normalise MIDI keycodes ([#18972](https://github.com/qmk/qmk_firmware/pull/18972))
+* Normalise output selection (Bluetooth) keycodes ([#19004](https://github.com/qmk/qmk_firmware/pull/19004))
+* Move EFL wear-leveling driver to be default for F1, F3, F4, L4, G4, WB32, GD32V. ([#19020](https://github.com/qmk/qmk_firmware/pull/19020))
+* Digitizer feature improvements ([#19034](https://github.com/qmk/qmk_firmware/pull/19034))
+* Joystick feature improvements ([#19052](https://github.com/qmk/qmk_firmware/pull/19052))
+* Add default limit to OLED dirty processing ([#19068](https://github.com/qmk/qmk_firmware/pull/19068))
+* Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` ([#19079](https://github.com/qmk/qmk_firmware/pull/19079))
+* Change `LED_MATRIX_STARTUP_*` defines to `LED_MATRIX_DEFAULT_*` ([#19080](https://github.com/qmk/qmk_firmware/pull/19080))
+* Extend eeconfig kb/user datablock API ([#19094](https://github.com/qmk/qmk_firmware/pull/19094))
+* Remove .noci functionality ([#19122](https://github.com/qmk/qmk_firmware/pull/19122))
+
+CLI:
+* Reject json with duplicate keys ([#18108](https://github.com/qmk/qmk_firmware/pull/18108))
+* Add pointing device support to data driven config ([#18215](https://github.com/qmk/qmk_firmware/pull/18215))
+* Disconnect `usb.device_ver` ([#18259](https://github.com/qmk/qmk_firmware/pull/18259))
+* Normalise info_config.h define generation ([#18439](https://github.com/qmk/qmk_firmware/pull/18439))
+* Generate DD RGBLight/LED/RGB Matrix animation defines ([#18459](https://github.com/qmk/qmk_firmware/pull/18459))
+* Add converter support to keymap.json ([#18776](https://github.com/qmk/qmk_firmware/pull/18776))
+* Ensure consistent clean behaviour ([#18781](https://github.com/qmk/qmk_firmware/pull/18781))
+* Format DD mappings and schemas ([#18924](https://github.com/qmk/qmk_firmware/pull/18924))
+* Publish hjson files as json ([#18996](https://github.com/qmk/qmk_firmware/pull/18996))
+* Add raw output option for QGF/QFF files. ([#18998](https://github.com/qmk/qmk_firmware/pull/18998))
+* Improve LED config parsing error messages ([#19007](https://github.com/qmk/qmk_firmware/pull/19007))
+* Revert "Add pointing device support to data driven config (#18215)" ([#19063](https://github.com/qmk/qmk_firmware/pull/19063))
+* Additional DD backlight config ([#19124](https://github.com/qmk/qmk_firmware/pull/19124))
+* Publish constants metadata to API ([#19143](https://github.com/qmk/qmk_firmware/pull/19143))
+
+Submodule updates:
+* Use a macro to compute the size of arrays at compile time ([#18044](https://github.com/qmk/qmk_firmware/pull/18044))
+* Update pico-sdk to version 1.4.0 ([#18423](https://github.com/qmk/qmk_firmware/pull/18423))
+
+Keyboards:
+* Rework PS/2 driver selection ([#17892](https://github.com/qmk/qmk_firmware/pull/17892))
+* Durgod K310/K320 Refactor ([#18224](https://github.com/qmk/qmk_firmware/pull/18224))
+* Optimise LAYOUT macro generation ([#18262](https://github.com/qmk/qmk_firmware/pull/18262))
+* Rename keyboards with uppercase letters ([#18268](https://github.com/qmk/qmk_firmware/pull/18268))
+* Remove legacy USE_SERIAL define ([#18292](https://github.com/qmk/qmk_firmware/pull/18292))
+* Resolve conflict merging master to develop ([#18297](https://github.com/qmk/qmk_firmware/pull/18297))
+* Remove legacy define USE_SERIAL_PD2 ([#18298](https://github.com/qmk/qmk_firmware/pull/18298))
+* Remove legacy define SERIAL_USE_MULTI_TRANSACTION ([#18299](https://github.com/qmk/qmk_firmware/pull/18299))
+* Adapt spidey3 userspace to recent unicode refactoring ([#18345](https://github.com/qmk/qmk_firmware/pull/18345))
+* Remove remaining use of terminal keys and related comment labels ([#18402](https://github.com/qmk/qmk_firmware/pull/18402))
+* Add DD mapping for LED/RGB Matrix center ([#18432](https://github.com/qmk/qmk_firmware/pull/18432))
+* develop updates for Drashna Keymaps ([#18472](https://github.com/qmk/qmk_firmware/pull/18472))
+* Remove lingering `DRIVER_LED_TOTAL` references ([#18475](https://github.com/qmk/qmk_firmware/pull/18475))
+* Remove lingering `DRIVER_LED_TOTAL` references ([#18594](https://github.com/qmk/qmk_firmware/pull/18594))
+* update andrebrait GMMK Pro keymap ([#18608](https://github.com/qmk/qmk_firmware/pull/18608))
+* AnnePro2: Adjust RGB flushing ([#18640](https://github.com/qmk/qmk_firmware/pull/18640))
+* Remove lingering `DRIVER_LED_TOTAL` references ([#18662](https://github.com/qmk/qmk_firmware/pull/18662))
+* Update snowe's KC_RESET to use QK_BOOT ([#18667](https://github.com/qmk/qmk_firmware/pull/18667))
+* Remove some .gitignore files ([#18689](https://github.com/qmk/qmk_firmware/pull/18689))
+* Remove keymaps that still reference legacy macros ([#18690](https://github.com/qmk/qmk_firmware/pull/18690))
+* Remove keymaps that still reference legacy macros ([#18693](https://github.com/qmk/qmk_firmware/pull/18693))
+* Remove stale userspace/keymaps ([#18700](https://github.com/qmk/qmk_firmware/pull/18700))
+* Update keyboards readme ([#18714](https://github.com/qmk/qmk_firmware/pull/18714))
+* Allow changes to the moonlander default music map ([#18715](https://github.com/qmk/qmk_firmware/pull/18715))
+* led_update_kb -> led_update_ports where appropriate ([#18716](https://github.com/qmk/qmk_firmware/pull/18716))
+* Update converter/usb_usb user keymaps to use LAYOUT_fullsize ([#18720](https://github.com/qmk/qmk_firmware/pull/18720))
+* Remove RGBLIGHT_ANIMATION and clean up effect defines for G-K ([#18726](https://github.com/qmk/qmk_firmware/pull/18726))
+* Remove RGBLIGHT_ANIMATION and clean up effect defines for L-Q ([#18727](https://github.com/qmk/qmk_firmware/pull/18727))
+* Remove RGBLIGHT_ANIMATION and clean up effect defines for R-Z ([#18728](https://github.com/qmk/qmk_firmware/pull/18728))
+* Remove RGBLIGHT_ANIMATION and clean up effect defines for layouts+users ([#18729](https://github.com/qmk/qmk_firmware/pull/18729))
+* Update info.json configs to explicitly list RGBLIGHT animations ([#18730](https://github.com/qmk/qmk_firmware/pull/18730))
+* A little personal cleanup after #18726 and #18729 ([#18734](https://github.com/qmk/qmk_firmware/pull/18734))
+* Move Hillside out of handwired ([#18751](https://github.com/qmk/qmk_firmware/pull/18751))
+* wilba_tech: allow keymaps to override backlight_effect_indicators() ([#18791](https://github.com/qmk/qmk_firmware/pull/18791))
+* Remove broken userspace and keymaps ([#18806](https://github.com/qmk/qmk_firmware/pull/18806))
+* Add support for KBDfans Odin V2 ([#18910](https://github.com/qmk/qmk_firmware/pull/18910))
+* Remove more `UNUSED_PINS` defines ([#18940](https://github.com/qmk/qmk_firmware/pull/18940))
+* Remove hardcoded VIA keycode range ([#18956](https://github.com/qmk/qmk_firmware/pull/18956))
+* KC_GESC -> QK_GESC, better alignment for OCD ([#19018](https://github.com/qmk/qmk_firmware/pull/19018))
+* Add missing `manufacturer` fields ([#19065](https://github.com/qmk/qmk_firmware/pull/19065))
+* Update use of legacy keycodes ([#19120](https://github.com/qmk/qmk_firmware/pull/19120))
+
+Keyboard fixes:
+* [GMMK Pro] Fix unintentional taps to the volume keys when using the encoder ([#17129](https://github.com/qmk/qmk_firmware/pull/17129))
+* Luna keyboard pet OLED timeout fix ([#17189](https://github.com/qmk/qmk_firmware/pull/17189))
+* Handle escaping of manufacturer/product strings ([#18194](https://github.com/qmk/qmk_firmware/pull/18194))
+* kegen/gboy: add manufacturer string ([#18196](https://github.com/qmk/qmk_firmware/pull/18196))
+* Ensure all keyboards have a bootloader set ([#18234](https://github.com/qmk/qmk_firmware/pull/18234))
+* Reverse keymap search order ([#18449](https://github.com/qmk/qmk_firmware/pull/18449))
+* Fixup cradio bootloader/processor ([#18477](https://github.com/qmk/qmk_firmware/pull/18477))
+* onekey: enable ADC for Bluepill and Blackpill ([#18545](https://github.com/qmk/qmk_firmware/pull/18545))
+* Fixup controllerworks/mini42 ([#18553](https://github.com/qmk/qmk_firmware/pull/18553))
+* RESET -> QK_BOOT user keymaps ([#18560](https://github.com/qmk/qmk_firmware/pull/18560))
+* Fixup linworks/fave84h ([#18593](https://github.com/qmk/qmk_firmware/pull/18593))
+* Fix compilation of 1upkeyboards on develop ([#18618](https://github.com/qmk/qmk_firmware/pull/18618))
+* Various keyboard fixes ([#18649](https://github.com/qmk/qmk_firmware/pull/18649))
+* Fixup twig50 ([#18651](https://github.com/qmk/qmk_firmware/pull/18651))
+* Fixup handwired/jopr — remove deprecated keycode ([#18668](https://github.com/qmk/qmk_firmware/pull/18668))
+* Fixup keychron/q3 ([#18687](https://github.com/qmk/qmk_firmware/pull/18687))
+* Fixup dumbpad/v3x ([#18692](https://github.com/qmk/qmk_firmware/pull/18692))
+* Fix aurora/sweep ([#18701](https://github.com/qmk/qmk_firmware/pull/18701))
+* Fix build failures uncovered by #18753 ([#18789](https://github.com/qmk/qmk_firmware/pull/18789))
+* Fixup emptystring/nqg ([#18804](https://github.com/qmk/qmk_firmware/pull/18804))
+* Fixup controllerwords/mini36 ([#18840](https://github.com/qmk/qmk_firmware/pull/18840))
+* Fixup 1upkeyboards/pi60_rgb ([#18858](https://github.com/qmk/qmk_firmware/pull/18858))
+* Fixup doio/kb16 ([#18859](https://github.com/qmk/qmk_firmware/pull/18859))
+* Fixup keebio/sinc/rev3 ([#18866](https://github.com/qmk/qmk_firmware/pull/18866))
+* elephant42: fix default keymap ([#18884](https://github.com/qmk/qmk_firmware/pull/18884))
+* Properly fix elephant42 ([#18908](https://github.com/qmk/qmk_firmware/pull/18908))
+* Fix syntax error introduced in #18800 ([#18933](https://github.com/qmk/qmk_firmware/pull/18933))
+* Resolve info.json/rules.mk feature conflicts in three boards ([#18942](https://github.com/qmk/qmk_firmware/pull/18942))
+* Fix DD warnings for RGBKB boards ([#18944](https://github.com/qmk/qmk_firmware/pull/18944))
+* Fix "no matrix definition" errors for some boards ([#18954](https://github.com/qmk/qmk_firmware/pull/18954))
+* LED config fixes ([#18973](https://github.com/qmk/qmk_firmware/pull/18973))
+* `handwired/swiftrax/walter`: fix layout mismatch ([#18974](https://github.com/qmk/qmk_firmware/pull/18974))
+* Fix use of shifted custom keycode ([#18978](https://github.com/qmk/qmk_firmware/pull/18978))
+* `pizzakeyboards/pizza65`: fix layouts ([#18979](https://github.com/qmk/qmk_firmware/pull/18979))
+* `cannonkeys/db60/hotswap`: fix layouts ([#18982](https://github.com/qmk/qmk_firmware/pull/18982))
+* `handwired/swiftrax/cowfish`: fix layouts ([#18984](https://github.com/qmk/qmk_firmware/pull/18984))
+* Fixup hotdox76v2 on develop ([#18991](https://github.com/qmk/qmk_firmware/pull/18991))
+* `mechlovin/adelais/standard_led/avr/rev1`: fix layout ([#18997](https://github.com/qmk/qmk_firmware/pull/18997))
+* `gboards/gergoplex`: fix matrix pins ([#18999](https://github.com/qmk/qmk_firmware/pull/18999))
+* Fixup keychron/q1/iso_encoder ([#19006](https://github.com/qmk/qmk_firmware/pull/19006))
+* Rollback unrelated changes from previous PR. ([#19015](https://github.com/qmk/qmk_firmware/pull/19015))
+* Fixup bn006 on develop ([#19029](https://github.com/qmk/qmk_firmware/pull/19029))
+* onekey: disable NKRO and mousekeys by default ([#19038](https://github.com/qmk/qmk_firmware/pull/19038))
+* Fix up laser_ninja/pumpkin_pad ([#19060](https://github.com/qmk/qmk_firmware/pull/19060))
+* Fixup keychron/q6 ([#19066](https://github.com/qmk/qmk_firmware/pull/19066))
+* Fixup handwired/alcor_dactyl ([#19072](https://github.com/qmk/qmk_firmware/pull/19072))
+* Fix some old keycodes ([#19086](https://github.com/qmk/qmk_firmware/pull/19086))
+* Update more `DRIVER_LED_TOTAL` defines to `RGB_MATRIX_LED_COUNT` ([#19089](https://github.com/qmk/qmk_firmware/pull/19089))
+* Fix references to `mouse_report_t` (which doesnt exist) ([#19107](https://github.com/qmk/qmk_firmware/pull/19107))
+* Fixup keychron/q5 ([#19119](https://github.com/qmk/qmk_firmware/pull/19119))
+* Fixup aeboards/satellite ([#19137](https://github.com/qmk/qmk_firmware/pull/19137))
+* Fixup aurora/corne on develop ([#19144](https://github.com/qmk/qmk_firmware/pull/19144))
+* Minor lint fixes for various info.json ([#19146](https://github.com/qmk/qmk_firmware/pull/19146))
+
+Others:
+* Add DD mapping for LED/RGB Matrix max brightness ([#18403](https://github.com/qmk/qmk_firmware/pull/18403))
+* Add DD mapping for LED/RGB Matrix split count ([#18408](https://github.com/qmk/qmk_firmware/pull/18408))
+* Add DD mapping for LED/RGB Matrix HSVS steps ([#18414](https://github.com/qmk/qmk_firmware/pull/18414))
+* Remove RGBLIGHT_ANIMTION and clean up effect defines for 0-F ([#18725](https://github.com/qmk/qmk_firmware/pull/18725))
+* Merge API update workflow ([#19121](https://github.com/qmk/qmk_firmware/pull/19121))
+
+Bugs:
+* Fix layer switching from tap dances by redoing the keymap lookup ([#17935](https://github.com/qmk/qmk_firmware/pull/17935))
+* ws2812: replace RGBLED_NUM with driver-owned constant to decouple driver from RGBLEDs/RGBMATRIX defines ([#18036](https://github.com/qmk/qmk_firmware/pull/18036))
+* Prevent USB peripheral fault when restarting USB on WB32 MCUs ([#18058](https://github.com/qmk/qmk_firmware/pull/18058))
+* Fix mouse report comparison failing on shared EP (fixes KB preventing sleep) ([#18060](https://github.com/qmk/qmk_firmware/pull/18060))
+* Fix incorrect `bluetooth.driver` rules.mk mapping ([#18205](https://github.com/qmk/qmk_firmware/pull/18205))
+* Adjust `EXTRAKEY_ENABLE` ifdefs for `send_extra()` ([#18249](https://github.com/qmk/qmk_firmware/pull/18249))
+* Fix docs regarding cirque pinnacle attenuation ([#18279](https://github.com/qmk/qmk_firmware/pull/18279))
+* Avoid repeated calls to rgblight_set() in tight succession when setting lighting layers ([#18338](https://github.com/qmk/qmk_firmware/pull/18338))
+* Fix cirque tap from secondary side of split keyboard ([#18351](https://github.com/qmk/qmk_firmware/pull/18351))
+* Fix EECONFIG_KEYMAP_UPPER_BYTE init ([#18394](https://github.com/qmk/qmk_firmware/pull/18394))
+* Fix retain brightness when val is changed while a layer is active ([#18426](https://github.com/qmk/qmk_firmware/pull/18426))
+* Update Chibios to latest 21.11.2 changes for RP2040 XIP deadlock mitigation ([#18428](https://github.com/qmk/qmk_firmware/pull/18428))
+* Fix incorrect g_led_config generation ([#18431](https://github.com/qmk/qmk_firmware/pull/18431))
+* Fix Per Key LED Indicator Callbacks ([#18450](https://github.com/qmk/qmk_firmware/pull/18450))
+* Update chibios-contrib for RP2040 i2c fixes take 2 ([#18455](https://github.com/qmk/qmk_firmware/pull/18455))
+* Fix comment of CM_QUES (Colemak question mark) ([#18557](https://github.com/qmk/qmk_firmware/pull/18557))
+* ChibiOS: Fix USB bus disconnect handling ([#18566](https://github.com/qmk/qmk_firmware/pull/18566))
+* Update ChibiOS-Contrib for USB IRQ and bus handling fixes ([#18574](https://github.com/qmk/qmk_firmware/pull/18574))
+* RP2040: only clear RX FIFO for serial pio driver clear ([#18581](https://github.com/qmk/qmk_firmware/pull/18581))
+* Fix ST7565 handler deadlock ([#18609](https://github.com/qmk/qmk_firmware/pull/18609))
+* Fix/Update ChibiOS hardware ID ([#18613](https://github.com/qmk/qmk_firmware/pull/18613))
+* Fix some rp2040 hardware ID errors ([#18617](https://github.com/qmk/qmk_firmware/pull/18617))
+* Fix joystick functionality for ChibiOS and OTG (Blackpill) ([#18631](https://github.com/qmk/qmk_firmware/pull/18631))
+* fix typo in solenoid.h ([#18635](https://github.com/qmk/qmk_firmware/pull/18635))
+* Fix boundary in `RGB_MATRIX_INDICATOR_SET_COLOR` ([#18650](https://github.com/qmk/qmk_firmware/pull/18650))
+* Fix MIDI output endpoint to use the out direction ([#18654](https://github.com/qmk/qmk_firmware/pull/18654))
+* Fix mouse use within send_string ([#18659](https://github.com/qmk/qmk_firmware/pull/18659))
+* Correctly build keymap.json containing additional config ([#18766](https://github.com/qmk/qmk_firmware/pull/18766))
+* Correctly build out of tree keymap.json containing additional config ([#18775](https://github.com/qmk/qmk_firmware/pull/18775))
+* Fix garbled test output ([#18822](https://github.com/qmk/qmk_firmware/pull/18822))
+* Fix rgb_matrix_set_flags_noeeprom declaration ([#18860](https://github.com/qmk/qmk_firmware/pull/18860))
+* Add missing Space Cadet alias ([#18876](https://github.com/qmk/qmk_firmware/pull/18876))
+* Fix oled_render to render all dirty blocks. ([#18887](https://github.com/qmk/qmk_firmware/pull/18887))
+* compiler.txt: ensure file exists before comparison ([#18921](https://github.com/qmk/qmk_firmware/pull/18921))
+* Fix compilation issue with WPM ([#18965](https://github.com/qmk/qmk_firmware/pull/18965))
+* Fix keycode parameter extraction to match the new DD keycodes ([#18977](https://github.com/qmk/qmk_firmware/pull/18977))
+* Fix jump in mouse_report value when scale changes during cirque get report ([#18992](https://github.com/qmk/qmk_firmware/pull/18992))
+* Fixup WS2812 vendor driver ([#19028](https://github.com/qmk/qmk_firmware/pull/19028))
+* Add missing prototype for get_hold_on_other_key_press to resolve #18855 ([#19056](https://github.com/qmk/qmk_firmware/pull/19056))
+* Fix duplicate key in keyboard.jsonschema ([#19058](https://github.com/qmk/qmk_firmware/pull/19058))
+* Fixup `keyboard.jsonschema`. ([#19059](https://github.com/qmk/qmk_firmware/pull/19059))
+* fixed MOUSEKEY_INERTIA on AVR ([#19096](https://github.com/qmk/qmk_firmware/pull/19096))
+* Fix encoder_init call order in keyboard_init ([#19140](https://github.com/qmk/qmk_firmware/pull/19140))
+* Fixup installation procedure for different Fedora versions. ([#19159](https://github.com/qmk/qmk_firmware/pull/19159))
diff --git a/docs/api_docs.md b/docs/api_docs.md
index 2594821ab0..3324bc545b 100644
--- a/docs/api_docs.md
+++ b/docs/api_docs.md
@@ -66,3 +66,41 @@ Once your compile job has finished you'll check the `result` key. The value of t
 * `firmware_keymap_url`: A list of URLs for the `keymap.c`
 * `firmware_source_url`: A list of URLs for the full firmware source code
 * `output`: The stdout and stderr for this compile job. Errors will be found here.
+
+## Constants :id=qmk-constants
+
+If you're writing a tool that leverages constants used within QMK, the API is used to publish "locked-in" versions of those constants in order to ensure that any third-party tooling has a canonical set of information to work with.
+
+The list of available constants can be retrieved by accessing one of the following endpoints:
+
+```
+$ curl https://keyboards.qmk.fm/v1/constants_metadata.json # For `master`
+{"last_updated": "2022-11-26 00:00:00 GMT", "constants": {"keycodes": ["0.0.1"]}}
+
+$ curl https://keyboards.develop.qmk.fm/v1/constants_metadata.json # For `develop`
+{"last_updated": "2022-11-26 12:00:00 GMT", "constants": {"keycodes": ["0.0.1", "0.0.2"]}}
+```
+
+!> Versions exported by the `master` endpoint are locked-in. Any extra versions that exist on the `develop` endpoint which don't exist in `master` are subject to change.
+
+?> Only keycodes are currently published, but over time all other "externally visible" IDs are expected to appear on these endpoints.
+
+To retrieve the constants associated with a subsystem, the endpoint format is as follows:
+```
+# https://keyboards.qmk.fm/v1/constants/{subsystem}_{version}.json
+```
+Which, for the metadata endpoint above results in a request of:
+```
+$ curl https://keyboards.qmk.fm/v1/constants/keycodes_0.0.1.json
+{
+    "ranges": {
+        "0x0000/0x00FF": {
+            "define": "QK_BASIC"
+        },
+        "0x0100/0x1EFF": {
+            "define": "QK_MODS"
+        },
+        "0x2000/0x1FFF": {
+            "define": "QK_MOD_TAP"
+<snip>
+```
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 8bceb39409..6233d5a392 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -28,7 +28,7 @@ The next Breaking Change is scheduled for February 26, 2023.
 
 ### Important Dates
 
-* 2022 Nov 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2022 Nov 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
 * 2022 Jan 29 - `develop` closed to new PR's.
 * 2022 Jan 29 - Call for testers.
 * 2022 Feb 12 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index ed2b466de3..2f974c3817 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -112,6 +112,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
 - submitters can have a personal (or bells-and-whistles) keymap showcasing capabilities in the same PR but it shouldn't be embedded in the 'default' keymap
 - submitters can also have a "manufacturer-matching" keymap that mirrors existing functionality of the commercial product, if porting an existing board
 - Do not include VIA json files in the PR. These do not belong in the QMK repository as they are not used by QMK firmware -- they belong in the [VIA Keyboard Repo](https://github.com/the-via/keyboards)
+- Do not include KLE json files in the PR. These have no use within QMK.
 - Do not include source files from another keyboard or vendors keyboard folder. Including core files is fine.
   - For instance, only `wilba_tech` boards shall include `keyboards/wilba_tech/wt_main.c` and  `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine for any and all boards.
   - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out.
@@ -135,7 +136,7 @@ Also, specific to ChibiOS:
     - for new MCUs, a new "child" keyboard should be added that targets your newly-added MCU, so that builds can be verified
     - for new hardware support such as display panels, core-side matrix implementations, or other peripherals, an associated keymap should be provided
     - if an existing keymap exists that can leverage this functionality this may not be required (e.g. a new RGB driver chip, supported by the `rgb` keymap) -- consult with the QMK Collaborators on Discord to determine if there is sufficient overlap already
-- any features adding `_kb`/`_user` callbacks must return a `bool`, to allow for user override of keyboard-level callbacks. 
+- any features adding `_kb`/`_user` callbacks must return a `bool`, to allow for user override of keyboard-level callbacks.
 - other requirements are at the discretion of QMK collaborators
     - core is a lot more subjective given the breadth of posted changes
 
diff --git a/readme.md b/readme.md
index c2fcda103e..5649ddfa09 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,3 @@
-# THIS IS THE DEVELOP BRANCH
-
-Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
-
 # Quantum Mechanical Keyboard Firmware
 
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)

From cbedec64a42ddc408fc5053dc3a68afc6f48d4c1 Mon Sep 17 00:00:00 2001
From: Leo Lou <louyuhong@gmail.com>
Date: Mon, 28 Nov 2022 10:03:58 +0800
Subject: [PATCH 937/959] Add piantor (#18920)

* Add piantor

* Update keyboards/beekeeb/piantor/readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/beekeeb/piantor/config.h            | 34 +++++++++
 keyboards/beekeeb/piantor/info.json           | 73 +++++++++++++++++++
 .../beekeeb/piantor/keymaps/default/keymap.c  | 27 +++++++
 keyboards/beekeeb/piantor/readme.md           | 26 +++++++
 keyboards/beekeeb/piantor/rules.mk            |  1 +
 5 files changed, 161 insertions(+)
 create mode 100644 keyboards/beekeeb/piantor/config.h
 create mode 100644 keyboards/beekeeb/piantor/info.json
 create mode 100644 keyboards/beekeeb/piantor/keymaps/default/keymap.c
 create mode 100644 keyboards/beekeeb/piantor/readme.md
 create mode 100644 keyboards/beekeeb/piantor/rules.mk

diff --git a/keyboards/beekeeb/piantor/config.h b/keyboards/beekeeb/piantor/config.h
new file mode 100644
index 0000000000..f8d74af211
--- /dev/null
+++ b/keyboards/beekeeb/piantor/config.h
@@ -0,0 +1,34 @@
+// Copyright 2022 beekeeb
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+#define DIRECT_PINS { \
+    { GP5, GP4, GP11, GP15, GP3, GP2}, \
+    { GP22, GP20, GP10, GP14, GP9, GP8}, \
+    { GP21, GP19, GP6, GP7, GP13, GP12}, \
+    { GP17, GP18, GP16, NO_PIN, NO_PIN, NO_PIN} \
+}
+
+#define DIRECT_PINS_RIGHT { \
+    { GP22, GP21, GP2, GP5, GP8, GP11}, \
+    { GP20, GP19, GP3, GP6, GP9, GP12}, \
+    { GP18, GP17, GP4, GP7, GP10, GP13}, \
+    { GP15, GP14, GP16, NO_PIN, NO_PIN, NO_PIN} \
+}
+
+#define BOOTMAGIC_LITE_ROW    0
+#define BOOTMAGIC_LITE_COLUMN 5
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/info.json
new file mode 100644
index 0000000000..623e60be15
--- /dev/null
+++ b/keyboards/beekeeb/piantor/info.json
@@ -0,0 +1,73 @@
+{
+    "manufacturer": "beekeeb",
+    "keyboard_name": "piantor",
+    "maintainer": "beekeeb",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "debounce": 5,
+    "processor": "RP2040",
+    "url": "https://github.com/beekeeb/piantor",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0xBEEB"
+    },
+    "split": {
+        "enabled": true
+    },
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.25 },
+                { "matrix": [0, 1], "x": 1, "y": 0.25 },
+                { "matrix": [0, 2], "x": 2, "y": 0.125 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0.125 },
+                { "matrix": [0, 5], "x": 5, "y": 0.25 },
+                { "matrix": [4, 0], "x": 8, "y": 0.25 },
+                { "matrix": [4, 1], "x": 9, "y": 0.125 },
+                { "matrix": [4, 2], "x": 10, "y": 0 },
+                { "matrix": [4, 3], "x": 11, "y": 0.125 },
+                { "matrix": [4, 4], "x": 12, "y": 0.25 },
+                { "matrix": [4, 5], "x": 13, "y": 0.25 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.125 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1.125 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [5, 0], "x": 8, "y": 1.25 },
+                { "matrix": [5, 1], "x": 9, "y": 1.125 },
+                { "matrix": [5, 2], "x": 10, "y": 1 },
+                { "matrix": [5, 3], "x": 11, "y": 1.125 },
+                { "matrix": [5, 4], "x": 12, "y": 1.25 },
+                { "matrix": [5, 5], "x": 13, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.125 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2.125 },
+                { "matrix": [2, 5], "x": 5, "y": 2.25 },
+                { "matrix": [6, 0], "x": 8, "y": 2.25 },
+                { "matrix": [6, 1], "x": 9, "y": 2.125 },
+                { "matrix": [6, 2], "x": 10, "y": 2 },
+                { "matrix": [6, 3], "x": 11, "y": 2.125 },
+                { "matrix": [6, 4], "x": 12, "y": 2.25 },
+                { "matrix": [6, 5], "x": 13, "y": 2.25 },
+                { "matrix": [3, 0], "x": 3.5, "y": 3.25 },
+                { "matrix": [3, 1], "x": 4.5, "y": 3.5 },
+                { "matrix": [3, 2], "x": 5.5, "y": 3.75 },
+                { "matrix": [7, 0], "x": 7.5, "y": 3.75 },
+                { "matrix": [7, 1], "x": 8.5, "y": 3.5 },
+                { "matrix": [7, 2], "x": 9.5, "y": 3.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/beekeeb/piantor/keymaps/default/keymap.c b/keyboards/beekeeb/piantor/keymaps/default/keymap.c
new file mode 100644
index 0000000000..434e251fb7
--- /dev/null
+++ b/keyboards/beekeeb/piantor/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2022 beekeeb
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┐
+      * │Tab│ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │Bsp│
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Ctl│ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │ ' │
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Sft│ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │Sft│
+      * └───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┘
+      *               ┌───┐                   ┌───┐
+      *               │GUI├───┐           ┌───┤Alt│
+      *               └───┤Bsp├───┐   ┌───┤Ent├───┘
+      *                   └───┤   │   │   ├───┘
+      *                       └───┘   └───┘
+      */
+    [0] = LAYOUT_split_3x6_3(
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                                            KC_LGUI, KC_BSPC, KC_SPC,           KC_SPC,  KC_ENT,  KC_RALT
+    )
+};
diff --git a/keyboards/beekeeb/piantor/readme.md b/keyboards/beekeeb/piantor/readme.md
new file mode 100644
index 0000000000..5171fd547e
--- /dev/null
+++ b/keyboards/beekeeb/piantor/readme.md
@@ -0,0 +1,26 @@
+# Piantor
+
+![Piantor](https://i.imgur.com/xIF754Qh.jpg)
+
+Piantor is a Cantor fork with Raspberry Pi Pico, hybrid hotswap socket and soldered-in switches support, and a breakable column.
+
+* Keyboard Maintainer: [beekeeb](https://github.com/beekeeb)
+* Hardware Supported: RP2040
+* Hardware Availability: https://shop.beekeeb.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make beekeeb/piantor:default
+
+Flashing example for this keyboard:
+
+    make beekeeb/piantor:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Hold the `BOOTSEL` button on the PCB while plugin in the usb cable.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/beekeeb/piantor/rules.mk b/keyboards/beekeeb/piantor/rules.mk
new file mode 100644
index 0000000000..161ec22b16
--- /dev/null
+++ b/keyboards/beekeeb/piantor/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor

From 5a3770d363a657b73c644bc70d4586c0d142f372 Mon Sep 17 00:00:00 2001
From: Ndot <Ndot@users.noreply.github.com>
Date: Mon, 28 Nov 2022 02:08:27 +0000
Subject: [PATCH 938/959] [Docs] Update reference_info_json.md (#18817)

* [Docs] Update reference_info_json.md

- Makes it easier to find keyboard.jsonschema.
- Adds a reference to the Data Driven page.

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 docs/reference_info_json.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index c872bcb696..a96d9d4b6f 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -1,6 +1,6 @@
 # `info.json`
 
-The information contained in `info.json` is combined with the `config.h` and `rules.mk` files, dynamically generating the necessary configuration for your keyboard at compile time. It is also used by the [QMK API](https://github.com/qmk/qmk_api), and contains the information [QMK Configurator](https://config.qmk.fm/) needs to display a representation of your keyboard.
+The information contained in `info.json` is combined with the `config.h` and `rules.mk` files, dynamically generating the necessary configuration for your keyboard at compile time. It is also used by the [QMK API](https://github.com/qmk/qmk_api), and contains the information [QMK Configurator](https://config.qmk.fm/) needs to display a representation of your keyboard. Its key/value pairs are ruled by the [`data/schemas/keyboard.jsonschema`](https://github.com/qmk/qmk_firmware/blob/master/data/schemas/keyboard.jsonschema) file. To learn more about the why and how of the schema file see the [Data Driven Configuration](https://docs.qmk.fm/#/data_driven_config) page.
 
 You can create `info.json` files at every level under `qmk_firmware/keyboards/<name>`. These files are combined, with more specific files overriding keys in less specific files. This means you do not need to duplicate your metadata information. For example, `qmk_firmware/keyboards/clueboard/info.json` specifies `manufacturer` and `maintainer`, while `qmk_firmware/keyboards/clueboard/66/info.json` specifies more specific information about Clueboard 66%.
 
@@ -22,9 +22,6 @@ The `info.json` file is a JSON formatted dictionary. The first six keys noted he
     * Example: `skullydazed`
 * `usb`
     * Configure USB VID, PID, and device version. See the [USB](#USB) section for more detail.
-
-There are many more optional keys, some of which are described below. Others may be found by examining `data/schemas`.
-
 * `debounce`
     * The amount of time in milliseconds to wait for debounce to happen.
     * Default: `5`
@@ -39,6 +36,9 @@ There are many more optional keys, some of which are described below. Others may
 * `rgblight`
     * Configure the [RGB Lighting feature](feature_rgblight.md). See the [RGB Lighting](#rgb-lighting) section for more detail.
 
+
+?> For all the available keys and their allowed values refer back to the [`data/schemas/keyboard.jsonschema`](https://github.com/qmk/qmk_firmware/blob/master/data/schemas/keyboard.jsonschema) file.
+
 ### Layout Format
 
 Within our `info.json` file the `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout macros, for example `LAYOUT_ansi` or `LAYOUT_iso`.

From 690eb4a4533940bd57646ba2021179840273eb0f Mon Sep 17 00:00:00 2001
From: gshmu <mhohai@aim.com>
Date: Mon, 28 Nov 2022 13:25:56 +0800
Subject: [PATCH 939/959] Fix RWIN typo within keycode list (#19155)

fix typo
---
 docs/keycodes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index 8613512221..f660c7f526 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -625,7 +625,7 @@ See also: [Modifier Keys](feature_advanced_keycodes.md#modifier-keys)
 |`RCTL(kc)`|                                  |Hold Right Control and press `kc`                     |
 |`RSFT(kc)`|                                  |Hold Right Shift and press `kc`                       |
 |`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)`            |Hold Right Alt (AltGr) and press `kc`                 |
-|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`            |Hold Right GUI and press `kc`                         |
+|`RGUI(kc)`|`RCMD(kc)`, `RWIN(kc)`            |Hold Right GUI and press `kc`                         |
 |`LSG(kc)` |`SGUI(kc)`, `SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and Left GUI and press `kc`           |
 |`LAG(kc)` |                                  |Hold Left Alt and Left GUI and press `kc`             |
 |`RSG(kc)` |                                  |Hold Right Shift and Right GUI and press `kc`         |

From d27b852fccf6165730b5a013e49ae69ab3124c56 Mon Sep 17 00:00:00 2001
From: Ryan Baker <76887060+ryanbaekr@users.noreply.github.com>
Date: Mon, 28 Nov 2022 00:46:40 -0500
Subject: [PATCH 940/959] new keyboard rb1 (#18164)

* rb1

* Update keymap.c

* Update keyboards/ryanbaekr/rb1/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Delete rb1.c

* Delete rb1.h

* Update keyboards/ryanbaekr/rb1/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/ryanbaekr/rb1/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/ryanbaekr/rb1/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/ryanbaekr/rb1/config.h              | 66 +++++++++++++++++++
 keyboards/ryanbaekr/rb1/info.json             | 18 +++++
 .../ryanbaekr/rb1/keymaps/default/keymap.c    | 22 +++++++
 .../ryanbaekr/rb1/keymaps/default/readme.md   |  1 +
 keyboards/ryanbaekr/rb1/readme.md             | 15 +++++
 keyboards/ryanbaekr/rb1/rules.mk              | 18 +++++
 keyboards/ryanbaekr/rb69/info.json            |  6 +-
 keyboards/ryanbaekr/rb86/info.json            |  6 +-
 8 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 keyboards/ryanbaekr/rb1/config.h
 create mode 100644 keyboards/ryanbaekr/rb1/info.json
 create mode 100644 keyboards/ryanbaekr/rb1/keymaps/default/keymap.c
 create mode 100644 keyboards/ryanbaekr/rb1/keymaps/default/readme.md
 create mode 100644 keyboards/ryanbaekr/rb1/readme.md
 create mode 100644 keyboards/ryanbaekr/rb1/rules.mk

diff --git a/keyboards/ryanbaekr/rb1/config.h b/keyboards/ryanbaekr/rb1/config.h
new file mode 100644
index 0000000000..1e1c0de880
--- /dev/null
+++ b/keyboards/ryanbaekr/rb1/config.h
@@ -0,0 +1,66 @@
+/*
+Copyright 2022 ryanbaekr
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * DIRECT: AVR pins used for keys
+ *
+ */
+#define DIRECT_PINS {{ B1 }}
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
diff --git a/keyboards/ryanbaekr/rb1/info.json b/keyboards/ryanbaekr/rb1/info.json
new file mode 100644
index 0000000000..07a76e578c
--- /dev/null
+++ b/keyboards/ryanbaekr/rb1/info.json
@@ -0,0 +1,18 @@
+{
+    "keyboard_name": "rb1",
+    "manufacturer": "ryanbaekr",
+    "url": "",
+    "maintainer": "ryanbaekr",
+    "usb": {
+        "vid": "0x7262",
+        "pid": "0x0001",
+        "device_version": "0.0.3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x":0, "y":0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ryanbaekr/rb1/keymaps/default/keymap.c b/keyboards/ryanbaekr/rb1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..06ddc64887
--- /dev/null
+++ b/keyboards/ryanbaekr/rb1/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+/* Copyright 2022 ryanbaekr
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this 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_F6
+    )
+};
diff --git a/keyboards/ryanbaekr/rb1/keymaps/default/readme.md b/keyboards/ryanbaekr/rb1/keymaps/default/readme.md
new file mode 100644
index 0000000000..30225e7aad
--- /dev/null
+++ b/keyboards/ryanbaekr/rb1/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for rb1
diff --git a/keyboards/ryanbaekr/rb1/readme.md b/keyboards/ryanbaekr/rb1/readme.md
new file mode 100644
index 0000000000..ce46a83f69
--- /dev/null
+++ b/keyboards/ryanbaekr/rb1/readme.md
@@ -0,0 +1,15 @@
+# rb1
+
+A single key macropad.
+
+* Keyboard Maintainer: [ryanbaekr](https://github.com/ryanbaekr)
+* Hardware Supported: rb1 with SparkFun Qwiic Pro Micro - USB-C
+* Hardware Availability: 2022/08/25
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ryanbaekr/rb1:default
+
+To boot into the bootloader, hold the reset button on the SparkFun Qwiic Pro Micro - USB-C on plug in
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/ryanbaekr/rb1/rules.mk b/keyboards/ryanbaekr/rb1/rules.mk
new file mode 100644
index 0000000000..515ca5621f
--- /dev/null
+++ b/keyboards/ryanbaekr/rb1/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index 805169a526..03b2054712 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "rb69", 
+    "keyboard_name": "rb69",
     "manufacturer": "ryanbaekr",
-    "url": "", 
-    "maintainer": "qmk", 
+    "url": "",
+    "maintainer": "ryanbaekr",
     "usb": {
         "vid": "0x7262",
         "pid": "0x0069",
diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json
index 05e3da7686..65806aef95 100644
--- a/keyboards/ryanbaekr/rb86/info.json
+++ b/keyboards/ryanbaekr/rb86/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "rb86", 
+    "keyboard_name": "rb86",
     "manufacturer": "ryanbaekr",
-    "url": "", 
-    "maintainer": "qmk", 
+    "url": "",
+    "maintainer": "ryanbaekr",
     "usb": {
         "vid": "0x7262",
         "pid": "0x0086",

From 9ddb0165a4fbdb6216fbecd17a5f6c59dacccdb4 Mon Sep 17 00:00:00 2001
From: JayceFayne <13365789+JayceFayne@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:34:20 +0100
Subject: [PATCH 941/959] fix typo (#19189)

---
 docs/one_shot_keys.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/one_shot_keys.md b/docs/one_shot_keys.md
index 49910a49e2..515830ea32 100644
--- a/docs/one_shot_keys.md
+++ b/docs/one_shot_keys.md
@@ -27,7 +27,7 @@ For one shot layers, you need to call `set_oneshot_layer(LAYER, ONESHOT_START)`
 
 For one shot mods, you need to call `set_oneshot_mods(MOD_BIT(KC_*))` to set it, or `clear_oneshot_mods()` to cancel it.
 
-!> If you're having issues with OSM translating over Remote Desktop Connection, this can be fixed by opening the settings, going to the "Local Resources" tap, and in the keyboard section, change the drop down to "On this Computer".  This will fix the issue and allow OSM to function properly over Remote Desktop.
+!> If you're having issues with OSM translating over Remote Desktop Connection, this can be fixed by opening the settings, going to the "Local Resources" tab, and in the keyboard section, change the drop down to "On this Computer".  This will fix the issue and allow OSM to function properly over Remote Desktop.
 
 ## Callbacks
 

From 8a8000b4ec379448848f561f57bbe2c781376357 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 30 Nov 2022 03:34:57 +1100
Subject: [PATCH 942/959] Fix Czech sendstring LUT (#19193)

---
 quantum/keymap_extras/sendstring_czech.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/keymap_extras/sendstring_czech.h b/quantum/keymap_extras/sendstring_czech.h
index 6693999f51..54c3317418 100644
--- a/quantum/keymap_extras/sendstring_czech.h
+++ b/quantum/keymap_extras/sendstring_czech.h
@@ -96,7 +96,7 @@ const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
     //       !        "        #        $        %        &        '
     KC_SPC,  CZ_SECT, CZ_URNG, CZ_X,    CZ_URNG, CZ_EQL,  CZ_C,    CZ_DIAE,
     // (     )        *        +        ,        -        .        /
-    CZ_LPRN, CZ_LPRN, CZ_MINS, CZ_PLUS, CZ_COMM, CZ_MINS, CZ_DOT,  CZ_UACU,
+    CZ_RPRN, CZ_RPRN, CZ_MINS, CZ_PLUS, CZ_COMM, CZ_MINS, CZ_DOT,  CZ_UACU,
     // 0     1        2        3        4        5        6        7
     CZ_EACU, CZ_PLUS, CZ_ECAR, CZ_SCAR, CZ_CCAR, CZ_RCAR, CZ_ZCAR, CZ_YACU,
     // 8     9        :        ;        <        =        >        ?

From 4a87af0e9af046d5fc00d930476920c0c34a57a7 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 29 Nov 2022 11:43:42 -0800
Subject: [PATCH 943/959] [Keymap] Drashna updates for 0.19 (#19175)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix up bastardkb boards since blackpill support is officially added.
  * Check for blackpill version, not elite c.
  * Add checks in chibiOS config since multiple ARM controllers supported.
  * Rework rules.mk for keymaps to better handle arm vs avr support
* Start moving away from `matrix_*_*` functions.
  * `housekeeping_task_*` instead of `matrix_scan_*`
  * `keyboard_(pre|post)_init_*` instead of `matrix_init_*`
* Add ℂℴmⅈℂ unicode input method.
* Clean up unicode code to be more compact and flexible.
* Remove/move Pro Micro LED commands to userspace and better filter them
* Fixup OLED code
  * Use newer quantum keycode functions/preprocessors rather than manual bit manipulation
  * Make unicode mode render much more compact/simple.
* Make qmk secrets more self contained
* Remove custom implementation of split watchdog
---
 .../charybdis/3x5/keymaps/drashna/config.h    | 113 ++++++++--------
 .../charybdis/3x5/keymaps/drashna/halconf.h   |  14 +-
 .../charybdis/3x5/keymaps/drashna/keymap.c    |  12 +-
 .../charybdis/3x5/keymaps/drashna/mcuconf.h   |  30 ++--
 .../charybdis/3x5/keymaps/drashna/rules.mk    |  59 +++++---
 .../charybdis/4x6/keymaps/drashna/config.h    | 108 ++++-----------
 .../charybdis/4x6/keymaps/drashna/halconf.h   |  26 ----
 .../charybdis/4x6/keymaps/drashna/keymap.c    |  26 ++--
 .../charybdis/4x6/keymaps/drashna/mcuconf.h   |  25 +---
 .../charybdis/4x6/keymaps/drashna/rules.mk    |  80 +++++++----
 .../dilemma/3x5_2/keymaps/drashna/halconf.h   |  23 ++++
 .../dilemma/3x5_2/keymaps/drashna/keymap.c    |  18 ++-
 .../dilemma/3x5_2/keymaps/drashna/mcuconf.h   |  26 ++++
 .../4x6_right/keymaps/drashna/keymap.c        |   4 +-
 .../5x6_right/keymaps/drashna/keymap.c        |  33 +----
 .../5x6_right/keymaps/drashna/rules.mk        |  72 ++++++----
 .../keebio/iris/keymaps/drashna/config.h      |   8 +-
 .../keebio/iris/keymaps/drashna/keymap.c      |  10 --
 .../keebio/iris/keymaps/drashna/rules.mk      |   4 -
 .../keebio/viterbi/keymaps/drashna/keymap.c   |  10 --
 .../keebio/viterbi/keymaps/drashna/rules.mk   |   3 +-
 keyboards/orthodox/keymaps/drashna/config.h   |   3 +-
 keyboards/orthodox/keymaps/drashna/keymap.c   |  10 --
 .../splitkb/kyria/keymaps/drashna/keymap.c    |   7 +-
 layouts/community/ergodox/drashna/keymap.c    |   2 +-
 layouts/community/ortho_4x12/drashna/config.h |   4 +-
 layouts/community/ortho_4x12/drashna/keymap.c |  13 +-
 layouts/community/ortho_4x12/drashna/rules.mk |  11 +-
 layouts/community/ortho_5x12/drashna/rules.mk |   6 +
 .../community/split_3x6_3/drashna/chconf.h    |   6 +-
 .../community/split_3x6_3/drashna/config.h    |   9 +-
 .../community/split_3x6_3/drashna/halconf.h   |   7 +-
 .../community/split_3x6_3/drashna/keymap.c    |   3 +-
 .../community/split_3x6_3/drashna/mcuconf.h   |  24 ++--
 .../community/split_3x6_3/drashna/rules.mk    |  27 ++--
 users/drashna/bootmagic_better.c              |   2 +-
 users/drashna/callbacks.c                     |  32 ++---
 users/drashna/callbacks.h                     |   4 +-
 users/drashna/callbacks.md                    |   5 -
 users/drashna/drashna.c                       |  27 +++-
 users/drashna/keyrecords/process_records.h    |   1 +
 users/drashna/keyrecords/unicode.c            | 128 +++++++++++++++---
 users/drashna/keyrecords/unicode.h            |   7 +-
 users/drashna/oled/oled_stuff.c               |  58 +++-----
 users/drashna/post_config.h                   |  15 +-
 users/drashna/rgb/rgblight_config.h           |  10 +-
 users/drashna/rules.mk                        |   7 +-
 users/drashna/split/split_config.h            |   5 +-
 users/drashna/split/transport_sync.c          |  45 +-----
 49 files changed, 622 insertions(+), 560 deletions(-)
 delete mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
 create mode 100644 keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
index ad549a5e22..514a153623 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
@@ -18,87 +18,90 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#undef PRODUCT
-#define PRODUCT "Charybdis Nano (Blackpill)"
+#ifdef KEYBOARD_bastardkb_charybdis_3x5_blackpill
 
-#undef MATRIX_ROW_PINS
-#define MATRIX_ROW_PINS \
-    { B12, B13, B14, B15 }
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS \
-    { A15, B3, B4, B5, B6 }
+#    undef MATRIX_ROW_PINS
+#    define MATRIX_ROW_PINS \
+        { B12, B13, B14, B15 }
+#    undef MATRIX_COL_PINS
+#    define MATRIX_COL_PINS \
+        { A15, B3, B4, B5, B6 }
 
+#    undef MATRIX_ROW_PINS_RIGHT
+#    define MATRIX_ROW_PINS_RIGHT \
+        { B12, B13, B14, B15 }
+#    undef MATRIX_COL_PINS_RIGHT
+#    define MATRIX_COL_PINS_RIGHT \
+        { A15, B3, B4, B5, B6 }
 
-#undef MATRIX_ROW_PINS_RIGHT
-#define MATRIX_ROW_PINS_RIGHT \
-    { B12, B13, B14, B15 }
-#undef MATRIX_COL_PINS_RIGHT
-#define MATRIX_COL_PINS_RIGHT \
-    { A15, B3, B4, B5, B6 }
-
-#define USB_VBUS_PIN        B10
-#define SPLIT_HAND_PIN      C14  // high = left, low = right
+#    define USB_VBUS_PIN B10
+#    undef SPLIT_HAND_PIN
+#    define SPLIT_HAND_PIN C14 // high = left, low = right
 
 // WS2812 RGB LED strip input and number of LEDs
-#undef RGB_DI_PIN
-#define RGB_DI_PIN          A1
-#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#define WS2812_PWM_DRIVER   PWMD2  // default: PWMD2
-#define WS2812_PWM_CHANNEL  2      // 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_EXTERNAL_PULLUP
+#    undef RGB_DI_PIN
+#    define RGB_DI_PIN A1
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#    define WS2812_PWM_DRIVER PWMD2 // default: PWMD2
+#    define WS2812_PWM_CHANNEL 2    // 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_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_TARGET_PERIOD 800000
+#    undef WS2812_DMA_STREAM
+#    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_TARGET_PERIOD 800000
 
-#define DEBUG_LED_PIN     C13
+#    define DEBUG_LED_PIN C13
 
 /* Audio config */
-#define AUDIO_PIN          B1
-#define AUDIO_PWM_DRIVER   PWMD3
-#define AUDIO_PWM_CHANNEL  4
-#define AUDIO_PWM_PAL_MODE 2
+#    define AUDIO_PIN B1
+#    define AUDIO_PWM_DRIVER PWMD3
+#    define AUDIO_PWM_CHANNEL 4
+#    define AUDIO_PWM_PAL_MODE 2
 
 /* serial.c configuration for split keyboard */
-#undef SOFT_SERIAL_PIN
-#define SERIAL_USART_FULL_DUPLEX  // Enable full duplex operation mode.
-#define SERIAL_USART_TX_PIN      A2
-#define SERIAL_USART_RX_PIN      A3
-#define SERIAL_USART_DRIVER      SD2
-#define SERIAL_USART_TX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#define SERIAL_USART_RX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
-#define SERIAL_USART_SPEED       921600
+#    undef SOFT_SERIAL_PIN
+#    define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode.
+#    undef SERIAL_USART_TX_PIN
+#    define SERIAL_USART_TX_PIN A2
+#    undef SERIAL_USART_RX_PIN
+#    define SERIAL_USART_RX_PIN A3
+#    define SERIAL_USART_DRIVER SD2
+#    define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#    define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#    define SERIAL_USART_TIMEOUT 100   // USART driver timeout. default 100
+#    define SERIAL_USART_SPEED 921600
 // #define SERIAL_USART_PIN_SWAP // swap RX and TX pins on master
 // To use the highest possible baudrate (3.75Mbit/s) uncomment the following
 // line, this can result in dropped communications so lower the speed if there
 // are many timeouts.
 // #define SERIAL_USART_SPEED (STM32_PCLK2 >> 4)
 
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
+#    define CRC8_USE_TABLE
+#    define CRC8_OPTIMIZE_SPEED
 
 /* spi config for eeprom and pmw3360 sensor */
-#define SPI_DRIVER                           SPID1
-#define SPI_SCK_PIN                          A5
-#define SPI_SCK_PAL_MODE                     5
-#define SPI_MOSI_PIN                         A7
-#define SPI_MOSI_PAL_MODE                    5
-#define SPI_MISO_PIN                         A6
-#define SPI_MISO_PAL_MODE                    5
+#    define SPI_DRIVER SPID1
+#    define SPI_SCK_PIN A5
+#    define SPI_SCK_PAL_MODE 5
+#    define SPI_MOSI_PIN A7
+#    define SPI_MOSI_PAL_MODE 5
+#    define SPI_MISO_PIN A6
+#    define SPI_MISO_PAL_MODE 5
 
 /* eeprom config */
-#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
-#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
+#    define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
+#    define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64
 // #define EXTERNAL_EEPROM_BYTE_COUNT           8196
 // #define EXTERNAL_EEPROM_PAGE_SIZE            32
 // #define EXTERNAL_EEPROM_ADDRESS_SIZE         2
 
 /* pmw3360 config  */
-#undef PMW33XX_CS_PIN
-#define PMW33XX_CS_PIN                       B0
+#    undef PMW33XX_CS_PIN
+#    define PMW33XX_CS_PIN B0
+#endif
 
 #define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
 #define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
index bc07c10527..3b254172b4 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
@@ -15,11 +15,13 @@
  */
 #pragma once
 
-#define HAL_USE_PWM     TRUE
-#define HAL_USE_SERIAL  TRUE
-#define HAL_USE_I2C     TRUE
-#define HAL_USE_SPI     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
+#    define HAL_USE_PWM TRUE
+#    define HAL_USE_SERIAL TRUE
+#    define HAL_USE_I2C TRUE
+#    define HAL_USE_SPI TRUE
+#    define SPI_USE_WAIT TRUE
+#    define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#endif
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
index a923a80b40..02cb89fe65 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
@@ -83,24 +83,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-void matrix_init_keyemap(void) { setPinInputHigh(A0); }
+#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
+void keyboard_pre_init_keymap(void) {
+    setPinInputHigh(A0);
+}
 
-void matrix_scan_keymap(void) {
+void housekeeping_task_keymap(void) {
     if (!readPin(A0)) {
         reset_keyboard();
     }
 }
 
-#ifdef USB_VBUS_PIN
+#    ifdef USB_VBUS_PIN
 bool usb_vbus_state(void) {
     setPinInputLow(USB_VBUS_PIN);
     wait_us(5);
     return readPin(USB_VBUS_PIN);
 }
-#endif
+#    endif
 
 void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
     for (int32_t i = 0; i < 40; i++) {
         __asm__ volatile("nop" ::: "memory");
     }
 }
+#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
index fd71b54b77..9c40967015 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
@@ -18,25 +18,27 @@
 
 #include_next "mcuconf.h"
 
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
+#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
+#    undef STM32_I2C_USE_I2C1
+#    define STM32_I2C_USE_I2C1 TRUE
 
 // #undef STM32_I2C_I2C1_RX_DMA_STREAM
 // #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-#undef STM32_I2C_I2C1_TX_DMA_STREAM
-#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+#    undef STM32_I2C_I2C1_TX_DMA_STREAM
+#    define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
 
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
+#    undef STM32_PWM_USE_TIM2
+#    define STM32_PWM_USE_TIM2 TRUE
 
-#undef STM32_PWM_USE_TIM3
-#define STM32_PWM_USE_TIM3 TRUE
+#    undef STM32_PWM_USE_TIM3
+#    define STM32_PWM_USE_TIM3 TRUE
 
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1           TRUE
+#    undef STM32_SPI_USE_SPI1
+#    define STM32_SPI_USE_SPI1 TRUE
 
-#undef STM32_SERIAL_USE_USART2
-#define STM32_SERIAL_USE_USART2 TRUE
+#    undef STM32_SERIAL_USE_USART2
+#    define STM32_SERIAL_USE_USART2 TRUE
 
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 5
+#    undef STM32_ST_USE_TIMER
+#    define STM32_ST_USE_TIMER 5
+#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
index dc0395c800..ff4ede45ca 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
@@ -1,28 +1,45 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
+RGB_MATRIX_ENABLE = no
+CUSTOM_UNICODE_ENABLE = no
+CUSTOM_POINTING_DEVICE = no
+CUSTOM_SPLIT_TRANSPORT_SYNC = no
 
-# Bootloader selection
-# BOOTLOADER = stm32-dfu
-BOOTLOADER := tinyuf2
 
-LTO_ENABLE := no
+ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/blackpill)
+    # Bootloader selection
+    BOOTLOADER := tinyuf2
 
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-KEYBOARD_SHARED_EP = yes
-MOUSE_SHARED_EP = yes
+    LTO_ENABLE := no
 
-EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
-SERIAL_DRIVER = usart
-AUDIO_DRIVER = pwm_hardware
+    AUDIO_SUPPORTED = yes
+    AUDIO_ENABLE = yes
+    AUDIO_DRIVER = pwm_hardware
 
-AUDIO_SUPPORTED = yes
-AUDIO_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = yes
-CONSOLE_ENABLE = yes
+    OVERLOAD_FEATURES = yes
+endif
 
-AUTOCORRECT_ENABLE = yes
+ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/v2/stemcell)
+    OVERLOAD_FEATURES = yes
+endif
+ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/v2/splinky)
+    OVERLOAD_FEATURES = yes
+endif
 
-DEBOUNCE_TYPE = asym_eager_defer_pk
+
+ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
+    BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+    KEYBOARD_SHARED_EP = yes
+    MOUSE_SHARED_EP = yes
+
+    MOUSEKEY_ENABLE = yes
+    NKRO_ENABLE = yes
+    CONSOLE_ENABLE = yes
+    RGB_MATRIX_ENABLE = yes
+
+    AUTOCORRECT_ENABLE = yes
+
+    CUSTOM_UNICODE_ENABLE = yes
+    CUSTOM_POINTING_DEVICE = yes
+    CUSTOM_SPLIT_TRANSPORT_SYNC = yes
+
+    DEBOUNCE_TYPE = asym_eager_defer_pk
+endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
index e29ff644da..cb11ea2748 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -16,99 +16,49 @@
  */
 #pragma once
 
-#undef PRODUCT
-#define PRODUCT "Charybdis (4x6) Blackpill"
+#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
+#    undef MATRIX_COL_PINS
+#    define MATRIX_COL_PINS \
+        { B0, B1, B12, B3, B4, B5 }
 
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS \
-    { B0, B1, B12, B3, B4, B5 }
-#undef MATRIX_COL_PINS_RIGHT
-#define MATRIX_COL_PINS_RIGHT \
-    { B0, B1, B12, B3, B4, B5 }
+#    define USB_VBUS_PIN B10
+#    define DEBUG_LED_PIN C13
 
-#undef MATRIX_ROW_PINS
-#define MATRIX_ROW_PINS \
-    { B15, A2, B8, A8, B9 }
-#undef MATRIX_ROW_PINS_RIGHT
-#define MATRIX_ROW_PINS_RIGHT \
-    { B15, A2, B8, A8, B9 }
+#    define AUDIO_PIN B7
+#    define AUDIO_PWM_DRIVER PWMD4
+#    define AUDIO_PWM_CHANNEL 2
+#    define AUDIO_PWM_PAL_MODE 2
+#    define AUDIO_INIT_DELAY
+#    define AUDIO_ENABLE_TONE_MULTIPLEXING
+#    define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
 
+#    define SERIAL_USART_SPEED (1 * 1024 * 1024)
 
-#define DIODE_DIRECTION ROW2COL
-#define SPLIT_HAND_PIN A3
-#undef MASTER_RIGHT
-#define USB_VBUS_PIN B10
+#    undef POINTING_DEVICE_CS_PIN
+#    define POINTING_DEVICE_CS_PIN A15 // b14
+#    define PMW33XX_LIFTOFF_DISTANCE 0b1111
+#endif
 
-#undef RGB_DI_PIN
-#define RGB_DI_PIN A1
-#define WS2812_EXTERNAL_PULLUP
-#define WS2812_PWM_DRIVER PWMD2
-#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_TARGET_PERIOD 800000
-
-#define DEBUG_LED_PIN     C13
-
-#define AUDIO_PIN          B7
-#define AUDIO_PWM_DRIVER   PWMD4
-#define AUDIO_PWM_CHANNEL  2
-#define AUDIO_PWM_PAL_MODE 2
-#define AUDIO_INIT_DELAY
-#define AUDIO_ENABLE_TONE_MULTIPLEXING
-#define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
-
-#undef SOFT_SERIAL_PIN
-// #define SERIAL_USART_FULL_DUPLEX  // Enable full duplex operation mode.
-#define SERIAL_USART_TX_PIN      A9
-// #define SERIAL_USART_RX_PIN      A3
-// #define SERIAL_USART_DRIVER      SD2
-// #define SERIAL_USART_TX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-// #define SERIAL_USART_RX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-// #define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
-// #define SERIAL_USART_SPEED       921600
-#define SERIAL_USART_SPEED (1.5 * 1024 * 1024)
-
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
-
-/* spi config for eeprom and pmw3360 sensor */
-#define SPI_DRIVER                           SPID1
-#define SPI_SCK_PIN                          A5
-#define SPI_SCK_PAL_MODE                     5
-#define SPI_MOSI_PIN                         A7
-#define SPI_MOSI_PAL_MODE                    5
-#define SPI_MISO_PIN                         A6
-#define SPI_MISO_PAL_MODE                    5
-
-#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
-#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
-
-#undef PMW33XX_CS_PIN
-#define PMW33XX_CS_PIN                       A15  // b14
-#define PMW33XX_LIFTOFF_DISTANCE 0b1111
 #undef ROTATIONAL_TRANSFORM_ANGLE
-#define ROTATIONAL_TRANSFORM_ANGLE -65
-
-#define CHARYBDIS_MINIMUM_DEFAULT_DPI     1200
-#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
-#define CHARYBDIS_MINIMUM_SNIPING_DPI     200
-#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
+#define ROTATIONAL_TRANSFORM_ANGLE 25
+#define POINTING_DEVICE_ROTATION_270
 
 /* RGB Matrix. */
-
 #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
+#define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
+#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
+#define CHARYBDIS_MINIMUM_SNIPING_DPI 200
+#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
+
 #define CHARYBDIS_CONFIG_SYNC
 
-#define BOOTMAGIC_LITE_ROW    0
+#define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT    5
+#define BOOTMAGIC_LITE_ROW_RIGHT 5
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-#define BOOTMAGIC_LITE_EEPROM_ROW    1
+#define BOOTMAGIC_LITE_EEPROM_ROW 1
 #define BOOTMAGIC_LITE_EEPROM_COLUMN 0
-#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT    1
+#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1
 #define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
deleted file mode 100644
index 8aad829e5c..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Nick Brassel (tzarc)
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define HAL_USE_PWM     TRUE
-#define HAL_USE_PAL     TRUE
-#define HAL_USE_SERIAL  TRUE
-// #define HAL_USE_I2C     TRUE
-#define HAL_USE_SPI     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
index cc6dbc34e9..50a05e1b35 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -83,12 +83,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                SFT_T(KC_SPACE),  ALT_T(KC_Q),      _______
     ),
     [_MOUSE] = LAYOUT_charybdis_4x6(
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______,
+        _______, _______, _______, _______, _______, _______,   _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______,
+        _______, _______, _______, _______, _______, _______,   KC_WH_U, _______, _______, _______, _______, DRGSCRL,
         _______, _______, _______, _______, _______, _______,   KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
-        _______, _______, _______, _______, _______, _______,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, DRGSCRL, _______,
-                                   _______, SNIPING, SNIPING,    _______, _______,
-                                           _______, _______,      _______
+        _______, _______, _______, _______, _______, _______,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
+                                   _______, _______, _______,   _______, _______,
+                                           _______, _______,     _______
     ),
 
     [_LOWER] = LAYOUT_charybdis_4x6_wrapper(
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_ADJUST] = LAYOUT_charybdis_4x6_wrapper(
-        QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_BLOCKS,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT,
+        QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_COMIC,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT,
         VRSN,    _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________, EE_CLR,
         KEYLOCK, _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________, TG_MODS,
         UC_NEXT, _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________, KC_MPLY,
@@ -121,8 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // clang-format on
 
 
-void matrix_init_keymap(void) {
-    setPinInputHigh(A0);
+void keyboard_post_init_keymap(void) {
 #ifdef RGB_MATRIX_ENABLE
      g_led_config.flags[53] = g_led_config.flags[54] = g_led_config.flags[55] =
         g_led_config.flags[0] = g_led_config.flags[1] = g_led_config.flags[2] = g_led_config.flags[3] =
@@ -131,11 +130,17 @@ void matrix_init_keymap(void) {
 #endif
 }
 
-void matrix_scan_keymap(void) {
+#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
+void keyboard_pre_init_keymap(void) {
+    setPinInputHigh(A0);
+}
+
+void housekeeping_task_keymap(void) {
     if (!readPin(A0)) {
         reset_keyboard();
     }
 }
+#endif
 
 #ifdef USB_VBUS_PIN
 bool usb_vbus_state(void) {
@@ -145,12 +150,13 @@ bool usb_vbus_state(void) {
 }
 #endif
 
+#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
 void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
     for (int32_t i = 0; i < 40; i++) {
         __asm__ volatile("nop" ::: "memory");
     }
 }
-
+#endif
 
 #ifdef SWAP_HANDS_ENABLE
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
index 4f04811e54..3a23d5f370 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
@@ -18,23 +18,10 @@
 
 #include_next "mcuconf.h"
 
-#undef STM32_PWM_USE_ADVANCED
-#define STM32_PWM_USE_ADVANCED TRUE
+#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
+#    undef STM32_PWM_USE_ADVANCED
+#    define STM32_PWM_USE_ADVANCED TRUE
 
-#undef STM32_PWM_USE_TIM1
-#define STM32_PWM_USE_TIM1 TRUE
-
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-
-#undef STM32_PWM_USE_TIM4
-#define STM32_PWM_USE_TIM4 TRUE
-
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 TRUE
-
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 5
+#    undef STM32_PWM_USE_TIM4
+#    define STM32_PWM_USE_TIM4 TRUE
+#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
index d655fbd5dc..12e9cecda0 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
@@ -1,34 +1,56 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
+CUSTOM_UNICODE_ENABLE = no
+CUSTOM_POINTING_DEVICE = no
+CUSTOM_SPLIT_TRANSPORT_SYNC = no
 
-# Bootloader selection
-BOOTLOADER := tinyuf2
+ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill)
+    # MCU name
+    # Bootloader selection
+    BOOTLOADER := tinyuf2
 
-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
-RGBLIGHT_ENABLE       = no  # Enable keyboard RGB underglow
-AUDIO_ENABLE          = yes # Audio output
-AUDIO_SUPPORTED       = yes # is set to no in kb, needs to be forcibly enabled
+    AUDIO_ENABLE          = yes # Audio output
+    AUDIO_SUPPORTED       = yes # is set to no in kb, needs to be forcibly enabled
+    AUDIO_DRIVER          = pwm_hardware
 
-KEYBOARD_SHARED_EP    = yes
-MOUSE_SHARED_EP       = yes
+    BACKLIGHT_DRIVER      = pwm
 
-EEPROM_DRIVER         = spi
-WS2812_DRIVER         = pwm
-SERIAL_DRIVER         = usart
-AUDIO_DRIVER          = pwm_hardware
-BACKLIGHT_DRIVER      = pwm
+    OVERLOAD_FEATURES = yes
+endif
 
-AUTOCORRECT_ENABLE = yes
-CAPS_WORD_ENABLE      = yes
-SWAP_HANDS_ENABLE     = yes
-TAP_DANCE_ENABLE      = yes
-DEBOUNCE_TYPE         = asym_eager_defer_pk
-WPM_ENABLE            = yes
-LTO_ENABLE            = no
-# OPT                   = 3
+ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/stemcell)
+    OVERLOAD_FEATURES = yes
+endif
+ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/splinky)
+    OVERLOAD_FEATURES = yes
+endif
+ifeq ($(strip $(MCU)), atmega32u4)
+    LTO_ENABLE = yes
+    BOOTLOADER = qmk-hid
+    BOOTLOADER_SIZE = 512
+endif
+
+ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
+    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
+    RGBLIGHT_ENABLE       = no  # Enable keyboard RGB underglow
+
+    KEYBOARD_SHARED_EP    = yes
+    MOUSE_SHARED_EP       = yes
+
+    AUTOCORRECT_ENABLE    = yes
+    CAPS_WORD_ENABLE      = yes
+    SWAP_HANDS_ENABLE     = yes
+    TAP_DANCE_ENABLE      = yes
+    DEBOUNCE_TYPE         = asym_eager_defer_pk
+    WPM_ENABLE            = yes
+    LTO_ENABLE            = no
+    # OPT                   = 3
+
+    CUSTOM_UNICODE_ENABLE = yes
+    CUSTOM_POINTING_DEVICE = yes
+    CUSTOM_SPLIT_TRANSPORT_SYNC = yes
+
+endif
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
new file mode 100644
index 0000000000..135994a43c
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define HAL_USE_I2C TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
index 9cd21c3c1f..d4aa71440d 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
@@ -112,7 +112,7 @@ bool oled_task_keymap(void) {
     };
     oled_write_raw_P(header_image, sizeof(header_image));
     oled_set_cursor(7, 0);
-    oled_write_P(PSTR("Rock On"), true);
+    oled_write_P(PSTR("Dilemma"), true);
 
     render_default_layer_state(1, 1);
     render_layer_state(1, 2);
@@ -158,3 +158,19 @@ bool oled_task_keymap(void) {
     return false;
 }
 #endif
+
+
+#ifdef SWAP_HANDS_ENABLE
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    /* Left hand, matrix positions */
+    {{0, 4}, {3, 4}, {2, 4}, {5, 4}, {4, 4}},
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}},
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}},
+    /* Right hand, matrix positions */
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}},
+    };
+#endif
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
new file mode 100644
index 0000000000..f9aa894665
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
index 1ea0eba7d3..a7d7528dfb 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
@@ -60,8 +60,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MOUSE] = LAYOUT_4x6_right(
-        _______, _______, _______, _______, _______, _______,                        KC_WH_U, _______, _______, _______, DPI_CONFIG, _______,
-        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
         _______, _______, _______, _______, _______, _______,                        KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
                           _______, _______,                                                            _______, _______,
                                             _______, _______,                                 _______,
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index a96630842d..afcc9b0a7a 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -132,6 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 
+#ifdef ENCODER_ENABLE
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_DEFAULT_LAYER_1] = { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } },
@@ -185,6 +186,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return false;
 }
 #endif
+#endif
 
 #ifdef OLED_ENABLE
 #    include "keyrecords/unicode.h"
@@ -209,36 +211,7 @@ void oled_render_large_display(bool side) {
         // clang-format on
         oled_write_P(logo, false);
 
-#    ifdef CUSTOM_UNICODE_ENABLE
-        oled_set_cursor(1, 14);
-        oled_write_ln_P(PSTR("Unicode:"), false);
-        switch (typing_mode) {
-            case UCTM_WIDE:
-                oled_write_P(PSTR("        Wide"), false);
-                break;
-            case UCTM_SCRIPT:
-                oled_write_P(PSTR("      Script"), false);
-                break;
-            case UCTM_BLOCKS:
-                oled_write_P(PSTR("      Blocks"), false);
-                break;
-            case UCTM_REGIONAL:
-                oled_write_P(PSTR("    Regional"), false);
-                break;
-            case UCTM_AUSSIE:
-                oled_write_P(PSTR("      Aussie"), false);
-                break;
-            case UCTM_ZALGO:
-                oled_write_P(PSTR("       Zalgo"), false);
-                break;
-            case UCTM_NO_MODE:
-                oled_write_P(PSTR("      Normal"), false);
-                break;
-            default:
-                oled_write_P(PSTR("     Unknown"), false);
-                break;
-        }
-#    endif
+        render_unicode_mode(1, 14);
     }
 }
 #endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 8b227d4cbd..acec28fa6e 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -1,40 +1,52 @@
-COMMAND_ENABLE                   = no
-RGBLIGHT_ENABLE                  = yes
-RGBLIGHT_STARTUP_ANIMATION       = yes
-AUDIO_ENABLE                     = yes
+AUTOCORRECT_ENABLE               = no
+AUDIO_ENABLE                     = no
+ENCODER_ENABLE                   = no
+CUSTOM_BOOTMAGIC_ENABLE          = no
+CUSTOM_UNICODE_ENABLE            = no
 HAPTIC_ENABLE                    = no
-TAP_DANCE_ENABLE                 = yes
-OLED_ENABLE                      = yes
-WPM_ENABLE                       = yes
-ENCODER_ENABLE                   = yes
-ENCODER_MAP_ENABLE               = yes
-AUTOCORRECT_ENABLE               = yes
-CAPS_WORD_ENABLE                 = yes
-DEFERRED_EXEC_ENABLE             = yes
+OLED_ENABLE                      = no
+OLED_DRIVER                      = custom
+RGBLIGHT_ENABLE                  = no
+SWAP_HANDS_ENABLE                = no
+TAP_DANCE_ENABLE                 = no
+WPM_ENABLE                       = no
 
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
-    RGBLIGHT_ENABLE              = no
-    AUDIO_ENABLE                 = no
-    HAPTIC_ENABLE                = no
-    TAP_DANCE_ENABLE             = no
-    OLED_ENABLE                  = no
-    WPM_ENABLE                   = no
-    ENCODER_ENABLE               = no
-    AUTOCORRECT_ENABLE           = no
-    LTO_SUPPORTED                = yes
-    SWAP_HANDS_ENABLE            = no
-    CUSTOM_UNICODE_ENABLE        = no
-    CAPS_WORD_ENABLE             = no
-    BOOTLOADER                   = qmk-hid
-    BOOTLOADER_SIZE              = 512
+    BOOTLOADER                       = qmk-hid
+    BOOTLOADER_SIZE                  = 512
+    CUSTOM_SPLIT_TRANSPORT_SYNC      = no
+    LTO_ENABLE                       = yes
+endif
+ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/arduinomicro)
+    BOOTLOADER                       = qmk-hid
+    BOOTLOADER_SIZE                  = 512
+    CUSTOM_SPLIT_TRANSPORT_SYNC      = no
+    LTO_ENABLE                       = yes
 endif
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
-    AUTOCORRECT_ENABLE           = no
-    CAPS_WORD_ENABLE             = yes
+    AUTOCORRECT_ENABLE               = no
+    OVERLOAD_FEATURES                = yes
+    LTO_ENABLE                       = yes
 endif
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
-    BOOTLOADER = tinyuf2
+    BOOTLOADER                       = tinyuf2
+    AUTOCORRECT_ENABLE               = yes
+    LTO_SUPPORTED                    = no
+    OVERLOAD_FEATURES                = yes
 endif
 # DEBOUNCE_TYPE = sym_eager_pk
 
-OLED_DRIVER = custom
+ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
+    AUDIO_ENABLE                     = yes
+    CAPS_WORD_ENABLE                 = yes
+    CUSTOM_BOOTMAGIC_ENABLE          = yes
+    CUSTOM_UNICODE_ENABLE            = yes
+    ENCODER_ENABLE                   = yes
+    ENCODER_MAP_ENABLE               = yes
+    OLED_ENABLE                      = yes
+    RGBLIGHT_ENABLE                  = yes
+    RGBLIGHT_STARTUP_ANIMATION       = yes
+    TAP_DANCE_ENABLE                 = yes
+    SWAP_HANDS_ENABLE                = yes
+    WPM_ENABLE                       = yes
+endif
diff --git a/keyboards/keebio/iris/keymaps/drashna/config.h b/keyboards/keebio/iris/keymaps/drashna/config.h
index 0569f30744..a4d2def67c 100644
--- a/keyboards/keebio/iris/keymaps/drashna/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna/config.h
@@ -30,7 +30,9 @@
 #    define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
 #    define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
 
-#    define RGBLIGHT_LIMIT_VAL 225
+#    ifndef RGBLIGHT_LIMIT_VAL
+#       define RGBLIGHT_LIMIT_VAL 225
+#    endif
 #endif  // RGBLIGHT_ENABLE
 
 #ifdef AUDIO_ENABLE
@@ -49,12 +51,14 @@
 #    define QMK_SPEAKER C6
 #endif
 
-#undef PRODUCT
 #if defined(KEYBOARD_keebio_iris_rev2)
+#    undef PRODUCT
 #    define PRODUCT "Drashna Hacked Iris Rev 2"
 #elif defined(KEYBOARD_keebio_iris_rev3)
+#    undef PRODUCT
 #    define PRODUCT "Drashna Hacked Iris Rev 3"
 #elif defined(KEYBOARD_keebio_iris_rev4)
+#    undef PRODUCT
 #    define PRODUCT "Drashna Hacked Iris Rev 4"
 #endif
 
diff --git a/keyboards/keebio/iris/keymaps/drashna/keymap.c b/keyboards/keebio/iris/keymaps/drashna/keymap.c
index a6199f1efe..02d0011f5c 100644
--- a/keyboards/keebio/iris/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/iris/keymaps/drashna/keymap.c
@@ -101,16 +101,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-void matrix_init_keymap(void) {
-#ifndef CONVERT_TO_PROTON_C
-    setPinOutput(D5);
-    writePinHigh(D5);
-
-    setPinOutput(B0);
-    writePinHigh(B0);
-#endif
-}
-
 void keyboard_post_init_keymap(void) {
 #if BACKLIGHT_ENABLE
     backlight_enable();
diff --git a/keyboards/keebio/iris/keymaps/drashna/rules.mk b/keyboards/keebio/iris/keymaps/drashna/rules.mk
index 51b9a105d2..f531c74a56 100644
--- a/keyboards/keebio/iris/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/iris/keymaps/drashna/rules.mk
@@ -14,7 +14,3 @@ INDICATOR_LIGHTS            = no
 RGBLIGHT_STARTUP_ANIMATION  = no
 CUSTOM_UNICODE_ENABLE       = no
 CUSTOM_SPLIT_TRANSPORT_SYNC = no
-
-ifneq ($(strip $(KEYBOARD)), keebio/iris/rev6)
-   RGBLIGHT_ENABLE    = yes
-endif
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
index cc9f3f82eb..4e393e4196 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c
@@ -74,13 +74,3 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     //}
     return true;
 }
-
-void matrix_init_keymap(void) {
-#ifndef CONVERT_TO_PROTON_C
-    setPinOutput(D5);
-    writePinHigh(D5);
-
-    setPinOutput(B0);
-    writePinHigh(B0);
-#endif
-}
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/rules.mk b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
index 487031b36d..86a693c3b1 100644
--- a/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk
@@ -21,4 +21,5 @@ LAYOUTS = ortho_5x7
 # SRC := $(filter-out split_util.c,$(SRC))
 # SRC += quantum/matrix.c
 
-BOOTLOADER        = qmk-dfu
+BOOTLOADER        = qmk-hid
+BOOTLOADER_SIZE   = 512
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index ca6a91f42d..f17deefb4e 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -53,10 +53,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 #endif  // AUDIO_ENABLE
 
-#undef PRODUCT
 #ifdef KEYBOARD_orthodox_rev1
+#    undef PRODUCT
 #    define PRODUCT "Drashna Hacked Orthodox Rev .1"
 #elif KEYBOARD_orthodox_rev3
+#    undef PRODUCT
 #    define PRODUCT "Drashna Hacked Orthodox Rev .3"
 #endif
 
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index 09ac5bd914..6d4b49fe59 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -68,13 +68,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
-
-void matrix_init_keymap(void) {
-#ifndef CONVERT_TO_PROTON_C
-    setPinOutput(D5);
-    writePinHigh(D5);
-
-    setPinOutput(B0);
-    writePinHigh(B0);
-#endif
-}
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
index 6b18e7c3bc..8c028985ef 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
@@ -144,6 +144,7 @@ void oled_render_large_display(bool side) {
             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
         };
         // clang-format on
+        oled_set_cursor(0,7);
         oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
     }
 }
@@ -157,9 +158,11 @@ const rgblight_segment_t PROGMEM gui_layers[]     = RGBLIGHT_LAYER_SEGMENTS({7,
 
 const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(shift_layers, control_layers, alt_layers, gui_layers);
 
-void keyboard_post_init_keymap(void) { rgblight_layers = my_rgb_layers; }
+void keyboard_post_init_keymap(void) {
+    rgblight_layers = my_rgb_layers;
+}
 
-void matrix_scan_keymap(void) {
+void housekeeping_task_keymap(void) {
     uint8_t mods = mod_config(get_mods() | get_oneshot_mods());
     rgblight_set_layer_state(0, mods & MOD_MASK_SHIFT);
     rgblight_set_layer_state(1, mods & MOD_MASK_CTRL);
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 64ef098280..e5675854e1 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -268,7 +268,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void matrix_scan_keymap(void) {  // runs frequently to update info
+void housekeeping_task_keymap(void) {  // runs frequently to update info
     uint8_t modifiers     = get_mods();
     uint8_t led_usb_state = host_keyboard_leds();
     uint8_t one_shot      = get_oneshot_mods();
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index e2154cbe2f..85112d8ce4 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -66,12 +66,14 @@
 #endif  // KEYBOARD_planck_light
 
 #if defined(KEYBOARD_planck)
-#    undef PRODUCT
 #    if defined(KEYBOARD_planck_light)
+#        undef PRODUCT
 #        define PRODUCT "Drashna Hacked RGB Beacon(Planck Light)"
 #    elif defined(KEYBOARD_planck_rev6)
+#        undef PRODUCT
 #        define PRODUCT "Drashna Hacked Planck Rev6"
 #    elif defined(KEYBOARD_planck_ez)
+#        undef PRODUCT
 #        define PRODUCT "Drashna Hacked Planck EZ"
 #        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
 #    endif
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index b7a132db12..b22401a77e 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -249,23 +249,12 @@ bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     return true;
 }
 
-void matrix_init_keymap(void) {
+void keyboard_post_init_keymap(void) {
 #    ifdef KEYBOARD_planck_light
     writePinLow(D6);
 #    endif
     // rgblight_mode(RGB_MATRIX_MULTISPLASH);
 }
-#else  // RGB_MATRIX_INIT
-
-void matrix_init_keymap(void) {
-#    if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_planck)
-    setPinOutput(D5);
-    writePinHigh(D5);
-
-    setPinOutput(B0);
-    writePinHigh(B0);
-#    endif
-}
 #endif  // RGB_MATRIX_INIT
 
 #ifdef ENCODER_ENABLE
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk
index e5c25d6fd5..a2278e931d 100644
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@@ -20,7 +20,7 @@ ifeq ($(strip $(KEYBOARD)), planck/rev6)
     AUDIO_ENABLE                = yes
     EEPROM_DRIVER               = i2c
     ENCODER_MAP_ENABLE          = yes
-    AUTOCORRECTION_ENABLE       = yes
+    AUTOCORRECT_ENABLE          = yes
     CAPS_WORD_ENABLE            = yes
 endif
 ifeq ($(strip $(KEYBOARD)), planck/light)
@@ -39,6 +39,13 @@ ifeq ($(strip $(KEYBOARD)), planck/ez)
     CONSOLE_ENABLE              = yes
     COMMAND_ENABLE              = yes
     AUDIO_ENABLE                = yes
-    AUTOCORRECTION_ENABLE       = yes
+    AUTOCORRECT_ENABLE          = yes
     CAPS_WORD_ENABLE            = yes
 endif
+
+ifeq ($(strip $(MCU)), atmega32u4)
+    BOOTLOADER = qmk-hid
+    BOOTLOADER_SIZE = 512
+    LTO_ENABLE = yes
+    CUSTOM_UNICODE_ENABLE = no
+endif
diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk
index 57cc3ce0be..c3b417f1bd 100644
--- a/layouts/community/ortho_5x12/drashna/rules.mk
+++ b/layouts/community/ortho_5x12/drashna/rules.mk
@@ -16,3 +16,9 @@ ifeq ($(strip $(KEYBOARD)), fractal)
     BOOTLOADER                  = qmk-dfu
     CUSTOM_UNICODE_ENABLE       = no
 endif
+
+ifeq ($(strip $(MCU)), atmega32u4)
+    BOOTLOADER                  = qmk-dfu
+    BOOTLOADER_SIZE             = 512
+    LTO_ENABLE                  = yes
+endif
diff --git a/layouts/community/split_3x6_3/drashna/chconf.h b/layouts/community/split_3x6_3/drashna/chconf.h
index ffcfb19896..9dbc78b973 100644
--- a/layouts/community/split_3x6_3/drashna/chconf.h
+++ b/layouts/community/split_3x6_3/drashna/chconf.h
@@ -1,6 +1,8 @@
 
-#define CH_CFG_ST_RESOLUTION                16
-#define CH_CFG_ST_FREQUENCY                 10000
+#if defined(KEYBOARD_crkbd)
+#    define CH_CFG_ST_RESOLUTION 16
+#    define CH_CFG_ST_FREQUENCY 10000
+#endif
 
 #if __has_include("platforms/chibios/common/configs/chconf.h")
 #    include_next "platforms/chibios/common/configs/chconf.h"
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index 0944e37077..0ef36d1f32 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -80,8 +80,13 @@
 #    define NO_MUSIC_MODE
 #endif
 
-#ifdef HAPTIC_ENABLE
-#    define SOLENOID_PIN B7
+#if defined(HAPTIC_ENABLE)
+#    if defined(CONVERT_TO_PROTON_C)
+#        define A13 PAL_LINE(GPIOA, 13)
+#        define SOLENOID_PIN A13
+#    else
+#        define SOLENOID_PIN B7
+#    endif
 #endif
 
 #undef PRODUCT
diff --git a/layouts/community/split_3x6_3/drashna/halconf.h b/layouts/community/split_3x6_3/drashna/halconf.h
index b099320b30..7cc1306598 100644
--- a/layouts/community/split_3x6_3/drashna/halconf.h
+++ b/layouts/community/split_3x6_3/drashna/halconf.h
@@ -15,8 +15,9 @@
  */
 #pragma once
 
-// #define HAL_USE_DAC TRUE
-#define HAL_USE_PWM TRUE
-#define HAL_USE_SERIAL TRUE
+#if defined(KEYBOARD_crkbd)
+#    define HAL_USE_PWM TRUE
+#    define HAL_USE_SERIAL TRUE
+#endif
 
 #include_next <halconf.h>
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index 707e688267..59f5fefb48 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -238,8 +238,7 @@ void render_small_kitty(void) {
 void oled_driver_render_logo_right(void) {
     render_small_kitty();
 
-    oled_set_cursor(0, 4);
-    render_default_layer_state();
+    render_default_layer_state(0, 4);
 }
 #    endif
 #endif
diff --git a/layouts/community/split_3x6_3/drashna/mcuconf.h b/layouts/community/split_3x6_3/drashna/mcuconf.h
index 649af5d1f4..920261476c 100644
--- a/layouts/community/split_3x6_3/drashna/mcuconf.h
+++ b/layouts/community/split_3x6_3/drashna/mcuconf.h
@@ -17,20 +17,16 @@
 
 #include_next <mcuconf.h>
 
-// #undef STM32_HSE_ENABLED
-// #define STM32_HSE_ENABLED FALSE
-// #undef STM32_GPT_USE_TIM15
-// #define STM32_GPT_USE_TIM15                  FALSE
+#if defined(KEYBOARD_crkbd)
 
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2                  TRUE
-#undef STM32_PWM_USE_TIM3
-#define STM32_PWM_USE_TIM3                  FALSE
+#    undef STM32_PWM_USE_TIM2
+#    define STM32_PWM_USE_TIM2 TRUE
+#    undef STM32_PWM_USE_TIM3
+#    define STM32_PWM_USE_TIM3 FALSE
 
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 TRUE
+#    undef STM32_SERIAL_USE_USART1
+#    define STM32_SERIAL_USE_USART1 TRUE
 
-// #undef STM32_PWM_TIM15_IRQ_PRIORITY
-// #define STM32_PWM_TIM15_IRQ_PRIORITY         16
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 3
+#    undef STM32_ST_USE_TIMER
+#    define STM32_ST_USE_TIMER 3
+#endif
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk
index 83eb699812..3fd4279bef 100644
--- a/layouts/community/split_3x6_3/drashna/rules.mk
+++ b/layouts/community/split_3x6_3/drashna/rules.mk
@@ -13,6 +13,10 @@ AUDIO_ENABLE               = no  # Audio output
 UNICODE_ENABLE             = no  # Unicode
 RGBLIGHT_ENABLE            = no  # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE          = no  # Enable one-hand typing
+OS_DETECTION_ENABLE        = no
+CUSTOM_UNICODE_ENABLE      = no
+CUSTOM_POINTING_DEVICE     = no
+CUSTOM_SPLIT_TRANSPORT_SYNC = no
 
 USE_ARM_CONFIG ?= no
 ifeq ($(strip $(CONVERT_TO)), proton_c)
@@ -27,19 +31,26 @@ endif
 ifeq ($(strip $(MCU)), STM32F401)
     USE_ARM_CONFIG = yes
 endif
+ifeq ($(strip $(MCU)), STM32F411)
+    USE_ARM_CONFIG = yes
+endif
+
+ifeq ($(strip $(MCU)), atmega32u4)
+    BOOTLOADER             = qmk-hid
+    BOOTLOADER_SIZE        = 512
+endif
 
 ifeq ($(strip $(USE_ARM_CONFIG)), yes)
     HAPTIC_ENABLE          = no
     WS2812_DRIVER          = pwm # won't work without a patch to the ctpc mk file
     SERIAL_DRIVER          = usart
-    SWAP_HANDS_ENABLE      = yes
     WPM_ENABLE             = yes
-    AUTOCORRECTION_ENABLE  = yes
+    AUTOCORRECT_ENABLE     = yes
     CAPS_WORD_ENABLE       = yes
-else
-    CUSTOM_UNICODE_ENABLE  = no
-    BOOTLOADER             = qmk-hid
-    BOOTLOADER_SIZE        = 512
+    OS_DETECTION_ENABLE    = yes
+    CUSTOM_UNICODE_ENABLE      = no
+    CUSTOM_POINTING_DEVICE     = no
+    CUSTOM_SPLIT_TRANSPORT_SYNC = no
 endif
 
 ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
@@ -47,7 +58,3 @@ ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
     RGB_MATRIX_ENABLE      = yes
     HAPTIC_ENABLE          = no
 endif
-
-ifeq ($(strip $(KEYBOARD)), cantor)
-    SWAP_HANDS_ENABLE      = no
-endif
diff --git a/users/drashna/bootmagic_better.c b/users/drashna/bootmagic_better.c
index 4932e25f1d..ffd2e609ae 100644
--- a/users/drashna/bootmagic_better.c
+++ b/users/drashna/bootmagic_better.c
@@ -44,7 +44,7 @@ void bootmagic_lite(void) {
     if (matrix_get_row(row) & (1 << col)) {
         perform_reset = true;
     }
-#ifdef STM32F411xE
+#if defined(STM32F411xE) && !defined(CONVERTER_ENABLED)
     if (!readPin(A0)) {
         perform_reset = true;
     }
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c
index 40383f124f..c2f1156cee 100644
--- a/users/drashna/callbacks.c
+++ b/users/drashna/callbacks.c
@@ -20,22 +20,6 @@ void                       keyboard_pre_init_user(void) {
 // functions in the keymaps
 // Call user matrix init, set default RGB colors and then
 // call the keymap's init function
-__attribute__((weak)) void matrix_init_keymap(void) {}
-__attribute__((weak)) void matrix_init_secret(void) {}
-void                       matrix_init_user(void) {
-#if defined(BOOTLOADER_CATERINA) && defined(__AVR__) && defined(__AVR_ATmega32U4__)
-    DDRD &= ~(1 << 5);
-    PORTD &= ~(1 << 5);
-
-    DDRB &= ~(1 << 0);
-    PORTB &= ~(1 << 0);
-#endif
-#ifdef CUSTOM_UNICODE_ENABLE
-    matrix_init_unicode();
-#endif
-    matrix_init_secret();
-    matrix_init_keymap();
-}
 
 __attribute__((weak)) void keyboard_post_init_keymap(void) {}
 void                       keyboard_post_init_user(void) {
@@ -51,6 +35,17 @@ void                       keyboard_post_init_user(void) {
 #ifdef I2C_SCANNER_ENABLE
     keyboard_post_init_i2c();
 #endif
+#ifdef CUSTOM_UNICODE_ENABLE
+    keyboard_post_init_unicode();
+#endif
+
+#if defined(BOOTLOADER_CATERINA) && defined(__AVR__) && defined(__AVR_ATmega32U4__)
+    DDRD &= ~(1 << 5);
+    PORTD &= ~(1 << 5);
+
+    DDRB &= ~(1 << 0);
+    PORTB &= ~(1 << 0);
+#endif
 
     keyboard_post_init_keymap();
 }
@@ -106,7 +101,6 @@ void                       suspend_wakeup_init_user(void) {
 // No global matrix scan code, so just run keymap's matrix
 // scan function
 __attribute__((weak)) void matrix_scan_keymap(void) {}
-__attribute__((weak)) void matrix_scan_secret(void) {}
 void                       matrix_scan_user(void) {
     static bool has_ran_yet;
     if (!has_ran_yet) {
@@ -117,9 +111,6 @@ void                       matrix_scan_user(void) {
 #ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code.
     run_diablo_macro_check();
 #endif // TAP_DANCE_ENABLE
-#ifdef CAPS_WORD_ENABLE
-    caps_word_task();
-#endif
 #if defined(CUSTOM_RGB_MATRIX)
     matrix_scan_rgb_matrix();
 #endif
@@ -129,7 +120,6 @@ void                       matrix_scan_user(void) {
 #ifdef CUSTOM_OLED_DRIVER
     matrix_scan_oled();
 #endif
-    matrix_scan_secret();
 
     matrix_scan_keymap();
 }
diff --git a/users/drashna/callbacks.h b/users/drashna/callbacks.h
index 15f8997619..d3d260378d 100644
--- a/users/drashna/callbacks.h
+++ b/users/drashna/callbacks.h
@@ -5,7 +5,7 @@
 
 #include "quantum.h"
 
-void          matrix_init_keymap(void);
+void          keyboard_post_init_keymap(void);
 void          matrix_init_secret(void);
 void          shutdown_keymap(void);
 void          suspend_power_down_keymap(void);
@@ -19,7 +19,7 @@ void          eeconfig_init_keymap(void);
 void          housekeeping_task_keymap(void);
 
 #ifdef CUSTOM_UNICODE_ENABLE
-void matrix_init_unicode(void);
+void keyboard_post_init_unicode(void);
 #endif
 #ifdef SPLIT_KEYBOARD
 void matrix_slave_scan_keymap(void);
diff --git a/users/drashna/callbacks.md b/users/drashna/callbacks.md
index a0f0d9fdae..5908a66142 100644
--- a/users/drashna/callbacks.md
+++ b/users/drashna/callbacks.md
@@ -15,11 +15,6 @@ My [Ergodox EZ Keymap](https://github.com/qmk/qmk_firmware/blob/master/layouts/c
 You can see a list of these files in [callbacks.c](callbacks.c), or a shortend list here 
 
 ```c
-__attribute__((weak)) void matrix_init_keymap(void) {}
-void                       matrix_init_user(void) {
-    matrix_init_keymap();
-}
-
 __attribute__((weak)) void keyboard_post_init_keymap(void) {}
 void                       keyboard_post_init_user(void) {
     keyboard_post_init_keymap();
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index d63f05b590..283e82d13d 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -130,14 +130,35 @@ void keyboard_post_init_i2c(void) {
 }
 #endif
 
-#if defined(AUTOCORRECT_ENABLE) && defined(AUDIO_ENABLE)
-#    ifdef USER_SONG_LIST
+#if defined(AUTOCORRECT_ENABLE)
+#    if defined(AUDIO_ENABLE)
+#        ifdef USER_SONG_LIST
 float autocorrect_song[][2] = SONG(MARIO_GAMEOVER);
-#    else
+#        else
 float autocorrect_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
+#        endif
 #    endif
+
 bool apply_autocorrect(uint8_t backspaces, const char *str) {
+    if (layer_state_is(_GAMEPAD)) {
+        return false;
+    }
+    // TO-DO use unicode stuff for this.  Will probably have to reverse engineer
+    // send string to get working properly, to send char string.
+
+#    if defined(AUDIO_ENABLE)
     PLAY_SONG(autocorrect_song);
+#    endif
     return true;
 }
 #endif
+
+#if defined(CAPS_WORD_ENABLE) && !defined(NO_ACTION_ONESHOT)
+void oneshot_locked_mods_changed_user(uint8_t mods) {
+    if (mods & MOD_MASK_SHIFT) {
+        del_mods(MOD_MASK_SHIFT);
+        set_oneshot_locked_mods(~MOD_MASK_SHIFT & get_oneshot_locked_mods());
+        caps_word_on();
+    }
+}
+#endif
diff --git a/users/drashna/keyrecords/process_records.h b/users/drashna/keyrecords/process_records.h
index 2ee7551648..0acd7e010d 100644
--- a/users/drashna/keyrecords/process_records.h
+++ b/users/drashna/keyrecords/process_records.h
@@ -45,6 +45,7 @@ enum userspace_custom_keycodes {
     KC_AUSSIE,
     KC_ZALGO,
     KC_SUPER,
+    KC_COMIC,
     KC_ACCEL,
     NEW_SAFE_RANGE // use "NEWPLACEHOLDER for keymap specific codes
 };
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index 753fca3231..16390074ca 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -7,7 +7,18 @@
 #include "unicode.h"
 #include "process_unicode_common.h"
 
-uint8_t typing_mode = UCTM_NO_MODE;
+uint8_t unicode_typing_mode = UCTM_NO_MODE;
+const char unicode_mode_str[UNCODES_MODE_END][13] PROGMEM = {
+    "      Normal\0",
+    "        Wide\0",
+    "      Script\0",
+    "      Blocks\0",
+    "    Regional\0",
+    "      Aussie\0",
+    "       Zalgo\0",
+    "Super Script\0",
+    "       Comic\0",
+};
 
 /**
  * @brief Registers the unicode keystrokes based on desired unicode
@@ -91,6 +102,45 @@ DEFINE_UNICODE_RANGE_TRANSLATOR(unicode_range_translator_script, 0x1D4EA, 0x1D4D
 DEFINE_UNICODE_RANGE_TRANSLATOR(unicode_range_translator_boxes, 0x1F170, 0x1F170, '0', '1', 0x2002);
 DEFINE_UNICODE_RANGE_TRANSLATOR(unicode_range_translator_regional, 0x1F1E6, 0x1F1E6, '0', '1', 0x2003);
 
+// DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_normal,
+//                               'a', // a
+//                               'b', // b
+//                               'c', // c
+//                               'd', // d
+//                               'e', // e
+//                               'f', // f
+//                               'g', // g
+//                               'h', // h
+//                               'i', // i
+//                               'j', // j
+//                               'k', // k
+//                               'l', // l
+//                               'm', // m
+//                               'n', // n
+//                               'o', // o
+//                               'p', // p
+//                               'q', // q
+//                               'r', // r
+//                               's', // s
+//                               't', // t
+//                               'u', // u
+//                               'v', // v
+//                               'w', // w
+//                               'x', // x
+//                               'y', // y
+//                               'z', // z
+//                               '1', // 1
+//                               '2', // 2
+//                               '3', // 3
+//                               '4', // 4
+//                               '5', // 5
+//                               '6', // 6
+//                               '7', // 7
+//                               '8', // 8
+//                               '9', // 9
+//                               '0'  // 0
+// );
+
 DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_aussie,
                               0x0250, // a
                               'q',    // b
@@ -169,6 +219,45 @@ DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_super,
                               0x2070  // 0
 );
 
+DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_comic,
+                              0x212B, // a
+                              0x212C, // b
+                              0x2102, // c
+                              0x2145, // d
+                              0x2107, // e
+                              0x2132, // f
+                              0x2141, // g
+                              0x210D, // h
+                              0x2148, // i
+                              0x2111, // j
+                              'k', // k
+                              0x2143, // l
+                              'm', // m
+                              0x2115, // n
+                              0x2134, // o
+                              0x2119, // p
+                              0x211A, // q
+                              0x211B, // r
+                              0x20B7, // s
+                              0x20B8, // t
+                              0x2127, // u
+                              'v', // v
+                              0x20A9, // w
+                              'x', // x
+                              0x213D, // y
+                              'z', // z
+                              '1', // 1
+                              '2', // 2
+                              '3', // 3
+                              '4', // 4
+                              '5', // 5
+                              '6', // 6
+                              '7', // 7
+                              '8', // 8
+                              '9', // 9
+                              '0'  // 0
+);
+
 bool process_record_aussie(uint16_t keycode, keyrecord_t *record) {
     bool is_shifted = (get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT;
     if ((KC_A <= keycode) && (keycode <= KC_0)) {
@@ -280,12 +369,12 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
                 register_unicode(0x203D);
             }
             break;
-        case KC_NOMODE ... KC_SUPER:
+        case KC_NOMODE ... KC_COMIC:
             if (record->event.pressed) {
-                if (typing_mode != keycode - KC_NOMODE) {
-                    typing_mode = keycode - KC_NOMODE;
+                if (unicode_typing_mode != keycode - KC_NOMODE) {
+                    unicode_typing_mode = keycode - KC_NOMODE;
                 } else {
-                    typing_mode = UCTM_NO_MODE;
+                    unicode_typing_mode = UCTM_NO_MODE;
                 }
             }
             break;
@@ -295,23 +384,26 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
         return true;
     }
 
-    if (((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) && record->tap.count) {
-        keycode &= 0xFF;
+    if (IS_QK_MOD_TAP(keycode) && record->tap.count) {
+        keycode = QK_MOD_TAP_GET_TAP_KEYCODE(keycode);
+    }
+    if (IS_QK_LAYER_TAP(keycode) && record->tap.count) {
+        keycode = QK_LAYER_TAP_GET_TAP_KEYCODE(keycode);
     }
 
-    if (typing_mode == UCTM_WIDE) {
+    if (unicode_typing_mode == UCTM_WIDE) {
         if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE) {
             return process_record_glyph_replacement(keycode, record, unicode_range_translator_wide);
         }
-    } else if (typing_mode == UCTM_SCRIPT) {
+    } else if (unicode_typing_mode == UCTM_SCRIPT) {
         if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE) {
             return process_record_glyph_replacement(keycode, record, unicode_range_translator_script);
         }
-    } else if (typing_mode == UCTM_BLOCKS) {
+    } else if (unicode_typing_mode == UCTM_BLOCKS) {
         if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE) {
             return process_record_glyph_replacement(keycode, record, unicode_range_translator_boxes);
         }
-    } else if (typing_mode == UCTM_REGIONAL) {
+    } else if (unicode_typing_mode == UCTM_REGIONAL) {
         if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE) {
             if (!process_record_glyph_replacement(keycode, record, unicode_range_translator_regional)) {
                 wait_us(500);
@@ -319,22 +411,26 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
                 return false;
             }
         }
-    } else if (typing_mode == UCTM_SUPER) {
+    } else if (unicode_typing_mode == UCTM_SUPER) {
         if (((KC_A <= keycode) && (keycode <= KC_0))) {
             return process_record_glyph_replacement(keycode, record, unicode_lut_translator_super);
         }
-    } else if (typing_mode == UCTM_AUSSIE) {
+    } else if (unicode_typing_mode == UCTM_COMIC) {
+        if (((KC_A <= keycode) && (keycode <= KC_0))) {
+            return process_record_glyph_replacement(keycode, record, unicode_lut_translator_comic);
+        }
+    } else if (unicode_typing_mode == UCTM_AUSSIE) {
         return process_record_aussie(keycode, record);
-    } else if (typing_mode == UCTM_ZALGO) {
+    } else if (unicode_typing_mode == UCTM_ZALGO) {
         return process_record_zalgo(keycode, record);
     }
     return true;
 }
 
 /**
- * @brief Initialize the default unicode mode on firmware startu
+ * @brief Initialize the default unicode mode on firmware startup
  *
  */
-void matrix_init_unicode(void) {
+void keyboard_post_init_unicode(void) {
     unicode_input_mode_init();
 }
diff --git a/users/drashna/keyrecords/unicode.h b/users/drashna/keyrecords/unicode.h
index 6885d4dd7f..43c2db89c0 100644
--- a/users/drashna/keyrecords/unicode.h
+++ b/users/drashna/keyrecords/unicode.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-enum unicode_typing_mode {
+enum unicode_typing_modes {
     UCTM_NO_MODE,
     UCTM_WIDE,
     UCTM_SCRIPT,
@@ -12,6 +12,9 @@ enum unicode_typing_mode {
     UCTM_AUSSIE,
     UCTM_ZALGO,
     UCTM_SUPER,
+    UCTM_COMIC,
+    UNCODES_MODE_END,
 };
 
-extern uint8_t typing_mode;
+extern uint8_t unicode_typing_mode;
+extern const PROGMEM char unicode_mode_str[UNCODES_MODE_END][13];
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 85a66eec7e..6dbe3b4812 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -67,18 +67,22 @@ static const char PROGMEM code_to_name[256] = {
  * @param record keyrecord_t data structure
  */
 void add_keylog(uint16_t keycode, keyrecord_t *record) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
-        if (((keycode & 0xFF) == KC_BSPC) && mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_CTRL) {
-            memset(keylog_str, ' ', OLED_KEYLOGGER_LENGTH);
-            return;
-        }
-        if (record->tap.count) {
-            keycode &= 0xFF;
-        } else if (keycode > 0xFF) {
-            return;
-        }
+    if (keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) {
+        keycode = QK_MOD_TAP_GET_TAP_KEYCODE(keycode);
+    } else if (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) {
+        keycode = QK_LAYER_TAP_GET_TAP_KEYCODE(keycode);
+    } else if (keycode >= QK_MODS && keycode <= QK_MODS_MAX) {
+        keycode = QK_MODS_GET_BASIC_KEYCODE(keycode);
     }
-    if (keycode > 0xFF) {
+
+
+    if ((keycode == KC_BSPC) && mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_CTRL) {
+        memset(keylog_str, ' ', OLED_KEYLOGGER_LENGTH);
+        return;
+    }
+    if (record->tap.count) {
+        keycode &= 0xFF;
+    } else if (keycode > 0xFF) {
         return;
     }
 
@@ -426,13 +430,14 @@ void render_bootmagic_status(uint8_t col, uint8_t line) {
         oled_write_P(logo[0][0], !is_bootmagic_on);
     }
 #ifndef OLED_DISPLAY_VERBOSE
+    oled_write_P(PSTR(" "), false);
     oled_write_P(logo[1][1], is_bootmagic_on);
     oled_write_P(logo[0][1], !is_bootmagic_on);
 #endif
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_NKRO), keymap_config.nkro);
     oled_write_P(PSTR(" "), false);
-#if defined(AUTOCORRECTION_ENABLE) || defined(AUTOCORRECT_ENABLE)
+#if defined(AUTOCORRECT_ENABLE)
     oled_write_P(PSTR("CRCT"), autocorrect_is_enabled());
     oled_write_P(PSTR(" "), false);
 #else
@@ -732,33 +737,8 @@ void render_kitty(uint8_t col, uint8_t line) {
 void render_unicode_mode(uint8_t col, uint8_t line) {
 #ifdef CUSTOM_UNICODE_ENABLE
     oled_set_cursor(col, line);
-    oled_write_ln_P(PSTR("Unicode:"), false);
-    switch (typing_mode) {
-        case UCTM_WIDE:
-            oled_write_P(PSTR("        Wide"), false);
-            break;
-        case UCTM_SCRIPT:
-            oled_write_P(PSTR("      Script"), false);
-            break;
-        case UCTM_BLOCKS:
-            oled_write_P(PSTR("      Blocks"), false);
-            break;
-        case UCTM_REGIONAL:
-            oled_write_P(PSTR("    Regional"), false);
-            break;
-        case UCTM_AUSSIE:
-            oled_write_P(PSTR("      Aussie"), false);
-            break;
-        case UCTM_ZALGO:
-            oled_write_P(PSTR("       Zalgo"), false);
-            break;
-        case UCTM_NO_MODE:
-            oled_write_P(PSTR("      Normal"), false);
-            break;
-        default:
-            oled_write_P(PSTR("     Unknown"), false);
-            break;
-    }
+    oled_write_P(PSTR("Unicode:"), false);
+    oled_write_P(unicode_mode_str[unicode_typing_mode], false);
 #endif
 }
 
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index 59b8cd7e42..85e60df681 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -43,6 +43,7 @@
 #            define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN
 #        endif
 #    endif
+#    undef RGB_MATRIX_DEFAULT_MODE
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_REST_MODE
 #endif
 
@@ -128,15 +129,15 @@
 #    define TAPPING_TERM 175
 #endif
 
-#ifndef SECURE_UNLOCK_SEQUENCE
-#    define SECURE_UNLOCK_SEQUENCE    \
-        {                             \
-            {2, 1}, {2, 2}, {2, 3}, { \
-                2, 4                  \
-            }                         \
-        }
+#if (__has_include("../../../qmk_secrets/config.h") && !defined(NO_SECRETS))
+#    include "../../../qmk_secrets/config.h"
 #endif
 
 #if defined(SPLIT_KEYBOARD) && defined(PROTOCOL_CHIBIOS) && !defined(USB_SUSPEND_WAKEUP_DELAY)
 #    define USB_SUSPEND_WAKEUP_DELAY 200
 #endif
+
+#ifdef XAP_ENABLE
+#    undef DYNAMIC_KEYMAP_LAYER_COUNT
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 12
+#endif
diff --git a/users/drashna/rgb/rgblight_config.h b/users/drashna/rgb/rgblight_config.h
index bb2bc3b3ef..d5a6917f1c 100644
--- a/users/drashna/rgb/rgblight_config.h
+++ b/users/drashna/rgb/rgblight_config.h
@@ -3,6 +3,10 @@
 
 #pragma once
 
-#    define RGBLIGHT_SLEEP
-#    define RGBLIGHT_EFFECT_TWINKLE_LIFE 250
-#    define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1 / 24
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_EFFECT_TWINKLE_LIFE 250
+#define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1 / 24
+
+#ifdef RGBLIGHT_DEFAULT_MODE
+#    undef RGBLIGHT_DEFAULT_MODE
+#endif
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 76bb5debe1..980d09576b 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -132,6 +132,9 @@ ifeq ($(strip $(AUTOCORRECTION_ENABLE)), yes)
    AUTOCORRECT_ENABLE = yes
 endif
 
-ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
-    SRC += bootmagic_better.c
+CUSTOM_BOOTMAGIC_ENABLE ?= yes
+ifeq ($(strip $(CUSTOM_BOOTMAGIC_ENABLE)), yes)
+    ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
+        SRC += bootmagic_better.c
+    endif
 endif
diff --git a/users/drashna/split/split_config.h b/users/drashna/split/split_config.h
index 66c12392d9..21ff3829bb 100644
--- a/users/drashna/split/split_config.h
+++ b/users/drashna/split/split_config.h
@@ -7,6 +7,9 @@
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_MODS_ENABLE
+#ifndef POINTING_DEVICE_ENABLE
+#    define SPLIT_WATCHDOG_ENABLE
+#endif
 #ifdef WPM_ENABLE
 #    define SPLIT_WPM_ENABLE
 #endif
@@ -17,5 +20,5 @@
 #    define SELECT_SOFT_SERIAL_SPEED 1
 #endif
 #ifdef CUSTOM_SPLIT_TRANSPORT_SYNC
-#    define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_WATCHDOG_SYNC, RPC_ID_USER_KEYLOG_STR
+#    define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_PLACEHOLDER, RPC_ID_USER_KEYLOG_STR
 #endif
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c
index 11c56849eb..0284627ed2 100644
--- a/users/drashna/split/transport_sync.c
+++ b/users/drashna/split/transport_sync.c
@@ -25,11 +25,6 @@ extern bool tap_toggling;
 extern bool swap_hands;
 #endif
 
-#if defined(SPLIT_WATCHDOG_TIMEOUT)
-static bool     watchdog_ping_done = false;
-static uint32_t watchdog_timer     = 0;
-#endif
-
 extern userspace_config_t userspace_config;
 extern bool               host_driver_disabled;
 
@@ -54,12 +49,6 @@ void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiato
     }
 }
 
-#if defined(SPLIT_WATCHDOG_TIMEOUT)
-void watchdog_handler(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) {
-    watchdog_ping_done = true;
-}
-#endif
-
 #ifdef CUSTOM_OLED_DRIVER
 #    include "oled/oled_stuff.h"
 void keylogger_string_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
@@ -77,14 +66,6 @@ void keyboard_post_init_transport_sync(void) {
 #ifdef CUSTOM_OLED_DRIVER
     transaction_register_rpc(RPC_ID_USER_KEYLOG_STR, keylogger_string_sync);
 #endif
-
-#if defined(SPLIT_WATCHDOG_TIMEOUT)
-#    if defined(PROTOCOL_LUFA)
-    wdt_disable();
-#    endif
-    transaction_register_rpc(RPC_ID_USER_WATCHDOG_SYNC, watchdog_handler);
-    watchdog_timer = timer_read32();
-#endif
 }
 
 void user_transport_update(void) {
@@ -103,7 +84,7 @@ void user_transport_update(void) {
 #endif
 #ifdef UNICODE_COMMON_ENABLE
         user_state.unicode_mode        = unicode_config.input_mode;
-        user_state.unicode_typing_mode = typing_mode;
+        user_state.unicode_typing_mode = unicode_typing_mode;
 #endif
 #ifdef SWAP_HANDS_ENABLE
         user_state.swap_hands = swap_hands;
@@ -117,7 +98,7 @@ void user_transport_update(void) {
         user_state.raw       = transport_user_state;
 #ifdef UNICODE_COMMON_ENABLE
         unicode_config.input_mode = user_state.unicode_mode;
-        typing_mode               = user_state.unicode_typing_mode;
+        unicode_typing_mode       = user_state.unicode_typing_mode;
 #endif
 #if defined(OLED_ENABLE) && !defined(SPLIT_OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
         is_oled_enabled = user_state.is_oled_enabled;
@@ -219,28 +200,6 @@ void user_transport_sync(void) {
         }
 #endif
     }
-
-#if defined(SPLIT_WATCHDOG_TIMEOUT)
-    if (!watchdog_ping_done) {
-        if (is_keyboard_master()) {
-            if (timer_elapsed32(watchdog_timer) > 100) {
-                uint8_t any_data = 1;
-                if (transaction_rpc_send(RPC_ID_USER_WATCHDOG_SYNC, sizeof(any_data), &any_data)) {
-                    watchdog_ping_done = true; // successful ping
-                } else {
-                    dprint("Watchdog ping failed!\n");
-                }
-                watchdog_timer = timer_read32();
-            }
-        } else {
-            if (timer_elapsed32(watchdog_timer) > 3500) {
-                mcu_reset();
-                while (1) {
-                }
-            }
-        }
-    }
-#endif
 }
 
 void housekeeping_task_transport_sync(void) {

From 90fe668dd976743b33bbc30c7a560d827df21cc0 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Wed, 30 Nov 2022 09:01:10 +0800
Subject: [PATCH 944/959] Enable bootmagic (#19191)

---
 keyboards/work_louder/micro/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index aee775e3d2..1417ba0cde 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -4,7 +4,7 @@
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
     "features": {
-        "bootmagic": false,
+        "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,

From 4a0aa9ada2837762e3b4eab73950962365341cce Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 30 Nov 2022 02:45:51 +0000
Subject: [PATCH 945/959] Fix headers in info.json reference (#19202)

---
 docs/reference_info_json.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index a96d9d4b6f..d5469c835a 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -39,7 +39,7 @@ The `info.json` file is a JSON formatted dictionary. The first six keys noted he
 
 ?> For all the available keys and their allowed values refer back to the [`data/schemas/keyboard.jsonschema`](https://github.com/qmk/qmk_firmware/blob/master/data/schemas/keyboard.jsonschema) file.
 
-### Layout Format
+## Layout Format
 
 Within our `info.json` file the `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout macros, for example `LAYOUT_ansi` or `LAYOUT_iso`.
 
@@ -68,11 +68,11 @@ All key positions and rotations are specified in relation to the top-left corner
     * A two item list describing the row and column location for this key.
     * Example: `[0, 4]`
 
-### Matrix Pins
+## Matrix Pins
 
 Currently QMK supports connecting switches either directly to GPIO pins or via a switch matrix. At this time you can not combine these, they are mutually exclusive.
 
-#### Switch Matrix
+### Switch Matrix
 
 Most keyboards use a switch matrix to connect keyswitches to the MCU. You can define your pin columns and rows to configure your switch matrix. When defining switch matrices you should also define your `diode_direction`.
 
@@ -88,7 +88,7 @@ Example:
 }
 ```
 
-#### Direct Pins
+### Direct Pins
 
 Direct pins are when you connect one side of the switch to GND and the other side to a GPIO pin on your MCU. No diode is required, but there is a 1:1 mapping between switches and pins.
 
@@ -250,7 +250,7 @@ The following animations can be enabled:
 |`static_gradient`|Enable static gradient mode.          |
 |`twinkle`        |Enable twinkle animation mode.        |
 
-### USB
+## USB
 
 Every USB keyboard needs to have its USB parameters defined. At a minimum you need to set the Vendor ID, Product ID, and device version.
 
@@ -268,7 +268,7 @@ Example:
 
 The device version is a BCD (binary coded decimal) value, in the format `MMmr`, so the below value would look like `0x0100` in the generated code. This also means the maximum valid values for each part are `99.9.9`, despite it being a hexadecimal value under the hood.
 
-### Encoders
+## Encoders
 
 This section controls the basic [rotary encoder](feature_encoders.md) support.
 
@@ -312,7 +312,7 @@ Examples:
 }
 ```
 
-### Secure
+## Secure
 
 The following options can be configured:
 

From 17fec52b0fc337ee96dec020e7371ddd5e39cdea Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 30 Nov 2022 04:27:48 +0000
Subject: [PATCH 946/959] Extend layout lint checks (#19200)

* Extend layout lint checks

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* Fix function comment

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 lib/python/qmk/info.py | 99 ++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 53 deletions(-)

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 1692d43c9c..0260b624af 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -1,6 +1,5 @@
 """Functions that help us generate and use info.json files.
 """
-from glob import glob
 from pathlib import Path
 
 import jsonschema
@@ -26,6 +25,50 @@ def _valid_community_layout(layout):
     return (Path('layouts/default') / layout).exists()
 
 
+def _validate(keyboard, info_data):
+    """Perform various validation on the provided info.json data
+    """
+    # First validate against the jsonschema
+    try:
+        validate(info_data, 'qmk.api.keyboard.v1')
+
+    except jsonschema.ValidationError as e:
+        json_path = '.'.join([str(p) for p in e.absolute_path])
+        cli.log.error('Invalid API data: %s: %s: %s', keyboard, json_path, e.message)
+        exit(1)
+
+    layouts = info_data.get('layouts', {})
+    layout_aliases = info_data.get('layout_aliases', {})
+    community_layouts = info_data.get('community_layouts', [])
+
+    # Make sure we have at least one layout
+    if len(layouts) == 0:
+        _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in info.json.')
+
+    # Providing only LAYOUT_all "because I define my layouts in a 3rd party tool"
+    if len(layouts) == 1 and 'LAYOUT_all' in layouts:
+        _log_warning(info_data, '"LAYOUT_all" should be "LAYOUT" unless additional layouts are provided.')
+
+    # Extended layout name checks
+    name_fragments = keyboard.split('/')
+    for layout in layouts.keys():
+        if any(fragment in layout for fragment in name_fragments):
+            _log_warning(info_data, f'Layout "{layout}" should not contain name of keyboard.')
+
+    # Filter out any non-existing community layouts
+    for layout in community_layouts:
+        if not _valid_community_layout(layout):
+            # Ignore layout from future checks
+            info_data['community_layouts'].remove(layout)
+            _log_error(info_data, 'Claims to support a community layout that does not exist: %s' % (layout))
+
+    # Make sure we supply layout macros for the community layouts we claim to support
+    for layout in community_layouts:
+        layout_name = 'LAYOUT_' + layout
+        if layout_name not in layouts and layout_name not in layout_aliases:
+            _log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name))
+
+
 def info_json(keyboard):
     """Generate the info.json data for a specific keyboard.
     """
@@ -72,34 +115,8 @@ def info_json(keyboard):
     # Merge in data from <keyboard.c>
     info_data = _extract_led_config(info_data, str(keyboard))
 
-    # Validate against the jsonschema
-    try:
-        validate(info_data, 'qmk.api.keyboard.v1')
-
-    except jsonschema.ValidationError as e:
-        json_path = '.'.join([str(p) for p in e.absolute_path])
-        cli.log.error('Invalid API data: %s: %s: %s', keyboard, json_path, e.message)
-        exit(1)
-
-    # Make sure we have at least one layout
-    if not info_data.get('layouts'):
-        _find_missing_layouts(info_data, keyboard)
-
-    if not info_data.get('layouts'):
-        _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in the keyboard.h or info.json.')
-
-    # Filter out any non-existing community layouts
-    for layout in info_data.get('community_layouts', []):
-        if not _valid_community_layout(layout):
-            # Ignore layout from future checks
-            info_data['community_layouts'].remove(layout)
-            _log_error(info_data, 'Claims to support a community layout that does not exist: %s' % (layout))
-
-    # Make sure we supply layout macros for the community layouts we claim to support
-    for layout in info_data.get('community_layouts', []):
-        layout_name = 'LAYOUT_' + layout
-        if layout_name not in info_data.get('layouts', {}) and layout_name not in info_data.get('layout_aliases', {}):
-            _log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name))
+    # Validate
+    _validate(keyboard, info_data)
 
     # Check that the reported matrix size is consistent with the actual matrix size
     _check_matrix(info_data)
@@ -701,30 +718,6 @@ def _search_keyboard_h(keyboard):
     return layouts, aliases
 
 
-def _find_missing_layouts(info_data, keyboard):
-    """Looks for layout macros when they aren't found other places.
-
-    If we don't find any layouts from info.json or keyboard.h we widen our search. This is error prone which is why we want to encourage people to follow the standard above.
-    """
-    _log_warning(info_data, '%s: Falling back to searching for KEYMAP/LAYOUT macros.' % (keyboard))
-
-    for file in glob('keyboards/%s/*.h' % keyboard):
-        these_layouts, these_aliases = find_layouts(file)
-
-        if these_layouts:
-            for layout_name, layout_json in these_layouts.items():
-                if not layout_name.startswith('LAYOUT_kc'):
-                    layout_json['c_macro'] = True
-                    info_data['layouts'][layout_name] = layout_json
-
-        for alias, alias_text in these_aliases.items():
-            if alias_text in these_layouts:
-                if 'layout_aliases' not in info_data:
-                    info_data['layout_aliases'] = {}
-
-                info_data['layout_aliases'][alias] = alias_text
-
-
 def _log_error(info_data, message):
     """Send an error message to both JSON and the log.
     """

From bb4f094a08fd150ebe8b4cd5c93b9e7bb0423fd7 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 30 Nov 2022 06:03:19 +0000
Subject: [PATCH 947/959] Fix bad bootmagic config (#19206)

---
 keyboards/afternoonlabs/breeze/rev0/config.h | 2 +-
 keyboards/afternoonlabs/gust/rev1/config.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h
index a4f03a7c4e..4c082fbeac 100644
--- a/keyboards/afternoonlabs/breeze/rev0/config.h
+++ b/keyboards/afternoonlabs/breeze/rev0/config.h
@@ -37,4 +37,4 @@
 #define DIODE_DIRECTION COL2ROW
 
 #define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COL 5
+#define BOOTMAGIC_LITE_COLUMN 5
diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h
index c2f4290a0b..f3e9c95c52 100644
--- a/keyboards/afternoonlabs/gust/rev1/config.h
+++ b/keyboards/afternoonlabs/gust/rev1/config.h
@@ -31,4 +31,4 @@
 #define DIODE_DIRECTION COL2ROW
 
 #define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COL 0
+#define BOOTMAGIC_LITE_COLUMN 0

From e0d0d81dfa7bf5bc492318d80f16f51722d69471 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 30 Nov 2022 06:18:05 +0000
Subject: [PATCH 948/959] Add missing default_ortho_5x5 keymap (#19208)

---
 .../ortho_5x5/default_ortho_5x5/keymap.c      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 layouts/default/ortho_5x5/default_ortho_5x5/keymap.c

diff --git a/layouts/default/ortho_5x5/default_ortho_5x5/keymap.c b/layouts/default/ortho_5x5/default_ortho_5x5/keymap.c
new file mode 100644
index 0000000000..fbcd47b79d
--- /dev/null
+++ b/layouts/default/ortho_5x5/default_ortho_5x5/keymap.c
@@ -0,0 +1,24 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┐
+     * │ A │ B │ C │ D │ E │
+     * ├───┼───┼───┼───┼───┤
+     * │ A │ B │ C │ D │ E │
+     * ├───┼───┼───┼───┼───┤
+     * │ A │ B │ C │ D │ E │
+     * ├───┼───┼───┼───┼───┤
+     * │ A │ B │ C │ D │ E │
+     * ├───┼───┼───┼───┼───┤
+     * │ A │ B │ C │ D │ E │
+     * └───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_5x5(
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E
+    )
+};

From 2d45e5e4b464d0fc7e83d4065da9e797c7c4d580 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 30 Nov 2022 06:38:02 +0000
Subject: [PATCH 949/959] Add ortho_3x3 community layout (#19210)

---
 .../ortho_3x3/default_ortho_3x3/keymap.c      | 18 +++++++++++++++
 layouts/default/ortho_3x3/info.json           | 22 +++++++++++++++++++
 layouts/default/ortho_3x3/layout.json         |  3 +++
 layouts/default/ortho_3x3/readme.md           |  3 +++
 layouts/default/readme.md                     | 11 ++++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 layouts/default/ortho_3x3/default_ortho_3x3/keymap.c
 create mode 100644 layouts/default/ortho_3x3/info.json
 create mode 100644 layouts/default/ortho_3x3/layout.json
 create mode 100644 layouts/default/ortho_3x3/readme.md

diff --git a/layouts/default/ortho_3x3/default_ortho_3x3/keymap.c b/layouts/default/ortho_3x3/default_ortho_3x3/keymap.c
new file mode 100644
index 0000000000..fbcca233bd
--- /dev/null
+++ b/layouts/default/ortho_3x3/default_ortho_3x3/keymap.c
@@ -0,0 +1,18 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┐
+     * │ A │ B │ C │
+     * ├───┼───┼───┤
+     * │ D │ E │ F │
+     * ├───┼───┼───┤
+     * │ G │ H │ I │
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_3x3(
+        KC_A,    KC_B,    KC_C,
+        KC_D,    KC_E,    KC_F,
+        KC_G,    KC_H,    KC_I
+    )
+};
diff --git a/layouts/default/ortho_3x3/info.json b/layouts/default/ortho_3x3/info.json
new file mode 100644
index 0000000000..4e0def90f4
--- /dev/null
+++ b/layouts/default/ortho_3x3/info.json
@@ -0,0 +1,22 @@
+{
+    "keyboard_name": "3x3 ortholinear layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_ortho_3x3": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/ortho_3x3/layout.json b/layouts/default/ortho_3x3/layout.json
new file mode 100644
index 0000000000..7986a26a76
--- /dev/null
+++ b/layouts/default/ortho_3x3/layout.json
@@ -0,0 +1,3 @@
+["","",""],
+["","",""],
+["","",""]
diff --git a/layouts/default/ortho_3x3/readme.md b/layouts/default/ortho_3x3/readme.md
new file mode 100644
index 0000000000..b6b2053565
--- /dev/null
+++ b/layouts/default/ortho_3x3/readme.md
@@ -0,0 +1,3 @@
+# ortho_3x3
+
+    LAYOUT_ortho_3x3
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index 0d2182e671..8390281796 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -1059,6 +1059,17 @@ LAYOUT_ortho_2x6
 └───┴───┴───┴───┴───┴───┘
 ```
 
+```
+LAYOUT_ortho_3x3
+┌───┬───┬───┐
+│   │   │   │
+├───┼───┼───┤
+│   │   │   │
+├───┼───┼───┤
+│   │   │   │
+└───┴───┴───┘
+```
+
 ```
 LAYOUT_ortho_3x10
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐

From 739d4ad2fb9d80f5fa924d04560ce191c81f8519 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 30 Nov 2022 06:39:27 +0000
Subject: [PATCH 950/959] Add some community layouts to 40percentclub boards
 (#19209)

---
 keyboards/40percentclub/25/rules.mk  | 2 ++
 keyboards/40percentclub/5x5/rules.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk
index d2e5d56c07..8e6f2001fb 100644
--- a/keyboards/40percentclub/25/rules.mk
+++ b/keyboards/40percentclub/25/rules.mk
@@ -19,3 +19,5 @@ AUDIO_ENABLE = no           # Audio output
 
 # Enable generic behavior for split boards
 SPLIT_KEYBOARD = yes
+
+LAYOUTS = ortho_5x5 ortho_5x10
diff --git a/keyboards/40percentclub/5x5/rules.mk b/keyboards/40percentclub/5x5/rules.mk
index 800b383cc0..c2528a4ba1 100644
--- a/keyboards/40percentclub/5x5/rules.mk
+++ b/keyboards/40percentclub/5x5/rules.mk
@@ -16,4 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS = ortho_5x15
+LAYOUTS = ortho_5x5 ortho_5x10 ortho_5x15

From 5d516ac2e232e4f58a8ff8103906ecb4181542c3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 30 Nov 2022 06:39:41 +0000
Subject: [PATCH 951/959] Ignore some layout macro names from lint (#19207)

---
 lib/python/qmk/info.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 0260b624af..7e588b5182 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -18,6 +18,16 @@ from qmk.math import compute
 true_values = ['1', 'on', 'yes']
 false_values = ['0', 'off', 'no']
 
+# TODO: reduce this list down
+SAFE_LAYOUT_TOKENS = {
+    'ansi',
+    'iso',
+    'wkl',
+    'tkl',
+    'preonic',
+    'planck',
+}
+
 
 def _valid_community_layout(layout):
     """Validate that a declared community list exists
@@ -40,6 +50,7 @@ def _validate(keyboard, info_data):
     layouts = info_data.get('layouts', {})
     layout_aliases = info_data.get('layout_aliases', {})
     community_layouts = info_data.get('community_layouts', [])
+    community_layouts_names = list(map(lambda layout: f'LAYOUT_{layout}', community_layouts))
 
     # Make sure we have at least one layout
     if len(layouts) == 0:
@@ -49,9 +60,10 @@ def _validate(keyboard, info_data):
     if len(layouts) == 1 and 'LAYOUT_all' in layouts:
         _log_warning(info_data, '"LAYOUT_all" should be "LAYOUT" unless additional layouts are provided.')
 
-    # Extended layout name checks
-    name_fragments = keyboard.split('/')
-    for layout in layouts.keys():
+    # Extended layout name checks - ignoring community_layouts and "safe" values
+    name_fragments = set(keyboard.split('/')) - SAFE_LAYOUT_TOKENS
+    potential_layouts = set(layouts.keys()) - set(community_layouts_names)
+    for layout in potential_layouts:
         if any(fragment in layout for fragment in name_fragments):
             _log_warning(info_data, f'Layout "{layout}" should not contain name of keyboard.')
 
@@ -63,8 +75,7 @@ def _validate(keyboard, info_data):
             _log_error(info_data, 'Claims to support a community layout that does not exist: %s' % (layout))
 
     # Make sure we supply layout macros for the community layouts we claim to support
-    for layout in community_layouts:
-        layout_name = 'LAYOUT_' + layout
+    for layout_name in community_layouts_names:
         if layout_name not in layouts and layout_name not in layout_aliases:
             _log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name))
 

From 0b29af101909dd7de46b50707423ec7aa7c686b8 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Wed, 30 Nov 2022 17:51:49 +1100
Subject: [PATCH 952/959] [Keymap] Update Miryoku (#19190)

---
 .../keymaps/manna-harbour_miryoku/config.h    | 40 ++++++++
 .../keymaps/manna-harbour_miryoku/keymap.c    |  0
 .../keymaps/manna-harbour_miryoku/rules.mk    |  4 +
 .../manna-harbour_miryoku/config.h            |  4 +-
 .../manna-harbour_miryoku/keymap.c            |  4 +
 .../manna-harbour_miryoku/rules.mk            |  0
 .../manna-harbour_miryoku.c                   | 48 ++++++++++
 .../miryoku_layer_alternatives.h              | 94 +++++++++----------
 users/manna-harbour_miryoku/readme.org        | 77 ++++++++++-----
 users/manna-harbour_miryoku/rules.mk          |  9 +-
 10 files changed, 206 insertions(+), 74 deletions(-)
 create mode 100644 keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h
 rename keyboards/{ferris => takashicompany/minizone}/keymaps/manna-harbour_miryoku/keymap.c (100%)
 create mode 100644 keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/rules.mk
 rename {keyboards/ferris/keymaps => layouts/community/split_3x5_2}/manna-harbour_miryoku/config.h (96%)
 create mode 100644 layouts/community/split_3x5_2/manna-harbour_miryoku/keymap.c
 rename {keyboards/ferris/keymaps => layouts/community/split_3x5_2}/manna-harbour_miryoku/rules.mk (100%)

diff --git a/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..b899befbe3
--- /dev/null
+++ b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,40 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#define XXX KC_NO
+
+#if defined (MIRYOKU_MAPPING_EXTENDED_THUMBS)
+
+#define LAYOUT_miryoku( \
+K00,   K01,   K02,   K03,   K04,                   K05,   K06,   K07,   K08,   K09, \
+K10,   K11,   K12,   K13,   K14,                   K15,   K16,   K17,   K18,   K19, \
+K20,   K21,   K22,   K23,   K24,                   K25,   K26,   K27,   K28,   K29, \
+N30,   N31,   K32,   K33,   K34,                   K35,   K36,   K37,   N38,   N39 \
+) \
+LAYOUT( \
+K00,   K01,   K02,   K03,   K04,                   K05,   K06,   K07,   K08,   K09, \
+K10,   K11,   K12,   K13,   K14,                   K15,   K16,   K17,   K18,   K19, \
+K20,   K21,   K22,   K23,   K24,                   K25,   K26,   K27,   K28,   K29, \
+       XXX,   K32,   K33,   K34,                   K35,   K36,   K37,   XXX \
+)
+
+#else
+
+#define LAYOUT_miryoku( \
+K00,   K01,   K02,   K03,   K04,                   K05,   K06,   K07,   K08,   K09, \
+K10,   K11,   K12,   K13,   K14,                   K15,   K16,   K17,   K18,   K19, \
+K20,   K21,   K22,   K23,   K24,                   K25,   K26,   K27,   K28,   K29, \
+N30,   N31,   K32,   K33,   K34,                   K35,   K36,   K37,   N38,   N39 \
+) \
+LAYOUT( \
+K00,   K01,   K02,   K03,   K04,                   K05,   K06,   K07,   K08,   K09, \
+K10,   K11,   K12,   K13,   K14,                   K15,   K16,   K17,   K18,   K19, \
+K20,   K21,   K22,   K23,   K24,                   K25,   K26,   K27,   K28,   K29, \
+              K32,   K33,   K34, KC_BTN1, KC_BTN2, K35,   K36,   K37 \
+)
+
+#endif
diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/rules.mk
new file mode 100644
index 0000000000..0488a92d46
--- /dev/null
+++ b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+LTO_ENABLE = yes
diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h b/layouts/community/split_3x5_2/manna-harbour_miryoku/config.h
similarity index 96%
rename from keyboards/ferris/keymaps/manna-harbour_miryoku/config.h
rename to layouts/community/split_3x5_2/manna-harbour_miryoku/config.h
index dbbff11bb6..c9f1117a6f 100644
--- a/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h
+++ b/layouts/community/split_3x5_2/manna-harbour_miryoku/config.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Manna Harbour
+// Copyright 2022 Manna Harbour
 // https://github.com/manna-harbour/miryoku
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -11,7 +11,7 @@ K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19, \
 K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29, \
 N30,   N31,   K32,   K33,   K34,          K35,   K36,   K37,   N38,   N39 \
 ) \
-LAYOUT( \
+LAYOUT_split_3x5_2( \
 K00,   K01,   K02,   K03,   K04,          K05,   K06,   K07,   K08,   K09, \
 K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19, \
 K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29, \
diff --git a/layouts/community/split_3x5_2/manna-harbour_miryoku/keymap.c b/layouts/community/split_3x5_2/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..dbab7f9820
--- /dev/null
+++ b/layouts/community/split_3x5_2/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk b/layouts/community/split_3x5_2/manna-harbour_miryoku/rules.mk
similarity index 100%
rename from keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk
rename to layouts/community/split_3x5_2/manna-harbour_miryoku/rules.mk
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
index 42660a6a5b..5de5d9b129 100644
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
@@ -7,12 +7,60 @@
 
 #include "manna-harbour_miryoku.h"
 
+
+// Additional Features double tap guard
+
+enum {
+    U_TD_BOOT,
+#define MIRYOKU_X(LAYER, STRING) U_TD_U_##LAYER,
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+};
+
+void u_td_fn_boot(qk_tap_dance_state_t *state, void *user_data) { \
+  if (state->count == 2) {
+    reset_keyboard();
+  }
+}
+
+#define MIRYOKU_X(LAYER, STRING) \
+void u_td_fn_U_##LAYER(qk_tap_dance_state_t *state, void *user_data) { \
+  if (state->count == 2) { \
+    default_layer_set((layer_state_t)1 << U_##LAYER); \
+  } \
+}
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [U_TD_BOOT] = ACTION_TAP_DANCE_FN(u_td_fn_boot),
+#define MIRYOKU_X(LAYER, STRING) [U_TD_U_##LAYER] = ACTION_TAP_DANCE_FN(u_td_fn_U_##LAYER),
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+};
+
+
+// keymap
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #define MIRYOKU_X(LAYER, STRING) [U_##LAYER] = U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_##LAYER, MIRYOKU_LAYER_##LAYER),
 MIRYOKU_LAYER_LIST
 #undef MIRYOKU_X
 };
 
+
+// shift functions
+
+const key_override_t capsword_key_override = ko_make_basic(MOD_MASK_SHIFT, CW_TOGG, KC_CAPS);
+
+const key_override_t **key_overrides = (const key_override_t *[]){
+    &capsword_key_override,
+    NULL
+};
+
+
+// thumb combos
+
 #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS)
 const uint16_t PROGMEM thumbcombos_base_right[] = {LT(U_SYM, KC_ENT), LT(U_NUM, KC_BSPC), COMBO_END};
 const uint16_t PROGMEM thumbcombos_base_left[] = {LT(U_NAV, KC_SPC), LT(U_MOUSE, KC_TAB), COMBO_END};
diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
index 15ad2a567a..dea06bb690 100644
--- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
+++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h
@@ -251,134 +251,134 @@ U_NP,              U_NP,              KC_ESC,            KC_SPC,            KC_T
 
 
 #define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT_FLIP \
-KC_PGUP,           KC_HOME,           KC_UP,             KC_END,            KC_INS,            U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
-KC_PGDN,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_NAV),         DF(U_NUM),         KC_ALGR,           U_NA,              \
+KC_PGUP,           KC_HOME,           KC_UP,             KC_END,            KC_INS,            U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
+KC_PGDN,           KC_LEFT,           KC_DOWN,           KC_RGHT,           CW_TOGG,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              TD(U_TD_U_NAV),    TD(U_TD_U_NUM),    KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV_FLIP \
-KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
-KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_NAV),         DF(U_NUM),         KC_ALGR,           U_NA,              \
+KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
+KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           CW_TOGG,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              TD(U_TD_U_NAV),    TD(U_TD_U_NUM),    KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_DEL,            KC_BSPC,           KC_ENT,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV_INVERTEDT \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_INS,            KC_HOME,           KC_UP,             KC_END,            KC_PGUP,           \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_PGDN,           \
-U_NA,              KC_ALGR,           DF(U_NUM),         DF(U_NAV),         U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              KC_INS,            KC_HOME,           KC_UP,             KC_END,            KC_PGUP,           \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              CW_TOGG,           KC_LEFT,           KC_DOWN,           KC_RGHT,           KC_PGDN,           \
+U_NA,              KC_ALGR,           TD(U_TD_U_NUM),    TD(U_TD_U_NAV),    U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV_VI \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_CAPS,           \
-U_NA,              KC_ALGR,           DF(U_NUM),         DF(U_NAV),         U_NA,              KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           CW_TOGG,           \
+U_NA,              KC_ALGR,           TD(U_TD_U_NUM),    TD(U_TD_U_NAV),    U_NA,              KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_INS,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NAV \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
-KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           \
-U_NA,              KC_ALGR,           DF(U_NUM),         DF(U_NAV),         U_NA,              KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              CW_TOGG,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           \
+U_NA,              KC_ALGR,           TD(U_TD_U_NUM),    TD(U_TD_U_NAV),    U_NA,              KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_ENT,            KC_BSPC,           KC_DEL,            U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT_FLIP \
-KC_WH_U,           KC_WH_L,           KC_MS_U,           KC_WH_R,           U_NU,              U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_WH_U,           KC_WH_L,           KC_MS_U,           KC_WH_R,           U_NU,              U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
 KC_WH_D,           KC_MS_L,           KC_MS_D,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_MOUSE),       DF(U_SYM),         KC_ALGR,           U_NA,              \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              TD(U_TD_U_MOUSE),  TD(U_TD_U_SYM),    KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_BTN3,           KC_BTN1,           KC_BTN2,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_FLIP \
-KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
 KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              DF(U_MOUSE),       DF(U_SYM),         KC_ALGR,           U_NA,              \
+U_UND,             U_CUT,             U_CPY,             U_PST,             U_RDO,             U_NA,              TD(U_TD_U_MOUSE),  TD(U_TD_U_SYM),    KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_BTN3,           KC_BTN1,           KC_BTN2,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_INVERTEDT \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_NU,              KC_WH_L,           KC_MS_U,           KC_WH_R,           KC_WH_U,           \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              U_NU,              KC_WH_L,           KC_MS_U,           KC_WH_R,           KC_WH_U,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_R,           KC_WH_D,           \
-U_NA,              KC_ALGR,           DF(U_SYM),         DF(U_MOUSE),       U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+U_NA,              KC_ALGR,           TD(U_TD_U_SYM),    TD(U_TD_U_MOUSE),  U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN2,           KC_BTN1,           KC_BTN3,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE_VI \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           U_NU,              \
-U_NA,              KC_ALGR,           DF(U_SYM),         DF(U_MOUSE),       U_NA,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              \
+U_NA,              KC_ALGR,           TD(U_TD_U_SYM),    TD(U_TD_U_MOUSE),  U_NA,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN2,           KC_BTN1,           KC_BTN3,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MOUSE \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              U_RDO,             U_PST,             U_CPY,             U_CUT,             U_UND,             \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MS_L,           KC_MS_D,           KC_MS_U,           KC_MS_R,           \
-U_NA,              KC_ALGR,           DF(U_SYM),         DF(U_MOUSE),       U_NA,              U_NU,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           \
+U_NA,              KC_ALGR,           TD(U_TD_U_SYM),    TD(U_TD_U_MOUSE),  U_NA,              U_NU,              KC_WH_L,           KC_WH_D,           KC_WH_U,           KC_WH_R,           \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_BTN2,           KC_BTN1,           KC_BTN3,           U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT_FLIP \
-RGB_HUI,           RGB_SAI,           KC_VOLU,           RGB_VAI,           RGB_TOG,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+RGB_HUI,           RGB_SAI,           KC_VOLU,           RGB_VAI,           RGB_TOG,           U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
 RGB_MOD,           KC_MPRV,           KC_VOLD,           KC_MNXT,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
+U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           U_NA,              TD(U_TD_U_MEDIA),  TD(U_TD_U_FUN),    KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_FLIP \
-RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
 KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           U_NU,              U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           U_NA,              DF(U_MEDIA),       DF(U_FUN),         KC_ALGR,           U_NA,              \
+U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           U_NA,              TD(U_TD_U_MEDIA),  TD(U_TD_U_FUN),    KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_MUTE,           KC_MPLY,           KC_MSTP,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_INVERTEDT \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_TOG,           RGB_MOD,           KC_VOLU,           RGB_HUI,           RGB_SAI,           \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              RGB_TOG,           RGB_MOD,           KC_VOLU,           RGB_HUI,           RGB_SAI,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MPRV,           KC_VOLD,           KC_MNXT,           RGB_VAI,           \
-U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OU_AUTO,           U_NU,              U_NU,              U_NU,              U_NU,              \
+U_NA,              KC_ALGR,           TD(U_TD_U_FUN),    TD(U_TD_U_MEDIA),  U_NA,              OU_AUTO,           U_NU,              U_NU,              U_NU,              U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA_VI \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           RGB_TOG,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           U_NU,              \
-U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           \
+U_NA,              KC_ALGR,           TD(U_TD_U_FUN),    TD(U_TD_U_MEDIA),  U_NA,              U_NU,              U_NU,              U_NU,              U_NU,              OU_AUTO,           \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_MEDIA \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              RGB_TOG,           RGB_MOD,           RGB_HUI,           RGB_SAI,           RGB_VAI,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              U_NU,              KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           \
-U_NA,              KC_ALGR,           DF(U_FUN),         DF(U_MEDIA),       U_NA,              OU_AUTO,           U_NU,              U_NU,              U_NU,              U_NU,              \
+U_NA,              KC_ALGR,           TD(U_TD_U_FUN),    TD(U_TD_U_MEDIA),  U_NA,              OU_AUTO,           U_NU,              U_NU,              U_NU,              U_NU,              \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MSTP,           KC_MPLY,           KC_MUTE,           U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_NUM_FLIP \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_EQL,            KC_4,              KC_5,              KC_6,              KC_SCLN,           \
-U_NA,              KC_ALGR,           DF(U_NAV),         DF(U_NUM),         U_NA,              KC_BSLS,           KC_1,              KC_2,              KC_3,              KC_GRV,            \
+U_NA,              KC_ALGR,           TD(U_TD_U_NAV),    TD(U_TD_U_NUM),    U_NA,              KC_BSLS,           KC_1,              KC_2,              KC_3,              KC_GRV,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_MINS,           KC_0,              KC_DOT,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_NUM \
-KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_LBRC,           KC_7,              KC_8,              KC_9,              KC_RBRC,           U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
 KC_SCLN,           KC_4,              KC_5,              KC_6,              KC_EQL,            U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-KC_GRV,            KC_1,              KC_2,              KC_3,              KC_BSLS,           U_NA,              DF(U_NUM),         DF(U_NAV),         KC_ALGR,           U_NA,              \
+KC_GRV,            KC_1,              KC_2,              KC_3,              KC_BSLS,           U_NA,              TD(U_TD_U_NUM),    TD(U_TD_U_NAV),    KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_DOT,            KC_0,              KC_MINS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_SYM_FLIP \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_PLUS,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_COLN,           \
-U_NA,              KC_ALGR,           DF(U_MOUSE),       DF(U_SYM),         U_NA,              KC_PIPE,           KC_EXLM,           KC_AT,             KC_HASH,           KC_TILD,           \
+U_NA,              KC_ALGR,           TD(U_TD_U_MOUSE),  TD(U_TD_U_SYM),    U_NA,              KC_PIPE,           KC_EXLM,           KC_AT,             KC_HASH,           KC_TILD,           \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_UNDS,           KC_LPRN,           KC_RPRN,           U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_SYM \
-KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_LCBR,           KC_AMPR,           KC_ASTR,           KC_LPRN,           KC_RCBR,           U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
 KC_COLN,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_PLUS,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-KC_TILD,           KC_EXLM,           KC_AT,             KC_HASH,           KC_PIPE,           U_NA,              DF(U_SYM),         DF(U_MOUSE),       KC_ALGR,           U_NA,              \
+KC_TILD,           KC_EXLM,           KC_AT,             KC_HASH,           KC_PIPE,           U_NA,              TD(U_TD_U_SYM),    TD(U_TD_U_MOUSE),  KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_LPRN,           KC_RPRN,           KC_UNDS,           U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 
 #define MIRYOKU_ALTERNATIVES_FUN_FLIP \
-QK_BOOT,           DF(U_TAP),         DF(U_EXTRA),       DF(U_BASE),        U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
+TD(U_TD_BOOT),     TD(U_TD_U_TAP),    TD(U_TD_U_EXTRA),  TD(U_TD_U_BASE),   U_NA,              KC_PSCR,           KC_F7,             KC_F8,             KC_F9,             KC_F12,            \
 KC_LGUI,           KC_LALT,           KC_LCTL,           KC_LSFT,           U_NA,              KC_SCRL,           KC_F4,             KC_F5,             KC_F6,             KC_F11,            \
-U_NA,              KC_ALGR,           DF(U_MEDIA),       DF(U_FUN),         U_NA,              KC_PAUS,           KC_F1,             KC_F2,             KC_F3,             KC_F10,            \
+U_NA,              KC_ALGR,           TD(U_TD_U_MEDIA),  TD(U_TD_U_FUN),    U_NA,              KC_PAUS,           KC_F1,             KC_F2,             KC_F3,             KC_F10,            \
 U_NP,              U_NP,              U_NA,              U_NA,              U_NA,              KC_TAB,            KC_SPC,            KC_APP,            U_NP,              U_NP
 
 #define MIRYOKU_ALTERNATIVES_FUN \
-KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              DF(U_BASE),        DF(U_EXTRA),       DF(U_TAP),         QK_BOOT,           \
+KC_F12,            KC_F7,             KC_F8,             KC_F9,             KC_PSCR,           U_NA,              TD(U_TD_U_BASE),   TD(U_TD_U_EXTRA),  TD(U_TD_U_TAP),    TD(U_TD_BOOT),     \
 KC_F11,            KC_F4,             KC_F5,             KC_F6,             KC_SCRL,           U_NA,              KC_LSFT,           KC_LCTL,           KC_LALT,           KC_LGUI,           \
-KC_F10,            KC_F1,             KC_F2,             KC_F3,             KC_PAUS,           U_NA,              DF(U_FUN),         DF(U_MEDIA),       KC_ALGR,           U_NA,              \
+KC_F10,            KC_F1,             KC_F2,             KC_F3,             KC_PAUS,           U_NA,              TD(U_TD_U_FUN),    TD(U_TD_U_MEDIA),  KC_ALGR,           U_NA,              \
 U_NP,              U_NP,              KC_APP,            KC_SPC,            KC_TAB,            U_NA,              U_NA,              U_NA,              U_NP,              U_NP
 
 
diff --git a/users/manna-harbour_miryoku/readme.org b/users/manna-harbour_miryoku/readme.org
index 0adc414e36..4621117526 100644
--- a/users/manna-harbour_miryoku/readme.org
+++ b/users/manna-harbour_miryoku/readme.org
@@ -39,6 +39,7 @@ Merging branches can be performed automatically at build time for [[#workflow-bu
 
 Any local changes to existing workflow files should be made independently in commits with messages starting ~[miryoku-github]~ so that they can also be automatically excluded in workflow builds.
 
+
 ** Building
 
 
@@ -171,7 +172,9 @@ The ~merge~ option can be used to merge branches at build time. Branches are spe
 
 The Build Inputs workflow can be used without editing workflow files.  Select Run workflow, select the Branch and fill out the form as desired, and activate Run workflow.
 
-Options are specified by entering values directly in the corresponding field.  Multiple comma separated values can be entered per option and a matrix build will be performed for each combination of values across all options.
+Most options are specified by entering values directly in the corresponding field.  Multiple comma separated values can be entered per option and a matrix build will be performed for each combination of values across all options.
+
+Values for Miryoku alternative layout options are selected from a list.  As multiple selection is not supported, matrix builds across multiple values are not possible for these options, and the Test Inputs or [[#build-examples][Build Example]] workflows should be used instead.
 
 The ~Keyboard~ option specifies the keyboard and is required.  All other options are optional.
 
@@ -416,6 +419,21 @@ make planck/rev6:manna-harbour_miryoku:flash FORCE_LAYOUT=planck_mit # planck re
 #+END_SRC
 
 
+
+**** split_3x5_2
+
+[[#thumb-combos][Thumb combos]] are enabled automatically for this layout.
+
+Keyboards supporting this layout: a_dux, alt34/rev1, bastardkb/dilemma, cradio, ferris/0_1, ferris/0_2, ferris/sweep
+
+Example build command lines:
+
+#+BEGIN_SRC sh :tangle no
+make ferris/0_2:manna-harbour_miryoku:flash # ferris/0_2
+make ferris/sweep:manna-harbour_miryoku:flash # ferris/sweep
+#+END_SRC
+
+
 **** split_3x5_3
 
 Keyboards supporting this layout: arch_36, boardsource/microdox, centromere, crkbd, eek, miniaxe, minidox/rev1, pteron36, squiggle/rev1, suihankey/split/rev1.
@@ -521,18 +539,6 @@ make ergotravel:manna-harbour_miryoku:flash
 #+END_SRC
 
 
-**** ferris
-
-[[#thumb-combos][Thumb combos]] are enabled automatically for this keyboard.
-
-To build for this keyboard,
-
-#+BEGIN_SRC sh :tangle no
-make ferris/0_2:manna-harbour_miryoku:flash # 0_2
-make ferris/sweep:manna-harbour_miryoku:flash # sweep
-#+END_SRC
-
-
 **** for_science
 
 The top row is unused.
@@ -724,6 +730,26 @@ make splitkb/kyria:manna-harbour_miryoku:flash MIRYOKU_MAPPING=EXTENDED_THUMBS #
 #+END_SRC
 
 
+**** takashicompany/minizone
+
+The bottom row middle two keys are mapped to left and right mouse buttons.
+
+An alternative subset mapping is also provided with the thumb keys shifted one
+position in the direction of thumb extension.  To select this mapping, append
+~MIRYOKU_MAPPING=EXTENDED_THUMBS~ to the ~make~ command line when building.
+
+To build for this keyboard,
+
+#+BEGIN_SRC sh :tangle no
+make takashicompany/minizone:manna-harbour_miryoku:flash # make
+make takashicompany/minizone:manna-harbour_miryoku:flash MIRYOKU_MAPPING=EXTENDED_THUMBS # make, extended thumb position
+make takashicompany/minizone:manna-harbour_miryoku:flash POINTING_DEVICE_ENABLE=yes POINTING_DEVICE_DRIVER=pimoroni_trackball OLED_ENABLE=no # make, with pimoroni trackball
+qmk compile -c -kb takashicompany/minizone -km manna-harbour_miryoku # qmk
+qmk compile -c -kb takashicompany/minizone -km manna-harbour_miryoku -e MIRYOKU_MAPPING=EXTENDED_THUMBS # qmk, extended thumb position
+qmk compile -c -kb takashicompany/minizone -km manna-harbour_miryoku -e POINTING_DEVICE_ENABLE=yes -e POINTING_DEVICE_DRIVER=pimoroni_trackball -e OLED_ENABLE=no # qmk, with pimoroni trackball
+#+END_SRC
+
+
 **** torn
 
 To build for this keyboard,
@@ -736,6 +762,21 @@ make torn:manna-harbour_miryoku:flash
 ** Additional and Experimental Features
 
 
+*** Bilateral Combinations
+
+- [[https://github.com/manna-harbour/qmk_firmware/issues/29][Bilateral Combinations]]
+
+
+*** Caps Word
+
+[[https://github.com/qmk/qmk_firmware/blob/master/docs/feature_caps_word.md][Caps Word]] is used in place of ~Caps Lock~.  Combine with ~Shift~ for ~Caps Lock~.
+
+
+*** Retro Shift
+
+- [[https://github.com/manna-harbour/qmk_firmware/issues/33][Retro Shift]]
+
+
 *** Thumb Combos
 
 ~MIRYOKU_KLUDGE_THUMBCOMBOS=yes~
@@ -743,15 +784,6 @@ make torn:manna-harbour_miryoku:flash
 Combo the primary and secondary thumb keys to emulate the tertiary thumb key.  Can be used on keyboards with missing or hard to reach tertiary thumb keys or for compatibility with same.  Requires suitable keycaps to enable the thumb to press both keys simultaneously.
 
 
-*** Bilateral Combinations
-
-- [[https://github.com/manna-harbour/qmk_firmware/issues/29][Bilateral Combinations]]
-
-
-*** Retro Shift
-
-- [[https://github.com/manna-harbour/qmk_firmware/issues/33][Retro Shift]]
-
 
 *** 𝑥MK
 
@@ -763,6 +795,7 @@ For [[#workflow-builds][workflow builds]], use the Build Inputs workflow and bui
 
 Also see [[https://github.com/manna-harbour/miryoku_kmonad][Miryoku KMonad]].
 
+
 ** 
 
 [[https://github.com/manna-harbour][https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/manna-harbour-boa-32.png]]
diff --git a/users/manna-harbour_miryoku/rules.mk b/users/manna-harbour_miryoku/rules.mk
index ea226c4a3d..c19a5ac046 100644
--- a/users/manna-harbour_miryoku/rules.mk
+++ b/users/manna-harbour_miryoku/rules.mk
@@ -1,9 +1,12 @@
 # Copyright 2019 Manna Harbour
 # https://github.com/manna-harbour/miryoku
 
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-AUTO_SHIFT_ENABLE = yes # Auto Shift
+MOUSEKEY_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+CAPS_WORD_ENABLE = yes
+KEY_OVERRIDE_ENABLE = yes
 
 INTROSPECTION_KEYMAP_C = manna-harbour_miryoku.c # keymaps
 

From 3d091f4a9d4a235c70121a1954f3e84b465b68b5 Mon Sep 17 00:00:00 2001
From: Adam Lickel <adam@lickel.com>
Date: Tue, 29 Nov 2022 22:52:10 -0800
Subject: [PATCH 953/959] Keeb.io Sinc: Enable Split LED state (#19187)

---
 keyboards/keebio/sinc/rev1/config.h | 2 ++
 keyboards/keebio/sinc/rev2/config.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
index 7fde38b58e..c394777a8f 100644
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@@ -23,6 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
+/* Synchronize Caps Lock LED across halves */
+#define SPLIT_LED_STATE_ENABLE
 
 /* ws2812 RGB LED */
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
index 7fde38b58e..c394777a8f 100644
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/config.h
@@ -23,6 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
+/* Synchronize Caps Lock LED across halves */
+#define SPLIT_LED_STATE_ENABLE
 
 /* ws2812 RGB LED */
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }

From 38a153b1435445f72c29c7cde50b018352c28d7c Mon Sep 17 00:00:00 2001
From: IFo Hancroft <contact@ifohancroft.com>
Date: Wed, 30 Nov 2022 08:52:44 +0200
Subject: [PATCH 954/959] [Keymap] Fixed ifohancroft Swap Hands Config (#19176)

---
 keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c b/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
index 58ef43e037..ed37ea1a4a 100644
--- a/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
+++ b/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
@@ -136,10 +136,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
-    {{0,  6}, {1,  6}, {2,  6}, {3,  6}, {4,  6}, {5,  6}, {6,  6}},
-    {{0,  7}, {1,  7}, {2,  7}, {3,  7}, {4,  7}, {5,  7}, {6,  7}}, 
-    {{0,  8}, {1,  8}, {2,  8}, {3,  8}, {4,  8}, {5,  8}, {6,  8}},
-    {{0,  9}, {1,  9}, {2,  9}, {3,  9}, {4,  9}, {5,  9}, {6,  9}},
-    {{0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10}, {6, 10}},
-    {{0, 11}, {1, 11}, {2, 11}, {3, 11}, {4, 11}, {5, 11}, {6, 11}}
+    {{0,  6}, {5,  6}, {4,  6}, {3,  6}, {2,  6}, {1,  6}, {6,  6}},
+    {{0,  7}, {5,  7}, {4,  7}, {3,  7}, {2,  7}, {1,  7}, {6,  7}}, 
+    {{0,  8}, {5,  8}, {4,  8}, {3,  8}, {2,  8}, {1,  8}, {6,  8}},
+    {{0,  9}, {5,  9}, {4,  9}, {3,  9}, {2,  9}, {1,  9}, {6,  9}},
+    {{0, 10}, {5, 10}, {4, 10}, {3, 10}, {2, 10}, {1, 10}, {6, 10}},
+    {{0, 11}, {5, 11}, {4, 11}, {3, 11}, {2, 11}, {1, 11}, {6, 11}}
 };

From 5ff7f289f28e2b10b8d89d83fb0aee13080dae25 Mon Sep 17 00:00:00 2001
From: Moses Hoyt <mohoyt@users.noreply.github.com>
Date: Wed, 30 Nov 2022 08:06:01 +0100
Subject: [PATCH 955/959] [Keyboard] Add Litl keyboard (#19000)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/sthlmkb/litl/info.json              |  49 ++++++++
 .../sthlmkb/litl/keymaps/default/keymap.c     |  37 ++++++
 keyboards/sthlmkb/litl/litl.c                 |  30 +++++
 keyboards/sthlmkb/litl/litl.h                 | 108 ++++++++++++++++++
 keyboards/sthlmkb/litl/readme.md              |  15 +++
 keyboards/sthlmkb/litl/rules.mk               |   1 +
 6 files changed, 240 insertions(+)
 create mode 100644 keyboards/sthlmkb/litl/info.json
 create mode 100644 keyboards/sthlmkb/litl/keymaps/default/keymap.c
 create mode 100644 keyboards/sthlmkb/litl/litl.c
 create mode 100644 keyboards/sthlmkb/litl/litl.h
 create mode 100644 keyboards/sthlmkb/litl/readme.md
 create mode 100644 keyboards/sthlmkb/litl/rules.mk

diff --git a/keyboards/sthlmkb/litl/info.json b/keyboards/sthlmkb/litl/info.json
new file mode 100644
index 0000000000..8340eb8372
--- /dev/null
+++ b/keyboards/sthlmkb/litl/info.json
@@ -0,0 +1,49 @@
+{
+    "manufacturer": "STHLM kb",
+    "keyboard_name": "litl",
+    "url": "https://github.com/mohoyt/litl",
+    "maintainer": "mohoyt",
+    "development_board": "promicro",
+    "diode_direction": "ROW2COL",
+    "features": {
+         "bootmagic": false,
+         "command": false,
+         "console": false,
+         "extrakey": true,
+         "debug": false,
+         "mousekey": false,
+         "encoder": true,
+         "oled": true
+    },
+    "matrix_pins": {
+         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+         "rows": ["B4", "B5", "D4", "C6", "D7", "E6", "F5", "F4"]
+     },
+    "usb": {
+         "device_version": "1.0.0",
+         "pid": "0x5353",
+         "vid": "0x8086"
+     },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"label":"1.25u", "x":11.75, "y":1, "w":1.25}, {"label":"1.25u", "x":0, "y":2, "w":1.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1.25u", "x":2.25, "y":3, "w":1.25}, {"label":"2.25u", "x":3.5, "y":3, "w":2.25}, {"label":"1u", "x":5.75, "y":3}, {"label":"2.75u", "x":6.75, "y":3, "w":2.75}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}, {"label":"Enc1", "x":14, "y":3}, {"label":"Enc2", "x":15, "y":3} ]
+        },
+        "LAYOUT_ansi_split_lshift": {
+            "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"1.25u", "x":0, "y":2, "w":1.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1u", "x":2.25, "y":3}, {"label":"6.25u", "x":3.25, "y":3, "w":6.25}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}, {"label":"Enc1", "x":14, "y":3}, {"label":"Enc2", "x":15, "y":3}]
+        },
+        "LAYOUT_ansi_split_space": {
+            "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"2.25u", "x":0, "y":2, "w":2.25}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1.25u", "x":2.25, "y":3, "w":1.25}, {"label":"2.25u", "x":3.5, "y":3, "w":2.25}, {"label":"1u", "x":5.75, "y":3}, {"label":"2.75u", "x":6.75, "y":3, "w":2.75}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}, {"label":"Enc1", "x":14, "y":3}, {"label":"Enc2", "x":15, "y":3}]
+        },
+        "LAYOUT_ansi_40": {
+            "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"2.25u", "x":0, "y":2, "w":2.25}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1u", "x":2.25, "y":3}, {"label":"6.25u", "x":3.25, "y":3, "w":6.25}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}, {"label":"Enc1", "x":14, "y":3}, {"label":"Enc2", "x":15, "y":3}]
+        },
+        "LAYOUT_ansi_split_enter": {
+            "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"1u", "x":10.75, "y":1}, {"label":"1.25u", "x":11.75, "y":1, "w":1.25}, {"label":"2.25u", "x":0, "y":2, "w":2.25}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1u", "x":2.25, "y":3}, {"label":"6.25u", "x":3.25, "y":3, "w":6.25}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}, {"label":"Enc1", "x":14, "y":3}, {"label":"Enc2", "x":15, "y":3}]
+        }
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D3", "pin_b": "D2", "resolution": 4 }
+        ]
+    }
+}
diff --git a/keyboards/sthlmkb/litl/keymaps/default/keymap.c b/keyboards/sthlmkb/litl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2c6ae5d35a
--- /dev/null
+++ b/keyboards/sthlmkb/litl/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 mohoyt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this 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_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+      KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+      LSFT_T(KC_GRV), KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT,
+      KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), MO(2), LT(1, KC_SPC), KC_RALT, KC_RGUI, KC_RCTL, KC_MPLY, KC_MUTE ),
+
+  [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_BSPC,
+  	  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_UP, KC_MINS, KC_EQL, KC_QUOT, KC_ENT,
+  	  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_EQL, KC_SLSH, KC_TRNS,
+  	  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MUTE ),
+
+  [2] = LAYOUT_all(
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO  , KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,  KC_NO  , 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_UP, KC_UP,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS )
+};
+
diff --git a/keyboards/sthlmkb/litl/litl.c b/keyboards/sthlmkb/litl/litl.c
new file mode 100644
index 0000000000..40aedfbe27
--- /dev/null
+++ b/keyboards/sthlmkb/litl/litl.c
@@ -0,0 +1,30 @@
+/* Copyright 2022 mohoyt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "litl.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/sthlmkb/litl/litl.h b/keyboards/sthlmkb/litl/litl.h
new file mode 100644
index 0000000000..3cbc5620d1
--- /dev/null
+++ b/keyboards/sthlmkb/litl/litl.h
@@ -0,0 +1,108 @@
+/* Copyright 2022 mohoyt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define _x_ KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+  K30, K31, K32,      K34, K35, K36, K37, K38, K39, K3A, K3B  \
+) { \
+{ K00, K02, K04, K06, K08, K0A, }, \
+{ K01, K03, K05, K07, K09, K0B, }, \
+{ K10, K12, K14, K16, K18, K1A, }, \
+{ K11, K13, K15, K17, K19, K1B, }, \
+{ K20, K22, K24, K26, K28, K2A, }, \
+{ K21, K23, K25, K27, K29, K2B, }, \
+{ K30, K32, K34, K36, K38, K3A, }, \
+{ K31, _x_, K35, K37, K39, K3B, }  \
+}
+
+#define LAYOUT_ansi_40( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, \
+  K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+  K30, K31, K32,           K35, K36,      K38, K39, K3A, K3B  \
+) { \
+{ K00, K02, K04, K06, K08, K0A, }, \
+{ K01, K03, K05, K07, K09, K0B, }, \
+{ K10, K12, K14, K16, K18, K1A, }, \
+{ K11, K13, K15, K17, K19, K1B, }, \
+{ K20, K22, K24, K26, K28, K2A, }, \
+{ K21, K23, K25, K27, K29, K2B, }, \
+{ K30, K32, K34, K36, K38, K3A, }, \
+{ K31, _x_, K35, K37, K39, K3B, }  \
+}
+
+#define LAYOUT_ansi_split_lshift( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+  K30, K31, K32,           K35, K36,      K38, K39, K3A, K3B  \
+) { \
+{ K00, K02, K04, K06, K08, K0A, }, \
+{ K01, K03, K05, K07, K09, K0B, }, \
+{ K10, K12, K14, K16, K18, K1A, }, \
+{ K11, K13, K15, K17, K19, K1B, }, \
+{ K20, K22, K24, K26, K28, K2A, }, \
+{ K21, K23, K25, K27, K29, K2B, }, \
+{ K30, K32, K34, K36, K38, K3A, }, \
+{ K31, _x_, K35, K37, K39, K3B, }  \
+}
+
+#define LAYOUT_ansi_split_space( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, \
+  K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+  K30, K31, K32,      K34, K35, K36, K37, K38, K39, K3A, K3B  \
+) { \
+{ K00, K02, K04, K06, K08, K0A, }, \
+{ K01, K03, K05, K07, K09, K0B, }, \
+{ K10, K12, K14, K16, K18, K1A, }, \
+{ K11, K13, K15, K17, K19, K1B, }, \
+{ K20, K22, K24, K26, K28, K2A, }, \
+{ K21, K23, K25, K27, K29, K2B, }, \
+{ K30, K32, K34, K36, K38, K3A, }, \
+{ K31, _x_, K35, K37, K39, K3B, }  \
+}
+
+#define LAYOUT_ansi_split_enter( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+  K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+  K30, K31, K32,           K35, K36,      K38, K39, K3A, K3B  \
+) { \
+{ K00, K02, K04, K06, K08, K0A, }, \
+{ K01, K03, K05, K07, K09, K0B, }, \
+{ K10, K12, K14, K16, K18, K1A, }, \
+{ K11, K13, K15, K17, K19, K1B, }, \
+{ K20, K22, K24, K26, K28, K2A, }, \
+{ K21, K23, K25, K27, K29, K2B, }, \
+{ K30, K32, K34, K36, K38, K3A, }, \
+{ K31, _x_, K35, K37, K39, K3B, }  \
+}
diff --git a/keyboards/sthlmkb/litl/readme.md b/keyboards/sthlmkb/litl/readme.md
new file mode 100644
index 0000000000..e04e229c73
--- /dev/null
+++ b/keyboards/sthlmkb/litl/readme.md
@@ -0,0 +1,15 @@
+# litl
+
+![Litl](https://i.imgur.com/ghyUaoqh.jpeg)
+
+Litl is an easy to build 40% keyboard using only through hole components. It uses a separate microcontroller (like the Pro Micro or Elite C) to enable flexibility in connectivity and to further simplify the soldering experience (no more tricksy USB ports).
+
+* Keyboard Maintainer: [mohoyt](https://github.com/mohoyt)
+* Hardware Supported: litl, Pro Micro, Elite-C, Puchi-C, Nice!Nano
+* Hardware Availability: [sthlm kb](https://sthlmkb.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sthlmkb/litl: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/sthlmkb/litl/rules.mk b/keyboards/sthlmkb/litl/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/sthlmkb/litl/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From a5c2eea6c16696773796b3c1df678c9cf20900b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Mart=C3=ADnez?=
 <58857054+elpekenin@users.noreply.github.com>
Date: Wed, 30 Nov 2022 18:48:23 +0100
Subject: [PATCH 956/959] Update OLED doc (#19213)

* Update OLED doc

* Update docs/feature_oled_driver.md

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 docs/feature_oled_driver.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index b7451f17df..dea9cb8074 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -80,6 +80,11 @@ static void render_logo(void) {
 
     oled_write_P(qmk_logo, false);
 }
+
+bool oled_task_user(void) {
+    render_logo();
+    return false;
+}
 ```
 
 ?> The default font file is located at `drivers/oled/glcdfont.c` and its location can be overwritten with the `OLED_FONT_H` configuration option. Font file content can be edited with external tools such as [Helix Font Editor](https://helixfonteditor.netlify.app/) and [Logo Editor](https://joric.github.io/qle/).

From 402d3d8a8648eb8d19d628dbced04bf414307595 Mon Sep 17 00:00:00 2001
From: Commander1024 <47283778+Commander1024@users.noreply.github.com>
Date: Wed, 30 Nov 2022 20:20:45 +0100
Subject: [PATCH 957/959] [Keyboard] Daskeyboard4 (#18675)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../daskeyboard/daskeyboard4/config.h         |  24 +++
 .../daskeyboard/daskeyboard4/daskeyboard4.c   |  19 +++
 .../daskeyboard/daskeyboard4/info.json        | 158 ++++++++++++++++++
 .../daskeyboard4/keymaps/default/keymap.c     |  45 +++++
 .../daskeyboard/daskeyboard4/readme.md        |  73 ++++++++
 .../daskeyboard/daskeyboard4/rules.mk         |   1 +
 6 files changed, 320 insertions(+)
 create mode 100644 keyboards/handwired/daskeyboard/daskeyboard4/config.h
 create mode 100644 keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c
 create mode 100644 keyboards/handwired/daskeyboard/daskeyboard4/info.json
 create mode 100644 keyboards/handwired/daskeyboard/daskeyboard4/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/daskeyboard/daskeyboard4/readme.md
 create mode 100644 keyboards/handwired/daskeyboard/daskeyboard4/rules.mk

diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/config.h b/keyboards/handwired/daskeyboard/daskeyboard4/config.h
new file mode 100644
index 0000000000..df121b6832
--- /dev/null
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/config.h
@@ -0,0 +1,24 @@
+// Copyright 2022 Commander1024 (@Commander1024)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* configure bootmagic lite trigger to ESC */
+#define BOOTMAGIC_LITE_ROW 5
+#define BOOTMAGIC_LITE_COLUMN 16
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c b/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c
new file mode 100644
index 0000000000..37d67007df
--- /dev/null
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c
@@ -0,0 +1,19 @@
+// Copyright 2022 Commander1024 (@Commander1024)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+// rotary encoder
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    // Volume control
+    if (clockwise) {
+        tap_code(KC_VOLD);
+    } else {
+        tap_code(KC_VOLU);
+    }
+    return true;
+};
+#endif
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
new file mode 100644
index 0000000000..a61443000d
--- /dev/null
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
@@ -0,0 +1,158 @@
+{
+    "manufacturer": "Metadot",
+    "keyboard_name": "daskeyboard4",
+    "maintainer": "Commander1024",
+    "url": "https://www.daskeyboard.com/de/daskeyboard-4-professional/",
+    "bootloader": "tinyuf2",
+    "bootloader_instructions": "Hold ESC while plugging USB in",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A2", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B9", "B7", "B6", "B5", "B4", "A8"],
+        "rows": ["A13", "A14", "A1", "A3", "B8", "B3", "A15", "B15"]
+    },
+    "board": "BLACKPILL_STM32_F411",
+    "processor": "STM32F411",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xFEED",
+        "pid": "0x0140"
+    },
+    "indicators": {
+        "num_lock": "C13",
+        "caps_lock": "B14",
+        "scroll_lock": "B2",
+        "on_state": 1
+    },
+    "encoder": {
+        "rotary": [
+            {
+            "pin_a": "B13",
+            "pin_b": "B12",
+            "resolution": 4
+            }
+        ]
+    },
+    "tapping": {
+        "toggle": 2
+    },
+    "layouts": {
+        "LAYOUT_fullsize_iso": {
+            "layout": [
+                { "label":"Esc", "matrix": [5, 16], "x": 0, "y": 0 },
+                { "label":"F1", "matrix": [2, 4], "x": 2, "y": 0 },
+                { "label":"F2", "matrix": [2, 5], "x": 3, "y": 0 },
+                { "label":"F3", "matrix": [3, 5], "x": 4, "y": 0 },
+                { "label":"F4", "matrix": [5, 5], "x": 5, "y": 0 },
+                { "label":"F5", "matrix": [0, 1], "x": 6.5, "y": 0 },
+                { "label":"F6", "matrix": [5, 8], "x": 7.5, "y": 0 },
+                { "label":"F7", "matrix": [3, 3], "x": 8.5, "y": 0 },
+                { "label":"F8", "matrix": [2, 3], "x": 9.5, "y": 0 },
+                { "label":"F9", "matrix": [2, 2], "x": 11, "y": 0 },
+                { "label":"F10", "matrix": [0, 2], "x": 12, "y": 0 },
+                { "label":"F11", "matrix": [5, 2], "x": 13, "y": 0 },
+                { "label":"F12", "matrix": [6, 2], "x": 14, "y": 0 },
+                { "label":"Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0 },
+                { "label":"Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0 },
+                { "label":"Pause", "matrix": [1, 1], "x": 17.25, "y": 0 },
+                { "label":"`", "matrix": [2, 16], "x": 0, "y": 1.25 },
+                { "label":"1", "matrix": [0, 16], "x": 1, "y": 1.25 },
+                { "label":"2", "matrix": [0, 4], "x": 2, "y": 1.25 },
+                { "label":"3", "matrix": [0, 5], "x": 3, "y": 1.25 },
+                { "label":"4", "matrix": [0, 6], "x": 4, "y": 1.25 },
+                { "label":"5", "matrix": [2, 6], "x": 5, "y": 1.25 },
+                { "label":"6", "matrix": [2, 7], "x": 6, "y": 1.25 },
+                { "label":"7", "matrix": [0, 7], "x": 7, "y": 1.25 },
+                { "label":"8", "matrix": [0, 8], "x": 8, "y": 1.25 },
+                { "label":"9", "matrix": [0, 3], "x": 9, "y": 1.25 },
+                { "label":"0", "matrix": [0, 9], "x": 10, "y": 1.25 },
+                { "label":"-", "matrix": [2, 9], "x": 11, "y": 1.25 },
+                { "label":"=", "matrix": [2, 8], "x": 12, "y": 1.25 },
+                { "label":"Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25 },
+                { "label":"Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25 },
+                { "label":"Home", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
+                { "label":"Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25 },
+                { "label":"Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25 },
+                { "label":"/", "matrix": [4, 11], "x": 19.5, "y": 1.25 },
+                { "label":"*", "matrix": [4, 14], "x": 20.5, "y": 1.25 },
+                { "label":"-", "matrix": [6, 14], "x": 21.5, "y": 1.25 },
+                { "label":"Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label":"Q", "matrix": [1, 16], "x": 1.5, "y": 2.25 },
+                { "label":"W", "matrix": [1, 4], "x": 2.5, "y": 2.25 },
+                { "label":"E", "matrix": [1, 5], "x": 3.5, "y": 2.25 },
+                { "label":"R", "matrix": [1, 6], "x": 4.5, "y": 2.25 },
+                { "label":"T", "matrix": [3, 6], "x": 5.5, "y": 2.25 },
+                { "label":"Y", "matrix": [3, 7], "x": 6.5, "y": 2.25 },
+                { "label":"U", "matrix": [1, 7], "x": 7.5, "y": 2.25 },
+                { "label":"I", "matrix": [1, 8], "x": 8.5, "y": 2.25 },
+                { "label":"O", "matrix": [1, 3], "x": 9.5, "y": 2.25 },
+                { "label":"P", "matrix": [1, 9], "x": 10.5, "y": 2.25 },
+                { "label":"[", "matrix": [3, 9], "x": 11.5, "y": 2.25 },
+                { "label":"]", "matrix": [3, 8], "x": 12.5, "y": 2.25 },
+                { "label":"Del", "matrix": [2, 10], "x": 15.25, "y": 2.25 },
+                { "label":"End", "matrix": [0, 15], "x": 16.25, "y": 2.25 },
+                { "label":"Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25 },
+                { "label":"7", "matrix": [1, 10], "x": 18.5, "y": 2.25 },
+                { "label":"8", "matrix": [1, 11], "x": 19.5, "y": 2.25 },
+                { "label":"9", "matrix": [1, 14], "x": 20.5, "y": 2.25 },
+                { "label":"+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25 },
+                { "label":"Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label":"A", "matrix": [7, 16], "x": 1.75, "y": 3.25 },
+                { "label":"S", "matrix": [7, 4], "x": 2.75, "y": 3.25 },
+                { "label":"D", "matrix": [7, 5], "x": 3.75, "y": 3.25 },
+                { "label":"F", "matrix": [7, 6], "x": 4.75, "y": 3.25 },
+                { "label":"G", "matrix": [5, 6], "x": 5.75, "y": 3.25 },
+                { "label":"H", "matrix": [5, 7], "x": 6.75, "y": 3.25 },
+                { "label":"J", "matrix": [7, 7], "x": 7.75, "y": 3.25 },
+                { "label":"K", "matrix": [7, 8], "x": 8.75, "y": 3.25 },
+                { "label":"L", "matrix": [7, 3], "x": 9.75, "y": 3.25 },
+                { "label":";", "matrix": [7, 9], "x": 10.75, "y": 3.25 },
+                { "label":"'", "matrix": [5, 9], "x": 11.75, "y": 3.25 },
+                { "label":"#", "matrix": [1, 2], "x": 12.75, "y": 3.25 },
+                { "label":"Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25 },
+                { "label":"4", "matrix": [3, 10], "x": 18.5, "y": 3.25 },
+                { "label":"5", "matrix": [3, 11], "x": 19.5, "y": 3.25 },
+                { "label":"6", "matrix": [3, 14], "x": 20.5, "y": 3.25 },
+                { "label":"Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25 },
+                { "label":"\\", "matrix": [5, 4], "x": 1.25, "y": 4.25 },
+                { "label":"Z", "matrix": [4, 16], "x": 2.25, "y": 4.25 },
+                { "label":"X", "matrix": [4, 4], "x": 3.25, "y": 4.25 },
+                { "label":"C", "matrix": [4, 5], "x": 4.25, "y": 4.25 },
+                { "label":"V", "matrix": [4, 6], "x": 5.25, "y": 4.25 },
+                { "label":"B", "matrix": [6, 6], "x": 6.25, "y": 4.25 },
+                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 4.25 },
+                { "label":"M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "label":",", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "label":".", "matrix": [4, 3], "x": 10.25, "y": 4.25 },
+                { "label":"/", "matrix": [6, 9], "x": 11.25, "y": 4.25 },
+                { "label":"Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
+                { "label":"Up", "matrix": [5, 15], "x": 16.25, "y": 4.25 },
+                { "label":"1", "matrix": [7, 10], "x": 18.5, "y": 4.25 },
+                { "label":"2", "matrix": [7, 11], "x": 19.5, "y": 4.25 },
+                { "label":"3", "matrix": [7, 14], "x": 20.5, "y": 4.25 },
+                { "label":"Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25 },
+                { "label":"Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25 },
+                { "label":"Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label":"Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25 },
+                { "label":" ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25 },
+                { "label":"Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25 },
+                { "label":"Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25 },
+                { "label":"Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25 },
+                { "label":"Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25 },
+                { "label":"Left", "matrix": [6, 15], "x": 15.25, "y": 5.25 },
+                { "label":"Down", "matrix": [6, 10], "x": 16.25, "y": 5.25 },
+                { "label":"Right", "matrix": [6, 11], "x": 17.25, "y": 5.25 },
+                { "label":"0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25 },
+                { "label":"Del", "matrix": [5, 14], "x": 20.5, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/keymaps/default/keymap.c b/keyboards/handwired/daskeyboard/daskeyboard4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fa5f15eccf
--- /dev/null
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2022 Commander1024 (@Commander1024)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+    _BASE,
+    _MEDIA,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │               │ 4 │ 5 │ 6 │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    [_BASE] = LAYOUT_fullsize_iso(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,     KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,    KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_NUHS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,             KC_RSFT,             KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TT(_MEDIA), KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
+    ),
+    [_MEDIA] = LAYOUT_fullsize_iso(
+        KC_TRNS,              KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_SLEP,
+
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,    KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,          KC_TRNS,               KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,  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/handwired/daskeyboard/daskeyboard4/readme.md b/keyboards/handwired/daskeyboard/daskeyboard4/readme.md
new file mode 100644
index 0000000000..0e2a46ee53
--- /dev/null
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/readme.md
@@ -0,0 +1,73 @@
+# daskeyboard4
+
+![daskeyboard4pro](https://i.imgur.com/Y3xT9Zuh.jpeg)
+
+![PCB](https://i.imgur.com/UfzVHcjh.jpeg)
+
+Reverse engineered PCB definition of daskeyboard 4 (Professional)
+
+* Keyboard Maintainer: [Commander1024](https://github.com/Commander1024)
+* Hardware Supported: The PCB, rotary encoder, LEDs
+* Hardware Availability: https://www.daskeyboard.com/de/daskeyboard-4-professional/
+* Microcontroller used: https://stm32-base.org/boards/STM32F401CEU6-WeAct-Black-Pill-V3.0.html
+
+I used a WeAct Black Pill V3.0 featuring the STM32F401CEU6 processor to replace the keyboard's destroyed controller. This keyboard definition can also be easily adopted to use any other microcontroller compatible with QMK and with sufficient I/O ports.
+
+The layout definition in **info.json** contains the magic. The rows and columns appear in the pin definition in the order they appear on the 26 pads, where the original ribbon cable was connected. **Note**: Pad 25 is not connected.
+
+It *should* work for ANSI as well as ISO variants, although I only tested the latter.
+
+Rotary encoder and LEDs are handwired.
+
+## Media key mapping
+KC_RGUI (right super key) is used to switch or toggle (double tap) to media layer.  
+The rotary encoder is used for volume control.
+![mediakeys](https://i.imgur.com/9g7tQzF.jpg)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/daskeyboard/daskeyboard4:default
+
+Flashing example for this keyboard:
+
+    make handwired/daskeyboard/daskeyboard4:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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 (5,16) 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
+
+## PCB-Pinout
+| PCB-pin | properties                  | STM32F411   |
+|---------|-----------------------------|-------------|
+| 1       | column, diode, 4 switches   |    C14      |
+| 2       | row, no diode, 13 switches  |    A13      |
+| 3       | row, no diode, 15 switches  |    A14      |
+| 4       | column, diode, 3 switches   |    C15      |
+| 5       | column, diode, 8 switches   |    A0       |
+| 6       | row, no diode, 14 switches  |    A1       |
+| 7       | column, diode, 7 switches   |    A2       |
+| 8       | row, no diode, 13 switches  |    A3       |
+| 9       | column, diode, 7 switches   |    A4       |
+| 10      | column, diode, 7 switches   |    A5       |
+| 11      | column, diode, 8 switches   |    A6       |
+| 12      | column, diode, 8 switches   |    A7       |
+| 13      | column, diode, 7 switches   |    B0       |
+| 14      | column, diode, 7 switches   |    B1       |
+| 15      | column, diode, 7 switches   |    B10      |
+| 16      | column, diode, 7 switches   |    B9       |
+| 17      | row, no diode, 12 switches  |    B8       |
+| 18      | column, diode, 2 switches   |    B7       |
+| 19      | column, diode, 2 switches   |    B6       |
+| 20      | column, diode, 6 switches   |    B5       |
+| 21      | column, diode, 6 switches   |    B4       |
+| 22      | row, no diode, 12 switches  |    B3       |
+| 23      | row, no diode, 10 switches  |    A15      |
+| 24      | row, no diode, 15 switches  |    B15      |
+| 25      | N/C                         |             |
+| 26      | column, diode, 7 switches   |    A8       |
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk b/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From 3f98542e52cd62f4db1346282fdf275202a0e7bd Mon Sep 17 00:00:00 2001
From: tsubuan_145 <88652606+tsubuan145@users.noreply.github.com>
Date: Thu, 1 Dec 2022 08:28:17 +0900
Subject: [PATCH 958/959] Add meow48 ver.1.0 keyboard (#19217)

just make the PRs stop
---
 keyboards/meow48/config.h                 | 86 +++++++++++++++++++++++
 keyboards/meow48/info.json                | 68 ++++++++++++++++++
 keyboards/meow48/keymaps/default/keymap.c | 60 ++++++++++++++++
 keyboards/meow48/keymaps/via/keymap.c     | 59 ++++++++++++++++
 keyboards/meow48/keymaps/via/rules.mk     |  2 +
 keyboards/meow48/meow48.c                 | 66 +++++++++++++++++
 keyboards/meow48/readme.md                | 25 +++++++
 keyboards/meow48/rules.mk                 | 20 ++++++
 8 files changed, 386 insertions(+)
 create mode 100644 keyboards/meow48/config.h
 create mode 100644 keyboards/meow48/info.json
 create mode 100644 keyboards/meow48/keymaps/default/keymap.c
 create mode 100644 keyboards/meow48/keymaps/via/keymap.c
 create mode 100644 keyboards/meow48/keymaps/via/rules.mk
 create mode 100644 keyboards/meow48/meow48.c
 create mode 100644 keyboards/meow48/readme.md
 create mode 100644 keyboards/meow48/rules.mk

diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h
new file mode 100644
index 0000000000..62ec038b34
--- /dev/null
+++ b/keyboards/meow48/config.h
@@ -0,0 +1,86 @@
+/*
+Copyright 2022 tsubuan145
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5, F4, F5 }
+#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define OLED_BRIGHTNESS 100
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 48
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+
+/*== all animations enable ==*/
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+ 
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json
new file mode 100644
index 0000000000..a3367a0849
--- /dev/null
+++ b/keyboards/meow48/info.json
@@ -0,0 +1,68 @@
+{
+    "manufacturer": "tsubuan145",
+    "keyboard_name": "meow48",
+    "maintainer": "tsubuan145",
+    "url": "https://github.com/tsubuan145",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xF048",
+        "vid": "0xF048"
+           },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label":"ESC", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label":"Q", "matrix": [1, 0], "x": 1, "y": 0 },
+                { "label":"W", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label":"E", "matrix": [1, 1], "x": 3, "y": 0 },
+                { "label":"R", "matrix": [0, 2], "x": 4, "y": 0 },
+                { "label":"T", "matrix": [1, 2], "x": 5, "y": 0 },
+                { "label":"Y", "matrix": [2, 2], "x": 6, "y": 0 },
+                { "label":"U", "matrix": [0, 3], "x": 7, "y": 0 },
+                { "label":"I", "matrix": [1, 3], "x": 8, "y": 0 },
+                { "label":"O", "matrix": [0, 4], "x": 9, "y": 0 },
+                { "label":"P", "matrix": [1, 4], "x": 10, "y": 0 },
+                { "label":"MINS", "matrix": [0, 5], "x": 11, "y": 0 },
+                { "label":"BSPC", "matrix": [1, 5], "w": 1.25, "x": 12, "y": 0 },
+
+                { "label":"TAB", "matrix": [2, 0], "w": 1.25, "x": 0, "y": 1 },
+                { "label":"A", "matrix": [3, 0], "x": 1.25, "y": 1 },
+                { "label":"S", "matrix": [2, 1], "x": 2.25, "y": 1 },
+                { "label":"D", "matrix": [3, 1], "x": 3.25, "y": 1 },
+                { "label":"F", "matrix": [3, 2], "x": 4.25, "y": 1 },
+                { "label":"G", "matrix": [4, 2], "x": 5.25, "y": 1 },
+                { "label":"H", "matrix": [2, 3], "x": 6.25, "y": 1 },
+                { "label":"J", "matrix": [3, 3], "x": 7.25, "y": 1 },
+                { "label":"K", "matrix": [2, 4], "x": 8.25, "y": 1 },
+                { "label":"L", "matrix": [3, 4], "x": 9.25, "y": 1 },
+                { "label":"SCLN", "matrix": [2, 5], "x": 10.25, "y": 1 },
+                { "label":"ENT", "matrix": [3, 5], "w": 2, "x": 11.25, "y": 1 },
+
+                { "label":"LSFT", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 2 },
+                { "label":"Z", "matrix": [5, 0], "x": 1.5, "y": 2 },
+                { "label":"X", "matrix": [4, 1], "x": 2.5, "y": 2 },
+                { "label":"C", "matrix": [5, 1], "x": 3.5, "y": 2 },
+                { "label":"V", "matrix": [5, 2], "x": 4.5, "y": 2 },
+                { "label":"B", "matrix": [6, 2], "x": 5.5, "y": 2 },
+                { "label":"N", "matrix": [4, 3], "x": 6.5, "y": 2 },
+                { "label":"M", "matrix": [5, 3], "x": 7.5, "y": 2 },
+                { "label":"COMM", "matrix": [4, 4], "x": 8.5, "y": 2 },
+                { "label":"DOT", "matrix": [5, 4], "x": 9.5, "y": 2 },
+                { "label":"SLSH", "matrix": [4, 5], "x": 10.5, "y": 2 },
+                { "label":"RSFT", "matrix": [5, 5], "w": 1.75, "x": 11.5, "y": 2 },
+
+                { "label":"CAPS", "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label":"LCTL", "matrix": [7, 0], "x": 1.25, "y": 3 },
+                { "label":"LGUI", "matrix": [6, 1], "x": 2.25, "y": 3 },
+                { "label":"LALT", "matrix": [7, 1], "x": 3.25, "y": 3 },
+                { "label":"SPC", "matrix": [7, 2], "w": 2, "x": 4.25, "y": 3 },
+                { "label":"SPC", "matrix": [6, 3], "w": 2, "x": 6.25, "y": 3 },
+                { "label":"DEL", "matrix": [7, 3], "x": 8.25, "y": 3 },
+                { "label":"LEFT", "matrix": [6, 4], "x": 9.25, "y": 3 },
+                { "label":"UP", "matrix": [7, 4], "x": 10.25, "y": 3 },
+                { "label":"DOWN", "matrix": [6, 5], "x": 11.25, "y": 3 },
+                { "label":"RGHT", "matrix": [7, 5], "x": 12.25, "y": 3 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/meow48/keymaps/default/keymap.c b/keyboards/meow48/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1f0293b84c
--- /dev/null
+++ b/keyboards/meow48/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2022 tsubuan145
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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 │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ - │  BSPACE│
+     * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │Tab   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │     Enter│
+     * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────────┤
+     * │Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift│
+     * ├─────┬─┴─┬─┴─┬─┴─┬─┴───┴─┬─┴───┴─┬─┴─┬─┴──┬┴───┼────┬────┤
+     * │Caps │CTL│GUI│Alt│       │       │Del│LEFT│ UP │DOWN│RGHT│
+     * └─────┴───┴───┴───┴───────┴───────┴───┴────┴────┴────┴────┘
+     * 
+     */
+     
+     [0] = LAYOUT(
+        KC_ESCAPE,  LT(3,KC_Q),    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS, KC_BSPC,
+        KC_TAB,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,          KC_ENT,
+        KC_LSFT,    KC_Z,    LT(2,KC_X),    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT,
+        KC_CAPS,    KC_LCTL, KC_LGUI, KC_LALT,    KC_SPACE,               LT(1, KC_SPACE),   KC_DEL,  KC_LEFT, KC_UP,  KC_DOWN, KC_RGHT
+    ),
+    
+     [1] = LAYOUT(
+        KC_NO,  LSFT(KC_1),    LSFT(KC_2),    LSFT(KC_3),    LSFT(KC_4),    LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),    LSFT(KC_8),    LSFT(KC_9),  KC_LBRC, KC_CIRC, KC_BSPC,
+        KC_NO,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_ENT,
+        KC_LSFT,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PLUS, KC_INT3, KC_INT1,       KC_RSFT,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,  KC_DEL,  KC_LEFT, KC_UP, 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_NO,   KC_NO,   KC_NO,   KC_NO,             KC_NO,   RGB_TOG,   RGB_HUD,  RGB_HUI,  RGB_RMOD, RGB_MOD
+    ),
+    
+     [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
+    )
+    
+        };
diff --git a/keyboards/meow48/keymaps/via/keymap.c b/keyboards/meow48/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ed22024fc7
--- /dev/null
+++ b/keyboards/meow48/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2022 tsubuan145
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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 │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ - │  BSPACE│
+     * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │Tab   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │     Enter│
+     * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────────┤
+     * │Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift│
+     * ├─────┬─┴─┬─┴─┬─┴─┬─┴───┴─┬─┴───┴─┬─┴─┬─┴──┬┴───┼────┬────┤
+     * │Caps │CTL│GUI│Alt│       │       │Del│LEFT│ UP │DOWN│RGHT│
+     * └─────┴───┴───┴───┴───────┴───────┴───┴────┴────┴────┴────┘
+     * 
+     */
+     
+     [0] = LAYOUT(
+        KC_ESCAPE,  LT(3,KC_Q),    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS, KC_BSPC,
+        KC_TAB,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,          KC_ENT,
+        KC_LSFT,    KC_Z,    LT(2,KC_X),    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT,
+        KC_CAPS,    KC_LCTL, KC_LGUI, KC_LALT,    KC_SPACE,               LT(1, KC_SPACE),   KC_DEL,  KC_LEFT, KC_UP,  KC_DOWN, KC_RGHT
+    ),
+    
+     [1] = LAYOUT(
+        KC_NO,  LSFT(KC_1),    LSFT(KC_2),    LSFT(KC_3),    LSFT(KC_4),    LSFT(KC_5),    LSFT(KC_6),    LSFT(KC_7),    LSFT(KC_8),    LSFT(KC_9),  KC_LBRC, KC_CIRC, KC_BSPC,
+        KC_NO,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_ENT,
+        KC_LSFT,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PLUS, KC_INT3, KC_INT1,       KC_RSFT,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,  KC_DEL,  KC_LEFT, KC_UP, 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_NO,   KC_NO,   KC_NO,   KC_NO,             KC_NO,   RGB_TOG,   RGB_HUD,  RGB_HUI,  RGB_RMOD, RGB_MOD
+    ),
+    
+     [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
+    )
+        };
diff --git a/keyboards/meow48/keymaps/via/rules.mk b/keyboards/meow48/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/meow48/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/meow48/meow48.c b/keyboards/meow48/meow48.c
new file mode 100644
index 0000000000..5c0005c3fc
--- /dev/null
+++ b/keyboards/meow48/meow48.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 tsubuan145
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+bool oled_task_kb(void) {
+
+    if (!oled_task_user()) { return false; }
+
+    oled_write_P(PSTR("Layer:"), false);
+    oled_write_ln(get_u8_str(get_highest_layer(layer_state), ' '), false);
+
+    static const char PROGMEM my_logo[] = {
+
+     
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 
+    0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf8, 0xfe, 0xff, 
+    0xff, 0xfe, 0x7c, 0x7c, 0xfe, 0xff, 0xff, 0xfe, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0xff, 0xfe, 0xfe, 0xff, 0x3f, 0x3f, 0xff, 
+    0xff, 0xfe, 0xfc, 0xf8, 0x00, 0xe0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xcf, 0xcf, 0xcf, 0xcf, 0xff, 
+    0xfe, 0xfc, 0xf8, 0x00, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0x7f, 0x3f, 0x7f, 0xff, 0xfe, 0xfe, 
+    0xfc, 0xf8, 0xf0, 0x00, 0x3c, 0xfe, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 
+    0xfe, 0xfc, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 
+    0xff, 0x9f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x80, 0xcf, 0xff, 0xff, 0xff, 0xff, 
+    0xff, 0xfc, 0x78, 0x78, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 
+    0xff, 0xff, 0xff, 0x7f, 0x00, 0x0f, 0x1f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xf9, 0xf9, 0xf9, 0xf9, 
+    0xf9, 0x71, 0x00, 0x00, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 
+    0x7f, 0x3f, 0x1f, 0x00, 0x00, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x0f, 0x3f, 
+    0x7f, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x01, 0x06, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
+    0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x1f, 0x3f, 0x7f, 0x7f, 0xff, 
+    0xff, 0xfc, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x78, 0x38, 0x3e, 0x1f, 0x00
+    };
+
+    oled_write_raw_P(my_logo, sizeof(my_logo));
+
+    return false;
+
+}
+#endif
diff --git a/keyboards/meow48/readme.md b/keyboards/meow48/readme.md
new file mode 100644
index 0000000000..9e96a69002
--- /dev/null
+++ b/keyboards/meow48/readme.md
@@ -0,0 +1,25 @@
+# Meow48
+
+*"Meow48" is a keyboard with a narrow pitch of 40%(48keys) exclusively for Kailh Choc.
+
+* Keyboard Maintainer: [tsubuan145](https://github.com/tsubuan145)
+* Hardware Supported: It is created with KiCAD 6.0.9.
+* Hardware Availability: (https://tsubuan-145.booth.pm/items/4231893)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make meow48:default
+    
+Flashing example for this keyboard:
+
+    make meow48:default:flash
+    
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/meow48/rules.mk b/keyboards/meow48/rules.mk
new file mode 100644
index 0000000000..523669774a
--- /dev/null
+++ b/keyboards/meow48/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
\ No newline at end of file

From e9d5967a93f789a87701c6123a73ecbd8dc7050b Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Thu, 1 Dec 2022 06:30:41 +0700
Subject: [PATCH 959/959] [Keyboard] Add keyboard Caticorn (#19138)

---
 keyboards/horrortroll/caticorn/caticorn.c     |   17 +
 keyboards/horrortroll/caticorn/caticorn.h     |   25 +
 keyboards/horrortroll/caticorn/config.h       |   38 +
 .../caticorn/rev1/hotswap/hotswap.h           |   54 +
 .../caticorn/rev1/hotswap/info.json           |  110 ++
 .../rev1/hotswap/keymaps/default/keymap.c     |   98 +
 .../rev1/hotswap/keymaps/via/config.h         |   19 +
 .../rev1/hotswap/keymaps/via/keymap.c         |   98 +
 .../rev1/hotswap/keymaps/via/rules.mk         |    1 +
 .../caticorn/rev1/hotswap/readme.md           |   25 +
 .../caticorn/rev1/hotswap/rules.mk            |   24 +
 .../caticorn/rev1/solder/info.json            | 1673 +++++++++++++++++
 .../rev1/solder/keymaps/default/keymap.c      |  252 +++
 .../caticorn/rev1/solder/keymaps/via/config.h |   19 +
 .../caticorn/rev1/solder/keymaps/via/keymap.c |  252 +++
 .../caticorn/rev1/solder/keymaps/via/rules.mk |    1 +
 .../caticorn/rev1/solder/readme.md            |   25 +
 .../horrortroll/caticorn/rev1/solder/rules.mk |   24 +
 .../horrortroll/caticorn/rev1/solder/solder.h |  582 ++++++
 .../chinese_pcb/devil68_pro/devil68_pro.c     |   12 +-
 keyboards/horrortroll/readme.md               |   12 +-
 21 files changed, 3350 insertions(+), 11 deletions(-)
 create mode 100644 keyboards/horrortroll/caticorn/caticorn.c
 create mode 100644 keyboards/horrortroll/caticorn/caticorn.h
 create mode 100644 keyboards/horrortroll/caticorn/config.h
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/hotswap.h
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/info.json
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/rules.mk
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/readme.md
 create mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/info.json
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/config.h
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/rules.mk
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/readme.md
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/rules.mk
 create mode 100644 keyboards/horrortroll/caticorn/rev1/solder/solder.h

diff --git a/keyboards/horrortroll/caticorn/caticorn.c b/keyboards/horrortroll/caticorn/caticorn.c
new file mode 100644
index 0000000000..b416eefdde
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/caticorn.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "caticorn.h"
diff --git a/keyboards/horrortroll/caticorn/caticorn.h b/keyboards/horrortroll/caticorn/caticorn.h
new file mode 100644
index 0000000000..87e1202dec
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/caticorn.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_horrortroll_caticorn_rev1_hotswap)
+    #include "hotswap.h"
+#elif defined(KEYBOARD_horrortroll_caticorn_rev1_solder)
+    #include "solder.h"
+#endif
diff --git a/keyboards/horrortroll/caticorn/config.h b/keyboards/horrortroll/caticorn/config.h
new file mode 100644
index 0000000000..bef1b690ab
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS \
+    { GP7, GP0, GP8, GP25, GP11, GP12 }
+#define MATRIX_COL_PINS \
+    { GP6, GP5, GP4, GP3, GP2, GP1, GP20, GP21, GP16, GP17, GP18, GP19, GP15, GP14, GP13, GP10, GP9 }
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/hotswap.h b/keyboards/horrortroll/caticorn/rev1/hotswap/hotswap.h
new file mode 100644
index 0000000000..e3c2584f14
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/hotswap.h
@@ -0,0 +1,54 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_ansi( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
new file mode 100644
index 0000000000..2309889e05
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "Caticorn Hotswap",
+    "manufacturer": "HorrorTroll",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x6002",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..81ba8347ec
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,98 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │  RShift  │    │ ↑ │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ App│RCrl││ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │  RShift  │    │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16     */
+    [_BASE] = LAYOUT_tkl_f13_ansi(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Rst││MeP│VoD│VoU│Mut││Stp│Prv│Ply│Nxt││Mai│Hom│Cal│Sch││MyC││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │   │   │       ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │        │   │   │   │   │   │   │   │   │   │   │          │    │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+       │    │    │    │                        │    │ Fn │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16      */
+    [_FN]   = LAYOUT_tkl_f13_ansi(
+                QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, KC_MYCM, _______, _______, _______,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+            ),
+};
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h
new file mode 100644
index 0000000000..4a9ae9bdc2
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d98822de17
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,98 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │  RShift  │    │ ↑ │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ App│RCrl││ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │  RShift  │    │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16     */
+    [_BASE] = LAYOUT_tkl_f13_ansi(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Rst││MeP│VoD│VoU│Mut││Stp│Prv│Ply│Nxt││Mai│Hom│Cal│Sch││MyC││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │   │   │       ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │        │   │   │   │   │   │   │   │   │   │   │          │    │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+       │    │    │    │                        │    │ Fn │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16     */
+    [_FN]   = LAYOUT_tkl_f13_ansi(
+                QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, KC_MYCM, _______, _______, _______,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+            ),
+};
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md b/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md
new file mode 100644
index 0000000000..b9023e8c71
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md
@@ -0,0 +1,25 @@
+# Caticorn Hotswap (Rev 1)
+
+A TKL keyboard, which controlled by an RP2040 chipset.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: RP2040
+* Hardware Availability: Prototype PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/caticorn/rev1/hotswap:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/caticorn/rev1/hotswap:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
+* **Physical reset button**: Press and hold the button on the back of the PCB, then plug USB onto PC
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
new file mode 100644
index 0000000000..f35b29bb41
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# EEPROM driver
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = rp2040_flash
+
+LAYOUTS = tkl_f13_ansi
\ No newline at end of file
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/info.json
new file mode 100644
index 0000000000..9964954aaf
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/info.json
@@ -0,0 +1,1673 @@
+{
+    "keyboard_name": "Caticorn Solder",
+    "manufacturer": "HorrorTroll",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x6001",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"International 3", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"ISO Hash", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"Win", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"Fn", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5723984bf4
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c
@@ -0,0 +1,252 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _F12,
+    _F13,
+    _F12_7U,
+    _F13_7U,
+    _FN,
+};
+
+enum layer_keycodes {
+    TOG_F12 = SAFE_RANGE, //Enable default layer for F12 layout
+    TOG_F13,              //Enable default layer for F13 layout
+    F12_TGN,              //Enable default layer for F12 Tsangan layout
+    F13_TGN,              //Enable default layer for F13 Tsangan layout
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12││PSc│Scr│Pse│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl││ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   ││   │   │   │
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F12] = LAYOUT_all(
+                KC_ESC,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl││ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F13] = LAYOUT_all(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12││PSc│Scr│Pse│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │LCrl │GUI│LAlt │           Space            │RAlt │ Fn│RCrl││ ← │ ↓ │ → │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   ││   │   │   │
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │     │   │     │                            │     │   │    ││   │   │   │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F12_7U] = LAYOUT_all(
+                KC_ESC,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │LCrl │GUI│LAlt │           Space            │RAlt │ Fn│RCrl││ ← │ ↓ │ → │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │     │   │     │                            │     │   │    ││   │   │   │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F13_7U] = LAYOUT_all(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Rst││   │MeP│VoD│VoU││Mut│Stp│Prv│Ply││Nxt│Mai│Hom│Cal││Sch││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │    │   │   │   │   │   │   │   │   │   │   │   │      │   │    │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │    │    │    │                        │    │ Fn │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_FN] = LAYOUT_all(
+                QK_BOOT, _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC,          KC_WSCH, _______, _______, _______,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TOG_F12, TOG_F13, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, F12_TGN, F13_TGN, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______, _______
+            ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TOG_F12:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F12);
+            }
+            return false;
+        case TOG_F13:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F13);
+            }
+            return false;
+        case F12_TGN:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F12_7U);
+            }
+            return false;
+        case F13_TGN:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F13_7U);
+            }
+            return false;
+	}
+    return true;
+}
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/config.h b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/config.h
new file mode 100644
index 0000000000..8fe93c228c
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 5
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5723984bf4
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c
@@ -0,0 +1,252 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _F12,
+    _F13,
+    _F12_7U,
+    _F13_7U,
+    _FN,
+};
+
+enum layer_keycodes {
+    TOG_F12 = SAFE_RANGE, //Enable default layer for F12 layout
+    TOG_F13,              //Enable default layer for F13 layout
+    F12_TGN,              //Enable default layer for F12 Tsangan layout
+    F13_TGN,              //Enable default layer for F13 Tsangan layout
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12││PSc│Scr│Pse│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl││ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   ││   │   │   │
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F12] = LAYOUT_all(
+                KC_ESC,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl││ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F13] = LAYOUT_all(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12││PSc│Scr│Pse│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │LCrl │GUI│LAlt │           Space            │RAlt │ Fn│RCrl││ ← │ ↓ │ → │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   ││   │   │   │
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │     │   │     │                            │     │   │    ││   │   │   │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F12_7U] = LAYOUT_all(
+                KC_ESC,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  ││Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │LCrl │GUI│LAlt │           Space            │RAlt │ Fn│RCrl││ ← │ ↓ │ → │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
+       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
+       │     │   │     │                            │     │   │    ││   │   │   │
+       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_F13_7U] = LAYOUT_all(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  
+                KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, MO(_FN), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+       │Rst││   │MeP│VoD│VoU││Mut│Stp│Prv│Ply││Nxt│Mai│Hom│Cal││Sch││   │   │   │
+       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+       │      │   │   │   │   │   │   │   │   │   │   │   │        │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+       │    │   │   │   │   │   │   │   │   │   │   │   │      │   │    │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │    │    │    │                        │    │ Fn │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    [_FN] = LAYOUT_all(
+                QK_BOOT, _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC,          KC_WSCH, _______, _______, _______,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TOG_F12, TOG_F13, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, F12_TGN, F13_TGN, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______, _______
+            ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TOG_F12:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F12);
+            }
+            return false;
+        case TOG_F13:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F13);
+            }
+            return false;
+        case F12_TGN:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F12_7U);
+            }
+            return false;
+        case F13_TGN:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_F13_7U);
+            }
+            return false;
+	}
+    return true;
+}
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/rules.mk b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/readme.md b/keyboards/horrortroll/caticorn/rev1/solder/readme.md
new file mode 100644
index 0000000000..e25e3bd563
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/readme.md
@@ -0,0 +1,25 @@
+# Caticorn Solder (Rev 1)
+
+A TKL keyboard, which controlled by an RP2040 chipset.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: RP2040
+* Hardware Availability: Prototype PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/caticorn/rev1/solder:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/caticorn/rev1/solder:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
+* **Physical reset button**: Press and hold the button on the back of the PCB, then plug USB onto PC
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
new file mode 100644
index 0000000000..4540766805
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# EEPROM driver
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = rp2040_flash
+
+LAYOUTS = tkl_ansi tkl_ansi_split_bs_rshift tkl_ansi_tsangan tkl_ansi_tsangan_split_bs_rshift tkl_f13_ansi tkl_f13_ansi_split_bs_rshift tkl_f13_ansi_tsangan tkl_f13_ansi_tsangan_split_bs_rshift tkl_iso tkl_iso_split_bs_rshift tkl_iso_tsangan tkl_iso_tsangan_split_bs_rshift tkl_f13_iso tkl_f13_iso_split_bs_rshift tkl_f13_iso_tsangan tkl_f13_iso_tsangan_split_bs_rshift
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/solder.h b/keyboards/horrortroll/caticorn/rev1/solder/solder.h
new file mode 100644
index 0000000000..a43282df50
--- /dev/null
+++ b/keyboards/horrortroll/caticorn/rev1/solder/solder.h
@@ -0,0 +1,582 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_all( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_ansi( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_ansi_split_bs_rshift( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_ansi_tsangan( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_ansi_tsangan_split_bs_rshift( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_ansi( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_ansi_tsangan( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_iso( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_iso_split_bs_rshift( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_iso_tsangan( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+ * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_iso_tsangan_split_bs_rshift( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_iso( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_iso_tsangan( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐3D  │└───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───┐
+ * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+ * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
+    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
+}
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
index 8b51920b81..3129a4af5d 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
-    {       0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12, NO_LED,     13,     14 },
-    {      15, NO_LED,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29 },
-    {      30, NO_LED,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42, NO_LED,     43 },
-    {  NO_LED,     44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54, NO_LED,     55,     56,     57 },
-    {      58,     59, NO_LED,     60, NO_LED, NO_LED,     61, NO_LED, NO_LED, NO_LED,     62,     63,     64,     65,     66,     67 }
+    {      0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12, NO_LED,     13,     14 },
+    {     15, NO_LED,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29 },
+    {     30, NO_LED,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42, NO_LED,     43 },
+    { NO_LED,     44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54, NO_LED,     55,     56,     57 },
+    {     58,     59, NO_LED,     60, NO_LED, NO_LED,     61, NO_LED, NO_LED, NO_LED,     62,     63,     64,     65,     66,     67 }
 }, {
     // Key matrix (0 -> 67)
     {0  ,  0}, {15 ,  0}, {30 ,  0}, {45 ,  0}, {60 ,  0}, {75 ,  0}, {90 ,  0}, {105,  0}, {120,  0}, {135,  0}, {150,  0}, {165,  0}, {180,  0},            {202,  0}, {224,  0},
diff --git a/keyboards/horrortroll/readme.md b/keyboards/horrortroll/readme.md
index 4da9469544..b6f5e8420b 100644
--- a/keyboards/horrortroll/readme.md
+++ b/keyboards/horrortroll/readme.md
@@ -7,9 +7,11 @@
   | Paws 60          | ATMEGA32U4    | 60%          | 0x7516    | 0x5001     | Hotswap                                      |
 
 ## Keyboards Completed has Collaboration with me:
-  | Keyboard name    | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
-  | ---------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- |
-  | Lemon40          | ATMEGA32U4    | 40% Alice    | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32           |
+  | Keyboard name      | MCU           | Layout       | Vendor ID | Product ID | Features                           |
+  | ------------------ | ------------- | ------------ | --------- | ---------- | ---------------------------------- |
+  | Lemon40            | ATMEGA32U4    | 40% Alice    | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32 |
+  | Caticorn (Solder)  | RP2040        | TKL          | 0x7516    | 0x6001     | Solder                             |
+  | Caticorn (Hotswap) | RP2040        | TKL          | 0x7516    | 0x6002     | Hotswap                            |
 
 ## Keyboard Rewrited by me:
   | Keyboard name                                                                               | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
@@ -27,6 +29,6 @@
 
 ## Contact me if you have any problem
 
-**Discord:** HorrorTroll#0975  
-**Facebook:** https://www.facebook.com/PhamChonChe.Duc/  
+**Discord:** HorrorTroll#0975
+**Facebook:** https://www.facebook.com/PhamChonChe.Duc
 **Email:** sonicvipduc@gmail.com
\ No newline at end of file